diff --git a/.eslintignore b/.eslintignore
index 4447ad67265..885e2cf3c7c 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -12,3 +12,4 @@ node_modules/
 spec/
 dist/
 tmp/
+documentation/
diff --git a/.gitattributes b/.gitattributes
index 546b134a0ce..2ba82579ac6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -27,3 +27,7 @@
 *.PDF  diff=astextplain
 *.rtf  diff=astextplain
 *.RTF  diff=astextplain
+
+# Ember App
+*.gjs linguist-language=js linguist-detectable
+*.gts linguist-language=ts linguist-detectable
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 90492aebc06..a7d0c1c2661 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,2 +1,2 @@
 chat:
-- plugins/chat/**/*
+  - plugins/chat/**/*
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index 057208eda32..b308d844199 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -1,14 +1,17 @@
-name: "Pull Request Labeler"
+name: Pull Request Labeler
+
 on:
-- pull_request_target
+  - pull_request_target
+
+permissions:
+  contents: read
+  pull-requests: write
 
 jobs:
   triage:
-    permissions:
-      contents: read
-      pull-requests: write
     runs-on: ubuntu-latest
+
     steps:
-    - uses: actions/labeler@v4
-      with:
-        repo-token: "${{ secrets.GITHUB_TOKEN }}"
+      - uses: actions/labeler@v4
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/licenses.yml b/.github/workflows/licenses.yml
index de665ecf290..40e53ad0c4a 100644
--- a/.github/workflows/licenses.yml
+++ b/.github/workflows/licenses.yml
@@ -15,7 +15,7 @@ permissions:
 
 jobs:
   build:
-    if: "!(github.event_name == 'push' && github.repository == 'discourse/discourse-private-mirror')"
+    if: github.event_name == 'pull_request' || github.repository != 'discourse/discourse-private-mirror'
     name: run
     runs-on: ubuntu-latest
     container: discourse/discourse_test:slim
@@ -36,8 +36,7 @@ jobs:
         with:
           path: vendor/bundle
           key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-gem-
+          restore-keys: ${{ runner.os }}-gem-
 
       - name: Setup gems
         run: |
@@ -61,8 +60,7 @@ jobs:
         with:
           path: ${{ steps.yarn-cache-dir.outputs.dir }}
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
+          restore-keys: ${{ runner.os }}-yarn-
 
       - name: Check RubyGems Licenses
         if: ${{ !cancelled() }}
diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
index b2125eea167..0ded454e9e6 100644
--- a/.github/workflows/linting.yml
+++ b/.github/workflows/linting.yml
@@ -15,13 +15,16 @@ permissions:
 
 jobs:
   build:
-    if: "!(github.event_name == 'push' && github.repository == 'discourse/discourse-private-mirror')"
+    if: github.event_name == 'pull_request' || github.repository != 'discourse/discourse-private-mirror'
     name: run
     runs-on: ubuntu-latest
     container: discourse/discourse_test:slim
     timeout-minutes: 30
 
     steps:
+      - name: Set working directory owner
+        run: chown root:root .
+
       - uses: actions/checkout@v3
         with:
           fetch-depth: 1
@@ -36,8 +39,7 @@ jobs:
         with:
           path: vendor/bundle
           key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-gem-
+          restore-keys: ${{ runner.os }}-gem-
 
       - name: Setup gems
         run: |
@@ -58,11 +60,10 @@ jobs:
         with:
           path: ${{ steps.yarn-cache-dir.outputs.dir }}
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
+          restore-keys: ${{ runner.os }}-yarn-
 
       - name: Yarn install
-        run: yarn install
+        run: yarn install --frozen-lockfile
 
       - name: Rubocop
         if: ${{ !cancelled() }}
@@ -70,33 +71,27 @@ jobs:
 
       - name: syntax_tree
         if: ${{ !cancelled() }}
-        run: bundle exec stree check Gemfile $(git ls-files '*.rb') $(git ls-files '*.rake')
+        run: |
+          set -E
+          bundle exec stree check Gemfile $(git ls-files '*.rb') $(git ls-files '*.rake')
 
       - name: ESLint (core)
         if: ${{ !cancelled() }}
-        run: yarn eslint app/assets/javascripts
+        run: yarn lint:js
 
       - name: ESLint (core plugins)
         if: ${{ !cancelled() }}
-        run: yarn eslint plugins
+        run: yarn lint:js-plugins
 
       - name: Prettier
         if: ${{ !cancelled() }}
         run: |
           yarn prettier -v
-          yarn pprettier --list-different \
-            "app/assets/stylesheets/**/*.scss" \
-            "app/assets/javascripts/**/*.js" \
-            "plugins/**/assets/stylesheets/**/*.scss" \
-            "plugins/**/assets/javascripts/**/*.js"
+          yarn lint:prettier
 
       - name: Ember template lint
         if: ${{ !cancelled() }}
-        run: |
-          yarn ember-template-lint \
-            --no-error-on-unmatched-pattern \
-            "app/assets/javascripts/**/*.hbs" \
-            "plugins/**/assets/javascripts/**/*.hbs"
+        run: yarn lint:hbs
 
       - name: English locale lint (core)
         if: ${{ !cancelled() }}
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2598bcac746..d8c991f8809 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -17,20 +17,19 @@ permissions:
 
 jobs:
   build:
-    if: "!(github.event_name == 'push' && github.repository == 'discourse/discourse-private-mirror')"
-    name: ${{ matrix.target }} ${{ matrix.build_type }}
+    if: github.event_name == 'pull_request' || github.repository != 'discourse/discourse-private-mirror'
+    name: ${{ matrix.target }} ${{ matrix.build_type }} ${{ matrix.ruby }}
     runs-on: ${{ (matrix.build_type == 'annotations') && 'ubuntu-latest' || 'ubuntu-20.04-8core' }}
-    container: discourse/discourse_test:slim${{ (matrix.build_type == 'frontend' || matrix.build_type == 'system') && '-browsers' || '' }}
+    container: discourse/discourse_test:slim${{ (matrix.build_type == 'frontend' || matrix.build_type == 'system') && '-browsers' || '' }}${{ (matrix.ruby == '3.1') && '-ruby-3.1.0' || '' }}
     timeout-minutes: 20
 
     env:
       DISCOURSE_HOSTNAME: www.example.com
-      RUBY_GLOBAL_METHOD_CACHE_SIZE: 131072
       RAILS_ENV: test
       PGUSER: discourse
       PGPASSWORD: discourse
-      USES_PARALLEL_DATABASES: ${{ matrix.build_type == 'backend' }}
-      CAPBYARA_DEFAULT_MAX_WAIT_TIME: 4
+      USES_PARALLEL_DATABASES: ${{ matrix.build_type == 'backend' || matrix.build_type == 'system' }}
+      CAPYBARA_DEFAULT_MAX_WAIT_TIME: 10
 
     strategy:
       fail-fast: false
@@ -38,6 +37,7 @@ jobs:
       matrix:
         build_type: [backend, frontend, system, annotations]
         target: [core, plugins]
+        ruby: ["3.2"]
         exclude:
           - build_type: annotations
             target: plugins
@@ -71,9 +71,8 @@ jobs:
         uses: actions/cache@v3
         with:
           path: vendor/bundle
-          key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-gem-
+          key: ${{ runner.os }}-${{ matrix.ruby }}-gem-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: ${{ runner.os }}-${{ matrix.ruby }}-gem-
 
       - name: Setup gems
         run: |
@@ -94,11 +93,10 @@ jobs:
         with:
           path: ${{ steps.yarn-cache-dir.outputs.dir }}
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
+          restore-keys: ${{ runner.os }}-yarn-
 
       - name: Yarn install
-        run: yarn install
+        run: yarn install --frozen-lockfile
 
       - name: Checkout official plugins
         if: matrix.target == 'plugins'
@@ -113,10 +111,9 @@ jobs:
         id: app-cache
         with:
           path: tmp/app-cache
-          key: >- # postgres version, hash of migrations, "parallel?"
+          key: >-
             ${{ runner.os }}-
             ${{ hashFiles('.github/workflows/tests.yml') }}-
-            ${{ matrix.postgres }}-
             ${{ hashFiles('db/**/*', 'plugins/**/db/**/*') }}-
             ${{ env.USES_PARALLEL_DATABASES }}
 
@@ -153,18 +150,50 @@ jobs:
       - name: Fetch turbo_rspec_runtime.log cache
         uses: actions/cache@v3
         id: test-runtime-cache
-        if: matrix.build_type == 'backend' && matrix.target == 'core'
+        if: matrix.build_type == 'backend' || matrix.build_type == 'system'
         with:
           path: tmp/turbo_rspec_runtime.log
-          key: rspec-runtime-backend-core
+          key: rspec-runtime-${{ matrix.build_type }}-${{ matrix.target }}-${{ github.run_id }}
+          restore-keys: rspec-runtime-${{ matrix.build_type }}-${{ matrix.target }}-
+
+      - name: Check Zeitwerk eager_load
+        if: matrix.build_type == 'backend'
+        env:
+          LOAD_PLUGINS: ${{ (matrix.target == 'plugins') && '1' || '0' }}
+        run: |
+          if ! bin/rails zeitwerk:check --trace; then
+            echo
+            echo "---------------------------------------------"
+            echo
+            echo "::error::'bin/rails zeitwerk:check' failed - the app will fail to boot with 'eager_load=true' (e.g. in production)."
+            echo "To reproduce locally, run 'bin/rails zeitwerk:check'."
+            echo "Alternatively, you can run your local server/tests with the 'DISCOURSE_ZEITWERK_EAGER_LOAD=1' environment variable."
+            echo
+            exit 1
+          fi
+
+      - name: Check Zeitwerk reloading
+        if: matrix.build_type == 'backend'
+        env:
+          LOAD_PLUGINS: ${{ (matrix.target == 'plugins') && '1' || '0' }}
+        run: |
+          if ! bin/rails runner 'Rails.application.reloader.reload!'; then
+            echo
+            echo "---------------------------------------------"
+            echo
+            echo "::error::Zeitwerk reload failed - the app will not be able to reload properly in development."
+            echo "To reproduce locally, run \`bin/rails runner 'Rails.application.reloader.reload!'\`."
+            echo
+            exit 1
+          fi
 
       - name: Core RSpec
         if: matrix.build_type == 'backend' && matrix.target == 'core'
-        run: bin/turbo_rspec --verbose
+        run: bin/turbo_rspec --use-runtime-info --verbose --format documentation
 
       - name: Plugin RSpec
         if: matrix.build_type == 'backend' && matrix.target == 'plugins'
-        run: bin/rake plugin:turbo_spec
+        run: bin/rake plugin:turbo_spec['*','--verbose --format documentation --use-runtime-info']
 
       - name: Plugin QUnit
         if: matrix.build_type == 'frontend' && matrix.target == 'plugins'
@@ -181,11 +210,12 @@ jobs:
 
       - name: Core System Tests
         if: matrix.build_type == 'system' && matrix.target == 'core'
-        run: bin/rspec spec/system --format documentation --profile
+        run: RAILS_ENABLE_TEST_LOG=1 RAILS_TEST_LOG_LEVEL=error PARALLEL_TEST_PROCESSORS=4 bin/turbo_rspec --use-runtime-info --profile=50 --verbose --format documentation spec/system
 
       - name: Plugin System Tests
         if: matrix.build_type == 'system' && matrix.target == 'plugins'
-        run: LOAD_PLUGINS=1 bin/rspec plugins/*/spec/system --format documentation --profile
+        run: LOAD_PLUGINS=1 RAILS_ENABLE_TEST_LOG=1 RAILS_TEST_LOG_LEVEL=error PARALLEL_TEST_PROCESSORS=4 bin/turbo_rspec --use-runtime-info --profile=50 --verbose --format documentation plugins/*/spec/system
+        timeout-minutes: 30
 
       - name: Upload failed system test screenshots
         uses: actions/upload-artifact@v3
@@ -212,7 +242,7 @@ jobs:
         timeout-minutes: 30
 
   core_frontend_tests:
-    if: "!(github.event_name == 'push' && github.repository == 'discourse/discourse-private-mirror')"
+    if: github.event_name == 'pull_request' || github.repository != 'discourse/discourse-private-mirror'
     name: core frontend (${{ matrix.browser }})
     runs-on: ubuntu-20.04-8core
     container:
@@ -250,26 +280,25 @@ jobs:
         with:
           path: ${{ steps.yarn-cache-dir.outputs.dir }}
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
+          restore-keys: ${{ runner.os }}-yarn-
 
       - name: Yarn install
         working-directory: ./app/assets/javascripts/discourse
-        run: yarn install
+        run: yarn install --frozen-lockfile
 
       - name: Ember Build
         working-directory: ./app/assets/javascripts/discourse
         run: |
           mkdir /tmp/emberbuild
-          yarn ember build --environment=test  -o /tmp/emberbuild
+          yarn ember build --environment=test -o /tmp/emberbuild
 
       - name: Core QUnit
         working-directory: ./app/assets/javascripts/discourse
-        run: yarn ember exam --path /tmp/emberbuild --load-balance --parallel=5  --launch "${{ env.TESTEM_BROWSER }}" --write-execution-file --random
+        run: yarn ember exam --path /tmp/emberbuild --load-balance --parallel=5 --launch "${{ env.TESTEM_BROWSER }}" --write-execution-file --random
         timeout-minutes: 15
 
       - uses: actions/upload-artifact@v3
         if: ${{ always() }}
         with:
-          name: ember-exam-execution-${{matrix.browser}}
+          name: ember-exam-execution-${{ matrix.browser }}
           path: ./app/assets/javascripts/discourse/test-execution-*.json
diff --git a/.gitignore b/.gitignore
index ad4ff4d9294..6b335523351 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,7 +38,7 @@
 !/plugins/discourse-local-dates
 !/plugins/discourse-narrative-bot
 !/plugins/discourse-presence
-!/plugins/lazy-yt/
+!/plugins/discourse-lazy-videos/
 !/plugins/chat/
 !/plugins/poll/
 !/plugins/styleguide
@@ -52,12 +52,20 @@
 
 # We provide a .sample but people can use newer versions if they want to
 .ruby-version
+.ruby-gemset
+
+# Likewise, there is a .vscode-sample for VSCode config
+.vscode
 
 # Front-end
 dist
 node_modules
 yarn-error.log
 
+# Linting artifacts
+.eslintcache
+/lint-progress/
+
 # Auto-generated plugin JS assets
 /app/assets/javascripts/plugins/*
 
diff --git a/.jsdoc b/.jsdoc
new file mode 100644
index 00000000000..06d1cf60830
--- /dev/null
+++ b/.jsdoc
@@ -0,0 +1,21 @@
+// jsdoc doesn't accept paths starting with _ (which is the case on github runners)
+// so we need to alter the default config
+{
+  "source": {
+    "excludePattern": ""
+  },
+  "templates": {
+    "default": {
+      "includeDate": false
+    }
+  },
+  "opts": {
+    "template": "./node_modules/tidy-jsdoc",
+    "prism-theme": "prism-custom",
+    "encoding": "utf8",
+    "recurse": true
+  },
+  "metadata": {
+    "title": "Discourse"
+  }
+}
diff --git a/.licensed.yml b/.licensed.yml
index 044e732fad2..75e581cdb55 100644
--- a/.licensed.yml
+++ b/.licensed.yml
@@ -51,6 +51,7 @@ reviewed:
     - net-imap # Ruby (bundled gem)
     - net-pop # Ruby (bundled gem)
     - net-smtp # Ruby (bundled gem)
+    - nio4r # MIT + BSD
     - omniauth # MIT
     - pg # Ruby
     - r2 # Apache-2.0 (Twitter)
diff --git a/.licensee.json b/.licensee.json
index 6fe0d279c89..93d376127f5 100644
--- a/.licensee.json
+++ b/.licensee.json
@@ -11,7 +11,9 @@
   "packages": {
     "@fortawesome/fontawesome-free": "*",
     "ember-template-lint-plugin-discourse": "*",
-    "squoosh": "2.0.0"
+    "spawn-command": "0.0.2",
+    "squoosh": "2.0.0",
+    "taffydb": "2.6.2"
   },
   "corrections": true
-}
\ No newline at end of file
+}
diff --git a/.prettierignore b/.prettierignore
index 93b35f929e2..c1caccc0683 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -3,6 +3,7 @@ plugins/**/assets/stylesheets/vendor/
 plugins/**/assets/javascripts/vendor/
 plugins/**/config/locales/**/*.yml
 plugins/**/config/*.yml
+documentation/
 package.json
 config/locales/**/*.yml
 !config/locales/**/*.en*.yml
diff --git a/.prettierrc b/.prettierrc
index 0967ef424bc..8a1423e9391 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -1 +1,17 @@
-{}
+{
+  "plugins": ["prettier-plugin-ember-template-tag"],
+  "overrides": [
+    {
+      "files": "*.gjs",
+      "options": {
+        "parser": "ember-template-tag"
+      }
+    },
+    {
+      "files": "*.gts",
+      "options": {
+        "parser": "ember-template-tag"
+      }
+    }
+  ]
+}
diff --git a/.rubocop.yml b/.rubocop.yml
index 4d4ad6d8d80..68abba36ad9 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -7,3 +7,7 @@ Discourse/NoAddReferenceOrAliasesActiveRecordMigration:
 
 Discourse/NoResetColumnInformationInMigrations:
   Enabled: true
+
+Lint/Debugger:
+  Exclude:
+    - script/**/*
diff --git a/.ruby-version.sample b/.ruby-version.sample
index ff365e06b95..e4604e3afd0 100644
--- a/.ruby-version.sample
+++ b/.ruby-version.sample
@@ -1 +1 @@
-3.1.3
+3.2.1
diff --git a/.template-lintrc.js b/.template-lintrc.js
index a5c4998a0ce..2c70a9c5068 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -5,6 +5,7 @@ module.exports = {
   rules: {
     "no-action-modifiers": true,
     "no-args-paths": true,
+    "no-array-prototype-extensions": false,
     "no-attrs-in-components": true,
     "no-capital-arguments": false, // TODO: we extensively use `args` argument name
     "no-curly-component-invocation": {
@@ -15,12 +16,15 @@ module.exports = {
         "directory-item-value",
         "directory-table-header-title",
         "loading-spinner",
-        "mobile-directory-item-label",
+        "directory-item-label",
       ],
     },
     "no-implicit-this": {
       allow: ["loading-spinner"],
     },
+    "no-obscure-array-access": false,
+    "require-mandatory-role-attributes": false,
+    "require-media-caption": false,
     // Begin prettier compatibility
     "eol-last": false,
     "self-closing-void-elements": false,
diff --git a/.vscode-sample/extensions.json b/.vscode-sample/extensions.json
new file mode 100644
index 00000000000..86c6cd8f91c
--- /dev/null
+++ b/.vscode-sample/extensions.json
@@ -0,0 +1,12 @@
+{
+  // See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
+  // Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
+
+  // List of extensions which should be recommended for users of this workspace.
+  "recommendations": [
+    "esbenp.prettier-vscode",
+    "typed-ember.glint-vscode",
+    "chiragpat.vscode-glimmer",
+    "dbaeumer.vscode-eslint"
+  ]
+}
diff --git a/.vscode-sample/settings.json b/.vscode-sample/settings.json
new file mode 100644
index 00000000000..5650eb57a33
--- /dev/null
+++ b/.vscode-sample/settings.json
@@ -0,0 +1,12 @@
+{
+  "[gjs]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[gts]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "eslint.validate": [
+    "glimmer-js",
+    "glimmer-ts"
+  ]
+}
diff --git a/Gemfile b/Gemfile
index f42b8d9cc3d..647aefea8ad 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,7 +18,7 @@ else
   # this allows us to include the bits of rails we use without pieces we do not.
   #
   # To issue a rails update bump the version number here
-  rails_version = "7.0.4.3"
+  rails_version = "7.0.5.1"
   gem "actionmailer", rails_version
   gem "actionpack", rails_version
   gem "actionview", rails_version
@@ -32,8 +32,8 @@ end
 gem "json"
 
 # TODO: At the moment Discourse does not work with Sprockets 4, we would need to correct internals
-# This is a desired upgrade we should get to.
-gem "sprockets", "3.7.2"
+# We intend to drop sprockets rather than upgrade to 4.x
+gem "sprockets", git: "https://github.com/rails/sprockets", branch: "3.x"
 
 # this will eventually be added to rails,
 # allows us to precompile all our templates in the unicorn master
@@ -41,7 +41,7 @@ gem "actionview_precompiler", require: false
 
 gem "discourse-seed-fu"
 
-gem "mail", git: "https://github.com/discourse/mail.git"
+gem "mail"
 gem "mini_mime"
 gem "mini_suffix"
 
@@ -71,8 +71,6 @@ gem "rails_multisite"
 
 gem "fast_xs", platform: :ruby
 
-gem "xorcist"
-
 gem "fastimage"
 
 gem "aws-sdk-s3", require: false
@@ -98,14 +96,13 @@ gem "omniauth-oauth2", require: false
 
 gem "omniauth-google-oauth2"
 
-# pending: https://github.com/ohler55/oj/issues/789
-gem "oj", "3.13.14"
+gem "oj"
 
 gem "pg"
 gem "mini_sql"
 gem "pry-rails", require: false
 gem "pry-byebug", require: false
-gem "r2", require: false
+gem "rtlcss", require: false
 gem "rake"
 
 gem "thor", require: false
@@ -147,6 +144,7 @@ group :test do
   gem "selenium-webdriver", require: false
   gem "test-prof"
   gem "webdrivers", require: false
+  gem "rails-dom-testing", require: false
 end
 
 group :test, :development do
@@ -160,7 +158,7 @@ group :test, :development do
 
   gem "rspec-rails"
 
-  gem "shoulda-matchers", require: false
+  gem "shoulda-matchers", require: false, github: "thoughtbot/shoulda-matchers"
   gem "rspec-html-matchers"
   gem "byebug", require: ENV["RM_INFO"].nil?, platform: :mri
   gem "rubocop-discourse", require: false
@@ -180,6 +178,7 @@ group :development do
   gem "better_errors", platform: :mri, require: !!ENV["BETTER_ERRORS"]
   gem "binding_of_caller"
   gem "yaml-lint"
+  gem "yard"
 end
 
 if ENV["ALLOW_DEV_POPULATE"] == "1"
@@ -229,10 +228,9 @@ gem "logstash-event", require: false
 gem "logstash-logger", require: false
 gem "logster"
 
-# NOTE: later versions of sassc are causing a segfault, possibly dependent on processer architecture
-# and until resolved should be locked at 2.0.1
-gem "sassc", "2.0.1", require: false
-gem "sassc-rails"
+# These are forks of sassc and sassc-rails with dart-sass support
+gem "dartsass-ruby"
+gem "dartsass-sprockets"
 
 gem "rotp", require: false
 
@@ -274,8 +272,7 @@ gem "faraday-retry"
 # https://github.com/ruby/net-imap/issues/16#issuecomment-803086765
 gem "net-http"
 
-# workaround for prometheus-client
-gem "webrick", require: false
-
 # Workaround until Ruby ships with cgi version 0.3.6 or higher.
 gem "cgi", ">= 0.3.6", require: false
+
+gem "tzinfo-data"
diff --git a/Gemfile.lock b/Gemfile.lock
index 1d24db2da52..60f09c27d00 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,32 +1,41 @@
 GIT
-  remote: https://github.com/discourse/mail.git
-  revision: 5b700fc95ee66378e0cf2559abc73c8bc3062a4b
+  remote: https://github.com/rails/sprockets
+  revision: f4d3dae71ef29c44b75a49cfbf8032cce07b423a
+  branch: 3.x
   specs:
-    mail (2.8.0.edge)
-      mini_mime (>= 0.1.1)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+
+GIT
+  remote: https://github.com/thoughtbot/shoulda-matchers.git
+  revision: 783a90554053002017510285bc736099b2749c22
+  specs:
+    shoulda-matchers (5.3.0)
+      activesupport (>= 5.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      actionview (= 7.0.4.3)
-      activejob (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    actionmailer (7.0.5.1)
+      actionpack (= 7.0.5.1)
+      actionview (= 7.0.5.1)
+      activejob (= 7.0.5.1)
+      activesupport (= 7.0.5.1)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.4.3)
-      actionview (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
-      rack (~> 2.0, >= 2.2.0)
+    actionpack (7.0.5.1)
+      actionview (= 7.0.5.1)
+      activesupport (= 7.0.5.1)
+      rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (7.0.4.3)
-      activesupport (= 7.0.4.3)
+    actionview (7.0.5.1)
+      activesupport (= 7.0.5.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -35,20 +44,20 @@ GEM
       actionview (>= 6.0.a)
     active_model_serializers (0.8.4)
       activemodel (>= 3.0)
-    activejob (7.0.4.3)
-      activesupport (= 7.0.4.3)
+    activejob (7.0.5.1)
+      activesupport (= 7.0.5.1)
       globalid (>= 0.3.6)
-    activemodel (7.0.4.3)
-      activesupport (= 7.0.4.3)
-    activerecord (7.0.4.3)
-      activemodel (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
-    activesupport (7.0.4.3)
+    activemodel (7.0.5.1)
+      activesupport (= 7.0.5.1)
+    activerecord (7.0.5.1)
+      activemodel (= 7.0.5.1)
+      activesupport (= 7.0.5.1)
+    activesupport (7.0.5.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.1)
+    addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
     annotate (3.2.0)
       activerecord (>= 3.2, < 8.0)
@@ -73,20 +82,20 @@ GEM
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.5.0)
       aws-eventstream (~> 1, >= 1.0.2)
-    better_errors (2.9.1)
-      coderay (>= 1.0.0)
+    better_errors (2.10.1)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
+      rouge (>= 1.0.0)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
-    bootsnap (1.15.0)
+    bootsnap (1.16.0)
       msgpack (~> 1.2)
     builder (3.2.4)
     bullet (7.0.7)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     byebug (11.1.3)
-    capybara (3.38.0)
+    capybara (3.39.2)
       addressable
       matrix
       mini_mime (>= 0.1.3)
@@ -101,8 +110,8 @@ GEM
     chunky_png (1.4.0)
     coderay (1.1.3)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.10)
-    connection_pool (2.3.0)
+    concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
     cose (1.3.0)
       cbor (~> 0.5.9)
       openssl-signature_algorithm (~> 1.0)
@@ -110,8 +119,17 @@ GEM
     crack (0.4.5)
       rexml
     crass (1.0.6)
-    css_parser (1.13.0)
+    css_parser (1.14.0)
       addressable
+    dartsass-ruby (3.0.1)
+      sass-embedded (~> 1.54)
+    dartsass-sprockets (3.0.0)
+      dartsass-ruby (~> 3.0)
+      railties (>= 4.0.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
+    date (3.3.3)
     debug_inspector (1.1.0)
     diff-lcs (1.5.0)
     diffy (3.4.2)
@@ -124,31 +142,34 @@ GEM
       faker (~> 2.16)
       literate_randomizer
     docile (1.4.0)
-    ecma-re-validator (0.4.0)
-      regexp_parser (~> 2.2)
     email_reply_trimmer (0.1.13)
-    erubi (1.11.0)
-    excon (0.96.0)
+    erubi (1.12.0)
+    excon (0.100.0)
     execjs (2.8.1)
-    exifr (1.3.10)
+    exifr (1.4.0)
     fabrication (2.30.0)
     faker (2.23.0)
       i18n (>= 1.8.11, < 2)
     fakeweb (1.3.0)
-    faraday (2.7.2)
+    faraday (2.7.10)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    faraday-retry (2.0.0)
+    faraday-retry (2.2.0)
       faraday (~> 2.0)
     fast_blank (1.0.1)
     fast_xs (0.8.0)
-    fastimage (2.2.6)
+    fastimage (2.2.7)
     ffi (1.15.5)
     fspath (3.1.2)
     gc_tracer (1.5.1)
-    globalid (1.0.1)
+    globalid (1.1.0)
       activesupport (>= 5.0)
+    google-protobuf (3.23.4)
+    google-protobuf (3.23.4-aarch64-linux)
+    google-protobuf (3.23.4-arm64-darwin)
+    google-protobuf (3.23.4-x86_64-darwin)
+    google-protobuf (3.23.4-x86_64-linux)
     guess_html_encoding (0.0.11)
     hana (1.3.7)
     hashdiff (1.0.1)
@@ -157,38 +178,37 @@ GEM
     hkdf (1.0.0)
     htmlentities (4.3.4)
     http_accept_language (2.1.1)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    image_optim (0.31.2)
+    image_optim (0.31.3)
       exifr (~> 1.2, >= 1.2.2)
       fspath (~> 3.0)
       image_size (>= 1.5, < 4)
       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)
-    image_size (3.2.0)
+    image_size (3.3.0)
     in_threads (1.6.0)
     jmespath (1.6.2)
     json (2.6.3)
     json-schema (3.0.0)
       addressable (>= 2.8)
-    json_schemer (0.2.23)
-      ecma-re-validator (~> 0.3)
+    json_schemer (1.0.3)
       hana (~> 1.3)
       regexp_parser (~> 2.0)
-      uri_template (~> 0.7)
-    jwt (2.6.0)
+      simpleidn (~> 0.2)
+    jwt (2.7.1)
     kgio (2.11.4)
-    libv8-node (16.10.0.0)
-    libv8-node (16.10.0.0-aarch64-linux)
-    libv8-node (16.10.0.0-arm64-darwin)
-    libv8-node (16.10.0.0-x86_64-darwin)
-    libv8-node (16.10.0.0-x86_64-darwin-19)
-    libv8-node (16.10.0.0-x86_64-linux)
+    language_server-protocol (3.17.0.3)
+    libv8-node (18.16.0.0)
+    libv8-node (18.16.0.0-aarch64-linux)
+    libv8-node (18.16.0.0-arm64-darwin)
+    libv8-node (18.16.0.0-x86_64-darwin)
+    libv8-node (18.16.0.0-x86_64-linux)
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     literate_randomizer (0.4.0)
-    lograge (0.12.0)
+    lograge (0.13.0)
       actionpack (>= 4)
       activesupport (>= 4)
       railties (>= 4)
@@ -196,37 +216,43 @@ GEM
     logstash-event (1.2.02)
     logstash-logger (0.26.1)
       logstash-event (~> 1.2)
-    logster (2.11.3)
-    loofah (2.19.1)
+    logster (2.12.2)
+    loofah (2.21.3)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
+      nokogiri (>= 1.12.0)
     lru_redux (1.1.0)
     lz4-ruby (0.3.3)
+    mail (2.8.1)
+      mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
     matrix (0.4.2)
     maxminddb (0.1.22)
     memory_profiler (1.0.1)
-    message_bus (4.3.1)
+    message_bus (4.3.7)
       rack (>= 1.1.3)
     method_source (1.0.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.1)
-    mini_racer (0.6.3)
-      libv8-node (~> 16.10.0.0)
-    mini_scheduler (0.15.0)
+    mini_portile2 (2.8.4)
+    mini_racer (0.8.0)
+      libv8-node (~> 18.16.0.0)
+    mini_scheduler (0.16.0)
       sidekiq (>= 4.2.3, < 7.0)
     mini_sql (1.4.0)
     mini_suffix (0.3.3)
       ffi (~> 1.9)
-    minitest (5.17.0)
-    mocha (2.0.2)
+    minitest (5.19.0)
+    mocha (2.1.0)
       ruby2_keywords (>= 0.0.5)
-    msgpack (1.6.0)
+    msgpack (1.7.2)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     mustache (1.1.1)
     net-http (0.3.2)
       uri
-    net-imap (0.3.1)
+    net-imap (0.3.7)
+      date
       net-protocol
     net-pop (0.1.2)
       net-protocol
@@ -234,17 +260,17 @@ GEM
       timeout
     net-smtp (0.3.3)
       net-protocol
-    nio4r (2.5.8)
-    nokogiri (1.14.2)
-      mini_portile2 (~> 2.8.0)
+    nio4r (2.5.9)
+    nokogiri (1.15.3)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.14.2-aarch64-linux)
+    nokogiri (1.15.3-aarch64-linux)
       racc (~> 1.4)
-    nokogiri (1.14.2-arm64-darwin)
+    nokogiri (1.15.3-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.14.2-x86_64-darwin)
+    nokogiri (1.15.3-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.14.2-x86_64-linux)
+    nokogiri (1.15.3-x86_64-linux)
       racc (~> 1.4)
     oauth (1.1.0)
       oauth-tty (~> 1.0, >= 1.0.1)
@@ -258,7 +284,7 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 4)
-    oj (3.13.14)
+    oj (3.15.1)
     omniauth (1.9.2)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
@@ -281,17 +307,18 @@ GEM
     omniauth-twitter (1.4.0)
       omniauth-oauth (~> 1.1)
       rack
-    openssl (3.0.2)
-    openssl-signature_algorithm (1.2.1)
-      openssl (> 2.0, < 3.1)
-    optimist (3.0.1)
-    parallel (1.22.1)
-    parallel_tests (4.0.0)
+    openssl (3.1.0)
+    openssl-signature_algorithm (1.3.0)
+      openssl (> 2.0)
+    optimist (3.1.0)
+    parallel (1.23.0)
+    parallel_tests (4.2.1)
       parallel
-    parser (3.2.0.0)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
-    pg (1.4.5)
-    prettier_print (1.2.0)
+      racc
+    pg (1.4.6)
+    prettier_print (1.2.1)
     progress (3.6.0)
     pry (0.14.2)
       coderay (~> 1.1)
@@ -301,39 +328,40 @@ GEM
       pry (>= 0.13, < 0.15)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
-    public_suffix (5.0.1)
-    puma (6.0.2)
+    public_suffix (5.0.3)
+    puma (6.3.0)
       nio4r (~> 2.0)
-    r2 (0.2.7)
-    racc (1.6.2)
-    rack (2.2.5)
-    rack-mini-profiler (3.0.0)
+    racc (1.7.1)
+    rack (2.2.8)
+    rack-mini-profiler (3.1.0)
       rack (>= 1.2.0)
-    rack-protection (3.0.5)
+    rack-protection (3.0.6)
       rack
-    rack-test (2.0.2)
+    rack-test (2.1.0)
       rack (>= 1.3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    rails-dom-testing (2.1.1)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.5.0)
-      loofah (~> 2.19, >= 2.19.1)
-    rails_failover (0.8.1)
-      activerecord (> 6.0, < 7.1)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    rails_failover (2.0.1)
+      activerecord (>= 6.1, <= 7.1)
       concurrent-ruby
-      railties (> 6.0, < 7.1)
-    rails_multisite (4.0.1)
-      activerecord (> 5.0, < 7.1)
-      railties (> 5.0, < 7.1)
-    railties (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+      railties (>= 6.1, <= 7.1)
+    rails_multisite (5.0.0)
+      activerecord (>= 6.0)
+      railties (>= 6.0)
+    railties (7.0.5.1)
+      actionpack (= 7.0.5.1)
+      activesupport (= 7.0.5.1)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
       zeitwerk (~> 2.5)
     rainbow (3.1.1)
-    raindrops (0.20.0)
+    raindrops (0.20.1)
     rake (13.0.6)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
@@ -343,16 +371,17 @@ GEM
       msgpack (>= 0.4.3)
       optimist (>= 3.0.0)
     rchardet (1.8.0)
-    redis (4.8.0)
-    redis-namespace (1.9.0)
+    redis (4.8.1)
+    redis-namespace (1.11.0)
       redis (>= 4)
-    regexp_parser (2.6.1)
+    regexp_parser (2.8.1)
     request_store (1.5.1)
       rack (>= 1.4)
-    rexml (3.2.5)
+    rexml (3.2.6)
     rinku (2.0.6)
     rotp (6.2.2)
-    rqrcode (2.1.2)
+    rouge (4.1.3)
+    rqrcode (2.2.0)
       chunky_png (~> 1.0)
       rqrcode_core (~> 1.0)
     rqrcode_core (1.2.0)
@@ -360,76 +389,85 @@ GEM
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-html-matchers (0.10.0)
       nokogiri (~> 1)
       rspec (>= 3.0.0.a)
-    rspec-mocks (3.12.2)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-rails (6.0.1)
+    rspec-rails (6.0.3)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
-      rspec-core (~> 3.11)
-      rspec-expectations (~> 3.11)
-      rspec-mocks (~> 3.11)
-      rspec-support (~> 3.11)
-    rspec-support (3.12.0)
+      rspec-core (~> 3.12)
+      rspec-expectations (~> 3.12)
+      rspec-mocks (~> 3.12)
+      rspec-support (~> 3.12)
+    rspec-support (3.12.1)
     rss (0.2.9)
       rexml
-    rswag-specs (2.8.0)
+    rswag-specs (2.10.1)
       activesupport (>= 3.1, < 7.1)
       json-schema (>= 2.2, < 4.0)
       railties (>= 3.1, < 7.1)
       rspec-core (>= 2.14)
-    rubocop (1.43.0)
+    rtlcss (0.2.1)
+      mini_racer (>= 0.6.3)
+    rubocop (1.55.1)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.2.2.3)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.24.1, < 2.0)
+      rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.24.1)
-      parser (>= 3.1.1.0)
-    rubocop-discourse (3.0.3)
+    rubocop-ast (1.29.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.18.0)
+      rubocop (~> 1.41)
+    rubocop-discourse (3.3.0)
       rubocop (>= 1.1.0)
       rubocop-rspec (>= 2.0.0)
-    rubocop-rspec (2.16.0)
+    rubocop-factory_bot (2.23.1)
       rubocop (~> 1.33)
-    ruby-prof (1.4.5)
-    ruby-progressbar (1.11.0)
+    rubocop-rspec (2.23.0)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
+    ruby-prof (1.6.3)
+    ruby-progressbar (1.13.0)
     ruby-readability (0.7.0)
       guess_html_encoding (>= 0.0.4)
       nokogiri (>= 1.6.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
-    sanitize (6.0.0)
+    sanitize (6.0.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    sassc (2.0.1)
-      ffi (~> 1.9)
-      rake
-    sassc-rails (2.1.2)
-      railties (>= 4.0.0)
-      sassc (>= 2.0)
-      sprockets (> 3.0)
-      sprockets-rails
-      tilt
-    selenium-webdriver (4.7.1)
+    sass-embedded (1.64.1)
+      google-protobuf (~> 3.23)
+      rake (>= 13.0.0)
+    sass-embedded (1.64.1-aarch64-linux-gnu)
+      google-protobuf (~> 3.23)
+    sass-embedded (1.64.1-arm64-darwin)
+      google-protobuf (~> 3.23)
+    sass-embedded (1.64.1-x86_64-darwin)
+      google-protobuf (~> 3.23)
+    sass-embedded (1.64.1-x86_64-linux-gnu)
+      google-protobuf (~> 3.23)
+    selenium-webdriver (4.10.0)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
-    shoulda-matchers (5.3.0)
-      activesupport (>= 5.2.0)
-    sidekiq (6.5.8)
+    sidekiq (6.5.9)
       connection_pool (>= 2.2.5, < 3)
       rack (~> 2.0)
       redis (>= 4.5.0, < 5)
@@ -439,27 +477,28 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
+    simpleidn (0.2.1)
+      unf (~> 0.1.4)
     snaky_hash (2.0.1)
       hashie
       version_gem (~> 1.1, >= 1.1.1)
-    sprockets (3.7.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
     sprockets-rails (3.4.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     sshkey (2.0.0)
-    stackprof (0.2.23)
-    syntax_tree (5.2.0)
+    stackprof (0.2.25)
+    syntax_tree (6.1.1)
       prettier_print (>= 1.2.0)
     syntax_tree-disable_ternary (1.0.0)
-    test-prof (1.1.0)
-    thor (1.2.1)
-    tilt (2.0.11)
-    timeout (0.3.1)
-    tzinfo (2.0.5)
+    test-prof (1.2.2)
+    thor (1.2.2)
+    tilt (2.2.0)
+    timeout (0.4.0)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
+    tzinfo-data (1.2023.3)
+      tzinfo (>= 1.0.0)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unf (0.1.4)
@@ -471,27 +510,25 @@ GEM
       raindrops (~> 0.7)
     uniform_notifier (1.16.0)
     uri (0.12.2)
-    uri_template (0.7.0)
-    version_gem (1.1.1)
+    version_gem (1.1.3)
     web-push (3.0.0)
       hkdf (~> 1.0)
       jwt (~> 2.0)
       openssl (~> 3.0)
-    webdrivers (5.2.0)
+    webdrivers (5.3.1)
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
-      selenium-webdriver (~> 4.0)
+      selenium-webdriver (~> 4.0, < 4.11)
     webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webrick (1.7.0)
     websocket (1.2.9)
-    xorcist (1.1.3)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    yaml-lint (0.0.10)
-    zeitwerk (2.6.6)
+    yaml-lint (0.1.2)
+    yard (0.9.34)
+    zeitwerk (2.6.10)
 
 PLATFORMS
   aarch64-linux
@@ -503,14 +540,14 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  actionmailer (= 7.0.4.3)
-  actionpack (= 7.0.4.3)
-  actionview (= 7.0.4.3)
+  actionmailer (= 7.0.5.1)
+  actionpack (= 7.0.5.1)
+  actionview (= 7.0.5.1)
   actionview_precompiler
   active_model_serializers (~> 0.8.3)
-  activemodel (= 7.0.4.3)
-  activerecord (= 7.0.4.3)
-  activesupport (= 7.0.4.3)
+  activemodel (= 7.0.5.1)
+  activerecord (= 7.0.5.1)
+  activesupport (= 7.0.5.1)
   addressable
   annotate
   aws-sdk-s3
@@ -528,6 +565,8 @@ DEPENDENCIES
   cose
   cppjieba_rb
   css_parser
+  dartsass-ruby
+  dartsass-sprockets
   diffy
   digest
   discourse-fonts
@@ -559,7 +598,7 @@ DEPENDENCIES
   loofah
   lru_redux
   lz4-ruby
-  mail!
+  mail
   maxminddb
   memory_profiler
   message_bus
@@ -577,7 +616,7 @@ DEPENDENCIES
   net-pop
   net-smtp
   nokogiri
-  oj (= 3.13.14)
+  oj
   omniauth
   omniauth-facebook
   omniauth-github
@@ -589,13 +628,13 @@ DEPENDENCIES
   pry-byebug
   pry-rails
   puma
-  r2
   rack
   rack-mini-profiler
   rack-protection
+  rails-dom-testing
   rails_failover
   rails_multisite
-  railties (= 7.0.4.3)
+  railties (= 7.0.5.1)
   rake
   rb-fsevent
   rbtrace
@@ -610,18 +649,17 @@ DEPENDENCIES
   rspec-rails
   rss
   rswag-specs
+  rtlcss
   rubocop-discourse
   ruby-prof
   ruby-readability
   rubyzip
   sanitize
-  sassc (= 2.0.1)
-  sassc-rails
   selenium-webdriver
-  shoulda-matchers
+  shoulda-matchers!
   sidekiq
   simplecov
-  sprockets (= 3.7.2)
+  sprockets!
   sprockets-rails
   sshkey
   stackprof
@@ -629,15 +667,15 @@ DEPENDENCIES
   syntax_tree-disable_ternary
   test-prof
   thor
+  tzinfo-data
   uglifier
   unf
   unicorn
   web-push
   webdrivers
   webmock
-  webrick
-  xorcist
   yaml-lint
+  yard
 
 BUNDLED WITH
-   2.4.1
+   2.4.13
diff --git a/README.md b/README.md
index 4673f84cc3f..42452e4f87c 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ To get your environment setup, follow the community setup guide for your operati
 
 If you're familiar with how Rails works and are comfortable setting up your own environment, you can also try out the [**Discourse Advanced Developer Guide**](docs/DEVELOPER-ADVANCED.md), which is aimed primarily at Ubuntu and macOS environments.
 
-Before you get started, ensure you have the following minimum versions: [Ruby 2.7+](https://www.ruby-lang.org/en/downloads/), [PostgreSQL 13+](https://www.postgresql.org/download/), [Redis 6.2+](https://redis.io/download). If you're having trouble, please see our [**TROUBLESHOOTING GUIDE**](docs/TROUBLESHOOTING.md) first!
+Before you get started, ensure you have the following minimum versions: [Ruby 3.2+](https://www.ruby-lang.org/en/downloads/), [PostgreSQL 13](https://www.postgresql.org/download/), [Redis 7](https://redis.io/download). If you're having trouble, please see our [**TROUBLESHOOTING GUIDE**](docs/TROUBLESHOOTING.md) first!
 
 ## Setting up Discourse
 
@@ -51,7 +51,7 @@ Discourse supports the **latest, stable releases** of all major browsers and pla
 | Microsoft Edge        |              |              |
 | Mozilla Firefox       |              |              |
 
-Additionally, we aim to support Safari on iOS 12.5+ until January 2023 (Discourse 3.0).
+Additionally, we aim to support Safari on iOS 15.7+.
 
 ## Built With
 
diff --git a/app/assets/javascripts/.licensee.json b/app/assets/javascripts/.licensee.json
index b3518d7a131..ae2abbd2b64 100644
--- a/app/assets/javascripts/.licensee.json
+++ b/app/assets/javascripts/.licensee.json
@@ -10,15 +10,16 @@
     ]
   },
   "packages": {
+    "cli-table": "0.3.11",
     "component-bind": "1.0.0",
     "component-inherit": "0.0.3",
     "duplex": "1.0.0",
     "glob": "3.1.21",
     "indexof": "0.0.1",
     "inherits": "1.0.2",
-    "jsonify": "0.0.0",
-    "messageformat": "0.1.5",
+    "jsonify": "0.0.1",
     "line-stream": "0.0.0",
+    "messageformat": "0.1.5",
     "regenerator-transform": "0.10.1",
     "source-map": "0.1.43",
     "sourcemap-validator": "1.1.1"
diff --git a/app/assets/javascripts/admin/addon/adapters/api-key.js b/app/assets/javascripts/admin/addon/adapters/api-key.js
index 860e4c50692..6e1ad0eb327 100644
--- a/app/assets/javascripts/admin/addon/adapters/api-key.js
+++ b/app/assets/javascripts/admin/addon/adapters/api-key.js
@@ -1,13 +1,13 @@
-import RESTAdapter from "discourse/adapters/rest";
+import RestAdapter from "discourse/adapters/rest";
 
-export default RESTAdapter.extend({
-  jsonMode: true,
+export default class ApiKey extends RestAdapter {
+  jsonMode = true;
 
   basePath() {
     return "/admin/api/";
-  },
+  }
 
   apiNameFor() {
     return "key";
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/adapters/build-plugin.js b/app/assets/javascripts/admin/addon/adapters/build-plugin.js
index 3a81ab4e573..98b875ba94b 100644
--- a/app/assets/javascripts/admin/addon/adapters/build-plugin.js
+++ b/app/assets/javascripts/admin/addon/adapters/build-plugin.js
@@ -1,11 +1,11 @@
 import RestAdapter from "discourse/adapters/rest";
 
 export default function buildPluginAdapter(pluginName) {
-  return RestAdapter.extend({
+  return class extends RestAdapter {
     pathFor(store, type, findArgs) {
       return (
-        "/admin/plugins/" + pluginName + this._super(store, type, findArgs)
+        "/admin/plugins/" + pluginName + super.pathFor(store, type, findArgs)
       );
-    },
-  });
+    }
+  };
 }
diff --git a/app/assets/javascripts/admin/addon/adapters/customization-base.js b/app/assets/javascripts/admin/addon/adapters/customization-base.js
index 272103ee8a8..d20f15d1dca 100644
--- a/app/assets/javascripts/admin/addon/adapters/customization-base.js
+++ b/app/assets/javascripts/admin/addon/adapters/customization-base.js
@@ -1,7 +1,7 @@
 import RestAdapter from "discourse/adapters/rest";
 
-export default RestAdapter.extend({
+export default class CustomizationBase extends RestAdapter {
   basePath() {
     return "/admin/customize/";
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/adapters/email-style.js b/app/assets/javascripts/admin/addon/adapters/email-style.js
index 12919f04b0d..e4465ef56eb 100644
--- a/app/assets/javascripts/admin/addon/adapters/email-style.js
+++ b/app/assets/javascripts/admin/addon/adapters/email-style.js
@@ -1,7 +1,7 @@
 import RestAdapter from "discourse/adapters/rest";
 
-export default RestAdapter.extend({
+export default class EmailStyle extends RestAdapter {
   pathFor() {
     return "/admin/customize/email_style";
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/adapters/embedding.js b/app/assets/javascripts/admin/addon/adapters/embedding.js
index ba3fb816b80..966098fd4d1 100644
--- a/app/assets/javascripts/admin/addon/adapters/embedding.js
+++ b/app/assets/javascripts/admin/addon/adapters/embedding.js
@@ -1,7 +1,7 @@
 import RestAdapter from "discourse/adapters/rest";
 
-export default RestAdapter.extend({
+export default class Embedding extends RestAdapter {
   pathFor() {
     return "/admin/customize/embedding";
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/adapters/staff-action-log.js b/app/assets/javascripts/admin/addon/adapters/staff-action-log.js
index d281f9746be..9a9d1d6c0b4 100644
--- a/app/assets/javascripts/admin/addon/adapters/staff-action-log.js
+++ b/app/assets/javascripts/admin/addon/adapters/staff-action-log.js
@@ -1,7 +1,7 @@
 import RestAdapter from "discourse/adapters/rest";
 
-export default RestAdapter.extend({
+export default class StaffActionLog extends RestAdapter {
   basePath() {
     return "/admin/logs/";
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/adapters/tag-group.js b/app/assets/javascripts/admin/addon/adapters/tag-group.js
index 4c12654d967..4caa9172b92 100644
--- a/app/assets/javascripts/admin/addon/adapters/tag-group.js
+++ b/app/assets/javascripts/admin/addon/adapters/tag-group.js
@@ -1,5 +1,5 @@
 import RestAdapter from "discourse/adapters/rest";
 
-export default RestAdapter.extend({
-  jsonMode: true,
-});
+export default class TagGroup extends RestAdapter {
+  jsonMode = true;
+}
diff --git a/app/assets/javascripts/admin/addon/adapters/theme.js b/app/assets/javascripts/admin/addon/adapters/theme.js
index cf34ab42f5f..66f901b2cdb 100644
--- a/app/assets/javascripts/admin/addon/adapters/theme.js
+++ b/app/assets/javascripts/admin/addon/adapters/theme.js
@@ -1,9 +1,10 @@
 import RestAdapter from "discourse/adapters/rest";
 
-export default RestAdapter.extend({
+export default class Theme extends RestAdapter {
+  jsonMode = true;
   basePath() {
     return "/admin/";
-  },
+  }
 
   afterFindAll(results) {
     let map = {};
@@ -20,7 +21,5 @@ export default RestAdapter.extend({
       theme.set("parentThemes", mappedParents);
     });
     return results;
-  },
-
-  jsonMode: true,
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/adapters/web-hook-event.js b/app/assets/javascripts/admin/addon/adapters/web-hook-event.js
index 1acd38386ba..8a6fa2b082d 100644
--- a/app/assets/javascripts/admin/addon/adapters/web-hook-event.js
+++ b/app/assets/javascripts/admin/addon/adapters/web-hook-event.js
@@ -1,7 +1,7 @@
-import RESTAdapter from "discourse/adapters/rest";
+import RestAdapter from "discourse/adapters/rest";
 
-export default RESTAdapter.extend({
+export default class WebHookEvent extends RestAdapter {
   basePath() {
     return "/admin/api/";
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/adapters/web-hook.js b/app/assets/javascripts/admin/addon/adapters/web-hook.js
index 1acd38386ba..813f7dbf03b 100644
--- a/app/assets/javascripts/admin/addon/adapters/web-hook.js
+++ b/app/assets/javascripts/admin/addon/adapters/web-hook.js
@@ -1,7 +1,7 @@
-import RESTAdapter from "discourse/adapters/rest";
+import RestAdapter from "discourse/adapters/rest";
 
-export default RESTAdapter.extend({
+export default class WebHook extends RestAdapter {
   basePath() {
     return "/admin/api/";
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/ace-editor.hbs b/app/assets/javascripts/admin/addon/components/ace-editor.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/ace-editor.hbs
rename to app/assets/javascripts/admin/addon/components/ace-editor.hbs
diff --git a/app/assets/javascripts/admin/addon/components/ace-editor.js b/app/assets/javascripts/admin/addon/components/ace-editor.js
index 06ed3763031..84aa4351e15 100644
--- a/app/assets/javascripts/admin/addon/components/ace-editor.js
+++ b/app/assets/javascripts/admin/addon/components/ace-editor.js
@@ -1,31 +1,33 @@
+import { action } from "@ember/object";
+import { classNames } from "@ember-decorators/component";
+import { observes, on } from "@ember-decorators/object";
 import Component from "@ember/component";
 import getURL from "discourse-common/lib/get-url";
 import loadScript from "discourse/lib/load-script";
 import I18n from "I18n";
-import { bind, observes } from "discourse-common/utils/decorators";
-import { on } from "@ember/object/evented";
+import { bind } from "discourse-common/utils/decorators";
 
 const COLOR_VARS_REGEX =
   /\$(primary|secondary|tertiary|quaternary|header_background|header_primary|highlight|danger|success|love)(\s|;|-(low|medium|high))/g;
 
-export default Component.extend({
-  mode: "css",
-  classNames: ["ace-wrapper"],
-  _editor: null,
-  _skipContentChangeEvent: null,
-  disabled: false,
-  htmlPlaceholder: false,
+@classNames("ace-wrapper")
+export default class AceEditor extends Component {
+  mode = "css";
+  disabled = false;
+  htmlPlaceholder = false;
+  _editor = null;
+  _skipContentChangeEvent = null;
 
   @observes("editorId")
   editorIdChanged() {
     if (this.autofocus) {
       this.send("focus");
     }
-  },
+  }
 
   didRender() {
     this._skipContentChangeEvent = false;
-  },
+  }
 
   @observes("content")
   contentChanged() {
@@ -33,14 +35,14 @@ export default Component.extend({
     if (this._editor && !this._skipContentChangeEvent) {
       this._editor.getSession().setValue(content);
     }
-  },
+  }
 
   @observes("mode")
   modeChanged() {
     if (this._editor && !this._skipContentChangeEvent) {
       this._editor.getSession().setMode("ace/mode/" + this.mode);
     }
-  },
+  }
 
   @observes("placeholder")
   placeholderChanged() {
@@ -49,12 +51,12 @@ export default Component.extend({
         placeholder: this.placeholder,
       });
     }
-  },
+  }
 
   @observes("disabled")
   disabledStateChanged() {
     this.changeDisabledState();
-  },
+  }
 
   changeDisabledState() {
     const editor = this._editor;
@@ -67,9 +69,10 @@ export default Component.extend({
       });
       editor.container.parentNode.setAttribute("data-disabled", disabled);
     }
-  },
+  }
 
-  _destroyEditor: on("willDestroyElement", function () {
+  @on("willDestroyElement")
+  _destroyEditor() {
     if (this._editor) {
       this._editor.destroy();
       this._editor = null;
@@ -80,16 +83,16 @@ export default Component.extend({
     }
 
     $(window).off("ace:resize");
-  }),
+  }
 
   resize() {
     if (this._editor) {
       this._editor.resize();
     }
-  },
+  }
 
   didInsertElement() {
-    this._super(...arguments);
+    super.didInsertElement(...arguments);
     loadScript("/javascripts/ace/ace.js").then(() => {
       window.ace.require(["ace/ace"], (loadedAce) => {
         loadedAce.config.set("loadWorkerFromBlob", false);
@@ -153,13 +156,13 @@ export default Component.extend({
         this._darkModeListener.addListener(this.setAceTheme);
       });
     });
-  },
+  }
 
   willDestroyElement() {
     if (this._darkModeListener) {
       this._darkModeListener.removeListener(this.setAceTheme);
     }
-  },
+  }
 
   @bind
   setAceTheme() {
@@ -170,7 +173,7 @@ export default Component.extend({
     this._editor.setTheme(
       `ace/theme/${schemeType === "dark" ? "chaos" : "chrome"}`
     );
-  },
+  }
 
   warnSCSSDeprecations() {
     if (
@@ -197,21 +200,20 @@ export default Component.extend({
 
     this._editor.getSession().setAnnotations(warnings);
 
-    this.setWarning(
+    this.setWarning?.(
       warnings.length
         ? I18n.t("admin.customize.theme.scss_color_variables_warning")
         : false
     );
-  },
+  }
 
-  actions: {
-    focus() {
-      if (this._editor) {
-        this._editor.focus();
-        this._editor.navigateFileEnd();
-      }
-    },
-  },
+  @action
+  focus() {
+    if (this._editor) {
+      this._editor.focus();
+      this._editor.navigateFileEnd();
+    }
+  }
 
   _overridePlaceholder(loadedAce) {
     const originalPlaceholderSetter =
@@ -239,5 +241,5 @@ export default Component.extend({
 
       this.$updatePlaceholder();
     };
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-backups-logs.hbs b/app/assets/javascripts/admin/addon/components/admin-backups-logs.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/admin-backups-logs.hbs
rename to app/assets/javascripts/admin/addon/components/admin-backups-logs.hbs
diff --git a/app/assets/javascripts/admin/addon/components/admin-backups-logs.js b/app/assets/javascripts/admin/addon/components/admin-backups-logs.js
index c707c99b70a..e1c12d04a32 100644
--- a/app/assets/javascripts/admin/addon/components/admin-backups-logs.js
+++ b/app/assets/javascripts/admin/addon/components/admin-backups-logs.js
@@ -1,28 +1,26 @@
-import { observes, on } from "discourse-common/utils/decorators";
+import { classNames } from "@ember-decorators/component";
+import { observes, on } from "@ember-decorators/object";
 import Component from "@ember/component";
 import I18n from "I18n";
 import discourseDebounce from "discourse-common/lib/debounce";
 import { scheduleOnce } from "@ember/runloop";
 
-export default Component.extend({
-  classNames: ["admin-backups-logs"],
-  showLoadingSpinner: false,
-  hasFormattedLogs: false,
-  noLogsMessage: I18n.t("admin.backups.logs.none"),
-
-  init() {
-    this._super(...arguments);
-    this._reset();
-  },
+@classNames("admin-backups-logs")
+export default class AdminBackupsLogs extends Component {
+  showLoadingSpinner = false;
+  hasFormattedLogs = false;
+  noLogsMessage = I18n.t("admin.backups.logs.none");
+  formattedLogs = "";
+  index = 0;
 
   _reset() {
     this.setProperties({ formattedLogs: "", index: 0 });
-  },
+  }
 
   _scrollDown() {
     const div = this.element;
     div.scrollTop = div.scrollHeight;
-  },
+  }
 
   @on("init")
   @observes("logs.[]")
@@ -31,7 +29,7 @@ export default Component.extend({
       this._reset(); // reset the cached logs whenever the model is reset
       this.renderLogs();
     }
-  },
+  }
 
   _updateFormattedLogsFunc() {
     const logs = this.logs;
@@ -55,13 +53,13 @@ export default Component.extend({
     this.renderLogs();
 
     scheduleOnce("afterRender", this, this._scrollDown);
-  },
+  }
 
   @on("init")
   @observes("logs.[]")
   _updateFormattedLogs() {
     discourseDebounce(this, this._updateFormattedLogsFunc, 150);
-  },
+  }
 
   renderLogs() {
     const formattedLogs = this.formattedLogs;
@@ -76,5 +74,5 @@ export default Component.extend({
     } else {
       this.set("showLoadingSpinner", false);
     }
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-editable-field.hbs b/app/assets/javascripts/admin/addon/components/admin-editable-field.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/admin-editable-field.hbs
rename to app/assets/javascripts/admin/addon/components/admin-editable-field.hbs
diff --git a/app/assets/javascripts/admin/addon/components/admin-editable-field.js b/app/assets/javascripts/admin/addon/components/admin-editable-field.js
index 892a3208e86..a99265b20cb 100644
--- a/app/assets/javascripts/admin/addon/components/admin-editable-field.js
+++ b/app/assets/javascripts/admin/addon/components/admin-editable-field.js
@@ -1,28 +1,22 @@
+import { tagName } from "@ember-decorators/component";
 import Component from "@ember/component";
 import { action } from "@ember/object";
 
-export default Component.extend({
-  tagName: "",
-
-  buffer: "",
-  editing: false,
-
-  init() {
-    this._super(...arguments);
-    this.set("editing", false);
-  },
+@tagName("")
+export default class AdminEditableField extends Component {
+  buffer = "";
+  editing = false;
 
   @action
   edit(event) {
     event?.preventDefault();
     this.set("buffer", this.value);
     this.toggleProperty("editing");
-  },
+  }
 
-  actions: {
-    save() {
-      // Action has to toggle 'editing' property.
-      this.action(this.buffer);
-    },
-  },
-});
+  @action
+  save() {
+    // Action has to toggle 'editing' property.
+    this.action(this.buffer);
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-form-row.hbs b/app/assets/javascripts/admin/addon/components/admin-form-row.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/admin-form-row.hbs
rename to app/assets/javascripts/admin/addon/components/admin-form-row.hbs
diff --git a/app/assets/javascripts/admin/addon/components/admin-form-row.js b/app/assets/javascripts/admin/addon/components/admin-form-row.js
index 6217c6b913f..266301263d4 100644
--- a/app/assets/javascripts/admin/addon/components/admin-form-row.js
+++ b/app/assets/javascripts/admin/addon/components/admin-form-row.js
@@ -1,4 +1,5 @@
+import { classNames } from "@ember-decorators/component";
 import Component from "@ember/component";
-export default Component.extend({
-  classNames: ["row"],
-});
+
+@classNames("row")
+export default class AdminFormRow extends Component {}
diff --git a/app/assets/javascripts/admin/addon/components/admin-graph.js b/app/assets/javascripts/admin/addon/components/admin-graph.js
index 1107abeb2ca..4ef05fca32e 100644
--- a/app/assets/javascripts/admin/addon/components/admin-graph.js
+++ b/app/assets/javascripts/admin/addon/components/admin-graph.js
@@ -1,9 +1,10 @@
+import { tagName } from "@ember-decorators/component";
 import Component from "@ember/component";
 import loadScript from "discourse/lib/load-script";
 
-export default Component.extend({
-  tagName: "canvas",
-  type: "line",
+@tagName("canvas")
+export default class AdminGraph extends Component {
+  type = "line";
 
   refreshChart() {
     const ctx = this.element.getContext("2d");
@@ -49,11 +50,11 @@ export default Component.extend({
     };
 
     this._chart = new window.Chart(ctx, config);
-  },
+  }
 
   didInsertElement() {
     loadScript("/javascripts/Chart.min.js").then(() =>
       this.refreshChart.apply(this)
     );
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/components/admin-nav.gjs b/app/assets/javascripts/admin/addon/components/admin-nav.gjs
new file mode 100644
index 00000000000..be3aa02cb4a
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/components/admin-nav.gjs
@@ -0,0 +1,15 @@
+import { tagName } from "@ember-decorators/component";
+import Component from "@ember/component";
+
+@tagName("")
+export default class AdminNav extends Component {
+  <template>
+    <div class="admin-controls">
+      <nav>
+        <ul class="nav nav-pills">
+          {{yield}}
+        </ul>
+      </nav>
+    </div>
+  </template>
+}
diff --git a/app/assets/javascripts/admin/addon/components/admin-nav.js b/app/assets/javascripts/admin/addon/components/admin-nav.js
deleted file mode 100644
index 0e6d50b17d4..00000000000
--- a/app/assets/javascripts/admin/addon/components/admin-nav.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import Component from "@ember/component";
-export default Component.extend({
-  tagName: "",
-});
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-penalty-history.hbs b/app/assets/javascripts/admin/addon/components/admin-penalty-history.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/admin-penalty-history.hbs
rename to app/assets/javascripts/admin/addon/components/admin-penalty-history.hbs
diff --git a/app/assets/javascripts/admin/addon/components/admin-penalty-history.js b/app/assets/javascripts/admin/addon/components/admin-penalty-history.js
index 32c288b248d..0931ac8e4a4 100644
--- a/app/assets/javascripts/admin/addon/components/admin-penalty-history.js
+++ b/app/assets/javascripts/admin/addon/components/admin-penalty-history.js
@@ -1,16 +1,16 @@
+import { classNames } from "@ember-decorators/component";
 import Component from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
 
-export default Component.extend({
-  classNames: ["penalty-history"],
-
+@classNames("penalty-history")
+export default class AdminPenaltyHistory extends Component {
   @discourseComputed("user.penalty_counts.suspended")
   suspendedCountClass(count) {
     if (count > 0) {
       return "danger";
     }
     return "";
-  },
+  }
 
   @discourseComputed("user.penalty_counts.silenced")
   silencedCountClass(count) {
@@ -18,5 +18,5 @@ export default Component.extend({
       return "danger";
     }
     return "";
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-penalty-post-action.hbs b/app/assets/javascripts/admin/addon/components/admin-penalty-post-action.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/admin-penalty-post-action.hbs
rename to app/assets/javascripts/admin/addon/components/admin-penalty-post-action.hbs
diff --git a/app/assets/javascripts/admin/addon/components/admin-penalty-post-action.js b/app/assets/javascripts/admin/addon/components/admin-penalty-post-action.js
index eb201ae0899..08314925460 100644
--- a/app/assets/javascripts/admin/addon/components/admin-penalty-post-action.js
+++ b/app/assets/javascripts/admin/addon/components/admin-penalty-post-action.js
@@ -1,5 +1,6 @@
-import Component from "@ember/component";
+import { action } from "@ember/object";
 import { equal } from "@ember/object/computed";
+import Component from "@ember/component";
 import discourseComputed, {
   afterRender,
 } from "discourse-common/utils/decorators";
@@ -7,30 +8,28 @@ import I18n from "I18n";
 
 const ACTIONS = ["delete", "delete_replies", "edit", "none"];
 
-export default Component.extend({
-  postId: null,
-  postAction: null,
-  postEdit: null,
+export default class AdminPenaltyPostAction extends Component {
+  postId = null;
+  postAction = null;
+  postEdit = null;
 
+  @equal("postAction", "edit") editing;
   @discourseComputed
   penaltyActions() {
     return ACTIONS.map((id) => {
       return { id, name: I18n.t(`admin.user.penalty_post_${id}`) };
     });
-  },
+  }
 
-  editing: equal("postAction", "edit"),
+  @action
+  penaltyChanged(postAction) {
+    this.set("postAction", postAction);
 
-  actions: {
-    penaltyChanged(postAction) {
-      this.set("postAction", postAction);
-
-      // If we switch to edit mode, jump to the edit textarea
-      if (postAction === "edit") {
-        this._focusEditTextarea();
-      }
-    },
-  },
+    // If we switch to edit mode, jump to the edit textarea
+    if (postAction === "edit") {
+      this._focusEditTextarea();
+    }
+  }
 
   @afterRender
   _focusEditTextarea() {
@@ -38,5 +37,5 @@ export default Component.extend({
     const body = elem.closest(".modal-body");
     body.scrollTo(0, body.clientHeight);
     elem.querySelector(".post-editor").focus();
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-penalty-reason.hbs b/app/assets/javascripts/admin/addon/components/admin-penalty-reason.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/admin-penalty-reason.hbs
rename to app/assets/javascripts/admin/addon/components/admin-penalty-reason.hbs
diff --git a/app/assets/javascripts/admin/addon/components/admin-penalty-reason.js b/app/assets/javascripts/admin/addon/components/admin-penalty-reason.js
index ca6164e7630..e8d037d249b 100644
--- a/app/assets/javascripts/admin/addon/components/admin-penalty-reason.js
+++ b/app/assets/javascripts/admin/addon/components/admin-penalty-reason.js
@@ -1,43 +1,46 @@
+import { tagName } from "@ember-decorators/component";
+import { equal } from "@ember/object/computed";
 import Component from "@ember/component";
 import { action } from "@ember/object";
-import { equal } from "@ember/object/computed";
 import discourseComputed from "discourse-common/utils/decorators";
 import I18n from "I18n";
 
 const CUSTOM_REASON_KEY = "custom";
 
-export default Component.extend({
-  tagName: "",
-  selectedReason: CUSTOM_REASON_KEY,
-  customReason: "",
-  reasonKeys: [
+@tagName("")
+export default class AdminPenaltyReason extends Component {
+  selectedReason = CUSTOM_REASON_KEY;
+  customReason = "";
+
+  reasonKeys = [
     "not_listening_to_staff",
     "consuming_staff_time",
     "combative",
     "in_wrong_place",
     "no_constructive_purpose",
     CUSTOM_REASON_KEY,
-  ],
-  isCustomReason: equal("selectedReason", CUSTOM_REASON_KEY),
+  ];
+
+  @equal("selectedReason", CUSTOM_REASON_KEY) isCustomReason;
 
   @discourseComputed("reasonKeys")
   reasons(keys) {
     return keys.map((key) => {
       return { id: key, name: I18n.t(`admin.user.suspend_reasons.${key}`) };
     });
-  },
+  }
 
   @action
   setSelectedReason(value) {
     this.set("selectedReason", value);
     this.setReason();
-  },
+  }
 
   @action
   setCustomReason(value) {
     this.set("customReason", value);
     this.setReason();
-  },
+  }
 
   setReason() {
     if (this.isCustomReason) {
@@ -48,5 +51,5 @@ export default Component.extend({
         I18n.t(`admin.user.suspend_reasons.${this.selectedReason}`)
       );
     }
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-penalty-similar-users.hbs b/app/assets/javascripts/admin/addon/components/admin-penalty-similar-users.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/admin-penalty-similar-users.hbs
rename to app/assets/javascripts/admin/addon/components/admin-penalty-similar-users.hbs
diff --git a/app/assets/javascripts/admin/addon/components/admin-penalty-similar-users.js b/app/assets/javascripts/admin/addon/components/admin-penalty-similar-users.js
index 241927a7b7f..52996d458f3 100644
--- a/app/assets/javascripts/admin/addon/components/admin-penalty-similar-users.js
+++ b/app/assets/javascripts/admin/addon/components/admin-penalty-similar-users.js
@@ -1,10 +1,10 @@
+import { tagName } from "@ember-decorators/component";
 import Component from "@ember/component";
 import { action } from "@ember/object";
 import discourseComputed from "discourse-common/utils/decorators";
 
-export default Component.extend({
-  tagName: "",
-
+@tagName("")
+export default class AdminPenaltySimilarUsers extends Component {
   @discourseComputed("penaltyType")
   penaltyField(penaltyType) {
     if (penaltyType === "suspend") {
@@ -12,7 +12,7 @@ export default Component.extend({
     } else if (penaltyType === "silence") {
       return "can_be_silenced";
     }
-  },
+  }
 
   @action
   selectUserId(userId, event) {
@@ -25,5 +25,5 @@ export default Component.extend({
     } else {
       this.selectedUserIds.removeObject(userId);
     }
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-report-chart.hbs b/app/assets/javascripts/admin/addon/components/admin-report-chart.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/admin-report-chart.hbs
rename to app/assets/javascripts/admin/addon/components/admin-report-chart.hbs
diff --git a/app/assets/javascripts/admin/addon/components/admin-report-chart.js b/app/assets/javascripts/admin/addon/components/admin-report-chart.js
index 1c4ad1caa3a..64f09aa0d7d 100644
--- a/app/assets/javascripts/admin/addon/components/admin-report-chart.js
+++ b/app/assets/javascripts/admin/addon/components/admin-report-chart.js
@@ -1,3 +1,4 @@
+import { classNames } from "@ember-decorators/component";
 import Report from "admin/models/report";
 import Component from "@ember/component";
 import discourseDebounce from "discourse-common/lib/debounce";
@@ -7,31 +8,31 @@ import { number } from "discourse/lib/formatter";
 import { schedule } from "@ember/runloop";
 import { bind } from "discourse-common/utils/decorators";
 
-export default Component.extend({
-  classNames: ["admin-report-chart"],
-  limit: 8,
-  total: 0,
-  options: null,
+@classNames("admin-report-chart")
+export default class AdminReportChart extends Component {
+  limit = 8;
+  total = 0;
+  options = null;
 
   didInsertElement() {
-    this._super(...arguments);
+    super.didInsertElement(...arguments);
 
     window.addEventListener("resize", this._resizeHandler);
-  },
+  }
 
   willDestroyElement() {
-    this._super(...arguments);
+    super.willDestroyElement(...arguments);
 
     window.removeEventListener("resize", this._resizeHandler);
 
     this._resetChart();
-  },
+  }
 
   didReceiveAttrs() {
-    this._super(...arguments);
+    super.didReceiveAttrs(...arguments);
 
     discourseDebounce(this, this._scheduleChartRendering, 100);
-  },
+  }
 
   _scheduleChartRendering() {
     schedule("afterRender", () => {
@@ -40,7 +41,7 @@ export default Component.extend({
         this.element && this.element.querySelector(".chart-canvas")
       );
     });
-  },
+  }
 
   _renderChart(model, chartCanvas) {
     if (!chartCanvas) {
@@ -99,7 +100,7 @@ export default Component.extend({
         this._buildChartConfig(data, this.options)
       );
     });
-  },
+  }
 
   _buildChartConfig(data, options) {
     return {
@@ -161,21 +162,21 @@ export default Component.extend({
         },
       },
     };
-  },
+  }
 
   _resetChart() {
     if (this._chart) {
       this._chart.destroy();
       this._chart = null;
     }
-  },
+  }
 
   _applyChartGrouping(model, data, options) {
     return Report.collapse(model, data, options.chartGrouping);
-  },
+  }
 
   @bind
   _resizeHandler() {
     discourseDebounce(this, this._scheduleChartRendering, 500);
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-report-counters.hbs b/app/assets/javascripts/admin/addon/components/admin-report-counters.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/admin-report-counters.hbs
rename to app/assets/javascripts/admin/addon/components/admin-report-counters.hbs
diff --git a/app/assets/javascripts/admin/addon/components/admin-report-counters.js b/app/assets/javascripts/admin/addon/components/admin-report-counters.js
index c956b93e359..6e3dab52366 100644
--- a/app/assets/javascripts/admin/addon/components/admin-report-counters.js
+++ b/app/assets/javascripts/admin/addon/components/admin-report-counters.js
@@ -1,6 +1,6 @@
+import { attributeBindings, classNames } from "@ember-decorators/component";
 import Component from "@ember/component";
-export default Component.extend({
-  classNames: ["admin-report-counters"],
 
-  attributeBindings: ["model.description:title"],
-});
+@classNames("admin-report-counters")
+@attributeBindings("model.description:title")
+export default class AdminReportCounters extends Component {}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-report-counts.hbs b/app/assets/javascripts/admin/addon/components/admin-report-counts.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/admin-report-counts.hbs
rename to app/assets/javascripts/admin/addon/components/admin-report-counts.hbs
diff --git a/app/assets/javascripts/admin/addon/components/admin-report-counts.js b/app/assets/javascripts/admin/addon/components/admin-report-counts.js
index 03c690dbbd6..fd1b6cc68d6 100644
--- a/app/assets/javascripts/admin/addon/components/admin-report-counts.js
+++ b/app/assets/javascripts/admin/addon/components/admin-report-counts.js
@@ -1,11 +1,12 @@
-import Component from "@ember/component";
+import { classNameBindings, tagName } from "@ember-decorators/component";
 import { match } from "@ember/object/computed";
-export default Component.extend({
-  allTime: true,
-  tagName: "tr",
-  reverseColors: match(
-    "report.type",
-    /^(time_to_first_response|topics_with_no_response)$/
-  ),
-  classNameBindings: ["reverseColors"],
-});
+import Component from "@ember/component";
+
+@tagName("tr")
+@classNameBindings("reverseColors")
+export default class AdminReportCounts extends Component {
+  allTime = true;
+
+  @match("report.type", /^(time_to_first_response|topics_with_no_response)$/)
+  reverseColors;
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-report-inline-table.hbs b/app/assets/javascripts/admin/addon/components/admin-report-inline-table.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/admin-report-inline-table.hbs
rename to app/assets/javascripts/admin/addon/components/admin-report-inline-table.hbs
diff --git a/app/assets/javascripts/admin/addon/components/admin-report-inline-table.js b/app/assets/javascripts/admin/addon/components/admin-report-inline-table.js
index 753320cc31a..3e770da6467 100644
--- a/app/assets/javascripts/admin/addon/components/admin-report-inline-table.js
+++ b/app/assets/javascripts/admin/addon/components/admin-report-inline-table.js
@@ -1,4 +1,5 @@
+import { classNames } from "@ember-decorators/component";
 import Component from "@ember/component";
-export default Component.extend({
-  classNames: ["admin-report-inline-table"],
-});
+
+@classNames("admin-report-inline-table")
+export default class AdminReportInlineTable extends Component {}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-report-per-day-counts.hbs b/app/assets/javascripts/admin/addon/components/admin-report-per-day-counts.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/admin-report-per-day-counts.hbs
rename to app/assets/javascripts/admin/addon/components/admin-report-per-day-counts.hbs
diff --git a/app/assets/javascripts/admin/addon/components/admin-report-per-day-counts.js b/app/assets/javascripts/admin/addon/components/admin-report-per-day-counts.js
index 7f039c061e1..ee48a5138f2 100644
--- a/app/assets/javascripts/admin/addon/components/admin-report-per-day-counts.js
+++ b/app/assets/javascripts/admin/addon/components/admin-report-per-day-counts.js
@@ -1,4 +1,5 @@
+import { tagName } from "@ember-decorators/component";
 import Component from "@ember/component";
-export default Component.extend({
-  tagName: "tr",
-});
+
+@tagName("tr")
+export default class AdminReportPerDayCounts extends Component {}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-report-stacked-chart.hbs b/app/assets/javascripts/admin/addon/components/admin-report-stacked-chart.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/admin-report-stacked-chart.hbs
rename to app/assets/javascripts/admin/addon/components/admin-report-stacked-chart.hbs
diff --git a/app/assets/javascripts/admin/addon/components/admin-report-stacked-chart.js b/app/assets/javascripts/admin/addon/components/admin-report-stacked-chart.js
index 6b773957f66..b69e75141e8 100644
--- a/app/assets/javascripts/admin/addon/components/admin-report-stacked-chart.js
+++ b/app/assets/javascripts/admin/addon/components/admin-report-stacked-chart.js
@@ -1,3 +1,4 @@
+import { classNames } from "@ember-decorators/component";
 import Report from "admin/models/report";
 import Component from "@ember/component";
 import discourseDebounce from "discourse-common/lib/debounce";
@@ -7,32 +8,31 @@ import { number } from "discourse/lib/formatter";
 import { schedule } from "@ember/runloop";
 import { bind } from "discourse-common/utils/decorators";
 
-export default Component.extend({
-  classNames: ["admin-report-chart", "admin-report-stacked-chart"],
-
+@classNames("admin-report-chart", "admin-report-stacked-chart")
+export default class AdminReportStackedChart extends Component {
   didInsertElement() {
-    this._super(...arguments);
+    super.didInsertElement(...arguments);
 
     window.addEventListener("resize", this._resizeHandler);
-  },
+  }
 
   willDestroyElement() {
-    this._super(...arguments);
+    super.willDestroyElement(...arguments);
 
     window.removeEventListener("resize", this._resizeHandler);
     this._resetChart();
-  },
+  }
 
   didReceiveAttrs() {
-    this._super(...arguments);
+    super.didReceiveAttrs(...arguments);
 
     discourseDebounce(this, this._scheduleChartRendering, 100);
-  },
+  }
 
   @bind
   _resizeHandler() {
     discourseDebounce(this, this._scheduleChartRendering, 500);
-  },
+  }
 
   _scheduleChartRendering() {
     schedule("afterRender", () => {
@@ -45,7 +45,7 @@ export default Component.extend({
         this.element.querySelector(".chart-canvas")
       );
     });
-  },
+  }
 
   _renderChart(model, chartCanvas) {
     if (!chartCanvas) {
@@ -79,7 +79,7 @@ export default Component.extend({
 
       this._chart = new window.Chart(context, this._buildChartConfig(data));
     });
-  },
+  }
 
   _buildChartConfig(data) {
     return {
@@ -150,10 +150,10 @@ export default Component.extend({
         },
       },
     };
-  },
+  }
 
   _resetChart() {
     this._chart?.destroy();
     this._chart = null;
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-report-storage-stats.hbs b/app/assets/javascripts/admin/addon/components/admin-report-storage-stats.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/admin-report-storage-stats.hbs
rename to app/assets/javascripts/admin/addon/components/admin-report-storage-stats.hbs
diff --git a/app/assets/javascripts/admin/addon/components/admin-report-storage-stats.js b/app/assets/javascripts/admin/addon/components/admin-report-storage-stats.js
index e12bc6432f7..ee0d7d24764 100644
--- a/app/assets/javascripts/admin/addon/components/admin-report-storage-stats.js
+++ b/app/assets/javascripts/admin/addon/components/admin-report-storage-stats.js
@@ -1,43 +1,45 @@
+import { classNames } from "@ember-decorators/component";
+import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
 import I18n from "I18n";
-import { alias } from "@ember/object/computed";
 import discourseComputed from "discourse-common/utils/decorators";
 import { setting } from "discourse/lib/computed";
 
-export default Component.extend({
-  classNames: ["admin-report-storage-stats"],
+@classNames("admin-report-storage-stats")
+export default class AdminReportStorageStats extends Component {
+  @setting("backup_location") backupLocation;
 
-  backupLocation: setting("backup_location"),
-  backupStats: alias("model.data.backups"),
-  uploadStats: alias("model.data.uploads"),
+  @alias("model.data.backups") backupStats;
+
+  @alias("model.data.uploads") uploadStats;
 
   @discourseComputed("backupStats")
   showBackupStats(stats) {
     return stats && this.currentUser.admin;
-  },
+  }
 
   @discourseComputed("backupLocation")
   backupLocationName(backupLocation) {
     return I18n.t(`admin.backups.location.${backupLocation}`);
-  },
+  }
 
   @discourseComputed("backupStats.used_bytes")
   usedBackupSpace(bytes) {
     return I18n.toHumanSize(bytes);
-  },
+  }
 
   @discourseComputed("backupStats.free_bytes")
   freeBackupSpace(bytes) {
     return I18n.toHumanSize(bytes);
-  },
+  }
 
   @discourseComputed("uploadStats.used_bytes")
   usedUploadSpace(bytes) {
     return I18n.toHumanSize(bytes);
-  },
+  }
 
   @discourseComputed("uploadStats.free_bytes")
   freeUploadSpace(bytes) {
     return I18n.toHumanSize(bytes);
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-report-table-cell.hbs b/app/assets/javascripts/admin/addon/components/admin-report-table-cell.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/admin-report-table-cell.hbs
rename to app/assets/javascripts/admin/addon/components/admin-report-table-cell.hbs
diff --git a/app/assets/javascripts/admin/addon/components/admin-report-table-cell.js b/app/assets/javascripts/admin/addon/components/admin-report-table-cell.js
index 838d8dbe1d4..89997c9afab 100644
--- a/app/assets/javascripts/admin/addon/components/admin-report-table-cell.js
+++ b/app/assets/javascripts/admin/addon/components/admin-report-table-cell.js
@@ -1,21 +1,27 @@
-import Component from "@ember/component";
+import {
+  attributeBindings,
+  classNameBindings,
+  classNames,
+  tagName,
+} from "@ember-decorators/component";
 import { alias } from "@ember/object/computed";
+import Component from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
 
-export default Component.extend({
-  tagName: "td",
-  classNames: ["admin-report-table-cell"],
-  classNameBindings: ["type", "property"],
-  attributeBindings: ["value:title"],
-  options: null,
+@tagName("td")
+@classNames("admin-report-table-cell")
+@classNameBindings("type", "property")
+@attributeBindings("value:title")
+export default class AdminReportTableCell extends Component {
+  options = null;
+
+  @alias("label.type") type;
+  @alias("label.mainProperty") property;
+  @alias("computedLabel.formattedValue") formattedValue;
+  @alias("computedLabel.value") value;
 
   @discourseComputed("label", "data", "options")
   computedLabel(label, data, options) {
     return label.compute(data, options || {});
-  },
-
-  type: alias("label.type"),
-  property: alias("label.mainProperty"),
-  formattedValue: alias("computedLabel.formattedValue"),
-  value: alias("computedLabel.value"),
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-report-table-header.hbs b/app/assets/javascripts/admin/addon/components/admin-report-table-header.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/admin-report-table-header.hbs
rename to app/assets/javascripts/admin/addon/components/admin-report-table-header.hbs
diff --git a/app/assets/javascripts/admin/addon/components/admin-report-table-header.js b/app/assets/javascripts/admin/addon/components/admin-report-table-header.js
index 5c7cdf1e4ca..7de3ac97088 100644
--- a/app/assets/javascripts/admin/addon/components/admin-report-table-header.js
+++ b/app/assets/javascripts/admin/addon/components/admin-report-table-header.js
@@ -1,19 +1,24 @@
+import {
+  attributeBindings,
+  classNameBindings,
+  classNames,
+  tagName,
+} from "@ember-decorators/component";
 import Component from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
 
-export default Component.extend({
-  tagName: "th",
-  classNames: ["admin-report-table-header"],
-  classNameBindings: ["label.mainProperty", "label.type", "isCurrentSort"],
-  attributeBindings: ["label.title:title"],
-
+@tagName("th")
+@classNames("admin-report-table-header")
+@classNameBindings("label.mainProperty", "label.type", "isCurrentSort")
+@attributeBindings("label.title:title")
+export default class AdminReportTableHeader extends Component {
   @discourseComputed("currentSortLabel.sortProperty", "label.sortProperty")
   isCurrentSort(currentSortField, labelSortField) {
     return currentSortField === labelSortField;
-  },
+  }
 
   @discourseComputed("currentSortDirection")
   sortIcon(currentSortDirection) {
     return currentSortDirection === 1 ? "caret-up" : "caret-down";
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-report-table-row.hbs b/app/assets/javascripts/admin/addon/components/admin-report-table-row.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/admin-report-table-row.hbs
rename to app/assets/javascripts/admin/addon/components/admin-report-table-row.hbs
diff --git a/app/assets/javascripts/admin/addon/components/admin-report-table-row.js b/app/assets/javascripts/admin/addon/components/admin-report-table-row.js
index ff34cb94e8b..e5e275aa7ad 100644
--- a/app/assets/javascripts/admin/addon/components/admin-report-table-row.js
+++ b/app/assets/javascripts/admin/addon/components/admin-report-table-row.js
@@ -1,6 +1,8 @@
+import { classNames, tagName } from "@ember-decorators/component";
 import Component from "@ember/component";
-export default Component.extend({
-  tagName: "tr",
-  classNames: ["admin-report-table-row"],
-  options: null,
-});
+
+@tagName("tr")
+@classNames("admin-report-table-row")
+export default class AdminReportTableRow extends Component {
+  options = null;
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-report-table.hbs b/app/assets/javascripts/admin/addon/components/admin-report-table.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/admin-report-table.hbs
rename to app/assets/javascripts/admin/addon/components/admin-report-table.hbs
diff --git a/app/assets/javascripts/admin/addon/components/admin-report-table.js b/app/assets/javascripts/admin/addon/components/admin-report-table.js
index a237e93ee43..3638625f872 100644
--- a/app/assets/javascripts/admin/addon/components/admin-report-table.js
+++ b/app/assets/javascripts/admin/addon/components/admin-report-table.js
@@ -1,22 +1,26 @@
-import Component from "@ember/component";
+import { action } from "@ember/object";
+import { classNameBindings, classNames } from "@ember-decorators/component";
 import { alias } from "@ember/object/computed";
+import Component from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
 import { makeArray } from "discourse-common/lib/helpers";
 
 const PAGES_LIMIT = 8;
 
-export default Component.extend({
-  classNameBindings: ["sortable", "twoColumns"],
-  classNames: ["admin-report-table"],
-  sortable: false,
-  sortDirection: 1,
-  perPage: alias("options.perPage"),
-  page: 0,
+@classNameBindings("sortable", "twoColumns")
+@classNames("admin-report-table")
+export default class AdminReportTable extends Component {
+  sortable = false;
+  sortDirection = 1;
+
+  @alias("options.perPage") perPage;
+
+  page = 0;
 
   @discourseComputed("model.computedLabels.length")
   twoColumns(labelsLength) {
     return labelsLength === 2;
-  },
+  }
 
   @discourseComputed(
     "totalsForSample",
@@ -31,12 +35,12 @@ export default Component.extend({
       .reduce((s, v) => s + v, 0);
 
     return sum >= 1 && total && datesFiltering;
-  },
+  }
 
   @discourseComputed("model.total", "options.total", "twoColumns")
   showTotal(reportTotal, total, twoColumns) {
     return reportTotal && total && twoColumns;
-  },
+  }
 
   @discourseComputed(
     "model.{average,data}",
@@ -50,17 +54,17 @@ export default Component.extend({
       sampleTotalValue &&
       hasTwoColumns
     );
-  },
+  }
 
   @discourseComputed("totalsForSample.1.value", "model.data.length")
   averageForSample(totals, count) {
     return (totals / count).toFixed(0);
-  },
+  }
 
   @discourseComputed("model.data.length")
   showSortingUI(dataLength) {
     return dataLength >= 5;
-  },
+  }
 
   @discourseComputed("totalsForSampleRow", "model.computedLabels")
   totalsForSample(row, labels) {
@@ -70,7 +74,7 @@ export default Component.extend({
       computedLabel.property = label.mainProperty;
       return computedLabel;
     });
-  },
+  }
 
   @discourseComputed("model.data", "model.computedLabels")
   totalsForSampleRow(rows, labels) {
@@ -98,7 +102,7 @@ export default Component.extend({
     });
 
     return totalsRow;
-  },
+  }
 
   @discourseComputed("sortLabel", "sortDirection", "model.data.[]")
   sortedData(sortLabel, sortDirection, data) {
@@ -118,7 +122,7 @@ export default Component.extend({
     }
 
     return data;
-  },
+  }
 
   @discourseComputed("sortedData.[]", "perPage", "page")
   paginatedData(data, perPage, page) {
@@ -128,7 +132,7 @@ export default Component.extend({
     }
 
     return data;
-  },
+  }
 
   @discourseComputed("model.data", "perPage", "page")
   pages(data, perPage, page) {
@@ -156,19 +160,19 @@ export default Component.extend({
     }
 
     return pages;
-  },
+  }
 
-  actions: {
-    changePage(page) {
-      this.set("page", page);
-    },
+  @action
+  changePage(page) {
+    this.set("page", page);
+  }
 
-    sortByLabel(label) {
-      if (this.sortLabel === label) {
-        this.set("sortDirection", this.sortDirection === 1 ? -1 : 1);
-      } else {
-        this.set("sortLabel", label);
-      }
-    },
-  },
-});
+  @action
+  sortByLabel(label) {
+    if (this.sortLabel === label) {
+      this.set("sortDirection", this.sortDirection === 1 ? -1 : 1);
+    } else {
+      this.set("sortLabel", label);
+    }
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-report-trust-level-counts.hbs b/app/assets/javascripts/admin/addon/components/admin-report-trust-level-counts.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/admin-report-trust-level-counts.hbs
rename to app/assets/javascripts/admin/addon/components/admin-report-trust-level-counts.hbs
diff --git a/app/assets/javascripts/admin/addon/components/admin-report-trust-level-counts.js b/app/assets/javascripts/admin/addon/components/admin-report-trust-level-counts.js
index 7f039c061e1..6da6a748934 100644
--- a/app/assets/javascripts/admin/addon/components/admin-report-trust-level-counts.js
+++ b/app/assets/javascripts/admin/addon/components/admin-report-trust-level-counts.js
@@ -1,4 +1,5 @@
+import { tagName } from "@ember-decorators/component";
 import Component from "@ember/component";
-export default Component.extend({
-  tagName: "tr",
-});
+
+@tagName("tr")
+export default class AdminReportTrustLevelCounts extends Component {}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-report.hbs b/app/assets/javascripts/admin/addon/components/admin-report.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/admin-report.hbs
rename to app/assets/javascripts/admin/addon/components/admin-report.hbs
diff --git a/app/assets/javascripts/admin/addon/components/admin-report.js b/app/assets/javascripts/admin/addon/components/admin-report.js
index 9f60e09a257..fede9cc2d60 100644
--- a/app/assets/javascripts/admin/addon/components/admin-report.js
+++ b/app/assets/javascripts/admin/addon/components/admin-report.js
@@ -1,6 +1,7 @@
+import { classNameBindings, classNames } from "@ember-decorators/component";
+import { alias, and, equal, notEmpty, or } from "@ember/object/computed";
 import EmberObject, { action, computed } from "@ember/object";
 import Report, { DAILY_LIMIT_DAYS, SCHEMA_VERSION } from "admin/models/report";
-import { alias, and, equal, notEmpty, or } from "@ember/object/computed";
 import Component from "@ember/component";
 import I18n from "I18n";
 import ReportLoader from "discourse/lib/reports-loader";
@@ -21,51 +22,58 @@ const TABLE_OPTIONS = {
 
 const CHART_OPTIONS = {};
 
-export default Component.extend({
-  classNameBindings: [
-    "isHidden:hidden",
-    "isHidden::is-visible",
-    "isEnabled",
-    "isLoading",
-    "dasherizedDataSourceName",
-  ],
-  classNames: ["admin-report"],
-  isEnabled: true,
-  disabledLabel: I18n.t("admin.dashboard.disabled"),
-  isLoading: false,
-  rateLimitationString: null,
-  dataSourceName: null,
-  report: null,
-  model: null,
-  reportOptions: null,
-  forcedModes: null,
-  showAllReportsLink: false,
-  filters: null,
-  showTrend: false,
-  showHeader: true,
-  showTitle: true,
-  showFilteringUI: false,
-  showDatesOptions: alias("model.dates_filtering"),
-  showRefresh: or("showDatesOptions", "model.available_filters.length"),
-  shouldDisplayTrend: and("showTrend", "model.prev_period"),
-  endDate: null,
-  startDate: null,
+@classNameBindings(
+  "isHidden:hidden",
+  "isHidden::is-visible",
+  "isEnabled",
+  "isLoading",
+  "dasherizedDataSourceName"
+)
+@classNames("admin-report")
+export default class AdminReport extends Component {
+  isEnabled = true;
+  disabledLabel = I18n.t("admin.dashboard.disabled");
+  isLoading = false;
+  rateLimitationString = null;
+  dataSourceName = null;
+  report = null;
+  model = null;
+  reportOptions = null;
+  forcedModes = null;
+  showAllReportsLink = false;
+  filters = null;
+  showTrend = false;
+  showHeader = true;
+  showTitle = true;
+  showFilteringUI = false;
 
-  init() {
-    this._super(...arguments);
+  @alias("model.dates_filtering") showDatesOptions;
 
-    this._reports = [];
-  },
+  @or("showDatesOptions", "model.available_filters.length") showRefresh;
 
-  isHidden: computed("siteSettings.dashboard_hidden_reports", function () {
+  @and("showTrend", "model.prev_period") shouldDisplayTrend;
+
+  endDate = null;
+  startDate = null;
+
+  @or("showTimeoutError", "showExceptionError", "showNotFoundError") showError;
+  @equal("model.error", "not_found") showNotFoundError;
+  @equal("model.error", "timeout") showTimeoutError;
+  @equal("model.error", "exception") showExceptionError;
+  @notEmpty("model.data") hasData;
+
+  _reports = [];
+
+  @computed("siteSettings.dashboard_hidden_reports")
+  get isHidden() {
     return (this.siteSettings.dashboard_hidden_reports || "")
       .split("|")
       .filter(Boolean)
       .includes(this.dataSourceName);
-  }),
+  }
 
   didReceiveAttrs() {
-    this._super(...arguments);
+    super.didReceiveAttrs(...arguments);
 
     let startDate = moment();
     if (this.filters && isPresent(this.filters.startDate)) {
@@ -88,42 +96,35 @@ export default Component.extend({
     } else if (this.dataSourceName) {
       this._fetchReport();
     }
-  },
-
-  showError: or("showTimeoutError", "showExceptionError", "showNotFoundError"),
-  showNotFoundError: equal("model.error", "not_found"),
-  showTimeoutError: equal("model.error", "timeout"),
-  showExceptionError: equal("model.error", "exception"),
-
-  hasData: notEmpty("model.data"),
+  }
 
   @discourseComputed("dataSourceName", "model.type")
   dasherizedDataSourceName(dataSourceName, type) {
     return (dataSourceName || type || "undefined").replace(/_/g, "-");
-  },
+  }
 
   @discourseComputed("dataSourceName", "model.type")
   dataSource(dataSourceName, type) {
     dataSourceName = dataSourceName || type;
     return `/admin/reports/${dataSourceName}`;
-  },
+  }
 
   @discourseComputed("displayedModes.length")
   showModes(displayedModesLength) {
     return displayedModesLength > 1;
-  },
+  }
 
   @discourseComputed("currentMode")
   isChartMode(currentMode) {
     return currentMode === "chart";
-  },
+  }
 
   @action
   changeGrouping(grouping) {
     this.send("refreshReport", {
       chartGrouping: grouping,
     });
-  },
+  }
 
   @discourseComputed("currentMode", "model.modes", "forcedModes")
   displayedModes(currentMode, reportModes, forcedModes) {
@@ -139,12 +140,12 @@ export default Component.extend({
         icon: mode === "table" ? "table" : "signal",
       };
     });
-  },
+  }
 
   @discourseComputed("currentMode")
   modeComponent(currentMode) {
     return `admin-report-${currentMode.replace(/_/g, "-")}`;
-  },
+  }
 
   @discourseComputed(
     "dataSourceName",
@@ -178,7 +179,7 @@ export default Component.extend({
       .join(":");
 
     return reportKey;
-  },
+  }
 
   @discourseComputed("options.chartGrouping", "model.chartData.length")
   chartGroupings(grouping, count) {
@@ -192,7 +193,7 @@ export default Component.extend({
         class: `chart-grouping ${grouping === id ? "active" : "inactive"}`,
       };
     });
-  },
+  }
 
   @action
   onChangeDateRange(range) {
@@ -200,7 +201,7 @@ export default Component.extend({
       startDate: range.from,
       endDate: range.to,
     });
-  },
+  }
 
   @action
   applyFilter(id, value) {
@@ -215,7 +216,7 @@ export default Component.extend({
     this.send("refreshReport", {
       filters: customFilters,
     });
-  },
+  }
 
   @action
   refreshReport(options = {}) {
@@ -238,7 +239,7 @@ export default Component.extend({
           ? this.get("filters.customFilters")
           : options.filters,
     });
-  },
+  }
 
   @action
   exportCsv() {
@@ -254,7 +255,7 @@ export default Component.extend({
     }
 
     exportEntity("report", args).then(outputExportResult);
-  },
+  }
 
   @action
   onChangeMode(mode) {
@@ -263,7 +264,7 @@ export default Component.extend({
     this.send("refreshReport", {
       chartGrouping: null,
     });
-  },
+  }
 
   _computeReport() {
     if (!this.element || this.isDestroying || this.isDestroyed) {
@@ -306,7 +307,7 @@ export default Component.extend({
     }
 
     this._renderReport(report, this.forcedModes, this.currentMode);
-  },
+  }
 
   _renderReport(report, forcedModes, currentMode) {
     const modes = forcedModes ? forcedModes.split(",") : report.modes;
@@ -317,11 +318,9 @@ export default Component.extend({
       currentMode,
       options: this._buildOptions(currentMode, report),
     });
-  },
+  }
 
   _fetchReport() {
-    this._super(...arguments);
-
     this.setProperties({ isLoading: true, rateLimitationString: null });
 
     next(() => {
@@ -349,7 +348,7 @@ export default Component.extend({
 
       ReportLoader.enqueue(this.dataSourceName, payload.data, callback);
     });
-  },
+  }
 
   _buildPayload(facets) {
     let payload = { data: { facets } };
@@ -375,7 +374,7 @@ export default Component.extend({
     }
 
     return payload;
-  },
+  }
 
   _buildOptions(mode, report) {
     if (mode === "table") {
@@ -393,7 +392,7 @@ export default Component.extend({
         })
       );
     }
-  },
+  }
 
   _loadReport(jsonReport) {
     Report.fillMissingDates(jsonReport, { filledField: "chartData" });
@@ -423,5 +422,5 @@ export default Component.extend({
     }
 
     return Report.create(jsonReport);
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-theme-editor.hbs b/app/assets/javascripts/admin/addon/components/admin-theme-editor.hbs
similarity index 97%
rename from app/assets/javascripts/admin/addon/templates/components/admin-theme-editor.hbs
rename to app/assets/javascripts/admin/addon/components/admin-theme-editor.hbs
index b74b2239f84..e6c201cb784 100644
--- a/app/assets/javascripts/admin/addon/templates/components/admin-theme-editor.hbs
+++ b/app/assets/javascripts/admin/addon/components/admin-theme-editor.hbs
@@ -44,7 +44,7 @@
             @checked={{this.onlyOverridden}}
             {{on
               "click"
-              (action "onlyOverriddenChanged" value="target.checked")
+              (action this.onlyOverriddenChanged value="target.checked")
             }}
           />
           {{i18n "admin.customize.theme.hide_unused_fields"}}
@@ -125,6 +125,6 @@
   @autofocus="true"
   @placeholder={{this.placeholder}}
   @htmlPlaceholder={{true}}
-  @save={{action "save"}}
+  @save={{this.save}}
   @setWarning={{action "setWarning"}}
 />
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/components/admin-theme-editor.js b/app/assets/javascripts/admin/addon/components/admin-theme-editor.js
index de8f0635791..31a0d02ec91 100644
--- a/app/assets/javascripts/admin/addon/components/admin-theme-editor.js
+++ b/app/assets/javascripts/admin/addon/components/admin-theme-editor.js
@@ -3,11 +3,13 @@ import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { fmt } from "discourse/lib/computed";
 import { isDocumentRTL } from "discourse/lib/text-direction";
-import { action } from "@ember/object";
+import { action, computed } from "@ember/object";
 import { next } from "@ember/runloop";
 
-export default Component.extend({
-  warning: null,
+export default class AdminThemeEditor extends Component {
+  warning = null;
+
+  @fmt("fieldName", "currentTargetName", "%@|%@") editorId;
 
   @discourseComputed("theme.targets", "onlyOverridden", "showAdvanced")
   visibleTargets(targets, onlyOverridden, showAdvanced) {
@@ -20,7 +22,7 @@ export default Component.extend({
       }
       return target.edited;
     });
-  },
+  }
 
   @discourseComputed("currentTargetName", "onlyOverridden", "theme.fields")
   visibleFields(targetName, onlyOverridden, fields) {
@@ -29,7 +31,7 @@ export default Component.extend({
       fields = fields.filter((field) => field.edited);
     }
     return fields;
-  },
+  }
 
   @discourseComputed("currentTargetName", "fieldName")
   activeSectionMode(targetName, fieldName) {
@@ -43,7 +45,7 @@ export default Component.extend({
       return "scss";
     }
     return fieldName && fieldName.includes("scss") ? "scss" : "html";
-  },
+  }
 
   @discourseComputed("currentTargetName", "fieldName")
   placeholder(targetName, fieldName) {
@@ -58,30 +60,27 @@ export default Component.extend({
       });
     }
     return "";
-  },
+  }
 
-  @discourseComputed("fieldName", "currentTargetName", "theme")
-  activeSection: {
-    get(fieldName, target, model) {
-      return model.getField(target, fieldName);
-    },
-    set(value, fieldName, target, model) {
-      model.setField(target, fieldName, value);
-      return value;
-    },
-  },
+  @computed("fieldName", "currentTargetName", "theme")
+  get activeSection() {
+    return this.theme.getField(this.currentTargetName, this.fieldName);
+  }
 
-  editorId: fmt("fieldName", "currentTargetName", "%@|%@"),
+  set activeSection(value) {
+    this.theme.setField(this.currentTargetName, this.fieldName, value);
+    return value;
+  }
 
   @discourseComputed("maximized")
   maximizeIcon(maximized) {
     return maximized ? "discourse-compress" : "discourse-expand";
-  },
+  }
 
   @discourseComputed("currentTargetName", "theme.targets")
   showAddField(currentTargetName, targets) {
     return targets.find((t) => t.name === currentTargetName).customNames;
-  },
+  }
 
   @discourseComputed(
     "currentTargetName",
@@ -90,52 +89,45 @@ export default Component.extend({
   )
   error(target, fieldName) {
     return this.theme.getError(target, fieldName);
-  },
+  }
 
   @action
   toggleShowAdvanced(event) {
     event?.preventDefault();
     this.toggleProperty("showAdvanced");
-  },
+  }
 
   @action
   toggleAddField(event) {
     event?.preventDefault();
     this.toggleProperty("addingField");
-  },
+  }
 
   @action
   toggleMaximize(event) {
     event?.preventDefault();
     this.toggleProperty("maximized");
     next(() => this.appEvents.trigger("ace:resize"));
-  },
+  }
 
-  actions: {
-    cancelAddField() {
-      this.set("addingField", false);
-    },
+  @action
+  cancelAddField() {
+    this.set("addingField", false);
+  }
 
-    addField(name) {
-      if (!name) {
-        return;
-      }
-      name = name.replace(/[^a-zA-Z0-9-_/]/g, "");
-      this.theme.setField(this.currentTargetName, name, "");
-      this.setProperties({ newFieldName: "", addingField: false });
-      this.fieldAdded(this.currentTargetName, name);
-    },
+  @action
+  addField(name) {
+    if (!name) {
+      return;
+    }
+    name = name.replace(/[^a-zA-Z0-9-_/]/g, "");
+    this.theme.setField(this.currentTargetName, name, "");
+    this.setProperties({ newFieldName: "", addingField: false });
+    this.fieldAdded(this.currentTargetName, name);
+  }
 
-    onlyOverriddenChanged(value) {
-      this.onlyOverriddenChanged(value);
-    },
-
-    save() {
-      this.attrs.save();
-    },
-
-    setWarning(message) {
-      this.set("warning", message);
-    },
-  },
-});
+  @action
+  setWarning(message) {
+    this.set("warning", message);
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-user-field-item.hbs b/app/assets/javascripts/admin/addon/components/admin-user-field-item.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/admin-user-field-item.hbs
rename to app/assets/javascripts/admin/addon/components/admin-user-field-item.hbs
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-watched-word.hbs b/app/assets/javascripts/admin/addon/components/admin-watched-word.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/admin-watched-word.hbs
rename to app/assets/javascripts/admin/addon/components/admin-watched-word.hbs
diff --git a/app/assets/javascripts/admin/addon/components/admin-watched-word.js b/app/assets/javascripts/admin/addon/components/admin-watched-word.js
index 7de7e3d8ab5..d6bde8016d2 100644
--- a/app/assets/javascripts/admin/addon/components/admin-watched-word.js
+++ b/app/assets/javascripts/admin/addon/components/admin-watched-word.js
@@ -1,23 +1,27 @@
-import Component from "@ember/component";
+import { classNames } from "@ember-decorators/component";
+import { inject as service } from "@ember/service";
 import { alias, equal } from "@ember/object/computed";
+import Component from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
 import { action } from "@ember/object";
 import I18n from "I18n";
-import { inject as service } from "@ember/service";
 
-export default Component.extend({
-  classNames: ["watched-word"],
-  dialog: service(),
+@classNames("watched-word")
+export default class AdminWatchedWord extends Component {
+  @service dialog;
 
-  isReplace: equal("actionKey", "replace"),
-  isTag: equal("actionKey", "tag"),
-  isLink: equal("actionKey", "link"),
-  isCaseSensitive: alias("word.case_sensitive"),
+  @equal("actionKey", "replace") isReplace;
+
+  @equal("actionKey", "tag") isTag;
+
+  @equal("actionKey", "link") isLink;
+
+  @alias("word.case_sensitive") isCaseSensitive;
 
   @discourseComputed("word.replacement")
   tags(replacement) {
     return replacement.split(",");
-  },
+  }
 
   @action
   deleteWord() {
@@ -33,5 +37,5 @@ export default Component.extend({
           })
         );
       });
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/components/admin-wrapper.js b/app/assets/javascripts/admin/addon/components/admin-wrapper.js
index d6a3564d420..98d18997d4f 100644
--- a/app/assets/javascripts/admin/addon/components/admin-wrapper.js
+++ b/app/assets/javascripts/admin/addon/components/admin-wrapper.js
@@ -1,14 +1,15 @@
 import Component from "@ember/component";
-export default Component.extend({
+
+export default class AdminWrapper extends Component {
   didInsertElement() {
-    this._super(...arguments);
+    super.didInsertElement(...arguments);
     document.querySelector("html").classList.add("admin-area");
     document.querySelector("body").classList.add("admin-interface");
-  },
+  }
 
   willDestroyElement() {
-    this._super(...arguments);
+    super.willDestroyElement(...arguments);
     document.querySelector("html").classList.remove("admin-area");
     document.querySelector("body").classList.remove("admin-interface");
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/components/cancel-link.js b/app/assets/javascripts/admin/addon/components/cancel-link.js
index 0e6d50b17d4..aa5d4dda65c 100644
--- a/app/assets/javascripts/admin/addon/components/cancel-link.js
+++ b/app/assets/javascripts/admin/addon/components/cancel-link.js
@@ -1,4 +1,5 @@
+import { tagName } from "@ember-decorators/component";
 import Component from "@ember/component";
-export default Component.extend({
-  tagName: "",
-});
+
+@tagName("")
+export default class CancelLink extends Component {}
diff --git a/app/assets/javascripts/discourse/app/templates/components/color-input.hbs b/app/assets/javascripts/admin/addon/components/color-input.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/color-input.hbs
rename to app/assets/javascripts/admin/addon/components/color-input.hbs
diff --git a/app/assets/javascripts/admin/addon/components/color-input.js b/app/assets/javascripts/admin/addon/components/color-input.js
index 2974b43871a..9c1c67f0442 100644
--- a/app/assets/javascripts/admin/addon/components/color-input.js
+++ b/app/assets/javascripts/admin/addon/components/color-input.js
@@ -1,6 +1,7 @@
+import { classNames } from "@ember-decorators/component";
 import { action, computed } from "@ember/object";
 import Component from "@ember/component";
-import { observes } from "discourse-common/utils/decorators";
+import { observes } from "@ember-decorators/object";
 
 /**
   An input field for a color.
@@ -9,20 +10,20 @@ import { observes } from "discourse-common/utils/decorators";
   @param brightnessValue is a number from 0 to 255 representing the brightness of the color. See ColorSchemeColor.
   @params valid is a boolean indicating if the input field is a valid color.
 **/
-export default Component.extend({
-  classNames: ["color-picker"],
+@classNames("color-picker")
+export default class ColorInput extends Component {
+  onlyHex = true;
+  styleSelection = true;
 
-  onlyHex: true,
-
-  styleSelection: true,
-
-  maxlength: computed("onlyHex", function () {
+  @computed("onlyHex")
+  get maxlength() {
     return this.onlyHex ? 6 : null;
-  }),
+  }
 
-  normalizedHexValue: computed("hexValue", function () {
+  @computed("hexValue")
+  get normalizedHexValue() {
     return this.normalize(this.hexValue);
-  }),
+  }
 
   normalize(color) {
     if (this._valid(color)) {
@@ -40,19 +41,19 @@ export default Component.extend({
       }
     }
     return color;
-  },
+  }
 
   @action
   onHexInput(color) {
     if (this.attrs.onChangeColor) {
       this.attrs.onChangeColor(this.normalize(color || ""));
     }
-  },
+  }
 
   @action
   onPickerInput(event) {
     this.set("hexValue", event.target.value.replace("#", ""));
-  },
+  }
 
   @observes("hexValue", "brightnessValue", "valid")
   hexValueChanged() {
@@ -65,9 +66,9 @@ export default Component.extend({
     if (this._valid()) {
       this.element.querySelector(".picker").value = this.normalize(hex);
     }
-  },
+  }
 
   _valid(color = this.hexValue) {
     return /^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$/.test(color);
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/dashboard-new-feature-item.hbs b/app/assets/javascripts/admin/addon/components/dashboard-new-feature-item.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/dashboard-new-feature-item.hbs
rename to app/assets/javascripts/admin/addon/components/dashboard-new-feature-item.hbs
diff --git a/app/assets/javascripts/admin/addon/components/dashboard-new-feature-item.js b/app/assets/javascripts/admin/addon/components/dashboard-new-feature-item.js
index 87d5ddb040f..80e6cd8a167 100644
--- a/app/assets/javascripts/admin/addon/components/dashboard-new-feature-item.js
+++ b/app/assets/javascripts/admin/addon/components/dashboard-new-feature-item.js
@@ -1,3 +1,3 @@
 import Component from "@ember/component";
 
-export default Component.extend({});
+export default class DashboardNewFeatureItem extends Component {}
diff --git a/app/assets/javascripts/admin/addon/templates/components/dashboard-new-features.hbs b/app/assets/javascripts/admin/addon/components/dashboard-new-features.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/dashboard-new-features.hbs
rename to app/assets/javascripts/admin/addon/components/dashboard-new-features.hbs
diff --git a/app/assets/javascripts/admin/addon/components/dashboard-new-features.js b/app/assets/javascripts/admin/addon/components/dashboard-new-features.js
index 6e8defb93c4..46b7559585b 100644
--- a/app/assets/javascripts/admin/addon/components/dashboard-new-features.js
+++ b/app/assets/javascripts/admin/addon/components/dashboard-new-features.js
@@ -1,18 +1,19 @@
+import { classNameBindings, classNames } from "@ember-decorators/component";
 import Component from "@ember/component";
 import { action, computed } from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 
-export default Component.extend({
-  newFeatures: null,
-  classNames: ["section", "dashboard-new-features"],
-  classNameBindings: ["hasUnseenFeatures:ordered-first"],
-  releaseNotesLink: null,
+@classNames("section", "dashboard-new-features")
+@classNameBindings("hasUnseenFeatures:ordered-first")
+export default class DashboardNewFeatures extends Component {
+  newFeatures = null;
+  releaseNotesLink = null;
 
-  init() {
-    this._super(...arguments);
+  constructor() {
+    super(...arguments);
 
     ajax("/admin/dashboard/new-features.json").then((json) => {
-      if (!this.element || this.isDestroying || this.isDestroyed) {
+      if (this.isDestroying || this.isDestroyed) {
         return;
       }
 
@@ -22,16 +23,17 @@ export default Component.extend({
         releaseNotesLink: json.release_notes_link,
       });
     });
-  },
+  }
 
-  columnCountClass: computed("newFeatures", function () {
+  @computed("newFeatures")
+  get columnCountClass() {
     return this.newFeatures.length > 2 ? "three-or-more-items" : "";
-  }),
+  }
 
   @action
   dismissNewFeatures() {
     ajax("/admin/dashboard/mark-new-features-as-seen.json", {
       type: "PUT",
     }).then(() => this.set("hasUnseenFeatures", false));
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/dashboard-problems.hbs b/app/assets/javascripts/admin/addon/components/dashboard-problems.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/dashboard-problems.hbs
rename to app/assets/javascripts/admin/addon/components/dashboard-problems.hbs
diff --git a/app/assets/javascripts/admin/addon/components/dashboard-problems.js b/app/assets/javascripts/admin/addon/components/dashboard-problems.js
index 87d5ddb040f..c4df8401e0f 100644
--- a/app/assets/javascripts/admin/addon/components/dashboard-problems.js
+++ b/app/assets/javascripts/admin/addon/components/dashboard-problems.js
@@ -1,3 +1,3 @@
 import Component from "@ember/component";
 
-export default Component.extend({});
+export default class DashboardProblems extends Component {}
diff --git a/app/assets/javascripts/admin/addon/templates/components/email-styles-editor.hbs b/app/assets/javascripts/admin/addon/components/email-styles-editor.hbs
similarity index 96%
rename from app/assets/javascripts/admin/addon/templates/components/email-styles-editor.hbs
rename to app/assets/javascripts/admin/addon/components/email-styles-editor.hbs
index 1ca8055f6b5..78b63780e11 100644
--- a/app/assets/javascripts/admin/addon/templates/components/email-styles-editor.hbs
+++ b/app/assets/javascripts/admin/addon/components/email-styles-editor.hbs
@@ -29,7 +29,7 @@
   @content={{this.editorContents}}
   @mode={{this.currentEditorMode}}
   @editorId={{this.editorId}}
-  @save={{action "save"}}
+  @save={{@save}}
 />
 
 <div class="admin-footer">
diff --git a/app/assets/javascripts/admin/addon/components/email-styles-editor.js b/app/assets/javascripts/admin/addon/components/email-styles-editor.js
index 48621b41cf3..2e1fc059be1 100644
--- a/app/assets/javascripts/admin/addon/components/email-styles-editor.js
+++ b/app/assets/javascripts/admin/addon/components/email-styles-editor.js
@@ -1,17 +1,19 @@
+import { action, computed } from "@ember/object";
+import { inject as service } from "@ember/service";
+import { reads } from "@ember/object/computed";
 import Component from "@ember/component";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
-import { reads } from "@ember/object/computed";
-import { inject as service } from "@ember/service";
 
-export default Component.extend({
-  dialog: service(),
-  editorId: reads("fieldName"),
+export default class EmailStylesEditor extends Component {
+  @service dialog;
+
+  @reads("fieldName") editorId;
 
   @discourseComputed("fieldName")
   currentEditorMode(fieldName) {
     return fieldName === "css" ? "scss" : fieldName;
-  },
+  }
 
   @discourseComputed("fieldName", "styles.html", "styles.css")
   resetDisabled(fieldName) {
@@ -19,36 +21,31 @@ export default Component.extend({
       this.get(`styles.${fieldName}`) ===
       this.get(`styles.default_${fieldName}`)
     );
-  },
+  }
 
-  @discourseComputed("styles", "fieldName")
-  editorContents: {
-    get(styles, fieldName) {
-      return styles[fieldName];
-    },
-    set(value, styles, fieldName) {
-      styles.setField(fieldName, value);
-      return value;
-    },
-  },
+  @computed("styles", "fieldName")
+  get editorContents() {
+    return this.styles[this.fieldName];
+  }
 
-  actions: {
-    reset() {
-      this.dialog.yesNoConfirm({
-        message: I18n.t("admin.customize.email_style.reset_confirm", {
-          fieldName: I18n.t(`admin.customize.email_style.${this.fieldName}`),
-        }),
-        didConfirm: () => {
-          this.styles.setField(
-            this.fieldName,
-            this.styles.get(`default_${this.fieldName}`)
-          );
-          this.notifyPropertyChange("editorContents");
-        },
-      });
-    },
-    save() {
-      this.attrs.save();
-    },
-  },
-});
+  set editorContents(value) {
+    this.styles.setField(this.fieldName, value);
+    return value;
+  }
+
+  @action
+  reset() {
+    this.dialog.yesNoConfirm({
+      message: I18n.t("admin.customize.email_style.reset_confirm", {
+        fieldName: I18n.t(`admin.customize.email_style.${this.fieldName}`),
+      }),
+      didConfirm: () => {
+        this.styles.setField(
+          this.fieldName,
+          this.styles.get(`default_${this.fieldName}`)
+        );
+        this.notifyPropertyChange("editorContents");
+      },
+    });
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/embeddable-host.hbs b/app/assets/javascripts/admin/addon/components/embeddable-host.hbs
similarity index 81%
rename from app/assets/javascripts/admin/addon/templates/components/embeddable-host.hbs
rename to app/assets/javascripts/admin/addon/components/embeddable-host.hbs
index f37f242ba09..55e4b3df3fa 100644
--- a/app/assets/javascripts/admin/addon/templates/components/embeddable-host.hbs
+++ b/app/assets/javascripts/admin/addon/components/embeddable-host.hbs
@@ -9,15 +9,6 @@
       autofocus={{true}}
     />
   </td>
-  <td class="editing-input">
-    <div class="label">{{i18n "admin.embedding.class_name"}}</div>
-    <Input
-      @value={{this.buffered.class_name}}
-      placeholder="class"
-      @enter={{action "save"}}
-      class="class-name"
-    />
-  </td>
   <td class="editing-input">
     <div class="label">{{i18n "admin.embedding.allowed_paths"}}</div>
     <Input
@@ -54,12 +45,6 @@
     <div class="label">{{i18n "admin.embedding.host"}}</div>
     {{this.host.host}}
   </td>
-  <td>
-    <div class="label">
-      {{i18n "admin.embedding.class_name"}}
-    </div>
-    {{this.host.class_name}}
-  </td>
   <td>
     <div class="label">
       {{i18n "admin.embedding.allowed_paths"}}
diff --git a/app/assets/javascripts/admin/addon/components/embeddable-host.js b/app/assets/javascripts/admin/addon/components/embeddable-host.js
index 320b173bfb5..2375aa81412 100644
--- a/app/assets/javascripts/admin/addon/components/embeddable-host.js
+++ b/app/assets/javascripts/admin/addon/components/embeddable-host.js
@@ -1,85 +1,91 @@
+import { action } from "@ember/object";
+import { tagName } from "@ember-decorators/component";
+import { inject as service } from "@ember/service";
+import { or } from "@ember/object/computed";
 import Category from "discourse/models/category";
 import Component from "@ember/component";
 import I18n from "I18n";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
 import discourseComputed from "discourse-common/utils/decorators";
-import { inject as service } from "@ember/service";
 import { isEmpty } from "@ember/utils";
-import { or } from "@ember/object/computed";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Component.extend(bufferedProperty("host"), {
-  editToggled: false,
-  tagName: "tr",
-  categoryId: null,
-  category: null,
-  dialog: service(),
+@tagName("tr")
+export default class EmbeddableHost extends Component.extend(
+  bufferedProperty("host")
+) {
+  @service dialog;
+  editToggled = false;
+  categoryId = null;
+  category = null;
 
-  editing: or("host.isNew", "editToggled"),
+  @or("host.isNew", "editToggled") editing;
 
   init() {
-    this._super(...arguments);
+    super.init(...arguments);
 
     const host = this.host;
     const categoryId = host.category_id || this.site.uncategorized_category_id;
     const category = Category.findById(categoryId);
 
     host.set("category", category);
-  },
+  }
 
   @discourseComputed("buffered.host", "host.isSaving")
   cantSave(host, isSaving) {
     return isSaving || isEmpty(host);
-  },
+  }
 
-  actions: {
-    edit() {
-      this.set("categoryId", this.get("host.category.id"));
-      this.set("editToggled", true);
-    },
+  @action
+  edit() {
+    this.set("categoryId", this.get("host.category.id"));
+    this.set("editToggled", true);
+  }
 
-    save() {
-      if (this.cantSave) {
-        return;
-      }
+  @action
+  save() {
+    if (this.cantSave) {
+      return;
+    }
 
-      const props = this.buffered.getProperties(
-        "host",
-        "allowed_paths",
-        "class_name"
-      );
-      props.category_id = this.categoryId;
+    const props = this.buffered.getProperties(
+      "host",
+      "allowed_paths",
+      "class_name"
+    );
+    props.category_id = this.categoryId;
 
-      const host = this.host;
+    const host = this.host;
 
-      host
-        .save(props)
-        .then(() => {
-          host.set("category", Category.findById(this.categoryId));
-          this.set("editToggled", false);
-        })
-        .catch(popupAjaxError);
-    },
-
-    delete() {
-      return this.dialog.confirm({
-        message: I18n.t("admin.embedding.confirm_delete"),
-        didConfirm: () => {
-          return this.host.destroyRecord().then(() => {
-            this.deleteHost(this.host);
-          });
-        },
-      });
-    },
-
-    cancel() {
-      const host = this.host;
-      if (host.get("isNew")) {
-        this.deleteHost(host);
-      } else {
-        this.rollbackBuffer();
+    host
+      .save(props)
+      .then(() => {
+        host.set("category", Category.findById(this.categoryId));
         this.set("editToggled", false);
-      }
-    },
-  },
-});
+      })
+      .catch(popupAjaxError);
+  }
+
+  @action
+  delete() {
+    return this.dialog.confirm({
+      message: I18n.t("admin.embedding.confirm_delete"),
+      didConfirm: () => {
+        return this.host.destroyRecord().then(() => {
+          this.deleteHost(this.host);
+        });
+      },
+    });
+  }
+
+  @action
+  cancel() {
+    const host = this.host;
+    if (host.get("isNew")) {
+      this.deleteHost(host);
+    } else {
+      this.rollbackBuffer();
+      this.set("editToggled", false);
+    }
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/embedding-setting.hbs b/app/assets/javascripts/admin/addon/components/embedding-setting.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/embedding-setting.hbs
rename to app/assets/javascripts/admin/addon/components/embedding-setting.hbs
diff --git a/app/assets/javascripts/admin/addon/components/embedding-setting.js b/app/assets/javascripts/admin/addon/components/embedding-setting.js
index f571d47cf61..85c26e7ea6d 100644
--- a/app/assets/javascripts/admin/addon/components/embedding-setting.js
+++ b/app/assets/javascripts/admin/addon/components/embedding-setting.js
@@ -1,33 +1,33 @@
+import { classNames } from "@ember-decorators/component";
+import { computed } from "@ember/object";
 import Component from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
 import { dasherize } from "@ember/string";
 
-export default Component.extend({
-  classNames: ["embed-setting"],
-
+@classNames("embed-setting")
+export default class EmbeddingSetting extends Component {
   @discourseComputed("field")
   inputId(field) {
     return dasherize(field);
-  },
+  }
 
   @discourseComputed("field")
   translationKey(field) {
     return `admin.embedding.${field}`;
-  },
+  }
 
   @discourseComputed("type")
   isCheckbox(type) {
     return type === "checkbox";
-  },
+  }
 
-  @discourseComputed("value")
-  checked: {
-    get(value) {
-      return !!value;
-    },
-    set(value) {
-      this.set("value", value);
-      return value;
-    },
-  },
-});
+  @computed("value")
+  get checked() {
+    return !!this.value;
+  }
+
+  set checked(value) {
+    this.set("value", value);
+    return value;
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/emoji-value-list.hbs b/app/assets/javascripts/admin/addon/components/emoji-value-list.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/emoji-value-list.hbs
rename to app/assets/javascripts/admin/addon/components/emoji-value-list.hbs
diff --git a/app/assets/javascripts/admin/addon/components/emoji-value-list.js b/app/assets/javascripts/admin/addon/components/emoji-value-list.js
index 3f2810383d0..40363b874d8 100644
--- a/app/assets/javascripts/admin/addon/components/emoji-value-list.js
+++ b/app/assets/javascripts/admin/addon/components/emoji-value-list.js
@@ -1,3 +1,4 @@
+import { classNameBindings } from "@ember-decorators/component";
 import Component from "@ember/component";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
@@ -6,12 +7,12 @@ import { action, set, setProperties } from "@ember/object";
 import { schedule } from "@ember/runloop";
 import discourseLater from "discourse-common/lib/later";
 
-export default Component.extend({
-  classNameBindings: [":value-list", ":emoji-list"],
-  values: null,
-  validationMessage: null,
-  emojiPickerIsActive: false,
-  isEditorFocused: false,
+@classNameBindings(":value-list", ":emoji-list")
+export default class EmojiValueList extends Component {
+  values = null;
+  validationMessage = null;
+  emojiPickerIsActive = false;
+  isEditorFocused = false;
 
   @discourseComputed("values")
   collection(values) {
@@ -28,14 +29,14 @@ export default Component.extend({
           emojiUrl: emojiUrlFor(value),
         };
       });
-  },
+  }
 
   @action
   closeEmojiPicker() {
     this.collection.setEach("isEditing", false);
     this.set("emojiPickerIsActive", false);
     this.set("isEditorFocused", false);
-  },
+  }
 
   @action
   emojiSelected(code) {
@@ -65,12 +66,12 @@ export default Component.extend({
 
     this.set("emojiPickerIsActive", false);
     this.set("isEditorFocused", false);
-  },
+  }
 
   @discourseComputed("collection")
   showUpDownButtons(collection) {
     return collection.length - 1 ? true : false;
-  },
+  }
 
   _splitValues(values) {
     if (values && values.length) {
@@ -91,7 +92,7 @@ export default Component.extend({
     } else {
       return [];
     }
-  },
+  }
 
   @action
   editValue(index) {
@@ -111,12 +112,12 @@ export default Component.extend({
         }
       }, 100);
     });
-  },
+  }
 
   @action
   removeValue(value) {
     this._removeValue(value);
-  },
+  }
 
   @action
   shift(operation, index) {
@@ -133,7 +134,7 @@ export default Component.extend({
     this.collection.insertAt(futureIndex, shiftedEmoji);
 
     this._saveValues();
-  },
+  }
 
   _validateInput(input) {
     this.set("validationMessage", null);
@@ -147,12 +148,12 @@ export default Component.extend({
     }
 
     return true;
-  },
+  }
 
   _removeValue(value) {
     this.collection.removeObject(value);
     this._saveValues();
-  },
+  }
 
   _replaceValue(index, newValue) {
     const item = this.collection[index];
@@ -161,9 +162,9 @@ export default Component.extend({
     }
     set(item, "value", newValue);
     this._saveValues();
-  },
+  }
 
   _saveValues() {
     this.set("values", this.collection.mapBy("value").join("|"));
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/flag-user-lists.hbs b/app/assets/javascripts/admin/addon/components/flag-user-lists.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/flag-user-lists.hbs
rename to app/assets/javascripts/admin/addon/components/flag-user-lists.hbs
diff --git a/app/assets/javascripts/admin/addon/components/flag-user-lists.js b/app/assets/javascripts/admin/addon/components/flag-user-lists.js
index 8b886047689..0096ce0a575 100644
--- a/app/assets/javascripts/admin/addon/components/flag-user-lists.js
+++ b/app/assets/javascripts/admin/addon/components/flag-user-lists.js
@@ -1,4 +1,5 @@
+import { classNames } from "@ember-decorators/component";
 import Component from "@ember/component";
-export default Component.extend({
-  classNames: ["flag-user-lists"],
-});
+
+@classNames("flag-user-lists")
+export default class FlagUserLists extends Component {}
diff --git a/app/assets/javascripts/admin/addon/templates/components/flag-user.hbs b/app/assets/javascripts/admin/addon/components/flag-user.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/flag-user.hbs
rename to app/assets/javascripts/admin/addon/components/flag-user.hbs
diff --git a/app/assets/javascripts/admin/addon/components/flag-user.js b/app/assets/javascripts/admin/addon/components/flag-user.js
index 87d5ddb040f..ef9b83f7803 100644
--- a/app/assets/javascripts/admin/addon/components/flag-user.js
+++ b/app/assets/javascripts/admin/addon/components/flag-user.js
@@ -1,3 +1,3 @@
 import Component from "@ember/component";
 
-export default Component.extend({});
+export default class FlagUser extends Component {}
diff --git a/app/assets/javascripts/admin/addon/components/form-template/form.hbs b/app/assets/javascripts/admin/addon/components/form-template/form.hbs
new file mode 100644
index 00000000000..01b8caf4d42
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/components/form-template/form.hbs
@@ -0,0 +1,78 @@
+<div class="form-templates__form">
+  <div class="control-group">
+    <label for="template-name">
+      {{i18n "admin.form_templates.new_template_form.name.label"}}
+    </label>
+    <TextField
+      @value={{this.templateName}}
+      @name="template-name"
+      @class="form-templates__form-name-input"
+      @placeholderKey="admin.form_templates.new_template_form.name.placeholder"
+    />
+  </div>
+  <div class="control-group form-templates__editor">
+    <div class="form-templates__quick-insert-field-buttons">
+      <span>
+        {{I18n "admin.form_templates.quick_insert_fields.add_new_field"}}
+      </span>
+      {{#each this.quickInsertFields as |field|}}
+        <DButton
+          @class="btn-flat btn-icon-text quick-insert-{{field.type}}"
+          @icon={{field.icon}}
+          @label="admin.form_templates.quick_insert_fields.{{field.type}}"
+          @action={{this.onInsertField}}
+          @actionParam={{field.type}}
+        />
+      {{/each}}
+      <DButton
+        class="btn-flat btn-icon-text form-templates__validations-modal-button"
+        @label="admin.form_templates.validations_modal.button_title"
+        @icon="check-circle"
+        @action={{this.showValidationOptionsModal}}
+      />
+    </div>
+    <DButton
+      @class="form-templates__preview-button"
+      @icon="eye"
+      @label="admin.form_templates.new_template_form.preview"
+      @action={{this.showPreview}}
+      @disabled={{this.disablePreviewButton}}
+    />
+  </div>
+
+  <div class="control-group">
+    <AceEditor @content={{this.templateContent}} @mode="yaml" />
+  </div>
+
+  <div class="footer-buttons">
+    <DButton
+      @class="btn-primary"
+      @label="admin.form_templates.new_template_form.submit"
+      @icon="check"
+      @action={{this.onSubmit}}
+      @disabled={{this.disableSubmitButton}}
+    />
+
+    <DButton
+      @label="admin.form_templates.new_template_form.cancel"
+      @icon="times"
+      @action={{this.onCancel}}
+    />
+
+    {{#if this.isEditing}}
+      <DButton
+        @class="btn-danger"
+        @label="admin.form_templates.view_template.delete"
+        @icon="trash-alt"
+        @action={{this.onDelete}}
+      />
+    {{/if}}
+  </div>
+</div>
+
+{{#if this.showFormTemplateFormPreview}}
+  <Modal::FormTemplateFormPreview
+    @closeModal={{fn (mut this.showFormTemplateFormPreview) false}}
+    @content={{this.templateContent}}
+  />
+{{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/components/form-template/form.js b/app/assets/javascripts/admin/addon/components/form-template/form.js
new file mode 100644
index 00000000000..0666eb26e14
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/components/form-template/form.js
@@ -0,0 +1,137 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+import { tracked } from "@glimmer/tracking";
+import I18n from "I18n";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { templateFormFields } from "admin/lib/template-form-fields";
+import FormTemplate from "admin/models/form-template";
+import showModal from "discourse/lib/show-modal";
+
+export default class FormTemplateForm extends Component {
+  @service router;
+  @service dialog;
+  @tracked formSubmitted = false;
+  @tracked templateContent = this.args.model?.template || "";
+  @tracked templateName = this.args.model?.name || "";
+  @tracked showFormTemplateFormPreview;
+  isEditing = this.args.model?.id ? true : false;
+  quickInsertFields = [
+    {
+      type: "checkbox",
+      icon: "check-square",
+    },
+    {
+      type: "input",
+      icon: "grip-lines",
+    },
+    {
+      type: "textarea",
+      icon: "align-left",
+    },
+    {
+      type: "dropdown",
+      icon: "chevron-circle-down",
+    },
+    {
+      type: "upload",
+      icon: "cloud-upload-alt",
+    },
+    {
+      type: "multiselect",
+      icon: "bullseye",
+    },
+  ];
+
+  get disablePreviewButton() {
+    return Boolean(!this.templateName.length || !this.templateContent.length);
+  }
+
+  get disableSubmitButton() {
+    return (
+      Boolean(!this.templateName.length || !this.templateContent.length) ||
+      this.formSubmitted
+    );
+  }
+
+  @action
+  onSubmit() {
+    if (!this.formSubmitted) {
+      this.formSubmitted = true;
+    }
+
+    const postData = {
+      name: this.templateName,
+      template: this.templateContent,
+    };
+
+    if (this.isEditing) {
+      postData["id"] = this.args.model.id;
+    }
+
+    FormTemplate.createOrUpdateTemplate(postData)
+      .then(() => {
+        this.formSubmitted = false;
+        this.router.transitionTo("adminCustomizeFormTemplates.index");
+      })
+      .catch((e) => {
+        popupAjaxError(e);
+        this.formSubmitted = false;
+      });
+  }
+
+  @action
+  onCancel() {
+    this.router.transitionTo("adminCustomizeFormTemplates.index");
+  }
+
+  @action
+  onDelete() {
+    return this.dialog.yesNoConfirm({
+      message: I18n.t("admin.form_templates.delete_confirm"),
+      didConfirm: () => {
+        FormTemplate.deleteTemplate(this.args.model.id)
+          .then(() => {
+            this.router.transitionTo("adminCustomizeFormTemplates.index");
+          })
+          .catch(popupAjaxError);
+      },
+    });
+  }
+
+  @action
+  onInsertField(type) {
+    const structure = templateFormFields.findBy("type", type).structure;
+
+    if (this.templateContent.length === 0) {
+      this.templateContent += structure;
+    } else {
+      this.templateContent += `\n${structure}`;
+    }
+  }
+
+  @action
+  showValidationOptionsModal() {
+    return showModal("admin-form-template-validation-options", {
+      admin: true,
+    });
+  }
+
+  @action
+  showPreview() {
+    const data = {
+      name: this.templateName,
+      template: this.templateContent,
+    };
+
+    if (this.isEditing) {
+      data["id"] = this.args.model.id;
+    }
+
+    FormTemplate.validateTemplate(data)
+      .then(() => {
+        this.showFormTemplateFormPreview = true;
+      })
+      .catch(popupAjaxError);
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/components/form-template/info-header.hbs b/app/assets/javascripts/admin/addon/components/form-template/info-header.hbs
new file mode 100644
index 00000000000..e9821a56017
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/components/form-template/info-header.hbs
@@ -0,0 +1,4 @@
+<div class="form-templates--info">
+  <h2>{{i18n "admin.form_templates.title"}}</h2>
+  <p class="desc">{{i18n "admin.form_templates.help"}}</p>
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/components/form-template/row-item.hbs b/app/assets/javascripts/admin/addon/components/form-template/row-item.hbs
new file mode 100644
index 00000000000..c7c1791b260
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/components/form-template/row-item.hbs
@@ -0,0 +1,36 @@
+<tr class="admin-list-item">
+  <td class="col first">{{@template.name}}</td>
+  <td class="col categories">
+    {{#each this.activeCategories as |category|}}
+      {{category-link category}}
+    {{/each}}
+  </td>
+  <td class="col action">
+    <DButton
+      @title="admin.form_templates.list_table.actions.view"
+      @icon="far-eye"
+      @class="btn-view-template"
+      @action={{fn (mut this.showViewTemplateModal) true}}
+    />
+    <DButton
+      @title="admin.form_templates.list_table.actions.edit"
+      @icon="pencil-alt"
+      @class="btn-edit-template"
+      @action={{this.editTemplate}}
+    />
+    <DButton
+      @title="admin.form_templates.list_table.actions.delete"
+      @icon="far-trash-alt"
+      @class="btn-danger btn-delete-template"
+      @action={{this.deleteTemplate}}
+    />
+  </td>
+</tr>
+
+{{#if this.showViewTemplateModal}}
+  <Modal::CustomizeFormTemplateView
+    @closeModal={{fn (mut this.showViewTemplateModal) false}}
+    @model={{@template}}
+    @refreshModel={{@refreshModel}}
+  />
+{{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/components/form-template/row-item.js b/app/assets/javascripts/admin/addon/components/form-template/row-item.js
new file mode 100644
index 00000000000..f95df2bb5ce
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/components/form-template/row-item.js
@@ -0,0 +1,44 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+import { ajax } from "discourse/lib/ajax";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import I18n from "I18n";
+
+export default class FormTemplateRowItem extends Component {
+  @service router;
+  @service dialog;
+  @service site;
+
+  get activeCategories() {
+    return this.site.categories?.filter((c) =>
+      c["form_template_ids"].includes(this.args.template.id)
+    );
+  }
+
+  @action
+  editTemplate() {
+    this.router.transitionTo(
+      "adminCustomizeFormTemplates.edit",
+      this.args.template
+    );
+  }
+
+  @action
+  deleteTemplate() {
+    return this.dialog.yesNoConfirm({
+      message: I18n.t("admin.form_templates.delete_confirm", {
+        template_name: this.args.template.name,
+      }),
+      didConfirm: () => {
+        ajax(`/admin/customize/form-templates/${this.args.template.id}.json`, {
+          type: "DELETE",
+        })
+          .then(() => {
+            this.args.refreshModel();
+          })
+          .catch(popupAjaxError);
+      },
+    });
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/highlighted-code.hbs b/app/assets/javascripts/admin/addon/components/highlighted-code.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/highlighted-code.hbs
rename to app/assets/javascripts/admin/addon/components/highlighted-code.hbs
diff --git a/app/assets/javascripts/admin/addon/components/highlighted-code.js b/app/assets/javascripts/admin/addon/components/highlighted-code.js
index 21cfaf6b154..782754682f3 100644
--- a/app/assets/javascripts/admin/addon/components/highlighted-code.js
+++ b/app/assets/javascripts/admin/addon/components/highlighted-code.js
@@ -1,11 +1,11 @@
-import { observes, on } from "discourse-common/utils/decorators";
+import { observes, on } from "@ember-decorators/object";
 import Component from "@ember/component";
 import highlightSyntax from "discourse/lib/highlight-syntax";
 
-export default Component.extend({
+export default class HighlightedCode extends Component {
   @on("didInsertElement")
   @observes("code")
   _refresh() {
     highlightSyntax(this.element, this.siteSettings, this.session);
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/inline-edit-checkbox.hbs b/app/assets/javascripts/admin/addon/components/inline-edit-checkbox.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/inline-edit-checkbox.hbs
rename to app/assets/javascripts/admin/addon/components/inline-edit-checkbox.hbs
diff --git a/app/assets/javascripts/admin/addon/components/inline-edit-checkbox.js b/app/assets/javascripts/admin/addon/components/inline-edit-checkbox.js
index cfbd2f82f98..8618e4044b4 100644
--- a/app/assets/javascripts/admin/addon/components/inline-edit-checkbox.js
+++ b/app/assets/javascripts/admin/addon/components/inline-edit-checkbox.js
@@ -1,15 +1,15 @@
+import { classNames } from "@ember-decorators/component";
 import Component from "@ember/component";
 import { action } from "@ember/object";
 import discourseComputed from "discourse-common/utils/decorators";
 
-export default Component.extend({
-  classNames: ["inline-edit"],
-
-  buffer: null,
-  bufferModelId: null,
+@classNames("inline-edit")
+export default class InlineEditCheckbox extends Component {
+  buffer = null;
+  bufferModelId = null;
 
   didReceiveAttrs() {
-    this._super(...arguments);
+    super.didReceiveAttrs(...arguments);
 
     if (this.modelId !== this.bufferModelId) {
       // HACK: The condition above ensures this method is called only when its
@@ -24,21 +24,21 @@ export default Component.extend({
         bufferModelId: this.modelId,
       });
     }
-  },
+  }
 
   @discourseComputed("checked", "buffer")
   changed(checked, buffer) {
     return !!checked !== !!buffer;
-  },
+  }
 
   @action
   apply() {
     this.set("checked", this.buffer);
     this.action();
-  },
+  }
 
   @action
   cancel() {
     this.set("buffer", this.checked);
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/install-theme-item.hbs b/app/assets/javascripts/admin/addon/components/install-theme-item.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/install-theme-item.hbs
rename to app/assets/javascripts/admin/addon/components/install-theme-item.hbs
diff --git a/app/assets/javascripts/admin/addon/components/install-theme-item.js b/app/assets/javascripts/admin/addon/components/install-theme-item.js
index b8d8823109d..459dc5dc673 100644
--- a/app/assets/javascripts/admin/addon/components/install-theme-item.js
+++ b/app/assets/javascripts/admin/addon/components/install-theme-item.js
@@ -1,4 +1,5 @@
+import { classNames } from "@ember-decorators/component";
 import Component from "@ember/component";
-export default Component.extend({
-  classNames: ["install-theme-item"],
-});
+
+@classNames("install-theme-item")
+export default class InstallThemeItem extends Component {}
diff --git a/app/assets/javascripts/admin/addon/templates/components/ip-lookup.hbs b/app/assets/javascripts/admin/addon/components/ip-lookup.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/ip-lookup.hbs
rename to app/assets/javascripts/admin/addon/components/ip-lookup.hbs
diff --git a/app/assets/javascripts/admin/addon/components/ip-lookup.js b/app/assets/javascripts/admin/addon/components/ip-lookup.js
index 02a52405645..42c5f128116 100644
--- a/app/assets/javascripts/admin/addon/components/ip-lookup.js
+++ b/app/assets/javascripts/admin/addon/components/ip-lookup.js
@@ -1,3 +1,5 @@
+import { classNames } from "@ember-decorators/component";
+import { inject as service } from "@ember/service";
 import AdminUser from "admin/models/admin-user";
 import Component from "@ember/component";
 import EmberObject, { action } from "@ember/object";
@@ -6,12 +8,11 @@ import { ajax } from "discourse/lib/ajax";
 import copyText from "discourse/lib/copy-text";
 import discourseComputed from "discourse-common/utils/decorators";
 import discourseLater from "discourse-common/lib/later";
-import { inject as service } from "@ember/service";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Component.extend({
-  classNames: ["ip-lookup"],
-  dialog: service(),
+@classNames("ip-lookup")
+export default class IpLookup extends Component {
+  @service dialog;
 
   @discourseComputed("other_accounts.length", "totalOthersWithSameIP")
   otherAccountsToDelete(otherAccountsLength, totalOthersWithSameIP) {
@@ -19,101 +20,100 @@ export default Component.extend({
     const total = Math.min(50, totalOthersWithSameIP || 0);
     const visible = Math.min(50, otherAccountsLength || 0);
     return Math.max(visible, total);
-  },
+  }
 
   @action
   hide(event) {
     event?.preventDefault();
     this.set("show", false);
-  },
+  }
 
-  actions: {
-    lookup() {
-      this.set("show", true);
+  @action
+  lookup() {
+    this.set("show", true);
 
-      if (!this.location) {
-        ajax("/admin/users/ip-info", {
-          data: { ip: this.ip },
-        }).then((location) =>
-          this.set("location", EmberObject.create(location))
-        );
-      }
+    if (!this.location) {
+      ajax("/admin/users/ip-info", {
+        data: { ip: this.ip },
+      }).then((location) => this.set("location", EmberObject.create(location)));
+    }
 
-      if (!this.other_accounts) {
-        this.set("otherAccountsLoading", true);
+    if (!this.other_accounts) {
+      this.set("otherAccountsLoading", true);
 
-        const data = {
-          ip: this.ip,
-          exclude: this.userId,
-          order: "trust_level DESC",
-        };
+      const data = {
+        ip: this.ip,
+        exclude: this.userId,
+        order: "trust_level DESC",
+      };
 
-        ajax("/admin/users/total-others-with-same-ip", {
-          data,
-        }).then((result) => this.set("totalOthersWithSameIP", result.total));
+      ajax("/admin/users/total-others-with-same-ip", {
+        data,
+      }).then((result) => this.set("totalOthersWithSameIP", result.total));
 
-        AdminUser.findAll("active", data).then((users) => {
-          this.setProperties({
-            other_accounts: users,
-            otherAccountsLoading: false,
-          });
+      AdminUser.findAll("active", data).then((users) => {
+        this.setProperties({
+          other_accounts: users,
+          otherAccountsLoading: false,
         });
-      }
-    },
-
-    copy() {
-      let text = `IP: ${this.ip}\n`;
-      const location = this.location;
-      if (location) {
-        if (location.hostname) {
-          text += `${I18n.t("ip_lookup.hostname")}: ${location.hostname}\n`;
-        }
-
-        text += I18n.t("ip_lookup.location");
-        if (location.location) {
-          text += `: ${location.location}\n`;
-        } else {
-          text += `: ${I18n.t("ip_lookup.location_not_found")}\n`;
-        }
-
-        if (location.organization) {
-          text += I18n.t("ip_lookup.organisation");
-          text += `: ${location.organization}\n`;
-        }
-      }
-
-      const $copyRange = $('<p id="copy-range"></p>');
-      $copyRange.html(text.trim().replace(/\n/g, "<br>"));
-      $(document.body).append($copyRange);
-      if (copyText(text, $copyRange[0])) {
-        this.set("copied", true);
-        discourseLater(() => this.set("copied", false), 2000);
-      }
-      $copyRange.remove();
-    },
-
-    deleteOtherAccounts() {
-      this.dialog.yesNoConfirm({
-        message: I18n.t("ip_lookup.confirm_delete_other_accounts"),
-        didConfirm: () => {
-          this.setProperties({
-            other_accounts: null,
-            otherAccountsLoading: true,
-            totalOthersWithSameIP: null,
-          });
-
-          ajax("/admin/users/delete-others-with-same-ip.json", {
-            type: "DELETE",
-            data: {
-              ip: this.ip,
-              exclude: this.userId,
-              order: "trust_level DESC",
-            },
-          })
-            .catch(popupAjaxError)
-            .finally(this.send("lookup"));
-        },
       });
-    },
-  },
-});
+    }
+  }
+
+  @action
+  copy() {
+    let text = `IP: ${this.ip}\n`;
+    const location = this.location;
+    if (location) {
+      if (location.hostname) {
+        text += `${I18n.t("ip_lookup.hostname")}: ${location.hostname}\n`;
+      }
+
+      text += I18n.t("ip_lookup.location");
+      if (location.location) {
+        text += `: ${location.location}\n`;
+      } else {
+        text += `: ${I18n.t("ip_lookup.location_not_found")}\n`;
+      }
+
+      if (location.organization) {
+        text += I18n.t("ip_lookup.organisation");
+        text += `: ${location.organization}\n`;
+      }
+    }
+
+    const $copyRange = $('<p id="copy-range"></p>');
+    $copyRange.html(text.trim().replace(/\n/g, "<br>"));
+    $(document.body).append($copyRange);
+    if (copyText(text, $copyRange[0])) {
+      this.set("copied", true);
+      discourseLater(() => this.set("copied", false), 2000);
+    }
+    $copyRange.remove();
+  }
+
+  @action
+  deleteOtherAccounts() {
+    this.dialog.yesNoConfirm({
+      message: I18n.t("ip_lookup.confirm_delete_other_accounts"),
+      didConfirm: () => {
+        this.setProperties({
+          other_accounts: null,
+          otherAccountsLoading: true,
+          totalOthersWithSameIP: null,
+        });
+
+        ajax("/admin/users/delete-others-with-same-ip.json", {
+          type: "DELETE",
+          data: {
+            ip: this.ip,
+            exclude: this.userId,
+            order: "trust_level DESC",
+          },
+        })
+          .catch(popupAjaxError)
+          .finally(this.send("lookup"));
+      },
+    });
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/components/modal/delete-posts-confirmation.hbs b/app/assets/javascripts/admin/addon/components/modal/delete-posts-confirmation.hbs
new file mode 100644
index 00000000000..8d8680d9b62
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/components/modal/delete-posts-confirmation.hbs
@@ -0,0 +1,36 @@
+<DModal
+  @title={{html-safe
+    (i18n
+      "admin.user.delete_posts.confirmation.title" username=@model.user.username
+    )
+  }}
+  @closeModal={{@closeModal}}
+>
+  <:body>
+    <p>{{html-safe
+        (i18n
+          "admin.user.delete_posts.confirmation.description"
+          username=@model.user.username
+          post_count=@model.user.post_count
+          text=this.text
+        )
+      }}</p>
+    <Input @type="text" @value={{this.value}} />
+  </:body>
+  <:footer>
+    <DButton
+      class="btn-danger"
+      @action={{@model.deleteAllPosts}}
+      @icon="trash-alt"
+      @disabled={{this.deleteDisabled}}
+      @translatedLabel={{i18n
+        "admin.user.delete_posts.confirmation.delete"
+        username=@model.user.username
+      }}
+    />
+    <DButton
+      @action={{@closeModal}}
+      @label="admin.user.delete_posts.confirmation.cancel"
+    />
+  </:footer>
+</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/components/modal/delete-posts-confirmation.js b/app/assets/javascripts/admin/addon/components/modal/delete-posts-confirmation.js
new file mode 100644
index 00000000000..62d8dadfe35
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/components/modal/delete-posts-confirmation.js
@@ -0,0 +1,18 @@
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import I18n from "I18n";
+
+export default class DeletePostsConfirmation extends Component {
+  @tracked value;
+
+  get text() {
+    return I18n.t("admin.user.delete_posts.confirmation.text", {
+      username: this.args.model.user.username,
+      post_count: this.args.model.user.post_count,
+    });
+  }
+
+  get deleteDisabled() {
+    return !this.value || this.text !== this.value;
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/components/modal/incoming-email.hbs b/app/assets/javascripts/admin/addon/components/modal/incoming-email.hbs
new file mode 100644
index 00000000000..e1beb0f6664
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/components/modal/incoming-email.hbs
@@ -0,0 +1,54 @@
+<DModal
+  class="admin-incoming-email-modal"
+  @title={{i18n "admin.email.incoming_emails.modal.title"}}
+  @closeModal={{@closeModal}}
+  @bodyClass="incoming-emails"
+>
+  <:body>
+    <div class="control-group">
+      <label>{{i18n "admin.email.incoming_emails.modal.error"}}</label>
+      <div class="controls">
+        <p>{{@model.error}}</p>
+        {{#if @model.error_description}}
+          <p class="error-description">{{@model.error_description}}</p>
+        {{/if}}
+      </div>
+    </div>
+
+    <hr />
+
+    <div class="control-group">
+      <label>{{i18n "admin.email.incoming_emails.modal.headers"}}</label>
+      <div class="controls">
+        <Textarea @value={{@model.headers}} wrap="off" />
+      </div>
+    </div>
+
+    <div class="control-group">
+      <label>{{i18n "admin.email.incoming_emails.modal.subject"}}</label>
+      <div class="controls">
+        {{@model.subject}}
+      </div>
+    </div>
+
+    <div class="control-group">
+      <label>{{i18n "admin.email.incoming_emails.modal.body"}}</label>
+      <div class="controls">
+        <Textarea @value={{@model.body}} />
+      </div>
+    </div>
+
+    {{#if @model.rejection_message}}
+      <hr />
+
+      <div class="control-group">
+        <label>{{i18n
+            "admin.email.incoming_emails.modal.rejection_message"
+          }}</label>
+        <div class="controls">
+          <Textarea @value={{@model.rejection_message}} />
+        </div>
+      </div>
+    {{/if}}
+  </:body>
+</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/components/moderation-history-item.js b/app/assets/javascripts/admin/addon/components/moderation-history-item.js
index 7f039c061e1..a94d4e65532 100644
--- a/app/assets/javascripts/admin/addon/components/moderation-history-item.js
+++ b/app/assets/javascripts/admin/addon/components/moderation-history-item.js
@@ -1,4 +1,5 @@
+import { tagName } from "@ember-decorators/component";
 import Component from "@ember/component";
-export default Component.extend({
-  tagName: "tr",
-});
+
+@tagName("tr")
+export default class ModerationHistoryItem extends Component {}
diff --git a/app/assets/javascripts/admin/addon/templates/components/permalink-form.hbs b/app/assets/javascripts/admin/addon/components/permalink-form.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/permalink-form.hbs
rename to app/assets/javascripts/admin/addon/components/permalink-form.hbs
diff --git a/app/assets/javascripts/admin/addon/components/permalink-form.js b/app/assets/javascripts/admin/addon/components/permalink-form.js
index 9c0c64de6b3..129ab0d58e4 100644
--- a/app/assets/javascripts/admin/addon/components/permalink-form.js
+++ b/app/assets/javascripts/admin/addon/components/permalink-form.js
@@ -1,3 +1,5 @@
+import { tagName } from "@ember-decorators/component";
+import { inject as service } from "@ember/service";
 import Component from "@ember/component";
 import I18n from "I18n";
 import Permalink from "admin/models/permalink";
@@ -5,16 +7,18 @@ import discourseComputed, { bind } from "discourse-common/utils/decorators";
 import { fmt } from "discourse/lib/computed";
 import { schedule } from "@ember/runloop";
 import { action } from "@ember/object";
-import { inject as service } from "@ember/service";
 
-export default Component.extend({
-  tagName: "",
-  dialog: service(),
-  formSubmitted: false,
-  permalinkType: "topic_id",
-  permalinkTypePlaceholder: fmt("permalinkType", "admin.permalink.%@"),
-  action: null,
-  permalinkTypeValue: null,
+@tagName("")
+export default class PermalinkForm extends Component {
+  @service dialog;
+
+  formSubmitted = false;
+  permalinkType = "topic_id";
+
+  @fmt("permalinkType", "admin.permalink.%@") permalinkTypePlaceholder;
+
+  action = null;
+  permalinkTypeValue = null;
 
   @discourseComputed
   permalinkTypes() {
@@ -25,21 +29,21 @@ export default Component.extend({
       { id: "tag_name", name: I18n.t("admin.permalink.tag_name") },
       { id: "external_url", name: I18n.t("admin.permalink.external_url") },
     ];
-  },
+  }
 
   @bind
   focusPermalink() {
     schedule("afterRender", () =>
       document.querySelector(".permalink-url")?.focus()
     );
-  },
+  }
 
   @action
   submitFormOnEnter(event) {
     if (event.key === "Enter") {
       this.onSubmit();
     }
-  },
+  }
 
   @action
   onSubmit() {
@@ -84,5 +88,5 @@ export default Component.extend({
           }
         );
     }
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/components/plugin-commit-hash.hbs b/app/assets/javascripts/admin/addon/components/plugin-commit-hash.hbs
new file mode 100644
index 00000000000..f9dabfbfba6
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/components/plugin-commit-hash.hbs
@@ -0,0 +1,9 @@
+{{#if this.commitHash}}
+  <a
+    href={{@plugin.commit_url}}
+    target="_blank"
+    rel="noopener noreferrer"
+    class="current commit-hash"
+    title={{this.commitHash}}
+  >{{this.shortCommitHash}}</a>
+{{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/components/plugin-commit-hash.js b/app/assets/javascripts/admin/addon/components/plugin-commit-hash.js
new file mode 100644
index 00000000000..0848db33c5e
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/components/plugin-commit-hash.js
@@ -0,0 +1,11 @@
+import Component from "@glimmer/component";
+
+export default class PluginCommitHash extends Component {
+  get shortCommitHash() {
+    return this.commitHash?.slice(0, 7);
+  }
+
+  get commitHash() {
+    return this.args.plugin.commit_hash;
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/report-filters/bool.hbs b/app/assets/javascripts/admin/addon/components/report-filters/bool.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/report-filters/bool.hbs
rename to app/assets/javascripts/admin/addon/components/report-filters/bool.hbs
diff --git a/app/assets/javascripts/admin/addon/components/report-filters/bool.js b/app/assets/javascripts/admin/addon/components/report-filters/bool.js
index 544709791c0..d406b1e87e5 100644
--- a/app/assets/javascripts/admin/addon/components/report-filters/bool.js
+++ b/app/assets/javascripts/admin/addon/components/report-filters/bool.js
@@ -1,16 +1,16 @@
 import FilterComponent from "admin/components/report-filters/filter";
 import { action } from "@ember/object";
 
-export default FilterComponent.extend({
-  checked: false,
+export default class Bool extends FilterComponent {
+  checked = false;
 
   didReceiveAttrs() {
-    this._super(...arguments);
+    super.didReceiveAttrs(...arguments);
     this.set("checked", !!this.filter.default);
-  },
+  }
 
   @action
   onChange() {
     this.applyFilter(this.filter.id, !this.checked || undefined);
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/report-filters/category.hbs b/app/assets/javascripts/admin/addon/components/report-filters/category.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/report-filters/category.hbs
rename to app/assets/javascripts/admin/addon/components/report-filters/category.hbs
diff --git a/app/assets/javascripts/admin/addon/components/report-filters/category.js b/app/assets/javascripts/admin/addon/components/report-filters/category.js
index 877c3aee7a2..c32e99c50f7 100644
--- a/app/assets/javascripts/admin/addon/components/report-filters/category.js
+++ b/app/assets/javascripts/admin/addon/components/report-filters/category.js
@@ -1,12 +1,12 @@
+import { readOnly } from "@ember/object/computed";
 import FilterComponent from "admin/components/report-filters/filter";
 import { action } from "@ember/object";
-import { readOnly } from "@ember/object/computed";
 
-export default FilterComponent.extend({
-  category: readOnly("filter.default"),
+export default class Category extends FilterComponent {
+  @readOnly("filter.default") category;
 
   @action
   onChange(categoryId) {
     this.applyFilter(this.filter.id, categoryId || undefined);
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/components/report-filters/filter.js b/app/assets/javascripts/admin/addon/components/report-filters/filter.js
index e89fb383865..697611d1ac5 100644
--- a/app/assets/javascripts/admin/addon/components/report-filters/filter.js
+++ b/app/assets/javascripts/admin/addon/components/report-filters/filter.js
@@ -1,9 +1,9 @@
 import Component from "@ember/component";
 import { action } from "@ember/object";
 
-export default Component.extend({
+export default class Filter extends Component {
   @action
   onChange(value) {
     this.applyFilter(this.filter.id, value);
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/report-filters/group.hbs b/app/assets/javascripts/admin/addon/components/report-filters/group.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/report-filters/group.hbs
rename to app/assets/javascripts/admin/addon/components/report-filters/group.hbs
diff --git a/app/assets/javascripts/admin/addon/components/report-filters/group.js b/app/assets/javascripts/admin/addon/components/report-filters/group.js
index 30dd4c7b1b9..8ac7eb3b9a2 100644
--- a/app/assets/javascripts/admin/addon/components/report-filters/group.js
+++ b/app/assets/javascripts/admin/addon/components/report-filters/group.js
@@ -1,18 +1,18 @@
-import FilterComponent from "admin/components/report-filters/filter";
+import { classNames } from "@ember-decorators/component";
 import { computed } from "@ember/object";
+import FilterComponent from "admin/components/report-filters/filter";
 
-export default FilterComponent.extend({
-  classNames: ["group-filter"],
-
+@classNames("group-filter")
+export default class Group extends FilterComponent {
   @computed
   get groupOptions() {
     return (this.site.groups || []).map((group) => {
       return { name: group["name"], value: group["id"] };
     });
-  },
+  }
 
   @computed("filter.default")
   get groupId() {
     return this.filter.default ? parseInt(this.filter.default, 10) : null;
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/report-filters/list.hbs b/app/assets/javascripts/admin/addon/components/report-filters/list.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/report-filters/list.hbs
rename to app/assets/javascripts/admin/addon/components/report-filters/list.hbs
diff --git a/app/assets/javascripts/admin/addon/components/report-filters/list.js b/app/assets/javascripts/admin/addon/components/report-filters/list.js
index 654269ecd00..7ecc076e96a 100644
--- a/app/assets/javascripts/admin/addon/components/report-filters/list.js
+++ b/app/assets/javascripts/admin/addon/components/report-filters/list.js
@@ -1,3 +1,3 @@
 import FilterComponent from "admin/components/report-filters/filter";
 
-export default FilterComponent.extend();
+export default class List extends FilterComponent {}
diff --git a/app/assets/javascripts/admin/addon/templates/components/resumable-upload.hbs b/app/assets/javascripts/admin/addon/components/resumable-upload.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/resumable-upload.hbs
rename to app/assets/javascripts/admin/addon/components/resumable-upload.hbs
diff --git a/app/assets/javascripts/admin/addon/components/resumable-upload.js b/app/assets/javascripts/admin/addon/components/resumable-upload.js
index 87d5ddb040f..abfa01ea018 100644
--- a/app/assets/javascripts/admin/addon/components/resumable-upload.js
+++ b/app/assets/javascripts/admin/addon/components/resumable-upload.js
@@ -1,3 +1,3 @@
 import Component from "@ember/component";
 
-export default Component.extend({});
+export default class ResumableUpload extends Component {}
diff --git a/app/assets/javascripts/admin/addon/templates/components/screened-ip-address-form.hbs b/app/assets/javascripts/admin/addon/components/screened-ip-address-form.hbs
similarity index 93%
rename from app/assets/javascripts/admin/addon/templates/components/screened-ip-address-form.hbs
rename to app/assets/javascripts/admin/addon/components/screened-ip-address-form.hbs
index 99884ddb53e..bb8b58b4e01 100644
--- a/app/assets/javascripts/admin/addon/templates/components/screened-ip-address-form.hbs
+++ b/app/assets/javascripts/admin/addon/components/screened-ip-address-form.hbs
@@ -17,7 +17,7 @@
 <DButton
   @type="submit"
   @class="btn-default"
-  @action={{action "submit"}}
+  @action={{action "submitForm"}}
   @disabled={{this.formSubmitted}}
   @label="admin.logs.screened_ips.form.add"
 />
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/components/screened-ip-address-form.js b/app/assets/javascripts/admin/addon/components/screened-ip-address-form.js
index ab553b6a213..fe7945dee79 100644
--- a/app/assets/javascripts/admin/addon/components/screened-ip-address-form.js
+++ b/app/assets/javascripts/admin/addon/components/screened-ip-address-form.js
@@ -1,9 +1,11 @@
+import { action } from "@ember/object";
+import { classNames, tagName } from "@ember-decorators/component";
+import { inject as service } from "@ember/service";
 import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 import I18n from "I18n";
 import ScreenedIpAddress from "admin/models/screened-ip-address";
 import { schedule } from "@ember/runloop";
-import { inject as service } from "@ember/service";
 
 /**
   A form to create an IP address that will be blocked or allowed.
@@ -16,12 +18,13 @@ import { inject as service } from "@ember/service";
   as an argument.
 **/
 
-export default Component.extend({
-  tagName: "form",
-  dialog: service(),
-  classNames: ["screened-ip-address-form", "inline-form"],
-  formSubmitted: false,
-  actionName: "block",
+@tagName("form")
+@classNames("screened-ip-address-form", "inline-form")
+export default class ScreenedIpAddressForm extends Component {
+  @service dialog;
+
+  formSubmitted = false;
+  actionName = "block";
 
   @discourseComputed("siteSettings.use_admin_ip_allowlist")
   actionNames(adminAllowlistEnabled) {
@@ -46,43 +49,42 @@ export default Component.extend({
         },
       ];
     }
-  },
+  }
 
   focusInput() {
     schedule("afterRender", () => {
       this.element.querySelector("input").focus();
     });
-  },
+  }
 
-  actions: {
-    submit() {
-      if (!this.formSubmitted) {
-        this.set("formSubmitted", true);
-        const screenedIpAddress = ScreenedIpAddress.create({
-          ip_address: this.ip_address,
-          action_name: this.actionName,
-        });
-        screenedIpAddress
-          .save()
-          .then((result) => {
-            this.setProperties({ ip_address: "", formSubmitted: false });
-            this.action(ScreenedIpAddress.create(result.screened_ip_address));
-            this.focusInput();
-          })
-          .catch((e) => {
-            this.set("formSubmitted", false);
-            const message = e.jqXHR.responseJSON?.errors
-              ? I18n.t("generic_error_with_reason", {
-                  error: e.jqXHR.responseJSON.errors.join(". "),
-                })
-              : I18n.t("generic_error");
-            this.dialog.alert({
-              message,
-              didConfirm: () => this.focusInput(),
-              didCancel: () => this.focusInput(),
-            });
+  @action
+  submitForm() {
+    if (!this.formSubmitted) {
+      this.set("formSubmitted", true);
+      const screenedIpAddress = ScreenedIpAddress.create({
+        ip_address: this.ip_address,
+        action_name: this.actionName,
+      });
+      screenedIpAddress
+        .save()
+        .then((result) => {
+          this.setProperties({ ip_address: "", formSubmitted: false });
+          this.action(ScreenedIpAddress.create(result.screened_ip_address));
+          this.focusInput();
+        })
+        .catch((e) => {
+          this.set("formSubmitted", false);
+          const message = e.jqXHR.responseJSON?.errors
+            ? I18n.t("generic_error_with_reason", {
+                error: e.jqXHR.responseJSON.errors.join(". "),
+              })
+            : I18n.t("generic_error");
+          this.dialog.alert({
+            message,
+            didConfirm: () => this.focusInput(),
+            didCancel: () => this.focusInput(),
           });
-      }
-    },
-  },
-});
+        });
+    }
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/secret-value-list.hbs b/app/assets/javascripts/admin/addon/components/secret-value-list.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/secret-value-list.hbs
rename to app/assets/javascripts/admin/addon/components/secret-value-list.hbs
diff --git a/app/assets/javascripts/admin/addon/components/secret-value-list.js b/app/assets/javascripts/admin/addon/components/secret-value-list.js
index 1f31dc40e2f..eae2a34d6dc 100644
--- a/app/assets/javascripts/admin/addon/components/secret-value-list.js
+++ b/app/assets/javascripts/admin/addon/components/secret-value-list.js
@@ -1,15 +1,16 @@
+import { classNameBindings } from "@ember-decorators/component";
 import Component from "@ember/component";
 import I18n from "I18n";
 import { isEmpty } from "@ember/utils";
-import { on } from "discourse-common/utils/decorators";
-import { set } from "@ember/object";
+import { on } from "@ember-decorators/object";
+import { action, set } from "@ember/object";
 
-export default Component.extend({
-  classNameBindings: [":value-list", ":secret-value-list"],
-  inputDelimiter: null,
-  collection: null,
-  values: null,
-  validationMessage: null,
+@classNameBindings(":value-list", ":secret-value-list")
+export default class SecretValueList extends Component {
+  inputDelimiter = null;
+  collection = null;
+  values = null;
+  validationMessage = null;
 
   @on("didReceiveAttrs")
   _setupCollection() {
@@ -19,41 +20,43 @@ export default Component.extend({
       "collection",
       this._splitValues(values, this.inputDelimiter || "\n")
     );
-  },
+  }
 
-  actions: {
-    changeKey(index, event) {
-      const newValue = event.target.value;
+  @action
+  changeKey(index, event) {
+    const newValue = event.target.value;
 
-      if (this._checkInvalidInput(newValue)) {
-        return;
-      }
+    if (this._checkInvalidInput(newValue)) {
+      return;
+    }
 
-      this._replaceValue(index, newValue, "key");
-    },
+    this._replaceValue(index, newValue, "key");
+  }
 
-    changeSecret(index, event) {
-      const newValue = event.target.value;
+  @action
+  changeSecret(index, event) {
+    const newValue = event.target.value;
 
-      if (this._checkInvalidInput(newValue)) {
-        return;
-      }
+    if (this._checkInvalidInput(newValue)) {
+      return;
+    }
 
-      this._replaceValue(index, newValue, "secret");
-    },
+    this._replaceValue(index, newValue, "secret");
+  }
 
-    addValue() {
-      if (this._checkInvalidInput([this.newKey, this.newSecret])) {
-        return;
-      }
-      this._addValue(this.newKey, this.newSecret);
-      this.setProperties({ newKey: "", newSecret: "" });
-    },
+  @action
+  addValue() {
+    if (this._checkInvalidInput([this.newKey, this.newSecret])) {
+      return;
+    }
+    this._addValue(this.newKey, this.newSecret);
+    this.setProperties({ newKey: "", newSecret: "" });
+  }
 
-    removeValue(value) {
-      this._removeValue(value);
-    },
-  },
+  @action
+  removeValue(value) {
+    this._removeValue(value);
+  }
 
   _checkInvalidInput(inputs) {
     this.set("validationMessage", null);
@@ -66,25 +69,25 @@ export default Component.extend({
         return true;
       }
     }
-  },
+  }
 
   _addValue(value, secret) {
     this.collection.addObject({ key: value, secret });
     this._saveValues();
-  },
+  }
 
   _removeValue(value) {
     const collection = this.collection;
     collection.removeObject(value);
     this._saveValues();
-  },
+  }
 
   _replaceValue(index, newValue, keyName) {
     let item = this.collection[index];
     set(item, keyName, newValue);
 
     this._saveValues();
-  },
+  }
 
   _saveValues() {
     this.set(
@@ -95,7 +98,7 @@ export default Component.extend({
         })
         .join("\n")
     );
-  },
+  }
 
   _splitValues(values, delimiter) {
     if (values && values.length) {
@@ -113,5 +116,5 @@ export default Component.extend({
     } else {
       return [];
     }
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/setting-validation-message.hbs b/app/assets/javascripts/admin/addon/components/setting-validation-message.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/setting-validation-message.hbs
rename to app/assets/javascripts/admin/addon/components/setting-validation-message.hbs
diff --git a/app/assets/javascripts/admin/addon/components/setting-validation-message.js b/app/assets/javascripts/admin/addon/components/setting-validation-message.js
index 87d5ddb040f..4e60ec9c884 100644
--- a/app/assets/javascripts/admin/addon/components/setting-validation-message.js
+++ b/app/assets/javascripts/admin/addon/components/setting-validation-message.js
@@ -1,3 +1,3 @@
 import Component from "@ember/component";
 
-export default Component.extend({});
+export default class SettingValidationMessage extends Component {}
diff --git a/app/assets/javascripts/admin/addon/templates/components/silence-details.hbs b/app/assets/javascripts/admin/addon/components/silence-details.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/silence-details.hbs
rename to app/assets/javascripts/admin/addon/components/silence-details.hbs
diff --git a/app/assets/javascripts/admin/addon/components/silence-details.js b/app/assets/javascripts/admin/addon/components/silence-details.js
index 0e6d50b17d4..b50edba07ee 100644
--- a/app/assets/javascripts/admin/addon/components/silence-details.js
+++ b/app/assets/javascripts/admin/addon/components/silence-details.js
@@ -1,4 +1,5 @@
+import { tagName } from "@ember-decorators/component";
 import Component from "@ember/component";
-export default Component.extend({
-  tagName: "",
-});
+
+@tagName("")
+export default class SilenceDetails extends Component {}
diff --git a/app/assets/javascripts/admin/addon/templates/components/simple-list.hbs b/app/assets/javascripts/admin/addon/components/simple-list.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/simple-list.hbs
rename to app/assets/javascripts/admin/addon/components/simple-list.hbs
diff --git a/app/assets/javascripts/admin/addon/components/simple-list.js b/app/assets/javascripts/admin/addon/components/simple-list.js
index 5ca219ee80f..e30d06c0725 100644
--- a/app/assets/javascripts/admin/addon/components/simple-list.js
+++ b/app/assets/javascripts/admin/addon/components/simple-list.js
@@ -1,34 +1,37 @@
+import { classNameBindings } from "@ember-decorators/component";
+import { empty } from "@ember/object/computed";
 import Component from "@ember/component";
 import { action } from "@ember/object";
-import { empty } from "@ember/object/computed";
-import discourseComputed, { on } from "discourse-common/utils/decorators";
+import discourseComputed from "discourse-common/utils/decorators";
+import { on } from "@ember-decorators/object";
 
-export default Component.extend({
-  classNameBindings: [":simple-list", ":value-list"],
-  inputEmpty: empty("newValue"),
-  inputDelimiter: null,
-  newValue: "",
-  collection: null,
-  values: null,
+@classNameBindings(":simple-list", ":value-list")
+export default class SimpleList extends Component {
+  @empty("newValue") inputEmpty;
+
+  inputDelimiter = null;
+  newValue = "";
+  collection = null;
+  values = null;
 
   @on("didReceiveAttrs")
   _setupCollection() {
     this.set("collection", this._splitValues(this.values, this.inputDelimiter));
-  },
+  }
 
   keyDown(event) {
     if (event.which === 13) {
       this.addValue(this.newValue);
       return;
     }
-  },
+  }
 
   @action
   changeValue(index, event) {
     this.collection.replace(index, 1, [event.target.value]);
     this.collection.arrayContentDidChange(index);
     this._onChange();
-  },
+  }
 
   @action
   addValue(newValue) {
@@ -39,13 +42,13 @@ export default Component.extend({
     this.set("newValue", null);
     this.collection.addObject(newValue);
     this._onChange();
-  },
+  }
 
   @action
   removeValue(value) {
     this.collection.removeObject(value);
     this._onChange();
-  },
+  }
 
   @action
   shift(operation, index) {
@@ -62,20 +65,20 @@ export default Component.extend({
     this.collection.insertAt(futureIndex, shiftedValue);
 
     this._onChange();
-  },
+  }
 
   _onChange() {
     this.onChange?.(this.collection);
-  },
+  }
 
   @discourseComputed("collection")
   showUpDownButtons(collection) {
     return collection.length - 1 ? true : false;
-  },
+  }
 
   _splitValues(values, delimiter) {
     return values && values.length
       ? values.split(delimiter || "\n").filter(Boolean)
       : [];
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-customization-change-details.hbs b/app/assets/javascripts/admin/addon/components/site-customization-change-details.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/site-customization-change-details.hbs
rename to app/assets/javascripts/admin/addon/components/site-customization-change-details.hbs
diff --git a/app/assets/javascripts/admin/addon/components/site-customization-change-details.js b/app/assets/javascripts/admin/addon/components/site-customization-change-details.js
index 87d5ddb040f..cb9487ad2b2 100644
--- a/app/assets/javascripts/admin/addon/components/site-customization-change-details.js
+++ b/app/assets/javascripts/admin/addon/components/site-customization-change-details.js
@@ -1,3 +1,3 @@
 import Component from "@ember/component";
 
-export default Component.extend({});
+export default class SiteCustomizationChangeDetails extends Component {}
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-customization-change-field.hbs b/app/assets/javascripts/admin/addon/components/site-customization-change-field.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/site-customization-change-field.hbs
rename to app/assets/javascripts/admin/addon/components/site-customization-change-field.hbs
diff --git a/app/assets/javascripts/admin/addon/components/site-customization-change-field.js b/app/assets/javascripts/admin/addon/components/site-customization-change-field.js
index 87d5ddb040f..0e361124a0f 100644
--- a/app/assets/javascripts/admin/addon/components/site-customization-change-field.js
+++ b/app/assets/javascripts/admin/addon/components/site-customization-change-field.js
@@ -1,3 +1,3 @@
 import Component from "@ember/component";
 
-export default Component.extend({});
+export default class SiteCustomizationChangeField extends Component {}
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-setting.hbs b/app/assets/javascripts/admin/addon/components/site-setting.hbs
similarity index 65%
rename from app/assets/javascripts/admin/addon/templates/components/site-setting.hbs
rename to app/assets/javascripts/admin/addon/components/site-setting.hbs
index e73d8697742..1e72fadac17 100644
--- a/app/assets/javascripts/admin/addon/templates/components/site-setting.hbs
+++ b/app/assets/javascripts/admin/addon/components/site-setting.hbs
@@ -1,7 +1,8 @@
 <div class="setting-label">
   <h3>
+    {{this.settingName}}
+
     {{#if this.staffLogFilter}}
-      {{this.settingName}}
       <LinkTo
         @route="adminLogs.staffActionLogs"
         @query={{hash filters=this.staffLogFilter force_refresh=true}}
@@ -11,17 +12,18 @@
           {{d-icon "history"}}
         </span>
       </LinkTo>
-    {{else}}
-      {{this.settingName}}
     {{/if}}
   </h3>
+
   {{#if this.defaultIsAvailable}}
-    <a
-      href
-      onClick={{action "setDefaultValues"}}
-    >{{this.setting.setDefaultValuesLabel}}</a>
+    <DButton
+      class="btn-link"
+      @action={{this.setDefaultValues}}
+      @translatedLabel={{this.setting.setDefaultValuesLabel}}
+    />
   {{/if}}
 </div>
+
 <div class="setting-value">
   {{component
     this.componentName
@@ -33,18 +35,20 @@
     allowAny=this.allowAny
   }}
 </div>
+
 {{#if this.dirty}}
   <div class="setting-controls">
-    <DButton @class="ok" @action={{action "update"}} @icon="check" />
-    <DButton @class="cancel" @action={{action "cancel"}} @icon="times" />
+    <DButton class="ok" @action={{this.update}} @icon="check" />
+    <DButton class="cancel" @action={{this.cancel}} @icon="times" />
   </div>
 {{else if this.setting.overridden}}
   {{#if this.setting.secret}}
-    <DButton @action={{action "toggleSecret"}} @icon="far-eye-slash" />
+    <DButton @action={{this.toggleSecret}} @icon="far-eye-slash" />
   {{/if}}
+
   <DButton
-    @class="btn-default undo"
-    @action={{action "resetDefault"}}
+    class="btn-default undo"
+    @action={{this.resetDefault}}
     @icon="undo"
     @label="admin.settings.reset"
   />
diff --git a/app/assets/javascripts/admin/addon/components/site-setting.js b/app/assets/javascripts/admin/addon/components/site-setting.js
index 888daa31176..f405a425285 100644
--- a/app/assets/javascripts/admin/addon/components/site-setting.js
+++ b/app/assets/javascripts/admin/addon/components/site-setting.js
@@ -1,18 +1,21 @@
+import { readOnly } from "@ember/object/computed";
 import BufferedContent from "discourse/mixins/buffered-content";
 import Component from "@ember/component";
 import SettingComponent from "admin/mixins/setting-component";
 import SiteSetting from "admin/models/site-setting";
-import { readOnly } from "@ember/object/computed";
 
-export default Component.extend(BufferedContent, SettingComponent, {
-  updateExistingUsers: null,
+export default class SiteSettingComponent extends Component.extend(
+  BufferedContent,
+  SettingComponent
+) {
+  updateExistingUsers = null;
+
+  @readOnly("setting.staffLogFilter") staffLogFilter;
 
   _save() {
     const setting = this.buffered;
     return SiteSetting.update(setting.get("setting"), setting.get("value"), {
       updateExistingUsers: this.updateExistingUsers,
     });
-  },
-
-  staffLogFilter: readOnly("setting.staffLogFilter"),
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/bool.hbs b/app/assets/javascripts/admin/addon/components/site-settings/bool.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/site-settings/bool.hbs
rename to app/assets/javascripts/admin/addon/components/site-settings/bool.hbs
diff --git a/app/assets/javascripts/admin/addon/components/site-settings/bool.js b/app/assets/javascripts/admin/addon/components/site-settings/bool.js
index 70d7c59ae00..8837213db27 100644
--- a/app/assets/javascripts/admin/addon/components/site-settings/bool.js
+++ b/app/assets/javascripts/admin/addon/components/site-settings/bool.js
@@ -1,19 +1,18 @@
+import { computed } from "@ember/object";
 import Component from "@ember/component";
-import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
 
-export default Component.extend({
-  @discourseComputed("value")
-  enabled: {
-    get(value) {
-      if (isEmpty(value)) {
-        return false;
-      }
-      return value.toString() === "true";
-    },
-    set(value) {
-      this.set("value", value ? "true" : "false");
-      return value;
-    },
-  },
-});
+export default class Bool extends Component {
+  @computed("value")
+  get enabled() {
+    if (isEmpty(this.value)) {
+      return false;
+    }
+    return this.value.toString() === "true";
+  }
+
+  set enabled(value) {
+    this.set("value", value ? "true" : "false");
+    return value;
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/category-list.hbs b/app/assets/javascripts/admin/addon/components/site-settings/category-list.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/site-settings/category-list.hbs
rename to app/assets/javascripts/admin/addon/components/site-settings/category-list.hbs
diff --git a/app/assets/javascripts/admin/addon/components/site-settings/category-list.js b/app/assets/javascripts/admin/addon/components/site-settings/category-list.js
index 9dc792e6de0..44fdee3a715 100644
--- a/app/assets/javascripts/admin/addon/components/site-settings/category-list.js
+++ b/app/assets/javascripts/admin/addon/components/site-settings/category-list.js
@@ -1,15 +1,15 @@
+import { action, computed } from "@ember/object";
 import Category from "discourse/models/category";
 import Component from "@ember/component";
-import { computed } from "@ember/object";
 
-export default Component.extend({
-  selectedCategories: computed("value", function () {
+export default class CategoryList extends Component {
+  @computed("value")
+  get selectedCategories() {
     return Category.findByIds(this.value.split("|").filter(Boolean));
-  }),
+  }
 
-  actions: {
-    onChangeSelectedCategories(value) {
-      this.set("value", (value || []).mapBy("id").join("|"));
-    },
-  },
-});
+  @action
+  onChangeSelectedCategories(value) {
+    this.set("value", (value || []).mapBy("id").join("|"));
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/category.hbs b/app/assets/javascripts/admin/addon/components/site-settings/category.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/site-settings/category.hbs
rename to app/assets/javascripts/admin/addon/components/site-settings/category.hbs
diff --git a/app/assets/javascripts/admin/addon/components/site-settings/category.js b/app/assets/javascripts/admin/addon/components/site-settings/category.js
index 87d5ddb040f..8e11b94d30d 100644
--- a/app/assets/javascripts/admin/addon/components/site-settings/category.js
+++ b/app/assets/javascripts/admin/addon/components/site-settings/category.js
@@ -1,3 +1,3 @@
 import Component from "@ember/component";
 
-export default Component.extend({});
+export default class Category extends Component {}
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/color.hbs b/app/assets/javascripts/admin/addon/components/site-settings/color.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/site-settings/color.hbs
rename to app/assets/javascripts/admin/addon/components/site-settings/color.hbs
diff --git a/app/assets/javascripts/admin/addon/components/site-settings/color.js b/app/assets/javascripts/admin/addon/components/site-settings/color.js
index 39df6da7d5e..a044348c0b2 100644
--- a/app/assets/javascripts/admin/addon/components/site-settings/color.js
+++ b/app/assets/javascripts/admin/addon/components/site-settings/color.js
@@ -24,8 +24,9 @@ function RGBToHex(rgb) {
   return "#" + r + g + b;
 }
 
-export default Component.extend({
-  valid: computed("value", function () {
+export default class Color extends Component {
+  @computed("value")
+  get valid() {
     let value = this.value.toLowerCase();
 
     let testColor = new Option().style;
@@ -43,10 +44,10 @@ export default Component.extend({
     }
 
     return testColor.color && hexifiedColor === value;
-  }),
+  }
 
   @action
   onChangeColor(color) {
     this.set("value", color);
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/compact-list.hbs b/app/assets/javascripts/admin/addon/components/site-settings/compact-list.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/site-settings/compact-list.hbs
rename to app/assets/javascripts/admin/addon/components/site-settings/compact-list.hbs
diff --git a/app/assets/javascripts/admin/addon/components/site-settings/compact-list.js b/app/assets/javascripts/admin/addon/components/site-settings/compact-list.js
index 246d56066a9..35d86e32dce 100644
--- a/app/assets/javascripts/admin/addon/components/site-settings/compact-list.js
+++ b/app/assets/javascripts/admin/addon/components/site-settings/compact-list.js
@@ -1,40 +1,36 @@
+import { action, computed } from "@ember/object";
 import Component from "@ember/component";
-import { computed } from "@ember/object";
 import { makeArray } from "discourse-common/lib/helpers";
 
-export default Component.extend({
-  tokenSeparator: "|",
+export default class CompactList extends Component {
+  tokenSeparator = "|";
+  createdChoices = null;
 
-  createdChoices: null,
-
-  settingValue: computed("value", function () {
+  @computed("value")
+  get settingValue() {
     return this.value.toString().split(this.tokenSeparator).filter(Boolean);
-  }),
+  }
 
-  settingChoices: computed(
-    "settingValue",
-    "setting.choices.[]",
-    "createdChoices.[]",
-    function () {
-      return [
-        ...new Set([
-          ...makeArray(this.settingValue),
-          ...makeArray(this.setting.choices),
-          ...makeArray(this.createdChoices),
-        ]),
-      ];
-    }
-  ),
+  @computed("settingValue", "setting.choices.[]", "createdChoices.[]")
+  get settingChoices() {
+    return [
+      ...new Set([
+        ...makeArray(this.settingValue),
+        ...makeArray(this.setting.choices),
+        ...makeArray(this.createdChoices),
+      ]),
+    ];
+  }
 
-  actions: {
-    onChangeListSetting(value) {
-      this.set("value", value.join(this.tokenSeparator));
-    },
+  @action
+  onChangeListSetting(value) {
+    this.set("value", value.join(this.tokenSeparator));
+  }
 
-    onChangeChoices(choices) {
-      this.set("createdChoices", [
-        ...new Set([...makeArray(this.createdChoices), ...makeArray(choices)]),
-      ]);
-    },
-  },
-});
+  @action
+  onChangeChoices(choices) {
+    this.set("createdChoices", [
+      ...new Set([...makeArray(this.createdChoices), ...makeArray(choices)]),
+    ]);
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/emoji-list.hbs b/app/assets/javascripts/admin/addon/components/site-settings/emoji-list.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/site-settings/emoji-list.hbs
rename to app/assets/javascripts/admin/addon/components/site-settings/emoji-list.hbs
diff --git a/app/assets/javascripts/admin/addon/components/site-settings/emoji-list.js b/app/assets/javascripts/admin/addon/components/site-settings/emoji-list.js
index 87d5ddb040f..706d6d80840 100644
--- a/app/assets/javascripts/admin/addon/components/site-settings/emoji-list.js
+++ b/app/assets/javascripts/admin/addon/components/site-settings/emoji-list.js
@@ -1,3 +1,3 @@
 import Component from "@ember/component";
 
-export default Component.extend({});
+export default class EmojiList extends Component {}
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/enum.hbs b/app/assets/javascripts/admin/addon/components/site-settings/enum.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/site-settings/enum.hbs
rename to app/assets/javascripts/admin/addon/components/site-settings/enum.hbs
diff --git a/app/assets/javascripts/admin/addon/components/site-settings/enum.js b/app/assets/javascripts/admin/addon/components/site-settings/enum.js
index 87d5ddb040f..faebe31c2d1 100644
--- a/app/assets/javascripts/admin/addon/components/site-settings/enum.js
+++ b/app/assets/javascripts/admin/addon/components/site-settings/enum.js
@@ -1,3 +1,3 @@
 import Component from "@ember/component";
 
-export default Component.extend({});
+export default class Enum extends Component {}
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/group-list.hbs b/app/assets/javascripts/admin/addon/components/site-settings/group-list.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/site-settings/group-list.hbs
rename to app/assets/javascripts/admin/addon/components/site-settings/group-list.hbs
diff --git a/app/assets/javascripts/admin/addon/components/site-settings/group-list.js b/app/assets/javascripts/admin/addon/components/site-settings/group-list.js
index ad9dbbfd1c5..e483afc3951 100644
--- a/app/assets/javascripts/admin/addon/components/site-settings/group-list.js
+++ b/app/assets/javascripts/admin/addon/components/site-settings/group-list.js
@@ -1,25 +1,25 @@
+import { action, computed } from "@ember/object";
 import Component from "@ember/component";
-import { computed } from "@ember/object";
 
-export default Component.extend({
-  tokenSeparator: "|",
+export default class GroupList extends Component {
+  tokenSeparator = "|";
+  nameProperty = "name";
+  valueProperty = "id";
 
-  nameProperty: "name",
-  valueProperty: "id",
-
-  groupChoices: computed("site.groups", function () {
+  @computed("site.groups")
+  get groupChoices() {
     return (this.site.groups || []).map((g) => {
       return { name: g.name, id: g.id.toString() };
     });
-  }),
+  }
 
-  settingValue: computed("value", function () {
+  @computed("value")
+  get settingValue() {
     return (this.value || "").split(this.tokenSeparator).filter(Boolean);
-  }),
+  }
 
-  actions: {
-    onChangeGroupListSetting(value) {
-      this.set("value", value.join(this.tokenSeparator));
-    },
-  },
-});
+  @action
+  onChangeGroupListSetting(value) {
+    this.set("value", value.join(this.tokenSeparator));
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/host-list.hbs b/app/assets/javascripts/admin/addon/components/site-settings/host-list.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/site-settings/host-list.hbs
rename to app/assets/javascripts/admin/addon/components/site-settings/host-list.hbs
diff --git a/app/assets/javascripts/admin/addon/components/site-settings/host-list.js b/app/assets/javascripts/admin/addon/components/site-settings/host-list.js
index 8cc320da8f8..3ce615eb4f1 100644
--- a/app/assets/javascripts/admin/addon/components/site-settings/host-list.js
+++ b/app/assets/javascripts/admin/addon/components/site-settings/host-list.js
@@ -1,14 +1,14 @@
 import Component from "@ember/component";
 import { action, computed } from "@ember/object";
 
-export default Component.extend({
-  tokenSeparator: "|",
-  choices: null,
+export default class HostList extends Component {
+  tokenSeparator = "|";
+  choices = null;
 
   @computed("value")
   get settingValue() {
     return this.value.toString().split(this.tokenSeparator).filter(Boolean);
-  },
+  }
 
   @action
   onChange(value) {
@@ -17,5 +17,5 @@ export default Component.extend({
     }
 
     this.set("value", value.join(this.tokenSeparator));
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/list.hbs b/app/assets/javascripts/admin/addon/components/site-settings/list.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/site-settings/list.hbs
rename to app/assets/javascripts/admin/addon/components/site-settings/list.hbs
diff --git a/app/assets/javascripts/admin/addon/components/site-settings/list.js b/app/assets/javascripts/admin/addon/components/site-settings/list.js
index 87d5ddb040f..d23ceb2ba77 100644
--- a/app/assets/javascripts/admin/addon/components/site-settings/list.js
+++ b/app/assets/javascripts/admin/addon/components/site-settings/list.js
@@ -1,3 +1,3 @@
 import Component from "@ember/component";
 
-export default Component.extend({});
+export default class List extends Component {}
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/named-list.hbs b/app/assets/javascripts/admin/addon/components/site-settings/named-list.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/site-settings/named-list.hbs
rename to app/assets/javascripts/admin/addon/components/site-settings/named-list.hbs
diff --git a/app/assets/javascripts/admin/addon/components/site-settings/named-list.js b/app/assets/javascripts/admin/addon/components/site-settings/named-list.js
index c6cf872d79a..fadfedc9f0b 100644
--- a/app/assets/javascripts/admin/addon/components/site-settings/named-list.js
+++ b/app/assets/javascripts/admin/addon/components/site-settings/named-list.js
@@ -1,13 +1,13 @@
 import Component from "@ember/component";
 import { action, computed } from "@ember/object";
 
-export default Component.extend({
-  tokenSeparator: "|",
+export default class NamedList extends Component {
+  tokenSeparator = "|";
 
   @computed("value")
   get settingValue() {
     return this.value.toString().split(this.tokenSeparator).filter(Boolean);
-  },
+  }
 
   @computed("setting.choices.[]", "settingValue")
   get settingChoices() {
@@ -24,10 +24,10 @@ export default Component.extend({
     }
 
     return choices;
-  },
+  }
 
   @action
   onChangeListSetting(value) {
     this.set("value", value.join(this.tokenSeparator));
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/secret-list.hbs b/app/assets/javascripts/admin/addon/components/site-settings/secret-list.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/site-settings/secret-list.hbs
rename to app/assets/javascripts/admin/addon/components/site-settings/secret-list.hbs
diff --git a/app/assets/javascripts/admin/addon/components/site-settings/secret-list.js b/app/assets/javascripts/admin/addon/components/site-settings/secret-list.js
index 87d5ddb040f..167dbdc6e55 100644
--- a/app/assets/javascripts/admin/addon/components/site-settings/secret-list.js
+++ b/app/assets/javascripts/admin/addon/components/site-settings/secret-list.js
@@ -1,3 +1,3 @@
 import Component from "@ember/component";
 
-export default Component.extend({});
+export default class SecretList extends Component {}
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/simple-list.hbs b/app/assets/javascripts/admin/addon/components/site-settings/simple-list.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/site-settings/simple-list.hbs
rename to app/assets/javascripts/admin/addon/components/site-settings/simple-list.hbs
diff --git a/app/assets/javascripts/admin/addon/components/site-settings/simple-list.js b/app/assets/javascripts/admin/addon/components/site-settings/simple-list.js
index 383dfeee421..ccc75e2b9dd 100644
--- a/app/assets/javascripts/admin/addon/components/site-settings/simple-list.js
+++ b/app/assets/javascripts/admin/addon/components/site-settings/simple-list.js
@@ -1,11 +1,11 @@
 import Component from "@ember/component";
 import { action } from "@ember/object";
 
-export default Component.extend({
-  inputDelimiter: "|",
+export default class SimpleList extends Component {
+  inputDelimiter = "|";
 
   @action
   onChange(value) {
     this.set("value", value.join(this.inputDelimiter || "\n"));
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/string.hbs b/app/assets/javascripts/admin/addon/components/site-settings/string.hbs
similarity index 54%
rename from app/assets/javascripts/admin/addon/templates/components/site-settings/string.hbs
rename to app/assets/javascripts/admin/addon/components/site-settings/string.hbs
index 3acf8936f4f..e4523829a8b 100644
--- a/app/assets/javascripts/admin/addon/templates/components/site-settings/string.hbs
+++ b/app/assets/javascripts/admin/addon/components/site-settings/string.hbs
@@ -2,7 +2,7 @@
   <Textarea @value={{this.value}} class="input-setting-textarea" />
 {{else if this.setting.json_schema}}
   <DButton
-    @action={{action "launchJsonEditorModal"}}
+    @action={{fn (mut this.showJsonEditorModal) true}}
     @icon="pencil-alt"
     @label="admin.site_settings.json_schema.edit"
   />
@@ -13,4 +13,14 @@
 {{/if}}
 
 <SettingValidationMessage @message={{this.validationMessage}} />
-<div class="desc">{{html-safe this.setting.description}}</div>
\ No newline at end of file
+<div class="desc">{{html-safe this.setting.description}}</div>
+
+{{#if this.showJsonEditorModal}}
+  <Modal::JsonSchemaEditor
+    @updateValue={{fn (mut this.value)}}
+    @value={{this.value}}
+    @settingName={{this.setting.setting}}
+    @jsonSchema={{this.setting.json_schema}}
+    @closeModal={{fn (mut this.showJsonEditorModal) false}}
+  />
+{{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/components/site-settings/string.js b/app/assets/javascripts/admin/addon/components/site-settings/string.js
index 2224c8745fa..011d71d070d 100644
--- a/app/assets/javascripts/admin/addon/components/site-settings/string.js
+++ b/app/assets/javascripts/admin/addon/components/site-settings/string.js
@@ -1,20 +1,3 @@
-import { action } from "@ember/object";
 import Component from "@ember/component";
-import showModal from "discourse/lib/show-modal";
 
-export default Component.extend({
-  @action
-  launchJsonEditorModal() {
-    const schemaModal = showModal("json-schema-editor", {
-      model: {
-        value: this.value,
-        settingName: this.setting.setting,
-        jsonSchema: this.setting.json_schema,
-      },
-    });
-
-    schemaModal.set("onClose", () => {
-      this.set("value", schemaModal.model.value);
-    });
-  },
-});
+export default class String extends Component {}
diff --git a/app/assets/javascripts/admin/addon/components/site-settings/tag-group-list.hbs b/app/assets/javascripts/admin/addon/components/site-settings/tag-group-list.hbs
new file mode 100644
index 00000000000..475a9fcf365
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/components/site-settings/tag-group-list.hbs
@@ -0,0 +1,7 @@
+<TagGroupChooser
+  @tagGroups={{this.selectedTagGroups}}
+  @onChange={{action "onTagGroupChange"}}
+  @options={{hash filterPlaceholder="category.required_tag_group.placeholder"}}
+/>
+<div class="desc">{{html-safe this.setting.description}}</div>
+<SettingValidationMessage @message={{this.validationMessage}} />
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/components/site-settings/tag-group-list.js b/app/assets/javascripts/admin/addon/components/site-settings/tag-group-list.js
new file mode 100644
index 00000000000..5d11c75027f
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/components/site-settings/tag-group-list.js
@@ -0,0 +1,15 @@
+import Component from "@ember/component";
+import { action } from "@ember/object";
+import discourseComputed from "discourse-common/utils/decorators";
+
+export default class TagGroupList extends Component {
+  @discourseComputed("value")
+  selectedTagGroups(value) {
+    return value.split("|").filter(Boolean);
+  }
+
+  @action
+  onTagGroupChange(tagGroups) {
+    this.set("value", tagGroups.join("|"));
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/tag-list.hbs b/app/assets/javascripts/admin/addon/components/site-settings/tag-list.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/site-settings/tag-list.hbs
rename to app/assets/javascripts/admin/addon/components/site-settings/tag-list.hbs
diff --git a/app/assets/javascripts/admin/addon/components/site-settings/tag-list.js b/app/assets/javascripts/admin/addon/components/site-settings/tag-list.js
index d679063df14..6f1b59c5eaf 100644
--- a/app/assets/javascripts/admin/addon/components/site-settings/tag-list.js
+++ b/app/assets/javascripts/admin/addon/components/site-settings/tag-list.js
@@ -2,16 +2,14 @@ import Component from "@ember/component";
 import { action } from "@ember/object";
 import discourseComputed from "discourse-common/utils/decorators";
 
-export default Component.extend({
+export default class TagList extends Component {
   @discourseComputed("value")
-  selectedTags: {
-    get(value) {
-      return value.split("|").filter(Boolean);
-    },
-  },
+  selectedTags(value) {
+    return value.split("|").filter(Boolean);
+  }
 
   @action
   changeSelectedTags(tags) {
     this.set("value", tags.join("|"));
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/upload.hbs b/app/assets/javascripts/admin/addon/components/site-settings/upload.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/site-settings/upload.hbs
rename to app/assets/javascripts/admin/addon/components/site-settings/upload.hbs
diff --git a/app/assets/javascripts/admin/addon/components/site-settings/upload.js b/app/assets/javascripts/admin/addon/components/site-settings/upload.js
index 87d5ddb040f..ac849a73642 100644
--- a/app/assets/javascripts/admin/addon/components/site-settings/upload.js
+++ b/app/assets/javascripts/admin/addon/components/site-settings/upload.js
@@ -1,3 +1,3 @@
 import Component from "@ember/component";
 
-export default Component.extend({});
+export default class Upload extends Component {}
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/uploaded-image-list.hbs b/app/assets/javascripts/admin/addon/components/site-settings/uploaded-image-list.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/site-settings/uploaded-image-list.hbs
rename to app/assets/javascripts/admin/addon/components/site-settings/uploaded-image-list.hbs
diff --git a/app/assets/javascripts/admin/addon/components/site-settings/uploaded-image-list.js b/app/assets/javascripts/admin/addon/components/site-settings/uploaded-image-list.js
index d66b07e0e8c..4d241b84f74 100644
--- a/app/assets/javascripts/admin/addon/components/site-settings/uploaded-image-list.js
+++ b/app/assets/javascripts/admin/addon/components/site-settings/uploaded-image-list.js
@@ -1,16 +1,16 @@
+import { action } from "@ember/object";
 import Component from "@ember/component";
 import showModal from "discourse/lib/show-modal";
 
-export default Component.extend({
-  actions: {
-    showUploadModal({ value, setting }) {
-      showModal("admin-uploaded-image-list", {
-        admin: true,
-        title: `admin.site_settings.${setting.setting}.title`,
-        model: { value, setting },
-      }).setProperties({
-        save: (v) => this.set("value", v),
-      });
-    },
-  },
-});
+export default class UploadedImageList extends Component {
+  @action
+  showUploadModal({ value, setting }) {
+    showModal("admin-uploaded-image-list", {
+      admin: true,
+      title: `admin.site_settings.${setting.setting}.title`,
+      model: { value, setting },
+    }).setProperties({
+      save: (v) => this.set("value", v),
+    });
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/url-list.hbs b/app/assets/javascripts/admin/addon/components/site-settings/url-list.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/site-settings/url-list.hbs
rename to app/assets/javascripts/admin/addon/components/site-settings/url-list.hbs
diff --git a/app/assets/javascripts/admin/addon/components/site-settings/url-list.js b/app/assets/javascripts/admin/addon/components/site-settings/url-list.js
index 87d5ddb040f..87e25fd4164 100644
--- a/app/assets/javascripts/admin/addon/components/site-settings/url-list.js
+++ b/app/assets/javascripts/admin/addon/components/site-settings/url-list.js
@@ -1,3 +1,3 @@
 import Component from "@ember/component";
 
-export default Component.extend({});
+export default class UrlList extends Component {}
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/value-list.hbs b/app/assets/javascripts/admin/addon/components/site-settings/value-list.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/site-settings/value-list.hbs
rename to app/assets/javascripts/admin/addon/components/site-settings/value-list.hbs
diff --git a/app/assets/javascripts/admin/addon/components/site-settings/value-list.js b/app/assets/javascripts/admin/addon/components/site-settings/value-list.js
index 87d5ddb040f..c358c36779f 100644
--- a/app/assets/javascripts/admin/addon/components/site-settings/value-list.js
+++ b/app/assets/javascripts/admin/addon/components/site-settings/value-list.js
@@ -1,3 +1,3 @@
 import Component from "@ember/component";
 
-export default Component.extend({});
+export default class ValueList extends Component {}
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-text-summary.hbs b/app/assets/javascripts/admin/addon/components/site-text-summary.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/site-text-summary.hbs
rename to app/assets/javascripts/admin/addon/components/site-text-summary.hbs
diff --git a/app/assets/javascripts/admin/addon/components/site-text-summary.js b/app/assets/javascripts/admin/addon/components/site-text-summary.js
index 8f9b3f3b6c9..a8706d5ba55 100644
--- a/app/assets/javascripts/admin/addon/components/site-text-summary.js
+++ b/app/assets/javascripts/admin/addon/components/site-text-summary.js
@@ -1,11 +1,11 @@
+import { classNameBindings, classNames } from "@ember-decorators/component";
 import Component from "@ember/component";
 import highlightHTML from "discourse/lib/highlight-html";
-import { on } from "discourse-common/utils/decorators";
-
-export default Component.extend({
-  classNames: ["site-text"],
-  classNameBindings: ["siteText.overridden"],
+import { on } from "@ember-decorators/object";
 
+@classNames("site-text")
+@classNameBindings("siteText.overridden")
+export default class SiteTextSummary extends Component {
   @on("didInsertElement")
   highlightTerm() {
     const term = this._searchTerm();
@@ -19,11 +19,11 @@ export default Component.extend({
         }
       );
     }
-  },
+  }
 
   click() {
     this.editAction(this.siteText);
-  },
+  }
 
   _searchTerm() {
     const regex = this.searchRegex;
@@ -37,5 +37,5 @@ export default Component.extend({
     }
 
     return this.term;
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/staff-actions.hbs b/app/assets/javascripts/admin/addon/components/staff-actions.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/staff-actions.hbs
rename to app/assets/javascripts/admin/addon/components/staff-actions.hbs
diff --git a/app/assets/javascripts/admin/addon/components/staff-actions.js b/app/assets/javascripts/admin/addon/components/staff-actions.js
index c639a04746d..4e4fe55c508 100644
--- a/app/assets/javascripts/admin/addon/components/staff-actions.js
+++ b/app/assets/javascripts/admin/addon/components/staff-actions.js
@@ -1,10 +1,10 @@
+import { tagName } from "@ember-decorators/component";
 import { action } from "@ember/object";
 import Component from "@ember/component";
 import DiscourseURL from "discourse/lib/url";
 
-export default Component.extend({
-  tagName: "",
-
+@tagName("")
+export default class StaffActions extends Component {
   @action
   openLinks(event) {
     const dataset = event.target.dataset;
@@ -20,5 +20,5 @@ export default Component.extend({
 
       DiscourseURL.routeTo(`/t/${dataset.linkTopicId}`);
     }
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/tags-uploader.hbs b/app/assets/javascripts/admin/addon/components/tags-uploader.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/tags-uploader.hbs
rename to app/assets/javascripts/admin/addon/components/tags-uploader.hbs
diff --git a/app/assets/javascripts/admin/addon/components/tags-uploader.js b/app/assets/javascripts/admin/addon/components/tags-uploader.js
index 39425b9b656..acc31e3506e 100644
--- a/app/assets/javascripts/admin/addon/components/tags-uploader.js
+++ b/app/assets/javascripts/admin/addon/components/tags-uploader.js
@@ -1,24 +1,27 @@
+import { inject as service } from "@ember/service";
+import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
 import I18n from "I18n";
 import UppyUploadMixin from "discourse/mixins/uppy-upload";
-import { alias } from "@ember/object/computed";
-import { inject as service } from "@ember/service";
 
-export default Component.extend(UppyUploadMixin, {
-  type: "csv",
-  dialog: service(),
-  uploadUrl: "/tags/upload",
-  addDisabled: alias("uploading"),
-  elementId: "tag-uploader",
-  preventDirectS3Uploads: true,
+export default class TagsUploader extends Component.extend(UppyUploadMixin) {
+  @service dialog;
+  type = "csv";
+
+  uploadUrl = "/tags/upload";
+
+  @alias("uploading") addDisabled;
+
+  elementId = "tag-uploader";
+  preventDirectS3Uploads = true;
 
   validateUploadedFilesOptions() {
     return { csvOnly: true };
-  },
+  }
 
   uploadDone() {
     this.closeModal();
     this.refresh();
     this.dialog.alert(I18n.t("tagging.upload_successful"));
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/components/theme-setting-editor.js b/app/assets/javascripts/admin/addon/components/theme-setting-editor.js
index 8ceaf32bbb6..1982145c03c 100644
--- a/app/assets/javascripts/admin/addon/components/theme-setting-editor.js
+++ b/app/assets/javascripts/admin/addon/components/theme-setting-editor.js
@@ -1,12 +1,9 @@
-import BufferedContent from "discourse/mixins/buffered-content";
-import Component from "@ember/component";
-import SettingComponent from "admin/mixins/setting-component";
+import SiteSettingComponent from "./site-setting";
 import { ajax } from "discourse/lib/ajax";
 import { url } from "discourse/lib/computed";
 
-export default Component.extend(BufferedContent, SettingComponent, {
-  layoutName: "admin/templates/components/site-setting",
-  updateUrl: url("model.id", "/admin/themes/%@/setting"),
+export default class extends SiteSettingComponent {
+  @url("model.id", "/admin/themes/%@/setting") updateUrl;
 
   _save() {
     return ajax(this.updateUrl, {
@@ -16,5 +13,5 @@ export default Component.extend(BufferedContent, SettingComponent, {
         value: this.get("buffered.value"),
       },
     });
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/components/theme-setting-relatives-selector.js b/app/assets/javascripts/admin/addon/components/theme-setting-relatives-selector.js
index 4f02a147688..02c7c84b335 100644
--- a/app/assets/javascripts/admin/addon/components/theme-setting-relatives-selector.js
+++ b/app/assets/javascripts/admin/addon/components/theme-setting-relatives-selector.js
@@ -1,15 +1,11 @@
-import BufferedContent from "discourse/mixins/buffered-content";
-import Component from "@ember/component";
-import SettingComponent from "admin/mixins/setting-component";
-
-export default Component.extend(BufferedContent, SettingComponent, {
-  layoutName: "admin/templates/components/site-setting",
+import SiteSettingComponent from "./site-setting";
 
+export default class ThemeSettingRelativesSelectorComponent extends SiteSettingComponent {
   _save() {
     return this.model
       .save({ [this.setting.setting]: this.convertNamesToIds() })
       .then(() => this.store.findAll("theme"));
-  },
+  }
 
   convertNamesToIds() {
     return this.get("buffered.value")
@@ -23,5 +19,5 @@ export default Component.extend(BufferedContent, SettingComponent, {
         }
         return themeName;
       });
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/components/theme-settings-editor.hbs b/app/assets/javascripts/admin/addon/components/theme-settings-editor.hbs
new file mode 100644
index 00000000000..d3884cfdb5f
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/components/theme-settings-editor.hbs
@@ -0,0 +1,23 @@
+<div class="settings-editor">
+  <div>
+    <AceEditor @mode="html" @content={{this.editedContent}} />
+
+    {{#each this.errors as |error|}}
+      <div class="validation-error">
+        {{d-icon "times"}}
+        <b>{{error.setting}}</b>:
+        {{error.errorMessage}}
+      </div>
+    {{/each}}
+  </div>
+
+  <div class="buttons">
+    <DButton
+      @action={{this.save}}
+      id="save"
+      class="btn-primary save"
+      @disabled={{this.saveButtonDisabled}}
+      @translatedLabel={{i18n "admin.customize.theme.save"}}
+    />
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/components/theme-settings-editor.js b/app/assets/javascripts/admin/addon/components/theme-settings-editor.js
new file mode 100644
index 00000000000..17993846ace
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/components/theme-settings-editor.js
@@ -0,0 +1,191 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import { tracked } from "@glimmer/tracking";
+import { ajax } from "discourse/lib/ajax";
+import { inject as service } from "@ember/service";
+import I18n from "I18n";
+
+export default class ThemeSettingsEditor extends Component {
+  @service dialog;
+
+  @tracked editedContent = JSON.stringify(
+    this.condensedThemeSettings,
+    null,
+    "\t"
+  );
+  @tracked errors = [];
+  @tracked saving = false;
+
+  // we need to store the controller being passed in so that when we
+  // call `save` we have not lost context of the argument
+  customizeThemeShowController = this.args.model?.controller;
+
+  get saveButtonDisabled() {
+    return !this.documentChanged || this.saving;
+  }
+
+  get documentChanged() {
+    try {
+      if (!this.editedContent) {
+        return false;
+      }
+      const editedContentString = JSON.stringify(
+        JSON.parse(this.editedContent)
+      );
+      const themeSettingsString = JSON.stringify(this.condensedThemeSettings);
+      if (editedContentString.localeCompare(themeSettingsString) !== 0) {
+        this.errors = [];
+        return true;
+      } else {
+        return false;
+      }
+    } catch {
+      return true;
+    }
+  }
+
+  get theme() {
+    return this.args.model?.model;
+  }
+
+  get condensedThemeSettings() {
+    if (!this.theme) {
+      return null;
+    }
+    return this.theme.settings.map((setting) => ({
+      setting: setting.setting,
+      value: setting.value,
+    }));
+  }
+
+  // validates the following:
+  // each setting must have a 'setting' and a 'value' key and no other keys
+  validateSettingsKeys(settings) {
+    return settings.reduce((acc, setting) => {
+      if (!acc) {
+        return acc;
+      }
+      if (!("setting" in setting)) {
+        // must have a setting key
+        return false;
+      }
+      if (!("value" in setting)) {
+        // must have a value key
+        return false;
+      }
+      if (Object.keys(setting).length > 2) {
+        // at this point it's verified to have setting and value key - but must have no other keys
+        return false;
+      }
+      return true;
+    }, true);
+  }
+
+  @action
+  async save() {
+    this.saving = true;
+    this.errors = [];
+    this.success = "";
+    if (!this.editedContent) {
+      // no changes.
+      return;
+    }
+    let newSettings = "";
+    try {
+      newSettings = JSON.parse(this.editedContent);
+    } catch (e) {
+      this.errors = [
+        ...this.errors,
+        {
+          setting: I18n.t("admin.customize.syntax_error"),
+          errorMessage: e.message,
+        },
+      ];
+      this.saving = false;
+      return;
+    }
+    if (!this.validateSettingsKeys(newSettings)) {
+      this.errors = [
+        ...this.errors,
+        {
+          setting: I18n.t("admin.customize.syntax_error"),
+          errorMessage: I18n.t("admin.customize.validation_settings_keys"),
+        },
+      ];
+      this.saving = false;
+      return;
+    }
+
+    const originalNames = this.theme
+      ? this.theme.settings.map((setting) => setting.setting)
+      : [];
+    const newNames = newSettings.map((setting) => setting.setting);
+    const deletedNames = originalNames.filter(
+      (originalName) => !newNames.find((newName) => newName === originalName)
+    );
+    const addedNames = newNames.filter(
+      (newName) =>
+        !originalNames.find((originalName) => originalName === newName)
+    );
+    if (deletedNames.length) {
+      this.errors = [
+        ...this.errors,
+        {
+          setting: deletedNames.join(", "),
+          errorMessage: I18n.t("admin.customize.validation_settings_deleted"),
+        },
+      ];
+    }
+    if (addedNames.length) {
+      this.errors = [
+        ...this.errors,
+        {
+          setting: addedNames.join(","),
+          errorMessage: I18n.t("admin.customize.validation_settings_added"),
+        },
+      ];
+    }
+
+    if (this.errors.length) {
+      this.saving = false;
+      return;
+    }
+
+    const changedSettings = newSettings.filter((newSetting) => {
+      const originalSetting = this.theme.settings.find(
+        (_originalSetting) => _originalSetting.setting === newSetting.setting
+      );
+      return originalSetting.value !== newSetting.value;
+    });
+    for (let setting of changedSettings) {
+      try {
+        await this.saveSetting(this.theme.id, setting);
+      } catch (err) {
+        const errorObjects = JSON.parse(err.jqXHR.responseText).errors.map(
+          (error) => ({
+            setting: setting.setting,
+            errorMessage: error,
+          })
+        );
+        this.errors = [...this.errors, ...errorObjects];
+      }
+    }
+    if (this.errors.length === 0) {
+      this.editedContent = null;
+    }
+    this.saving = false;
+    this.dialog.cancel();
+    this.customizeThemeShowController.send("routeRefreshModel");
+  }
+
+  async saveSetting(themeId, setting) {
+    const updateUrl = `/admin/themes/${themeId}/setting`;
+    return await ajax(updateUrl, {
+      type: "PUT",
+      data: {
+        name: setting.setting,
+        value: setting.value,
+      },
+    });
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/components/theme-translation.js b/app/assets/javascripts/admin/addon/components/theme-translation.js
index 7a598db1c82..c111b350515 100644
--- a/app/assets/javascripts/admin/addon/components/theme-translation.js
+++ b/app/assets/javascripts/admin/addon/components/theme-translation.js
@@ -1,18 +1,23 @@
-import BufferedContent from "discourse/mixins/buffered-content";
-import Component from "@ember/component";
-import SettingComponent from "admin/mixins/setting-component";
+import SiteSettingComponent from "./site-setting";
+import { ajax } from "discourse/lib/ajax";
+import { url } from "discourse/lib/computed";
 import { alias } from "@ember/object/computed";
 
-export default Component.extend(BufferedContent, SettingComponent, {
-  layoutName: "admin/templates/components/site-setting",
-  setting: alias("translation"),
-  type: "string",
-  settingName: alias("translation.key"),
+export default class ThemeTranslation extends SiteSettingComponent {
+  @alias("translation") setting;
+  @alias("translation.key") settingName;
+  @url("model.id", "/admin/themes/%@") updateUrl;
+
+  type = "string";
 
   _save() {
-    return this.model.saveTranslation(
-      this.get("translation.key"),
-      this.get("buffered.value")
-    );
-  },
-});
+    const translations = {
+      [this.get("translation.key")]: this.get("buffered.value"),
+    };
+
+    return ajax(this.updateUrl, {
+      type: "PUT",
+      data: { theme: { translations } },
+    });
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/components/theme-upload-add.hbs b/app/assets/javascripts/admin/addon/components/theme-upload-add.hbs
new file mode 100644
index 00000000000..08ee5addf15
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/components/theme-upload-add.hbs
@@ -0,0 +1,47 @@
+<DModal
+  class="add-upload-modal"
+  @title={{i18n "admin.customize.theme.add_upload"}}
+  @closeModal={{@closeModal}}
+  @flash={{this.flash}}
+>
+  <:body>
+    <div class="inputs">
+      <section class="field">
+        <input
+          {{on "change" this.updateName}}
+          type="file"
+          id="file-input"
+          accept="*"
+        />
+        <label for="file-input">
+          {{i18n "admin.customize.theme.upload_file_tip"}}
+        </label>
+      </section>
+      <section class="field">
+        <label for="theme-variable-name">
+          {{i18n "admin.customize.theme.variable_name"}}
+        </label>
+        <Input id="theme-variable-name" @value={{this.name}} />
+      </section>
+      {{#if this.fileSelected}}
+        {{#if this.errorMessage}}
+          <span class="alert alert-error">{{this.errorMessage}}</span>
+        {{/if}}
+      {{/if}}
+    </div>
+  </:body>
+  <:footer>
+    <DButton
+      @action={{this.upload}}
+      @disabled={{this.disabled}}
+      class="btn btn-primary"
+      @icon="upload"
+      @label="admin.customize.theme.upload"
+    />
+    <DButton
+      class="btn-flat d-modal-cancel"
+      @action={{@closeModal}}
+      @label="cancel"
+    />
+  </:footer>
+</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/components/theme-upload-add.js b/app/assets/javascripts/admin/addon/components/theme-upload-add.js
new file mode 100644
index 00000000000..5a8a359f130
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/components/theme-upload-add.js
@@ -0,0 +1,112 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import { tracked } from "@glimmer/tracking";
+import I18n from "I18n";
+import { ajax } from "discourse/lib/ajax";
+import { isEmpty } from "@ember/utils";
+
+const THEME_FIELD_VARIABLE_TYPE_IDS = [2, 3, 4];
+const SCSS_VARIABLE_NAMES = [
+  // common/foundation/colors.scss
+  "primary",
+  "secondary",
+  "tertiary",
+  "quaternary",
+  "header_background",
+  "header_primary",
+  "highlight",
+  "danger",
+  "success",
+  "love",
+  // common/foundation/math.scss
+  "E",
+  "PI",
+  "LN2",
+  "SQRT2",
+  // common/foundation/variables.scss
+  "small-width",
+  "medium-width",
+  "large-width",
+  "google",
+  "instagram",
+  "facebook",
+  "cas",
+  "twitter",
+  "github",
+  "base-font-size",
+  "base-line-height",
+  "base-font-family",
+  "primary-low",
+  "primary-medium",
+  "secondary-low",
+  "secondary-medium",
+  "tertiary-low",
+  "quaternary-low",
+  "highlight-low",
+  "highlight-medium",
+  "danger-low",
+  "danger-medium",
+  "success-low",
+  "love-low",
+];
+
+export default class ThemeUploadAdd extends Component {
+  @tracked name;
+  @tracked fileSelected = false;
+  @tracked flash;
+
+  get disabled() {
+    return this.errorMessage && this.fileSelected;
+  }
+
+  get errorMessage() {
+    if (!this.name) {
+      return;
+    } else if (!this.name.match(/^[a-z_][a-z0-9_-]*$/i)) {
+      return I18n.t("admin.customize.theme.variable_name_error.invalid_syntax");
+    } else if (SCSS_VARIABLE_NAMES.includes(name.toLowerCase())) {
+      return I18n.t("admin.customize.theme.variable_name_error.no_overwrite");
+    } else if (
+      this.args.model.themeFields.some(
+        (tf) =>
+          THEME_FIELD_VARIABLE_TYPE_IDS.includes(tf.type_id) &&
+          this.name === tf.name
+      )
+    ) {
+      return I18n.t("admin.customize.theme.variable_name_error.must_be_unique");
+    }
+  }
+
+  @action
+  updateName(e) {
+    if (isEmpty(this.name)) {
+      this.name = e.target.files[0].name.split(".")[0];
+    }
+    this.fileSelected = e.target.files[0];
+  }
+
+  @action
+  async upload() {
+    const file = document.getElementById("file-input").files[0];
+    const options = {
+      type: "POST",
+      processData: false,
+      contentType: false,
+      data: new FormData(),
+    };
+    options.data.append("file", file);
+
+    try {
+      const result = await ajax("/admin/themes/upload_asset", options);
+      const upload = {
+        upload_id: result.upload_id,
+        name: this.name,
+        original_filename: file.name,
+      };
+      this.args.model.addUpload(upload);
+      this.args.closeModal();
+    } catch (e) {
+      this.flash = e.jqXHR.responseJSON.errors.join(". ");
+    }
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/themes-list-item.hbs b/app/assets/javascripts/admin/addon/components/themes-list-item.hbs
similarity index 90%
rename from app/assets/javascripts/admin/addon/templates/components/themes-list-item.hbs
rename to app/assets/javascripts/admin/addon/components/themes-list-item.hbs
index a69e72c8cb9..c272aa400e6 100644
--- a/app/assets/javascripts/admin/addon/templates/components/themes-list-item.hbs
+++ b/app/assets/javascripts/admin/addon/components/themes-list-item.hbs
@@ -1,10 +1,11 @@
 <div class="inner-wrapper">
-  <PluginOutlet
-    @name="admin-customize-themes-list-item"
-    @tagName="span"
-    @connectorTagName="span"
-    @args={{hash theme=this.theme}}
-  />
+  <span>
+    <PluginOutlet
+      @name="admin-customize-themes-list-item"
+      @connectorTagName="span"
+      @outletArgs={{hash theme=this.theme}}
+    />
+  </span>
 
   <div class="info">
     <span class="name">
diff --git a/app/assets/javascripts/admin/addon/components/themes-list-item.js b/app/assets/javascripts/admin/addon/components/themes-list-item.js
index 29158c44967..b059b96ea47 100644
--- a/app/assets/javascripts/admin/addon/components/themes-list-item.js
+++ b/app/assets/javascripts/admin/addon/components/themes-list-item.js
@@ -1,3 +1,4 @@
+import { classNameBindings, classNames } from "@ember-decorators/component";
 import { and, gt } from "@ember/object/computed";
 import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
@@ -7,19 +8,22 @@ import { action } from "@ember/object";
 
 const MAX_COMPONENTS = 4;
 
-export default Component.extend({
-  childrenExpanded: false,
-  classNames: ["themes-list-item"],
-  classNameBindings: ["theme.selected:selected"],
-  hasComponents: gt("children.length", 0),
-  displayComponents: and("hasComponents", "theme.isActive"),
-  displayHasMore: gt("theme.childThemes.length", MAX_COMPONENTS),
+@classNames("themes-list-item")
+@classNameBindings("theme.selected:selected")
+export default class ThemesListItem extends Component {
+  childrenExpanded = false;
+
+  @gt("children.length", 0) hasComponents;
+
+  @and("hasComponents", "theme.isActive") displayComponents;
+
+  @gt("theme.childThemes.length", MAX_COMPONENTS) displayHasMore;
 
   click(e) {
     if (!e.target.classList.contains("others-count")) {
       this.navigateToTheme();
     }
-  },
+  }
 
   @discourseComputed(
     "theme.component",
@@ -40,12 +44,12 @@ export default Component.extend({
       const name = escape(t.name);
       return t.enabled ? name : `${iconHTML("ban")} ${name}`;
     });
-  },
+  }
 
   @discourseComputed("children")
   childrenString(children) {
     return children.join(", ");
-  },
+  }
 
   @discourseComputed(
     "theme.childThemes.length",
@@ -58,11 +62,11 @@ export default Component.extend({
       return 0;
     }
     return childrenCount - MAX_COMPONENTS;
-  },
+  }
 
   @action
   toggleChildrenExpanded(event) {
     event?.preventDefault();
     this.toggleProperty("childrenExpanded");
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/themes-list.hbs b/app/assets/javascripts/admin/addon/components/themes-list.hbs
similarity index 97%
rename from app/assets/javascripts/admin/addon/templates/components/themes-list.hbs
rename to app/assets/javascripts/admin/addon/components/themes-list.hbs
index 4f828de66b8..31020ee205a 100644
--- a/app/assets/javascripts/admin/addon/templates/components/themes-list.hbs
+++ b/app/assets/javascripts/admin/addon/components/themes-list.hbs
@@ -56,6 +56,7 @@
     {{#if this.hasInactiveThemes}}
       {{#each this.inactiveThemes as |theme|}}
         <ThemesListItem
+          @classNames="inactive-theme"
           @theme={{theme}}
           @navigateToTheme={{action "navigateToTheme" theme}}
         />
diff --git a/app/assets/javascripts/admin/addon/components/themes-list.js b/app/assets/javascripts/admin/addon/components/themes-list.js
index ca1d872f46b..e3ca02ef437 100644
--- a/app/assets/javascripts/admin/addon/components/themes-list.js
+++ b/app/assets/javascripts/admin/addon/components/themes-list.js
@@ -1,25 +1,30 @@
-import { COMPONENTS, THEMES } from "admin/models/theme";
+import { classNames } from "@ember-decorators/component";
+import { inject as service } from "@ember/service";
 import { equal, gt, gte } from "@ember/object/computed";
+import { COMPONENTS, THEMES } from "admin/models/theme";
 import Component from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
-import { inject as service } from "@ember/service";
 import { action } from "@ember/object";
 
-export default Component.extend({
-  router: service(),
-  THEMES,
-  COMPONENTS,
+@classNames("themes-list")
+export default class ThemesList extends Component {
+  @service router;
 
-  classNames: ["themes-list"],
-  filterTerm: null,
+  THEMES = THEMES;
+  COMPONENTS = COMPONENTS;
+  filterTerm = null;
 
-  hasThemes: gt("themesList.length", 0),
-  hasActiveThemes: gt("activeThemes.length", 0),
-  hasInactiveThemes: gt("inactiveThemes.length", 0),
-  showFilter: gte("themesList.length", 10),
+  @gt("themesList.length", 0) hasThemes;
 
-  themesTabActive: equal("currentTab", THEMES),
-  componentsTabActive: equal("currentTab", COMPONENTS),
+  @gt("activeThemes.length", 0) hasActiveThemes;
+
+  @gt("inactiveThemes.length", 0) hasInactiveThemes;
+
+  @gte("themesList.length", 10) showFilter;
+
+  @equal("currentTab", THEMES) themesTabActive;
+
+  @equal("currentTab", COMPONENTS) componentsTabActive;
 
   @discourseComputed("themes", "components", "currentTab")
   themesList(themes, components) {
@@ -28,7 +33,7 @@ export default Component.extend({
     } else {
       return components;
     }
-  },
+  }
 
   @discourseComputed(
     "themesList",
@@ -49,7 +54,7 @@ export default Component.extend({
       );
     }
     return this._filterThemes(results, this.filterTerm);
-  },
+  }
 
   @discourseComputed(
     "themesList",
@@ -78,7 +83,7 @@ export default Component.extend({
         });
     }
     return this._filterThemes(results, this.filterTerm);
-  },
+  }
 
   _filterThemes(themes, term) {
     term = term?.trim()?.toLowerCase();
@@ -86,7 +91,7 @@ export default Component.extend({
       return themes;
     }
     return themes.filter(({ name }) => name.toLowerCase().includes(term));
-  },
+  }
 
   @action
   changeView(newTab) {
@@ -96,10 +101,10 @@ export default Component.extend({
         this.set("filterTerm", null);
       }
     }
-  },
+  }
 
   @action
   navigateToTheme(theme) {
     this.router.transitionTo("adminCustomizeThemes.show", theme);
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/value-list.hbs b/app/assets/javascripts/admin/addon/components/value-list.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/value-list.hbs
rename to app/assets/javascripts/admin/addon/components/value-list.hbs
diff --git a/app/assets/javascripts/admin/addon/components/value-list.js b/app/assets/javascripts/admin/addon/components/value-list.js
index 65b47c5058c..078fbab2133 100644
--- a/app/assets/javascripts/admin/addon/components/value-list.js
+++ b/app/assets/javascripts/admin/addon/components/value-list.js
@@ -1,17 +1,22 @@
-import discourseComputed, { on } from "discourse-common/utils/decorators";
+import { action } from "@ember/object";
+import { classNames } from "@ember-decorators/component";
+import discourseComputed from "discourse-common/utils/decorators";
+import { on } from "@ember-decorators/object";
 import { empty, reads } from "@ember/object/computed";
 import Component from "@ember/component";
 import { makeArray } from "discourse-common/lib/helpers";
 
-export default Component.extend({
-  classNameBindings: [":value-list"],
-  inputInvalid: empty("newValue"),
-  inputDelimiter: null,
-  inputType: null,
-  newValue: "",
-  collection: null,
-  values: null,
-  noneKey: reads("addKey"),
+@classNames("value-list")
+export default class ValueList extends Component {
+  @empty("newValue") inputInvalid;
+
+  inputDelimiter = null;
+  inputType = null;
+  newValue = "";
+  collection = null;
+  values = null;
+
+  @reads("addKey") noneKey;
 
   @on("didReceiveAttrs")
   _setupCollection() {
@@ -25,57 +30,60 @@ export default Component.extend({
       "collection",
       this._splitValues(values, this.inputDelimiter || "\n")
     );
-  },
+  }
 
   @discourseComputed("choices.[]", "collection.[]")
   filteredChoices(choices, collection) {
     return makeArray(choices).filter((i) => !collection.includes(i));
-  },
+  }
 
   keyDown(event) {
     if (event.key === "Enter") {
       this.send("addValue", this.newValue);
     }
-  },
+  }
 
-  actions: {
-    changeValue(index, event) {
-      this._replaceValue(index, event.target.value);
-    },
+  @action
+  changeValue(index, event) {
+    this._replaceValue(index, event.target.value);
+  }
 
-    addValue(newValue) {
-      if (this.inputInvalid) {
-        return;
-      }
+  @action
+  addValue(newValue) {
+    if (this.inputInvalid) {
+      return;
+    }
 
-      this.set("newValue", null);
-      this._addValue(newValue);
-    },
+    this.set("newValue", null);
+    this._addValue(newValue);
+  }
 
-    removeValue(value) {
-      this._removeValue(value);
-    },
+  @action
+  removeValue(value) {
+    this._removeValue(value);
+  }
 
-    selectChoice(choice) {
-      this._addValue(choice);
-    },
+  @action
+  selectChoice(choice) {
+    this._addValue(choice);
+  }
 
-    shift(operation, index) {
-      let futureIndex = index + operation;
+  @action
+  shift(operation, index) {
+    let futureIndex = index + operation;
 
-      if (futureIndex > this.collection.length - 1) {
-        futureIndex = 0;
-      } else if (futureIndex < 0) {
-        futureIndex = this.collection.length - 1;
-      }
+    if (futureIndex > this.collection.length - 1) {
+      futureIndex = 0;
+    } else if (futureIndex < 0) {
+      futureIndex = this.collection.length - 1;
+    }
 
-      const shiftedValue = this.collection[index];
-      this.collection.removeAt(index);
-      this.collection.insertAt(futureIndex, shiftedValue);
+    const shiftedValue = this.collection[index];
+    this.collection.removeAt(index);
+    this.collection.insertAt(futureIndex, shiftedValue);
 
-      this._saveValues();
-    },
-  },
+    this._saveValues();
+  }
 
   _addValue(value) {
     this.collection.addObject(value);
@@ -87,7 +95,7 @@ export default Component.extend({
     }
 
     this._saveValues();
-  },
+  }
 
   _removeValue(value) {
     this.collection.removeObject(value);
@@ -99,12 +107,12 @@ export default Component.extend({
     }
 
     this._saveValues();
-  },
+  }
 
   _replaceValue(index, newValue) {
     this.collection.replace(index, 1, [newValue]);
     this._saveValues();
-  },
+  }
 
   _saveValues() {
     if (this.inputType === "array") {
@@ -113,12 +121,12 @@ export default Component.extend({
     }
 
     this.set("values", this.collection.join(this.inputDelimiter || "\n"));
-  },
+  }
 
   @discourseComputed("collection")
   showUpDownButtons(collection) {
     return collection.length - 1 ? true : false;
-  },
+  }
 
   _splitValues(values, delimiter) {
     if (values && values.length) {
@@ -126,5 +134,5 @@ export default Component.extend({
     } else {
       return [];
     }
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/version-checks.hbs b/app/assets/javascripts/admin/addon/components/version-checks.hbs
similarity index 96%
rename from app/assets/javascripts/admin/addon/templates/components/version-checks.hbs
rename to app/assets/javascripts/admin/addon/components/version-checks.hbs
index bade9f1fae7..b0b31c6e05e 100644
--- a/app/assets/javascripts/admin/addon/templates/components/version-checks.hbs
+++ b/app/assets/javascripts/admin/addon/components/version-checks.hbs
@@ -130,10 +130,16 @@
       </div>
     </div>
   {{/if}}
+
   <CustomHtml
     @name="upgrade-header"
     @versionCheck={{this.versionCheck}}
     @tagName="div"
     @classNames="upgrade-header"
   />
+
+  <PluginOutlet
+    @name="admin-upgrade-header"
+    @outletArgs={{hash versionCheck=this.versionCheck}}
+  />
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/components/version-checks.js b/app/assets/javascripts/admin/addon/components/version-checks.js
index 87d5ddb040f..b06deba9d5f 100644
--- a/app/assets/javascripts/admin/addon/components/version-checks.js
+++ b/app/assets/javascripts/admin/addon/components/version-checks.js
@@ -1,3 +1,3 @@
 import Component from "@ember/component";
 
-export default Component.extend({});
+export default class VersionChecks extends Component {}
diff --git a/app/assets/javascripts/admin/addon/templates/components/watched-word-form.hbs b/app/assets/javascripts/admin/addon/components/watched-word-form.hbs
similarity index 98%
rename from app/assets/javascripts/admin/addon/templates/components/watched-word-form.hbs
rename to app/assets/javascripts/admin/addon/components/watched-word-form.hbs
index 284ebebf67e..0e3c6939599 100644
--- a/app/assets/javascripts/admin/addon/templates/components/watched-word-form.hbs
+++ b/app/assets/javascripts/admin/addon/components/watched-word-form.hbs
@@ -79,7 +79,7 @@
 <DButton
   @type="submit"
   @class="btn btn-primary"
-  @action={{action "submit"}}
+  @action={{action "submitForm"}}
   @disabled={{this.submitDisabled}}
   @label="admin.watched_words.form.add"
 />
diff --git a/app/assets/javascripts/admin/addon/components/watched-word-form.js b/app/assets/javascripts/admin/addon/components/watched-word-form.js
index f1b3138a780..e3ab1c7b212 100644
--- a/app/assets/javascripts/admin/addon/components/watched-word-form.js
+++ b/app/assets/javascripts/admin/addon/components/watched-word-form.js
@@ -1,30 +1,38 @@
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import { action } from "@ember/object";
+import { classNames, tagName } from "@ember-decorators/component";
+import { inject as service } from "@ember/service";
+import { equal, not } from "@ember/object/computed";
+import discourseComputed from "discourse-common/utils/decorators";
+import { observes } from "@ember-decorators/object";
 import Component from "@ember/component";
 import I18n from "I18n";
 import WatchedWord from "admin/models/watched-word";
-import { equal, not } from "@ember/object/computed";
 import { isEmpty } from "@ember/utils";
 import { schedule } from "@ember/runloop";
-import { inject as service } from "@ember/service";
 
-export default Component.extend({
-  tagName: "form",
-  dialog: service(),
-  classNames: ["watched-word-form"],
-  formSubmitted: false,
-  actionKey: null,
-  showMessage: false,
-  selectedTags: null,
-  isCaseSensitive: false,
-  submitDisabled: not("word"),
-  canReplace: equal("actionKey", "replace"),
-  canTag: equal("actionKey", "tag"),
-  canLink: equal("actionKey", "link"),
+@tagName("form")
+@classNames("watched-word-form")
+export default class WatchedWordForm extends Component {
+  @service dialog;
+
+  formSubmitted = false;
+  actionKey = null;
+  showMessage = false;
+  selectedTags = null;
+  isCaseSensitive = false;
+
+  @not("word") submitDisabled;
+
+  @equal("actionKey", "replace") canReplace;
+
+  @equal("actionKey", "tag") canTag;
+
+  @equal("actionKey", "link") canLink;
 
   didInsertElement() {
-    this._super(...arguments);
+    super.didInsertElement(...arguments);
     this.set("selectedTags", []);
-  },
+  }
 
   @discourseComputed("siteSettings.watched_words_regular_expressions")
   placeholderKey(watchedWordsRegularExpressions) {
@@ -33,14 +41,14 @@ export default Component.extend({
     } else {
       return "admin.watched_words.form.placeholder";
     }
-  },
+  }
 
   @observes("word")
   removeMessage() {
     if (this.showMessage && !isEmpty(this.word)) {
       this.set("showMessage", false);
     }
-  },
+  }
 
   @discourseComputed("word")
   isUniqueWord(word) {
@@ -54,71 +62,71 @@ export default Component.extend({
       }
       return content.word.toLowerCase() !== word.toLowerCase();
     });
-  },
+  }
 
   focusInput() {
     schedule("afterRender", () => this.element.querySelector("input").focus());
-  },
+  }
 
-  actions: {
-    changeSelectedTags(tags) {
+  @action
+  changeSelectedTags(tags) {
+    this.setProperties({
+      selectedTags: tags,
+      replacement: tags.join(","),
+    });
+  }
+
+  @action
+  submitForm() {
+    if (!this.isUniqueWord) {
       this.setProperties({
-        selectedTags: tags,
-        replacement: tags.join(","),
+        showMessage: true,
+        message: I18n.t("admin.watched_words.form.exists"),
       });
-    },
+      return;
+    }
 
-    submit() {
-      if (!this.isUniqueWord) {
-        this.setProperties({
-          showMessage: true,
-          message: I18n.t("admin.watched_words.form.exists"),
-        });
-        return;
-      }
+    if (!this.formSubmitted) {
+      this.set("formSubmitted", true);
 
-      if (!this.formSubmitted) {
-        this.set("formSubmitted", true);
+      const watchedWord = WatchedWord.create({
+        word: this.word,
+        replacement:
+          this.canReplace || this.canTag || this.canLink
+            ? this.replacement
+            : null,
+        action: this.actionKey,
+        isCaseSensitive: this.isCaseSensitive,
+      });
 
-        const watchedWord = WatchedWord.create({
-          word: this.word,
-          replacement:
-            this.canReplace || this.canTag || this.canLink
-              ? this.replacement
-              : null,
-          action: this.actionKey,
-          isCaseSensitive: this.isCaseSensitive,
-        });
-
-        watchedWord
-          .save()
-          .then((result) => {
-            this.setProperties({
-              word: "",
-              replacement: "",
-              formSubmitted: false,
-              selectedTags: [],
-              showMessage: true,
-              message: I18n.t("admin.watched_words.form.success"),
-              isCaseSensitive: false,
-            });
-            this.action(WatchedWord.create(result));
-            this.focusInput();
-          })
-          .catch((e) => {
-            this.set("formSubmitted", false);
-            const message = e.jqXHR.responseJSON?.errors
-              ? I18n.t("generic_error_with_reason", {
-                  error: e.jqXHR.responseJSON.errors.join(". "),
-                })
-              : I18n.t("generic_error");
-            this.dialog.alert({
-              message,
-              didConfirm: () => this.focusInput(),
-              didCancel: () => this.focusInput(),
-            });
+      watchedWord
+        .save()
+        .then((result) => {
+          this.setProperties({
+            word: "",
+            replacement: "",
+            formSubmitted: false,
+            selectedTags: [],
+            showMessage: true,
+            message: I18n.t("admin.watched_words.form.success"),
+            isCaseSensitive: false,
           });
-      }
-    },
-  },
-});
+          this.action(WatchedWord.create(result));
+          this.focusInput();
+        })
+        .catch((e) => {
+          this.set("formSubmitted", false);
+          const message = e.jqXHR.responseJSON?.errors
+            ? I18n.t("generic_error_with_reason", {
+                error: e.jqXHR.responseJSON.errors.join(". "),
+              })
+            : I18n.t("generic_error");
+          this.dialog.alert({
+            message,
+            didConfirm: () => this.focusInput(),
+            didCancel: () => this.focusInput(),
+          });
+        });
+    }
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/components/watched-word-uploader.hbs b/app/assets/javascripts/admin/addon/components/watched-word-uploader.hbs
similarity index 100%
rename from app/assets/javascripts/admin/addon/templates/components/watched-word-uploader.hbs
rename to app/assets/javascripts/admin/addon/components/watched-word-uploader.hbs
diff --git a/app/assets/javascripts/admin/addon/components/watched-word-uploader.js b/app/assets/javascripts/admin/addon/components/watched-word-uploader.js
index 27c43ad5761..3c29a88cf7c 100644
--- a/app/assets/javascripts/admin/addon/components/watched-word-uploader.js
+++ b/app/assets/javascripts/admin/addon/components/watched-word-uploader.js
@@ -1,28 +1,33 @@
+import { classNames } from "@ember-decorators/component";
+import { alias } from "@ember/object/computed";
 import Component from "@ember/component";
 import I18n from "I18n";
 import UppyUploadMixin from "discourse/mixins/uppy-upload";
-import { alias } from "@ember/object/computed";
 import { dialog } from "discourse/lib/uploads";
 
-export default Component.extend(UppyUploadMixin, {
-  type: "txt",
-  classNames: "watched-words-uploader",
-  uploadUrl: "/admin/customize/watched_words/upload",
-  addDisabled: alias("uploading"),
-  preventDirectS3Uploads: true,
+@classNames("watched-words-uploader")
+export default class WatchedWordUploader extends Component.extend(
+  UppyUploadMixin
+) {
+  type = "txt";
+  uploadUrl = "/admin/customize/watched_words/upload";
+
+  @alias("uploading") addDisabled;
+
+  preventDirectS3Uploads = true;
 
   validateUploadedFilesOptions() {
     return { skipValidation: true };
-  },
+  }
 
   _perFileData() {
     return { action_key: this.actionKey };
-  },
+  }
 
   uploadDone() {
     if (this) {
       dialog.alert(I18n.t("admin.watched_words.form.upload_successful"));
       this.done();
     }
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-api-keys-index.js b/app/assets/javascripts/admin/addon/controllers/admin-api-keys-index.js
index 7b98fdba1d1..e7c90f292b3 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-api-keys-index.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-api-keys-index.js
@@ -2,18 +2,18 @@ import Controller from "@ember/controller";
 import { action } from "@ember/object";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Controller.extend({
-  loading: false,
+export default class AdminApiKeysIndexController extends Controller {
+  loading = false;
 
   @action
   revokeKey(key) {
     key.revoke().catch(popupAjaxError);
-  },
+  }
 
   @action
   undoRevokeKey(key) {
     key.undoRevoke().catch(popupAjaxError);
-  },
+  }
 
   @action
   loadMore() {
@@ -35,5 +35,5 @@ export default Controller.extend({
       .finally(() => {
         this.set("loading", false);
       });
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-api-keys-new.js b/app/assets/javascripts/admin/addon/controllers/admin-api-keys-new.js
index a95c7845c08..7569e0659df 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-api-keys-new.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-api-keys-new.js
@@ -1,37 +1,35 @@
+import { equal } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { isBlank } from "@ember/utils";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { action, get } from "@ember/object";
-import { equal } from "@ember/object/computed";
 import showModal from "discourse/lib/show-modal";
 import { ajax } from "discourse/lib/ajax";
+import { inject as service } from "@ember/service";
 
-export default Controller.extend({
-  userModes: null,
-  scopeModes: null,
-  globalScopes: null,
-  scopes: null,
+export default class AdminApiKeysNewController extends Controller {
+  @service router;
+
+  userModes = [
+    { id: "all", name: I18n.t("admin.api.all_users") },
+    { id: "single", name: I18n.t("admin.api.single_user") },
+  ];
+  scopeModes = [
+    { id: "granular", name: I18n.t("admin.api.scopes.granular") },
+    { id: "read_only", name: I18n.t("admin.api.scopes.read_only") },
+    { id: "global", name: I18n.t("admin.api.scopes.global") },
+  ];
+  globalScopes = null;
+  scopes = null;
+
+  @equal("userMode", "single") showUserSelector;
 
   init() {
-    this._super(...arguments);
-
-    this.set("userModes", [
-      { id: "all", name: I18n.t("admin.api.all_users") },
-      { id: "single", name: I18n.t("admin.api.single_user") },
-    ]);
-
-    this.set("scopeModes", [
-      { id: "granular", name: I18n.t("admin.api.scopes.granular") },
-      { id: "read_only", name: I18n.t("admin.api.scopes.read_only") },
-      { id: "global", name: I18n.t("admin.api.scopes.global") },
-    ]);
-
+    super.init(...arguments);
     this._loadScopes();
-  },
-
-  showUserSelector: equal("userMode", "single"),
+  }
 
   @discourseComputed("model.{description,username}", "showUserSelector")
   saveDisabled(model, showUserSelector) {
@@ -42,12 +40,12 @@ export default Controller.extend({
       return true;
     }
     return false;
-  },
+  }
 
   @action
   updateUsername(selected) {
     this.set("model.username", get(selected, "firstObject"));
-  },
+  }
 
   @action
   changeUserMode(userMode) {
@@ -55,12 +53,12 @@ export default Controller.extend({
       this.model.set("username", null);
     }
     this.set("userMode", userMode);
-  },
+  }
 
   @action
   changeScopeMode(scopeMode) {
     this.set("scopeMode", scopeMode);
-  },
+  }
 
   @action
   save() {
@@ -77,12 +75,12 @@ export default Controller.extend({
     }
 
     return this.model.save().catch(popupAjaxError);
-  },
+  }
 
   @action
   continue() {
-    this.transitionToRoute("adminApiKeys.show", this.model.id);
-  },
+    this.router.transitionTo("adminApiKeys.show", this.model.id);
+  }
 
   @action
   showURLs(urls) {
@@ -90,7 +88,7 @@ export default Controller.extend({
       admin: true,
       model: { urls },
     });
-  },
+  }
 
   _loadScopes() {
     return ajax("/admin/api/keys/scopes.json")
@@ -102,5 +100,5 @@ export default Controller.extend({
         this.set("scopes", data.scopes);
       })
       .catch(popupAjaxError);
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-api-keys-show.js b/app/assets/javascripts/admin/addon/controllers/admin-api-keys-show.js
index 28a883d985f..ba403002a39 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-api-keys-show.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-api-keys-show.js
@@ -1,66 +1,77 @@
+import { action } from "@ember/object";
+import { empty } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
-import { empty } from "@ember/object/computed";
 import { isEmpty } from "@ember/utils";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import showModal from "discourse/lib/show-modal";
+import { inject as service } from "@ember/service";
 
-export default Controller.extend(bufferedProperty("model"), {
-  isNew: empty("model.id"),
+export default class AdminApiKeysShowController extends Controller.extend(
+  bufferedProperty("model")
+) {
+  @service router;
 
-  actions: {
-    saveDescription() {
-      const buffered = this.buffered;
-      const attrs = buffered.getProperties("description");
+  @empty("model.id") isNew;
 
-      this.model
-        .save(attrs)
-        .then(() => {
-          this.set("editingDescription", false);
-          this.rollbackBuffer();
-        })
-        .catch(popupAjaxError);
-    },
+  @action
+  saveDescription() {
+    const buffered = this.buffered;
+    const attrs = buffered.getProperties("description");
 
-    cancel() {
-      const id = this.get("userField.id");
-      if (isEmpty(id)) {
-        this.destroyAction(this.userField);
-      } else {
+    this.model
+      .save(attrs)
+      .then(() => {
+        this.set("editingDescription", false);
         this.rollbackBuffer();
-        this.set("editing", false);
-      }
-    },
+      })
+      .catch(popupAjaxError);
+  }
 
-    editDescription() {
-      this.toggleProperty("editingDescription");
-      if (!this.editingDescription) {
-        this.rollbackBuffer();
-      }
-    },
+  @action
+  cancel() {
+    const id = this.get("userField.id");
+    if (isEmpty(id)) {
+      this.destroyAction(this.userField);
+    } else {
+      this.rollbackBuffer();
+      this.set("editing", false);
+    }
+  }
 
-    revokeKey(key) {
-      key.revoke().catch(popupAjaxError);
-    },
+  @action
+  editDescription() {
+    this.toggleProperty("editingDescription");
+    if (!this.editingDescription) {
+      this.rollbackBuffer();
+    }
+  }
 
-    deleteKey(key) {
-      key
-        .destroyRecord()
-        .then(() => this.transitionToRoute("adminApiKeys.index"))
-        .catch(popupAjaxError);
-    },
+  @action
+  revokeKey(key) {
+    key.revoke().catch(popupAjaxError);
+  }
 
-    undoRevokeKey(key) {
-      key.undoRevoke().catch(popupAjaxError);
-    },
+  @action
+  deleteKey(key) {
+    key
+      .destroyRecord()
+      .then(() => this.router.transitionTo("adminApiKeys.index"))
+      .catch(popupAjaxError);
+  }
 
-    showURLs(urls) {
-      return showModal("admin-api-key-urls", {
-        admin: true,
-        model: {
-          urls,
-        },
-      });
-    },
-  },
-});
+  @action
+  undoRevokeKey(key) {
+    key.undoRevoke().catch(popupAjaxError);
+  }
+
+  @action
+  showURLs(urls) {
+    return showModal("admin-api-key-urls", {
+      admin: true,
+      model: {
+        urls,
+      },
+    });
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-api-keys.js b/app/assets/javascripts/admin/addon/controllers/admin-api-keys.js
index 7ae8f5a1e2e..08fee5c7335 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-api-keys.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-api-keys.js
@@ -1,3 +1,3 @@
 import Controller from "@ember/controller";
 
-export default Controller.extend();
+export default class AdminApiKeysController extends Controller {}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-backups-index.js b/app/assets/javascripts/admin/addon/controllers/admin-backups-index.js
index 72a1bd18a54..09b7a3f9734 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-backups-index.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-backups-index.js
@@ -1,19 +1,21 @@
-import Controller, { inject as controller } from "@ember/controller";
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
 import { alias, equal } from "@ember/object/computed";
+import Controller, { inject as controller } from "@ember/controller";
 import { i18n, setting } from "discourse/lib/computed";
 import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
 
 import discourseComputed from "discourse-common/utils/decorators";
-import { inject as service } from "@ember/service";
 
-export default Controller.extend({
-  adminBackups: controller(),
-  dialog: service(),
-  status: alias("adminBackups.model"),
-  uploadLabel: i18n("admin.backups.upload.label"),
-  backupLocation: setting("backup_location"),
-  localBackupStorage: equal("backupLocation", "local"),
+export default class AdminBackupsIndexController extends Controller {
+  @service dialog;
+  @controller adminBackups;
+
+  @alias("adminBackups.model") status;
+  @i18n("admin.backups.upload.label") uploadLabel;
+  @setting("backup_location") backupLocation;
+  @equal("backupLocation", "local") localBackupStorage;
 
   @discourseComputed("status.allowRestore", "status.isOperationRunning")
   restoreTitle(allowRestore, isOperationRunning) {
@@ -24,35 +26,35 @@ export default Controller.extend({
     } else {
       return "admin.backups.operations.restore.title";
     }
-  },
+  }
 
-  actions: {
-    toggleReadOnlyMode() {
-      if (!this.site.get("isReadOnly")) {
-        this.dialog.yesNoConfirm({
-          message: I18n.t("admin.backups.read_only.enable.confirm"),
-          didConfirm: () => {
-            this.set("currentUser.hideReadOnlyAlert", true);
-            this._toggleReadOnlyMode(true);
-          },
-        });
-      } else {
-        this._toggleReadOnlyMode(false);
-      }
-    },
+  @action
+  toggleReadOnlyMode() {
+    if (!this.site.get("isReadOnly")) {
+      this.dialog.yesNoConfirm({
+        message: I18n.t("admin.backups.read_only.enable.confirm"),
+        didConfirm: () => {
+          this.set("currentUser.hideReadOnlyAlert", true);
+          this._toggleReadOnlyMode(true);
+        },
+      });
+    } else {
+      this._toggleReadOnlyMode(false);
+    }
+  }
 
-    download(backup) {
-      const link = backup.get("filename");
-      ajax(`/admin/backups/${link}`, { type: "PUT" }).then(() =>
-        this.dialog.alert(I18n.t("admin.backups.operations.download.alert"))
-      );
-    },
-  },
+  @action
+  download(backup) {
+    const link = backup.get("filename");
+    ajax(`/admin/backups/${link}`, { type: "PUT" }).then(() =>
+      this.dialog.alert(I18n.t("admin.backups.operations.download.alert"))
+    );
+  }
 
   _toggleReadOnlyMode(enable) {
     ajax("/admin/backups/readonly", {
       type: "PUT",
       data: { enable },
     }).then(() => this.site.set("isReadOnly", enable));
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-backups-logs.js b/app/assets/javascripts/admin/addon/controllers/admin-backups-logs.js
index e8a1694e2c2..3eae5564d17 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-backups-logs.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-backups-logs.js
@@ -1,13 +1,10 @@
-import Controller, { inject as controller } from "@ember/controller";
 import { alias } from "@ember/object/computed";
+import Controller, { inject as controller } from "@ember/controller";
 
-export default Controller.extend({
-  adminBackups: controller(),
-  status: alias("adminBackups.model"),
+export default class AdminBackupsLogsController extends Controller {
+  @controller adminBackups;
 
-  init() {
-    this._super(...arguments);
+  @alias("adminBackups.model") status;
 
-    this.logs = [];
-  },
-});
+  logs = [];
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-backups.js b/app/assets/javascripts/admin/addon/controllers/admin-backups.js
index 77dfbc31329..bb5c7251b16 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-backups.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-backups.js
@@ -1,11 +1,8 @@
 import { and, not } from "@ember/object/computed";
 import Controller from "@ember/controller";
-export default Controller.extend({
-  noOperationIsRunning: not("model.isOperationRunning"),
-  rollbackEnabled: and(
-    "model.canRollback",
-    "model.restoreEnabled",
-    "noOperationIsRunning"
-  ),
-  rollbackDisabled: not("rollbackEnabled"),
-});
+export default class AdminBackupsController extends Controller {
+  @not("model.isOperationRunning") noOperationIsRunning;
+  @not("rollbackEnabled") rollbackDisabled;
+  @and("model.canRollback", "model.restoreEnabled", "noOperationIsRunning")
+  rollbackEnabled;
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-badges/show.js b/app/assets/javascripts/admin/addon/controllers/admin-badges/show.js
index 5b098387ef8..9f49f32f744 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-badges/show.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-badges/show.js
@@ -1,7 +1,6 @@
 import Controller, { inject as controller } from "@ember/controller";
-import { observes } from "discourse-common/utils/decorators";
+import { observes } from "@ember-decorators/object";
 import I18n from "I18n";
-
 import { bufferedProperty } from "discourse/mixins/buffered-content";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { next } from "@ember/runloop";
@@ -25,6 +24,14 @@ export default class AdminBadgesShowController extends Controller.extend(
   @tracked savingStatus = "";
   @tracked selectedGraphicType = null;
 
+  get badgeEnabledLabel() {
+    if (this.buffered.get("enabled")) {
+      return "admin.badges.enabled";
+    } else {
+      return "admin.badges.disabled";
+    }
+  }
+
   get badgeTypes() {
     return this.adminBadges.badgeTypes;
   }
@@ -199,7 +206,7 @@ export default class AdminBadgesShowController extends Controller.extend(
             if (!adminBadges.includes(model)) {
               adminBadges.pushObject(model);
             }
-            this.transitionToRoute("adminBadges.show", model.get("id"));
+            this.router.transitionTo("adminBadges.show", model.get("id"));
           } else {
             this.commitBuffer();
             this.savingStatus = I18n.t("saved");
@@ -230,7 +237,7 @@ export default class AdminBadgesShowController extends Controller.extend(
           .destroy()
           .then(() => {
             adminBadges.removeObject(model);
-            this.transitionToRoute("adminBadges.index");
+            this.router.transitionTo("adminBadges.index");
           })
           .catch(() => {
             this.dialog.alert(I18n.t("generic_error"));
@@ -238,4 +245,16 @@ export default class AdminBadgesShowController extends Controller.extend(
       },
     });
   }
+
+  @action
+  toggleBadge() {
+    const originalState = this.buffered.get("enabled");
+    const newState = !this.buffered.get("enabled");
+
+    this.buffered.set("enabled", newState);
+    this.model.save({ enabled: newState }).catch((error) => {
+      this.buffered.set("enabled", originalState);
+      return popupAjaxError(error);
+    });
+  }
 }
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-colors-show.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-colors-show.js
index 3df2ee25d4f..e92f513e208 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-customize-colors-show.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-colors-show.js
@@ -7,6 +7,7 @@ import { inject as service } from "@ember/service";
 
 export default class AdminCustomizeColorsShowController extends Controller {
   @service dialog;
+  @service router;
   onlyOverridden = false;
 
   @computed("model.colors.[]", "onlyOverridden")
@@ -58,7 +59,7 @@ export default class AdminCustomizeColorsShowController extends Controller {
     );
     newColorScheme.save().then(() => {
       this.allColors.pushObject(newColorScheme);
-      this.replaceRoute("adminCustomize.colors.show", newColorScheme);
+      this.router.replaceWith("adminCustomize.colors.show", newColorScheme);
     });
   }
 
@@ -79,7 +80,7 @@ export default class AdminCustomizeColorsShowController extends Controller {
       didConfirm: () => {
         return this.model.destroy().then(() => {
           this.allColors.removeObject(this.model);
-          this.replaceRoute("adminCustomize.colors");
+          this.router.replaceWith("adminCustomize.colors");
         });
       },
     });
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-colors.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-colors.js
index 7f06b1f3f06..209f9dfcc39 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-customize-colors.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-colors.js
@@ -1,19 +1,22 @@
 import Controller from "@ember/controller";
-import EmberObject from "@ember/object";
+import EmberObject, { action } from "@ember/object";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import showModal from "discourse/lib/show-modal";
+import { inject as service } from "@ember/service";
+
+export default class AdminCustomizeColorsController extends Controller {
+  @service router;
 
-export default Controller.extend({
   @discourseComputed("model.@each.id")
   baseColorScheme() {
     return this.model.findBy("is_base", true);
-  },
+  }
 
   @discourseComputed("model.@each.id")
   baseColorSchemes() {
     return this.model.filterBy("is_base", true);
-  },
+  }
 
   @discourseComputed("baseColorScheme")
   baseColors(baseColorScheme) {
@@ -22,28 +25,28 @@ export default Controller.extend({
       baseColorsHash.set(color.get("name"), color);
     });
     return baseColorsHash;
-  },
+  }
 
-  actions: {
-    newColorSchemeWithBase(baseKey) {
-      const base = this.baseColorSchemes.findBy("base_scheme_id", baseKey);
-      const newColorScheme = base.copy();
-      newColorScheme.setProperties({
-        name: I18n.t("admin.customize.colors.new_name"),
-        base_scheme_id: base.get("base_scheme_id"),
-      });
-      newColorScheme.save().then(() => {
-        this.model.pushObject(newColorScheme);
-        newColorScheme.set("savingStatus", null);
-        this.replaceRoute("adminCustomize.colors.show", newColorScheme);
-      });
-    },
+  @action
+  newColorSchemeWithBase(baseKey) {
+    const base = this.baseColorSchemes.findBy("base_scheme_id", baseKey);
+    const newColorScheme = base.copy();
+    newColorScheme.setProperties({
+      name: I18n.t("admin.customize.colors.new_name"),
+      base_scheme_id: base.get("base_scheme_id"),
+    });
+    newColorScheme.save().then(() => {
+      this.model.pushObject(newColorScheme);
+      newColorScheme.set("savingStatus", null);
+      this.router.replaceWith("adminCustomize.colors.show", newColorScheme);
+    });
+  }
 
-    newColorScheme() {
-      showModal("admin-color-scheme-select-base", {
-        model: this.baseColorSchemes,
-        admin: true,
-      });
-    },
-  },
-});
+  @action
+  newColorScheme() {
+    showModal("admin-color-scheme-select-base", {
+      model: this.baseColorSchemes,
+      admin: true,
+    });
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-email-style-edit.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-email-style-edit.js
index ad664f79b5f..02b553c4312 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-customize-email-style-edit.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-email-style-edit.js
@@ -1,38 +1,38 @@
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
 import Controller from "@ember/controller";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
-import { inject as service } from "@ember/service";
 
-export default Controller.extend({
-  dialog: service(),
+export default class AdminCustomizeEmailStyleEditController extends Controller {
+  @service dialog;
 
   @discourseComputed("model.isSaving")
   saveButtonText(isSaving) {
     return isSaving ? I18n.t("saving") : I18n.t("admin.customize.save");
-  },
+  }
 
   @discourseComputed("model.changed", "model.isSaving")
   saveDisabled(changed, isSaving) {
     return !changed || isSaving;
-  },
+  }
 
-  actions: {
-    save() {
-      if (!this.model.saving) {
-        this.set("saving", true);
-        this.model
-          .update(this.model.getProperties("html", "css"))
-          .catch((e) => {
-            const msg =
-              e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors
-                ? I18n.t("admin.customize.email_style.save_error_with_reason", {
-                    error: e.jqXHR.responseJSON.errors.join(". "),
-                  })
-                : I18n.t("generic_error");
-            this.dialog.alert(msg);
-          })
-          .finally(() => this.set("model.changed", false));
-      }
-    },
-  },
-});
+  @action
+  save() {
+    if (!this.model.saving) {
+      this.set("saving", true);
+      this.model
+        .update(this.model.getProperties("html", "css"))
+        .catch((e) => {
+          const msg =
+            e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors
+              ? I18n.t("admin.customize.email_style.save_error_with_reason", {
+                  error: e.jqXHR.responseJSON.errors.join(". "),
+                })
+              : I18n.t("generic_error");
+          this.dialog.alert(msg);
+        })
+        .finally(() => this.set("model.changed", false));
+    }
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates-edit.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates-edit.js
index c784deb0ec5..b517fc3feda 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates-edit.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates-edit.js
@@ -1,23 +1,26 @@
+import { inject as service } from "@ember/service";
 import Controller, { inject as controller } from "@ember/controller";
 import I18n from "I18n";
 import { action } from "@ember/object";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
 import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import { inject as service } from "@ember/service";
 
-export default Controller.extend(bufferedProperty("emailTemplate"), {
-  adminCustomizeEmailTemplates: controller(),
-  dialog: service(),
-  emailTemplate: null,
-  saved: false,
+export default class AdminCustomizeEmailTemplatesEditController extends Controller.extend(
+  bufferedProperty("emailTemplate")
+) {
+  @service dialog;
+  @controller adminCustomizeEmailTemplates;
+
+  emailTemplate = null;
+  saved = false;
 
   @discourseComputed("buffered.body", "buffered.subject")
   saveDisabled(body, subject) {
     return (
       this.emailTemplate.body === body && this.emailTemplate.subject === subject
     );
-  },
+  }
 
   @discourseComputed("buffered")
   hasMultipleSubjects(buffered) {
@@ -26,7 +29,7 @@ export default Controller.extend(bufferedProperty("emailTemplate"), {
     } else {
       return buffered.getProperties("id")["id"];
     }
-  },
+  }
 
   @action
   saveChanges() {
@@ -38,7 +41,7 @@ export default Controller.extend(bufferedProperty("emailTemplate"), {
         this.set("saved", true);
       })
       .catch(popupAjaxError);
-  },
+  }
 
   @action
   revertChanges() {
@@ -57,5 +60,5 @@ export default Controller.extend(bufferedProperty("emailTemplate"), {
           .catch(popupAjaxError);
       },
     });
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates.js
index a3d7f360e03..a5781f50d56 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates.js
@@ -1,18 +1,16 @@
+import { sort } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import { action } from "@ember/object";
-import { sort } from "@ember/object/computed";
+import { inject as service } from "@ember/service";
 
-export default Controller.extend({
-  sortedTemplates: sort("emailTemplates", "titleSorting"),
+export default class AdminCustomizeEmailTemplatesController extends Controller {
+  @service router;
 
-  init() {
-    this._super(...arguments);
-
-    this.set("titleSorting", ["title"]);
-  },
+  titleSorting = ["title"];
+  @sort("emailTemplates", "titleSorting") sortedTemplates;
 
   @action
   onSelectTemplate(template) {
-    this.transitionToRoute("adminCustomizeEmailTemplates.edit", template);
-  },
-});
+    this.router.transitionTo("adminCustomizeEmailTemplates.edit", template);
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-form-templates-index.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-form-templates-index.js
new file mode 100644
index 00000000000..7b0c27ac756
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-form-templates-index.js
@@ -0,0 +1,17 @@
+import Controller from "@ember/controller";
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+
+export default class AdminCustomizeFormTemplatesIndex extends Controller {
+  @service router;
+
+  @action
+  newTemplate() {
+    this.router.transitionTo("adminCustomizeFormTemplates.new");
+  }
+
+  @action
+  reload() {
+    this.send("reloadModel");
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-robots-txt.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-robots-txt.js
index 4463b361d6b..de93b226c3b 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-customize-robots-txt.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-robots-txt.js
@@ -1,47 +1,52 @@
+import { action } from "@ember/object";
+import { not } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
-import { not } from "@ember/object/computed";
 import { propertyEqual } from "discourse/lib/computed";
 
-export default Controller.extend(bufferedProperty("model"), {
-  saved: false,
-  isSaving: false,
-  saveDisabled: propertyEqual("model.robots_txt", "buffered.robots_txt"),
-  resetDisabled: not("model.overridden"),
+export default class AdminCustomizeRobotsTxtController extends Controller.extend(
+  bufferedProperty("model")
+) {
+  saved = false;
+  isSaving = false;
 
-  actions: {
-    save() {
-      this.setProperties({
-        isSaving: true,
-        saved: false,
-      });
+  @propertyEqual("model.robots_txt", "buffered.robots_txt") saveDisabled;
 
-      ajax("robots.json", {
-        type: "PUT",
-        data: { robots_txt: this.buffered.get("robots_txt") },
+  @not("model.overridden") resetDisabled;
+
+  @action
+  save() {
+    this.setProperties({
+      isSaving: true,
+      saved: false,
+    });
+
+    ajax("robots.json", {
+      type: "PUT",
+      data: { robots_txt: this.buffered.get("robots_txt") },
+    })
+      .then((data) => {
+        this.commitBuffer();
+        this.set("saved", true);
+        this.set("model.overridden", data.overridden);
       })
-        .then((data) => {
-          this.commitBuffer();
-          this.set("saved", true);
-          this.set("model.overridden", data.overridden);
-        })
-        .finally(() => this.set("isSaving", false));
-    },
+      .finally(() => this.set("isSaving", false));
+  }
 
-    reset() {
-      this.setProperties({
-        isSaving: true,
-        saved: false,
-      });
-      ajax("robots.json", { type: "DELETE" })
-        .then((data) => {
-          this.buffered.set("robots_txt", data.robots_txt);
-          this.commitBuffer();
-          this.set("saved", true);
-          this.set("model.overridden", false);
-        })
-        .finally(() => this.set("isSaving", false));
-    },
-  },
-});
+  @action
+  reset() {
+    this.setProperties({
+      isSaving: true,
+      saved: false,
+    });
+    ajax("robots.json", { type: "DELETE" })
+      .then((data) => {
+        this.buffered.set("robots_txt", data.robots_txt);
+        this.commitBuffer();
+        this.set("saved", true);
+        this.set("model.overridden", false);
+      })
+      .finally(() => this.set("isSaving", false));
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-edit.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-edit.js
index 2c0cd18a702..82079543641 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-edit.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-edit.js
@@ -1,21 +1,27 @@
+import { action } from "@ember/object";
 import Controller from "@ember/controller";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { url } from "discourse/lib/computed";
+import { inject as service } from "@ember/service";
 
-export default Controller.extend({
-  section: null,
-  currentTarget: 0,
-  maximized: false,
-  previewUrl: url("model.id", "/admin/themes/%@/preview"),
-  showAdvanced: false,
-  editRouteName: "adminCustomizeThemes.edit",
-  showRouteName: "adminCustomizeThemes.show",
+export default class AdminCustomizeThemesEditController extends Controller {
+  @service router;
+
+  section = null;
+  currentTarget = 0;
+  maximized = false;
+
+  @url("model.id", "/admin/themes/%@/preview") previewUrl;
+
+  showAdvanced = false;
+  editRouteName = "adminCustomizeThemes.edit";
+  showRouteName = "adminCustomizeThemes.show";
 
   setTargetName(name) {
     const target = this.get("model.targets").find((t) => t.name === name);
     this.set("currentTarget", target && target.id);
-  },
+  }
 
   @discourseComputed("currentTarget")
   currentTargetName(id) {
@@ -23,50 +29,57 @@ export default Controller.extend({
       (t) => t.id === parseInt(id, 10)
     );
     return target && target.name;
-  },
+  }
 
   @discourseComputed("model.isSaving")
   saveButtonText(isSaving) {
     return isSaving ? I18n.t("saving") : I18n.t("admin.customize.save");
-  },
+  }
 
   @discourseComputed("model.changed", "model.isSaving")
   saveDisabled(changed, isSaving) {
     return !changed || isSaving;
-  },
+  }
 
-  actions: {
-    save() {
-      this.set("saving", true);
-      this.model.saveChanges("theme_fields").finally(() => {
-        this.set("saving", false);
-      });
-    },
+  @action
+  save() {
+    this.set("saving", true);
+    this.model.saveChanges("theme_fields").finally(() => {
+      this.set("saving", false);
+    });
+  }
 
-    fieldAdded(target, name) {
-      this.replaceRoute(this.editRouteName, this.get("model.id"), target, name);
-    },
+  @action
+  fieldAdded(target, name) {
+    this.router.replaceWith(
+      this.editRouteName,
+      this.get("model.id"),
+      target,
+      name
+    );
+  }
 
-    onlyOverriddenChanged(onlyShowOverridden) {
-      if (onlyShowOverridden) {
-        if (!this.model.hasEdited(this.currentTargetName, this.fieldName)) {
-          let firstTarget = this.get("model.targets").find((t) => t.edited);
-          let firstField = this.get(`model.fields.${firstTarget.name}`).find(
-            (f) => f.edited
-          );
+  @action
+  onlyOverriddenChanged(onlyShowOverridden) {
+    if (onlyShowOverridden) {
+      if (!this.model.hasEdited(this.currentTargetName, this.fieldName)) {
+        let firstTarget = this.get("model.targets").find((t) => t.edited);
+        let firstField = this.get(`model.fields.${firstTarget.name}`).find(
+          (f) => f.edited
+        );
 
-          this.replaceRoute(
-            this.editRouteName,
-            this.get("model.id"),
-            firstTarget.name,
-            firstField.name
-          );
-        }
+        this.router.replaceWith(
+          this.editRouteName,
+          this.get("model.id"),
+          firstTarget.name,
+          firstField.name
+        );
       }
-    },
+    }
+  }
 
-    goBack() {
-      this.replaceRoute(this.showRouteName, this.model.id);
-    },
-  },
-});
+  @action
+  goBack() {
+    this.router.replaceWith(this.showRouteName, this.model.id);
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-show.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-show.js
index 45d19733059..b37756645c4 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-show.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-show.js
@@ -1,4 +1,4 @@
-import { COMPONENTS, THEMES } from "admin/models/theme";
+import { inject as service } from "@ember/service";
 import {
   empty,
   filterBy,
@@ -6,40 +6,48 @@ import {
   match,
   notEmpty,
 } from "@ember/object/computed";
+import { COMPONENTS, THEMES } from "admin/models/theme";
 import Controller from "@ember/controller";
-import EmberObject from "@ember/object";
+import EmberObject, { action } from "@ember/object";
 import I18n from "I18n";
 import ThemeSettings from "admin/models/theme-settings";
 import discourseComputed from "discourse-common/utils/decorators";
 import { makeArray } from "discourse-common/lib/helpers";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import showModal from "discourse/lib/show-modal";
 import { url } from "discourse/lib/computed";
-import { inject as service } from "@ember/service";
+import ThemeSettingsEditor from "admin/components/theme-settings-editor";
+import ThemeUploadAddModal from "../components/theme-upload-add";
 
 const THEME_UPLOAD_VAR = 2;
 
-export default Controller.extend({
-  dialog: service(),
-  downloadUrl: url("model.id", "/admin/customize/themes/%@/export"),
-  previewUrl: url("model.id", "/admin/themes/%@/preview"),
-  addButtonDisabled: empty("selectedChildThemeId"),
-  editRouteName: "adminCustomizeThemes.edit",
-  parentThemesNames: mapBy("model.parentThemes", "name"),
-  availableParentThemes: filterBy("allThemes", "component", false),
-  availableActiveParentThemes: filterBy("availableParentThemes", "isActive"),
-  availableThemesNames: mapBy("availableParentThemes", "name"),
-  availableActiveThemesNames: mapBy("availableActiveParentThemes", "name"),
-  availableActiveChildThemes: filterBy("availableChildThemes", "hasParents"),
-  availableComponentsNames: mapBy("availableChildThemes", "name"),
-  availableActiveComponentsNames: mapBy("availableActiveChildThemes", "name"),
-  childThemesNames: mapBy("model.childThemes", "name"),
-  extraFiles: filterBy("model.theme_fields", "target", "extra_js"),
+export default class AdminCustomizeThemesShowController extends Controller {
+  @service dialog;
+  @service router;
+  @service modal;
+
+  editRouteName = "adminCustomizeThemes.edit";
+
+  @url("model.id", "/admin/customize/themes/%@/export") downloadUrl;
+  @url("model.id", "/admin/themes/%@/preview") previewUrl;
+  @empty("selectedChildThemeId") addButtonDisabled;
+  @mapBy("model.parentThemes", "name") parentThemesNames;
+  @filterBy("allThemes", "component", false) availableParentThemes;
+  @filterBy("availableParentThemes", "isActive") availableActiveParentThemes;
+  @mapBy("availableParentThemes", "name") availableThemesNames;
+  @mapBy("availableActiveParentThemes", "name") availableActiveThemesNames;
+  @filterBy("availableChildThemes", "hasParents") availableActiveChildThemes;
+  @mapBy("availableChildThemes", "name") availableComponentsNames;
+  @mapBy("availableActiveChildThemes", "name") availableActiveComponentsNames;
+  @mapBy("model.childThemes", "name") childThemesNames;
+  @filterBy("model.theme_fields", "target", "extra_js") extraFiles;
+  @notEmpty("settings") hasSettings;
+  @notEmpty("translations") hasTranslations;
+  @match("model.remote_theme.remote_url", /^http(s)?:\/\//) sourceIsHttp;
 
   @discourseComputed("model.component", "model.remote_theme")
   showCheckboxes() {
     return !this.model.component || this.model.remote_theme;
-  },
+  }
 
   @discourseComputed("model.editedFields")
   editedFieldsFormatted() {
@@ -57,13 +65,13 @@ export default Controller.extend({
       descriptions.push(resultString);
     });
     return descriptions;
-  },
+  }
 
   @discourseComputed("colorSchemeId", "model.color_scheme_id")
   colorSchemeChanged(colorSchemeId, existingId) {
     colorSchemeId = colorSchemeId === null ? null : parseInt(colorSchemeId, 10);
     return colorSchemeId !== existingId;
-  },
+  }
 
   @discourseComputed("availableChildThemes", "model.childThemes.[]", "model")
   selectableChildThemes(available, childThemes) {
@@ -73,7 +81,7 @@ export default Controller.extend({
         : available.filter((theme) => !childThemes.includes(theme));
       return themes.length === 0 ? null : themes;
     }
-  },
+  }
 
   @discourseComputed("model.parentThemes.[]")
   relativesSelectorSettingsForComponent() {
@@ -91,7 +99,7 @@ export default Controller.extend({
       allThemes: this.allThemes,
       setDefaultValuesLabel: I18n.t("admin.customize.theme.add_all_themes"),
     });
-  },
+  }
 
   @discourseComputed("model.parentThemes.[]")
   relativesSelectorSettingsForTheme() {
@@ -109,7 +117,7 @@ export default Controller.extend({
       allThemes: this.allThemes,
       setDefaultValuesLabel: I18n.t("admin.customize.theme.add_all"),
     });
-  },
+  }
 
   @discourseComputed("allThemes", "model.component", "model")
   availableChildThemes(allThemes) {
@@ -119,40 +127,36 @@ export default Controller.extend({
         (theme) => theme.get("id") !== themeId && theme.get("component")
       );
     }
-  },
+  }
 
   @discourseComputed("model.component")
   convertKey(component) {
     const type = component ? "component" : "theme";
     return `admin.customize.theme.convert_${type}`;
-  },
+  }
 
   @discourseComputed("model.component")
   convertIcon(component) {
     return component ? "cube" : "";
-  },
+  }
 
   @discourseComputed("model.component")
   convertTooltip(component) {
     const type = component ? "component" : "theme";
     return `admin.customize.theme.convert_${type}_tooltip`;
-  },
+  }
 
   @discourseComputed("model.settings")
   settings(settings) {
     return settings.map((setting) => ThemeSettings.create(setting));
-  },
-
-  hasSettings: notEmpty("settings"),
+  }
 
   @discourseComputed("model.translations")
   translations(translations) {
     return translations.map((setting) =>
       ThemeSettings.create({ ...setting, textarea: true })
     );
-  },
-
-  hasTranslations: notEmpty("translations"),
+  }
 
   @discourseComputed(
     "model.remote_theme.local_version",
@@ -161,12 +165,12 @@ export default Controller.extend({
   )
   hasOverwrittenHistory(localVersion, remoteVersion, commitsBehind) {
     return localVersion !== remoteVersion && commitsBehind === -1;
-  },
+  }
 
   @discourseComputed("model.remoteError", "updatingRemote")
   showRemoteError(errorMessage, updating) {
     return errorMessage && !updating;
-  },
+  }
 
   @discourseComputed(
     "model.remote_theme.remote_url",
@@ -175,13 +179,13 @@ export default Controller.extend({
   )
   finishInstall(remoteUrl, localVersion, commitsBehind) {
     return remoteUrl && !localVersion && !commitsBehind;
-  },
+  }
 
   editedFieldsForTarget(target) {
     return this.get("model.editedFields").filter(
       (field) => field.target === target
     );
-  },
+  }
 
   commitSwitchType() {
     const model = this.model;
@@ -222,16 +226,16 @@ export default Controller.extend({
         });
       })
       .catch(popupAjaxError);
-  },
+  }
+
   transitionToEditRoute() {
-    this.transitionToRoute(
+    this.router.transitionTo(
       this.editRouteName,
       this.get("model.id"),
       "common",
       "scss"
     );
-  },
-  sourceIsHttp: match("model.remote_theme.remote_url", /^http(s)?:\/\//),
+  }
 
   @discourseComputed(
     "model.remote_theme.remote_url",
@@ -241,168 +245,206 @@ export default Controller.extend({
     return remoteThemeBranch
       ? `${remoteThemeUrl.replace(/\.git$/, "")}/tree/${remoteThemeBranch}`
       : remoteThemeUrl;
-  },
+  }
 
   @discourseComputed("model.user.id", "model.default")
   showConvert(userId, defaultTheme) {
     return userId > 0 && !defaultTheme;
-  },
+  }
 
-  actions: {
-    updateToLatest() {
-      this.set("updatingRemote", true);
-      this.model
-        .updateToLatest()
-        .catch(popupAjaxError)
-        .finally(() => {
-          this.set("updatingRemote", false);
-        });
-    },
+  @action
+  refreshModel() {
+    this.send("routeRefreshModel");
+  }
 
-    checkForThemeUpdates() {
-      this.set("updatingRemote", true);
-      this.model
-        .checkForUpdates()
-        .catch(popupAjaxError)
-        .finally(() => {
-          this.set("updatingRemote", false);
-        });
-    },
-
-    addUploadModal() {
-      showModal("admin-add-upload", { admin: true, name: "" });
-    },
-
-    addUpload(info) {
-      let model = this.model;
-      model.setField("common", info.name, "", info.upload_id, THEME_UPLOAD_VAR);
-      model.saveChanges("theme_fields").catch((e) => popupAjaxError(e));
-    },
-
-    cancelChangeScheme() {
-      this.set("colorSchemeId", this.get("model.color_scheme_id"));
-    },
-    changeScheme() {
-      let schemeId = this.colorSchemeId;
-      this.set(
-        "model.color_scheme_id",
-        schemeId === null ? null : parseInt(schemeId, 10)
-      );
-      this.model.saveChanges("color_scheme_id");
-    },
-    startEditingName() {
-      this.set("oldName", this.get("model.name"));
-      this.set("editingName", true);
-    },
-    cancelEditingName() {
-      this.set("model.name", this.oldName);
-      this.set("editingName", false);
-    },
-    finishedEditingName() {
-      this.model.saveChanges("name");
-      this.set("editingName", false);
-    },
-
-    editTheme() {
-      if (this.get("model.remote_theme.is_git")) {
-        this.dialog.confirm({
-          message: I18n.t("admin.customize.theme.edit_confirm"),
-          didConfirm: () => this.transitionToEditRoute(),
-        });
-      } else {
-        this.transitionToEditRoute();
-      }
-    },
-
-    applyDefault() {
-      const model = this.model;
-      model.saveChanges("default").then(() => {
-        if (model.get("default")) {
-          this.allThemes.forEach((theme) => {
-            if (theme !== model && theme.get("default")) {
-              theme.set("default", false);
-            }
-          });
-        }
+  @action
+  updateToLatest() {
+    this.set("updatingRemote", true);
+    this.model
+      .updateToLatest()
+      .catch(popupAjaxError)
+      .finally(() => {
+        this.set("updatingRemote", false);
       });
-    },
+  }
 
-    applyUserSelectable() {
-      this.model.saveChanges("user_selectable");
-    },
-
-    applyAutoUpdateable() {
-      this.model.saveChanges("auto_update");
-    },
-
-    addChildTheme() {
-      let themeId = parseInt(this.selectedChildThemeId, 10);
-      let theme = this.allThemes.findBy("id", themeId);
-      this.model.addChildTheme(theme).then(() => this.store.findAll("theme"));
-    },
-
-    removeUpload(upload) {
-      return this.dialog.yesNoConfirm({
-        message: I18n.t("admin.customize.theme.delete_upload_confirm"),
-        didConfirm: () => this.model.removeField(upload),
+  @action
+  checkForThemeUpdates() {
+    this.set("updatingRemote", true);
+    this.model
+      .checkForUpdates()
+      .catch(popupAjaxError)
+      .finally(() => {
+        this.set("updatingRemote", false);
       });
-    },
+  }
 
-    removeChildTheme(theme) {
-      this.model
-        .removeChildTheme(theme)
-        .then(() => this.store.findAll("theme"));
-    },
+  @action
+  addUploadModal() {
+    this.modal.show(ThemeUploadAddModal, {
+      model: {
+        themeFields: this.model.theme_fields,
+        addUpload: this.addUpload,
+      },
+    });
+  }
 
-    destroy() {
-      return this.dialog.yesNoConfirm({
-        message: I18n.t("admin.customize.delete_confirm", {
-          theme_name: this.get("model.name"),
-        }),
-        didConfirm: () => {
-          const model = this.model;
-          model.setProperties({ recentlyInstalled: false });
-          model.destroyRecord().then(() => {
-            this.allThemes.removeObject(model);
-            this.transitionToRoute("adminCustomizeThemes");
-          });
-        },
+  @action
+  addUpload(info) {
+    let model = this.model;
+    model.setField("common", info.name, "", info.upload_id, THEME_UPLOAD_VAR);
+    model.saveChanges("theme_fields").catch((e) => popupAjaxError(e));
+  }
+
+  @action
+  cancelChangeScheme() {
+    this.set("colorSchemeId", this.get("model.color_scheme_id"));
+  }
+
+  @action
+  changeScheme() {
+    let schemeId = this.colorSchemeId;
+    this.set(
+      "model.color_scheme_id",
+      schemeId === null ? null : parseInt(schemeId, 10)
+    );
+    this.model.saveChanges("color_scheme_id");
+  }
+
+  @action
+  startEditingName() {
+    this.set("oldName", this.get("model.name"));
+    this.set("editingName", true);
+  }
+
+  @action
+  cancelEditingName() {
+    this.set("model.name", this.oldName);
+    this.set("editingName", false);
+  }
+
+  @action
+  finishedEditingName() {
+    this.model.saveChanges("name");
+    this.set("editingName", false);
+  }
+
+  @action
+  editTheme() {
+    if (this.get("model.remote_theme.is_git")) {
+      this.dialog.confirm({
+        message: I18n.t("admin.customize.theme.edit_confirm"),
+        didConfirm: () => this.transitionToEditRoute(),
       });
-    },
+    } else {
+      this.transitionToEditRoute();
+    }
+  }
 
-    switchType() {
-      const relatives = this.get("model.component")
-        ? this.get("model.parentThemes")
-        : this.get("model.childThemes");
-
-      let message = I18n.t(`${this.convertKey}_alert_generic`);
-
-      if (relatives && relatives.length > 0) {
-        message = I18n.t(`${this.convertKey}_alert`, {
-          relatives: relatives
-            .map((relative) => relative.get("name"))
-            .join(", "),
+  @action
+  applyDefault() {
+    const model = this.model;
+    model.saveChanges("default").then(() => {
+      if (model.get("default")) {
+        this.allThemes.forEach((theme) => {
+          if (theme !== model && theme.get("default")) {
+            theme.set("default", false);
+          }
         });
       }
+    });
+  }
 
-      return this.dialog.yesNoConfirm({
-        message,
-        didConfirm: () => this.commitSwitchType(),
+  @action
+  applyUserSelectable() {
+    this.model.saveChanges("user_selectable");
+  }
+
+  @action
+  applyAutoUpdateable() {
+    this.model.saveChanges("auto_update");
+  }
+
+  @action
+  addChildTheme() {
+    let themeId = parseInt(this.selectedChildThemeId, 10);
+    let theme = this.allThemes.findBy("id", themeId);
+    this.model.addChildTheme(theme).then(() => this.store.findAll("theme"));
+  }
+
+  @action
+  removeUpload(upload) {
+    return this.dialog.yesNoConfirm({
+      message: I18n.t("admin.customize.theme.delete_upload_confirm"),
+      didConfirm: () => this.model.removeField(upload),
+    });
+  }
+
+  @action
+  removeChildTheme(theme) {
+    this.model.removeChildTheme(theme).then(() => this.store.findAll("theme"));
+  }
+
+  @action
+  destroyTheme() {
+    return this.dialog.yesNoConfirm({
+      message: I18n.t("admin.customize.delete_confirm", {
+        theme_name: this.get("model.name"),
+      }),
+      didConfirm: () => {
+        const model = this.model;
+        model.setProperties({ recentlyInstalled: false });
+        model.destroyRecord().then(() => {
+          this.allThemes.removeObject(model);
+          this.router.transitionTo("adminCustomizeThemes");
+        });
+      },
+    });
+  }
+
+  @action
+  showThemeSettingsEditor() {
+    this.dialog.alert({
+      title: "Edit Settings",
+      bodyComponent: ThemeSettingsEditor,
+      bodyComponentModel: { model: this.model, controller: this },
+      class: "theme-settings-editor-dialog",
+    });
+  }
+
+  @action
+  switchType() {
+    const relatives = this.get("model.component")
+      ? this.get("model.parentThemes")
+      : this.get("model.childThemes");
+
+    let message = I18n.t(`${this.convertKey}_alert_generic`);
+
+    if (relatives && relatives.length > 0) {
+      message = I18n.t(`${this.convertKey}_alert`, {
+        relatives: relatives.map((relative) => relative.get("name")).join(", "),
       });
-    },
+    }
 
-    enableComponent() {
-      this.model.set("enabled", true);
-      this.model
-        .saveChanges("enabled")
-        .catch(() => this.model.set("enabled", false));
-    },
+    return this.dialog.yesNoConfirm({
+      message,
+      didConfirm: () => this.commitSwitchType(),
+    });
+  }
 
-    disableComponent() {
-      this.model.set("enabled", false);
-      this.model
-        .saveChanges("enabled")
-        .catch(() => this.model.set("enabled", true));
-    },
-  },
-});
+  @action
+  enableComponent() {
+    this.model.set("enabled", true);
+    this.model
+      .saveChanges("enabled")
+      .catch(() => this.model.set("enabled", false));
+  }
+
+  @action
+  disableComponent() {
+    this.model.set("enabled", false);
+    this.model
+      .saveChanges("enabled")
+      .catch(() => this.model.set("enabled", true));
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes.js
index a598ade6f5c..341114f89fb 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes.js
@@ -2,21 +2,21 @@ import Controller from "@ember/controller";
 import { THEMES } from "admin/models/theme";
 import discourseComputed from "discourse-common/utils/decorators";
 
-export default Controller.extend({
-  currentTab: THEMES,
+export default class AdminCustomizeThemesController extends Controller {
+  currentTab = THEMES;
 
   @discourseComputed("model", "model.@each.component")
   fullThemes(themes) {
     return themes.filter((t) => !t.get("component"));
-  },
+  }
 
   @discourseComputed("model", "model.@each.component")
   childThemes(themes) {
     return themes.filter((t) => t.get("component"));
-  },
+  }
 
   @discourseComputed("model.content")
   installedThemes(content) {
     return content || [];
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-dashboard-general.js b/app/assets/javascripts/admin/addon/controllers/admin-dashboard-general.js
index bde2cf574b2..b4373cb8ac7 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-dashboard-general.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-dashboard-general.js
@@ -1,13 +1,14 @@
+import { computed } from "@ember/object";
 import Controller, { inject as controller } from "@ember/controller";
 import AdminDashboard from "admin/models/admin-dashboard";
 import I18n from "I18n";
 import PeriodComputationMixin from "admin/mixins/period-computation";
 import Report from "admin/models/report";
-import { computed } from "@ember/object";
 import discourseComputed from "discourse-common/utils/decorators";
 import getURL from "discourse-common/lib/get-url";
 import { makeArray } from "discourse-common/lib/helpers";
 import { setting } from "discourse/lib/computed";
+import { inject as service } from "@ember/service";
 
 function staticReport(reportType) {
   return computed("reports.[]", function () {
@@ -15,41 +16,51 @@ function staticReport(reportType) {
   });
 }
 
-export default Controller.extend(PeriodComputationMixin, {
-  isLoading: false,
-  dashboardFetchedAt: null,
-  exceptionController: controller("exception"),
-  logSearchQueriesEnabled: setting("log_search_queries"),
+export default class AdminDashboardGeneralController extends Controller.extend(
+  PeriodComputationMixin
+) {
+  @service router;
+  @service siteSettings;
+  @controller("exception") exceptionController;
+
+  isLoading = false;
+  dashboardFetchedAt = null;
+
+  @setting("log_search_queries") logSearchQueriesEnabled;
+
+  @staticReport("users_by_type") usersByTypeReport;
+  @staticReport("users_by_trust_level") usersByTrustLevelReport;
+  @staticReport("storage_report") storageReport;
 
   @discourseComputed("siteSettings.dashboard_general_tab_activity_metrics")
   activityMetrics(metrics) {
     return (metrics || "").split("|").filter(Boolean);
-  },
+  }
 
-  hiddenReports: computed("siteSettings.dashboard_hidden_reports", function () {
+  @computed("siteSettings.dashboard_hidden_reports")
+  get hiddenReports() {
     return (this.siteSettings.dashboard_hidden_reports || "")
       .split("|")
       .filter(Boolean);
-  }),
+  }
 
-  isActivityMetricsVisible: computed(
-    "activityMetrics",
-    "hiddenReports",
-    function () {
-      return (
-        this.activityMetrics.length &&
-        this.activityMetrics.some((x) => !this.hiddenReports.includes(x))
-      );
-    }
-  ),
+  @computed("activityMetrics", "hiddenReports")
+  get isActivityMetricsVisible() {
+    return (
+      this.activityMetrics.length &&
+      this.activityMetrics.some((x) => !this.hiddenReports.includes(x))
+    );
+  }
 
-  isSearchReportsVisible: computed("hiddenReports", function () {
+  @computed("hiddenReports")
+  get isSearchReportsVisible() {
     return ["top_referred_topics", "trending_search"].some(
       (x) => !this.hiddenReports.includes(x)
     );
-  }),
+  }
 
-  isCommunityHealthVisible: computed("hiddenReports", function () {
+  @computed("hiddenReports")
+  get isCommunityHealthVisible() {
     return [
       "consolidated_page_views",
       "signups",
@@ -59,7 +70,7 @@ export default Controller.extend(PeriodComputationMixin, {
       "daily_engaged_users",
       "new_contributors",
     ].some((x) => !this.hiddenReports.includes(x));
-  }),
+  }
 
   @discourseComputed
   activityMetricsFilters() {
@@ -67,14 +78,14 @@ export default Controller.extend(PeriodComputationMixin, {
       startDate: this.lastMonth,
       endDate: this.today,
     };
-  },
+  }
 
   @discourseComputed
   topReferredTopicsOptions() {
     return {
       table: { total: false, limit: 8 },
     };
-  },
+  }
 
   @discourseComputed
   topReferredTopicsFilters() {
@@ -82,7 +93,7 @@ export default Controller.extend(PeriodComputationMixin, {
       startDate: moment().subtract(6, "days").startOf("day"),
       endDate: this.today,
     };
-  },
+  }
 
   @discourseComputed
   trendingSearchFilters() {
@@ -90,25 +101,21 @@ export default Controller.extend(PeriodComputationMixin, {
       startDate: moment().subtract(1, "month").startOf("day"),
       endDate: this.today,
     };
-  },
+  }
 
   @discourseComputed
   trendingSearchOptions() {
     return {
       table: { total: false, limit: 8 },
     };
-  },
+  }
 
   @discourseComputed
   trendingSearchDisabledLabel() {
     return I18n.t("admin.dashboard.reports.trending_search.disabled", {
       basePath: getURL(""),
     });
-  },
-
-  usersByTypeReport: staticReport("users_by_type"),
-  usersByTrustLevelReport: staticReport("users_by_trust_level"),
-  storageReport: staticReport("storage_report"),
+  }
 
   fetchDashboard() {
     if (this.isLoading) {
@@ -133,18 +140,18 @@ export default Controller.extend(PeriodComputationMixin, {
         })
         .catch((e) => {
           this.exceptionController.set("thrown", e.jqXHR);
-          this.replaceRoute("exception");
+          this.router.replaceWith("exception");
         })
         .finally(() => this.set("isLoading", false));
     }
-  },
+  }
 
   @discourseComputed("startDate", "endDate")
   filters(startDate, endDate) {
     return { startDate, endDate };
-  },
+  }
 
   _reportsForPeriodURL(period) {
     return getURL(`/admin?period=${period}`);
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-dashboard-moderation.js b/app/assets/javascripts/admin/addon/controllers/admin-dashboard-moderation.js
index 16e632d6e22..ef08301f811 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-dashboard-moderation.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-dashboard-moderation.js
@@ -1,10 +1,12 @@
+import { computed } from "@ember/object";
 import Controller from "@ember/controller";
 import PeriodComputationMixin from "admin/mixins/period-computation";
-import { computed } from "@ember/object";
 import discourseComputed from "discourse-common/utils/decorators";
 import getURL from "discourse-common/lib/get-url";
 
-export default Controller.extend(PeriodComputationMixin, {
+export default class AdminDashboardModerationController extends Controller.extend(
+  PeriodComputationMixin
+) {
   @discourseComputed
   flagsStatusOptions() {
     return {
@@ -13,17 +15,15 @@ export default Controller.extend(PeriodComputationMixin, {
         perPage: 10,
       },
     };
-  },
+  }
 
-  isModeratorsActivityVisible: computed(
-    "siteSettings.dashboard_hidden_reports",
-    function () {
-      return !(this.siteSettings.dashboard_hidden_reports || "")
-        .split("|")
-        .filter(Boolean)
-        .includes("moderators_activity");
-    }
-  ),
+  @computed("siteSettings.dashboard_hidden_reports")
+  get isModeratorsActivityVisible() {
+    return !(this.siteSettings.dashboard_hidden_reports || "")
+      .split("|")
+      .filter(Boolean)
+      .includes("moderators_activity");
+  }
 
   @discourseComputed
   userFlaggingRatioOptions() {
@@ -33,19 +33,19 @@ export default Controller.extend(PeriodComputationMixin, {
         perPage: 10,
       },
     };
-  },
+  }
 
   @discourseComputed("startDate", "endDate")
   filters(startDate, endDate) {
     return { startDate, endDate };
-  },
+  }
 
   @discourseComputed("lastWeek", "endDate")
   lastWeekfilters(startDate, endDate) {
     return { startDate, endDate };
-  },
+  }
 
   _reportsForPeriodURL(period) {
     return getURL(`/admin/dashboard/moderation?period=${period}`);
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-dashboard-reports.js b/app/assets/javascripts/admin/addon/controllers/admin-dashboard-reports.js
index b4b8c16617c..920f9459eca 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-dashboard-reports.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-dashboard-reports.js
@@ -2,10 +2,10 @@ import Controller from "@ember/controller";
 import { INPUT_DELAY } from "discourse-common/config/environment";
 import discourseComputed from "discourse-common/utils/decorators";
 import discourseDebounce from "discourse-common/lib/debounce";
-import { get } from "@ember/object";
+import { action, get } from "@ember/object";
 
-export default Controller.extend({
-  filter: null,
+export default class AdminDashboardReportsController extends Controller {
+  filter = null;
 
   @discourseComputed(
     "model.[]",
@@ -29,15 +29,14 @@ export default Controller.extend({
     reports = reports.filter((report) => !hiddenReports.includes(report.type));
 
     return reports;
-  },
+  }
 
-  actions: {
-    filterReports(filter) {
-      discourseDebounce(this, this._performFiltering, filter, INPUT_DELAY);
-    },
-  },
+  @action
+  filterReports(filter) {
+    discourseDebounce(this, this._performFiltering, filter, INPUT_DELAY);
+  }
 
   _performFiltering(filter) {
     this.set("filter", filter);
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-dashboard.js b/app/assets/javascripts/admin/addon/controllers/admin-dashboard.js
index 004df68daa7..abe340f2eea 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-dashboard.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-dashboard.js
@@ -1,17 +1,22 @@
+import { action, computed } from "@ember/object";
 import Controller, { inject as controller } from "@ember/controller";
 import AdminDashboard from "admin/models/admin-dashboard";
 import VersionCheck from "admin/models/version-check";
-import { computed } from "@ember/object";
 import discourseComputed from "discourse-common/utils/decorators";
 import { setting } from "discourse/lib/computed";
+import { inject as service } from "@ember/service";
 
 const PROBLEMS_CHECK_MINUTES = 1;
 
-export default Controller.extend({
-  isLoading: false,
-  dashboardFetchedAt: null,
-  exceptionController: controller("exception"),
-  showVersionChecks: setting("version_checks"),
+export default class AdminDashboardController extends Controller {
+  @service router;
+  @service siteSettings;
+  @controller("exception") exceptionController;
+
+  isLoading = false;
+  dashboardFetchedAt = null;
+
+  @setting("version_checks") showVersionChecks;
 
   @discourseComputed(
     "lowPriorityProblems.length",
@@ -21,25 +26,29 @@ export default Controller.extend({
     const problemsLength =
       lowPriorityProblemsLength + highPriorityProblemsLength;
     return this.currentUser.admin && problemsLength > 0;
-  },
+  }
 
-  visibleTabs: computed("siteSettings.dashboard_visible_tabs", function () {
+  @computed("siteSettings.dashboard_visible_tabs")
+  get visibleTabs() {
     return (this.siteSettings.dashboard_visible_tabs || "")
       .split("|")
       .filter(Boolean);
-  }),
+  }
 
-  isModerationTabVisible: computed("visibleTabs", function () {
+  @computed("visibleTabs")
+  get isModerationTabVisible() {
     return this.visibleTabs.includes("moderation");
-  }),
+  }
 
-  isSecurityTabVisible: computed("visibleTabs", function () {
+  @computed("visibleTabs")
+  get isSecurityTabVisible() {
     return this.visibleTabs.includes("security");
-  }),
+  }
 
-  isReportsTabVisible: computed("visibleTabs", function () {
+  @computed("visibleTabs")
+  get isReportsTabVisible() {
     return this.visibleTabs.includes("reports");
-  }),
+  }
 
   fetchProblems() {
     if (this.isLoadingProblems) {
@@ -53,7 +62,7 @@ export default Controller.extend({
     ) {
       this._loadProblems();
     }
-  },
+  }
 
   fetchDashboard() {
     const versionChecks = this.siteSettings.version_checks;
@@ -82,13 +91,13 @@ export default Controller.extend({
         })
         .catch((e) => {
           this.exceptionController.set("thrown", e.jqXHR);
-          this.replaceRoute("exception");
+          this.router.replaceWith("exception");
         })
         .finally(() => {
           this.set("isLoading", false);
         });
     }
-  },
+  }
 
   _loadProblems() {
     this.setProperties({
@@ -108,16 +117,15 @@ export default Controller.extend({
         );
       })
       .finally(() => this.set("loadingProblems", false));
-  },
+  }
 
   @discourseComputed("problemsFetchedAt")
   problemsTimestamp(problemsFetchedAt) {
     return moment(problemsFetchedAt).locale("en").format("LLL");
-  },
+  }
 
-  actions: {
-    refreshProblems() {
-      this._loadProblems();
-    },
-  },
-});
+  @action
+  refreshProblems() {
+    this._loadProblems();
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-advanced-test.js b/app/assets/javascripts/admin/addon/controllers/admin-email-advanced-test.js
index 860f276f8ae..1b27a572b6f 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-email-advanced-test.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-email-advanced-test.js
@@ -1,31 +1,31 @@
+import { action } from "@ember/object";
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Controller.extend({
-  email: null,
-  text: null,
-  elided: null,
-  format: null,
-  loading: null,
+export default class AdminEmailAdvancedTestController extends Controller {
+  email = null;
+  text = null;
+  elided = null;
+  format = null;
+  loading = null;
 
-  actions: {
-    run() {
-      this.set("loading", true);
+  @action
+  run() {
+    this.set("loading", true);
 
-      ajax("/admin/email/advanced-test", {
-        type: "POST",
-        data: { email: this.email },
+    ajax("/admin/email/advanced-test", {
+      type: "POST",
+      data: { email: this.email },
+    })
+      .then((data) => {
+        this.setProperties({
+          text: data.text,
+          elided: data.elided,
+          format: data.format,
+        });
       })
-        .then((data) => {
-          this.setProperties({
-            text: data.text,
-            elided: data.elided,
-            format: data.format,
-          });
-        })
-        .catch(popupAjaxError)
-        .finally(() => this.set("loading", false));
-    },
-  },
-});
+      .catch(popupAjaxError)
+      .finally(() => this.set("loading", false));
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-bounced.js b/app/assets/javascripts/admin/addon/controllers/admin-email-bounced.js
index c7a8ec98a60..79384e70f18 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-email-bounced.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-email-bounced.js
@@ -1,18 +1,18 @@
 import AdminEmailLogsController from "admin/controllers/admin-email-logs";
 import { INPUT_DELAY } from "discourse-common/config/environment";
 import discourseDebounce from "discourse-common/lib/debounce";
-import { observes } from "discourse-common/utils/decorators";
+import { observes } from "@ember-decorators/object";
 import { action } from "@ember/object";
 
-export default AdminEmailLogsController.extend({
+export default class AdminEmailBouncedController extends AdminEmailLogsController {
   @action
   handleShowIncomingEmail(id, event) {
     event?.preventDefault();
     this.send("showIncomingEmail", id);
-  },
+  }
 
   @observes("filter.{status,user,address,type}")
   filterEmailLogs() {
     discourseDebounce(this, this.loadLogs, INPUT_DELAY);
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-index.js b/app/assets/javascripts/admin/addon/controllers/admin-email-index.js
index dddec41d1cb..81bda7c5b16 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-email-index.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-email-index.js
@@ -1,21 +1,22 @@
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+import { empty } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
-import { empty } from "@ember/object/computed";
-import { observes } from "discourse-common/utils/decorators";
-import { inject as service } from "@ember/service";
+import { observes } from "@ember-decorators/object";
 import { htmlSafe } from "@ember/template";
 import { escapeExpression } from "discourse/lib/utilities";
 
-export default Controller.extend({
-  dialog: service(),
+export default class AdminEmailIndexController extends Controller {
+  @service dialog;
 
   /**
     Is the "send test email" button disabled?
 
     @property sendTestEmailDisabled
   **/
-  sendTestEmailDisabled: empty("testEmailAddress"),
+  @empty("testEmailAddress") sendTestEmailDisabled;
 
   /**
     Clears the 'sentTestEmail' property on successful send.
@@ -25,43 +26,40 @@ export default Controller.extend({
   @observes("testEmailAddress")
   testEmailAddressChanged() {
     this.set("sentTestEmail", false);
-  },
+  }
 
-  actions: {
-    /**
-      Sends a test email to the currently entered email address
+  /**
+    Sends a test email to the currently entered email address
 
-      @method sendTestEmail
-    **/
-    sendTestEmail() {
-      this.setProperties({
-        sendingEmail: true,
-        sentTestEmail: false,
-      });
+    @method sendTestEmail
+  **/
+  @action
+  sendTestEmail() {
+    this.setProperties({
+      sendingEmail: true,
+      sentTestEmail: false,
+    });
 
-      ajax("/admin/email/test", {
-        type: "POST",
-        data: { email_address: this.testEmailAddress },
+    ajax("/admin/email/test", {
+      type: "POST",
+      data: { email_address: this.testEmailAddress },
+    })
+      .then((response) =>
+        this.set("sentTestEmailMessage", response.sent_test_email_message)
+      )
+      .catch((e) => {
+        if (e.jqXHR.responseJSON?.errors) {
+          this.dialog.alert({
+            message: htmlSafe(
+              I18n.t("admin.email.error", {
+                server_error: escapeExpression(e.jqXHR.responseJSON.errors[0]),
+              })
+            ),
+          });
+        } else {
+          this.dialog.alert({ message: I18n.t("admin.email.test_error") });
+        }
       })
-        .then((response) =>
-          this.set("sentTestEmailMessage", response.sent_test_email_message)
-        )
-        .catch((e) => {
-          if (e.jqXHR.responseJSON?.errors) {
-            this.dialog.alert({
-              message: htmlSafe(
-                I18n.t("admin.email.error", {
-                  server_error: escapeExpression(
-                    e.jqXHR.responseJSON.errors[0]
-                  ),
-                })
-              ),
-            });
-          } else {
-            this.dialog.alert({ message: I18n.t("admin.email.test_error") });
-          }
-        })
-        .finally(() => this.set("sendingEmail", false));
-    },
-  },
-});
+      .finally(() => this.set("sendingEmail", false));
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-logs.js b/app/assets/javascripts/admin/addon/controllers/admin-email-logs.js
index 048ad491528..cb8e04736a7 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-email-logs.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-email-logs.js
@@ -1,14 +1,11 @@
 import Controller from "@ember/controller";
 import EmailLog from "admin/models/email-log";
-import EmberObject from "@ember/object";
+import EmberObject, { action } from "@ember/object";
 
-export default Controller.extend({
-  loading: false,
+export default class AdminEmailLogsController extends Controller {
+  loading = false;
+  filter = EmberObject.create();
 
-  init() {
-    this._super(...arguments);
-    this.set("filter", EmberObject.create());
-  },
   loadLogs(sourceModel, loadMore) {
     if ((loadMore && this.loading) || this.get("model.allLoaded")) {
       return;
@@ -38,11 +35,10 @@ export default Controller.extend({
         }
       })
       .finally(() => this.set("loading", false));
-  },
+  }
 
-  actions: {
-    loadMore() {
-      this.loadLogs(EmailLog, true);
-    },
-  },
-});
+  @action
+  loadMore() {
+    this.loadLogs(EmailLog, true);
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-preview-digest.js b/app/assets/javascripts/admin/addon/controllers/admin-email-preview-digest.js
index 84f85eea6d3..4120390eedb 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-email-preview-digest.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-email-preview-digest.js
@@ -1,66 +1,67 @@
+import { inject as service } from "@ember/service";
 import { empty, notEmpty, or } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import EmailPreview from "admin/models/email-preview";
 import { action, get } from "@ember/object";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import { inject as service } from "@ember/service";
 
-export default Controller.extend({
-  dialog: service(),
-  username: null,
-  lastSeen: null,
-  emailEmpty: empty("email"),
-  sendEmailDisabled: or("emailEmpty", "sendingEmail"),
-  showSendEmailForm: notEmpty("model.html_content"),
-  htmlEmpty: empty("model.html_content"),
+export default class AdminEmailPreviewDigestController extends Controller {
+  @service dialog;
+
+  username = null;
+  lastSeen = null;
+
+  @empty("email") emailEmpty;
+  @or("emailEmpty", "sendingEmail") sendEmailDisabled;
+  @notEmpty("model.html_content") showSendEmailForm;
+  @empty("model.html_content") htmlEmpty;
 
   @action
   toggleShowHtml(event) {
     event?.preventDefault();
     this.toggleProperty("showHtml");
-  },
+  }
 
-  actions: {
-    updateUsername(selected) {
-      this.set("username", get(selected, "firstObject"));
-    },
+  @action
+  updateUsername(selected) {
+    this.set("username", get(selected, "firstObject"));
+  }
 
-    refresh() {
-      const model = this.model;
+  @action
+  refresh() {
+    const model = this.model;
 
-      this.set("loading", true);
-      this.set("sentEmail", false);
+    this.set("loading", true);
+    this.set("sentEmail", false);
 
-      let username = this.username;
-      if (!username) {
-        username = this.currentUser.get("username");
-        this.set("username", username);
-      }
+    let username = this.username;
+    if (!username) {
+      username = this.currentUser.get("username");
+      this.set("username", username);
+    }
 
-      EmailPreview.findDigest(username, this.lastSeen).then((email) => {
-        model.setProperties(
-          email.getProperties("html_content", "text_content")
-        );
-        this.set("loading", false);
+    EmailPreview.findDigest(username, this.lastSeen).then((email) => {
+      model.setProperties(email.getProperties("html_content", "text_content"));
+      this.set("loading", false);
+    });
+  }
+
+  @action
+  sendEmail() {
+    this.set("sendingEmail", true);
+    this.set("sentEmail", false);
+
+    EmailPreview.sendDigest(this.username, this.lastSeen, this.email)
+      .then((result) => {
+        if (result.errors) {
+          this.dialog.alert(result.errors);
+        } else {
+          this.set("sentEmail", true);
+        }
+      })
+      .catch(popupAjaxError)
+      .finally(() => {
+        this.set("sendingEmail", false);
       });
-    },
-
-    sendEmail() {
-      this.set("sendingEmail", true);
-      this.set("sentEmail", false);
-
-      EmailPreview.sendDigest(this.username, this.lastSeen, this.email)
-        .then((result) => {
-          if (result.errors) {
-            this.dialog.alert(result.errors);
-          } else {
-            this.set("sentEmail", true);
-          }
-        })
-        .catch(popupAjaxError)
-        .finally(() => {
-          this.set("sendingEmail", false);
-        });
-    },
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-received.js b/app/assets/javascripts/admin/addon/controllers/admin-email-received.js
index 0a2933fa23d..65434538eff 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-email-received.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-email-received.js
@@ -1,18 +1,18 @@
+import { action } from "@ember/object";
 import AdminEmailLogsController from "admin/controllers/admin-email-logs";
 import { INPUT_DELAY } from "discourse-common/config/environment";
 import IncomingEmail from "admin/models/incoming-email";
 import discourseDebounce from "discourse-common/lib/debounce";
-import { observes } from "discourse-common/utils/decorators";
+import { observes } from "@ember-decorators/object";
 
-export default AdminEmailLogsController.extend({
+export default class AdminEmailReceivedController extends AdminEmailLogsController {
   @observes("filter.{status,from,to,subject}")
   filterIncomingEmails() {
     discourseDebounce(this, this.loadLogs, IncomingEmail, INPUT_DELAY);
-  },
+  }
 
-  actions: {
-    loadMore() {
-      this.loadLogs(IncomingEmail, true);
-    },
-  },
-});
+  @action
+  loadMore() {
+    this.loadLogs(IncomingEmail, true);
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-rejected.js b/app/assets/javascripts/admin/addon/controllers/admin-email-rejected.js
index 6e4ce786568..184d632db66 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-email-rejected.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-email-rejected.js
@@ -2,24 +2,23 @@ import AdminEmailLogsController from "admin/controllers/admin-email-logs";
 import { INPUT_DELAY } from "discourse-common/config/environment";
 import IncomingEmail from "admin/models/incoming-email";
 import discourseDebounce from "discourse-common/lib/debounce";
-import { observes } from "discourse-common/utils/decorators";
+import { observes } from "@ember-decorators/object";
 import { action } from "@ember/object";
 
-export default AdminEmailLogsController.extend({
+export default class AdminEmailRejectedController extends AdminEmailLogsController {
   @observes("filter.{status,from,to,subject,error}")
   filterIncomingEmails() {
     discourseDebounce(this, this.loadLogs, IncomingEmail, INPUT_DELAY);
-  },
+  }
 
   @action
   handleShowIncomingEmail(id, event) {
     event?.preventDefault();
     this.send("showIncomingEmail", id);
-  },
+  }
 
-  actions: {
-    loadMore() {
-      this.loadLogs(IncomingEmail, true);
-    },
-  },
-});
+  @action
+  loadMore() {
+    this.loadLogs(IncomingEmail, true);
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-sent.js b/app/assets/javascripts/admin/addon/controllers/admin-email-sent.js
index 5cc83109f8f..6d28b33d798 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-email-sent.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-email-sent.js
@@ -1,11 +1,11 @@
 import AdminEmailLogsController from "admin/controllers/admin-email-logs";
 import { INPUT_DELAY } from "discourse-common/config/environment";
 import discourseDebounce from "discourse-common/lib/debounce";
-import { observes } from "discourse-common/utils/decorators";
+import { observes } from "@ember-decorators/object";
 
-export default AdminEmailLogsController.extend({
+export default class AdminEmailSentController extends AdminEmailLogsController {
   @observes("filter.{status,user,address,type,reply_key}")
   filterEmailLogs() {
     discourseDebounce(this, this.loadLogs, INPUT_DELAY);
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-skipped.js b/app/assets/javascripts/admin/addon/controllers/admin-email-skipped.js
index 15005495645..366f27b8d2e 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-email-skipped.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-email-skipped.js
@@ -1,11 +1,11 @@
 import AdminEmailLogsController from "admin/controllers/admin-email-logs";
 import { INPUT_DELAY } from "discourse-common/config/environment";
 import discourseDebounce from "discourse-common/lib/debounce";
-import { observes } from "discourse-common/utils/decorators";
+import { observes } from "@ember-decorators/object";
 
-export default AdminEmailLogsController.extend({
+export default class AdminEmailSkippedController extends AdminEmailLogsController {
   @observes("filter.{status,user,address,type}")
   filterEmailLogs() {
     discourseDebounce(this, this.loadLogs, INPUT_DELAY);
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-embedding.js b/app/assets/javascripts/admin/addon/controllers/admin-embedding.js
index 147d4dd35a6..9fcccf318fc 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-embedding.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-embedding.js
@@ -1,25 +1,30 @@
+import { action } from "@ember/object";
 import Controller from "@ember/controller";
 import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Controller.extend({
-  saved: false,
-  embedding: null,
+export default class AdminEmbeddingController extends Controller {
+  saved = false;
+  embedding = null;
 
   // show settings if we have at least one created host
   @discourseComputed("embedding.embeddable_hosts.@each.isCreated")
   showSecondary() {
     const hosts = this.get("embedding.embeddable_hosts");
     return hosts.length && hosts.findBy("isCreated");
-  },
+  }
 
   @discourseComputed("embedding.base_url")
   embeddingCode(baseUrl) {
     const html = `<div id='discourse-comments'></div>
+<meta name='discourse-username' content='DISCOURSE_USERNAME'>
 
 <script type="text/javascript">
-  DiscourseEmbed = { discourseUrl: '${baseUrl}/',
-                     discourseEmbedUrl: 'REPLACE_ME' };
+  DiscourseEmbed = {
+    discourseUrl: '${baseUrl}/',
+    discourseEmbedUrl: 'EMBED_URL',
+    // className: 'CLASS_NAME',
+  };
 
   (function() {
     var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
@@ -29,27 +34,28 @@ export default Controller.extend({
 </script>`;
 
     return html;
-  },
+  }
 
-  actions: {
-    saveChanges() {
-      const embedding = this.embedding;
-      const updates = embedding.getProperties(embedding.get("fields"));
+  @action
+  saveChanges() {
+    const embedding = this.embedding;
+    const updates = embedding.getProperties(embedding.get("fields"));
 
-      this.set("saved", false);
-      this.embedding
-        .update(updates)
-        .then(() => this.set("saved", true))
-        .catch(popupAjaxError);
-    },
+    this.set("saved", false);
+    this.embedding
+      .update(updates)
+      .then(() => this.set("saved", true))
+      .catch(popupAjaxError);
+  }
 
-    addHost() {
-      const host = this.store.createRecord("embeddable-host");
-      this.get("embedding.embeddable_hosts").pushObject(host);
-    },
+  @action
+  addHost() {
+    const host = this.store.createRecord("embeddable-host");
+    this.get("embedding.embeddable_hosts").pushObject(host);
+  }
 
-    deleteHost(host) {
-      this.get("embedding.embeddable_hosts").removeObject(host);
-    },
-  },
-});
+  @action
+  deleteHost(host) {
+    this.get("embedding.embeddable_hosts").removeObject(host);
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-emojis.js b/app/assets/javascripts/admin/addon/controllers/admin-emojis.js
index eab68cf088a..6e7f86d88aa 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-emojis.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-emojis.js
@@ -1,49 +1,46 @@
+import { inject as service } from "@ember/service";
+import { sort } from "@ember/object/computed";
 import EmberObject, { action, computed } from "@ember/object";
 import Controller from "@ember/controller";
 import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
-import { sort } from "@ember/object/computed";
-import { inject as service } from "@ember/service";
 
 const ALL_FILTER = "all";
 
-export default Controller.extend({
-  dialog: service(),
-  filter: null,
-  sorting: null,
+export default class AdminEmojisController extends Controller {
+  @service dialog;
 
+  filter = null;
+  sorting = null;
+
+  @sort("filteredEmojis.[]", "sorting") sortedEmojis;
   init() {
-    this._super(...arguments);
+    super.init(...arguments);
 
     this.setProperties({
       filter: ALL_FILTER,
       sorting: ["group", "name"],
     });
-  },
+  }
 
-  sortedEmojis: sort("filteredEmojis.[]", "sorting"),
+  @computed("model")
+  get emojiGroups() {
+    return this.model.mapBy("group").uniq();
+  }
 
-  emojiGroups: computed("model", {
-    get() {
-      return this.model.mapBy("group").uniq();
-    },
-  }),
+  @computed("emojiGroups.[]")
+  get sortingGroups() {
+    return [ALL_FILTER].concat(this.emojiGroups);
+  }
 
-  sortingGroups: computed("emojiGroups.[]", {
-    get() {
-      return [ALL_FILTER].concat(this.emojiGroups);
-    },
-  }),
-
-  filteredEmojis: computed("model.[]", "filter", {
-    get() {
-      if (!this.filter || this.filter === ALL_FILTER) {
-        return this.model;
-      } else {
-        return this.model.filterBy("group", this.filter);
-      }
-    },
-  }),
+  @computed("model.[]", "filter")
+  get filteredEmojis() {
+    if (!this.filter || this.filter === ALL_FILTER) {
+      return this.model;
+    } else {
+      return this.model.filterBy("group", this.filter);
+    }
+  }
 
   _highlightEmojiList() {
     const customEmojiListEl = document.querySelector("#custom_emoji");
@@ -56,12 +53,12 @@ export default Controller.extend({
         customEmojiListEl.classList.remove("highlighted");
       });
     }
-  },
+  }
 
   @action
   filterGroups(value) {
     this.set("filter", value);
-  },
+  }
 
   @action
   emojiUploaded(emoji, group) {
@@ -69,7 +66,7 @@ export default Controller.extend({
     emoji.group = group;
     this.model.pushObject(EmberObject.create(emoji));
     this._highlightEmojiList();
-  },
+  }
 
   @action
   destroyEmoji(emoji) {
@@ -85,5 +82,5 @@ export default Controller.extend({
         });
       },
     });
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-emails.js b/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-emails.js
index ed3cd6489d7..4ce490eff02 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-emails.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-emails.js
@@ -1,23 +1,24 @@
+import { action } from "@ember/object";
 import Controller from "@ember/controller";
 import ScreenedEmail from "admin/models/screened-email";
 import { exportEntity } from "discourse/lib/export-csv";
 import { outputExportResult } from "discourse/lib/export-result";
 
-export default Controller.extend({
-  loading: false,
+export default class AdminLogsScreenedEmailsController extends Controller {
+  loading = false;
 
-  actions: {
-    clearBlock(row) {
-      row.clearBlock().then(function () {
-        // feeling lazy
-        window.location.reload();
-      });
-    },
+  @action
+  clearBlock(row) {
+    row.clearBlock().then(function () {
+      // feeling lazy
+      window.location.reload();
+    });
+  }
 
-    exportScreenedEmailList() {
-      exportEntity("screened_email").then(outputExportResult);
-    },
-  },
+  @action
+  exportScreenedEmailList() {
+    exportEntity("screened_email").then(outputExportResult);
+  }
 
   show() {
     this.set("loading", true);
@@ -25,5 +26,5 @@ export default Controller.extend({
       this.set("model", result);
       this.set("loading", false);
     });
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-ip-addresses.js b/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-ip-addresses.js
index bc11ec51f46..99e0bcfc2bd 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-ip-addresses.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-ip-addresses.js
@@ -1,31 +1,32 @@
+import { inject as service } from "@ember/service";
 import Controller from "@ember/controller";
 import I18n from "I18n";
 import { INPUT_DELAY } from "discourse-common/config/environment";
 import ScreenedIpAddress from "admin/models/screened-ip-address";
 import discourseDebounce from "discourse-common/lib/debounce";
 import { exportEntity } from "discourse/lib/export-csv";
-import { observes } from "discourse-common/utils/decorators";
+import { observes } from "@ember-decorators/object";
 import { outputExportResult } from "discourse/lib/export-result";
 import { action } from "@ember/object";
-import { inject as service } from "@ember/service";
 
-export default Controller.extend({
-  dialog: service(),
-  loading: false,
-  filter: null,
-  savedIpAddress: null,
+export default class AdminLogsScreenedIpAddressesController extends Controller {
+  @service dialog;
+
+  loading = false;
+  filter = null;
+  savedIpAddress = null;
 
   _debouncedShow() {
     this.set("loading", true);
     ScreenedIpAddress.findAll(this.filter).then((result) => {
       this.setProperties({ model: result, loading: false });
     });
-  },
+  }
 
   @observes("filter")
   show() {
     discourseDebounce(this, this._debouncedShow, INPUT_DELAY);
-  },
+  }
 
   @action
   edit(record, event) {
@@ -34,81 +35,86 @@ export default Controller.extend({
       this.set("savedIpAddress", record.get("ip_address"));
     }
     record.set("editing", true);
-  },
+  }
 
-  actions: {
-    allow(record) {
-      record.set("action_name", "do_nothing");
-      record.save();
-    },
+  @action
+  allow(record) {
+    record.set("action_name", "do_nothing");
+    record.save();
+  }
 
-    block(record) {
-      record.set("action_name", "block");
-      record.save();
-    },
+  @action
+  block(record) {
+    record.set("action_name", "block");
+    record.save();
+  }
 
-    cancel(record) {
-      const savedIpAddress = this.savedIpAddress;
-      if (savedIpAddress && record.get("editing")) {
-        record.set("ip_address", savedIpAddress);
-      }
-      record.set("editing", false);
-    },
+  @action
+  cancel(record) {
+    const savedIpAddress = this.savedIpAddress;
+    if (savedIpAddress && record.get("editing")) {
+      record.set("ip_address", savedIpAddress);
+    }
+    record.set("editing", false);
+  }
 
-    save(record) {
-      const wasEditing = record.get("editing");
-      record.set("editing", false);
-      record
-        .save()
-        .then(() => this.set("savedIpAddress", null))
-        .catch((e) => {
-          if (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors) {
+  @action
+  save(record) {
+    const wasEditing = record.get("editing");
+    record.set("editing", false);
+    record
+      .save()
+      .then(() => this.set("savedIpAddress", null))
+      .catch((e) => {
+        if (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors) {
+          this.dialog.alert(
+            I18n.t("generic_error_with_reason", {
+              error: e.jqXHR.responseJSON.errors.join(". "),
+            })
+          );
+        } else {
+          this.dialog.alert(I18n.t("generic_error"));
+        }
+        if (wasEditing) {
+          record.set("editing", true);
+        }
+      });
+  }
+
+  @action
+  destroyRecord(record) {
+    return this.dialog.yesNoConfirm({
+      message: I18n.t("admin.logs.screened_ips.delete_confirm", {
+        ip_address: record.get("ip_address"),
+      }),
+      didConfirm: () => {
+        return record
+          .destroy()
+          .then((deleted) => {
+            if (deleted) {
+              this.model.removeObject(record);
+            } else {
+              this.dialog.alert(I18n.t("generic_error"));
+            }
+          })
+          .catch((e) => {
             this.dialog.alert(
               I18n.t("generic_error_with_reason", {
-                error: e.jqXHR.responseJSON.errors.join(". "),
+                error: `http: ${e.status} - ${e.body}`,
               })
             );
-          } else {
-            this.dialog.alert(I18n.t("generic_error"));
-          }
-          if (wasEditing) {
-            record.set("editing", true);
-          }
-        });
-    },
+          });
+      },
+    });
+  }
 
-    destroy(record) {
-      return this.dialog.yesNoConfirm({
-        message: I18n.t("admin.logs.screened_ips.delete_confirm", {
-          ip_address: record.get("ip_address"),
-        }),
-        didConfirm: () => {
-          return record
-            .destroy()
-            .then((deleted) => {
-              if (deleted) {
-                this.model.removeObject(record);
-              } else {
-                this.dialog.alert(I18n.t("generic_error"));
-              }
-            })
-            .catch((e) => {
-              this.dialog.alert(
-                I18n.t("generic_error_with_reason", {
-                  error: `http: ${e.status} - ${e.body}`,
-                })
-              );
-            });
-        },
-      });
-    },
+  @action
+  recordAdded(arg) {
+    this.model.unshiftObject(arg);
+  }
 
-    recordAdded(arg) {
-      this.model.unshiftObject(arg);
-    },
-
-    exportScreenedIpList() {
-      exportEntity("screened_ip").then(outputExportResult);
-    },
-  },
-});
+  @action
+  exportScreenedIpList() {
+    exportEntity("screened_ip").then(outputExportResult);
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-urls.js b/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-urls.js
index 86621f59689..dc1e174d6a5 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-urls.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-urls.js
@@ -1,10 +1,11 @@
+import { action } from "@ember/object";
 import Controller from "@ember/controller";
 import ScreenedUrl from "admin/models/screened-url";
 import { exportEntity } from "discourse/lib/export-csv";
 import { outputExportResult } from "discourse/lib/export-result";
 
-export default Controller.extend({
-  loading: false,
+export default class AdminLogsScreenedUrlsController extends Controller {
+  loading = false;
 
   show() {
     this.set("loading", true);
@@ -12,11 +13,10 @@ export default Controller.extend({
       this.set("model", result);
       this.set("loading", false);
     });
-  },
+  }
 
-  actions: {
-    exportScreenedUrlList() {
-      exportEntity("screened_url").then(outputExportResult);
-    },
-  },
-});
+  @action
+  exportScreenedUrlList() {
+    exportEntity("screened_url").then(outputExportResult);
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js b/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js
index 11e5324bd61..5b8727aa115 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js
@@ -7,22 +7,21 @@ import { outputExportResult } from "discourse/lib/export-result";
 import { scheduleOnce } from "@ember/runloop";
 import showModal from "discourse/lib/show-modal";
 
-export default Controller.extend({
-  queryParams: ["filters"],
-
-  model: null,
-  filters: null,
-  userHistoryActions: null,
+export default class AdminLogsStaffActionLogsController extends Controller {
+  queryParams = ["filters"];
+  model = null;
+  filters = null;
+  userHistoryActions = null;
 
   @discourseComputed("filters.action_name")
   actionFilter(name) {
     return name ? I18n.t("admin.logs.staff_actions.actions." + name) : null;
-  },
+  }
 
   @discourseComputed("filters")
   filtersExists(filters) {
     return filters && Object.keys(filters).length > 0;
-  },
+  }
 
   _refresh() {
     this.store.findAll("staff-action-log", this.filters).then((result) => {
@@ -44,11 +43,11 @@ export default Controller.extend({
         );
       }
     });
-  },
+  }
 
   scheduleRefresh() {
     scheduleOnce("afterRender", this, this._refresh);
-  },
+  }
 
   resetFilters() {
     this.setProperties({
@@ -56,7 +55,7 @@ export default Controller.extend({
       filters: EmberObject.create(),
     });
     this.scheduleRefresh();
-  },
+  }
 
   changeFilters(props) {
     this.set("model", EmberObject.create({ loadingMore: true }));
@@ -76,7 +75,7 @@ export default Controller.extend({
 
     this.send("onFiltersChange", this.filters);
     this.scheduleRefresh();
-  },
+  }
 
   @action
   filterActionIdChanged(filterActionId) {
@@ -87,7 +86,7 @@ export default Controller.extend({
           .action_id,
       });
     }
-  },
+  }
 
   @action
   clearFilter(key, event) {
@@ -102,14 +101,14 @@ export default Controller.extend({
     } else {
       this.changeFilters({ [key]: null });
     }
-  },
+  }
 
   @action
   clearAllFilters(event) {
     event?.preventDefault();
     this.set("filterActionId", null);
     this.resetFilters();
-  },
+  }
 
   @action
   filterByAction(logItem, event) {
@@ -119,35 +118,35 @@ export default Controller.extend({
       action_id: logItem.get("action"),
       custom_type: logItem.get("custom_type"),
     });
-  },
+  }
 
   @action
   filterByStaffUser(acting_user, event) {
     event?.preventDefault();
     this.changeFilters({ acting_user: acting_user.username });
-  },
+  }
 
   @action
   filterByTargetUser(target_user, event) {
     event?.preventDefault();
     this.changeFilters({ target_user: target_user.username });
-  },
+  }
 
   @action
   filterBySubject(subject, event) {
     event?.preventDefault();
     this.changeFilters({ subject });
-  },
+  }
 
   @action
   exportStaffActionLogs() {
     exportEntity("staff_action").then(outputExportResult);
-  },
+  }
 
   @action
   loadMore() {
     this.model.loadMore();
-  },
+  }
 
   @action
   showDetailsModal(model, event) {
@@ -157,7 +156,7 @@ export default Controller.extend({
       admin: true,
       modalClass: "log-details-modal",
     });
-  },
+  }
 
   @action
   showCustomDetailsModal(model, event) {
@@ -168,5 +167,5 @@ export default Controller.extend({
       modalClass: "history-modal",
     });
     modal.loadDiff();
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-permalinks.js b/app/assets/javascripts/admin/addon/controllers/admin-permalinks.js
index 37f51260685..dcd31f10207 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-permalinks.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-permalinks.js
@@ -1,59 +1,63 @@
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+import { or } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import I18n from "I18n";
 import { INPUT_DELAY } from "discourse-common/config/environment";
 import Permalink from "admin/models/permalink";
 import discourseDebounce from "discourse-common/lib/debounce";
-import { observes } from "discourse-common/utils/decorators";
+import { observes } from "@ember-decorators/object";
 import { clipboardCopy } from "discourse/lib/utilities";
-import { inject as service } from "@ember/service";
-import { or } from "@ember/object/computed";
 
-export default Controller.extend({
-  dialog: service(),
-  loading: false,
-  filter: null,
-  showSearch: or("model.length", "filter"),
+export default class AdminPermalinksController extends Controller {
+  @service dialog;
+
+  loading = false;
+  filter = null;
+
+  @or("model.length", "filter") showSearch;
 
   _debouncedShow() {
     Permalink.findAll(this.filter).then((result) => {
       this.set("model", result);
       this.set("loading", false);
     });
-  },
+  }
 
   @observes("filter")
   show() {
     discourseDebounce(this, this._debouncedShow, INPUT_DELAY);
-  },
+  }
 
-  actions: {
-    recordAdded(arg) {
-      this.model.unshiftObject(arg);
-    },
+  @action
+  recordAdded(arg) {
+    this.model.unshiftObject(arg);
+  }
 
-    copyUrl(pl) {
-      let linkElement = document.querySelector(`#admin-permalink-${pl.id}`);
-      clipboardCopy(linkElement.textContent);
-    },
+  @action
+  copyUrl(pl) {
+    let linkElement = document.querySelector(`#admin-permalink-${pl.id}`);
+    clipboardCopy(linkElement.textContent);
+  }
 
-    destroy(record) {
-      return this.dialog.yesNoConfirm({
-        message: I18n.t("admin.permalink.delete_confirm"),
-        didConfirm: () => {
-          return record.destroy().then(
-            (deleted) => {
-              if (deleted) {
-                this.model.removeObject(record);
-              } else {
-                this.dialog.alert(I18n.t("generic_error"));
-              }
-            },
-            function () {
+  @action
+  destroyRecord(record) {
+    return this.dialog.yesNoConfirm({
+      message: I18n.t("admin.permalink.delete_confirm"),
+      didConfirm: () => {
+        return record.destroy().then(
+          (deleted) => {
+            if (deleted) {
+              this.model.removeObject(record);
+            } else {
               this.dialog.alert(I18n.t("generic_error"));
             }
-          );
-        },
-      });
-    },
-  },
-});
+          },
+          function () {
+            this.dialog.alert(I18n.t("generic_error"));
+          }
+        );
+      },
+    });
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-plugins.js b/app/assets/javascripts/admin/addon/controllers/admin-plugins.js
index 34ffe45783d..0222b6ec17c 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-plugins.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-plugins.js
@@ -1,19 +1,18 @@
-import { action } from "@ember/object";
-import Controller from "@ember/controller";
 import { inject as service } from "@ember/service";
+import Controller from "@ember/controller";
 
-export default Controller.extend({
-  router: service(),
+export default class AdminPluginsController extends Controller {
+  @service router;
 
   get adminRoutes() {
     return this.allAdminRoutes.filter((r) => this.routeExists(r.full_location));
-  },
+  }
 
   get brokenAdminRoutes() {
     return this.allAdminRoutes.filter(
       (r) => !this.routeExists(r.full_location)
     );
-  },
+  }
 
   get allAdminRoutes() {
     return this.model
@@ -22,15 +21,7 @@ export default Controller.extend({
         return p.admin_route;
       })
       .filter(Boolean);
-  },
-
-  @action
-  toggleMenu() {
-    const adminDetail = document.querySelector(".admin-detail");
-    ["mobile-closed", "mobile-open"].forEach((state) => {
-      adminDetail.classList.toggle(state);
-    });
-  },
+  }
 
   routeExists(routeName) {
     try {
@@ -39,5 +30,5 @@ export default Controller.extend({
     } catch (e) {
       return false;
     }
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-reports-show.js b/app/assets/javascripts/admin/addon/controllers/admin-reports-show.js
index 5f19399edf3..11057b29e6a 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-reports-show.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-reports-show.js
@@ -1,12 +1,12 @@
 import Controller from "@ember/controller";
 import discourseComputed from "discourse-common/utils/decorators";
 
-export default Controller.extend({
-  queryParams: ["start_date", "end_date", "filters", "chart_grouping", "mode"],
-  start_date: null,
-  end_date: null,
-  filters: null,
-  chart_grouping: null,
+export default class AdminReportsShowController extends Controller {
+  queryParams = ["start_date", "end_date", "filters", "chart_grouping", "mode"];
+  start_date = null;
+  end_date = null;
+  filters = null;
+  chart_grouping = null;
 
   @discourseComputed("model.type")
   reportOptions(type) {
@@ -19,5 +19,5 @@ export default Controller.extend({
     options.chartGrouping = this.chart_grouping;
 
     return options;
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-search-logs-index.js b/app/assets/javascripts/admin/addon/controllers/admin-search-logs-index.js
index bf110796f25..57b4be3ca0c 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-search-logs-index.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-search-logs-index.js
@@ -2,24 +2,19 @@ import Controller from "@ember/controller";
 import I18n from "I18n";
 export const DEFAULT_PERIOD = "yearly";
 
-export default Controller.extend({
-  loading: false,
-  period: DEFAULT_PERIOD,
-  searchType: "all",
-
-  init() {
-    this._super(...arguments);
-
-    this.searchTypeOptions = [
-      {
-        id: "all",
-        name: I18n.t("admin.logs.search_logs.types.all_search_types"),
-      },
-      { id: "header", name: I18n.t("admin.logs.search_logs.types.header") },
-      {
-        id: "full_page",
-        name: I18n.t("admin.logs.search_logs.types.full_page"),
-      },
-    ];
-  },
-});
+export default class AdminSearchLogsIndexController extends Controller {
+  loading = false;
+  period = DEFAULT_PERIOD;
+  searchType = "all";
+  searchTypeOptions = [
+    {
+      id: "all",
+      name: I18n.t("admin.logs.search_logs.types.all_search_types"),
+    },
+    { id: "header", name: I18n.t("admin.logs.search_logs.types.header") },
+    {
+      id: "full_page",
+      name: I18n.t("admin.logs.search_logs.types.full_page"),
+    },
+  ];
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-search-logs-term.js b/app/assets/javascripts/admin/addon/controllers/admin-search-logs-term.js
index 2d4f22211b6..f4732ebb599 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-search-logs-term.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-search-logs-term.js
@@ -2,29 +2,24 @@ import Controller from "@ember/controller";
 import { DEFAULT_PERIOD } from "admin/controllers/admin-search-logs-index";
 import I18n from "I18n";
 
-export default Controller.extend({
-  loading: false,
-  term: null,
-  period: DEFAULT_PERIOD,
-  searchType: "all",
-
-  init() {
-    this._super(...arguments);
-
-    this.searchTypeOptions = [
-      {
-        id: "all",
-        name: I18n.t("admin.logs.search_logs.types.all_search_types"),
-      },
-      { id: "header", name: I18n.t("admin.logs.search_logs.types.header") },
-      {
-        id: "full_page",
-        name: I18n.t("admin.logs.search_logs.types.full_page"),
-      },
-      {
-        id: "click_through_only",
-        name: I18n.t("admin.logs.search_logs.types.click_through_only"),
-      },
-    ];
-  },
-});
+export default class AdminSearchLogsTermController extends Controller {
+  loading = false;
+  term = null;
+  period = DEFAULT_PERIOD;
+  searchType = "all";
+  searchTypeOptions = [
+    {
+      id: "all",
+      name: I18n.t("admin.logs.search_logs.types.all_search_types"),
+    },
+    { id: "header", name: I18n.t("admin.logs.search_logs.types.header") },
+    {
+      id: "full_page",
+      name: I18n.t("admin.logs.search_logs.types.full_page"),
+    },
+    {
+      id: "click_through_only",
+      name: I18n.t("admin.logs.search_logs.types.click_through_only"),
+    },
+  ];
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-site-settings-category.js b/app/assets/javascripts/admin/addon/controllers/admin-site-settings-category.js
index 2727c56010e..50202e00f32 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-site-settings-category.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-site-settings-category.js
@@ -1,17 +1,18 @@
 import Controller, { inject as controller } from "@ember/controller";
 import discourseComputed from "discourse-common/utils/decorators";
 
-export default Controller.extend({
-  adminSiteSettings: controller(),
-  categoryNameKey: null,
+export default class AdminSiteSettingsCategoryController extends Controller {
+  @controller adminSiteSettings;
+
+  categoryNameKey = null;
 
   @discourseComputed("adminSiteSettings.visibleSiteSettings", "categoryNameKey")
   category(categories, nameKey) {
     return (categories || []).findBy("nameKey", nameKey);
-  },
+  }
 
   @discourseComputed("category")
   filteredContent(category) {
     return category ? category.siteSettings : [];
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-site-settings.js b/app/assets/javascripts/admin/addon/controllers/admin-site-settings.js
index 4ee3b0fab92..b6a1dedfaa6 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-site-settings.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-site-settings.js
@@ -1,26 +1,32 @@
+import { alias } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import I18n from "I18n";
 import { INPUT_DELAY } from "discourse-common/config/environment";
-import { alias } from "@ember/object/computed";
 import { isEmpty } from "@ember/utils";
-import { debounce, observes } from "discourse-common/utils/decorators";
+import { debounce } from "discourse-common/utils/decorators";
+import { observes } from "@ember-decorators/object";
 import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
 
-export default Controller.extend({
-  filter: null,
-  allSiteSettings: alias("model"),
-  visibleSiteSettings: null,
-  onlyOverridden: false,
+export default class AdminSiteSettingsController extends Controller {
+  @service router;
 
-  filterContentNow(category) {
-    // If we have no content, don't bother filtering anything
-    if (!!isEmpty(this.allSiteSettings)) {
-      return;
-    }
+  filter = "";
 
-    let filter, pluginFilter;
-    if (this.filter) {
-      filter = this.filter
+  @alias("model") allSiteSettings;
+
+  visibleSiteSettings = null;
+  onlyOverridden = false;
+
+  get maxResults() {
+    return 100;
+  }
+
+  performSearch(filter, allSiteSettings, onlyOverridden) {
+    let pluginFilter;
+
+    if (filter) {
+      filter = filter
         .toLowerCase()
         .split(" ")
         .filter((word) => {
@@ -39,29 +45,27 @@ export default Controller.extend({
         .trim();
     }
 
-    if (
-      (!filter || 0 === filter.length) &&
-      (!pluginFilter || 0 === pluginFilter.length) &&
-      !this.onlyOverridden
-    ) {
-      this.set("visibleSiteSettings", this.allSiteSettings);
-      if (this.categoryNameKey === "all_results") {
-        this.transitionToRoute("adminSiteSettings");
-      }
-      return;
-    }
-
     const all = {
       nameKey: "all_results",
       name: I18n.t("admin.site_settings.categories.all_results"),
       siteSettings: [],
     };
-    const matchesGroupedByCategory = [all];
 
+    const matchesGroupedByCategory = [all];
     const matches = [];
-    this.allSiteSettings.forEach((settingsCategory) => {
+
+    const strippedQuery = filter.replace(/[^a-z0-9]/gi, "");
+    let fuzzyRegex;
+
+    if (strippedQuery.length > 2) {
+      fuzzyRegex = new RegExp(strippedQuery.split("").join(".*"), "i");
+    }
+
+    allSiteSettings.forEach((settingsCategory) => {
+      let fuzzyMatches = [];
+
       const siteSettings = settingsCategory.siteSettings.filter((item) => {
-        if (this.onlyOverridden && !item.get("overridden")) {
+        if (onlyOverridden && !item.get("overridden")) {
           return false;
         }
         if (pluginFilter && item.plugin !== pluginFilter) {
@@ -69,16 +73,24 @@ export default Controller.extend({
         }
         if (filter) {
           const setting = item.get("setting").toLowerCase();
-          return (
+          let filterResult =
             setting.includes(filter) ||
             setting.replace(/_/g, " ").includes(filter) ||
             item.get("description").toLowerCase().includes(filter) ||
-            (item.get("value") || "").toLowerCase().includes(filter)
-          );
+            (item.get("value") || "").toString().toLowerCase().includes(filter);
+          if (!filterResult && fuzzyRegex && fuzzyRegex.test(setting)) {
+            fuzzyMatches.push(item);
+          }
+          return filterResult;
         } else {
           return true;
         }
       });
+
+      if (fuzzyMatches.length > 0) {
+        siteSettings.pushObjects(fuzzyMatches);
+      }
+
       if (siteSettings.length > 0) {
         matches.pushObjects(siteSettings);
         matchesGroupedByCategory.pushObject({
@@ -92,39 +104,69 @@ export default Controller.extend({
       }
     });
 
-    all.siteSettings.pushObjects(matches.slice(0, 30));
-    all.hasMore = matches.length > 30;
-    all.count = all.hasMore ? "30+" : matches.length;
+    all.siteSettings.pushObjects(matches.slice(0, this.maxResults));
+    all.hasMore = matches.length > this.maxResults;
+    all.count = all.hasMore ? `${this.maxResults}+` : matches.length;
+    all.maxResults = this.maxResults;
+
+    return matchesGroupedByCategory;
+  }
+
+  filterContentNow(category) {
+    if (isEmpty(this.allSiteSettings)) {
+      return;
+    }
+
+    if (isEmpty(this.filter) && !this.onlyOverridden) {
+      this.set("visibleSiteSettings", this.allSiteSettings);
+      if (this.categoryNameKey === "all_results") {
+        this.router.transitionTo("adminSiteSettings");
+      }
+      return;
+    }
+
+    const matchesGroupedByCategory = this.performSearch(
+      this.filter,
+      this.allSiteSettings,
+      this.onlyOverridden
+    );
 
     const categoryMatches = matchesGroupedByCategory.findBy(
       "nameKey",
       category
     );
+
     if (!categoryMatches || categoryMatches.count === 0) {
       category = "all_results";
     }
 
     this.set("visibleSiteSettings", matchesGroupedByCategory);
-    this.transitionToRoute(
+    this.router.transitionTo(
       "adminSiteSettingsCategory",
       category || "all_results"
     );
-  },
+  }
 
   @observes("filter", "onlyOverridden", "model")
+  optsChanged() {
+    this.filterContent();
+  }
+
   @debounce(INPUT_DELAY)
   filterContent() {
     if (this._skipBounce) {
       this.set("_skipBounce", false);
     } else {
-      this.filterContentNow(this.categoryNameKey);
+      if (!this.isDestroyed) {
+        this.filterContentNow(this.categoryNameKey);
+      }
     }
-  },
+  }
 
   @action
   clearFilter() {
     this.setProperties({ filter: "", onlyOverridden: false });
-  },
+  }
 
   @action
   toggleMenu() {
@@ -132,5 +174,5 @@ export default Controller.extend({
     ["mobile-closed", "mobile-open"].forEach((state) => {
       adminDetail.classList.toggle(state);
     });
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-site-text-edit.js b/app/assets/javascripts/admin/addon/controllers/admin-site-text-edit.js
index 8bcfc9b9da5..45b0e797cba 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-site-text-edit.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-site-text-edit.js
@@ -16,6 +16,11 @@ export default Controller.extend(bufferedProperty("siteText"), {
     return this.siteText.value === value;
   },
 
+  @discourseComputed("siteText.status")
+  isOutdated(status) {
+    return status === "outdated";
+  },
+
   @action
   saveChanges() {
     const attrs = this.buffered.getProperties("value");
@@ -48,4 +53,18 @@ export default Controller.extend(bufferedProperty("siteText"), {
       },
     });
   },
+
+  @action
+  dismissOutdated() {
+    this.siteText
+      .dismissOutdated(this.locale)
+      .then(() => {
+        this.siteText.set("status", "up_to_date");
+      })
+      .catch(popupAjaxError);
+  },
+
+  get interpolationKeys() {
+    return this.siteText.interpolation_keys.join(", ");
+  },
 });
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-site-text-index.js b/app/assets/javascripts/admin/addon/controllers/admin-site-text-index.js
index 1ec7abbbea6..041c2d835bc 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-site-text-index.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-site-text-index.js
@@ -1,37 +1,45 @@
+import { action } from "@ember/object";
 import Controller from "@ember/controller";
 import discourseComputed from "discourse-common/utils/decorators";
 import discourseDebounce from "discourse-common/lib/debounce";
+import { inject as service } from "@ember/service";
 let lastSearch;
 
-export default Controller.extend({
-  searching: false,
-  siteTexts: null,
-  preferred: false,
-  queryParams: ["q", "overridden", "locale"],
-  locale: null,
+export default class AdminSiteTextIndexController extends Controller {
+  @service router;
+  @service siteSettings;
 
-  q: null,
-  overridden: false,
+  searching = false;
+  siteTexts = null;
+  preferred = false;
+  queryParams = ["q", "overridden", "outdated", "locale"];
+  locale = null;
+  q = null;
+  overridden = false;
+  outdated = false;
 
   init() {
-    this._super(...arguments);
+    super.init(...arguments);
 
     this.set("locale", this.siteSettings.default_locale);
-  },
+  }
 
   _performSearch() {
     this.store
-      .find("site-text", this.getProperties("q", "overridden", "locale"))
+      .find(
+        "site-text",
+        this.getProperties("q", "overridden", "outdated", "locale")
+      )
       .then((results) => {
         this.set("siteTexts", results);
       })
       .finally(() => this.set("searching", false));
-  },
+  }
 
   @discourseComputed()
   availableLocales() {
     return JSON.parse(this.siteSettings.available_locales);
-  },
+  }
 
   @discourseComputed("locale")
   fallbackLocaleFullName() {
@@ -40,39 +48,48 @@ export default Controller.extend({
         return l.value === this.siteTexts.extras.fallback_locale;
       }).name;
     }
-  },
+  }
 
-  actions: {
-    edit(siteText) {
-      this.transitionToRoute("adminSiteText.edit", siteText.get("id"), {
-        queryParams: {
-          locale: this.locale,
-        },
-      });
-    },
+  @action
+  edit(siteText) {
+    this.router.transitionTo("adminSiteText.edit", siteText.get("id"), {
+      queryParams: {
+        locale: this.locale,
+      },
+    });
+  }
 
-    toggleOverridden() {
-      this.toggleProperty("overridden");
+  @action
+  toggleOverridden() {
+    this.toggleProperty("overridden");
+    this.set("searching", true);
+    discourseDebounce(this, this._performSearch, 400);
+  }
+
+  @action
+  toggleOutdated() {
+    this.toggleProperty("outdated");
+    this.set("searching", true);
+    discourseDebounce(this, this._performSearch, 400);
+  }
+
+  @action
+  search() {
+    const q = this.q;
+    if (q !== lastSearch) {
       this.set("searching", true);
       discourseDebounce(this, this._performSearch, 400);
-    },
+      lastSearch = q;
+    }
+  }
 
-    search() {
-      const q = this.q;
-      if (q !== lastSearch) {
-        this.set("searching", true);
-        discourseDebounce(this, this._performSearch, 400);
-        lastSearch = q;
-      }
-    },
+  @action
+  updateLocale(value) {
+    this.setProperties({
+      searching: true,
+      locale: value,
+    });
 
-    updateLocale(value) {
-      this.setProperties({
-        searching: true,
-        locale: value,
-      });
-
-      discourseDebounce(this, this._performSearch, 400);
-    },
-  },
-});
+    discourseDebounce(this, this._performSearch, 400);
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-user-badges.js b/app/assets/javascripts/admin/addon/controllers/admin-user-badges.js
index b36a22af0ce..94058717159 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-user-badges.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-user-badges.js
@@ -1,25 +1,25 @@
-import Controller, { inject as controller } from "@ember/controller";
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
 import { alias, sort } from "@ember/object/computed";
+import Controller, { inject as controller } from "@ember/controller";
 import GrantBadgeController from "discourse/mixins/grant-badge-controller";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { next } from "@ember/runloop";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import { inject as service } from "@ember/service";
 
-export default Controller.extend(GrantBadgeController, {
-  adminUser: controller(),
-  dialog: service(),
-  user: alias("adminUser.model"),
-  userBadges: alias("model"),
-  allBadges: alias("badges"),
-  sortedBadges: sort("model", "badgeSortOrder"),
+export default class AdminUserBadgesController extends Controller.extend(
+  GrantBadgeController
+) {
+  @service dialog;
+  @controller adminUser;
 
-  init() {
-    this._super(...arguments);
+  @alias("adminUser.model") user;
+  @alias("model") userBadges;
+  @alias("badges") allBadges;
+  @sort("model", "badgeSortOrder") sortedBadges;
 
-    this.badgeSortOrder = ["granted_at:desc"];
-  },
+  badgeSortOrder = ["granted_at:desc"];
 
   @discourseComputed("model", "model.[]", "model.expandedBadges.[]")
   groupedBadges() {
@@ -59,46 +59,47 @@ export default Controller.extend(GrantBadgeController, {
     });
 
     return expanded.sortBy("granted_at").reverse();
-  },
+  }
 
-  actions: {
-    expandGroup(userBadge) {
-      const model = this.model;
-      model.set("expandedBadges", model.get("expandedBadges") || []);
-      model.get("expandedBadges").pushObject(userBadge.badge.id);
-    },
+  @action
+  expandGroup(userBadge) {
+    const model = this.model;
+    model.set("expandedBadges", model.get("expandedBadges") || []);
+    model.get("expandedBadges").pushObject(userBadge.badge.id);
+  }
 
-    grantBadge() {
-      this.grantBadge(
-        this.selectedBadgeId,
-        this.get("user.username"),
-        this.badgeReason
-      ).then(
-        () => {
-          this.set("badgeReason", "");
-          next(() => {
-            // Update the selected badge ID after the combobox has re-rendered.
-            const newSelectedBadge = this.grantableBadges[0];
-            if (newSelectedBadge) {
-              this.set("selectedBadgeId", newSelectedBadge.get("id"));
-            }
-          });
-        },
-        function (error) {
-          popupAjaxError(error);
-        }
-      );
-    },
+  @action
+  performGrantBadge() {
+    this.grantBadge(
+      this.selectedBadgeId,
+      this.get("user.username"),
+      this.badgeReason
+    ).then(
+      () => {
+        this.set("badgeReason", "");
+        next(() => {
+          // Update the selected badge ID after the combobox has re-rendered.
+          const newSelectedBadge = this.grantableBadges[0];
+          if (newSelectedBadge) {
+            this.set("selectedBadgeId", newSelectedBadge.get("id"));
+          }
+        });
+      },
+      function (error) {
+        popupAjaxError(error);
+      }
+    );
+  }
 
-    revokeBadge(userBadge) {
-      return this.dialog.yesNoConfirm({
-        message: I18n.t("admin.badges.revoke_confirm"),
-        didConfirm: () => {
-          return userBadge.revoke().then(() => {
-            this.model.removeObject(userBadge);
-          });
-        },
-      });
-    },
-  },
-});
+  @action
+  revokeBadge(userBadge) {
+    return this.dialog.yesNoConfirm({
+      message: I18n.t("admin.badges.revoke_confirm"),
+      didConfirm: () => {
+        return userBadge.revoke().then(() => {
+          this.model.removeObject(userBadge);
+        });
+      },
+    });
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-user-fields.js b/app/assets/javascripts/admin/addon/controllers/admin-user-fields.js
index 619c1cf6293..255b6c12817 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-user-fields.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-user-fields.js
@@ -1,73 +1,74 @@
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
 import { gte, sort } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import I18n from "I18n";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import { inject as service } from "@ember/service";
 
 const MAX_FIELDS = 30;
 
-export default Controller.extend({
-  dialog: service(),
-  fieldTypes: null,
-  createDisabled: gte("model.length", MAX_FIELDS),
-  sortedFields: sort("model", "fieldSortOrder"),
+export default class AdminUserFieldsController extends Controller {
+  @service dialog;
 
-  init() {
-    this._super(...arguments);
+  fieldTypes = null;
 
-    this.fieldSortOrder = ["position"];
-  },
+  @gte("model.length", MAX_FIELDS) createDisabled;
+  @sort("model", "fieldSortOrder") sortedFields;
 
-  actions: {
-    createField() {
-      const f = this.store.createRecord("user-field", {
-        field_type: "text",
-        position: MAX_FIELDS,
+  fieldSortOrder = ["position"];
+
+  @action
+  createField() {
+    const f = this.store.createRecord("user-field", {
+      field_type: "text",
+      position: MAX_FIELDS,
+    });
+    this.model.pushObject(f);
+  }
+
+  @action
+  moveUp(f) {
+    const idx = this.sortedFields.indexOf(f);
+    if (idx) {
+      const prev = this.sortedFields.objectAt(idx - 1);
+      const prevPos = prev.get("position");
+
+      prev.update({ position: f.get("position") });
+      f.update({ position: prevPos });
+    }
+  }
+
+  @action
+  moveDown(f) {
+    const idx = this.sortedFields.indexOf(f);
+    if (idx > -1) {
+      const next = this.sortedFields.objectAt(idx + 1);
+      const nextPos = next.get("position");
+
+      next.update({ position: f.get("position") });
+      f.update({ position: nextPos });
+    }
+  }
+
+  @action
+  destroyField(f) {
+    const model = this.model;
+
+    // Only confirm if we already been saved
+    if (f.get("id")) {
+      this.dialog.yesNoConfirm({
+        message: I18n.t("admin.user_fields.delete_confirm"),
+        didConfirm: () => {
+          return f
+            .destroyRecord()
+            .then(function () {
+              model.removeObject(f);
+            })
+            .catch(popupAjaxError);
+        },
       });
-      this.model.pushObject(f);
-    },
-
-    moveUp(f) {
-      const idx = this.sortedFields.indexOf(f);
-      if (idx) {
-        const prev = this.sortedFields.objectAt(idx - 1);
-        const prevPos = prev.get("position");
-
-        prev.update({ position: f.get("position") });
-        f.update({ position: prevPos });
-      }
-    },
-
-    moveDown(f) {
-      const idx = this.sortedFields.indexOf(f);
-      if (idx > -1) {
-        const next = this.sortedFields.objectAt(idx + 1);
-        const nextPos = next.get("position");
-
-        next.update({ position: f.get("position") });
-        f.update({ position: nextPos });
-      }
-    },
-
-    destroy(f) {
-      const model = this.model;
-
-      // Only confirm if we already been saved
-      if (f.get("id")) {
-        this.dialog.yesNoConfirm({
-          message: I18n.t("admin.user_fields.delete_confirm"),
-          didConfirm: () => {
-            return f
-              .destroyRecord()
-              .then(function () {
-                model.removeObject(f);
-              })
-              .catch(popupAjaxError);
-          },
-        });
-      } else {
-        model.removeObject(f);
-      }
-    },
-  },
-});
+    } else {
+      model.removeObject(f);
+    }
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-user-index.js b/app/assets/javascripts/admin/addon/controllers/admin-user-index.js
index b6859b9ce0e..b9cc4c247fc 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-user-index.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-user-index.js
@@ -1,5 +1,7 @@
-import DiscourseURL, { userPath } from "discourse/lib/url";
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
 import { and, notEmpty } from "@ember/object/computed";
+import DiscourseURL, { userPath } from "discourse/lib/url";
 import { fmt, propertyNotEqual, setting } from "discourse/lib/computed";
 import AdminUser from "admin/models/admin-user";
 import CanCheckEmails from "discourse/mixins/can-check-emails";
@@ -10,37 +12,39 @@ import discourseComputed from "discourse-common/utils/decorators";
 import getURL from "discourse-common/lib/get-url";
 import { htmlSafe } from "@ember/template";
 import { extractError, popupAjaxError } from "discourse/lib/ajax-error";
-import { inject as service } from "@ember/service";
 import showModal from "discourse/lib/show-modal";
+import DeletePostsConfirmationModal from "../components/modal/delete-posts-confirmation";
 
-export default Controller.extend(CanCheckEmails, {
-  router: service(),
-  dialog: service(),
-  adminTools: service(),
-  originalPrimaryGroupId: null,
-  customGroupIdsBuffer: null,
-  availableGroups: null,
-  userTitleValue: null,
-  ssoExternalEmail: null,
-  ssoLastPayload: null,
+export default class AdminUserIndexController extends Controller.extend(
+  CanCheckEmails
+) {
+  @service router;
+  @service dialog;
+  @service adminTools;
+  @service modal;
 
-  showBadges: setting("enable_badges"),
-  hasLockedTrustLevel: notEmpty("model.manual_locked_trust_level"),
+  originalPrimaryGroupId = null;
+  customGroupIdsBuffer = null;
+  availableGroups = null;
+  userTitleValue = null;
+  ssoExternalEmail = null;
+  ssoLastPayload = null;
 
-  primaryGroupDirty: propertyNotEqual(
-    "originalPrimaryGroupId",
-    "model.primary_group_id"
-  ),
+  @setting("enable_badges") showBadges;
+  @notEmpty("model.manual_locked_trust_level") hasLockedTrustLevel;
 
-  canDisableSecondFactor: and(
-    "model.second_factor_enabled",
-    "model.can_disable_second_factor"
-  ),
+  @propertyNotEqual("originalPrimaryGroupId", "model.primary_group_id")
+  primaryGroupDirty;
+
+  @and("model.second_factor_enabled", "model.can_disable_second_factor")
+  canDisableSecondFactor;
+
+  @fmt("model.username_lower", userPath("%@/preferences")) preferencesPath;
 
   @discourseComputed("model.customGroups")
   customGroupIds(customGroups) {
     return customGroups.mapBy("id");
-  },
+  }
 
   @discourseComputed("customGroupIdsBuffer", "customGroupIds")
   customGroupsDirty(buffer, original) {
@@ -51,7 +55,7 @@ export default Controller.extend(CanCheckEmails, {
     return buffer.length === original.length
       ? buffer.any((id) => !original.includes(id))
       : true;
-  },
+  }
 
   @discourseComputed("model.automaticGroups")
   automaticGroups(automaticGroups) {
@@ -61,26 +65,24 @@ export default Controller.extend(CanCheckEmails, {
         return `<a href="/g/${name}">${name}</a>`;
       })
       .join(", ");
-  },
+  }
 
   @discourseComputed("model.associated_accounts")
   associatedAccountsLoaded(associatedAccounts) {
     return typeof associatedAccounts !== "undefined";
-  },
+  }
 
   @discourseComputed("model.associated_accounts")
   associatedAccounts(associatedAccounts) {
     return associatedAccounts
       .map((provider) => `${provider.name} (${provider.description})`)
       .join(", ");
-  },
+  }
 
   @discourseComputed("model.user_fields.[]")
   userFields(userFields) {
     return this.site.collectUserFields(userFields);
-  },
-
-  preferencesPath: fmt("model.username_lower", userPath("%@/preferences")),
+  }
 
   @discourseComputed(
     "model.can_delete_all_posts",
@@ -104,7 +106,7 @@ export default Controller.extend(CanCheckEmails, {
         count: this.siteSettings.delete_user_max_post_age,
       });
     }
-  },
+  }
 
   @discourseComputed("model.canBeDeleted", "model.staff")
   deleteExplanation(canBeDeleted, staff) {
@@ -119,18 +121,18 @@ export default Controller.extend(CanCheckEmails, {
         count: this.siteSettings.delete_user_max_post_age,
       });
     }
-  },
+  }
 
   @discourseComputed("model.username")
   postEditsByEditorFilter(username) {
     return { editor: username };
-  },
+  }
 
   groupAdded(added) {
     this.model
       .groupAdded(added)
       .catch(() => this.dialog.alert(I18n.t("generic_error")));
-  },
+  }
 
   groupRemoved(groupId) {
     this.model
@@ -141,475 +143,525 @@ export default Controller.extend(CanCheckEmails, {
         }
       })
       .catch(() => this.dialog.alert(I18n.t("generic_error")));
-  },
+  }
 
   @discourseComputed("ssoLastPayload")
   ssoPayload(lastPayload) {
     return lastPayload.split("&");
-  },
+  }
 
-  actions: {
-    impersonate() {
-      return this.model
-        .impersonate()
-        .then(() => DiscourseURL.redirectTo("/"))
-        .catch((e) => {
-          if (e.status === 404) {
-            this.dialog.alert(I18n.t("admin.impersonate.not_found"));
+  @action
+  impersonate() {
+    return this.model
+      .impersonate()
+      .then(() => DiscourseURL.redirectTo("/"))
+      .catch((e) => {
+        if (e.status === 404) {
+          this.dialog.alert(I18n.t("admin.impersonate.not_found"));
+        } else {
+          this.dialog.alert(I18n.t("admin.impersonate.invalid"));
+        }
+      });
+  }
+
+  @action
+  logOut() {
+    return this.model
+      .logOut()
+      .then(() => this.dialog.alert(I18n.t("admin.user.logged_out")));
+  }
+
+  @action
+  resetBounceScore() {
+    return this.model.resetBounceScore();
+  }
+
+  @action
+  approve() {
+    return this.model.approve(this.currentUser);
+  }
+
+  @action
+  _formatError(event) {
+    return `http: ${event.status} - ${event.body}`;
+  }
+
+  @action
+  deactivate() {
+    return this.model
+      .deactivate()
+      .then(() =>
+        this.model.setProperties({ active: false, can_activate: true })
+      )
+      .catch((e) => {
+        const error = I18n.t("admin.user.deactivate_failed", {
+          error: this._formatError(e),
+        });
+        this.dialog.alert(error);
+      });
+  }
+
+  @action
+  sendActivationEmail() {
+    return this.model
+      .sendActivationEmail()
+      .then(() => this.dialog.alert(I18n.t("admin.user.activation_email_sent")))
+      .catch(popupAjaxError);
+  }
+
+  @action
+  activate() {
+    return this.model
+      .activate()
+      .then(() =>
+        this.model.setProperties({
+          active: true,
+          can_deactivate: !this.model.staff,
+        })
+      )
+      .catch((e) => {
+        const error = I18n.t("admin.user.activate_failed", {
+          error: this._formatError(e),
+        });
+        this.dialog.alert(error);
+      });
+  }
+
+  @action
+  revokeAdmin() {
+    return this.model.revokeAdmin();
+  }
+
+  @action
+  grantAdmin() {
+    return this.model
+      .grantAdmin()
+      .then((result) => {
+        if (result.email_confirmation_required) {
+          this.dialog.alert(I18n.t("admin.user.grant_admin_confirm"));
+        }
+      })
+      .catch((error) => {
+        const nonce = error.jqXHR?.responseJSON.second_factor_challenge_nonce;
+        if (nonce) {
+          this.router.transitionTo("second-factor-auth", {
+            queryParams: { nonce },
+          });
+        } else {
+          popupAjaxError(error);
+        }
+      });
+  }
+
+  @action
+  revokeModeration() {
+    return this.model.revokeModeration();
+  }
+
+  @action
+  grantModeration() {
+    return this.model.grantModeration();
+  }
+
+  @action
+  saveTrustLevel() {
+    return this.model
+      .saveTrustLevel()
+      .then(() => window.location.reload())
+      .catch((e) => {
+        let error;
+        if (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors) {
+          error = e.jqXHR.responseJSON.errors[0];
+        }
+        error =
+          error ||
+          I18n.t("admin.user.trust_level_change_failed", {
+            error: this._formatError(e),
+          });
+        this.dialog.alert(error);
+      });
+  }
+
+  @action
+  restoreTrustLevel() {
+    return this.model.restoreTrustLevel();
+  }
+
+  @action
+  lockTrustLevel(locked) {
+    return this.model
+      .lockTrustLevel(locked)
+      .then(() => window.location.reload())
+      .catch((e) => {
+        let error;
+        if (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors) {
+          error = e.jqXHR.responseJSON.errors[0];
+        }
+        error =
+          error ||
+          I18n.t("admin.user.trust_level_change_failed", {
+            error: this._formatError(e),
+          });
+        this.dialog.alert(error);
+      });
+  }
+
+  @action
+  unsilence() {
+    return this.model.unsilence();
+  }
+
+  @action
+  silence() {
+    return this.model.silence();
+  }
+
+  @action
+  anonymize() {
+    const user = this.model;
+
+    const performAnonymize = () => {
+      this.model
+        .anonymize()
+        .then((data) => {
+          if (data.success) {
+            if (data.username) {
+              document.location = getURL(
+                `/admin/users/${user.get("id")}/${data.username}`
+              );
+            } else {
+              document.location = getURL("/admin/users/list/active");
+            }
           } else {
-            this.dialog.alert(I18n.t("admin.impersonate.invalid"));
-          }
-        });
-    },
-    logOut() {
-      return this.model
-        .logOut()
-        .then(() => this.dialog.alert(I18n.t("admin.user.logged_out")));
-    },
-    resetBounceScore() {
-      return this.model.resetBounceScore();
-    },
-    approve() {
-      return this.model.approve(this.currentUser);
-    },
-
-    _formatError(event) {
-      return `http: ${event.status} - ${event.body}`;
-    },
-
-    deactivate() {
-      return this.model
-        .deactivate()
-        .then(() =>
-          this.model.setProperties({ active: false, can_activate: true })
-        )
-        .catch((e) => {
-          const error = I18n.t("admin.user.deactivate_failed", {
-            error: this._formatError(e),
-          });
-          this.dialog.alert(error);
-        });
-    },
-    sendActivationEmail() {
-      return this.model
-        .sendActivationEmail()
-        .then(() =>
-          this.dialog.alert(I18n.t("admin.user.activation_email_sent"))
-        )
-        .catch(popupAjaxError);
-    },
-    activate() {
-      return this.model
-        .activate()
-        .then(() =>
-          this.model.setProperties({
-            active: true,
-            can_deactivate: !this.model.staff,
-          })
-        )
-        .catch((e) => {
-          const error = I18n.t("admin.user.activate_failed", {
-            error: this._formatError(e),
-          });
-          this.dialog.alert(error);
-        });
-    },
-    revokeAdmin() {
-      return this.model.revokeAdmin();
-    },
-    grantAdmin() {
-      return this.model
-        .grantAdmin()
-        .then((result) => {
-          if (result.email_confirmation_required) {
-            this.dialog.alert(I18n.t("admin.user.grant_admin_confirm"));
+            this.dialog.alert(I18n.t("admin.user.anonymize_failed"));
+            if (data.user) {
+              user.setProperties(data.user);
+            }
           }
         })
-        .catch((error) => {
-          const nonce = error.jqXHR?.responseJSON.second_factor_challenge_nonce;
-          if (nonce) {
-            this.router.transitionTo("second-factor-auth", {
-              queryParams: { nonce },
-            });
-          } else {
-            popupAjaxError(error);
-          }
-        });
-    },
-    revokeModeration() {
-      return this.model.revokeModeration();
-    },
-    grantModeration() {
-      return this.model.grantModeration();
-    },
-    saveTrustLevel() {
-      return this.model
-        .saveTrustLevel()
-        .then(() => window.location.reload())
-        .catch((e) => {
-          let error;
-          if (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors) {
-            error = e.jqXHR.responseJSON.errors[0];
-          }
-          error =
-            error ||
-            I18n.t("admin.user.trust_level_change_failed", {
-              error: this._formatError(e),
-            });
-          this.dialog.alert(error);
-        });
-    },
-    restoreTrustLevel() {
-      return this.model.restoreTrustLevel();
-    },
-    lockTrustLevel(locked) {
-      return this.model
-        .lockTrustLevel(locked)
-        .then(() => window.location.reload())
-        .catch((e) => {
-          let error;
-          if (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors) {
-            error = e.jqXHR.responseJSON.errors[0];
-          }
-          error =
-            error ||
-            I18n.t("admin.user.trust_level_change_failed", {
-              error: this._formatError(e),
-            });
-          this.dialog.alert(error);
-        });
-    },
-    unsilence() {
-      return this.model.unsilence();
-    },
-    silence() {
-      return this.model.silence();
-    },
+        .catch(() => this.dialog.alert(I18n.t("admin.user.anonymize_failed")));
+    };
 
-    anonymize() {
-      const user = this.model;
-
-      const performAnonymize = () => {
-        this.model
-          .anonymize()
-          .then((data) => {
-            if (data.success) {
-              if (data.username) {
-                document.location = getURL(
-                  `/admin/users/${user.get("id")}/${data.username}`
-                );
-              } else {
-                document.location = getURL("/admin/users/list/active");
-              }
-            } else {
-              this.dialog.alert(I18n.t("admin.user.anonymize_failed"));
-              if (data.user) {
-                user.setProperties(data.user);
-              }
-            }
-          })
-          .catch(() =>
-            this.dialog.alert(I18n.t("admin.user.anonymize_failed"))
-          );
-      };
-
-      this.dialog.alert({
-        message: I18n.t("admin.user.anonymize_confirm"),
-        class: "delete-user-modal",
-        buttons: [
-          {
-            icon: "exclamation-triangle",
-            label: I18n.t("admin.user.anonymize_yes"),
-            class: "btn-danger",
-            action: () => performAnonymize(),
-          },
-          {
-            label: I18n.t("composer.cancel"),
-          },
-        ],
-      });
-    },
-
-    disableSecondFactor() {
-      return this.model.disableSecondFactor();
-    },
-
-    clearPenaltyHistory() {
-      const user = this.model;
-      const path = `/admin/users/${user.get("id")}/penalty_history`;
-
-      return ajax(path, { type: "DELETE" })
-        .then(() => user.set("tl3_requirements.penalty_counts.total", 0))
-        .catch(popupAjaxError);
-    },
-
-    destroy() {
-      const postCount = this.get("model.post_count");
-      const maxPostCount = this.siteSettings.delete_all_posts_max;
-      const location = document.location.pathname;
-
-      const performDestroy = (block) => {
-        this.dialog.notice(I18n.t("admin.user.deleting_user"));
-        let formData = { context: location };
-        if (block) {
-          formData["block_email"] = true;
-          formData["block_urls"] = true;
-          formData["block_ip"] = true;
-        }
-        if (postCount <= maxPostCount) {
-          formData["delete_posts"] = true;
-        }
-        this.model
-          .destroy(formData)
-          .then((data) => {
-            if (data.deleted) {
-              if (/^\/admin\/users\/list\//.test(location)) {
-                document.location = location;
-              } else {
-                document.location = getURL("/admin/users/list/active");
-              }
-            } else {
-              this.dialog.alert(I18n.t("admin.user.delete_failed"));
-            }
-          })
-          .catch(() => {
-            this.dialog.alert(I18n.t("admin.user.delete_failed"));
-          });
-      };
-
-      this.dialog.alert({
-        title: I18n.t("admin.user.delete_confirm_title"),
-        message: I18n.t("admin.user.delete_confirm"),
-        class: "delete-user-modal",
-        buttons: [
-          {
-            label: I18n.t("admin.user.delete_dont_block"),
-            class: "btn-primary",
-            action: () => {
-              return performDestroy(false);
-            },
-          },
-          {
-            icon: "exclamation-triangle",
-            label: I18n.t("admin.user.delete_and_block"),
-            class: "btn-danger",
-            action: () => {
-              return performDestroy(true);
-            },
-          },
-          {
-            label: I18n.t("composer.cancel"),
-          },
-        ],
-      });
-    },
-
-    promptTargetUser() {
-      showModal("admin-merge-users-prompt", {
-        admin: true,
-        model: this.model,
-      });
-    },
-
-    showMergeConfirmation(targetUsername) {
-      showModal("admin-merge-users-confirmation", {
-        admin: true,
-        model: {
-          username: this.model.username,
-          targetUsername,
+    this.dialog.alert({
+      message: I18n.t("admin.user.anonymize_confirm"),
+      class: "delete-user-modal",
+      buttons: [
+        {
+          icon: "exclamation-triangle",
+          label: I18n.t("admin.user.anonymize_yes"),
+          class: "btn-danger",
+          action: () => performAnonymize(),
         },
-      });
-    },
+        {
+          label: I18n.t("composer.cancel"),
+        },
+      ],
+    });
+  }
 
-    merge(targetUsername) {
-      const user = this.model;
-      const location = document.location.pathname;
+  @action
+  disableSecondFactor() {
+    return this.model.disableSecondFactor();
+  }
 
+  @action
+  clearPenaltyHistory() {
+    const user = this.model;
+    const path = `/admin/users/${user.get("id")}/penalty_history`;
+
+    return ajax(path, { type: "DELETE" })
+      .then(() => user.set("tl3_requirements.penalty_counts.total", 0))
+      .catch(popupAjaxError);
+  }
+
+  @action
+  destroyUser() {
+    const postCount = this.get("model.post_count");
+    const maxPostCount = this.siteSettings.delete_all_posts_max;
+    const location = document.location.pathname;
+
+    const performDestroy = (block) => {
+      this.dialog.notice(I18n.t("admin.user.deleting_user"));
       let formData = { context: location };
-
-      if (targetUsername) {
-        formData["target_username"] = targetUsername;
+      if (block) {
+        formData["block_email"] = true;
+        formData["block_urls"] = true;
+        formData["block_ip"] = true;
+      }
+      if (postCount <= maxPostCount) {
+        formData["delete_posts"] = true;
       }
-
       this.model
-        .merge(formData)
-        .then((response) => {
-          if (response.success) {
-            showModal("admin-merge-users-progress", {
-              admin: true,
-              model: this.model,
-            });
+        .destroy(formData)
+        .then((data) => {
+          if (data.deleted) {
+            if (/^\/admin\/users\/list\//.test(location)) {
+              document.location = location;
+            } else {
+              document.location = getURL("/admin/users/list/active");
+            }
           } else {
-            this.dialog.alert(I18n.t("admin.user.merge_failed"));
+            this.dialog.alert(I18n.t("admin.user.delete_failed"));
           }
         })
         .catch(() => {
-          AdminUser.find(user.id).then((u) => user.setProperties(u));
-          this.dialog.alert(I18n.t("admin.user.merge_failed"));
+          this.dialog.alert(I18n.t("admin.user.delete_failed"));
         });
-    },
+    };
 
-    viewActionLogs() {
-      this.adminTools.showActionLogs(this, {
-        target_user: this.get("model.username"),
-      });
-    },
-    showSuspendModal() {
-      this.adminTools.showSuspendModal(this.model);
-    },
-    unsuspend() {
-      this.model.unsuspend().catch(popupAjaxError);
-    },
-    showSilenceModal() {
-      this.adminTools.showSilenceModal(this.model);
-    },
+    this.dialog.alert({
+      title: I18n.t("admin.user.delete_confirm_title"),
+      message: I18n.t("admin.user.delete_confirm"),
+      class: "delete-user-modal",
+      buttons: [
+        {
+          label: I18n.t("admin.user.delete_dont_block"),
+          class: "btn-primary",
+          action: () => {
+            return performDestroy(false);
+          },
+        },
+        {
+          icon: "exclamation-triangle",
+          label: I18n.t("admin.user.delete_and_block"),
+          class: "btn-danger",
+          action: () => {
+            return performDestroy(true);
+          },
+        },
+        {
+          label: I18n.t("composer.cancel"),
+        },
+      ],
+    });
+  }
 
-    saveUsername(newUsername) {
-      const oldUsername = this.get("model.username");
-      this.set("model.username", newUsername);
+  @action
+  promptTargetUser() {
+    showModal("admin-merge-users-prompt", {
+      admin: true,
+      model: this.model,
+    });
+  }
 
-      const path = `/users/${oldUsername.toLowerCase()}/preferences/username`;
+  @action
+  showMergeConfirmation(targetUsername) {
+    showModal("admin-merge-users-confirmation", {
+      admin: true,
+      model: {
+        username: this.model.username,
+        targetUsername,
+      },
+    });
+  }
 
-      return ajax(path, { data: { new_username: newUsername }, type: "PUT" })
-        .catch((e) => {
-          this.set("model.username", oldUsername);
-          popupAjaxError(e);
-        })
-        .finally(() => this.toggleProperty("editingUsername"));
-    },
+  @action
+  merge(targetUsername) {
+    const user = this.model;
+    const location = document.location.pathname;
 
-    saveName(newName) {
-      const oldName = this.get("model.name");
-      this.set("model.name", newName);
+    let formData = { context: location };
 
-      const path = userPath(`${this.get("model.username").toLowerCase()}.json`);
+    if (targetUsername) {
+      formData["target_username"] = targetUsername;
+    }
 
-      return ajax(path, { data: { name: newName }, type: "PUT" })
-        .catch((e) => {
-          this.set("model.name", oldName);
-          popupAjaxError(e);
-        })
-        .finally(() => this.toggleProperty("editingName"));
-    },
-
-    saveTitle(newTitle) {
-      const oldTitle = this.get("model.title");
-      this.set("model.title", newTitle);
-
-      const path = userPath(`${this.get("model.username").toLowerCase()}.json`);
-
-      return ajax(path, { data: { title: newTitle }, type: "PUT" })
-        .catch((e) => {
-          this.set("model.title", oldTitle);
-          popupAjaxError(e);
-        })
-        .finally(() => this.toggleProperty("editingTitle"));
-    },
-
-    saveCustomGroups() {
-      const currentIds = this.customGroupIds;
-      const bufferedIds = this.customGroupIdsBuffer;
-      const availableGroups = this.availableGroups;
-
-      bufferedIds
-        .filter((id) => !currentIds.includes(id))
-        .forEach((id) => this.groupAdded(availableGroups.findBy("id", id)));
-
-      currentIds
-        .filter((id) => !bufferedIds.includes(id))
-        .forEach((id) => this.groupRemoved(id));
-    },
-
-    resetCustomGroups() {
-      this.set("customGroupIdsBuffer", this.model.customGroups.mapBy("id"));
-    },
-
-    savePrimaryGroup() {
-      const primaryGroupId = this.get("model.primary_group_id");
-      const path = `/admin/users/${this.get("model.id")}/primary_group`;
-
-      return ajax(path, {
-        type: "PUT",
-        data: { primary_group_id: primaryGroupId },
-      })
-        .then(() => this.set("originalPrimaryGroupId", primaryGroupId))
-        .catch(() => this.dialog.alert(I18n.t("generic_error")));
-    },
-
-    resetPrimaryGroup() {
-      this.set("model.primary_group_id", this.originalPrimaryGroupId);
-    },
-
-    deleteSSORecord() {
-      return this.dialog.yesNoConfirm({
-        message: I18n.t("admin.user.discourse_connect.confirm_delete"),
-        didConfirm: () => this.model.deleteSSORecord(),
-      });
-    },
-
-    checkSsoEmail() {
-      return ajax(userPath(`${this.model.username_lower}/sso-email.json`), {
-        data: { context: window.location.pathname },
-      }).then((result) => {
-        if (result) {
-          this.set("ssoExternalEmail", result.email);
-        }
-      });
-    },
-
-    checkSsoPayload() {
-      return ajax(userPath(`${this.model.username_lower}/sso-payload.json`), {
-        data: { context: window.location.pathname },
-      }).then((result) => {
-        if (result) {
-          this.set("ssoLastPayload", result.payload);
-        }
-      });
-    },
-
-    showDeletePostsConfirmation() {
-      showModal("admin-delete-posts-confirmation", {
-        admin: true,
-        model: this.model,
-      });
-    },
-
-    deleteAllPosts() {
-      let deletedPosts = 0;
-      let deletedPercentage = 0;
-      const user = this.model;
-
-      const performDelete = (progressModal) => {
-        this.model
-          .deleteAllPosts()
-          .then(({ posts_deleted }) => {
-            if (posts_deleted === 0) {
-              user.set("post_count", 0);
-              progressModal.send("closeModal");
-            } else {
-              deletedPosts += posts_deleted;
-              deletedPercentage = Math.floor(
-                (deletedPosts * 100) / user.get("post_count")
-              );
-              progressModal.setProperties({
-                deletedPercentage,
-              });
-              performDelete(progressModal);
-            }
-          })
-          .catch((e) => {
-            progressModal.send("closeModal");
-            let error;
-            AdminUser.find(user.get("id")).then((u) => user.setProperties(u));
-            error = extractError(e) || I18n.t("admin.user.delete_posts_failed");
-            this.dialog.alert(error);
+    this.model
+      .merge(formData)
+      .then((response) => {
+        if (response.success) {
+          showModal("admin-merge-users-progress", {
+            admin: true,
+            model: this.model,
           });
-      };
-
-      const progressModal = showModal("admin-delete-user-posts-progress", {
-        admin: true,
+        } else {
+          this.dialog.alert(I18n.t("admin.user.merge_failed"));
+        }
+      })
+      .catch(() => {
+        AdminUser.find(user.id).then((u) => user.setProperties(u));
+        this.dialog.alert(I18n.t("admin.user.merge_failed"));
       });
-      performDelete(progressModal);
-    },
-  },
-});
+  }
+
+  @action
+  viewActionLogs() {
+    this.adminTools.showActionLogs(this, {
+      target_user: this.get("model.username"),
+    });
+  }
+
+  @action
+  showSuspendModal() {
+    this.adminTools.showSuspendModal(this.model);
+  }
+
+  @action
+  unsuspend() {
+    this.model.unsuspend().catch(popupAjaxError);
+  }
+
+  @action
+  showSilenceModal() {
+    this.adminTools.showSilenceModal(this.model);
+  }
+
+  @action
+  saveUsername(newUsername) {
+    const oldUsername = this.get("model.username");
+    this.set("model.username", newUsername);
+
+    const path = `/users/${oldUsername.toLowerCase()}/preferences/username`;
+
+    return ajax(path, { data: { new_username: newUsername }, type: "PUT" })
+      .catch((e) => {
+        this.set("model.username", oldUsername);
+        popupAjaxError(e);
+      })
+      .finally(() => this.toggleProperty("editingUsername"));
+  }
+
+  @action
+  saveName(newName) {
+    const oldName = this.get("model.name");
+    this.set("model.name", newName);
+
+    const path = userPath(`${this.get("model.username").toLowerCase()}.json`);
+
+    return ajax(path, { data: { name: newName }, type: "PUT" })
+      .catch((e) => {
+        this.set("model.name", oldName);
+        popupAjaxError(e);
+      })
+      .finally(() => this.toggleProperty("editingName"));
+  }
+
+  @action
+  saveTitle(newTitle) {
+    const oldTitle = this.get("model.title");
+    this.set("model.title", newTitle);
+
+    const path = userPath(`${this.get("model.username").toLowerCase()}.json`);
+
+    return ajax(path, { data: { title: newTitle }, type: "PUT" })
+      .catch((e) => {
+        this.set("model.title", oldTitle);
+        popupAjaxError(e);
+      })
+      .finally(() => this.toggleProperty("editingTitle"));
+  }
+
+  @action
+  saveCustomGroups() {
+    const currentIds = this.customGroupIds;
+    const bufferedIds = this.customGroupIdsBuffer;
+    const availableGroups = this.availableGroups;
+
+    bufferedIds
+      .filter((id) => !currentIds.includes(id))
+      .forEach((id) => this.groupAdded(availableGroups.findBy("id", id)));
+
+    currentIds
+      .filter((id) => !bufferedIds.includes(id))
+      .forEach((id) => this.groupRemoved(id));
+  }
+
+  @action
+  resetCustomGroups() {
+    this.set("customGroupIdsBuffer", this.model.customGroups.mapBy("id"));
+  }
+
+  @action
+  savePrimaryGroup() {
+    const primaryGroupId = this.get("model.primary_group_id");
+    const path = `/admin/users/${this.get("model.id")}/primary_group`;
+
+    return ajax(path, {
+      type: "PUT",
+      data: { primary_group_id: primaryGroupId },
+    })
+      .then(() => this.set("originalPrimaryGroupId", primaryGroupId))
+      .catch(() => this.dialog.alert(I18n.t("generic_error")));
+  }
+
+  @action
+  resetPrimaryGroup() {
+    this.set("model.primary_group_id", this.originalPrimaryGroupId);
+  }
+
+  @action
+  deleteSSORecord() {
+    return this.dialog.yesNoConfirm({
+      message: I18n.t("admin.user.discourse_connect.confirm_delete"),
+      didConfirm: () => this.model.deleteSSORecord(),
+    });
+  }
+
+  @action
+  checkSsoEmail() {
+    return ajax(userPath(`${this.model.username_lower}/sso-email.json`), {
+      data: { context: window.location.pathname },
+    }).then((result) => {
+      if (result) {
+        this.set("ssoExternalEmail", result.email);
+      }
+    });
+  }
+
+  @action
+  checkSsoPayload() {
+    return ajax(userPath(`${this.model.username_lower}/sso-payload.json`), {
+      data: { context: window.location.pathname },
+    }).then((result) => {
+      if (result) {
+        this.set("ssoLastPayload", result.payload);
+      }
+    });
+  }
+
+  @action
+  showDeletePostsConfirmation() {
+    this.modal.show(DeletePostsConfirmationModal, {
+      model: { user: this.model, deleteAllPosts: this.deleteAllPosts },
+    });
+  }
+
+  @action
+  deleteAllPosts() {
+    let deletedPosts = 0;
+    let deletedPercentage = 0;
+    const user = this.model;
+
+    const performDelete = (progressModal) => {
+      this.model
+        .deleteAllPosts()
+        .then(({ posts_deleted }) => {
+          if (posts_deleted === 0) {
+            user.set("post_count", 0);
+            progressModal.send("closeModal");
+          } else {
+            deletedPosts += posts_deleted;
+            deletedPercentage = Math.floor(
+              (deletedPosts * 100) / user.get("post_count")
+            );
+            progressModal.setProperties({
+              deletedPercentage,
+            });
+            performDelete(progressModal);
+          }
+        })
+        .catch((e) => {
+          progressModal.send("closeModal");
+          let error;
+          AdminUser.find(user.get("id")).then((u) => user.setProperties(u));
+          error = extractError(e, I18n.t("admin.user.delete_posts_failed"));
+          this.dialog.alert(error);
+        });
+    };
+
+    const progressModal = showModal("admin-delete-user-posts-progress", {
+      admin: true,
+    });
+    performDelete(progressModal);
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-user.js b/app/assets/javascripts/admin/addon/controllers/admin-user.js
index cf6c4e3aa2e..9fc1e78e7f8 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-user.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-user.js
@@ -1,2 +1,2 @@
 import Controller from "@ember/controller";
-export default Controller.extend();
+export default class AdminUserController extends Controller {}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-users-list-show.js b/app/assets/javascripts/admin/addon/controllers/admin-users-list-show.js
index e51e7c3a5cb..7865e57c5d6 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-users-list-show.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-users-list-show.js
@@ -1,4 +1,6 @@
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import { action } from "@ember/object";
+import discourseComputed from "discourse-common/utils/decorators";
+import { observes } from "@ember-decorators/object";
 import AdminUser from "admin/models/admin-user";
 import CanCheckEmails from "discourse/mixins/can-check-emails";
 import Controller from "@ember/controller";
@@ -7,41 +9,55 @@ import { INPUT_DELAY } from "discourse-common/config/environment";
 import discourseDebounce from "discourse-common/lib/debounce";
 import { i18n } from "discourse/lib/computed";
 
-export default Controller.extend(CanCheckEmails, {
-  model: null,
-  query: null,
-  order: null,
-  asc: null,
-  showEmails: false,
-  refreshing: false,
-  listFilter: null,
-  selectAll: false,
-  searchHint: i18n("search_hint"),
+export default class AdminUsersListShowController extends Controller.extend(
+  CanCheckEmails
+) {
+  model = null;
+  query = null;
+  order = null;
+  asc = null;
+  showEmails = false;
+  refreshing = false;
+  listFilter = null;
+  selectAll = false;
 
-  init() {
-    this._super(...arguments);
+  @i18n("search_hint") searchHint;
 
-    this._page = 1;
-    this._results = [];
-    this._canLoadMore = true;
-  },
+  _page = 1;
+  _results = [];
+  _canLoadMore = true;
 
   @discourseComputed("query")
   title(query) {
     return I18n.t("admin.users.titles." + query);
-  },
+  }
+
+  @discourseComputed("showEmails")
+  columnCount(showEmails) {
+    let colCount = 7; // note that the first column is hardcoded in the template
+
+    if (showEmails) {
+      colCount += 1;
+    }
+
+    if (this.siteSettings.must_approve_users) {
+      colCount += 1;
+    }
+
+    return colCount;
+  }
 
   @observes("listFilter")
   _filterUsers() {
     discourseDebounce(this, this.resetFilters, INPUT_DELAY);
-  },
+  }
 
   resetFilters() {
     this._page = 1;
     this._results = [];
     this._canLoadMore = true;
     this._refreshUsers();
-  },
+  }
 
   _refreshUsers() {
     if (!this._canLoadMore) {
@@ -69,17 +85,17 @@ export default Controller.extend(CanCheckEmails, {
       .finally(() => {
         this.set("refreshing", false);
       });
-  },
+  }
 
-  actions: {
-    loadMore() {
-      this._page += 1;
-      this._refreshUsers();
-    },
+  @action
+  loadMore() {
+    this._page += 1;
+    this._refreshUsers();
+  }
 
-    toggleEmailVisibility() {
-      this.toggleProperty("showEmails");
-      this.resetFilters();
-    },
-  },
-});
+  @action
+  toggleEmailVisibility() {
+    this.toggleProperty("showEmails");
+    this.resetFilters();
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-watched-words-action.js b/app/assets/javascripts/admin/addon/controllers/admin-watched-words-action.js
index a1b158a6774..9529d6bb7f3 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-watched-words-action.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-watched-words-action.js
@@ -1,32 +1,35 @@
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+import { or } from "@ember/object/computed";
 import Controller, { inject as controller } from "@ember/controller";
 import I18n from "I18n";
 import WatchedWord from "admin/models/watched-word";
 import { ajax } from "discourse/lib/ajax";
 import discourseComputed from "discourse-common/utils/decorators";
 import { fmt } from "discourse/lib/computed";
-import { or } from "@ember/object/computed";
 import { schedule } from "@ember/runloop";
 import showModal from "discourse/lib/show-modal";
-import { inject as service } from "@ember/service";
 
-export default Controller.extend({
-  adminWatchedWords: controller(),
-  actionNameKey: null,
-  dialog: service(),
-  downloadLink: fmt(
-    "actionNameKey",
-    "/admin/customize/watched_words/action/%@/download"
-  ),
-  showWordsList: or("adminWatchedWords.showWords", "adminWatchedWords.filter"),
+export default class AdminWatchedWordsActionController extends Controller {
+  @service dialog;
+  @controller adminWatchedWords;
+
+  actionNameKey = null;
+
+  @fmt("actionNameKey", "/admin/customize/watched_words/action/%@/download")
+  downloadLink;
+
+  @or("adminWatchedWords.showWords", "adminWatchedWords.filter")
+  showWordsList;
 
   findAction(actionName) {
     return (this.adminWatchedWords.model || []).findBy("nameKey", actionName);
-  },
+  }
 
   @discourseComputed("actionNameKey", "adminWatchedWords.model")
   currentAction(actionName) {
     return this.findAction(actionName);
-  },
+  }
 
   @discourseComputed("currentAction.words.[]")
   regexpError(words) {
@@ -37,78 +40,81 @@ export default Controller.extend({
         return I18n.t("admin.watched_words.invalid_regex", { word });
       }
     }
-  },
+  }
 
   @discourseComputed("actionNameKey")
   actionDescription(actionNameKey) {
     return I18n.t("admin.watched_words.action_descriptions." + actionNameKey);
-  },
+  }
 
-  actions: {
-    recordAdded(arg) {
-      const action = this.findAction(this.actionNameKey);
-      if (!action) {
-        return;
-      }
+  @action
+  recordAdded(arg) {
+    const foundAction = this.findAction(this.actionNameKey);
+    if (!foundAction) {
+      return;
+    }
 
-      action.words.unshiftObject(arg);
-      schedule("afterRender", () => {
-        // remove from other actions lists
-        let match = null;
-        this.adminWatchedWords.model.forEach((otherAction) => {
+    foundAction.words.unshiftObject(arg);
+    schedule("afterRender", () => {
+      // remove from other actions lists
+      let match = null;
+      this.adminWatchedWords.model.forEach((otherAction) => {
+        if (match) {
+          return;
+        }
+
+        if (otherAction.nameKey !== this.actionNameKey) {
+          match = otherAction.words.findBy("id", arg.id);
           if (match) {
-            return;
+            otherAction.words.removeObject(match);
           }
+        }
+      });
+    });
+  }
 
-          if (otherAction.nameKey !== this.actionNameKey) {
-            match = otherAction.words.findBy("id", arg.id);
-            if (match) {
-              otherAction.words.removeObject(match);
-            }
+  @action
+  recordRemoved(arg) {
+    if (this.currentAction) {
+      this.currentAction.words.removeObject(arg);
+    }
+  }
+
+  @action
+  uploadComplete() {
+    WatchedWord.findAll().then((data) => {
+      this.adminWatchedWords.set("model", data);
+    });
+  }
+
+  @action
+  test() {
+    WatchedWord.findAll().then((data) => {
+      this.adminWatchedWords.set("model", data);
+      showModal("admin-watched-word-test", {
+        admin: true,
+        model: this.currentAction,
+      });
+    });
+  }
+
+  @action
+  clearAll() {
+    const actionKey = this.actionNameKey;
+    this.dialog.yesNoConfirm({
+      message: I18n.t("admin.watched_words.clear_all_confirm", {
+        action: I18n.t("admin.watched_words.actions." + actionKey),
+      }),
+      didConfirm: () => {
+        ajax(`/admin/customize/watched_words/action/${actionKey}.json`, {
+          type: "DELETE",
+        }).then(() => {
+          const foundAction = this.findAction(actionKey);
+          if (foundAction) {
+            foundAction.set("words", []);
           }
         });
-      });
-    },
-
-    recordRemoved(arg) {
-      if (this.currentAction) {
-        this.currentAction.words.removeObject(arg);
-      }
-    },
-
-    uploadComplete() {
-      WatchedWord.findAll().then((data) => {
-        this.adminWatchedWords.set("model", data);
-      });
-    },
-
-    test() {
-      WatchedWord.findAll().then((data) => {
-        this.adminWatchedWords.set("model", data);
-        showModal("admin-watched-word-test", {
-          admin: true,
-          model: this.currentAction,
-        });
-      });
-    },
-
-    clearAll() {
-      const actionKey = this.actionNameKey;
-      this.dialog.yesNoConfirm({
-        message: I18n.t("admin.watched_words.clear_all_confirm", {
-          action: I18n.t("admin.watched_words.actions." + actionKey),
-        }),
-        didConfirm: () => {
-          ajax(`/admin/customize/watched_words/action/${actionKey}.json`, {
-            type: "DELETE",
-          }).then(() => {
-            const action = this.findAction(actionKey);
-            if (action) {
-              action.set("words", []);
-            }
-          });
-        },
-      });
-    },
-  },
-});
+      },
+    });
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-watched-words.js b/app/assets/javascripts/admin/addon/controllers/admin-watched-words.js
index 27e741e9ce5..72a2dedd430 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-watched-words.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-watched-words.js
@@ -3,11 +3,11 @@ import EmberObject, { action } from "@ember/object";
 import { INPUT_DELAY } from "discourse-common/config/environment";
 import discourseDebounce from "discourse-common/lib/debounce";
 import { isEmpty } from "@ember/utils";
-import { observes } from "discourse-common/utils/decorators";
+import { observes } from "@ember-decorators/object";
 
-export default Controller.extend({
-  filter: null,
-  showWords: false,
+export default class AdminWatchedWordsController extends Controller {
+  filter = null;
+  showWords = false;
 
   _filterContent() {
     if (isEmpty(this.allWatchedWords)) {
@@ -36,17 +36,17 @@ export default Controller.extend({
       );
     });
     this.set("model", model);
-  },
+  }
 
   @observes("filter")
   filterContent() {
     discourseDebounce(this, this._filterContent, INPUT_DELAY);
-  },
+  }
 
   @action
   clearFilter() {
     this.set("filter", "");
-  },
+  }
 
   @action
   toggleMenu() {
@@ -54,5 +54,5 @@ export default Controller.extend({
     ["mobile-closed", "mobile-open"].forEach((state) => {
       adminDetail.classList.toggle(state);
     });
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-edit.js b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-edit.js
index f24dfef939e..f13c99478c8 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-edit.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-edit.js
@@ -1,23 +1,27 @@
+import { inject as service } from "@ember/service";
+import { alias } from "@ember/object/computed";
 import Controller, { inject as controller } from "@ember/controller";
 import EmberObject, { action } from "@ember/object";
 import I18n from "I18n";
-import { alias } from "@ember/object/computed";
 import discourseComputed from "discourse-common/utils/decorators";
 import { isEmpty } from "@ember/utils";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import { inject as service } from "@ember/service";
 
-export default Controller.extend({
-  adminWebHooks: controller(),
-  dialog: service(),
-  eventTypes: alias("adminWebHooks.eventTypes"),
-  defaultEventTypes: alias("adminWebHooks.defaultEventTypes"),
-  contentTypes: alias("adminWebHooks.contentTypes"),
+export default class AdminWebHooksEditController extends Controller {
+  @service dialog;
+  @service router;
+  @service siteSettings;
+
+  @controller adminWebHooks;
+
+  @alias("adminWebHooks.eventTypes") eventTypes;
+  @alias("adminWebHooks.defaultEventTypes") defaultEventTypes;
+  @alias("adminWebHooks.contentTypes") contentTypes;
 
   @discourseComputed
   showTagsFilter() {
     return this.siteSettings.tagging_enabled;
-  },
+  }
 
   @discourseComputed("model.isSaving", "saved", "saveButtonDisabled")
   savingStatus(isSaving, saved, saveButtonDisabled) {
@@ -29,14 +33,14 @@ export default Controller.extend({
     // Use side effect of validation to clear saved text
     this.set("saved", false);
     return "";
-  },
+  }
 
   @discourseComputed("model.isNew")
   saveButtonText(isNew) {
     return isNew
       ? I18n.t("admin.web_hooks.create")
       : I18n.t("admin.web_hooks.save");
-  },
+  }
 
   @discourseComputed("model.secret")
   secretValidation(secret) {
@@ -55,7 +59,7 @@ export default Controller.extend({
         });
       }
     }
-  },
+  }
 
   @discourseComputed("model.wildcard_web_hook", "model.web_hook_event_types.[]")
   eventTypeValidation(isWildcard, eventTypes) {
@@ -65,7 +69,7 @@ export default Controller.extend({
         reason: I18n.t("admin.web_hooks.event_type_missing"),
       });
     }
-  },
+  }
 
   @discourseComputed(
     "model.isSaving",
@@ -82,7 +86,7 @@ export default Controller.extend({
     return isSaving
       ? false
       : secretValidation || eventTypeValidation || isEmpty(payloadUrl);
-  },
+  }
 
   @action
   async save() {
@@ -93,9 +97,9 @@ export default Controller.extend({
 
       this.set("saved", true);
       this.adminWebHooks.model.addObject(this.model);
-      this.transitionToRoute("adminWebHooks.show", this.model);
+      this.router.transitionTo("adminWebHooks.show", this.model);
     } catch (e) {
       popupAjaxError(e);
     }
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-index.js b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-index.js
index a1294cf09d7..865fbad990c 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-index.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-index.js
@@ -1,18 +1,19 @@
+import { inject as service } from "@ember/service";
+import { alias } from "@ember/object/computed";
 import Controller, { inject as controller } from "@ember/controller";
 import I18n from "I18n";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import { inject as service } from "@ember/service";
 import { action } from "@ember/object";
-import { alias } from "@ember/object/computed";
 
-export default Controller.extend({
-  adminWebHooks: controller(),
-  dialog: service(),
-  contentTypes: alias("adminWebHooks.contentTypes"),
-  defaultEventTypes: alias("adminWebHooks.defaultEventTypes"),
-  deliveryStatuses: alias("adminWebHooks.deliveryStatuses"),
-  eventTypes: alias("adminWebHooks.eventTypes"),
-  model: alias("adminWebHooks.model"),
+export default class AdminWebHooksIndexController extends Controller {
+  @service dialog;
+  @controller adminWebHooks;
+
+  @alias("adminWebHooks.contentTypes") contentTypes;
+  @alias("adminWebHooks.defaultEventTypes") defaultEventTypes;
+  @alias("adminWebHooks.deliveryStatuses") deliveryStatuses;
+  @alias("adminWebHooks.eventTypes") eventTypes;
+  @alias("adminWebHooks.model") model;
 
   @action
   destroy(webhook) {
@@ -27,10 +28,10 @@ export default Controller.extend({
         }
       },
     });
-  },
+  }
 
   @action
   loadMore() {
     this.model.loadMore();
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show.js b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show.js
index 38bef778fb4..0cb4ef04996 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show.js
@@ -1,18 +1,18 @@
+import { inject as service } from "@ember/service";
 import Controller, { inject as controller } from "@ember/controller";
 import { action } from "@ember/object";
 import I18n from "I18n";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import { inject as service } from "@ember/service";
 
-export default Controller.extend({
-  adminWebHooks: controller(),
-  dialog: service(),
-  router: service(),
+export default class AdminWebHooksShowController extends Controller {
+  @service dialog;
+  @service router;
+  @controller adminWebHooks;
 
   @action
   edit() {
     return this.router.transitionTo("adminWebHooks.edit", this.model);
-  },
+  }
 
   @action
   destroy() {
@@ -22,11 +22,11 @@ export default Controller.extend({
         try {
           await this.model.destroyRecord();
           this.adminWebHooks.model.removeObject(this.model);
-          this.transitionToRoute("adminWebHooks");
+          this.router.transitionTo("adminWebHooks");
         } catch (e) {
           popupAjaxError(e);
         }
       },
     });
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-web-hooks.js b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks.js
index fa4ba1ee7d2..6de7af26830 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-web-hooks.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks.js
@@ -1,3 +1,3 @@
 import Controller from "@ember/controller";
 
-export default Controller.extend({});
+export default class AdminWebHooksController extends Controller {}
diff --git a/app/assets/javascripts/admin/addon/controllers/admin.js b/app/assets/javascripts/admin/addon/controllers/admin.js
index 03838b789cd..9b802fe89e9 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin.js
@@ -1,20 +1,20 @@
+import { inject as service } from "@ember/service";
 import Controller from "@ember/controller";
 import { dasherize } from "@ember/string";
 import discourseComputed from "discourse-common/utils/decorators";
-import { inject as service } from "@ember/service";
 
-export default Controller.extend({
-  router: service(),
+export default class AdminController extends Controller {
+  @service router;
 
   @discourseComputed("siteSettings.enable_group_directory")
   showGroups(enableGroupDirectory) {
     return !enableGroupDirectory;
-  },
+  }
 
   @discourseComputed("siteSettings.enable_badges")
   showBadges(enableBadges) {
     return this.currentUser.get("admin") && enableBadges;
-  },
+  }
 
   @discourseComputed("router._router.currentPath")
   adminContentsClassName(currentPath) {
@@ -37,5 +37,5 @@ export default Controller.extend({
     }
 
     return cssClasses;
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-add-upload.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-add-upload.js
deleted file mode 100644
index 876ac3ae9ae..00000000000
--- a/app/assets/javascripts/admin/addon/controllers/modals/admin-add-upload.js
+++ /dev/null
@@ -1,142 +0,0 @@
-import Controller, { inject as controller } from "@ember/controller";
-import { and, not } from "@ember/object/computed";
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
-import I18n from "I18n";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import { ajax } from "discourse/lib/ajax";
-import { isEmpty } from "@ember/utils";
-import { popupAjaxError } from "discourse/lib/ajax-error";
-
-const THEME_FIELD_VARIABLE_TYPE_IDS = [2, 3, 4];
-
-const SCSS_VARIABLE_NAMES = [
-  // common/foundation/colors.scss
-  "primary",
-  "secondary",
-  "tertiary",
-  "quaternary",
-  "header_background",
-  "header_primary",
-  "highlight",
-  "danger",
-  "success",
-  "love",
-  // common/foundation/math.scss
-  "E",
-  "PI",
-  "LN2",
-  "SQRT2",
-  // common/foundation/variables.scss
-  "small-width",
-  "medium-width",
-  "large-width",
-  "google",
-  "instagram",
-  "facebook",
-  "cas",
-  "twitter",
-  "github",
-  "base-font-size",
-  "base-line-height",
-  "base-font-family",
-  "primary-low",
-  "primary-medium",
-  "secondary-low",
-  "secondary-medium",
-  "tertiary-low",
-  "quaternary-low",
-  "highlight-low",
-  "highlight-medium",
-  "danger-low",
-  "danger-medium",
-  "success-low",
-  "love-low",
-];
-
-export default Controller.extend(ModalFunctionality, {
-  adminCustomizeThemesShow: controller(),
-
-  uploadUrl: "/admin/themes/upload_asset",
-
-  onShow() {
-    this.set("name", null);
-    this.set("fileSelected", false);
-  },
-
-  enabled: and("nameValid", "fileSelected"),
-  disabled: not("enabled"),
-
-  @discourseComputed("name", "adminCustomizeThemesShow.model.theme_fields")
-  errorMessage(name, themeFields) {
-    if (name) {
-      if (!name.match(/^[a-z_][a-z0-9_-]*$/i)) {
-        return I18n.t(
-          "admin.customize.theme.variable_name_error.invalid_syntax"
-        );
-      } else if (SCSS_VARIABLE_NAMES.includes(name.toLowerCase())) {
-        return I18n.t("admin.customize.theme.variable_name_error.no_overwrite");
-      } else if (
-        themeFields.some(
-          (tf) =>
-            THEME_FIELD_VARIABLE_TYPE_IDS.includes(tf.type_id) &&
-            name === tf.name
-        )
-      ) {
-        return I18n.t(
-          "admin.customize.theme.variable_name_error.must_be_unique"
-        );
-      }
-    }
-
-    return null;
-  },
-
-  @discourseComputed("errorMessage")
-  nameValid(errorMessage) {
-    return null === errorMessage;
-  },
-
-  @observes("name")
-  uploadChanged() {
-    const file = $("#file-input")[0];
-    this.set("fileSelected", file && file.files[0]);
-  },
-
-  actions: {
-    updateName() {
-      let name = this.name;
-      if (isEmpty(name)) {
-        name = $("#file-input")[0].files[0].name;
-        this.set("name", name.split(".")[0]);
-      }
-      this.uploadChanged();
-    },
-
-    upload() {
-      const file = $("#file-input")[0].files[0];
-
-      const options = {
-        type: "POST",
-        processData: false,
-        contentType: false,
-        data: new FormData(),
-      };
-
-      options.data.append("file", file);
-
-      ajax(this.uploadUrl, options)
-        .then((result) => {
-          const upload = {
-            upload_id: result.upload_id,
-            name: this.name,
-            original_filename: file.name,
-          };
-          this.adminCustomizeThemesShow.send("addUpload", upload);
-          this.send("closeModal");
-        })
-        .catch((e) => {
-          popupAjaxError(e);
-        });
-    },
-  },
-});
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-badge-preview.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-badge-preview.js
index 322436303f9..f86c04e56e2 100644
--- a/app/assets/javascripts/admin/addon/controllers/modals/admin-badge-preview.js
+++ b/app/assets/javascripts/admin/addon/controllers/modals/admin-badge-preview.js
@@ -4,39 +4,12 @@ import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { escapeExpression } from "discourse/lib/utilities";
 
-export default Controller.extend({
-  sample: alias("model.sample"),
-  errors: alias("model.errors"),
-  count: alias("model.grant_count"),
+export default class AdminBadgePreviewController extends Controller {
+  @alias("model.sample") sample;
+  @alias("model.errors") errors;
+  @alias("model.grant_count") count;
 
-  @discourseComputed("count", "sample.length")
-  countWarning(count, sampleLength) {
-    if (count <= 10) {
-      return sampleLength !== count;
-    } else {
-      return sampleLength !== 10;
-    }
-  },
-
-  @discourseComputed("model.query_plan")
-  hasQueryPlan(queryPlan) {
-    return !!queryPlan;
-  },
-
-  @discourseComputed("model.query_plan")
-  queryPlanHtml(queryPlan) {
-    let output = `<pre class="badge-query-plan">`;
-
-    queryPlan.forEach((linehash) => {
-      output += escapeExpression(linehash["QUERY PLAN"]);
-      output += "<br>";
-    });
-
-    output += "</pre>";
-    return output;
-  },
-
-  processedSample: map("model.sample", (grant) => {
+  @map("model.sample", (grant) => {
     let i18nKey = "admin.badges.preview.grant.with";
     const i18nParams = { username: escapeExpression(grant.username) };
 
@@ -55,5 +28,33 @@ export default Controller.extend({
     }
 
     return I18n.t(i18nKey, i18nParams);
-  }),
-});
+  })
+  processedSample;
+
+  @discourseComputed("count", "sample.length")
+  countWarning(count, sampleLength) {
+    if (count <= 10) {
+      return sampleLength !== count;
+    } else {
+      return sampleLength !== 10;
+    }
+  }
+
+  @discourseComputed("model.query_plan")
+  hasQueryPlan(queryPlan) {
+    return !!queryPlan;
+  }
+
+  @discourseComputed("model.query_plan")
+  queryPlanHtml(queryPlan) {
+    let output = `<pre class="badge-query-plan">`;
+
+    queryPlan.forEach((linehash) => {
+      output += escapeExpression(linehash["QUERY PLAN"]);
+      output += "<br>";
+    });
+
+    output += "</pre>";
+    return output;
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-color-scheme-select-base.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-color-scheme-select-base.js
index 07f673728fe..81892e0404b 100644
--- a/app/assets/javascripts/admin/addon/controllers/modals/admin-color-scheme-select-base.js
+++ b/app/assets/javascripts/admin/addon/controllers/modals/admin-color-scheme-select-base.js
@@ -1,27 +1,29 @@
+import { action } from "@ember/object";
 import Controller, { inject as controller } from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
-export default Controller.extend(ModalFunctionality, {
-  adminCustomizeColors: controller(),
+export default class AdminColorSchemeSelectBaseController extends Controller.extend(
+  ModalFunctionality
+) {
+  @controller adminCustomizeColors;
 
-  selectedBaseThemeId: null,
+  selectedBaseThemeId = null;
 
   init() {
-    this._super(...arguments);
+    super.init(...arguments);
 
     const defaultScheme = this.get(
       "adminCustomizeColors.baseColorSchemes.0.base_scheme_id"
     );
     this.set("selectedBaseThemeId", defaultScheme);
-  },
+  }
 
-  actions: {
-    selectBase() {
-      this.adminCustomizeColors.send(
-        "newColorSchemeWithBase",
-        this.selectedBaseThemeId
-      );
-      this.send("closeModal");
-    },
-  },
-});
+  @action
+  selectBase() {
+    this.adminCustomizeColors.send(
+      "newColorSchemeWithBase",
+      this.selectedBaseThemeId
+    );
+    this.send("closeModal");
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-delete-posts-confirmation.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-delete-posts-confirmation.js
deleted file mode 100644
index 106b459f0ce..00000000000
--- a/app/assets/javascripts/admin/addon/controllers/modals/admin-delete-posts-confirmation.js
+++ /dev/null
@@ -1,46 +0,0 @@
-import Controller, { inject as controller } from "@ember/controller";
-import I18n from "I18n";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import { action } from "@ember/object";
-import { alias } from "@ember/object/computed";
-import discourseComputed from "discourse-common/utils/decorators";
-
-export default Controller.extend(ModalFunctionality, {
-  adminUserIndex: controller(),
-  username: alias("model.username"),
-  postCount: alias("model.post_count"),
-
-  onShow() {
-    this.set("value", null);
-  },
-
-  @discourseComputed("username", "postCount")
-  text(username, postCount) {
-    return I18n.t(`admin.user.delete_posts.confirmation.text`, {
-      username,
-      postCount,
-    });
-  },
-
-  @discourseComputed("username")
-  deleteButtonText(username) {
-    return I18n.t(`admin.user.delete_posts.confirmation.delete`, {
-      username,
-    });
-  },
-
-  @discourseComputed("value", "text")
-  deleteDisabled(value, text) {
-    return !value || text !== value;
-  },
-
-  @action
-  confirm() {
-    this.adminUserIndex.send("deleteAllPosts");
-  },
-
-  @action
-  close() {
-    this.send("closeModal");
-  },
-});
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-delete-user-posts-progress.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-delete-user-posts-progress.js
index 61b9bae999c..62723a4ab3f 100644
--- a/app/assets/javascripts/admin/addon/controllers/modals/admin-delete-user-posts-progress.js
+++ b/app/assets/javascripts/admin/addon/controllers/modals/admin-delete-user-posts-progress.js
@@ -1,6 +1,8 @@
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
-export default Controller.extend(ModalFunctionality, {
-  deletedPercentage: 0,
-});
+export default class AdminDeleteUserPostsProgressController extends Controller.extend(
+  ModalFunctionality
+) {
+  deletedPercentage = 0;
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-edit-badge-groupings.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-edit-badge-groupings.js
index c453a4f8b41..d23b9131ed1 100644
--- a/app/assets/javascripts/admin/addon/controllers/modals/admin-edit-badge-groupings.js
+++ b/app/assets/javascripts/admin/addon/controllers/modals/admin-edit-badge-groupings.js
@@ -1,13 +1,16 @@
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
 import { A } from "@ember/array";
 import Controller from "@ember/controller";
 import I18n from "I18n";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
 import { observes } from "discourse-common/utils/decorators";
-import { inject as service } from "@ember/service";
 
-export default Controller.extend(ModalFunctionality, {
-  dialog: service(),
+export default class AdminEditBadgeGroupingsController extends Controller.extend(
+  ModalFunctionality
+) {
+  @service dialog;
 
   @observes("model")
   modelChanged() {
@@ -22,7 +25,7 @@ export default Controller.extend(ModalFunctionality, {
     }
 
     this.set("workingCopy", copy);
-  },
+  }
 
   moveItem(item, delta) {
     const copy = this.workingCopy;
@@ -33,55 +36,68 @@ export default Controller.extend(ModalFunctionality, {
 
     copy.removeAt(index);
     copy.insertAt(index + delta, item);
-  },
+  }
 
-  actions: {
-    up(item) {
-      this.moveItem(item, -1);
-    },
-    down(item) {
-      this.moveItem(item, 1);
-    },
-    delete(item) {
-      this.workingCopy.removeObject(item);
-    },
-    cancel() {
-      this.setProperties({ model: null, workingCopy: null });
-      this.send("closeModal");
-    },
-    edit(item) {
-      item.set("editing", true);
-    },
-    save(item) {
-      item.set("editing", false);
-    },
-    add() {
-      const obj = this.store.createRecord("badge-grouping", {
-        editing: true,
-        name: I18n.t("admin.badges.badge_grouping"),
-      });
-      this.workingCopy.pushObject(obj);
-    },
-    saveAll() {
-      let items = this.workingCopy;
-      const groupIds = items.map((i) => i.get("id") || -1);
-      const names = items.map((i) => i.get("name"));
+  @action
+  up(item) {
+    this.moveItem(item, -1);
+  }
 
-      ajax("/admin/badges/badge_groupings", {
-        data: { ids: groupIds, names },
-        type: "POST",
-      }).then(
-        (data) => {
-          items = this.model;
-          items.clear();
-          data.badge_groupings.forEach((g) => {
-            items.pushObject(this.store.createRecord("badge-grouping", g));
-          });
-          this.setProperties({ model: null, workingCopy: null });
-          this.send("closeModal");
-        },
-        () => this.dialog.alert(I18n.t("generic_error"))
-      );
-    },
-  },
-});
+  @action
+  down(item) {
+    this.moveItem(item, 1);
+  }
+
+  @action
+  delete(item) {
+    this.workingCopy.removeObject(item);
+  }
+
+  @action
+  cancel() {
+    this.setProperties({ model: null, workingCopy: null });
+    this.send("closeModal");
+  }
+
+  @action
+  edit(item) {
+    item.set("editing", true);
+  }
+
+  @action
+  save(item) {
+    item.set("editing", false);
+  }
+
+  @action
+  add() {
+    const obj = this.store.createRecord("badge-grouping", {
+      editing: true,
+      name: I18n.t("admin.badges.badge_grouping"),
+    });
+    this.workingCopy.pushObject(obj);
+  }
+
+  @action
+  saveAll() {
+    let items = this.workingCopy;
+    const groupIds = items.map((i) => i.get("id") || -1);
+    const names = items.map((i) => i.get("name"));
+
+    ajax("/admin/badges/badge_groupings", {
+      data: { ids: groupIds, names },
+      type: "POST",
+    }).then(
+      (data) => {
+        items = this.model;
+        items.clear();
+        data.badge_groupings.forEach((g) => {
+          items.pushObject(this.store.createRecord("badge-grouping", g));
+        });
+        this.setProperties({ model: null, workingCopy: null });
+        this.send("closeModal");
+      },
+      () => this.dialog.alert(I18n.t("generic_error"))
+    );
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-form-template-validation-options.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-form-template-validation-options.js
new file mode 100644
index 00000000000..0b8457b16a4
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/controllers/modals/admin-form-template-validation-options.js
@@ -0,0 +1,35 @@
+import Controller from "@ember/controller";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import I18n from "I18n";
+
+export default class AdminFormTemplateValidationOptions extends Controller.extend(
+  ModalFunctionality
+) {
+  TABLE_HEADER_KEYS = ["key", "type", "description"];
+  VALIDATION_KEYS = ["required", "minimum", "maximum", "pattern", "type"];
+
+  get tableHeaders() {
+    const translatedHeaders = [];
+    this.TABLE_HEADER_KEYS.forEach((header) => {
+      translatedHeaders.push(
+        I18n.t(`admin.form_templates.validations_modal.table_headers.${header}`)
+      );
+    });
+
+    return translatedHeaders;
+  }
+
+  get validations() {
+    const translatedValidations = [];
+    const prefix = "admin.form_templates.validations_modal.validations";
+    this.VALIDATION_KEYS.forEach((validation) => {
+      translatedValidations.push({
+        key: I18n.t(`${prefix}.${validation}.key`),
+        type: I18n.t(`${prefix}.${validation}.type`),
+        description: I18n.t(`${prefix}.${validation}.description`),
+      });
+    });
+
+    return translatedValidations;
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-incoming-email.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-incoming-email.js
deleted file mode 100644
index 6055baa1fe4..00000000000
--- a/app/assets/javascripts/admin/addon/controllers/modals/admin-incoming-email.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import Controller from "@ember/controller";
-import IncomingEmail from "admin/models/incoming-email";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import discourseComputed from "discourse-common/utils/decorators";
-import { longDate } from "discourse/lib/formatter";
-import { popupAjaxError } from "discourse/lib/ajax-error";
-
-export default Controller.extend(ModalFunctionality, {
-  @discourseComputed("model.date")
-  date(d) {
-    return longDate(d);
-  },
-
-  load(id) {
-    return IncomingEmail.find(id).then((result) => this.set("model", result));
-  },
-
-  loadFromBounced(id) {
-    return IncomingEmail.findByBounced(id)
-      .then((result) => this.set("model", result))
-      .catch((error) => {
-        this.send("closeModal");
-        popupAjaxError(error);
-      });
-  },
-});
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-install-theme.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-install-theme.js
index a3553d8f7cb..500654d2dcc 100644
--- a/app/assets/javascripts/admin/addon/controllers/modals/admin-install-theme.js
+++ b/app/assets/javascripts/admin/addon/controllers/modals/admin-install-theme.js
@@ -1,46 +1,46 @@
+import { alias, equal, match } from "@ember/object/computed";
 import { COMPONENTS, THEMES } from "admin/models/theme";
 import Controller, { inject as controller } from "@ember/controller";
-import { alias, equal, match } from "@ember/object/computed";
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import discourseComputed from "discourse-common/utils/decorators";
+import { observes } from "@ember-decorators/object";
 import I18n from "I18n";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
-import { POPULAR_THEMES } from "discourse-common/helpers/popular-themes";
+import { POPULAR_THEMES } from "discourse-common/lib/popular-themes";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import { set } from "@ember/object";
+import { action, set } from "@ember/object";
 
 const MIN_NAME_LENGTH = 4;
 
-export default Controller.extend(ModalFunctionality, {
-  adminCustomizeThemes: controller(),
-  themesController: controller("adminCustomizeThemes"),
-  popular: equal("selection", "popular"),
-  local: equal("selection", "local"),
-  remote: equal("selection", "remote"),
-  create: equal("selection", "create"),
-  directRepoInstall: equal("selection", "directRepoInstall"),
-  selection: "popular",
-  loading: false,
-  keyGenUrl: "/admin/themes/generate_key_pair",
-  importUrl: "/admin/themes/import",
-  recordType: "theme",
-  checkPrivate: match("uploadUrl", /^ssh:\/\/.+@.+$|.+@.+:.+$/),
-  localFile: null,
-  uploadUrl: null,
-  uploadName: null,
-  advancedVisible: false,
-  selectedType: alias("themesController.currentTab"),
-  component: equal("selectedType", COMPONENTS),
-  urlPlaceholder: "https://github.com/discourse/sample_theme",
+export default class AdminInstallThemeController extends Controller.extend(
+  ModalFunctionality
+) {
+  @controller adminCustomizeThemes;
+  @controller("adminCustomizeThemes") themesController;
 
-  init() {
-    this._super(...arguments);
+  @equal("selection", "popular") popular;
+  @equal("selection", "local") local;
+  @equal("selection", "remote") remote;
+  @equal("selection", "create") create;
+  @equal("selection", "directRepoInstall") directRepoInstall;
+  selection = "popular";
+  loading = false;
+  keyGenUrl = "/admin/themes/generate_key_pair";
+  importUrl = "/admin/themes/import";
+  recordType = "theme";
+  @match("uploadUrl", /^ssh:\/\/.+@.+$|.+@.+:.+$/) checkPrivate;
+  localFile = null;
+  uploadUrl = null;
+  uploadName = null;
+  advancedVisible = false;
+  @alias("themesController.currentTab") selectedType;
+  @equal("selectedType", COMPONENTS) component;
+  urlPlaceholder = "https://github.com/discourse/sample_theme";
 
-    this.createTypes = [
-      { name: I18n.t("admin.customize.theme.theme"), value: THEMES },
-      { name: I18n.t("admin.customize.theme.component"), value: COMPONENTS },
-    ];
-  },
+  createTypes = [
+    { name: I18n.t("admin.customize.theme.theme"), value: THEMES },
+    { name: I18n.t("admin.customize.theme.component"), value: COMPONENTS },
+  ];
 
   @discourseComputed("themesController.installedThemes")
   themes(installedThemes) {
@@ -52,7 +52,7 @@ export default Controller.extend(ModalFunctionality, {
       }
       return t;
     });
-  },
+  }
 
   @discourseComputed(
     "loading",
@@ -78,12 +78,12 @@ export default Controller.extend(ModalFunctionality, {
       (isLocal && !localFile) ||
       (isCreate && nameTooShort)
     );
-  },
+  }
 
   @discourseComputed("name")
   nameTooShort(name) {
     return !name || name.length < MIN_NAME_LENGTH;
-  },
+  }
 
   @discourseComputed("component")
   placeholder(component) {
@@ -92,7 +92,7 @@ export default Controller.extend(ModalFunctionality, {
     } else {
       return I18n.t("admin.customize.theme.theme_name");
     }
-  },
+  }
 
   @observes("checkPrivate")
   privateWasChecked() {
@@ -108,7 +108,7 @@ export default Controller.extend(ModalFunctionality, {
           this._keyLoading = false;
         });
     }
-  },
+  }
 
   @discourseComputed("selection", "themeCannotBeInstalled")
   submitLabel(selection, themeCannotBeInstalled) {
@@ -119,12 +119,12 @@ export default Controller.extend(ModalFunctionality, {
     return `admin.customize.theme.${
       selection === "create" ? "create" : "install"
     }`;
-  },
+  }
 
   @discourseComputed("checkPrivate", "publicKey")
   showPublicKey(checkPrivate, publicKey) {
     return checkPrivate && publicKey;
-  },
+  }
 
   onClose() {
     this.setProperties({
@@ -135,7 +135,12 @@ export default Controller.extend(ModalFunctionality, {
       branch: null,
       selection: "popular",
     });
-  },
+
+    this.themesController.setProperties({
+      repoName: null,
+      repoUrl: null,
+    });
+  }
 
   themeHasSameUrl(theme, url) {
     const themeUrl = theme.remote_theme && theme.remote_theme.remote_url;
@@ -144,100 +149,101 @@ export default Controller.extend(ModalFunctionality, {
       url &&
       url.replace(/\.git$/, "") === themeUrl.replace(/\.git$/, "")
     );
-  },
+  }
 
-  actions: {
-    uploadLocaleFile() {
-      this.set("localFile", $("#file-input")[0].files[0]);
-    },
+  @action
+  uploadLocaleFile() {
+    this.set("localFile", $("#file-input")[0].files[0]);
+  }
 
-    toggleAdvanced() {
-      this.toggleProperty("advancedVisible");
-    },
+  @action
+  toggleAdvanced() {
+    this.toggleProperty("advancedVisible");
+  }
 
-    installThemeFromList(url) {
-      this.set("uploadUrl", url);
-      this.send("installTheme");
-    },
-
-    installTheme() {
-      if (this.create) {
-        this.set("loading", true);
-        const theme = this.store.createRecord(this.recordType);
-        theme
-          .save({ name: this.name, component: this.component })
-          .then(() => {
-            this.themesController.send("addTheme", theme);
-            this.send("closeModal");
-          })
-          .catch(popupAjaxError)
-          .finally(() => this.set("loading", false));
-
-        return;
-      }
-
-      let options = {
-        type: "POST",
-      };
-
-      if (this.local) {
-        options.processData = false;
-        options.contentType = false;
-        options.data = new FormData();
-        options.data.append("theme", this.localFile);
-      }
-
-      if (this.remote || this.popular || this.directRepoInstall) {
-        const duplicate = this.themesController.model.content.find((theme) =>
-          this.themeHasSameUrl(theme, this.uploadUrl)
-        );
-        if (duplicate && !this.duplicateRemoteThemeWarning) {
-          const warning = I18n.t(
-            "admin.customize.theme.duplicate_remote_theme",
-            { name: duplicate.name }
-          );
-          this.set("duplicateRemoteThemeWarning", warning);
-          return;
-        }
-        options.data = {
-          remote: this.uploadUrl,
-          branch: this.branch,
-          public_key: this.publicKey,
-        };
-      }
-
-      // User knows that theme cannot be installed, but they want to continue
-      // to force install it.
-      if (this.themeCannotBeInstalled) {
-        options.data["force"] = true;
-      }
-
-      if (this.get("model.user_id")) {
-        // Used by theme-creator
-        options.data["user_id"] = this.get("model.user_id");
-      }
+  @action
+  installThemeFromList(url) {
+    this.set("uploadUrl", url);
+    this.send("installTheme");
+  }
 
+  @action
+  installTheme() {
+    if (this.create) {
       this.set("loading", true);
-      ajax(this.importUrl, options)
-        .then((result) => {
-          const theme = this.store.createRecord(this.recordType, result.theme);
-          this.adminCustomizeThemes.send("addTheme", theme);
+      const theme = this.store.createRecord(this.recordType);
+      theme
+        .save({ name: this.name, component: this.component })
+        .then(() => {
+          this.themesController.send("addTheme", theme);
           this.send("closeModal");
         })
-        .then(() => {
-          this.set("publicKey", null);
-        })
-        .catch((error) => {
-          if (!this.publicKey || this.themeCannotBeInstalled) {
-            return popupAjaxError(error);
-          }
-
-          this.set(
-            "themeCannotBeInstalled",
-            I18n.t("admin.customize.theme.force_install")
-          );
-        })
+        .catch(popupAjaxError)
         .finally(() => this.set("loading", false));
-    },
-  },
-});
+
+      return;
+    }
+
+    let options = {
+      type: "POST",
+    };
+
+    if (this.local) {
+      options.processData = false;
+      options.contentType = false;
+      options.data = new FormData();
+      options.data.append("theme", this.localFile);
+    }
+
+    if (this.remote || this.popular || this.directRepoInstall) {
+      const duplicate = this.themesController.model.content.find((theme) =>
+        this.themeHasSameUrl(theme, this.uploadUrl)
+      );
+      if (duplicate && !this.duplicateRemoteThemeWarning) {
+        const warning = I18n.t("admin.customize.theme.duplicate_remote_theme", {
+          name: duplicate.name,
+        });
+        this.set("duplicateRemoteThemeWarning", warning);
+        return;
+      }
+      options.data = {
+        remote: this.uploadUrl,
+        branch: this.branch,
+        public_key: this.publicKey,
+      };
+    }
+
+    // User knows that theme cannot be installed, but they want to continue
+    // to force install it.
+    if (this.themeCannotBeInstalled) {
+      options.data["force"] = true;
+    }
+
+    if (this.get("model.user_id")) {
+      // Used by theme-creator
+      options.data["user_id"] = this.get("model.user_id");
+    }
+
+    this.set("loading", true);
+    ajax(this.importUrl, options)
+      .then((result) => {
+        const theme = this.store.createRecord(this.recordType, result.theme);
+        this.adminCustomizeThemes.send("addTheme", theme);
+        this.send("closeModal");
+      })
+      .then(() => {
+        this.set("publicKey", null);
+      })
+      .catch((error) => {
+        if (!this.publicKey || this.themeCannotBeInstalled) {
+          return popupAjaxError(error);
+        }
+
+        this.set(
+          "themeCannotBeInstalled",
+          I18n.t("admin.customize.theme.force_install")
+        );
+      })
+      .finally(() => this.set("loading", false));
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-merge-users-confirmation.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-merge-users-confirmation.js
index 7c37ddd0179..24c23e8ed51 100644
--- a/app/assets/javascripts/admin/addon/controllers/modals/admin-merge-users-confirmation.js
+++ b/app/assets/javascripts/admin/addon/controllers/modals/admin-merge-users-confirmation.js
@@ -1,18 +1,21 @@
+import { alias } from "@ember/object/computed";
 import Controller, { inject as controller } from "@ember/controller";
 import I18n from "I18n";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { action } from "@ember/object";
-import { alias } from "@ember/object/computed";
 import discourseComputed from "discourse-common/utils/decorators";
 
-export default Controller.extend(ModalFunctionality, {
-  adminUserIndex: controller(),
-  username: alias("model.username"),
-  targetUsername: alias("model.targetUsername"),
+export default class AdminMergeUsersConfirmationController extends Controller.extend(
+  ModalFunctionality
+) {
+  @controller adminUserIndex;
+
+  @alias("model.username") username;
+  @alias("model.targetUsername") targetUsername;
 
   onShow() {
     this.set("value", null);
-  },
+  }
 
   @discourseComputed("username", "targetUsername")
   text(username, targetUsername) {
@@ -20,28 +23,28 @@ export default Controller.extend(ModalFunctionality, {
       username,
       targetUsername,
     });
-  },
+  }
 
   @discourseComputed("username")
   mergeButtonText(username) {
     return I18n.t(`admin.user.merge.confirmation.transfer_and_delete`, {
       username,
     });
-  },
+  }
 
   @discourseComputed("value", "text")
   mergeDisabled(value, text) {
     return !value || text !== value;
-  },
+  }
 
   @action
   confirm() {
     this.adminUserIndex.send("merge", this.targetUsername);
     this.send("closeModal");
-  },
+  }
 
   @action
   close() {
     this.send("closeModal");
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-merge-users-progress.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-merge-users-progress.js
index bdbcf2d220c..3c16b7539bd 100644
--- a/app/assets/javascripts/admin/addon/controllers/modals/admin-merge-users-progress.js
+++ b/app/assets/javascripts/admin/addon/controllers/modals/admin-merge-users-progress.js
@@ -4,16 +4,18 @@ import I18n from "I18n";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { bind } from "discourse-common/utils/decorators";
 
-export default Controller.extend(ModalFunctionality, {
-  message: I18n.t("admin.user.merging_user"),
+export default class AdminMergeUsersProgressController extends Controller.extend(
+  ModalFunctionality
+) {
+  message = I18n.t("admin.user.merging_user");
 
   onShow() {
     this.messageBus.subscribe("/merge_user", this.onMessage);
-  },
+  }
 
   onClose() {
     this.messageBus.unsubscribe("/merge_user", this.onMessage);
-  },
+  }
 
   @bind
   onMessage(data) {
@@ -30,5 +32,5 @@ export default Controller.extend(ModalFunctionality, {
     } else if (data.failed) {
       this.set("message", I18n.t("admin.user.merge_failed"));
     }
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-merge-users-prompt.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-merge-users-prompt.js
index 46e23305f2b..3b2b86bf4ff 100644
--- a/app/assets/javascripts/admin/addon/controllers/modals/admin-merge-users-prompt.js
+++ b/app/assets/javascripts/admin/addon/controllers/modals/admin-merge-users-prompt.js
@@ -1,43 +1,46 @@
+import { alias } from "@ember/object/computed";
 import Controller, { inject as controller } from "@ember/controller";
 import I18n from "I18n";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { action, get } from "@ember/object";
-import { alias } from "@ember/object/computed";
 import discourseComputed from "discourse-common/utils/decorators";
 
-export default Controller.extend(ModalFunctionality, {
-  adminUserIndex: controller(),
-  username: alias("model.username"),
+export default class AdminMergeUsersPromptController extends Controller.extend(
+  ModalFunctionality
+) {
+  @controller adminUserIndex;
+
+  @alias("model.username") username;
 
   onShow() {
     this.set("targetUsername", null);
-  },
+  }
 
   @discourseComputed("username", "targetUsername")
   mergeDisabled(username, targetUsername) {
     return !targetUsername || username === targetUsername;
-  },
+  }
 
   @discourseComputed("username")
   mergeButtonText(username) {
     return I18n.t(`admin.user.merge.confirmation.transfer_and_delete`, {
       username,
     });
-  },
+  }
 
   @action
   showConfirmation() {
     this.send("closeModal");
     this.adminUserIndex.send("showMergeConfirmation", this.targetUsername);
-  },
+  }
 
   @action
   close() {
     this.send("closeModal");
-  },
+  }
 
   @action
   updateUsername(selected) {
     this.set("targetUsername", get(selected, "firstObject"));
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-penalize-user.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-penalize-user.js
index 4120bc34ff4..2fde82fe8f2 100644
--- a/app/assets/javascripts/admin/addon/controllers/modals/admin-penalize-user.js
+++ b/app/assets/javascripts/admin/addon/controllers/modals/admin-penalize-user.js
@@ -1,29 +1,31 @@
+import { inject as service } from "@ember/service";
 import Controller from "@ember/controller";
 import { action } from "@ember/object";
 import { next } from "@ember/runloop";
-import { inject as service } from "@ember/service";
 import { isEmpty } from "@ember/utils";
 import discourseComputed from "discourse-common/utils/decorators";
 import { extractError } from "discourse/lib/ajax-error";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import I18n from "I18n";
 
-export default Controller.extend(ModalFunctionality, {
-  dialog: service(),
+export default class AdminPenalizeUserController extends Controller.extend(
+  ModalFunctionality
+) {
+  @service dialog;
 
-  loadingUser: false,
-  errorMessage: null,
-  penaltyType: null,
-  penalizeUntil: null,
-  reason: null,
-  message: null,
-  postId: null,
-  postAction: null,
-  postEdit: null,
-  user: null,
-  otherUserIds: null,
-  loading: false,
-  confirmClose: false,
+  loadingUser = false;
+  errorMessage = null;
+  penaltyType = null;
+  penalizeUntil = null;
+  reason = null;
+  message = null;
+  postId = null;
+  postAction = null;
+  postEdit = null;
+  user = null;
+  otherUserIds = null;
+  loading = false;
+  confirmClose = false;
 
   onShow() {
     this.setProperties({
@@ -44,11 +46,11 @@ export default Controller.extend(ModalFunctionality, {
       message: null,
       confirmClose: false,
     });
-  },
+  }
 
   finishedSetup() {
     this.set("penalizeUntil", this.user?.next_penalty);
-  },
+  }
 
   beforeClose() {
     if (this.confirmClose) {
@@ -73,7 +75,7 @@ export default Controller.extend(ModalFunctionality, {
 
       return false;
     }
-  },
+  }
 
   @discourseComputed("penaltyType")
   modalTitle(penaltyType) {
@@ -82,7 +84,7 @@ export default Controller.extend(ModalFunctionality, {
     } else if (penaltyType === "silence") {
       return "admin.user.silence_modal_title";
     }
-  },
+  }
 
   @discourseComputed("penaltyType")
   buttonLabel(penaltyType) {
@@ -91,7 +93,7 @@ export default Controller.extend(ModalFunctionality, {
     } else if (penaltyType === "silence") {
       return "admin.user.silence";
     }
-  },
+  }
 
   @discourseComputed(
     "user.penalty_counts.suspended",
@@ -102,7 +104,7 @@ export default Controller.extend(ModalFunctionality, {
       SUSPENDED: suspendedCount,
       SILENCED: silencedCount,
     });
-  },
+  }
 
   @discourseComputed("penaltyType", "user.canSuspend", "user.canSilence")
   canPenalize(penaltyType, canSuspend, canSilence) {
@@ -113,12 +115,12 @@ export default Controller.extend(ModalFunctionality, {
     }
 
     return false;
-  },
+  }
 
   @discourseComputed("penalizing", "penalizeUntil", "reason")
   submitDisabled(penalizing, penalizeUntil, reason) {
     return penalizing || isEmpty(penalizeUntil) || !reason || reason.length < 1;
-  },
+  }
 
   @action
   async penalizeUser() {
@@ -164,5 +166,5 @@ export default Controller.extend(ModalFunctionality, {
     } finally {
       this.set("penalizing", false);
     }
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-reseed.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-reseed.js
index 744921b02a5..bc84df55b49 100644
--- a/app/assets/javascripts/admin/addon/controllers/modals/admin-reseed.js
+++ b/app/assets/javascripts/admin/addon/controllers/modals/admin-reseed.js
@@ -1,15 +1,19 @@
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
 import Controller from "@ember/controller";
 import I18n from "I18n";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
-import { inject as service } from "@ember/service";
 
-export default Controller.extend(ModalFunctionality, {
-  dialog: service(),
-  loading: true,
-  reseeding: false,
-  categories: null,
-  topics: null,
+export default class AdminReseedController extends Controller.extend(
+  ModalFunctionality
+) {
+  @service dialog;
+
+  loading = true;
+  reseeding = false;
+  categories = null;
+  topics = null;
 
   onShow() {
     ajax("/admin/customize/reseed")
@@ -20,27 +24,26 @@ export default Controller.extend(ModalFunctionality, {
         });
       })
       .finally(() => this.set("loading", false));
-  },
+  }
 
   _extractSelectedIds(items) {
     return items.filter((item) => item.selected).map((item) => item.id);
-  },
+  }
 
-  actions: {
-    reseed() {
-      this.set("reseeding", true);
-      ajax("/admin/customize/reseed", {
-        data: {
-          category_ids: this._extractSelectedIds(this.categories),
-          topic_ids: this._extractSelectedIds(this.topics),
-        },
-        type: "POST",
-      })
-        .catch(() => this.dialog.alert(I18n.t("generic_error")))
-        .finally(() => {
-          this.set("reseeding", false);
-          this.send("closeModal");
-        });
-    },
-  },
-});
+  @action
+  reseed() {
+    this.set("reseeding", true);
+    ajax("/admin/customize/reseed", {
+      data: {
+        category_ids: this._extractSelectedIds(this.categories),
+        topic_ids: this._extractSelectedIds(this.topics),
+      },
+      type: "POST",
+    })
+      .catch(() => this.dialog.alert(I18n.t("generic_error")))
+      .finally(() => {
+        this.set("reseeding", false);
+        this.send("closeModal");
+      });
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-staff-action-log-details.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-staff-action-log-details.js
index 06110e01130..7859abf24aa 100644
--- a/app/assets/javascripts/admin/addon/controllers/modals/admin-staff-action-log-details.js
+++ b/app/assets/javascripts/admin/addon/controllers/modals/admin-staff-action-log-details.js
@@ -1,4 +1,6 @@
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
-export default Controller.extend(ModalFunctionality);
+export default class AdminStaffActionLogDetailsController extends Controller.extend(
+  ModalFunctionality
+) {}
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-start-backup.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-start-backup.js
index f60908b0e2a..39e859cd8b7 100644
--- a/app/assets/javascripts/admin/addon/controllers/modals/admin-start-backup.js
+++ b/app/assets/javascripts/admin/addon/controllers/modals/admin-start-backup.js
@@ -1,35 +1,39 @@
+import { action } from "@ember/object";
 import Controller, { inject as controller } from "@ember/controller";
 import discourseComputed from "discourse-common/utils/decorators";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
-export default Controller.extend(ModalFunctionality, {
-  adminBackupsLogs: controller(),
+export default class AdminStartBackupController extends Controller.extend(
+  ModalFunctionality
+) {
+  @controller adminBackupsLogs;
 
   @discourseComputed
   warningMessage() {
     // this is never shown here, but we may want to show different
     // messages in plugins
     return "";
-  },
+  }
 
   @discourseComputed
   yesLabel() {
     return "yes_value";
-  },
+  }
 
-  actions: {
-    startBackupWithUploads() {
-      this.send("closeModal");
-      this.send("startBackup", true);
-    },
+  @action
+  startBackupWithUploads() {
+    this.send("closeModal");
+    this.send("startBackup", true);
+  }
 
-    startBackupWithoutUploads() {
-      this.send("closeModal");
-      this.send("startBackup", false);
-    },
+  @action
+  startBackupWithoutUploads() {
+    this.send("closeModal");
+    this.send("startBackup", false);
+  }
 
-    cancel() {
-      this.send("closeModal");
-    },
-  },
-});
+  @action
+  cancel() {
+    this.send("closeModal");
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-theme-change.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-theme-change.js
index 3f58f36d2e1..56e85076019 100644
--- a/app/assets/javascripts/admin/addon/controllers/modals/admin-theme-change.js
+++ b/app/assets/javascripts/admin/addon/controllers/modals/admin-theme-change.js
@@ -2,7 +2,9 @@ import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
 
-export default Controller.extend(ModalFunctionality, {
+export default class AdminThemeChangeController extends Controller.extend(
+  ModalFunctionality
+) {
   loadDiff() {
     this.set("loading", true);
     ajax(
@@ -11,5 +13,5 @@ export default Controller.extend(ModalFunctionality, {
       this.set("loading", false);
       this.set("diff", diff.side_by_side);
     });
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-uploaded-image-list.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-uploaded-image-list.js
index 8a60037a5ba..0b1503a83d7 100644
--- a/app/assets/javascripts/admin/addon/controllers/modals/admin-uploaded-image-list.js
+++ b/app/assets/javascripts/admin/addon/controllers/modals/admin-uploaded-image-list.js
@@ -1,30 +1,32 @@
-import { observes, on } from "discourse-common/utils/decorators";
+import { observes, on } from "@ember-decorators/object";
 import Controller from "@ember/controller";
 import { action } from "@ember/object";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
-export default Controller.extend(ModalFunctionality, {
+export default class AdminUploadedImageListController extends Controller.extend(
+  ModalFunctionality
+) {
   @on("init")
   @observes("model.value")
   _setup() {
     const value = this.get("model.value");
     this.set("images", value && value.length ? value.split("|") : []);
-  },
+  }
 
   @action
   remove(url, event) {
     event?.preventDefault();
     this.images.removeObject(url);
-  },
+  }
 
-  actions: {
-    uploadDone({ url }) {
-      this.images.addObject(url);
-    },
+  @action
+  uploadDone({ url }) {
+    this.images.addObject(url);
+  }
 
-    close() {
-      this.save(this.images.join("|"));
-      this.send("closeModal");
-    },
-  },
-});
+  @action
+  close() {
+    this.save(this.images.join("|"));
+    this.send("closeModal");
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/admin-watched-word-test.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-watched-word-test.js
index fc585c47ef6..5b8f9f3b132 100644
--- a/app/assets/javascripts/admin/addon/controllers/modals/admin-watched-word-test.js
+++ b/app/assets/javascripts/admin/addon/controllers/modals/admin-watched-word-test.js
@@ -1,16 +1,19 @@
+import { equal } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import discourseComputed from "discourse-common/utils/decorators";
-import { equal } from "@ember/object/computed";
 import {
   createWatchedWordRegExp,
   toWatchedWord,
 } from "discourse-common/utils/watched-words";
 
-export default Controller.extend(ModalFunctionality, {
-  isReplace: equal("model.nameKey", "replace"),
-  isTag: equal("model.nameKey", "tag"),
-  isLink: equal("model.nameKey", "link"),
+export default class AdminWatchedWordTestController extends Controller.extend(
+  ModalFunctionality
+) {
+  @equal("model.nameKey", "replace") isReplace;
+
+  @equal("model.nameKey", "tag") isTag;
+  @equal("model.nameKey", "link") isLink;
 
   @discourseComputed(
     "value",
@@ -71,5 +74,5 @@ export default Controller.extend(ModalFunctionality, {
 
       return matches;
     }
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/controllers/modals/site-setting-default-categories.js b/app/assets/javascripts/admin/addon/controllers/modals/site-setting-default-categories.js
index 8c3a2648989..e7e970578bd 100644
--- a/app/assets/javascripts/admin/addon/controllers/modals/site-setting-default-categories.js
+++ b/app/assets/javascripts/admin/addon/controllers/modals/site-setting-default-categories.js
@@ -2,4 +2,7 @@ import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import ModalUpdateExistingUsers from "discourse/mixins/modal-update-existing-users";
 
-export default Controller.extend(ModalFunctionality, ModalUpdateExistingUsers);
+export default class SiteSettingDefaultCategoriesController extends Controller.extend(
+  ModalFunctionality,
+  ModalUpdateExistingUsers
+) {}
diff --git a/app/assets/javascripts/admin/addon/helpers/disposition-icon.js b/app/assets/javascripts/admin/addon/helpers/disposition-icon.js
index f49d22e2726..80820b0bc63 100644
--- a/app/assets/javascripts/admin/addon/helpers/disposition-icon.js
+++ b/app/assets/javascripts/admin/addon/helpers/disposition-icon.js
@@ -2,7 +2,7 @@ import Helper from "@ember/component/helper";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import { htmlSafe } from "@ember/template";
 
-export default Helper.extend({
+export default class DispositionIcon extends Helper {
   compute([disposition]) {
     if (!disposition) {
       return null;
@@ -24,5 +24,5 @@ export default Helper.extend({
       }
     }
     return htmlSafe(iconHTML(icon, { title }));
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/lib/template-form-fields.js b/app/assets/javascripts/admin/addon/lib/template-form-fields.js
new file mode 100644
index 00000000000..80bf3c42050
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/lib/template-form-fields.js
@@ -0,0 +1,75 @@
+import I18n from "I18n";
+
+export const templateFormFields = [
+  {
+    type: "checkbox",
+    structure: `- type: checkbox
+  attributes:
+    label: "${I18n.t("admin.form_templates.field_placeholders.label")}"
+  validations:
+    # ${I18n.t("admin.form_templates.field_placeholders.validations")}`,
+  },
+  {
+    type: "input",
+    structure: `- type: input
+  attributes:
+    label: "${I18n.t("admin.form_templates.field_placeholders.label")}"
+    placeholder: "${I18n.t(
+      "admin.form_templates.field_placeholders.placeholder"
+    )}"
+  validations:
+    # ${I18n.t("admin.form_templates.field_placeholders.validations")}`,
+  },
+  {
+    type: "textarea",
+    structure: `- type: textarea
+  attributes:
+    label: "${I18n.t("admin.form_templates.field_placeholders.label")}"
+    placeholder: "${I18n.t(
+      "admin.form_templates.field_placeholders.placeholder"
+    )}"
+  validations:
+    # ${I18n.t("admin.form_templates.field_placeholders.validations")}`,
+  },
+  {
+    type: "dropdown",
+    structure: `- type: dropdown
+  choices:
+    - "${I18n.t("admin.form_templates.field_placeholders.choices.first")}"
+    - "${I18n.t("admin.form_templates.field_placeholders.choices.second")}"
+    - "${I18n.t("admin.form_templates.field_placeholders.choices.third")}"
+  attributes:
+    none_label: "${I18n.t(
+      "admin.form_templates.field_placeholders.none_label"
+    )}"
+    label: "${I18n.t("admin.form_templates.field_placeholders.label")}"
+    filterable: false
+  validations:
+    # ${I18n.t("admin.form_templates.field_placeholders.validations")}`,
+  },
+  {
+    type: "upload",
+    structure: `- type: upload
+  attributes:
+    file_types: ".jpg, .png, .gif"
+    allow_multiple: false
+    label: "${I18n.t("admin.form_templates.field_placeholders.label")}"
+  validations:
+    # ${I18n.t("admin.form_templates.field_placeholders.validations")}`,
+  },
+  {
+    type: "multiselect",
+    structure: `- type: multi-select
+  choices:
+    - "${I18n.t("admin.form_templates.field_placeholders.choices.first")}"
+    - "${I18n.t("admin.form_templates.field_placeholders.choices.second")}"
+    - "${I18n.t("admin.form_templates.field_placeholders.choices.third")}"
+  attributes:
+    none_label: "${I18n.t(
+      "admin.form_templates.field_placeholders.none_label"
+    )}"
+    label: "${I18n.t("admin.form_templates.field_placeholders.label")}"
+  validations:
+    # ${I18n.t("admin.form_templates.field_placeholders.validations")}`,
+  },
+];
diff --git a/app/assets/javascripts/admin/addon/mixins/setting-component.js b/app/assets/javascripts/admin/addon/mixins/setting-component.js
index 6b9bfbda105..f560e36eeb9 100644
--- a/app/assets/javascripts/admin/addon/mixins/setting-component.js
+++ b/app/assets/javascripts/admin/addon/mixins/setting-component.js
@@ -3,12 +3,10 @@ import { fmt, propertyNotEqual } from "discourse/lib/computed";
 import { alias, oneWay } from "@ember/object/computed";
 import I18n from "I18n";
 import Mixin from "@ember/object/mixin";
-import { Promise } from "rsvp";
 import { ajax } from "discourse/lib/ajax";
 import { categoryLinkHTML } from "discourse/helpers/category-link";
 import discourseComputed, { bind } from "discourse-common/utils/decorators";
 import { htmlSafe } from "@ember/template";
-import { on } from "@ember/object/evented";
 import showModal from "discourse/lib/show-modal";
 import { warn } from "@ember/debug";
 import { action } from "@ember/object";
@@ -29,6 +27,7 @@ const CUSTOM_TYPES = [
   "upload",
   "group_list",
   "tag_list",
+  "tag_group_list",
   "color",
   "simple_list",
   "emoji_list",
@@ -37,13 +36,63 @@ const CUSTOM_TYPES = [
 
 const AUTO_REFRESH_ON_SAVE = ["logo", "logo_small", "large_icon"];
 
+const DEFAULT_USER_PREFERENCES = [
+  "default_email_digest_frequency",
+  "default_include_tl0_in_digests",
+  "default_email_level",
+  "default_email_messages_level",
+  "default_email_mailing_list_mode",
+  "default_email_mailing_list_mode_frequency",
+  "default_email_previous_replies",
+  "default_email_in_reply_to",
+  "default_hide_profile_and_presence",
+  "default_other_new_topic_duration_minutes",
+  "default_other_auto_track_topics_after_msecs",
+  "default_other_notification_level_when_replying",
+  "default_other_external_links_in_new_tab",
+  "default_other_enable_quoting",
+  "default_other_enable_defer",
+  "default_other_dynamic_favicon",
+  "default_other_like_notification_frequency",
+  "default_other_skip_new_user_tips",
+  "default_topics_automatic_unpin",
+  "default_categories_watching",
+  "default_categories_tracking",
+  "default_categories_muted",
+  "default_categories_watching_first_post",
+  "default_categories_normal",
+  "default_tags_watching",
+  "default_tags_tracking",
+  "default_tags_muted",
+  "default_tags_watching_first_post",
+  "default_text_size",
+  "default_title_count_mode",
+  "default_navigation_menu_categories",
+  "default_navigation_menu_tags",
+  "default_sidebar_link_to_filtered_list",
+  "default_sidebar_show_count_of_new_items",
+];
+
 export default Mixin.create({
-  classNameBindings: [":row", ":setting", "overridden", "typeClass"],
-  content: alias("setting"),
-  validationMessage: null,
-  isSecret: oneWay("setting.secret"),
-  setting: null,
   attributeBindings: ["setting.setting:data-setting"],
+  classNameBindings: [":row", ":setting", "overridden", "typeClass"],
+  validationMessage: null,
+  setting: null,
+
+  content: alias("setting"),
+  isSecret: oneWay("setting.secret"),
+  componentName: fmt("typeClass", "site-settings/%@"),
+  overridden: propertyNotEqual("setting.default", "buffered.value"),
+
+  didInsertElement() {
+    this._super(...arguments);
+    this.element.addEventListener("keydown", this._handleKeydown);
+  },
+
+  willDestroyElement() {
+    this._super(...arguments);
+    this.element.removeEventListener("keydown", this._handleKeydown);
+  },
 
   @discourseComputed("buffered.value", "setting.value")
   dirty(bufferVal, settingVal) {
@@ -99,15 +148,11 @@ export default Mixin.create({
     return setting.type;
   },
 
-  componentName: fmt("typeClass", "site-settings/%@"),
-
   @discourseComputed("setting.anyValue")
   allowAny(anyValue) {
     return anyValue !== false;
   },
 
-  overridden: propertyNotEqual("setting.default", "buffered.value"),
-
   @discourseComputed("buffered.value")
   bufferedValues(value) {
     return splitString(value, "|");
@@ -127,90 +172,64 @@ export default Mixin.create({
   },
 
   @action
-  update() {
-    const defaultUserPreferences = [
-      "default_email_digest_frequency",
-      "default_include_tl0_in_digests",
-      "default_email_level",
-      "default_email_messages_level",
-      "default_email_mailing_list_mode",
-      "default_email_mailing_list_mode_frequency",
-      "default_email_previous_replies",
-      "default_email_in_reply_to",
-      "default_hide_profile_and_presence",
-      "default_other_new_topic_duration_minutes",
-      "default_other_auto_track_topics_after_msecs",
-      "default_other_notification_level_when_replying",
-      "default_other_external_links_in_new_tab",
-      "default_other_enable_quoting",
-      "default_other_enable_defer",
-      "default_other_dynamic_favicon",
-      "default_other_like_notification_frequency",
-      "default_other_skip_new_user_tips",
-      "default_topics_automatic_unpin",
-      "default_categories_watching",
-      "default_categories_tracking",
-      "default_categories_muted",
-      "default_categories_watching_first_post",
-      "default_categories_normal",
-      "default_tags_watching",
-      "default_tags_tracking",
-      "default_tags_muted",
-      "default_tags_watching_first_post",
-      "default_text_size",
-      "default_title_count_mode",
-      "default_sidebar_categories",
-      "default_sidebar_tags",
-    ];
-
+  async update() {
     const key = this.buffered.get("setting");
 
-    if (defaultUserPreferences.includes(key)) {
-      const data = {};
-      data[key] = this.buffered.get("value");
+    if (!DEFAULT_USER_PREFERENCES.includes(key)) {
+      await this.save();
+      return;
+    }
 
-      ajax(`/admin/site_settings/${key}/user_count.json`, {
-        type: "PUT",
-        data,
-      }).then((result) => {
-        const count = result.user_count;
+    const data = {
+      [key]: this.buffered.get("value"),
+    };
 
-        if (count > 0) {
-          const controller = showModal("site-setting-default-categories", {
-            model: { count, key: key.replaceAll("_", " ") },
-            admin: true,
-          });
+    const result = await ajax(`/admin/site_settings/${key}/user_count.json`, {
+      type: "PUT",
+      data,
+    });
 
-          controller.set("onClose", () => {
-            this.updateExistingUsers = controller.updateExistingUsers;
-            this.save();
-          });
-        } else {
-          this.save();
-        }
+    const count = result.user_count;
+
+    if (count > 0) {
+      const controller = showModal("site-setting-default-categories", {
+        model: { count, key: key.replaceAll("_", " ") },
+        admin: true,
+      });
+
+      controller.set("onClose", () => {
+        this.updateExistingUsers = controller.updateExistingUsers;
+        this.save();
       });
     } else {
-      this.save();
+      await this.save();
     }
   },
 
   @action
-  save() {
-    this._save()
-      .then(() => {
-        this.set("validationMessage", null);
-        this.commitBuffer();
-        if (AUTO_REFRESH_ON_SAVE.includes(this.setting.setting)) {
-          this.afterSave();
+  async save() {
+    try {
+      await this._save();
+
+      this.set("validationMessage", null);
+      this.commitBuffer();
+      if (AUTO_REFRESH_ON_SAVE.includes(this.setting.setting)) {
+        this.afterSave();
+      }
+    } catch (e) {
+      const json = e.jqXHR?.responseJSON;
+      if (json?.errors) {
+        let errorString = json.errors[0];
+
+        if (json.html_message) {
+          errorString = htmlSafe(errorString);
         }
-      })
-      .catch((e) => {
-        if (e.jqXHR?.responseJSON?.errors) {
-          this.set("validationMessage", e.jqXHR.responseJSON.errors[0]);
-        } else {
-          this.set("validationMessage", I18n.t("generic_error"));
-        }
-      });
+
+        this.set("validationMessage", errorString);
+      } else {
+        this.set("validationMessage", I18n.t("generic_error"));
+      }
+    }
   },
 
   @action
@@ -247,18 +266,9 @@ export default Mixin.create({
     }
   },
 
-  _watchEnterKey: on("didInsertElement", function () {
-    this.element.addEventListener("keydown", this._handleKeydown);
-  }),
-
-  _removeBindings: on("willDestroyElement", function () {
-    this.element.removeEventListener("keydown", this._handleKeydown);
-  }),
-
-  _save() {
+  async _save() {
     warn("You should define a `_save` method", {
       id: "discourse.setting-component.missing-save",
     });
-    return Promise.resolve();
   },
 });
diff --git a/app/assets/javascripts/admin/addon/models/admin-dashboard.js b/app/assets/javascripts/admin/addon/models/admin-dashboard.js
index c0c9f86702c..c261a424411 100644
--- a/app/assets/javascripts/admin/addon/models/admin-dashboard.js
+++ b/app/assets/javascripts/admin/addon/models/admin-dashboard.js
@@ -7,19 +7,17 @@ const GENERAL_ATTRIBUTES = [
   "release_notes_link",
 ];
 
-const AdminDashboard = EmberObject.extend({});
-
-AdminDashboard.reopenClass({
-  fetch() {
+export default class AdminDashboard extends EmberObject {
+  static fetch() {
     return ajax("/admin/dashboard.json").then((json) => {
       const model = AdminDashboard.create();
       model.set("version_check", json.version_check);
 
       return model;
     });
-  },
+  }
 
-  fetchGeneral() {
+  static fetchGeneral() {
     return ajax("/admin/dashboard/general.json").then((json) => {
       const model = AdminDashboard.create();
 
@@ -34,15 +32,13 @@ AdminDashboard.reopenClass({
 
       return model;
     });
-  },
+  }
 
-  fetchProblems() {
+  static fetchProblems() {
     return ajax("/admin/dashboard/problems.json").then((json) => {
       const model = AdminDashboard.create(json);
       model.set("loaded", true);
       return model;
     });
-  },
-});
-
-export default AdminDashboard;
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/models/admin-user.js b/app/assets/javascripts/admin/addon/models/admin-user.js
index a61980bc61a..4b9c94d7954 100644
--- a/app/assets/javascripts/admin/addon/models/admin-user.js
+++ b/app/assets/javascripts/admin/addon/models/admin-user.js
@@ -10,14 +10,30 @@ import { popupAjaxError } from "discourse/lib/ajax-error";
 import { propertyNotEqual } from "discourse/lib/computed";
 import { userPath } from "discourse/lib/url";
 
-const wrapAdmin = (user) => (user ? AdminUser.create(user) : null);
+export default class AdminUser extends User {
+  static find(user_id) {
+    return ajax(`/admin/users/${user_id}.json`).then((result) => {
+      result.loadedDetails = true;
+      return AdminUser.create(result);
+    });
+  }
 
-const AdminUser = User.extend({
-  adminUserView: true,
-  customGroups: filter("groups", (g) => !g.automatic && Group.create(g)),
-  automaticGroups: filter("groups", (g) => g.automatic && Group.create(g)),
+  static findAll(query, userFilter) {
+    return ajax(`/admin/users/list/${query}.json`, {
+      data: userFilter,
+    }).then((users) => users.map((u) => AdminUser.create(u)));
+  }
 
-  canViewProfile: or("active", "staged"),
+  adminUserView = true;
+
+  @filter("groups", (g) => !g.automatic && Group.create(g)) customGroups;
+  @filter("groups", (g) => g.automatic && Group.create(g)) automaticGroups;
+  @or("active", "staged") canViewProfile;
+  @gt("bounce_score", 0) canResetBounceScore;
+  @propertyNotEqual("originalTrustLevel", "trust_level") dirty;
+  @lt("trust_level", 4) canLockTrustLevel;
+  @not("staff") canSuspend;
+  @not("staff") canSilence;
 
   @discourseComputed("bounce_score", "reset_bounce_score_after")
   bounceScore(bounce_score, reset_bounce_score_after) {
@@ -28,7 +44,7 @@ const AdminUser = User.extend({
     } else {
       return bounce_score;
     }
-  },
+  }
 
   @discourseComputed("bounce_score")
   bounceScoreExplanation(bounce_score) {
@@ -39,17 +55,15 @@ const AdminUser = User.extend({
     } else {
       return I18n.t("admin.user.bounce_score_explanation.threshold_reached");
     }
-  },
+  }
 
   @discourseComputed
   bounceLink() {
     return getURL("/admin/email/bounced");
-  },
-
-  canResetBounceScore: gt("bounce_score", 0),
+  }
 
   resetBounceScore() {
-    return ajax(`/admin/users/${this.id}/reset_bounce_score`, {
+    return ajax(`/admin/users/${this.id}/reset-bounce-score`, {
       type: "POST",
     }).then(() =>
       this.setProperties({
@@ -57,14 +71,14 @@ const AdminUser = User.extend({
         reset_bounce_score_after: null,
       })
     );
-  },
+  }
 
   groupAdded(added) {
     return ajax(`/admin/users/${this.id}/groups`, {
       type: "POST",
       data: { group_id: added.id },
     }).then(() => this.groups.pushObject(added));
-  },
+  }
 
   groupRemoved(groupId) {
     return ajax(`/admin/users/${this.id}/groups/${groupId}`, {
@@ -75,13 +89,13 @@ const AdminUser = User.extend({
         this.set("primary_group_id", null);
       }
     });
-  },
+  }
 
   deleteAllPosts() {
     return ajax(`/admin/users/${this.get("id")}/delete_posts_batch`, {
       type: "PUT",
     });
-  },
+  }
 
   revokeAdmin() {
     return ajax(`/admin/users/${this.id}/revoke_admin`, {
@@ -97,7 +111,7 @@ const AdminUser = User.extend({
         can_delete_all_posts: resp.can_delete_all_posts,
       });
     });
-  },
+  }
 
   grantAdmin(data) {
     return ajax(`/admin/users/${this.id}/grant_admin`, {
@@ -114,7 +128,7 @@ const AdminUser = User.extend({
 
       return resp;
     });
-  },
+  }
 
   revokeModeration() {
     return ajax(`/admin/users/${this.id}/revoke_moderation`, {
@@ -130,7 +144,7 @@ const AdminUser = User.extend({
         });
       })
       .catch(popupAjaxError);
-  },
+  }
 
   grantModeration() {
     return ajax(`/admin/users/${this.id}/grant_moderation`, {
@@ -146,7 +160,7 @@ const AdminUser = User.extend({
         });
       })
       .catch(popupAjaxError);
-  },
+  }
 
   disableSecondFactor() {
     return ajax(`/admin/users/${this.id}/disable_second_factor`, {
@@ -156,7 +170,7 @@ const AdminUser = User.extend({
         this.set("second_factor_enabled", false);
       })
       .catch(popupAjaxError);
-  },
+  }
 
   approve(approvedBy) {
     return ajax(`/admin/users/${this.id}/approve`, {
@@ -168,83 +182,76 @@ const AdminUser = User.extend({
         approved_by: approvedBy,
       });
     });
-  },
+  }
 
   setOriginalTrustLevel() {
     this.set("originalTrustLevel", this.trust_level);
-  },
-
-  dirty: propertyNotEqual("originalTrustLevel", "trust_level"),
+  }
 
   saveTrustLevel() {
     return ajax(`/admin/users/${this.id}/trust_level`, {
       type: "PUT",
       data: { level: this.trust_level },
     });
-  },
+  }
 
   restoreTrustLevel() {
     this.set("trust_level", this.originalTrustLevel);
-  },
+  }
 
   lockTrustLevel(locked) {
     return ajax(`/admin/users/${this.id}/trust_level_lock`, {
       type: "PUT",
       data: { locked: !!locked },
     });
-  },
-
-  canLockTrustLevel: lt("trust_level", 4),
-
-  canSuspend: not("staff"),
-  canSilence: not("staff"),
+  }
 
   @discourseComputed("suspended_till", "suspended_at")
   suspendDuration(suspendedTill, suspendedAt) {
     suspendedAt = moment(suspendedAt);
     suspendedTill = moment(suspendedTill);
     return suspendedAt.format("L") + " - " + suspendedTill.format("L");
-  },
+  }
 
   suspend(data) {
     return ajax(`/admin/users/${this.id}/suspend`, {
       type: "PUT",
       data,
     }).then((result) => this.setProperties(result.suspension));
-  },
+  }
 
   unsuspend() {
     return ajax(`/admin/users/${this.id}/unsuspend`, {
       type: "PUT",
     }).then((result) => this.setProperties(result.suspension));
-  },
+  }
 
   logOut() {
     return ajax("/admin/users/" + this.id + "/log_out", {
       type: "POST",
       data: { username_or_email: this.username },
     });
-  },
+  }
 
   impersonate() {
     return ajax("/admin/impersonate", {
       type: "POST",
       data: { username_or_email: this.username },
     });
-  },
+  }
 
   activate() {
     return ajax(`/admin/users/${this.id}/activate`, {
       type: "PUT",
     });
-  },
+  }
 
   deactivate() {
     return ajax(`/admin/users/${this.id}/deactivate`, {
       type: "PUT",
       data: { context: document.location.pathname },
     });
-  },
+  }
 
   unsilence() {
     this.set("silencingUser", true);
@@ -254,7 +261,7 @@ const AdminUser = User.extend({
     })
       .then((result) => this.setProperties(result.unsilence))
       .finally(() => this.set("silencingUser", false));
-  },
+  }
 
   silence(data) {
     this.set("silencingUser", true);
@@ -265,20 +272,20 @@ const AdminUser = User.extend({
     })
       .then((result) => this.setProperties(result.silence))
       .finally(() => this.set("silencingUser", false));
-  },
+  }
 
   sendActivationEmail() {
     return ajax(userPath("action/send_activation_email"), {
       type: "POST",
       data: { username: this.username },
     });
-  },
+  }
 
   anonymize() {
     return ajax(`/admin/users/${this.id}/anonymize.json`, {
       type: "PUT",
     });
-  },
+  }
 
   destroy(formData) {
     return ajax(`/admin/users/${this.id}.json`, {
@@ -295,14 +302,14 @@ const AdminUser = User.extend({
       .catch(() => {
         this.find(this.id).then((u) => this.setProperties(u));
       });
-  },
+  }
 
   merge(formData) {
     return ajax(`/admin/users/${this.id}/merge.json`, {
       type: "POST",
       data: formData,
     });
-  },
+  }
 
   loadDetails() {
     if (this.loadedDetails) {
@@ -313,23 +320,29 @@ const AdminUser = User.extend({
       const userProperties = Object.assign(result, { loadedDetails: true });
       this.setProperties(userProperties);
     });
-  },
+  }
 
   @discourseComputed("tl3_requirements")
   tl3Requirements(requirements) {
     if (requirements) {
       return this.store.createRecord("tl3Requirements", requirements);
     }
-  },
+  }
 
   @discourseComputed("suspended_by")
-  suspendedBy: wrapAdmin,
+  suspendedBy(user) {
+    return user ? AdminUser.create(user) : null;
+  }
 
   @discourseComputed("silenced_by")
-  silencedBy: wrapAdmin,
+  silencedBy(user) {
+    return user ? AdminUser.create(user) : null;
+  }
 
   @discourseComputed("approved_by")
-  approvedBy: wrapAdmin,
+  approvedBy(user) {
+    return user ? AdminUser.create(user) : null;
+  }
 
   deleteSSORecord() {
     return ajax(`/admin/users/${this.id}/sso_record.json`, {
@@ -339,22 +352,5 @@ const AdminUser = User.extend({
         this.set("single_sign_on_record", null);
       })
       .catch(popupAjaxError);
-  },
-});
-
-AdminUser.reopenClass({
-  find(user_id) {
-    return ajax(`/admin/users/${user_id}.json`).then((result) => {
-      result.loadedDetails = true;
-      return AdminUser.create(result);
-    });
-  },
-
-  findAll(query, userFilter) {
-    return ajax(`/admin/users/list/${query}.json`, {
-      data: userFilter,
-    }).then((users) => users.map((u) => AdminUser.create(u)));
-  },
-});
-
-export default AdminUser;
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/models/api-key.js b/app/assets/javascripts/admin/addon/models/api-key.js
index be5475a4abc..f40d643270b 100644
--- a/app/assets/javascripts/admin/addon/models/api-key.js
+++ b/app/assets/javascripts/admin/addon/models/api-key.js
@@ -1,24 +1,26 @@
+import { computed } from "@ember/object";
 import AdminUser from "admin/models/admin-user";
 import RestModel from "discourse/models/rest";
 import { ajax } from "discourse/lib/ajax";
-import { computed } from "@ember/object";
 import discourseComputed from "discourse-common/utils/decorators";
 import { fmt } from "discourse/lib/computed";
 
-const ApiKey = RestModel.extend({
-  user: computed("_user", {
-    get() {
-      return this._user;
-    },
-    set(key, value) {
-      if (value && !(value instanceof AdminUser)) {
-        this.set("_user", AdminUser.create(value));
-      } else {
-        this.set("_user", value);
-      }
-      return this._user;
-    },
-  }),
+export default class ApiKey extends RestModel {
+  @fmt("truncated_key", "%@...") truncatedKey;
+
+  @computed("_user")
+  get user() {
+    return this._user;
+  }
+
+  set user(value) {
+    if (value && !(value instanceof AdminUser)) {
+      this.set("_user", AdminUser.create(value));
+    } else {
+      this.set("_user", value);
+    }
+    return this._user;
+  }
 
   @discourseComputed("description")
   shortDescription(description) {
@@ -26,32 +28,28 @@ const ApiKey = RestModel.extend({
       return description;
     }
     return `${description.substring(0, 40)}...`;
-  },
-
-  truncatedKey: fmt("truncated_key", "%@..."),
+  }
 
   revoke() {
     return ajax(`${this.basePath}/revoke`, {
       type: "POST",
     }).then((result) => this.setProperties(result.api_key));
-  },
+  }
 
   undoRevoke() {
     return ajax(`${this.basePath}/undo-revoke`, {
       type: "POST",
     }).then((result) => this.setProperties(result.api_key));
-  },
+  }
 
   createProperties() {
     return this.getProperties("description", "username", "scopes");
-  },
+  }
 
   @discourseComputed()
   basePath() {
     return this.store
       .adapterFor("api-key")
       .pathFor(this.store, "api-key", this.id);
-  },
-});
-
-export default ApiKey;
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/models/backup-status.js b/app/assets/javascripts/admin/addon/models/backup-status.js
index dffad0d0609..e9ee065f3e2 100644
--- a/app/assets/javascripts/admin/addon/models/backup-status.js
+++ b/app/assets/javascripts/admin/addon/models/backup-status.js
@@ -1,12 +1,12 @@
+import { not } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import discourseComputed from "discourse-common/utils/decorators";
-import { not } from "@ember/object/computed";
 
-export default EmberObject.extend({
-  restoreDisabled: not("restoreEnabled"),
+export default class BackupStatus extends EmberObject {
+  @not("restoreEnabled") restoreDisabled;
 
   @discourseComputed("allowRestore", "isOperationRunning")
   restoreEnabled(allowRestore, isOperationRunning) {
     return allowRestore && !isOperationRunning;
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/models/backup.js b/app/assets/javascripts/admin/addon/models/backup.js
index 717192e8ac3..9708f9589bc 100644
--- a/app/assets/javascripts/admin/addon/models/backup.js
+++ b/app/assets/javascripts/admin/addon/models/backup.js
@@ -2,25 +2,12 @@ import EmberObject from "@ember/object";
 import MessageBus from "message-bus-client";
 import { ajax } from "discourse/lib/ajax";
 
-const Backup = EmberObject.extend({
-  destroy() {
-    return ajax("/admin/backups/" + this.filename, { type: "DELETE" });
-  },
-
-  restore() {
-    return ajax("/admin/backups/" + this.filename + "/restore", {
-      type: "POST",
-      data: { client_id: MessageBus.clientId },
-    });
-  },
-});
-
-Backup.reopenClass({
-  find() {
+export default class Backup extends EmberObject {
+  static find() {
     return ajax("/admin/backups.json");
-  },
+  }
 
-  start(withUploads) {
+  static start(withUploads) {
     if (withUploads === undefined) {
       withUploads = true;
     }
@@ -31,19 +18,28 @@ Backup.reopenClass({
         client_id: MessageBus.clientId,
       },
     });
-  },
+  }
 
-  cancel() {
+  static cancel() {
     return ajax("/admin/backups/cancel.json", {
       type: "DELETE",
     });
-  },
+  }
 
-  rollback() {
+  static rollback() {
     return ajax("/admin/backups/rollback.json", {
       type: "POST",
     });
-  },
-});
+  }
 
-export default Backup;
+  destroy() {
+    return ajax("/admin/backups/" + this.filename, { type: "DELETE" });
+  }
+
+  restore() {
+    return ajax("/admin/backups/" + this.filename + "/restore", {
+      type: "POST",
+      data: { client_id: MessageBus.clientId },
+    });
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/models/color-scheme-color.js b/app/assets/javascripts/admin/addon/models/color-scheme-color.js
index 24beb9130ca..72efcb32c13 100644
--- a/app/assets/javascripts/admin/addon/models/color-scheme-color.js
+++ b/app/assets/javascripts/admin/addon/models/color-scheme-color.js
@@ -1,19 +1,19 @@
-import discourseComputed, {
-  observes,
-  on,
-} from "discourse-common/utils/decorators";
+import discourseComputed from "discourse-common/utils/decorators";
+import { observes, on } from "@ember-decorators/object";
 import EmberObject from "@ember/object";
 import I18n from "I18n";
 import { propertyNotEqual } from "discourse/lib/computed";
 
-const ColorSchemeColor = EmberObject.extend({
+export default class ColorSchemeColor extends EmberObject {
+  // Whether the current value is different than Discourse's default color scheme.
+  @propertyNotEqual("hex", "default_hex") overridden;
   @on("init")
   startTrackingChanges() {
     this.set("originals", { hex: this.hex || "FFFFFF" });
 
     // force changed property to be recalculated
     this.notifyPropertyChange("hex");
-  },
+  }
 
   // Whether value has changed since it was last saved.
   @discourseComputed("hex")
@@ -26,26 +26,23 @@ const ColorSchemeColor = EmberObject.extend({
     }
 
     return false;
-  },
-
-  // Whether the current value is different than Discourse's default color scheme.
-  overridden: propertyNotEqual("hex", "default_hex"),
+  }
 
   // Whether the saved value is different than Discourse's default color scheme.
   @discourseComputed("default_hex", "hex")
   savedIsOverriden(defaultHex) {
     return this.originals.hex !== defaultHex;
-  },
+  }
 
   revert() {
     this.set("hex", this.default_hex);
-  },
+  }
 
   undo() {
     if (this.originals) {
       this.set("hex", this.originals.hex);
     }
-  },
+  }
 
   @discourseComputed("name")
   translatedName(name) {
@@ -54,7 +51,7 @@ const ColorSchemeColor = EmberObject.extend({
     } else {
       return name;
     }
-  },
+  }
 
   @discourseComputed("name")
   description(name) {
@@ -63,7 +60,7 @@ const ColorSchemeColor = EmberObject.extend({
     } else {
       return "";
     }
-  },
+  }
 
   /**
     brightness returns a number between 0 (darkest) to 255 (brightest).
@@ -90,19 +87,17 @@ const ColorSchemeColor = EmberObject.extend({
           1000
       );
     }
-  },
+  }
 
   @observes("hex")
   hexValueChanged() {
     if (this.hex) {
       this.set("hex", this.hex.toString().replace(/[^0-9a-fA-F]/g, ""));
     }
-  },
+  }
 
   @discourseComputed("hex")
   valid(hex) {
     return hex.match(/^([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$/) !== null;
-  },
-});
-
-export default ColorSchemeColor;
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/models/color-scheme.js b/app/assets/javascripts/admin/addon/models/color-scheme.js
index e1b73ad14e8..53f8ea7eeda 100644
--- a/app/assets/javascripts/admin/addon/models/color-scheme.js
+++ b/app/assets/javascripts/admin/addon/models/color-scheme.js
@@ -1,3 +1,4 @@
+import { not } from "@ember/object/computed";
 import { A } from "@ember/array";
 import ArrayProxy from "@ember/array/proxy";
 import ColorSchemeColor from "admin/models/color-scheme-color";
@@ -5,26 +6,56 @@ import EmberObject from "@ember/object";
 import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
 import discourseComputed from "discourse-common/utils/decorators";
-import { not } from "@ember/object/computed";
 
-const ColorScheme = EmberObject.extend({
+class ColorSchemes extends ArrayProxy {}
+
+export default class ColorScheme extends EmberObject {
+  static findAll() {
+    const colorSchemes = ColorSchemes.create({ content: [], loading: true });
+    return ajax("/admin/color_schemes").then((all) => {
+      all.forEach((colorScheme) => {
+        colorSchemes.pushObject(
+          ColorScheme.create({
+            id: colorScheme.id,
+            name: colorScheme.name,
+            is_base: colorScheme.is_base,
+            theme_id: colorScheme.theme_id,
+            theme_name: colorScheme.theme_name,
+            base_scheme_id: colorScheme.base_scheme_id,
+            user_selectable: colorScheme.user_selectable,
+            colors: colorScheme.colors.map((c) => {
+              return ColorSchemeColor.create({
+                name: c.name,
+                hex: c.hex,
+                default_hex: c.default_hex,
+                is_advanced: c.is_advanced,
+              });
+            }),
+          })
+        );
+      });
+      return colorSchemes;
+    });
+  }
+
+  @not("id") newRecord;
   init() {
-    this._super(...arguments);
+    super.init(...arguments);
 
     this.startTrackingChanges();
-  },
+  }
 
   @discourseComputed
   description() {
     return "" + this.name;
-  },
+  }
 
   startTrackingChanges() {
     this.set("originals", {
       name: this.name,
       user_selectable: this.user_selectable,
     });
-  },
+  }
 
   schemeJson() {
     const buffer = [];
@@ -33,7 +64,7 @@ const ColorScheme = EmberObject.extend({
     });
 
     return [`"${this.name}": {`, buffer.join(",\n"), "}"].join("\n");
-  },
+  }
 
   copy() {
     const newScheme = ColorScheme.create({
@@ -47,7 +78,7 @@ const ColorScheme = EmberObject.extend({
       );
     });
     return newScheme;
-  },
+  }
 
   @discourseComputed(
     "name",
@@ -70,7 +101,7 @@ const ColorScheme = EmberObject.extend({
     }
 
     return false;
-  },
+  }
 
   @discourseComputed("changed")
   disableSave(changed) {
@@ -79,9 +110,7 @@ const ColorScheme = EmberObject.extend({
     }
 
     return !changed || this.saving || this.colors.any((c) => !c.get("valid"));
-  },
-
-  newRecord: not("id"),
+  }
 
   save(opts) {
     if (this.is_base || this.disableSave) {
@@ -124,7 +153,7 @@ const ColorScheme = EmberObject.extend({
       this.setProperties({ savingStatus: I18n.t("saved"), saving: false });
       this.notifyPropertyChange("description");
     });
-  },
+  }
 
   updateUserSelectable(value) {
     if (!this.id) {
@@ -137,45 +166,11 @@ const ColorScheme = EmberObject.extend({
       dataType: "json",
       contentType: "application/json",
     });
-  },
+  }
 
   destroy() {
     if (this.id) {
       return ajax(`/admin/color_schemes/${this.id}`, { type: "DELETE" });
     }
-  },
-});
-
-const ColorSchemes = ArrayProxy.extend({});
-
-ColorScheme.reopenClass({
-  findAll() {
-    const colorSchemes = ColorSchemes.create({ content: [], loading: true });
-    return ajax("/admin/color_schemes").then((all) => {
-      all.forEach((colorScheme) => {
-        colorSchemes.pushObject(
-          ColorScheme.create({
-            id: colorScheme.id,
-            name: colorScheme.name,
-            is_base: colorScheme.is_base,
-            theme_id: colorScheme.theme_id,
-            theme_name: colorScheme.theme_name,
-            base_scheme_id: colorScheme.base_scheme_id,
-            user_selectable: colorScheme.user_selectable,
-            colors: colorScheme.colors.map((c) => {
-              return ColorSchemeColor.create({
-                name: c.name,
-                hex: c.hex,
-                default_hex: c.default_hex,
-                is_advanced: c.is_advanced,
-              });
-            }),
-          })
-        );
-      });
-      return colorSchemes;
-    });
-  },
-});
-
-export default ColorScheme;
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/models/email-log.js b/app/assets/javascripts/admin/addon/models/email-log.js
index 6565611974a..18034d9f949 100644
--- a/app/assets/javascripts/admin/addon/models/email-log.js
+++ b/app/assets/javascripts/admin/addon/models/email-log.js
@@ -3,10 +3,8 @@ import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import getURL from "discourse-common/lib/get-url";
 
-const EmailLog = EmberObject.extend({});
-
-EmailLog.reopenClass({
-  create(attrs) {
+export default class EmailLog extends EmberObject {
+  static create(attrs) {
     attrs = attrs || {};
 
     if (attrs.user) {
@@ -17,10 +15,10 @@ EmailLog.reopenClass({
       attrs.post_url = getURL(attrs.post_url);
     }
 
-    return this._super(attrs);
-  },
+    return super.create(attrs);
+  }
 
-  findAll(filter, offset) {
+  static findAll(filter, offset) {
     filter = filter || {};
     offset = offset || 0;
 
@@ -30,7 +28,5 @@ EmailLog.reopenClass({
     return ajax(`/admin/email/${status}.json?offset=${offset}`, {
       data: filter,
     }).then((logs) => logs.map((log) => EmailLog.create(log)));
-  },
-});
-
-export default EmailLog;
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/models/email-preview.js b/app/assets/javascripts/admin/addon/models/email-preview.js
index 1a709db82bb..3de69dcb077 100644
--- a/app/assets/javascripts/admin/addon/models/email-preview.js
+++ b/app/assets/javascripts/admin/addon/models/email-preview.js
@@ -1,25 +1,21 @@
 import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 
-const EmailPreview = EmberObject.extend({});
-
-export function oneWeekAgo() {
-  return moment().locale("en").subtract(7, "days").format("YYYY-MM-DD");
-}
-
-EmailPreview.reopenClass({
-  findDigest(username, lastSeenAt) {
+export default class EmailPreview extends EmberObject {
+  static findDigest(username, lastSeenAt) {
     return ajax("/admin/email/preview-digest.json", {
       data: { last_seen_at: lastSeenAt || oneWeekAgo(), username },
     }).then((result) => EmailPreview.create(result));
-  },
+  }
 
-  sendDigest(username, lastSeenAt, email) {
+  static sendDigest(username, lastSeenAt, email) {
     return ajax("/admin/email/send-digest.json", {
       type: "POST",
       data: { last_seen_at: lastSeenAt || oneWeekAgo(), username, email },
     });
-  },
-});
+  }
+}
 
-export default EmailPreview;
+export function oneWeekAgo() {
+  return moment().locale("en").subtract(7, "days").format("YYYY-MM-DD");
+}
diff --git a/app/assets/javascripts/admin/addon/models/email-settings.js b/app/assets/javascripts/admin/addon/models/email-settings.js
index aa4a245f009..cfddf2f6a9a 100644
--- a/app/assets/javascripts/admin/addon/models/email-settings.js
+++ b/app/assets/javascripts/admin/addon/models/email-settings.js
@@ -1,14 +1,10 @@
 import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 
-const EmailSettings = EmberObject.extend({});
-
-EmailSettings.reopenClass({
-  find() {
+export default class EmailSettings extends EmberObject {
+  static find() {
     return ajax("/admin/email.json").then(function (settings) {
       return EmailSettings.create(settings);
     });
-  },
-});
-
-export default EmailSettings;
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/models/email-style.js b/app/assets/javascripts/admin/addon/models/email-style.js
index 3dd991d70ac..2824539a7a6 100644
--- a/app/assets/javascripts/admin/addon/models/email-style.js
+++ b/app/assets/javascripts/admin/addon/models/email-style.js
@@ -1,10 +1,10 @@
 import RestModel from "discourse/models/rest";
 
-export default RestModel.extend({
-  changed: false,
+export default class EmailStyle extends RestModel {
+  changed = false;
 
   setField(fieldName, value) {
     this.set(`${fieldName}`, value);
     this.set("changed", true);
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/models/email-template.js b/app/assets/javascripts/admin/addon/models/email-template.js
index 19936a6a976..f3d8c514cbd 100644
--- a/app/assets/javascripts/admin/addon/models/email-template.js
+++ b/app/assets/javascripts/admin/addon/models/email-template.js
@@ -2,12 +2,12 @@ import RestModel from "discourse/models/rest";
 import { ajax } from "discourse/lib/ajax";
 import { getProperties } from "@ember/object";
 
-export default RestModel.extend({
+export default class EmailTemplate extends RestModel {
   revert() {
     return ajax(`/admin/customize/email_templates/${this.id}`, {
       type: "DELETE",
     }).then((result) =>
       getProperties(result.email_template, "subject", "body", "can_revert")
     );
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/models/flag-type.js b/app/assets/javascripts/admin/addon/models/flag-type.js
index 5859584ce7f..3bb399fc2e5 100644
--- a/app/assets/javascripts/admin/addon/models/flag-type.js
+++ b/app/assets/javascripts/admin/addon/models/flag-type.js
@@ -2,9 +2,9 @@ import I18n from "I18n";
 import RestModel from "discourse/models/rest";
 import discourseComputed from "discourse-common/utils/decorators";
 
-export default RestModel.extend({
+export default class FlagType extends RestModel {
   @discourseComputed("id")
   name(id) {
     return I18n.t(`admin.flags.summary.action_type_${id}`, { count: 1 });
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/models/form-template.js b/app/assets/javascripts/admin/addon/models/form-template.js
new file mode 100644
index 00000000000..9981d9ebbb5
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/models/form-template.js
@@ -0,0 +1,49 @@
+import RestModel from "discourse/models/rest";
+import { ajax } from "discourse/lib/ajax";
+
+export default class FormTemplate extends RestModel {
+  static createTemplate(data) {
+    return ajax("/admin/customize/form-templates.json", {
+      type: "POST",
+      data,
+    });
+  }
+
+  static updateTemplate(id, data) {
+    return ajax(`/admin/customize/form-templates/${id}.json`, {
+      type: "PUT",
+      data,
+    });
+  }
+
+  static createOrUpdateTemplate(data) {
+    if (data.id) {
+      return this.updateTemplate(data.id, data);
+    } else {
+      return this.createTemplate(data);
+    }
+  }
+
+  static deleteTemplate(id) {
+    return ajax(`/admin/customize/form-templates/${id}.json`, {
+      type: "DELETE",
+    });
+  }
+
+  static async findAll() {
+    const result = await ajax("/admin/customize/form-templates.json");
+    return result.form_templates;
+  }
+
+  static async findById(id) {
+    const result = await ajax(`/admin/customize/form-templates/${id}.json`);
+    return result.form_template;
+  }
+
+  static validateTemplate(data) {
+    return ajax(`/admin/customize/form-templates/preview.json`, {
+      type: "GET",
+      data,
+    });
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/models/incoming-email.js b/app/assets/javascripts/admin/addon/models/incoming-email.js
index 8489ae8dd35..90c244f28af 100644
--- a/app/assets/javascripts/admin/addon/models/incoming-email.js
+++ b/app/assets/javascripts/admin/addon/models/incoming-email.js
@@ -2,28 +2,26 @@ import AdminUser from "admin/models/admin-user";
 import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 
-const IncomingEmail = EmberObject.extend({});
-
-IncomingEmail.reopenClass({
-  create(attrs) {
+export default class IncomingEmail extends EmberObject {
+  static create(attrs) {
     attrs = attrs || {};
 
     if (attrs.user) {
       attrs.user = AdminUser.create(attrs.user);
     }
 
-    return this._super(attrs);
-  },
+    return super.create(attrs);
+  }
 
-  find(id) {
+  static find(id) {
     return ajax(`/admin/email/incoming/${id}.json`);
-  },
+  }
 
-  findByBounced(id) {
+  static findByBounced(id) {
     return ajax(`/admin/email/incoming_from_bounced/${id}.json`);
-  },
+  }
 
-  findAll(filter, offset) {
+  static findAll(filter, offset) {
     filter = filter || {};
     offset = offset || 0;
 
@@ -35,11 +33,5 @@ IncomingEmail.reopenClass({
     }).then((incomings) =>
       incomings.map((incoming) => IncomingEmail.create(incoming))
     );
-  },
-
-  loadRawEmail(id) {
-    return ajax(`/admin/email/incoming/${id}/raw.json`);
-  },
-});
-
-export default IncomingEmail;
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/models/permalink.js b/app/assets/javascripts/admin/addon/models/permalink.js
index 25a3c90e037..580b111f0ae 100644
--- a/app/assets/javascripts/admin/addon/models/permalink.js
+++ b/app/assets/javascripts/admin/addon/models/permalink.js
@@ -4,7 +4,15 @@ import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import discourseComputed from "discourse-common/utils/decorators";
 
-const Permalink = EmberObject.extend({
+export default class Permalink extends EmberObject {
+  static findAll(filter) {
+    return ajax("/admin/permalinks.json", { data: { filter } }).then(function (
+      permalinks
+    ) {
+      return permalinks.map((p) => Permalink.create(p));
+    });
+  }
+
   save() {
     return ajax("/admin/permalinks.json", {
       type: "POST",
@@ -14,33 +22,21 @@ const Permalink = EmberObject.extend({
         permalink_type_value: this.permalink_type_value,
       },
     });
-  },
+  }
 
   @discourseComputed("category_id")
   category(category_id) {
     return Category.findById(category_id);
-  },
+  }
 
   @discourseComputed("external_url")
   linkIsExternal(external_url) {
     return !DiscourseURL.isInternal(external_url);
-  },
+  }
 
   destroy() {
     return ajax("/admin/permalinks/" + this.id + ".json", {
       type: "DELETE",
     });
-  },
-});
-
-Permalink.reopenClass({
-  findAll(filter) {
-    return ajax("/admin/permalinks.json", { data: { filter } }).then(function (
-      permalinks
-    ) {
-      return permalinks.map((p) => Permalink.create(p));
-    });
-  },
-});
-
-export default Permalink;
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/models/report.js b/app/assets/javascripts/admin/addon/models/report.js
index 9cd68dc7987..dd868a00e02 100644
--- a/app/assets/javascripts/admin/addon/models/report.js
+++ b/app/assets/javascripts/admin/addon/models/report.js
@@ -19,12 +19,188 @@ import round from "discourse/lib/round";
 // and you want to ensure cache is reset
 export const SCHEMA_VERSION = 4;
 
-const Report = EmberObject.extend({
-  average: false,
-  percent: false,
-  higher_is_better: true,
-  description_link: null,
-  description: null,
+export default class Report extends EmberObject {
+  static groupingForDatapoints(count) {
+    if (count < DAILY_LIMIT_DAYS) {
+      return "daily";
+    }
+
+    if (count >= DAILY_LIMIT_DAYS && count < WEEKLY_LIMIT_DAYS) {
+      return "weekly";
+    }
+
+    if (count >= WEEKLY_LIMIT_DAYS) {
+      return "monthly";
+    }
+  }
+
+  static unitForDatapoints(count) {
+    if (count >= DAILY_LIMIT_DAYS && count < WEEKLY_LIMIT_DAYS) {
+      return "week";
+    } else if (count >= WEEKLY_LIMIT_DAYS) {
+      return "month";
+    } else {
+      return "day";
+    }
+  }
+
+  static unitForGrouping(grouping) {
+    switch (grouping) {
+      case "monthly":
+        return "month";
+      case "weekly":
+        return "week";
+      default:
+        return "day";
+    }
+  }
+
+  static collapse(model, data, grouping) {
+    grouping = grouping || Report.groupingForDatapoints(data.length);
+
+    if (grouping === "daily") {
+      return data;
+    } else if (grouping === "weekly" || grouping === "monthly") {
+      const isoKind = grouping === "weekly" ? "isoWeek" : "month";
+      const kind = grouping === "weekly" ? "week" : "month";
+      const startMoment = moment(model.start_date, "YYYY-MM-DD");
+
+      let currentIndex = 0;
+      let currentStart = startMoment.clone().startOf(isoKind);
+      let currentEnd = startMoment.clone().endOf(isoKind);
+      const transformedData = [
+        {
+          x: currentStart.format("YYYY-MM-DD"),
+          y: 0,
+        },
+      ];
+
+      let appliedAverage = false;
+      data.forEach((d) => {
+        const date = moment(d.x, "YYYY-MM-DD");
+
+        if (
+          !date.isSame(currentStart) &&
+          !date.isBetween(currentStart, currentEnd)
+        ) {
+          if (model.average) {
+            transformedData[currentIndex].y = applyAverage(
+              transformedData[currentIndex].y,
+              currentStart,
+              currentEnd
+            );
+
+            appliedAverage = true;
+          }
+
+          currentIndex += 1;
+          currentStart = currentStart.add(1, kind).startOf(isoKind);
+          currentEnd = currentEnd.add(1, kind).endOf(isoKind);
+        } else {
+          appliedAverage = false;
+        }
+
+        if (transformedData[currentIndex]) {
+          transformedData[currentIndex].y += d.y;
+        } else {
+          transformedData[currentIndex] = {
+            x: d.x,
+            y: d.y,
+          };
+        }
+      });
+
+      if (model.average && !appliedAverage) {
+        transformedData[currentIndex].y = applyAverage(
+          transformedData[currentIndex].y,
+          currentStart,
+          moment(model.end_date).subtract(1, "day") // remove 1 day as model end date is at 00:00 of next day
+        );
+      }
+
+      return transformedData;
+    }
+
+    // ensure we return something if grouping is unknown
+    return data;
+  }
+
+  static fillMissingDates(report, options = {}) {
+    const dataField = options.dataField || "data";
+    const filledField = options.filledField || "data";
+    const startDate = options.startDate || "start_date";
+    const endDate = options.endDate || "end_date";
+
+    if (Array.isArray(report[dataField])) {
+      const startDateFormatted = moment
+        .utc(report[startDate])
+        .locale("en")
+        .format("YYYY-MM-DD");
+      const endDateFormatted = moment
+        .utc(report[endDate])
+        .locale("en")
+        .format("YYYY-MM-DD");
+
+      if (report.modes[0] === "stacked_chart") {
+        report[filledField] = report[dataField].map((rep) => {
+          return {
+            req: rep.req,
+            label: rep.label,
+            color: rep.color,
+            data: fillMissingDates(
+              JSON.parse(JSON.stringify(rep.data)),
+              startDateFormatted,
+              endDateFormatted
+            ),
+          };
+        });
+      } else {
+        report[filledField] = fillMissingDates(
+          JSON.parse(JSON.stringify(report[dataField])),
+          startDateFormatted,
+          endDateFormatted
+        );
+      }
+    }
+  }
+
+  static find(type, startDate, endDate, categoryId, groupId) {
+    return ajax("/admin/reports/" + type, {
+      data: {
+        start_date: startDate,
+        end_date: endDate,
+        category_id: categoryId,
+        group_id: groupId,
+      },
+    }).then((json) => {
+      // don’t fill for large multi column tables
+      // which are not date based
+      const modes = json.report.modes;
+      if (modes.length !== 1 && modes[0] !== "table") {
+        Report.fillMissingDates(json.report);
+      }
+
+      const model = Report.create({ type });
+      model.setProperties(json.report);
+
+      if (json.report.related_report) {
+        // TODO: fillMissingDates if xaxis is date
+        const related = Report.create({
+          type: json.report.related_report.type,
+        });
+        related.setProperties(json.report.related_report);
+        model.set("relatedReport", related);
+      }
+
+      return model;
+    });
+  }
+
+  average = false;
+  percent = false;
+  higher_is_better = true;
+  description_link = null;
+  description = null;
 
   @discourseComputed("type", "start_date", "end_date")
   reportUrl(type, start_date, end_date) {
@@ -35,7 +211,7 @@ const Report = EmberObject.extend({
     return getURL(
       `/admin/reports/${type}?start_date=${start_date}&end_date=${end_date}`
     );
-  },
+  }
 
   valueAt(numDaysAgo) {
     if (this.data) {
@@ -49,7 +225,7 @@ const Report = EmberObject.extend({
       }
     }
     return 0;
-  },
+  }
 
   valueFor(startDaysAgo, endDaysAgo) {
     if (this.data) {
@@ -70,46 +246,46 @@ const Report = EmberObject.extend({
       }
       return round(sum, -2);
     }
-  },
+  }
 
   @discourseComputed("data", "average")
   todayCount() {
     return this.valueAt(0);
-  },
+  }
 
   @discourseComputed("data", "average")
   yesterdayCount() {
     return this.valueAt(1);
-  },
+  }
 
   @discourseComputed("data", "average")
   sevenDaysAgoCount() {
     return this.valueAt(7);
-  },
+  }
 
   @discourseComputed("data", "average")
   thirtyDaysAgoCount() {
     return this.valueAt(30);
-  },
+  }
 
   @discourseComputed("data", "average")
   lastSevenDaysCount() {
     return this.averageCount(7, this.valueFor(1, 7));
-  },
+  }
 
   @discourseComputed("data", "average")
   lastThirtyDaysCount() {
     return this.averageCount(30, this.valueFor(1, 30));
-  },
+  }
 
   averageCount(count, value) {
     return this.average ? value / count : value;
-  },
+  }
 
   @discourseComputed("yesterdayCount", "higher_is_better")
   yesterdayTrend(yesterdayCount, higherIsBetter) {
     return this._computeTrend(this.valueAt(2), yesterdayCount, higherIsBetter);
-  },
+  }
 
   @discourseComputed("lastSevenDaysCount", "higher_is_better")
   sevenDaysTrend(lastSevenDaysCount, higherIsBetter) {
@@ -118,39 +294,39 @@ const Report = EmberObject.extend({
       lastSevenDaysCount,
       higherIsBetter
     );
-  },
+  }
 
   @discourseComputed("data")
   currentTotal(data) {
     return data.reduce((cur, pair) => cur + pair.y, 0);
-  },
+  }
 
   @discourseComputed("data", "currentTotal")
   currentAverage(data, total) {
     return makeArray(data).length === 0
       ? 0
       : parseFloat((total / parseFloat(data.length)).toFixed(1));
-  },
+  }
 
   @discourseComputed("trend", "higher_is_better")
   trendIcon(trend, higherIsBetter) {
     return this._iconForTrend(trend, higherIsBetter);
-  },
+  }
 
   @discourseComputed("sevenDaysTrend", "higher_is_better")
   sevenDaysTrendIcon(sevenDaysTrend, higherIsBetter) {
     return this._iconForTrend(sevenDaysTrend, higherIsBetter);
-  },
+  }
 
   @discourseComputed("thirtyDaysTrend", "higher_is_better")
   thirtyDaysTrendIcon(thirtyDaysTrend, higherIsBetter) {
     return this._iconForTrend(thirtyDaysTrend, higherIsBetter);
-  },
+  }
 
   @discourseComputed("yesterdayTrend", "higher_is_better")
   yesterdayTrendIcon(yesterdayTrend, higherIsBetter) {
     return this._iconForTrend(yesterdayTrend, higherIsBetter);
-  },
+  }
 
   @discourseComputed(
     "prev_period",
@@ -161,7 +337,7 @@ const Report = EmberObject.extend({
   trend(prev, currentTotal, currentAverage, higherIsBetter) {
     const total = this.average ? currentAverage : currentTotal;
     return this._computeTrend(prev, total, higherIsBetter);
-  },
+  }
 
   @discourseComputed(
     "prev30Days",
@@ -180,7 +356,7 @@ const Report = EmberObject.extend({
       lastThirtyDaysCount,
       higherIsBetter
     );
-  },
+  }
 
   @discourseComputed("type")
   method(type) {
@@ -189,7 +365,7 @@ const Report = EmberObject.extend({
     } else {
       return "sum";
     }
-  },
+  }
 
   percentChangeString(val1, val2) {
     const change = this._computeChange(val1, val2);
@@ -201,7 +377,7 @@ const Report = EmberObject.extend({
     } else {
       return change.toFixed(0) + "%";
     }
-  },
+  }
 
   @discourseComputed("prev_period", "currentTotal", "currentAverage")
   trendTitle(prev, currentTotal, currentAverage) {
@@ -224,7 +400,7 @@ const Report = EmberObject.extend({
       prev,
       current,
     });
-  },
+  }
 
   changeTitle(valAtT1, valAtT2, prevPeriodString) {
     const change = this.percentChangeString(valAtT1, valAtT2);
@@ -234,12 +410,12 @@ const Report = EmberObject.extend({
     }
     title += `Was ${number(valAtT1)} ${prevPeriodString}.`;
     return title;
-  },
+  }
 
   @discourseComputed("yesterdayCount")
   yesterdayCountTitle(yesterdayCount) {
     return this.changeTitle(this.valueAt(2), yesterdayCount, "two days ago");
-  },
+  }
 
   @discourseComputed("lastSevenDaysCount")
   sevenDaysCountTitle(lastSevenDaysCount) {
@@ -248,12 +424,12 @@ const Report = EmberObject.extend({
       lastSevenDaysCount,
       "two weeks ago"
     );
-  },
+  }
 
   @discourseComputed("prev30Days", "prev_period")
   canDisplayTrendIcon(prev30Days, prev_period) {
     return prev30Days ?? prev_period;
-  },
+  }
 
   @discourseComputed("prev30Days", "prev_period", "lastThirtyDaysCount")
   thirtyDaysCountTitle(prev30Days, prev_period, lastThirtyDaysCount) {
@@ -262,12 +438,12 @@ const Report = EmberObject.extend({
       lastThirtyDaysCount,
       "in the previous 30 day period"
     );
-  },
+  }
 
   @discourseComputed("data")
   sortedData(data) {
     return this.xAxisIsDate ? data.toArray().reverse() : data.toArray();
-  },
+  }
 
   @discourseComputed("data")
   xAxisIsDate() {
@@ -275,7 +451,7 @@ const Report = EmberObject.extend({
       return false;
     }
     return this.data && this.data[0].x.match(/\d{4}-\d{1,2}-\d{1,2}/);
-  },
+  }
 
   @discourseComputed("labels")
   computedLabels(labels) {
@@ -359,7 +535,7 @@ const Report = EmberObject.extend({
         },
       };
     });
-  },
+  }
 
   _userLabel(properties, row) {
     const username = row[properties.username];
@@ -388,7 +564,7 @@ const Report = EmberObject.extend({
       value: username,
       formattedValue: username ? formattedValue() : "—",
     };
-  },
+  }
 
   _topicLabel(properties, row) {
     const topicTitle = row[properties.title];
@@ -403,7 +579,7 @@ const Report = EmberObject.extend({
       value: topicTitle,
       formattedValue: topicTitle ? formattedValue() : "—",
     };
-  },
+  }
 
   _postLabel(properties, row) {
     const postTitle = row[properties.truncated_raw];
@@ -419,21 +595,21 @@ const Report = EmberObject.extend({
           ? `<a href='${href}'>${escapeExpression(postTitle)}</a>`
           : "—",
     };
-  },
+  }
 
   _secondsLabel(value) {
     return {
       value: toNumber(value),
       formattedValue: durationTiny(value),
     };
-  },
+  }
 
   _percentLabel(value) {
     return {
       value: toNumber(value),
       formattedValue: value ? `${value}%` : "—",
     };
-  },
+  }
 
   _numberLabel(value, options = {}) {
     const formatNumbers = isEmpty(options.formatNumbers)
@@ -446,21 +622,21 @@ const Report = EmberObject.extend({
       value: toNumber(value),
       formattedValue: value ? formattedValue() : "—",
     };
-  },
+  }
 
   _bytesLabel(value) {
     return {
       value: toNumber(value),
       formattedValue: I18n.toHumanSize(value),
     };
-  },
+  }
 
   _dateLabel(value, date, format = "LL") {
     return {
       value,
       formattedValue: value ? date.format(format) : "—",
     };
-  },
+  }
 
   _textLabel(value) {
     const escaped = escapeExpression(value);
@@ -469,7 +645,7 @@ const Report = EmberObject.extend({
       value,
       formattedValue: value ? escaped : "—",
     };
-  },
+  }
 
   _linkLabel(properties, row) {
     const property = properties[0];
@@ -484,11 +660,11 @@ const Report = EmberObject.extend({
       value,
       formattedValue: value ? formattedValue(value, row[properties[1]]) : "—",
     };
-  },
+  }
 
   _computeChange(valAtT1, valAtT2) {
     return ((valAtT2 - valAtT1) / valAtT1) * 100;
-  },
+  }
 
   _computeTrend(valAtT1, valAtT2, higherIsBetter) {
     const change = this._computeChange(valAtT1, valAtT2);
@@ -504,7 +680,7 @@ const Report = EmberObject.extend({
     } else if (change < -2) {
       return higherIsBetter ? "trending-down" : "trending-up";
     }
-  },
+  }
 
   _iconForTrend(trend, higherIsBetter) {
     switch (trend) {
@@ -519,8 +695,8 @@ const Report = EmberObject.extend({
       default:
         return "minus";
     }
-  },
-});
+  }
+}
 
 export const WEEKLY_LIMIT_DAYS = 365;
 export const DAILY_LIMIT_DAYS = 34;
@@ -529,183 +705,3 @@ function applyAverage(value, start, end) {
   const count = end.diff(start, "day") + 1; // 1 to include start
   return parseFloat((value / count).toFixed(2));
 }
-
-Report.reopenClass({
-  groupingForDatapoints(count) {
-    if (count < DAILY_LIMIT_DAYS) {
-      return "daily";
-    }
-
-    if (count >= DAILY_LIMIT_DAYS && count < WEEKLY_LIMIT_DAYS) {
-      return "weekly";
-    }
-
-    if (count >= WEEKLY_LIMIT_DAYS) {
-      return "monthly";
-    }
-  },
-
-  unitForDatapoints(count) {
-    if (count >= DAILY_LIMIT_DAYS && count < WEEKLY_LIMIT_DAYS) {
-      return "week";
-    } else if (count >= WEEKLY_LIMIT_DAYS) {
-      return "month";
-    } else {
-      return "day";
-    }
-  },
-
-  unitForGrouping(grouping) {
-    switch (grouping) {
-      case "monthly":
-        return "month";
-      case "weekly":
-        return "week";
-      default:
-        return "day";
-    }
-  },
-
-  collapse(model, data, grouping) {
-    grouping = grouping || Report.groupingForDatapoints(data.length);
-
-    if (grouping === "daily") {
-      return data;
-    } else if (grouping === "weekly" || grouping === "monthly") {
-      const isoKind = grouping === "weekly" ? "isoWeek" : "month";
-      const kind = grouping === "weekly" ? "week" : "month";
-      const startMoment = moment(model.start_date, "YYYY-MM-DD");
-
-      let currentIndex = 0;
-      let currentStart = startMoment.clone().startOf(isoKind);
-      let currentEnd = startMoment.clone().endOf(isoKind);
-      const transformedData = [
-        {
-          x: currentStart.format("YYYY-MM-DD"),
-          y: 0,
-        },
-      ];
-
-      let appliedAverage = false;
-      data.forEach((d) => {
-        const date = moment(d.x, "YYYY-MM-DD");
-
-        if (
-          !date.isSame(currentStart) &&
-          !date.isBetween(currentStart, currentEnd)
-        ) {
-          if (model.average) {
-            transformedData[currentIndex].y = applyAverage(
-              transformedData[currentIndex].y,
-              currentStart,
-              currentEnd
-            );
-
-            appliedAverage = true;
-          }
-
-          currentIndex += 1;
-          currentStart = currentStart.add(1, kind).startOf(isoKind);
-          currentEnd = currentEnd.add(1, kind).endOf(isoKind);
-        } else {
-          appliedAverage = false;
-        }
-
-        if (transformedData[currentIndex]) {
-          transformedData[currentIndex].y += d.y;
-        } else {
-          transformedData[currentIndex] = {
-            x: d.x,
-            y: d.y,
-          };
-        }
-      });
-
-      if (model.average && !appliedAverage) {
-        transformedData[currentIndex].y = applyAverage(
-          transformedData[currentIndex].y,
-          currentStart,
-          moment(model.end_date).subtract(1, "day") // remove 1 day as model end date is at 00:00 of next day
-        );
-      }
-
-      return transformedData;
-    }
-
-    // ensure we return something if grouping is unknown
-    return data;
-  },
-
-  fillMissingDates(report, options = {}) {
-    const dataField = options.dataField || "data";
-    const filledField = options.filledField || "data";
-    const startDate = options.startDate || "start_date";
-    const endDate = options.endDate || "end_date";
-
-    if (Array.isArray(report[dataField])) {
-      const startDateFormatted = moment
-        .utc(report[startDate])
-        .locale("en")
-        .format("YYYY-MM-DD");
-      const endDateFormatted = moment
-        .utc(report[endDate])
-        .locale("en")
-        .format("YYYY-MM-DD");
-
-      if (report.modes[0] === "stacked_chart") {
-        report[filledField] = report[dataField].map((rep) => {
-          return {
-            req: rep.req,
-            label: rep.label,
-            color: rep.color,
-            data: fillMissingDates(
-              JSON.parse(JSON.stringify(rep.data)),
-              startDateFormatted,
-              endDateFormatted
-            ),
-          };
-        });
-      } else {
-        report[filledField] = fillMissingDates(
-          JSON.parse(JSON.stringify(report[dataField])),
-          startDateFormatted,
-          endDateFormatted
-        );
-      }
-    }
-  },
-
-  find(type, startDate, endDate, categoryId, groupId) {
-    return ajax("/admin/reports/" + type, {
-      data: {
-        start_date: startDate,
-        end_date: endDate,
-        category_id: categoryId,
-        group_id: groupId,
-      },
-    }).then((json) => {
-      // don’t fill for large multi column tables
-      // which are not date based
-      const modes = json.report.modes;
-      if (modes.length !== 1 && modes[0] !== "table") {
-        Report.fillMissingDates(json.report);
-      }
-
-      const model = Report.create({ type });
-      model.setProperties(json.report);
-
-      if (json.report.related_report) {
-        // TODO: fillMissingDates if xaxis is date
-        const related = Report.create({
-          type: json.report.related_report.type,
-        });
-        related.setProperties(json.report.related_report);
-        model.set("relatedReport", related);
-      }
-
-      return model;
-    });
-  },
-});
-
-export default Report;
diff --git a/app/assets/javascripts/admin/addon/models/screened-email.js b/app/assets/javascripts/admin/addon/models/screened-email.js
index 62e985949df..8d7a3161ad8 100644
--- a/app/assets/javascripts/admin/addon/models/screened-email.js
+++ b/app/assets/javascripts/admin/addon/models/screened-email.js
@@ -3,21 +3,8 @@ import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
 import discourseComputed from "discourse-common/utils/decorators";
 
-const ScreenedEmail = EmberObject.extend({
-  @discourseComputed("action")
-  actionName(action) {
-    return I18n.t("admin.logs.screened_actions." + action);
-  },
-
-  clearBlock() {
-    return ajax("/admin/logs/screened_emails/" + this.id, {
-      type: "DELETE",
-    });
-  },
-});
-
-ScreenedEmail.reopenClass({
-  findAll() {
+export default class ScreenedEmail extends EmberObject {
+  static findAll() {
     return ajax("/admin/logs/screened_emails.json").then(function (
       screened_emails
     ) {
@@ -25,7 +12,16 @@ ScreenedEmail.reopenClass({
         return ScreenedEmail.create(b);
       });
     });
-  },
-});
+  }
 
-export default ScreenedEmail;
+  @discourseComputed("action")
+  actionName(action) {
+    return I18n.t("admin.logs.screened_actions." + action);
+  }
+
+  clearBlock() {
+    return ajax("/admin/logs/screened_emails/" + this.id, {
+      type: "DELETE",
+    });
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/models/screened-ip-address.js b/app/assets/javascripts/admin/addon/models/screened-ip-address.js
index 0fe7578f89f..87979087aaa 100644
--- a/app/assets/javascripts/admin/addon/models/screened-ip-address.js
+++ b/app/assets/javascripts/admin/addon/models/screened-ip-address.js
@@ -1,21 +1,28 @@
+import { equal } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
 import discourseComputed from "discourse-common/utils/decorators";
-import { equal } from "@ember/object/computed";
 
-const ScreenedIpAddress = EmberObject.extend({
+export default class ScreenedIpAddress extends EmberObject {
+  static findAll(filter) {
+    return ajax("/admin/logs/screened_ip_addresses.json", {
+      data: { filter },
+    }).then((screened_ips) =>
+      screened_ips.map((b) => ScreenedIpAddress.create(b))
+    );
+  }
+
+  @equal("action_name", "block") isBlocked;
   @discourseComputed("action_name")
   actionName(actionName) {
     return I18n.t(`admin.logs.screened_ips.actions.${actionName}`);
-  },
-
-  isBlocked: equal("action_name", "block"),
+  }
 
   @discourseComputed("ip_address")
   isRange(ipAddress) {
     return ipAddress.indexOf("/") > 0;
-  },
+  }
 
   save() {
     return ajax(
@@ -30,23 +37,11 @@ const ScreenedIpAddress = EmberObject.extend({
         },
       }
     );
-  },
+  }
 
   destroy() {
     return ajax("/admin/logs/screened_ip_addresses/" + this.id + ".json", {
       type: "DELETE",
     });
-  },
-});
-
-ScreenedIpAddress.reopenClass({
-  findAll(filter) {
-    return ajax("/admin/logs/screened_ip_addresses.json", {
-      data: { filter },
-    }).then((screened_ips) =>
-      screened_ips.map((b) => ScreenedIpAddress.create(b))
-    );
-  },
-});
-
-export default ScreenedIpAddress;
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/models/screened-url.js b/app/assets/javascripts/admin/addon/models/screened-url.js
index 9a0d4e1b737..3d2c5f97941 100644
--- a/app/assets/javascripts/admin/addon/models/screened-url.js
+++ b/app/assets/javascripts/admin/addon/models/screened-url.js
@@ -3,15 +3,8 @@ import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
 import discourseComputed from "discourse-common/utils/decorators";
 
-const ScreenedUrl = EmberObject.extend({
-  @discourseComputed("action")
-  actionName(action) {
-    return I18n.t("admin.logs.screened_actions." + action);
-  },
-});
-
-ScreenedUrl.reopenClass({
-  findAll() {
+export default class ScreenedUrl extends EmberObject {
+  static findAll() {
     return ajax("/admin/logs/screened_urls.json").then(function (
       screened_urls
     ) {
@@ -19,7 +12,10 @@ ScreenedUrl.reopenClass({
         return ScreenedUrl.create(b);
       });
     });
-  },
-});
+  }
 
-export default ScreenedUrl;
+  @discourseComputed("action")
+  actionName(action) {
+    return I18n.t("admin.logs.screened_actions." + action);
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/models/site-setting.js b/app/assets/javascripts/admin/addon/models/site-setting.js
index 49ed58366e1..6cd7852834e 100644
--- a/app/assets/javascripts/admin/addon/models/site-setting.js
+++ b/app/assets/javascripts/admin/addon/models/site-setting.js
@@ -4,22 +4,8 @@ import Setting from "admin/mixins/setting-object";
 import { ajax } from "discourse/lib/ajax";
 import discourseComputed from "discourse-common/utils/decorators";
 
-const SiteSetting = EmberObject.extend(Setting, {
-  @discourseComputed("setting")
-  staffLogFilter(setting) {
-    if (!setting) {
-      return;
-    }
-
-    return {
-      subject: setting,
-      action_name: "change_site_setting",
-    };
-  },
-});
-
-SiteSetting.reopenClass({
-  findAll() {
+export default class SiteSetting extends EmberObject.extend(Setting) {
+  static findAll() {
     return ajax("/admin/site_settings").then(function (settings) {
       // Group the results by category
       const categories = {};
@@ -38,9 +24,9 @@ SiteSetting.reopenClass({
         };
       });
     });
-  },
+  }
 
-  update(key, value, opts = {}) {
+  static update(key, value, opts = {}) {
     const data = {};
     data[key] = value;
 
@@ -49,7 +35,17 @@ SiteSetting.reopenClass({
     }
 
     return ajax(`/admin/site_settings/${key}`, { type: "PUT", data });
-  },
-});
+  }
 
-export default SiteSetting;
+  @discourseComputed("setting")
+  staffLogFilter(setting) {
+    if (!setting) {
+      return;
+    }
+
+    return {
+      subject: setting,
+      action_name: "change_site_setting",
+    };
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/models/site-text.js b/app/assets/javascripts/admin/addon/models/site-text.js
index c25a5b30a00..0460ab3d9dc 100644
--- a/app/assets/javascripts/admin/addon/models/site-text.js
+++ b/app/assets/javascripts/admin/addon/models/site-text.js
@@ -2,10 +2,19 @@ import RestModel from "discourse/models/rest";
 import { ajax } from "discourse/lib/ajax";
 import { getProperties } from "@ember/object";
 
-export default RestModel.extend({
+export default class SiteText extends RestModel {
   revert(locale) {
     return ajax(`/admin/customize/site_texts/${this.id}?locale=${locale}`, {
       type: "DELETE",
     }).then((result) => getProperties(result.site_text, "value", "can_revert"));
-  },
-});
+  }
+
+  dismissOutdated(locale) {
+    return ajax(
+      `/admin/customize/site_texts/${this.id}/dismiss_outdated?locale=${locale}`,
+      {
+        type: "PUT",
+      }
+    );
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/models/staff-action-log.js b/app/assets/javascripts/admin/addon/models/staff-action-log.js
index 70d86c41e77..4eb7864dd44 100644
--- a/app/assets/javascripts/admin/addon/models/staff-action-log.js
+++ b/app/assets/javascripts/admin/addon/models/staff-action-log.js
@@ -11,13 +11,36 @@ function format(label, value, escape = true) {
     : "";
 }
 
-const StaffActionLog = RestModel.extend({
-  showFullDetails: false,
+export default class StaffActionLog extends RestModel {
+  static munge(json) {
+    if (json.acting_user) {
+      json.acting_user = AdminUser.create(json.acting_user);
+    }
+    if (json.target_user) {
+      json.target_user = AdminUser.create(json.target_user);
+    }
+    return json;
+  }
+
+  static findAll(data) {
+    return ajax("/admin/logs/staff_action_logs.json", { data }).then(
+      (result) => {
+        return {
+          staff_action_logs: result.staff_action_logs.map((s) =>
+            StaffActionLog.create(s)
+          ),
+          user_history_actions: result.user_history_actions,
+        };
+      }
+    );
+  }
+
+  showFullDetails = false;
 
   @discourseComputed("action_name")
   actionName(actionName) {
     return I18n.t(`admin.logs.staff_actions.actions.${actionName}`);
-  },
+  }
 
   @discourseComputed(
     "email",
@@ -72,42 +95,15 @@ const StaffActionLog = RestModel.extend({
 
     const formatted = lines.filter((l) => l.length > 0).join("<br/>");
     return formatted.length > 0 ? formatted + "<br/>" : "";
-  },
+  }
 
   @discourseComputed("details")
   useModalForDetails(details) {
     return details && details.length > 100;
-  },
+  }
 
   @discourseComputed("action_name")
   useCustomModalForDetails(actionName) {
     return ["change_theme", "delete_theme"].includes(actionName);
-  },
-});
-
-StaffActionLog.reopenClass({
-  munge(json) {
-    if (json.acting_user) {
-      json.acting_user = AdminUser.create(json.acting_user);
-    }
-    if (json.target_user) {
-      json.target_user = AdminUser.create(json.target_user);
-    }
-    return json;
-  },
-
-  findAll(data) {
-    return ajax("/admin/logs/staff_action_logs.json", { data }).then(
-      (result) => {
-        return {
-          staff_action_logs: result.staff_action_logs.map((s) =>
-            StaffActionLog.create(s)
-          ),
-          user_history_actions: result.user_history_actions,
-        };
-      }
-    );
-  },
-});
-
-export default StaffActionLog;
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/models/theme-settings.js b/app/assets/javascripts/admin/addon/models/theme-settings.js
index d91c3e583ef..f61da7c2c0e 100644
--- a/app/assets/javascripts/admin/addon/models/theme-settings.js
+++ b/app/assets/javascripts/admin/addon/models/theme-settings.js
@@ -1,4 +1,4 @@
 import EmberObject from "@ember/object";
 import Setting from "admin/mixins/setting-object";
 
-export default EmberObject.extend(Setting, {});
+export default class ThemeSettings extends EmberObject.extend(Setting) {}
diff --git a/app/assets/javascripts/admin/addon/models/theme.js b/app/assets/javascripts/admin/addon/models/theme.js
index d41ecb7f5f7..83d96dddffc 100644
--- a/app/assets/javascripts/admin/addon/models/theme.js
+++ b/app/assets/javascripts/admin/addon/models/theme.js
@@ -13,11 +13,13 @@ export const THEMES = "themes";
 export const COMPONENTS = "components";
 const SETTINGS_TYPE_ID = 5;
 
-const Theme = RestModel.extend({
-  isActive: or("default", "user_selectable"),
-  isPendingUpdates: gt("remote_theme.commits_behind", 0),
-  hasEditedFields: gt("editedFields.length", 0),
-  hasParents: gt("parent_themes.length", 0),
+class Theme extends RestModel {
+  @or("default", "user_selectable") isActive;
+  @gt("remote_theme.commits_behind", 0) isPendingUpdates;
+  @gt("editedFields.length", 0) hasEditedFields;
+  @gt("parent_themes.length", 0) hasParents;
+
+  changed = false;
 
   @discourseComputed("theme_fields.[]")
   targets() {
@@ -45,7 +47,7 @@ const Theme = RestModel.extend({
       target["error"] = this.hasError(target.name);
       return target;
     });
-  },
+  }
 
   @discourseComputed("theme_fields.[]")
   fieldNames() {
@@ -67,7 +69,12 @@ const Theme = RestModel.extend({
     }
 
     return {
-      common: [...common, "embedded_scss", "color_definitions"],
+      common: [
+        ...common,
+        "color_definitions",
+        "embedded_scss",
+        "embedded_header",
+      ],
       desktop: common,
       mobile: common,
       settings: ["yaml"],
@@ -79,7 +86,7 @@ const Theme = RestModel.extend({
       ],
       extra_scss: scss_fields,
     };
-  },
+  }
 
   @discourseComputed(
     "fieldNames",
@@ -113,7 +120,7 @@ const Theme = RestModel.extend({
       });
     });
     return hash;
-  },
+  }
 
   @discourseComputed("theme_fields")
   themeFields(fields) {
@@ -129,7 +136,7 @@ const Theme = RestModel.extend({
       }
     });
     return hash;
-  },
+  }
 
   @discourseComputed("theme_fields", "theme_fields.[]")
   uploads(fields) {
@@ -139,32 +146,32 @@ const Theme = RestModel.extend({
     return fields.filter(
       (f) => f.target === "common" && f.type_id === THEME_UPLOAD_VAR
     );
-  },
+  }
 
   @discourseComputed("theme_fields", "theme_fields.@each.error")
   isBroken(fields) {
     return (
       fields && fields.any((field) => field.error && field.error.length > 0)
     );
-  },
+  }
 
   @discourseComputed("theme_fields.[]")
   editedFields(fields) {
     return fields.filter(
       (field) => !isBlank(field.value) && field.type_id !== SETTINGS_TYPE_ID
     );
-  },
+  }
 
   @discourseComputed("remote_theme.last_error_text")
   remoteError(errorText) {
     if (errorText && errorText.length > 0) {
       return errorText;
     }
-  },
+  }
 
   getKey(field) {
     return `${field.target} ${field.name}`;
-  },
+  }
 
   hasEdited(target, name) {
     if (name) {
@@ -175,27 +182,27 @@ const Theme = RestModel.extend({
         (field) => field.target === target && !isEmpty(field.value)
       );
     }
-  },
+  }
 
   hasError(target, name) {
     return this.theme_fields
       .filter((f) => f.target === target && (!name || name === f.name))
       .any((f) => f.error);
-  },
+  }
 
   getError(target, name) {
     let themeFields = this.themeFields;
     let key = this.getKey({ target, name });
     let field = themeFields[key];
     return field ? field.error : "";
-  },
+  }
 
   getField(target, name) {
     let themeFields = this.themeFields;
     let key = this.getKey({ target, name });
     let field = themeFields[key];
     return field ? field.value : "";
-  },
+  }
 
   removeField(field) {
     this.set("changed", true);
@@ -204,7 +211,7 @@ const Theme = RestModel.extend({
     field.value = null;
 
     return this.saveChanges("theme_fields");
-  },
+  }
 
   setField(target, name, value, upload_id, type_id) {
     this.set("changed", true);
@@ -244,25 +251,25 @@ const Theme = RestModel.extend({
         this.notifyPropertyChange("theme_fields.[]");
       }
     }
-  },
+  }
 
   @discourseComputed("childThemes.[]")
   child_theme_ids(childThemes) {
     if (childThemes) {
       return childThemes.map((theme) => get(theme, "id"));
     }
-  },
+  }
 
   @discourseComputed("recentlyInstalled", "component", "hasParents")
   warnUnassignedComponent(recent, component, hasParents) {
     return recent && component && !hasParents;
-  },
+  }
 
   removeChildTheme(theme) {
     const childThemes = this.childThemes;
     childThemes.removeObject(theme);
     return this.saveChanges("child_theme_ids");
-  },
+  }
 
   addChildTheme(theme) {
     let childThemes = this.childThemes;
@@ -273,7 +280,7 @@ const Theme = RestModel.extend({
     childThemes.removeObject(theme);
     childThemes.pushObject(theme);
     return this.saveChanges("child_theme_ids");
-  },
+  }
 
   addParentTheme(theme) {
     let parentThemes = this.parentThemes;
@@ -282,38 +289,26 @@ const Theme = RestModel.extend({
       this.set("parentThemes", parentThemes);
     }
     parentThemes.addObject(theme);
-  },
+  }
 
   checkForUpdates() {
     return this.save({ remote_check: true }).then(() =>
       this.set("changed", false)
     );
-  },
+  }
 
   updateToLatest() {
     return this.save({ remote_update: true }).then(() =>
       this.set("changed", false)
     );
-  },
-
-  changed: false,
+  }
 
   saveChanges() {
     const hash = this.getProperties.apply(this, arguments);
     return this.save(hash)
       .finally(() => this.set("changed", false))
       .catch(popupAjaxError);
-  },
-
-  saveSettings(name, value) {
-    const settings = {};
-    settings[name] = value;
-    return this.save({ settings });
-  },
-
-  saveTranslation(name, value) {
-    return this.save({ translations: { [name]: value } });
-  },
-});
+  }
+}
 
 export default Theme;
diff --git a/app/assets/javascripts/admin/addon/models/tl3-requirements.js b/app/assets/javascripts/admin/addon/models/tl3-requirements.js
index 920d6e5f665..43a41362369 100644
--- a/app/assets/javascripts/admin/addon/models/tl3-requirements.js
+++ b/app/assets/javascripts/admin/addon/models/tl3-requirements.js
@@ -1,21 +1,21 @@
 import EmberObject from "@ember/object";
 import discourseComputed from "discourse-common/utils/decorators";
 
-export default EmberObject.extend({
+export default class Tl3Requirements extends EmberObject {
   @discourseComputed("days_visited", "time_period")
   days_visited_percent(daysVisited, timePeriod) {
     return Math.round((daysVisited * 100) / timePeriod);
-  },
+  }
 
   @discourseComputed("min_days_visited", "time_period")
   min_days_visited_percent(minDaysVisited, timePeriod) {
     return Math.round((minDaysVisited * 100) / timePeriod);
-  },
+  }
 
   @discourseComputed("num_topics_replied_to", "min_topics_replied_to")
   capped_topics_replied_to(numReplied, minReplied) {
     return numReplied > minReplied;
-  },
+  }
 
   @discourseComputed(
     "days_visited",
@@ -71,5 +71,5 @@ export default EmberObject.extend({
       silenced: this.get("penalty_counts.silenced") === 0,
       suspended: this.get("penalty_counts.suspended") === 0,
     };
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/models/user-field.js b/app/assets/javascripts/admin/addon/models/user-field.js
index 53b92a63fd9..5a8bdea1832 100644
--- a/app/assets/javascripts/admin/addon/models/user-field.js
+++ b/app/assets/javascripts/admin/addon/models/user-field.js
@@ -2,14 +2,8 @@ import EmberObject from "@ember/object";
 import RestModel from "discourse/models/rest";
 import { i18n } from "discourse/lib/computed";
 
-const UserField = RestModel.extend();
-
-const UserFieldType = EmberObject.extend({
-  name: i18n("id", "admin.user_fields.field_types.%@"),
-});
-
-UserField.reopenClass({
-  fieldTypes() {
+export default class UserField extends RestModel {
+  static fieldTypes() {
     if (!this._fieldTypes) {
       this._fieldTypes = [
         UserFieldType.create({ id: "text" }),
@@ -20,11 +14,13 @@ UserField.reopenClass({
     }
 
     return this._fieldTypes;
-  },
+  }
 
-  fieldTypeById(id) {
+  static fieldTypeById(id) {
     return this.fieldTypes().findBy("id", id);
-  },
-});
+  }
+}
 
-export default UserField;
+class UserFieldType extends EmberObject {
+  @i18n("id", "admin.user_fields.field_types.%@") name;
+}
diff --git a/app/assets/javascripts/admin/addon/models/version-check.js b/app/assets/javascripts/admin/addon/models/version-check.js
index edf6ad5e0e6..baf029c3c47 100644
--- a/app/assets/javascripts/admin/addon/models/version-check.js
+++ b/app/assets/javascripts/admin/addon/models/version-check.js
@@ -2,43 +2,39 @@ import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import discourseComputed from "discourse-common/utils/decorators";
 
-const VersionCheck = EmberObject.extend({
+export default class VersionCheck extends EmberObject {
+  static find() {
+    return ajax("/admin/version_check").then((json) =>
+      VersionCheck.create(json)
+    );
+  }
+
   @discourseComputed("updated_at")
   noCheckPerformed(updatedAt) {
     return updatedAt === null;
-  },
+  }
 
   @discourseComputed("missing_versions_count")
   upToDate(missingVersionsCount) {
     return missingVersionsCount === 0 || missingVersionsCount === null;
-  },
+  }
 
   @discourseComputed("missing_versions_count")
   behindByOneVersion(missingVersionsCount) {
     return missingVersionsCount === 1;
-  },
+  }
 
   @discourseComputed("installed_sha")
   gitLink(installedSHA) {
     if (installedSHA) {
       return `https://github.com/discourse/discourse/commits/${installedSHA}`;
     }
-  },
+  }
 
   @discourseComputed("installed_sha")
   shortSha(installedSHA) {
     if (installedSHA) {
       return installedSHA.slice(0, 10);
     }
-  },
-});
-
-VersionCheck.reopenClass({
-  find() {
-    return ajax("/admin/version_check").then((json) =>
-      VersionCheck.create(json)
-    );
-  },
-});
-
-export default VersionCheck;
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/models/watched-word.js b/app/assets/javascripts/admin/addon/models/watched-word.js
index ceb9317f369..a6de62cc9db 100644
--- a/app/assets/javascripts/admin/addon/models/watched-word.js
+++ b/app/assets/javascripts/admin/addon/models/watched-word.js
@@ -2,34 +2,8 @@ import EmberObject from "@ember/object";
 import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
 
-const WatchedWord = EmberObject.extend({
-  save() {
-    return ajax(
-      "/admin/customize/watched_words" +
-        (this.id ? "/" + this.id : "") +
-        ".json",
-      {
-        type: this.id ? "PUT" : "POST",
-        data: {
-          word: this.word,
-          replacement: this.replacement,
-          action_key: this.action,
-          case_sensitive: this.isCaseSensitive,
-        },
-        dataType: "json",
-      }
-    );
-  },
-
-  destroy() {
-    return ajax("/admin/customize/watched_words/" + this.id + ".json", {
-      type: "DELETE",
-    });
-  },
-});
-
-WatchedWord.reopenClass({
-  findAll() {
+export default class WatchedWord extends EmberObject {
+  static findAll() {
     return ajax("/admin/customize/watched_words.json").then((list) => {
       const actions = {};
 
@@ -50,7 +24,29 @@ WatchedWord.reopenClass({
         });
       });
     });
-  },
-});
+  }
 
-export default WatchedWord;
+  save() {
+    return ajax(
+      "/admin/customize/watched_words" +
+        (this.id ? "/" + this.id : "") +
+        ".json",
+      {
+        type: this.id ? "PUT" : "POST",
+        data: {
+          word: this.word,
+          replacement: this.replacement,
+          action_key: this.action,
+          case_sensitive: this.isCaseSensitive,
+        },
+        dataType: "json",
+      }
+    );
+  }
+
+  destroy() {
+    return ajax("/admin/customize/watched_words/" + this.id + ".json", {
+      type: "DELETE",
+    });
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/models/web-hook.js b/app/assets/javascripts/admin/addon/models/web-hook.js
index 500311bec80..c955d67ae98 100644
--- a/app/assets/javascripts/admin/addon/models/web-hook.js
+++ b/app/assets/javascripts/admin/addon/models/web-hook.js
@@ -1,33 +1,34 @@
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import { computed } from "@ember/object";
+import discourseComputed from "discourse-common/utils/decorators";
+import { observes } from "@ember-decorators/object";
 import Category from "discourse/models/category";
 import Group from "discourse/models/group";
 import RestModel from "discourse/models/rest";
 import Site from "discourse/models/site";
 import { isEmpty } from "@ember/utils";
 
-export default RestModel.extend({
-  content_type: 1, // json
-  last_delivery_status: 1, // inactive
-  wildcard_web_hook: false,
-  verify_certificate: true,
-  active: false,
-  web_hook_event_types: null,
-  groupsFilterInName: null,
+export default class WebHook extends RestModel {
+  content_type = 1; // json
+  last_delivery_status = 1; // inactive
+  wildcard_web_hook = false;
+  verify_certificate = true;
+  active = false;
+  web_hook_event_types = null;
+  groupsFilterInName = null;
 
-  @discourseComputed("wildcard_web_hook")
-  webhookType: {
-    get(wildcard) {
-      return wildcard ? "wildcard" : "individual";
-    },
-    set(value) {
-      this.set("wildcard_web_hook", value === "wildcard");
-    },
-  },
+  @computed("wildcard_web_hook")
+  get wildcard() {
+    return this.wildcard_web_hook ? "wildcard" : "individual";
+  }
+
+  set wildcard(value) {
+    this.set("wildcard_web_hook", value === "wildcard");
+  }
 
   @discourseComputed("category_ids")
   categories(categoryIds) {
     return Category.findByIds(categoryIds);
-  },
+  }
 
   @observes("group_ids")
   updateGroupsFilter() {
@@ -41,11 +42,11 @@ export default RestModel.extend({
         return groupNames;
       }, [])
     );
-  },
+  }
 
   groupFinder(term) {
     return Group.findAll({ term, ignore_automatic: false });
-  },
+  }
 
   @discourseComputed("wildcard_web_hook", "web_hook_event_types.[]")
   description(isWildcardWebHook, types) {
@@ -57,7 +58,7 @@ export default RestModel.extend({
     });
 
     return isWildcardWebHook ? "*" : desc;
-  },
+  }
 
   createProperties() {
     const types = this.web_hook_event_types;
@@ -92,9 +93,9 @@ export default RestModel.extend({
               return groupIds;
             }, []),
     };
-  },
+  }
 
   updateProperties() {
     return this.createProperties();
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-api-index.js b/app/assets/javascripts/admin/addon/routes/admin-api-index.js
index 05c999b6323..4170d3b113a 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-api-index.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-api-index.js
@@ -1,7 +1,10 @@
 import Route from "@ember/routing/route";
+import { inject as service } from "@ember/service";
+
+export default class AdminApiIndexRoute extends Route {
+  @service router;
 
-export default Route.extend({
   beforeModel() {
-    this.transitionTo("adminApiKeys");
-  },
-});
+    this.router.transitionTo("adminApiKeys");
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-api-keys-index.js b/app/assets/javascripts/admin/addon/routes/admin-api-keys-index.js
index cdf77212133..84af24382be 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-api-keys-index.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-api-keys-index.js
@@ -1,7 +1,7 @@
 import Route from "@ember/routing/route";
 
-export default Route.extend({
+export default class AdminApiKeysIndexRoute extends Route {
   model() {
     return this.store.findAll("api-key");
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-api-keys-new.js b/app/assets/javascripts/admin/addon/routes/admin-api-keys-new.js
index cc375b0cc36..44ebc9066b5 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-api-keys-new.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-api-keys-new.js
@@ -1,7 +1,7 @@
 import Route from "@ember/routing/route";
 
-export default Route.extend({
+export default class AdminApiKeysNewRoute extends Route {
   model() {
     return this.store.createRecord("api-key");
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-api-keys-show.js b/app/assets/javascripts/admin/addon/routes/admin-api-keys-show.js
index 37d9b24119e..368e5c8a8bf 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-api-keys-show.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-api-keys-show.js
@@ -1,7 +1,7 @@
 import Route from "@ember/routing/route";
 
-export default Route.extend({
+export default class AdminApiKeysShowRoute extends Route {
   model(params) {
     return this.store.find("api-key", params.api_key_id);
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-api-keys.js b/app/assets/javascripts/admin/addon/routes/admin-api-keys.js
index bc733cc2bf4..3bdeb49c952 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-api-keys.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-api-keys.js
@@ -1,13 +1,17 @@
+import { action } from "@ember/object";
 import Route from "@ember/routing/route";
+import { inject as service } from "@ember/service";
 
-export default Route.extend({
-  actions: {
-    show(apiKey) {
-      this.transitionTo("adminApiKeys.show", apiKey.id);
-    },
+export default class AdminApiKeysRoute extends Route {
+  @service router;
 
-    new() {
-      this.transitionTo("adminApiKeys.new");
-    },
-  },
-});
+  @action
+  show(apiKey) {
+    this.router.transitionTo("adminApiKeys.show", apiKey.id);
+  }
+
+  @action
+  new() {
+    this.router.transitionTo("adminApiKeys.new");
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-backups-index.js b/app/assets/javascripts/admin/addon/routes/admin-backups-index.js
index 1f7ea93a693..60187bf3722 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-backups-index.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-backups-index.js
@@ -2,20 +2,20 @@ import Backup from "admin/models/backup";
 import Route from "@ember/routing/route";
 import { bind } from "discourse-common/utils/decorators";
 
-export default Route.extend({
+export default class AdminBackupsIndexRoute extends Route {
   activate() {
     this.messageBus.subscribe("/admin/backups", this.onMessage);
-  },
+  }
 
   deactivate() {
     this.messageBus.unsubscribe("/admin/backups", this.onMessage);
-  },
+  }
 
   model() {
     return Backup.find().then((backups) =>
       backups.map((backup) => Backup.create(backup))
     );
-  },
+  }
 
   @bind
   onMessage(backups) {
@@ -23,5 +23,5 @@ export default Route.extend({
       "model",
       backups.map((backup) => Backup.create(backup))
     );
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-backups-logs.js b/app/assets/javascripts/admin/addon/routes/admin-backups-logs.js
index 8de1ef52401..62fe429b057 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-backups-logs.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-backups-logs.js
@@ -2,7 +2,7 @@ import EmberObject from "@ember/object";
 import PreloadStore from "discourse/lib/preload-store";
 import Route from "@ember/routing/route";
 
-export default Route.extend({
+export default class AdminBackupsLogsRoute extends Route {
   // since the logs are pushed via the message bus
   // we only want to preload them (hence the beforeModel hook)
   beforeModel() {
@@ -20,9 +20,9 @@ export default Route.extend({
         logs.pushObjects(newLogs);
       }
     });
-  },
+  }
 
   setupController() {
     /* prevent default behavior */
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-backups.js b/app/assets/javascripts/admin/addon/routes/admin-backups.js
index 1379a097544..f5e6f72440f 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-backups.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-backups.js
@@ -1,7 +1,8 @@
+import { inject as service } from "@ember/service";
 import Backup from "admin/models/backup";
 import BackupStatus from "admin/models/backup-status";
 import DiscourseRoute from "discourse/routes/discourse";
-import EmberObject from "@ember/object";
+import EmberObject, { action } from "@ember/object";
 import I18n from "I18n";
 import PreloadStore from "discourse/lib/preload-store";
 import User from "discourse/models/user";
@@ -9,21 +10,21 @@ import { ajax } from "discourse/lib/ajax";
 import { extractError } from "discourse/lib/ajax-error";
 import getURL from "discourse-common/lib/get-url";
 import showModal from "discourse/lib/show-modal";
-import { inject as service } from "@ember/service";
 import { bind } from "discourse-common/utils/decorators";
 
 const LOG_CHANNEL = "/admin/backups/logs";
 
-export default DiscourseRoute.extend({
-  dialog: service(),
+export default class AdminBackupsRoute extends DiscourseRoute {
+  @service dialog;
+  @service router;
 
   activate() {
     this.messageBus.subscribe(LOG_CHANNEL, this.onMessage);
-  },
+  }
 
   deactivate() {
     this.messageBus.unsubscribe(LOG_CHANNEL, this.onMessage);
-  },
+  }
 
   model() {
     return PreloadStore.getAndRemove("operations_status", () =>
@@ -35,7 +36,7 @@ export default DiscourseRoute.extend({
         allowRestore: status.allow_restore,
       })
     );
-  },
+  }
 
   @bind
   onMessage(log) {
@@ -62,105 +63,111 @@ export default DiscourseRoute.extend({
         .get("logs")
         .pushObject(EmberObject.create(log));
     }
-  },
+  }
 
-  actions: {
-    showStartBackupModal() {
-      showModal("admin-start-backup", { admin: true });
-      this.controllerFor("modal").set("modalClass", "start-backup-modal");
-    },
+  @action
+  showStartBackupModal() {
+    showModal("admin-start-backup", { admin: true });
+  }
 
-    startBackup(withUploads) {
-      this.transitionTo("admin.backups.logs");
-      Backup.start(withUploads).then((result) => {
-        if (!result.success) {
-          this.dialog.alert(result.message);
-        }
-      });
-    },
+  @action
+  startBackup(withUploads) {
+    this.router.transitionTo("admin.backups.logs");
+    Backup.start(withUploads).then((result) => {
+      if (!result.success) {
+        this.dialog.alert(result.message);
+      }
+    });
+  }
 
-    destroyBackup(backup) {
-      return this.dialog.yesNoConfirm({
-        message: I18n.t("admin.backups.operations.destroy.confirm"),
-        didConfirm: () => {
-          backup
-            .destroy()
-            .then(() =>
-              this.controllerFor("adminBackupsIndex")
-                .get("model")
-                .removeObject(backup)
-            );
-        },
-      });
-    },
-
-    startRestore(backup) {
-      this.dialog.yesNoConfirm({
-        message: I18n.t("admin.backups.operations.restore.confirm"),
-        didConfirm: () => {
-          this.transitionTo("admin.backups.logs");
-          backup.restore();
-        },
-      });
-    },
-
-    cancelOperation() {
-      this.dialog.yesNoConfirm({
-        message: I18n.t("admin.backups.operations.cancel.confirm"),
-        didConfirm: () => {
-          Backup.cancel().then(() => {
-            this.controllerFor("adminBackups").set(
-              "model.isOperationRunning",
-              false
-            );
-          });
-        },
-      });
-    },
-
-    rollback() {
-      return this.dialog.yesNoConfirm({
-        message: I18n.t("admin.backups.operations.rollback.confirm"),
-        didConfirm: () => {
-          Backup.rollback().then((result) => {
-            if (!result.success) {
-              this.dialog.alert(result.message);
-            } else {
-              // redirect to homepage (session might be lost)
-              window.location = getURL("/");
-            }
-          });
-        },
-      });
-    },
-
-    uploadSuccess(filename) {
-      this.dialog.alert(I18n.t("admin.backups.upload.success", { filename }));
-    },
-
-    uploadError(filename, message) {
-      this.dialog.alert(
-        I18n.t("admin.backups.upload.error", { filename, message })
-      );
-    },
-
-    remoteUploadSuccess() {
-      Backup.find()
-        .then((backups) => backups.map((backup) => Backup.create(backup)))
-        .then((backups) => {
-          this.controllerFor("adminBackupsIndex").set(
-            "model",
-            backups.map((backup) => Backup.create(backup))
+  @action
+  destroyBackup(backup) {
+    return this.dialog.yesNoConfirm({
+      message: I18n.t("admin.backups.operations.destroy.confirm"),
+      didConfirm: () => {
+        backup
+          .destroy()
+          .then(() =>
+            this.controllerFor("adminBackupsIndex")
+              .get("model")
+              .removeObject(backup)
           );
-        })
-        .catch((error) => {
-          this.dialog.alert(
-            I18n.t("admin.backups.backup_storage_error", {
-              error_message: extractError(error),
-            })
+      },
+    });
+  }
+
+  @action
+  startRestore(backup) {
+    this.dialog.yesNoConfirm({
+      message: I18n.t("admin.backups.operations.restore.confirm"),
+      didConfirm: () => {
+        this.router.transitionTo("admin.backups.logs");
+        backup.restore();
+      },
+    });
+  }
+
+  @action
+  cancelOperation() {
+    this.dialog.yesNoConfirm({
+      message: I18n.t("admin.backups.operations.cancel.confirm"),
+      didConfirm: () => {
+        Backup.cancel().then(() => {
+          this.controllerFor("adminBackups").set(
+            "model.isOperationRunning",
+            false
           );
-          return [];
         });
-    },
-  },
-});
+      },
+    });
+  }
+
+  @action
+  rollback() {
+    return this.dialog.yesNoConfirm({
+      message: I18n.t("admin.backups.operations.rollback.confirm"),
+      didConfirm: () => {
+        Backup.rollback().then((result) => {
+          if (!result.success) {
+            this.dialog.alert(result.message);
+          } else {
+            // redirect to homepage (session might be lost)
+            window.location = getURL("/");
+          }
+        });
+      },
+    });
+  }
+
+  @action
+  uploadSuccess(filename) {
+    this.dialog.alert(I18n.t("admin.backups.upload.success", { filename }));
+  }
+
+  @action
+  uploadError(filename, message) {
+    this.dialog.alert(
+      I18n.t("admin.backups.upload.error", { filename, message })
+    );
+  }
+
+  @action
+  remoteUploadSuccess() {
+    Backup.find()
+      .then((backups) => backups.map((backup) => Backup.create(backup)))
+      .then((backups) => {
+        this.controllerFor("adminBackupsIndex").set(
+          "model",
+          backups.map((backup) => Backup.create(backup))
+        );
+      })
+      .catch((error) => {
+        this.dialog.alert(
+          I18n.t("admin.backups.backup_storage_error", {
+            error_message: extractError(error),
+          })
+        );
+        return [];
+      });
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-colors-show.js b/app/assets/javascripts/admin/addon/routes/admin-customize-colors-show.js
index 35353d31f73..8dc3005cd80 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-customize-colors-show.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-customize-colors-show.js
@@ -1,17 +1,18 @@
 import Route from "@ember/routing/route";
-export default Route.extend({
+
+export default class AdminCustomizeColorsShowRoute extends Route {
   model(params) {
     const all = this.modelFor("adminCustomize.colors");
     const model = all.findBy("id", parseInt(params.scheme_id, 10));
     return model ? model : this.replaceWith("adminCustomize.colors.index");
-  },
+  }
 
   serialize(model) {
     return { scheme_id: model.get("id") };
-  },
+  }
 
   setupController(controller, model) {
     controller.set("model", model);
     controller.set("allColors", this.modelFor("adminCustomize.colors"));
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-colors.js b/app/assets/javascripts/admin/addon/routes/admin-customize-colors.js
index cf2dc3d18d4..5d6dbf9c833 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-customize-colors.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-customize-colors.js
@@ -1,12 +1,12 @@
 import ColorScheme from "admin/models/color-scheme";
 import Route from "@ember/routing/route";
 
-export default Route.extend({
+export default class AdminCustomizeColorsRoute extends Route {
   model() {
     return ColorScheme.findAll();
-  },
+  }
 
   setupController(controller, model) {
     controller.set("model", model);
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-email-style-edit.js b/app/assets/javascripts/admin/addon/routes/admin-customize-email-style-edit.js
index 847b21a75c9..7ca5c589bb8 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-customize-email-style-edit.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-customize-email-style-edit.js
@@ -1,15 +1,17 @@
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
 import I18n from "I18n";
 import Route from "@ember/routing/route";
-import { inject as service } from "@ember/service";
 
-export default Route.extend({
-  dialog: service(),
+export default class AdminCustomizeEmailStyleEditRoute extends Route {
+  @service dialog;
+
   model(params) {
     return {
       model: this.modelFor("adminCustomizeEmailStyle"),
       fieldName: params.field_name,
     };
-  },
+  }
 
   setupController(controller, model) {
     controller.setProperties({
@@ -17,26 +19,25 @@ export default Route.extend({
       model: model.model,
     });
     this._shouldAlertUnsavedChanges = true;
-  },
+  }
 
-  actions: {
-    willTransition(transition) {
-      if (
-        this.get("controller.model.changed") &&
-        this._shouldAlertUnsavedChanges &&
-        transition.intent.name !== this.routeName
-      ) {
-        transition.abort();
-        this.dialog.confirm({
-          message: I18n.t("admin.customize.theme.unsaved_changes_alert"),
-          confirmButtonLabel: "admin.customize.theme.discard",
-          cancelButtonLabel: "admin.customize.theme.stay",
-          didConfirm: () => {
-            this._shouldAlertUnsavedChanges = false;
-            transition.retry();
-          },
-        });
-      }
-    },
-  },
-});
+  @action
+  willTransition(transition) {
+    if (
+      this.get("controller.model.changed") &&
+      this._shouldAlertUnsavedChanges &&
+      transition.intent.name !== this.routeName
+    ) {
+      transition.abort();
+      this.dialog.confirm({
+        message: I18n.t("admin.customize.theme.unsaved_changes_alert"),
+        confirmButtonLabel: "admin.customize.theme.discard",
+        cancelButtonLabel: "admin.customize.theme.stay",
+        didConfirm: () => {
+          this._shouldAlertUnsavedChanges = false;
+          transition.retry();
+        },
+      });
+    }
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-email-style-index.js b/app/assets/javascripts/admin/addon/routes/admin-customize-email-style-index.js
index baeca3d8c69..36863b65ec3 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-customize-email-style-index.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-customize-email-style-index.js
@@ -1,7 +1,7 @@
 import Route from "@ember/routing/route";
 
-export default Route.extend({
+export default class AdminCustomizeEmailStyleIndexRoute extends Route {
   beforeModel() {
     this.replaceWith("adminCustomizeEmailStyle.edit", "html");
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-email-style.js b/app/assets/javascripts/admin/addon/routes/admin-customize-email-style.js
index 209b1b75519..3e07735d06f 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-customize-email-style.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-customize-email-style.js
@@ -1,7 +1,7 @@
 import Route from "@ember/routing/route";
 
-export default Route.extend({
+export default class AdminCustomizeEmailStyleRoute extends Route {
   model() {
     return this.store.find("email-style");
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-email-templates-edit.js b/app/assets/javascripts/admin/addon/routes/admin-customize-email-templates-edit.js
index ae1e228d767..523b536f776 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-customize-email-templates-edit.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-customize-email-templates-edit.js
@@ -1,18 +1,18 @@
 import Route from "@ember/routing/route";
 import { scrollTop } from "discourse/mixins/scroll-top";
 
-export default Route.extend({
+export default class AdminCustomizeEmailTemplatesEditRoute extends Route {
   model(params) {
     const all = this.modelFor("adminCustomizeEmailTemplates");
     return all.findBy("id", params.id);
-  },
+  }
 
   setupController(controller, emailTemplate) {
     controller.setProperties({ emailTemplate, saved: false });
     scrollTop();
-  },
+  }
 
   deactivate() {
     this.controller.set("emailTemplate", null);
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-email-templates.js b/app/assets/javascripts/admin/addon/routes/admin-customize-email-templates.js
index 217de52502c..2808b693e1e 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-customize-email-templates.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-customize-email-templates.js
@@ -1,14 +1,17 @@
 import Route from "@ember/routing/route";
 import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+
+export default class AdminCustomizeEmailTemplatesRoute extends Route {
+  @service router;
 
-export default Route.extend({
   model() {
     return this.store.findAll("email-template");
-  },
+  }
 
   setupController(controller, model) {
     controller.set("emailTemplates", model);
-  },
+  }
 
   @action
   didTransition() {
@@ -17,10 +20,10 @@ export default Route.extend({
     );
 
     if (!editController.emailTemplate) {
-      this.transitionTo(
+      this.router.transitionTo(
         "adminCustomizeEmailTemplates.edit",
         this.controller.get("sortedTemplates.firstObject")
       );
     }
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-form-templates-edit.js b/app/assets/javascripts/admin/addon/routes/admin-customize-form-templates-edit.js
new file mode 100644
index 00000000000..073636f74fd
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/routes/admin-customize-form-templates-edit.js
@@ -0,0 +1,12 @@
+import DiscourseRoute from "discourse/routes/discourse";
+import FormTemplate from "admin/models/form-template";
+
+export default class AdminCustomizeFormTemplatesEdit extends DiscourseRoute {
+  model(params) {
+    return FormTemplate.findById(params.id);
+  }
+
+  setupController(controller, model) {
+    controller.set("model", model);
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-form-templates-index.js b/app/assets/javascripts/admin/addon/routes/admin-customize-form-templates-index.js
new file mode 100644
index 00000000000..364388c29da
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/routes/admin-customize-form-templates-index.js
@@ -0,0 +1,18 @@
+import DiscourseRoute from "discourse/routes/discourse";
+import { action } from "@ember/object";
+import FormTemplate from "admin/models/form-template";
+
+export default class AdminCustomizeFormTemplatesIndex extends DiscourseRoute {
+  model() {
+    return FormTemplate.findAll();
+  }
+
+  setupController(controller, model) {
+    controller.set("model", model);
+  }
+
+  @action
+  reloadModel() {
+    this.refresh();
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-index.js b/app/assets/javascripts/admin/addon/routes/admin-customize-index.js
index 615926c1c3a..65eee43a1da 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-customize-index.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-customize-index.js
@@ -1,10 +1,14 @@
 import Route from "@ember/routing/route";
-export default Route.extend({
+import { inject as service } from "@ember/service";
+
+export default class AdminCustomizeIndexRoute extends Route {
+  @service router;
+
   beforeModel() {
     if (this.currentUser.admin) {
-      this.transitionTo("adminCustomizeThemes");
+      this.router.transitionTo("adminCustomizeThemes");
     } else {
-      this.transitionTo("adminWatchedWords");
+      this.router.transitionTo("adminWatchedWords");
     }
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-robots-txt.js b/app/assets/javascripts/admin/addon/routes/admin-customize-robots-txt.js
index 99f9724bded..025c16bdaec 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-customize-robots-txt.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-customize-robots-txt.js
@@ -1,8 +1,8 @@
 import Route from "@ember/routing/route";
 import { ajax } from "discourse/lib/ajax";
 
-export default Route.extend({
+export default class AdminCustomizeRobotsTxtRoute extends Route {
   model() {
     return ajax("/admin/customize/robots");
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-themes-edit.js b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-edit.js
index c72e9d07311..cdc700da9a5 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-customize-themes-edit.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-edit.js
@@ -1,9 +1,11 @@
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
 import I18n from "I18n";
 import Route from "@ember/routing/route";
-import { inject as service } from "@ember/service";
 
-export default Route.extend({
-  dialog: service(),
+export default class AdminCustomizeThemesEditRoute extends Route {
+  @service dialog;
+  @service router;
 
   model(params) {
     const all = this.modelFor("adminCustomizeThemes");
@@ -15,7 +17,7 @@ export default Route.extend({
           field_name: params.field_name,
         }
       : this.replaceWith("adminCustomizeThemes.index");
-  },
+  }
 
   serialize(wrapper) {
     return {
@@ -24,18 +26,18 @@ export default Route.extend({
       field_name: wrapper.field_name || "scss",
       theme_id: wrapper.model.get("id"),
     };
-  },
+  }
 
   setupController(controller, wrapper) {
     const fields = wrapper.model
       .get("fields")
       [wrapper.target].map((f) => f.name);
     if (wrapper.model.remote_theme && wrapper.model.remote_theme.is_git) {
-      this.transitionTo("adminCustomizeThemes.index");
+      this.router.transitionTo("adminCustomizeThemes.index");
       return;
     }
     if (!fields.includes(wrapper.field_name)) {
-      this.transitionTo(
+      this.router.transitionTo(
         "adminCustomizeThemes.edit",
         wrapper.model.id,
         wrapper.target,
@@ -48,27 +50,26 @@ export default Route.extend({
     controller.set("fieldName", wrapper.field_name || "scss");
     this.controllerFor("adminCustomizeThemes").set("editingTheme", true);
     this.set("shouldAlertUnsavedChanges", true);
-  },
+  }
 
-  actions: {
-    willTransition(transition) {
-      if (
-        this.get("controller.model.changed") &&
-        this.shouldAlertUnsavedChanges &&
-        transition.intent.name !== this.routeName
-      ) {
-        transition.abort();
+  @action
+  willTransition(transition) {
+    if (
+      this.get("controller.model.changed") &&
+      this.shouldAlertUnsavedChanges &&
+      transition.intent.name !== this.routeName
+    ) {
+      transition.abort();
 
-        this.dialog.confirm({
-          message: I18n.t("admin.customize.theme.unsaved_changes_alert"),
-          confirmButtonLabel: "admin.customize.theme.discard",
-          cancelButtonLabel: "admin.customize.theme.stay",
-          didConfirm: () => {
-            this.set("shouldAlertUnsavedChanges", false);
-            transition.retry();
-          },
-        });
-      }
-    },
-  },
-});
+      this.dialog.confirm({
+        message: I18n.t("admin.customize.theme.unsaved_changes_alert"),
+        confirmButtonLabel: "admin.customize.theme.discard",
+        cancelButtonLabel: "admin.customize.theme.stay",
+        didConfirm: () => {
+          this.set("shouldAlertUnsavedChanges", false);
+          transition.retry();
+        },
+      });
+    }
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-themes-index.js b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-index.js
index 5e0af70da5b..ffbdb0d28de 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-customize-themes-index.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-index.js
@@ -19,13 +19,13 @@ const externalResources = [
   },
 ];
 
-export default Route.extend({
+export default class AdminCustomizeThemesIndexRoute extends Route {
   setupController(controller) {
-    this._super(...arguments);
+    super.setupController(...arguments);
     this.controllerFor("adminCustomizeThemes").set("editingTheme", false);
     controller.setProperties({
       externalResources,
       womanArtistEmojiURL: emojiUrlFor("woman_artist:t5"),
     });
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-themes-show.js b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-show.js
index 156dbf9dd0c..1481ca32cc2 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-customize-themes-show.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-show.js
@@ -1,24 +1,25 @@
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
 import { COMPONENTS, THEMES } from "admin/models/theme";
 import I18n from "I18n";
 import Route from "@ember/routing/route";
 import { scrollTop } from "discourse/mixins/scroll-top";
-import { inject as service } from "@ember/service";
 
-export default Route.extend({
-  dialog: service(),
+export default class AdminCustomizeThemesShowRoute extends Route {
+  @service dialog;
 
   serialize(model) {
     return { theme_id: model.get("id") };
-  },
+  }
 
   model(params) {
     const all = this.modelFor("adminCustomizeThemes");
     const model = all.findBy("id", parseInt(params.theme_id, 10));
     return model ? model : this.replaceWith("adminCustomizeThemes.index");
-  },
+  }
 
   setupController(controller, model) {
-    this._super(...arguments);
+    super.setupController(...arguments);
 
     const parentController = this.controllerFor("adminCustomizeThemes");
 
@@ -37,11 +38,11 @@ export default Route.extend({
     });
 
     this.handleHighlight(model);
-  },
+  }
 
   deactivate() {
     this.handleHighlight();
-  },
+  }
 
   handleHighlight(theme) {
     this.get("controller.allThemes")
@@ -50,26 +51,27 @@ export default Route.extend({
     if (theme) {
       theme.set("selected", true);
     }
-  },
+  }
 
-  actions: {
-    didTransition() {
-      scrollTop();
-    },
-    willTransition(transition) {
-      const model = this.controller.model;
-      if (model.warnUnassignedComponent) {
-        transition.abort();
+  @action
+  didTransition() {
+    scrollTop();
+  }
 
-        this.dialog.yesNoConfirm({
-          message: I18n.t("admin.customize.theme.unsaved_parent_themes"),
-          didConfirm: () => {
-            model.set("recentlyInstalled", false);
-            transition.retry();
-          },
-          didCancel: () => model.set("recentlyInstalled", false),
-        });
-      }
-    },
-  },
-});
+  @action
+  willTransition(transition) {
+    const model = this.controller.model;
+    if (model.warnUnassignedComponent) {
+      transition.abort();
+
+      this.dialog.yesNoConfirm({
+        message: I18n.t("admin.customize.theme.unsaved_parent_themes"),
+        didConfirm: () => {
+          model.set("recentlyInstalled", false);
+          transition.retry();
+        },
+        didCancel: () => model.set("recentlyInstalled", false),
+      });
+    }
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-themes.js b/app/assets/javascripts/admin/addon/routes/admin-customize-themes.js
index 22878ded22e..04f1df28105 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-customize-themes.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-customize-themes.js
@@ -1,23 +1,30 @@
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
 import Route from "@ember/routing/route";
 import showModal from "discourse/lib/show-modal";
 import I18n from "I18n";
 import { next } from "@ember/runloop";
-import { inject as service } from "@ember/service";
 
-export default Route.extend({
-  dialog: service(),
+export default class AdminCustomizeThemesRoute extends Route {
+  @service dialog;
+  @service router;
 
-  queryParams: {
+  queryParams = {
     repoUrl: null,
     repoName: null,
-  },
+  };
 
   model() {
     return this.store.findAll("theme");
-  },
+  }
+
+  @action
+  routeRefreshModel() {
+    this.refresh();
+  }
 
   setupController(controller, model) {
-    this._super(controller, model);
+    super.setupController(controller, model);
     controller.set("editingTheme", false);
 
     if (controller.repoUrl) {
@@ -31,35 +38,33 @@ export default Route.extend({
         });
       });
     }
-  },
+  }
 
-  actions: {
-    installModal() {
-      const currentTheme = this.controllerFor(
-        "adminCustomizeThemes.show"
-      ).model;
-      if (currentTheme?.warnUnassignedComponent) {
-        this.dialog.yesNoConfirm({
-          message: I18n.t("admin.customize.theme.unsaved_parent_themes"),
-          didConfirm: () => {
-            currentTheme.set("recentlyInstalled", false);
-            showModal("admin-install-theme", { admin: true });
-          },
-        });
-      } else {
-        showModal("admin-install-theme", { admin: true });
-      }
-    },
-
-    addTheme(theme) {
-      this.refresh();
-      theme.setProperties({ recentlyInstalled: true });
-      this.transitionTo("adminCustomizeThemes.show", theme.get("id"), {
-        queryParams: {
-          repoName: null,
-          repoUrl: null,
+  @action
+  installModal() {
+    const currentTheme = this.controllerFor("adminCustomizeThemes.show").model;
+    if (currentTheme?.warnUnassignedComponent) {
+      this.dialog.yesNoConfirm({
+        message: I18n.t("admin.customize.theme.unsaved_parent_themes"),
+        didConfirm: () => {
+          currentTheme.set("recentlyInstalled", false);
+          showModal("admin-install-theme", { admin: true });
         },
       });
-    },
-  },
-});
+    } else {
+      showModal("admin-install-theme", { admin: true });
+    }
+  }
+
+  @action
+  addTheme(theme) {
+    this.refresh();
+    theme.setProperties({ recentlyInstalled: true });
+    this.router.transitionTo("adminCustomizeThemes.show", theme.get("id"), {
+      queryParams: {
+        repoName: null,
+        repoUrl: null,
+      },
+    });
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-dashboard-general.js b/app/assets/javascripts/admin/addon/routes/admin-dashboard-general.js
index b13cd8f4412..bd12fd02a59 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-dashboard-general.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-dashboard-general.js
@@ -1,7 +1,7 @@
 import DiscourseRoute from "discourse/routes/discourse";
 
-export default DiscourseRoute.extend({
+export default class AdminDashboardGeneralRoute extends DiscourseRoute {
   activate() {
     this.controllerFor("admin-dashboard-general").fetchDashboard();
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-dashboard-reports.js b/app/assets/javascripts/admin/addon/routes/admin-dashboard-reports.js
index 79d03646644..dd0ba24a349 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-dashboard-reports.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-dashboard-reports.js
@@ -1,12 +1,12 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
 
-export default DiscourseRoute.extend({
+export default class AdminDashboardReportsRoute extends DiscourseRoute {
   model() {
     return ajax("/admin/reports");
-  },
+  }
 
   setupController(controller, model) {
     controller.setProperties({ model: model.reports, filter: null });
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-dashboard.js b/app/assets/javascripts/admin/addon/routes/admin-dashboard.js
index d6c9442a76d..ca539ff87ad 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-dashboard.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-dashboard.js
@@ -1,10 +1,10 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import { scrollTop } from "discourse/mixins/scroll-top";
 
-export default DiscourseRoute.extend({
+export default class AdminDashboardRoute extends DiscourseRoute {
   activate() {
     this.controllerFor("admin-dashboard").fetchProblems();
     this.controllerFor("admin-dashboard").fetchDashboard();
     scrollTop();
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-email-bounced.js b/app/assets/javascripts/admin/addon/routes/admin-email-bounced.js
index d89010c9efa..5a5d410c176 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-email-bounced.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-email-bounced.js
@@ -1,13 +1,26 @@
+import { action } from "@ember/object";
 import AdminEmailLogs from "admin/routes/admin-email-logs";
-import showModal from "discourse/lib/show-modal";
+import IncomingEmail from "admin/models/incoming-email";
+import IncomingEmailModal from "../components/modal/incoming-email";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { inject as service } from "@ember/service";
 
-export default AdminEmailLogs.extend({
-  status: "bounced",
+export default class AdminEmailBouncedRoute extends AdminEmailLogs {
+  @service modal;
+  status = "bounced";
 
-  actions: {
-    showIncomingEmail(id) {
-      showModal("admin-incoming-email", { admin: true });
-      this.controllerFor("modals/admin-incoming-email").loadFromBounced(id);
-    },
-  },
-});
+  @action
+  async showIncomingEmail(id) {
+    const model = await this.loadFromBounced(id);
+    this.modal.show(IncomingEmailModal, { model });
+  }
+
+  @action
+  async loadFromBounced(id) {
+    try {
+      return await IncomingEmail.findByBounced(id);
+    } catch (error) {
+      popupAjaxError(error);
+    }
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-email-incomings.js b/app/assets/javascripts/admin/addon/routes/admin-email-incomings.js
index 6321c8ef01f..4f6273c11a4 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-email-incomings.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-email-incomings.js
@@ -1,13 +1,13 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import IncomingEmail from "admin/models/incoming-email";
 
-export default DiscourseRoute.extend({
+export default class AdminEmailIncomingsRoute extends DiscourseRoute {
   model() {
     return IncomingEmail.findAll({ status: this.status });
-  },
+  }
 
   setupController(controller, model) {
     controller.set("model", model);
     controller.set("filter.status", this.status);
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-email-index.js b/app/assets/javascripts/admin/addon/routes/admin-email-index.js
index 3a5eec63bba..b549094445d 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-email-index.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-email-index.js
@@ -1,8 +1,8 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import EmailSettings from "admin/models/email-settings";
 
-export default DiscourseRoute.extend({
+export default class AdminEmailIndexRoute extends DiscourseRoute {
   model() {
     return EmailSettings.find();
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-email-logs.js b/app/assets/javascripts/admin/addon/routes/admin-email-logs.js
index 24a0b94a6b6..7c18b6881d8 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-email-logs.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-email-logs.js
@@ -1,10 +1,10 @@
 import DiscourseRoute from "discourse/routes/discourse";
 
-export default DiscourseRoute.extend({
+export default class AdminEmailLogsRoute extends DiscourseRoute {
   setupController(controller) {
     controller.setProperties({
       loading: true,
       filter: { status: this.status },
     });
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-email-preview-digest.js b/app/assets/javascripts/admin/addon/routes/admin-email-preview-digest.js
index 730bcd0e7ea..104a0663945 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-email-preview-digest.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-email-preview-digest.js
@@ -1,10 +1,10 @@
 import EmailPreview, { oneWeekAgo } from "admin/models/email-preview";
 import DiscourseRoute from "discourse/routes/discourse";
 
-export default DiscourseRoute.extend({
+export default class AdminEmailPreviewDigestRoute extends DiscourseRoute {
   model() {
     return EmailPreview.findDigest(this.currentUser.get("username"));
-  },
+  }
 
   afterModel(model) {
     const controller = this.controllerFor("adminEmailPreviewDigest");
@@ -14,5 +14,5 @@ export default DiscourseRoute.extend({
       lastSeen: oneWeekAgo(),
       showHtml: true,
     });
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-email-received.js b/app/assets/javascripts/admin/addon/routes/admin-email-received.js
index 663b946081c..06a1e6c4089 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-email-received.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-email-received.js
@@ -1,2 +1,5 @@
 import AdminEmailIncomings from "admin/routes/admin-email-incomings";
-export default AdminEmailIncomings.extend({ status: "received" });
+
+export default class AdminEmailReceivedRoute extends AdminEmailIncomings {
+  status = "received";
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-email-rejected.js b/app/assets/javascripts/admin/addon/routes/admin-email-rejected.js
index ce45fa8962e..bb8b73f77a5 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-email-rejected.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-email-rejected.js
@@ -1,13 +1,16 @@
+import { action } from "@ember/object";
 import AdminEmailIncomings from "admin/routes/admin-email-incomings";
-import showModal from "discourse/lib/show-modal";
+import IncomingEmailModal from "../components/modal/incoming-email";
+import IncomingEmail from "admin/models/incoming-email";
+import { inject as service } from "@ember/service";
 
-export default AdminEmailIncomings.extend({
-  status: "rejected",
+export default class AdminEmailRejectedRoute extends AdminEmailIncomings {
+  @service modal;
+  status = "rejected";
 
-  actions: {
-    showIncomingEmail(id) {
-      showModal("admin-incoming-email", { admin: true });
-      this.controllerFor("modals/admin-incoming-email").load(id);
-    },
-  },
-});
+  @action
+  async showIncomingEmail(id) {
+    const model = await IncomingEmail.find(id);
+    this.modal.show(IncomingEmailModal, { model });
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-email-sent.js b/app/assets/javascripts/admin/addon/routes/admin-email-sent.js
index 8abfdb00875..566faf6b2ce 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-email-sent.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-email-sent.js
@@ -1,2 +1,5 @@
 import AdminEmailLogs from "admin/routes/admin-email-logs";
-export default AdminEmailLogs.extend({ status: "sent" });
+
+export default class AdminEmailSentRoute extends AdminEmailLogs {
+  status = "sent";
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-email-skipped.js b/app/assets/javascripts/admin/addon/routes/admin-email-skipped.js
index 81c620e1692..b5eba7de969 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-email-skipped.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-email-skipped.js
@@ -1,2 +1,5 @@
 import AdminEmailLogs from "admin/routes/admin-email-logs";
-export default AdminEmailLogs.extend({ status: "skipped" });
+
+export default class AdminEmailSkippedRoute extends AdminEmailLogs {
+  status = "skipped";
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-embedding.js b/app/assets/javascripts/admin/addon/routes/admin-embedding.js
index 6fb8704832e..a834cd7de45 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-embedding.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-embedding.js
@@ -1,10 +1,11 @@
 import Route from "@ember/routing/route";
-export default Route.extend({
+
+export default class AdminEmbeddingRoute extends Route {
   model() {
     return this.store.find("embedding");
-  },
+  }
 
   setupController(controller, model) {
     controller.set("embedding", model);
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-emojis.js b/app/assets/javascripts/admin/addon/routes/admin-emojis.js
index 6d5b1ee648a..793a2ef31c8 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-emojis.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-emojis.js
@@ -2,12 +2,12 @@ import DiscourseRoute from "discourse/routes/discourse";
 import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 
-export default DiscourseRoute.extend({
+export default class AdminEmojisRoute extends DiscourseRoute {
   model() {
     return ajax("/admin/customize/emojis.json").then(function (emojis) {
       return emojis.map(function (emoji) {
         return EmberObject.create(emoji);
       });
     });
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-flags-posts-active.js b/app/assets/javascripts/admin/addon/routes/admin-flags-posts-active.js
index f637489bd3c..20a08ab11d5 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-flags-posts-active.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-flags-posts-active.js
@@ -1,7 +1,7 @@
 import DiscourseRoute from "discourse/routes/discourse";
 
-export default DiscourseRoute.extend({
+export default class AdminFlagsPostsActiveRoute extends DiscourseRoute {
   model() {
     return this.store.findAll("flagged-post", { filter: "active" });
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-flags-posts-old.js b/app/assets/javascripts/admin/addon/routes/admin-flags-posts-old.js
index 81a14cfa8c8..043d90a3c98 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-flags-posts-old.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-flags-posts-old.js
@@ -1,7 +1,7 @@
 import DiscourseRoute from "discourse/routes/discourse";
 
-export default DiscourseRoute.extend({
+export default class AdminFlagsPostsOldRoute extends DiscourseRoute {
   model() {
     return this.store.findAll("flagged-post", { filter: "old" });
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-flags-topics-index.js b/app/assets/javascripts/admin/addon/routes/admin-flags-topics-index.js
index 2f609050494..7e92ca02ef1 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-flags-topics-index.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-flags-topics-index.js
@@ -1,11 +1,11 @@
 import DiscourseRoute from "discourse/routes/discourse";
 
-export default DiscourseRoute.extend({
+export default class AdminFlagsTopicsIndexRoute extends DiscourseRoute {
   model() {
     return this.store.findAll("flagged-topic");
-  },
+  }
 
   setupController(controller, model) {
     controller.set("flaggedTopics", model);
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-logs-index.js b/app/assets/javascripts/admin/addon/routes/admin-logs-index.js
index 1fff3f40686..213e80258fb 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-logs-index.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-logs-index.js
@@ -1,7 +1,10 @@
 import DiscourseRoute from "discourse/routes/discourse";
+import { inject as service } from "@ember/service";
+
+export default class AdminLogsIndexRoute extends DiscourseRoute {
+  @service router;
 
-export default DiscourseRoute.extend({
   redirect() {
-    this.transitionTo("adminLogs.staffActionLogs");
-  },
-});
+    this.router.transitionTo("adminLogs.staffActionLogs");
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-logs-screened-emails.js b/app/assets/javascripts/admin/addon/routes/admin-logs-screened-emails.js
index 30b51ece159..fe2642de744 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-logs-screened-emails.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-logs-screened-emails.js
@@ -1,7 +1,7 @@
 import DiscourseRoute from "discourse/routes/discourse";
 
-export default DiscourseRoute.extend({
+export default class AdminLogsScreenedEmailsRoute extends DiscourseRoute {
   setupController() {
     return this.controllerFor("adminLogsScreenedEmails").show();
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-logs-screened-ip-addresses.js b/app/assets/javascripts/admin/addon/routes/admin-logs-screened-ip-addresses.js
index 6c0eb97c72c..ab4cc63d88e 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-logs-screened-ip-addresses.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-logs-screened-ip-addresses.js
@@ -1,7 +1,7 @@
 import DiscourseRoute from "discourse/routes/discourse";
 
-export default DiscourseRoute.extend({
+export default class AdminLogsScreenedIpAddressesRoute extends DiscourseRoute {
   setupController() {
     return this.controllerFor("adminLogsScreenedIpAddresses").show();
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-logs-screened-urls.js b/app/assets/javascripts/admin/addon/routes/admin-logs-screened-urls.js
index a32e9034eb6..73a8bf7d0c5 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-logs-screened-urls.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-logs-screened-urls.js
@@ -1,7 +1,7 @@
 import DiscourseRoute from "discourse/routes/discourse";
 
-export default DiscourseRoute.extend({
+export default class AdminLogsScreenedUrlsRoute extends DiscourseRoute {
   setupController() {
     return this.controllerFor("adminLogsScreenedUrls").show();
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-logs-staff-action-logs.js b/app/assets/javascripts/admin/addon/routes/admin-logs-staff-action-logs.js
index 96ab615379a..d027c870f0a 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-logs-staff-action-logs.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-logs-staff-action-logs.js
@@ -1,10 +1,13 @@
 import DiscourseRoute from "discourse/routes/discourse";
-import EmberObject from "@ember/object";
+import EmberObject, { action } from "@ember/object";
+import { inject as service } from "@ember/service";
 
-export default DiscourseRoute.extend({
-  queryParams: {
+export default class AdminLogsStaffActionLogsRoute extends DiscourseRoute {
+  @service router;
+
+  queryParams = {
     filters: { refreshModel: true },
-  },
+  };
 
   beforeModel(transition) {
     const params = transition.to.queryParams;
@@ -12,15 +15,15 @@ export default DiscourseRoute.extend({
     if (controller.filters === null || params.force_refresh) {
       controller.resetFilters();
     }
-  },
+  }
 
   deserializeQueryParam(value, urlKey, defaultValueType) {
-    if (urlKey === "filters") {
+    if (urlKey === "filters" && value) {
       return EmberObject.create(JSON.parse(decodeURIComponent(value)));
     }
 
-    return this._super(value, urlKey, defaultValueType);
-  },
+    return super.deserializeQueryParam(value, urlKey, defaultValueType);
+  }
 
   serializeQueryParam(value, urlKey, defaultValueType) {
     if (urlKey === "filters") {
@@ -31,18 +34,13 @@ export default DiscourseRoute.extend({
       }
     }
 
-    return this._super(value, urlKey, defaultValueType);
-  },
+    return super.serializeQueryParam(value, urlKey, defaultValueType);
+  }
 
-  actions: {
-    onFiltersChange(filters) {
-      if (filters && Object.keys(filters) === 0) {
-        this.transitionTo("adminLogs.staffActionLogs");
-      } else {
-        this.transitionTo("adminLogs.staffActionLogs", {
-          queryParams: { filters },
-        });
-      }
-    },
-  },
-});
+  @action
+  onFiltersChange(filters) {
+    this.router.transitionTo("adminLogs.staffActionLogs", {
+      queryParams: { filters },
+    });
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-permalinks.js b/app/assets/javascripts/admin/addon/routes/admin-permalinks.js
index 8ff655465a9..8d3e59802a7 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-permalinks.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-permalinks.js
@@ -1,12 +1,12 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import Permalink from "admin/models/permalink";
 
-export default DiscourseRoute.extend({
+export default class AdminPermalinksRoute extends DiscourseRoute {
   model() {
     return Permalink.findAll();
-  },
+  }
 
   setupController(controller, model) {
     controller.set("model", model);
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-plugins.js b/app/assets/javascripts/admin/addon/routes/admin-plugins.js
index d028590f436..45e2e04314d 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-plugins.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-plugins.js
@@ -1,13 +1,20 @@
+import { action } from "@ember/object";
 import Route from "@ember/routing/route";
-export default Route.extend({
+import { inject as service } from "@ember/service";
+
+export default class AdminPluginsRoute extends Route {
+  @service router;
+
   model() {
     return this.store.findAll("plugin");
-  },
+  }
 
-  actions: {
-    showSettings(plugin) {
-      const controller = this.controllerFor("adminSiteSettings");
-      this.transitionTo("adminSiteSettingsCategory", "plugins").then(() => {
+  @action
+  showSettings(plugin) {
+    const controller = this.controllerFor("adminSiteSettings");
+    this.router
+      .transitionTo("adminSiteSettingsCategory", "plugins")
+      .then(() => {
         if (plugin) {
           // filterContent() is normally on a debounce from typing.
           // Because we don't want the default of "All Results", we tell it
@@ -17,6 +24,5 @@ export default Route.extend({
           controller.filterContentNow("plugins");
         }
       });
-    },
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-reports-index.js b/app/assets/javascripts/admin/addon/routes/admin-reports-index.js
index 89cda3f7ace..e7196d83de5 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-reports-index.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-reports-index.js
@@ -1,7 +1,10 @@
 import DiscourseRoute from "discourse/routes/discourse";
+import { inject as service } from "@ember/service";
+
+export default class AdminReportsIndexRoute extends DiscourseRoute {
+  @service router;
 
-export default DiscourseRoute.extend({
   beforeModel() {
-    this.transitionTo("admin.dashboardReports");
-  },
-});
+    this.router.transitionTo("admin.dashboardReports");
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-reports-show.js b/app/assets/javascripts/admin/addon/routes/admin-reports-show.js
index 8aec4baf31c..3f50d031af7 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-reports-show.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-reports-show.js
@@ -1,13 +1,17 @@
+import { action } from "@ember/object";
 import DiscourseRoute from "discourse/routes/discourse";
+import { inject as service } from "@ember/service";
 
-export default DiscourseRoute.extend({
-  queryParams: {
+export default class AdminReportsShowRoute extends DiscourseRoute {
+  @service router;
+
+  queryParams = {
     start_date: { refreshModel: true },
     end_date: { refreshModel: true },
     filters: { refreshModel: true },
     chart_grouping: { refreshModel: true },
     mode: { refreshModel: true },
-  },
+  };
 
   model(params) {
     params.customFilters = params.filters;
@@ -30,15 +34,15 @@ export default DiscourseRoute.extend({
     delete params.chart_grouping;
 
     return params;
-  },
+  }
 
   deserializeQueryParam(value, urlKey, defaultValueType) {
     if (urlKey === "filters") {
       return JSON.parse(decodeURIComponent(value));
     }
 
-    return this._super(value, urlKey, defaultValueType);
-  },
+    return super.deserializeQueryParam(value, urlKey, defaultValueType);
+  }
 
   serializeQueryParam(value, urlKey, defaultValueType) {
     if (urlKey === "filters") {
@@ -49,25 +53,24 @@ export default DiscourseRoute.extend({
       }
     }
 
-    return this._super(value, urlKey, defaultValueType);
-  },
+    return super.serializeQueryParam(value, urlKey, defaultValueType);
+  }
 
-  actions: {
-    onParamsChange(params) {
-      const queryParams = {
-        type: params.type,
-        mode: params.mode,
-        start_date: params.startDate
-          ? params.startDate.toISOString(true).split("T")[0]
-          : null,
-        chart_grouping: params.chartGrouping,
-        filters: params.filters,
-        end_date: params.endDate
-          ? params.endDate.toISOString(true).split("T")[0]
-          : null,
-      };
+  @action
+  onParamsChange(params) {
+    const queryParams = {
+      type: params.type,
+      mode: params.mode,
+      start_date: params.startDate
+        ? params.startDate.toISOString(true).split("T")[0]
+        : null,
+      chart_grouping: params.chartGrouping,
+      filters: params.filters,
+      end_date: params.endDate
+        ? params.endDate.toISOString(true).split("T")[0]
+        : null,
+    };
 
-      this.transitionTo("adminReports.show", { queryParams });
-    },
-  },
-});
+    this.router.transitionTo("adminReports.show", { queryParams });
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-route-map.js b/app/assets/javascripts/admin/addon/routes/admin-route-map.js
index 37272c1c07a..ef5d507922d 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-route-map.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-route-map.js
@@ -97,6 +97,14 @@ export default function () {
             this.route("edit", { path: "/:field_name" });
           }
         );
+        this.route(
+          "adminCustomizeFormTemplates",
+          { path: "/form-templates", resetNamespace: true },
+          function () {
+            this.route("new", { path: "/new" });
+            this.route("edit", { path: "/:id" });
+          }
+        );
         this.route(
           "adminWatchedWords",
           { path: "/watched_words", resetNamespace: true },
diff --git a/app/assets/javascripts/admin/addon/routes/admin-search-logs-index.js b/app/assets/javascripts/admin/addon/routes/admin-search-logs-index.js
index c04f3b22b81..8c93fdc30dd 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-search-logs-index.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-search-logs-index.js
@@ -2,11 +2,11 @@ import DiscourseRoute from "discourse/routes/discourse";
 import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 
-export default DiscourseRoute.extend({
-  queryParams: {
+export default class AdminSearchLogsIndexRoute extends DiscourseRoute {
+  queryParams = {
     period: { refreshModel: true },
     searchType: { refreshModel: true },
-  },
+  };
 
   model(params) {
     this._params = params;
@@ -15,7 +15,7 @@ export default DiscourseRoute.extend({
     }).then((search_logs) => {
       return search_logs.map((sl) => EmberObject.create(sl));
     });
-  },
+  }
 
   setupController(controller, model) {
     const params = this._params;
@@ -24,5 +24,5 @@ export default DiscourseRoute.extend({
       period: params.period,
       searchType: params.searchType,
     });
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-search-logs-term.js b/app/assets/javascripts/admin/addon/routes/admin-search-logs-term.js
index 9847f44d19a..c0c658e6b5f 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-search-logs-term.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-search-logs-term.js
@@ -4,12 +4,12 @@ import { ajax } from "discourse/lib/ajax";
 import { fillMissingDates } from "discourse/lib/utilities";
 import { translateResults } from "discourse/lib/search";
 
-export default DiscourseRoute.extend({
-  queryParams: {
+export default class AdminSearchLogsTermRoute extends DiscourseRoute {
+  queryParams = {
     term: { refreshModel: true },
     period: { refreshModel: true },
     searchType: { refreshModel: true },
-  },
+  };
 
   model(params) {
     this._params = params;
@@ -40,7 +40,7 @@ export default DiscourseRoute.extend({
       model.setProperties(json.term);
       return model;
     });
-  },
+  }
 
   setupController(controller, model) {
     const params = this._params;
@@ -50,5 +50,5 @@ export default DiscourseRoute.extend({
       period: params.period,
       searchType: params.searchType,
     });
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-site-settings-category.js b/app/assets/javascripts/admin/addon/routes/admin-site-settings-category.js
index aab0b337db7..0d4f770db80 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-site-settings-category.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-site-settings-category.js
@@ -2,7 +2,7 @@ import DiscourseRoute from "discourse/routes/discourse";
 import EmberObject from "@ember/object";
 import I18n from "I18n";
 
-export default DiscourseRoute.extend({
+export default class AdminSiteSettingsCategoryRoute extends DiscourseRoute {
   model(params) {
     // The model depends on user input, so let the controller do the work:
     this.controllerFor("adminSiteSettingsCategory").set(
@@ -20,5 +20,5 @@ export default DiscourseRoute.extend({
         "filteredContent"
       ),
     });
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-site-settings-index.js b/app/assets/javascripts/admin/addon/routes/admin-site-settings-index.js
index 75580cb404d..5f266784bd4 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-site-settings-index.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-site-settings-index.js
@@ -4,12 +4,12 @@
 **/
 import DiscourseRoute from "discourse/routes/discourse";
 
-export default DiscourseRoute.extend({
+export default class AdminSiteSettingsIndexRoute extends DiscourseRoute {
   beforeModel() {
     this.replaceWith(
       "adminSiteSettingsCategory",
       this.controllerFor("adminSiteSettings").get("visibleSiteSettings")[0]
         .nameKey
     );
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-site-settings.js b/app/assets/javascripts/admin/addon/routes/admin-site-settings.js
index b97bc621bc1..a6fe9a12955 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-site-settings.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-site-settings.js
@@ -1,14 +1,15 @@
+import { action } from "@ember/object";
 import DiscourseRoute from "discourse/routes/discourse";
 import SiteSetting from "admin/models/site-setting";
 
-export default DiscourseRoute.extend({
-  queryParams: {
+export default class AdminSiteSettingsRoute extends DiscourseRoute {
+  queryParams = {
     filter: { replace: true },
-  },
+  };
 
   model() {
     return SiteSetting.findAll();
-  },
+  }
 
   afterModel(siteSettings) {
     const controller = this.controllerFor("adminSiteSettings");
@@ -16,13 +17,12 @@ export default DiscourseRoute.extend({
     if (!controller.get("visibleSiteSettings")) {
       controller.set("visibleSiteSettings", siteSettings);
     }
-  },
+  }
 
-  actions: {
-    refreshAll() {
-      SiteSetting.findAll().then((settings) => {
-        this.controllerFor("adminSiteSettings").set("model", settings);
-      });
-    },
-  },
-});
+  @action
+  refreshAll() {
+    SiteSetting.findAll().then((settings) => {
+      this.controllerFor("adminSiteSettings").set("model", settings);
+    });
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-site-text-edit.js b/app/assets/javascripts/admin/addon/routes/admin-site-text-edit.js
index 9a9677b687e..4fae723f898 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-site-text-edit.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-site-text-edit.js
@@ -1,10 +1,10 @@
 import Route from "@ember/routing/route";
 import { ajax } from "discourse/lib/ajax";
 
-export default Route.extend({
-  queryParams: {
+export default class AdminSiteTextEditRoute extends Route {
+  queryParams = {
     locale: { replace: true },
-  },
+  };
 
   model(params) {
     return ajax(
@@ -12,7 +12,7 @@ export default Route.extend({
     ).then((result) => {
       return this.store.createRecord("site-text", result.site_text);
     });
-  },
+  }
 
   setupController(controller, siteText) {
     const locales = JSON.parse(this.siteSettings.available_locales);
@@ -26,5 +26,5 @@ export default Route.extend({
       saved: false,
       localeFullName,
     });
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-site-text-index.js b/app/assets/javascripts/admin/addon/routes/admin-site-text-index.js
index 255315a8469..daf37261093 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-site-text-index.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-site-text-index.js
@@ -1,28 +1,28 @@
 import Route from "@ember/routing/route";
-import { getProperties } from "@ember/object";
+import { action, getProperties } from "@ember/object";
 import showModal from "discourse/lib/show-modal";
 
-export default Route.extend({
-  queryParams: {
+export default class AdminSiteTextIndexRoute extends Route {
+  queryParams = {
     q: { replace: true },
     overridden: { replace: true },
+    outdated: { replace: true },
     locale: { replace: true },
-  },
+  };
 
   model(params) {
     return this.store.find(
       "site-text",
-      getProperties(params, "q", "overridden", "locale")
+      getProperties(params, "q", "overridden", "outdated", "locale")
     );
-  },
+  }
 
   setupController(controller, model) {
     controller.set("siteTexts", model);
-  },
+  }
 
-  actions: {
-    showReseedModal() {
-      showModal("admin-reseed", { admin: true });
-    },
-  },
-});
+  @action
+  showReseedModal() {
+    showModal("admin-reseed", { admin: true });
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-user-badges.js b/app/assets/javascripts/admin/addon/routes/admin-user-badges.js
index 0c1621926ff..7d609fa5852 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-user-badges.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-user-badges.js
@@ -2,11 +2,11 @@ import Badge from "discourse/models/badge";
 import DiscourseRoute from "discourse/routes/discourse";
 import UserBadge from "discourse/models/user-badge";
 
-export default DiscourseRoute.extend({
+export default class AdminUserBadgesRoute extends DiscourseRoute {
   model() {
     const username = this.modelFor("adminUser").get("username");
     return UserBadge.findByUsername(username);
-  },
+  }
 
   setupController(controller, model) {
     // Find all badges.
@@ -23,5 +23,5 @@ export default DiscourseRoute.extend({
     });
     // Set the model.
     controller.set("model", model);
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-user-fields.js b/app/assets/javascripts/admin/addon/routes/admin-user-fields.js
index 79c908af647..bc3d4666c83 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-user-fields.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-user-fields.js
@@ -1,12 +1,12 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import UserField from "admin/models/user-field";
 
-export default DiscourseRoute.extend({
+export default class AdminUserFieldsRoute extends DiscourseRoute {
   model() {
     return this.store.findAll("user-field");
-  },
+  }
 
   setupController(controller, model) {
     controller.setProperties({ model, fieldTypes: UserField.fieldTypes() });
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-user-index.js b/app/assets/javascripts/admin/addon/routes/admin-user-index.js
index a6b329ac16c..7244eb35323 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-user-index.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-user-index.js
@@ -1,10 +1,10 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import Group from "discourse/models/group";
 
-export default DiscourseRoute.extend({
+export default class AdminUserIndexRoute extends DiscourseRoute {
   model() {
     return this.modelFor("adminUser");
-  },
+  }
 
   afterModel(model) {
     if (this.currentUser.admin) {
@@ -13,7 +13,7 @@ export default DiscourseRoute.extend({
         return model;
       });
     }
-  },
+  }
 
   setupController(controller, model) {
     controller.setProperties({
@@ -24,5 +24,5 @@ export default DiscourseRoute.extend({
       ssoLastPayload: null,
       model,
     });
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-user-tl3-requirements.js b/app/assets/javascripts/admin/addon/routes/admin-user-tl3-requirements.js
index 07919ecef88..29f141d305a 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-user-tl3-requirements.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-user-tl3-requirements.js
@@ -1,7 +1,7 @@
 import DiscourseRoute from "discourse/routes/discourse";
 
-export default DiscourseRoute.extend({
+export default class AdminUserTl3RequirementsRoute extends DiscourseRoute {
   model() {
     return this.modelFor("adminUser");
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-user.js b/app/assets/javascripts/admin/addon/routes/admin-user.js
index b0dbd34741b..2fad4956a84 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-user.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-user.js
@@ -2,22 +2,22 @@ import AdminUser from "admin/models/admin-user";
 import DiscourseRoute from "discourse/routes/discourse";
 import { get } from "@ember/object";
 
-export default DiscourseRoute.extend({
+export default class AdminUserRoute extends DiscourseRoute {
   serialize(model) {
     return {
       user_id: model.get("id"),
       username: model.get("username").toLowerCase(),
     };
-  },
+  }
 
   model(params) {
     return AdminUser.find(get(params, "user_id"));
-  },
+  }
 
   afterModel(adminUser) {
     return adminUser.loadDetails().then(function () {
       adminUser.setOriginalTrustLevel();
       return adminUser;
     });
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-users-index.js b/app/assets/javascripts/admin/addon/routes/admin-users-index.js
index 02d9cce4440..0dd8fcce4fd 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-users-index.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-users-index.js
@@ -1,7 +1,10 @@
 import DiscourseRoute from "discourse/routes/discourse";
+import { inject as service } from "@ember/service";
+
+export default class AdminUsersIndexRoute extends DiscourseRoute {
+  @service router;
 
-export default DiscourseRoute.extend({
   redirect() {
-    this.transitionTo("adminUsersList");
-  },
-});
+    this.router.transitionTo("adminUsersList");
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-users-list-index.js b/app/assets/javascripts/admin/addon/routes/admin-users-list-index.js
index 29ae18db797..7ccd3d62596 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-users-list-index.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-users-list-index.js
@@ -1,7 +1,10 @@
 import DiscourseRoute from "discourse/routes/discourse";
+import { inject as service } from "@ember/service";
+
+export default class AdminUsersListIndexRoute extends DiscourseRoute {
+  @service router;
 
-export default DiscourseRoute.extend({
   beforeModel() {
-    this.transitionTo("adminUsersList.show", "active");
-  },
-});
+    this.router.transitionTo("adminUsersList.show", "active");
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-users-list-show.js b/app/assets/javascripts/admin/addon/routes/admin-users-list-show.js
index 80eb675049d..f64a4f67c6f 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-users-list-show.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-users-list-show.js
@@ -1,10 +1,10 @@
 import DiscourseRoute from "discourse/routes/discourse";
 
-export default DiscourseRoute.extend({
-  queryParams: {
+export default class AdminUsersListShowRoute extends DiscourseRoute {
+  queryParams = {
     order: { refreshModel: true },
     asc: { refreshModel: true },
-  },
+  };
 
   // TODO: this has been introduced to fix a bug in admin-users-list-show
   // loading AdminUser model multiple times without refactoring the controller
@@ -27,5 +27,5 @@ export default DiscourseRoute.extend({
         controller.resetFilters();
       }
     }
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-users-list.js b/app/assets/javascripts/admin/addon/routes/admin-users-list.js
index 4630c8efc83..b9c246cb98c 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-users-list.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-users-list.js
@@ -1,22 +1,27 @@
+import { action } from "@ember/object";
 import AdminUser from "admin/models/admin-user";
 import DiscourseRoute from "discourse/routes/discourse";
 import { exportEntity } from "discourse/lib/export-csv";
 import { outputExportResult } from "discourse/lib/export-result";
+import { inject as service } from "@ember/service";
 
-export default DiscourseRoute.extend({
-  actions: {
-    exportUsers() {
-      exportEntity("user_list", {
-        trust_level: this.controllerFor("admin-users-list-show").get("query"),
-      }).then(outputExportResult);
-    },
+export default class AdminUsersListRoute extends DiscourseRoute {
+  @service router;
 
-    sendInvites() {
-      this.transitionTo("userInvited", this.currentUser);
-    },
+  @action
+  exportUsers() {
+    exportEntity("user_list", {
+      trust_level: this.controllerFor("admin-users-list-show").get("query"),
+    }).then(outputExportResult);
+  }
 
-    deleteUser(user) {
-      AdminUser.create(user).destroy({ deletePosts: true });
-    },
-  },
-});
+  @action
+  sendInvites() {
+    this.router.transitionTo("userInvited", this.currentUser);
+  }
+
+  @action
+  deleteUser(user) {
+    AdminUser.create(user).destroy({ deletePosts: true });
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-watched-words-action.js b/app/assets/javascripts/admin/addon/routes/admin-watched-words-action.js
index 5ba55219c7b..721e193b117 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-watched-words-action.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-watched-words-action.js
@@ -2,7 +2,7 @@ import DiscourseRoute from "discourse/routes/discourse";
 import EmberObject from "@ember/object";
 import I18n from "I18n";
 
-export default DiscourseRoute.extend({
+export default class AdminWatchedWordsActionRoute extends DiscourseRoute {
   model(params) {
     const controller = this.controllerFor("adminWatchedWordsAction");
     controller.set("actionNameKey", params.action_id);
@@ -11,5 +11,5 @@ export default DiscourseRoute.extend({
       name: I18n.t("admin.watched_words.actions." + params.action_id),
       words: controller.filteredContent,
     });
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-watched-words-index.js b/app/assets/javascripts/admin/addon/routes/admin-watched-words-index.js
index 4015e117c11..4f9f0dc7026 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-watched-words-index.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-watched-words-index.js
@@ -1,10 +1,10 @@
 import DiscourseRoute from "discourse/routes/discourse";
 
-export default DiscourseRoute.extend({
+export default class AdminWatchedWordsIndexRoute extends DiscourseRoute {
   beforeModel() {
     this.replaceWith(
       "adminWatchedWords.action",
       this.modelFor("adminWatchedWords")[0].nameKey
     );
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-watched-words.js b/app/assets/javascripts/admin/addon/routes/admin-watched-words.js
index aa793646cbd..3d9756b5cfa 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-watched-words.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-watched-words.js
@@ -1,17 +1,17 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import WatchedWord from "admin/models/watched-word";
 
-export default DiscourseRoute.extend({
-  queryParams: {
+export default class AdminWatchedWordsRoute extends DiscourseRoute {
+  queryParams = {
     filter: { replace: true },
-  },
+  };
 
   model() {
     return WatchedWord.findAll();
-  },
+  }
 
   afterModel(model) {
     const controller = this.controllerFor("adminWatchedWords");
     controller.set("allWatchedWords", model);
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-web-hooks-edit.js b/app/assets/javascripts/admin/addon/routes/admin-web-hooks-edit.js
index 6bd96b117b3..58eef48edbb 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-web-hooks-edit.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-web-hooks-edit.js
@@ -1,9 +1,9 @@
 import DiscourseRoute from "discourse/routes/discourse";
 
-export default DiscourseRoute.extend({
+export default class AdminWebHooksEditRoute extends DiscourseRoute {
   serialize(model) {
     return { web_hook_id: model.id || "new" };
-  },
+  }
 
   model(params) {
     if (params.web_hook_id === "new") {
@@ -11,10 +11,10 @@ export default DiscourseRoute.extend({
     }
 
     return this.store.find("web-hook", params.web_hook_id);
-  },
+  }
 
   setupController(controller, model) {
-    this._super(...arguments);
+    super.setupController(...arguments);
 
     if (model.get("isNew")) {
       model.set(
@@ -24,5 +24,5 @@ export default DiscourseRoute.extend({
     }
 
     controller.set("saved", false);
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-web-hooks-show.js b/app/assets/javascripts/admin/addon/routes/admin-web-hooks-show.js
index 369bbd00597..10ff93c51a0 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-web-hooks-show.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-web-hooks-show.js
@@ -1,7 +1,7 @@
 import DiscourseRoute from "discourse/routes/discourse";
 
-export default DiscourseRoute.extend({
+export default class AdminWebHooksShowRoute extends DiscourseRoute {
   model(params) {
     return this.store.find("web-hook", params.web_hook_id);
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin-web-hooks.js b/app/assets/javascripts/admin/addon/routes/admin-web-hooks.js
index 3619142a4c2..eefa7f347db 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-web-hooks.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-web-hooks.js
@@ -1,9 +1,9 @@
 import Route from "@ember/routing/route";
 
-export default Route.extend({
+export default class AdminWebHooksRoute extends Route {
   model() {
     return this.store.findAll("web-hook");
-  },
+  }
 
   setupController(controller, model) {
     controller.setProperties({
@@ -13,5 +13,5 @@ export default Route.extend({
       contentTypes: model.extras.content_types,
       deliveryStatuses: model.extras.delivery_statuses,
     });
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/routes/admin.js b/app/assets/javascripts/admin/addon/routes/admin.js
index e0949ba414c..201e0284084 100644
--- a/app/assets/javascripts/admin/addon/routes/admin.js
+++ b/app/assets/javascripts/admin/addon/routes/admin.js
@@ -1,19 +1,19 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import I18n from "I18n";
 
-export default DiscourseRoute.extend({
+export default class AdminRoute extends DiscourseRoute {
   titleToken() {
     return I18n.t("admin_title");
-  },
+  }
 
   activate() {
     this.controllerFor("application").setProperties({
       showTop: false,
       showFooter: false,
     });
-  },
+  }
 
   deactivate() {
     this.controllerFor("application").set("showTop", true);
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/services/admin-tools.js b/app/assets/javascripts/admin/addon/services/admin-tools.js
index 59d3a432d14..79944fc1475 100644
--- a/app/assets/javascripts/admin/addon/services/admin-tools.js
+++ b/app/assets/javascripts/admin/addon/services/admin-tools.js
@@ -10,8 +10,8 @@ import { htmlSafe } from "@ember/template";
 // A service that can act as a bridge between the front end Discourse application
 // and the admin application. Use this if you need front end code to access admin
 // modules. Inject it optionally, and if it exists go to town!
-export default Service.extend({
-  dialog: service(),
+export default class AdminToolsService extends Service {
+  @service dialog;
 
   showActionLogs(target, filters) {
     const controller = getOwner(target).lookup(
@@ -20,15 +20,15 @@ export default Service.extend({
     target.transitionToRoute("adminLogs.staffActionLogs").then(() => {
       controller.changeFilters(filters);
     });
-  },
+  }
 
   checkSpammer(userId) {
     return AdminUser.find(userId).then((au) => this.spammerDetails(au));
-  },
+  }
 
   deleteUser(id, formData) {
     return AdminUser.find(id).then((user) => user.destroy(formData));
-  },
+  }
 
   spammerDetails(adminUser) {
     return {
@@ -37,7 +37,7 @@ export default Service.extend({
         adminUser.get("can_be_deleted") &&
         adminUser.get("can_delete_all_posts"),
     };
-  },
+  }
 
   _showControlModal(type, user, opts) {
     opts = opts || {};
@@ -67,15 +67,15 @@ export default Service.extend({
 
       controller.finishedSetup();
     });
-  },
+  }
 
   showSilenceModal(user, opts) {
     this._showControlModal("silence", user, opts);
-  },
+  }
 
   showSuspendModal(user, opts) {
     this._showControlModal("suspend", user, opts);
-  },
+  }
 
   _deleteSpammer(adminUser) {
     // Try loading the email if the site supports it
@@ -131,5 +131,5 @@ export default Service.extend({
         });
       });
     });
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs b/app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs
index 4f6619b25e4..c909f9b9923 100644
--- a/app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs
+++ b/app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs
@@ -1,4 +1,12 @@
 <DSection @class="current-badge content-body">
+  <div class="control-group current-badge__toggle-badge">
+    <DToggleSwitch
+      @state={{this.buffered.enabled}}
+      @label={{this.badgeEnabledLabel}}
+      {{on "click" this.toggleBadge}}
+    />
+  </div>
+
   <form class="form-horizontal">
     <div class="control-group">
       <label for="name">{{i18n "admin.badges.name"}}</label>
@@ -253,13 +261,6 @@
           {{i18n "admin.badges.show_posts"}}
         </label>
       </div>
-
-      <div>
-        <label>
-          <Input @type="checkbox" @checked={{this.buffered.enabled}} />
-          {{i18n "admin.badges.enabled"}}
-        </label>
-      </div>
     </div>
 
     <div class="buttons">
@@ -285,10 +286,15 @@
 {{#if this.grant_count}}
   <div class="content-body current-badge-actions">
     <div>
-      <LinkTo @route="badges.show" @model={{this}}>{{i18n
-          "badges.granted"
-          count=this.grant_count
-        }}</LinkTo>
+      <LinkTo @route="badges.show" @model={{this}}>
+        {{html-safe
+          (i18n
+            "badges.awarded"
+            count=this.displayCount
+            number=(number this.displayCount)
+          )
+        }}
+      </LinkTo>
     </div>
   </div>
 {{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/templates/admin.hbs b/app/assets/javascripts/admin/addon/templates/admin.hbs
index b9a316091a2..e9f9ef01ca6 100644
--- a/app/assets/javascripts/admin/addon/templates/admin.hbs
+++ b/app/assets/javascripts/admin/addon/templates/admin.hbs
@@ -27,8 +27,8 @@
             {{#if this.siteSettings.enable_backups}}
               <NavItem @route="admin.backups" @label="admin.backups.title" />
             {{/if}}
+            <NavItem @route="adminPlugins" @label="admin.plugins.title" />
           {{/if}}
-          <NavItem @route="adminPlugins" @label="admin.plugins.title" />
           <PluginOutlet @name="admin-menu" />
         </ul>
       </div>
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-nav.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-nav.hbs
deleted file mode 100644
index 6d1163bcf2f..00000000000
--- a/app/assets/javascripts/admin/addon/templates/components/admin-nav.hbs
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="admin-controls">
-  <nav>
-    <ul class="nav nav-pills">
-      {{yield}}
-    </ul>
-  </nav>
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/templates/customize-colors-show.hbs b/app/assets/javascripts/admin/addon/templates/customize-colors-show.hbs
index ead4c563c0d..2eb3dd478f4 100644
--- a/app/assets/javascripts/admin/addon/templates/customize-colors-show.hbs
+++ b/app/assets/javascripts/admin/addon/templates/customize-colors-show.hbs
@@ -127,4 +127,4 @@
       <p>{{i18n "search.no_results"}}</p>
     {{/if}}
   </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/templates/customize-form-templates-edit.hbs b/app/assets/javascripts/admin/addon/templates/customize-form-templates-edit.hbs
new file mode 100644
index 00000000000..38c5499bfb4
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/templates/customize-form-templates-edit.hbs
@@ -0,0 +1,4 @@
+<div class="edit-form-template">
+  <FormTemplate::InfoHeader />
+  <FormTemplate::Form @model={{this.model}} />
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/templates/customize-form-templates-index.hbs b/app/assets/javascripts/admin/addon/templates/customize-form-templates-index.hbs
new file mode 100644
index 00000000000..2a41eedce4f
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/templates/customize-form-templates-index.hbs
@@ -0,0 +1,35 @@
+<div class="form-templates">
+  <FormTemplate::InfoHeader />
+
+  {{#if this.model}}
+    <table class="form-templates__table grid">
+      <thead>
+        <th class="col heading">
+          {{i18n "admin.form_templates.list_table.headings.name"}}
+        </th>
+        <th class="col heading">
+          {{i18n "admin.form_templates.list_table.headings.active_categories"}}
+        </th>
+        <th class="col heading sr-only">
+          {{i18n "admin.form_templates.list_table.headings.actions"}}
+        </th>
+      </thead>
+      <tbody>
+        {{#each this.model as |template|}}
+          <FormTemplate::RowItem
+            @template={{template}}
+            @refreshModel={{this.reload}}
+          />
+        {{/each}}
+      </tbody>
+    </table>
+  {{/if}}
+
+  <DButton
+    @class="btn-primary"
+    @label="admin.form_templates.new_template"
+    @title="admin.form_templates.new_template"
+    @icon="plus"
+    @action={{this.newTemplate}}
+  />
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/templates/customize-form-templates-new.hbs b/app/assets/javascripts/admin/addon/templates/customize-form-templates-new.hbs
new file mode 100644
index 00000000000..71515c6a54c
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/templates/customize-form-templates-new.hbs
@@ -0,0 +1,4 @@
+<div class="new-form-template">
+  <FormTemplate::InfoHeader />
+  <FormTemplate::Form />
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/addon/templates/customize-themes-show.hbs
index 1752e1a2b7f..3de57309c53 100644
--- a/app/assets/javascripts/admin/addon/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/addon/templates/customize-themes-show.hbs
@@ -1,10 +1,11 @@
 <div class="show-current-style">
-  <PluginOutlet
-    @name="admin-customize-themes-show-top"
-    @tagName="span"
-    @connectorTagName="div"
-    @args={{hash theme=this.model}}
-  />
+  <span>
+    <PluginOutlet
+      @name="admin-customize-themes-show-top"
+      @connectorTagName="div"
+      @outletArgs={{hash theme=this.model}}
+    />
+  </span>
   <div class="title">
     {{#if this.editingName}}
       <TextField @value={{this.model.name}} @autofocus="true" />
@@ -64,7 +65,7 @@
         @label="admin.customize.theme.finish_install"
       />
       <DButton
-        @action={{action "destroy"}}
+        @action={{action "destroyTheme"}}
         @label="admin.customize.delete"
         @icon="trash-alt"
         @class="btn-danger"
@@ -495,14 +496,22 @@
           />
         {{/if}}
       {{/if}}
+      {{#if this.hasSettings}}
 
+        <DButton
+          @action={{this.showThemeSettingsEditor}}
+          @label="admin.customize.theme.settings_editor"
+          @icon="pen"
+          @class="btn-default btn-normal"
+          @title="admin.customize.theme.settings_editor"
+        />
+      {{/if}}
       <DButton
-        @action={{action "destroy"}}
+        @action={{action "destroyTheme"}}
         @label="admin.customize.delete"
         @icon="trash-alt"
         @class="btn-danger"
       />
-
     </div>
   {{/if}}
 
diff --git a/app/assets/javascripts/admin/addon/templates/customize.hbs b/app/assets/javascripts/admin/addon/templates/customize.hbs
index 089b6587cc0..dac792775a4 100644
--- a/app/assets/javascripts/admin/addon/templates/customize.hbs
+++ b/app/assets/javascripts/admin/addon/templates/customize.hbs
@@ -45,6 +45,13 @@
       @label="admin.embedding.title"
       @class="admin-customize-embedding"
     />
+    {{#if this.siteSettings.experimental_form_templates}}
+      <NavItem
+        @route="adminCustomizeFormTemplates"
+        @label="admin.form_templates.nav_title"
+        @class="admin-customize-form-templates"
+      />
+    {{/if}}
   {{/if}}
   <NavItem
     @route="adminWatchedWords"
diff --git a/app/assets/javascripts/admin/addon/templates/dashboard.hbs b/app/assets/javascripts/admin/addon/templates/dashboard.hbs
index 0ebc0fdffe5..19f614fc360 100644
--- a/app/assets/javascripts/admin/addon/templates/dashboard.hbs
+++ b/app/assets/javascripts/admin/addon/templates/dashboard.hbs
@@ -1,8 +1,6 @@
-<PluginOutlet
-  @name="admin-dashboard-top"
-  @tagName="span"
-  @connectorTagName="div"
-/>
+<span>
+  <PluginOutlet @name="admin-dashboard-top" @connectorTagName="div" />
+</span>
 
 {{#if this.showVersionChecks}}
   <div class="section-top">
@@ -57,8 +55,6 @@
 
 <DashboardNewFeatures @tagName="div" />
 
-<PluginOutlet
-  @name="admin-dashboard-bottom"
-  @tagName="span"
-  @connectorTagName="div"
-/>
\ No newline at end of file
+<span>
+  <PluginOutlet @name="admin-dashboard-bottom" @connectorTagName="div" />
+</span>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/templates/dashboard_general.hbs b/app/assets/javascripts/admin/addon/templates/dashboard_general.hbs
index b9f0f8e6201..4b8bc39d995 100644
--- a/app/assets/javascripts/admin/addon/templates/dashboard_general.hbs
+++ b/app/assets/javascripts/admin/addon/templates/dashboard_general.hbs
@@ -1,9 +1,7 @@
 <ConditionalLoadingSpinner @condition={{this.isLoading}}>
-  <PluginOutlet
-    @name="admin-dashboard-general-top"
-    @tagName="span"
-    @connectorTagName="div"
-  />
+  <span>
+    <PluginOutlet @name="admin-dashboard-general-top" @connectorTagName="div" />
+  </span>
 
   {{#if this.isCommunityHealthVisible}}
     <div class="community-health section">
@@ -197,9 +195,10 @@
     {{/if}}
   </div>
 
-  <PluginOutlet
-    @name="admin-dashboard-general-bottom"
-    @tagName="span"
-    @connectorTagName="div"
-  />
+  <span>
+    <PluginOutlet
+      @name="admin-dashboard-general-bottom"
+      @connectorTagName="div"
+    />
+  </span>
 </ConditionalLoadingSpinner>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/templates/dashboard_moderation.hbs b/app/assets/javascripts/admin/addon/templates/dashboard_moderation.hbs
index f744675c523..0ee4bc1daf1 100644
--- a/app/assets/javascripts/admin/addon/templates/dashboard_moderation.hbs
+++ b/app/assets/javascripts/admin/addon/templates/dashboard_moderation.hbs
@@ -1,9 +1,10 @@
 <div class="sections">
-  <PluginOutlet
-    @name="admin-dashboard-moderation-top"
-    @tagName="span"
-    @connectorTagName="div"
-  />
+  <span>
+    <PluginOutlet
+      @name="admin-dashboard-moderation-top"
+      @connectorTagName="div"
+    />
+  </span>
 
   {{#if this.isModeratorsActivityVisible}}
     <div class="moderators-activity section">
@@ -49,11 +50,12 @@
       @reportOptions={{this.userFlaggingRatioOptions}}
     />
 
-    <PluginOutlet
-      @name="admin-dashboard-moderation-bottom"
-      @tagName="span"
-      @connectorTagName="div"
-      @args={{hash filters=this.lastWeekfilters}}
-    />
+    <span>
+      <PluginOutlet
+        @name="admin-dashboard-moderation-bottom"
+        @connectorTagName="div"
+        @outletArgs={{hash filters=this.lastWeekfilters}}
+      />
+    </span>
   </div>
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/templates/dashboard_security.hbs b/app/assets/javascripts/admin/addon/templates/dashboard_security.hbs
index c5c7c0ebb67..887cdb3c0fb 100644
--- a/app/assets/javascripts/admin/addon/templates/dashboard_security.hbs
+++ b/app/assets/javascripts/admin/addon/templates/dashboard_security.hbs
@@ -1,9 +1,10 @@
 <div class="sections">
-  <PluginOutlet
-    @name="admin-dashboard-security-top"
-    @tagName="span"
-    @connectorTagName="div"
-  />
+  <span>
+    <PluginOutlet
+      @name="admin-dashboard-security-top"
+      @connectorTagName="div"
+    />
+  </span>
 
   <div class="main-section">
     <AdminReport
@@ -16,10 +17,11 @@
       @filters={{this.lastWeekfilters}}
     />
 
-    <PluginOutlet
-      @name="admin-dashboard-security-bottom"
-      @tagName="span"
-      @connectorTagName="div"
-    />
+    <span>
+      <PluginOutlet
+        @name="admin-dashboard-security-bottom"
+        @connectorTagName="div"
+      />
+    </span>
   </div>
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/templates/embedding.hbs b/app/assets/javascripts/admin/addon/templates/embedding.hbs
index 1a47752e0b2..b382e2dc2cb 100644
--- a/app/assets/javascripts/admin/addon/templates/embedding.hbs
+++ b/app/assets/javascripts/admin/addon/templates/embedding.hbs
@@ -2,10 +2,9 @@
   {{#if this.embedding.embeddable_hosts}}
     <table class="embedding grid">
       <thead>
-        <th style="width: 25%">{{i18n "admin.embedding.host"}}</th>
-        <th style="width: 15%">{{i18n "admin.embedding.class_name"}}</th>
-        <th style="width: 25%">{{i18n "admin.embedding.allowed_paths"}}</th>
-        <th style="width: 25%">{{i18n "admin.embedding.category"}}</th>
+        <th style="width: 30%">{{i18n "admin.embedding.host"}}</th>
+        <th style="width: 30%">{{i18n "admin.embedding.allowed_paths"}}</th>
+        <th style="width: 30%">{{i18n "admin.embedding.category"}}</th>
         <th style="width: 10%">&nbsp;</th>
       </thead>
       <tbody>
@@ -28,7 +27,7 @@
 
 {{#if this.showSecondary}}
   <div class="embedding-secondary">
-    <p>{{html-safe (i18n "admin.embedding.sample")}}</p>
+    {{html-safe (i18n "admin.embedding.sample")}}
     <HighlightedCode @code={{this.embeddingCode}} @lang="html" />
   </div>
 
diff --git a/app/assets/javascripts/admin/addon/templates/logs/screened-ip-addresses.hbs b/app/assets/javascripts/admin/addon/templates/logs/screened-ip-addresses.hbs
index 027412e6dc8..0beb6a0b1e6 100644
--- a/app/assets/javascripts/admin/addon/templates/logs/screened-ip-addresses.hbs
+++ b/app/assets/javascripts/admin/addon/templates/logs/screened-ip-addresses.hbs
@@ -96,7 +96,7 @@
               {{else}}
                 <DButton
                   @class="btn-default btn-danger"
-                  @action={{action "destroy"}}
+                  @action={{action "destroyRecord"}}
                   @actionParam={{item}}
                   @icon="far-trash-alt"
                 />
diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-add-upload.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-add-upload.hbs
deleted file mode 100644
index 2cb57fdf1e8..00000000000
--- a/app/assets/javascripts/admin/addon/templates/modal/admin-add-upload.hbs
+++ /dev/null
@@ -1,37 +0,0 @@
-<DModalBody @class="add-upload-modal" @title="admin.customize.theme.add_upload">
-  <div class="inputs">
-    <section class="field">
-      <input
-        onchange={{action "updateName"}}
-        type="file"
-        id="file-input"
-        accept="*"
-      />
-      <label for="file-input">{{i18n
-          "admin.customize.theme.upload_file_tip"
-        }}</label>
-    </section>
-    <section class="field">
-      <label for="theme-variable-name">{{i18n
-          "admin.customize.theme.variable_name"
-        }}</label>
-      <Input id="theme-variable-name" @value={{this.name}} />
-    </section>
-    {{#if this.fileSelected}}
-      {{#if this.errorMessage}}
-        <span class="alert alert-error">{{this.errorMessage}}</span>
-      {{/if}}
-    {{/if}}
-  </div>
-</DModalBody>
-
-<div class="modal-footer">
-  <DButton
-    @action={{action "upload"}}
-    @disabled={{this.disabled}}
-    @class="btn btn-primary"
-    @icon="upload"
-    @label="admin.customize.theme.upload"
-  />
-  <DModalCancel @close={{route-action "closeModal"}} />
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-delete-posts-confirmation.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-delete-posts-confirmation.hbs
deleted file mode 100644
index 96349c3704f..00000000000
--- a/app/assets/javascripts/admin/addon/templates/modal/admin-delete-posts-confirmation.hbs
+++ /dev/null
@@ -1,32 +0,0 @@
-<div>
-  <DModalBody
-    @rawTitle={{i18n
-      "admin.user.delete_posts.confirmation.title"
-      username=this.username
-    }}
-  >
-    <p>{{html-safe
-        (i18n
-          "admin.user.delete_posts.confirmation.description"
-          username=this.username
-          post_count=this.postCount
-          text=this.text
-        )
-      }}</p>
-    <Input @type="text" @value={{this.value}} />
-  </DModalBody>
-
-  <div class="modal-footer">
-    <DButton
-      @class="btn-danger"
-      @action={{action "confirm"}}
-      @icon="trash-alt"
-      @disabled={{this.deleteDisabled}}
-      @translatedLabel={{this.deleteButtonText}}
-    />
-    <DButton
-      @action={{action "close"}}
-      @label="admin.user.delete_posts.confirmation.cancel"
-    />
-  </div>
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-form-template-validation-options.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-form-template-validation-options.hbs
new file mode 100644
index 00000000000..330dd1cebdc
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/templates/modal/admin-form-template-validation-options.hbs
@@ -0,0 +1,23 @@
+<DModalBody
+  @class="form-templates__validation-options"
+  @title="admin.form_templates.validations_modal.modal_title"
+>
+  <table>
+    <thead>
+      <tr>
+        {{#each this.tableHeaders as |header|}}
+          <th>{{header}}</th>
+        {{/each}}
+      </tr>
+    </thead>
+    <tbody>
+      {{#each this.validations as |item|}}
+        <tr>
+          <td><pre>{{item.key}}</pre></td>
+          <td>{{item.type}}</td>
+          <td>{{item.description}}</td>
+        </tr>
+      {{/each}}
+    </tbody>
+  </table>
+</DModalBody>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-incoming-email.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-incoming-email.hbs
deleted file mode 100644
index 28a4294b9d2..00000000000
--- a/app/assets/javascripts/admin/addon/templates/modal/admin-incoming-email.hbs
+++ /dev/null
@@ -1,50 +0,0 @@
-<DModalBody
-  @class="incoming-emails"
-  @title="admin.email.incoming_emails.modal.title"
->
-  <div class="control-group">
-    <label>{{i18n "admin.email.incoming_emails.modal.error"}}</label>
-    <div class="controls">
-      <p>{{this.model.error}}</p>
-      {{#if this.model.error_description}}
-        <p class="error-description">{{this.model.error_description}}</p>
-      {{/if}}
-    </div>
-  </div>
-
-  <hr />
-
-  <div class="control-group">
-    <label>{{i18n "admin.email.incoming_emails.modal.headers"}}</label>
-    <div class="controls">
-      <Textarea @value={{this.model.headers}} wrap="off" />
-    </div>
-  </div>
-
-  <div class="control-group">
-    <label>{{i18n "admin.email.incoming_emails.modal.subject"}}</label>
-    <div class="controls">
-      {{this.model.subject}}
-    </div>
-  </div>
-
-  <div class="control-group">
-    <label>{{i18n "admin.email.incoming_emails.modal.body"}}</label>
-    <div class="controls">
-      <Textarea @value={{this.model.body}} />
-    </div>
-  </div>
-
-  {{#if this.model.rejection_message}}
-    <hr />
-
-    <div class="control-group">
-      <label>{{i18n
-          "admin.email.incoming_emails.modal.rejection_message"
-        }}</label>
-      <div class="controls">
-        <Textarea @value={{this.model.rejection_message}} />
-      </div>
-    </div>
-  {{/if}}
-</DModalBody>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-penalize-user.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-penalize-user.hbs
index 1303d01d808..ea8ae78a8f2 100644
--- a/app/assets/javascripts/admin/addon/templates/modal/admin-penalize-user.hbs
+++ b/app/assets/javascripts/admin/addon/templates/modal/admin-penalize-user.hbs
@@ -57,7 +57,6 @@
         />
       {{/if}}
 
-      <div class="penalty-history">{{html-safe this.penaltyHistory}}</div>
     {{else}}
       {{#if (eq this.penaltyType "suspend")}}
         <div class="cant-suspend">{{i18n "admin.user.cant_suspend"}}</div>
@@ -65,6 +64,7 @@
         <div class="cant-silence">{{i18n "admin.user.cant_silence"}}</div>
       {{/if}}
     {{/if}}
+    <div class="penalty-history">{{html-safe this.penaltyHistory}}</div>
   </ConditionalLoadingSpinner>
 </DModalBody>
 
diff --git a/app/assets/javascripts/admin/addon/templates/permalinks.hbs b/app/assets/javascripts/admin/addon/templates/permalinks.hbs
index c3fefa1137c..8b2f83b4bf4 100644
--- a/app/assets/javascripts/admin/addon/templates/permalinks.hbs
+++ b/app/assets/javascripts/admin/addon/templates/permalinks.hbs
@@ -63,7 +63,7 @@
               </td>
               <td class="col action" style="text-align: right;">
                 <DButton
-                  @action={{action "destroy"}}
+                  @action={{action "destroyRecord"}}
                   @actionParam={{pl}}
                   @icon="far-trash-alt"
                   @class="btn-danger"
diff --git a/app/assets/javascripts/admin/addon/templates/plugins-index.hbs b/app/assets/javascripts/admin/addon/templates/plugins-index.hbs
index c211a73b156..c02746557af 100644
--- a/app/assets/javascripts/admin/addon/templates/plugins-index.hbs
+++ b/app/assets/javascripts/admin/addon/templates/plugins-index.hbs
@@ -42,7 +42,8 @@
           </td>
           <td class="version">
             <div class="label">{{i18n "admin.plugins.version"}}</div>
-            {{plugin.version}}
+            {{plugin.version}}<br />
+            <PluginCommitHash @plugin={{plugin}} />
           </td>
           <td class="col-enabled">
             <div class="label">{{i18n "admin.plugins.enabled"}}</div>
@@ -81,9 +82,10 @@
     href="https://meta.discourse.org/t/install-a-plugin/19157"
   >{{i18n "admin.plugins.howto"}}</a></p>
 
-<PluginOutlet
-  @name="admin-below-plugins-index"
-  @tagName="span"
-  @connectorTagName="div"
-  @args={{hash model=this.model}}
-/>
\ No newline at end of file
+<span>
+  <PluginOutlet
+    @name="admin-below-plugins-index"
+    @connectorTagName="div"
+    @outletArgs={{hash model=this.model}}
+  />
+</span>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/templates/plugins.hbs b/app/assets/javascripts/admin/addon/templates/plugins.hbs
index 421bc8cc288..ffe79967f31 100644
--- a/app/assets/javascripts/admin/addon/templates/plugins.hbs
+++ b/app/assets/javascripts/admin/addon/templates/plugins.hbs
@@ -1,33 +1,20 @@
 <div class="admin-controls">
-  <div class="controls">
-    <DButton
-      @action={{action "toggleMenu"}}
-      @class="menu-toggle"
-      @icon="bars"
-    />
-
-    {{#if this.currentUser.admin}}
-      <DButton
-        @label="admin.plugins.change_settings"
-        @icon="cog"
-        @class="btn-default settings-button"
-        @action={{route-action "showSettings"}}
-      />
-    {{/if}}
-  </div>
-</div>
-
-<div class="admin-nav pull-left">
-  <ul class="nav nav-stacked">
+  <HorizontalOverflowNav @className="main-nav nav plugin-nav">
     <NavItem @route="adminPlugins.index" @label="admin.plugins.title" />
-
     {{#each this.adminRoutes as |route|}}
       <NavItem @route={{route.full_location}} @label={{route.label}} />
     {{/each}}
-  </ul>
+    {{#if this.currentUser.admin}}
+      <NavItem
+        @route="adminSiteSettingsCategory"
+        @label="admin.plugins.change_settings"
+        @routeParam="plugins"
+      />
+    {{/if}}
+  </HorizontalOverflowNav>
 </div>
 
-<div class="admin-detail pull-left mobile-closed">
+<div class="admin-container">
   {{#each this.brokenAdminRoutes as |route|}}
     <div class="alert alert-error">
       {{i18n "admin.plugins.broken_route" name=(i18n route.label)}}
diff --git a/app/assets/javascripts/admin/addon/templates/site-settings-category.hbs b/app/assets/javascripts/admin/addon/templates/site-settings-category.hbs
index 43966ef9c28..3fba14e61cd 100644
--- a/app/assets/javascripts/admin/addon/templates/site-settings-category.hbs
+++ b/app/assets/javascripts/admin/addon/templates/site-settings-category.hbs
@@ -7,7 +7,10 @@
       />
     {{/each}}
     {{#if this.category.hasMore}}
-      <p class="warning">{{i18n "admin.site_settings.more_than_30_results"}}</p>
+      <p class="warning">{{i18n
+          "admin.site_settings.more_site_setting_results"
+          count=this.category.maxResults
+        }}</p>
     {{/if}}
   </DSection>
 {{else}}
diff --git a/app/assets/javascripts/admin/addon/templates/site-settings.hbs b/app/assets/javascripts/admin/addon/templates/site-settings.hbs
index a12f1f05339..673783dc8e0 100644
--- a/app/assets/javascripts/admin/addon/templates/site-settings.hbs
+++ b/app/assets/javascripts/admin/addon/templates/site-settings.hbs
@@ -1,5 +1,4 @@
 <div class="admin-controls">
-
   <div class="controls">
     <div class="inline-form">
       <DButton
@@ -21,9 +20,14 @@
       />
     </div>
   </div>
+
   <div class="search controls">
     <label>
-      <Input @type="checkbox" @checked={{this.onlyOverridden}} />
+      <Input
+        @type="checkbox"
+        @checked={{this.onlyOverridden}}
+        class="toggle-overridden"
+      />
       {{i18n "admin.settings.show_overriden"}}
     </label>
   </div>
@@ -37,11 +41,12 @@
           @route="adminSiteSettingsCategory"
           @model={{category.nameKey}}
           class={{category.nameKey}}
+          title={{category.name}}
         >
           {{category.name}}
-          {{#if category.count}}<span
-              class="count"
-            >({{category.count}})</span>{{/if}}
+          {{#if category.count}}
+            <span class="count">({{category.count}})</span>
+          {{/if}}
         </LinkTo>
       </li>
     {{/each}}
diff --git a/app/assets/javascripts/admin/addon/templates/site-text-edit.hbs b/app/assets/javascripts/admin/addon/templates/site-text-edit.hbs
index 3643a123f8b..33eee6fc3f1 100644
--- a/app/assets/javascripts/admin/addon/templates/site-text-edit.hbs
+++ b/app/assets/javascripts/admin/addon/templates/site-text-edit.hbs
@@ -7,12 +7,34 @@
     <h4>{{i18n "admin.site_text.locale"}} {{this.localeFullName}}</h4>
   </div>
 
+  {{#if this.isOutdated}}
+    <div class="outdated">
+      <h4>{{i18n "admin.site_text.outdated.title"}}</h4>
+      <p>{{i18n "admin.site_text.outdated.description"}}</p>
+      <h5>{{i18n "admin.site_text.outdated.old_default"}}</h5>
+      <p>{{this.siteText.old_default}}</p>
+      <h5>{{i18n "admin.site_text.outdated.new_default"}}</h5>
+      <p>{{this.siteText.new_default}}</p>
+      <DButton
+        @class="btn-default"
+        @action={{action "dismissOutdated"}}
+        @label="admin.site_text.outdated.dismiss"
+      />
+    </div>
+  {{/if}}
+
   <ExpandingTextArea
     @value={{this.buffered.value}}
     @rows="1"
     @class="site-text-value"
   />
 
+  {{#if this.siteText.has_interpolation_keys}}
+    <div class="desc">{{i18n "admin.site_text.interpolation_keys"}}
+      {{this.interpolationKeys}}
+    </div>
+  {{/if}}
+
   <SaveControls
     @model={{this.siteText}}
     @action={{action "saveChanges"}}
diff --git a/app/assets/javascripts/admin/addon/templates/site-text-index.hbs b/app/assets/javascripts/admin/addon/templates/site-text-index.hbs
index e3f7caa855c..2a6c64a6125 100644
--- a/app/assets/javascripts/admin/addon/templates/site-text-index.hbs
+++ b/app/assets/javascripts/admin/addon/templates/site-text-index.hbs
@@ -34,12 +34,23 @@
 
     <label>
       <Input
+        id="toggle-overridden"
         @type="checkbox"
         @checked={{this.overridden}}
         {{on "click" (action "toggleOverridden")}}
       />
       {{i18n "admin.site_text.show_overriden"}}
     </label>
+
+    <label>
+      <Input
+        id="toggle-outdated"
+        @type="checkbox"
+        @checked={{this.outdated}}
+        {{on "click" this.toggleOutdated}}
+      />
+      {{i18n "admin.site_text.show_outdated"}}
+    </label>
   </p>
 </div>
 
diff --git a/app/assets/javascripts/admin/addon/templates/user-badges.hbs b/app/assets/javascripts/admin/addon/templates/user-badges.hbs
index 9a0ea2252e3..702043e09c6 100644
--- a/app/assets/javascripts/admin/addon/templates/user-badges.hbs
+++ b/app/assets/javascripts/admin/addon/templates/user-badges.hbs
@@ -34,7 +34,7 @@
         </div>
         <DButton
           @class="btn-primary"
-          @action={{action "grantBadge"}}
+          @action={{this.performGrantBadge}}
           @type="submit"
           @label="admin.badges.grant"
         />
diff --git a/app/assets/javascripts/admin/addon/templates/user-fields.hbs b/app/assets/javascripts/admin/addon/templates/user-fields.hbs
index 0089aaa921e..982bf56e98e 100644
--- a/app/assets/javascripts/admin/addon/templates/user-fields.hbs
+++ b/app/assets/javascripts/admin/addon/templates/user-fields.hbs
@@ -10,7 +10,7 @@
         @fieldTypes={{this.fieldTypes}}
         @firstField={{this.sortedFields.firstObject}}
         @lastField={{this.sortedFields.lastObject}}
-        @destroyAction={{action "destroy"}}
+        @destroyAction={{action "destroyField"}}
         @moveUpAction={{action "moveUp"}}
         @moveDownAction={{action "moveDown"}}
       />
diff --git a/app/assets/javascripts/admin/addon/templates/user-index.hbs b/app/assets/javascripts/admin/addon/templates/user-index.hbs
index 4bd70c577f4..a02eac646bd 100644
--- a/app/assets/javascripts/admin/addon/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/addon/templates/user-index.hbs
@@ -28,7 +28,7 @@
     {{/if}}
     <PluginOutlet
       @name="admin-user-controls-after"
-      @args={{hash model=this.model}}
+      @outletArgs={{hash model=this.model}}
     />
   </div>
 
@@ -50,7 +50,10 @@
     />
   </div>
 
-  <PluginOutlet @name="admin-user-below-names" @args={{hash user=this.model}} />
+  <PluginOutlet
+    @name="admin-user-below-names"
+    @outletArgs={{hash user=this.model}}
+  />
 
   {{#if this.canCheckEmails}}
     <div class="display-row email">
@@ -259,12 +262,13 @@
   </section>
 {{/if}}
 
-<PluginOutlet
-  @name="admin-user-details"
-  @tagName="span"
-  @connectorTagName="div"
-  @args={{hash model=this.model}}
-/>
+<span>
+  <PluginOutlet
+    @name="admin-user-details"
+    @connectorTagName="div"
+    @outletArgs={{hash model=this.model}}
+  />
+</span>
 
 <section class="details">
   <h1>{{i18n "admin.user.permissions"}}</h1>
@@ -730,7 +734,7 @@
           @query={{hash
             username=this.model.username
             type="ReviewableFlaggedPost"
-            status="all"
+            status="approved"
           }}
           class="btn"
         >
@@ -857,12 +861,13 @@
   </section>
 {{/if}}
 
-<PluginOutlet
-  @name="after-user-details"
-  @tagName="span"
-  @connectorTagName="div"
-  @args={{hash model=this.model}}
-/>
+<span>
+  <PluginOutlet
+    @name="after-user-details"
+    @connectorTagName="div"
+    @outletArgs={{hash model=this.model}}
+  />
+</span>
 
 <section>
   <hr />
@@ -893,7 +898,7 @@
         @label="admin.user.delete"
         @icon="trash-alt"
         @class="btn-danger btn-user-delete"
-        @action={{action "destroy"}}
+        @action={{action "destroyUser"}}
       />
     {{/if}}
 
diff --git a/app/assets/javascripts/admin/addon/templates/users-list-show.hbs b/app/assets/javascripts/admin/addon/templates/users-list-show.hbs
index cf37be3f61c..1ca38344f64 100644
--- a/app/assets/javascripts/admin/addon/templates/users-list-show.hbs
+++ b/app/assets/javascripts/admin/addon/templates/users-list-show.hbs
@@ -1,3 +1,5 @@
+<PluginOutlet @name="admin-users-list-show-before" />
+
 <div class="admin-title">
   <h2>{{this.title}}</h2>
   {{#if this.canCheckEmails}}
@@ -24,170 +26,254 @@
     @title={{this.searchHint}}
   />
 </div>
-
 <LoadMore
   @class="users-list-container"
-  @selector=".users-list tr"
+  @selector=".directory-table .directory-table__cell"
   @action={{action "loadMore"}}
 >
   {{#if this.model}}
-    <table class="table users-list grid" role="table" aria-label={{this.title}}>
-      <thead>
-        <tr>
-          <TableHeaderToggle
-            @field="username"
-            @labelKey="username"
-            @order={{this.order}}
-            @asc={{this.asc}}
-            @automatic={{true}}
-          />
-          <TableHeaderToggle
-            @class={{if this.showEmails "" "hidden"}}
-            @field="email"
-            @labelKey="email"
-            @order={{this.order}}
-            @asc={{this.asc}}
-            @automatic={{true}}
-          />
-          <TableHeaderToggle
-            @field="last_emailed"
-            @labelKey="admin.users.last_emailed"
-            @order={{this.order}}
-            @asc={{this.asc}}
-            @automatic={{true}}
-          />
-          <TableHeaderToggle
-            @field="seen"
-            @labelKey="last_seen"
-            @order={{this.order}}
-            @asc={{this.asc}}
-            @automatic={{true}}
-          />
-          <TableHeaderToggle
-            @field="topics_viewed"
-            @labelKey="admin.user.topics_entered"
-            @order={{this.order}}
-            @asc={{this.asc}}
-            @automatic={{true}}
-          />
-          <TableHeaderToggle
-            @field="posts_read"
-            @labelKey="admin.user.posts_read_count"
-            @order={{this.order}}
-            @asc={{this.asc}}
-            @automatic={{true}}
-          />
-          <TableHeaderToggle
-            @field="read_time"
-            @labelKey="admin.user.time_read"
-            @order={{this.order}}
-            @asc={{this.asc}}
-            @automatic={{true}}
-          />
-          <TableHeaderToggle
-            @field="created"
-            @labelKey="created"
-            @order={{this.order}}
-            @asc={{this.asc}}
-            @automatic={{true}}
-          />
-          <PluginOutlet
-            @name="admin-users-list-thead-after"
-            @args={{hash order=this.order asc=this.asc}}
-          />
 
-          {{#if this.siteSettings.must_approve_users}}
-            <th>{{i18n "admin.users.approved"}}</th>
-          {{/if}}
-          <th>&nbsp;</th>
-        </tr>
-      </thead>
-      <tbody>
+    <ResponsiveTable
+      @className="users-list"
+      @aria-label={{this.title}}
+      @style={{html-safe
+        (concat
+          "grid-template-columns: minmax(min-content, 2fr) repeat("
+          (html-safe this.columnCount)
+          ", minmax(min-content, 1fr))"
+        )
+      }}
+      @updates={{this.model.email}}
+    >
+
+      <:header>
+        <TableHeaderToggle
+          @class="directory-table__column-header--username"
+          @field="username"
+          @labelKey="username"
+          @order={{this.order}}
+          @asc={{this.asc}}
+          @automatic={{true}}
+        />
+        <TableHeaderToggle
+          @class={{if
+            this.showEmails
+            "directory-table__column-header--email"
+            "hidden"
+          }}
+          @field="email"
+          @labelKey="email"
+          @order={{this.order}}
+          @asc={{this.asc}}
+          @automatic={{true}}
+        />
+        <TableHeaderToggle
+          @field="last_emailed"
+          @labelKey="admin.users.last_emailed"
+          @order={{this.order}}
+          @asc={{this.asc}}
+          @automatic={{true}}
+        />
+        <TableHeaderToggle
+          @field="seen"
+          @labelKey="last_seen"
+          @order={{this.order}}
+          @asc={{this.asc}}
+          @automatic={{true}}
+        />
+        <TableHeaderToggle
+          @field="topics_viewed"
+          @labelKey="admin.user.topics_entered"
+          @order={{this.order}}
+          @asc={{this.asc}}
+          @automatic={{true}}
+        />
+        <TableHeaderToggle
+          @field="posts_read"
+          @labelKey="admin.user.posts_read_count"
+          @order={{this.order}}
+          @asc={{this.asc}}
+          @automatic={{true}}
+        />
+        <TableHeaderToggle
+          @field="read_time"
+          @labelKey="admin.user.time_read"
+          @order={{this.order}}
+          @asc={{this.asc}}
+          @automatic={{true}}
+        />
+        <TableHeaderToggle
+          @field="created"
+          @labelKey="created"
+          @order={{this.order}}
+          @asc={{this.asc}}
+          @automatic={{true}}
+        />
+        <PluginOutlet
+          @name="admin-users-list-thead-after"
+          @outletArgs={{hash order=this.order asc=this.asc}}
+        />
+
+        {{#if this.siteSettings.must_approve_users}}
+          <div class="directory-table__column-header">{{i18n
+              "admin.users.approved"
+            }}</div>
+        {{/if}}
+        <div class="directory-table__column-header">&nbsp;</div>
+
+      </:header>
+
+      <:body>
         {{#each this.model as |user|}}
-          <tr
+          <div
             class="user
               {{user.selected}}
-              {{unless user.active 'not-activated'}}"
+              {{unless user.active 'not-activated'}}
+              directory-table__row"
           >
-            <td class="username">
-              <a href={{user.path}} data-user-card={{user.username}}>
+            <div class="directory-table__cell username">
+              <a
+                class="avatar"
+                href={{user.path}}
+                data-user-card={{user.username}}
+              >
                 {{avatar user imageSize="small"}}
               </a>
-              <LinkTo
-                @route="adminUser"
-                @model={{user}}
-              >{{user.username}}</LinkTo>
+              <LinkTo @route="adminUser" @model={{user}}>
+                {{user.username}}
+              </LinkTo>
               {{#if user.staged}}
                 {{d-icon "far-envelope" title="user.staged"}}
               {{/if}}
-            </td>
-            <td class="email {{if this.showEmails '' 'hidden'}}">
-              {{~user.email~}}
-            </td>
+            </div>
+            <div
+              class="directory-table__cell email
+                {{if this.showEmails '' 'hidden'}}"
+            >
+              <span class="directory-table__value">
+                {{~user.email~}}
+              </span>
+            </div>
 
             {{#if user.last_emailed_at}}
-              <td class="last-emailed" title={{raw-date user.last_emailed_at}}>
-                <div class="label">{{i18n "admin.users.last_emailed"}}</div>
-                <div>{{format-duration user.last_emailed_age}}</div>
-              </td>
+              <div
+                class="directory-table__cell last-emailed"
+                title={{raw-date user.last_emailed_at}}
+              >
+                <span class="directory-table__label">
+                  <span>{{i18n "admin.users.last_emailed"}}</span>
+                </span>
+                <span class="directory-table__value">
+                  {{format-duration user.last_emailed_age}}
+                </span>
+              </div>
             {{else}}
-              <td class="last-emailed">
-                <div class="label">{{i18n "admin.users.last_emailed"}}</div>
-                <div>{{format-duration user.last_emailed_age}}</div>
-              </td>
+              <div class="directory-table__cell last-emailed">
+                <span class="directory-table__label">
+                  <span>{{i18n "admin.users.last_emailed"}}</span>
+                </span>
+                <span class="directory-table__value">
+                  {{format-duration user.last_emailed_age}}
+                </span>
+              </div>
             {{/if}}
 
-            <td class="last-seen" title={{raw-date user.last_seen_at}}>
-              <div class="label">{{i18n "last_seen"}}</div>
-              <div>{{format-duration user.last_seen_age}}</div>
-            </td>
-            <td class="topics-entered">
-              <div class="label">{{i18n "admin.user.topics_entered"}}</div>
-              <div>{{number user.topics_entered}}</div>
-            </td>
-            <td class="posts-read">
-              <div class="label">{{i18n "admin.user.posts_read_count"}}</div>
-              <div>{{number user.posts_read_count}}</div>
-            </td>
-            <td class="time-read">
-              <div class="label">{{i18n "admin.user.time_read"}}</div>
-              <div>{{format-duration user.time_read}}</div>
-            </td>
-
-            <td class="created" title={{raw-date user.created_at}}>
-              <div class="label">{{i18n "created"}}</div>
-              <div>{{format-duration user.created_at_age}}</div>
-            </td>
+            <div
+              class="directory-table__cell last-seen"
+              title={{raw-date user.last_seen_at}}
+            >
+              <span class="directory-table__label">
+                <span>{{i18n "last_seen"}}</span>
+              </span>
+              <span class="directory-table__value">
+                {{format-duration user.last_seen_age}}
+              </span>
+            </div>
+            <div class="directory-table__cell topics-entered">
+              <span class="directory-table__label">
+                <span>{{i18n "admin.user.topics_entered"}}</span>
+              </span>
+              <span class="directory-table__value">
+                {{number user.topics_entered}}
+              </span>
+            </div>
+            <div class="directory-table__cell posts-read">
+              <span class="directory-table__label">
+                <span>{{i18n "admin.user.posts_read_count"}}</span>
+              </span>
+              <span class="directory-table__value">
+                {{number user.posts_read_count}}
+              </span>
+            </div>
+            <div class="directory-table__cell time-read">
+              <span class="directory-table__label">
+                <span>{{i18n "admin.user.time_read"}}</span>
+              </span>
+              <span class="directory-table__value">
+                {{format-duration user.time_read}}
+              </span>
+            </div>
+            <div
+              class="directory-table__cell created"
+              title={{raw-date user.created_at}}
+            >
+              <span class="directory-table__label">
+                <span>{{i18n "created"}}</span>
+              </span>
+              <span class="directory-table__value">
+                {{format-duration user.created_at_age}}
+              </span>
+            </div>
 
             <PluginOutlet
               @name="admin-users-list-td-after"
-              @args={{hash user=user query=this.query}}
+              @outletArgs={{hash user=user query=this.query}}
             />
 
             {{#if this.siteSettings.must_approve_users}}
-              <td>{{i18n-yes-no user.approved}}</td>
+              <div class="directory-table__cell">
+                <span class="directory-table__label">
+                  <span>{{i18n "admin.users.approved"}}</span>
+                </span>
+                <span class="directory-table__value">
+                  {{i18n-yes-no user.approved}}
+                </span>
+              </div>
             {{/if}}
 
-            <td class="user-status">
-              {{#if user.admin}}
-                {{d-icon "shield-alt" title="admin.title"}}
-              {{/if}}
-              {{#if user.moderator}}
-                {{d-icon "shield-alt" title="admin.moderator"}}
-              {{/if}}
-              {{#if user.second_factor_enabled}}
-                {{d-icon "lock" title="admin.user.second_factor_enabled"}}
-              {{/if}}
+            <div
+              class="directory-table__cell user-role{{if
+                  (or user.admin user.moderator user.second_factor_enabled)
+                  ''
+                  '--empty'
+                }}"
+            >
+              <span class="directory-table__label">
+                <span>{{i18n "admin.users.status"}}</span>
+              </span>
+              <span class="directory-table__value">
+                {{#if user.admin}}
+                  {{d-icon "shield-alt" title="admin.title"}}
+                {{/if}}
+                {{#if user.moderator}}
+                  {{d-icon "shield-alt" title="admin.moderator"}}
+                {{/if}}
+                {{#if user.second_factor_enabled}}
+                  {{d-icon "lock" title="admin.user.second_factor_enabled"}}
+                {{/if}}
+              </span>
               <PluginOutlet
                 @name="admin-users-list-icon"
                 @connectorTagName="div"
-                @args={{hash user=user query=this.query}}
+                @outletArgs={{hash user=user query=this.query}}
               />
-            </td>
-          </tr>
+            </div>
+          </div>
         {{/each}}
-      </tbody>
-    </table>
+      </:body>
+
+    </ResponsiveTable>
+
     <ConditionalLoadingSpinner @condition={{this.refreshing}} />
   {{else}}
     <p>{{i18n "search.no_results"}}</p>
diff --git a/app/assets/javascripts/admin/addon/templates/web-hooks-edit.hbs b/app/assets/javascripts/admin/addon/templates/web-hooks-edit.hbs
index d92cba2103b..5782a4083bd 100644
--- a/app/assets/javascripts/admin/addon/templates/web-hooks-edit.hbs
+++ b/app/assets/javascripts/admin/addon/templates/web-hooks-edit.hbs
@@ -115,12 +115,13 @@
       </div>
     </div>
 
-    <PluginOutlet
-      @name="web-hook-fields"
-      @tagName="span"
-      @connectorTagName="div"
-      @args={{hash model=this.model}}
-    />
+    <span>
+      <PluginOutlet
+        @name="web-hook-fields"
+        @connectorTagName="div"
+        @outletArgs={{hash model=this.model}}
+      />
+    </span>
 
     <label>
       <Input
diff --git a/app/assets/javascripts/admin/config/ember-cli-update.json b/app/assets/javascripts/admin/config/ember-cli-update.json
index c4e56160cb7..994928cd9c9 100644
--- a/app/assets/javascripts/admin/config/ember-cli-update.json
+++ b/app/assets/javascripts/admin/config/ember-cli-update.json
@@ -3,14 +3,16 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "3.28.5",
+      "version": "5.0.0",
       "blueprints": [
         {
           "name": "addon",
           "outputRepo": "https://github.com/ember-cli/ember-addon-output",
           "codemodsSource": "ember-addon-codemods-manifest@1",
           "isBaseBlueprint": true,
-          "options": ["--no-welcome"]
+          "options": [
+            "--no-welcome"
+          ]
         }
       ]
     }
diff --git a/app/assets/javascripts/admin/ember-cli-build.js b/app/assets/javascripts/admin/ember-cli-build.js
index c41e83fc78e..9ba06d12d03 100644
--- a/app/assets/javascripts/admin/ember-cli-build.js
+++ b/app/assets/javascripts/admin/ember-cli-build.js
@@ -3,7 +3,7 @@
 const EmberAddon = require("ember-cli/lib/broccoli/ember-addon");
 
 module.exports = function (defaults) {
-  let app = new EmberAddon(defaults, {
+  const app = new EmberAddon(defaults, {
     autoImport: {
       publicAssetURL: "",
     },
diff --git a/app/assets/javascripts/admin/index.js b/app/assets/javascripts/admin/index.js
index 02238e5b63c..8889660fdb5 100644
--- a/app/assets/javascripts/admin/index.js
+++ b/app/assets/javascripts/admin/index.js
@@ -1,15 +1,26 @@
 "use strict";
 
 const calculateCacheKeyForTree = require("calculate-cache-key-for-tree");
+const path = require("path");
 
 module.exports = {
   name: require("./package").name,
-  treeForAddon(tree) {
-    let app = this._findHost();
-    app.options.adminTree = this._super.treeForAddon.call(this, tree);
+
+  // return an empty tree here as we do not want the addon modules to be
+  // included into vendor.js; instead, we will produce a separate bundle
+  // (admin.js) to be included via a script tag as needed
+  treeForAddon() {
     return;
   },
 
+  // custom method to produce the tree for admin.js
+  // called by ember-cli-build.js in discourse core
+  treeForAddonBundle() {
+    let addonTreePath = path.resolve(this.root, this.treePaths.addon);
+    let addonTree = this.treeGenerator(addonTreePath);
+    return this._super.treeForAddon.call(this, addonTree);
+  },
+
   cacheKeyForTree(tree) {
     return calculateCacheKeyForTree(tree, this);
   },
diff --git a/app/assets/javascripts/admin/package.json b/app/assets/javascripts/admin/package.json
index 03e1828c421..01a467950dc 100644
--- a/app/assets/javascripts/admin/package.json
+++ b/app/assets/javascripts/admin/package.json
@@ -7,7 +7,6 @@
   "keywords": [
     "ember-addon"
   ],
-  "repository": "",
   "scripts": {
     "build": "ember build",
     "lint:hbs": "ember-template-lint .",
@@ -15,29 +14,30 @@
     "start": "ember serve"
   },
   "dependencies": {
-    "ember-auto-import": "^2.5.0",
-    "ember-cli-babel": "^7.26.10",
-    "ember-cli-htmlbars": "^6.1.1",
-    "webpack": "^5.75.0",
-    "xss": "^1.0.14"
+    "discourse-common": "1.0.0",
+    "ember-auto-import": "^2.6.3",
+    "ember-cli-babel": "^7.26.11",
+    "ember-cli-htmlbars": "^6.2.0",
+    "ember-template-imports": "^3.4.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.20.12",
+    "@babel/core": "^7.22.9",
     "@ember/optional-features": "^2.0.0",
-    "@embroider/test-setup": "^2.0.2",
+    "@ember/string": "^3.1.1",
+    "@embroider/test-setup": "^3.0.1",
     "@glimmer/component": "^1.1.2",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~3.28.5",
-    "ember-cli-dependency-checker": "^3.3.1",
+    "ember-cli": "~5.0.0",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-load-initializers": "^2.1.1",
-    "ember-resolver": "^8.0.3",
-    "ember-source": "~3.28.11",
+    "ember-resolver": "^10.1.1",
+    "ember-source": "~3.28.12",
     "ember-source-channel-url": "^3.0.0",
-    "loader.js": "^4.7.0"
+    "loader.js": "^4.7.0",
+    "webpack": "^5.88.2"
   },
   "engines": {
     "node": "16.* || >= 18",
diff --git a/app/assets/javascripts/admin/tests/dummy/app/index.html b/app/assets/javascripts/admin/tests/dummy/app/index.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/admin/tests/dummy/app/styles/.gitkeep b/app/assets/javascripts/admin/tests/dummy/app/styles/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/admin/tests/dummy/app/templates/.gitkeep b/app/assets/javascripts/admin/tests/dummy/app/templates/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/admin/tests/dummy/config/.gitkeep b/app/assets/javascripts/admin/tests/dummy/config/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/admin/tests/dummy/public/.gitkeep b/app/assets/javascripts/admin/tests/dummy/public/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/admin/tests/index.html b/app/assets/javascripts/admin/tests/index.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/bootstrap-json/index.js b/app/assets/javascripts/bootstrap-json/index.js
index 87826a54f72..fae9051fd1d 100644
--- a/app/assets/javascripts/bootstrap-json/index.js
+++ b/app/assets/javascripts/bootstrap-json/index.js
@@ -7,7 +7,7 @@ const path = require("path");
 const fs = require("fs");
 const fsPromises = fs.promises;
 const { JSDOM } = require("jsdom");
-const { shouldLoadPluginTestJs } = require("discourse-plugins");
+const { shouldLoadPlugins } = require("discourse-plugins");
 const { Buffer } = require("node:buffer");
 const { cwd, env } = require("node:process");
 
@@ -252,9 +252,9 @@ async function buildFromBootstrap(proxy, baseURL, req, response, preload) {
       url.searchParams.append("safe_mode", reqUrlSafeMode);
     }
 
-    const enableSidebar = forUrlSearchParams.get("enable_sidebar");
-    if (enableSidebar) {
-      url.searchParams.append("enable_sidebar", enableSidebar);
+    const navigationMenu = forUrlSearchParams.get("navigation_menu");
+    if (navigationMenu) {
+      url.searchParams.append("navigation_menu", navigationMenu);
     }
 
     const reqUrlPreviewThemeId = forUrlSearchParams.get("preview_theme_id");
@@ -343,9 +343,9 @@ async function handleRequest(proxy, baseURL, req, res) {
   const csp = response.headers.get("content-security-policy");
   if (csp) {
     const emberCliAdditions = [
-      `http://${originalHost}/assets/`,
-      `http://${originalHost}/ember-cli-live-reload.js`,
-      `http://${originalHost}/_lr/`,
+      `http://${originalHost}${baseURL}assets/`,
+      `http://${originalHost}${baseURL}ember-cli-live-reload.js`,
+      `http://${originalHost}${baseURL}_lr/`,
     ].join(" ");
 
     const newCSP = csp
@@ -390,7 +390,7 @@ module.exports = {
   },
 
   contentFor(type, config) {
-    if (shouldLoadPluginTestJs() && type === "test-plugin-js") {
+    if (shouldLoadPlugins() && type === "test-plugin-js") {
       const scripts = [];
 
       const pluginInfos = this.app.project
@@ -431,7 +431,7 @@ module.exports = {
             `<script src="${config.rootURL}assets/${src}" data-discourse-plugin="${name}"></script>`
         )
         .join("\n");
-    } else if (shouldLoadPluginTestJs() && type === "test-plugin-tests-js") {
+    } else if (shouldLoadPlugins() && type === "test-plugin-tests-js") {
       return this.app.project
         .findAddonByName("discourse-plugins")
         .pluginInfos()
@@ -441,7 +441,7 @@ module.exports = {
             `<script src="${config.rootURL}assets/plugins/test/${directoryName}_tests.js" data-discourse-plugin="${pluginName}"></script>`
         )
         .join("\n");
-    } else if (shouldLoadPluginTestJs() && type === "test-plugin-css") {
+    } else if (shouldLoadPlugins() && type === "test-plugin-css") {
       return `<link rel="stylesheet" href="${config.rootURL}bootstrap/plugin-css-for-tests.css" data-discourse-plugin="_all" />`;
     }
   },
@@ -463,6 +463,13 @@ to serve API requests. For example:
     baseURL = rootURL === "" ? "/" : cleanBaseURL(rootURL || baseURL);
 
     const rawMiddleware = express.raw({ type: () => true, limit: "100mb" });
+    const pathRestrictedRawMiddleware = (req, res, next) => {
+      if (this.shouldHandleRequest(req, baseURL)) {
+        return rawMiddleware(req, res, next);
+      } else {
+        return next();
+      }
+    };
 
     app.use(
       "/favicon.ico",
@@ -474,9 +481,9 @@ to serve API requests. For example:
       )
     );
 
-    app.use(rawMiddleware, async (req, res, next) => {
+    app.use(pathRestrictedRawMiddleware, async (req, res, next) => {
       try {
-        if (this.shouldForwardRequest(req, baseURL)) {
+        if (this.shouldHandleRequest(req, baseURL)) {
           await handleRequest(proxy, baseURL, req, res);
         } else {
           // Fixes issues when using e.g. "localhost" instead of loopback IP address
@@ -497,7 +504,7 @@ to serve API requests. For example:
     });
   },
 
-  shouldForwardRequest(request, baseURL) {
+  shouldHandleRequest(request, baseURL) {
     if (
       [
         `${baseURL}tests/index.html`,
@@ -509,7 +516,11 @@ to serve API requests. For example:
       return false;
     }
 
-    if (request.path.startsWith("/_lr/")) {
+    if (request.path.startsWith(`${baseURL}_lr/`)) {
+      return false;
+    }
+
+    if (request.path.startsWith(`${baseURL}message-bus/`)) {
       return false;
     }
 
diff --git a/app/assets/javascripts/bootstrap-json/package.json b/app/assets/javascripts/bootstrap-json/package.json
index f35b3b0e823..505d4317184 100644
--- a/app/assets/javascripts/bootstrap-json/package.json
+++ b/app/assets/javascripts/bootstrap-json/package.json
@@ -14,17 +14,17 @@
       "proxy-server-middleware"
     ]
   },
+  "devDependencies": {
+    "clean-base-url": "^1.0.0",
+    "discourse-plugins": "1.0.0",
+    "express": "^4.18.2",
+    "html-entities": "^2.4.0",
+    "jsdom": "^22.1.0",
+    "node-fetch": "^3.3.2"
+  },
   "engines": {
     "node": "16.* || >= 18",
     "npm": "please-use-yarn",
     "yarn": ">= 1.21.1"
-  },
-  "dependencies": {
-    "clean-base-url": "^1.0.0",
-    "discourse-plugins": "1.0.0",
-    "express": "^4.18.2",
-    "html-entities": "^2.3.3",
-    "jsdom": "^21.0.0",
-    "node-fetch": "^3.3.0"
   }
 }
diff --git a/app/assets/javascripts/confirm-new-email/confirm-new-email.js b/app/assets/javascripts/confirm-new-email/confirm-new-email.js
index 29cde23e569..053c9832767 100644
--- a/app/assets/javascripts/confirm-new-email/confirm-new-email.js
+++ b/app/assets/javascripts/confirm-new-email/confirm-new-email.js
@@ -13,10 +13,14 @@ if (security) {
         document.getElementById("security-key-credential").value =
           JSON.stringify(credentialData);
 
-        $(e.target).parents("form").submit();
+        e.target.closest("form").submit();
       },
       (errorMessage) => {
-        document.getElementById("security-key-error").innerText = errorMessage;
+        document.getElementById(
+          "security-key-error"
+        ).innerHTML = `<div class="alert alert-error"></div>`;
+        document.querySelector("#security-key-error .alert").innerText =
+          errorMessage;
       }
     );
   };
diff --git a/app/assets/javascripts/deprecation-silencer/index.js b/app/assets/javascripts/deprecation-silencer/index.js
new file mode 100644
index 00000000000..109b26ba1e1
--- /dev/null
+++ b/app/assets/javascripts/deprecation-silencer/index.js
@@ -0,0 +1,59 @@
+const SILENCED_WARN_PREFIXES = [
+  "Setting the `jquery-integration` optional feature flag",
+  "DEPRECATION: Invoking the `<LinkTo>` component with positional arguments is deprecated",
+];
+
+class DeprecationSilencer {
+  constructor() {
+    this.silenced = new WeakMap();
+  }
+
+  silence(object, method) {
+    if (this.alreadySilenced(object, method)) {
+      return;
+    }
+
+    let original = object[method];
+
+    object[method] = (message, ...args) => {
+      if (!this.shouldSilence(message)) {
+        return original.call(object, message, ...args);
+      }
+    };
+  }
+
+  alreadySilenced(object, method) {
+    let set = this.silenced.get(object);
+
+    if (!set) {
+      set = new Set();
+      this.silenced.set(object, set);
+    }
+
+    if (set.has(method)) {
+      return true;
+    } else {
+      set.add(method);
+      return false;
+    }
+  }
+
+  shouldSilence(message) {
+    return SILENCED_WARN_PREFIXES.some((prefix) => message.startsWith(prefix));
+  }
+}
+
+const DEPRECATION_SILENCER = new DeprecationSilencer();
+
+/**
+ * Export a dummy babel plugin which applies the console.warn silences in worker
+ * processes. Does not actually affect babel output.
+ */
+module.exports = function () {
+  DEPRECATION_SILENCER.silence(console, "warn");
+  return {};
+};
+
+module.exports.silence = function silence(...args) {
+  DEPRECATION_SILENCER.silence(...args);
+};
diff --git a/app/assets/javascripts/deprecation-silencer/package.json b/app/assets/javascripts/deprecation-silencer/package.json
new file mode 100644
index 00000000000..022c60c9990
--- /dev/null
+++ b/app/assets/javascripts/deprecation-silencer/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "deprecation-silencer",
+  "version": "1.0.0",
+  "private": true,
+  "description": "Silence deprecation in the build",
+  "author": "Discourse",
+  "license": "GPL-2.0-only",
+  "keywords": [],
+  "engines": {
+    "node": "16.* || >= 18",
+    "npm": "please-use-yarn",
+    "yarn": ">= 1.21.1"
+  }
+}
diff --git a/app/assets/javascripts/dialog-holder/addon/components/dialog-holder.hbs b/app/assets/javascripts/dialog-holder/addon/components/dialog-holder.hbs
index 7a1faaa0db9..52e9808bcd7 100644
--- a/app/assets/javascripts/dialog-holder/addon/components/dialog-holder.hbs
+++ b/app/assets/javascripts/dialog-holder/addon/components/dialog-holder.hbs
@@ -20,19 +20,14 @@
         </div>
       {{/if}}
 
-      {{#if (or this.dialog.message this.dialog.confirmPhrase)}}
+      {{#if (or this.dialog.message this.dialog.bodyComponent)}}
         <div class="dialog-body">
-          {{#if this.dialog.message}}
-            <p>{{this.dialog.message}}</p>
-          {{/if}}
-          {{#if this.dialog.confirmPhrase}}
-            <TextField
-              @value={{this.dialog.confirmPhraseInput}}
-              {{on "input" this.dialog.onConfirmPhraseInput}}
-              @id="confirm-phrase"
-              @autocorrect="off"
-              @autocapitalize="off"
+          {{#if this.dialog.bodyComponent}}
+            <this.dialog.bodyComponent
+              @model={{this.dialog.bodyComponentModel}}
             />
+          {{else if this.dialog.message}}
+            <p>{{this.dialog.message}}</p>
           {{/if}}
         </div>
       {{/if}}
diff --git a/app/assets/javascripts/dialog-holder/addon/services/dialog.js b/app/assets/javascripts/dialog-holder/addon/services/dialog.js
index 3fed4080757..3ccaaf2df1a 100644
--- a/app/assets/javascripts/dialog-holder/addon/services/dialog.js
+++ b/app/assets/javascripts/dialog-holder/addon/services/dialog.js
@@ -1,21 +1,22 @@
 import Service from "@ember/service";
 import A11yDialog from "a11y-dialog";
 import { bind } from "discourse-common/utils/decorators";
-import { isBlank } from "@ember/utils";
+import { next } from "@ember/runloop";
 
 export default Service.extend({
-  message: null,
-  type: null,
   dialogInstance: null,
-
+  message: null,
   title: null,
   titleElementId: null,
+  type: null,
+
+  bodyComponent: null,
+  bodyComponentModel: null,
 
   confirmButtonIcon: null,
   confirmButtonLabel: null,
   confirmButtonClass: null,
-  confirmPhrase: null,
-  confirmPhraseInput: null,
+  confirmButtonDisabled: false,
   cancelButtonLabel: null,
   cancelButtonClass: null,
   shouldDisplayCancel: null,
@@ -26,18 +27,21 @@ export default Service.extend({
   class: null,
   _confirming: false,
 
-  dialog(params) {
+  async dialog(params) {
     const {
       message,
+      bodyComponent,
+      bodyComponentModel,
       type,
       title,
 
+      confirmButtonClass = "btn-primary",
       confirmButtonIcon,
       confirmButtonLabel = "ok_value",
-      confirmButtonClass = "btn-primary",
-      cancelButtonLabel = "cancel_value",
+      confirmButtonDisabled = false,
+
       cancelButtonClass = "btn-default",
-      confirmPhrase,
+      cancelButtonLabel = "cancel_value",
       shouldDisplayCancel,
 
       didConfirm,
@@ -45,25 +49,37 @@ export default Service.extend({
       buttons,
     } = params;
 
-    let confirmButtonDisabled = !isBlank(confirmPhrase);
+    let element = document.getElementById("dialog-holder");
+    if (!element) {
+      await new Promise((resolve) => next(resolve));
+      element = document.getElementById("dialog-holder");
+    }
 
-    const element = document.getElementById("dialog-holder");
+    if (!element) {
+      const msg =
+        "dialog-holder wrapper element not found. Unable to render dialog";
+      // eslint-disable-next-line no-console
+      console.error(msg, params);
+      throw new Error(msg);
+    }
 
     this.setProperties({
       message,
+      bodyComponent,
+      bodyComponentModel,
       type,
       dialogInstance: new A11yDialog(element),
 
       title,
       titleElementId: title !== null ? "dialog-title" : null,
 
-      confirmButtonDisabled,
       confirmButtonClass,
-      confirmButtonLabel,
+      confirmButtonDisabled,
       confirmButtonIcon,
-      confirmPhrase,
-      cancelButtonLabel,
+      confirmButtonLabel,
+
       cancelButtonClass,
+      cancelButtonLabel,
       shouldDisplayCancel,
 
       didConfirm,
@@ -133,19 +149,21 @@ export default Service.extend({
   reset() {
     this.setProperties({
       message: null,
+      bodyComponent: null,
+      bodyComponentModel: null,
       type: null,
       dialogInstance: null,
 
       title: null,
       titleElementId: null,
 
-      confirmButtonLabel: null,
+      confirmButtonDisabled: false,
       confirmButtonIcon: null,
-      cancelButtonLabel: null,
+      confirmButtonLabel: null,
+
       cancelButtonClass: null,
+      cancelButtonLabel: null,
       shouldDisplayCancel: null,
-      confirmPhrase: null,
-      confirmPhraseInput: null,
 
       didConfirm: null,
       didCancel: null,
@@ -176,10 +194,7 @@ export default Service.extend({
   },
 
   @bind
-  onConfirmPhraseInput() {
-    this.set(
-      "confirmButtonDisabled",
-      this.confirmPhrase && this.confirmPhraseInput !== this.confirmPhrase
-    );
+  enableConfirmButton() {
+    this.set("confirmButtonDisabled", false);
   },
 });
diff --git a/app/assets/javascripts/dialog-holder/package.json b/app/assets/javascripts/dialog-holder/package.json
index 91add909f9e..20b84334d46 100644
--- a/app/assets/javascripts/dialog-holder/package.json
+++ b/app/assets/javascripts/dialog-holder/package.json
@@ -8,13 +8,13 @@
     "ember-addon"
   ],
   "dependencies": {
-    "a11y-dialog": "7.5.2",
-    "ember-auto-import": "^2.5.0",
-    "ember-cli-babel": "^7.26.10",
-    "ember-cli-htmlbars": "^6.1.1"
+    "a11y-dialog": "8.0.0",
+    "ember-auto-import": "^2.6.3",
+    "ember-cli-babel": "^7.26.11",
+    "ember-cli-htmlbars": "^6.2.0"
   },
   "devDependencies": {
-    "webpack": "^5.75.0"
+    "webpack": "^5.88.2"
   },
   "engines": {
     "node": "16.* || >= 18",
diff --git a/app/assets/javascripts/discourse-common/addon/helpers/bound-i18n.js b/app/assets/javascripts/discourse-common/addon/helpers/bound-i18n.js
index 2eb7a75f650..c109a7b1d33 100644
--- a/app/assets/javascripts/discourse-common/addon/helpers/bound-i18n.js
+++ b/app/assets/javascripts/discourse-common/addon/helpers/bound-i18n.js
@@ -1,4 +1,6 @@
 import I18n from "I18n";
-import { htmlHelper } from "discourse-common/lib/helpers";
+import { htmlSafe } from "@ember/template";
 
-export default htmlHelper((key, params) => I18n.t(key, params.hash));
+export default function boundI18n(key, options) {
+  return htmlSafe(I18n.t(key, options));
+}
diff --git a/app/assets/javascripts/discourse-common/addon/helpers/d-icon.js b/app/assets/javascripts/discourse-common/addon/helpers/d-icon.js
index ec759798b2d..fa7d04dc611 100644
--- a/app/assets/javascripts/discourse-common/addon/helpers/d-icon.js
+++ b/app/assets/javascripts/discourse-common/addon/helpers/d-icon.js
@@ -2,6 +2,8 @@ import { htmlSafe } from "@ember/template";
 import { registerUnbound } from "discourse-common/lib/helpers";
 import { renderIcon } from "discourse-common/lib/icon-library";
 
-registerUnbound("d-icon", function (id, params) {
-  return htmlSafe(renderIcon("string", id, params));
-});
+export default function icon(id, options = {}) {
+  return htmlSafe(renderIcon("string", id, options));
+}
+
+registerUnbound("d-icon", icon);
diff --git a/app/assets/javascripts/discourse-common/addon/lib/avatar-utils.js b/app/assets/javascripts/discourse-common/addon/lib/avatar-utils.js
new file mode 100644
index 00000000000..309f13a0c69
--- /dev/null
+++ b/app/assets/javascripts/discourse-common/addon/lib/avatar-utils.js
@@ -0,0 +1,86 @@
+import { getURLWithCDN } from "discourse-common/lib/get-url";
+import { helperContext } from "discourse-common/lib/helpers";
+import { escape } from "pretty-text/sanitizer";
+import { deepMerge } from "discourse-common/lib/object";
+
+let allowedSizes = null;
+
+export function translateSize(size) {
+  switch (size) {
+    case "tiny":
+      return 24;
+    case "small":
+      return 24;
+    case "medium":
+      return 48;
+    case "large":
+      return 48;
+    case "extra_large":
+      return 96;
+    case "huge":
+      return 144;
+  }
+  return size;
+}
+
+export function getRawSize(size) {
+  const pixelRatio = window.devicePixelRatio || 1;
+  let rawSize = 1;
+  if (pixelRatio > 1.1 && pixelRatio < 2.1) {
+    rawSize = 2;
+  } else if (pixelRatio >= 2.1) {
+    rawSize = 3;
+  }
+  return size * rawSize;
+}
+
+export function getRawAvatarSize(size) {
+  allowedSizes ??= helperContext()
+    .siteSettings["avatar_sizes"].split("|")
+    .map((s) => parseInt(s, 10))
+    .sort((a, b) => a - b);
+
+  size = getRawSize(size);
+
+  for (let i = 0; i < allowedSizes.length; i++) {
+    if (allowedSizes[i] >= size) {
+      return allowedSizes[i];
+    }
+  }
+
+  return allowedSizes[allowedSizes.length - 1];
+}
+
+export function avatarUrl(template, size, { customGetURL } = {}) {
+  if (!template) {
+    return "";
+  }
+  const rawSize = getRawAvatarSize(translateSize(size));
+  const templatedPath = template.replace(/\{size\}/g, rawSize);
+  return (customGetURL || getURLWithCDN)(templatedPath);
+}
+
+export function avatarImg(options, customGetURL) {
+  const size = translateSize(options.size);
+  let url = avatarUrl(options.avatarTemplate, size, { customGetURL });
+
+  // We won't render an invalid url
+  if (!url) {
+    return "";
+  }
+
+  const classes =
+    "avatar" + (options.extraClasses ? " " + options.extraClasses : "");
+
+  let title = "";
+  if (options.title) {
+    const escaped = escape(options.title || "");
+    title = ` title='${escaped}' aria-label='${escaped}'`;
+  }
+
+  return `<img loading='lazy' alt='' width='${size}' height='${size}' src='${url}' class='${classes}'${title}>`;
+}
+
+export function tinyAvatar(avatarTemplate, options) {
+  return avatarImg(deepMerge({ avatarTemplate, size: "tiny" }, options));
+}
diff --git a/app/assets/javascripts/discourse-common/addon/lib/deprecated.js b/app/assets/javascripts/discourse-common/addon/lib/deprecated.js
index 4752732e3c0..0dc0fea9640 100644
--- a/app/assets/javascripts/discourse-common/addon/lib/deprecated.js
+++ b/app/assets/javascripts/discourse-common/addon/lib/deprecated.js
@@ -1,5 +1,7 @@
 const handlers = [];
 const disabledDeprecations = new Set();
+const emberCliDeprecationWorkflows =
+  window.deprecationWorkflow?.config?.workflow;
 
 /**
  * Display a deprecation warning with the provided message. The warning will be prefixed with the theme/plugin name
@@ -47,7 +49,13 @@ export default function deprecated(msg, options = {}) {
     throw msg;
   }
 
-  console.warn(...[consolePrefix, msg].filter(Boolean)); //eslint-disable-line no-console
+  const matchedWorkflow = emberCliDeprecationWorkflows?.find(
+    (w) => w.matchId === id
+  );
+
+  if (matchedWorkflow?.handler !== "silence") {
+    console.warn(...[consolePrefix, msg].filter(Boolean)); //eslint-disable-line no-console
+  }
 }
 
 /**
diff --git a/app/assets/javascripts/discourse-common/addon/lib/get-owner.js b/app/assets/javascripts/discourse-common/addon/lib/get-owner.js
index 27b31f533b8..b1770fe3aea 100644
--- a/app/assets/javascripts/discourse-common/addon/lib/get-owner.js
+++ b/app/assets/javascripts/discourse-common/addon/lib/get-owner.js
@@ -42,5 +42,7 @@ export function getRegister(obj) {
     },
   };
 
+  setOwner(register, owner);
+
   return register;
 }
diff --git a/app/assets/javascripts/discourse-common/addon/lib/get-url.js b/app/assets/javascripts/discourse-common/addon/lib/get-url.js
index ec7d751846e..65157ac6b19 100644
--- a/app/assets/javascripts/discourse-common/addon/lib/get-url.js
+++ b/app/assets/javascripts/discourse-common/addon/lib/get-url.js
@@ -38,7 +38,7 @@ export function getURLWithCDN(url) {
   // only relative urls
   if (cdn && /^\/[^\/]/.test(url)) {
     url = cdn + url;
-  } else if (S3CDN) {
+  } else if (S3CDN && url.startsWith(S3BaseUrl)) {
     url = url.replace(S3BaseUrl, S3CDN);
   }
   return url;
diff --git a/app/assets/javascripts/discourse-common/addon/lib/legacy-resolver.js b/app/assets/javascripts/discourse-common/addon/lib/legacy-resolver.js
deleted file mode 100644
index 6a3ab1d6d32..00000000000
--- a/app/assets/javascripts/discourse-common/addon/lib/legacy-resolver.js
+++ /dev/null
@@ -1,343 +0,0 @@
-import Ember from "ember";
-import { classify, dasherize, decamelize } from "@ember/string";
-import deprecated from "discourse-common/lib/deprecated";
-import { findHelper } from "discourse-common/lib/helpers";
-import { get } from "@ember/object";
-import SuffixTrie from "discourse-common/lib/suffix-trie";
-
-let _options = {};
-let moduleSuffixTrie = null;
-
-export function setResolverOption(name, value) {
-  _options[name] = value;
-}
-
-export function getResolverOption(name) {
-  return _options[name];
-}
-
-export function clearResolverOptions() {
-  _options = {};
-}
-
-function parseName(fullName) {
-  const nameParts = fullName.split(":");
-  const type = nameParts[0];
-  let fullNameWithoutType = nameParts[1];
-  const namespace = get(this, "namespace");
-  const root = namespace;
-
-  return {
-    fullName,
-    type,
-    fullNameWithoutType,
-    name: fullNameWithoutType,
-    root,
-    resolveMethodName: "resolve" + classify(type),
-  };
-}
-
-function lookupModuleBySuffix(suffix) {
-  if (!moduleSuffixTrie) {
-    moduleSuffixTrie = new SuffixTrie("/");
-    Object.keys(requirejs.entries).forEach((name) => {
-      if (!name.includes("/templates/")) {
-        moduleSuffixTrie.add(name);
-      }
-    });
-  }
-  return moduleSuffixTrie.withSuffix(suffix, 1)[0];
-}
-
-export function buildResolver(baseName) {
-  return Ember.DefaultResolver.extend({
-    parseName,
-
-    resolveRouter(parsedName) {
-      const routerPath = `${baseName}/router`;
-      if (requirejs.entries[routerPath]) {
-        const module = requirejs(routerPath, null, null, true);
-        return module.default;
-      }
-      return this._super(parsedName);
-    },
-
-    normalize(fullName) {
-      if (fullName === "app-events:main") {
-        deprecated(
-          "`app-events:main` has been replaced with `service:app-events`",
-          {
-            since: "2.4.0",
-            dropFrom: "2.9.0.beta1",
-            id: "discourse.app-events-main",
-          }
-        );
-        return "service:app-events";
-      }
-
-      for (const [key, value] of Object.entries({
-        "controller:discovery.categoryWithID": "controller:discovery.category",
-        "controller:discovery.parentCategory": "controller:discovery.category",
-        "controller:tags-show": "controller:tag-show",
-        "controller:tags.show": "controller:tag.show",
-        "controller:tagsShow": "controller:tagShow",
-        "route:discovery.categoryWithID": "route:discovery.category",
-        "route:discovery.parentCategory": "route:discovery.category",
-        "route:tags-show": "route:tag-show",
-        "route:tags.show": "route:tag.show",
-        "route:tagsShow": "route:tagShow",
-      })) {
-        if (fullName === key) {
-          deprecated(`${key} was replaced with ${value}`, {
-            since: "2.6.0",
-            id: "discourse.legacy-resolver-resolutions",
-          });
-          return value;
-        }
-      }
-
-      const split = fullName.split(":");
-      if (split.length > 1) {
-        const appBase = `${baseName}/${split[0]}s/`;
-        const adminBase = "admin/" + split[0] + "s/";
-        const wizardBase = "wizard/" + split[0] + "s/";
-
-        // Allow render 'admin/templates/xyz' too
-        split[1] = split[1].replace(".templates", "").replace("/templates", "");
-
-        // Try slashes
-        let dashed = dasherize(split[1].replace(/\./g, "/"));
-        if (
-          requirejs.entries[appBase + dashed] ||
-          requirejs.entries[adminBase + dashed] ||
-          requirejs.entries[wizardBase + dashed]
-        ) {
-          return split[0] + ":" + dashed;
-        }
-
-        // Try with dashes instead of slashes
-        dashed = dasherize(split[1].replace(/\./g, "-"));
-        if (
-          requirejs.entries[appBase + dashed] ||
-          requirejs.entries[adminBase + dashed] ||
-          requirejs.entries[wizardBase + dashed]
-        ) {
-          return split[0] + ":" + dashed;
-        }
-      }
-      return this._super(fullName);
-    },
-
-    customResolve(parsedName) {
-      // If we end with the name we want, use it. This allows us to define components within plugins.
-      const suffix = parsedName.type + "s/" + parsedName.fullNameWithoutType,
-        dashed = dasherize(suffix),
-        moduleName = lookupModuleBySuffix(dashed);
-
-      let module;
-      if (moduleName) {
-        module = requirejs(moduleName, null, null, true /* force sync */);
-        if (module && module["default"]) {
-          module = module["default"];
-        }
-      }
-      return module;
-    },
-
-    resolveWidget(parsedName) {
-      return this.customResolve(parsedName) || this._super(parsedName);
-    },
-
-    resolveAdapter(parsedName) {
-      return this.customResolve(parsedName) || this._super(parsedName);
-    },
-
-    resolveModel(parsedName) {
-      return this.customResolve(parsedName) || this._super(parsedName);
-    },
-
-    resolveView(parsedName) {
-      return this.customResolve(parsedName) || this._super(parsedName);
-    },
-
-    resolveHelper(parsedName) {
-      return (
-        findHelper(parsedName.fullNameWithoutType) ||
-        this.customResolve(parsedName) ||
-        this._super(parsedName)
-      );
-    },
-
-    resolveController(parsedName) {
-      return this.customResolve(parsedName) || this._super(parsedName);
-    },
-
-    resolveComponent(parsedName) {
-      return this.customResolve(parsedName) || this._super(parsedName);
-    },
-
-    resolveService(parsedName) {
-      return this.customResolve(parsedName) || this._super(parsedName);
-    },
-
-    resolveRawView(parsedName) {
-      return this.customResolve(parsedName) || this._super(parsedName);
-    },
-
-    resolveRoute(parsedName) {
-      if (parsedName.fullNameWithoutType === "basic") {
-        return requirejs("discourse/routes/discourse", null, null, true)
-          .default;
-      }
-
-      return this.customResolve(parsedName) || this._super(parsedName);
-    },
-
-    findLoadingTemplate(parsedName) {
-      if (parsedName.fullNameWithoutType.match(/loading$/)) {
-        return Ember.TEMPLATES.loading;
-      }
-    },
-
-    findConnectorTemplate(parsedName) {
-      const full = parsedName.fullNameWithoutType.replace("components/", "");
-      if (full.startsWith("connectors")) {
-        return Ember.TEMPLATES[`javascripts/${full}`];
-      }
-    },
-
-    resolveTemplate(parsedName) {
-      return (
-        this.findPluginMobileTemplate(parsedName) ||
-        this.findPluginTemplate(parsedName) ||
-        this.findMobileTemplate(parsedName) ||
-        this.findTemplate(parsedName) ||
-        this.findLoadingTemplate(parsedName) ||
-        this.findConnectorTemplate(parsedName) ||
-        Ember.TEMPLATES.not_found
-      );
-    },
-
-    findPluginTemplate(parsedName) {
-      const pluginParsedName = this.parseName(
-        parsedName.fullName.replace("template:", "template:javascripts/")
-      );
-      return this.findTemplate(pluginParsedName);
-    },
-
-    findPluginMobileTemplate(parsedName) {
-      if (_options.mobileView) {
-        let pluginParsedName = this.parseName(
-          parsedName.fullName.replace(
-            "template:",
-            "template:javascripts/mobile/"
-          )
-        );
-        return this.findTemplate(pluginParsedName);
-      }
-    },
-
-    findMobileTemplate(parsedName) {
-      if (_options.mobileView) {
-        let mobileParsedName = this.parseName(
-          parsedName.fullName.replace("template:", "template:mobile/")
-        );
-        return this.findTemplate(mobileParsedName);
-      }
-    },
-
-    findTemplate(parsedName) {
-      const withoutType = parsedName.fullNameWithoutType,
-        slashedType = withoutType.replace(/\./g, "/"),
-        decamelized = decamelize(withoutType),
-        dashed = decamelized.replace(/\./g, "-").replace(/\_/g, "-"),
-        templates = Ember.TEMPLATES;
-
-      return (
-        this._super(parsedName) ||
-        templates[slashedType] ||
-        templates[withoutType] ||
-        templates[withoutType.replace(/\.raw$/, "")] ||
-        templates[dashed] ||
-        templates[decamelized.replace(/\./, "/")] ||
-        templates[decamelized.replace(/\_/, "/")] ||
-        templates[`${baseName}/templates/${withoutType}`] ||
-        this.findAdminTemplate(parsedName) ||
-        this.findWizardTemplate(parsedName) ||
-        this.findUnderscoredTemplate(parsedName)
-      );
-    },
-
-    findUnderscoredTemplate(parsedName) {
-      let decamelized = decamelize(parsedName.fullNameWithoutType);
-      let underscored = decamelized.replace(/\-/g, "_");
-      return Ember.TEMPLATES[underscored];
-    },
-
-    // Try to find a template within a special admin namespace, e.g. adminEmail => admin/templates/email
-    // (similar to how discourse lays out templates)
-    findAdminTemplate(parsedName) {
-      let decamelized = decamelize(parsedName.fullNameWithoutType);
-      if (decamelized.startsWith("components")) {
-        let comPath = `admin/templates/${decamelized}`;
-        const compTemplate =
-          Ember.TEMPLATES[`javascripts/${comPath}`] || Ember.TEMPLATES[comPath];
-        if (compTemplate) {
-          return compTemplate;
-        }
-      }
-
-      if (decamelized === "javascripts/admin") {
-        return Ember.TEMPLATES["admin/templates/admin"];
-      }
-
-      if (
-        decamelized.startsWith("admin") ||
-        decamelized.startsWith("javascripts/admin")
-      ) {
-        decamelized = decamelized.replace(/^admin\_/, "admin/templates/");
-        decamelized = decamelized.replace(/^admin\./, "admin/templates/");
-        decamelized = decamelized.replace(/\./g, "_");
-
-        const dashed = decamelized.replace(/_/g, "-");
-        return (
-          Ember.TEMPLATES[decamelized] ||
-          Ember.TEMPLATES[dashed] ||
-          Ember.TEMPLATES[dashed.replace("admin-", "admin/")]
-        );
-      }
-    },
-
-    findWizardTemplate(parsedName) {
-      let decamelized = decamelize(parsedName.fullNameWithoutType);
-      if (decamelized.startsWith("components")) {
-        let comPath = `wizard/templates/${decamelized}`;
-        const compTemplate =
-          Ember.TEMPLATES[`javascripts/${comPath}`] || Ember.TEMPLATES[comPath];
-        if (compTemplate) {
-          return compTemplate;
-        }
-      }
-
-      if (decamelized === "javascripts/wizard") {
-        return Ember.TEMPLATES["wizard/templates/wizard"];
-      }
-
-      if (
-        decamelized.startsWith("wizard") ||
-        decamelized.startsWith("javascripts/wizard")
-      ) {
-        decamelized = decamelized.replace(/^wizard\_/, "wizard/templates/");
-        decamelized = decamelized.replace(/^wizard\./, "wizard/templates/");
-        decamelized = decamelized.replace(/\./g, "_");
-
-        const dashed = decamelized.replace(/_/g, "-");
-        return (
-          Ember.TEMPLATES[decamelized] ||
-          Ember.TEMPLATES[dashed] ||
-          Ember.TEMPLATES[dashed.replace("wizard-", "wizard/")]
-        );
-      }
-    },
-  });
-}
diff --git a/app/assets/javascripts/discourse-common/addon/helpers/popular-themes.js b/app/assets/javascripts/discourse-common/addon/lib/popular-themes.js
similarity index 77%
rename from app/assets/javascripts/discourse-common/addon/helpers/popular-themes.js
rename to app/assets/javascripts/discourse-common/addon/lib/popular-themes.js
index dfb28f229d3..675106873b5 100644
--- a/app/assets/javascripts/discourse-common/addon/helpers/popular-themes.js
+++ b/app/assets/javascripts/discourse-common/addon/lib/popular-themes.js
@@ -2,7 +2,7 @@ export const POPULAR_THEMES = [
   {
     name: "Graceful",
     value: "https://github.com/discourse/graceful",
-    preview: "https://theme-creator.discourse.org/theme/awesomerobot/graceful",
+    preview: "https://discourse.theme-creator.io/theme/awesomerobot/graceful",
     description: "A light and graceful theme for Discourse.",
     meta_url:
       "https://meta.discourse.org/t/a-graceful-theme-for-discourse/93040",
@@ -10,8 +10,7 @@ export const POPULAR_THEMES = [
   {
     name: "Material Design Theme",
     value: "https://github.com/discourse/material-design-stock-theme",
-    preview:
-      "https://theme-creator.discourse.org/theme/tshenry/material-design",
+    preview: "https://discourse.theme-creator.io/theme/tshenry/material-design",
     description:
       "Inspired by Material Design, this theme comes with several color palettes (incl. a dark one).",
     meta_url: "https://meta.discourse.org/t/material-design-stock-theme/47142",
@@ -19,7 +18,7 @@ export const POPULAR_THEMES = [
   {
     name: "Minima",
     value: "https://github.com/discourse/minima",
-    preview: "https://theme-creator.discourse.org/theme/awesomerobot/minima",
+    preview: "https://discourse.theme-creator.io/theme/awesomerobot/minima",
     description: "A minimal theme with reduced UI elements and focus on text.",
     meta_url:
       "https://meta.discourse.org/t/minima-a-minimal-theme-for-discourse/108178",
@@ -27,7 +26,7 @@ export const POPULAR_THEMES = [
   {
     name: "Sam's Simple Theme",
     value: "https://github.com/discourse/discourse-simple-theme",
-    preview: "https://theme-creator.discourse.org/theme/sam/simple",
+    preview: "https://discourse.theme-creator.io/theme/sam/simple",
     description:
       "Simplified front page design with classic colors and typography.",
     meta_url:
@@ -36,6 +35,8 @@ export const POPULAR_THEMES = [
   {
     name: "Brand Header",
     value: "https://github.com/discourse/discourse-brand-header",
+    preview:
+      "https://discourse.theme-creator.io/theme/vinothkannans/brand-header",
     description:
       "Add an extra top header with your logo, navigation links and social icons.",
     meta_url: "https://meta.discourse.org/t/brand-header-theme-component/77977",
@@ -45,7 +46,7 @@ export const POPULAR_THEMES = [
     name: "Custom Header Links",
     value: "https://github.com/discourse/discourse-custom-header-links",
     preview:
-      "https://theme-creator.discourse.org/theme/Johani/custom-header-links",
+      "https://discourse.theme-creator.io/theme/awesomerobot/custom-header-links",
     description: "Easily add custom text-based links to the header.",
     meta_url: "https://meta.discourse.org/t/custom-header-links/90588",
     component: true,
@@ -61,7 +62,7 @@ export const POPULAR_THEMES = [
     name: "Category Banners",
     value: "https://github.com/discourse/discourse-category-banners",
     preview:
-      "https://theme-creator.discourse.org/theme/awesomerobot/discourse-category-banners",
+      "https://discourse.theme-creator.io/theme/awesomerobot/discourse-category-banners",
     description:
       "Show banners on category pages using your existing category details.",
     meta_url: "https://meta.discourse.org/t/discourse-category-banners/86241",
@@ -70,7 +71,7 @@ export const POPULAR_THEMES = [
   {
     name: "Kanban Board",
     value: "https://github.com/discourse/discourse-kanban-theme",
-    preview: "https://theme-creator.discourse.org/theme/david/kanban",
+    preview: "https://discourse.theme-creator.io/theme/david/kanban",
     description: "Display and organize topics using a Kanban board interface.",
     meta_url:
       "https://meta.discourse.org/t/kanban-board-theme-component/118164",
@@ -84,10 +85,19 @@ export const POPULAR_THEMES = [
     meta_url: "https://meta.discourse.org/t/hamburger-theme-selector/61210",
     component: true,
   },
+  {
+    name: "Sidebar Theme Toggle",
+    value: "https://github.com/discourse/discourse-sidebar-theme-toggle",
+    description:
+      "Displays a theme selector in the sidebar menu’s footer provided there is more than one user-selectable theme.",
+    meta_url: "https://meta.discourse.org/t/sidebar-theme-toggle/242802",
+    component: true,
+  },
   {
     name: "Header Submenus",
     value: "https://github.com/discourse/discourse-header-submenus",
-    preview: "https://theme-creator.discourse.org/theme/Johani/header-submenus",
+    preview:
+      "https://discourse.theme-creator.io/theme/awesomerobot/header-submenus",
     description: "Lets you build a header menu with submenus (dropdowns).",
     meta_url: "https://meta.discourse.org/t/header-submenus/94584",
     component: true,
@@ -104,7 +114,7 @@ export const POPULAR_THEMES = [
   {
     name: "Easy Responsive Footer",
     value: "https://github.com/discourse/Discourse-easy-footer",
-    preview: "https://theme-creator.discourse.org/theme/Johani/easy-footer",
+    preview: "https://discourse.theme-creator.io/theme/Johani/easy-footer",
     description: "Add a fully responsive footer without writing any HTML.",
     meta_url: "https://meta.discourse.org/t/easy-responsive-footer/95818",
     component: true,
diff --git a/app/assets/javascripts/discourse-common/addon/lib/raw-templates.js b/app/assets/javascripts/discourse-common/addon/lib/raw-templates.js
index b979d7c8fff..5a8bd75e100 100644
--- a/app/assets/javascripts/discourse-common/addon/lib/raw-templates.js
+++ b/app/assets/javascripts/discourse-common/addon/lib/raw-templates.js
@@ -1,4 +1,5 @@
 import { getResolverOption } from "discourse-common/resolver";
+import require from "require";
 
 export const __DISCOURSE_RAW_TEMPLATES = {};
 
@@ -45,11 +46,8 @@ export function buildRawConnectorCache(findOutlets) {
 }
 
 export function eagerLoadRawTemplateModules() {
-  for (const [key, value] of Object.entries(requirejs.entries)) {
-    if (
-      key.includes("/templates/") &&
-      value.deps.includes("discourse-common/lib/raw-templates")
-    ) {
+  for (const key of Object.keys(requirejs.entries)) {
+    if (key.includes("/raw-templates/")) {
       require(key);
     }
   }
diff --git a/app/assets/javascripts/discourse-common/addon/resolver.js b/app/assets/javascripts/discourse-common/addon/resolver.js
index 45c0655643c..6cf0b4627dd 100644
--- a/app/assets/javascripts/discourse-common/addon/resolver.js
+++ b/app/assets/javascripts/discourse-common/addon/resolver.js
@@ -3,7 +3,6 @@ import deprecated from "discourse-common/lib/deprecated";
 import { findHelper } from "discourse-common/lib/helpers";
 import SuffixTrie from "discourse-common/lib/suffix-trie";
 import Resolver from "ember-resolver";
-import { buildResolver as buildLegacyResolver } from "discourse-common/lib/legacy-resolver";
 import DiscourseTemplateMap from "discourse-common/lib/discourse-template-map";
 
 let _options = {};
@@ -77,6 +76,12 @@ const DEPRECATED_MODULES = new Map(
       dropFrom: "3.0.0",
       silent: true,
     },
+    "capabilities:main": {
+      newName: "service:capabilities",
+      since: "3.1.0.beta4",
+      dropFrom: "3.2.0.beta1",
+      silent: true,
+    },
     "current-user:main": {
       newName: "service:current-user",
       since: "2.9.0.beta7",
@@ -101,6 +106,12 @@ const DEPRECATED_MODULES = new Map(
       dropFrom: "3.0.0",
       silent: true,
     },
+    "controller:composer": {
+      newName: "service:composer",
+      since: "3.1.0.beta3",
+      dropFrom: "3.2.0",
+      silent: true,
+    },
   })
 );
 
@@ -140,16 +151,7 @@ function lookupModuleBySuffix(suffix) {
 }
 
 export function buildResolver(baseName) {
-  let LegacyResolver = buildLegacyResolver(baseName);
-
   return class extends Resolver {
-    LegacyResolver = LegacyResolver;
-
-    init(props) {
-      super.init(props);
-      this.legacyResolver = this.LegacyResolver.create(props);
-    }
-
     resolveRouter(/* parsedName */) {
       const routerPath = `${baseName}/router`;
       if (requirejs.entries[routerPath]) {
@@ -256,23 +258,6 @@ export function buildResolver(baseName) {
       }
     }
 
-    resolveOther(parsedName) {
-      let resolved = super.resolveOther(parsedName);
-      if (!resolved) {
-        let legacyParsedName = this.legacyResolver.parseName(
-          `${parsedName.type}:${parsedName.fullName}`
-        );
-        resolved = this.legacyResolver.resolveOther(legacyParsedName);
-        if (resolved) {
-          deprecated(
-            `Unable to resolve with new resolver, but resolved with legacy resolver: ${parsedName.fullName}`,
-            { id: "discourse.legacy-resolver-fallback" }
-          );
-        }
-      }
-      return resolved;
-    }
-
     resolveHelper(parsedName) {
       return findHelper(parsedName.fullNameWithoutType);
     }
diff --git a/app/assets/javascripts/discourse-common/addon/utils/decorators.js b/app/assets/javascripts/discourse-common/addon/utils/decorators.js
index 1320285db11..a6519aab200 100644
--- a/app/assets/javascripts/discourse-common/addon/utils/decorators.js
+++ b/app/assets/javascripts/discourse-common/addon/utils/decorators.js
@@ -1,4 +1,9 @@
 import { on as emberOn } from "@ember/object/evented";
+import {
+  observes as emberObservesDecorator,
+  on as emberOnDecorator,
+} from "@ember-decorators/object";
+
 import { observer } from "@ember/object";
 import {
   alias as EmberAlias,
@@ -37,6 +42,8 @@ import handleDescriptor from "discourse-common/utils/handle-descriptor";
 import isDescriptor from "discourse-common/utils/is-descriptor";
 import macroAlias from "discourse-common/utils/macro-alias";
 import discourseDebounce from "discourse-common/lib/debounce";
+import CoreObject from "@ember/object/core";
+import deprecated from "discourse-common/lib/deprecated";
 
 export default function discourseComputedDecorator(...params) {
   // determine if user called as @discourseComputed('blah', 'blah') or @discourseComputed
@@ -93,10 +100,9 @@ export function debounce(delay, immediate = false) {
     return {
       enumerable: descriptor.enumerable,
       configurable: descriptor.configurable,
-      writable: descriptor.writable,
-      initializer() {
+      get: function () {
         const originalFunction = descriptor.value;
-        const debounced = function (...args) {
+        const debounced = (...args) => {
           return discourseDebounce(
             this,
             originalFunction,
@@ -106,17 +112,52 @@ export function debounce(delay, immediate = false) {
           );
         };
 
+        // Memoize on instance for future access
+        Object.defineProperty(this, name, {
+          value: debounced,
+          enumerable: descriptor.enumerable,
+          configurable: descriptor.configurable,
+        });
+
         return debounced;
       },
     };
   };
 }
 
-export const on = decoratorAlias(emberOn, "Can not `on` without event names");
-export const observes = decoratorAlias(
-  observer,
-  "Can not `observe` without property names"
-);
+export function on(...onParams) {
+  return function (target) {
+    if (target instanceof CoreObject) {
+      deprecated(
+        `Using 'on' from 'discourse-common/utils/decorators' as a class property decorator is deprecated. You should import it from '@ember-decorators/object' instead.`,
+        { id: "discourse.utils-decorators-on", from: "3.1.0.beta2" }
+      );
+      return emberOnDecorator(...onParams)(...arguments);
+    } else {
+      return decoratorAlias(
+        emberOn,
+        "Can not `on` without event names"
+      )(...onParams)(...arguments);
+    }
+  };
+}
+
+export function observes(...observeParams) {
+  return function (target) {
+    if (target instanceof CoreObject) {
+      deprecated(
+        `Using 'observes' from 'discourse-common/utils/decorators' as a class property decorator is deprecated. You should import it from '@ember-decorators/object' instead.`,
+        { id: "discourse.utils-decorators-observes", from: "3.1.0.beta2" }
+      );
+      return emberObservesDecorator(...observeParams)(...arguments);
+    } else {
+      return decoratorAlias(
+        observer,
+        "Can not `observe` without property names"
+      )(...observeParams)(...arguments);
+    }
+  };
+}
 
 export const alias = macroAlias(EmberAlias);
 export const and = macroAlias(EmberAnd);
diff --git a/app/assets/javascripts/discourse-common/addon/utils/watched-words.js b/app/assets/javascripts/discourse-common/addon/utils/watched-words.js
index d864b807352..8ff622ce550 100644
--- a/app/assets/javascripts/discourse-common/addon/utils/watched-words.js
+++ b/app/assets/javascripts/discourse-common/addon/utils/watched-words.js
@@ -1,6 +1,6 @@
 export function createWatchedWordRegExp(word) {
   const caseFlag = word.case_sensitive ? "" : "i";
-  return new RegExp(word.regexp, `${caseFlag}g`);
+  return new RegExp(word.regexp, `${caseFlag}gu`);
 }
 
 export function toWatchedWord(regexp) {
diff --git a/app/assets/javascripts/discourse-common/config/ember-cli-update.json b/app/assets/javascripts/discourse-common/config/ember-cli-update.json
index c4e56160cb7..994928cd9c9 100644
--- a/app/assets/javascripts/discourse-common/config/ember-cli-update.json
+++ b/app/assets/javascripts/discourse-common/config/ember-cli-update.json
@@ -3,14 +3,16 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "3.28.5",
+      "version": "5.0.0",
       "blueprints": [
         {
           "name": "addon",
           "outputRepo": "https://github.com/ember-cli/ember-addon-output",
           "codemodsSource": "ember-addon-codemods-manifest@1",
           "isBaseBlueprint": true,
-          "options": ["--no-welcome"]
+          "options": [
+            "--no-welcome"
+          ]
         }
       ]
     }
diff --git a/app/assets/javascripts/discourse-common/config/ember-try.js b/app/assets/javascripts/discourse-common/config/ember-try.js
deleted file mode 100644
index 3a64030a8a2..00000000000
--- a/app/assets/javascripts/discourse-common/config/ember-try.js
+++ /dev/null
@@ -1,119 +0,0 @@
-"use strict";
-
-const getChannelURL = require("ember-source-channel-url");
-const { embroiderSafe, embroiderOptimized } = require("@embroider/test-setup");
-
-module.exports = async function () {
-  return {
-    useYarn: true,
-    scenarios: [
-      {
-        name: "ember-lts-3.8",
-        npm: {
-          devDependencies: {
-            "ember-source": "~3.8.0",
-          },
-        },
-      },
-      {
-        name: "ember-lts-3.12",
-        npm: {
-          devDependencies: {
-            "ember-source": "~3.12.0",
-          },
-        },
-      },
-      {
-        name: "ember-lts-3.20",
-        npm: {
-          devDependencies: {
-            "ember-source": "~3.20.5",
-          },
-        },
-      },
-      {
-        name: "ember-lts-3.24",
-        npm: {
-          devDependencies: {
-            "ember-source": "~3.24.3",
-          },
-        },
-      },
-      {
-        name: "ember-lts-3.28",
-        npm: {
-          devDependencies: {
-            "ember-source": "~3.28.0",
-          },
-        },
-      },
-      {
-        name: "ember-release",
-        npm: {
-          devDependencies: {
-            "ember-source": await getChannelURL("release"),
-          },
-        },
-      },
-      {
-        name: "ember-beta",
-        npm: {
-          devDependencies: {
-            "ember-source": await getChannelURL("beta"),
-          },
-        },
-      },
-      {
-        name: "ember-canary",
-        npm: {
-          devDependencies: {
-            "ember-source": await getChannelURL("canary"),
-          },
-        },
-      },
-      // The default `.travis.yml` runs this scenario via `yarn test`,
-      // not via `ember try`. It's still included here so that running
-      // `ember try:each` manually or from a customized CI config will run it
-      // along with all the other scenarios.
-      {
-        name: "ember-default",
-        npm: {
-          devDependencies: {},
-        },
-      },
-      {
-        name: "ember-default-with-jquery",
-        env: {
-          EMBER_OPTIONAL_FEATURES: JSON.stringify({
-            "jquery-integration": true,
-          }),
-        },
-        npm: {
-          devDependencies: {
-            "@ember/jquery": "^0.5.1",
-          },
-        },
-      },
-      {
-        name: "ember-classic",
-        env: {
-          EMBER_OPTIONAL_FEATURES: JSON.stringify({
-            "application-template-wrapper": true,
-            "default-async-observers": false,
-            "template-only-glimmer-components": false,
-          }),
-        },
-        npm: {
-          devDependencies: {
-            "ember-source": "~3.28.0",
-          },
-          ember: {
-            edition: "classic",
-          },
-        },
-      },
-      embroiderSafe(),
-      embroiderOptimized(),
-    ],
-  };
-};
diff --git a/app/assets/javascripts/discourse-common/config/environment.js b/app/assets/javascripts/discourse-common/config/environment.js
deleted file mode 100644
index b7238585e61..00000000000
--- a/app/assets/javascripts/discourse-common/config/environment.js
+++ /dev/null
@@ -1,5 +0,0 @@
-"use strict";
-
-module.exports = function (/* environment, appConfig */) {
-  return {};
-};
diff --git a/app/assets/javascripts/discourse-common/ember-cli-build.js b/app/assets/javascripts/discourse-common/ember-cli-build.js
index 60eb15c12a9..da57a67830a 100644
--- a/app/assets/javascripts/discourse-common/ember-cli-build.js
+++ b/app/assets/javascripts/discourse-common/ember-cli-build.js
@@ -3,7 +3,7 @@
 const EmberAddon = require("ember-cli/lib/broccoli/ember-addon");
 
 module.exports = function (defaults) {
-  let app = new EmberAddon(defaults, {
+  const app = new EmberAddon(defaults, {
     autoImport: {
       publicAssetURL: "",
     },
diff --git a/app/assets/javascripts/discourse-common/package.json b/app/assets/javascripts/discourse-common/package.json
index 0491353069b..83f9159c6ad 100644
--- a/app/assets/javascripts/discourse-common/package.json
+++ b/app/assets/javascripts/discourse-common/package.json
@@ -7,7 +7,6 @@
   "keywords": [
     "ember-addon"
   ],
-  "repository": "",
   "scripts": {
     "build": "ember build",
     "lint:hbs": "ember-template-lint .",
@@ -15,36 +14,36 @@
     "start": "ember serve"
   },
   "dependencies": {
-    "@uppy/aws-s3": "^3.0.4",
-    "@uppy/aws-s3-multipart": "^3.1.1",
-    "@uppy/core": "^3.0.4",
-    "@uppy/drop-target": "^2.0.1",
-    "@uppy/utils": "^5.1.1",
-    "@uppy/xhr-upload": "^3.0.4",
-    "ember-auto-import": "^2.5.0",
-    "ember-cli-babel": "^7.26.10",
-    "ember-cli-htmlbars": "^6.1.1",
-    "ember-resolver": "^8.0.3",
+    "@ember/string": "^3.1.1",
+    "@uppy/aws-s3": "3.0.6",
+    "@uppy/aws-s3-multipart": "3.1.3",
+    "@uppy/core": "3.0.4",
+    "@uppy/drop-target": "2.0.1",
+    "@uppy/utils": "5.4.0",
+    "@uppy/xhr-upload": "3.1.1",
+    "ember-auto-import": "^2.6.3",
+    "ember-cli-babel": "^7.26.11",
+    "ember-cli-htmlbars": "^6.2.0",
+    "ember-resolver": "^10.1.1",
     "handlebars": "^4.7.0",
-    "truth-helpers": "1.0.0",
-    "webpack": "^5.75.0"
+    "truth-helpers": "1.0.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.20.12",
+    "@babel/core": "^7.22.9",
     "@ember/optional-features": "^2.0.0",
-    "@embroider/test-setup": "^2.0.2",
+    "@embroider/test-setup": "^3.0.1",
     "@glimmer/component": "^1.1.2",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~3.28.5",
-    "ember-cli-dependency-checker": "^3.3.1",
+    "ember-cli": "~5.0.0",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-load-initializers": "^2.1.1",
-    "ember-source": "~3.28.11",
+    "ember-source": "~3.28.12",
     "ember-source-channel-url": "^3.0.0",
-    "loader.js": "^4.7.0"
+    "loader.js": "^4.7.0",
+    "webpack": "^5.88.2"
   },
   "engines": {
     "node": "16.* || >= 18",
diff --git a/app/assets/javascripts/discourse-common/tests/dummy/app/index.html b/app/assets/javascripts/discourse-common/tests/dummy/app/index.html
deleted file mode 100644
index 870306a6ba1..00000000000
--- a/app/assets/javascripts/discourse-common/tests/dummy/app/index.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Dummy</title>
-    <meta name="description" content="">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-
-    {{content-for "head"}}
-
-    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
-    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/dummy.css">
-
-    {{content-for "head-footer"}}
-  </head>
-  <body>
-    {{content-for "body"}}
-
-    <script src="{{rootURL}}assets/vendor.js"></script>
-    <script src="{{rootURL}}assets/dummy.js"></script>
-
-    {{content-for "body-footer"}}
-  </body>
-</html>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse-common/tests/dummy/app/styles/.gitkeep b/app/assets/javascripts/discourse-common/tests/dummy/app/styles/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/discourse-common/tests/dummy/app/templates/.gitkeep b/app/assets/javascripts/discourse-common/tests/dummy/app/templates/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/discourse-common/tests/dummy/config/.gitkeep b/app/assets/javascripts/discourse-common/tests/dummy/config/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/discourse-common/tests/dummy/public/.gitkeep b/app/assets/javascripts/discourse-common/tests/dummy/public/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/discourse-common/tests/index.html b/app/assets/javascripts/discourse-common/tests/index.html
deleted file mode 100644
index 5c291da716f..00000000000
--- a/app/assets/javascripts/discourse-common/tests/index.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Dummy Tests</title>
-    <meta name="description" content="">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-
-    {{content-for "head"}}
-    {{content-for "test-head"}}
-
-    <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
-    <link rel="stylesheet" href="{{rootURL}}assets/dummy.css">
-    <link rel="stylesheet" href="{{rootURL}}assets/test-support.css">
-
-    {{content-for "head-footer"}}
-    {{content-for "test-head-footer"}}
-  </head>
-  <body>
-    {{content-for "body"}}
-    {{content-for "test-body"}}
-
-    <div id="qunit"></div>
-    <div id="qunit-fixture">
-      <div id="ember-testing-container">
-        <div id="ember-testing"></div>
-      </div>
-    </div>
-
-    <script src="/testem.js" integrity="" data-embroider-ignore></script>
-    <script src="{{rootURL}}assets/vendor.js"></script>
-    <script src="{{rootURL}}assets/test-support.js"></script>
-    <script src="{{rootURL}}assets/dummy.js"></script>
-    <script src="{{rootURL}}assets/tests.js"></script>
-
-    {{content-for "body-footer"}}
-    {{content-for "test-body-footer"}}
-  </body>
-</html>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse-common/vendor/.gitkeep b/app/assets/javascripts/discourse-common/vendor/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/discourse-ensure-deprecation-order/index.js b/app/assets/javascripts/discourse-ensure-deprecation-order/index.js
deleted file mode 100644
index c5dd687c47c..00000000000
--- a/app/assets/javascripts/discourse-ensure-deprecation-order/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-"use strict";
-
-module.exports = {
-  name: require("./package").name,
-};
diff --git a/app/assets/javascripts/discourse-ensure-deprecation-order/package.json b/app/assets/javascripts/discourse-ensure-deprecation-order/package.json
deleted file mode 100644
index 90326e832e8..00000000000
--- a/app/assets/javascripts/discourse-ensure-deprecation-order/package.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "name": "discourse-ensure-deprecation-order",
-  "version": "1.0.0",
-  "description": "A dummy addon which ensures ember-cli-deprecation-workflow is loaded before @ember/jquery",
-  "author": "Discourse",
-  "license": "GPL-2.0-only",
-  "keywords": [
-    "ember-addon"
-  ],
-  "ember-addon": {
-    "before": "@ember/jquery",
-    "after": "ember-cli-deprecation-workflow"
-  }
-}
diff --git a/app/assets/javascripts/discourse-hbr/config/ember-cli-update.json b/app/assets/javascripts/discourse-hbr/config/ember-cli-update.json
index c4e56160cb7..994928cd9c9 100644
--- a/app/assets/javascripts/discourse-hbr/config/ember-cli-update.json
+++ b/app/assets/javascripts/discourse-hbr/config/ember-cli-update.json
@@ -3,14 +3,16 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "3.28.5",
+      "version": "5.0.0",
       "blueprints": [
         {
           "name": "addon",
           "outputRepo": "https://github.com/ember-cli/ember-addon-output",
           "codemodsSource": "ember-addon-codemods-manifest@1",
           "isBaseBlueprint": true,
-          "options": ["--no-welcome"]
+          "options": [
+            "--no-welcome"
+          ]
         }
       ]
     }
diff --git a/app/assets/javascripts/discourse-hbr/config/ember-try.js b/app/assets/javascripts/discourse-hbr/config/ember-try.js
deleted file mode 100644
index 3a64030a8a2..00000000000
--- a/app/assets/javascripts/discourse-hbr/config/ember-try.js
+++ /dev/null
@@ -1,119 +0,0 @@
-"use strict";
-
-const getChannelURL = require("ember-source-channel-url");
-const { embroiderSafe, embroiderOptimized } = require("@embroider/test-setup");
-
-module.exports = async function () {
-  return {
-    useYarn: true,
-    scenarios: [
-      {
-        name: "ember-lts-3.8",
-        npm: {
-          devDependencies: {
-            "ember-source": "~3.8.0",
-          },
-        },
-      },
-      {
-        name: "ember-lts-3.12",
-        npm: {
-          devDependencies: {
-            "ember-source": "~3.12.0",
-          },
-        },
-      },
-      {
-        name: "ember-lts-3.20",
-        npm: {
-          devDependencies: {
-            "ember-source": "~3.20.5",
-          },
-        },
-      },
-      {
-        name: "ember-lts-3.24",
-        npm: {
-          devDependencies: {
-            "ember-source": "~3.24.3",
-          },
-        },
-      },
-      {
-        name: "ember-lts-3.28",
-        npm: {
-          devDependencies: {
-            "ember-source": "~3.28.0",
-          },
-        },
-      },
-      {
-        name: "ember-release",
-        npm: {
-          devDependencies: {
-            "ember-source": await getChannelURL("release"),
-          },
-        },
-      },
-      {
-        name: "ember-beta",
-        npm: {
-          devDependencies: {
-            "ember-source": await getChannelURL("beta"),
-          },
-        },
-      },
-      {
-        name: "ember-canary",
-        npm: {
-          devDependencies: {
-            "ember-source": await getChannelURL("canary"),
-          },
-        },
-      },
-      // The default `.travis.yml` runs this scenario via `yarn test`,
-      // not via `ember try`. It's still included here so that running
-      // `ember try:each` manually or from a customized CI config will run it
-      // along with all the other scenarios.
-      {
-        name: "ember-default",
-        npm: {
-          devDependencies: {},
-        },
-      },
-      {
-        name: "ember-default-with-jquery",
-        env: {
-          EMBER_OPTIONAL_FEATURES: JSON.stringify({
-            "jquery-integration": true,
-          }),
-        },
-        npm: {
-          devDependencies: {
-            "@ember/jquery": "^0.5.1",
-          },
-        },
-      },
-      {
-        name: "ember-classic",
-        env: {
-          EMBER_OPTIONAL_FEATURES: JSON.stringify({
-            "application-template-wrapper": true,
-            "default-async-observers": false,
-            "template-only-glimmer-components": false,
-          }),
-        },
-        npm: {
-          devDependencies: {
-            "ember-source": "~3.28.0",
-          },
-          ember: {
-            edition: "classic",
-          },
-        },
-      },
-      embroiderSafe(),
-      embroiderOptimized(),
-    ],
-  };
-};
diff --git a/app/assets/javascripts/discourse-hbr/config/environment.js b/app/assets/javascripts/discourse-hbr/config/environment.js
deleted file mode 100644
index b7238585e61..00000000000
--- a/app/assets/javascripts/discourse-hbr/config/environment.js
+++ /dev/null
@@ -1,5 +0,0 @@
-"use strict";
-
-module.exports = function (/* environment, appConfig */) {
-  return {};
-};
diff --git a/app/assets/javascripts/discourse-hbr/ember-cli-build.js b/app/assets/javascripts/discourse-hbr/ember-cli-build.js
index 2171aed7fd0..d4c73d7e6ff 100644
--- a/app/assets/javascripts/discourse-hbr/ember-cli-build.js
+++ b/app/assets/javascripts/discourse-hbr/ember-cli-build.js
@@ -3,7 +3,7 @@
 const EmberAddon = require("ember-cli/lib/broccoli/ember-addon");
 
 module.exports = function (defaults) {
-  let app = new EmberAddon(defaults, {
+  const app = new EmberAddon(defaults, {
     autoImport: {
       publicAssetURL: "",
     },
diff --git a/app/assets/javascripts/discourse-hbr/package.json b/app/assets/javascripts/discourse-hbr/package.json
index 0010518e81f..912e7020dc5 100644
--- a/app/assets/javascripts/discourse-hbr/package.json
+++ b/app/assets/javascripts/discourse-hbr/package.json
@@ -7,7 +7,6 @@
   "keywords": [
     "ember-addon"
   ],
-  "repository": "",
   "scripts": {
     "build": "ember build",
     "lint:hbs": "ember-template-lint .",
@@ -15,29 +14,29 @@
     "start": "ember serve"
   },
   "dependencies": {
-    "ember-auto-import": "^2.5.0",
-    "ember-cli-babel": "^7.26.10",
-    "ember-cli-htmlbars": "^6.1.1",
-    "handlebars": "^4.7.6",
-    "webpack": "^5.75.0"
+    "ember-auto-import": "^2.6.3",
+    "ember-cli-babel": "^7.26.11",
+    "ember-cli-htmlbars": "^6.2.0",
+    "handlebars": "^4.7.6"
   },
   "devDependencies": {
-    "@babel/core": "^7.20.12",
+    "@babel/core": "^7.22.9",
     "@ember/optional-features": "^2.0.0",
-    "@embroider/test-setup": "^2.0.2",
+    "@ember/string": "^3.1.1",
+    "@embroider/test-setup": "^3.0.1",
     "@glimmer/component": "^1.1.2",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~3.28.5",
-    "ember-cli-dependency-checker": "^3.3.1",
+    "ember-cli": "~5.0.0",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-load-initializers": "^2.1.1",
-    "ember-resolver": "^8.0.3",
-    "ember-source": "~3.28.11",
+    "ember-resolver": "^10.1.1",
+    "ember-source": "~3.28.12",
     "ember-source-channel-url": "^3.0.0",
-    "loader.js": "^4.7.0"
+    "loader.js": "^4.7.0",
+    "webpack": "^5.88.2"
   },
   "engines": {
     "node": "16.* || >= 18",
diff --git a/app/assets/javascripts/discourse-hbr/raw-handlebars-compiler.js b/app/assets/javascripts/discourse-hbr/raw-handlebars-compiler.js
index 06dce159431..ec2091aeac8 100644
--- a/app/assets/javascripts/discourse-hbr/raw-handlebars-compiler.js
+++ b/app/assets/javascripts/discourse-hbr/raw-handlebars-compiler.js
@@ -141,9 +141,9 @@ TemplateCompiler.prototype.processString = function (string, relativePath) {
   if (pluginName) {
     filename = relativePath
       .replace(`discourse/plugins/${pluginName}/`, "")
-      .replace(/^(discourse\/)?templates\//, "javascripts/");
+      .replace(/^(discourse\/)?raw-templates\//, "javascripts/");
   } else {
-    filename = relativePath.replace(/^templates\//, "");
+    filename = relativePath.replace(/^raw-templates\//, "");
   }
 
   filename = filename.replace(/\.hbr$/, "");
diff --git a/app/assets/javascripts/discourse-hbr/tests/dummy/app/index.html b/app/assets/javascripts/discourse-hbr/tests/dummy/app/index.html
deleted file mode 100644
index 870306a6ba1..00000000000
--- a/app/assets/javascripts/discourse-hbr/tests/dummy/app/index.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Dummy</title>
-    <meta name="description" content="">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-
-    {{content-for "head"}}
-
-    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
-    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/dummy.css">
-
-    {{content-for "head-footer"}}
-  </head>
-  <body>
-    {{content-for "body"}}
-
-    <script src="{{rootURL}}assets/vendor.js"></script>
-    <script src="{{rootURL}}assets/dummy.js"></script>
-
-    {{content-for "body-footer"}}
-  </body>
-</html>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse-hbr/tests/dummy/app/styles/.gitkeep b/app/assets/javascripts/discourse-hbr/tests/dummy/app/styles/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/discourse-hbr/tests/dummy/app/templates/.gitkeep b/app/assets/javascripts/discourse-hbr/tests/dummy/app/templates/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/discourse-hbr/tests/dummy/config/.gitkeep b/app/assets/javascripts/discourse-hbr/tests/dummy/config/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/discourse-hbr/tests/dummy/public/.gitkeep b/app/assets/javascripts/discourse-hbr/tests/dummy/public/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/discourse-hbr/tests/index.html b/app/assets/javascripts/discourse-hbr/tests/index.html
deleted file mode 100644
index 5c291da716f..00000000000
--- a/app/assets/javascripts/discourse-hbr/tests/index.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Dummy Tests</title>
-    <meta name="description" content="">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-
-    {{content-for "head"}}
-    {{content-for "test-head"}}
-
-    <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
-    <link rel="stylesheet" href="{{rootURL}}assets/dummy.css">
-    <link rel="stylesheet" href="{{rootURL}}assets/test-support.css">
-
-    {{content-for "head-footer"}}
-    {{content-for "test-head-footer"}}
-  </head>
-  <body>
-    {{content-for "body"}}
-    {{content-for "test-body"}}
-
-    <div id="qunit"></div>
-    <div id="qunit-fixture">
-      <div id="ember-testing-container">
-        <div id="ember-testing"></div>
-      </div>
-    </div>
-
-    <script src="/testem.js" integrity="" data-embroider-ignore></script>
-    <script src="{{rootURL}}assets/vendor.js"></script>
-    <script src="{{rootURL}}assets/test-support.js"></script>
-    <script src="{{rootURL}}assets/dummy.js"></script>
-    <script src="{{rootURL}}assets/tests.js"></script>
-
-    {{content-for "body-footer"}}
-    {{content-for "test-body-footer"}}
-  </body>
-</html>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse-js-processor.js b/app/assets/javascripts/discourse-js-processor.js
index 0e038ec87fa..e642b5cacaf 100644
--- a/app/assets/javascripts/discourse-js-processor.js
+++ b/app/assets/javascripts/discourse-js-processor.js
@@ -2,7 +2,7 @@
 
 // This is executed in mini_racer to provide the JS logic for lib/discourse_js_processor.rb
 
-const makeEmberTemplateCompilerPlugin =
+const HTMLBarsInlinePrecompile =
   require("babel-plugin-ember-template-compilation").default;
 const colocatedBabelPlugin = require("colocated-babel-plugin").default;
 const precompile = require("ember-template-compiler").precompile;
@@ -38,9 +38,10 @@ function buildEmberTemplateManipulatorPlugin(themeId) {
 }
 
 function buildTemplateCompilerBabelPlugins({ themeId }) {
-  let compileFunction = precompile;
+  const compiler = { precompile };
+
   if (themeId) {
-    compileFunction = (src, opts) => {
+    compiler.precompile = (src, opts) => {
       return precompile(src, {
         ...opts,
         plugins: {
@@ -54,8 +55,11 @@ function buildTemplateCompilerBabelPlugins({ themeId }) {
     colocatedBabelPlugin,
     require("widget-hbs-compiler").WidgetHbsCompiler,
     [
-      makeEmberTemplateCompilerPlugin(() => compileFunction),
-      { enableLegacyModules: ["ember-cli-htmlbars"] },
+      HTMLBarsInlinePrecompile,
+      {
+        compiler,
+        enableLegacyModules: ["ember-cli-htmlbars"],
+      },
     ],
   ];
 }
diff --git a/app/assets/javascripts/discourse-plugins/index.js b/app/assets/javascripts/discourse-plugins/index.js
index b4b25cfcc34..237fc2fdaf6 100644
--- a/app/assets/javascripts/discourse-plugins/index.js
+++ b/app/assets/javascripts/discourse-plugins/index.js
@@ -15,9 +15,16 @@ function fixLegacyExtensions(tree) {
     getDestinationPath: function (relativePath) {
       if (relativePath.endsWith(".es6")) {
         return relativePath.slice(0, -4);
-      } else if (relativePath.endsWith(".raw.hbs")) {
-        return relativePath.replace(".raw.hbs", ".hbr");
+      } else if (relativePath.includes("/templates/")) {
+        if (relativePath.endsWith(".raw.hbs")) {
+          relativePath = relativePath.replace(".raw.hbs", ".hbr");
+        }
+
+        if (relativePath.endsWith(".hbr")) {
+          return relativePath.replace("/templates/", "/raw-templates/");
+        }
       }
+
       return relativePath;
     },
   });
@@ -83,6 +90,12 @@ function parsePluginName(pluginRbPath) {
 module.exports = {
   name: require("./package").name,
 
+  options: {
+    babel: {
+      plugins: [require.resolve("deprecation-silencer")],
+    },
+  },
+
   pluginInfos() {
     const root = path.resolve("../../../../plugins");
     const pluginDirectories = fs
@@ -135,6 +148,9 @@ module.exports = {
   },
 
   generatePluginsTree() {
+    if (!this.shouldLoadPlugins()) {
+      return mergeTrees([]);
+    }
     const appTree = this._generatePluginAppTree();
     const testTree = this._generatePluginTestTree();
     const adminTree = this._generatePluginAdminTree();
@@ -227,7 +243,16 @@ module.exports = {
     return;
   },
 
-  shouldLoadPluginTestJs() {
-    return EmberApp.env() === "development" || process.env.LOAD_PLUGINS === "1";
+  // Matches logic from GlobalSetting.load_plugins? in the ruby app
+  shouldLoadPlugins() {
+    if (process.env.LOAD_PLUGINS === "1") {
+      return true;
+    } else if (process.env.LOAD_PLUGINS === "0") {
+      return false;
+    } else if (EmberApp.env() === "test") {
+      return false;
+    } else {
+      return true;
+    }
   },
 };
diff --git a/app/assets/javascripts/discourse-plugins/package.json b/app/assets/javascripts/discourse-plugins/package.json
index 27c6ce80147..e6c583a1453 100644
--- a/app/assets/javascripts/discourse-plugins/package.json
+++ b/app/assets/javascripts/discourse-plugins/package.json
@@ -7,17 +7,18 @@
   "keywords": [
     "ember-addon"
   ],
-  "repository": "",
   "dependencies": {
+    "deprecation-silencer": "1.0.0",
     "discourse-widget-hbs": "1.0.0",
-    "ember-auto-import": "^2.5.0",
-    "ember-cli": "~3.28.5",
-    "ember-cli-babel": "^7.26.10",
-    "ember-cli-htmlbars": "^6.1.1",
-    "webpack": "^5.75.0"
+    "ember-auto-import": "^2.6.3",
+    "ember-cli-babel": "^7.26.11",
+    "ember-cli-htmlbars": "^6.2.0",
+    "ember-template-imports": "^3.4.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.20.12"
+    "@babel/core": "^7.22.9",
+    "ember-cli": "~5.0.0",
+    "webpack": "^5.88.2"
   },
   "engines": {
     "node": "16.* || >= 18",
diff --git a/app/assets/javascripts/discourse-widget-hbs/config/ember-cli-update.json b/app/assets/javascripts/discourse-widget-hbs/config/ember-cli-update.json
index c4e56160cb7..994928cd9c9 100644
--- a/app/assets/javascripts/discourse-widget-hbs/config/ember-cli-update.json
+++ b/app/assets/javascripts/discourse-widget-hbs/config/ember-cli-update.json
@@ -3,14 +3,16 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "3.28.5",
+      "version": "5.0.0",
       "blueprints": [
         {
           "name": "addon",
           "outputRepo": "https://github.com/ember-cli/ember-addon-output",
           "codemodsSource": "ember-addon-codemods-manifest@1",
           "isBaseBlueprint": true,
-          "options": ["--no-welcome"]
+          "options": [
+            "--no-welcome"
+          ]
         }
       ]
     }
diff --git a/app/assets/javascripts/discourse-widget-hbs/config/ember-try.js b/app/assets/javascripts/discourse-widget-hbs/config/ember-try.js
deleted file mode 100644
index 3a64030a8a2..00000000000
--- a/app/assets/javascripts/discourse-widget-hbs/config/ember-try.js
+++ /dev/null
@@ -1,119 +0,0 @@
-"use strict";
-
-const getChannelURL = require("ember-source-channel-url");
-const { embroiderSafe, embroiderOptimized } = require("@embroider/test-setup");
-
-module.exports = async function () {
-  return {
-    useYarn: true,
-    scenarios: [
-      {
-        name: "ember-lts-3.8",
-        npm: {
-          devDependencies: {
-            "ember-source": "~3.8.0",
-          },
-        },
-      },
-      {
-        name: "ember-lts-3.12",
-        npm: {
-          devDependencies: {
-            "ember-source": "~3.12.0",
-          },
-        },
-      },
-      {
-        name: "ember-lts-3.20",
-        npm: {
-          devDependencies: {
-            "ember-source": "~3.20.5",
-          },
-        },
-      },
-      {
-        name: "ember-lts-3.24",
-        npm: {
-          devDependencies: {
-            "ember-source": "~3.24.3",
-          },
-        },
-      },
-      {
-        name: "ember-lts-3.28",
-        npm: {
-          devDependencies: {
-            "ember-source": "~3.28.0",
-          },
-        },
-      },
-      {
-        name: "ember-release",
-        npm: {
-          devDependencies: {
-            "ember-source": await getChannelURL("release"),
-          },
-        },
-      },
-      {
-        name: "ember-beta",
-        npm: {
-          devDependencies: {
-            "ember-source": await getChannelURL("beta"),
-          },
-        },
-      },
-      {
-        name: "ember-canary",
-        npm: {
-          devDependencies: {
-            "ember-source": await getChannelURL("canary"),
-          },
-        },
-      },
-      // The default `.travis.yml` runs this scenario via `yarn test`,
-      // not via `ember try`. It's still included here so that running
-      // `ember try:each` manually or from a customized CI config will run it
-      // along with all the other scenarios.
-      {
-        name: "ember-default",
-        npm: {
-          devDependencies: {},
-        },
-      },
-      {
-        name: "ember-default-with-jquery",
-        env: {
-          EMBER_OPTIONAL_FEATURES: JSON.stringify({
-            "jquery-integration": true,
-          }),
-        },
-        npm: {
-          devDependencies: {
-            "@ember/jquery": "^0.5.1",
-          },
-        },
-      },
-      {
-        name: "ember-classic",
-        env: {
-          EMBER_OPTIONAL_FEATURES: JSON.stringify({
-            "application-template-wrapper": true,
-            "default-async-observers": false,
-            "template-only-glimmer-components": false,
-          }),
-        },
-        npm: {
-          devDependencies: {
-            "ember-source": "~3.28.0",
-          },
-          ember: {
-            edition: "classic",
-          },
-        },
-      },
-      embroiderSafe(),
-      embroiderOptimized(),
-    ],
-  };
-};
diff --git a/app/assets/javascripts/discourse-widget-hbs/config/environment.js b/app/assets/javascripts/discourse-widget-hbs/config/environment.js
deleted file mode 100644
index b7238585e61..00000000000
--- a/app/assets/javascripts/discourse-widget-hbs/config/environment.js
+++ /dev/null
@@ -1,5 +0,0 @@
-"use strict";
-
-module.exports = function (/* environment, appConfig */) {
-  return {};
-};
diff --git a/app/assets/javascripts/discourse-widget-hbs/ember-cli-build.js b/app/assets/javascripts/discourse-widget-hbs/ember-cli-build.js
index 2171aed7fd0..d4c73d7e6ff 100644
--- a/app/assets/javascripts/discourse-widget-hbs/ember-cli-build.js
+++ b/app/assets/javascripts/discourse-widget-hbs/ember-cli-build.js
@@ -3,7 +3,7 @@
 const EmberAddon = require("ember-cli/lib/broccoli/ember-addon");
 
 module.exports = function (defaults) {
-  let app = new EmberAddon(defaults, {
+  const app = new EmberAddon(defaults, {
     autoImport: {
       publicAssetURL: "",
     },
diff --git a/app/assets/javascripts/discourse-widget-hbs/index.js b/app/assets/javascripts/discourse-widget-hbs/index.js
index 21fe440d27d..d76f936f732 100644
--- a/app/assets/javascripts/discourse-widget-hbs/index.js
+++ b/app/assets/javascripts/discourse-widget-hbs/index.js
@@ -1,9 +1,6 @@
 "use strict";
 
-const WidgetHbsCompiler =
-  require("../../../../lib/javascripts/widget-hbs-compiler").WidgetHbsCompiler;
-
-const glimmer = require("@glimmer/syntax");
+const widgetHbsCompilerPath = require.resolve("./lib/widget-hbs-compiler");
 
 module.exports = {
   name: require("./package").name,
@@ -15,9 +12,12 @@ module.exports = {
     addonOptions.babel.plugins = addonOptions.babel.plugins || [];
     let babelPlugins = addonOptions.babel.plugins;
 
-    WidgetHbsCompiler.cacheKey = () => "discourse-widget-hbs";
-    WidgetHbsCompiler.glimmer = glimmer;
-    babelPlugins.push(WidgetHbsCompiler);
+    babelPlugins.push({
+      _parallelBabel: {
+        requireFile: widgetHbsCompilerPath,
+        useMethod: "WidgetHbsCompiler",
+      },
+    });
   },
 
   _getAddonOptions() {
diff --git a/lib/javascripts/widget-hbs-compiler.js b/app/assets/javascripts/discourse-widget-hbs/lib/widget-hbs-compiler.js
similarity index 99%
rename from lib/javascripts/widget-hbs-compiler.js
rename to app/assets/javascripts/discourse-widget-hbs/lib/widget-hbs-compiler.js
index 0b70f166950..9efebf16ec6 100644
--- a/lib/javascripts/widget-hbs-compiler.js
+++ b/app/assets/javascripts/discourse-widget-hbs/lib/widget-hbs-compiler.js
@@ -373,4 +373,6 @@ const WidgetHbsCompiler = function (babel) {
   };
 };
 
+WidgetHbsCompiler.cacheKey = () => "discourse-widget-hbs";
+
 exports.WidgetHbsCompiler = WidgetHbsCompiler;
diff --git a/app/assets/javascripts/discourse-widget-hbs/package.json b/app/assets/javascripts/discourse-widget-hbs/package.json
index 38a885d4448..5b6e7810318 100644
--- a/app/assets/javascripts/discourse-widget-hbs/package.json
+++ b/app/assets/javascripts/discourse-widget-hbs/package.json
@@ -7,7 +7,6 @@
   "keywords": [
     "ember-addon"
   ],
-  "repository": "",
   "scripts": {
     "build": "ember build",
     "lint:hbs": "ember-template-lint .",
@@ -15,30 +14,30 @@
     "start": "ember serve"
   },
   "dependencies": {
-    "ember-auto-import": "^2.5.0",
-    "ember-cli-babel": "^7.26.10",
-    "ember-cli-htmlbars": "^6.1.1",
-    "handlebars": "^4.7.6",
-    "webpack": "^5.75.0"
+    "ember-auto-import": "^2.6.3",
+    "ember-cli-babel": "^7.26.11",
+    "ember-cli-htmlbars": "^6.2.0",
+    "handlebars": "^4.7.6"
   },
   "devDependencies": {
-    "@babel/core": "^7.20.12",
+    "@babel/core": "^7.22.9",
     "@ember/optional-features": "^2.0.0",
-    "@embroider/test-setup": "^2.0.2",
+    "@ember/string": "^3.1.1",
+    "@embroider/test-setup": "^3.0.1",
     "@glimmer/component": "^1.1.2",
-    "@glimmer/syntax": "^0.84.2",
+    "@glimmer/syntax": "^0.84.3",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~3.28.5",
-    "ember-cli-dependency-checker": "^3.3.1",
+    "ember-cli": "~5.0.0",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-load-initializers": "^2.1.1",
-    "ember-resolver": "^8.0.3",
-    "ember-source": "~3.28.11",
+    "ember-resolver": "^10.1.1",
+    "ember-source": "~3.28.12",
     "ember-source-channel-url": "^3.0.0",
-    "loader.js": "^4.7.0"
+    "loader.js": "^4.7.0",
+    "webpack": "^5.88.2"
   },
   "engines": {
     "node": "16.* || >= 18",
diff --git a/app/assets/javascripts/discourse-widget-hbs/tests/dummy/app/index.html b/app/assets/javascripts/discourse-widget-hbs/tests/dummy/app/index.html
deleted file mode 100644
index 870306a6ba1..00000000000
--- a/app/assets/javascripts/discourse-widget-hbs/tests/dummy/app/index.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Dummy</title>
-    <meta name="description" content="">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-
-    {{content-for "head"}}
-
-    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
-    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/dummy.css">
-
-    {{content-for "head-footer"}}
-  </head>
-  <body>
-    {{content-for "body"}}
-
-    <script src="{{rootURL}}assets/vendor.js"></script>
-    <script src="{{rootURL}}assets/dummy.js"></script>
-
-    {{content-for "body-footer"}}
-  </body>
-</html>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse-widget-hbs/tests/dummy/app/styles/.gitkeep b/app/assets/javascripts/discourse-widget-hbs/tests/dummy/app/styles/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/discourse-widget-hbs/tests/dummy/app/templates/.gitkeep b/app/assets/javascripts/discourse-widget-hbs/tests/dummy/app/templates/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/discourse-widget-hbs/tests/dummy/config/.gitkeep b/app/assets/javascripts/discourse-widget-hbs/tests/dummy/config/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/discourse-widget-hbs/tests/dummy/public/.gitkeep b/app/assets/javascripts/discourse-widget-hbs/tests/dummy/public/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/discourse-widget-hbs/tests/index.html b/app/assets/javascripts/discourse-widget-hbs/tests/index.html
deleted file mode 100644
index 5c291da716f..00000000000
--- a/app/assets/javascripts/discourse-widget-hbs/tests/index.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Dummy Tests</title>
-    <meta name="description" content="">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-
-    {{content-for "head"}}
-    {{content-for "test-head"}}
-
-    <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
-    <link rel="stylesheet" href="{{rootURL}}assets/dummy.css">
-    <link rel="stylesheet" href="{{rootURL}}assets/test-support.css">
-
-    {{content-for "head-footer"}}
-    {{content-for "test-head-footer"}}
-  </head>
-  <body>
-    {{content-for "body"}}
-    {{content-for "test-body"}}
-
-    <div id="qunit"></div>
-    <div id="qunit-fixture">
-      <div id="ember-testing-container">
-        <div id="ember-testing"></div>
-      </div>
-    </div>
-
-    <script src="/testem.js" integrity="" data-embroider-ignore></script>
-    <script src="{{rootURL}}assets/vendor.js"></script>
-    <script src="{{rootURL}}assets/test-support.js"></script>
-    <script src="{{rootURL}}assets/dummy.js"></script>
-    <script src="{{rootURL}}assets/tests.js"></script>
-
-    {{content-for "body-footer"}}
-    {{content-for "test-body-footer"}}
-  </body>
-</html>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/.ember-cli b/app/assets/javascripts/discourse/.ember-cli
index ee64cfed2a8..8c1812cff8f 100644
--- a/app/assets/javascripts/discourse/.ember-cli
+++ b/app/assets/javascripts/discourse/.ember-cli
@@ -5,5 +5,11 @@
 
     Setting `disableAnalytics` to true will prevent any data from being sent.
   */
-  "disableAnalytics": false
+  "disableAnalytics": false,
+
+  /**
+    Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
+    rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
+  */
+  "isTypeScriptProject": false
 }
diff --git a/app/assets/javascripts/discourse/.watchmanconfig b/app/assets/javascripts/discourse/.watchmanconfig
new file mode 100644
index 00000000000..f9c3d8f84fb
--- /dev/null
+++ b/app/assets/javascripts/discourse/.watchmanconfig
@@ -0,0 +1,3 @@
+{
+  "ignore_dirs": ["dist"]
+}
diff --git a/app/assets/javascripts/discourse/app/adapters/list-tag.js b/app/assets/javascripts/discourse/app/adapters/list-tag.js
new file mode 100644
index 00000000000..7f89508e908
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/adapters/list-tag.js
@@ -0,0 +1,7 @@
+import RESTAdapter from "discourse/adapters/rest";
+
+export default class extends RESTAdapter {
+  pathFor(_store, _type, findArgs) {
+    return this.appendQueryParams("/tags/list", findArgs);
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/adapters/topic-list.js b/app/assets/javascripts/discourse/app/adapters/topic-list.js
index 31fbd179ddf..e5bdd606dbb 100644
--- a/app/assets/javascripts/discourse/app/adapters/topic-list.js
+++ b/app/assets/javascripts/discourse/app/adapters/topic-list.js
@@ -1,40 +1,38 @@
 import PreloadStore from "discourse/lib/preload-store";
 import RestAdapter from "discourse/adapters/rest";
 import { ajax } from "discourse/lib/ajax";
-import getURL from "discourse-common/lib/get-url";
 
-export function finderFor(filter, params) {
-  return function () {
-    let url = getURL("/") + filter + ".json";
+export default RestAdapter.extend({
+  find(store, type, { filter, params }) {
+    return PreloadStore.getAndRemove("topic_list", () => {
+      let url = `/${filter}.json`;
 
-    if (params) {
-      const urlSearchParams = new URLSearchParams();
+      if (params) {
+        const urlSearchParams = new URLSearchParams();
 
-      for (const [key, value] of Object.entries(params)) {
-        if (typeof value !== "undefined") {
-          urlSearchParams.set(key, value);
+        for (const [key, value] of Object.entries(params)) {
+          if (typeof value === "undefined") {
+            continue;
+          }
+
+          if (Array.isArray(value)) {
+            for (const arrayValue of value) {
+              urlSearchParams.append(`${key}[]`, arrayValue);
+            }
+          } else {
+            urlSearchParams.set(key, value);
+          }
+        }
+
+        const queryString = urlSearchParams.toString();
+
+        if (queryString) {
+          url += `?${queryString}`;
         }
       }
 
-      const queryString = urlSearchParams.toString();
-
-      if (queryString) {
-        url += `?${queryString}`;
-      }
-    }
-    return ajax(url);
-  };
-}
-
-export default RestAdapter.extend({
-  find(store, type, findArgs) {
-    const filter = findArgs.filter;
-    const params = findArgs.params;
-
-    return PreloadStore.getAndRemove(
-      "topic_list",
-      finderFor(filter, params)
-    ).then(function (result) {
+      return ajax(url);
+    }).then((result) => {
       result.filter = filter;
       result.params = params;
       return result;
diff --git a/app/assets/javascripts/discourse/app/app.js b/app/assets/javascripts/discourse/app/app.js
index 6b2bd6af253..9fb087e08f0 100644
--- a/app/assets/javascripts/discourse/app/app.js
+++ b/app/assets/javascripts/discourse/app/app.js
@@ -1,3 +1,6 @@
+import "./global-compat";
+
+import require from "require";
 import Application from "@ember/application";
 import { buildResolver } from "discourse-common/resolver";
 import { isTesting } from "discourse-common/config/environment";
@@ -17,40 +20,6 @@ const Discourse = Application.extend({
 
   Resolver: buildResolver("discourse"),
 
-  _prepareInitializer(moduleName) {
-    const themeId = moduleThemeId(moduleName);
-    let module = null;
-
-    try {
-      module = requirejs(moduleName, null, null, true);
-
-      if (!module) {
-        throw new Error(moduleName + " must export an initializer.");
-      }
-    } catch (error) {
-      if (!themeId || isTesting()) {
-        throw error;
-      }
-      fireThemeErrorEvent({ themeId, error });
-      return;
-    }
-
-    const init = module.default;
-    const oldInitialize = init.initialize;
-    init.initialize = (app) => {
-      try {
-        return oldInitialize.call(init, app.__container__, app);
-      } catch (error) {
-        if (!themeId || isTesting()) {
-          throw error;
-        }
-        fireThemeErrorEvent({ themeId, error });
-      }
-    };
-
-    return init;
-  },
-
   // Start up the Discourse application by running all the initializers we've defined.
   start() {
     document.querySelector("noscript")?.remove();
@@ -64,30 +33,7 @@ const Discourse = Application.extend({
       Error.stackTraceLimit = Infinity;
     }
 
-    Object.keys(requirejs._eak_seen).forEach((key) => {
-      if (/\/pre\-initializers\//.test(key)) {
-        const initializer = this._prepareInitializer(key);
-        if (initializer) {
-          this.initializer(initializer);
-        }
-      } else if (/\/(api\-)?initializers\//.test(key)) {
-        const initializer = this._prepareInitializer(key);
-        if (initializer) {
-          this.instanceInitializer(initializer);
-        }
-      }
-    });
-
-    // Plugins that are registered via `<script>` tags.
-    const withPluginApi = requirejs("discourse/lib/plugin-api").withPluginApi;
-    let initCount = 0;
-    _pluginCallbacks.forEach((cb) => {
-      this.instanceInitializer({
-        name: `_discourse_plugin_${++initCount}`,
-        after: "inject-objects",
-        initialize: () => withPluginApi(cb.version, cb.code),
-      });
-    });
+    loadInitializers(this);
   },
 
   _registerPluginCode(version, code) {
@@ -127,4 +73,136 @@ export function getAndClearUnhandledThemeErrors() {
   return copy;
 }
 
+/**
+ * Logic for loading initializers. Similar to ember-cli-load-initializers, but
+ * has some discourse-specific logic to handle loading initializers from
+ * plugins and themes.
+ */
+function loadInitializers(app) {
+  let initializers = [];
+  let instanceInitializers = [];
+
+  let discourseInitializers = [];
+  let discourseInstanceInitializers = [];
+
+  for (let moduleName of Object.keys(requirejs._eak_seen)) {
+    if (moduleName.startsWith("discourse/") && !moduleName.endsWith("-test")) {
+      // In discourse core, initializers follow standard Ember conventions
+      if (moduleName.startsWith("discourse/initializers/")) {
+        initializers.push(moduleName);
+      } else if (moduleName.startsWith("discourse/instance-initializers/")) {
+        instanceInitializers.push(moduleName);
+      } else {
+        // https://meta.discourse.org/t/updating-our-initializer-naming-patterns/241919
+        //
+        // For historical reasons, the naming conventions in plugins and themes
+        // differs from Ember:
+        //
+        // | Ember                 | Discourse          |                        |
+        // | initializers          | pre-initializers   | runs once per app load |
+        // | instance-initializers | (api-)initializers | runs once per app boot |
+        //
+        // In addition, the arguments to the initialize function is different –
+        // Ember initializers get either the `Application` or `ApplicationInstance`
+        // as the only argument, but the "discourse style" gets an extra container
+        // argument preceding that.
+
+        const themeId = moduleThemeId(moduleName);
+
+        if (
+          themeId !== undefined ||
+          moduleName.startsWith("discourse/plugins/")
+        ) {
+          if (moduleName.includes("/pre-initializers/")) {
+            discourseInitializers.push([moduleName, themeId]);
+          } else if (
+            moduleName.includes("/initializers/") ||
+            moduleName.includes("/api-initializers/")
+          ) {
+            discourseInstanceInitializers.push([moduleName, themeId]);
+          }
+        }
+      }
+    }
+  }
+
+  for (let moduleName of initializers) {
+    app.initializer(resolveInitializer(moduleName));
+  }
+
+  for (let moduleName of instanceInitializers) {
+    app.instanceInitializer(resolveInitializer(moduleName));
+  }
+
+  for (let [moduleName, themeId] of discourseInitializers) {
+    app.initializer(resolveDiscourseInitializer(moduleName, themeId));
+  }
+
+  for (let [moduleName, themeId] of discourseInstanceInitializers) {
+    app.instanceInitializer(resolveDiscourseInitializer(moduleName, themeId));
+  }
+
+  // Plugins that are registered via `<script>` tags.
+  const { withPluginApi } = require("discourse/lib/plugin-api");
+
+  for (let [i, callback] of _pluginCallbacks.entries()) {
+    app.instanceInitializer({
+      name: `_discourse_plugin_${i}`,
+      after: "inject-objects",
+      initialize: () => withPluginApi(callback.version, callback.code),
+    });
+  }
+}
+
+function resolveInitializer(moduleName) {
+  const module = require(moduleName, null, null, true);
+
+  if (!module) {
+    throw new Error(moduleName + " must export an initializer.");
+  }
+
+  const initializer = module["default"];
+
+  if (!initializer) {
+    throw new Error(moduleName + " must have a default export");
+  }
+
+  if (!initializer.name) {
+    initializer.name = moduleName.slice(moduleName.lastIndexOf("/") + 1);
+  }
+
+  return initializer;
+}
+
+function resolveDiscourseInitializer(moduleName, themeId) {
+  let initializer;
+
+  try {
+    initializer = resolveInitializer(moduleName);
+  } catch (error) {
+    if (!themeId || isTesting()) {
+      throw error;
+    } else {
+      fireThemeErrorEvent({ themeId, error });
+      return;
+    }
+  }
+
+  const oldInitialize = initializer.initialize;
+
+  initializer.initialize = (app) => {
+    try {
+      return oldInitialize.call(initializer, app.__container__, app);
+    } catch (error) {
+      if (!themeId || isTesting()) {
+        throw error;
+      } else {
+        fireThemeErrorEvent({ themeId, error });
+      }
+    }
+  };
+
+  return initializer;
+}
+
 export default Discourse;
diff --git a/app/assets/javascripts/discourse/app/templates/components/about-page-users.hbs b/app/assets/javascripts/discourse/app/components/about-page-users.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/about-page-users.hbs
rename to app/assets/javascripts/discourse/app/components/about-page-users.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/activation-controls.hbs b/app/assets/javascripts/discourse/app/components/activation-controls.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/activation-controls.hbs
rename to app/assets/javascripts/discourse/app/components/activation-controls.hbs
diff --git a/app/assets/javascripts/discourse/app/components/activation-email-form.hbs b/app/assets/javascripts/discourse/app/components/activation-email-form.hbs
new file mode 100644
index 00000000000..14bc86e2b01
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/activation-email-form.hbs
@@ -0,0 +1,6 @@
+<p>{{i18n "login.provide_new_email"}}</p>
+<Input
+  @value={{@email}}
+  {{on "input" this.newEmailChanged}}
+  class="activate-new-email"
+/>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/activation-email-form.js b/app/assets/javascripts/discourse/app/components/activation-email-form.js
index 87d5ddb040f..f4f958c898a 100644
--- a/app/assets/javascripts/discourse/app/components/activation-email-form.js
+++ b/app/assets/javascripts/discourse/app/components/activation-email-form.js
@@ -1,3 +1,9 @@
-import Component from "@ember/component";
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
 
-export default Component.extend({});
+export default class ActivationEmailForm extends Component {
+  @action
+  newEmailChanged(value) {
+    this.args.updateNewEmail?.(value);
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/ai-summary-skeleton.hbs b/app/assets/javascripts/discourse/app/components/ai-summary-skeleton.hbs
new file mode 100644
index 00000000000..410f6376e0b
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/ai-summary-skeleton.hbs
@@ -0,0 +1,26 @@
+<ul class="ai-summary__list" {{did-insert this.setupAnimation}}>
+  {{#each this.blocks as |block|}}
+    <li
+      class={{concat-class
+        "ai-summary__list-item"
+        (if block.show "show")
+        (if block.shown "is-shown")
+        (if block.blinking "blink")
+      }}
+      {{did-update (fn this.onBlinking block) block.blinking}}
+      {{did-update (fn this.onShowing block) block.show}}
+      {{will-destroy this.teardownAnimation}}
+    ></li>
+  {{/each}}
+</ul>
+
+<span>
+  <div class="ai-summary__generating-text">
+    {{i18n "summary.in_progress"}}
+  </div>
+  <span class="ai-summary__indicator-wave">
+    <span class="ai-summary__indicator-dot">.</span>
+    <span class="ai-summary__indicator-dot">.</span>
+    <span class="ai-summary__indicator-dot">.</span>
+  </span>
+</span>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/ai-summary-skeleton.js b/app/assets/javascripts/discourse/app/components/ai-summary-skeleton.js
new file mode 100644
index 00000000000..1323a7b3bf9
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/ai-summary-skeleton.js
@@ -0,0 +1,92 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import { tracked } from "@glimmer/tracking";
+import discourseLater from "discourse-common/lib/later";
+import { cancel } from "@ember/runloop";
+
+class Block {
+  @tracked show = false;
+  @tracked shown = false;
+  @tracked blinking = false;
+
+  constructor(args = {}) {
+    this.show = args.show ?? false;
+    this.shown = args.shown ?? false;
+  }
+}
+
+const BLOCKS_SIZE = 20; // changing this requires to change css accordingly
+
+export default class AiSummarySkeleton extends Component {
+  blocks = [...Array.from({ length: BLOCKS_SIZE }, () => new Block())];
+
+  #nextBlockBlinkingTimer;
+  #blockBlinkingTimer;
+  #blockShownTimer;
+
+  @action
+  setupAnimation() {
+    this.blocks.firstObject.show = true;
+    this.blocks.firstObject.shown = true;
+  }
+
+  @action
+  onBlinking(block) {
+    if (!block.blinking) {
+      return;
+    }
+
+    block.show = false;
+
+    this.#nextBlockBlinkingTimer = discourseLater(
+      this,
+      () => {
+        this.#nextBlock(block).blinking = true;
+      },
+      250
+    );
+
+    this.#blockBlinkingTimer = discourseLater(
+      this,
+      () => {
+        block.blinking = false;
+      },
+      500
+    );
+  }
+
+  @action
+  onShowing(block) {
+    if (!block.show) {
+      return;
+    }
+
+    this.#blockShownTimer = discourseLater(
+      this,
+      () => {
+        this.#nextBlock(block).show = true;
+        this.#nextBlock(block).shown = true;
+
+        if (this.blocks.lastObject === block) {
+          this.blocks.firstObject.blinking = true;
+        }
+      },
+      250
+    );
+  }
+
+  @action
+  teardownAnimation() {
+    cancel(this.#blockShownTimer);
+    cancel(this.#nextBlockBlinkingTimer);
+    cancel(this.#blockBlinkingTimer);
+  }
+
+  #nextBlock(currentBlock) {
+    if (currentBlock === this.blocks.lastObject) {
+      return this.blocks.firstObject;
+    } else {
+      return this.blocks.objectAt(this.blocks.indexOf(currentBlock) + 1);
+    }
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/templates/components/avatar-uploader.hbs b/app/assets/javascripts/discourse/app/components/avatar-uploader.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/avatar-uploader.hbs
rename to app/assets/javascripts/discourse/app/components/avatar-uploader.hbs
diff --git a/app/assets/javascripts/discourse/app/components/backup-codes.hbs b/app/assets/javascripts/discourse/app/components/backup-codes.hbs
new file mode 100644
index 00000000000..2df8855621e
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/backup-codes.hbs
@@ -0,0 +1,30 @@
+<div class="wrapper">
+  <textarea
+    id="backupCodes"
+    class="backup-codes-area"
+    rows="10"
+    readonly
+  >{{this.formattedBackupCodes}}</textarea>
+
+  <div class="controls">
+    <DButton
+      @action={{action "copyToClipboard"}}
+      @class="btn-default backup-codes-copy-btn"
+      @icon="copy"
+      @aria-label="user.second_factor_backup.copy_to_clipboard"
+      @title="user.second_factor_backup.copy_to_clipboard"
+    />
+
+    <a
+      download="{{this.siteTitleSlug}}-backup-codes.txt"
+      class="btn btn-default no-text btn-icon backup-codes-download-btn"
+      aria-label={{i18n "user.second_factor_backup.download_backup_codes"}}
+      title={{i18n "user.second_factor_backup.download_backup_codes"}}
+      rel="noopener noreferrer"
+      target="_blank"
+      href="data:application/octet-stream;charset=utf-8;base64,{{this.base64BackupCode}}"
+    >
+      {{d-icon "download"}}
+    </a>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/badge-button.hbs b/app/assets/javascripts/discourse/app/components/badge-button.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/badge-button.hbs
rename to app/assets/javascripts/discourse/app/components/badge-button.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/badge-card.hbs b/app/assets/javascripts/discourse/app/components/badge-card.hbs
similarity index 67%
rename from app/assets/javascripts/discourse/app/templates/components/badge-card.hbs
rename to app/assets/javascripts/discourse/app/components/badge-card.hbs
index 94d492ccb68..ba023121086 100644
--- a/app/assets/javascripts/discourse/app/templates/components/badge-card.hbs
+++ b/app/assets/javascripts/discourse/app/components/badge-card.hbs
@@ -1,10 +1,3 @@
-{{#if this.displayCount}}
-  <a
-    href={{this.url}}
-    title={{i18n "badges.granted" count=this.displayCount}}
-    class="grant-count"
-  >{{this.displayCount}}</a>
-{{/if}}
 {{#if this.badge.has_badge}}
   <a href={{this.url}} class="check-display status-checked">{{d-icon
       "check"
@@ -34,6 +27,10 @@
 {{/if}}
 
 <div class="badge-contents">
+  <PluginOutlet
+    @name="badge-contents-top"
+    @outletArgs={{hash badge=this.badge url=this.url}}
+  />
   <a
     href={{this.url}}
     class="badge-icon {{this.badge.badgeTypeClassName}}"
@@ -42,6 +39,24 @@
     <div class="badge-info-item">
       <h3><a href={{this.url}} class="badge-link">{{this.badge.name}}</a></h3>
       <div class="badge-summary">{{html-safe this.summary}}</div>
+
+      {{#if this.displayCount}}
+
+        <LinkTo
+          @route="badges.show"
+          @model={{this.badge}}
+          class="badge-granted"
+        >
+          {{html-safe
+            (i18n
+              "badges.awarded"
+              count=this.displayCount
+              number=(number this.displayCount)
+            )
+          }}
+        </LinkTo>
+
+      {{/if}}
     </div>
   </div>
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/badge-selector.hbs b/app/assets/javascripts/discourse/app/components/badge-selector.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/badge-selector.hbs
rename to app/assets/javascripts/discourse/app/components/badge-selector.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/badge-title.hbs b/app/assets/javascripts/discourse/app/components/badge-title.hbs
similarity index 94%
rename from app/assets/javascripts/discourse/app/templates/components/badge-title.hbs
rename to app/assets/javascripts/discourse/app/components/badge-title.hbs
index 62e7b1e8863..44238820190 100644
--- a/app/assets/javascripts/discourse/app/templates/components/badge-title.hbs
+++ b/app/assets/javascripts/discourse/app/components/badge-title.hbs
@@ -1,5 +1,5 @@
 <div class="badge-title">
-  <section class="user-content">
+  <section class="user-content" id="user-content">
     <form class="form-horizontal">
       <div class="control-group">
         <div class="controls">
diff --git a/app/assets/javascripts/discourse/app/templates/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/app/components/basic-topic-list.hbs
similarity index 88%
rename from app/assets/javascripts/discourse/app/templates/components/basic-topic-list.hbs
rename to app/assets/javascripts/discourse/app/components/basic-topic-list.hbs
index 596973ac661..478050fce40 100644
--- a/app/assets/javascripts/discourse/app/templates/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/app/components/basic-topic-list.hbs
@@ -10,8 +10,6 @@
       @canBulkSelect={{this.canBulkSelect}}
       @selected={{this.selected}}
       @tagsForUser={{this.tagsForUser}}
-      @onScroll={{this.onScroll}}
-      @scrollOnLoad={{this.scrollOnLoad}}
       @toggleBulkSelect={{this.toggleBulkSelect}}
       @updateAutoAddTopicsToBulkSelect={{this.updateAutoAddTopicsToBulkSelect}}
     />
diff --git a/app/assets/javascripts/discourse/app/templates/components/bookmark-icon.hbs b/app/assets/javascripts/discourse/app/components/bookmark-icon.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/bookmark-icon.hbs
rename to app/assets/javascripts/discourse/app/components/bookmark-icon.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/bookmark-list.hbs b/app/assets/javascripts/discourse/app/components/bookmark-list.hbs
similarity index 98%
rename from app/assets/javascripts/discourse/app/templates/components/bookmark-list.hbs
rename to app/assets/javascripts/discourse/app/components/bookmark-list.hbs
index b57c4372a2f..86a0b678c90 100644
--- a/app/assets/javascripts/discourse/app/templates/components/bookmark-list.hbs
+++ b/app/assets/javascripts/discourse/app/components/bookmark-list.hbs
@@ -89,7 +89,8 @@
                   }}
                 </a>
               {{/if}}
-              {{! template-lint-disable }}
+
+              {{! template-lint-disable no-invalid-interactive }}
               <p
                 class="post-excerpt"
                 {{on "click" this.screenExcerptForExternalLink}}
diff --git a/app/assets/javascripts/discourse/app/components/bookmark-list.js b/app/assets/javascripts/discourse/app/components/bookmark-list.js
index 15dd1f42cab..2765b5cc056 100644
--- a/app/assets/javascripts/discourse/app/components/bookmark-list.js
+++ b/app/assets/javascripts/discourse/app/components/bookmark-list.js
@@ -1,48 +1,21 @@
 import Component from "@ember/component";
+import { BookmarkFormData } from "discourse/lib/bookmark";
+import BookmarkModal from "discourse/components/modal/bookmark";
 import { action } from "@ember/object";
-import { next, schedule } from "@ember/runloop";
-import { openBookmarkModal } from "discourse/controllers/bookmark";
 import { ajax } from "discourse/lib/ajax";
 import {
   openLinkInNewTab,
   shouldOpenInNewTab,
 } from "discourse/lib/click-track";
-import Scrolling from "discourse/mixins/scrolling";
 import I18n from "I18n";
 import { Promise } from "rsvp";
 import { inject as service } from "@ember/service";
 
-export default Component.extend(Scrolling, {
+export default Component.extend({
   dialog: service(),
+  modal: service(),
   classNames: ["bookmark-list-wrapper"],
 
-  didInsertElement() {
-    this._super(...arguments);
-    this.bindScrolling();
-    this.scrollToLastPosition();
-  },
-
-  willDestroyElement() {
-    this._super(...arguments);
-    this.unbindScrolling();
-  },
-
-  scrollToLastPosition() {
-    const scrollTo = this.session.bookmarkListScrollPosition;
-    if (scrollTo >= 0) {
-      schedule("afterRender", () => {
-        if (this.element && !this.isDestroying && !this.isDestroyed) {
-          next(() => window.scrollTo(0, scrollTo));
-        }
-      });
-    }
-  },
-
-  scrolled() {
-    this._super(...arguments);
-    this.session.set("bookmarkListScrollPosition", window.scrollY);
-  },
-
   @action
   removeBookmark(bookmark) {
     return new Promise((resolve, reject) => {
@@ -84,17 +57,20 @@ export default Component.extend(Scrolling, {
 
   @action
   editBookmark(bookmark) {
-    openBookmarkModal(bookmark, {
-      onAfterSave: (savedData) => {
-        this.appEvents.trigger(
-          "bookmarks:changed",
-          savedData,
-          bookmark.attachedTo()
-        );
-        this.reload();
-      },
-      onAfterDelete: () => {
-        this.reload();
+    this.modal.show(BookmarkModal, {
+      model: {
+        bookmark: new BookmarkFormData(bookmark),
+        afterSave: (savedData) => {
+          this.appEvents.trigger(
+            "bookmarks:changed",
+            savedData,
+            bookmark.attachedTo()
+          );
+          this.reload();
+        },
+        afterDelete: () => {
+          this.reload();
+        },
       },
     });
   },
diff --git a/app/assets/javascripts/discourse/app/components/bookmark.js b/app/assets/javascripts/discourse/app/components/bookmark.js
deleted file mode 100644
index 51cce43e7ce..00000000000
--- a/app/assets/javascripts/discourse/app/components/bookmark.js
+++ /dev/null
@@ -1,412 +0,0 @@
-import { now, parseCustomDatetime, startOfDay } from "discourse/lib/time-utils";
-import { AUTO_DELETE_PREFERENCES } from "discourse/models/bookmark";
-import Component from "@ember/component";
-import I18n from "I18n";
-import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";
-import ItsATrap from "@discourse/itsatrap";
-import { Promise } from "rsvp";
-import {
-  TIME_SHORTCUT_TYPES,
-  defaultTimeShortcuts,
-} from "discourse/lib/time-shortcut";
-import { action } from "@ember/object";
-import { ajax } from "discourse/lib/ajax";
-import discourseComputed, { bind } from "discourse-common/utils/decorators";
-import { formattedReminderTime } from "discourse/lib/bookmark";
-import { and, notEmpty } from "@ember/object/computed";
-import { popupAjaxError } from "discourse/lib/ajax-error";
-import discourseLater from "discourse-common/lib/later";
-
-import { inject as service } from "@ember/service";
-
-const BOOKMARK_BINDINGS = {
-  enter: { handler: "saveAndClose" },
-  "d d": { handler: "delete" },
-};
-
-export default Component.extend({
-  dialog: service(),
-  tagName: "",
-  errorMessage: null,
-  selectedReminderType: null,
-  _closeWithoutSaving: null,
-  _savingBookmarkManually: null,
-  _saving: null,
-  _deleting: null,
-  _itsatrap: null,
-  postDetectedLocalDate: null,
-  postDetectedLocalTime: null,
-  postDetectedLocalTimezone: null,
-  prefilledDatetime: null,
-  userTimezone: null,
-  showOptions: null,
-  model: null,
-  afterSave: null,
-
-  init() {
-    this._super(...arguments);
-
-    this.setProperties({
-      errorMessage: null,
-      selectedReminderType: TIME_SHORTCUT_TYPES.NONE,
-      _closeWithoutSaving: false,
-      _savingBookmarkManually: false,
-      _saving: false,
-      _deleting: false,
-      postDetectedLocalDate: null,
-      postDetectedLocalTime: null,
-      postDetectedLocalTimezone: null,
-      prefilledDatetime: null,
-      userTimezone: this.currentUser.user_option.timezone,
-      showOptions: false,
-      _itsatrap: new ItsATrap(),
-      autoDeletePreference:
-        this.model.autoDeletePreference ||
-        AUTO_DELETE_PREFERENCES.CLEAR_REMINDER,
-    });
-
-    this.registerOnCloseHandler(this._onModalClose);
-    this._bindKeyboardShortcuts();
-
-    if (this.editingExistingBookmark) {
-      this._initializeExistingBookmarkData();
-    }
-
-    this._loadPostLocalDates();
-  },
-
-  didInsertElement() {
-    this._super(...arguments);
-
-    discourseLater(() => {
-      if (this.site.isMobileDevice) {
-        document.getElementById("bookmark-name").blur();
-      }
-    });
-
-    // we want to make sure the options panel opens so the user
-    // knows they have set these options previously.
-    if (this.model.id) {
-      this.set("showOptions", true);
-    } else {
-      document.getElementById("tap_tile_none").classList.add("active");
-    }
-  },
-
-  _initializeExistingBookmarkData() {
-    if (this.existingBookmarkHasReminder) {
-      this.set("prefilledDatetime", this.model.reminderAt);
-
-      let parsedDatetime = parseCustomDatetime(
-        this.prefilledDatetime,
-        null,
-        this.userTimezone
-      );
-
-      this.set("selectedDatetime", parsedDatetime);
-    }
-  },
-
-  _bindKeyboardShortcuts() {
-    KeyboardShortcuts.pause();
-
-    Object.keys(BOOKMARK_BINDINGS).forEach((shortcut) => {
-      this._itsatrap.bind(shortcut, () => {
-        let binding = BOOKMARK_BINDINGS[shortcut];
-        this.send(binding.handler);
-        return false;
-      });
-    });
-  },
-
-  _loadPostLocalDates() {
-    if (this.model.bookmarkableType !== "Post") {
-      return;
-    }
-
-    let postEl = document.querySelector(
-      `[data-post-id="${this.model.bookmarkableId}"]`
-    );
-    let localDateEl;
-    if (postEl) {
-      localDateEl = postEl.querySelector(".discourse-local-date");
-    }
-
-    if (localDateEl) {
-      this.setProperties({
-        postDetectedLocalDate: localDateEl.dataset.date,
-        postDetectedLocalTime: localDateEl.dataset.time,
-        postDetectedLocalTimezone: localDateEl.dataset.timezone,
-      });
-    }
-  },
-
-  _saveBookmark() {
-    let reminderAt;
-    if (this.selectedReminderType) {
-      reminderAt = this.selectedDatetime;
-    }
-
-    const reminderAtISO = reminderAt ? reminderAt.toISOString() : null;
-
-    if (this.selectedReminderType === TIME_SHORTCUT_TYPES.CUSTOM) {
-      if (!reminderAt) {
-        return Promise.reject(I18n.t("bookmarks.invalid_custom_datetime"));
-      }
-    }
-
-    const data = {
-      reminder_at: reminderAtISO,
-      name: this.model.name,
-      id: this.model.id,
-      auto_delete_preference: this.autoDeletePreference,
-    };
-
-    data.bookmarkable_id = this.model.bookmarkableId;
-    data.bookmarkable_type = this.model.bookmarkableType;
-
-    if (this.editingExistingBookmark) {
-      return ajax(`/bookmarks/${this.model.id}`, {
-        type: "PUT",
-        data,
-      }).then((response) => {
-        this._executeAfterSave(response, reminderAtISO);
-      });
-    } else {
-      return ajax("/bookmarks", { type: "POST", data }).then((response) => {
-        this._executeAfterSave(response, reminderAtISO);
-      });
-    }
-  },
-
-  _executeAfterSave(response, reminderAtISO) {
-    if (!this.afterSave) {
-      return;
-    }
-
-    const data = {
-      reminder_at: reminderAtISO,
-      auto_delete_preference: this.autoDeletePreference,
-      id: this.model.id || response.id,
-      name: this.model.name,
-    };
-
-    data.bookmarkable_id = this.model.bookmarkableId;
-    data.bookmarkable_type = this.model.bookmarkableType;
-
-    this.afterSave(data);
-  },
-
-  _deleteBookmark() {
-    return ajax("/bookmarks/" + this.model.id, {
-      type: "DELETE",
-    }).then((response) => {
-      if (this.afterDelete) {
-        this.afterDelete(response.topic_bookmarked, this.model.id);
-      }
-    });
-  },
-
-  _postLocalDate() {
-    let parsedPostLocalDate = parseCustomDatetime(
-      this.postDetectedLocalDate,
-      this.postDetectedLocalTime,
-      this.userTimezone,
-      this.postDetectedLocalTimezone
-    );
-
-    if (!this.postDetectedLocalTime) {
-      return startOfDay(parsedPostLocalDate);
-    }
-
-    return parsedPostLocalDate;
-  },
-
-  _handleSaveError(e) {
-    this._savingBookmarkManually = false;
-    if (typeof e === "string") {
-      this.dialog.alert(e);
-    } else {
-      popupAjaxError(e);
-    }
-  },
-
-  @bind
-  _onModalClose(closeOpts) {
-    // we want to close without saving if the user already saved
-    // manually or deleted the bookmark, as well as when the modal
-    // is just closed with the X button
-    this._closeWithoutSaving =
-      this._closeWithoutSaving ||
-      closeOpts.initiatedByCloseButton ||
-      closeOpts.initiatedByESC;
-
-    if (!this._closeWithoutSaving && !this._savingBookmarkManually) {
-      this._saveBookmark().catch((e) => this._handleSaveError(e));
-    }
-    if (this.onCloseWithoutSaving && this._closeWithoutSaving) {
-      this.onCloseWithoutSaving();
-    }
-  },
-
-  willDestroyElement() {
-    this._super(...arguments);
-
-    this._itsatrap?.destroy();
-    this.set("_itsatrap", null);
-    KeyboardShortcuts.unpause();
-  },
-
-  @discourseComputed("model.reminderAt")
-  showExistingReminderAt(reminderAt) {
-    return reminderAt && Date.parse(reminderAt) > new Date().getTime();
-  },
-
-  showDelete: notEmpty("model.id"),
-  userHasTimezoneSet: notEmpty("userTimezone"),
-  editingExistingBookmark: and("model", "model.id"),
-  existingBookmarkHasReminder: and("model", "model.id", "model.reminderAt"),
-
-  @discourseComputed("postDetectedLocalDate", "postDetectedLocalTime")
-  showPostLocalDate(postDetectedLocalDate, postDetectedLocalTime) {
-    if (!postDetectedLocalTime || !postDetectedLocalDate) {
-      return;
-    }
-
-    let postLocalDateTime = this._postLocalDate();
-    if (postLocalDateTime < now(this.userTimezone)) {
-      return;
-    }
-
-    return true;
-  },
-
-  @discourseComputed()
-  autoDeletePreferences: () => {
-    return Object.keys(AUTO_DELETE_PREFERENCES).map((key) => {
-      return {
-        id: AUTO_DELETE_PREFERENCES[key],
-        name: I18n.t(`bookmarks.auto_delete_preference.${key.toLowerCase()}`),
-      };
-    });
-  },
-
-  @discourseComputed("userTimezone")
-  timeOptions(userTimezone) {
-    const options = defaultTimeShortcuts(userTimezone);
-
-    if (this.showPostLocalDate) {
-      options.push({
-        icon: "globe-americas",
-        id: TIME_SHORTCUT_TYPES.POST_LOCAL_DATE,
-        label: "time_shortcut.post_local_date",
-        time: this._postLocalDate(),
-        timeFormatKey: "dates.long_no_year",
-        hidden: false,
-      });
-    }
-
-    return options;
-  },
-
-  @discourseComputed("existingBookmarkHasReminder")
-  customTimeShortcutLabels(existingBookmarkHasReminder) {
-    const labels = {};
-    if (existingBookmarkHasReminder) {
-      labels[TIME_SHORTCUT_TYPES.NONE] =
-        "bookmarks.remove_reminder_keep_bookmark";
-    }
-    return labels;
-  },
-
-  @discourseComputed("editingExistingBookmark", "existingBookmarkHasReminder")
-  hiddenTimeShortcutOptions(
-    editingExistingBookmark,
-    existingBookmarkHasReminder
-  ) {
-    if (editingExistingBookmark && !existingBookmarkHasReminder) {
-      return [TIME_SHORTCUT_TYPES.NONE];
-    }
-
-    return [];
-  },
-
-  @discourseComputed("model.reminderAt")
-  existingReminderAtFormatted(existingReminderAt) {
-    return formattedReminderTime(existingReminderAt, this.userTimezone);
-  },
-
-  @action
-  saveAndClose() {
-    if (this._saving || this._deleting) {
-      return;
-    }
-
-    this._saving = true;
-    this._savingBookmarkManually = true;
-    return this._saveBookmark()
-      .then(() => this.closeModal())
-      .catch((e) => this._handleSaveError(e))
-      .finally(() => (this._saving = false));
-  },
-
-  @action
-  toggleShowOptions() {
-    this.toggleProperty("showOptions");
-  },
-
-  @action
-  delete() {
-    if (!this.model.id) {
-      return;
-    }
-
-    this._deleting = true;
-    let deleteAction = () => {
-      this._closeWithoutSaving = true;
-      this._deleteBookmark()
-        .then(() => {
-          this._deleting = false;
-          this.closeModal();
-        })
-        .catch((e) => this._handleSaveError(e));
-    };
-
-    if (this.existingBookmarkHasReminder) {
-      this.dialog.deleteConfirm({
-        message: I18n.t("bookmarks.confirm_delete"),
-        didConfirm: () => deleteAction(),
-      });
-    } else {
-      deleteAction();
-    }
-  },
-
-  @action
-  closeWithoutSavingBookmark() {
-    this._closeWithoutSaving = true;
-    this.closeModal();
-  },
-
-  @action
-  onTimeSelected(type, time) {
-    this.setProperties({ selectedReminderType: type, selectedDatetime: time });
-
-    // if the type is custom, we need to wait for the user to click save, as
-    // they could still be adjusting the date and time
-    if (
-      ![TIME_SHORTCUT_TYPES.CUSTOM, TIME_SHORTCUT_TYPES.RELATIVE].includes(type)
-    ) {
-      return this.saveAndClose();
-    }
-  },
-
-  @action
-  selectPostLocalDate(date) {
-    this.setProperties({
-      selectedReminderType: this.reminderTypes.POST_LOCAL_DATE,
-      postLocalDate: date,
-    });
-    return this.saveAndClose();
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/components/bootstrap-mode-notice.hbs b/app/assets/javascripts/discourse/app/components/bootstrap-mode-notice.hbs
new file mode 100644
index 00000000000..3078dc4c160
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/bootstrap-mode-notice.hbs
@@ -0,0 +1,21 @@
+<DButton
+  class="btn-default bootstrap-mode"
+  @label="bootstrap_mode"
+  @action={{this.routeToAdminGuide}}
+  {{did-insert this.setupUserTip}}
+>
+  {{#if this.showUserTip}}
+    <UserTip @id="admin_guide" @content={{this.userTipContent}} />
+  {{else}}
+    <DTooltip @theme="user-tip" @arrow={{true}}>
+      <div class="user-tip__container">
+        <div class="user-tip__title">
+          {{i18n "user_tips.admin_guide.title"}}
+        </div>
+        <div class="user-tip__content">
+          {{i18n "user_tips.admin_guide.content_no_url"}}
+        </div>
+      </div>
+    </DTooltip>
+  {{/if}}
+</DButton>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/bootstrap-mode-notice.js b/app/assets/javascripts/discourse/app/components/bootstrap-mode-notice.js
new file mode 100644
index 00000000000..128aff7fab0
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/bootstrap-mode-notice.js
@@ -0,0 +1,37 @@
+import getURL from "discourse-common/lib/get-url";
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import I18n from "I18n";
+import DiscourseURL from "discourse/lib/url";
+
+export default class BootstrapModeNotice extends Component {
+  @service currentUser;
+  @service siteSettings;
+
+  @tracked showUserTip = false;
+
+  @action
+  setupUserTip() {
+    this.showUserTip = this.currentUser?.canSeeUserTip("admin_guide");
+  }
+
+  @action
+  routeToAdminGuide() {
+    this.showUserTip = false;
+    DiscourseURL.routeTo(
+      `/t/-/${this.siteSettings.admin_quick_start_topic_id}`
+    );
+  }
+
+  get adminGuideUrl() {
+    return getURL(`/t/-/${this.siteSettings.admin_quick_start_topic_id}`);
+  }
+
+  get userTipContent() {
+    return I18n.t("user_tips.admin_guide.content", {
+      admin_guide_url: this.adminGuideUrl,
+    });
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/bootstrap_mode_notice.js b/app/assets/javascripts/discourse/app/components/bootstrap_mode_notice.js
deleted file mode 100644
index 69914cfa04a..00000000000
--- a/app/assets/javascripts/discourse/app/components/bootstrap_mode_notice.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import Component from "@glimmer/component";
-import { htmlSafe } from "@ember/template";
-import I18n from "I18n";
-import { inject as service } from "@ember/service";
-import { action } from "@ember/object";
-import showModal from "discourse/lib/show-modal";
-
-export default class BootstrapModeNotice extends Component {
-  @service siteSettings;
-  @service site;
-
-  get message() {
-    let msg = null;
-    const bootstrapModeMinUsers = this.siteSettings.bootstrap_mode_min_users;
-
-    if (bootstrapModeMinUsers > 0) {
-      msg = "bootstrap_mode_enabled";
-    } else {
-      msg = "bootstrap_mode_disabled";
-    }
-
-    return htmlSafe(I18n.t(msg, { count: bootstrapModeMinUsers }));
-  }
-
-  @action
-  inviteUsers() {
-    showModal("create-invite");
-  }
-}
diff --git a/app/assets/javascripts/discourse/app/templates/components/bread-crumbs.hbs b/app/assets/javascripts/discourse/app/components/bread-crumbs.hbs
similarity index 77%
rename from app/assets/javascripts/discourse/app/templates/components/bread-crumbs.hbs
rename to app/assets/javascripts/discourse/app/components/bread-crumbs.hbs
index b9956d52f5d..d288b48d764 100644
--- a/app/assets/javascripts/discourse/app/templates/components/bread-crumbs.hbs
+++ b/app/assets/javascripts/discourse/app/components/bread-crumbs.hbs
@@ -1,3 +1,18 @@
+<PluginOutlet
+  @name="bread-crumbs-left"
+  @connectorTagName="li"
+  @outletArgs={{hash
+    tagId=this.tag.id
+    additionalTags=this.additionalTags
+    noSubcategories=this.noSubcategories
+    showTagsSection=this.showTagsSection
+    currentCategory=this.category
+    categoryBreadcrumbs=this.categoryBreadcrumbs
+    editingCategory=this.editingCategory
+    editingCategoryTab=this.editingCategoryTab
+  }}
+/>
+
 {{#each this.categoryBreadcrumbs as |breadcrumb|}}
   {{#if breadcrumb.hasOptions}}
     <li>
@@ -42,7 +57,7 @@
 <PluginOutlet
   @name="bread-crumbs-right"
   @connectorTagName="li"
-  @args={{hash
+  @outletArgs={{hash
     tagId=this.tag.id
     additionalTags=this.additionalTags
     noSubcategories=this.noSubcategories
diff --git a/app/assets/javascripts/discourse/app/components/bulk-actions/append-tags.hbs b/app/assets/javascripts/discourse/app/components/bulk-actions/append-tags.hbs
new file mode 100644
index 00000000000..581c7ded898
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/bulk-actions/append-tags.hbs
@@ -0,0 +1,9 @@
+<p>{{i18n "topics.bulk.choose_append_tags"}}</p>
+
+<p><TagChooser @tags={{this.tags}} @categoryId={{@categoryId}} /></p>
+
+<DButton
+  @action={{fn @performAndRefresh (hash type="append_tags" tags=this.tags)}}
+  @disabled={{not this.tags}}
+  @label="topics.bulk.append_tags"
+/>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/bulk-actions/append-tags.js b/app/assets/javascripts/discourse/app/components/bulk-actions/append-tags.js
new file mode 100644
index 00000000000..6b66d271026
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/bulk-actions/append-tags.js
@@ -0,0 +1,6 @@
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+
+export default class AppendTags extends Component {
+  @tracked tags = [];
+}
diff --git a/app/assets/javascripts/discourse/app/components/bulk-actions/change-category.hbs b/app/assets/javascripts/discourse/app/components/bulk-actions/change-category.hbs
new file mode 100644
index 00000000000..5c68851acf4
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/bulk-actions/change-category.hbs
@@ -0,0 +1,15 @@
+<p>{{i18n "topics.bulk.choose_new_category"}}</p>
+
+<p>
+  <CategoryChooser
+    @value={{this.categoryId}}
+    @onChange={{action (mut this.categoryId)}}
+  />
+</p>
+
+<ConditionalLoadingSpinner @condition={{@loading}}>
+  <DButton
+    @action={{this.changeCategory}}
+    @label="topics.bulk.change_category"
+  />
+</ConditionalLoadingSpinner>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/bulk-actions/change-category.js b/app/assets/javascripts/discourse/app/components/bulk-actions/change-category.js
new file mode 100644
index 00000000000..61c10614f4e
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/bulk-actions/change-category.js
@@ -0,0 +1,17 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+
+export default class ChangeCategory extends Component {
+  categoryId = 0;
+
+  @action
+  async changeCategory() {
+    await this.args.forEachPerformed(
+      {
+        type: "change_category",
+        category_id: this.categoryId,
+      },
+      (t) => t.set("category_id", this.categoryId)
+    );
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/bulk-actions/change-tags.hbs b/app/assets/javascripts/discourse/app/components/bulk-actions/change-tags.hbs
new file mode 100644
index 00000000000..4e46d9ff96a
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/bulk-actions/change-tags.hbs
@@ -0,0 +1,9 @@
+<p>{{i18n "topics.bulk.choose_new_tags"}}</p>
+
+<p><TagChooser @tags={{this.tags}} @categoryId={{@categoryId}} /></p>
+
+<DButton
+  @action={{fn @performAndRefresh (hash type="change_tags" tags=this.tags)}}
+  @disabled={{not this.tags}}
+  @label="topics.bulk.change_tags"
+/>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/bulk-actions/change-tags.js b/app/assets/javascripts/discourse/app/components/bulk-actions/change-tags.js
new file mode 100644
index 00000000000..eb80adf4565
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/bulk-actions/change-tags.js
@@ -0,0 +1,6 @@
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+
+export default class ChangeTags extends Component {
+  @tracked tags = [];
+}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/bulk-notification-level.hbs b/app/assets/javascripts/discourse/app/components/bulk-actions/notification-level.hbs
similarity index 91%
rename from app/assets/javascripts/discourse/app/templates/modal/bulk-notification-level.hbs
rename to app/assets/javascripts/discourse/app/components/bulk-actions/notification-level.hbs
index 89d8aa146f9..e9ff958df96 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/bulk-notification-level.hbs
+++ b/app/assets/javascripts/discourse/app/components/bulk-actions/notification-level.hbs
@@ -16,6 +16,6 @@
 
 <DButton
   @disabled={{this.disabled}}
-  @action={{action "changeNotificationLevel"}}
+  @action={{this.changeNotificationLevel}}
   @label="topics.bulk.change_notification_level"
 />
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/bulk-actions/notification-level.js b/app/assets/javascripts/discourse/app/components/bulk-actions/notification-level.js
new file mode 100644
index 00000000000..9a8dc0e0868
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/bulk-actions/notification-level.js
@@ -0,0 +1,28 @@
+import Component from "@glimmer/component";
+import I18n from "I18n";
+import { empty } from "@ember/object/computed";
+import { topicLevels } from "discourse/lib/notification-levels";
+import { action } from "@ember/object";
+
+// Support for changing the notification level of various topics
+export default class NotificationLevel extends Component {
+  notificationLevelId = null;
+
+  @empty("notificationLevelId") disabled;
+
+  get notificationLevels() {
+    return topicLevels.map((level) => ({
+      id: level.id.toString(),
+      name: I18n.t(`topic.notifications.${level.key}.title`),
+      description: I18n.t(`topic.notifications.${level.key}.description`),
+    }));
+  }
+
+  @action
+  changeNotificationLevel() {
+    this.args.performAndRefresh({
+      type: "change_notification_level",
+      notification_level_id: this.notificationLevelId,
+    });
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/templates/components/bulk-select-toggle.hbs b/app/assets/javascripts/discourse/app/components/bulk-select-toggle.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/bulk-select-toggle.hbs
rename to app/assets/javascripts/discourse/app/components/bulk-select-toggle.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/cancel-link.hbs b/app/assets/javascripts/discourse/app/components/cancel-link.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/cancel-link.hbs
rename to app/assets/javascripts/discourse/app/components/cancel-link.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/user-card.hbs b/app/assets/javascripts/discourse/app/components/card-container.hbs
similarity index 68%
rename from app/assets/javascripts/discourse/app/templates/user-card.hbs
rename to app/assets/javascripts/discourse/app/components/card-container.hbs
index b4ee7536a6a..9bde984d351 100644
--- a/app/assets/javascripts/discourse/app/templates/user-card.hbs
+++ b/app/assets/javascripts/discourse/app/components/card-container.hbs
@@ -4,16 +4,16 @@
 
 <UserCardContents
   @topic={{this.topic.model}}
-  @showUser={{action "showUser"}}
-  @filterPosts={{action "filterPosts"}}
+  @showUser={{this.showUser}}
+  @filterPosts={{this.filterPosts}}
   @composePrivateMessage={{route-action "composePrivateMessage"}}
   @createNewMessageViaParams={{route-action "createNewMessageViaParams"}}
   role="dialog"
-  aria-labelledby="discourse-user-card-title"
 />
+
 <GroupCardContents
   @topic={{this.topic.model}}
-  @showUser={{action "showUser"}}
-  @showGroup={{action "showGroup"}}
+  @showUser={{this.showUser}}
+  @showGroup={{this.showGroup}}
   @createNewMessageViaParams={{route-action "createNewMessageViaParams"}}
 />
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/card-container.js b/app/assets/javascripts/discourse/app/components/card-container.js
new file mode 100644
index 00000000000..b61d8334a43
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/card-container.js
@@ -0,0 +1,26 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+import { inject as controller } from "@ember/controller";
+import { action } from "@ember/object";
+import DiscourseURL, { groupPath, userPath } from "discourse/lib/url";
+
+export default class CardWrapper extends Component {
+  @service site;
+  @controller topic;
+
+  @action
+  filterPosts(user) {
+    const topicController = this.topic;
+    topicController.send("filterParticipant", user);
+  }
+
+  @action
+  showUser(user) {
+    DiscourseURL.routeTo(userPath(user.username_lower));
+  }
+
+  @action
+  showGroup(group) {
+    DiscourseURL.routeTo(groupPath(group.name));
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-and-latest-topics.hbs b/app/assets/javascripts/discourse/app/components/categories-and-latest-topics.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/categories-and-latest-topics.hbs
rename to app/assets/javascripts/discourse/app/components/categories-and-latest-topics.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-and-top-topics.hbs b/app/assets/javascripts/discourse/app/components/categories-and-top-topics.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/categories-and-top-topics.hbs
rename to app/assets/javascripts/discourse/app/components/categories-and-top-topics.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-boxes-topic.hbs b/app/assets/javascripts/discourse/app/components/categories-boxes-topic.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/categories-boxes-topic.hbs
rename to app/assets/javascripts/discourse/app/components/categories-boxes-topic.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-boxes-with-topics.hbs b/app/assets/javascripts/discourse/app/components/categories-boxes-with-topics.hbs
similarity index 85%
rename from app/assets/javascripts/discourse/app/templates/components/categories-boxes-with-topics.hbs
rename to app/assets/javascripts/discourse/app/components/categories-boxes-with-topics.hbs
index 2e2816c0604..10480daa034 100644
--- a/app/assets/javascripts/discourse/app/templates/components/categories-boxes-with-topics.hbs
+++ b/app/assets/javascripts/discourse/app/components/categories-boxes-with-topics.hbs
@@ -1,12 +1,7 @@
 {{#each this.categories as |c|}}
   <div
     data-notification-level={{c.notificationLevelString}}
-    style={{unless
-      this.noCategoryStyle
-      (html-safe
-        (concat (border-color c.color) (category-color-variable c.color))
-      )
-    }}
+    style={{unless this.noCategoryStyle (category-color-variable c.color)}}
     class="category category-box category-box-{{c.slug}}
       {{if c.isMuted 'muted'}}
       {{if this.noCategoryStyle 'no-category-boxes-style'}}"
@@ -44,7 +39,7 @@
 
       <PluginOutlet
         @name="category-box-below-each-category"
-        @args={{hash category=c}}
+        @outletArgs={{hash category=c}}
       />
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-boxes.hbs b/app/assets/javascripts/discourse/app/components/categories-boxes.hbs
similarity index 90%
rename from app/assets/javascripts/discourse/app/templates/components/categories-boxes.hbs
rename to app/assets/javascripts/discourse/app/components/categories-boxes.hbs
index 88d3a12dc8e..cddedd2a074 100644
--- a/app/assets/javascripts/discourse/app/templates/components/categories-boxes.hbs
+++ b/app/assets/javascripts/discourse/app/components/categories-boxes.hbs
@@ -1,16 +1,11 @@
 {{#each this.categories as |c|}}
   <PluginOutlet
     @name="category-box-before-each-box"
-    @args={{hash category=c}}
+    @outletArgs={{hash category=c}}
   />
 
   <div
-    style={{unless
-      this.noCategoryStyle
-      (html-safe
-        (concat (border-color c.color) (category-color-variable c.color))
-      )
-    }}
+    style={{unless this.noCategoryStyle (category-color-variable c.color)}}
     data-category-id={{c.id}}
     data-notification-level={{c.notificationLevelString}}
     data-url={{c.url}}
@@ -91,15 +86,18 @@
 
       <PluginOutlet
         @name="category-box-below-each-category"
-        @args={{hash category=c}}
+        @outletArgs={{hash category=c}}
       />
     </div>
   </div>
 
-  <PluginOutlet @name="category-box-after-each-box" @args={{hash category=c}} />
+  <PluginOutlet
+    @name="category-box-after-each-box"
+    @outletArgs={{hash category=c}}
+  />
 {{/each}}
 
 <PluginOutlet
   @name="category-boxes-after-boxes"
-  @args={{hash category=this.c}}
+  @outletArgs={{hash category=this.c}}
 />
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-only.hbs b/app/assets/javascripts/discourse/app/components/categories-only.hbs
similarity index 96%
rename from app/assets/javascripts/discourse/app/templates/components/categories-only.hbs
rename to app/assets/javascripts/discourse/app/components/categories-only.hbs
index ec8a6c70265..227e8114f24 100644
--- a/app/assets/javascripts/discourse/app/templates/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/app/components/categories-only.hbs
@@ -68,5 +68,5 @@
 <PluginOutlet
   @name="below-categories-only"
   @connectorTagName="div"
-  @args={{hash categories=this.categories showTopics=this.showTopics}}
+  @outletArgs={{hash categories=this.categories showTopics=this.showTopics}}
 />
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-topic-list.hbs b/app/assets/javascripts/discourse/app/components/categories-topic-list.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/categories-topic-list.hbs
rename to app/assets/javascripts/discourse/app/components/categories-topic-list.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-with-featured-topics.hbs b/app/assets/javascripts/discourse/app/components/categories-with-featured-topics.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/categories-with-featured-topics.hbs
rename to app/assets/javascripts/discourse/app/components/categories-with-featured-topics.hbs
diff --git a/app/assets/javascripts/discourse/app/components/category-list-item.js b/app/assets/javascripts/discourse/app/components/category-list-item.js
index 468ce928c75..12e41368404 100644
--- a/app/assets/javascripts/discourse/app/components/category-list-item.js
+++ b/app/assets/javascripts/discourse/app/components/category-list-item.js
@@ -26,4 +26,14 @@ export default Component.extend({
       (!isMutedCategory && listType === LIST_TYPE.MUTED)
     );
   },
+
+  @discourseComputed("topicTrackingState.messageCount")
+  unreadTopicsCount() {
+    return this.category.unreadTopicsCount;
+  },
+
+  @discourseComputed("topicTrackingState.messageCount")
+  newTopicsCount() {
+    return this.category.newTopicsCount;
+  },
 });
diff --git a/app/assets/javascripts/discourse/app/templates/components/category-logo.hbs b/app/assets/javascripts/discourse/app/components/category-logo.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/category-logo.hbs
rename to app/assets/javascripts/discourse/app/components/category-logo.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/category-name-fields.hbs b/app/assets/javascripts/discourse/app/components/category-name-fields.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/category-name-fields.hbs
rename to app/assets/javascripts/discourse/app/components/category-name-fields.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/category-permission-row.hbs b/app/assets/javascripts/discourse/app/components/category-permission-row.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/category-permission-row.hbs
rename to app/assets/javascripts/discourse/app/components/category-permission-row.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/category-read-only-banner.hbs b/app/assets/javascripts/discourse/app/components/category-read-only-banner.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/category-read-only-banner.hbs
rename to app/assets/javascripts/discourse/app/components/category-read-only-banner.hbs
diff --git a/app/assets/javascripts/discourse/app/components/category-title-before.hbs b/app/assets/javascripts/discourse/app/components/category-title-before.hbs
new file mode 100644
index 00000000000..4be248725d2
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/category-title-before.hbs
@@ -0,0 +1,4 @@
+<PluginOutlet
+  @name="category-title-before"
+  @outletArgs={{hash category=this.category}}
+/>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/category-title-link.hbs b/app/assets/javascripts/discourse/app/components/category-title-link.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/category-title-link.hbs
rename to app/assets/javascripts/discourse/app/components/category-title-link.hbs
diff --git a/app/assets/javascripts/discourse/app/components/category-unread.hbs b/app/assets/javascripts/discourse/app/components/category-unread.hbs
new file mode 100644
index 00000000000..459ccc57945
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/category-unread.hbs
@@ -0,0 +1,17 @@
+{{#if this.unreadTopicsCount}}
+  <a
+    href={{this.category.unreadUrl}}
+    title={{i18n "topic.unread_topics" count=this.unreadTopicsCount}}
+    class="badge new-posts badge-notification"
+  >{{i18n
+      "filters.unread.lower_title_with_count"
+      count=this.unreadTopicsCount
+    }}</a>
+{{/if}}
+{{#if this.newTopicsCount}}
+  <a
+    href={{this.category.newUrl}}
+    title={{i18n "topic.new_topics" count=this.newTopicsCount}}
+    class="badge new-posts badge-notification"
+  >{{i18n "filters.new.lower_title_with_count" count=this.newTopicsCount}}</a>
+{{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/cdn-img.hbs b/app/assets/javascripts/discourse/app/components/cdn-img.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/cdn-img.hbs
rename to app/assets/javascripts/discourse/app/components/cdn-img.hbs
diff --git a/app/assets/javascripts/discourse/app/components/char-counter.hbs b/app/assets/javascripts/discourse/app/components/char-counter.hbs
new file mode 100644
index 00000000000..3ab7e455dd7
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/char-counter.hbs
@@ -0,0 +1,12 @@
+<div
+  class={{concat-class "char-counter" (if (gt @value.length @max) "exceeded")}}
+  ...attributes
+>
+  {{yield}}
+  <small class="char-counter__ratio">
+    {{@value.length}}/{{@max}}
+  </small>
+  <span aria-live="polite" class="sr-only">
+    {{if (gt @value.length @max) (i18n "char_counter.exceeded")}}
+  </span>
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/choose-message.hbs b/app/assets/javascripts/discourse/app/components/choose-message.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/choose-message.hbs
rename to app/assets/javascripts/discourse/app/components/choose-message.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/choose-topic.hbs b/app/assets/javascripts/discourse/app/components/choose-topic.hbs
similarity index 95%
rename from app/assets/javascripts/discourse/app/templates/components/choose-topic.hbs
rename to app/assets/javascripts/discourse/app/components/choose-topic.hbs
index f9bf06d223a..15e42850396 100644
--- a/app/assets/javascripts/discourse/app/templates/components/choose-topic.hbs
+++ b/app/assets/javascripts/discourse/app/components/choose-topic.hbs
@@ -30,7 +30,7 @@
             />
             <TopicStatus @topic={{t}} @disableActions={{true}} />
             <span class="topic-title">
-              {{replace-emoji t.fancy_title}}
+              {{replace-emoji t.title}}
             </span>
             <span class="topic-categories">
               {{bound-category-link
diff --git a/app/assets/javascripts/discourse/app/templates/components/color-picker.hbs b/app/assets/javascripts/discourse/app/components/color-picker.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/color-picker.hbs
rename to app/assets/javascripts/discourse/app/components/color-picker.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/composer-action-title.hbs b/app/assets/javascripts/discourse/app/components/composer-action-title.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/composer-action-title.hbs
rename to app/assets/javascripts/discourse/app/components/composer-action-title.hbs
diff --git a/app/assets/javascripts/discourse/app/components/composer-body.js b/app/assets/javascripts/discourse/app/components/composer-body.js
index 0827c1f3ad4..8b6f8f8da1e 100644
--- a/app/assets/javascripts/discourse/app/components/composer-body.js
+++ b/app/assets/javascripts/discourse/app/components/composer-body.js
@@ -7,7 +7,6 @@ import discourseComputed, {
 import Component from "@ember/component";
 import Composer from "discourse/models/composer";
 import KeyEnterEscape from "discourse/mixins/key-enter-escape";
-import afterTransition from "discourse/lib/after-transition";
 import discourseDebounce from "discourse-common/lib/debounce";
 import { headerOffset } from "discourse/lib/offset-calculator";
 import positioningWorkaround from "discourse/lib/safari-hacks";
@@ -118,14 +117,15 @@ export default Component.extend(KeyEnterEscape, {
   @observes("composeState", "composer.{action,canEditTopicFeaturedLink}")
   _triggerComposerResized() {
     schedule("afterRender", () => {
-      if (!this.element || this.isDestroying || this.isDestroyed) {
-        return;
-      }
       discourseDebounce(this, this.composerResized, 300);
     });
   },
 
   composerResized() {
+    if (!this.element || this.isDestroying || this.isDestroyed) {
+      return;
+    }
+
     this.appEvents.trigger("composer:resized");
   },
 
@@ -181,8 +181,10 @@ export default Component.extend(KeyEnterEscape, {
     };
     triggerOpen();
 
-    afterTransition($(this.element), () => {
-      triggerOpen();
+    this.element.addEventListener("transitionend", (event) => {
+      if (event.propertyName === "height") {
+        triggerOpen();
+      }
     });
 
     positioningWorkaround(this.element);
diff --git a/app/assets/javascripts/discourse/app/components/composer-container.hbs b/app/assets/javascripts/discourse/app/components/composer-container.hbs
new file mode 100644
index 00000000000..8e19f89aa30
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/composer-container.hbs
@@ -0,0 +1,428 @@
+<ComposerBody
+  @composer={{this.composer.model}}
+  @showPreview={{this.composer.showPreview}}
+  @openIfDraft={{this.composer.openIfDraft}}
+  @typed={{this.composer.typed}}
+  @cancelled={{this.composer.cancelled}}
+  @save={{this.composer.saveAction}}
+>
+  <div class="grippie"></div>
+
+  {{#if this.composer.visible}}
+    <ComposerMessages
+      @composer={{this.composer.model}}
+      @messageCount={{this.composer.messageCount}}
+      @addLinkLookup={{this.composer.addLinkLookup}}
+    />
+
+    {{#if this.composer.showFullScreenPrompt}}
+      <ComposerFullscreenPrompt
+        @removeFullScreenExitPrompt={{this.composer.removeFullScreenExitPrompt}}
+      />
+    {{/if}}
+
+    {{#if this.composer.model.viewOpenOrFullscreen}}
+      <div
+        role="form"
+        aria-label={{I18n this.composer.saveLabel}}
+        class="reply-area
+          {{if this.composer.canEditTags 'with-tags' 'without-tags'}}
+          {{if
+            this.composer.model.showCategoryChooser
+            'with-category'
+            'without-category'
+          }}"
+      >
+        <span class="composer-open-plugin-outlet-container">
+          <PluginOutlet
+            @name="composer-open"
+            @connectorTagName="div"
+            @outletArgs={{hash model=this.composer.model}}
+          />
+        </span>
+
+        <div class="reply-to">
+          {{#unless this.composer.model.viewFullscreen}}
+            <div class="reply-details">
+              <ComposerActionTitle
+                @model={{this.composer.model}}
+                @openComposer={{this.composer.openComposer}}
+                @closeComposer={{this.composer.closeComposer}}
+                @canWhisper={{this.composer.canWhisper}}
+              />
+
+              <PluginOutlet
+                @name="composer-action-after"
+                @outletArgs={{hash model=this.composer.model}}
+              />
+
+              {{#unless this.composer.site.mobileView}}
+                {{#if this.composer.model.unlistTopic}}
+                  <span class="unlist">({{i18n "composer.unlist"}})</span>
+                {{/if}}
+                {{#if this.composer.isWhispering}}
+                  {{#if this.composer.model.noBump}}
+                    <span class="no-bump">{{d-icon "anchor"}}</span>
+                  {{/if}}
+                {{/if}}
+              {{/unless}}
+
+              {{#if this.composer.canEdit}}
+                <LinkToInput
+                  @onClick={{this.composer.displayEditReason}}
+                  @showInput={{this.composer.showEditReason}}
+                  @icon="info-circle"
+                  @class="display-edit-reason"
+                >
+                  <TextField
+                    @value={{this.composer.editReason}}
+                    @id="edit-reason"
+                    @maxlength="255"
+                    @placeholderKey="composer.edit_reason_placeholder"
+                  />
+                </LinkToInput>
+              {{/if}}
+            </div>
+          {{/unless}}
+
+          <PluginOutlet
+            @name="before-composer-controls"
+            @outletArgs={{hash model=this.composer.model}}
+          />
+
+          <ComposerToggles
+            @composeState={{this.composer.model.composeState}}
+            @showToolbar={{this.composer.showToolbar}}
+            @toggleComposer={{this.composer.toggle}}
+            @toggleToolbar={{this.composer.toggleToolbar}}
+            @toggleFullscreen={{this.composer.fullscreenComposer}}
+            @disableTextarea={{this.composer.disableTextarea}}
+          />
+        </div>
+
+        <ComposerEditor
+          @topic={{this.composer.topic}}
+          @composer={{this.composer.model}}
+          @lastValidatedAt={{this.composer.lastValidatedAt}}
+          @canWhisper={{this.composer.canWhisper}}
+          @storeToolbarState={{this.composer.storeToolbarState}}
+          @onPopupMenuAction={{this.composer.onPopupMenuAction}}
+          @showUploadModal={{route-action "showUploadSelector"}}
+          @popupMenuOptions={{this.composer.popupMenuOptions}}
+          @draftStatus={{this.composer.model.draftStatus}}
+          @isUploading={{this.composer.isUploading}}
+          @isProcessingUpload={{this.composer.isProcessingUpload}}
+          @allowUpload={{this.composer.allowUpload}}
+          @uploadIcon={{this.composer.uploadIcon}}
+          @isCancellable={{this.composer.isCancellable}}
+          @uploadProgress={{this.composer.uploadProgress}}
+          @groupsMentioned={{this.composer.groupsMentioned}}
+          @cannotSeeMention={{this.composer.cannotSeeMention}}
+          @hereMention={{this.composer.hereMention}}
+          @importQuote={{this.composer.importQuote}}
+          @togglePreview={{this.composer.togglePreview}}
+          @processPreview={{this.composer.showPreview}}
+          @showToolbar={{this.composer.showToolbar}}
+          @afterRefresh={{this.composer.afterRefresh}}
+          @focusTarget={{this.composer.focusTarget}}
+          @disableTextarea={{this.composer.disableTextarea}}
+          @formTemplateIds={{this.composer.formTemplateIds}}
+        >
+          <div class="composer-fields">
+            <PluginOutlet
+              @name="before-composer-fields"
+              @outletArgs={{hash model=this.composer.model}}
+            />
+            {{#unless this.composer.model.viewFullscreen}}
+              {{#if this.composer.model.canEditTitle}}
+                {{#if this.composer.model.creatingPrivateMessage}}
+                  <div class="user-selector">
+                    <ComposerUserSelector
+                      @topicId={{this.composer.topicModel.id}}
+                      @recipients={{this.composer.model.targetRecipients}}
+                      @hasGroups={{this.composer.model.hasTargetGroups}}
+                      @focusTarget={{this.composer.focusTarget}}
+                      @class={{concat
+                        "users-input"
+                        (if this.composer.showWarning " can-warn")
+                      }}
+                    />
+                    {{#if this.composer.showWarning}}
+                      <label class="add-warning">
+                        <Input
+                          @type="checkbox"
+                          @checked={{this.composer.model.isWarning}}
+                        />
+                        <span>{{i18n "composer.add_warning"}}</span>
+                      </label>
+                    {{/if}}
+                  </div>
+                {{/if}}
+
+                <div
+                  class="title-and-category
+                    {{if this.composer.showPreview 'with-preview'}}"
+                >
+                  <ComposerTitle
+                    @composer={{this.composer.model}}
+                    @lastValidatedAt={{this.composer.lastValidatedAt}}
+                    @focusTarget={{this.composer.focusTarget}}
+                  />
+
+                  {{#if this.composer.model.showCategoryChooser}}
+                    <div class="category-input">
+                      <CategoryChooser
+                        @value={{this.composer.model.categoryId}}
+                        @onChange={{this.composer.updateCategory}}
+                        @options={{hash
+                          disabled=this.composer.disableCategoryChooser
+                          scopedCategoryId=this.composer.scopedCategoryId
+                          prioritizedCategoryId=this.composer.prioritizedCategoryId
+                        }}
+                      />
+                      <PopupInputTip
+                        @validation={{this.composer.categoryValidation}}
+                      />
+                    </div>
+                  {{/if}}
+
+                  {{#if this.composer.canEditTags}}
+                    <MiniTagChooser
+                      @value={{this.composer.model.tags}}
+                      @onChange={{action (mut this.composer.model.tags)}}
+                      @options={{hash
+                        disabled=this.composer.disableTagsChooser
+                        categoryId=this.composer.model.categoryId
+                        minimum=this.composer.model.minimumRequiredTags
+                      }}
+                    />
+                    <PopupInputTip
+                      @validation={{this.composer.tagValidation}}
+                    />
+                  {{/if}}
+
+                  <PluginOutlet
+                    @name="after-title-and-category"
+                    @outletArgs={{hash
+                      model=this.composer.model
+                      tagValidation=this.composer.tagValidation
+                      canEditTags=this.composer.canEditTags
+                      disabled=this.composer.disableTagsChooser
+                    }}
+                  />
+                </div>
+              {{/if}}
+
+              <span>
+                <PluginOutlet
+                  @name="composer-fields"
+                  @connectorTagName="div"
+                  @outletArgs={{hash
+                    model=this.composer.model
+                    showPreview=this.composer.showPreview
+                  }}
+                />
+              </span>
+            {{/unless}}
+          </div>
+        </ComposerEditor>
+
+        <span>
+          <PluginOutlet
+            @name="composer-after-composer-editor"
+            @outletArgs={{hash model=this.composer.model}}
+          />
+        </span>
+
+        <div class="submit-panel">
+          <span>
+            <PluginOutlet
+              @name="composer-fields-below"
+              @connectorTagName="div"
+              @outletArgs={{hash model=this.composer.model}}
+            />
+          </span>
+
+          <div class="save-or-cancel">
+            <ComposerSaveButton
+              @action={{this.composer.saveAction}}
+              @icon={{this.composer.saveIcon}}
+              @label={{this.composer.saveLabel}}
+              @forwardEvent={{true}}
+              @disableSubmit={{this.composer.disableSubmit}}
+            />
+
+            {{#if this.composer.site.mobileView}}
+              <a
+                href
+                {{on "click" this.composer.cancel}}
+                title={{i18n "cancel"}}
+                class="cancel"
+              >
+                {{#if this.composer.canEdit}}
+                  {{d-icon "times"}}
+                {{else}}
+                  {{d-icon "far-trash-alt"}}
+                {{/if}}
+              </a>
+            {{else}}
+              <a href {{on "click" this.composer.cancel}} class="cancel">{{i18n
+                  "close"
+                }}</a>
+            {{/if}}
+
+            {{#if this.composer.site.mobileView}}
+              {{#if this.composer.whisperOrUnlistTopic}}
+                <span class="whisper">
+                  {{d-icon "far-eye-slash"}}
+                </span>
+              {{/if}}
+
+              {{#if this.composer.model.noBump}}
+                <span class="no-bump">{{d-icon "anchor"}}</span>
+              {{/if}}
+            {{/if}}
+
+            <span>
+              <PluginOutlet
+                @name="composer-after-save-or-cancel"
+                @outletArgs={{hash model=this.composer.model}}
+              />
+            </span>
+          </div>
+
+          {{#if this.composer.site.mobileView}}
+            <span>
+              <PluginOutlet
+                @name="composer-mobile-buttons-bottom"
+                @outletArgs={{hash model=this.composer.model}}
+              />
+            </span>
+
+            {{#if this.composer.allowUpload}}
+              <a
+                id="mobile-file-upload"
+                class="btn btn-default no-text mobile-file-upload
+                  {{if this.composer.isUploading 'hidden'}}"
+                aria-label={{i18n "composer.upload_title"}}
+              >
+                {{d-icon this.composer.uploadIcon}}
+              </a>
+            {{/if}}
+
+            <a
+              href
+              class="btn btn-default no-text mobile-preview"
+              title={{i18n "composer.show_preview"}}
+              {{on "click" this.composer.togglePreview}}
+              aria-label={{i18n "preview"}}
+            >
+              {{d-icon "desktop"}}
+            </a>
+
+            {{#if this.composer.showPreview}}
+              <DButton
+                @action={{this.composer.togglePreview}}
+                @class="hide-preview"
+                @ariaLabel="composer.hide_preview"
+                @icon="pencil-alt"
+              />
+            {{/if}}
+          {{/if}}
+
+          {{#if
+            (or this.composer.isUploading this.composer.isProcessingUpload)
+          }}
+            <div id="file-uploading">
+              {{#if this.composer.isProcessingUpload}}
+                {{loading-spinner size="small"}}<span>{{i18n
+                    "upload_selector.processing"
+                  }}</span>
+              {{else}}
+                {{loading-spinner size="small"}}<span>{{i18n
+                    "upload_selector.uploading"
+                  }}
+                  {{this.composer.uploadProgress}}%</span>
+              {{/if}}
+
+              {{#if this.composer.isCancellable}}
+                <a
+                  href
+                  id="cancel-file-upload"
+                  {{on "click" this.composer.cancelUpload}}
+                >{{d-icon "times"}}</a>
+              {{/if}}
+            </div>
+          {{/if}}
+
+          <div
+            class={{if this.composer.isUploading "hidden"}}
+            id="draft-status"
+          >
+            {{#if this.composer.model.draftStatus}}
+              <span
+                class="draft-error"
+                title={{this.composer.model.draftStatus}}
+              >
+                {{#if this.composer.model.draftConflictUser}}
+                  {{avatar
+                    this.composer.model.draftConflictUser
+                    imageSize="small"
+                  }}
+                  {{d-icon "user-edit"}}
+                {{else}}
+                  {{d-icon "exclamation-triangle"}}
+                {{/if}}
+                {{#unless this.composer.site.mobileView}}
+                  {{this.composer.model.draftStatus}}
+                {{/unless}}
+              </span>
+            {{/if}}
+          </div>
+
+          {{#unless this.site.mobileView}}
+            <DButton
+              @action={{this.composer.togglePreview}}
+              @translatedTitle={{this.composer.toggleText}}
+              @icon="angle-double-left"
+              @class={{concat
+                "btn-flat btn-mini-toggle toggle-preview "
+                (unless this.composer.showPreview "active")
+              }}
+            />
+          {{/unless}}
+        </div>
+      </div>
+    {{else}}
+      <div class="saving-text">
+        {{#if this.composer.model.createdPost}}
+          {{i18n "composer.saved"}}
+          <a
+            href={{this.composer.createdPost.url}}
+            {{on "click" this.composer.viewNewReply}}
+            class="permalink"
+          >{{i18n "composer.view_new_post"}}</a>
+        {{else}}
+          {{i18n "composer.saving"}}
+          {{loading-spinner size="small"}}
+        {{/if}}
+      </div>
+
+      <div class="draft-text">
+        {{#if this.composer.model.topic}}
+          {{d-icon "share"}}
+          {{html-safe this.composer.draftTitle}}
+        {{else}}
+          {{i18n "composer.saved_draft"}}
+        {{/if}}
+      </div>
+
+      <ComposerToggles
+        @composeState={{this.composer.model.composeState}}
+        @toggleFullscreen={{this.composer.openIfDraft}}
+        @toggleComposer={{this.composer.toggle}}
+        @toggleToolbar={{this.composer.toggleToolbar}}
+      />
+    {{/if}}
+  {{/if}}
+</ComposerBody>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/composer-container.js b/app/assets/javascripts/discourse/app/components/composer-container.js
new file mode 100644
index 00000000000..35fa83be7ba
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/composer-container.js
@@ -0,0 +1,7 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+
+export default class ComposerContainer extends Component {
+  @service composer;
+  @service site;
+}
diff --git a/app/assets/javascripts/discourse/app/templates/components/composer-editor.hbs b/app/assets/javascripts/discourse/app/components/composer-editor.hbs
similarity index 76%
rename from app/assets/javascripts/discourse/app/templates/components/composer-editor.hbs
rename to app/assets/javascripts/discourse/app/components/composer-editor.hbs
index bb3c6513aa7..5b1041b8c86 100644
--- a/app/assets/javascripts/discourse/app/templates/components/composer-editor.hbs
+++ b/app/assets/javascripts/discourse/app/components/composer-editor.hbs
@@ -16,6 +16,9 @@
   @onExpandPopupMenuOptions={{action "onExpandPopupMenuOptions"}}
   @onPopupMenuAction={{this.onPopupMenuAction}}
   @popupMenuOptions={{this.popupMenuOptions}}
+  @formTemplateIds={{this.formTemplateIds}}
+  @replyingToTopic={{this.composer.replyingToTopic}}
+  @editingPost={{this.composer.editingPost}}
   @disabled={{this.disableTextarea}}
   @outletArgs={{hash composer=this.composer editorType="composer"}}
 >
@@ -23,5 +26,9 @@
 </DEditor>
 
 {{#if this.allowUpload}}
-  <PickFilesButton @fileInputId="file-uploader" @allowMultiple={{true}} />
+  <PickFilesButton
+    @fileInputId="file-uploader"
+    @allowMultiple={{true}}
+    name="file-uploader"
+  />
 {{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/composer-editor.js b/app/assets/javascripts/discourse/app/components/composer-editor.js
index 2c8cd343389..6673c23f375 100644
--- a/app/assets/javascripts/discourse/app/components/composer-editor.js
+++ b/app/assets/javascripts/discourse/app/components/composer-editor.js
@@ -6,8 +6,8 @@ import {
   caretPosition,
   formatUsername,
   inCodeBlock,
-  tinyAvatar,
 } from "discourse/lib/utilities";
+import { tinyAvatar } from "discourse-common/lib/avatar-utils";
 import discourseComputed, {
   bind,
   debounce,
@@ -31,6 +31,7 @@ import discourseLater from "discourse-common/lib/later";
 import Component from "@ember/component";
 import Composer from "discourse/models/composer";
 import ComposerUploadUppy from "discourse/mixins/composer-upload-uppy";
+import ComposerVideoThumbnailUppy from "discourse/mixins/composer-video-thumbnail-uppy";
 import EmberObject from "@ember/object";
 import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
@@ -41,6 +42,11 @@ import { isTesting } from "discourse-common/config/environment";
 import { loadOneboxes } from "discourse/lib/load-oneboxes";
 import putCursorAtEnd from "discourse/lib/put-cursor-at-end";
 import userSearch from "discourse/lib/user-search";
+import {
+  destroyTippyInstances,
+  initUserStatusHtml,
+  renderUserStatusHtml,
+} from "discourse/lib/user-status-on-autocomplete";
 
 // original string `![image|foo=bar|690x220, 50%|bar=baz](upload://1TjaobgKObzpU7xRMw2HuUc87vO.png "image title")`
 // group 1 `image|foo=bar`
@@ -98,464 +104,456 @@ export function addComposerUploadMarkdownResolver(resolver) {
 export function cleanUpComposerUploadMarkdownResolver() {
   uploadMarkdownResolvers = [];
 }
+export default Component.extend(
+  ComposerUploadUppy,
+  ComposerVideoThumbnailUppy,
+  {
+    classNameBindings: ["showToolbar:toolbar-visible", ":wmd-controls"],
 
-export default Component.extend(ComposerUploadUppy, {
-  classNameBindings: ["showToolbar:toolbar-visible", ":wmd-controls"],
+    editorClass: ".d-editor",
+    fileUploadElementId: "file-uploader",
+    mobileFileUploaderId: "mobile-file-upload",
 
-  editorClass: ".d-editor",
-  fileUploadElementId: "file-uploader",
-  mobileFileUploaderId: "mobile-file-upload",
+    composerEventPrefix: "composer",
+    uploadType: "composer",
+    uppyId: "composer-editor-uppy",
+    composerModel: alias("composer"),
+    composerModelContentKey: "reply",
+    editorInputClass: ".d-editor-input",
+    shouldBuildScrollMap: true,
+    scrollMap: null,
+    processPreview: true,
 
-  // TODO (martin) Remove this once the chat plugin is using the new composerEventPrefix
-  eventPrefix: "composer",
-  composerEventPrefix: "composer",
-  uploadType: "composer",
-  uppyId: "composer-editor-uppy",
-  composerModel: alias("composer"),
-  composerModelContentKey: "reply",
-  editorInputClass: ".d-editor-input",
-  shouldBuildScrollMap: true,
-  scrollMap: null,
-  processPreview: true,
+    uploadMarkdownResolvers,
+    uploadPreProcessors,
+    uploadHandlers,
 
-  uploadMarkdownResolvers,
-  uploadPreProcessors,
-  uploadHandlers,
+    init() {
+      this._super(...arguments);
+      this.warnedCannotSeeMentions = [];
+      this.warnedGroupMentions = [];
+    },
 
-  init() {
-    this._super(...arguments);
-    this.warnedCannotSeeMentions = [];
-    this.warnedGroupMentions = [];
-  },
-
-  @discourseComputed("composer.requiredCategoryMissing")
-  replyPlaceholder(requiredCategoryMissing) {
-    if (requiredCategoryMissing) {
-      return "composer.reply_placeholder_choose_category";
-    } else {
-      const key = authorizesOneOrMoreImageExtensions(
-        this.currentUser.staff,
-        this.siteSettings
-      )
-        ? "reply_placeholder"
-        : "reply_placeholder_no_images";
-      return `composer.${key}`;
-    }
-  },
-
-  @discourseComputed
-  showLink() {
-    return this.currentUser && this.currentUser.link_posting_access !== "none";
-  },
-
-  @observes("focusTarget")
-  setFocus() {
-    if (this.focusTarget === "editor") {
-      putCursorAtEnd(this.element.querySelector("textarea"));
-    }
-  },
-
-  @discourseComputed
-  markdownOptions() {
-    return {
-      previewing: true,
-
-      formatUsername,
-
-      lookupAvatarByPostNumber: (postNumber, topicId) => {
-        const topic = this.topic;
-        if (!topic) {
-          return;
-        }
-
-        const posts = topic.get("postStream.posts");
-        if (posts && topicId === topic.get("id")) {
-          const quotedPost = posts.findBy("post_number", postNumber);
-          if (quotedPost) {
-            return tinyAvatar(quotedPost.get("avatar_template"));
-          }
-        }
-      },
-
-      lookupPrimaryUserGroupByPostNumber: (postNumber, topicId) => {
-        const topic = this.topic;
-        if (!topic) {
-          return;
-        }
-
-        const posts = topic.get("postStream.posts");
-        if (posts && topicId === topic.get("id")) {
-          const quotedPost = posts.findBy("post_number", postNumber);
-          if (quotedPost) {
-            return quotedPost.primary_group_name;
-          }
-        }
-      },
-
-      hashtagTypesInPriorityOrder:
-        this.site.hashtag_configurations["topic-composer"],
-      hashtagIcons: this.site.hashtag_icons,
-    };
-  },
-
-  @bind
-  _userSearchTerm(term) {
-    const topicId = this.get("topic.id");
-    // maybe this is a brand new topic, so grab category from composer
-    const categoryId =
-      this.get("topic.category_id") || this.get("composer.categoryId");
-
-    return userSearch({
-      term,
-      topicId,
-      categoryId,
-      includeGroups: true,
-    });
-  },
-
-  @bind
-  _afterMentionComplete(value) {
-    this.composer.set("reply", value);
-
-    // ensures textarea scroll position is correct
-    schedule("afterRender", () => {
-      const input = this.element.querySelector(".d-editor-input");
-      input?.blur();
-      input?.focus();
-    });
-  },
-
-  @on("didInsertElement")
-  _composerEditorInit() {
-    const $input = $(this.element.querySelector(".d-editor-input"));
-
-    if (this.siteSettings.enable_mentions) {
-      $input.autocomplete({
-        template: findRawTemplate("user-selector-autocomplete"),
-        dataSource: this._userSearchTerm,
-        key: "@",
-        transformComplete: (v) => v.username || v.name,
-        afterComplete: this._afterMentionComplete,
-        triggerRule: (textarea) =>
-          !inCodeBlock(textarea.value, caretPosition(textarea)),
-      });
-    }
-
-    this.element
-      .querySelector(".d-editor-input")
-      ?.addEventListener("scroll", this._throttledSyncEditorAndPreviewScroll);
-
-    // Focus on the body unless we have a title
-    if (!this.get("composer.canEditTitle")) {
-      putCursorAtEnd(this.element.querySelector(".d-editor-input"));
-    }
-
-    if (this.allowUpload) {
-      this._bindUploadTarget();
-      this._bindMobileUploadButton();
-    }
-
-    this.appEvents.trigger("composer:will-open");
-  },
-
-  @discourseComputed(
-    "composer.reply",
-    "composer.replyLength",
-    "composer.missingReplyCharacters",
-    "composer.minimumPostLength",
-    "lastValidatedAt"
-  )
-  validation(
-    reply,
-    replyLength,
-    missingReplyCharacters,
-    minimumPostLength,
-    lastValidatedAt
-  ) {
-    const postType = this.get("composer.post.post_type");
-    if (postType === this.site.get("post_types.small_action")) {
-      return;
-    }
-
-    let reason;
-    if (replyLength < 1) {
-      reason = I18n.t("composer.error.post_missing");
-    } else if (missingReplyCharacters > 0) {
-      reason = I18n.t("composer.error.post_length", {
-        count: minimumPostLength,
-      });
-      const tl = this.get("currentUser.trust_level");
-      if (tl === 0 || tl === 1) {
-        reason +=
-          "<br/>" +
-          I18n.t("composer.error.try_like", {
-            heart: iconHTML("heart", {
-              label: I18n.t("likes_lowercase", { count: 1 }),
-            }),
-          });
-      }
-    }
-
-    if (reason) {
-      return EmberObject.create({
-        failed: true,
-        reason,
-        lastShownAt: lastValidatedAt,
-      });
-    }
-  },
-
-  _resetShouldBuildScrollMap() {
-    this.set("shouldBuildScrollMap", true);
-  },
-
-  @bind
-  _handleInputInteraction(event) {
-    const preview = this.element.querySelector(".d-editor-preview-wrapper");
-
-    if (!$(preview).is(":visible")) {
-      return;
-    }
-
-    preview.removeEventListener("scroll", this._handleInputOrPreviewScroll);
-    event.target.addEventListener("scroll", this._handleInputOrPreviewScroll);
-  },
-
-  @bind
-  _handleInputOrPreviewScroll(event) {
-    this._syncScroll(
-      this._syncEditorAndPreviewScroll,
-      $(event.target),
-      $(this.element.querySelector(".d-editor-preview-wrapper"))
-    );
-  },
-
-  @bind
-  _handlePreviewInteraction(event) {
-    this.element
-      .querySelector(".d-editor-input")
-      ?.removeEventListener("scroll", this._handleInputOrPreviewScroll);
-
-    event.target?.addEventListener("scroll", this._handleInputOrPreviewScroll);
-  },
-
-  _syncScroll($callback, $input, $preview) {
-    if (!this.scrollMap || this.shouldBuildScrollMap) {
-      this.set("scrollMap", this._buildScrollMap($input, $preview));
-      this.set("shouldBuildScrollMap", false);
-    }
-
-    throttle(this, $callback, $input, $preview, this.scrollMap, 20);
-  },
-
-  // Adapted from https://github.com/markdown-it/markdown-it.github.io
-  _buildScrollMap($input, $preview) {
-    let sourceLikeDiv = $("<div />")
-      .css({
-        position: "absolute",
-        height: "auto",
-        visibility: "hidden",
-        width: $input[0].clientWidth,
-        "font-size": $input.css("font-size"),
-        "font-family": $input.css("font-family"),
-        "line-height": $input.css("line-height"),
-        "white-space": $input.css("white-space"),
-      })
-      .appendTo("body");
-
-    const linesMap = [];
-    let numberOfLines = 0;
-
-    $input
-      .val()
-      .split("\n")
-      .forEach((text) => {
-        linesMap.push(numberOfLines);
-
-        if (text.length === 0) {
-          numberOfLines++;
-        } else {
-          sourceLikeDiv.text(text);
-
-          let height;
-          let lineHeight;
-          height = parseFloat(sourceLikeDiv.css("height"));
-          lineHeight = parseFloat(sourceLikeDiv.css("line-height"));
-          numberOfLines += Math.round(height / lineHeight);
-        }
-      });
-
-    linesMap.push(numberOfLines);
-    sourceLikeDiv.remove();
-
-    const previewOffsetTop = $preview.offset().top;
-    const offset =
-      $preview.scrollTop() -
-      previewOffsetTop -
-      ($input.offset().top - previewOffsetTop);
-    const nonEmptyList = [];
-    const scrollMap = [];
-    for (let i = 0; i < numberOfLines; i++) {
-      scrollMap.push(-1);
-    }
-
-    nonEmptyList.push(0);
-    scrollMap[0] = 0;
-
-    $preview.find(".preview-sync-line").each((_, element) => {
-      let $element = $(element);
-      let lineNumber = $element.data("line-number");
-      let linesToTop = linesMap[lineNumber];
-      if (linesToTop !== 0) {
-        nonEmptyList.push(linesToTop);
-      }
-      scrollMap[linesToTop] = Math.round($element.offset().top + offset);
-    });
-
-    nonEmptyList.push(numberOfLines);
-    scrollMap[numberOfLines] = $preview[0].scrollHeight;
-
-    let position = 0;
-
-    for (let i = 1; i < numberOfLines; i++) {
-      if (scrollMap[i] !== -1) {
-        position++;
-        continue;
-      }
-
-      let top = nonEmptyList[position];
-      let bottom = nonEmptyList[position + 1];
-
-      scrollMap[i] = (
-        (scrollMap[bottom] * (i - top) + scrollMap[top] * (bottom - i)) /
-        (bottom - top)
-      ).toFixed(2);
-    }
-
-    return scrollMap;
-  },
-
-  @bind
-  _throttledSyncEditorAndPreviewScroll(event) {
-    const $preview = $(this.element.querySelector(".d-editor-preview-wrapper"));
-
-    throttle(
-      this,
-      this._syncEditorAndPreviewScroll,
-      $(event.target),
-      $preview,
-      20
-    );
-  },
-
-  _syncEditorAndPreviewScroll($input, $preview) {
-    if (!$input) {
-      return;
-    }
-
-    if ($input.scrollTop() === 0) {
-      $preview.scrollTop(0);
-      return;
-    }
-
-    const inputHeight = $input[0].scrollHeight;
-    const previewHeight = $preview[0].scrollHeight;
-
-    if ($input.height() + $input.scrollTop() + 100 > inputHeight) {
-      // cheat, special case for bottom
-      $preview.scrollTop(previewHeight);
-      return;
-    }
-
-    const scrollPosition = $input.scrollTop();
-    const factor = previewHeight / inputHeight;
-    const desired = scrollPosition * factor;
-    $preview.scrollTop(desired + 50);
-  },
-
-  _renderUnseenMentions(preview, unseen) {
-    fetchUnseenMentions({
-      names: unseen,
-      topicId: this.get("composer.topic.id"),
-      allowedNames: this.get("composer.targetRecipients")?.split(","),
-    }).then((response) => {
-      linkSeenMentions(preview, this.siteSettings);
-      this._warnMentionedGroups(preview);
-      this._warnCannotSeeMention(preview);
-      this._warnHereMention(response.here_count);
-    });
-  },
-
-  _renderUnseenHashtags(preview) {
-    let unseen;
-    const hashtagContext = this.site.hashtag_configurations["topic-composer"];
-    if (this.siteSettings.enable_experimental_hashtag_autocomplete) {
-      unseen = linkSeenHashtagsInContext(hashtagContext, preview);
-    } else {
-      unseen = linkSeenHashtags(preview);
-    }
-
-    if (unseen.length > 0) {
-      if (this.siteSettings.enable_experimental_hashtag_autocomplete) {
-        fetchUnseenHashtagsInContext(hashtagContext, unseen).then(() => {
-          linkSeenHashtagsInContext(hashtagContext, preview);
-        });
+    @discourseComputed("composer.requiredCategoryMissing")
+    replyPlaceholder(requiredCategoryMissing) {
+      if (requiredCategoryMissing) {
+        return "composer.reply_placeholder_choose_category";
       } else {
-        fetchUnseenHashtags(unseen).then(() => {
-          linkSeenHashtags(preview);
-        });
+        const key = authorizesOneOrMoreImageExtensions(
+          this.currentUser.staff,
+          this.siteSettings
+        )
+          ? "reply_placeholder"
+          : "reply_placeholder_no_images";
+        return `composer.${key}`;
       }
-    }
-  },
+    },
 
-  @debounce(2000)
-  _warnMentionedGroups(preview) {
-    schedule("afterRender", () => {
-      preview
-        .querySelectorAll(".mention-group[data-mentionable-user-count]")
-        .forEach((mention) => {
-          const { name } = mention.dataset;
-          if (
-            this.warnedGroupMentions.includes(name) ||
-            this._isInQuote(mention)
-          ) {
+    @discourseComputed
+    showLink() {
+      return (
+        this.currentUser && this.currentUser.link_posting_access !== "none"
+      );
+    },
+
+    @observes("focusTarget")
+    setFocus() {
+      if (this.focusTarget === "editor") {
+        putCursorAtEnd(this.element.querySelector("textarea"));
+      }
+    },
+
+    @discourseComputed
+    markdownOptions() {
+      return {
+        previewing: true,
+
+        formatUsername,
+
+        lookupAvatarByPostNumber: (postNumber, topicId) => {
+          const topic = this.topic;
+          if (!topic) {
             return;
           }
 
-          this.warnedGroupMentions.push(name);
-          this.groupsMentioned({
-            name,
-            userCount: mention.dataset.mentionableUserCount,
-            maxMentions: mention.dataset.maxMentions,
-          });
+          const posts = topic.get("postStream.posts");
+          if (posts && topicId === topic.get("id")) {
+            const quotedPost = posts.findBy("post_number", postNumber);
+            if (quotedPost) {
+              return tinyAvatar(quotedPost.get("avatar_template"));
+            }
+          }
+        },
+
+        lookupPrimaryUserGroupByPostNumber: (postNumber, topicId) => {
+          const topic = this.topic;
+          if (!topic) {
+            return;
+          }
+
+          const posts = topic.get("postStream.posts");
+          if (posts && topicId === topic.get("id")) {
+            const quotedPost = posts.findBy("post_number", postNumber);
+            if (quotedPost) {
+              return quotedPost.primary_group_name;
+            }
+          }
+        },
+
+        hashtagTypesInPriorityOrder:
+          this.site.hashtag_configurations["topic-composer"],
+        hashtagIcons: this.site.hashtag_icons,
+      };
+    },
+
+    @bind
+    _afterMentionComplete(value) {
+      this.composer.set("reply", value);
+
+      // ensures textarea scroll position is correct
+      schedule("afterRender", () => {
+        const input = this.element.querySelector(".d-editor-input");
+        input?.blur();
+        input?.focus();
+      });
+    },
+
+    @on("didInsertElement")
+    _composerEditorInit() {
+      const $input = $(this.element.querySelector(".d-editor-input"));
+
+      if (this.siteSettings.enable_mentions) {
+        $input.autocomplete({
+          template: findRawTemplate("user-selector-autocomplete"),
+          dataSource: (term) => {
+            destroyTippyInstances();
+            return userSearch({
+              term,
+              topicId: this.topic?.id,
+              categoryId: this.topic?.category_id || this.composer?.categoryId,
+              includeGroups: true,
+            }).then((result) => {
+              initUserStatusHtml(result.users);
+              return result;
+            });
+          },
+          onRender: (options) => {
+            renderUserStatusHtml(options);
+          },
+          key: "@",
+          transformComplete: (v) => v.username || v.name,
+          afterComplete: this._afterMentionComplete,
+          triggerRule: (textarea) =>
+            !inCodeBlock(textarea.value, caretPosition(textarea)),
+          onClose: destroyTippyInstances,
         });
-    });
-  },
+      }
 
-  // add a delay to allow for typing, so you don't open the warning right away
-  // previously we would warn after @bob even if you were about to mention @bob2
-  @debounce(2000)
-  _warnCannotSeeMention(preview) {
-    if (this.composer.draftKey === Composer.NEW_PRIVATE_MESSAGE_KEY) {
-      return;
-    }
+      this.element
+        .querySelector(".d-editor-input")
+        ?.addEventListener("scroll", this._throttledSyncEditorAndPreviewScroll);
 
-    preview.querySelectorAll(".mention[data-reason]").forEach((mention) => {
-      const { name } = mention.dataset;
-      if (this.warnedCannotSeeMentions.includes(name)) {
+      // Focus on the body unless we have a title
+      if (!this.get("composer.canEditTitle")) {
+        putCursorAtEnd(this.element.querySelector(".d-editor-input"));
+      }
+
+      if (this.allowUpload) {
+        this._bindUploadTarget();
+        this._bindMobileUploadButton();
+      }
+
+      this.appEvents.trigger(`${this.composerEventPrefix}:will-open`);
+    },
+
+    @discourseComputed(
+      "composer.reply",
+      "composer.replyLength",
+      "composer.missingReplyCharacters",
+      "composer.minimumPostLength",
+      "lastValidatedAt"
+    )
+    validation(
+      reply,
+      replyLength,
+      missingReplyCharacters,
+      minimumPostLength,
+      lastValidatedAt
+    ) {
+      const postType = this.get("composer.post.post_type");
+      if (postType === this.site.get("post_types.small_action")) {
         return;
       }
 
-      this.warnedCannotSeeMentions.push(name);
-      this.cannotSeeMention({
-        name,
-        reason: mention.dataset.reason,
-      });
-    });
+      let reason;
+      if (replyLength < 1) {
+        reason = I18n.t("composer.error.post_missing");
+      } else if (missingReplyCharacters > 0) {
+        reason = I18n.t("composer.error.post_length", {
+          count: minimumPostLength,
+        });
+        const tl = this.get("currentUser.trust_level");
+        if (tl === 0 || tl === 1) {
+          reason +=
+            "<br/>" +
+            I18n.t("composer.error.try_like", {
+              heart: iconHTML("heart", {
+                label: I18n.t("likes_lowercase", { count: 1 }),
+              }),
+            });
+        }
+      }
 
-    preview
-      .querySelectorAll(".mention-group[data-reason]")
-      .forEach((mention) => {
+      if (reason) {
+        return EmberObject.create({
+          failed: true,
+          reason,
+          lastShownAt: lastValidatedAt,
+        });
+      }
+    },
+
+    _resetShouldBuildScrollMap() {
+      this.set("shouldBuildScrollMap", true);
+    },
+
+    @bind
+    _handleInputInteraction(event) {
+      const preview = this.element.querySelector(".d-editor-preview-wrapper");
+
+      if (!$(preview).is(":visible")) {
+        return;
+      }
+
+      preview.removeEventListener("scroll", this._handleInputOrPreviewScroll);
+      event.target.addEventListener("scroll", this._handleInputOrPreviewScroll);
+    },
+
+    @bind
+    _handleInputOrPreviewScroll(event) {
+      this._syncScroll(
+        this._syncEditorAndPreviewScroll,
+        $(event.target),
+        $(this.element.querySelector(".d-editor-preview-wrapper"))
+      );
+    },
+
+    @bind
+    _handlePreviewInteraction(event) {
+      this.element
+        .querySelector(".d-editor-input")
+        ?.removeEventListener("scroll", this._handleInputOrPreviewScroll);
+
+      event.target?.addEventListener(
+        "scroll",
+        this._handleInputOrPreviewScroll
+      );
+    },
+
+    _syncScroll($callback, $input, $preview) {
+      if (!this.scrollMap || this.shouldBuildScrollMap) {
+        this.set("scrollMap", this._buildScrollMap($input, $preview));
+        this.set("shouldBuildScrollMap", false);
+      }
+
+      throttle(this, $callback, $input, $preview, this.scrollMap, 20);
+    },
+
+    // Adapted from https://github.com/markdown-it/markdown-it.github.io
+    _buildScrollMap($input, $preview) {
+      let sourceLikeDiv = $("<div />")
+        .css({
+          position: "absolute",
+          height: "auto",
+          visibility: "hidden",
+          width: $input[0].clientWidth,
+          "font-size": $input.css("font-size"),
+          "font-family": $input.css("font-family"),
+          "line-height": $input.css("line-height"),
+          "white-space": $input.css("white-space"),
+        })
+        .appendTo("body");
+
+      const linesMap = [];
+      let numberOfLines = 0;
+
+      $input
+        .val()
+        .split("\n")
+        .forEach((text) => {
+          linesMap.push(numberOfLines);
+
+          if (text.length === 0) {
+            numberOfLines++;
+          } else {
+            sourceLikeDiv.text(text);
+
+            let height;
+            let lineHeight;
+            height = parseFloat(sourceLikeDiv.css("height"));
+            lineHeight = parseFloat(sourceLikeDiv.css("line-height"));
+            numberOfLines += Math.round(height / lineHeight);
+          }
+        });
+
+      linesMap.push(numberOfLines);
+      sourceLikeDiv.remove();
+
+      const previewOffsetTop = $preview.offset().top;
+      const offset =
+        $preview.scrollTop() -
+        previewOffsetTop -
+        ($input.offset().top - previewOffsetTop);
+      const nonEmptyList = [];
+      const scrollMap = [];
+      for (let i = 0; i < numberOfLines; i++) {
+        scrollMap.push(-1);
+      }
+
+      nonEmptyList.push(0);
+      scrollMap[0] = 0;
+
+      $preview.find(".preview-sync-line").each((_, element) => {
+        let $element = $(element);
+        let lineNumber = $element.data("line-number");
+        let linesToTop = linesMap[lineNumber];
+        if (linesToTop !== 0) {
+          nonEmptyList.push(linesToTop);
+        }
+        scrollMap[linesToTop] = Math.round($element.offset().top + offset);
+      });
+
+      nonEmptyList.push(numberOfLines);
+      scrollMap[numberOfLines] = $preview[0].scrollHeight;
+
+      let position = 0;
+
+      for (let i = 1; i < numberOfLines; i++) {
+        if (scrollMap[i] !== -1) {
+          position++;
+          continue;
+        }
+
+        let top = nonEmptyList[position];
+        let bottom = nonEmptyList[position + 1];
+
+        scrollMap[i] = (
+          (scrollMap[bottom] * (i - top) + scrollMap[top] * (bottom - i)) /
+          (bottom - top)
+        ).toFixed(2);
+      }
+
+      return scrollMap;
+    },
+
+    @bind
+    _throttledSyncEditorAndPreviewScroll(event) {
+      const $preview = $(
+        this.element.querySelector(".d-editor-preview-wrapper")
+      );
+
+      throttle(
+        this,
+        this._syncEditorAndPreviewScroll,
+        $(event.target),
+        $preview,
+        20
+      );
+    },
+
+    _syncEditorAndPreviewScroll($input, $preview) {
+      if (!$input) {
+        return;
+      }
+
+      if ($input.scrollTop() === 0) {
+        $preview.scrollTop(0);
+        return;
+      }
+
+      const inputHeight = $input[0].scrollHeight;
+      const previewHeight = $preview[0].scrollHeight;
+
+      if ($input.height() + $input.scrollTop() + 100 > inputHeight) {
+        // cheat, special case for bottom
+        $preview.scrollTop(previewHeight);
+        return;
+      }
+
+      const scrollPosition = $input.scrollTop();
+      const factor = previewHeight / inputHeight;
+      const desired = scrollPosition * factor;
+      $preview.scrollTop(desired + 50);
+    },
+
+    _renderUnseenMentions(preview, unseen) {
+      fetchUnseenMentions({
+        names: unseen,
+        topicId: this.get("composer.topic.id"),
+        allowedNames: this.get("composer.targetRecipients")?.split(","),
+      }).then((response) => {
+        linkSeenMentions(preview, this.siteSettings);
+        this._warnMentionedGroups(preview);
+        this._warnCannotSeeMention(preview);
+        this._warnHereMention(response.here_count);
+      });
+    },
+
+    _renderUnseenHashtags(preview) {
+      let unseen;
+      const hashtagContext = this.site.hashtag_configurations["topic-composer"];
+      if (this.siteSettings.enable_experimental_hashtag_autocomplete) {
+        unseen = linkSeenHashtagsInContext(hashtagContext, preview);
+      } else {
+        unseen = linkSeenHashtags(preview);
+      }
+
+      if (unseen.length > 0) {
+        if (this.siteSettings.enable_experimental_hashtag_autocomplete) {
+          fetchUnseenHashtagsInContext(hashtagContext, unseen).then(() => {
+            linkSeenHashtagsInContext(hashtagContext, preview);
+          });
+        } else {
+          fetchUnseenHashtags(unseen).then(() => {
+            linkSeenHashtags(preview);
+          });
+        }
+      }
+    },
+
+    @debounce(2000)
+    _warnMentionedGroups(preview) {
+      schedule("afterRender", () => {
+        preview
+          .querySelectorAll(".mention-group[data-mentionable-user-count]")
+          .forEach((mention) => {
+            const { name } = mention.dataset;
+            if (
+              this.warnedGroupMentions.includes(name) ||
+              this._isInQuote(mention)
+            ) {
+              return;
+            }
+
+            this.warnedGroupMentions.push(name);
+            this.groupsMentioned({
+              name,
+              userCount: mention.dataset.mentionableUserCount,
+              maxMentions: mention.dataset.maxMentions,
+            });
+          });
+      });
+    },
+
+    // add a delay to allow for typing, so you don't open the warning right away
+    // previously we would warn after @bob even if you were about to mention @bob2
+    @debounce(2000)
+    _warnCannotSeeMention(preview) {
+      if (this.composer.draftKey === Composer.NEW_PRIVATE_MESSAGE_KEY) {
+        return;
+      }
+
+      preview.querySelectorAll(".mention[data-reason]").forEach((mention) => {
         const { name } = mention.dataset;
         if (this.warnedCannotSeeMentions.includes(name)) {
           return;
@@ -565,374 +563,436 @@ export default Component.extend(ComposerUploadUppy, {
         this.cannotSeeMention({
           name,
           reason: mention.dataset.reason,
-          notifiedCount: mention.dataset.notifiedUserCount,
-          isGroup: true,
         });
       });
-  },
 
-  _warnHereMention(hereCount) {
-    if (!hereCount || hereCount === 0) {
-      return;
-    }
+      preview
+        .querySelectorAll(".mention-group[data-reason]")
+        .forEach((mention) => {
+          const { name } = mention.dataset;
+          if (this.warnedCannotSeeMentions.includes(name)) {
+            return;
+          }
 
-    this.hereMention(hereCount);
-  },
+          this.warnedCannotSeeMentions.push(name);
+          this.cannotSeeMention({
+            name,
+            reason: mention.dataset.reason,
+            notifiedCount: mention.dataset.notifiedUserCount,
+            isGroup: true,
+          });
+        });
+    },
 
-  @bind
-  _handleImageScaleButtonClick(event) {
-    if (!event.target.classList.contains("scale-btn")) {
-      return;
-    }
-
-    const index = parseInt(
-      event.target.closest(".button-wrapper").dataset.imageIndex,
-      10
-    );
-
-    const scale = event.target.dataset.scale;
-    const matchingPlaceholder =
-      this.get("composer.reply").match(IMAGE_MARKDOWN_REGEX);
-
-    if (matchingPlaceholder) {
-      const match = matchingPlaceholder[index];
-
-      if (match) {
-        const replacement = match.replace(
-          IMAGE_MARKDOWN_REGEX,
-          `![$1|$2, ${scale}%$4]($5)`
-        );
-
-        this.appEvents.trigger(
-          "composer:replace-text",
-          matchingPlaceholder[index],
-          replacement,
-          { regex: IMAGE_MARKDOWN_REGEX, index }
-        );
+    _warnHereMention(hereCount) {
+      if (!hereCount || hereCount === 0) {
+        return;
       }
-    }
 
-    event.preventDefault();
-    return;
-  },
+      this.hereMention(hereCount);
+    },
 
-  resetImageControls(buttonWrapper) {
-    const imageResize = buttonWrapper.querySelector(".scale-btn-container");
-    const imageDelete = buttonWrapper.querySelector(".delete-image-button");
+    @bind
+    _handleImageScaleButtonClick(event) {
+      if (!event.target.classList.contains("scale-btn")) {
+        return;
+      }
 
-    const readonlyContainer = buttonWrapper.querySelector(
-      ".alt-text-readonly-container"
-    );
-    const editContainer = buttonWrapper.querySelector(
-      ".alt-text-edit-container"
-    );
+      const index = parseInt(
+        event.target.closest(".button-wrapper").dataset.imageIndex,
+        10
+      );
 
-    imageResize.removeAttribute("hidden");
-    imageDelete.removeAttribute("hidden");
+      const scale = event.target.dataset.scale;
+      const matchingPlaceholder =
+        this.get("composer.reply").match(IMAGE_MARKDOWN_REGEX);
 
-    readonlyContainer.removeAttribute("hidden");
-    buttonWrapper.removeAttribute("editing");
-    editContainer.setAttribute("hidden", "true");
-  },
+      if (matchingPlaceholder) {
+        const match = matchingPlaceholder[index];
 
-  commitAltText(buttonWrapper) {
-    const index = parseInt(buttonWrapper.getAttribute("data-image-index"), 10);
-    const matchingPlaceholder =
-      this.get("composer.reply").match(IMAGE_MARKDOWN_REGEX);
-    const match = matchingPlaceholder[index];
-    const input = buttonWrapper.querySelector("input.alt-text-input");
-    const replacement = match.replace(
-      IMAGE_MARKDOWN_REGEX,
-      `![${input.value}|$2$3$4]($5)`
-    );
+        if (match) {
+          const replacement = match.replace(
+            IMAGE_MARKDOWN_REGEX,
+            `![$1|$2, ${scale}%$4]($5)`
+          );
 
-    this.appEvents.trigger("composer:replace-text", match, replacement);
+          this.appEvents.trigger(
+            `${this.composerEventPrefix}:replace-text`,
+            matchingPlaceholder[index],
+            replacement,
+            { regex: IMAGE_MARKDOWN_REGEX, index }
+          );
+        }
+      }
 
-    this.resetImageControls(buttonWrapper);
-  },
-
-  @bind
-  _handleAltTextInputKeypress(event) {
-    if (!event.target.classList.contains("alt-text-input")) {
-      return;
-    }
-
-    if (event.key === "[" || event.key === "]") {
       event.preventDefault();
-    }
+      return;
+    },
+
+    resetImageControls(buttonWrapper) {
+      const imageResize = buttonWrapper.querySelector(".scale-btn-container");
+      const imageDelete = buttonWrapper.querySelector(".delete-image-button");
+
+      const readonlyContainer = buttonWrapper.querySelector(
+        ".alt-text-readonly-container"
+      );
+      const editContainer = buttonWrapper.querySelector(
+        ".alt-text-edit-container"
+      );
+
+      imageResize.removeAttribute("hidden");
+      imageDelete.removeAttribute("hidden");
+
+      readonlyContainer.removeAttribute("hidden");
+      buttonWrapper.removeAttribute("editing");
+      editContainer.setAttribute("hidden", "true");
+    },
+
+    commitAltText(buttonWrapper) {
+      const index = parseInt(
+        buttonWrapper.getAttribute("data-image-index"),
+        10
+      );
+      const matchingPlaceholder =
+        this.get("composer.reply").match(IMAGE_MARKDOWN_REGEX);
+      const match = matchingPlaceholder[index];
+      const input = buttonWrapper.querySelector("input.alt-text-input");
+      const replacement = match.replace(
+        IMAGE_MARKDOWN_REGEX,
+        `![${input.value}|$2$3$4]($5)`
+      );
+
+      this.appEvents.trigger(
+        `${this.composerEventPrefix}:replace-text`,
+        match,
+        replacement
+      );
+
+      this.resetImageControls(buttonWrapper);
+    },
+
+    @bind
+    _handleAltTextInputKeypress(event) {
+      if (!event.target.classList.contains("alt-text-input")) {
+        return;
+      }
+
+      if (event.key === "[" || event.key === "]") {
+        event.preventDefault();
+      }
+
+      if (event.key === "Enter") {
+        const buttonWrapper = event.target.closest(".button-wrapper");
+        this.commitAltText(buttonWrapper);
+      }
+    },
+
+    @bind
+    _handleAltTextEditButtonClick(event) {
+      if (!event.target.classList.contains("alt-text-edit-btn")) {
+        return;
+      }
+
+      const buttonWrapper = event.target.closest(".button-wrapper");
+      const imageResize = buttonWrapper.querySelector(".scale-btn-container");
+      const imageDelete = buttonWrapper.querySelector(".delete-image-button");
+
+      const readonlyContainer = buttonWrapper.querySelector(
+        ".alt-text-readonly-container"
+      );
+      const altText = readonlyContainer.querySelector(".alt-text");
+
+      const editContainer = buttonWrapper.querySelector(
+        ".alt-text-edit-container"
+      );
+      const editContainerInput = editContainer.querySelector(".alt-text-input");
+
+      buttonWrapper.setAttribute("editing", "true");
+      imageResize.setAttribute("hidden", "true");
+      imageDelete.setAttribute("hidden", "true");
+      readonlyContainer.setAttribute("hidden", "true");
+      editContainerInput.value = altText.textContent;
+      editContainer.removeAttribute("hidden");
+      editContainerInput.focus();
+      event.preventDefault();
+    },
+
+    @bind
+    _handleAltTextOkButtonClick(event) {
+      if (!event.target.classList.contains("alt-text-edit-ok")) {
+        return;
+      }
 
-    if (event.key === "Enter") {
       const buttonWrapper = event.target.closest(".button-wrapper");
       this.commitAltText(buttonWrapper);
-    }
-  },
+    },
 
-  @bind
-  _handleAltTextEditButtonClick(event) {
-    if (!event.target.classList.contains("alt-text-edit-btn")) {
-      return;
-    }
-
-    const buttonWrapper = event.target.closest(".button-wrapper");
-    const imageResize = buttonWrapper.querySelector(".scale-btn-container");
-    const imageDelete = buttonWrapper.querySelector(".delete-image-button");
-
-    const readonlyContainer = buttonWrapper.querySelector(
-      ".alt-text-readonly-container"
-    );
-    const altText = readonlyContainer.querySelector(".alt-text");
-
-    const editContainer = buttonWrapper.querySelector(
-      ".alt-text-edit-container"
-    );
-    const editContainerInput = editContainer.querySelector(".alt-text-input");
-
-    buttonWrapper.setAttribute("editing", "true");
-    imageResize.setAttribute("hidden", "true");
-    imageDelete.setAttribute("hidden", "true");
-    readonlyContainer.setAttribute("hidden", "true");
-    editContainerInput.value = altText.textContent;
-    editContainer.removeAttribute("hidden");
-    editContainerInput.focus();
-    event.preventDefault();
-  },
-
-  @bind
-  _handleAltTextOkButtonClick(event) {
-    if (!event.target.classList.contains("alt-text-edit-ok")) {
-      return;
-    }
-
-    const buttonWrapper = event.target.closest(".button-wrapper");
-    this.commitAltText(buttonWrapper);
-  },
-
-  @bind
-  _handleAltTextCancelButtonClick(event) {
-    if (!event.target.classList.contains("alt-text-edit-cancel")) {
-      return;
-    }
-
-    const buttonWrapper = event.target.closest(".button-wrapper");
-    this.resetImageControls(buttonWrapper);
-  },
-
-  @bind
-  _handleImageDeleteButtonClick(event) {
-    if (!event.target.classList.contains("delete-image-button")) {
-      return;
-    }
-    const index = parseInt(
-      event.target.closest(".button-wrapper").dataset.imageIndex,
-      10
-    );
-    const matchingPlaceholder =
-      this.get("composer.reply").match(IMAGE_MARKDOWN_REGEX);
-    this.appEvents.trigger(
-      "composer:replace-text",
-      matchingPlaceholder[index],
-      "",
-      { regex: IMAGE_MARKDOWN_REGEX, index }
-    );
-  },
-
-  _registerImageAltTextButtonClick(preview) {
-    preview.addEventListener("click", this._handleAltTextEditButtonClick);
-    preview.addEventListener("click", this._handleAltTextOkButtonClick);
-    preview.addEventListener("click", this._handleAltTextCancelButtonClick);
-    preview.addEventListener("click", this._handleImageDeleteButtonClick);
-    preview.addEventListener("keypress", this._handleAltTextInputKeypress);
-  },
-
-  @on("willDestroyElement")
-  _composerClosed() {
-    this._unbindMobileUploadButton();
-    this.appEvents.trigger("composer:will-close");
-    next(() => {
-      // need to wait a bit for the "slide down" transition of the composer
-      discourseLater(
-        () => this.appEvents.trigger("composer:closed"),
-        isTesting() ? 0 : 400
-      );
-    });
-
-    this.element
-      .querySelector(".d-editor-input")
-      ?.removeEventListener(
-        "scroll",
-        this._throttledSyncEditorAndPreviewScroll
-      );
-
-    const preview = this.element.querySelector(".d-editor-preview-wrapper");
-    preview?.removeEventListener("click", this._handleImageScaleButtonClick);
-    preview?.removeEventListener("click", this._handleAltTextEditButtonClick);
-    preview?.removeEventListener("click", this._handleAltTextOkButtonClick);
-    preview?.removeEventListener("click", this._handleAltTextCancelButtonClick);
-    preview?.removeEventListener("keypress", this._handleAltTextInputKeypress);
-  },
-
-  onExpandPopupMenuOptions(toolbarEvent) {
-    const selected = toolbarEvent.selected;
-    toolbarEvent.selectText(selected.start, selected.end - selected.start);
-    this.storeToolbarState(toolbarEvent);
-  },
-
-  showPreview() {
-    this.send("togglePreview");
-  },
-
-  _isInQuote(element) {
-    let parent = element.parentElement;
-    while (parent && !this._isPreviewRoot(parent)) {
-      if (this._isQuote(parent)) {
-        return true;
+    @bind
+    _handleAltTextCancelButtonClick(event) {
+      if (!event.target.classList.contains("alt-text-edit-cancel")) {
+        return;
       }
 
-      parent = parent.parentElement;
-    }
+      const buttonWrapper = event.target.closest(".button-wrapper");
+      this.resetImageControls(buttonWrapper);
+    },
 
-    return false;
-  },
+    @bind
+    _handleImageDeleteButtonClick(event) {
+      if (!event.target.classList.contains("delete-image-button")) {
+        return;
+      }
+      const index = parseInt(
+        event.target.closest(".button-wrapper").dataset.imageIndex,
+        10
+      );
+      const matchingPlaceholder =
+        this.get("composer.reply").match(IMAGE_MARKDOWN_REGEX);
+      this.appEvents.trigger(
+        `${this.composerEventPrefix}:replace-text`,
+        matchingPlaceholder[index],
+        "",
+        { regex: IMAGE_MARKDOWN_REGEX, index }
+      );
+    },
 
-  _isPreviewRoot(element) {
-    return (
-      element.tagName === "DIV" &&
-      element.classList.contains("d-editor-preview")
-    );
-  },
+    @bind
+    _handleImageGridButtonClick(event) {
+      if (!event.target.classList.contains("wrap-image-grid-button")) {
+        return;
+      }
 
-  _isQuote(element) {
-    return element.tagName === "ASIDE" && element.classList.contains("quote");
-  },
+      const index = parseInt(
+        event.target.closest(".button-wrapper").dataset.imageIndex,
+        10
+      );
+      const reply = this.get("composer.reply");
+      const matches = reply.match(IMAGE_MARKDOWN_REGEX);
+      const closingIndex =
+        index + parseInt(event.target.dataset.imageCount, 10) - 1;
 
-  _cursorIsOnEmptyLine() {
-    const textArea = this.element.querySelector(".d-editor-input");
-    const selectionStart = textArea.selectionStart;
-    if (selectionStart === 0) {
-      return true;
-    } else if (textArea.value.charAt(selectionStart - 1) === "\n") {
-      return true;
-    } else {
-      return false;
-    }
-  },
+      const textArea = this.element.querySelector(".d-editor-input");
+      textArea.selectionStart = reply.indexOf(matches[index]);
+      textArea.selectionEnd =
+        reply.indexOf(matches[closingIndex]) + matches[closingIndex].length;
 
-  _findMatchingUploadHandler(fileName) {
-    return this.uploadHandlers.find((handler) => {
-      const ext = handler.extensions.join("|");
-      const regex = new RegExp(`\\.(${ext})$`, "i");
-      return regex.test(fileName);
-    });
-  },
+      this.appEvents.trigger(
+        `${this.composerEventPrefix}:apply-surround`,
+        "[grid]",
+        "[/grid]",
+        "grid_surround",
+        { useBlockMode: true }
+      );
+    },
 
-  actions: {
-    importQuote(toolbarEvent) {
-      this.importQuote(toolbarEvent);
+    _registerImageAltTextButtonClick(preview) {
+      preview.addEventListener("click", this._handleAltTextEditButtonClick);
+      preview.addEventListener("click", this._handleAltTextOkButtonClick);
+      preview.addEventListener("click", this._handleAltTextCancelButtonClick);
+      preview.addEventListener("click", this._handleImageDeleteButtonClick);
+      preview.addEventListener("keypress", this._handleAltTextInputKeypress);
+      preview.addEventListener("click", this._handleImageGridButtonClick);
+    },
+
+    @on("willDestroyElement")
+    _composerClosed() {
+      this._unbindMobileUploadButton();
+      this.appEvents.trigger(`${this.composerEventPrefix}:will-close`);
+      next(() => {
+        // need to wait a bit for the "slide down" transition of the composer
+        discourseLater(
+          () => this.appEvents.trigger(`${this.composerEventPrefix}:closed`),
+          isTesting() ? 0 : 400
+        );
+      });
+
+      this.element
+        .querySelector(".d-editor-input")
+        ?.removeEventListener(
+          "scroll",
+          this._throttledSyncEditorAndPreviewScroll
+        );
+
+      const preview = this.element.querySelector(".d-editor-preview-wrapper");
+      preview?.removeEventListener("click", this._handleImageScaleButtonClick);
+      preview?.removeEventListener("click", this._handleAltTextEditButtonClick);
+      preview?.removeEventListener("click", this._handleAltTextOkButtonClick);
+      preview?.removeEventListener("click", this._handleImageDeleteButtonClick);
+      preview?.removeEventListener("click", this._handleImageGridButtonClick);
+      preview?.removeEventListener(
+        "click",
+        this._handleAltTextCancelButtonClick
+      );
+      preview?.removeEventListener(
+        "keypress",
+        this._handleAltTextInputKeypress
+      );
     },
 
     onExpandPopupMenuOptions(toolbarEvent) {
-      this.onExpandPopupMenuOptions(toolbarEvent);
+      const selected = toolbarEvent.selected;
+      toolbarEvent.selectText(selected.start, selected.end - selected.start);
+      this.storeToolbarState(toolbarEvent);
     },
 
-    togglePreview() {
-      this.togglePreview();
+    showPreview() {
+      this.send("togglePreview");
     },
 
-    extraButtons(toolbar) {
-      toolbar.addButton({
-        id: "quote",
-        group: "fontStyles",
-        icon: "far-comment",
-        sendAction: this.importQuote,
-        title: "composer.quote_post_title",
-        unshift: true,
-      });
+    _isInQuote(element) {
+      let parent = element.parentElement;
+      while (parent && !this._isPreviewRoot(parent)) {
+        if (this._isQuote(parent)) {
+          return true;
+        }
 
-      if (this.allowUpload && this.uploadIcon && !this.site.mobileView) {
-        toolbar.addButton({
-          id: "upload",
-          group: "insertions",
-          icon: this.uploadIcon,
-          title: "upload",
-          sendAction: this.showUploadModal,
-        });
+        parent = parent.parentElement;
       }
 
-      toolbar.addButton({
-        id: "options",
-        group: "extras",
-        icon: "cog",
-        title: "composer.options",
-        sendAction: this.onExpandPopupMenuOptions.bind(this),
-        popupMenu: true,
-      });
+      return false;
     },
 
-    previewUpdated(preview) {
-      // cache jquery objects for functions still using jquery
-      const $preview = $(preview);
+    _isPreviewRoot(element) {
+      return (
+        element.tagName === "DIV" &&
+        element.classList.contains("d-editor-preview")
+      );
+    },
 
-      // Paint mentions
-      const unseenMentions = linkSeenMentions(preview, this.siteSettings);
-      if (unseenMentions.length) {
-        discourseDebounce(
-          this,
-          this._renderUnseenMentions,
-          preview,
-          unseenMentions,
-          450
-        );
-      }
+    _isQuote(element) {
+      return element.tagName === "ASIDE" && element.classList.contains("quote");
+    },
 
-      this._warnMentionedGroups(preview);
-      this._warnCannotSeeMention(preview);
-
-      // Paint category, tag, and other data source hashtags
-      let unseenHashtags;
-      const hashtagContext = this.site.hashtag_configurations["topic-composer"];
-      if (this.siteSettings.enable_experimental_hashtag_autocomplete) {
-        unseenHashtags = linkSeenHashtagsInContext(hashtagContext, preview);
+    _cursorIsOnEmptyLine() {
+      const textArea = this.element.querySelector(".d-editor-input");
+      const selectionStart = textArea.selectionStart;
+      if (selectionStart === 0) {
+        return true;
+      } else if (textArea.value.charAt(selectionStart - 1) === "\n") {
+        return true;
       } else {
-        unseenHashtags = linkSeenHashtags(preview);
+        return false;
       }
-      if (unseenHashtags.length > 0) {
-        discourseDebounce(this, this._renderUnseenHashtags, preview, 450);
-      }
-
-      // Paint oneboxes
-      const paintFunc = () => {
-        const post = this.get("composer.post");
-        let refresh = false;
-
-        //If we are editing a post, we'll refresh its contents once.
-        if (post && !post.get("refreshedPost")) {
-          refresh = true;
-        }
-
-        const paintedCount = loadOneboxes(
-          preview,
-          ajax,
-          this.get("composer.topic.id"),
-          this.get("composer.category.id"),
-          this.siteSettings.max_oneboxes_per_post,
-          refresh
-        );
-
-        if (refresh && paintedCount > 0) {
-          post.set("refreshedPost", true);
-        }
-      };
-
-      discourseDebounce(this, paintFunc, 450);
-
-      // Short upload urls need resolution
-      resolveAllShortUrls(ajax, this.siteSettings, preview);
-
-      preview.addEventListener("click", this._handleImageScaleButtonClick);
-      this._registerImageAltTextButtonClick(preview);
-
-      this.trigger("previewRefreshed", preview);
-      this.afterRefresh($preview);
     },
-  },
-});
+
+    _findMatchingUploadHandler(fileName) {
+      return this.uploadHandlers.find((handler) => {
+        const ext = handler.extensions.join("|");
+        const regex = new RegExp(`\\.(${ext})$`, "i");
+        return regex.test(fileName);
+      });
+    },
+
+    actions: {
+      importQuote(toolbarEvent) {
+        this.importQuote(toolbarEvent);
+      },
+
+      onExpandPopupMenuOptions(toolbarEvent) {
+        this.onExpandPopupMenuOptions(toolbarEvent);
+      },
+
+      togglePreview() {
+        this.togglePreview();
+      },
+
+      extraButtons(toolbar) {
+        toolbar.addButton({
+          id: "quote",
+          group: "fontStyles",
+          icon: "far-comment",
+          sendAction: this.importQuote,
+          title: "composer.quote_post_title",
+          unshift: true,
+        });
+
+        if (this.allowUpload && this.uploadIcon && !this.site.mobileView) {
+          toolbar.addButton({
+            id: "upload",
+            group: "insertions",
+            icon: this.uploadIcon,
+            title: "upload",
+            sendAction: this.showUploadModal,
+          });
+        }
+
+        toolbar.addButton({
+          id: "options",
+          group: "extras",
+          icon: "cog",
+          title: "composer.options",
+          sendAction: this.onExpandPopupMenuOptions.bind(this),
+          popupMenu: true,
+        });
+      },
+
+      previewUpdated(preview) {
+        // cache jquery objects for functions still using jquery
+        const $preview = $(preview);
+
+        // Paint mentions
+        const unseenMentions = linkSeenMentions(preview, this.siteSettings);
+        if (unseenMentions.length) {
+          discourseDebounce(
+            this,
+            this._renderUnseenMentions,
+            preview,
+            unseenMentions,
+            450
+          );
+        }
+
+        this._warnMentionedGroups(preview);
+        this._warnCannotSeeMention(preview);
+
+        // Paint category, tag, and other data source hashtags
+        let unseenHashtags;
+        const hashtagContext =
+          this.site.hashtag_configurations["topic-composer"];
+        if (this.siteSettings.enable_experimental_hashtag_autocomplete) {
+          unseenHashtags = linkSeenHashtagsInContext(hashtagContext, preview);
+        } else {
+          unseenHashtags = linkSeenHashtags(preview);
+        }
+        if (unseenHashtags.length > 0) {
+          discourseDebounce(this, this._renderUnseenHashtags, preview, 450);
+        }
+
+        // Paint oneboxes
+        const paintFunc = () => {
+          const post = this.get("composer.post");
+          let refresh = false;
+
+          //If we are editing a post, we'll refresh its contents once.
+          if (post && !post.get("refreshedPost")) {
+            refresh = true;
+          }
+
+          const paintedCount = loadOneboxes(
+            preview,
+            ajax,
+            this.get("composer.topic.id"),
+            this.get("composer.category.id"),
+            this.siteSettings.max_oneboxes_per_post,
+            refresh
+          );
+
+          if (refresh && paintedCount > 0) {
+            post.set("refreshedPost", true);
+          }
+        };
+
+        discourseDebounce(this, paintFunc, 450);
+
+        // Short upload urls need resolution
+        resolveAllShortUrls(ajax, this.siteSettings, preview);
+
+        preview.addEventListener("click", this._handleImageScaleButtonClick);
+        this._registerImageAltTextButtonClick(preview);
+
+        this.trigger("previewRefreshed", preview);
+        this.afterRefresh($preview);
+      },
+    },
+  }
+);
diff --git a/app/assets/javascripts/discourse/app/components/composer-messages.hbs b/app/assets/javascripts/discourse/app/components/composer-messages.hbs
new file mode 100644
index 00000000000..202cbfc62e7
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/composer-messages.hbs
@@ -0,0 +1,14 @@
+{{#each this.messages as |message|}}
+  <ComposerMessage
+    @message={{message}}
+    @closeMessage={{action "closeMessage"}}
+    @shareModal={{fn (mut this.showShareModal) true}}
+    @switchPM={{action "switchPM"}}
+  />
+  {{#if this.showShareModal}}
+    <Modal::ShareTopic
+      @closeModal={{fn (mut this.showShareModal) false}}
+      @model={{this.shareModalData}}
+    />
+  {{/if}}
+{{/each}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/composer-messages.js b/app/assets/javascripts/discourse/app/components/composer-messages.js
index 275d1c534c5..28d7c1b5d57 100644
--- a/app/assets/javascripts/discourse/app/components/composer-messages.js
+++ b/app/assets/javascripts/discourse/app/components/composer-messages.js
@@ -1,110 +1,82 @@
 import Component from "@ember/component";
+import { classNameBindings } from "@ember-decorators/component";
 import EmberObject, { action } from "@ember/object";
 import I18n from "I18n";
 import LinkLookup from "discourse/lib/link-lookup";
 import { not } from "@ember/object/computed";
-import { scheduleOnce } from "@ember/runloop";
-import showModal from "discourse/lib/show-modal";
 import { ajax } from "discourse/lib/ajax";
+import { inject as service } from "@ember/service";
+import { tracked } from "@glimmer/tracking";
+import { INPUT_DELAY } from "discourse-common/config/environment";
+import { debounce } from "discourse-common/utils/decorators";
 
 let _messagesCache = {};
-let _recipient_names = [];
 
-export default Component.extend({
-  classNameBindings: [":composer-popup-container", "hidden"],
-  checkedMessages: false,
-  messages: null,
-  messagesByTemplate: null,
-  queuedForTyping: null,
-  _lastSimilaritySearch: null,
-  _similarTopicsMessage: null,
-  _yourselfConfirm: null,
-  similarTopics: null,
-  usersNotSeen: null,
+@classNameBindings(":composer-popup-container", "hidden")
+export default class ComposerMessages extends Component {
+  @service modal;
+  @tracked showShareModal;
 
-  hidden: not("composer.viewOpenOrFullscreen"),
+  checkedMessages = false;
+  messages = null;
+  messagesByTemplate = null;
+  queuedForTyping = null;
+  similarTopics = null;
+  usersNotSeen = null;
+  recipientNames = [];
+
+  @not("composer.viewOpenOrFullscreen") hidden;
+
+  _lastSimilaritySearch = null;
+  _similarTopicsMessage = null;
 
   didInsertElement() {
-    this._super(...arguments);
+    super.didInsertElement(...arguments);
+
     this.appEvents.on("composer:typed-reply", this, this._typedReply);
     this.appEvents.on("composer:opened", this, this._findMessages);
     this.appEvents.on("composer:find-similar", this, this._findSimilar);
     this.appEvents.on("composer-messages:close", this, this._closeTop);
     this.appEvents.on("composer-messages:create", this, this._create);
-    scheduleOnce("afterRender", this, this.reset);
-  },
+    this.reset();
+  }
 
   willDestroyElement() {
+    super.willDestroyElement(...arguments);
+
     this.appEvents.off("composer:typed-reply", this, this._typedReply);
     this.appEvents.off("composer:opened", this, this._findMessages);
     this.appEvents.off("composer:find-similar", this, this._findSimilar);
     this.appEvents.off("composer-messages:close", this, this._closeTop);
     this.appEvents.off("composer-messages:create", this, this._create);
-  },
+  }
 
   _closeTop() {
-    const messages = this.messages;
-    messages.popObject();
-    this.set("messageCount", messages.get("length"));
-  },
+    if (this.isDestroying || this.isDestroyed) {
+      return;
+    }
+
+    this.messages.popObject();
+    this.set("messageCount", this.messages.length);
+  }
 
   _removeMessage(message) {
-    const messages = this.messages;
-    messages.removeObject(message);
-    this.set("messageCount", messages.get("length"));
-  },
+    this.messages.removeObject(message);
+    this.set("messageCount", this.messages.length);
+  }
 
-  @action
-  closeMessage(message, event) {
-    event?.preventDefault();
-    this._removeMessage(message);
-  },
+  _create(info) {
+    if (this.isDestroying || this.isDestroyed) {
+      return;
+    }
 
-  actions: {
-    hideMessage(message) {
-      this._removeMessage(message);
-      // kind of hacky but the visibility depends on this
-      this.messagesByTemplate[message.get("templateName")] = undefined;
-    },
-
-    popup(message) {
-      const messagesByTemplate = this.messagesByTemplate;
-      const templateName = message.get("templateName");
-
-      if (!messagesByTemplate[templateName]) {
-        const messages = this.messages;
-        messages.pushObject(message);
-        this.set("messageCount", messages.get("length"));
-        messagesByTemplate[templateName] = message;
-      }
-    },
-
-    shareModal() {
-      const { topic } = this.composer;
-      const controller = showModal("share-topic", { model: topic.category });
-      controller.setProperties({
-        allowInvites:
-          topic.details.can_invite_to &&
-          !topic.archived &&
-          !topic.closed &&
-          !topic.deleted,
-        topic,
-      });
-    },
-
-    switchPM(message) {
-      this.composer.set("action", "privateMessage");
-      this.composer.set("targetRecipients", message.reply_username);
-      this._removeMessage(message);
-    },
-  },
+    this.reset();
+    this.popup(EmberObject.create(info));
+  }
 
   // Resets all active messages.
   // For example if composing a new post.
   reset() {
-    if (this.isDestroying || this.isDestroyed) {
-      return;
-    }
     this.setProperties({
       messages: [],
       messagesByTemplate: {},
@@ -112,106 +84,120 @@ export default Component.extend({
       checkedMessages: false,
       similarTopics: [],
     });
-  },
+  }
 
   // Called after the user has typed a reply.
   // Some messages only get shown after being typed.
-  _typedReply() {
+  @debounce(INPUT_DELAY)
+  async _typedReply() {
     if (this.isDestroying || this.isDestroyed) {
       return;
     }
 
-    const composer = this.composer;
-    if (composer.get("privateMessage")) {
-      const recipients = composer.targetRecipientsArray;
-      const recipient_names = recipients
+    for (const msg of this.queuedForTyping) {
+      if (this.composer.whisper && msg.hide_if_whisper) {
+        return;
+      }
+
+      this.popup(msg);
+    }
+
+    if (this.composer.privateMessage) {
+      if (
+        this.composer.targetRecipientsArray.length > 0 &&
+        this.composer.targetRecipientsArray.every(
+          (r) => r.name === this.currentUser.username
+        )
+      ) {
+        const message = this.composer.store.createRecord("composer-message", {
+          id: "yourself_confirm",
+          templateName: "education",
+          title: I18n.t("composer.yourself_confirm.title"),
+          body: I18n.t("composer.yourself_confirm.body"),
+        });
+
+        this.popup(message);
+      }
+
+      const recipient_names = this.composer.targetRecipientsArray
         .filter((r) => r.type === "user")
         .map(({ name }) => name);
 
       if (
         recipient_names.length > 0 &&
-        recipient_names.length !== _recipient_names.length &&
-        !recipient_names.every((v, i) => v === _recipient_names[i])
+        recipient_names.length !== this.recipientNames.length &&
+        !recipient_names.every((v, i) => v === this.recipientNames[i])
       ) {
-        _recipient_names = recipient_names;
+        this.recipientNames = recipient_names;
 
-        ajax(`/composer_messages/user_not_seen_in_a_while`, {
-          type: "GET",
-          data: {
-            usernames: recipient_names,
-          },
-        }).then((response) => {
-          if (
-            response.user_count > 0 &&
-            this.get("usersNotSeen") !== response.usernames.join("-")
-          ) {
-            this.set("usersNotSeen", response.usernames.join("-"));
-            this.messagesByTemplate["education"] = undefined;
-
-            let usernames = [];
-            response.usernames.forEach((username, index) => {
-              usernames[
-                index
-              ] = `<a class='mention' href='/u/${username}'>@${username}</a>`;
-            });
-
-            let body_key = "composer.user_not_seen_in_a_while.single";
-            if (response.user_count > 1) {
-              body_key = "composer.user_not_seen_in_a_while.multiple";
-            }
-            const message = composer.store.createRecord("composer-message", {
-              id: "user-not-seen",
-              templateName: "education",
-              body: I18n.t(body_key, {
-                usernames: usernames.join(", "),
-                time_ago: response.time_ago,
-              }),
-            });
-            this.send("popup", message);
+        const response = await ajax(
+          `/composer_messages/user_not_seen_in_a_while`,
+          {
+            type: "GET",
+            data: {
+              usernames: recipient_names,
+            },
           }
-        });
-      }
+        );
 
-      if (
-        recipients.length > 0 &&
-        recipients.every((r) => r.name === this.currentUser.get("username"))
-      ) {
-        const message =
-          this._yourselfConfirm ||
-          composer.store.createRecord("composer-message", {
-            id: "yourself_confirm",
-            templateName: "education",
-            title: I18n.t("composer.yourself_confirm.title"),
-            body: I18n.t("composer.yourself_confirm.body"),
+        if (this.isDestroying || this.isDestroyed) {
+          return;
+        }
+
+        if (
+          response.user_count > 0 &&
+          this.usersNotSeen !== response.usernames.join("-")
+        ) {
+          this.set("usersNotSeen", response.usernames.join("-"));
+          this.messagesByTemplate["education"] = undefined;
+
+          let usernames = [];
+          response.usernames.forEach((username, index) => {
+            usernames[
+              index
+            ] = `<a class='mention' href='/u/${username}'>@${username}</a>`;
           });
-        this.send("popup", message);
+
+          let body_key;
+          if (response.user_count === 1) {
+            body_key = "composer.user_not_seen_in_a_while.single";
+          } else {
+            body_key = "composer.user_not_seen_in_a_while.multiple";
+          }
+
+          const message = this.composer.store.createRecord("composer-message", {
+            id: "user-not-seen",
+            templateName: "education",
+            body: I18n.t(body_key, {
+              usernames: usernames.join(", "),
+              time_ago: response.time_ago,
+            }),
+          });
+
+          this.popup(message);
+        }
       }
     }
+  }
 
-    this.queuedForTyping.forEach((msg) => {
-      if (composer.whisper && msg.hide_if_whisper) {
-        return;
-      }
-      this.send("popup", msg);
-    });
-  },
-
-  _create(info) {
-    this.reset();
-    this.send("popup", EmberObject.create(info));
-  },
-
-  _findSimilar() {
-    const composer = this.composer;
-
-    // We don't care about similar topics unless creating a topic
-    if (!composer.get("creatingTopic")) {
+  async _findSimilar() {
+    if (this.isDestroying || this.isDestroyed) {
       return;
     }
 
-    // TODO pass the 200 in from somewhere
-    const raw = (composer.get("reply") || "").slice(0, 200);
-    const title = composer.get("title") || "";
+    // We don't care about similar topics unless creating a topic
+    if (!this.composer.creatingTopic) {
+      return;
+    }
+
+    // We don't care about similar topics when creating with a form template
+    if (this.composer?.category?.form_template_ids.length > 0) {
+      return;
+    }
+
+    // TODO: pass the 200 in from somewhere
+    const raw = (this.composer.reply || "").slice(0, 200);
+    const title = this.composer.title || "";
 
     // Ensure we have at least a title
     if (title.length < this.siteSettings.min_title_similar_length) {
@@ -223,79 +209,130 @@ export default Component.extend({
     if (concat === this._lastSimilaritySearch) {
       return;
     }
-    this._lastSimilaritySearch = concat;
 
-    const similarTopics = this.similarTopics;
-    const message =
-      this._similarTopicsMessage ||
-      composer.store.createRecord("composer-message", {
+    this._lastSimilaritySearch = concat;
+    this._similarTopicsMessage ||= this.composer.store.createRecord(
+      "composer-message",
+      {
         id: "similar_topics",
         templateName: "similar-topics",
         extraClass: "similar-topics",
-      });
-
-    this._similarTopicsMessage = message;
-
-    composer.store.find("similar-topic", { title, raw }).then((topics) => {
-      similarTopics.clear();
-      similarTopics.pushObjects(topics.get("content"));
-
-      if (similarTopics.get("length") > 0) {
-        message.set("similarTopics", similarTopics);
-        this.send("popup", message);
-      } else if (message && !(this.isDestroyed || this.isDestroying)) {
-        this.send("hideMessage", message);
       }
+    );
+
+    const topics = await this.composer.store.find("similar-topic", {
+      title,
+      raw,
     });
-  },
+
+    if (this.isDestroying || this.isDestroyed) {
+      return;
+    }
+
+    this.similarTopics.clear();
+    this.similarTopics.pushObjects(topics.content);
+
+    if (this.similarTopics.length > 0) {
+      this._similarTopicsMessage.set("similarTopics", this.similarTopics);
+      this.popup(this._similarTopicsMessage);
+    } else if (this._similarTopicsMessage) {
+      this.hideMessage(this._similarTopicsMessage);
+    }
+  }
 
   // Figure out if there are any messages that should be displayed above the composer.
-  _findMessages() {
+  async _findMessages() {
+    if (this.isDestroying || this.isDestroyed) {
+      return;
+    }
+
     if (this.checkedMessages) {
       return;
     }
 
-    const composer = this.composer;
-    const args = { composer_action: composer.get("action") };
-    const topicId = composer.get("topic.id");
-    const postId = composer.get("post.id");
+    const args = { composer_action: this.composer.action };
+    const topicId = this.composer.topic?.id;
+    const postId = this.composer.post?.id;
 
     if (topicId) {
       args.topic_id = topicId;
     }
+
     if (postId) {
       args.post_id = postId;
     }
 
     const cacheKey = `${args.composer_action}${args.topic_id}${args.post_id}`;
 
-    const processMessages = (messages) => {
+    let messages;
+    if (_messagesCache.cacheKey === cacheKey) {
+      messages = _messagesCache.messages;
+    } else {
+      messages = await this.composer.store.find("composer-message", args);
       if (this.isDestroying || this.isDestroyed) {
         return;
       }
 
-      // Checking composer messages on replies can give us a list of links to check for
-      // duplicates
-      if (messages.extras && messages.extras.duplicate_lookup) {
-        this.addLinkLookup(new LinkLookup(messages.extras.duplicate_lookup));
-      }
-
-      this.set("checkedMessages", true);
-      const queuedForTyping = this.queuedForTyping;
-      messages.forEach((msg) =>
-        msg.wait_for_typing
-          ? queuedForTyping.addObject(msg)
-          : this.send("popup", msg)
-      );
-    };
-
-    if (_messagesCache.cacheKey === cacheKey) {
-      processMessages(_messagesCache.messages);
-    } else {
-      composer.store.find("composer-message", args).then((messages) => {
-        _messagesCache = { messages, cacheKey };
-        processMessages(messages);
-      });
+      _messagesCache = { messages, cacheKey };
     }
-  },
-});
+
+    // Checking composer messages on replies can give us a list of links to check for
+    // duplicates
+    if (messages.extras?.duplicate_lookup) {
+      this.addLinkLookup(new LinkLookup(messages.extras.duplicate_lookup));
+    }
+
+    this.set("checkedMessages", true);
+
+    messages.forEach((msg) => {
+      if (msg.wait_for_typing) {
+        this.queuedForTyping.addObject(msg);
+      } else {
+        this.popup(msg);
+      }
+    });
+  }
+
+  @action
+  closeMessage(message, event) {
+    event?.preventDefault();
+    this._removeMessage(message);
+  }
+
+  @action
+  hideMessage(message) {
+    this._removeMessage(message);
+
+    // kind of hacky but the visibility depends on this
+    this.messagesByTemplate[message.templateName] = undefined;
+  }
+
+  @action
+  popup(message) {
+    if (!this.messagesByTemplate[message.templateName]) {
+      this.messages.pushObject(message);
+      this.set("messageCount", this.messages.length);
+      this.messagesByTemplate[message.templateName] = message;
+    }
+  }
+
+  get shareModalData() {
+    const { topic } = this.composer;
+    return {
+      topic,
+      category: topic.category,
+      allowInvites:
+        topic.details.can_invite_to &&
+        !topic.archived &&
+        !topic.closed &&
+        !topic.deleted,
+    };
+  }
+
+  @action
+  switchPM(message) {
+    this.composer.set("action", "privateMessage");
+    this.composer.set("targetRecipients", message.reply_username);
+    this._removeMessage(message);
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/templates/components/composer-title.hbs b/app/assets/javascripts/discourse/app/components/composer-title.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/composer-title.hbs
rename to app/assets/javascripts/discourse/app/components/composer-title.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/composer-toggles.hbs b/app/assets/javascripts/discourse/app/components/composer-toggles.hbs
similarity index 86%
rename from app/assets/javascripts/discourse/app/templates/components/composer-toggles.hbs
rename to app/assets/javascripts/discourse/app/components/composer-toggles.hbs
index 4fc18c2a428..eb94d61a518 100644
--- a/app/assets/javascripts/discourse/app/templates/components/composer-toggles.hbs
+++ b/app/assets/javascripts/discourse/app/components/composer-toggles.hbs
@@ -1,9 +1,7 @@
 <div class="composer-controls">
-  <PluginOutlet
-    @name="before-composer-toggles"
-    @tagName="span"
-    @connectorTagName="div"
-  />
+  <span>
+    <PluginOutlet @name="before-composer-toggles" @connectorTagName="div" />
+  </span>
 
   {{#if this.site.mobileView}}
     <DButton
diff --git a/app/assets/javascripts/discourse/app/templates/components/composer-user-selector.hbs b/app/assets/javascripts/discourse/app/components/composer-user-selector.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/composer-user-selector.hbs
rename to app/assets/javascripts/discourse/app/components/composer-user-selector.hbs
diff --git a/app/assets/javascripts/discourse/app/components/conditional-in-element.hbs b/app/assets/javascripts/discourse/app/components/conditional-in-element.hbs
new file mode 100644
index 00000000000..699f907e802
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/conditional-in-element.hbs
@@ -0,0 +1,9 @@
+{{#if @inline}}
+  {{yield}}
+{{else if @element}}
+  {{#if @append}}
+    {{#in-element @element insertBefore=null}}{{yield}}{{/in-element}}
+  {{else}}
+    {{#in-element @element}}{{yield}}{{/in-element}}
+  {{/if}}
+{{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/conditional-loading-section.hbs b/app/assets/javascripts/discourse/app/components/conditional-loading-section.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/conditional-loading-section.hbs
rename to app/assets/javascripts/discourse/app/components/conditional-loading-section.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/conditional-loading-spinner.hbs b/app/assets/javascripts/discourse/app/components/conditional-loading-spinner.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/conditional-loading-spinner.hbs
rename to app/assets/javascripts/discourse/app/components/conditional-loading-spinner.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/cook-text.hbs b/app/assets/javascripts/discourse/app/components/cook-text.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/cook-text.hbs
rename to app/assets/javascripts/discourse/app/components/cook-text.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/copy-button.hbs b/app/assets/javascripts/discourse/app/components/copy-button.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/copy-button.hbs
rename to app/assets/javascripts/discourse/app/components/copy-button.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/count-i18n.hbs b/app/assets/javascripts/discourse/app/components/count-i18n.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/count-i18n.hbs
rename to app/assets/javascripts/discourse/app/components/count-i18n.hbs
diff --git a/app/assets/javascripts/discourse/app/components/count-i18n.js b/app/assets/javascripts/discourse/app/components/count-i18n.js
index 6fa2ca3141a..884d1e06667 100644
--- a/app/assets/javascripts/discourse/app/components/count-i18n.js
+++ b/app/assets/javascripts/discourse/app/components/count-i18n.js
@@ -8,9 +8,14 @@ export default Component.extend({
 
   didReceiveAttrs() {
     this._super(...arguments);
-    this.set(
-      "i18nCount",
-      htmlSafe(I18n.t(this.key + (this.suffix || ""), { count: this.count }))
-    );
+
+    let fullKey = this.key + (this.suffix || "");
+    if (
+      this.currentUser?.new_new_view_enabled &&
+      fullKey === "topic_count_new"
+    ) {
+      fullKey = "topic_count_latest";
+    }
+    this.set("i18nCount", htmlSafe(I18n.t(fullKey, { count: this.count })));
   },
 });
diff --git a/app/assets/javascripts/discourse/app/templates/components/create-invite-uploader.hbs b/app/assets/javascripts/discourse/app/components/create-invite-uploader.hbs
similarity index 91%
rename from app/assets/javascripts/discourse/app/templates/components/create-invite-uploader.hbs
rename to app/assets/javascripts/discourse/app/components/create-invite-uploader.hbs
index 39521928255..698c898d6e8 100644
--- a/app/assets/javascripts/discourse/app/templates/components/create-invite-uploader.hbs
+++ b/app/assets/javascripts/discourse/app/components/create-invite-uploader.hbs
@@ -7,4 +7,5 @@
     submitDisabled=this.submitDisabled
     startUpload=(action "startUpload")
   )
+  this.setElement
 }}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/create-invite-uploader.js b/app/assets/javascripts/discourse/app/components/create-invite-uploader.js
index 17d29e01d4e..dea920d2c92 100644
--- a/app/assets/javascripts/discourse/app/components/create-invite-uploader.js
+++ b/app/assets/javascripts/discourse/app/components/create-invite-uploader.js
@@ -29,4 +29,10 @@ export default Component.extend(UppyUploadMixin, {
   startUpload() {
     this._startUpload();
   },
+
+  @action
+  setElement(element) {
+    this.set("fileInputEl", element);
+    this._initialize();
+  },
 });
diff --git a/app/assets/javascripts/discourse/app/templates/components/create-topic-button.hbs b/app/assets/javascripts/discourse/app/components/create-topic-button.hbs
similarity index 91%
rename from app/assets/javascripts/discourse/app/templates/components/create-topic-button.hbs
rename to app/assets/javascripts/discourse/app/components/create-topic-button.hbs
index 76560659373..a18e98b54fd 100644
--- a/app/assets/javascripts/discourse/app/templates/components/create-topic-button.hbs
+++ b/app/assets/javascripts/discourse/app/components/create-topic-button.hbs
@@ -7,4 +7,5 @@
     @disabled={{this.disabled}}
     @label={{this.label}}
   />
+  {{yield}}
 {{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/create-topics-notice.js b/app/assets/javascripts/discourse/app/components/create-topics-notice.js
deleted file mode 100644
index da6f089ef6a..00000000000
--- a/app/assets/javascripts/discourse/app/components/create-topics-notice.js
+++ /dev/null
@@ -1,118 +0,0 @@
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
-import Component from "@ember/component";
-import I18n from "I18n";
-import LivePostCounts from "discourse/models/live-post-counts";
-import { alias } from "@ember/object/computed";
-import { htmlSafe } from "@ember/template";
-import { inject as service } from "@ember/service";
-
-export default Component.extend({
-  classNameBindings: ["hidden:hidden", ":create-topics-notice"],
-
-  enabled: false,
-  router: service(),
-
-  publicTopicCount: null,
-  publicPostCount: null,
-
-  requiredTopics: 5,
-  requiredPosts: alias("siteSettings.tl1_requires_read_posts"),
-
-  init() {
-    this._super(...arguments);
-    if (this.shouldSee) {
-      let topicCount = 0,
-        postCount = 0;
-
-      // Use data we already have before fetching live stats
-      this.site.get("categories").forEach((c) => {
-        if (!c.get("read_restricted")) {
-          topicCount += c.get("topic_count");
-          postCount += c.get("post_count");
-        }
-      });
-
-      if (topicCount < this.requiredTopics || postCount < this.requiredPosts) {
-        this.set("enabled", true);
-        this.fetchLiveStats();
-      }
-    }
-  },
-
-  @discourseComputed(
-    "siteSettings.show_create_topics_notice",
-    "router.currentRouteName"
-  )
-  shouldSee(showCreateTopicsNotice, currentRouteName) {
-    return (
-      this.currentUser?.get("admin") &&
-      showCreateTopicsNotice &&
-      !this.site.get("wizard_required") &&
-      !currentRouteName.startsWith("wizard")
-    );
-  },
-
-  @discourseComputed(
-    "enabled",
-    "shouldSee",
-    "publicTopicCount",
-    "publicPostCount"
-  )
-  hidden(enabled, shouldSee, publicTopicCount, publicPostCount) {
-    return (
-      !enabled ||
-      !shouldSee ||
-      publicTopicCount == null ||
-      publicPostCount == null
-    );
-  },
-
-  @discourseComputed(
-    "publicTopicCount",
-    "publicPostCount",
-    "topicTrackingState.incomingCount"
-  )
-  message(publicTopicCount, publicPostCount) {
-    let msg = null;
-
-    if (
-      publicTopicCount < this.requiredTopics &&
-      publicPostCount < this.requiredPosts
-    ) {
-      msg = "too_few_topics_and_posts_notice_MF";
-    } else if (publicTopicCount < this.requiredTopics) {
-      msg = "too_few_topics_notice_MF";
-    } else {
-      msg = "too_few_posts_notice_MF";
-    }
-
-    return htmlSafe(
-      I18n.messageFormat(msg, {
-        requiredTopics: this.requiredTopics,
-        requiredPosts: this.requiredPosts,
-        currentTopics: publicTopicCount,
-        currentPosts: publicPostCount,
-      })
-    );
-  },
-
-  @observes("topicTrackingState.incomingCount")
-  fetchLiveStats() {
-    if (!this.enabled) {
-      return;
-    }
-
-    LivePostCounts.find().then((stats) => {
-      if (stats) {
-        this.set("publicTopicCount", stats.get("public_topic_count"));
-        this.set("publicPostCount", stats.get("public_post_count"));
-        if (
-          this.publicTopicCount >= this.requiredTopics &&
-          this.publicPostCount >= this.requiredPosts
-        ) {
-          this.set("enabled", false); // No more checks
-        }
-      }
-    });
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/components/custom-html-container.js b/app/assets/javascripts/discourse/app/components/custom-html-container.js
deleted file mode 100644
index 87d5ddb040f..00000000000
--- a/app/assets/javascripts/discourse/app/components/custom-html-container.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Component from "@ember/component";
-
-export default Component.extend({});
diff --git a/app/assets/javascripts/discourse/app/components/custom-html.js b/app/assets/javascripts/discourse/app/components/custom-html.js
index 3fdab2dc364..e8703a19898 100644
--- a/app/assets/javascripts/discourse/app/components/custom-html.js
+++ b/app/assets/javascripts/discourse/app/components/custom-html.js
@@ -1,6 +1,8 @@
 import Component from "@ember/component";
 import { getCustomHTML } from "discourse/helpers/custom-html";
 import { getOwner } from "discourse-common/lib/get-owner";
+import { hbs } from "ember-cli-htmlbars";
+import deprecated from "discourse-common/lib/deprecated";
 
 export default Component.extend({
   triggerAppEvent: null,
@@ -12,11 +14,15 @@ export default Component.extend({
 
     if (html) {
       this.set("html", html);
-      this.set("layoutName", "components/custom-html-container");
+      this.set("layout", hbs`{{this.html}}`);
     } else {
       const template = getOwner(this).lookup(`template:${name}`);
       if (template) {
-        this.set("layoutName", name);
+        deprecated(
+          "Defining an hbs template for CustomHTML rendering is deprecated. Use plugin outlets instead.",
+          { id: "discourse.custom_html_template" }
+        );
+        this.set("layout", template);
       }
     }
   },
diff --git a/app/assets/javascripts/discourse/app/components/d-button.js b/app/assets/javascripts/discourse/app/components/d-button.gjs
similarity index 66%
rename from app/assets/javascripts/discourse/app/components/d-button.js
rename to app/assets/javascripts/discourse/app/components/d-button.gjs
index 248c129e5c1..207958d0fc4 100644
--- a/app/assets/javascripts/discourse/app/components/d-button.js
+++ b/app/assets/javascripts/discourse/app/components/d-button.gjs
@@ -1,9 +1,14 @@
 import { inject as service } from "@ember/service";
 import { action } from "@ember/object";
 import { empty, equal, notEmpty } from "@ember/object/computed";
+import { htmlSafe } from "@ember/template";
 import GlimmerComponentWithDeprecatedParentView from "discourse/components/glimmer-component-with-deprecated-parent-view";
+import icon from "discourse-common/helpers/d-icon";
 import deprecated from "discourse-common/lib/deprecated";
+import concatClass from "discourse/helpers/concat-class";
 import DiscourseURL from "discourse/lib/url";
+import or from "truth-helpers/helpers/or";
+import { on } from "@ember/modifier";
 import I18n from "I18n";
 
 const ACTION_AS_STRING_DEPRECATION_ARGS = [
@@ -12,6 +17,62 @@ const ACTION_AS_STRING_DEPRECATION_ARGS = [
 ];
 
 export default class DButton extends GlimmerComponentWithDeprecatedParentView {
+  <template>
+    {{! template-lint-disable no-pointer-down-event-binding }}
+    <button
+      {{! For legacy compatibility. Prefer passing class as attributes. }}
+      class={{concatClass
+        @class
+        (if @isLoading "is-loading")
+        (if this.btnLink "btn-link" "btn")
+        (if this.noText "no-text")
+        this.btnType
+      }}
+      {{! For legacy compatibility. Prefer passing these as html attributes. }}
+      id={{@id}}
+      form={{@form}}
+      aria-controls={{@ariaControls}}
+      aria-expanded={{this.computedAriaExpanded}}
+      tabindex={{@tabindex}}
+      type={{or @type "button"}}
+      ...attributes
+      disabled={{this.isDisabled}}
+      title={{this.computedTitle}}
+      aria-label={{this.computedAriaLabel}}
+      {{on "keydown" this.keyDown}}
+      {{on "click" this.click}}
+      {{on "mousedown" this.mouseDown}}
+    >
+      {{#if @isLoading}}
+        {{~icon "spinner" class="loading-icon"~}}
+      {{else}}
+        {{#if @icon}}
+          {{#if @ariaHidden}}
+            <span aria-hidden="true">
+              {{~icon @icon~}}
+            </span>
+          {{else}}
+            {{~icon @icon~}}
+          {{/if}}
+        {{/if}}
+      {{/if}}
+
+      {{~#if this.computedLabel~}}
+        <span class="d-button-label">
+          {{~htmlSafe this.computedLabel~}}
+          {{~#if @ellipsis~}}
+            &hellip;
+          {{~/if~}}
+        </span>
+      {{~else~}}
+        &#8203;
+        {{! Zero-width space character, so icon-only button height = regular button height }}
+      {{~/if~}}
+
+      {{yield}}
+    </button>
+  </template>
+
   @service router;
 
   @notEmpty("args.icon")
diff --git a/app/assets/javascripts/discourse/app/components/d-document.js b/app/assets/javascripts/discourse/app/components/d-document.js
index 7e8fef1bd3a..9cdda954f43 100644
--- a/app/assets/javascripts/discourse/app/components/d-document.js
+++ b/app/assets/javascripts/discourse/app/components/d-document.js
@@ -50,15 +50,9 @@ export default Component.extend({
     }
 
     let count = pluginCounterFunctions.reduce((sum, fn) => sum + fn(), 0);
-    if (this.currentUser.redesigned_user_menu_enabled) {
-      count += this.currentUser.all_unread_notifications_count;
-      if (this.currentUser.unseen_reviewable_count) {
-        count += this.currentUser.unseen_reviewable_count;
-      }
-    } else {
-      count +=
-        this.currentUser.unread_notifications +
-        this.currentUser.unread_high_priority_notifications;
+    count += this.currentUser.all_unread_notifications_count;
+    if (this.currentUser.unseen_reviewable_count) {
+      count += this.currentUser.unseen_reviewable_count;
     }
     this.documentTitle.updateNotificationCount(count, { forced: opts?.forced });
   },
diff --git a/app/assets/javascripts/discourse/app/components/d-editor.hbs b/app/assets/javascripts/discourse/app/components/d-editor.hbs
new file mode 100644
index 00000000000..072b0a70175
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/d-editor.hbs
@@ -0,0 +1,104 @@
+<div
+  class="d-editor-container
+    {{if this.showFormTemplateForm 'has-form-template'}}"
+>
+  <div class="d-editor-textarea-column">
+    {{yield}}
+    {{#if this.showFormTemplateForm}}
+      {{#if (gt @formTemplateIds.length 1)}}
+        <FormTemplateChooser
+          @class="composer-select-form-template"
+          @filteredIds={{@formTemplateIds}}
+          @value={{this.selectedFormTemplateId}}
+          @onChange={{this.updateSelectedFormTemplateId}}
+          @options={{hash maximum=1}}
+        />
+      {{/if}}
+      <form id="form-template-form">
+        <FormTemplateField::Wrapper @id={{this.selectedFormTemplateId}} />
+      </form>
+    {{else}}
+      <div
+        class="d-editor-textarea-wrapper
+          {{if this.disabled 'disabled'}}
+          {{if this.isEditorFocused 'in-focus'}}"
+      >
+        <div class="d-editor-button-bar" role="toolbar">
+          {{#each this.toolbar.groups as |group|}}
+            {{#each group.buttons as |b|}}
+              {{#if b.popupMenu}}
+                <ToolbarPopupMenuOptions
+                  @content={{this.popupMenuOptions}}
+                  @onChange={{this.onPopupMenuAction}}
+                  @onOpen={{action b.action b}}
+                  @class={{b.className}}
+                  @tabindex={{-1}}
+                  @onKeydown={{this.rovingButtonBar}}
+                  @options={{hash icon=b.icon focusAfterOnChange=false}}
+                />
+              {{else}}
+                <DButton
+                  @action={{b.action}}
+                  @type="button"
+                  @actionParam={{b}}
+                  @translatedTitle={{b.title}}
+                  @label={{b.label}}
+                  @icon={{b.icon}}
+                  @class={{b.className}}
+                  @preventFocus={{b.preventFocus}}
+                  @tabindex={{b.tabindex}}
+                  @onKeyDown={{this.rovingButtonBar}}
+                />
+              {{/if}}
+            {{/each}}
+          {{/each}}
+        </div>
+
+        <ConditionalLoadingSpinner @condition={{this.loading}} />
+        <DTextarea
+          @autocomplete="off"
+          @tabindex={{this.tabindex}}
+          @value={{this.value}}
+          @class="d-editor-input"
+          @placeholder={{this.placeholderTranslated}}
+          @aria-label={{this.placeholderTranslated}}
+          @disabled={{this.disabled}}
+          @input={{this.change}}
+          @focusIn={{action "focusIn"}}
+          @focusOut={{action "focusOut"}}
+        />
+        <PopupInputTip @validation={{this.validation}} />
+        <PluginOutlet
+          @name="after-d-editor"
+          @connectorTagName="div"
+          @outletArgs={{this.outletArgs}}
+        />
+      </div>
+    {{/if}}
+  </div>
+
+  <div
+    class="d-editor-preview-wrapper {{if this.forcePreview 'force-preview'}}"
+  >
+    <div class="d-editor-preview">
+      {{#unless this.siteSettings.enable_diffhtml_preview}}
+        {{html-safe this.preview}}
+      {{/unless}}
+    </div>
+    <span class="d-editor-plugin">
+      <PluginOutlet
+        @name="editor-preview"
+        @connectorTagName="div"
+        @outletArgs={{this.outletArgs}}
+      />
+    </span>
+  </div>
+</div>
+
+<EmojiPicker
+  @isActive={{this.emojiPickerIsActive}}
+  @isEditorFocused={{this.isEditorFocused}}
+  @initialFilter={{this.emojiFilter}}
+  @emojiSelected={{action "emojiSelected"}}
+  @onEmojiPickerClose={{this.onEmojiPickerClose}}
+/>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/d-editor.js b/app/assets/javascripts/discourse/app/components/d-editor.js
index a622955b4c6..019a6780964 100644
--- a/app/assets/javascripts/discourse/app/components/d-editor.js
+++ b/app/assets/javascripts/discourse/app/components/d-editor.js
@@ -1,4 +1,5 @@
 import { ajax } from "discourse/lib/ajax";
+import { PLATFORM_KEY_MODIFIER } from "discourse/lib/keyboard-shortcuts";
 import {
   caretPosition,
   inCodeBlock,
@@ -33,7 +34,7 @@ import showModal from "discourse/lib/show-modal";
 import { siteDir } from "discourse/lib/text-direction";
 import { translations } from "pretty-text/emoji/data";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
-import { action } from "@ember/object";
+import { action, computed } from "@ember/object";
 import TextareaTextManipulation, {
   getHead,
 } from "discourse/mixins/textarea-text-manipulation";
@@ -180,15 +181,14 @@ class Toolbar {
 
     const title = I18n.t(button.title || `composer.${button.id}_title`);
     if (button.shortcut) {
-      const mac = /Mac|iPod|iPhone|iPad/.test(navigator.platform);
-      const mod = mac ? "Meta" : "Ctrl";
-
-      const shortcutTitle = `${translateModKey(mod + "+")}${translateModKey(
-        button.shortcut
-      )}`;
+      const shortcutTitle = `${translateModKey(
+        PLATFORM_KEY_MODIFIER + "+"
+      )}${translateModKey(button.shortcut)}`;
 
       createdButton.title = `${title} (${shortcutTitle})`;
-      this.shortcuts[`${mod}+${button.shortcut}`.toLowerCase()] = createdButton;
+      this.shortcuts[
+        `${PLATFORM_KEY_MODIFIER}+${button.shortcut}`.toLowerCase()
+      ] = createdButton;
     } else {
       createdButton.title = title;
     }
@@ -228,6 +228,35 @@ export default Component.extend(TextareaTextManipulation, {
   processPreview: true,
   composerFocusSelector: "#reply-control .d-editor-input",
 
+  selectedFormTemplateId: computed("formTemplateIds", {
+    get() {
+      if (this._selectedFormTemplateId) {
+        return this._selectedFormTemplateId;
+      }
+
+      return this.formTemplateIds?.[0];
+    },
+
+    set(key, value) {
+      return (this._selectedFormTemplateId = value);
+    },
+  }),
+
+  @action
+  updateSelectedFormTemplateId(formTemplateId) {
+    this.selectedFormTemplateId = formTemplateId;
+  },
+
+  @discourseComputed("formTemplateIds", "replyingToTopic", "editingPost")
+  showFormTemplateForm(formTemplateIds, replyingToTopic, editingPost) {
+    // TODO(@keegan): Remove !editingPost once we add edit/draft support for form templates
+    if (formTemplateIds?.length > 0 && !replyingToTopic && !editingPost) {
+      return true;
+    }
+
+    return false;
+  },
+
   @discourseComputed("placeholder")
   placeholderTranslated(placeholder) {
     if (placeholder) {
@@ -275,6 +304,9 @@ export default Component.extend(TextareaTextManipulation, {
 
     this._itsatrap.bind("tab", () => this.indentSelection("right"));
     this._itsatrap.bind("shift+tab", () => this.indentSelection("left"));
+    this._itsatrap.bind(`${PLATFORM_KEY_MODIFIER}+shift+.`, () =>
+      this.send("insertCurrentTime")
+    );
 
     // disable clicking on links in the preview
     this.element
@@ -285,6 +317,7 @@ export default Component.extend(TextareaTextManipulation, {
       this.appEvents.on("composer:insert-block", this, "insertBlock");
       this.appEvents.on("composer:insert-text", this, "insertText");
       this.appEvents.on("composer:replace-text", this, "replaceText");
+      this.appEvents.on("composer:apply-surround", this, "_applySurround");
       this.appEvents.on(
         "composer:indent-selected-text",
         this,
@@ -325,6 +358,7 @@ export default Component.extend(TextareaTextManipulation, {
       this.appEvents.off("composer:insert-block", this, "insertBlock");
       this.appEvents.off("composer:insert-text", this, "insertText");
       this.appEvents.off("composer:replace-text", this, "replaceText");
+      this.appEvents.off("composer:apply-surround", this, "_applySurround");
       this.appEvents.off(
         "composer:indent-selected-text",
         this,
@@ -419,10 +453,12 @@ export default Component.extend(TextareaTextManipulation, {
         );
 
         previewPromise = loadScript("/javascripts/diffhtml.min.js").then(() => {
-          window.diff.innerHTML(
-            this.element.querySelector(".d-editor-preview"),
-            cookedElement.innerHTML
-          );
+          const previewElement =
+            this.element.querySelector(".d-editor-preview");
+          // This is a workaround for a known bug in diffHTML
+          // https://github.com/tbranyen/diffhtml/issues/217#issuecomment-1479956332
+          window.diff.release(previewElement);
+          window.diff.innerHTML(previewElement, cookedElement.innerHTML);
         });
       }
 
@@ -525,7 +561,11 @@ export default Component.extend(TextareaTextManipulation, {
 
           if (term === "") {
             if (this.emojiStore.favorites.length) {
-              return resolve(this.emojiStore.favorites.slice(0, 5));
+              return resolve(
+                this.emojiStore.favorites
+                  .filter((f) => !this.site.denied_emojis?.includes(f))
+                  .slice(0, 5)
+              );
             } else {
               return resolve([
                 "slight_smile",
@@ -550,12 +590,13 @@ export default Component.extend(TextareaTextManipulation, {
             return resolve([allTranslations[full]]);
           }
 
+          const emojiDenied = this.get("site.denied_emojis") || [];
           const match = term.match(/^:?(.*?):t([2-6])?$/);
           if (match) {
             const name = match[1];
             const scale = match[2];
 
-            if (isSkinTonableEmoji(name)) {
+            if (isSkinTonableEmoji(name) && !emojiDenied.includes(name)) {
               if (scale) {
                 return resolve([`${name}:t${scale}`]);
               } else {
@@ -567,6 +608,7 @@ export default Component.extend(TextareaTextManipulation, {
           const options = emojiSearch(term, {
             maxResults: 5,
             diversity: this.emojiStore.diversity,
+            exclude: emojiDenied,
           });
 
           return resolve(options);
@@ -616,6 +658,11 @@ export default Component.extend(TextareaTextManipulation, {
     }
   },
 
+  _applySurround(head, tail, exampleKey, opts) {
+    const selected = this.getSelected();
+    this.applySurround(selected, head, tail, exampleKey, opts);
+  },
+
   _toggleDirection() {
     let currentDir = this._$textarea.attr("dir")
         ? this._$textarea.attr("dir")
@@ -763,6 +810,15 @@ export default Component.extend(TextareaTextManipulation, {
       }
     },
 
+    insertCurrentTime() {
+      const sel = this.getSelected("", { lineVal: true });
+      const timezone = this.currentUser.user_option.timezone;
+      const time = moment().format("HH:mm:ss");
+      const date = moment().format("YYYY-MM-DD");
+
+      this.addText(sel, `[date=${date} time=${time} timezone="${timezone}"]`);
+    },
+
     focusIn() {
       this.set("isEditorFocused", true);
     },
diff --git a/app/assets/javascripts/discourse/app/components/d-lightbox.hbs b/app/assets/javascripts/discourse/app/components/d-lightbox.hbs
new file mode 100644
index 00000000000..fc7d3ca867d
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/d-lightbox.hbs
@@ -0,0 +1,83 @@
+<DSection
+  tabIndex="-1"
+  id={{this.elementId}}
+  aria-hidden={{not this.isVisible}}
+  class={{this.HTMLClassList}}
+  @scrollTop={{false}}
+  {{did-insert this.registerAppEventListeners}}
+  {{will-destroy this.deregisterAppEventListners}}
+>
+  {{#if this.isVisible}}
+    <div
+      aria-hidden="false"
+      tabindex="0"
+      role="document"
+      class="d-lightbox__content"
+      style={{this.CSSVars}}
+      aria-labelledby={{this.titleElementId}}
+      {{on "keyup" this.onKeyup passive=true capture=true}}
+    >
+      <div class="d-lightbox__focus-trap" tabindex="0"></div>
+      <DLightbox::Header
+        @canDownload={{this.canDownload}}
+        @canFullscreen={{this.canFullscreen}}
+        @canNavigate={{this.canNavigate}}
+        @close={{this.close}}
+        @openInNewTab={{this.openInNewTab}}
+        @toggleCarousel={{this.toggleCarousel}}
+        @toggleFullScreen={{this.toggleFullScreen}}
+        @totalItemCount={{this.totalItemCount}}
+        @counterIndex={{this.counterIndex}}
+      />
+      <DLightbox::Body
+        @close={{this.close}}
+        @centerZoomedBackgroundPosition={{this.centerZoomedBackgroundPosition}}
+        @currentItem={{this.currentItem}}
+        @hasLoadingError={{this.hasLoadingError}}
+        @isLoading={{this.isLoading}}
+        @isZoomed={{this.isZoomed}}
+        @nextButtonIcon={{this.nextButtonIcon}}
+        @onTouchend={{this.onTouchend}}
+        @onTouchstart={{this.onTouchstart}}
+        @previousButtonIcon={{this.previousButtonIcon}}
+        @reloadImage={{this.reloadImage}}
+        @shouldDisplayMainImageArrows={{this.shouldDisplayMainImageArrows}}
+        @showNextItem={{this.showNextItem}}
+        @showPreviousItem={{this.showPreviousItem}}
+        @toggleZoom={{this.toggleZoom}}
+        @zoomOnMouseover={{this.zoomOnMouseover}}
+      />
+      {{#if this.shouldDisplayCarousel}}
+        <DLightbox::Carousel
+          @currentIndex={{this.currentIndex}}
+          @items={{this.items}}
+          @nextButtonIcon={{this.nextButtonIcon}}
+          @previousButtonIcon={{this.previousButtonIcon}}
+          @showNextItem={{this.showNextItem}}
+          @showPreviousItem={{this.showPreviousItem}}
+          @showSelectedImage={{this.showSelectedImage}}
+          @shouldDisplayCarouselArrows={{this.shouldDisplayCarouselArrows}}
+        />
+      {{/if}}
+      <DLightbox::Footer
+        @canDownload={{this.canDownload}}
+        @canRotate={{this.canRotate}}
+        @canZoom={{this.canZoom}}
+        @currentItem={{this.currentItem}}
+        @downloadImage={{this.downloadImage}}
+        @rotateImage={{this.rotateImage}}
+        @shouldDisplayTitle={{this.shouldDisplayTitle}}
+        @toggleExpandTitle={{this.toggleExpandTitle}}
+        @toggleZoom={{this.toggleZoom}}
+        @zoomButtonIcon={{this.zoomButtonIcon}}
+      />
+      <DLightbox::ScreenReaderAnnouncer
+        @currentItem={{this.currentItem}}
+        @counterIndex={{this.counterIndex}}
+        @totalItemCount={{this.totalItemCount}}
+        @titleElementId={{this.titleElementId}}
+      />
+      <div class="d-lightbox__focus-trap" tabindex="0"></div>
+    </div>
+  {{/if}}
+</DSection>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/d-lightbox.js b/app/assets/javascripts/discourse/app/components/d-lightbox.js
new file mode 100644
index 00000000000..a2cb4d8a262
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/d-lightbox.js
@@ -0,0 +1,490 @@
+import {
+  ANIMATION_DURATION,
+  KEYBOARD_SHORTCUTS,
+  LAYOUT_TYPES,
+  LIGHTBOX_APP_EVENT_NAMES,
+  LIGHTBOX_ELEMENT_ID,
+  SWIPE_DIRECTIONS,
+  TITLE_ELEMENT_ID,
+} from "discourse/lib/lightbox/constants";
+import {
+  createDownloadLink,
+  getSwipeDirection,
+  openImageInNewTab,
+  preloadItemImages,
+  scrollParentToElementCenter,
+  setCarouselScrollPosition,
+  setSiteThemeColor,
+} from "discourse/lib/lightbox/helpers";
+
+import Component from "@glimmer/component";
+import { bind } from "discourse-common/utils/decorators";
+import discourseLater from "discourse-common/lib/later";
+import { htmlSafe } from "@ember/template";
+import { inject as service } from "@ember/service";
+import { tracked } from "@glimmer/tracking";
+
+export default class DLightbox extends Component {
+  @service appEvents;
+
+  @tracked items = [];
+  @tracked isVisible = false;
+  @tracked isLoading = false;
+  @tracked currentIndex = 0;
+  @tracked currentItem = {};
+
+  @tracked isZoomed = false;
+  @tracked isRotated = false;
+  @tracked isFullScreen = false;
+  @tracked rotationAmount = 0;
+
+  @tracked hasCarousel = false;
+  @tracked hasExpandedTitle = false;
+
+  options = {};
+  callbacks = {};
+  willClose = false;
+  elementId = LIGHTBOX_ELEMENT_ID;
+  titleElementId = TITLE_ELEMENT_ID;
+  animationDuration = ANIMATION_DURATION;
+  scrollPosition = 0;
+
+  get layoutType() {
+    return window.innerWidth > window.innerHeight
+      ? LAYOUT_TYPES.HORIZONTAL
+      : LAYOUT_TYPES.VERTICAL;
+  }
+
+  get CSSVars() {
+    const base = "--d-lightbox-image";
+
+    const variables = [
+      `${base}-animation-duration: ${this.animationDuration}ms;`,
+    ];
+
+    if (!this.currentItem) {
+      return htmlSafe(variables.join(""));
+    }
+
+    const { width, height, aspectRatio, dominantColor, fullsizeURL, smallURL } =
+      this.currentItem;
+
+    variables.push(
+      `${base}-rotation: ${this.rotationAmount}deg`,
+      `${base}-width: ${width}px`,
+      `${base}-height: ${height}px`,
+      `${base}-aspect-ratio: ${aspectRatio}`,
+      `${base}-dominant-color: #${dominantColor}`,
+      `${base}-full-size-url: url(${encodeURI(fullsizeURL)})`,
+      `${base}-small-url: url(${encodeURI(smallURL)})`
+    );
+
+    return htmlSafe(variables.filter(Boolean).join(";"));
+  }
+
+  get HTMLClassList() {
+    const base = "d-lightbox";
+
+    const classNames = [base];
+
+    if (!this.isVisible) {
+      return classNames.join("");
+    }
+
+    classNames.push(
+      this.layoutType && `is-${this.layoutType}`,
+      this.isVisible && `is-visible`,
+      this.isLoading ? `is-loading` : `is-finished-loading`,
+      this.isFullScreen && `is-fullscreen`,
+      this.isZoomed && `is-zoomed`,
+      this.isRotated && `is-rotated`,
+      this.canZoom && `can-zoom`,
+      this.hasExpandedTitle && `has-expanded-title`,
+      this.hasCarousel && `has-carousel`,
+      this.hasLoadingError && `has-loading-error`,
+      this.willClose && `will-close`,
+      this.isRotated &&
+        this.rotationAmount &&
+        `is-rotated-${this.rotationAmount}`
+    );
+
+    return classNames.filter(Boolean).join(" ");
+  }
+
+  get shouldDisplayMainImageArrows() {
+    return (
+      !this.options.isMobile &&
+      this.canNavigate &&
+      !this.hasCarousel &&
+      !this.isZoomed &&
+      !this.isRotated
+    );
+  }
+
+  get shouldDisplayCarousel() {
+    return this.hasCarousel && !this.isZoomed && !this.isRotated;
+  }
+
+  get shouldDisplayCarouselArrows() {
+    return (
+      !this.options.isMobile &&
+      this.totalItemCount >= this.options.minCarosuelArrowItemCount
+    );
+  }
+
+  get shouldDisplayTitle() {
+    return !this.hasLoadingError && !this.isZoomed && !this.isRotated;
+  }
+
+  get totalItemCount() {
+    return this.items?.length || 0;
+  }
+
+  get counterIndex() {
+    return this.currentIndex ? this.currentIndex + 1 : 1;
+  }
+
+  get canNavigate() {
+    return this.items?.length > 1;
+  }
+
+  get canZoom() {
+    return !this.hasLoadingError && this.currentItem?.canZoom;
+  }
+
+  get canRotate() {
+    return !this.hasLoadingError;
+  }
+
+  get canDownload() {
+    return !this.hasLoadingError && this.options.canDownload;
+  }
+
+  get canFullscreen() {
+    return !this.hasLoadingError;
+  }
+
+  get hasLoadingError() {
+    return this.currentItem?.hasLoadingError;
+  }
+
+  get nextButtonIcon() {
+    return this.options.isRTL ? "chevron-left" : "chevron-right";
+  }
+
+  get previousButtonIcon() {
+    return this.options.isRTL ? "chevron-right" : "chevron-left";
+  }
+
+  get zoomButtonIcon() {
+    return this.isZoomed ? "search-minus" : "search-plus";
+  }
+
+  @bind
+  registerAppEventListeners() {
+    this.appEvents.on(LIGHTBOX_APP_EVENT_NAMES.OPEN, this.open);
+    this.appEvents.on(LIGHTBOX_APP_EVENT_NAMES.CLOSE, this.close);
+  }
+
+  @bind
+  deregisterAppEventListners() {
+    this.appEvents.off(LIGHTBOX_APP_EVENT_NAMES.OPEN, this.open);
+    this.appEvents.off(LIGHTBOX_APP_EVENT_NAMES.CLOSE, this.close);
+  }
+
+  @bind
+  open({ items, startingIndex, callbacks, options }) {
+    this.options = options;
+
+    this.items = items;
+    this.currentIndex = startingIndex;
+    this.callbacks = callbacks;
+
+    this.isLoading = true;
+    this.isVisible = true;
+    this.scrollPosition = window.scrollY;
+
+    this.#setCurrentItem(this.currentIndex);
+
+    if (
+      this.options.zoomOnOpen &&
+      this.currentItem?.canZoom &&
+      !this.currentItem?.isZoomed
+    ) {
+      this.toggleZoom();
+    }
+
+    this.callbacks.onOpen?.({
+      items: this.items,
+      currentItem: this.currentItem,
+    });
+  }
+
+  @bind
+  close() {
+    this.willClose = true;
+
+    discourseLater(this.cleanup, this.animationDuration);
+
+    this.callbacks.onClose?.();
+  }
+
+  async #setCurrentItem(index) {
+    this.#onBeforeItemChange();
+
+    this.currentIndex = (index + this.totalItemCount) % this.totalItemCount;
+    this.currentItem = await preloadItemImages(this.items[this.currentIndex]);
+
+    this.#onAfterItemChange();
+  }
+
+  #onBeforeItemChange() {
+    this.callbacks.onItemWillChange?.({
+      currentItem: this.currentItem,
+    });
+
+    this.isLoading = true;
+    this.isZoomed = false;
+    this.isRotated = false;
+  }
+
+  #onAfterItemChange() {
+    this.isLoading = false;
+
+    if (this.currentItem.dominantColor) {
+      setSiteThemeColor(this.currentItem.dominantColor);
+    }
+
+    setCarouselScrollPosition({
+      behavior: "smooth",
+    });
+
+    this.callbacks.onItemDidChange?.({
+      currentItem: this.currentItem,
+    });
+
+    const nextItem = this.items[this.currentIndex + 1];
+    return nextItem ? preloadItemImages(nextItem) : false;
+  }
+
+  @bind
+  centerZoomedBackgroundPosition(zoomedImageContainer) {
+    return this.options.isMobile
+      ? scrollParentToElementCenter({
+          element: zoomedImageContainer,
+          isRTL: this.options.isRTL,
+        })
+      : false;
+  }
+
+  zoomOnMouseover(event) {
+    const zoomedImageContainer = event.target;
+
+    const offsetX = event.offsetX;
+    const offsetY = event.offsetY;
+
+    const x = (offsetX / zoomedImageContainer.offsetWidth) * 100;
+    const y = (offsetY / zoomedImageContainer.offsetHeight) * 100;
+
+    zoomedImageContainer.style.backgroundPosition = x + "% " + y + "%";
+  }
+
+  @bind
+  toggleZoom() {
+    if (this.isLoading || !this.canZoom) {
+      return;
+    }
+
+    this.isZoomed = !this.isZoomed;
+    document.querySelector(".d-lightbox__close-button")?.focus();
+  }
+
+  @bind
+  rotateImage() {
+    this.rotationAmount = (this.rotationAmount + 90) % 360;
+    this.isRotated = this.rotationAmount !== 0;
+  }
+
+  @bind
+  toggleFullScreen() {
+    this.isFullScreen = !this.isFullScreen;
+
+    return this.isFullScreen
+      ? document.documentElement.requestFullscreen()
+      : document.exitFullscreen();
+  }
+
+  @bind
+  downloadImage() {
+    return createDownloadLink(this.currentItem);
+  }
+
+  @bind
+  openInNewTab() {
+    return openImageInNewTab(this.currentItem);
+  }
+
+  @bind
+  reloadImage() {
+    this.#setCurrentItem(this.currentIndex);
+  }
+
+  @bind
+  toggleCarousel() {
+    this.hasCarousel = !this.hasCarousel;
+
+    requestAnimationFrame(setCarouselScrollPosition);
+  }
+
+  @bind
+  showNextItem() {
+    this.#setCurrentItem(this.currentIndex + 1);
+  }
+
+  @bind
+  showPreviousItem() {
+    this.#setCurrentItem(this.currentIndex - 1);
+  }
+
+  @bind
+  showSelectedImage(event) {
+    const targetIndex = event.target.dataset?.lightboxItemIndex;
+    return targetIndex ? this.#setCurrentItem(Number(targetIndex)) : false;
+  }
+
+  @bind
+  toggleExpandTitle() {
+    this.hasExpandedTitle = !this.hasExpandedTitle;
+  }
+
+  @bind
+  onKeyup({ key }) {
+    if (KEYBOARD_SHORTCUTS.PREVIOUS.includes(key)) {
+      return this.showPreviousItem();
+    }
+
+    if (KEYBOARD_SHORTCUTS.NEXT.includes(key)) {
+      return this.showNextItem();
+    }
+
+    if (key === KEYBOARD_SHORTCUTS.CLOSE) {
+      return this.close();
+    }
+
+    if (key === KEYBOARD_SHORTCUTS.ZOOM) {
+      return this.toggleZoom();
+    }
+
+    if (key === KEYBOARD_SHORTCUTS.FULLSCREEN) {
+      return this.toggleFullScreen();
+    }
+
+    if (key === KEYBOARD_SHORTCUTS.ROTATE) {
+      return this.rotateImage();
+    }
+
+    if (key === KEYBOARD_SHORTCUTS.DOWNLOAD) {
+      return this.downloadImage();
+    }
+
+    if (key === KEYBOARD_SHORTCUTS.CAROUSEL) {
+      return this.toggleCarousel();
+    }
+
+    if (key === KEYBOARD_SHORTCUTS.TITLE) {
+      return this.toggleExpandTitle();
+    }
+
+    if (key === KEYBOARD_SHORTCUTS.NEWTAB) {
+      return this.openInNewTab();
+    }
+  }
+
+  @bind
+  onTouchstart(event = Event) {
+    if (this.isZoomed) {
+      return false;
+    }
+
+    this.touchstartX = event.changedTouches[0].screenX;
+    this.touchstartY = event.changedTouches[0].screenY;
+  }
+
+  @bind
+  async onTouchend(event) {
+    if (this.isZoomed) {
+      return false;
+    }
+
+    event.stopPropagation();
+
+    const touchendY = event.changedTouches[0].screenY;
+    const touchendX = event.changedTouches[0].screenX;
+
+    const swipeDirection = await getSwipeDirection({
+      touchstartX: this.touchstartX,
+      touchstartY: this.touchstartY,
+      touchendX,
+      touchendY,
+    });
+
+    switch (swipeDirection) {
+      case SWIPE_DIRECTIONS.LEFT:
+        this.options.isRTL ? this.showNextItem() : this.showPreviousItem();
+        break;
+      case SWIPE_DIRECTIONS.RIGHT:
+        this.options.isRTL ? this.showPreviousItem() : this.showNextItem();
+        break;
+      case SWIPE_DIRECTIONS.UP:
+        this.close();
+        break;
+      case SWIPE_DIRECTIONS.DOWN:
+        this.toggleCarousel();
+        break;
+    }
+  }
+
+  @bind
+  cleanup() {
+    if (this.isVisible) {
+      this.hasCarousel = !!document.querySelector(".d-lightbox.has-carousel");
+      this.hasExpandedTitle = false;
+      this.isLoading = false;
+      this.items = [];
+      this.currentIndex = 0;
+      this.isZoomed = false;
+      this.isRotated = false;
+      this.rotationAmount = 0;
+
+      if (this.isFullScreen) {
+        this.toggleFullScreen();
+        this.isFullScreen = false;
+      }
+
+      this.isVisible = false;
+      this.willClose = false;
+
+      this.resetScrollPosition();
+
+      this.callbacks.onCleanup?.();
+
+      this.callbacks = {};
+      this.options = {};
+    }
+  }
+
+  resetScrollPosition() {
+    if (window.scrollY !== this.scrollPosition) {
+      window.scrollTo({
+        left: 0,
+        top: parseInt(this.scrollPosition, 10),
+        behavior: "instant",
+      });
+    }
+  }
+
+  willDestroy() {
+    super.willDestroy(...arguments);
+    this.cleanup();
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/d-lightbox/backdrop.hbs b/app/assets/javascripts/discourse/app/components/d-lightbox/backdrop.hbs
new file mode 100644
index 00000000000..5ef4361fd8f
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/d-lightbox/backdrop.hbs
@@ -0,0 +1,6 @@
+<div
+  aria-hidden="true"
+  class="d-lightbox__backdrop"
+  tabindex="-1"
+  {{on "click" @close passive=true capture=true}}
+></div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/d-lightbox/body.hbs b/app/assets/javascripts/discourse/app/components/d-lightbox/body.hbs
new file mode 100644
index 00000000000..75348d76d23
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/d-lightbox/body.hbs
@@ -0,0 +1,59 @@
+<div
+  class="d-lightbox__body"
+  tabindex="-1"
+  {{on "touchstart" @onTouchstart passive=true capture=true}}
+  {{on "touchend" @onTouchend passive=true capture=true}}
+  {{on "click" @toggleZoom passive=true}}
+>
+  {{#if @shouldDisplayMainImageArrows}}
+    <DButton
+      @class="d-lightbox__previous-button btn-flat"
+      @title="experimental_lightbox.buttons.previous"
+      @icon={{@previousButtonIcon}}
+      @ariaHidden="true"
+      {{on "click" @showPreviousItem passive=true capture=true}}
+    />
+  {{/if}}
+  {{#if @isLoading}}
+    <span class="d-lightbox__loading-spinner">
+      {{loading-spinner size="large"}}
+    </span>
+  {{else if @hasLoadingError}}
+    <span class="d-lightbox__error-message">
+      <DButton
+        @class="d-lightbox__retry-button btn-flat"
+        @title="experimental_lightbox.buttons.redo"
+        @icon="redo"
+        {{on "click" @reloadImage passive=true capture=true}}
+      />
+      <span>{{i18n "experimental_lightbox.image_load_error"}}</span>
+    </span>
+  {{else if @isZoomed}}
+    <div
+      class="d-lightbox__zoomed-image-container"
+      tabindex="-1"
+      {{did-insert @centerZoomedBackgroundPosition}}
+      {{on "mousemove" @zoomOnMouseover passive=true capture=true}}
+    ></div>
+  {{else}}
+    <DLightbox::Backdrop @close={{@close}} />
+    <img
+      aria-hidden="true"
+      draggable="false"
+      fetchPriority="high"
+      decoding="async"
+      tabindex="-1"
+      class="d-lightbox__main-image"
+      src={{@currentItem.fullsizeURL}}
+    />
+  {{/if}}
+  {{#if @shouldDisplayMainImageArrows}}
+    <DButton
+      @class="d-lightbox__next-button btn-flat"
+      @title="experimental_lightbox.buttons.next"
+      @icon={{@nextButtonIcon}}
+      @ariaHidden="true"
+      {{on "click" @showNextItem passive=true capture=true}}
+    />
+  {{/if}}
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/d-lightbox/carousel.hbs b/app/assets/javascripts/discourse/app/components/d-lightbox/carousel.hbs
new file mode 100644
index 00000000000..c5867364eff
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/d-lightbox/carousel.hbs
@@ -0,0 +1,49 @@
+<div class="d-lightbox__carousel">
+  {{#if @shouldDisplayCarouselArrows}}
+    <DButton
+      @class="d-lightbox__carousel-previous-button btn-flat"
+      @title="experimental_lightbox.buttons.previous"
+      @icon={{@previousButtonIcon}}
+      @ariaHidden="true"
+      {{on "click" @showPreviousItem passive=true capture=true}}
+    />
+  {{/if}}
+  <div
+    class="d-lightbox__carousel-items"
+    tabindex="-1"
+    role="list"
+    aria-hidden="true"
+    {{on "click" @showSelectedImage passive=true capture=true}}
+    {{on "focus" @showSelectedImage passive=true capture=true}}
+  >
+    {{#each @items as |item|}}
+      <img
+        data-lightbox-carousel-item={{if
+          (eq item.index @currentIndex)
+          "current"
+          ""
+        }}
+        fetchPriority="low"
+        decoding="async"
+        loading="lazy"
+        tabindex="-1"
+        src={{item.smallURL}}
+        data-lightbox-item-index={{item.index}}
+        style={{item.cssVars}}
+        class={{concat
+          "d-lightbox__carousel-item"
+          (if (eq item.index @currentIndex) " is-current")
+        }}
+      />
+    {{/each}}
+  </div>
+  {{#if @shouldDisplayCarouselArrows}}
+    <DButton
+      @class="d-lightbox__carousel-next-button btn-flat"
+      @title="experimental_lightbox.buttons.next"
+      @icon={{@nextButtonIcon}}
+      @ariaHidden="true"
+      {{on "click" @showNextItem passive=true capture=true}}
+    />
+  {{/if}}
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/d-lightbox/footer.hbs b/app/assets/javascripts/discourse/app/components/d-lightbox/footer.hbs
new file mode 100644
index 00000000000..3427e2b7dc2
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/d-lightbox/footer.hbs
@@ -0,0 +1,48 @@
+<div class="d-lightbox__footer">
+  {{#if @shouldDisplayTitle}}
+    <div
+      aria-hidden="true"
+      class="d-lightbox__main-title"
+      tabindex="0"
+      {{on "click" @toggleExpandTitle passive=true capture=true}}
+    >
+      <span class="d-lightbox__item-title">
+        {{~@currentItem.title~}}
+      </span>
+      <span class="d-lightbox__item-file-details">
+        {{~@currentItem.fileDetails~}}
+      </span>
+    </div>
+  {{/if}}
+  <div class="d-lightbox__footer-buttons">
+    {{#if @canZoom}}
+      <DButton
+        @class="d-lightbox__zoom-button btn-flat"
+        @title="experimental_lightbox.buttons.zoom"
+        @icon={{@zoomButtonIcon}}
+        @ariaHidden="true"
+        {{on "click" @toggleZoom passive=true capture=true}}
+        aria-hidden="true"
+      />
+    {{/if}}
+    {{#if @canRotate}}
+      <DButton
+        @class="d-lightbox__rotate-button btn-flat"
+        @title="experimental_lightbox.buttons.rotate"
+        @icon="redo"
+        @ariaHidden="true"
+        {{on "click" @rotateImage passive=true capture=true}}
+        aria-hidden="true"
+      />
+    {{/if}}
+    {{#if @canDownload}}
+      <DButton
+        @class="d-lightbox__download-button btn-flat"
+        @title="experimental_lightbox.buttons.download"
+        @icon="download"
+        @ariaHidden="true"
+        {{on "click" @downloadImage passive=true capture=true}}
+      />
+    {{/if}}
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/d-lightbox/header.hbs b/app/assets/javascripts/discourse/app/components/d-lightbox/header.hbs
new file mode 100644
index 00000000000..e9068d69288
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/d-lightbox/header.hbs
@@ -0,0 +1,54 @@
+<div class="d-lightbox__header">
+  {{#if @canNavigate}}
+    <div aria-hidden="true" class="d-lightbox__multi-item-controls">
+      <DButton
+        @class="d-lightbox__carousel-button btn-flat"
+        @title="experimental_lightbox.buttons.carousel"
+        @icon="images"
+        @ariaHidden="true"
+        {{on "click" @toggleCarousel passive=true capture=true}}
+        aria-hidden="true"
+      />
+      <div class="d-lightbox__counters">
+        <span class="d-lightbox__counter-current">
+          {{~@counterIndex~}}
+        </span>
+        <span class="d-lightbox__counter-separator">
+          <span>/</span>
+        </span>
+        <span class="d-lightbox__counter-total">
+          {{~@totalItemCount~}}
+        </span>
+      </div>
+    </div>
+  {{/if}}
+  <div class="d-lightbox__header-buttons">
+    {{#if @canDownload}}
+      <DButton
+        @class="d-lightbox__new-tab-button btn-flat"
+        @title="experimental_lightbox.buttons.newtab"
+        @icon="external-link-alt"
+        @ariaHidden="true"
+        {{on "click" @openInNewTab passive=true capture=true}}
+        aria-hidden="true"
+      />
+    {{/if}}
+    {{#if @canFullscreen}}
+      <DButton
+        @class="d-lightbox__full-screen-button btn-flat"
+        @title="experimental_lightbox.buttons.fullscreen"
+        @icon="discourse-expand"
+        @ariaHidden="true"
+        {{on "click" @toggleFullScreen passive=true capture=true}}
+        aria-hidden="true"
+      />
+    {{/if}}
+    <DButton
+      @class="d-lightbox__close-button btn-flat"
+      @title="experimental_lightbox.buttons.close"
+      @icon="times"
+      @ariaHidden="true"
+      {{on "click" @close passive=true capture=true}}
+    />
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/d-lightbox/screen-reader-announcer.hbs b/app/assets/javascripts/discourse/app/components/d-lightbox/screen-reader-announcer.hbs
new file mode 100644
index 00000000000..5220c12c72f
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/d-lightbox/screen-reader-announcer.hbs
@@ -0,0 +1,16 @@
+<div class="d-lightbox__screen-reader-announcer" tabindex="-1">
+  <h2
+    aria-live="polite"
+    aria-level="2"
+    aria-atomic="true"
+    class="d-lightbox__screen-reader-title"
+    id={{@titleElementId}}
+  >
+    {{i18n
+      "experimental_lightbox.screen_reader_image_title"
+      current=@counterIndex
+      total=@totalItemCount
+      title=@currentItem.title
+    }}
+  </h2>
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/d-modal-body.hbs b/app/assets/javascripts/discourse/app/components/d-modal-body.hbs
new file mode 100644
index 00000000000..79681ae73bf
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/d-modal-body.hbs
@@ -0,0 +1,12 @@
+{{! Remove when legacy modals are dropped (deprecation: discourse.modal-controllers) }}
+
+<div
+  id={{@id}}
+  class={{concat-class "modal-body" @class}}
+  tabindex="-1"
+  {{did-insert this.didInsert}}
+  {{will-destroy this.willDestroy}}
+  ...attributes
+>
+  {{yield}}
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/d-modal-body.js b/app/assets/javascripts/discourse/app/components/d-modal-body.js
index f01bc23aa9a..0ba0ea4f801 100644
--- a/app/assets/javascripts/discourse/app/components/d-modal-body.js
+++ b/app/assets/javascripts/discourse/app/components/d-modal-body.js
@@ -1,52 +1,54 @@
-import Component from "@ember/component";
-import { scheduleOnce } from "@ember/runloop";
-export default Component.extend({
-  classNames: ["modal-body"],
-  fixed: false,
-  submitOnEnter: true,
-  dismissable: true,
-  attributeBindings: ["tabindex"],
-  tabindex: -1,
+// Remove when legacy modals are dropped (deprecation: discourse.modal-controllers)
 
-  didInsertElement() {
-    this._super(...arguments);
-    this._modalAlertElement = document.getElementById("modal-alert");
-    if (this._modalAlertElement) {
-      this._clearFlash();
+import Component from "@glimmer/component";
+import { disableImplicitInjections } from "discourse/lib/implicit-injections";
+import { action } from "@ember/object";
+import { tracked } from "@glimmer/tracking";
+import { inject as service } from "@ember/service";
+import { DEBUG } from "@glimmer/env";
+
+const LEGACY_ERROR =
+  "d-modal-body should only be used inside a legacy controller-based d-modal. https://meta.discourse.org/t/268057";
+
+function pick(object, keys) {
+  const result = {};
+  for (const key of keys) {
+    if (key in object) {
+      result[key] = object[key];
     }
+  }
+  return result;
+}
 
-    let fixedParent = this.element.closest(".d-modal.fixed-modal");
-    if (fixedParent) {
-      this.set("fixed", true);
-      $(fixedParent).modal("show");
-    }
+@disableImplicitInjections
+export default class DModalBody extends Component {
+  @service appEvents;
+  @service modal;
 
-    scheduleOnce("afterRender", this, this._afterFirstRender);
-    this.appEvents.on("modal-body:flash", this, "_flash");
-    this.appEvents.on("modal-body:clearFlash", this, "_clearFlash");
-  },
+  @tracked fixed = false;
 
-  willDestroyElement() {
-    this._super(...arguments);
-    this.appEvents.off("modal-body:flash", this, "_flash");
-    this.appEvents.off("modal-body:clearFlash", this, "_clearFlash");
-    this.appEvents.trigger("modal:body-dismissed");
-  },
-
-  _afterFirstRender() {
-    const maxHeight = this.maxHeight;
-    if (maxHeight) {
-      const maxHeightFloat = parseFloat(maxHeight) / 100.0;
-      if (maxHeightFloat > 0) {
-        const viewPortHeight = $(window).height();
-        this.element.style.maxHeight =
-          Math.floor(maxHeightFloat * viewPortHeight) + "px";
+  @action
+  didInsert(element) {
+    if (element.closest(".d-modal:not(.d-modal-legacy)")) {
+      // eslint-disable-next-line no-console
+      console.error(LEGACY_ERROR);
+      if (DEBUG) {
+        throw new Error(LEGACY_ERROR);
       }
     }
 
+    this.appEvents.trigger("modal-body:clearFlash");
+
+    const fixedParent = element.closest(".d-modal.fixed-modal");
+    if (fixedParent) {
+      this.fixed = true;
+      $(fixedParent).modal("show");
+      this.modal.hidden = false;
+    }
+
     this.appEvents.trigger(
       "modal:body-shown",
-      this.getProperties(
+      pick(this.args, [
         "title",
         "rawTitle",
         "fixed",
@@ -54,34 +56,15 @@ export default Component.extend({
         "rawSubtitle",
         "submitOnEnter",
         "dismissable",
-        "headerClass"
-      )
+        "headerClass",
+        "modalClass",
+        "titleAriaElementId",
+      ])
     );
-  },
+  }
 
-  _clearFlash() {
-    if (this._modalAlertElement) {
-      this._modalAlertElement.innerHTML = "";
-      this._modalAlertElement.classList.remove(
-        "alert",
-        "alert-error",
-        "alert-info",
-        "alert-success",
-        "alert-warning"
-      );
-    }
-  },
-
-  _flash(msg) {
-    this._clearFlash();
-    if (!this._modalAlertElement) {
-      return;
-    }
-
-    this._modalAlertElement.classList.add(
-      "alert",
-      `alert-${msg.messageClass || "success"}`
-    );
-    this._modalAlertElement.innerHTML = msg.text || "";
-  },
-});
+  @action
+  willDestroy() {
+    this.appEvents.trigger("modal:body-dismissed");
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-modal-cancel.hbs b/app/assets/javascripts/discourse/app/components/d-modal-cancel.hbs
similarity index 70%
rename from app/assets/javascripts/discourse/app/templates/components/d-modal-cancel.hbs
rename to app/assets/javascripts/discourse/app/components/d-modal-cancel.hbs
index f66de85d829..f409a846791 100644
--- a/app/assets/javascripts/discourse/app/templates/components/d-modal-cancel.hbs
+++ b/app/assets/javascripts/discourse/app/components/d-modal-cancel.hbs
@@ -1,5 +1,5 @@
 <DButton
   @class="btn-flat d-modal-cancel"
-  @action={{action this.close}}
+  @action={{@close}}
   @translatedLabel={{i18n "cancel"}}
 />
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/d-modal-cancel.js b/app/assets/javascripts/discourse/app/components/d-modal-cancel.js
deleted file mode 100644
index 0e6d50b17d4..00000000000
--- a/app/assets/javascripts/discourse/app/components/d-modal-cancel.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import Component from "@ember/component";
-export default Component.extend({
-  tagName: "",
-});
diff --git a/app/assets/javascripts/discourse/app/components/d-modal-legacy.hbs b/app/assets/javascripts/discourse/app/components/d-modal-legacy.hbs
new file mode 100644
index 00000000000..90a2c5f4665
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/d-modal-legacy.hbs
@@ -0,0 +1,95 @@
+{{! Remove when legacy modals are dropped (deprecation: discourse.modal-controllers) }}
+
+{{! template-lint-disable no-pointer-down-event-binding }}
+{{! template-lint-disable no-invalid-interactive }}
+
+<div
+  class={{concat-class
+    this.modalClass
+    this.modalStyle
+    (if this.hasPanels "has-panels")
+    (if @hidden "hidden")
+    "d-modal-legacy"
+  }}
+  id={{if (not-eq this.modalStyle "inline-modal") "discourse-modal"}}
+  data-keyboard="false"
+  aria-modal="true"
+  role="dialog"
+  aria-labelledby={{this.ariaLabelledby}}
+  ...attributes
+  {{did-insert this.setupListeners}}
+  {{will-destroy this.cleanupListeners}}
+  {{on "mousedown" this.handleMouseDown}}
+>
+  <div class="modal-outer-container">
+    <div class="modal-middle-container">
+      <div class="modal-inner-container">
+        <PluginOutlet @name="above-modal-header" @connectorTagName="div" />
+        <div class="modal-header {{this.headerClass}}">
+          {{#if this.dismissable}}
+            <DButton
+              @icon="times"
+              @action={{route-action "closeModal" "initiatedByCloseButton"}}
+              @class="btn-flat modal-close close"
+              @title="modal.close"
+            />
+          {{/if}}
+
+          <div class="modal-title-wrapper">
+            {{#if this.title}}
+              <div class="title">
+                <h3 id="discourse-modal-title">{{this.title}}</h3>
+
+                {{#if this.subtitle}}
+                  <p class="subtitle">{{this.subtitle}}</p>
+                {{/if}}
+              </div>
+            {{/if}}
+
+            <span id="modal-header-after-title"></span>
+          </div>
+
+          {{#if this.panels}}
+            <ul class="modal-tabs">
+              {{#each this.panels as |panel|}}
+                <ModalTab
+                  @panel={{panel}}
+                  @panelsLength={{this.panels.length}}
+                  @selectedPanel={{@selectedPanel}}
+                  @onSelectPanel={{@onSelectPanel}}
+                />
+              {{/each}}
+            </ul>
+          {{/if}}
+        </div>
+
+        <div
+          id="modal-alert"
+          role="alert"
+          class={{if
+            this.flash
+            (concat-class
+              "alert" (concat "alert-" (or this.flash.messageClass "success"))
+            )
+          }}
+        >
+          {{~this.flash.text~}}
+        </div>
+
+        {{yield}}
+
+        {{#each this.errors as |error|}}
+          <div class="alert alert-error">
+            <button
+              type="button"
+              class="close"
+              data-dismiss="alert"
+              aria-label={{i18n "modal.dismiss_error"}}
+            >×</button>
+            {{error}}
+          </div>
+        {{/each}}
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/d-modal-legacy.js b/app/assets/javascripts/discourse/app/components/d-modal-legacy.js
new file mode 100644
index 00000000000..ef8da04ba41
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/d-modal-legacy.js
@@ -0,0 +1,253 @@
+// Remove when legacy modals are dropped (deprecation: discourse.modal-controllers)
+
+import Component from "@glimmer/component";
+import I18n from "I18n";
+import { next, schedule } from "@ember/runloop";
+import { bind } from "discourse-common/utils/decorators";
+import { disableImplicitInjections } from "discourse/lib/implicit-injections";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+import { tracked } from "@glimmer/tracking";
+
+@disableImplicitInjections
+export default class DModal extends Component {
+  @service appEvents;
+  @service modal;
+
+  @tracked wrapperElement;
+  @tracked modalBodyData = {};
+  @tracked flash;
+
+  get modalStyle() {
+    if (this.args.modalStyle === "inline-modal") {
+      return "inline-modal";
+    } else {
+      return "fixed-modal";
+    }
+  }
+
+  get submitOnEnter() {
+    if ("submitOnEnter" in this.modalBodyData) {
+      return this.modalBodyData.submitOnEnter;
+    } else {
+      return true;
+    }
+  }
+
+  get dismissable() {
+    if ("dismissable" in this.modalBodyData) {
+      return this.modalBodyData.dismissable;
+    } else {
+      return true;
+    }
+  }
+
+  get title() {
+    if (this.modalBodyData.title) {
+      return I18n.t(this.modalBodyData.title);
+    } else if (this.modalBodyData.rawTitle) {
+      return this.modalBodyData.rawTitle;
+    } else {
+      return this.args.title;
+    }
+  }
+
+  get subtitle() {
+    if (this.modalBodyData.subtitle) {
+      return I18n.t(this.modalBodyData.subtitle);
+    }
+
+    return this.modalBodyData.rawSubtitle || this.args.subtitle;
+  }
+
+  get headerClass() {
+    return this.modalBodyData.headerClass;
+  }
+
+  get panels() {
+    return this.args.panels;
+  }
+
+  get errors() {
+    return this.args.errors;
+  }
+
+  @action
+  setupListeners(element) {
+    this.appEvents.on("modal:body-shown", this._modalBodyShown);
+    this.appEvents.on("modal-body:flash", this._flash);
+    this.appEvents.on("modal-body:clearFlash", this._clearFlash);
+    document.documentElement.addEventListener(
+      "keydown",
+      this._handleModalEvents
+    );
+    this.wrapperElement = element;
+  }
+
+  @action
+  cleanupListeners() {
+    this.appEvents.off("modal:body-shown", this._modalBodyShown);
+    this.appEvents.off("modal-body:flash", this._flash);
+    this.appEvents.off("modal-body:clearFlash", this._clearFlash);
+    document.documentElement.removeEventListener(
+      "keydown",
+      this._handleModalEvents
+    );
+  }
+
+  get ariaLabelledby() {
+    if (this.modalBodyData.titleAriaElementId) {
+      return this.modalBodyData.titleAriaElementId;
+    } else if (this.args.titleAriaElementId) {
+      return this.args.titleAriaElementId;
+    } else if (this.args.title) {
+      return "discourse-modal-title";
+    }
+  }
+
+  get modalClass() {
+    return this.modalBodyData.modalClass || this.args.modalClass;
+  }
+
+  triggerClickOnEnter(e) {
+    if (!this.submitOnEnter) {
+      return false;
+    }
+
+    // skip when in a form or a textarea element
+    if (
+      e.target.closest("form") ||
+      (document.activeElement && document.activeElement.nodeName === "TEXTAREA")
+    ) {
+      return false;
+    }
+
+    return true;
+  }
+
+  @action
+  handleMouseDown(e) {
+    if (!this.dismissable) {
+      return;
+    }
+
+    if (
+      e.target.classList.contains("modal-middle-container") ||
+      e.target.classList.contains("modal-outer-container")
+    ) {
+      // Send modal close (which bubbles to ApplicationRoute) if clicked outside.
+      // We do this because some CSS of ours seems to cover the backdrop and makes
+      // it unclickable.
+      return this.args.closeModal?.("initiatedByClickOut");
+    }
+  }
+
+  @bind
+  _modalBodyShown(data) {
+    if (this.isDestroying || this.isDestroyed) {
+      return;
+    }
+
+    if (data.fixed) {
+      this.modal.hidden = false;
+    }
+
+    this.modalBodyData = data;
+
+    next(() => {
+      schedule("afterRender", () => {
+        this._trapTab();
+      });
+    });
+  }
+
+  @bind
+  _handleModalEvents(event) {
+    if (this.args.hidden) {
+      return;
+    }
+
+    if (event.key === "Escape" && this.dismissable) {
+      next(() => this.args.closeModal("initiatedByESC"));
+    }
+
+    if (event.key === "Enter" && this.triggerClickOnEnter(event)) {
+      this.wrapperElement.querySelector(".modal-footer .btn-primary")?.click();
+      event.preventDefault();
+    }
+
+    if (event.key === "Tab") {
+      this._trapTab(event);
+    }
+  }
+
+  _trapTab(event) {
+    if (this.args.hidden) {
+      return true;
+    }
+
+    const innerContainer = this.wrapperElement.querySelector(
+      ".modal-inner-container"
+    );
+    if (!innerContainer) {
+      return;
+    }
+
+    let focusableElements =
+      '[autofocus], a, input, select, textarea, summary, [tabindex]:not([tabindex="-1"])';
+
+    if (!event) {
+      // on first trap we don't allow to focus modal-close
+      // and apply manual focus only if we don't have any autofocus element
+      const autofocusedElement = innerContainer.querySelector("[autofocus]");
+      if (
+        !autofocusedElement ||
+        document.activeElement !== autofocusedElement
+      ) {
+        // if there's not autofocus, or the activeElement, is not the autofocusable element
+        // attempt to focus the first of the focusable elements or just the modal-body
+        // to make it possible to scroll with arrow down/up
+        (
+          autofocusedElement ||
+          innerContainer.querySelector(
+            focusableElements + ", button:not(.modal-close)"
+          ) ||
+          innerContainer.querySelector(".modal-body")
+        )?.focus();
+      }
+
+      return;
+    }
+
+    focusableElements += ", button:enabled";
+
+    const firstFocusableElement =
+      innerContainer.querySelector(focusableElements);
+    const focusableContent = innerContainer.querySelectorAll(focusableElements);
+    const lastFocusableElement = focusableContent[focusableContent.length - 1];
+
+    if (event.shiftKey) {
+      if (document.activeElement === firstFocusableElement) {
+        lastFocusableElement?.focus();
+        event.preventDefault();
+      }
+    } else {
+      if (document.activeElement === lastFocusableElement) {
+        (
+          innerContainer.querySelector(".modal-close") || firstFocusableElement
+        )?.focus();
+        event.preventDefault();
+      }
+    }
+  }
+
+  @bind
+  _clearFlash() {
+    this.flash = null;
+  }
+
+  @bind
+  _flash(msg) {
+    this.flash = msg;
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/d-modal.hbs b/app/assets/javascripts/discourse/app/components/d-modal.hbs
new file mode 100644
index 00000000000..467813988db
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/d-modal.hbs
@@ -0,0 +1,102 @@
+{{! template-lint-disable no-pointer-down-event-binding }}
+{{! template-lint-disable no-invalid-interactive }}
+
+<ConditionalInElement
+  @element={{this.modal.containerElement}}
+  @inline={{@inline}}
+>
+  <this.dynamicElement
+    class={{concat-class
+      "modal"
+      "d-modal"
+      (if @inline "inline-modal" "fixed-modal")
+    }}
+    data-keyboard="false"
+    aria-modal="true"
+    role="dialog"
+    aria-labelledby={{if @title "discourse-modal-title"}}
+    ...attributes
+    {{did-insert this.setupListeners}}
+    {{will-destroy this.cleanupListeners}}
+    {{on "mouseup" this.handleMouseUp}}
+  >
+    <div class="modal-outer-container">
+      <div class="modal-middle-container">
+        <div class="modal-inner-container">
+          {{yield to="aboveHeader"}}
+
+          {{#if
+            (or
+              this.dismissable
+              @title
+              (has-block "headerBelowTitle")
+              (has-block "headerAboveTitle")
+            )
+          }}
+            <div class={{concat-class "modal-header" @headerClass}}>
+              {{#if this.dismissable}}
+                <DButton
+                  @icon="times"
+                  @action={{this.handleCloseButton}}
+                  @class="btn-flat modal-close close"
+                  @title="modal.close"
+                />
+              {{/if}}
+
+              {{yield to="headerAboveTitle"}}
+
+              <div class="modal-title-wrapper">
+                {{#if @title}}
+                  <div class="title">
+                    <h3 id="discourse-modal-title">{{@title}}</h3>
+
+                    {{#if @subtitle}}
+                      <p class="subtitle">{{@subtitle}}</p>
+                    {{/if}}
+                  </div>
+                {{/if}}
+
+                {{yield to="headerBelowTitle"}}
+              </div>
+            </div>
+          {{/if}}
+
+          {{yield to="belowHeader"}}
+
+          {{this.validateFlashType @flashType}}
+          {{#if @flash}}
+            <div
+              id="modal-alert"
+              role="alert"
+              class={{concat-class
+                "alert"
+                (if @flashType (concat "alert-" @flashType))
+              }}
+            >
+              {{~@flash~}}
+            </div>
+          {{/if}}
+
+          <div class={{concat-class "modal-body" @bodyClass}} tabindex="-1">
+            {{#if (has-block "body")}}
+              {{yield to="body"}}
+            {{else}}
+              {{yield}}
+            {{/if}}
+          </div>
+
+          {{#if (has-block "footer")}}
+            <div class="modal-footer">
+              {{yield to="footer"}}
+            </div>
+          {{/if}}
+
+          {{yield to="belowFooter"}}
+        </div>
+      </div>
+    </div>
+  </this.dynamicElement>
+  {{#unless @inline}}
+    <div class="modal-backdrop"></div>
+  {{/unless}}
+</ConditionalInElement>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/d-modal.js b/app/assets/javascripts/discourse/app/components/d-modal.js
index d238fc3bea2..c262a3b979a 100644
--- a/app/assets/javascripts/discourse/app/components/d-modal.js
+++ b/app/assets/javascripts/discourse/app/components/d-modal.js
@@ -1,176 +1,113 @@
-import Component from "@ember/component";
-import I18n from "I18n";
-import { next, schedule } from "@ember/runloop";
-import discourseComputed, { bind, on } from "discourse-common/utils/decorators";
+import Component from "@glimmer/component";
+import ClassicComponent from "@ember/component";
+import { action } from "@ember/object";
+import { cached, tracked } from "@glimmer/tracking";
+import { inject as service } from "@ember/service";
 
-export default Component.extend({
-  classNameBindings: [
-    ":modal",
-    ":d-modal",
-    "modalClass",
-    "modalStyle",
-    "hasPanels",
-  ],
-  attributeBindings: [
-    "data-keyboard",
-    "aria-modal",
-    "role",
-    "ariaLabelledby:aria-labelledby",
-  ],
-  submitOnEnter: true,
-  dismissable: true,
-  title: null,
-  titleAriaElementId: null,
-  subtitle: null,
-  role: "dialog",
-  headerClass: null,
+export const CLOSE_INITIATED_BY_BUTTON = "initiatedByCloseButton";
+export const CLOSE_INITIATED_BY_ESC = "initiatedByESC";
+export const CLOSE_INITIATED_BY_CLICK_OUTSIDE = "initiatedByClickOut";
+export const CLOSE_INITIATED_BY_MODAL_SHOW = "initiatedByModalShow";
 
-  init() {
-    this._super(...arguments);
+const FLASH_TYPES = ["success", "error", "warning", "info"];
 
-    // If we need to render a second modal for any reason, we can't
-    // use `elementId`
-    if (this.modalStyle !== "inline-modal") {
-      this.set("elementId", "discourse-modal");
-      this.set("modalStyle", "fixed-modal");
-    }
-  },
+export default class DModal extends Component {
+  @service modal;
+  @tracked wrapperElement;
 
-  // We handle ESC ourselves
-  "data-keyboard": "false",
-  // Inform screenreaders of the modal
-  "aria-modal": "true",
-
-  @discourseComputed("title", "titleAriaElementId")
-  ariaLabelledby(title, titleAriaElementId) {
-    if (titleAriaElementId) {
-      return titleAriaElementId;
-    }
-    if (title) {
-      return "discourse-modal-title";
-    }
-
-    return;
-  },
-
-  @on("didInsertElement")
-  setUp() {
-    this.appEvents.on("modal:body-shown", this, "_modalBodyShown");
+  @action
+  setupListeners(element) {
     document.documentElement.addEventListener(
       "keydown",
-      this._handleModalEvents
+      this.handleDocumentKeydown
     );
-  },
+    this.wrapperElement = element;
+    this.trapTab();
+  }
 
-  @on("willDestroyElement")
-  cleanUp() {
-    this.appEvents.off("modal:body-shown", this, "_modalBodyShown");
+  @action
+  cleanupListeners() {
     document.documentElement.removeEventListener(
       "keydown",
-      this._handleModalEvents
+      this.handleDocumentKeydown
     );
-  },
+  }
 
-  triggerClickOnEnter(e) {
-    if (!this.submitOnEnter) {
+  get dismissable() {
+    if (!this.args.closeModal) {
+      return false;
+    } else if ("dismissable" in this.args) {
+      return this.args.dismissable;
+    } else {
+      return true;
+    }
+  }
+
+  shouldTriggerClickOnEnter(event) {
+    if (this.args.submitOnEnter === false) {
       return false;
     }
 
     // skip when in a form or a textarea element
     if (
-      e.target.closest("form") ||
-      (document.activeElement && document.activeElement.nodeName === "TEXTAREA")
+      event.target.closest("form") ||
+      document.activeElement?.nodeName === "TEXTAREA"
     ) {
       return false;
     }
 
     return true;
-  },
+  }
+
+  @action
+  handleMouseUp(e) {
+    if (e.button !== 0) {
+      return; // Non-default mouse button
+    }
 
-  mouseDown(e) {
     if (!this.dismissable) {
       return;
     }
-    const $target = $(e.target);
+
     if (
-      $target.hasClass("modal-middle-container") ||
-      $target.hasClass("modal-outer-container")
+      e.target.classList.contains("modal-middle-container") ||
+      e.target.classList.contains("modal-outer-container")
     ) {
-      // Send modal close (which bubbles to ApplicationRoute) if clicked outside.
-      // We do this because some CSS of ours seems to cover the backdrop and makes
-      // it unclickable.
-      return (
-        this.attrs.closeModal && this.attrs.closeModal("initiatedByClickOut")
-      );
+      return this.args.closeModal?.({
+        initiatedBy: CLOSE_INITIATED_BY_CLICK_OUTSIDE,
+      });
     }
-  },
+  }
 
-  _modalBodyShown(data) {
-    if (this.isDestroying || this.isDestroyed) {
-      return;
-    }
-
-    if (data.fixed) {
-      this.element.classList.remove("hidden");
-    }
-
-    if (data.title) {
-      this.set("title", I18n.t(data.title));
-    } else if (data.rawTitle) {
-      this.set("title", data.rawTitle);
-    }
-
-    if (data.subtitle) {
-      this.set("subtitle", I18n.t(data.subtitle));
-    } else if (data.rawSubtitle) {
-      this.set("subtitle", data.rawSubtitle);
-    } else {
-      // if no subtitle provided, makes sure the previous subtitle
-      // of another modal is not used
-      this.set("subtitle", null);
-    }
-
-    if ("submitOnEnter" in data) {
-      this.set("submitOnEnter", data.submitOnEnter);
-    }
-
-    if ("dismissable" in data) {
-      this.set("dismissable", data.dismissable);
-    } else {
-      this.set("dismissable", true);
-    }
-
-    this.set("headerClass", data.headerClass || null);
-
-    schedule("afterRender", () => {
-      this._trapTab();
-    });
-  },
-
-  @bind
-  _handleModalEvents(event) {
-    if (this.element.classList.contains("hidden")) {
+  @action
+  handleDocumentKeydown(event) {
+    if (this.args.hidden) {
       return;
     }
 
     if (event.key === "Escape" && this.dismissable) {
-      next(() => this.attrs.closeModal("initiatedByESC"));
+      this.args.closeModal({ initiatedBy: CLOSE_INITIATED_BY_ESC });
     }
-    if (event.key === "Enter" && this.triggerClickOnEnter(event)) {
-      this.element?.querySelector(".modal-footer .btn-primary")?.click();
+
+    if (event.key === "Enter" && this.shouldTriggerClickOnEnter(event)) {
+      this.wrapperElement.querySelector(".modal-footer .btn-primary")?.click();
       event.preventDefault();
     }
-    if (event.key === "Tab") {
-      this._trapTab(event);
-    }
-  },
 
-  _trapTab(event) {
-    if (this.element.classList.contains("hidden")) {
+    if (event.key === "Tab") {
+      this.trapTab(event);
+    }
+  }
+
+  @action
+  trapTab(event) {
+    if (this.args.hidden) {
       return true;
     }
 
-    const innerContainer = this.element.querySelector(".modal-inner-container");
+    const innerContainer = this.wrapperElement.querySelector(
+      ".modal-inner-container"
+    );
     if (!innerContainer) {
       return;
     }
@@ -190,18 +127,21 @@ export default Component.extend({
         // attempt to focus the first of the focusable elements or just the modal-body
         // to make it possible to scroll with arrow down/up
         (
+          autofocusedElement ||
           innerContainer.querySelector(
             focusableElements + ", button:not(.modal-close)"
-          ) || innerContainer.querySelector(".modal-body")
+          ) ||
+          innerContainer.querySelector(".modal-body")
         )?.focus();
       }
 
       return;
     }
 
-    focusableElements = focusableElements + ", button:enabled";
+    focusableElements += ", button:enabled";
+
     const firstFocusableElement =
-      innerContainer.querySelectorAll(focusableElements)?.[0];
+      innerContainer.querySelector(focusableElements);
     const focusableContent = innerContainer.querySelectorAll(focusableElements);
     const lastFocusableElement = focusableContent[focusableContent.length - 1];
 
@@ -218,5 +158,31 @@ export default Component.extend({
         event.preventDefault();
       }
     }
-  },
-});
+  }
+
+  @action
+  handleCloseButton() {
+    this.args.closeModal({ initiatedBy: CLOSE_INITIATED_BY_BUTTON });
+  }
+
+  @action
+  validateFlashType(type) {
+    if (type && !FLASH_TYPES.includes(type)) {
+      throw `@flashType must be one of ${FLASH_TYPES.join(", ")}`;
+    }
+  }
+
+  // Could be optimised to remove classic component once RFC389 is implemented
+  // https://rfcs.emberjs.com/id/0389-dynamic-tag-names
+  @cached
+  get dynamicElement() {
+    const tagName = this.args.tagName || "div";
+    if (!["div", "form"].includes(tagName)) {
+      throw `@tagName must be form or div`;
+    }
+
+    return class WrapperComponent extends ClassicComponent {
+      tagName = tagName;
+    };
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/d-navigation-item.hbs b/app/assets/javascripts/discourse/app/components/d-navigation-item.hbs
new file mode 100644
index 00000000000..66b1018c4fb
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/d-navigation-item.hbs
@@ -0,0 +1,10 @@
+<li
+  aria-current={{this.ariaCurrent}}
+  title={{@title}}
+  class={{@class}}
+  ...attributes
+>
+  <LinkTo @route={{@route}}>
+    {{yield}}
+  </LinkTo>
+</li>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/d-navigation-item.js b/app/assets/javascripts/discourse/app/components/d-navigation-item.js
index bb32a384900..3aee34f7a31 100644
--- a/app/assets/javascripts/discourse/app/components/d-navigation-item.js
+++ b/app/assets/javascripts/discourse/app/components/d-navigation-item.js
@@ -1,17 +1,29 @@
-import Component from "@ember/component";
-import { computed } from "@ember/object";
+import Component from "@glimmer/component";
 import { inject as service } from "@ember/service";
 
-export default Component.extend({
-  tagName: "li",
+export default class DNavigationItem extends Component {
+  @service router;
 
-  route: null,
+  get ariaCurrent() {
+    // when there are multiple levels of navigation
+    // we want the active parent to get `aria-current="page"`
+    // and the active child to get `aria-current="location"`
+    if (
+      this.args.ariaCurrentContext === "parentNav" &&
+      this.router.currentRouteName !== this.args.route && // not the current route
+      this.router.currentRoute.parent.name.includes(this.args.route) // but is the current parent route
+    ) {
+      return "page";
+    }
 
-  router: service(),
+    if (this.router.currentRouteName !== this.args.route) {
+      return null;
+    }
 
-  attributeBindings: ["ariaCurrent:aria-current", "title"],
-
-  ariaCurrent: computed("router.currentRouteName", "route", function () {
-    return this.router.currentRouteName === this.route ? "page" : null;
-  }),
-});
+    if (this.args.ariaCurrentContext === "subNav") {
+      return "location";
+    } else {
+      return "page";
+    }
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs b/app/assets/javascripts/discourse/app/components/d-navigation.hbs
similarity index 93%
rename from app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
rename to app/assets/javascripts/discourse/app/components/d-navigation.hbs
index 07b8ba8d15b..e91c42db8ba 100644
--- a/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
+++ b/app/assets/javascripts/discourse/app/components/d-navigation.hbs
@@ -51,8 +51,7 @@
   <PluginOutlet
     @name="before-create-topic-button"
     @connectorTagName="div"
-    @tagName=""
-    @args={{hash
+    @outletArgs={{hash
       canCreateTopic=this.canCreateTopic
       createTopicDisabled=this.createTopicDisabled
       createTopicLabel=this.createTopicLabel
@@ -69,13 +68,16 @@
     @label={{this.createTopicLabel}}
     @btnClass={{this.createTopicClass}}
     @canCreateTopicOnTag={{this.canCreateTopicOnTag}}
-  />
+  >
+    {{#if this.createTopicButtonDisabled}}
+      <DTooltip>{{i18n "topic.create_disabled_category"}}</DTooltip>
+    {{/if}}
+  </CreateTopicButton>
 
   <PluginOutlet
     @name="after-create-topic-button"
     @connectorTagName="div"
-    @tagName=""
-    @args={{hash
+    @outletArgs={{hash
       canCreateTopic=this.canCreateTopic
       createTopicDisabled=this.createTopicDisabled
       createTopicLabel=this.createTopicLabel
diff --git a/app/assets/javascripts/discourse/app/components/d-navigation.js b/app/assets/javascripts/discourse/app/components/d-navigation.js
index 2153fc5f9ce..73e63a5d21e 100644
--- a/app/assets/javascripts/discourse/app/components/d-navigation.js
+++ b/app/assets/javascripts/discourse/app/components/d-navigation.js
@@ -4,6 +4,7 @@ import NavItem from "discourse/models/nav-item";
 import discourseComputed from "discourse-common/utils/decorators";
 import { NotificationLevels } from "discourse/lib/notification-levels";
 import { getOwner } from "discourse-common/lib/get-owner";
+import { htmlSafe } from "@ember/template";
 import { inject as service } from "@ember/service";
 
 export default Component.extend(FilterModeMixin, {
@@ -157,7 +158,7 @@ export default Component.extend(FilterModeMixin, {
 
     clickCreateTopicButton() {
       if (this.categoryReadOnlyBanner && !this.hasDraft) {
-        this.dialog.alert(this.categoryReadOnlyBanner);
+        this.dialog.alert({ message: htmlSafe(this.categoryReadOnlyBanner) });
       } else {
         this.createTopic();
       }
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-popover.hbs b/app/assets/javascripts/discourse/app/components/d-popover.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/d-popover.hbs
rename to app/assets/javascripts/discourse/app/components/d-popover.hbs
diff --git a/app/assets/javascripts/discourse/app/components/d-section.js b/app/assets/javascripts/discourse/app/components/d-section.js
index 515f4b5ed75..3746a3855d6 100644
--- a/app/assets/javascripts/discourse/app/components/d-section.js
+++ b/app/assets/javascripts/discourse/app/components/d-section.js
@@ -1,36 +1,13 @@
-import deprecated from "discourse-common/lib/deprecated";
 import Component from "@ember/component";
-import { scrollTop } from "discourse/mixins/scroll-top";
 import { scheduleOnce } from "@ember/runloop";
 
-// Can add a body class from within a component, also will scroll to the top automatically.
+// Can add a body class from within a component
 export default class extends Component {
   tagName = null;
   pageClass = null;
   bodyClass = null;
-  scrollTop = true;
   currentClasses = new Set();
 
-  didInsertElement() {
-    this._super(...arguments);
-
-    if (this.scrollTop === "false") {
-      deprecated("Uses boolean instead of string for scrollTop.", {
-        since: "2.8.0.beta9",
-        dropFrom: "2.9.0.beta1",
-        id: "discourse.d-section.scroll-top-boolean",
-      });
-
-      return;
-    }
-
-    if (!this.scrollTop) {
-      return;
-    }
-
-    scrollTop();
-  }
-
   didReceiveAttrs() {
     this._super(...arguments);
     scheduleOnce("afterRender", this, this._updateClasses);
diff --git a/app/assets/javascripts/discourse/app/components/d-textarea.js b/app/assets/javascripts/discourse/app/components/d-textarea.js
index 2c231631cf9..a4f296e2dfb 100644
--- a/app/assets/javascripts/discourse/app/components/d-textarea.js
+++ b/app/assets/javascripts/discourse/app/components/d-textarea.js
@@ -1,4 +1,4 @@
-import TextArea from "@ember/component/text-area";
+import { TextArea } from "@ember/legacy-built-in-components";
 
 export default TextArea.extend({
   attributeBindings: ["aria-label"],
diff --git a/app/assets/javascripts/discourse/app/components/d-toggle-switch.hbs b/app/assets/javascripts/discourse/app/components/d-toggle-switch.hbs
new file mode 100644
index 00000000000..bb04752856c
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/d-toggle-switch.hbs
@@ -0,0 +1,23 @@
+<div class="d-toggle-switch">
+  <label class="d-toggle-switch--label">
+    {{! template-lint-disable no-redundant-role }}
+    <button
+      class="d-toggle-switch__checkbox"
+      type="button"
+      role="switch"
+      aria-checked={{this.checked}}
+      ...attributes
+    ></button>
+    {{! template-lint-enable no-redundant-role }}
+
+    <span class="d-toggle-switch__checkbox-slider">
+      {{#if @state}}
+        {{d-icon "check"}}
+      {{/if}}
+    </span>
+  </label>
+
+  <span class="d-toggle-switch__checkbox-label">
+    {{this.computedLabel}}
+  </span>
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/d-toggle-switch.js b/app/assets/javascripts/discourse/app/components/d-toggle-switch.js
new file mode 100644
index 00000000000..0bd175dd11d
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/d-toggle-switch.js
@@ -0,0 +1,15 @@
+import Component from "@glimmer/component";
+import I18n from "I18n";
+
+export default class DToggleSwitch extends Component {
+  get computedLabel() {
+    if (this.args.label) {
+      return I18n.t(this.args.label);
+    }
+    return this.args.translatedLabel;
+  }
+
+  get checked() {
+    return this.args.state ? "true" : "false";
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/d-tooltip.gjs b/app/assets/javascripts/discourse/app/components/d-tooltip.gjs
new file mode 100644
index 00000000000..1f0a9719f59
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/d-tooltip.gjs
@@ -0,0 +1,41 @@
+import Component from "@glimmer/component";
+import didInsert from "@ember/render-modifiers/modifiers/did-insert";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+import { iconHTML } from "discourse-common/lib/icon-library";
+import tippy from "tippy.js";
+
+export default class DiscourseTooltip extends Component {
+  <template>
+    {{! template-lint-disable modifier-name-case }}
+    <div {{didInsert this.initTippy}}>{{yield}}</div>
+  </template>
+
+  @service capabilities;
+
+  #tippyInstance;
+
+  willDestroy() {
+    super.willDestroy(...arguments);
+    this.#tippyInstance.destroy();
+  }
+
+  stopPropagation(instance, event) {
+    event.preventDefault();
+    event.stopPropagation();
+  }
+
+  @action
+  initTippy(element) {
+    this.#tippyInstance = tippy(element.parentElement, {
+      content: element,
+      interactive: this.args.interactive ?? false,
+      trigger: this.capabilities.touch ? "click" : "mouseenter",
+      theme: this.args.theme || "d-tooltip",
+      arrow: this.args.arrow ? iconHTML("tippy-rounded-arrow") : false,
+      placement: this.args.placement || "bottom-start",
+      onTrigger: this.stopPropagation,
+      onUntrigger: this.stopPropagation,
+    });
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/d-tooltip.js b/app/assets/javascripts/discourse/app/components/d-tooltip.js
deleted file mode 100644
index cb88fd9cefc..00000000000
--- a/app/assets/javascripts/discourse/app/components/d-tooltip.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import Component from "@ember/component";
-import { schedule } from "@ember/runloop";
-import tippy from "tippy.js";
-import Ember from "ember";
-
-export default class DiscourseTooltip extends Component {
-  tagName = "";
-
-  didInsertElement() {
-    this._super(...arguments);
-    this._initTippy();
-  }
-
-  willDestroyElement() {
-    this._super(...arguments);
-    this._tippyInstance.destroy();
-  }
-
-  _initTippy() {
-    schedule("afterRender", () => {
-      // Ember.ViewUtils.getViewBounds is a private API,
-      // but it's not going to be dropped without a public deprecation warning,
-      // see: https://stackoverflow.com/a/50125938/3206146
-      const viewBounds = Ember.ViewUtils.getViewBounds(this);
-      const element = viewBounds.firstNode;
-      const parent = viewBounds.parentElement;
-      this._tippyInstance = tippy(parent, {
-        content: element,
-        trigger: this.capabilities.touch ? "click" : "mouseenter",
-        theme: "d-tooltip",
-        arrow: false,
-        placement: "bottom-start",
-      });
-    });
-  }
-}
diff --git a/app/assets/javascripts/discourse/app/templates/components/date-input.hbs b/app/assets/javascripts/discourse/app/components/date-input.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/date-input.hbs
rename to app/assets/javascripts/discourse/app/components/date-input.hbs
diff --git a/app/assets/javascripts/discourse/app/components/date-input.js b/app/assets/javascripts/discourse/app/components/date-input.js
index 16f12351120..61192bc5e59 100644
--- a/app/assets/javascripts/discourse/app/components/date-input.js
+++ b/app/assets/javascripts/discourse/app/components/date-input.js
@@ -54,7 +54,7 @@ export default Component.extend({
         if (this._picker && this.date) {
           const parsedDate =
             this.date instanceof moment ? this.date : moment(this.date);
-          this._picker.setDate(parsedDate.toDate(), true);
+          this._picker.setDate(parsedDate, true);
         }
       });
     });
@@ -66,7 +66,7 @@ export default Component.extend({
     if (this._picker && this.date) {
       const parsedDate =
         this.date instanceof moment ? this.date : moment(this.date);
-      this._picker.setDate(parsedDate.toDate(), true);
+      this._picker.setDate(parsedDate, true);
     }
 
     if (this._picker && this.relativeDate) {
@@ -75,7 +75,7 @@ export default Component.extend({
           ? this.relativeDate
           : moment(this.relativeDate);
 
-      this._picker.setMinDate(parsedRelativeDate.toDate(), true);
+      this._picker.setMinDate(parsedRelativeDate, true);
     }
 
     if (this._picker && !this.date) {
diff --git a/app/assets/javascripts/discourse/app/components/date-picker-future.js b/app/assets/javascripts/discourse/app/components/date-picker-future.js
index d975498fea8..87e8602f554 100644
--- a/app/assets/javascripts/discourse/app/components/date-picker-future.js
+++ b/app/assets/javascripts/discourse/app/components/date-picker-future.js
@@ -1,8 +1,6 @@
 import DatePicker from "discourse/components/date-picker";
 
 export default DatePicker.extend({
-  layoutName: "components/date-picker",
-
   _opts() {
     return {
       defaultDate: this.defaultDate || moment().add(1, "day").toDate(),
diff --git a/app/assets/javascripts/discourse/app/components/date-picker-past.js b/app/assets/javascripts/discourse/app/components/date-picker-past.js
index d3e90be43f0..7580be5912f 100644
--- a/app/assets/javascripts/discourse/app/components/date-picker-past.js
+++ b/app/assets/javascripts/discourse/app/components/date-picker-past.js
@@ -1,8 +1,6 @@
 import DatePicker from "discourse/components/date-picker";
 
 export default DatePicker.extend({
-  layoutName: "components/date-picker",
-
   _opts() {
     return {
       defaultDate:
diff --git a/app/assets/javascripts/discourse/app/templates/components/date-picker.hbs b/app/assets/javascripts/discourse/app/components/date-picker.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/date-picker.hbs
rename to app/assets/javascripts/discourse/app/components/date-picker.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/date-time-input-range.hbs b/app/assets/javascripts/discourse/app/components/date-time-input-range.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/date-time-input-range.hbs
rename to app/assets/javascripts/discourse/app/components/date-time-input-range.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/date-time-input.hbs b/app/assets/javascripts/discourse/app/components/date-time-input.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/date-time-input.hbs
rename to app/assets/javascripts/discourse/app/components/date-time-input.hbs
diff --git a/app/assets/javascripts/discourse/app/components/date-time-input.js b/app/assets/javascripts/discourse/app/components/date-time-input.js
index 864c1aeacbb..718f700b22c 100644
--- a/app/assets/javascripts/discourse/app/components/date-time-input.js
+++ b/app/assets/javascripts/discourse/app/components/date-time-input.js
@@ -66,7 +66,7 @@ export default Component.extend({
     );
   },
 
-  @computed
+  @computed("timezone")
   get resolvedTimezone() {
     return this.timezone || moment.tz.guess();
   },
diff --git a/app/assets/javascripts/discourse/app/templates/components/desktop-notification-config.hbs b/app/assets/javascripts/discourse/app/components/desktop-notification-config.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/desktop-notification-config.hbs
rename to app/assets/javascripts/discourse/app/components/desktop-notification-config.hbs
diff --git a/app/assets/javascripts/discourse/app/components/dialog-messages/group-delete.hbs b/app/assets/javascripts/discourse/app/components/dialog-messages/group-delete.hbs
new file mode 100644
index 00000000000..b6d45b96cb0
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/dialog-messages/group-delete.hbs
@@ -0,0 +1,20 @@
+{{#if @model.members.length}}
+  <p>
+    {{d-icon "users"}}
+    {{i18n "admin.groups.delete_details" count=@model.members.length}}
+  </p>
+{{/if}}
+{{#if @model.message_count}}
+  <p>
+    {{d-icon "envelope"}}
+    {{i18n
+      "admin.groups.delete_with_messages_confirm"
+      count=@model.message_count
+    }}
+  </p>
+{{/if}}
+
+<p>
+  {{d-icon "exclamation-triangle"}}
+  {{i18n "admin.groups.delete_warning"}}
+</p>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/dialog-messages/second-factor-confirm-phrase.hbs b/app/assets/javascripts/discourse/app/components/dialog-messages/second-factor-confirm-phrase.hbs
new file mode 100644
index 00000000000..47faec691fc
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/dialog-messages/second-factor-confirm-phrase.hbs
@@ -0,0 +1,32 @@
+{{i18n "user.second_factor.delete_confirm_header"}}
+
+<ul>
+  {{#each @model.totps as |totp|}}
+    <li>{{totp.name}}</li>
+  {{/each}}
+
+  {{#each @model.security_keys as |sk|}}
+    <li>{{sk.name}}</li>
+  {{/each}}
+
+  {{#if this.currentUser.second_factor_backup_enabled}}
+    <li>{{i18n "user.second_factor_backup.title"}}</li>
+  {{/if}}
+</ul>
+
+<p>
+  {{html-safe
+    (i18n
+      "user.second_factor.delete_confirm_instruction"
+      confirm=this.disabledString
+    )
+  }}
+</p>
+
+<TextField
+  @value={{this.confirmPhraseInput}}
+  {{on "input" this.onConfirmPhraseInput}}
+  @id="confirm-phrase"
+  @autocorrect="off"
+  @autocapitalize="off"
+/>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/dialog-messages/second-factor-confirm-phrase.js b/app/assets/javascripts/discourse/app/components/dialog-messages/second-factor-confirm-phrase.js
new file mode 100644
index 00000000000..267352f6890
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/dialog-messages/second-factor-confirm-phrase.js
@@ -0,0 +1,22 @@
+import Component from "@glimmer/component";
+import I18n from "I18n";
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+import { tracked } from "@glimmer/tracking";
+
+export default class SecondFactorConfirmPhrase extends Component {
+  @service dialog;
+  @service currentUser;
+
+  @tracked confirmPhraseInput = "";
+  disabledString = I18n.t("user.second_factor.disable");
+
+  @action
+  onConfirmPhraseInput() {
+    if (this.confirmPhraseInput === this.disabledString) {
+      this.dialog.set("confirmButtonDisabled", false);
+    } else {
+      this.dialog.set("confirmButtonDisabled", true);
+    }
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/directory-item.hbs b/app/assets/javascripts/discourse/app/components/directory-item.hbs
new file mode 100644
index 00000000000..e05a5367c79
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/directory-item.hbs
@@ -0,0 +1,38 @@
+<div class="directory-table__cell">
+  <UserInfo @user={{this.item.user}} />
+</div>
+
+{{#each this.columns as |column|}}
+  {{#if (directory-column-is-user-field column=column)}}
+    <div class="directory-table__cell--user-field">
+      <span class="directory-table__label">
+        <span>{{column.name}}</span>
+      </span>
+      {{directory-item-user-field-value item=this.item column=column}}
+    </div>
+  {{else}}
+    <div class="directory-table__cell">
+      <span class="directory-table__label">
+        <span>
+          {{#if column.icon}}
+            {{d-icon column.icon}}
+          {{/if}}
+          {{directory-item-label item=this.item column=column}}
+        </span>
+      </span>
+      {{directory-item-value item=this.item column=column}}
+    </div>
+  {{/if}}
+
+{{/each}}
+
+{{#if this.showTimeRead}}
+  <div class="directory-table__cell time-read">
+    <span class="directory-table__label">
+      <span>{{i18n "directory.time_read"}}</span>
+    </span>
+    <span class="directory-table__value">
+      {{format-duration this.item.time_read}}
+    </span>
+  </div>
+{{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/directory-item.js b/app/assets/javascripts/discourse/app/components/directory-item.js
index 0b557d6672a..f1b4e15a829 100644
--- a/app/assets/javascripts/discourse/app/components/directory-item.js
+++ b/app/assets/javascripts/discourse/app/components/directory-item.js
@@ -2,7 +2,8 @@ import Component from "@ember/component";
 import { propertyEqual } from "discourse/lib/computed";
 
 export default Component.extend({
-  tagName: "tr",
+  tagName: "div",
+  classNames: ["directory-table__row"],
   classNameBindings: ["me"],
   me: propertyEqual("item.user.id", "currentUser.id"),
   columns: null,
diff --git a/app/assets/javascripts/discourse/app/components/directory-table.hbs b/app/assets/javascripts/discourse/app/components/directory-table.hbs
new file mode 100644
index 00000000000..f9aa74ba30a
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/directory-table.hbs
@@ -0,0 +1,37 @@
+<ResponsiveTable>
+  <:header>
+    <TableHeaderToggle
+      @field="username"
+      @order={{this.order}}
+      @asc={{this.asc}}
+    />
+    {{#each this.columns as |column|}}
+      <TableHeaderToggle
+        @field={{column.name}}
+        @icon={{column.icon}}
+        @order={{this.order}}
+        @asc={{this.asc}}
+        @automatic={{directory-column-is-automatic column=column}}
+        @translated={{column.user_field_id}}
+        @onActiveRender={{this.setActiveHeader}}
+      />
+    {{/each}}
+
+    {{#if this.showTimeRead}}
+      <div class="directory-table__column-header">
+        <div class="header-contents">
+          {{i18n "directory.time_read"}}
+        </div>
+      </div>
+    {{/if}}
+  </:header>
+  <:body>
+    {{#each this.items as |item|}}
+      <DirectoryItem
+        @item={{item}}
+        @columns={{this.columns}}
+        @showTimeRead={{this.showTimeRead}}
+      />
+    {{/each}}
+  </:body>
+</ResponsiveTable>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/directory-table.js b/app/assets/javascripts/discourse/app/components/directory-table.js
index 08cb163562c..cf031759516 100644
--- a/app/assets/javascripts/discourse/app/components/directory-table.js
+++ b/app/assets/javascripts/discourse/app/components/directory-table.js
@@ -2,109 +2,31 @@ import Component from "@ember/component";
 import { action } from "@ember/object";
 
 export default Component.extend({
-  lastScrollPosition: 0,
-  ticking: false,
-  _topHorizontalScrollBar: null,
-  _tableContainer: null,
   _table: null,
-  _fakeScrollContent: null,
 
   didInsertElement() {
     this._super(...arguments);
     this.setProperties({
-      _tableContainer: this.element.querySelector(".directory-table-container"),
-      _topHorizontalScrollBar: this.element.querySelector(
-        ".directory-table-top-scroll"
-      ),
-      _fakeScrollContent: this.element.querySelector(
-        ".directory-table-top-scroll-fake-content"
-      ),
       _table: this.element.querySelector(".directory-table"),
+      _columnCount: this.showTimeRead
+        ? this.attrs.columns.value.length + 1
+        : this.attrs.columns.value.length,
     });
 
-    this._tableContainer.addEventListener("scroll", this.onBottomScroll);
-    this._topHorizontalScrollBar.addEventListener("scroll", this.onTopScroll);
-
-    // Set active header might have already scrolled the _tableContainer.
-    // Call onHorizontalScroll manually to scroll the _topHorizontalScrollBar
-    this.onResize();
-    this.onHorizontalScroll(this._tableContainer, this._topHorizontalScrollBar);
-    window.addEventListener("resize", this.onResize);
-  },
-
-  @action
-  onResize() {
-    if (
-      this._tableContainer.getBoundingClientRect().bottom < window.innerHeight
-    ) {
-      // Bottom of the table is visible. Hide the scrollbar
-      this._fakeScrollContent.style.height = 0;
-    } else {
-      this._fakeScrollContent.style.width = `${this._table.offsetWidth}px`;
-      this._fakeScrollContent.style.height = "1px";
-    }
-  },
-
-  @action
-  onTopScroll() {
-    this.onHorizontalScroll(this._topHorizontalScrollBar, this._tableContainer);
-  },
-
-  @action
-  onBottomScroll() {
-    this.onHorizontalScroll(this._tableContainer, this._topHorizontalScrollBar);
-  },
-
-  @action
-  onHorizontalScroll(primary, replica) {
-    if (
-      this.isDestroying ||
-      this.isDestroyed ||
-      this.lastScrollPosition === primary.scrollLeft
-    ) {
-      return;
-    }
-
-    this.set("lastScrollPosition", primary.scrollLeft);
-
-    if (!this.ticking) {
-      window.requestAnimationFrame(() => {
-        if (!this.isDestroying && !this.isDestroyed) {
-          replica.scrollLeft = this.lastScrollPosition;
-          this.set("ticking", false);
-        }
-      });
-
-      this.set("ticking", true);
-    }
-  },
-
-  willDestroyElement() {
-    this._tableContainer.removeEventListener("scroll", this.onBottomScroll);
-    this._topHorizontalScrollBar.removeEventListener(
-      "scroll",
-      this.onTopScroll
-    );
-    window.removeEventListener("resize", this.onResize);
+    this._table.style.gridTemplateColumns = `minmax(13em, 3fr) repeat(${this._columnCount}, minmax(max-content, 1fr))`;
   },
 
   @action
   setActiveHeader(header) {
     // After render, scroll table left to ensure the order by column is visible
-    if (!this._tableContainer) {
-      this.set(
-        "_tableContainer",
-        document.querySelector(".directory-table-container")
-      );
+    if (!this._table) {
+      this.set("_table", document.querySelector(".directory-table"));
     }
     const scrollPixels =
-      header.offsetLeft +
-      header.offsetWidth +
-      10 -
-      this._tableContainer.offsetWidth;
+      header.offsetLeft + header.offsetWidth + 10 - this._table.offsetWidth;
 
     if (scrollPixels > 0) {
-      this._tableContainer.scrollLeft = scrollPixels;
+      this._table.scrollLeft = scrollPixels;
     }
   },
 });
diff --git a/app/assets/javascripts/discourse/app/templates/components/disabled-icon.hbs b/app/assets/javascripts/discourse/app/components/disabled-icon.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/disabled-icon.hbs
rename to app/assets/javascripts/discourse/app/components/disabled-icon.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/discourse-banner.hbs b/app/assets/javascripts/discourse/app/components/discourse-banner.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/discourse-banner.hbs
rename to app/assets/javascripts/discourse/app/components/discourse-banner.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/discourse-linked-text.hbs b/app/assets/javascripts/discourse/app/components/discourse-linked-text.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/discourse-linked-text.hbs
rename to app/assets/javascripts/discourse/app/components/discourse-linked-text.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/discourse-tag-bound.hbs b/app/assets/javascripts/discourse/app/components/discourse-tag-bound.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/discourse-tag-bound.hbs
rename to app/assets/javascripts/discourse/app/components/discourse-tag-bound.hbs
diff --git a/app/assets/javascripts/discourse/app/components/discovery-topics-list.js b/app/assets/javascripts/discourse/app/components/discovery-topics-list.js
index 4821ade3736..9a1e6038c07 100644
--- a/app/assets/javascripts/discourse/app/components/discovery-topics-list.js
+++ b/app/assets/javascripts/discourse/app/components/discovery-topics-list.js
@@ -1,5 +1,4 @@
 import { observes, on } from "discourse-common/utils/decorators";
-import { next, schedule, scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import LoadMore from "discourse/mixins/load-more";
 import UrlRefresh from "discourse/mixins/url-refresh";
@@ -10,29 +9,18 @@ export default Component.extend(UrlRefresh, LoadMore, {
   eyelineSelector: ".topic-list-item",
   documentTitle: service(),
 
-  @on("didInsertElement")
-  @observes("model")
-  _readjustScrollPosition() {
-    const scrollTo = this.session.topicListScrollPosition;
-    if (scrollTo >= 0) {
-      schedule("afterRender", () => {
-        if (this.element && !this.isDestroying && !this.isDestroyed) {
-          next(() => window.scrollTo(0, scrollTo));
-        }
-      });
-    } else {
-      scheduleOnce("afterRender", this, this.loadMoreUnlessFull);
-    }
-  },
-
   @on("didInsertElement")
   _monitorTrackingState() {
-    this.topicTrackingState.onStateChange(() => this._updateTrackingTopics());
+    this.stateChangeCallbackId = this.topicTrackingState.onStateChange(() =>
+      this._updateTrackingTopics()
+    );
   },
 
   @on("willDestroyElement")
   _removeTrackingStateChangeMonitor() {
-    this.topicTrackingState.offStateChange(this.stateChangeCallbackId);
+    if (this.stateChangeCallbackId) {
+      this.topicTrackingState.offStateChange(this.stateChangeCallbackId);
+    }
   },
 
   _updateTrackingTopics() {
@@ -44,10 +32,6 @@ export default Component.extend(UrlRefresh, LoadMore, {
     this.documentTitle.updateContextCount(this.incomingCount);
   },
 
-  saveScrollPosition() {
-    this.session.set("topicListScrollPosition", $(window).scrollTop());
-  },
-
   actions: {
     loadMore() {
       this.documentTitle.updateContextCount(0);
@@ -60,7 +44,6 @@ export default Component.extend(UrlRefresh, LoadMore, {
         ) {
           this.addTopicsToBulkSelect(newTopics);
         }
-        schedule("afterRender", () => this.saveScrollPosition());
         if (moreTopicsUrl && $(window).height() >= $(document).height()) {
           this.send("loadMore");
         }
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-general.hbs b/app/assets/javascripts/discourse/app/components/edit-category-general.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/edit-category-general.hbs
rename to app/assets/javascripts/discourse/app/components/edit-category-general.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-images.hbs b/app/assets/javascripts/discourse/app/components/edit-category-images.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/edit-category-images.hbs
rename to app/assets/javascripts/discourse/app/components/edit-category-images.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-panel.hbs b/app/assets/javascripts/discourse/app/components/edit-category-panel.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/edit-category-panel.hbs
rename to app/assets/javascripts/discourse/app/components/edit-category-panel.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-security.hbs b/app/assets/javascripts/discourse/app/components/edit-category-security.hbs
similarity index 93%
rename from app/assets/javascripts/discourse/app/templates/components/edit-category-security.hbs
rename to app/assets/javascripts/discourse/app/components/edit-category-security.hbs
index acb0ae027b9..31ec87b07e9 100644
--- a/app/assets/javascripts/discourse/app/templates/components/edit-category-security.hbs
+++ b/app/assets/javascripts/discourse/app/components/edit-category-security.hbs
@@ -55,8 +55,9 @@
   {{/unless}}
 </section>
 
-<PluginOutlet
-  @name="category-custom-security"
-  @args={{hash category=this.category}}
-  @tagName="section"
-/>
\ No newline at end of file
+<section>
+  <PluginOutlet
+    @name="category-custom-security"
+    @outletArgs={{hash category=this.category}}
+  />
+</section>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-settings.hbs b/app/assets/javascripts/discourse/app/components/edit-category-settings.hbs
similarity index 89%
rename from app/assets/javascripts/discourse/app/templates/components/edit-category-settings.hbs
rename to app/assets/javascripts/discourse/app/components/edit-category-settings.hbs
index 5d1ab2c2375..2a36e0531d3 100644
--- a/app/assets/javascripts/discourse/app/templates/components/edit-category-settings.hbs
+++ b/app/assets/javascripts/discourse/app/components/edit-category-settings.hbs
@@ -4,11 +4,12 @@
       <label for="category-position">
         {{i18n "category.position"}}
       </label>
-      <TextField
-        @value={{this.category.position}}
+      <NumberField
+        @number={{this.category.position}}
         @id="category-position"
         @class="position-input"
         @type="number"
+        @min="0"
       />
     </section>
   {{/if}}
@@ -34,10 +35,11 @@
         {{i18n "category.num_featured_topics"}}
       {{/if}}
     </label>
-    <TextField
-      @value={{this.category.num_featured_topics}}
+    <NumberField
+      @number={{this.category.num_featured_topics}}
       @id="category-number-featured-topics"
       @type="number"
+      @min="1"
     />
   </section>
 
@@ -151,7 +153,6 @@
         <RelativeTimePicker
           @id="category-default-slow-mode"
           @durationMinutes={{this.category.defaultSlowModeMinutes}}
-          @hiddenIntervals={{this.hiddenRelativeIntervals}}
           @onChange={{action "onDefaultSlowModeDurationChange"}}
         />
       </div>
@@ -185,10 +186,23 @@
     <label for="category-number-daily-bump">
       {{i18n "category.num_auto_bump_daily"}}
     </label>
-    <TextField
-      @value={{this.category.custom_fields.num_auto_bump_daily}}
+    <NumberField
+      @number={{this.category.custom_fields.num_auto_bump_daily}}
       @id="category-number-daily-bump"
       @type="number"
+      @min="0"
+    />
+  </section>
+
+  <section class="field auto-bump-cooldown-days">
+    <label for="category-auto-bump-cooldown-days">
+      {{i18n "category.auto_bump_cooldown_days"}}
+    </label>
+    <NumberField
+      @number={{this.category.category_setting.auto_bump_cooldown_days}}
+      @id="category-auto-bump-cooldown-days"
+      @type="number"
+      @min="0"
     />
   </section>
 </section>
@@ -342,26 +356,32 @@
       </label>
     </section>
 
-    <PluginOutlet
-      @name="category-email-in"
-      @tagName="span"
-      @connectorTagName="div"
-      @args={{hash category=this.category}}
-    />
+    <span>
+      <PluginOutlet
+        @name="category-email-in"
+        @connectorTagName="div"
+        @outletArgs={{hash category=this.category}}
+      />
+    </span>
   {{/if}}
 
   {{#unless this.emailInEnabled}}
     <section class="field email-in-disabled">
-      {{i18n "category.email_in_disabled"}}
-      <a href={{get-url "/admin/site_settings/category/email"}}>{{i18n
-          "category.email_in_disabled_click"
-        }}</a>
+      {{html-safe
+        (i18n
+          "category.email_in_disabled"
+          setting_url=(get-url
+            "/admin/site_settings/category/all_results?filter=email_in"
+          )
+        )
+      }}
     </section>
   {{/unless}}
 </section>
 
-<PluginOutlet
-  @name="category-custom-settings"
-  @args={{hash category=this.category}}
-  @tagName="section"
-/>
+<section>
+  <PluginOutlet
+    @name="category-custom-settings"
+    @outletArgs={{hash category=this.category}}
+  />
+</section>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-tab.hbs b/app/assets/javascripts/discourse/app/components/edit-category-tab.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/edit-category-tab.hbs
rename to app/assets/javascripts/discourse/app/components/edit-category-tab.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-tags.hbs b/app/assets/javascripts/discourse/app/components/edit-category-tags.hbs
similarity index 99%
rename from app/assets/javascripts/discourse/app/templates/components/edit-category-tags.hbs
rename to app/assets/javascripts/discourse/app/components/edit-category-tags.hbs
index 5b39eadf2d2..d367e5a3554 100644
--- a/app/assets/javascripts/discourse/app/templates/components/edit-category-tags.hbs
+++ b/app/assets/javascripts/discourse/app/components/edit-category-tags.hbs
@@ -82,4 +82,4 @@
       @class="add-required-tag-group"
     />
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/edit-category-topic-template.hbs b/app/assets/javascripts/discourse/app/components/edit-category-topic-template.hbs
new file mode 100644
index 00000000000..24264bace93
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/edit-category-topic-template.hbs
@@ -0,0 +1,38 @@
+{{#if this.siteSettings.experimental_form_templates}}
+  <div class="control-group">
+    <DToggleSwitch
+      class="toggle-template-type"
+      @state={{this.showFormTemplate}}
+      @label={{this.templateTypeToggleLabel}}
+      {{on "click" this.toggleTemplateType}}
+    />
+  </div>
+
+  {{#if this.showFormTemplate}}
+    <div class="control-group">
+      <FormTemplateChooser
+        @class="select-category-template"
+        @value={{this.category.form_template_ids}}
+        @onChange={{action (mut this.category.form_template_ids)}}
+      />
+
+      <p class="select-category-template__info desc">
+        {{#if this.currentUser.staff}}
+          <LinkTo @route="adminCustomizeFormTemplates">
+            {{i18n "admin.form_templates.edit_category.select_template_help"}}
+          </LinkTo>
+        {{/if}}
+      </p>
+    </div>
+  {{else}}
+    <DEditor
+      @value={{this.category.topic_template}}
+      @showLink={{this.showInsertLinkButton}}
+    />
+  {{/if}}
+{{else}}
+  <DEditor
+    @value={{this.category.topic_template}}
+    @showLink={{this.showInsertLinkButton}}
+  />
+{{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/edit-category-topic-template.js b/app/assets/javascripts/discourse/app/components/edit-category-topic-template.js
index b9125ebf1e0..c921f5f65a1 100644
--- a/app/assets/javascripts/discourse/app/components/edit-category-topic-template.js
+++ b/app/assets/javascripts/discourse/app/components/edit-category-topic-template.js
@@ -1,15 +1,40 @@
 import { buildCategoryPanel } from "discourse/components/edit-category-panel";
-import { observes } from "discourse-common/utils/decorators";
+import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { schedule } from "@ember/runloop";
+import { action, computed } from "@ember/object";
 
 export default buildCategoryPanel("topic-template", {
-  // Modals are defined using the singleton pattern.
-  // Opening the insert link modal will destroy the edit category modal.
-  showInsertLinkButton: false,
+  showFormTemplate: computed("category.form_template_ids", {
+    get() {
+      return Boolean(this.category.form_template_ids.length);
+    },
+    set(key, value) {
+      return value;
+    },
+  }),
 
-  @observes("activeTab")
+  @discourseComputed("showFormTemplate")
+  templateTypeToggleLabel(showFormTemplate) {
+    if (showFormTemplate) {
+      return "admin.form_templates.edit_category.toggle_form_template";
+    }
+
+    return "admin.form_templates.edit_category.toggle_freeform";
+  },
+
+  @action
+  toggleTemplateType() {
+    this.toggleProperty("showFormTemplate");
+
+    if (!this.showFormTemplate) {
+      // Clear associated form templates if switching to freeform
+      this.set("category.form_template_ids", []);
+    }
+  },
+
+  @observes("activeTab", "showFormTemplate")
   _activeTabChanged() {
-    if (this.activeTab) {
+    if (this.activeTab && !this.showFormTemplate) {
       schedule("afterRender", () =>
         this.element.querySelector(".d-editor-input").focus()
       );
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-topic-timer-form.hbs b/app/assets/javascripts/discourse/app/components/edit-topic-timer-form.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/edit-topic-timer-form.hbs
rename to app/assets/javascripts/discourse/app/components/edit-topic-timer-form.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/emoji-group-buttons.hbs b/app/assets/javascripts/discourse/app/components/emoji-group-buttons.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/emoji-group-buttons.hbs
rename to app/assets/javascripts/discourse/app/components/emoji-group-buttons.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/emoji-group-sections.hbs b/app/assets/javascripts/discourse/app/components/emoji-group-sections.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/emoji-group-sections.hbs
rename to app/assets/javascripts/discourse/app/components/emoji-group-sections.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs b/app/assets/javascripts/discourse/app/components/emoji-picker.hbs
similarity index 96%
rename from app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs
rename to app/assets/javascripts/discourse/app/components/emoji-picker.hbs
index c2dc26b2f27..12cd404d667 100644
--- a/app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs
+++ b/app/assets/javascripts/discourse/app/components/emoji-picker.hbs
@@ -1,10 +1,10 @@
 {{#if this.isActive}}
-  {{! template-lint-disable no-invalid-interactive no-down-event-binding }}
+  {{! template-lint-disable no-invalid-interactive no-pointer-down-event-binding }}
   <div
     {{on "keydown" (action "keydown")}}
     class="emoji-picker {{if this.isActive 'opened'}}"
   >
-    {{! template-lint-enable no-invalid-interactive no-down-event-binding }}
+    {{! template-lint-enable no-invalid-interactive no-pointer-down-event-binding }}
     <div class="emoji-picker-category-buttons">
       {{#if this.recentEmojis.length}}
         <button
diff --git a/app/assets/javascripts/discourse/app/components/emoji-picker.js b/app/assets/javascripts/discourse/app/components/emoji-picker.js
index 8a5dec83a65..14657f390dc 100644
--- a/app/assets/javascripts/discourse/app/components/emoji-picker.js
+++ b/app/assets/javascripts/discourse/app/components/emoji-picker.js
@@ -211,10 +211,7 @@ export default Component.extend({
       return false;
     }
 
-    this.set(
-      "hoveredEmoji",
-      this._codeWithDiversity(event.target.title, this.selectedDiversity)
-    );
+    this._updateEmojiPreview(event.target.title);
   },
 
   @action
@@ -255,15 +252,11 @@ export default Component.extend({
 
     let currentEmoji;
 
-    this.set(
-      "hoveredEmoji",
-      this._codeWithDiversity(event.target.title, this.selectedDiversity)
-    );
-
     if (
       event.key === "ArrowDown" &&
       this._focusedOn(this.elements.searchInput)
     ) {
+      this._updateEmojiPreview(emojis[0].title);
       emojis[0].focus();
       event.preventDefault();
       return false;
@@ -284,7 +277,7 @@ export default Component.extend({
       if (fromTopicComposer) {
         document.querySelector(".d-editor-input")?.focus();
       } else if (fromChatComposer) {
-        document.querySelector(".chat-composer-input")?.focus();
+        document.querySelector(".chat-composer__input")?.focus();
       } else {
         document.querySelector("textarea")?.focus();
       }
@@ -306,8 +299,10 @@ export default Component.extend({
         let nextEmoji = currentEmoji + 1;
 
         if (nextEmoji < emojis.length) {
+          this._updateEmojiPreview(emojis[nextEmoji].title);
           emojis[nextEmoji].focus();
         } else if (nextEmoji >= emojis.length) {
+          this._updateEmojiPreview(emojis[0].title);
           emojis[0].focus();
         }
       }
@@ -315,6 +310,7 @@ export default Component.extend({
       if (event.key === "ArrowLeft") {
         const previousEmoji = currentEmoji - 1;
         if (currentEmoji > 0) {
+          this._updateEmojiPreview(emojis[previousEmoji].title);
           emojis[previousEmoji].focus();
         }
       }
@@ -329,7 +325,7 @@ export default Component.extend({
         const emojiBelow = [...emojis]
           .filter((c) => c.offsetTop > active.offsetTop)
           .find((c) => c.offsetLeft === active.offsetLeft);
-
+        this._updateEmojiPreview(emojiBelow.title);
         emojiBelow?.focus();
       }
 
@@ -343,8 +339,10 @@ export default Component.extend({
           .find((c) => c.offsetLeft === active.offsetLeft);
 
         if (emojiAbove) {
+          this._updateEmojiPreview(emojiAbove.title);
           emojiAbove.focus();
         } else {
+          this.set("hoveredEmoji", null);
           document.querySelector(this.elements.searchInput).focus();
         }
       }
@@ -382,6 +380,7 @@ export default Component.extend({
     if (filter) {
       results.innerHTML = emojiSearch(filter.toLowerCase(), {
         diversity: this.emojiStore.diversity,
+        exclude: this.site.denied_emojis,
       })
         .map(this._replaceEmoji)
         .join("");
@@ -467,6 +466,13 @@ export default Component.extend({
     );
   },
 
+  _updateEmojiPreview(title) {
+    return this.set(
+      "hoveredEmoji",
+      this._codeWithDiversity(title, this.selectedDiversity)
+    );
+  },
+
   @bind
   handleOutsideClick(event) {
     const emojiPicker = document.querySelector(".emoji-picker");
diff --git a/app/assets/javascripts/discourse/app/templates/components/emoji-uploader.hbs b/app/assets/javascripts/discourse/app/components/emoji-uploader.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/emoji-uploader.hbs
rename to app/assets/javascripts/discourse/app/components/emoji-uploader.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/empty-state.hbs b/app/assets/javascripts/discourse/app/components/empty-state.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/empty-state.hbs
rename to app/assets/javascripts/discourse/app/components/empty-state.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/expand-post.hbs b/app/assets/javascripts/discourse/app/components/expand-post.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/expand-post.hbs
rename to app/assets/javascripts/discourse/app/components/expand-post.hbs
diff --git a/app/assets/javascripts/discourse/app/components/expanding-text-area.js b/app/assets/javascripts/discourse/app/components/expanding-text-area.js
index 86a15b910b8..58b3dff7961 100644
--- a/app/assets/javascripts/discourse/app/components/expanding-text-area.js
+++ b/app/assets/javascripts/discourse/app/components/expanding-text-area.js
@@ -1,5 +1,5 @@
 import { observes, on } from "discourse-common/utils/decorators";
-import TextArea from "@ember/component/text-area";
+import { TextArea } from "@ember/legacy-built-in-components";
 import autosize from "discourse/lib/autosize";
 import { schedule } from "@ember/runloop";
 
diff --git a/app/assets/javascripts/discourse/app/components/fast-edit.hbs b/app/assets/javascripts/discourse/app/components/fast-edit.hbs
new file mode 100644
index 00000000000..7dc1454bb95
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/fast-edit.hbs
@@ -0,0 +1,19 @@
+{{! template-lint-disable no-pointer-down-event-binding }}
+{{! template-lint-disable no-invalid-interactive }}
+<div class="fast-edit-container" {{on "keydown" this.onKeydown}}>
+  <textarea
+    {{auto-focus}}
+    {{on "input" this.updateValue}}
+    id="fast-edit-input"
+  >{{@initialValue}}</textarea>
+
+  <DButton
+    class="btn-small btn-primary save-fast-edit"
+    @action={{this.save}}
+    @icon="pencil-alt"
+    @label="composer.save_edit"
+    @translatedTitle={{this.buttonTitle}}
+    @isLoading={{this.isSaving}}
+    @disabled={{this.disabled}}
+  />
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/fast-edit.js b/app/assets/javascripts/discourse/app/components/fast-edit.js
new file mode 100644
index 00000000000..448c3965910
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/fast-edit.js
@@ -0,0 +1,59 @@
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import { action } from "@ember/object";
+import { ajax } from "discourse/lib/ajax";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { fixQuotes } from "discourse/components/quote-button";
+import { translateModKey } from "discourse/lib/utilities";
+import I18n from "I18n";
+
+export default class FastEdit extends Component {
+  @tracked value = this.args.initialValue;
+  @tracked isSaving = false;
+
+  buttonTitle = I18n.t("composer.title", {
+    modifier: translateModKey("Meta+"),
+  });
+
+  get disabled() {
+    return this.value === this.args.initialValue;
+  }
+
+  @action
+  onKeydown(event) {
+    if (event.key === "Escape") {
+      this.args.close();
+    } else if (
+      event.key === "Enter" &&
+      (event.ctrlKey || event.metaKey) &&
+      !this.disabled
+    ) {
+      this.save();
+    }
+  }
+
+  @action
+  updateValue(event) {
+    this.value = event.target.value;
+  }
+
+  @action
+  async save() {
+    this.isSaving = true;
+
+    try {
+      const result = await ajax(`/posts/${this.args.post.id}`);
+      const newRaw = result.raw.replace(
+        fixQuotes(this.args.initialValue),
+        fixQuotes(this.value)
+      );
+
+      await this.args.post.save({ raw: newRaw });
+    } catch (error) {
+      popupAjaxError(error);
+    } finally {
+      this.isSaving = false;
+      this.args.close();
+    }
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/templates/components/featured-topic.hbs b/app/assets/javascripts/discourse/app/components/featured-topic.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/featured-topic.hbs
rename to app/assets/javascripts/discourse/app/components/featured-topic.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/flag-action-type.hbs b/app/assets/javascripts/discourse/app/components/flag-action-type.hbs
similarity index 92%
rename from app/assets/javascripts/discourse/app/templates/components/flag-action-type.hbs
rename to app/assets/javascripts/discourse/app/components/flag-action-type.hbs
index 8907e1caf05..684a7f8bc58 100644
--- a/app/assets/javascripts/discourse/app/templates/components/flag-action-type.hbs
+++ b/app/assets/javascripts/discourse/app/components/flag-action-type.hbs
@@ -16,6 +16,7 @@
             name="message"
             class="flag-message"
             placeholder={{this.customPlaceholder}}
+            aria-label={{i18n "flagging.notify_user_textarea_label"}}
             @value={{this.message}}
           />
           <div
@@ -48,6 +49,7 @@
             name="message"
             class="flag-message"
             placeholder={{this.customPlaceholder}}
+            aria-label={{i18n "flagging.notify_moderators_textarea_label"}}
             @value={{this.message}}
           />
           <div
diff --git a/app/assets/javascripts/discourse/app/templates/components/flag-selection.hbs b/app/assets/javascripts/discourse/app/components/flag-selection.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/flag-selection.hbs
rename to app/assets/javascripts/discourse/app/components/flag-selection.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/flat-button.hbs b/app/assets/javascripts/discourse/app/components/flat-button.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/flat-button.hbs
rename to app/assets/javascripts/discourse/app/components/flat-button.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/footer-message.hbs b/app/assets/javascripts/discourse/app/components/footer-message.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/footer-message.hbs
rename to app/assets/javascripts/discourse/app/components/footer-message.hbs
diff --git a/app/assets/javascripts/discourse/app/components/form-template-field/checkbox.hbs b/app/assets/javascripts/discourse/app/components/form-template-field/checkbox.hbs
new file mode 100644
index 00000000000..bac0b91ab3c
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/form-template-field/checkbox.hbs
@@ -0,0 +1,14 @@
+<div class="control-group form-template-field" data-field-type="checkbox">
+  <label class="form-template-field__label">
+    <Input
+      name={{@attributes.label}}
+      class="form-template-field__checkbox"
+      @type="checkbox"
+      required={{if @validations.required "required" ""}}
+    />
+    {{@attributes.label}}
+    {{#if @validations.required}}
+      {{d-icon "asterisk" class="form-template-field__required-indicator"}}
+    {{/if}}
+  </label>
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/form-template-field/dropdown.hbs b/app/assets/javascripts/discourse/app/components/form-template-field/dropdown.hbs
new file mode 100644
index 00000000000..ad6a2328c34
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/form-template-field/dropdown.hbs
@@ -0,0 +1,31 @@
+<div class="control-group form-template-field" data-field-type="dropdown">
+  {{#if @attributes.label}}
+    <label class="form-template-field__label">
+      {{@attributes.label}}
+      {{#if @validations.required}}
+        {{d-icon "asterisk" class="form-template-field__required-indicator"}}
+      {{/if}}
+    </label>
+  {{/if}}
+
+  {{! TODO(@keegan): Update implementation to use <ComboBox/> instead }}
+  {{! Current using <select> as it integrates easily with FormData (will update in v2) }}
+  <select
+    name={{@attributes.label}}
+    class="form-template-field__dropdown"
+    required={{if @validations.required "required" ""}}
+  >
+    {{#if @attributes.none_label}}
+      <option
+        class="form-template-field__dropdown-placeholder"
+        value=""
+        disabled
+        selected
+        hidden
+      >{{@attributes.none_label}}</option>
+    {{/if}}
+    {{#each @choices as |choice|}}
+      <option value={{choice}}>{{choice}}</option>
+    {{/each}}
+  </select>
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/form-template-field/input.hbs b/app/assets/javascripts/discourse/app/components/form-template-field/input.hbs
new file mode 100644
index 00000000000..cf6d827fc53
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/form-template-field/input.hbs
@@ -0,0 +1,22 @@
+<div class="control-group form-template-field" data-field-type="input">
+  {{#if @attributes.label}}
+    <label class="form-template-field__label">
+      {{@attributes.label}}
+      {{#if @validations.required}}
+        {{d-icon "asterisk" class="form-template-field__required-indicator"}}
+      {{/if}}
+    </label>
+
+  {{/if}}
+
+  <Input
+    name={{@attributes.label}}
+    class="form-template-field__input"
+    @type={{if @validations.type @validations.type "text"}}
+    placeholder={{@attributes.placeholder}}
+    required={{if @validations.required "required" ""}}
+    pattern={{@validations.pattern}}
+    minLength={{@validations.min}}
+    maxLength={{@validations.max}}
+  />
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/form-template-field/multi-select.hbs b/app/assets/javascripts/discourse/app/components/form-template-field/multi-select.hbs
new file mode 100644
index 00000000000..4329fb8fafa
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/form-template-field/multi-select.hbs
@@ -0,0 +1,31 @@
+<div class="control-group form-template-field" data-field-type="multi-select">
+  {{#if @attributes.label}}
+    <label class="form-template-field__label">
+      {{@attributes.label}}
+      {{#if @validations.required}}
+        {{d-icon "asterisk" class="form-template-field__required-indicator"}}
+      {{/if}}
+    </label>
+  {{/if}}
+
+  {{! TODO(@keegan): Update implementation to use <MultiSelect/> instead }}
+  {{! Current using <select multiple> as it integrates easily with FormData (will update in v2) }}
+  <select
+    name={{@attributes.label}}
+    class="form-template-field__multi-select"
+    required={{if @validations.required "required" ""}}
+    multiple="multiple"
+  >
+    {{#if @attributes.none_label}}
+      <option
+        class="form-template-field__multi-select-placeholder"
+        value=""
+        disabled
+        hidden
+      >{{@attributes.none_label}}</option>
+    {{/if}}
+    {{#each @choices as |choice|}}
+      <option value={{choice}}>{{choice}}</option>
+    {{/each}}
+  </select>
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/form-template-field/textarea.hbs b/app/assets/javascripts/discourse/app/components/form-template-field/textarea.hbs
new file mode 100644
index 00000000000..5190c4eed51
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/form-template-field/textarea.hbs
@@ -0,0 +1,19 @@
+<div class="control-group form-template-field" data-field-type="textarea">
+  {{#if @attributes.label}}
+    <label class="form-template-field__label">
+      {{@attributes.label}}
+      {{#if @validations.required}}
+        {{d-icon "asterisk" class="form-template-field__required-indicator"}}
+      {{/if}}
+    </label>
+  {{/if}}
+  <Textarea
+    name={{@attributes.label}}
+    class="form-template-field__textarea"
+    placeholder={{@attributes.placeholder}}
+    pattern={{@validations.pattern}}
+    minLength={{@validations.min}}
+    maxLength={{@validations.max}}
+    required={{if @validations.required "required" ""}}
+  />
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/form-template-field/upload.hbs b/app/assets/javascripts/discourse/app/components/form-template-field/upload.hbs
new file mode 100644
index 00000000000..4ce85aba49f
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/form-template-field/upload.hbs
@@ -0,0 +1,41 @@
+<div class="control-group form-template-field" data-field-type="upload">
+  {{#if @attributes.label}}
+    <label class="form-template-field__label">
+      {{@attributes.label}}
+      {{#if @validations.required}}
+        {{d-icon "asterisk" class="form-template-field__required-indicator"}}
+      {{/if}}
+    </label>
+  {{/if}}
+
+  <input type="hidden" name={{@attributes.label}} value={{this.uploadValue}} />
+
+  <PickFilesButton
+    @fileInputClass="form-template-field__upload"
+    @fileInputId={{this.fileUploadElementId}}
+    @allowMultiple={{@attributes.allow_multiple}}
+    @showButton={{true}}
+    @onFilesPicked={{true}}
+    @icon="upload"
+    @label={{this.uploadStatus}}
+    @fileInputDisabled={{this.disabled}}
+    @acceptedFormatsOverride={{@attributes.file_types}}
+    @acceptedFileTypesString={{@attributes.file_types}}
+  />
+
+  {{#if this.uploadedFiles}}
+    <ul class="form-template-field__uploaded-files">
+      {{#each this.uploadedFiles as |file|}}
+        <li>
+          {{d-icon "file"}}
+          <a
+            href={{file.url}}
+            target="_blank"
+            rel="noopener noreferrer"
+          >{{file.file_name}}</a>
+          <span>{{file.human_filesize}}</span>
+        </li>
+      {{/each}}
+    </ul>
+  {{/if}}
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/form-template-field/upload.js b/app/assets/javascripts/discourse/app/components/form-template-field/upload.js
new file mode 100644
index 00000000000..91c609676ca
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/form-template-field/upload.js
@@ -0,0 +1,69 @@
+import Component from "@ember/component";
+import UppyUploadMixin from "discourse/mixins/uppy-upload";
+import { computed } from "@ember/object";
+import { tracked } from "@glimmer/tracking";
+import { dasherize } from "@ember/string";
+import { isAudio, isImage, isVideo } from "discourse/lib/uploads";
+
+export default class FormTemplateFieldUpload extends Component.extend(
+  UppyUploadMixin
+) {
+  @tracked uploadValue;
+  @tracked uploadComplete = false;
+  @tracked uploadedFiles = [];
+  @tracked disabled = this.uploading;
+  @tracked fileUploadElementId = this.attributes?.label
+    ? `${dasherize(this.attributes.label)}-uploader`
+    : `${this.elementId}-uploader`;
+  @tracked fileInputSelector = `#${this.fileUploadElementId}`;
+  @tracked id = this.fileUploadElementId;
+
+  @computed("uploading", "uploadValue")
+  get uploadStatus() {
+    if (!this.uploading && !this.uploadValue) {
+      return "upload";
+    }
+
+    if (!this.uploading && this.uploadValue) {
+      this.uploadComplete = true;
+      return "upload";
+    }
+
+    return "uploading";
+  }
+
+  uploadDone(upload) {
+    // If reuploading, clear the existing file
+    if (this.uploadComplete) {
+      this.uploadedFiles = [];
+      this.uploadValue = "";
+    }
+
+    const uploadMarkdown = this.buildMarkdown(upload);
+    this.uploadedFiles.pushObject(upload);
+
+    if (this.uploadValue && this.allowMultipleFiles) {
+      // multiple file upload
+      this.uploadValue = `${this.uploadValue}\n${uploadMarkdown}`;
+    } else {
+      // single file upload
+      this.uploadValue = uploadMarkdown;
+    }
+  }
+
+  buildMarkdown(upload) {
+    if (isImage(upload.url)) {
+      return `![${upload.file_name}|${upload.width}x${upload.height}](${upload.short_url})`;
+    }
+
+    if (isAudio(upload.url)) {
+      return `![${upload.file_name}|audio](${upload.short_url})`;
+    }
+
+    if (isVideo(upload.url)) {
+      return `![${upload.file_name}|video](${upload.short_url})`;
+    }
+
+    return `[${upload.file_name}|attachment](${upload.short_url}) (${upload.human_filesize})`;
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/form-template-field/wrapper.hbs b/app/assets/javascripts/discourse/app/components/form-template-field/wrapper.hbs
new file mode 100644
index 00000000000..63423359cfb
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/form-template-field/wrapper.hbs
@@ -0,0 +1,19 @@
+{{#if this.parsedTemplate}}
+  <div
+    class="form-template-form__wrapper"
+    {{did-update this.refreshTemplate @id}}
+  >
+    {{#each this.parsedTemplate as |content|}}
+      {{component
+        (concat "form-template-field/" content.type)
+        attributes=content.attributes
+        choices=content.choices
+        validations=content.validations
+      }}
+    {{/each}}
+  </div>
+{{else}}
+  <div class="alert alert-error">
+    {{this.error}}
+  </div>
+{{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/form-template-field/wrapper.js b/app/assets/javascripts/discourse/app/components/form-template-field/wrapper.js
new file mode 100644
index 00000000000..cafcbda848e
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/form-template-field/wrapper.js
@@ -0,0 +1,45 @@
+import Component from "@glimmer/component";
+import Yaml from "js-yaml";
+import { tracked } from "@glimmer/tracking";
+import FormTemplate from "discourse/models/form-template";
+import { action } from "@ember/object";
+
+export default class FormTemplateFieldWrapper extends Component {
+  @tracked error = null;
+  @tracked parsedTemplate = null;
+
+  constructor() {
+    super(...arguments);
+
+    if (this.args.content) {
+      // Content used when no id exists yet
+      // (i.e. previewing while creating a new template)
+      this._loadTemplate(this.args.content);
+    } else if (this.args.id) {
+      this._fetchTemplate(this.args.id);
+    }
+  }
+
+  _loadTemplate(templateContent) {
+    try {
+      this.parsedTemplate = Yaml.load(templateContent);
+    } catch (e) {
+      this.error = e;
+    }
+  }
+
+  @action
+  refreshTemplate() {
+    if (Array.isArray(this.args?.id) && this.args?.id.length === 0) {
+      return;
+    }
+
+    return this._fetchTemplate(this.args.id);
+  }
+
+  async _fetchTemplate(id) {
+    const response = await FormTemplate.findById(id);
+    const templateContent = await response.form_template.template;
+    return this._loadTemplate(templateContent);
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/templates/components/future-date-input.hbs b/app/assets/javascripts/discourse/app/components/future-date-input.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/future-date-input.hbs
rename to app/assets/javascripts/discourse/app/components/future-date-input.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/generated-invite-link.hbs b/app/assets/javascripts/discourse/app/components/generated-invite-link.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/generated-invite-link.hbs
rename to app/assets/javascripts/discourse/app/components/generated-invite-link.hbs
diff --git a/app/assets/javascripts/discourse/app/components/glimmer-topic-timeline.js b/app/assets/javascripts/discourse/app/components/glimmer-topic-timeline.js
deleted file mode 100644
index 7c7f7889321..00000000000
--- a/app/assets/javascripts/discourse/app/components/glimmer-topic-timeline.js
+++ /dev/null
@@ -1,92 +0,0 @@
-import Component from "@glimmer/component";
-import { tracked } from "@glimmer/tracking";
-import optionalService from "discourse/lib/optional-service";
-import { inject as service } from "@ember/service";
-
-export default class GlimmerTopicTimeline extends Component {
-  @service site;
-  @service siteSettings;
-  @service currentUser;
-
-  @tracked dockAt = null;
-  @tracked dockBottom = null;
-  @tracked enteredIndex = this.args.enteredIndex;
-
-  adminTools = optionalService();
-  intersectionObserver = null;
-
-  constructor() {
-    super(...arguments);
-
-    if (this.args.prevEvent) {
-      this.enteredIndex = this.args.prevEvent.postIndex - 1;
-    }
-
-    if (!this.site.mobileView) {
-      this.intersectionObserver = new IntersectionObserver((entries) => {
-        for (const entry of entries) {
-          const bounds = entry.boundingClientRect;
-
-          if (entry.target.id === "topic-bottom") {
-            this.topicBottom = bounds.y + window.scrollY;
-          } else {
-            this.topicTop = bounds.y + window.scrollY;
-          }
-        }
-      });
-
-      const elements = [
-        document.querySelector(".container.posts"),
-        document.querySelector("#topic-bottom"),
-      ];
-
-      for (let i = 0; i < elements.length; i++) {
-        this.intersectionObserver.observe(elements[i]);
-      }
-    }
-  }
-
-  get displaySummary() {
-    return (
-      this.siteSettings.summary_timeline_button &&
-      !this.args.fullScreen &&
-      this.args.model.has_summary &&
-      !this.args.model.postStream.summary
-    );
-  }
-
-  get class() {
-    const classes = [];
-    if (this.args.fullscreen) {
-      if (this.addShowClass) {
-        classes.push("timeline-fullscreen show");
-      } else {
-        classes.push("timeline-fullscreen");
-      }
-    }
-
-    if (this.dockAt) {
-      classes.push("timeline-docked");
-      if (this.dockBottom) {
-        classes.push("timeline-docked-bottom");
-      }
-    }
-
-    return classes.join(" ");
-  }
-
-  get addShowClass() {
-    return this.args.fullscreen && !this.args.addShowClass;
-  }
-
-  get createdAt() {
-    return new Date(this.args.model.created_at);
-  }
-
-  willDestroy() {
-    if (!this.site.mobileView) {
-      this.intersectionObserver?.disconnect();
-      this.intersectionObserver = null;
-    }
-  }
-}
diff --git a/app/assets/javascripts/discourse/app/templates/components/global-notice.hbs b/app/assets/javascripts/discourse/app/components/global-notice.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/global-notice.hbs
rename to app/assets/javascripts/discourse/app/components/global-notice.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/google-search.hbs b/app/assets/javascripts/discourse/app/components/google-search.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/google-search.hbs
rename to app/assets/javascripts/discourse/app/components/google-search.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-activity-filter.hbs b/app/assets/javascripts/discourse/app/components/group-activity-filter.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/group-activity-filter.hbs
rename to app/assets/javascripts/discourse/app/components/group-activity-filter.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-card-contents.hbs b/app/assets/javascripts/discourse/app/components/group-card-contents.hbs
similarity index 97%
rename from app/assets/javascripts/discourse/app/templates/components/group-card-contents.hbs
rename to app/assets/javascripts/discourse/app/components/group-card-contents.hbs
index 5a88c81c591..83a3eae0eb2 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-card-contents.hbs
+++ b/app/assets/javascripts/discourse/app/components/group-card-contents.hbs
@@ -75,7 +75,7 @@
       {{#if this.group.members}}
         <div class="card-row third-row">
           <div class="members metadata">
-            {{#each this.group.members as |user|}}
+            {{#each this.highlightedMembers as |user|}}
               <a
                 {{on "click" this.close}}
                 href={{user.path}}
diff --git a/app/assets/javascripts/discourse/app/components/group-card-contents.js b/app/assets/javascripts/discourse/app/components/group-card-contents.js
index 547840d197c..bdadccc22c0 100644
--- a/app/assets/javascripts/discourse/app/components/group-card-contents.js
+++ b/app/assets/javascripts/discourse/app/components/group-card-contents.js
@@ -30,9 +30,15 @@ export default Component.extend(CardContentsBase, CleansUp, {
 
   group: null,
 
-  @discourseComputed("group.user_count", "group.members.length")
-  moreMembersCount: (memberCount, maxMemberDisplay) =>
-    memberCount - maxMemberDisplay,
+  @discourseComputed("group.members.[]")
+  highlightedMembers(members) {
+    return members.slice(0, maxMembersToDisplay);
+  },
+
+  @discourseComputed("group.user_count", "group.members.[]")
+  moreMembersCount(memberCount) {
+    return Math.max(memberCount - maxMembersToDisplay, 0);
+  },
 
   @discourseComputed("group.name")
   groupClass: (name) => (name ? `group-card-${name}` : ""),
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-flair-inputs.hbs b/app/assets/javascripts/discourse/app/components/group-flair-inputs.hbs
similarity index 98%
rename from app/assets/javascripts/discourse/app/templates/components/group-flair-inputs.hbs
rename to app/assets/javascripts/discourse/app/components/group-flair-inputs.hbs
index 60fbbf7114b..8bf8ca5c189 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-flair-inputs.hbs
+++ b/app/assets/javascripts/discourse/app/components/group-flair-inputs.hbs
@@ -86,7 +86,6 @@
         src={{this.demoAvatarUrl}}
         class="avatar actor"
         alt=""
-        role="presentation"
       />
     </div>
 
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-imap-email-settings.hbs b/app/assets/javascripts/discourse/app/components/group-imap-email-settings.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/group-imap-email-settings.hbs
rename to app/assets/javascripts/discourse/app/components/group-imap-email-settings.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-manage-email-settings.hbs b/app/assets/javascripts/discourse/app/components/group-manage-email-settings.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/group-manage-email-settings.hbs
rename to app/assets/javascripts/discourse/app/components/group-manage-email-settings.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-manage-logs-filter.hbs b/app/assets/javascripts/discourse/app/components/group-manage-logs-filter.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/group-manage-logs-filter.hbs
rename to app/assets/javascripts/discourse/app/components/group-manage-logs-filter.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-manage-logs-row.hbs b/app/assets/javascripts/discourse/app/components/group-manage-logs-row.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/group-manage-logs-row.hbs
rename to app/assets/javascripts/discourse/app/components/group-manage-logs-row.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-manage-save-button.hbs b/app/assets/javascripts/discourse/app/components/group-manage-save-button.hbs
similarity index 92%
rename from app/assets/javascripts/discourse/app/templates/components/group-manage-save-button.hbs
rename to app/assets/javascripts/discourse/app/components/group-manage-save-button.hbs
index c726861637d..7e249bd3640 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-manage-save-button.hbs
+++ b/app/assets/javascripts/discourse/app/components/group-manage-save-button.hbs
@@ -7,7 +7,7 @@
 {{/if}}
 <div class="control-group buttons group-manage-save-button">
   <DButton
-    @action={{action "save"}}
+    @action={{this.save}}
     @disabled={{or this.disabled this.saving}}
     @class="btn btn-primary group-manage-save"
     @translatedLabel={{this.savingText}}
diff --git a/app/assets/javascripts/discourse/app/components/group-manage-save-button.js b/app/assets/javascripts/discourse/app/components/group-manage-save-button.js
index 2b3a55e7779..606ed6402cf 100644
--- a/app/assets/javascripts/discourse/app/components/group-manage-save-button.js
+++ b/app/assets/javascripts/discourse/app/components/group-manage-save-button.js
@@ -3,10 +3,13 @@ import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { popupAutomaticMembershipAlert } from "discourse/controllers/groups-new";
-import showModal from "discourse/lib/show-modal";
 import { or } from "@ember/object/computed";
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+import GroupDefaultNotificationsModal from "discourse/components/modal/group-default-notifications";
 
 export default Component.extend({
+  modal: service(),
   saving: null,
   disabled: false,
   updateExistingUsers: null,
@@ -38,53 +41,61 @@ export default Component.extend({
     }
   },
 
-  actions: {
-    save() {
-      if (this.beforeSave) {
-        this.beforeSave();
-      }
+  @action
+  setUpdateExistingUsers(value) {
+    this.updateExistingUsers = value;
+  },
 
-      this.set("saving", true);
-      const group = this.model;
+  @action
+  save() {
+    if (this.beforeSave) {
+      this.beforeSave();
+    }
 
-      popupAutomaticMembershipAlert(
-        group.id,
-        group.automatic_membership_email_domains
-      );
+    this.set("saving", true);
+    const group = this.model;
 
-      const opts = {};
-      if (this.updateExistingUsers !== null) {
-        opts.update_existing_users = this.updateExistingUsers;
-      }
+    popupAutomaticMembershipAlert(
+      group.id,
+      group.automatic_membership_email_domains
+    );
 
-      return group
-        .save(opts)
-        .then(() => {
-          this.setProperties({
-            saved: true,
-            updateExistingUsers: null,
-          });
+    const opts = {};
+    if (this.updateExistingUsers !== null) {
+      opts.update_existing_users = this.updateExistingUsers;
+    }
 
-          if (this.afterSave) {
-            this.afterSave();
-          }
-        })
-        .catch((error) => {
-          const json = error.jqXHR.responseJSON;
-          if (error.jqXHR.status === 422 && json.user_count) {
-            const controller = showModal("group-default-notifications", {
-              model: { count: json.user_count },
-            });
+    return group
+      .save(opts)
+      .then(() => {
+        this.setProperties({
+          saved: true,
+          updateExistingUsers: null,
+        });
 
-            controller.set("onClose", () => {
-              this.updateExistingUsers = controller.updateExistingUsers;
-              this.send("save");
-            });
-          } else {
-            popupAjaxError(error);
-          }
-        })
-        .finally(() => this.set("saving", false));
-    },
+        if (this.afterSave) {
+          this.afterSave();
+        }
+      })
+      .catch((error) => {
+        const json = error.jqXHR.responseJSON;
+        if (error.jqXHR.status === 422 && json.user_count) {
+          this.editGroupNotifications(json);
+        } else {
+          popupAjaxError(error);
+        }
+      })
+      .finally(() => this.set("saving", false));
+  },
+
+  @action
+  async editGroupNotifications(json) {
+    await this.modal.show(GroupDefaultNotificationsModal, {
+      model: {
+        count: json.user_count,
+        setUpdateExistingUsers: this.setUpdateExistingUsers,
+      },
+    });
+    this.save();
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/group-member-dropdown.js b/app/assets/javascripts/discourse/app/components/group-member-dropdown.js
index bd6fa1006a3..f8bff73391b 100644
--- a/app/assets/javascripts/discourse/app/components/group-member-dropdown.js
+++ b/app/assets/javascripts/discourse/app/components/group-member-dropdown.js
@@ -43,6 +43,15 @@ export default DropdownSelectBoxComponent.extend({
           icon: "shield-alt",
         });
       }
+    } else if (this.canEditGroup && !this.member.owner) {
+      items.push({
+        id: "makeOwner",
+        name: I18n.t("groups.members.make_owner"),
+        description: I18n.t("groups.members.make_owner_description", {
+          username: this.get("member.username"),
+        }),
+        icon: "shield-alt",
+      });
     }
 
     if (this.currentUser.staff) {
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-member.hbs b/app/assets/javascripts/discourse/app/components/group-member.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/group-member.hbs
rename to app/assets/javascripts/discourse/app/components/group-member.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-membership-button.hbs b/app/assets/javascripts/discourse/app/components/group-membership-button.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/group-membership-button.hbs
rename to app/assets/javascripts/discourse/app/components/group-membership-button.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-navigation.hbs b/app/assets/javascripts/discourse/app/components/group-navigation.hbs
similarity index 93%
rename from app/assets/javascripts/discourse/app/templates/components/group-navigation.hbs
rename to app/assets/javascripts/discourse/app/components/group-navigation.hbs
index 229a955c316..9bc7550d068 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-navigation.hbs
+++ b/app/assets/javascripts/discourse/app/components/group-navigation.hbs
@@ -30,7 +30,7 @@
   {{/each}}
   <PluginOutlet
     @name="group-reports-nav-item"
-    @args={{hash group=this.group}}
+    @outletArgs={{hash group=this.group}}
     @connectorTagName="li"
   />
 </MobileNav>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-post.hbs b/app/assets/javascripts/discourse/app/components/group-post.hbs
similarity index 95%
rename from app/assets/javascripts/discourse/app/templates/components/group-post.hbs
rename to app/assets/javascripts/discourse/app/components/group-post.hbs
index d9ff03faabe..089163a2e6a 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-post.hbs
+++ b/app/assets/javascripts/discourse/app/components/group-post.hbs
@@ -29,7 +29,7 @@
           >{{this.post.user.title}}</span>{{/if}}
         <PluginOutlet
           @name="group-post-additional-member-info"
-          @args={{hash user=this.post.user}}
+          @outletArgs={{hash user=this.post.user}}
         />
       </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-selector.hbs b/app/assets/javascripts/discourse/app/components/group-selector.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/group-selector.hbs
rename to app/assets/javascripts/discourse/app/components/group-selector.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-smtp-email-settings.hbs b/app/assets/javascripts/discourse/app/components/group-smtp-email-settings.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/group-smtp-email-settings.hbs
rename to app/assets/javascripts/discourse/app/components/group-smtp-email-settings.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/groups-form-interaction-fields.hbs b/app/assets/javascripts/discourse/app/components/groups-form-interaction-fields.hbs
similarity index 91%
rename from app/assets/javascripts/discourse/app/templates/components/groups-form-interaction-fields.hbs
rename to app/assets/javascripts/discourse/app/components/groups-form-interaction-fields.hbs
index f294948b808..eca53831665 100644
--- a/app/assets/javascripts/discourse/app/templates/components/groups-form-interaction-fields.hbs
+++ b/app/assets/javascripts/discourse/app/components/groups-form-interaction-fields.hbs
@@ -105,12 +105,13 @@
       @placeholderKey="admin.groups.manage.interaction.incoming_email_placeholder"
     />
 
-    <PluginOutlet
-      @name="group-email-in"
-      @tagName="span"
-      @connectorTagName="div"
-      @args={{hash model=this.model}}
-    />
+    <span>
+      <PluginOutlet
+        @name="group-email-in"
+        @connectorTagName="div"
+        @outletArgs={{hash model=this.model}}
+      />
+    </span>
   </div>
 {{/if}}
 
@@ -129,9 +130,10 @@
   />
 </div>
 
-<PluginOutlet
-  @name="groups-interaction-custom-options"
-  @tagName="span"
-  @connectorTagName="div"
-  @args={{hash model=this.model}}
-/>
\ No newline at end of file
+<span>
+  <PluginOutlet
+    @name="groups-interaction-custom-options"
+    @connectorTagName="div"
+    @outletArgs={{hash model=this.model}}
+  />
+</span>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/groups-form-membership-fields.hbs b/app/assets/javascripts/discourse/app/components/groups-form-membership-fields.hbs
similarity index 95%
rename from app/assets/javascripts/discourse/app/templates/components/groups-form-membership-fields.hbs
rename to app/assets/javascripts/discourse/app/components/groups-form-membership-fields.hbs
index a293631b707..936f20af836 100644
--- a/app/assets/javascripts/discourse/app/templates/components/groups-form-membership-fields.hbs
+++ b/app/assets/javascripts/discourse/app/components/groups-form-membership-fields.hbs
@@ -94,12 +94,13 @@
     {{/if}}
   </div>
 
-  <PluginOutlet
-    @name="groups-form-membership-below-automatic"
-    @tagName="span"
-    @connectorTagName="div"
-    @args={{hash model=this.model}}
-  />
+  <span>
+    <PluginOutlet
+      @name="groups-form-membership-below-automatic"
+      @connectorTagName="div"
+      @outletArgs={{hash model=this.model}}
+    />
+  </span>
 
   <div class="control-group">
     <label class="control-label">{{i18n
diff --git a/app/assets/javascripts/discourse/app/templates/components/groups-form-profile-fields.hbs b/app/assets/javascripts/discourse/app/components/groups-form-profile-fields.hbs
similarity index 87%
rename from app/assets/javascripts/discourse/app/templates/components/groups-form-profile-fields.hbs
rename to app/assets/javascripts/discourse/app/components/groups-form-profile-fields.hbs
index 094583db504..44582a2eceb 100644
--- a/app/assets/javascripts/discourse/app/templates/components/groups-form-profile-fields.hbs
+++ b/app/assets/javascripts/discourse/app/components/groups-form-profile-fields.hbs
@@ -44,10 +44,11 @@
 {{#if this.canEdit}}
   {{yield}}
 
-  <PluginOutlet
-    @name="group-edit"
-    @tagName="span"
-    @connectorTagName="div"
-    @args={{hash group=this.model}}
-  />
+  <span>
+    <PluginOutlet
+      @name="group-edit"
+      @connectorTagName="div"
+      @outletArgs={{hash group=this.model}}
+    />
+  </span>
 {{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/groups-info.hbs b/app/assets/javascripts/discourse/app/components/groups-info.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/groups-info.hbs
rename to app/assets/javascripts/discourse/app/components/groups-info.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/hidden-details.hbs b/app/assets/javascripts/discourse/app/components/hidden-details.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/hidden-details.hbs
rename to app/assets/javascripts/discourse/app/components/hidden-details.hbs
diff --git a/app/assets/javascripts/discourse/app/components/hide-modal-trigger.js b/app/assets/javascripts/discourse/app/components/hide-modal-trigger.js
deleted file mode 100644
index 26b127301d9..00000000000
--- a/app/assets/javascripts/discourse/app/components/hide-modal-trigger.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import Component from "@ember/component";
-export default Component.extend({
-  didInsertElement() {
-    this._super(...arguments);
-    $(".d-modal.fixed-modal").modal("hide").addClass("hidden");
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/templates/components/horizontal-overflow-nav.hbs b/app/assets/javascripts/discourse/app/components/horizontal-overflow-nav.hbs
similarity index 86%
rename from app/assets/javascripts/discourse/app/templates/components/horizontal-overflow-nav.hbs
rename to app/assets/javascripts/discourse/app/components/horizontal-overflow-nav.hbs
index e4ac6b3c9d8..43302b0d661 100644
--- a/app/assets/javascripts/discourse/app/templates/components/horizontal-overflow-nav.hbs
+++ b/app/assets/javascripts/discourse/app/components/horizontal-overflow-nav.hbs
@@ -1,7 +1,10 @@
-{{! template-lint-disable no-down-event-binding }}
+{{! template-lint-disable no-pointer-down-event-binding }}
 {{! template-lint-disable no-invalid-interactive }}
 
-<div class="horizontal-overflow-nav {{if this.hasScroll 'has-scroll'}}">
+<nav
+  class="horizontal-overflow-nav {{if this.hasScroll 'has-scroll'}}"
+  aria-label={{@ariaLabel}}
+>
   {{#if this.hasScroll}}
     <a
       role="button"
@@ -43,4 +46,4 @@
       {{d-icon "chevron-right"}}
     </a>
   {{/if}}
-</div>
\ No newline at end of file
+</nav>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/horizontal-overflow-nav.js b/app/assets/javascripts/discourse/app/components/horizontal-overflow-nav.js
index dac5611ff94..f4ffd1b76c8 100644
--- a/app/assets/javascripts/discourse/app/components/horizontal-overflow-nav.js
+++ b/app/assets/javascripts/discourse/app/components/horizontal-overflow-nav.js
@@ -62,7 +62,7 @@ export default class HorizontalOverflowNav extends Component {
 
   @bind
   scrollDrag(event) {
-    if (this.site.mobileView) {
+    if (this.site.mobileView || !this.hasScroll) {
       return;
     }
 
@@ -78,19 +78,20 @@ export default class HorizontalOverflowNav extends Component {
     const mouseDragScroll = function (e) {
       let mouseChange = e.clientX - position.x;
       navPills.scrollLeft = position.left - mouseChange;
-
-      navPills.querySelectorAll("a").forEach((a) => {
-        a.style.cursor = "grabbing";
-      });
     };
 
+    navPills.querySelectorAll("a").forEach((a) => {
+      a.style.cursor = "grabbing";
+    });
+
     const removeDragScroll = function () {
+      document.removeEventListener("mousemove", mouseDragScroll);
       navPills.querySelectorAll("a").forEach((a) => {
         a.style.cursor = "pointer";
       });
     };
 
-    document.addEventListener("mousemove", mouseDragScroll, { once: true });
+    document.addEventListener("mousemove", mouseDragScroll);
     document.addEventListener("mouseup", removeDragScroll, { once: true });
   }
 
diff --git a/app/assets/javascripts/discourse/app/templates/components/ignored-user-list-item.hbs b/app/assets/javascripts/discourse/app/components/ignored-user-list-item.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/ignored-user-list-item.hbs
rename to app/assets/javascripts/discourse/app/components/ignored-user-list-item.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/ignored-user-list.hbs b/app/assets/javascripts/discourse/app/components/ignored-user-list.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/ignored-user-list.hbs
rename to app/assets/javascripts/discourse/app/components/ignored-user-list.hbs
diff --git a/app/assets/javascripts/discourse/app/components/ignored-user-list.js b/app/assets/javascripts/discourse/app/components/ignored-user-list.js
index 0ecbc713b45..487c6525464 100644
--- a/app/assets/javascripts/discourse/app/components/ignored-user-list.js
+++ b/app/assets/javascripts/discourse/app/components/ignored-user-list.js
@@ -1,9 +1,11 @@
 import Component from "@ember/component";
+import { inject as service } from "@ember/service";
 import User from "discourse/models/user";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import showModal from "discourse/lib/show-modal";
+import IgnoreDurationModal from "./modal/ignore-duration-with-username";
 
 export default Component.extend({
+  modal: service(),
   item: null,
   actions: {
     removeIgnoredUser(item) {
@@ -20,13 +22,13 @@ export default Component.extend({
       });
     },
     newIgnoredUser() {
-      const modal = showModal("ignore-duration-with-username", {
-        model: this.model,
-      });
-      modal.setProperties({
-        ignoredUsername: null,
-        onUserIgnored: (username) => {
-          this.items.addObject(username);
+      this.modal.show(IgnoreDurationModal, {
+        model: {
+          actingUser: this.model,
+          ignoredUsername: null,
+          onUserIgnored: (username) => {
+            this.items.addObject(username);
+          },
         },
       });
     },
diff --git a/app/assets/javascripts/discourse/app/templates/components/images-uploader.hbs b/app/assets/javascripts/discourse/app/components/images-uploader.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/images-uploader.hbs
rename to app/assets/javascripts/discourse/app/components/images-uploader.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/input-tip.hbs b/app/assets/javascripts/discourse/app/components/input-tip.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/input-tip.hbs
rename to app/assets/javascripts/discourse/app/components/input-tip.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/invite-link-panel.hbs b/app/assets/javascripts/discourse/app/components/invite-link-panel.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/invite-link-panel.hbs
rename to app/assets/javascripts/discourse/app/components/invite-link-panel.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/invite-panel.hbs b/app/assets/javascripts/discourse/app/components/invite-panel.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/invite-panel.hbs
rename to app/assets/javascripts/discourse/app/components/invite-panel.hbs
diff --git a/app/assets/javascripts/discourse/app/components/json-editor.js b/app/assets/javascripts/discourse/app/components/json-editor.js
deleted file mode 100644
index b693dfc01e8..00000000000
--- a/app/assets/javascripts/discourse/app/components/json-editor.js
+++ /dev/null
@@ -1,89 +0,0 @@
-import { action } from "@ember/object";
-import Component from "@ember/component";
-import { create } from "virtual-dom";
-import discourseComputed from "discourse-common/utils/decorators";
-import { iconNode } from "discourse-common/lib/icon-library";
-import loadScript from "discourse/lib/load-script";
-import { schedule } from "@ember/runloop";
-
-export default Component.extend({
-  className: "json-editor-holder",
-  editor: null,
-  saveChangesCallback: null,
-
-  didInsertElement() {
-    this._super(...arguments);
-
-    loadScript("/javascripts/jsoneditor.js").then(() => {
-      schedule("afterRender", () => {
-        let { JSONEditor } = window;
-
-        JSONEditor.defaults.options.theme = "bootstrap4";
-        JSONEditor.defaults.iconlibs = {
-          discourseIcons: DiscourseJsonSchemaEditorIconlib,
-        };
-        JSONEditor.defaults.options.iconlib = "discourseIcons";
-
-        const el = document.querySelector("#json-editor-holder");
-        this.editor = new JSONEditor(el, {
-          schema: this.model.jsonSchema,
-          disable_array_delete_all_rows: true,
-          disable_array_delete_last_row: true,
-          disable_array_reorder: false,
-          disable_array_copy: false,
-          enable_array_copy: true,
-          disable_edit_json: true,
-          disable_properties: true,
-          disable_collapse: true,
-          remove_button_labels: true,
-          show_errors: "never",
-          startval: this.model.value ? JSON.parse(this.model.value) : null,
-        });
-      });
-    });
-  },
-
-  @discourseComputed("model.settingName")
-  settingName(name) {
-    return name.replace(/\_/g, " ");
-  },
-
-  @action
-  saveChanges() {
-    const errors = this.editor.validate();
-    if (!errors.length) {
-      const fieldValue = JSON.stringify(this.editor.getValue());
-      this?.saveChangesCallback(fieldValue);
-    } else {
-      this.appEvents.trigger("modal-body:flash", {
-        text: errors.mapBy("message").join("\n"),
-        messageClass: "error",
-      });
-    }
-  },
-
-  willDestroyElement() {
-    this._super(...arguments);
-
-    this.editor?.destroy();
-  },
-});
-
-class DiscourseJsonSchemaEditorIconlib {
-  constructor() {
-    this.mapping = {
-      delete: "trash-alt",
-      add: "plus",
-      moveup: "arrow-up",
-      movedown: "arrow-down",
-      copy: "copy",
-    };
-  }
-
-  getIcon(key) {
-    if (!this.mapping[key]) {
-      return;
-    }
-    return create(iconNode(this.mapping[key]));
-  }
-}
diff --git a/app/assets/javascripts/discourse/app/templates/components/latest-topic-list-item.hbs b/app/assets/javascripts/discourse/app/components/latest-topic-list-item.hbs
similarity index 88%
rename from app/assets/javascripts/discourse/app/templates/components/latest-topic-list-item.hbs
rename to app/assets/javascripts/discourse/app/components/latest-topic-list-item.hbs
index 48229430ee9..c3043bcfe51 100644
--- a/app/assets/javascripts/discourse/app/templates/components/latest-topic-list-item.hbs
+++ b/app/assets/javascripts/discourse/app/components/latest-topic-list-item.hbs
@@ -26,6 +26,11 @@
   </div>
 </div>
 <div class="topic-stats">
+  <PluginOutlet
+    @name="above-latest-topic-list-item-post-count"
+    @connectorTagName="div"
+    @outletArgs={{hash topic=this.topic}}
+  />
   {{raw "list/posts-count-column" topic=this.topic tagName="div"}}
   <div class="topic-last-activity">
     <a
diff --git a/app/assets/javascripts/discourse/app/templates/components/link-to-input.hbs b/app/assets/javascripts/discourse/app/components/link-to-input.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/link-to-input.hbs
rename to app/assets/javascripts/discourse/app/components/link-to-input.hbs
diff --git a/app/assets/javascripts/discourse/app/components/loading-slider-fallback-spinner.hbs b/app/assets/javascripts/discourse/app/components/loading-slider-fallback-spinner.hbs
new file mode 100644
index 00000000000..629092f1ce0
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/loading-slider-fallback-spinner.hbs
@@ -0,0 +1,3 @@
+{{#if this.loadingSlider.stillLoading}}
+  <div class="loading-slider-fallback-spinner">{{loading-spinner}}</div>
+{{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/loading-slider-fallback-spinner.js b/app/assets/javascripts/discourse/app/components/loading-slider-fallback-spinner.js
new file mode 100644
index 00000000000..5cb2fddc892
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/loading-slider-fallback-spinner.js
@@ -0,0 +1,6 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+
+export default class LoadingSliderFallbackSpinner extends Component {
+  @service loadingSlider;
+}
diff --git a/app/assets/javascripts/discourse/app/templates/components/login-buttons.hbs b/app/assets/javascripts/discourse/app/components/login-buttons.hbs
similarity index 89%
rename from app/assets/javascripts/discourse/app/templates/components/login-buttons.hbs
rename to app/assets/javascripts/discourse/app/components/login-buttons.hbs
index 11d5195d334..78feba912f0 100644
--- a/app/assets/javascripts/discourse/app/templates/components/login-buttons.hbs
+++ b/app/assets/javascripts/discourse/app/components/login-buttons.hbs
@@ -16,4 +16,4 @@
     {{b.title}}
   </button>
 {{/each}}
-<PluginOutlet @name="after-login-buttons" />
+<PluginOutlet @name="after-login-buttons" />
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/menu-panel.hbs b/app/assets/javascripts/discourse/app/components/menu-panel.hbs
new file mode 100644
index 00000000000..9e77bac711d
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/menu-panel.hbs
@@ -0,0 +1,7 @@
+<div class={{concat-class "menu-panel" @animationClass}} data-max-width="500">
+  <div class="panel-body">
+    <div class="panel-body-contents">
+      {{yield}}
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/mobile-category-topic.hbs b/app/assets/javascripts/discourse/app/components/mobile-category-topic.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/mobile-category-topic.hbs
rename to app/assets/javascripts/discourse/app/components/mobile-category-topic.hbs
diff --git a/app/assets/javascripts/discourse/app/components/modal-container.hbs b/app/assets/javascripts/discourse/app/components/modal-container.hbs
new file mode 100644
index 00000000000..24ad1d2563b
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal-container.hbs
@@ -0,0 +1,36 @@
+<div class="modal-container" {{did-insert this.modal.setContainerElement}}>
+</div>
+
+{{#if this.modal.activeModal}}
+  {{#each (array this.modal.activeModal) as |activeModal|}}
+    {{! #each ensures that the activeModal component/model are updated atomically }}
+    <activeModal.component
+      @model={{activeModal.opts.model}}
+      @closeModal={{this.closeModal}}
+    />
+  {{/each}}
+{{/if}}
+
+{{! Legacy modals depend on this wrapper being in the DOM at all times. Eventually this will be dropped.
+For now, we mitigate the potential impact on things like tests by removing the `modal` and `d-modal` classes when inactive }}
+<DModalLegacy
+  @modalClass={{if
+    this.modal.isLegacy
+    (concat-class
+      "modal"
+      "d-modal"
+      this.modal.modalClass
+      (if this.modal.opts.panels "has-tabs")
+    )
+  }}
+  @title={{this.modal.title}}
+  @titleAriaElementId={{this.modal.opts.titleAriaElementId}}
+  @panels={{this.modal.opts.panels}}
+  @selectedPanel={{this.modal.selectedPanel}}
+  @onSelectPanel={{this.modal.onSelectPanel}}
+  @hidden={{this.modal.hidden}}
+  @errors={{this.modal.errors}}
+  @closeModal={{this.closeModal}}
+>
+  {{outlet "modalBody"}}
+</DModalLegacy>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal-container.js b/app/assets/javascripts/discourse/app/components/modal-container.js
new file mode 100644
index 00000000000..280cda29cfb
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal-container.js
@@ -0,0 +1,12 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+
+export default class ModalContainer extends Component {
+  @service modal;
+
+  @action
+  closeModal(data) {
+    this.modal.close(data);
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/templates/components/modal-footer-close.hbs b/app/assets/javascripts/discourse/app/components/modal-footer-close.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/modal-footer-close.hbs
rename to app/assets/javascripts/discourse/app/components/modal-footer-close.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/modal-panel.hbs b/app/assets/javascripts/discourse/app/components/modal-panel.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/modal-panel.hbs
rename to app/assets/javascripts/discourse/app/components/modal-panel.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/modal-tab.hbs b/app/assets/javascripts/discourse/app/components/modal-tab.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/modal-tab.hbs
rename to app/assets/javascripts/discourse/app/components/modal-tab.hbs
diff --git a/app/assets/javascripts/discourse/app/components/modal/activation-edit.hbs b/app/assets/javascripts/discourse/app/components/modal/activation-edit.hbs
new file mode 100644
index 00000000000..db187ad8a4a
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/activation-edit.hbs
@@ -0,0 +1,21 @@
+<DModal
+  @closeModal={{@closeModal}}
+  @title={{i18n "login.change_email"}}
+  @flash={{this.flash}}
+>
+  <:body>
+    <ActivationEmailForm
+      @email={{@model.newEmail}}
+      @updateNewEmail={{this.updateNewEmail}}
+    />
+  </:body>
+  <:footer>
+    <DButton
+      @action={{this.changeEmail}}
+      @label="login.submit_new_email"
+      @disabled={{this.submitDisabled}}
+      class="btn-primary"
+    />
+    <DButton @action={{@closeModal}} @label="close" />
+  </:footer>
+</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/activation-edit.js b/app/assets/javascripts/discourse/app/components/modal/activation-edit.js
new file mode 100644
index 00000000000..7716f0c843d
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/activation-edit.js
@@ -0,0 +1,38 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+import { tracked } from "@glimmer/tracking";
+import { changeEmail } from "discourse/lib/user-activation";
+import ActivationResent from "./activation-resent";
+
+export default class ActivationEdit extends Component {
+  @service login;
+  @service modal;
+
+  @tracked newEmail = this.args.model.newEmail;
+  @tracked flash;
+
+  get submitDisabled() {
+    return this.newEmail === this.args.model.currentEmail;
+  }
+
+  @action
+  changeEmail() {
+    changeEmail({
+      username: this.login?.loginName,
+      password: this.login?.loginPassword,
+      email: this.args.model.newEmail,
+    })
+      .then(() => {
+        this.modal.show(ActivationResent, {
+          model: { currentEmail: this.args.model.newEmail },
+        });
+      })
+      .catch((e) => (this.flash = e));
+  }
+
+  @action
+  updateNewEmail(e) {
+    this.newEmail = e.target.value;
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/modal/activation-resent.hbs b/app/assets/javascripts/discourse/app/components/modal/activation-resent.hbs
new file mode 100644
index 00000000000..af6d6c09261
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/activation-resent.hbs
@@ -0,0 +1,9 @@
+<DModal @title={{i18n "log_in"}} @closeModal={{@closeModal}}>
+  <:body>
+    {{html-safe
+      (i18n
+        "login.sent_activation_email_again" currentEmail=@model.currentEmail
+      )
+    }}
+  </:body>
+</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/bookmark.hbs b/app/assets/javascripts/discourse/app/components/modal/bookmark.hbs
new file mode 100644
index 00000000000..04bde449617
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/bookmark.hbs
@@ -0,0 +1,98 @@
+<DModal
+  @closeModal={{this.closingModal}}
+  @title={{this.modalTitle}}
+  @flash={{this.flash}}
+  @flashType="error"
+  id="bookmark-reminder-modal"
+  class="bookmark-reminder-modal bookmark-with-reminder"
+  data-bookmark-id={{this.bookmark.id}}
+  {{did-insert this.didInsert}}
+>
+  <:body>
+    <div class="control-group bookmark-name-wrap">
+      <Input
+        id="bookmark-name"
+        @value={{this.bookmark.name}}
+        name="bookmark-name"
+        class="bookmark-name"
+        @enter={{action "saveAndClose"}}
+        placeholder={{i18n "post.bookmarks.name_placeholder"}}
+        aria-label={{i18n "post.bookmarks.name_input_label"}}
+      />
+      <DButton
+        @icon="cog"
+        @action={{this.toggleShowOptions}}
+        class="bookmark-options-button"
+        @ariaLabel="post.bookmarks.options"
+        @title="post.bookmarks.options"
+      />
+    </div>
+
+    {{#if this.showOptions}}
+      <div class="bookmark-options-panel">
+        <label
+          class="control-label"
+          for="bookmark_auto_delete_preference"
+        >{{i18n "bookmarks.auto_delete_preference.label"}}</label>
+        <ComboBox
+          @content={{this.autoDeletePreferences}}
+          @value={{this.bookmark.autoDeletePreference}}
+          @class="bookmark-option-selector"
+          @id="bookmark-auto-delete-preference"
+          @onChange={{action (mut this.bookmark.autoDeletePreference)}}
+        />
+      </div>
+    {{/if}}
+
+    {{#if this.showExistingReminderAt}}
+      <div class="alert alert-info existing-reminder-at-alert">
+        {{d-icon "far-clock"}}
+        <span>{{i18n
+            "bookmarks.reminders.existing_reminder"
+            at_date_time=this.existingReminderAtFormatted
+          }}</span>
+      </div>
+    {{/if}}
+
+    <div class="control-group">
+      <label class="control-label">
+        {{i18n "post.bookmarks.set_reminder"}}
+      </label>
+
+      {{#if this.userHasTimezoneSet}}
+        <TimeShortcutPicker
+          @timeShortcuts={{this.timeOptions}}
+          @prefilledDatetime={{this.prefilledDatetime}}
+          @onTimeSelected={{action "onTimeSelected"}}
+          @hiddenOptions={{this.hiddenTimeShortcutOptions}}
+          @customLabels={{this.customTimeShortcutLabels}}
+          @_itsatrap={{this._itsatrap}}
+        />
+      {{else}}
+        <div class="alert alert-info">{{html-safe
+            (i18n "bookmarks.no_timezone" basePath=(base-path))
+          }}</div>
+      {{/if}}
+    </div>
+  </:body>
+
+  <:footer>
+    <DButton
+      id="save-bookmark"
+      @label="bookmarks.save"
+      class="btn-primary"
+      @action={{this.saveAndClose}}
+    />
+    <DModalCancel @close={{action "closeWithoutSavingBookmark"}} />
+    {{#if this.showDelete}}
+      <DButton
+        id="delete-bookmark"
+        @icon="trash-alt"
+        class="delete-bookmark btn-danger"
+        @action={{this.delete}}
+        @ariaLabel="post.bookmarks.actions.delete_bookmark.name"
+        @title="post.bookmarks.actions.delete_bookmark.name"
+      />
+    {{/if}}
+  </:footer>
+</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/bookmark.js b/app/assets/javascripts/discourse/app/components/modal/bookmark.js
new file mode 100644
index 00000000000..62334a58dbe
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/bookmark.js
@@ -0,0 +1,351 @@
+import Component from "@glimmer/component";
+import { extractError } from "discourse/lib/ajax-error";
+import { sanitize } from "discourse/lib/text";
+import { CLOSE_INITIATED_BY_CLICK_OUTSIDE } from "discourse/components/d-modal";
+import { inject as service } from "@ember/service";
+import { tracked } from "@glimmer/tracking";
+import { now, parseCustomDatetime, startOfDay } from "discourse/lib/time-utils";
+import { AUTO_DELETE_PREFERENCES } from "discourse/models/bookmark";
+import I18n from "I18n";
+import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";
+import ItsATrap from "@discourse/itsatrap";
+import { Promise } from "rsvp";
+import {
+  TIME_SHORTCUT_TYPES,
+  defaultTimeShortcuts,
+} from "discourse/lib/time-shortcut";
+import { action } from "@ember/object";
+import { ajax } from "discourse/lib/ajax";
+import { formattedReminderTime } from "discourse/lib/bookmark";
+import { and, notEmpty } from "@ember/object/computed";
+import discourseLater from "discourse-common/lib/later";
+
+const BOOKMARK_BINDINGS = {
+  enter: { handler: "saveAndClose" },
+  "d d": { handler: "delete" },
+};
+
+export default class BookmarkModal extends Component {
+  @service dialog;
+  @service currentUser;
+  @service site;
+
+  @tracked postDetectedLocalDate = null;
+  @tracked postDetectedLocalTime = null;
+  @tracked postDetectedLocalTimezone = null;
+  @tracked prefilledDatetime = null;
+  @tracked flash = null;
+  @tracked userTimezone = this.currentUser.user_option.timezone;
+  @tracked showOptions = this.args.model.bookmark.id ? true : false;
+
+  @notEmpty("userTimezone")
+  userHasTimezoneSet;
+
+  @notEmpty("bookmark.id")
+  showDelete;
+
+  @notEmpty("bookmark.id")
+  editingExistingBookmark;
+
+  @and("bookmark.id", "bookmark.reminderAt")
+  existingBookmarkHasReminder;
+
+  @tracked _closeWithoutSaving = false;
+  @tracked _savingBookmarkManually = false;
+  @tracked _saving = false;
+  @tracked _deleting = false;
+
+  _itsatrap = new ItsATrap();
+
+  get bookmark() {
+    return this.args.model.bookmark;
+  }
+
+  get modalTitle() {
+    return I18n.t(this.bookmark.id ? "bookmarks.edit" : "bookmarks.create");
+  }
+
+  get autoDeletePreferences() {
+    return Object.keys(AUTO_DELETE_PREFERENCES).map((key) => {
+      return {
+        id: AUTO_DELETE_PREFERENCES[key],
+        name: I18n.t(`bookmarks.auto_delete_preference.${key.toLowerCase()}`),
+      };
+    });
+  }
+
+  get showExistingReminderAt() {
+    return (
+      this.bookmark.reminderAt &&
+      Date.parse(this.bookmark.reminderAt) > new Date().getTime()
+    );
+  }
+
+  get existingReminderAtFormatted() {
+    return formattedReminderTime(this.bookmark.reminderAt, this.userTimezone);
+  }
+
+  get timeOptions() {
+    const options = defaultTimeShortcuts(this.userTimezone);
+
+    if (this.showPostLocalDate) {
+      options.push({
+        icon: "globe-americas",
+        id: TIME_SHORTCUT_TYPES.POST_LOCAL_DATE,
+        label: "time_shortcut.post_local_date",
+        time: this.#parsedPostLocalDateTime(),
+        timeFormatKey: "dates.long_no_year",
+        hidden: false,
+      });
+    }
+
+    return options;
+  }
+
+  get showPostLocalDate() {
+    if (!this.postDetectedLocalTime || !this.postDetectedLocalDate) {
+      return false;
+    }
+
+    if (this.#parsedPostLocalDateTime() < now(this.userTimezone)) {
+      return false;
+    }
+
+    return true;
+  }
+
+  get hiddenTimeShortcutOptions() {
+    if (this.editingExistingBookmark && !this.existingBookmarkHasReminder) {
+      return [TIME_SHORTCUT_TYPES.NONE];
+    }
+
+    return [];
+  }
+
+  get customTimeShortcutLabels() {
+    const labels = {};
+    if (this.existingBookmarkHasReminder) {
+      labels[TIME_SHORTCUT_TYPES.NONE] =
+        "bookmarks.remove_reminder_keep_bookmark";
+    }
+    return labels;
+  }
+
+  willDestroy() {
+    this._itsatrap?.destroy();
+    this._itsatrap = null;
+    KeyboardShortcuts.unpause();
+  }
+
+  @action
+  didInsert() {
+    discourseLater(() => {
+      if (this.site.isMobileDevice) {
+        document.getElementById("bookmark-name").blur();
+      }
+    });
+
+    if (!this.args.model.bookmark.id) {
+      document.getElementById("tap_tile_none").classList.add("active");
+    }
+
+    this.#bindKeyboardShortcuts();
+    this.#initializeExistingBookmarkData();
+    this.#loadPostLocalDates();
+  }
+
+  @action
+  saveAndClose() {
+    this.flash = null;
+    if (this._saving || this._deleting) {
+      return;
+    }
+
+    this._saving = true;
+    this._savingBookmarkManually = true;
+    return this.#saveBookmark()
+      .then(() => this.args.closeModal())
+      .catch((error) => this.#handleSaveError(error))
+      .finally(() => {
+        this._saving = false;
+      });
+  }
+
+  @action
+  toggleShowOptions() {
+    this.showOptions = !this.showOptions;
+  }
+
+  @action
+  onTimeSelected(type, time) {
+    this.bookmark.selectedReminderType = type;
+    this.bookmark.selectedDatetime = time;
+
+    // If the type is custom, we need to wait for the user to click save, as
+    // they could still be adjusting the date and time
+    if (
+      ![TIME_SHORTCUT_TYPES.CUSTOM, TIME_SHORTCUT_TYPES.RELATIVE].includes(type)
+    ) {
+      return this.saveAndClose();
+    }
+  }
+
+  @action
+  closingModal(closeModalArgs) {
+    // If the user clicks outside the modal we save automatically for them,
+    // as long as they are not already saving manually or deleting the bookmark.
+    if (
+      closeModalArgs.initiatedBy === CLOSE_INITIATED_BY_CLICK_OUTSIDE &&
+      !this._closeWithoutSaving &&
+      !this._savingBookmarkManually
+    ) {
+      this.#saveBookmark()
+        .catch((e) => this.#handleSaveError(e))
+        .then(() => {
+          this.args.closeModal(closeModalArgs);
+        });
+    } else {
+      this.args.closeModal(closeModalArgs);
+    }
+  }
+
+  @action
+  closeWithoutSavingBookmark() {
+    this._closeWithoutSaving = true;
+    this.args.closeModal({ closeWithoutSaving: this._closeWithoutSaving });
+  }
+
+  @action
+  delete() {
+    if (!this.bookmark.id) {
+      return;
+    }
+
+    this._deleting = true;
+    const deleteAction = () => {
+      this._closeWithoutSaving = true;
+      this.#deleteBookmark()
+        .then(() => {
+          this._deleting = false;
+          this.args.closeModal({
+            closeWithoutSaving: this._closeWithoutSaving,
+          });
+        })
+        .catch((error) => this.#handleSaveError(error));
+    };
+
+    if (this.existingBookmarkHasReminder) {
+      this.dialog.deleteConfirm({
+        message: I18n.t("bookmarks.confirm_delete"),
+        didConfirm: () => deleteAction(),
+      });
+    } else {
+      deleteAction();
+    }
+  }
+
+  #parsedPostLocalDateTime() {
+    let parsedPostLocalDate = parseCustomDatetime(
+      this.postDetectedLocalDate,
+      this.postDetectedLocalTime,
+      this.userTimezone,
+      this.postDetectedLocalTimezone
+    );
+
+    if (!this.postDetectedLocalTime) {
+      return startOfDay(parsedPostLocalDate);
+    }
+
+    return parsedPostLocalDate;
+  }
+
+  #saveBookmark() {
+    if (this.bookmark.selectedReminderType === TIME_SHORTCUT_TYPES.CUSTOM) {
+      if (!this.bookmark.reminderAtISO) {
+        return Promise.reject(I18n.t("bookmarks.invalid_custom_datetime"));
+      }
+    }
+
+    if (this.editingExistingBookmark) {
+      return ajax(`/bookmarks/${this.bookmark.id}`, {
+        type: "PUT",
+        data: this.bookmark.saveData,
+      }).then(() => {
+        this.args.model.afterSave?.(this.bookmark.saveData);
+      });
+    } else {
+      return ajax("/bookmarks", {
+        type: "POST",
+        data: this.bookmark.saveData,
+      }).then((response) => {
+        this.bookmark.id = response.id;
+        this.args.model.afterSave?.(this.bookmark.saveData);
+      });
+    }
+  }
+
+  #deleteBookmark() {
+    return ajax("/bookmarks/" + this.bookmark.id, {
+      type: "DELETE",
+    }).then((response) => {
+      this.args.model.afterDelete?.(
+        response.topic_bookmarked,
+        this.bookmark.id
+      );
+    });
+  }
+
+  #handleSaveError(error) {
+    this._savingBookmarkManually = false;
+    if (typeof error === "string") {
+      this.flash = sanitize(error);
+    } else {
+      this.flash = sanitize(extractError(error));
+    }
+  }
+
+  #bindKeyboardShortcuts() {
+    KeyboardShortcuts.pause();
+
+    Object.keys(BOOKMARK_BINDINGS).forEach((shortcut) => {
+      this._itsatrap.bind(shortcut, () => {
+        const binding = BOOKMARK_BINDINGS[shortcut];
+        this[binding.handler]();
+        return false;
+      });
+    });
+  }
+
+  #initializeExistingBookmarkData() {
+    if (!this.existingBookmarkHasReminder || !this.editingExistingBookmark) {
+      return;
+    }
+
+    this.prefilledDatetime = this.bookmark.reminderAt;
+    this.bookmark.selectedDatetime = parseCustomDatetime(
+      this.prefilledDatetime,
+      null,
+      this.userTimezone
+    );
+  }
+
+  // If we detect we are bookmarking a post which has local-date data
+  // in it, we can preload that date + time into the form to use as the
+  // bookmark reminder date + time.
+  #loadPostLocalDates() {
+    if (this.bookmark.bookmarkableType !== "Post") {
+      return;
+    }
+
+    const postEl = document.querySelector(
+      `[data-post-id="${this.bookmark.bookmarkableId}"]`
+    );
+    const localDateEl = postEl?.querySelector(".discourse-local-date");
+
+    if (localDateEl) {
+      this.postDetectedLocalDate = localDateEl.dataset.date;
+      this.postDetectedLocalTime = localDateEl.dataset.time;
+      this.postDetectedLocalTimezone = localDateEl.dataset.timezone;
+    }
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/modal/create-invite-bulk.hbs b/app/assets/javascripts/discourse/app/components/modal/create-invite-bulk.hbs
new file mode 100644
index 00000000000..2db39f4a6f1
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/create-invite-bulk.hbs
@@ -0,0 +1,41 @@
+<CreateInviteUploader @autoFindInput={{false}} as |uploader setElement|>
+  <DModal
+    @title={{i18n "user.invited.bulk_invite.text"}}
+    class="create-invite-bulk-modal"
+    @closeModal={{@closeModal}}
+  >
+    <:body>
+      {{#if uploader.uploaded}}
+        {{i18n "user.invited.bulk_invite.success"}}
+      {{else}}
+        {{html-safe (i18n "user.invited.bulk_invite.instructions")}}
+        <input
+          id="csv-file"
+          disabled={{uploader.uploading}}
+          type="file"
+          accept=".csv"
+          {{did-insert setElement}}
+        />
+      {{/if}}
+    </:body>
+    <:footer>
+      {{#unless uploader.uploaded}}
+        <DButton
+          @icon="link"
+          @translatedLabel={{if
+            uploader.uploading
+            (i18n
+              "user.invited.bulk_invite.progress"
+              progress=uploader.uploadProgress
+            )
+            (i18n "user.invited.bulk_invite.text")
+          }}
+          class="btn-primary"
+          @action={{uploader.startUpload}}
+          @disabled={{uploader.submitDisabled}}
+        />
+      {{/unless}}
+      <DButton @label="close" class="btn-primary" @action={{@closeModal}} />
+    </:footer>
+  </DModal>
+</CreateInviteUploader>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/customize-form-template-view.hbs b/app/assets/javascripts/discourse/app/components/modal/customize-form-template-view.hbs
new file mode 100644
index 00000000000..4ba90c4e275
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/customize-form-template-view.hbs
@@ -0,0 +1,37 @@
+<DModal
+  @title={{@model.name}}
+  @closeModal={{@closeModal}}
+  class="customize-form-template-view-modal"
+>
+  <:body>
+    <div class="control-group">
+      <DToggleSwitch
+        class="form-templates__preview-toggle"
+        @state={{this.showPreview}}
+        @label="admin.form_templates.view_template.toggle_preview"
+        {{on "click" this.togglePreview}}
+      />
+    </div>
+    {{#if this.showPreview}}
+      <FormTemplateField::Wrapper @id={{@model.id}} />
+    {{else}}
+      <HighlightedCode @lang="yaml" @code={{@model.template}} />
+    {{/if}}
+  </:body>
+
+  <:footer>
+    <DButton
+      class="btn-primary"
+      @action={{this.editTemplate}}
+      @icon="pencil-alt"
+      @label="admin.form_templates.view_template.edit"
+    />
+    <DModalCancel @close={{@closeModal}} />
+    <DButton
+      class="btn-danger"
+      @action={{this.deleteTemplate}}
+      @icon="trash-alt"
+      @label="admin.form_templates.view_template.delete"
+    />
+  </:footer>
+</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/customize-form-template-view.js b/app/assets/javascripts/discourse/app/components/modal/customize-form-template-view.js
new file mode 100644
index 00000000000..d3c300bf3f5
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/customize-form-template-view.js
@@ -0,0 +1,41 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+import I18n from "I18n";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { ajax } from "discourse/lib/ajax";
+import { tracked } from "@glimmer/tracking";
+
+export default class CustomizeFormTemplateViewModal extends Component {
+  @service router;
+  @service dialog;
+  @tracked showPreview = false;
+
+  @action
+  togglePreview() {
+    this.showPreview = !this.showPreview;
+  }
+
+  @action
+  editTemplate() {
+    this.router.transitionTo("adminCustomizeFormTemplates.edit", this.model);
+  }
+
+  @action
+  deleteTemplate() {
+    return this.dialog.yesNoConfirm({
+      message: I18n.t("admin.form_templates.delete_confirm", {
+        template_name: this.model.name,
+      }),
+      didConfirm: () => {
+        ajax(`/admin/customize/form-templates/${this.model.id}.json`, {
+          type: "DELETE",
+        })
+          .then(() => {
+            this.args.refreshModel();
+          })
+          .catch(popupAjaxError);
+      },
+    });
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/modal/delete-topic-confirm.hbs b/app/assets/javascripts/discourse/app/components/modal/delete-topic-confirm.hbs
new file mode 100644
index 00000000000..a399846da77
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/delete-topic-confirm.hbs
@@ -0,0 +1,32 @@
+<DModal
+  @title={{i18n "topic.actions.delete"}}
+  @closeModal={{@closeModal}}
+  class="delete-topic-confirm-modal"
+  @flash={{this.flash}}
+>
+  <:body>
+    <p>
+      {{i18n
+        "post.controls.delete_topic_confirm_modal"
+        count=this.siteSettings.min_topic_views_for_delete_confirm
+      }}
+    </p>
+  </:body>
+  <:footer>
+    <DButton
+      @action={{this.deleteTopic}}
+      @disabled={{this.deletingTopic}}
+      @label={{if
+        this.deletingTopic
+        "deleting"
+        "post.controls.delete_topic_confirm_modal_yes"
+      }}
+      class="btn-danger"
+    />
+    <DButton
+      @action={{@closeModal}}
+      @label="post.controls.delete_topic_confirm_modal_no"
+      class="btn-primary"
+    />
+  </:footer>
+</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/delete-topic-confirm.js b/app/assets/javascripts/discourse/app/components/modal/delete-topic-confirm.js
new file mode 100644
index 00000000000..f7eb53f1c2d
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/delete-topic-confirm.js
@@ -0,0 +1,27 @@
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+import I18n from "I18n";
+
+// Modal that displays confirmation text when user deletes a topic
+// The modal will display only if the topic exceeds a certain amount of views
+export default class DeleteTopicConfirm extends Component {
+  @service currentUser;
+  @service siteSettings;
+
+  @tracked deletingTopic = false;
+  @tracked flash;
+
+  @action
+  async deleteTopic() {
+    try {
+      this.deletingTopic = true;
+      await this.args.model.topic.destroy(this.currentUser);
+      this.args.closeModal();
+    } catch {
+      this.flash = I18n.t("post.controls.delete_topic_error");
+      this.deletingTopic = false;
+    }
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/modal/delete-topic-disallowed.hbs b/app/assets/javascripts/discourse/app/components/modal/delete-topic-disallowed.hbs
new file mode 100644
index 00000000000..7d469645167
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/delete-topic-disallowed.hbs
@@ -0,0 +1,8 @@
+<DModal @closeModal={{@closeModal}}>
+  <:body>
+    <p>{{html-safe (i18n "post.controls.delete_topic_disallowed_modal")}}</p>
+  </:body>
+  <:footer>
+    <DButton @action={{@closeModal}} class="btn-primary" @label="close" />
+  </:footer>
+</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/discard-draft.hbs b/app/assets/javascripts/discourse/app/components/modal/discard-draft.hbs
new file mode 100644
index 00000000000..5a92b0a24fa
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/discard-draft.hbs
@@ -0,0 +1,32 @@
+<DModal
+  @closeModal={{@closeModal}}
+  class="discard-draft-modal"
+  @dismissable={{false}}
+>
+  <:body>
+    <div class="instructions">
+      {{i18n "post.cancel_composer.confirm"}}
+    </div>
+  </:body>
+
+  <:footer>
+    <DButton
+      @icon="far-trash-alt"
+      @label="post.cancel_composer.discard"
+      @class="btn-danger discard-draft"
+      @action={{this.discardDraft}}
+    />
+    {{#if @model.showSaveDraftButton}}
+      <DButton
+        @label="post.cancel_composer.save_draft"
+        @class="save-draft"
+        @action={{this.saveDraftAndClose}}
+      />
+    {{/if}}
+    <DButton
+      @label="post.cancel_composer.keep_editing"
+      @class="keep-editing"
+      @action={{@closeModal}}
+    />
+  </:footer>
+</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/discard-draft.js b/app/assets/javascripts/discourse/app/components/modal/discard-draft.js
new file mode 100644
index 00000000000..965148baa71
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/discard-draft.js
@@ -0,0 +1,16 @@
+import { action } from "@ember/object";
+import Component from "@glimmer/component";
+
+export default class DiscardDraftModal extends Component {
+  @action
+  async discardDraft() {
+    await this.args.model.onDestroyDraft();
+    this.args.closeModal();
+  }
+
+  @action
+  async saveDraftAndClose() {
+    await this.args.model.onSaveDraft();
+    this.args.closeModal();
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/modal/dismiss-new.hbs b/app/assets/javascripts/discourse/app/components/modal/dismiss-new.hbs
new file mode 100644
index 00000000000..9563e469f63
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/dismiss-new.hbs
@@ -0,0 +1,33 @@
+<DModal
+  @closeModal={{@closeModal}}
+  @title={{i18n "topics.bulk.dismiss_new_modal.title"}}
+>
+  <:body>
+    <p>
+      <PreferenceCheckbox
+        @labelKey="topics.bulk.dismiss_new_modal.topics"
+        @checked={{this.dismissTopics}}
+        @class="dismiss-topics"
+      />
+      <PreferenceCheckbox
+        @labelKey="topics.bulk.dismiss_new_modal.posts"
+        @checked={{this.dismissPosts}}
+        @class="dismiss-posts"
+      />
+      <PreferenceCheckbox
+        @labelKey="topics.bulk.dismiss_new_modal.untrack"
+        @checked={{this.untrack}}
+        @class="untrack"
+      />
+    </p>
+  </:body>
+  <:footer>
+    <DButton
+      id="dismiss-read-confirm"
+      @action={{this.dismissed}}
+      @icon="check"
+      @label="topics.bulk.dismiss"
+      class="btn-primary"
+    />
+  </:footer>
+</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/dismiss-new.js b/app/assets/javascripts/discourse/app/components/modal/dismiss-new.js
new file mode 100644
index 00000000000..b9a161f53b4
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/dismiss-new.js
@@ -0,0 +1,19 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+
+export default class DismissNew extends Component {
+  dismissTopics = true;
+  dismissPosts = true;
+  untrack = false;
+
+  @action
+  dismissed() {
+    this.args.model.dismissCallback({
+      dismissTopics: this.dismissTopics,
+      dismissPosts: this.dismissPosts,
+      untrack: this.untrack,
+    });
+
+    this.args.closeModal();
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/modal/dismiss-notification-confirmation.hbs b/app/assets/javascripts/discourse/app/components/modal/dismiss-notification-confirmation.hbs
new file mode 100644
index 00000000000..92df144fc5a
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/dismiss-notification-confirmation.hbs
@@ -0,0 +1,22 @@
+<DModal
+  @headerClass="hidden"
+  class="dismiss-notification-confirmation"
+  @closeModal={{@closeModal}}
+>
+  <:body>
+    {{@model.confirmationMessage}}
+  </:body>
+  <:footer>
+    <DButton
+      @icon="check"
+      class="btn-primary"
+      @action={{this.dismiss}}
+      @label="notifications.dismiss_confirmation.dismiss"
+    />
+    <DButton
+      @action={{@closeModal}}
+      @label="notifications.dismiss_confirmation.cancel"
+      class="btn-default"
+    />
+  </:footer>
+</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/dismiss-notification-confirmation.js b/app/assets/javascripts/discourse/app/components/modal/dismiss-notification-confirmation.js
new file mode 100644
index 00000000000..1af22ceef50
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/dismiss-notification-confirmation.js
@@ -0,0 +1,10 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+
+export default class DismissNotificationConfirmation extends Component {
+  @action
+  dismiss() {
+    this.args.model?.dismissNotifications?.();
+    this.args.closeModal();
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/modal/dismiss-read.hbs b/app/assets/javascripts/discourse/app/components/modal/dismiss-read.hbs
new file mode 100644
index 00000000000..69e63e27ef7
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/dismiss-read.hbs
@@ -0,0 +1,23 @@
+<DModal
+  @closeModal={{@closeModal}}
+  @title={{i18n @model.title count=@model.count}}
+  class="dismiss-read-modal"
+>
+  <:body>
+    <p>
+      <PreferenceCheckbox
+        @labelKey="topics.bulk.also_dismiss_topics"
+        @checked={{this.dismissTopics}}
+      />
+    </p>
+  </:body>
+  <:footer>
+    <DButton
+      class="btn-primary"
+      @action={{route-action "dismissReadTopics" this.dismissTopics}}
+      @icon="check"
+      id="dismiss-read-confirm"
+      @label="topics.bulk.dismiss"
+    />
+  </:footer>
+</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/do-not-disturb.hbs b/app/assets/javascripts/discourse/app/components/modal/do-not-disturb.hbs
new file mode 100644
index 00000000000..7d74cd2e8d8
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/do-not-disturb.hbs
@@ -0,0 +1,48 @@
+<DModal
+  @title={{i18n "pause_notifications.title"}}
+  @closeModal={{@closeModal}}
+  @flash={{this.flash}}
+  class="do-not-disturb-modal"
+>
+  <:body>
+    <TapTileGrid as |grid|>
+      <TapTile
+        @class="do-not-disturb-tile"
+        @tileId="30"
+        @activeTile={{grid.activeTile}}
+        @onChange={{this.saveDuration}}
+      >
+        {{i18n "pause_notifications.options.half_hour"}}
+      </TapTile>
+      <TapTile
+        @class="do-not-disturb-tile"
+        @tileId="60"
+        @activeTile={{grid.activeTile}}
+        @onChange={{this.saveDuration}}
+      >
+        {{i18n "pause_notifications.options.one_hour"}}
+      </TapTile>
+      <TapTile
+        @class="do-not-disturb-tile"
+        @tileId="120"
+        @activeTile={{grid.activeTile}}
+        @onChange={{this.saveDuration}}
+      >
+        {{i18n "pause_notifications.options.two_hours"}}
+      </TapTile>
+      <TapTile
+        @class="do-not-disturb-tile"
+        @tileId="tomorrow"
+        @activeTile={{grid.activeTile}}
+        @onChange={{this.saveDuration}}
+      >
+        {{i18n "pause_notifications.options.tomorrow"}}
+      </TapTile>
+    </TapTileGrid>
+
+    <DButton
+      @action={{this.navigateToNotificationSchedule}}
+      @label="pause_notifications.set_schedule"
+    />
+  </:body>
+</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/do-not-disturb.js b/app/assets/javascripts/discourse/app/components/modal/do-not-disturb.js
new file mode 100644
index 00000000000..61df1bc86bd
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/do-not-disturb.js
@@ -0,0 +1,27 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import { tracked } from "@glimmer/tracking";
+import { inject as service } from "@ember/service";
+
+export default class DoNotDisturb extends Component {
+  @service currentUser;
+  @service router;
+
+  @tracked flash;
+
+  @action
+  async saveDuration(duration) {
+    try {
+      await this.currentUser.enterDoNotDisturbFor(duration);
+      this.args.closeModal();
+    } catch (e) {
+      this.flash = e;
+    }
+  }
+
+  @action
+  navigateToNotificationSchedule() {
+    this.router.transitionTo("preferences.notifications", this.currentUser);
+    this.args.closeModal();
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/modal/fast-edit.hbs b/app/assets/javascripts/discourse/app/components/modal/fast-edit.hbs
new file mode 100644
index 00000000000..692b336201b
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/fast-edit.hbs
@@ -0,0 +1,7 @@
+<DModal @title={{i18n "post.quote_edit"}} @closeModal={{@closeModal}}>
+  <FastEdit
+    @initialValue={{@model.initialValue}}
+    @post={{@model.post}}
+    @close={{@closeModal}}
+  />
+</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/form-template-form-preview.hbs b/app/assets/javascripts/discourse/app/components/modal/form-template-form-preview.hbs
new file mode 100644
index 00000000000..9f2dd782b3f
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/form-template-form-preview.hbs
@@ -0,0 +1,9 @@
+<DModal
+  @closeModal={{@closeModal}}
+  @title={{i18n "admin.form_templates.preview_modal.title"}}
+  class="form-template-form-preview-modal"
+>
+  <:body>
+    <FormTemplateField::Wrapper @content={{@content}} />
+  </:body>
+</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/fullscreen-code.hbs b/app/assets/javascripts/discourse/app/components/modal/fullscreen-code.hbs
new file mode 100644
index 00000000000..62a5a0f97f1
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/fullscreen-code.hbs
@@ -0,0 +1,11 @@
+<DModal
+  @closeModal={{this.closeModal}}
+  {{did-insert this.applyCodeblockButtons}}
+  class="fullscreen-code-modal"
+>
+  <:body>
+    <pre>
+      <code class={{@model.codeClasses}}>{{@model.code}}</code>
+    </pre>
+  </:body>
+</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/fullscreen-code.js b/app/assets/javascripts/discourse/app/components/modal/fullscreen-code.js
new file mode 100644
index 00000000000..08314924fe3
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/fullscreen-code.js
@@ -0,0 +1,28 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+import highlightSyntax from "discourse/lib/highlight-syntax";
+import CodeblockButtons from "discourse/lib/codeblock-buttons";
+
+export default class FullscreenCode extends Component {
+  @service siteSettings;
+  @service session;
+
+  @action
+  closeModal() {
+    this.codeBlockButtons.cleanup();
+    this.args.closeModal();
+  }
+
+  @action
+  applyCodeblockButtons(element) {
+    const modalElement = element.querySelector(".modal-body");
+    highlightSyntax(modalElement, this.siteSettings, this.session);
+
+    this.codeBlockButtons = new CodeblockButtons({
+      showFullscreen: false,
+      showCopy: true,
+    });
+    this.codeBlockButtons.attachToGeneric(modalElement);
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/modal/fullscreen-table.hbs b/app/assets/javascripts/discourse/app/components/modal/fullscreen-table.hbs
new file mode 100644
index 00000000000..91b6afb656b
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/fullscreen-table.hbs
@@ -0,0 +1,5 @@
+<DModal @closeModal={{@closeModal}} class="fullscreen-table-modal">
+  <:body>
+    {{@model.tableHtml}}
+  </:body>
+</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/group-add-members.hbs b/app/assets/javascripts/discourse/app/components/modal/group-add-members.hbs
new file mode 100644
index 00000000000..dfa9879d05c
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/group-add-members.hbs
@@ -0,0 +1,60 @@
+<DModal
+  @title={{this.title}}
+  @closeModal={{@closeModal}}
+  class="group-add-members-modal"
+  @flash={{this.flash}}
+>
+  <:body>
+    <form class="form-vertical group-add-members">
+      <p>{{i18n "groups.add_members.description"}}</p>
+      <div class="input-group">
+        <EmailGroupUserChooser
+          @value={{this.usernamesAndEmails}}
+          @onChange={{this.setUsernamesAndEmails}}
+          @options={{hash
+            allowEmails=this.currentUser.can_invite_to_forum
+            filterPlaceholder=(if
+              this.currentUser.can_invite_to_forum
+              "groups.add_members.usernames_or_emails_placeholder"
+              "groups.add_members.usernames_placeholder"
+            )
+          }}
+        />
+      </div>
+
+      {{#if @model.can_admin_group}}
+        <div class="input-group">
+          <label>
+            <Input
+              id="set-owner"
+              @type="checkbox"
+              @checked={{this.setOwner}}
+              disabled={{this.emails}}
+            />
+            {{i18n "groups.add_members.set_owner"}}
+          </label>
+        </div>
+      {{/if}}
+
+      <div class="input-group">
+        <label>
+          <Input
+            @type="checkbox"
+            @checked={{this.notifyUsers}}
+            disabled={{and (not this.usernames) this.emails}}
+          />
+          {{i18n "groups.add_members.notify_users"}}
+        </label>
+      </div>
+    </form>
+  </:body>
+  <:footer>
+    <DButton
+      @action={{this.addMembers}}
+      class="add btn-primary"
+      @icon="plus"
+      @disabled={{or this.loading (not this.usernamesAndEmails)}}
+      @label="groups.add"
+    />
+  </:footer>
+</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/group-add-members.js b/app/assets/javascripts/discourse/app/components/modal/group-add-members.js
new file mode 100644
index 00000000000..3e24d54dee4
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/group-add-members.js
@@ -0,0 +1,69 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import { isEmpty } from "@ember/utils";
+import { tracked } from "@glimmer/tracking";
+import { emailValid } from "discourse/lib/utilities";
+import I18n from "I18n";
+import { inject as service } from "@ember/service";
+
+export default class GroupAddMembers extends Component {
+  @service currentUser;
+  @service router;
+
+  @tracked loading = false;
+  @tracked setOwner = false;
+  @tracked notifyUsers = false;
+  @tracked usernamesAndEmails = [];
+  @tracked flash;
+
+  get title() {
+    return I18n.t("groups.add_members.title", {
+      group_name: this.args.model.fullName || this.args.model.name,
+    });
+  }
+
+  get usernames() {
+    return this.usernamesAndEmails.reject(emailValid).join(",");
+  }
+
+  get emails() {
+    return this.usernamesAndEmails.filter(emailValid).join(",");
+  }
+
+  @action
+  setUsernamesAndEmails(usernamesAndEmails) {
+    this.usernamesAndEmails = usernamesAndEmails;
+    if (this.emails) {
+      if (!this.usernames) {
+        this.notifyUsers = false;
+      }
+      this.setOwner = false;
+    }
+  }
+
+  @action
+  addMembers() {
+    if (isEmpty(this.usernamesAndEmails)) {
+      return;
+    }
+    this.loading = true;
+    const promise = this.setOwner
+      ? this.args.model.addOwners(this.usernames, true, this.notifyUsers)
+      : this.args.model.addMembers(
+          this.usernames,
+          true,
+          this.notifyUsers,
+          this.emails
+        );
+
+    promise
+      .then(() => {
+        this.router.transitionTo("group.members", this.args.model.name, {
+          queryParams: { ...(this.usernames && { filter: this.usernames }) },
+        });
+        this.args.closeModal();
+      })
+      .catch((e) => (this.flash = e))
+      .finally(() => (this.loading = false));
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/modal/group-default-notifications.hbs b/app/assets/javascripts/discourse/app/components/modal/group-default-notifications.hbs
new file mode 100644
index 00000000000..a27d0ac6d74
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/group-default-notifications.hbs
@@ -0,0 +1,19 @@
+<DModal
+  @title={{i18n "groups.default_notifications.modal_title"}}
+  @closeModal={{@closeModal}}
+>
+  <:body>
+    {{i18n "groups.default_notifications.modal_description" count=@model.count}}
+  </:body>
+  <:footer>
+    <DButton
+      @action={{this.updateExistingUsers}}
+      @label="groups.default_notifications.modal_yes"
+      class="btn-primary"
+    />
+    <DButton
+      @action={{this.cancel}}
+      @label="groups.default_notifications.modal_no"
+    />
+  </:footer>
+</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/group-default-notifications.js b/app/assets/javascripts/discourse/app/components/modal/group-default-notifications.js
new file mode 100644
index 00000000000..1c6dae86ff3
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/group-default-notifications.js
@@ -0,0 +1,16 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+
+export default class GroupDefaultNotifications extends Component {
+  @action
+  updateExistingUsers() {
+    this.args.model.setUpdateExistingUsers(true);
+    this.args.closeModal();
+  }
+
+  @action
+  cancel() {
+    this.args.model.setUpdateExistingUsers(false);
+    this.args.closeModal();
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/modal/history.hbs b/app/assets/javascripts/discourse/app/components/modal/history.hbs
new file mode 100644
index 00000000000..1ce8e17587c
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/history.hbs
@@ -0,0 +1,65 @@
+<DModal
+  @title={{i18n this.modalTitleKey}}
+  @closeModal={{@closeModal}}
+  class="history-modal"
+>
+  <:body>
+    <ConditionalLoadingSpinner @condition={{this.initialLoad}}>
+      <Modal::History::Revision
+        @model={{this.postRevision}}
+        @mobileView={{this.site.mobileView}}
+        @wikiDisabled={{this.wikiDisabled}}
+        @previousCategory={{this.previousCategory}}
+        @currentCategory={{this.currentCategory}}
+        @displayInline={{this.displayInline}}
+        @displaySideBySide={{this.displaySideBySide}}
+        @displaySideBySideMarkdown={{this.displaySideBySideMarkdown}}
+        @viewMode={{this.viewMode}}
+      />
+      <Modal::History::Revisions
+        @model={{this.postRevision}}
+        @hiddenClasses={{this.hiddenClasses}}
+        @mobileView={{this.site.mobileView}}
+        @userChanges={{this.user_changes}}
+        @wikiDisabled={{this.wikiDisabled}}
+        @postTypeDisabled={{this.postTypeDisabled}}
+        @previousCategory={{this.previousCategory}}
+        @currentCategory={{this.currentCategory}}
+        @previousTagChanges={{this.previousTagChanges}}
+        @currentTagChanges={{this.currentTagChanges}}
+        @bodyDiffHTML={{this.bodyDiffHTML}}
+        @bodyDiff={{this.bodyDiff}}
+        @calculateBodyDiff={{this.calculateBodyDiff}}
+        @titleDiff={{this.titleDiff}}
+      />
+    </ConditionalLoadingSpinner>
+  </:body>
+  <:footer>
+    {{#if @model.editPost}}
+      <Modal::History::TopicFooter
+        @model={{this.postRevision}}
+        @loadFirstVersion={{this.loadFirstVersion}}
+        @loadPreviousVersion={{this.loadPreviousVersion}}
+        @loadNextVersion={{this.loadNextVersion}}
+        @loadLastVersion={{this.loadLastVersion}}
+        @displayEdit={{this.displayEdit}}
+        @editPost={{this.editPost}}
+        @editButtonLabel={{this.editButtonLabel}}
+        @revertToVersion={{this.revertToVersion}}
+        @hideVersion={{this.hideVersion}}
+        @showVersion={{this.showVersion}}
+        @permanentlyDeleteVersions={{this.permanentlyDeleteVersions}}
+        @loading={{this.loading}}
+        @canPermanentlyDelete={{this.siteSettings.can_permanently_delete}}
+        @loadFirstDisabled={{this.loadFirstDisabled}}
+        @loadPreviousDisabled={{this.loadPreviousDisabled}}
+        @displayRevisions={{this.displayRevisions}}
+        @revisionsText={{this.revisionsText}}
+        @loadNextDisabled={{this.loadNextDisabled}}
+        @loadLastDisabled={{this.loadLastDisabled}}
+        @revertToRevisionText={{this.revertToRevisionText}}
+        @isStaff={{this.currentUser.staff}}
+      />
+    {{/if}}
+  </:footer>
+</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/history.js b/app/assets/javascripts/discourse/app/components/modal/history.js
new file mode 100644
index 00000000000..069da8ea109
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/history.js
@@ -0,0 +1,342 @@
+import { action } from "@ember/object";
+import { tracked } from "@glimmer/tracking";
+import Category from "discourse/models/category";
+import Component from "@glimmer/component";
+import I18n from "I18n";
+import Post from "discourse/models/post";
+import { categoryBadgeHTML } from "discourse/helpers/category-link";
+import { iconHTML } from "discourse-common/lib/icon-library";
+import { sanitizeAsync } from "discourse/lib/text";
+import { inject as service } from "@ember/service";
+
+function customTagArray(val) {
+  if (!val) {
+    return [];
+  }
+  if (!Array.isArray(val)) {
+    val = [val];
+  }
+  return val;
+}
+
+export default class History extends Component {
+  @service dialog;
+  @service site;
+  @service currentUser;
+  @service siteSettings;
+
+  @tracked loading;
+  @tracked postRevision;
+  @tracked viewMode = this.site?.mobileView ? "inline" : "side_by_side";
+  @tracked bodyDiff;
+  @tracked initialLoad = true;
+
+  constructor() {
+    super(...arguments);
+    this.refresh(this.args.model.postId, this.args.model.postVersion);
+  }
+
+  get loadFirstDisabled() {
+    return (
+      this.loading ||
+      this.postRevision?.current_revision <= this.postRevision?.first_revision
+    );
+  }
+
+  get loadPreviousDisabled() {
+    return (
+      this.loading ||
+      !this.postRevision.previous_revision ||
+      (!this.postRevision.previous_revision &&
+        this.postRevision.current_revision <=
+          this.postRevision.previous_revision)
+    );
+  }
+
+  get loadNextDisabled() {
+    return (
+      this.loading ||
+      this.postRevision?.current_revision >= this.postRevision?.next_revision
+    );
+  }
+
+  get loadLastDisabled() {
+    return (
+      this.loading ||
+      this.postRevision?.current_revision >= this.postRevision?.next_revision
+    );
+  }
+
+  get displayRevisions() {
+    return this.postRevision?.version_count > 2;
+  }
+
+  get modalTitleKey() {
+    return this.args.model.post.version > 100
+      ? "history_capped_revisions"
+      : "history";
+  }
+
+  get previousVersion() {
+    return this.postRevision?.current_version
+      ? this.postRevision.current_version - 1
+      : null;
+  }
+
+  get revisionsText() {
+    return I18n.t(
+      "post.revisions.controls.comparing_previous_to_current_out_of_total",
+      {
+        previous: this.previousVersion,
+        icon: iconHTML("arrows-alt-h"),
+        current: this.postRevision?.current_version,
+        total: this.postRevision?.version_count,
+      }
+    );
+  }
+
+  get titleDiff() {
+    let mode = this.viewMode;
+    if (mode === "side_by_side_markdown") {
+      mode = "side_by_side";
+    }
+    return this.postRevision?.title_changes?.[mode];
+  }
+
+  get bodyDiffHTML() {
+    return this.postRevision?.body_changes?.[this.viewMode];
+  }
+
+  @action
+  async calculateBodyDiff(_, bodyDiff) {
+    let html = bodyDiff;
+    if (this.viewMode !== "side_by_side_markdown") {
+      const opts = {
+        features: { editHistory: true, historyOneboxes: true },
+        allowListed: {
+          editHistory: { custom: (tag, attr) => attr === "class" },
+          historyOneboxes: ["header", "article", "div[style]"],
+        },
+      };
+      html = await sanitizeAsync(html, opts);
+    }
+    this.bodyDiff = html;
+  }
+
+  get previousTagChanges() {
+    const previousArray = customTagArray(
+      this.postRevision.tags_changes.previous
+    );
+    const currentSet = new Set(
+      customTagArray(this.postRevision.tags_changes.current)
+    );
+
+    return previousArray.map((name) => ({
+      name,
+      deleted: !currentSet.has(name),
+    }));
+  }
+
+  get currentTagChanges() {
+    const previousSet = new Set(
+      customTagArray(this.postRevision.tags_changes.previous)
+    );
+    const currentArray = customTagArray(this.postRevision.tags_changes.current);
+
+    return currentArray.map((name) => ({
+      name,
+      inserted: !previousSet.has(name),
+    }));
+  }
+
+  get createdAtDate() {
+    return moment(this.postRevision.created_at).format("LLLL");
+  }
+
+  get displayEdit() {
+    return !!(
+      this.postRevision?.can_edit &&
+      this.args.model.editPost &&
+      this.postRevision?.last_revision === this.postRevision?.current_revision
+    );
+  }
+
+  get revertToRevisionText() {
+    return I18n.t("post.revisions.controls.revert", {
+      revision: this.previousVersion,
+    });
+  }
+
+  refresh(postId, postVersion) {
+    this.loading = true;
+    Post.loadRevision(postId, postVersion).then((result) => {
+      this.postRevision = result;
+      this.loading = false;
+      this.initialLoad = false;
+    });
+  }
+
+  hide(postId, postVersion) {
+    Post.hideRevision(postId, postVersion).then(() =>
+      this.refresh(postId, postVersion)
+    );
+  }
+
+  show(postId, postVersion) {
+    Post.showRevision(postId, postVersion).then(() =>
+      this.refresh(postId, postVersion)
+    );
+  }
+
+  revert(post, postVersion) {
+    post
+      .revertToRevision(postVersion)
+      .then((result) => {
+        this.refresh(post.id, postVersion);
+        if (result.topic) {
+          post.set("topic.slug", result.topic.slug);
+          post.set("topic.title", result.topic.title);
+          post.set("topic.fancy_title", result.topic.fancy_title);
+        }
+        if (result.category_id) {
+          post.set("topic.category", Category.findById(result.category_id));
+        }
+        this.args.closeModal();
+      })
+      .catch(function (e) {
+        if (e.jqXHR.responseJSON?.errors?.[0]) {
+          this.dialog.alert(e.jqXHR.responseJSON.errors[0]);
+        }
+      });
+  }
+
+  get editButtonLabel() {
+    return `post.revisions.controls.${
+      this.postRevision.wiki ? "edit_wiki" : "edit_post"
+    }`;
+  }
+
+  get hiddenClasses() {
+    if (this.viewMode === "inline") {
+      return this.postRevision?.previous_hidden ||
+        this.postRevision?.current_hidden
+        ? "hidden-revision-either"
+        : null;
+    } else {
+      let result = [];
+      if (this.postRevision?.previous_hidden) {
+        result.push("hidden-revision-previous");
+      }
+      if (this.postRevision?.current_hidden) {
+        result.push("hidden-revision-current");
+      }
+      return result.join(" ");
+    }
+  }
+
+  get previousCategory() {
+    if (this.postRevision?.category_id_changes) {
+      let category = Category.findById(
+        this.postRevision.category_id_changes.previous
+      );
+      return categoryBadgeHTML(category, { allowUncategorized: true });
+    }
+  }
+
+  get currentCategory() {
+    if (this.postRevision?.category_id_changes) {
+      let category = Category.findById(
+        this.postRevision.category_id_changes.current
+      );
+      return categoryBadgeHTML(category, { allowUncategorized: true });
+    }
+  }
+
+  get wikiDisabled() {
+    return !this.postRevision.wiki_changes?.current;
+  }
+
+  get postTypeDisabled() {
+    return (
+      this.postRevision?.post_type_changes?.current !==
+      this.site.post_types.moderator_action
+    );
+  }
+
+  @action
+  displayInline(event) {
+    event?.preventDefault();
+    this.viewMode = "inline";
+  }
+
+  @action
+  displaySideBySide(event) {
+    event?.preventDefault();
+    this.viewMode = "side_by_side";
+  }
+
+  @action
+  displaySideBySideMarkdown(event) {
+    event?.preventDefault();
+    this.viewMode = "side_by_side_markdown";
+  }
+
+  @action
+  loadFirstVersion() {
+    this.refresh(this.postRevision.post_id, this.postRevision.first_revision);
+  }
+
+  @action
+  loadPreviousVersion() {
+    this.refresh(
+      this.postRevision.post_id,
+      this.postRevision.previous_revision
+    );
+  }
+
+  @action
+  loadNextVersion() {
+    this.refresh(this.postRevision.post_id, this.postRevision.next_revision);
+  }
+
+  @action
+  loadLastVersion() {
+    return this.refresh(
+      this.postRevision.post_id,
+      this.postRevision.last_revision
+    );
+  }
+
+  @action
+  hideVersion() {
+    this.hide(this.postRevision.post_id, this.postRevision.current_revision);
+  }
+
+  @action
+  permanentlyDeleteVersions() {
+    this.dialog.yesNoConfirm({
+      message: I18n.t("post.revisions.controls.destroy_confirm"),
+      didConfirm: () => {
+        Post.permanentlyDeleteRevisions(this.postRevision.post_id).then(() => {
+          this.args.closeModal();
+        });
+      },
+    });
+  }
+
+  @action
+  showVersion() {
+    this.show(this.postRevision.post_id, this.postRevision.current_revision);
+  }
+
+  @action
+  editPost() {
+    this.args.model.editPost(this.args.model.post);
+    this.args.closeModal();
+  }
+
+  @action
+  revertToVersion() {
+    this.revert(this.args.model.post, this.postRevision.current_revision);
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/modal/history/revision.hbs b/app/assets/javascripts/discourse/app/components/modal/history/revision.hbs
new file mode 100644
index 00000000000..b6233bffaea
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/history/revision.hbs
@@ -0,0 +1,101 @@
+<div id="revision">
+  <div id="revision-details">
+    {{d-icon "pencil-alt"}}
+    <LinkTo @route="user" @model={{@model.username}}>
+      {{bound-avatar-template @model.avatar_template "small"}}
+      {{@model.username}}
+    </LinkTo>
+    <PluginOutlet
+      @name="revision-user-details-after"
+      @outletArgs={{hash model=@model}}
+    />
+    <span class="date">{{bound-date @model.created_at}}</span>
+    {{#if @model.edit_reason}}
+      &mdash;
+      <span class="edit-reason">{{@model.edit_reason}}</span>
+    {{/if}}
+    {{#unless @mobileView}}
+      {{#if @model.user_changes}}
+        &mdash;
+        {{bound-avatar-template
+          @model.user_changes.previous.avatar_template
+          "small"
+        }}
+        {{@model.user_changes.previous.username}}
+        &rarr;
+        {{bound-avatar-template
+          @model.user_changes.current.avatar_template
+          "small"
+        }}
+        {{@model.user_changes.current.username}}
+      {{/if}}
+      {{#if @model.wiki_changes}}
+        &mdash;
+        <DisabledIcon @icon="far-edit" @disabled={{@wikiDisabled}} />
+      {{/if}}
+      {{#if @model.post_type_changes}}
+        &mdash;
+        <DisabledIcon @icon="shield-alt" @disabled={{@postTypeDisabled}} />
+      {{/if}}
+      {{#if @model.category_id_changes}}
+        &mdash;
+        {{html-safe @previousCategory}}
+        &rarr;
+        {{html-safe @currentCategory}}
+      {{/if}}
+    {{/unless}}
+  </div>
+  {{#unless @mobileView}}
+    <div id="display-modes">
+      <ul class="nav nav-pills">
+        <li>
+          <a
+            href
+            class={{concat-class
+              "inline-mode"
+              (if (eq @viewMode "inline") "active")
+            }}
+            {{on "click" @displayInline}}
+            title={{i18n "post.revisions.displays.inline.title"}}
+            aria-label={{i18n "post.revisions.displays.inline.title"}}
+          >
+            {{d-icon "far-square"}}
+            {{i18n "post.revisions.displays.inline.button"}}
+          </a>
+        </li>
+        <li>
+          <a
+            href
+            class={{concat-class
+              "side-by-side-mode"
+              (if (eq @viewMode "side_by_side") "active")
+            }}
+            {{on "click" @displaySideBySide}}
+            title={{i18n "post.revisions.displays.side_by_side.title"}}
+            aria-label={{i18n "post.revisions.displays.side_by_side.title"}}
+          >
+            {{d-icon "columns"}}
+            {{i18n "post.revisions.displays.side_by_side.button"}}
+          </a>
+        </li>
+        <li>
+          <a
+            href
+            class={{concat-class
+              "side-by-side-markdown-mode"
+              (if (eq @viewMode "side_by_side_markdown") "active")
+            }}
+            {{on "click" @displaySideBySideMarkdown}}
+            title={{i18n "post.revisions.displays.side_by_side_markdown.title"}}
+            aria-label={{i18n
+              "post.revisions.displays.side_by_side_markdown.title"
+            }}
+          >
+            {{d-icon "columns"}}
+            {{i18n "post.revisions.displays.side_by_side_markdown.button"}}
+          </a>
+        </li>
+      </ul>
+    </div>
+  {{/unless}}
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/history/revisions.hbs b/app/assets/javascripts/discourse/app/components/modal/history/revisions.hbs
new file mode 100644
index 00000000000..eeedf274618
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/history/revisions.hbs
@@ -0,0 +1,76 @@
+<div id="revisions" data-post-id={{@model.post_id}} class={{@hiddenClasses}}>
+  {{#if @model.title_changes}}
+    <div class="row">
+      <h2>{{html-safe @titleDiff}}</h2>
+    </div>
+  {{/if}}
+  {{#if @mobileView}}
+    {{#if @userChanges}}
+      <div class="row">
+        {{bound-avatar-template
+          @model.user_changes.previous.avatar_template
+          "small"
+        }}
+        {{@model.user_changes.previous.username}}
+        &rarr;
+        {{bound-avatar-template
+          @model.user_changes.current.avatar_template
+          "small"
+        }}
+        {{@model.user_changes.current.username}}
+      </div>
+    {{/if}}
+    {{#if @model.wiki_changes}}
+      <div class="row">
+        <DisabledIcon @icon="far-edit" @disabled={{@wikiDisabled}} />
+      </div>
+    {{/if}}
+    {{#if @model.post_type_changes}}
+      <div class="row">
+        <DisabledIcon @icon="shield-alt" @disabled={{@postTypeDisabled}} />
+      </div>
+    {{/if}}
+    {{#if @model.category_id_changes}}
+      <div class="row">
+        {{html-safe @previousCategory}}
+        &rarr;
+        {{html-safe @currentCategory}}
+      </div>
+    {{/if}}
+  {{/if}}
+  {{#if @model.tags_changes}}
+    <div class="row">
+      {{i18n "tagging.changed"}}
+      {{#each @previousTagChanges as |t|}}
+        {{discourse-tag t.name style=(if t.deleted "diff-del")}}
+      {{/each}}
+      &rarr;&nbsp;
+      {{#each @currentTagChanges as |t|}}
+        {{discourse-tag t.name style=(if t.inserted "diff-ins")}}
+      {{/each}}
+    </div>
+  {{/if}}
+  {{#if @model.featured_link_changes}}
+    <div class="row">
+      {{@model.featured_link_changes.previous}}
+      &rarr;
+      {{@model.featured_link_changes.current}}
+    </div>
+  {{/if}}
+
+  <span>
+    <PluginOutlet
+      @name="post-revisions"
+      @connectorTagName="div"
+      @outletArgs={{hash model=@model}}
+    />
+  </span>
+
+  <LinksRedirect
+    @class="row body-diff"
+    {{did-insert @calculateBodyDiff @bodyDiffHTML}}
+    {{did-update @calculateBodyDiff @bodyDiffHTML}}
+  >
+    {{html-safe @bodyDiff}}
+  </LinksRedirect>
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/history/topic-footer.hbs b/app/assets/javascripts/discourse/app/components/modal/history/topic-footer.hbs
new file mode 100644
index 00000000000..fc2f24c0675
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/history/topic-footer.hbs
@@ -0,0 +1,84 @@
+<div id="revision-controls">
+  <DButton
+    class="btn-default first-revision"
+    @action={{@loadFirstVersion}}
+    @icon="fast-backward"
+    @title="post.revisions.controls.first"
+    @disabled={{@loadFirstDisabled}}
+  />
+  <DButton
+    class="btn-default previous-revision"
+    @action={{@loadPreviousVersion}}
+    @icon="backward"
+    @title="post.revisions.controls.previous"
+    @disabled={{@loadPreviousDisabled}}
+  />
+  <div id="revision-numbers" class={{unless @displayRevisions "invisible"}}>
+    <ConditionalLoadingSpinner @condition={{@loading}} @size="small">
+      {{html-safe @revisionsText}}
+    </ConditionalLoadingSpinner>
+  </div>
+  <DButton
+    class="btn-default next-revision"
+    @action={{@loadNextVersion}}
+    @icon="forward"
+    @title="post.revisions.controls.next"
+    @disabled={{@loadNextDisabled}}
+  />
+  <DButton
+    class="btn-default last-revision"
+    @action={{@loadLastVersion}}
+    @icon="fast-forward"
+    @title="post.revisions.controls.last"
+    @disabled={{@loadLastDisabled}}
+  />
+</div>
+
+<div id="revision-footer-buttons">
+  {{#if @displayEdit}}
+    <DButton
+      @action={{@editPost}}
+      @icon="pencil-alt"
+      class="btn-default edit-post"
+      @label={{@editButtonLabel}}
+    />
+  {{/if}}
+
+  {{#if @isStaff}}
+    <DButton
+      @action={{@revertToVersion}}
+      @icon="undo"
+      @translatedLabel={{@revertToRevisionText}}
+      class="btn-danger revert-to-version"
+      @disabled={{@loading}}
+    />
+
+    {{#if @model.previous_hidden}}
+      <DButton
+        @action={{@showVersion}}
+        @icon="far-eye"
+        @label="post.revisions.controls.show"
+        class="btn-default show-revision"
+        @disabled={{@loading}}
+      />
+    {{else}}
+      <DButton
+        @action={{@hideVersion}}
+        @icon="far-eye-slash"
+        @label="post.revisions.controls.hide"
+        class="btn-danger hide-revision"
+        @disabled={{@loading}}
+      />
+    {{/if}}
+
+    {{#if (and @canPermanentlyDelete @model.previous_hidden)}}
+      <DButton
+        @action={{@permanentlyDeleteVersions}}
+        @icon="far-trash-alt"
+        @label="post.revisions.controls.destroy"
+        class="btn-danger destroy-revision"
+        @disabled={{@loading}}
+      />
+    {{/if}}
+  {{/if}}
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/ignore-duration-with-username.hbs b/app/assets/javascripts/discourse/app/components/modal/ignore-duration-with-username.hbs
new file mode 100644
index 00000000000..592fce9a578
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/ignore-duration-with-username.hbs
@@ -0,0 +1,38 @@
+<DModal
+  @closeModal={{@closeModal}}
+  @title={{i18n "user.user_notifications.ignore_duration_title"}}
+  @flash={{this.flash}}
+  @autoFocus="false"
+  class="ignore-duration-with-username-modal"
+>
+  <:body>
+    {{#if this.enableSelection}}
+      <div class="controls tracking-controls">
+        <label>{{d-icon "far-eye-slash" class="icon"}}
+          {{i18n "user.user_notifications.ignore_duration_username"}}</label>
+        <EmailGroupUserChooser
+          @value={{this.ignoredUsername}}
+          @onChange={{this.updateIgnoredUsername}}
+          @options={{hash excludeCurrentUser=true maximum=1}}
+        />
+      </div>
+    {{/if}}
+    <FutureDateInput
+      @label="user.user_notifications.ignore_duration_when"
+      @input={{readonly this.ignoredUntil}}
+      @customShortcuts={{this.timeShortcuts}}
+      @includeDateTime={{false}}
+      @onChangeInput={{action (mut this.ignoredUntil)}}
+    />
+    <p>{{i18n "user.user_notifications.ignore_duration_note"}}</p>
+  </:body>
+  <:footer>
+    <DButton
+      @class="btn-primary"
+      @disabled={{this.saveDisabled}}
+      @label="user.user_notifications.ignore_duration_save"
+      @action={{this.ignore}}
+    />
+    <ConditionalLoadingSpinner @size="small" @condition={{this.loading}} />
+  </:footer>
+</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/ignore-duration-with-username.js b/app/assets/javascripts/discourse/app/components/modal/ignore-duration-with-username.js
new file mode 100644
index 00000000000..70ffdef3c1c
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/ignore-duration-with-username.js
@@ -0,0 +1,70 @@
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+import I18n from "I18n";
+import User from "discourse/models/user";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { timeShortcuts } from "discourse/lib/time-shortcut";
+
+export default class IgnoreDurationModal extends Component {
+  @service currentUser;
+
+  @tracked flash;
+
+  @tracked loading = false;
+  @tracked ignoredUntil = null;
+  @tracked ignoredUsername = this.args.model.ignoredUsername;
+
+  enableSelection = this.args.model.enableSelection ?? true;
+
+  get timeShortcuts() {
+    const timezone = this.currentUser.user_option.timezone;
+    const shortcuts = timeShortcuts(timezone);
+    return [
+      shortcuts.laterToday(),
+      shortcuts.tomorrow(),
+      shortcuts.laterThisWeek(),
+      shortcuts.thisWeekend(),
+      shortcuts.monday(),
+      shortcuts.twoWeeks(),
+      shortcuts.nextMonth(),
+      shortcuts.twoMonths(),
+      shortcuts.threeMonths(),
+      shortcuts.fourMonths(),
+      shortcuts.sixMonths(),
+      shortcuts.oneYear(),
+      shortcuts.forever(),
+    ];
+  }
+
+  @action
+  ignore() {
+    if (!this.ignoredUntil || !this.ignoredUsername) {
+      this.flash = I18n.t(
+        "user.user_notifications.ignore_duration_time_frame_required"
+      );
+      return;
+    }
+    this.loading = true;
+    User.findByUsername(this.ignoredUsername).then((user) => {
+      user
+        .updateNotificationLevel({
+          level: "ignore",
+          expiringAt: this.ignoredUntil,
+          actingUser: this.args.model.actingUser,
+        })
+        .then(() => {
+          this.args.model.onUserIgnored?.(this.ignoredUsername);
+          this.args.closeModal();
+        })
+        .catch(popupAjaxError)
+        .finally(() => (this.loading = false));
+    });
+  }
+
+  @action
+  updateIgnoredUsername(selected) {
+    this.ignoredUsername = selected.firstObject;
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/modal/json-schema-editor.hbs b/app/assets/javascripts/discourse/app/components/modal/json-schema-editor.hbs
new file mode 100644
index 00000000000..663209e9fa0
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/json-schema-editor.hbs
@@ -0,0 +1,22 @@
+<DModal
+  @flash={{this.flash}}
+  @flashType={{this.flashType}}
+  @closeModal={{@closeModal}}
+  @title={{i18n
+    "admin.site_settings.json_schema.modal_title"
+    name=@settingName
+  }}
+  class="json-schema-editor-modal"
+>
+  <:body>
+    <div
+      id="json-editor-holder"
+      {{did-insert this.buildJsonEditor}}
+      {{will-destroy this.teardownJsonEditor}}
+    ></div>
+  </:body>
+
+  <:footer>
+    <DButton @class="btn-primary" @action={{this.saveChanges}} @label="save" />
+  </:footer>
+</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/json-schema-editor.js b/app/assets/javascripts/discourse/app/components/modal/json-schema-editor.js
new file mode 100644
index 00000000000..18fa534fc5a
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/json-schema-editor.js
@@ -0,0 +1,91 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import { afterRender } from "discourse-common/utils/decorators";
+import { create } from "virtual-dom";
+import { iconNode } from "discourse-common/lib/icon-library";
+import loadScript from "discourse/lib/load-script";
+import { tracked } from "@glimmer/tracking";
+
+export default class JsonSchemaEditorModal extends Component {
+  @tracked editor = null;
+  @tracked value = this.args.value;
+  @tracked flash;
+  @tracked flashType;
+
+  get settingName() {
+    return this.args.settingName.replace(/\_/g, " ");
+  }
+
+  @action
+  buildJsonEditor(editor) {
+    loadScript("/javascripts/jsoneditor.js").then(
+      this._loadEditor.bind(this, editor)
+    );
+  }
+
+  @action
+  teardownJsonEditor() {
+    this.editor?.destroy();
+  }
+
+  @action
+  saveChanges() {
+    const errors = this.editor.validate();
+
+    if (!errors.length) {
+      this.value = JSON.stringify(this.editor.getValue());
+      this.args.updateValue(this.value);
+      this.args.closeModal();
+    } else {
+      this.flash = errors.mapBy("message").join("\n");
+      this.flashType = "error";
+    }
+  }
+
+  @afterRender
+  _loadEditor(editor) {
+    let { JSONEditor } = window;
+
+    JSONEditor.defaults.options.theme = "bootstrap4";
+    JSONEditor.defaults.iconlibs = {
+      discourseIcons: DiscourseJsonSchemaEditorIconlib,
+    };
+    JSONEditor.defaults.options.iconlib = "discourseIcons";
+
+    this.editor = new JSONEditor(editor, {
+      schema: this.args.jsonSchema,
+      disable_array_delete_all_rows: true,
+      disable_array_delete_last_row: true,
+      disable_array_reorder: false,
+      disable_array_copy: false,
+      enable_array_copy: true,
+      disable_edit_json: true,
+      disable_properties: true,
+      disable_collapse: false,
+      remove_button_labels: true,
+      show_errors: "never",
+      startval: this.value ? JSON.parse(this.value) : null,
+    });
+  }
+}
+
+class DiscourseJsonSchemaEditorIconlib {
+  constructor() {
+    this.mapping = {
+      delete: "trash-alt",
+      add: "plus",
+      moveup: "arrow-up",
+      movedown: "arrow-down",
+      copy: "copy",
+      collapse: "chevron-down",
+      expand: "chevron-up",
+    };
+  }
+
+  getIcon(key) {
+    if (!this.mapping[key]) {
+      return;
+    }
+    return create(iconNode(this.mapping[key]));
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/modal/keyboard-shortcuts-help.hbs b/app/assets/javascripts/discourse/app/components/modal/keyboard-shortcuts-help.hbs
new file mode 100644
index 00000000000..6633a0c0345
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/keyboard-shortcuts-help.hbs
@@ -0,0 +1,27 @@
+<DModal
+  @title={{i18n "keyboard_shortcuts_help.title"}}
+  @closeModal={{@closeModal}}
+  class="keyboard-shortcuts-modal"
+>
+  <:body>
+    <div id="keyboard-shortcuts-help">
+      <div class="keyboard-shortcuts-help__container">
+        {{#each-in this.shortcuts as |category shortcutCategory|}}
+          <section
+            class="shortcut-category span-{{shortcutCategory.count}}
+              shortcut-category-{{category}}"
+          >
+            <h4>{{i18n
+                (concat "keyboard_shortcuts_help." category ".title")
+              }}</h4>
+            <ul>
+              {{#each-in shortcutCategory.shortcuts as |name shortcut|}}
+                <li>{{html-safe shortcut}}</li>
+              {{/each-in}}
+            </ul>
+          </section>
+        {{/each-in}}
+      </div>
+    </div>
+  </:body>
+</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/controllers/keyboard-shortcuts-help.js b/app/assets/javascripts/discourse/app/components/modal/keyboard-shortcuts-help.js
similarity index 93%
rename from app/assets/javascripts/discourse/app/controllers/keyboard-shortcuts-help.js
rename to app/assets/javascripts/discourse/app/components/modal/keyboard-shortcuts-help.js
index 359ab09d013..8078e5aef11 100644
--- a/app/assets/javascripts/discourse/app/controllers/keyboard-shortcuts-help.js
+++ b/app/assets/javascripts/discourse/app/components/modal/keyboard-shortcuts-help.js
@@ -1,8 +1,8 @@
-import Controller from "@ember/controller";
+import Component from "@glimmer/component";
 import I18n from "I18n";
 import { translateModKey } from "discourse/lib/utilities";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { extraKeyboardShortcutsHelp } from "discourse/lib/keyboard-shortcuts";
+import { inject as service } from "@ember/service";
 
 const KEY = "keyboard_shortcuts_help";
 const SHIFT = I18n.t("shortcut_modifier_key.shift");
@@ -59,17 +59,10 @@ function buildShortcut(
   return I18n.t(`${KEY}.${key}`, context);
 }
 
-export default Controller.extend(ModalFunctionality, {
-  onShow() {
-    this.set("modal.modalClass", "keyboard-shortcuts-modal");
-    this._defineShortcuts();
-  },
+export default class KeyboardShortcutsHelp extends Component {
+  @service currentUser;
 
-  onClose() {
-    this.set("shortcuts", null);
-  },
-
-  _defineShortcuts() {
+  get shortcuts() {
     let shortcuts = {
       jump_to: { shortcuts: this._buildJumpToSection() },
       application: {
@@ -194,6 +187,10 @@ export default Controller.extend(ModalFunctionality, {
             keys1: [SHIFT, "F11"],
             keysDelimiter: PLUS,
           }),
+          insertCurrentTime: buildShortcut("composing.insert_current_time", {
+            keys1: [META, SHIFT, "."],
+            keysDelimiter: PLUS,
+          }),
         },
       },
       bookmarks: {
@@ -201,35 +198,27 @@ export default Controller.extend(ModalFunctionality, {
           enter: buildShortcut("bookmarks.enter", { keys1: [ENTER] }),
           later_today: buildShortcut("bookmarks.later_today", {
             keys1: ["l", "t"],
-            shortcutsDelimiter: "space",
           }),
           later_this_week: buildShortcut("bookmarks.later_this_week", {
             keys1: ["l", "w"],
-            shortcutsDelimiter: "space",
           }),
           tomorrow: buildShortcut("bookmarks.tomorrow", {
             keys1: ["n", "d"],
-            shortcutsDelimiter: "space",
           }),
           next_business_week: buildShortcut("bookmarks.next_business_week", {
             keys1: ["n", "b", "w"],
-            shortcutsDelimiter: "space",
           }),
           next_business_day: buildShortcut("bookmarks.next_business_day", {
             keys1: ["n", "b", "d"],
-            shortcutsDelimiter: "space",
           }),
           custom: buildShortcut("bookmarks.custom", {
             keys1: ["c", "r"],
-            shortcutsDelimiter: "space",
           }),
           none: buildShortcut("bookmarks.none", {
             keys1: ["n", "r"],
-            shortcutsDelimiter: "space",
           }),
           delete: buildShortcut("bookmarks.delete", {
             keys1: ["d", "d"],
-            shortcutsDelimiter: "space",
           }),
         },
       },
@@ -252,8 +241,8 @@ export default Controller.extend(ModalFunctionality, {
     };
     this._buildExtraShortcuts(shortcuts);
     this._addCountsToShortcutCategories(shortcuts);
-    this.set("shortcuts", shortcuts);
-  },
+    return shortcuts;
+  }
 
   _buildExtraShortcuts(shortcuts) {
     for (const [category, helps] of Object.entries(
@@ -274,7 +263,7 @@ export default Controller.extend(ModalFunctionality, {
         );
       });
     }
-  },
+  }
 
   _addCountsToShortcutCategories(shortcuts) {
     for (const [category, shortcutCategory] of Object.entries(shortcuts)) {
@@ -282,7 +271,7 @@ export default Controller.extend(ModalFunctionality, {
         shortcutCategory.shortcuts
       ).length;
     }
-  },
+  }
 
   _transformExtraDefinition(definition) {
     if (definition.keys1) {
@@ -304,7 +293,7 @@ export default Controller.extend(ModalFunctionality, {
       );
     }
     return definition;
-  },
+  }
 
   _translateKeys(string) {
     for (const [matcher, replacement] of Object.entries(
@@ -313,7 +302,7 @@ export default Controller.extend(ModalFunctionality, {
       string = string.replace(matcher, replacement);
     }
     return string;
-  },
+  }
 
   _buildJumpToSection() {
     const shortcuts = {
@@ -337,5 +326,5 @@ export default Controller.extend(ModalFunctionality, {
       previous: buildShortcut("jump_to.previous", { keys1: ["g", "k"] }),
     });
     return shortcuts;
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/modal/not-activated.hbs b/app/assets/javascripts/discourse/app/components/modal/not-activated.hbs
new file mode 100644
index 00000000000..3b46045804d
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/not-activated.hbs
@@ -0,0 +1,11 @@
+<DModal @closeModal={{@closeModal}} @title={{i18n "log_in"}}>
+  <:body>
+    {{html-safe (i18n "login.not_activated" sentTo=@model.sentTo)}}
+  </:body>
+  <:footer>
+    <ActivationControls
+      @sendActivationEmail={{this.sendActivationEmail}}
+      @editActivationEmail={{this.editActivationEmail}}
+    />
+  </:footer>
+</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/not-activated.js b/app/assets/javascripts/discourse/app/components/modal/not-activated.js
new file mode 100644
index 00000000000..feec2984e7e
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/not-activated.js
@@ -0,0 +1,29 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+import { resendActivationEmail } from "discourse/lib/user-activation";
+import ActivationResent from "./activation-resent";
+import ActivationEdit from "./activation-edit";
+
+export default class NotActivated extends Component {
+  @service modal;
+
+  @action
+  sendActivationEmail() {
+    resendActivationEmail(this.username).then(() => {
+      this.modal.show(ActivationResent, {
+        model: { currentEmail: this.args.model.currentEmail },
+      });
+    });
+  }
+
+  @action
+  editActivationEmail() {
+    this.modal.show(ActivationEdit, {
+      model: {
+        currentEmail: this.args.model.currentEmail,
+        newEmail: this.args.model.currentEmail,
+      },
+    });
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/modal/publish-page.hbs b/app/assets/javascripts/discourse/app/components/modal/publish-page.hbs
new file mode 100644
index 00000000000..1ca0c842e39
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/publish-page.hbs
@@ -0,0 +1,105 @@
+<DModal
+  @closeModal={{@closeModal}}
+  @title={{i18n "topic.publish_page.title"}}
+  class="publish-page-modal"
+>
+  <:body>
+    {{#if this.unpublished}}
+      <p>{{i18n "topic.publish_page.unpublished"}}</p>
+    {{else}}
+      <ConditionalLoadingSpinner @condition={{this.initializing}}>
+        <p class="publish-description">{{i18n
+            "topic.publish_page.description"
+          }}</p>
+
+        <form>
+          <div class="controls">
+            <label>{{i18n "topic.publish_page.slug"}}</label>
+            <TextField
+              @value={{this.publishedPage.slug}}
+              @onChange={{this.checkSlug}}
+              @onChangeImmediate={{this.startCheckSlug}}
+              @disabled={{this.existing}}
+              @class="publish-slug"
+            />
+          </div>
+
+          <div class="controls">
+            <label>{{i18n "topic.publish_page.public"}}</label>
+
+            <p class="description">
+              <Input
+                @type="checkbox"
+                @checked={{readonly this.publishedPage.public}}
+                {{on "click" this.onChangePublic}}
+              />
+              {{i18n "topic.publish_page.public_description"}}
+            </p>
+          </div>
+        </form>
+
+        <div class="publish-url">
+          <ConditionalLoadingSpinner @condition={{this.checking}} />
+
+          {{#if this.existing}}
+            <div class="current-url">
+              {{i18n "topic.publish_page.publish_url"}}
+              <div>
+                <a
+                  href={{this.publishedPage.url}}
+                  target="_blank"
+                  rel="noopener noreferrer"
+                >{{this.publishedPage.url}}</a>
+              </div>
+            </div>
+          {{else}}
+            {{#if this.showUrl}}
+              <div class="valid-slug">
+                {{i18n "topic.publish_page.preview_url"}}
+                <div class="example-url">{{this.publishedPage.url}}</div>
+              </div>
+            {{/if}}
+
+            {{#if this.invalid}}
+              {{i18n "topic.publish_page.invalid_slug"}}
+              <span class="invalid-slug">{{this.reason}}.</span>
+            {{/if}}
+          {{/if}}
+
+        </div>
+      </ConditionalLoadingSpinner>
+    {{/if}}
+  </:body>
+  <:footer>
+    {{#if this.showUnpublish}}
+      <DButton
+        @label="topic.publish_page.unpublish"
+        @icon="trash-alt"
+        @class="btn-danger"
+        @isLoading={{this.unpublishing}}
+        @action={{this.unpublish}}
+      />
+
+      <DButton
+        @class="close-publish-page"
+        @icon="times"
+        @label="close"
+        @action={{@closeModal}}
+      />
+    {{else if this.unpublished}}
+      <DButton
+        @label="topic.publish_page.publishing_settings"
+        @action={{this.startNew}}
+      />
+    {{else}}
+      <DButton
+        @label="topic.publish_page.publish"
+        @class="btn-primary publish-page"
+        @icon="file"
+        @disabled={{this.disabled}}
+        @isLoading={{this.saving}}
+        @action={{this.publish}}
+      />
+    {{/if}}
+  </:footer>
+</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/publish-page.js b/app/assets/javascripts/discourse/app/components/modal/publish-page.js
new file mode 100644
index 00000000000..0907b484ffc
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/publish-page.js
@@ -0,0 +1,165 @@
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+import { tracked } from "@glimmer/tracking";
+import Component from "@glimmer/component";
+import { ajax } from "discourse/lib/ajax";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+
+const States = {
+  initializing: "initializing",
+  checking: "checking",
+  valid: "valid",
+  invalid: "invalid",
+  saving: "saving",
+  new: "new",
+  existing: "existing",
+  unpublishing: "unpublishing",
+  unpublished: "unpublished",
+};
+
+export default class PublishPageModal extends Component {
+  @service store;
+
+  @tracked state = States.initializing;
+  @tracked reason = null;
+  @tracked publishedPage = null;
+
+  constructor() {
+    super(...arguments);
+    this.store
+      .find("published_page", this.args.model.id)
+      .then((page) => {
+        this.state = States.existing;
+        this.publishedPage = page;
+      })
+      .catch(this.startNew);
+  }
+
+  get initializing() {
+    return this.state === States.initializing;
+  }
+
+  get checking() {
+    return this.state === States.checking;
+  }
+
+  get valid() {
+    return this.state === States.valid;
+  }
+
+  get invalid() {
+    return this.state === States.invalid;
+  }
+
+  get saving() {
+    return this.state === States.saving;
+  }
+
+  get new() {
+    return this.state === States.new;
+  }
+
+  get existing() {
+    return this.state === States.existing;
+  }
+
+  get unpublishing() {
+    return this.state === States.unpublishing;
+  }
+
+  get unpublished() {
+    return this.state === States.unpublished;
+  }
+
+  get disabled() {
+    return this.state !== States.valid;
+  }
+
+  get showUrl() {
+    return (
+      this.state === States.valid ||
+      this.state === States.saving ||
+      this.state === States.existing
+    );
+  }
+
+  get showUnpublish() {
+    return this.state === States.existing || this.state === States.unpublishing;
+  }
+
+  @action
+  startCheckSlug() {
+    if (this.state === States.existing) {
+      return;
+    }
+
+    this.state = States.checking;
+  }
+
+  @action
+  checkSlug() {
+    if (this.state === States.existing) {
+      return;
+    }
+    return ajax("/pub/check-slug", {
+      data: { slug: this.publishedPage.slug },
+    }).then((result) => {
+      if (result.valid_slug) {
+        this.state = States.valid;
+      } else {
+        this.state = States.invalid;
+        this.reason = result.reason;
+      }
+    });
+  }
+
+  @action
+  unpublish() {
+    this.state = States.unpublishing;
+    return this.publishedPage
+      .destroyRecord()
+      .then(() => {
+        this.state = States.unpublished;
+        this.args.model.set("publishedPage", null);
+      })
+      .catch((result) => {
+        this.state = States.existing;
+        popupAjaxError(result);
+      });
+  }
+
+  @action
+  publish() {
+    this.state = States.saving;
+
+    return this.publishedPage
+      .update(this.publishedPage.getProperties("slug", "public"))
+      .then(() => {
+        this.state = States.existing;
+        this.args.model.set("publishedPage", this.publishedPage);
+      })
+      .catch((errResult) => {
+        popupAjaxError(errResult);
+        this.state = States.existing;
+      });
+  }
+
+  @action
+  startNew() {
+    this.state = States.new;
+    this.publishedPage = this.store.createRecord(
+      "published_page",
+      this.args.model.getProperties("id", "slug", "public")
+    );
+    this.checkSlug();
+  }
+
+  @action
+  onChangePublic(event) {
+    this.publishedPage.set("public", event.target.checked);
+
+    if (this.showUnpublish) {
+      this.publish();
+    }
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/modal/second-factor-add-security-key.hbs b/app/assets/javascripts/discourse/app/components/modal/second-factor-add-security-key.hbs
new file mode 100644
index 00000000000..bde62e2e656
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/second-factor-add-security-key.hbs
@@ -0,0 +1,47 @@
+<DModal
+  @closeModal={{@closeModal}}
+  @title={{i18n "user.second_factor.security_key.add"}}
+  {{did-insert this.securityKeyRequested}}
+>
+  <:body>
+    <ConditionalLoadingSpinner @condition={{this.loading}}>
+      {{#if this.errorMessage}}
+        <div class="control-group">
+          <div class="controls">
+            <div class="alert alert-error">{{this.errorMessage}}</div>
+          </div>
+        </div>
+      {{/if}}
+
+      <div class="control-group">
+        <div class="controls">
+          {{html-safe
+            (i18n "user.second_factor.enable_security_key_description")
+          }}
+        </div>
+      </div>
+
+      <div class="control-group">
+        <div class="controls">
+          <Input
+            @value={{this.securityKeyName}}
+            id="security-key-name"
+            placeholder="security key name"
+          />
+        </div>
+      </div>
+
+      <div class="control-group">
+        <div class="controls">
+          {{#unless this.webauthnUnsupported}}
+            <DButton
+              class="btn-primary add-security-key"
+              @action={{this.registerSecurityKey}}
+              @label="user.second_factor.security_key.register"
+            />
+          {{/unless}}
+        </div>
+      </div>
+    </ConditionalLoadingSpinner>
+  </:body>
+</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/second-factor-add-security-key.js b/app/assets/javascripts/discourse/app/components/modal/second-factor-add-security-key.js
new file mode 100644
index 00000000000..624330fd73e
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/second-factor-add-security-key.js
@@ -0,0 +1,151 @@
+import {
+  bufferToBase64,
+  isWebauthnSupported,
+  stringToBuffer,
+} from "discourse/lib/webauthn";
+import Component from "@glimmer/component";
+import I18n from "I18n";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+import { tracked } from "@glimmer/tracking";
+
+export default class SecondFactorAddSecurityKey extends Component {
+  @service capabilities;
+
+  @tracked loading = false;
+  @tracked errorMessage = null;
+  @tracked securityKeyName;
+
+  get webauthnUnsupported() {
+    return !isWebauthnSupported();
+  }
+
+  @action
+  securityKeyRequested() {
+    let key;
+    if (this.capabilities.isIOS && !this.capabilities.isIpadOS) {
+      key = "user.second_factor.security_key.iphone_default_name";
+    } else if (this.capabilities.isAndroid) {
+      key = "user.second_factor.security_key.android_default_name";
+    } else {
+      key = "user.second_factor.security_key.default_name";
+    }
+    this.securityKeyName = key;
+
+    this.loading = true;
+    this.args.model.secondFactor
+      .requestSecurityKeyChallenge()
+      .then((response) => {
+        if (response.error) {
+          this.errorMessage = response.error;
+          return;
+        }
+
+        this.errorMessage = isWebauthnSupported()
+          ? null
+          : I18n.t("login.security_key_support_missing_error");
+        this.loading = false;
+        this.challenge = response.challenge;
+        this.relayingParty = {
+          id: response.rp_id,
+          name: response.rp_name,
+        };
+        this.supported_algorithms = response.supported_algorithms;
+        this.user_secure_id = response.user_secure_id;
+        this.existing_active_credential_ids =
+          response.existing_active_credential_ids;
+      })
+      .catch((error) => {
+        this.args.closeModal();
+        this.args.model.onError(error);
+      })
+      .finally(() => (this.loading = false));
+  }
+
+  @action
+  registerSecurityKey() {
+    if (!this.securityKeyName) {
+      this.errorMessage = I18n.t(
+        "user.second_factor.security_key.name_required_error"
+      );
+      return;
+    }
+    const publicKeyCredentialCreationOptions = {
+      challenge: Uint8Array.from(this.challenge, (c) => c.charCodeAt(0)),
+      rp: {
+        name: this.relayingParty.name,
+        id: this.relayingParty.id,
+      },
+      user: {
+        id: Uint8Array.from(this.user_secure_id, (c) => c.charCodeAt(0)),
+        displayName: this.args.model.secondFactor.username_lower,
+        name: this.args.model.secondFactor.username_lower,
+      },
+      pubKeyCredParams: this.supported_algorithms.map((alg) => {
+        return { type: "public-key", alg };
+      }),
+      excludeCredentials: this.existing_active_credential_ids.map(
+        (credentialId) => {
+          return {
+            type: "public-key",
+            id: stringToBuffer(atob(credentialId)),
+          };
+        }
+      ),
+      timeout: 20000,
+      attestation: "none",
+      authenticatorSelection: {
+        // see https://chromium.googlesource.com/chromium/src/+/master/content/browser/webauth/uv_preferred.md for why
+        // default value of preferred is not necessarily what we want, it limits webauthn to only devices that support
+        // user verification, which usually requires entering a PIN
+        userVerification: "discouraged",
+      },
+    };
+
+    navigator.credentials
+      .create({
+        publicKey: publicKeyCredentialCreationOptions,
+      })
+      .then(
+        (credential) => {
+          let serverData = {
+            id: credential.id,
+            rawId: bufferToBase64(credential.rawId),
+            type: credential.type,
+            attestation: bufferToBase64(credential.response.attestationObject),
+            clientData: bufferToBase64(credential.response.clientDataJSON),
+            name: this.securityKeyName,
+          };
+
+          this.args.model.secondFactor
+            .registerSecurityKey(serverData)
+            .then((response) => {
+              if (response.error) {
+                this.errorMessage = response.error;
+                return;
+              }
+              this.args.model.markDirty();
+              this.errorMessage = null;
+              this.args.closeModal();
+            })
+            .catch((error) => this.args.model.onError(error))
+            .finally(() => (this.loading = false));
+        },
+        (err) => {
+          if (err.name === "InvalidStateError") {
+            this.errorMessage = I18n.t(
+              "user.second_factor.security_key.already_added_error"
+            );
+            return;
+          }
+          if (err.name === "NotAllowedError") {
+            this.errorMessage = I18n.t(
+              "user.second_factor.security_key.not_allowed_error"
+            );
+            return;
+          }
+          this.errorMessage = err.message;
+        }
+      );
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/modal/second-factor-add-totp.hbs b/app/assets/javascripts/discourse/app/components/modal/second-factor-add-totp.hbs
new file mode 100644
index 00000000000..9e709d1ed2d
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/second-factor-add-totp.hbs
@@ -0,0 +1,83 @@
+<DModal
+  @closeModal={{@closeModal}}
+  @title={{i18n "user.second_factor.totp.add"}}
+  {{did-insert this.totpRequested}}
+>
+  <:body>
+    <ConditionalLoadingSpinner @condition={{this.loading}}>
+      {{#if this.errorMessage}}
+        <div class="control-group">
+          <div class="controls">
+            <div class="alert alert-error">{{this.errorMessage}}</div>
+          </div>
+        </div>
+      {{/if}}
+
+      <div class="control-group">
+        <div class="controls">
+          {{html-safe (i18n "user.second_factor.enable_description")}}
+        </div>
+      </div>
+
+      <div class="control-group">
+        <div class="controls">
+          <div class="qr-code">
+            <img src={{html-safe this.secondFactorImage}} />
+          </div>
+          <p>
+            {{#if this.showSecondFactorKey}}
+              <div class="second-factor-key">
+                {{this.secondFactorKey}}
+              </div>
+            {{else}}
+              <a
+                href
+                class="show-second-factor-key"
+                {{on "click" this.enableShowSecondFactorKey}}
+              >{{i18n "user.second_factor.show_key_description"}}</a>
+            {{/if}}
+          </p>
+        </div>
+      </div>
+
+      <div class="control-group">
+        <label class="control-label input-prepend">{{i18n
+            "user.second_factor.name"
+          }}</label>
+        <div class="controls">
+          <SecondFactorInput
+            @value={{this.secondFactorName}}
+            @inputId="second-factor-name"
+            @placeholder={{i18n "user.second_factor.totp.default_name"}}
+          />
+        </div>
+
+        <label class="control-label input-prepend">{{i18n
+            "user.second_factor.label"
+          }}</label>
+        <div class="controls">
+          <TextField
+            class="second-factor-token-input"
+            maxlength={{6}}
+            @value={{this.secondFactorToken}}
+            @inputId="second-factor-token"
+            placeholder="123456"
+            autocorrect="off"
+            autocapitalize="off"
+            autofocus="autofocus"
+          />
+        </div>
+      </div>
+
+      <div class="control-group">
+        <div class="controls">
+          <DButton
+            class="btn-primary add-totp"
+            @action={{this.enableSecondFactor}}
+            @label="enable"
+          />
+        </div>
+      </div>
+    </ConditionalLoadingSpinner>
+  </:body>
+</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/second-factor-add-totp.js b/app/assets/javascripts/discourse/app/components/modal/second-factor-add-totp.js
new file mode 100644
index 00000000000..5a7281c6d40
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/second-factor-add-totp.js
@@ -0,0 +1,65 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import { tracked } from "@glimmer/tracking";
+import I18n from "I18n";
+
+export default class SecondFactorAddTotp extends Component {
+  @tracked loading = false;
+  @tracked secondFactorImage;
+  @tracked secondFactorKey;
+  @tracked showSecondFactorKey = false;
+  @tracked errorMessage;
+  @tracked secondFactorToken;
+
+  @action
+  totpRequested() {
+    this.args.model.secondFactor
+      .createSecondFactorTotp()
+      .then((response) => {
+        if (response.error) {
+          this.errorMessage = response.error;
+          return;
+        }
+
+        this.errorMessage = null;
+        this.secondFactorKey = response.key;
+        this.secondFactorImage = response.qr;
+      })
+      .catch((error) => {
+        this.args.closeModal();
+        this.args.model.onError(error);
+      })
+      .finally(() => (this.loading = false));
+  }
+
+  @action
+  enableShowSecondFactorKey(e) {
+    e.preventDefault();
+    e.stopImmediatePropagation();
+    this.showSecondFactorKey = true;
+  }
+
+  @action
+  enableSecondFactor() {
+    if (!this.secondFactorToken || !this.secondFactorName) {
+      this.errorMessage = I18n.t(
+        "user.second_factor.totp.name_and_code_required_error"
+      );
+      return;
+    }
+    this.loading = true;
+    this.args.model.secondFactor
+      .enableSecondFactorTotp(this.secondFactorToken, this.secondFactorName)
+      .then((response) => {
+        if (response.error) {
+          this.errorMessage = response.error;
+          return;
+        }
+        this.args.model.markDirty();
+        this.errorMessage = null;
+        this.args.closeModal();
+      })
+      .catch((error) => this.args.model.onError(error))
+      .finally(() => (this.loading = false));
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/modal/second-factor-backup-edit.hbs b/app/assets/javascripts/discourse/app/components/modal/second-factor-backup-edit.hbs
new file mode 100644
index 00000000000..66b315c86d3
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/second-factor-backup-edit.hbs
@@ -0,0 +1,62 @@
+<DModal
+  @title={{i18n "user.second_factor_backup.title"}}
+  @closeModal={{@closeModal}}
+  class="second-factor-backup-edit-modal"
+>
+  <:body>
+    {{#if this.successMessage}}
+      <div class="alert alert-success">
+        {{this.successMessage}}
+      </div>
+    {{/if}}
+
+    {{#if this.errorMessage}}
+      <div class="alert alert-error">
+        {{this.errorMessage}}
+      </div>
+    {{/if}}
+
+    <ConditionalLoadingSection @isLoading={{this.loading}}>
+      {{#if this.backupCodes}}
+        <h3>{{i18n "user.second_factor_backup.codes.title"}}</h3>
+        <p>{{i18n "user.second_factor_backup.codes.description"}}</p>
+        <BackupCodes
+          @copyBackupCode={{this.copyBackupCode}}
+          @backupCodes={{this.backupCodes}}
+        />
+      {{/if}}
+    </ConditionalLoadingSection>
+
+    {{#if this.backupEnabled}}
+      {{html-safe
+        (i18n
+          "user.second_factor_backup.remaining_codes" count=this.remainingCodes
+        )
+      }}
+    {{else}}
+      {{html-safe (i18n "user.second_factor_backup.not_enabled")}}
+    {{/if}}
+  </:body>
+  <:footer>
+    <div class="actions">
+      {{#if this.backupEnabled}}
+        <DButton
+          class="btn-primary"
+          @icon="redo"
+          @action={{this.generateSecondFactorCodes}}
+          @type="submit"
+          @isLoading={{this.loading}}
+          @label="user.second_factor_backup.regenerate"
+        />
+      {{else}}
+        <DButton
+          class="btn-primary"
+          @action={{this.generateSecondFactorCodes}}
+          @type="submit"
+          @disabled={{this.loading}}
+          @label="user.second_factor_backup.enable"
+        />
+      {{/if}}
+    </div>
+  </:footer>
+</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/second-factor-backup-edit.js b/app/assets/javascripts/discourse/app/components/modal/second-factor-backup-edit.js
new file mode 100644
index 00000000000..203d293e4c8
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/second-factor-backup-edit.js
@@ -0,0 +1,64 @@
+import Component from "@glimmer/component";
+import I18n from "I18n";
+import { SECOND_FACTOR_METHODS } from "discourse/models/user";
+import { debounce } from "discourse-common/utils/decorators";
+import { tracked } from "@glimmer/tracking";
+import { action } from "@ember/object";
+
+export default class SecondFactorBackupEdit extends Component {
+  @tracked loading = false;
+  @tracked errorMessage;
+  @tracked successMessage;
+  @tracked backupEnabled =
+    this.args.model.secondFactor.second_factor_backup_enabled;
+  @tracked remainingCodes =
+    this.args.model.secondFactor.second_factor_remaining_backup_codes;
+  @tracked backupCodes;
+  @tracked secondFactorMethod = SECOND_FACTOR_METHODS.TOTP;
+
+  @action
+  copyBackupCode(successful) {
+    if (successful) {
+      this.successMessage = I18n.t(
+        "user.second_factor_backup.copied_to_clipboard"
+      );
+    } else {
+      this.errorMessage = I18n.t(
+        "user.second_factor_backup.copy_to_clipboard_error"
+      );
+    }
+    this._hideCopyMessage();
+  }
+
+  @action
+  generateSecondFactorCodes() {
+    this.loading = true;
+    this.args.model.secondFactor
+      .generateSecondFactorCodes()
+      .then((response) => {
+        if (response.error) {
+          this.errorMessage = response.error;
+          return;
+        }
+
+        this.args.model.markDirty();
+        this.errorMessage = null;
+        this.backupCodes = response.backup_codes;
+        this.args.model.setBackupEnabled(true);
+        this.backupEnabled = true;
+        this.remainingCodes = response.backup_codes.length;
+        this.args.model.setCodesRemaining(this.remainingCodes);
+      })
+      .catch((error) => {
+        this.args.closeModal();
+        this.args.model.onError(error);
+      })
+      .finally(() => (this.loading = false));
+  }
+
+  @debounce(2000)
+  _hideCopyMessage() {
+    this.successMessage = null;
+    this.errorMessage = null;
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/modal/second-factor-edit-security-key.hbs b/app/assets/javascripts/discourse/app/components/modal/second-factor-edit-security-key.hbs
new file mode 100644
index 00000000000..09bef461f1c
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/second-factor-edit-security-key.hbs
@@ -0,0 +1,26 @@
+<DModal
+  @title={{i18n "user.second_factor.security_key.edit"}}
+  @closeModal={{@closeModal}}
+>
+  <:body>
+    <form class="form-horizontal">
+      <div class="input-group">
+        <label for="security-key-name">{{i18n
+            "user.second_factor.security_key.edit_description"
+          }}</label>
+        <Input
+          name="security-key-name"
+          @type="text"
+          @value={{@model.securityKey.name}}
+        />
+      </div>
+    </form>
+  </:body>
+  <:footer>
+    <DButton
+      @action={{this.editSecurityKey}}
+      class="btn-primary"
+      @label="user.second_factor.security_key.save"
+    />
+  </:footer>
+</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/second-factor-edit-security-key.js b/app/assets/javascripts/discourse/app/components/modal/second-factor-edit-security-key.js
new file mode 100644
index 00000000000..441b72ed4a4
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/second-factor-edit-security-key.js
@@ -0,0 +1,31 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import { tracked } from "@glimmer/tracking";
+
+export default class SecondFactorEditSecurityKey extends Component {
+  @tracked loading = false;
+
+  @action
+  editSecurityKey() {
+    this.loading = true;
+    this.args.model.user
+      .updateSecurityKey(
+        this.args.model.securityKey.id,
+        this.args.model.securityKey.name,
+        false
+      )
+      .then((response) => {
+        if (response.error) {
+          return;
+        }
+        this.args.model.markDirty();
+      })
+      .catch((error) => {
+        this.args.model.onError(error);
+      })
+      .finally(() => {
+        this.loading = false;
+        this.args.closeModal();
+      });
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/modal/second-factor-edit.hbs b/app/assets/javascripts/discourse/app/components/modal/second-factor-edit.hbs
new file mode 100644
index 00000000000..c3d9f5ad6f1
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/second-factor-edit.hbs
@@ -0,0 +1,24 @@
+<DModal
+  @title={{i18n "user.second_factor.edit_title"}}
+  @closeModal={{@closeModal}}
+>
+  <:body>
+    <div class="input-group">
+      <label for="authenticator-name">{{i18n
+          "user.second_factor.edit_description"
+        }}</label>
+      <Input
+        name="authenticator-name"
+        @type="text"
+        @value={{@model.secondFactor.name}}
+      />
+    </div>
+  </:body>
+  <:footer>
+    <DButton
+      @action={{this.editSecondFactor}}
+      class="btn-primary"
+      @label="user.second_factor.save"
+    />
+  </:footer>
+</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/second-factor-edit.js b/app/assets/javascripts/discourse/app/components/modal/second-factor-edit.js
new file mode 100644
index 00000000000..be3ec5c5cce
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/second-factor-edit.js
@@ -0,0 +1,33 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import { tracked } from "@glimmer/tracking";
+
+export default class SecondFactorEdit extends Component {
+  @tracked loading = false;
+
+  @action
+  editSecondFactor() {
+    this.loading = true;
+    this.args.model.user
+      .updateSecondFactor(
+        this.args.model.secondFactor.id,
+        this.args.model.secondFactor.name,
+        false,
+        this.args.model.secondFactor.method
+      )
+      .then((response) => {
+        if (response.error) {
+          return;
+        }
+        this.args.model.markDirty();
+      })
+      .catch((error) => {
+        this.args.closeModal();
+        this.args.model.onError(error);
+      })
+      .finally(() => {
+        this.loading = false;
+        this.args.closeModal();
+      });
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/share-topic.hbs b/app/assets/javascripts/discourse/app/components/modal/share-topic.hbs
similarity index 84%
rename from app/assets/javascripts/discourse/app/templates/modal/share-topic.hbs
rename to app/assets/javascripts/discourse/app/components/modal/share-topic.hbs
index 8a50a21f6bd..b18a4b294bf 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/share-topic.hbs
+++ b/app/assets/javascripts/discourse/app/components/modal/share-topic.hbs
@@ -1,10 +1,14 @@
-<DModalBody
-  @rawTitle={{if
+<DModal
+  @title={{if
     this.post
     (i18n "post.share.title" post_number=this.post.post_number)
     (i18n "topic.share.title")
   }}
-  @rawSubtitle={{if this.post this.displayDate}}
+  @subtitle={{if this.post this.displayDate}}
+  @closeModal={{@closeModal}}
+  @flash={{this.flash}}
+  @flashType={{this.flashType}}
+  class="share-topic-modal"
 >
   <form>
     <div class="input-group invite-link">
@@ -17,6 +21,7 @@
       </label>
       <div class="link-share-container">
         <Input
+          id="invite-link"
           name="invite-link"
           class="invite-link"
           @value={{this.url}}
@@ -66,7 +71,11 @@
             />
           {{/if}}
         {{/if}}
+        <PluginOutlet
+          @name="share-topic-sources"
+          @outletArgs={{hash topic=this.topic post=this.post}}
+        />
       </div>
     </div>
   </form>
-</DModalBody>
\ No newline at end of file
+</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/share-topic.js b/app/assets/javascripts/discourse/app/components/modal/share-topic.js
new file mode 100644
index 00000000000..fa00bc6b543
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/share-topic.js
@@ -0,0 +1,121 @@
+import Component from "@ember/component";
+import { action } from "@ember/object";
+import { getAbsoluteURL } from "discourse-common/lib/get-url";
+import discourseComputed, {
+  afterRender,
+} from "discourse-common/utils/decorators";
+import { readOnly } from "@ember/object/computed";
+import { longDateNoYear } from "discourse/lib/formatter";
+import Sharing from "discourse/lib/sharing";
+import showModal from "discourse/lib/show-modal";
+import { bufferedProperty } from "discourse/mixins/buffered-content";
+import I18n from "I18n";
+import Category from "discourse/models/category";
+import { getOwner } from "discourse-common/lib/get-owner";
+
+const ShareTopicModal = Component.extend(bufferedProperty("invite"), {
+  topic: readOnly("model.topic"),
+  post: readOnly("model.post"),
+  category: readOnly("model.category"),
+  allowInvites: readOnly("model.allowInvites"),
+
+  didInsertElement() {
+    this._showRestrictedGroupWarning();
+    this._selectUrl();
+    this._super();
+  },
+
+  @afterRender
+  _showRestrictedGroupWarning() {
+    if (!this.category) {
+      return;
+    }
+
+    Category.fetchVisibleGroups(this.category.id).then((result) => {
+      if (result.groups.length > 0) {
+        this.setProperties({
+          flash: I18n.t("topic.share.restricted_groups", {
+            count: result.groups.length,
+            groupNames: result.groups.join(", "),
+          }),
+          flashType: "warning",
+        });
+      }
+    });
+  },
+
+  @afterRender
+  _selectUrl() {
+    const input = document.querySelector("input.invite-link");
+    if (input && !this.site.mobileView) {
+      // if the input is auto-focused on mobile, iOS requires two taps of the copy button
+      input.setSelectionRange(0, this.url.length);
+      input.focus();
+    }
+  },
+
+  @discourseComputed("post.shareUrl", "topic.shareUrl")
+  url(postUrl, topicUrl) {
+    if (postUrl) {
+      return getAbsoluteURL(postUrl);
+    } else if (topicUrl) {
+      return getAbsoluteURL(topicUrl);
+    }
+  },
+
+  @discourseComputed("post.created_at", "post.wiki", "post.last_wiki_edit")
+  displayDate(createdAt, wiki, lastWikiEdit) {
+    const date = wiki && lastWikiEdit ? lastWikiEdit : createdAt;
+    return longDateNoYear(new Date(date));
+  },
+
+  @discourseComputed(
+    "topic.{isPrivateMessage,invisible,category.read_restricted}"
+  )
+  sources(topic) {
+    const privateContext =
+      this.siteSettings.login_required ||
+      topic?.isPrivateMessage ||
+      topic?.invisible ||
+      topic?.category?.read_restricted;
+
+    return Sharing.activeSources(this.siteSettings.share_links, privateContext);
+  },
+
+  @action
+  share(source) {
+    Sharing.shareSource(source, {
+      title: this.topic.title,
+      url: this.url,
+    });
+  },
+
+  @action
+  inviteUsers() {
+    const controller = showModal("create-invite");
+    controller.setProperties({
+      inviteToTopic: true,
+      topics: [this.topic],
+    });
+    controller.buffered.setProperties({
+      topicId: this.topic.id,
+      topicTitle: this.topic.title,
+    });
+  },
+
+  @action
+  replyAsNewTopic() {
+    const postStream = this.topic.postStream;
+    const postId = this.post?.id || postStream.findPostIdForPostNumber(1);
+    const post = postStream.findLoadedPost(postId);
+    const topicController = getOwner(this).lookup("controller:topic");
+    topicController.actions.replyAsNewTopic.call(topicController, post);
+    this.closeModal();
+  },
+});
+
+ShareTopicModal.reopenClass({
+  modalClass: "share-topic-modal",
+});
+
+export default ShareTopicModal;
diff --git a/app/assets/javascripts/discourse/app/components/modal/sidebar-section-form.hbs b/app/assets/javascripts/discourse/app/components/modal/sidebar-section-form.hbs
new file mode 100644
index 00000000000..a64b2faf18f
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/sidebar-section-form.hbs
@@ -0,0 +1,137 @@
+<DModal
+  @closeModal={{@closeModal}}
+  @flash={{this.flash}}
+  @flashType={{this.flashType}}
+  @title={{i18n this.header}}
+  class="sidebar-section-form-modal"
+>
+  <:body>
+    <form class="form-horizontal sidebar-section-form">
+      {{#unless this.transformedModel.hideTitleInput}}
+        <div class="sidebar-section-form__input-wrapper">
+          <label for="section-name">
+            {{i18n "sidebar.sections.custom.title.label"}}
+          </label>
+
+          <Input
+            name="section-name"
+            @type="text"
+            @value={{this.transformedModel.title}}
+            class={{this.transformedModel.titleCssClass}}
+            {{on
+              "input"
+              (action (mut this.transformedModel.title) value="target.value")
+            }}
+          />
+
+          {{#if this.transformedModel.invalidTitleMessage}}
+            <div class="title warning">
+              {{this.transformedModel.invalidTitleMessage}}
+            </div>
+          {{/if}}
+        </div>
+      {{/unless}}
+
+      <div class="row-wrapper header">
+        <div class="input-group link-icon">
+          <label>{{i18n "sidebar.sections.custom.links.icon.label"}}</label>
+        </div>
+
+        <div class="input-group link-name">
+          <label>{{i18n "sidebar.sections.custom.links.name.label"}}</label>
+        </div>
+
+        <div class="input-group link-url">
+          <label>{{i18n "sidebar.sections.custom.links.value.label"}}</label>
+        </div>
+      </div>
+
+      {{#each this.activeLinks as |link|}}
+        <Sidebar::SectionFormLink
+          @link={{link}}
+          @deleteLink={{this.deleteLink}}
+          @reorderCallback={{this.reorder}}
+        />
+      {{/each}}
+      <DButton
+        @action={{action "addLink"}}
+        @class="btn-flat btn-text add-link"
+        @title="sidebar.sections.custom.links.add"
+        @icon="plus"
+        @label="sidebar.sections.custom.links.add"
+        @ariaLabel="sidebar.sections.custom.links.add"
+      />
+      {{#if this.transformedModel.sectionType}}
+        <hr />
+        <h3>{{i18n "sidebar.sections.custom.more_menu"}}</h3>
+        {{#each this.activeSecondaryLinks as |link|}}
+          <Sidebar::SectionFormLink
+            @link={{link}}
+            @deleteLink={{this.deleteLink}}
+            @reorderCallback={{this.reorder}}
+          />
+        {{/each}}
+        <DButton
+          @action={{action "addSecondaryLink"}}
+          @class="btn-flat btn-text add-link"
+          @title="sidebar.sections.custom.links.add"
+          @icon="plus"
+          @label="sidebar.sections.custom.links.add"
+          @ariaLabel="sidebar.sections.custom.links.add"
+        />
+
+      {{/if}}
+      {{#if (and this.currentUser.staff)}}
+        <div
+          class="row-wrapper mark-public-wrapper
+            {{if this.transformedModel.sectionType '-disabled'}}"
+        >
+          <label class="checkbox-label">
+            {{#if this.transformedModel.sectionType}}
+              <DTooltip @placement="top-start">
+                {{i18n "sidebar.sections.custom.always_public"}}
+              </DTooltip>
+            {{/if}}
+            <Input
+              @type="checkbox"
+              @checked={{this.transformedModel.public}}
+              class="mark-public"
+              disabled={{this.transformedModel.sectionType}}
+            />
+            {{i18n "sidebar.sections.custom.public"}}
+          </label>
+        </div>
+      {{/if}}
+    </form>
+  </:body>
+  <:footer>
+    <DButton
+      @id="save-section"
+      @action={{action "save"}}
+      @class="btn-primary"
+      @label="sidebar.sections.custom.save"
+      @ariaLabel="sidebar.sections.custom.save"
+      @disabled={{not this.transformedModel.valid}}
+    />
+    {{#if this.canDelete}}
+      <DButton
+        @icon="trash-alt"
+        @id="delete-section"
+        @class="btn-danger delete"
+        @action={{action "delete"}}
+        @label="sidebar.sections.custom.delete"
+        @ariaLabel="sidebar.sections.custom.delete"
+      />
+    {{/if}}
+    {{#if this.transformedModel.sectionType}}
+      <DButton
+        @action={{action "resetToDefault"}}
+        @class="btn-flat btn-text reset-link"
+        @icon="undo"
+        @title="sidebar.sections.custom.links.reset"
+        @label="sidebar.sections.custom.links.reset"
+        @ariaLabel="sidebar.sections.custom.links.reset"
+      />
+    {{/if}}
+  </:footer>
+</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/sidebar-section-form.js b/app/assets/javascripts/discourse/app/components/modal/sidebar-section-form.js
new file mode 100644
index 00000000000..41584ebbb11
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/sidebar-section-form.js
@@ -0,0 +1,517 @@
+import Component from "@ember/component";
+import { ajax } from "discourse/lib/ajax";
+import { isEmpty } from "@ember/utils";
+import { extractError } from "discourse/lib/ajax-error";
+import { inject as service } from "@ember/service";
+import I18n from "I18n";
+import { sanitize } from "discourse/lib/text";
+import { cached, tracked } from "@glimmer/tracking";
+import { A } from "@ember/array";
+import { SIDEBAR_SECTION, SIDEBAR_URL } from "discourse/lib/constants";
+import { bind } from "discourse-common/utils/decorators";
+import { action } from "@ember/object";
+import RouteInfoHelper from "discourse/lib/sidebar/route-info-helper";
+
+const FULL_RELOAD_LINKS_REGEX = [
+  /^\/my\/[a-z_\-\/]+$/,
+  /^\/pub\/[a-z_\-\/]+$/,
+  /^\/safe-mode$/,
+];
+
+class Section {
+  @tracked title;
+  @tracked links;
+  @tracked secondaryLinks;
+
+  constructor({
+    title,
+    links,
+    secondaryLinks,
+    id,
+    publicSection,
+    sectionType,
+    hideTitleInput,
+  }) {
+    this.title = title;
+    this.public = publicSection;
+    this.sectionType = sectionType;
+    this.links = links;
+    this.secondaryLinks = secondaryLinks;
+    this.id = id;
+    this.hideTitleInput = hideTitleInput;
+  }
+
+  get valid() {
+    const allLinks = this.links
+      .filter((link) => !link._destroy)
+      .concat(this.secondaryLinks?.filter((link) => !link._destroy) || []);
+    const validLinks =
+      allLinks.length > 0 && allLinks.every((link) => link.valid);
+    return this.validTitle && validLinks;
+  }
+
+  get validTitle() {
+    return !this.#blankTitle && !this.#tooLongTitle;
+  }
+
+  get invalidTitleMessage() {
+    if (this.title === undefined) {
+      return;
+    }
+    if (this.#blankTitle) {
+      return I18n.t("sidebar.sections.custom.title.validation.blank");
+    }
+    if (this.#tooLongTitle) {
+      return I18n.t("sidebar.sections.custom.title.validation.maximum", {
+        count: SIDEBAR_SECTION.max_title_length,
+      });
+    }
+  }
+
+  get titleCssClass() {
+    return this.title === undefined || this.validTitle ? "" : "warning";
+  }
+
+  get #blankTitle() {
+    return isEmpty(this.title);
+  }
+
+  get #tooLongTitle() {
+    return this.title.length > SIDEBAR_SECTION.max_title_length;
+  }
+}
+
+class SectionLink {
+  @tracked icon;
+  @tracked name;
+  @tracked value;
+  @tracked _destroy;
+
+  constructor({ router, icon, name, value, id, objectId, segment }) {
+    this.router = router;
+    this.icon = icon || "link";
+    this.name = name;
+    this.value = value;
+    this.id = id;
+    this.httpHost = "http://" + window.location.host;
+    this.httpsHost = "https://" + window.location.host;
+    this.objectId = objectId;
+    this.segment = segment;
+  }
+
+  get path() {
+    return this.value?.replace(this.httpHost, "").replace(this.httpsHost, "");
+  }
+
+  get valid() {
+    return this.validIcon && this.validName && this.validValue;
+  }
+
+  get validIcon() {
+    return !this.#blankIcon && !this.#tooLongIcon;
+  }
+
+  get validName() {
+    return !this.#blankName && !this.#tooLongName;
+  }
+
+  get validValue() {
+    return !this.#blankValue && !this.#tooLongValue && !this.#invalidValue;
+  }
+
+  get invalidIconMessage() {
+    if (this.#blankIcon) {
+      return I18n.t("sidebar.sections.custom.links.icon.validation.blank");
+    }
+    if (this.#tooLongIcon) {
+      return I18n.t("sidebar.sections.custom.links.icon.validation.maximum", {
+        count: SIDEBAR_URL.max_icon_length,
+      });
+    }
+  }
+
+  get invalidNameMessage() {
+    if (this.name === undefined) {
+      return;
+    }
+    if (this.#blankName) {
+      return I18n.t("sidebar.sections.custom.links.name.validation.blank");
+    }
+    if (this.#tooLongName) {
+      return I18n.t("sidebar.sections.custom.links.name.validation.maximum", {
+        count: SIDEBAR_URL.max_name_length,
+      });
+    }
+  }
+
+  get invalidValueMessage() {
+    if (this.value === undefined) {
+      return;
+    }
+    if (this.#blankValue) {
+      return I18n.t("sidebar.sections.custom.links.value.validation.blank");
+    }
+    if (this.#tooLongValue) {
+      return I18n.t("sidebar.sections.custom.links.value.validation.maximum", {
+        count: SIDEBAR_URL.max_value_length,
+      });
+    }
+    if (this.#invalidValue) {
+      return I18n.t("sidebar.sections.custom.links.value.validation.invalid");
+    }
+  }
+
+  get iconCssClass() {
+    return this.icon === undefined || this.validIcon ? "" : "warning";
+  }
+
+  get nameCssClass() {
+    return this.name === undefined || this.validName ? "" : "warning";
+  }
+
+  get valueCssClass() {
+    return this.value === undefined || this.validValue ? "" : "warning";
+  }
+
+  get external() {
+    return (
+      this.value &&
+      !(
+        this.value.startsWith(this.httpHost) ||
+        this.value.startsWith(this.httpsHost) ||
+        this.value.startsWith("/")
+      )
+    );
+  }
+
+  get isPrimary() {
+    return this.segment === "primary";
+  }
+
+  get #blankIcon() {
+    return isEmpty(this.icon);
+  }
+
+  get #tooLongIcon() {
+    return this.icon.length > SIDEBAR_URL.max_icon_length;
+  }
+
+  get #blankName() {
+    return isEmpty(this.name);
+  }
+
+  get #tooLongName() {
+    return this.name.length > SIDEBAR_URL.max_name_length;
+  }
+
+  get #blankValue() {
+    return isEmpty(this.value);
+  }
+
+  get #tooLongValue() {
+    return this.value.length > SIDEBAR_URL.max_value_length;
+  }
+
+  get #invalidValue() {
+    return (
+      this.path &&
+      (this.external ? !this.#validExternal() : !this.#validInternal())
+    );
+  }
+
+  #validExternal() {
+    try {
+      return new URL(this.value);
+    } catch {
+      return false;
+    }
+  }
+
+  #validInternal() {
+    const routeInfoHelper = new RouteInfoHelper(this.router, this.path);
+
+    return (
+      routeInfoHelper.route !== "unknown" ||
+      FULL_RELOAD_LINKS_REGEX.some((regex) => this.path.match(regex))
+    );
+  }
+}
+
+export default class SidebarSectionForm extends Component {
+  @service dialog;
+  @service router;
+
+  @tracked flash;
+  @tracked flashType;
+
+  nextObjectId = 0;
+
+  @cached
+  get transformedModel() {
+    const section = this.model?.section;
+
+    if (section) {
+      return new Section({
+        title: section.title,
+        publicSection: section.public,
+        sectionType: section.section_type,
+        links: section.links.reduce((acc, link) => {
+          if (link.segment === "primary") {
+            this.nextObjectId++;
+            acc.push(this.initLink(link));
+          }
+          return acc;
+        }, A()),
+        secondaryLinks: section.links.reduce((acc, link) => {
+          if (link.segment === "secondary") {
+            this.nextObjectId++;
+            acc.push(this.initLink(link));
+          }
+          return acc;
+        }, A()),
+        id: section.id,
+        hideTitleInput: this.model.hideSectionHeader,
+      });
+    } else {
+      return new Section({
+        links: A([
+          new SectionLink({
+            router: this.router,
+            objectId: this.nextObjectId,
+            segment: "primary",
+          }),
+        ]),
+      });
+    }
+  }
+
+  initLink(link) {
+    return new SectionLink({
+      router: this.router,
+      icon: link.icon,
+      name: link.name,
+      value: link.value,
+      id: link.id,
+      objectId: this.nextObjectId,
+      segment: link.segment,
+    });
+  }
+
+  create() {
+    return ajax(`/sidebar_sections`, {
+      type: "POST",
+      contentType: "application/json",
+      dataType: "json",
+      data: JSON.stringify({
+        title: this.transformedModel.title,
+        public: this.transformedModel.public,
+        links: this.transformedModel.links.map((link) => {
+          return {
+            icon: link.icon,
+            name: link.name,
+            value: link.path,
+          };
+        }),
+      }),
+    })
+      .then((data) => {
+        this.currentUser.set(
+          "sidebar_sections",
+          this.currentUser.sidebar_sections.concat(data.sidebar_section)
+        );
+        this.closeModal();
+      })
+      .catch((e) => {
+        this.flash = sanitize(extractError(e));
+        this.flashType = "error";
+      });
+  }
+
+  update() {
+    return ajax(`/sidebar_sections/${this.transformedModel.id}`, {
+      type: "PUT",
+      contentType: "application/json",
+      dataType: "json",
+      data: JSON.stringify({
+        title: this.transformedModel.title,
+        public: this.transformedModel.public,
+        links: this.transformedModel.links
+          .concat(this.transformedModel?.secondaryLinks || [])
+          .map((link) => {
+            return {
+              id: link.id,
+              icon: link.icon,
+              name: link.name,
+              value: link.path,
+              segment: link.segment,
+              _destroy: link._destroy,
+            };
+          }),
+      }),
+    })
+      .then((data) => {
+        const newSidebarSections = this.currentUser.sidebar_sections.map(
+          (section) => {
+            if (section.id === data["sidebar_section"].id) {
+              return data["sidebar_section"];
+            }
+            return section;
+          }
+        );
+        this.currentUser.set("sidebar_sections", newSidebarSections);
+        this.closeModal();
+      })
+      .catch((e) => {
+        this.flash = sanitize(extractError(e));
+        this.flashType = "error";
+      });
+  }
+
+  get activeLinks() {
+    return this.transformedModel.links.filter((link) => !link._destroy);
+  }
+
+  get activeSecondaryLinks() {
+    return this.transformedModel.secondaryLinks?.filter(
+      (link) => !link._destroy
+    );
+  }
+
+  get header() {
+    return this.transformedModel.id
+      ? "sidebar.sections.custom.edit"
+      : "sidebar.sections.custom.add";
+  }
+
+  @bind
+  reorder(linkFromId, linkTo, above) {
+    if (linkFromId === linkTo.objectId) {
+      return;
+    }
+    let linkFrom = this.transformedModel.links.find(
+      (link) => link.objectId === linkFromId
+    );
+    if (!linkFrom) {
+      linkFrom = this.transformedModel.secondaryLinks.find(
+        (link) => link.objectId === linkFromId
+      );
+    }
+
+    if (linkFrom.isPrimary) {
+      this.transformedModel.links.removeObject(linkFrom);
+    } else {
+      this.transformedModel.secondaryLinks?.removeObject(linkFrom);
+    }
+
+    if (linkTo.isPrimary) {
+      const toPosition = this.transformedModel.links.indexOf(linkTo);
+      linkFrom.segment = "primary";
+      this.transformedModel.links.insertAt(
+        above ? toPosition : toPosition + 1,
+        linkFrom
+      );
+    } else {
+      linkFrom.segment = "secondary";
+      const toPosition = this.transformedModel.secondaryLinks.indexOf(linkTo);
+      this.transformedModel.secondaryLinks.insertAt(
+        above ? toPosition : toPosition + 1,
+        linkFrom
+      );
+    }
+  }
+
+  get canDelete() {
+    return this.transformedModel.id && !this.transformedModel.sectionType;
+  }
+
+  @bind
+  deleteLink(link) {
+    if (link.id) {
+      link._destroy = "1";
+    } else {
+      if (link.isPrimary) {
+        this.transformedModel.links.removeObject(link);
+      } else {
+        this.transformedModel.secondaryLinks.removeObject(link);
+      }
+    }
+  }
+
+  @action
+  addLink() {
+    this.nextObjectId = this.nextObjectId + 1;
+    this.transformedModel.links.pushObject(
+      new SectionLink({
+        router: this.router,
+        objectId: this.nextObjectId,
+        segment: "primary",
+      })
+    );
+  }
+
+  @action
+  addSecondaryLink() {
+    this.nextObjectId = this.nextObjectId + 1;
+    this.transformedModel.secondaryLinks.pushObject(
+      new SectionLink({
+        router: this.router,
+        objectId: this.nextObjectId,
+        segment: "secondary",
+      })
+    );
+  }
+
+  @action
+  resetToDefault() {
+    return this.dialog.yesNoConfirm({
+      message: I18n.t("sidebar.sections.custom.reset_confirm"),
+      didConfirm: () => {
+        return ajax(`/sidebar_sections/reset/${this.transformedModel.id}`, {
+          type: "PUT",
+        })
+          .then((data) => {
+            this.currentUser.sidebar_sections.shiftObject();
+            this.currentUser.sidebar_sections.unshiftObject(
+              data["sidebar_section"]
+            );
+            this.closeModal();
+          })
+          .catch((e) => {
+            this.flash = sanitize(extractError(e));
+            this.flashType = "error";
+          });
+      },
+    });
+  }
+
+  @action
+  save() {
+    this.transformedModel.id ? this.update() : this.create();
+  }
+
+  @action
+  delete() {
+    return this.dialog.yesNoConfirm({
+      message: I18n.t("sidebar.sections.custom.delete_confirm"),
+      didConfirm: () => {
+        return ajax(`/sidebar_sections/${this.transformedModel.id}`, {
+          type: "DELETE",
+        })
+          .then(() => {
+            const newSidebarSections = this.currentUser.sidebar_sections.filter(
+              (section) => {
+                return section.id !== this.transformedModel.id;
+              }
+            );
+
+            this.currentUser.set("sidebar_sections", newSidebarSections);
+            this.closeModal();
+          })
+          .catch((e) => {
+            this.flash = sanitize(extractError(e));
+            this.flashType = "error";
+          });
+      },
+    });
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/modal/topic-bulk-actions.hbs b/app/assets/javascripts/discourse/app/components/modal/topic-bulk-actions.hbs
new file mode 100644
index 00000000000..22f1bd8a8ba
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/topic-bulk-actions.hbs
@@ -0,0 +1,44 @@
+<DModal
+  @title={{i18n "topics.bulk.actions"}}
+  @closeModal={{@closeModal}}
+  class="topic-bulk-actions-modal small"
+>
+  <p>
+    {{html-safe (i18n "topics.bulk.selected" count=@model.topics.length)}}
+  </p>
+
+  {{#if this.showProgress}}
+    <p>
+      {{html-safe (i18n "topics.bulk.progress" count=this.processedTopicCount)}}
+    </p>
+  {{else if this.activeComponent}}
+    <this.activeComponent
+      @loading={{this.loading}}
+      @topics={{@model.topics}}
+      @category={{@model.category}}
+      @setComponent={{this.setComponent}}
+      @forEachPerformed={{this.forEachPerformed}}
+      @performAndRefresh={{this.performAndRefresh}}
+    />
+  {{else}}
+    <div class="bulk-buttons">
+      {{#each this.buttons as |button|}}
+        <DButton
+          @action={{fn
+            button.action
+            (hash
+              topics=@model.topics
+              category=@model.category
+              setComponent=this.setComponent
+              performAndRefresh=this.performAndRefresh
+              forEachPerformed=this.forEachPerformed
+            )
+          }}
+          @label={{button.label}}
+          @icon={{button.icon}}
+          class={{button.class}}
+        />
+      {{/each}}
+    </div>
+  {{/if}}
+</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/topic-bulk-actions.js b/app/assets/javascripts/discourse/app/components/modal/topic-bulk-actions.js
new file mode 100644
index 00000000000..9e7c8b9e37a
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/topic-bulk-actions.js
@@ -0,0 +1,304 @@
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+import I18n from "I18n";
+import { Promise } from "rsvp";
+import Topic from "discourse/models/topic";
+import ChangeCategory from "../bulk-actions/change-category";
+import NotificationLevel from "../bulk-actions/notification-level";
+import ChangeTags from "../bulk-actions/change-tags";
+import AppendTags from "../bulk-actions/append-tags";
+import { getOwner } from "discourse-common/lib/get-owner";
+
+const _customButtons = [];
+
+export function _addBulkButton(opts) {
+  _customButtons.push({
+    label: opts.label,
+    icon: opts.icon,
+    class: opts.class,
+    visible: opts.visible,
+    action: opts.action,
+  });
+}
+
+export function clearBulkButtons() {
+  _customButtons.length = 0;
+}
+
+// Modal for performing bulk actions on topics
+export default class TopicBulkActions extends Component {
+  @service currentUser;
+  @service siteSettings;
+  @service dialog;
+
+  @tracked loading = false;
+  @tracked showProgress = false;
+  @tracked processedTopicCount = 0;
+  @tracked activeComponent = null;
+
+  defaultButtons = [
+    {
+      label: "topics.bulk.change_category",
+      icon: "pencil-alt",
+      class: "btn-default",
+      visible: ({ topics }) => !topics.some((t) => t.isPrivateMessage),
+      action({ setComponent }) {
+        setComponent(ChangeCategory);
+      },
+    },
+    {
+      label: "topics.bulk.close_topics",
+      icon: "lock",
+      class: "btn-default bulk-actions__close-topics",
+      visible: ({ topics }) => !topics.some((t) => t.isPrivateMessage),
+      action({ forEachPerformed }) {
+        forEachPerformed({ type: "close" }, (t) => t.set("closed", true));
+      },
+    },
+    {
+      label: "topics.bulk.archive_topics",
+      icon: "folder",
+      class: "btn-default",
+      visible: ({ topics }) => !topics.some((t) => t.isPrivateMessage),
+      action({ forEachPerformed }) {
+        forEachPerformed({ type: "archive" }, (t) => t.set("archived", true));
+      },
+    },
+    {
+      label: "topics.bulk.archive_topics",
+      icon: "folder",
+      class: "btn-default",
+      visible: ({ topics }) => topics.some((t) => t.isPrivateMessage),
+      action: ({ performAndRefresh }) => {
+        const userPrivateMessages = getOwner(this).lookup(
+          "controller:user-private-messages"
+        );
+        let params = { type: "archive_messages" };
+
+        if (userPrivateMessages.isGroup) {
+          params.group = userPrivateMessages.groupFilter;
+        }
+
+        performAndRefresh(params);
+      },
+    },
+    {
+      label: "topics.bulk.move_messages_to_inbox",
+      icon: "folder",
+      class: "btn-default",
+      visible: ({ topics }) => topics.some((t) => t.isPrivateMessage),
+      action: ({ performAndRefresh }) => {
+        const userPrivateMessages = getOwner(this).lookup(
+          "controller:user-private-messages"
+        );
+        let params = { type: "move_messages_to_inbox" };
+
+        if (userPrivateMessages.isGroup) {
+          params.group = userPrivateMessages.groupFilter;
+        }
+
+        performAndRefresh(params);
+      },
+    },
+    {
+      label: "topics.bulk.notification_level",
+      icon: "d-regular",
+      class: "btn-default",
+      action({ setComponent }) {
+        setComponent(NotificationLevel);
+      },
+    },
+    {
+      label: "topics.bulk.defer",
+      icon: "circle",
+      class: "btn-default",
+      visible: ({ currentUser }) => currentUser.user_option.enable_defer,
+      action({ performAndRefresh }) {
+        performAndRefresh({ type: "destroy_post_timing" });
+      },
+    },
+    {
+      label: "topics.bulk.unlist_topics",
+      icon: "far-eye-slash",
+      class: "btn-default",
+      visible: ({ topics }) =>
+        topics.some((t) => t.visible) &&
+        !topics.some((t) => t.isPrivateMessage),
+      action({ forEachPerformed }) {
+        forEachPerformed({ type: "unlist" }, (t) => t.set("visible", false));
+      },
+    },
+    {
+      label: "topics.bulk.relist_topics",
+      icon: "far-eye",
+      class: "btn-default",
+      visible: ({ topics }) =>
+        topics.some((t) => !t.visible) &&
+        !topics.some((t) => t.isPrivateMessage),
+      action({ forEachPerformed }) {
+        forEachPerformed({ type: "relist" }, (t) => t.set("visible", true));
+      },
+    },
+    {
+      label: "topics.bulk.reset_bump_dates",
+      icon: "anchor",
+      class: "btn-default",
+      visible: ({ currentUser }) => currentUser.canManageTopic,
+      action({ performAndRefresh }) {
+        performAndRefresh({ type: "reset_bump_dates" });
+      },
+    },
+    {
+      label: "topics.bulk.change_tags",
+      icon: "tag",
+      class: "btn-default",
+      visible: ({ currentUser, siteSettings }) =>
+        siteSettings.tagging_enabled && currentUser.canManageTopic,
+      action({ setComponent }) {
+        setComponent(ChangeTags);
+      },
+    },
+    {
+      label: "topics.bulk.append_tags",
+      icon: "tag",
+      class: "btn-default",
+      visible: ({ currentUser, siteSettings }) =>
+        siteSettings.tagging_enabled && currentUser.canManageTopic,
+      action({ setComponent }) {
+        setComponent(AppendTags);
+      },
+    },
+    {
+      label: "topics.bulk.remove_tags",
+      icon: "tag",
+      class: "btn-default",
+      visible: ({ currentUser, siteSettings }) =>
+        siteSettings.tagging_enabled && currentUser.canManageTopic,
+      action: ({ performAndRefresh, topics }) => {
+        this.dialog.deleteConfirm({
+          message: I18n.t("topics.bulk.confirm_remove_tags", {
+            count: topics.length,
+          }),
+          didConfirm: () => performAndRefresh({ type: "remove_tags" }),
+        });
+      },
+    },
+    {
+      label: "topics.bulk.delete",
+      icon: "trash-alt",
+      class: "btn-danger delete-topics",
+      visible: ({ currentUser }) => currentUser.staff,
+      action({ performAndRefresh }) {
+        performAndRefresh({ type: "delete" });
+      },
+    },
+  ];
+
+  get buttons() {
+    return [...this.defaultButtons, ..._customButtons].filter(({ visible }) => {
+      if (visible) {
+        return visible({
+          topics: this.args.model.topics,
+          category: this.args.model.category,
+          currentUser: this.currentUser,
+          siteSettings: this.siteSettings,
+        });
+      } else {
+        return true;
+      }
+    });
+  }
+
+  async perform(operation) {
+    this.loading = true;
+
+    if (this.args.model.topics.length > 20) {
+      this.showProgress = true;
+    }
+
+    try {
+      return this._processChunks(operation);
+    } catch {
+      this.dialog.alert(I18n.t("generic_error"));
+    } finally {
+      this.loading = false;
+      this.processedTopicCount = 0;
+      this.showProgress = false;
+    }
+  }
+
+  _generateTopicChunks(allTopics) {
+    let startIndex = 0;
+    const chunkSize = 30;
+    const chunks = [];
+
+    while (startIndex < allTopics.length) {
+      const topics = allTopics.slice(startIndex, startIndex + chunkSize);
+      chunks.push(topics);
+      startIndex += chunkSize;
+    }
+
+    return chunks;
+  }
+
+  _processChunks(operation) {
+    const allTopics = this.args.model.topics;
+    const topicChunks = this._generateTopicChunks(allTopics);
+    const topicIds = [];
+
+    const tasks = topicChunks.map((topics) => async () => {
+      const result = await Topic.bulkOperation(topics, operation);
+      this.processedTopicCount = this.processedTopicCount + topics.length;
+      return result;
+    });
+
+    return new Promise((resolve, reject) => {
+      const resolveNextTask = async () => {
+        if (tasks.length === 0) {
+          const topics = topicIds.map((id) => allTopics.findBy("id", id));
+          return resolve(topics);
+        }
+
+        const task = tasks.shift();
+
+        try {
+          const result = await task();
+          if (result?.topic_ids) {
+            topicIds.push(...result.topic_ids);
+          }
+          resolveNextTask();
+        } catch {
+          reject();
+        }
+      };
+
+      resolveNextTask();
+    });
+  }
+
+  @action
+  setComponent(component) {
+    this.activeComponent = component;
+  }
+
+  @action
+  async forEachPerformed(operation, cb) {
+    const topics = await this.perform(operation);
+
+    if (topics) {
+      topics.forEach(cb);
+      this.args.model.refreshClosure?.();
+      this.args.closeModal();
+    }
+  }
+
+  @action
+  async performAndRefresh(operation) {
+    await this.perform(operation);
+
+    this.args.model.refreshClosure?.();
+    this.args.closeModal();
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/more-topics.hbs b/app/assets/javascripts/discourse/app/components/more-topics.hbs
new file mode 100644
index 00000000000..c3acb2d76ff
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/more-topics.hbs
@@ -0,0 +1,39 @@
+<div
+  class="more-content-wrapper {{if this.singleList 'single-list'}}"
+  {{did-insert this.buildListPills}}
+>
+  {{#if this.showTopicListsNav}}
+    <div class="row">
+      <ul class="nav nav-pills" {{did-insert this.buildListPills}}>
+        {{#each this.availablePills as |pill|}}
+          <li>
+            <DButton
+              @translatedTitle={{pill.name}}
+              @translatedLabel={{pill.name}}
+              @class={{if pill.selected "active"}}
+              @action={{action "rememberTopicListPreference" pill.id}}
+            />
+          </li>
+        {{/each}}
+      </ul>
+    </div>
+  {{/if}}
+
+  {{#if @topic.relatedMessages.length}}
+    <RelatedMessages @topic={{@topic}} />
+  {{/if}}
+
+  {{#if @topic.suggestedTopics.length}}
+    <SuggestedTopics @topic={{@topic}} />
+
+    <span>
+      <PluginOutlet
+        @name="below-suggested-topics"
+        @connectorTagName="div"
+        @outletArgs={{hash topic=@topic}}
+      />
+    </span>
+  {{/if}}
+
+  <PluginOutlet @name="topic-more-content" @outletArgs={{hash model=@topic}} />
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/more-topics.js b/app/assets/javascripts/discourse/app/components/more-topics.js
new file mode 100644
index 00000000000..f82ac3ad44b
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/more-topics.js
@@ -0,0 +1,59 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+import { next } from "@ember/runloop";
+import { action } from "@ember/object";
+import { tracked } from "@glimmer/tracking";
+
+export default class MoreTopics extends Component {
+  @service site;
+  @service moreTopicsPreferenceTracking;
+
+  @tracked availablePills = [];
+  @tracked singleList = false;
+
+  get showTopicListsNav() {
+    return this.site.mobileView && !this.singleList;
+  }
+
+  @action
+  rememberTopicListPreference(value) {
+    this.moreTopicsPreferenceTracking.updatePreference(value);
+
+    this.buildListPills();
+  }
+
+  @action
+  buildListPills() {
+    next(() => {
+      const pills = Array.from(
+        document.querySelectorAll(".more-content-topics")
+      ).map((topicList) => {
+        return {
+          name: topicList.dataset.mobileTitle,
+          id: topicList.dataset.listId,
+        };
+      });
+
+      if (pills.length <= 1) {
+        this.singleList = true;
+      }
+
+      if (this.singleList || !this.site.mobileView) {
+        return;
+      }
+
+      let preference = this.moreTopicsPreferenceTracking.preference;
+
+      if (!preference) {
+        this.moreTopicsPreferenceTracking.updatePreference(pills[0].id);
+        preference = pills[0].id;
+      }
+
+      pills.forEach((pill) => {
+        pill.selected = pill.id === preference;
+      });
+
+      this.availablePills = pills;
+    });
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/templates/components/mount-widget.hbs b/app/assets/javascripts/discourse/app/components/mount-widget.hbs
similarity index 63%
rename from app/assets/javascripts/discourse/app/templates/components/mount-widget.hbs
rename to app/assets/javascripts/discourse/app/components/mount-widget.hbs
index f663276c5c3..0881f23660e 100644
--- a/app/assets/javascripts/discourse/app/templates/components/mount-widget.hbs
+++ b/app/assets/javascripts/discourse/app/components/mount-widget.hbs
@@ -1,5 +1,5 @@
 {{#each this._childComponents as |info|}}
-  {{#in-element info.element}}
+  {{#in-element info.element insertBefore=null}}
     <info.component @data={{info.data}} />
   {{/in-element}}
 {{/each}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/mount-widget.js b/app/assets/javascripts/discourse/app/components/mount-widget.js
index 6a1538ad5b5..d14f255cce5 100644
--- a/app/assets/javascripts/discourse/app/components/mount-widget.js
+++ b/app/assets/javascripts/discourse/app/components/mount-widget.js
@@ -19,7 +19,6 @@ export function resetWidgetCleanCallbacks() {
 }
 
 export default Component.extend({
-  layoutName: "components/mount-widget",
   _tree: null,
   _rootNode: null,
   _timeout: null,
@@ -167,4 +166,8 @@ export default Component.extend({
   unmountChildComponent(info) {
     this._childComponents.removeObject(info);
   },
+
+  didUpdateAttrs() {
+    this.queueRerender();
+  },
 });
diff --git a/app/assets/javascripts/discourse/app/templates/components/nav-item.hbs b/app/assets/javascripts/discourse/app/components/nav-item.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/nav-item.hbs
rename to app/assets/javascripts/discourse/app/components/nav-item.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/navigation-bar.hbs b/app/assets/javascripts/discourse/app/components/navigation-bar.hbs
similarity index 78%
rename from app/assets/javascripts/discourse/app/templates/components/navigation-bar.hbs
rename to app/assets/javascripts/discourse/app/components/navigation-bar.hbs
index b0ee57c3c2a..ffc6bc999dd 100644
--- a/app/assets/javascripts/discourse/app/templates/components/navigation-bar.hbs
+++ b/app/assets/javascripts/discourse/app/components/navigation-bar.hbs
@@ -9,5 +9,5 @@
 <PluginOutlet
   @name="extra-nav-item"
   @connectorTagName="li"
-  @args={{hash category=this.category filterMode=this.filterMode}}
+  @outletArgs={{hash category=this.category filterMode=this.filterMode}}
 />
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/navigation-item.hbs b/app/assets/javascripts/discourse/app/components/navigation-item.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/navigation-item.hbs
rename to app/assets/javascripts/discourse/app/components/navigation-item.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/notification-consent-banner.hbs b/app/assets/javascripts/discourse/app/components/notification-consent-banner.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/notification-consent-banner.hbs
rename to app/assets/javascripts/discourse/app/components/notification-consent-banner.hbs
diff --git a/app/assets/javascripts/discourse/app/components/number-field.js b/app/assets/javascripts/discourse/app/components/number-field.js
index 659d2024d42..9e3cce2c213 100644
--- a/app/assets/javascripts/discourse/app/components/number-field.js
+++ b/app/assets/javascripts/discourse/app/components/number-field.js
@@ -2,9 +2,37 @@ import I18n from "I18n";
 import TextField from "discourse/components/text-field";
 import discourseComputed from "discourse-common/utils/decorators";
 
+const ALLOWED_KEYS = [
+  "Enter",
+  "Backspace",
+  "Tab",
+  "Delete",
+  "ArrowLeft",
+  "ArrowUp",
+  "ArrowRight",
+  "ArrowDown",
+  "0",
+  "1",
+  "2",
+  "3",
+  "4",
+  "5",
+  "6",
+  "7",
+  "8",
+  "9",
+];
+
 export default TextField.extend({
   classNameBindings: ["invalid"],
 
+  keyDown: function (e) {
+    return (
+      ALLOWED_KEYS.includes(e.key) ||
+      (e.key === "-" && parseInt(this.get("min"), 10) < 0)
+    );
+  },
+
   @discourseComputed("number")
   value: {
     get(number) {
diff --git a/app/assets/javascripts/discourse/app/components/offline-indicator.hbs b/app/assets/javascripts/discourse/app/components/offline-indicator.hbs
new file mode 100644
index 00000000000..ee53efd7aeb
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/offline-indicator.hbs
@@ -0,0 +1,10 @@
+{{#if this.showing}}
+  <div class="offline-indicator">
+    <span>{{i18n "offline_indicator.no_internet"}}</span>
+    <DButton
+      @label="offline_indicator.refresh_page"
+      @display="link"
+      @action={{this.refresh}}
+    />
+  </div>
+{{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/offline-indicator.js b/app/assets/javascripts/discourse/app/components/offline-indicator.js
new file mode 100644
index 00000000000..347709cfd43
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/offline-indicator.js
@@ -0,0 +1,16 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+
+export default class OfflineIndicator extends Component {
+  @service networkConnectivity;
+
+  get showing() {
+    return !this.networkConnectivity.connected;
+  }
+
+  @action
+  refresh() {
+    window.location.reload(true);
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/page-loading-slider.hbs b/app/assets/javascripts/discourse/app/components/page-loading-slider.hbs
new file mode 100644
index 00000000000..f895371072f
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/page-loading-slider.hbs
@@ -0,0 +1,17 @@
+{{#if this.loadingSlider.enabled}}
+  <div
+    class={{concat-class
+      "loading-indicator-container"
+      this.state
+      (if this.capabilities.isAppWebview "discourse-hub-webview")
+    }}
+    {{on "transitionend" this.onContainerTransitionEnd}}
+    style={{this.containerStyle}}
+  >
+    <div
+      class="loading-indicator"
+      {{on "transitionend" this.onBarTransitionEnd}}
+    >
+    </div>
+  </div>
+{{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/page-loading-slider.js b/app/assets/javascripts/discourse/app/components/page-loading-slider.js
new file mode 100644
index 00000000000..d3c9577e085
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/page-loading-slider.js
@@ -0,0 +1,67 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+import { cancel, next } from "@ember/runloop";
+import { tracked } from "@glimmer/tracking";
+import { action } from "@ember/object";
+import { bind } from "discourse-common/utils/decorators";
+import { htmlSafe } from "@ember/template";
+
+export default class extends Component {
+  @service loadingSlider;
+  @service capabilities;
+
+  @tracked state = "ready";
+
+  constructor() {
+    super(...arguments);
+    this.loadingSlider.on("stateChanged", this.stateChanged);
+  }
+
+  @bind
+  stateChanged(loading) {
+    if (this._deferredStateChange) {
+      cancel(this._deferredStateChange);
+      this._deferredStateChange = null;
+    }
+
+    if (loading && this.ready) {
+      this.state = "loading";
+    } else if (loading) {
+      this.state = "ready";
+      this._deferredStateChange = next(() => (this.state = "loading"));
+    } else {
+      this.state = "done";
+    }
+  }
+
+  destroy() {
+    this.loadingSlider.off("stateChange", this, "stateChange");
+    super.destroy();
+  }
+
+  @action
+  onContainerTransitionEnd(event) {
+    if (
+      event.target === event.currentTarget &&
+      event.propertyName === "opacity"
+    ) {
+      this.state = "ready";
+    }
+  }
+
+  @action
+  onBarTransitionEnd(event) {
+    if (
+      event.target === event.currentTarget &&
+      event.propertyName === "transform" &&
+      this.state === "loading"
+    ) {
+      this.state = "still-loading";
+    }
+  }
+
+  get containerStyle() {
+    const duration = this.loadingSlider.averageLoadingDuration.toFixed(2);
+    return htmlSafe(`--loading-duration: ${duration}s`);
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/templates/components/parent-category-row.hbs b/app/assets/javascripts/discourse/app/components/parent-category-row.hbs
similarity index 89%
rename from app/assets/javascripts/discourse/app/templates/components/parent-category-row.hbs
rename to app/assets/javascripts/discourse/app/components/parent-category-row.hbs
index 71afd7bfa53..151bf4d8f91 100644
--- a/app/assets/javascripts/discourse/app/templates/components/parent-category-row.hbs
+++ b/app/assets/javascripts/discourse/app/components/parent-category-row.hbs
@@ -1,7 +1,7 @@
 {{#unless this.isHidden}}
   <PluginOutlet
     @name="category-list-above-each-category"
-    @args={{hash category=this.category}}
+    @outletArgs={{hash category=this.category}}
   />
 
   <tr
@@ -20,19 +20,14 @@
         {{if this.noCategoryStyle 'no-category-style'}}"
       style={{unless
         this.noCategoryStyle
-        (html-safe
-          (concat
-            (border-color this.category.color)
-            (category-color-variable this.category.color)
-          )
-        )
+        (category-color-variable this.category.color)
       }}
     >
       <CategoryTitleLink @category={{this.category}} />
       <PluginOutlet
         @name="below-category-title-link"
         @connectorTagName="div"
-        @args={{hash category=this.category}}
+        @outletArgs={{hash category=this.category}}
       />
 
       {{#if this.category.description_excerpt}}
@@ -72,6 +67,8 @@
         @category={{this.category}}
         @tagName="div"
         @class="unread-new"
+        @unreadTopicsCount={{this.unreadTopicsCount}}
+        @newTopicsCount={{this.newTopicsCount}}
       />
     </td>
 
diff --git a/app/assets/javascripts/discourse/app/templates/components/pending-post.hbs b/app/assets/javascripts/discourse/app/components/pending-post.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/pending-post.hbs
rename to app/assets/javascripts/discourse/app/components/pending-post.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/pick-files-button.hbs b/app/assets/javascripts/discourse/app/components/pick-files-button.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/pick-files-button.hbs
rename to app/assets/javascripts/discourse/app/components/pick-files-button.hbs
diff --git a/app/assets/javascripts/discourse/app/components/pick-files-button.js b/app/assets/javascripts/discourse/app/components/pick-files-button.js
index 991ffe1592f..2ac80e2ba28 100644
--- a/app/assets/javascripts/discourse/app/components/pick-files-button.js
+++ b/app/assets/javascripts/discourse/app/components/pick-files-button.js
@@ -91,7 +91,6 @@ export default Component.extend({
       this.dialog.alert(message);
       return;
     }
-    this.onFilesPicked(files);
   },
 
   _haveAcceptedTypes(files) {
diff --git a/app/assets/javascripts/discourse/app/components/plugin-connector.js b/app/assets/javascripts/discourse/app/components/plugin-connector.js
index 42f829efbfc..5ae2459f6dd 100644
--- a/app/assets/javascripts/discourse/app/components/plugin-connector.js
+++ b/app/assets/javascripts/discourse/app/components/plugin-connector.js
@@ -20,9 +20,6 @@ export default Component.extend({
   init() {
     this._super(...arguments);
 
-    const connector = this.connector;
-    this.set("layoutName", connector.templateName);
-
     const args = this.args || {};
     Object.keys(args).forEach((key) => {
       defineProperty(
@@ -50,15 +47,17 @@ export default Component.extend({
       );
     });
 
-    const connectorClass = this.get("connector.connectorClass");
-    this.set("actions", connectorClass.actions);
+    const connectorClass = this.connector.connectorClass;
+    this.set("actions", connectorClass?.actions);
 
-    for (const [name, action] of Object.entries(this.actions)) {
-      this.set(name, action.bind(this));
+    if (this.actions) {
+      for (const [name, action] of Object.entries(this.actions)) {
+        this.set(name, action.bind(this));
+      }
     }
 
     const merged = buildArgsWithDeprecations(args, deprecatedArgs);
-    connectorClass.setupComponent.call(this, merged, this);
+    connectorClass?.setupComponent?.call(this, merged, this);
   },
 
   didReceiveAttrs() {
@@ -77,13 +76,13 @@ export default Component.extend({
   willDestroyElement() {
     this._super(...arguments);
 
-    const connectorClass = this.get("connector.connectorClass");
-    connectorClass.teardownComponent.call(this, this);
+    const connectorClass = this.connector.connectorClass;
+    connectorClass?.teardownComponent?.call(this, this);
   },
 
   send(name, ...args) {
-    const connectorClass = this.get("connector.connectorClass");
-    const action = connectorClass.actions[name];
+    const connectorClass = this.connector.connectorClass;
+    const action = connectorClass?.actions?.[name];
     return action ? action.call(this, ...args) : this._super(name, ...args);
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/plugin-outlet.hbs b/app/assets/javascripts/discourse/app/components/plugin-outlet.hbs
new file mode 100644
index 00000000000..2639a58e88a
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/plugin-outlet.hbs
@@ -0,0 +1,44 @@
+{{#if @tagName}}
+  {{!
+    Older outlets have a wrapper tagName. RFC0389 proposes an interface for dynamic tag names, which we may want to use in future.
+    But for now, this classic component wrapper takes care of the tagName.
+  }}
+  <this.wrapperComponent @tagName={{@tagName}}>
+    {{#each this.connectors as |c|}}
+      {{#if c.componentClass}}
+        <c.componentClass @outletArgs={{this.outletArgsWithDeprecations}} />
+      {{else if @defaultGlimmer}}
+        <c.templateOnly @outletArgs={{this.outletArgsWithDeprecations}} />
+      {{else}}
+        <PluginConnector
+          @connector={{c}}
+          @args={{this.outletArgs}}
+          @deprecatedArgs={{@deprecatedArgs}}
+          @outletArgs={{this.outletArgsWithDeprecations}}
+          @class={{c.classicClassNames}}
+          @tagName={{or @connectorTagName ""}}
+          @layout={{c.template}}
+        />
+      {{/if}}
+    {{/each}}
+  </this.wrapperComponent>
+{{else}}
+  {{! The modern path: no wrapper element = no classic component }}
+  {{#each this.connectors as |c|}}
+    {{#if c.componentClass}}
+      <c.componentClass @outletArgs={{this.outletArgsWithDeprecations}} />
+    {{else if @defaultGlimmer}}
+      <c.templateOnly @outletArgs={{this.outletArgsWithDeprecations}} />
+    {{else}}
+      <PluginConnector
+        @connector={{c}}
+        @args={{this.outletArgs}}
+        @deprecatedArgs={{@deprecatedArgs}}
+        @outletArgs={{this.outletArgsWithDeprecations}}
+        @class={{c.classicClassNames}}
+        @tagName={{or @connectorTagName ""}}
+        @layout={{c.template}}
+      />
+    {{/if}}
+  {{/each}}
+{{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/plugin-outlet.js b/app/assets/javascripts/discourse/app/components/plugin-outlet.js
index 09b51fe3bcf..840c8b73f32 100644
--- a/app/assets/javascripts/discourse/app/components/plugin-outlet.js
+++ b/app/assets/javascripts/discourse/app/components/plugin-outlet.js
@@ -1,8 +1,23 @@
-import Component from "@ember/component";
+import GlimmerComponentWithDeprecatedParentView from "discourse/components/glimmer-component-with-deprecated-parent-view";
+import ClassicComponent from "@ember/component";
+
 import {
   buildArgsWithDeprecations,
   renderedConnectorsFor,
 } from "discourse/lib/plugin-connectors";
+import { helperContext } from "discourse-common/lib/helpers";
+import deprecated from "discourse-common/lib/deprecated";
+import { get } from "@ember/object";
+import { cached } from "@glimmer/tracking";
+
+const PARENT_VIEW_DEPRECATION_MSG =
+  "parentView should not be used within plugin outlets. Use the available outlet arguments, or inject a service which can provide the context you need.";
+const GET_DEPRECATION_MSG =
+  "Plugin outlet context is no longer an EmberObject - using `get()` is deprecated.";
+const TAG_NAME_DEPRECATION_MSG =
+  "The `tagName` argument to PluginOutlet is deprecated. If a wrapper element is required, define it manually around the outlet call.";
+const ARGS_DEPRECATION_MSG =
+  "PluginOutlet arguments should now be passed using `@outletArgs=` instead of `@args=`";
 
 /**
    A plugin outlet is an extension point for templates where other templates can
@@ -13,7 +28,7 @@ import {
    If your handlebars template has:
 
    ```handlebars
-     {{plugin-outlet name="evil-trout"}}
+     <PluginOutlet @name="evil-trout" />
    ```
 
    Then any handlebars files you create in the `connectors/evil-trout` directory
@@ -29,26 +44,90 @@ import {
 
    Will insert <b>Hello World</b> at that point in the template.
 
-   ## Disabling
-
-   If a plugin returns a disabled status, the outlets will not be wired up for it.
-   The list of disabled plugins is returned via the `Site` singleton.
-
 **/
-export default Component.extend({
-  tagName: "",
-  connectorTagName: "",
-  connectors: null,
 
-  init() {
-    this._super(...arguments);
-    const name = this.name;
-    if (name) {
-      const args = buildArgsWithDeprecations(
-        this.args || {},
-        this.deprecatedArgs || {}
-      );
-      this.set("connectors", renderedConnectorsFor(name, args, this));
+export default class PluginOutletComponent extends GlimmerComponentWithDeprecatedParentView {
+  context = {
+    ...helperContext(),
+    get parentView() {
+      return this.parentView;
+    },
+    get() {
+      deprecated(GET_DEPRECATION_MSG, {
+        id: "discourse.plugin-outlet-context-get",
+      });
+      return get(this, ...arguments);
+    },
+  };
+
+  constructor() {
+    const result = super(...arguments);
+
+    if (this.args.tagName) {
+      deprecated(`${TAG_NAME_DEPRECATION_MSG} (outlet: ${this.args.name})`, {
+        id: "discourse.plugin-outlet-tag-name",
+      });
     }
-  },
-});
+
+    if (this.args.args) {
+      deprecated(`${ARGS_DEPRECATION_MSG} (outlet: ${this.args.name})`, {
+        id: "discourse.plugin-outlet-args",
+      });
+    }
+
+    return result;
+  }
+
+  get connectors() {
+    return renderedConnectorsFor(
+      this.args.name,
+      this.outletArgsWithDeprecations,
+      this.context
+    );
+  }
+
+  // Traditionally, pluginOutlets had an argument named 'args'. However, that name is reserved
+  // in recent versions of ember so we need to migrate to outletArgs
+  @cached
+  get outletArgs() {
+    return this.args.outletArgs || this.args.args || {};
+  }
+
+  @cached
+  get outletArgsWithDeprecations() {
+    if (!this.args.deprecatedArgs) {
+      return this.outletArgs;
+    }
+
+    return buildArgsWithDeprecations(
+      this.outletArgs,
+      this.args.deprecatedArgs || {}
+    );
+  }
+
+  get parentView() {
+    deprecated(`${PARENT_VIEW_DEPRECATION_MSG} (outlet: ${this.args.name})`, {
+      id: "discourse.plugin-outlet-parent-view",
+    });
+    return this._parentView;
+  }
+  set parentView(value) {
+    this._parentView = value;
+  }
+
+  // Older plugin outlets have a `tagName` which we need to preserve for backwards-compatibility
+  get wrapperComponent() {
+    return PluginOutletWithTagNameWrapper;
+  }
+}
+
+class PluginOutletWithTagNameWrapper extends ClassicComponent {
+  // Overridden parentView to make this wrapper 'transparent'
+  // Calling this will trigger the deprecation notice in PluginOutletComponent
+  get parentView() {
+    return this._parentView.parentView;
+  }
+  set parentView(value) {
+    this._parentView = value;
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/templates/components/popup-input-tip.hbs b/app/assets/javascripts/discourse/app/components/popup-input-tip.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/popup-input-tip.hbs
rename to app/assets/javascripts/discourse/app/components/popup-input-tip.hbs
diff --git a/app/assets/javascripts/discourse/app/components/popup-input-tip.js b/app/assets/javascripts/discourse/app/components/popup-input-tip.js
index 8508a7e7610..a119210a6e9 100644
--- a/app/assets/javascripts/discourse/app/components/popup-input-tip.js
+++ b/app/assets/javascripts/discourse/app/components/popup-input-tip.js
@@ -1,10 +1,11 @@
 import { not, or, reads } from "@ember/object/computed";
 import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
-import { getOwner } from "discourse-common/lib/get-owner";
 import { htmlSafe } from "@ember/template";
+import { inject as service } from "@ember/service";
 
 export default Component.extend({
+  composer: service(),
   tagName: "a",
   classNameBindings: [":popup-tip", "good", "bad", "lastShownAt::hide"],
   attributeBindings: ["role", "ariaLabel", "tabindex"],
@@ -28,8 +29,7 @@ export default Component.extend({
 
   dismiss() {
     this.set("shownAt", null);
-    const composer = getOwner(this).lookup("controller:composer");
-    composer.clearLastValidatedAt();
+    this.composer.clearLastValidatedAt();
     this.element.previousElementSibling?.focus();
   },
 
diff --git a/app/assets/javascripts/discourse/app/templates/components/popup-menu.hbs b/app/assets/javascripts/discourse/app/components/popup-menu.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/popup-menu.hbs
rename to app/assets/javascripts/discourse/app/components/popup-menu.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/preference-checkbox.hbs b/app/assets/javascripts/discourse/app/components/preference-checkbox.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/preference-checkbox.hbs
rename to app/assets/javascripts/discourse/app/components/preference-checkbox.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/private-message-glyph.hbs b/app/assets/javascripts/discourse/app/components/private-message-glyph.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/private-message-glyph.hbs
rename to app/assets/javascripts/discourse/app/components/private-message-glyph.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/pwa-install-banner.hbs b/app/assets/javascripts/discourse/app/components/pwa-install-banner.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/pwa-install-banner.hbs
rename to app/assets/javascripts/discourse/app/components/pwa-install-banner.hbs
diff --git a/app/assets/javascripts/discourse/app/components/quote-button.hbs b/app/assets/javascripts/discourse/app/components/quote-button.hbs
new file mode 100644
index 00000000000..bb4ab12704e
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/quote-button.hbs
@@ -0,0 +1,71 @@
+<div
+  {{did-insert this.didInsert}}
+  class={{concat-class
+    "quote-button"
+    (if this.visible "visible")
+    (if this.displayFastEditInput "fast-editing")
+    (if this.animated "animated")
+  }}
+>
+  <div class="buttons">
+    {{#if this.embedQuoteButton}}
+      <DButton
+        @action={{this.insertQuote}}
+        @icon="quote-left"
+        @label="post.quote_reply"
+        @title="post.quote_reply_shortcut"
+        class="btn-flat insert-quote"
+      />
+    {{/if}}
+
+    {{#if this.canEditPost}}
+      <DButton
+        @icon="pencil-alt"
+        @action={{this.toggleFastEditForm}}
+        @label="post.quote_edit"
+        @title="post.quote_edit_shortcut"
+        class="btn-flat quote-edit-label"
+      />
+    {{/if}}
+
+    {{#if this.quoteSharingEnabled}}
+      <span class="quote-sharing">
+        {{#if this.quoteSharingShowLabel}}
+          <DButton
+            @icon="share"
+            @label="post.quote_share"
+            class="btn-flat quote-share-label"
+          />
+        {{/if}}
+
+        <span class="quote-share-buttons">
+          {{#each this.quoteSharingSources as |source|}}
+            <DButton
+              @action={{fn this.share source}}
+              @translatedTitle={{source.title}}
+              @icon={{source.icon}}
+              class="btn-flat"
+            />
+          {{/each}}
+
+          <PluginOutlet
+            @name="quote-share-buttons-after"
+            @connectorTagName="span"
+          />
+        </span>
+      </span>
+    {{/if}}
+  </div>
+
+  <div class="extra">
+    {{#if this.displayFastEditInput}}
+      <FastEdit
+        @initialValue={{this.fastEditInitialSelection}}
+        @post={{this.post}}
+        @close={{this.hideButton}}
+      />
+    {{/if}}
+
+    <PluginOutlet @name="quote-button-after" @connectorTagName="div" />
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/quote-button.js b/app/assets/javascripts/discourse/app/components/quote-button.js
index 3c057ce72f7..f6d449bb2a6 100644
--- a/app/assets/javascripts/discourse/app/components/quote-button.js
+++ b/app/assets/javascripts/discourse/app/components/quote-button.js
@@ -1,28 +1,26 @@
-import afterTransition from "discourse/lib/after-transition";
-import { propertyEqual } from "discourse/lib/computed";
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
 import { ajax } from "discourse/lib/ajax";
-import { popupAjaxError } from "discourse/lib/ajax-error";
 import {
   postUrl,
-  selectedElement,
+  selectedNode,
   selectedRange,
   selectedText,
   setCaretPosition,
-  translateModKey,
 } from "discourse/lib/utilities";
-import Component from "@ember/component";
-import I18n from "I18n";
 import { INPUT_DELAY } from "discourse-common/config/environment";
-import KeyEnterEscape from "discourse/mixins/key-enter-escape";
 import Sharing from "discourse/lib/sharing";
 import { action } from "@ember/object";
-import { alias } from "@ember/object/computed";
-import discourseComputed from "discourse-common/utils/decorators";
+import { bind } from "discourse-common/utils/decorators";
 import discourseDebounce from "discourse-common/lib/debounce";
 import { getAbsoluteURL } from "discourse-common/lib/get-url";
 import { next, schedule } from "@ember/runloop";
 import toMarkdown from "discourse/lib/to-markdown";
 import escapeRegExp from "discourse-common/utils/escape-regexp";
+import { createPopper } from "@popperjs/core";
+import virtualElementFromTextRange from "discourse/lib/virtual-element-from-text-range";
+import { inject as service } from "@ember/service";
+import FastEditModal from "discourse/components/modal/fast-edit";
 
 function getQuoteTitle(element) {
   const titleEl = element.querySelector(".title");
@@ -38,130 +36,96 @@ function getQuoteTitle(element) {
   return titleEl.textContent.trim().replace(/:$/, "");
 }
 
-function fixQuotes(str) {
-  // u+201c “
-  // u+201d ”
-  return str.replace(/[\u201C\u201D]/g, '"');
+export function fixQuotes(str) {
+  // u+201c, u+201d = “ ”
+  // u+2018, u+2019 = ‘ ’
+  return str.replace(/[\u201C\u201D]/g, '"').replace(/[\u2018\u2019]/g, "'");
 }
 
-export default Component.extend(KeyEnterEscape, {
-  classNames: ["quote-button"],
-  classNameBindings: [
-    "visible",
-    "_displayFastEditInput:fast-editing",
-    "animated",
-  ],
-  visible: false,
-  animated: false,
-  privateCategory: alias("topic.category.read_restricted"),
-  editPost: null,
+export default class QuoteButton extends Component {
+  @service appEvents;
+  @service capabilities;
+  @service currentUser;
+  @service modal;
+  @service site;
+  @service siteSettings;
 
-  _isFastEditable: false,
-  _displayFastEditInput: false,
-  _fastEditInitalSelection: null,
-  _fastEditNewSelection: null,
-  _isSavingFastEdit: false,
-  _canEditPost: false,
-  _saveEditButtonTitle: I18n.t("composer.title", {
-    modifier: translateModKey("Meta+"),
-  }),
+  @tracked visible = false;
+  @tracked animated = false;
+  @tracked isFastEditable = false;
+  @tracked displayFastEditInput = false;
+  @tracked fastEditInitialSelection;
 
-  _isMouseDown: false,
-  _reselected: false,
+  isMouseDown = false;
+  reselected = false;
+  prevSelection;
+  element;
+  popper;
+  popperPlacement = "top-start";
+  popperOffset = [0, 3];
 
-  _hideButton() {
-    this.quoteState.clear();
-    this.set("visible", false);
-    this.set("animated", false);
+  @bind
+  hideButton() {
+    this.args.quoteState.clear();
 
-    this.set("_isFastEditable", false);
-    this.set("_displayFastEditInput", false);
-    this.set("_fastEditInitalSelection", null);
-    this.set("_fastEditNewSelection", null);
-  },
+    this.visible = false;
+    this.animated = false;
+    this.isFastEditable = false;
+    this.displayFastEditInput = false;
+    this.fastEditInitialSelection = null;
 
-  _getRangeBoundaryRect(range, atEnd) {
-    // Don't mess with the original range as it results in weird behaviours
-    // where certain browsers will deselect the selection
-    const clone = range.cloneRange(range);
+    this.teardownSelectionListeners();
+  }
 
-    // create a marker element containing a single invisible character
-    const markerElement = document.createElement("span");
-    markerElement.appendChild(document.createTextNode("\ufeff"));
-
-    // on mobile, collapse the range at the end of the selection
-    if (atEnd) {
-      clone.collapse();
-    }
-    // insert the marker
-    clone.insertNode(markerElement);
-
-    // retrieve the position of the marker
-    const boundaryRect = markerElement.getBoundingClientRect();
-    boundaryRect.x += document.documentElement.scrollLeft;
-    boundaryRect.y += document.documentElement.scrollTop;
-
-    // remove the marker
-    const parent = markerElement.parentNode;
-    parent.removeChild(markerElement);
-
-    // merge back all text nodes so they don't get messed up
-    parent.normalize();
-
-    // work around Safari that would sometimes lose the selection
-    if (this.capabilities.isSafari) {
-      this._reselected = true;
-      window.getSelection().removeAllRanges();
-      window.getSelection().addRange(range);
-    }
-
-    return boundaryRect;
-  },
-
-  _selectionChanged() {
-    if (this._displayFastEditInput) {
+  selectionChanged() {
+    if (this.displayFastEditInput) {
+      this.textRange = virtualElementFromTextRange();
       return;
     }
 
-    const quoteState = this.quoteState;
-
     const selection = window.getSelection();
     if (selection.isCollapsed) {
       if (this.visible) {
-        this._hideButton();
+        this.hideButton();
       }
       return;
     }
 
     // ensure we selected content inside 1 post *only*
-    let firstRange, postId;
+    let postId;
     for (let r = 0; r < selection.rangeCount; r++) {
       const range = selection.getRangeAt(r);
-      const $selectionStart = $(range.startContainer);
-      const $ancestor = $(range.commonAncestorContainer);
+      const selectionStart =
+        range.startContainer.nodeType === Node.ELEMENT_NODE
+          ? range.startContainer
+          : range.startContainer.parentElement;
+      const ancestor =
+        range.commonAncestorContainer.nodeType === Node.ELEMENT_NODE
+          ? range.commonAncestorContainer
+          : range.commonAncestorContainer.parentElement;
 
-      if ($selectionStart.closest(".cooked").length === 0) {
+      if (!selectionStart.closest(".cooked")) {
         return;
       }
 
-      firstRange = firstRange || range;
-      postId = postId || $ancestor.closest(".boxed, .reply").data("post-id");
+      postId ||= ancestor.closest(".boxed, .reply")?.dataset?.postId;
 
-      if ($ancestor.closest(".contents").length === 0 || !postId) {
+      if (!ancestor.closest(".contents") || !postId) {
         if (this.visible) {
-          this._hideButton();
+          this.hideButton();
         }
         return;
       }
     }
 
-    const _selectedElement = selectedElement();
+    const _selectedElement =
+      selectedNode().nodeType === Node.ELEMENT_NODE
+        ? selectedNode()
+        : selectedNode().parentElement;
     const _selectedText = selectedText();
-
-    const $selectedElement = $(_selectedElement);
     const cooked =
-      $selectedElement.find(".cooked")[0] ||
-      $selectedElement.closest(".cooked")[0];
+      _selectedElement.querySelector(".cooked") ||
+      _selectedElement.closest(".cooked");
 
     // computing markdown takes a lot of time on long posts
     // this code attempts to compute it only when we can't fast track
@@ -185,43 +149,37 @@ export default Component.extend(KeyEnterEscape, {
       }
     }
 
+    const quoteState = this.args.quoteState;
     quoteState.selected(postId, _selectedText, opts);
-    this.set("visible", quoteState.buffer.length > 0);
+    this.visible = quoteState.buffer.length > 0;
 
-    if (this.siteSettings.enable_fast_edit) {
-      this.set(
-        "_canEditPost",
-        this.topic.postStream.findLoadedPost(postId)?.can_edit
-      );
+    if (this.canEditPost) {
+      const regexp = new RegExp(escapeRegExp(quoteState.buffer), "gi");
+      const matches = cooked.innerHTML.match(regexp);
+      const non_ascii_regex = /[^\x00-\x7F]/;
 
-      if (this._canEditPost) {
-        const regexp = new RegExp(escapeRegExp(quoteState.buffer), "gi");
-        const matches = cooked.innerHTML.match(regexp);
-
-        if (
-          quoteState.buffer.length < 1 ||
-          quoteState.buffer.includes("|") || // tables are too complex
-          quoteState.buffer.match(/\n/g) || // linebreaks are too complex
-          matches?.length > 1 // duplicates are too complex
-        ) {
-          this.set("_isFastEditable", false);
-          this.set("_fastEditInitalSelection", null);
-          this.set("_fastEditNewSelection", null);
-        } else if (matches?.length === 1) {
-          this.set("_isFastEditable", true);
-          this.set("_fastEditInitalSelection", quoteState.buffer);
-          this.set("_fastEditNewSelection", quoteState.buffer);
-        }
+      if (
+        quoteState.buffer.length === 0 ||
+        quoteState.buffer.includes("|") || // tables are too complex
+        quoteState.buffer.match(/\n/g) || // linebreaks are too complex
+        matches?.length > 1 || // duplicates are too complex
+        non_ascii_regex.test(quoteState.buffer) // non-ascii chars break fast-edit
+      ) {
+        this.isFastEditable = false;
+        this.fastEditInitialSelection = null;
+      } else if (matches?.length === 1) {
+        this.isFastEditable = true;
+        this.fastEditInitialSelection = quoteState.buffer;
       }
     }
 
     // avoid hard loops in quote selection unconditionally
     // this can happen if you triple click text in firefox
-    if (this._prevSelection === _selectedText) {
+    if (this.prevSelection === _selectedText) {
       return;
     }
 
-    this._prevSelection = _selectedText;
+    this.prevSelection = _selectedText;
 
     // on Desktop, shows the button at the beginning of the selection
     // on Mobile, shows the button at the end of the selection
@@ -229,7 +187,10 @@ export default Component.extend(KeyEnterEscape, {
     const { isIOS, isAndroid, isOpera } = this.capabilities;
     const showAtEnd = isMobileDevice || isIOS || isAndroid || isOpera;
 
-    const boundaryPosition = this._getRangeBoundaryRect(firstRange, showAtEnd);
+    if (showAtEnd) {
+      this.popperPlacement = "bottom-start";
+      this.popperOffset = [0, 25];
+    }
 
     // change the position of the button
     schedule("afterRender", () => {
@@ -237,311 +198,245 @@ export default Component.extend(KeyEnterEscape, {
         return;
       }
 
-      let top = 0;
-      let left = 0;
-      const pxFromSelection = 5;
+      this.textRange = virtualElementFromTextRange();
+      this.setupSelectionListeners();
 
-      if (showAtEnd) {
-        // The selection-handles on iOS have a hit area of ~50px radius
-        // so we need to make sure our buttons are outside that radius
-        // Apply the same logic on all mobile devices for consistency
-
-        top = boundaryPosition.bottom + pxFromSelection;
-        left = boundaryPosition.left;
-
-        const safeRadius = 50;
-
-        const topicArea = document
-          .querySelector(".topic-area")
-          .getBoundingClientRect();
-        topicArea.x += document.documentElement.scrollLeft;
-        topicArea.y += document.documentElement.scrollTop;
-
-        const endHandlePosition = boundaryPosition;
-        const width = this.element.clientWidth;
-
-        const possiblePositions = [
+      this.popper = createPopper(this.textRange, this.element, {
+        placement: this.popperPlacement,
+        modifiers: [
           {
-            // move to left
-            top,
-            left: left - width - safeRadius,
+            name: "computeStyles",
+            options: {
+              adaptive: false,
+            },
           },
           {
-            // move to right
-            top,
-            left: left + safeRadius,
+            name: "offset",
+            options: {
+              offset: this.popperOffset,
+            },
           },
-          {
-            // centered below end handle
-            top: top + safeRadius,
-            left: left - width / 2,
-          },
-        ];
-
-        for (const pos of possiblePositions) {
-          // Ensure buttons are entirely within the .topic-area
-          pos.left = Math.max(topicArea.left, pos.left);
-          pos.left = Math.min(topicArea.right - width, pos.left);
-
-          let clearOfStartHandle = true;
-          if (isAndroid) {
-            // On android, the start-selection handle extends below the line, so we need to avoid it as well:
-            const startHandlePosition = this._getRangeBoundaryRect(
-              firstRange,
-              false
-            );
-
-            clearOfStartHandle =
-              pos.top - startHandlePosition.bottom >= safeRadius ||
-              pos.left + width <= startHandlePosition.left - safeRadius ||
-              pos.left >= startHandlePosition.left + safeRadius;
-          }
-
-          const clearOfEndHandle =
-            pos.top - endHandlePosition.top >= safeRadius ||
-            pos.left + width <= endHandlePosition.left - safeRadius ||
-            pos.left >= endHandlePosition.left + safeRadius;
-
-          if (clearOfStartHandle && clearOfEndHandle) {
-            left = pos.left;
-            top = pos.top;
-            break;
-          }
-        }
-      } else {
-        // Desktop
-        top =
-          boundaryPosition.top - this.element.clientHeight - pxFromSelection;
-        left = boundaryPosition.left;
-      }
-
-      Object.assign(this.element.style, { top: `${top}px`, left: `${left}px` });
+        ],
+      });
 
       if (!this.animated) {
         // We only enable CSS transitions after the initial positioning
         // otherwise the button can appear to fly in from off-screen
-        next(() => this.set("animated", true));
+        next(() => (this.animated = true));
       }
     });
-  },
+  }
 
-  didInsertElement() {
-    this._super(...arguments);
+  @bind
+  updateRect() {
+    this.textRange?.updateRect();
+  }
 
+  setupSelectionListeners() {
+    document.body.addEventListener("mouseup", this.updateRect);
+    window.addEventListener("scroll", this.updateRect);
+    document.scrollingElement.addEventListener("scroll", this.updateRect);
+  }
+
+  teardownSelectionListeners() {
+    document.body.removeEventListener("mouseup", this.updateRect);
+    window.removeEventListener("scroll", this.updateRect);
+    document.scrollingElement.removeEventListener("scroll", this.updateRect);
+  }
+
+  @bind
+  onSelectionChanged() {
     const { isWinphone, isAndroid } = this.capabilities;
     const wait = isWinphone || isAndroid ? INPUT_DELAY : 25;
-    const onSelectionChanged = () => {
-      discourseDebounce(this, this._selectionChanged, wait);
-    };
+    discourseDebounce(this, this.selectionChanged, wait);
+  }
 
-    $(document)
-      .on("mousedown.quote-button", (e) => {
-        this._prevSelection = null;
-        this._isMouseDown = true;
-        this._reselected = false;
+  @bind
+  mousedown(e) {
+    this.prevSelection = null;
+    this.isMouseDown = true;
+    this.reselected = false;
 
-        // prevents fast-edit input event to trigger mousedown
-        if (e.target.classList.contains("fast-edit-input")) {
-          return;
-        }
-
-        if (
-          $(e.target).closest(".quote-button, .create, .share, .reply-new")
-            .length === 0
-        ) {
-          this._hideButton();
-        }
-      })
-      .on("mouseup.quote-button", (e) => {
-        // prevents fast-edit input event to trigger mouseup
-        if (e.target.classList.contains("fast-edit-input")) {
-          return;
-        }
-
-        this._prevSelection = null;
-        this._isMouseDown = false;
-        onSelectionChanged();
-      })
-      .on("selectionchange.quote-button", () => {
-        if (!this._isMouseDown && !this._reselected) {
-          onSelectionChanged();
-        }
-      });
-    this.appEvents.on("quote-button:quote", this, "insertQuote");
-    this.appEvents.on("quote-button:edit", this, "_toggleFastEditForm");
-  },
-
-  willDestroyElement() {
-    $(document)
-      .off("mousedown.quote-button")
-      .off("mouseup.quote-button")
-      .off("selectionchange.quote-button");
-    this.appEvents.off("quote-button:quote", this, "insertQuote");
-    this.appEvents.off("quote-button:edit", this, "_toggleFastEditForm");
-  },
-
-  @discourseComputed("topic.{isPrivateMessage,invisible,category}")
-  quoteSharingEnabled(topic) {
-    if (
-      this.site.mobileView ||
-      this.siteSettings.share_quote_visibility === "none" ||
-      (this.currentUser &&
-        this.siteSettings.share_quote_visibility === "anonymous") ||
-      this.quoteSharingSources.length === 0 ||
-      this.privateCategory ||
-      (this.currentUser && topic.invisible)
-    ) {
-      return false;
+    // prevents fast-edit input event from triggering mousedown
+    if (e.target.classList.contains("fast-edit-input")) {
+      return;
     }
 
-    return true;
-  },
+    if (!e.target.closest(".quote-button, .create, .share, .reply-new")) {
+      this.hideButton();
+    }
+  }
 
-  @discourseComputed("topic.isPrivateMessage")
-  quoteSharingSources(isPM) {
+  @bind
+  mouseup(e) {
+    // prevents fast-edit input event from triggering mouseup
+    if (e.target.classList.contains("fast-edit-input")) {
+      return;
+    }
+
+    this.prevSelection = null;
+    this.isMouseDown = false;
+    this.onSelectionChanged();
+  }
+
+  @bind
+  selectionchange() {
+    if (!this.isMouseDown && !this.reselected) {
+      this.onSelectionChanged();
+    }
+  }
+
+  @action
+  didInsert(element) {
+    this.element = element;
+
+    document.addEventListener("mousedown", this.mousedown);
+    document.addEventListener("mouseup", this.mouseup);
+    document.addEventListener("selectionchange", this.selectionchange);
+
+    this.appEvents.on("quote-button:quote", this, "insertQuote");
+    this.appEvents.on("quote-button:edit", this, "toggleFastEditForm");
+  }
+
+  willDestroy() {
+    super.willDestroy(...arguments);
+    this.popper?.destroy();
+
+    document.removeEventListener("mousedown", this.mousedown);
+    document.removeEventListener("mouseup", this.mouseup);
+    document.removeEventListener("selectionchange", this.selectionchange);
+
+    this.appEvents.off("quote-button:quote", this, "insertQuote");
+    this.appEvents.off("quote-button:edit", this, "toggleFastEditForm");
+    this.teardownSelectionListeners();
+  }
+
+  get post() {
+    return this.args.topic.postStream.findLoadedPost(
+      this.args.quoteState.postId
+    );
+  }
+
+  get quoteSharingEnabled() {
+    return (
+      this.site.desktopView &&
+      this.quoteSharingSources.length > 0 &&
+      !this.args.topic.invisible &&
+      !this.args.topic.category?.read_restricted &&
+      (this.siteSettings.share_quote_visibility === "all" ||
+        (this.siteSettings.share_quote_visibility === "anonymous" &&
+          !this.currentUser))
+    );
+  }
+
+  get quoteSharingSources() {
     return Sharing.activeSources(
       this.siteSettings.share_quote_buttons,
-      this.siteSettings.login_required || isPM
+      this.siteSettings.login_required || this.args.topic.isPrivateMessage
     );
-  },
+  }
 
-  @discourseComputed("topic.{isPrivateMessage,invisible,category}")
-  quoteSharingShowLabel() {
+  get quoteSharingShowLabel() {
     return this.quoteSharingSources.length > 1;
-  },
+  }
 
-  @discourseComputed("topic.{id,slug}", "quoteState")
-  shareUrl(topic, quoteState) {
-    const postId = quoteState.postId;
-    const postNumber = topic.postStream.findLoadedPost(postId).post_number;
-    return getAbsoluteURL(postUrl(topic.slug, topic.id, postNumber));
-  },
+  get shareUrl() {
+    return getAbsoluteURL(
+      postUrl(this.args.topic.slug, this.args.topic.id, this.post.post_number)
+    );
+  }
+
+  get embedQuoteButton() {
+    const canCreatePost = this.args.topic.details.can_create_post;
+    const canReplyAsNewTopic = this.args.topic.details.can_reply_as_new_topic;
 
-  @discourseComputed(
-    "topic.details.can_create_post",
-    "topic.details.can_reply_as_new_topic"
-  )
-  embedQuoteButton(canCreatePost, canReplyAsNewTopic) {
     return (
       (canCreatePost || canReplyAsNewTopic) &&
       this.currentUser?.get("user_option.enable_quoting")
     );
-  },
+  }
 
-  _saveFastEditDisabled: propertyEqual(
-    "_fastEditInitalSelection",
-    "_fastEditNewSelection"
-  ),
+  get canEditPost() {
+    return this.siteSettings.enable_fast_edit && this.post?.can_edit;
+  }
 
   @action
-  insertQuote() {
-    this.attrs.selectText().then(() => this._hideButton());
-  },
+  async insertQuote() {
+    await this.args.selectText();
+    this.hideButton();
+  }
 
   @action
-  _toggleFastEditForm() {
-    if (this._isFastEditable) {
-      this.toggleProperty("_displayFastEditInput");
+  async toggleFastEditForm() {
+    if (this.isFastEditable) {
+      if (this.site.desktopView) {
+        this.displayFastEditInput = !this.displayFastEditInput;
+      } else {
+        this.modal.show(FastEditModal, {
+          model: {
+            initialValue: this.fastEditInitialSelection,
+            post: this.post,
+          },
+        });
+        this.hideButton();
+      }
 
-      schedule("afterRender", () => {
-        if (this.site.mobileView) {
-          this.element.style.left = `${
-            (window.innerWidth - this.element.clientWidth) / 2
-          }px`;
-        }
-        document.querySelector("#fast-edit-input")?.focus();
-      });
-    } else {
-      const postId = this.quoteState.postId;
-      const postModel = this.topic.postStream.findLoadedPost(postId);
-      return ajax(`/posts/${postModel.id}`, { type: "GET", cache: false }).then(
-        (result) => {
-          let bestIndex = 0;
-          const rows = result.raw.split("\n");
-
-          // selecting even a part of the text of a list item will include
-          // "* " at the beginning of the buffer, we remove it to be able
-          // to find it in row
-          const buffer = fixQuotes(
-            this.quoteState.buffer.split("\n")[0].replace(/^\* /, "")
-          );
-
-          rows.some((row, index) => {
-            if (row.length && row.includes(buffer)) {
-              bestIndex = index;
-              return true;
-            }
-          });
-
-          this?.editPost(postModel);
-
-          afterTransition(document.querySelector("#reply-control"), () => {
-            const textarea = document.querySelector(".d-editor-input");
-            if (!textarea || this.isDestroyed || this.isDestroying) {
-              return;
-            }
-
-            // best index brings us to one row before as slice start from 1
-            // we add 1 to be at the beginning of next line, unless we start from top
-            setCaretPosition(
-              textarea,
-              rows.slice(0, bestIndex).join("\n").length +
-                (bestIndex > 0 ? 1 : 0)
-            );
-
-            // ensures we correctly scroll to caret and reloads composer
-            // if we do another selection/edit
-            textarea.blur();
-            textarea.focus();
-          });
-        }
-      );
+      return;
     }
-  },
 
-  @action
-  _saveFastEdit() {
-    const postId = this.quoteState?.postId;
-    const postModel = this.topic.postStream.findLoadedPost(postId);
+    const result = await ajax(`/posts/${this.post.id}`);
 
-    this.set("_isSavingFastEdit", true);
+    if (this.isDestroying || this.isDestroyed) {
+      return;
+    }
 
-    return ajax(`/posts/${postModel.id}`, { type: "GET", cache: false })
-      .then((result) => {
-        const newRaw = result.raw.replace(
-          fixQuotes(this._fastEditInitalSelection),
-          fixQuotes(this._fastEditNewSelection)
+    let bestIndex = 0;
+    const rows = result.raw.split("\n");
+
+    // selecting even a part of the text of a list item will include
+    // "* " at the beginning of the buffer, we remove it to be able
+    // to find it in row
+    const buffer = fixQuotes(
+      this.args.quoteState.buffer.split("\n")[0].replace(/^\* /, "")
+    );
+
+    rows.some((row, index) => {
+      if (row.length && row.includes(buffer)) {
+        bestIndex = index;
+        return true;
+      }
+    });
+
+    this.args.editPost(this.post);
+
+    document
+      .querySelector("#reply-control")
+      ?.addEventListener("transitionend", () => {
+        const textarea = document.querySelector(".d-editor-input");
+        if (!textarea || this.isDestroyed || this.isDestroying) {
+          return;
+        }
+
+        // best index brings us to one row before as slice start from 1
+        // we add 1 to be at the beginning of next line, unless we start from top
+        setCaretPosition(
+          textarea,
+          rows.slice(0, bestIndex).join("\n").length + (bestIndex > 0 ? 1 : 0)
         );
 
-        postModel
-          .save({ raw: newRaw })
-          .catch(popupAjaxError)
-          .finally(() => {
-            this.set("_isSavingFastEdit", false);
-            this._hideButton();
-          });
-      })
-      .catch(popupAjaxError);
-  },
-
-  @action
-  save() {
-    if (this._displayFastEditInput && !this._saveFastEditDisabled) {
-      this._saveFastEdit();
-    }
-  },
-
-  @action
-  cancelled() {
-    this._hideButton();
-  },
+        // ensures we correctly scroll to caret and reloads composer
+        // if we do another selection/edit
+        textarea.blur();
+        textarea.focus();
+      });
+  }
 
   @action
   share(source) {
     Sharing.shareSource(source, {
       url: this.shareUrl,
-      title: this.topic.title,
+      title: this.args.topic.title,
       quote: window.getSelection().toString(),
     });
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/templates/components/related-messages.hbs b/app/assets/javascripts/discourse/app/components/related-messages.hbs
similarity index 72%
rename from app/assets/javascripts/discourse/app/templates/components/related-messages.hbs
rename to app/assets/javascripts/discourse/app/components/related-messages.hbs
index 32cdb231862..6767440cc14 100644
--- a/app/assets/javascripts/discourse/app/templates/components/related-messages.hbs
+++ b/app/assets/javascripts/discourse/app/components/related-messages.hbs
@@ -1,10 +1,12 @@
 <div
   id="related-messages"
-  class="suggested-topics"
+  class="more-content-topics {{if this.hidden 'hidden'}}"
   role="complementary"
   aria-labelledby="related-messages-title"
+  data-mobile-title={{i18n "related_messages.pill"}}
+  data-list-id={{this.listId}}
 >
-  <h3 class="suggested-topics-title" id="related-messages-title">
+  <h3 id="related-messages-title" class="more-topics-title">
     {{i18n "related_messages.title"}}
   </h3>
 
diff --git a/app/assets/javascripts/discourse/app/components/related-messages.js b/app/assets/javascripts/discourse/app/components/related-messages.js
index daa1a058bea..90545638a86 100644
--- a/app/assets/javascripts/discourse/app/components/related-messages.js
+++ b/app/assets/javascripts/discourse/app/components/related-messages.js
@@ -1,9 +1,17 @@
 import Component from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
 import getURL from "discourse-common/lib/get-url";
+import { inject as service } from "@ember/service";
 
 export default Component.extend({
   tagName: "",
+  moreTopicsPreferenceTracking: service(),
+  listId: "related-Messages",
+
+  @discourseComputed("moreTopicsPreferenceTracking.preference")
+  hidden(preference) {
+    return this.site.mobileView && preference !== this.listId;
+  },
 
   @discourseComputed("topic")
   targetUser(topic) {
diff --git a/app/assets/javascripts/discourse/app/templates/components/relative-time-picker.hbs b/app/assets/javascripts/discourse/app/components/relative-time-picker.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/relative-time-picker.hbs
rename to app/assets/javascripts/discourse/app/components/relative-time-picker.hbs
diff --git a/app/assets/javascripts/discourse/app/components/relative-time-picker.js b/app/assets/javascripts/discourse/app/components/relative-time-picker.js
index cb23e50cadf..29e91b71e25 100644
--- a/app/assets/javascripts/discourse/app/components/relative-time-picker.js
+++ b/app/assets/javascripts/discourse/app/components/relative-time-picker.js
@@ -14,19 +14,19 @@ export default Component.extend({
 
   @on("init")
   cloneDuration() {
-    let mins = this.durationMinutes;
-    let hours = this.durationHours;
+    const usesHours = Object.hasOwn(this.attrs, "durationHours");
+    const usesMinutes = Object.hasOwn(this.attrs, "durationMinutes");
 
-    if (hours && mins) {
+    if (usesHours && usesMinutes) {
       throw new Error(
         "relative-time needs initial duration in hours OR minutes, both are not supported"
       );
     }
 
-    if (hours) {
-      this._setInitialDurationFromHours(hours);
+    if (usesHours) {
+      this._setInitialDurationFromHours(this.durationHours);
     } else {
-      this._setInitialDurationFromMinutes(mins);
+      this._setInitialDurationFromMinutes(this.durationMinutes);
     }
   },
 
@@ -47,7 +47,12 @@ export default Component.extend({
   },
 
   _setInitialDurationFromHours(hours) {
-    if (hours >= 8760) {
+    if (hours === null) {
+      this.setProperties({
+        duration: hours,
+        selectedInterval: "hours",
+      });
+    } else if (hours >= 8760) {
       this.setProperties({
         duration: this._roundedDuration(hours / 365 / 24),
         selectedInterval: "years",
diff --git a/app/assets/javascripts/discourse/app/components/responsive-table.hbs b/app/assets/javascripts/discourse/app/components/responsive-table.hbs
new file mode 100644
index 00000000000..1cbd920dcf8
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/responsive-table.hbs
@@ -0,0 +1,22 @@
+<div class="directory-table-container">
+  <div class="directory-table-top-scroll" {{on "scroll" this.onTopScroll}}>
+    <div class="directory-table-top-scroll-fake-content"></div>
+  </div>
+  <div
+    class={{concat-class "directory-table" @className}}
+    role="table"
+    aria-label={{@ariaLabel}}
+    style={{@style}}
+    {{did-insert this.checkScroll}}
+    {{did-update this.checkScroll @updates}}
+    {{on-resize this.checkScroll}}
+    {{on "scroll" this.onBottomScroll}}
+  >
+    <div class="directory-table__header">
+      {{yield to="header"}}
+    </div>
+    <div class="directory-table__body">
+      {{yield to="body"}}
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/responsive-table.js b/app/assets/javascripts/discourse/app/components/responsive-table.js
new file mode 100644
index 00000000000..aecf9c67c34
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/responsive-table.js
@@ -0,0 +1,51 @@
+import Component from "@ember/component";
+import { bind } from "discourse-common/utils/decorators";
+import { tracked } from "@glimmer/tracking";
+
+export default class ResponsiveTable extends Component {
+  @tracked lastScrollPosition = 0;
+  @tracked ticking = false;
+  @tracked _table = document.querySelector(".directory-table");
+  @tracked _topHorizontalScrollBar = document.querySelector(
+    ".directory-table-top-scroll"
+  );
+
+  @bind
+  checkScroll() {
+    const _fakeScrollContent = document.querySelector(
+      ".directory-table-top-scroll-fake-content"
+    );
+
+    if (this._table.getBoundingClientRect().bottom < window.innerHeight) {
+      // Bottom of the table is visible. Hide the scrollbar
+      _fakeScrollContent.style.height = 0;
+    } else {
+      _fakeScrollContent.style.width = `${this._table.scrollWidth}px`;
+      _fakeScrollContent.style.height = "1px";
+    }
+  }
+
+  @bind
+  onTopScroll() {
+    this.onHorizontalScroll(this._topHorizontalScrollBar, this._table);
+  }
+
+  @bind
+  onBottomScroll() {
+    this.onHorizontalScroll(this._table, this._topHorizontalScrollBar);
+  }
+
+  @bind
+  onHorizontalScroll(primary, replica) {
+    this.set("lastScrollPosition", primary?.scrollLeft);
+
+    if (!this.ticking) {
+      window.requestAnimationFrame(() => {
+        replica.scrollLeft = this.lastScrollPosition;
+        this.set("ticking", false);
+      });
+
+      this.set("ticking", true);
+    }
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-bundled-action.hbs b/app/assets/javascripts/discourse/app/components/reviewable-bundled-action.hbs
similarity index 84%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-bundled-action.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-bundled-action.hbs
index 9496f71ea06..ffd767d5d28 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-bundled-action.hbs
+++ b/app/assets/javascripts/discourse/app/components/reviewable-bundled-action.hbs
@@ -1,11 +1,11 @@
 {{#if this.multiple}}
   <DropdownSelectBox
-    @class="reviewable-action-dropdown"
+    @class="reviewable-action-dropdown btn-icon-text"
     @nameProperty="label"
     @content={{this.bundle.actions}}
     @onChange={{action "performById"}}
     @options={{hash
-      icon=this.bundle.icon
+      showCaret=true
       disabled=this.reviewableUpdating
       placement=this.placement
       translatedNone=this.bundle.label
@@ -19,7 +19,6 @@
       " "
       this.first.button_class
     }}
-    @icon={{this.first.icon}}
     @action={{action "perform" this.first}}
     @translatedLabel={{this.first.label}}
     @disabled={{this.reviewableUpdating}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-claimed-topic.hbs b/app/assets/javascripts/discourse/app/components/reviewable-claimed-topic.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-claimed-topic.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-claimed-topic.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-conversation-post.hbs b/app/assets/javascripts/discourse/app/components/reviewable-conversation-post.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-conversation-post.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-conversation-post.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-created-by-name.hbs b/app/assets/javascripts/discourse/app/components/reviewable-created-by-name.hbs
similarity index 89%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-created-by-name.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-created-by-name.hbs
index e3c213a1ba0..26806b9c5ab 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-created-by-name.hbs
+++ b/app/assets/javascripts/discourse/app/components/reviewable-created-by-name.hbs
@@ -12,6 +12,6 @@
   <PluginOutlet
     @name="after-reviewable-post-user"
     @connectorTagName="div"
-    @args={{hash user=this.user}}
+    @outletArgs={{hash user=this.user}}
   />
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-created-by.hbs b/app/assets/javascripts/discourse/app/components/reviewable-created-by.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-created-by.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-created-by.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-field-category.hbs b/app/assets/javascripts/discourse/app/components/reviewable-field-category.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-field-category.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-field-category.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-field-editor.hbs b/app/assets/javascripts/discourse/app/components/reviewable-field-editor.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-field-editor.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-field-editor.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-field-tags.hbs b/app/assets/javascripts/discourse/app/components/reviewable-field-tags.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-field-tags.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-field-tags.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-field-text.hbs b/app/assets/javascripts/discourse/app/components/reviewable-field-text.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-field-text.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-field-text.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-field-textarea.hbs b/app/assets/javascripts/discourse/app/components/reviewable-field-textarea.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-field-textarea.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-field-textarea.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-field.hbs b/app/assets/javascripts/discourse/app/components/reviewable-field.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-field.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-field.hbs
diff --git a/app/assets/javascripts/discourse/app/components/reviewable-flagged-post.hbs b/app/assets/javascripts/discourse/app/components/reviewable-flagged-post.hbs
new file mode 100644
index 00000000000..0e9e7d2bb89
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/reviewable-flagged-post.hbs
@@ -0,0 +1,42 @@
+<div class="flagged-post-header">
+  <ReviewableTopicLink @reviewable={{@reviewable}} @tagName="" />
+  <ReviewablePostEdits @reviewable={{@reviewable}} @tagName="" />
+</div>
+
+<div class="post-contents-wrapper">
+  <ReviewableCreatedBy @user={{@reviewable.target_created_by}} @tagName="" />
+  <div class="post-contents">
+    <ReviewablePostHeader
+      @reviewable={{@reviewable}}
+      @createdBy={{@reviewable.target_created_by}}
+      @tagName=""
+    />
+    <div
+      class="post-body {{if this.isCollapsed 'is-collapsed'}}"
+      {{did-insert this.calculatePostBodySize @reviewable}}
+    >
+      {{#if @reviewable.blank_post}}
+        <p>{{i18n "review.deleted_post"}}</p>
+      {{else}}
+        {{html-safe @reviewable.cooked}}
+      {{/if}}
+    </div>
+
+    {{#if this.isLongPost}}
+      <DButton
+        @class="btn-default btn-icon post-body__toggle-btn"
+        @action={{this.toggleContent}}
+        @label={{this.collapseButtonProps.label}}
+        @icon={{this.collapseButtonProps.icon}}
+      />
+    {{/if}}
+    <span>
+      <PluginOutlet
+        @name="after-reviewable-flagged-post-body"
+        @connectorTagName="div"
+        @outletArgs={{hash model=@reviewable}}
+      />
+    </span>
+    {{yield}}
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/reviewable-flagged-post.js b/app/assets/javascripts/discourse/app/components/reviewable-flagged-post.js
index 87d5ddb040f..95e3668e14a 100644
--- a/app/assets/javascripts/discourse/app/components/reviewable-flagged-post.js
+++ b/app/assets/javascripts/discourse/app/components/reviewable-flagged-post.js
@@ -1,3 +1,39 @@
-import Component from "@ember/component";
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import { tracked } from "@glimmer/tracking";
+import { bind } from "discourse-common/utils/decorators";
 
-export default Component.extend({});
+export default class ReviewableFlaggedPost extends Component {
+  @tracked isCollapsed = false;
+  @tracked isLongPost = false;
+  maxPostHeight = 300;
+
+  @action
+  toggleContent() {
+    this.isCollapsed = !this.isCollapsed;
+  }
+
+  @bind
+  calculatePostBodySize(element) {
+    if (element?.offsetHeight > this.maxPostHeight) {
+      this.isCollapsed = true;
+      this.isLongPost = true;
+    } else {
+      this.isCollapsed = false;
+      this.isLongPost = false;
+    }
+  }
+
+  get collapseButtonProps() {
+    if (this.isCollapsed) {
+      return {
+        label: "review.show_more",
+        icon: "chevron-down",
+      };
+    }
+    return {
+      label: "review.show_less",
+      icon: "chevron-up",
+    };
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-histories.hbs b/app/assets/javascripts/discourse/app/components/reviewable-histories.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-histories.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-histories.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-item.hbs b/app/assets/javascripts/discourse/app/components/reviewable-item.hbs
similarity index 87%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-item.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-item.hbs
index cf84dab913f..6616d1d573c 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-item.hbs
+++ b/app/assets/javascripts/discourse/app/components/reviewable-item.hbs
@@ -3,7 +3,9 @@
   class="reviewable-item {{this.customClasses}}"
 >
   <div class="reviewable-meta-data">
-    <span class="reviewable-type">{{this.reviewable.humanType}}</span>
+    <span
+      class={{concat-class "reviewable-type" this.reviewable.humanTypeCssClass}}
+    >{{this.reviewable.humanType}}</span>
     {{#if this.reviewable.reply_count}}
       <span class="reply-count">{{i18n
           "review.replies"
@@ -17,7 +19,7 @@
       >{{age-with-tooltip this.reviewable.created_at}}</LinkTo>
     </span>
     <span class="status">
-      {{reviewable-status this.reviewable.status}}
+      {{reviewable-status this.reviewable.status this.reviewable.type}}
     </span>
     <a
       href
@@ -57,14 +59,21 @@
       </div>
     {{else}}
       {{#component
-        this.reviewableComponent
-        reviewable=this.reviewable
-        tagName=""
+        this.reviewableComponent reviewable=this.reviewable tagName=""
       }}
         <ReviewableScores @reviewable={{this.reviewable}} @tagName="" />
       {{/component}}
     {{/if}}
   </div>
+
+  {{#if (eq this.reviewable.type "ReviewableFlaggedPost")}}
+    {{#if (eq this.reviewable.status 0)}}
+      <h3 class="reviewable-item__context-question">
+        {{this.reviewable.flaggedPostContextQuestion}}
+      </h3>
+    {{/if}}
+  {{/if}}
+
   <div class="reviewable-actions">
     {{#if this.reviewable.last_performing_username}}
       <div class="stale-help">{{html-safe
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-post-edits.hbs b/app/assets/javascripts/discourse/app/components/reviewable-post-edits.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-post-edits.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-post-edits.hbs
diff --git a/app/assets/javascripts/discourse/app/components/reviewable-post-edits.js b/app/assets/javascripts/discourse/app/components/reviewable-post-edits.js
index 75b8692a49f..297df51b826 100644
--- a/app/assets/javascripts/discourse/app/components/reviewable-post-edits.js
+++ b/app/assets/javascripts/discourse/app/components/reviewable-post-edits.js
@@ -4,9 +4,12 @@ import { action } from "@ember/object";
 import { gt } from "@ember/object/computed";
 import { historyHeat } from "discourse/widgets/post-edits-indicator";
 import { longDate } from "discourse/lib/formatter";
-import showModal from "discourse/lib/show-modal";
+import { inject as service } from "@ember/service";
+import HistoryModal from "discourse/components/modal/history";
 
 export default Component.extend({
+  modal: service(),
+
   hasEdits: gt("reviewable.post_version", 1),
 
   @discourseComputed("reviewable.post_updated_at")
@@ -24,13 +27,14 @@ export default Component.extend({
     event?.preventDefault();
     let postId = this.get("reviewable.post_id");
     this.store.find("post", postId).then((post) => {
-      let historyController = showModal("history", {
-        model: post,
-        modalClass: "history-modal",
+      this.modal.show(HistoryModal, {
+        model: {
+          post,
+          postId,
+          postVersion: "latest",
+          topicController: null,
+        },
       });
-      historyController.refresh(postId, "latest");
-      historyController.set("post", post);
-      historyController.set("topicController", null);
     });
   },
 });
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-post-header.hbs b/app/assets/javascripts/discourse/app/components/reviewable-post-header.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-post-header.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-post-header.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-post.hbs b/app/assets/javascripts/discourse/app/components/reviewable-post.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-post.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-post.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-queued-post.hbs b/app/assets/javascripts/discourse/app/components/reviewable-queued-post.hbs
similarity index 86%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-queued-post.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-queued-post.hbs
index 9231ed1d31b..cdb6d8e7a7f 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-queued-post.hbs
+++ b/app/assets/javascripts/discourse/app/components/reviewable-queued-post.hbs
@@ -13,12 +13,15 @@
 </ReviewableTopicLink>
 
 <div class="post-contents-wrapper">
-  <ReviewableCreatedBy @user={{this.reviewable.created_by}} @tagName="" />
+  <ReviewableCreatedBy
+    @user={{this.reviewable.target_created_by}}
+    @tagName=""
+  />
 
   <div class="post-contents">
     <ReviewablePostHeader
       @reviewable={{this.reviewable}}
-      @createdBy={{this.reviewable.created_by}}
+      @createdBy={{this.reviewable.target_created_by}}
       @tagName=""
     />
 
diff --git a/app/assets/javascripts/discourse/app/components/reviewable-score.hbs b/app/assets/javascripts/discourse/app/components/reviewable-score.hbs
new file mode 100644
index 00000000000..49407ecb2e6
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/reviewable-score.hbs
@@ -0,0 +1,43 @@
+<tr class="reviewable-score">
+  <td class="user">
+    <UserLink @user={{this.rs.user}}>
+      {{avatar this.rs.user imageSize="tiny"}}
+      {{this.rs.user.username}}
+    </UserLink>
+  </td>
+
+  <td>
+    {{format-date this.rs.created_at format="tiny"}}
+  </td>
+
+  <td>
+    {{d-icon this.rs.score_type.icon}}
+    {{this.title}}
+  </td>
+
+  {{#if this.showStatus}}
+    <td class="reviewed-by">
+      {{#if this.rs.reviewed_by}}
+        <UserLink @user={{this.rs.reviewed_by}}>
+          {{avatar this.rs.reviewed_by imageSize="tiny"}}
+          {{this.rs.reviewed_by.username}}
+        </UserLink>
+      {{else}}
+        &mdash;
+      {{/if}}
+    </td>
+
+    <td>
+      {{#if this.rs.reviewed_by}}
+        {{format-date this.rs.reviewed_at format="tiny"}}
+      {{/if}}
+    </td>
+
+    <td>
+      {{reviewable-status this.rs.status this.reviewable.type}}
+    </td>
+
+  {{else}}
+    <td colspan="4"></td>
+  {{/if}}
+</tr>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/reviewable-scores.hbs b/app/assets/javascripts/discourse/app/components/reviewable-scores.hbs
new file mode 100644
index 00000000000..73d268380da
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/reviewable-scores.hbs
@@ -0,0 +1,44 @@
+{{#if this.reviewable.reviewable_scores}}
+  <div class="reviewable-scores__table-wrapper">
+    <table class="reviewable-scores">
+      <thead>
+        <tr>
+          <th>{{i18n "review.scores.submitted_by"}}</th>
+          <th>{{i18n "review.scores.date"}}</th>
+          <th>{{i18n "review.scores.type"}}</th>
+          <th>{{i18n "review.scores.reviewed_by"}}</th>
+          <th>{{i18n "review.scores.reviewed_timestamp"}}</th>
+          <th>{{i18n "review.scores.status"}}</th>
+        </tr>
+      </thead>
+      <tbody>
+        {{#each this.reviewable.reviewable_scores as |rs|}}
+          <ReviewableScore @rs={{rs}} @reviewable={{this.reviewable}} />
+        {{/each}}
+      </tbody>
+    </table>
+  </div>
+
+  {{#each this.reviewable.reviewable_scores as |rs|}}
+    {{#if rs.reason}}
+      <div class="reviewable-score-reason">{{html-safe rs.reason}}</div>
+    {{/if}}
+
+    {{#if rs.reviewable_conversation}}
+      <div class="reviewable-conversation">
+        {{#each rs.reviewable_conversation.conversation_posts as |p index|}}
+          <ReviewableConversationPost @post={{p}} @index={{index}} />
+        {{/each}}
+        <div class="controls">
+          <a
+            href={{rs.reviewable_conversation.permalink}}
+            class="btn btn-small"
+          >
+            {{i18n "review.conversation.view_full"}}
+          </a>
+        </div>
+      </div>
+    {{/if}}
+  {{/each}}
+
+{{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-tags.hbs b/app/assets/javascripts/discourse/app/components/reviewable-tags.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-tags.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-tags.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-topic-link.hbs b/app/assets/javascripts/discourse/app/components/reviewable-topic-link.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-topic-link.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-topic-link.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-user.hbs b/app/assets/javascripts/discourse/app/components/reviewable-user.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/reviewable-user.hbs
rename to app/assets/javascripts/discourse/app/components/reviewable-user.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/save-controls.hbs b/app/assets/javascripts/discourse/app/components/save-controls.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/save-controls.hbs
rename to app/assets/javascripts/discourse/app/components/save-controls.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/score-value.hbs b/app/assets/javascripts/discourse/app/components/score-value.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/score-value.hbs
rename to app/assets/javascripts/discourse/app/components/score-value.hbs
diff --git a/app/assets/javascripts/discourse/app/components/scrolling-post-stream.js b/app/assets/javascripts/discourse/app/components/scrolling-post-stream.js
index 901005e0866..c5d16602034 100644
--- a/app/assets/javascripts/discourse/app/components/scrolling-post-stream.js
+++ b/app/assets/javascripts/discourse/app/components/scrolling-post-stream.js
@@ -302,6 +302,7 @@ export default MountWidget.extend({
       }
     }
     this.queueRerender();
+    this._scrollTriggered();
   },
 
   @bind
@@ -363,6 +364,10 @@ export default MountWidget.extend({
     this.appEvents.off("post-stream:posted", this, "_posted");
   },
 
+  didUpdateAttrs() {
+    this._refresh({ force: true });
+  },
+
   _handleWidgetButtonHoverState(event) {
     if (event.target.classList.contains("widget-button")) {
       document
diff --git a/app/assets/javascripts/discourse/app/templates/components/search-advanced-options.hbs b/app/assets/javascripts/discourse/app/components/search-advanced-options.hbs
similarity index 99%
rename from app/assets/javascripts/discourse/app/templates/components/search-advanced-options.hbs
rename to app/assets/javascripts/discourse/app/components/search-advanced-options.hbs
index ddbee982168..37bcff80043 100644
--- a/app/assets/javascripts/discourse/app/templates/components/search-advanced-options.hbs
+++ b/app/assets/javascripts/discourse/app/components/search-advanced-options.hbs
@@ -6,7 +6,7 @@
     <PluginOutlet
       @name="advanced-search-options-above"
       @connectorTagName="div"
-      @args={{hash
+      @outletArgs={{hash
         searchedTerms=this.searchedTerms
         onChangeSearchedTermField=this.onChangeSearchedTermField
       }}
@@ -222,7 +222,7 @@
     <PluginOutlet
       @name="advanced-search-options-below"
       @connectorTagName="div"
-      @args={{hash
+      @outletArgs={{hash
         searchedTerms=this.searchedTerms
         onChangeSearchedTermField=this.onChangeSearchedTermField
       }}
diff --git a/app/assets/javascripts/discourse/app/components/search-menu.hbs b/app/assets/javascripts/discourse/app/components/search-menu.hbs
new file mode 100644
index 00000000000..a8c9ca61da7
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-menu.hbs
@@ -0,0 +1,25 @@
+<MenuPanel @animationClass={{@animationClass}}>
+  <SearchMenu::MenuPanelContents
+    @inTopicContext={{this.inTopicContext}}
+    @clearTopicContext={{this.clearTopicContext}}
+    @clearPMInboxContext={{this.clearPMInboxContext}}
+    @inPMInboxContext={{this.inPMInboxContext}}
+    @searchTermChanged={{this.searchTermChanged}}
+    @loading={{this.loading}}
+    @fullSearchUrl={{this.fullSearchUrl}}
+    @fullSearch={{this.fullSearch}}
+    @triggerSearch={{this.triggerSearch}}
+    @clearSearch={{this.clearSearch}}
+    @includesTopics={{this.includesTopics}}
+    @noResults={{this.noResults}}
+    @results={{this.results}}
+    @invalidTerm={{this.invalidTerm}}
+    @suggestionKeyword={{this.suggestionKeyword}}
+    @suggestionResults={{this.suggestionResults}}
+    @searchTopics={{this.includesTopics}}
+    @typeFilter={{this.typeFilter}}
+    @updateTypeFilter={{this.updateTypeFilter}}
+    @toggleSearchMenu={{@toggleSearchMenu}}
+    @closeSearchMenu={{@closeSearchMenu}}
+  />
+</MenuPanel>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/search-menu.js b/app/assets/javascripts/discourse/app/components/search-menu.js
new file mode 100644
index 00000000000..a1b5c62c726
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-menu.js
@@ -0,0 +1,294 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+import { bind } from "discourse-common/utils/decorators";
+import { tracked } from "@glimmer/tracking";
+import {
+  isValidSearchTerm,
+  searchForTerm,
+  updateRecentSearches,
+} from "discourse/lib/search";
+import DiscourseURL from "discourse/lib/url";
+import discourseDebounce from "discourse-common/lib/debounce";
+import getURL from "discourse-common/lib/get-url";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { Promise } from "rsvp";
+import { search as searchCategoryTag } from "discourse/lib/category-tag-search";
+import userSearch from "discourse/lib/user-search";
+import { CANCELLED_STATUS } from "discourse/lib/autocomplete";
+import { cancel } from "@ember/runloop";
+
+const CATEGORY_SLUG_REGEXP = /(\#[a-zA-Z0-9\-:]*)$/gi;
+const USERNAME_REGEXP = /(\@[a-zA-Z0-9\-\_]*)$/gi;
+const SUGGESTIONS_REGEXP = /(in:|status:|order:|:)([a-zA-Z]*)$/gi;
+export const SEARCH_INPUT_ID = "search-term";
+export const SEARCH_BUTTON_ID = "search-button";
+export const MODIFIER_REGEXP = /.*(\#|\@|:).*$/gi;
+export const DEFAULT_TYPE_FILTER = "exclude_topics";
+
+export function focusSearchInput() {
+  document.getElementById(SEARCH_INPUT_ID).focus();
+}
+
+export function focusSearchButton() {
+  document.getElementById(SEARCH_BUTTON_ID).focus();
+}
+
+export default class SearchMenu extends Component {
+  @service search;
+  @service currentUser;
+  @service siteSettings;
+  @service appEvents;
+
+  @tracked inTopicContext = this.args.inTopicContext;
+  @tracked loading = false;
+  @tracked results = {};
+  @tracked noResults = false;
+  @tracked inPMInboxContext =
+    this.search.searchContext?.type === "private_messages";
+  @tracked typeFilter = DEFAULT_TYPE_FILTER;
+  @tracked suggestionKeyword = false;
+  @tracked suggestionResults = [];
+  @tracked invalidTerm = false;
+  _debouncer = null;
+  _activeSearch = null;
+
+  get includesTopics() {
+    return this.typeFilter !== DEFAULT_TYPE_FILTER;
+  }
+
+  get searchContext() {
+    if (this.inTopicContext || this.inPMInboxContext) {
+      return this.search.searchContext;
+    }
+
+    return false;
+  }
+
+  @bind
+  fullSearchUrl(opts) {
+    let url = "/search";
+    let params = new URLSearchParams();
+
+    if (this.search.activeGlobalSearchTerm) {
+      let q = this.search.activeGlobalSearchTerm;
+
+      if (this.searchContext?.type === "topic") {
+        q += ` topic:${this.searchContext.id}`;
+      } else if (this.searchContext?.type === "private_messages") {
+        q += " in:messages";
+      }
+      params.set("q", q);
+    }
+    if (opts?.expanded) {
+      params.set("expanded", "true");
+    }
+    if (params.toString() !== "") {
+      url = `${url}?${params}`;
+    }
+    return getURL(url);
+  }
+
+  @bind
+  clearSearch(e) {
+    e.stopPropagation();
+    e.preventDefault();
+    this.search.activeGlobalSearchTerm = "";
+    focusSearchInput();
+    this.triggerSearch();
+  }
+
+  @action
+  searchTermChanged(term, opts = {}) {
+    this.typeFilter = opts.searchTopics ? null : DEFAULT_TYPE_FILTER;
+    if (opts.setTopicContext) {
+      this.inTopicContext = true;
+    }
+    this.search.activeGlobalSearchTerm = term;
+    this.triggerSearch();
+  }
+
+  @action
+  fullSearch() {
+    this.loading = false;
+    const url = this.fullSearchUrl();
+    if (url) {
+      DiscourseURL.routeTo(url);
+    }
+  }
+
+  @action
+  updateTypeFilter(value) {
+    this.typeFilter = value;
+  }
+
+  @action
+  clearPMInboxContext() {
+    this.inPMInboxContext = false;
+  }
+
+  @action
+  clearTopicContext() {
+    this.inTopicContext = false;
+  }
+
+  // for cancelling debounced search
+  cancel() {
+    if (this._activeSearch) {
+      this._activeSearch.abort();
+      this._activeSearch = null;
+    }
+  }
+
+  async perform() {
+    this.cancel();
+
+    const matchSuggestions = this.matchesSuggestions();
+    if (matchSuggestions) {
+      this.noResults = true;
+      this.results = {};
+      this.loading = false;
+      this.suggestionResults = [];
+
+      if (matchSuggestions.type === "category") {
+        const categorySearchTerm = matchSuggestions.categoriesMatch[0].replace(
+          "#",
+          ""
+        );
+
+        const categoryTagSearch = searchCategoryTag(
+          categorySearchTerm,
+          this.siteSettings
+        );
+        Promise.resolve(categoryTagSearch).then((results) => {
+          if (results !== CANCELLED_STATUS) {
+            this.suggestionResults = results;
+            this.suggestionKeyword = "#";
+          }
+        });
+      } else if (matchSuggestions.type === "username") {
+        const userSearchTerm = matchSuggestions.usernamesMatch[0].replace(
+          "@",
+          ""
+        );
+        const opts = { includeGroups: true, limit: 6 };
+        if (userSearchTerm.length > 0) {
+          opts.term = userSearchTerm;
+        } else {
+          opts.lastSeenUsers = true;
+        }
+
+        userSearch(opts).then((result) => {
+          if (result?.users?.length > 0) {
+            this.suggestionResults = result.users;
+            this.suggestionKeyword = "@";
+          } else {
+            this.noResults = true;
+            this.suggestionKeyword = false;
+          }
+        });
+      } else {
+        this.suggestionKeyword = matchSuggestions[0];
+      }
+      return;
+    }
+
+    this.suggestionKeyword = false;
+
+    if (!this.search.activeGlobalSearchTerm) {
+      this.noResults = false;
+      this.results = {};
+      this.loading = false;
+      this.invalidTerm = false;
+    } else if (
+      !isValidSearchTerm(this.search.activeGlobalSearchTerm, this.siteSettings)
+    ) {
+      this.noResults = true;
+      this.results = {};
+      this.loading = false;
+      this.invalidTerm = true;
+    } else {
+      this.invalidTerm = false;
+
+      this._activeSearch = searchForTerm(this.search.activeGlobalSearchTerm, {
+        typeFilter: this.typeFilter,
+        fullSearchUrl: this.fullSearchUrl,
+        searchContext: this.searchContext,
+      });
+
+      this._activeSearch
+        .then((results) => {
+          // we ensure the current search term is the one used
+          // when starting the query
+          if (results) {
+            if (this.searchContext) {
+              this.appEvents.trigger("post-stream:refresh", {
+                force: true,
+              });
+            }
+
+            this.noResults = results.resultTypes.length === 0;
+            this.results = results;
+          }
+        })
+        .catch(popupAjaxError)
+        .finally(() => {
+          this.loading = false;
+        });
+    }
+  }
+
+  matchesSuggestions() {
+    if (
+      this.search.activeGlobalSearchTerm === undefined ||
+      this.includesTopics
+    ) {
+      return false;
+    }
+
+    const term = this.search.activeGlobalSearchTerm.trim();
+    const categoriesMatch = term.match(CATEGORY_SLUG_REGEXP);
+
+    if (categoriesMatch) {
+      return { type: "category", categoriesMatch };
+    }
+
+    const usernamesMatch = term.match(USERNAME_REGEXP);
+    if (usernamesMatch) {
+      return { type: "username", usernamesMatch };
+    }
+
+    const suggestionsMatch = term.match(SUGGESTIONS_REGEXP);
+    if (suggestionsMatch) {
+      return suggestionsMatch;
+    }
+
+    return false;
+  }
+
+  @action
+  triggerSearch() {
+    this.noResults = false;
+
+    if (this.includesTopics) {
+      if (this.search.contextType === "topic") {
+        this.search.highlightTerm = this.search.activeGlobalSearchTerm;
+      }
+      this.loading = true;
+      cancel(this._debouncer);
+      this.perform();
+
+      if (this.currentUser) {
+        updateRecentSearches(
+          this.currentUser,
+          this.search.activeGlobalSearchTerm
+        );
+      }
+    } else {
+      this.loading = false;
+      if (!this.inTopicContext) {
+        this._debouncer = discourseDebounce(this, this.perform, 400);
+      }
+    }
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/advanced-button.hbs b/app/assets/javascripts/discourse/app/components/search-menu/advanced-button.hbs
new file mode 100644
index 00000000000..b1b847c430c
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-menu/advanced-button.hbs
@@ -0,0 +1,7 @@
+<a
+  class="show-advanced-search"
+  title={{i18n "search.open_advanced"}}
+  href={{@href}}
+>
+  {{d-icon "sliders-h"}}
+</a>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/browser-search-tip.hbs b/app/assets/javascripts/discourse/app/components/search-menu/browser-search-tip.hbs
new file mode 100644
index 00000000000..4b470452ec4
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-menu/browser-search-tip.hbs
@@ -0,0 +1,8 @@
+<div class="browser-search-tip">
+  <span class="tip-label">
+    {{this.translatedLabel}}
+  </span>
+  <span class="tip-description">
+    {{i18n "search.browser_tip_description"}}
+  </span>
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/browser-search-tip.js b/app/assets/javascripts/discourse/app/components/search-menu/browser-search-tip.js
new file mode 100644
index 00000000000..904e1db6f27
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-menu/browser-search-tip.js
@@ -0,0 +1,9 @@
+import Component from "@glimmer/component";
+import I18n from "I18n";
+import { translateModKey } from "discourse/lib/utilities";
+
+export default class BrowserSearchTip extends Component {
+  get translatedLabel() {
+    return I18n.t("search.browser_tip", { modifier: translateModKey("Meta+") });
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/clear-button.hbs b/app/assets/javascripts/discourse/app/components/search-menu/clear-button.hbs
new file mode 100644
index 00000000000..0b3b2dce015
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-menu/clear-button.hbs
@@ -0,0 +1,9 @@
+<a
+  class="clear-search"
+  aria-label="clear_input"
+  title={{i18n "search.clear_search"}}
+  href
+  {{on "click" @clearSearch}}
+>
+  {{d-icon "times"}}
+</a>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/highlighted-search.hbs b/app/assets/javascripts/discourse/app/components/search-menu/highlighted-search.hbs
new file mode 100644
index 00000000000..28bf444b69d
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-menu/highlighted-search.hbs
@@ -0,0 +1 @@
+{{html-safe @string}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/highlighted-search.js b/app/assets/javascripts/discourse/app/components/search-menu/highlighted-search.js
new file mode 100644
index 00000000000..dd0fba9e501
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-menu/highlighted-search.js
@@ -0,0 +1,15 @@
+import Component from "@glimmer/component";
+import highlightSearch from "discourse/lib/highlight-search";
+import { inject as service } from "@ember/service";
+
+export default class HighlightedSearch extends Component {
+  @service search;
+
+  constructor() {
+    super(...arguments);
+    const span = document.createElement("span");
+    span.textContent = this.args.string;
+
+    highlightSearch(span, this.search.activeGlobalSearchTerm);
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/menu-panel-contents.hbs b/app/assets/javascripts/discourse/app/components/search-menu/menu-panel-contents.hbs
new file mode 100644
index 00000000000..04d0941b4da
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-menu/menu-panel-contents.hbs
@@ -0,0 +1,65 @@
+<div class="search-input">
+  {{#if @inTopicContext}}
+    <DButton
+      @icon="times"
+      @label="search.in_this_topic"
+      @title="search.in_this_topic_tooltip"
+      class="btn btn-small search-context"
+      @action={{@clearTopicContext}}
+      @iconRight={{true}}
+    />
+  {{else if @inPMInboxContext}}
+    <DButton
+      @icon="times"
+      @label="search.in_messages"
+      @title="search.in_messages_tooltip"
+      @class="btn btn-small search-context"
+      @action={{@clearPMInboxContext}}
+      @iconRight={{true}}
+    />
+  {{/if}}
+
+  <SearchMenu::SearchTerm
+    @searchTermChanged={{@searchTermChanged}}
+    @typeFilter={{@typeFilter}}
+    @updateTypeFilter={{@updateTypeFilter}}
+    @triggerSearch={{@triggerSearch}}
+    @fullSearch={{@fullSearch}}
+    @clearPMInboxContext={{@clearPMInboxContext}}
+    @clearTopicContext={{@clearTopicContext}}
+    @closeSearchMenu={{@closeSearchMenu}}
+  />
+
+  {{#if @loading}}
+    <div class="searching">
+      {{loading-spinner}}
+    </div>
+  {{else}}
+    <div class="searching">
+      {{#if this.search.activeGlobalSearchTerm}}
+        <SearchMenu::ClearButton @clearSearch={{@clearSearch}} />
+      {{/if}}
+      <SearchMenu::AdvancedButton @href={{this.advancedSearchButtonHref}} />
+    </div>
+  {{/if}}
+</div>
+
+{{#if (and @inTopicContext (not @includesTopics))}}
+  <SearchMenu::BrowserSearchTip />
+{{else}}
+  {{#unless @loading}}
+    <SearchMenu::Results
+      @noResults={{@noResults}}
+      @results={{@results}}
+      @invalidTerm={{@invalidTerm}}
+      @suggestionKeyword={{@suggestionKeyword}}
+      @suggestionResults={{@suggestionResults}}
+      @searchTopics={{@includesTopics}}
+      @inPMInboxContext={{@inPMInboxContext}}
+      @triggerSearch={{@triggerSearch}}
+      @updateTypeFilter={{@updateTypeFilter}}
+      @closeSearchMenu={{@closeSearchMenu}}
+      @searchTermChanged={{@searchTermChanged}}
+    />
+  {{/unless}}
+{{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/menu-panel-contents.js b/app/assets/javascripts/discourse/app/components/search-menu/menu-panel-contents.js
new file mode 100644
index 00000000000..e980911f3a9
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-menu/menu-panel-contents.js
@@ -0,0 +1,10 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+
+export default class MenuPanelContents extends Component {
+  @service search;
+
+  get advancedSearchButtonHref() {
+    return this.args.fullSearchUrl({ expanded: true });
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/results.hbs b/app/assets/javascripts/discourse/app/components/search-menu/results.hbs
new file mode 100644
index 00000000000..67032e7281e
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-menu/results.hbs
@@ -0,0 +1,52 @@
+<div class="results">
+  {{#if @suggestionKeyword}}
+    <SearchMenu::Results::Assistant
+      @suggestionKeyword={{@suggestionKeyword}}
+      @results={{@suggestionResults}}
+      @closeSearchMenu={{@closeSearchMenu}}
+      @searchTermChanged={{@searchTermChanged}}
+    />
+  {{else if this.termTooShort}}
+    <div class="no-results">{{i18n "search.too_short"}}</div>
+  {{else if this.noTopicResults}}
+    <div class="no-results">{{i18n "search.no_results"}}</div>
+  {{else if this.renderInitialOptions}}
+    <SearchMenu::Results::InitialOptions
+      @closeSearchMenu={{@closeSearchMenu}}
+      @searchTermChanged={{@searchTermChanged}}
+    />
+  {{else}}
+    {{#if @searchTopics}}
+      {{! render results after a search has been performed }}
+      {{#if this.resultTypesWithComponent}}
+        <SearchMenu::Results::Types
+          @resultTypes={{this.resultTypesWithComponent}}
+          @topicResultsOnly={{true}}
+          @closeSearchMenu={{@closeSearchMenu}}
+        />
+        <SearchMenu::Results::MoreLink
+          @updateTypeFilter={{@updateTypeFilter}}
+          @triggerSearch={{@triggerSearch}}
+          @resultTypes={{this.resultTypesWithComponent}}
+          @closeSearchMenu={{@closeSearchMenu}}
+          @searchTermChanged={{@searchTermChanged}}
+        />
+      {{/if}}
+    {{else}}
+      {{#unless @inPMInboxContext}}
+        {{! render the first couple suggestions before a search has been performed}}
+        <SearchMenu::Results::InitialOptions
+          @closeSearchMenu={{@closeSearchMenu}}
+          @searchTermChanged={{@searchTermChanged}}
+        />
+        {{#if this.resultTypesWithComponent}}
+          <SearchMenu::Results::Types
+            @resultTypes={{this.resultTypesWithComponent}}
+            @closeSearchMenu={{@closeSearchMenu}}
+            @searchTermChanged={{@searchTermChanged}}
+          />
+        {{/if}}
+      {{/unless}}
+    {{/if}}
+  {{/if}}
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/results.js b/app/assets/javascripts/discourse/app/components/search-menu/results.js
new file mode 100644
index 00000000000..cc08acde99f
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-menu/results.js
@@ -0,0 +1,53 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+import { tracked } from "@glimmer/tracking";
+import { action } from "@ember/object";
+import TopicViewComponent from "./results/type/topic";
+import PostViewComponent from "./results/type/post";
+import UserViewComponent from "./results/type/user";
+import TagViewComponent from "./results/type/tag";
+import GroupViewComponent from "./results/type/group";
+import CategoryViewComponent from "./results/type/category";
+
+const SEARCH_RESULTS_COMPONENT_TYPE = {
+  "search-result-category": CategoryViewComponent,
+  "search-result-topic": TopicViewComponent,
+  "search-result-post": PostViewComponent,
+  "search-result-user": UserViewComponent,
+  "search-result-tag": TagViewComponent,
+  "search-result-group": GroupViewComponent,
+};
+
+export default class Results extends Component {
+  @service search;
+
+  @tracked searchTopics = this.args.searchTopics;
+
+  get renderInitialOptions() {
+    return !this.search.activeGlobalSearchTerm && !this.args.inPMInboxContext;
+  }
+
+  get noTopicResults() {
+    return this.args.searchTopics && this.args.noResults;
+  }
+
+  get termTooShort() {
+    return this.args.searchTopics && this.args.invalidTerm;
+  }
+
+  get resultTypesWithComponent() {
+    let content = [];
+    this.args.results.resultTypes?.map((resultType) => {
+      content.push({
+        ...resultType,
+        component: SEARCH_RESULTS_COMPONENT_TYPE[resultType.componentName],
+      });
+    });
+    return content;
+  }
+
+  @action
+  updateSearchTopics(value) {
+    this.searchTopics = value;
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/results/assistant-item.hbs b/app/assets/javascripts/discourse/app/components/search-menu/results/assistant-item.hbs
new file mode 100644
index 00000000000..8f5f3263202
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-menu/results/assistant-item.hbs
@@ -0,0 +1,56 @@
+{{! template-lint-disable no-pointer-down-event-binding }}
+{{! template-lint-disable no-invalid-interactive }}
+<li
+  class="search-menu-assistant-item"
+  {{on "keydown" this.onKeydown}}
+  {{on "click" this.onClick}}
+>
+  <a class="search-link" href={{this.href}}>
+    <span aria-label={{i18n "search.title"}}>
+      {{d-icon (or @icon "search")}}
+    </span>
+
+    {{#if this.prefix}}
+      <span class="search-item-prefix">
+        {{this.prefix}}
+      </span>
+    {{/if}}
+
+    {{#if @withInLabel}}
+      <span class="label-suffix">{{i18n "search.in"}}</span>
+    {{/if}}
+
+    {{#if @category}}
+      <SearchMenu::Results::Type::Category @result={{@category}} />
+      {{#if (and @tag @isIntersection)}}
+        <span class="search-item-tag">
+          {{d-icon "tag"}}{{@tag}}
+        </span>
+      {{/if}}
+    {{else if @tag}}
+      {{#if (and @isIntersection @additionalTags.length)}}
+        <span class="search-item-tag">{{this.tagsSlug}}</span>
+      {{else}}
+        <span class="search-item-tag">
+          <SearchMenu::Results::Type::Tag @result={{@tag}} />
+        </span>
+      {{/if}}
+    {{else if @user}}
+      <span class="search-item-user">
+        <SearchMenu::Results::Type::User @result={{@user}} />
+      </span>
+    {{/if}}
+
+    <span class="search-item-slug">
+      {{#if @suffix}}
+        <span class="label-suffix">{{@suffix}}</span>
+      {{/if}}
+      {{@label}}
+    </span>
+    {{#if @extraHint}}
+      <span class="extra-hint">
+        {{i18n "search.enter_hint"}}
+      </span>
+    {{/if}}
+  </a>
+</li>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/results/assistant-item.js b/app/assets/javascripts/discourse/app/components/search-menu/results/assistant-item.js
new file mode 100644
index 00000000000..1d4797458d0
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-menu/results/assistant-item.js
@@ -0,0 +1,101 @@
+import Component from "@glimmer/component";
+import getURL from "discourse-common/lib/get-url";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+import { debounce } from "discourse-common/utils/decorators";
+import {
+  focusSearchButton,
+  focusSearchInput,
+} from "discourse/components/search-menu";
+
+export default class AssistantItem extends Component {
+  @service search;
+  @service appEvents;
+
+  icon = this.args.icon || "search";
+
+  get href() {
+    let href = "#";
+    if (this.args.category) {
+      href = this.args.category.url;
+
+      if (this.args.tags && this.args.isIntersection) {
+        href = getURL(`/tag/${this.args.tag}`);
+      }
+    } else if (
+      this.args.tags &&
+      this.args.isIntersection &&
+      this.args.additionalTags?.length
+    ) {
+      href = getURL(`/tag/${this.args.tag}`);
+    }
+
+    return href;
+  }
+
+  get prefix() {
+    let prefix = "";
+    if (this.args.suggestionKeyword !== "+") {
+      prefix =
+        this.search.activeGlobalSearchTerm
+          ?.split(this.args.suggestionKeyword)[0]
+          .trim() || "";
+      if (prefix.length) {
+        prefix = `${prefix} `;
+      }
+    } else {
+      prefix = this.search.activeGlobalSearchTerm;
+    }
+    return prefix;
+  }
+
+  get tagsSlug() {
+    if (!this.args.tag || !this.args.additionalTags) {
+      return;
+    }
+
+    return `tags:${[this.args.tag, ...this.args.additionalTags].join("+")}`;
+  }
+
+  @action
+  onKeydown(e) {
+    if (e.key === "Escape") {
+      focusSearchButton();
+      this.args.closeSearchMenu();
+      e.preventDefault();
+      return false;
+    }
+
+    if (e.key === "Enter") {
+      this.itemSelected();
+    }
+
+    this.search.handleArrowUpOrDown(e);
+    e.stopPropagation();
+    e.preventDefault();
+  }
+
+  @action
+  onClick(e) {
+    this.itemSelected();
+    e.preventDefault();
+    return false;
+  }
+
+  @debounce(100)
+  itemSelected() {
+    let updatedValue = "";
+    if (this.args.slug) {
+      updatedValue = this.prefix.concat(this.args.slug);
+    } else {
+      updatedValue = this.prefix.trim();
+    }
+    const inTopicContext = this.search.searchContext?.type === "topic";
+    this.args.searchTermChanged(updatedValue, {
+      searchTopics: !inTopicContext || this.search.activeGlobalSearchTerm,
+      ...(inTopicContext &&
+        !this.args.searchAllTopics && { setTopicContext: true }),
+    });
+    focusSearchInput();
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/results/assistant.hbs b/app/assets/javascripts/discourse/app/components/search-menu/results/assistant.hbs
new file mode 100644
index 00000000000..bc29ae86a2b
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-menu/results/assistant.hbs
@@ -0,0 +1,81 @@
+<ul class="search-menu-assistant">
+  {{! suggestion type keywords are mapped to SUGGESTION_KEYWORD_MAP }}
+  {{#if (eq this.suggestionType "tagIntersection")}}
+    {{#each @results as |result|}}
+      <SearchMenu::Results::AssistantItem
+        @tag={{result.tagName}}
+        @additionalTags={{result.additionalTags}}
+        @category={{result.category}}
+        @slug={{@slug}}
+        @withInLabel={{@withInLabel}}
+        @isIntersection={{true}}
+        @closeSearchMenu={{@closeSearchMenu}}
+        @searchTermChanged={{@searchTermChanged}}
+        @suggestionKeyword={{@suggestionKeyword}}
+      />
+    {{/each}}
+  {{else if (eq this.suggestionType "categoryOrTag")}}
+    {{#each @results as |result|}}
+      {{#if result.model}}
+        <SearchMenu::Results::AssistantItem
+          @category={{result.model}}
+          @slug={{get this.fullSlugForCategoryMap result.model.id}}
+          @withInLabel={{@withInLabel}}
+          @closeSearchMenu={{@closeSearchMenu}}
+          @searchTermChanged={{@searchTermChanged}}
+          @suggestionKeyword={{@suggestionKeyword}}
+        />
+      {{else}}
+        <SearchMenu::Results::AssistantItem
+          @tag={{result.name}}
+          @slug={{concat this.prefix "#" result.name}}
+          @withInLabel={{@withInLabel}}
+          @closeSearchMenu={{@closeSearchMenu}}
+          @searchTermChanged={{@searchTermChanged}}
+          @suggestionKeyword={{@suggestionKeyword}}
+        />
+      {{/if}}
+    {{/each}}
+  {{else if (eq this.suggestionType "user")}}
+    {{#if this.userMatchesInTopic}}
+      <SearchMenu::Results::AssistantItem
+        @extraHint={{true}}
+        @user={{this.user}}
+        @slug={{concat this.prefix "@" this.user.username}}
+        @suffix={{i18n "search.in_topics_posts"}}
+        @closeSearchMenu={{@closeSearchMenu}}
+        @searchTermChanged={{@searchTermChanged}}
+        @suggestionKeyword={{@suggestionKeyword}}
+      />
+
+      <SearchMenu::Results::AssistantItem
+        @user={{this.user}}
+        @slug={{concat this.prefix "@" this.user.username}}
+        @suffix={{i18n "search.in_this_topic"}}
+        @closeSearchMenu={{@closeSearchMenu}}
+        @searchTermChanged={{@searchTermChanged}}
+        @suggestionKeyword={{@suggestionKeyword}}
+      />
+    {{else}}
+      {{#each @results as |result|}}
+        <SearchMenu::Results::AssistantItem
+          @user={{result}}
+          @slug={{concat this.prefix "@" result.username}}
+          @closeSearchMenu={{@closeSearchMenu}}
+          @searchTermChanged={{@searchTermChanged}}
+          @suggestionKeyword={{@suggestionKeyword}}
+        />
+      {{/each}}
+    {{/if}}
+  {{else}}
+    {{#each this.suggestionShortcuts as |item|}}
+      <SearchMenu::Results::AssistantItem
+        @slug={{concat this.prefix item}}
+        @label={{item}}
+        @closeSearchMenu={{@closeSearchMenu}}
+        @searchTermChanged={{@searchTermChanged}}
+        @suggestionKeyword={{@suggestionKeyword}}
+      />
+    {{/each}}
+  {{/if}}
+</ul>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/results/assistant.js b/app/assets/javascripts/discourse/app/components/search-menu/results/assistant.js
new file mode 100644
index 00000000000..4421706af87
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-menu/results/assistant.js
@@ -0,0 +1,128 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+
+const suggestionShortcuts = [
+  "in:title",
+  "in:pinned",
+  "status:open",
+  "status:closed",
+  "status:public",
+  "status:noreplies",
+  "order:latest",
+  "order:views",
+  "order:likes",
+  "order:latest_topic",
+];
+
+const SUGGESTION_KEYWORD_MAP = {
+  "+": "tagIntersection",
+  "#": "categoryOrTag",
+  "@": "user",
+};
+
+export default class Assistant extends Component {
+  @service router;
+  @service currentUser;
+  @service siteSettings;
+  @service search;
+
+  constructor() {
+    super(...arguments);
+
+    if (this.currentUser) {
+      addSearchSuggestion("in:likes");
+      addSearchSuggestion("in:bookmarks");
+      addSearchSuggestion("in:mine");
+      addSearchSuggestion("in:messages");
+      addSearchSuggestion("in:seen");
+      addSearchSuggestion("in:tracking");
+      addSearchSuggestion("in:unseen");
+      addSearchSuggestion("in:watching");
+    }
+
+    if (this.siteSettings.tagging_enabled) {
+      addSearchSuggestion("in:tagged");
+      addSearchSuggestion("in:untagged");
+    }
+  }
+
+  get suggestionShortcuts() {
+    const shortcut = this.search.activeGlobalSearchTerm.split(" ").slice(-1);
+    const suggestions = suggestionShortcuts.filter((suggestion) =>
+      suggestion.includes(shortcut)
+    );
+    return suggestions.slice(0, 8);
+  }
+
+  get userMatchesInTopic() {
+    return (
+      this.args.results.length === 1 &&
+      this.router.currentRouteName.startsWith("topic.")
+    );
+  }
+
+  get suggestionType() {
+    switch (this.args.suggestionKeyword) {
+      case "+":
+        return SUGGESTION_KEYWORD_MAP[this.args.suggestionKeyword];
+      case "#":
+        return SUGGESTION_KEYWORD_MAP[this.args.suggestionKeyword];
+      case "@":
+        return SUGGESTION_KEYWORD_MAP[this.args.suggestionKeyword];
+    }
+  }
+
+  get prefix() {
+    let prefix = "";
+    if (this.args.suggestionKeyword !== "+") {
+      prefix =
+        this.args.slug?.split(this.args.suggestionKeyword)[0].trim() || "";
+      if (prefix.length) {
+        prefix = `${prefix} `;
+      }
+    } else {
+      this.args.results.forEach((result) => {
+        if (result.additionalTags) {
+          prefix =
+            this.args.slug?.split(" ").slice(0, -1).join(" ").trim() || "";
+        } else {
+          prefix = this.args.slug?.split("#")[0].trim() || "";
+        }
+        if (prefix.length) {
+          prefix = `${prefix} `;
+        }
+      });
+    }
+    return prefix;
+  }
+
+  // For all results that are a category we need to assign
+  // a 'fullSlug' for each object. It would place too much logic
+  // to do this on the fly within the view so instead we build
+  // a 'fullSlugForCategoryMap' which we can then
+  // access in the view by 'category.id'
+  get fullSlugForCategoryMap() {
+    const categoryMap = {};
+    this.args.results.forEach((result) => {
+      if (result.model) {
+        const fullSlug = result.model.parentCategory
+          ? `#${result.model.parentCategory.slug}:${result.model.slug}`
+          : `#${result.model.slug}`;
+        categoryMap[result.model.id] = `${this.prefix}${fullSlug}`;
+      }
+    });
+    return categoryMap;
+  }
+
+  get user() {
+    // when only one user matches while in topic
+    // quick suggest user search in the topic or globally
+    return this.args.results[0];
+  }
+}
+
+export function addSearchSuggestion(value) {
+  if (!suggestionShortcuts.includes(value)) {
+    suggestionShortcuts.push(value);
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/results/blurb.hbs b/app/assets/javascripts/discourse/app/components/search-menu/results/blurb.hbs
new file mode 100644
index 00000000000..31f6a9f2420
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-menu/results/blurb.hbs
@@ -0,0 +1,11 @@
+<span class="blurb">
+  {{format-age @result.created_at}}
+  <span> - </span>
+  {{#if this.siteSettings.use_pg_headlines_for_excerpt}}
+    <span>{{@result.blurb}}</span>
+  {{else}}
+    <span>
+      <SearchMenu::HighlightedSearch @string={{@result.blurb}} />
+    </span>
+  {{/if}}
+</span>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/results/blurb.js b/app/assets/javascripts/discourse/app/components/search-menu/results/blurb.js
new file mode 100644
index 00000000000..5e0c15590ca
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-menu/results/blurb.js
@@ -0,0 +1,7 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+
+export default class Blurb extends Component {
+  @service siteSettings;
+  @service site;
+}
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/results/initial-options.hbs b/app/assets/javascripts/discourse/app/components/search-menu/results/initial-options.hbs
new file mode 100644
index 00000000000..c11db9d02f2
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-menu/results/initial-options.hbs
@@ -0,0 +1,46 @@
+<ul class="search-menu-initial-options">
+  {{#if this.termMatchesContextTypeKeyword}}
+    <SearchMenu::Results::AssistantItem
+      @slug={{this.slug}}
+      @extraHint={{true}}
+      @closeSearchMenu={{@closeSearchMenu}}
+      @searchTermChanged={{@searchTermChanged}}
+      @suggestionKeyword={{this.contextTypeKeyword}}
+    />
+  {{else}}
+    {{#if (or this.search.activeGlobalSearchTerm this.search.searchContext)}}
+      {{#if this.search.activeGlobalSearchTerm}}
+        <SearchMenu::Results::AssistantItem
+          @suffix={{i18n "search.in_topics_posts"}}
+          @closeSearchMenu={{@closeSearchMenu}}
+          @searchAllTopics={{true}}
+          @extraHint={{true}}
+          @searchTermChanged={{@searchTermChanged}}
+          @suggestionKeyword={{this.contextTypeKeyword}}
+        />
+      {{/if}}
+
+      {{#if this.search.searchContext}}
+        <this.contextTypeComponent
+          @slug={{this.slug}}
+          @suggestionKeyword={{this.contextTypeKeyword}}
+          @results={{this.initialResults}}
+          @withInLabel={{this.withInLabel}}
+          @suffix={{this.suffix}}
+          @label={{this.label}}
+          @closeSearchMenu={{@closeSearchMenu}}
+          @searchTermChanged={{@searchTermChanged}}
+        />
+      {{/if}}
+    {{else}}
+      <SearchMenu::Results::RandomQuickTip />
+
+      {{#if (and this.currentUser this.siteSettings.log_search_queries)}}
+        <SearchMenu::Results::RecentSearches
+          @closeSearchMenu={{@closeSearchMenu}}
+          @searchTermChanged={{@searchTermChanged}}
+        />
+      {{/if}}
+    {{/if}}
+  {{/if}}
+</ul>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/results/initial-options.js b/app/assets/javascripts/discourse/app/components/search-menu/results/initial-options.js
new file mode 100644
index 00000000000..5c13732ae22
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-menu/results/initial-options.js
@@ -0,0 +1,128 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+import { MODIFIER_REGEXP } from "discourse/components/search-menu";
+import AssistantItem from "./assistant-item";
+import Assistant from "./assistant";
+import I18n from "I18n";
+
+const SEARCH_CONTEXT_TYPE_COMPONENTS = {
+  topic: AssistantItem,
+  private_messages: AssistantItem,
+  category: Assistant,
+  tag: Assistant,
+  tagIntersection: Assistant,
+  user: AssistantItem,
+};
+
+export default class InitialOptions extends Component {
+  @service search;
+  @service siteSettings;
+  @service currentUser;
+
+  constructor() {
+    super(...arguments);
+
+    if (this.search.activeGlobalSearchTerm || this.search.searchContext) {
+      if (this.search.searchContext) {
+        // set the component we will be using to display results
+        this.contextTypeComponent =
+          SEARCH_CONTEXT_TYPE_COMPONENTS[this.search.searchContext.type];
+        // set attributes for the component
+        this.attributesForSearchContextType(this.search.searchContext.type);
+      }
+    }
+  }
+
+  get termMatchesContextTypeKeyword() {
+    return this.search.activeGlobalSearchTerm?.match(MODIFIER_REGEXP)
+      ? true
+      : false;
+  }
+
+  attributesForSearchContextType(type) {
+    switch (type) {
+      case "topic":
+        this.topicContextType();
+        break;
+      case "private_messages":
+        this.privateMessageContextType();
+        break;
+      case "category":
+        this.categoryContextType();
+        break;
+      case "tag":
+        this.tagContextType();
+        break;
+      case "tagIntersection":
+        this.tagIntersectionContextType();
+        break;
+      case "user":
+        this.userContextType();
+        break;
+    }
+  }
+
+  topicContextType() {
+    this.suffix = I18n.t("search.in_this_topic");
+  }
+
+  privateMessageContextType() {
+    this.slug = "in:messages";
+    this.label = "in:messages";
+  }
+
+  categoryContextType() {
+    const searchContextCategory = this.search.searchContext.category;
+    const fullSlug = searchContextCategory.parentCategory
+      ? `#${searchContextCategory.parentCategory.slug}:${searchContextCategory.slug}`
+      : `#${searchContextCategory.slug}`;
+
+    this.slug = fullSlug;
+    this.contextTypeKeyword = "#";
+    this.initialResults = [{ model: this.search.searchContext.category }];
+    this.withInLabel = true;
+  }
+
+  tagContextType() {
+    this.slug = `#${this.search.searchContext.name}`;
+    this.contextTypeKeyword = "#";
+    this.initialResults = [{ name: this.search.searchContext.name }];
+    this.withInLabel = true;
+  }
+
+  tagIntersectionContextType() {
+    const searchContext = this.search.searchContext;
+
+    let tagTerm;
+    if (searchContext.additionalTags) {
+      const tags = [searchContext.tagId, ...searchContext.additionalTags];
+      tagTerm = `tags:${tags.join("+")}`;
+    } else {
+      tagTerm = `#${searchContext.tagId}`;
+    }
+    let suggestionOptions = {
+      tagName: searchContext.tagId,
+      additionalTags: searchContext.additionalTags,
+    };
+    if (searchContext.category) {
+      const categorySlug = searchContext.category.parentCategory
+        ? `#${searchContext.category.parentCategory.slug}:${searchContext.category.slug}`
+        : `#${searchContext.category.slug}`;
+      suggestionOptions.categoryName = categorySlug;
+      suggestionOptions.category = searchContext.category;
+      tagTerm = tagTerm + ` ${categorySlug}`;
+    }
+
+    this.slug = tagTerm;
+    this.contextTypeKeyword = "+";
+    this.initialResults = [suggestionOptions];
+    this.withInLabel = true;
+  }
+
+  userContextType() {
+    this.slug = `@${this.search.searchContext.user.username}`;
+    this.suffix = I18n.t("search.in_posts_by", {
+      username: this.search.searchContext.user.username,
+    });
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/results/more-link.hbs b/app/assets/javascripts/discourse/app/components/search-menu/results/more-link.hbs
new file mode 100644
index 00000000000..a035c876406
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-menu/results/more-link.hbs
@@ -0,0 +1,17 @@
+{{#if this.topicResults}}
+  {{! template-lint-disable no-invalid-interactive }}
+  <div class="search-menu__show-more" {{on "keyup" this.onKeyup}}>
+    {{#if this.moreUrl}}
+      <a href={{this.moreUrl}} class="filter search-link">
+        {{i18n "more"}}...
+      </a>
+    {{else if this.topicResults.more}}
+      <a
+        {{on "click" (fn this.moreOfType this.topicResults.type)}}
+        class="filter search-link"
+      >
+        {{i18n "more"}}...
+      </a>
+    {{/if}}
+  </div>
+{{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/results/more-link.js b/app/assets/javascripts/discourse/app/components/search-menu/results/more-link.js
new file mode 100644
index 00000000000..994c1a946ef
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-menu/results/more-link.js
@@ -0,0 +1,37 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+import { focusSearchButton } from "discourse/components/search-menu";
+
+export default class MoreLink extends Component {
+  @service search;
+
+  get topicResults() {
+    const topicResults = this.args.resultTypes.filter(
+      (resultType) => resultType.type === "topic"
+    );
+    return topicResults[0];
+  }
+
+  get moreUrl() {
+    return this.topicResults.moreUrl && this.topicResults.moreUrl();
+  }
+
+  @action
+  moreOfType(type) {
+    this.args.updateTypeFilter(type);
+    this.args.triggerSearch();
+  }
+
+  @action
+  onKeyup(e) {
+    if (e.key === "Escape") {
+      focusSearchButton();
+      this.args.closeSearchMenu();
+      e.preventDefault();
+      return false;
+    }
+
+    this.search.handleArrowUpOrDown(e);
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/results/random-quick-tip.hbs b/app/assets/javascripts/discourse/app/components/search-menu/results/random-quick-tip.hbs
new file mode 100644
index 00000000000..2a605efe836
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-menu/results/random-quick-tip.hbs
@@ -0,0 +1,16 @@
+<li class="search-random-quick-tip">
+  <span
+    class={{concat-class
+      "tip-label"
+      (if this.randomTip.clickable "tip-clickable")
+    }}
+    role="button"
+    {{on "click" this.tipSelected}}
+  >
+    {{this.randomTip.label}}
+  </span>
+
+  <span class="tip-description">
+    {{this.randomTip.description}}
+  </span>
+</li>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/results/random-quick-tip.js b/app/assets/javascripts/discourse/app/components/search-menu/results/random-quick-tip.js
new file mode 100644
index 00000000000..8f0cf9eb258
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-menu/results/random-quick-tip.js
@@ -0,0 +1,70 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+import I18n from "I18n";
+import { focusSearchInput } from "discourse/components/search-menu";
+
+const DEFAULT_QUICK_TIPS = [
+  {
+    label: "#",
+    description: I18n.t("search.tips.category_tag"),
+    clickable: true,
+  },
+  {
+    label: "@",
+    description: I18n.t("search.tips.author"),
+    clickable: true,
+  },
+  {
+    label: "in:",
+    description: I18n.t("search.tips.in"),
+    clickable: true,
+  },
+  {
+    label: "status:",
+    description: I18n.t("search.tips.status"),
+    clickable: true,
+  },
+  {
+    label: I18n.t("search.tips.full_search_key", { modifier: "Ctrl" }),
+    description: I18n.t("search.tips.full_search"),
+  },
+  {
+    label: "@me",
+    description: I18n.t("search.tips.me"),
+  },
+];
+
+let QUICK_TIPS = [];
+
+export function addQuickSearchRandomTip(tip) {
+  if (!QUICK_TIPS.includes(tip)) {
+    QUICK_TIPS.push(tip);
+  }
+}
+
+export function resetQuickSearchRandomTips() {
+  QUICK_TIPS = [].concat(DEFAULT_QUICK_TIPS);
+}
+
+resetQuickSearchRandomTips();
+
+export default class RandomQuickTip extends Component {
+  @service search;
+
+  constructor() {
+    super(...arguments);
+    this.randomTip = QUICK_TIPS[Math.floor(Math.random() * QUICK_TIPS.length)];
+  }
+
+  @action
+  tipSelected(e) {
+    if (e.target.classList.contains("tip-clickable")) {
+      this.search.activeGlobalSearchTerm = this.randomTip.label;
+      focusSearchInput();
+
+      e.stopPropagation();
+      e.preventDefault();
+    }
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/results/recent-searches.hbs b/app/assets/javascripts/discourse/app/components/search-menu/results/recent-searches.hbs
new file mode 100644
index 00000000000..158183b3b33
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-menu/results/recent-searches.hbs
@@ -0,0 +1,23 @@
+{{#if this.currentUser.recent_searches}}
+  <div class="search-menu-recent">
+    <div class="heading">
+      <h4>{{i18n "search.recent"}}</h4>
+      <FlatButton
+        @title="search.clear_recent"
+        @icon="times"
+        @action={{this.clearRecent}}
+        @class="clear-recent-searches"
+      />
+    </div>
+
+    {{#each this.currentUser.recent_searches as |slug|}}
+      <SearchMenu::Results::AssistantItem
+        @icon="history"
+        @label={{slug}}
+        @slug={{slug}}
+        @closeSearchMenu={{@closeSearchMenu}}
+        @searchTermChanged={{@searchTermChanged}}
+      />
+    {{/each}}
+  </div>
+{{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/results/recent-searches.js b/app/assets/javascripts/discourse/app/components/search-menu/results/recent-searches.js
new file mode 100644
index 00000000000..2f5c77407b8
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-menu/results/recent-searches.js
@@ -0,0 +1,51 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+import User from "discourse/models/user";
+import { action } from "@ember/object";
+import { focusSearchButton } from "discourse/components/search-menu";
+
+export default class RecentSearches extends Component {
+  @service currentUser;
+  @service siteSettings;
+
+  constructor() {
+    super(...arguments);
+
+    if (
+      this.currentUser &&
+      this.siteSettings.log_search_queries &&
+      !this.currentUser.recent_searches?.length
+    ) {
+      this.loadRecentSearches();
+    }
+  }
+
+  @action
+  clearRecent() {
+    return User.resetRecentSearches().then((result) => {
+      if (result.success) {
+        this.currentUser.recent_searches.clear();
+      }
+    });
+  }
+
+  @action
+  onKeyup(e) {
+    if (e.key === "Escape") {
+      focusSearchButton();
+      this.args.closeSearchMenu();
+      e.preventDefault();
+      return false;
+    }
+
+    this.search.handleArrowUpOrDown(e);
+  }
+
+  loadRecentSearches() {
+    User.loadRecentSearches().then((result) => {
+      if (result.success && result.recent_searches?.length) {
+        this.currentUser.set("recent_searches", result.recent_searches);
+      }
+    });
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/results/type/category.hbs b/app/assets/javascripts/discourse/app/components/search-menu/results/type/category.hbs
new file mode 100644
index 00000000000..64b312acfc5
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-menu/results/type/category.hbs
@@ -0,0 +1 @@
+{{category-link @result link=false allowUncategorized=true}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/results/type/group.hbs b/app/assets/javascripts/discourse/app/components/search-menu/results/type/group.hbs
new file mode 100644
index 00000000000..e552d6926b5
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-menu/results/type/group.hbs
@@ -0,0 +1,19 @@
+<div class="group-result">
+  {{#if @result.flairUrl}}
+    <AvatarFlair
+      @flairName={{@result.name}}
+      @flairUrl={{@result.flairUrl}}
+      @flairBgColor={{@result.flairBgColor}}
+      @flairColor={{@result.flairColor}}
+    />
+  {{else}}
+    {{d-icon "users"}}
+  {{/if}}
+  <div class="group-names">
+    <span class="name">{{or @result.fullName @result.name}}</span>
+    {{! show the name of the group if we also show the full name }}
+    {{#if @result.fullName}}
+      <div class="slug">{{@result.name}}</div>
+    {{/if}}
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/results/type/post.hbs b/app/assets/javascripts/discourse/app/components/search-menu/results/type/post.hbs
new file mode 100644
index 00000000000..b96d53e4090
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-menu/results/type/post.hbs
@@ -0,0 +1,2 @@
+{{i18n "search.post_format" @result}}
+<SearchMenu::Results::Blurb @result={{@result}} />
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/results/type/tag.hbs b/app/assets/javascripts/discourse/app/components/search-menu/results/type/tag.hbs
new file mode 100644
index 00000000000..6d5c636b5f1
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-menu/results/type/tag.hbs
@@ -0,0 +1,2 @@
+{{d-icon "tag"}}
+{{discourse-tag (or @result.id @result) tagName="span"}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/results/type/topic.hbs b/app/assets/javascripts/discourse/app/components/search-menu/results/type/topic.hbs
new file mode 100644
index 00000000000..1038c134d66
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-menu/results/type/topic.hbs
@@ -0,0 +1,24 @@
+<span class="topic">
+  <span class="first-line">
+    <TopicStatus @topic={{@result.topic}} @disableActions={{true}} />
+    <span class="topic-title" data-topic-id={{@result.topic.id}}>
+      {{#if
+        (and
+          this.siteSettings.use_pg_headlines_for_excerpt
+          @result.topic_title_headline
+        )
+      }}
+        <span>{{replace-emoji @result.topic_title_headline}}</span>
+      {{else}}
+        <SearchMenu::HighlightedSearch @string={{@result.topic.fancyTitle}} />
+      {{/if}}
+    </span>
+  </span>
+  <span class="second-line">
+    {{category-link @result.topic.category link=false}}
+    {{#if this.siteSettings.tagging_enabled}}
+      {{discourse-tags @result.topic tagName="span"}}
+    {{/if}}
+  </span>
+</span>
+<SearchMenu::Results::Blurb @result={{@result}} />
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/results/type/topic.js b/app/assets/javascripts/discourse/app/components/search-menu/results/type/topic.js
new file mode 100644
index 00000000000..52a77b67a88
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-menu/results/type/topic.js
@@ -0,0 +1,6 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+
+export default class Results extends Component {
+  @service siteSettings;
+}
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/results/type/user.hbs b/app/assets/javascripts/discourse/app/components/search-menu/results/type/user.hbs
new file mode 100644
index 00000000000..da530613341
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-menu/results/type/user.hbs
@@ -0,0 +1,14 @@
+{{avatar
+  @result
+  imageSize="small"
+  template=@result.avatar_template
+  username=@result.username
+}}
+<span class="username">
+  {{format-username @result.username}}
+</span>
+{{#if @result.custom_data}}
+  {{#each @result.custom_data as |row|}}
+    <span class="custom-field">{{row.name}}: {{row.value}}</span>
+  {{/each}}
+{{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/results/types.hbs b/app/assets/javascripts/discourse/app/components/search-menu/results/types.hbs
new file mode 100644
index 00000000000..4e1058ec212
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-menu/results/types.hbs
@@ -0,0 +1,18 @@
+{{#each this.filteredResultTypes as |resultType|}}
+  <div class={{resultType.componentName}}>
+    <ul
+      class="list"
+      aria-label={{concat (i18n "search.results") " " resultType.type}}
+    >
+      {{#each resultType.results as |result|}}
+        {{! template-lint-disable no-pointer-down-event-binding }}
+        {{! template-lint-disable no-invalid-interactive }}
+        <li class="item" {{on "keydown" this.onKeydown}}>
+          <a href={{(or result.url result.path)}} class="search-link">
+            <resultType.component @result={{result}} />
+          </a>
+        </li>
+      {{/each}}
+    </ul>
+  </div>
+{{/each}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/results/types.js b/app/assets/javascripts/discourse/app/components/search-menu/results/types.js
new file mode 100644
index 00000000000..6f53640045e
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-menu/results/types.js
@@ -0,0 +1,35 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+import { focusSearchButton } from "discourse/components/search-menu";
+
+export default class Types extends Component {
+  @service search;
+
+  get filteredResultTypes() {
+    // return only topic result types
+    if (this.args.topicResultsOnly) {
+      return this.args.resultTypes.filter(
+        (resultType) => resultType.type === "topic"
+      );
+    }
+
+    // return all result types minus topics
+    return this.args.resultTypes.filter(
+      (resultType) => resultType.type !== "topic"
+    );
+  }
+
+  @action
+  onKeydown(e) {
+    if (e.key === "Escape") {
+      focusSearchButton();
+      this.args.closeSearchMenu();
+      e.preventDefault();
+      return false;
+    }
+
+    this.search.handleResultInsertion(e);
+    this.search.handleArrowUpOrDown(e);
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/search-term.hbs b/app/assets/javascripts/discourse/app/components/search-menu/search-term.hbs
new file mode 100644
index 00000000000..a00a0dd1e8a
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-menu/search-term.hbs
@@ -0,0 +1,11 @@
+<input
+  id={{this.inputId}}
+  type="text"
+  autocomplete="off"
+  value={{this.search.activeGlobalSearchTerm}}
+  placeholder={{i18n "search.title"}}
+  aria-label={{i18n "search.title"}}
+  {{on "keyup" this.onKeyup}}
+  {{on "input" this.updateSearchTerm}}
+  {{did-insert this.focus}}
+/>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/search-term.js b/app/assets/javascripts/discourse/app/components/search-menu/search-term.js
new file mode 100644
index 00000000000..c072f768ab1
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/search-menu/search-term.js
@@ -0,0 +1,89 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import { tracked } from "@glimmer/tracking";
+import { isiPad } from "discourse/lib/utilities";
+import { inject as service } from "@ember/service";
+import {
+  DEFAULT_TYPE_FILTER,
+  SEARCH_INPUT_ID,
+  focusSearchButton,
+} from "discourse/components/search-menu";
+
+const SECOND_ENTER_MAX_DELAY = 15000;
+
+export default class SearchTerm extends Component {
+  @service search;
+  @service appEvents;
+
+  @tracked lastEnterTimestamp = null;
+
+  // make constant available in template
+  get inputId() {
+    return SEARCH_INPUT_ID;
+  }
+
+  @action
+  updateSearchTerm(input) {
+    this.parseAndUpdateSearchTerm(
+      this.search.activeGlobalSearchTerm,
+      input.target.value
+    );
+  }
+
+  @action
+  focus(element) {
+    element.focus();
+    element.select();
+  }
+
+  @action
+  onKeyup(e) {
+    if (e.key === "Escape") {
+      focusSearchButton();
+      this.args.closeSearchMenu();
+      e.preventDefault();
+      return false;
+    }
+
+    this.search.handleArrowUpOrDown(e);
+
+    if (e.key === "Enter") {
+      const recentEnterHit =
+        this.lastEnterTimestamp &&
+        Date.now() - this.lastEnterTimestamp < SECOND_ENTER_MAX_DELAY;
+
+      // same combination as key-enter-escape mixin
+      if (
+        e.ctrlKey ||
+        e.metaKey ||
+        (isiPad() && e.altKey) ||
+        (this.args.typeFilter !== DEFAULT_TYPE_FILTER && recentEnterHit)
+      ) {
+        this.args.fullSearch();
+        this.args.closeSearchMenu();
+      } else {
+        this.args.updateTypeFilter(null);
+        this.args.triggerSearch();
+      }
+      this.lastEnterTimestamp = Date.now();
+    }
+
+    if (e.key === "Backspace") {
+      if (!e.target.value) {
+        this.args.clearTopicContext();
+        this.args.clearPMInboxContext();
+        this.focus(e.target);
+      }
+    }
+
+    e.preventDefault();
+  }
+
+  parseAndUpdateSearchTerm(originalVal, newVal) {
+    // remove zero-width chars
+    const parsedVal = newVal.replace(/[\u200B-\u200D\uFEFF]/, "");
+    if (parsedVal !== originalVal) {
+      this.args.searchTermChanged(parsedVal);
+    }
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/templates/components/search-result-entries.hbs b/app/assets/javascripts/discourse/app/components/search-result-entries.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/search-result-entries.hbs
rename to app/assets/javascripts/discourse/app/components/search-result-entries.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/search-result-entry.hbs b/app/assets/javascripts/discourse/app/components/search-result-entry.hbs
similarity index 91%
rename from app/assets/javascripts/discourse/app/templates/components/search-result-entry.hbs
rename to app/assets/javascripts/discourse/app/components/search-result-entry.hbs
index 9be5b4dfcd4..2592d6f32d9 100644
--- a/app/assets/javascripts/discourse/app/templates/components/search-result-entry.hbs
+++ b/app/assets/javascripts/discourse/app/components/search-result-entry.hbs
@@ -41,12 +41,13 @@
       {{#if this.post.topic}}
         {{discourse-tags this.post.topic}}
       {{/if}}
-      <PluginOutlet
-        @name="full-page-search-category"
-        @tagName="span"
-        @connectorTagName="div"
-        @args={{hash post=this.post}}
-      />
+      <span>
+        <PluginOutlet
+          @name="full-page-search-category"
+          @connectorTagName="div"
+          @outletArgs={{hash post=this.post}}
+        />
+      </span>
     </div>
   </div>
 
diff --git a/app/assets/javascripts/discourse/app/templates/components/second-factor-form.hbs b/app/assets/javascripts/discourse/app/components/second-factor-form.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/second-factor-form.hbs
rename to app/assets/javascripts/discourse/app/components/second-factor-form.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/second-factor-input.hbs b/app/assets/javascripts/discourse/app/components/second-factor-input.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/second-factor-input.hbs
rename to app/assets/javascripts/discourse/app/components/second-factor-input.hbs
diff --git a/app/assets/javascripts/discourse/app/components/security-key-dropdown.js b/app/assets/javascripts/discourse/app/components/security-key-dropdown.js
new file mode 100644
index 00000000000..847317bf53f
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/security-key-dropdown.js
@@ -0,0 +1,43 @@
+import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
+import I18n from "I18n";
+import { computed } from "@ember/object";
+
+export default DropdownSelectBoxComponent.extend({
+  classNames: ["security-key-dropdown"],
+
+  selectKitOptions: {
+    icon: "wrench",
+    showFullTitle: false,
+  },
+
+  content: computed(function () {
+    const content = [];
+
+    content.push({
+      id: "edit",
+      icon: "pencil-alt",
+      name: I18n.t("user.second_factor.edit"),
+    });
+
+    content.push({
+      id: "disable",
+      icon: "trash-alt",
+      name: I18n.t("user.second_factor.disable"),
+    });
+
+    return content;
+  }),
+
+  actions: {
+    onChange(id) {
+      switch (id) {
+        case "edit":
+          this.editSecurityKey(this.securityKey);
+          break;
+        case "disable":
+          this.disableSingleSecondFactor(this.securityKey);
+          break;
+      }
+    },
+  },
+});
diff --git a/app/assets/javascripts/discourse/app/templates/components/security-key-form.hbs b/app/assets/javascripts/discourse/app/components/security-key-form.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/security-key-form.hbs
rename to app/assets/javascripts/discourse/app/components/security-key-form.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/selected-posts.hbs b/app/assets/javascripts/discourse/app/components/selected-posts.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/selected-posts.hbs
rename to app/assets/javascripts/discourse/app/components/selected-posts.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/share-panel.hbs b/app/assets/javascripts/discourse/app/components/share-panel.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/share-panel.hbs
rename to app/assets/javascripts/discourse/app/components/share-panel.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/share-source.hbs b/app/assets/javascripts/discourse/app/components/share-source.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/share-source.hbs
rename to app/assets/javascripts/discourse/app/components/share-source.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/shared-draft-controls.hbs b/app/assets/javascripts/discourse/app/components/shared-draft-controls.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/shared-draft-controls.hbs
rename to app/assets/javascripts/discourse/app/components/shared-draft-controls.hbs
diff --git a/app/assets/javascripts/discourse/app/components/sidebar.hbs b/app/assets/javascripts/discourse/app/components/sidebar.hbs
index 8ed675f33b6..b3277988731 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar.hbs
@@ -1,12 +1,24 @@
-<DSection
-  @pageClass="has-sidebar"
-  @id="d-sidebar"
-  @class="sidebar-container"
-  @scrollTop={{false}}
->
-  <Sidebar::Sections
-    @currentUser={{this.currentUser}}
-    @collapsableSections={{true}}
-  />
+<DSection @pageClass="has-sidebar" @id="d-sidebar" @class="sidebar-container">
+  {{#if this.showSwitchPanelButtonsOnTop}}
+    <Sidebar::SwitchPanelButtons @buttons={{this.switchPanelButtons}} />
+  {{/if}}
+
+  {{#if this.sidebarState.showMainPanel}}
+    <Sidebar::Sections
+      @currentUser={{this.currentUser}}
+      @collapsableSections={{true}}
+      @panel={{this.currentPanel}}
+    />
+  {{else}}
+    <Sidebar::ApiPanels
+      @currentUser={{this.currentUser}}
+      @collapsableSections={{true}}
+    />
+  {{/if}}
+
+  {{#unless this.showSwitchPanelButtonsOnTop}}
+    <Sidebar::SwitchPanelButtons @buttons={{this.switchPanelButtons}} />
+  {{/unless}}
+
   <Sidebar::Footer />
 </DSection>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/sidebar.js b/app/assets/javascripts/discourse/app/components/sidebar.js
index f4316c392a6..7b1ff574668 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar.js
+++ b/app/assets/javascripts/discourse/app/components/sidebar.js
@@ -5,7 +5,9 @@ import { inject as service } from "@ember/service";
 export default class Sidebar extends Component {
   @service appEvents;
   @service site;
+  @service siteSettings;
   @service currentUser;
+  @service sidebarState;
 
   constructor() {
     super(...arguments);
@@ -15,6 +17,24 @@ export default class Sidebar extends Component {
     }
   }
 
+  get showSwitchPanelButtonsOnTop() {
+    return this.siteSettings.default_sidebar_switch_panel_position === "top";
+  }
+
+  get switchPanelButtons() {
+    if (
+      this.sidebarState.combinedMode ||
+      this.sidebarState.panels.length === 1 ||
+      !this.currentUser
+    ) {
+      return [];
+    }
+
+    return this.sidebarState.panels.filter(
+      (panel) => panel !== this.sidebarState.currentPanel
+    );
+  }
+
   @bind
   collapseSidebar(event) {
     let shouldCollapseSidebar = false;
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/anonymous/categories-section.hbs b/app/assets/javascripts/discourse/app/components/sidebar/anonymous/categories-section.hbs
index 82853f2bd7b..e139fc9561c 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/anonymous/categories-section.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/anonymous/categories-section.hbs
@@ -6,7 +6,6 @@
 
   {{#each this.sectionLinks as |sectionLink|}}
     <Sidebar::SectionLink
-      @linkName={{sectionLink.name}}
       @route={{sectionLink.route}}
       @title={{sectionLink.title}}
       @content={{sectionLink.text}}
@@ -15,7 +14,7 @@
       @prefixType={{sectionLink.prefixType}}
       @prefixValue={{sectionLink.prefixValue}}
       @prefixColor={{sectionLink.prefixColor}}
-      @prefixElementColors={{sectionLink.prefixElementColors}}
+      data-category-id={{sectionLink.category.id}}
     />
   {{/each}}
 
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/anonymous/categories-section.js b/app/assets/javascripts/discourse/app/components/sidebar/anonymous/categories-section.js
index b1a2d849d26..0c548a796b5 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/anonymous/categories-section.js
+++ b/app/assets/javascripts/discourse/app/components/sidebar/anonymous/categories-section.js
@@ -1,4 +1,3 @@
-import { canDisplayCategory } from "discourse/lib/sidebar/helpers";
 import SidebarCommonCategoriesSection from "discourse/components/sidebar/common/categories-section";
 import Category from "discourse/models/category";
 
@@ -6,27 +5,20 @@ export default class SidebarAnonymousCategoriesSection extends SidebarCommonCate
   constructor() {
     super(...arguments);
 
-    if (!this.siteSettings.default_sidebar_categories) {
+    if (!this.siteSettings.default_navigation_menu_categories) {
       this.shouldSortCategoriesByDefault = false;
     }
   }
 
   get categories() {
-    if (this.siteSettings.default_sidebar_categories) {
+    if (this.siteSettings.default_navigation_menu_categories) {
       return Category.findByIds(
-        this.siteSettings.default_sidebar_categories
+        this.siteSettings.default_navigation_menu_categories
           .split("|")
           .map((categoryId) => parseInt(categoryId, 10))
       );
     } else {
-      return this.site.categoriesList
-        .filter((category) => {
-          return (
-            !category.parent_category_id &&
-            canDisplayCategory(category.id, this.siteSettings)
-          );
-        })
-        .slice(0, 5);
+      return this.topSiteCategories;
     }
   }
 }
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/anonymous/community-section.js b/app/assets/javascripts/discourse/app/components/sidebar/anonymous/community-section.js
deleted file mode 100644
index 30d47e5b03e..00000000000
--- a/app/assets/javascripts/discourse/app/components/sidebar/anonymous/community-section.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import SidebarCommonCommunitySection from "discourse/components/sidebar/common/community-section";
-import EverythingSectionLink from "discourse/lib/sidebar/common/community-section/everything-section-link";
-import AboutSectionLink from "discourse/lib/sidebar/common/community-section/about-section-link";
-import FAQSectionLink from "discourse/lib/sidebar/common/community-section/faq-section-link";
-import GroupsSectionLink from "discourse/lib/sidebar/common/community-section/groups-section-link";
-import UsersSectionLink from "discourse/lib/sidebar/common/community-section/users-section-link";
-import BadgesSectionLink from "discourse/lib/sidebar/common/community-section/badges-section-link";
-
-export default class SidebarAnonymousCommunitySection extends SidebarCommonCommunitySection {
-  get defaultMainSectionLinks() {
-    const defaultLinks = [
-      EverythingSectionLink,
-      UsersSectionLink,
-      FAQSectionLink,
-    ];
-
-    defaultLinks.splice(
-      this.displayShortSiteDescription ? 0 : 2,
-      0,
-      AboutSectionLink
-    );
-
-    return defaultLinks;
-  }
-
-  get displayShortSiteDescription() {
-    return (
-      !this.currentUser &&
-      (this.siteSettings.short_site_description || "").length > 0
-    );
-  }
-
-  get defaultMoreSectionLinks() {
-    return [GroupsSectionLink, BadgesSectionLink];
-  }
-}
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/anonymous/custom-sections.js b/app/assets/javascripts/discourse/app/components/sidebar/anonymous/custom-sections.js
new file mode 100644
index 00000000000..4726ec3ee5b
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/sidebar/anonymous/custom-sections.js
@@ -0,0 +1,5 @@
+import SidebarCustomSection from "discourse/components/sidebar/common/custom-sections";
+
+export default class SidebarAnonymousCustomSections extends SidebarCustomSection {
+  anonymous = true;
+}
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/anonymous/sections.hbs b/app/assets/javascripts/discourse/app/components/sidebar/anonymous/sections.hbs
index aee22d9ebbf..f757ca0c996 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/anonymous/sections.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/anonymous/sections.hbs
@@ -1,5 +1,5 @@
 <div class="sidebar-sections sidebar-sections-anonymous">
-  <Sidebar::Anonymous::CommunitySection @collapsable={{@collapsableSections}} />
+  <Sidebar::Anonymous::CustomSections @collapsable={{@collapsableSections}} />
   <Sidebar::Anonymous::CategoriesSection
     @collapsable={{@collapsableSections}}
   />
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/anonymous/tags-section.hbs b/app/assets/javascripts/discourse/app/components/sidebar/anonymous/tags-section.hbs
index 8f8da826570..95fb8b2d5d4 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/anonymous/tags-section.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/anonymous/tags-section.hbs
@@ -9,10 +9,13 @@
       <Sidebar::SectionLink
         @route={{sectionLink.route}}
         @content={{sectionLink.text}}
+        @title={{sectionLink.title}}
         @currentWhen={{sectionLink.currentWhen}}
         @prefixType={{sectionLink.prefixType}}
         @prefixValue={{sectionLink.prefixValue}}
+        @prefixColor={{sectionLink.prefixColor}}
         @models={{sectionLink.models}}
+        data-tag-name={{sectionLink.tagName}}
       />
     {{/each}}
 
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/anonymous/tags-section.js b/app/assets/javascripts/discourse/app/components/sidebar/anonymous/tags-section.js
index 3a3596ad520..e08538fa01b 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/anonymous/tags-section.js
+++ b/app/assets/javascripts/discourse/app/components/sidebar/anonymous/tags-section.js
@@ -1,6 +1,7 @@
-import { cached } from "@glimmer/tracking";
 import Component from "@glimmer/component";
+import { cached } from "@glimmer/tracking";
 import { inject as service } from "@ember/service";
+
 import TagSectionLink from "discourse/lib/sidebar/user/tags-section/tag-section-link";
 
 export default class SidebarAnonymousTagsSection extends Component {
@@ -10,23 +11,19 @@ export default class SidebarAnonymousTagsSection extends Component {
 
   get displaySection() {
     return (
-      this.site.anonymous_default_sidebar_tags?.length > 0 ||
-      this.site.top_tags?.length > 0
+      this.site.anonymous_default_navigation_menu_tags?.length > 0 ||
+      this.site.navigation_menu_site_top_tags?.length > 0
     );
   }
 
   @cached
   get sectionLinks() {
-    let tags;
-
-    if (this.site.anonymous_default_sidebar_tags) {
-      tags = this.site.anonymous_default_sidebar_tags;
-    } else {
-      tags = this.site.top_tags.slice(0, 5);
-    }
-    return tags.map((tagName) => {
+    return (
+      this.site.anonymous_default_navigation_menu_tags ||
+      this.site.navigation_menu_site_top_tags
+    ).map((tag) => {
       return new TagSectionLink({
-        tagName,
+        tag,
         topicTrackingState: this.topicTrackingState,
       });
     });
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/api-panels.hbs b/app/assets/javascripts/discourse/app/components/sidebar/api-panels.hbs
new file mode 100644
index 00000000000..a58561911d0
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/sidebar/api-panels.hbs
@@ -0,0 +1,3 @@
+<div class="sidebar-sections">
+  <Sidebar::ApiSections @collapsable={{@collapsableSections}} />
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/api-section.hbs b/app/assets/javascripts/discourse/app/components/sidebar/api-section.hbs
new file mode 100644
index 00000000000..acb73faa18a
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/sidebar/api-section.hbs
@@ -0,0 +1,44 @@
+<Sidebar::Section
+  @sectionName={{this.section.name}}
+  @headerLinkText={{this.section.text}}
+  @headerLinkTitle={{this.section.title}}
+  @headerActionsIcon={{this.section.actionsIcon}}
+  @headerActions={{this.section.actions}}
+  @willDestroy={{this.section.willDestroy}}
+  @collapsable={{@collapsable}}
+  @displaySection={{this.section.displaySection}}
+>
+
+  {{#each this.section.links as |link|}}
+    <Sidebar::SectionLink
+      @linkName={{link.name}}
+      @class={{link.classNames}}
+      @route={{link.route}}
+      @model={{link.model}}
+      @models={{link.models}}
+      @href={{link.href}}
+      @title={{link.title}}
+      @contentCSSClass={{link.contentCSSClass}}
+      @prefixColor={{link.prefixColor}}
+      @prefixBadge={{link.prefixBadge}}
+      @prefixType={{link.prefixType}}
+      @prefixValue={{link.prefixValue}}
+      @prefixCSSClass={{link.prefixCSSClass}}
+      @suffixType={{link.suffixType}}
+      @suffixValue={{link.suffixValue}}
+      @suffixCSSClass={{link.suffixCSSClass}}
+      @hoverType={{link.hoverType}}
+      @hoverValue={{link.hoverValue}}
+      @hoverAction={{link.hoverAction}}
+      @hoverTitle={{link.hoverTitle}}
+      @currentWhen={{link.currentWhen}}
+      @didInsert={{link.didInsert}}
+      @willDestroy={{link.willDestroy}}
+      @content={{link.text}}
+      @contentComponent={{component
+        link.contentComponent
+        status=link.contentComponentArgs
+      }}
+    />
+  {{/each}}
+</Sidebar::Section>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/api-section.js b/app/assets/javascripts/discourse/app/components/sidebar/api-section.js
new file mode 100644
index 00000000000..044a557e02b
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/sidebar/api-section.js
@@ -0,0 +1,10 @@
+import Component from "@glimmer/component";
+import { getOwner, setOwner } from "@ember/application";
+
+export default class SidebarApiSection extends Component {
+  constructor() {
+    super(...arguments);
+    this.section = new this.args.sectionConfig();
+    setOwner(this.section, getOwner(this));
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/api-sections.hbs b/app/assets/javascripts/discourse/app/components/sidebar/api-sections.hbs
new file mode 100644
index 00000000000..0661b23b432
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/sidebar/api-sections.hbs
@@ -0,0 +1,6 @@
+{{#each this.sections as |sectionConfig|}}
+  <Sidebar::ApiSection
+    @sectionConfig={{sectionConfig}}
+    @collapsable={{@collapsable}}
+  />
+{{/each}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/api-sections.js b/app/assets/javascripts/discourse/app/components/sidebar/api-sections.js
new file mode 100644
index 00000000000..e9ef60b5023
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/sidebar/api-sections.js
@@ -0,0 +1,14 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+
+export default class SidebarApiSections extends Component {
+  @service sidebarState;
+
+  get sections() {
+    if (this.sidebarState.combinedMode) {
+      return this.sidebarState.panels.map((panel) => panel.sections).flat();
+    } else {
+      return this.sidebarState.currentPanel.sections;
+    }
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/common/categories-section.js b/app/assets/javascripts/discourse/app/components/sidebar/common/categories-section.js
index 68c3e74b1ce..374f03f8b0a 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/common/categories-section.js
+++ b/app/assets/javascripts/discourse/app/components/sidebar/common/categories-section.js
@@ -6,6 +6,8 @@ import Category from "discourse/models/category";
 import CategorySectionLink from "discourse/lib/sidebar/user/categories-section/category-section-link";
 import { canDisplayCategory } from "discourse/lib/sidebar/helpers";
 
+export const TOP_SITE_CATEGORIES_TO_SHOW = 5;
+
 export default class SidebarCommonCategoriesSection extends Component {
   @service topicTrackingState;
   @service siteSettings;
@@ -20,15 +22,26 @@ export default class SidebarCommonCategoriesSection extends Component {
    */
   get categories() {}
 
+  get topSiteCategories() {
+    return this.site.categoriesList
+      .filter((category) => {
+        return (
+          !category.parent_category_id &&
+          canDisplayCategory(category.id, this.siteSettings)
+        );
+      })
+      .slice(0, TOP_SITE_CATEGORIES_TO_SHOW);
+  }
+
   get sortedCategories() {
     if (!this.shouldSortCategoriesByDefault) {
       return this.categories;
     }
 
-    let categories = this.site.categories;
+    let categories = [...this.site.categories];
 
     if (!this.siteSettings.fixed_category_positions) {
-      categories = categories.sort((a, b) => a.name.localeCompare(b.name));
+      categories.sort((a, b) => a.name.localeCompare(b.name));
     }
 
     const categoryIds = this.categories.map((category) => category.id);
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/common/community-section.hbs b/app/assets/javascripts/discourse/app/components/sidebar/common/community-section.hbs
deleted file mode 100644
index 0419787e963..00000000000
--- a/app/assets/javascripts/discourse/app/components/sidebar/common/community-section.hbs
+++ /dev/null
@@ -1,40 +0,0 @@
-<Sidebar::Section
-  @sectionName="community"
-  @headerLinkText={{i18n "sidebar.sections.community.header_link_text"}}
-  @headerActionsIcon={{this.headerActionsIcon}}
-  @headerActions={{this.headerActions}}
-  @collapsable={{@collapsable}}
->
-
-  {{#if this.displayShortSiteDescription}}
-    <Sidebar::SectionMessage>
-      {{this.siteSettings.short_site_description}}
-    </Sidebar::SectionMessage>
-  {{/if}}
-
-  {{#each this.sectionLinks as |sectionLink|}}
-    <Sidebar::SectionLink
-      @shouldDisplay={{sectionLink.shouldDisplay}}
-      @linkName={{sectionLink.name}}
-      @href={{sectionLink.href}}
-      @route={{sectionLink.route}}
-      @query={{sectionLink.query}}
-      @title={{sectionLink.title}}
-      @content={{sectionLink.text}}
-      @currentWhen={{sectionLink.currentWhen}}
-      @badgeText={{sectionLink.badgeText}}
-      @model={{sectionLink.model}}
-      @models={{sectionLink.models}}
-      @prefixType={{sectionLink.prefixType}}
-      @prefixValue={{sectionLink.prefixValue}}
-      @suffixCSSClass={{sectionLink.suffixCSSClass}}
-      @suffixValue={{sectionLink.suffixValue}}
-      @suffixType={{sectionLink.suffixType}}
-    />
-  {{/each}}
-
-  <Sidebar::MoreSectionLinks
-    @sectionLinks={{this.moreSectionLinks}}
-    @secondarySectionLinks={{this.moreSecondarySectionLinks}}
-  />
-</Sidebar::Section>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/common/community-section.js b/app/assets/javascripts/discourse/app/components/sidebar/common/community-section.js
deleted file mode 100644
index 3def2b04809..00000000000
--- a/app/assets/javascripts/discourse/app/components/sidebar/common/community-section.js
+++ /dev/null
@@ -1,96 +0,0 @@
-import Component from "@glimmer/component";
-import { inject as service } from "@ember/service";
-import { tracked } from "@glimmer/tracking";
-
-import {
-  customSectionLinks,
-  secondaryCustomSectionLinks,
-} from "discourse/lib/sidebar/custom-community-section-links";
-
-export default class SidebarCommunitySection extends Component {
-  @service router;
-  @service topicTrackingState;
-  @service currentUser;
-  @service appEvents;
-  @service siteSettings;
-
-  @tracked sectionLinks;
-  @tracked moreSectionLinks;
-  @tracked moreSecondarySectionLinks;
-
-  callbackId;
-  headerActionsIcon;
-  headerActions;
-
-  constructor() {
-    super(...arguments);
-
-    this.moreSectionLinks = this.#initializeSectionLinks(
-      [...this.defaultMoreSectionLinks, ...customSectionLinks],
-      { inMoreDrawer: true }
-    );
-
-    this.moreSecondarySectionLinks = this.#initializeSectionLinks(
-      [
-        ...this.defaultMoreSecondarySectionLinks,
-        ...secondaryCustomSectionLinks,
-      ],
-      { inMoreDrawer: true }
-    );
-
-    this.sectionLinks = this.#initializeSectionLinks(
-      this.defaultMainSectionLinks,
-      { inMoreDrawer: false }
-    );
-
-    this.callbackId = this.topicTrackingState.onStateChange(() => {
-      this.sectionLinks.forEach((sectionLink) => {
-        sectionLink.onTopicTrackingStateChange();
-      });
-    });
-  }
-
-  willDestroy() {
-    [
-      ...this.sectionLinks,
-      ...this.moreSectionLinks,
-      ...this.moreSecondarySectionLinks,
-    ].forEach((sectionLink) => {
-      sectionLink.teardown?.();
-    });
-
-    this.topicTrackingState.offStateChange(this.callbackId);
-  }
-
-  // Override in child
-  get defaultMainSectionLinks() {
-    return [];
-  }
-
-  // Override in child
-  get defaultMoreSectionLinks() {
-    return [];
-  }
-
-  // Override in child
-  get defaultMoreSecondarySectionLinks() {
-    return [];
-  }
-
-  #initializeSectionLinks(sectionLinkClasses, { inMoreDrawer } = {}) {
-    return sectionLinkClasses.map((sectionLinkClass) => {
-      return this.#initializeSectionLink(sectionLinkClass, inMoreDrawer);
-    });
-  }
-
-  #initializeSectionLink(sectionLinkClass, inMoreDrawer) {
-    return new sectionLinkClass({
-      topicTrackingState: this.topicTrackingState,
-      currentUser: this.currentUser,
-      appEvents: this.appEvents,
-      router: this.router,
-      siteSettings: this.siteSettings,
-      inMoreDrawer,
-    });
-  }
-}
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/common/custom-section.hbs b/app/assets/javascripts/discourse/app/components/sidebar/common/custom-section.hbs
new file mode 100644
index 00000000000..30e36c03454
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/sidebar/common/custom-section.hbs
@@ -0,0 +1,86 @@
+<Sidebar::Section
+  @sectionName={{this.section.slug}}
+  @headerLinkText={{this.section.decoratedTitle}}
+  @indicatePublic={{this.section.indicatePublic}}
+  @collapsable={{@collapsable}}
+  @headerActions={{this.section.headerActions}}
+  @headerActionsIcon={{this.section.headerActionIcon}}
+  @class={{this.section.dragCss}}
+  @hideSectionHeader={{this.section.hideSectionHeader}}
+>
+  {{#each this.section.links as |link|}}
+    {{#if link.externalOrFullReload}}
+      <Sidebar::SectionLink
+        @shouldDisplay={{link.shouldDisplay}}
+        @linkName={{link.name}}
+        @content={{replace-emoji link.text}}
+        @prefixType="icon"
+        @prefixValue={{link.prefixValue}}
+        @fullReload={{link.fullReload}}
+        @href={{link.value}}
+        @class={{link.linkDragCss}}
+        {{(if
+          this.section.reorderable
+          (modifier
+            "draggable"
+            didStartDrag=link.didStartDrag
+            didEndDrag=link.didEndDrag
+            dragMove=link.dragMove
+          )
+        )}}
+      />
+    {{else}}
+      <Sidebar::SectionLink
+        @shouldDisplay={{link.shouldDisplay}}
+        @href={{link.href}}
+        @title={{link.title}}
+        @linkName={{link.name}}
+        @route={{link.route}}
+        @model={{link.model}}
+        @models={{link.models}}
+        @query={{link.query}}
+        @content={{replace-emoji link.text}}
+        @badgeText={{link.badgeText}}
+        @prefixType="icon"
+        @prefixValue={{link.prefixValue}}
+        @suffixCSSClass={{link.suffixCSSClass}}
+        @suffixValue={{link.suffixValue}}
+        @suffixType={{link.suffixType}}
+        @currentWhen={{link.currentWhen}}
+        @class={{link.linkDragCss}}
+        {{(if
+          this.section.reorderable
+          (modifier
+            "draggable"
+            didStartDrag=link.didStartDrag
+            didEndDrag=link.didEndDrag
+            dragMove=link.dragMove
+          )
+        )}}
+      />
+    {{/if}}
+  {{/each}}
+
+  {{#if this.section.moreLinks}}
+    {{#if this.navigationMenu.isDesktopDropdownMode}}
+      {{#each this.section.moreLinks as |sectionLink|}}
+        <Sidebar::MoreSectionLink @sectionLink={{sectionLink}} />
+      {{/each}}
+
+      {{#if this.section.moreSectionButtonAction}}
+        <Sidebar::SectionLinkButton
+          @action={{this.section.moreSectionButtonAction}}
+          @icon={{this.section.moreSectionButtonIcon}}
+          @text={{this.section.moreSectionButtonText}}
+        />
+      {{/if}}
+    {{else if this.section.moreLinks}}
+      <Sidebar::MoreSectionLinks
+        @sectionLinks={{this.section.moreLinks}}
+        @moreButtonAction={{this.section.moreSectionButtonAction}}
+        @moreButtonText={{this.section.moreSectionButtonText}}
+        @moreButtonIcon={{this.section.moreSectionButtonIcon}}
+      />
+    {{/if}}
+  {{/if}}
+</Sidebar::Section>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/common/custom-section.js b/app/assets/javascripts/discourse/app/components/sidebar/common/custom-section.js
new file mode 100644
index 00000000000..2bf3946b865
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/sidebar/common/custom-section.js
@@ -0,0 +1,44 @@
+import { getOwner } from "@ember/application";
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import { inject as service } from "@ember/service";
+
+import Section from "discourse/lib/sidebar/section";
+import AdminCommunitySection from "discourse/lib/sidebar/user/community-section/admin-section";
+import CommonCommunitySection from "discourse/lib/sidebar/common/community-section/section";
+
+export default class SidebarCustomSection extends Component {
+  @service currentUser;
+  @service navigationMenu;
+  @service site;
+  @service siteSettings;
+
+  @tracked section;
+
+  constructor() {
+    super(...arguments);
+    this.section = this.#initializeSection();
+  }
+
+  willDestroy() {
+    this.section.teardown?.();
+    super.willDestroy();
+  }
+
+  #initializeSection() {
+    let sectionClass = Section;
+
+    switch (this.args.sectionData.section_type) {
+      case "community":
+        sectionClass = this.currentUser?.admin
+          ? AdminCommunitySection
+          : CommonCommunitySection;
+        break;
+    }
+
+    return new sectionClass({
+      section: this.args.sectionData,
+      owner: getOwner(this),
+    });
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/common/custom-sections.hbs b/app/assets/javascripts/discourse/app/components/sidebar/common/custom-sections.hbs
new file mode 100644
index 00000000000..c07cd0ea437
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/sidebar/common/custom-sections.hbs
@@ -0,0 +1,8 @@
+<div class="sidebar-custom-sections">
+  {{#each this.sections as |section|}}
+    <Sidebar::Common::CustomSection
+      @sectionData={{section}}
+      @collapsable={{@collapsable}}
+    />
+  {{/each}}
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/common/custom-sections.js b/app/assets/javascripts/discourse/app/components/sidebar/common/custom-sections.js
new file mode 100644
index 00000000000..2457ae39246
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/sidebar/common/custom-sections.js
@@ -0,0 +1,22 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+
+export default class SidebarCustomSection extends Component {
+  @service currentUser;
+  @service router;
+  @service messageBus;
+  @service appEvents;
+  @service topicTrackingState;
+  @service site;
+  @service siteSettings;
+
+  anonymous = false;
+
+  get sections() {
+    if (this.anonymous) {
+      return this.site.anonymous_sidebar_sections;
+    } else {
+      return this.currentUser.sidebarSections;
+    }
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/categories-modal.hbs b/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/categories-modal.hbs
new file mode 100644
index 00000000000..bc0d9fa7a67
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/categories-modal.hbs
@@ -0,0 +1,74 @@
+<Sidebar::EditNavigationMenu::Modal
+  @class="sidebar__edit-navigation-menu__categories-modal"
+  @title="sidebar.categories_form_modal.title"
+  @disableSaveButton={{this.saving}}
+  @save={{this.save}}
+  @showResetDefaultsButton={{(gt
+    this.siteSettings.default_navigation_menu_categories.length 0
+  )}}
+  @resetToDefaults={{this.resetToDefaults}}
+  @deselectAll={{this.deselectAll}}
+  @deselectAllText={{i18n "sidebar.categories_form_modal.subtitle.text"}}
+  @inputFilterPlaceholder={{i18n
+    "sidebar.categories_form_modal.filter_placeholder"
+  }}
+  @onFilterInput={{this.onFilterInput}}
+  @resetFilter={{this.resetFilter}}
+  @filterSelected={{this.filterSelected}}
+  @filterUnselected={{this.filterUnselected}}
+  @closeModal={{@closeModal}}
+>
+  <form class="sidebar-categories-form">
+    {{#if (gt this.filteredCategoriesGroupings.length 0)}}
+      {{#each this.filteredCategoriesGroupings as |categories|}}
+        <div
+          class="sidebar-categories-form__row"
+          style={{html-safe (border-color categories.0.color "left")}}
+        >
+
+          {{#each categories as |category|}}
+            <div
+              class="sidebar-categories-form__category-row"
+              data-category-id={{category.id}}
+              data-category-level={{category.level}}
+            >
+              <label
+                class="sidebar-categories-form__category-label"
+                for={{concat "sidebar-categories-form__input--" category.id}}
+              >
+                <div class="sidebar-categories-form__category-wrapper">
+                  <div class="sidebar-categories-form__category-badge">
+                    {{category-badge category}}
+                  </div>
+                  {{#unless category.parentCategory}}
+                    <div class="sidebar-categories-form__category-description">
+                      {{dir-span category.description_excerpt htmlSafe="true"}}
+                    </div>
+                  {{/unless}}
+                </div>
+
+                <Input
+                  id={{concat "sidebar-categories-form__input--" category.id}}
+                  class="sidebar-categories-form__input"
+                  @type="checkbox"
+                  @checked={{includes
+                    this.selectedSidebarCategoryIds
+                    category.id
+                  }}
+                  disabled={{(not
+                    (includes this.filteredCategoryIds category.id)
+                  )}}
+                  {{on "click" (action "toggleCategory" category.id)}}
+                />
+              </label>
+            </div>
+          {{/each}}
+        </div>
+      {{/each}}
+    {{else}}
+      <div class="sidebar-categories-form__no-categories">
+        {{i18n "sidebar.categories_form_modal.no_categories"}}
+      </div>
+    {{/if}}
+  </form>
+</Sidebar::EditNavigationMenu::Modal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/categories-modal.js b/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/categories-modal.js
new file mode 100644
index 00000000000..a515bf6184a
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/categories-modal.js
@@ -0,0 +1,179 @@
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+
+import { INPUT_DELAY } from "discourse-common/config/environment";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import Category from "discourse/models/category";
+
+export default class extends Component {
+  @service currentUser;
+  @service site;
+  @service siteSettings;
+
+  @tracked filter = "";
+  @tracked filteredCategoryIds;
+  @tracked onlySelected = false;
+  @tracked onlyUnselected = false;
+
+  @tracked selectedSidebarCategoryIds = [
+    ...this.currentUser.sidebar_category_ids,
+  ];
+
+  categoryGroupings = [];
+
+  constructor() {
+    super(...arguments);
+
+    let categories = [...this.site.categories];
+
+    if (!this.siteSettings.fixed_category_positions) {
+      categories.sort((a, b) => a.name.localeCompare(b.name));
+    }
+
+    Category.sortCategories(categories).reduce(
+      (categoryGrouping, category, index, arr) => {
+        if (category.isUncategorizedCategory) {
+          return categoryGrouping;
+        }
+
+        categoryGrouping.push(category);
+
+        const nextCategory = arr[index + 1];
+
+        if (!nextCategory || nextCategory.level === 0) {
+          this.categoryGroupings.push(categoryGrouping);
+          return [];
+        }
+
+        return categoryGrouping;
+      },
+      []
+    );
+  }
+
+  get filteredCategoriesGroupings() {
+    const filteredCategoryIds = new Set();
+
+    const groupings = this.categoryGroupings.reduce((acc, categoryGrouping) => {
+      const filteredCategories = new Set();
+
+      const addCategory = (category) => {
+        if (this.#matchesFilter(category)) {
+          if (category.parentCategory?.parentCategory) {
+            filteredCategories.add(category.parentCategory.parentCategory);
+          }
+
+          if (category.parentCategory) {
+            filteredCategories.add(category.parentCategory);
+          }
+
+          filteredCategoryIds.add(category.id);
+          filteredCategories.add(category);
+        }
+      };
+
+      categoryGrouping.forEach((category) => {
+        if (this.onlySelected) {
+          if (this.selectedSidebarCategoryIds.includes(category.id)) {
+            addCategory(category);
+          }
+        } else if (this.onlyUnselected) {
+          if (!this.selectedSidebarCategoryIds.includes(category.id)) {
+            addCategory(category);
+          }
+        } else {
+          addCategory(category);
+        }
+      });
+
+      if (filteredCategories.size > 0) {
+        acc.push(Array.from(filteredCategories));
+      }
+
+      return acc;
+    }, []);
+
+    this.filteredCategoryIds = Array.from(filteredCategoryIds);
+    return groupings;
+  }
+
+  #matchesFilter(category) {
+    return this.filter.length === 0 || category.nameLower.includes(this.filter);
+  }
+
+  @action
+  resetFilter() {
+    this.onlySelected = false;
+    this.onlyUnselected = false;
+  }
+
+  @action
+  filterSelected() {
+    this.onlySelected = true;
+    this.onlyUnselected = false;
+  }
+
+  @action
+  filterUnselected() {
+    this.onlySelected = false;
+    this.onlyUnselected = true;
+  }
+
+  @action
+  onFilterInput(filter) {
+    discourseDebounce(this, this.#performFiltering, filter, INPUT_DELAY);
+  }
+
+  #performFiltering(filter) {
+    this.filter = filter.toLowerCase();
+  }
+
+  @action
+  deselectAll() {
+    this.selectedSidebarCategoryIds.clear();
+  }
+
+  @action
+  toggleCategory(categoryId) {
+    if (this.selectedSidebarCategoryIds.includes(categoryId)) {
+      this.selectedSidebarCategoryIds.removeObject(categoryId);
+    } else {
+      this.selectedSidebarCategoryIds.addObject(categoryId);
+    }
+  }
+
+  @action
+  resetToDefaults() {
+    this.selectedSidebarCategoryIds =
+      this.siteSettings.default_navigation_menu_categories
+        .split("|")
+        .map((id) => parseInt(id, 10));
+  }
+
+  @action
+  save() {
+    this.saving = true;
+    const initialSidebarCategoryIds = this.currentUser.sidebar_category_ids;
+
+    this.currentUser.set(
+      "sidebar_category_ids",
+      this.selectedSidebarCategoryIds
+    );
+
+    this.currentUser
+      .save(["sidebar_category_ids"])
+      .then(() => {
+        this.args.closeModal();
+      })
+      .catch((error) => {
+        this.currentUser.set("sidebar_category_ids", initialSidebarCategoryIds);
+        popupAjaxError(error);
+      })
+      .finally(() => {
+        this.saving = false;
+      });
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/modal.hbs b/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/modal.hbs
new file mode 100644
index 00000000000..5a6d3242473
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/modal.hbs
@@ -0,0 +1,73 @@
+<DModal
+  class={{concat-class "sidebar__edit-navigation-menu__modal" @class}}
+  @title={{i18n @title}}
+  @closeModal={{@closeModal}}
+>
+  <:headerBelowTitle>
+    <p class="sidebar__edit-navigation-menu__deselect-wrapper">
+      <DButton
+        @class="btn-flat sidebar__edit-navigation-menu__deselect-button"
+        @label="sidebar.edit_navigation_modal_form.deselect_button_text"
+        @ariaLabel="sidebar.edit_navigation_modal_form.deselect_button_text"
+        @action={{@deselectAll}}
+      />
+
+      {{@deselectAllText}}
+    </p>
+  </:headerBelowTitle>
+
+  <:belowHeader>
+    <div class="sidebar__edit-navigation-menu__filter">
+      <div class="sidebar__edit-navigation-menu__filter-input">
+        {{d-icon
+          "search"
+          class="sidebar__edit-navigation-menu__filter-input-icon"
+        }}
+
+        <Input
+          class="sidebar__edit-navigation-menu__filter-input-field"
+          placeholder={{@inputFilterPlaceholder}}
+          @type="text"
+          @value={{this.filter}}
+          {{on "input" (action @onFilterInput value="target.value")}}
+          autofocus="true"
+        />
+      </div>
+
+      <div class="sidebar__edit-navigation-menu__filter-dropdown-wrapper">
+        <DropdownSelectBox
+          @class="sidebar__edit-navigation-menu__filter-dropdown"
+          @value={{this.filterDropdownValue}}
+          @content={{this.filterDropdownContent}}
+          @onChange={{this.onFilterDropdownChange}}
+          @options={{hash showCaret=true}}
+        />
+      </div>
+    </div>
+  </:belowHeader>
+
+  <:body>
+    {{yield}}
+  </:body>
+
+  <:footer>
+    <div class="sidebar__edit-navigation-menu__footer">
+      <DButton
+        @class="btn-primary sidebar__edit-navigation-menu__save-button"
+        @label="save"
+        @disabled={{@saving}}
+        @action={{@save}}
+      />
+
+      {{#if @showResetDefaultsButton}}
+        <DButton
+          @icon="undo"
+          @class="btn-flat btn-text sidebar__edit-navigation-menu__reset-defaults-button"
+          @label="sidebar.edit_navigation_modal_form.reset_to_defaults"
+          @disabled={{@saving}}
+          @action={{@resetToDefaults}}
+        />
+      {{/if}}
+    </div>
+  </:footer>
+</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/modal.js b/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/modal.js
new file mode 100644
index 00000000000..f36cd6e4025
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/modal.js
@@ -0,0 +1,50 @@
+import I18n from "I18n";
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import { action } from "@ember/object";
+
+export default class extends Component {
+  @tracked filter = "";
+  @tracked filterDropdownValue = "all";
+
+  filterDropdownContent = [
+    {
+      id: "all",
+      name: I18n.t("sidebar.edit_navigation_modal_form.filter_dropdown.all"),
+    },
+    {
+      id: "selected",
+      name: I18n.t(
+        "sidebar.edit_navigation_modal_form.filter_dropdown.selected"
+      ),
+    },
+    {
+      id: "unselected",
+      name: I18n.t(
+        "sidebar.edit_navigation_modal_form.filter_dropdown.unselected"
+      ),
+    },
+  ];
+
+  @action
+  onFilterInput(value) {
+    this.args.onFilterInput(value);
+  }
+
+  @action
+  onFilterDropdownChange(value) {
+    this.filterDropdownValue = value;
+
+    switch (value) {
+      case "all":
+        this.args.resetFilter();
+        break;
+      case "selected":
+        this.args.filterSelected();
+        break;
+      case "unselected":
+        this.args.filterUnselected();
+        break;
+    }
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/tags-modal.hbs b/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/tags-modal.hbs
new file mode 100644
index 00000000000..1d999e98f61
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/tags-modal.hbs
@@ -0,0 +1,63 @@
+<Sidebar::EditNavigationMenu::Modal
+  @class="sidebar__edit-navigation-menu__tags-modal"
+  @title="sidebar.tags_form_modal.title"
+  @saving={{this.saving}}
+  @save={{this.save}}
+  @showResetDefaultsButton={{(gt
+    this.siteSettings.default_navigation_menu_tags.length 0
+  )}}
+  @resetToDefaults={{this.resetToDefaults}}
+  @deselectAll={{this.deselectAll}}
+  @deselectAllText={{i18n "sidebar.tags_form_modal.subtitle.text"}}
+  @inputFilterPlaceholder={{i18n "sidebar.tags_form_modal.filter_placeholder"}}
+  @onFilterInput={{this.onFilterInput}}
+  @resetFilter={{this.resetFilter}}
+  @filterSelected={{this.filterSelected}}
+  @filterUnselected={{this.filterUnselected}}
+  @closeModal={{@closeModal}}
+>
+  <form class="sidebar-tags-form">
+    {{#if this.tagsLoading}}
+      <div class="spinner"></div>
+    {{else}}
+      {{#if (gt this.tags.length 0)}}
+        {{#each this.tags as |tag|}}
+          <div
+            class="sidebar-tags-form__tag"
+            data-tag-name={{tag.name}}
+            {{did-insert this.didInsertTag}}
+          >
+            <Input
+              id={{concat "sidebar-tags-form__input--" tag.name}}
+              class="sidebar-tags-form__input"
+              @type="checkbox"
+              @checked={{includes this.selectedTags tag.name}}
+              {{on "click" (action "toggleTag" tag.name)}}
+            />
+
+            <label
+              class="sidebar-tags-form__tag-label"
+              for={{concat "sidebar-tags-form__input--" tag.name}}
+            >
+              <p>
+                <span class="sidebar-tags-form__tag-label-name">
+                  {{tag.name}}
+                </span>
+
+                <span class="sidebar-tags-form__tag-label-count">
+                  ({{tag.topic_count}})
+                </span>
+              </p>
+            </label>
+          </div>
+        {{/each}}
+      {{else}}
+        <div class="sidebar-tags-form__no-tags">
+          {{i18n "sidebar.tags_form_modal.no_tags"}}
+        </div>
+      {{/if}}
+    {{/if}}
+  </form>
+
+  <ConditionalLoadingSpinner @condition={{this.tags.loadingMore}} />
+</Sidebar::EditNavigationMenu::Modal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/tags-modal.js b/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/tags-modal.js
new file mode 100644
index 00000000000..6fcb55341f5
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/tags-modal.js
@@ -0,0 +1,160 @@
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { INPUT_DELAY } from "discourse-common/config/environment";
+import discourseDebounce from "discourse-common/lib/debounce";
+
+export default class extends Component {
+  @service currentUser;
+  @service siteSettings;
+  @service store;
+
+  @tracked filter = "";
+  @tracked onlySelected = false;
+  @tracked onlyUnSelected = false;
+  @tracked tags = [];
+  @tracked tagsLoading = true;
+  @tracked selectedTags = [...this.currentUser.sidebarTagNames];
+
+  constructor() {
+    super(...arguments);
+    this.#loadTags();
+  }
+
+  async #loadTags() {
+    this.tagsLoading = true;
+
+    const findArgs = {};
+
+    if (this.filter !== "") {
+      findArgs.filter = this.filter;
+    }
+
+    if (this.onlySelected) {
+      findArgs.only_tags = this.selectedTags.join(",");
+    }
+
+    if (this.onlyUnselected) {
+      findArgs.exclude_tags = this.selectedTags.join(",");
+    }
+
+    await this.store
+      .findAll("listTag", findArgs)
+      .then((tags) => {
+        this.tagsLoading = false;
+        this.tags = tags;
+      })
+      .catch((error) => {
+        popupAjaxError(error);
+      });
+  }
+
+  @action
+  didInsertTag(element) {
+    const tagName = element.dataset.tagName;
+    const lastTagName = this.tags.content[this.tags.content.length - 1].name;
+
+    if (tagName === lastTagName) {
+      if (this.observer) {
+        this.observer.disconnect();
+      } else {
+        const root = document.querySelector(".modal-body");
+        const style = window.getComputedStyle(root);
+        const marginTop = parseFloat(style.marginTop);
+        const paddingTop = parseFloat(style.paddingTop);
+
+        this.observer = new IntersectionObserver(
+          (entries) => {
+            entries.forEach((entry) => {
+              if (entry.isIntersecting) {
+                this.tags.loadMore();
+              }
+            });
+          },
+          {
+            root: document.querySelector(".modal-body"),
+            rootMargin: `0px 0px ${marginTop + paddingTop}px 0px`,
+            threshold: 1.0,
+          }
+        );
+      }
+
+      this.observer.observe(element);
+    }
+  }
+
+  @action
+  resetFilter() {
+    this.onlySelected = false;
+    this.onlyUnselected = false;
+    this.#loadTags();
+  }
+
+  @action
+  filterSelected() {
+    this.onlySelected = true;
+    this.onlyUnselected = false;
+    this.#loadTags();
+  }
+
+  @action
+  filterUnselected() {
+    this.onlySelected = false;
+    this.onlyUnselected = true;
+    this.#loadTags();
+  }
+
+  @action
+  onFilterInput(filter) {
+    discourseDebounce(this, this.#performFiltering, filter, INPUT_DELAY);
+  }
+
+  #performFiltering(filter) {
+    this.filter = filter.toLowerCase();
+    this.#loadTags();
+  }
+
+  @action
+  deselectAll() {
+    this.selectedTags.clear();
+  }
+
+  @action
+  resetToDefaults() {
+    this.selectedTags =
+      this.siteSettings.default_navigation_menu_tags.split("|");
+  }
+
+  @action
+  toggleTag(tag) {
+    if (this.selectedTags.includes(tag)) {
+      this.selectedTags.removeObject(tag);
+    } else {
+      this.selectedTags.addObject(tag);
+    }
+  }
+
+  @action
+  save() {
+    this.saving = true;
+    const initialSidebarTags = this.currentUser.sidebar_tags;
+    this.currentUser.set("sidebar_tag_names", this.selectedTags);
+
+    this.currentUser
+      .save(["sidebar_tag_names"])
+      .then((result) => {
+        this.currentUser.set("sidebar_tags", result.user.sidebar_tags);
+        this.args.closeModal();
+      })
+      .catch((error) => {
+        this.currentUser.set("sidebar_tags", initialSidebarTags);
+        popupAjaxError(error);
+      })
+      .finally(() => {
+        this.saving = false;
+      });
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/footer.hbs b/app/assets/javascripts/discourse/app/components/sidebar/footer.hbs
index 64f0d1f8c98..00e9dd99028 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/footer.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/footer.hbs
@@ -3,6 +3,15 @@
     <div class="sidebar-footer-actions">
       <PluginOutlet @name="sidebar-footer-actions" />
 
+      {{#if this.currentUser}}
+        <DButton
+          @icon="plus"
+          @action={{action this.addSection}}
+          @class="btn-flat add-section"
+          @title="sidebar.sections.custom.add"
+        />
+      {{/if}}
+
       {{#if
         (or
           this.site.mobileView
@@ -22,7 +31,7 @@
           @action={{route-action "showKeyboardShortcutsHelp"}}
           @title="keyboard_shortcuts_help.title"
           @icon="keyboard"
-          @class="sidebar-footer-actions-button sidebar-footer-actions-keyboard-shortcuts"
+          @class="btn-flat sidebar-footer-actions-button sidebar-footer-actions-keyboard-shortcuts"
         />
       {{/if}}
     </div>
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/footer.js b/app/assets/javascripts/discourse/app/components/sidebar/footer.js
index 68b8c7afe7e..5aed931255f 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/footer.js
+++ b/app/assets/javascripts/discourse/app/components/sidebar/footer.js
@@ -1,12 +1,17 @@
 import Component from "@glimmer/component";
-import { getOwner } from "discourse-common/lib/get-owner";
 import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+import SidebarSectionForm from "discourse/components/modal/sidebar-section-form";
 
 export default class SidebarFooter extends Component {
+  @service capabilities;
+  @service currentUser;
+  @service modal;
   @service site;
   @service siteSettings;
 
-  get capabilities() {
-    return getOwner(this).lookup("capabilities:main");
+  @action
+  addSection() {
+    this.modal.show(SidebarSectionForm);
   }
 }
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/hamburger-dropdown.hbs b/app/assets/javascripts/discourse/app/components/sidebar/hamburger-dropdown.hbs
index f437f28ec05..3baeb1578bd 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/hamburger-dropdown.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/hamburger-dropdown.hbs
@@ -9,7 +9,7 @@
         <div class="sidebar-hamburger-dropdown">
           <Sidebar::Sections
             @currentUser={{this.currentUser}}
-            @collapsableSections={{true}}
+            @collapsableSections={{this.collapsableSections}}
           />
           <Sidebar::Footer @tagName="" />
         </div>
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/hamburger-dropdown.js b/app/assets/javascripts/discourse/app/components/sidebar/hamburger-dropdown.js
index a7888ce2d9a..6e17d85693c 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/hamburger-dropdown.js
+++ b/app/assets/javascripts/discourse/app/components/sidebar/hamburger-dropdown.js
@@ -5,9 +5,22 @@ import { inject as service } from "@ember/service";
 export default class SidebarHamburgerDropdown extends Component {
   @service appEvents;
   @service currentUser;
+  @service site;
+  @service siteSettings;
 
   @action
   triggerRenderedAppEvent() {
     this.appEvents.trigger("sidebar-hamburger-dropdown:rendered");
   }
+
+  get collapsableSections() {
+    if (
+      this.siteSettings.navigation_menu === "header dropdown" &&
+      !this.args.collapsableSections
+    ) {
+      return this.site.mobileView || this.site.narrowDesktopView;
+    } else {
+      this.args.collapsableSections;
+    }
+  }
 }
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/more-section-link.hbs b/app/assets/javascripts/discourse/app/components/sidebar/more-section-link.hbs
index d23371fbdf6..134a1b0a5b7 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/more-section-link.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/more-section-link.hbs
@@ -1,15 +1,30 @@
-<Sidebar::SectionLink
-  @shouldDisplay={{@sectionLink.shouldDisplay}}
-  @linkName={{@sectionLink.name}}
-  @route={{@sectionLink.route}}
-  @href={{@sectionLink.href}}
-  @query={{@sectionLink.query}}
-  @title={{@sectionLink.title}}
-  @content={{@sectionLink.text}}
-  @currentWhen={{@sectionLink.currentWhen}}
-  @badgeText={{@sectionLink.badgeText}}
-  @model={{@sectionLink.model}}
-  @models={{@sectionLink.models}}
-  @prefixType={{@sectionLink.prefixType}}
-  @prefixValue={{@sectionLink.prefixValue}}
-/>
\ No newline at end of file
+{{#if @sectionLink.externalOrFullReload}}
+  <Sidebar::SectionLink
+    @shouldDisplay={{@sectionLink.shouldDisplay}}
+    @linkName={{@sectionLink.name}}
+    @content={{replace-emoji @sectionLink.text}}
+    @prefixType="icon"
+    @prefixValue={{@sectionLink.prefixValue}}
+    @fullReload={{@sectionLink.fullReload}}
+    @href={{@sectionLink.value}}
+  />
+{{else}}
+  <Sidebar::SectionLink
+    @shouldDisplay={{@sectionLink.shouldDisplay}}
+    @href={{@sectionLink.href}}
+    @title={{@sectionLink.title}}
+    @linkName={{@sectionLink.name}}
+    @route={{@sectionLink.route}}
+    @model={{@sectionLink.model}}
+    @models={{@sectionLink.models}}
+    @query={{@sectionLink.query}}
+    @content={{replace-emoji @sectionLink.text}}
+    @badgeText={{@sectionLink.badgeText}}
+    @prefixType="icon"
+    @prefixValue={{@sectionLink.prefixValue}}
+    @suffixCSSClass={{@sectionLink.suffixCSSClass}}
+    @suffixValue={{@sectionLink.suffixValue}}
+    @suffixType={{@sectionLink.suffixType}}
+    @currentWhen={{@sectionLink.currentWhen}}
+  />
+{{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/more-section-links.hbs b/app/assets/javascripts/discourse/app/components/sidebar/more-section-links.hbs
index ce0c659b09f..bcb99107116 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/more-section-links.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/more-section-links.hbs
@@ -2,19 +2,17 @@
   <Sidebar::MoreSectionLink @sectionLink={{this.activeSectionLink}} />
 {{/if}}
 
-<details
-  class="sidebar-more-section-links-details"
-  {{on "toggle" this.toggleSectionLinks}}
->
-  <summary class="sidebar-more-section-links-details-summary sidebar-row">
-    <span class="sidebar-more-section-links-icon-wrapper">
-      {{d-icon "ellipsis-v"}}
-    </span>
+<li class="sidebar-section-link-wrapper">
+  <DButton
+    @icon="ellipsis-v"
+    @action={{action this.toggleSectionLinks}}
+    @class="btn-flat sidebar-more-section-links-details-summary"
+    @label="sidebar.more"
+  />
+</li>
 
-    {{i18n "sidebar.more"}}
-  </summary>
-
-  {{#if this.shouldDisplaySectionLinks}}
+{{#if this.open}}
+  <div class="sidebar-more-section-links-details">
     <div
       class="sidebar-more-section-links-details-content-wrapper"
       {{did-insert this.registerClickListener}}
@@ -22,20 +20,22 @@
     >
 
       <div class="sidebar-more-section-links-details-content">
-        <div class="sidebar-more-section-links-details-content-main">
+        <ul class="sidebar-more-section-links-details-content-main">
           {{#each this.sectionLinks as |sectionLink|}}
             <Sidebar::MoreSectionLink @sectionLink={{sectionLink}} />
           {{/each}}
-        </div>
+        </ul>
 
-        {{#if (gt this.secondarySectionLinks.length 0)}}
-          <div class="sidebar-more-section-links-details-content-secondary">
-            {{#each this.secondarySectionLinks as |sectionLink|}}
-              <Sidebar::MoreSectionLink @sectionLink={{sectionLink}} />
-            {{/each}}
+        {{#if @moreButtonAction}}
+          <div class="sidebar-more-section-links-details-content-footer">
+            <Sidebar::SectionLinkButton
+              @action={{@moreButtonAction}}
+              @icon={{@moreButtonIcon}}
+              @text={{@moreButtonText}}
+            />
           </div>
         {{/if}}
       </div>
     </div>
-  {{/if}}
-</details>
\ No newline at end of file
+  </div>
+{{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/more-section-links.js b/app/assets/javascripts/discourse/app/components/sidebar/more-section-links.js
index 3bcbd787a61..72e2f415abf 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/more-section-links.js
+++ b/app/assets/javascripts/discourse/app/components/sidebar/more-section-links.js
@@ -9,10 +9,8 @@ import Component from "@glimmer/component";
 export default class SidebarMoreSectionLinks extends Component {
   @service router;
 
-  @tracked shouldDisplaySectionLinks = false;
   @tracked activeSectionLink;
-
-  #allLinks = [...this.args.sectionLinks, ...this.args.secondarySectionLinks];
+  @tracked open = false;
 
   constructor() {
     super(...arguments);
@@ -49,15 +47,13 @@ export default class SidebarMoreSectionLinks extends Component {
 
   @bind
   closeDetails(event) {
-    if (this.shouldDisplaySectionLinks) {
-      const isLinkClick = event.target.className.includes(
-        "sidebar-section-link"
-      );
+    if (this.open) {
+      const isLinkClick =
+        event.target.className.includes("sidebar-section-link") ||
+        event.target.className.includes("sidebar-section-link-button");
 
       if (isLinkClick || this.#isOutsideDetailsClick(event)) {
-        document
-          .querySelector(".sidebar-more-section-links-details")
-          ?.removeAttribute("open");
+        this.open = false;
       }
     }
   }
@@ -73,8 +69,8 @@ export default class SidebarMoreSectionLinks extends Component {
   }
 
   @action
-  toggleSectionLinks(element) {
-    this.shouldDisplaySectionLinks = element.target.hasAttribute("open");
+  toggleSectionLinks() {
+    this.open = !this.open;
   }
 
   #removeClickEventListener() {
@@ -92,7 +88,7 @@ export default class SidebarMoreSectionLinks extends Component {
   }
 
   #setActiveSectionLink() {
-    const activeSectionLink = this.#allLinks.find((sectionLink) => {
+    const activeSectionLink = this.args.sectionLinks.find((sectionLink) => {
       const args = [sectionLink.route];
 
       if (sectionLink.model) {
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/section-form-link.hbs b/app/assets/javascripts/discourse/app/components/sidebar/section-form-link.hbs
new file mode 100644
index 00000000000..923dd7cdf24
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/sidebar/section-form-link.hbs
@@ -0,0 +1,72 @@
+<div
+  class={{concat-class
+    "sidebar-section-form-link"
+    "row-wrapper"
+    this.dragCssClass
+  }}
+  draggable="true"
+  {{on "dragstart" this.dragHasStarted}}
+  {{on "dragover" this.dragOver}}
+  {{on "dragenter" this.dragEnter}}
+  {{on "dragleave" this.dragLeave}}
+  {{on "dragend" this.dragEnd}}
+  {{on "drop" this.dropItem}}
+>
+  <div class="draggable" data-link-name={{@link.name}}>
+    {{d-icon "grip-lines"}}
+  </div>
+  <div class="input-group">
+    <IconPicker
+      @name="icon"
+      @value={{@link.icon}}
+      @options={{hash
+        maximum=1
+        caretDownIcon="caret-down"
+        caretUpIcon="caret-up"
+        icons=@link.icon
+      }}
+      class={{@link.iconCssClass}}
+      @onlyAvailable={{true}}
+      @onChange={{action (mut @link.icon)}}
+    />
+    {{#if @link.invalidIconMessage}}
+      <div class="icon warning">
+        {{@link.invalidIconMessage}}
+      </div>
+    {{/if}}
+  </div>
+  <div class="input-group">
+    <Input
+      name="link-name"
+      @type="text"
+      @value={{@link.name}}
+      class={{@link.nameCssClass}}
+      {{on "input" (action (mut @link.name) value="target.value")}}
+    />
+    {{#if @link.invalidNameMessage}}
+      <div class="name warning">
+        {{@link.invalidNameMessage}}
+      </div>
+    {{/if}}
+  </div>
+  <div class="input-group">
+    <Input
+      name="link-url"
+      @type="text"
+      @value={{@link.value}}
+      class={{@link.valueCssClass}}
+      {{on "input" (action (mut @link.value) value="target.value")}}
+    />
+    {{#if @link.invalidValueMessage}}
+      <div class="value warning">
+        {{@link.invalidValueMessage}}
+      </div>
+    {{/if}}
+  </div>
+  <DButton
+    @icon="trash-alt"
+    @action={{action @deleteLink @link}}
+    @class="btn-flat delete-link"
+    @title="sidebar.sections.custom.links.delete"
+  />
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/section-form-link.js b/app/assets/javascripts/discourse/app/components/sidebar/section-form-link.js
new file mode 100644
index 00000000000..106d2eba74e
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/sidebar/section-form-link.js
@@ -0,0 +1,68 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import { tracked } from "@glimmer/tracking";
+
+export default class SectionFormLink extends Component {
+  @tracked dragCssClass;
+
+  dragCount = 0;
+
+  isAboveElement(event) {
+    event.preventDefault();
+    const target = event.currentTarget;
+    const domRect = target.getBoundingClientRect();
+    return event.offsetY < domRect.height / 2;
+  }
+
+  @action
+  dragHasStarted(event) {
+    event.dataTransfer.effectAllowed = "move";
+    event.dataTransfer.setData("linkId", this.args.link.objectId);
+    this.dragCssClass = "dragging";
+  }
+
+  @action
+  dragOver(event) {
+    event.preventDefault();
+    if (!this.dragCssClass) {
+      if (this.isAboveElement(event)) {
+        this.dragCssClass = "drag-above";
+      } else {
+        this.dragCssClass = "drag-below";
+      }
+    }
+  }
+  @action
+  dragEnter() {
+    this.dragCount++;
+  }
+
+  @action
+  dragLeave() {
+    this.dragCount--;
+    if (
+      this.dragCount === 0 &&
+      (this.dragCssClass === "drag-above" || this.dragCssClass === "drag-below")
+    ) {
+      this.dragCssClass = null;
+    }
+  }
+
+  @action
+  dropItem(event) {
+    event.stopPropagation();
+    this.dragCounter = 0;
+    this.args.reorderCallback(
+      parseInt(event.dataTransfer.getData("linkId"), 10),
+      this.args.link,
+      this.isAboveElement(event)
+    );
+    this.dragCssClass = null;
+  }
+
+  @action
+  dragEnd() {
+    this.dragCounter = 0;
+    this.dragCssClass = null;
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/section-header.hbs b/app/assets/javascripts/discourse/app/components/sidebar/section-header.hbs
index 9a2dd84fa8b..07179ab69a9 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/section-header.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/section-header.hbs
@@ -9,7 +9,7 @@
     {{yield}}
   </DButton>
 {{else}}
-  <span class="sidebar-section-header" title={{i18n "sidebar.toggle_section"}}>
+  <span class="sidebar-section-header">
     {{yield}}
   </span>
 {{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/section-link-button.hbs b/app/assets/javascripts/discourse/app/components/sidebar/section-link-button.hbs
new file mode 100644
index 00000000000..852bcc1d381
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/sidebar/section-link-button.hbs
@@ -0,0 +1,15 @@
+<div class="sidebar-section-link-wrapper">
+  <button
+    type="button"
+    class="btn btn-flat sidebar-section-link-button sidebar-row"
+    {{on "click" @action}}
+  >
+    <span class="sidebar-section-link-prefix icon">
+      {{d-icon @icon}}
+    </span>
+
+    <span class="sidebar-section-link-content-text">
+      {{@text}}
+    </span>
+  </button>
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/section-link-prefix.hbs b/app/assets/javascripts/discourse/app/components/sidebar/section-link-prefix.hbs
index 7cbb3468759..ef9a1ad6fe3 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/section-link-prefix.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/section-link-prefix.hbs
@@ -7,30 +7,24 @@
     }}
     style={{if @prefixColor (html-safe (concat "color: " @prefixColor))}}
   >
+
     {{#if (eq @prefixType "image")}}
-      <img src={{@prefixValue}} class="prefix-image" />
-    {{/if}}
-
-    {{#if (eq @prefixType "text")}}
+      <img src={{this.prefixValue}} class="prefix-image" />
+    {{else if (eq @prefixType "text")}}
       <span class="prefix-text">
-        {{@prefixValue}}
+        {{this.prefixValue}}
       </span>
-    {{/if}}
-
-    {{#if (eq @prefixType "icon")}}
-      {{d-icon @prefixValue class="prefix-icon"}}
-    {{/if}}
-
-    {{#if (eq @prefixType "span")}}
+    {{else if (eq @prefixType "icon")}}
+      {{d-icon this.prefixValue class="prefix-icon"}}
+    {{else if (eq @prefixType "span")}}
       <span
         style={{html-safe
-          (concat
-            "background: linear-gradient(90deg, " @prefixElementColors ")"
-          )
+          (concat "background: linear-gradient(90deg, " this.prefixValue ")")
         }}
         class="prefix-span"
       ></span>
     {{/if}}
+
     {{#if @prefixBadge}}
       {{d-icon @prefixBadge class="prefix-badge"}}
     {{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/section-link-prefix.js b/app/assets/javascripts/discourse/app/components/sidebar/section-link-prefix.js
new file mode 100644
index 00000000000..31ecf39dfb3
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/sidebar/section-link-prefix.js
@@ -0,0 +1,34 @@
+import Component from "@glimmer/component";
+import { isHex } from "discourse/components/sidebar/section-link";
+
+export default class extends Component {
+  get prefixValue() {
+    if (!this.args.prefixType && !this.args.prefixValue) {
+      return;
+    }
+
+    switch (this.args.prefixType) {
+      case "span":
+        let hexValues = this.args.prefixValue;
+
+        hexValues = hexValues.reduce((acc, color) => {
+          const hexCode = isHex(color);
+
+          if (hexCode) {
+            acc.push(`#${hexCode} 50%`);
+          }
+
+          return acc;
+        }, []);
+
+        if (hexValues.length === 1) {
+          hexValues.push(hexValues[0]);
+        }
+
+        return hexValues.join(", ");
+        break;
+      default:
+        return this.args.prefixValue;
+    }
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/section-link-to.js b/app/assets/javascripts/discourse/app/components/sidebar/section-link-to.js
deleted file mode 100644
index 6287fc2ecf6..00000000000
--- a/app/assets/javascripts/discourse/app/components/sidebar/section-link-to.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import Ember from "ember";
-
-export default class SidebarSectionLinkTo extends Ember.LinkComponent {
-  // Overriding the private function here because the behavior of the component when used with the `current-when`
-  // attribute does not seem to follow what was mentioned in the docs: "A link will be active if current-when is true or
-  // the current route is the route this link would transition to". When the `current-when` attribute is used, the
-  // `route` and `query` attributes are ignored which is not what we want. In addition, we're stuck on Ember 3.15 at
-  // the moment and are awaiting the upgrade to the latest supported Ember version before I can determine if this is a
-  // bug and report it as such.
-  _isActive(routerState) {
-    if (this.loading) {
-      return false;
-    }
-
-    let currentWhen = this["current-when"];
-
-    if (typeof currentWhen === "boolean") {
-      return currentWhen;
-    }
-
-    let isCurrentWhenSpecified = Boolean(currentWhen);
-
-    if (isCurrentWhenSpecified) {
-      currentWhen = currentWhen.split(" ");
-    } else {
-      currentWhen = [this._route];
-    }
-
-    let { _models: models, _query: query, _routing: routing } = this;
-
-    for (let i = 0; i < currentWhen.length; i++) {
-      if (
-        routing.isActiveForRoute(
-          models,
-          query,
-          currentWhen[i],
-          routerState,
-          // **custom code override start**
-          // we always want query params to be considered
-          false
-          // isCurrentWhenSpecified
-          // **custom code override end**
-        )
-      ) {
-        return true;
-      }
-    }
-
-    return false;
-  }
-}
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/section-link.hbs b/app/assets/javascripts/discourse/app/components/sidebar/section-link.hbs
index 0744d15f16d..4ff6382374b 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/section-link.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/section-link.hbs
@@ -2,21 +2,23 @@
   <li
     class="sidebar-section-link-wrapper"
     {{did-insert this.didInsert this.args}}
+    data-list-item-name={{@linkName}}
+    ...attributes
   >
     {{#if @href}}
       <a
         href={{@href}}
         rel="noopener noreferrer"
-        target="_blank"
+        target={{this.target}}
         class={{this.classNames}}
         title={{@title}}
+        data-link-name={{@linkName}}
       >
         <Sidebar::SectionLinkPrefix
           @prefixType={{@prefixType}}
           @prefixValue={{@prefixValue}}
           @prefixCSSClass={{@prefixCSSClass}}
           @prefixColor={{this.prefixColor}}
-          @prefixElementColors={{this.prefixElementColors}}
           @prefixBadge={{@prefixBadge}}
         />
 
@@ -25,13 +27,14 @@
         </span>
       </a>
     {{else}}
-      <Sidebar::SectionLinkTo
-        @class={{this.classNames}}
+      <LinkTo
+        class={{this.classNames}}
         @route={{@route}}
-        @query={{@query}}
+        @query={{or @query (hash)}}
         @models={{this.models}}
         @current-when={{@currentWhen}}
-        @title={{@title}}
+        title={{@title}}
+        data-link-name={{@linkName}}
       >
 
         <Sidebar::SectionLinkPrefix
@@ -39,7 +42,6 @@
           @prefixValue={{@prefixValue}}
           @prefixCSSClass={{@prefixCSSClass}}
           @prefixColor={{this.prefixColor}}
-          @prefixElementColors={{this.prefixElementColors}}
           @prefixBadge={{@prefixBadge}}
         />
 
@@ -50,6 +52,7 @@
           }}
         >
           {{@content}}
+          {{@contentComponent}}
         </span>
 
         {{#if @badgeText}}
@@ -86,7 +89,7 @@
             </button>
           </span>
         {{/if}}
-      </Sidebar::SectionLinkTo>
+      </LinkTo>
     {{/if}}
   </li>
 {{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/section-link.js b/app/assets/javascripts/discourse/app/components/sidebar/section-link.js
index 620da26bd64..0c50537e832 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/section-link.js
+++ b/app/assets/javascripts/discourse/app/components/sidebar/section-link.js
@@ -1,6 +1,24 @@
 import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
 
+/**
+ * Checks if a given string is a valid color hex code.
+ *
+ * @param {String|undefined} input Input string to check if it is a valid color hex code. Can be in the form of "FFFFFF" or "#FFFFFF" or "FFF" or "#FFF".
+ * @returns {String|undefined} Returns the matching color hex code without the leading `#` if it is valid, otherwise returns undefined. Example: "FFFFFF" or "FFF".
+ */
+export function isHex(input) {
+  const match = input?.match(/^#?([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/);
+
+  if (match) {
+    return match[1];
+  } else {
+    return;
+  }
+}
 export default class SectionLink extends Component {
+  @service currentUser;
+
   willDestroy() {
     if (this.args.willDestroy) {
       this.args.willDestroy();
@@ -22,11 +40,7 @@ export default class SectionLink extends Component {
   }
 
   get classNames() {
-    let classNames = [
-      "sidebar-section-link",
-      `sidebar-section-link-${this.args.linkName}`,
-      "sidebar-row",
-    ];
+    let classNames = ["sidebar-section-link", "sidebar-row"];
 
     if (this.args.class) {
       classNames.push(this.args.class);
@@ -35,6 +49,15 @@ export default class SectionLink extends Component {
     return classNames.join(" ");
   }
 
+  get target() {
+    if (this.args.fullReload) {
+      return "_self";
+    }
+    return this.currentUser?.user_option?.external_links_in_new_tab
+      ? "_blank"
+      : "_self";
+  }
+
   get models() {
     if (this.args.model) {
       return [this.args.model];
@@ -48,28 +71,12 @@ export default class SectionLink extends Component {
   }
 
   get prefixColor() {
-    const color = this.args.prefixColor;
+    const hexCode = isHex(this.args.prefixColor);
 
-    if (!color || !color.match(/^\w{6}$/)) {
-      return "";
-    }
-
-    return "#" + color;
-  }
-
-  get prefixElementColors() {
-    if (!this.args.prefixElementColors) {
+    if (hexCode) {
+      return `#${hexCode}`;
+    } else {
       return;
     }
-
-    const prefixElementColors = this.args.prefixElementColors.filter((color) =>
-      color?.slice(0, 6)
-    );
-
-    if (prefixElementColors.length === 1) {
-      prefixElementColors.push(prefixElementColors[0]);
-    }
-
-    return prefixElementColors.map((color) => `#${color} 50%`).join(", ");
   }
 }
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/section.hbs b/app/assets/javascripts/discourse/app/components/sidebar/section.hbs
index fc2f5471ba6..5ec274885a1 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/section.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/section.hbs
@@ -1,45 +1,61 @@
 {{#if this.displaySection}}
-  <div class={{concat "sidebar-section-wrapper sidebar-section-" @sectionName}}>
-    <div class="sidebar-section-header-wrapper sidebar-row">
-      <Sidebar::SectionHeader
-        @collapsable={{@collapsable}}
-        @sidebarSectionContentID={{this.sidebarSectionContentID}}
-        @toggleSectionDisplay={{this.toggleSectionDisplay}}
-        @isExpanded={{this.displaySectionContent}}
-      >
-        {{#if @collapsable}}
-          <span class="sidebar-section-header-caret">
-            {{d-icon this.headerCaretIcon}}
+  <div
+    class={{concat-class "sidebar-section-wrapper sidebar-section" @class}}
+    data-section-name={{@sectionName}}
+  >
+    {{#unless @hideSectionHeader}}
+      <div class="sidebar-section-header-wrapper sidebar-row">
+        <Sidebar::SectionHeader
+          @collapsable={{@collapsable}}
+          @sidebarSectionContentID={{this.sidebarSectionContentID}}
+          @toggleSectionDisplay={{this.toggleSectionDisplay}}
+          @isExpanded={{this.displaySectionContent}}
+        >
+          {{#if @collapsable}}
+            <span class="sidebar-section-header-caret">
+              {{d-icon this.headerCaretIcon}}
+            </span>
+          {{/if}}
+
+          <span class="sidebar-section-header-text">
+            {{@headerLinkText}}
           </span>
+          {{#if @indicatePublic}}
+            <span class="sidebar-section-header-global-indicator">
+              {{d-icon "globe"}}
+              <DTooltip @placement="top">{{d-icon "shield-alt"}}
+                {{i18n "sidebar.sections.global_section"}}
+              </DTooltip>
+            </span>
+          {{/if}}
+        </Sidebar::SectionHeader>
+
+        {{#if this.isSingleHeaderAction}}
+          {{#each @headerActions as |headerAction|}}
+            <button
+              type="button"
+              class="sidebar-section-header-button"
+              {{on "click" headerAction.action}}
+              title={{headerAction.title}}
+            >
+              {{d-icon @headerActionsIcon}}
+            </button>
+          {{/each}}
         {{/if}}
 
-        <span class="sidebar-section-header-text">
-          {{@headerLinkText}}
-        </span>
-      </Sidebar::SectionHeader>
-
-      {{#if this.isSingleHeaderAction}}
-        {{#each @headerActions as |headerAction|}}
-          <button
-            type="button"
-            class="sidebar-section-header-button"
-            {{on "click" headerAction.action}}
-            title={{headerAction.title}}
-          >
-            {{d-icon @headerActionsIcon}}
-          </button>
-        {{/each}}
-      {{/if}}
-
-      {{#if this.isMultipleHeaderActions}}
-        <DropdownSelectBox
-          @options={{hash icon=@headerActionsIcon placementStrategy="absolute"}}
-          @content={{@headerActions}}
-          @onChange={{action "handleMultipleHeaderActions"}}
-          @class="sidebar-section-header-dropdown"
-        />
-      {{/if}}
-    </div>
+        {{#if this.isMultipleHeaderActions}}
+          <DropdownSelectBox
+            @options={{hash
+              icon=@headerActionsIcon
+              placementStrategy="absolute"
+            }}
+            @content={{@headerActions}}
+            @onChange={{action "handleMultipleHeaderActions"}}
+            @class="sidebar-section-header-dropdown"
+          />
+        {{/if}}
+      </div>
+    {{/unless}}
 
     {{#if this.displaySectionContent}}
       <ul class="sidebar-section-content" id={{this.sidebarSectionContentID}}>
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/sections.hbs b/app/assets/javascripts/discourse/app/components/sidebar/sections.hbs
index e2f6b4a7ba7..b59e75a3b32 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/sections.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/sections.hbs
@@ -1,5 +1,8 @@
 {{#if @currentUser}}
-  <Sidebar::User::Sections @collapsableSections={{@collapsableSections}} />
+  <Sidebar::User::Sections
+    @collapsableSections={{@collapsableSections}}
+    @panel={{@panel}}
+  />
 {{else}}
   <Sidebar::Anonymous::Sections @collapsableSections={{@collapsableSections}} />
 {{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/switch-panel-buttons.hbs b/app/assets/javascripts/discourse/app/components/sidebar/switch-panel-buttons.hbs
new file mode 100644
index 00000000000..aee2505a104
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/sidebar/switch-panel-buttons.hbs
@@ -0,0 +1,8 @@
+{{#each @buttons as |button|}}
+  <DButton
+    @action={{action "switchPanel" @currentPanel button}}
+    @class="btn-default sidebar__panel-switch-button"
+    @icon={{button.switchButtonIcon}}
+    @translatedLabel={{button.switchButtonLabel}}
+  />
+{{/each}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/switch-panel-buttons.js b/app/assets/javascripts/discourse/app/components/sidebar/switch-panel-buttons.js
new file mode 100644
index 00000000000..05f9c679789
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/sidebar/switch-panel-buttons.js
@@ -0,0 +1,20 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+
+export default class SwitchPanelButtons extends Component {
+  @service router;
+  @service sidebarState;
+
+  @action
+  switchPanel(currentPanel, panel) {
+    this.sidebarState.currentPanel.lastKnownURL = this.router.currentURL;
+    this.sidebarState.setPanel(panel.key);
+    const url = panel.lastKnownURL || panel.switchButtonDefaultUrl;
+    if (url === "/") {
+      this.router.transitionTo("discovery.latest");
+    } else {
+      this.router.transitionTo(url);
+    }
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.hbs b/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.hbs
index 1e1ebeff991..3c073d92240 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.hbs
@@ -1,64 +1,49 @@
-{{#if this.shouldDisplay}}
-  <Sidebar::Section
-    @sectionName="categories"
-    @headerLinkText={{i18n "sidebar.sections.categories.header_link_text"}}
-    @headerActions={{array
-      (hash
-        action=this.editTracked
-        title=(i18n "sidebar.sections.categories.header_action_title")
-      )
-    }}
-    @headerActionsIcon="pencil-alt"
-    @collapsable={{@collapsable}}
-  >
+<Sidebar::Section
+  @sectionName="categories"
+  @headerLinkText={{i18n "sidebar.sections.categories.header_link_text"}}
+  @headerActions={{array
+    (hash
+      action=this.showModal
+      title=(i18n "sidebar.sections.categories.header_action_title")
+    )
+  }}
+  @headerActionsIcon="pencil-alt"
+  @collapsable={{@collapsable}}
+>
 
-    {{#if (gt this.sectionLinks.length 0)}}
-      {{#each this.sectionLinks as |sectionLink|}}
-        <Sidebar::SectionLink
-          @linkName={{sectionLink.name}}
-          @route={{sectionLink.route}}
-          @query={{sectionLink.query}}
-          @title={{sectionLink.title}}
-          @content={{sectionLink.text}}
-          @currentWhen={{sectionLink.currentWhen}}
-          @model={{sectionLink.model}}
-          @badgeText={{sectionLink.badgeText}}
-          @prefixBadge={{sectionLink.prefixBadge}}
-          @prefixType={{sectionLink.prefixType}}
-          @prefixValue={{sectionLink.prefixValue}}
-          @prefixColor={{sectionLink.prefixColor}}
-          @prefixElementColors={{sectionLink.prefixElementColors}}
-          @suffixCSSClass={{sectionLink.suffixCSSClass}}
-          @suffixValue={{sectionLink.suffixValue}}
-          @suffixType={{sectionLink.suffixType}}
-        />
-      {{/each}}
-    {{else}}
+  {{#if (gt this.sectionLinks.length 0)}}
+    {{#each this.sectionLinks as |sectionLink|}}
       <Sidebar::SectionLink
-        @linkName="configure-categories"
-        @route="preferences.sidebar"
-        @prefixType="icon"
-        @prefixValue="pencil-alt"
-        @model={{this.currentUser}}
-        @content={{i18n
-          "sidebar.sections.categories.links.add_categories.content"
-        }}
-        @title={{i18n "sidebar.sections.categories.links.add_categories.title"}}
+        @route={{sectionLink.route}}
+        @query={{sectionLink.query}}
+        @title={{sectionLink.title}}
+        @content={{sectionLink.text}}
+        @currentWhen={{sectionLink.currentWhen}}
+        @model={{sectionLink.model}}
+        @badgeText={{sectionLink.badgeText}}
+        @prefixBadge={{sectionLink.prefixBadge}}
+        @prefixType={{sectionLink.prefixType}}
+        @prefixValue={{sectionLink.prefixValue}}
+        @prefixColor={{sectionLink.prefixColor}}
+        @suffixCSSClass={{sectionLink.suffixCSSClass}}
+        @suffixValue={{sectionLink.suffixValue}}
+        @suffixType={{sectionLink.suffixType}}
+        data-category-id={{sectionLink.category.id}}
       />
-    {{/if}}
+    {{/each}}
+  {{/if}}
 
-    <Sidebar::Common::AllCategoriesSectionLink />
+  <Sidebar::Common::AllCategoriesSectionLink />
 
-    {{#if (and this.currentUser.admin (not this.hasDefaultSidebarCategories))}}
-      <Sidebar::SectionLink
-        @linkName="configure-default-sidebar-categories"
-        @content={{i18n "sidebar.sections.categories.configure_defaults"}}
-        @prefixType="icon"
-        @prefixValue="wrench"
-        @route="adminSiteSettingsCategory"
-        @model="sidebar"
-        @query={{hash filter="default_sidebar_categories"}}
-      />
-    {{/if}}
-  </Sidebar::Section>
-{{/if}}
\ No newline at end of file
+  {{#if this.shouldDisplayDefaultConfig}}
+    <Sidebar::SectionLink
+      @linkName="configure-default-navigation-menu-categories"
+      @content={{i18n "sidebar.sections.categories.configure_defaults"}}
+      @prefixType="icon"
+      @prefixValue="wrench"
+      @route="adminSiteSettingsCategory"
+      @model="sidebar"
+      @query={{hash filter="default_navigation_menu_categories"}}
+    />
+  {{/if}}
+</Sidebar::Section>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.js b/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.js
index d3bc1378a7a..f96b0bcb74b 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.js
+++ b/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.js
@@ -1,18 +1,21 @@
-import { inject as service } from "@ember/service";
 import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
 import { cached } from "@glimmer/tracking";
 
 import { debounce } from "discourse-common/utils/decorators";
 import Category from "discourse/models/category";
 import SidebarCommonCategoriesSection from "discourse/components/sidebar/common/categories-section";
+import { hasDefaultSidebarCategories } from "discourse/lib/sidebar/helpers";
+import SidebarEditNavigationMenuCategoriesModal from "discourse/components/sidebar/edit-navigation-menu/categories-modal";
 
 export const REFRESH_COUNTS_APP_EVENT_NAME =
   "sidebar:refresh-categories-section-counts";
 
 export default class SidebarUserCategoriesSection extends SidebarCommonCategoriesSection {
-  @service router;
-  @service currentUser;
   @service appEvents;
+  @service currentUser;
+  @service modal;
+  @service router;
 
   constructor() {
     super(...arguments);
@@ -47,29 +50,23 @@ export default class SidebarUserCategoriesSection extends SidebarCommonCategorie
 
   @cached
   get categories() {
-    return Category.findByIds(this.currentUser.sidebarCategoryIds);
-  }
-
-  /**
-   * If a site has no default sidebar categories configured, show categories section if the user has categories configured.
-   * Otherwise, hide the categories section from the sidebar for the user.
-   *
-   * If a site has default sidebar categories configured, always show categories section for the user.
-   */
-  get shouldDisplay() {
-    if (this.hasDefaultSidebarCategories) {
-      return true;
+    if (this.currentUser.sidebarCategoryIds?.length > 0) {
+      return Category.findByIds(this.currentUser.sidebarCategoryIds);
     } else {
-      return this.categories.length > 0;
+      return this.topSiteCategories;
     }
   }
 
+  get shouldDisplayDefaultConfig() {
+    return this.currentUser.admin && !this.hasDefaultSidebarCategories;
+  }
+
   get hasDefaultSidebarCategories() {
-    return this.siteSettings.default_sidebar_categories.length > 0;
+    return hasDefaultSidebarCategories(this.siteSettings);
   }
 
   @action
-  editTracked() {
-    this.router.transitionTo("preferences.sidebar", this.currentUser);
+  showModal() {
+    this.modal.show(SidebarEditNavigationMenuCategoriesModal);
   }
 }
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/user/community-section.js b/app/assets/javascripts/discourse/app/components/sidebar/user/community-section.js
deleted file mode 100644
index 2bcb92da48d..00000000000
--- a/app/assets/javascripts/discourse/app/components/sidebar/user/community-section.js
+++ /dev/null
@@ -1,74 +0,0 @@
-import I18n from "I18n";
-
-import Composer from "discourse/models/composer";
-import { getOwner } from "discourse-common/lib/get-owner";
-import PermissionType from "discourse/models/permission-type";
-import EverythingSectionLink from "discourse/lib/sidebar/common/community-section/everything-section-link";
-import MyPostsSectionLink from "discourse/lib/sidebar/user/community-section/my-posts-section-link";
-import GroupsSectionLink from "discourse/lib/sidebar/common/community-section/groups-section-link";
-import UsersSectionLink from "discourse/lib/sidebar/common/community-section/users-section-link";
-import AboutSectionLink from "discourse/lib/sidebar/common/community-section/about-section-link";
-import FAQSectionLink from "discourse/lib/sidebar/common/community-section/faq-section-link";
-import AdminSectionLink from "discourse/lib/sidebar/user/community-section/admin-section-link";
-import BadgesSectionLink from "discourse/lib/sidebar/common/community-section/badges-section-link";
-import ReviewSectionLink from "discourse/lib/sidebar/user/community-section/review-section-link";
-import SidebarCommonCommunitySection from "discourse/components/sidebar/common/community-section";
-
-import { action } from "@ember/object";
-import { next } from "@ember/runloop";
-
-export default class SidebarUserCommunitySection extends SidebarCommonCommunitySection {
-  constructor() {
-    super(...arguments);
-
-    this.headerActionsIcon = "plus";
-
-    this.headerActions = [
-      {
-        action: this.composeTopic,
-        title: I18n.t("sidebar.sections.community.header_action_title"),
-      },
-    ];
-  }
-
-  get defaultMainSectionLinks() {
-    return [
-      EverythingSectionLink,
-      MyPostsSectionLink,
-      AdminSectionLink,
-      ReviewSectionLink,
-    ];
-  }
-
-  get defaultMoreSectionLinks() {
-    return [
-      GroupsSectionLink,
-      UsersSectionLink,
-      BadgesSectionLink,
-      ReviewSectionLink,
-    ];
-  }
-
-  get defaultMoreSecondarySectionLinks() {
-    return [AboutSectionLink, FAQSectionLink];
-  }
-
-  @action
-  composeTopic() {
-    const composerArgs = {
-      action: Composer.CREATE_TOPIC,
-      draftKey: Composer.NEW_TOPIC_KEY,
-    };
-
-    const controller = getOwner(this).lookup("controller:navigation/category");
-    const category = controller.category;
-
-    if (category && category.permission === PermissionType.FULL) {
-      composerArgs.categoryId = category.id;
-    }
-
-    next(() => {
-      getOwner(this).lookup("controller:composer").open(composerArgs);
-    });
-  }
-}
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/user/custom-sections.js b/app/assets/javascripts/discourse/app/components/sidebar/user/custom-sections.js
new file mode 100644
index 00000000000..22ec07d0d16
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/sidebar/user/custom-sections.js
@@ -0,0 +1,22 @@
+import { ajax } from "discourse/lib/ajax";
+import { bind } from "discourse-common/utils/decorators";
+import SidebarCustomSection from "discourse/components/sidebar/common/custom-sections";
+
+export default class SidebarUserCustomSections extends SidebarCustomSection {
+  constructor() {
+    super(...arguments);
+
+    this.messageBus.subscribe("/refresh-sidebar-sections", this._refresh);
+  }
+
+  willDestroy() {
+    this.messageBus.unsubscribe("/refresh-sidebar-sections");
+  }
+
+  @bind
+  _refresh() {
+    return ajax("/sidebar_sections.json", {}).then((json) => {
+      this.currentUser.set("sidebar_sections", json.sidebar_sections);
+    });
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/user/messages-section.js b/app/assets/javascripts/discourse/app/components/sidebar/user/messages-section.js
index af421985fdd..5747b39d69b 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/user/messages-section.js
+++ b/app/assets/javascripts/discourse/app/components/sidebar/user/messages-section.js
@@ -38,10 +38,6 @@ export default class SidebarUserMessagesSection extends Component {
       this._refreshSectionLinksDisplayState
     );
 
-    this.pmTopicTrackingState
-      .startTracking()
-      .then(this._refreshSectionLinkCounts);
-
     this._pmTopicTrackingStateKey = "messages-section";
 
     this.pmTopicTrackingState.onStateChange(
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/user/sections.hbs b/app/assets/javascripts/discourse/app/components/sidebar/user/sections.hbs
index f1902565d03..b18a4b0cb1f 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/user/sections.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/user/sections.hbs
@@ -1,5 +1,5 @@
 <div class="sidebar-sections">
-  <Sidebar::User::CommunitySection @collapsable={{@collapsableSections}} />
+  <Sidebar::User::CustomSections @collapsable={{@collapsableSections}} />
   <Sidebar::User::CategoriesSection @collapsable={{@collapsableSections}} />
 
   {{#if this.currentUser.display_sidebar_tags}}
@@ -10,45 +10,5 @@
     <Sidebar::User::MessagesSection @collapsable={{@collapsableSections}} />
   {{/if}}
 
-  {{#each this.customSections as |customSection|}}
-    <Sidebar::Section
-      @sectionName={{customSection.name}}
-      @headerLinkText={{customSection.text}}
-      @headerLinkTitle={{customSection.title}}
-      @headerActionsIcon={{customSection.actionsIcon}}
-      @headerActions={{customSection.actions}}
-      @willDestroy={{customSection.willDestroy}}
-      @collapsable={{@collapsableSections}}
-      @displaySection={{customSection.displaySection}}
-    >
-
-      {{#each customSection.links as |link|}}
-        <Sidebar::SectionLink
-          @linkName={{link.name}}
-          @class={{link.classNames}}
-          @route={{link.route}}
-          @model={{link.model}}
-          @models={{link.models}}
-          @title={{link.title}}
-          @contentCSSClass={{link.contentCSSClass}}
-          @prefixColor={{link.prefixColor}}
-          @prefixBadge={{link.prefixBadge}}
-          @prefixType={{link.prefixType}}
-          @prefixValue={{link.prefixValue}}
-          @prefixCSSClass={{link.prefixCSSClass}}
-          @suffixType={{link.suffixType}}
-          @suffixValue={{link.suffixValue}}
-          @suffixCSSClass={{link.suffixCSSClass}}
-          @hoverType={{link.hoverType}}
-          @hoverValue={{link.hoverValue}}
-          @hoverAction={{link.hoverAction}}
-          @hoverTitle={{link.hoverTitle}}
-          @currentWhen={{link.currentWhen}}
-          @didInsert={{link.didInsert}}
-          @willDestroy={{link.willDestroy}}
-          @content={{link.text}}
-        />
-      {{/each}}
-    </Sidebar::Section>
-  {{/each}}
+  <Sidebar::ApiSections @collapsable={{@collapsableSections}} />
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/user/sections.js b/app/assets/javascripts/discourse/app/components/sidebar/user/sections.js
index f835ad71ab1..1830dc6dcda 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/user/sections.js
+++ b/app/assets/javascripts/discourse/app/components/sidebar/user/sections.js
@@ -1,6 +1,4 @@
 import Component from "@glimmer/component";
-import { customSections as sidebarCustomSections } from "discourse/lib/sidebar/custom-sections";
-import { getOwner, setOwner } from "@ember/application";
 import { inject as service } from "@ember/service";
 
 export default class SidebarUserSections extends Component {
@@ -8,21 +6,6 @@ export default class SidebarUserSections extends Component {
   @service currentUser;
   @service site;
 
-  customSections;
-
-  constructor() {
-    super(...arguments);
-    this.customSections = this._customSections;
-  }
-
-  get _customSections() {
-    return sidebarCustomSections.map((customSection) => {
-      const section = new customSection({ sidebar: this });
-      setOwner(section, getOwner(this));
-      return section;
-    });
-  }
-
   get enableMessagesSection() {
     return this.currentUser?.can_send_private_messages;
   }
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.hbs b/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.hbs
index b610245700b..863a54ef2b8 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.hbs
@@ -1,58 +1,47 @@
-{{#if this.shouldDisplay}}
-  <Sidebar::Section
-    @sectionName="tags"
-    @headerLinkText={{i18n "sidebar.sections.tags.header_link_text"}}
-    @headerActions={{array
-      (hash
-        action=this.editTracked
-        title=(i18n "sidebar.sections.tags.header_action_title")
-      )
-    }}
-    @headerActionsIcon="pencil-alt"
-    @collapsable={{@collapsable}}
-  >
+<Sidebar::Section
+  @sectionName="tags"
+  @headerLinkText={{i18n "sidebar.sections.tags.header_link_text"}}
+  @headerActions={{array
+    (hash
+      action=this.showModal
+      title=(i18n "sidebar.sections.tags.header_action_title")
+    )
+  }}
+  @headerActionsIcon="pencil-alt"
+  @collapsable={{@collapsable}}
+>
 
-    {{#if (gt this.sectionLinks.length 0)}}
-      {{#each this.sectionLinks as |sectionLink|}}
-        <Sidebar::SectionLink
-          @linkName={{sectionLink.name}}
-          @route={{sectionLink.route}}
-          @title={{sectionLink.title}}
-          @content={{sectionLink.text}}
-          @currentWhen={{sectionLink.currentWhen}}
-          @prefixType={{sectionLink.prefixType}}
-          @prefixValue={{sectionLink.prefixValue}}
-          @badgeText={{sectionLink.badgeText}}
-          @models={{sectionLink.models}}
-          @suffixCSSClass={{sectionLink.suffixCSSClass}}
-          @suffixValue={{sectionLink.suffixValue}}
-          @suffixType={{sectionLink.suffixType}}
-        />
-      {{/each}}
-    {{else}}
+  {{#if (gt this.sectionLinks.length 0)}}
+    {{#each this.sectionLinks as |sectionLink|}}
       <Sidebar::SectionLink
-        @linkName="configure-tags"
-        @route="preferences.sidebar"
-        @prefixType="icon"
-        @prefixValue="pencil-alt"
-        @model={{this.currentUser}}
-        @content={{i18n "sidebar.sections.tags.links.add_tags.content"}}
-        @title={{i18n "sidebar.sections.tags.links.add_tags.title"}}
+        @route={{sectionLink.route}}
+        @title={{sectionLink.title}}
+        @content={{sectionLink.text}}
+        @currentWhen={{sectionLink.currentWhen}}
+        @prefixType={{sectionLink.prefixType}}
+        @prefixValue={{sectionLink.prefixValue}}
+        @prefixColor={{sectionLink.prefixColor}}
+        @badgeText={{sectionLink.badgeText}}
+        @models={{sectionLink.models}}
+        @suffixCSSClass={{sectionLink.suffixCSSClass}}
+        @suffixValue={{sectionLink.suffixValue}}
+        @suffixType={{sectionLink.suffixType}}
+        data-tag-name={{sectionLink.tagName}}
       />
-    {{/if}}
+    {{/each}}
+  {{/if}}
 
-    <Sidebar::Common::AllTagsSectionLink />
+  <Sidebar::Common::AllTagsSectionLink />
 
-    {{#if (and this.currentUser.admin (not this.hasDefaultSidebarTags))}}
-      <Sidebar::SectionLink
-        @linkName="configure-default-sidebar-tags"
-        @content={{i18n "sidebar.sections.tags.configure_defaults"}}
-        @prefixType="icon"
-        @prefixValue="wrench"
-        @route="adminSiteSettingsCategory"
-        @model="sidebar"
-        @query={{hash filter="default_sidebar_tags"}}
-      />
-    {{/if}}
-  </Sidebar::Section>
-{{/if}}
\ No newline at end of file
+  {{#if this.shouldDisplayDefaultConfig}}
+    <Sidebar::SectionLink
+      @linkName="configure-default-navigation-menu-tags"
+      @content={{i18n "sidebar.sections.tags.configure_defaults"}}
+      @prefixType="icon"
+      @prefixValue="wrench"
+      @route="adminSiteSettingsCategory"
+      @model="sidebar"
+      @query={{hash filter="default_navigation_menu_tags"}}
+    />
+  {{/if}}
+</Sidebar::Section>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.js b/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.js
index 950d9fea914..3a52c2cb576 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.js
+++ b/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.js
@@ -1,17 +1,21 @@
-import { cached } from "@glimmer/tracking";
 import Component from "@glimmer/component";
-import { inject as service } from "@ember/service";
 import { action } from "@ember/object";
+import { cached } from "@glimmer/tracking";
+import { inject as service } from "@ember/service";
 
 import TagSectionLink from "discourse/lib/sidebar/user/tags-section/tag-section-link";
 import PMTagSectionLink from "discourse/lib/sidebar/user/tags-section/pm-tag-section-link";
+import { hasDefaultSidebarTags } from "discourse/lib/sidebar/helpers";
+import SidebarEditNavigationMenuTagsModal from "discourse/components/sidebar/edit-navigation-menu/tags-modal";
 
 export default class SidebarUserTagsSection extends Component {
-  @service router;
-  @service topicTrackingState;
-  @service pmTopicTrackingState;
   @service currentUser;
+  @service modal;
+  @service pmTopicTrackingState;
+  @service router;
+  @service site;
   @service siteSettings;
+  @service topicTrackingState;
 
   constructor() {
     super(...arguments);
@@ -33,18 +37,26 @@ export default class SidebarUserTagsSection extends Component {
   get sectionLinks() {
     const links = [];
 
-    for (const tag of this.currentUser.sidebarTags) {
+    let tags;
+
+    if (this.currentUser.sidebarTags.length > 0) {
+      tags = this.currentUser.sidebarTags;
+    } else {
+      tags = this.site.navigation_menu_site_top_tags || [];
+    }
+
+    for (const tag of tags) {
       if (tag.pm_only) {
         links.push(
           new PMTagSectionLink({
-            tagName: tag.name,
+            tag,
             currentUser: this.currentUser,
           })
         );
       } else {
         links.push(
           new TagSectionLink({
-            tagName: tag.name,
+            tag,
             topicTrackingState: this.topicTrackingState,
             currentUser: this.currentUser,
           })
@@ -55,26 +67,16 @@ export default class SidebarUserTagsSection extends Component {
     return links;
   }
 
-  /**
-   * If a site has no default sidebar tags configured, show tags section if the user has personal sidebar tags configured.
-   * Otherwise, hide the tags section from the sidebar for the user.
-   *
-   * If a site has default sidebar tags configured, always display the tags section.
-   */
-  get shouldDisplay() {
-    if (this.hasDefaultSidebarTags) {
-      return true;
-    } else {
-      return this.currentUser.sidebarTags.length > 0;
-    }
+  get shouldDisplayDefaultConfig() {
+    return this.currentUser.admin && !this.hasDefaultSidebarTags;
   }
 
   get hasDefaultSidebarTags() {
-    return this.siteSettings.default_sidebar_tags.length > 0;
+    return hasDefaultSidebarTags(this.siteSettings);
   }
 
   @action
-  editTracked() {
-    this.router.transitionTo("preferences.sidebar", this.currentUser);
+  showModal() {
+    this.modal.show(SidebarEditNavigationMenuTagsModal);
   }
 }
diff --git a/app/assets/javascripts/discourse/app/templates/components/signup-cta.hbs b/app/assets/javascripts/discourse/app/components/signup-cta.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/signup-cta.hbs
rename to app/assets/javascripts/discourse/app/components/signup-cta.hbs
diff --git a/app/assets/javascripts/discourse/app/components/site-header.js b/app/assets/javascripts/discourse/app/components/site-header.js
index b8c146d9325..01dd38728a0 100644
--- a/app/assets/javascripts/discourse/app/components/site-header.js
+++ b/app/assets/javascripts/discourse/app/components/site-header.js
@@ -8,8 +8,11 @@ import Docking from "discourse/mixins/docking";
 import MountWidget from "discourse/components/mount-widget";
 import ItsATrap from "@discourse/itsatrap";
 import RerenderOnDoNotDisturbChange from "discourse/mixins/rerender-on-do-not-disturb-change";
-import { observes } from "discourse-common/utils/decorators";
+import { bind, observes } from "discourse-common/utils/decorators";
 import { topicTitleDecorators } from "discourse/components/topic-title";
+import { isTesting } from "discourse-common/config/environment";
+import { DEBUG } from "@glimmer/env";
+import { registerWaiter, unregisterWaiter } from "@ember/test";
 
 const SiteHeaderComponent = MountWidget.extend(
   Docking,
@@ -26,12 +29,13 @@ const SiteHeaderComponent = MountWidget.extend(
     _scheduledRemoveAnimate: null,
     _topic: null,
     _itsatrap: null,
+    _applicationElement: null,
 
     @observes(
       "currentUser.unread_notifications",
       "currentUser.unread_high_priority_notifications",
       "currentUser.all_unread_notifications_count",
-      "currentUser.reviewable_count", // TODO: remove this when redesigned_user_menu_enabled is removed
+      "currentUser.reviewable_count",
       "currentUser.unseen_reviewable_count",
       "session.defaultColorSchemeIsDark",
       "session.darkModeAvailable"
@@ -54,6 +58,22 @@ const SiteHeaderComponent = MountWidget.extend(
     },
 
     _animateOpening(panel) {
+      let waiter;
+      if (DEBUG && isTesting()) {
+        waiter = () => false;
+        registerWaiter(waiter);
+      }
+
+      window.requestAnimationFrame(() => {
+        this._setAnimateOpeningProperties(panel);
+
+        if (DEBUG && isTesting()) {
+          unregisterWaiter(waiter);
+        }
+      });
+    },
+
+    _setAnimateOpeningProperties(panel) {
       const headerCloak = document.querySelector(".header-cloak");
       panel.classList.add("animate");
       headerCloak.classList.add("animate");
@@ -67,13 +87,16 @@ const SiteHeaderComponent = MountWidget.extend(
     },
 
     _animateClosing(panel, menuOrigin) {
-      const windowWidth = document.body.offsetWidth;
       this._animate = true;
       const headerCloak = document.querySelector(".header-cloak");
       panel.classList.add("animate");
       headerCloak.classList.add("animate");
-      const offsetDirection = menuOrigin === "left" ? -1 : 1;
-      panel.style.setProperty("--offset", `${offsetDirection * windowWidth}px`);
+      if (menuOrigin === "left") {
+        panel.style.setProperty("--offset", `-100vw`);
+      } else {
+        panel.style.setProperty("--offset", `100vw`);
+      }
+
       headerCloak.style.setProperty("--opacity", 0);
       this._scheduledRemoveAnimate = discourseLater(() => {
         panel.classList.remove("animate");
@@ -181,7 +204,7 @@ const SiteHeaderComponent = MountWidget.extend(
     },
 
     dockCheck() {
-      const header = document.querySelector("header.d-header");
+      const header = this.header;
 
       if (this.docAt === null) {
         if (!header) {
@@ -190,7 +213,8 @@ const SiteHeaderComponent = MountWidget.extend(
         this.docAt = header.offsetTop;
       }
 
-      const main = document.querySelector(".ember-application");
+      const main = (this._applicationElement ??=
+        document.querySelector(".ember-application"));
       const offsetTop = main ? main.offsetTop : 0;
       const offset = window.pageYOffset - offsetTop;
       if (offset >= this.docAt) {
@@ -226,9 +250,7 @@ const SiteHeaderComponent = MountWidget.extend(
       this.appEvents.on("header:show-topic", this, "setTopic");
       this.appEvents.on("header:hide-topic", this, "setTopic");
 
-      if (this.currentUser?.redesigned_user_menu_enabled) {
-        this.appEvents.on("user-menu:rendered", this, "_animateMenu");
-      }
+      this.appEvents.on("user-menu:rendered", this, "_animateMenu");
 
       if (this._dropDownHeaderEnabled()) {
         this.appEvents.on(
@@ -250,53 +272,35 @@ const SiteHeaderComponent = MountWidget.extend(
 
       const header = document.querySelector("header.d-header");
       this._itsatrap = new ItsATrap(header);
-      const dirs = this.currentUser?.redesigned_user_menu_enabled
-        ? ["up", "down"]
-        : ["right", "left"];
+      const dirs = ["up", "down"];
       this._itsatrap.bind(dirs, (e) => this._handleArrowKeysNav(e));
     },
 
     _handleArrowKeysNav(event) {
-      if (this.currentUser?.redesigned_user_menu_enabled) {
-        const activeTab = document.querySelector(
-          ".menu-tabs-container .btn.active"
+      const activeTab = document.querySelector(
+        ".menu-tabs-container .btn.active"
+      );
+      if (activeTab) {
+        let activeTabNumber = Number(
+          document.activeElement.dataset.tabNumber ||
+            activeTab.dataset.tabNumber
         );
-        if (activeTab) {
-          let activeTabNumber = Number(
-            document.activeElement.dataset.tabNumber ||
-              activeTab.dataset.tabNumber
-          );
-          const maxTabNumber =
-            document.querySelectorAll(".menu-tabs-container .btn").length - 1;
-          const isNext = event.key === "ArrowDown";
-          let nextTab = isNext ? activeTabNumber + 1 : activeTabNumber - 1;
-          if (isNext && nextTab > maxTabNumber) {
-            nextTab = 0;
-          }
-          if (!isNext && nextTab < 0) {
-            nextTab = maxTabNumber;
-          }
-          event.preventDefault();
-          document
-            .querySelector(
-              `.menu-tabs-container .btn[data-tab-number='${nextTab}']`
-            )
-            .focus();
+        const maxTabNumber =
+          document.querySelectorAll(".menu-tabs-container .btn").length - 1;
+        const isNext = event.key === "ArrowDown";
+        let nextTab = isNext ? activeTabNumber + 1 : activeTabNumber - 1;
+        if (isNext && nextTab > maxTabNumber) {
+          nextTab = 0;
         }
-      } else {
-        const activeTab = document.querySelector(".glyphs .menu-link.active");
-
-        if (activeTab) {
-          let focusedTab = document.activeElement;
-          if (!focusedTab.dataset.tabNumber) {
-            focusedTab = activeTab;
-          }
-
-          this.appEvents.trigger("user-menu:navigation", {
-            key: event.key,
-            tabNumber: Number(focusedTab.dataset.tabNumber),
-          });
+        if (!isNext && nextTab < 0) {
+          nextTab = maxTabNumber;
         }
+        event.preventDefault();
+        document
+          .querySelector(
+            `.menu-tabs-container .btn[data-tab-number='${nextTab}']`
+          )
+          .focus();
       }
     },
 
@@ -315,9 +319,7 @@ const SiteHeaderComponent = MountWidget.extend(
       this.appEvents.off("header:show-topic", this, "setTopic");
       this.appEvents.off("header:hide-topic", this, "setTopic");
       this.appEvents.off("dom:clean", this, "_cleanDom");
-      if (this.currentUser?.redesigned_user_menu_enabled) {
-        this.appEvents.off("user-menu:rendered", this, "_animateMenu");
-      }
+      this.appEvents.off("user-menu:rendered", this, "_animateMenu");
 
       if (this._dropDownHeaderEnabled()) {
         this.appEvents.off(
@@ -343,6 +345,7 @@ const SiteHeaderComponent = MountWidget.extend(
         canSignUp: this.canSignUp,
         sidebarEnabled: this.sidebarEnabled,
         showSidebar: this.showSidebar,
+        navigationMenuQueryParamOverride: this.navigationMenuQueryParamOverride,
       };
     },
 
@@ -364,7 +367,6 @@ const SiteHeaderComponent = MountWidget.extend(
         return;
       }
 
-      const windowWidth = document.body.offsetWidth;
       const viewMode =
         this.site.mobileView || this.site.narrowDesktopView
           ? "slide-in"
@@ -373,9 +375,6 @@ const SiteHeaderComponent = MountWidget.extend(
       menuPanels.forEach((panel) => {
         const headerCloak = document.querySelector(".header-cloak");
         let width = parseInt(panel.getAttribute("data-max-width"), 10) || 300;
-        if (windowWidth - width < 50) {
-          width = windowWidth - 50;
-        }
         if (this._panMenuOffset) {
           this._panMenuOffset = -width;
         }
@@ -383,77 +382,23 @@ const SiteHeaderComponent = MountWidget.extend(
         panel.classList.remove("drop-down");
         panel.classList.remove("slide-in");
         panel.classList.add(viewMode);
+
         if (this._animate || this._panMenuOffset !== 0) {
           if (
             (this.site.mobileView || this.site.narrowDesktopView) &&
             panel.parentElement.classList.contains(this._leftMenuClass())
           ) {
             this._panMenuOrigin = "left";
-            panel.style.setProperty("--offset", `${-windowWidth}px`);
+            panel.style.setProperty("--offset", `-100vw`);
           } else {
             this._panMenuOrigin = "right";
-            panel.style.setProperty("--offset", `${windowWidth}px`);
+            panel.style.setProperty("--offset", `100vw`);
           }
           headerCloak.style.setProperty("--opacity", 0);
         }
 
-        const panelBody = panel.querySelector(".panel-body");
-
-        // We use a mutationObserver to check for style changes, so it's important
-        // we don't set it if it doesn't change. Same goes for the panelBody!
-
-        if (!this.site.mobileView && !this.site.narrowDesktopView) {
-          const buttonPanel = document.querySelectorAll("header ul.icons");
-          if (buttonPanel.length === 0) {
-            return;
-          }
-
-          // These values need to be set here, not in the css file - this is to deal with the
-          // possibility of the window being resized and the menu changing from .slide-in to .drop-down.
-          if (panel.style.top !== "100%" || panel.style.height !== "auto") {
-            panel.style.setProperty("top", "100%");
-            panel.style.setProperty("height", "auto");
-          }
-        } else {
+        if (viewMode === "slide-in") {
           headerCloak.style.display = "block";
-
-          const menuTop = headerTop();
-
-          const winHeightOffset = this.currentUser?.redesigned_user_menu_enabled
-            ? 0
-            : 16;
-          let initialWinHeight = window.innerHeight;
-          const winHeight = initialWinHeight - winHeightOffset;
-
-          let height = winHeight - menuTop;
-
-          const isIPadApp = document.body.classList.contains("footer-nav-ipad"),
-            heightProp = isIPadApp ? "max-height" : "height",
-            iPadOffset = 10;
-
-          if (isIPadApp) {
-            height = winHeight - menuTop - iPadOffset;
-          }
-
-          if (panelBody.style.height !== "100%") {
-            panelBody.style.setProperty("height", "100%");
-          }
-          if (
-            panel.style.top !== `${menuTop}px` ||
-            panel.style[heightProp] !== `${height}px`
-          ) {
-            panel.style.top = `${menuTop}px`;
-            panel.style.setProperty(heightProp, `${height}px`);
-            if (headerCloak) {
-              headerCloak.style.top = `${menuTop}px`;
-            }
-          }
-        }
-
-        // TODO: remove the if condition when redesigned_user_menu_enabled is
-        // removed
-        if (!panel.classList.contains("revamped")) {
-          panel.style.setProperty("width", `${width}px`);
         }
         if (this._animate) {
           this._animateOpening(panel);
@@ -475,53 +420,90 @@ const SiteHeaderComponent = MountWidget.extend(
 export default SiteHeaderComponent.extend({
   classNames: ["d-header-wrap"],
   classNameBindings: ["site.mobileView::drop-down-mode"],
+  headerWrap: null,
+  header: null,
 
   init() {
     this._super(...arguments);
-
     this._resizeObserver = null;
   },
 
+  @bind
+  updateHeaderOffset() {
+    let headerWrapTop = this.headerWrap.getBoundingClientRect().top;
+
+    if (headerWrapTop !== 0) {
+      headerWrapTop -= Math.max(0, document.body.getBoundingClientRect().top);
+    }
+
+    if (DEBUG && isTesting()) {
+      headerWrapTop -= document
+        .getElementById("ember-testing-container")
+        .getBoundingClientRect().top;
+
+      headerWrapTop -= 1; // For 1px border on testing container
+    }
+
+    const documentStyle = document.documentElement.style;
+
+    const currentValue = documentStyle.getPropertyValue("--header-offset");
+    const newValue = `${this.headerWrap.offsetHeight + headerWrapTop}px`;
+
+    if (currentValue !== newValue) {
+      documentStyle.setProperty("--header-offset", newValue);
+    }
+  },
+
+  @bind
+  onScroll() {
+    schedule("afterRender", this.updateHeaderOffset);
+  },
+
   didInsertElement() {
     this._super(...arguments);
 
     this.appEvents.on("site-header:force-refresh", this, "queueRerender");
 
-    const header = document.querySelector(".d-header-wrap");
-    if (header) {
+    this.headerWrap = document.querySelector(".d-header-wrap");
+
+    if (this.headerWrap) {
       schedule("afterRender", () => {
+        this.header = this.headerWrap.querySelector("header.d-header");
+        this.updateHeaderOffset();
+        const headerTop = this.header.offsetTop;
         document.documentElement.style.setProperty(
-          "--header-offset",
-          `${header.offsetHeight}px`
+          "--header-top",
+          `${headerTop}px`
         );
       });
+
+      window.addEventListener("scroll", this.onScroll, {
+        passive: true,
+      });
     }
 
     if ("ResizeObserver" in window) {
       this._resizeObserver = new ResizeObserver((entries) => {
         for (let entry of entries) {
           if (entry.contentRect) {
+            const headerTop = this.header.offsetTop;
             document.documentElement.style.setProperty(
-              "--header-offset",
-              entry.contentRect.height + "px"
+              "--header-top",
+              `${headerTop}px`
             );
+            this.updateHeaderOffset();
           }
         }
       });
 
-      this._resizeObserver.observe(header);
+      this._resizeObserver.observe(this.headerWrap);
     }
   },
 
   willDestroyElement() {
     this._super(...arguments);
-
+    window.removeEventListener("scroll", this.onScroll);
     this._resizeObserver?.disconnect();
     this.appEvents.off("site-header:force-refresh", this, "queueRerender");
   },
 });
-
-export function headerTop() {
-  const header = document.querySelector("header.d-header");
-  return header.offsetTop ? header.offsetTop : 0;
-}
diff --git a/app/assets/javascripts/discourse/app/templates/components/slow-mode-info.hbs b/app/assets/javascripts/discourse/app/components/slow-mode-info.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/slow-mode-info.hbs
rename to app/assets/javascripts/discourse/app/components/slow-mode-info.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/software-update-prompt.hbs b/app/assets/javascripts/discourse/app/components/software-update-prompt.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/software-update-prompt.hbs
rename to app/assets/javascripts/discourse/app/components/software-update-prompt.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/sub-category-item.hbs b/app/assets/javascripts/discourse/app/components/sub-category-item.hbs
similarity index 55%
rename from app/assets/javascripts/discourse/app/templates/components/sub-category-item.hbs
rename to app/assets/javascripts/discourse/app/components/sub-category-item.hbs
index a8d88651f1a..dadf3b9801d 100644
--- a/app/assets/javascripts/discourse/app/templates/components/sub-category-item.hbs
+++ b/app/assets/javascripts/discourse/app/components/sub-category-item.hbs
@@ -3,7 +3,11 @@
     <CategoryTitleBefore @category={{this.category}} />
     {{category-link this.category hideParent="true"}}
     {{#unless this.hideUnread}}
-      <CategoryUnread @category={{this.category}} />
+      <CategoryUnread
+        @category={{this.category}}
+        @unreadTopicsCount={{this.unreadTopicsCount}}
+        @newTopicsCount={{this.newTopicsCount}}
+      />
     {{/unless}}
   </span>
 {{/unless}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/sub-category-row.hbs b/app/assets/javascripts/discourse/app/components/sub-category-row.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/sub-category-row.hbs
rename to app/assets/javascripts/discourse/app/components/sub-category-row.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/subcategories-with-featured-topics.hbs b/app/assets/javascripts/discourse/app/components/subcategories-with-featured-topics.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/subcategories-with-featured-topics.hbs
rename to app/assets/javascripts/discourse/app/components/subcategories-with-featured-topics.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/suggested-topics.hbs b/app/assets/javascripts/discourse/app/components/suggested-topics.hbs
similarity index 65%
rename from app/assets/javascripts/discourse/app/templates/components/suggested-topics.hbs
rename to app/assets/javascripts/discourse/app/components/suggested-topics.hbs
index 3605646bc38..90e8f6d2297 100644
--- a/app/assets/javascripts/discourse/app/templates/components/suggested-topics.hbs
+++ b/app/assets/javascripts/discourse/app/components/suggested-topics.hbs
@@ -1,12 +1,14 @@
 <div
   id="suggested-topics"
-  class="suggested-topics"
+  class="more-content-topics {{if this.hidden 'hidden'}}"
   role="complementary"
   aria-labelledby="suggested-topics-title"
+  data-mobile-title={{i18n "suggested_topics.pill"}}
+  data-list-id={{this.listId}}
 >
-  <UserTip @id="suggested_topics" />
+  <UserTip @id="suggested_topics" @selector=".user-tip-reference" />
 
-  <h3 id="suggested-topics-title" class="suggested-topics-title">
+  <h3 id="suggested-topics-title" class="more-topics-title">
     {{i18n this.suggestedTitleLabel}}
   </h3>
 
@@ -25,11 +27,4 @@
   <h3 class="suggested-topics-message">
     {{html-safe this.browseMoreMessage}}
   </h3>
-</div>
-
-<PluginOutlet
-  @name="below-suggested-topics"
-  @tagName="span"
-  @connectorTagName="div"
-  @args={{hash topic=this.topic}}
-/>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/suggested-topics.js b/app/assets/javascripts/discourse/app/components/suggested-topics.js
index ad0c6671706..3a46a0670ec 100644
--- a/app/assets/javascripts/discourse/app/components/suggested-topics.js
+++ b/app/assets/javascripts/discourse/app/components/suggested-topics.js
@@ -5,9 +5,12 @@ import { categoryBadgeHTML } from "discourse/helpers/category-link";
 import discourseComputed from "discourse-common/utils/decorators";
 import getURL from "discourse-common/lib/get-url";
 import { iconHTML } from "discourse-common/lib/icon-library";
+import { inject as service } from "@ember/service";
 
 export default Component.extend({
   tagName: "",
+  moreTopicsPreferenceTracking: service(),
+  listId: "suggested-topics",
 
   suggestedTitleLabel: computed("topic", function () {
     const href = this.currentUser && this.currentUser.pmPath(this.topic);
@@ -18,6 +21,11 @@ export default Component.extend({
     }
   }),
 
+  @discourseComputed("moreTopicsPreferenceTracking.preference")
+  hidden(preference) {
+    return this.site.mobileView && preference !== this.listId;
+  },
+
   @discourseComputed(
     "topic",
     "pmTopicTrackingState.isTracking",
diff --git a/app/assets/javascripts/discourse/app/components/table-header-toggle.hbs b/app/assets/javascripts/discourse/app/components/table-header-toggle.hbs
new file mode 100644
index 00000000000..dc32c5c91fb
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/table-header-toggle.hbs
@@ -0,0 +1,20 @@
+<div
+  class="header-contents"
+  id={{this.id}}
+  role="button"
+  tabindex="0"
+  aria-label={{this.ariaLabel}}
+  aria-pressed={{this.pressedState}}
+>
+
+  {{yield}}
+  <span class="text">
+    {{directory-table-header-title
+      field=this.field
+      labelKey=this.labelKey
+      icon=this.icon
+      translated=this.translated
+    }}
+    {{this.chevronIcon}}
+  </span>
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/table-header-toggle.js b/app/assets/javascripts/discourse/app/components/table-header-toggle.js
index 78dc01dffee..1b1bb07ce1a 100644
--- a/app/assets/javascripts/discourse/app/components/table-header-toggle.js
+++ b/app/assets/javascripts/discourse/app/components/table-header-toggle.js
@@ -6,8 +6,8 @@ import discourseComputed from "discourse-common/utils/decorators";
 import I18n from "I18n";
 
 export default Component.extend({
-  tagName: "th",
-  classNames: ["sortable"],
+  tagName: "div",
+  classNames: ["directory-table__column-header", "sortable"],
   attributeBindings: ["title", "colspan", "ariaSort:aria-sort", "role"],
   role: "columnheader",
   labelKey: null,
diff --git a/app/assets/javascripts/discourse/app/templates/components/tag-drop-link.hbs b/app/assets/javascripts/discourse/app/components/tag-drop-link.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/tag-drop-link.hbs
rename to app/assets/javascripts/discourse/app/components/tag-drop-link.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/tag-groups-form.hbs b/app/assets/javascripts/discourse/app/components/tag-groups-form.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/tag-groups-form.hbs
rename to app/assets/javascripts/discourse/app/components/tag-groups-form.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/tag-info.hbs b/app/assets/javascripts/discourse/app/components/tag-info.hbs
similarity index 96%
rename from app/assets/javascripts/discourse/app/templates/components/tag-info.hbs
rename to app/assets/javascripts/discourse/app/components/tag-info.hbs
index 5e72224c3a6..bda4cdadc52 100644
--- a/app/assets/javascripts/discourse/app/templates/components/tag-info.hbs
+++ b/app/assets/javascripts/discourse/app/components/tag-info.hbs
@@ -120,6 +120,7 @@
             @excludeSynonyms={{true}}
             @excludeHasSynonyms={{true}}
             @unlimitedTagCount={{true}}
+            @allowCreate={{true}}
           />
           <DButton
             @class="ok"
@@ -131,11 +132,12 @@
       </section>
     {{/if}}
     {{#if this.canAdminTag}}
-      <PluginOutlet
-        @name="tag-custom-settings"
-        @args={{hash tag=this.tagInfo}}
-        @tagName="section"
-      />
+      <section>
+        <PluginOutlet
+          @name="tag-custom-settings"
+          @outletArgs={{hash tag=this.tagInfo}}
+        />
+      </section>
       <div class="tag-actions">
         <DButton
           @class="btn-default"
diff --git a/app/assets/javascripts/discourse/app/templates/components/tag-list.hbs b/app/assets/javascripts/discourse/app/components/tag-list.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/tag-list.hbs
rename to app/assets/javascripts/discourse/app/components/tag-list.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/tap-tile-grid.hbs b/app/assets/javascripts/discourse/app/components/tap-tile-grid.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/tap-tile-grid.hbs
rename to app/assets/javascripts/discourse/app/components/tap-tile-grid.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/tap-tile.hbs b/app/assets/javascripts/discourse/app/components/tap-tile.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/tap-tile.hbs
rename to app/assets/javascripts/discourse/app/components/tap-tile.hbs
diff --git a/app/assets/javascripts/discourse/app/components/text-field.js b/app/assets/javascripts/discourse/app/components/text-field.js
index 9044d9c1ced..8f82fffff4a 100644
--- a/app/assets/javascripts/discourse/app/components/text-field.js
+++ b/app/assets/javascripts/discourse/app/components/text-field.js
@@ -1,7 +1,7 @@
 import { cancel, next } from "@ember/runloop";
 import { isLTR, isRTL, siteDir } from "discourse/lib/text-direction";
 import I18n from "I18n";
-import TextField from "@ember/component/text-field";
+import { TextField } from "@ember/legacy-built-in-components";
 import discourseComputed from "discourse-common/utils/decorators";
 import discourseDebounce from "discourse-common/lib/debounce";
 
diff --git a/app/assets/javascripts/discourse/app/templates/components/text-overflow.hbs b/app/assets/javascripts/discourse/app/components/text-overflow.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/text-overflow.hbs
rename to app/assets/javascripts/discourse/app/components/text-overflow.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/time-input.hbs b/app/assets/javascripts/discourse/app/components/time-input.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/time-input.hbs
rename to app/assets/javascripts/discourse/app/components/time-input.hbs
diff --git a/app/assets/javascripts/discourse/app/components/time-input.js b/app/assets/javascripts/discourse/app/components/time-input.js
index 3489388dc9a..f655c725eaa 100644
--- a/app/assets/javascripts/discourse/app/components/time-input.js
+++ b/app/assets/javascripts/discourse/app/components/time-input.js
@@ -89,20 +89,19 @@ export default Component.extend({
     // theres 1440 minutes in a day
     // and 1440 / 15 = 96
     let i = 0;
-    while (i < 96) {
+    let option = start;
+    options.push(option);
+    while (i < 95) {
       // while diff with minimumTime is less than one hour
       // use 15 minutes steps and then 30 minutes
-      const minutes = this.minimumTime ? (i <= 4 ? 15 : 30) : 15;
-      const option = start + i * minutes;
-
+      const minutes = this.minimumTime ? (i <= 3 ? 15 : 30) : 15;
+      option = option + minutes;
       // when start is higher than 0 we will reach 1440 minutes
-      // before the 96 iterations
+      // before the 95 iterations
       if (option > 1440) {
         break;
       }
-
       options.push(option);
-
       i++;
     }
 
@@ -112,15 +111,15 @@ export default Component.extend({
 
     options = options.sort((a, b) => a - b);
 
-    return options.map((option) => {
-      let name = convertMinutesToString(option);
+    return options.map((opt) => {
+      let name = convertMinutesToString(opt);
       let label;
 
       if (this.date && this.relativeDate) {
         const diff = this.date
           .clone()
           .startOf("day")
-          .add(option, "minutes")
+          .add(opt, "minutes")
           .diff(this.relativeDate, "minutes");
 
         if (diff < 1440) {
@@ -131,7 +130,7 @@ export default Component.extend({
       }
 
       return {
-        id: option,
+        id: opt,
         name,
         label,
         title: name,
diff --git a/app/assets/javascripts/discourse/app/templates/components/time-shortcut-picker.hbs b/app/assets/javascripts/discourse/app/components/time-shortcut-picker.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/time-shortcut-picker.hbs
rename to app/assets/javascripts/discourse/app/components/time-shortcut-picker.hbs
diff --git a/app/assets/javascripts/discourse/app/components/token-based-auth-dropdown.js b/app/assets/javascripts/discourse/app/components/token-based-auth-dropdown.js
new file mode 100644
index 00000000000..3d13eeb23aa
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/token-based-auth-dropdown.js
@@ -0,0 +1,40 @@
+import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
+import I18n from "I18n";
+import { computed } from "@ember/object";
+
+export default DropdownSelectBoxComponent.extend({
+  classNames: ["token-based-auth-dropdown"],
+
+  selectKitOptions: {
+    icon: "wrench",
+    showFullTitle: false,
+  },
+
+  content: computed(function () {
+    return [
+      {
+        id: "edit",
+        icon: "pencil-alt",
+        name: I18n.t("user.second_factor.edit"),
+      },
+      {
+        id: "disable",
+        icon: "trash-alt",
+        name: I18n.t("user.second_factor.disable"),
+      },
+    ];
+  }),
+
+  actions: {
+    onChange(id) {
+      switch (id) {
+        case "edit":
+          this.editSecondFactor(this.totp);
+          break;
+        case "disable":
+          this.disableSingleSecondFactor(this.totp);
+          break;
+      }
+    },
+  },
+});
diff --git a/app/assets/javascripts/discourse/app/templates/components/top-period-buttons.hbs b/app/assets/javascripts/discourse/app/components/top-period-buttons.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/top-period-buttons.hbs
rename to app/assets/javascripts/discourse/app/components/top-period-buttons.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-category.hbs b/app/assets/javascripts/discourse/app/components/topic-category.hbs
similarity index 73%
rename from app/assets/javascripts/discourse/app/templates/components/topic-category.hbs
rename to app/assets/javascripts/discourse/app/components/topic-category.hbs
index 52e5e758611..1849f46ad7d 100644
--- a/app/assets/javascripts/discourse/app/templates/components/topic-category.hbs
+++ b/app/assets/javascripts/discourse/app/components/topic-category.hbs
@@ -12,9 +12,10 @@
   {{/if}}
 </div>
 
-<PluginOutlet
-  @name="topic-category"
-  @tagName="span"
-  @connectorTagName="div"
-  @args={{hash topic=this.topic category=this.topic.category}}
-/>
\ No newline at end of file
+<span>
+  <PluginOutlet
+    @name="topic-category"
+    @connectorTagName="div"
+    @outletArgs={{hash topic=this.topic category=this.topic.category}}
+  />
+</span>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-dismiss-buttons.hbs b/app/assets/javascripts/discourse/app/components/topic-dismiss-buttons.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/topic-dismiss-buttons.hbs
rename to app/assets/javascripts/discourse/app/components/topic-dismiss-buttons.hbs
diff --git a/app/assets/javascripts/discourse/app/components/topic-dismiss-buttons.js b/app/assets/javascripts/discourse/app/components/topic-dismiss-buttons.js
index 4b85ebe572e..3b5e4603ea9 100644
--- a/app/assets/javascripts/discourse/app/components/topic-dismiss-buttons.js
+++ b/app/assets/javascripts/discourse/app/components/topic-dismiss-buttons.js
@@ -1,15 +1,17 @@
 import { action } from "@ember/object";
-import showModal from "discourse/lib/show-modal";
-import discourseLater from "discourse-common/lib/later";
-import isElementInViewport from "discourse/lib/is-element-in-viewport";
-import discourseComputed, { on } from "discourse-common/utils/decorators";
+import discourseComputed from "discourse-common/utils/decorators";
 import I18n from "I18n";
 import Component from "@ember/component";
+import { inject as service } from "@ember/service";
+import DismissReadModal from "discourse/components/modal/dismiss-read";
 
 export default Component.extend({
   tagName: "",
   classNames: ["topic-dismiss-buttons"],
 
+  currentUser: service(),
+  modal: service(),
+
   position: null,
   selectedTopics: null,
   model: null,
@@ -29,23 +31,13 @@ export default Component.extend({
     return `dismiss-new-${position}`;
   },
 
-  @discourseComputed(
-    "position",
-    "isOtherDismissUnreadButtonVisible",
-    "isOtherDismissNewButtonVisible"
-  )
-  showBasedOnPosition(
-    position,
-    isOtherDismissUnreadButtonVisible,
-    isOtherDismissNewButtonVisible
-  ) {
+  @discourseComputed("position", "model.topics.length")
+  showBasedOnPosition(position, topicCount) {
     if (position !== "top") {
       return true;
     }
 
-    return !(
-      isOtherDismissUnreadButtonVisible || isOtherDismissNewButtonVisible
-    );
+    return topicCount > 5;
   },
 
   @discourseComputed("selectedTopics.length")
@@ -60,7 +52,9 @@ export default Component.extend({
 
   @discourseComputed("selectedTopics.length")
   dismissNewLabel(selectedTopicCount) {
-    if (selectedTopicCount === 0) {
+    if (this.currentUser.new_new_view_enabled) {
+      return I18n.t("topics.bulk.dismiss_button");
+    } else if (selectedTopicCount === 0) {
       return I18n.t("topics.bulk.dismiss_new");
     }
     return I18n.t("topics.bulk.dismiss_new_with_selected", {
@@ -68,38 +62,17 @@ export default Component.extend({
     });
   },
 
-  // we want to only render the Dismiss... button at the top of the
-  // page if the user cannot see the bottom Dismiss... button based on their
-  // viewport, or if too many topics fill the page
-  @on("didInsertElement")
-  _determineOtherDismissVisibility() {
-    discourseLater(() => {
-      if (this.position === "top") {
-        this.set(
-          "isOtherDismissUnreadButtonVisible",
-          isElementInViewport(document.getElementById("dismiss-topics-bottom"))
-        );
-        this.set(
-          "isOtherDismissNewButtonVisible",
-          isElementInViewport(document.getElementById("dismiss-new-bottom"))
-        );
-      } else {
-        this.set("isOtherDismissUnreadButtonVisible", true);
-        this.set("isOtherDismissNewButtonVisible", true);
-      }
-    });
-  },
-
   @action
   dismissReadPosts() {
     let dismissTitle = "topics.bulk.dismiss_read";
-    if (this.selectedTopics.length > 0) {
+    if (this.selectedTopics.length) {
       dismissTitle = "topics.bulk.dismiss_read_with_selected";
     }
-    showModal("dismiss-read", {
-      titleTranslated: I18n.t(dismissTitle, {
+    this.modal.show(DismissReadModal, {
+      model: {
+        title: dismissTitle,
         count: this.selectedTopics.length,
-      }),
+      },
     });
   },
 });
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-entrance.hbs b/app/assets/javascripts/discourse/app/components/topic-entrance.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/topic-entrance.hbs
rename to app/assets/javascripts/discourse/app/components/topic-entrance.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-footer-buttons.hbs b/app/assets/javascripts/discourse/app/components/topic-footer-buttons.hbs
similarity index 95%
rename from app/assets/javascripts/discourse/app/templates/components/topic-footer-buttons.hbs
rename to app/assets/javascripts/discourse/app/components/topic-footer-buttons.hbs
index 678a98ef889..7ace8cae08f 100644
--- a/app/assets/javascripts/discourse/app/templates/components/topic-footer-buttons.hbs
+++ b/app/assets/javascripts/discourse/app/components/topic-footer-buttons.hbs
@@ -58,7 +58,7 @@
 
   <PluginOutlet
     @name="topic-footer-main-buttons-before-create"
-    @args={{hash topic=this.topic}}
+    @outletArgs={{hash topic=this.topic}}
     @connectorTagName="span"
   />
 
@@ -74,7 +74,7 @@
 
   <PluginOutlet
     @name="after-topic-footer-main-buttons"
-    @args={{hash topic=this.topic}}
+    @outletArgs={{hash topic=this.topic}}
     @connectorTagName="span"
   />
 </div>
@@ -97,6 +97,6 @@
 
 <PluginOutlet
   @name="after-topic-footer-buttons"
-  @args={{hash topic=this.topic}}
+  @outletArgs={{hash topic=this.topic}}
   @connectorTagName="span"
 />
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/topic-footer-buttons.js b/app/assets/javascripts/discourse/app/components/topic-footer-buttons.js
index af67f35d264..2cdd9803564 100644
--- a/app/assets/javascripts/discourse/app/components/topic-footer-buttons.js
+++ b/app/assets/javascripts/discourse/app/components/topic-footer-buttons.js
@@ -13,9 +13,6 @@ export default Component.extend({
 
   role: "region",
 
-  // Allow us to extend it
-  layoutName: "components/topic-footer-buttons",
-
   @discourseComputed("canSendPms", "topic.isPrivateMessage")
   canArchive(canSendPms, isPM) {
     return canSendPms && isPM;
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-list-item.hbs b/app/assets/javascripts/discourse/app/components/topic-list-item.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/topic-list-item.hbs
rename to app/assets/javascripts/discourse/app/components/topic-list-item.hbs
diff --git a/app/assets/javascripts/discourse/app/components/topic-list-item.js b/app/assets/javascripts/discourse/app/components/topic-list-item.js
index 16247e89c85..029771c44cf 100644
--- a/app/assets/javascripts/discourse/app/components/topic-list-item.js
+++ b/app/assets/javascripts/discourse/app/components/topic-list-item.js
@@ -3,7 +3,7 @@ import discourseComputed, {
   observes,
 } from "discourse-common/utils/decorators";
 import Component from "@ember/component";
-import DiscourseURL from "discourse/lib/url";
+import DiscourseURL, { groupPath } from "discourse/lib/url";
 import I18n from "I18n";
 import { RUNTIME_OPTIONS } from "discourse-common/lib/raw-handlebars-helpers";
 import { alias } from "@ember/object/computed";
@@ -13,6 +13,7 @@ import { schedule } from "@ember/runloop";
 import { topicTitleDecorators } from "discourse/components/topic-title";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
 import { htmlSafe } from "@ember/template";
+import { inject as service } from "@ember/service";
 
 export function showEntrance(e) {
   let target = $(e.target);
@@ -34,12 +35,23 @@ export function showEntrance(e) {
 }
 
 export function navigateToTopic(topic, href) {
-  this.appEvents.trigger("header:update-topic", topic);
+  if (this.siteSettings.page_loading_indicator !== "slider") {
+    // With the slider, it feels nicer for the header to update once the rest of the topic content loads,
+    // so skip setting it early.
+    this.appEvents.trigger("header:update-topic", topic);
+  }
+
+  this.session.set("lastTopicIdViewed", {
+    topicId: topic.id,
+    historyUuid: this.router.location.getState?.().uuid,
+  });
+
   DiscourseURL.routeTo(href || topic.get("url"));
   return false;
 }
 
 export default Component.extend({
+  router: service(),
   tagName: "tr",
   classNameBindings: [":topic-list-item", "unboundClassNames", "topic.visited"],
   attributeBindings: ["data-topic-id", "role", "ariaLevel:aria-level"],
@@ -59,6 +71,9 @@ export default Component.extend({
         htmlSafe(template(this, RUNTIME_OPTIONS))
       );
       schedule("afterRender", () => {
+        if (this.isDestroyed || this.isDestroying) {
+          return;
+        }
         if (this.selected && this.selected.includes(this.topic)) {
           this.element.querySelector("input.bulk-select").checked = true;
         }
@@ -115,6 +130,17 @@ export default Component.extend({
     nodeClassList.toggle("read", !data.show_indicator);
   },
 
+  @discourseComputed("topic.participant_groups")
+  participantGroups(groupNames) {
+    if (!groupNames) {
+      return [];
+    }
+
+    return groupNames.map((name) => {
+      return { name, url: groupPath(name) };
+    });
+  },
+
   @discourseComputed("topic.id")
   unreadIndicatorChannel(topicId) {
     return `/private-messages/unread-indicator/${topicId}`;
@@ -219,17 +245,19 @@ export default Component.extend({
     }
 
     const topic = this.topic;
-    if (e.target.classList.contains("bulk-select")) {
+    const target = e.target;
+    const classList = target.classList;
+    if (classList.contains("bulk-select")) {
       const selected = this.selected;
 
-      if (e.target.checked) {
+      if (target.checked) {
         selected.addObject(topic);
 
         if (this.lastChecked && e.shiftKey) {
           const bulkSelects = Array.from(
               document.querySelectorAll("input.bulk-select")
             ),
-            from = bulkSelects.indexOf(e.target),
+            from = bulkSelects.indexOf(target),
             to = bulkSelects.findIndex((el) => el.id === this.lastChecked.id),
             start = Math.min(from, to),
             end = Math.max(from, to);
@@ -242,27 +270,27 @@ export default Component.extend({
             });
         }
 
-        this.set("lastChecked", e.target);
+        this.set("lastChecked", target);
       } else {
         selected.removeObject(topic);
         this.set("lastChecked", null);
       }
     }
 
-    if (e.target.classList.contains("raw-topic-link")) {
+    if (classList.contains("raw-topic-link")) {
       if (wantsNewWindow(e)) {
         return true;
       }
       e.preventDefault();
-      return this.navigateToTopic(topic, e.target.getAttribute("href"));
+      return this.navigateToTopic(topic, target.getAttribute("href"));
     }
 
     // make full row click target on mobile, due to size constraints
     if (
       this.site.mobileView &&
-      (e.target.classList.contains("right") ||
-        e.target.classList.contains("topic-item-stats") ||
-        e.target.classList.contains("main-link"))
+      e.target.matches(
+        ".topic-list-data, .main-link, .right, .topic-item-stats, .topic-item-stats__category-tags, .discourse-tags"
+      )
     ) {
       if (wantsNewWindow(e)) {
         return true;
@@ -271,7 +299,10 @@ export default Component.extend({
       return this.navigateToTopic(topic, topic.lastUnreadUrl);
     }
 
-    if (e.target.closest("a.topic-status")) {
+    if (
+      classList.contains("d-icon-thumbtack") &&
+      target.closest("a.topic-status")
+    ) {
       this.topic.togglePinnedForUser();
       return false;
     }
@@ -305,7 +336,14 @@ export default Component.extend({
 
   _highlightIfNeeded: on("didInsertElement", function () {
     // highlight the last topic viewed
-    if (this.session.get("lastTopicIdViewed") === this.get("topic.id")) {
+    const lastViewedTopicInfo = this.session.get("lastTopicIdViewed");
+
+    const isLastViewedTopic =
+      lastViewedTopicInfo?.topicId === this.topic.id &&
+      lastViewedTopicInfo?.historyUuid ===
+        this.router.location.getState?.().uuid;
+
+    if (isLastViewedTopic) {
       this.session.set("lastTopicIdViewed", null);
       this.highlight({ isLastViewedTopic: true });
     } else if (this.get("topic.highlight")) {
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-list.hbs b/app/assets/javascripts/discourse/app/components/topic-list.hbs
similarity index 95%
rename from app/assets/javascripts/discourse/app/templates/components/topic-list.hbs
rename to app/assets/javascripts/discourse/app/components/topic-list.hbs
index 1f814417820..b11f110780a 100644
--- a/app/assets/javascripts/discourse/app/templates/components/topic-list.hbs
+++ b/app/assets/javascripts/discourse/app/components/topic-list.hbs
@@ -18,7 +18,7 @@
 
 <PluginOutlet
   @name="before-topic-list-body"
-  @args={{hash
+  @outletArgs={{hash
     topics=this.topics
     selected=this.selected
     bulkSelectEnabled=this.bulkSelectEnabled
@@ -54,7 +54,7 @@
     }}
     <PluginOutlet
       @name="after-topic-list-item"
-      @args={{hash topic=topic index=index}}
+      @outletArgs={{hash topic=topic index=index}}
       @connectorTagName="tr"
     />
   {{/each}}
@@ -62,7 +62,7 @@
 
 <PluginOutlet
   @name="after-topic-list-body"
-  @args={{hash
+  @outletArgs={{hash
     topics=this.topics
     selected=this.selected
     bulkSelectEnabled=this.bulkSelectEnabled
diff --git a/app/assets/javascripts/discourse/app/components/topic-list.js b/app/assets/javascripts/discourse/app/components/topic-list.js
index 6a1d1bd5198..f6fe1a2dd11 100644
--- a/app/assets/javascripts/discourse/app/components/topic-list.js
+++ b/app/assets/javascripts/discourse/app/components/topic-list.js
@@ -3,10 +3,12 @@ import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 import LoadMore from "discourse/mixins/load-more";
 import { on } from "@ember/object/evented";
-import { next, schedule } from "@ember/runloop";
-import showModal from "discourse/lib/show-modal";
+import { inject as service } from "@ember/service";
+import TopicBulkActions from "./modal/topic-bulk-actions";
 
 export default Component.extend(LoadMore, {
+  modal: service(),
+
   tagName: "table",
   classNames: ["topic-list"],
   classNameBindings: ["bulkSelectEnabled:sticky-header"],
@@ -67,26 +69,6 @@ export default Component.extend(LoadMore, {
     onScroll.call(this);
   },
 
-  scrollToLastPosition() {
-    if (!this.scrollOnLoad) {
-      return;
-    }
-
-    const scrollTo = this.session.topicListScrollPosition;
-    if (scrollTo >= 0) {
-      schedule("afterRender", () => {
-        if (this.element && !this.isDestroying && !this.isDestroyed) {
-          next(() => window.scrollTo(0, scrollTo));
-        }
-      });
-    }
-  },
-
-  didInsertElement() {
-    this._super(...arguments);
-    this.scrollToLastPosition();
-  },
-
   _updateLastVisitedTopic(topics, order, ascending, top) {
     this.set("lastVisitedTopic", null);
 
@@ -165,47 +147,42 @@ export default Component.extend(LoadMore, {
       let target = e.target.closest(sel);
 
       if (target) {
-        callback.call(this, target);
+        callback(target);
       }
     };
 
-    onClick("button.bulk-select", function () {
+    onClick("button.bulk-select", () => {
       this.toggleBulkSelect();
       this.rerender();
     });
 
-    onClick("button.bulk-select-all", function () {
+    onClick("button.bulk-select-all", () => {
       this.updateAutoAddTopicsToBulkSelect(true);
       document
         .querySelectorAll("input.bulk-select:not(:checked)")
         .forEach((el) => el.click());
     });
 
-    onClick("button.bulk-clear-all", function () {
+    onClick("button.bulk-clear-all", () => {
       this.updateAutoAddTopicsToBulkSelect(false);
       document
         .querySelectorAll("input.bulk-select:checked")
         .forEach((el) => el.click());
     });
 
-    onClick("th.sortable", function (element) {
+    onClick("th.sortable", (element) => {
       this.changeSort(element.dataset.sortOrder);
       this.rerender();
     });
 
-    onClick("button.bulk-select-actions", function () {
-      const controller = showModal("topic-bulk-actions", {
+    onClick("button.bulk-select-actions", () => {
+      this.modal.show(TopicBulkActions, {
         model: {
           topics: this.selected,
           category: this.category,
+          refreshClosure: this.bulkSelectAction,
         },
-        title: "topics.bulk.actions",
       });
-
-      const action = this.bulkSelectAction;
-      if (action) {
-        controller.set("refreshClosure", () => action());
-      }
     });
   },
 
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-navigation-popup.hbs b/app/assets/javascripts/discourse/app/components/topic-navigation-popup.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/topic-navigation-popup.hbs
rename to app/assets/javascripts/discourse/app/components/topic-navigation-popup.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-navigation.hbs b/app/assets/javascripts/discourse/app/components/topic-navigation.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/topic-navigation.hbs
rename to app/assets/javascripts/discourse/app/components/topic-navigation.hbs
diff --git a/app/assets/javascripts/discourse/app/components/topic-navigation.js b/app/assets/javascripts/discourse/app/components/topic-navigation.js
index 6bcea0da5fe..447933706a8 100644
--- a/app/assets/javascripts/discourse/app/components/topic-navigation.js
+++ b/app/assets/javascripts/discourse/app/components/topic-navigation.js
@@ -93,7 +93,9 @@ export default Component.extend(PanEvents, {
           !$target.is("#discourse-modal") &&
           !$parents.is(".modal-footer") &&
           ($target.is(".topic-timeline") ||
-            !$parents.is("#topic-progress-wrapper"))
+            !$parents.is("#topic-progress-wrapper")) &&
+          !$parents.is(".timeline-open-jump-to-post-prompt-btn") &&
+          !$target.is(".timeline-open-jump-to-post-prompt-btn")
         ) {
           this._collapseFullscreen();
         }
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-post-badges.hbs b/app/assets/javascripts/discourse/app/components/topic-post-badges.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/topic-post-badges.hbs
rename to app/assets/javascripts/discourse/app/components/topic-post-badges.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-progress.hbs b/app/assets/javascripts/discourse/app/components/topic-progress.hbs
similarity index 85%
rename from app/assets/javascripts/discourse/app/templates/components/topic-progress.hbs
rename to app/assets/javascripts/discourse/app/components/topic-progress.hbs
index 9ff4691a4ec..edbe065bff7 100644
--- a/app/assets/javascripts/discourse/app/templates/components/topic-progress.hbs
+++ b/app/assets/javascripts/discourse/app/components/topic-progress.hbs
@@ -15,6 +15,7 @@
 
 <nav
   title={{i18n "topic.progress.title"}}
+  aria-label={{i18n "topic.progress.title"}}
   class={{if this.hideProgress "hidden"}}
   id="topic-progress"
   style={{html-safe this.progressStyle}}
@@ -29,8 +30,4 @@
   <div class="bg"></div>
 </nav>
 
-<PluginOutlet
-  @name="after-topic-progress"
-  @tagName=""
-  @connectorTagName="div"
-/>
\ No newline at end of file
+<PluginOutlet @name="after-topic-progress" @connectorTagName="div" />
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-status.hbs b/app/assets/javascripts/discourse/app/components/topic-status.hbs
similarity index 97%
rename from app/assets/javascripts/discourse/app/templates/components/topic-status.hbs
rename to app/assets/javascripts/discourse/app/components/topic-status.hbs
index b9dd63accb7..377e02f5188 100644
--- a/app/assets/javascripts/discourse/app/templates/components/topic-status.hbs
+++ b/app/assets/javascripts/discourse/app/components/topic-status.hbs
@@ -65,5 +65,5 @@
 <PluginOutlet
   @name="after-topic-status"
   @connectorTagName="div"
-  @args={{hash topic=this.topic}}
+  @outletArgs={{hash topic=this.topic}}
 />
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/glimmer-topic-timeline.hbs b/app/assets/javascripts/discourse/app/components/topic-timeline.hbs
similarity index 77%
rename from app/assets/javascripts/discourse/app/components/glimmer-topic-timeline.hbs
rename to app/assets/javascripts/discourse/app/components/topic-timeline.hbs
index d2f7554e385..ef77e284523 100644
--- a/app/assets/javascripts/discourse/app/components/glimmer-topic-timeline.hbs
+++ b/app/assets/javascripts/discourse/app/components/topic-timeline.hbs
@@ -1,5 +1,8 @@
-<div class={{concat "timeline-container " this.class}}>
-  <div class="topic-timeline">
+<div
+  class={{concat-class "timeline-container" this.classes}}
+  {{did-insert this.addShowClass}}
+>
+  <div class="topic-timeline" {{did-insert this.addUserTip}}>
     <TopicTimeline::Container
       @model={{@model}}
       @enteredIndex={{this.enteredIndex}}
@@ -10,9 +13,9 @@
       @jumpToPostPrompt={{@jumpToPostPrompt}}
       @fullscreen={{@fullscreen}}
       @mobileView={{@mobileView}}
-      @currentUser={{this.currentUser}}
       @toggleMultiSelect={{@toggleMultiSelect}}
       @showTopicSlowModeUpdate={{@showTopicSlowModeUpdate}}
+      @showTopReplies={{@showTopReplies}}
       @deleteTopic={{@deleteTopic}}
       @recoverTopic={{@recoverTopic}}
       @toggleClosed={{@toggleClosed}}
@@ -25,6 +28,8 @@
       @convertToPublicTopic={{@convertToPublicTopic}}
       @convertToPrivateMessage={{@convertToPrivateMessage}}
       @replyToPost={{@replyToPost}}
+      @setDocked={{this.setDocked}}
+      @setDockedBottom={{this.setDockedBottom}}
     />
   </div>
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/topic-timeline.js b/app/assets/javascripts/discourse/app/components/topic-timeline.js
index d37ced63530..92c4f6d545a 100644
--- a/app/assets/javascripts/discourse/app/components/topic-timeline.js
+++ b/app/assets/javascripts/discourse/app/components/topic-timeline.js
@@ -1,133 +1,83 @@
-import Docking from "discourse/mixins/docking";
-import MountWidget from "discourse/components/mount-widget";
-import { headerOffset } from "discourse/lib/offset-calculator";
-import { next } from "@ember/runloop";
-import { observes } from "discourse-common/utils/decorators";
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
 import optionalService from "discourse/lib/optional-service";
+import { inject as service } from "@ember/service";
+import { bind } from "discourse-common/utils/decorators";
+import I18n from "I18n";
+import { action } from "@ember/object";
 
-export default MountWidget.extend(Docking, {
-  adminTools: optionalService(),
-  widget: "topic-timeline-container",
-  dockBottom: null,
-  dockAt: null,
-  intersectionObserver: null,
+export default class TopicTimeline extends Component {
+  @service siteSettings;
+  @service currentUser;
 
-  buildArgs() {
-    let attrs = {
-      topic: this.topic,
-      notificationLevel: this.notificationLevel,
-      topicTrackingState: this.topicTrackingState,
-      enteredIndex: this.enteredIndex,
-      dockAt: this.dockAt,
-      dockBottom: this.dockBottom,
-      mobileView: this.get("site.mobileView"),
-    };
+  @tracked enteredIndex = this.args.enteredIndex;
+  @tracked docked = false;
+  @tracked dockedBottom = false;
 
-    let event = this.prevEvent;
-    if (event) {
-      attrs.enteredIndex = event.postIndex - 1;
+  adminTools = optionalService();
+
+  constructor() {
+    super(...arguments);
+
+    if (this.args.prevEvent) {
+      this.enteredIndex = this.args.prevEvent.postIndex - 1;
+    }
+  }
+
+  get createdAt() {
+    return new Date(this.args.model.created_at);
+  }
+
+  get classes() {
+    const classes = [];
+    if (this.args.fullscreen) {
+      classes.push("timeline-fullscreen");
     }
 
-    if (this.fullscreen) {
-      attrs.fullScreen = true;
-      attrs.addShowClass = this.addShowClass;
-    }
-
-    return attrs;
-  },
-
-  @observes("topic.highest_post_number", "loading")
-  newPostAdded() {
-    this.queueRerender(() => this.queueDockCheck());
-  },
-
-  @observes("topic.details.notification_level")
-  _queueRerender() {
-    this.queueRerender();
-  },
-
-  dockCheck() {
-    const timeline = this.element.querySelector(".timeline-container");
-    const timelineHeight = (timeline && timeline.offsetHeight) || 400;
-
-    const prev = this.dockAt;
-    const posTop = headerOffset() + window.pageYOffset;
-    const pos = posTop + timelineHeight;
-
-    this.dockBottom = false;
-    if (posTop < this.topicTop) {
-      this.dockAt = parseInt(this.topicTop, 10);
-    } else if (pos > this.topicBottom) {
-      this.dockAt = parseInt(this.topicBottom - timelineHeight, 10);
-      this.dockBottom = true;
-      if (this.dockAt < 0) {
-        this.dockAt = 0;
-      }
-    } else {
-      this.dockAt = null;
-      this.fastDockAt = parseInt(this.topicBottom - timelineHeight, 10);
-    }
-
-    if (this.dockAt !== prev) {
-      this.queueRerender();
-    }
-  },
-
-  didInsertElement() {
-    this._super(...arguments);
-
-    if (this.fullscreen && !this.addShowClass) {
-      next(() => {
-        this.set("addShowClass", true);
-        this.queueRerender();
-      });
-    }
-
-    this.dispatch(
-      "topic:current-post-scrolled",
-      () => `timeline-scrollarea-${this.topic.id}`
-    );
-    this.dispatch("topic:toggle-actions", "topic-admin-menu-button");
-    if (!this.site.mobileView) {
-      this.appEvents.on("composer:opened", this, this.queueRerender);
-      this.appEvents.on("composer:resized", this, this.queueRerender);
-      this.appEvents.on("composer:closed", this, this.queueRerender);
-      if ("IntersectionObserver" in window) {
-        this.intersectionObserver = new IntersectionObserver((entries) => {
-          for (const entry of entries) {
-            const bounds = entry.boundingClientRect;
-
-            if (entry.target.id === "topic-bottom") {
-              this.set("topicBottom", bounds.y + window.scrollY);
-            } else {
-              this.set("topicTop", bounds.y + window.scrollY);
-            }
-          }
-        });
-
-        const elements = [
-          document.querySelector(".container.posts"),
-          document.querySelector("#topic-bottom"),
-        ];
-
-        for (let i = 0; i < elements.length; i++) {
-          this.intersectionObserver.observe(elements[i]);
-        }
+    if (this.docked) {
+      classes.push("timeline-docked");
+      if (this.dockedBottom) {
+        classes.push("timeline-docked-bottom");
       }
     }
-  },
 
-  willDestroyElement() {
-    this._super(...arguments);
+    return classes.join(" ");
+  }
 
-    if (!this.site.mobileView) {
-      this.appEvents.off("composer:opened", this, this.queueRerender);
-      this.appEvents.off("composer:resized", this, this.queueRerender);
-      this.appEvents.off("composer:closed", this, this.queueRerender);
-      if ("IntersectionObserver" in window) {
-        this.intersectionObserver?.disconnect();
-        this.intersectionObserver = null;
-      }
+  @bind
+  addShowClass(element) {
+    if (this.args.fullscreen && !this.args.addShowClass) {
+      element.classList.add("show");
     }
-  },
-});
+  }
+
+  @bind
+  addUserTip(element) {
+    if (!this.currentUser) {
+      return;
+    }
+
+    this.currentUser.showUserTip({
+      id: "topic_timeline",
+      titleText: I18n.t("user_tips.topic_timeline.title"),
+      contentText: I18n.t("user_tips.topic_timeline.content"),
+      reference: document.querySelector("div.timeline-scrollarea-wrapper"),
+      appendTo: element,
+      placement: "left",
+    });
+  }
+
+  @action
+  setDocked(value) {
+    if (this.docked !== value) {
+      this.docked = value;
+    }
+  }
+
+  @action
+  setDockedBottom(value) {
+    if (this.dockedBottom !== value) {
+      this.dockedBottom = value;
+    }
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/topic-timeline/back-button.hbs b/app/assets/javascripts/discourse/app/components/topic-timeline/back-button.hbs
index 5f146edd71e..4e58991621e 100644
--- a/app/assets/javascripts/discourse/app/components/topic-timeline/back-button.hbs
+++ b/app/assets/javascripts/discourse/app/components/topic-timeline/back-button.hbs
@@ -2,7 +2,7 @@
   @type="button"
   @class="btn-primary btn-small back-button"
   @title={{i18n "topic.timeline.back_description"}}
-  @onClick={{@onClick}}
+  @action={{@onGoBack}}
 >
   {{i18n "topic.timeline.back"}}
 </DButton>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/topic-timeline/container.hbs b/app/assets/javascripts/discourse/app/components/topic-timeline/container.hbs
index 1261221b116..6efc2aebde9 100644
--- a/app/assets/javascripts/discourse/app/components/topic-timeline/container.hbs
+++ b/app/assets/javascripts/discourse/app/components/topic-timeline/container.hbs
@@ -34,11 +34,11 @@
   </div>
 {{/if}}
 
-{{#if (and (not @fullscreen) @currentUser)}}
+{{#if (and (not @fullscreen) this.currentUser)}}
   <div class="timeline-controls">
     <PluginOutlet
       @name="timeline-controls-before"
-      @args={{hash model=@model}}
+      @outletArgs={{hash model=@model}}
     />
     <TopicAdminMenuButton
       @topic={{@model}}
@@ -82,7 +82,7 @@
       <TopicTimeline::Scroller
         @current={{this.current}}
         @total={{this.total}}
-        @goBack={{this.goBack}}
+        @onGoBack={{this.onGoBack}}
         @fullscreen={{@fullscreen}}
         @showDockedButton={{this.showDockedButton}}
         @date={{this.date}}
@@ -96,24 +96,18 @@
         onClick={{this.updatePercentage}}
       ></div>
 
-      {{#if this.hasBackPosition}}
+      {{#if (and this.hasBackPosition this.showButton)}}
         <div class="timeline-last-read" style={{this.lastReadStyle}}>
           {{d-icon "minus" class="progress"}}
-          {{#if this.showButton}}
-            <TopicTimeline::BackButton @onClick={{this.goBack}} />
-          {{/if}}
+          <TopicTimeline::BackButton @onGoBack={{this.goBack}} />
         </div>
       {{/if}}
     </div>
 
     <div class="timeline-date-wrapper">
-      <a
-        class="now-date"
-        onClick={{this.updatePercentage}}
-        title={{this.nowDate}}
-      >
+      <a class="now-date" onClick={{this.updatePercentage}}>
         <span>
-          {{this.nowDate}}
+          {{age-with-tooltip this.nowDate this.nowDateOptions}}
         </span>
       </a>
     </div>
@@ -123,16 +117,16 @@
     {{#if this.displaySummary}}
       <button
         type="button"
-        class="show-summary btn-small"
-        label={{i18n "summary.short_label"}}
+        class="show-summary btn btn-small"
         title={{i18n "summary.short_title"}}
-        {{on "click" @showSummary}}
+        {{on "click" @showTopReplies}}
       >
         {{d-icon "layer-group"}}
+        {{i18n "summary.short_label"}}
       </button>
     {{/if}}
 
-    {{#if (and @currentUser (not @fullscreen))}}
+    {{#if (and this.currentUser (not @fullscreen))}}
       {{#if this.canCreatePost}}
         <button
           type="button"
@@ -148,8 +142,7 @@
     {{#if @fullscreen}}
       <button
         type="button"
-        {{! we need to keep this a widget-button to not close the modal when opening form }}
-        class="widget-button btn btn-text jump-to-post"
+        class="timeline-open-jump-to-post-prompt-btn btn btn-text jump-to-post"
         title={{i18n "topic.progress.jump_prompt_long"}}
         {{on "click" @jumpToPostPrompt}}
       >
@@ -159,7 +152,7 @@
       </button>
     {{/if}}
 
-    {{#if @currentUser}}
+    {{#if this.currentUser}}
       <TopicNotificationsButton
         @notificationLevel={{@model.details.notification_level}}
         @topic={{@model}}
@@ -178,7 +171,7 @@
     {{/if}}
     <PluginOutlet
       @name="timeline-footer-controls-after"
-      @args={{hash model=@model}}
+      @outletArgs={{hash model=@model}}
     />
   </div>
 {{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/topic-timeline/container.js b/app/assets/javascripts/discourse/app/components/topic-timeline/container.js
index 9ed5d571b98..3d9c95fa108 100644
--- a/app/assets/javascripts/discourse/app/components/topic-timeline/container.js
+++ b/app/assets/javascripts/discourse/app/components/topic-timeline/container.js
@@ -1,13 +1,13 @@
 import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
 import { action } from "@ember/object";
-import { relativeAge } from "discourse/lib/formatter";
 import I18n from "I18n";
 import { htmlSafe } from "@ember/template";
 import { inject as service } from "@ember/service";
 import { bind, debounce } from "discourse-common/utils/decorators";
 import { actionDescriptionHtml } from "discourse/widgets/post-small-action";
 import domUtils from "discourse-common/utils/dom-utils";
+import { headerOffset } from "discourse/lib/offset-calculator";
 
 export const SCROLLER_HEIGHT = 50;
 const MIN_SCROLLAREA_HEIGHT = 170;
@@ -17,6 +17,7 @@ const LAST_READ_HEIGHT = 20;
 export default class TopicTimelineScrollArea extends Component {
   @service appEvents;
   @service siteSettings;
+  @service currentUser;
 
   @tracked showButton = false;
   @tracked current;
@@ -27,12 +28,16 @@ export default class TopicTimelineScrollArea extends Component {
   @tracked total;
   @tracked date;
   @tracked lastReadPercentage = null;
+  @tracked lastRead;
+  @tracked lastReadTop;
   @tracked before;
   @tracked after;
   @tracked timelineScrollareaStyle;
   @tracked dragging = false;
   @tracked excerpt = "";
 
+  intersectionObserver = null;
+
   constructor() {
     super(...arguments);
 
@@ -43,9 +48,41 @@ export default class TopicTimelineScrollArea extends Component {
       this.appEvents.on("composer:opened", this.calculatePosition);
       this.appEvents.on("composer:resized", this.calculatePosition);
       this.appEvents.on("composer:closed", this.calculatePosition);
+      this.appEvents.on("post-stream:posted", this.calculatePosition);
+    }
+
+    this.intersectionObserver = new IntersectionObserver((entries) => {
+      for (const entry of entries) {
+        const bounds = entry.boundingClientRect;
+
+        if (entry.target.id === "topic-bottom") {
+          this.topicBottom = bounds.y + window.scrollY;
+        } else {
+          this.topicTop = bounds.y + window.scrollY;
+        }
+      }
+    });
+
+    const elements = [
+      document.querySelector(".container.posts"),
+      document.querySelector("#topic-bottom"),
+    ];
+
+    for (let i = 0; i < elements.length; i++) {
+      this.intersectionObserver.observe(elements[i]);
     }
 
     this.calculatePosition();
+    this.dockCheck();
+  }
+
+  get displaySummary() {
+    return (
+      this.siteSettings.summary_timeline_button &&
+      !this.args.fullScreen &&
+      this.args.model.has_summary &&
+      !this.args.model.postStream.summary
+    );
   }
 
   get displayTimeLineScrollArea() {
@@ -53,8 +90,7 @@ export default class TopicTimelineScrollArea extends Component {
       return true;
     }
 
-    const streamLength = this.args.model.postStream?.stream?.length;
-    if (streamLength === 1) {
+    if (this.total === 1) {
       const postsWrapper = document.querySelector(".posts-wrapper");
       if (postsWrapper && postsWrapper.offsetHeight < 1000) {
         return false;
@@ -116,22 +152,21 @@ export default class TopicTimelineScrollArea extends Component {
     return this.lastReadTop > bottom ? bottom : this.lastReadTop;
   }
 
-  get bottomAge() {
-    return relativeAge(
-      new Date(this.args.model.last_posted_at || this.args.model.created_at),
-      {
-        addAgo: true,
-        defaultFormat: timelineDate,
-      }
-    );
-  }
-
   get startDate() {
     return timelineDate(this.args.model.createdAt);
   }
 
+  get nowDateOptions() {
+    return {
+      addAgo: true,
+      defaultFormat: timelineDate,
+    };
+  }
+
   get nowDate() {
-    return this.bottomAge;
+    return (
+      this.args.model.get("last_posted_at") || this.args.model.get("created_at")
+    );
   }
 
   get lastReadHeight() {
@@ -171,8 +206,8 @@ export default class TopicTimelineScrollArea extends Component {
 
     this.date = date;
 
-    const lastReadId = topic.last_read_post_id;
     const lastReadNumber = topic.last_read_post_number;
+    const lastReadId = topic.last_read_post_id;
 
     if (lastReadId && lastReadNumber) {
       const idx = postStream.stream.indexOf(lastReadId) + 1;
@@ -200,12 +235,6 @@ export default class TopicTimelineScrollArea extends Component {
         this.before + SCROLLER_HEIGHT - 5 < this.lastReadTop ||
         this.before > this.lastReadTop + 25;
     }
-
-    if (this.hasBackPosition) {
-      this.lastReadTop = Math.round(
-        this.lastReadPercentage * scrollareaHeight()
-      );
-    }
   }
 
   @debounce(50)
@@ -258,8 +287,10 @@ export default class TopicTimelineScrollArea extends Component {
   }
 
   @bind
-  dragMove(e) {
-    this.updatePercentage(e);
+  dragMove(event) {
+    event.stopPropagation();
+    event.preventDefault();
+    this.updatePercentage(event);
   }
 
   @bind
@@ -273,6 +304,7 @@ export default class TopicTimelineScrollArea extends Component {
     this.current = e.postIndex;
     this.percentage = e.percent;
     this.calculatePosition();
+    this.dockCheck();
   }
 
   @action
@@ -280,6 +312,40 @@ export default class TopicTimelineScrollArea extends Component {
     this.args.jumpToIndex(this.lastRead);
   }
 
+  dockCheck() {
+    const timeline = document.querySelector(".timeline-container");
+    const timelineHeight = (timeline && timeline.offsetHeight) || 400;
+
+    const prevDockAt = this.dockAt;
+    const positionTop = headerOffset() + window.pageYOffset;
+    const currentPosition = positionTop + timelineHeight;
+
+    this.dockBottom = false;
+    if (positionTop < this.topicTop) {
+      this.dockAt = parseInt(this.topicTop, 10);
+    } else if (currentPosition > this.topicBottom) {
+      this.dockAt = parseInt(this.topicBottom - timelineHeight, 10);
+      this.dockBottom = true;
+      if (this.dockAt < 0) {
+        this.dockAt = 0;
+      }
+    } else {
+      this.dockAt = null;
+    }
+
+    if (this.dockAt !== prevDockAt) {
+      if (this.dockAt) {
+        this.args.setDocked(true);
+        if (this.dockBottom) {
+          this.args.setDockedBottom(true);
+        }
+      } else {
+        this.args.setDocked(false);
+        this.args.setDockedBottom(false);
+      }
+    }
+  }
+
   commit() {
     this.calculatePosition();
 
@@ -302,10 +368,14 @@ export default class TopicTimelineScrollArea extends Component {
 
   willDestroy() {
     if (!this.args.mobileView) {
+      this.intersectionObserver?.disconnect();
+      this.intersectionObserver = null;
+
       this.appEvents.off("composer:opened", this.calculatePosition);
       this.appEvents.off("composer:resized", this.calculatePosition);
       this.appEvents.off("composer:closed", this.calculatePosition);
       this.appEvents.off("topic:current-post-scrolled", this.postScrolled);
+      this.appEvents.off("post-stream:posted", this.calculatePosition);
     }
   }
 
diff --git a/app/assets/javascripts/discourse/app/components/topic-timeline/scroller.hbs b/app/assets/javascripts/discourse/app/components/topic-timeline/scroller.hbs
index 2a666eefedb..2c092052cc8 100644
--- a/app/assets/javascripts/discourse/app/components/topic-timeline/scroller.hbs
+++ b/app/assets/javascripts/discourse/app/components/topic-timeline/scroller.hbs
@@ -18,7 +18,7 @@
         </div>
       {{/if}}
       {{#if (and @showDockedButton (not @dragging))}}
-        <TopicTimeline::BackButton @onClick={{@goBack}} />
+        <TopicTimeline::BackButton @onGoBack={{@onGoBack}} />
       {{/if}}
     </div>
     <div class="timeline-handle"></div>
@@ -34,7 +34,7 @@
         </div>
       {{/if}}
       {{#if (and @showDockedButton (not @dragging))}}
-        <TopicTimeline::BackButton @onClick={{@goBack}} />
+        <TopicTimeline::BackButton @onGoBack={{@onGoBack}} />
       {{/if}}
     </div>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-timer-info.hbs b/app/assets/javascripts/discourse/app/components/topic-timer-info.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/topic-timer-info.hbs
rename to app/assets/javascripts/discourse/app/components/topic-timer-info.hbs
diff --git a/app/assets/javascripts/discourse/app/components/topic-title.hbs b/app/assets/javascripts/discourse/app/components/topic-title.hbs
new file mode 100644
index 00000000000..d7f72e1f35a
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/topic-title.hbs
@@ -0,0 +1,12 @@
+<div class="container">
+  <div class="title-wrapper">
+    {{yield}}
+  </div>
+  <span>
+    <PluginOutlet
+      @name="topic-title"
+      @connectorTagName="div"
+      @outletArgs={{hash model=this.model}}
+    />
+  </span>
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/track-selected.hbs b/app/assets/javascripts/discourse/app/components/track-selected.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/track-selected.hbs
rename to app/assets/javascripts/discourse/app/components/track-selected.hbs
diff --git a/app/assets/javascripts/discourse/app/components/two-factor-backup-dropdown.js b/app/assets/javascripts/discourse/app/components/two-factor-backup-dropdown.js
new file mode 100644
index 00000000000..56233cb8af7
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/two-factor-backup-dropdown.js
@@ -0,0 +1,45 @@
+import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
+import I18n from "I18n";
+import { computed } from "@ember/object";
+
+export default DropdownSelectBoxComponent.extend({
+  classNames: ["two-factor-backup-dropdown"],
+
+  selectKitOptions: {
+    icon: "wrench",
+    showFullTitle: false,
+  },
+
+  content: computed(function () {
+    const content = [];
+
+    content.push({
+      id: "edit",
+      icon: "pencil-alt",
+      name: I18n.t("user.second_factor.edit"),
+    });
+
+    if (this.secondFactorBackupEnabled) {
+      content.push({
+        id: "disable",
+        icon: "trash-alt",
+        name: I18n.t("user.second_factor.disable"),
+      });
+    }
+
+    return content;
+  }),
+
+  actions: {
+    onChange(id) {
+      switch (id) {
+        case "edit":
+          this.editSecondFactorBackup();
+          break;
+        case "disable":
+          this.disableSecondFactorBackup();
+          break;
+      }
+    },
+  },
+});
diff --git a/app/assets/javascripts/discourse/app/templates/components/uppy-backup-uploader.hbs b/app/assets/javascripts/discourse/app/components/uppy-backup-uploader.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/uppy-backup-uploader.hbs
rename to app/assets/javascripts/discourse/app/components/uppy-backup-uploader.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/uppy-image-uploader.hbs b/app/assets/javascripts/discourse/app/components/uppy-image-uploader.hbs
similarity index 90%
rename from app/assets/javascripts/discourse/app/templates/components/uppy-image-uploader.hbs
rename to app/assets/javascripts/discourse/app/components/uppy-image-uploader.hbs
index c363d8255e0..dd3e863d9e6 100644
--- a/app/assets/javascripts/discourse/app/templates/components/uppy-image-uploader.hbs
+++ b/app/assets/javascripts/discourse/app/components/uppy-image-uploader.hbs
@@ -25,14 +25,14 @@
         @icon="far-trash-alt"
         @type="button"
       />
-
       <DButton
         @icon="discourse-expand"
         @title="expand"
         @type="button"
         @class="image-uploader-lightbox-btn no-text"
-        @action={{action "toggleLightbox"}}
         @disabled={{this.loadingLightbox}}
+        @action={{unless this.experimentalLightboxEnabled this.toggleLightbox}}
+        data-lightbox-trigger={{if this.experimentalLightboxEnabled "true"}}
       />
     {{/if}}
 
diff --git a/app/assets/javascripts/discourse/app/components/uppy-image-uploader.js b/app/assets/javascripts/discourse/app/components/uppy-image-uploader.js
index 7dd74d69807..8818ffb4d38 100644
--- a/app/assets/javascripts/discourse/app/components/uppy-image-uploader.js
+++ b/app/assets/javascripts/discourse/app/components/uppy-image-uploader.js
@@ -1,10 +1,15 @@
 import Component from "@ember/component";
+import { action } from "@ember/object";
 import { or } from "@ember/object/computed";
 import UppyUploadMixin from "discourse/mixins/uppy-upload";
 import discourseComputed, { on } from "discourse-common/utils/decorators";
 import { getURLWithCDN } from "discourse-common/lib/get-url";
 import { isEmpty } from "@ember/utils";
-import lightbox from "discourse/lib/lightbox";
+import {
+  cleanupLightboxes,
+  default as lightbox,
+  setupLightboxes,
+} from "discourse/lib/lightbox";
 import { next } from "@ember/runloop";
 import { htmlSafe } from "@ember/template";
 import { authorizesOneOrMoreExtensions } from "discourse/lib/uploads";
@@ -14,6 +19,11 @@ export default Component.extend(UppyUploadMixin, {
   classNames: ["image-uploader"],
   disabled: or("notAllowed", "uploading", "processing"),
 
+  @discourseComputed("siteSettings.enable_experimental_lightbox")
+  experimentalLightboxEnabled(experimentalLightboxEnabled) {
+    return experimentalLightboxEnabled;
+  },
+
   @discourseComputed("disabled", "notAllowed")
   disabledReason(disabled, notAllowed) {
     if (disabled && notAllowed) {
@@ -97,21 +107,33 @@ export default Component.extend(UppyUploadMixin, {
 
   @on("didRender")
   _applyLightbox() {
-    next(() => lightbox(this.element, this.siteSettings));
+    if (this.experimentalLightboxEnabled) {
+      setupLightboxes({
+        container: this.element,
+        selector: ".lightbox",
+      });
+    } else {
+      next(() => lightbox(this.element, this.siteSettings));
+    }
   },
 
   @on("willDestroyElement")
   _closeOnRemoval() {
-    if ($.magnificPopup?.instance) {
-      $.magnificPopup.instance.close();
+    if (this.experimentalLightboxEnabled) {
+      cleanupLightboxes();
+    } else {
+      if ($.magnificPopup?.instance) {
+        $.magnificPopup.instance.close();
+      }
     }
   },
 
-  actions: {
-    toggleLightbox() {
-      $(this.element.querySelector("a.lightbox"))?.magnificPopup("open");
-    },
+  @action
+  toggleLightbox() {
+    $(this.element.querySelector("a.lightbox"))?.magnificPopup("open");
+  },
 
+  actions: {
     trash() {
       // uppy needs to be reset to allow for more uploads
       this._reset();
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-avatar-flair.hbs b/app/assets/javascripts/discourse/app/components/user-avatar-flair.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/user-avatar-flair.hbs
rename to app/assets/javascripts/discourse/app/components/user-avatar-flair.hbs
diff --git a/app/assets/javascripts/discourse/app/components/user-avatar-flair.js b/app/assets/javascripts/discourse/app/components/user-avatar-flair.js
index 079de882165..bc32bc424fc 100644
--- a/app/assets/javascripts/discourse/app/components/user-avatar-flair.js
+++ b/app/assets/javascripts/discourse/app/components/user-avatar-flair.js
@@ -7,7 +7,7 @@ export default Component.extend({
 
   @discourseComputed("user")
   flair(user) {
-    if (!user) {
+    if (!user || !user.flair_group_id) {
       return;
     }
 
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-badge.hbs b/app/assets/javascripts/discourse/app/components/user-badge.hbs
similarity index 70%
rename from app/assets/javascripts/discourse/app/templates/components/user-badge.hbs
rename to app/assets/javascripts/discourse/app/components/user-badge.hbs
index a29bb6ead7f..fd61b1c4874 100644
--- a/app/assets/javascripts/discourse/app/templates/components/user-badge.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-badge.hbs
@@ -1,7 +1,7 @@
 <a class="user-card-badge-link" href={{this.badgeUrl}}>
   <BadgeButton @badge={{@badge}}>
     {{#if this.showGrantCount}}
-      <span class="count">(&times;&nbsp;{{@count}})</span>
+      <span class="count">&nbsp;(&times;{{@count}})</span>
     {{/if}}
   </BadgeButton>
 </a>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/app/components/user-card-contents.hbs
similarity index 85%
rename from app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
rename to app/assets/javascripts/discourse/app/components/user-card-contents.hbs
index 4a264624d0d..e0b92f2772e 100644
--- a/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-card-contents.hbs
@@ -1,7 +1,7 @@
 {{#if this.visible}}
   <PluginOutlet
     @name="before-user-card-content"
-    @args={{hash user=this.user}}
+    @outletArgs={{hash user=this.user}}
   />
   <div class="card-content">
     {{#if this.loading}}
@@ -28,7 +28,7 @@
     {{else}}
       <div class="card-row first-row">
         <div class="user-card-avatar">
-          {{#if this.user.profile_hidden}}
+          {{#if this.contentHidden}}
             <span class="card-huge-avatar">{{bound-avatar
                 this.user
                 "huge"
@@ -43,12 +43,13 @@
 
           <UserAvatarFlair @user={{this.user}} />
 
-          <PluginOutlet
-            @name="user-card-avatar-flair"
-            @connectorTagName="div"
-            @args={{hash user=this.user}}
-            @tagName="div"
-          />
+          <div>
+            <PluginOutlet
+              @name="user-card-avatar-flair"
+              @connectorTagName="div"
+              @outletArgs={{hash user=this.user}}
+            />
+          </div>
         </div>
         <div class="names">
           <h1
@@ -56,7 +57,7 @@
               {{this.newUser}}
               {{if this.nameFirst 'full-name' 'username'}}"
           >
-            {{#if this.user.profile_hidden}}
+            {{#if this.contentHidden}}
               <span
                 id="discourse-user-card-title"
                 class="name-username-wrapper"
@@ -90,7 +91,7 @@
           <PluginOutlet
             @name="user-card-after-username"
             @connectorTagName="div"
-            @args={{hash
+            @outletArgs={{hash
               user=this.user
               showUser=(fn this.handleShowUser this.user)
             }}
@@ -111,16 +112,19 @@
           {{#if this.hasStatus}}
             <h3 class="user-status">
               {{html-safe this.userStatusEmoji}}
-              {{this.user.status.description}}
+              <span class="user-status__description">
+                {{this.user.status.description}}
+              </span>
               {{format-date this.user.status.ends_at format="tiny"}}
             </h3>
           {{/if}}
-          <PluginOutlet
-            @name="user-card-post-names"
-            @connectorTagName="div"
-            @args={{hash user=this.user}}
-            @tagName="div"
-          />
+          <div>
+            <PluginOutlet
+              @name="user-card-post-names"
+              @connectorTagName="div"
+              @outletArgs={{hash user=this.user}}
+            />
+          </div>
         </div>
         <ul class="usercard-controls">
           {{#if this.user.can_send_private_message_to_user}}
@@ -136,8 +140,7 @@
           <PluginOutlet
             @name="user-card-below-message-button"
             @connectorTagName="li"
-            @args={{hash user=this.user close=(action "close")}}
-            @tagName=""
+            @outletArgs={{hash user=this.user close=(action "close")}}
           />
           {{#if this.showFilter}}
             <li>
@@ -169,17 +172,18 @@
               />
             </li>
           {{/if}}
-          <PluginOutlet
-            @name="user-card-additional-buttons"
-            @connectorTagName="div"
-            @args={{hash user=this.user close=(action "close")}}
-            @tagName="li"
-          />
+          <li>
+            <PluginOutlet
+              @name="user-card-additional-buttons"
+              @connectorTagName="div"
+              @outletArgs={{hash user=this.user close=(action "close")}}
+            />
+          </li>
         </ul>
         <PluginOutlet
           @name="user-card-additional-controls"
           @connectorTagName="div"
-          @args={{hash user=this.user close=(action "close")}}
+          @outletArgs={{hash user=this.user close=(action "close")}}
         />
       </div>
 
@@ -189,6 +193,12 @@
             <span>{{i18n "user.profile_hidden"}}</span>
           </div>
         </div>
+      {{else if this.user.inactive}}
+        <div class="card-row second-row">
+          <div class="inactive-user">
+            <span>{{i18n "user.inactive_user"}}</span>
+          </div>
+        </div>
       {{/if}}
 
       {{#if this.isSuspendedOrHasBio}}
@@ -237,8 +247,8 @@
                 this.user.featured_topic.slug
                 this.user.featured_topic.id
               }}
-            >{{html-safe
-                (replace-emoji this.user.featured_topic.fancy_title)
+            >{{replace-emoji
+                (html-safe this.user.featured_topic.fancy_title)
               }}</LinkTo>
           </div>
         </div>
@@ -251,12 +261,13 @@
               <span class="website-name">
                 {{d-icon "globe"}}
                 {{#if this.linkWebsite}}
-                  {{! template-lint-disable  }}
+                  {{! template-lint-disable link-rel-noopener }}
                   <a
-                    href="{{this.user.website}}"
+                    href={{this.user.website}}
                     rel="noopener {{unless this.removeNoFollow 'nofollow ugc'}}"
                     target="_blank"
                   >{{this.user.website_name}}</a>
+                  {{! template-lint-enable link-rel-noopener }}
                 {{else}}
                   <span
                     title={{this.user.website}}
@@ -271,23 +282,24 @@
               </span>
             {{/if}}
             {{#if this.showUserLocalTime}}
-              <span class="local-time" title="{{i18n 'local_time'}}">
+              <span class="local-time" title={{i18n "local_time"}}>
                 {{d-icon "far-clock"}}
                 <span>{{this.formattedUserLocalTime}}</span>
               </span>
             {{/if}}
-            <PluginOutlet
-              @name="user-card-location-and-website"
-              @tagName="span"
-              @connectorTagName="div"
-              @args={{hash user=this.user}}
-            />
+            <span>
+              <PluginOutlet
+                @name="user-card-location-and-website"
+                @connectorTagName="div"
+                @outletArgs={{hash user=this.user}}
+              />
+            </span>
           </div>
         </div>
       {{/if}}
 
       <div class="card-row metadata-row">
-        {{#unless this.user.profile_hidden}}
+        {{#unless this.contentHidden}}
           <div class="metadata">
             {{#if this.user.last_posted_at}}
               <h3><span class="desc">{{i18n "last_post"}}</span>
@@ -296,7 +308,7 @@
             <h3><span class="desc">{{i18n "joined"}}</span>
               {{format-date this.user.created_at leaveAgo="true"}}</h3>
             {{#if this.user.time_read}}
-              <h3 title="{{this.timeReadTooltip}}">
+              <h3 title={{this.timeReadTooltip}}>
                 <span class="desc">{{i18n "time_read"}}</span>
                 {{format-duration this.user.time_read}}
                 {{#if this.showRecentTimeRead}}
@@ -326,14 +338,14 @@
             <PluginOutlet
               @name="user-card-metadata"
               @connectorTagName="div"
-              @args={{hash user=this.user}}
+              @outletArgs={{hash user=this.user}}
             />
           </div>
         {{/unless}}
         <PluginOutlet
           @name="user-card-after-metadata"
           @connectorTagName="div"
-          @args={{hash user=this.user}}
+          @outletArgs={{hash user=this.user}}
         />
       </div>
 
@@ -364,7 +376,7 @@
       <PluginOutlet
         @name="user-card-before-badges"
         @connectorTagName="div"
-        @args={{hash user=this.user}}
+        @outletArgs={{hash user=this.user}}
       />
 
       {{#if this.showBadges}}
diff --git a/app/assets/javascripts/discourse/app/components/user-card-contents.js b/app/assets/javascripts/discourse/app/components/user-card-contents.js
index 884fcf35d37..4489659ac0f 100644
--- a/app/assets/javascripts/discourse/app/components/user-card-contents.js
+++ b/app/assets/javascripts/discourse/app/components/user-card-contents.js
@@ -30,6 +30,7 @@ export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
     "usernameClass",
     "primaryGroup",
   ],
+  attributeBindings: ["labelledBy:aria-labelledby"],
   allowBackgrounds: setting("allow_profile_backgrounds"),
   showBadges: setting("enable_badges"),
 
@@ -46,6 +47,11 @@ export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
   showDelete: and("viewingAdmin", "showName", "user.canBeDeleted"),
   linkWebsite: not("user.isBasic"),
 
+  @discourseComputed("user")
+  labelledBy(user) {
+    return user ? "discourse-user-card-title" : null;
+  },
+
   @discourseComputed("user")
   hasLocaleOrWebsite(user) {
     return user.location || user.website_name || this.userTimezone;
@@ -178,6 +184,11 @@ export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
     return `group-${primaryGroup}`;
   },
 
+  @discourseComputed("user.profile_hidden", "user.inactive")
+  contentHidden(profileHidden, inactive) {
+    return profileHidden || inactive;
+  },
+
   _showCallback(username, $target) {
     this._positionCard($target);
     this.setProperties({ visible: true, loading: true });
diff --git a/app/assets/javascripts/discourse/app/components/user-field.hbs b/app/assets/javascripts/discourse/app/components/user-field.hbs
new file mode 100644
index 00000000000..04e5ac8f227
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/user-field.hbs
@@ -0,0 +1,6 @@
+<this.userFieldComponent
+  @field={{@field}}
+  @value={{@value}}
+  @class={{@class}}
+  @validation={{@validation}}
+/>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/user-field.js b/app/assets/javascripts/discourse/app/components/user-field.js
index aedfa0de48f..2189fc963de 100644
--- a/app/assets/javascripts/discourse/app/components/user-field.js
+++ b/app/assets/javascripts/discourse/app/components/user-field.js
@@ -1,34 +1,18 @@
-import Component from "@ember/component";
-import discourseComputed from "discourse-common/utils/decorators";
-import { fmt } from "discourse/lib/computed";
+import Component from "@glimmer/component";
+import UserFieldConfirm from "./user-fields/confirm";
+import UserFieldDropdown from "./user-fields/dropdown";
+import UserFieldMultiselect from "./user-fields/multiselect";
+import UserFieldText from "./user-fields/text";
 
-export default Component.extend({
-  classNameBindings: [":user-field", "field.field_type", "customFieldClass"],
-  layoutName: fmt("field.field_type", "components/user-fields/%@"),
+const COMPONENTS = {
+  confirm: UserFieldConfirm,
+  dropdown: UserFieldDropdown,
+  multiselect: UserFieldMultiselect,
+  text: UserFieldText,
+};
 
-  didInsertElement() {
-    this._super(...arguments);
-
-    let element = this.element.querySelector(
-      ".user-field.dropdown .select-kit-header"
-    );
-    element = element || this.element.querySelector("input");
-    this.field.element = element;
-  },
-
-  @discourseComputed
-  noneLabel() {
-    return "user_fields.none";
-  },
-
-  @discourseComputed("field.name")
-  customFieldClass(fieldName) {
-    if (fieldName) {
-      fieldName = fieldName
-        .replace(/\s+/g, "-")
-        .replace(/[!\"#$%&'\(\)\*\+,\.\/:;<=>\?\@\[\\\]\^`\{\|\}~]/g, "")
-        .toLowerCase();
-      return fieldName && `user-field-${fieldName}`;
-    }
-  },
-});
+export default class UserFieldComponent extends Component {
+  get userFieldComponent() {
+    return COMPONENTS[this.args.field.field_type];
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/user-fields/base.js b/app/assets/javascripts/discourse/app/components/user-fields/base.js
new file mode 100644
index 00000000000..2a64fd21700
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/user-fields/base.js
@@ -0,0 +1,32 @@
+import Component from "@ember/component";
+import discourseComputed from "discourse-common/utils/decorators";
+
+export default Component.extend({
+  classNameBindings: [":user-field", "field.field_type", "customFieldClass"],
+
+  didInsertElement() {
+    this._super(...arguments);
+
+    let element = this.element.querySelector(
+      ".user-field.dropdown .select-kit-header"
+    );
+    element = element || this.element.querySelector("input");
+    this.field.element = element;
+  },
+
+  @discourseComputed
+  noneLabel() {
+    return "user_fields.none";
+  },
+
+  @discourseComputed("field.name")
+  customFieldClass(fieldName) {
+    if (fieldName) {
+      fieldName = fieldName
+        .replace(/\s+/g, "-")
+        .replace(/[!\"#$%&'\(\)\*\+,\.\/:;<=>\?\@\[\\\]\^`\{\|\}~]/g, "")
+        .toLowerCase();
+      return fieldName && `user-field-${fieldName}`;
+    }
+  },
+});
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-fields/confirm.hbs b/app/assets/javascripts/discourse/app/components/user-fields/confirm.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/user-fields/confirm.hbs
rename to app/assets/javascripts/discourse/app/components/user-fields/confirm.hbs
diff --git a/app/assets/javascripts/discourse/app/components/user-fields/confirm.js b/app/assets/javascripts/discourse/app/components/user-fields/confirm.js
index 87d5ddb040f..6924c4e9052 100644
--- a/app/assets/javascripts/discourse/app/components/user-fields/confirm.js
+++ b/app/assets/javascripts/discourse/app/components/user-fields/confirm.js
@@ -1,3 +1,3 @@
-import Component from "@ember/component";
+import UserFieldBase from "./base";
 
-export default Component.extend({});
+export default class UserFieldConfirm extends UserFieldBase {}
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-fields/dropdown.hbs b/app/assets/javascripts/discourse/app/components/user-fields/dropdown.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/user-fields/dropdown.hbs
rename to app/assets/javascripts/discourse/app/components/user-fields/dropdown.hbs
diff --git a/app/assets/javascripts/discourse/app/components/user-fields/dropdown.js b/app/assets/javascripts/discourse/app/components/user-fields/dropdown.js
index 87d5ddb040f..7f54ac33261 100644
--- a/app/assets/javascripts/discourse/app/components/user-fields/dropdown.js
+++ b/app/assets/javascripts/discourse/app/components/user-fields/dropdown.js
@@ -1,3 +1,3 @@
-import Component from "@ember/component";
+import UserFieldBase from "./base";
 
-export default Component.extend({});
+export default class UserFieldDropdown extends UserFieldBase {}
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-fields/multiselect.hbs b/app/assets/javascripts/discourse/app/components/user-fields/multiselect.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/user-fields/multiselect.hbs
rename to app/assets/javascripts/discourse/app/components/user-fields/multiselect.hbs
diff --git a/app/assets/javascripts/discourse/app/components/user-fields/multiselect.js b/app/assets/javascripts/discourse/app/components/user-fields/multiselect.js
index 87d5ddb040f..4bb677c1243 100644
--- a/app/assets/javascripts/discourse/app/components/user-fields/multiselect.js
+++ b/app/assets/javascripts/discourse/app/components/user-fields/multiselect.js
@@ -1,3 +1,3 @@
-import Component from "@ember/component";
+import UserFieldBase from "./base";
 
-export default Component.extend({});
+export default class UserFieldMultiselect extends UserFieldBase {}
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-fields/text.hbs b/app/assets/javascripts/discourse/app/components/user-fields/text.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/user-fields/text.hbs
rename to app/assets/javascripts/discourse/app/components/user-fields/text.hbs
diff --git a/app/assets/javascripts/discourse/app/components/user-fields/text.js b/app/assets/javascripts/discourse/app/components/user-fields/text.js
index 87d5ddb040f..f19667f33e9 100644
--- a/app/assets/javascripts/discourse/app/components/user-fields/text.js
+++ b/app/assets/javascripts/discourse/app/components/user-fields/text.js
@@ -1,3 +1,3 @@
-import Component from "@ember/component";
+import UserFieldBase from "./base";
 
-export default Component.extend({});
+export default class UserFieldText extends UserFieldBase {}
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-flag-percentage.hbs b/app/assets/javascripts/discourse/app/components/user-flag-percentage.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/user-flag-percentage.hbs
rename to app/assets/javascripts/discourse/app/components/user-flag-percentage.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-info.hbs b/app/assets/javascripts/discourse/app/components/user-info.hbs
similarity index 83%
rename from app/assets/javascripts/discourse/app/templates/components/user-info.hbs
rename to app/assets/javascripts/discourse/app/components/user-info.hbs
index fdd5e2e4905..812ccd20ce9 100644
--- a/app/assets/javascripts/discourse/app/templates/components/user-info.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-info.hbs
@@ -37,12 +37,13 @@
         @showTooltip={{@showStatusTooltip}}
       />
     {{/if}}
-    <PluginOutlet
-      @name="after-user-name"
-      @tagName="span"
-      @connectorTagName="span"
-      @args={{hash user=this.user}}
-    />
+    <span>
+      <PluginOutlet
+        @name="after-user-name"
+        @connectorTagName="span"
+        @outletArgs={{hash user=this.user}}
+      />
+    </span>
   </div>
   <div class="title">{{@user.title}}</div>
 
@@ -54,9 +55,10 @@
 
 </div>
 
-<PluginOutlet
-  @name="after-user-info"
-  @tagName="span"
-  @connectorTagName="div"
-  @args={{hash user=this.user}}
-/>
\ No newline at end of file
+<span>
+  <PluginOutlet
+    @name="after-user-info"
+    @connectorTagName="div"
+    @outletArgs={{hash user=this.user}}
+  />
+</span>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/user-menu/bookmarks-list.js b/app/assets/javascripts/discourse/app/components/user-menu/bookmarks-list.js
index fcef1a4310b..bc8598f83dd 100644
--- a/app/assets/javascripts/discourse/app/components/user-menu/bookmarks-list.js
+++ b/app/assets/javascripts/discourse/app/components/user-menu/bookmarks-list.js
@@ -1,7 +1,6 @@
 import UserMenuNotificationsList from "discourse/components/user-menu/notifications-list";
 import { ajax } from "discourse/lib/ajax";
 import Notification from "discourse/models/notification";
-import showModal from "discourse/lib/show-modal";
 import I18n from "I18n";
 import UserMenuNotificationItem from "discourse/lib/user-menu/notification-item";
 import UserMenuBookmarkItem from "discourse/lib/user-menu/bookmark-item";
@@ -45,6 +44,12 @@ export default class UserMenuBookmarksList extends UserMenuNotificationsList {
     return this.currentUser.get(key) || 0;
   }
 
+  get dismissConfirmationText() {
+    return I18n.t("notifications.dismiss_confirmation.body.bookmarks", {
+      count: this.#unreadBookmarkRemindersCount,
+    });
+  }
+
   async fetchItems() {
     const data = await ajax(
       `/u/${this.currentUser.username}/user-menu-bookmarks`
@@ -74,15 +79,4 @@ export default class UserMenuBookmarksList extends UserMenuNotificationsList {
 
     return content;
   }
-
-  dismissWarningModal() {
-    const modalController = showModal("dismiss-notification-confirmation");
-    modalController.set(
-      "confirmationMessage",
-      I18n.t("notifications.dismiss_confirmation.body.bookmarks", {
-        count: this.#unreadBookmarkRemindersCount,
-      })
-    );
-    return modalController;
-  }
 }
diff --git a/app/assets/javascripts/discourse/app/components/user-menu/items-list.hbs b/app/assets/javascripts/discourse/app/components/user-menu/items-list.hbs
index 45ca20cd8b1..050ac632093 100644
--- a/app/assets/javascripts/discourse/app/components/user-menu/items-list.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-menu/items-list.hbs
@@ -29,6 +29,13 @@
         {{i18n "user.dismiss"}}
       </button>
     {{/if}}
+    <PluginOutlet
+      @name="panel-body-bottom"
+      @outletArgs={{hash
+        itemsCacheKey=this.itemsCacheKey
+        closeUserMenu=@closeUserMenu
+      }}
+    />
   </div>
 {{else}}
   {{component this.emptyStateComponent}}
diff --git a/app/assets/javascripts/discourse/app/components/user-menu/items-list.js b/app/assets/javascripts/discourse/app/components/user-menu/items-list.js
index 0c5681b6d5d..69a2fa60705 100644
--- a/app/assets/javascripts/discourse/app/components/user-menu/items-list.js
+++ b/app/assets/javascripts/discourse/app/components/user-menu/items-list.js
@@ -28,6 +28,10 @@ export default class UserMenuItemsList extends Component {
     return "user-menu/items-list-empty-state";
   }
 
+  get renderDismissConfirmation() {
+    return false;
+  }
+
   async fetchItems() {
     throw new Error(
       `the fetchItems method must be implemented in ${this.constructor.name}`
@@ -38,10 +42,6 @@ export default class UserMenuItemsList extends Component {
     await this.#load();
   }
 
-  dismissWarningModal() {
-    return null;
-  }
-
   async #load() {
     const cached = this.#getCachedItems();
     if (cached?.length) {
diff --git a/app/assets/javascripts/discourse/app/components/user-menu/likes-notifications-list.js b/app/assets/javascripts/discourse/app/components/user-menu/likes-notifications-list.js
index fd87ffe3e87..a23f5354780 100644
--- a/app/assets/javascripts/discourse/app/components/user-menu/likes-notifications-list.js
+++ b/app/assets/javascripts/discourse/app/components/user-menu/likes-notifications-list.js
@@ -5,8 +5,8 @@ export default class UserMenuLikesNotificationsList extends UserMenuNotification
     return this.filterByTypes;
   }
 
-  dismissWarningModal() {
-    return null;
+  get renderDismissConfirmation() {
+    return false;
   }
 
   get emptyStateComponent() {
diff --git a/app/assets/javascripts/discourse/app/components/user-menu/menu-tab.hbs b/app/assets/javascripts/discourse/app/components/user-menu/menu-tab.hbs
index 3e361a7b23e..4f890d4067f 100644
--- a/app/assets/javascripts/discourse/app/components/user-menu/menu-tab.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-menu/menu-tab.hbs
@@ -1,5 +1,4 @@
-<button
-  type="button"
+<a
   role="tab"
   class={{this.classNames}}
   id={{this.id}}
@@ -8,12 +7,12 @@
   aria-selected={{if this.isActive "true" "false"}}
   aria-controls={{this.ariaControls}}
   data-tab-number={{@tab.position}}
+  href={{@tab.linkWhenActive}}
   {{on "click" @onTabClick}}
-  {{! template-lint-disable require-context-role }}
 >
   {{d-icon @tab.icon}}
   {{#if @tab.count}}
     <span aria-hidden="true" class="badge-notification">{{@tab.count}}</span>
   {{/if}}
   {{yield}}
-</button>
\ No newline at end of file
+</a>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/user-menu/menu.hbs b/app/assets/javascripts/discourse/app/components/user-menu/menu.hbs
index d3e23b3cb46..25efaa7a1cc 100644
--- a/app/assets/javascripts/discourse/app/components/user-menu/menu.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-menu/menu.hbs
@@ -35,12 +35,11 @@
         class="quick-access-panel"
         tabindex="-1"
       >
-        {{component
-          this.currentPanelComponent
-          closeUserMenu=@closeUserMenu
-          filterByTypes=this.currentNotificationTypes
-          ariaLabelledby=(concat "user-menu-button-" this.currentTabId)
-        }}
+        <this.currentPanelComponent
+          @closeUserMenu={{@closeUserMenu}}
+          @filterByTypes={{this.currentNotificationTypes}}
+          @ariaLabelledby={{concat "user-menu-button-" this.currentTabId}}
+        />
       </div>
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/app/components/user-menu/menu.js b/app/assets/javascripts/discourse/app/components/user-menu/menu.js
index cd79a6c7b03..66186c660e1 100644
--- a/app/assets/javascripts/discourse/app/components/user-menu/menu.js
+++ b/app/assets/javascripts/discourse/app/components/user-menu/menu.js
@@ -1,30 +1,32 @@
 import Component from "@glimmer/component";
-import { tracked } from "@glimmer/tracking";
+import { cached, tracked } from "@glimmer/tracking";
 import { action } from "@ember/object";
 import { NO_REMINDER_ICON } from "discourse/models/bookmark";
 import UserMenuTab, { CUSTOM_TABS_CLASSES } from "discourse/lib/user-menu/tab";
 import { inject as service } from "@ember/service";
 import getUrl from "discourse-common/lib/get-url";
-import DiscourseURL from "discourse/lib/url";
+import { wantsNewWindow } from "discourse/lib/intercept-click";
+import UserMenuNotificationsList from "./notifications-list";
+import UserMenuRepliesNotificationsList from "./replies-notifications-list";
+import UserMenuLikesNotificationsList from "./likes-notifications-list";
+import UserMenuMessagesList from "./messages-list";
+import UserMenuBookmarksList from "./bookmarks-list";
+import UserMenuReviewablesList from "./reviewables-list";
+import UserMenuProfileTabContent from "./profile-tab-content";
+import UserMenuOtherNotificationsList from "./other-notifications-list";
+import deprecated from "discourse-common/lib/deprecated";
+import { getOwner } from "discourse-common/lib/get-owner";
 
 const DEFAULT_TAB_ID = "all-notifications";
-const DEFAULT_PANEL_COMPONENT = "user-menu/notifications-list";
+const DEFAULT_PANEL_COMPONENT = UserMenuNotificationsList;
 
 const REVIEW_QUEUE_TAB_ID = "review-queue";
 
 const CORE_TOP_TABS = [
   class extends UserMenuTab {
-    get id() {
-      return DEFAULT_TAB_ID;
-    }
-
-    get icon() {
-      return "bell";
-    }
-
-    get panelComponent() {
-      return DEFAULT_PANEL_COMPONENT;
-    }
+    id = DEFAULT_TAB_ID;
+    icon = "bell";
+    panelComponent = DEFAULT_PANEL_COMPONENT;
 
     get linkWhenActive() {
       return `${this.currentUser.path}/notifications`;
@@ -32,55 +34,47 @@ const CORE_TOP_TABS = [
   },
 
   class extends UserMenuTab {
-    get id() {
-      return "replies";
-    }
-
-    get icon() {
-      return "reply";
-    }
-
-    get panelComponent() {
-      return "user-menu/replies-notifications-list";
-    }
+    id = "replies";
+    icon = "reply";
+    panelComponent = UserMenuRepliesNotificationsList;
+    notificationTypes = [
+      "mentioned",
+      "group_mentioned",
+      "posted",
+      "quoted",
+      "replied",
+    ];
 
     get count() {
       return (
         this.getUnreadCountForType("mentioned") +
+        this.getUnreadCountForType("group_mentioned") +
         this.getUnreadCountForType("posted") +
         this.getUnreadCountForType("quoted") +
         this.getUnreadCountForType("replied")
       );
     }
 
-    get notificationTypes() {
-      return ["mentioned", "posted", "quoted", "replied"];
-    }
-
     get linkWhenActive() {
       return `${this.currentUser.path}/notifications/responses`;
     }
   },
 
   class extends UserMenuTab {
-    get id() {
-      return "likes";
-    }
-
-    get icon() {
-      return "heart";
-    }
-
-    get panelComponent() {
-      return "user-menu/likes-notifications-list";
-    }
+    id = "likes";
+    icon = "heart";
+    panelComponent = UserMenuLikesNotificationsList;
 
     get shouldDisplay() {
       return !this.currentUser.user_option.likes_notifications_disabled;
     }
 
     get count() {
-      return this.getUnreadCountForType("liked");
+      return (
+        this.getUnreadCountForType("liked") +
+        this.getUnreadCountForType("liked_consolidated") +
+        this.getUnreadCountForType("reaction")
+      );
     }
 
     // TODO(osama): reaction is a type used by the reactions plugin, but it's
@@ -96,17 +90,10 @@ const CORE_TOP_TABS = [
   },
 
   class extends UserMenuTab {
-    get id() {
-      return "messages";
-    }
-
-    get icon() {
-      return "notification.private_message";
-    }
-
-    get panelComponent() {
-      return "user-menu/messages-list";
-    }
+    id = "messages";
+    icon = "notification.private_message";
+    panelComponent = UserMenuMessagesList;
+    notificationTypes = ["private_message", "group_message_summary"];
 
     get count() {
       return this.getUnreadCountForType("private_message");
@@ -116,53 +103,31 @@ const CORE_TOP_TABS = [
       return this.currentUser?.can_send_private_messages;
     }
 
-    get notificationTypes() {
-      return ["private_message", "group_message_summary"];
-    }
-
     get linkWhenActive() {
       return `${this.currentUser.path}/messages`;
     }
   },
 
   class extends UserMenuTab {
-    get id() {
-      return "bookmarks";
-    }
-
-    get icon() {
-      return NO_REMINDER_ICON;
-    }
-
-    get panelComponent() {
-      return "user-menu/bookmarks-list";
-    }
+    id = "bookmarks";
+    icon = NO_REMINDER_ICON;
+    panelComponent = UserMenuBookmarksList;
+    notificationTypes = ["bookmark_reminder"];
 
     get count() {
       return this.getUnreadCountForType("bookmark_reminder");
     }
 
-    get notificationTypes() {
-      return ["bookmark_reminder"];
-    }
-
     get linkWhenActive() {
       return `${this.currentUser.path}/activity/bookmarks`;
     }
   },
 
   class extends UserMenuTab {
-    get id() {
-      return REVIEW_QUEUE_TAB_ID;
-    }
-
-    get icon() {
-      return "flag";
-    }
-
-    get panelComponent() {
-      return "user-menu/reviewables-list";
-    }
+    id = REVIEW_QUEUE_TAB_ID;
+    icon = "flag";
+    panelComponent = UserMenuReviewablesList;
+    linkWhenActive = getUrl("/review");
 
     get shouldDisplay() {
       return (
@@ -173,26 +138,14 @@ const CORE_TOP_TABS = [
     get count() {
       return this.currentUser.get("reviewable_count");
     }
-
-    get linkWhenActive() {
-      return getUrl("/review");
-    }
   },
 ];
 
 const CORE_BOTTOM_TABS = [
   class extends UserMenuTab {
-    get id() {
-      return "profile";
-    }
-
-    get icon() {
-      return "user";
-    }
-
-    get panelComponent() {
-      return "user-menu/profile-tab-content";
-    }
+    id = "profile";
+    icon = "user";
+    panelComponent = UserMenuProfileTabContent;
 
     get linkWhenActive() {
       return `${this.currentUser.path}/summary`;
@@ -201,23 +154,15 @@ const CORE_BOTTOM_TABS = [
 ];
 
 const CORE_OTHER_NOTIFICATIONS_TAB = class extends UserMenuTab {
+  id = "other-notifications";
+  icon = "discourse-other-tab";
+  panelComponent = UserMenuOtherNotificationsList;
+
   constructor(currentUser, siteSettings, site, otherNotificationTypes) {
     super(...arguments);
     this.otherNotificationTypes = otherNotificationTypes;
   }
 
-  get id() {
-    return "other-notifications";
-  }
-
-  get icon() {
-    return "discourse-other-tab";
-  }
-
-  get panelComponent() {
-    return "user-menu/other-notifications-list";
-  }
-
   get count() {
     return this.otherNotificationTypes.reduce((sum, notificationType) => {
       return sum + this.getUnreadCountForType(notificationType);
@@ -229,6 +174,18 @@ const CORE_OTHER_NOTIFICATIONS_TAB = class extends UserMenuTab {
   }
 };
 
+function resolvePanelComponent(owner, panelComponent) {
+  if (typeof panelComponent === "string") {
+    const nameForConsole = JSON.stringify(panelComponent);
+    deprecated(
+      `user-menu tab panelComponent must be passed as a component class (passed ${nameForConsole})`,
+      { id: "discourse.user-menu.panel-component-class" }
+    );
+    return owner.resolveRegistration(`component:${panelComponent}`);
+  }
+  return panelComponent;
+}
+
 export default class UserMenu extends Component {
   @service currentUser;
   @service siteSettings;
@@ -239,13 +196,8 @@ export default class UserMenu extends Component {
   @tracked currentPanelComponent = DEFAULT_PANEL_COMPONENT;
   @tracked currentNotificationTypes;
 
-  constructor() {
-    super(...arguments);
-    this.topTabs = this._topTabs;
-    this.bottomTabs = this._bottomTabs;
-  }
-
-  get _topTabs() {
+  @cached
+  get topTabs() {
     const tabs = [];
 
     CORE_TOP_TABS.forEach((tabClass) => {
@@ -286,7 +238,8 @@ export default class UserMenu extends Component {
     });
   }
 
-  get _bottomTabs() {
+  @cached
+  get bottomTabs() {
     const tabs = [];
 
     CORE_BOTTOM_TABS.forEach((tabClass) => {
@@ -314,14 +267,22 @@ export default class UserMenu extends Component {
   }
 
   @action
-  handleTabClick(tab) {
-    if (this.currentTabId !== tab.id) {
-      this.currentTabId = tab.id;
-      this.currentPanelComponent = tab.panelComponent;
-      this.currentNotificationTypes = tab.notificationTypes;
-    } else if (tab.linkWhenActive) {
-      DiscourseURL.routeTo(tab.linkWhenActive);
+  handleTabClick(tab, event) {
+    if (wantsNewWindow(event) || this.currentTabId === tab.id) {
+      // Allow normal navigation to href
+      return;
     }
+
+    event.preventDefault();
+
+    this.currentTabId = tab.id;
+    this.currentPanelComponent = resolvePanelComponent(
+      getOwner(this),
+      tab.panelComponent
+    );
+
+    this.appEvents.trigger("user-menu:tab-click", tab.id);
+    this.currentNotificationTypes = tab.notificationTypes;
   }
 
   @action
diff --git a/app/assets/javascripts/discourse/app/components/user-menu/messages-list.js b/app/assets/javascripts/discourse/app/components/user-menu/messages-list.js
index 1b04b491458..38333ba40ff 100644
--- a/app/assets/javascripts/discourse/app/components/user-menu/messages-list.js
+++ b/app/assets/javascripts/discourse/app/components/user-menu/messages-list.js
@@ -1,7 +1,6 @@
 import UserMenuNotificationsList from "discourse/components/user-menu/notifications-list";
 import { ajax } from "discourse/lib/ajax";
 import Notification from "discourse/models/notification";
-import showModal from "discourse/lib/show-modal";
 import I18n from "I18n";
 import UserMenuNotificationItem from "discourse/lib/user-menu/notification-item";
 import UserMenuMessageItem from "discourse/lib/user-menu/message-item";
@@ -49,6 +48,12 @@ export default class UserMenuMessagesList extends UserMenuNotificationsList {
     return this.currentUser.get(key) || 0;
   }
 
+  get dismissConfirmationText() {
+    return I18n.t("notifications.dismiss_confirmation.body.messages", {
+      count: this.#unreadMessagesNotifications,
+    });
+  }
+
   async fetchItems() {
     const data = await ajax(
       `/u/${this.currentUser.username}/user-menu-private-messages`
@@ -97,15 +102,4 @@ export default class UserMenuMessagesList extends UserMenuNotificationsList {
 
     return content;
   }
-
-  dismissWarningModal() {
-    const modalController = showModal("dismiss-notification-confirmation");
-    modalController.set(
-      "confirmationMessage",
-      I18n.t("notifications.dismiss_confirmation.body.messages", {
-        count: this.#unreadMessagesNotifications,
-      })
-    );
-    return modalController;
-  }
 }
diff --git a/app/assets/javascripts/discourse/app/components/user-menu/notifications-list.js b/app/assets/javascripts/discourse/app/components/user-menu/notifications-list.js
index efe1cadf523..32d9c340661 100644
--- a/app/assets/javascripts/discourse/app/components/user-menu/notifications-list.js
+++ b/app/assets/javascripts/discourse/app/components/user-menu/notifications-list.js
@@ -6,18 +6,20 @@ import {
   mergeSortedLists,
   postRNWebviewMessage,
 } from "discourse/lib/utilities";
-import showModal from "discourse/lib/show-modal";
 import { inject as service } from "@ember/service";
 import UserMenuNotificationItem from "discourse/lib/user-menu/notification-item";
 import Notification from "discourse/models/notification";
 import UserMenuReviewable from "discourse/models/user-menu-reviewable";
 import UserMenuReviewableItem from "discourse/lib/user-menu/reviewable-item";
+import DismissNotificationConfirmationModal from "discourse/components/modal/dismiss-notification-confirmation";
 
 export default class UserMenuNotificationsList extends UserMenuItemsList {
+  @service appEvents;
   @service currentUser;
   @service siteSettings;
   @service site;
   @service store;
+  @service modal;
 
   get filterByTypes() {
     return this.args.filterByTypes;
@@ -64,6 +66,20 @@ export default class UserMenuNotificationsList extends UserMenuItemsList {
     }
   }
 
+  get renderDismissConfirmation() {
+    return true;
+  }
+
+  get dismissConfirmationText() {
+    return I18n.t("notifications.dismiss_confirmation.body.default", {
+      count: this.currentUser.unread_high_priority_notifications,
+    });
+  }
+
+  get alwaysRenderDismissConfirmation() {
+    return false;
+  }
+
   async fetchItems() {
     const params = {
       limit: 30,
@@ -108,6 +124,7 @@ export default class UserMenuNotificationsList extends UserMenuItemsList {
         }
       ).forEach((item) => {
         const props = {
+          appEvents: this.appEvents,
           currentUser: this.currentUser,
           siteSettings: this.siteSettings,
           site: this.site,
@@ -126,6 +143,7 @@ export default class UserMenuNotificationsList extends UserMenuItemsList {
       content.push(
         new UserMenuNotificationItem({
           notification,
+          appEvents: this.appEvents,
           currentUser: this.currentUser,
           siteSettings: this.siteSettings,
           site: this.site,
@@ -135,56 +153,64 @@ export default class UserMenuNotificationsList extends UserMenuItemsList {
     return content;
   }
 
-  dismissWarningModal() {
-    if (this.currentUser.unread_high_priority_notifications > 0) {
-      const modalController = showModal("dismiss-notification-confirmation");
-      modalController.set(
-        "confirmationMessage",
-        I18n.t("notifications.dismiss_confirmation.body.default", {
-          count: this.currentUser.unread_high_priority_notifications,
-        })
-      );
-      return modalController;
-    }
-  }
-
-  @action
-  dismissButtonClick() {
+  async performDismiss() {
     const opts = { type: "PUT" };
     const dismissTypes = this.dismissTypes;
     if (dismissTypes?.length > 0) {
       opts.data = { dismiss_types: dismissTypes.join(",") };
     }
-    const modalController = this.dismissWarningModal();
-    const modalCallback = () => {
-      ajax("/notifications/mark-read", opts).then(() => {
-        if (dismissTypes) {
-          const unreadNotificationCountsHash = {
-            ...this.currentUser.grouped_unread_notifications,
-          };
-          dismissTypes.forEach((type) => {
-            const typeId = this.site.notification_types[type];
-            if (typeId) {
-              delete unreadNotificationCountsHash[typeId];
-            }
-          });
-          this.currentUser.set(
-            "grouped_unread_notifications",
-            unreadNotificationCountsHash
-          );
-        } else {
-          this.currentUser.set("all_unread_notifications_count", 0);
-          this.currentUser.set("unread_high_priority_notifications", 0);
-          this.currentUser.set("grouped_unread_notifications", {});
+    await ajax("/notifications/mark-read", opts);
+    if (dismissTypes) {
+      const unreadNotificationCountsHash = {
+        ...this.currentUser.grouped_unread_notifications,
+      };
+      dismissTypes.forEach((type) => {
+        const typeId = this.site.notification_types[type];
+        if (typeId) {
+          delete unreadNotificationCountsHash[typeId];
         }
-        this.refreshList();
-        postRNWebviewMessage("markRead", "1");
       });
-    };
-    if (modalController) {
-      modalController.set("dismissNotifications", modalCallback);
+      this.currentUser.set(
+        "grouped_unread_notifications",
+        unreadNotificationCountsHash
+      );
     } else {
-      modalCallback();
+      this.currentUser.set("all_unread_notifications_count", 0);
+      this.currentUser.set("unread_high_priority_notifications", 0);
+      this.currentUser.set("grouped_unread_notifications", {});
+    }
+    this.refreshList();
+    postRNWebviewMessage("markRead", "1");
+  }
+
+  dismissWarningModal() {
+    this.modal.show(DismissNotificationConfirmationModal, {
+      model: {
+        confirmationMessage: this.dismissConfirmationText,
+        dismissNotifications: () => this.performDismiss(),
+      },
+    });
+  }
+
+  @action
+  dismissButtonClick() {
+    // by default we display a warning modal when dismissing a notification
+    // however we bypass the warning modal for specific notification types when
+    // they are a 'low priority' type of notification (eg. likes)
+    if (
+      this.renderDismissConfirmation ||
+      this.alwaysRenderDismissConfirmation
+    ) {
+      if (
+        this.currentUser.unread_high_priority_notifications > 0 ||
+        this.alwaysRenderDismissConfirmation
+      ) {
+        this.dismissWarningModal();
+      } else {
+        this.performDismiss();
+      }
+    } else {
+      this.performDismiss();
     }
   }
 }
diff --git a/app/assets/javascripts/discourse/app/components/user-menu/other-notifications-list.js b/app/assets/javascripts/discourse/app/components/user-menu/other-notifications-list.js
index 7cb132b5836..edf03c55536 100644
--- a/app/assets/javascripts/discourse/app/components/user-menu/other-notifications-list.js
+++ b/app/assets/javascripts/discourse/app/components/user-menu/other-notifications-list.js
@@ -9,7 +9,7 @@ export default class UserMenuOtherNotificationsList extends UserMenuNotification
     return "user-menu/other-notifications-list-empty-state";
   }
 
-  dismissWarningModal() {
-    return null;
+  get renderDismissConfirmation() {
+    return false;
   }
 }
diff --git a/app/assets/javascripts/discourse/app/components/user-menu/profile-tab-content.hbs b/app/assets/javascripts/discourse/app/components/user-menu/profile-tab-content.hbs
index 759d7cf93da..b81151b1c84 100644
--- a/app/assets/javascripts/discourse/app/components/user-menu/profile-tab-content.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-menu/profile-tab-content.hbs
@@ -120,6 +120,19 @@
     </li>
   {{/if}}
 
+  {{#each this.extraItems as |item|}}
+    <li class={{item.className}}>
+      <a href={{item.href}}>
+        {{#if item.icon}}
+          {{d-icon item.icon}}
+        {{/if}}
+        <span class="item-label">
+          {{item.content}}
+        </span>
+      </a>
+    </li>
+  {{/each}}
+
   <li class="logout">
     <DButton
       @class="btn-flat profile-tab-btn"
diff --git a/app/assets/javascripts/discourse/app/components/user-menu/profile-tab-content.js b/app/assets/javascripts/discourse/app/components/user-menu/profile-tab-content.js
index 4ca06d3040b..451bd15b53a 100644
--- a/app/assets/javascripts/discourse/app/components/user-menu/profile-tab-content.js
+++ b/app/assets/javascripts/discourse/app/components/user-menu/profile-tab-content.js
@@ -3,11 +3,23 @@ import { inject as service } from "@ember/service";
 import { action } from "@ember/object";
 import showModal from "discourse/lib/show-modal";
 import DoNotDisturb from "discourse/lib/do-not-disturb";
+import DoNotDisturbModal from "discourse/components/modal/do-not-disturb";
+
+const _extraItems = [];
+
+export function addUserMenuProfileTabItem(item) {
+  _extraItems.push(item);
+}
+
+export function resetUserMenuProfileTabItems() {
+  _extraItems.clear();
+}
 
 export default class UserMenuProfileTabContent extends Component {
   @service currentUser;
   @service siteSettings;
   @service userStatus;
+  @service modal;
 
   saving = false;
 
@@ -34,6 +46,10 @@ export default class UserMenuProfileTabContent extends Component {
     );
   }
 
+  get extraItems() {
+    return _extraItems;
+  }
+
   get #doNotDisturbUntilDate() {
     if (!this.currentUser.get("do_not_disturb_until")) {
       return;
@@ -58,7 +74,7 @@ export default class UserMenuProfileTabContent extends Component {
     } else {
       this.saving = false;
       this.args.closeUserMenu();
-      showModal("do-not-disturb");
+      this.modal.show(DoNotDisturbModal);
     }
   }
 
diff --git a/app/assets/javascripts/discourse/app/components/user-menu/replies-notifications-list.js b/app/assets/javascripts/discourse/app/components/user-menu/replies-notifications-list.js
index 1773d5651a9..49b791f3175 100644
--- a/app/assets/javascripts/discourse/app/components/user-menu/replies-notifications-list.js
+++ b/app/assets/javascripts/discourse/app/components/user-menu/replies-notifications-list.js
@@ -5,8 +5,8 @@ export default class UserMenuRepliesNotificationsList extends UserMenuNotificati
     return this.filterByTypes;
   }
 
-  dismissWarningModal() {
-    return null;
+  get renderDismissConfirmation() {
+    return false;
   }
 
   get emptyStateComponent() {
diff --git a/app/assets/javascripts/discourse/app/components/user-menu/reviewables-list.js b/app/assets/javascripts/discourse/app/components/user-menu/reviewables-list.js
index d8155ef6c88..e75efd52b69 100644
--- a/app/assets/javascripts/discourse/app/components/user-menu/reviewables-list.js
+++ b/app/assets/javascripts/discourse/app/components/user-menu/reviewables-list.js
@@ -25,6 +25,8 @@ export default class UserMenuReviewablesList extends UserMenuItemsList {
 
   fetchItems() {
     return ajax("/review/user-menu-list").then((data) => {
+      this.currentUser.updateReviewableCount(data.reviewable_count);
+
       return data.reviewables.map((item) => {
         return new UserMenuReviewableItem({
           reviewable: UserMenuReviewable.create(item),
diff --git a/app/assets/javascripts/discourse/app/components/user-nav.hbs b/app/assets/javascripts/discourse/app/components/user-nav.hbs
index 96b8f220c90..9fad9589576 100644
--- a/app/assets/javascripts/discourse/app/components/user-nav.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-nav.hbs
@@ -1,74 +1,83 @@
 <section class="user-navigation user-navigation-primary">
-  <HorizontalOverflowNav @className="main-nav nav user-nav">
+  <HorizontalOverflowNav
+    @className="main-nav nav user-nav"
+    @ariaLabel="User primary"
+  >
     {{#unless @user.profile_hidden}}
-      <li class="summary">
-        <LinkTo @route="user.summary">
-          {{d-icon "user"}}
-          <span>{{i18n "user.summary.title"}}</span>
-        </LinkTo>
-      </li>
+      <DNavigationItem @route="user.summary" class="user-nav__summary">
+        {{d-icon "user"}}
+        <span>{{i18n "user.summary.title"}}</span>
+      </DNavigationItem>
+
+      <DNavigationItem
+        @route="userActivity"
+        @ariaCurrentContext="parentNav"
+        class="user-nav__activity"
+      >
+        {{d-icon "stream"}}
+        <span>{{i18n "user.activity_stream"}}</span>
+      </DNavigationItem>
 
-      <li class="user-activity">
-        <LinkTo @route="userActivity">
-          {{d-icon "stream"}}
-          <span>{{i18n "user.activity_stream"}}</span>
-        </LinkTo>
-      </li>
     {{/unless}}
 
     {{#if @showNotificationsTab}}
-      <li class="user-notifications">
-        <LinkTo @route="userNotifications">
-          {{d-icon "bell" class="glyph"}}
-          <span>{{i18n "user.notifications"}}</span>
-        </LinkTo>
-      </li>
+      <DNavigationItem
+        @route="userNotifications"
+        @ariaCurrentContext="parentNav"
+        class="user-nav__notifications"
+      >
+        {{d-icon "bell" class="glyph"}}
+        <span>{{i18n "user.notifications"}}</span>
+      </DNavigationItem>
     {{/if}}
 
     {{#if @showPrivateMessages}}
-      <li class="private-messages">
-        <LinkTo @route="userPrivateMessages">
-          {{d-icon "envelope"}}
-          <span>{{i18n "user.private_messages"}}</span>
-        </LinkTo>
-      </li>
+      <DNavigationItem
+        @route="userPrivateMessages"
+        @ariaCurrentContext="parentNav"
+        class="user-nav__personal-messages"
+      >
+        {{d-icon "envelope"}}
+        <span>{{i18n "user.private_messages"}}</span>
+      </DNavigationItem>
     {{/if}}
 
     {{#if @canInviteToForum}}
-      <li class="invited">
-        <LinkTo @route="userInvited">
-          {{d-icon "user-plus"}}
-          <span>{{i18n "user.invited.title"}}</span>
-        </LinkTo>
-      </li>
+      <DNavigationItem
+        @route="userInvited"
+        @ariaCurrentContext="parentNav"
+        class="user-nav__invites"
+      >
+        {{d-icon "user-plus"}}
+        <span>{{i18n "user.invited.title"}}</span>
+      </DNavigationItem>
     {{/if}}
 
     {{#if @showBadges}}
-      <li class="badges">
-        <LinkTo @route="user.badges">
-          {{d-icon "certificate"}}
-          <span>{{i18n "badges.title"}}</span>
-        </LinkTo>
-      </li>
+      <DNavigationItem @route="user.badges" class="user-nav__badges">
+        {{d-icon "certificate"}}
+        <span>{{i18n "badges.title"}}</span>
+      </DNavigationItem>
     {{/if}}
 
     <PluginOutlet
       @name="user-main-nav"
       @connectorTagName="li"
-      @args={{hash model=@user}}
+      @outletArgs={{hash model=@user}}
     />
 
     {{#if @user.can_edit}}
-      <li class="preferences">
-        <LinkTo @route="preferences">
-          {{d-icon "cog"}}
-          <span>{{i18n "user.preferences"}}</span>
-        </LinkTo>
-      </li>
+      <DNavigationItem
+        @route="preferences"
+        @ariaCurrentContext="parentNav"
+        class="user-nav__preferences"
+      >
+        {{d-icon "cog"}}
+        <span>{{i18n "user.preferences"}}</span>
+      </DNavigationItem>
     {{/if}}
-
-    {{#if (and this.site.mobileView this.currentUser.staff)}}
-      <li class="admin">
+    {{#if (and @isMobileView @isStaff)}}
+      <li class="user-nav__admin">
         <a href={{@user.adminPath}}>
           {{d-icon "wrench"}}
           <span>{{i18n "admin.user.manage_user"}}</span>
diff --git a/app/assets/javascripts/discourse/app/components/user-nav.js b/app/assets/javascripts/discourse/app/components/user-nav.js
deleted file mode 100644
index 7bef2d13ad0..00000000000
--- a/app/assets/javascripts/discourse/app/components/user-nav.js
+++ /dev/null
@@ -1,46 +0,0 @@
-import I18n from "I18n";
-
-import Component from "@glimmer/component";
-import { inject as service } from "@ember/service";
-import { action } from "@ember/object";
-import { next } from "@ember/runloop";
-
-import { bind } from "discourse-common/utils/decorators";
-import { DROPDOWN_BUTTON_CSS_CLASS } from "discourse/components/user-nav/dropdown-list";
-
-export default class UserNav extends Component {
-  @service currentUser;
-  @service site;
-  @service router;
-
-  get draftLabel() {
-    const count = this.currentUser.draft_count;
-
-    return count > 0
-      ? I18n.t("drafts.label_with_count", { count })
-      : I18n.t("drafts.label");
-  }
-
-  @bind
-  _handleClickEvent(event) {
-    if (!event.target.closest(`.${DROPDOWN_BUTTON_CSS_CLASS}`)) {
-      next(() => {
-        this.args.toggleUserNav();
-      });
-    }
-  }
-
-  @action
-  registerClickListener(element) {
-    if (this.site.mobileView) {
-      element.addEventListener("click", this._handleClickEvent);
-    }
-  }
-
-  @action
-  unregisterClickListener(element) {
-    if (this.site.mobileView) {
-      element.removeEventListener("click", this._handleClickEvent);
-    }
-  }
-}
diff --git a/app/assets/javascripts/discourse/app/components/user-nav/activity-nav.hbs b/app/assets/javascripts/discourse/app/components/user-nav/activity-nav.hbs
deleted file mode 100644
index b0f5ed0c484..00000000000
--- a/app/assets/javascripts/discourse/app/components/user-nav/activity-nav.hbs
+++ /dev/null
@@ -1,51 +0,0 @@
-<DNavigationItem @route="userActivity.index">
-  {{d-icon "stream"}}
-  <span>{{i18n "user.filters.all"}}</span>
-</DNavigationItem>
-<DNavigationItem @route="userActivity.topics">
-  {{d-icon "list-ul"}}
-  <span>{{i18n "user_action_groups.4"}}</span>
-</DNavigationItem>
-<DNavigationItem @route="userActivity.replies">
-  {{d-icon "reply"}}
-  <span>{{i18n "user_action_groups.5"}}</span>
-</DNavigationItem>
-
-{{#if @user.showRead}}
-  <DNavigationItem @route="userActivity.read" @title={{i18n "user.read_help"}}>
-    {{d-icon "history"}}
-    <span>{{i18n "user.read"}}</span>
-  </DNavigationItem>
-{{/if}}
-
-{{#if @user.showDrafts}}
-  <DNavigationItem @route="userActivity.drafts">
-    {{d-icon "pencil-alt"}}
-    <span>{{@draftLabel}}</span>
-  </DNavigationItem>
-{{/if}}
-
-{{#if (gt @model.pending_posts_count 0)}}
-  <DNavigationItem @route="userActivity.pending">
-    {{d-icon "clock"}}
-    <span>{{@pendingLabel}}</span>
-  </DNavigationItem>
-{{/if}}
-
-<DNavigationItem @route="userActivity.likesGiven">
-  {{d-icon "heart"}}
-  <span>{{i18n "user_action_groups.1"}}</span>
-</DNavigationItem>
-
-{{#if @user.showBookmarks}}
-  <DNavigationItem @route="userActivity.bookmarks">
-    {{d-icon "bookmark"}}
-    <span>{{i18n "user_action_groups.3"}}</span>
-  </DNavigationItem>
-{{/if}}
-
-<PluginOutlet
-  @name="user-activity-bottom"
-  @connectorTagName="li"
-  @args={{hash model=@model}}
-/>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/user-nav/dropdown-list.hbs b/app/assets/javascripts/discourse/app/components/user-nav/dropdown-list.hbs
deleted file mode 100644
index 681e8d75cdb..00000000000
--- a/app/assets/javascripts/discourse/app/components/user-nav/dropdown-list.hbs
+++ /dev/null
@@ -1,24 +0,0 @@
-<li class={{concat @class " user-nav-dropdown-list-item"}}>
-  <button
-    type="button"
-    class={{this.buttonClass}}
-    {{on "click" this.toggleList}}
-  >
-    {{d-icon @icon}}
-    <span>{{@text}}</span>
-    {{d-icon this.chevron class="user-nav-dropdown-chevron"}}
-  </button>
-
-  {{#if (and (has-block "submenu") this.displayList)}}
-    <div
-      class="user-nav-dropdown-submenu-wrapper"
-      {{did-insert this.registerClickListener}}
-      {{will-destroy this.deregisterClickListener}}
-    >
-
-      <ul class={{concat @submenuClass " user-nav-dropdown-submenu"}}>
-        {{yield to="submenu"}}
-      </ul>
-    </div>
-  {{/if}}
-</li>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/user-nav/dropdown-list.js b/app/assets/javascripts/discourse/app/components/user-nav/dropdown-list.js
deleted file mode 100644
index 7b9a82bdf57..00000000000
--- a/app/assets/javascripts/discourse/app/components/user-nav/dropdown-list.js
+++ /dev/null
@@ -1,58 +0,0 @@
-import Component from "@glimmer/component";
-import { action } from "@ember/object";
-import { inject as service } from "@ember/service";
-import { tracked } from "@glimmer/tracking";
-
-import { bind } from "discourse-common/utils/decorators";
-
-export const DROPDOWN_BUTTON_CSS_CLASS = "user-nav-dropdown-button";
-export default class UserNavDropdownList extends Component {
-  @service site;
-  @tracked displayList = this.site.mobileView && this.args.isActive;
-
-  get chevron() {
-    return this.displayList ? "chevron-up" : "chevron-down";
-  }
-
-  get defaultButtonClass() {
-    return DROPDOWN_BUTTON_CSS_CLASS;
-  }
-
-  get buttonClass() {
-    const props = [this.defaultButtonClass];
-
-    if (this.args.isActive) {
-      props.push("active");
-    }
-
-    return props.join(" ");
-  }
-
-  @action
-  toggleList() {
-    this.displayList = !this.displayList;
-  }
-
-  @bind
-  collapseList(e) {
-    const isClickOnButton = e.composedPath().some((element) => {
-      if (element?.classList?.contains(this.defaultButtonClass)) {
-        return true;
-      }
-    });
-
-    if (!isClickOnButton) {
-      this.displayList = false;
-    }
-  }
-
-  @action
-  registerClickListener() {
-    document.addEventListener("click", this.collapseList);
-  }
-
-  @action
-  deregisterClickListener() {
-    document.removeEventListener("click", this.collapseList);
-  }
-}
diff --git a/app/assets/javascripts/discourse/app/components/user-nav/messages-secondary-nav.hbs b/app/assets/javascripts/discourse/app/components/user-nav/messages-secondary-nav.hbs
index 24558ef8dfb..ba830cb1910 100644
--- a/app/assets/javascripts/discourse/app/components/user-nav/messages-secondary-nav.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-nav/messages-secondary-nav.hbs
@@ -1,5 +1,3 @@
-{{#if this.currentUser.redesigned_user_page_nav_enabled}}
-  {{#in-element this.messagesNav}}
-    {{yield}}
-  {{/in-element}}
-{{/if}}
\ No newline at end of file
+{{#in-element this.messagesNav}}
+  {{yield}}
+{{/in-element}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/user-nav/notifications-nav.hbs b/app/assets/javascripts/discourse/app/components/user-nav/notifications-nav.hbs
deleted file mode 100644
index 75cd13dc923..00000000000
--- a/app/assets/javascripts/discourse/app/components/user-nav/notifications-nav.hbs
+++ /dev/null
@@ -1,42 +0,0 @@
-<li>
-  <LinkTo @route="userNotifications.index">
-    {{d-icon "bell"}}
-    <span>{{i18n "user.filters.all"}}</span>
-  </LinkTo>
-</li>
-
-<li>
-  <LinkTo @route="userNotifications.responses">
-    {{d-icon "reply"}}
-    <span>{{i18n "user_action_groups.6"}}</span>
-  </LinkTo>
-</li>
-
-<li>
-  <LinkTo @route="userNotifications.likesReceived">
-    {{d-icon "heart"}}
-    <span>{{i18n "user_action_groups.2"}}</span>
-  </LinkTo>
-</li>
-
-{{#if @siteSettings.enable_mentions}}
-  <li>
-    <LinkTo @route="userNotifications.mentions">
-      {{d-icon "at"}}
-      <span>{{i18n "user_action_groups.7"}}</span>
-    </LinkTo>
-  </li>
-{{/if}}
-
-<li>
-  <LinkTo @route="userNotifications.edits">
-    {{d-icon "pencil-alt"}}
-    <span>{{i18n "user_action_groups.11"}}</span>
-  </LinkTo>
-</li>
-
-<PluginOutlet
-  @name="user-notifications-bottom"
-  @connectorTagName="li"
-  @args={{hash model=@model}}
-/>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/user-nav/preferences-nav.hbs b/app/assets/javascripts/discourse/app/components/user-nav/preferences-nav.hbs
deleted file mode 100644
index 8aea0e46a88..00000000000
--- a/app/assets/javascripts/discourse/app/components/user-nav/preferences-nav.hbs
+++ /dev/null
@@ -1,77 +0,0 @@
-<li class="nav-account">
-  <LinkTo @route="preferences.account">
-    {{d-icon "user"}}
-    <span>{{i18n "user.preferences_nav.account"}}</span>
-  </LinkTo>
-</li>
-
-<li class="nav-security">
-  <LinkTo @route="preferences.security">
-    {{d-icon "lock"}}
-    <span>{{i18n "user.preferences_nav.security"}}</span>
-  </LinkTo>
-</li>
-
-<li class="nav-profile">
-  <LinkTo @route="preferences.profile">
-    {{d-icon "user"}}
-    <span>{{i18n "user.preferences_nav.profile"}}</span>
-  </LinkTo>
-</li>
-
-<li class="nav-emails">
-  <LinkTo @route="preferences.emails">
-    {{d-icon "envelope"}}
-    <span>{{i18n "user.preferences_nav.emails"}}</span>
-  </LinkTo>
-</li>
-
-<li class="nav-notifications">
-  <LinkTo @route="preferences.notifications">
-    {{d-icon "bell"}}
-    <span>{{i18n "user.preferences_nav.notifications"}}</span>
-  </LinkTo>
-</li>
-
-{{#if @model.can_change_tracking_preferences}}
-  <li class="nav-tracking">
-    <LinkTo @route="preferences.tracking">
-      {{d-icon "plus"}}
-      <span>{{i18n "user.preferences_nav.tracking"}}</span>
-    </LinkTo>
-  </li>
-{{/if}}
-
-<li class="indent nav-users">
-  <LinkTo @route="preferences.users">
-    {{d-icon "users"}}
-    <span>{{i18n "user.preferences_nav.users"}}</span>
-  </LinkTo>
-</li>
-
-<li class="nav-interface">
-  <LinkTo @route="preferences.interface">
-    {{d-icon "desktop"}}
-    <span>{{i18n "user.preferences_nav.interface"}}</span>
-  </LinkTo>
-</li>
-
-{{#if (not (eq @siteSettings.navigation_menu "legacy"))}}
-  <li class="indent nav-sidebar">
-    <LinkTo @route="preferences.sidebar">
-      {{d-icon "bars"}}
-      <span>{{i18n "user.preferences_nav.sidebar"}}</span>
-    </LinkTo>
-  </li>
-{{/if}}
-
-<PluginOutlet
-  @name="user-preferences-nav-under-interface"
-  @connectorTagName="div"
-  @args={{hash model=@model}}
-/>
-<PluginOutlet
-  @name="user-preferences-nav"
-  @connectorTagName="li"
-  @args={{hash model=@model}}
-/>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-notification-schedule-day.hbs b/app/assets/javascripts/discourse/app/components/user-notification-schedule-day.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/user-notification-schedule-day.hbs
rename to app/assets/javascripts/discourse/app/components/user-notification-schedule-day.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-notification-schedule.hbs b/app/assets/javascripts/discourse/app/components/user-notification-schedule.hbs
similarity index 89%
rename from app/assets/javascripts/discourse/app/templates/components/user-notification-schedule.hbs
rename to app/assets/javascripts/discourse/app/components/user-notification-schedule.hbs
index 56cfd657be8..8b08f2ada1c 100644
--- a/app/assets/javascripts/discourse/app/templates/components/user-notification-schedule.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-notification-schedule.hbs
@@ -1,4 +1,7 @@
-<div class="control-group notification-schedule">
+<div
+  class="control-group notification-schedule"
+  data-setting-name="user-notification-schedule"
+>
   <label class="control-label">{{i18n
       "user.notification_schedule.title"
     }}</label>
diff --git a/app/assets/javascripts/discourse/app/components/user-preferences/allow-private-messages.hbs b/app/assets/javascripts/discourse/app/components/user-preferences/allow-private-messages.hbs
deleted file mode 100644
index bc206c94384..00000000000
--- a/app/assets/javascripts/discourse/app/components/user-preferences/allow-private-messages.hbs
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="control-group private-messages">
-  <label class="control-label">{{i18n "user.private_messages"}}</label>
-  <div class="controls">
-    <PreferenceCheckbox
-      @labelKey="user.allow_private_messages"
-      @checked={{@model.user_option.allow_private_messages}}
-    />
-  </div>
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/user-preferences/categories.hbs b/app/assets/javascripts/discourse/app/components/user-preferences/categories.hbs
index 1d6a24b2630..74160c9b62c 100644
--- a/app/assets/javascripts/discourse/app/components/user-preferences/categories.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-preferences/categories.hbs
@@ -91,18 +91,20 @@
   {{/if}}
 </div>
 
-<PluginOutlet
-  @name="user-preferences-categories"
-  @tagName="span"
-  @connectorTagName="div"
-  @args={{hash model=@model save=@save}}
-/>
+<span>
+  <PluginOutlet
+    @name="user-preferences-categories"
+    @connectorTagName="div"
+    @outletArgs={{hash model=@model save=@save}}
+  />
+</span>
 
 <br />
 
-<PluginOutlet
-  @name="user-custom-controls"
-  @tagName="span"
-  @connectorTagName="div"
-  @args={{hash model=@model}}
-/>
\ No newline at end of file
+<span>
+  <PluginOutlet
+    @name="user-custom-controls"
+    @connectorTagName="div"
+    @outletArgs={{hash model=@model}}
+  />
+</span>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/user-preferences/tags.hbs b/app/assets/javascripts/discourse/app/components/user-preferences/tags.hbs
index 4bcfbbdb7d7..65c751fa1e6 100644
--- a/app/assets/javascripts/discourse/app/components/user-preferences/tags.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-preferences/tags.hbs
@@ -65,11 +65,11 @@
   <PluginOutlet
     @name="user-preferences-tags"
     @connectorTagName="div"
-    @args={{hash model=@model save=@save}}
+    @outletArgs={{hash model=@model save=@save}}
   />
   <PluginOutlet
     @name="user-custom-controls"
     @connectorTagName="div"
-    @args={{hash model=@model}}
+    @outletArgs={{hash model=@model}}
   />
 {{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/user-profile-avatar.hbs b/app/assets/javascripts/discourse/app/components/user-profile-avatar.hbs
new file mode 100644
index 00000000000..7c88f0d1e01
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/user-profile-avatar.hbs
@@ -0,0 +1,11 @@
+<div class="user-profile-avatar">
+  {{bound-avatar @user "huge"}}
+  <UserAvatarFlair @user={{@user}} />
+  <div>
+    <PluginOutlet
+      @name="user-profile-avatar-flair"
+      @connectorTagName="div"
+      @outletArgs={{hash model=@user}}
+    />
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/user-selector.js b/app/assets/javascripts/discourse/app/components/user-selector.js
deleted file mode 100644
index 17c85727db2..00000000000
--- a/app/assets/javascripts/discourse/app/components/user-selector.js
+++ /dev/null
@@ -1,195 +0,0 @@
-import { bind, observes, on } from "discourse-common/utils/decorators";
-import TextField from "discourse/components/text-field";
-import { findRawTemplate } from "discourse-common/lib/raw-templates";
-import { isEmpty } from "@ember/utils";
-import userSearch from "discourse/lib/user-search";
-import deprecated from "discourse-common/lib/deprecated";
-
-export default TextField.extend({
-  autocorrect: false,
-  autocapitalize: false,
-  name: "user-selector",
-  canReceiveUpdates: false,
-  single: false,
-  fullWidthWrap: false,
-
-  @on("init")
-  deprecateComponent() {
-    deprecated(
-      "The `<UserSelector>` component is deprecated. Please use `<EmailGroupUserChooser>` instead.",
-      { since: "2.7", dropFrom: "2.8", id: "discourse.user-selector-component" }
-    );
-  },
-
-  @bind
-  _paste(event) {
-    let pastedText = "";
-
-    if (window.clipboardData && window.clipboardData.getData) {
-      // IE
-      pastedText = window.clipboardData.getData("Text");
-    } else if (event.clipboardData && event.clipboardData.getData) {
-      pastedText = event.clipboardData.getData("text/plain");
-    }
-
-    if (pastedText.length > 0) {
-      this.importText(pastedText);
-      event.preventDefault();
-      return false;
-    }
-  },
-
-  didUpdateAttrs() {
-    this._super(...arguments);
-
-    if (this.canReceiveUpdates) {
-      this._createAutocompleteInstance({ updateData: true });
-    }
-  },
-
-  @on("willDestroyElement")
-  _destroyAutocompleteInstance() {
-    $(this.element).autocomplete("destroy");
-    this.element.removeEventListener("paste", this._paste);
-  },
-
-  @on("didInsertElement")
-  _createAutocompleteInstance(opts) {
-    const bool = (n) => {
-      const val = this[n];
-      return val === true || val === "true";
-    };
-
-    let selected = [],
-      groups = [],
-      currentUser = this.currentUser,
-      includeMentionableGroups = bool("includeMentionableGroups"),
-      includeMessageableGroups = bool("includeMessageableGroups"),
-      includeGroups = bool("includeGroups"),
-      allowedUsers = bool("allowedUsers"),
-      excludeCurrentUser = bool("excludeCurrentUser"),
-      single = bool("single"),
-      allowAny = bool("allowAny"),
-      disabled = bool("disabled"),
-      allowEmails = bool("allowEmails"),
-      fullWidthWrap = bool("fullWidthWrap");
-
-    const allExcludedUsernames = () => {
-      // hack works around some issues with allowAny eventing
-      let usernames = single ? [] : selected;
-
-      if (currentUser && excludeCurrentUser) {
-        usernames = usernames.concat([currentUser.username]);
-      }
-
-      return usernames.concat(this.excludedUsernames || []);
-    };
-
-    this.element.addEventListener("paste", this._paste);
-
-    const userSelectorComponent = this;
-
-    $(this.element)
-      .val(this.usernames)
-      .autocomplete({
-        template: findRawTemplate("user-selector-autocomplete"),
-        disabled,
-        single,
-        allowAny,
-        updateData: opts && opts.updateData ? opts.updateData : false,
-        fullWidthWrap,
-
-        dataSource(term) {
-          return userSearch({
-            term,
-            topicId: userSelectorComponent.topicId,
-            exclude: allExcludedUsernames(),
-            includeGroups,
-            allowedUsers,
-            includeMentionableGroups,
-            includeMessageableGroups,
-            groupMembersOf: userSelectorComponent.groupMembersOf,
-            allowEmails,
-          });
-        },
-
-        transformComplete(v) {
-          if (v.username || v.name) {
-            if (!v.username) {
-              groups.push(v.name);
-            }
-            return v.username || v.name;
-          } else {
-            const excludes = allExcludedUsernames();
-            return v.usernames.filter((item) => !excludes.includes(item));
-          }
-        },
-
-        onChangeItems(items) {
-          let hasGroups = false;
-          items = items.map((i) => {
-            if (groups.includes(i)) {
-              hasGroups = true;
-            }
-            return i.username ? i.username : i;
-          });
-
-          let previouslySelected = [];
-          if (Array.isArray(userSelectorComponent.usernames)) {
-            previouslySelected = userSelectorComponent.usernames;
-          } else {
-            if (userSelectorComponent.usernames) {
-              previouslySelected = userSelectorComponent.usernames.split(",");
-            }
-          }
-
-          userSelectorComponent.setProperties({
-            usernames: items.join(","),
-            hasGroups,
-          });
-          selected = items;
-
-          if (userSelectorComponent.onChangeCallback) {
-            userSelectorComponent.onChangeCallback(
-              previouslySelected,
-              selected
-            );
-          }
-        },
-
-        reverseTransform(i) {
-          return { username: i };
-        },
-      });
-  },
-
-  importText(text) {
-    let usernames = [];
-    if ((this.usernames || "").length > 0) {
-      usernames = this.usernames.split(",");
-    }
-
-    (text || "").split(/[, \n]+/).forEach((val) => {
-      val = val.replace(/^@+/, "").trim();
-      if (
-        val.length > 0 &&
-        (!this.excludedUsernames || !this.excludedUsernames.includes(val))
-      ) {
-        usernames.push(val);
-      }
-    });
-    this.set("usernames", usernames.uniq().join(","));
-
-    if (!this.canReceiveUpdates) {
-      this._createAutocompleteInstance({ updateData: true });
-    }
-  },
-
-  // THIS IS A HUGE HACK TO SUPPORT CLEARING THE INPUT
-  @observes("usernames")
-  _clearInput() {
-    if (arguments.length > 1 && isEmpty(this.usernames)) {
-      $(this.element).parent().find("a").click();
-    }
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-stat.hbs b/app/assets/javascripts/discourse/app/components/user-stat.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/user-stat.hbs
rename to app/assets/javascripts/discourse/app/components/user-stat.hbs
diff --git a/app/assets/javascripts/discourse/app/components/user-status-message.hbs b/app/assets/javascripts/discourse/app/components/user-status-message.hbs
new file mode 100644
index 00000000000..630c42a8bbe
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/user-status-message.hbs
@@ -0,0 +1,25 @@
+{{#if @status}}
+  <span class={{concat-class "user-status-message" @class}}>
+    {{emoji @status.emoji skipTitle=true}}
+    {{#if @showDescription}}
+      <span class="user-status-message-description">
+        {{@status.description}}
+      </span>
+    {{/if}}
+    {{#if this.showTooltip}}
+      <DTooltip>
+        <div class="user-status-message-tooltip">
+          {{emoji @status.emoji skipTitle=true}}
+          <span class="user-status-tooltip-description">
+            {{@status.description}}
+          </span>
+          {{#if this.until}}
+            <div class="user-status-tooltip-until">
+              {{this.until}}
+            </div>
+          {{/if}}
+        </div>
+      </DTooltip>
+    {{/if}}
+  </span>
+{{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/user-status-message.js b/app/assets/javascripts/discourse/app/components/user-status-message.js
index e7b74052774..18934c14907 100644
--- a/app/assets/javascripts/discourse/app/components/user-status-message.js
+++ b/app/assets/javascripts/discourse/app/components/user-status-message.js
@@ -13,7 +13,7 @@ export default class UserStatusMessage extends Component {
     }
 
     const timezone = this.currentUser
-      ? this.currentUser.timezone
+      ? this.currentUser.user_option?.timezone
       : moment.tz.guess();
 
     return until(this.status.ends_at, timezone, this.currentUser?.locale);
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-status-picker.hbs b/app/assets/javascripts/discourse/app/components/user-status-picker.hbs
similarity index 97%
rename from app/assets/javascripts/discourse/app/templates/components/user-status-picker.hbs
rename to app/assets/javascripts/discourse/app/components/user-status-picker.hbs
index fa11de21f53..9c8a5ecc264 100644
--- a/app/assets/javascripts/discourse/app/templates/components/user-status-picker.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-status-picker.hbs
@@ -19,6 +19,7 @@
     <Input
       class="user-status-description"
       @value={{@status.description}}
+      maxlength="100"
       placeholder={{i18n "user_status.what_are_you_doing"}}
       {{on "input" this.setDefaultEmoji}}
       {{on "focus" this.focus}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-stream-item.hbs b/app/assets/javascripts/discourse/app/components/user-stream-item.hbs
similarity index 79%
rename from app/assets/javascripts/discourse/app/templates/components/user-stream-item.hbs
rename to app/assets/javascripts/discourse/app/components/user-stream-item.hbs
index a491ef58ee1..e26105f28aa 100644
--- a/app/assets/javascripts/discourse/app/templates/components/user-stream-item.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-stream-item.hbs
@@ -28,27 +28,31 @@
   {{else}}
     <ExpandPost @item={{@item}} />
   {{/if}}
-  <span class="time">{{format-date @item.created_at}}</span>
 
-  {{#if @item.deleted_by}}
-    <span class="delete-info">
-      {{d-icon "far-trash-alt"}}
-      {{avatar
-        @item.deleted_by
-        imageSize="tiny"
-        extraClasses="actor"
-        ignoreTitle="true"
-      }}
-      {{format-date @item.deleted_at leaveAgo="true"}}
-    </span>
-  {{/if}}
+  <div class="user-stream-item__metadata">
+    <span class="time">{{format-date @item.created_at}}</span>
 
-  <PluginOutlet
-    @name="user-stream-item-header"
-    @tagName="span"
-    @connectorTagName="div"
-    @args={{hash item=@item}}
-  />
+    {{#if @item.deleted_by}}
+      <span class="delete-info">
+        {{d-icon "far-trash-alt"}}
+        {{avatar
+          @item.deleted_by
+          imageSize="tiny"
+          extraClasses="actor"
+          ignoreTitle="true"
+        }}
+        {{format-date @item.deleted_at leaveAgo="true"}}
+      </span>
+    {{/if}}
+  </div>
+
+  <span>
+    <PluginOutlet
+      @name="user-stream-item-header"
+      @connectorTagName="div"
+      @outletArgs={{hash item=@item}}
+    />
+  </span>
 </div>
 
 {{#if this.actionDescription}}
@@ -112,4 +116,6 @@
       @title="drafts.remove"
     />
   </div>
-{{/if}}
\ No newline at end of file
+{{/if}}
+
+{{yield to="bottom"}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-stream.hbs b/app/assets/javascripts/discourse/app/components/user-stream.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/user-stream.hbs
rename to app/assets/javascripts/discourse/app/components/user-stream.hbs
diff --git a/app/assets/javascripts/discourse/app/components/user-stream.js b/app/assets/javascripts/discourse/app/components/user-stream.js
index d025570b456..e170d91e4f7 100644
--- a/app/assets/javascripts/discourse/app/components/user-stream.js
+++ b/app/assets/javascripts/discourse/app/components/user-stream.js
@@ -6,16 +6,14 @@ import I18n from "I18n";
 import LoadMore from "discourse/mixins/load-more";
 import Post from "discourse/models/post";
 import { NEW_TOPIC_KEY } from "discourse/models/composer";
-import { getOwner } from "discourse-common/lib/get-owner";
-import { observes } from "discourse-common/utils/decorators";
 import { on } from "@ember/object/evented";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import { next, schedule } from "@ember/runloop";
 import { inject as service } from "@ember/service";
 
 export default Component.extend(LoadMore, {
   tagName: "ul",
   dialog: service(),
+  composer: service(),
   _lastDecoratedElement: null,
 
   _initialize: on("init", function () {
@@ -32,14 +30,7 @@ export default Component.extend(LoadMore, {
   eyelineSelector: ".user-stream .item",
   classNames: ["user-stream"],
 
-  @observes("stream.user.id")
-  _scrollTopOnModelChange() {
-    schedule("afterRender", () => $(document).scrollTop(0));
-  },
-
   _inserted: on("didInsertElement", function () {
-    $(window).on("resize.discourse-on-scroll", () => this.scrolled());
-
     $(this.element).on(
       "click.details-disabled",
       "details.disabled",
@@ -49,12 +40,10 @@ export default Component.extend(LoadMore, {
       return ClickTrack.trackClick(e, this.siteSettings);
     });
     this._updateLastDecoratedElement();
-    this._scrollToLastPosition();
   }),
 
   // This view is being removed. Shut down operations
   _destroyed: on("willDestroyElement", function () {
-    $(window).unbind("resize.discourse-on-scroll");
     $(this.element).off("click.details-disabled", "details.disabled");
 
     // Unbind link tracking
@@ -73,22 +62,6 @@ export default Component.extend(LoadMore, {
     this._lastDecoratedElement = lastElement;
   },
 
-  _scrollToLastPosition() {
-    const scrollTo = this.session.userStreamScrollPosition;
-    if (scrollTo >= 0) {
-      schedule("afterRender", () => {
-        if (this.element && !this.isDestroying && !this.isDestroyed) {
-          next(() => window.scrollTo(0, scrollTo));
-        }
-      });
-    }
-  },
-
-  scrolled() {
-    this._super(...arguments);
-    this.session.set("userStreamScrollPosition", window.scrollY);
-  },
-
   actions: {
     removeBookmark(userAction) {
       const stream = this.stream;
@@ -100,9 +73,8 @@ export default Component.extend(LoadMore, {
     },
 
     resumeDraft(item) {
-      const composer = getOwner(this).lookup("controller:composer");
-      if (composer.get("model.viewOpen")) {
-        composer.close();
+      if (this.composer.get("model.viewOpen")) {
+        this.composer.close();
       }
       if (item.get("postUrl")) {
         DiscourseURL.routeTo(item.get("postUrl"));
@@ -114,7 +86,7 @@ export default Component.extend(LoadMore, {
               return;
             }
 
-            composer.open({
+            this.composer.open({
               draft,
               draftKey: item.draft_key,
               draftSequence: d.draft_sequence,
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-summary-category-search.hbs b/app/assets/javascripts/discourse/app/components/user-summary-category-search.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/user-summary-category-search.hbs
rename to app/assets/javascripts/discourse/app/components/user-summary-category-search.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-summary-section.hbs b/app/assets/javascripts/discourse/app/components/user-summary-section.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/user-summary-section.hbs
rename to app/assets/javascripts/discourse/app/components/user-summary-section.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-summary-topic.hbs b/app/assets/javascripts/discourse/app/components/user-summary-topic.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/user-summary-topic.hbs
rename to app/assets/javascripts/discourse/app/components/user-summary-topic.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-summary-topics-list.hbs b/app/assets/javascripts/discourse/app/components/user-summary-topics-list.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/user-summary-topics-list.hbs
rename to app/assets/javascripts/discourse/app/components/user-summary-topics-list.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-summary-user.hbs b/app/assets/javascripts/discourse/app/components/user-summary-user.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/user-summary-user.hbs
rename to app/assets/javascripts/discourse/app/components/user-summary-user.hbs
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-summary-users-list.hbs b/app/assets/javascripts/discourse/app/components/user-summary-users-list.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/components/user-summary-users-list.hbs
rename to app/assets/javascripts/discourse/app/components/user-summary-users-list.hbs
diff --git a/app/assets/javascripts/discourse/app/components/user-tip.hbs b/app/assets/javascripts/discourse/app/components/user-tip.hbs
index b55c1a88437..8731b9c4b6d 100644
--- a/app/assets/javascripts/discourse/app/components/user-tip.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-tip.hbs
@@ -1 +1 @@
-<span {{did-insert this.showUserTip}}></span>
\ No newline at end of file
+<span class="user-tip-reference" {{did-insert this.showUserTip}}></span>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/user-tip.js b/app/assets/javascripts/discourse/app/components/user-tip.js
index d85656f898d..9684bf54618 100644
--- a/app/assets/javascripts/discourse/app/components/user-tip.js
+++ b/app/assets/javascripts/discourse/app/components/user-tip.js
@@ -1,4 +1,5 @@
 import { action } from "@ember/object";
+import { schedule } from "@ember/runloop";
 import { inject as service } from "@ember/service";
 import Component from "@glimmer/component";
 import { hideUserTip } from "discourse/lib/user-tips";
@@ -13,19 +14,32 @@ export default class UserTip extends Component {
       return;
     }
 
-    const { id, selector, content, placement } = this.args;
-    this.currentUser.showUserTip({
-      id,
+    schedule("afterRender", () => {
+      const {
+        id,
+        selector,
+        content,
+        placement,
+        buttonLabel,
+        buttonIcon,
+        onDismiss,
+      } = this.args;
+      element = element.parentElement;
 
-      titleText: I18n.t(`user_tips.${id}.title`),
-      contentText: content || I18n.t(`user_tips.${id}.content`),
-
-      reference: selector
-        ? element.parentElement.querySelector(selector) || element.parentElement
-        : element,
-      appendTo: element.parentElement,
-
-      placement: placement || "top",
+      this.currentUser.showUserTip({
+        id,
+        titleText: I18n.t(`user_tips.${id}.title`),
+        contentHtml: content,
+        contentText: I18n.t(`user_tips.${id}.content`),
+        buttonLabel,
+        buttonIcon,
+        reference:
+          (selector && element.parentElement.querySelector(selector)) ||
+          element,
+        appendTo: element.parentElement,
+        placement,
+        onDismiss,
+      });
     });
   }
 
diff --git a/app/assets/javascripts/discourse/app/components/watch-read.js b/app/assets/javascripts/discourse/app/components/watch-read.js
index f01ad3696c0..6ab1d63d670 100644
--- a/app/assets/javascripts/discourse/app/components/watch-read.js
+++ b/app/assets/javascripts/discourse/app/components/watch-read.js
@@ -1,39 +1,43 @@
-import { bind } from "discourse-common/utils/decorators";
 import Component from "@ember/component";
+import { inject as service } from "@ember/service";
+import { bind } from "discourse-common/utils/decorators";
 import isElementInViewport from "discourse/lib/is-element-in-viewport";
+import { ajax } from "discourse/lib/ajax";
+import { userPath } from "discourse/lib/url";
+
+export default class WatchRead extends Component {
+  @service currentUser;
 
-export default Component.extend({
   didInsertElement() {
-    this._super(...arguments);
-    const currentUser = this.currentUser;
-    if (!currentUser) {
+    super.didInsertElement(...arguments);
+
+    if (!this.currentUser || this.currentUser.read_faq) {
       return;
     }
 
-    const path = this.path;
-    if (path === "faq" || path === "guidelines") {
-      this._markRead();
-      window.addEventListener("resize", this._markRead, false);
-      window.addEventListener("scroll", this._markRead, false);
-    }
-  },
+    this._checkIfRead();
+    window.addEventListener("resize", this._checkIfRead, false);
+    window.addEventListener("scroll", this._checkIfRead, false);
+  }
 
   willDestroyElement() {
-    this._super(...arguments);
+    super.willDestroyElement(...arguments);
 
-    window.removeEventListener("resize", this._markRead);
-    window.removeEventListener("scroll", this._markRead);
-  },
+    window.removeEventListener("resize", this._checkIfRead);
+    window.removeEventListener("scroll", this._checkIfRead);
+  }
 
   @bind
-  _markRead() {
-    const faqUnread = !this.currentUser.read_faq;
+  async _checkIfRead() {
+    const lastParagraph = document.querySelector(
+      "[itemprop='mainContentOfPage'] > *:last-child"
+    );
 
-    if (
-      faqUnread &&
-      isElementInViewport(document.querySelector(".contents p:last-child"))
-    ) {
-      this.action();
+    if (!isElementInViewport(lastParagraph)) {
+      return;
     }
-  },
-});
+
+    await ajax(userPath("read-faq"), { type: "POST" });
+    this.currentUser.set("read_faq", true);
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/welcome-topic-banner.js b/app/assets/javascripts/discourse/app/components/welcome-topic-banner.js
deleted file mode 100644
index 205fc3538f1..00000000000
--- a/app/assets/javascripts/discourse/app/components/welcome-topic-banner.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import Component from "@glimmer/component";
-import { action } from "@ember/object";
-import { getOwner } from "discourse-common/lib/get-owner";
-import Topic from "discourse/models/topic";
-import Composer from "discourse/models/composer";
-import { inject as service } from "@ember/service";
-
-export default class WelcomeTopicBanner extends Component {
-  @service siteSettings;
-  @service store;
-
-  @action
-  editWelcomeTopic() {
-    const topicController = getOwner(this).lookup("controller:topic");
-
-    Topic.find(this.siteSettings.welcome_topic_id, {}).then((topic) => {
-      this.store
-        .createRecord("topic", {
-          id: topic.id,
-          slug: topic.slug,
-        })
-        .postStream.loadPostByPostNumber(1)
-        .then((post) => {
-          post.topic.setProperties({
-            draft_key: Composer.EDIT,
-            "details.can_edit": true,
-          });
-          topicController.send("editPost", post);
-        });
-    });
-  }
-}
diff --git a/app/assets/javascripts/discourse/app/controllers/account-created-edit-email.js b/app/assets/javascripts/discourse/app/controllers/account-created-edit-email.js
index c3a20cc06d7..33d0bd96a8f 100644
--- a/app/assets/javascripts/discourse/app/controllers/account-created-edit-email.js
+++ b/app/assets/javascripts/discourse/app/controllers/account-created-edit-email.js
@@ -2,8 +2,10 @@ import Controller from "@ember/controller";
 import { changeEmail } from "discourse/lib/user-activation";
 import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
+import { inject as service } from "@ember/service";
 
 export default Controller.extend({
+  router: service(),
   accountCreated: null,
   newEmail: null,
 
@@ -18,13 +20,13 @@ export default Controller.extend({
       changeEmail({ email })
         .then(() => {
           this.set("accountCreated.email", email);
-          this.transitionToRoute("account-created.resent");
+          this.router.transitionTo("account-created.resent");
         })
         .catch(popupAjaxError);
     },
 
     cancel() {
-      this.transitionToRoute("account-created.index");
+      this.router.transitionTo("account-created.index");
     },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/account-created-index.js b/app/assets/javascripts/discourse/app/controllers/account-created-index.js
index 10091881d1b..b4da505f284 100644
--- a/app/assets/javascripts/discourse/app/controllers/account-created-index.js
+++ b/app/assets/javascripts/discourse/app/controllers/account-created-index.js
@@ -4,8 +4,10 @@ import getUrl from "discourse-common/lib/get-url";
 import discourseComputed from "discourse-common/utils/decorators";
 import { resendActivationEmail } from "discourse/lib/user-activation";
 import { wavingHandURL } from "discourse/lib/waving-hand-url";
+import { inject as service } from "@ember/service";
 
 export default Controller.extend({
+  router: service(),
   envelopeImageUrl: getUrl("/images/envelope.svg"),
 
   @discourseComputed
@@ -21,11 +23,11 @@ export default Controller.extend({
   actions: {
     sendActivationEmail() {
       resendActivationEmail(this.get("accountCreated.username")).then(() => {
-        this.transitionToRoute("account-created.resent");
+        this.router.transitionTo("account-created.resent");
       });
     },
     editActivationEmail() {
-      this.transitionToRoute("account-created.edit-email");
+      this.router.transitionTo("account-created.edit-email");
     },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/activation-edit.js b/app/assets/javascripts/discourse/app/controllers/activation-edit.js
deleted file mode 100644
index ee57b1b1fd9..00000000000
--- a/app/assets/javascripts/discourse/app/controllers/activation-edit.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import Controller, { inject as controller } from "@ember/controller";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import { changeEmail } from "discourse/lib/user-activation";
-import discourseComputed from "discourse-common/utils/decorators";
-import { extractError } from "discourse/lib/ajax-error";
-
-export default Controller.extend(ModalFunctionality, {
-  login: controller(),
-
-  currentEmail: null,
-  newEmail: null,
-  password: null,
-
-  @discourseComputed("newEmail", "currentEmail")
-  submitDisabled(newEmail, currentEmail) {
-    return newEmail === currentEmail;
-  },
-
-  actions: {
-    changeEmail() {
-      const login = this.login;
-
-      changeEmail({
-        username: login.get("loginName"),
-        password: login.get("loginPassword"),
-        email: this.newEmail,
-      })
-        .then(() => {
-          const modal = this.showModal("activation-resent", {
-            title: "log_in",
-          });
-          modal.set("currentEmail", this.newEmail);
-        })
-        .catch((err) => this.flash(extractError(err), "error"));
-    },
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/controllers/application.js b/app/assets/javascripts/discourse/app/controllers/application.js
index 1c775ad51bb..6ab68de881f 100644
--- a/app/assets/javascripts/discourse/app/controllers/application.js
+++ b/app/assets/javascripts/discourse/app/controllers/application.js
@@ -7,13 +7,13 @@ import { action } from "@ember/object";
 const HIDE_SIDEBAR_KEY = "sidebar-hidden";
 
 export default Controller.extend({
-  queryParams: [{ sidebarQueryParamOverride: "enable_sidebar" }],
+  queryParams: [{ navigationMenuQueryParamOverride: "navigation_menu" }],
 
   showTop: true,
   showFooter: false,
   router: service(),
   showSidebar: false,
-  sidebarQueryParamOverride: null,
+  navigationMenuQueryParamOverride: null,
   sidebarDisabledRouteOverride: false,
   showSiteHeader: true,
 
@@ -41,18 +41,6 @@ export default Controller.extend({
     return this.siteSettings.login_required && !this.currentUser;
   },
 
-  @discourseComputed(
-    "siteSettings.bootstrap_mode_enabled",
-    "router.currentRouteName"
-  )
-  showBootstrapModeNotice(bootstrapModeEnabled, currentRouteName) {
-    return (
-      this.currentUser?.get("staff") &&
-      bootstrapModeEnabled &&
-      !currentRouteName.startsWith("wizard")
-    );
-  },
-
   @discourseComputed
   showFooterNav() {
     return this.capabilities.isAppWebview || this.capabilities.isiOSPWA;
@@ -63,13 +51,13 @@ export default Controller.extend({
   },
 
   @discourseComputed(
-    "sidebarQueryParamOverride",
+    "navigationMenuQueryParamOverride",
     "siteSettings.navigation_menu",
     "canDisplaySidebar",
     "sidebarDisabledRouteOverride"
   )
   sidebarEnabled(
-    sidebarQueryParamOverride,
+    navigationMenuQueryParamOverride,
     navigationMenu,
     canDisplaySidebar,
     sidebarDisabledRouteOverride
@@ -82,11 +70,14 @@ export default Controller.extend({
       return false;
     }
 
-    if (sidebarQueryParamOverride === "1") {
+    if (navigationMenuQueryParamOverride === "sidebar") {
       return true;
     }
 
-    if (sidebarQueryParamOverride === "0") {
+    if (
+      navigationMenuQueryParamOverride === "legacy" ||
+      navigationMenuQueryParamOverride === "header_dropdown"
+    ) {
       return false;
     }
 
diff --git a/app/assets/javascripts/discourse/app/controllers/associate-account-confirm.js b/app/assets/javascripts/discourse/app/controllers/associate-account-confirm.js
index 6afae9f1d77..e12c6a11757 100644
--- a/app/assets/javascripts/discourse/app/controllers/associate-account-confirm.js
+++ b/app/assets/javascripts/discourse/app/controllers/associate-account-confirm.js
@@ -2,8 +2,12 @@ import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
+import { inject as service } from "@ember/service";
 
 export default Controller.extend(ModalFunctionality, {
+  router: service(),
+  currentUser: service(),
+
   actions: {
     finishConnect() {
       ajax({
@@ -12,7 +16,7 @@ export default Controller.extend(ModalFunctionality, {
       })
         .then((result) => {
           if (result.success) {
-            this.transitionToRoute(
+            this.router.transitionTo(
               "preferences.account",
               this.currentUser.findDetails()
             );
diff --git a/app/assets/javascripts/discourse/app/controllers/avatar-selector.js b/app/assets/javascripts/discourse/app/controllers/avatar-selector.js
index eab7d45a2aa..682cd001347 100644
--- a/app/assets/javascripts/discourse/app/controllers/avatar-selector.js
+++ b/app/assets/javascripts/discourse/app/controllers/avatar-selector.js
@@ -7,6 +7,8 @@ import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { setting } from "discourse/lib/computed";
 import { isTesting } from "discourse-common/config/environment";
+import { dependentKeyCompat } from "@ember/object/compat";
+import { tracked } from "@glimmer/tracking";
 
 export default Controller.extend(ModalFunctionality, {
   gravatarName: setting("gravatar_name"),
@@ -56,23 +58,34 @@ export default Controller.extend(ModalFunctionality, {
     }
   },
 
-  @discourseComputed(
-    "user.use_logo_small_as_avatar",
-    "user.avatar_template",
-    "user.system_avatar_template",
-    "user.gravatar_avatar_template"
-  )
-  selected(
-    useLogo,
-    avatarTemplate,
-    systemAvatarTemplate,
-    gravatarAvatarTemplate
-  ) {
-    if (useLogo) {
+  @tracked _selected: null,
+
+  @dependentKeyCompat
+  get selected() {
+    return this._selected ?? this.defaultSelection;
+  },
+
+  set selected(value) {
+    this._selected = value;
+  },
+
+  @action
+  onSelectedChanged(value) {
+    this._selected = value;
+  },
+
+  get defaultSelection() {
+    if (this.get("user.use_logo_small_as_avatar")) {
       return "logo";
-    } else if (avatarTemplate === systemAvatarTemplate) {
+    } else if (
+      this.get("user.avatar_template") ===
+      this.get("user.system_avatar_template")
+    ) {
       return "system";
-    } else if (avatarTemplate === gravatarAvatarTemplate) {
+    } else if (
+      this.get("user.avatar_template") ===
+      this.get("user.gravatar_avatar_template")
+    ) {
       return "gravatar";
     } else {
       return "custom";
diff --git a/app/assets/javascripts/discourse/app/controllers/bookmark.js b/app/assets/javascripts/discourse/app/controllers/bookmark.js
deleted file mode 100644
index c05fcda47ad..00000000000
--- a/app/assets/javascripts/discourse/app/controllers/bookmark.js
+++ /dev/null
@@ -1,80 +0,0 @@
-import Controller from "@ember/controller";
-import I18n from "I18n";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import { action } from "@ember/object";
-import { Promise } from "rsvp";
-import showModal from "discourse/lib/show-modal";
-
-export function openBookmarkModal(
-  bookmark,
-  callbacks = {
-    onCloseWithoutSaving: null,
-    onAfterSave: null,
-    onAfterDelete: null,
-  }
-) {
-  return new Promise((resolve) => {
-    const model = {
-      id: bookmark.id,
-      reminderAt: bookmark.reminder_at,
-      autoDeletePreference: bookmark.auto_delete_preference,
-      name: bookmark.name,
-    };
-
-    model.bookmarkableId = bookmark.bookmarkable_id;
-    model.bookmarkableType = bookmark.bookmarkable_type;
-
-    let modalController = showModal("bookmark", {
-      model,
-      titleTranslated: I18n.t(
-        bookmark.id ? "bookmarks.edit" : "bookmarks.create"
-      ),
-      modalClass: "bookmark-with-reminder",
-    });
-    modalController.setProperties({
-      onCloseWithoutSaving: () => {
-        if (callbacks.onCloseWithoutSaving) {
-          callbacks.onCloseWithoutSaving();
-        }
-        resolve();
-      },
-      afterSave: (savedData) => {
-        let resolveData;
-        if (callbacks.onAfterSave) {
-          resolveData = callbacks.onAfterSave(savedData);
-        }
-        resolve(resolveData);
-      },
-      afterDelete: (topicBookmarked, bookmarkId) => {
-        if (callbacks.onAfterDelete) {
-          callbacks.onAfterDelete(topicBookmarked, bookmarkId);
-        }
-        resolve();
-      },
-    });
-  });
-}
-
-export default Controller.extend(ModalFunctionality, {
-  onShow() {
-    this.setProperties({
-      model: this.model || {},
-      allowSave: true,
-    });
-  },
-
-  @action
-  registerOnCloseHandler(handlerFn) {
-    this.set("onCloseHandler", handlerFn);
-  },
-
-  /**
-   * We always want to save the bookmark unless the user specifically
-   * clicks the save or cancel button to mimic browser behaviour.
-   */
-  onClose(opts = {}) {
-    if (this.onCloseHandler) {
-      this.onCloseHandler(opts);
-    }
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/controllers/bulk-notification-level.js b/app/assets/javascripts/discourse/app/controllers/bulk-notification-level.js
deleted file mode 100644
index 0a8655986fb..00000000000
--- a/app/assets/javascripts/discourse/app/controllers/bulk-notification-level.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import Controller, { inject as controller } from "@ember/controller";
-import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
-import { empty } from "@ember/object/computed";
-import { topicLevels } from "discourse/lib/notification-levels";
-
-// Support for changing the notification level of various topics
-export default Controller.extend({
-  topicBulkActions: controller(),
-  notificationLevelId: null,
-
-  @discourseComputed
-  notificationLevels() {
-    return topicLevels.map((level) => {
-      return {
-        id: level.id.toString(),
-        name: I18n.t(`topic.notifications.${level.key}.title`),
-        description: I18n.t(`topic.notifications.${level.key}.description`),
-      };
-    });
-  },
-
-  disabled: empty("notificationLevelId"),
-
-  actions: {
-    changeNotificationLevel() {
-      this.topicBulkActions.performAndRefresh({
-        type: "change_notification_level",
-        notification_level_id: this.notificationLevelId,
-      });
-    },
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/controllers/composer.js b/app/assets/javascripts/discourse/app/controllers/composer.js
index 9dabffdaa5e..73e80522c53 100644
--- a/app/assets/javascripts/discourse/app/controllers/composer.js
+++ b/app/assets/javascripts/discourse/app/controllers/composer.js
@@ -1,1581 +1,19 @@
-import Composer, { SAVE_ICONS, SAVE_LABELS } from "discourse/models/composer";
-import Controller, { inject as controller } from "@ember/controller";
-import EmberObject, { action, computed } from "@ember/object";
-import { alias, and, or, reads } from "@ember/object/computed";
-import {
-  authorizesOneOrMoreExtensions,
-  uploadIcon,
-} from "discourse/lib/uploads";
-import { cancel, scheduleOnce } from "@ember/runloop";
-import {
-  cannotPostAgain,
-  durationTextFromSeconds,
-} from "discourse/helpers/slow-mode";
-import discourseComputed, {
-  observes,
-  on,
-} from "discourse-common/utils/decorators";
-import DiscourseURL from "discourse/lib/url";
-import Draft from "discourse/models/draft";
-import I18n from "I18n";
-import { Promise } from "rsvp";
-import { buildQuote } from "discourse/lib/quote";
-import deprecated from "discourse-common/lib/deprecated";
-import discourseDebounce from "discourse-common/lib/debounce";
-import { emojiUnescape } from "discourse/lib/text";
-import { escapeExpression, modKeysPressed } from "discourse/lib/utilities";
-import { getOwner } from "discourse-common/lib/get-owner";
-import getURL from "discourse-common/lib/get-url";
-import { isEmpty } from "@ember/utils";
-import { isTesting } from "discourse-common/config/environment";
-import { inject as service } from "@ember/service";
-import { shortDate } from "discourse/lib/formatter";
-import showModal from "discourse/lib/show-modal";
-
-async function loadDraft(store, opts = {}) {
-  let { draft, draftKey, draftSequence } = opts;
-
-  try {
-    if (draft && typeof draft === "string") {
-      draft = JSON.parse(draft);
-    }
-  } catch (error) {
-    draft = null;
-    Draft.clear(draftKey, draftSequence);
-  }
-
-  if (!draft?.title && !draft?.reply) {
-    return;
-  }
-
-  let attrs = {
-    draftKey,
-    draftSequence,
-    draft: true,
-    composerState: Composer.DRAFT,
-    topic: opts.topic,
-  };
-
-  Composer.serializedFieldsForDraft().forEach((f) => {
-    attrs[f] = draft[f] || opts[f];
-  });
-
-  const composer = store.createRecord("composer");
-  await composer.open(attrs);
-
-  return composer;
-}
-
-const _popupMenuOptionsCallbacks = [];
-const _composerSaveErrorCallbacks = [];
-
-let _checkDraftPopup = !isTesting();
-
-export function toggleCheckDraftPopup(enabled) {
-  _checkDraftPopup = enabled;
-}
-
-export function clearPopupMenuOptionsCallback() {
-  _popupMenuOptionsCallbacks.length = 0;
-}
-
-export function addPopupMenuOptionsCallback(callback) {
-  _popupMenuOptionsCallbacks.push(callback);
-}
-
-export function clearComposerSaveErrorCallback() {
-  _composerSaveErrorCallbacks.length = 0;
-}
-
-export function addComposerSaveErrorCallback(callback) {
-  _composerSaveErrorCallbacks.push(callback);
-}
-
-export default Controller.extend({
-  topicController: controller("topic"),
-  router: service(),
-  dialog: service(),
-
-  checkedMessages: false,
-  messageCount: null,
-  showEditReason: false,
-  editReason: null,
-  scopedCategoryId: null,
-  prioritizedCategoryId: null,
-  lastValidatedAt: null,
-  isUploading: false,
-  isProcessingUpload: false,
-  topic: null,
-  linkLookup: null,
-  showPreview: true,
-  composerHeight: null,
-  forcePreview: and("site.mobileView", "showPreview"),
-  whisperOrUnlistTopic: or("isWhispering", "model.unlistTopic"),
-  categories: alias("site.categoriesList"),
-
-  @on("init")
-  _setupPreview() {
-    const val = this.site.mobileView
-      ? false
-      : this.keyValueStore.get("composer.showPreview") || "true";
-    this.set("showPreview", val === "true");
-  },
-
-  @computed(
-    "model.loading",
-    "isUploading",
-    "isProcessingUpload",
-    "_disableSubmit"
-  )
-  get disableSubmit() {
-    return (
-      this.model?.loading ||
-      this.isUploading ||
-      this.isProcessingUpload ||
-      this._disableSubmit
-    );
-  },
-
-  set disableSubmit(value) {
-    return this.set("_disableSubmit", value);
-  },
-
-  @discourseComputed("showPreview")
-  toggleText(showPreview) {
-    return showPreview
-      ? I18n.t("composer.hide_preview")
-      : I18n.t("composer.show_preview");
-  },
-
-  @observes("showPreview")
-  showPreviewChanged() {
-    if (!this.site.mobileView) {
-      this.keyValueStore.set({
-        key: "composer.showPreview",
-        value: this.showPreview,
-      });
-    }
-  },
-
-  @discourseComputed(
-    "model.replyingToTopic",
-    "model.creatingPrivateMessage",
-    "model.targetRecipients",
-    "model.composeState"
-  )
-  focusTarget(replyingToTopic, creatingPM, usernames, composeState) {
-    // Focus on usernames if it's blank or if it's just you
-    usernames = usernames || "";
-    if (
-      (creatingPM && usernames.length === 0) ||
-      usernames === this.currentUser.username
-    ) {
-      return "usernames";
-    }
-
-    if (replyingToTopic) {
-      return "reply";
-    }
-
-    if (composeState === Composer.FULLSCREEN) {
-      return "editor";
-    }
-
-    return "title";
-  },
-
-  showToolbar: computed({
-    get() {
-      const keyValueStore = getOwner(this).lookup("service:key-value-store");
-      const storedVal = keyValueStore.get("toolbar-enabled");
-      if (this._toolbarEnabled === undefined && storedVal === undefined) {
-        // iPhone 6 is 375, anything narrower and toolbar should
-        // be default disabled.
-        // That said we should remember the state
-        this._toolbarEnabled =
-          window.innerWidth > 370 && !this.capabilities.isAndroid;
-      }
-      return this._toolbarEnabled || storedVal === "true";
-    },
-    set(key, val) {
-      const keyValueStore = getOwner(this).lookup("service:key-value-store");
-      this._toolbarEnabled = val;
-      keyValueStore.set({
-        key: "toolbar-enabled",
-        value: val ? "true" : "false",
-      });
-      return val;
-    },
-  }),
-
-  topicModel: alias("topicController.model"),
-
-  @discourseComputed("model.canEditTitle", "model.creatingPrivateMessage")
-  canEditTags(canEditTitle, creatingPrivateMessage) {
-    if (creatingPrivateMessage && this.site.mobileView) {
-      return false;
-    }
-
-    const isPrivateMessage =
-      creatingPrivateMessage || this.get("model.topic.isPrivateMessage");
-
-    return (
-      canEditTitle &&
-      this.site.can_tag_topics &&
-      (!isPrivateMessage || this.site.can_tag_pms)
-    );
-  },
-
-  @discourseComputed("model.editingPost", "model.topic.details.can_edit")
-  disableCategoryChooser(editingPost, canEditTopic) {
-    return editingPost && !canEditTopic;
-  },
-
-  @discourseComputed("model.editingPost", "model.topic.canEditTags")
-  disableTagsChooser(editingPost, canEditTags) {
-    return editingPost && !canEditTags;
-  },
-
-  isStaffUser: reads("currentUser.staff"),
-  whisperer: reads("currentUser.whisperer"),
-
-  canUnlistTopic: and("model.creatingTopic", "isStaffUser"),
-
-  @discourseComputed("canWhisper", "replyingToWhisper")
-  showWhisperToggle(canWhisper, replyingToWhisper) {
-    return canWhisper && !replyingToWhisper;
-  },
-
-  @discourseComputed("model.post")
-  replyingToWhisper(repliedToPost) {
-    return (
-      repliedToPost && repliedToPost.post_type === this.site.post_types.whisper
-    );
-  },
-
-  isWhispering: or("replyingToWhisper", "model.whisper"),
-
-  @discourseComputed("model.action", "isWhispering", "model.privateMessage")
-  saveIcon(modelAction, isWhispering, privateMessage) {
-    if (isWhispering) {
-      return "far-eye-slash";
-    }
-    if (privateMessage && modelAction === Composer.REPLY) {
-      return "envelope";
-    }
-
-    return SAVE_ICONS[modelAction];
-  },
-
-  // Note we update when some other attributes like tag/category change to allow
-  // text customizations to use those.
-  @discourseComputed(
-    "model.action",
-    "isWhispering",
-    "model.editConflict",
-    "model.privateMessage",
-    "model.tags",
-    "model.category"
-  )
-  saveLabel(modelAction, isWhispering, editConflict, privateMessage) {
-    let result = this.model.customizationFor("saveLabel");
-    if (result) {
-      return result;
-    }
-
-    if (editConflict) {
-      return "composer.overwrite_edit";
-    } else if (isWhispering) {
-      return "composer.create_whisper";
-    } else if (privateMessage && modelAction === Composer.REPLY) {
-      return "composer.create_pm";
-    }
-
-    return SAVE_LABELS[modelAction];
-  },
-
-  @discourseComputed("whisperer", "model.action")
-  canWhisper(whisperer, modelAction) {
-    return whisperer && modelAction === Composer.REPLY;
-  },
-
-  _setupPopupMenuOption(callback) {
-    let option = callback(this);
-    if (typeof option === "undefined") {
-      return null;
-    }
-
-    if (typeof option.condition === "undefined") {
-      option.condition = true;
-    } else if (typeof option.condition === "boolean") {
-      // uses existing value
-    } else {
-      option.condition = this.get(option.condition);
-    }
-
-    return option;
-  },
-
-  @discourseComputed("model.requiredCategoryMissing", "model.replyLength")
-  disableTextarea(requiredCategoryMissing, replyLength) {
-    return requiredCategoryMissing && replyLength === 0;
-  },
-
-  @discourseComputed("model.composeState", "model.creatingTopic", "model.post")
-  popupMenuOptions(composeState) {
-    if (composeState === "open" || composeState === "fullscreen") {
-      const options = [];
-
-      options.push(
-        this._setupPopupMenuOption(() => {
-          return {
-            action: "toggleInvisible",
-            icon: "far-eye-slash",
-            label: "composer.toggle_unlisted",
-            condition: "canUnlistTopic",
-          };
-        })
-      );
-
-      if (this.capabilities.touch) {
-        options.push(
-          this._setupPopupMenuOption(() => {
-            return {
-              action: "applyFormatCode",
-              icon: "code",
-              label: "composer.code_title",
-            };
-          })
-        );
-
-        options.push(
-          this._setupPopupMenuOption(() => {
-            return {
-              action: "applyUnorderedList",
-              icon: "list-ul",
-              label: "composer.ulist_title",
-            };
-          })
-        );
-
-        options.push(
-          this._setupPopupMenuOption(() => {
-            return {
-              action: "applyOrderedList",
-              icon: "list-ol",
-              label: "composer.olist_title",
-            };
-          })
-        );
-      }
-
-      options.push(
-        this._setupPopupMenuOption(() => {
-          return {
-            action: "toggleWhisper",
-            icon: "far-eye-slash",
-            label: "composer.toggle_whisper",
-            condition: "showWhisperToggle",
-          };
-        })
-      );
-
-      return options.concat(
-        _popupMenuOptionsCallbacks
-          .map((callback) => this._setupPopupMenuOption(callback))
-          .filter((o) => o)
-      );
-    }
-  },
-
-  @discourseComputed("model.creatingPrivateMessage", "model.targetRecipients")
-  showWarning(creatingPrivateMessage, usernames) {
-    if (!this.get("currentUser.staff")) {
-      return false;
-    }
-
-    const hasTargetGroups = this.get("model.hasTargetGroups");
-
-    // We need exactly one user to issue a warning
-    if (
-      isEmpty(usernames) ||
-      usernames.split(",").length !== 1 ||
-      hasTargetGroups
-    ) {
-      return false;
-    }
-
-    return creatingPrivateMessage;
-  },
-
-  @discourseComputed("model.topic.title")
-  draftTitle(topicTitle) {
-    return emojiUnescape(escapeExpression(topicTitle));
-  },
-
-  @discourseComputed
-  allowUpload() {
-    return authorizesOneOrMoreExtensions(
-      this.currentUser.staff,
-      this.siteSettings
-    );
-  },
-
-  @discourseComputed()
-  uploadIcon() {
-    return uploadIcon(this.currentUser.staff, this.siteSettings);
-  },
-
-  // Use this to open the composer when you are not sure whether it is
-  // already open and whether it already has a draft being worked on. Supports
-  // options to append text once the composer is open if required.
-  //
-  // opts:
-  //
-  // - topic: if this is present, the composer will be opened with the reply
-  // action and the current topic key and draft sequence
-  // - fallbackToNewTopic: if true, and there is no draft and no topic,
-  // the composer will be opened with the create_topic action and a new
-  // topic draft key
-  // - insertText: the text to append to the composer once it is opened
-  // - openOpts: this object will be passed to this.open if fallbackToNewTopic is
-  // true or topic is provided
-  @action
-  async focusComposer(opts = {}) {
-    await this._openComposerForFocus(opts);
-    this._focusAndInsertText(opts.insertText);
-  },
-
-  async _openComposerForFocus(opts) {
-    if (this.get("model.viewOpen")) {
-      return;
-    }
-
-    const opened = this.openIfDraft();
-    if (opened) {
-      return;
-    }
-
-    if (opts.topic) {
-      return await this.open({
-        action: Composer.REPLY,
-        draftKey: opts.topic.get("draft_key"),
-        draftSequence: opts.topic.get("draft_sequence"),
-        topic: opts.topic,
-        ...(opts.openOpts || {}),
-      });
-    }
-
-    if (opts.fallbackToNewTopic) {
-      return await this.open({
-        action: Composer.CREATE_TOPIC,
-        draftKey: Composer.NEW_TOPIC_KEY,
-        ...(opts.openOpts || {}),
-      });
-    }
-  },
-
-  _focusAndInsertText(insertText) {
-    scheduleOnce("afterRender", () => {
-      document.querySelector("textarea.d-editor-input")?.focus();
-
-      if (insertText) {
-        this.model.appendText(insertText, null, { new_line: true });
-      }
-    });
-  },
-
-  @action
-  openIfDraft(event) {
-    if (!this.get("model.viewDraft")) {
-      return false;
-    }
-
-    // when called from shortcut, ensure we don't propagate the key to
-    // the composer input title
-    if (event) {
-      event.preventDefault();
-      event.stopPropagation();
-    }
-
-    this.set("model.composeState", Composer.OPEN);
-
-    document.documentElement.style.setProperty(
-      "--composer-height",
-      this.get("model.composerHeight")
-    );
-
-    return true;
-  },
-
-  @action
-  removeFullScreenExitPrompt() {
-    this.set("model.showFullScreenExitPrompt", false);
-  },
-
-  @action
-  async cancel(event) {
-    event?.preventDefault();
-    await this.cancelComposer();
-  },
-
-  @action
-  cancelUpload(event) {
-    event?.preventDefault();
-    this.set("model.uploadCancelled", true);
-  },
-
-  @action
-  togglePreview(event) {
-    event?.preventDefault();
-    this.toggleProperty("showPreview");
-  },
-
-  @action
-  viewNewReply(event) {
-    if (event && modKeysPressed(event).length > 0) {
-      return false;
-    }
-    event?.preventDefault();
-    DiscourseURL.routeTo(this.get("model.createdPost.url"));
-    this.close();
-  },
-
-  actions: {
-    closeComposer() {
-      this.close();
-    },
-
-    async openComposer(options, post, topic) {
-      await this.open(options);
-
-      let url = post?.url || topic?.url;
-      const topicTitle = topic?.title;
-
-      if (!url || !topicTitle) {
-        return;
-      }
-
-      url = `${location.protocol}//${location.host}${url}`;
-      const link = `[${escapeExpression(topicTitle)}](${url})`;
-      const continueDiscussion = I18n.t("post.continue_discussion", {
-        postLink: link,
-      });
-
-      const reply = this.get("model.reply");
-      if (reply?.includes(continueDiscussion)) {
-        return;
-      }
-
-      this.model.prependText(continueDiscussion, {
-        new_line: true,
-      });
-    },
-
-    onPopupMenuAction(menuAction) {
-      this.send(menuAction);
-    },
-
-    storeToolbarState(toolbarEvent) {
-      this.set("toolbarEvent", toolbarEvent);
-    },
-
-    typed() {
-      this.checkReplyLength();
-      this.model.typing();
-    },
-
-    cancelled() {
-      this.send("hitEsc");
-    },
-
-    addLinkLookup(linkLookup) {
-      this.set("linkLookup", linkLookup);
-    },
-
-    afterRefresh($preview) {
-      const topic = this.get("model.topic");
-      const linkLookup = this.linkLookup;
-
-      if (!topic || !linkLookup) {
-        return;
-      }
-
-      // Don't check if there's only one post
-      if (topic.posts_count === 1) {
-        return;
-      }
-
-      const post = this.get("model.post");
-      const $links = $("a[href]", $preview);
-      $links.each((idx, l) => {
-        const href = l.href;
-        if (href && href.length) {
-          // skip links added by watched words
-          if (l.dataset.word !== undefined) {
-            return true;
-          }
-
-          // skip links in quotes and oneboxes
-          for (let element = l; element; element = element.parentElement) {
-            if (
-              element.tagName === "DIV" &&
-              element.classList.contains("d-editor-preview")
-            ) {
-              break;
-            }
-
-            if (
-              element.tagName === "ASIDE" &&
-              element.classList.contains("quote")
-            ) {
-              return true;
-            }
-
-            if (
-              element.tagName === "ASIDE" &&
-              element.classList.contains("onebox") &&
-              href !== element.dataset["onebox-src"]
-            ) {
-              return true;
-            }
-          }
-
-          const [linkWarn, linkInfo] = linkLookup.check(post, href);
-
-          if (linkWarn && !this.get("isWhispering")) {
-            let body;
-            if (linkInfo.username === this.currentUser.username) {
-              body = I18n.t("composer.duplicate_link_same_user", {
-                domain: linkInfo.domain,
-                post_url: topic.urlForPostNumber(linkInfo.post_number),
-                ago: shortDate(linkInfo.posted_at),
-              });
-            } else {
-              body = I18n.t("composer.duplicate_link", {
-                domain: linkInfo.domain,
-                username: linkInfo.username,
-                post_url: topic.urlForPostNumber(linkInfo.post_number),
-                ago: shortDate(linkInfo.posted_at),
-              });
-            }
-            this.appEvents.trigger("composer-messages:create", {
-              extraClass: "custom-body",
-              templateName: "education",
-              body,
-            });
-            return false;
-          }
-        }
-        return true;
-      });
-    },
-
-    toggleWhisper() {
-      this.toggleProperty("model.whisper");
-    },
-
-    toggleInvisible() {
-      this.toggleProperty("model.unlistTopic");
-    },
-
-    toggleToolbar() {
-      this.toggleProperty("showToolbar");
-    },
-
-    // Toggle the reply view
-    async toggle() {
-      this.closeAutocomplete();
-
-      const composer = this.model;
-
-      if (isEmpty(composer?.reply) && isEmpty(composer?.title)) {
-        this.close();
-      } else if (composer?.viewOpenOrFullscreen) {
-        this.shrink();
-      } else {
-        await this.cancelComposer();
-      }
-    },
-
-    fullscreenComposer() {
-      this.toggleFullscreen();
-      return false;
-    },
-
-    // Import a quote from the post
-    async importQuote(toolbarEvent) {
-      const postStream = this.get("topic.postStream");
-      let postId = this.get("model.post.id");
-
-      // If there is no current post, use the first post id from the stream
-      if (!postId && postStream) {
-        postId = postStream.get("stream.firstObject");
-      }
-
-      // If we're editing a post, fetch the reply when importing a quote
-      if (this.get("model.editingPost")) {
-        const replyToPostNumber = this.get("model.post.reply_to_post_number");
-        if (replyToPostNumber) {
-          const replyPost = postStream.posts.findBy(
-            "post_number",
-            replyToPostNumber
-          );
-
-          if (replyPost) {
-            postId = replyPost.id;
-          }
-        }
-      }
-
-      if (!postId) {
-        return;
-      }
-
-      this.set("model.loading", true);
-
-      const post = await this.store.find("post", postId);
-      const quote = buildQuote(post, post.raw, { full: true });
-
-      toolbarEvent.addText(quote);
-      this.set("model.loading", false);
-    },
-
-    save(ignore, event) {
-      this.save(false, {
-        jump:
-          !(event?.shiftKey && this.get("model.replyingToTopic")) &&
-          !this.skipJumpOnSave,
-      });
-    },
-
-    displayEditReason() {
-      this.set("showEditReason", true);
-    },
-
-    hitEsc() {
-      if (
-        document.querySelectorAll(".emoji-picker-modal.fadeIn").length === 1
-      ) {
-        this.appEvents.trigger("emoji-picker:close");
-        return;
-      }
-
-      if ((this.messageCount || 0) > 0) {
-        this.appEvents.trigger("composer-messages:close");
-        return;
-      }
-
-      const composer = this.model;
-
-      if (composer?.viewOpen) {
-        this.shrink();
-      }
-
-      if (composer?.viewFullscreen) {
-        this.toggleFullscreen();
-        this.focusComposer();
-      }
-    },
-
-    groupsMentioned({ name, userCount, maxMentions }) {
-      if (
-        this.get("model.creatingPrivateMessage") ||
-        this.get("model.topic.isPrivateMessage")
-      ) {
-        return;
-      }
-
-      maxMentions = parseInt(maxMentions, 10);
-      userCount = parseInt(userCount, 10);
-
-      let body;
-      const groupLink = getURL(`/g/${name}/members`);
-
-      if (userCount > maxMentions) {
-        body = I18n.t("composer.group_mentioned_limit", {
-          group: `@${name}`,
-          count: maxMentions,
-          group_link: groupLink,
-        });
-      } else if (userCount > 0) {
-        body = I18n.t("composer.group_mentioned", {
-          group: `@${name}`,
-          count: userCount,
-          group_link: groupLink,
-        });
-      }
-
-      if (body) {
-        this.appEvents.trigger("composer-messages:create", {
-          extraClass: "custom-body",
-          templateName: "education",
-          body,
-        });
-      }
-    },
-
-    cannotSeeMention({ name, reason, notifiedCount, isGroup }) {
-      notifiedCount = parseInt(notifiedCount, 10);
-
-      let body;
-      if (isGroup) {
-        body = I18n.t(`composer.cannot_see_group_mention.${reason}`, {
-          group: name,
-          count: notifiedCount,
-        });
-      } else {
-        body = I18n.t(`composer.cannot_see_mention.${reason}`, {
-          username: name,
-        });
-      }
-
-      this.appEvents.trigger("composer-messages:create", {
-        extraClass: "custom-body",
-        templateName: "education",
-        body,
-      });
-    },
-
-    hereMention(count) {
-      this.appEvents.trigger("composer-messages:create", {
-        extraClass: "custom-body",
-        templateName: "education",
-        body: I18n.t("composer.here_mention", {
-          here: this.siteSettings.here_mention,
-          count,
-        }),
-      });
-    },
-
-    applyFormatCode() {
-      this.toolbarEvent.formatCode();
-    },
-
-    applyUnorderedList() {
-      this.toolbarEvent.applyList("* ", "list_item");
-    },
-
-    applyOrderedList() {
-      this.toolbarEvent.applyList(
-        (i) => (!i ? "1. " : `${parseInt(i, 10) + 1}. `),
-        "list_item"
-      );
-    },
-  },
-
-  save(force, options = {}) {
-    if (this.disableSubmit) {
-      return;
-    }
-
-    // Clear the warning state if we're not showing the checkbox anymore
-    if (!this.showWarning) {
-      this.set("model.isWarning", false);
-    }
-
-    if (this.site.mobileView && this.showPreview) {
-      this.set("showPreview", false);
-    }
-
-    const composer = this.model;
-
-    if (composer?.cantSubmitPost) {
-      if (composer?.viewFullscreen) {
-        this.toggleFullscreen();
-      }
-
-      this.set("lastValidatedAt", Date.now());
-      return;
-    }
-
-    const topic = composer.topic;
-    const slowModePost =
-      topic && topic.slow_mode_seconds && topic.user_last_posted_at;
-    const notEditing = this.get("model.action") !== "edit";
-
-    // Editing a topic in slow mode is directly handled by the backend.
-    if (slowModePost && notEditing) {
-      if (
-        cannotPostAgain(
-          this.currentUser,
-          topic.slow_mode_seconds,
-          topic.user_last_posted_at
-        )
-      ) {
-        const canPostAt = new moment(topic.user_last_posted_at).add(
-          topic.slow_mode_seconds,
-          "seconds"
-        );
-        const timeLeft = moment().diff(canPostAt, "seconds");
-        const message = I18n.t("composer.slow_mode.error", {
-          timeLeft: durationTextFromSeconds(timeLeft),
-        });
-
-        this.dialog.alert(message);
-        return;
-      } else {
-        // Edge case where the user tries to post again immediately.
-        topic.set("user_last_posted_at", new Date().toISOString());
-      }
-    }
-
-    composer.set("disableDrafts", true);
-
-    // for now handle a very narrow use case
-    // if we are replying to a topic
-    // AND are on on a different topic
-    // AND topic is open (or we are staff)
-    // --> pop the window up
-    if (!force && composer.replyingToTopic) {
-      const currentTopic = this.topicModel;
-
-      if (!currentTopic) {
-        this.save(true);
-        return;
-      }
-
-      if (
-        currentTopic.id !== composer.get("topic.id") &&
-        (this.isStaffUser || !currentTopic.closed)
-      ) {
-        this.dialog.alert({
-          title: I18n.t("composer.posting_not_on_topic"),
-          buttons: [
-            {
-              label:
-                I18n.t("composer.reply_original") +
-                "<br/><div class='topic-title overflow-ellipsis'>" +
-                this.get("model.topic.fancyTitle") +
-                "</div>",
-              class: "btn-primary btn-reply-on-original",
-              action: () => this.save(true),
-            },
-            {
-              label:
-                I18n.t("composer.reply_here") +
-                "<br/><div class='topic-title overflow-ellipsis'>" +
-                currentTopic.get("fancyTitle") +
-                "</div>",
-              class: "btn-reply-here",
-              action: () => {
-                composer.setProperties({ topic: currentTopic, post: null });
-                this.save(true);
-              },
-            },
-            {
-              label: I18n.t("composer.cancel"),
-              class: "btn-flat btn-text btn-reply-where-cancel",
-            },
-          ],
-          class: "reply-where-modal",
-        });
-        return;
-      }
-    }
-
-    let staged = false;
-
-    // TODO: This should not happen in model
-    const imageSizes = {};
-    document
-      .querySelectorAll("#reply-control .d-editor-preview img")
-      .forEach((e) => {
-        const src = e.src;
-
-        if (src && src.length) {
-          imageSizes[src] = { width: e.naturalWidth, height: e.naturalHeight };
-        }
-      });
-
-    const promise = composer
-      .save({ imageSizes, editReason: this.editReason })
-      .then((result) => {
-        this.appEvents.trigger("composer:saved");
-
-        if (result.responseJson.action === "enqueued") {
-          this.send("postWasEnqueued", result.responseJson);
-          if (result.responseJson.pending_post) {
-            let pendingPosts = this.get("topicController.model.pending_posts");
-            if (pendingPosts) {
-              pendingPosts.pushObject(result.responseJson.pending_post);
-            }
-          }
-
-          return this.destroyDraft().then(() => {
-            this.close();
-            this.appEvents.trigger("post-stream:refresh");
-            return result;
-          });
-        }
-
-        if (this.get("model.editingPost")) {
-          this.appEvents.trigger("composer:edited-post");
-          this.appEvents.trigger("post-stream:refresh", {
-            id: parseInt(result.responseJson.id, 10),
-          });
-          if (result.responseJson.post.post_number === 1) {
-            this.appEvents.trigger("header:update-topic", composer.topic);
-          }
-        } else {
-          this.appEvents.trigger("post-stream:refresh");
-        }
-
-        if (result.responseJson.action === "create_post") {
-          this.appEvents.trigger("composer:created-post");
-          this.appEvents.trigger(
-            "post:highlight",
-            result.payload.post_number,
-            options
-          );
-        }
-
-        if (this.get("model.draftKey") === Composer.NEW_TOPIC_KEY) {
-          this.currentUser.set("has_topic_draft", false);
-        }
-
-        if (result.responseJson.route_to) {
-          // TODO: await this:
-          this.destroyDraft();
-          if (result.responseJson.message) {
-            return this.dialog.alert({
-              message: result.responseJson.message,
-              didConfirm: () => {
-                DiscourseURL.routeTo(result.responseJson.route_to);
-              },
-            });
-          }
-          return DiscourseURL.routeTo(result.responseJson.route_to);
-        }
-
-        this.close();
-
-        this.currentUser.set("any_posts", true);
-
-        const post = result.target;
-
-        if (post && !staged && options.jump !== false) {
-          DiscourseURL.routeTo(post.url, {
-            keepFilter: true,
-            skipIfOnScreen: true,
-          });
-        }
-      })
-      .catch((error) => {
-        composer.set("disableDrafts", false);
-        if (error) {
-          this.appEvents.one("composer:will-open", () => {
-            if (
-              _composerSaveErrorCallbacks.length === 0 ||
-              !_composerSaveErrorCallbacks
-                .map((c) => {
-                  return c.call(this, error);
-                })
-                .some((i) => {
-                  return i;
-                })
-            ) {
-              this.dialog.alert(error);
-            }
-          });
-        }
-      });
-
-    if (
-      this.router.currentRouteName.split(".")[0] === "topic" &&
-      composer.get("topic.id") === this.get("topicModel.id")
-    ) {
-      staged = composer.get("stagedPost");
-    }
-
-    this.appEvents.trigger("post-stream:posted", staged);
-
-    this.messageBus.pause();
-    promise.finally(() => this.messageBus.resume());
-
-    return promise;
-  },
-
-  // Notify the composer messages controller that a reply has been typed. Some
-  // messages only appear after typing.
-  checkReplyLength() {
-    if (!isEmpty("model.reply")) {
-      this.appEvents.trigger("composer:typed-reply");
-    }
-  },
-
-  /**
-    Open the composer view
-
-    @method open
-    @param {Object} opts Options for creating a post
-      @param {String} opts.action The action we're performing: edit, reply, createTopic, createSharedDraft, privateMessage
-      @param {String} opts.draftKey
-      @param {Post} [opts.post] The post we're replying to
-      @param {Topic} [opts.topic] The topic we're replying to
-      @param {String} [opts.quote] If we're opening a reply from a quote, the quote we're making
-      @param {Boolean} [opts.ignoreIfChanged]
-      @param {Boolean} [opts.disableScopedCategory]
-      @param {Number} [opts.categoryId] Sets `scopedCategoryId` and `categoryId` on the Composer model
-      @param {Number} [opts.prioritizedCategoryId]
-      @param {String} [opts.draftSequence]
-      @param {Boolean} [opts.skipDraftCheck]
-      @param {Boolean} [opts.skipJumpOnSave] Option to skip navigating to the post when saved in this composer session
-  **/
-  async open(opts = {}) {
-    if (!opts.draftKey) {
-      throw new Error("composer opened without a proper draft key");
-    }
-
-    let composerModel = this.model;
-
-    if (
-      opts.ignoreIfChanged &&
-      composerModel &&
-      composerModel.composeState !== Composer.CLOSED
-    ) {
-      return;
-    }
-
-    this.setProperties({
-      showEditReason: false,
-      editReason: null,
-      scopedCategoryId: null,
-      prioritizedCategoryId: null,
-      skipAutoSave: true,
-    });
-
-    this.set("skipJumpOnSave", !!opts.skipJumpOnSave);
-
-    // Scope the categories drop down to the category we opened the composer with.
-    if (opts.categoryId && !opts.disableScopedCategory) {
-      const category = this.site.categories.findBy("id", opts.categoryId);
-      if (category) {
-        this.set("scopedCategoryId", opts.categoryId);
-      }
-    }
-
-    if (opts.prioritizedCategoryId) {
-      const category = this.site.categories.findBy(
-        "id",
-        opts.prioritizedCategoryId
-      );
-      if (category) {
-        this.set("prioritizedCategoryId", opts.prioritizedCategoryId);
-      }
-    }
-
-    // If we want a different draft than the current composer, close it and clear our model.
-    if (
-      composerModel &&
-      opts.draftKey !== composerModel.draftKey &&
-      composerModel.composeState === Composer.DRAFT
-    ) {
-      this.close();
-      composerModel = null;
-    }
-
-    try {
-      if (composerModel?.replyDirty) {
-        // If we're already open, we don't have to do anything
-        if (
-          composerModel.composeState === Composer.OPEN &&
-          composerModel.draftKey === opts.draftKey &&
-          !opts.action
-        ) {
-          return;
-        }
-
-        // If it's the same draft, just open it up again.
-        if (
-          composerModel.composeState === Composer.DRAFT &&
-          composerModel.draftKey === opts.draftKey
-        ) {
-          composerModel.set("composeState", Composer.OPEN);
-          if (!opts.action) {
-            return;
-          }
-        }
-
-        await this.cancelComposer();
-        await this.open(opts);
-        return;
-      }
-
-      if (composerModel && composerModel.action !== opts.action) {
-        composerModel.setProperties({ unlistTopic: false, whisper: false });
-      }
-
-      // we need a draft sequence for the composer to work
-      if (opts.draftSequence === undefined) {
-        let data = await Draft.get(opts.draftKey);
-
-        if (opts.skipDraftCheck) {
-          data.draft = undefined;
-        } else {
-          data = await this.confirmDraftAbandon(data);
-        }
-
-        opts.draft ||= data.draft;
-        opts.draftSequence = data.draft_sequence;
-
-        await this._setModel(composerModel, opts);
-        return;
-      }
-
-      // otherwise, do the draft check async
-      if (!opts.draft && !opts.skipDraftCheck) {
-        let data = await Draft.get(opts.draftKey);
-        data = await this.confirmDraftAbandon(data);
-
-        if (data.draft) {
-          opts.draft = data.draft;
-          opts.draftSequence = data.draft_sequence;
-          await this.open(opts);
-        }
-      }
-
-      await this._setModel(composerModel, opts);
-    } finally {
-      this.skipAutoSave = false;
-    }
-  },
-
-  // Given a potential instance and options, set the model for this composer.
-  async _setModel(optionalComposerModel, opts) {
-    this.set("linkLookup", null);
-
-    let composerModel;
-    if (opts.draft) {
-      composerModel = await loadDraft(this.store, opts);
-
-      if (!composerModel) {
-        throw new Error("draft was not found");
-      }
-    } else {
-      const model =
-        optionalComposerModel || this.store.createRecord("composer");
-
-      await model.open(opts);
-      composerModel = model;
-    }
-
-    this.set("model", composerModel);
-
-    composerModel.setProperties({
-      composeState: Composer.OPEN,
-      isWarning: false,
-      hasTargetGroups: opts.hasGroups,
-    });
-
-    if (!this.model.targetRecipients) {
-      if (opts.usernames) {
-        deprecated("`usernames` is deprecated, use `recipients` instead.", {
-          id: "discourse.composer.usernames",
-        });
-        this.model.set("targetRecipients", opts.usernames);
-      } else if (opts.recipients) {
-        this.model.set("targetRecipients", opts.recipients);
-      }
-    }
-
-    if (
-      opts.topicTitle &&
-      opts.topicTitle.length <= this.siteSettings.max_topic_title_length
-    ) {
-      this.model.set("title", opts.topicTitle);
-    }
-
-    if (opts.topicCategoryId) {
-      this.model.set("categoryId", opts.topicCategoryId);
-    }
-
-    if (opts.topicTags && this.site.can_tag_topics) {
-      let tags = escapeExpression(opts.topicTags)
-        .split(",")
-        .slice(0, this.siteSettings.max_tags_per_topic);
-
-      tags.forEach(
-        (tag, index, array) =>
-          (array[index] = tag.substring(0, this.siteSettings.max_tag_length))
-      );
-
-      this.model.set("tags", tags);
-    }
-
-    if (opts.topicBody) {
-      this.model.set("reply", opts.topicBody);
-    }
-
-    const defaultComposerHeight = this._getDefaultComposerHeight();
-
-    this.set("model.composerHeight", defaultComposerHeight);
-    document.documentElement.style.setProperty(
-      "--composer-height",
-      defaultComposerHeight
-    );
-  },
-
-  _getDefaultComposerHeight() {
-    if (this.keyValueStore.getItem("composerHeight")) {
-      return this.keyValueStore.getItem("composerHeight");
-    }
-
-    // The two custom properties below can be overriden by themes/plugins to set different default composer heights.
-    if (this.model.action === "reply") {
-      return "var(--reply-composer-height, 300px)";
-    } else {
-      return "var(--new-topic-composer-height, 400px)";
-    }
-  },
-
-  async destroyDraft(draftSequence = null) {
-    const key = this.get("model.draftKey");
-    if (!key) {
-      return;
-    }
-
-    if (key === Composer.NEW_TOPIC_KEY) {
-      this.currentUser.set("has_topic_draft", false);
-    }
-
-    if (this._saveDraftPromise) {
-      await this._saveDraftPromise;
-      return await this.destroyDraft();
-    }
-
-    const sequence = draftSequence || this.get("model.draftSequence");
-    await Draft.clear(key, sequence);
-    this.appEvents.trigger("draft:destroyed", key);
-  },
-
-  confirmDraftAbandon(data) {
-    if (!data.draft) {
-      return data;
-    }
-
-    // do not show abandon dialog if old draft is clean
-    const draft = JSON.parse(data.draft);
-    if (draft.reply === draft.originalText) {
-      data.draft = null;
-      return data;
-    }
-
-    if (!_checkDraftPopup) {
-      data.draft = null;
-      return data;
-    }
-
-    return new Promise((resolve) => {
-      this.dialog.alert({
-        message: I18n.t("drafts.abandon.confirm"),
-        buttons: [
-          {
-            label: I18n.t("drafts.abandon.yes_value"),
-            class: "btn-danger",
-            icon: "far-trash-alt",
-            action: () => {
-              this.destroyDraft(data.draft_sequence).finally(() => {
-                data.draft = null;
-                resolve(data);
-              });
-            },
-          },
-          {
-            label: I18n.t("drafts.abandon.no_value"),
-            class: "btn-resume-editing",
-            action: () => resolve(data),
-          },
-        ],
-      });
-    });
-  },
-
-  cancelComposer() {
-    this.skipAutoSave = true;
-
-    if (this._saveDraftDebounce) {
-      cancel(this._saveDraftDebounce);
-    }
-
-    return new Promise((resolve) => {
-      if (this.get("model.hasMetaData") || this.get("model.replyDirty")) {
-        const modal = showModal("discard-draft", {
-          model: this.model,
-          modalClass: "discard-draft-modal",
-        });
-        modal.setProperties({
-          onDestroyDraft: () => {
-            return this.destroyDraft()
-              .then(() => {
-                this.model.clearState();
-                this.close();
-              })
-              .finally(() => {
-                this.appEvents.trigger("composer:cancelled");
-                resolve();
-              });
-          },
-          onSaveDraft: () => {
-            this._saveDraft();
-            this.model.clearState();
-            this.close();
-            this.appEvents.trigger("composer:cancelled");
-            return resolve();
-          },
-          // needed to resume saving drafts if composer stays open
-          onDismissModal: () => resolve(),
-        });
-      } else {
-        // it is possible there is some sort of crazy draft with no body ... just give up on it
-        this.destroyDraft()
-          .then(() => {
-            this.model.clearState();
-            this.close();
-          })
-          .finally(() => {
-            this.appEvents.trigger("composer:cancelled");
-            resolve();
-          });
-      }
-    }).finally(() => {
-      this.skipAutoSave = false;
-    });
-  },
-
-  shrink() {
-    if (
-      this.get("model.replyDirty") ||
-      (this.get("model.canEditTitle") && this.get("model.titleDirty"))
-    ) {
-      this.collapse();
-    } else {
-      this.close();
-    }
-  },
-
-  _saveDraft() {
-    if (!this.model) {
-      return;
-    }
-
-    if (this.model.draftSaving) {
-      this._saveDraftDebounce = discourseDebounce(this, this._saveDraft, 2000);
-    } else {
-      this._saveDraftPromise = this.model
-        .saveDraft(this.currentUser)
-        .finally(() => {
-          this._lastDraftSaved = Date.now();
-          this._saveDraftPromise = null;
-        });
-    }
-  },
-
-  @observes("model.reply", "model.title")
-  _shouldSaveDraft() {
-    if (
-      this.model &&
-      !this.model.loading &&
-      !this.skipAutoSave &&
-      !this.model.disableDrafts
-    ) {
-      if (!this._lastDraftSaved) {
-        // pretend so we get a save unconditionally in 15 secs
-        this._lastDraftSaved = Date.now();
-      }
-      if (Date.now() - this._lastDraftSaved > 15000) {
-        this._saveDraft();
-      } else {
-        this._saveDraftDebounce = discourseDebounce(
-          this,
-          this._saveDraft,
-          2000
-        );
-      }
-    }
-  },
-
-  @discourseComputed("model.categoryId", "lastValidatedAt")
-  categoryValidation(categoryId, lastValidatedAt) {
-    if (!this.siteSettings.allow_uncategorized_topics && !categoryId) {
-      return EmberObject.create({
-        failed: true,
-        reason: I18n.t("composer.error.category_missing"),
-        lastShownAt: lastValidatedAt,
-      });
-    }
-  },
-
-  @discourseComputed("model.category", "model.tags", "lastValidatedAt")
-  tagValidation(category, tags, lastValidatedAt) {
-    const tagsArray = tags || [];
-    if (this.site.can_tag_topics && !this.currentUser.staff && category) {
-      // category.minimumRequiredTags incorporates both minimum_required_tags, and required_tag_groups
-      if (category.minimumRequiredTags > tagsArray.length) {
-        return EmberObject.create({
-          failed: true,
-          reason: I18n.t("composer.error.tags_missing", {
-            count: category.minimumRequiredTags,
-          }),
-          lastShownAt: lastValidatedAt,
-        });
-      }
-    }
-  },
-
-  collapse() {
-    this._saveDraft();
-    this.set("model.composeState", Composer.DRAFT);
-    document.documentElement.style.setProperty("--composer-height", "40px");
-  },
-
-  toggleFullscreen() {
-    this._saveDraft();
-
-    const composer = this.model;
-
-    if (composer?.viewFullscreen) {
-      composer?.set("composeState", Composer.OPEN);
-    } else {
-      composer?.set("composeState", Composer.FULLSCREEN);
-      composer?.set("showFullScreenExitPrompt", true);
-    }
-  },
-
-  @discourseComputed("model.viewFullscreen", "model.showFullScreenExitPrompt")
-  showFullScreenPrompt(isFullscreen, showExitPrompt) {
-    return isFullscreen && showExitPrompt && !this.capabilities.touch;
-  },
-
-  close() {
-    // the 'fullscreen-composer' class is added to remove scrollbars from the
-    // document while in fullscreen mode. If the composer is closed for any reason
-    // this class should be removed
-
-    const elem = document.querySelector("html");
-    elem.classList.remove("fullscreen-composer");
-    elem.classList.remove("composer-open");
-
-    document.activeElement?.blur();
-    document.documentElement.style.removeProperty("--composer-height");
-    this.setProperties({ model: null, lastValidatedAt: null });
-  },
-
-  closeAutocomplete() {
-    $(".d-editor-input").autocomplete({ cancel: true });
-  },
-
-  @discourseComputed("model.action")
-  canEdit(modelAction) {
-    return modelAction === "edit" && this.currentUser.can_edit;
-  },
-
-  @discourseComputed("model.composeState")
-  visible(state) {
-    return state && state !== "closed";
-  },
-
-  clearLastValidatedAt() {
-    this.set("lastValidatedAt", null);
-  },
-});
+import Composer, {
+  addComposerSaveErrorCallback,
+  addPopupMenuOptionsCallback,
+  clearComposerSaveErrorCallback,
+  clearPopupMenuOptionsCallback,
+  toggleCheckDraftPopup,
+} from "discourse/services/composer";
+
+// TODO add deprecation
+
+export default Composer;
+
+export {
+  addComposerSaveErrorCallback,
+  addPopupMenuOptionsCallback,
+  clearComposerSaveErrorCallback,
+  clearPopupMenuOptionsCallback,
+  toggleCheckDraftPopup,
+};
diff --git a/app/assets/javascripts/discourse/app/controllers/create-account.js b/app/assets/javascripts/discourse/app/controllers/create-account.js
index b364d8d2ebd..0d75cc8495c 100644
--- a/app/assets/javascripts/discourse/app/controllers/create-account.js
+++ b/app/assets/javascripts/discourse/app/controllers/create-account.js
@@ -18,7 +18,6 @@ import { ajax } from "discourse/lib/ajax";
 import { emailValid } from "discourse/lib/utilities";
 import { findAll } from "discourse/models/login-method";
 import discourseDebounce from "discourse-common/lib/debounce";
-import getURL from "discourse-common/lib/get-url";
 import { isEmpty } from "@ember/utils";
 import { notEmpty } from "@ember/object/computed";
 import { setting } from "discourse/lib/computed";
@@ -129,11 +128,12 @@ export default Controller.extend(
 
     @discourseComputed
     disclaimerHtml() {
-      return I18n.t("create_account.disclaimer", {
-        tos_link: this.siteSettings.tos_url || getURL("/tos"),
-        privacy_link:
-          this.siteSettings.privacy_policy_url || getURL("/privacy"),
-      });
+      if (this.site.tos_url && this.site.privacy_policy_url) {
+        return I18n.t("create_account.disclaimer", {
+          tos_link: this.site.tos_url,
+          privacy_link: this.site.privacy_policy_url,
+        });
+      }
     },
 
     // Check the email address
diff --git a/app/assets/javascripts/discourse/app/controllers/create-invite-bulk.js b/app/assets/javascripts/discourse/app/controllers/create-invite-bulk.js
deleted file mode 100644
index 0ebeb099924..00000000000
--- a/app/assets/javascripts/discourse/app/controllers/create-invite-bulk.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import Controller from "@ember/controller";
-import { action } from "@ember/object";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-
-export default Controller.extend(ModalFunctionality, {
-  data: null,
-
-  onShow() {
-    this.set("data", null);
-  },
-
-  onClose() {
-    if (this.data) {
-      this.data.abort();
-      this.set("data", null);
-    }
-  },
-
-  @action
-  submit(data) {
-    this.set("data", data);
-    data.submit();
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/controllers/create-invite.js b/app/assets/javascripts/discourse/app/controllers/create-invite.js
index 3f8dbf832ed..3dcafa4899c 100644
--- a/app/assets/javascripts/discourse/app/controllers/create-invite.js
+++ b/app/assets/javascripts/discourse/app/controllers/create-invite.js
@@ -34,12 +34,12 @@ export default Controller.extend(
 
     @discourseComputed("buffered.emailOrDomain")
     isEmail(emailOrDomain) {
-      return emailValid(emailOrDomain);
+      return emailValid(emailOrDomain?.trim());
     },
 
     @discourseComputed("buffered.emailOrDomain")
     isDomain(emailOrDomain) {
-      return hostnameValid(emailOrDomain);
+      return hostnameValid(emailOrDomain?.trim());
     },
 
     isLink: not("isEmail"),
@@ -83,9 +83,9 @@ export default Controller.extend(
 
       if (data.emailOrDomain) {
         if (emailValid(data.emailOrDomain)) {
-          data.email = data.emailOrDomain;
+          data.email = data.emailOrDomain?.trim();
         } else if (hostnameValid(data.emailOrDomain)) {
-          data.domain = data.emailOrDomain;
+          data.domain = data.emailOrDomain?.trim();
         }
         delete data.emailOrDomain;
       }
@@ -123,10 +123,6 @@ export default Controller.extend(
       return this.invite
         .save(data)
         .then(() => {
-          if (!this.invite.id) {
-            return;
-          }
-
           this.rollbackBuffer();
 
           if (
diff --git a/app/assets/javascripts/discourse/app/controllers/delete-topic-confirm.js b/app/assets/javascripts/discourse/app/controllers/delete-topic-confirm.js
deleted file mode 100644
index eb5496e89a7..00000000000
--- a/app/assets/javascripts/discourse/app/controllers/delete-topic-confirm.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import Controller, { inject as controller } from "@ember/controller";
-import I18n from "I18n";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import { action } from "@ember/object";
-import discourseComputed from "discourse-common/utils/decorators";
-
-// Modal that displays confirmation text when user deletes a topic
-// The modal will display only if the topic exceeds a certain amount of views
-export default Controller.extend(ModalFunctionality, {
-  topicController: controller("topic"),
-  deletingTopic: false,
-
-  @discourseComputed("deletingTopic")
-  buttonTitle(deletingTopic) {
-    return deletingTopic
-      ? I18n.t("deleting")
-      : I18n.t("post.controls.delete_topic_confirm_modal_yes");
-  },
-
-  onShow() {
-    this.set("deletingTopic", false);
-  },
-
-  @action
-  deleteTopic() {
-    this.set("deletingTopic", true);
-
-    this.topicController.model
-      .destroy(this.currentUser)
-      .then(() => this.send("closeModal"))
-      .catch(() => {
-        this.flash(I18n.t("post.controls.delete_topic_error"), "error");
-        this.set("deletingTopic", false);
-      });
-
-    return false;
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/controllers/discard-draft.js b/app/assets/javascripts/discourse/app/controllers/discard-draft.js
deleted file mode 100644
index 75bf5a53129..00000000000
--- a/app/assets/javascripts/discourse/app/controllers/discard-draft.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import Controller from "@ember/controller";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-
-export default Controller.extend(ModalFunctionality, {
-  actions: {
-    async destroyDraft() {
-      await this.onDestroyDraft();
-      this.send("closeModal");
-    },
-
-    async saveDraftAndClose() {
-      await this.onSaveDraft();
-      this.send("closeModal");
-    },
-
-    async dismissModal() {
-      await this.onDismissModal();
-      this.send("closeModal");
-    },
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/controllers/discovery-filter.js b/app/assets/javascripts/discourse/app/controllers/discovery-filter.js
new file mode 100644
index 00000000000..030efc8076d
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/controllers/discovery-filter.js
@@ -0,0 +1,14 @@
+import Controller from "@ember/controller";
+import { action } from "@ember/object";
+import { tracked } from "@glimmer/tracking";
+
+export default class extends Controller {
+  @tracked q = "";
+
+  queryParams = ["q"];
+
+  @action
+  updateTopicsListQueryParams(queryString) {
+    this.q = queryString;
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/controllers/discovery.js b/app/assets/javascripts/discourse/app/controllers/discovery.js
index 9a8d58b310d..f2cad393286 100644
--- a/app/assets/javascripts/discourse/app/controllers/discovery.js
+++ b/app/assets/javascripts/discourse/app/controllers/discovery.js
@@ -2,7 +2,6 @@ import Controller, { inject as controller } from "@ember/controller";
 import { alias, equal, not } from "@ember/object/computed";
 import { action } from "@ember/object";
 import Category from "discourse/models/category";
-import discourseComputed from "discourse-common/utils/decorators";
 import DiscourseURL from "discourse/lib/url";
 import { inject as service } from "@ember/service";
 
@@ -22,24 +21,6 @@ export default Controller.extend({
 
   loadedAllItems: not("discoveryTopics.model.canLoadMore"),
 
-  @discourseComputed(
-    "router.currentRouteName",
-    "router.currentRoute.queryParams.f",
-    "site.show_welcome_topic_banner"
-  )
-  showEditWelcomeTopicBanner(
-    currentRouteName,
-    hasParams,
-    showWelcomeTopicBanner
-  ) {
-    return (
-      this.currentUser?.staff &&
-      currentRouteName === "discovery.latest" &&
-      showWelcomeTopicBanner &&
-      !hasParams
-    );
-  },
-
   @action
   loadingBegan() {
     this.set("loading", true);
@@ -79,6 +60,13 @@ export default Controller.extend({
     return `${url}?${urlSearchParams.toString()}`;
   },
 
+  get showLoadingSpinner() {
+    return (
+      this.get("loading") &&
+      this.siteSettings.page_loading_indicator === "spinner"
+    );
+  },
+
   actions: {
     changePeriod(p) {
       DiscourseURL.routeTo(this.showMoreUrl(p));
diff --git a/app/assets/javascripts/discourse/app/controllers/discovery/topics.js b/app/assets/javascripts/discourse/app/controllers/discovery/topics.js
index 3b95a44dee7..ba3791eeeb2 100644
--- a/app/assets/javascripts/discourse/app/controllers/discovery/topics.js
+++ b/app/assets/javascripts/discourse/app/controllers/discovery/topics.js
@@ -1,9 +1,9 @@
 import { alias, empty, equal, gt, not, readOnly } from "@ember/object/computed";
 import BulkTopicSelection from "discourse/mixins/bulk-topic-selection";
+import DismissTopics from "discourse/mixins/dismiss-topics";
 import DiscoveryController from "discourse/controllers/discovery";
 import I18n from "I18n";
 import Topic from "discourse/models/topic";
-import TopicList from "discourse/models/topic-list";
 import { inject as controller } from "@ember/controller";
 import deprecated from "discourse-common/lib/deprecated";
 import discourseComputed from "discourse-common/utils/decorators";
@@ -56,6 +56,32 @@ const controllerOpts = {
     return this._isFilterPage(filter, "new") && topicsLength > 0;
   },
 
+  callResetNew(dismissPosts = false, dismissTopics = false, untrack = false) {
+    const tracked =
+      (this.router.currentRoute.queryParams["f"] ||
+        this.router.currentRoute.queryParams["filter"]) === "tracked";
+
+    let topicIds = this.selected
+      ? this.selected.map((topic) => topic.id)
+      : null;
+
+    Topic.resetNew(this.category, !this.noSubcategories, {
+      tracked,
+      topicIds,
+      dismissPosts,
+      dismissTopics,
+      untrack,
+    }).then((result) => {
+      if (result.topic_ids) {
+        this.topicTrackingState.removeTopics(result.topic_ids);
+      }
+      this.send(
+        "refresh",
+        tracked ? { skipResettingParams: ["filter", "f"] } : {}
+      );
+    });
+  },
+
   // Show newly inserted topics
   @action
   showInserted(event) {
@@ -79,61 +105,11 @@ const controllerOpts = {
       );
       return routeAction("changeSort", this.router._router, ...arguments)();
     },
+  },
 
-    refresh(options = { skipResettingParams: [] }) {
-      const filter = this.get("model.filter");
-      this.send("resetParams", options.skipResettingParams);
-
-      // Don't refresh if we're still loading
-      if (this.discovery.loading) {
-        return;
-      }
-
-      // If we `send('loading')` here, due to returning true it bubbles up to the
-      // router and ember throws an error due to missing `handlerInfos`.
-      // Lesson learned: Don't call `loading` yourself.
-      this.discovery.loadingBegan();
-
-      this.topicTrackingState.resetTracking();
-
-      this.store.findFiltered("topicList", { filter }).then((list) => {
-        TopicList.hideUniformCategory(list, this.category);
-
-        // If query params are present in the current route, we need still need to sync topic
-        // tracking with the topicList without any query params. Then we set the topic
-        // list to the list filtered with query params in the afterRefresh.
-        const params = this.router.currentRoute.queryParams;
-        if (Object.keys(params).length) {
-          this.store
-            .findFiltered("topicList", { filter, params })
-            .then((listWithParams) => {
-              this.afterRefresh(filter, list, listWithParams);
-            });
-        } else {
-          this.afterRefresh(filter, list);
-        }
-      });
-    },
-
-    resetNew() {
-      const tracked =
-        (this.router.currentRoute.queryParams["f"] ||
-          this.router.currentRoute.queryParams["filter"]) === "tracked";
-
-      let topicIds = this.selected
-        ? this.selected.map((topic) => topic.id)
-        : null;
-
-      Topic.resetNew(this.category, !this.noSubcategories, {
-        tracked,
-        topicIds,
-      }).then(() =>
-        this.send(
-          "refresh",
-          tracked ? { skipResettingParams: ["filter", "f"] } : {}
-        )
-      );
-    },
+  @action
+  refresh() {
+    this.send("triggerRefresh");
   },
 
   afterRefresh(filter, list, listModel = list) {
@@ -150,7 +126,6 @@ const controllerOpts = {
   hasTopics: gt("model.topics.length", 0),
   allLoaded: empty("model.more_topics_url"),
   latest: endWith("model.filter", "latest"),
-  new: endWith("model.filter", "new"),
   top: endWith("model.filter", "top"),
   yearly: equal("period", "yearly"),
   quarterly: equal("period", "quarterly"),
@@ -158,6 +133,11 @@ const controllerOpts = {
   weekly: equal("period", "weekly"),
   daily: equal("period", "daily"),
 
+  @discourseComputed("model.filter")
+  new(filter) {
+    return filter?.endsWith("new") && !this.currentUser?.new_new_view_enabled;
+  },
+
   @discourseComputed("allLoaded", "model.topics.length")
   footerMessage(allLoaded, topicsLength) {
     if (!allLoaded) {
@@ -191,17 +171,26 @@ const controllerOpts = {
 
     const segments = (this.get("model.filter") || "").split("/");
 
-    const tab = segments[segments.length - 1];
+    let tab = segments[segments.length - 1];
+
     if (tab !== "new" && tab !== "unread") {
       return;
     }
 
+    if (tab === "new" && this.currentUser.new_new_view_enabled) {
+      tab = "new_new";
+    }
+
     return I18n.t("topics.none.educate." + tab, {
       userPrefsUrl: userPath(
-        `${this.currentUser.get("username_lower")}/preferences/notifications`
+        `${this.currentUser.get("username_lower")}/preferences/tracking`
       ),
     });
   },
 };
 
-export default DiscoveryController.extend(controllerOpts, BulkTopicSelection);
+export default DiscoveryController.extend(
+  controllerOpts,
+  BulkTopicSelection,
+  DismissTopics
+);
diff --git a/app/assets/javascripts/discourse/app/controllers/dismiss-notification-confirmation.js b/app/assets/javascripts/discourse/app/controllers/dismiss-notification-confirmation.js
deleted file mode 100644
index ff13e85c861..00000000000
--- a/app/assets/javascripts/discourse/app/controllers/dismiss-notification-confirmation.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import Controller from "@ember/controller";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-
-export default Controller.extend(ModalFunctionality, {
-  actions: {
-    dismiss() {
-      this.send("closeModal");
-      this.dismissNotifications();
-    },
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/controllers/do-not-disturb.js b/app/assets/javascripts/discourse/app/controllers/do-not-disturb.js
deleted file mode 100644
index cafa0483ef3..00000000000
--- a/app/assets/javascripts/discourse/app/controllers/do-not-disturb.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import Controller from "@ember/controller";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import { action } from "@ember/object";
-import { extractError } from "discourse/lib/ajax-error";
-
-export default Controller.extend(ModalFunctionality, {
-  duration: null,
-
-  @action
-  setDuration(duration) {
-    this.set("duration", duration);
-    this.save();
-  },
-
-  save() {
-    this.currentUser
-      .enterDoNotDisturbFor(this.duration)
-      .then(() => {
-        this.send("closeModal");
-      })
-      .catch((e) => {
-        this.flash(extractError(e), "error");
-      });
-  },
-
-  @action
-  navigateToNotificationSchedule() {
-    this.transitionToRoute("preferences.notifications", this.currentUser);
-    this.send("closeModal");
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/controllers/edit-category-tabs.js b/app/assets/javascripts/discourse/app/controllers/edit-category-tabs.js
index 154fd5e94e6..0735ecbff95 100644
--- a/app/assets/javascripts/discourse/app/controllers/edit-category-tabs.js
+++ b/app/assets/javascripts/discourse/app/controllers/edit-category-tabs.js
@@ -6,12 +6,15 @@ import DiscourseURL from "discourse/lib/url";
 import I18n from "I18n";
 import { NotificationLevels } from "discourse/lib/notification-levels";
 import PermissionType from "discourse/models/permission-type";
-import { extractError } from "discourse/lib/ajax-error";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 import { underscore } from "@ember/string";
 import { inject as service } from "@ember/service";
 
 export default Controller.extend({
   dialog: service(),
+  site: service(),
+  router: service(),
+
   selectedTab: "general",
   saving: false,
   deleting: false,
@@ -109,11 +112,11 @@ export default Controller.extend({
               notification_level: NotificationLevels.REGULAR,
             });
             this.site.updateCategory(model);
-            this.transitionToRoute("editCategory", Category.slugFor(model));
+            this.router.transitionTo("editCategory", Category.slugFor(model));
           }
         })
         .catch((error) => {
-          this.dialog.alert(extractError(error));
+          popupAjaxError(error);
           this.set("saving", false);
         });
     },
@@ -126,7 +129,7 @@ export default Controller.extend({
           this.model
             .destroy()
             .then(() => {
-              this.transitionToRoute("discovery.categories");
+              this.router.transitionTo("discovery.categories");
             })
             .catch(() => {
               this.displayErrors([I18n.t("category.delete_error")]);
diff --git a/app/assets/javascripts/discourse/app/controllers/edit-user-directory-columns.js b/app/assets/javascripts/discourse/app/controllers/edit-user-directory-columns.js
index 771d5b9b306..cc0ddf23d10 100644
--- a/app/assets/javascripts/discourse/app/controllers/edit-user-directory-columns.js
+++ b/app/assets/javascripts/discourse/app/controllers/edit-user-directory-columns.js
@@ -2,7 +2,7 @@ import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
 import EmberObject, { action } from "@ember/object";
-import { extractError } from "discourse/lib/ajax-error";
+import { extractError, popupAjaxError } from "discourse/lib/ajax-error";
 import { reload } from "discourse/helpers/page-reloader";
 
 const UP = "up";
@@ -23,7 +23,7 @@ export default Controller.extend(ModalFunctionality, {
             .map((c) => EmberObject.create(c)),
         });
       })
-      .catch(extractError);
+      .catch(popupAjaxError);
   },
 
   @action
@@ -49,12 +49,16 @@ export default Controller.extend(ModalFunctionality, {
   resetToDefault() {
     let resetColumns = this.columns;
     resetColumns
-      .sort((a, b) =>
-        (a.automatic_position || a.user_field.position + 1000) >
-        (b.automatic_position || b.user_field.position + 1000)
-          ? 1
-          : -1
-      )
+      .sort((a, b) => {
+        const a1 = a.automatic_position || (a.user_field?.position || 0) + 1000;
+        const b1 = b.automatic_position || (b.user_field?.position || 0) + 1000;
+
+        if (a1 === b1) {
+          return a.name.localeCompare(b.name);
+        } else {
+          return a1 > b1 ? 1 : -1;
+        }
+      })
       .forEach((column, index) => {
         column.setProperties({
           position: column.automatic_position || index + 1,
diff --git a/app/assets/javascripts/discourse/app/controllers/exception.js b/app/assets/javascripts/discourse/app/controllers/exception.js
index 628f4921f09..8018e44a519 100644
--- a/app/assets/javascripts/discourse/app/controllers/exception.js
+++ b/app/assets/javascripts/discourse/app/controllers/exception.js
@@ -4,28 +4,8 @@ import DiscourseURL from "discourse/lib/url";
 import Controller from "@ember/controller";
 import I18n from "I18n";
 import { schedule } from "@ember/runloop";
-
-const ButtonBackBright = {
-    classes: "btn-primary",
-    action: "back",
-    key: "errors.buttons.back",
-  },
-  ButtonBackDim = {
-    classes: "",
-    action: "back",
-    key: "errors.buttons.back",
-  },
-  ButtonTryAgain = {
-    classes: "btn-primary",
-    action: "tryLoading",
-    key: "errors.buttons.again",
-    icon: "sync",
-  },
-  ButtonLoadPage = {
-    classes: "btn-primary",
-    action: "tryLoading",
-    key: "errors.buttons.fixed",
-  };
+import { action } from "@ember/object";
+import { cached } from "@glimmer/tracking";
 
 // The controller for the nice error page
 export default Controller.extend({
@@ -114,42 +94,69 @@ export default Controller.extend({
     }
   },
 
+  @cached
+  get buttons() {
+    return {
+      ButtonBackBright: {
+        classes: "btn-primary",
+        action: this.back,
+        key: "errors.buttons.back",
+      },
+      ButtonBackDim: {
+        classes: "",
+        action: this.back,
+        key: "errors.buttons.back",
+      },
+      ButtonTryAgain: {
+        classes: "btn-primary",
+        action: this.tryLoading,
+        key: "errors.buttons.again",
+        icon: "sync",
+      },
+      ButtonLoadPage: {
+        classes: "btn-primary",
+        action: this.tryLoading,
+        key: "errors.buttons.fixed",
+      },
+    };
+  },
+
   @discourseComputed("networkFixed", "isNetwork", "lastTransition")
   enabledButtons(networkFixed, isNetwork, lastTransition) {
     if (networkFixed) {
-      return [ButtonLoadPage];
+      return [this.buttons.ButtonLoadPage];
     } else if (isNetwork) {
-      return [ButtonBackDim, ButtonTryAgain];
+      return [this.buttons.ButtonBackDim, this.buttons.ButtonTryAgain];
     } else if (!lastTransition) {
-      return [ButtonBackBright];
+      return [this.buttons.ButtonBackBright];
     } else {
-      return [ButtonBackBright, ButtonTryAgain];
+      return [this.buttons.ButtonBackBright, this.buttons.ButtonTryAgain];
     }
   },
 
-  actions: {
-    back() {
-      // Strip off subfolder
-      const currentURL = DiscourseURL.router.location.getURL();
-      if (this.lastTransition && currentURL !== "/exception") {
-        this.lastTransition.abort();
-        this.setProperties({ lastTransition: null, thrown: null });
-        // Can't use routeTo because it handles navigation to the same page
-        DiscourseURL.handleURL(currentURL);
-      } else {
-        window.history.back();
-      }
-    },
+  @action
+  back() {
+    // Strip off subfolder
+    const currentURL = DiscourseURL.router.location.getURL();
+    if (this.lastTransition && currentURL !== "/exception") {
+      this.lastTransition.abort();
+      this.setProperties({ lastTransition: null, thrown: null });
+      // Can't use routeTo because it handles navigation to the same page
+      DiscourseURL.handleURL(currentURL);
+    } else {
+      window.history.back();
+    }
+  },
 
-    tryLoading() {
-      this.set("loading", true);
+  @action
+  tryLoading() {
+    this.set("loading", true);
 
-      schedule("afterRender", () => {
-        const transition = this.lastTransition;
-        this.setProperties({ lastTransition: null, thrown: null });
-        transition.retry();
-        this.set("loading", false);
-      });
-    },
+    schedule("afterRender", () => {
+      const transition = this.lastTransition;
+      this.setProperties({ lastTransition: null, thrown: null });
+      transition.retry();
+      this.set("loading", false);
+    });
   },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/forgot-password.js b/app/assets/javascripts/discourse/app/controllers/forgot-password.js
index 7733fed4ec0..0d6c67b78b2 100644
--- a/app/assets/javascripts/discourse/app/controllers/forgot-password.js
+++ b/app/assets/javascripts/discourse/app/controllers/forgot-password.js
@@ -5,9 +5,10 @@ import { ajax } from "discourse/lib/ajax";
 import cookie from "discourse/lib/cookie";
 import discourseComputed from "discourse-common/utils/decorators";
 import { escapeExpression } from "discourse/lib/utilities";
-import { extractError } from "discourse/lib/ajax-error";
+import { flashAjaxError } from "discourse/lib/ajax-error";
 import getURL from "discourse-common/lib/get-url";
 import { isEmpty } from "@ember/utils";
+import { htmlSafe } from "@ember/template";
 
 export default Controller.extend(ModalFunctionality, {
   offerHelp: null,
@@ -70,10 +71,12 @@ export default Controller.extend(ModalFunctionality, {
             key += "_not_found";
 
             this.flash(
-              I18n.t(key, {
-                email: accountEmailOrUsername,
-                username: accountEmailOrUsername,
-              }),
+              htmlSafe(
+                I18n.t(key, {
+                  email: accountEmailOrUsername,
+                  username: accountEmailOrUsername,
+                })
+              ),
               "error"
             );
           } else {
@@ -90,9 +93,7 @@ export default Controller.extend(ModalFunctionality, {
             this.set("helpSeen", !data.user_found);
           }
         })
-        .catch((e) => {
-          this.flash(extractError(e), "error");
-        })
+        .catch(flashAjaxError(this))
         .finally(() => {
           this.set("disabled", false);
         });
diff --git a/app/assets/javascripts/discourse/app/controllers/full-page-search.js b/app/assets/javascripts/discourse/app/controllers/full-page-search.js
index 59157ac2646..62188768484 100644
--- a/app/assets/javascripts/discourse/app/controllers/full-page-search.js
+++ b/app/assets/javascripts/discourse/app/controllers/full-page-search.js
@@ -1,5 +1,8 @@
 import Controller, { inject as controller } from "@ember/controller";
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import discourseComputed, {
+  bind,
+  observes,
+} from "discourse-common/utils/decorators";
 import {
   getSearchKey,
   isValidSearchTerm,
@@ -20,8 +23,9 @@ import { scrollTop } from "discourse/mixins/scroll-top";
 import { setTransient } from "discourse/lib/page-tracker";
 import { Promise } from "rsvp";
 import { search as searchCategoryTag } from "discourse/lib/category-tag-search";
-import showModal from "discourse/lib/show-modal";
 import userSearch from "discourse/lib/user-search";
+import { inject as service } from "@ember/service";
+import TopicBulkActions from "discourse/components/modal/topic-bulk-actions";
 
 const SortOrders = [
   { name: I18n.t("search.relevance"), id: 0 },
@@ -37,11 +41,22 @@ export const SEARCH_TYPE_USERS = "users";
 
 const PAGE_LIMIT = 10;
 
+const customSearchTypes = [];
+
+export function registerFullPageSearchType(
+  translationKey,
+  searchTypeId,
+  searchFunc
+) {
+  customSearchTypes.push({ translationKey, searchTypeId, searchFunc });
+}
+
 export default Controller.extend({
   application: controller(),
-  composer: controller(),
-  bulkSelectEnabled: null,
+  composer: service(),
+  modal: service(),
 
+  bulkSelectEnabled: null,
   loading: false,
   queryParams: [
     "q",
@@ -68,7 +83,7 @@ export default Controller.extend({
   init() {
     this._super(...arguments);
 
-    this.set("searchTypes", [
+    const searchTypes = [
       { name: I18n.t("search.type.default"), id: SEARCH_TYPE_DEFAULT },
       {
         name: this.siteSettings.tagging_enabled
@@ -77,7 +92,16 @@ export default Controller.extend({
         id: SEARCH_TYPE_CATS_TAGS,
       },
       { name: I18n.t("search.type.users"), id: SEARCH_TYPE_USERS },
-    ]);
+    ];
+
+    customSearchTypes.forEach((type) => {
+      searchTypes.push({
+        name: I18n.t(type.translationKey),
+        id: type.searchTypeId,
+      });
+    });
+
+    this.set("searchTypes", searchTypes);
   },
 
   @discourseComputed("resultCount")
@@ -274,6 +298,13 @@ export default Controller.extend({
     return searchType === SEARCH_TYPE_DEFAULT;
   },
 
+  @discourseComputed("search_type")
+  customSearchType(searchType) {
+    return customSearchTypes.find(
+      (type) => searchType === type["searchTypeId"]
+    );
+  },
+
   @discourseComputed("bulkSelectEnabled")
   searchInfoClassNames(bulkSelectEnabled) {
     return bulkSelectEnabled
@@ -283,6 +314,7 @@ export default Controller.extend({
 
   searchButtonDisabled: or("searching", "loading"),
 
+  @bind
   _search() {
     if (this.searching) {
       return;
@@ -324,6 +356,12 @@ export default Controller.extend({
 
     const searchKey = getSearchKey(args);
 
+    if (this.customSearchType) {
+      const customSearch = this.customSearchType["searchFunc"];
+      customSearch(this, args, searchKey);
+      return;
+    }
+
     switch (this.search_type) {
       case SEARCH_TYPE_CATS_TAGS:
         const categoryTagSearch = searchCategoryTag(
@@ -463,14 +501,12 @@ export default Controller.extend({
     },
 
     showBulkActions() {
-      const modalController = showModal("topic-bulk-actions", {
+      this.modal.show(TopicBulkActions, {
         model: {
           topics: this.selected,
+          refreshClosure: this._search,
         },
-        title: "topics.bulk.actions",
       });
-
-      modalController.set("refreshClosure", () => this._search());
     },
 
     search(options = {}) {
diff --git a/app/assets/javascripts/discourse/app/controllers/fullscreen-code.js b/app/assets/javascripts/discourse/app/controllers/fullscreen-code.js
deleted file mode 100644
index 81108cb5452..00000000000
--- a/app/assets/javascripts/discourse/app/controllers/fullscreen-code.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import Controller from "@ember/controller";
-import { afterRender } from "discourse-common/utils/decorators";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import highlightSyntax from "discourse/lib/highlight-syntax";
-import CodeblockButtons from "discourse/lib/codeblock-buttons";
-
-export default Controller.extend(ModalFunctionality, {
-  onShow() {
-    this._applyCodeblockButtons();
-  },
-
-  onClose() {
-    this.codeBlockButtons.cleanup();
-  },
-
-  @afterRender
-  _applyCodeblockButtons() {
-    const modalElement = document.querySelector(".modal-body");
-
-    highlightSyntax(modalElement, this.siteSettings, this.session);
-
-    this.codeBlockButtons = new CodeblockButtons({
-      showFullscreen: false,
-      showCopy: true,
-    });
-    this.codeBlockButtons.attachToGeneric(modalElement);
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/controllers/grant-badge.js b/app/assets/javascripts/discourse/app/controllers/grant-badge.js
index 0b09e326616..8c6d8e3afcb 100644
--- a/app/assets/javascripts/discourse/app/controllers/grant-badge.js
+++ b/app/assets/javascripts/discourse/app/controllers/grant-badge.js
@@ -6,7 +6,7 @@ import ModalFunctionality from "discourse/mixins/modal-functionality";
 import UserBadge from "discourse/models/user-badge";
 import { all } from "rsvp";
 import discourseComputed from "discourse-common/utils/decorators";
-import { extractError } from "discourse/lib/ajax-error";
+import { flashAjaxError } from "discourse/lib/ajax-error";
 
 export default Controller.extend(ModalFunctionality, GrantBadgeController, {
   topicController: controller("topic"),
@@ -64,21 +64,16 @@ export default Controller.extend(ModalFunctionality, GrantBadgeController, {
         this.get("post.username"),
         this.badgeReason
       )
-        .then(
-          (newBadge) => {
-            this.set("selectedBadgeId", null);
-            this.flash(
-              I18n.t("badges.successfully_granted", {
-                username: this.get("post.username"),
-                badge: newBadge.get("badge.name"),
-              }),
-              "success"
-            );
-          },
-          (error) => {
-            this.flash(extractError(error), "error");
-          }
-        )
+        .then((newBadge) => {
+          this.set("selectedBadgeId", null);
+          this.flash(
+            I18n.t("badges.successfully_granted", {
+              username: this.get("post.username"),
+              badge: newBadge.get("badge.name"),
+            }),
+            "success"
+          );
+        }, flashAjaxError(this))
         .finally(() => this.set("saving", false));
     },
   },
diff --git a/app/assets/javascripts/discourse/app/controllers/group-add-members.js b/app/assets/javascripts/discourse/app/controllers/group-add-members.js
deleted file mode 100644
index b6bd5e51a4f..00000000000
--- a/app/assets/javascripts/discourse/app/controllers/group-add-members.js
+++ /dev/null
@@ -1,82 +0,0 @@
-import Controller from "@ember/controller";
-import { action } from "@ember/object";
-import { isEmpty } from "@ember/utils";
-import discourseComputed from "discourse-common/utils/decorators";
-import { extractError } from "discourse/lib/ajax-error";
-import { emailValid } from "discourse/lib/utilities";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import I18n from "I18n";
-
-export default Controller.extend(ModalFunctionality, {
-  loading: false,
-
-  usernamesAndEmails: null,
-  setOwner: false,
-  notifyUsers: false,
-
-  onShow() {
-    this.setProperties({
-      loading: false,
-      setOwner: false,
-      notifyUsers: false,
-      usernamesAndEmails: [],
-    });
-  },
-
-  @discourseComputed("model.name", "model.full_name")
-  rawTitle(name, fullName) {
-    return I18n.t("groups.add_members.title", { group_name: fullName || name });
-  },
-
-  @discourseComputed("usernamesAndEmails.[]")
-  usernames(usernamesAndEmails) {
-    return usernamesAndEmails.reject(emailValid).join(",");
-  },
-
-  @discourseComputed("usernamesAndEmails.[]")
-  emails(usernamesAndEmails) {
-    return usernamesAndEmails.filter(emailValid).join(",");
-  },
-
-  @action
-  setUsernamesAndEmails(usernamesAndEmails) {
-    this.set("usernamesAndEmails", usernamesAndEmails);
-
-    if (this.emails) {
-      if (!this.usernames) {
-        this.set("notifyUsers", false);
-      }
-
-      this.set("setOwner", false);
-    }
-  },
-
-  @action
-  addMembers() {
-    if (isEmpty(this.usernamesAndEmails)) {
-      return;
-    }
-
-    this.set("loading", true);
-
-    const promise = this.setOwner
-      ? this.model.addOwners(this.usernames, true, this.notifyUsers)
-      : this.model.addMembers(
-          this.usernames,
-          true,
-          this.notifyUsers,
-          this.emails
-        );
-
-    promise
-      .then(() => {
-        this.transitionToRoute("group.members", this.get("model.name"), {
-          queryParams: this.usernames ? { filter: this.usernames } : {},
-        });
-
-        this.send("closeModal");
-      })
-      .catch((error) => this.flash(extractError(error), "error"))
-      .finally(() => this.set("loading", false));
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/controllers/group-default-notifications.js b/app/assets/javascripts/discourse/app/controllers/group-default-notifications.js
deleted file mode 100644
index 8c3a2648989..00000000000
--- a/app/assets/javascripts/discourse/app/controllers/group-default-notifications.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import Controller from "@ember/controller";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import ModalUpdateExistingUsers from "discourse/mixins/modal-update-existing-users";
-
-export default Controller.extend(ModalFunctionality, ModalUpdateExistingUsers);
diff --git a/app/assets/javascripts/discourse/app/controllers/group-index.js b/app/assets/javascripts/discourse/app/controllers/group-index.js
index fd6826cd958..55dc4fe1f31 100644
--- a/app/assets/javascripts/discourse/app/controllers/group-index.js
+++ b/app/assets/javascripts/discourse/app/controllers/group-index.js
@@ -25,6 +25,10 @@ export default Controller.extend({
   bulkSelection: null,
 
   @observes("filterInput")
+  filterInputChanged() {
+    this._setFilter();
+  },
+
   @debounce(500)
   _setFilter() {
     this.set("filter", this.filterInput);
@@ -134,17 +138,17 @@ export default Controller.extend({
       case "removeMembers":
         return ajax(`/groups/${this.model.id}/members.json`, {
           type: "DELETE",
-          data: { user_ids: selection.map((u) => u.id).join(",") },
+          data: { user_ids: selection.mapBy("id").join(",") },
         }).then(() => {
           this.model.reloadMembers(this.memberParams, true);
           this.set("isBulk", false);
         });
 
       case "makeOwners":
-        return ajax(`/admin/groups/${this.model.id}/owners.json`, {
+        return ajax(`/groups/${this.model.id}/owners.json`, {
           type: "PUT",
           data: {
-            group: { usernames: selection.map((u) => u.username).join(",") },
+            usernames: selection.mapBy("username").join(","),
           },
         }).then(() => {
           selection.forEach((s) => s.set("owner", true));
diff --git a/app/assets/javascripts/discourse/app/controllers/group-requests.js b/app/assets/javascripts/discourse/app/controllers/group-requests.js
index 71f0d0c3271..d8d87662cdd 100644
--- a/app/assets/javascripts/discourse/app/controllers/group-requests.js
+++ b/app/assets/javascripts/discourse/app/controllers/group-requests.js
@@ -19,6 +19,10 @@ export default Controller.extend({
   loading: false,
 
   @observes("filterInput")
+  filterInputChanged() {
+    this._setFilter();
+  },
+
   @debounce(500)
   _setFilter() {
     this.set("filter", this.filterInput);
diff --git a/app/assets/javascripts/discourse/app/controllers/group.js b/app/assets/javascripts/discourse/app/controllers/group.js
index 6ee7e58e1d3..babbd63f1e3 100644
--- a/app/assets/javascripts/discourse/app/controllers/group.js
+++ b/app/assets/javascripts/discourse/app/controllers/group.js
@@ -4,6 +4,7 @@ import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
 import { capitalize } from "@ember/string";
 import { inject as service } from "@ember/service";
+import GroupDeleteDialog from "discourse/components/dialog-messages/group-delete";
 
 const Tab = EmberObject.extend({
   init() {
@@ -19,6 +20,9 @@ const Tab = EmberObject.extend({
 export default Controller.extend({
   application: controller(),
   dialog: service(),
+  currentUser: service(),
+  router: service(),
+
   counts: null,
   showing: "members",
   destroying: null,
@@ -137,22 +141,15 @@ export default Controller.extend({
     this.set("destroying", true);
 
     const model = this.model;
-    const title = I18n.t("admin.groups.delete_confirm");
-    let message = null;
-
-    if (model.has_messages && model.message_count > 0) {
-      message = I18n.t("admin.groups.delete_with_messages_confirm", {
-        count: model.message_count,
-      });
-    }
 
     this.dialog.deleteConfirm({
-      title,
-      message,
+      title: I18n.t("admin.groups.delete_confirm", { group: model.name }),
+      bodyComponent: GroupDeleteDialog,
+      bodyComponentModel: model,
       didConfirm: () => {
         model
           .destroy()
-          .then(() => this.transitionToRoute("groups.index"))
+          .then(() => this.router.transitionTo("groups.index"))
           .catch((error) => {
             // eslint-disable-next-line no-console
             console.error(error);
diff --git a/app/assets/javascripts/discourse/app/controllers/groups-index.js b/app/assets/javascripts/discourse/app/controllers/groups-index.js
index fdc3f909001..c773f9f817a 100644
--- a/app/assets/javascripts/discourse/app/controllers/groups-index.js
+++ b/app/assets/javascripts/discourse/app/controllers/groups-index.js
@@ -4,8 +4,10 @@ import { INPUT_DELAY } from "discourse-common/config/environment";
 import { action } from "@ember/object";
 import discourseComputed from "discourse-common/utils/decorators";
 import discourseDebounce from "discourse-common/lib/debounce";
+import { inject as service } from "@ember/service";
 
 export default Controller.extend({
+  router: service(),
   application: controller(),
   queryParams: ["order", "asc", "filter", "type"],
   order: null,
@@ -55,7 +57,7 @@ export default Controller.extend({
 
   @action
   new() {
-    this.transitionToRoute("groups.new");
+    this.router.transitionTo("groups.new");
   },
 
   _debouncedFilter(filter) {
diff --git a/app/assets/javascripts/discourse/app/controllers/groups-new.js b/app/assets/javascripts/discourse/app/controllers/groups-new.js
index faddce7b720..2e6d6cc3941 100644
--- a/app/assets/javascripts/discourse/app/controllers/groups-new.js
+++ b/app/assets/javascripts/discourse/app/controllers/groups-new.js
@@ -37,6 +37,7 @@ export function popupAutomaticMembershipAlert(group_id, email_domains) {
 
 export default Controller.extend({
   dialog: service(),
+  router: service(),
   saving: null,
 
   @discourseComputed("model.ownerUsernames")
@@ -62,7 +63,7 @@ export default Controller.extend({
     group
       .create()
       .then(() => {
-        this.transitionToRoute("group.members", group.name);
+        this.router.transitionTo("group.members", group.name);
       })
       .catch(popupAjaxError)
       .finally(() => this.set("saving", false));
diff --git a/app/assets/javascripts/discourse/app/controllers/history.js b/app/assets/javascripts/discourse/app/controllers/history.js
deleted file mode 100644
index 00e64f86da3..00000000000
--- a/app/assets/javascripts/discourse/app/controllers/history.js
+++ /dev/null
@@ -1,368 +0,0 @@
-import { action } from "@ember/object";
-import { alias, equal, gt, not, or } from "@ember/object/computed";
-import discourseComputed, {
-  observes,
-  on,
-} from "discourse-common/utils/decorators";
-import { propertyGreaterThan, propertyLessThan } from "discourse/lib/computed";
-import Category from "discourse/models/category";
-import Controller from "@ember/controller";
-import I18n from "I18n";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import Post from "discourse/models/post";
-import { categoryBadgeHTML } from "discourse/helpers/category-link";
-import { iconHTML } from "discourse-common/lib/icon-library";
-import { sanitizeAsync } from "discourse/lib/text";
-import { inject as service } from "@ember/service";
-
-function customTagArray(val) {
-  if (!val) {
-    return [];
-  }
-  if (!Array.isArray(val)) {
-    val = [val];
-  }
-  return val;
-}
-
-// This controller handles displaying of history
-export default Controller.extend(ModalFunctionality, {
-  dialog: service(),
-  loading: true,
-  viewMode: "side_by_side",
-
-  @on("init")
-  _changeViewModeOnMobile() {
-    if (this.site && this.site.mobileView) {
-      this.set("viewMode", "inline");
-    }
-  },
-
-  previousFeaturedLink: alias("model.featured_link_changes.previous"),
-  currentFeaturedLink: alias("model.featured_link_changes.current"),
-
-  @discourseComputed(
-    "model.tags_changes.previous",
-    "model.tags_changes.current"
-  )
-  previousTagChanges(previous, current) {
-    const previousArray = customTagArray(previous);
-    const currentSet = new Set(customTagArray(current));
-
-    return previousArray.map((name) => ({
-      name,
-      deleted: !currentSet.has(name),
-    }));
-  },
-
-  @discourseComputed(
-    "model.tags_changes.previous",
-    "model.tags_changes.current"
-  )
-  currentTagChanges(previous, current) {
-    const previousSet = new Set(customTagArray(previous));
-    const currentArray = customTagArray(current);
-
-    return currentArray.map((name) => ({
-      name,
-      inserted: !previousSet.has(name),
-    }));
-  },
-
-  @discourseComputed("post.version")
-  modalTitleKey(version) {
-    if (version > 100) {
-      return "history_capped_revisions";
-    } else {
-      return "history";
-    }
-  },
-
-  @discourseComputed(
-    "previousVersion",
-    "model.current_version",
-    "model.version_count"
-  )
-  revisionsText(previous, current, total) {
-    return I18n.t(
-      "post.revisions.controls.comparing_previous_to_current_out_of_total",
-      {
-        previous,
-        icon: iconHTML("arrows-alt-h"),
-        current,
-        total,
-      }
-    );
-  },
-
-  @discourseComputed("previousVersion")
-  revertToRevisionText(revision) {
-    return I18n.t("post.revisions.controls.revert", { revision });
-  },
-
-  refresh(postId, postVersion) {
-    this.set("loading", true);
-
-    Post.loadRevision(postId, postVersion).then((result) => {
-      this.setProperties({ loading: false, model: result });
-    });
-  },
-
-  hide(postId, postVersion) {
-    Post.hideRevision(postId, postVersion).then(() =>
-      this.refresh(postId, postVersion)
-    );
-  },
-
-  show(postId, postVersion) {
-    Post.showRevision(postId, postVersion).then(() =>
-      this.refresh(postId, postVersion)
-    );
-  },
-
-  revert(post, postVersion) {
-    post
-      .revertToRevision(postVersion)
-      .then((result) => {
-        this.refresh(post.get("id"), postVersion);
-        if (result.topic) {
-          post.set("topic.slug", result.topic.slug);
-          post.set("topic.title", result.topic.title);
-          post.set("topic.fancy_title", result.topic.fancy_title);
-        }
-        if (result.category_id) {
-          post.set("topic.category", Category.findById(result.category_id));
-        }
-        this.send("closeModal");
-      })
-      .catch(function (e) {
-        if (
-          e.jqXHR.responseJSON &&
-          e.jqXHR.responseJSON.errors &&
-          e.jqXHR.responseJSON.errors[0]
-        ) {
-          this.dialog.alert(e.jqXHR.responseJSON.errors[0]);
-        }
-      });
-  },
-
-  @discourseComputed("model.created_at")
-  createdAtDate(createdAt) {
-    return moment(createdAt).format("LLLL");
-  },
-
-  @discourseComputed("model.current_version")
-  previousVersion(current) {
-    return current - 1;
-  },
-
-  @discourseComputed("model.current_revision", "model.previous_revision")
-  displayGoToPrevious(current, prev) {
-    return prev && current > prev;
-  },
-
-  displayRevisions: gt("model.version_count", 2),
-  displayGoToFirst: propertyGreaterThan(
-    "model.current_revision",
-    "model.first_revision"
-  ),
-  displayGoToNext: propertyLessThan(
-    "model.current_revision",
-    "model.next_revision"
-  ),
-  displayGoToLast: propertyLessThan(
-    "model.current_revision",
-    "model.next_revision"
-  ),
-
-  hideGoToFirst: not("displayGoToFirst"),
-  hideGoToPrevious: not("displayGoToPrevious"),
-  hideGoToNext: not("displayGoToNext"),
-  hideGoToLast: not("displayGoToLast"),
-
-  loadFirstDisabled: or("loading", "hideGoToFirst"),
-  loadPreviousDisabled: or("loading", "hideGoToPrevious"),
-  loadNextDisabled: or("loading", "hideGoToNext"),
-  loadLastDisabled: or("loading", "hideGoToLast"),
-
-  @discourseComputed("model.previous_hidden")
-  displayShow(prevHidden) {
-    return prevHidden && this.currentUser && this.currentUser.get("staff");
-  },
-
-  @discourseComputed("model.previous_hidden")
-  displayHide(prevHidden) {
-    return !prevHidden && this.currentUser && this.currentUser.get("staff");
-  },
-
-  @discourseComputed(
-    "model.last_revision",
-    "model.current_revision",
-    "model.can_edit",
-    "topicController"
-  )
-  displayEdit(lastRevision, currentRevision, canEdit, topicController) {
-    return !!(canEdit && topicController && lastRevision === currentRevision);
-  },
-
-  @discourseComputed("model.wiki")
-  editButtonLabel(wiki) {
-    return `post.revisions.controls.${wiki ? "edit_wiki" : "edit_post"}`;
-  },
-
-  @discourseComputed()
-  displayRevert() {
-    return this.currentUser && this.currentUser.get("staff");
-  },
-
-  isEitherRevisionHidden: or("model.previous_hidden", "model.current_hidden"),
-
-  @discourseComputed(
-    "model.previous_hidden",
-    "model.current_hidden",
-    "displayingInline"
-  )
-  hiddenClasses(prevHidden, currentHidden, displayingInline) {
-    if (displayingInline) {
-      return this.isEitherRevisionHidden ? "hidden-revision-either" : null;
-    } else {
-      let result = [];
-      if (prevHidden) {
-        result.push("hidden-revision-previous");
-      }
-      if (currentHidden) {
-        result.push("hidden-revision-current");
-      }
-      return result.join(" ");
-    }
-  },
-
-  displayingInline: equal("viewMode", "inline"),
-  displayingSideBySide: equal("viewMode", "side_by_side"),
-  displayingSideBySideMarkdown: equal("viewMode", "side_by_side_markdown"),
-
-  @discourseComputed("displayingInline")
-  inlineClass(displayingInline) {
-    return displayingInline ? "active" : "";
-  },
-
-  @discourseComputed("displayingSideBySide")
-  sideBySideClass(displayingSideBySide) {
-    return displayingSideBySide ? "active" : "";
-  },
-
-  @discourseComputed("displayingSideBySideMarkdown")
-  sideBySideMarkdownClass(displayingSideBySideMarkdown) {
-    return displayingSideBySideMarkdown ? "active" : "";
-  },
-
-  @discourseComputed("model.category_id_changes")
-  previousCategory(changes) {
-    if (changes) {
-      let category = Category.findById(changes["previous"]);
-      return categoryBadgeHTML(category, { allowUncategorized: true });
-    }
-  },
-
-  @discourseComputed("model.category_id_changes")
-  currentCategory(changes) {
-    if (changes) {
-      let category = Category.findById(changes["current"]);
-      return categoryBadgeHTML(category, { allowUncategorized: true });
-    }
-  },
-
-  @discourseComputed("model.wiki_changes")
-  wikiDisabled(changes) {
-    return changes && !changes["current"];
-  },
-
-  @discourseComputed("model.post_type_changes")
-  postTypeDisabled(changes) {
-    return (
-      changes &&
-      changes["current"] !== this.site.get("post_types.moderator_action")
-    );
-  },
-
-  @discourseComputed("viewMode", "model.title_changes")
-  titleDiff(viewMode) {
-    if (viewMode === "side_by_side_markdown") {
-      viewMode = "side_by_side";
-    }
-    return this.get("model.title_changes." + viewMode);
-  },
-
-  @observes("viewMode", "model.body_changes")
-  bodyDiffChanged() {
-    const viewMode = this.viewMode;
-    const html = this.get(`model.body_changes.${viewMode}`);
-    if (viewMode === "side_by_side_markdown") {
-      this.set("bodyDiff", html);
-    } else {
-      const opts = {
-        features: { editHistory: true, historyOneboxes: true },
-        allowListed: {
-          editHistory: { custom: (tag, attr) => attr === "class" },
-          historyOneboxes: ["header", "article", "div[style]"],
-        },
-      };
-
-      return sanitizeAsync(html, opts).then((result) =>
-        this.set("bodyDiff", result)
-      );
-    }
-  },
-
-  @action
-  displayInline(event) {
-    event?.preventDefault();
-    this.set("viewMode", "inline");
-  },
-
-  @action
-  displaySideBySide(event) {
-    event?.preventDefault();
-    this.set("viewMode", "side_by_side");
-  },
-
-  @action
-  displaySideBySideMarkdown(event) {
-    event?.preventDefault();
-    this.set("viewMode", "side_by_side_markdown");
-  },
-
-  actions: {
-    loadFirstVersion() {
-      this.refresh(this.get("model.post_id"), this.get("model.first_revision"));
-    },
-    loadPreviousVersion() {
-      this.refresh(
-        this.get("model.post_id"),
-        this.get("model.previous_revision")
-      );
-    },
-    loadNextVersion() {
-      this.refresh(this.get("model.post_id"), this.get("model.next_revision"));
-    },
-    loadLastVersion() {
-      this.refresh(this.get("model.post_id"), this.get("model.last_revision"));
-    },
-
-    hideVersion() {
-      this.hide(this.get("model.post_id"), this.get("model.current_revision"));
-    },
-    showVersion() {
-      this.show(this.get("model.post_id"), this.get("model.current_revision"));
-    },
-
-    editPost() {
-      this.topicController.send("editPost", this.post);
-      this.send("closeModal");
-    },
-
-    revertToVersion() {
-      this.revert(this.post, this.get("model.current_revision"));
-    },
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/controllers/ignore-duration-with-username.js b/app/assets/javascripts/discourse/app/controllers/ignore-duration-with-username.js
deleted file mode 100644
index 89c5250382d..00000000000
--- a/app/assets/javascripts/discourse/app/controllers/ignore-duration-with-username.js
+++ /dev/null
@@ -1,65 +0,0 @@
-import Controller from "@ember/controller";
-import I18n from "I18n";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import User from "discourse/models/user";
-import { popupAjaxError } from "discourse/lib/ajax-error";
-import { timeShortcuts } from "discourse/lib/time-shortcut";
-import discourseComputed from "discourse-common/utils/decorators";
-
-export default Controller.extend(ModalFunctionality, {
-  loading: false,
-  ignoredUntil: null,
-  ignoredUsername: null,
-
-  @discourseComputed
-  timeShortcuts() {
-    const timezone = this.currentUser.user_option.timezone;
-    const shortcuts = timeShortcuts(timezone);
-    return [
-      shortcuts.laterToday(),
-      shortcuts.tomorrow(),
-      shortcuts.laterThisWeek(),
-      shortcuts.thisWeekend(),
-      shortcuts.monday(),
-      shortcuts.twoWeeks(),
-      shortcuts.nextMonth(),
-      shortcuts.twoMonths(),
-      shortcuts.threeMonths(),
-      shortcuts.fourMonths(),
-      shortcuts.sixMonths(),
-      shortcuts.oneYear(),
-      shortcuts.forever(),
-    ];
-  },
-
-  actions: {
-    ignore() {
-      if (!this.ignoredUntil || !this.ignoredUsername) {
-        this.flash(
-          I18n.t("user.user_notifications.ignore_duration_time_frame_required"),
-          "error"
-        );
-        return;
-      }
-      this.set("loading", true);
-      User.findByUsername(this.ignoredUsername).then((user) => {
-        user
-          .updateNotificationLevel({
-            level: "ignore",
-            expiringAt: this.ignoredUntil,
-            actingUser: this.model,
-          })
-          .then(() => {
-            this.onUserIgnored(this.ignoredUsername);
-            this.send("closeModal");
-          })
-          .catch(popupAjaxError)
-          .finally(() => this.set("loading", false));
-      });
-    },
-
-    updateIgnoredUsername(selected) {
-      this.set("ignoredUsername", selected.firstObject);
-    },
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/controllers/ignore-duration.js b/app/assets/javascripts/discourse/app/controllers/ignore-duration.js
deleted file mode 100644
index 6522d58b010..00000000000
--- a/app/assets/javascripts/discourse/app/controllers/ignore-duration.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import Controller from "@ember/controller";
-import I18n from "I18n";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import { popupAjaxError } from "discourse/lib/ajax-error";
-import { timeShortcuts } from "discourse/lib/time-shortcut";
-import discourseComputed from "discourse-common/utils/decorators";
-
-export default Controller.extend(ModalFunctionality, {
-  loading: false,
-  ignoredUntil: null,
-
-  @discourseComputed
-  timeShortcuts() {
-    const timezone = this.currentUser.user_option.timezone;
-    const shortcuts = timeShortcuts(timezone);
-    return [
-      shortcuts.laterToday(),
-      shortcuts.tomorrow(),
-      shortcuts.laterThisWeek(),
-      shortcuts.thisWeekend(),
-      shortcuts.monday(),
-      shortcuts.twoWeeks(),
-      shortcuts.nextMonth(),
-      shortcuts.twoMonths(),
-      shortcuts.threeMonths(),
-      shortcuts.fourMonths(),
-      shortcuts.sixMonths(),
-      shortcuts.oneYear(),
-      shortcuts.forever(),
-    ];
-  },
-
-  actions: {
-    ignore() {
-      if (!this.ignoredUntil) {
-        this.flash(
-          I18n.t("user.user_notifications.ignore_duration_time_frame_required"),
-          "error"
-        );
-        return;
-      }
-      this.set("loading", true);
-      this.model
-        .updateNotificationLevel({
-          level: "ignore",
-          expiringAt: this.ignoredUntil,
-        })
-        .then(() => {
-          this.set("model.ignored", true);
-          this.set("model.muted", false);
-          if (this.onSuccess) {
-            this.onSuccess();
-          }
-          this.send("closeModal");
-        })
-        .catch(popupAjaxError)
-        .finally(() => this.set("loading", false));
-    },
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/controllers/invites-show.js b/app/assets/javascripts/discourse/app/controllers/invites-show.js
index 2d99c580f8b..60ff407c76f 100644
--- a/app/assets/javascripts/discourse/app/controllers/invites-show.js
+++ b/app/assets/javascripts/discourse/app/controllers/invites-show.js
@@ -271,11 +271,12 @@ export default Controller.extend(
 
     @discourseComputed
     disclaimerHtml() {
-      return I18n.t("create_account.disclaimer", {
-        tos_link: this.siteSettings.tos_url || getUrl("/tos"),
-        privacy_link:
-          this.siteSettings.privacy_policy_url || getUrl("/privacy"),
-      });
+      if (this.site.tos_url && this.site.privacy_policy_url) {
+        return I18n.t("create_account.disclaimer", {
+          tos_link: this.site.tos_url,
+          privacy_link: this.site.privacy_policy_url,
+        });
+      }
     },
 
     @discourseComputed("authOptions.associate_url", "authOptions.auth_provider")
diff --git a/app/assets/javascripts/discourse/app/controllers/json-schema-editor.js b/app/assets/javascripts/discourse/app/controllers/json-schema-editor.js
deleted file mode 100644
index db1f37686c8..00000000000
--- a/app/assets/javascripts/discourse/app/controllers/json-schema-editor.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { action } from "@ember/object";
-import Controller from "@ember/controller";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-
-export default Controller.extend(ModalFunctionality, {
-  editor: null,
-
-  @action
-  saveChanges(value) {
-    this.set("model.value", value);
-    this.send("closeModal");
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/controllers/login-page.js b/app/assets/javascripts/discourse/app/controllers/login-page.js
new file mode 100644
index 00000000000..5c6dfb43bc7
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/controllers/login-page.js
@@ -0,0 +1,5 @@
+import Controller, { inject as controller } from "@ember/controller";
+
+export default class LoginPageController extends Controller {
+  @controller application;
+}
diff --git a/app/assets/javascripts/discourse/app/controllers/login.js b/app/assets/javascripts/discourse/app/controllers/login.js
index 9d35dc7c977..3a92c0c7698 100644
--- a/app/assets/javascripts/discourse/app/controllers/login.js
+++ b/app/assets/javascripts/discourse/app/controllers/login.js
@@ -10,7 +10,7 @@ import { SECOND_FACTOR_METHODS } from "discourse/models/user";
 import { ajax } from "discourse/lib/ajax";
 import discourseComputed from "discourse-common/utils/decorators";
 import { escape } from "pretty-text/sanitizer";
-import { extractError } from "discourse/lib/ajax-error";
+import { flashAjaxError } from "discourse/lib/ajax-error";
 import { findAll } from "discourse/models/login-method";
 import getURL from "discourse-common/lib/get-url";
 import { getWebauthnCredential } from "discourse/lib/webauthn";
@@ -19,6 +19,7 @@ import { setting } from "discourse/lib/computed";
 import showModal from "discourse/lib/show-modal";
 import { wavingHandURL } from "discourse/lib/waving-hand-url";
 import { inject as service } from "@ember/service";
+import { htmlSafe } from "@ember/template";
 
 // This is happening outside of the app via popup
 const AuthErrors = [
@@ -157,26 +158,32 @@ export default Controller.extend(ModalFunctionality, {
       .then((data) => {
         const loginName = escapeExpression(this.loginName);
         const isEmail = loginName.match(/@/);
-        let key = `email_login.complete_${isEmail ? "email" : "username"}`;
+        let key = isEmail
+          ? "email_login.complete_email"
+          : "email_login.complete_username";
         if (data.user_found === false) {
           this.flash(
-            I18n.t(`${key}_not_found`, {
-              email: loginName,
-              username: loginName,
-            }),
+            htmlSafe(
+              I18n.t(`${key}_not_found`, {
+                email: loginName,
+                username: loginName,
+              })
+            ),
             "error"
           );
         } else {
           let postfix = data.hide_taken ? "" : "_found";
           this.flash(
-            I18n.t(`${key}${postfix}`, {
-              email: loginName,
-              username: loginName,
-            })
+            htmlSafe(
+              I18n.t(`${key}${postfix}`, {
+                email: loginName,
+                username: loginName,
+              })
+            )
           );
         }
       })
-      .catch((e) => this.flash(extractError(e), "error"))
+      .catch(flashAjaxError(this))
       .finally(() => this.set("processingEmailLink", false));
   },
 
@@ -437,10 +444,9 @@ export default Controller.extend(ModalFunctionality, {
       return;
     }
 
-    const skipConfirmation =
-      options && this.siteSettings.auth_skip_create_confirm;
-
+    const skipConfirmation = this.siteSettings.auth_skip_create_confirm;
     const createAccountController = this.createAccount;
+
     createAccountController.setProperties({
       accountEmail: options.email,
       accountUsername: options.username,
@@ -450,7 +456,7 @@ export default Controller.extend(ModalFunctionality, {
     });
 
     next(() => {
-      showModal("createAccount", {
+      showModal("create-account", {
         modalClass: "create-account",
         titleAriaElementId: "create-account-title",
       });
diff --git a/app/assets/javascripts/discourse/app/controllers/modal.js b/app/assets/javascripts/discourse/app/controllers/modal.js
deleted file mode 100644
index cf6c4e3aa2e..00000000000
--- a/app/assets/javascripts/discourse/app/controllers/modal.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import Controller from "@ember/controller";
-export default Controller.extend();
diff --git a/app/assets/javascripts/discourse/app/controllers/move-to-topic.js b/app/assets/javascripts/discourse/app/controllers/move-to-topic.js
index c5f80bcab28..1ceed8f6725 100644
--- a/app/assets/javascripts/discourse/app/controllers/move-to-topic.js
+++ b/app/assets/javascripts/discourse/app/controllers/move-to-topic.js
@@ -5,7 +5,7 @@ import DiscourseURL from "discourse/lib/url";
 import I18n from "I18n";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import discourseComputed from "discourse-common/utils/decorators";
-import { extractError } from "discourse/lib/ajax-error";
+import { flashAjaxError } from "discourse/lib/ajax-error";
 import { isEmpty } from "@ember/utils";
 import { next } from "@ember/runloop";
 
@@ -22,6 +22,7 @@ export default Controller.extend(ModalFunctionality, {
   newMessage: equal("selection", "new_message"),
   existingMessage: equal("selection", "existing_message"),
   participants: null,
+  chronologicalOrder: false,
 
   init() {
     this._super(...arguments);
@@ -81,6 +82,8 @@ export default Controller.extend(ModalFunctionality, {
       topicName: "",
       tags: null,
       participants: [],
+      selectedTopicId: null,
+      chronologicalOrder: false,
     });
 
     const isPrivateMessage = this.get("model.isPrivateMessage");
@@ -125,7 +128,10 @@ export default Controller.extend(ModalFunctionality, {
       let mergeOptions, moveOptions;
 
       if (type === "existingTopic") {
-        mergeOptions = { destination_topic_id: this.selectedTopicId };
+        mergeOptions = {
+          destination_topic_id: this.selectedTopicId,
+          chronological_order: this.chronologicalOrder,
+        };
         moveOptions = Object.assign(
           { post_ids: this.get("topicController.selectedPostIds") },
           mergeOptions
@@ -135,6 +141,7 @@ export default Controller.extend(ModalFunctionality, {
           destination_topic_id: this.selectedTopicId,
           participants: this.participants.join(","),
           archetype: "private_message",
+          chronological_order: this.chronologicalOrder,
         };
         moveOptions = Object.assign(
           { post_ids: this.get("topicController.selectedPostIds") },
@@ -168,9 +175,7 @@ export default Controller.extend(ModalFunctionality, {
           this.topicController.send("toggleMultiSelect");
           DiscourseURL.routeTo(result.url);
         })
-        .catch((xhr) => {
-          this.flash(extractError(xhr, I18n.t("topic.move_to.error")), "error");
-        })
+        .catch(flashAjaxError(this, I18n.t("topic.move_to.error")))
         .finally(() => {
           this.set("saving", false);
         });
diff --git a/app/assets/javascripts/discourse/app/controllers/navigation/filter.js b/app/assets/javascripts/discourse/app/controllers/navigation/filter.js
new file mode 100644
index 00000000000..c88c560d3ed
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/controllers/navigation/filter.js
@@ -0,0 +1,12 @@
+import Controller, { inject as controller } from "@ember/controller";
+
+export default class extends Controller {
+  @controller("discovery/filter") discoveryFilter;
+
+  queryString = "";
+
+  constructor() {
+    super(...arguments);
+    this.queryString = this.discoveryFilter.q;
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/controllers/not-activated.js b/app/assets/javascripts/discourse/app/controllers/not-activated.js
deleted file mode 100644
index bb9bfc67284..00000000000
--- a/app/assets/javascripts/discourse/app/controllers/not-activated.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import Controller from "@ember/controller";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import { resendActivationEmail } from "discourse/lib/user-activation";
-
-export default Controller.extend(ModalFunctionality, {
-  actions: {
-    sendActivationEmail() {
-      resendActivationEmail(this.username).then(() => {
-        const modal = this.showModal("activation-resent", { title: "log_in" });
-        modal.set("currentEmail", this.currentEmail);
-      });
-    },
-
-    editActivationEmail() {
-      const modal = this.showModal("activation-edit", {
-        title: "login.change_email",
-      });
-
-      const currentEmail = this.currentEmail;
-      modal.set("currentEmail", currentEmail);
-      modal.set("newEmail", currentEmail);
-    },
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/account.js b/app/assets/javascripts/discourse/app/controllers/preferences/account.js
index 7baeb206c29..8131d5dea74 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/account.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/account.js
@@ -1,7 +1,7 @@
-import { gt, not, or } from "@ember/object/computed";
+import { alias, gt, not, or } from "@ember/object/computed";
 import { propertyNotEqual, setting } from "discourse/lib/computed";
 import CanCheckEmails from "discourse/mixins/can-check-emails";
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import EmberObject, { action } from "@ember/object";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
@@ -12,9 +12,13 @@ import { popupAjaxError } from "discourse/lib/ajax-error";
 import { inject as service } from "@ember/service";
 import { next } from "@ember/runloop";
 import showModal from "discourse/lib/show-modal";
+import { exportUserArchive } from "discourse/lib/export-csv";
 
 export default Controller.extend(CanCheckEmails, {
   dialog: service(),
+  user: controller(),
+  canDownloadPosts: alias("user.viewingSelf"),
+
   init() {
     this._super(...arguments);
 
@@ -136,6 +140,14 @@ export default Controller.extend(CanCheckEmails, {
     return findAll().length > 0;
   },
 
+  @discourseComputed(
+    "siteSettings.max_allowed_secondary_emails",
+    "model.can_edit_email"
+  )
+  canAddEmail(maxAllowedSecondaryEmails, canEditEmail) {
+    return maxAllowedSecondaryEmails > 0 && canEditEmail;
+  },
+
   @action
   resendConfirmationEmail(email, event) {
     event?.preventDefault();
@@ -244,5 +256,12 @@ export default Controller.extend(CanCheckEmails, {
     connectAccount(method) {
       method.doLogin({ reconnect: true });
     },
+
+    exportUserArchive() {
+      this.dialog.yesNoConfirm({
+        message: I18n.t("user.download_archive.confirm"),
+        didConfirm: () => exportUserArchive(),
+      });
+    },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/emails.js b/app/assets/javascripts/discourse/app/controllers/preferences/emails.js
index a332882af52..c370e6f3d16 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/emails.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/emails.js
@@ -11,6 +11,7 @@ const EMAIL_LEVELS = {
 };
 
 export default Controller.extend({
+  subpageTitle: I18n.t("user.preferences_nav.emails"),
   emailMessagesLevelAway: equal(
     "model.user_option.email_messages_level",
     EMAIL_LEVELS.ONLY_WHEN_AWAY
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/interface.js b/app/assets/javascripts/discourse/app/controllers/preferences/interface.js
index d1e2c253820..9f86caa8e1c 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/interface.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/interface.js
@@ -36,6 +36,7 @@ export default Controller.extend({
   preferencesController: controller("preferences"),
   makeColorSchemeDefault: true,
   canPreviewColorScheme: propertyEqual("model.id", "currentUser.id"),
+  subpageTitle: I18n.t("user.preferences_nav.interface"),
 
   init() {
     this._super(...arguments);
@@ -340,7 +341,7 @@ export default Controller.extend({
 
           this.homeChanged();
 
-          if (this.themeId !== this.currentThemeId) {
+          if (this.themeId && this.themeId !== this.currentThemeId) {
             reload();
           }
         })
@@ -433,8 +434,6 @@ export default Controller.extend({
     },
 
     resetSeenUserTips() {
-      this.model.set("skip_new_user_tips", false);
-      this.model.set("seen_popups", null);
       this.model.set("user_option.skip_new_user_tips", false);
       this.model.set("user_option.seen_popups", null);
       return this.model.save(["skip_new_user_tips", "seen_popups"]);
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/navigation-menu.js b/app/assets/javascripts/discourse/app/controllers/preferences/navigation-menu.js
new file mode 100644
index 00000000000..c6b512189f8
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/navigation-menu.js
@@ -0,0 +1,52 @@
+import Controller from "@ember/controller";
+import { action } from "@ember/object";
+import { tracked } from "@glimmer/tracking";
+import I18n from "I18n";
+
+import { popupAjaxError } from "discourse/lib/ajax-error";
+
+export default class extends Controller {
+  @tracked saved = false;
+
+  subpageTitle = I18n.t("user.preferences_nav.navigation_menu");
+
+  saveAttrNames = [
+    "sidebar_link_to_filtered_list",
+    "sidebar_show_count_of_new_items",
+  ];
+
+  @action
+  save() {
+    const initialSidebarLinkToFilteredList =
+      this.model.sidebarLinkToFilteredList;
+    const initialSidebarShowCountOfNewItems =
+      this.model.sidebarShowCountOfNewItems;
+
+    this.model.set(
+      "user_option.sidebar_link_to_filtered_list",
+      this.newSidebarLinkToFilteredList
+    );
+    this.model.set(
+      "user_option.sidebar_show_count_of_new_items",
+      this.newSidebarShowCountOfNewItems
+    );
+
+    this.model
+      .save(this.saveAttrNames)
+      .then(() => {
+        this.saved = true;
+      })
+      .catch((error) => {
+        this.model.set(
+          "user_option.sidebar_link_to_filtered_list",
+          initialSidebarLinkToFilteredList
+        );
+        this.model.set(
+          "user_option.sidebar_show_count_of_new_items",
+          initialSidebarShowCountOfNewItems
+        );
+
+        popupAjaxError(error);
+      });
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/notifications.js b/app/assets/javascripts/discourse/app/controllers/preferences/notifications.js
index 6db87bbe846..b31e596c6be 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/notifications.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/notifications.js
@@ -1,10 +1,10 @@
 import Controller from "@ember/controller";
-import discourseComputed from "discourse-common/utils/decorators";
 import I18n from "I18n";
-import { NotificationLevels } from "discourse/lib/notification-levels";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Controller.extend({
+  subpageTitle: I18n.t("user.preferences_nav.notifications"),
+
   init() {
     this._super(...arguments);
 
@@ -28,71 +28,6 @@ export default Controller.extend({
       { name: I18n.t("user.like_notification_frequency.first_time"), value: 2 },
       { name: I18n.t("user.like_notification_frequency.never"), value: 3 },
     ];
-
-    this.autoTrackDurations = [
-      { name: I18n.t("user.auto_track_options.never"), value: -1 },
-      { name: I18n.t("user.auto_track_options.immediately"), value: 0 },
-      {
-        name: I18n.t("user.auto_track_options.after_30_seconds"),
-        value: 30000,
-      },
-      { name: I18n.t("user.auto_track_options.after_1_minute"), value: 60000 },
-      {
-        name: I18n.t("user.auto_track_options.after_2_minutes"),
-        value: 120000,
-      },
-      {
-        name: I18n.t("user.auto_track_options.after_3_minutes"),
-        value: 180000,
-      },
-      {
-        name: I18n.t("user.auto_track_options.after_4_minutes"),
-        value: 240000,
-      },
-      {
-        name: I18n.t("user.auto_track_options.after_5_minutes"),
-        value: 300000,
-      },
-      {
-        name: I18n.t("user.auto_track_options.after_10_minutes"),
-        value: 600000,
-      },
-    ];
-
-    this.notificationLevelsForReplying = [
-      {
-        name: I18n.t("topic.notifications.watching.title"),
-        value: NotificationLevels.WATCHING,
-      },
-      {
-        name: I18n.t("topic.notifications.tracking.title"),
-        value: NotificationLevels.TRACKING,
-      },
-      {
-        name: I18n.t("topic.notifications.regular.title"),
-        value: NotificationLevels.REGULAR,
-      },
-    ];
-
-    this.considerNewTopicOptions = [
-      { name: I18n.t("user.new_topic_duration.not_viewed"), value: -1 },
-      { name: I18n.t("user.new_topic_duration.after_1_day"), value: 60 * 24 },
-      { name: I18n.t("user.new_topic_duration.after_2_days"), value: 60 * 48 },
-      {
-        name: I18n.t("user.new_topic_duration.after_1_week"),
-        value: 7 * 60 * 24,
-      },
-      {
-        name: I18n.t("user.new_topic_duration.after_2_weeks"),
-        value: 2 * 7 * 60 * 24,
-      },
-      { name: I18n.t("user.new_topic_duration.last_here"), value: -2 },
-    ];
-  },
-
-  @discourseComputed("currentUser.can_send_private_messages")
-  showMessageSettings() {
-    return this.currentUser?.can_send_private_messages;
   },
 
   actions: {
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/profile.js b/app/assets/javascripts/discourse/app/controllers/preferences/profile.js
index f5db9651ec2..303bfe32348 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/profile.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/profile.js
@@ -12,6 +12,7 @@ import { inject as service } from "@ember/service";
 
 export default Controller.extend({
   dialog: service(),
+  subpageTitle: I18n.t("user.preferences_nav.profile"),
   init() {
     this._super(...arguments);
     this.saveAttrNames = [
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/second-factor.js b/app/assets/javascripts/discourse/app/controllers/preferences/second-factor.js
index 257c99e1c99..5e0d1d5b58d 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/second-factor.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/second-factor.js
@@ -8,12 +8,17 @@ import { alias } from "@ember/object/computed";
 import discourseComputed from "discourse-common/utils/decorators";
 import { findAll } from "discourse/models/login-method";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import showModal from "discourse/lib/show-modal";
 import { inject as service } from "@ember/service";
-import { htmlSafe } from "@ember/template";
+import SecondFactorConfirmPhrase from "discourse/components/dialog-messages/second-factor-confirm-phrase";
+import SecondFactorAddSecurityKey from "discourse/components/modal/second-factor-add-security-key";
+import SecondFactorEditSecurityKey from "discourse/components/modal/second-factor-edit-security-key";
+import SecondFactorEdit from "discourse/components/modal/second-factor-edit";
+import SecondFactorAddTotp from "discourse/components/modal/second-factor-add-totp";
+import SecondFactorBackupEdit from "discourse/components/modal/second-factor-backup-edit";
 
 export default Controller.extend(CanCheckEmails, {
   dialog: service(),
+  modal: service(),
   loading: false,
   dirty: false,
   resetPasswordLoading: false,
@@ -42,6 +47,7 @@ export default Controller.extend(CanCheckEmails, {
     return user && user.enforcedSecondFactor;
   },
 
+  @action
   handleError(error) {
     if (error.jqXHR) {
       error = error.jqXHR;
@@ -57,6 +63,17 @@ export default Controller.extend(CanCheckEmails, {
     }
   },
 
+  @action
+  setBackupEnabled(value) {
+    this.set("backupEnabled", value);
+  },
+
+  @action
+  setCodesRemaining(value) {
+    this.model.set("second_factor_remaining_backup_codes", value);
+  },
+
+  @action
   loadSecondFactors() {
     if (this.dirty === false) {
       return;
@@ -89,6 +106,7 @@ export default Controller.extend(CanCheckEmails, {
       .finally(() => this.set("loading", false));
   },
 
+  @action
   markDirty() {
     this.set("dirty", true);
   },
@@ -114,29 +132,6 @@ export default Controller.extend(CanCheckEmails, {
       .finally(() => this.set("resetPasswordLoading", false));
   },
 
-  disableAllMessage() {
-    let templateElements = [I18n.t("user.second_factor.delete_confirm_header")];
-    templateElements.push("<ul>");
-    this.totps.forEach((totp) => {
-      templateElements.push(`<li>${totp.name}</li>`);
-    });
-    this.security_keys.forEach((key) => {
-      templateElements.push(`<li>${key.name}</li>`);
-    });
-    if (this.currentUser.second_factor_backup_enabled) {
-      templateElements.push(
-        `<li>${I18n.t("user.second_factor_backup.title")}</li>`
-      );
-    }
-    templateElements.push("</ul>");
-    templateElements.push(
-      I18n.t("user.second_factor.delete_confirm_instruction", {
-        confirm: I18n.t("user.second_factor.disable"),
-      })
-    );
-    return htmlSafe(templateElements.join(""));
-  },
-
   actions: {
     confirmPassword() {
       if (!this.password) {
@@ -154,9 +149,13 @@ export default Controller.extend(CanCheckEmails, {
 
       this.dialog.deleteConfirm({
         title: I18n.t("user.second_factor.disable_confirm"),
-        message: this.disableAllMessage(),
+        bodyComponent: SecondFactorConfirmPhrase,
+        bodyComponentModel: {
+          totps: this.totps,
+          security_keys: this.security_keys,
+        },
         confirmButtonLabel: "user.second_factor.disable",
-        confirmPhrase: I18n.t("user.second_factor.disable"),
+        confirmButtonDisabled: true,
         confirmButtonIcon: "ban",
         cancelButtonClass: "btn-flat",
         didConfirm: () => {
@@ -185,40 +184,61 @@ export default Controller.extend(CanCheckEmails, {
         confirmButtonIcon: "ban",
         cancelButtonClass: "btn-flat",
         didConfirm: () => {
-          this.currentUser
-            .updateSecondFactor(
-              secondFactorMethod.id,
-              secondFactorMethod.name,
-              true,
-              secondFactorMethod.method
-            )
-            .then((response) => {
-              if (response.error) {
-                return;
-              }
-              this.markDirty();
-            })
-            .catch((e) => this.handleError(e))
-            .finally(() => {
-              this.setProperties({
-                totps: this.totps.filter(
-                  (totp) =>
-                    totp.id !== secondFactorMethod.id ||
-                    totp.method !== secondFactorMethod.method
-                ),
-                security_keys: this.security_keys.filter(
-                  (key) =>
-                    key.id !== secondFactorMethod.id ||
-                    key.method !== secondFactorMethod.method
-                ),
+          if (this.totps.includes(secondFactorMethod)) {
+            this.currentUser
+              .updateSecondFactor(
+                secondFactorMethod.id,
+                secondFactorMethod.name,
+                true,
+                secondFactorMethod.method
+              )
+              .then((response) => {
+                if (response.error) {
+                  return;
+                }
+                this.markDirty();
+                this.set(
+                  "totps",
+                  this.totps.filter(
+                    (totp) =>
+                      totp.id !== secondFactorMethod.id ||
+                      totp.method !== secondFactorMethod.method
+                  )
+                );
+              })
+              .catch((e) => this.handleError(e))
+              .finally(() => {
+                this.set("loading", false);
               });
+          }
 
-              this.set("loading", false);
-            });
+          if (this.security_keys.includes(secondFactorMethod)) {
+            this.currentUser
+              .updateSecurityKey(
+                secondFactorMethod.id,
+                secondFactorMethod.name,
+                true
+              )
+              .then((response) => {
+                if (response.error) {
+                  return;
+                }
+                this.markDirty();
+                this.set(
+                  "security_keys",
+                  this.security_keys.filter(
+                    (securityKey) => securityKey.id !== secondFactorMethod.id
+                  )
+                );
+              })
+              .catch((e) => this.handleError(e))
+              .finally(() => {
+                this.set("loading", false);
+              });
+          }
         },
       });
     },
-
     disableSecondFactorBackup() {
       this.dialog.deleteConfirm({
         title: I18n.t("user.second_factor.delete_backup_codes_confirm_title"),
@@ -254,65 +274,61 @@ export default Controller.extend(CanCheckEmails, {
       });
     },
 
-    createTotp() {
-      const controller = showModal("second-factor-add-totp", {
-        model: this.model,
-        title: "user.second_factor.totp.add",
-      });
-      controller.setProperties({
-        onClose: () => this.loadSecondFactors(),
-        markDirty: () => this.markDirty(),
-        onError: (e) => this.handleError(e),
+    async createTotp() {
+      await this.modal.show(SecondFactorAddTotp, {
+        model: {
+          secondFactor: this.model,
+          markDirty: () => this.markDirty(),
+          onError: (e) => this.handleError(e),
+        },
       });
+      this.loadSecondFactors();
     },
 
-    createSecurityKey() {
-      const controller = showModal("second-factor-add-security-key", {
-        model: this.model,
-        title: "user.second_factor.security_key.add",
-      });
-      controller.setProperties({
-        onClose: () => this.loadSecondFactors(),
-        markDirty: () => this.markDirty(),
-        onError: (e) => this.handleError(e),
+    async createSecurityKey() {
+      await this.modal.show(SecondFactorAddSecurityKey, {
+        model: {
+          secondFactor: this.model,
+          markDirty: this.markDirty,
+          onError: this.handleError,
+        },
       });
+      this.loadSecondFactors();
     },
 
-    editSecurityKey(security_key) {
-      const controller = showModal("second-factor-edit-security-key", {
-        model: security_key,
-        title: "user.second_factor.security_key.edit",
-      });
-      controller.setProperties({
-        user: this.model,
-        onClose: () => this.loadSecondFactors(),
-        markDirty: () => this.markDirty(),
-        onError: (e) => this.handleError(e),
+    async editSecurityKey(security_key) {
+      await this.modal.show(SecondFactorEditSecurityKey, {
+        model: {
+          securityKey: security_key,
+          user: this.model,
+          markDirty: () => this.markDirty(),
+          onError: (e) => this.handleError(e),
+        },
       });
+      this.loadSecondFactors();
     },
 
-    editSecondFactor(second_factor) {
-      const controller = showModal("second-factor-edit", {
-        model: second_factor,
-        title: "user.second_factor.edit_title",
-      });
-      controller.setProperties({
-        user: this.model,
-        onClose: () => this.loadSecondFactors(),
-        markDirty: () => this.markDirty(),
-        onError: (e) => this.handleError(e),
+    async editSecondFactor(second_factor) {
+      await this.modal.show(SecondFactorEdit, {
+        model: {
+          secondFactor: second_factor,
+          user: this.model,
+          markDirty: () => this.markDirty(),
+          onError: (e) => this.handleError(e),
+        },
       });
+      this.loadSecondFactors();
     },
 
-    editSecondFactorBackup() {
-      const controller = showModal("second-factor-backup-edit", {
-        model: this.model,
-        title: "user.second_factor_backup.title",
-      });
-      controller.setProperties({
-        onClose: () => this.loadSecondFactors(),
-        markDirty: () => this.markDirty(),
-        onError: (e) => this.handleError(e),
+    async editSecondFactorBackup() {
+      await this.modal.show(SecondFactorBackupEdit, {
+        model: {
+          secondFactor: this.model,
+          markDirty: () => this.markDirty(),
+          onError: (e) => this.handleError(e),
+          setBackupEnabled: (e) => this.setBackupEnabled(e),
+          setCodesRemaining: (e) => this.setCodesRemaining(e),
+        },
       });
     },
   },
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/security.js b/app/assets/javascripts/discourse/app/controllers/preferences/security.js
index 800d597c651..932235db306 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/security.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/security.js
@@ -15,7 +15,7 @@ const DEFAULT_AUTH_TOKENS_COUNT = 2;
 
 export default Controller.extend(CanCheckEmails, {
   passwordProgress: null,
-
+  subpageTitle: I18n.t("user.preferences_nav.security"),
   showAllAuthTokens: false,
 
   @discourseComputed("model.is_anonymous")
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/sidebar.js b/app/assets/javascripts/discourse/app/controllers/preferences/sidebar.js
deleted file mode 100644
index 8a2ac607227..00000000000
--- a/app/assets/javascripts/discourse/app/controllers/preferences/sidebar.js
+++ /dev/null
@@ -1,74 +0,0 @@
-import Controller from "@ember/controller";
-import { action } from "@ember/object";
-import { tracked } from "@glimmer/tracking";
-import I18n from "I18n";
-
-import { popupAjaxError } from "discourse/lib/ajax-error";
-
-export const DEFAULT_LIST_DESTINATION = "default";
-export const UNREAD_LIST_DESTINATION = "unread_new";
-
-export default class extends Controller {
-  @tracked saved = false;
-  @tracked selectedSidebarCategories = [];
-  @tracked selectedSidebarTagNames = [];
-
-  saveAttrNames = [
-    "sidebar_category_ids",
-    "sidebar_tag_names",
-    "sidebar_list_destination",
-  ];
-
-  sidebarListDestinations = [
-    {
-      name: I18n.t("user.experimental_sidebar.list_destination_default"),
-      value: DEFAULT_LIST_DESTINATION,
-    },
-    {
-      name: I18n.t("user.experimental_sidebar.list_destination_unread_new"),
-      value: UNREAD_LIST_DESTINATION,
-    },
-  ];
-
-  @action
-  save() {
-    const initialSidebarCategoryIds = this.model.sidebarCategoryIds;
-    const initialSidebarListDestination = this.model.sidebar_list_destination;
-
-    this.model.set(
-      "sidebarCategoryIds",
-      this.selectedSidebarCategories.mapBy("id")
-    );
-
-    this.model.set("sidebar_tag_names", this.selectedSidebarTagNames);
-
-    this.model.set(
-      "user_option.sidebar_list_destination",
-      this.newSidebarListDestination
-    );
-
-    this.model
-      .save(this.saveAttrNames)
-      .then((result) => {
-        if (result.user.sidebar_tags) {
-          this.model.set("sidebar_tags", result.user.sidebar_tags);
-        }
-        this.model.set(
-          "sidebar_list_destination",
-          this.newSidebarListDestination
-        );
-
-        this.saved = true;
-      })
-      .catch((error) => {
-        this.model.set("sidebarCategoryIds", initialSidebarCategoryIds);
-        popupAjaxError(error);
-      })
-      .finally(() => {
-        this.model.set("sidebar_tag_names", []);
-        if (initialSidebarListDestination !== this.newSidebarListDestination) {
-          window.location.reload();
-        }
-      });
-  }
-}
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/tracking.js b/app/assets/javascripts/discourse/app/controllers/preferences/tracking.js
index 0900a9fc6ff..a39a922dd9b 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/tracking.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/tracking.js
@@ -101,6 +101,25 @@ export default class extends Controller {
       )
       .filter((t) => t);
   }
+  @computed(
+    "model.watchedCategories",
+    "model.mutedCategories",
+    "model.watched_tags.[]",
+    "model.muted_tags.[]"
+  )
+  get showMutePrecedenceSetting() {
+    const show =
+      (this.model.watchedCategories?.length > 0 &&
+        this.model.muted_tags?.length > 0) ||
+      (this.model.watched_tags?.length > 0 &&
+        this.model.mutedCategories?.length > 0);
+
+    if (show && this.model.user_option.watched_precedence_over_muted === null) {
+      this.model.user_option.watched_precedence_over_muted =
+        this.siteSettings.watched_precedence_over_muted;
+    }
+    return show;
+  }
 
   @computed(
     "model.watchedCategories",
@@ -147,6 +166,7 @@ export default class extends Controller {
       "watched_category_ids",
       "tracked_category_ids",
       "watched_first_post_category_ids",
+      "watched_precedence_over_muted",
     ];
 
     if (this.siteSettings.tagging_enabled) {
diff --git a/app/assets/javascripts/discourse/app/controllers/publish-page.js b/app/assets/javascripts/discourse/app/controllers/publish-page.js
deleted file mode 100644
index f237944de4b..00000000000
--- a/app/assets/javascripts/discourse/app/controllers/publish-page.js
+++ /dev/null
@@ -1,130 +0,0 @@
-import { action, computed } from "@ember/object";
-import { equal, not } from "@ember/object/computed";
-import Controller from "@ember/controller";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import { ajax } from "discourse/lib/ajax";
-import { popupAjaxError } from "discourse/lib/ajax-error";
-
-const States = {
-  initializing: "initializing",
-  checking: "checking",
-  valid: "valid",
-  invalid: "invalid",
-  saving: "saving",
-  new: "new",
-  existing: "existing",
-  unpublishing: "unpublishing",
-  unpublished: "unpublished",
-};
-
-const StateHelpers = {};
-Object.keys(States).forEach((name) => {
-  StateHelpers[name] = equal("state", name);
-});
-
-export default Controller.extend(ModalFunctionality, StateHelpers, {
-  state: null,
-  reason: null,
-  publishedPage: null,
-  disabled: not("valid"),
-
-  showUrl: computed("state", function () {
-    return (
-      this.state === States.valid ||
-      this.state === States.saving ||
-      this.state === States.existing
-    );
-  }),
-
-  showUnpublish: computed("state", function () {
-    return this.state === States.existing || this.state === States.unpublishing;
-  }),
-
-  onShow() {
-    this.set("state", States.initializing);
-
-    this.store
-      .find("published_page", this.model.id)
-      .then((page) => {
-        this.setProperties({ state: States.existing, publishedPage: page });
-      })
-      .catch(this.startNew);
-  },
-
-  @action
-  startCheckSlug() {
-    if (this.state === States.existing) {
-      return;
-    }
-
-    this.set("state", States.checking);
-  },
-
-  @action
-  checkSlug() {
-    if (this.state === States.existing) {
-      return;
-    }
-    return ajax("/pub/check-slug", {
-      data: { slug: this.publishedPage.slug },
-    }).then((result) => {
-      if (result.valid_slug) {
-        this.set("state", States.valid);
-      } else {
-        this.setProperties({ state: States.invalid, reason: result.reason });
-      }
-    });
-  },
-
-  @action
-  unpublish() {
-    this.set("state", States.unpublishing);
-    return this.publishedPage
-      .destroyRecord()
-      .then(() => {
-        this.set("state", States.unpublished);
-        this.model.set("publishedPage", null);
-      })
-      .catch((result) => {
-        this.set("state", States.existing);
-        popupAjaxError(result);
-      });
-  },
-
-  @action
-  publish() {
-    this.set("state", States.saving);
-
-    return this.publishedPage
-      .update(this.publishedPage.getProperties("slug", "public"))
-      .then(() => {
-        this.set("state", States.existing);
-        this.model.set("publishedPage", this.publishedPage);
-      })
-      .catch((errResult) => {
-        popupAjaxError(errResult);
-        this.set("state", States.existing);
-      });
-  },
-
-  @action
-  startNew() {
-    this.setProperties({
-      state: States.new,
-      publishedPage: this.store.createRecord(
-        "published_page",
-        this.model.getProperties("id", "slug", "public")
-      ),
-    });
-    this.checkSlug();
-  },
-
-  @action
-  onChangePublic(isPublic) {
-    this.publishedPage.set("public", isPublic);
-
-    if (this.showUnpublish) {
-      this.publish();
-    }
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/controllers/raw-email.js b/app/assets/javascripts/discourse/app/controllers/raw-email.js
index b2a5a8ec1e9..103c4574ce1 100644
--- a/app/assets/javascripts/discourse/app/controllers/raw-email.js
+++ b/app/assets/javascripts/discourse/app/controllers/raw-email.js
@@ -1,5 +1,4 @@
 import Controller from "@ember/controller";
-import IncomingEmail from "admin/models/incoming-email";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import Post from "discourse/models/post";
 import { equal } from "@ember/object/computed";
@@ -30,16 +29,6 @@ export default Controller.extend(ModalFunctionality, {
     );
   },
 
-  loadIncomingRawEmail(incomingEmailId) {
-    return IncomingEmail.loadRawEmail(incomingEmailId).then((result) =>
-      this.setProperties({
-        rawEmail: result.raw_email,
-        textPart: result.text_part,
-        htmlPart: result.html_part,
-      })
-    );
-  },
-
   actions: {
     displayRaw() {
       this.set("tab", "raw");
diff --git a/app/assets/javascripts/discourse/app/controllers/review-index.js b/app/assets/javascripts/discourse/app/controllers/review-index.js
index e301a3cfeeb..acd369cd2fa 100644
--- a/app/assets/javascripts/discourse/app/controllers/review-index.js
+++ b/app/assets/javascripts/discourse/app/controllers/review-index.js
@@ -42,9 +42,11 @@ export default Controller.extend({
   @discourseComputed("reviewableTypes")
   allTypes() {
     return (this.reviewableTypes || []).map((type) => {
+      const translationKey = underscore(type).replace(/[^\w]+/g, "_");
+
       return {
         id: type,
-        name: I18n.t(`review.types.${underscore(type)}.title`),
+        name: I18n.t(`review.types.${translationKey}.title`),
       };
     });
   },
diff --git a/app/assets/javascripts/discourse/app/controllers/second-factor-add-security-key.js b/app/assets/javascripts/discourse/app/controllers/second-factor-add-security-key.js
deleted file mode 100644
index 9bda6f81c14..00000000000
--- a/app/assets/javascripts/discourse/app/controllers/second-factor-add-security-key.js
+++ /dev/null
@@ -1,157 +0,0 @@
-import {
-  bufferToBase64,
-  isWebauthnSupported,
-  stringToBuffer,
-} from "discourse/lib/webauthn";
-import Controller from "@ember/controller";
-import I18n from "I18n";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-
-// model for this controller is user
-export default Controller.extend(ModalFunctionality, {
-  loading: false,
-  errorMessage: null,
-
-  onShow() {
-    let securityKeyName;
-    if (this.capabilities.isIOS && !this.capabilities.isIpadOS) {
-      securityKeyName = I18n.t(
-        "user.second_factor.security_key.iphone_default_name"
-      );
-    } else if (this.capabilities.isAndroid) {
-      securityKeyName = I18n.t(
-        "user.second_factor.security_key.android_default_name"
-      );
-    } else {
-      securityKeyName = I18n.t("user.second_factor.security_key.default_name");
-    }
-    // clear properties every time because the controller is a singleton
-    this.setProperties({
-      errorMessage: null,
-      loading: true,
-      securityKeyName,
-      webauthnUnsupported: !isWebauthnSupported(),
-    });
-
-    this.model
-      .requestSecurityKeyChallenge()
-      .then((response) => {
-        if (response.error) {
-          this.set("errorMessage", response.error);
-          return;
-        }
-
-        this.setProperties({
-          errorMessage: isWebauthnSupported()
-            ? null
-            : I18n.t("login.security_key_support_missing_error"),
-          loading: false,
-          challenge: response.challenge,
-          relayingParty: {
-            id: response.rp_id,
-            name: response.rp_name,
-          },
-          supported_algorithms: response.supported_algorithms,
-          user_secure_id: response.user_secure_id,
-          existing_active_credential_ids:
-            response.existing_active_credential_ids,
-        });
-      })
-      .catch((error) => {
-        this.send("closeModal");
-        this.onError(error);
-      })
-      .finally(() => this.set("loading", false));
-  },
-
-  actions: {
-    registerSecurityKey() {
-      if (!this.securityKeyName) {
-        this.set(
-          "errorMessage",
-          I18n.t("user.second_factor.security_key.name_required_error")
-        );
-        return;
-      }
-      const publicKeyCredentialCreationOptions = {
-        challenge: Uint8Array.from(this.challenge, (c) => c.charCodeAt(0)),
-        rp: {
-          name: this.relayingParty.name,
-          id: this.relayingParty.id,
-        },
-        user: {
-          id: Uint8Array.from(this.user_secure_id, (c) => c.charCodeAt(0)),
-          displayName: this.model.username_lower,
-          name: this.model.username_lower,
-        },
-        pubKeyCredParams: this.supported_algorithms.map((alg) => {
-          return { type: "public-key", alg };
-        }),
-        excludeCredentials: this.existing_active_credential_ids.map(
-          (credentialId) => {
-            return {
-              type: "public-key",
-              id: stringToBuffer(atob(credentialId)),
-            };
-          }
-        ),
-        timeout: 20000,
-        attestation: "none",
-        authenticatorSelection: {
-          // see https://chromium.googlesource.com/chromium/src/+/master/content/browser/webauth/uv_preferred.md for why
-          // default value of preferred is not necessarily what we want, it limits webauthn to only devices that support
-          // user verification, which usually requires entering a PIN
-          userVerification: "discouraged",
-        },
-      };
-
-      navigator.credentials
-        .create({
-          publicKey: publicKeyCredentialCreationOptions,
-        })
-        .then(
-          (credential) => {
-            let serverData = {
-              id: credential.id,
-              rawId: bufferToBase64(credential.rawId),
-              type: credential.type,
-              attestation: bufferToBase64(
-                credential.response.attestationObject
-              ),
-              clientData: bufferToBase64(credential.response.clientDataJSON),
-              name: this.securityKeyName,
-            };
-
-            this.model
-              .registerSecurityKey(serverData)
-              .then((response) => {
-                if (response.error) {
-                  this.set("errorMessage", response.error);
-                  return;
-                }
-                this.markDirty();
-                this.set("errorMessage", null);
-                this.send("closeModal");
-              })
-              .catch((error) => this.onError(error))
-              .finally(() => this.set("loading", false));
-          },
-          (err) => {
-            if (err.name === "InvalidStateError") {
-              return this.set(
-                "errorMessage",
-                I18n.t("user.second_factor.security_key.already_added_error")
-              );
-            }
-            if (err.name === "NotAllowedError") {
-              return this.set(
-                "errorMessage",
-                I18n.t("user.second_factor.security_key.not_allowed_error")
-              );
-            }
-            this.set("errorMessage", err.message);
-          }
-        );
-    },
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/controllers/second-factor-add-totp.js b/app/assets/javascripts/discourse/app/controllers/second-factor-add-totp.js
deleted file mode 100644
index 2ed9127535e..00000000000
--- a/app/assets/javascripts/discourse/app/controllers/second-factor-add-totp.js
+++ /dev/null
@@ -1,80 +0,0 @@
-import Controller from "@ember/controller";
-import { action } from "@ember/object";
-import I18n from "I18n";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-
-export default Controller.extend(ModalFunctionality, {
-  loading: false,
-  secondFactorImage: null,
-  secondFactorKey: null,
-  showSecondFactorKey: false,
-  errorMessage: null,
-
-  onShow() {
-    this.setProperties({
-      errorMessage: null,
-      secondFactorKey: null,
-      secondFactorName: null,
-      secondFactorToken: null,
-      showSecondFactorKey: false,
-      secondFactorImage: null,
-      loading: true,
-    });
-    this.model
-      .createSecondFactorTotp()
-      .then((response) => {
-        if (response.error) {
-          this.set("errorMessage", response.error);
-          return;
-        }
-
-        this.setProperties({
-          errorMessage: null,
-          secondFactorKey: response.key,
-          secondFactorImage: response.qr,
-        });
-      })
-      .catch((error) => {
-        this.send("closeModal");
-        this.onError(error);
-      })
-      .finally(() => this.set("loading", false));
-  },
-
-  @action
-  enableShowSecondFactorKey(event) {
-    event?.preventDefault();
-    this.set("showSecondFactorKey", true);
-  },
-
-  actions: {
-    showSecondFactorKey() {
-      this.enableShowSecondFactorKey();
-    },
-
-    enableSecondFactor() {
-      if (!this.secondFactorToken || !this.secondFactorName) {
-        this.set(
-          "errorMessage",
-          I18n.t("user.second_factor.totp.name_and_code_required_error")
-        );
-        return;
-      }
-      this.set("loading", true);
-
-      this.model
-        .enableSecondFactorTotp(this.secondFactorToken, this.secondFactorName)
-        .then((response) => {
-          if (response.error) {
-            this.set("errorMessage", response.error);
-            return;
-          }
-          this.markDirty();
-          this.set("errorMessage", null);
-          this.send("closeModal");
-        })
-        .catch((error) => this.onError(error))
-        .finally(() => this.set("loading", false));
-    },
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/controllers/second-factor-backup-edit.js b/app/assets/javascripts/discourse/app/controllers/second-factor-backup-edit.js
deleted file mode 100644
index 6854102fe0b..00000000000
--- a/app/assets/javascripts/discourse/app/controllers/second-factor-backup-edit.js
+++ /dev/null
@@ -1,79 +0,0 @@
-import Controller from "@ember/controller";
-import I18n from "I18n";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import { SECOND_FACTOR_METHODS } from "discourse/models/user";
-import { alias } from "@ember/object/computed";
-import discourseLater from "discourse-common/lib/later";
-
-export default Controller.extend(ModalFunctionality, {
-  loading: false,
-  errorMessage: null,
-  successMessage: null,
-  backupEnabled: alias("model.second_factor_backup_enabled"),
-  remainingCodes: alias("model.second_factor_remaining_backup_codes"),
-  backupCodes: null,
-  secondFactorMethod: SECOND_FACTOR_METHODS.TOTP,
-
-  onShow() {
-    this.setProperties({
-      loading: false,
-      errorMessage: null,
-      successMessage: null,
-      backupCodes: null,
-    });
-  },
-
-  actions: {
-    copyBackupCode(successful) {
-      if (successful) {
-        this.set(
-          "successMessage",
-          I18n.t("user.second_factor_backup.copied_to_clipboard")
-        );
-      } else {
-        this.set(
-          "errorMessage",
-          I18n.t("user.second_factor_backup.copy_to_clipboard_error")
-        );
-      }
-
-      this._hideCopyMessage();
-    },
-
-    generateSecondFactorCodes() {
-      this.set("loading", true);
-      this.model
-        .generateSecondFactorCodes()
-        .then((response) => {
-          if (response.error) {
-            this.set("errorMessage", response.error);
-            return;
-          }
-
-          this.markDirty();
-          this.setProperties({
-            errorMessage: null,
-            backupCodes: response.backup_codes,
-            backupEnabled: true,
-            remainingCodes: response.backup_codes.length,
-          });
-        })
-        .catch((error) => {
-          this.send("closeModal");
-          this.onError(error);
-        })
-        .finally(() => {
-          this.setProperties({
-            loading: false,
-          });
-        });
-    },
-  },
-
-  _hideCopyMessage() {
-    discourseLater(
-      () => this.setProperties({ successMessage: null, errorMessage: null }),
-      2000
-    );
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/controllers/second-factor-edit-security-key.js b/app/assets/javascripts/discourse/app/controllers/second-factor-edit-security-key.js
deleted file mode 100644
index 352fc5bbf31..00000000000
--- a/app/assets/javascripts/discourse/app/controllers/second-factor-edit-security-key.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import Controller from "@ember/controller";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-
-export default Controller.extend(ModalFunctionality, {
-  actions: {
-    disableSecurityKey() {
-      this.user
-        .updateSecurityKey(this.model.id, this.model.name, true)
-        .then((response) => {
-          if (response.error) {
-            return;
-          }
-          this.markDirty();
-        })
-        .catch((error) => {
-          this.send("closeModal");
-          this.onError(error);
-        })
-        .finally(() => {
-          this.set("loading", false);
-          this.send("closeModal");
-        });
-    },
-
-    editSecurityKey() {
-      this.user
-        .updateSecurityKey(this.model.id, this.model.name, false)
-        .then((response) => {
-          if (response.error) {
-            return;
-          }
-          this.markDirty();
-        })
-        .catch((error) => {
-          this.onError(error);
-        })
-        .finally(() => {
-          this.set("loading", false);
-          this.send("closeModal");
-        });
-    },
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/controllers/second-factor-edit.js b/app/assets/javascripts/discourse/app/controllers/second-factor-edit.js
deleted file mode 100644
index 88eaedd6459..00000000000
--- a/app/assets/javascripts/discourse/app/controllers/second-factor-edit.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import Controller from "@ember/controller";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-
-export default Controller.extend(ModalFunctionality, {
-  actions: {
-    editSecondFactor() {
-      this.user
-        .updateSecondFactor(
-          this.model.id,
-          this.model.name,
-          false,
-          this.model.method
-        )
-        .then((response) => {
-          if (response.error) {
-            return;
-          }
-          this.markDirty();
-        })
-        .catch((error) => {
-          this.send("closeModal");
-          this.onError(error);
-        })
-        .finally(() => {
-          this.set("loading", false);
-          this.send("closeModal");
-        });
-    },
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/controllers/share-topic.js b/app/assets/javascripts/discourse/app/controllers/share-topic.js
deleted file mode 100644
index 5f9766af2c4..00000000000
--- a/app/assets/javascripts/discourse/app/controllers/share-topic.js
+++ /dev/null
@@ -1,126 +0,0 @@
-import Controller from "@ember/controller";
-import { action } from "@ember/object";
-import { getAbsoluteURL } from "discourse-common/lib/get-url";
-import discourseComputed, {
-  afterRender,
-} from "discourse-common/utils/decorators";
-import { longDateNoYear } from "discourse/lib/formatter";
-import Sharing from "discourse/lib/sharing";
-import showModal from "discourse/lib/show-modal";
-import { bufferedProperty } from "discourse/mixins/buffered-content";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import I18n from "I18n";
-import Category from "discourse/models/category";
-import { getOwner } from "discourse-common/lib/get-owner";
-
-export default Controller.extend(
-  ModalFunctionality,
-  bufferedProperty("invite"),
-  {
-    topic: null,
-    post: null,
-    allowInvites: false,
-
-    onShow() {
-      this.setProperties({
-        topic: null,
-        post: null,
-        allowInvites: false,
-      });
-
-      this._showRestrictedGroupWarning();
-      this._selectUrl();
-    },
-
-    @afterRender
-    _showRestrictedGroupWarning() {
-      if (!this.model) {
-        return;
-      }
-
-      Category.fetchVisibleGroups(this.model.id).then((result) => {
-        if (result.groups.length > 0) {
-          this.flash(
-            I18n.t("topic.share.restricted_groups", {
-              count: result.groups.length,
-              groupNames: result.groups.join(", "),
-            }),
-            "warning"
-          );
-        }
-      });
-    },
-
-    @afterRender
-    _selectUrl() {
-      const input = document.querySelector("input.invite-link");
-      if (input && !this.site.mobileView) {
-        // if the input is auto-focused on mobile, iOS requires two taps of the copy button
-        input.setSelectionRange(0, this.url.length);
-        input.focus();
-      }
-    },
-
-    @discourseComputed("post.shareUrl", "topic.shareUrl")
-    url(postUrl, topicUrl) {
-      if (postUrl) {
-        return getAbsoluteURL(postUrl);
-      } else if (topicUrl) {
-        return getAbsoluteURL(topicUrl);
-      }
-    },
-
-    @discourseComputed("post.created_at", "post.wiki", "post.last_wiki_edit")
-    displayDate(createdAt, wiki, lastWikiEdit) {
-      const date = wiki && lastWikiEdit ? lastWikiEdit : createdAt;
-      return longDateNoYear(new Date(date));
-    },
-
-    @discourseComputed(
-      "topic.{isPrivateMessage,invisible,category.read_restricted}"
-    )
-    sources(topic) {
-      const privateContext =
-        this.siteSettings.login_required ||
-        topic?.isPrivateMessage ||
-        topic?.invisible ||
-        topic?.category?.read_restricted;
-
-      return Sharing.activeSources(
-        this.siteSettings.share_links,
-        privateContext
-      );
-    },
-
-    @action
-    share(source) {
-      Sharing.shareSource(source, {
-        title: this.topic.title,
-        url: this.url,
-      });
-    },
-
-    @action
-    inviteUsers() {
-      const controller = showModal("create-invite");
-      controller.setProperties({
-        inviteToTopic: true,
-        topics: [this.topic],
-      });
-      controller.buffered.setProperties({
-        topicId: this.topic.id,
-        topicTitle: this.topic.title,
-      });
-    },
-
-    @action
-    replyAsNewTopic() {
-      const postStream = this.topic.postStream;
-      const postId = this.post?.id || postStream.findPostIdForPostNumber(1);
-      const post = postStream.findLoadedPost(postId);
-      const topicController = getOwner(this).lookup("controller:topic");
-      topicController.actions.replyAsNewTopic.call(topicController, post);
-      this.send("closeModal");
-    },
-  }
-);
diff --git a/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-delete-modal.js b/app/assets/javascripts/discourse/app/controllers/sidebar-tags-form.js
similarity index 55%
rename from plugins/chat/assets/javascripts/discourse/controllers/chat-channel-delete-modal.js
rename to app/assets/javascripts/discourse/app/controllers/sidebar-tags-form.js
index ad230c1021b..eca315bcbe8 100644
--- a/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-delete-modal.js
+++ b/app/assets/javascripts/discourse/app/controllers/sidebar-tags-form.js
@@ -1,8 +1,6 @@
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
-export default class ChatChannelDeleteModalController extends Controller.extend(
+export default class SidebarTagsForm extends Controller.extend(
   ModalFunctionality
-) {
-  chatChannel = null;
-}
+) {}
diff --git a/app/assets/javascripts/discourse/app/controllers/static.js b/app/assets/javascripts/discourse/app/controllers/static.js
deleted file mode 100644
index b86a70cd546..00000000000
--- a/app/assets/javascripts/discourse/app/controllers/static.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import Controller, { inject as controller } from "@ember/controller";
-import { ajax } from "discourse/lib/ajax";
-import discourseComputed from "discourse-common/utils/decorators";
-import { equal, or } from "@ember/object/computed";
-import { userPath } from "discourse/lib/url";
-
-export default Controller.extend({
-  application: controller(),
-
-  showLoginButton: equal("model.path", "login"),
-  anyButtons: or("showLoginButton", "showSignupButton"),
-
-  @discourseComputed("model.path")
-  bodyClass: (path) => `static-${path}`,
-
-  @discourseComputed("model.path")
-  showSignupButton() {
-    return (
-      this.get("model.path") === "login" && this.get("application.canSignUp")
-    );
-  },
-
-  actions: {
-    markFaqRead() {
-      const currentUser = this.currentUser;
-      if (currentUser) {
-        ajax(userPath("read-faq"), { type: "POST" }).then(() => {
-          currentUser.set("read_faq", true);
-        });
-      }
-    },
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/controllers/tag-groups-edit.js b/app/assets/javascripts/discourse/app/controllers/tag-groups-edit.js
index bcc378cbf3f..3d163c3d740 100644
--- a/app/assets/javascripts/discourse/app/controllers/tag-groups-edit.js
+++ b/app/assets/javascripts/discourse/app/controllers/tag-groups-edit.js
@@ -1,6 +1,8 @@
 import Controller, { inject as controller } from "@ember/controller";
+import { inject as service } from "@ember/service";
 
 export default Controller.extend({
+  router: service(),
   tagGroups: controller(),
 
   actions: {
@@ -8,7 +10,7 @@ export default Controller.extend({
       const tagGroups = this.tagGroups.model;
       tagGroups.removeObject(this.model);
 
-      this.transitionToRoute("tagGroups.index");
+      this.router.transitionTo("tagGroups.index");
     },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/tag-groups-new.js b/app/assets/javascripts/discourse/app/controllers/tag-groups-new.js
index 5487e1c94b8..89da975db39 100644
--- a/app/assets/javascripts/discourse/app/controllers/tag-groups-new.js
+++ b/app/assets/javascripts/discourse/app/controllers/tag-groups-new.js
@@ -1,6 +1,8 @@
 import Controller, { inject as controller } from "@ember/controller";
+import { inject as service } from "@ember/service";
 
 export default Controller.extend({
+  router: service(),
   tagGroups: controller(),
 
   actions: {
@@ -8,7 +10,7 @@ export default Controller.extend({
       const tagGroups = this.tagGroups.model;
       tagGroups.pushObject(this.model);
 
-      this.transitionToRoute("tagGroups.index");
+      this.router.transitionTo("tagGroups.index");
     },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/tag-groups.js b/app/assets/javascripts/discourse/app/controllers/tag-groups.js
index a648ed6fab3..1f5a0f3ad1b 100644
--- a/app/assets/javascripts/discourse/app/controllers/tag-groups.js
+++ b/app/assets/javascripts/discourse/app/controllers/tag-groups.js
@@ -1,9 +1,12 @@
 import Controller from "@ember/controller";
+import { inject as service } from "@ember/service";
 
 export default Controller.extend({
+  router: service(),
+
   actions: {
     newTagGroup() {
-      this.transitionToRoute("tagGroups.new");
+      this.router.transitionTo("tagGroups.new");
     },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/tag-show.js b/app/assets/javascripts/discourse/app/controllers/tag-show.js
index cc32873bbc8..2edbe52dbf5 100644
--- a/app/assets/javascripts/discourse/app/controllers/tag-show.js
+++ b/app/assets/javascripts/discourse/app/controllers/tag-show.js
@@ -2,6 +2,7 @@ import DiscoverySortableController from "discourse/controllers/discovery-sortabl
 import { inject as controller } from "@ember/controller";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import BulkTopicSelection from "discourse/mixins/bulk-topic-selection";
+import DismissTopics from "discourse/mixins/dismiss-topics";
 import FilterModeMixin from "discourse/mixins/filter-mode";
 import I18n from "I18n";
 import NavItem from "discourse/models/nav-item";
@@ -13,10 +14,14 @@ import { inject as service } from "@ember/service";
 
 export default DiscoverySortableController.extend(
   BulkTopicSelection,
+  DismissTopics,
   FilterModeMixin,
   {
     application: controller(),
     dialog: service(),
+    router: service(),
+    currentUser: service(),
+    siteSettings: service(),
 
     tag: null,
     additionalTags: null,
@@ -91,8 +96,7 @@ export default DiscoverySortableController.extend(
       return this._isFilterPage(filter, "new") && topicsLength > 0;
     },
 
-    @action
-    resetNew() {
+    callResetNew(dismissPosts = false, dismissTopics = false, untrack = false) {
       const tracked =
         (this.router.currentRoute.queryParams["f"] ||
           this.router.currentRoute.queryParams["filter"]) === "tracked";
@@ -103,9 +107,15 @@ export default DiscoverySortableController.extend(
         tracked,
         tag: this.tag,
         topicIds,
-      }).then(() =>
-        this.refresh(tracked ? { skipResettingParams: ["filter", "f"] } : {})
-      );
+        dismissPosts,
+        dismissTopics,
+        untrack,
+      }).then((result) => {
+        if (result.topic_ids) {
+          this.topicTrackingState.removeTopics(result.topic_ids);
+        }
+        this.refresh(tracked ? { skipResettingParams: ["filter", "f"] } : {});
+      });
     },
 
     @action
@@ -171,7 +181,7 @@ export default DiscoverySortableController.extend(
         didConfirm: () => {
           return this.tag
             .destroyRecord()
-            .then(() => this.transitionToRoute("tags.index"))
+            .then(() => this.router.transitionTo("tags.index"))
             .catch(() => this.dialog.alert(I18n.t("generic_error")));
         },
       });
@@ -184,6 +194,8 @@ export default DiscoverySortableController.extend(
         .then((response) => {
           const payload = response.responseJson;
 
+          this.tagNotification.set("notification_level", notificationLevel);
+
           this.currentUser.setProperties({
             watched_tags: payload.watched_tags,
             watching_first_post_tags: payload.watching_first_post_tags,
diff --git a/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js b/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js
deleted file mode 100644
index 9bbc1558904..00000000000
--- a/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js
+++ /dev/null
@@ -1,332 +0,0 @@
-import { alias, empty } from "@ember/object/computed";
-import Controller, { inject as controller } from "@ember/controller";
-import I18n from "I18n";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import { Promise } from "rsvp";
-import Topic from "discourse/models/topic";
-
-import { inject as service } from "@ember/service";
-
-const _buttons = [];
-
-const alwaysTrue = () => true;
-
-function identity() {}
-
-function addBulkButton(action, key, opts) {
-  opts = opts || {};
-
-  const btn = {
-    action,
-    label: `topics.bulk.${key}`,
-    icon: opts.icon,
-    buttonVisible: opts.buttonVisible || alwaysTrue,
-    enabledSetting: opts.enabledSetting,
-    class: opts.class,
-  };
-
-  _buttons.push(btn);
-}
-
-// Default buttons
-addBulkButton("showChangeCategory", "change_category", {
-  icon: "pencil-alt",
-  class: "btn-default",
-  buttonVisible: (topics) => !topics.some((t) => t.isPrivateMessage),
-});
-addBulkButton("closeTopics", "close_topics", {
-  icon: "lock",
-  class: "btn-default",
-  buttonVisible: (topics) => !topics.some((t) => t.isPrivateMessage),
-});
-addBulkButton("archiveTopics", "archive_topics", {
-  icon: "folder",
-  class: "btn-default",
-  buttonVisible: (topics) => !topics.some((t) => t.isPrivateMessage),
-});
-addBulkButton("archiveMessages", "archive_topics", {
-  icon: "folder",
-  class: "btn-default",
-  buttonVisible: (topics) => topics.some((t) => t.isPrivateMessage),
-});
-addBulkButton("moveMessagesToInbox", "move_messages_to_inbox", {
-  icon: "folder",
-  class: "btn-default",
-  buttonVisible: (topics) => topics.some((t) => t.isPrivateMessage),
-});
-addBulkButton("showNotificationLevel", "notification_level", {
-  icon: "d-regular",
-  class: "btn-default",
-});
-addBulkButton("deletePostTiming", "defer", {
-  icon: "circle",
-  class: "btn-default",
-  buttonVisible() {
-    return this.currentUser.user_option.enable_defer;
-  },
-});
-addBulkButton("unlistTopics", "unlist_topics", {
-  icon: "far-eye-slash",
-  class: "btn-default",
-  buttonVisible: (topics) =>
-    topics.some((t) => t.visible) && !topics.some((t) => t.isPrivateMessage),
-});
-addBulkButton("relistTopics", "relist_topics", {
-  icon: "far-eye",
-  class: "btn-default",
-  buttonVisible: (topics) =>
-    topics.some((t) => !t.visible) && !topics.some((t) => t.isPrivateMessage),
-});
-addBulkButton("resetBumpDateTopics", "reset_bump_dates", {
-  icon: "anchor",
-  class: "btn-default",
-  buttonVisible() {
-    return this.currentUser.canManageTopic;
-  },
-});
-addBulkButton("showTagTopics", "change_tags", {
-  icon: "tag",
-  class: "btn-default",
-  enabledSetting: "tagging_enabled",
-  buttonVisible() {
-    return this.currentUser.canManageTopic;
-  },
-});
-addBulkButton("showAppendTagTopics", "append_tags", {
-  icon: "tag",
-  class: "btn-default",
-  enabledSetting: "tagging_enabled",
-  buttonVisible() {
-    return this.currentUser.canManageTopic;
-  },
-});
-addBulkButton("removeTags", "remove_tags", {
-  icon: "tag",
-  class: "btn-default",
-  enabledSetting: "tagging_enabled",
-  buttonVisible() {
-    return this.currentUser.canManageTopic;
-  },
-});
-addBulkButton("deleteTopics", "delete", {
-  icon: "trash-alt",
-  class: "btn-danger delete-topics",
-  buttonVisible() {
-    return this.currentUser.staff;
-  },
-});
-
-// Modal for performing bulk actions on topics
-export default Controller.extend(ModalFunctionality, {
-  userPrivateMessages: controller("user-private-messages"),
-  dialog: service(),
-  tags: null,
-  emptyTags: empty("tags"),
-  categoryId: alias("model.category.id"),
-  processedTopicCount: 0,
-  isGroup: alias("userPrivateMessages.isGroup"),
-  groupFilter: alias("userPrivateMessages.groupFilter"),
-
-  onShow() {
-    const topics = this.get("model.topics");
-    this.set(
-      "buttons",
-      _buttons.filter((b) => {
-        if (b.enabledSetting && !this.siteSettings[b.enabledSetting]) {
-          return false;
-        }
-        return b.buttonVisible.call(this, topics);
-      })
-    );
-    this.set("modal.modalClass", "topic-bulk-actions-modal small");
-    this.send("changeBulkTemplate", "modal/bulk-actions-buttons");
-  },
-
-  perform(operation) {
-    this.set("processedTopicCount", 0);
-    if (this.get("model.topics").length > 20) {
-      this.send("changeBulkTemplate", "modal/bulk-progress");
-    }
-
-    this.set("loading", true);
-
-    return this._processChunks(operation)
-      .catch(() => {
-        this.dialog.alert(I18n.t("generic_error"));
-      })
-      .finally(() => {
-        this.set("loading", false);
-      });
-  },
-
-  _generateTopicChunks(allTopics) {
-    let startIndex = 0;
-    const chunkSize = 30;
-    const chunks = [];
-
-    while (startIndex < allTopics.length) {
-      let topics = allTopics.slice(startIndex, startIndex + chunkSize);
-      chunks.push(topics);
-      startIndex += chunkSize;
-    }
-
-    return chunks;
-  },
-
-  _processChunks(operation) {
-    const allTopics = this.get("model.topics");
-    const topicChunks = this._generateTopicChunks(allTopics);
-    const topicIds = [];
-
-    const tasks = topicChunks.map((topics) => () => {
-      return Topic.bulkOperation(topics, operation).then((result) => {
-        this.set(
-          "processedTopicCount",
-          this.get("processedTopicCount") + topics.length
-        );
-        return result;
-      });
-    });
-
-    return new Promise((resolve, reject) => {
-      const resolveNextTask = () => {
-        if (tasks.length === 0) {
-          const topics = topicIds.map((id) => allTopics.findBy("id", id));
-          return resolve(topics);
-        }
-
-        tasks
-          .shift()()
-          .then((result) => {
-            if (result && result.topic_ids) {
-              topicIds.push(...result.topic_ids);
-            }
-            resolveNextTask();
-          })
-          .catch(reject);
-      };
-
-      resolveNextTask();
-    });
-  },
-
-  forEachPerformed(operation, cb) {
-    this.perform(operation).then((topics) => {
-      if (topics) {
-        topics.forEach(cb);
-        (this.refreshClosure || identity)();
-        this.send("closeModal");
-      }
-    });
-  },
-
-  performAndRefresh(operation) {
-    return this.perform(operation).then(() => {
-      (this.refreshClosure || identity)();
-      this.send("closeModal");
-    });
-  },
-
-  actions: {
-    showTagTopics() {
-      this.set("tags", "");
-      this.set("action", "changeTags");
-      this.set("label", "change_tags");
-      this.set("title", "choose_new_tags");
-      this.send("changeBulkTemplate", "bulk-tag");
-    },
-
-    changeTags() {
-      this.performAndRefresh({ type: "change_tags", tags: this.tags });
-    },
-
-    showAppendTagTopics() {
-      this.set("tags", null);
-      this.set("action", "appendTags");
-      this.set("label", "append_tags");
-      this.set("title", "choose_append_tags");
-      this.send("changeBulkTemplate", "bulk-tag");
-    },
-
-    appendTags() {
-      this.performAndRefresh({ type: "append_tags", tags: this.tags });
-    },
-
-    showChangeCategory() {
-      this.send("changeBulkTemplate", "modal/bulk-change-category");
-    },
-
-    showNotificationLevel() {
-      this.send("changeBulkTemplate", "modal/bulk-notification-level");
-    },
-
-    deleteTopics() {
-      this.performAndRefresh({ type: "delete" });
-    },
-
-    closeTopics() {
-      this.forEachPerformed({ type: "close" }, (t) => t.set("closed", true));
-    },
-
-    archiveTopics() {
-      this.forEachPerformed({ type: "archive" }, (t) =>
-        t.set("archived", true)
-      );
-    },
-
-    archiveMessages() {
-      let params = { type: "archive_messages" };
-      if (this.isGroup) {
-        params.group = this.groupFilter;
-      }
-      this.performAndRefresh(params);
-    },
-
-    moveMessagesToInbox() {
-      let params = { type: "move_messages_to_inbox" };
-      if (this.isGroup) {
-        params.group = this.groupFilter;
-      }
-      this.performAndRefresh(params);
-    },
-
-    unlistTopics() {
-      this.forEachPerformed({ type: "unlist" }, (t) => t.set("visible", false));
-    },
-
-    relistTopics() {
-      this.forEachPerformed({ type: "relist" }, (t) => t.set("visible", true));
-    },
-
-    resetBumpDateTopics() {
-      this.performAndRefresh({ type: "reset_bump_dates" });
-    },
-
-    changeCategory() {
-      const categoryId = parseInt(this.newCategoryId, 10) || 0;
-
-      this.perform({ type: "change_category", category_id: categoryId }).then(
-        (topics) => {
-          topics.forEach((t) => t.set("category_id", categoryId));
-          (this.refreshClosure || identity)();
-          this.send("closeModal");
-        }
-      );
-    },
-
-    deletePostTiming() {
-      this.performAndRefresh({ type: "destroy_post_timing" });
-    },
-
-    removeTags() {
-      this.dialog.deleteConfirm({
-        message: I18n.t("topics.bulk.confirm_remove_tags", {
-          count: this.get("model.topics").length,
-        }),
-        didConfirm: () => this.performAndRefresh({ type: "remove_tags" }),
-      });
-    },
-  },
-});
-
-export { addBulkButton };
diff --git a/app/assets/javascripts/discourse/app/controllers/topic.js b/app/assets/javascripts/discourse/app/controllers/topic.js
index 2f1f976f5a5..075a0cdec6f 100644
--- a/app/assets/javascripts/discourse/app/controllers/topic.js
+++ b/app/assets/javascripts/discourse/app/controllers/topic.js
@@ -6,9 +6,15 @@ import discourseComputed, {
   bind,
   observes,
 } from "discourse-common/utils/decorators";
+import { resetCachedTopicList } from "discourse/lib/cached-topic-list";
 import { isEmpty, isPresent } from "@ember/utils";
 import { next, schedule } from "@ember/runloop";
 import discourseLater from "discourse-common/lib/later";
+import BookmarkModal from "discourse/components/modal/bookmark";
+import {
+  CLOSE_INITIATED_BY_BUTTON,
+  CLOSE_INITIATED_BY_ESC,
+} from "discourse/components/d-modal";
 import Bookmark, { AUTO_DELETE_PREFERENCES } from "discourse/models/bookmark";
 import Composer from "discourse/models/composer";
 import EmberObject, { action } from "@ember/object";
@@ -28,7 +34,8 @@ import { popupAjaxError } from "discourse/lib/ajax-error";
 import { inject as service } from "@ember/service";
 import showModal from "discourse/lib/show-modal";
 import { spinnerHTML } from "discourse/helpers/loading-spinner";
-import { openBookmarkModal } from "discourse/controllers/bookmark";
+import { BookmarkFormData } from "discourse/lib/bookmark";
+import DeleteTopicConfirmModal from "discourse/components/modal/delete-topic-confirm";
 
 let customPostMessageCallbacks = {};
 
@@ -47,11 +54,17 @@ export function registerCustomPostMessageCallback(type, callback) {
 }
 
 export default Controller.extend(bufferedProperty("model"), {
-  composer: controller(),
+  composer: service(),
   application: controller(),
   dialog: service(),
   documentTitle: service(),
   screenTrack: service(),
+  modal: service(),
+  currentUser: service(),
+  router: service(),
+  siteSettings: service(),
+  site: service(),
+  appEvents: service(),
 
   multiSelect: false,
   selectedPostIds: null,
@@ -519,9 +532,9 @@ export default Controller.extend(bufferedProperty("model"), {
       }
     },
 
-    showSummary() {
+    showTopReplies() {
       return this.get("model.postStream")
-        .showSummary()
+        .showTopReplies()
         .then(() => {
           this.updateQueryParams();
         });
@@ -558,7 +571,7 @@ export default Controller.extend(bufferedProperty("model"), {
         .removeAllowedUser(user)
         .then(() => {
           if (this.currentUser.id === user.id) {
-            this.transitionToRoute("userPrivateMessages", user);
+            this.router.transitionTo("userPrivateMessages", user);
           }
         });
     },
@@ -579,7 +592,10 @@ export default Controller.extend(bufferedProperty("model"), {
         return;
       }
 
-      const backToInbox = () => this.gotoInbox(topic.get("inboxGroupName"));
+      const backToInbox = () => {
+        resetCachedTopicList(this.session);
+        this.gotoInbox(topic.get("inboxGroupName"));
+      };
 
       if (topic.get("message_archived")) {
         topic.moveToInbox().then(backToInbox);
@@ -674,7 +690,10 @@ export default Controller.extend(bufferedProperty("model"), {
     deletePost(post, opts) {
       if (post.get("post_number") === 1) {
         return this.deleteTopic(opts);
-      } else if (!post.can_delete) {
+      } else if (
+        (!opts?.force_destroy && !post.can_delete) ||
+        (opts?.force_destroy && !post.can_permanently_delete)
+      ) {
         return false;
       }
 
@@ -819,7 +838,7 @@ export default Controller.extend(bufferedProperty("model"), {
 
       // Cancel and reopen the composer for the first post
       if (editingFirst) {
-        composer.cancelComposer().then(() => composer.open(opts));
+        composer.cancelComposer(opts).then(() => composer.open(opts));
       } else {
         composer.open(opts);
       }
@@ -1265,43 +1284,60 @@ export default Controller.extend(bufferedProperty("model"), {
   },
 
   _modifyTopicBookmark(bookmark) {
-    return openBookmarkModal(bookmark, {
-      onAfterSave: (savedData) => {
-        this._syncBookmarks(savedData);
-        this.model.set("bookmarking", false);
-        this.model.set("bookmarked", true);
-        this.model.incrementProperty("bookmarksWereChanged");
-        this.appEvents.trigger(
-          "bookmarks:changed",
-          savedData,
-          bookmark.attachedTo()
-        );
-      },
-      onAfterDelete: (topicBookmarked, bookmarkId) => {
-        this.model.removeBookmark(bookmarkId);
+    this.modal.show(BookmarkModal, {
+      model: {
+        bookmark: new BookmarkFormData(bookmark),
+        afterSave: (savedData) => {
+          this._syncBookmarks(savedData);
+          this.model.set("bookmarking", false);
+          this.model.set("bookmarked", true);
+          this.model.incrementProperty("bookmarksWereChanged");
+          this.appEvents.trigger(
+            "bookmarks:changed",
+            savedData,
+            bookmark.attachedTo()
+          );
+        },
+        afterDelete: (topicBookmarked, bookmarkId) => {
+          this.model.removeBookmark(bookmarkId);
+        },
       },
     });
   },
 
   _modifyPostBookmark(bookmark, post) {
-    return openBookmarkModal(bookmark, {
-      onCloseWithoutSaving: () => {
-        post.appEvents.trigger("post-stream:refresh", {
-          id: bookmark.bookmarkable_id,
-        });
-      },
-      onAfterSave: (savedData) => {
-        this._syncBookmarks(savedData);
-        this.model.set("bookmarking", false);
-        post.createBookmark(savedData);
-        this.model.afterPostBookmarked(post, savedData);
-        return [post.id];
-      },
-      onAfterDelete: (topicBookmarked, bookmarkId) => {
-        this.model.removeBookmark(bookmarkId);
-        post.deleteBookmark(topicBookmarked);
-      },
-    });
+    this.modal
+      .show(BookmarkModal, {
+        model: {
+          bookmark: new BookmarkFormData(bookmark),
+          afterSave: (savedData) => {
+            this._syncBookmarks(savedData);
+            this.model.set("bookmarking", false);
+            post.createBookmark(savedData);
+            this.model.afterPostBookmarked(post, savedData);
+            return [post.id];
+          },
+          afterDelete: (topicBookmarked, bookmarkId) => {
+            this.model.removeBookmark(bookmarkId);
+            post.deleteBookmark(topicBookmarked);
+          },
+        },
+      })
+      .then((closeData) => {
+        if (!closeData) {
+          return;
+        }
+
+        if (
+          closeData.closeWithoutSaving ||
+          closeData.initiatedBy === CLOSE_INITIATED_BY_ESC ||
+          closeData.initiatedBy === CLOSE_INITIATED_BY_BUTTON
+        ) {
+          post.appEvents.trigger("post-stream:refresh", {
+            id: bookmark.bookmarkable_id,
+          });
+        }
+      });
   },
 
   _syncBookmarks(data) {
@@ -1534,10 +1570,7 @@ export default Controller.extend(bufferedProperty("model"), {
   },
 
   deleteTopicModal() {
-    showModal("delete-topic-confirm", {
-      model: this.model,
-      title: "topic.actions.delete",
-    });
+    this.modal.show(DeleteTopicConfirmModal, { model: { topic: this.model } });
   },
 
   retryOnRateLimit(times, promise, topicId) {
diff --git a/app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks.js b/app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks.js
index 72a316b4b65..785e5bac9dd 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks.js
@@ -8,11 +8,13 @@ import Bookmark from "discourse/models/bookmark";
 import I18n from "I18n";
 import { Promise } from "rsvp";
 import { htmlSafe } from "@ember/template";
+import { inject as service } from "@ember/service";
 
 export default Controller.extend({
   queryParams: ["q"],
   q: null,
 
+  router: service(),
   application: controller(),
   user: controller(),
   loading: false,
@@ -51,7 +53,7 @@ export default Controller.extend({
 
   @action
   search() {
-    this.transitionToRoute({
+    this.router.transitionTo({
       queryParams: { q: this.searchTerm },
     });
   },
diff --git a/app/assets/javascripts/discourse/app/controllers/user-card.js b/app/assets/javascripts/discourse/app/controllers/user-card.js
deleted file mode 100644
index af91ee22d4d..00000000000
--- a/app/assets/javascripts/discourse/app/controllers/user-card.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import Controller, { inject as controller } from "@ember/controller";
-import DiscourseURL, { groupPath, userPath } from "discourse/lib/url";
-
-export default Controller.extend({
-  topic: controller(),
-
-  actions: {
-    filterPosts(user) {
-      const topicController = this.topic;
-      topicController.send("filterParticipant", user);
-    },
-
-    showUser(user) {
-      DiscourseURL.routeTo(userPath(user.username_lower));
-    },
-
-    showGroup(group) {
-      DiscourseURL.routeTo(groupPath(group.name));
-    },
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/controllers/user-invited-show.js b/app/assets/javascripts/discourse/app/controllers/user-invited-show.js
index 14e8bc968f9..28ab7321568 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-invited-show.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-invited-show.js
@@ -11,9 +11,11 @@ import showModal from "discourse/lib/show-modal";
 import Invite from "discourse/models/invite";
 import I18n from "I18n";
 import { inject as service } from "@ember/service";
+import CreateInviteBulk from "discourse/components/modal/create-invite-bulk";
 
 export default Controller.extend({
   dialog: service(),
+  modal: service(),
   user: null,
   model: null,
   filter: null,
@@ -30,6 +32,10 @@ export default Controller.extend({
   },
 
   @observes("searchTerm")
+  searchTermChanged() {
+    this._searchTermChanged();
+  },
+
   @debounce(INPUT_DELAY)
   _searchTermChanged() {
     Invite.findInvitedBy(this.user, this.filter, this.searchTerm).then(
@@ -73,7 +79,7 @@ export default Controller.extend({
 
   @action
   createInviteCsv() {
-    showModal("create-invite-bulk");
+    this.modal.show(CreateInviteBulk);
   },
 
   @action
diff --git a/app/assets/javascripts/discourse/app/controllers/user-notifications.js b/app/assets/javascripts/discourse/app/controllers/user-notifications.js
index 3890d5a199d..044c710de7e 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-notifications.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-notifications.js
@@ -3,11 +3,13 @@ import getURL from "discourse-common/lib/get-url";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { ajax } from "discourse/lib/ajax";
-import showModal from "discourse/lib/show-modal";
 import I18n from "I18n";
 import { htmlSafe } from "@ember/template";
+import { inject as service } from "@ember/service";
+import DismissNotificationConfirmationModal from "discourse/components/modal/dismiss-notification-confirmation";
 
 export default Controller.extend({
+  modal: service(),
   application: controller(),
   queryParams: ["filter"],
   filter: "all",
@@ -49,27 +51,24 @@ export default Controller.extend({
     );
   },
 
-  markRead() {
-    return ajax("/notifications/mark-read", { type: "PUT" }).then(() => {
-      this.model.forEach((n) => n.set("read", true));
-    });
+  async markRead() {
+    await ajax("/notifications/mark-read", { type: "PUT" });
+    this.model.forEach((n) => n.set("read", true));
   },
 
   actions: {
     async resetNew() {
-      const unreadHighPriorityNotifications = this.currentUser.get(
-        "unread_high_priority_notifications"
-      );
-
-      if (unreadHighPriorityNotifications > 0) {
-        showModal("dismiss-notification-confirmation").setProperties({
-          confirmationMessage: I18n.t(
-            "notifications.dismiss_confirmation.body.default",
-            {
-              count: unreadHighPriorityNotifications,
-            }
-          ),
-          dismissNotifications: () => this.markRead(),
+      if (this.currentUser.unread_high_priority_notifications > 0) {
+        this.modal.show(DismissNotificationConfirmationModal, {
+          model: {
+            confirmationMessage: I18n.t(
+              "notifications.dismiss_confirmation.body.default",
+              {
+                count: this.currentUser.unread_high_priority_notifications,
+              }
+            ),
+            dismissNotifications: () => this.markRead(),
+          },
         });
       } else {
         this.markRead();
diff --git a/app/assets/javascripts/discourse/app/controllers/user-private-messages-group.js b/app/assets/javascripts/discourse/app/controllers/user-private-messages-group.js
index b648b3a7e87..edbcc89ecce 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-private-messages-group.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-private-messages-group.js
@@ -1,6 +1,6 @@
 import I18n from "I18n";
 import Controller, { inject as controller } from "@ember/controller";
-import { computed } from "@ember/object";
+import { action, computed } from "@ember/object";
 
 export default class extends Controller {
   @controller user;
@@ -11,7 +11,8 @@ export default class extends Controller {
 
   @computed(
     "pmTopicTrackingState.newIncoming.[]",
-    "pmTopicTrackingState.statesModificationCounter"
+    "pmTopicTrackingState.statesModificationCounter",
+    "pmTopicTrackingState.isTracking"
   )
   get newLinkText() {
     return this.#linkText("new");
@@ -19,16 +20,21 @@ export default class extends Controller {
 
   @computed(
     "pmTopicTrackingState.newIncoming.[]",
-    "pmTopicTrackingState.statesModificationCounter"
+    "pmTopicTrackingState.statesModificationCounter",
+    "pmTopicTrackingState.isTracking"
   )
   get unreadLinkText() {
     return this.#linkText("unread");
   }
 
+  get navigationControlsButton() {
+    return document.getElementById("navigation-controls__button");
+  }
+
   #linkText(type) {
     const count = this.pmTopicTrackingState?.lookupCount(type, {
       inboxFilter: "group",
-      groupName: this.groupName,
+      groupName: this.group.name,
     });
 
     if (count === 0) {
@@ -37,4 +43,9 @@ export default class extends Controller {
       return I18n.t(`user.messages.${type}_with_count`, { count });
     }
   }
+
+  @action
+  changeGroupNotificationLevel(notificationLevel) {
+    this.group.setNotification(notificationLevel, this.get("user.model.id"));
+  }
 }
diff --git a/app/assets/javascripts/discourse/app/controllers/user-private-messages-user.js b/app/assets/javascripts/discourse/app/controllers/user-private-messages-user.js
index 7669910017b..470cd0036b6 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-private-messages-user.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-private-messages-user.js
@@ -22,7 +22,8 @@ export default class extends Controller {
 
   @computed(
     "pmTopicTrackingState.newIncoming.[]",
-    "pmTopicTrackingState.statesModificationCounter"
+    "pmTopicTrackingState.statesModificationCounter",
+    "pmTopicTrackingState.isTracking"
   )
   get newLinkText() {
     return this.#linkText("new");
@@ -30,7 +31,8 @@ export default class extends Controller {
 
   @computed(
     "pmTopicTrackingState.newIncoming.[]",
-    "pmTopicTrackingState.statesModificationCounter"
+    "pmTopicTrackingState.statesModificationCounter",
+    "pmTopicTrackingState.isTracking"
   )
   get unreadLinkText() {
     return this.#linkText("unread");
diff --git a/app/assets/javascripts/discourse/app/controllers/user-private-messages.js b/app/assets/javascripts/discourse/app/controllers/user-private-messages.js
index 45c37747bd2..845184601ca 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-private-messages.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-private-messages.js
@@ -1,5 +1,5 @@
 import Controller, { inject as controller } from "@ember/controller";
-import { action, computed } from "@ember/object";
+import { action } from "@ember/object";
 import { inject as service } from "@ember/service";
 import { alias, and, equal, readOnly } from "@ember/object/computed";
 import { cached, tracked } from "@glimmer/tracking";
@@ -34,19 +34,23 @@ export default class extends Controller {
   @alias("group.name") groupFilter;
   @and("user.viewingSelf", "currentUser.can_send_private_messages") showNewPM;
   @equal("currentParentRouteName", "userPrivateMessages.group") isGroup;
-  @equal("currentParentRouteName", "userPrivateMessages.user") isPersonal;
   @readOnly("user.viewingSelf") viewingSelf;
-  @readOnly("router.currentRouteName") currentRouteName;
   @readOnly("router.currentRoute.parent.name") currentParentRouteName;
   @readOnly("site.can_tag_pms") pmTaggingEnabled;
 
   get messagesDropdownValue() {
     let value;
 
+    const currentURL = this.router.currentURL.toLowerCase();
+
     for (let i = this.messagesDropdownContent.length - 1; i >= 0; i--) {
       const row = this.messagesDropdownContent[i];
 
-      if (this.router.currentURL.includes(row.id)) {
+      if (
+        currentURL.includes(
+          row.id.toLowerCase().replace(this.router.rootURL, "/")
+        )
+      ) {
         value = row.id;
         break;
       }
@@ -57,9 +61,11 @@ export default class extends Controller {
 
   @cached
   get messagesDropdownContent() {
+    const usernameLower = this.model.username_lower;
+
     const content = [
       {
-        id: this.router.urlFor("userPrivateMessages.user", this.model.username),
+        id: this.router.urlFor("userPrivateMessages.user", usernameLower),
         name: I18n.t("user.messages.inbox"),
       },
     ];
@@ -68,7 +74,7 @@ export default class extends Controller {
       content.push({
         id: this.router.urlFor(
           "userPrivateMessages.group",
-          this.model.username,
+          usernameLower,
           group.name
         ),
         name: group.name,
@@ -78,7 +84,7 @@ export default class extends Controller {
 
     if (this.pmTaggingEnabled) {
       content.push({
-        id: this.router.urlFor("userPrivateMessages.tags", this.model.username),
+        id: this.router.urlFor("userPrivateMessages.tags", usernameLower),
         name: I18n.t("user.messages.tags"),
         icon: "tags",
       });
@@ -86,7 +92,7 @@ export default class extends Controller {
 
     customUserNavMessagesDropdownRows.forEach((row) => {
       content.push({
-        id: this.router.urlFor(row.routeName, this.model.username),
+        id: this.router.urlFor(row.routeName, usernameLower),
         name: row.name,
         icon: row.icon,
       });
@@ -95,39 +101,6 @@ export default class extends Controller {
     return content;
   }
 
-  @computed(
-    "pmTopicTrackingState.newIncoming.[]",
-    "pmTopicTrackingState.statesModificationCounter",
-    "group"
-  )
-  get newLinkText() {
-    return this.#linkText("new");
-  }
-
-  @computed(
-    "pmTopicTrackingState.newIncoming.[]",
-    "pmTopicTrackingState.statesModificationCounter",
-    "group"
-  )
-  get unreadLinkText() {
-    return this.#linkText("unread");
-  }
-
-  #linkText(type) {
-    const count = this.pmTopicTrackingState?.lookupCount(type) || 0;
-
-    if (count === 0) {
-      return I18n.t(`user.messages.${type}`);
-    } else {
-      return I18n.t(`user.messages.${type}_with_count`, { count });
-    }
-  }
-
-  @action
-  changeGroupNotificationLevel(notificationLevel) {
-    this.group.setNotification(notificationLevel, this.get("user.model.id"));
-  }
-
   @action
   onMessagesDropdownChange(item) {
     return DiscourseURL.routeTo(item);
diff --git a/app/assets/javascripts/discourse/app/controllers/user-topics-list.js b/app/assets/javascripts/discourse/app/controllers/user-topics-list.js
index a40ab97f4e9..ecee3f764b9 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-topics-list.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-topics-list.js
@@ -25,10 +25,6 @@ export default Controller.extend(BulkTopicSelection, {
     return topicsLength === 0 && incomingCount === 0;
   },
 
-  saveScrollPosition() {
-    this.session.set("topicListScrollPosition", $(window).scrollTop());
-  },
-
   @observes("model.canLoadMore")
   _showFooter() {
     this.set("application.showFooter", !this.get("model.canLoadMore"));
diff --git a/app/assets/javascripts/discourse/app/controllers/user.js b/app/assets/javascripts/discourse/app/controllers/user.js
index c46e2c34868..237a264265d 100644
--- a/app/assets/javascripts/discourse/app/controllers/user.js
+++ b/app/assets/javascripts/discourse/app/controllers/user.js
@@ -68,6 +68,8 @@ export default Controller.extend(CanCheckEmails, {
     };
   }),
 
+  isTrustLevelZero: equal("model.trust_level", 0),
+  hasTrustLevel: or("isTrustLevelZero", "model.trust_level"),
   showStaffCounters: or(
     "hasGivenFlags",
     "hasFlaggedPosts",
@@ -194,11 +196,8 @@ export default Controller.extend(CanCheckEmails, {
     if (!this.currentUser?.staff) {
       return false;
     }
-    if (this.currentUser?.redesigned_user_page_nav_enabled) {
-      return this.site.desktopView;
-    } else {
-      return true;
-    }
+
+    return this.site.desktopView;
   },
 
   @action
diff --git a/app/assets/javascripts/discourse/app/global-compat.js b/app/assets/javascripts/discourse/app/global-compat.js
new file mode 100644
index 00000000000..97270c55b71
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/global-compat.js
@@ -0,0 +1,7 @@
+import virtualDom from "virtual-dom";
+import widgetHelpers from "discourse-widget-hbs/helpers";
+
+window.__widget_helpers = widgetHelpers;
+
+// TODO: Eliminate this global
+window.virtualDom = virtualDom;
diff --git a/app/assets/javascripts/discourse/app/helpers/application.js b/app/assets/javascripts/discourse/app/helpers/application.js
index 629a20648af..d3392c99f96 100644
--- a/app/assets/javascripts/discourse/app/helpers/application.js
+++ b/app/assets/javascripts/discourse/app/helpers/application.js
@@ -10,8 +10,14 @@ import { registerUnbound } from "discourse-common/lib/helpers";
 
 registerUnbound("raw-date", (dt) => htmlSafe(longDate(new Date(dt))));
 
-registerUnbound("age-with-tooltip", (dt) =>
-  htmlSafe(autoUpdatingRelativeAge(new Date(dt), { title: true }))
+registerUnbound("age-with-tooltip", (dt, params) =>
+  htmlSafe(
+    autoUpdatingRelativeAge(new Date(dt), {
+      title: true,
+      addAgo: params.addAgo || false,
+      ...(params.defaultFormat && { defaultFormat: params.defaultFormat }),
+    })
+  )
 );
 
 registerUnbound("number", (orig, params) => {
diff --git a/app/assets/javascripts/discourse/app/helpers/border-color.js b/app/assets/javascripts/discourse/app/helpers/border-color.js
index 7272a76586d..546c55a5468 100644
--- a/app/assets/javascripts/discourse/app/helpers/border-color.js
+++ b/app/assets/javascripts/discourse/app/helpers/border-color.js
@@ -1,3 +1,12 @@
-import { htmlHelper } from "discourse-common/lib/helpers";
+import { htmlSafe } from "@ember/template";
 
-export default htmlHelper((color) => `border-color: #${color}; `);
+const validDirections = ["top", "right", "bottom", "left"];
+
+export default function borderColor(color, direction) {
+  const borderProperty =
+    direction && validDirections.includes(direction)
+      ? `border-${direction}-color`
+      : "border-color";
+
+  return htmlSafe(`${borderProperty}: #${color} `);
+}
diff --git a/app/assets/javascripts/discourse/app/helpers/bound-avatar-template.js b/app/assets/javascripts/discourse/app/helpers/bound-avatar-template.js
index 8e054d8ce50..0117673a357 100644
--- a/app/assets/javascripts/discourse/app/helpers/bound-avatar-template.js
+++ b/app/assets/javascripts/discourse/app/helpers/bound-avatar-template.js
@@ -1,11 +1,11 @@
-import { avatarImg } from "discourse/lib/utilities";
-import { htmlHelper } from "discourse-common/lib/helpers";
+import { htmlSafe } from "@ember/template";
+import { avatarImg } from "discourse-common/lib/avatar-utils";
 import { isEmpty } from "@ember/utils";
 
-export default htmlHelper((avatarTemplate, size) => {
+export default function boundAvatarTemplate(avatarTemplate, size) {
   if (isEmpty(avatarTemplate)) {
-    return "<div class='avatar-placeholder'></div>";
+    return htmlSafe("<div class='avatar-placeholder'></div>");
   } else {
-    return avatarImg({ size, avatarTemplate });
+    return htmlSafe(avatarImg({ size, avatarTemplate }));
   }
-});
+}
diff --git a/app/assets/javascripts/discourse/app/helpers/bound-avatar.js b/app/assets/javascripts/discourse/app/helpers/bound-avatar.js
index 627ca000176..838363a770e 100644
--- a/app/assets/javascripts/discourse/app/helpers/bound-avatar.js
+++ b/app/assets/javascripts/discourse/app/helpers/bound-avatar.js
@@ -1,14 +1,16 @@
+import { htmlSafe } from "@ember/template";
 import { addExtraUserClasses } from "discourse/helpers/user-avatar";
-import { avatarImg } from "discourse/lib/utilities";
-import { get } from "@ember/object";
-import { htmlHelper } from "discourse-common/lib/helpers";
+import { avatarImg } from "discourse-common/lib/avatar-utils";
 import { isEmpty } from "@ember/utils";
 
-export default htmlHelper((user, size) => {
+export default function boundAvatar(user, size) {
   if (isEmpty(user)) {
-    return "<div class='avatar-placeholder'></div>";
+    return htmlSafe("<div class='avatar-placeholder'></div>");
   }
 
-  const avatarTemplate = get(user, "avatar_template");
-  return avatarImg(addExtraUserClasses(user, { size, avatarTemplate }));
-});
+  return htmlSafe(
+    avatarImg(
+      addExtraUserClasses(user, { size, avatarTemplate: user.avatar_template })
+    )
+  );
+}
diff --git a/app/assets/javascripts/discourse/app/helpers/bound-category-link.js b/app/assets/javascripts/discourse/app/helpers/bound-category-link.js
index bd620032219..84f4f81dbd7 100644
--- a/app/assets/javascripts/discourse/app/helpers/bound-category-link.js
+++ b/app/assets/javascripts/discourse/app/helpers/bound-category-link.js
@@ -1,4 +1 @@
-import { categoryLinkHTML } from "discourse/helpers/category-link";
-import { htmlHelper } from "discourse-common/lib/helpers";
-
-export default htmlHelper(categoryLinkHTML);
+export { categoryLinkHTML as default } from "discourse/helpers/category-link";
diff --git a/app/assets/javascripts/discourse/app/helpers/bound-date.js b/app/assets/javascripts/discourse/app/helpers/bound-date.js
index 160de4defd6..62982881370 100644
--- a/app/assets/javascripts/discourse/app/helpers/bound-date.js
+++ b/app/assets/javascripts/discourse/app/helpers/bound-date.js
@@ -1,6 +1,11 @@
+import { htmlSafe } from "@ember/template";
 import { autoUpdatingRelativeAge } from "discourse/lib/formatter";
-import { htmlHelper } from "discourse-common/lib/helpers";
 
-export default htmlHelper((dt) =>
-  autoUpdatingRelativeAge(new Date(dt), { format: "medium", title: true })
-);
+export default function boundDate(dt) {
+  return htmlSafe(
+    autoUpdatingRelativeAge(new Date(dt), {
+      format: "medium",
+      title: true,
+    })
+  );
+}
diff --git a/app/assets/javascripts/discourse/app/helpers/capitalize-string.js b/app/assets/javascripts/discourse/app/helpers/capitalize-string.js
index 02a9e587e9e..c2ead87b761 100644
--- a/app/assets/javascripts/discourse/app/helpers/capitalize-string.js
+++ b/app/assets/javascripts/discourse/app/helpers/capitalize-string.js
@@ -1,3 +1,9 @@
-import { htmlHelper } from "discourse-common/lib/helpers";
+import deprecated from "discourse-common/lib/deprecated";
 
-export default htmlHelper((str) => str[0].toUpperCase() + str.slice(1));
+export default function capitalizeString(str) {
+  deprecated("capitalize-string helper is deprecated", {
+    id: "discourse.capitalize-string",
+    since: "3.1.0.beta6",
+  });
+  return str[0].toUpperCase() + str.slice(1);
+}
diff --git a/app/assets/javascripts/discourse/app/helpers/category-color-variable.js b/app/assets/javascripts/discourse/app/helpers/category-color-variable.js
index 4ad1cdcea79..05831521ad4 100644
--- a/app/assets/javascripts/discourse/app/helpers/category-color-variable.js
+++ b/app/assets/javascripts/discourse/app/helpers/category-color-variable.js
@@ -1,3 +1,5 @@
-import { htmlHelper } from "discourse-common/lib/helpers";
+import { htmlSafe } from "@ember/template";
 
-export default htmlHelper((color) => `--category-color: #${color};`);
+export default function categoryColorVariable(color) {
+  return htmlSafe(`--category-color: #${color};`);
+}
diff --git a/app/assets/javascripts/discourse/app/helpers/concat-class.js b/app/assets/javascripts/discourse/app/helpers/concat-class.js
index d8c91ec6a2b..fd0979b295c 100644
--- a/app/assets/javascripts/discourse/app/helpers/concat-class.js
+++ b/app/assets/javascripts/discourse/app/helpers/concat-class.js
@@ -1,8 +1,7 @@
-import { helper } from "@ember/component/helper";
-
-function concatClass(args) {
+export default function concatClass(...args) {
   const classes = args.compact().join(" ");
-  return classes.length ? classes : undefined;
-}
 
-export default helper(concatClass);
+  if (classes.length) {
+    return classes;
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/helpers/dash-if-empty.js b/app/assets/javascripts/discourse/app/helpers/dash-if-empty.js
index 502998ee877..645f778cc91 100644
--- a/app/assets/javascripts/discourse/app/helpers/dash-if-empty.js
+++ b/app/assets/javascripts/discourse/app/helpers/dash-if-empty.js
@@ -1,4 +1,6 @@
-import { htmlHelper } from "discourse-common/lib/helpers";
+import { htmlSafe } from "@ember/template";
 import { isEmpty } from "@ember/utils";
 
-export default htmlHelper((str) => (isEmpty(str) ? "&mdash;" : str));
+export default function dashIfEmpty(str) {
+  return isEmpty(str) ? htmlSafe("&mdash;") : str;
+}
diff --git a/app/assets/javascripts/discourse/app/helpers/dasherize.js b/app/assets/javascripts/discourse/app/helpers/dasherize.js
index ed8936763dd..02ec8926abe 100644
--- a/app/assets/javascripts/discourse/app/helpers/dasherize.js
+++ b/app/assets/javascripts/discourse/app/helpers/dasherize.js
@@ -1,8 +1,5 @@
-import Helper from "@ember/component/helper";
 import { dasherize as emberDasherize } from "@ember/string";
 
-function dasherize([value]) {
-  return emberDasherize((value || "").replace(".", "-"));
+export default function dasherize(value = "") {
+  return emberDasherize(value.replace(".", "-"));
 }
-
-export default Helper.helper(dasherize);
diff --git a/app/assets/javascripts/discourse/app/helpers/directory-item-helpers.js b/app/assets/javascripts/discourse/app/helpers/directory-item-helpers.js
index 29339de185a..41ab101dcc2 100644
--- a/app/assets/javascripts/discourse/app/helpers/directory-item-helpers.js
+++ b/app/assets/javascripts/discourse/app/helpers/directory-item-helpers.js
@@ -3,7 +3,7 @@ import { number } from "discourse/lib/formatter";
 import { registerUnbound } from "discourse-common/lib/helpers";
 import I18n from "I18n";
 
-registerUnbound("mobile-directory-item-label", function (args) {
+registerUnbound("directory-item-label", function (args) {
   // Args should include key/values { item, column }
   const count = args.item.get(args.column.name);
   const translationPrefix =
@@ -14,7 +14,9 @@ registerUnbound("mobile-directory-item-label", function (args) {
 registerUnbound("directory-item-value", function (args) {
   // Args should include key/values { item, column }
   return htmlSafe(
-    `<span class='number'>${number(args.item.get(args.column.name))}</span>`
+    `<span class='directory-table__value'>${number(
+      args.item.get(args.column.name)
+    )}</span>`
   );
 });
 
@@ -25,7 +27,9 @@ registerUnbound("directory-item-user-field-value", function (args) {
       ? args.item.user.user_fields[args.column.user_field_id]
       : null;
   const content = value || "-";
-  return htmlSafe(`<span class='user-field-value'>${content}</span>`);
+  return htmlSafe(
+    `<span class='directory-table__value--user-field'>${content}</span>`
+  );
 });
 
 registerUnbound("directory-column-is-automatic", function (args) {
diff --git a/app/assets/javascripts/discourse/app/helpers/editable-value.js b/app/assets/javascripts/discourse/app/helpers/editable-value.js
index 32763daaf49..fe60d35ddb3 100644
--- a/app/assets/javascripts/discourse/app/helpers/editable-value.js
+++ b/app/assets/javascripts/discourse/app/helpers/editable-value.js
@@ -1,20 +1,17 @@
-import Helper from "@ember/component/helper";
 import { get } from "@ember/object";
 
-export function formatCurrency([reviewable, fieldId]) {
+export default function editableValue(reviewable, fieldId) {
   // The field `category_id` corresponds to `category`
   if (fieldId === "category_id") {
     fieldId = "category.id";
   }
 
-  let value = get(reviewable, fieldId);
+  const value = get(reviewable, fieldId);
 
   // If it's an array, say tags, make a copy so we aren't mutating the original
   if (Array.isArray(value)) {
-    value = value.slice(0);
+    return value.slice(0);
   }
 
   return value;
 }
-
-export default Helper.helper(formatCurrency);
diff --git a/app/assets/javascripts/discourse/app/helpers/format-date.js b/app/assets/javascripts/discourse/app/helpers/format-date.js
index 5cc5f6ca017..0f41327a016 100644
--- a/app/assets/javascripts/discourse/app/helpers/format-date.js
+++ b/app/assets/javascripts/discourse/app/helpers/format-date.js
@@ -28,6 +28,7 @@ registerUnbound("format-date", function (val, params) {
         format,
         title,
         leaveAgo,
+        prefix: params.prefix,
       })
     );
   }
diff --git a/app/assets/javascripts/discourse/app/helpers/icon-or-image.js b/app/assets/javascripts/discourse/app/helpers/icon-or-image.js
index 3ad6d53604a..a8c69991967 100644
--- a/app/assets/javascripts/discourse/app/helpers/icon-or-image.js
+++ b/app/assets/javascripts/discourse/app/helpers/icon-or-image.js
@@ -1,16 +1,15 @@
 import { convertIconClass, iconHTML } from "discourse-common/lib/icon-library";
-import { htmlHelper } from "discourse-common/lib/helpers";
 import { isEmpty } from "@ember/utils";
+import { htmlSafe } from "@ember/template";
 
-export default htmlHelper(function ({ icon, image }) {
+export default function iconOrImage({ icon, image }) {
   if (!isEmpty(image)) {
-    return `<img src='${image}'>`;
+    return htmlSafe(`<img src='${image}'>`);
   }
 
   if (isEmpty(icon)) {
     return "";
   }
 
-  icon = convertIconClass(icon);
-  return iconHTML(icon);
-});
+  return htmlSafe(iconHTML(convertIconClass(icon)));
+}
diff --git a/app/assets/javascripts/discourse/app/helpers/inline-date.js b/app/assets/javascripts/discourse/app/helpers/inline-date.js
index 166ca2ad224..be93dc7c37a 100644
--- a/app/assets/javascripts/discourse/app/helpers/inline-date.js
+++ b/app/assets/javascripts/discourse/app/helpers/inline-date.js
@@ -1,10 +1,14 @@
-import { registerHelper } from "discourse-common/lib/helpers";
+import deprecated from "discourse-common/lib/deprecated";
 import { relativeAge } from "discourse/lib/formatter";
 
-registerHelper("inline-date", function ([dt]) {
-  // TODO: Remove this in 1.13 or greater
+export default function inlineDate(dt) {
+  deprecated("inline-date helper is deprecated", {
+    id: "discourse.inline-date",
+    since: "3.1.0.beta6",
+  });
+
   if (dt.value) {
     dt = dt.value();
   }
   return relativeAge(new Date(dt));
-});
+}
diff --git a/app/assets/javascripts/discourse/app/helpers/loading-spinner.js b/app/assets/javascripts/discourse/app/helpers/loading-spinner.js
index 5188c619905..1a751523a26 100644
--- a/app/assets/javascripts/discourse/app/helpers/loading-spinner.js
+++ b/app/assets/javascripts/discourse/app/helpers/loading-spinner.js
@@ -1,17 +1,15 @@
-import { htmlHelper } from "discourse-common/lib/helpers";
+import { htmlSafe } from "@ember/template";
 
-function renderSpinner(cssClass) {
+export function renderSpinner(cssClass) {
   let html = "<div class='spinner";
   if (cssClass) {
     html += " " + cssClass;
   }
   return html + "'></div>";
 }
-let spinnerHTML = renderSpinner();
 
-export default htmlHelper((params) => {
-  const hash = params.hash;
-  return renderSpinner(hash && hash.size ? hash.size : undefined);
-});
+export const spinnerHTML = renderSpinner();
 
-export { spinnerHTML, renderSpinner };
+export default function loadingSpinner({ size } = {}) {
+  return htmlSafe(renderSpinner(size));
+}
diff --git a/app/assets/javascripts/discourse/app/helpers/period-title.js b/app/assets/javascripts/discourse/app/helpers/period-title.js
index 090f7cacd3e..9bb6dfcba8d 100644
--- a/app/assets/javascripts/discourse/app/helpers/period-title.js
+++ b/app/assets/javascripts/discourse/app/helpers/period-title.js
@@ -1,5 +1,5 @@
 import I18n from "I18n";
-import { htmlHelper } from "discourse-common/lib/helpers";
+import { htmlSafe } from "@ember/template";
 
 const TITLE_SUBS = {
   all: "all_time",
@@ -9,68 +9,69 @@ const TITLE_SUBS = {
   daily: "today",
 };
 
-export default htmlHelper((period, options) => {
+export default function periodTitle(period, { showDateRange, fullDay } = {}) {
   const title = I18n.t("filters.top." + (TITLE_SUBS[period] || "this_week"));
-  if (options.hash.showDateRange) {
-    let dateString = "";
-    let finish;
 
-    if (options.hash.fullDay) {
-      finish = moment().utc().subtract(1, "days");
-    } else {
-      finish = moment();
-    }
-
-    switch (period) {
-      case "yearly":
-        dateString =
-          finish
-            .clone()
-            .subtract(1, "year")
-            .format(I18n.t("dates.long_with_year_no_time")) +
-          " - " +
-          finish.format(I18n.t("dates.long_with_year_no_time"));
-        break;
-      case "quarterly":
-        dateString =
-          finish
-            .clone()
-            .subtract(3, "month")
-            .format(I18n.t("dates.long_no_year_no_time")) +
-          " - " +
-          finish.format(I18n.t("dates.long_no_year_no_time"));
-        break;
-      case "weekly":
-        let start;
-        if (options.hash.fullDay) {
-          start = finish.clone().subtract(1, "week");
-        } else {
-          start = finish.clone().subtract(6, "days");
-        }
-
-        dateString =
-          start.format(I18n.t("dates.long_no_year_no_time")) +
-          " - " +
-          finish.format(I18n.t("dates.long_no_year_no_time"));
-        break;
-      case "monthly":
-        dateString =
-          finish
-            .clone()
-            .subtract(1, "month")
-            .format(I18n.t("dates.long_no_year_no_time")) +
-          " - " +
-          finish.format(I18n.t("dates.long_no_year_no_time"));
-        break;
-      case "daily":
-        dateString = finish
-          .clone()
-          .format(I18n.t("dates.full_no_year_no_time"));
-        break;
-    }
-
-    return `<span class="date-section">${title}</span><span class='top-date-string'>${dateString}</span>`;
-  } else {
-    return title;
+  if (!showDateRange) {
+    return htmlSafe(title);
   }
-});
+
+  let dateString = "";
+  let finish;
+
+  if (fullDay) {
+    finish = moment().utc().subtract(1, "days");
+  } else {
+    finish = moment();
+  }
+
+  switch (period) {
+    case "yearly":
+      dateString =
+        finish
+          .clone()
+          .subtract(1, "year")
+          .format(I18n.t("dates.long_with_year_no_time")) +
+        " – " +
+        finish.format(I18n.t("dates.long_with_year_no_time"));
+      break;
+    case "quarterly":
+      dateString =
+        finish
+          .clone()
+          .subtract(3, "month")
+          .format(I18n.t("dates.long_no_year_no_time")) +
+        " – " +
+        finish.format(I18n.t("dates.long_no_year_no_time"));
+      break;
+    case "weekly":
+      let start;
+      if (fullDay) {
+        start = finish.clone().subtract(1, "week");
+      } else {
+        start = finish.clone().subtract(6, "days");
+      }
+
+      dateString =
+        start.format(I18n.t("dates.long_no_year_no_time")) +
+        " – " +
+        finish.format(I18n.t("dates.long_no_year_no_time"));
+      break;
+    case "monthly":
+      dateString =
+        finish
+          .clone()
+          .subtract(1, "month")
+          .format(I18n.t("dates.long_no_year_no_time")) +
+        " – " +
+        finish.format(I18n.t("dates.long_no_year_no_time"));
+      break;
+    case "daily":
+      dateString = finish.clone().format(I18n.t("dates.full_no_year_no_time"));
+      break;
+  }
+
+  return htmlSafe(
+    `<span class="date-section">${title}</span><span class='top-date-string'>${dateString}</span>`
+  );
+}
diff --git a/app/assets/javascripts/discourse/app/helpers/replace-emoji.js b/app/assets/javascripts/discourse/app/helpers/replace-emoji.js
index 3109cf29003..81d78a3a1f4 100644
--- a/app/assets/javascripts/discourse/app/helpers/replace-emoji.js
+++ b/app/assets/javascripts/discourse/app/helpers/replace-emoji.js
@@ -1,7 +1,9 @@
 import { emojiUnescape } from "discourse/lib/text";
-import { htmlSafe } from "@ember/template";
+import { htmlSafe, isHTMLSafe } from "@ember/template";
 import { registerUnbound } from "discourse-common/lib/helpers";
+import { escapeExpression } from "discourse/lib/utilities";
 
 registerUnbound("replace-emoji", (text, options) => {
+  text = isHTMLSafe(text) ? text.toString() : escapeExpression(text);
   return htmlSafe(emojiUnescape(text, options));
 });
diff --git a/app/assets/javascripts/discourse/app/helpers/reviewable-history-description.js b/app/assets/javascripts/discourse/app/helpers/reviewable-history-description.js
index 0bd3e1aa819..16fe1ff1a43 100644
--- a/app/assets/javascripts/discourse/app/helpers/reviewable-history-description.js
+++ b/app/assets/javascripts/discourse/app/helpers/reviewable-history-description.js
@@ -1,14 +1,16 @@
 import { EDITED } from "discourse/models/reviewable-history";
 import I18n from "I18n";
-import { htmlHelper } from "discourse-common/lib/helpers";
 import { htmlStatus } from "discourse/helpers/reviewable-status";
 import { iconHTML } from "discourse-common/lib/icon-library";
+import { htmlSafe } from "@ember/template";
 
-export default htmlHelper(function (rh) {
+export default function reviewableHistoryDescription(rh) {
   switch (rh.reviewable_history_type) {
     case EDITED:
-      return iconHTML("pencil-alt") + " " + I18n.t("review.history.edited");
+      return htmlSafe(
+        iconHTML("pencil-alt") + " " + I18n.t("review.history.edited")
+      );
     default:
-      return htmlStatus(rh.status);
+      return htmlSafe(htmlStatus(rh.status));
   }
-});
+}
diff --git a/app/assets/javascripts/discourse/app/helpers/reviewable-status.js b/app/assets/javascripts/discourse/app/helpers/reviewable-status.js
index 4fe4ef2445e..f36a0e75095 100644
--- a/app/assets/javascripts/discourse/app/helpers/reviewable-status.js
+++ b/app/assets/javascripts/discourse/app/helpers/reviewable-status.js
@@ -6,26 +6,67 @@ import {
   REJECTED,
 } from "discourse/models/reviewable";
 import I18n from "I18n";
-import { htmlHelper } from "discourse-common/lib/helpers";
 import { iconHTML } from "discourse-common/lib/icon-library";
+import { htmlSafe } from "@ember/template";
 
-function dataFor(status) {
+function dataFor(status, type) {
   switch (status) {
     case PENDING:
       return { name: "pending" };
     case APPROVED:
-      return { icon: "check", name: "approved" };
+      switch (type) {
+        case "ReviewableQueuedPost":
+          return {
+            icon: "check",
+            name: "approved_post",
+            cssClass: "approved",
+          };
+        case "ReviewableUser":
+          return {
+            icon: "check",
+            name: "approved_user",
+            cssClass: "approved",
+          };
+        default:
+          return {
+            icon: "check",
+            name: "approved_flag",
+            cssClass: "approved",
+          };
+      }
     case REJECTED:
-      return { icon: "times", name: "rejected" };
+      switch (type) {
+        case "ReviewableQueuedPost":
+          return {
+            icon: "times",
+            name: "rejected_post",
+            cssClass: "rejected",
+          };
+        case "ReviewableUser":
+          return {
+            icon: "times",
+            name: "rejected_user",
+            cssClass: "rejected",
+          };
+        default:
+          return {
+            icon: "times",
+            name: "rejected_flag",
+            cssClass: "rejected",
+          };
+      }
     case IGNORED:
-      return { icon: "external-link-alt", name: "ignored" };
+      return {
+        icon: "external-link-alt",
+        name: "ignored",
+      };
     case DELETED:
       return { icon: "trash-alt", name: "deleted" };
   }
 }
 
-export function htmlStatus(status) {
-  let data = dataFor(status);
+export function htmlStatus(status, type) {
+  let data = dataFor(status, type);
   if (!data) {
     return;
   }
@@ -33,15 +74,13 @@ export function htmlStatus(status) {
   let icon = data.icon ? iconHTML(data.icon) : "";
 
   return `
-    <span class='status'>
-      <span class="${data.name}">
-        ${icon}
-        ${I18n.t("review.statuses." + data.name + ".title")}
-      </span>
+    <span class="${data.cssClass || data.name}">
+      ${icon}
+      ${I18n.t("review.statuses." + data.name + ".title")}
     </span>
   `;
 }
 
-export default htmlHelper((status) => {
-  return htmlStatus(status);
-});
+export default function (status, type) {
+  return htmlSafe(htmlStatus(status, type));
+}
diff --git a/app/assets/javascripts/discourse/app/helpers/user-avatar.js b/app/assets/javascripts/discourse/app/helpers/user-avatar.js
index 1b63bdf5d14..33736300ee5 100644
--- a/app/assets/javascripts/discourse/app/helpers/user-avatar.js
+++ b/app/assets/javascripts/discourse/app/helpers/user-avatar.js
@@ -1,4 +1,5 @@
-import { avatarImg, formatUsername } from "discourse/lib/utilities";
+import { formatUsername } from "discourse/lib/utilities";
+import { avatarImg } from "discourse-common/lib/avatar-utils";
 import I18n from "I18n";
 import { get } from "@ember/object";
 import { htmlSafe } from "@ember/template";
diff --git a/app/assets/javascripts/discourse/app/helpers/user-status.js b/app/assets/javascripts/discourse/app/helpers/user-status.js
index da2f3bd7d24..52809f8c0d8 100644
--- a/app/assets/javascripts/discourse/app/helpers/user-status.js
+++ b/app/assets/javascripts/discourse/app/helpers/user-status.js
@@ -1,27 +1,28 @@
 import I18n from "I18n";
 import { escapeExpression } from "discourse/lib/utilities";
-import { htmlHelper } from "discourse-common/lib/helpers";
 import { iconHTML } from "discourse-common/lib/icon-library";
+import { htmlSafe } from "@ember/template";
 
-export default htmlHelper((user, args) => {
+export default function userStatus(user, { currentUser } = {}) {
   if (!user) {
     return;
   }
 
-  const name = escapeExpression(user.get("name"));
-  let currentUser;
-  if (args && args.hash) {
-    currentUser = args.hash.currentUser;
+  const name = escapeExpression(user.name);
+
+  if (user.admin && currentUser?.staff) {
+    return htmlSafe(
+      iconHTML("shield-alt", {
+        label: I18n.t("user.admin", { user: name }),
+      })
+    );
   }
 
-  if (currentUser && user.get("admin") && currentUser.get("staff")) {
-    return iconHTML("shield-alt", {
-      label: I18n.t("user.admin", { user: name }),
-    });
+  if (user.moderator) {
+    return htmlSafe(
+      iconHTML("shield-alt", {
+        label: I18n.t("user.moderator", { user: name }),
+      })
+    );
   }
-  if (user.get("moderator")) {
-    return iconHTML("shield-alt", {
-      label: I18n.t("user.moderator", { user: name }),
-    });
-  }
-});
+}
diff --git a/app/assets/javascripts/discourse/app/index.html b/app/assets/javascripts/discourse/app/index.html
index 1014dd1de7b..5ba9b1d2455 100644
--- a/app/assets/javascripts/discourse/app/index.html
+++ b/app/assets/javascripts/discourse/app/index.html
@@ -9,7 +9,6 @@
       that JS assets continue to be re-compiled when changes are made.
     -->
     <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>Discourse - Ember CLI</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, user-scalable=yes, viewport-fit=cover">
@@ -20,6 +19,9 @@
     <bootstrap-content key="discourse-preload-stylesheets">
     {{content-for "discourse-preload-stylesheets"}}
 
+    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css" />
+    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/discourse.css" />
+
     <script defer src="{{rootURL}}assets/vendor.js"></script>
     <script defer src="{{rootURL}}assets/discourse.js"></script>
 
diff --git a/app/assets/javascripts/discourse/app/initializers/badging.js b/app/assets/javascripts/discourse/app/initializers/badging.js
deleted file mode 100644
index 38f6db84ade..00000000000
--- a/app/assets/javascripts/discourse/app/initializers/badging.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Updates the PWA badging if available
-export default {
-  name: "badging",
-  after: "message-bus",
-
-  initialize(container) {
-    if (!navigator.setAppBadge) {
-      return;
-    } // must have the Badging API
-
-    const user = container.lookup("service:current-user");
-    if (!user) {
-      return;
-    } // must be logged in
-
-    const appEvents = container.lookup("service:app-events");
-    appEvents.on("notifications:changed", () => {
-      let notifications;
-      if (user.redesigned_user_menu_enabled) {
-        notifications = user.all_unread_notifications_count;
-        if (user.unseen_reviewable_count) {
-          notifications += user.unseen_reviewable_count;
-        }
-      } else {
-        notifications =
-          user.unread_notifications + user.unread_high_priority_notifications;
-      }
-
-      navigator.setAppBadge(notifications);
-    });
-  },
-};
diff --git a/app/assets/javascripts/discourse/app/initializers/colocated-template-overrides.js b/app/assets/javascripts/discourse/app/initializers/colocated-template-overrides.js
deleted file mode 100644
index 0aed290e533..00000000000
--- a/app/assets/javascripts/discourse/app/initializers/colocated-template-overrides.js
+++ /dev/null
@@ -1,58 +0,0 @@
-import DiscourseTemplateMap from "discourse-common/lib/discourse-template-map";
-import * as GlimmerManager from "@glimmer/manager";
-
-const COLOCATED_TEMPLATE_OVERRIDES = new Map();
-
-// This patch is not ideal, but Ember does not allow us to change a component template after initial association
-// https://github.com/glimmerjs/glimmer-vm/blob/03a4b55c03/packages/%40glimmer/manager/lib/public/template.ts#L14-L20
-const originalGetTemplate = GlimmerManager.getComponentTemplate;
-GlimmerManager.getComponentTemplate = (component) => {
-  return (
-    COLOCATED_TEMPLATE_OVERRIDES.get(component) ??
-    originalGetTemplate(component)
-  );
-};
-
-export default {
-  name: "colocated-template-overrides",
-  after: "populate-template-map",
-
-  initialize(container) {
-    this.eachThemePluginTemplate((templateKey, moduleNames) => {
-      if (!templateKey.startsWith("components/")) {
-        return;
-      }
-
-      if (DiscourseTemplateMap.coreTemplates.has(templateKey)) {
-        // It's a non-colocated core component. Template will be overridden at runtime.
-        return;
-      }
-
-      const componentName = templateKey.slice("components/".length);
-      const component = container.owner.resolveRegistration(
-        `component:${componentName}`
-      );
-
-      if (component && originalGetTemplate(component)) {
-        const finalOverrideModuleName = moduleNames[moduleNames.length - 1];
-        const overrideTemplate = require(finalOverrideModuleName).default;
-
-        COLOCATED_TEMPLATE_OVERRIDES.set(component, overrideTemplate);
-      }
-    });
-  },
-
-  eachThemePluginTemplate(cb) {
-    for (const [key, value] of DiscourseTemplateMap.pluginTemplates) {
-      cb(key, value);
-    }
-
-    for (const [key, value] of DiscourseTemplateMap.themeTemplates) {
-      cb(key, value);
-    }
-  },
-
-  teardown() {
-    COLOCATED_TEMPLATE_OVERRIDES.clear();
-  },
-};
diff --git a/app/assets/javascripts/discourse/app/pre-initializers/discourse-bootstrap.js b/app/assets/javascripts/discourse/app/initializers/discourse-bootstrap.js
similarity index 96%
rename from app/assets/javascripts/discourse/app/pre-initializers/discourse-bootstrap.js
rename to app/assets/javascripts/discourse/app/initializers/discourse-bootstrap.js
index 746708b435a..d799ab63383 100644
--- a/app/assets/javascripts/discourse/app/pre-initializers/discourse-bootstrap.js
+++ b/app/assets/javascripts/discourse/app/initializers/discourse-bootstrap.js
@@ -16,16 +16,14 @@ import runloop from "@ember/runloop";
 import { DEBUG } from "@glimmer/env";
 
 export default {
-  name: "discourse-bootstrap",
-
   // The very first initializer to run
-  initialize(container) {
+  initialize(app) {
     if (DEBUG) {
       runloop._backburner.ASYNC_STACKS = true;
     }
 
-    setURLContainer(container);
-    setDefaultOwner(container);
+    setURLContainer(app.__container__);
+    setDefaultOwner(app.__container__);
 
     // Our test environment has its own bootstrap code
     if (isTesting()) {
diff --git a/app/assets/javascripts/discourse/app/pre-initializers/dynamic-route-builders.js b/app/assets/javascripts/discourse/app/initializers/dynamic-route-builders.js
similarity index 95%
rename from app/assets/javascripts/discourse/app/pre-initializers/dynamic-route-builders.js
rename to app/assets/javascripts/discourse/app/initializers/dynamic-route-builders.js
index b5b91a832cd..356f7ca67f7 100644
--- a/app/assets/javascripts/discourse/app/pre-initializers/dynamic-route-builders.js
+++ b/app/assets/javascripts/discourse/app/initializers/dynamic-route-builders.js
@@ -4,12 +4,12 @@ import TagShowRoute from "discourse/routes/tag-show";
 import User from "discourse/models/user";
 import buildCategoryRoute from "discourse/routes/build-category-route";
 import buildTopicRoute from "discourse/routes/build-topic-route";
+import { dasherize } from "@ember/string";
 
 export default {
   after: "inject-discourse-objects",
-  name: "dynamic-route-builders",
 
-  initialize(registry, app) {
+  initialize(app) {
     app.register(
       "controller:discovery.category",
       DiscoverySortableController.extend()
@@ -39,7 +39,7 @@ export default {
 
     const site = Site.current();
     site.get("filters").forEach((filter) => {
-      const filterDasherized = filter.dasherize();
+      const filterDasherized = dasherize(filter);
       app.register(
         `controller:discovery.${filterDasherized}`,
         DiscoverySortableController.extend()
@@ -106,7 +106,7 @@ export default {
     );
 
     site.get("filters").forEach(function (filter) {
-      const filterDasherized = filter.dasherize();
+      const filterDasherized = dasherize(filter);
 
       app.register(
         `route:tag.show-${filterDasherized}`,
diff --git a/app/assets/javascripts/discourse/app/initializers/edit-notification-clicks-tracker.js b/app/assets/javascripts/discourse/app/initializers/edit-notification-clicks-tracker.js
deleted file mode 100644
index c410a5e0c36..00000000000
--- a/app/assets/javascripts/discourse/app/initializers/edit-notification-clicks-tracker.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import { setLastEditNotificationClick } from "discourse/models/post-stream";
-
-export default {
-  name: "edit-notification-clicks-tracker",
-
-  initialize(container) {
-    const appEvents = container.lookup("service:app-events");
-    appEvents.on("edit-notification:clicked", this.handleClick);
-  },
-
-  handleClick({ topicId, postNumber, revisionNumber }) {
-    setLastEditNotificationClick(topicId, postNumber, revisionNumber);
-  },
-};
diff --git a/app/assets/javascripts/discourse/app/initializers/ember-input-component-extension.js b/app/assets/javascripts/discourse/app/initializers/ember-input-component-extension.js
deleted file mode 100644
index 841ff0e9929..00000000000
--- a/app/assets/javascripts/discourse/app/initializers/ember-input-component-extension.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import TextField from "@ember/component/text-field";
-import TextArea from "@ember/component/text-area";
-let initializedOnce = false;
-
-export default {
-  name: "ember-input-component-extensions",
-
-  initialize() {
-    if (initializedOnce) {
-      return;
-    }
-
-    TextField.reopen({
-      attributeBindings: ["aria-describedby", "aria-invalid"],
-    });
-    TextArea.reopen({
-      attributeBindings: ["aria-describedby", "aria-invalid"],
-    });
-
-    initializedOnce = true;
-  },
-};
diff --git a/app/assets/javascripts/discourse/app/initializers/ember-link-component-extension.js b/app/assets/javascripts/discourse/app/initializers/ember-link-component-extension.js
deleted file mode 100644
index 9c2b8e768eb..00000000000
--- a/app/assets/javascripts/discourse/app/initializers/ember-link-component-extension.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import Ember from "ember";
-let initializedOnce = false;
-
-export default {
-  name: "ember-link-component-extensions",
-
-  initialize() {
-    if (initializedOnce) {
-      return;
-    }
-
-    Ember.LinkComponent.reopen({
-      attributeBindings: ["name"],
-    });
-
-    initializedOnce = true;
-  },
-};
diff --git a/app/assets/javascripts/discourse/app/initializers/inject-discourse-objects.js b/app/assets/javascripts/discourse/app/initializers/inject-discourse-objects.js
new file mode 100644
index 00000000000..57955ee03f9
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/initializers/inject-discourse-objects.js
@@ -0,0 +1,50 @@
+import TopicTrackingState, {
+  startTracking,
+} from "discourse/models/topic-tracking-state";
+import DiscourseLocation from "discourse/lib/discourse-location";
+import Session from "discourse/models/session";
+import Site from "discourse/models/site";
+import User from "discourse/models/user";
+
+import { registerDiscourseImplicitInjections } from "discourse/lib/implicit-injections";
+
+export default {
+  after: "discourse-bootstrap",
+
+  initialize(app) {
+    const siteSettings = app.__container__.lookup("service:site-settings");
+
+    const currentUser = User.current();
+
+    // We can't use a 'real' service factory (i.e. services/current-user.js) because we need
+    // to register a null value for anon
+    app.register("service:current-user", currentUser, { instantiate: false });
+
+    this.topicTrackingState = TopicTrackingState.create({
+      messageBus: app.__container__.lookup("service:message-bus"),
+      siteSettings,
+      currentUser,
+    });
+
+    app.register("service:topic-tracking-state", this.topicTrackingState, {
+      instantiate: false,
+    });
+
+    const site = Site.current();
+    app.register("service:site", site, { instantiate: false });
+
+    const session = Session.current();
+    app.register("service:session", session, { instantiate: false });
+
+    app.register("location:discourse-location", DiscourseLocation);
+
+    registerDiscourseImplicitInjections();
+
+    startTracking(this.topicTrackingState);
+  },
+
+  teardown() {
+    // Manually call `willDestroy` as this isn't an actual `Service`
+    this.topicTrackingState.willDestroy();
+  },
+};
diff --git a/app/assets/javascripts/discourse/app/pre-initializers/map-routes.js b/app/assets/javascripts/discourse/app/initializers/map-routes.js
similarity index 85%
rename from app/assets/javascripts/discourse/app/pre-initializers/map-routes.js
rename to app/assets/javascripts/discourse/app/initializers/map-routes.js
index cf911e834fd..bba4a6b6443 100644
--- a/app/assets/javascripts/discourse/app/pre-initializers/map-routes.js
+++ b/app/assets/javascripts/discourse/app/initializers/map-routes.js
@@ -1,10 +1,9 @@
 import { mapRoutes } from "discourse/mapping-router";
 
 export default {
-  name: "map-routes",
   after: "inject-discourse-objects",
 
-  initialize(_, app) {
+  initialize(app) {
     this.routerClass = mapRoutes();
     app.register("router:main", this.routerClass);
   },
diff --git a/app/assets/javascripts/discourse/app/initializers/opengraph-tag-updater.js b/app/assets/javascripts/discourse/app/initializers/opengraph-tag-updater.js
deleted file mode 100644
index cb3d4158884..00000000000
--- a/app/assets/javascripts/discourse/app/initializers/opengraph-tag-updater.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import { getAbsoluteURL } from "discourse-common/lib/get-url";
-
-export default {
-  name: "opengraph-tag-updater",
-
-  initialize(container) {
-    // workaround for Safari on iOS 14.3
-    // seems it has started using opengraph tags when sharing
-    const ogTitle = document.querySelector("meta[property='og:title']");
-    const ogUrl = document.querySelector("meta[property='og:url']");
-    const twitterTitle = document.querySelector(
-      "meta[property='twitter:title']"
-    );
-    const twitterUrl = document.querySelector("meta[property='twitter:url']");
-
-    if (!ogTitle || !ogUrl || !twitterTitle || !twitterUrl) {
-      return;
-    }
-
-    const appEvents = container.lookup("service:app-events");
-    appEvents.on("page:changed", ({ title, url }) => {
-      ogTitle.setAttribute("content", title);
-      ogUrl.setAttribute("content", getAbsoluteURL(url));
-      twitterTitle.setAttribute("content", title);
-      twitterUrl.setAttribute("content", getAbsoluteURL(url));
-    });
-  },
-};
diff --git a/app/assets/javascripts/discourse/app/initializers/register-service-worker.js b/app/assets/javascripts/discourse/app/initializers/register-service-worker.js
deleted file mode 100644
index aae5f42a87f..00000000000
--- a/app/assets/javascripts/discourse/app/initializers/register-service-worker.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import { registerServiceWorker } from "discourse/lib/register-service-worker";
-
-export default {
-  name: "register-service-worker",
-
-  initialize(container) {
-    let { serviceWorkerURL } = container.lookup("service:session");
-    registerServiceWorker(container, serviceWorkerURL);
-  },
-};
diff --git a/app/assets/javascripts/discourse/app/initializers/safari-13-deprecation.js b/app/assets/javascripts/discourse/app/initializers/safari-13-deprecation.js
deleted file mode 100644
index 521cd6c0a38..00000000000
--- a/app/assets/javascripts/discourse/app/initializers/safari-13-deprecation.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import I18n from "I18n";
-import { withPluginApi } from "discourse/lib/plugin-api";
-
-function setupMessage(api) {
-  const isSafari = navigator.vendor === "Apple Computer, Inc.";
-  if (!isSafari) {
-    return;
-  }
-
-  let safariMajorVersion = navigator.userAgent.match(/Version\/(\d+)\./)?.[1];
-  safariMajorVersion = safariMajorVersion
-    ? parseInt(safariMajorVersion, 10)
-    : null;
-
-  if (safariMajorVersion && safariMajorVersion <= 13) {
-    api.addGlobalNotice(
-      I18n.t("safari_13_warning"),
-      "browser-deprecation-warning",
-      { dismissable: true, dismissDuration: moment.duration(1, "week") }
-    );
-  }
-}
-
-export default {
-  name: "safari-13-deprecation",
-
-  initialize() {
-    withPluginApi("0.8.37", setupMessage);
-  },
-};
diff --git a/app/assets/javascripts/discourse/app/initializers/welcome-topic-banner.js b/app/assets/javascripts/discourse/app/initializers/welcome-topic-banner.js
deleted file mode 100644
index b00f24f83dc..00000000000
--- a/app/assets/javascripts/discourse/app/initializers/welcome-topic-banner.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import { bind } from "discourse-common/utils/decorators";
-
-export default {
-  name: "welcome-topic-banner",
-  after: "message-bus",
-
-  initialize(container) {
-    this.site = container.lookup("service:site");
-    this.messageBus = container.lookup("service:message-bus");
-
-    if (this.site.show_welcome_topic_banner) {
-      this.messageBus.subscribe("/site/welcome-topic-banner", this.onMessage);
-    }
-  },
-
-  teardown() {
-    this.messageBus.unsubscribe("/site/welcome-topic-banner", this.onMessage);
-  },
-
-  @bind
-  onMessage(disabled) {
-    this.site.set("show_welcome_topic_banner", disabled);
-  },
-};
diff --git a/app/assets/javascripts/discourse/app/initializers/animated-images.js b/app/assets/javascripts/discourse/app/instance-initializers/animated-images-pause-on-click.js
similarity index 98%
rename from app/assets/javascripts/discourse/app/initializers/animated-images.js
rename to app/assets/javascripts/discourse/app/instance-initializers/animated-images-pause-on-click.js
index d19331b2559..576779f55a5 100644
--- a/app/assets/javascripts/discourse/app/initializers/animated-images.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/animated-images-pause-on-click.js
@@ -31,8 +31,6 @@ function animatedImgs() {
 }
 
 export default {
-  name: "animated-images-pause-on-click",
-
   initialize() {
     withPluginApi("0.8.7", (api) => {
       function _cleanUp() {
diff --git a/app/assets/javascripts/discourse/app/initializers/auth-complete.js b/app/assets/javascripts/discourse/app/instance-initializers/auth-complete.js
similarity index 77%
rename from app/assets/javascripts/discourse/app/initializers/auth-complete.js
rename to app/assets/javascripts/discourse/app/instance-initializers/auth-complete.js
index 13029e40442..b650bf4d4f5 100644
--- a/app/assets/javascripts/discourse/app/initializers/auth-complete.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/auth-complete.js
@@ -1,8 +1,8 @@
 import { next } from "@ember/runloop";
+
 export default {
-  name: "auth-complete",
   after: "inject-objects",
-  initialize(container) {
+  initialize(owner) {
     let lastAuthResult;
 
     if (document.getElementById("data-authentication")) {
@@ -12,14 +12,14 @@ export default {
     }
 
     if (lastAuthResult) {
-      const router = container.lookup("router:main");
+      const router = owner.lookup("router:main");
 
       router.one("didTransition", () => {
         const controllerName =
           router.currentPath === "invites.show" ? "invites-show" : "login";
 
         next(() => {
-          let controller = container.lookup(`controller:${controllerName}`);
+          let controller = owner.lookup(`controller:${controllerName}`);
           controller.authenticationComplete(JSON.parse(lastAuthResult));
         });
       });
diff --git a/app/assets/javascripts/discourse/app/initializers/auto-load-modules.js b/app/assets/javascripts/discourse/app/instance-initializers/auto-load-modules.js
similarity index 57%
rename from app/assets/javascripts/discourse/app/initializers/auto-load-modules.js
rename to app/assets/javascripts/discourse/app/instance-initializers/auto-load-modules.js
index c37a90fd5ce..6c58a896f79 100644
--- a/app/assets/javascripts/discourse/app/initializers/auto-load-modules.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/auto-load-modules.js
@@ -7,7 +7,7 @@ import RawHandlebars from "discourse-common/lib/raw-handlebars";
 import { registerRawHelpers } from "discourse-common/lib/raw-handlebars-helpers";
 import { setOwner } from "@ember/application";
 
-export function autoLoadModules(container, registry) {
+export function autoLoadModules(owner, registry) {
   Object.keys(requirejs.entries).forEach((entry) => {
     if (/\/helpers\//.test(entry) && !/-test/.test(entry)) {
       requirejs(entry, null, null, true);
@@ -18,16 +18,16 @@ export function autoLoadModules(container, registry) {
   });
 
   let context = {
-    siteSettings: container.lookup("service:site-settings"),
-    keyValueStore: container.lookup("service:key-value-store"),
-    capabilities: container.lookup("capabilities:main"),
-    currentUser: container.lookup("service:current-user"),
-    site: container.lookup("service:site"),
-    session: container.lookup("service:session"),
-    topicTrackingState: container.lookup("service:topic-tracking-state"),
+    siteSettings: owner.lookup("service:site-settings"),
+    keyValueStore: owner.lookup("service:key-value-store"),
+    capabilities: owner.lookup("service:capabilities"),
+    currentUser: owner.lookup("service:current-user"),
+    site: owner.lookup("service:site"),
+    session: owner.lookup("service:session"),
+    topicTrackingState: owner.lookup("service:topic-tracking-state"),
     registry,
   };
-  setOwner(context, container);
+  setOwner(context, owner);
 
   createHelperContext(context);
   registerHelpers(registry);
@@ -35,7 +35,8 @@ export function autoLoadModules(container, registry) {
 }
 
 export default {
-  name: "auto-load-modules",
   after: "inject-objects",
-  initialize: (container) => autoLoadModules(container, container.registry),
+  initialize: (owner) => {
+    autoLoadModules(owner, owner.__container__.registry);
+  },
 };
diff --git a/app/assets/javascripts/discourse/app/instance-initializers/badging.js b/app/assets/javascripts/discourse/app/instance-initializers/badging.js
new file mode 100644
index 00000000000..967a3849b0d
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/instance-initializers/badging.js
@@ -0,0 +1,26 @@
+// Updates the PWA badging if available
+export default {
+  after: "message-bus",
+
+  initialize(owner) {
+    if (!navigator.setAppBadge) {
+      return;
+    } // must have the Badging API
+
+    const user = owner.lookup("service:current-user");
+    if (!user) {
+      return;
+    } // must be logged in
+
+    const appEvents = owner.lookup("service:app-events");
+    appEvents.on("notifications:changed", () => {
+      let notifications;
+      notifications = user.all_unread_notifications_count;
+      if (user.unseen_reviewable_count) {
+        notifications += user.unseen_reviewable_count;
+      }
+
+      navigator.setAppBadge(notifications);
+    });
+  },
+};
diff --git a/app/assets/javascripts/discourse/app/initializers/banner.js b/app/assets/javascripts/discourse/app/instance-initializers/banner.js
similarity index 63%
rename from app/assets/javascripts/discourse/app/initializers/banner.js
rename to app/assets/javascripts/discourse/app/instance-initializers/banner.js
index 09859d7ccbf..b15e8097d03 100644
--- a/app/assets/javascripts/discourse/app/initializers/banner.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/banner.js
@@ -3,12 +3,11 @@ import { bind } from "discourse-common/utils/decorators";
 import PreloadStore from "discourse/lib/preload-store";
 
 export default {
-  name: "banner",
   after: "message-bus",
 
-  initialize(container) {
-    this.site = container.lookup("service:site");
-    this.messageBus = container.lookup("service:message-bus");
+  initialize(owner) {
+    this.site = owner.lookup("service:site");
+    this.messageBus = owner.lookup("service:message-bus");
 
     const banner = EmberObject.create(PreloadStore.get("banner") || {});
     this.site.set("banner", banner);
@@ -21,7 +20,11 @@ export default {
   },
 
   @bind
-  onMessage(data = {}) {
-    this.site.set("banner", EmberObject.create(data));
+  onMessage(data) {
+    if (data) {
+      this.site.set("banner", EmberObject.create(data));
+    } else {
+      this.site.set("banner", null);
+    }
   },
 };
diff --git a/app/assets/javascripts/discourse/app/instance-initializers/category-color-css-generator.js b/app/assets/javascripts/discourse/app/instance-initializers/category-color-css-generator.js
new file mode 100644
index 00000000000..a7242832f3d
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/instance-initializers/category-color-css-generator.js
@@ -0,0 +1,33 @@
+export default {
+  after: "register-hashtag-types",
+
+  /**
+   * This generates CSS variables for each category color,
+   * which can be used in themes to style category-specific elements.
+   *
+   * It is also used when styling hashtag icons, since they are colored
+   * based on the category color.
+   */
+  initialize(owner) {
+    this.site = owner.lookup("service:site");
+
+    // If the site is login_required and the user is anon there will be no categories preloaded.
+    if (!this.site.categories) {
+      return;
+    }
+
+    const generatedCssVariables = [
+      ":root {",
+      ...this.site.categories.map(
+        (category) => `--category-${category.id}-color: #${category.color};`
+      ),
+      "}",
+    ];
+
+    const cssTag = document.createElement("style");
+    cssTag.type = "text/css";
+    cssTag.id = "category-color-css-generator";
+    cssTag.innerHTML = generatedCssVariables.join("\n");
+    document.head.appendChild(cssTag);
+  },
+};
diff --git a/app/assets/javascripts/discourse/app/initializers/clean-dom-on-route-change.js b/app/assets/javascripts/discourse/app/instance-initializers/clean-dom-on-route-change.js
similarity index 86%
rename from app/assets/javascripts/discourse/app/initializers/clean-dom-on-route-change.js
rename to app/assets/javascripts/discourse/app/instance-initializers/clean-dom-on-route-change.js
index 41d841f8d0e..9275feeb0b5 100644
--- a/app/assets/javascripts/discourse/app/initializers/clean-dom-on-route-change.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/clean-dom-on-route-change.js
@@ -33,18 +33,17 @@ function _clean(transition) {
 }
 
 export default {
-  name: "clean-dom-on-route-change",
   after: "inject-objects",
 
-  initialize(container) {
-    const router = container.lookup("router:main");
+  initialize(owner) {
+    const router = owner.lookup("router:main");
 
     router.on("routeDidChange", (transition) => {
       if (transition.isAborted) {
         return;
       }
 
-      scheduleOnce("afterRender", container, _clean, transition);
+      scheduleOnce("afterRender", owner, _clean, transition);
     });
   },
 };
diff --git a/app/assets/javascripts/discourse/app/initializers/click-interceptor.js b/app/assets/javascripts/discourse/app/instance-initializers/click-interceptor.js
similarity index 83%
rename from app/assets/javascripts/discourse/app/initializers/click-interceptor.js
rename to app/assets/javascripts/discourse/app/instance-initializers/click-interceptor.js
index 3219664f35b..91a7c22cdfc 100644
--- a/app/assets/javascripts/discourse/app/initializers/click-interceptor.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/click-interceptor.js
@@ -2,9 +2,8 @@ import DiscourseURL from "discourse/lib/url";
 import interceptClick from "discourse/lib/intercept-click";
 
 export default {
-  name: "click-interceptor",
-  initialize(container, app) {
-    this.selector = app.rootElement;
+  initialize(owner) {
+    this.selector = owner.rootElement;
     $(this.selector).on("click.discourse", "a", interceptClick);
     window.addEventListener("hashchange", this.hashChanged);
   },
diff --git a/app/assets/javascripts/discourse/app/initializers/codeblock-buttons.js b/app/assets/javascripts/discourse/app/instance-initializers/codeblock-buttons.js
similarity index 90%
rename from app/assets/javascripts/discourse/app/initializers/codeblock-buttons.js
rename to app/assets/javascripts/discourse/app/instance-initializers/codeblock-buttons.js
index d2540f7a9c2..c7bf07142da 100644
--- a/app/assets/javascripts/discourse/app/initializers/codeblock-buttons.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/codeblock-buttons.js
@@ -5,10 +5,8 @@ import CodeblockButtons from "discourse/lib/codeblock-buttons";
 let _codeblockButtons = [];
 
 export default {
-  name: "codeblock-buttons",
-
-  initialize(container) {
-    const siteSettings = container.lookup("service:site-settings");
+  initialize(owner) {
+    const siteSettings = owner.lookup("service:site-settings");
 
     withPluginApi("0.8.7", (api) => {
       function _cleanUp() {
diff --git a/app/assets/javascripts/discourse/app/instance-initializers/component-templates.js b/app/assets/javascripts/discourse/app/instance-initializers/component-templates.js
new file mode 100644
index 00000000000..776846c925c
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/instance-initializers/component-templates.js
@@ -0,0 +1,79 @@
+import DiscourseTemplateMap from "discourse-common/lib/discourse-template-map";
+import * as GlimmerManager from "@glimmer/manager";
+import ClassicComponent from "@ember/component";
+
+const COLOCATED_TEMPLATE_OVERRIDES = new Map();
+
+// This patch is not ideal, but Ember does not allow us to change a component template after initial association
+// https://github.com/glimmerjs/glimmer-vm/blob/03a4b55c03/packages/%40glimmer/manager/lib/public/template.ts#L14-L20
+const originalGetTemplate = GlimmerManager.getComponentTemplate;
+GlimmerManager.getComponentTemplate = (component) => {
+  return (
+    COLOCATED_TEMPLATE_OVERRIDES.get(component) ??
+    originalGetTemplate(component)
+  );
+};
+
+export default {
+  after: ["populate-template-map", "mobile"],
+
+  initialize(owner) {
+    this.site = owner.lookup("service:site");
+
+    this.eachThemePluginTemplate((templateKey, moduleNames, mobile) => {
+      if (!mobile && DiscourseTemplateMap.coreTemplates.has(templateKey)) {
+        // It's a non-colocated core component. Template will be overridden at runtime.
+        return;
+      }
+
+      let componentName = templateKey;
+      if (mobile) {
+        componentName = componentName.slice("mobile/".length);
+      }
+      componentName = componentName.slice("components/".length);
+
+      const component = owner.resolveRegistration(`component:${componentName}`);
+
+      if (component && originalGetTemplate(component)) {
+        const finalOverrideModuleName = moduleNames[moduleNames.length - 1];
+        const overrideTemplate = require(finalOverrideModuleName).default;
+
+        COLOCATED_TEMPLATE_OVERRIDES.set(component, overrideTemplate);
+      } else if (!component) {
+        // Plugin/theme component template with no backing class.
+        // Treat as classic component to emulate pre-template-only-glimmer-component behaviour.
+        owner.register(`component:${componentName}`, ClassicComponent);
+      }
+    });
+  },
+
+  eachThemePluginTemplate(cb) {
+    const { coreTemplates, pluginTemplates, themeTemplates } =
+      DiscourseTemplateMap;
+
+    const orderedOverrides = [
+      [pluginTemplates, "components/", false],
+      [themeTemplates, "components/", false],
+    ];
+
+    if (this.site.mobileView) {
+      orderedOverrides.push(
+        [coreTemplates, "mobile/components/", true],
+        [pluginTemplates, "mobile/components/", true],
+        [themeTemplates, "mobile/components/", true]
+      );
+    }
+
+    for (const [map, prefix, mobile] of orderedOverrides) {
+      for (const [key, value] of map) {
+        if (key.startsWith(prefix)) {
+          cb(key, value, mobile);
+        }
+      }
+    }
+  },
+
+  teardown() {
+    COLOCATED_TEMPLATE_OVERRIDES.clear();
+  },
+};
diff --git a/app/assets/javascripts/discourse/app/initializers/csrf-token.js b/app/assets/javascripts/discourse/app/instance-initializers/csrf-token.js
similarity index 85%
rename from app/assets/javascripts/discourse/app/initializers/csrf-token.js
rename to app/assets/javascripts/discourse/app/instance-initializers/csrf-token.js
index 6af8eebf869..5589b5f4aac 100644
--- a/app/assets/javascripts/discourse/app/initializers/csrf-token.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/csrf-token.js
@@ -4,10 +4,9 @@ let installed = false;
 let callbacks = $.Callbacks();
 
 export default {
-  name: "csrf-token",
-  initialize(container) {
+  initialize(owner) {
     // Add a CSRF token to all AJAX requests
-    let session = container.lookup("service:session");
+    let session = owner.lookup("service:session");
     session.set(
       "csrfToken",
       document.head.querySelector("meta[name=csrf-token]")?.content
diff --git a/app/assets/javascripts/discourse/app/initializers/d-popover.js b/app/assets/javascripts/discourse/app/instance-initializers/d-popover.js
similarity index 95%
rename from app/assets/javascripts/discourse/app/initializers/d-popover.js
rename to app/assets/javascripts/discourse/app/instance-initializers/d-popover.js
index 3a46a104807..2d11e739323 100644
--- a/app/assets/javascripts/discourse/app/initializers/d-popover.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/d-popover.js
@@ -1,8 +1,6 @@
 import { showPopover } from "discourse/lib/d-popover";
 
 export default {
-  name: "d-popover",
-
   initialize() {
     ["click", "mouseover"].forEach((eventType) => {
       document.addEventListener(eventType, (e) => {
diff --git a/app/assets/javascripts/discourse/app/instance-initializers/document-scrollbar-width.js b/app/assets/javascripts/discourse/app/instance-initializers/document-scrollbar-width.js
new file mode 100644
index 00000000000..639ce6cf445
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/instance-initializers/document-scrollbar-width.js
@@ -0,0 +1,17 @@
+export default {
+  async initialize(owner) {
+    const siteSettings = owner.lookup("service:site-settings");
+
+    if (siteSettings.enable_experimental_lightbox) {
+      const viewportWidth = window.innerWidth;
+      const bodyRects = document.body.getBoundingClientRect();
+      let scrollbarWidth = viewportWidth - bodyRects.width;
+      scrollbarWidth = scrollbarWidth = Math.round(scrollbarWidth * 100) / 100;
+
+      document.documentElement.style.setProperty(
+        "--document-scrollbar-width",
+        `${scrollbarWidth}px`
+      );
+    }
+  },
+};
diff --git a/app/assets/javascripts/discourse/app/initializers/eager-load-raw-templates.js b/app/assets/javascripts/discourse/app/instance-initializers/eager-load-raw-templates.js
similarity index 81%
rename from app/assets/javascripts/discourse/app/initializers/eager-load-raw-templates.js
rename to app/assets/javascripts/discourse/app/instance-initializers/eager-load-raw-templates.js
index 47be0b1303a..d38a14295d1 100644
--- a/app/assets/javascripts/discourse/app/initializers/eager-load-raw-templates.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/eager-load-raw-templates.js
@@ -1,8 +1,6 @@
 import { eagerLoadRawTemplateModules } from "discourse-common/lib/raw-templates";
 
 export default {
-  name: "eager-load-raw-templates",
-
   initialize() {
     eagerLoadRawTemplateModules();
   },
diff --git a/app/assets/javascripts/discourse/app/initializers/enable-emoji.js b/app/assets/javascripts/discourse/app/instance-initializers/enable-emoji.js
similarity index 85%
rename from app/assets/javascripts/discourse/app/initializers/enable-emoji.js
rename to app/assets/javascripts/discourse/app/instance-initializers/enable-emoji.js
index 5d97739a3b9..2eaccc68c60 100644
--- a/app/assets/javascripts/discourse/app/initializers/enable-emoji.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/enable-emoji.js
@@ -3,10 +3,8 @@ import { registerEmoji } from "pretty-text/emoji";
 import { withPluginApi } from "discourse/lib/plugin-api";
 
 export default {
-  name: "enable-emoji",
-
-  initialize(container) {
-    const siteSettings = container.lookup("service:site-settings");
+  initialize(owner) {
+    const siteSettings = owner.lookup("service:site-settings");
     if (!siteSettings.enable_emoji) {
       return;
     }
diff --git a/app/assets/javascripts/discourse/app/initializers/handle-cookies.js b/app/assets/javascripts/discourse/app/instance-initializers/handle-cookies.js
similarity index 95%
rename from app/assets/javascripts/discourse/app/initializers/handle-cookies.js
rename to app/assets/javascripts/discourse/app/instance-initializers/handle-cookies.js
index ed0a4c89d95..5d36f39c141 100644
--- a/app/assets/javascripts/discourse/app/initializers/handle-cookies.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/handle-cookies.js
@@ -7,8 +7,6 @@ import { isTesting } from "discourse-common/config/environment";
 const DELAY = isTesting() ? 0 : 5000;
 
 export default {
-  name: "handle-cookies",
-
   initialize() {
     // No need to block boot for this housekeeping - we can defer it a few seconds
     later(() => {
diff --git a/app/assets/javascripts/discourse/app/instance-initializers/hashtag-css-generator.js b/app/assets/javascripts/discourse/app/instance-initializers/hashtag-css-generator.js
new file mode 100644
index 00000000000..286f8eaa8f5
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/instance-initializers/hashtag-css-generator.js
@@ -0,0 +1,41 @@
+import { getHashtagTypeClasses } from "discourse/lib/hashtag-autocomplete";
+
+export default {
+  after: "category-color-css-generator",
+
+  /**
+   * This generates CSS classes for each hashtag type,
+   * which are used to color the hashtag icons in the composer,
+   * cooked posts, and the sidebar.
+   *
+   * Each type has its own corresponding class, which is registered
+   * with the hastag type via api.registerHashtagType. The default
+   * ones in core are CategoryHashtagType and TagHashtagType.
+   */
+  initialize(owner) {
+    this.site = owner.lookup("service:site");
+
+    // If the site is login_required and the user is anon there will be no categories
+    // preloaded, so there will be no category color CSS variables generated by
+    // the category-color-css-generator initializer.
+    if (!this.site.categories) {
+      return;
+    }
+
+    let generatedCssClasses = [];
+
+    Object.values(getHashtagTypeClasses()).forEach((hashtagType) => {
+      hashtagType.preloadedData.forEach((model) => {
+        generatedCssClasses = generatedCssClasses.concat(
+          hashtagType.generateColorCssClasses(model)
+        );
+      });
+    });
+
+    const cssTag = document.createElement("style");
+    cssTag.type = "text/css";
+    cssTag.id = "hashtag-css-generator";
+    cssTag.innerHTML = generatedCssClasses.join("\n");
+    document.head.appendChild(cssTag);
+  },
+};
diff --git a/app/assets/javascripts/discourse/app/instance-initializers/hashtag-post-decorations.js b/app/assets/javascripts/discourse/app/instance-initializers/hashtag-post-decorations.js
new file mode 100644
index 00000000000..75b462d0ddc
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/instance-initializers/hashtag-post-decorations.js
@@ -0,0 +1,20 @@
+import { withPluginApi } from "discourse/lib/plugin-api";
+import { decorateHashtags } from "discourse/lib/hashtag-autocomplete";
+
+export default {
+  after: "hashtag-css-generator",
+
+  initialize(owner) {
+    const siteSettings = owner.lookup("service:site-settings");
+    const site = owner.lookup("service:site");
+
+    withPluginApi("0.8.7", (api) => {
+      if (siteSettings.enable_experimental_hashtag_autocomplete) {
+        api.decorateCookedElement((post) => decorateHashtags(post, site), {
+          onlyStream: true,
+          id: "hashtag-icons",
+        });
+      }
+    });
+  },
+};
diff --git a/app/assets/javascripts/discourse/app/initializers/image-aspect-ratio.js b/app/assets/javascripts/discourse/app/instance-initializers/image-aspect-ratio.js
similarity index 98%
rename from app/assets/javascripts/discourse/app/initializers/image-aspect-ratio.js
rename to app/assets/javascripts/discourse/app/instance-initializers/image-aspect-ratio.js
index 448cf41a443..06b7da2b78d 100644
--- a/app/assets/javascripts/discourse/app/initializers/image-aspect-ratio.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/image-aspect-ratio.js
@@ -11,8 +11,6 @@ import { withPluginApi } from "discourse/lib/plugin-api";
 // the lifetime of all `<img` elements.
 
 export default {
-  name: "image-aspect-ratio",
-
   initWithApi(api) {
     const supportsAspectRatio = CSS.supports("aspect-ratio: 1");
 
diff --git a/app/assets/javascripts/discourse/app/instance-initializers/init-route-scroll-manager.js b/app/assets/javascripts/discourse/app/instance-initializers/init-route-scroll-manager.js
new file mode 100644
index 00000000000..8e7a64c8672
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/instance-initializers/init-route-scroll-manager.js
@@ -0,0 +1,5 @@
+export default {
+  initialize(owner) {
+    owner.lookup("service:route-scroll-manager");
+  },
+};
diff --git a/app/assets/javascripts/discourse/app/initializers/inject-objects.js b/app/assets/javascripts/discourse/app/instance-initializers/inject-objects.js
similarity index 69%
rename from app/assets/javascripts/discourse/app/initializers/inject-objects.js
rename to app/assets/javascripts/discourse/app/instance-initializers/inject-objects.js
index ea54bb1a7b9..85de6a6004c 100644
--- a/app/assets/javascripts/discourse/app/initializers/inject-objects.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/inject-objects.js
@@ -4,45 +4,47 @@ import Site from "discourse/models/site";
 import deprecated from "discourse-common/lib/deprecated";
 
 export default {
-  name: "inject-objects",
-  after: "export-application-global",
-  initialize(container, app) {
-    // This is required for Ember CLI tests to work
-    setDefaultOwner(app.__container__);
+  after: "sniff-capabilities",
 
-    Object.defineProperty(app, "SiteSettings", {
+  initialize(owner) {
+    // This is required for Ember CLI tests to work
+    setDefaultOwner(owner.__container__);
+
+    window.Discourse = owner;
+
+    Object.defineProperty(owner, "SiteSettings", {
       get() {
         deprecated(
           `use injected siteSettings instead of Discourse.SiteSettings`,
           {
             since: "2.8",
-            dropFrom: "2.9",
+            dropFrom: "3.2",
             id: "discourse.global.site-settings",
           }
         );
-        return container.lookup("service:site-settings");
+        return owner.lookup("service:site-settings");
       },
     });
-    Object.defineProperty(app, "User", {
+    Object.defineProperty(owner, "User", {
       get() {
         deprecated(
           `import discourse/models/user instead of using Discourse.User`,
           {
             since: "2.8",
-            dropFrom: "2.9",
+            dropFrom: "3.2",
             id: "discourse.global.user",
           }
         );
         return User;
       },
     });
-    Object.defineProperty(app, "Site", {
+    Object.defineProperty(owner, "Site", {
       get() {
         deprecated(
           `import discourse/models/site instead of using Discourse.Site`,
           {
             since: "2.8",
-            dropFrom: "2.9",
+            dropFrom: "3.2",
             id: "discourse.global.site",
           }
         );
@@ -50,4 +52,8 @@ export default {
       },
     });
   },
+
+  teardown() {
+    delete window.Discourse;
+  },
 };
diff --git a/app/assets/javascripts/discourse/app/initializers/jquery-plugins.js b/app/assets/javascripts/discourse/app/instance-initializers/jquery-plugins.js
similarity index 98%
rename from app/assets/javascripts/discourse/app/initializers/jquery-plugins.js
rename to app/assets/javascripts/discourse/app/instance-initializers/jquery-plugins.js
index 8302cf90bb1..df7e01b66e9 100644
--- a/app/assets/javascripts/discourse/app/initializers/jquery-plugins.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/jquery-plugins.js
@@ -6,7 +6,6 @@ import deprecated from "discourse-common/lib/deprecated";
 let jqueryPluginsConfigured = false;
 
 export default {
-  name: "jquery-plugins",
   initialize() {
     if (jqueryPluginsConfigured) {
       return;
diff --git a/app/assets/javascripts/discourse/app/initializers/keyboard-shortcuts.js b/app/assets/javascripts/discourse/app/instance-initializers/keyboard-shortcuts.js
similarity index 68%
rename from app/assets/javascripts/discourse/app/initializers/keyboard-shortcuts.js
rename to app/assets/javascripts/discourse/app/instance-initializers/keyboard-shortcuts.js
index b484497e320..bab5c8cff3d 100644
--- a/app/assets/javascripts/discourse/app/initializers/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/keyboard-shortcuts.js
@@ -2,10 +2,8 @@ import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";
 import ItsATrap from "@discourse/itsatrap";
 
 export default {
-  name: "keyboard-shortcuts",
-
-  initialize(container) {
-    KeyboardShortcuts.init(ItsATrap, container);
+  initialize(owner) {
+    KeyboardShortcuts.init(ItsATrap, owner);
     KeyboardShortcuts.bindEvents();
   },
 
diff --git a/app/assets/javascripts/discourse/app/initializers/live-development.js b/app/assets/javascripts/discourse/app/instance-initializers/live-development.js
similarity index 93%
rename from app/assets/javascripts/discourse/app/initializers/live-development.js
rename to app/assets/javascripts/discourse/app/instance-initializers/live-development.js
index 71c9d324998..ba2c306ac05 100644
--- a/app/assets/javascripts/discourse/app/initializers/live-development.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/live-development.js
@@ -5,11 +5,9 @@ import { bind } from "discourse-common/utils/decorators";
 
 //  Use the message bus for live reloading of components for faster development.
 export default {
-  name: "live-development",
-
-  initialize(container) {
-    this.messageBus = container.lookup("service:message-bus");
-    const session = container.lookup("service:session");
+  initialize(owner) {
+    this.messageBus = owner.lookup("service:message-bus");
+    const session = owner.lookup("service:session");
 
     // Preserve preview_theme_id=## and pp=async-flamegraph parameters across pages
     const params = new URLSearchParams(window.location.search);
diff --git a/app/assets/javascripts/discourse/app/initializers/localization.js b/app/assets/javascripts/discourse/app/instance-initializers/localization.js
similarity index 86%
rename from app/assets/javascripts/discourse/app/initializers/localization.js
rename to app/assets/javascripts/discourse/app/instance-initializers/localization.js
index 32d7fc8c8f6..b49a746fbcd 100644
--- a/app/assets/javascripts/discourse/app/initializers/localization.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/localization.js
@@ -2,11 +2,10 @@ import I18n from "I18n";
 import bootbox from "bootbox";
 
 export default {
-  name: "localization",
   after: "inject-objects",
 
-  isVerboseLocalizationEnabled(container) {
-    const siteSettings = container.lookup("service:site-settings");
+  isVerboseLocalizationEnabled(owner) {
+    const siteSettings = owner.lookup("service:site-settings");
     if (siteSettings.verbose_localization) {
       return true;
     }
@@ -18,8 +17,8 @@ export default {
     }
   },
 
-  initialize(container) {
-    if (this.isVerboseLocalizationEnabled(container)) {
+  initialize(owner) {
+    if (this.isVerboseLocalizationEnabled(owner)) {
       I18n.enableVerboseLocalization();
     }
 
diff --git a/app/assets/javascripts/discourse/app/initializers/logout.js b/app/assets/javascripts/discourse/app/instance-initializers/logout.js
similarity index 79%
rename from app/assets/javascripts/discourse/app/initializers/logout.js
rename to app/assets/javascripts/discourse/app/instance-initializers/logout.js
index c329ff9f612..6a761986df4 100644
--- a/app/assets/javascripts/discourse/app/initializers/logout.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/logout.js
@@ -6,13 +6,12 @@ let _showingLogout = false;
 
 // Subscribe to "logout" change events via the Message Bus
 export default {
-  name: "logout",
   after: "message-bus",
 
-  initialize(container) {
-    this.messageBus = container.lookup("service:message-bus");
-    this.dialog = container.lookup("service:dialog");
-    this.currentUser = container.lookup("service:current-user");
+  initialize(owner) {
+    this.messageBus = owner.lookup("service:message-bus");
+    this.dialog = owner.lookup("service:dialog");
+    this.currentUser = owner.lookup("service:current-user");
 
     if (this.currentUser) {
       this.messageBus.subscribe(
diff --git a/app/assets/javascripts/discourse/app/initializers/logs-notice.js b/app/assets/javascripts/discourse/app/instance-initializers/logs-notice.js
similarity index 60%
rename from app/assets/javascripts/discourse/app/initializers/logs-notice.js
rename to app/assets/javascripts/discourse/app/instance-initializers/logs-notice.js
index d696bfb35d5..e53e34b8ce7 100644
--- a/app/assets/javascripts/discourse/app/initializers/logs-notice.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/logs-notice.js
@@ -3,18 +3,17 @@ import Singleton from "discourse/mixins/singleton";
 let initializedOnce = false;
 
 export default {
-  name: "logs-notice",
   after: "message-bus",
 
-  initialize(container) {
+  initialize(owner) {
     if (initializedOnce) {
       return;
     }
 
-    const siteSettings = container.lookup("service:site-settings");
-    const messageBus = container.lookup("service:message-bus");
-    const keyValueStore = container.lookup("service:key-value-store");
-    const currentUser = container.lookup("service:current-user");
+    const siteSettings = owner.lookup("service:site-settings");
+    const messageBus = owner.lookup("service:message-bus");
+    const keyValueStore = owner.lookup("service:key-value-store");
+    const currentUser = owner.lookup("service:current-user");
     LogsNotice.reopenClass(Singleton, {
       createCurrent() {
         return this.create({
diff --git a/app/assets/javascripts/discourse/app/initializers/message-bus.js b/app/assets/javascripts/discourse/app/instance-initializers/message-bus.js
similarity index 82%
rename from app/assets/javascripts/discourse/app/initializers/message-bus.js
rename to app/assets/javascripts/discourse/app/instance-initializers/message-bus.js
index 7b0593a863f..b645c332e07 100644
--- a/app/assets/javascripts/discourse/app/initializers/message-bus.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/message-bus.js
@@ -5,15 +5,6 @@ import { handleLogoff } from "discourse/lib/ajax";
 import userPresent, { onPresenceChange } from "discourse/lib/user-presence";
 
 const LONG_POLL_AFTER_UNSEEN_TIME = 1200000; // 20 minutes
-const CONNECTIVITY_ERROR_CLASS = "message-bus-offline";
-
-function updateConnectivityIndicator(stat) {
-  if (stat === "error") {
-    document.documentElement.classList.add(CONNECTIVITY_ERROR_CLASS);
-  } else {
-    document.documentElement.classList.remove(CONNECTIVITY_ERROR_CLASS);
-  }
-}
 
 function ajax(opts) {
   if (opts.complete) {
@@ -21,7 +12,6 @@ function ajax(opts) {
     opts.complete = function (xhr, stat) {
       handleLogoff(xhr);
       oldComplete(xhr, stat);
-      updateConnectivityIndicator(stat);
     };
   } else {
     opts.complete = handleLogoff;
@@ -31,18 +21,17 @@ function ajax(opts) {
 }
 
 export default {
-  name: "message-bus",
   after: "inject-objects",
 
-  initialize(container) {
+  initialize(owner) {
     // We don't use the message bus in testing
     if (isTesting()) {
       return;
     }
 
-    const messageBus = container.lookup("service:message-bus"),
-      user = container.lookup("service:current-user"),
-      siteSettings = container.lookup("service:site-settings");
+    const messageBus = owner.lookup("service:message-bus"),
+      user = owner.lookup("service:current-user"),
+      siteSettings = owner.lookup("service:site-settings");
 
     messageBus.alwaysLongPoll = !isProduction();
     messageBus.shouldLongPollCallback = () =>
@@ -86,8 +75,7 @@ export default {
     messageBus.baseUrl =
       siteSettings.long_polling_base_url.replace(/\/$/, "") + "/";
 
-    messageBus.enableChunkedEncoding =
-      isProduction() && siteSettings.enable_chunked_encoding;
+    messageBus.enableChunkedEncoding = siteSettings.enable_chunked_encoding;
 
     if (messageBus.baseUrl !== "/") {
       messageBus.ajax = function (opts) {
diff --git a/app/assets/javascripts/discourse/app/instance-initializers/meta-tag-updater.js b/app/assets/javascripts/discourse/app/instance-initializers/meta-tag-updater.js
new file mode 100644
index 00000000000..3b1fed8d9b4
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/instance-initializers/meta-tag-updater.js
@@ -0,0 +1,27 @@
+import { getAbsoluteURL } from "discourse-common/lib/get-url";
+
+export default {
+  initialize(owner) {
+    // workaround for Safari on iOS 14.3
+    // seems it has started using opengraph tags when sharing
+    const ogTitle = document.querySelector("meta[property='og:title']");
+    const ogUrl = document.querySelector("meta[property='og:url']");
+    const twitterTitle = document.querySelector("meta[name='twitter:title']");
+    const twitterUrl = document.querySelector("meta[name='twitter:url']");
+
+    // workaround for mobile Chrome, which uses the canonical url when sharing
+    const canonicalUrl = document.querySelector("link[rel='canonical']");
+
+    const appEvents = owner.lookup("service:app-events");
+    appEvents.on("page:changed", ({ title, url }) => {
+      const absoluteUrl = getAbsoluteURL(url);
+
+      ogTitle?.setAttribute("content", title);
+      ogUrl?.setAttribute("content", absoluteUrl);
+      twitterTitle?.setAttribute("content", title);
+      twitterUrl?.setAttribute("content", absoluteUrl);
+
+      canonicalUrl?.setAttribute("href", absoluteUrl);
+    });
+  },
+};
diff --git a/app/assets/javascripts/discourse/app/initializers/mobile-keyboard.js b/app/assets/javascripts/discourse/app/instance-initializers/mobile-keyboard.js
similarity index 93%
rename from app/assets/javascripts/discourse/app/initializers/mobile-keyboard.js
rename to app/assets/javascripts/discourse/app/instance-initializers/mobile-keyboard.js
index 816f8e15b5b..2eb4a12377e 100644
--- a/app/assets/javascripts/discourse/app/initializers/mobile-keyboard.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/mobile-keyboard.js
@@ -1,12 +1,11 @@
 import { bind } from "discourse-common/utils/decorators";
 
 export default {
-  name: "mobile-keyboard",
   after: "mobile",
 
-  initialize(container) {
-    const site = container.lookup("service:site");
-    this.capabilities = container.lookup("capabilities:main");
+  initialize(owner) {
+    const site = owner.lookup("service:site");
+    this.capabilities = owner.lookup("service:capabilities");
 
     if (!this.capabilities.isIpadOS && !site.mobileView) {
       return;
diff --git a/app/assets/javascripts/discourse/app/initializers/mobile.js b/app/assets/javascripts/discourse/app/instance-initializers/mobile.js
similarity index 62%
rename from app/assets/javascripts/discourse/app/initializers/mobile.js
rename to app/assets/javascripts/discourse/app/instance-initializers/mobile.js
index 029650305dc..b09277801ac 100644
--- a/app/assets/javascripts/discourse/app/initializers/mobile.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/mobile.js
@@ -1,21 +1,18 @@
 import Mobile from "discourse/lib/mobile";
 import { setResolverOption } from "discourse-common/resolver";
-import { setResolverOption as setLegacyResolverOption } from "discourse-common/lib/legacy-resolver";
 
 // Initializes the `Mobile` helper object.
 export default {
-  name: "mobile",
   after: "inject-objects",
 
-  initialize(container) {
+  initialize(owner) {
     Mobile.init();
-    const site = container.lookup("service:site");
+    const site = owner.lookup("service:site");
 
     site.set("mobileView", Mobile.mobileView);
     site.set("desktopView", !Mobile.mobileView);
     site.set("isMobileDevice", Mobile.isMobileDevice);
 
     setResolverOption("mobileView", Mobile.mobileView);
-    setLegacyResolverOption("mobileView", Mobile.mobileView);
   },
 };
diff --git a/app/assets/javascripts/discourse/app/initializers/moment.js b/app/assets/javascripts/discourse/app/instance-initializers/moment.js
similarity index 59%
rename from app/assets/javascripts/discourse/app/initializers/moment.js
rename to app/assets/javascripts/discourse/app/instance-initializers/moment.js
index e27f2e4ddaf..4884e4f871b 100644
--- a/app/assets/javascripts/discourse/app/initializers/moment.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/moment.js
@@ -1,8 +1,8 @@
 export default {
-  name: "moment",
   after: "message-bus",
 
   initialize() {
+    moment.tz.link(["Asia/Kolkata|IST", "Asia/Seoul|KST", "Asia/Tokyo|JST"]);
     delete moment.tz._links["us_pacific-new"];
   },
 };
diff --git a/app/assets/javascripts/discourse/app/initializers/narrow-desktop.js b/app/assets/javascripts/discourse/app/instance-initializers/narrow-desktop.js
similarity index 83%
rename from app/assets/javascripts/discourse/app/initializers/narrow-desktop.js
rename to app/assets/javascripts/discourse/app/instance-initializers/narrow-desktop.js
index 647e6b91954..bd638881964 100644
--- a/app/assets/javascripts/discourse/app/initializers/narrow-desktop.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/narrow-desktop.js
@@ -1,19 +1,17 @@
 import NarrowDesktop from "discourse/lib/narrow-desktop";
 
 export default {
-  name: "narrow-desktop",
-
-  initialize(container) {
+  initialize(owner) {
     NarrowDesktop.init();
     let site;
-    if (!container.isDestroyed) {
-      site = container.lookup("service:site");
+    if (!owner.isDestroyed) {
+      site = owner.lookup("service:site");
       site.set("narrowDesktopView", NarrowDesktop.narrowDesktopView);
     }
 
     if ("ResizeObserver" in window) {
       this._resizeObserver = new ResizeObserver((entries) => {
-        if (container.isDestroyed) {
+        if (owner.isDestroyed) {
           return;
         }
         for (let entry of entries) {
@@ -22,7 +20,7 @@ export default {
             entry.contentRect.width
           );
           if (oldNarrowDesktopView !== newNarrowDesktopView) {
-            const applicationController = container.lookup(
+            const applicationController = owner.lookup(
               "controller:application"
             );
             site.set("narrowDesktopView", newNarrowDesktopView);
diff --git a/app/assets/javascripts/discourse/app/initializers/onebox-decorators.js b/app/assets/javascripts/discourse/app/instance-initializers/onebox-decorators.js
similarity index 97%
rename from app/assets/javascripts/discourse/app/initializers/onebox-decorators.js
rename to app/assets/javascripts/discourse/app/instance-initializers/onebox-decorators.js
index 11af2dcb025..7517fbd5ee4 100644
--- a/app/assets/javascripts/discourse/app/initializers/onebox-decorators.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/onebox-decorators.js
@@ -38,8 +38,6 @@ function _cleanUp() {
 }
 
 export default {
-  name: "onebox-decorators",
-
   initialize() {
     withPluginApi("0.8.42", (api) => {
       api.decorateCookedElement(
diff --git a/app/assets/javascripts/discourse/app/initializers/page-tracking.js b/app/assets/javascripts/discourse/app/instance-initializers/page-tracking.js
similarity index 74%
rename from app/assets/javascripts/discourse/app/initializers/page-tracking.js
rename to app/assets/javascripts/discourse/app/instance-initializers/page-tracking.js
index f640275e8c2..804cfd26d6d 100644
--- a/app/assets/javascripts/discourse/app/initializers/page-tracking.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/page-tracking.js
@@ -3,19 +3,18 @@ import {
   resetPageTracking,
   startPageTracking,
 } from "discourse/lib/page-tracker";
-import { viewTrackingRequired } from "discourse/lib/ajax";
+import { resetAjax, trackNextAjaxAsPageview } from "discourse/lib/ajax";
 
 export default {
-  name: "page-tracking",
   after: "inject-objects",
 
-  initialize(container) {
+  initialize(owner) {
     // Tell our AJAX system to track a page transition
-    const router = container.lookup("router:main");
-    router.on("routeWillChange", viewTrackingRequired);
+    const router = owner.lookup("router:main");
+    router.on("routeWillChange", this.handleRouteWillChange);
 
-    let appEvents = container.lookup("service:app-events");
-    let documentTitle = container.lookup("service:document-title");
+    let appEvents = owner.lookup("service:app-events");
+    let documentTitle = owner.lookup("service:document-title");
 
     startPageTracking(router, appEvents, documentTitle);
 
@@ -65,7 +64,15 @@ export default {
     }
   },
 
+  handleRouteWillChange(transition) {
+    // will be null on initial boot transition, which is already tracked as a pageview via the HTML request
+    if (transition.from) {
+      trackNextAjaxAsPageview();
+    }
+  },
+
   teardown() {
     resetPageTracking();
+    resetAjax();
   },
 };
diff --git a/app/assets/javascripts/discourse/app/initializers/populate-template-map.js b/app/assets/javascripts/discourse/app/instance-initializers/populate-template-map.js
similarity index 85%
rename from app/assets/javascripts/discourse/app/initializers/populate-template-map.js
rename to app/assets/javascripts/discourse/app/instance-initializers/populate-template-map.js
index 4d198fed511..a05e84bda79 100644
--- a/app/assets/javascripts/discourse/app/initializers/populate-template-map.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/populate-template-map.js
@@ -1,7 +1,6 @@
 import discourseTemplateMap from "discourse-common/lib/discourse-template-map";
 
 export default {
-  name: "populate-template-map",
   initialize() {
     discourseTemplateMap.setModuleNames(Object.keys(requirejs.entries));
   },
diff --git a/app/assets/javascripts/discourse/app/initializers/post-decorations.js b/app/assets/javascripts/discourse/app/instance-initializers/post-decorations.js
similarity index 69%
rename from app/assets/javascripts/discourse/app/initializers/post-decorations.js
rename to app/assets/javascripts/discourse/app/instance-initializers/post-decorations.js
index 735ee492419..13db688c21a 100644
--- a/app/assets/javascripts/discourse/app/initializers/post-decorations.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/post-decorations.js
@@ -3,20 +3,24 @@ import discourseLater from "discourse-common/lib/later";
 import I18n from "I18n";
 import highlightSyntax from "discourse/lib/highlight-syntax";
 import lightbox from "discourse/lib/lightbox";
+import Columns from "discourse/lib/columns";
 import { iconHTML, iconNode } from "discourse-common/lib/icon-library";
 import { setTextDirections } from "discourse/lib/text-direction";
 import { nativeLazyLoading } from "discourse/lib/lazy-load-images";
 import { withPluginApi } from "discourse/lib/plugin-api";
 import { create } from "virtual-dom";
-import showModal from "discourse/lib/show-modal";
+import FullscreenTableModal from "discourse/components/modal/fullscreen-table";
+import { SELECTORS } from "discourse/lib/lightbox/constants";
 
 export default {
-  name: "post-decorations",
-  initialize(container) {
+  initialize(owner) {
     withPluginApi("0.1", (api) => {
-      const siteSettings = container.lookup("service:site-settings");
-      const session = container.lookup("service:session");
-      const site = container.lookup("service:site");
+      const siteSettings = owner.lookup("service:site-settings");
+      const session = owner.lookup("service:session");
+      const site = owner.lookup("service:site");
+      const modal = owner.lookup("service:modal");
+      // will eventually just be called lightbox
+      const lightboxService = owner.lookup("service:lightbox");
       api.decorateCookedElement(
         (elem) => {
           return highlightSyntax(elem, siteSettings, session);
@@ -26,11 +30,48 @@ export default {
         }
       );
 
+      if (siteSettings.enable_experimental_lightbox) {
+        api.decorateCookedElement(
+          (element, helper) => {
+            return helper &&
+              element.querySelector(SELECTORS.DEFAULT_ITEM_SELECTOR)
+              ? lightboxService.setupLightboxes({
+                  container: element,
+                  selector: SELECTORS.DEFAULT_ITEM_SELECTOR,
+                })
+              : null;
+          },
+          {
+            id: "experimental-discourse-lightbox",
+            onlyStream: true,
+          }
+        );
+
+        api.cleanupStream(lightboxService.cleanupLightboxes);
+      } else {
+        api.decorateCookedElement(
+          (elem) => {
+            return lightbox(elem, siteSettings);
+          },
+          { id: "discourse-lightbox" }
+        );
+      }
+
       api.decorateCookedElement(
         (elem) => {
-          return lightbox(elem, siteSettings);
+          const grids = elem.querySelectorAll(".d-image-grid");
+
+          if (!grids.length) {
+            return;
+          }
+
+          grids.forEach((grid) => {
+            return new Columns(grid, {
+              columns: site.mobileView ? 2 : 3,
+            });
+          });
         },
-        { id: "discourse-lightbox" }
+        { id: "discourse-image-grid" }
       );
 
       if (siteSettings.support_mixed_text_direction) {
@@ -58,7 +99,7 @@ export default {
         { id: "discourse-audio" }
       );
 
-      const caps = container.lookup("capabilities:main");
+      const caps = owner.lookup("service:capabilities");
       if (caps.isSafari || caps.isIOS) {
         api.decorateCookedElement(
           (elem) => {
@@ -141,15 +182,15 @@ export default {
           "open-popup-link",
           "btn-default",
           "btn",
-          "btn-icon-text"
+          "btn-icon",
+          "btn-expand-table",
+          "no-text"
         );
         const expandIcon = create(
           iconNode("discourse-expand", { class: "expand-table-icon" })
         );
-        const openPopupText = document.createTextNode(
-          I18n.t("fullscreen_table.expand_btn")
-        );
-        openPopupBtn.append(expandIcon, openPopupText);
+        openPopupBtn.title = I18n.t("fullscreen_table.expand_btn");
+        openPopupBtn.append(expandIcon);
         return openPopupBtn;
       }
 
@@ -158,10 +199,9 @@ export default {
       }
 
       function generateModal(event) {
-        const table = event.target.nextElementSibling;
+        const table = event.currentTarget.parentElement.nextElementSibling;
         const tempTable = table.cloneNode(true);
-
-        showModal("fullscreen-table").set("tableHtml", tempTable);
+        modal.show(FullscreenTableModal, { model: { tableHtml: tempTable } });
       }
 
       function generatePopups(tables) {
@@ -176,8 +216,12 @@ export default {
 
           const popupBtn = _createButton();
           table.parentNode.classList.add("fullscreen-table-wrapper");
-          table.parentNode.insertBefore(popupBtn, table);
+          // Create a button wrapper for case of multiple buttons (i.e. table builder extension)
+          const buttonWrapper = document.createElement("div");
+          buttonWrapper.classList.add("fullscreen-table-wrapper--buttons");
+          buttonWrapper.append(popupBtn);
           popupBtn.addEventListener("click", generateModal, false);
+          table.parentNode.insertBefore(buttonWrapper, table);
         });
       }
 
diff --git a/app/assets/javascripts/discourse/app/initializers/read-only.js b/app/assets/javascripts/discourse/app/instance-initializers/read-only.js
similarity index 72%
rename from app/assets/javascripts/discourse/app/initializers/read-only.js
rename to app/assets/javascripts/discourse/app/instance-initializers/read-only.js
index 8d322350b75..de339ff2146 100644
--- a/app/assets/javascripts/discourse/app/initializers/read-only.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/read-only.js
@@ -2,12 +2,11 @@ import { bind } from "discourse-common/utils/decorators";
 
 // Subscribe to "read-only" status change events via the Message Bus
 export default {
-  name: "read-only",
   after: "message-bus",
 
-  initialize(container) {
-    this.messageBus = container.lookup("service:message-bus");
-    this.site = container.lookup("service:site");
+  initialize(owner) {
+    this.messageBus = owner.lookup("service:message-bus");
+    this.site = owner.lookup("service:site");
 
     this.messageBus.subscribe("/site/read-only", this.onMessage);
   },
diff --git a/app/assets/javascripts/discourse/app/instance-initializers/register-hashtag-types.js b/app/assets/javascripts/discourse/app/instance-initializers/register-hashtag-types.js
new file mode 100644
index 00000000000..b102f6179e9
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/instance-initializers/register-hashtag-types.js
@@ -0,0 +1,14 @@
+import { withPluginApi } from "discourse/lib/plugin-api";
+import CategoryHashtagType from "discourse/lib/hashtag-types/category";
+import TagHashtagType from "discourse/lib/hashtag-types/tag";
+
+export default {
+  before: "hashtag-css-generator",
+
+  initialize(owner) {
+    withPluginApi("0.8.7", (api) => {
+      api.registerHashtagType("category", new CategoryHashtagType(owner));
+      api.registerHashtagType("tag", new TagHashtagType(owner));
+    });
+  },
+};
diff --git a/app/assets/javascripts/discourse/app/initializers/register-media-optimization-upload-processor.js b/app/assets/javascripts/discourse/app/instance-initializers/register-media-optimization-upload-processor.js
similarity index 81%
rename from app/assets/javascripts/discourse/app/initializers/register-media-optimization-upload-processor.js
rename to app/assets/javascripts/discourse/app/instance-initializers/register-media-optimization-upload-processor.js
index f7cd1f61322..d77388887f6 100644
--- a/app/assets/javascripts/discourse/app/initializers/register-media-optimization-upload-processor.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/register-media-optimization-upload-processor.js
@@ -3,11 +3,9 @@ import UppyMediaOptimization from "discourse/lib/uppy-media-optimization-plugin"
 import { Promise } from "rsvp";
 
 export default {
-  name: "register-media-optimization-upload-processor",
-
-  initialize(container) {
-    const siteSettings = container.lookup("service:site-settings");
-    const capabilities = container.lookup("capabilities:main");
+  initialize(owner) {
+    const siteSettings = owner.lookup("service:site-settings");
+    const capabilities = owner.lookup("service:capabilities");
 
     if (siteSettings.composer_media_optimization_image_enabled) {
       // NOTE: There are various performance issues with the Canvas
@@ -32,11 +30,11 @@ export default {
         ({ isMobileDevice }) => {
           return {
             optimizeFn: (data, opts) => {
-              if (container.isDestroyed || container.isDestroying) {
+              if (owner.isDestroyed || owner.isDestroying) {
                 return Promise.resolve();
               }
 
-              return container
+              return owner
                 .lookup("service:media-optimization-worker")
                 .optimizeImage(data, opts);
             },
diff --git a/app/assets/javascripts/discourse/app/instance-initializers/register-service-worker.js b/app/assets/javascripts/discourse/app/instance-initializers/register-service-worker.js
new file mode 100644
index 00000000000..aa9de2742bf
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/instance-initializers/register-service-worker.js
@@ -0,0 +1,8 @@
+import { registerServiceWorker } from "discourse/lib/register-service-worker";
+
+export default {
+  initialize(owner) {
+    let { serviceWorkerURL } = owner.lookup("service:session");
+    registerServiceWorker(serviceWorkerURL);
+  },
+};
diff --git a/app/assets/javascripts/discourse/app/initializers/relative-ages.js b/app/assets/javascripts/discourse/app/instance-initializers/relative-ages.js
similarity index 94%
rename from app/assets/javascripts/discourse/app/initializers/relative-ages.js
rename to app/assets/javascripts/discourse/app/instance-initializers/relative-ages.js
index 887725954a3..33b823aa0a8 100644
--- a/app/assets/javascripts/discourse/app/initializers/relative-ages.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/relative-ages.js
@@ -2,8 +2,6 @@ import { updateRelativeAge } from "discourse/lib/formatter";
 
 // Updates the relative ages of dates on the screen.
 export default {
-  name: "relative-ages",
-
   initialize() {
     this._interval = setInterval(function () {
       updateRelativeAge(document.querySelectorAll(".relative-date"));
diff --git a/app/assets/javascripts/discourse/app/initializers/sharing-sources.js b/app/assets/javascripts/discourse/app/instance-initializers/sharing-sources.js
similarity index 92%
rename from app/assets/javascripts/discourse/app/initializers/sharing-sources.js
rename to app/assets/javascripts/discourse/app/instance-initializers/sharing-sources.js
index c5f6e68163f..35d11bc601d 100644
--- a/app/assets/javascripts/discourse/app/initializers/sharing-sources.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/sharing-sources.js
@@ -2,10 +2,8 @@ import I18n from "I18n";
 import Sharing from "discourse/lib/sharing";
 
 export default {
-  name: "sharing-sources",
-
-  initialize(container) {
-    const siteSettings = container.lookup("service:site-settings");
+  initialize(owner) {
+    const siteSettings = owner.lookup("service:site-settings");
 
     Sharing.addSource({
       id: "twitter",
diff --git a/app/assets/javascripts/discourse/app/initializers/show-footer.js b/app/assets/javascripts/discourse/app/instance-initializers/show-footer.js
similarity index 58%
rename from app/assets/javascripts/discourse/app/initializers/show-footer.js
rename to app/assets/javascripts/discourse/app/instance-initializers/show-footer.js
index 4b196287dd0..82c4e6e9b9e 100644
--- a/app/assets/javascripts/discourse/app/initializers/show-footer.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/show-footer.js
@@ -1,9 +1,7 @@
 export default {
-  name: "show-footer",
-
-  initialize(container) {
-    const router = container.lookup("router:main");
-    const application = container.lookup("controller:application");
+  initialize(owner) {
+    const router = owner.lookup("router:main");
+    const application = owner.lookup("controller:application");
 
     // only take care of hiding the footer here
     // controllers MUST take care of displaying it
diff --git a/app/assets/javascripts/discourse/app/initializers/signup-cta.js b/app/assets/javascripts/discourse/app/instance-initializers/signup-cta.js
similarity index 82%
rename from app/assets/javascripts/discourse/app/initializers/signup-cta.js
rename to app/assets/javascripts/discourse/app/instance-initializers/signup-cta.js
index ba905454e3c..ed27e6385cd 100644
--- a/app/assets/javascripts/discourse/app/initializers/signup-cta.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/signup-cta.js
@@ -6,15 +6,13 @@ const ONE_DAY = 24 * 60 * 60 * 1000;
 const PROMPT_HIDE_DURATION = ONE_DAY;
 
 export default {
-  name: "signup-cta",
-
-  initialize(container) {
-    const screenTrack = container.lookup("service:screen-track");
+  initialize(owner) {
+    const screenTrack = owner.lookup("service:screen-track");
     const session = Session.current();
-    const siteSettings = container.lookup("service:site-settings");
-    const keyValueStore = container.lookup("service:key-value-store");
-    const user = container.lookup("service:current-user");
-    const appEvents = container.lookup("service:app-events");
+    const siteSettings = owner.lookup("service:site-settings");
+    const keyValueStore = owner.lookup("service:key-value-store");
+    const user = owner.lookup("service:current-user");
+    const appEvents = owner.lookup("service:app-events");
 
     // Preconditions
     if (user) {
diff --git a/app/assets/javascripts/discourse/app/instance-initializers/sniff-capabilities.js b/app/assets/javascripts/discourse/app/instance-initializers/sniff-capabilities.js
new file mode 100644
index 00000000000..b62e50f000a
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/instance-initializers/sniff-capabilities.js
@@ -0,0 +1,12 @@
+export default {
+  initialize(owner) {
+    const caps = owner.lookup("service:capabilities");
+    const html = document.documentElement;
+
+    if (caps.touch) {
+      html.classList.add("touch", "discourse-touch");
+    } else {
+      html.classList.add("no-touch", "discourse-no-touch");
+    }
+  },
+};
diff --git a/app/assets/javascripts/discourse/app/initializers/sticky-avatars.js b/app/assets/javascripts/discourse/app/instance-initializers/sticky-avatars.js
similarity index 60%
rename from app/assets/javascripts/discourse/app/initializers/sticky-avatars.js
rename to app/assets/javascripts/discourse/app/instance-initializers/sticky-avatars.js
index 2fa8c87d7b9..af393e5b2d2 100644
--- a/app/assets/javascripts/discourse/app/initializers/sticky-avatars.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/sticky-avatars.js
@@ -1,11 +1,10 @@
 import StickyAvatars from "discourse/lib/sticky-avatars";
 
 export default {
-  name: "sticky-avatars",
   after: "inject-objects",
 
-  initialize(container) {
-    this._stickyAvatars = StickyAvatars.init(container);
+  initialize(owner) {
+    this._stickyAvatars = StickyAvatars.init(owner);
   },
 
   teardown() {
diff --git a/app/assets/javascripts/discourse/app/initializers/strip-mobile-app-url-params.js b/app/assets/javascripts/discourse/app/instance-initializers/strip-mobile-app-url-params.js
similarity index 94%
rename from app/assets/javascripts/discourse/app/initializers/strip-mobile-app-url-params.js
rename to app/assets/javascripts/discourse/app/instance-initializers/strip-mobile-app-url-params.js
index fe634331891..35c4b4682e8 100644
--- a/app/assets/javascripts/discourse/app/initializers/strip-mobile-app-url-params.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/strip-mobile-app-url-params.js
@@ -1,6 +1,4 @@
 export default {
-  name: "strip-mobile-app-url-params",
-
   initialize() {
     let queryStrings = window.location.search;
 
diff --git a/app/assets/javascripts/discourse/app/initializers/subscribe-user-notifications.js b/app/assets/javascripts/discourse/app/instance-initializers/subscribe-user-notifications.js
similarity index 88%
rename from app/assets/javascripts/discourse/app/initializers/subscribe-user-notifications.js
rename to app/assets/javascripts/discourse/app/instance-initializers/subscribe-user-notifications.js
index e963f2fa003..34f01290a20 100644
--- a/app/assets/javascripts/discourse/app/initializers/subscribe-user-notifications.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/subscribe-user-notifications.js
@@ -15,27 +15,24 @@ import Notification from "discourse/models/notification";
 import { bind } from "discourse-common/utils/decorators";
 
 export default {
-  name: "subscribe-user-notifications",
   after: "message-bus",
 
-  initialize(container) {
-    this.currentUser = container.lookup("service:current-user");
+  initialize(owner) {
+    this.currentUser = owner.lookup("service:current-user");
 
     if (!this.currentUser) {
       return;
     }
 
-    this.messageBus = container.lookup("service:message-bus");
-    this.store = container.lookup("service:store");
-    this.messageBus = container.lookup("service:message-bus");
-    this.appEvents = container.lookup("service:app-events");
-    this.siteSettings = container.lookup("service:site-settings");
-    this.site = container.lookup("service:site");
-    this.router = container.lookup("router:main");
+    this.messageBus = owner.lookup("service:message-bus");
+    this.store = owner.lookup("service:store");
+    this.messageBus = owner.lookup("service:message-bus");
+    this.appEvents = owner.lookup("service:app-events");
+    this.siteSettings = owner.lookup("service:site-settings");
+    this.site = owner.lookup("service:site");
+    this.router = owner.lookup("router:main");
 
-    this.reviewableCountsChannel = this.currentUser.redesigned_user_menu_enabled
-      ? `/reviewable_counts/${this.currentUser.id}`
-      : "/reviewable_counts";
+    this.reviewableCountsChannel = `/reviewable_counts/${this.currentUser.id}`;
 
     this.messageBus.subscribe(
       this.reviewableCountsChannel,
@@ -126,12 +123,10 @@ export default {
       this.currentUser.updateReviewableCount(data.reviewable_count);
     }
 
-    if (this.currentUser.redesigned_user_menu_enabled) {
-      this.currentUser.set(
-        "unseen_reviewable_count",
-        data.unseen_reviewable_count
-      );
-    }
+    this.currentUser.set(
+      "unseen_reviewable_count",
+      data.unseen_reviewable_count
+    );
   },
 
   @bind
diff --git a/app/assets/javascripts/discourse/app/initializers/svg-sprite-fontawesome.js b/app/assets/javascripts/discourse/app/instance-initializers/svg-sprite-fontawesome.js
similarity index 54%
rename from app/assets/javascripts/discourse/app/initializers/svg-sprite-fontawesome.js
rename to app/assets/javascripts/discourse/app/instance-initializers/svg-sprite-fontawesome.js
index b9351be0665..4840299c34e 100644
--- a/app/assets/javascripts/discourse/app/initializers/svg-sprite-fontawesome.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/svg-sprite-fontawesome.js
@@ -1,11 +1,8 @@
 import { loadSprites } from "discourse/lib/svg-sprite-loader";
 
 export default {
-  name: "svg-sprite-fontawesome",
-  after: "export-application-global",
-
-  initialize(container) {
-    const session = container.lookup("service:session");
+  initialize(owner) {
+    const session = owner.lookup("service:session");
 
     if (session.svgSpritePath) {
       loadSprites(session.svgSpritePath, "fontawesome");
diff --git a/app/assets/javascripts/discourse/app/initializers/theme-errors-handler.js b/app/assets/javascripts/discourse/app/instance-initializers/theme-errors-handler.js
similarity index 94%
rename from app/assets/javascripts/discourse/app/initializers/theme-errors-handler.js
rename to app/assets/javascripts/discourse/app/instance-initializers/theme-errors-handler.js
index 827b26ea0cd..bf8cfc94696 100644
--- a/app/assets/javascripts/discourse/app/initializers/theme-errors-handler.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/theme-errors-handler.js
@@ -13,15 +13,12 @@ import Ember from "ember";
 const showingErrors = new Set();
 
 export default {
-  name: "theme-errors-handler",
-  after: "export-application-global",
-
-  initialize(container) {
+  initialize(owner) {
     if (isTesting()) {
       return;
     }
 
-    this.currentUser = container.lookup("service:current-user");
+    this.currentUser = owner.lookup("service:current-user");
 
     getAndClearUnhandledThemeErrors().forEach((e) => this.reportThemeError(e));
 
diff --git a/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js b/app/assets/javascripts/discourse/app/instance-initializers/topic-footer-buttons.js
similarity index 91%
rename from app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js
rename to app/assets/javascripts/discourse/app/instance-initializers/topic-footer-buttons.js
index 610bfefe5df..f1e3b651822 100644
--- a/app/assets/javascripts/discourse/app/initializers/topic-footer-buttons.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/topic-footer-buttons.js
@@ -4,7 +4,7 @@ import {
   WITH_REMINDER_ICON,
 } from "discourse/models/bookmark";
 import { registerTopicFooterButton } from "discourse/lib/register-topic-footer-button";
-import showModal from "discourse/lib/show-modal";
+import ShareTopicModal from "discourse/components/modal/share-topic";
 
 const SHARE_PRIORITY = 1000;
 const BOOKMARK_PRIORITY = 900;
@@ -13,9 +13,7 @@ const FLAG_PRIORITY = 700;
 const DEFER_PRIORITY = 500;
 
 export default {
-  name: "topic-footer-buttons",
-
-  initialize() {
+  initialize(owner) {
     registerTopicFooterButton({
       id: "share-and-invite",
       icon: "d-topic-share",
@@ -27,15 +25,15 @@ export default {
       },
       title: "topic.share.help",
       action() {
-        const controller = showModal("share-topic", {
-          model: this.topic.category,
-        });
-        controller.setProperties({
-          allowInvites:
-            this.currentUser.can_invite_to_forum &&
-            this.canInviteTo &&
-            !this.inviteDisabled,
-          topic: this.topic,
+        owner.lookup("service:modal").show(ShareTopicModal, {
+          model: {
+            category: this.topic.category,
+            topic: this.topic,
+            allowInvites:
+              this.currentUser.can_invite_to_forum &&
+              this.canInviteTo &&
+              !this.inviteDisabled,
+          },
         });
       },
       dropdown() {
diff --git a/app/assets/javascripts/discourse/app/initializers/url-redirects.js b/app/assets/javascripts/discourse/app/instance-initializers/url-redirects.js
similarity index 70%
rename from app/assets/javascripts/discourse/app/initializers/url-redirects.js
rename to app/assets/javascripts/discourse/app/instance-initializers/url-redirects.js
index e04798f90b0..e7bc0797fe5 100644
--- a/app/assets/javascripts/discourse/app/initializers/url-redirects.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/url-redirects.js
@@ -3,11 +3,10 @@ import { initializeDefaultHomepage } from "discourse/lib/utilities";
 import escapeRegExp from "discourse-common/utils/escape-regexp";
 
 export default {
-  name: "url-redirects",
   after: "inject-objects",
 
-  initialize(container) {
-    const currentUser = container.lookup("service:current-user");
+  initialize(owner) {
+    const currentUser = owner.lookup("service:current-user");
     if (currentUser) {
       const username = currentUser.get("username");
       const escapedUsername = escapeRegExp(username);
@@ -23,10 +22,15 @@ export default {
     DiscourseURL.rewrite(/^\/groups\//, "/g/");
 
     // Initialize default homepage
-    let siteSettings = container.lookup("service:site-settings");
+    let siteSettings = owner.lookup("service:site-settings");
     initializeDefaultHomepage(siteSettings);
 
-    DiscourseURL.rewrite(/^\/u\/([^\/]+)\/?$/, "/u/$1/summary", {
+    let defaultUserRoute = siteSettings.view_user_route || "summary";
+    if (!owner.lookup(`route:user.${defaultUserRoute}`)) {
+      defaultUserRoute = "summary";
+    }
+
+    DiscourseURL.rewrite(/^\/u\/([^\/]+)\/?$/, `/u/$1/${defaultUserRoute}`, {
       exceptions: [
         "/u/account-created",
         "/users/account-created",
diff --git a/app/assets/javascripts/discourse/app/initializers/user-tips.js b/app/assets/javascripts/discourse/app/instance-initializers/user-tips.js
similarity index 57%
rename from app/assets/javascripts/discourse/app/initializers/user-tips.js
rename to app/assets/javascripts/discourse/app/instance-initializers/user-tips.js
index 16a04cd6e57..999d00eef12 100644
--- a/app/assets/javascripts/discourse/app/initializers/user-tips.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/user-tips.js
@@ -1,27 +1,38 @@
 import { bind } from "discourse-common/utils/decorators";
 
 export default {
-  name: "user-tips",
   after: "message-bus",
 
-  initialize(container) {
-    this.currentUser = container.lookup("service:current-user");
+  initialize(owner) {
+    this.currentUser = owner.lookup("service:current-user");
     if (!this.currentUser) {
       return;
     }
 
-    this.messageBus = container.lookup("service:message-bus");
-    this.site = container.lookup("service:site");
+    this.messageBus = owner.lookup("service:message-bus");
+    this.site = owner.lookup("service:site");
 
-    this.messageBus.subscribe("/user-tips", this.onMessage);
+    this.messageBus.subscribe(
+      `/user-tips/${this.currentUser.id}`,
+      this.onMessage
+    );
   },
 
   teardown() {
-    this.messageBus?.unsubscribe("/user-tips", this.onMessage);
+    if (this.currentUser) {
+      this.messageBus?.unsubscribe(
+        `/user-tips/${this.currentUser.id}`,
+        this.onMessage
+      );
+    }
   },
 
   @bind
   onMessage(seenUserTips) {
+    if (!this.site.user_tips) {
+      return;
+    }
+
     this.currentUser.set("seen_popups", seenUserTips);
 
     if (!this.currentUser.user_option) {
diff --git a/app/assets/javascripts/discourse/app/initializers/webview-background.js b/app/assets/javascripts/discourse/app/instance-initializers/webview-background.js
similarity index 86%
rename from app/assets/javascripts/discourse/app/initializers/webview-background.js
rename to app/assets/javascripts/discourse/app/instance-initializers/webview-background.js
index dd2fa50e212..0e68eab1e31 100644
--- a/app/assets/javascripts/discourse/app/initializers/webview-background.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/webview-background.js
@@ -3,11 +3,10 @@ import discourseLater from "discourse-common/lib/later";
 
 // Send bg color to webview so iOS status bar matches site theme
 export default {
-  name: "webview-background",
   after: "inject-objects",
 
-  initialize(container) {
-    const caps = container.lookup("capabilities:main");
+  initialize(owner) {
+    const caps = owner.lookup("service:capabilities");
     if (caps.isAppWebview) {
       window
         .matchMedia("(prefers-color-scheme: dark)")
diff --git a/app/assets/javascripts/discourse/app/lib/after-transition.js b/app/assets/javascripts/discourse/app/lib/after-transition.js
deleted file mode 100644
index 70edaaf8436..00000000000
--- a/app/assets/javascripts/discourse/app/lib/after-transition.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
-  CSS transitions are a PITA, often we need to queue some js after a transition, this helper ensures
-  it happens after the transition.
-
-  SO: http://stackoverflow.com/questions/9943435/css3-animation-end-techniques
-**/
-let dummy = document.createElement("div"),
-  eventNameHash = {
-    webkit: "webkitTransitionEnd",
-    Moz: "transitionend",
-    O: "oTransitionEnd",
-    ms: "MSTransitionEnd",
-  };
-
-let transitionEnd = (function () {
-  let retValue;
-  retValue = "transitionend";
-  Object.keys(eventNameHash).some(function (vendor) {
-    if (vendor + "TransitionProperty" in dummy.style) {
-      retValue = eventNameHash[vendor];
-      return true;
-    }
-  });
-  return retValue;
-})();
-
-export default function (element, callback) {
-  return $(element).on(transitionEnd, (event) => {
-    if (event.target !== event.currentTarget) {
-      return;
-    }
-    return callback(event);
-  });
-}
diff --git a/app/assets/javascripts/discourse/app/lib/ajax-error.js b/app/assets/javascripts/discourse/app/lib/ajax-error.js
index cf93622a8cb..464afe9c78d 100644
--- a/app/assets/javascripts/discourse/app/lib/ajax-error.js
+++ b/app/assets/javascripts/discourse/app/lib/ajax-error.js
@@ -1,7 +1,8 @@
 import I18n from "I18n";
 import { getOwner } from "discourse-common/lib/get-owner";
+import { htmlSafe } from "@ember/template";
 
-export function extractError(error, defaultMessage) {
+function extractErrorInfo(error, defaultMessage) {
   if (error instanceof Error) {
     // eslint-disable-next-line no-console
     console.error(error.stack);
@@ -16,7 +17,9 @@ export function extractError(error, defaultMessage) {
     error = error.jqXHR;
   }
 
-  let parsedError, parsedJSON;
+  let html = false,
+    parsedError,
+    parsedJSON;
 
   if (error.responseJSON) {
     parsedJSON = error.responseJSON;
@@ -33,6 +36,10 @@ export function extractError(error, defaultMessage) {
   }
 
   if (parsedJSON) {
+    if (parsedJSON.html_message) {
+      html = true;
+    }
+
     if (parsedJSON.errors?.length > 1) {
       parsedError = I18n.t("multiple_errors", {
         errors: parsedJSON.errors.map((e, i) => `${i + 1}) ${e}`).join(" "),
@@ -56,20 +63,39 @@ export function extractError(error, defaultMessage) {
     }
   }
 
-  return parsedError || defaultMessage || I18n.t("generic_error");
+  return {
+    html,
+    message: parsedError || defaultMessage || I18n.t("generic_error"),
+  };
 }
 
-export function throwAjaxError(undoCallback) {
+export function extractError(error, defaultMessage) {
+  return extractErrorInfo(error, defaultMessage).message;
+}
+
+export function throwAjaxError(undoCallback, defaultMessage) {
   return function (error) {
     // If we provided an `undo` callback
     if (undoCallback) {
       undoCallback(error);
     }
-    throw extractError(error);
+    throw extractError(error, defaultMessage);
+  };
+}
+
+export function flashAjaxError(modal, defaultMessage) {
+  return (error) => {
+    modal.flash(extractError(error, defaultMessage), "error");
   };
 }
 
 export function popupAjaxError(error) {
   const dialog = getOwner(this).lookup("service:dialog");
-  dialog.alert(extractError(error));
+  const errorInfo = extractErrorInfo(error);
+
+  if (errorInfo.html) {
+    dialog.alert({ message: htmlSafe(errorInfo.message) });
+  } else {
+    dialog.alert(errorInfo.message);
+  }
 }
diff --git a/app/assets/javascripts/discourse/app/lib/ajax.js b/app/assets/javascripts/discourse/app/lib/ajax.js
index 4ec61986c91..e33b0e4a61f 100644
--- a/app/assets/javascripts/discourse/app/lib/ajax.js
+++ b/app/assets/javascripts/discourse/app/lib/ajax.js
@@ -15,10 +15,14 @@ export function setTransientHeader(key, value) {
   _transientHeader = { key, value };
 }
 
-export function viewTrackingRequired() {
+export function trackNextAjaxAsPageview() {
   _trackView = true;
 }
 
+export function resetAjax() {
+  _trackView = false;
+}
+
 export function setLogoffCallback(cb) {
   _logoffCallback = cb;
 }
diff --git a/app/assets/javascripts/discourse/app/lib/autocomplete.js b/app/assets/javascripts/discourse/app/lib/autocomplete.js
index 1f71e2cc3ae..32cb925e69f 100644
--- a/app/assets/javascripts/discourse/app/lib/autocomplete.js
+++ b/app/assets/javascripts/discourse/app/lib/autocomplete.js
@@ -6,6 +6,7 @@ import Site from "discourse/models/site";
 import { createPopper } from "@popperjs/core";
 import discourseDebounce from "discourse-common/lib/debounce";
 import { iconHTML } from "discourse-common/lib/icon-library";
+import { isDocumentRTL } from "discourse/lib/text-direction";
 
 /**
   This is a jQuery plugin to support autocompleting values in our text fields.
@@ -91,7 +92,6 @@ export default function (options) {
   let autocompleteOptions = null;
   let selectedOption = null;
   let completeStart = null;
-  let completeEnd = null;
   let me = this;
   let div = null;
   let scrollElement = null;
@@ -148,6 +148,7 @@ export default function (options) {
 
   function closeAutocomplete() {
     _autoCompletePopper?.destroy();
+    options.onClose && options.onClose();
 
     if (div) {
       div.hide().remove();
@@ -217,7 +218,9 @@ export default function (options) {
       });
   }
 
-  let completeTerm = async function (term) {
+  let completeTerm = async function (term, event) {
+    let completeEnd = null;
+
     if (term) {
       if (isInput) {
         me.val("");
@@ -227,17 +230,37 @@ export default function (options) {
         addInputSelectedItem(term, true);
       } else {
         if (options.transformComplete) {
-          term = await options.transformComplete(term);
+          term = await options.transformComplete(term, event);
         }
 
         if (term) {
           let text = me.val();
 
+          // After completion is done our position for completeStart may have
+          // drifted. This can happen if the TEXTAREA changed out-of-band between
+          // the time autocomplete was first displayed and the time of completion
+          // Specifically this may happen due to uploads which inject a placeholder
+          // which is later replaced with a different length string.
+          let pos = guessCompletePosition({ completeTerm: true });
+
+          if (
+            pos.completeStart !== undefined &&
+            pos.completeEnd !== undefined
+          ) {
+            completeStart = pos.completeStart;
+            completeEnd = pos.completeEnd;
+          } else {
+            completeStart = completeEnd = caretPosition(me[0]);
+          }
+
+          let space =
+            text.substring(completeEnd + 1, completeEnd + 2) === " " ? "" : " ";
+
           text =
             text.substring(0, completeStart) +
             (options.preserveKey ? options.key || "" : "") +
             term +
-            " " +
+            space +
             text.substring(completeEnd + 1, text.length);
 
           me.val(text);
@@ -251,7 +274,7 @@ export default function (options) {
           setCaretPosition(me[0], newCaretPos);
 
           if (options && options.afterComplete) {
-            options.afterComplete(text);
+            options.afterComplete(text, event);
           }
         }
       }
@@ -350,7 +373,7 @@ export default function (options) {
     } else {
       selectedOption = -1;
     }
-    ul.find("li").click(function () {
+    ul.find("li").click(function ({ originalEvent }) {
       selectedOption = ul.find("li").index(this);
       // hack for Gboard, see meta.discourse.org/t/-/187009/24
       if (autocompleteOptions == null) {
@@ -358,13 +381,13 @@ export default function (options) {
         const forcedAutocompleteOptions = dataSource(prevTerm, opts);
         forcedAutocompleteOptions?.then((data) => {
           updateAutoComplete(data);
-          completeTerm(autocompleteOptions[selectedOption]);
+          completeTerm(autocompleteOptions[selectedOption], originalEvent);
           if (!options.single) {
             me.focus();
           }
         });
       } else {
-        completeTerm(autocompleteOptions[selectedOption]);
+        completeTerm(autocompleteOptions[selectedOption], originalEvent);
         if (!options.single) {
           me.focus();
         }
@@ -382,11 +405,14 @@ export default function (options) {
       scrollElement = div.find(options.scrollElementSelector);
     }
 
+    if (options.onRender) {
+      options.onRender(autocompleteOptions);
+    }
+
     if (isInput || options.treatAsTextarea) {
       _autoCompletePopper && _autoCompletePopper.destroy();
       _autoCompletePopper = createPopper(me[0], div[0], {
-        placement: "bottom-start",
-        strategy: "fixed",
+        placement: `${Site.currentProp("mobileView") ? "top" : "bottom"}-start`,
         modifiers: [
           {
             name: "offset",
@@ -400,20 +426,14 @@ export default function (options) {
     }
 
     let vOffset = 0;
-    let hOffset = 0;
     let pos = me.caretPosition({
       pos: completeStart + 1,
     });
 
-    hOffset = 10;
     if (options.treatAsTextarea) {
       vOffset = -32;
     }
 
-    div.css({
-      left: "-1000px",
-    });
-
     if (!isInput && !options.treatAsTextarea) {
       vOffset = div.height();
 
@@ -426,34 +446,39 @@ export default function (options) {
         vOffset = BELOW;
       }
 
+      if (Site.currentProp("mobileView") && me.height() / 2 >= pos.top) {
+        vOffset = BELOW;
+      }
+    }
+
+    const mePos = me.position();
+
+    let left;
+    if (isDocumentRTL()) {
+      left = mePos.left + pos.left - div.width();
+    } else {
+      let hOffset = 10;
       if (Site.currentProp("mobileView")) {
-        if (me.height() / 2 >= pos.top) {
-          vOffset = BELOW;
-        }
         if (me.width() / 2 <= pos.left) {
           hOffset = -div.width();
         }
       }
+      left = mePos.left + pos.left + hOffset;
     }
-
-    let mePos = me.position();
-
-    let borderTop = parseInt(me.css("border-top-width"), 10) || 0;
-
-    let left = mePos.left + pos.left + hOffset;
     if (left < 0) {
       left = 0;
     }
 
     const offsetTop = me.offset().top;
+    const borderTop = parseInt(me.css("border-top-width"), 10) || 0;
     if (mePos.top + pos.top + borderTop - vOffset + offsetTop < 30) {
       vOffset = BELOW;
     }
 
     div.css({
       position: "absolute",
-      top: mePos.top + pos.top - vOffset + borderTop + "px",
-      left: left + "px",
+      top: `${mePos.top + pos.top - vOffset + borderTop}px`,
+      left: `${left}px`,
     });
   }
 
@@ -537,7 +562,6 @@ export default function (options) {
 
         if (match) {
           completeStart = cp - match[0].length;
-          completeEnd = completeStart + match[0].length - 1;
           let term = match[0].substring(1, match[0].length);
           updateAutoComplete(dataSource(term, options));
         }
@@ -551,7 +575,7 @@ export default function (options) {
           checkTriggerRule() &&
           (!prevChar || allowedLettersRegex.test(prevChar))
         ) {
-          completeStart = completeEnd = cp - 1;
+          completeStart = cp - 1;
           updateAutoComplete(dataSource("", options));
         }
       }
@@ -561,8 +585,55 @@ export default function (options) {
     }
   }
 
+  function guessCompletePosition(opts) {
+    let prev, stopFound, term;
+    let prevIsGood = true;
+    let element = me[0];
+    let backSpace = opts && opts.backSpace;
+    let completeTermOption = opts && opts.completeTerm;
+
+    let caretPos = caretPosition(element);
+
+    if (backSpace) {
+      caretPos -= 1;
+    }
+
+    let start = null;
+    let end = null;
+
+    let initialCaretPos = caretPos;
+
+    while (prevIsGood && caretPos >= 0) {
+      caretPos -= 1;
+      prev = element.value[caretPos];
+
+      stopFound = prev === options.key;
+
+      if (stopFound) {
+        prev = element.value[caretPos - 1];
+
+        if (
+          checkTriggerRule({ backSpace }) &&
+          (prev === undefined || allowedLettersRegex.test(prev))
+        ) {
+          start = caretPos;
+          term = element.value.substring(caretPos + 1, initialCaretPos);
+          end = caretPos + term.length;
+
+          break;
+        }
+      }
+      prevIsGood = !/\s/.test(prev);
+      if (completeTermOption) {
+        prevIsGood ||= prev === " ";
+      }
+    }
+
+    return { completeStart: start, completeEnd: end, term };
+  }
+
   function handleKeyDown(e) {
-    let c, i, initial, prev, prevIsGood, stopFound, term, total, userToComplete;
+    let i, term, total, userToComplete;
     let cp;
 
     if (e.ctrlKey || e.altKey || e.metaKey) {
@@ -597,35 +668,12 @@ export default function (options) {
     }
 
     if (completeStart === null && e.which === keys.backSpace && options.key) {
-      c = caretPosition(me[0]);
-      c -= 1;
-      initial = c;
-      prevIsGood = true;
+      let position = guessCompletePosition({ backSpace: true });
+      completeStart = position.completeStart;
 
-      while (prevIsGood && c >= 0) {
-        c -= 1;
-        prev = me[0].value[c];
-        stopFound = prev === options.key;
-
-        if (stopFound) {
-          prev = me[0].value[c - 1];
-
-          if (
-            checkTriggerRule({ backSpace: true }) &&
-            (!prev || allowedLettersRegex.test(prev))
-          ) {
-            completeStart = c;
-            term = me[0].value.substring(c + 1, initial);
-
-            if (!completeEnd) {
-              completeEnd = c + term.length;
-            }
-
-            updateAutoComplete(dataSource(term, options));
-            return true;
-          }
-        }
-        prevIsGood = /[a-zA-Z\.-]/.test(prev);
+      if (position.completeEnd) {
+        updateAutoComplete(dataSource(position.term, options));
+        return true;
       }
     }
 
@@ -667,7 +715,7 @@ export default function (options) {
             selectedOption >= 0 &&
             (userToComplete = autocompleteOptions[selectedOption])
           ) {
-            completeTerm(userToComplete);
+            completeTerm(userToComplete, e);
           } else {
             // We're cancelling it, really.
             return true;
@@ -686,6 +734,11 @@ export default function (options) {
           e.preventDefault();
           return false;
         case keys.downArrow:
+          if (!autocompleteOptions) {
+            closeAutocomplete();
+            return true;
+          }
+
           total = autocompleteOptions.length;
           selectedOption = selectedOption + 1;
           if (selectedOption >= total) {
@@ -701,7 +754,6 @@ export default function (options) {
         case keys.backSpace:
           autocompleteOptions = null;
           cp--;
-          completeEnd = cp;
 
           if (cp < 0) {
             closeAutocomplete();
@@ -725,7 +777,6 @@ export default function (options) {
           return true;
         default:
           autocompleteOptions = null;
-          completeEnd = cp;
           return true;
       }
     }
diff --git a/app/assets/javascripts/discourse/app/lib/bookmark.js b/app/assets/javascripts/discourse/app/lib/bookmark.js
index 3ed24cfb111..367ed8f8170 100644
--- a/app/assets/javascripts/discourse/app/lib/bookmark.js
+++ b/app/assets/javascripts/discourse/app/lib/bookmark.js
@@ -1,4 +1,8 @@
 import I18n from "I18n";
+import { AUTO_DELETE_PREFERENCES } from "discourse/models/bookmark";
+import { TIME_SHORTCUT_TYPES } from "discourse/lib/time-shortcut";
+import { tracked } from "@glimmer/tracking";
+
 export function formattedReminderTime(reminderAt, timezone) {
   let reminderAtDate = moment.tz(reminderAt, timezone);
   let formatted = reminderAtDate.format(I18n.t("dates.time"));
@@ -16,3 +20,43 @@ export function formattedReminderTime(reminderAt, timezone) {
     date_time: reminderAtDate.format(I18n.t("dates.long_with_year")),
   });
 }
+
+export class BookmarkFormData {
+  @tracked selectedDatetime;
+  @tracked selectedReminderType = TIME_SHORTCUT_TYPES.NONE;
+  @tracked id;
+  @tracked reminderAt;
+  @tracked autoDeletePreference;
+  @tracked name;
+  @tracked bookmarkableId;
+  @tracked bookmarkableType;
+
+  constructor(bookmark) {
+    this.id = bookmark.id;
+    this.reminderAt = bookmark.reminder_at;
+    this.name = bookmark.name;
+    this.bookmarkableId = bookmark.bookmarkable_id;
+    this.bookmarkableType = bookmark.bookmarkable_type;
+    this.autoDeletePreference =
+      bookmark.auto_delete_preference ?? AUTO_DELETE_PREFERENCES.CLEAR_REMINDER;
+  }
+
+  get reminderAtISO() {
+    if (!this.selectedReminderType || !this.selectedDatetime) {
+      return;
+    }
+
+    return this.selectedDatetime.toISOString();
+  }
+
+  get saveData() {
+    return {
+      reminder_at: this.reminderAtISO,
+      name: this.name,
+      id: this.id,
+      auto_delete_preference: this.autoDeletePreference,
+      bookmarkable_id: this.bookmarkableId,
+      bookmarkable_type: this.bookmarkableType,
+    };
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/lib/cached-topic-list.js b/app/assets/javascripts/discourse/app/lib/cached-topic-list.js
index 38148314d3c..a32d75990f9 100644
--- a/app/assets/javascripts/discourse/app/lib/cached-topic-list.js
+++ b/app/assets/javascripts/discourse/app/lib/cached-topic-list.js
@@ -1,13 +1,24 @@
+export function setCachedTopicList(session, topicList) {
+  session.set("topicList", topicList);
+}
+
+export function getCachedTopicList(session) {
+  session.get("topicList");
+}
+
+export function resetCachedTopicList(session) {
+  session.setProperties({
+    topicList: null,
+  });
+}
+
 export function findOrResetCachedTopicList(session, filter) {
   const lastTopicList = session.get("topicList");
 
   if (lastTopicList && lastTopicList.filter === filter) {
     return lastTopicList;
   } else {
-    session.setProperties({
-      topicList: null,
-      topicListScrollPosition: null,
-    });
+    resetCachedTopicList(session);
     return false;
   }
 }
diff --git a/app/assets/javascripts/discourse/app/lib/click-track.js b/app/assets/javascripts/discourse/app/lib/click-track.js
index 04290714033..5e8cde5f431 100644
--- a/app/assets/javascripts/discourse/app/lib/click-track.js
+++ b/app/assets/javascripts/discourse/app/lib/click-track.js
@@ -46,7 +46,7 @@ export function isValidLink(link) {
   return (
     link.classList.contains("track-link") ||
     !link.closest(
-      ".hashtag, .hashtag-cooked, .badge-category, .onebox-result, .onebox-body"
+      ".hashtag, .hashtag-cooked, .hashtag-icon-placeholder, .badge-category, .onebox-result, .onebox-body"
     )
   );
 }
diff --git a/app/assets/javascripts/discourse/app/lib/codeblock-buttons.js b/app/assets/javascripts/discourse/app/lib/codeblock-buttons.js
index a17ec51e224..4c38c2e5e12 100644
--- a/app/assets/javascripts/discourse/app/lib/codeblock-buttons.js
+++ b/app/assets/javascripts/discourse/app/lib/codeblock-buttons.js
@@ -2,11 +2,12 @@ import { cancel } from "@ember/runloop";
 import discourseLater from "discourse-common/lib/later";
 import Mobile from "discourse/lib/mobile";
 import { bind } from "discourse-common/utils/decorators";
-import showModal from "discourse/lib/show-modal";
 import I18n from "I18n";
 import { guidFor } from "@ember/object/internals";
 import { clipboardCopy } from "discourse/lib/utilities";
 import { iconHTML } from "discourse-common/lib/icon-library";
+import { getOwner } from "discourse-common/lib/get-owner";
+import FullscreenCodeModal from "discourse/components/modal/fullscreen-code";
 
 // Use to attach copy/fullscreen buttons to a block of code, either
 // within the post stream or for a regular element that contains
@@ -113,6 +114,9 @@ export default class CodeblockButtons {
         copyButton.ariaLabel = I18n.t("copy_codeblock.copy");
         copyButton.innerHTML = iconHTML("copy");
         wrapperEl.appendChild(copyButton);
+        wrapperEl.style.right = `${
+          codeBlock.offsetWidth - codeBlock.clientWidth
+        }px`;
       }
 
       if (
@@ -169,9 +173,12 @@ export default class CodeblockButtons {
           this._copyComplete(button);
         }
       } else if (action === "fullscreen") {
-        showModal("fullscreen-code").setProperties({
-          code: text,
-          codeClasses: codeEl.className,
+        const modal = getOwner(this).lookup("service:modal");
+        modal.show(FullscreenCodeModal, {
+          model: {
+            code: text,
+            codeClasses: codeEl.className,
+          },
         });
       }
     }
diff --git a/app/assets/javascripts/discourse/app/lib/color-scheme-picker.js b/app/assets/javascripts/discourse/app/lib/color-scheme-picker.js
index 7582323fcf6..3ce04d013f7 100644
--- a/app/assets/javascripts/discourse/app/lib/color-scheme-picker.js
+++ b/app/assets/javascripts/discourse/app/lib/color-scheme-picker.js
@@ -54,7 +54,7 @@ export function loadColorSchemeStylesheet(
   darkMode = false
 ) {
   const themeId = theme_id ? `/${theme_id}` : "";
-  ajax(`/color-scheme-stylesheet/${colorSchemeId}${themeId}.json`).then(
+  return ajax(`/color-scheme-stylesheet/${colorSchemeId}${themeId}.json`).then(
     (result) => {
       if (result && result.new_href) {
         const elementId = darkMode ? "cs-preview-dark" : "cs-preview-light";
diff --git a/app/assets/javascripts/discourse/app/lib/columns.js b/app/assets/javascripts/discourse/app/lib/columns.js
new file mode 100644
index 00000000000..3654748b987
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/columns.js
@@ -0,0 +1,119 @@
+/**
+ * Turns an element containing multiple children into a grid of columns.
+ * Can be used to arrange images or media in a grid.
+ *
+ * Inspired/adapted from https://github.com/mladenilic/columns.js
+ *
+ */
+export default class Columns {
+  constructor(container, options = {}) {
+    this.container = container;
+
+    this.options = {
+      columns: 3,
+      minCount: 2,
+      ...options,
+    };
+
+    this.items = this._prepareItems();
+
+    if (this.items.length >= this.options.minCount) {
+      this.render();
+    } else {
+      container.dataset.disabled = true;
+    }
+  }
+
+  count() {
+    // a 2x2 grid looks better in most cases for 2 or 4 items
+    if (this.items.length === 4 || this.items.length === 2) {
+      return 2;
+    }
+    return this.options.columns;
+  }
+
+  render() {
+    if (this.container.dataset.columns) {
+      return;
+    }
+
+    this.container.dataset.columns = this.count();
+
+    const columns = this._distributeEvenly();
+
+    while (this.container.firstChild) {
+      this.container.removeChild(this.container.firstChild);
+    }
+    this.container.append(...columns);
+    return this;
+  }
+
+  _prepareColumns(count) {
+    const columns = [];
+    [...Array(count)].forEach(() => {
+      const column = document.createElement("div");
+      column.classList.add("d-image-grid-column");
+      columns.push(column);
+    });
+
+    return columns;
+  }
+
+  _prepareItems() {
+    let targets = [];
+
+    Array.from(this.container.children).forEach((child) => {
+      if (child.nodeName === "P" && child.children.length > 0) {
+        // sometimes children are wrapped in a paragraph
+        Array.from(child.children).forEach((c) => {
+          targets.push(this._wrapDirectImage(c));
+        });
+      } else {
+        targets.push(this._wrapDirectImage(child));
+      }
+    });
+
+    return targets.filter((item) => {
+      return !["BR", "P"].includes(item.nodeName);
+    });
+  }
+
+  _wrapDirectImage(item) {
+    if (item.nodeName !== "IMG") {
+      return item;
+    }
+
+    const wrapper = document.createElement("span");
+    wrapper.classList.add("image-wrapper");
+    wrapper.append(item);
+    return wrapper;
+  }
+
+  _distributeEvenly() {
+    const count = this.count();
+    const columns = this._prepareColumns(count);
+
+    const columnHeights = [];
+    for (let n = 0; n < count; n++) {
+      columnHeights[n] = 0;
+    }
+    this.items.forEach((item) => {
+      let shortest = 0;
+
+      for (let j = 1; j < count; ++j) {
+        if (columnHeights[j] < columnHeights[shortest]) {
+          shortest = j;
+        }
+      }
+
+      // use aspect ratio to compare heights and append to shortest column
+      // if element is not an image, assume ratio is 1:1
+      const img = item.querySelector("img") || item;
+      const aR = img.nodeName === "IMG" ? img.height / img.width : 1;
+      columnHeights[shortest] += aR;
+      columns[shortest].append(item);
+    });
+
+    return columns;
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/lib/constants.js b/app/assets/javascripts/discourse/app/lib/constants.js
index c2e876a2612..d17290caf30 100644
--- a/app/assets/javascripts/discourse/app/lib/constants.js
+++ b/app/assets/javascripts/discourse/app/lib/constants.js
@@ -11,3 +11,13 @@ export const SEARCH_PRIORITIES = {
 };
 
 export const SEARCH_PHRASE_REGEXP = '"([^"]+)"';
+
+export const SIDEBAR_URL = {
+  max_icon_length: 40,
+  max_name_length: 80,
+  max_value_length: 200,
+};
+
+export const SIDEBAR_SECTION = {
+  max_title_length: 30,
+};
diff --git a/app/assets/javascripts/discourse/app/lib/d-tooltip.js b/app/assets/javascripts/discourse/app/lib/d-tooltip.js
new file mode 100644
index 00000000000..b217b54a44a
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/d-tooltip.js
@@ -0,0 +1,22 @@
+import tippy from "tippy.js";
+
+function stopPropagation(instance, event) {
+  event.preventDefault();
+  event.stopPropagation();
+}
+function hasTouchCapabilities() {
+  return navigator.maxTouchPoints > 1 || "ontouchstart" in window;
+}
+
+export default function createDTooltip(target, content) {
+  return tippy(target, {
+    interactive: false,
+    content,
+    trigger: hasTouchCapabilities() ? "click" : "mouseenter",
+    theme: "d-tooltip",
+    arrow: false,
+    placement: "bottom-start",
+    onTrigger: stopPropagation,
+    onUntrigger: stopPropagation,
+  });
+}
diff --git a/app/assets/javascripts/discourse/app/lib/discourse-location.js b/app/assets/javascripts/discourse/app/lib/discourse-location.js
index d672978f269..39a18a7fbd3 100644
--- a/app/assets/javascripts/discourse/app/lib/discourse-location.js
+++ b/app/assets/javascripts/discourse/app/lib/discourse-location.js
@@ -6,6 +6,17 @@ let popstateFired = false;
 const supportsHistoryState = window.history && "state" in window.history;
 const popstateCallbacks = [];
 
+function _uuid() {
+  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function (c) {
+    let r, v;
+    /* eslint-disable no-bitwise */
+    r = (Math.random() * 16) | 0;
+    v = c === "x" ? r : (r & 3) | 8;
+    /* eslint-enable no-bitwise */
+    return v.toString(16);
+  });
+}
+
 /**
   `Ember.DiscourseLocation` implements the location API using the browser's
   `history.pushState` API.
@@ -130,7 +141,7 @@ const DiscourseLocation = EmberObject.extend({
    @param path {String}
   */
   pushState(path) {
-    const state = { path };
+    const state = { path, uuid: _uuid() };
 
     // store state if browser doesn't support `history.state`
     if (!supportsHistoryState) {
@@ -152,7 +163,7 @@ const DiscourseLocation = EmberObject.extend({
    @param path {String}
   */
   replaceState(path) {
-    const state = { path };
+    const state = { path, uuid: _uuid() };
 
     // store state if browser doesn't support `history.state`
     if (!supportsHistoryState) {
diff --git a/app/assets/javascripts/discourse/app/lib/ember-events.js b/app/assets/javascripts/discourse/app/lib/ember-events.js
index dbd6dce9766..de8b6a69e6b 100644
--- a/app/assets/javascripts/discourse/app/lib/ember-events.js
+++ b/app/assets/javascripts/discourse/app/lib/ember-events.js
@@ -2,6 +2,7 @@
 import Component from "@ember/component";
 import EmberObject from "@ember/object";
 import { actionModifier } from "./ember-action-modifier";
+import Ember from "ember";
 
 /**
  * Classic Ember components (i.e. "@ember/component") rely upon "event
diff --git a/app/assets/javascripts/discourse/app/lib/form-template-validation.js b/app/assets/javascripts/discourse/app/lib/form-template-validation.js
new file mode 100644
index 00000000000..2bb59cca8f5
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/form-template-validation.js
@@ -0,0 +1,143 @@
+import I18n from "I18n";
+
+export default function prepareFormTemplateData(form) {
+  const formData = new FormData(form);
+
+  // Validate the form template
+  _validateFormTemplateData(form);
+  if (!form.checkValidity()) {
+    return false;
+  }
+
+  // Gather form template data
+  const formDetails = [];
+  for (let [key, value] of formData.entries()) {
+    formDetails.push({
+      [key]: value,
+    });
+  }
+
+  const mergedData = [];
+  const mergedKeys = new Set();
+
+  for (const item of formDetails) {
+    const key = Object.keys(item)[0]; // Get the key of the current item
+    if (mergedKeys.has(key)) {
+      // If the key has already been merged, append the value to the existing key
+      mergedData[mergedData.length - 1][key] += "\n" + item[key];
+    } else {
+      mergedData.push(item);
+      mergedKeys.add(key);
+    }
+  }
+
+  // Construct formatted post output
+  const formattedOutput = mergedData.map((item) => {
+    const key = Object.keys(item)[0];
+    const value = item[key];
+    if (value) {
+      return `### ${key}\n${value}`;
+    }
+  });
+
+  return formattedOutput.join("\n\n");
+}
+
+function _validateFormTemplateData(form) {
+  const fields = Array.from(form.elements);
+
+  fields.forEach((field) => {
+    field.setAttribute("aria-invalid", false);
+
+    const errorBox = document.createElement("div");
+    errorBox.classList.add("form-template-field__error", "popup-tip");
+    const errorId = field.id + "-error";
+
+    field.addEventListener("invalid", () => {
+      field.setAttribute("aria-invalid", true);
+      errorBox.classList.add("bad");
+      errorBox.setAttribute("id", errorId);
+      field.setAttribute("aria-describedby", errorId);
+
+      if (!field.nextElementSibling) {
+        field.insertAdjacentElement("afterend", errorBox);
+      }
+
+      _showErrorMessage(field, errorBox);
+    });
+
+    // Mark the field as valid as changed:
+    field.addEventListener("input", () => {
+      const valid = field.checkValidity();
+      if (valid) {
+        field.setAttribute("aria-invalid", false);
+        errorBox.classList.remove("bad");
+
+        errorBox.textContent = "";
+      }
+    });
+
+    field.addEventListener("blur", () => {
+      field.checkValidity();
+    });
+  });
+}
+
+function _showErrorMessage(field, element) {
+  if (field.validity.valueMissing) {
+    const prefix = "form_templates.errors.valueMissing";
+    const types = [
+      "select-one",
+      "select-multiple",
+      "checkbox",
+      "text",
+      "number",
+    ];
+    _showErrorByType(element, field, prefix, types);
+  } else if (field.validity.typeMismatch) {
+    const prefix = "form_templates.errors.typeMismatch";
+    const types = [
+      "color",
+      "date",
+      "email",
+      "number",
+      "password",
+      "tel",
+      "text",
+      "url",
+    ];
+    _showErrorByType(element, field, prefix, types);
+  } else if (field.validity.tooShort) {
+    element.textContent = I18n.t("form_templates.errors.tooShort", {
+      minLength: field.minLength,
+    });
+  } else if (field.validity.tooLong) {
+    element.textContent = I18n.t("form_templates.errors.tooLong", {
+      maxLength: field.maxLength,
+    });
+  } else if (field.validity.rangeOverflow) {
+    element.textContent = I18n.t("form_templates.errors.rangeOverflow", {
+      max: field.max,
+    });
+  } else if (field.validity.rangeUnderflow) {
+    element.textContent = I18n.t("form_templates.errors.rangeUnderflow", {
+      min: field.min,
+    });
+  } else if (field.validity.patternMismatch) {
+    element.textContent = I18n.t("form_templates.errors.patternMismatch");
+  } else if (field.validity.badInput) {
+    element.textContent = I18n.t("form_templates.errors.badInput");
+  }
+}
+
+function _showErrorByType(element, field, prefix, types) {
+  if (!types.includes(field.type)) {
+    element.textContent = I18n.t(`${prefix}.default`);
+  } else {
+    types.forEach((type) => {
+      if (field.type === type) {
+        element.textContent = I18n.t(`${prefix}.${type}`);
+      }
+    });
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/lib/formatter.js b/app/assets/javascripts/discourse/app/lib/formatter.js
index 66cd9991959..33004ab7666 100644
--- a/app/assets/javascripts/discourse/app/lib/formatter.js
+++ b/app/assets/javascripts/discourse/app/lib/formatter.js
@@ -7,7 +7,7 @@ export function shortDate(date) {
   return moment(date).format(I18n.t("dates.medium.date_year"));
 }
 
-function shortDateNoYear(date) {
+export function shortDateNoYear(date) {
   return moment(date).format(I18n.t("dates.tiny.date_month"));
 }
 
@@ -102,6 +102,11 @@ export function autoUpdatingRelativeAge(date, options) {
     append += "' title='" + longDate(date);
   }
 
+  let prefix = "";
+  if (options.prefix) {
+    prefix = options.prefix + " ";
+  }
+
   return (
     "<span class='relative-date" +
     append +
@@ -110,6 +115,7 @@ export function autoUpdatingRelativeAge(date, options) {
     "' data-format='" +
     format +
     "'>" +
+    prefix +
     relAge +
     "</span>"
   );
diff --git a/app/assets/javascripts/discourse/app/lib/hashtag-autocomplete.js b/app/assets/javascripts/discourse/app/lib/hashtag-autocomplete.js
index 8e052c22196..defdb468bf5 100644
--- a/app/assets/javascripts/discourse/app/lib/hashtag-autocomplete.js
+++ b/app/assets/javascripts/discourse/app/lib/hashtag-autocomplete.js
@@ -1,4 +1,5 @@
 import { findRawTemplate } from "discourse-common/lib/raw-templates";
+import domFromString from "discourse-common/lib/dom-from-string";
 import discourseLater from "discourse-common/lib/later";
 import { INPUT_DELAY, isTesting } from "discourse-common/config/environment";
 import { cancel } from "@ember/runloop";
@@ -14,6 +15,40 @@ import { search as searchCategoryTag } from "discourse/lib/category-tag-search";
 import { emojiUnescape } from "discourse/lib/text";
 import { htmlSafe } from "@ember/template";
 
+let hashtagTypeClasses = {};
+export function registerHashtagType(type, typeClassInstance) {
+  hashtagTypeClasses[type] = typeClassInstance;
+}
+export function cleanUpHashtagTypeClasses() {
+  hashtagTypeClasses = {};
+}
+export function getHashtagTypeClasses() {
+  return hashtagTypeClasses;
+}
+export function decorateHashtags(element, site) {
+  element.querySelectorAll(".hashtag-cooked").forEach((hashtagEl) => {
+    // Replace the empty icon placeholder span with actual icon HTML.
+    const iconPlaceholderEl = hashtagEl.querySelector(
+      ".hashtag-icon-placeholder"
+    );
+    const hashtagType = hashtagEl.dataset.type;
+    const hashtagTypeClass = getHashtagTypeClasses()[hashtagType];
+    if (iconPlaceholderEl && hashtagTypeClass) {
+      const hashtagIconHTML = hashtagTypeClass
+        .generateIconHTML({
+          icon: site.hashtag_icons[hashtagType],
+          id: hashtagEl.dataset.id,
+        })
+        .trim();
+      iconPlaceholderEl.replaceWith(domFromString(hashtagIconHTML)[0]);
+    }
+
+    // Add an aria-label to the hashtag element so that screen readers
+    // can read the hashtag text.
+    hashtagEl.setAttribute("aria-label", `${hashtagEl.innerText.trim()}`);
+  });
+}
+
 /**
  * Sets up a textarea using the jQuery autocomplete plugin, specifically
  * to match on the hashtag (#) character for autocompletion of categories,
@@ -205,12 +240,18 @@ function _searchRequest(term, contextualHashtagConfiguration, resultFunc) {
     data: { term, order: contextualHashtagConfiguration },
   });
   currentSearch
-    .then((r) => {
-      r.results?.forEach((result) => {
+    .then((response) => {
+      response.results?.forEach((result) => {
         // Convert :emoji: in the result text to HTML safely.
         result.text = htmlSafe(emojiUnescape(escapeExpression(result.text)));
+
+        const hashtagType = getHashtagTypeClasses()[result.type];
+        result.icon = hashtagType.generateIconHTML({
+          icon: result.icon,
+          id: result.id,
+        });
       });
-      resultFunc(r.results || CANCELLED_STATUS);
+      resultFunc(response.results || CANCELLED_STATUS);
     })
     .finally(() => {
       currentSearch = null;
@@ -224,7 +265,7 @@ function _findAndReplaceSeenHashtagPlaceholder(
   hashtagSpan
 ) {
   contextualHashtagConfiguration.forEach((type) => {
-    // replace raw span for the hashtag with a cooked one
+    // Replace raw span for the hashtag with a cooked one
     const matchingSeenHashtag = seenHashtags[type]?.[slugRef];
     if (matchingSeenHashtag) {
       // NOTE: When changing the HTML structure here, you must also change
@@ -233,8 +274,12 @@ function _findAndReplaceSeenHashtagPlaceholder(
       link.classList.add("hashtag-cooked");
       link.href = matchingSeenHashtag.relative_url;
       link.dataset.type = type;
+      link.dataset.id = matchingSeenHashtag.id;
       link.dataset.slug = matchingSeenHashtag.slug;
-      link.innerHTML = `<svg class="fa d-icon d-icon-${matchingSeenHashtag.icon} svg-icon svg-node"><use href="#${matchingSeenHashtag.icon}"></use></svg><span>${matchingSeenHashtag.text}</span>`;
+      const hashtagType = new getHashtagTypeClasses()[type];
+      link.innerHTML = `${hashtagType.generateIconHTML(
+        matchingSeenHashtag
+      )}<span>${emojiUnescape(matchingSeenHashtag.text)}</span>`;
       hashtagSpan.replaceWith(link);
     }
   });
diff --git a/app/assets/javascripts/discourse/app/lib/hashtag-types/base.js b/app/assets/javascripts/discourse/app/lib/hashtag-types/base.js
new file mode 100644
index 00000000000..4de8a448250
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/hashtag-types/base.js
@@ -0,0 +1,23 @@
+import { setOwner } from "@ember/application";
+
+export default class HashtagTypeBase {
+  constructor(owner) {
+    setOwner(this, owner);
+  }
+
+  get type() {
+    throw "not implemented";
+  }
+
+  get preloadedData() {
+    throw "not implemented";
+  }
+
+  generateColorCssClasses() {
+    throw "not implemented";
+  }
+
+  generateIconHTML() {
+    throw "not implemented";
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/lib/hashtag-types/category.js b/app/assets/javascripts/discourse/app/lib/hashtag-types/category.js
new file mode 100644
index 00000000000..6c5028d9c23
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/hashtag-types/category.js
@@ -0,0 +1,40 @@
+import HashtagTypeBase from "./base";
+import { inject as service } from "@ember/service";
+
+export default class CategoryHashtagType extends HashtagTypeBase {
+  @service site;
+
+  get type() {
+    return "category";
+  }
+
+  get preloadedData() {
+    return this.site.categories || [];
+  }
+
+  generateColorCssClasses(category) {
+    const generatedCssClasses = [];
+    const backgroundGradient = [`var(--category-${category.id}-color) 50%`];
+    if (category.parentCategory) {
+      backgroundGradient.push(
+        `var(--category-${category.parentCategory.id}-color) 50%`
+      );
+    } else {
+      backgroundGradient.push(`var(--category-${category.id}-color) 50%`);
+    }
+
+    generatedCssClasses.push(`.hashtag-color--category-${category.id} {
+  background: linear-gradient(-90deg, ${backgroundGradient.join(", ")});
+}`);
+
+    return generatedCssClasses;
+  }
+
+  generateIconHTML(hashtag) {
+    const hashtagId = parseInt(hashtag.id, 10);
+    const colorCssClass = !this.preloadedData.mapBy("id").includes(hashtagId)
+      ? "hashtag-missing"
+      : `hashtag-color--${this.type}-${hashtag.id}`;
+    return `<span class="hashtag-category-badge ${colorCssClass}"></span>`;
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/lib/hashtag-types/tag.js b/app/assets/javascripts/discourse/app/lib/hashtag-types/tag.js
new file mode 100644
index 00000000000..42cd657f210
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/hashtag-types/tag.js
@@ -0,0 +1,22 @@
+import HashtagTypeBase from "./base";
+import { iconHTML } from "discourse-common/lib/icon-library";
+
+export default class TagHashtagType extends HashtagTypeBase {
+  get type() {
+    return "tag";
+  }
+
+  get preloadedData() {
+    return [];
+  }
+
+  generateColorCssClasses() {
+    return [];
+  }
+
+  generateIconHTML(hashtag) {
+    return iconHTML(hashtag.icon, {
+      class: `hashtag-color--${this.type}-${hashtag.id}`,
+    });
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/lib/implicit-injections.js b/app/assets/javascripts/discourse/app/lib/implicit-injections.js
new file mode 100644
index 00000000000..711ec882214
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/implicit-injections.js
@@ -0,0 +1,126 @@
+import { getOwner } from "@ember/application";
+import EmberObject, { computed } from "@ember/object";
+
+import Controller from "@ember/controller";
+import Component from "@ember/component";
+import Route from "@ember/routing/route";
+import RestModel from "discourse/models/rest";
+import RestAdapter from "discourse/adapters/rest";
+import Service from "@ember/service";
+
+const disableImplicitInjectionsKey = Symbol("DISABLE_IMPLICIT_INJECTIONS");
+
+/**
+ * Based on the Ember's standard injection helper, plus extra logic to make it behave more
+ * like Ember<=3 'implicit injections', and to allow disabling it on a per-class basis.
+ * https://github.com/emberjs/ember.js/blob/22b318a381/packages/%40ember/-internals/metal/lib/injected_property.ts#L37
+ *
+ */
+function implicitInjectionShim(lookupName, key) {
+  let overrideKey = `__OVERRIDE_${key}`;
+
+  return computed(key, {
+    get() {
+      if (this[overrideKey]) {
+        return this[overrideKey];
+      }
+      if (this[disableImplicitInjectionsKey]) {
+        return undefined;
+      }
+
+      let owner = getOwner(this) || this.container;
+      if (!owner) {
+        return undefined;
+      }
+      return owner.lookup(lookupName);
+    },
+
+    set(_, value) {
+      return (this[overrideKey] = value);
+    },
+  });
+}
+
+function setInjections(target, injections) {
+  const extension = {};
+  for (const [key, lookupName] of Object.entries(injections)) {
+    extension[key] = implicitInjectionShim(lookupName, key);
+  }
+  EmberObject.reopen.call(target, extension);
+}
+
+let alreadyRegistered = false;
+
+/**
+ * Configure Discourse's standard injections on common framework classes.
+ * In Ember<=3 this was done using 'implicit injections', but these have been
+ * removed in Ember 4. This shim implements similar behaviour by reopening the
+ * base framework classes.
+ *
+ * Long-term we aim to move away from this pattern, towards 'explicit injections'
+ * https://guides.emberjs.com/release/applications/dependency-injection/
+ *
+ * Incremental migration to newer patterns can be achieved using the `@disableImplicitInjections`
+ * helper (available on `discourse/lib/implicit-injections')
+ */
+export function registerDiscourseImplicitInjections() {
+  if (alreadyRegistered) {
+    return;
+  }
+  const commonInjections = {
+    appEvents: "service:app-events",
+    pmTopicTrackingState: "service:pm-topic-tracking-state",
+    store: "service:store",
+    site: "service:site",
+    searchService: "service:search",
+    session: "service:session",
+    messageBus: "service:message-bus",
+    siteSettings: "service:site-settings",
+    topicTrackingState: "service:topic-tracking-state",
+    keyValueStore: "service:key-value-store",
+  };
+
+  setInjections(Controller, {
+    ...commonInjections,
+    capabilities: "service:capabilities",
+    currentUser: "service:current-user",
+  });
+
+  setInjections(Component, {
+    capabilities: "service:capabilities",
+    currentUser: "service:current-user",
+    ...commonInjections,
+  });
+
+  setInjections(Route, {
+    ...commonInjections,
+    currentUser: "service:current-user",
+  });
+
+  setInjections(RestModel, {
+    ...commonInjections,
+  });
+
+  setInjections(RestAdapter, {
+    ...commonInjections,
+  });
+
+  setInjections(Service, {
+    session: "service:session",
+    messageBus: "service:message-bus",
+    siteSettings: "service:site-settings",
+    topicTrackingState: "service:topic-tracking-state",
+    keyValueStore: "service:key-value-store",
+    currentUser: "service:current-user",
+  });
+
+  alreadyRegistered = true;
+}
+
+/**
+ * A class decorator which disables implicit injections for instances of this class.
+ * Essentially opts-in to the modern Ember 4+ behaviour.
+ */
+export function disableImplicitInjections(target) {
+  target.prototype[disableImplicitInjectionsKey] = true;
+}
diff --git a/app/assets/javascripts/discourse/app/lib/intercept-click.js b/app/assets/javascripts/discourse/app/lib/intercept-click.js
index 0e7b33334af..fe81d6d5254 100644
--- a/app/assets/javascripts/discourse/app/lib/intercept-click.js
+++ b/app/assets/javascripts/discourse/app/lib/intercept-click.js
@@ -24,11 +24,13 @@ export default function interceptClick(e) {
 
   const currentTarget = e.currentTarget;
   const href = currentTarget.getAttribute("href");
+  const linkTarget = currentTarget.getAttribute("target");
+  const targettingOtherFrame = linkTarget && linkTarget !== "_self";
 
   if (
     !href ||
     href.startsWith("#") ||
-    currentTarget.getAttribute("target") ||
+    targettingOtherFrame ||
     currentTarget.dataset.emberAction ||
     currentTarget.dataset.autoRoute ||
     currentTarget.dataset.shareUrl ||
diff --git a/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js b/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
index e5b75854665..5eb93bec091 100644
--- a/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
@@ -1,5 +1,6 @@
 import { bind } from "discourse-common/utils/decorators";
 import discourseDebounce from "discourse-common/lib/debounce";
+import { getOwner, setOwner } from "@ember/application";
 import { run, throttle } from "@ember/runloop";
 import discourseLater from "discourse-common/lib/later";
 import {
@@ -12,7 +13,7 @@ import domUtils from "discourse-common/utils/dom-utils";
 import { INPUT_DELAY } from "discourse-common/config/environment";
 import { ajax } from "discourse/lib/ajax";
 import { headerOffset } from "discourse/lib/offset-calculator";
-import { helperContext } from "discourse-common/lib/helpers";
+import { capabilities } from "discourse/services/capabilities";
 
 let extraKeyboardShortcutsHelp = {};
 function addExtraKeyboardShortcutHelp(help) {
@@ -32,6 +33,12 @@ export function clearExtraKeyboardShortcutHelp() {
 
 export { extraKeyboardShortcutsHelp as extraKeyboardShortcutsHelp };
 
+export const PLATFORM_KEY_MODIFIER = /Mac|iPod|iPhone|iPad/.test(
+  navigator.platform
+)
+  ? "meta"
+  : "ctrl";
+
 const DEFAULT_BINDINGS = {
   "!": { postAction: "showFlags" },
   "#": { handler: "goToPost", anonymous: true },
@@ -99,7 +106,10 @@ const DEFAULT_BINDINGS = {
   "shift+k": { handler: "prevSection", anonymous: true },
   "shift+p": { handler: "pinUnpinTopic" },
   "shift+r": { handler: "replyToTopic" },
-  "shift+s": { click: "#topic-footer-buttons button.share", anonymous: true }, // share topic
+  "shift+s": {
+    click: "#topic-footer-buttons button.share-and-invite",
+    anonymous: true,
+  }, // share topic
   "shift+l": { handler: "goToUnreadPost" },
   "shift+z shift+z": { handler: "logout" },
   "shift+f11": { handler: "fullscreenComposer", global: true },
@@ -121,7 +131,9 @@ function preventKeyboardEvent(event) {
 }
 
 export default {
-  init(keyTrapper, container) {
+  init(keyTrapper, owner) {
+    setOwner(this, owner);
+
     // Sometimes the keyboard shortcut initializer is not torn down. This makes sure
     // we clear any previous test state.
     if (this.keyTrapper) {
@@ -130,14 +142,13 @@ export default {
     }
 
     this.keyTrapper = new keyTrapper();
-    this.container = container;
     this._stopCallback();
 
-    this.searchService = this.container.lookup("service:search");
-    this.appEvents = this.container.lookup("service:app-events");
-    this.currentUser = this.container.lookup("service:current-user");
-    this.siteSettings = this.container.lookup("service:site-settings");
-    this.site = this.container.lookup("service:site");
+    this.searchService = owner.lookup("service:search");
+    this.appEvents = owner.lookup("service:app-events");
+    this.currentUser = owner.lookup("service:current-user");
+    this.siteSettings = owner.lookup("service:site-settings");
+    this.site = owner.lookup("service:site");
 
     // Disable the shortcut if private messages are disabled
     if (!this.currentUser?.can_send_private_messages) {
@@ -158,11 +169,10 @@ export default {
 
     this.keyTrapper?.destroy();
     this.keyTrapper = null;
-    this.container = null;
   },
 
   isTornDown() {
-    return this.keyTrapper == null || this.container == null;
+    return this.keyTrapper == null;
   },
 
   bindKey(key, binding = null) {
@@ -298,16 +308,16 @@ export default {
     const topic = this.currentTopic();
     if (topic && document.querySelectorAll(".posts-wrapper").length) {
       preventKeyboardEvent(event);
-      this.container.lookup("controller:topic").send("toggleBookmark");
+      getOwner(this).lookup("controller:topic").send("toggleBookmark");
     }
   },
 
   logout() {
-    this.container.lookup("route:application").send("logout");
+    getOwner(this).lookup("route:application").send("logout");
   },
 
   quoteReply() {
-    if (this.isPostTextSelected()) {
+    if (this.isPostTextSelected) {
       this.appEvents.trigger("quote-button:quote");
       return false;
     }
@@ -323,7 +333,7 @@ export default {
   },
 
   editPost() {
-    if (this.siteSettings.enable_fast_edit && this.isPostTextSelected()) {
+    if (this.siteSettings.enable_fast_edit && this.isPostTextSelected) {
       this.appEvents.trigger("quote-button:edit");
       return false;
     } else {
@@ -350,11 +360,11 @@ export default {
   },
 
   goToFirstSuggestedTopic() {
-    const el = document.querySelector(".suggested-topics a.raw-topic-link");
+    const el = document.querySelector("#suggested-topics a.raw-topic-link");
     if (el) {
       el.click();
     } else {
-      const controller = this.container.lookup("controller:topic");
+      const controller = getOwner(this).lookup("controller:topic");
       // Only the last page contains list of suggested topics.
       const url = `/t/${controller.get("model.id")}/last.json`;
       ajax(url).then((result) => {
@@ -383,7 +393,7 @@ export default {
 
   _jumpTo(direction) {
     if (document.querySelector(".container.posts")) {
-      this.container.lookup("controller:topic").send(direction);
+      getOwner(this).lookup("controller:topic").send(direction);
     }
   },
 
@@ -426,7 +436,7 @@ export default {
     run(() => {
       if (document.querySelector(".container.posts")) {
         event.preventDefault(); // We need to stop printing the current page in Firefox
-        this.container.lookup("controller:topic").print();
+        getOwner(this).lookup("controller:topic").print();
       }
     });
   },
@@ -445,14 +455,14 @@ export default {
       return;
     }
 
-    this.container.lookup("controller:composer").open({
+    getOwner(this).lookup("service:composer").open({
       action: Composer.CREATE_TOPIC,
       draftKey: Composer.NEW_TOPIC_KEY,
     });
   },
 
   focusComposer(event) {
-    const composer = this.container.lookup("controller:composer");
+    const composer = getOwner(this).lookup("service:composer");
     if (event) {
       event.preventDefault();
       event.stopPropagation();
@@ -461,14 +471,14 @@ export default {
   },
 
   fullscreenComposer() {
-    const composer = this.container.lookup("controller:composer");
+    const composer = getOwner(this).lookup("service:composer");
     if (composer.get("model")) {
       composer.toggleFullscreen();
     }
   },
 
   pinUnpinTopic() {
-    this.container.lookup("controller:topic").togglePinnedState();
+    getOwner(this).lookup("controller:topic").togglePinnedState();
   },
 
   goToPost(event) {
@@ -497,7 +507,7 @@ export default {
   },
 
   showHelpModal() {
-    this.container
+    getOwner(this)
       .lookup("controller:application")
       .send("showKeyboardShortcutsHelp");
   },
@@ -531,7 +541,7 @@ export default {
   sendToTopicListItemView(action, elem) {
     elem = elem || document.querySelector("tr.selected.topic-list-item");
     if (elem) {
-      const registry = this.container.lookup("-view-registry:main");
+      const registry = getOwner(this).lookup("-view-registry:main");
       if (registry) {
         const view = registry[elem.id];
         view.send(action);
@@ -540,7 +550,7 @@ export default {
   },
 
   currentTopic() {
-    const topicController = this.container.lookup("controller:topic");
+    const topicController = getOwner(this).lookup("controller:topic");
     if (topicController) {
       const topic = topicController.get("model");
       if (topic) {
@@ -549,9 +559,9 @@ export default {
     }
   },
 
-  isPostTextSelected() {
-    const topicController = this.container.lookup("controller:topic");
-    return !!topicController?.get("quoteState")?.postId;
+  get isPostTextSelected() {
+    const topicController = getOwner(this).lookup("controller:topic");
+    return !!topicController.quoteState.postId;
   },
 
   sendToSelectedPost(action, elem) {
@@ -565,7 +575,7 @@ export default {
     }
 
     if (selectedPostId) {
-      const topicController = this.container.lookup("controller:topic");
+      const topicController = getOwner(this).lookup("controller:topic");
       const post = topicController
         .get("model.postStream.posts")
         .findBy("id", selectedPostId);
@@ -574,7 +584,7 @@ export default {
 
         let actionMethod = topicController.actions[action];
         if (!actionMethod) {
-          const topicRoute = this.container.lookup("route:topic");
+          const topicRoute = getOwner(this).lookup("route:topic");
           actionMethod = topicRoute.actions[action];
         }
 
@@ -721,9 +731,20 @@ export default {
       }
     }
 
-    article = articles[index + direction];
-    if (!article) {
-      return;
+    let newIndex = index;
+    while (true) {
+      newIndex += direction;
+      article = articles[newIndex];
+
+      // Element doesn't exist
+      if (!article) {
+        return;
+      }
+
+      // Element is visible
+      if (article.getBoundingClientRect().height > 0) {
+        break;
+      }
     }
 
     for (const a of articles) {
@@ -849,7 +870,7 @@ export default {
   },
 
   _replyToPost() {
-    this.container.lookup("controller:topic").send("replyToPost");
+    getOwner(this).lookup("controller:topic").send("replyToPost");
   },
 
   _getSelectedPost() {
@@ -861,7 +882,7 @@ export default {
   },
 
   deferTopic() {
-    this.container.lookup("controller:topic").send("deferTopic");
+    getOwner(this).lookup("controller:topic").send("deferTopic");
   },
 
   toggleAdminActions() {
@@ -869,13 +890,13 @@ export default {
   },
 
   webviewKeyboardBack() {
-    if (helperContext().capabilities.isAppWebview) {
+    if (capabilities.isAppWebview) {
       window.history.back();
     }
   },
 
   webviewKeyboardForward() {
-    if (helperContext().capabilities.isAppWebview) {
+    if (capabilities.isAppWebview) {
       window.history.forward();
     }
   },
diff --git a/app/assets/javascripts/discourse/app/lib/lightbox.js b/app/assets/javascripts/discourse/app/lib/lightbox.js
index 27704d0fcdf..eb5c92170a5 100644
--- a/app/assets/javascripts/discourse/app/lib/lightbox.js
+++ b/app/assets/javascripts/discourse/app/lib/lightbox.js
@@ -2,22 +2,50 @@ import {
   escapeExpression,
   postRNWebviewMessage,
 } from "discourse/lib/utilities";
+
 import I18n from "I18n";
 import User from "discourse/models/user";
+import deprecated from "discourse-common/lib/deprecated";
+import { getOwner } from "discourse-common/lib/get-owner";
+import { helperContext } from "discourse-common/lib/helpers";
+import { isTesting } from "discourse-common/config/environment";
 import loadScript from "discourse/lib/load-script";
 import { renderIcon } from "discourse-common/lib/icon-library";
 import { spinnerHTML } from "discourse/helpers/loading-spinner";
-import { helperContext } from "discourse-common/lib/helpers";
-import { isTesting } from "discourse-common/config/environment";
+import { SELECTORS } from "discourse/lib/lightbox/constants";
+
+export async function setupLightboxes({ container, selector }) {
+  const lightboxService = getOwner(this).lookup("service:lightbox");
+  lightboxService.setupLightboxes({ container, selector });
+}
+
+export function cleanupLightboxes() {
+  const lightboxService = getOwner(this).lookup("service:lightbox");
+  return lightboxService.cleanupLightboxes();
+}
+
+export default function lightbox(elem, siteSettings) {
+  if (siteSettings.enable_experimental_lightbox) {
+    deprecated(
+      "Accessing the default `lightbox` export is deprecated. Import setupLightboxes and cleanupLightboxes from `discourse/lib/lightbox` instead.",
+      {
+        since: "3.0.0.beta16",
+        dropFrom: "3.2.0",
+        id: "discourse.lightbox.default-export",
+      }
+    );
+
+    return setupLightboxes({
+      container: elem,
+      selector: SELECTORS.DEFAULT_ITEM_SELECTOR,
+    });
+  }
 
-export default function (elem, siteSettings) {
   if (!elem) {
     return;
   }
 
-  const lightboxes = elem.querySelectorAll(
-    "*:not(.spoiler):not(.spoiled) a.lightbox"
-  );
+  const lightboxes = elem.querySelectorAll(SELECTORS.DEFAULT_ITEM_SELECTOR);
 
   if (!lightboxes.length) {
     return;
diff --git a/app/assets/javascripts/discourse/app/lib/lightbox/constants.js b/app/assets/javascripts/discourse/app/lib/lightbox/constants.js
new file mode 100644
index 00000000000..04472c0189a
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/lightbox/constants.js
@@ -0,0 +1,81 @@
+import { isTesting } from "discourse-common/config/environment";
+
+export const ANIMATION_DURATION =
+  isTesting() || window.matchMedia("(prefers-reduced-motion: reduce)").matches
+    ? 0
+    : 150;
+
+export const MIN_CAROUSEL_ARROW_ITEM_COUNT = 5;
+
+export const SWIPE_THRESHOLD = 50;
+
+export const SWIPE_DIRECTIONS = {
+  DOWN: "down",
+  LEFT: "left",
+  RIGHT: "right",
+  UP: "up",
+};
+
+export const DOCUMENT_ELEMENT_LIGHTBOX_OPEN_CLASS = "has-lightbox";
+export const LIGHTBOX_ELEMENT_ID = "discourse-lightbox";
+export const TITLE_ELEMENT_ID = "d-lightbox-image-title";
+
+export const SELECTORS = {
+  ACTIVE_CAROUSEL_ITEM: "[data-lightbox-carousel-item='current']",
+  DEFAULT_ITEM_SELECTOR: "*:not(.spoiler):not(.spoiled) a.lightbox",
+  FILE_DETAILS_CONTAINER: ".informations",
+  LIGHTBOX_CONTAINER: ".d-lightbox",
+  LIGHTBOX_CONTENT: ".d-lightbox__content",
+  LIGHTBOX_BODY: ".d-lightbox__body",
+  FOCUS_TRAP: ".d-lightbox__focus-trap",
+  MAIN_IMAGE: ".d-lightbox__main-image",
+  MULTI_BUTTONS: ".d-lightbox__multi-item-controls",
+  CAROUSEL_BUTTON: ".d-lightbox__carousel-button",
+  PREV_BUTTON: ".d-lightbox__previous-button",
+  NEXT_BUTTON: ".d-lightbox__next-button",
+  CLOSE_BUTTON: ".d-lightbox__close-button",
+  FULL_SCREEN_BUTTON: ".d-lightbox__full-screen-button",
+  TAB_BUTTON: ".d-lightbox__new-tab-button",
+  ROTATE_BUTTON: ".d-lightbox__rotate-button",
+  ZOOM_BUTTON: ".d-lightbox__zoom-button",
+  DOWNLOAD_BUTTON: ".d-lightbox__download-button",
+  COUNTERS: ".d-lightbox__counters",
+  COUNTER_CURRENT: ".d-lightbox__counter-current",
+  COUNTER_TOTAL: ".d-lightbox__counter-total",
+  IMAGE_TITLE: ".d-lightbox__image-title",
+  ACTIVE_ITEM_TITLE: ".d-lightbox__item-title",
+  ACTIVE_ITEM_FILE_DETAILS: ".d-lightbox__item-file-details",
+  CAROUSEL: ".d-lightbox__carousel",
+  CAROUSEL_ITEM: ".d-lightbox__carousel-item",
+  CAROUSEL_PREV_BUTTON: ".d-lightbox__carousel-previous-button",
+  CAROUSEL_NEXT_BUTTON: ".d-lightbox__carousel-next-button",
+};
+
+export const LIGHTBOX_APP_EVENT_NAMES = {
+  // this cannot use dom:clean else #cleanupLightboxes will be called after #setupLightboxes
+  CLEAN: "lightbox:clean",
+  CLOSE: "lightbox:close",
+  CLOSED: "lightbox:closed",
+  ITEM_DID_CHANGE: "lightbox:item-did-change",
+  ITEM_WILL_CHANGE: "lightbox:item-will-change",
+  OPEN: "lightbox:open",
+  OPENED: "lightbox:opened",
+};
+
+export const LAYOUT_TYPES = {
+  HORIZONTAL: "horizontal",
+  VERTICAL: "vertical",
+};
+
+export const KEYBOARD_SHORTCUTS = {
+  CAROUSEL: "a",
+  CLOSE: "Escape",
+  DOWNLOAD: "d",
+  FULLSCREEN: "m",
+  NEWTAB: "n",
+  NEXT: ["ArrowRight", "ArrowDown"],
+  PREVIOUS: ["ArrowLeft", "ArrowUp"],
+  ROTATE: "r",
+  TITLE: "t",
+  ZOOM: "z",
+};
diff --git a/app/assets/javascripts/discourse/app/lib/lightbox/helpers.js b/app/assets/javascripts/discourse/app/lib/lightbox/helpers.js
new file mode 100644
index 00000000000..5354296a6ef
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/lightbox/helpers.js
@@ -0,0 +1,18 @@
+export {
+  setSiteThemeColor,
+  getSiteThemeColor,
+} from "./helpers/site-theme-color";
+
+export { getSwipeDirection } from "./helpers/get-swipe-direction";
+
+export { preloadItemImages } from "./helpers/preload-item-images";
+
+export { createDownloadLink } from "./helpers/create-download-link";
+
+export { scrollParentToElementCenter } from "./helpers/scroll-parent-to-element-center";
+
+export { openImageInNewTab } from "./helpers/open-image-in-new-tab";
+
+export { setCarouselScrollPosition } from "./helpers/set-carousel-scroll-position";
+
+export { findNearestSharedParent } from "./helpers/find-nearest-shared-parent";
diff --git a/app/assets/javascripts/discourse/app/lib/lightbox/helpers/create-download-link.js b/app/assets/javascripts/discourse/app/lib/lightbox/helpers/create-download-link.js
new file mode 100644
index 00000000000..66b1398cf2f
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/lightbox/helpers/create-download-link.js
@@ -0,0 +1,11 @@
+export async function createDownloadLink(lightboxItem) {
+  try {
+    const link = document.createElement("a");
+    link.href = lightboxItem.downloadURL;
+    link.download = lightboxItem.title;
+    link.click();
+  } catch (error) {
+    // eslint-disable-next-line no-console
+    console.error(error);
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/lib/lightbox/helpers/find-nearest-shared-parent.js b/app/assets/javascripts/discourse/app/lib/lightbox/helpers/find-nearest-shared-parent.js
new file mode 100644
index 00000000000..673f1028c9c
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/lightbox/helpers/find-nearest-shared-parent.js
@@ -0,0 +1,14 @@
+export function findNearestSharedParent(items) {
+  const ancestors = [];
+  for (const item of items) {
+    let ancestor = item;
+    while (ancestor) {
+      ancestors.push(ancestor);
+      ancestor = ancestor.parentElement;
+    }
+  }
+  return ancestors.filter(
+    (ancestor) =>
+      ancestors.indexOf(ancestor) !== ancestors.lastIndexOf(ancestor)
+  )[0];
+}
diff --git a/app/assets/javascripts/discourse/app/lib/lightbox/helpers/get-swipe-direction.js b/app/assets/javascripts/discourse/app/lib/lightbox/helpers/get-swipe-direction.js
new file mode 100644
index 00000000000..256f0249f9c
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/lightbox/helpers/get-swipe-direction.js
@@ -0,0 +1,26 @@
+import { SWIPE_DIRECTIONS, SWIPE_THRESHOLD } from "../constants";
+
+export function getSwipeDirection({
+  touchstartX,
+  touchstartY,
+  touchendX,
+  touchendY,
+}) {
+  const diffX = touchstartX - touchendX;
+  const absDiffX = Math.abs(diffX);
+
+  const diffY = touchstartY - touchendY;
+  const absDiffY = Math.abs(diffY);
+
+  if (absDiffX > SWIPE_THRESHOLD) {
+    return Math.sign(diffX) > 0
+      ? SWIPE_DIRECTIONS.RIGHT
+      : SWIPE_DIRECTIONS.LEFT;
+  }
+
+  if (absDiffY > SWIPE_THRESHOLD) {
+    return Math.sign(diffY) > 0 ? SWIPE_DIRECTIONS.UP : SWIPE_DIRECTIONS.DOWN;
+  }
+
+  return false;
+}
diff --git a/app/assets/javascripts/discourse/app/lib/lightbox/helpers/open-image-in-new-tab.js b/app/assets/javascripts/discourse/app/lib/lightbox/helpers/open-image-in-new-tab.js
new file mode 100644
index 00000000000..25b81a78403
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/lightbox/helpers/open-image-in-new-tab.js
@@ -0,0 +1,8 @@
+export async function openImageInNewTab(lightboxItem) {
+  try {
+    window.open(lightboxItem.fullsizeURL, "_blank");
+  } catch (error) {
+    // eslint-disable-next-line no-console
+    console.error(error);
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/lib/lightbox/helpers/preload-item-images.js b/app/assets/javascripts/discourse/app/lib/lightbox/helpers/preload-item-images.js
new file mode 100644
index 00000000000..24a79ce943c
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/lightbox/helpers/preload-item-images.js
@@ -0,0 +1,50 @@
+export async function preloadItemImages(lightboxItem) {
+  if (!lightboxItem) {
+    return;
+  }
+
+  if (lightboxItem.isLoaded && !lightboxItem.hasLoadingError) {
+    return lightboxItem;
+  }
+
+  const fullsizeImage = new Image();
+  const smallImage = new Image();
+
+  const fullsizeImagePromise = new Promise((resolve, reject) => {
+    fullsizeImage.onload = resolve;
+    fullsizeImage.onerror = reject;
+    fullsizeImage.src = lightboxItem.fullsizeURL;
+  });
+
+  const smallImagePromise = new Promise((resolve, reject) => {
+    smallImage.onload = resolve;
+    smallImage.onerror = reject;
+    smallImage.src = lightboxItem.smallURL;
+  });
+
+  try {
+    await Promise.all([fullsizeImagePromise, smallImagePromise]);
+
+    lightboxItem = {
+      ...lightboxItem,
+      isLoaded: true,
+      hasLoadingError: false,
+      width: fullsizeImage.naturalWidth,
+      height: fullsizeImage.naturalHeight,
+      aspectRatio:
+        lightboxItem.aspectRatio ||
+        `${smallImage.naturalWidth} / ${smallImage.naturalHeight}`,
+      canZoom:
+        fullsizeImage.naturalWidth > window.innerWidth ||
+        fullsizeImage.naturalHeight > window.innerHeight,
+    };
+  } catch (error) {
+    lightboxItem.hasLoadingError = true;
+    // eslint-disable-next-line no-console
+    console.error(
+      `Failed to load lightbox image ${lightboxItem.index}: ${lightboxItem.fullsizeURL}`
+    );
+  }
+
+  return lightboxItem;
+}
diff --git a/app/assets/javascripts/discourse/app/lib/lightbox/helpers/scroll-parent-to-element-center.js b/app/assets/javascripts/discourse/app/lib/lightbox/helpers/scroll-parent-to-element-center.js
new file mode 100644
index 00000000000..ba774bcd931
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/lightbox/helpers/scroll-parent-to-element-center.js
@@ -0,0 +1,16 @@
+export async function scrollParentToElementCenter({ element, isRTL }) {
+  const {
+    offsetWidth: width,
+    offsetHeight: height,
+    parentElement: parent,
+  } = element;
+
+  // if isRTL, make it relative to the right side of the viewport
+  const modifier = isRTL ? -1 : 1;
+
+  const x = ((width - parent.offsetWidth) / 2) * modifier;
+  const y = (height - parent.offsetHeight) / 2;
+
+  parent.scrollLeft = parseInt(x, 10);
+  parent.scrollTop = parseInt(y, 10);
+}
diff --git a/app/assets/javascripts/discourse/app/lib/lightbox/helpers/set-carousel-scroll-position.js b/app/assets/javascripts/discourse/app/lib/lightbox/helpers/set-carousel-scroll-position.js
new file mode 100644
index 00000000000..d50c12d5677
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/lightbox/helpers/set-carousel-scroll-position.js
@@ -0,0 +1,25 @@
+import { SELECTORS } from "../constants";
+
+export async function setCarouselScrollPosition({ behavior = "instant" } = {}) {
+  const carouselItem = document.querySelector(SELECTORS.ACTIVE_CAROUSEL_ITEM);
+
+  if (!carouselItem) {
+    return;
+  }
+
+  const left =
+    carouselItem.offsetLeft -
+    carouselItem.offsetWidth -
+    carouselItem.offsetWidth / 2;
+
+  const top =
+    carouselItem.offsetTop -
+    carouselItem.offsetHeight -
+    carouselItem.offsetHeight / 2;
+
+  carouselItem.parentElement.scrollTo({
+    behavior,
+    left,
+    top,
+  });
+}
diff --git a/app/assets/javascripts/discourse/app/lib/lightbox/helpers/site-theme-color.js b/app/assets/javascripts/discourse/app/lib/lightbox/helpers/site-theme-color.js
new file mode 100644
index 00000000000..4f768f68568
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/lightbox/helpers/site-theme-color.js
@@ -0,0 +1,18 @@
+import { postRNWebviewMessage } from "discourse/lib/utilities";
+
+export async function getSiteThemeColor() {
+  const siteThemeColor = document.querySelector('meta[name="theme-color"]');
+  return siteThemeColor?.content;
+}
+
+export async function setSiteThemeColor(color = "000000") {
+  const _color = `#${color.replace(/^#*/, "")}`;
+
+  const siteThemeColor = document.querySelector('meta[name="theme-color"]');
+
+  if (siteThemeColor) {
+    siteThemeColor.content = _color;
+  }
+
+  postRNWebviewMessage?.("headerBg", _color);
+}
diff --git a/app/assets/javascripts/discourse/app/lib/lightbox/process-html.js b/app/assets/javascripts/discourse/app/lib/lightbox/process-html.js
new file mode 100644
index 00000000000..cf65e807383
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/lightbox/process-html.js
@@ -0,0 +1,89 @@
+import { SELECTORS } from "./constants";
+import { escapeExpression } from "discourse/lib/utilities";
+import { htmlSafe } from "@ember/template";
+
+export async function processHTML({ container, selector, clickTarget }) {
+  selector ??= SELECTORS.DEFAULT_ITEM_SELECTOR;
+
+  const items = [...container.querySelectorAll(selector)];
+
+  let _startingIndex = items.findIndex((item) => item === clickTarget);
+
+  if (_startingIndex === -1) {
+    _startingIndex = 0;
+  }
+
+  const backgroundImageRegex = /url\((['"])?(.*?)\1\)/gi;
+
+  const _processedItems = items.map((item, index) => {
+    try {
+      const innerImage = item.querySelector("img") || {};
+
+      const _backgroundImage =
+        item.style?.backgroundImage ||
+        item.parentElement?.style?.backgroundImage ||
+        null;
+
+      const _fullsizeURL = item.href || item.src || innerImage.src || null;
+
+      const _smallURL =
+        innerImage.currentSrc ||
+        item.src ||
+        innerImage.src ||
+        _backgroundImage?.replace(backgroundImageRegex, "$2") ||
+        null;
+
+      const _downloadURL =
+        item.dataset?.downloadHref ||
+        item.href ||
+        item.src ||
+        innerImage.src ||
+        null;
+
+      const _title =
+        item.title || item.alt || innerImage.title || innerImage.alt || null;
+
+      const _aspectRatio =
+        item.dataset?.aspectRatio ||
+        innerImage.dataset?.aspectRatio ||
+        item.style?.aspectRatio ||
+        innerImage.style?.aspectRatio ||
+        null;
+
+      const _fileDetails =
+        item
+          .querySelector(SELECTORS.FILE_DETAILS_CONTAINER)
+          ?.innerText.trim() || null;
+
+      const _dominantColor = innerImage.dataset?.dominantColor || null;
+
+      const _cssVars = [
+        _dominantColor && `--dominant-color: #${_dominantColor};`,
+        _aspectRatio && `--aspect-ratio: ${_aspectRatio};`,
+        _smallURL && `--small-url: url(${encodeURI(_smallURL)});`,
+      ].join("");
+
+      return {
+        fullsizeURL: encodeURI(_fullsizeURL),
+        smallURL: encodeURI(_smallURL),
+        downloadURL: encodeURI(_downloadURL),
+        title: escapeExpression(_title),
+        fileDetails: _fileDetails,
+        dominantColor: _dominantColor,
+        aspectRatio: _aspectRatio,
+        index,
+        cssVars: htmlSafe(_cssVars),
+      };
+    } catch (error) {
+      // eslint-disable-next-line no-console
+      console.error(`Error processing lightbox item ${index}`);
+      // eslint-disable-next-line no-console
+      console.error(error);
+    }
+  });
+
+  return {
+    items: _processedItems,
+    startingIndex: _startingIndex,
+  };
+}
diff --git a/app/assets/javascripts/discourse/app/lib/logout.js b/app/assets/javascripts/discourse/app/lib/logout.js
index 637d85764db..a2018e4ce45 100644
--- a/app/assets/javascripts/discourse/app/lib/logout.js
+++ b/app/assets/javascripts/discourse/app/lib/logout.js
@@ -11,6 +11,6 @@ export default function logout({ redirect } = {}) {
     window.location.href = redirect;
     return;
   }
-
-  window.location.href = getURL("/");
+  const url = ctx.siteSettings.login_required ? "/login" : "/";
+  window.location.href = getURL(url);
 }
diff --git a/app/assets/javascripts/discourse/app/lib/narrow-desktop.js b/app/assets/javascripts/discourse/app/lib/narrow-desktop.js
index 5d2a89b98c0..595b6d5b6b5 100644
--- a/app/assets/javascripts/discourse/app/lib/narrow-desktop.js
+++ b/app/assets/javascripts/discourse/app/lib/narrow-desktop.js
@@ -10,7 +10,7 @@ const NarrowDesktop = {
   },
 
   isNarrowDesktopView(width) {
-    return width < 1000;
+    return width < 768;
   },
 };
 
diff --git a/app/assets/javascripts/discourse/app/lib/notification-types-manager.js b/app/assets/javascripts/discourse/app/lib/notification-types-manager.js
index 7ee7878342b..017cbc81566 100644
--- a/app/assets/javascripts/discourse/app/lib/notification-types-manager.js
+++ b/app/assets/javascripts/discourse/app/lib/notification-types-manager.js
@@ -1,5 +1,6 @@
 import NotificationTypeBase from "discourse/lib/notification-types/base";
 
+import AdminProblems from "discourse/lib/notification-types/admin-problems";
 import BookmarkReminder from "discourse/lib/notification-types/bookmark-reminder";
 import Custom from "discourse/lib/notification-types/custom";
 import GrantedBadge from "discourse/lib/notification-types/granted-badge";
@@ -13,10 +14,12 @@ import MembershipRequestConsolidated from "discourse/lib/notification-types/memb
 import NewFeatures from "discourse/lib/notification-types/new-features";
 import MovedPost from "discourse/lib/notification-types/moved-post";
 import WatchingFirstPost from "discourse/lib/notification-types/watching-first-post";
+import Edited from "discourse/lib/notification-types/edited";
 
 const CLASS_FOR_TYPE = {
   bookmark_reminder: BookmarkReminder,
   custom: Custom,
+  edited: Edited,
   granted_badge: GrantedBadge,
   group_mentioned: GroupMentioned,
   group_message_summary: GroupMessageSummary,
@@ -27,6 +30,7 @@ const CLASS_FOR_TYPE = {
   membership_request_consolidated: MembershipRequestConsolidated,
   moved_post: MovedPost,
   new_features: NewFeatures,
+  admin_problems: AdminProblems,
   watching_first_post: WatchingFirstPost,
 };
 
diff --git a/app/assets/javascripts/discourse/app/lib/notification-types/admin-problems.js b/app/assets/javascripts/discourse/app/lib/notification-types/admin-problems.js
new file mode 100644
index 00000000000..9aadcbf6cca
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/notification-types/admin-problems.js
@@ -0,0 +1,21 @@
+import NotificationTypeBase from "discourse/lib/notification-types/base";
+import getURL from "discourse-common/lib/get-url";
+import I18n from "I18n";
+
+export default class extends NotificationTypeBase {
+  get label() {
+    return null;
+  }
+
+  get description() {
+    return I18n.t("notifications.admin_problems");
+  }
+
+  get linkHref() {
+    return getURL("/admin");
+  }
+
+  get icon() {
+    return "gift";
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/lib/notification-types/custom.js b/app/assets/javascripts/discourse/app/lib/notification-types/custom.js
index 7096f79d6f7..936f69916ae 100644
--- a/app/assets/javascripts/discourse/app/lib/notification-types/custom.js
+++ b/app/assets/javascripts/discourse/app/lib/notification-types/custom.js
@@ -6,7 +6,6 @@ export default class extends NotificationTypeBase {
     if (this.notification.data.title) {
       return I18n.t(this.notification.data.title);
     }
-    return super.linkTitle;
   }
 
   get icon() {
diff --git a/app/assets/javascripts/discourse/app/lib/notification-types/edited.js b/app/assets/javascripts/discourse/app/lib/notification-types/edited.js
new file mode 100644
index 00000000000..221cc2640b3
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/notification-types/edited.js
@@ -0,0 +1,12 @@
+import NotificationTypeBase from "discourse/lib/notification-types/base";
+import { setLastEditNotificationClick } from "discourse/models/post-stream";
+
+export default class extends NotificationTypeBase {
+  onClick() {
+    setLastEditNotificationClick(
+      this.notification.topic_id,
+      this.notification.post_number,
+      this.notification.data.revision_number
+    );
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/lib/plugin-api.js b/app/assets/javascripts/discourse/app/lib/plugin-api.js
index 0822df4fbe3..fa3e255c498 100644
--- a/app/assets/javascripts/discourse/app/lib/plugin-api.js
+++ b/app/assets/javascripts/discourse/app/lib/plugin-api.js
@@ -58,19 +58,18 @@ import { addPluginReviewableParam } from "discourse/components/reviewable-item";
 import {
   addComposerSaveErrorCallback,
   addPopupMenuOptionsCallback,
-} from "discourse/controllers/composer";
+} from "discourse/services/composer";
 import { addPostClassesCallback } from "discourse/widgets/post";
 import {
   addGroupPostSmallActionCode,
   addPostSmallActionClassesCallback,
   addPostSmallActionIcon,
 } from "discourse/widgets/post-small-action";
-import { addQuickAccessProfileItem } from "discourse/widgets/quick-access-profile";
 import { addTagsHtmlCallback } from "discourse/lib/render-tags";
 import { addToolbarCallback } from "discourse/components/d-editor";
 import { addTopicParticipantClassesCallback } from "discourse/widgets/topic-map";
 import { addTopicTitleDecorator } from "discourse/components/topic-title";
-import { addUserMenuGlyph } from "discourse/widgets/user-menu";
+import { addUserMenuProfileTabItem } from "discourse/components/user-menu/profile-tab-content";
 import { addUsernameSelectorDecorator } from "discourse/helpers/decorate-username-selector";
 import { addWidgetCleanCallback } from "discourse/components/mount-widget";
 import deprecated from "discourse-common/lib/deprecated";
@@ -95,28 +94,42 @@ import { replaceTagRenderer } from "discourse/lib/render-tag";
 import { registerCustomLastUnreadUrlCallback } from "discourse/models/topic";
 import { setNewCategoryDefaultColors } from "discourse/routes/new-category";
 import { addSearchResultsCallback } from "discourse/lib/search";
+import { addOnKeyDownCallback } from "discourse/widgets/search-menu";
 import {
   addQuickSearchRandomTip,
   addSearchSuggestion,
+  removeDefaultQuickSearchRandomTips,
 } from "discourse/widgets/search-menu-results";
+import { addSearchSuggestion as addGlimmerSearchSuggestion } from "discourse/components/search-menu/results/assistant";
 import { CUSTOM_USER_SEARCH_OPTIONS } from "select-kit/components/user-chooser";
 import { downloadCalendar } from "discourse/lib/download-calendar";
 import { consolePrefix } from "discourse/lib/source-identifier";
 import { addSectionLink as addCustomCommunitySectionLink } from "discourse/lib/sidebar/custom-community-section-links";
-import { addSidebarSection } from "discourse/lib/sidebar/custom-sections";
-import { registerCustomCountable as registerUserCategorySectionLinkCountable } from "discourse/lib/sidebar/user/categories-section/category-section-link";
+import {
+  addSidebarPanel,
+  addSidebarSection,
+} from "discourse/lib/sidebar/custom-sections";
+import {
+  registerCustomCategoryLockIcon,
+  registerCustomCategorySectionLinkPrefix,
+  registerCustomCountable as registerUserCategorySectionLinkCountable,
+} from "discourse/lib/sidebar/user/categories-section/category-section-link";
+import { registerCustomTagSectionLinkPrefixIcon } from "discourse/lib/sidebar/user/tags-section/base-tag-section-link";
 import { REFRESH_COUNTS_APP_EVENT_NAME as REFRESH_USER_SIDEBAR_CATEGORIES_SECTION_COUNTS_APP_EVENT_NAME } from "discourse/components/sidebar/user/categories-section";
 import DiscourseURL from "discourse/lib/url";
 import { registerNotificationTypeRenderer } from "discourse/lib/notification-types-manager";
 import { registerUserMenuTab } from "discourse/lib/user-menu/tab";
 import { registerModelTransformer } from "discourse/lib/model-transformers";
 import { registerCustomUserNavMessagesDropdownRow } from "discourse/controllers/user-private-messages";
+import { registerFullPageSearchType } from "discourse/controllers/full-page-search";
+import { registerHashtagType } from "discourse/lib/hashtag-autocomplete";
+import { _addBulkButton } from "discourse/components/modal/topic-bulk-actions";
 
 // If you add any methods to the API ensure you bump up the version number
 // based on Semantic Versioning 2.0.0. Please update the changelog at
 // docs/CHANGELOG-JAVASCRIPT-PLUGIN-API.md whenever you change the version
 // using the format described at https://keepachangelog.com/en/1.0.0/.
-const PLUGIN_API_VERSION = "1.6.0";
+export const PLUGIN_API_VERSION = "1.8.0";
 
 // This helper prevents us from applying the same `modifyClass` over and over in test mode.
 function canModify(klass, type, resolverName, changes) {
@@ -183,11 +196,15 @@ class PluginApi {
   _resolveClass(resolverName, opts) {
     opts = opts || {};
 
-    if (this.container.cache[resolverName]) {
+    if (
+      this.container.cache[resolverName] ||
+      (resolverName === "model:user" &&
+        this.container.lookup("service:current-user"))
+    ) {
       // eslint-disable-next-line no-console
       console.warn(
         consolePrefix(),
-        `"${resolverName}" was already cached in the container. Changes won't be applied.`
+        `"${resolverName}" has already been initialized and registered as a singleton. Move the modifyClass call earlier in the boot process for changes to take effect. https://meta.discourse.org/t/262064`
       );
     }
 
@@ -562,7 +579,17 @@ class PluginApi {
   attachWidgetAction(widget, actionName, fn) {
     const widgetClass =
       queryRegistry(widget) ||
-      this.container.factoryFor(`widget:${widget}`).class;
+      this.container.factoryFor(`widget:${widget}`)?.class;
+
+    if (!widgetClass) {
+      // eslint-disable-next-line no-console
+      console.error(
+        consolePrefix(),
+        `attachWidgetAction: Could not find widget ${widget} in registry`
+      );
+      return;
+    }
+
     widgetClass.prototype[actionName] = fn;
   }
 
@@ -979,7 +1006,7 @@ class PluginApi {
   }
 
   /**
-   * Adds a glyph to user menu after bookmarks
+   * Adds a glyph to the legacy user menu after bookmarks
    * WARNING: there is limited space there
    *
    * example:
@@ -991,9 +1018,13 @@ class PluginApi {
    *    data: { url: `/some/path` },
    * });
    *
+   * To customize the new user menu, see api.registerUserMenuTab
    */
-  addUserMenuGlyph(glyph) {
-    addUserMenuGlyph(glyph);
+  addUserMenuGlyph() {
+    deprecated(
+      "addUserMenuGlyph has been removed. Use api.registerUserMenuTab instead.",
+      { id: "discourse.add-user-menu-glyph" }
+    );
   }
 
   /**
@@ -1066,7 +1097,7 @@ class PluginApi {
    *   customFilter: (category, args, router) => { return category && category.name !== 'bug' }
    *   customHref: (category, args, router) => {  if (category && category.name) === 'not-a-bug') return "/a-feature"; },
    *   before: "top",
-   *   forceActive(category, args, router) => router.currentURL === "/a/b/c/d";
+   *   forceActive: (category, args, router) => router.currentURL === "/a/b/c/d",
    * })
    */
   addNavigationBarItem(item) {
@@ -1559,7 +1590,7 @@ class PluginApi {
    *
    **/
   addQuickAccessProfileItem(item) {
-    addQuickAccessProfileItem(item);
+    addUserMenuProfileTabItem(item);
   }
 
   addFeaturedLinkMetaDecorator(decorator) {
@@ -1641,6 +1672,7 @@ class PluginApi {
    */
   addSearchSuggestion(value) {
     addSearchSuggestion(value);
+    addGlimmerSearchSuggestion(value);
   }
 
   /**
@@ -1660,6 +1692,25 @@ class PluginApi {
     downloadCalendar(title, dates);
   }
 
+  /**
+   * Add a function to be called when there is a keyDown even on the search-menu widget.
+   * This function runs before the default logic, and if one callback returns a falsey value
+   * the logic chain will stop, to prevent the core behavior from occurring.
+   *
+   * Example usage:
+   * ```
+   * api.addSearchMenuOnKeyDownCallback((searchMenu, event) => {
+   *  if (searchMenu.term === "stop") {
+   *    return false;
+   *  }
+   * });
+   * ```
+   *
+   */
+  addSearchMenuOnKeyDownCallback(fn) {
+    addOnKeyDownCallback(fn);
+  }
+
   /**
    * Add a quick search tip shown randomly when the search dropdown is invoked on desktop.
    *
@@ -1679,6 +1730,19 @@ class PluginApi {
     addQuickSearchRandomTip(tip);
   }
 
+  /**
+   * Remove the default quick search tips shown randomly when the search dropdown is invoked on desktop.
+   *
+   * Usage:
+   * ```
+   * api.removeDefaultQuickSearchRandomTips();
+   * ```
+   *
+   */
+  removeDefaultQuickSearchRandomTips(tip) {
+    removeDefaultQuickSearchRandomTips(tip);
+  }
+
   /**
    * Add custom user search options.
    * It is heavily correlated with `register_groups_callback_for_users_search_controller_action` which allows defining custom filter.
@@ -1753,7 +1817,6 @@ class PluginApi {
   }
 
   /**
-   * EXPERIMENTAL. Do not use.
    * Support for adding a navigation link to Sidebar Community section under the "More..." links drawer by returning a
    * class which extends from the BaseSectionLink class interface. See `lib/sidebar/user/community-section/base-section-link.js`
    * for documentation on the BaseSectionLink class interface.
@@ -1801,10 +1864,11 @@ class PluginApi {
    *
    * @param {(addCommunitySectionLinkCallback|Object)} arg - A callback function or an Object.
    * @param {string} arg.name - The name of the link. Needs to be dasherized and lowercase.
-   * @param {string=} arg.route - The Ember route name to generate the href attribute for the link.
-   * @param {string=} arg.href - The href attribute for the link.
    * @param {string} arg.title - The title attribute for the link.
    * @param {string} arg.text - The text to display for the link.
+   * @param {string} [arg.route] - The Ember route name to generate the href attribute for the link.
+   * @param {string} [arg.href] - The href attribute for the link.
+   * @param {string} [arg.icon] - The FontAwesome icon to display for the link.
    * @param {Boolean} [secondary] - Determines whether the section link should be added to the main or secondary section in the "More..." links drawer.
    */
   addCommunitySectionLink(arg, secondary) {
@@ -1812,7 +1876,6 @@ class PluginApi {
   }
 
   /**
-   * EXPERIMENTAL. Do not use.
    * Registers a new countable for section links under Sidebar Categories section on top of the default countables of
    * unread topics count and new topics count.
    *
@@ -1857,7 +1920,7 @@ class PluginApi {
    * @param {Object} arg - An object
    * @param {string} arg.badgeTextFunction - Function used to generate the text for the badge displayed in the section link.
    * @param {string} arg.route - The Ember route name to generate the href attribute for the link.
-   * @param {Object=} arg.routeQuery - Object representing the query params that should be appended to the route generated.
+   * @param {Object} [arg.routeQuery] - Object representing the query params that should be appended to the route generated.
    * @param {shouldRegister} arg.shouldRegister - Function used to determine if the countable should be registered for the category.
    * @param {refreshCountFunction} arg.refreshCountFunction - Function used to calculate the value used to set the property for the count whenever the sidebar section link refreshes.
    * @param {prioritizeOverDefaults} args.prioritizeOverDefaults - Function used to determine whether the countable should be prioritized over the default countables of unread/new.
@@ -1881,7 +1944,84 @@ class PluginApi {
   }
 
   /**
-   * EXPERIMENTAL. Do not use.
+   * Changes the lock icon used for a sidebar category section link to indicate that a category is read restricted.
+   *
+   * @param {String} Name of a FontAwesome 5 icon
+   */
+  registerCustomCategorySectionLinkLockIcon(icon) {
+    return registerCustomCategoryLockIcon(icon);
+  }
+
+  /**
+   * Register a custom prefix for a sidebar category section link.
+   *
+   * Example:
+   *
+   * ```
+   * api.registerCustomCategorySectionLinkPrefix({
+   *   categoryId: category.id,
+   *   prefixType: "icon",
+   *   prefixValue: "wrench",
+   *   prefixColor: "FF0000"
+   * })
+   * ```
+   *
+   * @param {Object} arg - An object
+   * @param {string} arg.categoryId - The id of the category
+   * @param {string} arg.prefixType - The type of prefix to use. Can be "icon", "image", "text" or "span".
+   * @param {string} arg.prefixValue - The value of the prefix to use.
+   *                                    For "icon", pass in the name of a FontAwesome 5 icon.
+   *                                    For "image", pass in the src of the image.
+   *                                    For "text", pass in the text to display.
+   *                                    For "span", pass in an array containing two hex color values. Example: `[FF0000, 000000]`.
+   * @param {string} arg.prefixColor - The color of the prefix to use. Example: "FF0000".
+   */
+  registerCustomCategorySectionLinkPrefix({
+    categoryId,
+    prefixType,
+    prefixValue,
+    prefixColor,
+  }) {
+    registerCustomCategorySectionLinkPrefix({
+      categoryId,
+      prefixType,
+      prefixValue,
+      prefixColor,
+    });
+  }
+
+  /**
+   * Register a custom prefix for a sidebar tag section link.
+   *
+   * Example:
+   *
+   * ```
+   * api.registerCustomTagSectionLinkPrefixValue({
+   *   tagName: "tag1",
+   *   prefixType: "icon",
+   *   prefixValue: "wrench",
+   *   prefixColor: "#FF0000"
+   * });
+   * ```
+   *
+   * @param {Object} arg - An object
+   * @param {string} arg.tagName - The name of the tag
+   * @param {string} arg.prefixValue - The name of a FontAwesome 5 icon.
+   * @param {string} arg.prefixColor - The color represented using hexadecimal to use for the prefix. Example: "#FF0000" or "#FFF".
+   */
+  registerCustomTagSectionLinkPrefixIcon({
+    tagName,
+    prefixValue,
+    prefixColor,
+  }) {
+    registerCustomTagSectionLinkPrefixIcon({
+      tagName,
+      prefixValue,
+      prefixColor,
+    });
+  }
+
+  /**
    * Triggers a refresh of the counts for all category section links under the categories section for a logged in user.
    */
   refreshUserSidebarCategoriesSectionCounts() {
@@ -1894,6 +2034,59 @@ class PluginApi {
 
   /**
    * EXPERIMENTAL. Do not use.
+   * Support for adding a Sidebar panel by returning a class which extends from the BaseCustomSidebarPanel
+   * class interface. See `lib/sidebar/user/base-custom-sidebar-panel.js` for documentation on the BaseCustomSidebarPanel class
+   * interface.
+   *
+   * ```
+   * api.addSidebarPanel((BaseCustomSidebarPanel) => {
+   *   const ChatSidebarPanel = class extends BaseCustomSidebarPanel {
+   *     get key() {
+   *       return "chat";
+   *     }
+   *     get switchButtonLabel() {
+   *       return I18n.t("sidebar.panels.chat.label");
+   *     }
+   *     get switchButtonIcon() {
+   *       return "d-chat";
+   *     }
+   *     get switchButtonDefaultUrl() {
+   *       return "/chat";
+   *     }
+   *   };
+   *   return ChatSidebarPanel;
+   * });
+   * ```
+   */
+  addSidebarPanel(func) {
+    addSidebarPanel(func);
+  }
+
+  /**
+   * EXPERIMENTAL. Do not use.
+   * Support for setting a Sidebar panel.
+   */
+  setSidebarPanel(name) {
+    this._lookupContainer("service:sidebar-state").setPanel(name);
+  }
+
+  /**
+   * EXPERIMENTAL. Do not use.
+   * Set combined sidebar section mode. In this mode, sections from all panels are displayed together.
+   */
+  setCombinedSidebarMode() {
+    this._lookupContainer("service:sidebar-state").setCombinedMode();
+  }
+
+  /**
+   * EXPERIMENTAL. Do not use.
+   * Set separated sidebar section mode. In this mode, only sections from the current panel are displayed.
+   */
+  setSeparatedSidebarMode() {
+    this._lookupContainer("service:sidebar-state").setSeparatedMode();
+  }
+
+  /**
    * Support for adding a Sidebar section by returning a class which extends from the BaseCustomSidebarSection
    * class interface. See `lib/sidebar/user/base-custom-sidebar-section.js` for documentation on the BaseCustomSidebarSection class
    * interface.
@@ -2012,12 +2205,11 @@ class PluginApi {
    * })
    * ```
    */
-  addSidebarSection(func) {
-    addSidebarSection(func);
+  addSidebarSection(func, panelKey = "main") {
+    addSidebarSection(func, panelKey);
   }
 
   /**
-   * EXPERIMENTAL. Do not use.
    * Register a custom renderer for a notification type or override the
    * renderer of an existing type. See lib/notification-types/base.js for
    * documentation and the default renderer.
@@ -2047,7 +2239,6 @@ class PluginApi {
   }
 
   /**
-   * EXPERIMENTAL. Do not use.
    * Registers a new tab in the user menu. This API method expects a callback
    * that should return a class inheriting from the class (UserMenuTab) that's
    * passed to the callback. See discourse/app/lib/user-menu/tab.js for
@@ -2056,9 +2247,9 @@ class PluginApi {
    * ```
    * api.registerUserMenuTab((UserMenuTab) => {
    *   return class extends UserMenuTab {
-   *     get id() {
-   *       return "custom-tab-id";
-   *     }
+   *     id = "custom-tab-id";
+   *     panelComponent = MyCustomPanelGlimmerComponent;
+   *     icon = "some-fa5-icon";
    *
    *     get shouldDisplay() {
    *       return this.siteSettings.enable_custom_tab && this.currentUser.admin;
@@ -2067,14 +2258,6 @@ class PluginApi {
    *     get count() {
    *       return this.currentUser.my_custom_notification_count;
    *     }
-   *
-   *     get panelComponent() {
-   *       return "your-custom-glimmer-component";
-   *     }
-   *
-   *     get icon() {
-   *       return "some-fa5-icon";
-   *     }
    *   }
    * });
    * ```
@@ -2090,7 +2273,6 @@ class PluginApi {
   }
 
   /**
-   * EXPERIMENTAL. Do not use.
    * Apply transformation using a callback on a list of model instances of a
    * specific type. Currently, this API only works on lists rendered in the
    * user menu such as notifications, bookmarks and topics (i.e. messages), but
@@ -2121,7 +2303,6 @@ class PluginApi {
   }
 
   /**
-   * EXPERIMENTAL. Do not use.
    * Adds a row to the dropdown used on the `userPrivateMessages` route used to navigate between the different user
    * messages pages.
    *
@@ -2132,6 +2313,73 @@ class PluginApi {
   addUserMessagesNavigationDropdownRow(routeName, name, icon) {
     registerCustomUserNavMessagesDropdownRow(routeName, name, icon);
   }
+
+  /**
+   * EXPERIMENTAL. Do not use.
+   * Adds a new search type which can be selected when visiting the full page search UI.
+   *
+   * @param {string} translationKey
+   * @param {string} searchTypeId
+   * @param {function} searchFunc - Available arguments: fullPage controller, search args, searchKey.
+   */
+  addFullPageSearchType(translationKey, searchTypeId, searchFunc) {
+    registerFullPageSearchType(translationKey, searchTypeId, searchFunc);
+  }
+
+  /**
+   * Registers a hashtag type and its corresponding class.
+   * This is used when generating CSS classes in the hashtag-css-generator.
+   *
+   * @param {string} type - The type of the hashtag.
+   * @param {Class} typeClassInstance - The initialized class of the hashtag type, which
+   *  needs the `container`.
+   */
+  registerHashtagType(type, typeClassInstance) {
+    registerHashtagType(type, typeClassInstance);
+  }
+
+  /**
+   * Adds a button to the bulk topic actions modal.
+   *
+   * ```
+   * api.addBulkActionButton({
+   *   label: "super_plugin.bulk.enhance",
+   *   icon: "magic",
+   *   class: "btn-default",
+   *   visible: ({ currentUser, siteSettings }) => siteSettings.super_plugin_enabled && currentUser.staff,
+   *   async action({ setComponent }) {
+   *     await doSomething(this.model.topics);
+   *     setComponent(MyBulkModal);
+   *   },
+   * });
+   * ```
+   *
+   * @callback buttonVisibilityCallback
+   * @param {Object} opts
+   * @param {Topic[]} opts.topics - the selected topic for the bulk action
+   * @param {Category} opts.category - the category in which the action is performed (if applicable)
+   * @param {User} opts.currentUser
+   * @param {SiteSettings} opts.siteSettings
+   * @returns {Boolean} - whether the button should be visible or not
+   *
+   * @callback buttonAction
+   * @param {Object} opts
+   * @param {Topic[]} opts.topics - the selected topic for the bulk action
+   * @param {Category} opts.category - the category in which the action is performed (if applicable)
+   * @param {function} opts.setComponent - render a template in the bulk action modal (pass in an imported component)
+   * @param {function} opts.performAndRefresh
+   * @param {function} opts.forEachPerformed
+   *
+   * @param {Object} opts
+   * @param {string} opts.label
+   * @param {string} opts.icon
+   * @param {string} opts.class
+   * @param {buttonVisibilityCallback} opts.visible
+   * @param {buttonAction} opts.action
+   */
+  addBulkActionButton(opts) {
+    _addBulkButton(opts);
+  }
 }
 
 // from http://stackoverflow.com/questions/6832596/how-to-compare-software-version-number-using-js-only-number
diff --git a/app/assets/javascripts/discourse/app/lib/plugin-connectors.js b/app/assets/javascripts/discourse/app/lib/plugin-connectors.js
index 0a9e07146c8..1315bbcc1b2 100644
--- a/app/assets/javascripts/discourse/app/lib/plugin-connectors.js
+++ b/app/assets/javascripts/discourse/app/lib/plugin-connectors.js
@@ -1,6 +1,12 @@
 import { buildRawConnectorCache } from "discourse-common/lib/raw-templates";
 import deprecated from "discourse-common/lib/deprecated";
 import DiscourseTemplateMap from "discourse-common/lib/discourse-template-map";
+import {
+  getComponentTemplate,
+  hasInternalComponentManager,
+  setComponentTemplate,
+} from "@glimmer/manager";
+import templateOnly from "@ember/component/template-only";
 
 let _connectorCache;
 let _rawConnectorCache;
@@ -18,13 +24,6 @@ export function extraConnectorClass(name, obj) {
   _extraConnectorClasses[name] = obj;
 }
 
-const DefaultConnectorClass = {
-  actions: {},
-  shouldRender: () => true,
-  setupComponent() {},
-  teardownComponent() {},
-};
-
 function findOutlets(keys, callback) {
   keys.forEach(function (res) {
     const segments = res.split("/");
@@ -58,9 +57,20 @@ function findClass(outletName, uniqueName) {
   const id = `${outletName}/${uniqueName}`;
   let foundClass = _extraConnectorClasses[id] || _classPaths[id];
 
-  return foundClass
-    ? Object.assign({}, DefaultConnectorClass, foundClass)
-    : DefaultConnectorClass;
+  return foundClass;
+}
+
+/**
+ * Sets component template, ignoring errors if it's already set to the same template
+ */
+function safeSetComponentTemplate(template, component) {
+  try {
+    setComponentTemplate(template, component);
+  } catch (e) {
+    if (getComponentTemplate(component) !== template) {
+      throw e;
+    }
+  }
 }
 
 /**
@@ -71,21 +81,77 @@ export function expireConnectorCache() {
   _connectorCache = null;
 }
 
+class ConnectorInfo {
+  #componentClass;
+  #templateOnly;
+
+  constructor(outletName, connectorName, connectorClass, template) {
+    this.outletName = outletName;
+    this.connectorName = connectorName;
+    this.connectorClass = connectorClass;
+    this.template = template;
+  }
+
+  get componentClass() {
+    return (this.#componentClass ??= this.#buildComponentClass());
+  }
+
+  get templateOnly() {
+    return (this.#templateOnly ??= this.#buildTemplateOnlyClass());
+  }
+
+  get classicClassNames() {
+    return `${this.outletName}-outlet ${this.connectorName}`;
+  }
+
+  #buildComponentClass() {
+    const klass = this.connectorClass;
+    if (klass && hasInternalComponentManager(klass)) {
+      safeSetComponentTemplate(this.template, klass);
+      this.#warnUnusableHooks();
+      return klass;
+    } else {
+      return false;
+    }
+  }
+
+  #buildTemplateOnlyClass() {
+    const component = templateOnly();
+    setComponentTemplate(this.template, component);
+    this.#warnUnusableHooks();
+    return component;
+  }
+
+  #warnUnusableHooks() {
+    for (const methodName of [
+      "actions",
+      "setupComponent",
+      "teardownComponent",
+    ]) {
+      if (this.connectorClass?.[methodName]) {
+        deprecated(
+          `actions, setupComponent and teardownComponent hooks cannot be used with Glimmer plugin outlets. Define a component class instead. (${this.outletName}/${this.connectorName}).`,
+          { id: "discourse.plugin-outlet-classic-hooks" }
+        );
+      }
+    }
+  }
+}
+
 function buildConnectorCache() {
   _connectorCache = {};
 
   findOutlets(
     DiscourseTemplateMap.keys(),
-    (outletName, resource, uniqueName) => {
-      _connectorCache[outletName] = _connectorCache[outletName] || [];
+    (outletName, resource, connectorName) => {
+      _connectorCache[outletName] ||= [];
 
-      _connectorCache[outletName].push({
-        outletName,
-        templateName: resource,
-        template: require(DiscourseTemplateMap.resolve(resource)).default,
-        classNames: `${outletName}-outlet ${uniqueName}`,
-        connectorClass: findClass(outletName, uniqueName),
-      });
+      const template = require(DiscourseTemplateMap.resolve(resource)).default;
+      const connectorClass = findClass(outletName, connectorName);
+
+      _connectorCache[outletName].push(
+        new ConnectorInfo(outletName, connectorName, connectorClass, template)
+      );
     }
   );
 }
@@ -99,7 +165,8 @@ export function connectorsFor(outletName) {
 
 export function renderedConnectorsFor(outletName, args, context) {
   return connectorsFor(outletName).filter((con) => {
-    return con.connectorClass.shouldRender(args, context);
+    const shouldRender = con.connectorClass?.shouldRender;
+    return !shouldRender || shouldRender(args, context);
   });
 }
 
diff --git a/app/assets/javascripts/discourse/app/lib/public-js-versions.js b/app/assets/javascripts/discourse/app/lib/public-js-versions.js
index f807c36c3f4..b92c9da219b 100644
--- a/app/assets/javascripts/discourse/app/lib/public-js-versions.js
+++ b/app/assets/javascripts/discourse/app/lib/public-js-versions.js
@@ -3,11 +3,11 @@
 
 export const PUBLIC_JS_VERSIONS = {
   "ace/ace.js": "ace.js/1.4.13/ace.js",
-  "jsoneditor.js": "@json-editor/json-editor/2.6.1/jsoneditor.js",
+  "jsoneditor.js": "@json-editor/json-editor/2.10.0/jsoneditor.js",
   "chart.min.js": "chart.js/3.5.1/chart.min.js",
   "chartjs-plugin-datalabels.min.js":
-    "chartjs-plugin-datalabels/2.0.0/chartjs-plugin-datalabels.min.js",
-  "diffhtml.min.js": "diffhtml/1.0.0-beta.20/diffhtml.min.js",
+    "chartjs-plugin-datalabels/2.2.0/chartjs-plugin-datalabels.min.js",
+  "diffhtml.min.js": "diffhtml/1.0.0-beta.29/diffhtml.min.js",
   "jquery.magnific-popup.min.js":
     "magnific-popup/1.1.0/jquery.magnific-popup.min.js",
   "pikaday.js": "pikaday/1.8.2/pikaday.js",
diff --git a/app/assets/javascripts/discourse/app/lib/push-notifications.js b/app/assets/javascripts/discourse/app/lib/push-notifications.js
index e89cba54c4d..1659f924c56 100644
--- a/app/assets/javascripts/discourse/app/lib/push-notifications.js
+++ b/app/assets/javascripts/discourse/app/lib/push-notifications.js
@@ -48,8 +48,7 @@ export function isPushNotificationsSupported() {
       "PushManager" in window &&
       !caps.isAppWebview &&
       navigator.serviceWorker.controller &&
-      navigator.serviceWorker.controller.state === "activated" &&
-      !caps.isIOS
+      navigator.serviceWorker.controller.state === "activated"
     )
   ) {
     return false;
diff --git a/app/assets/javascripts/discourse/app/lib/quote-state.js b/app/assets/javascripts/discourse/app/lib/quote-state.js
index 63f7337aec0..c4648f192ae 100644
--- a/app/assets/javascripts/discourse/app/lib/quote-state.js
+++ b/app/assets/javascripts/discourse/app/lib/quote-state.js
@@ -1,7 +1,9 @@
+import { tracked } from "@glimmer/tracking";
+
 export default class QuoteState {
-  constructor() {
-    this.clear();
-  }
+  @tracked postId = null;
+  @tracked buffer = "";
+  @tracked opts = null;
 
   selected(postId, buffer, opts) {
     this.postId = postId;
diff --git a/app/assets/javascripts/discourse/app/lib/register-service-worker.js b/app/assets/javascripts/discourse/app/lib/register-service-worker.js
index c4fa02bc94d..bac9c2c01f5 100644
--- a/app/assets/javascripts/discourse/app/lib/register-service-worker.js
+++ b/app/assets/javascripts/discourse/app/lib/register-service-worker.js
@@ -1,17 +1,8 @@
 import getAbsoluteURL, { isAbsoluteURL } from "discourse-common/lib/get-url";
 
-export function registerServiceWorker(
-  container,
-  serviceWorkerURL,
-  registerOptions = {}
-) {
+export function registerServiceWorker(serviceWorkerURL, registerOptions = {}) {
   if (window.isSecureContext && "serviceWorker" in navigator) {
-    const caps = container.lookup("capabilities:main");
-    const isAppleBrowser =
-      caps.isSafari ||
-      (caps.isIOS && !window.matchMedia("(display-mode: standalone)").matches);
-
-    if (serviceWorkerURL && !isAppleBrowser) {
+    if (serviceWorkerURL) {
       navigator.serviceWorker.getRegistrations().then((registrations) => {
         for (let registration of registrations) {
           if (
diff --git a/app/assets/javascripts/discourse/app/lib/render-tag.js b/app/assets/javascripts/discourse/app/lib/render-tag.js
index d0fbb81515e..87d97bebb68 100644
--- a/app/assets/javascripts/discourse/app/lib/render-tag.js
+++ b/app/assets/javascripts/discourse/app/lib/render-tag.js
@@ -49,7 +49,7 @@ export function defaultRenderTag(tag, params) {
     " class='" +
     classes.join(" ") +
     "'>" +
-    visibleName +
+    (params.displayName ? escape(params.displayName) : visibleName) +
     "</" +
     tagName +
     ">";
diff --git a/app/assets/javascripts/discourse/app/lib/render-tags.js b/app/assets/javascripts/discourse/app/lib/render-tags.js
index 6f8aedf9e9f..032764bb618 100644
--- a/app/assets/javascripts/discourse/app/lib/render-tags.js
+++ b/app/assets/javascripts/discourse/app/lib/render-tags.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import renderTag from "discourse/lib/render-tag";
 
 let callbacks = null;
@@ -56,7 +57,8 @@ export default function (topic, params) {
   }
 
   if (customHtml || (tags && tags.length > 0)) {
-    buffer = "<div class='discourse-tags'>";
+    buffer = `<div class='discourse-tags' role='list' 
+                aria-label=${I18n.t("tagging.tags")}>`;
     if (tags) {
       for (let i = 0; i < tags.length; i++) {
         buffer +=
diff --git a/app/assets/javascripts/discourse/app/lib/search.js b/app/assets/javascripts/discourse/app/lib/search.js
index ac5f529a533..c0fa7c37bf1 100644
--- a/app/assets/javascripts/discourse/app/lib/search.js
+++ b/app/assets/javascripts/discourse/app/lib/search.js
@@ -108,11 +108,13 @@ function translateGroupedSearchResults(results, opts) {
   const groupedSearchResult = results.grouped_search_result;
   if (groupedSearchResult) {
     [
+      // We are defining the order that the result types will be
+      // displayed in. We should make this customizable.
       ["topic", "posts"],
-      ["user", "users"],
-      ["group", "groups"],
       ["category", "categories"],
       ["tag", "tags"],
+      ["user", "users"],
+      ["group", "groups"],
     ].forEach(function (pair) {
       const type = pair[0];
       const name = pair[1];
diff --git a/app/assets/javascripts/discourse/app/lib/show-modal.js b/app/assets/javascripts/discourse/app/lib/show-modal.js
index f2628490598..69affb7cee0 100644
--- a/app/assets/javascripts/discourse/app/lib/show-modal.js
+++ b/app/assets/javascripts/discourse/app/lib/show-modal.js
@@ -1,8 +1,29 @@
-import I18n from "I18n";
-import { dasherize } from "@ember/string";
+// Remove when legacy modals are dropped (deprecation: discourse.modal-controllers)
+
 import { getOwner } from "discourse-common/lib/get-owner";
 
-export default function (name, opts) {
+/**
+ * Render a modal
+ *
+ * @param {string} name - the controller/template name for the modal body.
+ *
+ * @param {Object} [options] - options
+ * @param {string} [options.model] - An object which will be set as the `model` property on the controller
+ * @param {boolean} [options.admin] - look under the admin namespace for the controller/template
+ * @param {string} [options.templateName] - override the template name to render
+ * @param {string} [options.title] - (deprecated) translation key for modal title. Pass `@title` to DModalBody instead
+ * @param {string} [options.titleTranslated] - (deprecated) translated modal title. Pass `@rawTitle` to DModalBody instead
+ * @param {string} [options.modalClass] - (deprecated) classname for modal. Pass `@modalClass` to DModalBody instead
+ * @param {string} [options.titleAriaElementId] - (deprecated) Pass `@titleAriaElementId` to DModalBody instead
+ *
+ * @returns {Controller} The modal controller instance
+ */
+export default function showModal(name, opts) {
+  if (typeof name !== "string") {
+    throw new Error(
+      "`discourse/lib/show-modal` can only be used with the legacy controller-based API. To use the new component-based API, inject the modal service and call modal.show(). https://meta.discourse.org/t/268057"
+    );
+  }
   opts = opts || {};
 
   let container = getOwner(this);
@@ -10,80 +31,6 @@ export default function (name, opts) {
     return;
   }
 
-  // We use the container here because modals are like singletons
-  // in Discourse. Only one can be shown with a particular state.
-  const route = container.lookup("route:application");
-  const modalController = route.controllerFor("modal");
-
-  modalController.set(
-    "modalClass",
-    opts.modalClass || `${dasherize(name).toLowerCase()}-modal`
-  );
-
-  const controllerName = opts.admin ? `modals/${name}` : name;
-  modalController.set("name", controllerName);
-
-  let controller = container.lookup("controller:" + controllerName);
-  const templateName = opts.templateName || dasherize(name);
-
-  const renderArgs = { into: "modal", outlet: "modalBody" };
-  if (controller) {
-    renderArgs.controller = controllerName;
-  } else {
-    // use a basic controller
-    renderArgs.controller = "basic-modal-body";
-    controller = container.lookup(`controller:${renderArgs.controller}`);
-  }
-
-  if (opts.addModalBodyView) {
-    renderArgs.view = "modal-body";
-  }
-
-  const modalName = `modal/${templateName}`;
-  const fullName = opts.admin ? `admin/templates/${modalName}` : modalName;
-  route.render(fullName, renderArgs);
-  if (opts.title) {
-    modalController.set("title", I18n.t(opts.title));
-  } else if (opts.titleTranslated) {
-    modalController.set("title", opts.titleTranslated);
-  } else {
-    modalController.set("title", null);
-  }
-
-  if (opts.titleAriaElementId) {
-    modalController.set("titleAriaElementId", opts.titleAriaElementId);
-  }
-
-  if (opts.panels) {
-    modalController.setProperties({
-      panels: opts.panels,
-      selectedPanel: opts.panels[0],
-    });
-
-    if (controller.actions.onSelectPanel) {
-      modalController.set(
-        "onSelectPanel",
-        controller.actions.onSelectPanel.bind(controller)
-      );
-    }
-
-    modalController.set(
-      "modalClass",
-      `${modalController.get("modalClass")} has-tabs`
-    );
-  } else {
-    modalController.setProperties({ panels: [], selectedPanel: null });
-  }
-
-  controller.set("modal", modalController);
-  const model = opts.model;
-  if (model) {
-    controller.set("model", model);
-  }
-  if (controller.onShow) {
-    controller.onShow();
-  }
-  controller.set("flashMessage", null);
-
-  return controller;
+  const modalService = container.lookup("service:modal");
+  return modalService.show(name, opts);
 }
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/base-community-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/base-community-section-link.js
index e7dc1603fdb..656fdd32174 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/base-community-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/base-community-section-link.js
@@ -9,6 +9,8 @@ export default class BaseCommunitySectionLink {
     router,
     siteSettings,
     inMoreDrawer,
+    overridenName,
+    overridenIcon,
   } = {}) {
     this.router = router;
     this.topicTrackingState = topicTrackingState;
@@ -16,6 +18,8 @@ export default class BaseCommunitySectionLink {
     this.appEvents = appEvents;
     this.siteSettings = siteSettings;
     this.inMoreDrawer = inMoreDrawer;
+    this.overridenName = overridenName;
+    this.overridenIcon = overridenIcon;
   }
 
   /**
@@ -105,10 +109,17 @@ export default class BaseCommunitySectionLink {
   /**
    * @returns {string} The name of the fontawesome icon to be displayed before the link. Defaults to "link".
    */
-  get prefixValue() {
+  get defaultPrefixValue() {
     return "link";
   }
 
+  /**
+   * @returns {string} The name of the fontawesome icon to be displayed before the link.
+   */
+  get prefixValue() {
+    return this.overridenIcon || this.defaultPrefixValue;
+  }
+
   _notImplemented() {
     throw "not implemented";
   }
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/base-custom-sidebar-panel.js b/app/assets/javascripts/discourse/app/lib/sidebar/base-custom-sidebar-panel.js
new file mode 100644
index 00000000000..f9a8ceecbbe
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/base-custom-sidebar-panel.js
@@ -0,0 +1,38 @@
+/**
+ * Base class representing a sidebar section header interface.
+ */
+export default class BaseCustomSidebarPanel {
+  sections = [];
+
+  /**
+   * @returns {string} Identifier for sidebar panel
+   */
+  get key() {
+    this.#notImplemented();
+  }
+
+  /**
+   * @returns {string} Text for the switch button
+   */
+  get switchButtonLabel() {
+    this.#notImplemented();
+  }
+
+  /**
+   * @returns {string} Icon for the switch button
+   */
+  get switchButtonIcon() {
+    this.#notImplemented();
+  }
+
+  /**
+   * @returns {string} Default path to panel
+   */
+  get switchButtonDefaultUrl() {
+    this.#notImplemented();
+  }
+
+  #notImplemented() {
+    throw "not implemented";
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/base-custom-sidebar-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/base-custom-sidebar-section-link.js
index 750c83fcd5d..c693a0ae921 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/base-custom-sidebar-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/base-custom-sidebar-section-link.js
@@ -19,9 +19,12 @@ export default class BaseCustomSidebarSectionLink {
   /**
    * @returns {string} The Ember route which the section link should link to.
    */
-  get route() {
-    this._notImplemented();
-  }
+  get route() {}
+
+  /**
+   * @returns {string} URL to external website which the section link should link to.
+   */
+  get href() {}
 
   /**
    * @returns {Object} `model` argument for the <LinkTo> component. See https://api.emberjs.com/ember/release/classes/Ember.Templates.components/methods/LinkTo?anchor=LinkTo.
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/base-custom-sidebar-section.js b/app/assets/javascripts/discourse/app/lib/sidebar/base-custom-sidebar-section.js
index 85dc82e1886..9a2ab6a493c 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/base-custom-sidebar-section.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/base-custom-sidebar-section.js
@@ -2,10 +2,6 @@
  * Base class representing a sidebar section header interface.
  */
 export default class BaseCustomSidebarSection {
-  constructor({ sidebar } = {}) {
-    this.sidebar = sidebar;
-  }
-
   /**
    * @returns {string} The name of the section header. Needs to be dasherized and lowercase.
    */
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/about-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/about-section-link.js
index 46c38aa4e14..5b155fe0f2a 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/about-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/about-section-link.js
@@ -16,10 +16,13 @@ export default class AboutSectionLink extends BaseSectionLink {
   }
 
   get text() {
-    return I18n.t("sidebar.sections.community.links.about.content");
+    return I18n.t(
+      `sidebar.sections.community.links.${this.overridenName.toLowerCase()}.content`,
+      { defaultValue: this.overridenName }
+    );
   }
 
-  get prefixValue() {
+  get defaultPrefixValue() {
     return "info-circle";
   }
 }
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/badges-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/badges-section-link.js
index 6904b2cd8c0..139bca4fc2a 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/badges-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/badges-section-link.js
@@ -16,14 +16,17 @@ export default class BadgesSectionLink extends BaseSectionLink {
   }
 
   get text() {
-    return I18n.t("sidebar.sections.community.links.badges.content");
+    return I18n.t(
+      `sidebar.sections.community.links.${this.overridenName.toLowerCase()}.content`,
+      { defaultValue: this.overridenName }
+    );
   }
 
   get shouldDisplay() {
     return this.siteSettings.enable_badges;
   }
 
-  get prefixValue() {
+  get defaultPrefixValue() {
     return "certificate";
   }
 }
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/everything-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/everything-section-link.js
index 08953f85c2e..61657ada2ea 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/everything-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/everything-section-link.js
@@ -2,13 +2,10 @@ import I18n from "I18n";
 
 import { tracked } from "@glimmer/tracking";
 import BaseSectionLink from "discourse/lib/sidebar/base-community-section-link";
-import { UNREAD_LIST_DESTINATION } from "discourse/controllers/preferences/sidebar";
 
 export default class EverythingSectionLink extends BaseSectionLink {
   @tracked totalUnread = 0;
   @tracked totalNew = 0;
-  @tracked hideCount =
-    this.currentUser?.sidebarListDestination !== UNREAD_LIST_DESTINATION;
 
   constructor() {
     super(...arguments);
@@ -26,11 +23,15 @@ export default class EverythingSectionLink extends BaseSectionLink {
 
     this.totalUnread = this.topicTrackingState.countUnread();
 
-    if (this.totalUnread === 0) {
+    if (this.totalUnread === 0 || this.#newNewViewEnabled) {
       this.totalNew = this.topicTrackingState.countNew();
     }
   }
 
+  get showCount() {
+    return this.currentUser?.sidebarShowCountOfNewItems;
+  }
+
   get name() {
     return "everything";
   }
@@ -40,11 +41,14 @@ export default class EverythingSectionLink extends BaseSectionLink {
   }
 
   get title() {
-    return I18n.t("sidebar.sections.community.links.everything.title");
+    return I18n.t("sidebar.sections.community.links.topics.title");
   }
 
   get text() {
-    return I18n.t("sidebar.sections.community.links.everything.content");
+    return I18n.t(
+      `sidebar.sections.community.links.${this.overridenName.toLowerCase()}.content`,
+      { defaultValue: this.overridenName }
+    );
   }
 
   get currentWhen() {
@@ -52,10 +56,13 @@ export default class EverythingSectionLink extends BaseSectionLink {
   }
 
   get badgeText() {
-    if (this.hideCount) {
+    if (!this.showCount) {
       return;
     }
-    if (this.totalUnread > 0) {
+
+    if (this.#newNewViewEnabled && this.#unreadAndNewCount > 0) {
+      return this.#unreadAndNewCount.toString();
+    } else if (this.totalUnread > 0) {
       return I18n.t("sidebar.unread_count", {
         count: this.totalUnread,
       });
@@ -63,24 +70,23 @@ export default class EverythingSectionLink extends BaseSectionLink {
       return I18n.t("sidebar.new_count", {
         count: this.totalNew,
       });
-    } else {
-      return;
     }
   }
 
   get route() {
-    if (this.currentUser?.sidebarListDestination === UNREAD_LIST_DESTINATION) {
-      if (this.totalUnread > 0) {
+    if (this.currentUser?.sidebarLinkToFilteredList) {
+      if (this.#newNewViewEnabled && this.#unreadAndNewCount > 0) {
+        return "discovery.new";
+      } else if (this.totalUnread > 0) {
         return "discovery.unread";
-      }
-      if (this.totalNew > 0) {
+      } else if (this.totalNew > 0) {
         return "discovery.new";
       }
     }
     return "discovery.latest";
   }
 
-  get prefixValue() {
+  get defaultPrefixValue() {
     return "layer-group";
   }
 
@@ -93,8 +99,16 @@ export default class EverythingSectionLink extends BaseSectionLink {
   }
 
   get suffixValue() {
-    if (this.hideCount && (this.totalUnread || this.totalNew)) {
+    if (!this.showCount && (this.totalUnread || this.totalNew)) {
       return "circle";
     }
   }
+
+  get #unreadAndNewCount() {
+    return this.totalUnread + this.totalNew;
+  }
+
+  get #newNewViewEnabled() {
+    return !!this.currentUser?.new_new_view_enabled;
+  }
 }
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/faq-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/faq-section-link.js
index 37a1136c0cd..38e83c58568 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/faq-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/faq-section-link.js
@@ -20,10 +20,13 @@ export default class FAQSectionLink extends BaseSectionLink {
   }
 
   get text() {
-    return I18n.t("sidebar.sections.community.links.faq.content");
+    return I18n.t(
+      `sidebar.sections.community.links.${this.overridenName.toLowerCase()}.content`,
+      { defaultValue: this.overridenName }
+    );
   }
 
-  get prefixValue() {
+  get defaultPrefixValue() {
     return "question-circle";
   }
 }
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/groups-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/groups-section-link.js
index f2d6fe78e8f..667d77dc67a 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/groups-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/groups-section-link.js
@@ -16,14 +16,17 @@ export default class GroupsSectionLink extends BaseSectionLink {
   }
 
   get text() {
-    return I18n.t("sidebar.sections.community.links.groups.content");
+    return I18n.t(
+      `sidebar.sections.community.links.${this.overridenName.toLowerCase()}.content`,
+      { defaultValue: this.overridenName }
+    );
   }
 
   get shouldDisplay() {
     return this.siteSettings.enable_group_directory;
   }
 
-  get prefixValue() {
+  get defaultPrefixValue() {
     return "user-friends";
   }
 }
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/section.js b/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/section.js
new file mode 100644
index 00000000000..e1cc4492016
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/section.js
@@ -0,0 +1,136 @@
+import SectionLink from "discourse/lib/sidebar/section-link";
+import { setOwner } from "@ember/application";
+import { inject as service } from "@ember/service";
+import { tracked } from "@glimmer/tracking";
+
+import EverythingSectionLink from "discourse/lib/sidebar/common/community-section/everything-section-link";
+import MyPostsSectionLink from "discourse/lib/sidebar/user/community-section/my-posts-section-link";
+import AdminSectionLink from "discourse/lib/sidebar/user/community-section/admin-section-link";
+import AboutSectionLink from "discourse/lib/sidebar/common/community-section/about-section-link";
+import FAQSectionLink from "discourse/lib/sidebar/common/community-section/faq-section-link";
+import UsersSectionLink from "discourse/lib/sidebar/common/community-section/users-section-link";
+import GroupsSectionLink from "discourse/lib/sidebar/common/community-section/groups-section-link";
+import BadgesSectionLink from "discourse/lib/sidebar/common/community-section/badges-section-link";
+import ReviewSectionLink from "discourse/lib/sidebar/user/community-section/review-section-link";
+import {
+  customSectionLinks,
+  secondaryCustomSectionLinks,
+} from "discourse/lib/sidebar/custom-community-section-links";
+
+const SPECIAL_LINKS_MAP = {
+  "/latest": EverythingSectionLink,
+  "/about": AboutSectionLink,
+  "/u": UsersSectionLink,
+  "/faq": FAQSectionLink,
+  "/my/activity": MyPostsSectionLink,
+  "/review": ReviewSectionLink,
+  "/badges": BadgesSectionLink,
+  "/admin": AdminSectionLink,
+  "/g": GroupsSectionLink,
+};
+
+export default class CommunitySection {
+  @service appEvents;
+  @service currentUser;
+  @service modal;
+  @service router;
+  @service siteSettings;
+  @service topicTrackingState;
+
+  @tracked links;
+  @tracked moreLinks;
+
+  reorderable = false;
+  hideSectionHeader = true;
+
+  constructor({ section, owner }) {
+    setOwner(this, owner);
+
+    this.section = section;
+    this.slug = section.slug;
+
+    this.callbackId = this.topicTrackingState?.onStateChange(() => {
+      this.links.forEach((link) => {
+        if (link.onTopicTrackingStateChange) {
+          link.onTopicTrackingStateChange();
+        }
+      });
+    });
+
+    this.apiLinks = customSectionLinks
+      .concat(secondaryCustomSectionLinks)
+      .map((link) => this.#initializeSectionLink(link, { inMoreDrawer: true }));
+
+    this.links = this.section.links.reduce((filtered, link) => {
+      if (link.segment === "primary") {
+        const generatedLink = this.#generateLink(link);
+
+        if (generatedLink) {
+          filtered.push(generatedLink);
+        }
+      }
+
+      return filtered;
+    }, []);
+
+    this.moreLinks = this.section.links
+      .reduce((filtered, link) => {
+        if (link.segment === "secondary") {
+          const generatedLink = this.#generateLink(link, true);
+
+          if (generatedLink) {
+            filtered.push(generatedLink);
+          }
+        }
+
+        return filtered;
+      }, [])
+      .concat(this.apiLinks);
+  }
+
+  teardown() {
+    if (this.callbackId) {
+      this.topicTrackingState.offStateChange(this.callbackId);
+    }
+
+    [...this.links, ...this.moreLinks].forEach((sectionLink) => {
+      sectionLink.teardown?.();
+    });
+  }
+
+  #generateLink(link, inMoreDrawer = false) {
+    const sectionLinkClass = SPECIAL_LINKS_MAP[link.value];
+
+    if (sectionLinkClass) {
+      return this.#initializeSectionLink(
+        sectionLinkClass,
+        inMoreDrawer,
+        link.name,
+        link.icon
+      );
+    } else {
+      return new SectionLink(link, this, this.router);
+    }
+  }
+
+  #initializeSectionLink(
+    sectionLinkClass,
+    inMoreDrawer,
+    overridenName,
+    overridenIcon
+  ) {
+    if (this.router.isDestroying) {
+      return;
+    }
+    return new sectionLinkClass({
+      topicTrackingState: this.topicTrackingState,
+      currentUser: this.currentUser,
+      appEvents: this.appEvents,
+      router: this.router,
+      siteSettings: this.siteSettings,
+      inMoreDrawer,
+      overridenName,
+      overridenIcon,
+    });
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/users-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/users-section-link.js
index fafbf071245..02b979fea92 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/users-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/users-section-link.js
@@ -16,7 +16,10 @@ export default class UsersSectionLink extends BaseSectionLink {
   }
 
   get text() {
-    return I18n.t("sidebar.sections.community.links.users.content");
+    return I18n.t(
+      `sidebar.sections.community.links.${this.overridenName.toLowerCase()}.content`,
+      { defaultValue: this.overridenName }
+    );
   }
 
   get shouldDisplay() {
@@ -26,7 +29,7 @@ export default class UsersSectionLink extends BaseSectionLink {
     );
   }
 
-  get prefixValue() {
+  get defaultPrefixValue() {
     return "users";
   }
 }
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/custom-community-section-links.js b/app/assets/javascripts/discourse/app/lib/sidebar/custom-community-section-links.js
index b18cccd0fdf..6d29113823e 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/custom-community-section-links.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/custom-community-section-links.js
@@ -1,45 +1,9 @@
 import BaseCommunitySectionLink from "discourse/lib/sidebar/base-community-section-link";
+import RouteInfoHelper from "discourse/lib/sidebar/route-info-helper";
 
 export let customSectionLinks = [];
 export let secondaryCustomSectionLinks = [];
 
-class RouteInfoHelper {
-  constructor(router, url) {
-    this.routeInfo = router.recognize(url);
-  }
-
-  get route() {
-    return this.routeInfo.name;
-  }
-
-  get models() {
-    return this.#getParameters;
-  }
-
-  get query() {
-    return this.routeInfo.queryParams;
-  }
-
-  /**
-   * Extracted from https://github.com/emberjs/rfcs/issues/658
-   * Retrieves all parameters for a `RouteInfo` object and its parents in
-   * correct oder, so that you can pass them to e.g.
-   * `transitionTo(routeName, ...params)`.
-   */
-  get #getParameters() {
-    let allParameters = [];
-    let current = this.routeInfo;
-
-    do {
-      const { params, paramNames } = current;
-      const currentParameters = paramNames.map((n) => params[n]);
-      allParameters = [...currentParameters, ...allParameters];
-    } while ((current = current.parent));
-
-    return allParameters;
-  }
-}
-
 /**
  * Appends an additional section link to the Community section under the "More..." links drawer.
  *
@@ -49,10 +13,11 @@ class RouteInfoHelper {
  *
  * @param {(addSectionLinkCallback|Object)} args - A callback function or an Object.
  * @param {string} args.name - The name of the link. Needs to be dasherized and lowercase.
- * @param {string=} args.route - The Ember route name to generate the href attribute for the link.
- * @param {string=} args.href - The href attribute for the link.
- * @param {string=} args.title - The title attribute for the link.
  * @param {string} args.text - The text to display for the link.
+ * @param {string} [args.route] - The Ember route name to generate the href attribute for the link.
+ * @param {string} [args.href] - The href attribute for the link.
+ * @param {string} [args.title] - The title attribute for the link.
+ * @param {string} [args.icon] - The FontAwesome 5 icon to display for the link.
  * @param {Boolean} [secondary] - Determines whether the section link should be added to the main or secondary section in the "More..." links drawer.
  */
 export function addSectionLink(args, secondary) {
@@ -101,6 +66,10 @@ export function addSectionLink(args, secondary) {
       get title() {
         return args.title;
       }
+
+      get prefixValue() {
+        return args.icon || super.prefixValue;
+      }
     };
 
     links.push(klass);
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/custom-sections.js b/app/assets/javascripts/discourse/app/lib/sidebar/custom-sections.js
index 2284ca57fa2..ef4b1ddb178 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/custom-sections.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/custom-sections.js
@@ -1,14 +1,51 @@
 import BaseCustomSidebarSection from "discourse/lib/sidebar/base-custom-sidebar-section";
+import BaseCustomSidebarPanel from "discourse/lib/sidebar/base-custom-sidebar-panel";
 import BaseCustomSidebarSectionLink from "discourse/lib/sidebar/base-custom-sidebar-section-link";
+import I18n from "I18n";
 
-export const customSections = [];
+class MainSidebarPanel {
+  sections = [];
 
-export function addSidebarSection(func) {
-  customSections.push(
+  get key() {
+    return "main";
+  }
+
+  get switchButtonLabel() {
+    return I18n.t("sidebar.panels.forum.label");
+  }
+
+  get switchButtonIcon() {
+    return "random";
+  }
+
+  get switchButtonDefaultUrl() {
+    return "/";
+  }
+}
+
+export let customPanels = [new MainSidebarPanel()];
+
+export let currentPanelKey = "main";
+
+export function addSidebarPanel(func) {
+  const panelClass = func.call(this, BaseCustomSidebarPanel);
+  customPanels.push(new panelClass());
+}
+
+export function addSidebarSection(func, panelKey) {
+  const panel = customPanels.find((p) => p.key === panelKey);
+  if (!panel) {
+    // eslint-disable-next-line no-console
+    return console.warn(
+      `Error adding section to ${panelKey} because panel doens't exist. Check addSidebarPanel API.`
+    );
+  }
+  panel.sections.push(
     func.call(this, BaseCustomSidebarSection, BaseCustomSidebarSectionLink)
   );
 }
 
-export function resetSidebarSection() {
-  customSections.length = 0;
+export function resetSidebarPanels() {
+  customPanels = [new MainSidebarPanel()];
+  currentPanelKey = "main";
 }
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/helpers.js b/app/assets/javascripts/discourse/app/lib/sidebar/helpers.js
index e6401c442fe..7fc3e68edd8 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/helpers.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/helpers.js
@@ -7,3 +7,11 @@ export function canDisplayCategory(categoryId, siteSettings) {
 
   return !Category.isUncategorized(categoryId);
 }
+
+export function hasDefaultSidebarCategories(siteSettings) {
+  return siteSettings.default_navigation_menu_categories.length > 0;
+}
+
+export function hasDefaultSidebarTags(siteSettings) {
+  return siteSettings.default_navigation_menu_tags.length > 0;
+}
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/route-info-helper.js b/app/assets/javascripts/discourse/app/lib/sidebar/route-info-helper.js
new file mode 100644
index 00000000000..39db22d53a2
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/route-info-helper.js
@@ -0,0 +1,36 @@
+export default class RouteInfoHelper {
+  constructor(router, url) {
+    this.routeInfo = router.recognize(router.rootURL.replace(/\/$/, "") + url);
+  }
+
+  get route() {
+    return this.routeInfo.name;
+  }
+
+  get models() {
+    return this.#getParameters;
+  }
+
+  get query() {
+    return this.routeInfo.queryParams;
+  }
+
+  /**
+   * Extracted from https://github.com/emberjs/rfcs/issues/658
+   * Retrieves all parameters for a `RouteInfo` object and its parents in
+   * correct oder, so that you can pass them to e.g.
+   * `transitionTo(routeName, ...params)`.
+   */
+  get #getParameters() {
+    let allParameters = [];
+    let current = this.routeInfo;
+
+    do {
+      const { params, paramNames } = current;
+      const currentParameters = paramNames.map((n) => params[n]);
+      allParameters = [...currentParameters, ...allParameters];
+    } while ((current = current.parent));
+
+    return allParameters;
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/section-link.js
new file mode 100644
index 00000000000..e489222b5c1
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/section-link.js
@@ -0,0 +1,137 @@
+import { tracked } from "@glimmer/tracking";
+import { bind } from "discourse-common/utils/decorators";
+import RouteInfoHelper from "discourse/lib/sidebar/route-info-helper";
+import discourseLater from "discourse-common/lib/later";
+
+const TOUCH_SCREEN_DELAY = 300;
+const MOUSE_DELAY = 250;
+
+export default class SectionLink {
+  @tracked linkDragCss;
+
+  constructor(
+    { external, full_reload, icon, id, name, value },
+    section,
+    router
+  ) {
+    this.external = external;
+    this.fullReload = full_reload;
+    this.prefixValue = icon;
+    this.id = id;
+    this.name = name;
+    this.text = name;
+    this.value = value;
+    this.section = section;
+
+    if (!this.externalOrFullReload) {
+      const routeInfoHelper = new RouteInfoHelper(router, value);
+      this.route = routeInfoHelper.route;
+      this.models = routeInfoHelper.models;
+      this.query = routeInfoHelper.query;
+    }
+  }
+
+  get shouldDisplay() {
+    return true;
+  }
+
+  get externalOrFullReload() {
+    return this.external || this.fullReload;
+  }
+
+  @bind
+  didStartDrag(event) {
+    // 0 represents left button of the mouse
+    if (event.button === 0 || event.targetTouches) {
+      this.startMouseY = this.#calcMouseY(event);
+      this.willDrag = true;
+
+      discourseLater(
+        () => {
+          this.delayedStart(event);
+        },
+        event.targetTouches ? TOUCH_SCREEN_DELAY : MOUSE_DELAY
+      );
+    }
+  }
+
+  delayedStart(event) {
+    if (this.willDrag) {
+      const currentMouseY = this.#calcMouseY(event);
+
+      if (currentMouseY === this.startMouseY) {
+        event.stopPropagation();
+        event.preventDefault();
+        this.mouseY = this.#calcMouseY(event);
+        this.linkDragCss = "drag";
+        this.section.disable();
+        this.drag = true;
+      }
+    }
+  }
+
+  @bind
+  didEndDrag() {
+    this.linkDragCss = null;
+    this.mouseY = null;
+    this.section.enable();
+    this.section.reorder();
+    this.willDrag = false;
+    this.drag = false;
+  }
+
+  @bind
+  dragMove(event) {
+    const moveMouseY = this.#calcMouseY(event);
+
+    if (this.willDrag && moveMouseY !== this.startMouseY && !this.drag) {
+      /**
+       * If mouse position is different, it means that it is a scroll and not drag and drop action.
+       * In that case, we want to do nothing and keep original behaviour.
+       */
+      this.willDrag = false;
+      return;
+    } else {
+      /**
+       * Otherwise, event propagation should be stopped as we have our own handler for drag and drop.
+       */
+      event.stopPropagation();
+      event.preventDefault();
+    }
+
+    this.startMouseY = moveMouseY;
+
+    if (!this.drag) {
+      return;
+    }
+
+    const currentMouseY = this.#calcMouseY(event);
+    const distance = currentMouseY - this.mouseY;
+
+    if (!this.linkHeight) {
+      this.linkHeight = document.getElementsByClassName(
+        "sidebar-section-link-wrapper"
+      )[0].clientHeight;
+    }
+
+    if (distance >= this.linkHeight) {
+      if (this.section.links.indexOf(this) !== this.section.links.length - 1) {
+        this.section.moveLinkDown(this);
+        this.mouseY = currentMouseY;
+      }
+    }
+
+    if (distance <= -this.linkHeight) {
+      if (this.section.links.indexOf(this) !== 0) {
+        this.section.moveLinkUp(this);
+        this.mouseY = currentMouseY;
+      }
+    }
+  }
+
+  #calcMouseY(event) {
+    return Math.round(
+      event.targetTouches ? event.targetTouches[0].clientY : event.y
+    );
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/section.js b/app/assets/javascripts/discourse/app/lib/sidebar/section.js
new file mode 100644
index 00000000000..3e89414c18b
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/section.js
@@ -0,0 +1,94 @@
+import I18n from "I18n";
+import SectionLink from "discourse/lib/sidebar/section-link";
+import { tracked } from "@glimmer/tracking";
+import { setOwner } from "@ember/application";
+import { inject as service } from "@ember/service";
+import { bind } from "discourse-common/utils/decorators";
+import { ajax } from "discourse/lib/ajax";
+import SidebarSectionForm from "discourse/components/modal/sidebar-section-form";
+
+export default class Section {
+  @service currentUser;
+  @service modal;
+  @service router;
+
+  @tracked dragCss;
+  @tracked links;
+
+  reorderable = true;
+
+  constructor({ section, owner }) {
+    setOwner(this, owner);
+
+    this.section = section;
+    this.slug = section.slug;
+
+    this.links = this.section.links.map((link) => {
+      return new SectionLink(link, this, this.router);
+    });
+  }
+
+  get decoratedTitle() {
+    return this.section.title;
+  }
+
+  get indicatePublic() {
+    return this.section.public && this.currentUser?.staff;
+  }
+
+  get headerActions() {
+    if (!this.section.public || this.currentUser?.staff) {
+      return [
+        {
+          action: () => {
+            return this.modal.show(SidebarSectionForm, {
+              model: this,
+            });
+          },
+          title: I18n.t("sidebar.sections.custom.edit"),
+        },
+      ];
+    }
+  }
+
+  get headerActionIcon() {
+    return "pencil-alt";
+  }
+
+  @bind
+  disable() {
+    this.dragCss = "disabled";
+  }
+
+  @bind
+  enable() {
+    this.dragCss = null;
+  }
+
+  @bind
+  moveLinkDown(link) {
+    const position = this.links.indexOf(link) + 1;
+    this.links = this.links.removeObject(link);
+    this.links.splice(position, 0, link);
+  }
+
+  @bind
+  moveLinkUp(link) {
+    const position = this.links.indexOf(link) - 1;
+    this.links = this.links.removeObject(link);
+    this.links.splice(position, 0, link);
+  }
+
+  @bind
+  reorder() {
+    return ajax(`/sidebar_sections/reorder`, {
+      type: "POST",
+      contentType: "application/json",
+      dataType: "json",
+      data: JSON.stringify({
+        sidebar_section_id: this.section.id,
+        links_order: this.links.map((link) => link.id),
+      }),
+    });
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/user/categories-section/category-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/categories-section/category-section-link.js
index 1427b50bdf5..43fae208a45 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/user/categories-section/category-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/categories-section/category-section-link.js
@@ -5,7 +5,17 @@ import { get, set } from "@ember/object";
 
 import { bind } from "discourse-common/utils/decorators";
 import Category from "discourse/models/category";
-import { UNREAD_LIST_DESTINATION } from "discourse/controllers/preferences/sidebar";
+
+const UNREAD_AND_NEW_COUNTABLE = {
+  propertyName: "unreadAndNewCount",
+  badgeTextFunction: (count) => count.toString(),
+  route: "discovery.newCategory",
+  refreshCountFunction: ({ topicTrackingState, category }) => {
+    return topicTrackingState.countNewAndUnread({
+      categoryId: category.id,
+    });
+  },
+};
 
 const DEFAULT_COUNTABLES = [
   {
@@ -61,6 +71,39 @@ export function resetCustomCountables() {
   customCountables.length = 0;
 }
 
+let customCategoryLockIcon;
+
+export function registerCustomCategoryLockIcon(icon) {
+  customCategoryLockIcon = icon;
+}
+
+export function resetCustomCategoryLockIcon() {
+  customCategoryLockIcon = null;
+}
+
+let customCategoryPrefixes = {};
+
+export function registerCustomCategorySectionLinkPrefix({
+  categoryId,
+  prefixValue,
+  prefixType,
+  prefixColor,
+}) {
+  customCategoryPrefixes[categoryId] = {
+    prefixValue,
+    prefixType,
+    prefixColor,
+  };
+}
+
+export function resetCustomCategorySectionLinkPrefix() {
+  for (let key in customCategoryPrefixes) {
+    if (customCategoryPrefixes.hasOwnProperty(key)) {
+      delete customCategoryPrefixes[key];
+    }
+  }
+}
+
 export default class CategorySectionLink {
   @tracked activeCountable;
 
@@ -74,7 +117,13 @@ export default class CategorySectionLink {
   }
 
   #countables() {
-    const countables = [...DEFAULT_COUNTABLES];
+    const countables = [];
+
+    if (this.#newNewViewEnabled) {
+      countables.push(UNREAD_AND_NEW_COUNTABLE);
+    } else {
+      countables.push(...DEFAULT_COUNTABLES);
+    }
 
     if (customCountables.length > 0) {
       customCountables.forEach((customCountable) => {
@@ -99,8 +148,8 @@ export default class CategorySectionLink {
     return countables;
   }
 
-  get hideCount() {
-    return this.currentUser?.sidebarListDestination !== UNREAD_LIST_DESTINATION;
+  get showCount() {
+    return this.currentUser?.sidebarShowCountOfNewItems;
   }
 
   @bind
@@ -139,25 +188,39 @@ export default class CategorySectionLink {
   }
 
   get prefixType() {
-    return "span";
+    return customCategoryPrefixes[this.category.id]?.prefixType || "span";
   }
 
-  get prefixElementColors() {
-    return [this.category.parentCategory?.color, this.category.color];
+  get prefixValue() {
+    const customPrefixValue =
+      customCategoryPrefixes[this.category.id]?.prefixValue;
+
+    if (customPrefixValue) {
+      return customPrefixValue;
+    }
+
+    if (this.category.parentCategory?.color) {
+      return [this.category.parentCategory?.color, this.category.color];
+    } else {
+      return [this.category.color];
+    }
   }
 
   get prefixColor() {
-    return this.category.color;
+    return (
+      customCategoryPrefixes[this.category.id]?.prefixColor ||
+      this.category.color
+    );
   }
 
   get prefixBadge() {
     if (this.category.read_restricted) {
-      return "lock";
+      return customCategoryLockIcon || "lock";
     }
   }
 
   get badgeText() {
-    if (this.hideCount) {
+    if (!this.showCount) {
       return;
     }
 
@@ -171,7 +234,7 @@ export default class CategorySectionLink {
   }
 
   get route() {
-    if (this.currentUser?.sidebarListDestination === UNREAD_LIST_DESTINATION) {
+    if (this.currentUser?.sidebarLinkToFilteredList) {
       const activeCountable = this.activeCountable;
 
       if (activeCountable) {
@@ -183,7 +246,7 @@ export default class CategorySectionLink {
   }
 
   get query() {
-    if (this.currentUser?.sidebarListDestination === UNREAD_LIST_DESTINATION) {
+    if (this.currentUser?.sidebarLinkToFilteredList) {
       const activeCountable = this.activeCountable;
 
       if (activeCountable?.routeQuery) {
@@ -201,8 +264,12 @@ export default class CategorySectionLink {
   }
 
   get suffixValue() {
-    if (this.hideCount && this.activeCountable) {
+    if (!this.showCount && this.activeCountable) {
       return "circle";
     }
   }
+
+  get #newNewViewEnabled() {
+    return !!this.currentUser?.new_new_view_enabled;
+  }
 }
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/admin-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/admin-section-link.js
index 850a7c48d6b..86aa606f93d 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/admin-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/admin-section-link.js
@@ -16,14 +16,17 @@ export default class AdminSectionLink extends BaseSectionLink {
   }
 
   get text() {
-    return I18n.t("sidebar.sections.community.links.admin.content");
+    return I18n.t(
+      `sidebar.sections.community.links.${this.overridenName.toLowerCase()}.content`,
+      { defaultValue: this.overridenName }
+    );
   }
 
   get shouldDisplay() {
-    return this.currentUser?.staff;
+    return !!this.currentUser?.staff;
   }
 
-  get prefixValue() {
+  get defaultPrefixValue() {
     return "wrench";
   }
 }
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/admin-section.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/admin-section.js
new file mode 100644
index 00000000000..f27266ae652
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/admin-section.js
@@ -0,0 +1,30 @@
+import I18n from "I18n";
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+
+import CommonCommunitySection from "discourse/lib/sidebar/common/community-section/section";
+import SidebarSectionForm from "discourse/components/modal/sidebar-section-form";
+
+export default class extends CommonCommunitySection {
+  @service modal;
+  @service navigationMenu;
+
+  @action
+  moreSectionButtonAction() {
+    return this.modal.show(SidebarSectionForm, { model: this });
+  }
+
+  get moreSectionButtonText() {
+    return I18n.t(
+      `sidebar.sections.community.edit_section.${
+        this.navigationMenu.isDesktopDropdownMode
+          ? "header_dropdown"
+          : "sidebar"
+      }`
+    );
+  }
+
+  get moreSectionButtonIcon() {
+    return "pencil-alt";
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/my-posts-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/my-posts-section-link.js
index 82fceb4bd0e..033143f430c 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/my-posts-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/my-posts-section-link.js
@@ -2,28 +2,42 @@ import I18n from "I18n";
 import { tracked } from "@glimmer/tracking";
 
 import BaseSectionLink from "discourse/lib/sidebar/base-community-section-link";
-import { UNREAD_LIST_DESTINATION } from "discourse/controllers/preferences/sidebar";
 
 const USER_DRAFTS_CHANGED_EVENT = "user-drafts:changed";
 
 export default class MyPostsSectionLink extends BaseSectionLink {
-  @tracked draftCount = this.currentUser.draft_count;
-  @tracked hideCount =
-    this.currentUser?.sidebarListDestination !== UNREAD_LIST_DESTINATION;
+  @tracked draftCount = this.currentUser?.draft_count;
 
   constructor() {
     super(...arguments);
-    this.appEvents.on(USER_DRAFTS_CHANGED_EVENT, this, this._updateDraftCount);
+
+    if (this.shouldDisplay) {
+      this.appEvents.on(
+        USER_DRAFTS_CHANGED_EVENT,
+        this,
+        this._updateDraftCount
+      );
+    }
   }
 
   teardown() {
-    this.appEvents.off(USER_DRAFTS_CHANGED_EVENT, this, this._updateDraftCount);
+    if (this.shouldDisplay) {
+      this.appEvents.off(
+        USER_DRAFTS_CHANGED_EVENT,
+        this,
+        this._updateDraftCount
+      );
+    }
   }
 
   _updateDraftCount() {
     this.draftCount = this.currentUser.draft_count;
   }
 
+  get showCount() {
+    return this.currentUser.sidebarShowCountOfNewItems;
+  }
+
   get name() {
     return "my-posts";
   }
@@ -55,11 +69,26 @@ export default class MyPostsSectionLink extends BaseSectionLink {
   }
 
   get text() {
-    return I18n.t("sidebar.sections.community.links.my_posts.content");
+    if (this._hasDraft && this.currentUser?.new_new_view_enabled) {
+      return I18n.t("sidebar.sections.community.links.my_posts.content_drafts");
+    } else {
+      return I18n.t(
+        `sidebar.sections.community.links.${this.overridenName
+          .toLowerCase()
+          .replace(" ", "_")}.content`,
+        { defaultValue: this.overridenName }
+      );
+    }
   }
 
   get badgeText() {
-    if (this._hasDraft && !this.hideCount) {
+    if (!this.showCount || !this._hasDraft) {
+      return;
+    }
+
+    if (this.currentUser.new_new_view_enabled) {
+      return this.draftCount.toString();
+    } else {
       return I18n.t("sidebar.sections.community.links.my_posts.draft_count", {
         count: this.draftCount,
       });
@@ -70,7 +99,10 @@ export default class MyPostsSectionLink extends BaseSectionLink {
     return this.draftCount > 0;
   }
 
-  get prefixValue() {
+  get defaultPrefixValue() {
+    if (this._hasDraft && this.currentUser?.new_new_view_enabled) {
+      return "pencil-alt";
+    }
     return "user";
   }
 
@@ -83,8 +115,12 @@ export default class MyPostsSectionLink extends BaseSectionLink {
   }
 
   get suffixValue() {
-    if (this._hasDraft && this.hideCount) {
+    if (this._hasDraft && !this.showCount) {
       return "circle";
     }
   }
+
+  get shouldDisplay() {
+    return this.currentUser;
+  }
 }
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/review-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/review-section-link.js
index aa4478b72e1..a3db1f591d1 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/review-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/review-section-link.js
@@ -1,39 +1,9 @@
 import I18n from "I18n";
-
-import { tracked } from "@glimmer/tracking";
-
-import { bind } from "discourse-common/utils/decorators";
 import BaseSectionLink from "discourse/lib/sidebar/base-community-section-link";
 
 export default class ReviewSectionLink extends BaseSectionLink {
-  @tracked canDisplay;
-
-  constructor() {
-    super(...arguments);
-
-    this._refreshCanDisplay();
-    this.appEvents.on("user-reviewable-count:changed", this._refreshCanDisplay);
-  }
-
-  teardown() {
-    this.appEvents.off(
-      "user-reviewable-count:changed",
-      this._refreshCanDisplay
-    );
-  }
-
-  @bind
-  _refreshCanDisplay() {
-    if (!this.currentUser.can_review) {
-      this.canDisplay = false;
-      return;
-    }
-
-    if (this.inMoreDrawer) {
-      this.canDisplay = this.currentUser.reviewable_count < 1;
-    } else {
-      this.canDisplay = this.currentUser.reviewable_count > 0;
-    }
+  get shouldDisplay() {
+    return !!this.currentUser?.can_review;
   }
 
   get name() {
@@ -49,11 +19,10 @@ export default class ReviewSectionLink extends BaseSectionLink {
   }
 
   get text() {
-    return I18n.t("sidebar.sections.community.links.review.content");
-  }
-
-  get shouldDisplay() {
-    return this.canDisplay;
+    return I18n.t(
+      `sidebar.sections.community.links.${this.overridenName.toLowerCase()}.content`,
+      { defaultValue: this.overridenName }
+    );
   }
 
   get badgeText() {
@@ -66,7 +35,7 @@ export default class ReviewSectionLink extends BaseSectionLink {
     }
   }
 
-  get prefixValue() {
+  get defaultPrefixValue() {
     return "flag";
   }
 }
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/user/tags-section/base-tag-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/tags-section/base-tag-section-link.js
index 6a32ae90277..4f8cac18897 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/user/tags-section/base-tag-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/tags-section/base-tag-section-link.js
@@ -1,6 +1,31 @@
+import { escape } from "pretty-text/sanitizer";
+
+let customTagSectionLinkPrefixIcons = {};
+
+export function registerCustomTagSectionLinkPrefixIcon({
+  tagName,
+  prefixValue,
+  prefixColor,
+}) {
+  customTagSectionLinkPrefixIcons[tagName] = {
+    prefixValue,
+    prefixColor,
+  };
+}
+
+export function resetCustomTagSectionLinkPrefixIcons() {
+  for (let key in customTagSectionLinkPrefixIcons) {
+    if (customTagSectionLinkPrefixIcons.hasOwnProperty(key)) {
+      delete customTagSectionLinkPrefixIcons[key];
+    }
+  }
+}
+
 export default class BaseTagSectionLink {
-  constructor({ tagName }) {
-    this.tagName = tagName;
+  constructor({ tag, currentUser }) {
+    this.tag = tag;
+    this.tagName = tag.name;
+    this.currentUser = currentUser;
   }
 
   get name() {
@@ -11,11 +36,19 @@ export default class BaseTagSectionLink {
     return this.tagName;
   }
 
+  get title() {
+    return escape(this.tag.description);
+  }
+
   get prefixType() {
     return "icon";
   }
 
   get prefixValue() {
-    return "tag";
+    return customTagSectionLinkPrefixIcons[this.tagName]?.prefixValue || "tag";
+  }
+
+  get prefixColor() {
+    return customTagSectionLinkPrefixIcons[this.tagName]?.prefixColor;
   }
 }
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/user/tags-section/pm-tag-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/tags-section/pm-tag-section-link.js
index 7e10951d5b1..09d36e4d10c 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/user/tags-section/pm-tag-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/tags-section/pm-tag-section-link.js
@@ -1,11 +1,6 @@
 import BaseTagSectionLink from "discourse/lib/sidebar/user/tags-section/base-tag-section-link";
 
 export default class PMTagSectionLink extends BaseTagSectionLink {
-  constructor({ currentUser }) {
-    super(...arguments);
-    this.currentUser = currentUser;
-  }
-
   get models() {
     return [this.currentUser, this.tagName];
   }
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/user/tags-section/tag-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/tags-section/tag-section-link.js
index 3d3c4121bae..0aaaf5451bd 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/user/tags-section/tag-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/tags-section/tag-section-link.js
@@ -4,18 +4,14 @@ import { tracked } from "@glimmer/tracking";
 
 import { bind } from "discourse-common/utils/decorators";
 import BaseTagSectionLink from "discourse/lib/sidebar/user/tags-section/base-tag-section-link";
-import { UNREAD_LIST_DESTINATION } from "discourse/controllers/preferences/sidebar";
 
 export default class TagSectionLink extends BaseTagSectionLink {
   @tracked totalUnread = 0;
   @tracked totalNew = 0;
-  @tracked hideCount =
-    this.currentUser?.sidebarListDestination !== UNREAD_LIST_DESTINATION;
 
-  constructor({ topicTrackingState, currentUser }) {
+  constructor({ topicTrackingState }) {
     super(...arguments);
     this.topicTrackingState = topicTrackingState;
-    this.currentUser = currentUser;
     this.refreshCounts();
   }
 
@@ -25,23 +21,28 @@ export default class TagSectionLink extends BaseTagSectionLink {
       tagId: this.tagName,
     });
 
-    if (this.totalUnread === 0) {
+    if (this.totalUnread === 0 || this.#newNewViewEnabled) {
       this.totalNew = this.topicTrackingState.countNew({
         tagId: this.tagName,
       });
     }
   }
 
+  get showCount() {
+    return this.currentUser?.sidebarShowCountOfNewItems;
+  }
+
   get models() {
     return [this.tagName];
   }
 
   get route() {
-    if (this.currentUser?.sidebarListDestination === UNREAD_LIST_DESTINATION) {
-      if (this.totalUnread > 0) {
+    if (this.currentUser?.sidebarLinkToFilteredList) {
+      if (this.#newNewViewEnabled && this.#unreadAndNewCount > 0) {
+        return "tag.showNew";
+      } else if (this.totalUnread > 0) {
         return "tag.showUnread";
-      }
-      if (this.totalNew > 0) {
+      } else if (this.totalNew > 0) {
         return "tag.showNew";
       }
     }
@@ -53,10 +54,13 @@ export default class TagSectionLink extends BaseTagSectionLink {
   }
 
   get badgeText() {
-    if (this.hideCount) {
+    if (!this.showCount) {
       return;
     }
-    if (this.totalUnread > 0) {
+
+    if (this.#newNewViewEnabled && this.#unreadAndNewCount > 0) {
+      return this.#unreadAndNewCount.toString();
+    } else if (this.totalUnread > 0) {
       return I18n.t("sidebar.unread_count", {
         count: this.totalUnread,
       });
@@ -76,8 +80,16 @@ export default class TagSectionLink extends BaseTagSectionLink {
   }
 
   get suffixValue() {
-    if (this.hideCount && (this.totalUnread || this.totalNew)) {
+    if (!this.showCount && (this.totalUnread || this.totalNew)) {
       return "circle";
     }
   }
+
+  get #unreadAndNewCount() {
+    return this.totalUnread + this.totalNew;
+  }
+
+  get #newNewViewEnabled() {
+    return !!this.currentUser?.new_new_view_enabled;
+  }
 }
diff --git a/app/assets/javascripts/discourse/app/lib/static-route-builder.js b/app/assets/javascripts/discourse/app/lib/static-route-builder.js
deleted file mode 100644
index 274e1e5186b..00000000000
--- a/app/assets/javascripts/discourse/app/lib/static-route-builder.js
+++ /dev/null
@@ -1,50 +0,0 @@
-import DiscourseURL from "discourse/lib/url";
-import DiscourseRoute from "discourse/routes/discourse";
-import I18n from "I18n";
-import StaticPage from "discourse/models/static-page";
-
-const configs = {
-  faq: "faq_url",
-  tos: "tos_url",
-  privacy: "privacy_policy_url",
-};
-
-export default function (page) {
-  return DiscourseRoute.extend({
-    renderTemplate() {
-      this.render("static");
-    },
-
-    beforeModel(transition) {
-      const configKey = configs[page];
-      if (configKey && this.siteSettings[configKey].length > 0) {
-        transition.abort();
-        DiscourseURL.redirectTo(this.siteSettings[configKey]);
-      }
-    },
-
-    activate() {
-      this._super(...arguments);
-      DiscourseURL.jumpToElement(document.location.hash.slice(1));
-    },
-
-    model() {
-      return StaticPage.find(page);
-    },
-
-    setupController(controller, model) {
-      this.controllerFor("static").set("model", model);
-    },
-
-    titleToken() {
-      return I18n.t(page);
-    },
-
-    actions: {
-      didTransition() {
-        this.controllerFor("application").set("showFooter", true);
-        return true;
-      },
-    },
-  });
-}
diff --git a/app/assets/javascripts/discourse/app/lib/sticky-avatars.js b/app/assets/javascripts/discourse/app/lib/sticky-avatars.js
index d69f23b3e06..16fd8af2b74 100644
--- a/app/assets/javascripts/discourse/app/lib/sticky-avatars.js
+++ b/app/assets/javascripts/discourse/app/lib/sticky-avatars.js
@@ -2,11 +2,12 @@ import { addWidgetCleanCallback } from "discourse/components/mount-widget";
 import Site from "discourse/models/site";
 import { bind } from "discourse-common/utils/decorators";
 import { headerOffset } from "discourse/lib/offset-calculator";
+import { getOwner, setOwner } from "@ember/application";
 import { schedule } from "@ember/runloop";
 
 export default class StickyAvatars {
-  static init(container) {
-    return new this(container).init();
+  static init(owner) {
+    return new this(owner).init();
   }
 
   stickyClass = "sticky-avatar";
@@ -15,8 +16,8 @@ export default class StickyAvatars {
   direction = "⬇️";
   prevOffset = -1;
 
-  constructor(container) {
-    this.container = container;
+  constructor(owner) {
+    setOwner(this, owner);
   }
 
   init() {
@@ -24,7 +25,7 @@ export default class StickyAvatars {
       return;
     }
 
-    const appEvents = this.container.lookup("service:app-events");
+    const appEvents = getOwner(this).lookup("service:app-events");
     appEvents.on("topic:current-post-scrolled", this._handlePostNodes);
     appEvents.on("topic:scrolled", this._handleScroll);
     appEvents.on("page:topic-loaded", this._initIntersectionObserver);
@@ -34,9 +35,7 @@ export default class StickyAvatars {
     return this;
   }
 
-  destroy() {
-    this.container = null;
-  }
+  destroy() {}
 
   @bind
   _handleScroll(offset) {
diff --git a/app/assets/javascripts/discourse/app/lib/text.js b/app/assets/javascripts/discourse/app/lib/text.js
index f87aca89a40..c8cfc3fc55e 100644
--- a/app/assets/javascripts/discourse/app/lib/text.js
+++ b/app/assets/javascripts/discourse/app/lib/text.js
@@ -19,6 +19,7 @@ function getOpts(opts) {
       currentUser: context.currentUser,
       censoredRegexp: context.site.censored_regexp,
       customEmojiTranslation: context.site.custom_emoji_translation,
+      emojiDenyList: context.site.denied_emojis,
       siteSettings: context.siteSettings,
       formatUsername,
       watchedWordsReplace: context.site.watched_words_replace,
@@ -96,6 +97,7 @@ function createPrettyText(options) {
 
 function emojiOptions() {
   let siteSettings = helperContext().siteSettings;
+  let context = helperContext();
   if (!siteSettings.enable_emoji) {
     return;
   }
@@ -105,6 +107,7 @@ function emojiOptions() {
     emojiSet: siteSettings.emoji_set,
     enableEmojiShortcuts: siteSettings.enable_emoji_shortcuts,
     inlineEmoji: siteSettings.enable_inline_emoji_translation,
+    emojiDenyList: context.site.denied_emojis,
     emojiCDNUrl: siteSettings.external_emoji_url,
   };
 }
diff --git a/app/assets/javascripts/discourse/app/lib/transform-post.js b/app/assets/javascripts/discourse/app/lib/transform-post.js
index 24d0a0d3392..740c7c7f58e 100644
--- a/app/assets/javascripts/discourse/app/lib/transform-post.js
+++ b/app/assets/javascripts/discourse/app/lib/transform-post.js
@@ -26,6 +26,7 @@ export function transformBasicPost(post) {
     flair_url: post.flair_url,
     flair_bg_color: post.flair_bg_color,
     flair_color: post.flair_color,
+    flair_group_id: post.flair_group_id,
     wiki: post.wiki,
     lastWikiEdit: post.last_wiki_edit,
     firstPost: post.post_number === 1,
@@ -56,6 +57,7 @@ export function transformBasicPost(post) {
     canPermanentlyDelete: false,
     showFlagDelete: false,
     canRecover: post.can_recover,
+    canSeeHiddenPost: post.can_see_hidden_post,
     canEdit: post.can_edit,
     canFlag: !post.get("topic.deleted") && !isEmpty(post.get("flagsAvailable")),
     canReviewTopic: false,
@@ -216,7 +218,8 @@ export default function transformPost(
     postAtts.userFilters = postStream.userFilters;
     postAtts.topicSummaryEnabled = postStream.summary;
     postAtts.topicWordCount = topic.word_count;
-    postAtts.hasTopicSummary = topic.has_summary;
+    postAtts.hasTopRepliesSummary = topic.has_summary;
+    postAtts.summarizable = topic.summarizable;
   }
 
   if (postAtts.isDeleted) {
diff --git a/app/assets/javascripts/discourse/app/lib/update-user-status-on-mention.js b/app/assets/javascripts/discourse/app/lib/update-user-status-on-mention.js
new file mode 100644
index 00000000000..eb95e52d34a
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/update-user-status-on-mention.js
@@ -0,0 +1,14 @@
+import createUserStatusMessage from "discourse/lib/user-status-message";
+
+export function updateUserStatusOnMention(mention, status, tippyInstances) {
+  removeStatus(mention);
+  if (status) {
+    const statusHtml = createUserStatusMessage(status, { showTooltip: true });
+    tippyInstances.push(statusHtml._tippy);
+    mention.appendChild(statusHtml);
+  }
+}
+
+function removeStatus(mention) {
+  mention.querySelector("span.user-status-message")?.remove();
+}
diff --git a/app/assets/javascripts/discourse/app/lib/uploads.js b/app/assets/javascripts/discourse/app/lib/uploads.js
index 95dbeba100b..a31095572e9 100644
--- a/app/assets/javascripts/discourse/app/lib/uploads.js
+++ b/app/assets/javascripts/discourse/app/lib/uploads.js
@@ -196,7 +196,7 @@ export function authorizedExtensions(staff, siteSettings) {
 
 function authorizedImagesExtensions(staff, siteSettings) {
   return authorizesAllExtensions(staff, siteSettings)
-    ? "png, jpg, jpeg, gif, svg, ico, heic, heif, webp"
+    ? "png, jpg, jpeg, gif, svg, ico, heic, heif, webp, avif"
     : imagesExtensions(staff, siteSettings).join(", ");
 }
 
@@ -230,7 +230,7 @@ export function authorizesOneOrMoreImageExtensions(staff, siteSettings) {
 }
 
 export function isImage(path) {
-  return /\.(png|webp|jpe?g|gif|svg|ico|heic|heif)$/i.test(path);
+  return /\.(png|webp|jpe?g|gif|svg|ico|heic|heif|avif)$/i.test(path);
 }
 
 export function isVideo(path) {
diff --git a/app/assets/javascripts/discourse/app/lib/url.js b/app/assets/javascripts/discourse/app/lib/url.js
index 996a51f94dd..7864a0d1fac 100644
--- a/app/assets/javascripts/discourse/app/lib/url.js
+++ b/app/assets/javascripts/discourse/app/lib/url.js
@@ -27,7 +27,6 @@ const SERVER_SIDE_ONLY = [
   /^\/raw\/\d+/,
   /\.rss$/,
   /\.json$/,
-  /^\/admin\/upgrade$/,
   /^\/logs($|\/)/,
   /^\/admin\/customize\/watched_words\/action\/[^\/]+\/download$/,
   /^\/pub\//,
@@ -156,6 +155,10 @@ const DiscourseURL = EmberObject.extend({
   },
 
   replaceState(path) {
+    if (path.startsWith("#")) {
+      path = this.router.currentURL.replace(/#.*$/, "") + path;
+    }
+
     if (this.router.currentURL !== path) {
       // Always use replaceState in the next runloop to prevent weird routes changing
       // while URLs are loading. For example, while a topic loads it sets `currentPost`
@@ -410,7 +413,7 @@ const DiscourseURL = EmberObject.extend({
   },
 
   get isComposerOpen() {
-    return this.controllerFor("composer")?.visible;
+    return this.container.lookup("service:composer")?.visible;
   },
 
   get router() {
@@ -461,7 +464,7 @@ const DiscourseURL = EmberObject.extend({
     transition._discourse_original_url = path;
 
     const promise = transition.promise || transition;
-    promise.then(() => this.jumpToElement(elementId));
+    return promise.then(() => this.jumpToElement(elementId));
   },
 
   jumpToElement(elementId) {
@@ -506,9 +509,13 @@ export function getCategoryAndTagUrl(category, subcategories, tag) {
 
   if (category) {
     url = category.path;
-    if (subcategories && category.default_list_filter === "none") {
-      url += "/all";
-    } else if (!subcategories && category.default_list_filter === "all") {
+    if (category.default_list_filter === "none" && subcategories) {
+      if (subcategories) {
+        url += "/all";
+      } else {
+        url += "/none";
+      }
+    } else if (!subcategories) {
       url += "/none";
     }
   }
diff --git a/app/assets/javascripts/discourse/app/lib/user-menu/notification-item.js b/app/assets/javascripts/discourse/app/lib/user-menu/notification-item.js
index d140078e1bb..c015849c052 100644
--- a/app/assets/javascripts/discourse/app/lib/user-menu/notification-item.js
+++ b/app/assets/javascripts/discourse/app/lib/user-menu/notification-item.js
@@ -5,8 +5,9 @@ import { setTransientHeader } from "discourse/lib/ajax";
 import { getRenderDirector } from "discourse/lib/notification-types-manager";
 
 export default class UserMenuNotificationItem extends UserMenuBaseItem {
-  constructor({ notification, currentUser, siteSettings, site }) {
+  constructor({ notification, appEvents, currentUser, siteSettings, site }) {
     super(...arguments);
+    this.appEvents = appEvents;
     this.notification = notification;
     this.currentUser = currentUser;
     this.siteSettings = siteSettings;
@@ -62,6 +63,9 @@ export default class UserMenuNotificationItem extends UserMenuBaseItem {
   }
 
   onClick() {
+    this.renderDirector.onClick?.();
+    this.appEvents.trigger("user-menu:notification-click", this.notification);
+
     if (!this.notification.read) {
       this.notification.set("read", true);
 
diff --git a/app/assets/javascripts/discourse/app/lib/user-menu/tab.js b/app/assets/javascripts/discourse/app/lib/user-menu/tab.js
index 356b7f8ec1d..76cfbe9aa5c 100644
--- a/app/assets/javascripts/discourse/app/lib/user-menu/tab.js
+++ b/app/assets/javascripts/discourse/app/lib/user-menu/tab.js
@@ -45,7 +45,7 @@ export default class UserMenuTab {
   }
 
   /**
-   * @returns {string} Dasherized version of the component name that should be rendered in the panel area when the tab is active.
+   * @returns {Component} Component class that should be rendered in the panel area when the tab is active.
    */
   get panelComponent() {
     throw new Error("not implemented");
diff --git a/app/assets/javascripts/discourse/app/lib/user-search.js b/app/assets/javascripts/discourse/app/lib/user-search.js
index e24770fead3..8dad5e38889 100644
--- a/app/assets/javascripts/discourse/app/lib/user-search.js
+++ b/app/assets/javascripts/discourse/app/lib/user-search.js
@@ -145,49 +145,65 @@ let debouncedSearch = function (
   );
 };
 
+function lowerCaseIncludes(string, term) {
+  return string && term && string.toLowerCase().includes(term.toLowerCase());
+}
+
 function organizeResults(r, options) {
   if (r === CANCELLED_STATUS) {
     return r;
   }
 
-  let exclude = options.exclude || [],
-    limit = options.limit || 5,
-    users = [],
+  const exclude = options.exclude || [];
+
+  // Sometimes the term passed contains spaces, but the search is limited
+  // to the first word only.
+  const term = options.term?.trim()?.split(/\s/, 1)?.[0];
+
+  const users = [],
     emails = [],
-    groups = [],
-    results = [];
+    groups = [];
+  let resultsLength = 0;
 
   if (r.users) {
-    r.users.every(function (u) {
-      if (!exclude.includes(u.username)) {
-        users.push(u);
-        results.push(u);
+    r.users.forEach((user) => {
+      if (resultsLength < options.limit && !exclude.includes(user.username)) {
+        user.isUser = true;
+        user.isMetadataMatch =
+          !lowerCaseIncludes(user.username, term) &&
+          !lowerCaseIncludes(user.name, term);
+        users.push(user);
+        resultsLength += 1;
       }
-      return results.length <= limit;
     });
   }
 
   if (options.allowEmails && emailValid(options.term)) {
-    let e = { username: options.term };
-    emails = [e];
-    results.push(e);
+    emails.push({ username: options.term, isEmail: true });
+    resultsLength += 1;
   }
 
   if (r.groups) {
-    r.groups.every(function (g) {
+    r.groups.forEach((group) => {
       if (
-        options.term.toLowerCase() === g.name.toLowerCase() ||
-        results.length < limit
+        (options.term.toLowerCase() === group.name.toLowerCase() ||
+          resultsLength < options.limit) &&
+        !exclude.includes(group.name)
       ) {
-        if (!exclude.includes(g.name)) {
-          groups.push(g);
-          results.push(g);
-        }
+        group.isGroup = true;
+        groups.push(group);
+        resultsLength += 1;
       }
-      return true;
     });
   }
 
+  const results = [
+    ...users.filter((u) => !u.isMetadataMatch),
+    ...emails,
+    ...groups,
+    ...users.filter((u) => u.isMetadataMatch),
+  ];
+
   results.users = users;
   results.emails = emails;
   results.groups = groups;
@@ -277,7 +293,7 @@ export default function userSearch(options) {
       limit,
       function (r) {
         cancel(clearPromise);
-        resolve(organizeResults(r, options));
+        resolve(organizeResults(r, { ...options, limit }));
       }
     );
   });
diff --git a/app/assets/javascripts/discourse/app/lib/user-status-message.js b/app/assets/javascripts/discourse/app/lib/user-status-message.js
new file mode 100644
index 00000000000..7159b4b2c68
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/user-status-message.js
@@ -0,0 +1,62 @@
+import createDTooltip from "discourse/lib/d-tooltip";
+import { emojiUnescape } from "discourse/lib/text";
+import { escapeExpression } from "discourse/lib/utilities";
+import { until } from "discourse/lib/formatter";
+import User from "discourse/models/user";
+
+function getUntil(endsAt) {
+  const currentUser = User.current();
+
+  const timezone = currentUser
+    ? currentUser.user_option?.timezone
+    : moment.tz.guess();
+
+  return until(endsAt, timezone, currentUser?.locale);
+}
+
+function getEmoji(emojiName) {
+  const emoji = escapeExpression(`:${emojiName}:`);
+  return emojiUnescape(emoji, {
+    skipTitle: true,
+  });
+}
+
+function attachTooltip(target, status) {
+  const content = document.createElement("div");
+  content.classList.add("user-status-message-tooltip");
+  content.innerHTML = getEmoji(status.emoji);
+
+  const tooltipDescription = document.createElement("span");
+  tooltipDescription.classList.add("user-status-tooltip-description");
+  tooltipDescription.innerText = status.description;
+  content.appendChild(tooltipDescription);
+
+  if (status.ends_at) {
+    const untilElement = document.createElement("div");
+    untilElement.classList.add("user-status-tooltip-until");
+    untilElement.innerText = getUntil(status.ends_at);
+    content.appendChild(untilElement);
+  }
+  createDTooltip(target, content);
+}
+
+export default function createUserStatusMessage(status, opts) {
+  const userStatusMessage = document.createElement("span");
+  userStatusMessage.classList.add("user-status-message");
+  if (opts?.class) {
+    userStatusMessage.classList.add(opts.class);
+  }
+  userStatusMessage.innerHTML = getEmoji(status.emoji);
+
+  if (opts?.showDescription) {
+    const messageDescription = document.createElement("span");
+    messageDescription.classList.add("user-status-message-description");
+    messageDescription.innerText = status.description;
+    userStatusMessage.appendChild(messageDescription);
+  }
+
+  if (opts?.showTooltip) {
+    attachTooltip(userStatusMessage, status);
+  }
+  return userStatusMessage;
+}
diff --git a/app/assets/javascripts/discourse/app/lib/user-status-on-autocomplete.js b/app/assets/javascripts/discourse/app/lib/user-status-on-autocomplete.js
new file mode 100644
index 00000000000..49cdcee1770
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/user-status-on-autocomplete.js
@@ -0,0 +1,36 @@
+import createUserStatusMessage from "discourse/lib/user-status-message";
+
+let tippyInstances = [];
+
+export function initUserStatusHtml(users) {
+  (users || []).forEach((user, index) => {
+    if (user.status) {
+      user.index = index;
+      user.statusHtml = createUserStatusMessage(user.status, {
+        showTooltip: true,
+        showDescription: true,
+      });
+      tippyInstances.push(user.statusHtml._tippy);
+    }
+  });
+}
+
+export function renderUserStatusHtml(options) {
+  const users = document.querySelectorAll(".autocomplete.ac-user li");
+  users.forEach((user) => {
+    const index = user.dataset.index;
+    const statusHtml = options.find(function (el) {
+      return el.index === parseInt(index, 10);
+    })?.statusHtml;
+    if (statusHtml) {
+      user.querySelector(".user-status").replaceWith(statusHtml);
+    }
+  });
+}
+
+export function destroyTippyInstances() {
+  tippyInstances.forEach((instance) => {
+    instance.destroy();
+  });
+  tippyInstances = [];
+}
diff --git a/app/assets/javascripts/discourse/app/lib/user-tips.js b/app/assets/javascripts/discourse/app/lib/user-tips.js
index df27654a90e..6a58bb06229 100644
--- a/app/assets/javascripts/discourse/app/lib/user-tips.js
+++ b/app/assets/javascripts/discourse/app/lib/user-tips.js
@@ -1,108 +1,176 @@
+import { isTesting } from "discourse-common/config/environment";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import I18n from "I18n";
 import { escape } from "pretty-text/sanitizer";
 import tippy from "tippy.js";
+import isElementInViewport from "discourse/lib/is-element-in-viewport";
 
-const instances = {};
-const queue = [];
+const TIPPY_DELAY = 500;
+
+const instancesMap = {};
+window.instancesMap = instancesMap;
+
+function destroyInstance(instance) {
+  if (instance.showTimeout) {
+    clearTimeout(instance.showTimeout);
+    instance.showTimeout = null;
+  }
+
+  if (instance.destroyTimeout) {
+    clearTimeout(instance.destroyTimeout);
+    instance.destroyTimeout = null;
+  }
+
+  instance.destroy();
+}
+
+function cancelDestroyInstance(instance) {
+  if (instance.destroyTimeout) {
+    clearTimeout(instance.destroyTimeout);
+    instance.destroyTimeout = null;
+  }
+}
+
+function showInstance(instance) {
+  if (isTesting()) {
+    instance.show();
+  } else if (!instance.showTimeout) {
+    instance.showTimeout = setTimeout(() => {
+      instance.showTimeout = null;
+      if (!instance.state.isDestroyed) {
+        instance.show();
+      }
+    }, TIPPY_DELAY);
+  }
+}
+
+function hideInstance(instance) {
+  clearTimeout(instance.showTimeout);
+  instance.showTimeout = null;
+  instance.hide();
+}
 
 export function showUserTip(options) {
-  hideUserTip(options.id);
+  // Find if a similar instance has been scheduled for destroying recently
+  // and cancel that
+  let instance = instancesMap[options.id];
+  if (instance) {
+    if (instance.reference === options.reference) {
+      return cancelDestroyInstance(instance);
+    } else {
+      destroyInstance(instance);
+      delete instancesMap[options.id];
+    }
+  }
 
   if (!options.reference) {
     return;
   }
 
-  if (Object.keys(instances).length > 0) {
-    return addToQueue(options);
+  let buttonText = escape(I18n.t(options.buttonLabel || "user_tips.button"));
+  if (options.buttonIcon) {
+    buttonText = `${iconHTML(options.buttonIcon)} ${buttonText}`;
   }
 
-  instances[options.id] = tippy(options.reference, {
-    // Tippy must be displayed as soon as possible and not be hidden unless
-    // the user clicks on one of the two buttons.
-    showOnCreate: true,
+  instancesMap[options.id] = tippy(options.reference, {
     hideOnClick: false,
     trigger: "manual",
-    theme: "user-tips",
-
-    // It must be interactive to make buttons work.
-    interactive: true,
+    theme: "user-tip",
+    zIndex: "", // reset z-index to use inherited value from the parent
+    duration: TIPPY_DELAY,
 
     arrow: iconHTML("tippy-rounded-arrow"),
     placement: options.placement,
     appendTo: options.appendTo,
 
-    // It often happens for the reference element to be rerendered. In this
-    // case, tippy must be rerendered too. Having an animation means that the
-    // animation will replay over and over again.
-    animation: false,
-
-    // The `content` property below is HTML.
+    interactive: true, // for buttons in content
     allowHTML: true,
 
-    content: `
-      <div class='user-tip-container'>
-        <div class='user-tip-title'>${escape(options.titleText)}</div>
-        <div class='user-tip-content'>${escape(options.contentText)}</div>
-        <div class='user-tip-buttons'>
-          <button class="btn btn-primary btn-dismiss">${escape(
-            options.primaryBtnText || I18n.t("user_tips.primary")
-          )}</button>
-          <button class="btn btn-flat btn-text btn-dismiss-all">${escape(
-            options.secondaryBtnText || I18n.t("user_tips.secondary")
-          )}</button>
+    content:
+      options.content ||
+      `<div class='user-tip__container'>
+        <div class='user-tip__title'>${escape(options.titleText)}</div>
+        <div class='user-tip__content'>${
+          options.contentHtml || escape(options.contentText)
+        }</div>
+        <div class='user-tip__buttons'>
+          <button class="btn btn-primary">${buttonText}</button>
         </div>
       </div>`,
 
-    onCreate(instance) {
-      instance.popper
-        .querySelector(".btn-dismiss")
-        .addEventListener("click", (event) => {
-          options.onDismiss();
-          event.preventDefault();
-        });
+    onCreate(tippyInstance) {
+      // Used to set correct z-index property on root tippy element
+      tippyInstance.popper.classList.add("user-tip");
 
-      instance.popper
-        .querySelector(".btn-dismiss-all")
+      tippyInstance.popper
+        .querySelector(".btn")
         .addEventListener("click", (event) => {
-          options.onDismissAll();
+          options.onDismiss?.();
           event.preventDefault();
         });
     },
   });
+
+  showNextUserTip();
 }
 
-export function hideUserTip(userTipId) {
-  const instance = instances[userTipId];
-  if (instance && !instance.state.isDestroyed) {
-    instance.destroy();
-  }
-  delete instances[userTipId];
+export function hideUserTip(userTipId, force = false) {
+  // Tippy instances are not destroyed immediately because sometimes there
+  // user tip is recreated immediately. This happens when Ember components
+  // are re-rendered because a parent component has changed
 
-  const index = queue.findIndex((userTip) => userTip.id === userTipId);
-  if (index > -1) {
-    queue.splice(index, 1);
+  const instance = instancesMap[userTipId];
+  if (!instance) {
+    return;
+  }
+
+  if (force) {
+    destroyInstance(instance);
+    delete instancesMap[userTipId];
+    showNextUserTip();
+  } else if (!instance.destroyTimeout) {
+    instance.destroyTimeout = setTimeout(() => {
+      destroyInstance(instancesMap[userTipId]);
+      delete instancesMap[userTipId];
+      showNextUserTip();
+    }, TIPPY_DELAY);
   }
 }
 
 export function hideAllUserTips() {
-  Object.keys(instances).forEach(hideUserTip);
-}
-
-function addToQueue(options) {
-  for (let i = 0; i < queue.size; ++i) {
-    if (queue[i].id === options.id) {
-      queue[i] = options;
-      return;
-    }
-  }
-
-  queue.push(options);
+  Object.keys(instancesMap).forEach((userTipId) => {
+    destroyInstance(instancesMap[userTipId]);
+    delete instancesMap[userTipId];
+  });
 }
 
 export function showNextUserTip() {
-  const options = queue.shift();
-  if (options) {
-    showUserTip(options);
+  const instances = Object.values(instancesMap);
+
+  // Return early if a user tip is already visible and it is in viewport
+  if (
+    instances.find(
+      (instance) =>
+        instance.state.isVisible && isElementInViewport(instance.reference)
+    )
+  ) {
+    return;
   }
+
+  // Otherwise, try to find a user tip in the viewport
+  const idx = instances.findIndex((instance) =>
+    isElementInViewport(instance.reference)
+  );
+
+  // If no instance was found, select first user tip
+  const newInstance = instances[idx === -1 ? 0 : idx];
+
+  // Show only selected instance and hide all the other ones
+  instances.forEach((instance) => {
+    if (instance === newInstance) {
+      showInstance(instance);
+    } else {
+      hideInstance(instance);
+    }
+  });
 }
diff --git a/app/assets/javascripts/discourse/app/lib/utilities.js b/app/assets/javascripts/discourse/app/lib/utilities.js
index 75ba7f02364..57bdec349b3 100644
--- a/app/assets/javascripts/discourse/app/lib/utilities.js
+++ b/app/assets/javascripts/discourse/app/lib/utilities.js
@@ -1,14 +1,31 @@
-import getURL, { getURLWithCDN } from "discourse-common/lib/get-url";
+import getURL from "discourse-common/lib/get-url";
 import Handlebars from "handlebars";
 import I18n from "I18n";
-import { deepMerge } from "discourse-common/lib/object";
 import { escape } from "pretty-text/sanitizer";
-import { helperContext } from "discourse-common/lib/helpers";
 import toMarkdown from "discourse/lib/to-markdown";
 import deprecated from "discourse-common/lib/deprecated";
+import * as AvatarUtils from "discourse-common/lib/avatar-utils";
+import { capabilities } from "discourse/services/capabilities";
 
 let _defaultHomepage;
 
+function deprecatedAvatarUtil(name) {
+  return function () {
+    deprecated(
+      `${name} should be imported from discourse-common/lib/avatar-utils instead of discourse/lib/utilities`,
+      { id: "discourse.avatar-utils" }
+    );
+    return AvatarUtils[name](...arguments);
+  };
+}
+
+export const translateSize = deprecatedAvatarUtil("translateSize");
+export const getRawSize = deprecatedAvatarUtil("getRawSize");
+export const getRawAvatarSize = deprecatedAvatarUtil("getRawAvatarSize");
+export const avatarUrl = deprecatedAvatarUtil("avatarUrl");
+export const avatarImg = deprecatedAvatarUtil("avatarImg");
+export const tinyAvatar = deprecatedAvatarUtil("tinyAvatar");
+
 export function splitString(str, separator = ",") {
   if (typeof str === "string") {
     return str.split(separator).filter(Boolean);
@@ -17,24 +34,6 @@ export function splitString(str, separator = ",") {
   }
 }
 
-export function translateSize(size) {
-  switch (size) {
-    case "tiny":
-      return 20;
-    case "small":
-      return 25;
-    case "medium":
-      return 32;
-    case "large":
-      return 45;
-    case "extra_large":
-      return 60;
-    case "huge":
-      return 120;
-  }
-  return size;
-}
-
 export function escapeExpression(string) {
   if (!string) {
     return "";
@@ -58,51 +57,6 @@ export function replaceFormatter(fn) {
   _usernameFormatDelegate = fn;
 }
 
-export function avatarUrl(template, size, { customGetURL } = {}) {
-  if (!template) {
-    return "";
-  }
-  const rawSize = getRawSize(translateSize(size));
-  const templatedPath = template.replace(/\{size\}/g, rawSize);
-  return (customGetURL || getURLWithCDN)(templatedPath);
-}
-
-export function getRawSize(size) {
-  const pixelRatio = window.devicePixelRatio || 1;
-  let rawSize = 1;
-  if (pixelRatio > 1.1 && pixelRatio < 2.1) {
-    rawSize = 2;
-  } else if (pixelRatio >= 2.1) {
-    rawSize = 3;
-  }
-  return size * rawSize;
-}
-
-export function avatarImg(options, customGetURL) {
-  const size = translateSize(options.size);
-  let url = avatarUrl(options.avatarTemplate, size, { customGetURL });
-
-  // We won't render an invalid url
-  if (!url) {
-    return "";
-  }
-
-  const classes =
-    "avatar" + (options.extraClasses ? " " + options.extraClasses : "");
-
-  let title = "";
-  if (options.title) {
-    const escaped = escapeExpression(options.title || "");
-    title = ` title='${escaped}' aria-label='${escaped}'`;
-  }
-
-  return `<img loading='lazy' alt='' width='${size}' height='${size}' src='${url}' class='${classes}'${title}>`;
-}
-
-export function tinyAvatar(avatarTemplate, options) {
-  return avatarImg(deepMerge({ avatarTemplate, size: "tiny" }, options));
-}
-
 export function postUrl(slug, topicId, postNumber) {
   let url = getURL("/t/");
   if (slug) {
@@ -208,7 +162,7 @@ export function selectedText() {
   return toMarkdown($div.html());
 }
 
-export function selectedElement() {
+export function selectedNode() {
   return selectedRange()?.commonAncestorContainer;
 }
 
@@ -314,7 +268,7 @@ export function determinePostReplaceSelection({
 export function isAppleDevice() {
   // IE has no DOMNodeInserted so can not get this hack despite saying it is like iPhone
   // This will apply hack on all iDevices
-  let caps = helperContext().capabilities;
+  let caps = capabilities;
   return caps.isIOS && !window.navigator.userAgent.match(/Trident/g);
 }
 
@@ -497,20 +451,22 @@ export function modKeysPressed(event) {
 }
 
 export function translateModKey(string) {
-  const { isApple } = helperContext().capabilities;
+  const { isApple } = capabilities;
   // Apple device users are used to glyphs for shortcut keys
   if (isApple) {
     string = string
-      .replace("Shift", "\u21E7")
-      .replace("Meta", "\u2318")
-      .replace("Alt", "\u2325")
+      .toLowerCase()
+      .replace("shift", "\u21E7")
+      .replace("meta", "\u2318")
+      .replace("alt", "\u2325")
       .replace(/\+/g, "");
   } else {
     string = string
-      .replace("Shift", I18n.t("shortcut_modifier_key.shift"))
-      .replace("Ctrl", I18n.t("shortcut_modifier_key.ctrl"))
-      .replace("Meta", I18n.t("shortcut_modifier_key.ctrl"))
-      .replace("Alt", I18n.t("shortcut_modifier_key.alt"));
+      .toLowerCase()
+      .replace("shift", I18n.t("shortcut_modifier_key.shift"))
+      .replace("ctrl", I18n.t("shortcut_modifier_key.ctrl"))
+      .replace("meta", I18n.t("shortcut_modifier_key.ctrl"))
+      .replace("alt", I18n.t("shortcut_modifier_key.alt"));
   }
 
   return string;
@@ -638,6 +594,3 @@ export function mergeSortedLists(list1, list2, comparator) {
   }
   return merged;
 }
-
-// This prevents a mini racer crash
-export default {};
diff --git a/app/assets/javascripts/discourse/app/lib/virtual-element-from-text-range.js b/app/assets/javascripts/discourse/app/lib/virtual-element-from-text-range.js
new file mode 100644
index 00000000000..c2ada2c96b0
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/lib/virtual-element-from-text-range.js
@@ -0,0 +1,33 @@
+class VirtualElementFromTextRange {
+  constructor() {
+    this.updateRect();
+  }
+
+  updateRect() {
+    const selection = document.getSelection();
+    this.range = selection && selection.rangeCount && selection.getRangeAt(0);
+
+    if (!this.range) {
+      return;
+    }
+
+    this.rect = this.range.getBoundingClientRect();
+    return this.rect;
+  }
+
+  getBoundingClientRect() {
+    return this.rect;
+  }
+
+  get clientWidth() {
+    return this.rect.width;
+  }
+
+  get clientHeight() {
+    return this.rect.height;
+  }
+}
+
+export default function virtualElementFromTextRange() {
+  return new VirtualElementFromTextRange();
+}
diff --git a/app/assets/javascripts/discourse/app/mixins/card-contents-base.js b/app/assets/javascripts/discourse/app/mixins/card-contents-base.js
index 74f173791d6..08c9ba26eee 100644
--- a/app/assets/javascripts/discourse/app/mixins/card-contents-base.js
+++ b/app/assets/javascripts/discourse/app/mixins/card-contents-base.js
@@ -2,12 +2,13 @@ import { alias, match } from "@ember/object/computed";
 import { schedule, throttle } from "@ember/runloop";
 import DiscourseURL from "discourse/lib/url";
 import Mixin from "@ember/object/mixin";
-import afterTransition from "discourse/lib/after-transition";
 import { escapeExpression } from "discourse/lib/utilities";
 import { inject as service } from "@ember/service";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
 import { bind } from "discourse-common/utils/decorators";
 import discourseLater from "discourse-common/lib/later";
+import { createPopper } from "@popperjs/core";
+import { headerOffset } from "discourse/lib/offset-calculator";
 
 const DEFAULT_SELECTOR = "#main-outlet";
 
@@ -36,9 +37,10 @@ export default Mixin.create({
   loading: null,
   cardTarget: null,
   post: null,
-  isFixed: false,
   isDocked: false,
 
+  _popperReference: null,
+
   _show(username, target, event) {
     // No user card for anon
     if (this.siteSettings.hide_user_profiles_from_public && !this.currentUser) {
@@ -56,12 +58,6 @@ export default Mixin.create({
 
     this.appEvents.trigger("card:show", username, target, event);
 
-    const currentUsername = this.username;
-    if (username === currentUsername || this.loading === username) {
-      this._positionCard($(target));
-      return;
-    }
-
     const closestArticle = target.closest("article");
     const postId = closestArticle?.dataset?.postId || null;
     const wasVisible = this.visible;
@@ -85,9 +81,11 @@ export default Mixin.create({
       post,
     });
 
+    document.querySelector(".card-cloak")?.classList.remove("hidden");
     this.appEvents.trigger("user-card:show", { username });
     this._showCallback(username, $(target)).then((user) => {
       this.appEvents.trigger("user-card:after-show", { user });
+      this._positionCard($(target), event);
     });
 
     // We bind scrolling on mobile after cards are shown to hide them if user scrolls
@@ -100,7 +98,7 @@ export default Mixin.create({
 
   didInsertElement() {
     this._super(...arguments);
-    afterTransition($(this.element), this._hide);
+
     const id = this.elementId;
     const triggeringLinkClass = this.triggeringLinkClass;
     const previewClickEvent = `click.discourse-preview-${id}-${triggeringLinkClass}`;
@@ -168,7 +166,7 @@ export default Mixin.create({
   },
 
   _topicHeaderTrigger(username, target) {
-    this.setProperties({ isFixed: true, isDocked: true });
+    this.setProperties({ isDocked: true });
     return this._show(username, target);
   },
 
@@ -188,104 +186,74 @@ export default Mixin.create({
   },
 
   _previewClick($target) {
-    this.set("isFixed", true);
     return this._show($target.text().replace(/^@/, ""), $target);
   },
 
-  _positionCard(target) {
-    const rtl = $("html").css("direction") === "rtl";
-    if (!target) {
-      return;
-    }
-    const width = $(this.element).width();
-    const height = 175;
-    const isFixed = this.isFixed;
-    const isDocked = this.isDocked;
-
-    let verticalAdjustments = 0;
+  _positionCard(target, event) {
+    this._popperReference?.destroy();
 
     schedule("afterRender", () => {
-      if (target) {
-        if (!this.site.mobileView) {
-          let position = target.offset();
-          if (target.parents(".d-header").length > 0) {
-            position.top = target.position().top;
-          }
+      if (!target) {
+        return;
+      }
 
-          if (position) {
-            position.bottom = "unset";
+      if (this.site.desktopView) {
+        const avatarOverflowSize = 44;
+        this._popperReference = createPopper(target[0], this.element, {
+          placement: "right",
+          modifiers: [
+            {
+              name: "preventOverflow",
+              options: {
+                padding: {
+                  top: headerOffset() + avatarOverflowSize,
+                  right: 10,
+                  bottom: 10,
+                  left: 10,
+                },
+              },
+            },
+            { name: "eventListeners", enabled: false },
+            { name: "offset", options: { offset: [10, 10] } },
+          ],
+        });
+      } else {
+        this._popperReference = createPopper(target[0], this.element, {
+          modifiers: [
+            { name: "eventListeners", enabled: false },
+            {
+              name: "computeStyles",
+              enabled: true,
+              fn({ state }) {
+                // mimics our modal top of the screen positioning
+                state.styles.popper = {
+                  ...state.styles.popper,
+                  position: "fixed",
+                  left: `${
+                    (window.innerWidth - state.rects.popper.width) / 2
+                  }px`,
+                  top: "10%",
+                  transform: "translateY(-10%)",
+                };
 
-            if (rtl) {
-              // The site direction is rtl
-              position.right = $(window).width() - position.left + 10;
-              position.left = "auto";
-              let overage = $(window).width() - 50 - (position.right + width);
-              if (overage < 0) {
-                position.right += overage;
-                position.top += target.height() + 48;
-                verticalAdjustments += target.height() + 48;
-              }
-            } else {
-              // The site direction is ltr
-              position.left += target.width() + 10;
+                return state;
+              },
+            },
+          ],
+        });
+      }
 
-              let overage = $(window).width() - 50 - (position.left + width);
-              if (overage < 0) {
-                position.left += overage;
-                position.top += target.height() + 48;
-                verticalAdjustments += target.height() + 48;
-              }
-            }
+      this.element.classList.toggle("docked-card", this.isDocked);
 
-            // It looks better to have the card aligned slightly higher
-            position.top -= 24;
-
-            if (isFixed) {
-              position.top -= $("html").scrollTop();
-              //if content is fixed and will be cut off on the bottom, display it above...
-              if (
-                position.top + height + verticalAdjustments >
-                $(window).height() - 50
-              ) {
-                position.bottom =
-                  $(window).height() -
-                  (target.offset().top - $("html").scrollTop());
-                if (verticalAdjustments > 0) {
-                  position.bottom += 48;
-                }
-                position.top = "unset";
-              }
-            }
-
-            const avatarOverflowSize = 44;
-            if (isDocked && position.top < avatarOverflowSize) {
-              position.top = avatarOverflowSize;
-            }
-
-            $(this.element).css(position);
-          }
-        }
-
-        if (this.site.mobileView) {
-          $(".card-cloak").removeClass("hidden");
-          let position = target.offset();
-          position.top = "10%"; // match modal behaviour
-          position.left = 0;
-          $(this.element).css(position);
-        }
-        $(this.element).toggleClass("docked-card", isDocked);
-
-        // After the card is shown, focus on the first link
-        //
-        // note: we DO NOT use afterRender here cause _positionCard may
-        // run afterwards, if we allowed this to happen the usercard
-        // may be offscreen and we may scroll all the way to it on focus
-        if (event.pointerId === -1) {
-          discourseLater(() => {
-            const firstLink = this.element.querySelector("a");
-            firstLink && firstLink.focus();
-          }, 350);
-        }
+      // After the card is shown, focus on the first link
+      //
+      // note: we DO NOT use afterRender here cause _positionCard may
+      // run afterwards, if we allowed this to happen the usercard
+      // may be offscreen and we may scroll all the way to it on focus
+      if (event?.pointerId === -1) {
+        discourseLater(() => {
+          this.element.querySelector("a")?.focus();
+        }, 350);
       }
     });
   },
@@ -307,7 +275,6 @@ export default Mixin.create({
       loading: null,
       cardTarget: null,
       post: null,
-      isFixed: false,
       isDocked: false,
     });
 
diff --git a/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js b/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js
index ce355aeede3..b0a7ac5fef5 100644
--- a/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js
+++ b/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js
@@ -325,27 +325,28 @@ export default Mixin.create(ExtendableUploader, UppyS3Multipart, {
 
         cacheShortUploadUrl(upload.short_url, upload);
 
-        if (this.useUploadPlaceholders) {
+        this._generateVideoThumbnail(file, upload.url, () => {
+          if (this.useUploadPlaceholders) {
+            this.appEvents.trigger(
+              `${this.composerEventPrefix}:replace-text`,
+              this.placeholders[file.id].uploadPlaceholder.trim(),
+              markdown
+            );
+          }
+          this._resetUpload(file, { removePlaceholder: false });
           this.appEvents.trigger(
-            `${this.composerEventPrefix}:replace-text`,
-            this.placeholders[file.id].uploadPlaceholder.trim(),
-            markdown
+            `${this.composerEventPrefix}:upload-success`,
+            file.name,
+            upload
           );
-        }
 
-        this._resetUpload(file, { removePlaceholder: false });
-        this.appEvents.trigger(
-          `${this.composerEventPrefix}:upload-success`,
-          file.name,
-          upload
-        );
-
-        if (this.inProgressUploads.length === 0) {
-          this.appEvents.trigger(
-            `${this.composerEventPrefix}:all-uploads-complete`
-          );
-          this._reset();
-        }
+          if (this.inProgressUploads.length === 0) {
+            this.appEvents.trigger(
+              `${this.composerEventPrefix}:all-uploads-complete`
+            );
+            this._reset();
+          }
+        });
       });
     });
 
diff --git a/app/assets/javascripts/discourse/app/mixins/composer-video-thumbnail-uppy.js b/app/assets/javascripts/discourse/app/mixins/composer-video-thumbnail-uppy.js
new file mode 100644
index 00000000000..7781149d38d
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/mixins/composer-video-thumbnail-uppy.js
@@ -0,0 +1,125 @@
+import Mixin from "@ember/object/mixin";
+import ExtendableUploader from "discourse/mixins/extendable-uploader";
+import UppyS3Multipart from "discourse/mixins/uppy-s3-multipart";
+import Uppy from "@uppy/core";
+import DropTarget from "@uppy/drop-target";
+import XHRUpload from "@uppy/xhr-upload";
+import { warn } from "@ember/debug";
+import I18n from "I18n";
+import getURL from "discourse-common/lib/get-url";
+import { bind } from "discourse-common/utils/decorators";
+import { inject as service } from "@ember/service";
+
+export default Mixin.create(ExtendableUploader, UppyS3Multipart, {
+  dialog: service(),
+  uploadRootPath: "/uploads",
+  uploadTargetBound: false,
+  useUploadPlaceholders: true,
+
+  @bind
+  _generateVideoThumbnail(videoFile, uploadUrl, callback) {
+    if (!this.siteSettings.video_thumbnails_enabled) {
+      return callback();
+    }
+    if (videoFile.type.split("/")[0] !== "video") {
+      return callback();
+    }
+    let video = document.createElement("video");
+    video.src = URL.createObjectURL(videoFile.data);
+
+    // These attributes are needed for thumbnail generation on mobile.
+    // This video tag is not visible, so this is all happening in the background.
+    video.autoplay = true;
+    video.muted = true;
+    video.playsinline = true;
+
+    let videoSha1 = uploadUrl
+      .substring(uploadUrl.lastIndexOf("/") + 1)
+      .split(".")[0];
+
+    // Wait for the video element to load, otherwise the canvas will be empty.
+    // iOS Safari prefers onloadedmetadata over oncanplay.
+    video.onloadedmetadata = () => {
+      let canvas = document.createElement("canvas");
+      let ctx = canvas.getContext("2d");
+      canvas.width = video.videoWidth;
+      canvas.height = video.videoHeight;
+
+      // A timeout is needed on mobile.
+      setTimeout(() => {
+        ctx.drawImage(video, 0, 0, video.videoWidth, video.videoHeight);
+
+        // upload video thumbnail
+        canvas.toBlob((blob) => {
+          this._uppyInstance = new Uppy({
+            id: "video-thumbnail",
+            meta: {
+              upload_type: `thumbnail`,
+              videoSha1,
+            },
+            autoProceed: true,
+          });
+
+          if (this.siteSettings.enable_upload_debug_mode) {
+            this._instrumentUploadTimings();
+          }
+
+          if (this.siteSettings.enable_direct_s3_uploads) {
+            this._useS3MultipartUploads();
+          } else {
+            this._useXHRUploads();
+          }
+          this._uppyInstance.use(DropTarget, { target: this.element });
+
+          this._uppyInstance.on("upload", () => {
+            this.set("uploading", true);
+          });
+
+          this._uppyInstance.on("upload-success", () => {
+            this.set("uploading", false);
+            callback();
+          });
+
+          this._uppyInstance.on("upload-error", (file, error, response) => {
+            let message = I18n.t("wizard.upload_error");
+            if (response.body.errors) {
+              message = response.body.errors.join("\n");
+            }
+
+            // eslint-disable-next-line no-console
+            console.error(message);
+            this.set("uploading", false);
+            callback();
+          });
+
+          try {
+            this._uppyInstance.addFile({
+              source: `${this.id} thumbnail`,
+              name: `${videoSha1}`,
+              type: blob.type,
+              data: blob,
+            });
+          } catch (err) {
+            warn(`error adding files to uppy: ${err}`, {
+              id: "discourse.upload.uppy-add-files-error",
+            });
+          }
+        });
+      }, 100);
+    };
+  },
+
+  // This should be overridden in a child component if you need to
+  // hook into uppy events and be sure that everything is already
+  // set up for _uppyInstance.
+  _uppyReady() {},
+
+  _useXHRUploads() {
+    this._uppyInstance.use(XHRUpload, {
+      endpoint: getURL(`/uploads.json?client_id=${this.messageBus.clientId}`),
+      headers: {
+        "X-CSRF-Token": this.session.csrfToken,
+      },
+    });
+  },
+});
diff --git a/app/assets/javascripts/discourse/app/mixins/disable-sidebar.js b/app/assets/javascripts/discourse/app/mixins/disable-sidebar.js
new file mode 100644
index 00000000000..e96c2618977
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/mixins/disable-sidebar.js
@@ -0,0 +1,15 @@
+import Mixin from "@ember/object/mixin";
+
+export default Mixin.create({
+  activate() {
+    this.controllerFor("application").setProperties({
+      sidebarDisabledRouteOverride: true,
+    });
+  },
+
+  deactivate() {
+    this.controllerFor("application").setProperties({
+      sidebarDisabledRouteOverride: false,
+    });
+  },
+});
diff --git a/app/assets/javascripts/discourse/app/mixins/dismiss-topics.js b/app/assets/javascripts/discourse/app/mixins/dismiss-topics.js
new file mode 100644
index 00000000000..2d99c5c9d61
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/mixins/dismiss-topics.js
@@ -0,0 +1,24 @@
+import Mixin from "@ember/object/mixin";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+import DismissNewModal from "discourse/components/modal/dismiss-new";
+
+export default Mixin.create({
+  modal: service(),
+  currentUser: service(),
+
+  @action
+  resetNew() {
+    if (!this.currentUser.new_new_view_enabled) {
+      return this.callResetNew();
+    }
+
+    this.modal.show(DismissNewModal, {
+      model: {
+        dismissCallback: ({ dismissPosts, dismissTopics, untrack }) => {
+          this.callResetNew(dismissPosts, dismissTopics, untrack);
+        },
+      },
+    });
+  },
+});
diff --git a/app/assets/javascripts/discourse/app/mixins/extendable-uploader.js b/app/assets/javascripts/discourse/app/mixins/extendable-uploader.js
index 8a20a5858ba..d5dab6cce9c 100644
--- a/app/assets/javascripts/discourse/app/mixins/extendable-uploader.js
+++ b/app/assets/javascripts/discourse/app/mixins/extendable-uploader.js
@@ -74,7 +74,7 @@ export default Mixin.create(UploadDebugging, {
     }
   },
 
-  // TODO (martin) This and _onPreProcessComplete will need to be tweaked
+  // NOTE: This and _onPreProcessComplete will need to be tweaked
   // if we ever add support for "determinate" preprocessors for uppy, which
   // means the progress will have a value rather than a started/complete
   // state ("indeterminate").
diff --git a/app/assets/javascripts/discourse/app/mixins/modal-functionality.js b/app/assets/javascripts/discourse/app/mixins/modal-functionality.js
index 6287199a755..ee302c08fc1 100644
--- a/app/assets/javascripts/discourse/app/mixins/modal-functionality.js
+++ b/app/assets/javascripts/discourse/app/mixins/modal-functionality.js
@@ -16,8 +16,7 @@ export default Mixin.create({
 
   actions: {
     closeModal() {
-      this.modal.send("closeModal");
-      this.set("panels", []);
+      this.modal.close();
     },
   },
 });
diff --git a/app/assets/javascripts/discourse/app/mixins/open-composer.js b/app/assets/javascripts/discourse/app/mixins/open-composer.js
index c5e58c52ad4..68dd5f71c5e 100644
--- a/app/assets/javascripts/discourse/app/mixins/open-composer.js
+++ b/app/assets/javascripts/discourse/app/mixins/open-composer.js
@@ -1,25 +1,41 @@
 // This mixin allows a route to open the composer
 import Composer from "discourse/models/composer";
 import Mixin from "@ember/object/mixin";
+import { getOwner } from "discourse-common/lib/get-owner";
 
 export default Mixin.create({
   openComposer(controller) {
     let categoryId = controller.get("category.id");
+
+    if (
+      this.siteSettings.default_subcategory_on_read_only_category &&
+      !controller.canCreateTopicOnCategory
+    ) {
+      if (controller.canCreateTopicOnSubCategory) {
+        categoryId = controller.get("defaultSubcategory.id");
+      } else {
+        categoryId = this.siteSettings.default_composer_category;
+      }
+    }
+
     if (
       categoryId &&
+      !this.siteSettings.default_subcategory_on_read_only_category &&
       controller.category.isUncategorizedCategory &&
       !this.siteSettings.allow_uncategorized_topics
     ) {
       categoryId = null;
     }
 
-    this.controllerFor("composer").open({
-      prioritizedCategoryId: categoryId,
-      topicCategoryId: categoryId,
-      action: Composer.CREATE_TOPIC,
-      draftKey: controller.get("model.draft_key") || Composer.NEW_TOPIC_KEY,
-      draftSequence: controller.get("model.draft_sequence") || 0,
-    });
+    getOwner(this)
+      .lookup("service:composer")
+      .open({
+        prioritizedCategoryId: categoryId,
+        topicCategoryId: categoryId,
+        action: Composer.CREATE_TOPIC,
+        draftKey: controller.get("model.draft_key") || Composer.NEW_TOPIC_KEY,
+        draftSequence: controller.get("model.draft_sequence") || 0,
+      });
   },
 
   openComposerWithTopicParams(
@@ -29,24 +45,26 @@ export default Mixin.create({
     topicCategoryId,
     topicTags
   ) {
-    this.controllerFor("composer").open({
-      action: Composer.CREATE_TOPIC,
-      topicTitle,
-      topicBody,
-      topicCategoryId,
-      topicTags,
-      draftKey: controller.get("model.draft_key") || Composer.NEW_TOPIC_KEY,
-      draftSequence: controller.get("model.draft_sequence"),
-    });
+    getOwner(this)
+      .lookup("service:composer")
+      .open({
+        action: Composer.CREATE_TOPIC,
+        topicTitle,
+        topicBody,
+        topicCategoryId,
+        topicTags,
+        draftKey: controller.get("model.draft_key") || Composer.NEW_TOPIC_KEY,
+        draftSequence: controller.get("model.draft_sequence"),
+      });
   },
 
   openComposerWithMessageParams({
-    recipients = [],
+    recipients = "",
     topicTitle = "",
     topicBody = "",
     hasGroups = false,
   } = {}) {
-    this.controllerFor("composer").open({
+    getOwner(this).lookup("service:composer").open({
       action: Composer.PRIVATE_MESSAGE,
       recipients,
       topicTitle,
diff --git a/app/assets/javascripts/discourse/app/mixins/textarea-text-manipulation.js b/app/assets/javascripts/discourse/app/mixins/textarea-text-manipulation.js
index 46e4b7cc729..73bde2f7cbc 100644
--- a/app/assets/javascripts/discourse/app/mixins/textarea-text-manipulation.js
+++ b/app/assets/javascripts/discourse/app/mixins/textarea-text-manipulation.js
@@ -402,10 +402,12 @@ export default Mixin.create({
       plainText = plainText.replace(/\r/g, "");
       const table = this.extractTable(plainText);
       if (table) {
-        this.appEvents.trigger(
-          `${this.composerEventPrefix}:insert-text`,
-          table
-        );
+        this.composerEventPrefix
+          ? this.appEvents.trigger(
+              `${this.composerEventPrefix}:insert-text`,
+              table
+            )
+          : this.insertText(table);
         handled = true;
       }
     }
@@ -457,10 +459,12 @@ export default Mixin.create({
         }
 
         if (isComposer) {
-          this.appEvents.trigger(
-            `${this.composerEventPrefix}:insert-text`,
-            markdown
-          );
+          this.composerEventPrefix
+            ? this.appEvents.trigger(
+                `${this.composerEventPrefix}:insert-text`,
+                markdown
+              )
+            : this.insertText(markdown);
           handled = true;
         }
       }
diff --git a/app/assets/javascripts/discourse/app/mixins/upload-debugging.js b/app/assets/javascripts/discourse/app/mixins/upload-debugging.js
index 0c7a935f3e9..f1c0cc6f7cf 100644
--- a/app/assets/javascripts/discourse/app/mixins/upload-debugging.js
+++ b/app/assets/javascripts/discourse/app/mixins/upload-debugging.js
@@ -10,6 +10,12 @@ export default Mixin.create({
   },
 
   _consolePerformanceTiming(timing) {
+    // Sometimes performance.measure can fail to return a PerformanceMeasure
+    // object, in this case we can't log anything so return to prevent errors.
+    if (!timing) {
+      return;
+    }
+
     const minutes = Math.floor(timing.duration / 60000);
     const seconds = ((timing.duration % 60000) / 1000).toFixed(0);
     const duration = minutes + ":" + (seconds < 10 ? "0" : "") + seconds;
@@ -19,9 +25,9 @@ export default Mixin.create({
   },
 
   _performanceApiSupport() {
-    performance.mark("testing support 1");
-    performance.mark("testing support 2");
-    const perfMeasure = performance.measure(
+    this._performanceMark("testing support 1");
+    this._performanceMark("testing support 2");
+    const perfMeasure = this._performanceMeasure(
       "performance api support",
       "testing support 1",
       "testing support 2"
@@ -29,11 +35,31 @@ export default Mixin.create({
     return perfMeasure;
   },
 
+  _performanceMark(markName) {
+    return performance.mark(markName);
+  },
+
+  _performanceMeasure(measureName, startMark, endMark) {
+    let measureResult;
+    try {
+      measureResult = performance.measure(measureName, startMark, endMark);
+    } catch (error) {
+      if (
+        error.message.includes("Failed to execute 'measure' on 'Performance'")
+      ) {
+        // eslint-disable-next-line no-console
+        console.warn(
+          `Uppy performance measure failed: ${measureName}, ${startMark}, ${endMark}`
+        );
+      }
+    }
+    return measureResult;
+  },
+
   _instrumentUploadTimings() {
     if (!this._performanceApiSupport()) {
-      // TODO (martin) (2021-01-23) Check if FireFox fixed this yet.
       warn(
-        "Some browsers do not return a PerformanceMeasure when calling performance.mark, disabling instrumentation. See https://developer.mozilla.org/en-US/docs/Web/API/Performance/measure#return_value and https://bugzilla.mozilla.org/show_bug.cgi?id=1724645",
+        "Some browsers do not return a PerformanceMeasure when calling this._performanceMark, disabling instrumentation. See https://developer.mozilla.org/en-US/docs/Web/API/this._performanceMeasure#return_value and https://bugzilla.mozilla.org/show_bug.cgi?id=1724645",
         { id: "discourse.upload-debugging" }
       );
       return;
@@ -41,23 +67,23 @@ export default Mixin.create({
 
     this._uppyInstance.on("upload", (data) => {
       data.fileIDs.forEach((fileId) =>
-        performance.mark(`upload-${fileId}-start`)
+        this._performanceMark(`upload-${fileId}-start`)
       );
     });
 
     this._uppyInstance.on("create-multipart", (fileId) => {
-      performance.mark(`upload-${fileId}-create-multipart`);
+      this._performanceMark(`upload-${fileId}-create-multipart`);
     });
 
     this._uppyInstance.on("create-multipart-success", (fileId) => {
-      performance.mark(`upload-${fileId}-create-multipart-success`);
+      this._performanceMark(`upload-${fileId}-create-multipart-success`);
     });
 
     this._uppyInstance.on("complete-multipart", (fileId) => {
-      performance.mark(`upload-${fileId}-complete-multipart`);
+      this._performanceMark(`upload-${fileId}-complete-multipart`);
 
       this._consolePerformanceTiming(
-        performance.measure(
+        this._performanceMeasure(
           `upload-${fileId}-multipart-all-parts-complete`,
           `upload-${fileId}-create-multipart-success`,
           `upload-${fileId}-complete-multipart`
@@ -66,10 +92,10 @@ export default Mixin.create({
     });
 
     this._uppyInstance.on("complete-multipart-success", (fileId) => {
-      performance.mark(`upload-${fileId}-complete-multipart-success`);
+      this._performanceMark(`upload-${fileId}-complete-multipart-success`);
 
       this._consolePerformanceTiming(
-        performance.measure(
+        this._performanceMeasure(
           `upload-${fileId}-multipart-total-network-exclusive-complete-multipart`,
           `upload-${fileId}-create-multipart`,
           `upload-${fileId}-complete-multipart`
@@ -77,7 +103,7 @@ export default Mixin.create({
       );
 
       this._consolePerformanceTiming(
-        performance.measure(
+        this._performanceMeasure(
           `upload-${fileId}-multipart-total-network-inclusive-complete-multipart`,
           `upload-${fileId}-create-multipart`,
           `upload-${fileId}-complete-multipart-success`
@@ -85,7 +111,7 @@ export default Mixin.create({
       );
 
       this._consolePerformanceTiming(
-        performance.measure(
+        this._performanceMeasure(
           `upload-${fileId}-multipart-complete-convert-to-upload`,
           `upload-${fileId}-complete-multipart`,
           `upload-${fileId}-complete-multipart-success`
@@ -94,9 +120,9 @@ export default Mixin.create({
     });
 
     this._uppyInstance.on("upload-success", (file) => {
-      performance.mark(`upload-${file.id}-end`);
+      this._performanceMark(`upload-${file.id}-end`);
       this._consolePerformanceTiming(
-        performance.measure(
+        this._performanceMeasure(
           `upload-${file.id}-multipart-total-inclusive-preprocessing`,
           `upload-${file.id}-start`,
           `upload-${file.id}-end`
diff --git a/app/assets/javascripts/discourse/app/mixins/uppy-s3-multipart.js b/app/assets/javascripts/discourse/app/mixins/uppy-s3-multipart.js
index 0de515d2a79..5c905dd3e9e 100644
--- a/app/assets/javascripts/discourse/app/mixins/uppy-s3-multipart.js
+++ b/app/assets/javascripts/discourse/app/mixins/uppy-s3-multipart.js
@@ -5,6 +5,7 @@ import { Promise } from "rsvp";
 import { ajax } from "discourse/lib/ajax";
 import AwsS3Multipart from "@uppy/aws-s3-multipart";
 const RETRY_DELAYS = [0, 1000, 3000, 5000];
+const MB = 1024 * 1024;
 
 export default Mixin.create({
   _useS3MultipartUploads() {
@@ -21,6 +22,20 @@ export default Mixin.create({
       limit: 10,
       retryDelays: RETRY_DELAYS,
 
+      // When we get to really big files, it's better to not have thousands
+      // of small chunks, since we don't have a resume functionality if the
+      // upload fails. Better to try upload less chunks even if those chunks
+      // are bigger.
+      getChunkSize(file) {
+        if (file.size >= 500 * MB) {
+          return 20 * MB;
+        } else if (file.size >= 100 * MB) {
+          return 10 * MB;
+        } else {
+          return 5 * MB;
+        }
+      },
+
       createMultipartUpload: this._createMultipartUpload,
       prepareUploadParts: this._prepareUploadParts,
       completeMultipartUpload: this._completeMultipartUpload,
diff --git a/app/assets/javascripts/discourse/app/mixins/uppy-upload.js b/app/assets/javascripts/discourse/app/mixins/uppy-upload.js
index 6b8b42aac60..c4fc2056c81 100644
--- a/app/assets/javascripts/discourse/app/mixins/uppy-upload.js
+++ b/app/assets/javascripts/discourse/app/mixins/uppy-upload.js
@@ -35,6 +35,7 @@ export default Mixin.create(UppyS3Multipart, ExtendableUploader, {
   id: null,
   uploadRootPath: "/uploads",
   fileInputSelector: ".hidden-upload-field",
+  autoFindInput: true,
 
   uploadDone() {
     warn("You should implement `uploadDone`", {
@@ -68,12 +69,15 @@ export default Mixin.create(UppyS3Multipart, ExtendableUploader, {
 
   @on("didInsertElement")
   _initialize() {
-    this.setProperties({
-      fileInputEl: this.element.querySelector(this.fileInputSelector),
-    });
+    if (this.autoFindInput) {
+      this.setProperties({
+        fileInputEl: this.element.querySelector(this.fileInputSelector),
+      });
+    } else if (!this.fileInputEl) {
+      return;
+    }
     this.set("allowMultipleFiles", this.fileInputEl.multiple);
     this.set("inProgressUploads", []);
-    this._triggerInProgressUploadsEvent();
 
     this._bindFileInputChange();
 
@@ -267,6 +271,10 @@ export default Mixin.create(UppyS3Multipart, ExtendableUploader, {
       });
     });
 
+    if (this.siteSettings.enable_upload_debug_mode) {
+      this._instrumentUploadTimings();
+    }
+
     // TODO (martin) preventDirectS3Uploads is necessary because some of
     // the current upload mixin components, for example the emoji uploader,
     // send the upload to custom endpoints that do fancy things in the rails
@@ -294,8 +302,10 @@ export default Mixin.create(UppyS3Multipart, ExtendableUploader, {
     this._uppyInstance.on("cancel-all", () => {
       this.appEvents.trigger(`upload-mixin:${this.id}:uploads-cancelled`);
       if (!this.isDestroyed && !this.isDestroying) {
-        this.set("inProgressUploads", []);
-        this._triggerInProgressUploadsEvent();
+        if (this.inProgressUploads.length) {
+          this.set("inProgressUploads", []);
+          this._triggerInProgressUploadsEvent();
+        }
       }
     });
 
@@ -314,6 +324,7 @@ export default Mixin.create(UppyS3Multipart, ExtendableUploader, {
   },
 
   _triggerInProgressUploadsEvent() {
+    this.onProgressUploadsChanged?.(this.inProgressUploads);
     this.appEvents.trigger(
       `upload-mixin:${this.id}:in-progress-uploads`,
       this.inProgressUploads
diff --git a/app/assets/javascripts/discourse/app/models/category.js b/app/assets/javascripts/discourse/app/models/category.js
index 47232142ec6..8bb0f762d92 100644
--- a/app/assets/javascripts/discourse/app/models/category.js
+++ b/app/assets/javascripts/discourse/app/models/category.js
@@ -38,9 +38,11 @@ const Category = RestModel.extend({
   @discourseComputed("required_tag_groups", "minimum_required_tags")
   minimumRequiredTags() {
     if (this.required_tag_groups?.length > 0) {
-      return this.required_tag_groups.reduce(
-        (sum, rtg) => sum + rtg.min_count,
-        0
+      // it should require the max between the bare minimum set in the category and the sum of the min_count of the
+      // required_tag_groups
+      return Math.max(
+        this.required_tag_groups.reduce((sum, rtg) => sum + rtg.min_count, 0),
+        this.minimum_required_tags || 0
       );
     } else {
       return this.minimum_required_tags > 0 ? this.minimum_required_tags : null;
@@ -68,7 +70,11 @@ const Category = RestModel.extend({
 
   @discourseComputed("parentCategory.level")
   level(parentLevel) {
-    return (parentLevel || -1) + 1;
+    if (!parentLevel) {
+      return parentLevel === 0 ? 1 : 0;
+    } else {
+      return parentLevel + 1;
+    }
   },
 
   @discourseComputed("subcategories")
@@ -192,6 +198,14 @@ const Category = RestModel.extend({
     return notificationLevel >= NotificationLevels.TRACKING;
   },
 
+  get unreadTopicsCount() {
+    return this.topicTrackingState.countUnread({ categoryId: this.id });
+  },
+
+  get newTopicsCount() {
+    return this.topicTrackingState.countNew({ categoryId: this.id });
+  },
+
   save() {
     const id = this.id;
     const url = id ? `/categories/${id}` : "/categories";
@@ -219,8 +233,10 @@ const Category = RestModel.extend({
         uploaded_logo_dark_id: this.get("uploaded_logo_dark.id"),
         uploaded_background_id: this.get("uploaded_background.id"),
         allow_badges: this.allow_badges,
+        category_setting_attributes: this.category_setting,
         custom_fields: this.custom_fields,
         topic_template: this.topic_template,
+        form_template_ids: this.form_template_ids,
         all_topics_wiki: this.all_topics_wiki,
         allow_unlimited_owner_edits_on_first_post:
           this.allow_unlimited_owner_edits_on_first_post,
@@ -302,16 +318,6 @@ const Category = RestModel.extend({
     }
   },
 
-  @discourseComputed("id", "topicTrackingState.messageCount")
-  unreadTopics(id) {
-    return this.topicTrackingState.countUnread({ categoryId: id });
-  },
-
-  @discourseComputed("id", "topicTrackingState.messageCount")
-  newTopics(id) {
-    return this.topicTrackingState.countNew({ categoryId: id });
-  },
-
   setNotification(notification_level) {
     User.currentProp(
       "muted_category_ids",
diff --git a/app/assets/javascripts/discourse/app/models/composer.js b/app/assets/javascripts/discourse/app/models/composer.js
index 267c2412d4f..57909403e6f 100644
--- a/app/assets/javascripts/discourse/app/models/composer.js
+++ b/app/assets/javascripts/discourse/app/models/composer.js
@@ -5,11 +5,8 @@ import discourseComputed, {
   observes,
   on,
 } from "discourse-common/utils/decorators";
-import {
-  emailValid,
-  escapeExpression,
-  tinyAvatar,
-} from "discourse/lib/utilities";
+import { emailValid, escapeExpression } from "discourse/lib/utilities";
+import { tinyAvatar } from "discourse-common/lib/avatar-utils";
 import Draft from "discourse/models/draft";
 import I18n from "I18n";
 import { Promise } from "rsvp";
@@ -142,7 +139,9 @@ const Composer = RestModel.extend({
     set(categoryId) {
       const oldCategoryId = this._categoryId;
 
-      if (isEmpty(categoryId)) {
+      if (this.privateMessage) {
+        categoryId = null;
+      } else if (isEmpty(categoryId)) {
         // Check if there is a default composer category to set
         const defaultComposerCategoryId = parseInt(
           this.siteSettings.default_composer_category,
@@ -923,7 +922,6 @@ const Composer = RestModel.extend({
         if (!this.canEditTopicFeaturedLink) {
           this.set("featuredLink", null);
         }
-
         return this.editingPost ? this.editPost(opts) : this.createPost(opts);
       }
     });
@@ -1063,6 +1061,7 @@ const Composer = RestModel.extend({
       wiki: false,
       typingTime: this.typingTime,
       composerTime: this.composerTime,
+      metaData: this.metaData,
     });
 
     this.serialize(_create_serializer, createdPost);
diff --git a/app/assets/javascripts/discourse/app/models/form-template.js b/app/assets/javascripts/discourse/app/models/form-template.js
new file mode 100644
index 00000000000..b46c8de45e9
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/models/form-template.js
@@ -0,0 +1,13 @@
+import { ajax } from "discourse/lib/ajax";
+import RestModel from "discourse/models/rest";
+
+export default class FormTemplate extends RestModel {
+  static async findAll() {
+    const result = await ajax("/form-templates.json");
+    return result.form_templates;
+  }
+
+  static async findById(id) {
+    return await ajax(`/form-templates/${id}.json`);
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/models/group.js b/app/assets/javascripts/discourse/app/models/group.js
index fc1b4725fb8..4fdbec58697 100644
--- a/app/assets/javascripts/discourse/app/models/group.js
+++ b/app/assets/javascripts/discourse/app/models/group.js
@@ -148,9 +148,9 @@ const Group = RestModel.extend({
   },
 
   async addOwners(usernames, filter, notifyUsers) {
-    const response = await ajax(`/admin/groups/${this.id}/owners.json`, {
+    const response = await ajax(`/groups/${this.id}/owners.json`, {
       type: "PUT",
-      data: { group: { usernames, notify_users: notifyUsers } },
+      data: { usernames, notify_users: notifyUsers },
     });
 
     if (filter) {
@@ -375,7 +375,7 @@ const Group = RestModel.extend({
   },
 
   requestMembership(reason) {
-    return ajax(`/groups/${this.name}/request_membership`, {
+    return ajax(`/groups/${this.name}/request_membership.json`, {
       type: "POST",
       data: { reason },
     });
diff --git a/app/assets/javascripts/discourse/app/models/nav-item.js b/app/assets/javascripts/discourse/app/models/nav-item.js
index bfc3260832b..d676f65ff88 100644
--- a/app/assets/javascripts/discourse/app/models/nav-item.js
+++ b/app/assets/javascripts/discourse/app/models/nav-item.js
@@ -249,6 +249,10 @@ NavItem.reopenClass({
     }
     let items = args.siteSettings.top_menu.split("|");
 
+    const user = getOwner(this).lookup("service:current-user");
+    if (user?.new_new_view_enabled) {
+      items = items.reject((item) => item === "unread");
+    }
     const filterType = (args.filterMode || "").split("/").pop();
 
     if (!items.some((i) => filterType === i)) {
diff --git a/app/assets/javascripts/discourse/app/models/post-stream.js b/app/assets/javascripts/discourse/app/models/post-stream.js
index 58df4e99db6..cfae484f7e0 100644
--- a/app/assets/javascripts/discourse/app/models/post-stream.js
+++ b/app/assets/javascripts/discourse/app/models/post-stream.js
@@ -251,7 +251,7 @@ export default RestModel.extend({
     });
   },
 
-  showSummary() {
+  showTopReplies() {
     this.cancelFilter();
     this.set("filter", "summary");
     return this.refreshAndJumpToSecondVisible();
diff --git a/app/assets/javascripts/discourse/app/models/post.js b/app/assets/javascripts/discourse/app/models/post.js
index 25a8f401686..1f9f1573ddc 100644
--- a/app/assets/javascripts/discourse/app/models/post.js
+++ b/app/assets/javascripts/discourse/app/models/post.js
@@ -461,6 +461,12 @@ Post.reopenClass({
     });
   },
 
+  permanentlyDeleteRevisions(postId) {
+    return ajax(`/posts/${postId}/revisions/permanently_delete`, {
+      type: "DELETE",
+    });
+  },
+
   showRevision(postId, version) {
     return ajax(`/posts/${postId}/revisions/${version}/show`, {
       type: "PUT",
diff --git a/app/assets/javascripts/discourse/app/models/rest.js b/app/assets/javascripts/discourse/app/models/rest.js
index 8e9cd09f9b4..3c5e3060071 100644
--- a/app/assets/javascripts/discourse/app/models/rest.js
+++ b/app/assets/javascripts/discourse/app/models/rest.js
@@ -113,7 +113,7 @@ RestModel.reopenClass({
       args.siteSettings = owner.lookup("service:site-settings");
     }
     if (!args.appEvents) {
-      args.appEvents = owner.lookup("service:appEvents");
+      args.appEvents = owner.lookup("service:app-events");
     }
 
     args.__munge = this.munge;
diff --git a/app/assets/javascripts/discourse/app/models/reviewable.js b/app/assets/javascripts/discourse/app/models/reviewable.js
index a8e0a8ad8d1..db973283cfa 100644
--- a/app/assets/javascripts/discourse/app/models/reviewable.js
+++ b/app/assets/javascripts/discourse/app/models/reviewable.js
@@ -1,10 +1,10 @@
 import categoryFromId from "discourse-common/utils/category-macro";
+import { dasherize, underscore } from "@ember/string";
 import I18n from "I18n";
 import { Promise } from "rsvp";
 import RestModel from "discourse/models/rest";
 import { ajax } from "discourse/lib/ajax";
 import discourseComputed from "discourse-common/utils/decorators";
-import { underscore } from "@ember/string";
 
 export const PENDING = 0;
 export const APPROVED = 1;
@@ -14,17 +14,50 @@ export const DELETED = 4;
 
 const Reviewable = RestModel.extend({
   @discourseComputed("type", "topic")
-  humanType(type, topic) {
+  resolvedType(type, topic) {
     // Display "Queued Topic" if the post will create a topic
     if (type === "ReviewableQueuedPost" && !topic) {
-      type = "ReviewableQueuedTopic";
+      return "ReviewableQueuedTopic";
     }
 
-    return I18n.t(`review.types.${underscore(type)}.title`, {
+    return type;
+  },
+
+  @discourseComputed("resolvedType")
+  humanType(resolvedType) {
+    return I18n.t(`review.types.${underscore(resolvedType)}.title`, {
       defaultValue: "",
     });
   },
 
+  @discourseComputed("humanType")
+  humanTypeCssClass(humanType) {
+    return "-" + dasherize(humanType);
+  },
+
+  @discourseComputed
+  flaggedPostContextQuestion() {
+    const uniqueReviewableScores =
+      this.reviewable_scores.uniqBy("score_type.type");
+
+    if (uniqueReviewableScores.length === 1) {
+      if (uniqueReviewableScores[0].score_type.type === "notify_moderators") {
+        return I18n.t("review.context_question.something_else_wrong");
+      }
+    }
+
+    const listOfQuestions = I18n.listJoiner(
+      uniqueReviewableScores
+        .map((score) => score.score_type.title.toLowerCase())
+        .uniq(),
+      I18n.t("review.context_question.delimiter")
+    );
+
+    return I18n.t("review.context_question.is_this_post", {
+      reviewable_human_score_types: listOfQuestions,
+    });
+  },
+
   category: categoryFromId("category_id"),
 
   update(updates) {
diff --git a/app/assets/javascripts/discourse/app/models/topic-list.js b/app/assets/javascripts/discourse/app/models/topic-list.js
index c108f8b41e9..aefae16d707 100644
--- a/app/assets/javascripts/discourse/app/models/topic-list.js
+++ b/app/assets/javascripts/discourse/app/models/topic-list.js
@@ -5,9 +5,9 @@ import Session from "discourse/models/session";
 import User from "discourse/models/user";
 import { ajax } from "discourse/lib/ajax";
 import { getOwner } from "discourse-common/lib/get-owner";
-import getURL from "discourse-common/lib/get-url";
 import { isEmpty } from "@ember/utils";
 import { notEmpty } from "@ember/object/computed";
+import deprecated from "discourse-common/lib/deprecated";
 
 function extractByKey(collection, klass) {
   const retval = {};
@@ -123,9 +123,7 @@ const TopicList = RestModel.extend({
       this.topics.filter((topic) => topic_ids.includes(topic.id))
     );
 
-    const url = `${getURL("/")}${this.filter}.json?topic_ids=${topic_ids.join(
-      ","
-    )}`;
+    const url = `/${this.filter}.json?topic_ids=${topic_ids.join(",")}`;
 
     return ajax({ url, data: this.params }).then((result) => {
       let i = 0;
@@ -198,6 +196,15 @@ TopicList.reopenClass({
   },
 
   find(filter, params) {
+    deprecated(
+      `TopicList.find is deprecated. Use \`findFiltered("topicList")\` on the \`store\` service instead.`,
+      {
+        id: "topic-list-find",
+        since: "3.1.0.beta5",
+        dropFrom: "3.2.0.beta1",
+      }
+    );
+
     const store = getOwner(this).lookup("service:store");
     return store.findFiltered("topicList", { filter, params });
   },
diff --git a/app/assets/javascripts/discourse/app/models/topic-tracking-state.js b/app/assets/javascripts/discourse/app/models/topic-tracking-state.js
index 50d05a2fde7..89ab10a4fa5 100644
--- a/app/assets/javascripts/discourse/app/models/topic-tracking-state.js
+++ b/app/assets/javascripts/discourse/app/models/topic-tracking-state.js
@@ -27,6 +27,10 @@ function isUnread(topic) {
   );
 }
 
+function isNewOrUnread(topic) {
+  return isUnread(topic) || isNew(topic);
+}
+
 function isUnseen(topic) {
   return !topic.is_seen;
 }
@@ -83,20 +87,53 @@ const TopicTrackingState = EmberObject.extend({
    *
    * @method establishChannels
    */
-  establishChannels() {
-    this.messageBus.subscribe("/latest", this._processChannelPayload);
+  establishChannels(meta) {
+    meta ??= {};
+    const messageBusDefaultNewMessageId = -1;
+
+    this.messageBus.subscribe(
+      "/latest",
+      this._processChannelPayload,
+      meta["/latest"] || messageBusDefaultNewMessageId
+    );
+
     if (this.currentUser) {
-      this.messageBus.subscribe("/new", this._processChannelPayload);
-      this.messageBus.subscribe(`/unread`, this._processChannelPayload);
+      this.messageBus.subscribe(
+        "/new",
+        this._processChannelPayload,
+        meta["/new"] || messageBusDefaultNewMessageId
+      );
+
+      this.messageBus.subscribe(
+        `/unread`,
+        this._processChannelPayload,
+        meta["/unread"] || messageBusDefaultNewMessageId
+      );
+
       this.messageBus.subscribe(
         `/unread/${this.currentUser.id}`,
-        this._processChannelPayload
+        this._processChannelPayload,
+        meta[`/unread/${this.currentUser.id}`] || messageBusDefaultNewMessageId
       );
     }
 
-    this.messageBus.subscribe("/delete", this.onDeleteMessage);
-    this.messageBus.subscribe("/recover", this.onRecoverMessage);
-    this.messageBus.subscribe("/destroy", this.onDestroyMessage);
+    this.messageBus.subscribe(
+      "/delete",
+      this.onDeleteMessage,
+      meta["/delete"] || messageBusDefaultNewMessageId
+    );
+
+    this.messageBus.subscribe(
+      "/recover",
+      this.onRecoverMessage,
+      meta["/recover"] || messageBusDefaultNewMessageId
+    );
+
+    this.messageBus.subscribe(
+      "/destroy",
+      this.onDestroyMessage,
+      meta["/destroy"] || messageBusDefaultNewMessageId
+    );
   },
 
   @bind
@@ -247,11 +284,12 @@ const TopicTrackingState = EmberObject.extend({
       this._addIncoming(data.topic_id);
     }
 
+    const unreadRecipients = ["all", "unread", "unseen"];
+    if (this.currentUser?.new_new_view_enabled) {
+      unreadRecipients.push("new");
+    }
     // count an unread topic as incoming
-    if (
-      ["all", "unread", "unseen"].includes(filter) &&
-      data.message_type === "unread"
-    ) {
+    if (unreadRecipients.includes(filter) && data.message_type === "unread") {
       const old = this.findState(data);
 
       // the highest post number is equal to last read post number here
@@ -359,8 +397,9 @@ const TopicTrackingState = EmberObject.extend({
    * @method removeTopic
    */
   removeTopic(topicId) {
-    this.states.delete(this._stateKey(topicId));
-    this._afterStateChange();
+    if (this.states.delete(this._stateKey(topicId))) {
+      this._afterStateChange();
+    }
   },
 
   /**
@@ -519,7 +558,22 @@ const TopicTrackingState = EmberObject.extend({
     const mutedCategoryIds = this.currentUser?.muted_category_ids?.concat(
       this.currentUser.indirectly_muted_category_ids
     );
-    let filterFn = type === "new" ? isNew : isUnread;
+
+    let filterFn;
+    switch (type) {
+      case "new":
+        filterFn = isNew;
+        break;
+      case "unread":
+        filterFn = isUnread;
+        break;
+      case "new_and_unread":
+      case "unread_and_new":
+        filterFn = isNewOrUnread;
+        break;
+      default:
+        throw new Error(`Unkown filter type ${type}`);
+    }
 
     return Array.from(this.states.values()).filter((topic) => {
       if (!filterFn(topic)) {
@@ -530,6 +584,14 @@ const TopicTrackingState = EmberObject.extend({
         return false;
       }
 
+      if (
+        categoryId &&
+        topic.is_category_topic &&
+        categoryId !== topic.category_id
+      ) {
+        return false;
+      }
+
       if (tagId && !topic.tags?.includes(tagId)) {
         return false;
       }
@@ -566,6 +628,21 @@ const TopicTrackingState = EmberObject.extend({
     });
   },
 
+  countNewAndUnread({
+    categoryId,
+    tagId,
+    noSubcategories,
+    customFilterFn,
+  } = {}) {
+    return this.countCategoryByState({
+      type: "new_and_unread",
+      categoryId,
+      tagId,
+      noSubcategories,
+      customFilterFn,
+    });
+  },
+
   /**
    * Calls the provided callback for each of the currently tracked topics
    * we have in state.
@@ -676,12 +753,21 @@ const TopicTrackingState = EmberObject.extend({
     let categoryId = category ? get(category, "id") : null;
 
     if (type === "new") {
-      return this.countNew({
+      let count = this.countNew({
         categoryId,
         tagId,
         noSubcategories,
         customFilterFn,
       });
+      if (this.currentUser?.new_new_view_enabled) {
+        count += this.countUnread({
+          categoryId,
+          tagId,
+          noSubcategories,
+          customFilterFn,
+        });
+      }
+      return count;
     } else if (type === "unread") {
       return this.countUnread({
         categoryId,
@@ -757,8 +843,14 @@ const TopicTrackingState = EmberObject.extend({
   // for a particular seen topic has not yet reached the server.
   _fixDelayedServerState(list, filter) {
     for (let index = list.topics.length - 1; index >= 0; index--) {
-      const state = this.findState(list.topics[index].id);
-      if (state && state.last_read_post_number > 0) {
+      const topic = list.topics[index];
+      const state = this.findState(topic.id);
+      if (
+        state &&
+        state.last_read_post_number > 0 &&
+        (topic.last_read_post_number === 0 ||
+          !this.currentUser?.new_new_view_enabled)
+      ) {
         if (filter === "new") {
           list.topics.splice(index, 1);
         } else {
@@ -924,6 +1016,10 @@ const TopicTrackingState = EmberObject.extend({
       this._dismissNewTopics(data.payload.topic_ids);
     }
 
+    if (data.message_type === "dismiss_new_posts") {
+      this._dismissNewPosts(data.payload.topic_ids);
+    }
+
     if (["new_topic", "unread", "read"].includes(data.message_type)) {
       this.notifyIncoming(data);
       if (!deepEqual(old, data.payload)) {
@@ -963,6 +1059,23 @@ const TopicTrackingState = EmberObject.extend({
     topicIds.forEach((topicId) => {
       this.modifyStateProp(topicId, "is_seen", true);
     });
+
+    this.incrementMessageCount();
+  },
+
+  _dismissNewPosts(topicIds) {
+    topicIds.forEach((topicId) => {
+      const state = this.findState(topicId);
+
+      if (state) {
+        this.modifyStateProp(
+          topicId,
+          "last_read_post_number",
+          state.highest_post_number
+        );
+      }
+    });
+
     this.incrementMessageCount();
   },
 
@@ -1005,10 +1118,13 @@ const TopicTrackingState = EmberObject.extend({
 });
 
 export function startTracking(tracking) {
-  const data = PreloadStore.get("topicTrackingStates");
-  tracking.loadStates(data);
-  tracking.establishChannels();
-  PreloadStore.remove("topicTrackingStates");
+  PreloadStore.getAndRemove("topicTrackingStates").then((data) =>
+    tracking.loadStates(data)
+  );
+
+  PreloadStore.getAndRemove("topicTrackingStateMeta").then((meta) =>
+    tracking.establishChannels(meta)
+  );
 }
 
 export default TopicTrackingState;
diff --git a/app/assets/javascripts/discourse/app/models/topic.js b/app/assets/javascripts/discourse/app/models/topic.js
index 4667825058c..2c66fdb759b 100644
--- a/app/assets/javascripts/discourse/app/models/topic.js
+++ b/app/assets/javascripts/discourse/app/models/topic.js
@@ -26,7 +26,7 @@ import { applyModelTransformations } from "discourse/lib/model-transformers";
 
 export function loadTopicView(topic, args) {
   const data = deepMerge({}, args);
-  const url = `${getURL("/t/")}${topic.id}`;
+  const url = `/t/${topic.id}`;
   const jsonUrl = (data.nearPost ? `${url}/${data.nearPost}` : url) + ".json";
 
   delete data.nearPost;
@@ -183,12 +183,15 @@ const Topic = RestModel.extend({
     return postsCount - 1;
   },
 
-  @discourseComputed
-  details() {
-    return this.store.createRecord("topicDetails", {
+  get details() {
+    return (this._details ??= this.store.createRecord("topicDetails", {
       id: this.id,
       topic: this,
-    });
+    }));
+  },
+
+  set details(value) {
+    return (this._details = value);
   },
 
   @discourseComputed("visible")
@@ -453,7 +456,7 @@ const Topic = RestModel.extend({
   },
 
   // Delete this topic
-  destroy(deleted_by, opts) {
+  destroy(deleted_by, opts = {}) {
     return ajax(`/t/${this.id}`, {
       data: { context: window.location.pathname, ...opts },
       type: "DELETE",
@@ -468,14 +471,15 @@ const Topic = RestModel.extend({
             this.siteSettings.can_permanently_delete && deleted_by.admin,
         });
         if (
-          !deleted_by.staff &&
-          !deleted_by.groups.some(
-            (group) => group.name === this.category.reviewable_by_group_name
-          ) &&
-          !(
-            this.siteSettings.tl4_delete_posts_and_topics &&
-            deleted_by.trust_level >= 4
-          )
+          opts.force_destroy ||
+          (!deleted_by.staff &&
+            !deleted_by.groups.some(
+              (group) => group.name === this.category?.reviewable_by_group_name
+            ) &&
+            !(
+              this.siteSettings.tl4_delete_posts_and_topics &&
+              deleted_by.trust_level >= 4
+            ))
         ) {
           DiscourseURL.redirectTo("/");
         }
@@ -847,6 +851,18 @@ Topic.reopenClass({
       data.topic_ids = topicIds;
     }
 
+    if (opts.dismissPosts) {
+      data.dismiss_posts = opts.dismissPosts;
+    }
+
+    if (opts.dismissTopics) {
+      data.dismiss_topics = opts.dismissTopics;
+    }
+
+    if (opts.untrack) {
+      data.untrack = opts.untrack;
+    }
+
     return ajax("/topics/reset-new", { type: "PUT", data });
   },
 
diff --git a/app/assets/javascripts/discourse/app/models/user.js b/app/assets/javascripts/discourse/app/models/user.js
index e36bc13c7ff..e684d61fa02 100644
--- a/app/assets/javascripts/discourse/app/models/user.js
+++ b/app/assets/javascripts/discourse/app/models/user.js
@@ -2,15 +2,7 @@ import EmberObject, { computed, get, getProperties } from "@ember/object";
 import { camelize } from "@ember/string";
 import cookie, { removeCookie } from "discourse/lib/cookie";
 import { defaultHomepage, escapeExpression } from "discourse/lib/utilities";
-import {
-  alias,
-  equal,
-  filterBy,
-  gt,
-  mapBy,
-  or,
-  readOnly,
-} from "@ember/object/computed";
+import { alias, equal, filterBy, gt, mapBy, or } from "@ember/object/computed";
 import getURL, { getURLWithCDN } from "discourse-common/lib/get-url";
 import { A } from "@ember/array";
 import Badge from "discourse/models/badge";
@@ -45,7 +37,6 @@ import { cancel } from "@ember/runloop";
 import discourseLater from "discourse-common/lib/later";
 import { isTesting } from "discourse-common/config/environment";
 import {
-  hideAllUserTips,
   hideUserTip,
   showNextUserTip,
   showUserTip,
@@ -137,7 +128,9 @@ let userOptionFields = [
   "seen_popups",
   "default_calendar",
   "bookmark_auto_delete_preference",
-  "sidebar_list_destination",
+  "sidebar_link_to_filtered_list",
+  "sidebar_show_count_of_new_items",
+  "watched_precedence_over_muted",
 ];
 
 export function addSaveableUserOptionField(fieldName) {
@@ -368,9 +361,9 @@ const User = RestModel.extend({
   },
 
   isBasic: equal("trust_level", 0),
-  isLeader: equal("trust_level", 3),
-  isElder: equal("trust_level", 4),
-  canManageTopic: or("staff", "isElder"),
+  isRegular: equal("trust_level", 3),
+  isLeader: equal("trust_level", 4),
+  canManageTopic: or("staff", "isLeader"),
 
   @discourseComputed("previous_visit_at")
   previousVisitAt(previous_visit_at) {
@@ -407,8 +400,9 @@ const User = RestModel.extend({
     });
   },
 
+  sidebarSections: alias("sidebar_sections"),
+
   sidebarTagNames: mapBy("sidebarTags", "name"),
-  sidebarListDestination: readOnly("sidebar_list_destination"),
 
   changeUsername(new_username) {
     return ajax(userPath(`${this.username_lower}/preferences/username`), {
@@ -421,6 +415,12 @@ const User = RestModel.extend({
     return ajax(userPath(`${this.username_lower}/preferences/email`), {
       type: "POST",
       data: { email },
+    }).then(() => {
+      if (!this.unconfirmed_emails) {
+        this.set("unconfirmed_emails", []);
+      }
+
+      this.unconfirmed_emails.pushObject(email);
     });
   },
 
@@ -428,11 +428,13 @@ const User = RestModel.extend({
     return ajax(userPath(`${this.username_lower}/preferences/email`), {
       type: "PUT",
       data: { email },
-    });
-  },
+    }).then(() => {
+      if (!this.unconfirmed_emails) {
+        this.set("unconfirmed_emails", []);
+      }
 
-  copy() {
-    return User.create(this.getProperties(Object.keys(this)));
+      this.unconfirmed_emails.pushObject(email);
+    });
   },
 
   save(fields) {
@@ -676,11 +678,6 @@ const User = RestModel.extend({
     return groups.length === 0 ? null : groups;
   },
 
-  @discourseComputed("filteredGroups", "numGroupsToDisplay")
-  showMoreGroupsLink(filteredGroups, numGroupsToDisplay) {
-    return filteredGroups.length > numGroupsToDisplay;
-  },
-
   // NOTE: This only includes groups *visible* to the user via the serializer,
   // so be wary when using this.
   isInAnyGroups(groupIds) {
@@ -834,17 +831,6 @@ const User = RestModel.extend({
     });
   },
 
-  generateMultipleUseInviteLink(
-    group_ids,
-    max_redemptions_allowed,
-    expires_at
-  ) {
-    return ajax("/invites", {
-      type: "POST",
-      data: { group_ids, max_redemptions_allowed, expires_at },
-    });
-  },
-
   @dependentKeyCompat
   get mutedCategories() {
     return Category.findByIds(this.get("muted_category_ids"));
@@ -905,6 +891,16 @@ const User = RestModel.extend({
     return !this.siteSettings.enable_discourse_connect && canDeleteAccount;
   },
 
+  @dependentKeyCompat
+  get sidebarLinkToFilteredList() {
+    return this.get("user_option.sidebar_link_to_filtered_list");
+  },
+
+  @dependentKeyCompat
+  get sidebarShowCountOfNewItems() {
+    return this.get("user_option.sidebar_show_count_of_new_items");
+  },
+
   delete() {
     if (this.can_delete_account) {
       return ajax(userPath(this.username + ".json"), {
@@ -1175,81 +1171,70 @@ const User = RestModel.extend({
     return [...trackedTags, ...watchedTags, ...watchingFirstPostTags];
   },
 
-  showUserTip(options) {
+  canSeeUserTip(id) {
     const userTips = Site.currentProp("user_tips");
-    if (!userTips || this.skip_new_user_tips) {
-      return;
+    if (!userTips || this.user_option?.skip_new_user_tips) {
+      return false;
     }
 
-    if (!userTips[options.id]) {
+    if (!userTips[id]) {
       if (!isTesting()) {
         // eslint-disable-next-line no-console
-        console.warn("Cannot show user tip with type =", options.id);
+        console.warn("Cannot show user tip with type =", id);
       }
-      return;
+      return false;
     }
 
-    const seenUserTips = this.seen_popups || [];
-    if (
-      seenUserTips.includes(-1) ||
-      seenUserTips.includes(userTips[options.id])
-    ) {
-      return;
+    const seenUserTips = this.user_option?.seen_popups || [];
+    if (seenUserTips.includes(-1) || seenUserTips.includes(userTips[id])) {
+      return false;
     }
 
-    showUserTip({
-      ...options,
-      onDismiss: () => this.hideUserTipForever(options.id),
-      onDismissAll: () => this.hideUserTipForever(),
-    });
+    return true;
+  },
+
+  showUserTip(options) {
+    if (this.canSeeUserTip(options.id)) {
+      showUserTip({
+        ...options,
+        onDismiss: () => {
+          options.onDismiss?.();
+          this.hideUserTipForever(options.id);
+        },
+      });
+    }
   },
 
   hideUserTipForever(userTipId) {
     const userTips = Site.currentProp("user_tips");
-    if (!userTips || this.skip_new_user_tips) {
+    if (!userTips || this.user_option?.skip_new_user_tips) {
       return;
     }
 
     // Empty userTipId means all user tips.
-    if (userTipId && !userTips[userTipId]) {
+    if (!userTips[userTipId]) {
       // eslint-disable-next-line no-console
       console.warn("Cannot hide user tip with type =", userTipId);
       return;
     }
 
     // Hide user tips and maybe show the next one.
-    if (userTipId) {
-      hideUserTip(userTipId);
-      showNextUserTip();
-    } else {
-      hideAllUserTips();
-    }
+    hideUserTip(userTipId, true);
+    showNextUserTip();
 
     // Update list of seen user tips.
-    let seenUserTips = this.seen_popups || [];
-    if (userTipId) {
-      if (seenUserTips.includes(userTips[userTipId])) {
-        return;
-      }
-      seenUserTips.push(userTips[userTipId]);
-    } else {
-      if (seenUserTips.includes(-1)) {
-        return;
-      }
-      seenUserTips = [-1];
+    let seenUserTips = this.user_option?.seen_popups || [];
+    if (seenUserTips.includes(userTips[userTipId])) {
+      return;
     }
+    seenUserTips.push(userTips[userTipId]);
 
     // Save seen user tips on the server.
     if (!this.user_option) {
       this.set("user_option", {});
     }
     this.set("user_option.seen_popups", seenUserTips);
-    if (userTipId) {
-      return this.save(["seen_popups"]);
-    } else {
-      this.set("user_option.skip_new_user_tips", true);
-      return this.save(["seen_popups", "skip_new_user_tips"]);
-    }
+    return this.save(["seen_popups"]);
   },
 });
 
@@ -1364,9 +1349,7 @@ User.reopenClass(Singleton, {
       data: { timezone: user.user_option.timezone },
     });
   },
-});
 
-User.reopenClass({
   create(args) {
     args = args || {};
     this.deleteStatusTrackingFields(args);
@@ -1399,6 +1382,13 @@ User.reopen(Evented, {
 
   // always call stopTrackingStatus() when done with a user
   trackStatus() {
+    if (!this.id) {
+      // eslint-disable-next-line no-console
+      console.warn(
+        "It's impossible to track user status on a user model that doesn't have id. This user model won't be receiving live user status updates."
+      );
+    }
+
     if (this._subscribersCount === 0) {
       this.addObserver("status", this, "_statusChanged");
 
@@ -1427,6 +1417,10 @@ User.reopen(Evented, {
     this._subscribersCount--;
   },
 
+  isTrackingStatus() {
+    return this._subscribersCount > 0;
+  },
+
   _statusChanged(sender, key) {
     this.trigger("status-changed");
 
diff --git a/app/assets/javascripts/discourse/app/modifiers/auto-focus.js b/app/assets/javascripts/discourse/app/modifiers/auto-focus.js
new file mode 100644
index 00000000000..78d43f65a93
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/modifiers/auto-focus.js
@@ -0,0 +1,12 @@
+import Modifier from "ember-modifier";
+
+export default class AutoFocusModifier extends Modifier {
+  didFocus = false;
+
+  modify(element) {
+    if (!this.didFocus) {
+      element.focus();
+      this.didFocus = true;
+    }
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/modifiers/draggable.js b/app/assets/javascripts/discourse/app/modifiers/draggable.js
index d2d6a8035b1..dfc4850019b 100644
--- a/app/assets/javascripts/discourse/app/modifiers/draggable.js
+++ b/app/assets/javascripts/discourse/app/modifiers/draggable.js
@@ -22,22 +22,24 @@ export default class DraggableModifier extends Modifier {
     this.element.addEventListener("mousedown", this.dragMove, {
       passive: false,
     });
+    this.element.addEventListener("dragenter", this.dragMove, {
+      passive: false,
+    });
   }
 
   @bind
   dragMove(e) {
-    e.stopPropagation();
-    e.preventDefault();
     if (!this.hasStarted) {
       this.hasStarted = true;
 
       if (this.didStartDragCallback) {
-        this.didStartDragCallback();
+        this.didStartDragCallback(e);
       }
 
       // Register a global event to capture mouse moves when element 'clicked'.
       document.addEventListener("touchmove", this.drag, { passive: false });
       document.addEventListener("mousemove", this.drag, { passive: false });
+      document.addEventListener("dragover", this.drag, { passive: false });
       document.body.classList.add("dragging");
 
       // On leaving click, stop moving.
@@ -47,6 +49,9 @@ export default class DraggableModifier extends Modifier {
       document.addEventListener("mouseup", this.didEndDrag, {
         passive: false,
       });
+      document.addEventListener("drop", this.didEndDrag, {
+        passive: false,
+      });
     }
   }
 
@@ -64,6 +69,7 @@ export default class DraggableModifier extends Modifier {
 
       document.removeEventListener("touchmove", this.drag);
       document.removeEventListener("mousemove", this.drag);
+      document.removeEventListener("dragover", this.drag);
 
       document.body.classList.remove("dragging");
       this.hasStarted = false;
@@ -73,10 +79,13 @@ export default class DraggableModifier extends Modifier {
   cleanup() {
     document.removeEventListener("touchstart", this.dragMove);
     document.removeEventListener("mousedown", this.dragMove);
+    document.removeEventListener("dragenter", this.dragMove);
     document.removeEventListener("touchend", this.didEndDrag);
     document.removeEventListener("mouseup", this.didEndDrag);
+    document.removeEventListener("drop", this.didEndDrag);
     document.removeEventListener("mousemove", this.drag);
     document.removeEventListener("touchmove", this.drag);
+    document.removeEventListener("dragover", this.drag);
     document.body.classList.remove("dragging");
   }
 }
diff --git a/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js b/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js
deleted file mode 100644
index b8b50155932..00000000000
--- a/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js
+++ /dev/null
@@ -1,118 +0,0 @@
-import TopicTrackingState, {
-  startTracking,
-} from "discourse/models/topic-tracking-state";
-import DiscourseLocation from "discourse/lib/discourse-location";
-import Session from "discourse/models/session";
-import Site from "discourse/models/site";
-import User from "discourse/models/user";
-
-const ALL_TARGETS = ["controller", "component", "route", "model", "adapter"];
-
-export function injectServiceIntoService({ app, property, specifier }) {
-  // app.inject doesn't allow implicit injection of services into services.
-  // However, we need to do it in order to convert our old service-like objects
-  // into true services, without breaking existing implicit injections.
-  // This hack will be removed when we remove implicit injections for the Ember 4.0 update.
-
-  // Supplying a specific injection with the same property name prevents the infinite
-  // which would be caused by injecting a service into itself
-  app.register("discourse:null", null, { instantiate: false });
-  app.inject(specifier, property, "discourse:null");
-
-  // Bypass the validation in `app.inject` by adding directly to the array
-  app.__registry__._typeInjections["service"] ??= [];
-  app.__registry__._typeInjections["service"].push({
-    property,
-    specifier,
-  });
-}
-
-export default {
-  name: "inject-discourse-objects",
-  after: "discourse-bootstrap",
-
-  initialize(container, app) {
-    const siteSettings = container.lookup("service:site-settings");
-
-    const currentUser = User.current();
-
-    // We can't use a 'real' service factory (i.e. services/current-user.js) because we need
-    // to register a null value for anon
-    app.register("service:current-user", currentUser, { instantiate: false });
-
-    this.topicTrackingState = TopicTrackingState.create({
-      messageBus: container.lookup("service:message-bus"),
-      siteSettings,
-      currentUser,
-    });
-
-    app.register("service:topic-tracking-state", this.topicTrackingState, {
-      instantiate: false,
-    });
-
-    const site = Site.current();
-    app.register("service:site", site, { instantiate: false });
-
-    const session = Session.current();
-    app.register("service:session", session, { instantiate: false });
-
-    app.register("location:discourse-location", DiscourseLocation);
-
-    ALL_TARGETS.forEach((t) => {
-      app.inject(t, "appEvents", "service:app-events");
-      app.inject(t, "pmTopicTrackingState", "service:pm-topic-tracking-state");
-      app.inject(t, "store", "service:store");
-      app.inject(t, "site", "service:site");
-      app.inject(t, "searchService", "service:search");
-      app.inject(t, "session", "service:session");
-      app.inject(t, "messageBus", "service:message-bus");
-      app.inject(t, "siteSettings", "service:site-settings");
-      app.inject(t, "topicTrackingState", "service:topic-tracking-state");
-      app.inject(t, "keyValueStore", "service:key-value-store");
-    });
-
-    injectServiceIntoService({
-      app,
-      property: "session",
-      specifier: "service:session",
-    });
-    injectServiceIntoService({
-      app,
-      property: "messageBus",
-      specifier: "service:message-bus",
-    });
-    injectServiceIntoService({
-      app,
-      property: "siteSettings",
-      specifier: "service:site-settings",
-    });
-    injectServiceIntoService({
-      app,
-      property: "topicTrackingState",
-      specifier: "service:topic-tracking-state",
-    });
-    injectServiceIntoService({
-      app,
-      property: "keyValueStore",
-      specifier: "service:key-value-store",
-    });
-
-    if (currentUser) {
-      ["controller", "component", "route"].forEach((t) => {
-        app.inject(t, "currentUser", "service:current-user");
-      });
-      injectServiceIntoService({
-        app,
-        property: "currentUser",
-        specifier: "service:current-user",
-      });
-    }
-
-    startTracking(this.topicTrackingState);
-  },
-
-  teardown() {
-    // Manually call `willDestroy` as this isn't an actual `Service`
-    this.topicTrackingState.willDestroy();
-  },
-};
diff --git a/app/assets/javascripts/discourse/app/pre-initializers/sniff-capabilities.js b/app/assets/javascripts/discourse/app/pre-initializers/sniff-capabilities.js
deleted file mode 100644
index cb600d976e5..00000000000
--- a/app/assets/javascripts/discourse/app/pre-initializers/sniff-capabilities.js
+++ /dev/null
@@ -1,61 +0,0 @@
-// Initializes an object that lets us know about browser's capabilities
-
-const APPLE_NAVIGATOR_PLATFORMS = /iPhone|iPod|iPad|Macintosh|MacIntel/;
-
-const APPLE_USERAGENTDATA_PLATFORM = /macOS/;
-
-export default {
-  name: "sniff-capabilities",
-
-  initialize(_, app) {
-    const html = document.querySelector("html");
-    const touch = navigator.maxTouchPoints > 1 || "ontouchstart" in window;
-    const ua = navigator.userAgent;
-    const caps = { touch };
-
-    if (touch) {
-      html.classList.add("touch", "discourse-touch");
-    } else {
-      html.classList.add("no-touch", "discourse-no-touch");
-    }
-
-    caps.isAndroid = ua.includes("Android");
-    caps.isWinphone = ua.includes("Windows Phone");
-    caps.isOpera = !!window.opera || ua.includes(" OPR/");
-    caps.isFirefox = ua.includes("Firefox");
-    caps.isChrome = !!window.chrome && !caps.isOpera;
-    caps.isSafari =
-      /Constructor/.test(window.HTMLElement) ||
-      window.safari?.pushNotification.toString() ===
-        "[object SafariRemoteNotification]";
-    caps.isIpadOS = ua.includes("Mac OS") && !/iPhone|iPod/.test(ua) && touch;
-    caps.isIOS =
-      (/iPhone|iPod/.test(navigator.userAgent) || caps.isIpadOS) &&
-      !window.MSStream;
-
-    caps.isApple =
-      APPLE_NAVIGATOR_PLATFORMS.test(navigator.platform) ||
-      (navigator.userAgentData &&
-        APPLE_USERAGENTDATA_PLATFORM.test(navigator.userAgentData.platform));
-
-    caps.hasContactPicker =
-      "contacts" in navigator && "ContactsManager" in window;
-    caps.canVibrate = "vibrate" in navigator;
-    caps.isPwa =
-      window.matchMedia("(display-mode: standalone)").matches ||
-      window.navigator.standalone ||
-      document.referrer.includes("android-app://");
-
-    caps.isiOSPWA = caps.isPwa && caps.isIOS;
-
-    caps.wasLaunchedFromDiscourseHub =
-      window.location.search.includes("discourse_app=1");
-    caps.isAppWebview = window.ReactNativeWebView !== undefined;
-
-    // Inject it
-    app.register("capabilities:main", caps, { instantiate: false });
-    app.inject("view", "capabilities", "capabilities:main");
-    app.inject("controller", "capabilities", "capabilities:main");
-    app.inject("component", "capabilities", "capabilities:main");
-  },
-};
diff --git a/app/assets/javascripts/discourse/app/templates/badge-selector-autocomplete.hbr b/app/assets/javascripts/discourse/app/raw-templates/badge-selector-autocomplete.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/badge-selector-autocomplete.hbr
rename to app/assets/javascripts/discourse/app/raw-templates/badge-selector-autocomplete.hbr
diff --git a/app/assets/javascripts/discourse/app/templates/category-selector-autocomplete.hbr b/app/assets/javascripts/discourse/app/raw-templates/category-selector-autocomplete.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/category-selector-autocomplete.hbr
rename to app/assets/javascripts/discourse/app/raw-templates/category-selector-autocomplete.hbr
diff --git a/app/assets/javascripts/discourse/app/templates/category-tag-autocomplete.hbr b/app/assets/javascripts/discourse/app/raw-templates/category-tag-autocomplete.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/category-tag-autocomplete.hbr
rename to app/assets/javascripts/discourse/app/raw-templates/category-tag-autocomplete.hbr
diff --git a/app/assets/javascripts/discourse/app/templates/emoji-selector-autocomplete.hbr b/app/assets/javascripts/discourse/app/raw-templates/emoji-selector-autocomplete.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/emoji-selector-autocomplete.hbr
rename to app/assets/javascripts/discourse/app/raw-templates/emoji-selector-autocomplete.hbr
diff --git a/app/assets/javascripts/discourse/app/templates/flat-button.hbr b/app/assets/javascripts/discourse/app/raw-templates/flat-button.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/flat-button.hbr
rename to app/assets/javascripts/discourse/app/raw-templates/flat-button.hbr
diff --git a/app/assets/javascripts/discourse/app/templates/group-selector-autocomplete.hbr b/app/assets/javascripts/discourse/app/raw-templates/group-selector-autocomplete.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/group-selector-autocomplete.hbr
rename to app/assets/javascripts/discourse/app/raw-templates/group-selector-autocomplete.hbr
diff --git a/app/assets/javascripts/discourse/app/templates/hashtag-autocomplete.hbr b/app/assets/javascripts/discourse/app/raw-templates/hashtag-autocomplete.hbr
similarity index 59%
rename from app/assets/javascripts/discourse/app/templates/hashtag-autocomplete.hbr
rename to app/assets/javascripts/discourse/app/raw-templates/hashtag-autocomplete.hbr
index 49c3e488145..32695a5ea10 100644
--- a/app/assets/javascripts/discourse/app/templates/hashtag-autocomplete.hbr
+++ b/app/assets/javascripts/discourse/app/raw-templates/hashtag-autocomplete.hbr
@@ -3,7 +3,7 @@
     <ul>
       {{#each options as |option|}}
         <li class="hashtag-autocomplete__option">
-          <a class="hashtag-autocomplete__link" title="{{option.description}}" href>{{d-icon option.icon}}<span class="hashtag-autocomplete__text">{{option.text}}{{#if option.secondary_text}}<span class="hashtag-autocomplete__meta-text">({{option.secondary_text}}){{/if}}</span></span>
+          <a class="hashtag-autocomplete__link" title="{{option.description}}" href>{{{option.icon}}}<span class="hashtag-autocomplete__text">{{option.text}}{{#if option.secondary_text}}<span class="hashtag-autocomplete__meta-text">({{option.secondary_text}}){{/if}}</span></span>
           </a>
         </li>
       {{/each}}
diff --git a/app/assets/javascripts/discourse/app/templates/list/action-list.hbr b/app/assets/javascripts/discourse/app/raw-templates/list/action-list.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/list/action-list.hbr
rename to app/assets/javascripts/discourse/app/raw-templates/list/action-list.hbr
diff --git a/app/assets/javascripts/discourse/app/templates/list/activity-column.hbr b/app/assets/javascripts/discourse/app/raw-templates/list/activity-column.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/list/activity-column.hbr
rename to app/assets/javascripts/discourse/app/raw-templates/list/activity-column.hbr
diff --git a/app/assets/javascripts/discourse/app/templates/list/category-column.hbr b/app/assets/javascripts/discourse/app/raw-templates/list/category-column.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/list/category-column.hbr
rename to app/assets/javascripts/discourse/app/raw-templates/list/category-column.hbr
diff --git a/app/assets/javascripts/discourse/app/raw-templates/list/participant-groups.hbr b/app/assets/javascripts/discourse/app/raw-templates/list/participant-groups.hbr
new file mode 100644
index 00000000000..53d796a7860
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/raw-templates/list/participant-groups.hbr
@@ -0,0 +1,18 @@
+<div
+  class="participant-group-wrapper"
+  role="list"
+  aria-label="{{i18n 'topic.participant_groups'}}"
+>
+  {{#each groups as |group|}}
+    <div class="participant-group">
+      <a
+        class="user-group trigger-group-card"
+        href="{{group.url}}"
+        data-group-card="{{group.name}}"
+      >
+        {{d-icon "users"}}
+        {{group.name}}
+      </a>
+    </div>
+  {{/each}}
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/list/post-count-or-badges.hbr b/app/assets/javascripts/discourse/app/raw-templates/list/post-count-or-badges.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/list/post-count-or-badges.hbr
rename to app/assets/javascripts/discourse/app/raw-templates/list/post-count-or-badges.hbr
diff --git a/app/assets/javascripts/discourse/app/templates/list/posters-column.hbr b/app/assets/javascripts/discourse/app/raw-templates/list/posters-column.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/list/posters-column.hbr
rename to app/assets/javascripts/discourse/app/raw-templates/list/posters-column.hbr
diff --git a/app/assets/javascripts/discourse/app/templates/list/posts-count-column.hbr b/app/assets/javascripts/discourse/app/raw-templates/list/posts-count-column.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/list/posts-count-column.hbr
rename to app/assets/javascripts/discourse/app/raw-templates/list/posts-count-column.hbr
diff --git a/app/assets/javascripts/discourse/app/templates/list/topic-excerpt.hbr b/app/assets/javascripts/discourse/app/raw-templates/list/topic-excerpt.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/list/topic-excerpt.hbr
rename to app/assets/javascripts/discourse/app/raw-templates/list/topic-excerpt.hbr
diff --git a/app/assets/javascripts/discourse/app/templates/list/topic-list-item.hbr b/app/assets/javascripts/discourse/app/raw-templates/list/topic-list-item.hbr
similarity index 94%
rename from app/assets/javascripts/discourse/app/templates/list/topic-list-item.hbr
rename to app/assets/javascripts/discourse/app/raw-templates/list/topic-list-item.hbr
index dc1e35ac5e5..37dc34ad124 100644
--- a/app/assets/javascripts/discourse/app/templates/list/topic-list-item.hbr
+++ b/app/assets/javascripts/discourse/app/raw-templates/list/topic-list-item.hbr
@@ -40,6 +40,9 @@
       {{/unless}}
     {{/unless}}
     {{discourse-tags topic mode="list" tagsForUser=tagsForUser}}
+    {{#if participantGroups}}
+      {{raw "list/participant-groups" groups=participantGroups}}
+    {{/if}}
     {{raw "list/action-list" topic=topic postNumbers=topic.liked_post_numbers className="likes" icon="heart"}}
   </div>
   {{#if expandPinned}}
@@ -83,3 +86,5 @@
 </td>
 
 {{raw "list/activity-column" topic=topic class="num topic-list-data" tagName="td"}}
+
+{{~raw-plugin-outlet name="topic-list-after-columns"}}
diff --git a/app/assets/javascripts/discourse/app/templates/list/unread-indicator.hbr b/app/assets/javascripts/discourse/app/raw-templates/list/unread-indicator.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/list/unread-indicator.hbr
rename to app/assets/javascripts/discourse/app/raw-templates/list/unread-indicator.hbr
diff --git a/app/assets/javascripts/discourse/app/templates/list/visited-line.hbr b/app/assets/javascripts/discourse/app/raw-templates/list/visited-line.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/list/visited-line.hbr
rename to app/assets/javascripts/discourse/app/raw-templates/list/visited-line.hbr
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/list/topic-list-item.hbr b/app/assets/javascripts/discourse/app/raw-templates/mobile/list/topic-list-item.hbr
similarity index 87%
rename from app/assets/javascripts/discourse/app/templates/mobile/list/topic-list-item.hbr
rename to app/assets/javascripts/discourse/app/raw-templates/mobile/list/topic-list-item.hbr
index 3c0de444e89..fcf11336bc5 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/list/topic-list-item.hbr
+++ b/app/assets/javascripts/discourse/app/raw-templates/mobile/list/topic-list-item.hbr
@@ -38,13 +38,13 @@
       {{raw "list/post-count-or-badges" topic=topic postBadgesEnabled=showTopicPostBadges}}
     </div>
     <div class="topic-item-stats clearfix">
-      {{#unless hideCategory}}
-        {{~raw-plugin-outlet name="topic-list-before-category"}}
-        <div class='category'>
-          {{category-link topic.category}}
-        </div>
-      {{/unless}}
-      {{discourse-tags topic mode="list"}}
+      <span class="topic-item-stats__category-tags">
+        {{#unless hideCategory}}
+          {{~raw-plugin-outlet name="topic-list-before-category"}}
+          {{category-link topic.category~}}
+        {{~/unless}}
+        {{~discourse-tags topic mode="list"}}
+      </span>
       <div class='num activity last'>
         <span class="age activity" title="{{topic.bumpedAtTitle}}"><a
             href="{{topic.lastPostUrl}}">{{format-date topic.bumpedAt format="tiny" noTitle="true"}}</a>
diff --git a/app/assets/javascripts/discourse/app/templates/post/poster-avatar.hbr b/app/assets/javascripts/discourse/app/raw-templates/post/poster-avatar.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/post/poster-avatar.hbr
rename to app/assets/javascripts/discourse/app/raw-templates/post/poster-avatar.hbr
diff --git a/app/assets/javascripts/discourse/app/templates/topic-list-header-column.hbr b/app/assets/javascripts/discourse/app/raw-templates/topic-list-header-column.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/topic-list-header-column.hbr
rename to app/assets/javascripts/discourse/app/raw-templates/topic-list-header-column.hbr
diff --git a/app/assets/javascripts/discourse/app/templates/topic-list-header.hbr b/app/assets/javascripts/discourse/app/raw-templates/topic-list-header.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/topic-list-header.hbr
rename to app/assets/javascripts/discourse/app/raw-templates/topic-list-header.hbr
diff --git a/app/assets/javascripts/discourse/app/templates/topic-post-badges.hbr b/app/assets/javascripts/discourse/app/raw-templates/topic-post-badges.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/topic-post-badges.hbr
rename to app/assets/javascripts/discourse/app/raw-templates/topic-post-badges.hbr
diff --git a/app/assets/javascripts/discourse/app/templates/topic-status.hbr b/app/assets/javascripts/discourse/app/raw-templates/topic-status.hbr
similarity index 100%
rename from app/assets/javascripts/discourse/app/templates/topic-status.hbr
rename to app/assets/javascripts/discourse/app/raw-templates/topic-status.hbr
diff --git a/app/assets/javascripts/discourse/app/raw-templates/user-selector-autocomplete.hbr b/app/assets/javascripts/discourse/app/raw-templates/user-selector-autocomplete.hbr
new file mode 100644
index 00000000000..53c1ecbf7c9
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/raw-templates/user-selector-autocomplete.hbr
@@ -0,0 +1,39 @@
+<div class='autocomplete ac-user'>
+  <ul>
+    {{#each options as |item|}}
+      {{#if item.isUser}}
+        <li data-index={{item.index}}>
+          <a href title="{{item.name}}" class="{{item.cssClasses}}">
+            {{avatar item imageSize="tiny"}}
+            <span class='username'>{{format-username item.username}}</span>
+            {{#if item.name}}
+              <span class='name'>{{item.name}}</span>
+            {{/if}}
+            {{#if item.status}}
+              <span class='user-status'></span>
+            {{/if}}
+          </a>
+        </li>
+      {{/if}}
+
+      {{#if item.isEmail}}
+        <li>
+          <a href title="{{item.username}}">
+            {{d-icon 'envelope'}}
+            <span class='username'>{{format-username item.username}}</span>
+          </a>
+        </li>
+      {{/if}}
+
+      {{#if item.isGroup}}
+        <li>
+          <a href title="{{item.full_name}}">
+            {{d-icon "users"}}
+            <span class='username'>{{item.name}}</span>
+            <span class='name'>{{item.full_name}}</span>
+          </a>
+        </li>
+      {{/if}}
+    {{/each}}
+  </ul>
+</div>
diff --git a/app/assets/javascripts/discourse/app/routes/app-route-map.js b/app/assets/javascripts/discourse/app/routes/app-route-map.js
index b30a365ca68..d282ef4a188 100644
--- a/app/assets/javascripts/discourse/app/routes/app-route-map.js
+++ b/app/assets/javascripts/discourse/app/routes/app-route-map.js
@@ -52,6 +52,8 @@ export default function () {
       });
     });
 
+    this.route("filter", { path: "/filter" });
+
     this.route("categories");
 
     // default filter for a category
@@ -173,11 +175,10 @@ export default function () {
         this.route("tags");
         this.route("interface");
         this.route("apps");
-        this.route("sidebar");
+        this.route("navigation-menu");
 
         this.route("email");
         this.route("second-factor");
-        this.route("second-factor-backup");
       });
 
       this.route(
@@ -203,12 +204,14 @@ export default function () {
   this.route("associate-account", { path: "/associate/:token" });
   this.route("login-preferences");
   this.route("forgot-password", { path: "/password-reset" });
+
   this.route("faq", { path: "/faq" });
+  this.route("guidelines", { path: "/guidelines" });
+  this.route("conduct", { path: "/conduct" });
+  this.route("rules", { path: "/rules" });
+
   this.route("tos", { path: "/tos" });
   this.route("privacy", { path: "/privacy" });
-  this.route("guidelines", { path: "/guidelines" });
-  this.route("rules", { path: "/rules" });
-  this.route("conduct", { path: "/conduct" });
 
   this.route("new-topic", { path: "/new-topic" });
   this.route("new-message", { path: "/new-message" });
diff --git a/app/assets/javascripts/discourse/app/routes/application.js b/app/assets/javascripts/discourse/app/routes/application.js
index 9a9f08e9ef3..15782b806e5 100644
--- a/app/assets/javascripts/discourse/app/routes/application.js
+++ b/app/assets/javascripts/discourse/app/routes/application.js
@@ -13,6 +13,9 @@ import mobile from "discourse/lib/mobile";
 import { inject as service } from "@ember/service";
 import { setting } from "discourse/lib/computed";
 import showModal from "discourse/lib/show-modal";
+import { action } from "@ember/object";
+import KeyboardShortcutsHelp from "discourse/components/modal/keyboard-shortcuts-help";
+import NotActivatedModal from "../components/modal/not-activated";
 
 function unlessReadOnly(method, message) {
   return function () {
@@ -39,6 +42,23 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
   shortSiteDescription: setting("short_site_description"),
   documentTitle: service(),
   dialog: service(),
+  composer: service(),
+  modal: service(),
+  loadingSlider: service(),
+  router: service(),
+
+  @action
+  loading(transition) {
+    if (this.loadingSlider.enabled) {
+      this.loadingSlider.transitionStarted();
+      transition.promise.finally(() => {
+        this.loadingSlider.transitionEnded();
+      });
+      return false;
+    } else {
+      return true; // Use native ember loading implementation
+    }
+  },
 
   actions: {
     toggleAnonymous() {
@@ -72,13 +92,6 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
       this.documentTitle.setTitle(tokens.join(" - "));
     },
 
-    postWasEnqueued(details) {
-      showModal("post-enqueued", {
-        model: details,
-        title: "review.approval.title",
-      });
-    },
-
     composePrivateMessage(user, post) {
       const recipients = user ? user.get("username") : "";
       const reply = post
@@ -91,7 +104,7 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
         : null;
 
       // used only once, one less dependency
-      return this.controllerFor("composer").open({
+      return this.composer.open({
         action: Composer.PRIVATE_MESSAGE,
         recipients,
         archetypeId: "private_message",
@@ -112,7 +125,7 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
       }
 
       if (xhrOrErr && xhrOrErr.status === 404) {
-        return this.transitionTo("exception-unknown");
+        return this.router.transitionTo("exception-unknown");
       }
 
       exceptionController.setProperties({
@@ -135,15 +148,15 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
     ),
 
     showForgotPassword() {
-      this.controllerFor("forgot-password").setProperties({
+      getOwner(this).lookup("controller:forgot-password").setProperties({
         offerHelp: null,
         helpSeen: false,
       });
-      showModal("forgotPassword", { title: "forgot_password.title" });
+      showModal("forgot-password", { title: "forgot_password.title" });
     },
 
     showNotActivated(props) {
-      showModal("not-activated", { title: "log_in" }).setProperties(props);
+      this.modal.show(NotActivatedModal, { model: props });
     },
 
     showUploadSelector() {
@@ -151,51 +164,12 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
     },
 
     showKeyboardShortcutsHelp() {
-      showModal("keyboard-shortcuts-help", {
-        title: "keyboard_shortcuts_help.title",
-      });
+      this.modal.show(KeyboardShortcutsHelp);
     },
 
     // Close the current modal, and destroy its state.
     closeModal(initiatedBy) {
-      const route = getOwner(this).lookup("route:application");
-      let modalController = route.controllerFor("modal");
-      const controllerName = modalController.get("name");
-
-      if (controllerName) {
-        const controller = getOwner(this).lookup(
-          `controller:${controllerName}`
-        );
-        if (controller && controller.beforeClose) {
-          if (false === controller.beforeClose()) {
-            return;
-          }
-        }
-      }
-
-      this.render("hide-modal", { into: "modal", outlet: "modalBody" });
-
-      if (controllerName) {
-        const controller = getOwner(this).lookup(
-          `controller:${controllerName}`
-        );
-
-        if (controller) {
-          this.appEvents.trigger("modal:closed", {
-            name: controllerName,
-            controller,
-          });
-
-          if (controller.onClose) {
-            controller.onClose({
-              initiatedByCloseButton: initiatedBy === "initiatedByCloseButton",
-              initiatedByClickOut: initiatedBy === "initiatedByClickOut",
-              initiatedByESC: initiatedBy === "initiatedByESC",
-            });
-          }
-        }
-        modalController.set("name", null);
-      }
+      return this.modal.close(initiatedBy);
     },
 
     /**
@@ -204,11 +178,11 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
       user clicks "No", reopenModal. If user clicks "Yes", be sure to call closeModal.
     **/
     hideModal() {
-      $(".d-modal.fixed-modal").modal("hide");
+      return this.modal.hide();
     },
 
     reopenModal() {
-      $(".d-modal.fixed-modal").modal("show");
+      return this.modal.reopen();
     },
 
     editCategory(category) {
@@ -219,16 +193,6 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
       user.checkEmail();
     },
 
-    changeBulkTemplate(w) {
-      const controllerName = w.replace("modal/", "");
-      const controller = getOwner(this).lookup("controller:" + controllerName);
-      this.render(w, {
-        into: "modal/topic-bulk-actions",
-        outlet: "bulkOutlet",
-        controller: controller ? controllerName : "topic-bulk-actions",
-      });
-    },
-
     createNewTopicViaParams(title, body, category_id, tags) {
       this.openComposerWithTopicParams(
         this.controllerFor("discovery/topics"),
@@ -240,7 +204,7 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
     },
 
     createNewMessageViaParams({
-      recipients = [],
+      recipients = "",
       topicTitle = "",
       topicBody = "",
       hasGroups = false,
@@ -254,20 +218,13 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
     },
   },
 
-  renderTemplate() {
-    this.render("application");
-    this.render("user-card", { into: "application", outlet: "user-card" });
-    this.render("modal", { into: "application", outlet: "modal" });
-    this.render("composer", { into: "application", outlet: "composer" });
-  },
-
   handleShowLogin() {
     if (this.siteSettings.enable_discourse_connect) {
       const returnPath = encodeURIComponent(window.location.pathname);
       window.location = getURL("/session/sso?return_path=" + returnPath);
     } else {
-      this._autoLogin("login", "login-modal", {
-        notAuto: () => this.controllerFor("login").resetForm(),
+      this._autoLogin("login", {
+        notAuto: () => getOwner(this).lookup("controller:login").resetForm(),
       });
     }
   },
@@ -277,7 +234,8 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
       const returnPath = encodeURIComponent(window.location.pathname);
       window.location = getURL("/session/sso?return_path=" + returnPath);
     } else {
-      this._autoLogin("createAccount", "create-account", {
+      this._autoLogin("create-account", {
+        modalClass: "create-account",
         signup: true,
         titleAriaElementId: "create-account-title",
       });
@@ -286,21 +244,24 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
 
   _autoLogin(
     modal,
-    modalClass,
-    { notAuto = null, signup = false, titleAriaElementId = null } = {}
+    {
+      modalClass = undefined,
+      notAuto = null,
+      signup = false,
+      titleAriaElementId = null,
+    } = {}
   ) {
     const methods = findAll();
 
     if (!this.siteSettings.enable_local_logins && methods.length === 1) {
-      this.controllerFor("login").send("externalLogin", methods[0], {
-        signup,
-      });
+      getOwner(this)
+        .lookup("controller:login")
+        .send("externalLogin", methods[0], {
+          signup,
+        });
     } else {
-      showModal(modal, { titleAriaElementId });
-      this.controllerFor("modal").set("modalClass", modalClass);
-      if (notAuto) {
-        notAuto();
-      }
+      showModal(modal, { modalClass, titleAriaElementId });
+      notAuto?.();
     }
   },
 
diff --git a/app/assets/javascripts/discourse/app/routes/build-admin-user-posts-route.js b/app/assets/javascripts/discourse/app/routes/build-admin-user-posts-route.js
deleted file mode 100644
index ab2756565bb..00000000000
--- a/app/assets/javascripts/discourse/app/routes/build-admin-user-posts-route.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import DiscourseRoute from "discourse/routes/discourse";
-import { emojiUnescape } from "discourse/lib/text";
-import { escapeExpression } from "discourse/lib/utilities";
-import { action } from "@ember/object";
-
-export default function (filter) {
-  return DiscourseRoute.extend({
-    @action
-    didTransition() {
-      this.controllerFor("user-posts")._showFooter();
-      return true;
-    },
-
-    model() {
-      return this.modelFor("user").get("postsStream");
-    },
-
-    afterModel(model) {
-      return model.filterBy({ filter });
-    },
-
-    setupController(controller, model) {
-      // initialize "canLoadMore"
-      model.set("canLoadMore", model.get("itemsLoaded") === 60);
-
-      model.get("content").forEach((item) => {
-        if (item.get("title")) {
-          item.set("title", emojiUnescape(escapeExpression(item.title)));
-        }
-      });
-
-      this.controllerFor("user-posts").set("model", model);
-    },
-
-    renderTemplate() {
-      this.render("user/posts");
-    },
-  });
-}
diff --git a/app/assets/javascripts/discourse/app/routes/build-category-route.js b/app/assets/javascripts/discourse/app/routes/build-category-route.js
index 74e17b9b3e4..0cee1a6a0c3 100644
--- a/app/assets/javascripts/discourse/app/routes/build-category-route.js
+++ b/app/assets/javascripts/discourse/app/routes/build-category-route.js
@@ -15,11 +15,14 @@ import I18n from "I18n";
 import PermissionType from "discourse/models/permission-type";
 import TopicList from "discourse/models/topic-list";
 import { action } from "@ember/object";
+import PreloadStore from "discourse/lib/preload-store";
+import { inject as service } from "@ember/service";
 
 // A helper function to create a category route with parameters
 export default (filterArg, params) => {
   return DiscourseRoute.extend({
     queryParams,
+    composer: service(),
 
     model(modelParams) {
       const category = Category.findBySlugPathWithID(
@@ -59,10 +62,12 @@ export default (filterArg, params) => {
         filterArg === "default" &&
         modelParams
       ) {
-        return this.replaceWith("discovery.categoryNone", {
-          category,
-          category_slug_path_with_id: modelParams.category_slug_path_with_id,
-        });
+        // TODO: avoid throwing away preload data by redirecting on the server
+        PreloadStore.getAndRemove("topic_list");
+        return this.replaceWith(
+          "discovery.categoryNone",
+          modelParams.category_slug_path_with_id
+        );
       }
 
       this._setupNavigation(category);
@@ -148,14 +153,31 @@ export default (filterArg, params) => {
     setupController(controller, model) {
       const topics = this.topics,
         category = model.category,
-        canCreateTopic = topics.get("can_create_topic"),
-        canCreateTopicOnCategory =
-          canCreateTopic && category.get("permission") === PermissionType.FULL;
+        canCreateTopic = topics.get("can_create_topic");
+
+      let canCreateTopicOnCategory =
+        canCreateTopic && category.get("permission") === PermissionType.FULL;
+      let cannotCreateTopicOnCategory = !canCreateTopicOnCategory;
+      let defaultSubcategory;
+      let canCreateTopicOnSubCategory;
+
+      if (this.siteSettings.default_subcategory_on_read_only_category) {
+        cannotCreateTopicOnCategory = false;
+
+        if (!canCreateTopicOnCategory && category.subcategories) {
+          defaultSubcategory = category.subcategories.find((subcategory) => {
+            return subcategory.get("permission") === PermissionType.FULL;
+          });
+          canCreateTopicOnSubCategory = !!defaultSubcategory;
+        }
+      }
 
       this.controllerFor("navigation/category").setProperties({
         canCreateTopicOnCategory,
-        cannotCreateTopicOnCategory: !canCreateTopicOnCategory,
+        cannotCreateTopicOnCategory,
         canCreateTopic,
+        canCreateTopicOnSubCategory,
+        defaultSubcategory,
       });
 
       let topicOpts = {
@@ -169,6 +191,8 @@ export default (filterArg, params) => {
         expandAllPinned: true,
         canCreateTopic,
         canCreateTopicOnCategory,
+        canCreateTopicOnSubCategory,
+        defaultSubcategory,
       };
 
       const p = category.get("params");
@@ -182,7 +206,7 @@ export default (filterArg, params) => {
       }
 
       this.controllerFor("discovery/topics").setProperties(topicOpts);
-      this.searchService.set("searchContext", category.get("searchContext"));
+      this.searchService.searchContext = category.get("searchContext");
       this.set("topics", null);
     },
 
@@ -206,8 +230,8 @@ export default (filterArg, params) => {
     deactivate() {
       this._super(...arguments);
 
-      this.controllerFor("composer").set("prioritizedCategoryId", null);
-      this.searchService.set("searchContext", null);
+      this.composer.set("prioritizedCategoryId", null);
+      this.searchService.searchContext = null;
     },
 
     @action
diff --git a/app/assets/javascripts/discourse/app/routes/build-group-messages-route.js b/app/assets/javascripts/discourse/app/routes/build-group-messages-route.js
index c366a4eb830..0ab0990f531 100644
--- a/app/assets/javascripts/discourse/app/routes/build-group-messages-route.js
+++ b/app/assets/javascripts/discourse/app/routes/build-group-messages-route.js
@@ -39,12 +39,11 @@ export default (type) => {
         showPosters: true,
       });
 
-      const currentUser = this.currentUser;
-      this.searchService.set("searchContext", {
+      this.searchService.searchContext = {
         type: "private_messages",
-        id: currentUser.get("username_lower"),
-        user: currentUser,
-      });
+        id: this.currentUser.get("username_lower"),
+        user: this.currentUser,
+      };
     },
 
     emptyState() {
@@ -59,7 +58,7 @@ export default (type) => {
     },
 
     deactivate() {
-      this.searchService.set("searchContext", null);
+      this.searchService.searchContext = null;
     },
   });
 };
diff --git a/app/assets/javascripts/discourse/app/routes/build-private-messages-group-route.js b/app/assets/javascripts/discourse/app/routes/build-private-messages-group-route.js
index 555dcb29fd1..98d19ac1fd8 100644
--- a/app/assets/javascripts/discourse/app/routes/build-private-messages-group-route.js
+++ b/app/assets/javascripts/discourse/app/routes/build-private-messages-group-route.js
@@ -23,7 +23,7 @@ export default (inboxType, filter) => {
 
     model() {
       const username = this.modelFor("user").get("username_lower");
-      const groupName = this.modelFor("userPrivateMessages.group");
+      const groupName = this.modelFor("userPrivateMessages.group").name;
 
       let topicListFilter = `topics/private-messages-group/${username}/${groupName}`;
 
@@ -60,9 +60,7 @@ export default (inboxType, filter) => {
         groupName = filters.pop();
       }
 
-      const group = this.modelFor("user")
-        .get("groups")
-        .filterBy("name", groupName)[0];
+      const group = this.modelFor("userPrivateMessages.group");
 
       this.setProperties({ groupName, group });
     },
diff --git a/app/assets/javascripts/discourse/app/routes/build-private-messages-route.js b/app/assets/javascripts/discourse/app/routes/build-private-messages-route.js
index 200f5a57569..598647bf080 100644
--- a/app/assets/javascripts/discourse/app/routes/build-private-messages-route.js
+++ b/app/assets/javascripts/discourse/app/routes/build-private-messages-route.js
@@ -80,7 +80,16 @@ export default (inboxType, path, filter) => {
         group: null,
       });
 
-      this.searchService.set("contextType", "private_messages");
+      // Private messages don't have a unique search context instead
+      // it is built upon the user search context and then tweaks the `type`.
+      // Since this is the only model in which we set a custom `type` we don't
+      // want to create a stand-alone `setSearchType` on the search service so
+      // we can instead explicitly set the search context and pass in the `type`
+      const pmSearchContext = {
+        ...this.controllerFor("user").get("model.searchContext"),
+        type: "private_messages",
+      };
+      this.searchService.searchContext = pmSearchContext;
     },
 
     emptyState() {
@@ -97,9 +106,8 @@ export default (inboxType, path, filter) => {
     deactivate() {
       this.controllerFor("user-topics-list").unsubscribe();
 
-      this.searchService.set(
-        "searchContext",
-        this.controllerFor("user").get("model.searchContext")
+      this.searchService.searchContext = this.controllerFor("user").get(
+        "model.searchContext"
       );
     },
 
diff --git a/app/assets/javascripts/discourse/app/routes/build-static-route.js b/app/assets/javascripts/discourse/app/routes/build-static-route.js
deleted file mode 100644
index 7878c94fa34..00000000000
--- a/app/assets/javascripts/discourse/app/routes/build-static-route.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import DiscourseRoute from "discourse/routes/discourse";
-import StaticPage from "discourse/models/static-page";
-
-export default function (pageName) {
-  const route = {
-    model() {
-      return StaticPage.find(pageName);
-    },
-
-    renderTemplate() {
-      this.render("static");
-    },
-
-    setupController(controller, model) {
-      this.controllerFor("static").set("model", model);
-    },
-  };
-  return DiscourseRoute.extend(route);
-}
diff --git a/app/assets/javascripts/discourse/app/routes/build-topic-route.js b/app/assets/javascripts/discourse/app/routes/build-topic-route.js
index 4717641724e..ae18ee2b867 100644
--- a/app/assets/javascripts/discourse/app/routes/build-topic-route.js
+++ b/app/assets/javascripts/discourse/app/routes/build-topic-route.js
@@ -56,7 +56,7 @@ async function findTopicList(
     session.set("topicList", null);
   } else {
     // Clear the cache
-    session.setProperties({ topicList: null, topicListScrollPosition: null });
+    session.setProperties({ topicList: null });
   }
 
   if (!list) {
@@ -146,6 +146,7 @@ export default function (filter, extras) {
         };
 
         this.controllerFor("discovery/topics").setProperties(topicOpts);
+
         this.controllerFor("navigation/default").set(
           "canCreateTopic",
           model.get("can_create_topic")
@@ -154,6 +155,7 @@ export default function (filter, extras) {
 
       renderTemplate() {
         this.render("navigation/default", { outlet: "navigation-bar" });
+
         this.render("discovery/topics", {
           controller: "discovery/topics",
           outlet: "list-container",
diff --git a/app/assets/javascripts/discourse/app/routes/conduct.js b/app/assets/javascripts/discourse/app/routes/conduct.js
index c3eb7577120..81cb015cbe7 100644
--- a/app/assets/javascripts/discourse/app/routes/conduct.js
+++ b/app/assets/javascripts/discourse/app/routes/conduct.js
@@ -1,3 +1,6 @@
-import staticRouteBuilder from "discourse/lib/static-route-builder";
+import FaqRoute from "./faq";
 
-export default staticRouteBuilder("conduct");
+// Conduct is effectively a faq alias
+export default class ConductRoute extends FaqRoute {
+  pageId = "conduct";
+}
diff --git a/app/assets/javascripts/discourse/app/routes/discourse.js b/app/assets/javascripts/discourse/app/routes/discourse.js
index fc9792da024..da07704a23c 100644
--- a/app/assets/javascripts/discourse/app/routes/discourse.js
+++ b/app/assets/javascripts/discourse/app/routes/discourse.js
@@ -3,6 +3,7 @@ import Draft from "discourse/models/draft";
 import Route from "@ember/routing/route";
 import { once } from "@ember/runloop";
 import { seenUser } from "discourse/lib/user-presence";
+import { getOwner } from "discourse-common/lib/get-owner";
 
 const DiscourseRoute = Route.extend({
   showFooter: false,
@@ -53,7 +54,7 @@ const DiscourseRoute = Route.extend({
   },
 
   openTopicDraft() {
-    const composer = this.controllerFor("composer");
+    const composer = getOwner(this).lookup("service:composer");
 
     if (
       composer.get("model.action") === Composer.CREATE_TOPIC &&
@@ -74,15 +75,6 @@ const DiscourseRoute = Route.extend({
     }
   },
 
-  // deprecated, use isCurrentUser() instead
-  isAnotherUsersPage(user) {
-    if (!this.currentUser) {
-      return true;
-    }
-
-    return user.username !== this.currentUser.username;
-  },
-
   isCurrentUser(user) {
     if (!this.currentUser) {
       return false; // the current user is anonymous
diff --git a/app/assets/javascripts/discourse/app/routes/discovery-categories.js b/app/assets/javascripts/discourse/app/routes/discovery-categories.js
index 1bbb16c2cba..572d57c7f62 100644
--- a/app/assets/javascripts/discourse/app/routes/discovery-categories.js
+++ b/app/assets/javascripts/discourse/app/routes/discovery-categories.js
@@ -10,10 +10,12 @@ import { defaultHomepage } from "discourse/lib/utilities";
 import { hash } from "rsvp";
 import { next } from "@ember/runloop";
 import showModal from "discourse/lib/show-modal";
-import getURL from "discourse-common/lib/get-url";
 import Session from "discourse/models/session";
+import { inject as service } from "@ember/service";
 
 const DiscoveryCategoriesRoute = DiscourseRoute.extend(OpenComposer, {
+  router: service(),
+
   renderTemplate() {
     this.render("navigation/categories", { outlet: "navigation-bar" });
     this.render("discovery/categories", { outlet: "list-container" });
@@ -57,7 +59,7 @@ const DiscoveryCategoriesRoute = DiscourseRoute.extend(OpenComposer, {
         this.topics.filter((topic) => topic_ids.includes(topic.id))
       );
 
-      const url = `${getURL("/")}latest.json?topic_ids=${topic_ids.join(",")}`;
+      const url = `/latest.json?topic_ids=${topic_ids.join(",")}`;
 
       return ajax({ url, data: this.params }).then((result) => {
         const topicIds = new Set();
@@ -145,12 +147,12 @@ const DiscoveryCategoriesRoute = DiscourseRoute.extend(OpenComposer, {
 
   @action
   createCategory() {
-    this.transitionTo("newCategory");
+    this.router.transitionTo("newCategory");
   },
 
   @action
   reorderCategories() {
-    showModal("reorderCategories");
+    showModal("reorder-categories");
   },
 
   @action
diff --git a/app/assets/javascripts/discourse/app/routes/discovery-filter.js b/app/assets/javascripts/discourse/app/routes/discovery-filter.js
new file mode 100644
index 00000000000..17812785574
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/routes/discovery-filter.js
@@ -0,0 +1,40 @@
+import I18n from "I18n";
+
+import DiscourseRoute from "discourse/routes/discourse";
+import { action } from "@ember/object";
+
+export default class extends DiscourseRoute {
+  queryParams = {
+    q: { replace: true, refreshModel: true },
+  };
+
+  model(data) {
+    return this.store.findFiltered("topicList", {
+      filter: "filter",
+      params: { q: data.q },
+    });
+  }
+
+  titleToken() {
+    const filterText = I18n.t("filters.filter.title");
+    return I18n.t("filters.with_topics", { filter: filterText });
+  }
+
+  setupController(_controller, model) {
+    this.controllerFor("discovery/topics").setProperties({ model });
+  }
+
+  renderTemplate() {
+    this.render("navigation/filter", { outlet: "navigation-bar" });
+
+    this.render("discovery/topics", {
+      controller: "discovery/topics",
+      outlet: "list-container",
+    });
+  }
+
+  // TODO(tgxworld): This action is required by the `discovery/topics` controller which is not necessary for this route.
+  // Figure out a way to remove this.
+  @action
+  changeSort() {}
+}
diff --git a/app/assets/javascripts/discourse/app/routes/discovery.js b/app/assets/javascripts/discourse/app/routes/discovery.js
index 1951755782f..0434c228178 100644
--- a/app/assets/javascripts/discourse/app/routes/discovery.js
+++ b/app/assets/javascripts/discourse/app/routes/discovery.js
@@ -5,9 +5,9 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import OpenComposer from "discourse/mixins/open-composer";
 import User from "discourse/models/user";
-import { scrollTop } from "discourse/mixins/scroll-top";
 import { setTopicList } from "discourse/lib/topic-list-tracker";
 import { action } from "@ember/object";
+import { resetCachedTopicList } from "discourse/lib/cached-topic-list";
 
 export default DiscourseRoute.extend(OpenComposer, {
   queryParams: {
@@ -56,9 +56,6 @@ export default DiscourseRoute.extend(OpenComposer, {
   @action
   loadingComplete() {
     this.controllerFor("discovery").loadingComplete();
-    if (!this.session.get("topicListScrollPosition")) {
-      scrollTop();
-    }
   },
 
   @action
@@ -98,4 +95,14 @@ export default DiscourseRoute.extend(OpenComposer, {
       includeSubcategories: !controller.noSubcategories,
     });
   },
+
+  refresh() {
+    resetCachedTopicList(this.session);
+    this._super();
+  },
+
+  @action
+  triggerRefresh() {
+    this.refresh();
+  },
 });
diff --git a/app/assets/javascripts/discourse/app/routes/exception-unknown.js b/app/assets/javascripts/discourse/app/routes/exception-unknown.js
index e1001b47cbc..d223a1aab25 100644
--- a/app/assets/javascripts/discourse/app/routes/exception-unknown.js
+++ b/app/assets/javascripts/discourse/app/routes/exception-unknown.js
@@ -1,7 +1,5 @@
 import UnknownRoute from "discourse/routes/unknown";
 
 export default UnknownRoute.extend({
-  renderTemplate() {
-    this.render("unknown");
-  },
+  templateName: "unknown",
 });
diff --git a/app/assets/javascripts/discourse/app/routes/faq.js b/app/assets/javascripts/discourse/app/routes/faq.js
index d1726ef6c2b..34c54a719f7 100644
--- a/app/assets/javascripts/discourse/app/routes/faq.js
+++ b/app/assets/javascripts/discourse/app/routes/faq.js
@@ -1,3 +1,39 @@
-import staticRouteBuilder from "discourse/lib/static-route-builder";
+import DiscourseRoute from "discourse/routes/discourse";
+import { inject as service } from "@ember/service";
+import DiscourseURL from "discourse/lib/url";
+import StaticPage from "discourse/models/static-page";
+import I18n from "I18n";
+import { action } from "@ember/object";
 
-export default staticRouteBuilder("faq");
+export default class FaqRoute extends DiscourseRoute {
+  @service siteSettings;
+
+  pageId = "faq";
+  templateName = "faq";
+
+  activate() {
+    super.activate(...arguments);
+    DiscourseURL.jumpToElement(document.location.hash.slice(1));
+  }
+
+  beforeModel(transition) {
+    if (this.pageId === "faq" && this.siteSettings.faq_url) {
+      transition.abort();
+      DiscourseURL.redirectTo(this.siteSettings.faq_url);
+    }
+  }
+
+  model() {
+    return StaticPage.find(this.pageId);
+  }
+
+  titleToken() {
+    return I18n.t(this.pageId);
+  }
+
+  @action
+  didTransition() {
+    this.controllerFor("application").set("showFooter", true);
+    return true;
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/routes/forgot-password.js b/app/assets/javascripts/discourse/app/routes/forgot-password.js
index ddddb138dce..f07d8b0e120 100644
--- a/app/assets/javascripts/discourse/app/routes/forgot-password.js
+++ b/app/assets/javascripts/discourse/app/routes/forgot-password.js
@@ -1,19 +1,15 @@
-import buildStaticRoute from "discourse/routes/build-static-route";
+import DiscourseRoute from "discourse/routes/discourse";
 import { defaultHomepage } from "discourse/lib/utilities";
 import { next } from "@ember/runloop";
 
-const ForgotPasswordRoute = buildStaticRoute("password-reset");
+export default class ForgotPasswordRoute extends DiscourseRoute {
+  async beforeModel() {
+    const { loginRequired } = this.controllerFor("application");
 
-ForgotPasswordRoute.reopen({
-  beforeModel() {
-    const loginRequired =
-      this.controllerFor("application").get("loginRequired");
-    this.replaceWith(
+    const e = await this.replaceWith(
       loginRequired ? "login" : `discovery.${defaultHomepage()}`
-    ).then((e) => {
-      next(() => e.send("showForgotPassword"));
-    });
-  },
-});
+    );
 
-export default ForgotPasswordRoute;
+    next(() => e.send("showForgotPassword"));
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/routes/group-activity-index.js b/app/assets/javascripts/discourse/app/routes/group-activity-index.js
index 82d2e7d33b4..c1d686d1a95 100644
--- a/app/assets/javascripts/discourse/app/routes/group-activity-index.js
+++ b/app/assets/javascripts/discourse/app/routes/group-activity-index.js
@@ -1,12 +1,15 @@
 import Route from "@ember/routing/route";
+import { inject as service } from "@ember/service";
 
 export default Route.extend({
+  router: service(),
+
   beforeModel() {
     const group = this.modelFor("group");
     if (group.can_see_members) {
-      this.transitionTo("group.activity.posts");
+      this.router.transitionTo("group.activity.posts");
     } else {
-      this.transitionTo("group.activity.mentions");
+      this.router.transitionTo("group.activity.mentions");
     }
   },
 });
diff --git a/app/assets/javascripts/discourse/app/routes/group-activity-posts.js b/app/assets/javascripts/discourse/app/routes/group-activity-posts.js
index dddbc26f876..925368a0658 100644
--- a/app/assets/javascripts/discourse/app/routes/group-activity-posts.js
+++ b/app/assets/javascripts/discourse/app/routes/group-activity-posts.js
@@ -5,6 +5,8 @@ import { action, get } from "@ember/object";
 export function buildGroupPage(type) {
   return DiscourseRoute.extend({
     type,
+    templateName: "group-activity-posts",
+    controllerName: "group-activity-posts",
 
     titleToken() {
       return I18n.t(`groups.${type}`);
@@ -17,7 +19,7 @@ export function buildGroupPage(type) {
 
     setupController(controller, model) {
       let loadedAll = model.length < 20;
-      this.controllerFor("group-activity-posts").setProperties({
+      controller.setProperties({
         model,
         type,
         canLoadMore: !loadedAll,
@@ -25,10 +27,6 @@ export function buildGroupPage(type) {
       this.controllerFor("application").set("showFooter", loadedAll);
     },
 
-    renderTemplate() {
-      this.render("group-activity-posts");
-    },
-
     @action
     didTransition() {
       return true;
diff --git a/app/assets/javascripts/discourse/app/routes/group-index.js b/app/assets/javascripts/discourse/app/routes/group-index.js
index c1286780900..a5640ea5f26 100644
--- a/app/assets/javascripts/discourse/app/routes/group-index.js
+++ b/app/assets/javascripts/discourse/app/routes/group-index.js
@@ -2,8 +2,12 @@ import DiscourseRoute from "discourse/routes/discourse";
 import I18n from "I18n";
 import { action } from "@ember/object";
 import showModal from "discourse/lib/show-modal";
+import { inject as service } from "@ember/service";
+import GroupAddMembersModal from "discourse/components/modal/group-add-members";
 
 export default DiscourseRoute.extend({
+  modal: service(),
+
   titleToken() {
     return I18n.t("groups.members.title");
   },
@@ -25,7 +29,7 @@ export default DiscourseRoute.extend({
 
   @action
   showAddMembersModal() {
-    showModal("group-add-members", { model: this.modelFor("group") });
+    this.modal.show(GroupAddMembersModal, { model: this.modelFor("group") });
   },
 
   @action
diff --git a/app/assets/javascripts/discourse/app/routes/group-manage-email.js b/app/assets/javascripts/discourse/app/routes/group-manage-email.js
index 5f8a26e43b7..0ede9ea9840 100644
--- a/app/assets/javascripts/discourse/app/routes/group-manage-email.js
+++ b/app/assets/javascripts/discourse/app/routes/group-manage-email.js
@@ -1,13 +1,15 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import I18n from "I18n";
+import { inject as service } from "@ember/service";
 
 export default DiscourseRoute.extend({
+  router: service(),
   showFooter: true,
 
   beforeModel() {
     // cannot configure IMAP without SMTP being enabled
     if (!this.siteSettings.enable_smtp) {
-      return this.transitionTo("group.manage.profile");
+      return this.router.transitionTo("group.manage.profile");
     }
   },
 
diff --git a/app/assets/javascripts/discourse/app/routes/group-manage-index.js b/app/assets/javascripts/discourse/app/routes/group-manage-index.js
index 8a44d0ab7b2..0376b77e2d0 100644
--- a/app/assets/javascripts/discourse/app/routes/group-manage-index.js
+++ b/app/assets/javascripts/discourse/app/routes/group-manage-index.js
@@ -1,9 +1,11 @@
 import DiscourseRoute from "discourse/routes/discourse";
+import { inject as service } from "@ember/service";
 
 export default DiscourseRoute.extend({
+  router: service(),
   showFooter: true,
 
   beforeModel() {
-    this.transitionTo("group.manage.profile");
+    this.router.transitionTo("group.manage.profile");
   },
 });
diff --git a/app/assets/javascripts/discourse/app/routes/group-manage.js b/app/assets/javascripts/discourse/app/routes/group-manage.js
index db7ef9a8bcb..399a0a5e61b 100644
--- a/app/assets/javascripts/discourse/app/routes/group-manage.js
+++ b/app/assets/javascripts/discourse/app/routes/group-manage.js
@@ -1,7 +1,9 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import I18n from "I18n";
+import { inject as service } from "@ember/service";
 
 export default DiscourseRoute.extend({
+  router: service(),
   showFooter: true,
 
   titleToken() {
@@ -18,7 +20,7 @@ export default DiscourseRoute.extend({
       (!(this.modelFor("group").can_admin_group && group.get("automatic")) &&
         !this.currentUser.canManageGroup(group))
     ) {
-      this.transitionTo("group.members", group);
+      this.router.transitionTo("group.members", group);
     }
   },
 
diff --git a/app/assets/javascripts/discourse/app/routes/group-members.js b/app/assets/javascripts/discourse/app/routes/group-members.js
index 643e925f747..1fff7e2812b 100644
--- a/app/assets/javascripts/discourse/app/routes/group-members.js
+++ b/app/assets/javascripts/discourse/app/routes/group-members.js
@@ -1,7 +1,10 @@
 import DiscourseRoute from "discourse/routes/discourse";
+import { inject as service } from "@ember/service";
 
 export default DiscourseRoute.extend({
+  router: service(),
+
   beforeModel() {
-    this.transitionTo("group.index");
+    this.router.transitionTo("group.index");
   },
 });
diff --git a/app/assets/javascripts/discourse/app/routes/group-messages-index.js b/app/assets/javascripts/discourse/app/routes/group-messages-index.js
index c5630cc1088..8f473ad3da7 100644
--- a/app/assets/javascripts/discourse/app/routes/group-messages-index.js
+++ b/app/assets/javascripts/discourse/app/routes/group-messages-index.js
@@ -1,6 +1,10 @@
 import Route from "@ember/routing/route";
+import { inject as service } from "@ember/service";
+
 export default Route.extend({
+  router: service(),
+
   beforeModel() {
-    this.transitionTo("group.messages.inbox");
+    this.router.transitionTo("group.messages.inbox");
   },
 });
diff --git a/app/assets/javascripts/discourse/app/routes/group-messages.js b/app/assets/javascripts/discourse/app/routes/group-messages.js
index bbf8cb990a3..3c457fde640 100644
--- a/app/assets/javascripts/discourse/app/routes/group-messages.js
+++ b/app/assets/javascripts/discourse/app/routes/group-messages.js
@@ -1,8 +1,11 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import I18n from "I18n";
 import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
 
 export default DiscourseRoute.extend({
+  router: service(),
+
   titleToken() {
     return I18n.t("groups.messages");
   },
@@ -16,7 +19,7 @@ export default DiscourseRoute.extend({
       !group.get("is_group_user") &&
       !(this.currentUser && this.currentUser.admin)
     ) {
-      this.transitionTo("group.members", group);
+      this.router.transitionTo("group.members", group);
     }
   },
 
diff --git a/app/assets/javascripts/discourse/app/routes/group-permissions.js b/app/assets/javascripts/discourse/app/routes/group-permissions.js
index 82ba93cac92..5984360c527 100644
--- a/app/assets/javascripts/discourse/app/routes/group-permissions.js
+++ b/app/assets/javascripts/discourse/app/routes/group-permissions.js
@@ -2,8 +2,10 @@ import DiscourseRoute from "discourse/routes/discourse";
 import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
 import { buildPermissionDescription } from "discourse/models/permission-type";
+import { inject as service } from "@ember/service";
 
 export default DiscourseRoute.extend({
+  router: service(),
   showFooter: true,
 
   titleToken() {
@@ -23,7 +25,7 @@ export default DiscourseRoute.extend({
         return { permissions };
       })
       .catch(() => {
-        this.transitionTo("group.members", group);
+        this.router.transitionTo("group.members", group);
       });
   },
 
diff --git a/app/assets/javascripts/discourse/app/routes/groups-new.js b/app/assets/javascripts/discourse/app/routes/groups-new.js
index 810b31f26d1..6800426e928 100644
--- a/app/assets/javascripts/discourse/app/routes/groups-new.js
+++ b/app/assets/javascripts/discourse/app/routes/groups-new.js
@@ -1,8 +1,10 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import Group from "discourse/models/group";
 import I18n from "I18n";
+import { inject as service } from "@ember/service";
 
 export default DiscourseRoute.extend({
+  router: service(),
   showFooter: true,
 
   titleToken() {
@@ -23,7 +25,7 @@ export default DiscourseRoute.extend({
 
   afterModel() {
     if (!this.get("currentUser.can_create_group")) {
-      this.transitionTo("groups");
+      this.router.transitionTo("groups");
     }
   },
 });
diff --git a/app/assets/javascripts/discourse/app/routes/guidelines.js b/app/assets/javascripts/discourse/app/routes/guidelines.js
index dae2ffd72d8..aa6abcc6782 100644
--- a/app/assets/javascripts/discourse/app/routes/guidelines.js
+++ b/app/assets/javascripts/discourse/app/routes/guidelines.js
@@ -1,3 +1,6 @@
-import staticRouteBuilder from "discourse/lib/static-route-builder";
+import FaqRoute from "./faq";
 
-export default staticRouteBuilder("guidelines");
+// Guidelines is a faq alias
+export default class GuidelinesRoute extends FaqRoute {
+  pageId = "guidelines";
+}
diff --git a/app/assets/javascripts/discourse/app/routes/invites-show.js b/app/assets/javascripts/discourse/app/routes/invites-show.js
index 7a044a0e373..e9ba6340070 100644
--- a/app/assets/javascripts/discourse/app/routes/invites-show.js
+++ b/app/assets/javascripts/discourse/app/routes/invites-show.js
@@ -2,8 +2,9 @@ import DiscourseRoute from "discourse/routes/discourse";
 import I18n from "I18n";
 import PreloadStore from "discourse/lib/preload-store";
 import { deepMerge } from "discourse-common/lib/object";
+import DisableSidebar from "discourse/mixins/disable-sidebar";
 
-export default DiscourseRoute.extend({
+export default DiscourseRoute.extend(DisableSidebar, {
   titleToken() {
     return I18n.t("invites.accept_title");
   },
@@ -18,6 +19,22 @@ export default DiscourseRoute.extend({
     }
   },
 
+  activate() {
+    this._super(...arguments);
+
+    this.controllerFor("application").setProperties({
+      showSiteHeader: false,
+    });
+  },
+
+  deactivate() {
+    this._super(...arguments);
+
+    this.controllerFor("application").setProperties({
+      showSiteHeader: true,
+    });
+  },
+
   setupController(controller, model) {
     this._super(...arguments);
 
diff --git a/app/assets/javascripts/discourse/app/routes/login.js b/app/assets/javascripts/discourse/app/routes/login.js
index bc6766c1a36..a8c4788e562 100644
--- a/app/assets/javascripts/discourse/app/routes/login.js
+++ b/app/assets/javascripts/discourse/app/routes/login.js
@@ -1,17 +1,25 @@
-import buildStaticRoute from "discourse/routes/build-static-route";
+import DiscourseRoute from "discourse/routes/discourse";
+import { inject as service } from "@ember/service";
 import { defaultHomepage } from "discourse/lib/utilities";
 import { next } from "@ember/runloop";
+import StaticPage from "discourse/models/static-page";
 
-const LoginRoute = buildStaticRoute("login");
+export default class LoginRoute extends DiscourseRoute {
+  @service siteSettings;
+
+  // `login-page` because `login` controller is the one for
+  // the login modal
+  controllerName = "login-page";
 
-LoginRoute.reopen({
   beforeModel() {
     if (!this.siteSettings.login_required) {
       this.replaceWith(`/${defaultHomepage()}`).then((e) => {
         next(() => e.send("showLogin"));
       });
     }
-  },
-});
+  }
 
-export default LoginRoute;
+  model() {
+    return StaticPage.find("login");
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/routes/new-category.js b/app/assets/javascripts/discourse/app/routes/new-category.js
index d9888391584..f9244c28dce 100644
--- a/app/assets/javascripts/discourse/app/routes/new-category.js
+++ b/app/assets/javascripts/discourse/app/routes/new-category.js
@@ -3,8 +3,8 @@ import I18n from "I18n";
 import { Promise } from "rsvp";
 import { SEARCH_PRIORITIES } from "discourse/lib/constants";
 
-let _newCategoryColor = "0088CC",
-  _newCategoryTextColor = "FFFFFF";
+let _newCategoryColor = "0088CC";
+let _newCategoryTextColor = "FFFFFF";
 
 export function setNewCategoryDefaultColors(backgroundColor, textColor) {
   _newCategoryColor = backgroundColor;
@@ -12,6 +12,24 @@ export function setNewCategoryDefaultColors(backgroundColor, textColor) {
 }
 
 export default DiscourseRoute.extend({
+  controllerName: "edit-category-tabs",
+  templateName: "edit-category-tabs",
+
+  beforeModel() {
+    if (!this.currentUser) {
+      this.replaceWith("/404");
+      return;
+    }
+    if (!this.currentUser.admin) {
+      if (
+        !this.currentUser.moderator ||
+        this.siteSettings.moderators_manage_categories_and_groups === false
+      ) {
+        this.replaceWith("/404");
+      }
+    }
+  },
+
   model() {
     return Promise.resolve(this.groupPermissions())
       .then((permissions) => {
@@ -31,7 +49,10 @@ export default DiscourseRoute.extend({
       allow_badges: true,
       topic_featured_link_allowed: true,
       custom_fields: {},
+      category_setting: {},
       search_priority: SEARCH_PRIORITIES.normal,
+      required_tag_groups: [],
+      form_template_ids: [],
     });
   },
 
@@ -53,11 +74,4 @@ export default DiscourseRoute.extend({
       },
     ];
   },
-
-  renderTemplate() {
-    this.render("edit-category-tabs", {
-      controller: "edit-category-tabs",
-      model: this.currentModel,
-    });
-  },
 });
diff --git a/app/assets/javascripts/discourse/app/routes/new-topic.js b/app/assets/javascripts/discourse/app/routes/new-topic.js
index abf30681a7c..f66848f90b9 100644
--- a/app/assets/javascripts/discourse/app/routes/new-topic.js
+++ b/app/assets/javascripts/discourse/app/routes/new-topic.js
@@ -43,11 +43,16 @@ export default DiscourseRoute.extend({
           }
         });
       } else {
-        this.replaceWith("discovery.latest").then((e) => {
-          if (this.controllerFor("navigation/default").canCreateTopic) {
-            this._sendTransition(e, transition);
-          }
-        });
+        if (transition.from) {
+          transition.abort();
+          this.send("createNewTopicViaParams");
+        } else {
+          this.replaceWith("discovery.latest").then((e) => {
+            if (this.controllerFor("navigation/default").canCreateTopic) {
+              this._sendTransition(e, transition);
+            }
+          });
+        }
       }
     } else {
       // User is not logged in
diff --git a/app/assets/javascripts/discourse/app/routes/preferences-account.js b/app/assets/javascripts/discourse/app/routes/preferences-account.js
index e7516e2f208..032ef98f34e 100644
--- a/app/assets/javascripts/discourse/app/routes/preferences-account.js
+++ b/app/assets/javascripts/discourse/app/routes/preferences-account.js
@@ -2,6 +2,7 @@ import RestrictedUserRoute from "discourse/routes/restricted-user";
 import UserBadge from "discourse/models/user-badge";
 import showModal from "discourse/lib/show-modal";
 import { action } from "@ember/object";
+import I18n from "I18n";
 
 export default RestrictedUserRoute.extend({
   showFooter: true,
@@ -32,6 +33,7 @@ export default RestrictedUserRoute.extend({
       newPrimaryGroupInput: user.get("primary_group_id"),
       newFlairGroupId: user.get("flair_group_id"),
       newStatus: user.status,
+      subpageTitle: I18n.t("user.preferences_nav.account"),
     });
   },
 
diff --git a/app/assets/javascripts/discourse/app/routes/preferences-email.js b/app/assets/javascripts/discourse/app/routes/preferences-email.js
index 984a0e35c4d..375b7ff07e7 100644
--- a/app/assets/javascripts/discourse/app/routes/preferences-email.js
+++ b/app/assets/javascripts/discourse/app/routes/preferences-email.js
@@ -7,16 +7,12 @@ export default RestrictedUserRoute.extend({
     return this.modelFor("user");
   },
 
-  renderTemplate() {
-    this.render({ into: "user" });
-  },
-
   setupController(controller, model) {
     controller.reset();
     controller.setProperties({
       model,
-      oldEmail: controller.new ? "" : model.get("email"),
-      newEmail: controller.new ? "" : model.get("email"),
+      oldEmail: controller.new ? "" : model.email,
+      newEmail: controller.new ? "" : model.email,
     });
   },
 
@@ -25,10 +21,4 @@ export default RestrictedUserRoute.extend({
       controller.set("new", undefined);
     }
   },
-
-  // A bit odd, but if we leave to /preferences we need to re-render that outlet
-  deactivate() {
-    this._super(...arguments);
-    this.render("preferences", { into: "user", controller: "preferences" });
-  },
 });
diff --git a/app/assets/javascripts/discourse/app/routes/preferences-index.js b/app/assets/javascripts/discourse/app/routes/preferences-index.js
index c09799ce450..ebeff6614af 100644
--- a/app/assets/javascripts/discourse/app/routes/preferences-index.js
+++ b/app/assets/javascripts/discourse/app/routes/preferences-index.js
@@ -1,9 +1,11 @@
 import RestrictedUserRoute from "discourse/routes/restricted-user";
+import { inject as service } from "@ember/service";
 
 export default RestrictedUserRoute.extend({
+  router: service(),
   showFooter: true,
 
   redirect() {
-    this.transitionTo("preferences.account");
+    this.router.transitionTo("preferences.account");
   },
 });
diff --git a/app/assets/javascripts/discourse/app/routes/preferences-sidebar.js b/app/assets/javascripts/discourse/app/routes/preferences-navigation-menu.js
similarity index 78%
rename from app/assets/javascripts/discourse/app/routes/preferences-sidebar.js
rename to app/assets/javascripts/discourse/app/routes/preferences-navigation-menu.js
index a82ac9a5815..8f01ffdfe56 100644
--- a/app/assets/javascripts/discourse/app/routes/preferences-sidebar.js
+++ b/app/assets/javascripts/discourse/app/routes/preferences-navigation-menu.js
@@ -8,12 +8,13 @@ export default RestrictedUserRoute.extend({
     const props = {
       model: user,
       selectedSidebarCategories: Category.findByIds(user.sidebarCategoryIds),
+      newSidebarLinkToFilteredList: user.sidebarLinkToFilteredList,
+      newSidebarShowCountOfNewItems: user.sidebarShowCountOfNewItems,
     };
 
     if (this.siteSettings.tagging_enabled) {
       props.selectedSidebarTagNames = user.sidebarTagNames;
     }
-    props.newSidebarListDestination = user.sidebarListDestination;
 
     controller.setProperties(props);
   },
diff --git a/app/assets/javascripts/discourse/app/routes/preferences-second-factor.js b/app/assets/javascripts/discourse/app/routes/preferences-second-factor.js
index 46d296b2e52..10a21cf12dc 100644
--- a/app/assets/javascripts/discourse/app/routes/preferences-second-factor.js
+++ b/app/assets/javascripts/discourse/app/routes/preferences-second-factor.js
@@ -1,19 +1,19 @@
 import RestrictedUserRoute from "discourse/routes/restricted-user";
 import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
 
 export default RestrictedUserRoute.extend({
+  currentUser: service(),
+  siteSettings: service(),
+
   showFooter: true,
 
   model() {
     return this.modelFor("user");
   },
 
-  renderTemplate() {
-    return this.render({ into: "user" });
-  },
-
   setupController(controller, model) {
-    controller.setProperties({ model, newUsername: model.get("username") });
+    controller.setProperties({ model, newUsername: model.username });
     controller.set("loading", true);
 
     model
@@ -39,17 +39,14 @@ export default RestrictedUserRoute.extend({
   willTransition(transition) {
     this._super(...arguments);
 
-    const controller = this.controllerFor("preferences/second-factor");
-    const user = controller.get("currentUser");
-    const settings = controller.get("siteSettings");
-
     if (
       transition.targetName === "preferences.second-factor" ||
-      !user ||
-      user.is_anonymous ||
-      user.second_factor_enabled ||
-      (settings.enforce_second_factor === "staff" && !user.staff) ||
-      settings.enforce_second_factor === "no"
+      !this.currentUser ||
+      this.currentUser.is_anonymous ||
+      this.currentUser.second_factor_enabled ||
+      (this.siteSettings.enforce_second_factor === "staff" &&
+        !this.currentUser.staff) ||
+      this.siteSettings.enforce_second_factor === "no"
     ) {
       return true;
     }
diff --git a/app/assets/javascripts/discourse/app/routes/preferences.js b/app/assets/javascripts/discourse/app/routes/preferences.js
index 8c157859da6..83bc53b2f20 100644
--- a/app/assets/javascripts/discourse/app/routes/preferences.js
+++ b/app/assets/javascripts/discourse/app/routes/preferences.js
@@ -1,7 +1,19 @@
 import RestrictedUserRoute from "discourse/routes/restricted-user";
+import I18n from "I18n";
+import { inject as service } from "@ember/service";
 
 export default RestrictedUserRoute.extend({
+  router: service(),
+
   model() {
     return this.modelFor("user");
   },
+
+  titleToken() {
+    let controller = this.controllerFor(this.router.currentRouteName);
+    let subpageTitle = controller?.subpageTitle;
+    return subpageTitle
+      ? `${subpageTitle} - ${I18n.t("user.preferences")}`
+      : I18n.t("user.preferences");
+  },
 });
diff --git a/app/assets/javascripts/discourse/app/routes/privacy.js b/app/assets/javascripts/discourse/app/routes/privacy.js
index da25743b788..dfe8646ed1a 100644
--- a/app/assets/javascripts/discourse/app/routes/privacy.js
+++ b/app/assets/javascripts/discourse/app/routes/privacy.js
@@ -1,3 +1,36 @@
-import staticRouteBuilder from "discourse/lib/static-route-builder";
+import DiscourseRoute from "discourse/routes/discourse";
+import { inject as service } from "@ember/service";
+import DiscourseURL from "discourse/lib/url";
+import StaticPage from "discourse/models/static-page";
+import I18n from "I18n";
+import { action } from "@ember/object";
 
-export default staticRouteBuilder("privacy");
+export default class PrivacyRoute extends DiscourseRoute {
+  @service siteSettings;
+
+  activate() {
+    super.activate(...arguments);
+    DiscourseURL.jumpToElement(document.location.hash.slice(1));
+  }
+
+  beforeModel(transition) {
+    if (this.siteSettings.privacy_policy_url) {
+      transition.abort();
+      DiscourseURL.redirectTo(this.siteSettings.privacy_policy_url);
+    }
+  }
+
+  model() {
+    return StaticPage.find("privacy");
+  }
+
+  titleToken() {
+    return I18n.t("privacy");
+  }
+
+  @action
+  didTransition() {
+    this.controllerFor("application").set("showFooter", true);
+    return true;
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/routes/review-index.js b/app/assets/javascripts/discourse/app/routes/review-index.js
index 23fd3ab4450..55780a5a8dd 100644
--- a/app/assets/javascripts/discourse/app/routes/review-index.js
+++ b/app/assets/javascripts/discourse/app/routes/review-index.js
@@ -95,9 +95,7 @@ export default DiscourseRoute.extend({
   },
 
   get _reviewableCountsChannel() {
-    return this.currentUser.redesigned_user_menu_enabled
-      ? `/reviewable_counts/${this.currentUser.id}`
-      : "/reviewable_counts";
+    return `/reviewable_counts/${this.currentUser.id}`;
   },
 
   @action
diff --git a/app/assets/javascripts/discourse/app/routes/rules.js b/app/assets/javascripts/discourse/app/routes/rules.js
index ee8594cccdd..6175f099132 100644
--- a/app/assets/javascripts/discourse/app/routes/rules.js
+++ b/app/assets/javascripts/discourse/app/routes/rules.js
@@ -1,3 +1,6 @@
-import staticRouteBuilder from "discourse/lib/static-route-builder";
+import FaqRoute from "./faq";
 
-export default staticRouteBuilder("rules");
+// Rules is effectively a faq alias
+export default class RulesRoute extends FaqRoute {
+  pageId = "rules";
+}
diff --git a/app/assets/javascripts/discourse/app/routes/second-factor-auth.js b/app/assets/javascripts/discourse/app/routes/second-factor-auth.js
index 50bfee3e1ae..b3c0e06f67d 100644
--- a/app/assets/javascripts/discourse/app/routes/second-factor-auth.js
+++ b/app/assets/javascripts/discourse/app/routes/second-factor-auth.js
@@ -2,8 +2,9 @@ import DiscourseRoute from "discourse/routes/discourse";
 import PreloadStore from "discourse/lib/preload-store";
 import { ajax } from "discourse/lib/ajax";
 import { extractError } from "discourse/lib/ajax-error";
+import DisableSidebar from "discourse/mixins/disable-sidebar";
 
-export default DiscourseRoute.extend({
+export default DiscourseRoute.extend(DisableSidebar, {
   queryParams: {
     nonce: { refreshModel: true },
   },
@@ -26,18 +27,6 @@ export default DiscourseRoute.extend({
     }
   },
 
-  activate() {
-    this.controllerFor("application").setProperties({
-      sidebarDisabledRouteOverride: true,
-    });
-  },
-
-  deactivate() {
-    this.controllerFor("application").setProperties({
-      sidebarDisabledRouteOverride: false,
-    });
-  },
-
   setupController(controller, model) {
     this._super(...arguments);
     controller.resetState();
diff --git a/app/assets/javascripts/discourse/app/routes/signup.js b/app/assets/javascripts/discourse/app/routes/signup.js
index 89a6a04c7a9..bf9f6d57d89 100644
--- a/app/assets/javascripts/discourse/app/routes/signup.js
+++ b/app/assets/javascripts/discourse/app/routes/signup.js
@@ -1,26 +1,22 @@
-import buildStaticRoute from "discourse/routes/build-static-route";
+import DiscourseRoute from "discourse/routes/discourse";
 import { next } from "@ember/runloop";
 
-const SignupRoute = buildStaticRoute("signup");
-
-SignupRoute.reopen({
+export default class SignupRoute extends DiscourseRoute {
   beforeModel() {
-    let canSignUp = this.controllerFor("application").get("canSignUp");
+    const { canSignUp } = this.controllerFor("application");
 
-    if (!this.siteSettings.login_required) {
-      this.replaceWith("discovery.latest").then((e) => {
-        if (canSignUp) {
-          next(() => e.send("showCreateAccount"));
-        }
-      });
-    } else {
+    if (this.siteSettings.login_required) {
       this.replaceWith("login").then((e) => {
         if (canSignUp) {
           next(() => e.send("showCreateAccount"));
         }
       });
+    } else {
+      this.replaceWith("discovery.latest").then((e) => {
+        if (canSignUp) {
+          next(() => e.send("showCreateAccount"));
+        }
+      });
     }
-  },
-});
-
-export default SignupRoute;
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/routes/tag-groups-new.js b/app/assets/javascripts/discourse/app/routes/tag-groups-new.js
index 8df2516fb6b..8225a26f41e 100644
--- a/app/assets/javascripts/discourse/app/routes/tag-groups-new.js
+++ b/app/assets/javascripts/discourse/app/routes/tag-groups-new.js
@@ -1,12 +1,14 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import I18n from "I18n";
+import { inject as service } from "@ember/service";
 
 export default DiscourseRoute.extend({
+  router: service(),
   showFooter: true,
 
   beforeModel() {
     if (!this.siteSettings.tagging_enabled) {
-      this.transitionTo("tagGroups");
+      this.router.transitionTo("tagGroups");
     }
   },
 
diff --git a/app/assets/javascripts/discourse/app/routes/tag-show.js b/app/assets/javascripts/discourse/app/routes/tag-show.js
index 9c73f3b1d8d..5286b0ad178 100644
--- a/app/assets/javascripts/discourse/app/routes/tag-show.js
+++ b/app/assets/javascripts/discourse/app/routes/tag-show.js
@@ -17,11 +17,14 @@ import { makeArray } from "discourse-common/lib/helpers";
 import { setTopicList } from "discourse/lib/topic-list-tracker";
 import showModal from "discourse/lib/show-modal";
 import { action } from "@ember/object";
+import PreloadStore from "discourse/lib/preload-store";
+import { inject as service } from "@ember/service";
 
 const NONE = "none";
 const ALL = "all";
 
 export default DiscourseRoute.extend(FilterModeMixin, {
+  composer: service(),
   navMode: "latest",
 
   queryParams,
@@ -89,6 +92,20 @@ export default DiscourseRoute.extend(FilterModeMixin, {
       filter = `tag/${tagId}/l/${topicFilter}`;
     }
 
+    if (
+      this.noSubcategories === undefined &&
+      category?.default_list_filter === "none" &&
+      topicFilter === "latest"
+    ) {
+      // TODO: avoid throwing away preload data by redirecting on the server
+      PreloadStore.getAndRemove("topic_list");
+      return this.replaceWith(
+        "tags.showCategoryNone",
+        params.category_slug_path_with_id,
+        tagId
+      );
+    }
+
     const list = await findTopicList(
       this.store,
       this.topicTrackingState,
@@ -123,10 +140,7 @@ export default DiscourseRoute.extend(FilterModeMixin, {
   },
 
   setupController(controller, model) {
-    const noSubcategories =
-      this.noSubcategories === undefined
-        ? model.category?.default_list_filter === NONE
-        : this.noSubcategories;
+    const noSubcategories = this.noSubcategories;
 
     this.controllerFor("tag.show").setProperties({
       model: model.tag,
@@ -136,7 +150,21 @@ export default DiscourseRoute.extend(FilterModeMixin, {
       noSubcategories,
       loading: false,
     });
-    this.searchService.set("searchContext", model.tag.searchContext);
+
+    if (model.category || model.additionalTags) {
+      const tagIntersectionSearchContext = {
+        type: "tagIntersection",
+        tagId: model.tag.id,
+        tag: model.tag,
+        additionalTags: model.additionalTags || null,
+        categoryId: model.category?.id || null,
+        category: model.category || null,
+      };
+
+      this.searchService.searchContext = tagIntersectionSearchContext;
+    } else {
+      this.searchService.searchContext = model.tag.searchContext;
+    }
   },
 
   titleToken() {
@@ -174,7 +202,7 @@ export default DiscourseRoute.extend(FilterModeMixin, {
 
   deactivate() {
     this._super(...arguments);
-    this.searchService.set("searchContext", null);
+    this.searchService.searchContext = null;
   },
 
   @action
@@ -188,8 +216,7 @@ export default DiscourseRoute.extend(FilterModeMixin, {
       this.openTopicDraft();
     } else {
       const controller = this.controllerFor("tag.show");
-      const composerController = this.controllerFor("composer");
-      composerController
+      this.composer
         .open({
           categoryId: controller.category?.id,
           action: Composer.CREATE_TOPIC,
@@ -197,8 +224,8 @@ export default DiscourseRoute.extend(FilterModeMixin, {
         })
         .then(() => {
           // Pre-fill the tags input field
-          if (composerController.canEditTags && controller.tag?.id) {
-            const composerModel = this.controllerFor("composer").model;
+          if (this.composer.canEditTags && controller.tag?.id) {
+            const composerModel = this.composer.model;
             composerModel.set("tags", this._controllerTags(controller));
           }
         });
diff --git a/app/assets/javascripts/discourse/app/routes/tags-index.js b/app/assets/javascripts/discourse/app/routes/tags-index.js
index ede026def30..b3387690160 100644
--- a/app/assets/javascripts/discourse/app/routes/tags-index.js
+++ b/app/assets/javascripts/discourse/app/routes/tags-index.js
@@ -2,8 +2,11 @@ import DiscourseRoute from "discourse/routes/discourse";
 import I18n from "I18n";
 import Tag from "discourse/models/tag";
 import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
 
 export default DiscourseRoute.extend({
+  router: service(),
+
   model() {
     return this.store.findAll("tag").then((result) => {
       if (result.extras) {
@@ -43,7 +46,7 @@ export default DiscourseRoute.extend({
 
   @action
   showTagGroups() {
-    this.transitionTo("tagGroups");
+    this.router.transitionTo("tagGroups");
     return true;
   },
 
diff --git a/app/assets/javascripts/discourse/app/routes/tags-legacy-redirect.js b/app/assets/javascripts/discourse/app/routes/tags-legacy-redirect.js
index 94c8dbd4478..d04530d4854 100644
--- a/app/assets/javascripts/discourse/app/routes/tags-legacy-redirect.js
+++ b/app/assets/javascripts/discourse/app/routes/tags-legacy-redirect.js
@@ -1,7 +1,13 @@
 import Route from "@ember/routing/route";
+import { inject as service } from "@ember/service";
 
 export default Route.extend({
+  router: service(),
+
   beforeModel() {
-    this.transitionTo("tag.show", this.paramsFor("tags.legacyRedirect").tag_id);
+    this.router.transitionTo(
+      "tag.show",
+      this.paramsFor("tags.legacyRedirect").tag_id
+    );
   },
 });
diff --git a/app/assets/javascripts/discourse/app/routes/topic-from-params.js b/app/assets/javascripts/discourse/app/routes/topic-from-params.js
index 5875089d6d7..2f5f6334d84 100644
--- a/app/assets/javascripts/discourse/app/routes/topic-from-params.js
+++ b/app/assets/javascripts/discourse/app/routes/topic-from-params.js
@@ -5,9 +5,12 @@ import { isEmpty } from "@ember/utils";
 import { isTesting } from "discourse-common/config/environment";
 import { schedule } from "@ember/runloop";
 import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
 
 // This route is used for retrieving a topic based on params
 export default DiscourseRoute.extend({
+  composer: service(),
+
   // Avoid default model hook
   model(params) {
     params = params || {};
@@ -56,7 +59,6 @@ export default DiscourseRoute.extend({
     }
 
     const topicController = this.controllerFor("topic");
-    const composerController = this.controllerFor("composer");
     const topic = this.modelFor("topic");
     const postStream = topic.postStream;
 
@@ -105,7 +107,7 @@ export default DiscourseRoute.extend({
     }
 
     if (!isEmpty(topic.draft)) {
-      composerController.open({
+      this.composer.open({
         draft: Draft.getLocal(topic.draft_key, topic.draft),
         draftKey: topic.draft_key,
         draftSequence: topic.draft_sequence,
diff --git a/app/assets/javascripts/discourse/app/routes/topic.js b/app/assets/javascripts/discourse/app/routes/topic.js
index 2f4570b181b..8743d764655 100644
--- a/app/assets/javascripts/discourse/app/routes/topic.js
+++ b/app/assets/javascripts/discourse/app/routes/topic.js
@@ -10,16 +10,26 @@ import { setTopicId } from "discourse/lib/topic-list-tracker";
 import showModal from "discourse/lib/show-modal";
 import TopicFlag from "discourse/lib/flag-targets/topic-flag";
 import PostFlag from "discourse/lib/flag-targets/post-flag";
+import HistoryModal from "discourse/components/modal/history";
+import PublishPageModal from "discourse/components/modal/publish-page";
 
 const SCROLL_DELAY = 500;
 
 const TopicRoute = DiscourseRoute.extend({
+  composer: service(),
   screenTrack: service(),
+  modal: service(),
 
   scheduledReplace: null,
   lastScrollPos: null,
   isTransitioning: false,
 
+  buildRouteInfoMetadata() {
+    return {
+      scrollOnTransition: false,
+    };
+  },
+
   redirect() {
     return this.redirectIfLoginRequired();
   },
@@ -103,9 +113,8 @@ const TopicRoute = DiscourseRoute.extend({
   @action
   showPagePublish() {
     const model = this.modelFor("topic");
-    showModal("publish-page", {
+    this.modal.show(PublishPageModal, {
       model,
-      title: "topic.publish_page.title",
     });
   },
 
@@ -113,13 +122,11 @@ const TopicRoute = DiscourseRoute.extend({
   showTopicTimerModal() {
     const model = this.modelFor("topic");
 
-    const topicTimer = model.get("topic_timer");
-    if (!topicTimer) {
+    if (!model.get("topic_timer")) {
       model.set("topic_timer", {});
     }
 
     showModal("edit-topic-timer", { model });
-    this.controllerFor("modal").set("modalClass", "edit-topic-timer-modal");
   },
 
   @action
@@ -139,23 +146,23 @@ const TopicRoute = DiscourseRoute.extend({
 
   @action
   showFeatureTopic() {
-    showModal("featureTopic", {
+    showModal("feature-topic", {
       model: this.modelFor("topic"),
       title: "topic.feature_topic.title",
     });
-    this.controllerFor("modal").set("modalClass", "feature-topic-modal");
     this.controllerFor("feature_topic").reset();
   },
 
   @action
   showHistory(model, revision) {
-    let historyController = showModal("history", {
-      model,
-      modalClass: "history-modal",
+    this.modal.show(HistoryModal, {
+      model: {
+        postId: model.id,
+        postVersion: revision || "latest",
+        post: model,
+        editPost: (post) => this.controllerFor("topic").send("editPost", post),
+      },
     });
-    historyController.refresh(model.get("id"), revision || "latest");
-    historyController.set("post", model);
-    historyController.set("topicController", this.controllerFor("topic"));
   },
 
   @action
@@ -319,16 +326,12 @@ const TopicRoute = DiscourseRoute.extend({
   activate() {
     this._super(...arguments);
     this.set("isTransitioning", false);
-
-    const topic = this.modelFor("topic");
-    this.session.set("lastTopicIdViewed", parseInt(topic.get("id"), 10));
   },
 
   deactivate() {
     this._super(...arguments);
 
-    this.searchService.set("searchContext", null);
-    this.controllerFor("user-card").set("visible", false);
+    this.searchService.searchContext = null;
 
     const topicController = this.controllerFor("topic");
     const postStream = topicController.get("model.postStream");
@@ -336,7 +339,7 @@ const TopicRoute = DiscourseRoute.extend({
     postStream.cancelFilter();
 
     topicController.set("multiSelect", false);
-    this.controllerFor("composer").set("topic", null);
+    this.composer.set("topic", null);
     this.screenTrack.stop();
 
     this.appEvents.trigger("header:hide-topic");
@@ -354,13 +357,13 @@ const TopicRoute = DiscourseRoute.extend({
       firstPostExpanded: false,
     });
 
-    this.searchService.set("searchContext", model.get("searchContext"));
+    this.searchService.searchContext = model.get("searchContext");
 
     // close the multi select when switching topics
     controller.set("multiSelect", false);
     controller.get("quoteState").clear();
 
-    this.controllerFor("composer").set("topic", model);
+    this.composer.set("topic", model);
     this.topicTrackingState.trackIncoming("all");
 
     // We reset screen tracking every time a topic is entered
diff --git a/app/assets/javascripts/discourse/app/routes/tos.js b/app/assets/javascripts/discourse/app/routes/tos.js
index 10bdfeca3c3..a1fdaa3c8bd 100644
--- a/app/assets/javascripts/discourse/app/routes/tos.js
+++ b/app/assets/javascripts/discourse/app/routes/tos.js
@@ -1,3 +1,36 @@
-import staticRouteBuilder from "discourse/lib/static-route-builder";
+import DiscourseRoute from "discourse/routes/discourse";
+import { inject as service } from "@ember/service";
+import DiscourseURL from "discourse/lib/url";
+import StaticPage from "discourse/models/static-page";
+import I18n from "I18n";
+import { action } from "@ember/object";
 
-export default staticRouteBuilder("tos");
+export default class TosRoute extends DiscourseRoute {
+  @service siteSettings;
+
+  activate() {
+    super.activate(...arguments);
+    DiscourseURL.jumpToElement(document.location.hash.slice(1));
+  }
+
+  beforeModel(transition) {
+    if (this.siteSettings.tos_url) {
+      transition.abort();
+      DiscourseURL.redirectTo(this.siteSettings.tos_url);
+    }
+  }
+
+  model() {
+    return StaticPage.find("tos");
+  }
+
+  titleToken() {
+    return I18n.t("tos");
+  }
+
+  @action
+  didTransition() {
+    this.controllerFor("application").set("showFooter", true);
+    return true;
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/routes/user-activity-bookmarks-with-reminders.js b/app/assets/javascripts/discourse/app/routes/user-activity-bookmarks-with-reminders.js
index d4718b8a062..4698b3f8bfb 100644
--- a/app/assets/javascripts/discourse/app/routes/user-activity-bookmarks-with-reminders.js
+++ b/app/assets/javascripts/discourse/app/routes/user-activity-bookmarks-with-reminders.js
@@ -1,11 +1,14 @@
 import DiscourseRoute from "discourse/routes/discourse";
+import { inject as service } from "@ember/service";
 
 export default DiscourseRoute.extend({
+  router: service(),
+
   queryParams: {
     q: { replace: true },
   },
 
   redirect() {
-    this.transitionTo("userActivity.bookmarks");
+    this.router.transitionTo("userActivity.bookmarks");
   },
 });
diff --git a/app/assets/javascripts/discourse/app/routes/user-activity-bookmarks.js b/app/assets/javascripts/discourse/app/routes/user-activity-bookmarks.js
index a29d1124f47..5e6857816ea 100644
--- a/app/assets/javascripts/discourse/app/routes/user-activity-bookmarks.js
+++ b/app/assets/javascripts/discourse/app/routes/user-activity-bookmarks.js
@@ -2,8 +2,11 @@ import { action } from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import DiscourseRoute from "discourse/routes/discourse";
 import { Promise } from "rsvp";
+import I18n from "I18n";
 
 export default DiscourseRoute.extend({
+  templateName: "user/bookmarks",
+
   queryParams: {
     acting_username: { refreshModel: true },
     q: { refreshModel: true },
@@ -22,7 +25,6 @@ export default DiscourseRoute.extend({
 
     this.session.setProperties({
       bookmarksModel: null,
-      bookmarkListScrollPosition: null,
     });
 
     controller.set("loading", true);
@@ -46,8 +48,8 @@ export default DiscourseRoute.extend({
       .finally(() => controller.set("loading", false));
   },
 
-  renderTemplate() {
-    this.render("user_bookmarks");
+  titleToken() {
+    return I18n.t("user_action_groups.3");
   },
 
   @action
diff --git a/app/assets/javascripts/discourse/app/routes/user-activity-drafts.js b/app/assets/javascripts/discourse/app/routes/user-activity-drafts.js
index 5a5d30507bd..c3ec009a7e7 100644
--- a/app/assets/javascripts/discourse/app/routes/user-activity-drafts.js
+++ b/app/assets/javascripts/discourse/app/routes/user-activity-drafts.js
@@ -3,6 +3,8 @@ import I18n from "I18n";
 import { action } from "@ember/object";
 
 export default DiscourseRoute.extend({
+  templateName: "user/stream",
+
   model() {
     const user = this.modelFor("user");
     const draftsStream = user.get("userDraftsStream");
@@ -16,14 +18,6 @@ export default DiscourseRoute.extend({
     });
   },
 
-  renderTemplate() {
-    this.render("user_stream");
-  },
-
-  setupController(controller, model) {
-    controller.set("model", model);
-  },
-
   emptyState() {
     const title = I18n.t("user_activity.no_drafts_title");
     const body = I18n.t("user_activity.no_drafts_body");
@@ -38,6 +32,10 @@ export default DiscourseRoute.extend({
     this.appEvents.off("draft:destroyed", this, this.refresh);
   },
 
+  titleToken() {
+    return I18n.t("user_action_groups.15");
+  },
+
   @action
   didTransition() {
     this.controllerFor("user-activity")._showFooter();
diff --git a/app/assets/javascripts/discourse/app/routes/user-activity-index.js b/app/assets/javascripts/discourse/app/routes/user-activity-index.js
index 88bb0b37cdb..4907997ed05 100644
--- a/app/assets/javascripts/discourse/app/routes/user-activity-index.js
+++ b/app/assets/javascripts/discourse/app/routes/user-activity-index.js
@@ -25,4 +25,8 @@ export default UserActivityStreamRoute.extend({
 
     return { title, body };
   },
+
+  titleToken() {
+    return I18n.t("user.filters.all");
+  },
 });
diff --git a/app/assets/javascripts/discourse/app/routes/user-activity-likes-given.js b/app/assets/javascripts/discourse/app/routes/user-activity-likes-given.js
index 901c890e245..0965c24d57c 100644
--- a/app/assets/javascripts/discourse/app/routes/user-activity-likes-given.js
+++ b/app/assets/javascripts/discourse/app/routes/user-activity-likes-given.js
@@ -25,6 +25,10 @@ export default UserActivityStreamRoute.extend({
     return { title, body };
   },
 
+  titleToken() {
+    return I18n.t("user_action_groups.1");
+  },
+
   @action
   didTransition() {
     this.controllerFor("application").set("showFooter", true);
diff --git a/app/assets/javascripts/discourse/app/routes/user-activity-pending.js b/app/assets/javascripts/discourse/app/routes/user-activity-pending.js
index 9089fa6b5c5..d086ebeabf9 100644
--- a/app/assets/javascripts/discourse/app/routes/user-activity-pending.js
+++ b/app/assets/javascripts/discourse/app/routes/user-activity-pending.js
@@ -1,8 +1,11 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import { emojiUnescape } from "discourse/lib/text";
 import { escapeExpression } from "discourse/lib/utilities";
+import { inject as service } from "@ember/service";
 
 export default DiscourseRoute.extend({
+  router: service(),
+
   beforeModel() {
     this.username = this.modelFor("user").username_lower;
   },
@@ -42,7 +45,7 @@ export default DiscourseRoute.extend({
   _handleCountChange(count) {
     this.refresh();
     if (count <= 0) {
-      this.transitionTo("userActivity");
+      this.router.transitionTo("userActivity");
     }
   },
 });
diff --git a/app/assets/javascripts/discourse/app/routes/user-activity-read.js b/app/assets/javascripts/discourse/app/routes/user-activity-read.js
index 5746b96d1aa..8a0fbbe2eb0 100644
--- a/app/assets/javascripts/discourse/app/routes/user-activity-read.js
+++ b/app/assets/javascripts/discourse/app/routes/user-activity-read.js
@@ -24,12 +24,6 @@ export default UserTopicListRoute.extend({
       });
   },
 
-  afterModel(model, transition) {
-    if (!this.isPoppedState(transition)) {
-      this.session.set("topicListScrollPosition", null);
-    }
-  },
-
   emptyState() {
     const title = I18n.t("user_activity.no_read_topics_title");
     const body = htmlSafe(
@@ -42,6 +36,10 @@ export default UserTopicListRoute.extend({
     return { title, body };
   },
 
+  titleToken() {
+    return `${I18n.t("user.read")}`;
+  },
+
   @action
   triggerRefresh() {
     this.refresh();
diff --git a/app/assets/javascripts/discourse/app/routes/user-activity-replies.js b/app/assets/javascripts/discourse/app/routes/user-activity-replies.js
index 2db4981c4f4..04ab75c18ed 100644
--- a/app/assets/javascripts/discourse/app/routes/user-activity-replies.js
+++ b/app/assets/javascripts/discourse/app/routes/user-activity-replies.js
@@ -29,6 +29,10 @@ export default UserActivityStreamRoute.extend({
     return { title, body };
   },
 
+  titleToken() {
+    return I18n.t("user_action_groups.5");
+  },
+
   @action
   didTransition() {
     this.controllerFor("application").set("showFooter", true);
diff --git a/app/assets/javascripts/discourse/app/routes/user-activity-stream.js b/app/assets/javascripts/discourse/app/routes/user-activity-stream.js
index 8195788a337..05d81f4c46c 100644
--- a/app/assets/javascripts/discourse/app/routes/user-activity-stream.js
+++ b/app/assets/javascripts/discourse/app/routes/user-activity-stream.js
@@ -4,6 +4,8 @@ import { action } from "@ember/object";
 import I18n from "I18n";
 
 export default DiscourseRoute.extend(ViewingActionType, {
+  templateName: "user/stream",
+
   queryParams: {
     acting_username: { refreshModel: true },
   },
@@ -19,22 +21,14 @@ export default DiscourseRoute.extend(ViewingActionType, {
   },
 
   afterModel(model, transition) {
-    if (!this.isPoppedState(transition)) {
-      this.session.set("userStreamScrollPosition", null);
-    }
-
     return model.stream.filterBy({
       filter: this.userActionType,
       actingUsername: transition.to.queryParams.acting_username,
     });
   },
 
-  renderTemplate() {
-    this.render("user_stream");
-  },
-
-  setupController(controller, model) {
-    controller.set("model", model);
+  setupController() {
+    this._super(...arguments);
     this.viewingActionType(this.userActionType);
   },
 
diff --git a/app/assets/javascripts/discourse/app/routes/user-activity-topics.js b/app/assets/javascripts/discourse/app/routes/user-activity-topics.js
index 7059e4acb8b..d1064f0fa0e 100644
--- a/app/assets/javascripts/discourse/app/routes/user-activity-topics.js
+++ b/app/assets/javascripts/discourse/app/routes/user-activity-topics.js
@@ -24,12 +24,6 @@ export default UserTopicListRoute.extend({
       });
   },
 
-  afterModel(model, transition) {
-    if (!this.isPoppedState(transition)) {
-      this.session.set("topicListScrollPosition", null);
-    }
-  },
-
   emptyState() {
     const user = this.modelFor("user");
     let title, body;
@@ -50,6 +44,10 @@ export default UserTopicListRoute.extend({
     return { title, body };
   },
 
+  titleToken() {
+    return I18n.t("user_action_groups.4");
+  },
+
   @action
   triggerRefresh() {
     this.refresh();
diff --git a/app/assets/javascripts/discourse/app/routes/user-activity.js b/app/assets/javascripts/discourse/app/routes/user-activity.js
index 9a94a47d8df..f6bd36c49c3 100644
--- a/app/assets/javascripts/discourse/app/routes/user-activity.js
+++ b/app/assets/javascripts/discourse/app/routes/user-activity.js
@@ -1,4 +1,5 @@
 import DiscourseRoute from "discourse/routes/discourse";
+import I18n from "I18n";
 
 export default DiscourseRoute.extend({
   model() {
@@ -10,13 +11,11 @@ export default DiscourseRoute.extend({
     return user;
   },
 
-  afterModel(_model, transition) {
-    if (!this.isPoppedState(transition)) {
-      this.session.set("userStreamScrollPosition", null);
-    }
-  },
-
   setupController(controller, user) {
     this.controllerFor("user-activity").set("model", user);
   },
+
+  titleToken() {
+    return I18n.t("user.activity_stream");
+  },
 });
diff --git a/app/assets/javascripts/discourse/app/routes/user-badges.js b/app/assets/javascripts/discourse/app/routes/user-badges.js
index 6feb940c502..852bf7fa459 100644
--- a/app/assets/javascripts/discourse/app/routes/user-badges.js
+++ b/app/assets/javascripts/discourse/app/routes/user-badges.js
@@ -2,8 +2,11 @@ import DiscourseRoute from "discourse/routes/discourse";
 import UserBadge from "discourse/models/user-badge";
 import ViewingActionType from "discourse/mixins/viewing-action-type";
 import { action } from "@ember/object";
+import I18n from "I18n";
 
 export default DiscourseRoute.extend(ViewingActionType, {
+  templateName: "user/badges",
+
   model() {
     return UserBadge.findByUsername(
       this.modelFor("user").get("username_lower"),
@@ -11,13 +14,13 @@ export default DiscourseRoute.extend(ViewingActionType, {
     );
   },
 
-  setupController(controller, model) {
+  setupController() {
+    this._super(...arguments);
     this.viewingActionType(-1);
-    controller.set("model", model);
   },
 
-  renderTemplate() {
-    this.render("user/badges");
+  titleToken() {
+    return I18n.t("badges.title");
   },
 
   @action
diff --git a/app/assets/javascripts/discourse/app/routes/user-deleted-posts.js b/app/assets/javascripts/discourse/app/routes/user-deleted-posts.js
index 75b35d804ff..e5a9e658997 100644
--- a/app/assets/javascripts/discourse/app/routes/user-deleted-posts.js
+++ b/app/assets/javascripts/discourse/app/routes/user-deleted-posts.js
@@ -1,3 +1,35 @@
-import createAdminUserPostsRoute from "discourse/routes/build-admin-user-posts-route";
+import DiscourseRoute from "discourse/routes/discourse";
+import { emojiUnescape } from "discourse/lib/text";
+import { escapeExpression } from "discourse/lib/utilities";
+import { action } from "@ember/object";
 
-export default createAdminUserPostsRoute("deleted");
+export default class UserDeletedPosts extends DiscourseRoute {
+  templateName = "user/posts";
+  controllerName = "user-posts";
+
+  model() {
+    return this.modelFor("user").postsStream;
+  }
+
+  afterModel(model) {
+    return model.filterBy({ filter: "deleted" });
+  }
+
+  setupController(controller, model) {
+    super.setupController(...arguments);
+
+    model.set("canLoadMore", model.itemsLoaded === 60);
+
+    model.content.forEach((item) => {
+      if (item.title) {
+        item.set("title", emojiUnescape(escapeExpression(item.title)));
+      }
+    });
+  }
+
+  @action
+  didTransition() {
+    this.controller._showFooter();
+    return true;
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/routes/user-index.js b/app/assets/javascripts/discourse/app/routes/user-index.js
index 57098df94b0..00db564fb9f 100644
--- a/app/assets/javascripts/discourse/app/routes/user-index.js
+++ b/app/assets/javascripts/discourse/app/routes/user-index.js
@@ -1,6 +1,9 @@
 import DiscourseRoute from "discourse/routes/discourse";
+import { inject as service } from "@ember/service";
 
 export default DiscourseRoute.extend({
+  router: service(),
+
   beforeModel() {
     const { currentUser } = this;
     const viewingMe =
@@ -14,7 +17,7 @@ export default DiscourseRoute.extend({
     if (this.site.mobileView) {
       this.replaceWith(destination);
     } else {
-      this.transitionTo(destination);
+      this.router.transitionTo(destination);
     }
   },
 });
diff --git a/app/assets/javascripts/discourse/app/routes/user-invited-show.js b/app/assets/javascripts/discourse/app/routes/user-invited-show.js
index af6f4a3eeb4..bfa5ce2136d 100644
--- a/app/assets/javascripts/discourse/app/routes/user-invited-show.js
+++ b/app/assets/javascripts/discourse/app/routes/user-invited-show.js
@@ -1,6 +1,7 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import Invite from "discourse/models/invite";
 import { action } from "@ember/object";
+import I18n from "I18n";
 
 export default DiscourseRoute.extend({
   model(params) {
@@ -27,6 +28,10 @@ export default DiscourseRoute.extend({
     });
   },
 
+  titleToken() {
+    return I18n.t("user.invited." + this.inviteFilter + "_tab");
+  },
+
   @action
   triggerRefresh() {
     this.refresh();
diff --git a/app/assets/javascripts/discourse/app/routes/user-invited.js b/app/assets/javascripts/discourse/app/routes/user-invited.js
index ae432d3ecc7..11053e16605 100644
--- a/app/assets/javascripts/discourse/app/routes/user-invited.js
+++ b/app/assets/javascripts/discourse/app/routes/user-invited.js
@@ -1,4 +1,5 @@
 import DiscourseRoute from "discourse/routes/discourse";
+import I18n from "I18n";
 
 export default DiscourseRoute.extend({
   setupController(controller) {
@@ -10,4 +11,8 @@ export default DiscourseRoute.extend({
       can_see_invite_details,
     });
   },
+
+  titleToken() {
+    return I18n.t("user.invited.title");
+  },
 });
diff --git a/app/assets/javascripts/discourse/app/routes/user-notifications-edits.js b/app/assets/javascripts/discourse/app/routes/user-notifications-edits.js
index 8be7b15b7bb..90b469a3c4d 100644
--- a/app/assets/javascripts/discourse/app/routes/user-notifications-edits.js
+++ b/app/assets/javascripts/discourse/app/routes/user-notifications-edits.js
@@ -1,6 +1,11 @@
 import UserAction from "discourse/models/user-action";
 import UserActivityStreamRoute from "discourse/routes/user-activity-stream";
+import I18n from "I18n";
 
 export default UserActivityStreamRoute.extend({
   userActionType: UserAction.TYPES["edits"],
+
+  titleToken() {
+    return I18n.t("user_action_groups.11");
+  },
 });
diff --git a/app/assets/javascripts/discourse/app/routes/user-notifications-index.js b/app/assets/javascripts/discourse/app/routes/user-notifications-index.js
index 45af6681c72..193a7827db9 100644
--- a/app/assets/javascripts/discourse/app/routes/user-notifications-index.js
+++ b/app/assets/javascripts/discourse/app/routes/user-notifications-index.js
@@ -1,14 +1,19 @@
 import DiscourseRoute from "discourse/routes/discourse";
+import I18n from "I18n";
+import { inject as service } from "@ember/service";
 
 export default DiscourseRoute.extend({
+  router: service(),
   controllerName: "user-notifications",
-  renderTemplate() {
-    this.render("user/notifications-index");
+  templateName: "user/notifications-index",
+
+  titleToken() {
+    return I18n.t("user.filters.all");
   },
 
   afterModel(model) {
     if (!model) {
-      this.transitionTo("userNotifications.responses");
+      this.router.transitionTo("userNotifications.responses");
     }
   },
 });
diff --git a/app/assets/javascripts/discourse/app/routes/user-notifications-likes-received.js b/app/assets/javascripts/discourse/app/routes/user-notifications-likes-received.js
index 1bfaa46b844..c913ae16df2 100644
--- a/app/assets/javascripts/discourse/app/routes/user-notifications-likes-received.js
+++ b/app/assets/javascripts/discourse/app/routes/user-notifications-likes-received.js
@@ -1,6 +1,11 @@
 import UserAction from "discourse/models/user-action";
 import UserActivityStreamRoute from "discourse/routes/user-activity-stream";
+import I18n from "I18n";
 
 export default UserActivityStreamRoute.extend({
   userActionType: UserAction.TYPES["likes_received"],
+
+  titleToken() {
+    return I18n.t("user_action_groups.1");
+  },
 });
diff --git a/app/assets/javascripts/discourse/app/routes/user-notifications-mentions.js b/app/assets/javascripts/discourse/app/routes/user-notifications-mentions.js
index 2d8c2622da0..449a2dbf330 100644
--- a/app/assets/javascripts/discourse/app/routes/user-notifications-mentions.js
+++ b/app/assets/javascripts/discourse/app/routes/user-notifications-mentions.js
@@ -1,6 +1,11 @@
 import UserAction from "discourse/models/user-action";
 import UserActivityStreamRoute from "discourse/routes/user-activity-stream";
+import I18n from "I18n";
 
 export default UserActivityStreamRoute.extend({
   userActionType: UserAction.TYPES["mentions"],
+
+  titleToken() {
+    return I18n.t("user_action_groups.7");
+  },
 });
diff --git a/app/assets/javascripts/discourse/app/routes/user-notifications-responses.js b/app/assets/javascripts/discourse/app/routes/user-notifications-responses.js
index 52604ccdc54..12f43ff2c64 100644
--- a/app/assets/javascripts/discourse/app/routes/user-notifications-responses.js
+++ b/app/assets/javascripts/discourse/app/routes/user-notifications-responses.js
@@ -1,6 +1,11 @@
 import UserAction from "discourse/models/user-action";
 import UserActivityStreamRoute from "discourse/routes/user-activity-stream";
+import I18n from "I18n";
 
 export default UserActivityStreamRoute.extend({
   userActionType: UserAction.TYPES["replies"],
+
+  titleToken() {
+    return I18n.t("user_action_groups.6");
+  },
 });
diff --git a/app/assets/javascripts/discourse/app/routes/user-notifications.js b/app/assets/javascripts/discourse/app/routes/user-notifications.js
index aeb118579cf..d7a02592bf7 100644
--- a/app/assets/javascripts/discourse/app/routes/user-notifications.js
+++ b/app/assets/javascripts/discourse/app/routes/user-notifications.js
@@ -1,6 +1,7 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import ViewingActionType from "discourse/mixins/viewing-action-type";
 import { action } from "@ember/object";
+import I18n from "I18n";
 
 export default DiscourseRoute.extend(ViewingActionType, {
   controllerName: "user-notifications",
@@ -26,9 +27,13 @@ export default DiscourseRoute.extend(ViewingActionType, {
     }
   },
 
-  setupController(controller, model) {
-    controller.set("model", model);
+  setupController(controller) {
+    this._super(...arguments);
     controller.set("user", this.modelFor("user"));
     this.viewingActionType(-1);
   },
+
+  titleToken() {
+    return I18n.t("user.notifications");
+  },
 });
diff --git a/app/assets/javascripts/discourse/app/routes/user-private-messages-group.js b/app/assets/javascripts/discourse/app/routes/user-private-messages-group.js
index 600b58bfaca..dd3fcdd50ca 100644
--- a/app/assets/javascripts/discourse/app/routes/user-private-messages-group.js
+++ b/app/assets/javascripts/discourse/app/routes/user-private-messages-group.js
@@ -1,11 +1,25 @@
 import DiscourseRoute from "discourse/routes/discourse";
+import { inject as service } from "@ember/service";
 
 export default class extends DiscourseRoute {
+  @service router;
+
   model(params) {
-    return params.name;
+    return this.modelFor("user")
+      .get("groups")
+      .find((group) => {
+        return group.name.toLowerCase() === params.name.toLowerCase();
+      });
+  }
+
+  afterModel(model) {
+    if (!model) {
+      this.router.transitionTo("exception-unknown");
+      return;
+    }
   }
 
   setupController(controller, model) {
-    controller.set("groupName", model);
+    controller.set("group", model);
   }
 }
diff --git a/app/assets/javascripts/discourse/app/routes/user-private-messages.js b/app/assets/javascripts/discourse/app/routes/user-private-messages.js
index 319cc1caad8..b0518dfcba1 100644
--- a/app/assets/javascripts/discourse/app/routes/user-private-messages.js
+++ b/app/assets/javascripts/discourse/app/routes/user-private-messages.js
@@ -2,29 +2,23 @@ import Composer from "discourse/models/composer";
 import DiscourseRoute from "discourse/routes/discourse";
 import Draft from "discourse/models/draft";
 import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
 
 export default DiscourseRoute.extend({
-  renderTemplate() {
-    this.render("user/messages");
-  },
-
-  model() {
-    return this.modelFor("user");
-  },
+  templateName: "user/messages",
+  composer: service(),
 
   afterModel() {
-    return this.pmTopicTrackingState.startTracking();
+    this.pmTopicTrackingState.startTracking();
   },
 
-  setupController(controller, model) {
-    controller.set("model", model);
+  setupController() {
+    this._super(...arguments);
 
     if (this.currentUser) {
-      const composerController = this.controllerFor("composer");
-
       Draft.get("new_private_message").then((data) => {
         if (data.draft) {
-          composerController.open({
+          this.composer.open({
             draft: data.draft,
             draftKey: Composer.NEW_PRIVATE_MESSAGE_KEY,
             ignoreIfChanged: true,
diff --git a/app/assets/javascripts/discourse/app/routes/user-summary.js b/app/assets/javascripts/discourse/app/routes/user-summary.js
index d7fefead284..7f06eabd8c9 100644
--- a/app/assets/javascripts/discourse/app/routes/user-summary.js
+++ b/app/assets/javascripts/discourse/app/routes/user-summary.js
@@ -1,4 +1,5 @@
 import DiscourseRoute from "discourse/routes/discourse";
+import I18n from "I18n";
 
 export default DiscourseRoute.extend({
   showFooter: true,
@@ -11,4 +12,8 @@ export default DiscourseRoute.extend({
 
     return user.summary();
   },
+
+  titleToken() {
+    return I18n.t("user.summary.title");
+  },
 });
diff --git a/app/assets/javascripts/discourse/app/routes/user-topic-list.js b/app/assets/javascripts/discourse/app/routes/user-topic-list.js
index 3f48e195ef7..a1c91aab225 100644
--- a/app/assets/javascripts/discourse/app/routes/user-topic-list.js
+++ b/app/assets/javascripts/discourse/app/routes/user-topic-list.js
@@ -3,9 +3,8 @@ import ViewingActionType from "discourse/mixins/viewing-action-type";
 import { setTopicList } from "discourse/lib/topic-list-tracker";
 
 export default DiscourseRoute.extend(ViewingActionType, {
-  renderTemplate() {
-    this.render("user-topics-list");
-  },
+  templateName: "user-topics-list",
+  controllerName: "user-topics-list",
 
   setupController(controller, model) {
     setTopicList(model);
@@ -13,7 +12,7 @@ export default DiscourseRoute.extend(ViewingActionType, {
     const userActionType = this.userActionType;
     this.controllerFor("user").set("userActionType", userActionType);
     this.controllerFor("user-activity").set("userActionType", userActionType);
-    this.controllerFor("user-topics-list").setProperties({
+    controller.setProperties({
       model,
       hideCategory: false,
     });
diff --git a/app/assets/javascripts/discourse/app/routes/user.js b/app/assets/javascripts/discourse/app/routes/user.js
index b3efdef6878..cf9072e1b8c 100644
--- a/app/assets/javascripts/discourse/app/routes/user.js
+++ b/app/assets/javascripts/discourse/app/routes/user.js
@@ -1,5 +1,4 @@
 import DiscourseRoute from "discourse/routes/discourse";
-import I18n from "I18n";
 import User from "discourse/models/user";
 import { action } from "@ember/object";
 import { bind } from "discourse-common/utils/decorators";
@@ -45,7 +44,7 @@ export default DiscourseRoute.extend({
 
   setupController(controller, user) {
     controller.set("model", user);
-    this.searchService.set("searchContext", user.searchContext);
+    this.searchService.searchContext = user.searchContext;
   },
 
   activate() {
@@ -74,7 +73,7 @@ export default DiscourseRoute.extend({
     user.stopTrackingStatus();
 
     // Remove the search context
-    this.searchService.set("searchContext", null);
+    this.searchService.searchContext = null;
   },
 
   @bind
@@ -98,9 +97,7 @@ export default DiscourseRoute.extend({
 
   titleToken() {
     const username = this.modelFor("user").username;
-    if (username) {
-      return [I18n.t("user.profile"), username];
-    }
+    return username ? username : null;
   },
 
   @action
diff --git a/app/assets/javascripts/discourse/app/routes/users.js b/app/assets/javascripts/discourse/app/routes/users.js
index 442f2b3b555..77355b71dff 100644
--- a/app/assets/javascripts/discourse/app/routes/users.js
+++ b/app/assets/javascripts/discourse/app/routes/users.js
@@ -42,7 +42,10 @@ export default DiscourseRoute.extend({
   model(params) {
     return ajax("/directory-columns.json")
       .then((response) => {
-        params.order = params.order || response.directory_columns[0].name;
+        params.order =
+          params.order ||
+          response.directory_columns[0]?.name ||
+          "likes_received";
         return { params, columns: response.directory_columns };
       })
       .catch(popupAjaxError);
diff --git a/app/assets/javascripts/discourse/app/services/capabilities.js b/app/assets/javascripts/discourse/app/services/capabilities.js
new file mode 100644
index 00000000000..41dac2d3607
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/services/capabilities.js
@@ -0,0 +1,54 @@
+const APPLE_NAVIGATOR_PLATFORMS = /iPhone|iPod|iPad|Macintosh|MacIntel/;
+const APPLE_USER_AGENT_DATA_PLATFORM = /macOS/;
+
+function calculateCapabilities() {
+  const capabilities = {};
+
+  const ua = navigator.userAgent;
+
+  capabilities.touch = navigator.maxTouchPoints > 1 || "ontouchstart" in window;
+
+  capabilities.isAndroid = ua.includes("Android");
+  capabilities.isWinphone = ua.includes("Windows Phone");
+  capabilities.isIpadOS =
+    ua.includes("Mac OS") && !/iPhone|iPod/.test(ua) && capabilities.touch;
+  capabilities.isIOS =
+    (/iPhone|iPod/.test(navigator.userAgent) || capabilities.isIpadOS) &&
+    !window.MSStream;
+  capabilities.isApple =
+    APPLE_NAVIGATOR_PLATFORMS.test(navigator.platform) ||
+    (navigator.userAgentData &&
+      APPLE_USER_AGENT_DATA_PLATFORM.test(navigator.userAgentData.platform));
+
+  capabilities.isOpera = !!window.opera || ua.includes(" OPR/");
+  capabilities.isFirefox = ua.includes("Firefox");
+  capabilities.isChrome = !!window.chrome && !capabilities.isOpera;
+  capabilities.isSafari =
+    /Constructor/.test(window.HTMLElement) ||
+    window.safari?.pushNotification?.toString() ===
+      "[object SafariRemoteNotification]";
+
+  capabilities.hasContactPicker =
+    "contacts" in navigator && "ContactsManager" in window;
+  capabilities.canVibrate = "vibrate" in navigator;
+  capabilities.isPwa =
+    window.matchMedia("(display-mode: standalone)").matches ||
+    window.navigator.standalone ||
+    document.referrer.includes("android-app://");
+  capabilities.isiOSPWA = capabilities.isPwa && capabilities.isIOS;
+  capabilities.wasLaunchedFromDiscourseHub =
+    window.location.search.includes("discourse_app=1");
+  capabilities.isAppWebview = window.ReactNativeWebView !== undefined;
+
+  return capabilities;
+}
+
+export const capabilities = calculateCapabilities();
+
+export default class CapabilitiesService {
+  static isServiceFactory = true;
+
+  static create() {
+    return capabilities;
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/services/composer.js b/app/assets/javascripts/discourse/app/services/composer.js
new file mode 100644
index 00000000000..d9ade6abfb7
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/services/composer.js
@@ -0,0 +1,1683 @@
+import Composer, { SAVE_ICONS, SAVE_LABELS } from "discourse/models/composer";
+import Controller from "@ember/controller";
+import EmberObject, { action, computed } from "@ember/object";
+import { alias, and, or, reads } from "@ember/object/computed";
+import {
+  authorizesOneOrMoreExtensions,
+  uploadIcon,
+} from "discourse/lib/uploads";
+import { cancel, scheduleOnce } from "@ember/runloop";
+import {
+  cannotPostAgain,
+  durationTextFromSeconds,
+} from "discourse/helpers/slow-mode";
+import discourseComputed from "discourse-common/utils/decorators";
+import { observes, on } from "@ember-decorators/object";
+import DiscourseURL from "discourse/lib/url";
+import Draft from "discourse/models/draft";
+import I18n from "I18n";
+import { Promise } from "rsvp";
+import { buildQuote } from "discourse/lib/quote";
+import deprecated from "discourse-common/lib/deprecated";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { emojiUnescape } from "discourse/lib/text";
+import { escapeExpression, modKeysPressed } from "discourse/lib/utilities";
+import { getOwner } from "discourse-common/lib/get-owner";
+import getURL from "discourse-common/lib/get-url";
+import { isEmpty } from "@ember/utils";
+import { isTesting } from "discourse-common/config/environment";
+import { inject as service } from "@ember/service";
+import { shortDate } from "discourse/lib/formatter";
+import showModal from "discourse/lib/show-modal";
+import { categoryBadgeHTML } from "discourse/helpers/category-link";
+import renderTags from "discourse/lib/render-tags";
+import { htmlSafe } from "@ember/template";
+import { iconHTML } from "discourse-common/lib/icon-library";
+import prepareFormTemplateData from "discourse/lib/form-template-validation";
+import DiscardDraftModal from "discourse/components/modal/discard-draft";
+
+async function loadDraft(store, opts = {}) {
+  let { draft, draftKey, draftSequence } = opts;
+
+  try {
+    if (draft && typeof draft === "string") {
+      draft = JSON.parse(draft);
+    }
+  } catch (error) {
+    draft = null;
+    Draft.clear(draftKey, draftSequence);
+  }
+
+  if (!draft?.title && !draft?.reply) {
+    return;
+  }
+
+  let attrs = {
+    draftKey,
+    draftSequence,
+    draft: true,
+    composerState: Composer.DRAFT,
+    topic: opts.topic,
+  };
+
+  Composer.serializedFieldsForDraft().forEach((f) => {
+    attrs[f] = draft[f] || opts[f];
+  });
+
+  const composer = store.createRecord("composer");
+  await composer.open(attrs);
+
+  return composer;
+}
+
+const _popupMenuOptionsCallbacks = [];
+const _composerSaveErrorCallbacks = [];
+
+let _checkDraftPopup = !isTesting();
+
+export function toggleCheckDraftPopup(enabled) {
+  _checkDraftPopup = enabled;
+}
+
+export function clearPopupMenuOptionsCallback() {
+  _popupMenuOptionsCallbacks.length = 0;
+}
+
+export function addPopupMenuOptionsCallback(callback) {
+  _popupMenuOptionsCallbacks.push(callback);
+}
+
+export function clearComposerSaveErrorCallback() {
+  _composerSaveErrorCallbacks.length = 0;
+}
+
+export function addComposerSaveErrorCallback(callback) {
+  _composerSaveErrorCallbacks.push(callback);
+}
+
+export default class ComposerController extends Controller {
+  @service router;
+  @service dialog;
+  @service site;
+  @service store;
+  @service appEvents;
+  @service capabilities;
+  @service modal;
+
+  checkedMessages = false;
+  messageCount = null;
+  showEditReason = false;
+  editReason = null;
+  scopedCategoryId = null;
+  prioritizedCategoryId = null;
+  lastValidatedAt = null;
+  isUploading = false;
+  isProcessingUpload = false;
+  topic = null;
+  linkLookup = null;
+  showPreview = true;
+  composerHeight = null;
+
+  @and("site.mobileView", "showPreview") forcePreview;
+  @or("isWhispering", "model.unlistTopic") whisperOrUnlistTopic;
+  @alias("site.categoriesList") categories;
+  @alias("topicController.model") topicModel;
+  @reads("currentUser.staff") isStaffUser;
+  @reads("currentUser.whisperer") whisperer;
+  @and("model.creatingTopic", "isStaffUser") canUnlistTopic;
+  @or("replyingToWhisper", "model.whisper") isWhispering;
+
+  get topicController() {
+    return getOwner(this).lookup("controller:topic");
+  }
+
+  @on("init")
+  _setupPreview() {
+    const val = this.site.mobileView
+      ? false
+      : this.keyValueStore.get("composer.showPreview") || "true";
+    this.set("showPreview", val === "true");
+  }
+
+  @computed(
+    "model.loading",
+    "isUploading",
+    "isProcessingUpload",
+    "_disableSubmit"
+  )
+  get disableSubmit() {
+    return (
+      this.model?.loading ||
+      this.isUploading ||
+      this.isProcessingUpload ||
+      this._disableSubmit
+    );
+  }
+
+  set disableSubmit(value) {
+    return this.set("_disableSubmit", value);
+  }
+
+  get formTemplateIds() {
+    if (!this.siteSettings.experimental_form_templates) {
+      return null;
+    }
+
+    return this.model.category?.get("form_template_ids");
+  }
+
+  @discourseComputed("showPreview")
+  toggleText(showPreview) {
+    return showPreview
+      ? I18n.t("composer.hide_preview")
+      : I18n.t("composer.show_preview");
+  }
+
+  @observes("showPreview")
+  showPreviewChanged() {
+    if (!this.site.mobileView) {
+      this.keyValueStore.set({
+        key: "composer.showPreview",
+        value: this.showPreview,
+      });
+    }
+  }
+
+  @discourseComputed(
+    "model.replyingToTopic",
+    "model.creatingPrivateMessage",
+    "model.targetRecipients",
+    "model.composeState"
+  )
+  focusTarget(replyingToTopic, creatingPM, usernames, composeState) {
+    // Focus on usernames if it's blank or if it's just you
+    usernames = usernames || "";
+    if (
+      (creatingPM && usernames.length === 0) ||
+      usernames === this.currentUser.username
+    ) {
+      return "usernames";
+    }
+
+    if (replyingToTopic) {
+      return "reply";
+    }
+
+    if (composeState === Composer.FULLSCREEN) {
+      return "editor";
+    }
+
+    return "title";
+  }
+
+  @computed
+  get showToolbar() {
+    const keyValueStore = getOwner(this).lookup("service:key-value-store");
+    const storedVal = keyValueStore.get("toolbar-enabled");
+    if (this._toolbarEnabled === undefined && storedVal === undefined) {
+      // iPhone 6 is 375, anything narrower and toolbar should
+      // be default disabled.
+      // That said we should remember the state
+      this._toolbarEnabled =
+        window.innerWidth > 370 && !this.capabilities.isAndroid;
+    }
+    return this._toolbarEnabled || storedVal === "true";
+  }
+
+  set showToolbar(val) {
+    const keyValueStore = getOwner(this).lookup("service:key-value-store");
+    this._toolbarEnabled = val;
+    keyValueStore.set({
+      key: "toolbar-enabled",
+      value: val ? "true" : "false",
+    });
+    return val;
+  }
+
+  @discourseComputed("model.canEditTitle", "model.creatingPrivateMessage")
+  canEditTags(canEditTitle, creatingPrivateMessage) {
+    const isPrivateMessage =
+      creatingPrivateMessage || this.get("model.topic.isPrivateMessage");
+
+    return (
+      canEditTitle &&
+      this.site.can_tag_topics &&
+      (!isPrivateMessage || this.site.can_tag_pms)
+    );
+  }
+
+  @discourseComputed("model.editingPost", "model.topic.details.can_edit")
+  disableCategoryChooser(editingPost, canEditTopic) {
+    return editingPost && !canEditTopic;
+  }
+
+  @discourseComputed("model.editingPost", "model.topic.canEditTags")
+  disableTagsChooser(editingPost, canEditTags) {
+    return editingPost && !canEditTags;
+  }
+
+  @discourseComputed("canWhisper", "replyingToWhisper")
+  showWhisperToggle(canWhisper, replyingToWhisper) {
+    return canWhisper && !replyingToWhisper;
+  }
+
+  @discourseComputed("model.post")
+  replyingToWhisper(repliedToPost) {
+    return (
+      repliedToPost && repliedToPost.post_type === this.site.post_types.whisper
+    );
+  }
+
+  @discourseComputed("model.action", "isWhispering", "model.privateMessage")
+  saveIcon(modelAction, isWhispering, privateMessage) {
+    if (isWhispering) {
+      return "far-eye-slash";
+    }
+    if (privateMessage && modelAction === Composer.REPLY) {
+      return "envelope";
+    }
+
+    return SAVE_ICONS[modelAction];
+  }
+
+  // Note we update when some other attributes like tag/category change to allow
+  // text customizations to use those.
+  @discourseComputed(
+    "model.action",
+    "isWhispering",
+    "model.editConflict",
+    "model.privateMessage",
+    "model.tags",
+    "model.category"
+  )
+  saveLabel(modelAction, isWhispering, editConflict, privateMessage) {
+    let result = this.model.customizationFor("saveLabel");
+    if (result) {
+      return result;
+    }
+
+    if (editConflict) {
+      return "composer.overwrite_edit";
+    } else if (isWhispering) {
+      return "composer.create_whisper";
+    } else if (privateMessage && modelAction === Composer.REPLY) {
+      return "composer.create_pm";
+    }
+
+    return SAVE_LABELS[modelAction];
+  }
+
+  @discourseComputed("whisperer", "model.action")
+  canWhisper(whisperer, modelAction) {
+    return whisperer && modelAction === Composer.REPLY;
+  }
+
+  _setupPopupMenuOption(callback) {
+    let option = callback(this);
+    if (typeof option === "undefined") {
+      return null;
+    }
+
+    if (typeof option.condition === "undefined") {
+      option.condition = true;
+    } else if (typeof option.condition === "boolean") {
+      // uses existing value
+    } else {
+      option.condition = this.get(option.condition);
+    }
+
+    return option;
+  }
+
+  @discourseComputed("model.requiredCategoryMissing", "model.replyLength")
+  disableTextarea(requiredCategoryMissing, replyLength) {
+    return requiredCategoryMissing && replyLength === 0;
+  }
+
+  @discourseComputed("model.composeState", "model.creatingTopic", "model.post")
+  popupMenuOptions(composeState) {
+    if (composeState === "open" || composeState === "fullscreen") {
+      const options = [];
+
+      options.push(
+        this._setupPopupMenuOption(() => {
+          return {
+            action: "toggleInvisible",
+            icon: "far-eye-slash",
+            label: "composer.toggle_unlisted",
+            condition: "canUnlistTopic",
+          };
+        })
+      );
+
+      if (this.capabilities.touch) {
+        options.push(
+          this._setupPopupMenuOption(() => {
+            return {
+              action: "applyFormatCode",
+              icon: "code",
+              label: "composer.code_title",
+            };
+          })
+        );
+
+        options.push(
+          this._setupPopupMenuOption(() => {
+            return {
+              action: "applyUnorderedList",
+              icon: "list-ul",
+              label: "composer.ulist_title",
+            };
+          })
+        );
+
+        options.push(
+          this._setupPopupMenuOption(() => {
+            return {
+              action: "applyOrderedList",
+              icon: "list-ol",
+              label: "composer.olist_title",
+            };
+          })
+        );
+      }
+
+      options.push(
+        this._setupPopupMenuOption(() => {
+          return {
+            action: "toggleWhisper",
+            icon: "far-eye-slash",
+            label: "composer.toggle_whisper",
+            condition: "showWhisperToggle",
+          };
+        })
+      );
+
+      return options.concat(
+        _popupMenuOptionsCallbacks
+          .map((callback) => this._setupPopupMenuOption(callback))
+          .filter((o) => o)
+      );
+    }
+  }
+
+  @discourseComputed(
+    "model.creatingPrivateMessage",
+    "model.targetRecipients",
+    "model.warningsDisabled"
+  )
+  showWarning(creatingPrivateMessage, usernames, warningsDisabled) {
+    if (!this.get("currentUser.staff") || warningsDisabled) {
+      return false;
+    }
+
+    const hasTargetGroups = this.get("model.hasTargetGroups");
+
+    // We need exactly one user to issue a warning
+    if (
+      isEmpty(usernames) ||
+      usernames.split(",").length !== 1 ||
+      hasTargetGroups
+    ) {
+      return false;
+    }
+
+    return creatingPrivateMessage;
+  }
+
+  @discourseComputed("model.topic.title")
+  draftTitle(topicTitle) {
+    return emojiUnescape(escapeExpression(topicTitle));
+  }
+
+  @discourseComputed
+  allowUpload() {
+    return authorizesOneOrMoreExtensions(
+      this.currentUser.staff,
+      this.siteSettings
+    );
+  }
+
+  @discourseComputed()
+  uploadIcon() {
+    return uploadIcon(this.currentUser.staff, this.siteSettings);
+  }
+
+  // Use this to open the composer when you are not sure whether it is
+  // already open and whether it already has a draft being worked on. Supports
+  // options to append text once the composer is open if required.
+  //
+  // opts:
+  //
+  // - topic: if this is present, the composer will be opened with the reply
+  // action and the current topic key and draft sequence
+  // - fallbackToNewTopic: if true, and there is no draft and no topic,
+  // the composer will be opened with the create_topic action and a new
+  // topic draft key
+  // - insertText: the text to append to the composer once it is opened
+  // - openOpts: this object will be passed to this.open if fallbackToNewTopic is
+  // true or topic is provided
+  @action
+  async focusComposer(opts = {}) {
+    await this._openComposerForFocus(opts);
+    this._focusAndInsertText(opts.insertText);
+  }
+
+  async _openComposerForFocus(opts) {
+    if (this.get("model.viewOpen")) {
+      return;
+    }
+
+    const opened = this.openIfDraft();
+    if (opened) {
+      return;
+    }
+
+    if (opts.topic) {
+      return await this.open({
+        action: Composer.REPLY,
+        draftKey: opts.topic.get("draft_key"),
+        draftSequence: opts.topic.get("draft_sequence"),
+        topic: opts.topic,
+        ...(opts.openOpts || {}),
+      });
+    }
+
+    if (opts.fallbackToNewTopic) {
+      return await this.open({
+        action: Composer.CREATE_TOPIC,
+        draftKey: Composer.NEW_TOPIC_KEY,
+        ...(opts.openOpts || {}),
+      });
+    }
+  }
+
+  _focusAndInsertText(insertText) {
+    scheduleOnce("afterRender", () => {
+      document.querySelector("textarea.d-editor-input")?.focus();
+
+      if (insertText) {
+        this.model.appendText(insertText, null, { new_line: true });
+      }
+    });
+  }
+
+  @action
+  updateCategory(categoryId) {
+    this.model.categoryId = categoryId;
+  }
+
+  @action
+  openIfDraft(event) {
+    if (!this.get("model.viewDraft")) {
+      return false;
+    }
+
+    // when called from shortcut, ensure we don't propagate the key to
+    // the composer input title
+    if (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    }
+
+    this.set("model.composeState", Composer.OPEN);
+
+    document.documentElement.style.setProperty(
+      "--composer-height",
+      this.get("model.composerHeight")
+    );
+
+    return true;
+  }
+
+  @action
+  removeFullScreenExitPrompt() {
+    this.set("model.showFullScreenExitPrompt", false);
+  }
+
+  @action
+  async cancel(event) {
+    event?.preventDefault();
+    await this.cancelComposer();
+  }
+
+  @action
+  cancelUpload(event) {
+    event?.preventDefault();
+    this.set("model.uploadCancelled", true);
+  }
+
+  @action
+  togglePreview(event) {
+    event?.preventDefault();
+    this.toggleProperty("showPreview");
+  }
+
+  @action
+  viewNewReply(event) {
+    if (event && modKeysPressed(event).length > 0) {
+      return false;
+    }
+    event?.preventDefault();
+    DiscourseURL.routeTo(this.get("model.createdPost.url"));
+    this.close();
+  }
+
+  @action
+  closeComposer() {
+    this.close();
+  }
+
+  @action
+  async openComposer(options, post, topic) {
+    await this.open(options);
+
+    let url = post?.url || topic?.url;
+    const topicTitle = topic?.title;
+
+    if (!url || !topicTitle) {
+      return;
+    }
+
+    url = `${location.protocol}//${location.host}${url}`;
+    const link = `[${escapeExpression(topicTitle)}](${url})`;
+    const continueDiscussion = I18n.t("post.continue_discussion", {
+      postLink: link,
+    });
+
+    const reply = this.get("model.reply");
+    if (reply?.includes(continueDiscussion)) {
+      return;
+    }
+
+    this.model.prependText(continueDiscussion, {
+      new_line: true,
+    });
+  }
+
+  @action
+  onPopupMenuAction(menuAction) {
+    return (
+      this.actions?.[menuAction]?.bind(this) || // Legacy-style contributions from themes/plugins
+      this[menuAction]
+    )();
+  }
+
+  @action
+  storeToolbarState(toolbarEvent) {
+    this.set("toolbarEvent", toolbarEvent);
+  }
+
+  @action
+  typed() {
+    this.checkReplyLength();
+    this.model.typing();
+  }
+
+  @action
+  cancelled() {
+    this.hitEsc();
+  }
+
+  @action
+  addLinkLookup(linkLookup) {
+    this.set("linkLookup", linkLookup);
+  }
+
+  @action
+  afterRefresh($preview) {
+    const topic = this.get("model.topic");
+    const linkLookup = this.linkLookup;
+
+    if (!topic || !linkLookup) {
+      return;
+    }
+
+    // Don't check if there's only one post
+    if (topic.posts_count === 1) {
+      return;
+    }
+
+    const post = this.get("model.post");
+    const $links = $("a[href]", $preview);
+    $links.each((idx, l) => {
+      const href = l.href;
+      if (href && href.length) {
+        // skip links added by watched words
+        if (l.dataset.word !== undefined) {
+          return true;
+        }
+
+        // skip links in quotes and oneboxes
+        for (let element = l; element; element = element.parentElement) {
+          if (
+            element.tagName === "DIV" &&
+            element.classList.contains("d-editor-preview")
+          ) {
+            break;
+          }
+
+          if (
+            element.tagName === "ASIDE" &&
+            element.classList.contains("quote")
+          ) {
+            return true;
+          }
+
+          if (
+            element.tagName === "ASIDE" &&
+            element.classList.contains("onebox") &&
+            href !== element.dataset["onebox-src"]
+          ) {
+            return true;
+          }
+        }
+
+        const [linkWarn, linkInfo] = linkLookup.check(post, href);
+
+        if (linkWarn && !this.isWhispering) {
+          if (linkInfo.username === this.currentUser.username) {
+            this.appEvents.trigger("composer-messages:create", {
+              extraClass: "custom-body",
+              templateName: "education",
+              body: I18n.t("composer.duplicate_link_same_user", {
+                domain: linkInfo.domain,
+                post_url: topic.urlForPostNumber(linkInfo.post_number),
+                ago: shortDate(linkInfo.posted_at),
+              }),
+            });
+          } else {
+            this.appEvents.trigger("composer-messages:create", {
+              extraClass: "custom-body duplicate-link-message",
+              templateName: "education",
+              body: I18n.t("composer.duplicate_link", {
+                domain: linkInfo.domain,
+                username: linkInfo.username,
+                post_url: topic.urlForPostNumber(linkInfo.post_number),
+                ago: shortDate(linkInfo.posted_at),
+              }),
+            });
+          }
+
+          return false;
+        }
+      }
+      return true;
+    });
+  }
+
+  @action
+  toggleWhisper() {
+    this.toggleProperty("model.whisper");
+  }
+
+  @action
+  toggleInvisible() {
+    this.toggleProperty("model.unlistTopic");
+  }
+
+  @action
+  toggleToolbar() {
+    this.toggleProperty("showToolbar");
+  }
+
+  // Toggle the reply view
+  @action
+  async toggle() {
+    this.closeAutocomplete();
+
+    const composer = this.model;
+
+    if (isEmpty(composer?.reply) && isEmpty(composer?.title)) {
+      this.close();
+    } else if (composer?.viewOpenOrFullscreen) {
+      this.shrink();
+    } else {
+      await this.cancelComposer();
+    }
+  }
+
+  @action
+  fullscreenComposer() {
+    this.toggleFullscreen();
+    return false;
+  }
+
+  // Import a quote from the post
+  @action
+  async importQuote(toolbarEvent) {
+    const postStream = this.get("topic.postStream");
+    let postId = this.get("model.post.id");
+
+    // If there is no current post, use the first post id from the stream
+    if (!postId && postStream) {
+      postId = postStream.get("stream.firstObject");
+    }
+
+    // If we're editing a post, fetch the reply when importing a quote
+    if (this.get("model.editingPost")) {
+      const replyToPostNumber = this.get("model.post.reply_to_post_number");
+      if (replyToPostNumber) {
+        const replyPost = postStream.posts.findBy(
+          "post_number",
+          replyToPostNumber
+        );
+
+        if (replyPost) {
+          postId = replyPost.id;
+        }
+      }
+    }
+
+    if (!postId) {
+      return;
+    }
+
+    this.set("model.loading", true);
+
+    const post = await this.store.find("post", postId);
+    const quote = buildQuote(post, post.raw, { full: true });
+
+    toolbarEvent.addText(quote);
+    this.set("model.loading", false);
+  }
+
+  @action
+  saveAction(ignore, event) {
+    this.save(false, {
+      jump:
+        !(event?.shiftKey && this.get("model.replyingToTopic")) &&
+        !this.skipJumpOnSave,
+    });
+  }
+
+  @action
+  displayEditReason() {
+    this.set("showEditReason", true);
+  }
+
+  @action
+  hitEsc() {
+    if (document.querySelectorAll(".emoji-picker-modal.fadeIn").length === 1) {
+      this.appEvents.trigger("emoji-picker:close");
+      return;
+    }
+
+    if ((this.messageCount || 0) > 0) {
+      this.appEvents.trigger("composer-messages:close");
+      return;
+    }
+
+    const composer = this.model;
+
+    if (composer?.viewOpen) {
+      this.shrink();
+    }
+
+    if (composer?.viewFullscreen) {
+      this.toggleFullscreen();
+      this.focusComposer();
+    }
+  }
+
+  @action
+  groupsMentioned({ name, userCount, maxMentions }) {
+    if (
+      this.get("model.creatingPrivateMessage") ||
+      this.get("model.topic.isPrivateMessage")
+    ) {
+      return;
+    }
+
+    maxMentions = parseInt(maxMentions, 10);
+    userCount = parseInt(userCount, 10);
+
+    let body;
+    const groupLink = getURL(`/g/${name}/members`);
+
+    if (userCount > maxMentions) {
+      body = I18n.t("composer.group_mentioned_limit", {
+        group: `@${name}`,
+        count: maxMentions,
+        group_link: groupLink,
+      });
+    } else if (userCount > 0) {
+      body = I18n.t("composer.group_mentioned", {
+        group: `@${name}`,
+        count: userCount,
+        group_link: groupLink,
+      });
+    }
+
+    if (body) {
+      this.appEvents.trigger("composer-messages:create", {
+        extraClass: "custom-body",
+        templateName: "education",
+        body,
+      });
+    }
+  }
+
+  @action
+  cannotSeeMention({ name, reason, notifiedCount, isGroup }) {
+    notifiedCount = parseInt(notifiedCount, 10);
+
+    let body;
+    if (isGroup) {
+      body = I18n.t(`composer.cannot_see_group_mention.${reason}`, {
+        group: name,
+        count: notifiedCount,
+      });
+    } else {
+      body = I18n.t(`composer.cannot_see_mention.${reason}`, {
+        username: name,
+      });
+    }
+
+    this.appEvents.trigger("composer-messages:create", {
+      extraClass: "custom-body",
+      templateName: "education",
+      body,
+    });
+  }
+
+  @action
+  hereMention(count) {
+    this.appEvents.trigger("composer-messages:create", {
+      extraClass: "custom-body",
+      templateName: "education",
+      body: I18n.t("composer.here_mention", {
+        here: this.siteSettings.here_mention,
+        count,
+      }),
+    });
+  }
+
+  @action
+  applyFormatCode() {
+    this.toolbarEvent.formatCode();
+  }
+
+  @action
+  applyUnorderedList() {
+    this.toolbarEvent.applyList("* ", "list_item");
+  }
+
+  @action
+  applyOrderedList() {
+    this.toolbarEvent.applyList(
+      (i) => (!i ? "1. " : `${parseInt(i, 10) + 1}. `),
+      "list_item"
+    );
+  }
+
+  save(force, options = {}) {
+    if (this.disableSubmit) {
+      return;
+    }
+
+    // Clear the warning state if we're not showing the checkbox anymore
+    if (!this.showWarning) {
+      this.set("model.isWarning", false);
+    }
+
+    if (this.site.mobileView && this.showPreview) {
+      this.set("showPreview", false);
+    }
+
+    if (this.siteSettings.experimental_form_templates) {
+      if (
+        this.formTemplateIds?.length > 0 &&
+        !this.get("model.replyingToTopic")
+      ) {
+        const formTemplateData = prepareFormTemplateData(
+          document.querySelector("#form-template-form")
+        );
+        if (formTemplateData) {
+          this.model.set("reply", formTemplateData);
+        } else {
+          return;
+        }
+      }
+    }
+
+    const composer = this.model;
+
+    if (composer?.cantSubmitPost) {
+      if (composer?.viewFullscreen) {
+        this.toggleFullscreen();
+      }
+
+      this.set("lastValidatedAt", Date.now());
+      return;
+    }
+
+    const topic = composer.topic;
+    const slowModePost =
+      topic && topic.slow_mode_seconds && topic.user_last_posted_at;
+    const notEditing = this.get("model.action") !== "edit";
+
+    // Editing a topic in slow mode is directly handled by the backend.
+    if (slowModePost && notEditing) {
+      if (
+        cannotPostAgain(
+          this.currentUser,
+          topic.slow_mode_seconds,
+          topic.user_last_posted_at
+        )
+      ) {
+        const canPostAt = new moment(topic.user_last_posted_at).add(
+          topic.slow_mode_seconds,
+          "seconds"
+        );
+        const timeLeft = moment().diff(canPostAt, "seconds");
+        const message = I18n.t("composer.slow_mode.error", {
+          timeLeft: durationTextFromSeconds(timeLeft),
+        });
+
+        this.dialog.alert(message);
+        return;
+      } else {
+        // Edge case where the user tries to post again immediately.
+        topic.set("user_last_posted_at", new Date().toISOString());
+      }
+    }
+
+    composer.set("disableDrafts", true);
+
+    // for now handle a very narrow use case
+    // if we are replying to a topic
+    // AND are on on a different topic
+    // AND topic is open (or we are staff)
+    // --> pop the window up
+    if (!force && composer.replyingToTopic) {
+      const currentTopic = this.topicModel;
+      const originalTopic = this.model.topic;
+
+      if (!currentTopic) {
+        this.save(true);
+        return;
+      }
+
+      const topicLabelContent = function (topicOption) {
+        const topicClosed = topicOption.closed
+          ? `<span class="topic-status">${iconHTML("lock")}</span>`
+          : "";
+        const topicPinned = topicOption.pinned
+          ? `<span class="topic-status">${iconHTML("thumbtack")}</span>`
+          : "";
+        const topicBookmarked = topicOption.bookmarked
+          ? `<span class="topic-status">${iconHTML("bookmark")}</span>`
+          : "";
+        const topicPM =
+          topicOption.archetype === "private_message"
+            ? `<span class="topic-status">${iconHTML("envelope")}</span>`
+            : "";
+
+        return `<div class='topic-title'>
+                  <div class="topic-title__top-line">
+                    <span class='topic-statuses'>
+                      ${topicPM}${topicBookmarked}${topicClosed}${topicPinned}
+                    </span>
+                    <span class='fancy-title'>
+                      ${topicOption.fancyTitle}
+                    </span>
+                  </div>
+                  <div class="topic-title__bottom-line">
+                    ${categoryBadgeHTML(topicOption.category, {
+                      link: false,
+                    })}${htmlSafe(renderTags(topicOption))}
+                  </div>
+                </div>`;
+      };
+
+      if (
+        currentTopic.id !== composer.get("topic.id") &&
+        (this.isStaffUser || !currentTopic.closed)
+      ) {
+        this.dialog.alert({
+          title: I18n.t("composer.posting_not_on_topic"),
+          buttons: [
+            {
+              label: topicLabelContent(originalTopic),
+              class: "btn-primary btn-reply-where btn-reply-on-original",
+              action: () => this.save(true),
+            },
+            {
+              label: topicLabelContent(currentTopic),
+              class: "btn-reply-where btn-reply-here",
+              action: () => {
+                composer.setProperties({ topic: currentTopic, post: null });
+                this.save(true);
+              },
+            },
+            {
+              label: I18n.t("composer.cancel"),
+              class: "btn-flat btn-text btn-reply-where__cancel",
+            },
+          ],
+          class: "reply-where-modal",
+        });
+        return;
+      }
+    }
+
+    let staged = false;
+
+    // TODO: This should not happen in model
+    const imageSizes = {};
+    document
+      .querySelectorAll(
+        "#reply-control .d-editor-preview img:not(.avatar, .emoji)"
+      )
+      .forEach((e) => {
+        const src = e.src;
+
+        if (src && src.length) {
+          imageSizes[src] = { width: e.naturalWidth, height: e.naturalHeight };
+        }
+      });
+
+    const promise = composer
+      .save({ imageSizes, editReason: this.editReason })
+      .then((result) => {
+        this.appEvents.trigger("composer:saved");
+
+        if (result.responseJson.action === "enqueued") {
+          this.postWasEnqueued(result.responseJson);
+          if (result.responseJson.pending_post) {
+            let pendingPosts = this.get("topicController.model.pending_posts");
+            if (pendingPosts) {
+              pendingPosts.pushObject(result.responseJson.pending_post);
+            }
+          }
+
+          return this.destroyDraft().then(() => {
+            this.close();
+            this.appEvents.trigger("post-stream:refresh");
+            return result;
+          });
+        }
+
+        if (this.get("model.editingPost")) {
+          this.appEvents.trigger("composer:edited-post");
+          this.appEvents.trigger("post-stream:refresh", {
+            id: parseInt(result.responseJson.id, 10),
+          });
+          if (result.responseJson.post.post_number === 1) {
+            this.appEvents.trigger("header:update-topic", composer.topic);
+          }
+        } else {
+          this.appEvents.trigger("post-stream:refresh");
+        }
+
+        if (result.responseJson.action === "create_post") {
+          this.appEvents.trigger("composer:created-post");
+          this.appEvents.trigger(
+            "post:highlight",
+            result.payload.post_number,
+            options
+          );
+        }
+
+        if (this.get("model.draftKey") === Composer.NEW_TOPIC_KEY) {
+          this.currentUser.set("has_topic_draft", false);
+        }
+
+        if (result.responseJson.route_to) {
+          // TODO: await this:
+          this.destroyDraft();
+          if (result.responseJson.message) {
+            return this.dialog.alert({
+              message: result.responseJson.message,
+              didConfirm: () => {
+                DiscourseURL.routeTo(result.responseJson.route_to);
+              },
+            });
+          }
+          return DiscourseURL.routeTo(result.responseJson.route_to);
+        }
+
+        this.close();
+
+        this.currentUser.set("any_posts", true);
+
+        const post = result.target;
+
+        if (post && !staged && options.jump !== false) {
+          DiscourseURL.routeTo(post.url, {
+            keepFilter: true,
+            skipIfOnScreen: true,
+          });
+        }
+      })
+      .catch((error) => {
+        composer.set("disableDrafts", false);
+        if (error) {
+          this.appEvents.one("composer:will-open", () => {
+            if (
+              _composerSaveErrorCallbacks.length === 0 ||
+              !_composerSaveErrorCallbacks
+                .map((c) => {
+                  return c.call(this, error);
+                })
+                .some((i) => {
+                  return i;
+                })
+            ) {
+              this.dialog.alert(error);
+            }
+          });
+        }
+      });
+
+    if (
+      this.router.currentRouteName.split(".")[0] === "topic" &&
+      composer.get("topic.id") === this.get("topicModel.id")
+    ) {
+      staged = composer.get("stagedPost");
+    }
+
+    this.appEvents.trigger("post-stream:posted", staged);
+
+    this.messageBus.pause();
+    promise.finally(() => this.messageBus.resume());
+
+    return promise;
+  }
+
+  @action
+  postWasEnqueued(details) {
+    showModal("post-enqueued", {
+      model: details,
+      title: "review.approval.title",
+    });
+  }
+
+  // Notify the composer messages controller that a reply has been typed. Some
+  // messages only appear after typing.
+  checkReplyLength() {
+    if (!isEmpty("model.reply")) {
+      this.appEvents.trigger("composer:typed-reply");
+    }
+  }
+
+  /**
+    Open the composer view
+
+    @method open
+    @param {Object} opts Options for creating a post
+      @param {String} opts.action The action we're performing: edit, reply, createTopic, createSharedDraft, privateMessage
+      @param {String} opts.draftKey
+      @param {Post} [opts.post] The post we're replying to
+      @param {Topic} [opts.topic] The topic we're replying to
+      @param {String} [opts.quote] If we're opening a reply from a quote, the quote we're making
+      @param {Boolean} [opts.ignoreIfChanged]
+      @param {Boolean} [opts.disableScopedCategory]
+      @param {Number} [opts.categoryId] Sets `scopedCategoryId` and `categoryId` on the Composer model
+      @param {Number} [opts.prioritizedCategoryId]
+      @param {String} [opts.draftSequence]
+      @param {Boolean} [opts.skipDraftCheck]
+      @param {Boolean} [opts.skipJumpOnSave] Option to skip navigating to the post when saved in this composer session
+  **/
+  async open(opts = {}) {
+    if (!opts.draftKey) {
+      throw new Error("composer opened without a proper draft key");
+    }
+
+    let composerModel = this.model;
+
+    if (
+      opts.ignoreIfChanged &&
+      composerModel &&
+      composerModel.composeState !== Composer.CLOSED
+    ) {
+      return;
+    }
+
+    this.setProperties({
+      showEditReason: false,
+      editReason: null,
+      scopedCategoryId: null,
+      prioritizedCategoryId: null,
+      skipAutoSave: true,
+    });
+
+    this.set("skipJumpOnSave", !!opts.skipJumpOnSave);
+
+    // Scope the categories drop down to the category we opened the composer with.
+    if (opts.categoryId && !opts.disableScopedCategory) {
+      const category = this.site.categories.findBy("id", opts.categoryId);
+      if (category) {
+        this.set("scopedCategoryId", opts.categoryId);
+      }
+    }
+
+    if (opts.prioritizedCategoryId) {
+      const category = this.site.categories.findBy(
+        "id",
+        opts.prioritizedCategoryId
+      );
+
+      if (category) {
+        this.set("prioritizedCategoryId", opts.prioritizedCategoryId);
+      }
+    }
+
+    // If we want a different draft than the current composer, close it and clear our model.
+    if (
+      composerModel &&
+      opts.draftKey !== composerModel.draftKey &&
+      composerModel.composeState === Composer.DRAFT
+    ) {
+      this.close();
+      composerModel = null;
+    }
+
+    try {
+      if (composerModel?.replyDirty) {
+        // If we're already open, we don't have to do anything
+        if (
+          composerModel.composeState === Composer.OPEN &&
+          composerModel.draftKey === opts.draftKey &&
+          !opts.action
+        ) {
+          return;
+        }
+
+        // If it's the same draft, just open it up again.
+        if (
+          composerModel.composeState === Composer.DRAFT &&
+          composerModel.draftKey === opts.draftKey
+        ) {
+          composerModel.set("composeState", Composer.OPEN);
+          if (!opts.action) {
+            return;
+          }
+        }
+
+        await this.cancelComposer(opts);
+        await this.open(opts);
+        return;
+      }
+
+      if (composerModel && composerModel.action !== opts.action) {
+        composerModel.setProperties({ unlistTopic: false, whisper: false });
+      }
+
+      // we need a draft sequence for the composer to work
+      if (opts.draftSequence === undefined) {
+        let data = await Draft.get(opts.draftKey);
+
+        if (opts.skipDraftCheck) {
+          data.draft = undefined;
+        } else {
+          data = await this.confirmDraftAbandon(data);
+        }
+
+        opts.draft ||= data.draft;
+        opts.draftSequence = data.draft_sequence;
+
+        await this._setModel(composerModel, opts);
+        return;
+      }
+
+      // otherwise, do the draft check async
+      if (!opts.draft && !opts.skipDraftCheck) {
+        let data = await Draft.get(opts.draftKey);
+        data = await this.confirmDraftAbandon(data);
+
+        if (data.draft) {
+          opts.draft = data.draft;
+          opts.draftSequence = data.draft_sequence;
+          await this.open(opts);
+        }
+      }
+
+      await this._setModel(composerModel, opts);
+    } finally {
+      this.skipAutoSave = false;
+    }
+  }
+
+  // Given a potential instance and options, set the model for this composer.
+  async _setModel(optionalComposerModel, opts) {
+    this.set("linkLookup", null);
+
+    let composerModel;
+    if (opts.draft) {
+      composerModel = await loadDraft(this.store, opts);
+
+      if (!composerModel) {
+        throw new Error("draft was not found");
+      }
+    } else {
+      const model =
+        optionalComposerModel || this.store.createRecord("composer");
+
+      await model.open(opts);
+      composerModel = model;
+    }
+
+    this.set("model", composerModel);
+
+    composerModel.setProperties({
+      composeState: Composer.OPEN,
+      isWarning: false,
+      hasTargetGroups: opts.hasGroups,
+      warningsDisabled: opts.warningsDisabled,
+    });
+
+    if (!this.model.targetRecipients) {
+      if (opts.usernames) {
+        deprecated("`usernames` is deprecated, use `recipients` instead.", {
+          id: "discourse.composer.usernames",
+        });
+        this.model.set("targetRecipients", opts.usernames);
+      } else if (opts.recipients) {
+        this.model.set("targetRecipients", opts.recipients);
+      }
+    }
+
+    if (
+      opts.topicTitle &&
+      opts.topicTitle.length <= this.siteSettings.max_topic_title_length
+    ) {
+      this.model.set("title", opts.topicTitle);
+    }
+
+    if (opts.topicCategoryId) {
+      this.model.set("categoryId", opts.topicCategoryId);
+    }
+
+    if (opts.topicTags && this.site.can_tag_topics) {
+      let tags = escapeExpression(opts.topicTags)
+        .split(",")
+        .slice(0, this.siteSettings.max_tags_per_topic);
+
+      tags.forEach(
+        (tag, index, array) =>
+          (array[index] = tag.substring(0, this.siteSettings.max_tag_length))
+      );
+
+      this.model.set("tags", tags);
+    }
+
+    if (opts.topicBody) {
+      this.model.set("reply", opts.topicBody);
+    }
+
+    const defaultComposerHeight = this._getDefaultComposerHeight();
+
+    this.set("model.composerHeight", defaultComposerHeight);
+    document.documentElement.style.setProperty(
+      "--composer-height",
+      defaultComposerHeight
+    );
+  }
+
+  _getDefaultComposerHeight() {
+    if (this.keyValueStore.getItem("composerHeight")) {
+      return this.keyValueStore.getItem("composerHeight");
+    }
+
+    // The two custom properties below can be overriden by themes/plugins to set different default composer heights.
+    if (this.model.action === "reply") {
+      return "var(--reply-composer-height, 300px)";
+    } else {
+      return "var(--new-topic-composer-height, 400px)";
+    }
+  }
+
+  async destroyDraft(draftSequence = null) {
+    const key = this.get("model.draftKey");
+    if (!key) {
+      return;
+    }
+
+    if (key === Composer.NEW_TOPIC_KEY) {
+      this.currentUser.set("has_topic_draft", false);
+    }
+
+    if (this._saveDraftPromise) {
+      await this._saveDraftPromise;
+      return await this.destroyDraft();
+    }
+
+    const sequence = draftSequence || this.get("model.draftSequence");
+    await Draft.clear(key, sequence);
+    this.appEvents.trigger("draft:destroyed", key);
+  }
+
+  confirmDraftAbandon(data) {
+    if (!data.draft) {
+      return data;
+    }
+
+    // do not show abandon dialog if old draft is clean
+    const draft = JSON.parse(data.draft);
+    if (draft.reply === draft.originalText) {
+      data.draft = null;
+      return data;
+    }
+
+    if (!_checkDraftPopup) {
+      data.draft = null;
+      return data;
+    }
+
+    return new Promise((resolve) => {
+      this.dialog.alert({
+        message: I18n.t("drafts.abandon.confirm"),
+        buttons: [
+          {
+            label: I18n.t("drafts.abandon.yes_value"),
+            class: "btn-danger",
+            icon: "far-trash-alt",
+            action: () => {
+              this.destroyDraft(data.draft_sequence).finally(() => {
+                data.draft = null;
+                resolve(data);
+              });
+            },
+          },
+          {
+            label: I18n.t("drafts.abandon.no_value"),
+            class: "btn-resume-editing",
+            action: () => resolve(data),
+          },
+        ],
+      });
+    });
+  }
+
+  cancelComposer(opts = {}) {
+    this.skipAutoSave = true;
+
+    if (this._saveDraftDebounce) {
+      cancel(this._saveDraftDebounce);
+    }
+
+    return new Promise((resolve) => {
+      if (this.get("model.hasMetaData") || this.get("model.replyDirty")) {
+        const overridesDraft =
+          this.model.composeState === Composer.OPEN &&
+          this.model.draftKey === opts.draftKey &&
+          [Composer.EDIT_SHARED_DRAFT, Composer.EDIT].includes(opts.action);
+        const showSaveDraftButton = this.model.canSaveDraft && !overridesDraft;
+        this.modal.show(DiscardDraftModal, {
+          model: {
+            showSaveDraftButton,
+            onDestroyDraft: () => {
+              return this.destroyDraft()
+                .then(() => {
+                  this.model.clearState();
+                  this.close();
+                })
+                .finally(() => {
+                  this.appEvents.trigger("composer:cancelled");
+                  resolve();
+                });
+            },
+            onSaveDraft: () => {
+              this._saveDraft();
+              this.model.clearState();
+              this.close();
+              this.appEvents.trigger("composer:cancelled");
+              return resolve();
+            },
+          },
+        });
+      } else {
+        // it is possible there is some sort of crazy draft with no body ... just give up on it
+        this.destroyDraft()
+          .then(() => {
+            this.model.clearState();
+            this.close();
+          })
+          .finally(() => {
+            this.appEvents.trigger("composer:cancelled");
+            resolve();
+          });
+      }
+    }).finally(() => {
+      this.skipAutoSave = false;
+    });
+  }
+
+  shrink() {
+    if (
+      this.get("model.replyDirty") ||
+      (this.get("model.canEditTitle") && this.get("model.titleDirty"))
+    ) {
+      this.collapse();
+    } else {
+      this.close();
+    }
+  }
+
+  _saveDraft() {
+    if (!this.model) {
+      return;
+    }
+
+    if (this.model.draftSaving) {
+      this._saveDraftDebounce = discourseDebounce(this, this._saveDraft, 2000);
+    } else {
+      this._saveDraftPromise = this.model
+        .saveDraft(this.currentUser)
+        .finally(() => {
+          this._lastDraftSaved = Date.now();
+          this._saveDraftPromise = null;
+        });
+    }
+  }
+
+  @observes("model.reply", "model.title")
+  _shouldSaveDraft() {
+    if (
+      this.model &&
+      !this.model.loading &&
+      !this.skipAutoSave &&
+      !this.model.disableDrafts
+    ) {
+      if (!this._lastDraftSaved) {
+        // pretend so we get a save unconditionally in 15 secs
+        this._lastDraftSaved = Date.now();
+      }
+      if (Date.now() - this._lastDraftSaved > 15000) {
+        this._saveDraft();
+      } else {
+        this._saveDraftDebounce = discourseDebounce(
+          this,
+          this._saveDraft,
+          2000
+        );
+      }
+    }
+  }
+
+  @discourseComputed("model.categoryId", "lastValidatedAt")
+  categoryValidation(categoryId, lastValidatedAt) {
+    if (!this.siteSettings.allow_uncategorized_topics && !categoryId) {
+      return EmberObject.create({
+        failed: true,
+        reason: I18n.t("composer.error.category_missing"),
+        lastShownAt: lastValidatedAt,
+      });
+    }
+  }
+
+  @discourseComputed("model.category", "model.tags", "lastValidatedAt")
+  tagValidation(category, tags, lastValidatedAt) {
+    const tagsArray = tags || [];
+    if (this.site.can_tag_topics && !this.currentUser.staff && category) {
+      // category.minimumRequiredTags incorporates both minimum_required_tags, and required_tag_groups
+      if (category.minimumRequiredTags > tagsArray.length) {
+        return EmberObject.create({
+          failed: true,
+          reason: I18n.t("composer.error.tags_missing", {
+            count: category.minimumRequiredTags,
+          }),
+          lastShownAt: lastValidatedAt,
+        });
+      }
+    }
+  }
+
+  collapse() {
+    this._saveDraft();
+    this.set("model.composeState", Composer.DRAFT);
+    document.documentElement.style.setProperty("--composer-height", "40px");
+  }
+
+  toggleFullscreen() {
+    this._saveDraft();
+
+    const composer = this.model;
+
+    if (composer?.viewFullscreen) {
+      composer?.set("composeState", Composer.OPEN);
+    } else {
+      composer?.set("composeState", Composer.FULLSCREEN);
+      composer?.set("showFullScreenExitPrompt", true);
+    }
+  }
+
+  @discourseComputed("model.viewFullscreen", "model.showFullScreenExitPrompt")
+  showFullScreenPrompt(isFullscreen, showExitPrompt) {
+    return isFullscreen && showExitPrompt && !this.capabilities.touch;
+  }
+
+  close() {
+    // the 'fullscreen-composer' class is added to remove scrollbars from the
+    // document while in fullscreen mode. If the composer is closed for any reason
+    // this class should be removed
+
+    const elem = document.querySelector("html");
+    elem.classList.remove("fullscreen-composer");
+    elem.classList.remove("composer-open");
+
+    document.activeElement?.blur();
+    document.documentElement.style.removeProperty("--composer-height");
+    this.setProperties({ model: null, lastValidatedAt: null });
+  }
+
+  closeAutocomplete() {
+    $(".d-editor-input").autocomplete({ cancel: true });
+  }
+
+  @discourseComputed("model.action")
+  canEdit(modelAction) {
+    return modelAction === "edit" && this.currentUser.can_edit;
+  }
+
+  @discourseComputed("model.composeState")
+  visible(state) {
+    return state && state !== "closed";
+  }
+
+  clearLastValidatedAt() {
+    this.set("lastValidatedAt", null);
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/services/lightbox.js b/app/assets/javascripts/discourse/app/services/lightbox.js
new file mode 100644
index 00000000000..884d8d8154b
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/services/lightbox.js
@@ -0,0 +1,271 @@
+import {
+  DOCUMENT_ELEMENT_LIGHTBOX_OPEN_CLASS,
+  LIGHTBOX_APP_EVENT_NAMES,
+  MIN_CAROUSEL_ARROW_ITEM_COUNT,
+  SELECTORS,
+} from "discourse/lib/lightbox/constants";
+import Service, { inject as service } from "@ember/service";
+import {
+  getSiteThemeColor,
+  setSiteThemeColor,
+} from "discourse/lib/lightbox/helpers";
+
+import { bind } from "discourse-common/utils/decorators";
+import { isDocumentRTL } from "discourse/lib/text-direction";
+import { processHTML } from "discourse/lib/lightbox/process-html";
+
+export default class LightboxService extends Service {
+  @service appEvents;
+  @service site;
+
+  lightboxIsOpen = false;
+  lightboxClickElements = [];
+  lastFocusedElement = null;
+  originalSiteThemeColor = null;
+  onFocus = null;
+  selector = null;
+
+  callbacks = {};
+  options = {};
+
+  async init() {
+    super.init(...arguments);
+
+    this.callbacks = {
+      onOpen: this.onLightboxOpened,
+      onClose: this.onLightboxClosed,
+      onWillChange: this.onLightboxItemWillChange,
+      onItemDidChange: this.onLightboxItemDidChange,
+      onCleanUp: this.onLightboxCleanedUp,
+    };
+
+    this.options = {
+      isMobile: this.site.mobileView,
+      isRTL: isDocumentRTL(),
+      minCarosuelArrowItemCount: MIN_CAROUSEL_ARROW_ITEM_COUNT,
+      zoomOnOpen: false,
+      canDownload:
+        this.currentUser ||
+        !this.siteSettings.prevent_anons_from_downloading_files,
+    };
+
+    this.appEvents.on(
+      LIGHTBOX_APP_EVENT_NAMES.CLEAN,
+      this,
+      this.cleanupLightboxes
+    );
+  }
+
+  @bind
+  async onLightboxOpened({ items, currentItem }) {
+    this.originalSiteThemeColor = await getSiteThemeColor();
+
+    document.documentElement.classList.add(
+      DOCUMENT_ELEMENT_LIGHTBOX_OPEN_CLASS
+    );
+
+    this.#setupDocumentFocus();
+
+    this.appEvents.trigger(LIGHTBOX_APP_EVENT_NAMES.OPENED, {
+      items,
+      currentItem,
+    });
+  }
+
+  @bind
+  async onLightboxItemWillChange({ currentItem }) {
+    this.appEvents.trigger(LIGHTBOX_APP_EVENT_NAMES.ITEM_WILL_CHANGE, {
+      currentItem,
+    });
+  }
+
+  @bind
+  async onLightboxItemDidChange({ currentItem }) {
+    this.appEvents.trigger(LIGHTBOX_APP_EVENT_NAMES.ITEM_DID_CHANGE, {
+      currentItem,
+    });
+  }
+
+  @bind
+  async onLightboxClosed() {
+    document.documentElement.classList.remove(
+      DOCUMENT_ELEMENT_LIGHTBOX_OPEN_CLASS
+    );
+
+    setSiteThemeColor(this.originalSiteThemeColor);
+    this.#restoreDocumentFocus();
+
+    this.originalSiteThemeColor = "";
+    this.lightboxIsOpen = false;
+
+    this.appEvents.trigger(LIGHTBOX_APP_EVENT_NAMES.CLOSED);
+  }
+
+  @bind
+  onLightboxCleanedUp() {
+    return true;
+  }
+
+  @bind
+  async openLightbox({ container, selector, clickTarget }) {
+    const { items, startingIndex } = await processHTML({
+      container,
+      selector,
+      clickTarget,
+    });
+
+    if (!items.length) {
+      return;
+    }
+
+    this.appEvents.trigger(LIGHTBOX_APP_EVENT_NAMES.OPEN, {
+      items,
+      startingIndex,
+      callbacks: { ...this.callbacks },
+      options: { ...this.options },
+    });
+
+    this.lightboxIsOpen = true;
+  }
+
+  @bind
+  async closeLightbox() {
+    if (this.lightboxIsOpen) {
+      this.appEvents.trigger(LIGHTBOX_APP_EVENT_NAMES.CLOSE);
+      this.lightboxIsOpen = false;
+    }
+  }
+
+  async #setupLightboxes({ container, selector }) {
+    if (!container) {
+      throw new Error("Lightboxes require a container to be passed in");
+    }
+
+    this.selector = selector;
+    const hasLightboxes = container.querySelector(selector);
+
+    if (!hasLightboxes) {
+      return;
+    }
+
+    const handlerOptions = { capture: true };
+    container.addEventListener(
+      "click",
+      (event) => {
+        this.handleClickEvent(event, selector);
+      },
+      handlerOptions
+    );
+
+    this.lightboxClickElements.push({ container, handlerOptions });
+  }
+
+  @bind
+  async setupLightboxes({ container, selector }) {
+    this.#setupLightboxes({ container, selector });
+  }
+
+  async #cleanupLightboxes() {
+    this.closeLightbox();
+
+    this.lightboxClickElements.forEach(({ container, handlerOptions }) => {
+      container.removeEventListener(
+        "click",
+        this.handleClickEvent,
+        handlerOptions
+      );
+    });
+
+    this.lightboxClickElements = [];
+  }
+
+  @bind
+  async cleanupLightboxes() {
+    this.#cleanupLightboxes();
+  }
+
+  async #setupDocumentFocus() {
+    if (!this.lightboxIsOpen) {
+      return;
+    }
+
+    this.lastFocusedElement = document.activeElement;
+    document.activeElement.blur();
+    document.querySelector(SELECTORS.CLOSE_BUTTON)?.focus();
+
+    const focusableElements = document.querySelectorAll(
+      SELECTORS.LIGHTBOX_CONTAINER + " button"
+    );
+
+    const firstFocusableElement = focusableElements[0];
+    const lastFocusableElement =
+      focusableElements[focusableElements.length - 1];
+
+    const focusTraps = document.querySelectorAll(SELECTORS.FOCUS_TRAP);
+
+    const firstfocusTrap = focusTraps[0];
+    const lastfocusTrap = focusTraps[focusTraps.length - 1];
+
+    this.onFocus = ({ target }) => {
+      if (target === firstfocusTrap) {
+        lastFocusableElement.focus();
+      } else if (target === lastfocusTrap) {
+        firstFocusableElement.focus();
+      }
+    };
+
+    document.addEventListener("focus", this.onFocus, {
+      passive: true,
+      capture: true,
+    });
+  }
+
+  async #restoreDocumentFocus() {
+    document.removeEventListener("focus", this.onFocus, {
+      passive: true,
+      capture: true,
+    });
+
+    document.activeElement.blur();
+
+    this.lastFocusedElement?.focus();
+  }
+
+  async #reset() {
+    this.appEvents.off(
+      LIGHTBOX_APP_EVENT_NAMES.CLEAN,
+      this,
+      this.cleanupLightboxes
+    );
+  }
+
+  handleClickEvent(event, trigger) {
+    const closestTrigger = event.target.closest(trigger);
+    const isLightboxClick = event
+      .composedPath()
+      .find(
+        (element) =>
+          element.matches &&
+          (element.matches(trigger) ||
+            element.matches("[data-lightbox-trigger]"))
+      );
+
+    if (!isLightboxClick) {
+      return;
+    }
+
+    event.preventDefault();
+
+    this.openLightbox({
+      container: event.currentTarget,
+      selector: trigger,
+      clickTarget: closestTrigger,
+    });
+
+    event.target.toggleAttribute(SELECTORS.DOCUMENT_LAST_FOCUSED_ELEMENT);
+  }
+
+  willDestroy() {
+    this.#reset();
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/services/loading-slider.js b/app/assets/javascripts/discourse/app/services/loading-slider.js
new file mode 100644
index 00000000000..08f1bb04e14
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/services/loading-slider.js
@@ -0,0 +1,129 @@
+import Service, { inject as service } from "@ember/service";
+import Evented from "@ember/object/evented";
+import { cancel, later, schedule } from "@ember/runloop";
+import { tracked } from "@glimmer/tracking";
+import { bind } from "discourse-common/utils/decorators";
+import { disableImplicitInjections } from "discourse/lib/implicit-injections";
+
+const STORE_LOADING_TIMES = 5;
+const DEFAULT_LOADING_TIME = 0.3;
+const MIN_LOADING_TIME = 0.1;
+
+const STILL_LOADING_DURATION = 2;
+
+class RollingAverage {
+  @tracked average;
+  #values = [];
+  #i = 0;
+  #size;
+
+  constructor(size, initialAverage) {
+    this.#size = size;
+    this.average = initialAverage;
+  }
+
+  record(value) {
+    this.#values[this.#i] = value;
+    this.#i = (this.#i + 1) % this.#size;
+    this.average =
+      this.#values.reduce((p, c) => p + c, 0) / this.#values.length;
+  }
+}
+
+class ScheduleManager {
+  #scheduled = [];
+
+  cancelAll() {
+    this.#scheduled.forEach((s) => cancel(s));
+    this.#scheduled = [];
+  }
+
+  schedule() {
+    this.#scheduled.push(schedule(...arguments));
+  }
+
+  later() {
+    this.#scheduled.push(later(...arguments));
+  }
+}
+
+class Timer {
+  #startedAt;
+
+  start() {
+    this.#startedAt = Date.now();
+  }
+
+  stop() {
+    return (Date.now() - this.#startedAt) / 1000;
+  }
+}
+
+@disableImplicitInjections
+export default class LoadingSlider extends Service.extend(Evented) {
+  @service siteSettings;
+  @tracked loading = false;
+  @tracked stillLoading = false;
+
+  rollingAverage = new RollingAverage(
+    STORE_LOADING_TIMES,
+    DEFAULT_LOADING_TIME
+  );
+
+  scheduleManager = new ScheduleManager();
+
+  timer = new Timer();
+
+  get enabled() {
+    return this.siteSettings.page_loading_indicator === "slider";
+  }
+
+  get averageLoadingDuration() {
+    return this.rollingAverage.average;
+  }
+
+  transitionStarted() {
+    this.timer.start();
+    this.loading = true;
+    this.trigger("stateChanged", true);
+
+    this.scheduleManager.cancelAll();
+
+    this.scheduleManager.later(
+      this.setStillLoading,
+      STILL_LOADING_DURATION * 1000
+    );
+  }
+
+  @bind
+  transitionEnded() {
+    let duration = this.timer.stop();
+    if (duration < MIN_LOADING_TIME) {
+      duration = MIN_LOADING_TIME;
+    }
+    this.rollingAverage.record(duration);
+
+    this.loading = false;
+    this.stillLoading = false;
+    this.trigger("stateChanged", false);
+
+    this.scheduleManager.cancelAll();
+    this.scheduleManager.schedule("afterRender", this.removeClasses);
+  }
+
+  @bind
+  setStillLoading() {
+    this.stillLoading = true;
+    this.scheduleManager.schedule("afterRender", this.addStillLoadingClass);
+  }
+
+  @bind
+  addStillLoadingClass() {
+    document.body.classList.add("still-loading");
+  }
+
+  @bind
+  removeClasses() {
+    document.body.classList.remove("loading", "still-loading");
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/services/modal.js b/app/assets/javascripts/discourse/app/services/modal.js
new file mode 100644
index 00000000000..d84030ad5d4
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/services/modal.js
@@ -0,0 +1,315 @@
+import Service, { inject as service } from "@ember/service";
+import { tracked } from "@glimmer/tracking";
+import { getOwner } from "@ember/application";
+import I18n from "I18n";
+import { dasherize } from "@ember/string";
+import { action } from "@ember/object";
+import { disableImplicitInjections } from "discourse/lib/implicit-injections";
+import { CLOSE_INITIATED_BY_MODAL_SHOW } from "discourse/components/d-modal";
+import deprecated from "discourse-common/lib/deprecated";
+
+// Known legacy modals in core. Silence deprecation warnings for these so the messages
+// don't cause unnecessary noise.
+const KNOWN_LEGACY_MODALS = [
+  "associate-account-confirm",
+  "auth-token",
+  "avatar-selector",
+  "bulk-change-category",
+  "bulk-notification-level",
+  "bulk-progress",
+  "change-owner",
+  "change-post-notice",
+  "change-timestamp",
+  "convert-to-public-topic",
+  "create-account",
+  "create-invite-bulk",
+  "create-invite",
+  "download-calendar",
+  "edit-slow-mode",
+  "edit-topic-timer",
+  "edit-user-directory-columns",
+  "explain-reviewable",
+  "feature-topic-on-profile",
+  "feature-topic",
+  "flag",
+  "forgot-password",
+  "grant-badge",
+  "group-default-notifications",
+  "history",
+  "ignore-duration-with-username",
+  "ignore-duration",
+  "insert-hyperlink",
+  "jump-to-post",
+  "login",
+  "move-to-topic",
+  "post-enqueued",
+  "publish-page",
+  "raw-email",
+  "reject-reason-reviewable",
+  "reorder-categories",
+  "request-group-membership-form",
+  "share-and-invite",
+  "tag-upload",
+  "topic-summary",
+  "user-status",
+  "admin-merge-users-prompt",
+  "admin-start-backup",
+  "admin-watched-word-test",
+  "admin-api-key-urls",
+  "admin-delete-user-posts-progress",
+  "admin-install-theme",
+  "admin-penalize-user",
+  "admin-theme-change",
+  "site-setting-default-categories",
+  "admin-badge-preview",
+  "admin-edit-badge-groupings",
+  "admin-merge-users-confirmation",
+  "admin-reseed",
+  "admin-theme-item",
+  "admin-color-scheme-select-base",
+  "admin-form-template-validation-options",
+  "admin-merge-users-progress",
+  "admin-staff-action-log-details",
+  "admin-uploaded-image-list",
+];
+
+const LEGACY_OPTS = new Set([
+  "admin",
+  "templateName",
+  "title",
+  "titleTranslated",
+  "modalClass",
+  "titleAriaElementId",
+  "panels",
+]);
+
+@disableImplicitInjections
+class ModalService extends Service {
+  @tracked activeModal;
+  @tracked opts = {};
+
+  @tracked containerElement;
+
+  @action
+  setContainerElement(element) {
+    this.containerElement = element;
+  }
+
+  /**
+   * Render a modal
+   *
+   * @param {Component} modal - a reference to the component class for the modal
+   * @param {Object} [options] - options
+   * @param {string} [options.model] - An object which will be passed as the `@model` argument on the component
+   *
+   * @returns {Promise} A promise that resolves when the modal is closed, with any data passed to closeModal
+   */
+  show(modal, opts) {
+    this.close({ initiatedBy: CLOSE_INITIATED_BY_MODAL_SHOW });
+
+    let resolveShowPromise;
+    const promise = new Promise((resolve) => {
+      resolveShowPromise = resolve;
+    });
+
+    this.opts = opts || {};
+    this.activeModal = { component: modal, opts, resolveShowPromise };
+
+    const unsupportedOpts = Object.keys(opts).filter((key) =>
+      LEGACY_OPTS.has(key)
+    );
+    if (unsupportedOpts.length > 0) {
+      throw new Error(
+        `${unsupportedOpts.join(
+          ", "
+        )} are not supported in the component-based modal API. See https://meta.discourse.org/t/268057`
+      );
+    }
+
+    return promise;
+  }
+
+  close(data) {
+    this.activeModal?.resolveShowPromise?.(data);
+    this.activeModal = null;
+    this.opts = {};
+  }
+}
+
+// Remove all logic below when legacy modals are dropped (deprecation: discourse.modal-controllers)
+export default class ModalServiceWithLegacySupport extends ModalService {
+  @service appEvents;
+
+  @tracked name;
+  @tracked selectedPanel;
+  @tracked hidden = true;
+
+  @tracked titleOverride;
+  @tracked modalClassOverride;
+  @tracked onSelectPanel;
+
+  get title() {
+    if (this.titleOverride) {
+      return this.titleOverride;
+    } else if (this.opts.titleTranslated) {
+      return this.opts.titleTranslated;
+    } else if (this.opts.title) {
+      return I18n.t(this.opts.title);
+    } else {
+      return null;
+    }
+  }
+
+  set title(value) {
+    this.titleOverride = value;
+  }
+
+  get modalClass() {
+    if (!this.isLegacy) {
+      return null;
+    }
+
+    return (
+      this.modalClassOverride ||
+      this.opts.modalClass ||
+      `${dasherize(this.name.replace(/^modals\//, "")).toLowerCase()}-modal`
+    );
+  }
+
+  set modalClass(value) {
+    this.modalClassOverride = value;
+  }
+
+  show(modal, opts = {}) {
+    if (typeof modal !== "string") {
+      return super.show(modal, opts);
+    }
+
+    this.close({ initiatedBy: CLOSE_INITIATED_BY_MODAL_SHOW });
+
+    if (!KNOWN_LEGACY_MODALS.includes(modal)) {
+      deprecated(
+        `Defining modals using a controller is deprecated. Use the component-based API instead. (modal: ${modal})`,
+        {
+          id: "discourse.modal-controllers",
+          since: "3.1",
+          dropFrom: "3.2",
+          url: "https://meta.discourse.org/t/268057",
+        }
+      );
+    }
+
+    const name = modal;
+    const container = getOwner(this);
+    const route = container.lookup("route:application");
+
+    this.opts = opts;
+
+    const controllerName = opts.admin ? `modals/${name}` : name;
+    this.name = controllerName;
+
+    let controller = container.lookup("controller:" + controllerName);
+    const templateName = opts.templateName || dasherize(name);
+
+    const renderArgs = { into: "application", outlet: "modalBody" };
+    if (controller) {
+      renderArgs.controller = controllerName;
+    } else {
+      // use a basic controller
+      renderArgs.controller = "basic-modal-body";
+      controller = container.lookup(`controller:${renderArgs.controller}`);
+    }
+
+    if (opts.addModalBodyView) {
+      renderArgs.view = "modal-body";
+    }
+
+    const modalName = `modal/${templateName}`;
+    const fullName = opts.admin ? `admin/templates/${modalName}` : modalName;
+    route.render(fullName, renderArgs);
+
+    if (opts.panels) {
+      if (controller.actions.onSelectPanel) {
+        this.onSelectPanel = controller.actions.onSelectPanel.bind(controller);
+      }
+      this.selectedPanel = opts.panels[0];
+    }
+
+    controller.set("modal", this);
+    const model = opts.model;
+    if (model) {
+      controller.set("model", model);
+    }
+    if (controller.onShow) {
+      controller.onShow();
+    }
+    controller.set("flashMessage", null);
+
+    return (this.activeController = controller);
+  }
+
+  close(initiatedBy) {
+    if (!this.isLegacy) {
+      super.close(...arguments);
+    }
+
+    const controllerName = this.name;
+    const controller = controllerName
+      ? getOwner(this).lookup(`controller:${controllerName}`)
+      : null;
+
+    if (controller?.beforeClose?.() === false) {
+      return;
+    }
+
+    getOwner(this)
+      .lookup("route:application")
+      .render("hide-modal", { into: "application", outlet: "modalBody" });
+    $(".d-modal.fixed-modal").modal("hide");
+
+    if (controller) {
+      this.appEvents.trigger("modal:closed", {
+        name: controllerName,
+        controller,
+      });
+
+      if (controller.onClose) {
+        controller.onClose({
+          initiatedByCloseButton: initiatedBy === "initiatedByCloseButton",
+          initiatedByClickOut: initiatedBy === "initiatedByClickOut",
+          initiatedByESC: initiatedBy === "initiatedByESC",
+        });
+      }
+    }
+    this.hidden = true;
+
+    this.name =
+      this.selectedPanel =
+      this.modalClassOverride =
+      this.titleOverride =
+      this.onSelectPanel =
+        null;
+
+    super.close();
+  }
+
+  hide() {
+    if (this.isLegacy) {
+      $(".d-modal.fixed-modal").modal("hide");
+    } else {
+      throw "hide/reopen are not supported for component-based modals";
+    }
+  }
+
+  reopen() {
+    if (this.isLegacy) {
+      $(".d-modal.fixed-modal").modal("show");
+    } else {
+      throw "hide/reopen are not supported for component-based modals";
+    }
+  }
+
+  get isLegacy() {
+    return this.name && !this.activeModal;
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/services/more-topics-preference-tracking.js b/app/assets/javascripts/discourse/app/services/more-topics-preference-tracking.js
new file mode 100644
index 00000000000..6267ef94d17
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/services/more-topics-preference-tracking.js
@@ -0,0 +1,20 @@
+import Service, { inject as service } from "@ember/service";
+import { tracked } from "@glimmer/tracking";
+
+const TOPIC_LIST_PREFERENCE_KEY = "more-topics-list-preference";
+
+export default class MoreTopicsPreferenceTracking extends Service {
+  @service keyValueStore;
+
+  @tracked preference;
+
+  init() {
+    super.init(...arguments);
+    this.preference = this.keyValueStore.get(TOPIC_LIST_PREFERENCE_KEY);
+  }
+
+  updatePreference(value) {
+    this.keyValueStore.set({ key: TOPIC_LIST_PREFERENCE_KEY, value });
+    this.preference = value;
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/services/navigation-menu.js b/app/assets/javascripts/discourse/app/services/navigation-menu.js
new file mode 100644
index 00000000000..848356bf075
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/services/navigation-menu.js
@@ -0,0 +1,13 @@
+import Service, { inject as service } from "@ember/service";
+
+export default class NavigationMenu extends Service {
+  @service site;
+  @service siteSettings;
+
+  get isDesktopDropdownMode() {
+    const headerDropdownMode =
+      this.siteSettings.navigation_menu === "header dropdown";
+
+    return !this.site.mobileView && headerDropdownMode;
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/services/network-connectivity.js b/app/assets/javascripts/discourse/app/services/network-connectivity.js
new file mode 100644
index 00000000000..ba484d2260f
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/services/network-connectivity.js
@@ -0,0 +1,77 @@
+import Service from "@ember/service";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { ajax } from "discourse/lib/ajax";
+import { bind } from "discourse-common/utils/decorators";
+import { cancel } from "@ember/runloop";
+import { tracked } from "@glimmer/tracking";
+
+const CONNECTIVITY_ERROR_CLASS = "network-disconnected";
+
+export default class NetworkConnectivity extends Service {
+  @tracked connected = true;
+
+  constructor() {
+    super(...arguments);
+
+    this.setConnectivity(navigator.onLine);
+
+    window.addEventListener("offline", () => {
+      this.setConnectivity(false);
+      this.startTimerToCheckNavigator();
+    });
+
+    window.addEventListener("online", this.pingServerAndSetConnectivity);
+
+    window.addEventListener("visibilitychange", this.onFocus);
+  }
+
+  @bind
+  onFocus() {
+    if (!this.connected && document.visibilityState === "visible") {
+      this.pingServerAndSetConnectivity();
+    }
+  }
+
+  @bind
+  async pingServerAndSetConnectivity() {
+    try {
+      let response = await ajax("/srv/status", { dataType: "text" });
+      if (response === "ok") {
+        cancel(this._timer);
+        this.setConnectivity(true);
+      } else {
+        throw "disconnected";
+      }
+    } catch {
+      // Either the request didn't go out at all or the response wasn't "ok". Both are failures.
+      // Start the timer to check every second if `navigator.onLine` comes back online in the event that
+      // we miss the `online` event firing
+      this.startTimerToCheckNavigator();
+    }
+  }
+
+  @bind
+  startTimerToCheckNavigator() {
+    cancel(this._timer);
+
+    this._timer = discourseDebounce(this, this.checkNavigatorOnline, 1000);
+  }
+
+  @bind
+  checkNavigatorOnline() {
+    if (navigator.onLine) {
+      this.pingServerAndSetConnectivity();
+    } else {
+      this.startTimerToCheckNavigator();
+    }
+  }
+
+  setConnectivity(connected) {
+    this.connected = connected;
+
+    document.documentElement.classList.toggle(
+      CONNECTIVITY_ERROR_CLASS,
+      !connected
+    );
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/services/presence.js b/app/assets/javascripts/discourse/app/services/presence.js
index 38abb4d4796..d503a7fdda4 100644
--- a/app/assets/javascripts/discourse/app/services/presence.js
+++ b/app/assets/javascripts/discourse/app/services/presence.js
@@ -1,4 +1,4 @@
-import Service from "@ember/service";
+import Service, { inject as service } from "@ember/service";
 import EmberObject, { computed } from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import { cancel, debounce, next, once, throttle } from "@ember/runloop";
@@ -14,6 +14,7 @@ import { bind } from "discourse-common/utils/decorators";
 import Evented from "@ember/object/evented";
 import { isTesting } from "discourse-common/config/environment";
 import getURL from "discourse-common/lib/get-url";
+import { disableImplicitInjections } from "discourse/lib/implicit-injections";
 
 const PRESENCE_INTERVAL_S = 30;
 const DEFAULT_PRESENCE_DEBOUNCE_MS = isTesting() ? 0 : 500;
@@ -250,7 +251,12 @@ class PresenceChannelState extends EmberObject.extend(Evented) {
   }
 }
 
+@disableImplicitInjections
 export default class PresenceService extends Service {
+  @service currentUser;
+  @service siteSettings;
+  @service messageBus;
+
   _presenceDebounceMs = DEFAULT_PRESENCE_DEBOUNCE_MS;
 
   init() {
@@ -260,6 +266,7 @@ export default class PresenceService extends Service {
     this._presentProxies = new Map();
     this._subscribedProxies = new Map();
     this._initialDataRequests = new Map();
+    this._previousPresentButInactiveChannels = new Set();
 
     if (this.currentUser) {
       window.addEventListener("beforeunload", this._beaconLeaveAll);
@@ -506,6 +513,7 @@ export default class PresenceService extends Service {
 
     try {
       const presentChannels = [];
+      const presentButInactiveChannels = new Set();
       const channelsToLeave = queue
         .filter((e) => e.type === "leave")
         .map((e) => e.channel);
@@ -518,11 +526,19 @@ export default class PresenceService extends Service {
         ) {
           presentChannels.push(channelName);
         } else {
-          channelsToLeave.push(channelName);
+          presentButInactiveChannels.add(channelName);
+          if (!this._previousPresentButInactiveChannels.has(channelName)) {
+            channelsToLeave.push(channelName);
+          }
         }
       }
+      this._previousPresentButInactiveChannels = presentButInactiveChannels;
 
-      if (queue.length === 0 && presentChannels.length === 0) {
+      if (
+        queue.length === 0 &&
+        presentChannels.length === 0 &&
+        channelsToLeave.length === 0
+      ) {
         return;
       }
 
@@ -556,6 +572,11 @@ export default class PresenceService extends Service {
         const waitSeconds = e.jqXHR.responseJSON?.extras?.wait_seconds || 10;
         this._presenceDebounceMs = waitSeconds * 1000;
       } else {
+        // Other error, exponential backoff capped at 30 seconds
+        this._presenceDebounceMs = Math.min(
+          this._presenceDebounceMs * 2,
+          PRESENCE_INTERVAL_S * 1000
+        );
         throw e;
       }
     } finally {
@@ -600,7 +621,7 @@ export default class PresenceService extends Service {
       );
     } else if (
       !this._nextUpdateTimer &&
-      this._presentChannels.length > 0 &&
+      this._presentChannels.size > 0 &&
       !isTesting()
     ) {
       this._nextUpdateTimer = discourseLater(
diff --git a/app/assets/javascripts/discourse/app/services/route-scroll-manager.js b/app/assets/javascripts/discourse/app/services/route-scroll-manager.js
new file mode 100644
index 00000000000..0f9e63158de
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/services/route-scroll-manager.js
@@ -0,0 +1,92 @@
+import Service, { inject as service } from "@ember/service";
+import { bind } from "discourse-common/utils/decorators";
+import { schedule } from "@ember/runloop";
+import { isTesting } from "discourse-common/config/environment";
+
+const MAX_SCROLL_LOCATIONS = 100;
+
+/**
+ * This service is responsible for managing scroll position when transitioning.
+ * When visiting a new route, this service will scroll to the top of the page.
+ * When returning to a previously-visited route via the browser back button,
+ * this service will scroll to the previous scroll position.
+ *
+ * To opt-out of the behaviour, individual routes can add a scrollOnTransition
+ * boolean to their RouteInfo metadata using Ember's `buildRouteInfoMetadata` hook.
+ */
+export default class RouteScrollManager extends Service {
+  @service router;
+
+  scrollLocationHistory = new Map();
+  uuid;
+
+  scrollElement = isTesting()
+    ? document.getElementById("ember-testing-container")
+    : document.scrollingElement;
+
+  @bind
+  routeWillChange() {
+    if (!this.uuid) {
+      return;
+    }
+    this.scrollLocationHistory.set(this.uuid, [
+      this.scrollElement.scrollLeft,
+      this.scrollElement.scrollTop,
+    ]);
+    this.#pruneOldScrollLocations();
+  }
+
+  @bind
+  routeDidChange(transition) {
+    const newUuid = this.router.location.getState?.().uuid;
+
+    if (newUuid === this.uuid) {
+      // routeDidChange fired without the history state actually changing. Most likely a refresh.
+      // Forget the previously-stored scroll location so that we scroll to the top
+      this.scrollLocationHistory.delete(this.uuid);
+    }
+
+    this.uuid = newUuid;
+
+    if (!this.#shouldScroll(transition.to)) {
+      return;
+    }
+
+    const scrollLocation = this.scrollLocationHistory.get(this.uuid) || [0, 0];
+    schedule("afterRender", () => {
+      this.scrollElement.scrollTo(...scrollLocation);
+    });
+  }
+
+  #pruneOldScrollLocations() {
+    while (this.scrollLocationHistory.size > MAX_SCROLL_LOCATIONS) {
+      // JS Map guarantees keys will be returned in insertion order
+      const oldestUUID = this.scrollLocationHistory.keys().next().value;
+      this.scrollLocationHistory.delete(oldestUUID);
+    }
+  }
+
+  #shouldScroll(routeInfo) {
+    // Leafmost route has priority
+    for (let route = routeInfo; route; route = route.parent) {
+      const scrollOnTransition = route.metadata?.scrollOnTransition;
+      if (typeof scrollOnTransition === "boolean") {
+        return scrollOnTransition;
+      }
+    }
+
+    // No overrides - default to true
+    return true;
+  }
+
+  init() {
+    super.init(...arguments);
+    this.router.on("routeDidChange", this.routeDidChange);
+    this.router.on("routeWillChange", this.routeWillChange);
+  }
+
+  willDestroy() {
+    this.router.off("routeDidChange", this.routeDidChange);
+    this.router.off("routeWillChange", this.routeWillChange);
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/services/search.js b/app/assets/javascripts/discourse/app/services/search.js
index 2fe2dacaecf..baef9d04aaf 100644
--- a/app/assets/javascripts/discourse/app/services/search.js
+++ b/app/assets/javascripts/discourse/app/services/search.js
@@ -1,21 +1,109 @@
-import Service from "@ember/service";
-import discourseComputed from "discourse-common/utils/decorators";
+import Service, { inject as service } from "@ember/service";
+import { disableImplicitInjections } from "discourse/lib/implicit-injections";
+import { tracked } from "@glimmer/tracking";
+import { action } from "@ember/object";
+import { focusSearchInput } from "discourse/components/search-menu";
 
-export default Service.extend({
-  searchContextEnabled: false, // checkbox to scope search
-  searchContext: null,
-  highlightTerm: null,
+@disableImplicitInjections
+export default class Search extends Service {
+  @service appEvents;
 
-  @discourseComputed("searchContext")
-  contextType: {
-    get(searchContext) {
-      return searchContext?.type;
-    },
+  @tracked activeGlobalSearchTerm = "";
+  @tracked searchContext;
+  @tracked highlightTerm;
 
-    set(value, searchContext) {
-      this.set("searchContext", { ...searchContext, type: value });
+  // only relative for the widget search menu
+  searchContextEnabled = false; // checkbox to scope search
 
-      return value;
-    },
-  },
-});
+  get contextType() {
+    return this.searchContext?.type || null;
+  }
+
+  // The need to navigate with the keyboard creates a lot shared logic
+  // between multiple components
+  //
+  // - SearchTerm
+  // - Results::AssistantItem
+  // - Results::Types
+  // - Results::MoreLink
+  // - Results::RecentSearches
+  //
+  // To minimze the duplicate logic we will create a shared action here
+  // that can be reused across all of the components
+  @action
+  handleResultInsertion(e) {
+    if (e.keyCode === 65 /* a or A */) {
+      // add a link and focus composer if open
+      if (document.querySelector("#reply-control.open")) {
+        this.appEvents.trigger(
+          "composer:insert-text",
+          document.activeElement.href,
+          {
+            ensureSpace: true,
+          }
+        );
+        this.appEvents.trigger("header:keyboard-trigger", { type: "search" });
+        document.querySelector("#reply-control.open textarea").focus();
+
+        e.stopPropagation();
+        e.preventDefault();
+        return false;
+      }
+    }
+  }
+
+  @action
+  handleArrowUpOrDown(e) {
+    if (e.key === "ArrowUp" || e.key === "ArrowDown") {
+      let focused = e.target.closest(".search-menu") ? e.target : null;
+      if (!focused) {
+        return;
+      }
+
+      let links = document.querySelectorAll(".search-menu .results a");
+      let results = document.querySelectorAll(
+        ".search-menu .results .search-link"
+      );
+
+      if (!results.length) {
+        return;
+      }
+
+      let prevResult;
+      let result;
+
+      links.forEach((item) => {
+        if (item.classList.contains("search-link")) {
+          prevResult = item;
+        }
+
+        if (item === focused) {
+          result = prevResult;
+        }
+      });
+
+      let index = -1;
+      if (result) {
+        index = Array.prototype.indexOf.call(results, result);
+      }
+
+      if (index === -1 && e.key === "ArrowDown") {
+        // change focus from the search input to the first result item
+        const firstResult = results[0] || links[0];
+        firstResult.focus();
+      } else if (index === 0 && e.key === "ArrowUp") {
+        focusSearchInput();
+      } else if (index > -1) {
+        // change focus to the next result item if present
+        index += e.key === "ArrowDown" ? 1 : -1;
+        if (index >= 0 && index < results.length) {
+          results[index].focus();
+        }
+      }
+
+      e.stopPropagation();
+      e.preventDefault();
+      return false;
+    }
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/services/sidebar-state.js b/app/assets/javascripts/discourse/app/services/sidebar-state.js
new file mode 100644
index 00000000000..ef6f995d0c9
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/services/sidebar-state.js
@@ -0,0 +1,55 @@
+import Service from "@ember/service";
+import { tracked } from "@glimmer/tracking";
+
+import {
+  currentPanelKey,
+  customPanels as panels,
+} from "discourse/lib/sidebar/custom-sections";
+
+const COMBINED_MODE = "combined";
+const SEPARATED_MODE = "separated";
+const MAIN_PANEL = "main";
+
+export default class SidebarState extends Service {
+  @tracked currentPanelKey = currentPanelKey;
+  @tracked panels = panels;
+  @tracked mode = COMBINED_MODE;
+
+  constructor() {
+    super(...arguments);
+
+    this.#reset();
+  }
+
+  setPanel(name) {
+    this.currentPanelKey = name;
+    this.mode = SEPARATED_MODE;
+  }
+
+  get currentPanel() {
+    return this.panels.find((panel) => panel.key === this.currentPanelKey);
+  }
+
+  setSeparatedMode() {
+    this.mode = SEPARATED_MODE;
+  }
+
+  setCombinedMode() {
+    this.mode = COMBINED_MODE;
+    this.currentPanelKey = MAIN_PANEL;
+  }
+
+  get combinedMode() {
+    return this.mode === COMBINED_MODE;
+  }
+
+  get showMainPanel() {
+    return this.currentPanelKey === MAIN_PANEL;
+  }
+
+  #reset() {
+    this.currentPanelKey = currentPanelKey;
+    this.panels = panels;
+    this.mode = COMBINED_MODE;
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/services/store.js b/app/assets/javascripts/discourse/app/services/store.js
index 57489ab0be4..ed5ba6d3c6e 100644
--- a/app/assets/javascripts/discourse/app/services/store.js
+++ b/app/assets/javascripts/discourse/app/services/store.js
@@ -6,6 +6,7 @@ import ResultSet from "discourse/models/result-set";
 import { ajax } from "discourse/lib/ajax";
 import { getRegister } from "discourse-common/lib/get-owner";
 import { underscore } from "@ember/string";
+import { warn } from "@ember/debug";
 
 let _identityMap;
 
@@ -325,9 +326,18 @@ export default Service.extend({
         const subType = m[1];
 
         if (m[2]) {
+          if (!Array.isArray(obj[k])) {
+            warn(`Expected an array of resource ids for ${type}.${k}`, {
+              id: "discourse.store.hydrate-embedded",
+            });
+
+            return;
+          }
+
           const hydrated = obj[k].map((id) =>
             this._lookupSubType(subType, type, id, root)
           );
+
           obj[this.pluralize(subType)] = hydrated || [];
           delete obj[k];
         } else {
diff --git a/app/assets/javascripts/discourse/app/styles/app.css b/app/assets/javascripts/discourse/app/styles/app.css
new file mode 100644
index 00000000000..ea2da937983
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/styles/app.css
@@ -0,0 +1,4 @@
+/**
+ * 👋 Greetings Discourse Developer. This CSS file is unused. If you're looking
+ * for stylesheets managed by Rails, see app/assets/stylesheets at project root.
+ */
diff --git a/app/assets/javascripts/discourse/app/templates/about.hbs b/app/assets/javascripts/discourse/app/templates/about.hbs
index a6f8cd43050..f3b54c9d648 100644
--- a/app/assets/javascripts/discourse/app/templates/about.hbs
+++ b/app/assets/javascripts/discourse/app/templates/about.hbs
@@ -18,12 +18,16 @@
                 "faq"
               }}</LinkTo></li>
         {{/if}}
-        <li class="nav-item-tos"><LinkTo @route="tos">{{i18n
-              "tos"
-            }}</LinkTo></li>
-        <li class="nav-item-privacy"><LinkTo @route="privacy">{{i18n
-              "privacy"
-            }}</LinkTo></li>
+        {{#if this.site.tos_url}}
+          <li class="nav-item-tos"><LinkTo @route="tos">{{i18n
+                "tos"
+              }}</LinkTo></li>
+        {{/if}}
+        {{#if this.site.privacy_policy_url}}
+          <li class="nav-item-privacy"><LinkTo @route="privacy">{{i18n
+                "privacy"
+              }}</LinkTo></li>
+        {{/if}}
       </ul>
 
       <section class="about description">
@@ -34,7 +38,7 @@
       <PluginOutlet
         @name="about-after-description"
         @connectorTagName="section"
-        @args={{hash model=this.model}}
+        @outletArgs={{hash model=this.model}}
       />
 
       {{#if this.model.admins}}
@@ -46,12 +50,13 @@
         </section>
       {{/if}}
 
-      <PluginOutlet
-        @name="about-after-admins"
-        @tagName="span"
-        @connectorTagName="section"
-        @args={{hash model=this.model}}
-      />
+      <span>
+        <PluginOutlet
+          @name="about-after-admins"
+          @connectorTagName="section"
+          @outletArgs={{hash model=this.model}}
+        />
+      </span>
 
       {{#if this.model.moderators}}
         <section class="about moderators">
@@ -64,12 +69,13 @@
         </section>
       {{/if}}
 
-      <PluginOutlet
-        @name="about-after-moderators"
-        @tagName="span"
-        @connectorTagName="section"
-        @args={{hash model=this.model}}
-      />
+      <span>
+        <PluginOutlet
+          @name="about-after-moderators"
+          @connectorTagName="section"
+          @outletArgs={{hash model=this.model}}
+        />
+      </span>
 
       {{#if this.model.category_moderators.length}}
         {{#each this.model.category_moderators as |cm|}}
diff --git a/app/assets/javascripts/discourse/app/templates/application.hbs b/app/assets/javascripts/discourse/app/templates/application.hbs
index 91331070062..0a604ff204d 100644
--- a/app/assets/javascripts/discourse/app/templates/application.hbs
+++ b/app/assets/javascripts/discourse/app/templates/application.hbs
@@ -1,10 +1,11 @@
 <DiscourseRoot>
   <a href="#main-container" id="skip-link">{{i18n "skip_to_main_content"}}</a>
   <DDocument />
+  <PageLoadingSlider />
   <PluginOutlet
     @name="above-site-header"
     @connectorTagName="div"
-    @args={{hash currentPath=this.router._router.currentPath}}
+    @outletArgs={{hash currentPath=this.router._router.currentPath}}
   />
 
   {{#if this.showSiteHeader}}
@@ -17,6 +18,7 @@
       @toggleAnonymous={{route-action "toggleAnonymous"}}
       @logout={{route-action "logout"}}
       @sidebarEnabled={{this.sidebarEnabled}}
+      @navigationMenuQueryParamOverride={{this.navigationMenuQueryParamOverride}}
       @showSidebar={{this.showSidebar}}
       @toggleSidebar={{action "toggleSidebar"}}
     />
@@ -24,10 +26,14 @@
 
   <SoftwareUpdatePrompt />
 
+  {{#if this.siteSettings.enable_offline_indicator}}
+    <OfflineIndicator />
+  {{/if}}
+
   <PluginOutlet
     @name="below-site-header"
     @connectorTagName="div"
-    @args={{hash currentPath=this.router._router.currentPath}}
+    @outletArgs={{hash currentPath=this.router._router.currentPath}}
   />
 
   <div id="main-outlet-wrapper" class="wrap" role="main">
@@ -39,6 +45,10 @@
       {{/if}}
     </div>
 
+    <LoadingSliderFallbackSpinner />
+
+    <PluginOutlet @name="before-main-outlet" />
+
     <div id="main-outlet">
       <PluginOutlet @name="above-main-container" @connectorTagName="div" />
       <div class="container" id="main-container">
@@ -47,27 +57,31 @@
         {{/if}}
         <NotificationConsentBanner />
         <PwaInstallBanner />
-        {{#if this.showBootstrapModeNotice}}
-          <BootstrapModeNotice />
-        {{/if}}
         <GlobalNotice />
-        <CreateTopicsNotice />
         <PluginOutlet
           @name="top-notices"
           @connectorTagName="div"
-          @args={{hash currentPath=this.router._router.currentPath}}
+          @outletArgs={{hash currentPath=this.router._router.currentPath}}
         />
       </div>
 
       {{outlet}}
-      {{outlet "user-card"}}
+
+      <CardContainer />
+      <PluginOutlet
+        @name="main-outlet-bottom"
+        @outletArgs={{hash showFooter=this.showFooter}}
+      />
     </div>
+
+    <PluginOutlet @name="after-main-outlet" />
+
   </div>
 
   <PluginOutlet
     @name="above-footer"
     @connectorTagName="div"
-    @args={{hash showFooter=this.showFooter}}
+    @outletArgs={{hash showFooter=this.showFooter}}
   />
   {{#if this.showFooter}}
     <CustomHtml
@@ -79,13 +93,14 @@
   <PluginOutlet
     @name="below-footer"
     @connectorTagName="div"
-    @args={{hash showFooter=this.showFooter}}
+    @outletArgs={{hash showFooter=this.showFooter}}
   />
 
-  {{outlet "modal"}}
+  <DLightbox />
+  <ModalContainer />
   <DialogHolder />
   <TopicEntrance />
-  {{outlet "composer"}}
+  <ComposerContainer />
 
   {{#if this.showFooterNav}}
     <FooterNav />
diff --git a/app/assets/javascripts/discourse/app/templates/badges/index.hbs b/app/assets/javascripts/discourse/app/templates/badges/index.hbs
index 51d09133f91..5d57beb177b 100644
--- a/app/assets/javascripts/discourse/app/templates/badges/index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/badges/index.hbs
@@ -2,17 +2,15 @@
   <div class="container badges">
     <h1>{{i18n "badges.title"}}</h1>
 
-    <PluginOutlet
-      @name="below-badges-title"
-      @tagName="span"
-      @connectorTagName="div"
-    />
+    <span>
+      <PluginOutlet @name="below-badges-title" @connectorTagName="div" />
+    </span>
 
     <div class="badge-groups">
       {{#each this.badgeGroups as |bg|}}
         <div class="badge-grouping">
           <div class="title">
-            <h3>{{bg.badgeGrouping.displayName}}</h3>
+            <h2>{{bg.badgeGrouping.displayName}}</h2>
           </div>
           <div class="badge-group-list">
             {{#each bg.badges as |b|}}
diff --git a/app/assets/javascripts/discourse/app/templates/badges/show.hbs b/app/assets/javascripts/discourse/app/templates/badges/show.hbs
index 96b8550f7ad..504dad0e2d4 100644
--- a/app/assets/javascripts/discourse/app/templates/badges/show.hbs
+++ b/app/assets/javascripts/discourse/app/templates/badges/show.hbs
@@ -54,10 +54,12 @@
               @class="badge-info"
               @date={{ub.granted_at}}
             >
-              <div class="granted-on">{{i18n
-                  "badges.granted_on"
-                  date=(inline-date ub.granted_at)
-                }}</div>
+              <div class="granted-on">
+                {{html-safe
+                  (i18n "badges.granted_on" date=(format-date ub.granted_at))
+                }}
+              </div>
+
               {{#if ub.post_number}}
                 <a
                   class="post-link"
diff --git a/app/assets/javascripts/discourse/app/templates/bulk-tag.hbs b/app/assets/javascripts/discourse/app/templates/bulk-tag.hbs
deleted file mode 100644
index e3f75763906..00000000000
--- a/app/assets/javascripts/discourse/app/templates/bulk-tag.hbs
+++ /dev/null
@@ -1,9 +0,0 @@
-<p>{{i18n (concat "topics.bulk." this.title)}}</p>
-
-<p><TagChooser @tags={{this.tags}} @categoryId={{this.categoryId}} /></p>
-
-<DButton
-  @action={{action this.action}}
-  @disabled={{this.emptyTags}}
-  @label={{concat "topics.bulk." this.label}}
-/>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/activation-email-form.hbs b/app/assets/javascripts/discourse/app/templates/components/activation-email-form.hbs
deleted file mode 100644
index c1301d19d6d..00000000000
--- a/app/assets/javascripts/discourse/app/templates/components/activation-email-form.hbs
+++ /dev/null
@@ -1,2 +0,0 @@
-<p>{{i18n "login.provide_new_email"}}</p>
-<Input @value={{this.email}} class="activate-new-email" />
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/backup-codes.hbs b/app/assets/javascripts/discourse/app/templates/components/backup-codes.hbs
deleted file mode 100644
index 37b1cd141fb..00000000000
--- a/app/assets/javascripts/discourse/app/templates/components/backup-codes.hbs
+++ /dev/null
@@ -1,28 +0,0 @@
-<div class="wrapper">
-  <textarea
-    id="backupCodes"
-    class="backup-codes-area"
-    rows="10"
-    readonly
-  >{{this.formattedBackupCodes}}</textarea>
-
-  <DButton
-    @action={{action "copyToClipboard"}}
-    @class="backup-codes-copy-btn"
-    @icon="copy"
-    @aria-label="user.second_factor_backup.copy_to_clipboard"
-    @title="user.second_factor_backup.copy_to_clipboard"
-  />
-
-  <a
-    download="{{this.siteTitleSlug}}-backup-codes.txt"
-    class="btn no-text btn-icon backup-codes-download-btn"
-    aria-label={{i18n "user.second_factor_backup.download_backup_codes"}}
-    title={{i18n "user.second_factor_backup.download_backup_codes"}}
-    rel="noopener noreferrer"
-    target="_blank"
-    href="data:application/octet-stream;charset=utf-8;base64,{{this.base64BackupCode}}"
-  >
-    {{d-icon "download"}}
-  </a>
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/bookmark.hbs b/app/assets/javascripts/discourse/app/templates/components/bookmark.hbs
deleted file mode 100644
index a2d5c11a87c..00000000000
--- a/app/assets/javascripts/discourse/app/templates/components/bookmark.hbs
+++ /dev/null
@@ -1,93 +0,0 @@
-<ConditionalLoadingSpinner @condition={{this.loading}}>
-  {{#if this.errorMessage}}
-    <div class="control-group">
-      <div class="controls">
-        <div class="alert alert-error">{{this.errorMessage}}</div>
-      </div>
-    </div>
-  {{/if}}
-
-  <div class="control-group bookmark-name-wrap">
-    <Input
-      id="bookmark-name"
-      @value={{this.model.name}}
-      name="bookmark-name"
-      class="bookmark-name"
-      @enter={{action "saveAndClose"}}
-      placeholder={{i18n "post.bookmarks.name_placeholder"}}
-      maxlength="100"
-    />
-    <DButton
-      @icon="cog"
-      @action={{action "toggleShowOptions"}}
-      @class="bookmark-options-button"
-      @ariaLabel="post.bookmarks.options"
-      @title="post.bookmarks.options"
-    />
-  </div>
-
-  {{#if this.showOptions}}
-    <div class="bookmark-options-panel">
-      <label class="control-label" for="bookmark_auto_delete_preference">{{i18n
-          "bookmarks.auto_delete_preference.label"
-        }}</label>
-      <ComboBox
-        @content={{this.autoDeletePreferences}}
-        @value={{this.autoDeletePreference}}
-        @class="bookmark-option-selector"
-        @onChange={{action (mut this.autoDeletePreference)}}
-      />
-    </div>
-  {{/if}}
-
-  {{#if this.showExistingReminderAt}}
-    <div class="alert alert-info existing-reminder-at-alert">
-      {{d-icon "far-clock"}}
-      <span>{{i18n
-          "bookmarks.reminders.existing_reminder"
-          at_date_time=this.existingReminderAtFormatted
-        }}</span>
-    </div>
-  {{/if}}
-
-  <div class="control-group">
-    <label class="control-label">
-      {{i18n "post.bookmarks.set_reminder"}}
-    </label>
-
-    {{#if this.userHasTimezoneSet}}
-      <TimeShortcutPicker
-        @timeShortcuts={{this.timeOptions}}
-        @prefilledDatetime={{this.prefilledDatetime}}
-        @onTimeSelected={{action "onTimeSelected"}}
-        @hiddenOptions={{this.hiddenTimeShortcutOptions}}
-        @customLabels={{this.customTimeShortcutLabels}}
-        @_itsatrap={{this._itsatrap}}
-      />
-    {{else}}
-      <div class="alert alert-info">{{html-safe
-          (i18n "bookmarks.no_timezone" basePath=(base-path))
-        }}</div>
-    {{/if}}
-  </div>
-
-  <div class="modal-footer control-group">
-    <DButton
-      @id="save-bookmark"
-      @label="bookmarks.save"
-      @class="btn-primary"
-      @action={{action "saveAndClose"}}
-    />
-    <DModalCancel @close={{action "closeWithoutSavingBookmark"}} />
-    {{#if this.showDelete}}
-      <DButton
-        @id="delete-bookmark"
-        @icon="trash-alt"
-        @class="delete-bookmark btn-danger"
-        @action={{action "delete"}}
-        @ariaLabel="post.bookmarks.actions.delete_bookmark.name"
-        @title="post.bookmarks.actions.delete_bookmark.name"
-      />
-    {{/if}}
-  </div>
-</ConditionalLoadingSpinner>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/bootstrap-mode-notice.hbs b/app/assets/javascripts/discourse/app/templates/components/bootstrap-mode-notice.hbs
deleted file mode 100644
index b61e3bcc321..00000000000
--- a/app/assets/javascripts/discourse/app/templates/components/bootstrap-mode-notice.hbs
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="row bootstrap-mode-notice">
-  <div class="alert alert-info alert-bootstrap-mode">
-    <div class="col-text">
-      {{this.message}}
-    </div>
-    <div class="col-button">
-      <div class="alert--button"><DButton
-          @icon="user-plus"
-          @action={{this.inviteUsers}}
-          @class="btn-primary bootstrap-invite-button"
-          @label="bootstrap_invite_button_title"
-        /></div>
-      {{#if this.site.wizard_required}}
-        <div class="alert--link"><a
-            class="bootstrap-wizard-link"
-            href="/wizard"
-          >{{i18n "bootstrap_wizard_link_title"}}</a></div>
-      {{/if}}
-    </div>
-  </div>
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/category-title-before.hbs b/app/assets/javascripts/discourse/app/templates/components/category-title-before.hbs
deleted file mode 100644
index a8423b0406c..00000000000
--- a/app/assets/javascripts/discourse/app/templates/components/category-title-before.hbs
+++ /dev/null
@@ -1,4 +0,0 @@
-<PluginOutlet
-  @name="category-title-before"
-  @args={{hash category=this.category}}
-/>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/category-unread.hbs b/app/assets/javascripts/discourse/app/templates/components/category-unread.hbs
deleted file mode 100644
index 0021e01260f..00000000000
--- a/app/assets/javascripts/discourse/app/templates/components/category-unread.hbs
+++ /dev/null
@@ -1,20 +0,0 @@
-{{#if this.category.unreadTopics}}
-  <a
-    href={{this.category.unreadUrl}}
-    title={{i18n "topic.unread_topics" count=this.category.unreadTopics}}
-    class="badge new-posts badge-notification"
-  >{{i18n
-      "filters.unread.lower_title_with_count"
-      count=this.category.unreadTopics
-    }}</a>
-{{/if}}
-{{#if this.category.newTopics}}
-  <a
-    href={{this.category.newUrl}}
-    title={{i18n "topic.new_topics" count=this.category.newTopics}}
-    class="badge new-posts badge-notification"
-  >{{i18n
-      "filters.new.lower_title_with_count"
-      count=this.category.newTopics
-    }}</a>
-{{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/composer-messages.hbs b/app/assets/javascripts/discourse/app/templates/components/composer-messages.hbs
deleted file mode 100644
index ea42db24a83..00000000000
--- a/app/assets/javascripts/discourse/app/templates/components/composer-messages.hbs
+++ /dev/null
@@ -1,8 +0,0 @@
-{{#each this.messages as |message|}}
-  <ComposerMessage
-    @message={{message}}
-    @closeMessage={{action "closeMessage"}}
-    @shareModal={{action "shareModal"}}
-    @switchPM={{action "switchPM"}}
-  />
-{{/each}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/create-topics-notice.hbs b/app/assets/javascripts/discourse/app/templates/components/create-topics-notice.hbs
deleted file mode 100644
index 4f6e388f54a..00000000000
--- a/app/assets/javascripts/discourse/app/templates/components/create-topics-notice.hbs
+++ /dev/null
@@ -1,7 +0,0 @@
-{{#unless this.hidden}}
-  <div class="row">
-    <div class="alert alert-info alert-too-few-topics">
-      {{this.message}}
-    </div>
-  </div>
-{{/unless}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/custom-html-container.hbs b/app/assets/javascripts/discourse/app/templates/components/custom-html-container.hbs
deleted file mode 100644
index 63db710e363..00000000000
--- a/app/assets/javascripts/discourse/app/templates/components/custom-html-container.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{this.html}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-button.hbs b/app/assets/javascripts/discourse/app/templates/components/d-button.hbs
deleted file mode 100644
index 09b44b2ed2e..00000000000
--- a/app/assets/javascripts/discourse/app/templates/components/d-button.hbs
+++ /dev/null
@@ -1,45 +0,0 @@
-{{! template-lint-disable no-down-event-binding }}
-<button
-  {{! For legacy compatibility. Prefer passing class as attributes. }}
-  class="{{@class}}
-    {{if @isLoading 'is-loading'}}
-    {{if this.btnLink 'btn-link' 'btn'}}
-    {{if this.noText 'no-text'}}
-    {{this.btnType}}"
-  {{! For legacy compatibility. Prefer passing these as html attributes. }}
-  id={{@id}}
-  form={{@form}}
-  aria-controls={{@ariaControls}}
-  aria-expanded={{this.computedAriaExpanded}}
-  tabindex={{@tabindex}}
-  type={{or @type "button"}}
-  ...attributes
-  disabled={{this.isDisabled}}
-  title={{this.computedTitle}}
-  aria-label={{this.computedAriaLabel}}
-  {{on "keydown" this.keyDown}}
-  {{on "click" this.click}}
-  {{on "mousedown" this.mouseDown}}
->
-  {{#if @isLoading}}
-    {{~d-icon "spinner" class="loading-icon"~}}
-  {{else}}
-    {{#if @icon}}
-      {{~d-icon @icon~}}
-    {{/if}}
-  {{/if}}
-
-  {{~#if this.computedLabel~}}
-    <span class="d-button-label">
-      {{~html-safe this.computedLabel~}}
-      {{~#if @ellipsis~}}
-        &hellip;
-      {{~/if~}}
-    </span>
-  {{~else if (not (has-block))~}}
-    &#8203;
-    {{! Zero-width space character, so icon-only button height = regular button height }}
-  {{~/if~}}
-
-  {{yield}}
-</button>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-editor.hbs b/app/assets/javascripts/discourse/app/templates/components/d-editor.hbs
deleted file mode 100644
index ac429bd300b..00000000000
--- a/app/assets/javascripts/discourse/app/templates/components/d-editor.hbs
+++ /dev/null
@@ -1,87 +0,0 @@
-<div class="d-editor-container">
-  <div class="d-editor-textarea-column">
-    {{yield}}
-
-    <div
-      class="d-editor-textarea-wrapper
-        {{if this.disabled 'disabled'}}
-        {{if this.isEditorFocused 'in-focus'}}"
-    >
-      <div class="d-editor-button-bar" role="toolbar">
-        {{#each this.toolbar.groups as |group|}}
-          {{#each group.buttons as |b|}}
-            {{#if b.popupMenu}}
-              <ToolbarPopupMenuOptions
-                @content={{this.popupMenuOptions}}
-                @onChange={{this.onPopupMenuAction}}
-                @onOpen={{action b.action b}}
-                @class={{b.className}}
-                @tabindex={{-1}}
-                @onKeydown={{this.rovingButtonBar}}
-                @options={{hash icon=b.icon focusAfterOnChange=false}}
-              />
-            {{else}}
-              <DButton
-                @action={{b.action}}
-                @type="button"
-                @actionParam={{b}}
-                @translatedTitle={{b.title}}
-                @label={{b.label}}
-                @icon={{b.icon}}
-                @class={{b.className}}
-                @preventFocus={{b.preventFocus}}
-                @tabindex={{b.tabindex}}
-                @onKeyDown={{this.rovingButtonBar}}
-              />
-            {{/if}}
-          {{/each}}
-        {{/each}}
-      </div>
-
-      <ConditionalLoadingSpinner @condition={{this.loading}} />
-      <DTextarea
-        @autocomplete="off"
-        @tabindex={{this.tabindex}}
-        @value={{this.value}}
-        @class="d-editor-input"
-        @placeholder={{this.placeholderTranslated}}
-        @aria-label={{this.placeholderTranslated}}
-        @disabled={{this.disabled}}
-        @input={{this.change}}
-        @focusIn={{action "focusIn"}}
-        @focusOut={{action "focusOut"}}
-      />
-      <PopupInputTip @validation={{this.validation}} />
-      <PluginOutlet
-        @name="after-d-editor"
-        @connectorTagName="div"
-        @args={{this.outletArgs}}
-      />
-    </div>
-  </div>
-
-  <div
-    class="d-editor-preview-wrapper {{if this.forcePreview 'force-preview'}}"
-  >
-    <div class="d-editor-preview">
-      {{#unless this.siteSettings.enable_diffhtml_preview}}
-        {{html-safe this.preview}}
-      {{/unless}}
-    </div>
-    <PluginOutlet
-      @name="editor-preview"
-      @tagName="span"
-      @connectorTagName="div"
-      @classNames="d-editor-plugin"
-      @args={{this.outletArgs}}
-    />
-  </div>
-</div>
-
-<EmojiPicker
-  @isActive={{this.emojiPickerIsActive}}
-  @isEditorFocused={{this.isEditorFocused}}
-  @initialFilter={{this.emojiFilter}}
-  @emojiSelected={{action "emojiSelected"}}
-  @onEmojiPickerClose={{this.onEmojiPickerClose}}
-/>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-modal.hbs b/app/assets/javascripts/discourse/app/templates/components/d-modal.hbs
deleted file mode 100644
index 22481b8c348..00000000000
--- a/app/assets/javascripts/discourse/app/templates/components/d-modal.hbs
+++ /dev/null
@@ -1,56 +0,0 @@
-<div class="modal-outer-container">
-  <div class="modal-middle-container">
-    <div class="modal-inner-container">
-      <PluginOutlet @name="above-modal-header" @connectorTagName="div" />
-      <div class="modal-header {{this.headerClass}}">
-        {{#if this.dismissable}}
-          <DButton
-            @icon="times"
-            @action={{route-action "closeModal" "initiatedByCloseButton"}}
-            @class="btn-flat modal-close close"
-            @title="modal.close"
-          />
-        {{/if}}
-
-        {{#if this.title}}
-          <div class="title">
-            <h3 id="discourse-modal-title">{{this.title}}</h3>
-
-            {{#if this.subtitle}}
-              <p class="subtitle">{{this.subtitle}}</p>
-            {{/if}}
-          </div>
-        {{/if}}
-
-        {{#if this.panels}}
-          <ul class="modal-tabs">
-            {{#each this.panels as |panel|}}
-              <ModalTab
-                @panel={{panel}}
-                @panelsLength={{this.panels.length}}
-                @selectedPanel={{this.selectedPanel}}
-                @onSelectPanel={{this.onSelectPanel}}
-              />
-            {{/each}}
-          </ul>
-        {{/if}}
-      </div>
-
-      <div id="modal-alert" role="alert"></div>
-
-      {{yield}}
-
-      {{#each this.errors as |error|}}
-        <div class="alert alert-error">
-          <button
-            type="button"
-            class="close"
-            data-dismiss="alert"
-            aria-label={{i18n "modal.dismiss_error"}}
-          >×</button>
-          {{error}}
-        </div>
-      {{/each}}
-    </div>
-  </div>
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-navigation-item.hbs b/app/assets/javascripts/discourse/app/templates/components/d-navigation-item.hbs
deleted file mode 100644
index d3fc03d783d..00000000000
--- a/app/assets/javascripts/discourse/app/templates/components/d-navigation-item.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-<LinkTo @route={{this.route}}>
-  {{yield}}
-</LinkTo>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-tooltip.hbs b/app/assets/javascripts/discourse/app/templates/components/d-tooltip.hbs
deleted file mode 100644
index 97b23804af4..00000000000
--- a/app/assets/javascripts/discourse/app/templates/components/d-tooltip.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-<div>
-  {{yield}}
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/directory-item.hbs b/app/assets/javascripts/discourse/app/templates/components/directory-item.hbs
deleted file mode 100644
index 4561d5ecb68..00000000000
--- a/app/assets/javascripts/discourse/app/templates/components/directory-item.hbs
+++ /dev/null
@@ -1,16 +0,0 @@
-<td><UserInfo @user={{this.item.user}} /></td>
-{{#each this.columns as |column|}}
-  <td>
-    {{#if (directory-column-is-user-field column=column)}}
-      {{directory-item-user-field-value item=this.item column=column}}
-    {{else}}
-      {{directory-item-value item=this.item column=column}}
-    {{/if}}
-  </td>
-{{/each}}
-
-{{#if this.showTimeRead}}
-  <td><span class="time-read">{{format-duration
-        this.item.time_read
-      }}</span></td>
-{{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/directory-table.hbs b/app/assets/javascripts/discourse/app/templates/components/directory-table.hbs
deleted file mode 100644
index d8adc30add1..00000000000
--- a/app/assets/javascripts/discourse/app/templates/components/directory-table.hbs
+++ /dev/null
@@ -1,39 +0,0 @@
-<div class="directory-table-top-scroll">
-  <div class="directory-table-top-scroll-fake-content"></div>
-</div>
-
-<div class="directory-table-container">
-  <table class="directory-table">
-    <thead>
-      <TableHeaderToggle
-        @field="username"
-        @order={{this.order}}
-        @asc={{this.asc}}
-      />
-      {{#each this.columns as |column|}}
-        <TableHeaderToggle
-          @field={{column.name}}
-          @icon={{column.icon}}
-          @order={{this.order}}
-          @asc={{this.asc}}
-          @automatic={{directory-column-is-automatic column=column}}
-          @translated={{column.user_field_id}}
-          @onActiveRender={{this.setActiveHeader}}
-        />
-      {{/each}}
-
-      {{#if this.showTimeRead}}
-        <th>{{i18n "directory.time_read"}}</th>
-      {{/if}}
-    </thead>
-    <tbody>
-      {{#each this.items as |item|}}
-        <DirectoryItem
-          @item={{item}}
-          @columns={{this.columns}}
-          @showTimeRead={{this.showTimeRead}}
-        />
-      {{/each}}
-    </tbody>
-  </table>
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/discovery-topics-list.hbs b/app/assets/javascripts/discourse/app/templates/components/discovery-topics-list.hbs
deleted file mode 100644
index 5bd46512095..00000000000
--- a/app/assets/javascripts/discourse/app/templates/components/discovery-topics-list.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{yield (hash saveScrollPosition=this.saveScrollPosition)}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-topic-template.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-topic-template.hbs
deleted file mode 100644
index 265c0693d87..00000000000
--- a/app/assets/javascripts/discourse/app/templates/components/edit-category-topic-template.hbs
+++ /dev/null
@@ -1,4 +0,0 @@
-<DEditor
-  @value={{this.category.topic_template}}
-  @showLink={{this.showInsertLinkButton}}
-/>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/json-editor.hbs b/app/assets/javascripts/discourse/app/templates/components/json-editor.hbs
deleted file mode 100644
index 4ccd6b8c5de..00000000000
--- a/app/assets/javascripts/discourse/app/templates/components/json-editor.hbs
+++ /dev/null
@@ -1,16 +0,0 @@
-<DModalBody
-  @rawTitle={{i18n
-    "admin.site_settings.json_schema.modal_title"
-    name=this.settingName
-  }}
->
-  <div id="json-editor-holder"></div>
-</DModalBody>
-
-<div class="modal-footer">
-  <DButton
-    @class="btn-primary"
-    @action={{action "saveChanges"}}
-    @label="save"
-  />
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/plugin-outlet.hbs b/app/assets/javascripts/discourse/app/templates/components/plugin-outlet.hbs
deleted file mode 100644
index f5d83c4bbf4..00000000000
--- a/app/assets/javascripts/discourse/app/templates/components/plugin-outlet.hbs
+++ /dev/null
@@ -1,9 +0,0 @@
-{{#each this.connectors as |c|}}
-  <PluginConnector
-    @connector={{c}}
-    @args={{this.args}}
-    @deprecatedArgs={{this.deprecatedArgs}}
-    @class={{c.classNames}}
-    @tagName={{this.connectorTagName}}
-  />
-{{/each}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/quote-button.hbs b/app/assets/javascripts/discourse/app/templates/components/quote-button.hbs
deleted file mode 100644
index 2eb7e71912f..00000000000
--- a/app/assets/javascripts/discourse/app/templates/components/quote-button.hbs
+++ /dev/null
@@ -1,70 +0,0 @@
-<div class="buttons">
-  {{#if this.embedQuoteButton}}
-    <DButton
-      @class="btn-flat insert-quote"
-      @action={{action "insertQuote"}}
-      @icon="quote-left"
-      @label="post.quote_reply"
-      @title="post.quote_reply_shortcut"
-    />
-  {{/if}}
-
-  {{#if this.siteSettings.enable_fast_edit}}
-    {{#if this._canEditPost}}
-      <DButton
-        @icon="pencil-alt"
-        @action={{action "_toggleFastEditForm"}}
-        @label="post.quote_edit"
-        @class="btn-flat quote-edit-label"
-        @title="post.quote_edit_shortcut"
-      />
-    {{/if}}
-  {{/if}}
-
-  {{#if this.quoteSharingEnabled}}
-    <span class="quote-sharing">
-      {{#if this.quoteSharingShowLabel}}
-        <DButton
-          @icon="share"
-          @label="post.quote_share"
-          @class="btn-flat quote-share-label"
-        />
-      {{/if}}
-
-      <span class="quote-share-buttons">
-        {{#each this.quoteSharingSources as |source|}}
-          <DButton
-            @class="btn-flat"
-            @action={{action "share" source}}
-            @translatedTitle={{source.title}}
-            @icon={{source.icon}}
-          />
-        {{/each}}
-        <PluginOutlet
-          @name="quote-share-buttons-after"
-          @connectorTagName="div"
-        />
-      </span>
-    </span>
-  {{/if}}
-</div>
-
-<div class="extra">
-  {{#if this.siteSettings.enable_fast_edit}}
-    {{#if this._displayFastEditInput}}
-      <div class="fast-edit-container">
-        <Textarea id="fast-edit-input" @value={{this._fastEditNewSelection}} />
-        <DButton
-          @action={{action "_saveFastEdit"}}
-          @class="btn-small btn-primary save-fast-edit"
-          @icon="pencil-alt"
-          @label="composer.save_edit"
-          @translatedTitle={{this._saveEditButtonTitle}}
-          @disabled={{this._saveFastEditDisabled}}
-          @isLoading={{this._isSavingFastEdit}}
-        />
-      </div>
-    {{/if}}
-  {{/if}}
-  <PluginOutlet @name="quote-button-after" @connectorTagName="div" />
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-flagged-post.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-flagged-post.hbs
deleted file mode 100644
index c23d3b29c20..00000000000
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-flagged-post.hbs
+++ /dev/null
@@ -1,32 +0,0 @@
-<div class="flagged-post-header">
-  <ReviewableTopicLink @reviewable={{this.reviewable}} @tagName="" />
-  <ReviewablePostEdits @reviewable={{this.reviewable}} @tagName="" />
-</div>
-
-<div class="post-contents-wrapper">
-  <ReviewableCreatedBy
-    @user={{this.reviewable.target_created_by}}
-    @tagName=""
-  />
-  <div class="post-contents">
-    <ReviewablePostHeader
-      @reviewable={{this.reviewable}}
-      @createdBy={{this.reviewable.target_created_by}}
-      @tagName=""
-    />
-    <div class="post-body">
-      {{#if this.reviewable.blank_post}}
-        <p>{{i18n "review.deleted_post"}}</p>
-      {{else}}
-        {{html-safe this.reviewable.cooked}}
-      {{/if}}
-    </div>
-    <PluginOutlet
-      @name="after-reviewable-flagged-post-body"
-      @tagName="span"
-      @connectorTagName="div"
-      @args={{hash model=this.reviewable}}
-    />
-    {{yield}}
-  </div>
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-score.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-score.hbs
deleted file mode 100644
index 639aff88b93..00000000000
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-score.hbs
+++ /dev/null
@@ -1,79 +0,0 @@
-<tr class="reviewable-score">
-  <td class="user">
-    <UserLink @user={{this.rs.user}}>
-      {{avatar this.rs.user imageSize="tiny"}}
-      {{this.rs.user.username}}
-    </UserLink>
-    <UserFlagPercentage
-      @agreed={{this.rs.agree_stats.agreed}}
-      @disagreed={{this.rs.agree_stats.disagreed}}
-      @ignored={{this.rs.agree_stats.ignored}}
-    />
-  </td>
-  <td>
-    {{d-icon this.rs.score_type.icon}}
-    {{this.title}}
-  </td>
-  <td>
-    {{format-date this.rs.created_at format="tiny"}}
-  </td>
-
-  {{#if this.showStatus}}
-    <td class="reviewable-score-spacer">
-      {{d-icon "angle-double-right"}}
-    </td>
-
-    <td class="reviewed-by">
-      {{#if this.rs.reviewed_by}}
-        <UserLink @user={{this.rs.reviewed_by}}>
-          {{avatar this.rs.reviewed_by imageSize="tiny"}}
-          {{this.rs.reviewed_by.username}}
-        </UserLink>
-      {{else}}
-        &mdash;
-      {{/if}}
-    </td>
-
-    <td>
-      {{reviewable-status this.rs.status}}
-    </td>
-    <td>
-      {{#if this.rs.reviewed_by}}
-        {{format-date this.rs.reviewed_at format="tiny"}}
-      {{/if}}
-    </td>
-  {{else}}
-    <td colspan="4"></td>
-  {{/if}}
-</tr>
-
-{{#if this.rs.reason}}
-  <tr>
-    <td colspan="7">
-      <div class="reviewable-score-reason">{{html-safe this.rs.reason}}</div>
-    </td>
-  </tr>
-{{/if}}
-
-{{#if this.rs.reviewable_conversation}}
-  <tr>
-    <td colspan="7">
-      <div class="reviewable-conversation">
-        {{#each
-          this.rs.reviewable_conversation.conversation_posts
-          as |p index|
-        }}
-          <ReviewableConversationPost @post={{p}} @index={{index}} />
-        {{/each}}
-        <div class="controls">
-          <a
-            href={{this.rs.reviewable_conversation.permalink}}
-            class="btn btn-small"
-          >
-            {{i18n "review.conversation.view_full"}}
-          </a>
-        </div>
-      </div>
-    </td>
-  </tr>
-{{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-scores.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-scores.hbs
deleted file mode 100644
index 7758be85088..00000000000
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-scores.hbs
+++ /dev/null
@@ -1,9 +0,0 @@
-{{#if this.reviewable.reviewable_scores}}
-  <table class="reviewable-scores">
-    <tbody>
-      {{#each this.reviewable.reviewable_scores as |rs|}}
-        <ReviewableScore @rs={{rs}} @reviewable={{this.reviewable}} />
-      {{/each}}
-    </tbody>
-  </table>
-{{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/table-header-toggle.hbs b/app/assets/javascripts/discourse/app/templates/components/table-header-toggle.hbs
deleted file mode 100644
index 4a8aacf6721..00000000000
--- a/app/assets/javascripts/discourse/app/templates/components/table-header-toggle.hbs
+++ /dev/null
@@ -1,16 +0,0 @@
-<span
-  class="header-contents"
-  id={{this.id}}
-  role="button"
-  tabindex="0"
-  aria-label={{this.ariaLabel}}
-  aria-pressed={{this.pressedState}}
->
-  {{directory-table-header-title
-    field=this.field
-    labelKey=this.labelKey
-    icon=this.icon
-    translated=this.translated
-  }}
-  {{this.chevronIcon}}
-</span>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-title.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-title.hbs
deleted file mode 100644
index cd0a7f6cc69..00000000000
--- a/app/assets/javascripts/discourse/app/templates/components/topic-title.hbs
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="container">
-  <div class="title-wrapper">
-    {{yield}}
-  </div>
-  <PluginOutlet
-    @name="topic-title"
-    @tagName="span"
-    @connectorTagName="div"
-    @args={{hash model=this.model}}
-  />
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-profile-avatar.hbs b/app/assets/javascripts/discourse/app/templates/components/user-profile-avatar.hbs
deleted file mode 100644
index c1994f081b1..00000000000
--- a/app/assets/javascripts/discourse/app/templates/components/user-profile-avatar.hbs
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="user-profile-avatar">
-  {{bound-avatar @user "huge"}}
-  <UserAvatarFlair @user={{@user}} />
-  <PluginOutlet
-    @name="user-profile-avatar-flair"
-    @connectorTagName="div"
-    @args={{hash model=@user}}
-    @tagName="div"
-  />
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-status-message.hbs b/app/assets/javascripts/discourse/app/templates/components/user-status-message.hbs
deleted file mode 100644
index c8a8dd566eb..00000000000
--- a/app/assets/javascripts/discourse/app/templates/components/user-status-message.hbs
+++ /dev/null
@@ -1,23 +0,0 @@
-<span class="user-status-message">
-  {{emoji @status.emoji skipTitle=true}}
-  {{#if @showDescription}}
-    <span class="user-status-message-description">
-      {{@status.description}}
-    </span>
-  {{/if}}
-  {{#if this.showTooltip}}
-    <DTooltip>
-      <div class="user-status-message-tooltip">
-        {{emoji @status.emoji skipTitle=true}}
-        <span class="user-status-tooltip-description">
-          {{@status.description}}
-        </span>
-        {{#if this.until}}
-          <div class="user-status-tooltip-until">
-            {{this.until}}
-          </div>
-        {{/if}}
-      </div>
-    </DTooltip>
-  {{/if}}
-</span>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/components/welcome-topic-banner.hbs b/app/assets/javascripts/discourse/app/templates/components/welcome-topic-banner.hbs
deleted file mode 100644
index 32705dbafc8..00000000000
--- a/app/assets/javascripts/discourse/app/templates/components/welcome-topic-banner.hbs
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="welcome-cta">
-  <div class="welcome-cta__content">
-    <h1 class="welcome-cta__title">{{i18n "welcome_topic_banner.title"}}</h1>
-    <p class="welcome-cta__description">{{i18n
-        "welcome_topic_banner.description"
-      }}</p>
-  </div>
-  <DButton
-    @class="btn-primary welcome-cta__button"
-    @action={{action "editWelcomeTopic"}}
-    @label="welcome_topic_banner.button_title"
-    @icon="pencil-alt"
-  />
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/composer.hbs b/app/assets/javascripts/discourse/app/templates/composer.hbs
deleted file mode 100644
index 6cec8edad99..00000000000
--- a/app/assets/javascripts/discourse/app/templates/composer.hbs
+++ /dev/null
@@ -1,395 +0,0 @@
-<ComposerBody
-  @composer={{this.model}}
-  @showPreview={{this.showPreview}}
-  @openIfDraft={{action "openIfDraft"}}
-  @typed={{action "typed"}}
-  @cancelled={{action "cancelled"}}
-  @save={{action "save"}}
->
-  <div class="grippie"></div>
-
-  {{#if this.visible}}
-    <ComposerMessages
-      @composer={{this.model}}
-      @messageCount={{this.messageCount}}
-      @addLinkLookup={{action "addLinkLookup"}}
-    />
-
-    {{#if this.showFullScreenPrompt}}
-      <ComposerFullscreenPrompt
-        @removeFullScreenExitPrompt={{action "removeFullScreenExitPrompt"}}
-      />
-    {{/if}}
-
-    {{#if this.model.viewOpenOrFullscreen}}
-      <div
-        role="form"
-        aria-label={{I18n this.saveLabel}}
-        class="reply-area {{if this.canEditTags 'with-tags' 'without-tags'}}"
-      >
-        <PluginOutlet
-          @name="composer-open"
-          @tagName="span"
-          @connectorTagName="div"
-          @args={{hash model=this.model}}
-        />
-
-        <div class="reply-to">
-          {{#unless this.model.viewFullscreen}}
-            <div class="reply-details">
-              <ComposerActionTitle
-                @model={{this.model}}
-                @openComposer={{action "openComposer"}}
-                @closeComposer={{action "closeComposer"}}
-                @canWhisper={{this.canWhisper}}
-              />
-
-              <PluginOutlet
-                @name="composer-action-after"
-                @args={{hash model=this.model}}
-              />
-
-              {{#unless this.site.mobileView}}
-                {{#if this.model.unlistTopic}}
-                  <span class="unlist">({{i18n "composer.unlist"}})</span>
-                {{/if}}
-                {{#if this.isWhispering}}
-                  {{#if this.model.noBump}}
-                    <span class="no-bump">{{d-icon "anchor"}}</span>
-                  {{/if}}
-                {{/if}}
-              {{/unless}}
-
-              {{#if this.canEdit}}
-                <LinkToInput
-                  @onClick={{action "displayEditReason"}}
-                  @showInput={{this.showEditReason}}
-                  @icon="info-circle"
-                  @class="display-edit-reason"
-                >
-                  <TextField
-                    @value={{this.editReason}}
-                    @id="edit-reason"
-                    @maxlength="255"
-                    @placeholderKey="composer.edit_reason_placeholder"
-                  />
-                </LinkToInput>
-              {{/if}}
-            </div>
-          {{/unless}}
-
-          <PluginOutlet
-            @name="before-composer-controls"
-            @args={{hash model=this.model}}
-          />
-
-          <ComposerToggles
-            @composeState={{this.model.composeState}}
-            @showToolbar={{this.showToolbar}}
-            @toggleComposer={{action "toggle"}}
-            @toggleToolbar={{action "toggleToolbar"}}
-            @toggleFullscreen={{action "fullscreenComposer"}}
-            @disableTextarea={{this.disableTextarea}}
-          />
-        </div>
-
-        <ComposerEditor
-          @topic={{this.topic}}
-          @composer={{this.model}}
-          @lastValidatedAt={{this.lastValidatedAt}}
-          @canWhisper={{this.canWhisper}}
-          @storeToolbarState={{action "storeToolbarState"}}
-          @onPopupMenuAction={{action "onPopupMenuAction"}}
-          @showUploadModal={{route-action "showUploadSelector"}}
-          @popupMenuOptions={{this.popupMenuOptions}}
-          @draftStatus={{this.model.draftStatus}}
-          @isUploading={{this.isUploading}}
-          @isProcessingUpload={{this.isProcessingUpload}}
-          @allowUpload={{this.allowUpload}}
-          @uploadIcon={{this.uploadIcon}}
-          @isCancellable={{this.isCancellable}}
-          @uploadProgress={{this.uploadProgress}}
-          @groupsMentioned={{action "groupsMentioned"}}
-          @cannotSeeMention={{action "cannotSeeMention"}}
-          @hereMention={{action "hereMention"}}
-          @importQuote={{action "importQuote"}}
-          @togglePreview={{action "togglePreview"}}
-          @processPreview={{this.showPreview}}
-          @showToolbar={{this.showToolbar}}
-          @afterRefresh={{action "afterRefresh"}}
-          @focusTarget={{this.focusTarget}}
-          @disableTextarea={{this.disableTextarea}}
-        >
-          <div class="composer-fields">
-            <PluginOutlet
-              @name="before-composer-fields"
-              @args={{hash model=this.model}}
-            />
-            {{#unless this.model.viewFullscreen}}
-              {{#if this.model.canEditTitle}}
-                {{#if this.model.creatingPrivateMessage}}
-                  <div class="user-selector">
-                    <ComposerUserSelector
-                      @topicId={{this.topicModel.id}}
-                      @recipients={{this.model.targetRecipients}}
-                      @hasGroups={{this.model.hasTargetGroups}}
-                      @focusTarget={{this.focusTarget}}
-                      @class={{concat
-                        "users-input"
-                        (if this.showWarning " can-warn")
-                      }}
-                    />
-                    {{#if this.showWarning}}
-                      <label class="add-warning">
-                        <Input
-                          @type="checkbox"
-                          @checked={{this.model.isWarning}}
-                        />
-                        <span>{{i18n "composer.add_warning"}}</span>
-                      </label>
-                    {{/if}}
-                  </div>
-                {{/if}}
-
-                <div
-                  class="title-and-category
-                    {{if this.showPreview 'with-preview'}}"
-                >
-                  <ComposerTitle
-                    @composer={{this.model}}
-                    @lastValidatedAt={{this.lastValidatedAt}}
-                    @focusTarget={{this.focusTarget}}
-                  />
-
-                  {{#if this.model.showCategoryChooser}}
-                    <div class="category-input">
-                      <CategoryChooser
-                        @value={{this.model.categoryId}}
-                        @onChange={{action (mut this.model.categoryId)}}
-                        @options={{hash
-                          disabled=this.disableCategoryChooser
-                          scopedCategoryId=this.scopedCategoryId
-                          prioritizedCategoryId=this.prioritizedCategoryId
-                        }}
-                      />
-                      <PopupInputTip @validation={{this.categoryValidation}} />
-                    </div>
-                  {{/if}}
-
-                  {{#if this.canEditTags}}
-                    <MiniTagChooser
-                      @value={{this.model.tags}}
-                      @onChange={{action (mut this.model.tags)}}
-                      @options={{hash
-                        disabled=this.disableTagsChooser
-                        categoryId=this.model.categoryId
-                        minimum=this.model.minimumRequiredTags
-                      }}
-                    />
-                    <PopupInputTip @validation={{this.tagValidation}} />
-                  {{/if}}
-
-                  <PluginOutlet
-                    @name="after-title-and-category"
-                    @args={{hash
-                      model=this.model
-                      tagValidation=this.tagValidation
-                      canEditTags=this.canEditTags
-                      disabled=this.disableTagsChooser
-                    }}
-                  />
-                </div>
-              {{/if}}
-
-              <PluginOutlet
-                @name="composer-fields"
-                @tagName="span"
-                @connectorTagName="div"
-                @args={{hash model=this.model showPreview=this.showPreview}}
-              />
-            {{/unless}}
-          </div>
-        </ComposerEditor>
-
-        <PluginOutlet
-          @name="composer-after-composer-editor"
-          @tagName="span"
-          @args={{hash model=this.model}}
-        />
-
-        <div class="submit-panel">
-          <PluginOutlet
-            @name="composer-fields-below"
-            @tagName="span"
-            @connectorTagName="div"
-            @args={{hash model=this.model}}
-          />
-
-          <div class="save-or-cancel">
-            <ComposerSaveButton
-              @action={{action "save"}}
-              @icon={{this.saveIcon}}
-              @label={{this.saveLabel}}
-              @forwardEvent={{true}}
-              @disableSubmit={{this.disableSubmit}}
-            />
-
-            {{#if this.site.mobileView}}
-              <a
-                href
-                {{on "click" this.cancel}}
-                title={{i18n "cancel"}}
-                class="cancel"
-              >
-                {{#if this.canEdit}}
-                  {{d-icon "times"}}
-                {{else}}
-                  {{d-icon "far-trash-alt"}}
-                {{/if}}
-              </a>
-            {{else}}
-              <a href {{on "click" this.cancel}} class="cancel">{{i18n
-                  "close"
-                }}</a>
-            {{/if}}
-
-            {{#if this.site.mobileView}}
-              {{#if this.whisperOrUnlistTopic}}
-                <span class="whisper">
-                  {{d-icon "far-eye-slash"}}
-                </span>
-              {{/if}}
-
-              {{#if this.model.noBump}}
-                <span class="no-bump">{{d-icon "anchor"}}</span>
-              {{/if}}
-            {{/if}}
-
-            {{#if (or this.isUploading this.isProcessingUpload)}}
-              <div id="file-uploading">
-                {{#if this.isProcessingUpload}}
-                  {{loading-spinner size="small"}}<span>{{i18n
-                      "upload_selector.processing"
-                    }}</span>
-                {{else}}
-                  {{loading-spinner size="small"}}<span>{{i18n
-                      "upload_selector.uploading"
-                    }}
-                    {{this.uploadProgress}}%</span>
-                {{/if}}
-
-                {{#if this.isCancellable}}
-                  <a
-                    href
-                    id="cancel-file-upload"
-                    {{on "click" this.cancelUpload}}
-                  >{{d-icon "times"}}</a>
-                {{/if}}
-              </div>
-            {{/if}}
-
-            <div class={{if this.isUploading "hidden"}} id="draft-status">
-              {{#if this.model.draftStatus}}
-                <span class="draft-error" title={{this.model.draftStatus}}>
-                  {{#if this.model.draftConflictUser}}
-                    {{avatar this.model.draftConflictUser imageSize="small"}}
-                    {{d-icon "user-edit"}}
-                  {{else}}
-                    {{d-icon "exclamation-triangle"}}
-                  {{/if}}
-                  {{#unless this.site.mobileView}}
-                    {{this.model.draftStatus}}
-                  {{/unless}}
-                </span>
-              {{/if}}
-            </div>
-
-            <PluginOutlet
-              @name="composer-after-save-or-cancel"
-              @tagName="span"
-              @args={{hash model=this.model}}
-            />
-          </div>
-
-          {{#if this.site.mobileView}}
-            <PluginOutlet
-              @name="composer-mobile-buttons-bottom"
-              @tagName="span"
-              @args={{hash model=this.model}}
-            />
-
-            {{#if this.allowUpload}}
-              <a
-                id="mobile-file-upload"
-                class="btn btn-default no-text mobile-file-upload
-                  {{if this.isUploading 'hidden'}}"
-                aria-label={{i18n "composer.upload_title"}}
-              >
-                {{d-icon this.uploadIcon}}
-              </a>
-            {{/if}}
-
-            <a
-              href
-              class="btn btn-default no-text mobile-preview"
-              title={{i18n "composer.show_preview"}}
-              {{on "click" this.togglePreview}}
-              aria-label={{i18n "preview"}}
-            >
-              {{d-icon "desktop"}}
-            </a>
-
-            {{#if this.showPreview}}
-              <DButton
-                @action={{action "togglePreview"}}
-                @class="hide-preview"
-                @ariaLabel="composer.hide_preview"
-                @icon="pencil-alt"
-              />
-            {{/if}}
-          {{else}}
-            <DButton
-              @action={{action "togglePreview"}}
-              @translatedTitle={{this.toggleText}}
-              @icon="angle-double-left"
-              @class={{concat
-                "btn-flat btn-mini-toggle toggle-preview "
-                (unless this.showPreview "active")
-              }}
-            />
-          {{/if}}
-        </div>
-      </div>
-    {{else}}
-      <div class="saving-text">
-        {{#if this.model.createdPost}}
-          {{i18n "composer.saved"}}
-          <a
-            href={{this.createdPost.url}}
-            {{on "click" this.viewNewReply}}
-            class="permalink"
-          >{{i18n "composer.view_new_post"}}</a>
-        {{else}}
-          {{i18n "composer.saving"}}
-          {{loading-spinner size="small"}}
-        {{/if}}
-      </div>
-
-      <div class="draft-text">
-        {{#if this.model.topic}}
-          {{d-icon "share"}}
-          {{html-safe this.draftTitle}}
-        {{else}}
-          {{i18n "composer.saved_draft"}}
-        {{/if}}
-      </div>
-
-      <ComposerToggles
-        @composeState={{this.model.composeState}}
-        @toggleFullscreen={{action "openIfDraft"}}
-        @toggleComposer={{action "toggle"}}
-        @toggleToolbar={{action "toggleToolbar"}}
-      />
-    {{/if}}
-  {{/if}}
-</ComposerBody>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/discovery.hbs b/app/assets/javascripts/discourse/app/templates/discovery.hbs
index c64aaac414e..2eaecdf418a 100644
--- a/app/assets/javascripts/discourse/app/templates/discovery.hbs
+++ b/app/assets/javascripts/discourse/app/templates/discovery.hbs
@@ -8,11 +8,9 @@
   {{/unless}}
 </div>
 
-<PluginOutlet
-  @name="discovery-list-controls-above"
-  @tagName="span"
-  @connectorTagName="div"
-/>
+<span>
+  <PluginOutlet @name="discovery-list-controls-above" @connectorTagName="div" />
+</span>
 
 <div class="list-controls">
   <PluginOutlet
@@ -24,22 +22,20 @@
   </div>
 </div>
 
-<ConditionalLoadingSpinner @condition={{this.loading}} />
+<ConditionalLoadingSpinner @condition={{this.showLoadingSpinner}} />
 
-<PluginOutlet @name="discovery-above" @tagName="span" @connectorTagName="div" />
+<span>
+  <PluginOutlet @name="discovery-above" @connectorTagName="div" />
+</span>
 
-{{#if this.showEditWelcomeTopicBanner}}
-  <WelcomeTopicBanner />
-{{/if}}
-
-<div class="container list-container {{if this.loading 'hidden'}}">
+<div class="container list-container {{if this.showLoadingSpinner 'hidden'}}">
   <div class="row">
     <div class="full-width">
       <div id="header-list-area">
         {{outlet "header-list-container"}}
         <PluginOutlet
           @name="header-list-container-bottom"
-          @args={{hash category=this.category}}
+          @outletArgs={{hash category=this.category}}
         />
       </div>
     </div>
@@ -50,9 +46,8 @@
       <div id="list-area">
         <PluginOutlet
           @name="discovery-list-container-top"
-          @tagName=""
           @connectorTagName="span"
-          @args={{hash category=this.category listLoading=this.loading}}
+          @outletArgs={{hash category=this.category listLoading=this.loading}}
         />
         {{outlet "list-container"}}
       </div>
@@ -60,4 +55,6 @@
   </div>
 </div>
 
-<PluginOutlet @name="discovery-below" @tagName="span" @connectorTagName="div" />
\ No newline at end of file
+<span>
+  <PluginOutlet @name="discovery-below" @connectorTagName="div" />
+</span>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/discovery/categories.hbs b/app/assets/javascripts/discourse/app/templates/discovery/categories.hbs
index a977659fb22..ad003477e94 100644
--- a/app/assets/javascripts/discourse/app/templates/discovery/categories.hbs
+++ b/app/assets/javascripts/discourse/app/templates/discovery/categories.hbs
@@ -1,7 +1,7 @@
 <PluginOutlet
   @name="above-discovery-categories"
   @connectorTagName="div"
-  @args={{hash
+  @outletArgs={{hash
     categories=this.model.categories
     categoryPageStyle=this.categoryPageStyle
     topics=this.model.topics
@@ -45,7 +45,7 @@
 <PluginOutlet
   @name="below-discovery-categories"
   @connectorTagName="div"
-  @args={{hash
+  @outletArgs={{hash
     categories=this.model.categories
     categoryPageStyle=this.categoryPageStyle
     topics=this.model.topics
diff --git a/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs
index a68161e5aa0..c4c1129178a 100644
--- a/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs
@@ -31,7 +31,6 @@
   @autoAddTopicsToBulkSelect={{this.autoAddTopicsToBulkSelect}}
   @bulkSelectEnabled={{this.bulkSelectEnabled}}
   @addTopicsToBulkSelect={{action "addTopicsToBulkSelect"}}
-  as |discoveryTopicList|
 >
   {{#if this.top}}
     <div class="top-lists">
@@ -59,12 +58,13 @@
       </div>
     {{/if}}
   {{/if}}
-  <PluginOutlet
-    @name="before-topic-list"
-    @tagName="span"
-    @connectorTagName="div"
-    @args={{hash category=this.category}}
-  />
+  <span>
+    <PluginOutlet
+      @name="before-topic-list"
+      @connectorTagName="div"
+      @outletArgs={{hash category=this.category}}
+    />
+  </span>
 
   {{#if this.hasTopics}}
     <TopicList
@@ -89,18 +89,17 @@
       @category={{this.category}}
       @topics={{this.model.topics}}
       @discoveryList={{true}}
-      @scrollOnLoad={{true}}
-      @onScroll={{discoveryTopicList.saveScrollPosition}}
       @focusLastVisitedTopic={{true}}
     />
   {{/if}}
 
-  <PluginOutlet
-    @name="after-topic-list"
-    @tagName="span"
-    @connectorTagName="div"
-    @args={{hash category=this.category}}
-  />
+  <span>
+    <PluginOutlet
+      @name="after-topic-list"
+      @connectorTagName="div"
+      @outletArgs={{hash category=this.category}}
+    />
+  </span>
 </DiscoveryTopicsList>
 
 <footer class="topic-list-bottom">
diff --git a/app/assets/javascripts/discourse/app/templates/faq.hbs b/app/assets/javascripts/discourse/app/templates/faq.hbs
new file mode 100644
index 00000000000..b729b06218a
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/faq.hbs
@@ -0,0 +1,9 @@
+<DSection @bodyClass="static-{{this.model.path}}" @class="container">
+  <WatchRead>
+    <div class="contents clearfix body-page">
+      <PluginOutlet @name="above-static" />
+      {{html-safe this.model.html}}
+      <PluginOutlet @name="below-static" />
+    </div>
+  </WatchRead>
+</DSection>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/full-page-search.hbs b/app/assets/javascripts/discourse/app/templates/full-page-search.hbs
index 3e48050697d..139017a085f 100644
--- a/app/assets/javascripts/discourse/app/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/app/templates/full-page-search.hbs
@@ -137,19 +137,20 @@
       {{/if}}
     {{/if}}
 
-    <PluginOutlet
-      @name="full-page-search-below-search-info"
-      @tagName="span"
-      @connectorTagName="div"
-      @args={{hash search=this.searchTerm}}
-    />
+    <span>
+      <PluginOutlet
+        @name="full-page-search-below-search-info"
+        @connectorTagName="div"
+        @outletArgs={{hash search=this.searchTerm}}
+      />
+    </span>
 
     {{#if this.searching}}
       {{loading-spinner size="medium"}}
     {{else}}
       <div class="search-results" role="region">
         <LoadMore @selector=".fps-result" @action={{action "loadMore"}}>
-          {{#if this.usingDefaultSearchType}}
+          {{#if (or this.usingDefaultSearchType this.customSearchType)}}
             <SearchResultEntries
               @posts={{this.model.posts}}
               @bulkSelectEnabled={{this.bulkSelectEnabled}}
diff --git a/app/assets/javascripts/discourse/app/templates/group-index.hbs b/app/assets/javascripts/discourse/app/templates/group-index.hbs
index 926d895daa7..18e4b30b172 100644
--- a/app/assets/javascripts/discourse/app/templates/group-index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group-index.hbs
@@ -1,5 +1,15 @@
 <section class="user-content">
   <div class="group-members-actions">
+
+    {{#if this.canManageGroup}}
+      <DButton
+        @class="bulk-select"
+        @icon="list"
+        @action={{action "toggleBulkSelect"}}
+        @title="topics.bulk.toggle"
+      />
+    {{/if}}
+
     {{#if this.model.can_see_members}}
       <TextField
         @value={{this.filterInput}}
@@ -10,6 +20,35 @@
     {{/if}}
 
     {{#if this.canManageGroup}}
+
+      {{#if this.isBulk}}
+        <span class="bulk-select-buttons-wrap">
+          {{#if this.bulkSelection}}
+            <BulkGroupMemberDropdown
+              @bulkSelection={{this.bulkSelection}}
+              @canAdminGroup={{this.model.can_admin_group}}
+              @canEditGroup={{this.model.can_edit_group}}
+              @onChange={{action "actOnSelection" this.bulkSelection}}
+            />
+
+            <DButton
+              @action={{action "bulkClearAll"}}
+              @label="topics.bulk.clear_all"
+              @icon="far-square"
+              @class="bulk-select-clear"
+            />
+          {{/if}}
+
+          <DButton
+            @action={{action "bulkSelectAll"}}
+            @label="topics.bulk.select_all"
+            @icon="check-square"
+            @class="bulk-select-all"
+          />
+
+        </span>
+      {{/if}}
+
       <div class="group-members-manage">
         <DButton
           @icon="plus"
@@ -31,132 +70,167 @@
   </div>
 
   {{#if this.hasMembers}}
-    <LoadMore @selector=".group-members tr" @action={{action "loadMore"}}>
-      <table
-        class={{if this.isBulk "group-members sticky-header" "group-members"}}
+    <LoadMore
+      @selector=".directory-table .directory-table__cell"
+      @action={{action "loadMore"}}
+    >
+
+      <ResponsiveTable
+        @className="group-members
+          {{if this.isBulk 'sticky-header' ''}}
+          {{if this.canManageGroup 'group-members--can-manage' ''}}"
       >
-        <thead>
-          <tr>
-            <th class="bulk-select">
-              {{#if this.canManageGroup}}
-                <FlatButton
-                  @class="bulk-select"
-                  @icon="list"
-                  @action={{action "toggleBulkSelect"}}
-                  @title="topics.bulk.toggle"
-                />
-              {{/if}}
-            </th>
-            {{#if this.isBulk}}
-              <th class="bulk-select-buttons">
-                <span class="bulk-select-buttons-wrap">
-                  {{#if this.bulkSelection}}
-                    <BulkGroupMemberDropdown
-                      @bulkSelection={{this.bulkSelection}}
-                      @canAdminGroup={{this.model.can_admin_group}}
-                      @onChange={{action "actOnSelection" this.bulkSelection}}
+        <:header>
+          <TableHeaderToggle
+            @order={{this.order}}
+            @asc={{this.asc}}
+            @field="username_lower"
+            @labelKey="username"
+            @class="directory-table__column-header--username username"
+            @automatic={{true}}
+            @colspan="2"
+          />
+
+          {{#if this.canManageGroup}}
+            <div
+              class="directory-table__column-header directory-table__column-header--can-manage"
+            ></div>
+          {{/if}}
+
+          <TableHeaderToggle
+            @class="directory-table__column-header--added"
+            @order={{this.order}}
+            @asc={{this.asc}}
+            @field="added_at"
+            @labelKey="groups.member_added"
+            @automatic={{true}}
+          />
+          <TableHeaderToggle
+            @class="directory-table__column-header--last-posted"
+            @order={{this.order}}
+            @asc={{this.asc}}
+            @field="last_posted_at"
+            @labelKey="last_post"
+            @automatic={{true}}
+          />
+          <TableHeaderToggle
+            @class="directory-table__column-header--last-seen"
+            @order={{this.order}}
+            @asc={{this.asc}}
+            @field="last_seen_at"
+            @labelKey="last_seen"
+            @automatic={{true}}
+          />
+
+          {{#if this.canManageGroup}}
+            <div
+              class="directory-table__column-header directory-table__column-header--member-settings"
+            ></div>
+          {{/if}}
+        </:header>
+
+        <:body>
+          {{#each this.model.members as |m|}}
+            <div class="directory-table__row">
+
+              <div
+                class="directory-table__cell directory-table__cell--username group-member"
+                colspan="2"
+              >
+                {{#if this.canManageGroup}}
+                  {{#if this.isBulk}}
+                    <Input
+                      @type="checkbox"
+                      class="bulk-select"
+                      {{on "click" (action "selectMember" m)}}
                     />
                   {{/if}}
-                  <DButton
-                    @action={{action "bulkSelectAll"}}
-                    @label="topics.bulk.select_all"
-                  />
-                  <DButton
-                    @action={{action "bulkClearAll"}}
-                    @label="topics.bulk.clear_all"
-                  />
-                </span>
-              </th>
-            {{/if}}
-            <TableHeaderToggle
-              @order={{this.order}}
-              @asc={{this.asc}}
-              @field="username_lower"
-              @labelKey="username"
-              @class="username"
-              @automatic={{true}}
-              @colspan="2"
-            />
-            <TableHeaderToggle
-              @order={{this.order}}
-              @asc={{this.asc}}
-              @field="added_at"
-              @labelKey="groups.member_added"
-              @automatic={{true}}
-            />
-            <TableHeaderToggle
-              @order={{this.order}}
-              @asc={{this.asc}}
-              @field="last_posted_at"
-              @labelKey="last_post"
-              @automatic={{true}}
-            />
-            <TableHeaderToggle
-              @order={{this.order}}
-              @asc={{this.asc}}
-              @field="last_seen_at"
-              @labelKey="last_seen"
-              @automatic={{true}}
-            />
-            <th></th>
-          </tr>
-        </thead>
-
-        <tbody>
-          {{#each this.model.members as |m|}}
-            <tr>
-              {{#if this.isBulk}}
-                <td class="bulk-select">
-                  <Input
-                    @type="checkbox"
-                    class="bulk-select"
-                    {{on "click" (action "selectMember" m)}}
-                  />
-                </td>
-              {{/if}}
-
-              <td class="group-member" colspan="2">
+                {{/if}}
                 <UserInfo
                   @user={{m}}
                   @skipName={{this.skipName}}
                   @showStatus={{true}}
                   @showStatusTooltip={{true}}
                 />
-              </td>
+              </div>
 
-              <td class="group-owner">
-                {{#if m.owner}}
-                  {{d-icon "shield-alt"}}
-                  {{i18n "groups.members.owner"}}<br />
-                {{/if}}
-                {{#if m.primary}}
-                  {{i18n "groups.members.primary"}}
-                {{/if}}
-              </td>
-              <td>
-                <span class="text">{{bound-date m.added_at}}</span>
-              </td>
-              <td>
-                <span class="text">{{bound-date m.last_posted_at}}</span>
-              </td>
-              <td>
-                <span class="text">{{bound-date m.last_seen_at}}</span>
-              </td>
+              {{#if this.canManageGroup}}
+                <div
+                  class="directory-table__cell directory-table__cell--can-manage group-owner"
+                >
+                  {{#if (or m.owner m.primary)}}
+                    <span class="directory-table__label">
+                      <span>{{i18n "groups.members.status"}}</span>
+                    </span>
+                  {{/if}}
+                  <span class="directory-table__value">
+                    {{#if m.owner}}
+                      {{d-icon "shield-alt"}}
+                      {{i18n "groups.members.owner"}}<br />
+                    {{/if}}
+                    {{#if m.primary}}
+                      {{i18n "groups.members.primary"}}
+                    {{/if}}
+                  </span>
 
-              <td>
-                {{#if this.canManageGroup}}
+                </div>
+              {{/if}}
+              <div class="directory-table__cell directory-table__cell--added">
+                <span class="directory-table__label">
+                  <span>{{i18n "groups.member_added"}}</span>
+                </span>
+                <span class="directory-table__value">
+                  {{bound-date m.added_at}}
+                </span>
+              </div>
+              <div
+                class="directory-table__cell{{unless
+                    m.last_posted_at
+                    '--empty'
+                  }}
+                  directory-table__cell--last-posted"
+              >
+                {{#if m.last_posted_at}}
+                  <span class="directory-table__label">
+                    <span>{{i18n "last_post"}}</span>
+                  </span>
+                {{/if}}
+                <span class="directory-table__value">
+                  {{bound-date m.last_posted_at}}
+                </span>
+              </div>
+              <div
+                class="directory-table__cell{{unless m.last_seen_at '--empty'}}
+                  directory-table__cell--last-seen"
+              >
+                {{#if m.last_seen_at}}
+                  <span class="directory-table__label">
+                    <span>{{i18n "last_seen"}}</span>
+                  </span>
+                {{/if}}
+                <span class="directory-table__value">
+                  {{bound-date m.last_seen_at}}
+                </span>
+              </div>
+              {{#if this.canManageGroup}}
+                <div
+                  class="directory-table__cell directory-table__cell--member-settings member-settings"
+                >
                   <GroupMemberDropdown
                     @member={{m}}
                     @canAdminGroup={{this.model.can_admin_group}}
+                    @canEditGroup={{this.model.can_edit_group}}
                     @onChange={{action "actOnGroup" m}}
                   />
-                {{/if}}
-                {{! group parameter is used by plugins }}
-              </td>
-            </tr>
+                  {{! group parameter is used by plugins }}
+                </div>
+              {{/if}}
+            </div>
           {{/each}}
-        </tbody>
-      </table>
+        </:body>
+
+      </ResponsiveTable>
+
     </LoadMore>
 
     <ConditionalLoadingSpinner @condition={{this.loading}} />
diff --git a/app/assets/javascripts/discourse/app/templates/group-requests.hbs b/app/assets/javascripts/discourse/app/templates/group-requests.hbs
index 52c74040293..0767ce55f3d 100644
--- a/app/assets/javascripts/discourse/app/templates/group-requests.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group-requests.hbs
@@ -9,10 +9,14 @@
   </div>
 
   {{#if this.hasRequesters}}
-    <LoadMore @selector=".group-members tr" @action={{action "loadMore"}}>
-      <table class="group-members">
-        <thead>
+    <LoadMore
+      @selector=".directory-table .directory-table__cell"
+      @action={{action "loadMore"}}
+    >
+      <ResponsiveTable @className="group-members group-members__requests">
+        <:header>
           <TableHeaderToggle
+            @class="username"
             @order={{this.order}}
             @asc={{this.asc}}
             @field="username_lower"
@@ -26,22 +30,34 @@
             @labelKey="groups.member_requested"
             @automatic={{true}}
           />
-          <th>{{i18n "groups.requests.reason"}}</th>
-          <th></th>
-          <th></th>
-        </thead>
-
-        <tbody>
+          <div
+            class="directory-table__column-header group-request-reason__column-header"
+          >{{i18n "groups.requests.reason"}}</div>
+          <div class="directory-table__column-header"></div>
+        </:header>
+        <:body>
           {{#each this.model.requesters as |m|}}
-            <tr>
-              <td class="group-member">
+            <div class="directory-table__row">
+              <div class="directory-table__cell group-member">
                 <UserInfo @user={{m}} @skipName={{this.skipName}} />
-              </td>
-              <td>
-                <span class="text">{{bound-date m.requested_at}}</span>
-              </td>
-              <td>{{m.reason}}</td>
-              <td>
+              </div>
+              <div class="directory-table__cell">
+                <span class="directory-table__label">
+                  <span>{{i18n "groups.member_requested"}}</span>
+                </span>
+                <span class="directory-table__value">
+                  <span>{{bound-date m.requested_at}}</span>
+                </span>
+              </div>
+              <div class="directory-table__cell group-request-reason__content">
+                <span class="directory-table__label">
+                  <span>{{i18n "groups.requests.reason"}}</span>
+                </span>
+                <span class="directory-table__value">
+                  {{m.reason}}
+                </span>
+              </div>
+              <div class="directory-table__cell group-accept-deny-buttons">
                 {{#if m.request_undone}}
                   {{i18n "groups.requests.undone"}}
                 {{else if m.request_accepted}}
@@ -67,17 +83,14 @@
                     @class="btn-danger"
                   />
                 {{/if}}
-              </td>
-              <td></td>
-            </tr>
+              </div>
+            </div>
           {{/each}}
-        </tbody>
-      </table>
+        </:body>
+      </ResponsiveTable>
     </LoadMore>
-
     <ConditionalLoadingSpinner @condition={{this.loading}} />
   {{else}}
     <div>{{i18n "groups.empty.requests"}}</div>
   {{/if}}
-
-</section>
+</section>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/group.hbs b/app/assets/javascripts/discourse/app/templates/group.hbs
index 1ac5d565c71..6e0245e4b8b 100644
--- a/app/assets/javascripts/discourse/app/templates/group.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group.hbs
@@ -1,9 +1,10 @@
-<PluginOutlet
-  @name="before-group-container"
-  @tagName="span"
-  @connectorTagName="div"
-  @args={{hash group=this.model}}
-/>
+<span>
+  <PluginOutlet
+    @name="before-group-container"
+    @connectorTagName="div"
+    @outletArgs={{hash group=this.model}}
+  />
+</span>
 
 <div class="container group group-{{this.model.name}}">
   {{#if this.showTooltip}}
@@ -73,12 +74,13 @@
         {{/if}}
       </div>
 
-      <PluginOutlet
-        @name="group-details-after"
-        @tagName="span"
-        @connectorTagName="div"
-        @args={{hash model=this.model}}
-      />
+      <span>
+        <PluginOutlet
+          @name="group-details-after"
+          @connectorTagName="div"
+          @outletArgs={{hash model=this.model}}
+        />
+      </span>
     </div>
 
     {{#if this.model.bio_cooked}}
diff --git a/app/assets/javascripts/discourse/app/templates/group/activity.hbs b/app/assets/javascripts/discourse/app/templates/group/activity.hbs
index b916428639f..98e6fa05b7e 100644
--- a/app/assets/javascripts/discourse/app/templates/group/activity.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group/activity.hbs
@@ -16,6 +16,6 @@
     <PluginOutlet @name="group-activity-bottom" @connectorTagName="li" />
   </MobileNav>
 </section>
-<section class="user-content">
+<section class="user-content" id="user-content">
   {{outlet}}
 </section>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/group/manage.hbs b/app/assets/javascripts/discourse/app/templates/group/manage.hbs
index 4e1d80cfc33..f103e7f3ed3 100644
--- a/app/assets/javascripts/discourse/app/templates/group/manage.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group/manage.hbs
@@ -12,6 +12,6 @@
     {{/each}}
   </MobileNav>
 </section>
-<section class="user-content">
+<section class="user-content" id="user-content">
   {{outlet}}
 </section>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/group/manage/tags.hbs b/app/assets/javascripts/discourse/app/templates/group/manage/tags.hbs
index 312b6f94cb3..caebf64bd86 100644
--- a/app/assets/javascripts/discourse/app/templates/group/manage/tags.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group/manage/tags.hbs
@@ -3,7 +3,7 @@
   <PluginOutlet
     @name="before-manage-group-tags"
     @connectorTagName="div"
-    @args={{hash model=this.model}}
+    @outletArgs={{hash model=this.model}}
   />
 
   <div class="control-group">
diff --git a/app/assets/javascripts/discourse/app/templates/group/messages.hbs b/app/assets/javascripts/discourse/app/templates/group/messages.hbs
index dc985edf674..b5919924c68 100644
--- a/app/assets/javascripts/discourse/app/templates/group/messages.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group/messages.hbs
@@ -12,6 +12,6 @@
     </li>
   </MobileNav>
 </section>
-<section class="user-content">
+<section class="user-content" id="user-content">
   {{outlet}}
 </section>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/group/permissions.hbs b/app/assets/javascripts/discourse/app/templates/group/permissions.hbs
index 6ad2d05354c..fcd231f6b15 100644
--- a/app/assets/javascripts/discourse/app/templates/group/permissions.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group/permissions.hbs
@@ -1,4 +1,4 @@
-<section class="user-content">
+<section class="user-content" id="user-content">
   {{#if this.model.permissions}}
     <label class="group-category-permissions-desc">
       {{i18n "groups.permissions.description"}}
diff --git a/app/assets/javascripts/discourse/app/templates/groups/index.hbs b/app/assets/javascripts/discourse/app/templates/groups/index.hbs
index 9d36badc8fd..a7c3e4c48fe 100644
--- a/app/assets/javascripts/discourse/app/templates/groups/index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/groups/index.hbs
@@ -102,12 +102,13 @@
                       {{/if}}
                     </GroupMembershipButton>
 
-                    <PluginOutlet
-                      @name="group-index-box-after"
-                      @tagName="span"
-                      @connectorTagName="div"
-                      @args={{hash model=group}}
-                    />
+                    <span>
+                      <PluginOutlet
+                        @name="group-index-box-after"
+                        @connectorTagName="div"
+                        @outletArgs={{hash model=group}}
+                      />
+                    </span>
                   </div>
                 </div>
               </LinkTo>
diff --git a/app/assets/javascripts/discourse/app/templates/hide-modal.hbs b/app/assets/javascripts/discourse/app/templates/hide-modal.hbs
index bb85151265c..e69de29bb2d 100644
--- a/app/assets/javascripts/discourse/app/templates/hide-modal.hbs
+++ b/app/assets/javascripts/discourse/app/templates/hide-modal.hbs
@@ -1 +0,0 @@
-<HideModalTrigger />
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/login.hbs b/app/assets/javascripts/discourse/app/templates/login.hbs
new file mode 100644
index 00000000000..c598fb59c39
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/login.hbs
@@ -0,0 +1,32 @@
+<DSection @bodyClass="static-login" @class="container">
+  <div class="contents clearfix body-page">
+    <div class="login-welcome">
+      <PluginOutlet @name="above-login" @outletArgs={{hash model=this.model}} />
+      <PluginOutlet @name="above-static" />
+
+      <div class="login-content">
+        {{html-safe this.model.html}}
+      </div>
+
+      <PluginOutlet @name="below-static" />
+      <PluginOutlet @name="below-login" @outletArgs={{hash model=this.model}} />
+
+      <div class="body-page-button-container">
+        {{#if this.application.canSignUp}}
+          <DButton
+            @action={{route-action "showCreateAccount"}}
+            @class="btn-primary sign-up-button"
+            @label="sign_up"
+          />
+        {{/if}}
+
+        <DButton
+          @action={{route-action "showLogin"}}
+          @class="btn-primary login-button"
+          @icon="user"
+          @label="log_in"
+        />
+      </div>
+    </div>
+  </div>
+</DSection>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/components/categories-with-featured-topics.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/categories-with-featured-topics.hbs
deleted file mode 100644
index 30855c0a4af..00000000000
--- a/app/assets/javascripts/discourse/app/templates/mobile/components/categories-with-featured-topics.hbs
+++ /dev/null
@@ -1 +0,0 @@
-<CategoriesOnly @categories={{this.categories}} @showTopics="true" />
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/components/directory-item.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/directory-item.hbs
deleted file mode 100644
index 6f8d45048ec..00000000000
--- a/app/assets/javascripts/discourse/app/templates/mobile/components/directory-item.hbs
+++ /dev/null
@@ -1,37 +0,0 @@
-<UserInfo @user={{this.item.user}} />
-
-{{#each this.columns as |column|}}
-  {{#if (directory-column-is-user-field column=column)}}
-    {{#if (get this.item.user.user_fields column.user_field_id)}}
-      <div class="user-stat">
-        <span class="value user-field">
-          {{directory-item-user-field-value item=this.item column=column}}
-        </span>
-        <span class="label">
-          {{column.name}}
-        </span>
-      </div>
-    {{/if}}
-
-  {{else}}
-    <div class="user-stat">
-      <span class="value">
-        {{directory-item-value item=this.item column=column}}
-      </span>
-      <span class="label">
-        {{#if column.icon}}
-          {{d-icon column.icon}}
-        {{/if}}
-        {{mobile-directory-item-label item=this.item column=column}}
-      </span>
-    </div>
-  {{/if}}
-{{/each}}
-
-{{#if this.showTimeRead}}
-  <UserStat
-    @value={{this.item.time_read}}
-    @label="directory.time_read"
-    @type="duration"
-  />
-{{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/components/navigation-bar.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/navigation-bar.hbs
index 074942329a1..7bf9c105d20 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/components/navigation-bar.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/components/navigation-bar.hbs
@@ -17,7 +17,13 @@
     <PluginOutlet
       @name="extra-nav-item"
       @connectorTagName="li"
-      @args={{hash category=this.category filterMode=this.filterMode}}
+      @outletArgs={{hash category=this.category filterMode=this.filterMode}}
     />
   </ul>
-{{/if}}
\ No newline at end of file
+{{/if}}
+
+<PluginOutlet
+  @name="inline-extra-nav-item"
+  @connectorTagName="li"
+  @outletArgs={{hash category=this.category filterMode=this.filterMode}}
+/>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/components/parent-category-row.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/parent-category-row.hbs
index c0f5b38df41..638f803edac 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/components/parent-category-row.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/components/parent-category-row.hbs
@@ -1,7 +1,7 @@
 {{#unless this.isHidden}}
   <PluginOutlet
     @name="category-list-above-each-category"
-    @args={{hash category=this.category}}
+    @outletArgs={{hash category=this.category}}
   />
   <div
     data-category-id={{this.category.id}}
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/discovery/topics.hbs b/app/assets/javascripts/discourse/app/templates/mobile/discovery/topics.hbs
index 5dbe608e694..869f996736a 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/discovery/topics.hbs
@@ -11,7 +11,6 @@
   @model={{this.model}}
   @refresh={{action "refresh"}}
   @incomingCount={{this.topicTrackingState.incomingCount}}
-  as |discoveryTopicList|
 >
   {{#if this.top}}
     <div class="top-lists">
@@ -56,8 +55,6 @@
       @expandAllPinned={{this.expandAllPinned}}
       @category={{this.category}}
       @topics={{this.model.topics}}
-      @scrollOnLoad={{true}}
-      @onScroll={{discoveryTopicList.saveScrollPosition}}
     />
   {{/if}}
 </DiscoveryTopicsList>
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/group-index.hbs b/app/assets/javascripts/discourse/app/templates/mobile/group-index.hbs
deleted file mode 100644
index 1986e243741..00000000000
--- a/app/assets/javascripts/discourse/app/templates/mobile/group-index.hbs
+++ /dev/null
@@ -1,62 +0,0 @@
-<section class="user-content">
-  <TextField
-    @value={{this.filterInput}}
-    @placeholderKey={{this.filterPlaceholder}}
-    @autocomplete="off"
-    @class="group-username-filter no-blur"
-  />
-
-  <div class="group-members-manage">
-    {{#if this.canManageGroup}}
-      <DButton
-        @icon="plus"
-        @label="groups.manage.add_members"
-        @class="group-members-add"
-        @action={{route-action "showAddMembersModal"}}
-      />
-    {{/if}}
-  </div>
-
-  {{#if this.hasMembers}}
-    <LoadMore
-      @selector=".group-members .user-info"
-      @action={{action "loadMore"}}
-    >
-      <div class="group-members">
-        {{#each this.model.members as |user|}}
-          <div class="group-member">
-            <UserInfo @user={{user}} @skipName={{this.skipName}}>
-              {{#if user.owner}}<strong class="group-owner-label">{{i18n
-                    "groups.owner"
-                  }}</strong>{{/if}}
-
-              <div class="group-member-info">
-                <label>{{i18n "last_post"}}</label>
-                <span class="text">{{bound-date user.last_posted_at}}</span>
-              </div>
-
-              <div class="group-member-info">
-                <label>{{i18n "last_seen"}}</label>
-                <span class="text">{{bound-date user.last_seen_at}}</span>
-              </div>
-
-              {{#if this.canManageGroup}}
-                <GroupMemberDropdown
-                  @member={{user}}
-                  @canAdminGroup={{this.model.can_admin_group}}
-                  @onChange={{action "actOnGroup" user}}
-                />
-              {{/if}}
-            </UserInfo>
-          </div>
-        {{/each}}
-      </div>
-    </LoadMore>
-
-    <ConditionalLoadingSpinner @condition={{this.loading}} />
-  {{else}}
-    <br />
-
-    <div>{{i18n this.emptyMessageKey}}</div>
-  {{/if}}
-</section>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/modal/login.hbs b/app/assets/javascripts/discourse/app/templates/mobile/modal/login.hbs
index 325cb8bde5f..369f3d7c728 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/modal/login.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/modal/login.hbs
@@ -42,7 +42,7 @@
             <Input
               @value={{this.loginPassword}}
               class={{value-entered this.loginPassword}}
-              @type="password"
+              @type={{if this.maskPassword "password" "text"}}
               id="login-account-password"
               maxlength="200"
               disabled={{this.showSecondFactor}}
@@ -50,11 +50,17 @@
             <label class="alt-placeholder" for="login-account-password">{{i18n
                 "login.password"
               }}</label>
-            <a
-              href
-              id="forgot-password-link"
-              {{on "click" this.handleForgotPassword}}
-            >{{i18n "forgot_password.action"}}</a>
+            <div class="login__password-links">
+              <a
+                href
+                id="forgot-password-link"
+                {{on "click" this.handleForgotPassword}}
+              >{{i18n "forgot_password.action"}}</a>
+              <TogglePasswordMask
+                @maskPassword={{this.maskPassword}}
+                @togglePasswordMask={{this.togglePasswordMask}}
+              />
+            </div>
           </div>
         </div>
         <SecondFactorForm
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/users.hbs b/app/assets/javascripts/discourse/app/templates/mobile/users.hbs
deleted file mode 100644
index 66bf9b31281..00000000000
--- a/app/assets/javascripts/discourse/app/templates/mobile/users.hbs
+++ /dev/null
@@ -1,79 +0,0 @@
-<LoadMore @selector=".directory .user" @action={{action "loadMore"}}>
-  <div class="container">
-    <div class="users-directory directory">
-      <PluginOutlet
-        @name="users-top"
-        @tagName="span"
-        @connectorTagName="div"
-        @args={{hash model=this.model}}
-      />
-
-      <div class="directory-controls">
-        <PeriodChooser
-          @period={{this.period}}
-          @onChange={{action (mut this.period)}}
-          @fullDay={{false}}
-        />
-        {{#if this.lastUpdatedAt}}
-          <div class="directory-last-updated">
-            {{i18n "directory.last_updated"}}
-            {{this.lastUpdatedAt}}
-          </div>
-        {{/if}}
-        <div class="inline-form full-width">
-          <Input
-            @value={{readonly this.nameInput}}
-            placeholder={{i18n "directory.filter_name"}}
-            class="filter-name no-blur"
-            {{on
-              "input"
-              (action "onUsernameFilterChanged" value="target.value")
-            }}
-          />
-          <ComboBox
-            @class="directory-group-selector"
-            @value={{this.group}}
-            @content={{this.groupOptions}}
-            @onChange={{action this.groupChanged}}
-            @options={{hash none="directory.group.all"}}
-          />
-          {{#if this.currentUser.staff}}
-            <DButton
-              @icon="wrench"
-              @action={{action "showEditColumnsModal"}}
-              @class="btn-default open-edit-columns-btn"
-            />
-          {{/if}}
-        </div>
-        <PluginOutlet
-          @name="users-directory-controls"
-          @args={{hash model=this.model}}
-        />
-      </div>
-
-      <ConditionalLoadingSpinner @condition={{this.isLoading}}>
-        {{#if this.model.length}}
-          <div class="total-rows">{{i18n
-              "directory.total_rows"
-              count=this.model.totalRows
-            }}</div>
-          {{#each this.model as |item|}}
-            <DirectoryItem
-              @tagName="div"
-              @class="user"
-              @item={{item}}
-              @columns={{this.columns}}
-              @showTimeRead={{this.showTimeRead}}
-            />
-          {{/each}}
-
-          <ConditionalLoadingSpinner @condition={{this.model.loadingMore}} />
-        {{else}}
-          <div class="clearfix"></div>
-          <p>{{i18n "directory.no_results"}}</p>
-        {{/if}}
-      </ConditionalLoadingSpinner>
-
-    </div>
-  </div>
-</LoadMore>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal.hbs b/app/assets/javascripts/discourse/app/templates/modal.hbs
deleted file mode 100644
index 8825264bd4d..00000000000
--- a/app/assets/javascripts/discourse/app/templates/modal.hbs
+++ /dev/null
@@ -1,14 +0,0 @@
-<DModal
-  @modalClass={{this.modalClass}}
-  @title={{this.title}}
-  @titleAriaElementId={{this.titleAriaElementId}}
-  @subtitle={{this.subtitle}}
-  @panels={{this.panels}}
-  @selectedPanel={{this.selectedPanel}}
-  @onSelectPanel={{this.onSelectPanel}}
-  @class="hidden"
-  @errors={{this.errors}}
-  @closeModal={{route-action "closeModal"}}
->
-  {{outlet "modalBody"}}
-</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal/activation-edit.hbs b/app/assets/javascripts/discourse/app/templates/modal/activation-edit.hbs
deleted file mode 100644
index 2f3f0d0c78e..00000000000
--- a/app/assets/javascripts/discourse/app/templates/modal/activation-edit.hbs
+++ /dev/null
@@ -1,13 +0,0 @@
-<DModalBody>
-  <ActivationEmailForm @email={{this.newEmail}} />
-</DModalBody>
-
-<div class="modal-footer">
-  <DButton
-    @action={{action "changeEmail"}}
-    @label="login.submit_new_email"
-    @disabled={{this.submitDisabled}}
-    @class="btn-primary"
-  />
-  <DButton @action={{route-action "closeModal"}} @label="close" />
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal/activation-resent.hbs b/app/assets/javascripts/discourse/app/templates/modal/activation-resent.hbs
deleted file mode 100644
index 7400663115d..00000000000
--- a/app/assets/javascripts/discourse/app/templates/modal/activation-resent.hbs
+++ /dev/null
@@ -1,7 +0,0 @@
-<DModalBody>
-  {{html-safe
-    (i18n "login.sent_activation_email_again" currentEmail=this.currentEmail)
-  }}
-</DModalBody>
-
-<ModalFooterClose @closeModal={{route-action "closeModal"}} />
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal/avatar-selector.hbs b/app/assets/javascripts/discourse/app/templates/modal/avatar-selector.hbs
index 35f6bb9dd0d..0ddbcd20b11 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/avatar-selector.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/avatar-selector.hbs
@@ -23,6 +23,7 @@
           @name="logo"
           @value="logo"
           @selection={{this.selected}}
+          @onChange={{this.onSelectedChanged}}
         />
         <label class="radio" for="logo-small">{{bound-avatar-template
             this.siteSettings.site_logo_small_url
@@ -37,6 +38,7 @@
         @name="avatar"
         @value="system"
         @selection={{this.selected}}
+        @onChange={{this.onSelectedChanged}}
       />
       <label class="radio" for="system-avatar">{{bound-avatar-template
           this.user.system_avatar_template
@@ -51,6 +53,7 @@
           @name="avatar"
           @value="gravatar"
           @selection={{this.selected}}
+          @onChange={{this.onSelectedChanged}}
         />
         <label class="radio" for="gravatar">{{bound-avatar-template
             this.user.gravatar_avatar_template
@@ -90,6 +93,7 @@
           @name="avatar"
           @value="custom"
           @selection={{this.selected}}
+          @onChange={{this.onSelectedChanged}}
         />
         <label class="radio" for="uploaded-avatar">
           {{#if this.user.custom_avatar_template}}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
deleted file mode 100644
index c73b473949d..00000000000
--- a/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
+++ /dev/null
@@ -1,10 +0,0 @@
-<DModalBody @id="bookmark-reminder-modal">
-  <Bookmark
-    @model={{this.model}}
-    @afterSave={{this.afterSave}}
-    @afterDelete={{this.afterDelete}}
-    @onCloseWithoutSaving={{this.onCloseWithoutSaving}}
-    @registerOnCloseHandler={{action "registerOnCloseHandler"}}
-    @closeModal={{action "closeModal"}}
-  />
-</DModalBody>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal/bulk-actions-buttons.hbs b/app/assets/javascripts/discourse/app/templates/modal/bulk-actions-buttons.hbs
deleted file mode 100644
index d1f05264d62..00000000000
--- a/app/assets/javascripts/discourse/app/templates/modal/bulk-actions-buttons.hbs
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="bulk-buttons">
-  {{#each this.buttons as |button|}}
-    <DButton
-      @action={{action button.action}}
-      @label={{button.label}}
-      @icon={{button.icon}}
-      @class={{button.class}}
-    />
-  {{/each}}
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal/bulk-change-category.hbs b/app/assets/javascripts/discourse/app/templates/modal/bulk-change-category.hbs
deleted file mode 100644
index 1469e90da43..00000000000
--- a/app/assets/javascripts/discourse/app/templates/modal/bulk-change-category.hbs
+++ /dev/null
@@ -1,15 +0,0 @@
-<p>{{i18n "topics.bulk.choose_new_category"}}</p>
-
-<p>
-  <CategoryChooser
-    @value={{this.newCategoryId}}
-    @onChange={{action (mut this.newCategoryId)}}
-  />
-</p>
-
-<ConditionalLoadingSpinner @condition={{this.loading}}>
-  <DButton
-    @action={{action "changeCategory"}}
-    @label="topics.bulk.change_category"
-  />
-</ConditionalLoadingSpinner>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal/bulk-progress.hbs b/app/assets/javascripts/discourse/app/templates/modal/bulk-progress.hbs
deleted file mode 100644
index 69480bd60fc..00000000000
--- a/app/assets/javascripts/discourse/app/templates/modal/bulk-progress.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-<p>{{html-safe
-    (i18n "topics.bulk.progress" count=this.processedTopicCount)
-  }}</p>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/app/templates/modal/create-account.hbs
index 9ca0c1d1ae4..8a560fe8777 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/create-account.hbs
@@ -4,11 +4,12 @@
   @action={{action "createAccount"}}
 >
   {{#unless this.complete}}
-    <PluginOutlet
-      @name="create-account-before-modal-body"
-      @tagName="span"
-      @connectorTagName="div"
-    />
+    <span>
+      <PluginOutlet
+        @name="create-account-before-modal-body"
+        @connectorTagName="div"
+      />
+    </span>
     <DModalBody
       @class={{this.modalBodyClasses}}
       @preventModalAlertHiding={{true}}
@@ -93,8 +94,8 @@
                     @value={{this.accountName}}
                     @id="new-account-name"
                     @class={{value-entered this.accountName}}
-                    @aria-describedby="fullname-validation"
-                    @aria-invalid={{this.nameValidation.failed}}
+                    aria-describedby="fullname-validation"
+                    aria-invalid={{this.nameValidation.failed}}
                   />
                   <label class="alt-placeholder" for="new-account-name">
                     {{i18n "user.name.title"}}
@@ -115,7 +116,7 @@
 
               <PluginOutlet
                 @name="create-account-before-password"
-                @args={{hash
+                @outletArgs={{hash
                   accountName=this.accountName
                   accountUsername=this.accountUsername
                   accountPassword=this.accountPassword
@@ -133,8 +134,8 @@
                     id="new-account-password"
                     @autocomplete="current-password"
                     @capsLockOn={{this.capsLockOn}}
-                    @aria-describedby="password-validation"
-                    @aria-invalid={{this.passwordValidation.failed}}
+                    aria-describedby="password-validation"
+                    aria-invalid={{this.passwordValidation.failed}}
                   />
                   <label class="alt-placeholder" for="new-account-password">
                     {{i18n "user.password.title"}}
@@ -200,7 +201,7 @@
 
               <PluginOutlet
                 @name="create-account-after-password"
-                @args={{hash
+                @outletArgs={{hash
                   accountName=this.accountName
                   accountUsername=this.accountUsername
                   accountPassword=this.accountPassword
diff --git a/app/assets/javascripts/discourse/app/templates/modal/create-invite-bulk.hbs b/app/assets/javascripts/discourse/app/templates/modal/create-invite-bulk.hbs
deleted file mode 100644
index de91eda4a0a..00000000000
--- a/app/assets/javascripts/discourse/app/templates/modal/create-invite-bulk.hbs
+++ /dev/null
@@ -1,40 +0,0 @@
-<CreateInviteUploader as |status|>
-  <DModalBody @title="user.invited.bulk_invite.text">
-    {{#if status.uploaded}}
-      {{i18n "user.invited.bulk_invite.success"}}
-    {{else}}
-      {{html-safe (i18n "user.invited.bulk_invite.instructions")}}
-
-      <input
-        id="csv-file"
-        disabled={{status.uploading}}
-        type="file"
-        accept=".csv"
-      />
-    {{/if}}
-  </DModalBody>
-
-  <div class="modal-footer">
-    {{#unless status.uploaded}}
-      <DButton
-        @icon={{if this.isEmail "envelope" "link"}}
-        @translatedLabel={{if
-          status.uploading
-          (i18n
-            "user.invited.bulk_invite.progress" progress=status.uploadProgress
-          )
-          (i18n "user.invited.bulk_invite.text")
-        }}
-        @class="btn-primary"
-        @action={{status.startUpload}}
-        @disabled={{status.submitDisabled}}
-      />
-    {{/unless}}
-
-    <DButton
-      @label="close"
-      @class="btn-primary"
-      @action={{route-action "closeModal"}}
-    />
-  </div>
-</CreateInviteUploader>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal/delete-topic-confirm.hbs b/app/assets/javascripts/discourse/app/templates/modal/delete-topic-confirm.hbs
deleted file mode 100644
index 0fb6a9682a4..00000000000
--- a/app/assets/javascripts/discourse/app/templates/modal/delete-topic-confirm.hbs
+++ /dev/null
@@ -1,20 +0,0 @@
-<DModalBody>
-  <p>{{i18n
-      "post.controls.delete_topic_confirm_modal"
-      count=this.siteSettings.min_topic_views_for_delete_confirm
-    }}</p>
-</DModalBody>
-
-<div class="modal-footer">
-  <DButton
-    @action={{action "deleteTopic"}}
-    @disabled={{this.deletingTopic}}
-    @translatedLabel={{this.buttonTitle}}
-    @class="btn-danger"
-  />
-  <DButton
-    @action={{route-action "closeModal"}}
-    @label="post.controls.delete_topic_confirm_modal_no"
-    @class="btn-primary"
-  />
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal/delete-topic-disallowed.hbs b/app/assets/javascripts/discourse/app/templates/modal/delete-topic-disallowed.hbs
deleted file mode 100644
index e207bbaf8fa..00000000000
--- a/app/assets/javascripts/discourse/app/templates/modal/delete-topic-disallowed.hbs
+++ /dev/null
@@ -1,10 +0,0 @@
-<DModalBody>
-  <p>{{html-safe (i18n "post.controls.delete_topic_disallowed_modal")}}</p>
-</DModalBody>
-<div class="modal-footer">
-  <DButton
-    @action={{route-action "closeModal"}}
-    @class="btn-primary"
-    @label="close"
-  />
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal/discard-draft.hbs b/app/assets/javascripts/discourse/app/templates/modal/discard-draft.hbs
deleted file mode 100644
index f77f4a164b0..00000000000
--- a/app/assets/javascripts/discourse/app/templates/modal/discard-draft.hbs
+++ /dev/null
@@ -1,26 +0,0 @@
-<DModalBody @headerClass="hidden">
-  <div class="instructions">
-    {{i18n "post.cancel_composer.confirm"}}
-  </div>
-</DModalBody>
-
-<div class="modal-footer">
-  <DButton
-    @icon="far-trash-alt"
-    @label="post.cancel_composer.discard"
-    @class="btn-danger discard-draft"
-    @action={{action "destroyDraft"}}
-  />
-  {{#if this.model.canSaveDraft}}
-    <DButton
-      @label="post.cancel_composer.save_draft"
-      @class="save-draft"
-      @action={{action "saveDraftAndClose"}}
-    />
-  {{/if}}
-  <DButton
-    @label="post.cancel_composer.keep_editing"
-    @class="keep-editing"
-    @action={{action "dismissModal"}}
-  />
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal/dismiss-notification-confirmation.hbs b/app/assets/javascripts/discourse/app/templates/modal/dismiss-notification-confirmation.hbs
deleted file mode 100644
index 9b05e40a313..00000000000
--- a/app/assets/javascripts/discourse/app/templates/modal/dismiss-notification-confirmation.hbs
+++ /dev/null
@@ -1,17 +0,0 @@
-<DModalBody @headerClass="hidden" @class="dismiss-notification-confirmation">
-  {{this.confirmationMessage}}
-</DModalBody>
-
-<div class="modal-footer">
-  <DButton
-    @icon="check"
-    @class="btn-primary"
-    @action={{action "dismiss"}}
-    @label="notifications.dismiss_confirmation.dismiss"
-  />
-  <DButton
-    @action={{route-action "closeModal"}}
-    @label="notifications.dismiss_confirmation.cancel"
-    @class="btn-default"
-  />
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal/dismiss-read.hbs b/app/assets/javascripts/discourse/app/templates/modal/dismiss-read.hbs
deleted file mode 100644
index fa8ef810762..00000000000
--- a/app/assets/javascripts/discourse/app/templates/modal/dismiss-read.hbs
+++ /dev/null
@@ -1,18 +0,0 @@
-<DModalBody>
-  <p>
-    <PreferenceCheckbox
-      @labelKey="topics.bulk.also_dismiss_topics"
-      @checked={{this.dismissTopics}}
-    />
-  </p>
-</DModalBody>
-
-<div class="modal-footer">
-  <DButton
-    @class="btn-primary"
-    @action={{route-action "dismissReadTopics" this.dismissTopics}}
-    @icon="check"
-    @id="dismiss-read-confirm"
-    @label="topics.bulk.dismiss"
-  />
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal/do-not-disturb.hbs b/app/assets/javascripts/discourse/app/templates/modal/do-not-disturb.hbs
deleted file mode 100644
index 64ad28617c5..00000000000
--- a/app/assets/javascripts/discourse/app/templates/modal/do-not-disturb.hbs
+++ /dev/null
@@ -1,42 +0,0 @@
-<DModalBody @title="pause_notifications.title">
-  <TapTileGrid @activeTile={{this.duration}} as |grid|>
-    <TapTile
-      @class="do-not-disturb-tile"
-      @tileId="30"
-      @activeTile={{grid.activeTile}}
-      @onChange={{action "setDuration"}}
-    >
-      {{i18n "pause_notifications.options.half_hour"}}
-    </TapTile>
-    <TapTile
-      @class="do-not-disturb-tile"
-      @tileId="60"
-      @activeTile={{grid.activeTile}}
-      @onChange={{action "setDuration"}}
-    >
-      {{i18n "pause_notifications.options.one_hour"}}
-    </TapTile>
-    <TapTile
-      @class="do-not-disturb-tile"
-      @tileId="120"
-      @activeTile={{grid.activeTile}}
-      @onChange={{action "setDuration"}}
-    >
-      {{i18n "pause_notifications.options.two_hours"}}
-    </TapTile>
-    <TapTile
-      @class="do-not-disturb-tile"
-      @tileId="tomorrow"
-      @activeTile={{grid.activeTile}}
-      @onChange={{action "setDuration"}}
-    >
-      {{i18n "pause_notifications.options.tomorrow"}}
-    </TapTile>
-  </TapTileGrid>
-
-  <DButton
-    @action={{action "navigateToNotificationSchedule"}}
-    @label="pause_notifications.set_schedule"
-  />
-
-</DModalBody>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal/flag.hbs b/app/assets/javascripts/discourse/app/templates/modal/flag.hbs
index 11bdf665fb3..c118abc5adc 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/flag.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/flag.hbs
@@ -24,7 +24,7 @@
   <PluginOutlet
     @name="flag-modal-bottom"
     @connectorTagName="div"
-    @args={{hash post=this.model}}
+    @outletArgs={{hash post=this.model}}
   />
 </DModalBody>
 
diff --git a/app/assets/javascripts/discourse/app/templates/modal/fullscreen-code.hbs b/app/assets/javascripts/discourse/app/templates/modal/fullscreen-code.hbs
deleted file mode 100644
index b7c9b8d0d6d..00000000000
--- a/app/assets/javascripts/discourse/app/templates/modal/fullscreen-code.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-<DModalBody>
-  <pre>
-    <code class={{this.codeClasses}}>{{this.code}}</code>
-  </pre>
-</DModalBody>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal/fullscreen-table.hbs b/app/assets/javascripts/discourse/app/templates/modal/fullscreen-table.hbs
deleted file mode 100644
index 6f89a63b6b7..00000000000
--- a/app/assets/javascripts/discourse/app/templates/modal/fullscreen-table.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-<DModalBody>
-  {{this.tableHtml}}
-</DModalBody>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal/group-add-members.hbs b/app/assets/javascripts/discourse/app/templates/modal/group-add-members.hbs
deleted file mode 100644
index 851f6322361..00000000000
--- a/app/assets/javascripts/discourse/app/templates/modal/group-add-members.hbs
+++ /dev/null
@@ -1,55 +0,0 @@
-<DModalBody @rawTitle={{this.rawTitle}}>
-  <form class="form-vertical group-add-members">
-    <p>{{i18n "groups.add_members.description"}}</p>
-
-    <div class="input-group">
-      <EmailGroupUserChooser
-        @value={{this.usernamesAndEmails}}
-        @onChange={{action "setUsernamesAndEmails"}}
-        @options={{hash
-          allowEmails=this.currentUser.can_invite_to_forum
-          filterPlaceholder=(if
-            this.currentUser.can_invite_to_forum
-            "groups.add_members.usernames_or_emails_placeholder"
-            "groups.add_members.usernames_placeholder"
-          )
-        }}
-      />
-    </div>
-
-    {{#if this.model.can_admin_group}}
-      <div class="input-group">
-        <label>
-          <Input
-            id="set-owner"
-            @type="checkbox"
-            @checked={{this.setOwner}}
-            disabled={{this.emails}}
-          />
-          {{i18n "groups.add_members.set_owner"}}
-        </label>
-      </div>
-    {{/if}}
-
-    <div class="input-group">
-      <label>
-        <Input
-          @type="checkbox"
-          @checked={{this.notifyUsers}}
-          disabled={{and (not this.usernames) this.emails}}
-        />
-        {{i18n "groups.add_members.notify_users"}}
-      </label>
-    </div>
-  </form>
-</DModalBody>
-
-<div class="modal-footer">
-  <DButton
-    @action={{action "addMembers"}}
-    @class="add btn-primary"
-    @icon="plus"
-    @disabled={{or this.loading (not this.usernamesAndEmails)}}
-    @label="groups.add"
-  />
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal/group-default-notifications.hbs b/app/assets/javascripts/discourse/app/templates/modal/group-default-notifications.hbs
deleted file mode 100644
index 10250ecf0c7..00000000000
--- a/app/assets/javascripts/discourse/app/templates/modal/group-default-notifications.hbs
+++ /dev/null
@@ -1,18 +0,0 @@
-<DModalBody @title="groups.default_notifications.modal_title">
-  {{i18n
-    "groups.default_notifications.modal_description"
-    count=this.model.count
-  }}
-</DModalBody>
-
-<div class="modal-footer">
-  <DButton
-    @action={{action "updateExistingUsers"}}
-    @class="btn-primary"
-    @label="groups.default_notifications.modal_yes"
-  />
-  <DButton
-    @action={{action "cancel"}}
-    @label="groups.default_notifications.modal_no"
-  />
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal/history.hbs b/app/assets/javascripts/discourse/app/templates/modal/history.hbs
deleted file mode 100644
index 4a55aae7874..00000000000
--- a/app/assets/javascripts/discourse/app/templates/modal/history.hbs
+++ /dev/null
@@ -1,255 +0,0 @@
-<DModalBody @title={{this.modalTitleKey}} @maxHeight="70%">
-  <div id="revision">
-    <div id="revision-details">
-      {{d-icon "pencil-alt"}}
-      <LinkTo @route="user" @model={{this.model.username}}>
-        {{bound-avatar-template this.model.avatar_template "small"}}
-        {{this.model.username}}
-      </LinkTo>
-      <PluginOutlet
-        @name="revision-user-details-after"
-        @args={{hash model=this.model}}
-      />
-      <span class="date">{{bound-date this.model.created_at}}</span>
-      {{#if this.model.edit_reason}}
-        &mdash;
-        <span class="edit-reason">{{this.model.edit_reason}}</span>
-      {{/if}}
-      {{#unless this.site.mobileView}}
-        {{#if this.model.user_changes}}
-          &mdash;
-          {{bound-avatar-template
-            this.model.user_changes.previous.avatar_template
-            "small"
-          }}
-          {{this.model.user_changes.previous.username}}
-          &rarr;
-          {{bound-avatar-template
-            this.model.user_changes.current.avatar_template
-            "small"
-          }}
-          {{this.model.user_changes.current.username}}
-        {{/if}}
-        {{#if this.model.wiki_changes}}
-          &mdash;
-          <DisabledIcon @icon="far-edit" @disabled={{this.wikiDisabled}} />
-        {{/if}}
-        {{#if this.model.post_type_changes}}
-          &mdash;
-          <DisabledIcon
-            @icon="shield-alt"
-            @disabled={{this.postTypeDisabled}}
-          />
-        {{/if}}
-        {{#if this.model.category_id_changes}}
-          &mdash;
-          {{html-safe this.previousCategory}}
-          &rarr;
-          {{html-safe this.currentCategory}}
-        {{/if}}
-      {{/unless}}
-    </div>
-    {{#unless this.site.mobileView}}
-      <div id="display-modes">
-        <ul class="nav nav-pills">
-          <li>
-            <a
-              href
-              class={{this.inlineClass}}
-              {{on "click" this.displayInline}}
-              title={{i18n "post.revisions.displays.inline.title"}}
-            >
-              {{d-icon "far-square"}}
-              {{i18n "post.revisions.displays.inline.button"}}
-            </a>
-          </li>
-          <li>
-            <a
-              href
-              class={{this.sideBySideClass}}
-              {{on "click" this.displaySideBySide}}
-              title={{i18n "post.revisions.displays.side_by_side.title"}}
-            >
-              {{d-icon "columns"}}
-              {{i18n "post.revisions.displays.side_by_side.button"}}
-            </a>
-          </li>
-          <li>
-            <a
-              href
-              class={{this.sideBySideMarkdownClass}}
-              {{on "click" this.displaySideBySideMarkdown}}
-              title={{i18n
-                "post.revisions.displays.side_by_side_markdown.title"
-              }}
-            >
-              {{d-icon "columns"}}
-              {{i18n "post.revisions.displays.side_by_side_markdown.button"}}
-            </a>
-          </li>
-        </ul>
-      </div>
-    {{/unless}}
-  </div>
-  <div
-    id="revisions"
-    data-post-id={{this.model.post_id}}
-    class={{this.hiddenClasses}}
-  >
-    {{#if this.model.title_changes}}
-      <div class="row">
-        <h2>{{html-safe this.titleDiff}}</h2>
-      </div>
-    {{/if}}
-    {{#if this.site.mobileView}}
-      {{#if this.user_changes}}
-        <div class="row">
-          {{bound-avatar-template
-            this.model.user_changes.previous.avatar_template
-            "small"
-          }}
-          {{this.model.user_changes.previous.username}}
-          &rarr;
-          {{bound-avatar-template
-            this.model.user_changes.current.avatar_template
-            "small"
-          }}
-          {{this.model.user_changes.current.username}}
-        </div>
-      {{/if}}
-      {{#if this.model.wiki_changes}}
-        <div class="row">
-          <DisabledIcon @icon="far-edit" @disabled={{this.wikiDisabled}} />
-        </div>
-      {{/if}}
-      {{#if this.model.post_type_changes}}
-        <div class="row">
-          <DisabledIcon
-            @icon="shield-alt"
-            @disabled={{this.postTypeDisabled}}
-          />
-        </div>
-      {{/if}}
-      {{#if this.model.category_id_changes}}
-        <div class="row">
-          {{html-safe this.previousCategory}}
-          &rarr;
-          {{html-safe this.currentCategory}}
-        </div>
-      {{/if}}
-    {{/if}}
-    {{#if this.model.tags_changes}}
-      <div class="row">
-        {{i18n "tagging.changed"}}
-        {{#each this.previousTagChanges as |t|}}
-          {{discourse-tag t.name style=(if t.deleted "diff-del")}}
-        {{/each}}
-        &rarr;&nbsp;
-        {{#each this.currentTagChanges as |t|}}
-          {{discourse-tag t.name style=(if t.inserted "diff-ins")}}
-        {{/each}}
-      </div>
-    {{/if}}
-    {{#if this.model.featured_link_changes}}
-      <div class="row">
-        {{this.model.featured_link_changes.previous}}
-        &rarr;
-        {{this.model.featured_link_changes.current}}
-      </div>
-    {{/if}}
-
-    <PluginOutlet
-      @name="post-revisions"
-      @tagName="span"
-      @connectorTagName="div"
-      @args={{hash model=this.model}}
-    />
-
-    <LinksRedirect @class="row">
-      {{html-safe this.bodyDiff}}
-    </LinksRedirect>
-  </div>
-</DModalBody>
-{{#if this.topicController}}
-  <div class="modal-footer">
-    <div id="revision-controls">
-      <DButton
-        @class="btn-default"
-        @action={{action "loadFirstVersion"}}
-        @icon="fast-backward"
-        @title="post.revisions.controls.first"
-        @disabled={{this.loadFirstDisabled}}
-      />
-      <DButton
-        @class="btn-default"
-        @action={{action "loadPreviousVersion"}}
-        @icon="backward"
-        @title="post.revisions.controls.previous"
-        @disabled={{this.loadPreviousDisabled}}
-      />
-      <div
-        id="revision-numbers"
-        class={{unless this.displayRevisions "invisible"}}
-      >
-        <ConditionalLoadingSpinner @condition={{this.loading}} @size="small">
-          {{html-safe this.revisionsText}}
-        </ConditionalLoadingSpinner>
-      </div>
-      <DButton
-        @class="btn-default"
-        @action={{action "loadNextVersion"}}
-        @icon="forward"
-        @title="post.revisions.controls.next"
-        @disabled={{this.loadNextDisabled}}
-      />
-      <DButton
-        @class="btn-default"
-        @action={{action "loadLastVersion"}}
-        @icon="fast-forward"
-        @title="post.revisions.controls.last"
-        @disabled={{this.loadLastDisabled}}
-      />
-    </div>
-
-    <div id="revision-footer-buttons">
-      {{#if this.displayEdit}}
-        <DButton
-          @action={{action "editPost"}}
-          @icon="pencil-alt"
-          @class="btn-default"
-          @label={{this.editButtonLabel}}
-        />
-      {{/if}}
-
-      {{#if this.displayRevert}}
-        <DButton
-          @action={{action "revertToVersion"}}
-          @icon="undo"
-          @translatedLabel={{this.revertToRevisionText}}
-          @class="btn-danger"
-          @disabled={{this.loading}}
-        />
-      {{/if}}
-
-      {{#if this.displayHide}}
-        <DButton
-          @action={{action "hideVersion"}}
-          @icon="far-eye-slash"
-          @label="post.revisions.controls.hide"
-          @class="btn-danger"
-          @disabled={{this.loading}}
-        />
-      {{/if}}
-
-      {{#if this.displayShow}}
-        <DButton
-          @action={{action "showVersion"}}
-          @icon="far-eye"
-          @label="post.revisions.controls.show"
-          @class="btn-default"
-          @disabled={{this.loading}}
-        />
-      {{/if}}
-    </div>
-  </div>
-{{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal/ignore-duration-with-username.hbs b/app/assets/javascripts/discourse/app/templates/modal/ignore-duration-with-username.hbs
deleted file mode 100644
index 550fa5b9a64..00000000000
--- a/app/assets/javascripts/discourse/app/templates/modal/ignore-duration-with-username.hbs
+++ /dev/null
@@ -1,32 +0,0 @@
-<DModalBody
-  @title="user.user_notifications.ignore_duration_title"
-  @autoFocus="false"
->
-  <div class="controls tracking-controls">
-    <label>{{d-icon "far-eye-slash" class="icon"}}
-      {{i18n "user.user_notifications.ignore_duration_username"}}</label>
-    <EmailGroupUserChooser
-      @value={{this.ignoredUsername}}
-      @onChange={{action "updateIgnoredUsername"}}
-      @options={{hash excludeCurrentUser=true maximum=1}}
-    />
-  </div>
-  <FutureDateInput
-    @label="user.user_notifications.ignore_duration_when"
-    @input={{readonly this.ignoredUntil}}
-    @customShortcuts={{this.timeShortcuts}}
-    @includeDateTime={{false}}
-    @onChangeInput={{action (mut this.ignoredUntil)}}
-  />
-  <p>{{i18n "user.user_notifications.ignore_duration_note"}}</p>
-</DModalBody>
-
-<div class="modal-footer">
-  <DButton
-    @class="btn-primary"
-    @disabled={{this.saveDisabled}}
-    @label="user.user_notifications.ignore_duration_save"
-    @action={{action "ignore"}}
-  />
-  <ConditionalLoadingSpinner @size="small" @condition={{this.loading}} />
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal/ignore-duration.hbs b/app/assets/javascripts/discourse/app/templates/modal/ignore-duration.hbs
deleted file mode 100644
index be525f4089e..00000000000
--- a/app/assets/javascripts/discourse/app/templates/modal/ignore-duration.hbs
+++ /dev/null
@@ -1,24 +0,0 @@
-<DModalBody
-  @title="user.user_notifications.ignore_duration_title"
-  @autoFocus="false"
->
-  <FutureDateInput
-    @label="user.user_notifications.ignore_duration_when"
-    @input={{this.ignoredUntil}}
-    @customShortcuts={{this.timeShortcuts}}
-    @includeDateTime={{false}}
-    @onChangeInput={{action (mut this.ignoredUntil)}}
-  />
-  <p>{{i18n "user.user_notifications.ignore_duration_note"}}</p>
-</DModalBody>
-
-<div class="modal-footer">
-  <DButton
-    @class="btn-primary ignore-duration-save"
-    @disabled={{this.saveDisabled}}
-    @label="user.user_notifications.ignore_duration_save"
-    @action={{action "ignore"}}
-  />
-
-  <ConditionalLoadingSpinner @size="small" @condition={{this.loading}} />
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal/insert-hyperlink.hbs b/app/assets/javascripts/discourse/app/templates/modal/insert-hyperlink.hbs
index affbf5d1b6e..a69187ed8fb 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/insert-hyperlink.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/insert-hyperlink.hbs
@@ -21,7 +21,7 @@
               data-title={{result.fancy_title}}
             >
               <TopicStatus @topic={{result}} @disableActions={{true}} />
-              {{replace-emoji result.fancy_title}}
+              {{replace-emoji result.title}}
               <div class="search-category">
                 {{#if result.category.parentCategory}}
                   {{category-link result.category.parentCategory}}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/json-schema-editor.hbs b/app/assets/javascripts/discourse/app/templates/modal/json-schema-editor.hbs
deleted file mode 100644
index d734ba8efa0..00000000000
--- a/app/assets/javascripts/discourse/app/templates/modal/json-schema-editor.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-<JsonEditor
-  @model={{this.model}}
-  @saveChangesCallback={{action "saveChanges"}}
-  @tagName=""
-/>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal/keyboard-shortcuts-help.hbs b/app/assets/javascripts/discourse/app/templates/modal/keyboard-shortcuts-help.hbs
deleted file mode 100644
index 90de7b13736..00000000000
--- a/app/assets/javascripts/discourse/app/templates/modal/keyboard-shortcuts-help.hbs
+++ /dev/null
@@ -1,15 +0,0 @@
-<DModalBody @id="keyboard-shortcuts-help">
-  {{#each-in this.shortcuts as |category shortcutCategory|}}
-    <section
-      class="shortcut-category span-{{shortcutCategory.count}}
-        shortcut-category-{{category}}"
-    >
-      <h4>{{i18n (concat "keyboard_shortcuts_help." category ".title")}}</h4>
-      <ul>
-        {{#each-in shortcutCategory.shortcuts as |name shortcut|}}
-          <li>{{html-safe shortcut}}</li>
-        {{/each-in}}
-      </ul>
-    </section>
-  {{/each-in}}
-</DModalBody>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal/move-to-topic.hbs b/app/assets/javascripts/discourse/app/templates/modal/move-to-topic.hbs
index 80994b7e078..7ca7f1cad06 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/move-to-topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/move-to-topic.hbs
@@ -68,6 +68,18 @@
           @value={{this.participants}}
           @onChange={{action (mut this.participants)}}
         />
+
+        {{#if this.selectedTopicId}}
+          <hr />
+          <label for="chronological-order" class="checkbox-label">
+            <Input
+              id="chronological-order"
+              @type="checkbox"
+              @checked={{this.chronologicalOrder}}
+            />
+            {{i18n "topic.merge_topic.chronological_order"}}
+          </label>
+        {{/if}}
       </form>
     {{/if}}
 
@@ -118,6 +130,18 @@
           @currentTopicId={{this.model.id}}
           @selectedTopicId={{this.selectedTopicId}}
         />
+
+        {{#if this.selectedTopicId}}
+          <hr />
+          <label for="chronological-order" class="checkbox-label">
+            <Input
+              id="chronological-order"
+              @type="checkbox"
+              @checked={{this.chronologicalOrder}}
+            />
+            {{i18n "topic.merge_topic.chronological_order"}}
+          </label>
+        {{/if}}
       </form>
     {{/if}}
 
diff --git a/app/assets/javascripts/discourse/app/templates/modal/not-activated.hbs b/app/assets/javascripts/discourse/app/templates/modal/not-activated.hbs
deleted file mode 100644
index c88973280f6..00000000000
--- a/app/assets/javascripts/discourse/app/templates/modal/not-activated.hbs
+++ /dev/null
@@ -1,10 +0,0 @@
-<DModalBody>
-  {{html-safe (i18n "login.not_activated" sentTo=this.sentTo)}}
-</DModalBody>
-
-<div class="modal-footer">
-  <ActivationControls
-    @sendActivationEmail={{action "sendActivationEmail"}}
-    @editActivationEmail={{action "editActivationEmail"}}
-  />
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal/publish-page.hbs b/app/assets/javascripts/discourse/app/templates/modal/publish-page.hbs
deleted file mode 100644
index a2608b31a96..00000000000
--- a/app/assets/javascripts/discourse/app/templates/modal/publish-page.hbs
+++ /dev/null
@@ -1,100 +0,0 @@
-<DModalBody>
-  {{#if this.unpublished}}
-    <p>{{i18n "topic.publish_page.unpublished"}}</p>
-  {{else}}
-    <ConditionalLoadingSpinner @condition={{this.initializing}}>
-      <p class="publish-description">{{i18n
-          "topic.publish_page.description"
-        }}</p>
-
-      <form>
-        <div class="controls">
-          <label>{{i18n "topic.publish_page.slug"}}</label>
-          <TextField
-            @value={{this.publishedPage.slug}}
-            @onChange={{action "checkSlug"}}
-            @onChangeImmediate={{action "startCheckSlug"}}
-            @disabled={{this.existing}}
-            @class="publish-slug"
-          />
-        </div>
-
-        <div class="controls">
-          <label>{{i18n "topic.publish_page.public"}}</label>
-
-          <p class="description">
-            <Input
-              @type="checkbox"
-              @checked={{readonly this.publishedPage.public}}
-              {{on "click" (action "onChangePublic" value="target.checked")}}
-            />
-            {{i18n "topic.publish_page.public_description"}}
-          </p>
-        </div>
-      </form>
-
-      <div class="publish-url">
-        <ConditionalLoadingSpinner @condition={{this.checking}} />
-
-        {{#if this.existing}}
-          <div class="current-url">
-            {{i18n "topic.publish_page.publish_url"}}
-            <div>
-              <a
-                href={{this.publishedPage.url}}
-                target="_blank"
-                rel="noopener noreferrer"
-              >{{this.publishedPage.url}}</a>
-            </div>
-          </div>
-        {{else}}
-          {{#if this.showUrl}}
-            <div class="valid-slug">
-              {{i18n "topic.publish_page.preview_url"}}
-              <div class="example-url">{{this.publishedPage.url}}</div>
-            </div>
-          {{/if}}
-
-          {{#if this.invalid}}
-            {{i18n "topic.publish_page.invalid_slug"}}
-            <span class="invalid-slug">{{this.reason}}.</span>
-          {{/if}}
-        {{/if}}
-
-      </div>
-    </ConditionalLoadingSpinner>
-  {{/if}}
-</DModalBody>
-
-<div class="modal-footer">
-  {{#if this.showUnpublish}}
-    <DButton
-      @label="topic.publish_page.unpublish"
-      @icon="trash-alt"
-      @class="btn-danger"
-      @isLoading={{this.unpublishing}}
-      @action={{action "unpublish"}}
-    />
-
-    <DButton
-      @class="close-publish-page"
-      @icon="times"
-      @label="close"
-      @action={{action "closeModal"}}
-    />
-  {{else if this.unpublished}}
-    <DButton
-      @label="topic.publish_page.publishing_settings"
-      @action={{action "startNew"}}
-    />
-  {{else}}
-    <DButton
-      @label="topic.publish_page.publish"
-      @class="btn-primary publish-page"
-      @icon="file"
-      @disabled={{this.disabled}}
-      @isLoading={{this.saving}}
-      @action={{action "publish"}}
-    />
-  {{/if}}
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal/raw-email.hbs b/app/assets/javascripts/discourse/app/templates/modal/raw-email.hbs
index 6528f7fa574..c8850a9a39c 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/raw-email.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/raw-email.hbs
@@ -1,8 +1,4 @@
-<DModalBody
-  @title="raw_email.title"
-  @class="incoming-email-modal"
-  @maxHeight="80%"
->
+<DModalBody @title="raw_email.title" @class="incoming-email-modal">
   <div class="incoming-email-tabs">
     <DButton
       @action={{action "displayRaw"}}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/reorder-categories.hbs b/app/assets/javascripts/discourse/app/templates/modal/reorder-categories.hbs
index 8b53dd5a4d1..0b6928f9313 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/reorder-categories.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/reorder-categories.hbs
@@ -21,6 +21,7 @@
             <NumberField
               @number={{readonly cat.position}}
               @change={{action "change" cat}}
+              @min="0"
             />
             <DButton
               @class="btn-default no-text"
diff --git a/app/assets/javascripts/discourse/app/templates/modal/request-group-membership-form.hbs b/app/assets/javascripts/discourse/app/templates/modal/request-group-membership-form.hbs
index 3d171b6f678..c65f109b7af 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/request-group-membership-form.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/request-group-membership-form.hbs
@@ -5,7 +5,7 @@
         {{i18n "groups.membership_request.reason"}}
       </label>
 
-      <ExpandingTextArea @value={{this.reason}} @maxlength="280" />
+      <ExpandingTextArea @value={{this.reason}} @maxlength="5000" />
     </div>
   </DModalBody>
 
diff --git a/app/assets/javascripts/discourse/app/templates/modal/second-factor-add-security-key.hbs b/app/assets/javascripts/discourse/app/templates/modal/second-factor-add-security-key.hbs
deleted file mode 100644
index ada4360b481..00000000000
--- a/app/assets/javascripts/discourse/app/templates/modal/second-factor-add-security-key.hbs
+++ /dev/null
@@ -1,41 +0,0 @@
-<DModalBody>
-  <ConditionalLoadingSpinner @condition={{this.loading}}>
-    {{#if this.errorMessage}}
-      <div class="control-group">
-        <div class="controls">
-          <div class="alert alert-error">{{this.errorMessage}}</div>
-        </div>
-      </div>
-    {{/if}}
-
-    <div class="control-group">
-      <div class="controls">
-        {{html-safe
-          (i18n "user.second_factor.enable_security_key_description")
-        }}
-      </div>
-    </div>
-
-    <div class="control-group">
-      <div class="controls">
-        <Input
-          @value={{this.securityKeyName}}
-          id="security-key-name"
-          placeholder="security key name"
-        />
-      </div>
-    </div>
-
-    <div class="control-group">
-      <div class="controls">
-        {{#unless this.webauthnUnsupported}}
-          <DButton
-            @class="btn-primary add-security-key"
-            @action={{action "registerSecurityKey"}}
-            @label="user.second_factor.security_key.register"
-          />
-        {{/unless}}
-      </div>
-    </div>
-  </ConditionalLoadingSpinner>
-</DModalBody>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal/second-factor-add-totp.hbs b/app/assets/javascripts/discourse/app/templates/modal/second-factor-add-totp.hbs
deleted file mode 100644
index 573d125d79a..00000000000
--- a/app/assets/javascripts/discourse/app/templates/modal/second-factor-add-totp.hbs
+++ /dev/null
@@ -1,73 +0,0 @@
-<DModalBody>
-  <ConditionalLoadingSpinner @condition={{this.loading}}>
-    {{#if this.errorMessage}}
-      <div class="control-group">
-        <div class="controls">
-          <div class="alert alert-error">{{this.errorMessage}}</div>
-        </div>
-      </div>
-    {{/if}}
-
-    <div class="control-group">
-      <div class="controls">
-        {{html-safe (i18n "user.second_factor.enable_description")}}
-      </div>
-    </div>
-
-    <div class="control-group">
-      <div class="controls">
-        <div class="qr-code">
-          <img src={{html-safe this.secondFactorImage}} />
-        </div>
-        <p>
-          {{#if this.showSecondFactorKey}}
-            {{this.secondFactorKey}}
-          {{else}}
-            <a href {{on "click" this.enableShowSecondFactorKey}}>{{i18n
-                "user.second_factor.show_key_description"
-              }}</a>
-          {{/if}}
-        </p>
-      </div>
-    </div>
-
-    <div class="control-group">
-      <label class="control-label input-prepend">{{i18n
-          "user.second_factor.name"
-        }}</label>
-      <div class="controls">
-        <SecondFactorInput
-          @value={{this.secondFactorName}}
-          @inputId="second-factor-name"
-          @placeholder={{i18n "user.second_factor.totp.default_name"}}
-        />
-      </div>
-
-      <label class="control-label input-prepend">{{i18n
-          "user.second_factor.label"
-        }}</label>
-      <div class="controls">
-        <TextField
-          @class="second-factor-token-input"
-          @maxlength={{6}}
-          @value={{this.secondFactorToken}}
-          @inputId="second-factor-token"
-          @placeholder="123456"
-          @autocorrect="off"
-          @autocapitalize="off"
-          @autofocus="autofocus"
-        />
-      </div>
-    </div>
-
-    <div class="control-group">
-      <div class="controls">
-        <DButton
-          @class="btn-primary add-totp"
-          @action={{action "enableSecondFactor"}}
-          @label="enable"
-        />
-      </div>
-    </div>
-  </ConditionalLoadingSpinner>
-</DModalBody>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal/second-factor-backup-edit.hbs b/app/assets/javascripts/discourse/app/templates/modal/second-factor-backup-edit.hbs
deleted file mode 100644
index 288c7457c0e..00000000000
--- a/app/assets/javascripts/discourse/app/templates/modal/second-factor-backup-edit.hbs
+++ /dev/null
@@ -1,64 +0,0 @@
-<DModalBody>
-  <section
-    class="user-preferences solo-preference second-factor-backup-preferences"
-  >
-    <form class="form-horizontal">
-      {{#if this.successMessage}}
-        <div class="alert alert-success">
-          {{this.successMessage}}
-        </div>
-      {{/if}}
-
-      {{#if this.errorMessage}}
-        <div class="alert alert-error">
-          {{this.errorMessage}}
-        </div>
-      {{/if}}
-
-      {{#if this.backupEnabled}}
-        {{html-safe
-          (i18n
-            "user.second_factor_backup.remaining_codes"
-            count=this.remainingCodes
-          )
-        }}
-      {{/if}}
-
-      <div class="actions">
-        {{#if this.backupEnabled}}
-          <DButton
-            @class="btn-primary"
-            @icon="redo"
-            @action={{action "generateSecondFactorCodes"}}
-            @type="submit"
-            @isLoading={{this.loading}}
-            @label="user.second_factor_backup.regenerate"
-          />
-        {{else}}
-          <DButton
-            @class="btn-primary"
-            @action={{action "generateSecondFactorCodes"}}
-            @type="submit"
-            @disabled={{this.loading}}
-            @label="user.second_factor_backup.enable"
-          />
-        {{/if}}
-      </div>
-
-      <ConditionalLoadingSection @isLoading={{this.loading}}>
-        {{#if this.backupCodes}}
-          <h3>{{i18n "user.second_factor_backup.codes.title"}}</h3>
-
-          <p>
-            {{i18n "user.second_factor_backup.codes.description"}}
-          </p>
-
-          <BackupCodes
-            @copyBackupCode={{action "copyBackupCode"}}
-            @backupCodes={{this.backupCodes}}
-          />
-        {{/if}}
-      </ConditionalLoadingSection>
-    </form>
-  </section>
-</DModalBody>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal/second-factor-edit-security-key.hbs b/app/assets/javascripts/discourse/app/templates/modal/second-factor-edit-security-key.hbs
deleted file mode 100644
index 47e35776280..00000000000
--- a/app/assets/javascripts/discourse/app/templates/modal/second-factor-edit-security-key.hbs
+++ /dev/null
@@ -1,25 +0,0 @@
-<DModalBody>
-  <form class="form-horizontal">
-    <div class="input-group">
-      <label for="security-key-name">{{i18n
-          "user.second_factor.security_key.edit_description"
-        }}</label>
-      <Input name="security-key-name" @type="text" @value={{this.model.name}} />
-    </div>
-  </form>
-</DModalBody>
-
-<div class="modal-footer">
-  <DButton
-    @action={{action "editSecurityKey"}}
-    @class="btn-primary"
-    @label="user.second_factor.security_key.save"
-  />
-  <DButton
-    @action={{action "disableSecurityKey"}}
-    @class="btn-danger no-text"
-    @icon="trash-alt"
-    @aria-label="user.second_factor.disable"
-    @title="user.second_factor.disable"
-  />
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal/second-factor-edit.hbs b/app/assets/javascripts/discourse/app/templates/modal/second-factor-edit.hbs
deleted file mode 100644
index 7aa3f44dd67..00000000000
--- a/app/assets/javascripts/discourse/app/templates/modal/second-factor-edit.hbs
+++ /dev/null
@@ -1,22 +0,0 @@
-<DModalBody>
-  <form class="form-horizontal">
-    <div class="input-group">
-      <label for="authenticator-name">{{i18n
-          "user.second_factor.edit_description"
-        }}</label>
-      <Input
-        name="authenticator-name"
-        @type="text"
-        @value={{this.model.name}}
-      />
-    </div>
-  </form>
-</DModalBody>
-
-<div class="modal-footer">
-  <DButton
-    @action={{action "editSecondFactor"}}
-    @class="btn-primary"
-    @label="user.second_factor.save"
-  />
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal/sidebar-tags-form.hbs b/app/assets/javascripts/discourse/app/templates/modal/sidebar-tags-form.hbs
new file mode 100644
index 00000000000..96b771a138c
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/modal/sidebar-tags-form.hbs
@@ -0,0 +1,3 @@
+<Sidebar::EditNavigationModalForm::TagsForm
+  @closeModal={{(action "closeModal")}}
+/>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal/topic-bulk-actions.hbs b/app/assets/javascripts/discourse/app/templates/modal/topic-bulk-actions.hbs
deleted file mode 100644
index 95d449a02b8..00000000000
--- a/app/assets/javascripts/discourse/app/templates/modal/topic-bulk-actions.hbs
+++ /dev/null
@@ -1,6 +0,0 @@
-<DModalBody>
-  <p>{{html-safe
-      (i18n "topics.bulk.selected" count=this.model.topics.length)
-    }}</p>
-  {{outlet "bulkOutlet"}}
-</DModalBody>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/navigation/category.hbs b/app/assets/javascripts/discourse/app/templates/navigation/category.hbs
index 6ce32156cd8..593732b95c6 100644
--- a/app/assets/javascripts/discourse/app/templates/navigation/category.hbs
+++ b/app/assets/javascripts/discourse/app/templates/navigation/category.hbs
@@ -8,12 +8,13 @@
     {{/if}}
   {{/if}}
 
-  <PluginOutlet
-    @name="category-heading"
-    @tagName="span"
-    @connectorTagName="div"
-    @args={{hash category=this.category}}
-  />
+  <span>
+    <PluginOutlet
+      @name="category-heading"
+      @connectorTagName="div"
+      @outletArgs={{hash category=this.category}}
+    />
+  </span>
 </section>
 
 <DSection @class="navigation-container category-navigation">
@@ -31,6 +32,6 @@
   <PluginOutlet
     @name="category-navigation"
     @connectorTagName="div"
-    @args={{hash category=this.category}}
+    @outletArgs={{hash category=this.category}}
   />
 </DSection>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/navigation/default.hbs b/app/assets/javascripts/discourse/app/templates/navigation/default.hbs
index 9848aadf5fd..c075d552437 100644
--- a/app/assets/javascripts/discourse/app/templates/navigation/default.hbs
+++ b/app/assets/javascripts/discourse/app/templates/navigation/default.hbs
@@ -1,8 +1,4 @@
-<DSection
-  @bodyClass="navigation-topics"
-  @class="navigation-container"
-  @scrollTop={{false}}
->
+<DSection @bodyClass="navigation-topics" @class="navigation-container">
   <DNavigation
     @filterMode={{this.filterMode}}
     @canCreateTopic={{this.canCreateTopic}}
diff --git a/app/assets/javascripts/discourse/app/templates/navigation/filter.hbs b/app/assets/javascripts/discourse/app/templates/navigation/filter.hbs
new file mode 100644
index 00000000000..c9e135979c1
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/navigation/filter.hbs
@@ -0,0 +1,16 @@
+<DSection @bodyClass="navigation-filter" @class="navigation-container">
+  <div class="topic-query-filter">
+    <div class="topic-query-filter__input">
+      {{d-icon "filter" class="topic-query-filter__icon"}}
+      <Input
+        class="topic-query-filter__filter-term"
+        @value={{this.queryString}}
+        @enter={{action
+          this.discoveryFilter.updateTopicsListQueryParams
+          this.queryString
+        }}
+        @type="text"
+      />
+    </div>
+  </div>
+</DSection>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/preferences-email.hbs b/app/assets/javascripts/discourse/app/templates/preferences-email.hbs
index 26708ecc2df..08f9caf979a 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences-email.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences-email.hbs
@@ -1,34 +1,23 @@
 <DSection @pageClass="user-preferences" @tagName="">
-  <section class="user-preferences solo-preference">
-    <form class="form-horizontal">
-
-      <div class="control-group">
-        <div class="controls">
-          <h3>{{i18n
-              (if this.new "user.add_email.title" "user.change_email.title")
-            }}</h3>
-        </div>
-      </div>
-
+  <section class="user-content user-preferences solo-preference">
+    <form class="form-vertical">
       {{#if this.success}}
-        <div class="control-group">
-          <div class="controls">
-            <div class="instructions">
-              <p>{{this.successMessage}}</p>
-            </div>
-          </div>
-        </div>
+        <div class="alert alert-success">{{this.successMessage}}</div>
+        <LinkTo @route="preferences.account" class="success-back">
+          {{d-icon "arrow-left"}}
+          {{i18n "user.change_email.back_to_preferences"}}
+        </LinkTo>
+
       {{else}}
         {{#if this.error}}
-          <div class="control-group">
-            <div class="controls">
-              <div class="alert alert-error">{{this.errorMessage}}</div>
-            </div>
-          </div>
+          <div class="alert alert-error">{{this.errorMessage}}</div>
         {{/if}}
-
         <div class="control-group">
-          <label class="control-label">{{i18n "user.email.title"}}</label>
+          <label class="control-label">
+            {{i18n
+              (if this.new "user.add_email.title" "user.change_email.title")
+            }}
+          </label>
           <div class="controls">
             <TextField
               @value={{this.newEmail}}
@@ -36,9 +25,6 @@
               @classNames="input-xxlarge"
               @autofocus="autofocus"
             />
-            <InputTip @validation={{this.emailValidation}} />
-          </div>
-          <div class="controls">
             <div class="instructions">
               {{#if this.taken}}
                 {{i18n "user.change_email.taken"}}
@@ -46,22 +32,23 @@
                 {{i18n "user.email.instructions"}}
               {{/if}}
             </div>
+            <InputTip @validation={{this.emailValidation}} />
           </div>
         </div>
-
-        <div class="control-group">
-          <div class="controls">
-            <DButton
-              @class="btn-primary"
-              @action={{action "saveEmail"}}
-              @type="submit"
-              @disabled={{this.saveDisabled}}
-              @translatedLabel={{this.saveButtonText}}
-            />
-          </div>
+        <div class="controls save-button">
+          <DButton
+            @class="btn-primary"
+            @action={{action "saveEmail"}}
+            @type="submit"
+            @disabled={{this.saveDisabled}}
+            @translatedLabel={{this.saveButtonText}}
+          />
+          <CancelLink
+            @route="preferences.account"
+            @args={{this.model.username}}
+          />
         </div>
       {{/if}}
-
     </form>
   </section>
 </DSection>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/preferences-second-factor.hbs b/app/assets/javascripts/discourse/app/templates/preferences-second-factor.hbs
index 2ac512b4d4e..a48025158c1 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences-second-factor.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences-second-factor.hbs
@@ -1,31 +1,21 @@
 <DSection @pageClass="user-preferences" @tagName="">
-  <section class="user-preferences solo-preference second-factor">
+  <section class="user-content user-preferences solo-preference second-factor">
     <ConditionalLoadingSpinner @condition={{this.loading}}>
-      <form class="form-horizontal">
+      <form class="form-vertical">
         {{#if this.showEnforcedNotice}}
-          <div class="control-group">
-            <div class="controls">
-              <div class="alert alert-error">{{i18n
-                  "user.second_factor.enforced_notice"
-                }}</div>
-            </div>
-          </div>
+          <div class="alert alert-error">{{i18n
+              "user.second_factor.enforced_notice"
+            }}</div>
         {{/if}}
 
         {{#if this.displayOAuthWarning}}
-          <div class="control-group">
-            <div class="controls">
-              {{i18n "user.second_factor.oauth_enabled_warning"}}
-            </div>
-          </div>
+          <div class="alert alert-warning">{{i18n
+              "user.second_factor.oauth_enabled_warning"
+            }}</div>
         {{/if}}
 
         {{#if this.errorMessage}}
-          <div class="control-group">
-            <div class="controls">
-              <div class="alert alert-error">{{this.errorMessage}}</div>
-            </div>
-          </div>
+          <div class="alert alert-error">{{this.errorMessage}}</div>
         {{/if}}
 
         {{#if this.loaded}}
@@ -41,23 +31,14 @@
                       {{i18n "user.second_factor.totp.default_name"}}
                     {{/if}}
                   </div>
-
                   {{#if this.isCurrentUser}}
                     <div class="actions">
-                      <DButton
-                        @action={{action "editSecondFactor" totp}}
-                        @class="btn-default btn-flat btn-small btn-icon pad-left no-text edit"
-                        @disabled={{this.loading}}
-                        @icon="pencil-alt"
-                        @aria-label="user.second_factor.edit"
-                        @title="user.second_factor.edit"
-                      />
-                      <DButton
-                        @action={{action "disableSingleSecondFactor" totp}}
-                        @class="btn-danger btn-flat no-text"
-                        @icon="trash-alt"
-                        @aria-label="user.second_factor.disable"
-                        @title="user.second_factor.disable"
+                      <TokenBasedAuthDropdown
+                        @totp={{totp}}
+                        @editSecondFactor={{action "editSecondFactor"}}
+                        @disableSingleSecondFactor={{action
+                          "disableSingleSecondFactor"
+                        }}
                       />
                     </div>
                   {{/if}}
@@ -65,7 +46,7 @@
               {{/each}}
               <DButton
                 @action={{action "createTotp"}}
-                @class="btn-primary new-totp"
+                @class="btn-default new-totp"
                 @icon="plus"
                 @disabled={{this.loading}}
                 @label="user.second_factor.totp.add"
@@ -88,23 +69,12 @@
 
                   {{#if this.isCurrentUser}}
                     <div class="actions">
-                      <DButton
-                        @action={{action "editSecurityKey" security_key}}
-                        @class="btn-default btn-flat btn-small btn-icon pad-left no-text edit"
-                        @disabled={{this.loading}}
-                        @icon="pencil-alt"
-                        @aria-label="user.second_factor.edit"
-                        @title="user.second_factor.edit"
-                      />
-                      <DButton
-                        @action={{action
+                      <SecurityKeyDropdown
+                        @securityKey={{security_key}}
+                        @editSecurityKey={{action "editSecurityKey"}}
+                        @disableSingleSecondFactor={{action
                           "disableSingleSecondFactor"
-                          security_key
                         }}
-                        @class="btn-danger btn-flat no-text"
-                        @icon="trash-alt"
-                        @aria-label="user.second_factor.disable"
-                        @title="user.second_factor.disable"
                       />
                     </div>
                   {{/if}}
@@ -112,7 +82,7 @@
               {{/each}}
               <DButton
                 @action={{action "createSecurityKey"}}
-                @class="btn-primary new-security-key"
+                @class="btn-default new-security-key"
                 @icon="plus"
                 @disabled={{this.loading}}
                 @label="user.second_factor.security_key.add"
@@ -134,32 +104,34 @@
                         )
                       }}
                     {{else}}
-                      {{i18n "user.second_factor_backup.enable_long"}}
+                      <DButton
+                        @action={{action "editSecondFactorBackup"}}
+                        @class="btn-default new-second-factor-backup"
+                        @icon="plus"
+                        @disabled={{this.loading}}
+                        @label="user.second_factor_backup.enable_long"
+                      />
                     {{/if}}
                   </div>
 
-                  {{#if this.isCurrentUser}}
+                  {{#if
+                    (and
+                      this.model.second_factor_backup_enabled this.isCurrentUser
+                    )
+                  }}
                     <div class="actions">
-                      <DButton
-                        @action={{action "editSecondFactorBackup"}}
-                        @class="btn-default btn-flat btn-small btn-icon pad-left no-text edit edit-2fa-backup"
-                        @disabled={{this.loading}}
-                        @icon="pencil-alt"
-                        @aria-label="user.second_factor.edit"
-                        @title="user.second_factor.edit"
+                      <TwoFactorBackupDropdown
+                        @secondFactorBackupEnabled={{this.model.second_factor_backup_enabled}}
+                        @editSecondFactorBackup={{action
+                          "editSecondFactorBackup"
+                        }}
+                        @disableSecondFactorBackup={{action
+                          "disableSecondFactorBackup"
+                        }}
                       />
-
-                      {{#if this.model.second_factor_backup_enabled}}
-                        <DButton
-                          @action={{action "disableSecondFactorBackup"}}
-                          @class="btn-danger btn-flat no-text"
-                          @icon="trash-alt"
-                          @aria-label="user.second_factor.disable"
-                          @title="user.second_factor.disable"
-                        />
-                      {{/if}}
                     </div>
                   {{/if}}
+
                 {{else}}
                   {{i18n "user.second_factor_backup.enable_prerequisites"}}
                 {{/if}}
@@ -169,8 +141,8 @@
 
           {{#if this.model.second_factor_enabled}}
             {{#unless this.showEnforcedNotice}}
-              <div class="control-group">
-                <div class="controls">
+              <div class="control-group pref-second-factor-disable-all">
+                <div class="controls -actions">
                   <DButton
                     @class="btn-danger"
                     @icon="ban"
@@ -178,6 +150,10 @@
                     @disabled={{this.loading}}
                     @label="user.second_factor.disable_all"
                   />
+                  <CancelLink
+                    @route="preferences.security"
+                    @args={{this.model.username}}
+                  />
                 </div>
               </div>
             {{/unless}}
@@ -203,7 +179,7 @@
           </div>
 
           <div class="control-group">
-            <div class="controls">
+            <div class="controls -actions">
               <DButton
                 @class="btn-primary"
                 @type="submit"
@@ -214,7 +190,7 @@
 
               {{#unless this.showEnforcedNotice}}
                 <CancelLink
-                  @route="preferences.account"
+                  @route="preferences.security"
                   @args={{this.model.username}}
                 />
               {{/unless}}
diff --git a/app/assets/javascripts/discourse/app/templates/preferences.hbs b/app/assets/javascripts/discourse/app/templates/preferences.hbs
index 88f978b73ac..16435e6cb84 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences.hbs
@@ -1,115 +1,113 @@
-{{#if this.currentUser.redesigned_user_page_nav_enabled}}
-  <DSection @pageClass="user-preferences" />
-  <div class="user-navigation user-navigation-secondary">
-    <HorizontalOverflowNav>
-      <UserNav::PreferencesNav
-        @currentUser={{this.currentUser}}
-        @model={{this.model}}
-        @siteSettings={{this.siteSettings}}
-      />
-    </HorizontalOverflowNav>
-  </div>
-{{else}}
-  <DSection @pageClass="user-preferences" @class="user-secondary-navigation">
-    <MobileNav
-      @class="preferences-nav"
-      @desktopClass="preferences-list action-list nav-stacked"
+<DSection @pageClass="user-preferences" />
+
+<div class="user-navigation user-navigation-secondary">
+  <HorizontalOverflowNav @ariaLabel="User secondary - preferences">
+    <DNavigationItem
+      @route="preferences.account"
+      @ariaCurrentContext="subNav"
+      class="user-nav__preferences-account"
     >
-      <li class="nav-account">
-        <LinkTo @route="preferences.account">
-          {{i18n "user.preferences_nav.account"}}
-        </LinkTo>
-      </li>
-      <li class="nav-security">
-        <LinkTo @route="preferences.security">
-          {{i18n "user.preferences_nav.security"}}
-        </LinkTo>
-      </li>
-      <li class="nav-profile">
-        <LinkTo @route="preferences.profile">
-          {{i18n "user.preferences_nav.profile"}}
-        </LinkTo>
-      </li>
-      <li class="nav-emails">
-        <LinkTo @route="preferences.emails">
-          {{i18n "user.preferences_nav.emails"}}
-        </LinkTo>
-      </li>
-      <li class="nav-notifications">
-        <LinkTo @route="preferences.notifications">
-          {{i18n "user.preferences_nav.notifications"}}
-        </LinkTo>
-      </li>
-      {{#if this.model.can_change_tracking_preferences}}
-        <li class="indent nav-categories">
-          <LinkTo @route="preferences.categories">
-            {{i18n "user.preferences_nav.categories"}}
-          </LinkTo>
-        </li>
-      {{/if}}
-      <li class="indent nav-users">
-        <LinkTo @route="preferences.users">
-          {{i18n "user.preferences_nav.users"}}
-        </LinkTo>
-      </li>
-      {{#if
-        (and
-          this.model.can_change_tracking_preferences
-          this.siteSettings.tagging_enabled
-        )
-      }}
-        <li class="indent nav-tags">
-          <LinkTo @route="preferences.tags">
-            {{i18n "user.preferences_nav.tags"}}
-          </LinkTo>
-        </li>
-      {{/if}}
-      <li class="nav-interface">
-        <LinkTo @route="preferences.interface">
-          {{i18n "user.preferences_nav.interface"}}
-        </LinkTo>
-      </li>
+      {{d-icon "user"}}
+      <span>{{i18n "user.preferences_nav.account"}}</span>
+    </DNavigationItem>
 
-      {{#if (not (eq this.siteSettings.navigation_menu "legacy"))}}
-        <li class="indent nav-sidebar">
-          <LinkTo @route="preferences.sidebar">
-            {{i18n "user.preferences_nav.sidebar"}}
-          </LinkTo>
-        </li>
-      {{/if}}
+    <DNavigationItem
+      @route="preferences.security"
+      @ariaCurrentContext="subNav"
+      class="user-nav__preferences-security"
+    >
+      {{d-icon "lock"}}
+      <span>{{i18n "user.preferences_nav.security"}}</span>
+    </DNavigationItem>
 
-      <PluginOutlet
-        @name="user-preferences-nav-under-interface"
-        @tagName="span"
-        @connectorTagName="div"
-        @args={{hash model=this.model}}
-      />
+    <DNavigationItem
+      @route="preferences.profile"
+      @ariaCurrentContext="subNav"
+      class="user-nav__preferences-profile"
+    >
+      {{d-icon "user"}}
+      <span>{{i18n "user.preferences_nav.profile"}}</span>
+    </DNavigationItem>
 
-      {{#if this.model.userApiKeys}}
-        <li class="nav-apps">
-          <LinkTo @route="preferences.apps">
-            {{i18n "user.preferences_nav.apps"}}
-          </LinkTo>
-        </li>
-      {{/if}}
+    <DNavigationItem
+      @route="preferences.emails"
+      @ariaCurrentContext="subNav"
+      class="user-nav__preferences-emails"
+    >
+      {{d-icon "envelope"}}
+      <span>{{i18n "user.preferences_nav.emails"}}</span>
+    </DNavigationItem>
 
-      <PluginOutlet
-        @name="user-preferences-nav"
-        @tagName="span"
-        @connectorTagName="li"
-        @args={{hash model=this.model}}
-      />
-    </MobileNav>
-  </DSection>
-{{/if}}
+    <DNavigationItem
+      @route="preferences.notifications"
+      @ariaCurrentContext="subNav"
+      class="user-nav__preferences-notifications"
+    >
+      {{d-icon "bell"}}
+      <span>{{i18n "user.preferences_nav.notifications"}}</span>
+    </DNavigationItem>
 
-<section class="user-content user-preferences">
-  <PluginOutlet
-    @name="above-user-preferences"
-    @tagName="span"
-    @connectorTagName="div"
-    @args={{hash model=this.model}}
-  />
+    {{#if this.model.can_change_tracking_preferences}}
+      <DNavigationItem
+        @route="preferences.tracking"
+        @ariaCurrentContext="subNav"
+        class="user-nav__preferences-tracking"
+      >
+        {{d-icon "plus"}}
+        <span>{{i18n "user.preferences_nav.tracking"}}</span>
+      </DNavigationItem>
+    {{/if}}
+
+    <DNavigationItem
+      @route="preferences.users"
+      @ariaCurrentContext="subNav"
+      class="user-nav__preferences-users"
+    >
+      {{d-icon "users"}}
+      <span>{{i18n "user.preferences_nav.users"}}</span>
+    </DNavigationItem>
+
+    <DNavigationItem
+      @route="preferences.interface"
+      @ariaCurrentContext="subNav"
+      class="user-nav__preferences-interface"
+    >
+      {{d-icon "desktop"}}
+      <span>{{i18n "user.preferences_nav.interface"}}</span>
+    </DNavigationItem>
+
+    {{#if (not-eq this.siteSettings.navigation_menu "legacy")}}
+      <DNavigationItem
+        @route="preferences.navigation-menu"
+        @ariaCurrentContext="subNav"
+        class="user-nav__preferences-navigation-menu"
+      >
+        {{d-icon "bars"}}
+        <span>{{i18n "user.preferences_nav.navigation_menu"}}</span>
+      </DNavigationItem>
+    {{/if}}
+
+    <PluginOutlet
+      @name="user-preferences-nav-under-interface"
+      @connectorTagName="div"
+      @outletArgs={{hash model=this.model}}
+    />
+    <PluginOutlet
+      @name="user-preferences-nav"
+      @connectorTagName="li"
+      @outletArgs={{hash model=this.model}}
+    />
+  </HorizontalOverflowNav>
+</div>
+
+<section class="user-content user-preferences" id="user-content">
+  <span>
+    <PluginOutlet
+      @name="above-user-preferences"
+      @connectorTagName="div"
+      @outletArgs={{hash model=this.model}}
+    />
+  </span>
 
   <form class="form-vertical">
     {{outlet}}
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/account.hbs b/app/assets/javascripts/discourse/app/templates/preferences/account.hbs
index 4825d6f219e..06cfd1559b2 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/account.hbs
@@ -1,10 +1,10 @@
-<div class="control-group pref-username">
+<div class="control-group pref-username" data-setting-name="user-username">
   <label class="control-label">{{i18n "user.username.title"}}</label>
   <UsernamePreference @user={{this.model}} />
 </div>
 
 {{#unless this.siteSettings.discourse_connect_overrides_avatar}}
-  <div class="control-group pref-avatar">
+  <div class="control-group pref-avatar" data-setting-name="user-avatar">
     <label class="control-label" id="profile-picture">{{i18n
         "user.avatar.title"
       }}</label>
@@ -22,7 +22,7 @@
 {{/unless}}
 
 {{#if this.canCheckEmails}}
-  <div class="control-group pref-email">
+  <div class="control-group pref-email" data-setting-name="user-email">
     <label class="control-label">{{i18n "user.email.title"}}</label>
     {{#if this.model.email}}
       {{#if this.siteSettings.enable_secondary_emails}}
@@ -67,7 +67,7 @@
           {{/each}}
         </div>
 
-        {{#if this.model.can_edit_email}}
+        {{#if this.canAddEmail}}
           <LinkTo
             @route="preferences.email"
             @query={{hash new=1}}
@@ -111,7 +111,10 @@
 {{/if}}
 
 {{#if this.canUpdateAssociatedAccounts}}
-  <div class="control-group pref-associated-accounts">
+  <div
+    class="control-group pref-associated-accounts"
+    data-setting-name="user-associated-accounts"
+  >
     <label class="control-label">{{i18n
         "user.associated_accounts.title"
       }}</label>
@@ -175,7 +178,7 @@
 {{/if}}
 
 {{#if this.canEditName}}
-  <div class="control-group pref-name">
+  <div class="control-group pref-name" data-setting-name="user-name">
     <label class="control-label">{{i18n "user.name.title"}}</label>
     <div class="controls">
       {{#if this.model.can_edit_name}}
@@ -195,7 +198,7 @@
 {{/if}}
 
 {{#if this.canSelectTitle}}
-  <div class="control-group pref-title">
+  <div class="control-group pref-title" data-setting-name="user-title">
     <label class="control-label">{{i18n "user.title.title"}}</label>
     <div class="controls">
       <ComboBox
@@ -212,7 +215,7 @@
 {{/if}}
 
 {{#if this.canSelectFlair}}
-  <div class="control-group pref-flair">
+  <div class="control-group pref-flair" data-setting-name="user-flair">
     <label class="control-label">{{i18n "user.flair.title"}}</label>
     <div class="controls">
       <FlairChooser
@@ -229,7 +232,7 @@
 {{/if}}
 
 {{#if this.canSelectUserStatus}}
-  <div class="control-group pref-user-status">
+  <div class="control-group pref-user-status" data-setting-name="user-status">
     <label class="control-label">{{i18n "user.status.title"}}</label>
     <div class="controls">
       {{#if this.newStatus}}
@@ -251,7 +254,10 @@
 {{/if}}
 
 {{#if this.canSelectPrimaryGroup}}
-  <div class="control-group pref-primary-group">
+  <div
+    class="control-group pref-primary-group"
+    data-setting-name="user-primary-group"
+  >
     <label class="control-label">{{i18n "user.primary_group.title"}}</label>
     <div class="controls">
       <ComboBox
@@ -263,21 +269,43 @@
   </div>
 {{/if}}
 
-<PluginOutlet
-  @name="user-preferences-account"
-  @tagName="span"
-  @connectorTagName="div"
-  @args={{hash model=this.model save=(action "save")}}
-/>
+{{#if this.canDownloadPosts}}
+  <div
+    class="control-group pref-data-export"
+    data-setting-name="user-data-export"
+  >
+    <label class="control-label">{{i18n "user.download_archive.title"}}</label>
+    <div class="controls">
+      <DButton
+        @action={{action "exportUserArchive"}}
+        @class="btn-default btn-request-archive"
+        @label="user.download_archive.button_text"
+        @icon="download"
+      />
+    </div>
+    <div class="instructions">
+      {{i18n "user.download_archive.description"}}
+    </div>
+  </div>
+{{/if}}
+
+<span>
+  <PluginOutlet
+    @name="user-preferences-account"
+    @connectorTagName="div"
+    @outletArgs={{hash model=this.model save=(action "save")}}
+  />
+</span>
 
 <br />
 
-<PluginOutlet
-  @name="user-custom-controls"
-  @tagName="span"
-  @connectorTagName="div"
-  @args={{hash model=this.model}}
-/>
+<span>
+  <PluginOutlet
+    @name="user-custom-controls"
+    @connectorTagName="div"
+    @outletArgs={{hash model=this.model}}
+  />
+</span>
 
 {{#if this.canSaveUser}}
   <SaveControls
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/apps.hbs b/app/assets/javascripts/discourse/app/templates/preferences/apps.hbs
index 81ff9a9b7cc..c5dc8752cc8 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/apps.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/apps.hbs
@@ -1,8 +1,9 @@
 <UserPreferences::UserApiKeys @model={{@model}} />
 
-<PluginOutlet
-  @name="user-preferences-apps"
-  @tagName="span"
-  @connectorTagName="div"
-  @args={{hash model=this.model}}
-/>
\ No newline at end of file
+<span>
+  <PluginOutlet
+    @name="user-preferences-apps"
+    @connectorTagName="div"
+    @outletArgs={{hash model=this.model}}
+  />
+</span>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/emails.hbs b/app/assets/javascripts/discourse/app/templates/preferences/emails.hbs
index 7785495a801..08cd30b2a1f 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/emails.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/emails.hbs
@@ -8,7 +8,10 @@
 <div class="control-group pref-email-settings">
   <label class="control-label">{{i18n "user.email_settings"}}</label>
 
-  <div class="controls controls-dropdown">
+  <div
+    class="controls controls-dropdown"
+    data-setting-name="user-email-messages-level"
+  >
     <label for="user-email-messages-level">{{i18n
         "user.email_messages_level"
       }}</label>
@@ -24,7 +27,7 @@
     {{/if}}
   </div>
 
-  <div class="controls controls-dropdown">
+  <div class="controls controls-dropdown" data-setting-name="user-email-level">
     <label for="user-email-level">{{i18n "user.email_level.title"}}</label>
     <ComboBox
       @valueProperty="value"
@@ -38,7 +41,10 @@
     {{/if}}
   </div>
 
-  <div class="controls controls-dropdown">
+  <div
+    class="controls controls-dropdown"
+    data-setting-name="user-email-previous-replies"
+  >
     <label>{{i18n "user.email_previous_replies.title"}}</label>
     <ComboBox
       @valueProperty="value"
@@ -48,28 +54,34 @@
     />
   </div>
   <PreferenceCheckbox
+    data-setting-name="user-email-in-reply-to"
     @labelKey="user.email_in_reply_to"
     @checked={{this.model.user_option.email_in_reply_to}}
   />
 
-  <PluginOutlet
-    @name="user-preferences-emails-pref-email-settings"
-    @tagName="span"
-    @connectorTagName="div"
-    @args={{hash model=this.model save=(action "save")}}
-  />
+  <span>
+    <PluginOutlet
+      @name="user-preferences-emails-pref-email-settings"
+      @connectorTagName="div"
+      @outletArgs={{hash model=this.model save=(action "save")}}
+    />
+  </span>
 </div>
 
 {{#unless this.siteSettings.disable_digest_emails}}
   <div class="control-group pref-activity-summary">
     <label class="control-label">{{i18n "user.email_activity_summary"}}</label>
     <PreferenceCheckbox
+      data-setting-name="user-email-digests"
       @labelKey="user.email_digests.title"
       @disabled={{this.model.user_option.mailing_list_mode}}
       @checked={{this.model.user_option.email_digests}}
     />
     {{#if this.model.user_option.email_digests}}
-      <div class="controls controls-dropdown">
+      <div
+        class="controls controls-dropdown"
+        data-setting-name="user-email-digests-frequency"
+      >
         <ComboBox
           @valueProperty="value"
           @content={{this.digestFrequencies}}
@@ -79,6 +91,7 @@
         />
       </div>
       <PreferenceCheckbox
+        data-setting-name="user-include-tl0-in-digests"
         @labelKey="user.include_tl0_in_digests"
         @disabled={{this.model.user_option.mailing_list_mode}}
         @checked={{this.model.user_option.include_tl0_in_digests}}
@@ -91,14 +104,18 @@
   <div class="control-group pref-mailing-list-mode">
     <label class="control-label">{{i18n "user.mailing_list_mode.label"}}</label>
     <PreferenceCheckbox
+      data-setting-name="user-mailing-list-mode-enabled"
       @labelKey="user.mailing_list_mode.enabled"
       @checked={{this.model.user_option.mailing_list_mode}}
     />
-    <div class="instructions">{{html-safe
-        (i18n "user.mailing_list_mode.instructions")
-      }}</div>
+    <div class="instructions">
+      {{html-safe (i18n "user.mailing_list_mode.instructions")}}
+    </div>
     {{#if this.model.user_option.mailing_list_mode}}
-      <div class="controls controls-dropdown">
+      <div
+        class="controls controls-dropdown"
+        data-setting-name="user-mailing-list-mode-options"
+      >
         <ComboBox
           @valueProperty="value"
           @content={{this.mailingListModeOptions}}
@@ -112,21 +129,23 @@
   </div>
 {{/unless}}
 
-<PluginOutlet
-  @name="user-preferences-emails"
-  @tagName="span"
-  @connectorTagName="div"
-  @args={{hash model=this.model save=(action "save")}}
-/>
+<span>
+  <PluginOutlet
+    @name="user-preferences-emails"
+    @connectorTagName="div"
+    @outletArgs={{hash model=this.model save=(action "save")}}
+  />
+</span>
 
 <br />
 
-<PluginOutlet
-  @name="user-custom-controls"
-  @tagName="span"
-  @connectorTagName="div"
-  @args={{hash model=this.model}}
-/>
+<span>
+  <PluginOutlet
+    @name="user-custom-controls"
+    @connectorTagName="div"
+    @outletArgs={{hash model=this.model}}
+  />
+</span>
 
 <SaveControls
   @model={{this.model}}
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs b/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
index 6bff82729c6..1c1d072c337 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
@@ -1,12 +1,13 @@
-<PluginOutlet
-  @name="user-preferences-interface-top"
-  @tagName="span"
-  @connectorTagName="div"
-  @args={{hash model=this.model save=(action "save")}}
-/>
+<span>
+  <PluginOutlet
+    @name="user-preferences-interface-top"
+    @connectorTagName="div"
+    @outletArgs={{hash model=this.model save=(action "save")}}
+  />
+</span>
 
 {{#if this.showThemeSelector}}
-  <div class="control-group theme">
+  <div class="control-group theme" data-setting-name="user-theme">
     <label class="control-label">{{i18n "user.theme"}}</label>
     <div class="controls">
       <ComboBox
@@ -32,41 +33,41 @@
 {{/if}}
 
 {{#if this.showColorSchemeSelector}}
-  <fieldset class="control-group color-scheme">
+  <fieldset
+    class="control-group color-scheme"
+    data-setting-name="user-color-scheme"
+  >
     <legend class="control-label">{{i18n "user.color_scheme"}}</legend>
-    <div class="control-subgroup light-color-scheme">
-      {{#if this.showDarkColorSchemeSelector}}
-        <div class="instructions">{{i18n "user.color_schemes.regular"}}</div>
-      {{/if}}
-      <div class="controls">
-        <ComboBox
-          @content={{this.userSelectableColorSchemes}}
-          @value={{this.selectedColorSchemeId}}
-          @onChange={{action "loadColorScheme"}}
-          @options={{hash
-            translatedNone=this.selectedColorSchemeNoneLabel
-            autoInsertNoneItem=this.showColorSchemeNoneItem
-          }}
-        />
-      </div>
-    </div>
-    {{#if this.showDarkColorSchemeSelector}}
-      <div class="control-subgroup dark-color-scheme">
-        <div class="instructions">{{i18n "user.color_schemes.dark"}}</div>
+    <div class="controls">
+      <div class="control-subgroup light-color-scheme">
+        {{#if this.showDarkColorSchemeSelector}}
+          <div class="instructions">{{i18n "user.color_schemes.regular"}}</div>
+        {{/if}}
         <div class="controls">
           <ComboBox
-            @content={{this.userSelectableDarkColorSchemes}}
-            @value={{this.selectedDarkColorSchemeId}}
-            @onChange={{action "loadDarkColorScheme"}}
+            @content={{this.userSelectableColorSchemes}}
+            @value={{this.selectedColorSchemeId}}
+            @onChange={{action "loadColorScheme"}}
+            @options={{hash
+              translatedNone=this.selectedColorSchemeNoneLabel
+              autoInsertNoneItem=this.showColorSchemeNoneItem
+            }}
           />
         </div>
       </div>
-
-      <div class="instructions">
-        {{i18n "user.color_schemes.dark_instructions"}}
-      </div>
-    {{/if}}
-
+      {{#if this.showDarkColorSchemeSelector}}
+        <div class="control-subgroup dark-color-scheme">
+          <div class="instructions">{{i18n "user.color_schemes.dark"}}</div>
+          <div class="controls">
+            <ComboBox
+              @content={{this.userSelectableDarkColorSchemes}}
+              @value={{this.selectedDarkColorSchemeId}}
+              @onChange={{action "loadDarkColorScheme"}}
+            />
+          </div>
+        </div>
+      {{/if}}
+    </div>
     {{#if this.previewingColorScheme}}
       {{#if this.previewingColorScheme}}
         <DButton
@@ -76,7 +77,6 @@
           @class="btn-default btn-small undo-preview"
         />
       {{/if}}
-
       <div class="controls color-scheme-checkbox">
         <PreferenceCheckbox
           @labelKey="user.color_scheme_default_on_all_devices"
@@ -84,11 +84,16 @@
         />
       </div>
     {{/if}}
+    {{#if this.showDarkColorSchemeSelector}}
+      <div class="instructions">
+        {{i18n "user.color_schemes.dark_instructions"}}
+      </div>
+    {{/if}}
   </fieldset>
 {{/if}}
 
 {{#if this.showDarkModeToggle}}
-  <div class="control-group dark-mode">
+  <div class="control-group dark-mode" data-setting-name="user-dark-mode">
     <label class="control-label">{{i18n "user.dark_mode"}}</label>
     <div class="controls">
       <PreferenceCheckbox
@@ -99,7 +104,7 @@
   </div>
 {{/if}}
 
-<div class="control-group text-size">
+<div class="control-group text-size" data-setting-name="user-text-size">
   <label for="text-size-selector" class="control-label">{{i18n
       "user.text_size.title"
     }}</label>
@@ -123,7 +128,7 @@
 </div>
 
 {{#if this.siteSettings.allow_user_locale}}
-  <div class="control-group pref-locale">
+  <div class="control-group pref-locale" data-setting-name="user-locale">
     <label for="locale-selector" class="control-label">{{i18n
         "user.locale.title"
       }}</label>
@@ -144,7 +149,7 @@
   </div>
 {{/if}}
 
-<div class="control-group home">
+<div class="control-group home" data-setting-name="user-home">
   <label for="home-selector" class="control-label">{{i18n "user.home"}}</label>
   <div class="controls">
     <ComboBox
@@ -157,29 +162,33 @@
   </div>
 </div>
 
-<fieldset class="control-group other">
+<fieldset class="control-group other" data-setting-name="user-other-settings">
   <legend class="control-label">{{i18n "user.other_settings"}}</legend>
 
   <PreferenceCheckbox
     @labelKey="user.external_links_in_new_tab"
     @checked={{this.model.user_option.external_links_in_new_tab}}
     @class="pref-external-links"
+    data-setting-name="user-external-links"
   />
   <PreferenceCheckbox
     @labelKey="user.enable_quoting"
     @checked={{this.model.user_option.enable_quoting}}
     @class="pref-enable-quoting"
+    data-setting-name="user-enable-quoting"
   />
   <PreferenceCheckbox
     @labelKey="user.enable_defer"
     @checked={{this.model.user_option.enable_defer}}
     @class="pref-defer-unread"
+    data-setting-name="user-enable-defer"
   />
   {{#if this.siteSettings.automatically_unpin_topics}}
     <PreferenceCheckbox
       @labelKey="user.automatically_unpin_topics"
       @checked={{this.model.user_option.automatically_unpin_topics}}
       @class="pref-auto-unpin"
+      data-setting-name="user-auto-unpin"
     />
   {{/if}}
   {{#if this.siteSettings.allow_users_to_hide_profile}}
@@ -187,14 +196,19 @@
       @labelKey="user.hide_profile_and_presence"
       @checked={{this.model.user_option.hide_profile_and_presence}}
       @class="pref-hide-profile"
+      data-setting-name="user-hide-profile"
     />
   {{/if}}
   <PreferenceCheckbox
     @labelKey="user.dynamic_favicon"
     @checked={{this.model.user_option.dynamic_favicon}}
     @class="pref-dynamic-favicon"
+    data-setting-name="user-dynamic-favicon"
   />
-  <div class="controls controls-dropdown pref-page-title">
+  <div
+    class="controls controls-dropdown pref-page-title"
+    data-setting-name="user-page-title"
+  >
     <label for="user-title-count-mode">{{i18n
         "user.title_count_mode.title"
       }}</label>
@@ -206,7 +220,10 @@
       @onChange={{action (mut this.model.user_option.title_count_mode)}}
     />
   </div>
-  <div class="controls controls-dropdown pref-bookmark-after-notification">
+  <div
+    class="controls controls-dropdown pref-bookmark-after-notification"
+    data-setting-name="user-bookmark-after-notification"
+  >
     <label for="bookmark-after-notification-mode">{{i18n
         "user.bookmark_after_notification.title"
       }}</label>
@@ -214,7 +231,7 @@
       @valueProperty="value"
       @content={{this.bookmarkAfterNotificationModes}}
       @value={{this.model.user_option.bookmark_auto_delete_preference}}
-      @id="boookmark-after-notification-mode"
+      @id="bookmark-after-notification-mode"
       @onChange={{action
         (mut this.model.user_option.bookmark_auto_delete_preference)
       }}
@@ -224,30 +241,34 @@
     @labelKey="user.skip_new_user_tips.description"
     @checked={{this.model.user_option.skip_new_user_tips}}
     @class="pref-new-user-tips"
+    data-setting-name="user-new-user-tips"
   />
   {{#if this.site.user_tips}}
     <DButton
       @class="pref-reset-seen-user-tips"
       @action={{action "resetSeenUserTips"}}
+      data-setting-name="user-reset-seen-user-tips"
     >{{i18n "user.reset_seen_user_tips"}}</DButton>
   {{/if}}
 </fieldset>
 
-<PluginOutlet
-  @name="user-preferences-interface"
-  @tagName="span"
-  @connectorTagName="div"
-  @args={{hash model=this.model save=(action "save")}}
-/>
+<span>
+  <PluginOutlet
+    @name="user-preferences-interface"
+    @connectorTagName="div"
+    @outletArgs={{hash model=this.model save=(action "save")}}
+  />
+</span>
 
 <br />
 
-<PluginOutlet
-  @name="user-custom-controls"
-  @tagName="span"
-  @connectorTagName="div"
-  @args={{hash model=this.model}}
-/>
+<span>
+  <PluginOutlet
+    @name="user-custom-controls"
+    @connectorTagName="div"
+    @outletArgs={{hash model=this.model}}
+  />
+</span>
 
 <SaveControls
   @model={{this.model}}
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/navigation-menu.hbs b/app/assets/javascripts/discourse/app/templates/preferences/navigation-menu.hbs
new file mode 100644
index 00000000000..30ee0bd0a38
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/preferences/navigation-menu.hbs
@@ -0,0 +1,31 @@
+<div
+  class="control-group preferences-navigation-menu-navigation"
+  data-setting-name="user-navigation-menu-navigation"
+>
+  <legend class="control-label">{{i18n
+      "user.experimental_sidebar.navigation_section"
+    }}</legend>
+
+  <div class="controls">
+    <label>{{i18n
+        "user.experimental_sidebar.navigation_section_instruction"
+      }}</label>
+
+    <PreferenceCheckbox
+      @labelKey="user.experimental_sidebar.link_to_filtered_list_checkbox_description"
+      @checked={{this.newSidebarLinkToFilteredList}}
+      @class="pref-link-to-filtered-list"
+    />
+    <PreferenceCheckbox
+      @labelKey="user.experimental_sidebar.show_count_new_items_checkbox_description"
+      @checked={{this.newSidebarShowCountOfNewItems}}
+      @class="pref-show-count-new-items"
+    />
+  </div>
+</div>
+
+<SaveControls
+  @model={{this.model}}
+  @action={{action "save"}}
+  @saved={{this.saved}}
+/>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/notifications.hbs b/app/assets/javascripts/discourse/app/templates/preferences/notifications.hbs
index 5dfd1770840..6b0f382fb1f 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/notifications.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/notifications.hbs
@@ -1,16 +1,10 @@
 <div class="control-group notifications">
   <label class="control-label">{{i18n "user.notifications"}}</label>
 
-  {{#unless this.currentUser.redesigned_user_page_nav_enabled}}
-    <UserPreferences::TopicTracking
-      @considerNewTopicOptions={{this.considerNewTopicOptions}}
-      @model={{this.model}}
-      @autoTrackDurations={{this.autoTrackDurations}}
-      @notificationLevelsForReplying={{this.notificationLevelsForReplying}}
-    />
-  {{/unless}}
-
-  <div class="controls controls-dropdown">
+  <div
+    class="controls controls-dropdown"
+    data-setting-name="user-like-notification-frequency"
+  >
     <label>{{i18n "user.like_notification_frequency.title"}}</label>
     <ComboBox
       @valueProperty="value"
@@ -23,8 +17,11 @@
   </div>
 </div>
 
-{{#unless this.capabilities.isIOS}}
-  <div class="control-group desktop-notifications">
+{{#unless this.capabilities.isAppWebview}}
+  <div
+    class="control-group desktop-notifications"
+    data-setting-name="user-desktop-notifications"
+  >
     <label class="control-label">{{i18n
         "user.desktop_notifications.label"
       }}</label>
@@ -32,38 +29,35 @@
     <div class="instructions">{{i18n
         "user.desktop_notifications.each_browser_note"
       }}</div>
-    <PluginOutlet
-      @name="user-preferences-desktop-notifications"
-      @tagName="span"
-      @connectorTagName="div"
-      @args={{hash model=this.model save=(action "save")}}
-    />
+    <span>
+      <PluginOutlet
+        @name="user-preferences-desktop-notifications"
+        @connectorTagName="div"
+        @outletArgs={{hash model=this.model save=(action "save")}}
+      />
+    </span>
   </div>
 {{/unless}}
 
 <UserNotificationSchedule @model={{this.model}} />
 
-{{#if this.showMessageSettings}}
-  {{#unless this.currentUser.redesigned_user_page_nav_enabled}}
-    <UserPreferences::AllowPrivateMessages @model={{this.model}} />
-  {{/unless}}
-{{/if}}
-
-<PluginOutlet
-  @name="user-preferences-notifications"
-  @tagName="span"
-  @connectorTagName="div"
-  @args={{hash model=this.model save=(action "save")}}
-/>
+<span>
+  <PluginOutlet
+    @name="user-preferences-notifications"
+    @connectorTagName="div"
+    @outletArgs={{hash model=this.model save=(action "save")}}
+  />
+</span>
 
 <br />
 
-<PluginOutlet
-  @name="user-custom-controls"
-  @tagName="span"
-  @connectorTagName="div"
-  @args={{hash model=this.model}}
-/>
+<span>
+  <PluginOutlet
+    @name="user-custom-controls"
+    @connectorTagName="div"
+    @outletArgs={{hash model=this.model}}
+  />
+</span>
 
 <SaveControls
   @model={{this.model}}
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs b/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs
index d08eec804e0..b87f0754a5d 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs
@@ -1,5 +1,5 @@
 {{#if this.canChangeBio}}
-  <div class="control-group pref-bio">
+  <div class="control-group pref-bio" data-setting-name="user-bio">
     <label class="control-label">{{i18n "user.bio"}}</label>
     <div class="controls bio-composer input-xxlarge">
       <DEditor @value={{this.model.bio_raw}} />
@@ -7,7 +7,7 @@
   </div>
 {{/if}}
 
-<div class="control-group pref-timezone">
+<div class="control-group pref-timezone" data-setting-name="user-timezone">
   <label class="control-label">{{i18n "user.timezone"}}</label>
   <TimezoneInput
     @value={{this.model.user_option.timezone}}
@@ -23,7 +23,7 @@
 </div>
 
 {{#if this.model.can_change_location}}
-  <div class="control-group pref-location">
+  <div class="control-group pref-location" data-setting-name="user-location">
     <label class="control-label" for="edit-location">{{i18n
         "user.location"
       }}</label>
@@ -39,7 +39,7 @@
 {{/if}}
 
 {{#if this.model.can_change_website}}
-  <div class="control-group pref-website">
+  <div class="control-group pref-website" data-setting-name="user-website">
     <label class="control-label" for="edit-website">{{i18n
         "user.website"
       }}</label>
@@ -55,7 +55,7 @@
 {{/if}}
 
 {{#each this.userFields as |uf|}}
-  <div class="control-group">
+  <div class="control-group" data-setting-name="user-user-fields">
     <UserField @field={{uf.field}} @value={{uf.value}} />
   </div>
 {{/each}}
@@ -63,7 +63,10 @@
 
 {{#if this.siteSettings.allow_profile_backgrounds}}
   {{#if this.canUploadProfileHeader}}
-    <div class="control-group pref-profile-bg">
+    <div
+      class="control-group pref-profile-bg"
+      data-setting-name="user-profile-bg"
+    >
       <label class="control-label">{{i18n
           "user.change_profile_background.title"
         }}</label>
@@ -80,7 +83,7 @@
     </div>
   {{/if}}
   {{#if this.canUploadUserCardBackground}}
-    <div class="control-group pref-profile-bg">
+    <div class="control-group pref-profile-bg" data-setting-name="user-card-bg">
       <label class="control-label">{{i18n
           "user.change_card_background.title"
         }}</label>
@@ -99,7 +102,7 @@
 {{/if}}
 
 {{#if this.siteSettings.allow_featured_topic_on_user_profiles}}
-  <div class="control-group">
+  <div class="control-group" data-setting-name="user-featured-topic">
     <label class="control-label">{{i18n "user.featured_topic"}}</label>
     {{#if this.model.featured_topic}}
       <label class="featured-topic-link">
@@ -110,7 +113,7 @@
             this.model.featured_topic.id
           }}
         >
-          {{html-safe (replace-emoji this.model.featured_topic.fancy_title)}}
+          {{replace-emoji (html-safe this.model.featured_topic.fancy_title)}}
         </LinkTo>
       </label>
     {{/if}}
@@ -136,7 +139,7 @@
 {{/if}}
 
 {{#if this.canChangeDefaultCalendar}}
-  <div class="control-group">
+  <div class="control-group" data-setting-name="user-default-calendar">
     <label class="control-label">{{i18n
         "download_calendar.default_calendar"
       }}</label>
@@ -155,28 +158,31 @@
   </div>
 {{/if}}
 
-<PluginOutlet
-  @name="user-preferences-profile"
-  @tagName="span"
-  @connectorTagName="div"
-  @args={{hash model=this.model save=(action "save")}}
-/>
+<span>
+  <PluginOutlet
+    @name="user-preferences-profile"
+    @connectorTagName="div"
+    @outletArgs={{hash model=this.model save=(action "save")}}
+  />
+</span>
 
-<PluginOutlet
-  @name="user-custom-preferences"
-  @tagName="span"
-  @connectorTagName="div"
-  @args={{hash model=this.model}}
-/>
+<span>
+  <PluginOutlet
+    @name="user-custom-preferences"
+    @connectorTagName="div"
+    @outletArgs={{hash model=this.model}}
+  />
+</span>
 
 <br />
 
-<PluginOutlet
-  @name="user-custom-controls"
-  @tagName="span"
-  @connectorTagName="div"
-  @args={{hash model=this.model}}
-/>
+<span>
+  <PluginOutlet
+    @name="user-custom-controls"
+    @connectorTagName="div"
+    @outletArgs={{hash model=this.model}}
+  />
+</span>
 
 <SaveControls
   @model={{this.model}}
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/security.hbs b/app/assets/javascripts/discourse/app/templates/preferences/security.hbs
index 9ec0a9e85d5..41fe1a92bbe 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/security.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/security.hbs
@@ -1,5 +1,5 @@
 {{#if this.canChangePassword}}
-  <div class="control-group pref-password">
+  <div class="control-group pref-password" data-setting-name="user-password">
     <label class="control-label">{{i18n "user.password.title"}}</label>
     <div class="controls">
       <a href {{on "click" this.changePassword}} class="btn btn-default">
@@ -15,7 +15,10 @@
     </div>
   </div>
 
-  <div class="control-group pref-second-factor">
+  <div
+    class="control-group pref-second-factor"
+    data-setting-name="user-second-factor"
+  >
     <label class="control-label">{{i18n "user.second_factor.title"}}</label>
     {{#unless this.model.second_factor_enabled}}
       <label>
@@ -34,7 +37,10 @@
 {{/if}}
 
 {{#if this.canCheckEmails}}
-  <div class="control-group pref-auth-tokens">
+  <div
+    class="control-group pref-auth-tokens"
+    data-setting-name="user-auth-tokens"
+  >
     <label class="control-label">{{i18n "user.auth_tokens.title"}}</label>
 
     <div class="auth-tokens">
@@ -100,22 +106,22 @@
   </div>
 {{/if}}
 
-{{#if this.currentUser.redesigned_user_page_nav_enabled}}
-  <UserPreferences::UserApiKeys @model={{@model}} />
-{{/if}}
+<UserPreferences::UserApiKeys @model={{@model}} />
 
-<PluginOutlet
-  @name="user-preferences-security"
-  @tagName="span"
-  @connectorTagName="div"
-  @args={{hash model=this.model save=(action "save")}}
-/>
+<span>
+  <PluginOutlet
+    @name="user-preferences-security"
+    @connectorTagName="div"
+    @outletArgs={{hash model=this.model save=(action "save")}}
+  />
+</span>
 
 <br />
 
-<PluginOutlet
-  @name="user-custom-controls"
-  @tagName="span"
-  @connectorTagName="div"
-  @args={{hash model=this.model}}
-/>
\ No newline at end of file
+<span>
+  <PluginOutlet
+    @name="user-custom-controls"
+    @connectorTagName="div"
+    @outletArgs={{hash model=this.model}}
+  />
+</span>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/sidebar.hbs b/app/assets/javascripts/discourse/app/templates/preferences/sidebar.hbs
deleted file mode 100644
index ab82ed5bc23..00000000000
--- a/app/assets/javascripts/discourse/app/templates/preferences/sidebar.hbs
+++ /dev/null
@@ -1,67 +0,0 @@
-<div class="control-group preferences-sidebar-categories">
-  <legend class="control-label">{{i18n
-      "user.experimental_sidebar.categories_section"
-    }}</legend>
-
-  <div class="controls">
-    <CategorySelector
-      @categories={{this.selectedSidebarCategories}}
-      @onChange={{action (mut this.selectedSidebarCategories)}}
-      @options={{hash
-        allowUncategorized=(not this.siteSettings.suppress_uncategorized_badge)
-        displayCategoryDescription=true
-      }}
-    />
-  </div>
-
-  <div class="instructions">{{i18n
-      "user.experimental_sidebar.categories_section_instruction"
-    }}</div>
-</div>
-
-{{#if this.model.display_sidebar_tags}}
-  <div class="control-group preferences-sidebar-tags">
-    <legend class="control-label">{{i18n
-        "user.experimental_sidebar.tags_section"
-      }}</legend>
-
-    <div class="controls">
-      <TagChooser
-        @tags={{this.selectedSidebarTagNames}}
-        @everyTag={{true}}
-        @unlimitedTagCount={{true}}
-        @onChange={{action (mut this.selectedSidebarTagNames)}}
-        @options={{hash allowAny=false}}
-      />
-    </div>
-
-    <div class="instructions">{{i18n
-        "user.experimental_sidebar.tags_section_instruction"
-      }}</div>
-  </div>
-{{/if}}
-
-<div class="control-group preferences-sidebar-navigation">
-  <legend class="control-label">{{i18n
-      "user.experimental_sidebar.navigation_section"
-    }}</legend>
-
-  <div class="controls controls-dropdown">
-    <label>{{i18n
-        "user.experimental_sidebar.list_destination_instruction"
-      }}</label>
-    <ComboBox
-      @class="preferences-sidebar-navigation__list-destination-selector"
-      @valueProperty="value"
-      @content={{this.sidebarListDestinations}}
-      @value={{this.newSidebarListDestination}}
-      @onChange={{action (mut this.newSidebarListDestination)}}
-    />
-  </div>
-</div>
-
-<SaveControls
-  @model={{this.model}}
-  @action={{action "save"}}
-  @saved={{this.saved}}
-/>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/tracking.hbs b/app/assets/javascripts/discourse/app/templates/preferences/tracking.hbs
index 749fa164778..2756e30642d 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/tracking.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/tracking.hbs
@@ -2,12 +2,54 @@
 
 <div class="user-preferences__tracking-topics-wrapper">
   <label class="control-label">{{i18n "user.topics_settings"}}</label>
-  <UserPreferences::TopicTracking
-    @considerNewTopicOptions={{this.considerNewTopicOptions}}
-    @model={{this.model}}
-    @autoTrackDurations={{this.autoTrackDurations}}
-    @notificationLevelsForReplying={{this.notificationLevelsForReplying}}
-  />
+
+  <div class="user-preferences_tracking-topics-controls">
+    <div
+      class="controls controls-dropdown"
+      data-setting-name="user-new-topic-duration"
+    >
+      <label>{{i18n "user.new_topic_duration.label"}}</label>
+      <ComboBox
+        @class="duration"
+        @valueProperty="value"
+        @content={{this.considerNewTopicOptions}}
+        @value={{this.model.user_option.new_topic_duration_minutes}}
+        @onChange={{action
+          (mut this.model.user_option.new_topic_duration_minutes)
+        }}
+      />
+    </div>
+
+    <div
+      class="controls controls-dropdown"
+      data-setting-name="user-auto-track-topics"
+    >
+      <label>{{i18n "user.auto_track_topics"}}</label>
+      <ComboBox
+        @valueProperty="value"
+        @content={{this.autoTrackDurations}}
+        @value={{this.model.user_option.auto_track_topics_after_msecs}}
+        @onChange={{action
+          (mut this.model.user_option.auto_track_topics_after_msecs)
+        }}
+      />
+    </div>
+
+    <div
+      class="controls controls-dropdown"
+      data-setting-name="user-notification-level-when-replying"
+    >
+      <label>{{i18n "user.notification_level_when_replying"}}</label>
+      <ComboBox
+        @valueProperty="value"
+        @content={{this.notificationLevelsForReplying}}
+        @value={{this.model.user_option.notification_level_when_replying}}
+        @onChange={{action
+          (mut this.model.user_option.notification_level_when_replying)
+        }}
+      />
+    </div>
+  </div>
 </div>
 
 <div class="user-preferences__tracking-categories-tags-wrapper">
@@ -30,6 +72,15 @@
     />
   </div>
 </div>
+{{#if this.showMutePrecedenceSetting}}
+  <div class="control-group user-preferences__watched-precedence-over-muted">
+    <PreferenceCheckbox
+      data-setting-name="watched-precedence-over-muted"
+      @labelKey="user.watched_precedence_over_muted"
+      @checked={{this.model.user_option.watched_precedence_over_muted}}
+    />
+  </div>
+{{/if}}
 
 {{#if this.canSave}}
   <SaveControls
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/users.hbs b/app/assets/javascripts/discourse/app/templates/preferences/users.hbs
index 77bdb15273b..6ffb37ffaaa 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/users.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/users.hbs
@@ -1,6 +1,6 @@
 <label class="control-label">{{i18n "user.users"}}</label>
 {{#if this.ignoredEnabled}}
-  <div class="control-group user-ignore">
+  <div class="control-group user-ignore" data-setting-name="user-ignored-users">
     <div class="controls tracking-controls user-notifications">
       <label>{{d-icon "far-eye-slash" class="icon"}}
         {{i18n "user.ignored_users"}}</label>
@@ -13,7 +13,7 @@
   </div>
 {{/if}}
 
-<div class="control-group user-mute">
+<div class="control-group user-mute" data-setting-name="user-muted-users">
   <div class="controls tracking-controls">
     <label>
       {{d-icon "d-muted" class="icon"}}
@@ -29,39 +29,54 @@
 </div>
 
 {{#if this.currentUser.can_send_private_messages}}
-  {{#if this.currentUser.redesigned_user_page_nav_enabled}}
-    <UserPreferences::AllowPrivateMessages @model={{this.model}} />
-  {{/if}}
-
-  <div class="control-group user-allow-pm">
-    <div class="controls">
-      <PreferenceCheckbox
-        @labelKey="user.allow_private_messages_from_specific_users"
-        @checked={{this.model.user_option.enable_allowed_pm_users}}
-        @disabled={{this.disableAllowPmUsersSetting}}
-      />
-    </div>
-    {{#if this.allowPmUsersEnabled}}
-      <div class="controls tracking-controls">
-        <UserChooser
-          @value={{this.allowedPmUsernames}}
-          @onChange={{action "onChangeAllowedPmUsernames"}}
-          @options={{hash excludeCurrentUser=true}}
+  <div class="control-group private-messages">
+    <label class="control-label">{{i18n "user.private_messages"}}</label>
+    <div
+      class="control-group user-allow-pm"
+      data-setting-name="user-allow-private-messages"
+    >
+      <div class="controls">
+        <PreferenceCheckbox
+          @labelKey="user.allow_private_messages"
+          @checked={{this.model.user_option.allow_private_messages}}
         />
       </div>
-      <div class="instructions">{{i18n
-          "user.allowed_pm_users_instructions"
-        }}</div>
-    {{/if}}
+    </div>
+
+    <div
+      class="control-group user-allow-pm"
+      data-setting-name="user-allow-private-messages-from-specific-users"
+    >
+      <div class="controls">
+        <PreferenceCheckbox
+          @labelKey="user.allow_private_messages_from_specific_users"
+          @checked={{this.model.user_option.enable_allowed_pm_users}}
+          @disabled={{this.disableAllowPmUsersSetting}}
+        />
+      </div>
+      {{#if this.allowPmUsersEnabled}}
+        <div class="controls tracking-controls">
+          <UserChooser
+            @value={{this.allowedPmUsernames}}
+            @onChange={{action "onChangeAllowedPmUsernames"}}
+            @options={{hash excludeCurrentUser=true}}
+          />
+        </div>
+        <div class="instructions">{{i18n
+            "user.allowed_pm_users_instructions"
+          }}</div>
+      {{/if}}
+    </div>
   </div>
 {{/if}}
 
-<PluginOutlet
-  @name="user-custom-controls"
-  @tagName="span"
-  @connectorTagName="div"
-  @args={{hash model=this.model}}
-/>
+<span>
+  <PluginOutlet
+    @name="user-custom-controls"
+    @connectorTagName="div"
+    @outletArgs={{hash model=this.model}}
+  />
+</span>
 
 <SaveControls
   @model={{this.model}}
diff --git a/app/assets/javascripts/discourse/app/templates/privacy.hbs b/app/assets/javascripts/discourse/app/templates/privacy.hbs
new file mode 100644
index 00000000000..7108ee67f47
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/privacy.hbs
@@ -0,0 +1,7 @@
+<DSection @bodyClass="static-privacy" @class="container">
+  <div class="contents clearfix body-page">
+    <PluginOutlet @name="above-static" />
+    {{html-safe this.model.html}}
+    <PluginOutlet @name="below-static" />
+  </div>
+</DSection>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/review-index.hbs b/app/assets/javascripts/discourse/app/templates/review-index.hbs
index 722b32d9dcd..2804d1637c1 100644
--- a/app/assets/javascripts/discourse/app/templates/review-index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/review-index.hbs
@@ -28,12 +28,16 @@
 
     {{#if this.filtersExpanded}}
 
-      <PluginOutlet
-        @name="above-review-filters"
-        @tagName="span"
-        @connectorTagName="div"
-        @args={{hash model=this.model additionalFilters=this.additionalFilters}}
-      />
+      <span>
+        <PluginOutlet
+          @name="above-review-filters"
+          @connectorTagName="div"
+          @outletArgs={{hash
+            model=this.model
+            additionalFilters=this.additionalFilters
+          }}
+        />
+      </span>
 
       <div class="reviewable-filter">
         <label class="filter-label">{{i18n "review.filters.type.title"}}</label>
diff --git a/app/assets/javascripts/discourse/app/templates/review-topics.hbs b/app/assets/javascripts/discourse/app/templates/review-topics.hbs
index 286e391e0a7..5bed189751f 100644
--- a/app/assets/javascripts/discourse/app/templates/review-topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/review-topics.hbs
@@ -16,7 +16,7 @@
                 href={{rt.relative_url}}
                 rel="noopener noreferrer"
                 target="_blank"
-              >{{replace-emoji rt.fancy_title}}</a>
+              >{{replace-emoji rt.title}}</a>
             </div>
           </td>
           <td class="reviewable-count">
diff --git a/app/assets/javascripts/discourse/app/templates/static.hbs b/app/assets/javascripts/discourse/app/templates/static.hbs
deleted file mode 100644
index cb060af6703..00000000000
--- a/app/assets/javascripts/discourse/app/templates/static.hbs
+++ /dev/null
@@ -1,37 +0,0 @@
-<DSection @bodyClass={{this.bodyClass}} @class="container">
-  <WatchRead @action={{action "markFaqRead"}} @path={{this.model.path}}>
-    <div class="contents clearfix body-page">
-
-      <PluginOutlet
-        @name="above-static"
-        @tagName="span"
-        @connectorTagName="div"
-      />
-
-      {{html-safe this.model.html}}
-
-      <PluginOutlet @name="below-static" @connectorTagName="div" />
-
-      {{#if this.anyButtons}}
-        <div class="body-page-button-container">
-          {{#if this.showSignupButton}}
-            <DButton
-              @action={{route-action "showCreateAccount"}}
-              @class="btn-primary sign-up-button"
-              @label="sign_up"
-            />
-          {{/if}}
-
-          {{#if this.showLoginButton}}
-            <DButton
-              @action={{route-action "showLogin"}}
-              @class="btn-primary login-button"
-              @icon="user"
-              @label="log_in"
-            />
-          {{/if}}
-        </div>
-      {{/if}}
-    </div>
-  </WatchRead>
-</DSection>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/tag/show.hbs b/app/assets/javascripts/discourse/app/templates/tag/show.hbs
index 767a88a1d50..53289e6c310 100644
--- a/app/assets/javascripts/discourse/app/templates/tag/show.hbs
+++ b/app/assets/javascripts/discourse/app/templates/tag/show.hbs
@@ -13,11 +13,12 @@
     <DiscourseBanner @user={{this.currentUser}} @banner={{this.site.banner}} />
   </div>
 
-  <PluginOutlet
-    @name="discovery-list-controls-above"
-    @tagName="span"
-    @connectorTagName="div"
-  />
+  <span>
+    <PluginOutlet
+      @name="discovery-list-controls-above"
+      @connectorTagName="div"
+    />
+  </span>
 
   <div class="list-controls">
     <PluginOutlet
@@ -47,7 +48,7 @@
         <PluginOutlet
           @name="tag-navigation"
           @connectorTagName="div"
-          @args={{hash category=this.category tag=this.tag}}
+          @outletArgs={{hash category=this.category tag=this.tag}}
         />
       </section>
     </div>
@@ -61,12 +62,13 @@
     />
   {{/if}}
 
-  <PluginOutlet
-    @name="discovery-list-container-top"
-    @tagName="span"
-    @connectorTagName="div"
-    @args={{hash category=this.category}}
-  />
+  <span>
+    <PluginOutlet
+      @name="discovery-list-container-top"
+      @connectorTagName="div"
+      @outletArgs={{hash category=this.category}}
+    />
+  </span>
 
   <TopicDismissButtons
     @position="top"
@@ -77,11 +79,9 @@
     @resetNew={{action "resetNew"}}
   />
 
-  <PluginOutlet
-    @name="discovery-above"
-    @tagName="span"
-    @connectorTagName="div"
-  />
+  <span>
+    <PluginOutlet @name="discovery-above" @connectorTagName="div" />
+  </span>
 
   <div class="container list-container">
     <div class="row">
@@ -95,7 +95,6 @@
               @autoAddTopicsToBulkSelect={{this.autoAddTopicsToBulkSelect}}
               @bulkSelectEnabled={{this.bulkSelectEnabled}}
               @addTopicsToBulkSelect={{action "addTopicsToBulkSelect"}}
-              as |discoveryTopicList|
             >
               {{#if this.top}}
                 <div class="top-lists">
@@ -140,8 +139,6 @@
                   @order={{this.order}}
                   @ascending={{this.ascending}}
                   @changeSort={{action "changeSort"}}
-                  @onScroll={{discoveryTopicList.saveScrollPosition}}
-                  @scrollOnLoad={{true}}
                   @focusLastVisitedTopic={{true}}
                 />
               {{/if}}
@@ -178,9 +175,7 @@
     </div>
   </div>
 
-  <PluginOutlet
-    @name="discovery-below"
-    @tagName="span"
-    @connectorTagName="div"
-  />
+  <span>
+    <PluginOutlet @name="discovery-below" @connectorTagName="div" />
+  </span>
 </DSection>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/tags/index.hbs b/app/assets/javascripts/discourse/app/templates/tags/index.hbs
index a2afd799d84..949e000b89a 100644
--- a/app/assets/javascripts/discourse/app/templates/tags/index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/tags/index.hbs
@@ -11,12 +11,13 @@
   </div>
 </div>
 
-<PluginOutlet
-  @name="tags-below-title"
-  @connectorTagName="div"
-  @tagName="div"
-  @args={{hash model=this.model}}
-/>
+<div>
+  <PluginOutlet
+    @name="tags-below-title"
+    @connectorTagName="div"
+    @outletArgs={{hash model=this.model}}
+  />
+</div>
 
 <div class="tag-sort-options">
   {{i18n "tagging.sort_by"}}
diff --git a/app/assets/javascripts/discourse/app/templates/topic.hbs b/app/assets/javascripts/discourse/app/templates/topic.hbs
index 93b5a0987b1..aa269fe16bb 100644
--- a/app/assets/javascripts/discourse/app/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/topic.hbs
@@ -24,12 +24,16 @@
     <SharedDraftControls @topic={{this.model}} />
   {{/if}}
 
-  <PluginOutlet
-    @name="topic-above-post-stream"
-    @tagName="span"
-    @connectorTagName="div"
-    @args={{hash model=this.model editFirstPost=(action "editFirstPost")}}
-  />
+  <span>
+    <PluginOutlet
+      @name="topic-above-post-stream"
+      @connectorTagName="div"
+      @outletArgs={{hash
+        model=this.model
+        editFirstPost=(action "editFirstPost")
+      }}
+    />
+  </span>
 
   {{#if this.model.postStream.loaded}}
     {{#if this.model.postStream.firstPostPresent}}
@@ -68,16 +72,19 @@
                   filterable=true
                   categoryId=this.buffered.category_id
                   minimum=this.minimumRequiredTags
+                  filterPlaceholder="tagging.choose_for_topic"
+                  useHeaderFilter=true
                 }}
               />
             {{/if}}
 
-            <PluginOutlet
-              @name="edit-topic"
-              @tagName="span"
-              @connectorTagName="div"
-              @args={{hash model=this.model buffered=this.buffered}}
-            />
+            <span>
+              <PluginOutlet
+                @name="edit-topic"
+                @connectorTagName="div"
+                @outletArgs={{hash model=this.model buffered=this.buffered}}
+              />
+            </span>
 
             <div class="edit-controls">
               <DButton
@@ -148,8 +155,7 @@
 
             <PluginOutlet
               @name="topic-title-suffix"
-              @tagName=""
-              @args={{hash model=this.model}}
+              @outletArgs={{hash model=this.model}}
             />
           </h1>
 
@@ -216,74 +222,38 @@
         <PluginOutlet
           @name="topic-navigation"
           @connectorTagName="div"
-          @args={{hash topic=this.model}}
+          @outletArgs={{hash topic=this.model}}
         />
 
         {{#if info.renderTimeline}}
-          {{#if this.currentUser.redesigned_topic_timeline_enabled}}
-            <GlimmerTopicTimeline
-              @info={{info}}
-              @model={{this.model}}
-              @replyToPost={{action "replyToPost"}}
-              @showSummary={{action "showSummary"}}
-              @jumpToPostPrompt={{action "jumpToPostPrompt"}}
-              @enteredIndex={{this.enteredIndex}}
-              @prevEvent={{info.prevEvent}}
-              @jumpTop={{action "jumpTop"}}
-              @jumpBottom={{action "jumpBottom"}}
-              @jumpEnd={{action "jumpEnd"}}
-              @jumpToIndex={{action "jumpToIndex"}}
-              @toggleMultiSelect={{action "toggleMultiSelect"}}
-              @showTopicSlowModeUpdate={{route-action
-                "showTopicSlowModeUpdate"
-              }}
-              @deleteTopic={{action "deleteTopic"}}
-              @recoverTopic={{action "recoverTopic"}}
-              @toggleClosed={{action "toggleClosed"}}
-              @toggleArchived={{action "toggleArchived"}}
-              @toggleVisibility={{action "toggleVisibility"}}
-              @showTopicTimerModal={{route-action "showTopicTimerModal"}}
-              @showFeatureTopic={{route-action "showFeatureTopic"}}
-              @showChangeTimestamp={{route-action "showChangeTimestamp"}}
-              @resetBumpDate={{action "resetBumpDate"}}
-              @convertToPublicTopic={{action "convertToPublicTopic"}}
-              @convertToPrivateMessage={{action "convertToPrivateMessage"}}
-              @fullscreen={{info.topicProgressExpanded}}
-              @mobileView={{this.site.mobileView}}
-            />
-          {{else}}
-            <TopicTimeline
-              @topic={{this.model}}
-              @notificationLevel={{this.model.details.notification_level}}
-              @prevEvent={{info.prevEvent}}
-              @fullscreen={{info.topicProgressExpanded}}
-              @enteredIndex={{this.enteredIndex}}
-              @loading={{this.model.postStream.loading}}
-              @jumpToPost={{action "jumpToPost"}}
-              @jumpTop={{action "jumpTop"}}
-              @jumpBottom={{action "jumpBottom"}}
-              @jumpEnd={{action "jumpEnd"}}
-              @jumpToPostPrompt={{action "jumpToPostPrompt"}}
-              @jumpToIndex={{action "jumpToIndex"}}
-              @replyToPost={{action "replyToPost"}}
-              @showSummary={{action "showSummary"}}
-              @toggleMultiSelect={{action "toggleMultiSelect"}}
-              @showTopicSlowModeUpdate={{route-action
-                "showTopicSlowModeUpdate"
-              }}
-              @deleteTopic={{action "deleteTopic"}}
-              @recoverTopic={{action "recoverTopic"}}
-              @toggleClosed={{action "toggleClosed"}}
-              @toggleArchived={{action "toggleArchived"}}
-              @toggleVisibility={{action "toggleVisibility"}}
-              @showTopicTimerModal={{route-action "showTopicTimerModal"}}
-              @showFeatureTopic={{route-action "showFeatureTopic"}}
-              @showChangeTimestamp={{route-action "showChangeTimestamp"}}
-              @resetBumpDate={{action "resetBumpDate"}}
-              @convertToPublicTopic={{action "convertToPublicTopic"}}
-              @convertToPrivateMessage={{action "convertToPrivateMessage"}}
-            />
-          {{/if}}
+          <TopicTimeline
+            @info={{info}}
+            @model={{this.model}}
+            @replyToPost={{action "replyToPost"}}
+            @showTopReplies={{action "showTopReplies"}}
+            @jumpToPostPrompt={{action "jumpToPostPrompt"}}
+            @enteredIndex={{this.enteredIndex}}
+            @prevEvent={{info.prevEvent}}
+            @jumpTop={{action "jumpTop"}}
+            @jumpBottom={{action "jumpBottom"}}
+            @jumpEnd={{action "jumpEnd"}}
+            @jumpToIndex={{action "jumpToIndex"}}
+            @toggleMultiSelect={{action "toggleMultiSelect"}}
+            @showTopicSlowModeUpdate={{route-action "showTopicSlowModeUpdate"}}
+            @deleteTopic={{action "deleteTopic"}}
+            @recoverTopic={{action "recoverTopic"}}
+            @toggleClosed={{action "toggleClosed"}}
+            @toggleArchived={{action "toggleArchived"}}
+            @toggleVisibility={{action "toggleVisibility"}}
+            @showTopicTimerModal={{route-action "showTopicTimerModal"}}
+            @showFeatureTopic={{route-action "showFeatureTopic"}}
+            @showChangeTimestamp={{route-action "showChangeTimestamp"}}
+            @resetBumpDate={{action "resetBumpDate"}}
+            @convertToPublicTopic={{action "convertToPublicTopic"}}
+            @convertToPrivateMessage={{action "convertToPrivateMessage"}}
+            @fullscreen={{info.topicProgressExpanded}}
+            @mobileView={{this.site.mobileView}}
+          />
         {{else}}
           <TopicProgress
             @prevEvent={{info.prevEvent}}
@@ -291,12 +261,16 @@
             @expanded={{info.topicProgressExpanded}}
             @jumpToPost={{action "jumpToPost"}}
           >
-            <PluginOutlet
-              @name="before-topic-progress"
-              @tagName="span"
-              @connectorTagName="div"
-              @args={{hash model=this.model jumpToPost=(action "jumpToPost")}}
-            />
+            <span>
+              <PluginOutlet
+                @name="before-topic-progress"
+                @connectorTagName="div"
+                @outletArgs={{hash
+                  model=this.model
+                  jumpToPost=(action "jumpToPost")
+                }}
+              />
+            </span>
             <TopicAdminMenuButton
               @topic={{this.model}}
               @openUpwards="true"
@@ -329,12 +303,13 @@
               @condition={{this.model.postStream.loadingAbove}}
             />
 
-            <PluginOutlet
-              @name="topic-above-posts"
-              @tagName="span"
-              @connectorTagName="div"
-              @args={{hash model=this.model}}
-            />
+            <span>
+              <PluginOutlet
+                @name="topic-above-posts"
+                @connectorTagName="div"
+                @outletArgs={{hash model=this.model}}
+              />
+            </span>
 
             {{#unless this.model.postStream.loadingFilter}}
               <ScrollingPostStream
@@ -369,7 +344,7 @@
                 @unhidePost={{action "unhidePost"}}
                 @replyToPost={{action "replyToPost"}}
                 @toggleWiki={{action "toggleWiki"}}
-                @showSummary={{action "showSummary"}}
+                @showTopReplies={{action "showTopReplies"}}
                 @cancelFilter={{action "cancelFilter"}}
                 @removeAllowedUser={{action "removeAllowedUser"}}
                 @removeAllowedGroup={{action "removeAllowedGroup"}}
@@ -519,12 +494,13 @@
         <SignupCta />
       {{else}}
         {{#if this.currentUser}}
-          <PluginOutlet
-            @name="topic-above-footer-buttons"
-            @tagName="span"
-            @connectorTagName="div"
-            @args={{hash model=this.model}}
-          />
+          <span>
+            <PluginOutlet
+              @name="topic-above-footer-buttons"
+              @connectorTagName="div"
+              @outletArgs={{hash model=this.model}}
+            />
+          </span>
 
           <TopicFooterButtons
             @topic={{this.model}}
@@ -560,26 +536,15 @@
         {{/if}}
       {{/if}}
 
-      <PluginOutlet
-        @name="topic-above-suggested"
-        @tagName="span"
-        @connectorTagName="div"
-        @args={{hash model=this.model}}
-      />
-      <div
-        class="{{if
-            this.model.relatedMessages.length
-            'related-messages-wrapper'
-          }}
-          {{if this.model.suggestedTopics.length 'suggested-topics-wrapper'}}"
-      >
-        {{#if this.model.relatedMessages.length}}
-          <RelatedMessages @topic={{this.model}} />
-        {{/if}}
-        {{#if this.model.suggestedTopics.length}}
-          <SuggestedTopics @topic={{this.model}} />
-        {{/if}}
-      </div>
+      <span>
+        <PluginOutlet
+          @name="topic-above-suggested"
+          @connectorTagName="div"
+          @outletArgs={{hash model=this.model}}
+        />
+      </span>
+
+      <MoreTopics @topic={{this.model}} />
     {{/if}}
   {{else}}
     <div class="container">
@@ -618,6 +583,5 @@
     @selectText={{action "selectText"}}
     @editPost={{action "editPost"}}
     @topic={{this.model}}
-    @composerVisible={{this.composer.visible}}
   />
 </DiscourseTopic>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/tos.hbs b/app/assets/javascripts/discourse/app/templates/tos.hbs
new file mode 100644
index 00000000000..a334271b1f2
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/tos.hbs
@@ -0,0 +1,7 @@
+<DSection @bodyClass="static-tos" @class="container">
+  <div class="contents clearfix body-page">
+    <PluginOutlet @name="above-static" />
+    {{html-safe this.model.html}}
+    <PluginOutlet @name="below-static" />
+  </div>
+</DSection>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/app/templates/user-invited-show.hbs
index f429025a355..25cb311913a 100644
--- a/app/assets/javascripts/discourse/app/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user-invited-show.hbs
@@ -2,6 +2,7 @@
   {{#if this.canInviteToForum}}
     <LoadMore
       @class="user-content"
+      @id="user-content"
       @selector=".user-invite-list tr"
       @action={{action "loadMore"}}
     >
@@ -183,24 +184,26 @@
                       {{/if}}
                     </td>
 
-                    <td class="invite-actions">
-                      <DButton
-                        @class="btn-default"
-                        @icon="pencil-alt"
-                        @action={{action "editInvite" invite}}
-                        @title="user.invited.edit"
-                      />
-                      <DButton
-                        @icon="trash-alt"
-                        @class="cancel"
-                        @action={{action "destroyInvite" invite}}
-                        @title={{if
-                          invite.destroyed
-                          "user.invited.removed"
-                          "user.invited.remove"
-                        }}
-                      />
-                    </td>
+                    {{#if invite.can_delete_invite}}
+                      <td class="invite-actions">
+                        <DButton
+                          @class="btn-default"
+                          @icon="pencil-alt"
+                          @action={{action "editInvite" invite}}
+                          @title="user.invited.edit"
+                        />
+                        <DButton
+                          @icon="trash-alt"
+                          @class="cancel"
+                          @action={{action "destroyInvite" invite}}
+                          @title={{if
+                            invite.destroyed
+                            "user.invited.removed"
+                            "user.invited.remove"
+                          }}
+                        />
+                      </td>
+                    {{/if}}
                   </tr>
                 {{/each}}
               </tbody>
diff --git a/app/assets/javascripts/discourse/app/templates/user-invited.hbs b/app/assets/javascripts/discourse/app/templates/user-invited.hbs
index 1d3ebe4fe39..33a32a68135 100644
--- a/app/assets/javascripts/discourse/app/templates/user-invited.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user-invited.hbs
@@ -1,47 +1,25 @@
 {{#if this.can_see_invite_details}}
-  {{#if this.currentUser.redesigned_user_page_nav_enabled}}
-    <DSection @pageClass="user-invites" />
+  <DSection @pageClass="user-invites" />
 
-    <div class="user-navigation user-navigation-secondary">
-      <HorizontalOverflowNav>
-        <NavItem
-          @route="userInvited.show"
-          @routeParam="pending"
-          @i18nLabel={{this.pendingLabel}}
-        />
-        <NavItem
-          @route="userInvited.show"
-          @routeParam="expired"
-          @i18nLabel={{this.expiredLabel}}
-        />
-        <NavItem
-          @route="userInvited.show"
-          @routeParam="redeemed"
-          @i18nLabel={{this.redeemedLabel}}
-        />
-      </HorizontalOverflowNav>
-    </div>
-  {{else}}
-    <DSection @class="user-secondary-navigation" @pageClass="user-invites">
-      <MobileNav @class="invites-nav" @desktopClass="nav-stacked action-list">
-        <NavItem
-          @route="userInvited.show"
-          @routeParam="pending"
-          @i18nLabel={{this.pendingLabel}}
-        />
-        <NavItem
-          @route="userInvited.show"
-          @routeParam="expired"
-          @i18nLabel={{this.expiredLabel}}
-        />
-        <NavItem
-          @route="userInvited.show"
-          @routeParam="redeemed"
-          @i18nLabel={{this.redeemedLabel}}
-        />
-      </MobileNav>
-    </DSection>
-  {{/if}}
+  <div class="user-navigation user-navigation-secondary">
+    <HorizontalOverflowNav @ariaLabel="User secondary - invites">
+      <NavItem
+        @route="userInvited.show"
+        @routeParam="pending"
+        @i18nLabel={{this.pendingLabel}}
+      />
+      <NavItem
+        @route="userInvited.show"
+        @routeParam="expired"
+        @i18nLabel={{this.expiredLabel}}
+      />
+      <NavItem
+        @route="userInvited.show"
+        @routeParam="redeemed"
+        @i18nLabel={{this.redeemedLabel}}
+      />
+    </HorizontalOverflowNav>
+  </div>
 {{/if}}
 
 {{outlet}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/user-private-messages-group.hbs b/app/assets/javascripts/discourse/app/templates/user-private-messages-group.hbs
index f6a007d45cf..c4cb2e32b79 100644
--- a/app/assets/javascripts/discourse/app/templates/user-private-messages-group.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user-private-messages-group.hbs
@@ -1,44 +1,51 @@
 <UserNav::MessagesSecondaryNav>
-  <li class="messages-group-latest">
-    <LinkTo @route="userPrivateMessages.group.index" @model={{this.groupName}}>
-      {{d-icon "envelope"}}
-      <span>{{i18n "categories.latest"}}</span>
-    </LinkTo>
-  </li>
+
+  <DNavigationItem
+    @route="userPrivateMessages.group.index"
+    @ariaCurrentContext="subNav"
+    class="user-nav__messages-group-latest"
+  >
+    {{d-icon "envelope"}}
+    <span>{{i18n "categories.latest"}}</span>
+  </DNavigationItem>
 
   {{#if this.viewingSelf}}
-    <li class="messages-group-new">
-      <LinkTo
-        @route="userPrivateMessages.group.new"
-        @model={{this.groupName}}
-        class="new"
-      >
-        {{d-icon "exclamation-circle"}}
-        <span>{{this.newLinkText}}</span>
-      </LinkTo>
-    </li>
+    <DNavigationItem
+      @route="userPrivateMessages.group.new"
+      @ariaCurrentContext="subNav"
+      class="user-nav__messages-group-new"
+    >
+      {{d-icon "exclamation-circle"}}
+      <span>{{this.newLinkText}}</span>
+    </DNavigationItem>
 
-    <li class="messages-group-unread">
-      <LinkTo
-        @route="userPrivateMessages.group.unread"
-        @model={{this.groupName}}
-        class="unread"
-      >
-        {{d-icon "plus-circle"}}
-        <span>{{this.unreadLinkText}}</span>
-      </LinkTo>
-    </li>
+    <DNavigationItem
+      @route="userPrivateMessages.group.unread"
+      @ariaCurrentContext="subNav"
+      class="user-nav__messages-group-unread"
+    >
+      {{d-icon "plus-circle"}}
+      <span>{{this.unreadLinkText}}</span>
+    </DNavigationItem>
 
-    <li class="messages-group-archive">
-      <LinkTo
-        @route="userPrivateMessages.group.archive"
-        @model={{this.groupName}}
-      >
-        {{d-icon "archive"}}
-        <span>{{i18n "user.messages.archive"}}</span>
-      </LinkTo>
-    </li>
+    <DNavigationItem
+      @route="userPrivateMessages.group.archive"
+      @ariaCurrentContext="subNav"
+      class="user-nav__messages-group-archive"
+    >
+      {{d-icon "archive"}}
+      <span>{{i18n "user.messages.archive"}}</span>
+    </DNavigationItem>
   {{/if}}
 </UserNav::MessagesSecondaryNav>
 
-{{outlet}}
\ No newline at end of file
+{{#in-element this.navigationControlsButton}}
+  <GroupNotificationsButton
+    @value={{this.group.group_user.notification_level}}
+    @onChange={{this.changeGroupNotificationLevel}}
+  />
+{{/in-element}}
+
+<div class="group-messages group-{{this.group.name}}">
+  {{outlet}}
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/user-private-messages-user.hbs b/app/assets/javascripts/discourse/app/templates/user-private-messages-user.hbs
index 0ddb6b1ee0d..869e93780d4 100644
--- a/app/assets/javascripts/discourse/app/templates/user-private-messages-user.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user-private-messages-user.hbs
@@ -5,50 +5,54 @@
 {{/if}}
 
 <UserNav::MessagesSecondaryNav>
-  <li class="messages-latest">
-    <LinkTo @route="userPrivateMessages.user.index" @model={{this.model}}>
-      {{d-icon "envelope"}}
-      <span>{{i18n "categories.latest"}}</span>
-    </LinkTo>
-  </li>
+  <DNavigationItem
+    @route="userPrivateMessages.user.index"
+    @ariaCurrentContext="subNav"
+    class="user-nav__messages-latest"
+  >
+    {{d-icon "envelope"}}
+    <span>{{i18n "categories.latest"}}</span>
+  </DNavigationItem>
 
-  <li class="messages-sent">
-    <LinkTo @route="userPrivateMessages.user.sent" @model={{this.model}}>
-      {{d-icon "reply"}}
-      <span>{{i18n "user.messages.sent"}}</span>
-    </LinkTo>
-  </li>
+  <DNavigationItem
+    @route="userPrivateMessages.user.sent"
+    @ariaCurrentContext="subNav"
+    class="user-nav__messages-sent"
+  >
+    {{d-icon "reply"}}
+    <span>{{i18n "user.messages.sent"}}</span>
+  </DNavigationItem>
 
   {{#if this.viewingSelf}}
-    <li class="messages-new">
-      <LinkTo
-        @route="userPrivateMessages.user.new"
-        @model={{this.model}}
-        class="new"
-      >
-        {{d-icon "exclamation-circle"}}
-        <span>{{this.newLinkText}}</span>
-      </LinkTo>
-    </li>
+    <DNavigationItem
+      @route="userPrivateMessages.user.new"
+      @ariaCurrentContext="subNav"
+      class="user-nav__messages-new"
+    >
+      {{d-icon "exclamation-circle"}}
+      <span>{{this.newLinkText}}</span>
+    </DNavigationItem>
+
+    <DNavigationItem
+      @route="userPrivateMessages.user.unread"
+      @ariaCurrentContext="subNav"
+      class="user-nav__messages-unread"
+    >
+      {{d-icon "plus-circle"}}
+      <span>{{this.unreadLinkText}}</span>
+    </DNavigationItem>
 
-    <li class="messages-unread">
-      <LinkTo
-        @route="userPrivateMessages.user.unread"
-        @model={{this.model}}
-        class="unread"
-      >
-        {{d-icon "plus-circle"}}
-        <span>{{this.unreadLinkText}}</span>
-      </LinkTo>
-    </li>
   {{/if}}
 
-  <li class="messages-archive">
-    <LinkTo @route="userPrivateMessages.user.archive" @model={{this.model}}>
-      {{d-icon "archive"}}
-      <span>{{i18n "user.messages.archive"}}</span>
-    </LinkTo>
-  </li>
+  <DNavigationItem
+    @route="userPrivateMessages.user.archive"
+    @ariaCurrentContext="subNav"
+    class="user-nav__messages-archive"
+  >
+    {{d-icon "archive"}}
+    <span>{{i18n "user.messages.archive"}}</span>
+  </DNavigationItem>
+
 </UserNav::MessagesSecondaryNav>
 
 {{outlet}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/user-selector-autocomplete.hbr b/app/assets/javascripts/discourse/app/templates/user-selector-autocomplete.hbr
deleted file mode 100644
index 90db6c3907d..00000000000
--- a/app/assets/javascripts/discourse/app/templates/user-selector-autocomplete.hbr
+++ /dev/null
@@ -1,47 +0,0 @@
-<div class='autocomplete ac-user'>
-  <ul>
-    {{#each options.users as |user|}}
-      <li>
-        <a href title="{{user.name}}" class="{{user.cssClasses}}">
-          {{avatar user imageSize="tiny"}}
-          <span class='username'>{{format-username user.username}}</span>
-          {{#if user.name}}
-            <span class='name'>{{user.name}}</span>
-          {{/if}}
-          {{#if user.status}}
-            {{emoji user.status.emoji}}
-            <span class='status-description' title='{{user.status.description}}'>
-              {{user.status.description}}
-            </span>
-            {{#if user.status.ends_at}}
-              {{format-age user.status.ends_at}}
-            {{/if}}
-          {{/if}}
-        </a>
-      </li>
-    {{/each}}
-
-    {{#if options.emails}}
-      {{#each options.emails as |email|}}
-        <li>
-          <a href title="{{email.username}}">
-            {{d-icon 'envelope'}}
-            <span class='username'>{{format-username email.username}}</span>
-          </a>
-        </li>
-      {{/each}}
-    {{/if}}
-
-    {{#if options.groups}}
-      {{#each options.groups as |group|}}
-        <li>
-          <a href title="{{group.full_name}}">
-            {{d-icon "users"}}
-            <span class='username'>{{group.name}}</span>
-            <span class='name'>{{group.full_name}}</span>
-          </a>
-        </li>
-      {{/each}}
-    {{/if}}
-  </ul>
-</div>
diff --git a/app/assets/javascripts/discourse/app/templates/user-topics-list.hbs b/app/assets/javascripts/discourse/app/templates/user-topics-list.hbs
index cdc84cb42e0..e1a46665d13 100644
--- a/app/assets/javascripts/discourse/app/templates/user-topics-list.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user-topics-list.hbs
@@ -43,9 +43,7 @@
       @bulkSelectAction={{action "refresh"}}
       @selected={{this.selected}}
       @tagsForUser={{this.tagsForUser}}
-      @onScroll={{this.saveScrollPosition}}
       @canBulkSelect={{this.canBulkSelect}}
-      @scrollOnLoad={{true}}
       @toggleBulkSelect={{action "toggleBulkSelect"}}
       @updateAutoAddTopicsToBulkSelect={{action
         "updateAutoAddTopicsToBulkSelect"
diff --git a/app/assets/javascripts/discourse/app/templates/user.hbs b/app/assets/javascripts/discourse/app/templates/user.hbs
index 803efde906a..0e08cef4409 100644
--- a/app/assets/javascripts/discourse/app/templates/user.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user.hbs
@@ -1,7 +1,7 @@
 <PluginOutlet
   @name="above-user-profile"
   @connectorTagName="div"
-  @args={{hash model=this.model}}
+  @outletArgs={{hash model=this.model}}
 />
 <div
   class="container
@@ -10,6 +10,9 @@
     {{this.primaryGroup}}"
 >
   <DSection @class="user-main">
+    <a href="#user-content" id="skip-link" class="skip-link__user-nav">
+      {{i18n "skip_user_nav"}}
+    </a>
     <section
       class="{{if this.collapsedInfo 'collapsed-info'}}
         about
@@ -19,11 +22,15 @@
         {{#if this.showStaffCounters}}
           <div class="staff-counters">
             {{#if this.model.number_of_flags_given}}
-              <div><span
-                  class="helpful-flags"
-                >{{this.model.number_of_flags_given}}</span>{{i18n
-                  "user.staff_counters.flags_given"
-                }}</div>
+              <div>
+                {{html-safe
+                  (i18n
+                    "user.staff_counters.flags_given"
+                    className="helpful-flags"
+                    count=this.model.number_of_flags_given
+                  )
+                }}
+              </div>
             {{/if}}
             {{#if this.model.number_of_flagged_posts}}
               <div>
@@ -31,14 +38,16 @@
                   @route="review"
                   @query={{hash
                     username=this.model.username
-                    status="all"
+                    status="approved"
                     type="ReviewableFlaggedPost"
                   }}
                 >
-                  <span
-                    class="flagged-posts"
-                  >{{this.model.number_of_flagged_posts}}</span>{{i18n
-                    "user.staff_counters.flagged_posts"
+                  {{html-safe
+                    (i18n
+                      "user.staff_counters.flagged_posts"
+                      className="flagged-posts"
+                      count=this.model.number_of_flagged_posts
+                    )
                   }}
                 </LinkTo>
               </div>
@@ -53,10 +62,12 @@
                     type="ReviewableQueuedPost"
                   }}
                 >
-                  <span
-                    class="flagged-posts"
-                  >{{this.model.number_of_rejected_posts}}</span>{{i18n
-                    "user.staff_counters.rejected_posts"
+                  {{html-safe
+                    (i18n
+                      "user.staff_counters.rejected_posts"
+                      className="flagged-posts"
+                      count=this.model.number_of_rejected_posts
+                    )
                   }}
                 </LinkTo>
               </div>
@@ -65,10 +76,12 @@
             {{#if this.model.number_of_deleted_posts}}
               <div>
                 <LinkTo @route="user.deletedPosts" @model={{this.model}}>
-                  <span
-                    class="deleted-posts"
-                  >{{this.model.number_of_deleted_posts}}</span>{{i18n
-                    "user.staff_counters.deleted_posts"
+                  {{html-safe
+                    (i18n
+                      "user.staff_counters.deleted_posts"
+                      className="deleted-posts"
+                      count=this.model.number_of_deleted_posts
+                    )
                   }}
                 </LinkTo>
               </div>
@@ -76,10 +89,12 @@
             {{#if this.model.number_of_suspensions}}
               <div>
                 <a href {{on "click" this.showSuspensions}}>
-                  <span
-                    class="suspensions"
-                  >{{this.model.number_of_suspensions}}</span>{{i18n
-                    "user.staff_counters.suspensions"
+                  {{html-safe
+                    (i18n
+                      "user.staff_counters.suspensions"
+                      className="suspensions"
+                      count=this.model.number_of_suspensions
+                    )
                   }}
                 </a>
               </div>
@@ -90,10 +105,13 @@
                   @route="userPrivateMessages.user.warnings"
                   @model={{this.model}}
                 >
-                  <span
-                    class="warnings-received"
-                  >{{this.model.warnings_received_count}}</span>
-                  {{i18n "user.staff_counters.warnings_received"}}
+                  {{html-safe
+                    (i18n
+                      "user.staff_counters.warnings_received"
+                      className="warnings-received"
+                      count=this.model.warnings_received_count
+                    )
+                  }}
                 </LinkTo>
               </div>
             {{/if}}
@@ -108,68 +126,15 @@
         <div class="primary">
           <PluginOutlet
             @name="before-user-profile-avatar"
-            @args={{hash model=this.model}}
+            @outletArgs={{hash model=this.model}}
           />
           <UserProfileAvatar @user={{this.model}} @tagName="" />
-          <section class="controls">
-            <ul>
-              {{#if this.model.can_send_private_message_to_user}}
-                <li>
-                  <DButton
-                    @class="btn-primary compose-pm"
-                    @action={{route-action "composePrivateMessage" this.model}}
-                    @icon="envelope"
-                    @label="user.private_message"
-                  />
-                </li>
-              {{/if}}
-
-              {{#if this.canMuteOrIgnoreUser}}
-                <li>
-                  <UserNotificationsDropdown
-                    @user={{this.model}}
-                    @value={{this.userNotificationLevel}}
-                    @updateNotificationLevel={{action
-                      "updateNotificationLevel"
-                    }}
-                  />
-                </li>
-              {{/if}}
-
-              {{#if this.displayTopLevelAdminButton}}
-                <li><a
-                    href={{this.model.adminPath}}
-                    class="btn btn-default"
-                  >{{d-icon "wrench"}}<span class="d-button-label">{{i18n
-                        "admin.user.show_admin_profile"
-                      }}</span></a></li>
-              {{/if}}
-
-              <PluginOutlet
-                @name="user-profile-controls"
-                @connectorTagName="li"
-                @args={{hash model=this.model}}
-              />
-
-              {{#if this.canExpandProfile}}
-                <li>
-                  <DButton
-                    @ariaExpanded={{this.collapsedInfoState.isExpanded}}
-                    @ariaLabel={{this.collapsedInfoState.ariaLabel}}
-                    @ariaControls="collapsed-info-panel"
-                    @class="btn-default"
-                    @label={{concat "user." this.collapsedInfoState.label}}
-                    @icon={{this.collapsedInfoState.icon}}
-                    @action={{action this.collapsedInfoState.action}}
-                  />
-                </li>
-              {{/if}}
-            </ul>
-          </section>
-
           <div class="primary-textual">
             <div class="user-profile-names">
-              <h1 class={{if this.nameFirst "full-name" "username"}}>
+              <div
+                class="{{if this.nameFirst 'full-name' 'username'}}
+                  user-profile-names__primary"
+              >
                 {{if
                   this.nameFirst
                   this.model.name
@@ -179,49 +144,60 @@
                 {{#if this.model.status}}
                   <UserStatusMessage @status={{this.model.status}} />
                 {{/if}}
-              </h1>
-              <h2 class={{if this.nameFirst "username" "full-name"}}>{{#if
+              </div>
+              <div
+                class="{{if this.nameFirst 'username' 'full-name'}}
+                  user-profile-names__secondary"
+              >{{#if
                   this.nameFirst
-                }}{{this.model.username}}{{else}}{{this.model.name}}{{/if}}</h2>
+                }}{{this.model.username}}{{else}}{{this.model.name}}{{/if}}</div>
               {{#if this.model.staged}}
-                <h2 class="staged">{{i18n "user.staged"}}</h2>
+                <div class="staged user-profile-names__secondary">{{i18n
+                    "user.staged"
+                  }}</div>
               {{/if}}
               {{#if this.model.title}}
-                <h3>{{this.model.title}}</h3>
+                <div
+                  class="user-profile-names__title"
+                >{{this.model.title}}</div>
               {{/if}}
-              <PluginOutlet
-                @name="user-post-names"
-                @tagName="span"
-                @connectorTagName="div"
-                @args={{hash model=this.model}}
-              />
+              <span>
+                <PluginOutlet
+                  @name="user-post-names"
+                  @connectorTagName="div"
+                  @outletArgs={{hash model=this.model}}
+                />
+              </span>
             </div>
 
             {{#if this.showFeaturedTopic}}
-              <h3 class="featured-topic">
-                <span>{{i18n "user.featured_topic"}}</span>
-                <LinkTo
+              <div class="featured-topic user-profile__featured-topic">
+                <span title={{i18n "user.featured_topic"}}>
+                  {{d-icon "book"~}}
+                </span><LinkTo
                   @route="topic"
                   @models={{array
                     this.model.featured_topic.slug
                     this.model.featured_topic.id
                   }}
-                >{{html-safe
-                    (replace-emoji this.model.featured_topic.fancy_title)
+                >{{replace-emoji
+                    (html-safe this.model.featured_topic.fancy_title)
                   }}</LinkTo>
-              </h3>
+              </div>
             {{/if}}
 
-            <h3 class="location-and-website">
+            <div
+              class="location-and-website user-profile__location-and-website"
+            >
               {{#if this.model.location}}<div
                   class="user-profile-location"
-                >{{d-icon "map-marker-alt"}}
+                >{{d-icon "map-marker-alt"~}}
                   {{this.model.location}}</div>{{/if}}
               {{#if this.model.website_name}}
                 <div class="user-profile-website">
-                  {{d-icon "globe"}}
-                  {{#if this.linkWebsite}}
-                    {{! template-lint-disable  }}
+                  {{! template-lint-disable link-rel-noopener }}
+                  {{d-icon "globe"~}}
+                  {{#if this.linkWebsite~}}
                     <a
                       href={{this.model.website}}
                       rel="noopener {{unless
@@ -235,15 +211,17 @@
                       title={{this.model.website}}
                     >{{this.model.website_name}}</span>
                   {{/if}}
+                  {{! template-lint-enable link-rel-noopener }}
                 </div>
               {{/if}}
-              <PluginOutlet
-                @name="user-location-and-website"
-                @tagName="span"
-                @connectorTagName="div"
-                @args={{hash model=this.model}}
-              />
-            </h3>
+              <span>
+                <PluginOutlet
+                  @name="user-location-and-website"
+                  @connectorTagName="div"
+                  @outletArgs={{hash model=this.model}}
+                />
+              </span>
+            </div>
 
             <div class="bio">
               {{#if this.model.suspended}}
@@ -291,50 +269,111 @@
                   {{/if}}
                 {{/each}}
 
-                <PluginOutlet
-                  @name="user-profile-public-fields"
-                  @tagName="span"
-                  @connectorTagName="div"
-                  @args={{hash
-                    publicUserFields=this.publicUserFields
-                    model=this.model
-                  }}
-                />
+                <span>
+                  <PluginOutlet
+                    @name="user-profile-public-fields"
+                    @connectorTagName="div"
+                    @outletArgs={{hash
+                      publicUserFields=this.publicUserFields
+                      model=this.model
+                    }}
+                  />
+                </span>
               </div>
             {{/if}}
 
-            <PluginOutlet
-              @name="user-profile-primary"
-              @tagName="span"
-              @connectorTagName="div"
-              @args={{hash model=this.model}}
-            />
+            <span>
+              <PluginOutlet
+                @name="user-profile-primary"
+                @connectorTagName="div"
+                @outletArgs={{hash model=this.model}}
+              />
+            </span>
           </div>
+
+          <section class="controls">
+            <ul>
+              {{#if this.model.can_send_private_message_to_user}}
+                <li>
+                  <DButton
+                    @class="btn-primary compose-pm"
+                    @action={{route-action "composePrivateMessage" this.model}}
+                    @icon="envelope"
+                    @label="user.private_message"
+                  />
+                </li>
+              {{/if}}
+
+              {{#if this.canMuteOrIgnoreUser}}
+                <li>
+                  <UserNotificationsDropdown
+                    @user={{this.model}}
+                    @value={{this.userNotificationLevel}}
+                    @updateNotificationLevel={{action
+                      "updateNotificationLevel"
+                    }}
+                  />
+                </li>
+              {{/if}}
+
+              {{#if this.displayTopLevelAdminButton}}
+                <li><a
+                    href={{this.model.adminPath}}
+                    class="btn btn-default user-admin"
+                  >{{d-icon "wrench"}}<span class="d-button-label">{{i18n
+                        "admin.user.show_admin_profile"
+                      }}</span></a></li>
+              {{/if}}
+
+              <PluginOutlet
+                @name="user-profile-controls"
+                @connectorTagName="li"
+                @outletArgs={{hash model=this.model}}
+              />
+
+              {{#if this.canExpandProfile}}
+                <li>
+                  <DButton
+                    @ariaExpanded={{this.collapsedInfoState.isExpanded}}
+                    @ariaLabel={{this.collapsedInfoState.ariaLabel}}
+                    @ariaControls="collapsed-info-panel"
+                    @class="btn-default"
+                    @label={{concat "user." this.collapsedInfoState.label}}
+                    @icon={{this.collapsedInfoState.icon}}
+                    @action={{action this.collapsedInfoState.action}}
+                  />
+                </li>
+              {{/if}}
+            </ul>
+          </section>
         </div>
         <PluginOutlet
           @name="user-profile-above-collapsed-info"
-          @args={{hash model=this.model collapsedInfo=this.collapsedInfo}}
+          @outletArgs={{hash model=this.model collapsedInfo=this.collapsedInfo}}
         />
         {{#unless this.collapsedInfo}}
           <div class="secondary" id="collapsed-info-panel">
             <dl>
               {{#if this.model.created_at}}
-                <div><dt>{{i18n "user.created"}}</dt><dd>{{bound-date
-                      this.model.created_at
-                    }}</dd></div>
+                <div><dt class="created-at">{{i18n "user.created"}}</dt><dd
+                    class="created-at"
+                  >{{bound-date this.model.created_at}}</dd></div>
               {{/if}}
               {{#if this.model.last_posted_at}}
-                <div><dt>{{i18n "user.last_posted"}}</dt><dd>{{bound-date
+                <div><dt class="last-posted-at">{{i18n
+                      "user.last_posted"
+                    }}</dt><dd class="last-posted-at">{{bound-date
                       this.model.last_posted_at
                     }}</dd></div>
               {{/if}}
               {{#if this.model.last_seen_at}}
-                <div><dt>{{i18n "user.last_seen"}}</dt><dd>{{bound-date
-                      this.model.last_seen_at
-                    }}</dd></div>
+                <div><dt class="last-seen-at">{{i18n "user.last_seen"}}</dt><dd
+                    class="last-seen-at"
+                  >{{bound-date this.model.last_seen_at}}</dd></div>
               {{/if}}
               {{#if this.model.profile_view_count}}
-                <div><dt>{{i18n "views"}}</dt><dd
+                <div><dt class="profile-view-count">{{i18n "views"}}</dt><dd
+                    class="profile-view-count"
                   >{{this.model.profile_view_count}}</dd></div>
               {{/if}}
               {{#if this.model.invited_by}}
@@ -345,14 +384,14 @@
                       @model={{this.model.invited_by}}
                     >{{this.model.invited_by.username}}</LinkTo></dd></div>
               {{/if}}
-              {{#if this.model.trust_level}}
+              {{#if this.hasTrustLevel}}
                 <div><dt class="trust-level">{{i18n "user.trust_level"}}</dt><dd
                     class="trust-level"
                   >{{this.model.trustLevel.name}}</dd></div>
               {{/if}}
               {{#if this.canCheckEmails}}
-                <div><dt>{{i18n "user.email.title"}}</dt>
-                  <dd title={{this.model.email}}>
+                <div><dt class="email">{{i18n "user.email.title"}}</dt>
+                  <dd class="email" title={{this.model.email}}>
                     {{#if this.model.email}}
                       {{this.model.email}}
                     {{else}}
@@ -402,90 +441,32 @@
             </dl>
             <PluginOutlet
               @name="user-profile-secondary"
-              @tagName="span"
               @connectorTagName="div"
-              @args={{hash model=this.model}}
+              @outletArgs={{hash model=this.model}}
             />
           </div>
         {{/unless}}
       </div>
     </section>
 
-    {{#if this.currentUser.redesigned_user_page_nav_enabled}}
-      <div class="new-user-wrapper">
-        <UserNav
-          @user={{this.model}}
-          @showNotificationsTab={{this.showNotificationsTab}}
-          @showPrivateMessages={{this.showPrivateMessages}}
-          @canInviteToForum={{this.canInviteToForum}}
-          @showBadges={{this.showBadges}}
-          @currentParentRoute={{this.currentParentRoute}}
-          @showRead={{this.showRead}}
-          @showDrafts={{this.showDrafts}}
-          @showBookmarks={{this.showBookmarks}}
-        />
-
-        <div class="new-user-content-wrapper">
-          {{outlet}}
-        </div>
-      </div>
-    {{else}}
-      <div class="user-content-wrapper">
-        <section class="user-primary-navigation">
-          <MobileNav @class="main-nav" @desktopClass="nav nav-pills user-nav">
-            {{#unless this.model.profile_hidden}}
-              <li class="summary"><LinkTo @route="user.summary">{{i18n
-                    "user.summary.title"
-                  }}</LinkTo></li>
-              <li class="activity"><LinkTo @route="userActivity">{{i18n
-                    "user.activity_stream"
-                  }}</LinkTo></li>
-            {{/unless}}
-
-            {{#if this.showNotificationsTab}}
-              <li class="user-notifications">
-                <LinkTo @route="userNotifications">
-                  {{d-icon "bell" class="glyph"}}{{i18n "user.notifications"}}
-                </LinkTo>
-              </li>
-            {{/if}}
-
-            {{#if this.showPrivateMessages}}
-              <li class="private-messages"><LinkTo
-                  @route="userPrivateMessages"
-                >{{d-icon "envelope"}}{{i18n
-                    "user.private_messages"
-                  }}</LinkTo></li>
-            {{/if}}
-
-            {{#if this.canInviteToForum}}
-              <li class="invited"><LinkTo @route="userInvited">{{d-icon
-                    "user-plus"
-                  }}{{i18n "user.invited.title"}}</LinkTo></li>
-            {{/if}}
-
-            {{#if this.showBadges}}
-              <li class="badges"><LinkTo @route="user.badges">{{d-icon
-                    "certificate"
-                  }}{{i18n "badges.title"}}</LinkTo></li>
-            {{/if}}
-
-            <PluginOutlet
-              @name="user-main-nav"
-              @connectorTagName="li"
-              @args={{hash model=this.model}}
-            />
-
-            {{#if this.model.can_edit}}
-              <li class="preferences"><LinkTo @route="preferences">{{d-icon
-                    "cog"
-                  }}{{i18n "user.preferences"}}</LinkTo></li>
-            {{/if}}
-          </MobileNav>
-        </section>
+    <div class="new-user-wrapper">
+      <UserNav
+        @user={{this.model}}
+        @isStaff={{this.currentUser.staff}}
+        @isMobileView={{this.site.mobileView}}
+        @showNotificationsTab={{this.showNotificationsTab}}
+        @showPrivateMessages={{this.showPrivateMessages}}
+        @canInviteToForum={{this.canInviteToForum}}
+        @showBadges={{this.showBadges}}
+        @currentParentRoute={{this.currentParentRoute}}
+        @showRead={{this.showRead}}
+        @showDrafts={{this.showDrafts}}
+        @showBookmarks={{this.showBookmarks}}
+      />
 
+      <div class="new-user-content-wrapper">
         {{outlet}}
       </div>
-    {{/if}}
+    </div>
   </DSection>
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/user/activity.hbs b/app/assets/javascripts/discourse/app/templates/user/activity.hbs
index cfbbdc52151..574930b5d8e 100644
--- a/app/assets/javascripts/discourse/app/templates/user/activity.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/activity.hbs
@@ -1,93 +1,95 @@
-{{#if this.currentUser.redesigned_user_page_nav_enabled}}
-  <DSection @pageClass="user-activity" />
+<DSection @pageClass="user-activity" />
 
-  <div class="user-navigation user-navigation-secondary">
-    <HorizontalOverflowNav>
-      <UserNav::ActivityNav
-        @user={{this.user}}
-        @viewingSelf={{this.viewingSelf}}
-        @model={{this.model}}
-        @siteSettings={{this.siteSettings}}
-        @draftLabel={{this.draftLabel}}
-        @pendingLabel={{this.pendingLabel}}
-      />
-    </HorizontalOverflowNav>
-  </div>
+<div class="user-navigation user-navigation-secondary">
+  <HorizontalOverflowNav @ariaLabel="User secondary - activity">
+    <DNavigationItem
+      @route="userActivity.index"
+      @ariaCurrentContext="subNav"
+      class="user-nav__activity-all"
+    >
+      {{d-icon "stream"}}
+      <span>{{i18n "user.filters.all"}}</span>
+    </DNavigationItem>
 
-{{else}}
-  <DSection
-    @pageClass="user-activity"
-    @class="user-secondary-navigation"
-    @scrollTop={{false}}
-  >
-    <nav role="navigation">
-      <MobileNav
-        @class="activity-nav"
-        @desktopClass="action-list activity-list nav-stacked"
+    <DNavigationItem
+      @route="userActivity.topics"
+      @ariaCurrentContext="subNav"
+      class="user-nav__activity-topics"
+    >
+      {{d-icon "list-ul"}}
+      <span>{{i18n "user_action_groups.4"}}</span>
+    </DNavigationItem>
+    <DNavigationItem
+      @route="userActivity.replies"
+      @ariaCurrentContext="subNav"
+      class="user-nav__activity-replies"
+    >
+      {{d-icon "reply"}}
+      <span>{{i18n "user_action_groups.5"}}</span>
+    </DNavigationItem>
+
+    {{#if this.user.showRead}}
+      <DNavigationItem
+        @route="userActivity.read"
+        @ariaCurrentContext="subNav"
+        class="user-nav__activity-read"
+        title={{i18n "user.read_help"}}
       >
-        <DNavigationItem @route="userActivity.index">{{i18n
-            "user.filters.all"
-          }}</DNavigationItem>
-        <DNavigationItem @route="userActivity.topics">{{i18n
-            "user_action_groups.4"
-          }}</DNavigationItem>
-        <DNavigationItem @route="userActivity.replies">{{i18n
-            "user_action_groups.5"
-          }}</DNavigationItem>
+        {{d-icon "history"}}
+        <span>{{i18n "user.read"}}</span>
+      </DNavigationItem>
+    {{/if}}
 
-        {{#if this.user.showRead}}
-          <DNavigationItem
-            @route="userActivity.read"
-            @title={{i18n "user.read_help"}}
-          >
-            {{i18n "user.read"}}
-          </DNavigationItem>
-        {{/if}}
+    {{#if this.user.showDrafts}}
+      <DNavigationItem
+        @route="userActivity.drafts"
+        @ariaCurrentContext="subNav"
+        class="user-nav__activity-drafts"
+      >
+        {{d-icon "pencil-alt"}}
+        <span>{{this.draftLabel}}</span>
+      </DNavigationItem>
+    {{/if}}
 
-        {{#if this.user.showDrafts}}
-          <DNavigationItem @route="userActivity.drafts">
-            {{this.draftLabel}}
-          </DNavigationItem>
-        {{/if}}
+    {{#if (gt this.model.pending_posts_count 0)}}
+      <DNavigationItem
+        @route="userActivity.pending"
+        @ariaCurrentContext="subNav"
+        class="user-nav__activity-pending"
+      >
+        {{d-icon "clock"}}
+        <span>{{this.pendingLabel}}</span>
+      </DNavigationItem>
+    {{/if}}
 
-        {{#if (gt this.model.pending_posts_count 0)}}
-          <DNavigationItem @route="userActivity.pending">
-            {{this.pendingLabel}}
-          </DNavigationItem>
-        {{/if}}
+    <DNavigationItem
+      @route="userActivity.likesGiven"
+      @ariaCurrentContext="subNav"
+      class="user-nav__activity-likes"
+    >
+      {{d-icon "heart"}}
+      <span>{{i18n "user_action_groups.1"}}</span>
+    </DNavigationItem>
 
-        <DNavigationItem @route="userActivity.likesGiven">{{i18n
-            "user_action_groups.1"
-          }}</DNavigationItem>
+    {{#if this.user.showBookmarks}}
+      <DNavigationItem
+        @route="userActivity.bookmarks"
+        @ariaCurrentContext="subNav"
+        class="user-nav__activity-bookmarks"
+      >
+        {{d-icon "bookmark"}}
+        <span>{{i18n "user_action_groups.3"}}</span>
+      </DNavigationItem>
+    {{/if}}
 
-        {{#if this.user.showBookmarks}}
-          <DNavigationItem @route="userActivity.bookmarks">{{i18n
-              "user_action_groups.3"
-            }}</DNavigationItem>
-        {{/if}}
+    <PluginOutlet
+      @name="user-activity-bottom"
+      @connectorTagName="li"
+      @outletArgs={{hash model=this.model}}
+    />
+  </HorizontalOverflowNav>
+</div>
 
-        <PluginOutlet
-          @name="user-activity-bottom"
-          @tagName="span"
-          @connectorTagName="li"
-          @args={{hash model=this.model}}
-        />
-      </MobileNav>
-    </nav>
-  </DSection>
-
-  {{#if this.canDownloadPosts}}
-    <section class="user-additional-controls">
-      <DButton
-        @action={{action "exportUserArchive"}}
-        @class="btn-default"
-        @label="user.download_archive.button_text"
-        @icon="download"
-      />
-    </section>
-  {{/if}}
-{{/if}}
-
-<section class="user-content">
+<section class="user-content" id="user-content">
   {{outlet}}
 </section>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/user/badges.hbs b/app/assets/javascripts/discourse/app/templates/user/badges.hbs
index 00dd25bc3bb..b98331b7f53 100644
--- a/app/assets/javascripts/discourse/app/templates/user/badges.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/badges.hbs
@@ -1,4 +1,4 @@
-<DSection @pageClass="user-badges" @class="user-content">
+<DSection @pageClass="user-badges" @class="user-content" id="user-content">
   <p class="favorite-count">
     {{i18n
       "badges.favorite_count"
@@ -22,7 +22,7 @@
     {{/each}}
     <PluginOutlet
       @name="after-user-profile-badges"
-      @args={{hash user=this.user.model}}
+      @outletArgs={{hash user=this.user.model}}
     />
   </div>
 </DSection>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/user/messages.hbs b/app/assets/javascripts/discourse/app/templates/user/messages.hbs
index f4260d26928..98a680b7f01 100644
--- a/app/assets/javascripts/discourse/app/templates/user/messages.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/messages.hbs
@@ -1,208 +1,50 @@
-{{#if this.currentUser.redesigned_user_page_nav_enabled}}
-  <DSection @pageClass="user-messages" />
+<DSection @pageClass="user-messages" />
 
-  <div class="user-navigation user-navigation-secondary">
-    <ol class="category-breadcrumb">
-      <li>
-        <UserNav::MessagesDropdown
-          @content={{this.messagesDropdownContent}}
-          @value={{this.messagesDropdownValue}}
-          @onChange={{this.onMessagesDropdownChange}}
-        />
-      </li>
-    </ol>
+<PluginOutlet
+  @name="user-messages-above-navigation"
+  @outletArgs={{hash model=this.model}}
+/>
 
-    <HorizontalOverflowNav
-      @className="messages-nav"
-      id="user-navigation-secondary__horizontal-nav"
-    />
-
-    <div class="navigation-controls">
-      {{#if this.site.mobileView}}
-        {{#if this.currentUser.admin}}
-          <BulkSelectToggle
-            @parentController={{"user-topics-list"}}
-            @tagName=""
-          />
-        {{/if}}
-      {{/if}}
-
-      {{#if this.isGroup}}
-        <GroupNotificationsButton
-          @value={{this.group.group_user.notification_level}}
-          @onChange={{this.changeGroupNotificationLevel}}
-        />
-      {{/if}}
-
-      {{#if this.showNewPM}}
-        <DButton
-          @class="btn-primary new-private-message"
-          @action={{route-action "composePrivateMessage"}}
-          @icon="envelope"
-          @label="user.new_private_message"
-        />
-      {{/if}}
-    </div>
-  </div>
-{{else}}
-  <DSection @class="user-secondary-navigation" @pageClass="user-messages">
-    <MobileNav @class="messages-nav" @desktopClass="nav-stacked action-list">
-      <li>
-        <LinkTo @route="userPrivateMessages.user.index" @model={{this.model}}>
-          {{i18n "user.messages.inbox"}}
-        </LinkTo>
-      </li>
-
-      {{#if this.isPersonal}}
-        <li class="archive">
-          <LinkTo @route="userPrivateMessages.user.sent" @model={{this.model}}>
-            {{i18n "user.messages.sent"}}
-          </LinkTo>
-        </li>
-
-        {{#if this.viewingSelf}}
-          <li class="archive">
-            <LinkTo
-              @route="userPrivateMessages.user.new"
-              @model={{this.model}}
-              class="new"
-            >
-              {{this.newLinkText}}
-            </LinkTo>
-          </li>
-
-          <li class="archive">
-            <LinkTo
-              @route="userPrivateMessages.user.unread"
-              @model={{this.model}}
-              class="unread"
-            >
-              {{this.unreadLinkText}}
-            </LinkTo>
-          </li>
-        {{/if}}
-
-        <li class="archive">
-          <LinkTo
-            @route="userPrivateMessages.user.archive"
-            @model={{this.model}}
-          >
-            {{i18n "user.messages.archive"}}
-          </LinkTo>
-        </li>
-      {{/if}}
-
-      {{#each this.model.groupsWithMessages as |group|}}
-        <li>
-          <LinkTo @route="userPrivateMessages.group" @model={{group.name}}>
-            {{d-icon "users"}}
-            {{capitalize-string group.name}}
-          </LinkTo>
-        </li>
-
-        {{#if (and this.isGroup (eq this.groupFilter group.name))}}
-          {{#if this.viewingSelf}}
-            <li class="archive">
-              <LinkTo
-                @route="userPrivateMessages.group.new"
-                @model={{group.name}}
-                class="new"
-              >
-                {{this.newLinkText}}
-              </LinkTo>
-            </li>
-
-            <li class="archive">
-              <LinkTo
-                @route="userPrivateMessages.group.unread"
-                @model={{group.name}}
-                class="unread"
-              >
-                {{this.unreadLinkText}}
-              </LinkTo>
-            </li>
-          {{/if}}
-
-          <li class="archive">
-            <LinkTo
-              @route="userPrivateMessages.group.archive"
-              @model={{group.name}}
-            >
-              {{i18n "user.messages.archive"}}
-            </LinkTo>
-          </li>
-        {{/if}}
-      {{/each}}
-
-      {{#if this.pmTaggingEnabled}}
-        <li class="tags">
-          <LinkTo @route="userPrivateMessages.tags.index" @model={{this.model}}>
-            {{i18n "user.messages.tags"}}
-          </LinkTo>
-        </li>
-
-        {{#if this.tagId}}
-          <li class="archive">
-            <LinkTo
-              @route="userPrivateMessages.tags.show"
-              @model={{this.tagId}}
-            >
-              {{this.tagId}}
-            </LinkTo>
-          </li>
-        {{/if}}
-      {{/if}}
-
-      <PluginOutlet
-        @name="user-messages-nav"
-        @tagName="span"
-        @connectorTagName="li"
-        @args={{hash model=this.model}}
+<div class="user-navigation user-navigation-secondary">
+  <ol class="category-breadcrumb">
+    <li>
+      <UserNav::MessagesDropdown
+        @content={{this.messagesDropdownContent}}
+        @value={{this.messagesDropdownValue}}
+        @onChange={{this.onMessagesDropdownChange}}
       />
-    </MobileNav>
-  </DSection>
+    </li>
+  </ol>
 
-  {{#unless this.site.mobileView}}
-    <section class="user-additional-controls">
-      {{#if this.group}}
-        <GroupNotificationsButton
-          @value={{this.group.group_user.notification_level}}
-          @onChange={{action "changeGroupNotificationLevel"}}
+  <HorizontalOverflowNav
+    @className="messages-nav"
+    @ariaLabel="User secondary - messages"
+    id="user-navigation-secondary__horizontal-nav"
+  />
+
+  <div class="navigation-controls">
+    {{#if this.site.mobileView}}
+      {{#if this.currentUser.admin}}
+        <BulkSelectToggle
+          @parentController={{"user-topics-list"}}
+          @tagName=""
         />
       {{/if}}
+    {{/if}}
 
-      {{#if this.showNewPM}}
-        <DButton
-          @class="btn-primary new-private-message"
-          @action={{route-action "composePrivateMessage"}}
-          @icon="envelope"
-          @label="user.new_private_message"
-        />
-      {{/if}}
-    </section>
-  {{/unless}}
-{{/if}}
+    <span id="navigation-controls__button"></span>
 
-<section class="user-content">
-  {{#unless this.currentUser.redesigned_user_page_nav_enabled}}
-    <div class="list-actions">
-      {{#if this.site.mobileView}}
-        {{#if this.showNewPM}}
-          <DButton
-            @class="btn-primary new-private-message"
-            @action={{route-action "composePrivateMessage"}}
-            @icon="envelope"
-            @label="user.new_private_message"
-          />
-        {{/if}}
-        {{#if this.currentUser.admin}}
-          <BulkSelectToggle
-            @parentController={{"user-topics-list"}}
-            @tagName=""
-          />
-        {{/if}}
-      {{/if}}
-    </div>
-  {{/unless}}
+    {{#if this.showNewPM}}
+      <DButton
+        @class="btn-primary new-private-message"
+        @action={{route-action "composePrivateMessage"}}
+        @icon="envelope"
+        @label="user.new_private_message"
+      />
+    {{/if}}
+  </div>
+</div>
+
+<section class="user-content" id="user-content">
   {{outlet}}
 </section>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/user/notifications.hbs b/app/assets/javascripts/discourse/app/templates/user/notifications.hbs
index 15ec2c67533..c20ec154a4e 100644
--- a/app/assets/javascripts/discourse/app/templates/user/notifications.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/notifications.hbs
@@ -1,72 +1,64 @@
-{{#if this.currentUser.redesigned_user_page_nav_enabled}}
-  <DSection @pageClass="user-notifications" />
+<DSection @pageClass="user-notifications" />
 
-  <div class="user-navigation user-navigation-secondary">
-    <HorizontalOverflowNav>
-      <UserNav::NotificationsNav
-        @model={{this.model}}
-        @siteSettings={{this.siteSettings}}
-      />
-    </HorizontalOverflowNav>
-
-    {{#if this.model}}
-      <div class="navigation-controls">
-        <DButton
-          @title="user.dismiss_notifications_tooltip"
-          @class="btn btn-default dismiss-notifications"
-          @action={{action "resetNew"}}
-          @label="user.dismiss_notifications"
-          @icon="check"
-          @disabled={{this.allNotificationsRead}}
-        />
-      </div>
-    {{/if}}
-  </div>
-{{else}}
-  <DSection @pageClass="user-notifications" @class="user-secondary-navigation">
-    <MobileNav
-      @class="notifications-nav"
-      @desktopClass="notification-list action-list nav-stacked"
+<div class="user-navigation user-navigation-secondary">
+  <HorizontalOverflowNav @ariaLabel="User secondary - notifications">
+    <DNavigationItem
+      @route="userNotifications.index"
+      @ariaCurrentContext="subNav"
+      class="user-nav__notifications-all"
     >
-      <li>
-        <LinkTo @route="userNotifications.index">
-          {{i18n "user.filters.all"}}
-        </LinkTo>
-      </li>
-      <li>
-        <LinkTo @route="userNotifications.responses">
-          {{i18n "user_action_groups.6"}}
-        </LinkTo>
-      </li>
-      <li>
-        <LinkTo @route="userNotifications.likesReceived">
-          {{i18n "user_action_groups.2"}}
-        </LinkTo>
-      </li>
-      {{#if this.siteSettings.enable_mentions}}
-        <li>
-          <LinkTo @route="userNotifications.mentions">
-            {{i18n "user_action_groups.7"}}
-          </LinkTo>
-        </li>
-      {{/if}}
-      <li>
-        <LinkTo @route="userNotifications.edits">
-          {{i18n "user_action_groups.11"}}
-        </LinkTo>
-      </li>
-      <PluginOutlet
-        @name="user-notifications-bottom"
-        @tagName="span"
-        @connectorTagName="li"
-        @args={{hash model=this.model}}
-      />
-    </MobileNav>
+      {{d-icon "bell"}}
+      <span>{{i18n "user.filters.all"}}</span>
+    </DNavigationItem>
 
-  </DSection>
+    <DNavigationItem
+      @route="userNotifications.responses"
+      @ariaCurrentContext="subNav"
+      class="user-nav__notifications-responses"
+    >
+      {{d-icon "reply"}}
+      <span>{{i18n "user_action_groups.6"}}</span>
+    </DNavigationItem>
+
+    <DNavigationItem
+      @route="userNotifications.likesReceived"
+      @ariaCurrentContext="subNav"
+      class="user-nav__notifications-likes"
+    >
+      {{d-icon "heart"}}
+      <span>{{i18n "user_action_groups.2"}}</span>
+    </DNavigationItem>
+
+    {{#if this.siteSettings.enable_mentions}}
+      <DNavigationItem
+        @route="userNotifications.mentions"
+        @ariaCurrentContext="subNav"
+        class="user-nav__notifications-mentions"
+      >
+        {{d-icon "at"}}
+        <span>{{i18n "user_action_groups.7"}}</span>
+      </DNavigationItem>
+    {{/if}}
+
+    <DNavigationItem
+      @route="userNotifications.edits"
+      @ariaCurrentContext="subNav"
+      class="user-nav__notifications-edits"
+    >
+      {{d-icon "pencil-alt"}}
+      <span>{{i18n "user_action_groups.11"}}</span>
+    </DNavigationItem>
+
+    <PluginOutlet
+      @name="user-notifications-bottom"
+      @connectorTagName="li"
+      @outletArgs={{hash model=this.model}}
+    />
+
+  </HorizontalOverflowNav>
 
   {{#if this.model}}
-    <section class="user-additional-controls">
+    <div class="navigation-controls">
       <DButton
         @title="user.dismiss_notifications_tooltip"
         @class="btn btn-default dismiss-notifications"
@@ -75,11 +67,11 @@
         @icon="check"
         @disabled={{this.allNotificationsRead}}
       />
-    </section>
+    </div>
   {{/if}}
-{{/if}}
+</div>
 
-<section class="user-content">
+<section class="user-content" id="user-content">
   <LoadMore
     @class="notification-history user-stream"
     @selector=".user-stream .notification"
diff --git a/app/assets/javascripts/discourse/app/templates/user/summary.hbs b/app/assets/javascripts/discourse/app/templates/user/summary.hbs
index 1a40cb01214..15859e0cdb0 100644
--- a/app/assets/javascripts/discourse/app/templates/user/summary.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/summary.hbs
@@ -1,8 +1,8 @@
 <DSection @pageClass="user-summary" @tagName="">
-  <div class="user-content">
+  <div class="user-content" id="user-content">
     <PluginOutlet
       @name="above-user-summary-stats"
-      @args={{hash model=this.model user=this.user}}
+      @outletArgs={{hash model=this.model user=this.user}}
     />
     {{#if this.model.can_see_summary_stats}}
       <div class="top-section stats-section">
@@ -95,7 +95,7 @@
           <PluginOutlet
             @name="user-summary-stat"
             @connectorTagName="li"
-            @args={{hash model=this.model user=this.user}}
+            @outletArgs={{hash model=this.model user=this.user}}
           />
         </ul>
       </div>
@@ -103,7 +103,7 @@
 
     <PluginOutlet
       @name="below-user-summary-stats"
-      @args={{hash model=this.model user=this.user}}
+      @outletArgs={{hash model=this.model user=this.user}}
     />
 
     <div class="top-section">
@@ -150,9 +150,9 @@
       <UserSummarySection @title="top_links" @class="links-section pull-left">
         {{#if this.model.links.length}}
           <ul>
-            {{! template-lint-disable }}
             {{#each this.model.links as |link|}}
               <li>
+                {{! template-lint-disable link-rel-noopener }}
                 <a
                   class="domain"
                   href={{link.url}}
@@ -165,14 +165,20 @@
                 >
                   {{shorten-url link.url}}
                 </a>
+                {{! template-lint-enable link-rel-noopener }}
+
                 <span
                   class="badge badge-notification clicks"
-                  title="{{i18n 'topic_map.clicks' count=link.clicks}}"
-                >{{number link.clicks}}</span>
+                  title={{i18n "topic_map.clicks" count=link.clicks}}
+                >
+                  {{number link.clicks}}
+                </span>
+
                 <br />
-                <a href="{{link.post_url}}">{{html-safe
-                    link.topic.fancyTitle
-                  }}</a>
+
+                <a href={{link.post_url}}>
+                  {{html-safe link.topic.fancyTitle}}
+                </a>
               </li>
             {{/each}}
           </ul>
@@ -282,7 +288,7 @@
             {{/each}}
             <PluginOutlet
               @name="after-user-summary-badges"
-              @args={{hash model=this.model user=this.user}}
+              @outletArgs={{hash model=this.model user=this.user}}
             />
           </div>
         {{else}}
diff --git a/app/assets/javascripts/discourse/app/templates/users.hbs b/app/assets/javascripts/discourse/app/templates/users.hbs
index c8ab68e508f..9dc6a5d0d49 100644
--- a/app/assets/javascripts/discourse/app/templates/users.hbs
+++ b/app/assets/javascripts/discourse/app/templates/users.hbs
@@ -1,13 +1,17 @@
 <DSection @pageClass="users">
-  <LoadMore @selector=".directory tbody tr" @action={{action "loadMore"}}>
+  <LoadMore
+    @selector=".directory-table .directory-table__cell"
+    @action={{action "loadMore"}}
+  >
     <div class="container">
       <div class="users-directory directory">
-        <PluginOutlet
-          @name="users-top"
-          @tagName="span"
-          @connectorTagName="div"
-          @args={{hash model=this.model}}
-        />
+        <span>
+          <PluginOutlet
+            @name="users-top"
+            @connectorTagName="div"
+            @outletArgs={{hash model=this.model}}
+          />
+        </span>
         <div class="directory-controls">
           <div class="period-controls">
             <PeriodChooser
@@ -55,7 +59,7 @@
             {{/if}}
             <PluginOutlet
               @name="users-directory-controls"
-              @args={{hash model=this.model}}
+              @outletArgs={{hash model=this.model}}
             />
           </div>
         </div>
diff --git a/app/assets/javascripts/discourse/app/widgets/admin-problems-notification-item.js b/app/assets/javascripts/discourse/app/widgets/admin-problems-notification-item.js
new file mode 100644
index 00000000000..10e787a1c88
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/widgets/admin-problems-notification-item.js
@@ -0,0 +1,19 @@
+import { DefaultNotificationItem } from "discourse/widgets/default-notification-item";
+import I18n from "I18n";
+import { createWidgetFrom } from "discourse/widgets/widget";
+import getURL from "discourse-common/lib/get-url";
+import { iconNode } from "discourse-common/lib/icon-library";
+
+createWidgetFrom(DefaultNotificationItem, "admin-problems-notification-item", {
+  text() {
+    return I18n.t("notifications.admin_problems");
+  },
+
+  url() {
+    return getURL("/admin");
+  },
+
+  icon() {
+    return iconNode("gift");
+  },
+});
diff --git a/app/assets/javascripts/discourse/app/widgets/before-header-panel-outlet.js b/app/assets/javascripts/discourse/app/widgets/before-header-panel-outlet.js
new file mode 100644
index 00000000000..9ee3bc82489
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/widgets/before-header-panel-outlet.js
@@ -0,0 +1,8 @@
+import { hbs } from "ember-cli-htmlbars";
+import { registerWidgetShim } from "discourse/widgets/render-glimmer";
+
+registerWidgetShim(
+  "before-header-panel-outlet",
+  "div.before-header-panel-outlet",
+  hbs`<PluginOutlet @name="before-header-panel" @outletArgs={{hash attrs=@data}} /> `
+);
diff --git a/app/assets/javascripts/discourse/app/widgets/button.js b/app/assets/javascripts/discourse/app/widgets/button.js
index 83b9e0505e1..fc23dbf6331 100644
--- a/app/assets/javascripts/discourse/app/widgets/button.js
+++ b/app/assets/javascripts/discourse/app/widgets/button.js
@@ -10,7 +10,7 @@ export const ButtonClass = {
   buildClasses(attrs) {
     let className = this.attrs.className || "";
 
-    let hasText = attrs.label || attrs.contents;
+    let hasText = attrs.translatedLabel || attrs.label || attrs.contents;
 
     if (!hasText) {
       className += " no-text";
diff --git a/app/assets/javascripts/discourse/app/widgets/decorator-helper.js b/app/assets/javascripts/discourse/app/widgets/decorator-helper.js
index fcd58cba038..307a1f876ca 100644
--- a/app/assets/javascripts/discourse/app/widgets/decorator-helper.js
+++ b/app/assets/javascripts/discourse/app/widgets/decorator-helper.js
@@ -2,6 +2,7 @@ import Connector from "discourse/widgets/connector";
 import PostCooked from "discourse/widgets/post-cooked";
 import RawHtml from "discourse/widgets/raw-html";
 import { h } from "virtual-dom";
+import RenderGlimmer from "discourse/widgets/render-glimmer";
 
 class DecoratorHelper {
   constructor(widget, attrs, state) {
@@ -106,6 +107,51 @@ class DecoratorHelper {
   connect(details) {
     return new Connector(this.widget, details);
   }
+
+  /**
+   * Returns an element containing a rendered glimmer template. For full usage instructions,
+   * see `widgets/render-glimmer.js`.
+   *
+   * Example usage:
+   *
+   * ```
+   * import { hbs } from "ember-cli-htmlbars";
+   *
+   * api.decorateCookedElement((cooked, helper) => {
+   *   // Generate a new element with glimmer rendered inside
+   *   const glimmerElement = helper.renderGlimmer(
+   *     "div.my-wrapper-class",
+   *     hbs`<DButton @icon={{@data.param}} @translatedLabel="Hello world from Glimmer Component"/>`,
+   *     { param: "user-plus" }
+   *   );
+   *   cooked.appendChild(glimmerElement);
+   *
+   *   // Or append to an existing element
+   *   helper.renderGlimmer(
+   *     cooked.querySelector(".some-container"),
+   *     hbs`I will be appended to some-container`
+   *   );
+   * }, { onlyStream: true, id: "my-id" });
+   * ```
+   *
+   */
+  renderGlimmer(renderInto, template, data) {
+    if (!this.widget.postContentsDestroyCallbacks) {
+      throw "renderGlimmer can only be used in the context of a post";
+    }
+
+    const renderGlimmer = new RenderGlimmer(
+      this.widget,
+      renderInto,
+      template,
+      data
+    );
+    renderGlimmer.init();
+    this.widget.postContentsDestroyCallbacks.push(
+      renderGlimmer.destroy.bind(renderGlimmer)
+    );
+    return renderGlimmer.element;
+  }
 }
 DecoratorHelper.prototype.h = h;
 
diff --git a/app/assets/javascripts/discourse/app/widgets/default-notification-item.js b/app/assets/javascripts/discourse/app/widgets/default-notification-item.js
index fa571a4e27f..7a2f3084b8c 100644
--- a/app/assets/javascripts/discourse/app/widgets/default-notification-item.js
+++ b/app/assets/javascripts/discourse/app/widgets/default-notification-item.js
@@ -192,6 +192,7 @@ export const DefaultNotificationItem = createWidget(
           method: "PUT",
           data: { id: this.attrs.id },
         });
+        this.scheduleRerender();
       }
     },
   }
diff --git a/app/assets/javascripts/discourse/app/widgets/do-not-disturb.js b/app/assets/javascripts/discourse/app/widgets/do-not-disturb.js
index d5989c6290a..a78e5f0663e 100644
--- a/app/assets/javascripts/discourse/app/widgets/do-not-disturb.js
+++ b/app/assets/javascripts/discourse/app/widgets/do-not-disturb.js
@@ -3,29 +3,18 @@ import { createWidget } from "discourse/widgets/widget";
 import { dateNode } from "discourse/helpers/node";
 import { h } from "virtual-dom";
 import { iconNode } from "discourse-common/lib/icon-library";
-import showModal from "discourse/lib/show-modal";
 import DoNotDisturb from "discourse/lib/do-not-disturb";
+import DoNotDisturbModal from "discourse/components/modal/do-not-disturb";
 
 export default createWidget("do-not-disturb", {
   tagName: "li.do-not-disturb",
+  services: ["modal"],
+
   saving: false,
 
   html() {
-    if (this.currentUser.isInDoNotDisturb()) {
-      return [
-        h("button.btn-flat.do-not-disturb-inner-container", [
-          iconNode("toggle-on"),
-          this.label(),
-        ]),
-      ];
-    } else {
-      return [
-        h("button.btn-flat.do-not-disturb-inner-container", [
-          iconNode("toggle-off"),
-          h("span.do-not-disturb-label", I18n.t("pause_notifications.label")),
-        ]),
-      ];
-    }
+    const isOn = this.currentUser.isInDoNotDisturb();
+    return [this._menuButton(isOn)];
   },
 
   click() {
@@ -40,11 +29,19 @@ export default createWidget("do-not-disturb", {
       });
     } else {
       this.saving = false;
-      return showModal("do-not-disturb");
+      return this.modal.show(DoNotDisturbModal);
     }
   },
 
-  label() {
+  _menuButton(isOn) {
+    const icon = iconNode(isOn ? "toggle-on" : "toggle-off");
+    return h("button.btn-flat.do-not-disturb-inner-container", [
+      icon,
+      this._label(),
+    ]);
+  },
+
+  _label() {
     const content = [h("span", I18n.t("pause_notifications.label"))];
 
     const until = this.currentUser.do_not_disturb_until;
diff --git a/app/assets/javascripts/discourse/app/widgets/embedded-post.js b/app/assets/javascripts/discourse/app/widgets/embedded-post.js
index a845fc70eb1..6f7f1242082 100644
--- a/app/assets/javascripts/discourse/app/widgets/embedded-post.js
+++ b/app/assets/javascripts/discourse/app/widgets/embedded-post.js
@@ -8,15 +8,15 @@ createWidget("post-link-arrow", {
   tagName: "div.post-link-arrow",
 
   template: hbs`
-    {{#if attrs.above}}
-      <a href={{attrs.shareUrl}} class="post-info arrow" title={{i18n "topic.jump_reply_up"}}>
+      <a href={{attrs.shareUrl}} class="post-info arrow" title={{i18n "topic.jump_reply"}} aria-label={{i18n 
+        "topic.jump_reply_aria" username=attrs.name
+      }}>
+      {{#if attrs.above}}
         {{d-icon "arrow-up"}}
-      </a>
-    {{else}}
-      <a href={{attrs.shareUrl}} class="post-info arrow" title={{i18n "topic.jump_reply_down"}}>
+      {{else}}
         {{d-icon "arrow-down"}}
+      {{/if}}
       </a>
-    {{/if}}
   `,
 });
 
@@ -44,6 +44,7 @@ export default createWidget("embedded-post", {
           h("div.topic-meta-data.embedded-reply", [
             this.attach("poster-name", attrs),
             this.attach("post-link-arrow", {
+              name: attrs.username,
               above: state.above,
               shareUrl: attrs.customShare,
             }),
@@ -53,4 +54,12 @@ export default createWidget("embedded-post", {
       ]),
     ];
   },
+
+  init() {
+    this.postContentsDestroyCallbacks = [];
+  },
+
+  destroy() {
+    this.postContentsDestroyCallbacks.forEach((c) => c());
+  },
 });
diff --git a/app/assets/javascripts/discourse/app/widgets/hamburger-categories.js b/app/assets/javascripts/discourse/app/widgets/hamburger-categories.js
index 8ef945c88b2..c48bbfb8e97 100644
--- a/app/assets/javascripts/discourse/app/widgets/hamburger-categories.js
+++ b/app/assets/javascripts/discourse/app/widgets/hamburger-categories.js
@@ -19,8 +19,8 @@ createWidget("hamburger-category", {
       this.attach("category-link", { category: c, allowUncategorized: true }),
     ];
 
-    const unreadTotal =
-      parseInt(c.get("unreadTopics"), 10) + parseInt(c.get("newTopics"), 10);
+    const unreadTotal = c.unreadTopicsCount + c.newTopicsCount;
+
     if (unreadTotal) {
       results.push(
         h(
diff --git a/app/assets/javascripts/discourse/app/widgets/hamburger-menu.js b/app/assets/javascripts/discourse/app/widgets/hamburger-menu.js
index 2edd4b23a5e..67b3b9e7a93 100644
--- a/app/assets/javascripts/discourse/app/widgets/hamburger-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/hamburger-menu.js
@@ -198,12 +198,12 @@ export default createWidget("hamburger-menu", {
         .filter((c) => c.notification_level !== NotificationLevels.MUTED);
 
       categories = allCategories
-        .filter((c) => c.get("newTopics") > 0 || c.get("unreadTopics") > 0)
+        .filter((c) => c.newTopicsCount > 0 || c.unreadTopicsCount > 0)
         .sort((a, b) => {
           return (
-            b.get("newTopics") +
-            b.get("unreadTopics") -
-            (a.get("newTopics") + a.get("unreadTopics"))
+            b.newTopicsCount +
+            b.unreadTopicsCount -
+            (a.unreadTopicsCount + a.newTopicsCount)
           );
         });
 
@@ -354,15 +354,7 @@ export default createWidget("hamburger-menu", {
       });
   },
 
-  html(attrs, state) {
-    if (
-      this.currentUser &&
-      !this.currentUser.redesigned_user_menu_enabled &&
-      !state.loaded
-    ) {
-      this.refreshReviewableCount(state);
-    }
-
+  html() {
     return this.attach("menu-panel", {
       contents: () => this.panelContents(),
       maxWidth: this.settings.maxWidth,
diff --git a/app/assets/javascripts/discourse/app/widgets/header-bootstrap-mode.js b/app/assets/javascripts/discourse/app/widgets/header-bootstrap-mode.js
new file mode 100644
index 00000000000..0f11aeed11c
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/widgets/header-bootstrap-mode.js
@@ -0,0 +1,8 @@
+import { hbs } from "ember-cli-htmlbars";
+import { registerWidgetShim } from "discourse/widgets/render-glimmer";
+
+registerWidgetShim(
+  "header-bootstrap-mode",
+  "div.d-header-mode",
+  hbs`<BootstrapModeNotice />`
+);
diff --git a/app/assets/javascripts/discourse/app/widgets/header-contents.js b/app/assets/javascripts/discourse/app/widgets/header-contents.js
index ba579498dad..5442cd5abf7 100644
--- a/app/assets/javascripts/discourse/app/widgets/header-contents.js
+++ b/app/assets/javascripts/discourse/app/widgets/header-contents.js
@@ -2,7 +2,12 @@ import { createWidget } from "discourse/widgets/widget";
 import hbs from "discourse/widgets/hbs-compiler";
 
 createWidget("header-contents", {
-  tagName: "div.contents.clearfix",
+  tagName: "div.contents",
+  transform() {
+    return {
+      showBootstrapMode: this.currentUser?.staff && this.site.desktopView,
+    };
+  },
   template: hbs`
     {{#if this.site.desktopView}}
       {{#if attrs.sidebarEnabled}}
@@ -14,8 +19,14 @@ createWidget("header-contents", {
 
     {{#if attrs.topic}}
       {{header-topic-info attrs=attrs}}
+    {{else if this.siteSettings.bootstrap_mode_enabled}}
+      {{#if transformed.showBootstrapMode}}
+        {{header-bootstrap-mode attrs=attrs}}
+      {{/if}}
     {{/if}}
 
-    <div class="panel clearfix" role="navigation">{{yield}}</div>
+    {{before-header-panel-outlet attrs=attrs}}
+
+    <div class="panel" role="navigation">{{yield}}</div>
   `,
 });
diff --git a/app/assets/javascripts/discourse/app/widgets/header.js b/app/assets/javascripts/discourse/app/widgets/header.js
index 01c19101121..2c6605f2c8c 100644
--- a/app/assets/javascripts/discourse/app/widgets/header.js
+++ b/app/assets/javascripts/discourse/app/widgets/header.js
@@ -13,6 +13,7 @@ import { logSearchLinkClick } from "discourse/lib/search";
 import RenderGlimmer from "discourse/widgets/render-glimmer";
 import { hbs } from "ember-cli-htmlbars";
 import { hideUserTip } from "discourse/lib/user-tips";
+import { SEARCH_BUTTON_ID } from "discourse/components/search-menu";
 
 let _extraHeaderIcons = [];
 
@@ -24,7 +25,7 @@ export function clearExtraHeaderIcons() {
   _extraHeaderIcons = [];
 }
 
-const dropdown = {
+export const dropdown = {
   buildClasses(attrs) {
     let classes = attrs.classNames || [];
     if (attrs.active) {
@@ -81,83 +82,57 @@ createWidget("header-notifications", {
     if (user.isInDoNotDisturb()) {
       contents.push(h("div.do-not-disturb-background", iconNode("moon")));
     } else {
-      if (this.currentUser.redesigned_user_menu_enabled) {
-        let ringClass = null;
-        if (user.new_personal_messages_notifications_count) {
-          ringClass = "personal-messages";
-          contents.push(
-            this.attach("link", {
-              action: attrs.action,
-              className: "badge-notification with-icon new-pms",
-              icon: "envelope",
-              omitSpan: true,
-              title: "notifications.tooltip.new_message_notification",
-              titleOptions: {
-                count: user.new_personal_messages_notifications_count,
-              },
-            })
-          );
-        } else if (user.unseen_reviewable_count) {
-          contents.push(
-            this.attach("link", {
-              action: attrs.action,
-              className: "badge-notification with-icon new-reviewables",
-              icon: "flag",
-              omitSpan: true,
-              title: "notifications.tooltip.new_reviewable",
-              titleOptions: { count: user.unseen_reviewable_count },
-            })
-          );
-        } else if (user.all_unread_notifications_count) {
-          ringClass = "regular-notifications";
-          contents.push(
-            this.attach("link", {
-              action: attrs.action,
-              className: "badge-notification unread-notifications",
-              rawLabel: user.all_unread_notifications_count,
-              omitSpan: true,
-              title: "notifications.tooltip.regular",
-              titleOptions: { count: user.all_unread_notifications_count },
-            })
-          );
-        }
-        if (ringClass && this._shouldHighlightAvatar()) {
-          contents.push(h(`span.ring.revamped.${ringClass}`));
-        }
-      } else {
-        const unreadNotifications = user.unread_notifications;
-        if (!!unreadNotifications) {
-          contents.push(
-            this.attach("link", {
-              action: attrs.action,
-              className: "badge-notification unread-notifications",
-              rawLabel: unreadNotifications,
-              omitSpan: true,
-              title: "notifications.tooltip.regular",
-              titleOptions: { count: unreadNotifications },
-            })
-          );
-        }
-
-        const unreadHighPriority = user.unread_high_priority_notifications;
-        if (!!unreadHighPriority) {
-          if (this._shouldHighlightAvatar()) {
-            contents.push(h("span.ring"));
-          }
-
-          // add the counter for the unread high priority
-          contents.push(
-            this.attach("link", {
-              action: attrs.action,
-              className:
-                "badge-notification unread-high-priority-notifications",
-              rawLabel: unreadHighPriority,
-              omitSpan: true,
-              title: "notifications.tooltip.high_priority",
-              titleOptions: { count: unreadHighPriority },
-            })
-          );
-        }
+      if (user.new_personal_messages_notifications_count) {
+        contents.push(
+          this.attach("link", {
+            action: attrs.action,
+            className: "badge-notification with-icon new-pms",
+            icon: "envelope",
+            omitSpan: true,
+            title: "notifications.tooltip.new_message_notification",
+            titleOptions: {
+              count: user.new_personal_messages_notifications_count,
+            },
+            attributes: {
+              "aria-label": I18n.t(
+                "notifications.tooltip.new_message_notification",
+                {
+                  count: user.new_personal_messages_notifications_count,
+                }
+              ),
+            },
+          })
+        );
+      } else if (user.unseen_reviewable_count) {
+        contents.push(
+          this.attach("link", {
+            action: attrs.action,
+            className: "badge-notification with-icon new-reviewables",
+            icon: "flag",
+            omitSpan: true,
+            title: "notifications.tooltip.new_reviewable",
+            titleOptions: { count: user.unseen_reviewable_count },
+            attributes: {
+              "aria-label": I18n.t("notifications.tooltip.new_reviewable", {
+                count: user.unseen_reviewable_count,
+              }),
+            },
+          })
+        );
+      } else if (user.all_unread_notifications_count) {
+        contents.push(
+          this.attach("link", {
+            action: attrs.action,
+            className: "badge-notification unread-notifications",
+            rawLabel: user.all_unread_notifications_count,
+            omitSpan: true,
+            title: "notifications.tooltip.regular",
+            titleOptions: { count: user.all_unread_notifications_count },
+            attributes: {
+              "aria-label": I18n.t("user.notifications"),
+            },
+          })
+        );
       }
     }
     return contents;
@@ -214,7 +189,7 @@ createWidget(
 
       html(attrs) {
         return h(
-          "a.icon",
+          "button.icon.btn-flat",
           {
             attributes: {
               "aria-haspopup": true,
@@ -247,7 +222,7 @@ createWidget(
         }
 
         return h(
-          "a.icon.btn-flat",
+          "button.icon.btn-flat",
           {
             attributes: {
               "aria-expanded": attrs.active,
@@ -286,7 +261,7 @@ createWidget("header-icons", {
     const search = this.attach("header-dropdown", {
       title: "search.title",
       icon: "search",
-      iconId: "search-button",
+      iconId: SEARCH_BUTTON_ID,
       action: "toggleSearchMenu",
       active: attrs.searchVisible,
       href: getURL("/search"),
@@ -308,7 +283,7 @@ createWidget("header-icons", {
         let { currentUser } = this;
         if (
           currentUser?.reviewable_count &&
-          !this.currentUser.redesigned_user_menu_enabled
+          this.siteSettings.navigation_menu === "legacy"
         ) {
           return h(
             "div.badge-notification.reviewables",
@@ -323,11 +298,7 @@ createWidget("header-icons", {
       },
     });
 
-    if (
-      this.siteSettings.navigation_menu === "legacy" ||
-      !attrs.sidebarEnabled ||
-      this.site.mobileView
-    ) {
+    if (!attrs.sidebarEnabled || this.site.mobileView) {
       icons.push(hamburger);
     }
 
@@ -409,6 +380,7 @@ createWidget("revamped-hamburger-menu-wrapper", {
   click(event) {
     if (
       event.target.closest(".sidebar-section-header-button") ||
+      event.target.closest(".sidebar-section-link-button") ||
       event.target.closest(".sidebar-section-link")
     ) {
       this.sendWidgetAction("toggleHamburger");
@@ -447,8 +419,47 @@ createWidget("revamped-user-menu-wrapper", {
   },
 });
 
+createWidget("glimmer-search-menu-wrapper", {
+  buildAttributes() {
+    return { "data-click-outside": true, "aria-live": "polite" };
+  },
+
+  buildClasses() {
+    return ["search-menu"];
+  },
+
+  html() {
+    return [
+      new RenderGlimmer(
+        this,
+        "div.widget-component-connector",
+        hbs`<SearchMenu
+          @inTopicContext={{@data.inTopicContext}}
+          @searchVisible={{@data.searchVisible}}
+          @animationClass={{@data.animationClass}}
+          @closeSearchMenu={{@data.closeSearchMenu}}
+        />`,
+        {
+          closeSearchMenu: this.closeSearchMenu.bind(this),
+          inTopicContext: this.attrs.inTopicContext,
+          searchVisible: this.attrs.searchVisible,
+          animationClass: this.attrs.animationClass,
+        }
+      ),
+    ];
+  },
+
+  closeSearchMenu() {
+    this.sendWidgetAction("toggleSearchMenu");
+  },
+
+  clickOutside() {
+    this.closeSearchMenu();
+  },
+});
+
 export default createWidget("header", {
-  tagName: "header.d-header.clearfix",
+  tagName: "header.d-header",
   buildKey: () => `header`,
   services: ["router", "search"],
 
@@ -491,25 +502,34 @@ export default createWidget("header", {
       const panels = [this.attach("header-buttons", attrs), headerIcons];
 
       if (state.searchVisible) {
-        panels.push(
-          this.attach("search-menu", {
-            inTopicContext: state.inTopicContext && inTopicRoute,
-          })
-        );
+        if (this.currentUser?.experimental_search_menu_groups_enabled) {
+          panels.push(
+            this.attach("glimmer-search-menu-wrapper", {
+              inTopicContext: state.inTopicContext && inTopicRoute,
+              searchVisible: state.searchVisible,
+              animationClass: this.animationClass(),
+            })
+          );
+        } else {
+          panels.push(
+            this.attach("search-menu", {
+              inTopicContext: state.inTopicContext && inTopicRoute,
+            })
+          );
+        }
       } else if (state.hamburgerVisible) {
-        if (this.siteSettings.navigation_menu !== "legacy") {
-          if (!attrs.sidebarEnabled || this.site.narrowDesktopView) {
-            panels.push(this.attach("revamped-hamburger-menu-wrapper", {}));
-          }
+        if (
+          attrs.navigationMenuQueryParamOverride === "header_dropdown" ||
+          (attrs.navigationMenuQueryParamOverride !== "legacy" &&
+            this.siteSettings.navigation_menu !== "legacy" &&
+            (!attrs.sidebarEnabled || this.site.narrowDesktopView))
+        ) {
+          panels.push(this.attach("revamped-hamburger-menu-wrapper", {}));
         } else {
           panels.push(this.attach("hamburger-menu"));
         }
       } else if (state.userVisible) {
-        if (this.currentUser.redesigned_user_menu_enabled) {
-          panels.push(this.attach("revamped-user-menu-wrapper", {}));
-        } else {
-          panels.push(this.attach("user-menu"));
-        }
+        panels.push(this.attach("revamped-user-menu-wrapper", {}));
       }
 
       additionalPanels.map((panel) => {
@@ -547,6 +567,12 @@ export default createWidget("header", {
     }
   },
 
+  animationClass() {
+    return this.site.mobileView || this.site.narrowDesktopView
+      ? "slide-in"
+      : "drop-down";
+  },
+
   closeAll() {
     this.state.userVisible = false;
     this.state.hamburgerVisible = false;
@@ -649,14 +675,32 @@ export default createWidget("header", {
   },
 
   preventDefault(e) {
-    // prevent all scrolling on menu panels, except on overflow
-    const height = window.innerHeight ? window.innerHeight : $(window).height();
-    if (
-      !$(e.target).parents(".menu-panel").length ||
-      $(".menu-panel .panel-body-contents").height() <= height
-    ) {
-      e.preventDefault();
+    const windowHeight = window.innerHeight;
+
+    // allow profile menu tabs to scroll if they're taller than the window
+    if (e.target.closest(".menu-panel .menu-tabs-container")) {
+      const topTabs = document.querySelector(".menu-panel .top-tabs");
+      const bottomTabs = document.querySelector(".menu-panel .bottom-tabs");
+      const profileTabsHeight =
+        topTabs?.offsetHeight + bottomTabs?.offsetHeight || 0;
+
+      if (profileTabsHeight > windowHeight) {
+        return;
+      }
     }
+
+    // allow menu panels to scroll if contents are taller than the window
+    if (e.target.closest(".menu-panel")) {
+      const menuContentHeight =
+        document.querySelector(".menu-panel .panel-body-contents")
+          .offsetHeight || 0;
+
+      if (menuContentHeight > windowHeight) {
+        return;
+      }
+    }
+
+    e.preventDefault();
   },
 
   togglePageSearch() {
@@ -719,7 +763,12 @@ export default createWidget("header", {
   },
 
   focusSearchInput() {
-    if (this.state.searchVisible) {
+    // the glimmer search menu handles the focusing of the search
+    // input within the search component
+    if (
+      this.state.searchVisible &&
+      !this.currentUser?.experimental_search_menu_groups_enabled
+    ) {
       schedule("afterRender", () => {
         const searchInput = document.querySelector("#search-term");
         searchInput.focus();
diff --git a/app/assets/javascripts/discourse/app/widgets/home-logo.js b/app/assets/javascripts/discourse/app/widgets/home-logo.js
index 32db00bbc2a..7eaeec28298 100644
--- a/app/assets/javascripts/discourse/app/widgets/home-logo.js
+++ b/app/assets/javascripts/discourse/app/widgets/home-logo.js
@@ -13,6 +13,12 @@ export default createWidget("home-logo", {
     href: getURL("/"),
   },
 
+  buildClasses() {
+    if (this.attrs.minimized) {
+      return "title--minimized";
+    }
+  },
+
   href() {
     const href = this.settings.href;
     return typeof href === "function" ? href() : href;
diff --git a/app/assets/javascripts/discourse/app/widgets/hooks.js b/app/assets/javascripts/discourse/app/widgets/hooks.js
index a95de1c1817..b6266df2c1a 100644
--- a/app/assets/javascripts/discourse/app/widgets/hooks.js
+++ b/app/assets/javascripts/discourse/app/widgets/hooks.js
@@ -17,6 +17,7 @@ const MOUSE_OVER_ATTRIBUTE_NAME = "_discourse_mouse_over_widget";
 const MOUSE_OUT_ATTRIBUTE_NAME = "_discourse_mouse_out_widget";
 const TOUCH_START_ATTRIBUTE_NAME = "_discourse_touch_start_widget";
 const TOUCH_END_ATTRIBUTE_NAME = "_discourse_touch_end_widget";
+const TOUCH_MOVE_ATTRIBUTE_NAME = "_discourse_touch_move_widget";
 
 class WidgetBaseHook {
   constructor(widget) {
@@ -73,6 +74,9 @@ export const WidgetTouchEndHook = buildHook(TOUCH_END_ATTRIBUTE_NAME);
 function touchStartHandler(e) {
   return e.currentTarget[TOUCH_START_ATTRIBUTE_NAME].touchStart(e);
 }
+function touchMoveHandler(e) {
+  return e.currentTarget[TOUCH_MOVE_ATTRIBUTE_NAME].touchMove(e);
+}
 
 export class WidgetTouchStartHook extends WidgetBaseHook {
   hook(node, propertyName, previousValue) {
@@ -92,6 +96,24 @@ export class WidgetTouchStartHook extends WidgetBaseHook {
     }
   }
 }
+export class WidgetTouchMoveHook extends WidgetBaseHook {
+  hook(node, propertyName, previousValue) {
+    node[TOUCH_MOVE_ATTRIBUTE_NAME] = this.widget;
+    if (!previousValue) {
+      // Element added to DOM
+      node.addEventListener("touchmove", touchMoveHandler, {
+        passive: false,
+      });
+    }
+  }
+
+  unhook(node, propertyName, newValue) {
+    if (!newValue) {
+      // Element removed from DOM
+      node.removeEventListener("touchmove", touchMoveHandler);
+    }
+  }
+}
 
 let _currentlyDraggingElement;
 
@@ -263,13 +285,20 @@ WidgetClickHook.setupDocumentCallback = function () {
   });
 
   $(document).on("mousedown.discourse-widget", (e) => {
-    nodeCallback(e.target, MOUSE_DOWN_ATTRIBUTE_NAME, (w) => {
-      w.mouseDown(e);
-    });
+    nodeCallback(
+      e.target,
+      MOUSE_DOWN_ATTRIBUTE_NAME,
+      (w) => {
+        w.mouseDown(e);
+      },
+      { rerender: false }
+    );
   });
 
   $(document).on("mouseup.discourse-widget", (e) => {
-    nodeCallback(e.target, MOUSE_UP_ATTRIBUTE_NAME, (w) => w.mouseUp(e));
+    nodeCallback(e.target, MOUSE_UP_ATTRIBUTE_NAME, (w) => w.mouseUp(e), {
+      rerender: false,
+    });
   });
 
   $(document).on("mousemove.discourse-widget", (e) => {
diff --git a/app/assets/javascripts/discourse/app/widgets/post-cooked.js b/app/assets/javascripts/discourse/app/widgets/post-cooked.js
index bc89830628d..3b2accee8c7 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-cooked.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-cooked.js
@@ -4,13 +4,12 @@ import { ajax } from "discourse/lib/ajax";
 import highlightSearch from "discourse/lib/highlight-search";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import { isValidLink } from "discourse/lib/click-track";
-import { number, until } from "discourse/lib/formatter";
+import { number } from "discourse/lib/formatter";
 import { spinnerHTML } from "discourse/helpers/loading-spinner";
 import { escape } from "pretty-text/sanitizer";
 import domFromString from "discourse-common/lib/dom-from-string";
 import getURL from "discourse-common/lib/get-url";
-import { emojiUnescape } from "discourse/lib/text";
-import { escapeExpression } from "discourse/lib/utilities";
+import { updateUserStatusOnMention } from "discourse/lib/update-user-status-on-mention";
 
 let _beforeAdoptDecorators = [];
 let _afterAdoptDecorators = [];
@@ -37,6 +36,7 @@ function createDetachedElement(nodeName) {
 
 export default class PostCooked {
   originalQuoteContents = null;
+  tippyInstances = [];
 
   constructor(attrs, decoratorHelper, currentUser) {
     this.attrs = attrs;
@@ -77,6 +77,7 @@ export default class PostCooked {
 
   destroy() {
     this._stopTrackingMentionedUsersStatus();
+    this._destroyTippyInstances();
   }
 
   _decorateAndAdopt(cooked) {
@@ -381,7 +382,14 @@ export default class PostCooked {
     }
   }
 
+  _destroyTippyInstances() {
+    this.tippyInstances.forEach((instance) => {
+      instance.destroy();
+    });
+  }
+
   _rerenderUserStatusOnMentions() {
+    this._destroyTippyInstances();
     this._post()?.mentioned_users?.forEach((user) =>
       this._rerenderUserStatusOnMention(this.cookedDiv, user)
     );
@@ -392,43 +400,10 @@ export default class PostCooked {
     const mentions = postElement.querySelectorAll(`a.mention[href="${href}"]`);
 
     mentions.forEach((mention) => {
-      this._updateUserStatus(mention, user.status);
+      updateUserStatusOnMention(mention, user.status, this.tippyInstances);
     });
   }
 
-  _updateUserStatus(mention, status) {
-    this._removeUserStatus(mention);
-    if (status) {
-      this._insertUserStatus(mention, status);
-    }
-  }
-
-  _insertUserStatus(mention, status) {
-    const emoji = escapeExpression(`:${status.emoji}:`);
-    const statusHtml = emojiUnescape(emoji, {
-      class: "user-status",
-      title: this._userStatusTitle(status),
-    });
-    mention.insertAdjacentHTML("beforeend", statusHtml);
-  }
-
-  _removeUserStatus(mention) {
-    mention.querySelector("img.user-status")?.remove();
-  }
-
-  _userStatusTitle(status) {
-    if (!status.ends_at) {
-      return status.description;
-    }
-
-    const until_ = until(
-      status.ends_at,
-      this.currentUser.timezone,
-      this.currentUser.locale
-    );
-    return escapeExpression(`${status.description} ${until_}`);
-  }
-
   _trackMentionedUsersStatus() {
     this._post()?.mentioned_users?.forEach((user) => {
       user.trackStatus?.();
diff --git a/app/assets/javascripts/discourse/app/widgets/post-edits-indicator.js b/app/assets/javascripts/discourse/app/widgets/post-edits-indicator.js
index 741f9705b40..3dee8c4868f 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-edits-indicator.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-edits-indicator.js
@@ -56,6 +56,7 @@ export default createWidget("post-edits-indicator", {
       translatedTitle: title,
       className,
       action: "onPostEditsIndicatorClick",
+      translatedAriaLabel: I18n.t("post.edit_history"),
       translatedLabel: attrs.version > 1 ? attrs.version - 1 : "",
     });
   },
diff --git a/app/assets/javascripts/discourse/app/widgets/post-menu.js b/app/assets/javascripts/discourse/app/widgets/post-menu.js
index 4eaa333b7cd..48d2da21cae 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-menu.js
@@ -4,7 +4,6 @@ import discourseLater from "discourse-common/lib/later";
 import { Promise } from "rsvp";
 import { formattedReminderTime } from "discourse/lib/bookmark";
 import { h } from "virtual-dom";
-import showModal from "discourse/lib/show-modal";
 import { smallUserAtts } from "discourse/widgets/actions-summary";
 import I18n from "I18n";
 import {
@@ -12,6 +11,7 @@ import {
   WITH_REMINDER_ICON,
 } from "discourse/models/bookmark";
 import { isTesting } from "discourse-common/config/environment";
+import DeleteTopicDisallowedModal from "discourse/components/modal/delete-topic-disallowed";
 
 const LIKE_ACTION = 2;
 const VIBRATE_DURATION = 5;
@@ -292,7 +292,7 @@ registerButton("replies", (attrs, state, siteSettings) => {
       ? state.filteredRepliesShown
         ? "post.view_all_posts"
         : "post.filtered_replies_hint"
-      : "post.has_replies",
+      : "",
     labelOptions: { count: replyCount },
     label: attrs.mobileView ? "post.has_replies_count" : "post.has_replies",
     iconRight: !siteSettings.enable_filtered_replies_view || attrs.mobileView,
@@ -300,7 +300,12 @@ registerButton("replies", (attrs, state, siteSettings) => {
     translatedAriaLabel: I18n.t("post.sr_expand_replies", {
       count: replyCount,
     }),
+    ariaExpanded:
+      !siteSettings.enable_filtered_replies_view && state.repliesShown
+        ? "true"
+        : "false",
     ariaPressed,
+    ariaControls: `embedded-posts__bottom--${attrs.post_number}`,
   };
 });
 
@@ -442,6 +447,7 @@ function replaceButton(buttons, find, replace) {
 
 export default createWidget("post-menu", {
   tagName: "section.post-menu-area.clearfix",
+  services: ["modal"],
 
   settings: {
     collapseButtons: true,
@@ -707,7 +713,7 @@ export default createWidget("post-menu", {
   },
 
   showDeleteTopicModal() {
-    showModal("delete-topic-disallowed");
+    this.modal.show(DeleteTopicDisallowedModal);
   },
 
   showMoreActions() {
diff --git a/app/assets/javascripts/discourse/app/widgets/post.js b/app/assets/javascripts/discourse/app/widgets/post.js
index fc1d83c7696..30710b2eed3 100644
--- a/app/assets/javascripts/discourse/app/widgets/post.js
+++ b/app/assets/javascripts/discourse/app/widgets/post.js
@@ -1,9 +1,6 @@
 import { applyDecorators, createWidget } from "discourse/widgets/widget";
-import {
-  avatarUrl,
-  formatUsername,
-  translateSize,
-} from "discourse/lib/utilities";
+import { formatUsername } from "discourse/lib/utilities";
+import { avatarUrl, translateSize } from "discourse-common/lib/avatar-utils";
 import getURL, { getURLWithCDN } from "discourse-common/lib/get-url";
 import DecoratorHelper from "discourse/widgets/decorator-helper";
 import DiscourseURL from "discourse/lib/url";
@@ -23,9 +20,10 @@ import {
 import { relativeAgeMediumSpan } from "discourse/lib/formatter";
 import { transformBasicPost } from "discourse/lib/transform-post";
 import autoGroupFlairForUser from "discourse/lib/avatar-flair";
-import showModal from "discourse/lib/show-modal";
 import { nativeShare } from "discourse/lib/pwa-utils";
 import { hideUserTip } from "discourse/lib/user-tips";
+import ShareTopicModal from "discourse/components/modal/share-topic";
+import { getOwner } from "@ember/application";
 
 function transformWithCallbacks(post) {
   let transformed = transformBasicPost(post);
@@ -64,6 +62,7 @@ export function avatarImg(wanted, attrs) {
       title,
       "aria-label": title,
       loading: "lazy",
+      tabindex: "-1",
     },
     className,
   };
@@ -141,10 +140,19 @@ createWidget("reply-to-tab", {
     return { loading: false };
   },
 
-  buildAttributes() {
-    return {
+  buildAttributes(attrs) {
+    let result = {
       tabindex: "0",
     };
+
+    if (!this.attrs.mobileView) {
+      result["aria-controls"] = `embedded-posts__top--${attrs.post_number}`;
+      result["aria-expanded"] = this.attrs.repliesAbove.length
+        ? "true"
+        : "false";
+    }
+
+    return result;
   },
 
   html(attrs, state) {
@@ -216,13 +224,15 @@ createWidget("post-avatar", {
 
     const postAvatarBody = [body];
 
-    if (attrs.flair_url || attrs.flair_bg_color) {
-      postAvatarBody.push(this.attach("avatar-flair", attrs));
-    } else {
-      const autoFlairAttrs = autoGroupFlairForUser(this.site, attrs);
+    if (attrs.flair_group_id) {
+      if (attrs.flair_url || attrs.flair_bg_color) {
+        postAvatarBody.push(this.attach("avatar-flair", attrs));
+      } else {
+        const autoFlairAttrs = autoGroupFlairForUser(this.site, attrs);
 
-      if (autoFlairAttrs) {
-        postAvatarBody.push(this.attach("avatar-flair", autoFlairAttrs));
+        if (autoFlairAttrs) {
+          postAvatarBody.push(this.attach("avatar-flair", autoFlairAttrs));
+        }
       }
     }
 
@@ -398,8 +408,11 @@ createWidget("post-date", {
   showShareModal() {
     const post = this.findAncestorModel();
     const topic = post.topic;
-    const controller = showModal("share-topic", { model: topic.category });
-    controller.setProperties({ topic, post });
+    getOwner(this)
+      .lookup("service:modal")
+      .show(ShareTopicModal, {
+        model: { category: topic.category, topic, post },
+      });
   },
 });
 
@@ -485,7 +498,7 @@ createWidget("post-contents", {
 
     result = result.concat(applyDecorators(this, "after-cooked", attrs, state));
 
-    if (attrs.cooked_hidden) {
+    if (attrs.cooked_hidden && attrs.canSeeHiddenPost) {
       result.push(this.attach("expand-hidden", attrs));
     }
 
@@ -504,28 +517,31 @@ createWidget("post-contents", {
     const repliesBelow = state.repliesBelow;
     if (repliesBelow.length) {
       result.push(
-        h("section.embedded-posts.bottom", [
-          repliesBelow.map((p) => {
-            return this.attach("embedded-post", p, {
-              model: p.asPost,
-              state: {
-                role: "region",
-                "aria-label": I18n.t("post.sr_embedded_reply_description", {
-                  post_number: attrs.post_number,
-                  username: p.username,
-                }),
-              },
-            });
-          }),
-          this.attach("button", {
-            title: "post.collapse",
-            icon: "chevron-up",
-            action: "toggleRepliesBelow",
-            actionParam: "true",
-            className: "btn collapse-up",
-            translatedAriaLabel: I18n.t("post.sr_collapse_replies"),
-          }),
-        ])
+        h(
+          `section.embedded-posts.bottom#embedded-posts__bottom--${this.attrs.post_number}`,
+          [
+            repliesBelow.map((p) => {
+              return this.attach("embedded-post", p, {
+                model: p.asPost,
+                state: {
+                  role: "region",
+                  "aria-label": I18n.t("post.sr_embedded_reply_description", {
+                    post_number: attrs.post_number,
+                    username: p.username,
+                  }),
+                },
+              });
+            }),
+            this.attach("button", {
+              title: "post.collapse",
+              icon: "chevron-up",
+              action: "toggleRepliesBelow",
+              actionParam: "true",
+              className: "btn collapse-up",
+              translatedAriaLabel: I18n.t("post.sr_collapse_replies"),
+            }),
+          ]
+        )
       );
     }
 
@@ -612,10 +628,21 @@ createWidget("post-contents", {
     const post = this.findAncestorModel();
     nativeShare(this.capabilities, { url: post.shareUrl }).catch(() => {
       const topic = post.topic;
-      const controller = showModal("share-topic", { model: topic.category });
-      controller.setProperties({ topic, post });
+      getOwner(this)
+        .lookup("service:modal")
+        .show(ShareTopicModal, {
+          model: { category: topic.category, topic, post },
+        });
     });
   },
+
+  init() {
+    this.postContentsDestroyCallbacks = [];
+  },
+
+  destroy() {
+    this.postContentsDestroyCallbacks.forEach((c) => c());
+  },
 });
 
 createWidget("post-notice", {
@@ -738,16 +765,19 @@ createWidget("post-article", {
       rows.push(
         h(
           "div.row",
-          h("section.embedded-posts.top.topic-body", [
-            this.attach("button", {
-              title: "post.collapse",
-              icon: "chevron-down",
-              action: "toggleReplyAbove",
-              actionParam: "true",
-              className: "btn collapse-down",
-            }),
-            replies,
-          ])
+          h(
+            `section.embedded-posts.top.topic-body#embedded-posts__top--${attrs.post_number}`,
+            [
+              this.attach("button", {
+                title: "post.collapse",
+                icon: "chevron-down",
+                action: "toggleReplyAbove",
+                actionParam: "true",
+                className: "btn collapse-down",
+              }),
+              replies,
+            ]
+          )
         )
       );
     }
@@ -759,7 +789,10 @@ createWidget("post-article", {
     rows.push(
       h("div.row", [
         this.attach("post-avatar", attrs),
-        this.attach("post-body", attrs),
+        this.attach("post-body", {
+          ...attrs,
+          repliesAbove: state.repliesAbove,
+        }),
       ])
     );
     return rows;
diff --git a/app/assets/javascripts/discourse/app/widgets/private-message-map.js b/app/assets/javascripts/discourse/app/widgets/private-message-map.js
index 781d2a8a3c0..a9b390e9eef 100644
--- a/app/assets/javascripts/discourse/app/widgets/private-message-map.js
+++ b/app/assets/javascripts/discourse/app/widgets/private-message-map.js
@@ -185,7 +185,7 @@ export default createWidget("private-message-map", {
         this.attach("button", {
           action: "showInvite",
           icon: "plus",
-          className: "btn btn-default no-text btn-icon",
+          className: "btn btn-default no-text btn-icon add-participant-btn",
         })
       );
     }
diff --git a/app/assets/javascripts/discourse/app/widgets/quick-access-bookmarks.js b/app/assets/javascripts/discourse/app/widgets/quick-access-bookmarks.js
deleted file mode 100644
index c7ec173d1e5..00000000000
--- a/app/assets/javascripts/discourse/app/widgets/quick-access-bookmarks.js
+++ /dev/null
@@ -1,89 +0,0 @@
-import RawHtml from "discourse/widgets/raw-html";
-import {
-  NO_REMINDER_ICON,
-  WITH_REMINDER_ICON,
-} from "discourse/models/bookmark";
-import { iconHTML } from "discourse-common/lib/icon-library";
-import QuickAccessPanel from "discourse/widgets/quick-access-panel";
-import { ajax } from "discourse/lib/ajax";
-import { createWidget, createWidgetFrom } from "discourse/widgets/widget";
-import { h } from "virtual-dom";
-import { postUrl } from "discourse/lib/utilities";
-import I18n from "I18n";
-import { htmlSafe } from "@ember/template";
-
-createWidget("no-quick-access-bookmarks", {
-  html() {
-    return h("div.empty-state", [
-      h("span.empty-state-title", I18n.t("user.no_bookmarks_title")),
-      h(
-        "div.empty-state-body",
-        new RawHtml({
-          html:
-            "<p>" +
-            htmlSafe(
-              I18n.t("user.no_bookmarks_body", {
-                icon: iconHTML(NO_REMINDER_ICON),
-              })
-            ) +
-            "</p>",
-        })
-      ),
-    ]);
-  },
-});
-
-createWidgetFrom(QuickAccessPanel, "quick-access-bookmarks", {
-  buildKey: () => "quick-access-bookmarks",
-  emptyStateWidget: "no-quick-access-bookmarks",
-
-  showAllHref() {
-    return `${this.attrs.path}/activity/bookmarks`;
-  },
-
-  findNewItems() {
-    return this.loadBookmarksWithReminders();
-  },
-
-  itemHtml(bookmark) {
-    // for topic level bookmarks we want to jump to the last unread post
-    // instead of the OP
-    let postNumber;
-    if (bookmark.bookmarkable_type === "Topic") {
-      postNumber = bookmark.last_read_post_number + 1;
-    } else {
-      postNumber = bookmark.linked_post_number;
-    }
-
-    let href;
-    if (
-      bookmark.bookmarkable_type === "Topic" ||
-      bookmark.bookmarkable_type === "Post"
-    ) {
-      href = postUrl(bookmark.slug, bookmark.topic_id, postNumber);
-    } else {
-      href = bookmark.bookmarkable_url;
-    }
-
-    return this.attach("quick-access-item", {
-      icon: this.icon(bookmark),
-      href,
-      title: bookmark.name,
-      content: bookmark.title,
-      username: bookmark.user.username,
-    });
-  },
-
-  icon(bookmark) {
-    if (bookmark.reminder_at) {
-      return WITH_REMINDER_ICON;
-    }
-    return NO_REMINDER_ICON;
-  },
-
-  loadBookmarksWithReminders() {
-    return ajax(`/u/${this.currentUser.username}/bookmarks.json`).then(
-      ({ user_bookmark_list }) => user_bookmark_list.bookmarks
-    );
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/widgets/quick-access-item.js b/app/assets/javascripts/discourse/app/widgets/quick-access-item.js
deleted file mode 100644
index 61e7668ff1c..00000000000
--- a/app/assets/javascripts/discourse/app/widgets/quick-access-item.js
+++ /dev/null
@@ -1,80 +0,0 @@
-import RawHtml from "discourse/widgets/raw-html";
-import { createWidget } from "discourse/widgets/widget";
-import { emojiUnescape } from "discourse/lib/text";
-import { escapeExpression } from "discourse/lib/utilities";
-import { h } from "virtual-dom";
-import { iconNode } from "discourse-common/lib/icon-library";
-
-/**
- * This helper widget tries to enforce a consistent look and behavior for any
- * item under any quick access panels.
- *
- * It accepts the following attributes:
- *   action
- *   actionParam
- *   content
- *   escapedContent
- *   href
- *   icon
- *   read
- *   username
- */
-export default createWidget("quick-access-item", {
-  tagName: "li",
-
-  buildClasses(attrs) {
-    const result = [];
-    if (attrs.className) {
-      result.push(attrs.className);
-    }
-    if (attrs.read === undefined || attrs.read) {
-      result.push("read");
-    }
-    return result;
-  },
-
-  html({ href, title, icon }) {
-    let content = this._contentHtml();
-
-    if (href) {
-      let topicId = href.match(/\/t\/.*?\/(\d+)/);
-      if (topicId && topicId[1]) {
-        topicId = escapeExpression(topicId[1]);
-        content = `<span data-topic-id="${topicId}">${content}</span>`;
-      }
-    }
-
-    return h("a", { attributes: this._linkAttributes(href, title) }, [
-      iconNode(icon),
-      new RawHtml({
-        html: `<div>${this._usernameHtml()}${content}</div>`,
-      }),
-    ]);
-  },
-
-  click(e) {
-    this.attrs.read = true;
-    if (this.attrs.action) {
-      e.preventDefault();
-      return this.sendWidgetAction(this.attrs.action, this.attrs.actionParam);
-    }
-  },
-
-  _linkAttributes(href, title) {
-    return { href, title };
-  },
-
-  _contentHtml() {
-    const content =
-      this.attrs.escapedContent || escapeExpression(this.attrs.content);
-    return emojiUnescape(content);
-  },
-
-  _usernameHtml() {
-    // Generate an empty `<span>` even if there is no username, because the
-    // first `<span>` is styled differently.
-    return this.attrs.username
-      ? `<span>${this.attrs.username}</span> `
-      : "<span></span>";
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/widgets/quick-access-messages.js b/app/assets/javascripts/discourse/app/widgets/quick-access-messages.js
deleted file mode 100644
index b4aad96358d..00000000000
--- a/app/assets/javascripts/discourse/app/widgets/quick-access-messages.js
+++ /dev/null
@@ -1,72 +0,0 @@
-import RawHtml from "discourse/widgets/raw-html";
-import { iconHTML } from "discourse-common/lib/icon-library";
-import { h } from "virtual-dom";
-import QuickAccessPanel from "discourse/widgets/quick-access-panel";
-import { createWidget, createWidgetFrom } from "discourse/widgets/widget";
-import { postUrl } from "discourse/lib/utilities";
-import getURL from "discourse-common/lib/get-url";
-import I18n from "I18n";
-import { htmlSafe } from "@ember/template";
-
-const ICON = "notification.private_message";
-
-function toItem(message) {
-  const lastReadPostNumber = message.last_read_post_number || 0;
-  const nextUnreadPostNumber = Math.min(
-    lastReadPostNumber + 1,
-    message.highest_post_number
-  );
-
-  return {
-    escapedContent: message.fancy_title,
-    href: postUrl(message.slug, message.id, nextUnreadPostNumber),
-    icon: ICON,
-    read: message.last_read_post_number >= message.highest_post_number,
-    username: message.last_poster_username,
-  };
-}
-
-createWidget("no-quick-access-messages", {
-  html() {
-    return h("div.empty-state", [
-      h("span.empty-state-title", I18n.t("user.no_messages_title")),
-      h(
-        "div.empty-state-body",
-        new RawHtml({
-          html:
-            "<p>" +
-            htmlSafe(
-              I18n.t("user.no_messages_body", {
-                aboutUrl: getURL("/about"),
-                icon: iconHTML("envelope"),
-              })
-            ) +
-            "</p>",
-        })
-      ),
-    ]);
-  },
-});
-
-createWidgetFrom(QuickAccessPanel, "quick-access-messages", {
-  buildKey: () => "quick-access-messages",
-  emptyStateWidget: "no-quick-access-messages",
-
-  showAllHref() {
-    return `${this.attrs.path}/messages`;
-  },
-
-  findNewItems() {
-    return this.store
-      .findFiltered("topicList", {
-        filter: `topics/private-messages/${this.currentUser.username_lower}`,
-      })
-      .then(({ topic_list }) => {
-        return topic_list.topics.map(toItem);
-      });
-  },
-
-  itemHtml(message) {
-    return this.attach("quick-access-item", message);
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/widgets/quick-access-notifications.js b/app/assets/javascripts/discourse/app/widgets/quick-access-notifications.js
deleted file mode 100644
index bd4a54df794..00000000000
--- a/app/assets/javascripts/discourse/app/widgets/quick-access-notifications.js
+++ /dev/null
@@ -1,89 +0,0 @@
-import RawHtml from "discourse/widgets/raw-html";
-import { iconHTML } from "discourse-common/lib/icon-library";
-import getURL from "discourse-common/lib/get-url";
-import QuickAccessPanel from "discourse/widgets/quick-access-panel";
-import { ajax } from "discourse/lib/ajax";
-import { createWidget, createWidgetFrom } from "discourse/widgets/widget";
-import { h } from "virtual-dom";
-import I18n from "I18n";
-import { dasherize } from "@ember/string";
-import { htmlSafe } from "@ember/template";
-
-const ICON = "bell";
-
-createWidget("no-quick-access-notifications", {
-  html() {
-    return h("div.empty-state", [
-      h("span.empty-state-title", I18n.t("user.no_notifications_title")),
-      h(
-        "div.empty-state-body",
-        new RawHtml({
-          html:
-            "<p>" +
-            htmlSafe(
-              I18n.t("user.no_notifications_body", {
-                preferencesUrl: getURL("/my/preferences/notifications"),
-                icon: iconHTML(ICON),
-              })
-            ) +
-            "</p>",
-        })
-      ),
-    ]);
-  },
-});
-
-createWidgetFrom(QuickAccessPanel, "quick-access-notifications", {
-  buildKey: () => "quick-access-notifications",
-  emptyStateWidget: "no-quick-access-notifications",
-
-  buildAttributes() {
-    return { tabindex: -1 };
-  },
-
-  markReadRequest() {
-    return ajax("/notifications/mark-read", { type: "PUT" });
-  },
-
-  newItemsLoaded() {
-    if (!this.currentUser.enforcedSecondFactor) {
-      this.currentUser.set("unread_notifications", 0);
-    }
-  },
-
-  itemHtml(notification) {
-    const notificationName =
-      this.site.notificationLookup[notification.notification_type];
-
-    return this.attach(
-      `${dasherize(notificationName)}-notification-item`,
-      notification,
-      {},
-      { fallbackWidgetName: "default-notification-item" }
-    );
-  },
-
-  findNewItems() {
-    return this._findStaleItemsInStore().refresh();
-  },
-
-  showAllHref() {
-    return `${this.attrs.path}/notifications`;
-  },
-
-  hasUnread() {
-    return this.getItems().filterBy("read", false).length > 0;
-  },
-
-  _findStaleItemsInStore() {
-    return this.store.findStale(
-      "notification",
-      {
-        recent: true,
-        silent: this.currentUser.enforcedSecondFactor,
-        limit: 30,
-      },
-      { cacheKey: "recent-notifications" }
-    );
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/widgets/quick-access-panel.js b/app/assets/javascripts/discourse/app/widgets/quick-access-panel.js
deleted file mode 100644
index 6c8036f5e53..00000000000
--- a/app/assets/javascripts/discourse/app/widgets/quick-access-panel.js
+++ /dev/null
@@ -1,165 +0,0 @@
-import I18n from "I18n";
-import { Promise } from "rsvp";
-import Session from "discourse/models/session";
-import { createWidget } from "discourse/widgets/widget";
-import { h } from "virtual-dom";
-import { postRNWebviewMessage } from "discourse/lib/utilities";
-
-/**
- * This tries to enforce a consistent flow of fetching, caching, refreshing,
- * and rendering for "quick access items".
- *
- * There are parts to introducing a new quick access panel:
- * 1. A user menu link that sends a `quickAccess` action, with a unique `type`.
- * 2. A `quick-access-${type}` widget, extended from `quick-access-panel`.
- */
-export default createWidget("quick-access-panel", {
-  tagName: "div.quick-access-panel",
-  emptyStatePlaceholderItemKey: null,
-  emptyStateWidget: null,
-  settings: {
-    viewAllLabel: null,
-  },
-
-  buildKey: () => {
-    throw Error('Cannot attach abstract widget "quick-access-panel".');
-  },
-
-  markReadRequest() {
-    return Promise.resolve();
-  },
-
-  hideBottomItems() {
-    return false;
-  },
-
-  hasUnread() {
-    return false;
-  },
-
-  showAllHref() {
-    return "";
-  },
-
-  findNewItems() {
-    return Promise.resolve([]);
-  },
-
-  buildId() {
-    return this.key;
-  },
-
-  buildAttributes() {
-    const attributes = this.attrs;
-    attributes["aria-labelledby"] = attributes.currentQuickAccess;
-    attributes["tabindex"] = "0";
-    attributes["role"] = "tabpanel";
-
-    return attributes;
-  },
-
-  newItemsLoaded() {},
-
-  itemHtml(item) {}, // eslint-disable-line no-unused-vars
-
-  emptyStatePlaceholderItem() {
-    if (this.emptyStatePlaceholderItemKey) {
-      return h("li.read", I18n.t(this.emptyStatePlaceholderItemKey));
-    } else if (this.emptyStateWidget) {
-      return this.attach(this.emptyStateWidget);
-    } else {
-      return "";
-    }
-  },
-
-  defaultState() {
-    return { items: [], loading: false, loaded: false };
-  },
-
-  markRead() {
-    return this.markReadRequest().then(() => {
-      this.refreshNotifications(this.state);
-      postRNWebviewMessage("markRead", "1");
-    });
-  },
-
-  refreshNotifications(state) {
-    if (state.loading) {
-      return;
-    }
-
-    if (this.getItems().length === 0) {
-      state.loading = true;
-    }
-
-    this.findNewItems()
-      .then((newItems) => this.setItems(newItems))
-      .catch(() => this.setItems([]))
-      .finally(() => {
-        state.loading = false;
-        state.loaded = true;
-        this.newItemsLoaded();
-        this.sendWidgetAction("itemsLoaded", {
-          hasUnread: this.hasUnread(),
-          markRead: () => this.markRead(),
-        });
-        this.scheduleRerender();
-      });
-  },
-
-  html(attrs, state) {
-    if (!state.loaded) {
-      this.refreshNotifications(state);
-    }
-
-    if (state.loading) {
-      return [h("div.spinner-container", h("div.spinner"))];
-    }
-
-    const items = this.getItems().length
-      ? this.getItems().map((item) => this.itemHtml(item))
-      : [this.emptyStatePlaceholderItem()];
-
-    let bottomItems = [];
-
-    if (!this.hideBottomItems()) {
-      const tab = I18n.t(this.attrs.titleKey).toLowerCase();
-
-      bottomItems.push(
-        // intentionally a link so it can be ctrl clicked
-        this.attach("link", {
-          title: "view_all",
-          titleOptions: { tab },
-          icon: "chevron-down",
-          label: this.settings.viewAllLabel,
-          className: "btn btn-default btn-icon no-text show-all",
-          "aria-label": "view_all",
-          ariaLabelOptions: { tab },
-          href: this.showAllHref(),
-        })
-      );
-    }
-
-    if (this.hasUnread()) {
-      bottomItems.push(
-        this.attach("button", {
-          title: "user.dismiss_notifications_tooltip",
-          icon: "check",
-          label: "user.dismiss",
-          className: "btn btn-default notifications-dismiss",
-          action: "dismissNotifications",
-        })
-      );
-    }
-
-    return [h("ul", items), h("div.panel-body-bottom", bottomItems)];
-  },
-
-  getItems() {
-    return Session.currentProp(`${this.key}-items`) || [];
-  },
-
-  setItems(newItems) {
-    Session.currentProp(`${this.key}-items`, newItems);
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/widgets/quick-access-profile.js b/app/assets/javascripts/discourse/app/widgets/quick-access-profile.js
deleted file mode 100644
index 7558f5d9f81..00000000000
--- a/app/assets/javascripts/discourse/app/widgets/quick-access-profile.js
+++ /dev/null
@@ -1,190 +0,0 @@
-import I18n from "I18n";
-import { Promise } from "rsvp";
-import QuickAccessItem from "discourse/widgets/quick-access-item";
-import QuickAccessPanel from "discourse/widgets/quick-access-panel";
-import { createWidgetFrom } from "discourse/widgets/widget";
-import showModal from "discourse/lib/show-modal";
-import { dateNode } from "discourse/helpers/node";
-
-const _extraItems = [];
-
-export function addQuickAccessProfileItem(item) {
-  _extraItems.push(item);
-}
-
-createWidgetFrom(QuickAccessItem, "logout-item", {
-  tagName: "li.logout",
-
-  html() {
-    return this.attach("flat-button", {
-      action: "logout",
-      icon: "sign-out-alt",
-      label: "user.log_out",
-    });
-  },
-});
-
-createWidgetFrom(QuickAccessItem, "user-status-item", {
-  tagName: "li.user-status",
-  services: ["userStatus"],
-
-  html() {
-    const status = this.currentUser.status;
-    if (status) {
-      return this._editStatusButton(status);
-    } else {
-      return this._setStatusButton();
-    }
-  },
-
-  hideMenuAndSetStatus() {
-    this.sendWidgetAction("toggleUserMenu");
-    showModal("user-status", {
-      title: "user_status.set_custom_status",
-      modalClass: "user-status",
-      model: {
-        status: this.currentUser.status,
-        pauseNotifications: this.currentUser.isInDoNotDisturb(),
-        saveAction: (status, pauseNotifications) =>
-          this.userStatus.set(status, pauseNotifications),
-        deleteAction: () => this.userStatus.clear(),
-      },
-    });
-  },
-
-  _setStatusButton() {
-    return this.attach("flat-button", {
-      action: "hideMenuAndSetStatus",
-      icon: "plus-circle",
-      label: "user_status.set_custom_status",
-    });
-  },
-
-  _editStatusButton(status) {
-    const menuButton = {
-      action: "hideMenuAndSetStatus",
-      emoji: status.emoji,
-      translatedLabel: status.description,
-    };
-
-    if (status.ends_at) {
-      menuButton.contents = dateNode(status.ends_at);
-    }
-
-    return this.attach("flat-button", menuButton);
-  },
-});
-
-createWidgetFrom(QuickAccessPanel, "quick-access-profile", {
-  tagName: "div.quick-access-panel.quick-access-profile",
-
-  buildKey: () => "quick-access-profile",
-
-  hideBottomItems() {
-    // Never show the button to the full profile page.
-    return true;
-  },
-
-  findNewItems() {
-    return Promise.resolve(this._getItems());
-  },
-
-  itemHtml(item) {
-    const widgetType = item.widget || "quick-access-item";
-    return this.attach(widgetType, item);
-  },
-
-  _getItems() {
-    const items = [];
-
-    if (this.siteSettings.enable_user_status) {
-      items.push({ widget: "user-status-item" });
-    }
-    items.push(...this._getDefaultItems());
-    if (this._showToggleAnonymousButton()) {
-      items.push(this._toggleAnonymousButton());
-    }
-    items.push(..._extraItems);
-
-    if (this.attrs.showLogoutButton) {
-      items.push({ widget: "logout-item" });
-    }
-    return items;
-  },
-
-  _getDefaultItems() {
-    let defaultItems = [
-      {
-        icon: "user",
-        href: `${this.attrs.path}/summary`,
-        content: I18n.t("user.summary.title"),
-        className: "summary",
-      },
-      {
-        icon: "stream",
-        href: `${this.attrs.path}/activity`,
-        content: I18n.t("user.activity_stream"),
-        className: "activity",
-      },
-    ];
-
-    if (this.currentUser.can_invite_to_forum) {
-      defaultItems.push({
-        icon: "user-plus",
-        href: `${this.attrs.path}/invited`,
-        content: I18n.t("user.invited.title"),
-        className: "invites",
-      });
-    }
-
-    defaultItems.push(
-      {
-        icon: "pencil-alt",
-        href: `${this.attrs.path}/activity/drafts`,
-        content:
-          this.currentUser.draft_count > 0
-            ? I18n.t("drafts.label_with_count", {
-                count: this.currentUser.draft_count,
-              })
-            : I18n.t("drafts.label"),
-        className: "drafts",
-      },
-      {
-        icon: "cog",
-        href: `${this.attrs.path}/preferences`,
-        content: I18n.t("user.preferences"),
-        className: "preferences",
-      }
-    );
-    defaultItems.push({ widget: "do-not-disturb" });
-
-    return defaultItems;
-  },
-
-  _toggleAnonymousButton() {
-    if (this.currentUser.is_anonymous) {
-      return {
-        action: "toggleAnonymous",
-        className: "disable-anonymous",
-        content: I18n.t("switch_from_anon"),
-        icon: "ban",
-      };
-    } else {
-      return {
-        action: "toggleAnonymous",
-        className: "enable-anonymous",
-        content: I18n.t("switch_to_anon"),
-        icon: "user-secret",
-      };
-    }
-  },
-
-  _showToggleAnonymousButton() {
-    return (
-      (this.siteSettings.allow_anonymous_posting &&
-        this.currentUser.trust_level >=
-          this.siteSettings.anonymous_posting_min_trust_level) ||
-      this.currentUser.is_anonymous
-    );
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/widgets/render-glimmer.js b/app/assets/javascripts/discourse/app/widgets/render-glimmer.js
index e4db7d87ca2..23caaa6f73c 100644
--- a/app/assets/javascripts/discourse/app/widgets/render-glimmer.js
+++ b/app/assets/javascripts/discourse/app/widgets/render-glimmer.js
@@ -1,7 +1,8 @@
-import Component from "@glimmer/component";
+import templateOnly from "@ember/component/template-only";
 import { setComponentTemplate } from "@ember/component";
 import { tracked } from "@glimmer/tracking";
 import { assert } from "@ember/debug";
+import { createWidgetFrom } from "discourse/widgets/widget";
 
 /*
 
@@ -78,39 +79,48 @@ export default class RenderGlimmer {
   /**
    * Create a RenderGlimmer instance
    * @param widget - the widget instance which is rendering this content
-   * @param tagName - tagName for the wrapper element (e.g. `div.my-class`)
+   * @param renderInto - a string describing a new wrapper element (e.g. `div.my-class`),
+   *  or an existing HTML element to append content into.
    * @param template - a glimmer template compiled via ember-cli-htmlbars
    * @param data - will be made available at `@data` in your template
    */
-  constructor(widget, tagName, template, data) {
+  constructor(widget, renderInto, template, data) {
     assert(
       "`template` should be a template compiled via `ember-cli-htmlbars`",
       template.name === "factory"
     );
-    this.tagName = tagName;
-    this.widget = widget;
+    this.renderInto = renderInto;
+    if (widget) {
+      this.widget = widget;
+    }
     this.template = template;
     this.data = data;
   }
 
   init() {
-    const [type, ...classNames] = this.tagName.split(".");
-    this.element = document.createElement(type);
-    this.element.classList.add(...classNames);
+    if (this.renderInto instanceof Element) {
+      this.element = this.renderInto;
+    } else {
+      const [type, ...classNames] = this.renderInto.split(".");
+      this.element = document.createElement(type);
+      this.element.classList.add(...classNames);
+    }
     this.connectComponent();
     return this.element;
   }
 
   destroy() {
     if (this._componentInfo) {
-      this.widget._findView().unmountChildComponent(this._componentInfo);
+      this.parentMountWidgetComponent.unmountChildComponent(
+        this._componentInfo
+      );
     }
   }
 
   update(prev) {
     if (
       prev.template.__id !== this.template.__id ||
-      prev.tagName !== this.tagName
+      prev.renderInto !== this.renderInto
     ) {
       // Totally different component, but the widget framework guessed it was the
       // same widget. Destroy old component and re-init the new one.
@@ -127,9 +137,10 @@ export default class RenderGlimmer {
   }
 
   connectComponent() {
-    const { element, template, widget } = this;
+    const { element, template } = this;
 
-    const component = class extends Component {};
+    const component = templateOnly();
+    component.name = "Widgets/RenderGlimmer";
     setComponentTemplate(template, component);
 
     this._componentInfo = {
@@ -137,9 +148,39 @@ export default class RenderGlimmer {
       component,
       @tracked data: this.data,
     };
-    const parentMountWidgetComponent = widget._findView();
-    parentMountWidgetComponent.mountChildComponent(this._componentInfo);
+
+    this.parentMountWidgetComponent.mountChildComponent(this._componentInfo);
+  }
+
+  get parentMountWidgetComponent() {
+    return this.widget?._findView() || this._emberView;
   }
 }
 
 RenderGlimmer.prototype.type = "Widget";
+
+/**
+ * Define a widget shim which renders a Glimmer template. Designed for incrementally migrating
+ * a widget-based UI to Glimmer. Widget attrs will be made available to your template at `@data`.
+ * For more details, see documentation for the RenderGlimmer class.
+ * @param name - the widget's name (which can then be used in `.attach` elsewhere)
+ * @param tagName - a string describing a new wrapper element (e.g. `div.my-class`)
+ * @param template - a glimmer template compiled via ember-cli-htmlbars
+ */
+export function registerWidgetShim(name, tagName, template) {
+  const RenderGlimmerShim = class MyClass extends RenderGlimmer {
+    constructor(attrs) {
+      super(null, tagName, template, attrs);
+      return this;
+    }
+
+    get widget() {
+      return this.parentWidget;
+    }
+
+    didRenderWidget() {}
+    willRerenderWidget() {}
+  };
+
+  createWidgetFrom(RenderGlimmerShim, name, {});
+}
diff --git a/app/assets/javascripts/discourse/app/widgets/search-menu-results.js b/app/assets/javascripts/discourse/app/widgets/search-menu-results.js
index bc88e254e5c..243c0991dd3 100644
--- a/app/assets/javascripts/discourse/app/widgets/search-menu-results.js
+++ b/app/assets/javascripts/discourse/app/widgets/search-menu-results.js
@@ -8,12 +8,14 @@ import { dateNode } from "discourse/helpers/node";
 import { emojiUnescape } from "discourse/lib/text";
 import getURL from "discourse-common/lib/get-url";
 import { h } from "virtual-dom";
-import hbs from "discourse/widgets/hbs-compiler";
+import widgetHbs from "discourse/widgets/hbs-compiler";
 import highlightSearch from "discourse/lib/highlight-search";
 import { iconNode } from "discourse-common/lib/icon-library";
 import renderTag from "discourse/lib/render-tag";
 import { MODIFIER_REGEXP } from "discourse/widgets/search-menu";
 import User from "discourse/models/user";
+import { hbs } from "ember-cli-htmlbars";
+import RenderGlimmer from "discourse/widgets/render-glimmer";
 
 const suggestionShortcuts = [
   "in:title",
@@ -73,6 +75,10 @@ export function addQuickSearchRandomTip(tip) {
   }
 }
 
+export function removeDefaultQuickSearchRandomTips() {
+  QUICK_TIPS = QUICK_TIPS.filter((tip) => !DEFAULT_QUICK_TIPS.includes(tip));
+}
+
 export function resetQuickSearchRandomTips() {
   QUICK_TIPS = [].concat(DEFAULT_QUICK_TIPS);
 }
@@ -284,7 +290,14 @@ createWidget("search-menu-results", {
   tagName: "div.results",
 
   html(attrs) {
-    const { term, suggestionKeyword, results, searchTopics } = attrs;
+    const {
+      term,
+      suggestionKeyword,
+      inTopicContext,
+      results,
+      searchTopics,
+      onLinkClicked,
+    } = attrs;
 
     if (suggestionKeyword) {
       return this.attach("search-menu-assistant", {
@@ -385,9 +398,41 @@ createWidget("search-menu-results", {
       }
     }
 
+    content.push(
+      new RenderGlimmer(
+        this,
+        "div",
+        hbs`<PluginOutlet @name="search-menu-results-top" @outletArgs={{@data.outletArgs}}/>`,
+        {
+          outletArgs: {
+            searchTerm: term,
+            inTopicContext,
+            onLinkClicked,
+            searchTopics,
+          },
+        }
+      )
+    );
+
     content.push(categoriesAndTags);
     content.push(usersAndGroups);
 
+    content.push(
+      new RenderGlimmer(
+        this,
+        "div",
+        hbs`<PluginOutlet @name="search-menu-results-bottom" @outletArgs={{@data.outletArgs}}/>`,
+        {
+          outletArgs: {
+            searchTerm: term,
+            inTopicContext,
+            onLinkClicked,
+            searchTopics,
+          },
+        }
+      )
+    );
+
     return content;
   },
 });
@@ -415,13 +460,42 @@ createWidget("search-menu-assistant", {
 
     const content = [];
     const { suggestionKeyword, term } = attrs;
-    let prefix = term?.split(suggestionKeyword)[0].trim() || "";
 
-    if (prefix.length) {
-      prefix = `${prefix} `;
+    let prefix;
+    if (suggestionKeyword !== "+") {
+      prefix = term?.split(suggestionKeyword)[0].trim() || "";
+
+      if (prefix.length) {
+        prefix = `${prefix} `;
+      }
     }
 
     switch (suggestionKeyword) {
+      case "+":
+        attrs.results.forEach((item) => {
+          if (item.additionalTags) {
+            prefix = term?.split(" ").slice(0, -1).join(" ").trim() || "";
+          } else {
+            prefix = term?.split("#")[0].trim() || "";
+          }
+
+          if (prefix.length) {
+            prefix = `${prefix} `;
+          }
+
+          content.push(
+            this.attach("search-menu-assistant-item", {
+              prefix,
+              tag: item.tagName,
+              additionalTags: item.additionalTags,
+              category: item.category,
+              slug: term,
+              withInLabel: attrs.withInLabel,
+              isIntersection: true,
+            })
+          );
+        });
+        break;
       case "#":
         attrs.results.forEach((item) => {
           if (item.model) {
@@ -457,18 +531,6 @@ createWidget("search-menu-assistant", {
           this.router.currentRouteName.startsWith("topic.")
         ) {
           const user = attrs.results[0];
-          content.push(
-            this.attach("search-menu-assistant-item", {
-              prefix,
-              user,
-              setTopicContext: true,
-              slug: `${prefix}@${user.username}`,
-              suffix: h(
-                "span.label-suffix",
-                ` ${I18n.t("search.in_this_topic")}`
-              ),
-            })
-          );
           content.push(
             this.attach("search-menu-assistant-item", {
               extraHint: I18n.t("search.enter_hint"),
@@ -481,6 +543,18 @@ createWidget("search-menu-assistant", {
               ),
             })
           );
+          content.push(
+            this.attach("search-menu-assistant-item", {
+              prefix,
+              user,
+              setTopicContext: true,
+              slug: `${prefix}@${user.username}`,
+              suffix: h(
+                "span.label-suffix",
+                ` ${I18n.t("search.in_this_topic")}`
+              ),
+            })
+          );
         } else {
           attrs.results.forEach((user) => {
             content.push(
@@ -523,6 +597,10 @@ createWidget("search-menu-initial-options", {
     const content = [];
 
     if (attrs.term || ctx) {
+      if (attrs.term) {
+        content.push(this.defaultRow(attrs.term, { withLabel: true }));
+      }
+
       if (ctx) {
         const term = attrs.term || "";
         switch (ctx.type) {
@@ -572,6 +650,36 @@ createWidget("search-menu-initial-options", {
               })
             );
             break;
+          case "tagIntersection":
+            let tagTerm;
+            if (ctx.additionalTags) {
+              const tags = [ctx.tagId, ...ctx.additionalTags];
+              tagTerm = `${term} tags:${tags.join("+")}`;
+            } else {
+              tagTerm = `${term} #${ctx.tagId}`;
+            }
+            let suggestionOptions = {
+              tagName: ctx.tagId,
+              additionalTags: ctx.additionalTags,
+            };
+            if (ctx.category) {
+              const categorySlug = ctx.category.parentCategory
+                ? `#${ctx.category.parentCategory.slug}:${ctx.category.slug}`
+                : `#${ctx.category.slug}`;
+              suggestionOptions.categoryName = categorySlug;
+              suggestionOptions.category = ctx.category;
+              tagTerm = tagTerm + ` ${categorySlug}`;
+            }
+
+            content.push(
+              this.attach("search-menu-assistant", {
+                term: tagTerm,
+                suggestionKeyword: "+",
+                results: [suggestionOptions],
+                withInLabel: true,
+              })
+            );
+            break;
           case "user":
             content.push(
               this.attach("search-menu-assistant-item", {
@@ -591,9 +699,6 @@ createWidget("search-menu-initial-options", {
         }
       }
 
-      if (attrs.term) {
-        content.push(this.defaultRow(attrs.term, { withLabel: true }));
-      }
       return content;
     }
 
@@ -617,7 +722,7 @@ createWidget("search-menu-initial-options", {
       slug: term,
       extraHint: I18n.t("search.enter_hint"),
       label: [
-        h("span.keyword", `${term} `),
+        h("span.keyword", `${term}`),
         opts.withLabel
           ? h("span.label-suffix", I18n.t("search.in_topics_posts"))
           : null,
@@ -677,11 +782,20 @@ createWidget("search-menu-assistant-item", {
           link: false,
         })
       );
-    } else if (attrs.tag) {
-      attributes.href = getURL(`/tag/${attrs.tag}`);
 
-      content.push(iconNode("tag"));
-      content.push(h("span.search-item-tag", attrs.tag));
+      // category and tag combination
+      if (attrs.tag && attrs.isIntersection) {
+        attributes.href = getURL(`/tag/${attrs.tag}`);
+        content.push(h("span.search-item-tag", [iconNode("tag"), attrs.tag]));
+      }
+    } else if (attrs.tag) {
+      if (attrs.isIntersection && attrs.additionalTags?.length) {
+        const tags = [attrs.tag, ...attrs.additionalTags];
+        content.push(h("span.search-item-tag", `tags:${tags.join("+")}`));
+      } else {
+        attributes.href = getURL(`/tag/${attrs.tag}`);
+        content.push(h("span.search-item-tag", [iconNode("tag"), attrs.tag]));
+      }
     } else if (attrs.user) {
       const userResult = [
         avatarImg("small", {
@@ -709,6 +823,7 @@ createWidget("search-menu-assistant-item", {
       value: this.attrs.slug,
       searchTopics: true,
       setTopicContext: this.attrs.setTopicContext,
+      origin: this.attrs.origin,
     });
     e.preventDefault();
     return false;
@@ -721,10 +836,16 @@ createWidget("random-quick-tip", {
   buildKey: () => "random-quick-tip",
 
   defaultState() {
-    return QUICK_TIPS[Math.floor(Math.random() * QUICK_TIPS.length)];
+    return QUICK_TIPS.length
+      ? QUICK_TIPS[Math.floor(Math.random() * QUICK_TIPS.length)]
+      : {};
   },
 
   html(attrs, state) {
+    if (!Object.keys(state).length) {
+      return;
+    }
+
     return [
       h(
         `span.tip-label${state.clickable ? ".tip-clickable" : ""}`,
@@ -750,7 +871,7 @@ createWidget("random-quick-tip", {
 createWidget("search-menu-recent-searches", {
   tagName: "div.search-menu-recent",
 
-  template: hbs`
+  template: widgetHbs`
     <div class="heading">
       <h4>{{i18n "search.recent"}}</h4>
       {{flat-button
@@ -764,7 +885,7 @@ createWidget("search-menu-recent-searches", {
     {{#each this.currentUser.recent_searches as |slug|}}
       {{attach
         widget="search-menu-assistant-item"
-        attrs=(hash slug=slug icon="history")
+        attrs=(hash slug=slug icon="history" origin="recent-search")
       }}
     {{/each}}
   `,
diff --git a/app/assets/javascripts/discourse/app/widgets/search-menu.js b/app/assets/javascripts/discourse/app/widgets/search-menu.js
index ca44e882354..fcbbc105843 100644
--- a/app/assets/javascripts/discourse/app/widgets/search-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/search-menu.js
@@ -27,6 +27,15 @@ export const DEFAULT_TYPE_FILTER = "exclude_topics";
 
 const searchData = {};
 
+const onKeyDownCallbacks = [];
+
+export function addOnKeyDownCallback(fn) {
+  onKeyDownCallbacks.push(fn);
+}
+export function resetOnKeyDownCallbacks() {
+  onKeyDownCallbacks.clear();
+}
+
 export function initSearchData() {
   searchData.loading = false;
   searchData.results = {};
@@ -322,6 +331,8 @@ export default createWidget("search-menu", {
           suggestionResults: searchData.suggestionResults,
           searchTopics: SearchHelper.includesTopics(),
           inPMInboxContext: this.state.inPMInboxContext,
+          inTopicContext: this.state.inTopicContext,
+          onLinkClicked: this.onLinkClicked.bind(this),
         })
       );
     }
@@ -348,8 +359,21 @@ export default createWidget("search-menu", {
     });
   },
 
-  mouseDownOutside() {
-    this.sendWidgetAction("toggleSearchMenu");
+  onLinkClicked() {
+    return this.sendWidgetAction("linkClickedEvent");
+  },
+
+  mouseDown(e) {
+    if (e.target === document.querySelector("input#search-term")) {
+      this.state.inputSelectionEvent = true;
+    }
+  },
+
+  clickOutside() {
+    if (this.key === "search-menu" && !this.state.inputSelectionEvent) {
+      this.sendWidgetAction("toggleSearchMenu");
+    }
+    this.state.inputSelectionEvent = false;
   },
 
   clearTopicContext() {
@@ -362,6 +386,18 @@ export default createWidget("search-menu", {
   },
 
   keyDown(e) {
+    if (
+      onKeyDownCallbacks.length &&
+      !onKeyDownCallbacks.some((fn) => fn(this, e))
+    ) {
+      // Return early if any callbacks return false
+      return;
+    }
+
+    this.handleKeyDown(e);
+  },
+
+  handleKeyDown(e) {
     if (e.key === "Escape") {
       this.sendWidgetAction("toggleSearchMenu");
       document.querySelector("#search-button").focus();
diff --git a/app/assets/javascripts/discourse/app/widgets/summary-box.js b/app/assets/javascripts/discourse/app/widgets/summary-box.js
new file mode 100644
index 00000000000..fa0e425a1b6
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/widgets/summary-box.js
@@ -0,0 +1,116 @@
+import { createWidget } from "discourse/widgets/widget";
+import { hbs } from "ember-cli-htmlbars";
+import { ajax } from "discourse/lib/ajax";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { cookAsync } from "discourse/lib/text";
+import RawHtml from "discourse/widgets/raw-html";
+import I18n from "I18n";
+import { shortDateNoYear } from "discourse/lib/formatter";
+import { h } from "virtual-dom";
+import { iconNode } from "discourse-common/lib/icon-library";
+import RenderGlimmer from "discourse/widgets/render-glimmer";
+
+export default createWidget("summary-box", {
+  tagName: "article.summary-box",
+  buildKey: (attrs) => `summary-box-${attrs.topicId}`,
+
+  defaultState() {
+    return { expandSummarizedOn: false };
+  },
+
+  html(attrs) {
+    const html = [];
+
+    const summary = attrs.summary;
+
+    if (summary && !attrs.skipAgeCheck) {
+      html.push(
+        new RawHtml({
+          html: `<div class="generated-summary">${summary.summarized_text}</div>`,
+        })
+      );
+
+      const summarizationInfo = [
+        h("p", {}, [
+          I18n.t("summary.summarized_on", { date: summary.summarized_on }),
+          this.buildTooltip(attrs),
+        ]),
+      ];
+
+      if (summary.outdated) {
+        summarizationInfo.push(this.outdatedSummaryWarning(attrs));
+      }
+
+      html.push(h("div.summarized-on", {}, summarizationInfo));
+    } else {
+      html.push(this.buildSummarySkeleton());
+      this.fetchSummary(attrs.topicId, attrs.skipAgeCheck);
+    }
+
+    return html;
+  },
+
+  buildSummarySkeleton() {
+    return new RenderGlimmer(
+      this,
+      "div.ai-summary__container",
+      hbs`{{ai-summary-skeleton}}`
+    );
+  },
+
+  buildTooltip(attrs) {
+    return new RenderGlimmer(
+      this,
+      "span",
+      hbs`{{d-icon "info-circle"}}<DTooltip @placement="top-end">
+        {{i18n "summary.model_used" model=@data.summarizedBy}}
+      </DTooltip>`,
+      {
+        summarizedBy: attrs.summary.summarized_by,
+      }
+    );
+  },
+
+  outdatedSummaryWarning(attrs) {
+    let outdatedText = I18n.t("summary.outdated");
+
+    if (
+      !attrs.hasTopRepliesSummary &&
+      attrs.summary.new_posts_since_summary > 0
+    ) {
+      outdatedText += " ";
+      outdatedText += I18n.t("summary.outdated_posts", {
+        count: attrs.summary.new_posts_since_summary,
+      });
+    }
+
+    return h("p.outdated-summary", {}, [
+      outdatedText,
+      iconNode("exclamation-triangle", { class: "info-icon" }),
+    ]);
+  },
+
+  fetchSummary(topicId, skipAgeCheck) {
+    let fetchURL = `/t/${topicId}/strategy-summary`;
+
+    if (skipAgeCheck) {
+      fetchURL += "?skip_age_check=true";
+    }
+
+    ajax(fetchURL)
+      .then((data) => {
+        cookAsync(data.summary).then((cooked) => {
+          // We store the summary in the parent so we can re-render it without doing a new request.
+          data.summarized_text = cooked.string;
+          data.summarized_on = shortDateNoYear(data.summarized_on);
+
+          if (skipAgeCheck) {
+            data.regenerated = true;
+          }
+
+          this.sendWidgetEvent("summaryUpdated", data);
+        });
+      })
+      .catch(popupAjaxError);
+  },
+});
diff --git a/app/assets/javascripts/discourse/app/widgets/toggle-topic-summary.js b/app/assets/javascripts/discourse/app/widgets/toggle-topic-summary.js
index 82f9dae5ca4..fef771cc617 100644
--- a/app/assets/javascripts/discourse/app/widgets/toggle-topic-summary.js
+++ b/app/assets/javascripts/discourse/app/widgets/toggle-topic-summary.js
@@ -1,6 +1,7 @@
 import I18n from "I18n";
 import RawHtml from "discourse/widgets/raw-html";
 import { createWidget } from "discourse/widgets/widget";
+import { h } from "virtual-dom";
 
 const MIN_POST_READ_TIME = 4;
 
@@ -33,16 +34,121 @@ createWidget("toggle-summary-description", {
 
 export default createWidget("toggle-topic-summary", {
   tagName: "section.information.toggle-summary",
-  html(attrs) {
-    return [
-      this.attach("toggle-summary-description", attrs),
-      this.attach("button", {
-        className: "btn btn-primary",
-        icon: attrs.topicSummaryEnabled ? null : "layer-group",
-        title: attrs.topicSummaryEnabled ? null : "summary.short_title",
-        label: attrs.topicSummaryEnabled ? "summary.disable" : "summary.enable",
-        action: attrs.topicSummaryEnabled ? "cancelFilter" : "showSummary",
-      }),
-    ];
+  buildKey: (attrs) => `toggle-topic-summary-${attrs.topicId}`,
+
+  defaultState() {
+    return {
+      expandSummaryBox: false,
+      summaryBoxHidden: true,
+      summary: "",
+      summarizedOn: null,
+      summarizedBy: null,
+    };
+  },
+
+  html(attrs, state) {
+    const html = [];
+    const summarizationButtons = [];
+
+    if (attrs.summarizable) {
+      const canRegenerate =
+        !state.regenerate &&
+        state.summary.outdated &&
+        state.summary.can_regenerate;
+      const canCollapse =
+        !canRegenerate && !this.loadingSummary() && this.summaryBoxVisble();
+      const summarizeButton = canCollapse
+        ? this.hideSummaryButton()
+        : this.generateSummaryButton(canRegenerate);
+
+      summarizationButtons.push(summarizeButton);
+    }
+
+    if (attrs.hasTopRepliesSummary) {
+      html.push(this.attach("toggle-summary-description", attrs));
+      summarizationButtons.push(
+        this.attach("button", {
+          className: "btn top-replies",
+          icon: attrs.topicSummaryEnabled ? null : "layer-group",
+          title: attrs.topicSummaryEnabled ? null : "summary.short_title",
+          label: attrs.topicSummaryEnabled
+            ? "summary.disable"
+            : "summary.enable",
+          action: attrs.topicSummaryEnabled ? "cancelFilter" : "showTopReplies",
+        })
+      );
+    }
+
+    if (summarizationButtons) {
+      html.push(h("div.summarization-buttons", summarizationButtons));
+    }
+
+    if (this.summaryBoxVisble()) {
+      attrs.summary = state.summary;
+      attrs.skipAgeCheck = state.regenerate;
+
+      html.push(this.attach("summary-box", attrs));
+    }
+
+    return html;
+  },
+
+  generateSummaryButton(canRegenerate) {
+    const title = canRegenerate
+      ? "summary.buttons.regenerate"
+      : "summary.buttons.generate";
+    const icon = canRegenerate ? "sync" : "magic";
+
+    return this.attach("button", {
+      className: "btn btn-primary topic-strategy-summarization",
+      icon,
+      title: I18n.t(title),
+      translatedTitle: I18n.t(title),
+      translatedLabel: I18n.t(title),
+      action: canRegenerate ? "regenerateSummary" : "expandSummaryBox",
+      disabled: this.loadingSummary(),
+    });
+  },
+
+  hideSummaryButton() {
+    return this.attach("button", {
+      className: "btn btn-primary topic-strategy-summarization",
+      icon: "chevron-up",
+      title: "summary.buttons.hide",
+      label: "summary.buttons.hide",
+      action: "toggleSummaryBox",
+      disabled: this.loadingSummary(),
+    });
+  },
+
+  loadingSummary() {
+    return (
+      this.summaryBoxVisble() && (!this.state.summary || this.state.regenerate)
+    );
+  },
+
+  summaryUpdatedEvent(summary) {
+    this.state.summary = summary;
+
+    if (summary.regenerated) {
+      this.state.regenerate = false;
+    }
+  },
+
+  summaryBoxVisble() {
+    return this.state.expandSummaryBox && !this.state.summaryBoxHidden;
+  },
+
+  expandSummaryBox() {
+    this.state.expandSummaryBox = true;
+    this.state.summaryBoxHidden = false;
+  },
+
+  regenerateSummary() {
+    this.state.regenerate = true;
+  },
+
+  toggleSummaryBox() {
+    this.state.summaryBoxHidden = !this.state.summaryBoxHidden;
   },
 });
diff --git a/app/assets/javascripts/discourse/app/widgets/topic-map.js b/app/assets/javascripts/discourse/app/widgets/topic-map.js
index d408931dedf..67d6bdd323d 100644
--- a/app/assets/javascripts/discourse/app/widgets/topic-map.js
+++ b/app/assets/javascripts/discourse/app/widgets/topic-map.js
@@ -80,12 +80,14 @@ createWidget("topic-participant", {
       linkContents.push(h("span.post-count", attrs.post_count.toString()));
     }
 
-    if (attrs.flair_url || attrs.flair_bg_color) {
-      linkContents.push(this.attach("avatar-flair", attrs));
-    } else {
-      const autoFlairAttrs = autoGroupFlairForUser(this.site, attrs);
-      if (autoFlairAttrs) {
-        linkContents.push(this.attach("avatar-flair", autoFlairAttrs));
+    if (attrs.flair_group_id) {
+      if (attrs.flair_url || attrs.flair_bg_color) {
+        linkContents.push(this.attach("avatar-flair", attrs));
+      } else {
+        const autoFlairAttrs = autoGroupFlairForUser(this.site, attrs);
+        if (autoFlairAttrs) {
+          linkContents.push(this.attach("avatar-flair", autoFlairAttrs));
+        }
       }
     }
     return h(
@@ -254,12 +256,14 @@ createWidget("topic-map-summary", {
           ? "topic.expand_details"
           : "topic.collapse_details",
         icon: state.collapsed ? "chevron-down" : "chevron-up",
+        ariaExpanded: state.collapsed ? "false" : "true",
+        ariaControls: "topic-map-expanded",
         action: "toggleMap",
         className: "btn",
       })
     );
 
-    return [nav, h("ul.clearfix", contents)];
+    return [nav, h("ul", contents)];
   },
 });
 
@@ -296,7 +300,7 @@ createWidget("topic-map-link", {
 });
 
 createWidget("topic-map-expanded", {
-  tagName: "section.topic-map-expanded",
+  tagName: "section.topic-map-expanded#topic-map-expanded",
   buildKey: (attrs) => `topic-map-expanded-${attrs.id}`,
 
   defaultState() {
@@ -307,7 +311,7 @@ createWidget("topic-map-expanded", {
     let avatars;
 
     if (attrs.participants && attrs.participants.length > 0) {
-      avatars = h("section.avatars.clearfix", [
+      avatars = h("section.avatars", [
         h("h3", I18n.t("topic_map.participants_title")),
         renderParticipants.call(this, attrs.userFilters, attrs.participants),
       ]);
@@ -372,7 +376,7 @@ export default createWidget("topic-map", {
   buildKey: (attrs) => `topic-map-${attrs.id}`,
 
   defaultState(attrs) {
-    return { collapsed: !attrs.hasTopicSummary };
+    return { collapsed: !attrs.hasTopRepliesSummary };
   },
 
   html(attrs, state) {
@@ -382,7 +386,7 @@ export default createWidget("topic-map", {
       contents.push(this.attach("topic-map-expanded", attrs));
     }
 
-    if (attrs.hasTopicSummary) {
+    if (attrs.hasTopRepliesSummary || attrs.summarizable) {
       contents.push(this.attach("toggle-topic-summary", attrs));
     }
 
diff --git a/app/assets/javascripts/discourse/app/widgets/topic-timeline.js b/app/assets/javascripts/discourse/app/widgets/topic-timeline.js
deleted file mode 100644
index 45a24e1ad2e..00000000000
--- a/app/assets/javascripts/discourse/app/widgets/topic-timeline.js
+++ /dev/null
@@ -1,628 +0,0 @@
-import ComponentConnector from "discourse/widgets/component-connector";
-import I18n from "I18n";
-import RawHtml from "discourse/widgets/raw-html";
-import { createWidget } from "discourse/widgets/widget";
-import { actionDescriptionHtml } from "discourse/widgets/post-small-action";
-import { h } from "virtual-dom";
-import { iconNode } from "discourse-common/lib/icon-library";
-import discourseLater from "discourse-common/lib/later";
-import { relativeAge } from "discourse/lib/formatter";
-import renderTags from "discourse/lib/render-tags";
-import renderTopicFeaturedLink from "discourse/lib/render-topic-featured-link";
-import { hideUserTip } from "discourse/lib/user-tips";
-
-const SCROLLER_HEIGHT = 50;
-const LAST_READ_HEIGHT = 20;
-const MIN_SCROLLAREA_HEIGHT = 170;
-const MAX_SCROLLAREA_HEIGHT = 300;
-
-function scrollareaHeight() {
-  const composerHeight =
-      document.getElementById("reply-control").offsetHeight || 0,
-    headerHeight = document.querySelectorAll(".d-header")[0].offsetHeight || 0;
-
-  // scrollarea takes up about half of the timeline's height
-  const availableHeight =
-    (window.innerHeight - composerHeight - headerHeight) / 2;
-
-  return Math.max(
-    MIN_SCROLLAREA_HEIGHT,
-    Math.min(availableHeight, MAX_SCROLLAREA_HEIGHT)
-  );
-}
-
-function scrollareaRemaining() {
-  return scrollareaHeight() - SCROLLER_HEIGHT;
-}
-
-function clamp(p, min = 0.0, max = 1.0) {
-  return Math.max(Math.min(p, max), min);
-}
-
-function attachBackButton(widget) {
-  return widget.attach("button", {
-    className: "btn-primary btn-small back-button",
-    label: "topic.timeline.back",
-    title: "topic.timeline.back_description",
-    action: "goBack",
-  });
-}
-
-createWidget("timeline-last-read", {
-  tagName: "div.timeline-last-read",
-
-  buildAttributes(attrs) {
-    const bottom = scrollareaHeight() - LAST_READ_HEIGHT / 2;
-    const top = attrs.top > bottom ? bottom : attrs.top;
-    return { style: `height: ${LAST_READ_HEIGHT}px; top: ${top}px` };
-  },
-
-  html(attrs) {
-    const result = [iconNode("minus", { class: "progress" })];
-    if (attrs.showButton) {
-      result.push(attachBackButton(this));
-    }
-
-    return result;
-  },
-});
-
-function timelineDate(date) {
-  const fmt =
-    date.getFullYear() === new Date().getFullYear()
-      ? "long_no_year_no_time"
-      : "timeline_date";
-  return moment(date).format(I18n.t(`dates.${fmt}`));
-}
-
-createWidget("timeline-scroller", {
-  tagName: "div.timeline-scroller",
-  buildKey: (attrs) => `timeline-scroller-${attrs.topicId}`,
-
-  defaultState() {
-    return { dragging: false };
-  },
-
-  buildAttributes() {
-    return { style: `height: ${SCROLLER_HEIGHT}px` };
-  },
-
-  html(attrs, state) {
-    const { current, total, date } = attrs;
-
-    const contents = [
-      h(
-        "div.timeline-replies",
-        I18n.t(`topic.timeline.replies_short`, { current, total })
-      ),
-    ];
-
-    if (date) {
-      contents.push(h("div.timeline-ago", timelineDate(date)));
-    }
-
-    if (attrs.showDockedButton && !state.dragging) {
-      contents.push(attachBackButton(this));
-    }
-    let result = [
-      h("div.timeline-handle"),
-      h("div.timeline-scroller-content", contents),
-    ];
-
-    if (attrs.fullScreen) {
-      result = [result[1], result[0]];
-    }
-
-    return result;
-  },
-
-  drag(e) {
-    this.state.dragging = true;
-    this.sendWidgetAction("updatePercentage", e.pageY);
-  },
-
-  dragEnd(e) {
-    this.state.dragging = false;
-    if ($(e.target).is("button")) {
-      this.sendWidgetAction("goBack");
-    } else {
-      this.sendWidgetAction("commit");
-    }
-  },
-});
-
-createWidget("timeline-padding", {
-  tagName: "div.timeline-padding",
-  buildAttributes(attrs) {
-    return { style: `height: ${attrs.height}px` };
-  },
-
-  click(e) {
-    this.sendWidgetAction("updatePercentage", e.pageY);
-    this.sendWidgetAction("commit");
-  },
-});
-
-createWidget("timeline-scrollarea", {
-  tagName: "div.timeline-scrollarea",
-  buildKey: (attrs) => `timeline-scrollarea-${attrs.topic.id}`,
-
-  buildAttributes() {
-    return { style: `height: ${scrollareaHeight()}px` };
-  },
-
-  defaultState(attrs) {
-    return {
-      percentage: this._percentFor(attrs.topic, attrs.enteredIndex + 1),
-      scrolledPost: 1,
-    };
-  },
-
-  position() {
-    const { attrs } = this;
-    const percentage = this.state.percentage;
-    const topic = attrs.topic;
-    const postStream = topic.get("postStream");
-    const total = postStream.get("filteredPostsCount");
-
-    const scrollPosition = clamp(Math.floor(total * percentage), 0, total) + 1;
-    const current = clamp(scrollPosition, 1, total);
-
-    const daysAgo = postStream.closestDaysAgoFor(current);
-    let date;
-
-    if (daysAgo === undefined) {
-      const post = postStream
-        .get("posts")
-        .findBy("id", postStream.get("stream")[current]);
-
-      if (post) {
-        date = new Date(post.get("created_at"));
-      }
-    } else if (daysAgo !== null) {
-      date = new Date();
-      date.setDate(date.getDate() - daysAgo || 0);
-    } else {
-      date = null;
-    }
-
-    const result = {
-      current,
-      scrollPosition,
-      total,
-      date,
-      lastRead: null,
-      lastReadPercentage: null,
-    };
-
-    const lastReadId = topic.last_read_post_id;
-    const lastReadNumber = topic.last_read_post_number;
-
-    if (lastReadId && lastReadNumber) {
-      const idx = postStream.get("stream").indexOf(lastReadId) + 1;
-      result.lastRead = idx;
-      result.lastReadPercentage = this._percentFor(topic, idx);
-    }
-
-    if (this.state.position !== result.scrollPosition) {
-      this.state.position = result.scrollPosition;
-      this.sendWidgetAction("updatePosition", current);
-    }
-
-    return result;
-  },
-
-  html(attrs, state) {
-    const position = this.position();
-
-    state.scrolledPost = position.current;
-    const percentage = state.percentage;
-    if (percentage === null) {
-      return;
-    }
-
-    const before = scrollareaRemaining() * percentage;
-    const after = scrollareaHeight() - before - SCROLLER_HEIGHT;
-
-    let showButton = false;
-    const hasBackPosition =
-      position.lastRead &&
-      position.lastRead > 3 &&
-      position.lastRead > position.current &&
-      Math.abs(position.lastRead - position.current) > 3 &&
-      Math.abs(position.lastRead - position.total) > 1 &&
-      position.lastRead !== position.total;
-
-    if (hasBackPosition) {
-      const lastReadTop = Math.round(
-        position.lastReadPercentage * scrollareaHeight()
-      );
-      showButton =
-        before + SCROLLER_HEIGHT - 5 < lastReadTop || before > lastReadTop + 25;
-    }
-
-    let scrollerAttrs = position;
-    scrollerAttrs.showDockedButton =
-      !attrs.mobileView && hasBackPosition && !showButton;
-    scrollerAttrs.fullScreen = attrs.fullScreen;
-    scrollerAttrs.topicId = attrs.topic.id;
-
-    const result = [
-      this.attach("timeline-padding", { height: before }),
-      this.attach("timeline-scroller", scrollerAttrs),
-      this.attach("timeline-padding", { height: after }),
-    ];
-
-    if (hasBackPosition) {
-      const lastReadTop = Math.round(
-        position.lastReadPercentage * scrollareaHeight()
-      );
-      result.push(
-        this.attach("timeline-last-read", {
-          top: lastReadTop,
-          lastRead: position.lastRead,
-          showButton,
-        })
-      );
-    }
-
-    return result;
-  },
-
-  updatePercentage(y) {
-    const $area = $(".timeline-scrollarea");
-    const areaTop = $area.offset().top;
-
-    const percentage = clamp(parseFloat(y - areaTop) / $area.height());
-
-    this.state.percentage = percentage;
-  },
-
-  commit() {
-    const position = this.position();
-    this.state.scrolledPost = position.current;
-
-    if (position.current === position.scrollPosition) {
-      this.sendWidgetAction("jumpToIndex", position.current);
-    } else {
-      this.sendWidgetAction("jumpEnd");
-    }
-  },
-
-  topicCurrentPostScrolled(event) {
-    this.state.percentage = event.percent;
-  },
-
-  _percentFor(topic, postIndex) {
-    const total = topic.get("postStream.filteredPostsCount");
-    return clamp(parseFloat(postIndex - 1.0) / total);
-  },
-
-  goBack() {
-    this.sendWidgetAction("jumpToIndex", this.position().lastRead);
-  },
-});
-
-createWidget("topic-timeline-container", {
-  tagName: "div.timeline-container",
-  buildClasses(attrs) {
-    if (attrs.fullScreen) {
-      if (attrs.addShowClass) {
-        return "timeline-fullscreen show";
-      } else {
-        return "timeline-fullscreen";
-      }
-    }
-    if (attrs.dockAt) {
-      const result = ["timeline-docked"];
-      if (attrs.dockBottom) {
-        result.push("timeline-docked-bottom");
-      }
-      return result.join(" ");
-    }
-  },
-
-  html(attrs) {
-    return this.attach("topic-timeline", attrs);
-  },
-});
-
-createWidget("timeline-controls", {
-  tagName: "div.timeline-controls",
-
-  html(attrs) {
-    const controls = [];
-    const { fullScreen, currentUser, topic } = attrs;
-
-    if (!fullScreen && currentUser) {
-      controls.push(
-        this.attach("topic-admin-menu-button", {
-          topic,
-          addKeyboardTargetClass: true,
-        })
-      );
-    }
-
-    return controls;
-  },
-});
-
-createWidget("timeline-footer-controls", {
-  tagName: "div.timeline-footer-controls",
-
-  html(attrs) {
-    const controls = [];
-    const { currentUser, fullScreen, topic, notificationLevel } = attrs;
-
-    if (
-      this.siteSettings.summary_timeline_button &&
-      !fullScreen &&
-      topic.has_summary &&
-      !topic.postStream.summary
-    ) {
-      controls.push(
-        this.attach("button", {
-          className: "show-summary btn-small",
-          icon: "layer-group",
-          label: "summary.short_label",
-          title: "summary.short_title",
-          action: "showSummary",
-        })
-      );
-    }
-
-    if (currentUser && !fullScreen) {
-      if (topic.get("details.can_create_post")) {
-        controls.push(
-          this.attach("button", {
-            className: "btn-default create reply-to-post",
-            icon: "reply",
-            title: "topic.reply.help",
-            action: "replyToPost",
-          })
-        );
-      }
-    }
-
-    if (fullScreen) {
-      controls.push(
-        this.attach("button", {
-          className: "jump-to-post",
-          title: "topic.progress.jump_prompt_long",
-          label: "topic.progress.jump_prompt",
-          action: "jumpToPostPrompt",
-        })
-      );
-    }
-
-    if (currentUser) {
-      controls.push(
-        new ComponentConnector(
-          this,
-          "topic-notifications-button",
-          {
-            notificationLevel,
-            topic,
-            showFullTitle: false,
-            appendReason: false,
-            placement: "bottom-end",
-            mountedAsWidget: true,
-            showCaret: false,
-          },
-          ["notificationLevel"]
-        )
-      );
-      if (this.site.mobileView) {
-        controls.push(
-          this.attach("topic-admin-menu-button", {
-            topic,
-            addKeyboardTargetClass: true,
-            openUpwards: true,
-          })
-        );
-      }
-    }
-
-    return controls;
-  },
-});
-
-export default createWidget("topic-timeline", {
-  tagName: "div.topic-timeline",
-  buildKey: (attrs) => `topic-timeline-area-${attrs.topic.id}`,
-
-  defaultState() {
-    return { position: null, excerpt: null };
-  },
-
-  updatePosition(scrollPosition) {
-    if (!this.attrs.fullScreen) {
-      return;
-    }
-
-    this.state.position = scrollPosition;
-    this.state.excerpt = "";
-    const stream = this.attrs.topic.get("postStream");
-
-    // a little debounce to avoid flashing
-    discourseLater(() => {
-      if (!this.state.position === scrollPosition) {
-        return;
-      }
-
-      // we have an off by one, stream is zero based,
-      stream.excerpt(scrollPosition - 1).then((info) => {
-        if (info && this.state.position === scrollPosition) {
-          let excerpt = "";
-
-          if (info.username) {
-            excerpt = "<span class='username'>" + info.username + ":</span> ";
-          }
-
-          if (info.excerpt) {
-            this.state.excerpt = excerpt + info.excerpt;
-          } else if (info.action_code) {
-            this.state.excerpt = `${excerpt} ${actionDescriptionHtml(
-              info.action_code,
-              info.created_at,
-              info.username
-            )}`;
-          }
-
-          this.scheduleRerender();
-        }
-      });
-    }, 50);
-  },
-
-  html(attrs) {
-    const { topic } = attrs;
-    const createdAt = new Date(topic.created_at);
-    const { currentUser } = this;
-    const { tagging_enabled, topic_featured_link_enabled } = this.siteSettings;
-
-    attrs["currentUser"] = currentUser;
-
-    let result = [];
-
-    if (attrs.fullScreen) {
-      let titleHTML = "";
-      if (attrs.mobileView) {
-        titleHTML = new RawHtml({
-          html: `<span>${topic.get("fancyTitle")}</span>`,
-        });
-      }
-
-      let elems = [
-        h(
-          "h2",
-          this.attach("link", {
-            contents: () => titleHTML,
-            className: "fancy-title",
-            action: "jumpTop",
-          })
-        ),
-      ];
-
-      // duplicate of the {{topic-category}} component
-      let category = [];
-
-      if (!topic.get("isPrivateMessage")) {
-        if (topic.category.parentCategory) {
-          category.push(
-            this.attach("category-link", {
-              category: topic.category.parentCategory,
-            })
-          );
-        }
-        category.push(
-          this.attach("category-link", { category: topic.category })
-        );
-      }
-
-      const showTags = tagging_enabled && topic.tags && topic.tags.length > 0;
-
-      if (showTags || topic_featured_link_enabled) {
-        let extras = [];
-        if (showTags) {
-          const tagsHtml = new RawHtml({
-            html: renderTags(topic, { mode: "list" }),
-          });
-          extras.push(h("div.list-tags", tagsHtml));
-        }
-        if (topic_featured_link_enabled) {
-          extras.push(new RawHtml({ html: renderTopicFeaturedLink(topic) }));
-        }
-        category.push(h("div.topic-header-extra", extras));
-      }
-
-      if (category.length > 0) {
-        elems.push(h("div.topic-category", category));
-      }
-
-      if (this.state.excerpt) {
-        elems.push(
-          new RawHtml({
-            html: `<div class='post-excerpt'>${this.state.excerpt}</div>`,
-          })
-        );
-      }
-
-      result.push(h("div.title", elems));
-    }
-
-    result.push(this.attach("timeline-controls", attrs));
-
-    let displayTimeLineScrollArea = true;
-    if (!attrs.mobileView) {
-      const streamLength = attrs.topic.get("postStream.stream.length");
-
-      if (streamLength === 1) {
-        const postsWrapper = document.querySelector(".posts-wrapper");
-        if (postsWrapper && postsWrapper.offsetHeight < 1000) {
-          displayTimeLineScrollArea = false;
-        }
-      }
-    }
-
-    if (displayTimeLineScrollArea) {
-      const bottomAge = relativeAge(
-        new Date(topic.last_posted_at || topic.created_at),
-        {
-          addAgo: true,
-          defaultFormat: timelineDate,
-        }
-      );
-      const scroller = [
-        h(
-          "div.timeline-date-wrapper",
-          this.attach("link", {
-            className: "start-date",
-            rawLabel: timelineDate(createdAt),
-            action: "jumpTop",
-          })
-        ),
-        this.attach("timeline-scrollarea", attrs),
-        h(
-          "div.timeline-date-wrapper",
-          this.attach("link", {
-            className: "now-date",
-            rawLabel: bottomAge,
-            action: "jumpBottom",
-          })
-        ),
-      ];
-
-      result.push(h("div.timeline-scrollarea-wrapper", scroller));
-      result.push(this.attach("timeline-footer-controls", attrs));
-    }
-
-    return result;
-  },
-
-  didRenderWidget() {
-    if (!this.currentUser || !this.siteSettings.enable_user_tips) {
-      return;
-    }
-
-    this.currentUser.showUserTip({
-      id: "topic_timeline",
-
-      titleText: I18n.t("user_tips.topic_timeline.title"),
-      contentText: I18n.t("user_tips.topic_timeline.content"),
-
-      reference: document.querySelector("div.timeline-scrollarea-wrapper"),
-      appendTo: document.querySelector("div.topic-timeline"),
-
-      placement: "left",
-    });
-  },
-
-  destroy() {
-    hideUserTip("topic_timeline");
-  },
-
-  willRerenderWidget() {
-    hideUserTip("topic_timeline");
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/widgets/user-menu.js b/app/assets/javascripts/discourse/app/widgets/user-menu.js
deleted file mode 100644
index 374b32d7a17..00000000000
--- a/app/assets/javascripts/discourse/app/widgets/user-menu.js
+++ /dev/null
@@ -1,341 +0,0 @@
-import discourseLater from "discourse-common/lib/later";
-import { createWidget } from "discourse/widgets/widget";
-import { h } from "virtual-dom";
-import showModal from "discourse/lib/show-modal";
-import I18n from "I18n";
-
-const UserMenuAction = {
-  QUICK_ACCESS: "quickAccess",
-};
-
-const QuickAccess = {
-  BOOKMARKS: "bookmarks",
-  MESSAGES: "messages",
-  NOTIFICATIONS: "notifications",
-  PROFILE: "profile",
-};
-
-const Titles = {
-  bookmarks: "user.bookmarks",
-  messages: "user.private_messages",
-  notifications: "user.notifications",
-  profile: "user.preferences",
-};
-
-let extraGlyphs;
-
-export function addUserMenuGlyph(glyph) {
-  extraGlyphs = extraGlyphs || [];
-  extraGlyphs.push(glyph);
-}
-
-createWidget("user-menu-links", {
-  tagName: "div.menu-links-header",
-
-  _tabAttrs(quickAccessType) {
-    return {
-      "aria-controls": `quick-access-${quickAccessType}`,
-      "aria-selected": "false",
-      tabindex: "-1",
-    };
-  },
-
-  // TODO: Remove when 2.7 gets released.
-  _structureAsTab(extraGlyph) {
-    const glyph = extraGlyph;
-    // Assume glyph is a button if it has a data-url field.
-    if (!glyph.data || !glyph.data.url) {
-      glyph.title = glyph.label;
-      glyph.data = { url: glyph.href };
-
-      glyph.label = null;
-      glyph.href = null;
-    }
-
-    if (glyph.className) {
-      glyph.className += " menu-link";
-    } else {
-      glyph.className = "menu-link";
-    }
-
-    glyph.role = "tab";
-    glyph.tabAttrs = this._tabAttrs(glyph.actionParam);
-
-    return glyph;
-  },
-
-  profileGlyph() {
-    return {
-      title: Titles["profile"],
-      className: "user-preferences-link menu-link",
-      id: QuickAccess.PROFILE,
-      icon: "user",
-      action: UserMenuAction.QUICK_ACCESS,
-      actionParam: QuickAccess.PROFILE,
-      data: { url: `${this.attrs.path}/summary` },
-      role: "tab",
-      tabAttrs: this._tabAttrs(QuickAccess.PROFILE),
-    };
-  },
-
-  notificationsGlyph() {
-    return {
-      title: Titles["notifications"],
-      className: "user-notifications-link menu-link",
-      id: QuickAccess.NOTIFICATIONS,
-      icon: "bell",
-      action: UserMenuAction.QUICK_ACCESS,
-      actionParam: QuickAccess.NOTIFICATIONS,
-      data: { url: `${this.attrs.path}/notifications` },
-      role: "tab",
-      tabAttrs: this._tabAttrs(QuickAccess.NOTIFICATIONS),
-    };
-  },
-
-  bookmarksGlyph() {
-    return {
-      title: Titles["bookmarks"],
-      action: UserMenuAction.QUICK_ACCESS,
-      actionParam: QuickAccess.BOOKMARKS,
-      className: "user-bookmarks-link menu-link",
-      id: QuickAccess.BOOKMARKS,
-      icon: "bookmark",
-      data: { url: `${this.attrs.path}/activity/bookmarks` },
-      "aria-label": "user.bookmarks",
-      role: "tab",
-      tabAttrs: this._tabAttrs(QuickAccess.BOOKMARKS),
-    };
-  },
-
-  messagesGlyph() {
-    return {
-      title: Titles["messages"],
-      action: UserMenuAction.QUICK_ACCESS,
-      actionParam: QuickAccess.MESSAGES,
-      className: "user-pms-link menu-link",
-      id: QuickAccess.MESSAGES,
-      icon: "envelope",
-      data: { url: `${this.attrs.path}/messages` },
-      role: "tab",
-      tabAttrs: this._tabAttrs(QuickAccess.MESSAGES),
-    };
-  },
-
-  linkHtml(link) {
-    if (this.isActive(link)) {
-      link = this.markAsActive(link);
-    }
-    return this.attach("link", link);
-  },
-
-  glyphHtml(glyph, idx) {
-    if (this.isActive(glyph)) {
-      glyph = this.markAsActive(glyph);
-    }
-    glyph.data["tab-number"] = `${idx}`;
-
-    return this.attach("flat-button", glyph);
-  },
-
-  html() {
-    const glyphs = [this.notificationsGlyph()];
-
-    if (extraGlyphs) {
-      extraGlyphs.forEach((g) => {
-        if (typeof g === "function") {
-          g = g(this);
-        }
-        if (g) {
-          const structuredGlyph = this._structureAsTab(g);
-          Titles[structuredGlyph.actionParam] =
-            structuredGlyph.title || structuredGlyph.label;
-          glyphs.push(structuredGlyph);
-        }
-      });
-    }
-
-    glyphs.push(this.bookmarksGlyph());
-
-    if (this.currentUser?.can_send_private_messages) {
-      glyphs.push(this.messagesGlyph());
-    }
-
-    glyphs.push(this.profileGlyph());
-
-    return h("div.menu-links-row", [
-      h(
-        "div.glyphs",
-        { attributes: { "aria-label": "Menu links", role: "tablist" } },
-        glyphs.map((l, index) => this.glyphHtml(l, index))
-      ),
-    ]);
-  },
-
-  markAsActive(definition) {
-    // Clicking on an active quick access tab icon should redirect the user to
-    // the full page.
-    definition.action = null;
-    definition.actionParam = null;
-    definition.url = definition.data.url;
-
-    if (definition.className) {
-      definition.className += " active";
-    } else {
-      definition.className = "active";
-    }
-
-    definition.tabAttrs["tabindex"] = "0";
-    definition.tabAttrs["aria-selected"] = "true";
-
-    return definition;
-  },
-
-  isActive({ action, actionParam }) {
-    return (
-      action === UserMenuAction.QUICK_ACCESS &&
-      actionParam === this.attrs.currentQuickAccess
-    );
-  },
-});
-
-export default createWidget("user-menu", {
-  tagName: "div.user-menu",
-  buildKey: () => "user-menu",
-
-  settings: {
-    maxWidth: 320,
-    showLogoutButton: true,
-  },
-
-  userMenuNavigation(nav) {
-    const maxTabNumber = document.querySelectorAll(".glyphs button").length - 1;
-    const isLeft = nav.key === "ArrowLeft";
-
-    let nextTab = isLeft ? nav.tabNumber - 1 : nav.tabNumber + 1;
-
-    if (isLeft && nextTab < 0) {
-      nextTab = maxTabNumber;
-    }
-
-    if (!isLeft && nextTab > maxTabNumber) {
-      nextTab = 0;
-    }
-
-    document
-      .querySelector(`.menu-link[role='tab'][data-tab-number='${nextTab}']`)
-      .focus();
-  },
-
-  defaultState() {
-    return {
-      currentQuickAccess: QuickAccess.NOTIFICATIONS,
-      titleKey: Titles["notifications"],
-      hasUnread: false,
-      markUnread: null,
-    };
-  },
-
-  panelContents() {
-    const path = this.currentUser.get("path");
-    const { currentQuickAccess, titleKey } = this.state;
-
-    const result = [
-      this.attach("user-menu-links", {
-        path,
-        currentQuickAccess,
-      }),
-      this.quickAccessPanel(path, titleKey, currentQuickAccess),
-    ];
-
-    return result;
-  },
-
-  dismissNotifications() {
-    const unreadHighPriorityNotifications = this.currentUser.get(
-      "unread_high_priority_notifications"
-    );
-
-    if (unreadHighPriorityNotifications > 0) {
-      return showModal("dismiss-notification-confirmation").setProperties({
-        confirmationMessage: I18n.t(
-          "notifications.dismiss_confirmation.body.default",
-          {
-            count: unreadHighPriorityNotifications,
-          }
-        ),
-        dismissNotifications: () => this.state.markRead(),
-      });
-    } else {
-      return this.state.markRead();
-    }
-  },
-
-  itemsLoaded({ hasUnread, markRead }) {
-    this.state.hasUnread = hasUnread;
-    this.state.markRead = markRead;
-  },
-
-  html() {
-    return this.attach("menu-panel", {
-      maxWidth: this.settings.maxWidth,
-      contents: () => this.panelContents(),
-    });
-  },
-
-  clickOutsideMobile(e) {
-    const centeredElement = document.elementFromPoint(e.clientX, e.clientY);
-    const parents = document
-      .elementsFromPoint(e.clientX, e.clientY)
-      .some((ele) => ele.classList.contains("panel"));
-    if (!centeredElement.classList.contains("header-cloak") && parents) {
-      this.sendWidgetAction("toggleUserMenu");
-    } else {
-      const windowWidth = document.body.offsetWidth;
-      const panel = document.querySelector(".menu-panel");
-      panel.classList.add("animate");
-      let offsetDirection =
-        document.querySelector("html").classList["direction"] === "rtl"
-          ? -1
-          : 1;
-      panel.style.setProperty("--offset", `${offsetDirection * windowWidth}px`);
-      const headerCloak = document.querySelector(".header-cloak");
-      headerCloak.classList.add("animate");
-      headerCloak.style.setProperty("--opacity", 0);
-      discourseLater(() => this.sendWidgetAction("toggleUserMenu"), 200);
-    }
-  },
-
-  clickOutside(e) {
-    if (this.site.mobileView) {
-      this.clickOutsideMobile(e);
-    } else {
-      this.sendWidgetAction("toggleUserMenu");
-    }
-  },
-
-  keyDown(e) {
-    if (e.key === "Escape") {
-      this.sendWidgetAction("toggleUserMenu");
-      e.preventDefault();
-      return false;
-    }
-  },
-
-  quickAccess(type) {
-    if (this.state.currentQuickAccess !== type) {
-      this.state.currentQuickAccess = type;
-      this.state.titleKey = Titles[type];
-    }
-  },
-
-  quickAccessPanel(path, titleKey, currentQuickAccess) {
-    const { showLogoutButton } = this.settings;
-    // This deliberately does NOT fallback to a default quick access panel.
-    return this.attach(`quick-access-${this.state.currentQuickAccess}`, {
-      path,
-      showLogoutButton,
-      titleKey,
-      currentQuickAccess,
-    });
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/widgets/widget.js b/app/assets/javascripts/discourse/app/widgets/widget.js
index 0985f0283fd..8e226c46020 100644
--- a/app/assets/javascripts/discourse/app/widgets/widget.js
+++ b/app/assets/javascripts/discourse/app/widgets/widget.js
@@ -14,6 +14,7 @@ import {
   WidgetMouseOverHook,
   WidgetMouseUpHook,
   WidgetTouchEndHook,
+  WidgetTouchMoveHook,
   WidgetTouchStartHook,
 } from "discourse/widgets/hooks";
 import DecoratorHelper from "discourse/widgets/decorator-helper";
@@ -23,6 +24,8 @@ import { deepMerge } from "discourse-common/lib/object";
 import { get } from "@ember/object";
 import { h } from "virtual-dom";
 import { isProduction } from "discourse-common/config/environment";
+import { consolePrefix } from "discourse/lib/source-identifier";
+import { getOwner, setOwner } from "@ember/application";
 
 const _registry = {};
 
@@ -30,6 +33,10 @@ export function queryRegistry(name) {
   return _registry[name];
 }
 
+export function deleteFromRegistry(name) {
+  return delete _registry[name];
+}
+
 const _decorators = {};
 
 export function decorateWidget(widgetName, cb) {
@@ -102,7 +109,10 @@ export function reopenWidget(name, opts) {
   let existing = _registry[name];
   if (!existing) {
     // eslint-disable-next-line no-console
-    console.error(`Could not find widget ${name} in registry`);
+    console.error(
+      consolePrefix(),
+      `reopenWidget: Could not find widget ${name} in registry`
+    );
     return;
   }
 
@@ -138,12 +148,13 @@ export default class Widget {
     this.dirtyKeys = opts.dirtyKeys;
 
     register.deprecateContainer(this);
+    setOwner(this, getOwner(register));
 
     this.key = this.buildKey ? this.buildKey(attrs) : null;
     this.site = register.lookup("service:site");
     this.siteSettings = register.lookup("service:site-settings");
     this.currentUser = register.lookup("service:current-user");
-    this.capabilities = register.lookup("capabilities:main");
+    this.capabilities = register.lookup("service:capabilities");
     this.store = register.lookup("service:store");
     this.appEvents = register.lookup("service:app-events");
     this.keyValueStore = register.lookup("service:key-value-store");
@@ -471,6 +482,10 @@ export default class Widget {
       properties["widget-touch-end"] = new WidgetTouchEndHook(this);
     }
 
+    if (this.touchMove) {
+      properties["widget-touch-move"] = new WidgetTouchMoveHook(this);
+    }
+
     const attributes = properties["attributes"] || {};
     properties.attributes = attributes;
 
diff --git a/app/assets/javascripts/discourse/config/deprecation-workflow.js b/app/assets/javascripts/discourse/config/deprecation-workflow.js
index f0763859a59..a40e3ff0880 100644
--- a/app/assets/javascripts/discourse/config/deprecation-workflow.js
+++ b/app/assets/javascripts/discourse/config/deprecation-workflow.js
@@ -3,25 +3,10 @@ globalThis.deprecationWorkflow.config = {
   // We're using RAISE_ON_DEPRECATION in environment.js instead of
   // `throwOnUnhandled` here since it is easier to toggle.
   workflow: [
-    { handler: "silence", matchId: "ember-global" },
-    { handler: "silence", matchId: "ember-string.prototype-extensions" },
-    { handler: "silence", matchId: "ember.built-in-components.reopen" },
-    { handler: "silence", matchId: "ember.built-in-components.import" },
-    { handler: "silence", matchId: "implicit-injections" },
     { handler: "silence", matchId: "route-render-template" },
-    { handler: "silence", matchId: "routing.transition-methods" },
     { handler: "silence", matchId: "route-disconnect-outlet" },
-    { handler: "silence", matchId: "setting-on-hash" },
+    { handler: "silence", matchId: "routing.transition-methods" },
     { handler: "silence", matchId: "this-property-fallback" },
-    { handler: "silence", matchId: "ember.globals-resolver" },
-    { handler: "silence", matchId: "globals-resolver" },
-    {
-      handler: "silence",
-      matchId: "deprecated-run-loop-and-computed-dot-access",
-    },
-    {
-      handler: "silence",
-      matchId: "ember.built-in-components.legacy-arguments",
-    },
+    { handler: "silence", matchId: "discourse.select-kit" },
   ],
 };
diff --git a/app/assets/javascripts/discourse/config/ember-cli-update.json b/app/assets/javascripts/discourse/config/ember-cli-update.json
index 109d955ecb7..a218fcf5e18 100644
--- a/app/assets/javascripts/discourse/config/ember-cli-update.json
+++ b/app/assets/javascripts/discourse/config/ember-cli-update.json
@@ -3,14 +3,16 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "3.28.5",
+      "version": "5.0.0",
       "blueprints": [
         {
           "name": "app",
           "outputRepo": "https://github.com/ember-cli/ember-new-output",
           "codemodsSource": "ember-app-codemods-manifest@1",
           "isBaseBlueprint": true,
-          "options": ["--no-welcome"]
+          "options": [
+            "--no-welcome"
+          ]
         }
       ]
     }
diff --git a/app/assets/javascripts/discourse/config/environment.js b/app/assets/javascripts/discourse/config/environment.js
index b8dc3564e1c..345b5c3c30e 100644
--- a/app/assets/javascripts/discourse/config/environment.js
+++ b/app/assets/javascripts/discourse/config/environment.js
@@ -1,7 +1,7 @@
 "use strict";
 
 module.exports = function (environment) {
-  let ENV = {
+  const ENV = {
     modulePrefix: "discourse",
     environment,
     rootURL: process.env.DISCOURSE_RELATIVE_URL_ROOT || "/",
@@ -16,8 +16,6 @@ module.exports = function (environment) {
         // Prevent Ember Data from overriding Date.parse.
         Date: false,
       },
-      // This is easier to toggle than the flag in ember-cli-deprecation-workflow.
-      RAISE_ON_DEPRECATION: false,
     },
     exportApplicationGlobal: true,
 
@@ -27,13 +25,20 @@ module.exports = function (environment) {
     },
   };
 
+  if (process.env.EMBER_RAISE_ON_DEPRECATION === "1") {
+    ENV.EmberENV.RAISE_ON_DEPRECATION = true;
+  } else if (process.env.EMBER_RAISE_ON_DEPRECATION === "0") {
+    ENV.EmberENV.RAISE_ON_DEPRECATION = false;
+  } else {
+    // Default (normally false; true in core qunit runs)
+  }
+
   if (environment === "development") {
     // ENV.APP.LOG_RESOLVER = true;
     // ENV.APP.LOG_ACTIVE_GENERATION = true;
     // ENV.APP.LOG_TRANSITIONS = true;
     // ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
     // ENV.APP.LOG_VIEW_LOOKUPS = true;
-    ENV.EmberENV.RAISE_ON_DEPRECATION = false;
   }
 
   if (environment === "test") {
@@ -46,8 +51,6 @@ module.exports = function (environment) {
 
     ENV.APP.rootElement = "#ember-testing";
     ENV.APP.autoboot = false;
-
-    ENV.EmberENV.RAISE_ON_DEPRECATION = false;
   }
 
   if (environment === "production") {
diff --git a/app/assets/javascripts/discourse/config/optional-features.json b/app/assets/javascripts/discourse/config/optional-features.json
index 9effd838a6a..d0d7c47f937 100644
--- a/app/assets/javascripts/discourse/config/optional-features.json
+++ b/app/assets/javascripts/discourse/config/optional-features.json
@@ -1,4 +1,6 @@
 {
   "application-template-wrapper": false,
-  "default-async-observers": true
+  "default-async-observers": true,
+  "jquery-integration": true,
+  "template-only-glimmer-components": true
 }
diff --git a/app/assets/javascripts/discourse/config/targets.js b/app/assets/javascripts/discourse/config/targets.js
index 13213df3789..09210acbf6b 100644
--- a/app/assets/javascripts/discourse/config/targets.js
+++ b/app/assets/javascripts/discourse/config/targets.js
@@ -10,8 +10,7 @@ const browsers = [
 ];
 
 if (isCI || isProduction) {
-  // https://meta.discourse.org/t/224747
-  browsers.push("Safari 12");
+  browsers.push("Safari 15");
 }
 
 module.exports = {
diff --git a/app/assets/javascripts/discourse/ember-cli-build.js b/app/assets/javascripts/discourse/ember-cli-build.js
index 57349327ea0..238bdce4a73 100644
--- a/app/assets/javascripts/discourse/ember-cli-build.js
+++ b/app/assets/javascripts/discourse/ember-cli-build.js
@@ -4,47 +4,28 @@ const EmberApp = require("ember-cli/lib/broccoli/ember-app");
 const resolve = require("path").resolve;
 const mergeTrees = require("broccoli-merge-trees");
 const concat = require("broccoli-concat");
-const prettyTextEngine = require("./lib/pretty-text-engine");
 const { createI18nTree } = require("./lib/translation-plugin");
 const { parsePluginClientSettings } = require("./lib/site-settings-plugin");
 const discourseScss = require("./lib/discourse-scss");
 const generateScriptsTree = require("./lib/scripts");
 const funnel = require("broccoli-funnel");
+const DeprecationSilencer = require("deprecation-silencer");
+const generateWorkboxTree = require("./lib/workbox-tree-builder");
 
-const SILENCED_WARN_PREFIXES = [
-  "Setting the `jquery-integration` optional feature flag",
-  "The Ember Classic edition has been deprecated",
-  "Setting the `template-only-glimmer-components` optional feature flag to `false`",
-  "DEPRECATION: Invoking the `<LinkTo>` component with positional arguments is deprecated",
-];
+process.env.BROCCOLI_ENABLED_MEMOIZE = true;
 
 module.exports = function (defaults) {
-  let discourseRoot = resolve("../../../..");
-  let vendorJs = discourseRoot + "/vendor/assets/javascripts/";
+  const discourseRoot = resolve("../../../..");
+  const vendorJs = discourseRoot + "/vendor/assets/javascripts/";
 
-  // Silence the warnings listed in SILENCED_WARN_PREFIXES
-  const ui = defaults.project.ui;
-  const oldWriteWarning = ui.writeWarnLine.bind(ui);
-  ui.writeWarnLine = (message, ...args) => {
-    if (!SILENCED_WARN_PREFIXES.some((prefix) => message.startsWith(prefix))) {
-      return oldWriteWarning(message, ...args);
-    }
-  };
-
-  // Silence warnings which go straight to console.warn (e.g. template compiler deprecations)
-  /* eslint-disable no-console */
-  const oldConsoleWarn = console.warn.bind(console);
-  console.warn = (message, ...args) => {
-    if (!SILENCED_WARN_PREFIXES.some((prefix) => message.startsWith(prefix))) {
-      return oldConsoleWarn(message, ...args);
-    }
-  };
-  /* eslint-enable no-console */
+  // Silence deprecations which we are aware of - see `lib/deprecation-silencer.js`
+  DeprecationSilencer.silence(console, "warn");
+  DeprecationSilencer.silence(defaults.project.ui, "writeWarnLine");
 
   const isProduction = EmberApp.env().includes("production");
   const isTest = EmberApp.env().includes("test");
 
-  let app = new EmberApp(defaults, {
+  const app = new EmberApp(defaults, {
     autoRun: false,
     "ember-qunit": {
       insertContentForTestBody: false,
@@ -68,6 +49,8 @@ module.exports = function (defaults) {
           fallback: {
             // Sinon needs a `util` polyfill
             util: require.resolve("util/"),
+            // Also for sinon
+            timers: false,
           },
         },
         module: {
@@ -108,6 +91,14 @@ module.exports = function (defaults) {
       ],
     },
 
+    "ember-cli-babel": {
+      throwUnlessParallelizable: true,
+    },
+
+    babel: {
+      plugins: [require.resolve("deprecation-silencer")],
+    },
+
     // We need to build tests in prod for theme tests
     tests: true,
 
@@ -136,7 +127,7 @@ module.exports = function (defaults) {
       annotation: "TreeMerger (appTestTrees)",
     });
 
-    let tests = concat(appTestTrees, {
+    const tests = concat(appTestTrees, {
       inputFiles: ["**/tests/**/*-test.js"],
       headerFiles: ["vendor/ember-cli/tests-prefix.js"],
       footerFiles: ["vendor/ember-cli/app-config.js"],
@@ -145,7 +136,7 @@ module.exports = function (defaults) {
       sourceMapConfig: false,
     });
 
-    let testHelpers = concat(appTestTrees, {
+    const testHelpers = concat(appTestTrees, {
       inputFiles: [
         "**/tests/test-boot-ember-cli.js",
         "**/tests/helpers/**/*.js",
@@ -191,32 +182,36 @@ module.exports = function (defaults) {
     .findAddonByName("discourse-plugins")
     .generatePluginsTree();
 
-  const terserPlugin = app.project.findAddonByName("ember-cli-terser");
-  const applyTerser = (tree) => terserPlugin.postprocessTree("all", tree);
+  const adminTree = app.project.findAddonByName("admin").treeForAddonBundle();
 
-  return mergeTrees([
+  const wizardTree = app.project.findAddonByName("wizard").treeForAddonBundle();
+
+  const markdownItBundleTree = app.project
+    .findAddonByName("pretty-text")
+    .treeForMarkdownItBundle();
+
+  return app.toTree([
     createI18nTree(discourseRoot, vendorJs),
     parsePluginClientSettings(discourseRoot, vendorJs, app),
-    app.toTree(),
     funnel(`${discourseRoot}/public/javascripts`, { destDir: "javascripts" }),
     funnel(`${vendorJs}/highlightjs`, {
       files: ["highlight-test-bundle.min.js"],
       destDir: "assets/highlightjs",
     }),
-    applyTerser(
-      concat(mergeTrees([app.options.adminTree]), {
-        inputFiles: ["**/*.js"],
-        outputFile: `assets/admin.js`,
-      })
-    ),
-    applyTerser(
-      concat(mergeTrees([app.options.wizardTree]), {
-        inputFiles: ["**/*.js"],
-        outputFile: `assets/wizard.js`,
-      })
-    ),
-    applyTerser(prettyTextEngine(app)),
+    generateWorkboxTree(),
+    concat(adminTree, {
+      inputFiles: ["**/*.js"],
+      outputFile: `assets/admin.js`,
+    }),
+    concat(wizardTree, {
+      inputFiles: ["**/*.js"],
+      outputFile: `assets/wizard.js`,
+    }),
+    concat(markdownItBundleTree, {
+      inputFiles: ["**/*.js"],
+      outputFile: `assets/markdown-it-bundle.js`,
+    }),
     generateScriptsTree(app),
-    applyTerser(discoursePluginsTree),
+    discoursePluginsTree,
   ]);
 };
diff --git a/app/assets/javascripts/discourse/lib/pretty-text-engine.js b/app/assets/javascripts/discourse/lib/pretty-text-engine.js
deleted file mode 100644
index 08d91f1877a..00000000000
--- a/app/assets/javascripts/discourse/lib/pretty-text-engine.js
+++ /dev/null
@@ -1,28 +0,0 @@
-const mergeTrees = require("broccoli-merge-trees");
-const funnel = require("broccoli-funnel");
-const concat = require("broccoli-concat");
-const WatchedDir = require("broccoli-source").WatchedDir;
-const Funnel = require("broccoli-funnel");
-
-module.exports = function prettyTextEngine(app) {
-  let babelAddon = app.project.findAddonByName("ember-cli-babel");
-
-  const sourceTree = new WatchedDir(
-    "../pretty-text/engines/discourse-markdown"
-  );
-  const namespacedTree = new Funnel(sourceTree, {
-    getDestinationPath: function (relativePath) {
-      return `pretty-text/engines/discourse-markdown/${relativePath}`;
-    },
-  });
-
-  const engineTree = babelAddon.transpileTree(namespacedTree);
-
-  let markdownIt = funnel("../node_modules/markdown-it/dist", {
-    files: ["markdown-it.js"],
-  });
-  return concat(mergeTrees([engineTree, markdownIt]), {
-    inputFiles: ["**/*.js"],
-    outputFile: `assets/markdown-it-bundle.js`,
-  });
-};
diff --git a/app/assets/javascripts/discourse/lib/site-settings-plugin.js b/app/assets/javascripts/discourse/lib/site-settings-plugin.js
index 1ebdfbcb2ab..43cf95455c0 100644
--- a/app/assets/javascripts/discourse/lib/site-settings-plugin.js
+++ b/app/assets/javascripts/discourse/lib/site-settings-plugin.js
@@ -5,7 +5,7 @@ const concat = require("broccoli-concat");
 const mergeTrees = require("broccoli-merge-trees");
 const deepmerge = require("deepmerge");
 const glob = require("glob");
-const { shouldLoadPluginTestJs } = require("discourse-plugins");
+const { shouldLoadPlugins } = require("discourse-plugins");
 
 let built = false;
 
@@ -72,7 +72,7 @@ module.exports.parsePluginClientSettings = function (
 ) {
   let settings = [discourseRoot + "/config"];
 
-  if (shouldLoadPluginTestJs()) {
+  if (shouldLoadPlugins()) {
     const pluginInfos = app.project
       .findAddonByName("discourse-plugins")
       .pluginInfos();
diff --git a/app/assets/javascripts/discourse/lib/translation-plugin.js b/app/assets/javascripts/discourse/lib/translation-plugin.js
index 29fd1299590..0adbf39613c 100644
--- a/app/assets/javascripts/discourse/lib/translation-plugin.js
+++ b/app/assets/javascripts/discourse/lib/translation-plugin.js
@@ -6,7 +6,7 @@ const mergeTrees = require("broccoli-merge-trees");
 const MessageFormat = require("messageformat");
 const deepmerge = require("deepmerge");
 const glob = require("glob");
-const { shouldLoadPluginTestJs } = require("discourse-plugins");
+const { shouldLoadPlugins } = require("discourse-plugins");
 
 let built = false;
 
@@ -96,7 +96,7 @@ module.exports = function translatePlugin(...params) {
 module.exports.createI18nTree = function (discourseRoot, vendorJs) {
   let translations = [discourseRoot + "/config/locales"];
 
-  if (shouldLoadPluginTestJs()) {
+  if (shouldLoadPlugins()) {
     translations = translations.concat(
       glob
         .sync(discourseRoot + "/plugins/*/config/locales/client.en.yml")
diff --git a/app/assets/javascripts/discourse/lib/workbox-tree-builder.js b/app/assets/javascripts/discourse/lib/workbox-tree-builder.js
new file mode 100644
index 00000000000..e5686ad1ee5
--- /dev/null
+++ b/app/assets/javascripts/discourse/lib/workbox-tree-builder.js
@@ -0,0 +1,34 @@
+const crypto = require("crypto");
+const mergeTrees = require("broccoli-merge-trees");
+const funnel = require("broccoli-funnel");
+
+module.exports = function generateWorkboxTree() {
+  const workboxDeps = [
+    "workbox-sw",
+    "workbox-routing",
+    "workbox-core",
+    "workbox-strategies",
+    "workbox-expiration",
+    "workbox-cacheable-response",
+  ];
+
+  const nodes = workboxDeps.map((name) => {
+    return funnel(`../node_modules/${name}/build`);
+  });
+
+  const versions = workboxDeps.map((name) => {
+    return require(`../../node_modules/${name}/package.json`).version;
+  });
+
+  // Normally Sprockets will create a cachebuster per-file. In this case we need it at the directory level since
+  // workbox is responsible for loading its own files and doesn't support customized names per-file.
+  // Sprockets' default behaviour for these files is disabled via freedom_patches/sprockets.rb.
+  const versionHash = crypto
+    .createHash("md5")
+    .update(versions.join("|"))
+    .digest("hex");
+
+  return funnel(mergeTrees(nodes), {
+    destDir: `assets/workbox-${versionHash}`,
+  });
+};
diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json
index c4aa0e7d363..d4ac26e003d 100644
--- a/app/assets/javascripts/discourse/package.json
+++ b/app/assets/javascripts/discourse/package.json
@@ -3,7 +3,6 @@
   "version": "0.0.0",
   "private": true,
   "description": "A platform for community discussion. Free, open, simple.",
-  "repository": "",
   "license": "GPL-2.0-only",
   "author": "Discourse",
   "directories": {
@@ -13,91 +12,102 @@
   "scripts": {
     "build": "ember build",
     "start": "ember serve",
-    "test": "ember test"
+    "test": "ember test",
+    "postinstall": "yarn --silent --cwd .. patch-package"
   },
   "dependencies": {
-    "@babel/core": "^7.20.12",
-    "@babel/standalone": "^7.20.12",
+    "@glimmer/syntax": "^0.84.3",
+    "discourse-hbr": "1.0.0",
+    "discourse-widget-hbs": "1.0.0",
+    "ember-source": "~3.28.12",
+    "handlebars": "^4.7.7",
+    "pretty-text": "1.0.0"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.22.9",
+    "@babel/standalone": "^7.22.9",
     "@discourse/backburner.js": "^2.7.1-0",
     "@discourse/itsatrap": "^2.0.10",
     "@ember-compat/tracked-built-ins": "^0.9.1",
     "@ember/jquery": "^2.0.0",
+    "@ember/legacy-built-in-components": "^0.4.2",
     "@ember/optional-features": "^2.0.0",
-    "@ember/render-modifiers": "^2.0.4",
-    "@ember/test-helpers": "^2.9.3",
+    "@ember/render-modifiers": "^2.1.0",
+    "@ember/string": "^3.1.1",
+    "@ember/test-helpers": "^2.9.4",
     "@glimmer/component": "^1.1.2",
-    "@glimmer/syntax": "^0.84.2",
     "@glimmer/tracking": "^1.1.2",
-    "@popperjs/core": "^2.11.6",
-    "@uppy/aws-s3": "^3.0.4",
-    "@uppy/aws-s3-multipart": "^3.1.1",
-    "@uppy/core": "^3.0.4",
-    "@uppy/drop-target": "^2.0.1",
-    "@uppy/utils": "^5.1.1",
-    "@uppy/xhr-upload": "^3.0.4",
-    "a11y-dialog": "7.5.2",
+    "@popperjs/core": "^2.11.8",
+    "@uppy/aws-s3": "3.0.6",
+    "@uppy/aws-s3-multipart": "3.1.3",
+    "@uppy/core": "3.0.4",
+    "@uppy/drop-target": "2.0.1",
+    "@uppy/utils": "5.4.0",
+    "@uppy/xhr-upload": "3.1.1",
+    "a11y-dialog": "8.0.0",
     "admin": "1.0.0",
-    "babel-import-util": "^1.3.0",
+    "babel-import-util": "^1.4.1",
     "babel-plugin-ember-template-compilation": "^2.0.0",
     "bootstrap": "3.4.1",
     "bootstrap-json": "1.0.0",
     "broccoli-asset-rev": "^3.0.0",
-    "deepmerge": "^4.2.2",
+    "deepmerge": "^4.3.1",
+    "deprecation-silencer": "1.0.0",
     "dialog-holder": "1.0.0",
     "discourse-common": "1.0.0",
-    "discourse-ensure-deprecation-order": "1.0.0",
-    "discourse-hbr": "1.0.0",
     "discourse-plugins": "1.0.0",
-    "discourse-widget-hbs": "1.0.0",
-    "ember-auto-import": "^2.5.0",
-    "ember-auto-import-chunks-json-generator": "^1.0.0",
+    "ember-auto-import": "^2.6.3",
+    "ember-auto-import-chunks-json-generator": "^1.1.0",
     "ember-buffered-proxy": "^2.1.1",
-    "ember-cached-decorator-polyfill": "^1.0.1",
-    "ember-cli": "~3.28.5",
-    "ember-cli-app-version": "^5.0.0",
-    "ember-cli-babel": "^7.26.10",
-    "ember-cli-dependency-checker": "^3.3.1",
+    "ember-cached-decorator-polyfill": "^1.0.2",
+    "ember-cli": "~5.0.0",
+    "ember-cli-app-version": "^6.0.1",
+    "ember-cli-babel": "^7.26.11",
     "ember-cli-deprecation-workflow": "^2.1.0",
-    "ember-cli-htmlbars": "^6.1.1",
+    "ember-cli-htmlbars": "^6.2.0",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-progress-ci": "1.0.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
+    "ember-decorators": "^6.1.1",
     "ember-exam": "^8.0.0",
-    "ember-export-application-global": "^2.0.1",
+    "ember-functions-as-helper-polyfill": "^2.1.1",
     "ember-load-initializers": "^2.1.1",
-    "ember-modifier": "^4.0.0",
+    "ember-modifier": "^4.1.0",
     "ember-on-resize-modifier": "^1.1.0",
-    "ember-qunit": "^6.1.1",
-    "ember-rfc176-data": "^0.3.17",
-    "ember-source": "~3.28.11",
+    "ember-production-deprecations": "1.0.0",
+    "ember-qunit": "^6.2.0",
+    "ember-template-imports": "^3.4.2",
     "ember-test-selectors": "^6.0.0",
-    "eslint": "^8.31.0",
-    "eslint-plugin-qunit": "^7.3.4",
-    "handlebars": "^4.7.7",
-    "html-entities": "^2.3.3",
+    "eslint": "^8.46.0",
+    "eslint-plugin-qunit": "^8.0.0",
+    "html-entities": "^2.4.0",
     "imports-loader": "^4.0.1",
     "js-yaml": "^4.1.0",
-    "jsdom": "^21.0.0",
+    "jsdom": "^22.1.0",
     "loader.js": "^4.7.0",
-    "markdown-it": "^13.0.1",
-    "message-bus-client": "^4.3.0",
+    "message-bus-client": "^4.3.7",
     "messageformat": "0.1.5",
     "pretender": "^3.4.7",
-    "pretty-text": "1.0.0",
-    "qunit": "^2.19.3",
+    "qunit": "^2.19.4",
     "qunit-dom": "^2.0.0",
-    "sass": "^1.57.0",
+    "sass": "^1.64.1",
     "select-kit": "1.0.0",
-    "sinon": "^15.0.1",
+    "sinon": "^15.2.0",
     "source-map": "^0.7.4",
-    "terser": "^5.16.1",
+    "terser": "^5.19.2",
     "tippy.js": "^6.3.7",
+    "truth-helpers": "1.0.0",
     "util": "^0.12.5",
     "virtual-dom": "^2.1.1",
-    "webpack": "^5.75.0",
+    "webpack": "^5.88.2",
     "wizard": "1.0.0",
-    "xss": "^1.0.14"
+    "workbox-cacheable-response": "^7.0.0",
+    "workbox-core": "^7.0.0",
+    "workbox-expiration": "^7.0.0",
+    "workbox-routing": "^7.0.0",
+    "workbox-strategies": "^7.0.0",
+    "workbox-sw": "^7.0.0"
   },
   "engines": {
     "node": "16.* || >= 18",
@@ -105,11 +115,6 @@
     "yarn": ">= 1.21.1"
   },
   "ember": {
-    "edition": "default"
-  },
-  "devDependencies": {
-    "ember-cached-decorator-polyfill": "^1.0.1",
-    "ember-cli-deprecation-workflow": "^2.1.0",
-    "ember-exam": "^8.0.0"
+    "edition": "octane"
   }
 }
diff --git a/app/assets/javascripts/discourse/public/assets/scripts/discourse-boot.js b/app/assets/javascripts/discourse/public/assets/scripts/discourse-boot.js
index 964fb0b5bf5..c9601aa0075 100644
--- a/app/assets/javascripts/discourse/public/assets/scripts/discourse-boot.js
+++ b/app/assets/javascripts/discourse/public/assets/scripts/discourse-boot.js
@@ -3,10 +3,12 @@
     throw "Unsupported browser detected";
   }
 
-  window.__widget_helpers = require("discourse-widget-hbs/helpers").default;
-
-  // TODO: Eliminate this global
-  window.virtualDom = require("virtual-dom");
+  // In Ember 3.28, the `ember` package is responsible for configuring `Helper.helper`,
+  // so we need to require('ember') before setting up any helpers.
+  // https://github.com/emberjs/ember.js/blob/744e536d37/packages/ember/index.js#L493-L493
+  // In modern Ember, the Helper.helper definition has moved to the helper module itself
+  // https://github.com/emberjs/ember.js/blob/0c5518ea7b/packages/%40ember/-internals/glimmer/lib/helper.ts#L134-L138
+  require("ember");
 
   let element = document.querySelector(
     `meta[name="discourse/config/environment"]`
diff --git a/app/assets/javascripts/discourse/public/assets/scripts/discourse-test-load-dynamic-js.js b/app/assets/javascripts/discourse/public/assets/scripts/discourse-test-load-dynamic-js.js
index 8041b5141bd..5f461030810 100644
--- a/app/assets/javascripts/discourse/public/assets/scripts/discourse-test-load-dynamic-js.js
+++ b/app/assets/javascripts/discourse/public/assets/scripts/discourse-test-load-dynamic-js.js
@@ -1,7 +1,8 @@
 const dynamicJsTemplate = document.querySelector("#dynamic-test-js");
 
 const params = new URLSearchParams(document.location.search);
-const skipPlugins = params.get("qunit_skip_plugins");
+const target = params.get("target");
+const skipPlugins = !target || target === "core";
 
 (async function setup() {
   for (const element of dynamicJsTemplate.content.childNodes) {
diff --git a/app/assets/javascripts/discourse/public/assets/scripts/module-shims.js b/app/assets/javascripts/discourse/public/assets/scripts/module-shims.js
index 16a61fe5154..e4630af4274 100644
--- a/app/assets/javascripts/discourse/public/assets/scripts/module-shims.js
+++ b/app/assets/javascripts/discourse/public/assets/scripts/module-shims.js
@@ -1,5 +1,17 @@
-define("I18n", ["exports"], function (exports) {
-  return I18n;
+define("I18n", ["exports", "discourse-common/lib/deprecated"], function (
+  exports,
+  deprecated
+) {
+  exports.default = I18n;
+  exports.t = function () {
+    deprecated.default(
+      "Importing t from I18n is deprecated. Use the default export instead.",
+      {
+        id: "discourse.i18n-t-import",
+      }
+    );
+    return I18n.t(...arguments);
+  };
 });
 
 define("htmlbars-inline-precompile", ["exports"], function (exports) {
diff --git a/app/assets/javascripts/discourse/scripts/browser-detect.js b/app/assets/javascripts/discourse/scripts/browser-detect.js
index 86cce506a88..b205e684ebb 100644
--- a/app/assets/javascripts/discourse/scripts/browser-detect.js
+++ b/app/assets/javascripts/discourse/scripts/browser-detect.js
@@ -1,7 +1,14 @@
 /* eslint-disable no-var */ // `let` is not supported in very old browsers
 
 (function () {
-  if (!window.WeakMap || !window.Promise || typeof globalThis === "undefined") {
+  if (
+    !window.WeakMap ||
+    !window.Promise ||
+    typeof globalThis === "undefined" ||
+    !String.prototype.replaceAll ||
+    !CSS.supports ||
+    !CSS.supports("aspect-ratio: 1")
+  ) {
     window.unsupportedBrowser = true;
   } else {
     // Some implementations of `WeakMap.prototype.has` do not accept false
diff --git a/app/assets/javascripts/discourse/testem.js b/app/assets/javascripts/discourse/testem.js
index 6f0bc0382e3..bf83225482d 100644
--- a/app/assets/javascripts/discourse/testem.js
+++ b/app/assets/javascripts/discourse/testem.js
@@ -1,5 +1,5 @@
 const TapReporter = require("testem/lib/reporters/tap_reporter");
-const { shouldLoadPluginTestJs } = require("discourse-plugins");
+const { shouldLoadPlugins } = require("discourse-plugins");
 const fs = require("fs");
 
 class Reporter {
@@ -96,7 +96,7 @@ module.exports = {
     Chrome: [
       // --no-sandbox is needed when running Chrome inside a container
       process.env.CI ? "--no-sandbox" : null,
-      "--headless",
+      "--headless=new",
       "--disable-dev-shm-usage",
       "--disable-software-rasterizer",
       "--mute-audio",
@@ -139,7 +139,7 @@ if (process.argv.includes("-t")) {
       });
     },
   ];
-} else if (shouldLoadPluginTestJs()) {
+} else if (shouldLoadPlugins()) {
   // Running with ember cli, but we want to pass through plugin request to Rails
   module.exports.proxies = {
     "/assets/plugins/*_extra.js": {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/admin-install-theme-modal-test.js b/app/assets/javascripts/discourse/tests/acceptance/admin-install-theme-modal-test.js
index b02f30355d1..68b58decea7 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/admin-install-theme-modal-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/admin-install-theme-modal-test.js
@@ -1,5 +1,5 @@
 import { acceptance, query } from "discourse/tests/helpers/qunit-helpers";
-import { click, fillIn, visit } from "@ember/test-helpers";
+import { click, currentURL, fillIn, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 import I18n from "I18n";
 
@@ -82,6 +82,13 @@ acceptance("Admin - Themes - Install modal", function (needs) {
       "testUrl",
       "repo url is visible"
     );
+
+    await click(".d-modal-cancel");
+    assert.strictEqual(
+      currentURL(),
+      "/admin/customize/themes",
+      "query params are cleared after dismissing the modal"
+    );
   });
 
   test("installed themes are matched with the popular list by URL", async function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/admin-plugins-test.js b/app/assets/javascripts/discourse/tests/acceptance/admin-plugins-test.js
index 61ca9fafc3c..3a326ce86d3 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/admin-plugins-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/admin-plugins-test.js
@@ -28,6 +28,9 @@ acceptance("Admin - Plugins", function (needs) {
             enabled_setting: "testplugin_enabled",
             has_settings: true,
             is_official: true,
+            commit_hash: "1234567890abcdef",
+            commit_url:
+              "https://github.com/username/some-test-plugin/commit/1234567890abcdef",
           },
         ],
       })
@@ -44,8 +47,14 @@ acceptance("Admin - Plugins", function (needs) {
     );
 
     assert.true(
-      exists(".admin-plugins .admin-detail .alert-error"),
+      exists(".admin-plugins .admin-container .alert-error"),
       "displays an error for unknown routes"
     );
+
+    assert.strictEqual(
+      table.querySelector("tr .version a.commit-hash").href,
+      "https://github.com/username/some-test-plugin/commit/1234567890abcdef",
+      "displays a commit hash with a link to commit url"
+    );
   });
 });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/admin-site-settings-test.js b/app/assets/javascripts/discourse/tests/acceptance/admin-site-settings-test.js
index cda13cc16a0..bf876817f5d 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/admin-site-settings-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/admin-site-settings-test.js
@@ -3,6 +3,7 @@ import {
   count,
   exists,
   query,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
 import {
   click,
@@ -127,6 +128,14 @@ acceptance("Admin - Site Settings", function (needs) {
     assert.strictEqual(count(".row.setting"), 1);
   });
 
+  test("filtering overridden settings", async function (assert) {
+    await visit("/admin/site_settings");
+    assert.dom(".row.setting").exists({ count: 4 });
+
+    await click(".toggle-overridden");
+    assert.dom(".row.setting").exists({ count: 2 });
+  });
+
   test("filter settings by plugin name", async function (assert) {
     await visit("/admin/site_settings");
 
@@ -142,7 +151,7 @@ acceptance("Admin - Site Settings", function (needs) {
     await visit("admin/site_settings/category/basic?filter=menu");
     assert.strictEqual(
       currentURL(),
-      "admin/site_settings/category/basic?filter=menu"
+      "/admin/site_settings/category/basic?filter=menu"
     );
   });
 
@@ -190,4 +199,17 @@ acceptance("Admin - Site Settings", function (needs) {
       "blocked_onebox_domains=proper.com"
     );
   });
+
+  test("nav menu items have titles", async (assert) => {
+    await visit("/admin/site_settings");
+
+    const navItems = queryAll(".admin-nav .nav-stacked li a");
+    navItems.each((_, item) => {
+      assert.equal(
+        item.title,
+        item.innerText,
+        "menu item has title, and the title is equal to menu item's label"
+      );
+    });
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/admin-site-text-test.js b/app/assets/javascripts/discourse/tests/acceptance/admin-site-text-test.js
index 38cfee1af71..36bb84091f6 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/admin-site-text-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/admin-site-text-test.js
@@ -24,7 +24,7 @@ acceptance("Admin - Site Texts", function (needs) {
     assert.ok(exists(".site-text.overridden"));
 
     // Only show overridden
-    await click(".search-area .filter-options input");
+    await click(".search-area .filter-options #toggle-overridden");
     assert.strictEqual(
       currentURL(),
       "/admin/customize/site_texts?overridden=true&q=Test"
@@ -32,6 +32,14 @@ acceptance("Admin - Site Texts", function (needs) {
 
     assert.ok(!exists(".site-text:not(.overridden)"));
     assert.ok(exists(".site-text.overridden"));
+    await click(".search-area .filter-options #toggle-overridden");
+
+    // Only show outdated
+    await click(".search-area .filter-options #toggle-outdated");
+    assert.strictEqual(
+      currentURL(),
+      "/admin/customize/site_texts?outdated=true&q=Test"
+    );
   });
 
   test("edit and revert a site text by key", async function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/admin-user-index-test.js b/app/assets/javascripts/discourse/tests/acceptance/admin-user-index-test.js
index 8e14be163d4..c36888778bc 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/admin-user-index-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/admin-user-index-test.js
@@ -123,6 +123,27 @@ acceptance("Admin - User Index", function (needs) {
 
       return helper.response({});
     });
+
+    server.get("/admin/users/6.json", () => {
+      return helper.response({
+        id: 6,
+        username: "user6",
+        name: null,
+        avatar_template: "/letter_avatar_proxy/v4/letter/b/f0a364/{size}.png",
+        active: true,
+        admin: false,
+        moderator: false,
+        can_grant_admin: true,
+        can_revoke_admin: false,
+      });
+    });
+
+    server.put("/admin/users/6/grant_admin", () => {
+      return helper.response(403, {
+        error: "A message with <strong>bold</strong> text.",
+        html_message: true,
+      });
+    });
   });
 
   needs.hooks.beforeEach(() => {
@@ -222,7 +243,7 @@ acceptance("Admin - User Index", function (needs) {
     );
   });
 
-  test("grant admin - shows the confirmation bootbox", async function (assert) {
+  test("grant admin - shows the confirmation dialog", async function (assert) {
     await visit("/admin/users/3/user1");
     await click(".grant-admin");
     assert.ok(exists(".dialog-content"));
@@ -234,6 +255,17 @@ acceptance("Admin - User Index", function (needs) {
     await click(".dialog-footer .btn-primary");
   });
 
+  test("grant admin - optionally allows HTML to be shown in the confirmation dialog", async function (assert) {
+    await visit("/admin/users/6/user6");
+    await click(".grant-admin");
+    assert.ok(exists(".dialog-content"));
+
+    assert.ok(
+      exists(".dialog-content .dialog-body strong"),
+      "HTML is rendered in the dialog"
+    );
+  });
+
   test("grant admin - redirects to the 2fa page", async function (assert) {
     await visit("/admin/users/4/user2");
     await click(".grant-admin");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/admin-users-list-test.js b/app/assets/javascripts/discourse/tests/acceptance/admin-users-list-test.js
index 6e051abe6be..83badf83d05 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/admin-users-list-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/admin-users-list-test.js
@@ -68,7 +68,8 @@ acceptance("Admin - Users List", function (needs) {
     await click(".hide-emails");
 
     assert.strictEqual(
-      query(".users-list .user:nth-child(1) .email").innerText,
+      query(".users-list .user:nth-child(1) .email .directory-table__value")
+        .innerText,
       "",
       "hides the emails"
     );
diff --git a/app/assets/javascripts/discourse/tests/acceptance/banner-test.js b/app/assets/javascripts/discourse/tests/acceptance/banner-test.js
new file mode 100644
index 00000000000..7b743a40a28
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/acceptance/banner-test.js
@@ -0,0 +1,26 @@
+import {
+  acceptance,
+  publishToMessageBus,
+} from "discourse/tests/helpers/qunit-helpers";
+import { test } from "qunit";
+import { visit } from "@ember/test-helpers";
+
+acceptance("Site Banner", function () {
+  test("shows and hides correctly", async function (assert) {
+    await visit("/");
+
+    assert.dom("#banner").doesNotExist();
+
+    await publishToMessageBus("/site/banner", {
+      html: "hello world",
+      key: 12,
+      url: "/t/12",
+    });
+
+    assert.dom("#banner #banner-content").hasText("hello world");
+
+    await publishToMessageBus("/site/banner", null);
+
+    assert.dom("#banner").doesNotExist();
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/bookmarks-test.js b/app/assets/javascripts/discourse/tests/acceptance/bookmarks-test.js
deleted file mode 100644
index 7cafec78bd8..00000000000
--- a/app/assets/javascripts/discourse/tests/acceptance/bookmarks-test.js
+++ /dev/null
@@ -1,487 +0,0 @@
-import {
-  acceptance,
-  exists,
-  loggedInUser,
-  query,
-} from "discourse/tests/helpers/qunit-helpers";
-import { click, fillIn, visit } from "@ember/test-helpers";
-import I18n from "I18n";
-import selectKit from "discourse/tests/helpers/select-kit-helper";
-import { test } from "qunit";
-import topicFixtures from "discourse/tests/fixtures/topic";
-import { cloneJSON } from "discourse-common/lib/object";
-
-async function openBookmarkModal(postNumber = 1) {
-  if (exists(`#post_${postNumber} button.show-more-actions`)) {
-    await click(`#post_${postNumber} button.show-more-actions`);
-  }
-  await click(`#post_${postNumber} button.bookmark`);
-}
-
-async function openEditBookmarkModal() {
-  await click(".topic-post:first-child button.bookmarked");
-}
-
-async function testTopicLevelBookmarkButtonIcon(assert, postNumber) {
-  const iconWithoutClock = "d-icon-bookmark";
-  const iconWithClock = "d-icon-discourse-bookmark-clock";
-
-  await visit("/t/internationalization-localization/280");
-  assert.ok(
-    query("#topic-footer-button-bookmark svg").classList.contains(
-      iconWithoutClock
-    ),
-    "Shows an icon without a clock when there is no a bookmark"
-  );
-
-  await openBookmarkModal(postNumber);
-  await click("#save-bookmark");
-
-  assert.ok(
-    query("#topic-footer-button-bookmark svg").classList.contains(
-      iconWithoutClock
-    ),
-    "Shows an icon without a clock when there is a bookmark without a reminder"
-  );
-
-  await openBookmarkModal(postNumber);
-  await click("#tap_tile_tomorrow");
-
-  assert.ok(
-    query("#topic-footer-button-bookmark svg").classList.contains(
-      iconWithClock
-    ),
-    "Shows an icon with a clock when there is a bookmark with a reminder"
-  );
-}
-
-acceptance("Bookmarking", function (needs) {
-  needs.user();
-
-  const topicResponse = cloneJSON(topicFixtures["/t/280/1.json"]);
-  topicResponse.post_stream.posts[0].cooked += `<span data-date="2036-01-15" data-time="00:35:00" class="discourse-local-date cooked-date past" data-timezone="Europe/London">
-  <span>
-    <svg class="fa d-icon d-icon-globe-americas svg-icon" xmlns="http://www.w3.org/2000/svg">
-      <use href="#globe-americas"></use>
-    </svg>
-    <span class="relative-time">January 15, 2036 12:35 AM</span>
-  </span>
-</span>`;
-
-  topicResponse.post_stream.posts[1].cooked += `<span data-date="2021-01-15" data-time="00:35:00" class="discourse-local-date cooked-date past" data-timezone="Europe/London">
-  <span>
-    <svg class="fa d-icon d-icon-globe-americas svg-icon" xmlns="http://www.w3.org/2000/svg">
-      <use href="#globe-americas"></use>
-    </svg>
-    <span class="relative-time">Today 10:30 AM</span>
-  </span>
-</span>`;
-
-  needs.pretender((server, helper) => {
-    function handleRequest(request) {
-      const data = helper.parsePostData(request.requestBody);
-
-      if (data.bookmarkable_id === "398" && data.bookmarkable_type === "Post") {
-        return helper.response({ id: 1, success: "OK" });
-      } else if (data.bookmarkable_type === "Topic") {
-        return helper.response({ id: 3, success: "OK" });
-      } else if (
-        data.bookmarkable_id === "419" &&
-        data.bookmarkable_type === "Post"
-      ) {
-        return helper.response({ id: 2, success: "OK" });
-      }
-    }
-    server.post("/bookmarks", handleRequest);
-    server.put("/bookmarks/1", handleRequest);
-    server.put("/bookmarks/2", handleRequest);
-    server.put("/bookmarks/3", handleRequest);
-    server.delete("/bookmarks/1", () =>
-      helper.response({ success: "OK", topic_bookmarked: false })
-    );
-    server.get("/t/280.json", () => helper.response(topicResponse));
-  });
-
-  test("Bookmarks modal opening", async function (assert) {
-    await visit("/t/internationalization-localization/280");
-    await openBookmarkModal();
-    assert.ok(
-      exists("#bookmark-reminder-modal"),
-      "it shows the bookmark modal"
-    );
-    assert.ok(
-      exists("#tap_tile_none.active"),
-      "it highlights the None option by default"
-    );
-  });
-
-  test("Bookmarks modal selecting reminder type", async function (assert) {
-    await visit("/t/internationalization-localization/280");
-
-    await openBookmarkModal();
-    await click("#tap_tile_tomorrow");
-
-    await openBookmarkModal();
-    await click("#tap_tile_start_of_next_business_week");
-
-    await openBookmarkModal();
-    await click("#tap_tile_next_month");
-
-    await openBookmarkModal();
-    await click("#tap_tile_custom");
-    assert.ok(exists("#tap_tile_custom.active"), "it selects custom");
-    assert.ok(exists(".tap-tile-date-input"), "it shows the custom date input");
-    assert.ok(exists(".tap-tile-time-input"), "it shows the custom time input");
-    await click("#save-bookmark");
-  });
-
-  test("Saving a bookmark with a reminder", async function (assert) {
-    await visit("/t/internationalization-localization/280");
-    await openBookmarkModal();
-    await fillIn("input#bookmark-name", "Check this out later");
-    await click("#tap_tile_tomorrow");
-
-    assert.ok(
-      exists(".topic-post:first-child button.bookmark.bookmarked"),
-      "it shows the bookmarked icon on the post"
-    );
-    assert.ok(
-      exists(
-        ".topic-post:first-child button.bookmark.bookmarked > .d-icon-discourse-bookmark-clock"
-      ),
-      "it shows the bookmark clock icon because of the reminder"
-    );
-  });
-
-  test("Opening the options panel and remembering the option", async function (assert) {
-    await visit("/t/internationalization-localization/280");
-    await openBookmarkModal();
-    assert.notOk(
-      exists(".bookmark-options-panel"),
-      "it should not open the options panel by default"
-    );
-    await click(".bookmark-options-button");
-    assert.ok(
-      exists(".bookmark-options-panel"),
-      "it should open the options panel"
-    );
-    await selectKit(".bookmark-option-selector").expand();
-    await selectKit(".bookmark-option-selector").selectRowByValue(1);
-    await click("#save-bookmark");
-    await openEditBookmarkModal();
-
-    assert.ok(
-      exists(".bookmark-options-panel"),
-      "it should reopen the options panel"
-    );
-    assert.strictEqual(
-      selectKit(".bookmark-option-selector").header().value(),
-      "1"
-    );
-  });
-
-  test("Saving a bookmark with no reminder or name", async function (assert) {
-    await visit("/t/internationalization-localization/280");
-    await openBookmarkModal();
-    await click("#save-bookmark");
-
-    assert.ok(
-      exists(".topic-post:first-child button.bookmark.bookmarked"),
-      "it shows the bookmarked icon on the post"
-    );
-    assert.notOk(
-      exists(
-        ".topic-post:first-child button.bookmark.bookmarked > .d-icon-discourse-bookmark-clock"
-      ),
-      "it shows the regular bookmark active icon"
-    );
-  });
-
-  test("Deleting a bookmark with a reminder", async function (assert) {
-    await visit("/t/internationalization-localization/280");
-    await openBookmarkModal();
-    await click("#tap_tile_tomorrow");
-
-    await openEditBookmarkModal();
-
-    assert.ok(
-      exists("#bookmark-reminder-modal"),
-      "it shows the bookmark modal"
-    );
-
-    await click("#delete-bookmark");
-
-    assert.ok(exists(".dialog-body"), "it asks for delete confirmation");
-    assert.ok(
-      query(".dialog-body").innerText.includes(
-        I18n.t("bookmarks.confirm_delete")
-      ),
-      "it shows delete confirmation message"
-    );
-
-    await click(".dialog-footer .btn-danger");
-
-    assert.notOk(
-      exists(".topic-post:first-child button.bookmark.bookmarked"),
-      "it no longer shows the bookmarked icon on the post after bookmark is deleted"
-    );
-  });
-
-  test("Cancelling saving a bookmark", async function (assert) {
-    await visit("/t/internationalization-localization/280");
-    await openBookmarkModal();
-    await click(".d-modal-cancel");
-    assert.notOk(
-      exists(".topic-post:first-child button.bookmark.bookmarked"),
-      "it does not show the bookmarked icon on the post because it is not saved"
-    );
-  });
-
-  test("Editing a bookmark", async function (assert) {
-    await visit("/t/internationalization-localization/280");
-    let now = moment.tz(loggedInUser().user_option.timezone);
-    let tomorrow = now.add(1, "day").format("YYYY-MM-DD");
-    await openBookmarkModal();
-    await fillIn("input#bookmark-name", "Test name");
-    await click("#tap_tile_tomorrow");
-
-    await openEditBookmarkModal();
-    assert.strictEqual(
-      query("#bookmark-name").value,
-      "Test name",
-      "it should prefill the bookmark name"
-    );
-    assert.strictEqual(
-      query("#custom-date > input").value,
-      tomorrow,
-      "it should prefill the bookmark date"
-    );
-    assert.strictEqual(
-      query("#custom-time").value,
-      "08:00",
-      "it should prefill the bookmark time"
-    );
-  });
-
-  test("Using a post date for the reminder date", async function (assert) {
-    await visit("/t/internationalization-localization/280");
-    let postDate = moment.tz("2036-01-15", loggedInUser().user_option.timezone);
-    let postDateFormatted = postDate.format("YYYY-MM-DD");
-    await openBookmarkModal();
-    await fillIn("input#bookmark-name", "Test name");
-    await click("#tap_tile_post_local_date");
-
-    await openEditBookmarkModal();
-    assert.strictEqual(
-      query("#bookmark-name").value,
-      "Test name",
-      "it should prefill the bookmark name"
-    );
-    assert.strictEqual(
-      query("#custom-date > input").value,
-      postDateFormatted,
-      "it should prefill the bookmark date"
-    );
-    assert.strictEqual(
-      query("#custom-time").value,
-      "10:35",
-      "it should prefill the bookmark time"
-    );
-  });
-
-  test("Cannot use the post date for a reminder when the post date is in the past", async function (assert) {
-    await visit("/t/internationalization-localization/280");
-    await openBookmarkModal(2);
-    assert.notOk(
-      exists("#tap_tile_post_local_date"),
-      "it does not show the local date tile"
-    );
-  });
-
-  test("The topic level bookmark button deletes all bookmarks if several posts on the topic are bookmarked", async function (assert) {
-    const yesButton = ".dialog-footer .btn-primary";
-    const noButton = ".dialog-footer .btn-default";
-
-    await visit("/t/internationalization-localization/280");
-    await openBookmarkModal(1);
-    await click("#save-bookmark");
-    await openBookmarkModal(2);
-    await click("#save-bookmark");
-
-    assert.ok(
-      exists(".topic-post:first-child button.bookmark.bookmarked"),
-      "the first bookmark is added"
-    );
-    assert.ok(
-      exists(".topic-post:nth-child(3) button.bookmark.bookmarked"),
-      "the second bookmark is added"
-    );
-
-    // open the modal and cancel deleting
-    await click("#topic-footer-button-bookmark");
-    await click(noButton);
-
-    assert.ok(
-      exists(".topic-post:first-child button.bookmark.bookmarked"),
-      "the first bookmark isn't deleted"
-    );
-    assert.ok(
-      exists(".topic-post:nth-child(3) button.bookmark.bookmarked"),
-      "the second bookmark isn't deleted"
-    );
-
-    // open the modal and accept deleting
-    await click("#topic-footer-button-bookmark");
-    await click(yesButton);
-
-    assert.ok(
-      !exists(".topic-post:first-child button.bookmark.bookmarked"),
-      "the first bookmark is deleted"
-    );
-    assert.ok(
-      !exists(".topic-post:nth-child(3) button.bookmark.bookmarked"),
-      "the second bookmark is deleted"
-    );
-  });
-
-  test("The topic level bookmark button opens the edit modal if only the first post on the topic is bookmarked", async function (assert) {
-    await visit("/t/internationalization-localization/280");
-    await openBookmarkModal(1);
-    await click("#save-bookmark");
-
-    assert.strictEqual(
-      query("#topic-footer-button-bookmark").innerText,
-      I18n.t("bookmarked.edit_bookmark"),
-      "A topic level bookmark button has a label 'Edit Bookmark'"
-    );
-
-    await click("#topic-footer-button-bookmark");
-
-    assert.ok(
-      exists("div.modal.bookmark-with-reminder"),
-      "The edit modal is opened"
-    );
-  });
-
-  test("Creating and editing a topic level bookmark", async function (assert) {
-    await visit("/t/internationalization-localization/280");
-    await click("#topic-footer-button-bookmark");
-    await click("#save-bookmark");
-
-    assert.notOk(
-      exists(".topic-post:first-child button.bookmark.bookmarked"),
-      "the first post is not marked as being bookmarked"
-    );
-
-    assert.strictEqual(
-      query("#topic-footer-button-bookmark").innerText,
-      I18n.t("bookmarked.edit_bookmark"),
-      "A topic level bookmark button has a label 'Edit Bookmark'"
-    );
-
-    await click("#topic-footer-button-bookmark");
-    await fillIn("input#bookmark-name", "Test name");
-    await click("#tap_tile_tomorrow");
-
-    await click("#topic-footer-button-bookmark");
-
-    assert.strictEqual(
-      query("input#bookmark-name").value,
-      "Test name",
-      "The topic level bookmark editing preserves the values entered"
-    );
-
-    await click(".d-modal-cancel");
-
-    await openBookmarkModal(1);
-    await click("#save-bookmark");
-
-    assert.ok(
-      exists(".topic-post:first-child button.bookmark.bookmarked"),
-      "the first post is bookmarked independently of the topic level bookmark"
-    );
-
-    // deleting all bookmarks in the topic
-    assert.strictEqual(
-      query("#topic-footer-button-bookmark").innerText,
-      I18n.t("bookmarked.clear_bookmarks"),
-      "the footer button says Clear Bookmarks because there is more than one"
-    );
-    await click("#topic-footer-button-bookmark");
-    await click(".dialog-footer .btn-primary");
-
-    assert.ok(
-      !exists(".topic-post:first-child button.bookmark.bookmarked"),
-      "the first post bookmark is deleted"
-    );
-    assert.strictEqual(
-      query("#topic-footer-button-bookmark").innerText,
-      I18n.t("bookmarked.title"),
-      "the topic level bookmark is deleted"
-    );
-  });
-
-  test("Deleting a topic_level bookmark with a reminder", async function (assert) {
-    await visit("/t/internationalization-localization/280");
-    await click("#topic-footer-button-bookmark");
-    await click("#save-bookmark");
-
-    assert.strictEqual(
-      query("#topic-footer-button-bookmark").innerText,
-      I18n.t("bookmarked.edit_bookmark"),
-      "A topic level bookmark button has a label 'Edit Bookmark'"
-    );
-
-    await click("#topic-footer-button-bookmark");
-    await fillIn("input#bookmark-name", "Test name");
-    await click("#tap_tile_tomorrow");
-
-    await click("#topic-footer-button-bookmark");
-    await click("#delete-bookmark");
-
-    assert.ok(exists(".dialog-body"), "it asks for delete confirmation");
-    assert.ok(
-      query(".dialog-body").innerText.includes(
-        I18n.t("bookmarks.confirm_delete")
-      ),
-      "it shows delete confirmation message"
-    );
-
-    await click(".dialog-footer .btn-danger");
-
-    assert.strictEqual(
-      query("#topic-footer-button-bookmark").innerText,
-      I18n.t("bookmarked.title"),
-      "A topic level bookmark button no longer says 'Edit Bookmark' after deletion"
-    );
-  });
-
-  test("The topic level bookmark button opens the edit modal if only one post in the post stream is bookmarked", async function (assert) {
-    await visit("/t/internationalization-localization/280");
-    await openBookmarkModal(2);
-    await click("#save-bookmark");
-
-    assert.strictEqual(
-      query("#topic-footer-button-bookmark").innerText,
-      I18n.t("bookmarked.edit_bookmark"),
-      "A topic level bookmark button has a label 'Edit Bookmark'"
-    );
-
-    await click("#topic-footer-button-bookmark");
-
-    assert.ok(
-      exists("div.modal.bookmark-with-reminder"),
-      "The edit modal is opened"
-    );
-  });
-
-  test("The topic level bookmark button shows an icon with a clock if there is a bookmark with a reminder on the first post", async function (assert) {
-    const postNumber = 1;
-    await testTopicLevelBookmarkButtonIcon(assert, postNumber);
-  });
-
-  test("The topic level bookmark button shows an icon with a clock if there is a bookmark with a reminder on the second post", async function (assert) {
-    const postNumber = 2;
-    await testTopicLevelBookmarkButtonIcon(assert, postNumber);
-  });
-});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/bootstrap-mode-notice-test.js b/app/assets/javascripts/discourse/tests/acceptance/bootstrap-mode-notice-test.js
index de3c793294d..03be08812c9 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/bootstrap-mode-notice-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/bootstrap-mode-notice-test.js
@@ -1,6 +1,6 @@
 import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
 import { test } from "qunit";
-import { click, currentURL, settled, visit } from "@ember/test-helpers";
+import { visit } from "@ember/test-helpers";
 
 acceptance("Bootstrap Mode Notice", function (needs) {
   needs.user({ admin: true });
@@ -10,37 +10,15 @@ acceptance("Bootstrap Mode Notice", function (needs) {
     bootstrap_mode_min_users: 50,
   });
 
-  test("Navigation", async function (assert) {
+  test("is displayed if bootstrap mode is enabled", async function (assert) {
+    this.siteSettings.bootstrap_mode_enabled = true;
     await visit("/");
-    assert.ok(
-      exists(".bootstrap-mode-notice"),
-      "has the bootstrap mode notice"
-    );
-    assert.ok(
-      exists(".bootstrap-invite-button"),
-      "bootstrap notice has invite button"
-    );
-    assert.ok(
-      exists(".bootstrap-wizard-link"),
-      "bootstrap notice has wizard link"
-    );
-
-    await click(".bootstrap-invite-button");
-    assert.ok(exists(".create-invite-modal"), "opens create invite modal");
-
-    await click(".bootstrap-wizard-link");
-    assert.strictEqual(
-      currentURL(),
-      "/wizard/steps/hello-world",
-      "it transitions to the wizard page"
-    );
+    assert.ok(exists(".bootstrap-mode"));
+  });
 
+  test("is hidden if bootstrap mode is disabled", async function (assert) {
     this.siteSettings.bootstrap_mode_enabled = false;
     await visit("/");
-    await settled();
-    assert.ok(
-      !exists(".bootstrap-mode-notice"),
-      "removes the notice when bootstrap mode is disabled"
-    );
+    assert.ok(!exists(".bootstrap-mode"));
   });
 });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/category-edit-test.js b/app/assets/javascripts/discourse/tests/acceptance/category-edit-test.js
index a315b60e72d..aaf2dda4dd6 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/category-edit-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/category-edit-test.js
@@ -114,6 +114,7 @@ acceptance("Category Edit", function (needs) {
     await allowedTagChooser.expand();
     await allowedTagChooser.selectRowByValue("monkey");
 
+    await allowedTagChooser.collapse();
     const allowedTagGroupChooser = selectKit("#category-allowed-tag-groups");
     await allowedTagGroupChooser.expand();
     await allowedTagGroupChooser.selectRowByValue("TagGroup1");
@@ -127,6 +128,7 @@ acceptance("Category Edit", function (needs) {
     assert.deepEqual(payload.allowed_tags, ["monkey"]);
     assert.deepEqual(payload.allowed_tag_groups, ["TagGroup1"]);
 
+    await allowedTagGroupChooser.collapse();
     await allowedTagChooser.expand();
     await allowedTagChooser.deselectItemByValue("monkey");
 
diff --git a/app/assets/javascripts/discourse/tests/acceptance/category-new-test.js b/app/assets/javascripts/discourse/tests/acceptance/category-new-test.js
index abf2b6f1a3b..e5b04cc03a2 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/category-new-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/category-new-test.js
@@ -8,6 +8,34 @@ import DiscourseURL from "discourse/lib/url";
 import I18n from "I18n";
 import sinon from "sinon";
 import { test } from "qunit";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+
+acceptance("New category access for moderators", function (needs) {
+  needs.user({ moderator: true, admin: false, trust_level: 1 });
+
+  test("Authorizes access based on site setting", async function (assert) {
+    this.siteSettings.moderators_manage_categories_and_groups = false;
+    await visit("/new-category");
+
+    assert.strictEqual(currentURL(), "/404");
+
+    this.siteSettings.moderators_manage_categories_and_groups = true;
+    await visit("/new-category");
+
+    assert.strictEqual(
+      currentURL(),
+      "/new-category",
+      "it allows access to new category when site setting is enabled"
+    );
+  });
+});
+
+acceptance("New category access for non authorized users", function () {
+  test("Prevents access when not signed in", async function (assert) {
+    await visit("/new-category");
+    assert.strictEqual(currentURL(), "/404");
+  });
+});
 
 acceptance("Category New", function (needs) {
   needs.user();
@@ -21,6 +49,20 @@ acceptance("Category New", function (needs) {
     await fillIn("input.category-name", "testing");
     assert.strictEqual(query(".badge-category").innerText, "testing");
 
+    await click(".edit-category-nav .edit-category-topic-template a");
+    assert
+      .dom(".edit-category-tab-topic-template")
+      .isVisible("it can switch to topic template tab");
+
+    await click(".edit-category-nav .edit-category-tags a");
+    await click("button.add-required-tag-group");
+
+    const tagSelector = selectKit(
+      ".required-tag-group-row .select-kit.tag-group-chooser"
+    );
+    await tagSelector.expand();
+    await tagSelector.selectRowByValue("TagGroup1");
+
     await click("#save-category");
 
     assert.strictEqual(
@@ -29,6 +71,15 @@ acceptance("Category New", function (needs) {
       "it transitions to the category edit route"
     );
 
+    await click(".edit-category-nav .edit-category-tags a");
+
+    assert.ok(
+      exists(
+        ".required-tag-group-row .select-kit-header[data-value='TagGroup1']"
+      ),
+      "it shows saved required tag group"
+    );
+
     assert.strictEqual(
       query(".edit-category-title h2").innerText,
       I18n.t("category.edit_dialog_title", {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-actions-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-actions-test.js
index dcd0adea595..3e126039f9b 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-actions-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-actions-test.js
@@ -12,7 +12,7 @@ import I18n from "I18n";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
 import sinon from "sinon";
 import { test } from "qunit";
-import { toggleCheckDraftPopup } from "discourse/controllers/composer";
+import { toggleCheckDraftPopup } from "discourse/services/composer";
 import userFixtures from "discourse/tests/fixtures/user-fixtures";
 import { cloneJSON } from "discourse-common/lib/object";
 
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-editor-mentions-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-editor-mentions-test.js
index 41f650c48ac..20d2e646fce 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-editor-mentions-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-editor-mentions-test.js
@@ -2,10 +2,12 @@ import { test } from "qunit";
 import { click, fillIn, triggerKeyEvent, visit } from "@ember/test-helpers";
 import {
   acceptance,
+  emulateAutocomplete,
   exists,
   fakeTime,
   loggedInUser,
   query,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
 import { setCaretPosition } from "discourse/lib/utilities";
 
@@ -43,6 +45,17 @@ acceptance("Composer - editor mentions", function (needs) {
             avatar_template:
               "https://avatars.discourse.org/v3/letter/t/41988e/{size}.png",
           },
+          {
+            username: "foo",
+            avatar_template:
+              "https://avatars.discourse.org/v3/letter/t/41988e/{size}.png",
+          },
+        ],
+        groups: [
+          {
+            name: "user_group",
+            full_name: "Group",
+          },
         ],
       });
     });
@@ -52,19 +65,7 @@ acceptance("Composer - editor mentions", function (needs) {
     await visit("/");
     await click("#create-topic");
 
-    // Emulate user pressing backspace in the editor
-    const editor = query(".d-editor-input");
-
-    await triggerKeyEvent(".d-editor-input", "keydown", "@");
-    await fillIn(".d-editor-input", "abc @");
-    await setCaretPosition(editor, 5);
-    await triggerKeyEvent(".d-editor-input", "keyup", "@");
-
-    await triggerKeyEvent(".d-editor-input", "keydown", "U");
-    await fillIn(".d-editor-input", "abc @u");
-    await setCaretPosition(editor, 6);
-    await triggerKeyEvent(".d-editor-input", "keyup", "U");
-
+    await emulateAutocomplete(".d-editor-input", "abc @u");
     await click(".autocomplete.ac-user .selected");
 
     assert.strictEqual(
@@ -133,28 +134,37 @@ acceptance("Composer - editor mentions", function (needs) {
     await visit("/");
     await click("#create-topic");
 
-    // emulate typing in "abc @u"
-    const editor = query(".d-editor-input");
-    await fillIn(".d-editor-input", "@");
-    await setCaretPosition(editor, 5);
-    await triggerKeyEvent(".d-editor-input", "keyup", "@");
-    await fillIn(".d-editor-input", "@u");
-    await setCaretPosition(editor, 6);
-    await triggerKeyEvent(".d-editor-input", "keyup", "U");
+    await emulateAutocomplete(".d-editor-input", "@u");
 
     assert.ok(
-      exists(`.autocomplete .emoji[title='${status.emoji}']`),
+      exists(`.autocomplete .emoji[alt='${status.emoji}']`),
       "status emoji is shown"
     );
     assert.equal(
-      query(".autocomplete .status-description").textContent.trim(),
+      query(
+        ".autocomplete .user-status-message-description"
+      ).textContent.trim(),
       status.description,
       "status description is shown"
     );
-    assert.equal(
-      query(".autocomplete .relative-date").textContent.trim(),
-      "1h",
-      "status expiration time is shown"
+  });
+
+  test("metadata matches are moved to the end", async function (assert) {
+    await visit("/");
+    await click("#create-topic");
+
+    await emulateAutocomplete(".d-editor-input", "abc @u");
+
+    assert.deepEqual(
+      [...queryAll(".ac-user .username")].map((e) => e.innerText),
+      ["user", "user2", "user_group", "foo"]
+    );
+
+    await emulateAutocomplete(".d-editor-input", "abc @f");
+
+    assert.deepEqual(
+      [...queryAll(".ac-user .username")].map((e) => e.innerText),
+      ["foo", "user_group", "user", "user2"]
     );
   });
 });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-image-grid-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-image-grid-test.js
new file mode 100644
index 00000000000..f41476d67ca
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-image-grid-test.js
@@ -0,0 +1,147 @@
+import { click, fillIn, visit } from "@ember/test-helpers";
+import { acceptance, query } from "discourse/tests/helpers/qunit-helpers";
+import { test } from "qunit";
+
+acceptance("Composer - Image Grid", function (needs) {
+  needs.user();
+  needs.settings({
+    allow_uncategorized_topics: true,
+  });
+
+  needs.pretender((server, helper) => {
+    server.post("/uploads/lookup-urls", () => {
+      return helper.response([]);
+    });
+  });
+
+  test("Image Grid", async function (assert) {
+    await visit("/");
+
+    const uploads = [
+      "![image_example_0|666x500](upload://q4iRxcuSAzfnbUaCsbjMXcGrpaK.jpeg)",
+      "![image_example_1|481x480](upload://p1ijebM2iyQcUswBffKwMny3gxu.jpeg)",
+      "![image_example_3|481x480](upload://p1ijebM2iyQcUswBffKwMny3gxu.jpeg)",
+    ];
+
+    await click("#create-topic");
+    await fillIn(".d-editor-input", uploads.join("\n"));
+
+    await click(
+      ".button-wrapper[data-image-index='0'] .wrap-image-grid-button"
+    );
+
+    assert.strictEqual(
+      query(".d-editor-input").value,
+      `[grid]\n${uploads.join("\n")}\n[/grid]`,
+      "Image grid toggles on"
+    );
+
+    await click(
+      ".button-wrapper[data-image-index='0'] .wrap-image-grid-button"
+    );
+
+    assert.strictEqual(
+      query(".d-editor-input").value,
+      uploads.join("\n"),
+      "Image grid toggles off"
+    );
+
+    const multipleImages = `![zorro|10x10](upload://zorro.png) ![z2|20x20](upload://zorrito.png)\nand a second group of images\n\n${uploads.join(
+      "\n"
+    )}`;
+    await fillIn(".d-editor-input", multipleImages);
+
+    await click(".image-wrapper:first-child .wrap-image-grid-button");
+
+    assert.strictEqual(
+      query(".d-editor-input").value,
+      `[grid]![zorro|10x10](upload://zorro.png) ![z2|20x20](upload://zorrito.png)[/grid]
+and a second group of images
+
+![image_example_0|666x500](upload://q4iRxcuSAzfnbUaCsbjMXcGrpaK.jpeg)
+![image_example_1|481x480](upload://p1ijebM2iyQcUswBffKwMny3gxu.jpeg)
+![image_example_3|481x480](upload://p1ijebM2iyQcUswBffKwMny3gxu.jpeg)`,
+      "First image grid toggles on"
+    );
+
+    await click(".image-wrapper:nth-of-type(1) .wrap-image-grid-button");
+
+    assert.strictEqual(
+      query(".d-editor-input").value,
+      multipleImages,
+      "First image grid toggles off"
+    );
+
+    // Second group of images is in paragraph 2
+    assert.ok(
+      query(
+        ".d-editor-preview p:nth-child(2) .wrap-image-grid-button[data-image-count='3']"
+      ),
+      "Grid button has correct image count"
+    );
+
+    await click(".d-editor-preview p:nth-child(2) .wrap-image-grid-button");
+
+    assert.strictEqual(
+      query(".d-editor-input").value,
+      `![zorro|10x10](upload://zorro.png) ![z2|20x20](upload://zorrito.png)
+and a second group of images
+
+[grid]
+![image_example_0|666x500](upload://q4iRxcuSAzfnbUaCsbjMXcGrpaK.jpeg)
+![image_example_1|481x480](upload://p1ijebM2iyQcUswBffKwMny3gxu.jpeg)
+![image_example_3|481x480](upload://p1ijebM2iyQcUswBffKwMny3gxu.jpeg)
+[/grid]`,
+      "Second image grid toggles on"
+    );
+  });
+
+  test("Image Grid Preview", async function (assert) {
+    await visit("/");
+
+    const uploads = [
+      "![image_example_0|666x500](upload://q4iRxcuSAzfnbUaCsbjMXcGrpaK.jpeg)",
+      "![image_example_1|481x480](upload://p1ijebM2iyQcUswBffKwMny3gxu.jpeg)",
+    ];
+
+    await click("#create-topic");
+    await fillIn(".d-editor-input", uploads.join("\n"));
+
+    assert.ok(
+      query(
+        ".image-wrapper:first-child .wrap-image-grid-button[data-image-count='2']"
+      ),
+      "Grid button has correct image count"
+    );
+
+    await click(
+      ".button-wrapper[data-image-index='0'] .wrap-image-grid-button"
+    );
+
+    assert.strictEqual(
+      document.querySelectorAll(".d-editor-preview .d-image-grid-column")
+        .length,
+      2,
+      "Preview organizes images into two columns"
+    );
+
+    await fillIn(".d-editor-input", `[grid]\n${uploads[0]}\n[/grid]`);
+
+    assert.ok(
+      query(".d-editor-preview .d-image-grid[data-disabled]"),
+      "Grid is disabled when there is only one image"
+    );
+
+    await fillIn(
+      ".d-editor-input",
+      `[grid]${uploads[0]} ${uploads[1]} ${uploads[0]} ${uploads[1]}[/grid]`
+    );
+
+    assert.ok(
+      document.querySelectorAll(".d-editor-preview .d-image-grid-column")
+        .length,
+      2,
+      "Special case of two columns for 4 images"
+    );
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-messages-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-messages-test.js
index 8d78ac5114a..bbb54a45e5b 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-messages-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-messages-test.js
@@ -3,14 +3,31 @@ import {
   exists,
   query,
 } from "discourse/tests/helpers/qunit-helpers";
-import { click, fillIn, triggerKeyEvent, visit } from "@ember/test-helpers";
+import {
+  click,
+  fillIn,
+  triggerKeyEvent,
+  visit,
+  waitUntil,
+} from "@ember/test-helpers";
 import { test } from "qunit";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
 import I18n from "I18n";
+import pretender, { response } from "../helpers/create-pretender";
 
 acceptance("Composer - Messages", function (needs) {
   needs.user();
+
+  let userNotSeenRequestCount = 0;
+
+  needs.hooks.afterEach(() => {
+    userNotSeenRequestCount = 0;
+  });
+
   needs.pretender((server, helper) => {
     server.get("/composer_messages/user_not_seen_in_a_while", () => {
+      userNotSeenRequestCount += 1;
+
       return helper.response({
         user_count: 1,
         usernames: ["charlie"],
@@ -22,13 +39,17 @@ acceptance("Composer - Messages", function (needs) {
   test("Shows warning in composer if user hasn't been seen in a long time.", async function (assert) {
     await visit("/u/charlie");
     await click("button.compose-pm");
-    assert.ok(
-      !exists(".composer-popup"),
+
+    assert.false(
+      exists(".composer-popup"),
       "composer warning is not shown by default"
     );
+
     await triggerKeyEvent(".d-editor-input", "keyup", "Space");
-    assert.ok(exists(".composer-popup"), "shows composer warning message");
-    assert.ok(
+
+    assert.true(exists(".composer-popup"), "shows composer warning message");
+
+    assert.true(
       query(".composer-popup").innerHTML.includes(
         I18n.t("composer.user_not_seen_in_a_while.single", {
           usernames: ['<a class="mention" href="/u/charlie">@charlie</a>'],
@@ -37,6 +58,20 @@ acceptance("Composer - Messages", function (needs) {
       ),
       "warning message has correct body"
     );
+
+    assert.strictEqual(
+      userNotSeenRequestCount,
+      1,
+      "ne user not seen request is made to the server"
+    );
+
+    await triggerKeyEvent(".d-editor-input", "keyup", "Space");
+
+    assert.strictEqual(
+      userNotSeenRequestCount,
+      1,
+      "does not make additional user not seen request to the server if the recipient names are the same"
+    );
   });
 });
 
@@ -60,13 +95,14 @@ acceptance("Composer - Messages - Cannot see group", function (needs) {
   test("Shows warning in composer if group hasn't been invited", async function (assert) {
     await visit("/t/130");
     await click("button.create");
-    assert.ok(
-      !exists(".composer-popup"),
+    assert.false(
+      exists(".composer-popup"),
       "composer warning is not shown by default"
     );
+
     await fillIn(".d-editor-input", "Mention @staff");
-    assert.ok(exists(".composer-popup"), "shows composer warning message");
-    assert.ok(
+    assert.true(exists(".composer-popup"), "shows composer warning message");
+    assert.true(
       query(".composer-popup").innerHTML.includes(
         I18n.t("composer.cannot_see_group_mention.not_allowed", {
           group: "staff",
@@ -79,13 +115,14 @@ acceptance("Composer - Messages - Cannot see group", function (needs) {
   test("Shows warning in composer if group hasn't been invited, but some members have access already", async function (assert) {
     await visit("/t/130");
     await click("button.create");
-    assert.ok(
-      !exists(".composer-popup"),
+    assert.false(
+      exists(".composer-popup"),
       "composer warning is not shown by default"
     );
+
     await fillIn(".d-editor-input", "Mention @staff2");
-    assert.ok(exists(".composer-popup"), "shows composer warning message");
-    assert.ok(
+    assert.true(exists(".composer-popup"), "shows composer warning message");
+    assert.true(
       query(".composer-popup").innerHTML.includes(
         I18n.t("composer.cannot_see_group_mention.some_not_allowed", {
           group: "staff2",
@@ -96,3 +133,171 @@ acceptance("Composer - Messages - Cannot see group", function (needs) {
     );
   });
 });
+
+acceptance("Composer - Messages - Duplicate links", function (needs) {
+  needs.user();
+
+  test("Shows the warning", async function (assert) {
+    pretender.get("/inline-onebox", () =>
+      response({
+        "inline-oneboxes": [],
+      })
+    );
+
+    let receivedMessages = false;
+    pretender.get("/composer_messages", () => {
+      receivedMessages = true;
+      return response({
+        composer_messages: [],
+        extras: {
+          duplicate_lookup: {
+            "test.localhost/t/testing-topic/123/4567": {
+              domain: "test.localhost",
+              username: "uwe_keim",
+              posted_at: "2021-01-01T12:00:00.000Z",
+              post_number: 1,
+            },
+          },
+        },
+      });
+    });
+
+    await visit("/t/internationalization-localization/280");
+    await click("button.create");
+
+    // Work around the lack of CSS transitions in the test env
+    const event = new Event("transitionend");
+    event.propertyName = "height";
+    query("#reply-control").dispatchEvent(event);
+
+    assert
+      .dom(".composer-popup")
+      .doesNotExist("composer warning is not shown by default");
+
+    await waitUntil(() => receivedMessages);
+
+    await fillIn(
+      ".d-editor-input",
+      "Here's a link: https://test.localhost/t/testing-topic/123/4567"
+    );
+
+    assert
+      .dom(".composer-popup.duplicate-link-message")
+      .exists("shows composer warning message");
+  });
+});
+
+acceptance("Composer - Messages - Private Messages", function (needs) {
+  needs.user({
+    id: 32,
+    username: "codinghorror",
+  });
+
+  needs.pretender((server, helper) => {
+    server.get("/composer_messages/user_not_seen_in_a_while", () => {
+      return helper.response({});
+    });
+
+    server.get("/u/search/users", () =>
+      response({
+        users: [
+          {
+            username: "codinghorror",
+          },
+          {
+            username: "sam",
+          },
+        ],
+      })
+    );
+  });
+
+  test("Shows warning in the composer if the user is sending a message only to himself", async function (assert) {
+    await visit("/new-message");
+
+    const privateMessageUsers = selectKit("#private-message-users");
+
+    assert.strictEqual(
+      privateMessageUsers.header().value(),
+      null,
+      "target recipients are empty"
+    );
+
+    // Since we are activating the composer via the route /new-message, it was initialized with
+    // default values. Filling the input before assigning the target recipient of the message
+    // also ensures that the popup test is executed correctly when targetRecipients is empty.
+    await fillIn("#reply-title", "Private message test title");
+    await triggerKeyEvent(".d-editor-input", "keyup", "Space");
+
+    assert.false(
+      exists(".composer-popup"),
+      "composer warning is not shown if the target recipients are empty"
+    );
+
+    // filling the input with the username of the current user
+    await privateMessageUsers.expand();
+    await privateMessageUsers.fillInFilter("codinghorror");
+    await privateMessageUsers.selectRowByValue("codinghorror");
+    await privateMessageUsers.collapse();
+
+    await triggerKeyEvent(".d-editor-input", "keyup", "Space");
+
+    assert.true(exists(".composer-popup"), "shows composer warning message");
+    assert.true(
+      query(".composer-popup").innerHTML.includes(
+        I18n.t("composer.yourself_confirm.title")
+      ),
+      "warning message has correct title"
+    );
+    assert.true(
+      query(".composer-popup").innerHTML.includes(
+        I18n.t("composer.yourself_confirm.body")
+      ),
+      "warning message has correct body"
+    );
+  });
+
+  test("Does not show a warning in the composer if the message is sent to other users", async function (assert) {
+    await visit("/new-message");
+
+    const privateMessageUsers = selectKit("#private-message-users");
+
+    assert.strictEqual(
+      privateMessageUsers.header().value(),
+      null,
+      "target recipients are empty"
+    );
+
+    // Since we are activating the composer via the route /new-message, it was initialized with
+    // default values. Filling the input before assigning the target recipient of the message
+    // also ensures that the popup test is executed correctly when targetRecipients is empty.
+    await fillIn("#reply-title", "Private message test title");
+    await triggerKeyEvent(".d-editor-input", "keyup", "Space");
+
+    assert.false(
+      exists(".composer-popup"),
+      "composer warning is not shown if the target recipients are empty"
+    );
+
+    // filling the input with the username of another user
+    await privateMessageUsers.expand();
+    await privateMessageUsers.fillInFilter("sam");
+    await privateMessageUsers.selectRowByValue("sam");
+    await privateMessageUsers.collapse();
+
+    await triggerKeyEvent(".d-editor-input", "keyup", "Space");
+    assert.false(exists(".composer-popup"), "do not show it for other user");
+
+    // filling the input with the username of the current user
+    await privateMessageUsers.expand();
+    await privateMessageUsers.fillInFilter("codinghorror");
+    await privateMessageUsers.selectRowByValue("codinghorror");
+    await privateMessageUsers.collapse();
+
+    await triggerKeyEvent(".d-editor-input", "keyup", "Space");
+    assert.false(
+      exists(".composer-popup"),
+      "do not show it when the current user is just one of the target recipients"
+    );
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
index f38fdbaf414..22a30cc32b1 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
@@ -7,7 +7,7 @@ import {
   triggerKeyEvent,
   visit,
 } from "@ember/test-helpers";
-import { toggleCheckDraftPopup } from "discourse/controllers/composer";
+import { toggleCheckDraftPopup } from "discourse/services/composer";
 import { cloneJSON } from "discourse-common/lib/object";
 import TopicFixtures from "discourse/tests/fixtures/topic";
 import LinkLookup from "discourse/lib/link-lookup";
@@ -22,6 +22,7 @@ import {
   count,
   exists,
   invisible,
+  metaModifier,
   query,
   updateCurrentUser,
   visible,
@@ -216,16 +217,7 @@ acceptance("Composer", function (needs) {
     textarea.selectionStart = textarea.value.length;
     textarea.selectionEnd = textarea.value.length;
 
-    // Testing keyboard events is tough!
-    const mac = /Mac|iPod|iPhone|iPad/.test(navigator.platform);
-    const event = document.createEvent("Event");
-    event.initEvent("keydown", true, true);
-    event[mac ? "metaKey" : "ctrlKey"] = true;
-    event.key = "B";
-    event.keyCode = 66;
-
-    textarea.dispatchEvent(event);
-    await settled();
+    await triggerKeyEvent(textarea, "keydown", "B", metaModifier);
 
     const example = I18n.t(`composer.bold_text`);
     assert.strictEqual(
@@ -360,7 +352,8 @@ acceptance("Composer", function (needs) {
     );
 
     await click(".topic-post:nth-of-type(1) button.edit");
-    await click(".modal-footer button.save-draft");
+    assert.ok(invisible(".modal-footer button.save-draft"));
+    await click(".modal-footer button.discard-draft");
     assert.ok(invisible(".discard-draft-modal.modal"));
 
     assert.strictEqual(
@@ -370,6 +363,26 @@ acceptance("Composer", function (needs) {
     );
   });
 
+  test("Can Keep Editing when replying on a different topic", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+
+    await click("#topic-footer-buttons .create");
+    await fillIn(".d-editor-input", "this is the content of my reply");
+
+    await visit("/t/this-is-a-test-topic/9");
+    await click("#topic-footer-buttons .create");
+    assert.ok(visible(".discard-draft-modal.modal"));
+
+    await click(".modal-footer button.keep-editing");
+    assert.ok(invisible(".discard-draft-modal.modal"));
+
+    assert.strictEqual(
+      query(".d-editor-input").value,
+      "this is the content of my reply",
+      "composer does not switch when using Keep Editing button"
+    );
+  });
+
   test("Posting on a different topic", async function (assert) {
     await visit("/t/internationalization-localization/280");
     await click("#topic-footer-buttons .btn.create");
@@ -769,23 +782,6 @@ acceptance("Composer", function (needs) {
     );
   });
 
-  test("Composer with dirty reply can toggle to edit", async function (assert) {
-    await visit("/t/this-is-a-test-topic/9");
-
-    await click(".topic-post:nth-of-type(1) button.reply");
-    await fillIn(".d-editor-input", "This is a dirty reply");
-    await click(".topic-post:nth-of-type(1) button.edit");
-    assert.ok(
-      exists(".discard-draft-modal.modal"),
-      "it pops up a confirmation dialog"
-    );
-    await click(".modal-footer button.discard-draft");
-    assert.ok(
-      query(".d-editor-input").value.startsWith("This is the first post."),
-      "it populates the input with the post text"
-    );
-  });
-
   test("Composer draft with dirty reply can toggle to edit", async function (assert) {
     await visit("/t/this-is-a-test-topic/9");
 
@@ -797,17 +793,13 @@ acceptance("Composer", function (needs) {
       exists(".discard-draft-modal.modal"),
       "it pops up a confirmation dialog"
     );
-    assert.strictEqual(
-      query(".modal-footer button.save-draft").innerText.trim(),
-      I18n.t("post.cancel_composer.save_draft"),
-      "has save draft button"
-    );
+    assert.ok(invisible(".modal-footer button.save-draft"));
     assert.strictEqual(
       query(".modal-footer button.keep-editing").innerText.trim(),
       I18n.t("post.cancel_composer.keep_editing"),
       "has keep editing button"
     );
-    await click(".modal-footer button.save-draft");
+    await click(".modal-footer button.discard-draft");
     assert.ok(
       query(".d-editor-input").value.startsWith("This is the second post."),
       "it populates the input with the post text"
@@ -996,7 +988,7 @@ acceptance("Composer", function (needs) {
     await visit("/t/internationalization-localization/280");
     await click("#topic-footer-buttons .create");
 
-    this.container.lookup("controller:composer").set(
+    this.container.lookup("service:composer").set(
       "linkLookup",
       new LinkLookup({
         "github.com": {
@@ -1165,7 +1157,7 @@ acceptance("Composer - Focus Open and Closed", function (needs) {
   test("Focusing a composer which is not open with create topic", async function (assert) {
     await visit("/t/internationalization-localization/280");
 
-    const composer = this.container.lookup("controller:composer");
+    const composer = this.container.lookup("service:composer");
     await composer.focusComposer({ fallbackToNewTopic: true });
 
     await settled();
@@ -1180,7 +1172,7 @@ acceptance("Composer - Focus Open and Closed", function (needs) {
   test("Focusing a composer which is not open with create topic and append text", async function (assert) {
     await visit("/t/internationalization-localization/280");
 
-    const composer = this.container.lookup("controller:composer");
+    const composer = this.container.lookup("service:composer");
     await composer.focusComposer({
       fallbackToNewTopic: true,
       insertText: "this is appended",
@@ -1202,7 +1194,7 @@ acceptance("Composer - Focus Open and Closed", function (needs) {
     await visit("/");
     await click("#create-topic");
 
-    const composer = this.container.lookup("controller:composer");
+    const composer = this.container.lookup("service:composer");
     await composer.focusComposer();
 
     await settled();
@@ -1217,7 +1209,7 @@ acceptance("Composer - Focus Open and Closed", function (needs) {
     await visit("/");
     await click("#create-topic");
 
-    const composer = this.container.lookup("controller:composer");
+    const composer = this.container.lookup("service:composer");
     await composer.focusComposer({ insertText: "this is some appended text" });
 
     await settled();
@@ -1239,7 +1231,7 @@ acceptance("Composer - Focus Open and Closed", function (needs) {
     await fillIn(".d-editor-input", "This is a dirty reply");
     await click(".toggle-minimize");
 
-    const composer = this.container.lookup("controller:composer");
+    const composer = this.container.lookup("service:composer");
     await composer.focusComposer({ insertText: "this is some appended text" });
 
     await settled();
@@ -1269,7 +1261,7 @@ acceptance("Composer - Default category", function (needs) {
         name: "General",
         slug: "general",
         permission: 1,
-        ltopic_template: null,
+        topic_template: null,
       },
       {
         id: 2,
@@ -1306,7 +1298,7 @@ acceptance("Composer - Uncategorized category", function (needs) {
         name: "General",
         slug: "general",
         permission: 1,
-        ltopic_template: null,
+        topic_template: null,
       },
       {
         id: 2,
@@ -1337,7 +1329,7 @@ acceptance("Composer - default category not set", function (needs) {
         name: "General",
         slug: "general",
         permission: 1,
-        ltopic_template: null,
+        topic_template: null,
       },
       {
         id: 2,
@@ -1360,3 +1352,29 @@ acceptance("Composer - default category not set", function (needs) {
   });
 });
 // END: Default Composer Category tests
+
+acceptance("Composer - current time", function (needs) {
+  needs.user();
+
+  test("composer insert current time shortcut", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+
+    await click("#topic-footer-buttons .btn.create");
+    assert.ok(exists(".d-editor-input"), "the composer input is visible");
+    await fillIn(".d-editor-input", "and the time now is: ");
+
+    const date = moment().format("YYYY-MM-DD");
+
+    await triggerKeyEvent(".d-editor-input", "keydown", ".", {
+      ...metaModifier,
+      shiftKey: true,
+    });
+
+    const inputValue = query("#reply-control .d-editor-input").value.trim();
+
+    assert.ok(
+      inputValue.startsWith(`and the time now is: [date=${date}`),
+      "it adds the current date"
+    );
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/create-invite-modal-test.js b/app/assets/javascripts/discourse/tests/acceptance/create-invite-modal-test.js
index ce818cb6fcd..e2ad32b9f56 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/create-invite-modal-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/create-invite-modal-test.js
@@ -1,7 +1,6 @@
 import { click, fillIn, visit } from "@ember/test-helpers";
 import {
   acceptance,
-  count,
   exists,
   fakeTime,
   loggedInUser,
@@ -57,15 +56,15 @@ acceptance("Invites - Create & Edit Invite Modal", function (needs) {
     await visit("/u/eviltrout/invited/pending");
     await click(".user-invite-buttons .btn:first-child");
 
-    assert.ok(!exists("tbody tr"), "does not show invite before saving");
+    assert
+      .dom("table.user-invite-list tbody tr")
+      .exists({ count: 2 }, "is seeded with two rows");
 
     await click(".btn-primary");
 
-    assert.strictEqual(
-      count("tbody tr"),
-      1,
-      "adds invite to list after saving"
-    );
+    assert
+      .dom("table.user-invite-list tbody tr")
+      .exists({ count: 3 }, "gets added to the list");
   });
 
   test("copying saves invite", async function (assert) {
@@ -155,7 +154,7 @@ acceptance("Invites - Email Invites", function (needs) {
       "sends skip_email to server"
     );
 
-    await fillIn("#invite-email", "test2@example.com");
+    await fillIn("#invite-email", "test2@example.com ");
     assert.ok(exists(".send-invite"), "shows save and send email button");
     await click(".send-invite");
     assert.ok(
diff --git a/app/assets/javascripts/discourse/tests/acceptance/css-generator-test.js b/app/assets/javascripts/discourse/tests/acceptance/css-generator-test.js
new file mode 100644
index 00000000000..23aea9c4aa3
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/acceptance/css-generator-test.js
@@ -0,0 +1,49 @@
+import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
+import { visit } from "@ember/test-helpers";
+import { test } from "qunit";
+
+acceptance("CSS Generator", function (needs) {
+  needs.user();
+
+  needs.site({
+    categories: [
+      { id: 1, color: "ff0000", name: "category1" },
+      { id: 2, color: "333", name: "category2" },
+      { id: 4, color: "2B81AF", parentCategory: { id: 1 }, name: "category3" },
+    ],
+  });
+
+  test("category CSS variables are generated", async function (assert) {
+    await visit("/");
+    const cssTag = document.querySelector("style#category-color-css-generator");
+    assert.equal(
+      cssTag.innerHTML,
+      ":root {\n--category-1-color: #ff0000;\n--category-2-color: #333;\n--category-4-color: #2B81AF;\n}"
+    );
+  });
+
+  test("hashtag CSS classes are generated", async function (assert) {
+    await visit("/");
+    const cssTag = document.querySelector("style#hashtag-css-generator");
+    assert.equal(
+      cssTag.innerHTML,
+      ".hashtag-color--category-1 {\n  background: linear-gradient(-90deg, var(--category-1-color) 50%, var(--category-1-color) 50%);\n}\n.hashtag-color--category-2 {\n  background: linear-gradient(-90deg, var(--category-2-color) 50%, var(--category-2-color) 50%);\n}\n.hashtag-color--category-4 {\n  background: linear-gradient(-90deg, var(--category-4-color) 50%, var(--category-1-color) 50%);\n}"
+    );
+  });
+});
+
+acceptance(
+  "CSS Generator | Anon user in login_required site",
+  function (needs) {
+    needs.site({ categories: null });
+    needs.settings({ login_required: true });
+
+    test("category CSS variables are not generated", async function (assert) {
+      await visit("/");
+      const cssTag = document.querySelector(
+        "style#category-color-css-generator"
+      );
+      assert.notOk(exists(cssTag));
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/acceptance/custom-html-template-test.js b/app/assets/javascripts/discourse/tests/acceptance/custom-html-template-test.js
index d141fd61a0d..71d65351bb7 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/custom-html-template-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/custom-html-template-test.js
@@ -3,6 +3,7 @@ import { hbs } from "ember-cli-htmlbars";
 import { test } from "qunit";
 import { visit } from "@ember/test-helpers";
 import { registerTemporaryModule } from "discourse/tests/helpers/temporary-module-helper";
+import { withSilencedDeprecationsAsync } from "discourse-common/lib/deprecated";
 
 acceptance("CustomHTML template", function (needs) {
   needs.hooks.beforeEach(() => {
@@ -13,11 +14,16 @@ acceptance("CustomHTML template", function (needs) {
   });
 
   test("renders custom template", async function (assert) {
-    await visit("/static/faq");
-    assert.strictEqual(
-      query("span.top-span").innerText,
-      "TOP",
-      "it inserted the template"
+    await withSilencedDeprecationsAsync(
+      "discourse.custom_html_template",
+      async () => {
+        await visit("/static/faq");
+        assert.strictEqual(
+          query("span.top-span").innerText,
+          "TOP",
+          "it inserted the template"
+        );
+      }
     );
   });
 });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/d-lightbox-test.js b/app/assets/javascripts/discourse/tests/acceptance/d-lightbox-test.js
new file mode 100644
index 00000000000..a5061fbfc88
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/acceptance/d-lightbox-test.js
@@ -0,0 +1,974 @@
+import {
+  LIGHTBOX_IMAGE_FIXTURES,
+  generateLightboxMarkup,
+} from "discourse/tests/helpers/lightbox-helpers";
+import {
+  acceptance,
+  chromeTest,
+  queryAll,
+} from "discourse/tests/helpers/qunit-helpers";
+import {
+  click,
+  triggerEvent,
+  triggerKeyEvent,
+  visit,
+  waitFor,
+} from "@ember/test-helpers";
+
+import { cloneJSON } from "discourse-common/lib/object";
+import i18n from "I18n";
+import sinon from "sinon";
+import { skip, test } from "qunit";
+import topicFixtures from "discourse/tests/fixtures/topic";
+import { SELECTORS } from "discourse/lib/lightbox/constants";
+
+async function waitForLoad() {
+  return await waitFor(".d-lightbox.is-finished-loading", {
+    timeout: 5000,
+  });
+}
+
+const singleLargeImageMarkup = `
+${generateLightboxMarkup(LIGHTBOX_IMAGE_FIXTURES.first)}`;
+
+const singleSmallImageMarkup = `
+${generateLightboxMarkup(LIGHTBOX_IMAGE_FIXTURES.smallerThanViewPort)}
+`;
+
+const multipleLargeImagesMarkup = `
+${generateLightboxMarkup(LIGHTBOX_IMAGE_FIXTURES.first)}
+${generateLightboxMarkup(LIGHTBOX_IMAGE_FIXTURES.second)}
+${generateLightboxMarkup(LIGHTBOX_IMAGE_FIXTURES.third)}
+`;
+
+const markupWithInvalidImage = `
+${generateLightboxMarkup(LIGHTBOX_IMAGE_FIXTURES.first)}
+${generateLightboxMarkup(LIGHTBOX_IMAGE_FIXTURES.invalidImage)}
+${generateLightboxMarkup(LIGHTBOX_IMAGE_FIXTURES.second)}`;
+
+function setupPretender(server, helper, markup) {
+  const topicResponse = cloneJSON(topicFixtures["/t/280/1.json"]);
+  let markupFromArray = Array.isArray(markup);
+  let responseTotal = markupFromArray ? markup.length : 1;
+
+  for (let i = 0; i < responseTotal; i++) {
+    topicResponse.post_stream.posts[i].cooked += markupFromArray
+      ? markup[i]
+      : markup;
+  }
+
+  server.get("/t/280.json", () => helper.response(topicResponse));
+  server.get("/t/280/:post_number.json", () => helper.response(topicResponse));
+}
+
+acceptance("Experimental Lightbox - site setting", function (needs) {
+  needs.pretender((server, helper) =>
+    setupPretender(server, helper, singleLargeImageMarkup)
+  );
+
+  test("it does not interfere with Magnific when enable_experimental_lightbox is disabled", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+    await click(SELECTORS.DEFAULT_ITEM_SELECTOR);
+
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).doesNotExist();
+
+    await click(".mfp-close");
+  });
+});
+
+acceptance("Experimental Lightbox - layout single image", function (needs) {
+  needs.settings({ enable_experimental_lightbox: true });
+
+  needs.pretender((server, helper) =>
+    setupPretender(server, helper, singleLargeImageMarkup)
+  );
+
+  test("it shows the correct elements for a single-image lightbox", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+    await click(SELECTORS.DEFAULT_ITEM_SELECTOR);
+
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).exists();
+
+    await waitForLoad();
+
+    assert.dom(".d-lightbox__main-title").exists();
+
+    assert
+      .dom(SELECTORS.ACTIVE_ITEM_TITLE)
+      .hasText(LIGHTBOX_IMAGE_FIXTURES.first.title);
+
+    assert
+      .dom(SELECTORS.ACTIVE_ITEM_FILE_DETAILS)
+      .hasText(LIGHTBOX_IMAGE_FIXTURES.first.fileDetails);
+
+    assert.dom(SELECTORS.CLOSE_BUTTON).exists();
+    assert.dom(SELECTORS.CLOSE_BUTTON).isFocused();
+    assert.dom(SELECTORS.TAB_BUTTON).exists();
+    assert.dom(SELECTORS.FULL_SCREEN_BUTTON).exists();
+    assert.dom(SELECTORS.ROTATE_BUTTON).exists();
+    assert.dom(SELECTORS.ZOOM_BUTTON).exists();
+    assert.dom(SELECTORS.DOWNLOAD_BUTTON).exists();
+    assert.dom(SELECTORS.PREV_BUTTON).doesNotExist();
+    assert.dom(SELECTORS.NEXT_BUTTON).doesNotExist();
+    assert.dom(SELECTORS.MULTI_BUTTONS).doesNotExist();
+    assert.dom(SELECTORS.CAROUSEL).doesNotExist();
+    assert.dom(SELECTORS.MAIN_IMAGE).exists();
+    assert.dom(SELECTORS.MAIN_IMAGE).hasAttribute("src");
+
+    assert.dom(".d-lightbox__error-message").doesNotExist();
+
+    assert
+      .dom(SELECTORS.MAIN_IMAGE)
+      .hasAttribute("src", LIGHTBOX_IMAGE_FIXTURES.first.fullsizeURL);
+
+    assert.dom(".d-lightbox.is-fullscreen").doesNotExist();
+    assert.dom(".d-lightbox.is-rotated").doesNotExist();
+    assert.dom(".d-lightbox.is-zoomed").doesNotExist();
+    assert.dom(".d-lightbox__backdrop").exists();
+
+    await click(SELECTORS.CLOSE_BUTTON);
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).doesNotExist();
+  });
+});
+
+acceptance("Experimental Lightbox - layout multiple images", function (needs) {
+  needs.settings({ enable_experimental_lightbox: true });
+
+  needs.pretender((server, helper) =>
+    setupPretender(server, helper, multipleLargeImagesMarkup)
+  );
+
+  test("it shows multiple image controls when there's more than one item", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+
+    await click(SELECTORS.DEFAULT_ITEM_SELECTOR);
+    await waitForLoad();
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).exists();
+    assert.dom(SELECTORS.PREV_BUTTON).exists();
+    assert.dom(SELECTORS.NEXT_BUTTON).exists();
+    assert.dom(SELECTORS.MULTI_BUTTONS).exists();
+    assert.dom(SELECTORS.COUNTERS).exists();
+    assert.dom(SELECTORS.COUNTER_CURRENT).hasText("1");
+    assert.dom(SELECTORS.COUNTER_TOTAL).hasText("3");
+    assert.dom(SELECTORS.CAROUSEL).doesNotExist();
+
+    await click(SELECTORS.CLOSE_BUTTON);
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).doesNotExist();
+  });
+});
+
+acceptance("Experimental Lightbox - interaction", function (needs) {
+  needs.settings({ enable_experimental_lightbox: true });
+
+  needs.pretender((server, helper) =>
+    setupPretender(server, helper, multipleLargeImagesMarkup)
+  );
+
+  test("handles zoom", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+    await click(SELECTORS.DEFAULT_ITEM_SELECTOR);
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).exists();
+
+    await waitForLoad();
+    assert.dom(".d-lightbox.is-zoomed").doesNotExist();
+
+    await click(SELECTORS.ZOOM_BUTTON);
+    assert.dom(SELECTORS.LIGHTBOX_CONTAINER).hasClass("is-zoomed");
+    assert.dom(SELECTORS.ACTIVE_ITEM_TITLE).doesNotExist();
+
+    await click(SELECTORS.ZOOM_BUTTON);
+    assert.dom(SELECTORS.LIGHTBOX_CONTAINER).doesNotHaveClass("is-zoomed");
+    assert.dom(SELECTORS.ACTIVE_ITEM_TITLE).exists();
+
+    await click(SELECTORS.MAIN_IMAGE);
+    assert.dom(SELECTORS.LIGHTBOX_CONTAINER).hasClass("is-zoomed");
+
+    await click(".d-lightbox__zoomed-image-container");
+    assert.dom(SELECTORS.LIGHTBOX_CONTAINER).doesNotHaveClass("is-zoomed");
+
+    await click(SELECTORS.CLOSE_BUTTON);
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).doesNotExist();
+  });
+
+  test("handles rotation", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+    await click(SELECTORS.DEFAULT_ITEM_SELECTOR);
+    assert.dom(SELECTORS.LIGHTBOX_CONTAINER).exists();
+
+    await waitForLoad();
+    assert.dom(SELECTORS.LIGHTBOX_CONTAINER).doesNotHaveClass("is-rotated");
+
+    await click(SELECTORS.ROTATE_BUTTON);
+    assert.dom(SELECTORS.LIGHTBOX_CONTAINER).hasClass("is-rotated");
+    assert.dom(SELECTORS.LIGHTBOX_CONTAINER).hasClass("is-rotated-90");
+
+    await click(SELECTORS.ROTATE_BUTTON);
+    assert.dom(SELECTORS.LIGHTBOX_CONTAINER).hasClass("is-rotated-180");
+
+    await click(SELECTORS.ROTATE_BUTTON);
+    assert.dom(SELECTORS.LIGHTBOX_CONTAINER).hasClass("is-rotated-270");
+
+    await click(SELECTORS.ROTATE_BUTTON);
+    assert.dom(SELECTORS.LIGHTBOX_CONTAINER).doesNotHaveClass("is-rotated");
+
+    await click(SELECTORS.CLOSE_BUTTON);
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).doesNotExist();
+  });
+
+  test("handles navigation - next", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+    await click(SELECTORS.DEFAULT_ITEM_SELECTOR);
+
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).exists();
+    assert.dom(SELECTORS.COUNTER_CURRENT).hasText("1");
+    assert.dom(SELECTORS.COUNTER_TOTAL).hasText("3");
+
+    await waitForLoad();
+
+    assert
+      .dom(SELECTORS.MAIN_IMAGE)
+      .hasAttribute("src", LIGHTBOX_IMAGE_FIXTURES.first.fullsizeURL);
+
+    await click(SELECTORS.NEXT_BUTTON);
+    await waitForLoad();
+
+    assert.dom(SELECTORS.COUNTER_CURRENT).hasText("2");
+
+    assert
+      .dom(SELECTORS.MAIN_IMAGE)
+      .hasAttribute("src", LIGHTBOX_IMAGE_FIXTURES.second.fullsizeURL);
+
+    await click(SELECTORS.NEXT_BUTTON);
+    await waitForLoad();
+
+    assert.dom(SELECTORS.COUNTER_CURRENT).hasText("3");
+
+    assert
+      .dom(SELECTORS.MAIN_IMAGE)
+      .hasAttribute("src", LIGHTBOX_IMAGE_FIXTURES.third.fullsizeURL);
+
+    await click(SELECTORS.NEXT_BUTTON);
+    await waitForLoad();
+
+    assert.dom(SELECTORS.COUNTER_CURRENT).hasText("1");
+
+    assert
+      .dom(SELECTORS.MAIN_IMAGE)
+      .hasAttribute("src", LIGHTBOX_IMAGE_FIXTURES.first.fullsizeURL);
+
+    await click(SELECTORS.CLOSE_BUTTON);
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).doesNotExist();
+  });
+
+  test("handles navigation - previous", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+    await click(SELECTORS.DEFAULT_ITEM_SELECTOR);
+
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).exists();
+    assert.dom(SELECTORS.COUNTER_CURRENT).hasText("1");
+    assert.dom(SELECTORS.COUNTER_TOTAL).hasText("3");
+
+    await waitForLoad();
+    assert
+      .dom(SELECTORS.MAIN_IMAGE)
+      .hasAttribute("src", LIGHTBOX_IMAGE_FIXTURES.first.fullsizeURL);
+
+    await click(SELECTORS.PREV_BUTTON);
+    assert.dom(SELECTORS.COUNTER_CURRENT).hasText("3");
+
+    await waitForLoad();
+    assert
+      .dom(SELECTORS.MAIN_IMAGE)
+      .hasAttribute("src", LIGHTBOX_IMAGE_FIXTURES.third.fullsizeURL);
+
+    await click(SELECTORS.PREV_BUTTON);
+    assert.dom(SELECTORS.COUNTER_CURRENT).hasText("2");
+
+    await waitForLoad();
+    assert
+      .dom(SELECTORS.MAIN_IMAGE)
+      .hasAttribute("src", LIGHTBOX_IMAGE_FIXTURES.second.fullsizeURL);
+
+    await click(SELECTORS.PREV_BUTTON);
+    assert.dom(SELECTORS.COUNTER_CURRENT).hasText("1");
+
+    await waitForLoad();
+    assert
+      .dom(SELECTORS.MAIN_IMAGE)
+      .hasAttribute("src", LIGHTBOX_IMAGE_FIXTURES.first.fullsizeURL);
+
+    await click(SELECTORS.CLOSE_BUTTON);
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).doesNotExist();
+  });
+
+  test("handles navigation - opens at the correct index", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+    const lightboxes = queryAll(SELECTORS.DEFAULT_ITEM_SELECTOR);
+
+    await click(lightboxes[1]);
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).exists();
+    assert.dom(SELECTORS.COUNTER_CURRENT).hasText("2");
+    assert.dom(SELECTORS.COUNTER_TOTAL).hasText("3");
+
+    await waitForLoad();
+    assert
+      .dom(SELECTORS.MAIN_IMAGE)
+      .hasAttribute("src", LIGHTBOX_IMAGE_FIXTURES.second.fullsizeURL);
+
+    await click(SELECTORS.CLOSE_BUTTON);
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).doesNotExist();
+
+    await click(lightboxes[2]);
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).exists();
+    assert.dom(SELECTORS.COUNTER_CURRENT).hasText("3");
+    assert.dom(SELECTORS.COUNTER_TOTAL).hasText("3");
+
+    await waitForLoad();
+    assert
+      .dom(SELECTORS.MAIN_IMAGE)
+      .hasAttribute("src", LIGHTBOX_IMAGE_FIXTURES.third.fullsizeURL);
+
+    await click(SELECTORS.CLOSE_BUTTON);
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).doesNotExist();
+  });
+
+  test(`handles navigation - prevents document scroll while the lightbox is open`, async function (assert) {
+    await visit("/t/internationalization-localization/280");
+
+    const classListAddStub = sinon.stub(
+      document.documentElement.classList,
+      "add"
+    );
+    const classListRemoveStub = sinon.stub(
+      document.documentElement.classList,
+      "remove"
+    );
+
+    await click(SELECTORS.DEFAULT_ITEM_SELECTOR);
+    await waitForLoad();
+
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).exists();
+
+    assert.ok(
+      classListAddStub.calledWith("has-lightbox"),
+      "adds has-lightbox class to document element"
+    );
+
+    await click(SELECTORS.CLOSE_BUTTON);
+
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).doesNotExist();
+
+    assert.ok(
+      classListRemoveStub.calledWith("has-lightbox"),
+      "removes has-lightbox class from document element"
+    );
+
+    classListAddStub.restore();
+    classListRemoveStub.restore();
+  });
+
+  test("handles fullscreen", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+
+    await click(SELECTORS.DEFAULT_ITEM_SELECTOR);
+
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).exists();
+    assert.dom(SELECTORS.LIGHTBOX_CONTAINER).doesNotHaveClass("is-fullscreen");
+
+    const requestFullscreenStub = sinon.stub(
+      document.documentElement,
+      "requestFullscreen"
+    );
+
+    const exitFullscreenStub = sinon.stub(document, "exitFullscreen");
+
+    await click(SELECTORS.FULL_SCREEN_BUTTON);
+
+    assert.dom(SELECTORS.LIGHTBOX_CONTAINER).hasClass("is-fullscreen");
+    assert.ok(requestFullscreenStub.calledOnce, "it calls requestFullscreen");
+
+    await click(SELECTORS.FULL_SCREEN_BUTTON);
+
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).doesNotHaveClass("is-fullscreen");
+
+    assert.ok(exitFullscreenStub.calledOnce, "it calls exitFullscreen");
+
+    await click(SELECTORS.CLOSE_BUTTON);
+
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).doesNotExist();
+
+    requestFullscreenStub.restore();
+    exitFullscreenStub.restore();
+  });
+
+  test("handles download", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+
+    await click(SELECTORS.DEFAULT_ITEM_SELECTOR);
+
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).exists();
+
+    const clickStub = sinon.stub(HTMLAnchorElement.prototype, "click");
+
+    // appends and clicks <a download="..." href="..."></a>
+    await click(SELECTORS.DOWNLOAD_BUTTON);
+
+    assert.ok(clickStub.called, "The click method was called");
+
+    await click(SELECTORS.CLOSE_BUTTON);
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).doesNotExist();
+
+    clickStub.restore();
+  });
+
+  test("handles newtab", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+
+    await click(SELECTORS.DEFAULT_ITEM_SELECTOR);
+
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).exists();
+
+    const openStub = sinon.stub(window, "open");
+
+    await click(SELECTORS.TAB_BUTTON);
+
+    assert.ok(openStub.called, "The open method was called");
+
+    await click(SELECTORS.CLOSE_BUTTON);
+
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).doesNotExist();
+
+    openStub.restore();
+  });
+
+  test("handles close", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+
+    await click(SELECTORS.DEFAULT_ITEM_SELECTOR);
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).exists();
+
+    await click(SELECTORS.CLOSE_BUTTON);
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).doesNotExist();
+  });
+
+  test("handles focus", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).doesNotExist();
+
+    await click(SELECTORS.DEFAULT_ITEM_SELECTOR);
+    await waitForLoad();
+
+    assert.dom(SELECTORS.CLOSE_BUTTON).isFocused();
+
+    // tab forward
+    Array(50)
+      .fill()
+      .forEach(async () => {
+        await triggerKeyEvent(SELECTORS.LIGHTBOX_CONTENT, "keyup", 9);
+      });
+
+    // it keeps focus inside the lightbox when tabbing forward
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).exists();
+
+    // tab backward
+    Array(50)
+      .fill()
+      .forEach(async () => {
+        await triggerKeyEvent(SELECTORS.LIGHTBOX_CONTENT, "keyup", 9, {
+          shiftKey: true,
+        });
+      });
+
+    // it keeps focus inside the lightbox when tabbing backward
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).exists();
+
+    await click(SELECTORS.CLOSE_BUTTON);
+
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).doesNotExist();
+
+    // it restores focus in the main document when closed
+    assert.dom(SELECTORS.DEFAULT_ITEM_SELECTOR).isFocused();
+  });
+
+  test("navigation - screen reader announcer", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+
+    const firstExpectedTitle = i18n.t(
+      "experimental_lightbox.screen_reader_image_title",
+      {
+        current: 1,
+        total: 3,
+        title: LIGHTBOX_IMAGE_FIXTURES.first.title,
+      }
+    );
+
+    const secondExpectedTitle = i18n.t(
+      "experimental_lightbox.screen_reader_image_title",
+      {
+        current: 2,
+        total: 3,
+        title: LIGHTBOX_IMAGE_FIXTURES.second.title,
+      }
+    );
+
+    await click(SELECTORS.DEFAULT_ITEM_SELECTOR);
+    await waitForLoad();
+
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).exists();
+
+    assert.dom(".d-lightbox__screen-reader-announcer").exists();
+
+    assert
+      .dom(".d-lightbox__screen-reader-announcer")
+      .hasText(firstExpectedTitle);
+
+    await click(SELECTORS.NEXT_BUTTON);
+    await waitForLoad();
+
+    assert
+      .dom(".d-lightbox__screen-reader-announcer")
+      .hasText(secondExpectedTitle);
+
+    await click(SELECTORS.CLOSE_BUTTON);
+
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).doesNotExist();
+  });
+
+  // TODO: this test is flaky on firefox. It runs fine locally and the functionality works in a real session, but fails on CI.
+  chromeTest("handles keyboard shortcuts", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+    await click(SELECTORS.DEFAULT_ITEM_SELECTOR);
+
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).exists();
+
+    await waitForLoad();
+
+    await triggerKeyEvent(SELECTORS.LIGHTBOX_CONTENT, "keyup", "ArrowRight");
+
+    assert.dom(SELECTORS.COUNTER_CURRENT).hasText("2");
+
+    await triggerKeyEvent(SELECTORS.LIGHTBOX_CONTENT, "keyup", "ArrowLeft");
+
+    assert.dom(SELECTORS.COUNTER_CURRENT).hasText("1");
+
+    await triggerKeyEvent(SELECTORS.LIGHTBOX_CONTENT, "keyup", "ArrowDown");
+
+    assert.dom(SELECTORS.COUNTER_CURRENT).hasText("2");
+
+    await triggerKeyEvent(SELECTORS.LIGHTBOX_CONTENT, "keyup", "ArrowUp");
+
+    assert.dom(SELECTORS.COUNTER_CURRENT).hasText("1");
+
+    assert.dom(SELECTORS.LIGHTBOX_CONTAINER).doesNotHaveClass("is-zoomed");
+
+    await triggerKeyEvent(SELECTORS.LIGHTBOX_CONTENT, "keyup", 90); // 'z' key
+
+    assert.dom(SELECTORS.LIGHTBOX_CONTAINER).hasClass("is-zoomed");
+
+    await triggerKeyEvent(SELECTORS.LIGHTBOX_CONTENT, "keyup", 90);
+
+    assert.dom(SELECTORS.LIGHTBOX_CONTAINER).doesNotHaveClass("is-zoomed");
+    assert.dom(SELECTORS.LIGHTBOX_CONTAINER).doesNotHaveClass("is-rotated");
+
+    await triggerKeyEvent(SELECTORS.LIGHTBOX_CONTENT, "keyup", 82); // r key
+
+    assert.dom(SELECTORS.LIGHTBOX_CONTAINER).hasClass("is-rotated");
+
+    await triggerKeyEvent(SELECTORS.LIGHTBOX_CONTENT, "keyup", 82);
+    await triggerKeyEvent(SELECTORS.LIGHTBOX_CONTENT, "keyup", 82);
+    await triggerKeyEvent(SELECTORS.LIGHTBOX_CONTENT, "keyup", 82);
+
+    // back to original rotation
+    assert.dom(SELECTORS.LIGHTBOX_CONTAINER).doesNotHaveClass("is-rotated");
+
+    assert.dom(SELECTORS.CAROUSEL).doesNotExist();
+
+    await triggerKeyEvent(SELECTORS.LIGHTBOX_CONTENT, "keyup", 65); // 'a' key
+
+    assert.dom(SELECTORS.CAROUSEL).exists();
+
+    await triggerKeyEvent(SELECTORS.LIGHTBOX_CONTENT, "keyup", 65);
+
+    assert.dom(SELECTORS.CAROUSEL).doesNotExist();
+
+    assert
+      .dom(SELECTORS.LIGHTBOX_CONTAINER)
+      .doesNotHaveClass("has-expanded-title");
+
+    await triggerKeyEvent(SELECTORS.LIGHTBOX_CONTENT, "keyup", 84); // 't' key
+
+    assert.dom(SELECTORS.LIGHTBOX_CONTAINER).hasClass("has-expanded-title");
+
+    await triggerKeyEvent(SELECTORS.LIGHTBOX_CONTENT, "keyup", 84);
+
+    assert
+      .dom(SELECTORS.LIGHTBOX_CONTAINER)
+      .doesNotHaveClass("has-expanded-title");
+
+    const requestFullscreenStub = sinon.stub(
+      document.documentElement,
+      "requestFullscreen"
+    );
+
+    assert.dom(SELECTORS.LIGHTBOX_CONTAINER).doesNotHaveClass("is-fullscreen");
+
+    const exitFullscreenStub = sinon.stub(document, "exitFullscreen");
+
+    await triggerKeyEvent(SELECTORS.LIGHTBOX_CONTENT, "keyup", 77); // 'm' key
+
+    assert.dom(SELECTORS.LIGHTBOX_CONTAINER).hasClass("is-fullscreen");
+
+    await triggerKeyEvent(SELECTORS.LIGHTBOX_CONTENT, "keyup", 77);
+
+    assert.dom(SELECTORS.LIGHTBOX_CONTAINER).doesNotHaveClass("is-fullscreen");
+
+    requestFullscreenStub.restore();
+    exitFullscreenStub.restore();
+
+    await triggerKeyEvent(SELECTORS.LIGHTBOX_CONTENT, "keyup", "Escape");
+
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).doesNotExist();
+  });
+});
+
+acceptance("Experimental Lightbox - carousel", function (needs) {
+  needs.settings({ enable_experimental_lightbox: true });
+
+  needs.pretender((server, helper) =>
+    setupPretender(server, helper, [
+      multipleLargeImagesMarkup + multipleLargeImagesMarkup,
+      multipleLargeImagesMarkup,
+    ])
+  );
+
+  test("navigation", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+    await click(SELECTORS.DEFAULT_ITEM_SELECTOR);
+
+    // lightbox opens with the first image
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).exists();
+    assert.dom(SELECTORS.COUNTER_CURRENT).hasText("1");
+
+    // carousel is not visible by default
+    assert.dom(SELECTORS.CAROUSEL).doesNotExist();
+
+    await click(SELECTORS.CAROUSEL_BUTTON);
+
+    // carousel opens after clicking the button, and has prev/next buttons
+    assert.dom(SELECTORS.CAROUSEL).exists();
+    assert.dom(SELECTORS.CAROUSEL_PREV_BUTTON).exists();
+    assert.dom(SELECTORS.CAROUSEL_NEXT_BUTTON).exists();
+
+    // carousel has 5 items and an active item
+    assert.dom(SELECTORS.CAROUSEL_ITEM).exists({ count: 6 });
+    assert.dom(SELECTORS.CAROUSEL_ITEM + ".is-current").exists();
+
+    await waitForLoad();
+
+    // carousel current item is the first image
+    assert
+      .dom(SELECTORS.CAROUSEL_ITEM + ".is-current")
+      .hasAttribute("src", LIGHTBOX_IMAGE_FIXTURES.first.smallURL);
+
+    await click(SELECTORS.CAROUSEL_NEXT_BUTTON);
+    await waitForLoad();
+
+    // carousel next button works and current item is the second image
+    assert
+      .dom(SELECTORS.CAROUSEL_ITEM + ".is-current")
+      .hasAttribute("src", LIGHTBOX_IMAGE_FIXTURES.second.smallURL);
+
+    await click(SELECTORS.CAROUSEL_PREV_BUTTON);
+    await waitForLoad();
+
+    // carousel previous button works and current item is the first image again
+    assert
+      .dom(SELECTORS.CAROUSEL_ITEM + ".is-current")
+      .hasAttribute("src", LIGHTBOX_IMAGE_FIXTURES.first.smallURL);
+
+    await click(SELECTORS.CAROUSEL_ITEM + ":nth-child(3)");
+    await waitForLoad();
+
+    // carousel manual item selection works and current item is the third image
+    assert
+      .dom(SELECTORS.CAROUSEL_ITEM + ".is-current")
+      .hasAttribute("src", LIGHTBOX_IMAGE_FIXTURES.third.smallURL);
+
+    // carousel closes after clicking the carousel button again
+    await click(SELECTORS.CAROUSEL_BUTTON);
+    assert.dom(SELECTORS.CAROUSEL).doesNotExist();
+
+    await click(SELECTORS.CLOSE_BUTTON);
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).doesNotExist();
+  });
+
+  test("arrows are not shown when there are only a few images", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+
+    const lightboxes = [...queryAll(SELECTORS.DEFAULT_ITEM_SELECTOR)];
+
+    const lastThreeLightboxes = lightboxes.slice(-6);
+
+    lastThreeLightboxes.forEach((lightbox) => {
+      lightbox.remove();
+    });
+
+    await click(SELECTORS.DEFAULT_ITEM_SELECTOR);
+    assert.dom(SELECTORS.LIGHTBOX_CONTAINER).exists();
+    assert.dom(SELECTORS.CAROUSEL).doesNotExist();
+
+    // carousel opens after clicking the button
+    await click(SELECTORS.CAROUSEL_BUTTON);
+    assert.dom(SELECTORS.CAROUSEL).exists();
+    assert.dom(SELECTORS.CAROUSEL_ITEM).exists({ count: 3 });
+
+    // no prev/next buttons when carousel only has a few images
+    assert.dom(SELECTORS.CAROUSEL_PREV_BUTTON).doesNotExist();
+    assert.dom(SELECTORS.CAROUSEL_NEXT_BUTTON).doesNotExist();
+
+    // carousel closes after clicking the button again
+    await click(SELECTORS.CAROUSEL_BUTTON);
+    assert.dom(SELECTORS.CAROUSEL).doesNotExist();
+
+    await click(SELECTORS.CLOSE_BUTTON);
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).doesNotExist();
+  });
+
+  test("images update when changing galleries", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+
+    // click on image from first gallery
+    await click("#post_1 " + SELECTORS.DEFAULT_ITEM_SELECTOR + ":nth-child(1)");
+
+    // toggle carousel open
+    await click(SELECTORS.CAROUSEL_BUTTON);
+
+    // number of images in carousel matches first gallery
+    assert.dom(SELECTORS.CAROUSEL_ITEM).exists({ count: 6 });
+
+    await click(SELECTORS.CLOSE_BUTTON);
+
+    // click on image from second gallery
+    await click("#post_2 " + SELECTORS.DEFAULT_ITEM_SELECTOR + ":nth-child(1)");
+
+    // number of images in carousel matches second gallery
+    assert.dom(SELECTORS.CAROUSEL_ITEM).exists({ count: 3 });
+  });
+});
+
+acceptance("Experimental Lightbox - mobile", function (needs) {
+  needs.settings({ enable_experimental_lightbox: true });
+
+  needs.pretender((server, helper) =>
+    setupPretender(server, helper, multipleLargeImagesMarkup)
+  );
+
+  test("navigation - swipe navigation LTR", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+    await click(SELECTORS.DEFAULT_ITEM_SELECTOR);
+
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).exists();
+    assert.dom(SELECTORS.COUNTER_CURRENT).hasText("1");
+
+    await triggerEvent(SELECTORS.LIGHTBOX_BODY, "touchstart", {
+      changedTouches: [{ screenX: 0, screenY: 0 }],
+      touches: [{ screenX: 0, screenY: 0 }],
+    });
+
+    await triggerEvent(SELECTORS.LIGHTBOX_BODY, "touchend", {
+      changedTouches: [{ screenX: 150, screenY: 0 }],
+      touches: [{ pageX: 150, pageY: 0 }],
+    });
+
+    // swiping left goes to the previous image
+    assert.dom(SELECTORS.COUNTER_CURRENT).hasText("3");
+
+    await triggerEvent(SELECTORS.LIGHTBOX_BODY, "touchstart", {
+      changedTouches: [{ screenX: 0, screenY: 0 }],
+      touches: [{ screenX: 0, screenY: 0 }],
+    });
+
+    await triggerEvent(SELECTORS.LIGHTBOX_BODY, "touchend", {
+      changedTouches: [{ screenX: -150, screenY: 0 }],
+      touches: [{ pageX: 150, pageY: 0 }],
+    });
+
+    // swiping right goes to the next image
+    assert.dom(SELECTORS.COUNTER_CURRENT).hasText("1");
+
+    await click(SELECTORS.CLOSE_BUTTON);
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).doesNotExist();
+  });
+
+  test("navigation - swipe navigation RTL", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+    await click(SELECTORS.DEFAULT_ITEM_SELECTOR);
+
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).exists();
+    assert.dom(SELECTORS.COUNTER_CURRENT).hasText("1");
+
+    const containsStub = sinon.stub(
+      document.documentElement.classList,
+      "contains"
+    );
+
+    containsStub.withArgs("rtl").returns(true);
+
+    await triggerEvent(SELECTORS.LIGHTBOX_BODY, "touchstart", {
+      changedTouches: [{ screenX: 0, screenY: 0 }],
+      touches: [{ screenX: 0, screenY: 0 }],
+    });
+
+    await triggerEvent(SELECTORS.LIGHTBOX_BODY, "touchend", {
+      changedTouches: [{ screenX: -150, screenY: 0 }],
+      touches: [{ pageX: 150, pageY: 0 }],
+    });
+
+    // swiping left goes to the next image in RTL
+    assert.dom(SELECTORS.COUNTER_CURRENT).hasText("2");
+
+    await triggerEvent(SELECTORS.LIGHTBOX_BODY, "touchstart", {
+      changedTouches: [{ screenX: 0, screenY: 0 }],
+      touches: [{ screenX: 0, screenY: 0 }],
+    });
+
+    await triggerEvent(SELECTORS.LIGHTBOX_BODY, "touchend", {
+      changedTouches: [{ screenX: 150, screenY: 0 }],
+      touches: [{ pageX: 150, pageY: 0 }],
+    });
+
+    // swiping right goes to the previous image in RTL
+    assert.dom(SELECTORS.COUNTER_CURRENT).hasText("1");
+
+    containsStub.restore();
+
+    await click(SELECTORS.CLOSE_BUTTON);
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).doesNotExist();
+  });
+
+  test("navigation - swipe close", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+    await click(SELECTORS.DEFAULT_ITEM_SELECTOR);
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).exists();
+
+    await triggerEvent(SELECTORS.LIGHTBOX_BODY, "touchstart", {
+      changedTouches: [{ screenX: 0, screenY: 0 }],
+      touches: [{ screenX: 0, screenY: 0 }],
+    });
+
+    await triggerEvent(SELECTORS.LIGHTBOX_BODY, "touchend", {
+      changedTouches: [{ screenX: 0, screenY: -150 }],
+      touches: [{ pageX: 0, pageY: 150 }],
+    });
+
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).doesNotExist();
+  });
+
+  test("navigation - swipe carousel", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+
+    await click(SELECTORS.DEFAULT_ITEM_SELECTOR);
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).exists();
+    assert.dom(SELECTORS.CAROUSEL).doesNotExist();
+
+    await triggerEvent(SELECTORS.LIGHTBOX_BODY, "touchstart", {
+      changedTouches: [{ screenX: 0, screenY: 0 }],
+      touches: [{ screenX: 0, screenY: 0 }],
+    });
+
+    await triggerEvent(SELECTORS.LIGHTBOX_BODY, "touchend", {
+      changedTouches: [{ screenX: 0, screenY: 150 }],
+      touches: [{ pageX: 0, pageY: 150 }],
+    });
+
+    assert.dom(SELECTORS.CAROUSEL).exists(); // opens after swiping down
+
+    await triggerEvent(SELECTORS.LIGHTBOX_BODY, "touchstart", {
+      changedTouches: [{ screenX: 0, screenY: 0 }],
+      touches: [{ screenX: 0, screenY: 0 }],
+    });
+
+    await triggerEvent(SELECTORS.LIGHTBOX_BODY, "touchend", {
+      changedTouches: [{ screenX: 0, screenY: 150 }],
+      touches: [{ pageX: 0, pageY: 150 }],
+    });
+
+    assert.dom(SELECTORS.CAROUSEL).doesNotExist(); // closes after swiping down again
+
+    await click(SELECTORS.CLOSE_BUTTON);
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).doesNotExist();
+  });
+});
+
+acceptance("Experimental Lightbox - loading state", function (needs) {
+  needs.settings({ enable_experimental_lightbox: true });
+
+  needs.pretender((server, helper) =>
+    setupPretender(server, helper, markupWithInvalidImage)
+  );
+
+  skip("handles loading errors", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+
+    await click(SELECTORS.DEFAULT_ITEM_SELECTOR);
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).exists();
+
+    await waitForLoad();
+
+    // the image has the correct src
+    assert
+      .dom(SELECTORS.MAIN_IMAGE)
+      .hasAttribute("src", LIGHTBOX_IMAGE_FIXTURES.first.fullsizeURL);
+
+    await click(SELECTORS.NEXT_BUTTON);
+
+    // does not show an image if it can't be loaded
+    assert.dom(SELECTORS.MAIN_IMAGE).doesNotExist();
+
+    await click(SELECTORS.NEXT_BUTTON);
+
+    // it shows the correct image when navigating after an error
+    assert.dom(SELECTORS.COUNTER_CURRENT).hasText("3");
+
+    await waitForLoad();
+
+    assert
+      .dom(SELECTORS.MAIN_IMAGE)
+      .hasAttribute("src", LIGHTBOX_IMAGE_FIXTURES.second.fullsizeURL);
+
+    await click(SELECTORS.CLOSE_BUTTON);
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).doesNotExist();
+  });
+});
+
+acceptance("Experimental Lightbox - conditional buttons", function (needs) {
+  needs.settings({
+    enable_experimental_lightbox: true,
+    prevent_anons_from_downloading_files: true,
+  });
+
+  needs.pretender((server, helper) =>
+    setupPretender(server, helper, singleSmallImageMarkup)
+  );
+
+  test("it doesn't show the newtab and download buttons to anons if prevent_anons_from_downloading_files is enabled", async function (assert) {
+    this.siteSettings.prevent_anons_from_downloading_files = true;
+    await visit("/t/internationalization-localization/280");
+    await click(SELECTORS.DEFAULT_ITEM_SELECTOR);
+
+    // it does not show the newtab or download button
+    assert.dom(SELECTORS.TAB_BUTTON).doesNotExist();
+    assert.dom(SELECTORS.DOWNLOAD_BUTTON).doesNotExist();
+  });
+
+  test("it doesn't show the zoom button if the image is smaller than the viewport", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+
+    await click(SELECTORS.DEFAULT_ITEM_SELECTOR);
+    assert.dom(SELECTORS.ZOOM_BUTTON).doesNotExist();
+
+    await click(SELECTORS.CLOSE_BUTTON);
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).doesNotExist();
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/dismiss-notification-modal-test.js b/app/assets/javascripts/discourse/tests/acceptance/dismiss-notification-modal-test.js
deleted file mode 100644
index f52e4cac171..00000000000
--- a/app/assets/javascripts/discourse/tests/acceptance/dismiss-notification-modal-test.js
+++ /dev/null
@@ -1,79 +0,0 @@
-import { click, visit } from "@ember/test-helpers";
-import {
-  acceptance,
-  exists,
-  query,
-  updateCurrentUser,
-} from "discourse/tests/helpers/qunit-helpers";
-import I18n from "I18n";
-import { test } from "qunit";
-import pretender, { response } from "../helpers/create-pretender";
-
-acceptance("Dismiss notification confirmation", function (needs) {
-  needs.user();
-
-  test("does not show modal when no high priority notifications", async function (assert) {
-    pretender.put("/notifications/mark-read", () =>
-      response({ success: true })
-    );
-
-    await visit("/");
-    await click(".current-user");
-    await click(".notifications-dismiss");
-    assert.notOk(exists(".dismiss-notification-confirmation"));
-  });
-
-  test("shows confirmation modal", async function (assert) {
-    updateCurrentUser({
-      unread_high_priority_notifications: 2,
-    });
-    await visit("/");
-    await click(".current-user");
-    await click(".notifications-dismiss");
-    assert.ok(exists(".dismiss-notification-confirmation"));
-
-    assert.strictEqual(
-      query(".dismiss-notification-confirmation-modal .modal-body").innerText,
-      I18n.t("notifications.dismiss_confirmation.body.default", { count: 2 })
-    );
-  });
-
-  test("marks unread when confirm and closes modal", async function (assert) {
-    updateCurrentUser({
-      unread_high_priority_notifications: 2,
-    });
-    await visit("/");
-    await click(".current-user");
-    await click(".notifications-dismiss");
-
-    assert.strictEqual(
-      query(".dismiss-notification-confirmation-modal .btn-primary").innerText,
-      I18n.t("notifications.dismiss_confirmation.dismiss")
-    );
-    pretender.put("/notifications/mark-read", () =>
-      response({ success: true })
-    );
-
-    await click(".dismiss-notification-confirmation-modal .btn-primary");
-
-    assert.notOk(exists(".dismiss-notification-confirmation"));
-  });
-
-  test("does marks unread when cancel and closes modal", async function (assert) {
-    updateCurrentUser({
-      unread_high_priority_notifications: 2,
-    });
-    await visit("/");
-    await click(".current-user");
-    await click(".notifications-dismiss");
-
-    assert.strictEqual(
-      query(".dismiss-notification-confirmation-modal .btn-default").innerText,
-      I18n.t("notifications.dismiss_confirmation.cancel")
-    );
-
-    await click(".dismiss-notification-confirmation-modal .btn-default");
-
-    assert.notOk(exists(".dismiss-notification-confirmation"));
-  });
-});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/do-not-disturb-test.js b/app/assets/javascripts/discourse/tests/acceptance/do-not-disturb-test.js
index 635ed948a03..18b8300d213 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/do-not-disturb-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/do-not-disturb-test.js
@@ -11,109 +11,6 @@ import { test } from "qunit";
 import DoNotDisturb from "discourse/lib/do-not-disturb";
 
 acceptance("Do not disturb", function (needs) {
-  needs.user();
-  needs.pretender((server, helper) => {
-    server.post("/do-not-disturb.json", () => {
-      let now = new Date();
-      now.setHours(now.getHours() + 1);
-      return helper.response({ ends_at: now });
-    });
-    server.delete("/do-not-disturb.json", () =>
-      helper.response({ success: true })
-    );
-  });
-
-  test("when turned off, it is turned on from modal", async function (assert) {
-    updateCurrentUser({ do_not_disturb_until: null });
-
-    await visit("/");
-    await click(".header-dropdown-toggle.current-user");
-    await click(".menu-links-row .user-preferences-link");
-
-    await click(".do-not-disturb");
-
-    assert.ok(exists(".do-not-disturb-modal"), "modal to choose time appears");
-
-    let tiles = queryAll(".do-not-disturb-tile");
-    assert.ok(tiles.length === 4, "There are 4 duration choices");
-
-    await click(tiles[0]);
-
-    assert.ok(query(".do-not-disturb-modal.hidden"), "modal is hidden");
-
-    assert.ok(
-      exists(".header-dropdown-toggle .do-not-disturb-background .d-icon-moon"),
-      "moon icon is present in header"
-    );
-  });
-
-  test("Can be invoked via keyboard", async function (assert) {
-    updateCurrentUser({ do_not_disturb_until: null });
-
-    await visit("/");
-    await click(".header-dropdown-toggle.current-user");
-    await click(".menu-links-row .user-preferences-link");
-    await click(".do-not-disturb");
-
-    assert.ok(exists(".do-not-disturb-modal"), "DND modal is displayed");
-
-    assert.strictEqual(
-      count(".do-not-disturb-tile"),
-      4,
-      "There are 4 duration choices"
-    );
-
-    await triggerKeyEvent(
-      ".do-not-disturb-tile:nth-child(1)",
-      "keydown",
-      "Enter"
-    );
-
-    assert.ok(
-      query(".do-not-disturb-modal.hidden"),
-      "DND modal is hidden after making a choice"
-    );
-
-    assert.ok(
-      exists(".header-dropdown-toggle .do-not-disturb-background .d-icon-moon"),
-      "moon icon is shown in header avatar"
-    );
-  });
-
-  test("when turned on, it can be turned off", async function (assert) {
-    let now = new Date();
-    now.setHours(now.getHours() + 1);
-    updateCurrentUser({ do_not_disturb_until: now });
-
-    await visit("/");
-    await click(".header-dropdown-toggle.current-user");
-    await click(".menu-links-row .user-preferences-link");
-    assert.strictEqual(
-      query(".do-not-disturb .relative-date").textContent,
-      "1h"
-    );
-
-    await click(".do-not-disturb");
-
-    assert.ok(
-      !exists(".do-not-disturb-background"),
-      "The active moon icons are removed"
-    );
-  });
-
-  test("doesn't show the end date for eternal DnD", async function (assert) {
-    updateCurrentUser({ do_not_disturb_until: DoNotDisturb.forever });
-
-    await visit("/");
-    await click(".header-dropdown-toggle.current-user");
-    await click(".menu-links-row .user-preferences-link");
-
-    assert.dom(".do-not-disturb .relative-date").doesNotExist();
-  });
-});
-
-acceptance("Do not disturb - new user menu", function (needs) {
-  needs.user({ redesigned_user_menu_enabled: true });
   needs.pretender((server, helper) => {
     server.post("/do-not-disturb.json", () => {
       const now = new Date();
@@ -124,6 +21,7 @@ acceptance("Do not disturb - new user menu", function (needs) {
       helper.response({ success: true })
     );
   });
+  needs.user();
 
   test("when turned off, it is turned on from modal", async function (assert) {
     updateCurrentUser({ do_not_disturb_until: null });
@@ -140,7 +38,7 @@ acceptance("Do not disturb - new user menu", function (needs) {
 
     await click(tiles[0]);
 
-    assert.ok(query(".do-not-disturb-modal.hidden"), "modal is hidden");
+    assert.dom(".d-modal").doesNotExist("modal is hidden");
 
     assert.ok(
       exists(".header-dropdown-toggle .do-not-disturb-background .d-icon-moon"),
@@ -170,10 +68,9 @@ acceptance("Do not disturb - new user menu", function (needs) {
       "Enter"
     );
 
-    assert.ok(
-      query(".do-not-disturb-modal.hidden"),
-      "DND modal is hidden after making a choice"
-    );
+    assert
+      .dom(".d-modal")
+      .doesNotExist("DND modal is hidden after making a choice");
 
     assert.ok(
       exists(".header-dropdown-toggle .do-not-disturb-background .d-icon-moon"),
diff --git a/app/assets/javascripts/discourse/tests/acceptance/edit-notification-click-test.js b/app/assets/javascripts/discourse/tests/acceptance/edit-notification-click-test.js
index e9aace5b6db..2997c83ddee 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/edit-notification-click-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/edit-notification-click-test.js
@@ -40,14 +40,16 @@ acceptance("Edit Notification Click", function (needs) {
 
   test("history modal is shown when navigating from a non-topic page", async function (assert) {
     await visit("/");
-    await click(".d-header-icons #current-user");
-    await click("#quick-access-notifications .edited");
+    await click(".header-dropdown-toggle.current-user");
+    await click(".notification.edited a");
     const [v1, v2] = queryAll(".history-modal .revision-content");
+
     assert.strictEqual(
       v1.textContent.trim(),
       "Hello world this is a test",
       "history modal for the edited post is shown"
     );
+
     assert.strictEqual(
       v2.textContent.trim(),
       "Hello world this is a testThis is an edit!",
diff --git a/app/assets/javascripts/discourse/tests/acceptance/fast-edit-test.js b/app/assets/javascripts/discourse/tests/acceptance/fast-edit-test.js
index 5d02b73a945..7fe8403bfcb 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/fast-edit-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/fast-edit-test.js
@@ -1,6 +1,6 @@
 import {
   acceptance,
-  exists,
+  metaModifier,
   query,
   selectText,
 } from "discourse/tests/helpers/qunit-helpers";
@@ -28,17 +28,15 @@ acceptance("Fast Edit", function (needs) {
     await selectText(textNode, 9);
     await click(".quote-button .quote-edit-label");
 
-    assert.ok(exists("#fast-edit-input"), "fast editor is open");
-    assert.strictEqual(
-      query("#fast-edit-input").value,
-      "Any plans",
-      "contains selected text"
-    );
+    assert.dom("#fast-edit-input").exists();
+    assert
+      .dom("#fast-edit-input")
+      .hasValue("Any plans", "contains selected text");
 
     await fillIn("#fast-edit-input", "My edit");
     await click(".save-fast-edit");
 
-    assert.notOk(exists("#fast-edit-input"), "fast editor is closed");
+    assert.dom("#fast-edit-input").doesNotExist();
   });
 
   test("Works with keyboard shortcut", async function (assert) {
@@ -49,17 +47,24 @@ acceptance("Fast Edit", function (needs) {
     await selectText(textNode, 9);
     await triggerKeyEvent(document, "keypress", "E");
 
-    assert.ok(exists("#fast-edit-input"), "fast editor is open");
-    assert.strictEqual(
-      query("#fast-edit-input").value,
-      "Any plans",
-      "contains selected text"
-    );
+    assert.dom("#fast-edit-input").exists();
+    assert
+      .dom("#fast-edit-input")
+      .hasValue("Any plans", "contains selected text");
 
+    // Saving
     await fillIn("#fast-edit-input", "My edit");
-    await click(".save-fast-edit");
+    await triggerKeyEvent("#fast-edit-input", "keydown", "Enter", metaModifier);
 
-    assert.notOk(exists("#fast-edit-input"), "fast editor is closed");
+    assert.dom("#fast-edit-input").doesNotExist();
+
+    // Closing
+    await selectText(textNode, 9);
+    await triggerKeyEvent(document, "keypress", "E");
+    assert.dom("#fast-edit-input").exists();
+
+    await triggerKeyEvent("#fast-edit-input", "keydown", "Escape");
+    assert.dom("#fast-edit-input").doesNotExist();
   });
 
   test("Opens full composer for multi-line selection", async function (assert) {
@@ -70,7 +75,22 @@ acceptance("Fast Edit", function (needs) {
     await selectText(textNode);
     await click(".quote-button .quote-edit-label");
 
-    assert.notOk(exists("#fast-edit-input"), "fast editor is not open");
-    assert.ok(exists(".d-editor-input"), "the composer is open");
+    assert.dom("#fast-edit-input").doesNotExist();
+    assert.dom(".d-editor-input").exists();
+  });
+
+  test("Opens full composer when editing non-ascii characters", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+
+    query("#post_2 .cooked").append(
+      `Je suis désolé, ”comment ça va”? A bientôt!`
+    );
+    const textNode = query("#post_2 .cooked").childNodes[2];
+
+    await selectText(textNode);
+    await click(".quote-button .quote-edit-label");
+
+    assert.dom("#fast-edit-input").doesNotExist();
+    assert.dom(".d-editor-input").exists();
   });
 });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/glimmer-search-mobile-test.js b/app/assets/javascripts/discourse/tests/acceptance/glimmer-search-mobile-test.js
new file mode 100644
index 00000000000..3e0841a1897
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/acceptance/glimmer-search-mobile-test.js
@@ -0,0 +1,53 @@
+import {
+  acceptance,
+  count,
+  exists,
+  query,
+} from "discourse/tests/helpers/qunit-helpers";
+import { click, fillIn, visit } from "@ember/test-helpers";
+import { test } from "qunit";
+
+acceptance("Search - Glimmer - Mobile", function (needs) {
+  needs.mobileView();
+  needs.user({
+    experimental_search_menu_groups_enabled: true,
+  });
+
+  test("search", async function (assert) {
+    await visit("/");
+
+    await click("#search-button");
+
+    assert.ok(
+      exists("input.full-page-search"),
+      "it shows the full page search form"
+    );
+
+    assert.ok(!exists(".search-results .fps-topic"), "no results by default");
+
+    await click(".advanced-filters summary");
+
+    assert.ok(
+      exists(".advanced-filters[open]"),
+      "it should expand advanced search filters"
+    );
+
+    await fillIn(".search-query", "discourse");
+    await click(".search-cta");
+
+    assert.strictEqual(count(".fps-topic"), 1, "has one post");
+
+    assert.notOk(
+      exists(".advanced-filters[open]"),
+      "it should collapse advanced search filters"
+    );
+
+    await click("#search-button");
+
+    assert.strictEqual(
+      query("input.full-page-search").value,
+      "discourse",
+      "it does not reset input when hitting search icon again"
+    );
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/glimmer-search-test.js b/app/assets/javascripts/discourse/tests/acceptance/glimmer-search-test.js
new file mode 100644
index 00000000000..3b9b1221e72
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/acceptance/glimmer-search-test.js
@@ -0,0 +1,1081 @@
+import {
+  acceptance,
+  count,
+  exists,
+  query,
+  queryAll,
+  updateCurrentUser,
+} from "discourse/tests/helpers/qunit-helpers";
+import { click, fillIn, triggerKeyEvent, visit } from "@ember/test-helpers";
+import I18n from "I18n";
+import searchFixtures from "discourse/tests/fixtures/search-fixtures";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { test } from "qunit";
+import { DEFAULT_TYPE_FILTER } from "discourse/components/search-menu";
+
+acceptance("Search - Glimmer - Anonymous", function (needs) {
+  needs.user({
+    experimental_search_menu_groups_enabled: true,
+  });
+  needs.hooks.beforeEach(() => {
+    updateCurrentUser({ is_anonymous: true });
+  });
+  needs.pretender((server, helper) => {
+    server.get("/search/query", (request) => {
+      if (request.queryParams.type_filter === DEFAULT_TYPE_FILTER) {
+        // posts/topics are not present in the payload by default
+        return helper.response({
+          users: searchFixtures["search/query"]["users"],
+          categories: searchFixtures["search/query"]["categories"],
+          groups: searchFixtures["search/query"]["groups"],
+          grouped_search_result:
+            searchFixtures["search/query"]["grouped_search_result"],
+        });
+      }
+      return helper.response(searchFixtures["search/query"]);
+    });
+
+    server.get("/u/search/users", () => {
+      return helper.response({
+        users: [
+          {
+            username: "admin",
+            name: "admin",
+            avatar_template: "/images/avatar.png",
+          },
+        ],
+      });
+    });
+
+    server.get("/tag/important/notifications", () => {
+      return helper.response({
+        tag_notification: { id: "important", notification_level: 2 },
+      });
+    });
+  });
+
+  test("presence of elements", async function (assert) {
+    await visit("/");
+    await click("#search-button");
+
+    assert.ok(exists("#search-term"), "it shows the search input");
+    assert.ok(
+      exists(".show-advanced-search"),
+      "it shows full page search button"
+    );
+  });
+
+  test("random quick tips", async function (assert) {
+    await visit("/");
+    await click("#search-button");
+    await fillIn("#search-term", "dev");
+
+    assert.ok(
+      !exists(".search-menu .results ul li.search-random-quick-tip"),
+      "quick tip is no longer shown"
+    );
+  });
+
+  test("advanced search", async function (assert) {
+    await visit("/");
+    await click("#search-button");
+    await fillIn("#search-term", "dev");
+    await triggerKeyEvent("#search-term", "keyup", "ArrowDown");
+    await click(document.activeElement);
+    await click(".show-advanced-search");
+
+    assert.strictEqual(
+      query(".full-page-search").value,
+      "dev",
+      "it goes to full search page and preserves the search term"
+    );
+
+    assert.ok(
+      exists(".search-advanced-options"),
+      "advanced search is expanded"
+    );
+  });
+
+  test("search button toggles search menu", async function (assert) {
+    await visit("/");
+
+    await click("#search-button");
+    assert.ok(exists(".search-menu"));
+
+    await click(".d-header"); // click outside
+    assert.ok(!exists(".search-menu"));
+
+    await click("#search-button");
+    assert.ok(exists(".search-menu"));
+
+    await click("#search-button"); // toggle same button
+    assert.ok(!exists(".search-menu"));
+  });
+
+  test("initial options", async function (assert) {
+    await visit("/");
+    await click("#search-button");
+    await fillIn("#search-term", "dev");
+
+    assert.strictEqual(
+      query(
+        ".search-menu .results ul.search-menu-initial-options li:first-child .search-item-prefix"
+      ).innerText.trim(),
+      "dev",
+      "first dropdown item includes correct prefix"
+    );
+
+    assert.strictEqual(
+      query(
+        ".search-menu .results ul.search-menu-initial-options li:first-child .search-item-slug"
+      ).innerText.trim(),
+      I18n.t("search.in_topics_posts"),
+      "first dropdown item includes correct suffix"
+    );
+
+    assert.ok(
+      exists(".search-menu .search-result-category ul li"),
+      "shows matching category results"
+    );
+
+    assert.ok(
+      exists(".search-menu .search-result-user ul li"),
+      "shows matching user results"
+    );
+  });
+
+  test("initial options - tag search scope", async function (assert) {
+    const contextSelector = ".search-menu .results .search-menu-assistant-item";
+    await visit("/tag/important");
+    await click("#search-button");
+
+    assert.strictEqual(
+      query(".search-link .label-suffix").textContent.trim(),
+      I18n.t("search.in"),
+      "first option includes suffix"
+    );
+
+    assert.strictEqual(
+      query(".search-link .search-item-tag").textContent.trim(),
+      "important",
+      "frst option includes tag"
+    );
+
+    await fillIn("#search-term", "smth");
+    const secondOption = queryAll(contextSelector)[1];
+
+    assert.strictEqual(
+      secondOption.querySelector(".search-item-prefix").textContent.trim(),
+      "smth",
+      "second option includes term"
+    );
+
+    assert.strictEqual(
+      secondOption.querySelector(".label-suffix").textContent.trim(),
+      I18n.t("search.in"),
+      "second option includes suffix"
+    );
+
+    assert.strictEqual(
+      secondOption.querySelector(".search-item-tag").textContent.trim(),
+      "important",
+      "second option includes tag"
+    );
+  });
+
+  test("initial options - category search scope", async function (assert) {
+    const contextSelector = ".search-menu .results .search-menu-assistant-item";
+    await visit("/c/bug");
+    await click("#search-button");
+    await fillIn("#search-term", "smth");
+    const secondOption = queryAll(contextSelector)[1];
+
+    assert.strictEqual(
+      secondOption.querySelector(".search-item-prefix").textContent.trim(),
+      "smth",
+      "second option includes term"
+    );
+
+    assert.strictEqual(
+      secondOption.querySelector(".label-suffix").textContent.trim(),
+      I18n.t("search.in"),
+      "second option includes suffix"
+    );
+
+    assert.strictEqual(
+      secondOption.querySelector(".category-name").textContent.trim(),
+      "bug",
+      "second option includes category slug"
+    );
+
+    assert.ok(
+      exists(`${contextSelector} span.badge-wrapper`),
+      "category badge is a span (i.e. not a link)"
+    );
+  });
+
+  test("initial options - topic search scope", async function (assert) {
+    const contextSelector = ".search-menu .results .search-menu-assistant-item";
+    await visit("/t/internationalization-localization/280");
+    await click("#search-button");
+    await fillIn("#search-term", "smth");
+    const secondOption = queryAll(contextSelector)[1];
+
+    assert.strictEqual(
+      secondOption.querySelector(".search-item-prefix").textContent.trim(),
+      "smth",
+      "second option includes term"
+    );
+
+    assert.strictEqual(
+      secondOption.querySelector(".label-suffix").textContent.trim(),
+      I18n.t("search.in_this_topic"),
+      "second option includes suffix"
+    );
+  });
+
+  test("initial options - topic search scope - 'in all topics' searches in all topics", async function (assert) {
+    await visit("/t/internationalization-localization/280/1");
+    await click("#search-button");
+    await fillIn("#search-term", "foo");
+    // select 'in all topics and posts'
+    await click(
+      ".search-menu .results .search-menu-initial-options .search-menu-assistant-item:first-child"
+    );
+    assert.ok(
+      exists(".search-result-topic"),
+      "search result is a list of topics"
+    );
+  });
+
+  test("initial options - topic search scope - 'in this topic' searches posts within topic", async function (assert) {
+    await visit("/t/internationalization-localization/280/1");
+    await click("#search-button");
+    await fillIn("#search-term", "foo");
+    // select 'in this topic'
+    await click(
+      ".search-menu .results .search-menu-initial-options .search-menu-assistant-item:nth-child(2)"
+    );
+    assert.ok(
+      exists(".search-result-post"),
+      "search result is a list of posts"
+    );
+  });
+
+  test("initial options - topic search scope - keep 'in this topic' filter in full page search", async function (assert) {
+    await visit("/t/internationalization-localization/280/1");
+    await click("#search-button");
+    await fillIn("#search-term", "proper");
+    await triggerKeyEvent(document.activeElement, "keyup", "ArrowDown");
+    await triggerKeyEvent(document.activeElement, "keydown", "ArrowDown");
+    await click(document.activeElement);
+    await click(".show-advanced-search");
+
+    assert.strictEqual(
+      query(".full-page-search").value,
+      "proper topic:280",
+      "it goes to full search page and preserves search term + context"
+    );
+
+    assert.ok(
+      exists(".search-advanced-options"),
+      "advanced search is expanded"
+    );
+  });
+
+  test("initial options - topic search scope - special case when matching a single user", async function (assert) {
+    await visit("/t/internationalization-localization/280/1");
+    await click("#search-button");
+    await fillIn("#search-term", "@admin");
+
+    assert.strictEqual(count(".search-menu-assistant-item"), 2);
+    assert.strictEqual(
+      query(
+        ".search-menu-assistant-item:first-child .search-item-slug .label-suffix"
+      ).textContent.trim(),
+      I18n.t("search.in_topics_posts"),
+      "first result hints at global search"
+    );
+
+    assert.strictEqual(
+      query(
+        ".search-menu-assistant-item:nth-child(2) .search-item-slug .label-suffix"
+      ).textContent.trim(),
+      I18n.t("search.in_this_topic"),
+      "second result hints at search within current topic"
+    );
+  });
+
+  test("initial options - user search scope", async function (assert) {
+    const contextSelector = ".search-menu .results .search-menu-assistant-item";
+    await visit("/u/eviltrout");
+    await click("#search-button");
+    await fillIn("#search-term", "smth");
+    const secondOption = queryAll(contextSelector)[1];
+
+    assert.strictEqual(
+      secondOption.querySelector(".search-item-prefix").textContent.trim(),
+      "smth",
+      "second option includes term for user-scoped search"
+    );
+
+    assert.strictEqual(
+      secondOption.querySelector(".label-suffix").textContent.trim(),
+      I18n.t("search.in_posts_by", { username: "eviltrout" }),
+      "second option includes suffix for user-scoped search"
+    );
+  });
+
+  test("topic results", async function (assert) {
+    await visit("/");
+    await click("#search-button");
+    await fillIn("#search-term", "dev");
+    await triggerKeyEvent("#search-term", "keyup", "ArrowDown");
+    await click(document.activeElement);
+
+    assert.ok(
+      exists(".search-menu .search-result-topic ul li"),
+      "shows topic results"
+    );
+
+    assert.ok(
+      exists(".search-menu .results ul li .topic-title[data-topic-id]"),
+      "topic has data-topic-id"
+    );
+  });
+
+  test("topic results - topic search scope", async function (assert) {
+    await visit("/t/internationalization-localization/280/1");
+    await click("#search-button");
+    await fillIn("#search-term", "a proper");
+    await triggerKeyEvent(document.activeElement, "keyup", "ArrowDown");
+    await triggerKeyEvent(document.activeElement, "keydown", "ArrowDown");
+    await click(document.activeElement);
+
+    assert.ok(
+      exists(".search-menu .search-result-post ul li"),
+      "clicking second option scopes search to current topic"
+    );
+
+    assert.strictEqual(
+      query("#post_7 span.highlighted").textContent.trim(),
+      "a proper",
+      "highlights the post correctly"
+    );
+
+    assert.ok(
+      exists(".search-menu .search-context"),
+      "search context indicator is visible"
+    );
+
+    await click(".clear-search");
+    assert.strictEqual(
+      query("#search-term").textContent.trim(),
+      "",
+      "clear button works"
+    );
+
+    await click(".search-context");
+    assert.ok(
+      !exists(".search-menu .search-context"),
+      "search context indicator is no longer visible"
+    );
+
+    await fillIn("#search-term", "dev");
+    await query("#search-term").focus();
+    await triggerKeyEvent(document.activeElement, "keyup", "ArrowDown");
+    await triggerKeyEvent(document.activeElement, "keydown", "ArrowDown");
+    await click(document.activeElement);
+
+    assert.ok(
+      exists(".search-menu .search-context"),
+      "search context indicator is visible"
+    );
+
+    await fillIn("#search-term", "");
+    await query("#search-term").focus();
+    await triggerKeyEvent("#search-term", "keyup", "Backspace");
+
+    assert.ok(
+      !exists(".search-menu .search-context"),
+      "backspace resets search context"
+    );
+  });
+
+  test("topic results - search result escapes html in topic title", async function (assert) {
+    await visit("/");
+    await click("#search-button");
+    await fillIn("#search-term", "dev");
+    await triggerKeyEvent("#search-term", "keyup", "Enter");
+
+    assert.ok(
+      exists(
+        ".search-menu .search-result-topic .item .topic-title span#topic-with-html"
+      ),
+      "html in the topic title is properly escaped"
+    );
+  });
+
+  test("topic results - search result escapes emojis in topic title", async function (assert) {
+    await visit("/");
+    await click("#search-button");
+    await fillIn("#search-term", "dev");
+    await triggerKeyEvent("#search-term", "keyup", "Enter");
+
+    assert.ok(
+      exists(
+        ".search-menu .search-result-topic .item .topic-title img[alt='+1']"
+      ),
+      ":+1: in the topic title is properly converted to an emoji"
+    );
+  });
+});
+
+acceptance("Search - Glimmer - Authenticated", function (needs) {
+  needs.user({
+    experimental_search_menu_groups_enabled: true,
+  });
+  needs.settings({
+    log_search_queries: true,
+    allow_uncategorized_topics: true,
+  });
+
+  needs.pretender((server, helper) => {
+    server.get("/search/query", (request) => {
+      if (request.queryParams.term.includes("empty")) {
+        return helper.response({
+          posts: [],
+          users: [],
+          categories: [],
+          tags: [],
+          groups: [],
+          grouped_search_result: {
+            more_posts: null,
+            more_users: null,
+            more_categories: null,
+            term: "plans test",
+            search_log_id: 1,
+            more_full_page_results: null,
+            can_create_topic: true,
+            error: null,
+            type_filter: null,
+            post_ids: [],
+            user_ids: [],
+            category_ids: [],
+            tag_ids: [],
+            group_ids: [],
+          },
+        });
+      }
+
+      return helper.response(searchFixtures["search/query"]);
+    });
+
+    server.get("/inline-onebox", () =>
+      helper.response({
+        "inline-oneboxes": [
+          {
+            url: "http://www.something.com",
+            title: searchFixtures["search/query"].topics[0].title,
+          },
+        ],
+      })
+    );
+  });
+
+  test("full page search - the right filters are shown", async function (assert) {
+    const inSelector = selectKit(".select-kit#in");
+    await visit("/search?expanded=true");
+    await inSelector.expand();
+
+    assert.ok(inSelector.rowByValue("first").exists());
+    assert.ok(inSelector.rowByValue("pinned").exists());
+    assert.ok(inSelector.rowByValue("wiki").exists());
+    assert.ok(inSelector.rowByValue("images").exists());
+
+    assert.ok(inSelector.rowByValue("unseen").exists());
+    assert.ok(inSelector.rowByValue("posted").exists());
+    assert.ok(inSelector.rowByValue("watching").exists());
+    assert.ok(inSelector.rowByValue("tracking").exists());
+    assert.ok(inSelector.rowByValue("bookmarks").exists());
+
+    assert.ok(exists(".search-advanced-options .in-likes"));
+    assert.ok(exists(".search-advanced-options .in-private"));
+    assert.ok(exists(".search-advanced-options .in-seen"));
+  });
+
+  test("topic results - topic search scope - works with empty result sets", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+    await click("#search-button");
+    await fillIn("#search-term", "plans");
+    await triggerKeyEvent("#search-term", "keyup", "ArrowDown");
+    await click(document.activeElement);
+
+    assert.notStrictEqual(count(".search-menu .results .item"), 0);
+
+    await fillIn("#search-term", "plans empty");
+    await triggerKeyEvent("#search-term", "keyup", 13);
+
+    assert.strictEqual(count(".search-menu .results .item"), 0);
+    assert.strictEqual(count(".search-menu .results .no-results"), 1);
+    assert.strictEqual(
+      query(".search-menu .results .no-results").innerText,
+      I18n.t("search.no_results")
+    );
+  });
+
+  test("search menu keyboard navigation", async function (assert) {
+    const container = ".search-menu .results";
+    await visit("/");
+    await click("#search-button");
+    await fillIn("#search-term", "dev");
+    assert.ok(exists(query(`${container} ul li`)), "has a list of items");
+
+    await triggerKeyEvent("#search-term", "keyup", "Enter");
+    assert.ok(
+      exists(query(`${container} .search-result-topic`)),
+      "has topic results"
+    );
+
+    await triggerKeyEvent("#search-term", "keyup", "ArrowDown");
+    assert.strictEqual(
+      document.activeElement.getAttribute("href"),
+      query(`${container} li:first-child a`).getAttribute("href"),
+      "arrow down selects first element"
+    );
+
+    await triggerKeyEvent(document.activeElement, "keydown", "ArrowDown");
+    assert.strictEqual(
+      document.activeElement.getAttribute("href"),
+      query(`${container} li:nth-child(2) a`).getAttribute("href"),
+      "arrow down selects next element"
+    );
+
+    // navigate to the `more link`
+    await triggerKeyEvent(document.activeElement, "keydown", "ArrowDown");
+    await triggerKeyEvent(document.activeElement, "keydown", "ArrowDown");
+    await triggerKeyEvent(document.activeElement, "keydown", "ArrowDown");
+    await triggerKeyEvent(document.activeElement, "keydown", "ArrowDown");
+    assert.strictEqual(
+      document.activeElement.getAttribute("href"),
+      "/search?q=dev",
+      "arrow down sets focus to more results link"
+    );
+
+    await triggerKeyEvent("#search-term", "keyup", "Escape");
+    assert.strictEqual(
+      document.activeElement,
+      query("#search-button"),
+      "Escaping search returns focus to search button"
+    );
+    assert.ok(!exists(".search-menu:visible"), "Esc removes search dropdown");
+
+    await click("#search-button");
+    await triggerKeyEvent(document.activeElement, "keyup", "ArrowDown");
+    await triggerKeyEvent(document.activeElement, "keydown", "ArrowUp");
+    assert.strictEqual(
+      document.activeElement.tagName.toLowerCase(),
+      "input",
+      "arrow up sets focus to search term input"
+    );
+
+    await triggerKeyEvent("#search-term", "keyup", "Enter");
+    assert.ok(
+      exists(query(`${container} .search-result-topic`)),
+      "has topic results"
+    );
+
+    await triggerKeyEvent("#search-term", "keyup", "Enter");
+    assert.ok(
+      exists(query(`.search-container`)),
+      "second Enter hit goes to full page search"
+    );
+    assert.ok(
+      !exists(query(`.search-menu`)),
+      "search dropdown is collapsed after second Enter hit"
+    );
+
+    //new search launched, Enter key should be reset
+    await click("#search-button");
+    assert.ok(exists(query(`${container} ul li`)), "has a list of items");
+
+    await triggerKeyEvent("#search-term", "keyup", "Enter");
+    assert.ok(exists(query(`.search-menu`)), "search dropdown is visible");
+  });
+
+  test("search menu keyboard navigation - while composer is open", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+    await click(".reply");
+    await fillIn(".d-editor-input", "a link");
+    await click("#search-button");
+    await fillIn("#search-term", "dev");
+    await triggerKeyEvent("#search-term", "keyup", "Enter");
+    await triggerKeyEvent(document.activeElement, "keyup", "ArrowDown");
+    await triggerKeyEvent(document.activeElement, "keydown", 65); // maps to lowercase a
+
+    assert.ok(
+      query(".d-editor-input").value.includes("a link"),
+      "still has the original composer content"
+    );
+
+    assert.ok(
+      query(".d-editor-input").value.includes(
+        searchFixtures["search/query"].topics[0].slug
+      ),
+      "adds link from search to composer"
+    );
+  });
+
+  test("initial options - recent search results", async function (assert) {
+    await visit("/");
+    await click("#search-button");
+
+    assert.strictEqual(
+      query(
+        ".search-menu .search-menu-recent li:nth-of-type(1) .search-link"
+      ).textContent.trim(),
+      "yellow",
+      "shows first recent search"
+    );
+
+    assert.strictEqual(
+      query(
+        ".search-menu .search-menu-recent li:nth-of-type(2) .search-link"
+      ).textContent.trim(),
+      "blue",
+      "shows second recent search"
+    );
+  });
+});
+
+acceptance("Search - Glimmer - with tagging enabled", function (needs) {
+  needs.user({
+    experimental_search_menu_groups_enabled: true,
+  });
+  needs.settings({ tagging_enabled: true });
+
+  test("topic results - displays tags", async function (assert) {
+    await visit("/");
+    await click("#search-button");
+    await fillIn("#search-term", "dev");
+    await triggerKeyEvent("#search-term", "keyup", 13);
+
+    assert.strictEqual(
+      query(
+        ".search-menu .results ul li:nth-of-type(1) .discourse-tags"
+      ).textContent.trim(),
+      "dev slow",
+      "tags displayed in search results"
+    );
+  });
+
+  test("initial results - displays tag shortcuts", async function (assert) {
+    await visit("/");
+    await click("#search-button");
+    await fillIn("#search-term", "dude #monk");
+    const firstItem =
+      ".search-menu .results ul.search-menu-assistant .search-link";
+
+    assert.ok(exists(query(firstItem)));
+
+    const firstTag = query(`${firstItem} .search-item-tag`).textContent.trim();
+    assert.strictEqual(firstTag, "monkey");
+  });
+});
+
+acceptance("Search - Glimmer - assistant", function (needs) {
+  needs.user({
+    experimental_search_menu_groups_enabled: true,
+  });
+
+  needs.pretender((server, helper) => {
+    server.get("/search/query", (request) => {
+      if (request.queryParams["search_context[type]"] === "private_messages") {
+        // return only one result for PM search
+        return helper.response({
+          posts: [
+            {
+              id: 3833,
+              name: "Bill Dudney",
+              username: "bdudney",
+              avatar_template:
+                "/user_avatar/meta.discourse.org/bdudney/{size}/8343_1.png",
+              uploaded_avatar_id: 8343,
+              created_at: "2013-02-07T17:46:57.469Z",
+              cooked:
+                "<p>I've gotten vagrant up and running with a development environment but it's taking forever to load.</p>\n\n<p>For example <a href=\"http://192.168.10.200:3000/\" rel=\"nofollow\">http://192.168.10.200:3000/</a> takes tens of seconds to load.</p>\n\n<p>I'm running the whole stack on a new rMBP with OS X 10.8.2.</p>\n\n<p>Any ideas of what I've done wrong? Or is this just a function of being on the bleeding edge?</p>\n\n<p>Thanks,</p>\n\n<p>-bd</p>",
+              post_number: 1,
+              post_type: 1,
+              updated_at: "2013-02-07T17:46:57.469Z",
+              like_count: 0,
+              reply_count: 1,
+              reply_to_post_number: null,
+              quote_count: 0,
+              incoming_link_count: 4422,
+              reads: 327,
+              score: 21978.4,
+              yours: false,
+              topic_id: 2179,
+              topic_slug: "development-mode-super-slow",
+              display_username: "Bill Dudney",
+              primary_group_name: null,
+              version: 2,
+              can_edit: false,
+              can_delete: false,
+              can_recover: false,
+              user_title: null,
+              actions_summary: [
+                {
+                  id: 2,
+                  count: 0,
+                  hidden: false,
+                  can_act: false,
+                },
+                {
+                  id: 3,
+                  count: 0,
+                  hidden: false,
+                  can_act: false,
+                },
+                {
+                  id: 4,
+                  count: 0,
+                  hidden: false,
+                  can_act: false,
+                },
+                {
+                  id: 5,
+                  count: 0,
+                  hidden: true,
+                  can_act: false,
+                },
+                {
+                  id: 6,
+                  count: 0,
+                  hidden: false,
+                  can_act: false,
+                },
+                {
+                  id: 7,
+                  count: 0,
+                  hidden: false,
+                  can_act: false,
+                },
+                {
+                  id: 8,
+                  count: 0,
+                  hidden: false,
+                  can_act: false,
+                },
+              ],
+              moderator: false,
+              admin: false,
+              staff: false,
+              user_id: 1828,
+              hidden: false,
+              hidden_reason_id: null,
+              trust_level: 1,
+              deleted_at: null,
+              user_deleted: false,
+              edit_reason: null,
+              can_view_edit_history: true,
+              wiki: false,
+              blurb:
+                "I've gotten vagrant up and running with a development environment but it's taking forever to load. For example http://192.168.10.200:3000/ takes...",
+            },
+          ],
+          topics: [
+            {
+              id: 2179,
+              title: "Development mode super slow",
+              fancy_title: "Development mode super slow",
+              slug: "development-mode-super-slow",
+              posts_count: 72,
+              reply_count: 53,
+              highest_post_number: 73,
+              image_url: null,
+              created_at: "2013-02-07T17:46:57.262Z",
+              last_posted_at: "2015-04-17T08:08:26.671Z",
+              bumped: true,
+              bumped_at: "2015-04-17T08:08:26.671Z",
+              unseen: false,
+              pinned: false,
+              unpinned: null,
+              visible: true,
+              closed: false,
+              archived: false,
+              bookmarked: null,
+              liked: null,
+              views: 9538,
+              like_count: 45,
+              has_summary: true,
+              archetype: "regular",
+              last_poster_username: null,
+              category_id: 7,
+              pinned_globally: false,
+              posters: [],
+              tags: ["dev", "slow"],
+              tags_descriptions: {
+                dev: "dev description",
+                slow: "slow description",
+              },
+            },
+          ],
+          grouped_search_result: {
+            term: "emoji",
+            post_ids: [3833],
+          },
+        });
+      }
+      return helper.response(searchFixtures["search/query"]);
+    });
+
+    server.get("/tag/dev/notifications", () => {
+      return helper.response({
+        tag_notification: { id: "dev", notification_level: 2 },
+      });
+    });
+
+    server.get("/tags/c/bug/1/dev/l/latest.json", () => {
+      return helper.response({
+        users: [],
+        primary_groups: [],
+        topic_list: {
+          can_create_topic: true,
+          draft: null,
+          draft_key: "new_topic",
+          draft_sequence: 1,
+          per_page: 30,
+          tags: [
+            {
+              id: 1,
+              name: "dev",
+              topic_count: 1,
+            },
+          ],
+          topics: [],
+        },
+      });
+    });
+
+    server.get("/tags/intersection/dev/foo.json", () => {
+      return helper.response({
+        topic_list: {
+          can_create_topic: true,
+          draft: null,
+          draft_key: "new_topic",
+          draft_sequence: 1,
+          per_page: 30,
+          topics: [],
+        },
+      });
+    });
+
+    server.get("/u/search/users", () => {
+      return helper.response({
+        users: [
+          {
+            username: "TeaMoe",
+            name: "TeaMoe",
+            avatar_template:
+              "https://avatars.discourse.org/v3/letter/t/41988e/{size}.png",
+          },
+          {
+            username: "TeamOneJ",
+            name: "J Cobb",
+            avatar_template:
+              "https://avatars.discourse.org/v3/letter/t/3d9bf3/{size}.png",
+          },
+          {
+            username: "kudos",
+            name: "Team Blogeto.com",
+            avatar_template:
+              "/user_avatar/meta.discourse.org/kudos/{size}/62185_1.png",
+          },
+        ],
+      });
+    });
+  });
+
+  test("initial options - shows category shortcuts when typing #", async function (assert) {
+    await visit("/");
+    await click("#search-button");
+    await fillIn("#search-term", "#");
+
+    assert.strictEqual(
+      query(
+        ".search-menu .results ul.search-menu-assistant .search-link .category-name"
+      ).innerText,
+      "support"
+    );
+  });
+
+  test("initial options - tag search scope - shows category / tag combination shortcut when both are present", async function (assert) {
+    await visit("/tags/c/bug/dev");
+    await click("#search-button");
+
+    assert.strictEqual(
+      query(".search-menu .results ul.search-menu-assistant .category-name")
+        .innerText,
+      "bug",
+      "Category is displayed"
+    );
+
+    assert.strictEqual(
+      query(".search-menu .results ul.search-menu-assistant .search-item-tag")
+        .innerText,
+      "dev",
+      "Tag is displayed"
+    );
+  });
+
+  test("initial options - tag and category search scope - updates tag / category combination search suggestion when typing", async function (assert) {
+    await visit("/tags/c/bug/dev");
+    await click("#search-button");
+    await fillIn("#search-term", "foo bar");
+
+    assert.strictEqual(
+      query(
+        ".search-menu .results ul.search-menu-assistant .search-item-prefix"
+      ).innerText,
+      "foo bar",
+      "Input is applied to search query"
+    );
+
+    assert.strictEqual(
+      query(".search-menu .results ul.search-menu-assistant .category-name")
+        .innerText,
+      "bug"
+    );
+
+    assert.strictEqual(
+      query(".search-menu .results ul.search-menu-assistant .search-item-tag")
+        .innerText,
+      "dev",
+      "Tag is displayed"
+    );
+  });
+
+  test("initial options - tag intersection search scope - shows tag combination shortcut when visiting tag intersection", async function (assert) {
+    await visit("/tags/intersection/dev/foo");
+    await click("#search-button");
+
+    assert.strictEqual(
+      query(".search-menu .results ul.search-menu-assistant .search-item-tag")
+        .innerText,
+      "tags:dev+foo",
+      "Tags are displayed"
+    );
+  });
+
+  test("initial options - tag intersection search scope - updates tag intersection search suggestion when typing", async function (assert) {
+    await visit("/tags/intersection/dev/foo");
+    await click("#search-button");
+    await fillIn("#search-term", "foo bar");
+
+    assert.strictEqual(
+      query(
+        ".search-menu .results ul.search-menu-assistant .search-item-prefix"
+      ).innerText,
+      "foo bar",
+      "Input is applied to search query"
+    );
+
+    assert.strictEqual(
+      query(".search-menu .results ul.search-menu-assistant .search-item-tag")
+        .innerText,
+      "tags:dev+foo",
+      "Tags are displayed"
+    );
+  });
+
+  test("initial options - shows in: shortcuts", async function (assert) {
+    await visit("/");
+    await click("#search-button");
+    const firstTarget =
+      ".search-menu .results ul.search-menu-assistant .search-link ";
+
+    await fillIn("#search-term", "in:");
+    assert.strictEqual(
+      query(firstTarget.concat(".search-item-slug")).innerText,
+      "in:title",
+      "keyword is present in suggestion"
+    );
+
+    await fillIn("#search-term", "sam in:");
+    assert.strictEqual(
+      query(firstTarget.concat(".search-item-prefix")).innerText,
+      "sam",
+      "term is present in suggestion"
+    );
+    assert.strictEqual(
+      query(firstTarget.concat(".search-item-slug")).innerText,
+      "in:title",
+      "keyword is present in suggestion"
+    );
+
+    await fillIn("#search-term", "in:mess");
+    assert.strictEqual(query(firstTarget).innerText, "in:messages");
+  });
+
+  test("initial options - user search scope - shows users when typing @", async function (assert) {
+    await visit("/");
+    await click("#search-button");
+    await fillIn("#search-term", "@");
+    const firstUser =
+      ".search-menu .results ul.search-menu-assistant .search-item-user";
+    const firstUsername = query(firstUser).innerText.trim();
+
+    assert.strictEqual(firstUsername, "TeaMoe");
+
+    await click(query(firstUser));
+    assert.strictEqual(query("#search-term").value, `@${firstUsername}`);
+  });
+
+  test("initial options - private message search scope - shows 'in messages' button when in an inbox", async function (assert) {
+    await visit("/u/charlie/messages");
+    await click("#search-button");
+
+    assert.ok(exists(".btn.search-context"), "it shows the button");
+
+    await fillIn("#search-term", "");
+    await query("input#search-term").focus();
+    await triggerKeyEvent("input#search-term", "keyup", "Backspace");
+
+    assert.notOk(exists(".btn.search-context"), "it removes the button");
+
+    await click(".d-header");
+    await click("#search-button");
+    assert.ok(
+      exists(".btn.search-context"),
+      "it shows the button when reinvoking search"
+    );
+
+    await fillIn("#search-term", "emoji");
+    await query("input#search-term").focus();
+    await triggerKeyEvent("#search-term", "keyup", "Enter");
+
+    assert.strictEqual(
+      count(".search-menu .search-result-topic"),
+      1,
+      "it passes the PM search context to the search query"
+    );
+  });
+
+  test("topic results - updates search term when selecting a initial category option", async function (assert) {
+    await visit("/");
+    await click("#search-button");
+    await fillIn("#search-term", "sam #");
+    const firstCategory =
+      ".search-menu .results ul.search-menu-assistant .search-link";
+    const firstCategoryName = query(
+      `${firstCategory} .category-name`
+    ).innerText;
+    await click(firstCategory);
+
+    assert.strictEqual(
+      query("#search-term").value,
+      `sam #${firstCategoryName}`
+    );
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/glimmer-topic-timeline-test.js b/app/assets/javascripts/discourse/tests/acceptance/glimmer-topic-timeline-test.js
deleted file mode 100644
index fc19b1ab83a..00000000000
--- a/app/assets/javascripts/discourse/tests/acceptance/glimmer-topic-timeline-test.js
+++ /dev/null
@@ -1,401 +0,0 @@
-import { click, currentURL, visit } from "@ember/test-helpers";
-import {
-  acceptance,
-  exists,
-  query,
-} from "discourse/tests/helpers/qunit-helpers";
-import { test } from "qunit";
-
-acceptance("Glimmer Topic Timeline", function (needs) {
-  needs.user({
-    admin: true,
-    redesigned_topic_timeline_enabled: true,
-  });
-  needs.pretender((server, helper) => {
-    server.get("/t/129.json", () => {
-      return helper.response({
-        post_stream: {
-          posts: [
-            {
-              id: 132,
-              name: null,
-              username: "foo",
-              avatar_template:
-                "/letter_avatar_proxy/v4/letter/f/b19c9b/{size}.png",
-              created_at: "2020-07-08T15:03:53.166Z",
-              cooked: "<p>Deleted post</p>",
-              post_number: 1,
-              post_type: 1,
-              updated_at: "2020-07-08T15:04:33.425Z",
-              reply_count: 0,
-              reply_to_post_number: null,
-              quote_count: 0,
-              incoming_link_count: 0,
-              reads: 1,
-              readers_count: 0,
-              score: 0,
-              yours: true,
-              topic_id: 129,
-              topic_slug: "deleted-topic-with-whisper-post",
-              display_username: null,
-              primary_group_name: null,
-              flair_name: null,
-              flair_url: null,
-              flair_bg_color: null,
-              flair_color: null,
-              version: 1,
-              can_edit: true,
-              can_delete: false,
-              can_recover: true,
-              can_wiki: true,
-              read: true,
-              user_title: null,
-              bookmarked: false,
-              bookmarks: [],
-              actions_summary: [
-                {
-                  id: 3,
-                  can_act: true,
-                },
-                {
-                  id: 4,
-                  can_act: true,
-                },
-                {
-                  id: 8,
-                  can_act: true,
-                },
-                {
-                  id: 7,
-                  can_act: true,
-                },
-              ],
-              moderator: false,
-              admin: true,
-              staff: true,
-              user_id: 7,
-              hidden: false,
-              trust_level: 4,
-              deleted_at: "2020-07-08T15:04:37.544Z",
-              deleted_by: {
-                id: 7,
-                username: "foo",
-                name: null,
-                avatar_template:
-                  "/letter_avatar_proxy/v4/letter/f/b19c9b/{size}.png",
-              },
-              user_deleted: false,
-              edit_reason: null,
-              can_view_edit_history: true,
-              wiki: false,
-              reviewable_id: 0,
-              reviewable_score_count: 0,
-              reviewable_score_pending_count: 0,
-            },
-            {
-              id: 133,
-              name: null,
-              username: "foo",
-              avatar_template:
-                "/letter_avatar_proxy/v4/letter/f/b19c9b/{size}.png",
-              created_at: "2020-07-08T15:04:23.190Z",
-              cooked: "<p>Whisper post</p>",
-              post_number: 2,
-              post_type: 4,
-              updated_at: "2020-07-08T15:04:23.190Z",
-              reply_count: 0,
-              reply_to_post_number: null,
-              quote_count: 0,
-              incoming_link_count: 0,
-              reads: 1,
-              readers_count: 0,
-              score: 0,
-              yours: true,
-              topic_id: 129,
-              topic_slug: "deleted-topic-with-whisper-post",
-              display_username: null,
-              primary_group_name: null,
-              flair_name: null,
-              flair_url: null,
-              flair_bg_color: null,
-              flair_color: null,
-              version: 1,
-              can_edit: true,
-              can_delete: true,
-              can_recover: false,
-              can_wiki: true,
-              read: true,
-              user_title: null,
-              bookmarked: false,
-              bookmarks: [],
-              actions_summary: [
-                {
-                  id: 3,
-                  can_act: true,
-                },
-                {
-                  id: 4,
-                  can_act: true,
-                },
-                {
-                  id: 8,
-                  can_act: true,
-                },
-                {
-                  id: 7,
-                  can_act: true,
-                },
-              ],
-              moderator: false,
-              admin: true,
-              staff: true,
-              user_id: 7,
-              hidden: false,
-              trust_level: 4,
-              deleted_at: null,
-              user_deleted: false,
-              edit_reason: null,
-              can_view_edit_history: true,
-              wiki: false,
-              reviewable_id: 0,
-              reviewable_score_count: 0,
-              reviewable_score_pending_count: 0,
-            },
-          ],
-          stream: [132, 133],
-        },
-        timeline_lookup: [[1, 0]],
-        suggested_topics: [
-          {
-            id: 7,
-            title: "Welcome to Discourse",
-            fancy_title: "Welcome to Discourse",
-            slug: "welcome-to-discourse",
-            posts_count: 1,
-            reply_count: 0,
-            highest_post_number: 1,
-            image_url: null,
-            created_at: "2020-07-08T14:56:57.424Z",
-            last_posted_at: "2020-07-08T14:56:57.488Z",
-            bumped: true,
-            bumped_at: "2020-07-08T14:56:57.488Z",
-            archetype: "regular",
-            unseen: false,
-            pinned: true,
-            unpinned: null,
-            excerpt:
-              "The first paragraph of this pinned topic will be visible as a welcome message to all new visitors on your homepage. It’s important! \nEdit this into a brief description of your community: \n\nWho is it for?\nWhat can they fi&hellip;",
-            visible: true,
-            closed: false,
-            archived: false,
-            bookmarked: null,
-            liked: null,
-            tags: [],
-            like_count: 0,
-            views: 0,
-            category_id: 1,
-            featured_link: null,
-            posters: [
-              {
-                extras: "latest single",
-                description: "Original Poster, Most Recent Poster",
-                user: {
-                  id: -1,
-                  username: "system",
-                  name: "system",
-                  avatar_template: "/images/discourse-logo-sketch-small.png",
-                },
-              },
-            ],
-          },
-        ],
-        tags: [],
-        id: 129,
-        title: "Deleted topic with whisper post",
-        fancy_title: "Deleted topic with whisper post",
-        posts_count: 0,
-        created_at: "2020-07-08T15:03:53.045Z",
-        views: 1,
-        reply_count: 0,
-        like_count: 0,
-        last_posted_at: null,
-        visible: true,
-        closed: false,
-        archived: false,
-        has_summary: false,
-        archetype: "regular",
-        slug: "deleted-topic-with-whisper-post",
-        category_id: 1,
-        word_count: 8,
-        deleted_at: "2020-07-08T15:04:37.580Z",
-        user_id: 7,
-        featured_link: null,
-        pinned_globally: false,
-        pinned_at: null,
-        pinned_until: null,
-        image_url: null,
-        slow_mode_seconds: 0,
-        draft: null,
-        draft_key: "topic_129",
-        draft_sequence: 5,
-        posted: true,
-        unpinned: null,
-        pinned: false,
-        current_post_number: 1,
-        highest_post_number: 2,
-        last_read_post_number: 0,
-        bookmarks: [],
-        last_read_post_id: null,
-        deleted_by: {
-          id: 7,
-          username: "foo",
-          name: null,
-          avatar_template: "/letter_avatar_proxy/v4/letter/f/b19c9b/{size}.png",
-        },
-        has_deleted: false,
-        actions_summary: [
-          {
-            id: 4,
-            count: 0,
-            hidden: false,
-            can_act: true,
-          },
-          {
-            id: 8,
-            count: 0,
-            hidden: false,
-            can_act: true,
-          },
-          {
-            id: 7,
-            count: 0,
-            hidden: false,
-            can_act: true,
-          },
-        ],
-        chunk_size: 20,
-        bookmarked: false,
-        bookmarks: [],
-        topic_timer: null,
-        message_bus_last_id: 5,
-        participant_count: 1,
-        show_read_indicator: false,
-        thumbnails: null,
-        slow_mode_enabled_until: null,
-        details: {
-          can_edit: true,
-          notification_level: 3,
-          notifications_reason_id: 1,
-          can_move_posts: true,
-          can_recover: true,
-          can_remove_allowed_users: true,
-          can_invite_to: true,
-          can_invite_via_email: true,
-          can_reply_as_new_topic: true,
-          can_flag_topic: true,
-          can_review_topic: true,
-          can_close_topic: true,
-          can_archive_topic: true,
-          can_split_merge_topic: true,
-          can_edit_staff_notes: true,
-          can_toggle_topic_visibility: true,
-          can_pin_unpin_topic: true,
-          can_moderate_category: true,
-          can_remove_self_id: 7,
-          participants: [
-            {
-              id: 7,
-              username: "foo",
-              name: null,
-              avatar_template:
-                "/letter_avatar_proxy/v4/letter/f/b19c9b/{size}.png",
-              post_count: 1,
-              primary_group_name: null,
-              flair_name: null,
-              flair_url: null,
-              flair_color: null,
-              flair_bg_color: null,
-              admin: true,
-              trust_level: 4,
-            },
-          ],
-          created_by: {
-            id: 7,
-            username: "foo",
-            name: null,
-            avatar_template:
-              "/letter_avatar_proxy/v4/letter/f/b19c9b/{size}.png",
-          },
-          last_poster: {
-            id: 7,
-            username: "foo",
-            name: null,
-            avatar_template:
-              "/letter_avatar_proxy/v4/letter/f/b19c9b/{size}.png",
-          },
-        },
-      });
-    });
-  });
-
-  test("it has a topic admin menu", async function (assert) {
-    await visit("/t/internationalization-localization");
-    assert.ok(
-      exists(".timeline-controls .topic-admin-menu-button"),
-      "admin menu is present"
-    );
-  });
-
-  test("it has a reply-to-post button", async function (assert) {
-    await visit("/t/internationalization-localization");
-    assert.ok(
-      exists(".timeline-footer-controls .reply-to-post"),
-      "reply to post button is present"
-    );
-  });
-
-  test("it has a topic notification button", async function (assert) {
-    await visit("/t/internationalization-localization");
-    assert.ok(
-      exists(".timeline-footer-controls .topic-notifications-button"),
-      "topic notifications button is present"
-    );
-  });
-
-  test("Shows dates of first and last posts", async function (assert) {
-    await visit("/t/deleted-topic-with-whisper-post/129");
-    assert.strictEqual(
-      query(".timeline-date-wrapper .now-date").innerText,
-      "Jul 2020"
-    );
-  });
-
-  test("selecting start-date navigates you to the first post", async function (assert) {
-    await visit("/t/internationalization-localization/280/2");
-    await click(".timeline-date-wrapper .start-date");
-    assert.strictEqual(
-      currentURL(),
-      "/t/internationalization-localization/280/1",
-      "navigates to the first post"
-    );
-  });
-
-  test("selecting now-date navigates you to the last post", async function (assert) {
-    await visit("/t/internationalization-localization/280/1");
-    await click(".timeline-date-wrapper .now-date");
-    assert.strictEqual(
-      currentURL(),
-      "/t/internationalization-localization/280/11",
-      "navigates to the latest post"
-    );
-  });
-
-  test("clicking the timeline padding updates the position", async function (assert) {
-    await visit("/t/internationalization-localization/280/2");
-    await click(".timeline-scrollarea .timeline-padding");
-    assert.notOk(
-      currentURL().includes("/280/2"),
-      "The position of the currently viewed post has been updated from it's initial position"
-    );
-  });
-});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/globals-test.js b/app/assets/javascripts/discourse/tests/acceptance/globals-test.js
new file mode 100644
index 00000000000..f761334fc07
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/acceptance/globals-test.js
@@ -0,0 +1,45 @@
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { visit } from "@ember/test-helpers";
+import { test } from "qunit";
+import { getOwner } from "@ember/application";
+import { withSilencedDeprecations } from "discourse-common/lib/deprecated";
+import User from "discourse/models/user";
+import Site from "discourse/models/site";
+
+acceptance("Acceptance | Globals", function () {
+  test("Globals function as expected", async function (assert) {
+    await visit("/");
+
+    assert.ok(window.Discourse, "window.Discourse is present");
+
+    assert.strictEqual(
+      window.Discourse,
+      getOwner(this),
+      "matches the expected application instance"
+    );
+
+    withSilencedDeprecations("discourse.global.user", () => {
+      assert.strictEqual(
+        window.Discourse.User,
+        User,
+        "Deprecated User alias is present"
+      );
+    });
+
+    withSilencedDeprecations("discourse.global.site", () => {
+      assert.strictEqual(
+        window.Discourse.Site,
+        Site,
+        "Deprecated Site alias is present"
+      );
+    });
+
+    withSilencedDeprecations("discourse.global.site-settings", () => {
+      assert.strictEqual(
+        window.Discourse.SiteSettings,
+        getOwner(this).lookup("service:site-settings"),
+        "Deprecated SiteSettings alias is present"
+      );
+    });
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/group-index-test.js b/app/assets/javascripts/discourse/tests/acceptance/group-index-test.js
index f5e0081a87e..475b6baf7f8 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/group-index-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/group-index-test.js
@@ -20,7 +20,7 @@ acceptance("Group Members - Anonymous", function () {
       1,
       "it displays the group's avatar flair"
     );
-    assert.ok(exists(".group-members tr"), "it lists group members");
+    assert.ok(exists(".group-members .group-member"), "it lists group members");
 
     assert.ok(
       !exists(".group-member-dropdown"),
@@ -39,7 +39,7 @@ acceptance("Group Members", function (needs) {
   needs.user();
 
   needs.pretender((server, helper) => {
-    server.put("/admin/groups/47/owners.json", () => {
+    server.put("/groups/47/owners.json", () => {
       return helper.response({ success: true });
     });
   });
@@ -137,7 +137,7 @@ acceptance("Group Members", function (needs) {
     );
 
     await click("button.bulk-select");
-    await click(".bulk-select-buttons button:nth-child(1)");
+    await click(".bulk-select-all");
 
     assert.ok(
       exists(".bulk-select-buttons-wrap details"),
diff --git a/app/assets/javascripts/discourse/tests/acceptance/group-manage-categories-test.js b/app/assets/javascripts/discourse/tests/acceptance/group-manage-categories-test.js
index 1e36361608c..38dcd87512d 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/group-manage-categories-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/group-manage-categories-test.js
@@ -12,7 +12,7 @@ acceptance("Managing Group Category Notification Defaults", function () {
     await visit("/g/discourse/manage/categories");
 
     assert.ok(
-      exists(".group-members tr"),
+      exists(".group-members .group-member"),
       "it should redirect to members page for an anonymous user"
     );
   });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/group-manage-profile-test.js b/app/assets/javascripts/discourse/tests/acceptance/group-manage-profile-test.js
index aa436364a53..c3de67d7f55 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/group-manage-profile-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/group-manage-profile-test.js
@@ -12,7 +12,7 @@ acceptance("Managing Group Profile", function () {
     await visit("/g/discourse/manage/profile");
 
     assert.ok(
-      exists(".group-members tr"),
+      exists(".group-members .group-member"),
       "it should redirect to members page for an anonymous user"
     );
   });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/group-manage-tags-test.js b/app/assets/javascripts/discourse/tests/acceptance/group-manage-tags-test.js
index 2d75056e83d..e3d500831c9 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/group-manage-tags-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/group-manage-tags-test.js
@@ -12,7 +12,7 @@ acceptance("Managing Group Tag Notification Defaults", function () {
     await visit("/g/discourse/manage/tags");
 
     assert.ok(
-      exists(".group-members tr"),
+      exists(".group-members .group-member"),
       "it should redirect to members page for an anonymous user"
     );
   });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/group-requests-test.js b/app/assets/javascripts/discourse/tests/acceptance/group-requests-test.js
index abbde3f6038..2a9441dfb11 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/group-requests-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/group-requests-test.js
@@ -89,37 +89,49 @@ acceptance("Group Requests", function (needs) {
   test("Group Requests", async function (assert) {
     await visit("/g/Macdonald/requests");
 
-    assert.strictEqual(count(".group-members tr"), 2);
+    assert.strictEqual(count(".group-members .group-member"), 2);
     assert.strictEqual(
-      query(".group-members tr:first-child td:nth-child(1)")
+      query(".group-members .directory-table__row:first-child .user-detail")
         .innerText.trim()
         .replace(/\s+/g, " "),
       "eviltrout Robin Ward"
     );
     assert.strictEqual(
-      query(".group-members tr:first-child td:nth-child(3)").innerText.trim(),
+      query(
+        ".group-members .directory-table__row:first-child .directory-table__cell:nth-child(3)"
+      ).innerText.trim(),
       "Please accept my membership request."
     );
     assert.strictEqual(
-      query(".group-members tr:first-child .btn-primary").innerText.trim(),
+      query(
+        ".group-members .directory-table__row:first-child .btn-primary"
+      ).innerText.trim(),
       "Accept"
     );
     assert.strictEqual(
-      query(".group-members tr:first-child .btn-danger").innerText.trim(),
+      query(
+        ".group-members .directory-table__row:first-child .btn-danger"
+      ).innerText.trim(),
       "Deny"
     );
 
-    await click(".group-members tr:first-child .btn-primary");
+    await click(
+      ".group-members .directory-table__row:first-child .btn-primary"
+    );
     assert.ok(
-      query(".group-members tr:first-child td:nth-child(4)")
+      query(
+        ".group-members .directory-table__row:first-child .directory-table__cell:nth-child(4)"
+      )
         .innerText.trim()
         .startsWith("accepted")
     );
     assert.deepEqual(requests, [["19", "true"]]);
 
-    await click(".group-members tr:last-child .btn-danger");
+    await click(".group-members .directory-table__row:last-child .btn-danger");
     assert.strictEqual(
-      query(".group-members tr:last-child td:nth-child(4)").innerText.trim(),
+      query(
+        ".group-members .directory-table__row:last-child .directory-table__cell:nth-child(4)"
+      ).innerText.trim(),
       "denied"
     );
     assert.deepEqual(requests, [
diff --git a/app/assets/javascripts/discourse/tests/acceptance/group-test.js b/app/assets/javascripts/discourse/tests/acceptance/group-test.js
index 445e4033503..be4a0cbef41 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/group-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/group-test.js
@@ -10,7 +10,7 @@ import selectKit from "discourse/tests/helpers/select-kit-helper";
 import { test } from "qunit";
 
 function setupGroupPretender(server, helper) {
-  server.post("/groups/Macdonald/request_membership", () => {
+  server.post("/groups/Macdonald/request_membership.json", () => {
     return helper.response({
       relative_url: "/t/internationalization-localization/280",
     });
@@ -275,7 +275,7 @@ acceptance("Group - Authenticated", function (needs) {
     await click(".group-details-button button.btn-danger");
 
     assert.strictEqual(
-      query(".dialog-body").textContent.trim(),
+      query(".dialog-body p:nth-of-type(2)").textContent.trim(),
       I18n.t("admin.groups.delete_with_messages_confirm", {
         count: 2,
       }),
diff --git a/app/assets/javascripts/discourse/tests/acceptance/hamburger-menu-test.js b/app/assets/javascripts/discourse/tests/acceptance/hamburger-menu-test.js
index 76ba93d5a93..d6ff32033e6 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/hamburger-menu-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/hamburger-menu-test.js
@@ -11,14 +11,11 @@ acceptance(
   "Opening the hamburger menu with some reviewables",
   function (needs) {
     needs.user();
-    needs.pretender((server, helper) => {
-      server.get("/review/count.json", () => helper.response({ count: 3 }));
-    });
     needs.settings({
       navigation_menu: "legacy",
     });
     test("As a staff member", async function (assert) {
-      updateCurrentUser({ moderator: true, admin: false });
+      updateCurrentUser({ moderator: true, admin: false, reviewable_count: 3 });
 
       await visit("/");
       await click(".hamburger-dropdown");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/hashtag-autocomplete-test.js b/app/assets/javascripts/discourse/tests/acceptance/hashtag-autocomplete-test.js
index 2849bd73a00..f6051259273 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/hashtag-autocomplete-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/hashtag-autocomplete-test.js
@@ -1,28 +1,10 @@
-import { setCaretPosition } from "discourse/lib/utilities";
-import { acceptance, query } from "discourse/tests/helpers/qunit-helpers";
 import {
-  click,
-  fillIn,
-  settled,
-  triggerKeyEvent,
-  visit,
-} from "@ember/test-helpers";
+  acceptance,
+  emulateAutocomplete,
+} from "discourse/tests/helpers/qunit-helpers";
+import { click, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 
-async function typeHashtagAutocomplete() {
-  const composerInput = query(".d-editor-input");
-  await fillIn(".d-editor-input", "abc #");
-  await triggerKeyEvent(".d-editor-input", "keydown", "#");
-  await fillIn(".d-editor-input", "abc #");
-  await setCaretPosition(composerInput, 5);
-  await triggerKeyEvent(".d-editor-input", "keyup", "#");
-  await triggerKeyEvent(".d-editor-input", "keydown", "O");
-  await fillIn(".d-editor-input", "abc #o");
-  await setCaretPosition(composerInput, 6);
-  await triggerKeyEvent(".d-editor-input", "keyup", "O");
-  await settled();
-}
-
 acceptance("#hashtag autocompletion in composer", function (needs) {
   needs.user();
   needs.settings({
@@ -71,7 +53,9 @@ acceptance("#hashtag autocompletion in composer", function (needs) {
   test(":emoji: unescape in autocomplete search results", async function (assert) {
     await visit("/t/internationalization-localization/280");
     await click("#topic-footer-buttons .btn.create");
-    await typeHashtagAutocomplete();
+
+    await emulateAutocomplete(".d-editor-input", "abc #o");
+
     assert.dom(".hashtag-autocomplete__option").exists({ count: 3 });
     assert
       .dom(
diff --git a/app/assets/javascripts/discourse/tests/acceptance/history-test.js b/app/assets/javascripts/discourse/tests/acceptance/history-test.js
new file mode 100644
index 00000000000..420c8254b1b
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/acceptance/history-test.js
@@ -0,0 +1,103 @@
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { test } from "qunit";
+import { click, visit } from "@ember/test-helpers";
+
+const revisionResponse = {
+  created_at: "2021-11-24T10:59:36.163Z",
+  post_id: 419,
+  previous_hidden: false,
+  current_hidden: false,
+  first_revision: 1,
+  previous_revision: 1,
+  current_revision: 2,
+  next_revision: null,
+  last_revision: 2,
+  current_version: 2,
+  version_count: 2,
+  username: "bianca",
+  display_username: "bianca",
+  avatar_template: "/letter_avatar_proxy/v4/letter/b/3be4f8/{size}.png",
+  edit_reason: null,
+  body_changes: {
+    inline: '<div class="inline-diff"><p>Welcome to Discourse!</p</div>',
+    side_by_side:
+      '<div class="revision-content"><p>Welcome to Discourse!</p</div><div class="revision-content"><p>Welcome to Discourse!</p</div>',
+    side_by_side_markdown:
+      '<table class="markdown"><tr><td>Welcome to Discourse!</td><td>Welcome to Discourse!</td></tr></table>',
+  },
+  title_changes: {
+    inline: '<div class="inline-diff"><div>Welcome to Discourse!</div></div>',
+    side_by_side:
+      '<div class="revision-content"><div>Welcome to Discourse!</div></div><div class="revision-content"><div>Welcome to Discourse!</div></div>',
+  },
+  user_changes: null,
+  tags_changes: {
+    previous: ["tag1", "tag2"],
+    current: ["tag2", "tag3"],
+  },
+  wiki: false,
+  can_edit: true,
+};
+
+acceptance("History Modal - authorized", function (needs) {
+  needs.user();
+  needs.pretender((server, helper) => {
+    server.get("/posts/419/revisions/latest.json", () => {
+      return helper.response(revisionResponse);
+    });
+
+    server.get("/posts/419/revisions/1.json", () => {
+      return helper.response({
+        ...revisionResponse,
+        current_revision: 1,
+        previous_revision: null,
+      });
+    });
+  });
+
+  test("edit post button", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+    await click("article[data-post-id='419'] .edits button");
+    assert
+      .dom(".history-modal #revision-footer-buttons .edit-post")
+      .exists("displays the edit post button on the latest revision");
+  });
+
+  test("edit post button - not last revision", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+    await click("article[data-post-id='419'] .edits button");
+    await click(".history-modal .previous-revision");
+    assert
+      .dom(".history-modal #revision-footer-buttons .edit-post")
+      .doesNotExist(
+        "hides the edit post button when not on the latest revision"
+      );
+  });
+
+  test("previous revision button", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+    await click("article[data-post-id='419'] .edits button");
+
+    await click(".history-modal .previous-revision");
+
+    assert.dom(".history-modal .previous-revision").isDisabled();
+  });
+});
+
+acceptance("History Modal - anonymous", function (needs) {
+  needs.pretender((server, helper) => {
+    server.get("/posts/419/revisions/latest.json", () => {
+      return helper.response({ ...revisionResponse, can_edit: false });
+    });
+  });
+
+  test("edit post button", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+    await click("article[data-post-id='419'] .edits button");
+    assert
+      .dom(".history-modal #revision-footer-buttons .edit-post")
+      .doesNotExist(
+        "it should not display edit button when user cannot edit the post"
+      );
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/implicit-injections-test.js b/app/assets/javascripts/discourse/tests/acceptance/implicit-injections-test.js
new file mode 100644
index 00000000000..be8c474aa69
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/acceptance/implicit-injections-test.js
@@ -0,0 +1,56 @@
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { test } from "qunit";
+import RestModel from "discourse/models/rest";
+import Service, { inject as service } from "@ember/service";
+import { getOwner, setOwner } from "@ember/application";
+
+acceptance("Implicit injections shims", function () {
+  test("it provides legacy injections on common models", function (assert) {
+    const serviceInstance = Service.create();
+    setOwner(serviceInstance, getOwner(this));
+
+    assert.strictEqual(
+      serviceInstance.session,
+      getOwner(this).lookup("service:session")
+    );
+  });
+
+  test("it allows overlaying explicit injections", function (assert) {
+    class MyService extends Service {
+      @service session;
+    }
+    const serviceInstance = MyService.create();
+    setOwner(serviceInstance, getOwner(this));
+
+    assert.strictEqual(
+      serviceInstance.session,
+      getOwner(this).lookup("service:session")
+    );
+  });
+
+  test("it allows overriding values by assignment", function (assert) {
+    const serviceInstance = Service.create({ session: "an override" });
+    setOwner(serviceInstance, getOwner(this));
+
+    assert.strictEqual(serviceInstance.session, "an override");
+  });
+
+  test("passes through assigned values when creating from another object", async function (assert) {
+    const initialModel = RestModel.create({
+      appEvents: "overridden app events",
+    });
+
+    assert.strictEqual(
+      initialModel.appEvents,
+      "overridden app events",
+      "overridden app events are set correctly"
+    );
+
+    const newModel = RestModel.create(initialModel);
+    assert.strictEqual(
+      newModel.appEvents,
+      "overridden app events",
+      "overridden app events are passed though when creating from another objects"
+    );
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/invite-accept-test.js b/app/assets/javascripts/discourse/tests/acceptance/invite-accept-test.js
index 48272b7fc92..fef727d7fe3 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/invite-accept-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/invite-accept-test.js
@@ -97,6 +97,17 @@ acceptance("Invite accept", function (needs) {
     });
 
     await visit("/invites/my-valid-invite-token");
+
+    assert.notOk(
+      document.body.classList.contains("has-sidebar-page"),
+      "does not display the sidebar on the invites page"
+    );
+
+    assert.notOk(
+      exists(".d-header"),
+      "does not display the site header on the invites page"
+    );
+
     assert.ok(exists("#new-account-email"), "shows the email input");
     assert.ok(exists("#new-account-username"), "shows the username input");
     assert.strictEqual(
diff --git a/app/assets/javascripts/discourse/tests/acceptance/keyboard-shortcuts-test.js b/app/assets/javascripts/discourse/tests/acceptance/keyboard-shortcuts-test.js
index 81715d16fae..688fc286bd7 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/keyboard-shortcuts-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/keyboard-shortcuts-test.js
@@ -69,6 +69,31 @@ acceptance("Keyboard Shortcuts - Anonymous Users", function (needs) {
       "pressing k moves selection to previous post"
     );
   });
+
+  test("j/k navigation skips hidden elements", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+
+    document.querySelector("#qunit-fixture").innerHTML = `
+      <style>
+        #post_2, #post_3 { display: none; }
+      </style>
+    `;
+
+    await triggerKeyEvent(document, "keypress", "J");
+    assert
+      .dom(".post-stream .topic-post.selected #post_1")
+      .exists("first post is selected");
+
+    await triggerKeyEvent(document, "keypress", "J");
+    assert
+      .dom(".post-stream .topic-post.selected #post_4")
+      .exists("pressing j moves selection to next visible post");
+
+    await triggerKeyEvent(document, "keypress", "K");
+    assert
+      .dom(".post-stream .topic-post.selected #post_1")
+      .exists("pressing k moves selection to previous visible post");
+  });
 });
 
 acceptance("Keyboard Shortcuts - Authenticated Users", function (needs) {
@@ -219,4 +244,36 @@ acceptance("Keyboard Shortcuts - Authenticated Users", function (needs) {
 
     assert.strictEqual(resetNewCalled, 1);
   });
+
+  test("share shortcuts", async function (assert) {
+    await visit("/t/this-is-a-test-topic/9");
+    await triggerKeyEvent(document, "keypress", "J");
+    assert.ok(
+      exists(".post-stream .topic-post.selected #post_1"),
+      "first post is selected"
+    );
+
+    await triggerKeyEvent(document, "keypress", "J");
+    assert.ok(
+      exists(".post-stream .topic-post.selected #post_2"),
+      "pressing j moves selection to next post"
+    );
+
+    await triggerKeyEvent(document, "keypress", "S");
+    assert
+      .dom(".d-modal.share-topic-modal")
+      .exists("post-specific share modal is open");
+    assert
+      .dom("#discourse-modal-title")
+      .hasText(I18n.t("post.share.title", { post_number: 2 }));
+    await click(".modal-close");
+
+    await triggerKeyEvent(document, "keydown", "S", { shiftKey: true });
+    assert
+      .dom(".d-modal.share-topic-modal")
+      .exists("topic level share modal is open");
+    assert.dom("#discourse-modal-title").hasText(I18n.t("topic.share.title"));
+
+    await click(".modal-close");
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/last-visited-topic-focus-test.js b/app/assets/javascripts/discourse/tests/acceptance/last-visited-topic-focus-test.js
deleted file mode 100644
index b2456c72da1..00000000000
--- a/app/assets/javascripts/discourse/tests/acceptance/last-visited-topic-focus-test.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import { acceptance, query } from "discourse/tests/helpers/qunit-helpers";
-import { test } from "qunit";
-import { visit } from "@ember/test-helpers";
-import { cloneJSON } from "discourse-common/lib/object";
-import topicFixtures from "discourse/tests/fixtures/topic";
-
-acceptance("Last Visited Topic Focus", function (needs) {
-  needs.pretender((server, helper) => {
-    const fixture = cloneJSON(topicFixtures["/t/54077.json"]);
-    fixture.id = 11996;
-    fixture.slug =
-      "its-really-hard-to-navigate-the-create-topic-reply-pane-with-the-keyboard";
-    server.get("/t/11996.json", () => helper.response(fixture));
-  });
-  test("last visited topic receives focus when you return back to the topic list", async function (assert) {
-    await visit("/");
-    await visit(
-      "/t/its-really-hard-to-navigate-the-create-topic-reply-pane-with-the-keyboard/11996"
-    );
-    await visit("/");
-    const visitedTopicTitle = query(
-      '.topic-list-body tr[data-topic-id="11996"] .main-link'
-    );
-    assert.ok(visitedTopicTitle.classList.contains("focused"));
-  });
-});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/loading-indicator-test.js b/app/assets/javascripts/discourse/tests/acceptance/loading-indicator-test.js
new file mode 100644
index 00000000000..fa2ad0314f4
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/acceptance/loading-indicator-test.js
@@ -0,0 +1,99 @@
+import {
+  currentRouteName,
+  getSettledState,
+  settled,
+  visit,
+  waitUntil,
+} from "@ember/test-helpers";
+import { acceptance, query } from "discourse/tests/helpers/qunit-helpers";
+import { test } from "qunit";
+import pretender from "discourse/tests/helpers/create-pretender";
+import AboutFixtures from "discourse/tests/fixtures/about";
+
+// Like settled(), but ignores timers, transitions and network requests
+function isMostlySettled() {
+  let { hasRunLoop, hasPendingWaiters, isRenderPending } = getSettledState();
+
+  if (hasRunLoop || hasPendingWaiters || isRenderPending) {
+    return false;
+  } else {
+    return true;
+  }
+}
+
+function mostlySettled() {
+  return waitUntil(isMostlySettled);
+}
+
+acceptance("Page Loading Indicator", function (needs) {
+  let pendingRequest;
+  let resolvePendingRequest;
+
+  needs.pretender((server, helper) => {
+    pendingRequest = new Promise(
+      (resolve) => (resolvePendingRequest = resolve)
+    );
+
+    pretender.get(
+      "/about.json",
+      (request) => {
+        resolvePendingRequest(request);
+        return helper.response(AboutFixtures["about.json"]);
+      },
+      true // Require manual resolution
+    );
+  });
+
+  test("it works in 'spinner' mode", async function (assert) {
+    this.siteSettings.page_loading_indicator = "spinner";
+
+    await visit("/");
+    visit("/about");
+
+    const aboutRequest = await pendingRequest;
+    await mostlySettled();
+
+    assert.strictEqual(currentRouteName(), "about_loading");
+    assert.dom("#main-outlet > div.spinner").exists();
+    assert.dom(".loading-indicator-container").doesNotExist();
+
+    pretender.resolve(aboutRequest);
+    await settled();
+
+    assert.strictEqual(currentRouteName(), "about");
+    assert.dom("#main-outlet > div.spinner").doesNotExist();
+    assert.dom("#main-outlet section.about").exists();
+  });
+
+  test("it works in 'slider' mode", async function (assert) {
+    this.siteSettings.page_loading_indicator = "slider";
+
+    await visit("/");
+
+    assert.dom(".loading-indicator-container").exists();
+    assert.dom(".loading-indicator-container").hasClass("ready");
+
+    visit("/about");
+
+    const aboutRequest = await pendingRequest;
+    await mostlySettled();
+
+    assert.strictEqual(currentRouteName(), "discovery.latest");
+    assert.dom("#main-outlet > div.spinner").doesNotExist();
+
+    await waitUntil(() =>
+      query(".loading-indicator-container").classList.contains("loading")
+    );
+
+    pretender.resolve(aboutRequest);
+
+    await waitUntil(() =>
+      query(".loading-indicator-container").classList.contains("done")
+    );
+
+    await settled();
+
+    assert.strictEqual(currentRouteName(), "about");
+    assert.dom("#main-outlet section.about").exists();
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/login-with-email-test.js b/app/assets/javascripts/discourse/tests/acceptance/login-with-email-test.js
index 15f83901d26..540bbbb47b8 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/login-with-email-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/login-with-email-test.js
@@ -56,7 +56,7 @@ acceptance("Login with email", function (needs) {
     await click("#email-login-link");
 
     assert.strictEqual(
-      query(".alert-error").innerHTML,
+      query(".alert-error").innerHTML.trim(),
       I18n.t("email_login.complete_username_not_found", {
         username: "someuser",
       }),
@@ -67,7 +67,7 @@ acceptance("Login with email", function (needs) {
     await click("#email-login-link");
 
     assert.strictEqual(
-      query(".alert-error").innerHTML,
+      query(".alert-error").innerHTML.trim(),
       I18n.t("email_login.complete_email_not_found", {
         email: "someuser@gmail.com",
       }),
diff --git a/app/assets/javascripts/discourse/tests/acceptance/opengraph-tag-updater-test.js b/app/assets/javascripts/discourse/tests/acceptance/meta-tag-updater-test.js
similarity index 63%
rename from app/assets/javascripts/discourse/tests/acceptance/opengraph-tag-updater-test.js
rename to app/assets/javascripts/discourse/tests/acceptance/meta-tag-updater-test.js
index fdf713c7bcd..485f3e2dccb 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/opengraph-tag-updater-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/meta-tag-updater-test.js
@@ -2,15 +2,19 @@ import { click, visit } from "@ember/test-helpers";
 import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { test } from "qunit";
 
-acceptance("Opengraph Tag Updater", function (needs) {
+acceptance("Meta Tag Updater", function (needs) {
   needs.pretender((server, helper) => {
     server.get("/about", () => {
       return helper.response({});
     });
   });
+  needs.site({});
 
   test("updates OG title and URL", async function (assert) {
     await visit("/");
+    await click(
+      ".sidebar-section[data-section-name='community'] .sidebar-more-section-links-details-summary"
+    );
     await click("a[href='/about']");
 
     assert.strictEqual(
@@ -29,17 +33,24 @@ acceptance("Opengraph Tag Updater", function (needs) {
     );
     assert.strictEqual(
       document
-        .querySelector("meta[property='twitter:title']")
+        .querySelector("meta[name='twitter:title']")
         .getAttribute("content"),
       document.title,
-      "it should update OG title"
+      "it should update Twitter title"
     );
     assert.ok(
       document
-        .querySelector("meta[property='twitter:url']")
+        .querySelector("meta[name='twitter:url']")
         .getAttribute("content")
         .endsWith("/about"),
-      "it should update OG URL"
+      "it should update Twitter URL"
+    );
+    assert.ok(
+      document
+        .querySelector("link[rel='canonical']")
+        .getAttribute("href")
+        .endsWith("/about"),
+      "it should update the canonical URL"
     );
   });
 });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/mobile-pan-test.js b/app/assets/javascripts/discourse/tests/acceptance/mobile-pan-test.js
index 6fc8ea63c20..7b0b70539fb 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/mobile-pan-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/mobile-pan-test.js
@@ -7,6 +7,10 @@ import {
 import { click, triggerEvent, visit } from "@ember/test-helpers";
 
 async function triggerSwipeStart(touchTarget) {
+  const emberTesting = document.querySelector("#ember-testing-container");
+  emberTesting.scrollTop = 0;
+  emberTesting.scrollLeft = 0;
+
   // Other tests are shown in a transformed viewport, and this is a multiple for the offsets
   let scale = parseFloat(
     window
diff --git a/app/assets/javascripts/discourse/tests/acceptance/mobile-topic-bulk-actions-test.js b/app/assets/javascripts/discourse/tests/acceptance/mobile-topic-bulk-actions-test.js
index 82cb0a21189..9ede67febe1 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/mobile-topic-bulk-actions-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/mobile-topic-bulk-actions-test.js
@@ -1,6 +1,5 @@
 import {
   acceptance,
-  invisible,
   query,
   queryAll,
   updateCurrentUser,
@@ -23,7 +22,7 @@ acceptance("Topic - Bulk Actions - Mobile", function (needs) {
   });
 
   test("bulk select - modal", async function (assert) {
-    updateCurrentUser({ moderator: true, enable_defer: true });
+    updateCurrentUser({ moderator: true, user_option: { enable_defer: true } });
     await visit("/latest");
     await click("button.bulk-select");
 
@@ -124,9 +123,8 @@ acceptance("Topic - Bulk Actions - Mobile", function (needs) {
     await click(".bulk-select-actions");
     await click(".modal-body .delete-topics");
 
-    assert.ok(
-      invisible(".topic-bulk-actions-modal"),
-      "it closes the bulk select modal"
-    );
+    assert
+      .dom(".topic-bulk-actions-modal")
+      .doesNotExist("it closes the bulk select modal");
   });
 });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/mobile-users-test.js b/app/assets/javascripts/discourse/tests/acceptance/mobile-users-test.js
index 9913b12f4e2..4f46e025547 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/mobile-users-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/mobile-users-test.js
@@ -7,6 +7,9 @@ acceptance("User Directory - Mobile", function (needs) {
 
   test("Visit Page", async function (assert) {
     await visit("/u");
-    assert.ok(exists(".directory .user"), "has a list of users");
+    assert.ok(
+      exists(".directory .directory-table__row"),
+      "has a list of users"
+    );
   });
 });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/modal-test.js b/app/assets/javascripts/discourse/tests/acceptance/modal-legacy-test.js
similarity index 74%
rename from app/assets/javascripts/discourse/tests/acceptance/modal-test.js
rename to app/assets/javascripts/discourse/tests/acceptance/modal-legacy-test.js
index 91fc61547b1..492dc97f171 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/modal-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/modal-legacy-test.js
@@ -11,8 +11,17 @@ import { hbs } from "ember-cli-htmlbars";
 import showModal from "discourse/lib/show-modal";
 import { registerTemporaryModule } from "../helpers/temporary-module-helper";
 import { getOwner } from "discourse-common/lib/get-owner";
+import { withSilencedDeprecations } from "discourse-common/lib/deprecated";
+import Component from "@glimmer/component";
+import { setComponentTemplate } from "@glimmer/manager";
 
-acceptance("Modal", function (needs) {
+function silencedShowModal() {
+  return withSilencedDeprecations("discourse.modal-controllers", () =>
+    showModal(...arguments)
+  );
+}
+
+acceptance("Legacy Modal", function (needs) {
   let _translations;
   needs.hooks.beforeEach(() => {
     _translations = I18n.translations;
@@ -38,15 +47,15 @@ acceptance("Modal", function (needs) {
     await click(".login-button");
     assert.strictEqual(count(".d-modal:visible"), 1, "modal should appear");
 
-    const controller = getOwner(this).lookup("controller:modal");
-    assert.strictEqual(controller.name, "login");
+    const service = getOwner(this).lookup("service:modal");
+    assert.strictEqual(service.name, "login");
 
     await click(".modal-outer-container");
     assert.ok(
       !exists(".d-modal:visible"),
       "modal should disappear when you click outside"
     );
-    assert.strictEqual(controller.name, null);
+    assert.strictEqual(service.name, null);
 
     await click(".login-button");
     assert.strictEqual(count(".d-modal:visible"), 1, "modal should reappear");
@@ -59,7 +68,7 @@ acceptance("Modal", function (needs) {
       hbs`{{#d-modal-body title="" class="" dismissable=false}}test{{/d-modal-body}}`
     );
 
-    showModal("not-dismissable", {});
+    silencedShowModal("not-dismissable", {});
     await settled();
 
     assert.strictEqual(count(".d-modal:visible"), 1, "modal should appear");
@@ -89,7 +98,7 @@ acceptance("Modal", function (needs) {
     ];
 
     await visit("/");
-    showModal("test-raw-title-panels", { panels });
+    silencedShowModal("test-raw-title-panels", { panels });
     await settled();
 
     assert.strictEqual(
@@ -108,7 +117,7 @@ acceptance("Modal", function (needs) {
 
     await visit("/");
 
-    showModal("test-title", { title: "test_title" });
+    silencedShowModal("test-title", { title: "test_title" });
     await settled();
     assert.strictEqual(
       query(".d-modal .title").innerText.trim(),
@@ -118,7 +127,7 @@ acceptance("Modal", function (needs) {
 
     await click(".d-modal .close");
 
-    showModal("test-title-with-body", { title: "test_title" });
+    silencedShowModal("test-title-with-body", { title: "test_title" });
     await settled();
     assert.strictEqual(
       query(".d-modal .title").innerText.trim(),
@@ -128,13 +137,39 @@ acceptance("Modal", function (needs) {
 
     await click(".d-modal .close");
 
-    showModal("test-title");
+    silencedShowModal("test-title");
     await settled();
     assert.ok(
       !exists(".d-modal .title"),
       "it should not re-use the previous title"
     );
   });
+
+  test("opening legacy modal while modern modal is open", async function (assert) {
+    registerTemporaryModule(
+      "discourse/templates/modal/legacy-modal",
+      hbs`<DModalBody @rawTitle="legacy modal title" />`
+    );
+
+    class ModernModal extends Component {}
+    setComponentTemplate(
+      hbs`<DModal @title="modern modal title" />`,
+      ModernModal
+    );
+
+    await visit("/");
+
+    const modalService = getOwner(this).lookup("service:modal");
+
+    modalService.show(ModernModal);
+    await settled();
+    assert.dom(".d-modal .title").hasText("modern modal title");
+
+    silencedShowModal("legacy-modal");
+    await settled();
+
+    assert.dom(".d-modal .title").hasText("legacy modal title");
+  });
 });
 
 acceptance("Modal Keyboard Events", function (needs) {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/modal-service-test.js b/app/assets/javascripts/discourse/tests/acceptance/modal-service-test.js
new file mode 100644
index 00000000000..4390cc9b246
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/acceptance/modal-service-test.js
@@ -0,0 +1,152 @@
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { click, settled, triggerKeyEvent, visit } from "@ember/test-helpers";
+import { test } from "qunit";
+import { hbs } from "ember-cli-htmlbars";
+import { getOwner } from "@ember/application";
+import Component from "@glimmer/component";
+import { setComponentTemplate } from "@glimmer/manager";
+import {
+  CLOSE_INITIATED_BY_BUTTON,
+  CLOSE_INITIATED_BY_CLICK_OUTSIDE,
+  CLOSE_INITIATED_BY_ESC,
+  CLOSE_INITIATED_BY_MODAL_SHOW,
+} from "discourse/components/d-modal";
+import { action } from "@ember/object";
+
+class MyModalClass extends Component {
+  @action
+  closeWithCustomData() {
+    this.args.closeModal({ hello: "world" });
+  }
+}
+setComponentTemplate(
+  hbs`
+    <DModal
+      @closeModal={{@closeModal}}
+      @title="Hello World"
+    >
+      Modal content is {{@model.text}}
+      <button class='custom-data' {{on "click" this.closeWithCustomData}}></button>
+    </DModal>
+  `,
+  MyModalClass
+);
+
+acceptance("Modal service: component-based API", function () {
+  test("displays correctly", async function (assert) {
+    await visit("/");
+
+    assert.dom(".d-modal").doesNotExist("there is no modal at first");
+
+    const modalService = getOwner(this).lookup("service:modal");
+
+    let promise = modalService.show(MyModalClass, {
+      model: { text: "working" },
+    });
+    await settled();
+    assert.dom(".d-modal").exists("modal should appear");
+
+    assert.dom(".d-modal .title h3").hasText("Hello World");
+    assert.dom(".d-modal .modal-body").hasText("Modal content is working");
+
+    await click(".modal-outer-container");
+    assert.dom(".d-modal").doesNotExist("disappears on click outside");
+    assert.deepEqual(
+      await promise,
+      { initiatedBy: CLOSE_INITIATED_BY_CLICK_OUTSIDE },
+      "promise resolves with correct initiator"
+    );
+
+    promise = modalService.show(MyModalClass, { model: { text: "working" } });
+    await settled();
+    assert.dom(".d-modal").exists("modal reappears");
+
+    await triggerKeyEvent("#main-outlet", "keydown", "Escape");
+    assert.dom(".d-modal").doesNotExist("disappears on escape");
+    assert.deepEqual(
+      await promise,
+      { initiatedBy: CLOSE_INITIATED_BY_ESC },
+      "promise resolves with correct initiator"
+    );
+
+    promise = modalService.show(MyModalClass, { model: { text: "working" } });
+    await settled();
+    assert.dom(".d-modal").exists("modal reappears");
+
+    await click(".d-modal .modal-close");
+    assert.dom(".d-modal").doesNotExist("disappears when close button clicked");
+    assert.deepEqual(
+      await promise,
+      { initiatedBy: CLOSE_INITIATED_BY_BUTTON },
+      "promise resolves with correct initiator"
+    );
+
+    promise = modalService.show(MyModalClass, { model: { text: "working" } });
+    await settled();
+    assert.dom(".d-modal").exists("modal reappears");
+
+    await click(".d-modal .modal-close");
+    assert.dom(".d-modal").doesNotExist("disappears when close button clicked");
+    assert.deepEqual(
+      await promise,
+      { initiatedBy: CLOSE_INITIATED_BY_BUTTON },
+      "promise resolves with correct initiator"
+    );
+
+    promise = modalService.show(MyModalClass, { model: { text: "first" } });
+    await settled();
+    assert.dom(".d-modal").exists("modal reappears");
+
+    modalService.show(MyModalClass, { model: { text: "second" } });
+    await settled();
+    assert
+      .dom(".d-modal .modal-body")
+      .hasText("Modal content is second", "new modal replaces old");
+    assert.deepEqual(
+      await promise,
+      { initiatedBy: CLOSE_INITIATED_BY_MODAL_SHOW },
+      "first modal promise resolves with correct initiator"
+    );
+  });
+
+  test("lifecycle hooks and arguments", async function (assert) {
+    await visit("/");
+
+    const events = [];
+
+    class ModalWithLifecycleHooks extends MyModalClass {
+      constructor() {
+        super(...arguments);
+        events.push(`constructor: ${this.args.model?.data}`);
+      }
+
+      willDestroy() {
+        events.push(`willDestroy: ${this.args.model?.data}`);
+      }
+    }
+
+    const modalService = getOwner(this).lookup("service:modal");
+
+    modalService.show(ModalWithLifecycleHooks, {
+      model: { data: "argumentValue" },
+    });
+    await settled();
+
+    assert.deepEqual(
+      events,
+      ["constructor: argumentValue"],
+      "constructor called with args available"
+    );
+
+    modalService.close();
+    await settled();
+
+    assert.deepEqual(
+      events,
+      ["constructor: argumentValue", "willDestroy: argumentValue"],
+      "constructor called with args available"
+    );
+  });
+
+  // (See also, `tests/integration/component/d-modal-test.js`)
+});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/new-topic-test.js b/app/assets/javascripts/discourse/tests/acceptance/new-topic-test.js
index 18daaab0a5a..671e33dacf1 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/new-topic-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/new-topic-test.js
@@ -1,11 +1,7 @@
-import {
-  acceptance,
-  exists,
-  query,
-} from "discourse/tests/helpers/qunit-helpers";
+import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
 import { test } from "qunit";
-import { visit } from "@ember/test-helpers";
+import { currentURL, visit, waitFor } from "@ember/test-helpers";
 
 acceptance("New Topic - Anonymous", function () {
   test("accessing new-topic route when logged out", async function (assert) {
@@ -17,26 +13,48 @@ acceptance("New Topic - Anonymous", function () {
 
 acceptance("New Topic - Authenticated", function (needs) {
   needs.user();
-  test("accessing new-topic route when logged in", async function (assert) {
+
+  test("accessing new-topic route", async function (assert) {
+    await visit("/c/1");
+
+    try {
+      await visit("/new-topic");
+    } catch (error) {
+      assert.strictEqual(
+        error.message,
+        "TransitionAborted",
+        "it aborts the transition"
+      );
+    }
+
+    assert.strictEqual(currentURL(), "/c/1");
+
+    await waitFor(".composer-fields", { timeout: 5000 });
+
+    assert.dom(".composer-fields").exists("it opens the composer");
+  });
+
+  test("accessing new-topic route with title, body and category param", async function (assert) {
     await visit(
       "/new-topic?title=topic%20title&body=topic%20body&category=bug"
     );
 
     assert.ok(exists(".composer-fields"), "it opens composer");
-    assert.strictEqual(
-      query("#reply-title").value.trim(),
-      "topic title",
-      "it pre-fills topic title"
-    );
-    assert.strictEqual(
-      query(".d-editor-input").value.trim(),
-      "topic body",
-      "it pre-fills topic body"
-    );
+
+    assert
+      .dom("#reply-title")
+      .hasValue("topic title", "it pre-fills the topic title");
+
+    assert
+      .dom(".d-editor-input")
+      .hasValue("topic body", "it pre-fills topic body");
+
     assert.strictEqual(
       selectKit(".category-chooser").header().value(),
       "1",
       "it selects desired category"
     );
+
+    assert.strictEqual(currentURL(), "/c/1");
   });
 });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/new-topics-test.js b/app/assets/javascripts/discourse/tests/acceptance/new-topics-test.js
new file mode 100644
index 00000000000..bba685b047b
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/acceptance/new-topics-test.js
@@ -0,0 +1,31 @@
+import I18n from "I18n";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { test } from "qunit";
+import { visit } from "@ember/test-helpers";
+
+acceptance("New Topics - New new view enabled", function (needs) {
+  needs.user({
+    new_new_view_enabled: true,
+  });
+
+  needs.pretender((server, helper) => {
+    server.get("/new.json", () => {
+      return helper.response({
+        topic_list: { can_create_topic: true, topics: [] },
+      });
+    });
+  });
+
+  test("visiting new page when there are no new topics", async function (assert) {
+    await visit("/new");
+
+    const text = new DOMParser().parseFromString(
+      I18n.t("topics.none.educate.new_new", {
+        userPrefsUrl: "/u/eviltrout/preferences/tracking",
+      }),
+      "text/html"
+    ).documentElement.textContent;
+
+    assert.dom(".topic-list-bottom .education").hasText(text);
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/notifications-test.js b/app/assets/javascripts/discourse/tests/acceptance/notifications-test.js
index 842986f4fd5..507a6bb2093 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/notifications-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/notifications-test.js
@@ -1,196 +1,12 @@
-import { click, visit } from "@ember/test-helpers";
+import { visit } from "@ember/test-helpers";
 import {
   acceptance,
-  count,
   exists,
   publishToMessageBus,
-  query,
-  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
 import { test } from "qunit";
 import User from "discourse/models/user";
 
-acceptance("User Notifications", function (needs) {
-  needs.user();
-
-  test("Update works correctly", async function (assert) {
-    await visit("/");
-    await click("li.current-user");
-
-    // set older notifications to read
-
-    await publishToMessageBus("/notification/19", {
-      unread_notifications: 5,
-      unread_private_messages: 0,
-      unread_high_priority_notifications: 0,
-      read_first_notification: false,
-      last_notification: {},
-      recent: [
-        [123, false],
-        [456, false],
-        [789, true],
-        [1234, true],
-        [5678, true],
-      ],
-      seen_notification_id: null,
-    });
-
-    assert.strictEqual(count("#quick-access-notifications li"), 6);
-
-    // high priority, unread notification - should be first
-
-    await publishToMessageBus("/notification/19", {
-      unread_notifications: 6,
-      unread_private_messages: 0,
-      unread_high_priority_notifications: 1,
-      read_first_notification: false,
-      last_notification: {
-        notification: {
-          id: 42,
-          user_id: 1,
-          notification_type: 5,
-          read: false,
-          high_priority: true,
-          created_at: "2021-01-01 12:00:00 UTC",
-          post_number: 1,
-          topic_id: 42,
-          fancy_title: "First notification",
-          slug: "topic",
-          data: {
-            topic_title: "First notification",
-            original_post_id: 42,
-            original_post_type: 1,
-            original_username: "foo",
-            revision_number: null,
-            display_username: "foo",
-          },
-        },
-      },
-      recent: [
-        [42, false],
-        [123, false],
-        [456, false],
-        [789, true],
-        [1234, true],
-        [5678, true],
-      ],
-      seen_notification_id: null,
-    });
-
-    assert.strictEqual(count("#quick-access-notifications li"), 6);
-    assert.strictEqual(
-      query("#quick-access-notifications li span[data-topic-id]").innerText,
-      "First notification"
-    );
-
-    // high priority, read notification - should be second
-
-    await publishToMessageBus("/notification/19", {
-      unread_notifications: 7,
-      unread_private_messages: 0,
-      unread_high_priority_notifications: 1,
-      read_first_notification: false,
-      last_notification: {
-        notification: {
-          id: 43,
-          user_id: 1,
-          notification_type: 5,
-          read: true,
-          high_priority: false,
-          created_at: "2021-01-01 12:00:00 UTC",
-          post_number: 1,
-          topic_id: 42,
-          fancy_title: "Second notification",
-          slug: "topic",
-          data: {
-            topic_title: "Second notification",
-            original_post_id: 42,
-            original_post_type: 1,
-            original_username: "foo",
-            revision_number: null,
-            display_username: "foo",
-          },
-        },
-      },
-      recent: [
-        [42, false],
-        [43, true],
-        [123, false],
-        [456, false],
-        [789, true],
-        [1234, true],
-        [5678, true],
-      ],
-      seen_notification_id: null,
-    });
-
-    assert.strictEqual(count("#quick-access-notifications li"), 7);
-    assert.strictEqual(
-      queryAll("#quick-access-notifications li span[data-topic-id]")[1]
-        .innerText,
-      "Second notification"
-    );
-
-    // updates existing notifications
-
-    await publishToMessageBus("/notification/19", {
-      unread_notifications: 8,
-      unread_private_messages: 0,
-      unread_high_priority_notifications: 1,
-      read_first_notification: false,
-      last_notification: {
-        notification: {
-          id: 44,
-          user_id: 1,
-          notification_type: 5,
-          read: true,
-          high_priority: false,
-          created_at: "2021-01-01 12:00:00 UTC",
-          post_number: 1,
-          topic_id: 42,
-          fancy_title: "Third notification",
-          slug: "topic",
-          data: {
-            topic_title: "Third notification",
-            original_post_id: 42,
-            original_post_type: 1,
-            original_username: "foo",
-            revision_number: null,
-            display_username: "foo",
-          },
-        },
-      },
-      recent: [
-        [5678, false],
-        [1234, false],
-        [789, false],
-        [456, true],
-        [123, true],
-        [44, false],
-        [43, false],
-        [42, true],
-      ],
-      seen_notification_id: null,
-    });
-
-    assert.strictEqual(count("#quick-access-notifications li"), 8);
-    const texts = [];
-    [...queryAll("#quick-access-notifications li")].forEach((element) => {
-      texts.push(element.innerText.trim());
-    });
-    assert.deepEqual(texts, [
-      "foo First notification",
-      "foo Third notification",
-      "foo Second notification",
-      "velesin some title",
-      "aquaman liked 5 of your posts",
-      "5 messages in your test inbox",
-      "test1 accepted your invitation",
-      "Membership accepted in 'test'",
-    ]);
-  });
-});
-
 acceptance("Category Notifications", function (needs) {
   needs.user({ muted_category_ids: [1], indirectly_muted_category_ids: [2] });
 
diff --git a/app/assets/javascripts/discourse/tests/acceptance/page-tracking-test.js b/app/assets/javascripts/discourse/tests/acceptance/page-tracking-test.js
new file mode 100644
index 00000000000..bcbfedaa28f
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/acceptance/page-tracking-test.js
@@ -0,0 +1,39 @@
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { click, visit } from "@ember/test-helpers";
+import { test } from "qunit";
+import pretender from "discourse/tests/helpers/create-pretender";
+
+acceptance("Page tracking", function () {
+  test("sets the discourse-track-view header correctly", async function (assert) {
+    const trackViewHeaderName = "Discourse-Track-View";
+    assert.strictEqual(
+      pretender.handledRequests.length,
+      0,
+      "no requests logged before app boot"
+    );
+
+    await visit("/");
+    assert.strictEqual(
+      pretender.handledRequests.length,
+      1,
+      "one request logged during app boot"
+    );
+    assert.strictEqual(
+      pretender.handledRequests[0].requestHeaders[trackViewHeaderName],
+      undefined,
+      "does not track view for ajax before a transition has taken place"
+    );
+
+    await click("#site-logo");
+    assert.strictEqual(
+      pretender.handledRequests.length,
+      2,
+      "second request logged during next transition"
+    );
+    assert.strictEqual(
+      pretender.handledRequests[1].requestHeaders[trackViewHeaderName],
+      "true",
+      "sends track-view header for subsequent requests"
+    );
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/personal-message-test.js b/app/assets/javascripts/discourse/tests/acceptance/personal-message-test.js
index 82867e72209..a5f9802fe2c 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/personal-message-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/personal-message-test.js
@@ -1,7 +1,18 @@
-import { acceptance, query } from "discourse/tests/helpers/qunit-helpers";
+import { click, currentURL, visit } from "@ember/test-helpers";
+import DiscourseURL from "discourse/lib/url";
+import {
+  acceptance,
+  publishToMessageBus,
+  query,
+} from "discourse/tests/helpers/qunit-helpers";
 import I18n from "I18n";
 import { test } from "qunit";
-import { visit } from "@ember/test-helpers";
+import sinon from "sinon";
+import {
+  getCachedTopicList,
+  setCachedTopicList,
+} from "discourse/lib/cached-topic-list";
+import { getOwner } from "discourse-common/lib/get-owner";
 
 acceptance("Personal Message", function (needs) {
   needs.user();
@@ -10,8 +21,68 @@ acceptance("Personal Message", function (needs) {
     await visit("/t/pm-for-testing/12");
 
     assert.strictEqual(
-      query("#suggested-topics .suggested-topics-title").innerText.trim(),
+      query("#suggested-topics-title").innerText.trim(),
       I18n.t("suggested_topics.pm_title")
     );
   });
+
+  test("redirects to inbox after topic is archived and clears topicList cache", async function (assert) {
+    const session = getOwner(this).lookup("service:session");
+    setCachedTopicList(session, {});
+
+    await visit("/t/pm-for-testing/12");
+    await click(".archive-topic");
+
+    assert.strictEqual(currentURL(), "/u/eviltrout/messages");
+    assert.notOk(getCachedTopicList(session), "topic list cached is cleared");
+  });
+});
+
+acceptance("Personal Message (regular user)", function (needs) {
+  needs.user({ admin: false, moderator: false });
+
+  needs.pretender((server) => {
+    server.get("/posts/15", () => [
+      403,
+      {},
+      {
+        errors: ["You are not permitted to view the requested resource."],
+        error_type: "invalid_access",
+      },
+    ]);
+  });
+
+  test("redirects to homepage after topic is deleted", async function (assert) {
+    sinon.stub(DiscourseURL, "redirectTo");
+
+    await visit("/t/pm-for-testing/12");
+
+    await click(".post-controls .show-more-actions");
+    await click(".post-controls .delete");
+    await publishToMessageBus("/topic/12", {
+      id: 15,
+      post_number: 1,
+      updated_at: "2017-01-27T03:53:58.394Z",
+      user_id: 8,
+      last_editor_id: 8,
+      type: "deleted",
+      version: 1,
+    });
+
+    assert.true(DiscourseURL.redirectTo.calledWith("/"));
+  });
+});
+
+acceptance("Personal Message - invite", function (needs) {
+  needs.user();
+
+  test("suggested messages", async function (assert) {
+    await visit("/t/pm-for-testing/12");
+    await click(".add-remove-participant-btn");
+    await click(".private-message-map .controls .add-participant-btn");
+
+    assert
+      .dom(".d-modal.share-and-invite .invite-user-control")
+      .exists("invite modal is displayed");
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-connector-class-test.js b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-connector-class-test.js
deleted file mode 100644
index f5186065f1b..00000000000
--- a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-connector-class-test.js
+++ /dev/null
@@ -1,102 +0,0 @@
-import {
-  acceptance,
-  count,
-  exists,
-  query,
-} from "discourse/tests/helpers/qunit-helpers";
-import { click, visit } from "@ember/test-helpers";
-import { action } from "@ember/object";
-import { extraConnectorClass } from "discourse/lib/plugin-connectors";
-import { hbs } from "ember-cli-htmlbars";
-import { test } from "qunit";
-import { registerTemporaryModule } from "discourse/tests/helpers/temporary-module-helper";
-
-const PREFIX = "discourse/plugins/some-plugin/templates/connectors";
-
-acceptance("Plugin Outlet - Connector Class", function (needs) {
-  needs.hooks.beforeEach(() => {
-    extraConnectorClass("user-profile-primary/hello", {
-      actions: {
-        sayHello() {
-          this.set("hello", `${this.hello || ""}hello!`);
-        },
-      },
-    });
-
-    extraConnectorClass("user-profile-primary/hi", {
-      setupComponent() {
-        this.appEvents.on("hi:sayHi", this, this.say);
-      },
-
-      teardownComponent() {
-        this.appEvents.off("hi:sayHi", this, this.say);
-      },
-
-      @action
-      say() {
-        this.set("hi", "hi!");
-      },
-
-      @action
-      sayHi() {
-        this.appEvents.trigger("hi:sayHi");
-      },
-    });
-
-    extraConnectorClass("user-profile-primary/dont-render", {
-      shouldRender(args) {
-        return args.model.get("username") !== "eviltrout";
-      },
-    });
-
-    registerTemporaryModule(
-      `${PREFIX}/user-profile-primary/hello`,
-      hbs`<span class='hello-username'>{{model.username}}</span>
-        <button class='say-hello' {{on "click" (action "sayHello")}}></button>
-        <button class='say-hello-using-this' {{on "click" this.sayHello}}></button>
-        <span class='hello-result'>{{hello}}</span>`
-    );
-    registerTemporaryModule(
-      `${PREFIX}/user-profile-primary/hi`,
-      hbs`<button class='say-hi' {{on "click" (action "sayHi")}}></button>
-        <span class='hi-result'>{{hi}}</span>`
-    );
-    registerTemporaryModule(
-      `${PREFIX}/user-profile-primary/dont-render`,
-      hbs`I'm not rendered!`
-    );
-  });
-
-  test("Renders a template into the outlet", async function (assert) {
-    await visit("/u/eviltrout");
-    assert.strictEqual(
-      count(".user-profile-primary-outlet.hello"),
-      1,
-      "it has class names"
-    );
-    assert.ok(
-      !exists(".user-profile-primary-outlet.dont-render"),
-      "doesn't render"
-    );
-
-    await click(".say-hello");
-    assert.strictEqual(
-      query(".hello-result").innerText,
-      "hello!",
-      "actions delegate properly"
-    );
-    await click(".say-hello-using-this");
-    assert.strictEqual(
-      query(".hello-result").innerText,
-      "hello!hello!",
-      "actions are made available on `this` and are bound correctly"
-    );
-
-    await click(".say-hi");
-    assert.strictEqual(
-      query(".hi-result").innerText,
-      "hi!",
-      "actions delegate properly"
-    );
-  });
-});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-parent-view-test.js b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-parent-view-test.js
new file mode 100644
index 00000000000..053db157d01
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-parent-view-test.js
@@ -0,0 +1,29 @@
+import { acceptance, query } from "discourse/tests/helpers/qunit-helpers";
+import { hbs } from "ember-cli-htmlbars";
+import { test } from "qunit";
+import { visit } from "@ember/test-helpers";
+import { withSilencedDeprecationsAsync } from "discourse-common/lib/deprecated";
+import { registerTemporaryModule } from "discourse/tests/helpers/temporary-module-helper";
+
+acceptance("Plugin Outlet - Deprecated parentView", function (needs) {
+  needs.hooks.beforeEach(function () {
+    registerTemporaryModule(
+      "discourse/templates/connectors/user-profile-primary/hello",
+      hbs`<span class='hello-username'>{{this.parentView.parentView.class}}</span>`
+    );
+  });
+
+  test("Can access parentview", async function (assert) {
+    await withSilencedDeprecationsAsync(
+      "discourse.plugin-outlet-parent-view",
+      async () => {
+        await visit("/u/eviltrout");
+        assert.strictEqual(
+          query(".hello-username").innerText,
+          "user-main",
+          "it renders a value from parentView.parentView"
+        );
+      }
+    );
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-single-template-test.js b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-single-template-test.js
index 5022ac3fe2c..a7b3fe8355e 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-single-template-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-single-template-test.js
@@ -15,7 +15,7 @@ acceptance("Plugin Outlet - Single Template", function (needs) {
   needs.hooks.beforeEach(() => {
     registerTemporaryModule(
       CONNECTOR_MODULE,
-      hbs`<span class='hello-username'>{{model.username}}</span>`
+      hbs`<span class='hello-username'>{{this.model.username}}</span>`
     );
   });
 
diff --git a/app/assets/javascripts/discourse/tests/acceptance/post-inline-mentions-test.js b/app/assets/javascripts/discourse/tests/acceptance/post-inline-mentions-test.js
index a6f7035d51e..fb854f4cee5 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/post-inline-mentions-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/post-inline-mentions-test.js
@@ -4,13 +4,35 @@ import {
   publishToMessageBus,
   query,
 } from "discourse/tests/helpers/qunit-helpers";
-import { visit } from "@ember/test-helpers";
+import { triggerEvent, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 import { cloneJSON } from "discourse-common/lib/object";
 import topicFixtures from "../fixtures/topic";
 import pretender, { response } from "discourse/tests/helpers/create-pretender";
 
-acceptance("Post inline mentions test", function (needs) {
+function topicWithoutUserStatus(topicId, mentionedUserId) {
+  const topic = cloneJSON(topicFixtures[`/t/${topicId}.json`]);
+  topic.archetype = "regular";
+  const firstPost = topic.post_stream.posts[0];
+  firstPost.cooked =
+    '<p>I am mentioning <a class="mention" href="/u/user1">@user1</a> again.</p>';
+  firstPost.mentioned_users = [
+    {
+      id: mentionedUserId,
+      username: "user1",
+      avatar_template: "/letter_avatar_proxy/v4/letter/a/bbce88/{size}.png",
+    },
+  ];
+  return topic;
+}
+
+function topicWithUserStatus(topicId, mentionedUserId, status) {
+  const topic = topicWithoutUserStatus(topicId, mentionedUserId);
+  topic.post_stream.posts[0].mentioned_users[0].status = status;
+  return topic;
+}
+
+acceptance("Post inline mentions", function (needs) {
   needs.user();
 
   const topicId = 130;
@@ -21,43 +43,19 @@ acceptance("Post inline mentions test", function (needs) {
     ends_at: null,
   };
 
-  function topicWithoutUserStatus() {
-    const topic = cloneJSON(topicFixtures[`/t/${topicId}.json`]);
-    const firstPost = topic.post_stream.posts[0];
-    firstPost.cooked =
-      '<p>I am mentioning <a class="mention" href="/u/user1">@user1</a> again.</p>';
-    firstPost.mentioned_users = [
-      {
-        id: mentionedUserId,
-        username: "user1",
-        avatar_template: "/letter_avatar_proxy/v4/letter/a/bbce88/{size}.png",
-      },
-    ];
-    return topic;
-  }
-
-  function topicWithUserStatus() {
-    const topic = topicWithoutUserStatus();
-    topic.post_stream.posts[0].mentioned_users[0].status = status;
-    return topic;
-  }
-
   test("shows user status on inline mentions", async function (assert) {
     pretender.get(`/t/${topicId}.json`, () => {
-      return response(topicWithUserStatus());
+      return response(topicWithUserStatus(topicId, mentionedUserId, status));
     });
 
     await visit(`/t/lorem-ipsum-dolor-sit-amet/${topicId}`);
 
     assert.ok(
-      exists(".topic-post .cooked .mention .user-status"),
+      exists(".topic-post .cooked .mention .user-status-message"),
       "user status is shown"
     );
-    const statusElement = query(".topic-post .cooked .mention .user-status");
-    assert.equal(
-      statusElement.title,
-      status.description,
-      "status description is correct"
+    const statusElement = query(
+      ".topic-post .cooked .mention .user-status-message img"
     );
     assert.ok(
       statusElement.src.includes(status.emoji),
@@ -67,12 +65,12 @@ acceptance("Post inline mentions test", function (needs) {
 
   test("inserts user status on message bus message", async function (assert) {
     pretender.get(`/t/${topicId}.json`, () => {
-      return response(topicWithoutUserStatus());
+      return response(topicWithoutUserStatus(topicId, mentionedUserId));
     });
     await visit(`/t/lorem-ipsum-dolor-sit-amet/${topicId}`);
 
     assert.notOk(
-      exists(".topic-post .cooked .mention .user-status"),
+      exists(".topic-post .cooked .mention .user-status-message"),
       "user status isn't shown"
     );
 
@@ -84,14 +82,11 @@ acceptance("Post inline mentions test", function (needs) {
     });
 
     assert.ok(
-      exists(".topic-post .cooked .mention .user-status"),
+      exists(".topic-post .cooked .mention .user-status-message"),
       "user status is shown"
     );
-    const statusElement = query(".topic-post .cooked .mention .user-status");
-    assert.equal(
-      statusElement.title,
-      status.description,
-      "status description is correct"
+    const statusElement = query(
+      ".topic-post .cooked .mention .user-status-message img"
     );
     assert.ok(
       statusElement.src.includes(status.emoji),
@@ -101,12 +96,12 @@ acceptance("Post inline mentions test", function (needs) {
 
   test("updates user status on message bus message", async function (assert) {
     pretender.get(`/t/${topicId}.json`, () => {
-      return response(topicWithUserStatus());
+      return response(topicWithUserStatus(topicId, mentionedUserId, status));
     });
     await visit(`/t/lorem-ipsum-dolor-sit-amet/${topicId}`);
 
     assert.ok(
-      exists(".topic-post .cooked .mention .user-status"),
+      exists(".topic-post .cooked .mention .user-status-message"),
       "initial user status is shown"
     );
 
@@ -122,14 +117,11 @@ acceptance("Post inline mentions test", function (needs) {
     });
 
     assert.ok(
-      exists(".topic-post .cooked .mention .user-status"),
+      exists(".topic-post .cooked .mention .user-status-message"),
       "updated user status is shown"
     );
-    const statusElement = query(".topic-post .cooked .mention .user-status");
-    assert.equal(
-      statusElement.title,
-      newStatus.description,
-      "updated status description is correct"
+    const statusElement = query(
+      ".topic-post .cooked .mention .user-status-message img"
     );
     assert.ok(
       statusElement.src.includes(newStatus.emoji),
@@ -139,12 +131,12 @@ acceptance("Post inline mentions test", function (needs) {
 
   test("removes user status on message bus message", async function (assert) {
     pretender.get(`/t/${topicId}.json`, () => {
-      return response(topicWithUserStatus());
+      return response(topicWithUserStatus(topicId, mentionedUserId, status));
     });
     await visit(`/t/lorem-ipsum-dolor-sit-amet/${topicId}`);
 
     assert.ok(
-      exists(".topic-post .cooked .mention .user-status"),
+      exists(".topic-post .cooked .mention .user-status-message"),
       "initial user status is shown"
     );
 
@@ -153,8 +145,94 @@ acceptance("Post inline mentions test", function (needs) {
     });
 
     assert.notOk(
-      exists(".topic-post .cooked .mention .user-status"),
+      exists(".topic-post .cooked .mention .user-status-message"),
       "updated user has disappeared"
     );
   });
 });
+
+acceptance("Post inline mentions – user status tooltip", function (needs) {
+  needs.user();
+
+  const topicId = 130;
+  const mentionedUserId = 1;
+  const status = {
+    description: "Surfing",
+    emoji: "surfing_man",
+    ends_at: null,
+  };
+
+  async function mouseEnter(selector) {
+    await triggerEvent(query(selector), "mouseenter");
+  }
+
+  test("shows user status tooltip", async function (assert) {
+    pretender.get(`/t/${topicId}.json`, () => {
+      return response(topicWithUserStatus(topicId, mentionedUserId, status));
+    });
+
+    await visit(`/t/lorem-ipsum-dolor-sit-amet/${topicId}`);
+    assert.ok(
+      exists(".topic-post .cooked .mention .user-status-message"),
+      "user status is shown"
+    );
+
+    await mouseEnter(".user-status-message");
+    const statusTooltip = document.querySelector(
+      ".user-status-message-tooltip"
+    );
+    assert.ok(statusTooltip, "status tooltip is shown");
+    assert.ok(
+      statusTooltip.querySelector("img").src.includes(status.emoji),
+      "emoji is correct"
+    );
+    assert.equal(
+      statusTooltip.querySelector(".user-status-tooltip-description").innerText,
+      status.description,
+      "status description is correct"
+    );
+  });
+});
+
+acceptance("Post inline mentions as an anonymous user", function () {
+  const topicId = 130;
+  const mentionedUserId = 1;
+  const status = {
+    description: "Surfing",
+    emoji: "surfing_man",
+    ends_at: null,
+  };
+
+  test("an anonymous user can see user status on mentions", async function (assert) {
+    pretender.get(`/t/${topicId}.json`, () => {
+      const topic = topicWithUserStatus(topicId, mentionedUserId, status);
+      return response(topic);
+    });
+    await visit(`/t/lorem-ipsum-dolor-sit-amet/${topicId}`);
+
+    assert.ok(
+      exists(".topic-post .cooked .mention .user-status-message"),
+      "user status is shown"
+    );
+  });
+
+  test("an anonymous user can see user status with an end date on mentions", async function (assert) {
+    pretender.get(`/t/${topicId}.json`, () => {
+      const statusWithEndDate = Object.assign(status, {
+        ends_at: "2100-02-01T09:00:00.000Z",
+      });
+      const topic = topicWithUserStatus(
+        topicId,
+        mentionedUserId,
+        statusWithEndDate
+      );
+      return response(topic);
+    });
+    await visit(`/t/lorem-ipsum-dolor-sit-amet/${topicId}`);
+
+    assert.ok(
+      exists(".topic-post .cooked .mention .user-status-message"),
+      "user status is shown"
+    );
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/post-table-wrapper-test.js b/app/assets/javascripts/discourse/tests/acceptance/post-table-wrapper-test.js
new file mode 100644
index 00000000000..909a90bc6e6
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/acceptance/post-table-wrapper-test.js
@@ -0,0 +1,60 @@
+import { test } from "qunit";
+import { click, visit } from "@ember/test-helpers";
+import {
+  acceptance,
+  exists,
+  query,
+} from "discourse/tests/helpers/qunit-helpers";
+
+acceptance("Post Table Wrapper Test", function () {
+  test("fullscreen table wrapper appears on post with large table", async function (assert) {
+    await visit("/t/54081");
+    const postWithLargeTable = ".post-stream .topic-post:first-child";
+    assert.ok(
+      exists(`${postWithLargeTable} .fullscreen-table-wrapper`),
+      "The wrapper is present on the post with the large table"
+    );
+
+    assert.ok(
+      exists(
+        `${postWithLargeTable} .fullscreen-table-wrapper .fullscreen-table-wrapper--buttons .open-popup-link`
+      ),
+      "buttons for the table wrapper appear inside a separate div"
+    );
+
+    const fullscreenButtonWrapper = query(
+      `${postWithLargeTable} .fullscreen-table-wrapper .fullscreen-table-wrapper--buttons`
+    );
+
+    assert.strictEqual(
+      window
+        .getComputedStyle(fullscreenButtonWrapper)
+        .getPropertyValue("position"),
+      "absolute",
+      "the wrapper buttons should not be in the cooked post's flow"
+    );
+
+    await click(
+      `${postWithLargeTable} .fullscreen-table-wrapper .btn-expand-table`
+    );
+
+    assert.ok(
+      exists(".fullscreen-table-modal"),
+      "The fullscreen table modal appears"
+    );
+    assert.ok(
+      exists(".fullscreen-table-modal table"),
+      "The table is present inside the modal"
+    );
+
+    await click(".fullscreen-table-modal .modal-close.close");
+    await click(
+      `${postWithLargeTable} .fullscreen-table-wrapper .btn-expand-table svg`
+    );
+
+    assert.ok(
+      exists(".fullscreen-table-modal"),
+      "Fullscreen table modal appears on clicking svg icon"
+    );
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/preferences-test.js b/app/assets/javascripts/discourse/tests/acceptance/preferences-test.js
index 9b6e3089cb3..3f5e19f5b91 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/preferences-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/preferences-test.js
@@ -44,6 +44,7 @@ acceptance("User Preferences", function (needs) {
       document.body.classList.contains("user-preferences-page"),
       "has the body class"
     );
+
     assert.strictEqual(
       currentURL(),
       "/u/eviltrout/preferences/account",
@@ -62,27 +63,27 @@ acceptance("User Preferences", function (needs) {
     await fillIn(".pref-name input[type=text]", "Jon Snow");
     await savePreferences();
 
-    await click(".preferences-nav .nav-profile a");
+    await click(".user-nav__preferences-profile a");
     await fillIn("#edit-location", "Westeros");
     await savePreferences();
 
-    await click(".preferences-nav .nav-emails a");
+    await click(".user-nav__preferences-emails a");
     await click(".pref-activity-summary input[type=checkbox]");
     await savePreferences();
 
-    await click(".preferences-nav .nav-notifications a");
+    await click(".user-nav__preferences-tracking a");
 
     await selectKit(
-      ".control-group.notifications .combo-box.duration"
+      ".user-preferences_tracking-topics-controls .combo-box.duration"
     ).expand();
 
     await selectKit(
-      ".control-group.notifications .combo-box.duration"
+      ".user-preferences_tracking-topics-controls .combo-box.duration"
     ).selectRowByValue(1440);
 
     await savePreferences();
 
-    await click(".preferences-nav .nav-categories a");
+    await click(".user-nav__preferences-tracking a");
 
     const categorySelector = selectKit(
       ".tracking-controls .category-selector "
@@ -90,26 +91,25 @@ acceptance("User Preferences", function (needs) {
 
     await categorySelector.expand();
     await categorySelector.fillInFilter("faq");
+
+    const tagSelector = selectKit(".tracking-controls .tag-chooser");
+    await tagSelector.expand();
+    await tagSelector.fillInFilter("monkey");
+
     await savePreferences();
 
     this.siteSettings.tagging_enabled = false;
 
-    await visit("/");
-    await visit("/u/eviltrout/preferences");
+    await visit("/u/eviltrout/preferences/tracking");
 
-    assert.ok(
-      !exists(".preferences-nav .nav-tags a"),
-      "tags tab isn't there when tags are disabled"
+    assert.notOk(
+      exists(".tag-notifications"),
+      "updating tags tracking preferences isn't visible when tags are disabled"
     );
 
-    await click(".preferences-nav .nav-interface a");
+    await click(".user-nav__preferences-interface a");
     await click(".control-group.other input[type=checkbox]:nth-of-type(1)");
     await savePreferences();
-
-    assert.ok(
-      !exists(".preferences-nav .nav-apps a"),
-      "apps tab isn't there when you have no authorized apps"
-    );
   });
 });
 
@@ -235,3 +235,15 @@ acceptance(
     });
   }
 );
+
+acceptance("User Preference - No Secondary Emails Allowed", function (needs) {
+  needs.user();
+  needs.pretender(preferencesPretender);
+  needs.settings({ max_allowed_secondary_emails: 0 });
+
+  test("Add Alternate Email Button is unvailable", async function (assert) {
+    await visit("/u/eviltrout/preferences");
+
+    assert.dom(".pref-email a").doesNotExist();
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/review-test.js b/app/assets/javascripts/discourse/tests/acceptance/review-test.js
index 212ada586fb..55185b1b1fc 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/review-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/review-test.js
@@ -5,7 +5,6 @@ import {
   loggedInUser,
   publishToMessageBus,
   query,
-  updateCurrentUser,
   visible,
 } from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, visit } from "@ember/test-helpers";
@@ -226,38 +225,7 @@ acceptance("Review", function (needs) {
     );
   });
 
-  test("Reviewables can become stale when redesigned_user_menu_enabled is false", async function (assert) {
-    updateCurrentUser({ redesigned_user_menu_enabled: false });
-    await visit("/review");
-
-    const reviewable = query(`[data-reviewable-id="1234"]`);
-    assert.notOk(reviewable.className.includes("reviewable-stale"));
-    assert.strictEqual(
-      count(`[data-reviewable-id="1234"] .status .pending`),
-      1
-    );
-    assert.ok(!exists(".stale-help"));
-
-    await publishToMessageBus("/reviewable_counts", {
-      review_count: 1,
-      updates: {
-        1234: { last_performing_username: "foo", status: 1 },
-      },
-    });
-
-    assert.ok(reviewable.className.includes("reviewable-stale"));
-    assert.strictEqual(count("[data-reviewable-id=1234] .status .approved"), 1);
-    assert.strictEqual(count(".stale-help"), 1);
-    assert.ok(query(".stale-help").innerText.includes("foo"));
-
-    await visit("/");
-    await visit("/review"); // reload review
-
-    assert.strictEqual(count(".stale-help"), 0);
-  });
-
-  test("Reviewables can become stale when redesigned_user_menu_enabled is true", async function (assert) {
-    updateCurrentUser({ redesigned_user_menu_enabled: true });
+  test("Reviewables can become stale", async function (assert) {
     await visit("/review");
 
     const reviewable = query(`[data-reviewable-id="1234"]`);
diff --git a/app/assets/javascripts/discourse/tests/acceptance/search-full-test.js b/app/assets/javascripts/discourse/tests/acceptance/search-full-test.js
index def95cb6656..bb9627b54ad 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/search-full-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/search-full-test.js
@@ -573,8 +573,8 @@ acceptance("Search - Full Page", function (needs) {
     await click(".bulk-select"); // toggle bulk
     await click(".bulk-select-visible .btn:nth-child(2)"); // select all
     await click(".bulk-select-btn"); // show bulk actions
-    await click(".topic-bulk-actions-modal .btn:nth-child(2)"); // close topics
-    assert.equal(lastBody["topic_ids[]"], 130);
+    await click(".topic-bulk-actions-modal .btn.bulk-actions__close-topics");
+    assert.deepEqual(lastBody["topic_ids[]"], ["130"]);
   });
 
   test("adds visited class to visited topics", async function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/search-test.js b/app/assets/javascripts/discourse/tests/acceptance/search-test.js
index f0b21db01e7..af531e0aec4 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/search-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/search-test.js
@@ -3,6 +3,7 @@ import {
   count,
   exists,
   query,
+  queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
 import {
   click,
@@ -14,7 +15,7 @@ import {
 import I18n from "I18n";
 import searchFixtures from "discourse/tests/fixtures/search-fixtures";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
-import { skip, test } from "qunit";
+import { test } from "qunit";
 import { DEFAULT_TYPE_FILTER } from "discourse/widgets/search-menu";
 
 acceptance("Search - Anonymous", function (needs) {
@@ -73,7 +74,7 @@ acceptance("Search - Anonymous", function (needs) {
       query(
         ".search-menu .results ul.search-menu-initial-options li:first-child .search-item-slug"
       ).innerText.trim(),
-      `dev ${I18n.t("search.in_topics_posts")}`,
+      `dev${I18n.t("search.in_topics_posts")}`,
       "shows topic search as first dropdown item"
     );
 
@@ -113,8 +114,7 @@ acceptance("Search - Anonymous", function (needs) {
     );
   });
 
-  // TODO: This feature doesn't work currently (/t/69760)
-  skip("search button toggles search menu", async function (assert) {
+  test("search button toggles search menu", async function (assert) {
     await visit("/");
 
     await click("#search-button");
@@ -131,37 +131,36 @@ acceptance("Search - Anonymous", function (needs) {
   });
 
   test("search scope", async function (assert) {
-    const firstResult =
-      ".search-menu .results .search-menu-assistant-item:first-child";
+    const contextSelector = ".search-menu .results .search-menu-assistant-item";
 
     await visit("/tag/important");
     await click("#search-button");
 
     assert.strictEqual(
-      query(firstResult).textContent.trim(),
-      `${I18n.t("search.in")} test`,
+      queryAll(contextSelector)[0].firstChild.textContent.trim(),
+      `${I18n.t("search.in")} important`,
       "contextual tag search is first available option with no term"
     );
 
     await fillIn("#search-term", "smth");
 
     assert.strictEqual(
-      query(firstResult).textContent.trim(),
-      `smth ${I18n.t("search.in")} test`,
-      "tag-scoped search is first available option"
+      queryAll(contextSelector)[1].firstChild.textContent.trim(),
+      `smth ${I18n.t("search.in")} important`,
+      "tag-scoped search is second available option"
     );
 
     await visit("/c/bug");
     await click("#search-button");
 
     assert.strictEqual(
-      query(firstResult).textContent.trim(),
+      queryAll(contextSelector)[1].firstChild.textContent.trim(),
       `smth ${I18n.t("search.in")} bug`,
-      "category-scoped search is first available option"
+      "category-scoped search is first available option with no search term"
     );
 
     assert.ok(
-      exists(`${firstResult} span.badge-wrapper`),
+      exists(`${contextSelector} span.badge-wrapper`),
       "category badge is a span (i.e. not a link)"
     );
 
@@ -169,20 +168,20 @@ acceptance("Search - Anonymous", function (needs) {
     await click("#search-button");
 
     assert.strictEqual(
-      query(firstResult).textContent.trim(),
+      queryAll(contextSelector)[1].firstChild.textContent.trim(),
       `smth ${I18n.t("search.in_this_topic")}`,
-      "topic-scoped search is first available option"
+      "topic-scoped search is first available option with no search term"
     );
 
     await visit("/u/eviltrout");
     await click("#search-button");
 
     assert.strictEqual(
-      query(firstResult).textContent.trim(),
+      queryAll(contextSelector)[1].firstChild.textContent.trim(),
       `smth ${I18n.t("search.in_posts_by", {
         username: "eviltrout",
       })}`,
-      "user-scoped search is first available option"
+      "user-scoped search is first available option with no search term"
     );
   });
 
@@ -197,17 +196,18 @@ acceptance("Search - Anonymous", function (needs) {
     assert.strictEqual(
       query(firstResult).textContent.trim(),
       I18n.t("search.in_this_topic"),
-      "contextual topic search is first available option"
+      "contextual topic search is first available option with no search term"
     );
 
     await fillIn("#search-term", "a proper");
     await query("input#search-term").focus();
     await triggerKeyEvent(".search-menu", "keydown", "ArrowDown");
+    await triggerKeyEvent(".search-menu", "keydown", "ArrowDown");
 
     await click(document.activeElement);
     assert.ok(
       exists(".search-menu .search-result-post ul li"),
-      "clicking first option formats results as posts"
+      "clicking second option scopes search to current topic"
     );
 
     assert.strictEqual(
@@ -233,6 +233,7 @@ acceptance("Search - Anonymous", function (needs) {
     await fillIn("#search-term", "dev");
     await query("input#search-term").focus();
     await triggerKeyEvent(".search-menu", "keydown", "ArrowDown");
+    await triggerKeyEvent(".search-menu", "keydown", "ArrowDown");
     await click(document.activeElement);
 
     assert.ok(
@@ -255,18 +256,18 @@ acceptance("Search - Anonymous", function (needs) {
 
     await click("#search-button");
 
-    const firstResult =
-      ".search-menu .results .search-menu-assistant-item:first-child";
+    const contextSelector = ".search-menu .results .search-menu-assistant-item";
 
     assert.strictEqual(
-      query(firstResult).textContent.trim(),
+      queryAll(contextSelector)[0].firstChild.textContent.trim(),
       I18n.t("search.in_this_topic"),
-      "contextual topic search is first available option"
+      "contextual topic search is first available option with no search term"
     );
 
     await fillIn("#search-term", "proper");
     await query("input#search-term").focus();
     await triggerKeyEvent(".search-menu", "keydown", "ArrowDown");
+    await triggerKeyEvent(".search-menu", "keydown", "ArrowDown");
     await click(document.activeElement);
 
     assert.ok(
@@ -300,16 +301,16 @@ acceptance("Search - Anonymous", function (needs) {
       query(
         ".search-menu-assistant-item:first-child .search-item-user .label-suffix"
       ).textContent.trim(),
-      I18n.t("search.in_this_topic"),
-      "first result hints in this topic search"
+      I18n.t("search.in_topics_posts"),
+      "first result hints at global search"
     );
 
     assert.strictEqual(
       query(
         ".search-menu-assistant-item:nth-child(2) .search-item-user .label-suffix"
       ).textContent.trim(),
-      I18n.t("search.in_topics_posts"),
-      "second result hints global search"
+      I18n.t("search.in_this_topic"),
+      "second result hints at search within current topic"
     );
   });
 
@@ -757,6 +758,47 @@ acceptance("Search - assistant", function (needs) {
       return helper.response(searchFixtures["search/query"]);
     });
 
+    server.get("/tag/dev/notifications", () => {
+      return helper.response({
+        tag_notification: { id: "dev", notification_level: 2 },
+      });
+    });
+
+    server.get("/tags/c/bug/1/dev/l/latest.json", () => {
+      return helper.response({
+        users: [],
+        primary_groups: [],
+        topic_list: {
+          can_create_topic: true,
+          draft: null,
+          draft_key: "new_topic",
+          draft_sequence: 1,
+          per_page: 30,
+          tags: [
+            {
+              id: 1,
+              name: "dev",
+              topic_count: 1,
+            },
+          ],
+          topics: [],
+        },
+      });
+    });
+
+    server.get("/tags/intersection/dev/foo.json", () => {
+      return helper.response({
+        topic_list: {
+          can_create_topic: true,
+          draft: null,
+          draft_key: "new_topic",
+          draft_sequence: 1,
+          per_page: 30,
+          topics: [],
+        },
+      });
+    });
+
     server.get("/u/search/users", () => {
       return helper.response({
         users: [
@@ -810,13 +852,92 @@ acceptance("Search - assistant", function (needs) {
       query(
         ".search-menu .results ul.search-menu-assistant .search-item-prefix"
       ).innerText,
-      "sam "
+      "sam"
     );
 
     await click(firstCategory);
     assert.strictEqual(query("#search-term").value, `sam #${firstResultSlug}`);
   });
 
+  test("Shows category / tag combination shortcut when both are present", async function (assert) {
+    await visit("/tags/c/bug/dev");
+    await click("#search-button");
+
+    assert.strictEqual(
+      query(".search-menu .results ul.search-menu-assistant .category-name")
+        .innerText,
+      "bug",
+      "Category is displayed"
+    );
+
+    assert.strictEqual(
+      query(".search-menu .results ul.search-menu-assistant .search-item-tag")
+        .innerText,
+      "dev",
+      "Tag is displayed"
+    );
+  });
+
+  test("Updates tag / category combination search suggestion when typing", async function (assert) {
+    await visit("/tags/c/bug/dev");
+    await click("#search-button");
+    await fillIn("#search-term", "foo bar");
+
+    assert.strictEqual(
+      query(
+        ".search-menu .results ul.search-menu-assistant .search-item-prefix"
+      ).innerText,
+      "foo bar",
+      "Input is applied to search query"
+    );
+
+    assert.strictEqual(
+      query(".search-menu .results ul.search-menu-assistant .category-name")
+        .innerText,
+      "bug"
+    );
+
+    assert.strictEqual(
+      query(".search-menu .results ul.search-menu-assistant .search-item-tag")
+        .innerText,
+      "dev",
+      "Tag is displayed"
+    );
+  });
+
+  test("Shows tag combination shortcut when visiting tag intersection", async function (assert) {
+    await visit("/tags/intersection/dev/foo");
+    await click("#search-button");
+
+    assert.strictEqual(
+      query(".search-menu .results ul.search-menu-assistant .search-item-tag")
+        .innerText,
+      "tags:dev+foo",
+      "Tags are displayed"
+    );
+  });
+
+  test("Updates tag intersection search suggestion when typing", async function (assert) {
+    await visit("/tags/intersection/dev/foo");
+    await click("#search-button");
+    await fillIn("#search-term", "foo bar");
+
+    assert.strictEqual(
+      query(
+        ".search-menu .results ul.search-menu-assistant .search-item-prefix"
+      ).innerText,
+      "foo bar",
+      "Input is applied to search query"
+    );
+
+    assert.strictEqual(
+      query(".search-menu .results ul.search-menu-assistant .search-item-tag")
+        .innerText,
+      "tags:dev+foo",
+      "Tags are displayed"
+    );
+  });
+
   test("shows in: shortcuts", async function (assert) {
     await visit("/");
     await click("#search-button");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/select-kit-accessibility-test.js b/app/assets/javascripts/discourse/tests/acceptance/select-kit-accessibility-test.js
new file mode 100644
index 00000000000..d4940f45231
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/acceptance/select-kit-accessibility-test.js
@@ -0,0 +1,67 @@
+import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
+import { click, tab, triggerKeyEvent, visit } from "@ember/test-helpers";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { test } from "qunit";
+
+acceptance("Select-kit - Composer - Accessibility", function (needs) {
+  needs.user();
+  needs.site({ can_tag_topics: true });
+  needs.settings({ allow_uncategorized_topics: true });
+
+  test("tabbing works", async function (assert) {
+    await visit("/");
+    await click("#create-topic");
+
+    const tagChooser = selectKit(".mini-tag-chooser");
+    await tagChooser.expand();
+
+    assert
+      .dom(".mini-tag-chooser .filter-input")
+      .isFocused("it should focus the filter by default");
+
+    await tab();
+
+    assert
+      .dom(".mini-tag-chooser .select-kit-row:first-child")
+      .isFocused("it should focus the first row next");
+
+    await tab({ backwards: true });
+
+    assert
+      .dom(".mini-tag-chooser .filter-input")
+      .isFocused("it should focus the filter again when tabbing backwards");
+
+    await tab({ backwards: true });
+
+    assert
+      .dom(".mini-tag-chooser .select-kit-header")
+      .isFocused("it should focus the tag chooser header next");
+
+    await tab({ backwards: true });
+
+    assert
+      .dom(".category-chooser .select-kit-header")
+      .isFocused("it should focus the category chooser header next");
+
+    await tab();
+
+    assert
+      .dom(".mini-tag-chooser .select-kit-header")
+      .isFocused("it should focus the tag chooser again");
+
+    await tagChooser.expand();
+
+    await triggerKeyEvent(
+      ".mini-tag-chooser .select-kit-row:first-child",
+      "keydown",
+      "Escape"
+    );
+
+    assert.notOk(
+      exists(".mini-tag-chooser .select-kit-body .select-kit-row"),
+      "Hitting Escape dismisses the tag chooser"
+    );
+
+    assert.ok(exists(".composer-fields"), "Escape does not dismiss composer");
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-anonymous-categories-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-anonymous-categories-section-test.js
index 252a8e756b8..36e5048b9ba 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-anonymous-categories-section-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-anonymous-categories-section-test.js
@@ -12,13 +12,13 @@ acceptance("Sidebar - Anonymous - Categories Section", function (needs) {
     navigation_menu: "sidebar",
   });
 
-  test("category section links ordered by category's topic count when default_sidebar_categories has not been configured and site setting to fix categories positions is disabled", async function (assert) {
+  test("category section links ordered by category's topic count when default_navigation_menu_categories has not been configured and site setting to fix categories positions is disabled", async function (assert) {
     this.siteSettings.fixed_category_positions = false;
 
     await visit("/");
 
     const categorySectionLinks = queryAll(
-      ".sidebar-section-categories .sidebar-section-link-wrapper"
+      ".sidebar-section[data-section-name='categories'] .sidebar-section-link-wrapper"
     );
 
     const sidebarCategories = Site.current()
@@ -53,18 +53,18 @@ acceptance("Sidebar - Anonymous - Categories Section", function (needs) {
     );
 
     assert.ok(
-      exists("a.sidebar-section-link-all-categories"),
+      exists("a.sidebar-section-link[data-link-name='all-categories']"),
       "all categories link is visible"
     );
   });
 
-  test("category section links ordered by default category's position when default_sidebar_categories has not been configured and site setting to fix categories positions is enabled", async function (assert) {
+  test("category section links ordered by default category's position when default_navigation_menu_categories has not been configured and site setting to fix categories positions is enabled", async function (assert) {
     this.siteSettings.fixed_category_positions = true;
 
     await visit("/");
 
     const categories = queryAll(
-      ".sidebar-section-categories .sidebar-section-link-wrapper"
+      ".sidebar-section[data-section-name='categories'] .sidebar-section-link-wrapper"
     );
 
     const siteCategories = Site.current().categories;
@@ -97,19 +97,19 @@ acceptance("Sidebar - Anonymous - Categories Section", function (needs) {
     );
 
     assert.ok(
-      exists("a.sidebar-section-link-all-categories"),
+      exists("a.sidebar-section-link[data-link-name='all-categories']"),
       "all categories link is visible"
     );
   });
 
-  test("category section links in sidebar when default_sidebar_categories site setting has been configured and site setting to fix category position is enabled", async function (assert) {
+  test("category section links in sidebar when default_navigation_menu_categories site setting has been configured and site setting to fix category position is enabled", async function (assert) {
     this.siteSettings.fixed_category_positions = true;
-    this.siteSettings.default_sidebar_categories = "1|3|13";
+    this.siteSettings.default_navigation_menu_categories = "1|3|13";
 
     await visit("/");
 
     const categories = queryAll(
-      ".sidebar-section-categories .sidebar-section-link-wrapper"
+      ".sidebar-section[data-section-name='categories'] .sidebar-section-link-wrapper"
     );
 
     assert.strictEqual(categories.length, 4);
@@ -118,7 +118,7 @@ acceptance("Sidebar - Anonymous - Categories Section", function (needs) {
     assert.strictEqual(categories[2].textContent.trim(), "bug");
 
     assert.ok(
-      exists("a.sidebar-section-link-all-categories"),
+      exists("a.sidebar-section-link[data-link-name='all-categories']"),
       "all categories link is visible"
     );
   });
@@ -138,7 +138,7 @@ acceptance("Sidebar - Anonymous - Categories Section", function (needs) {
 
     assert.notOk(
       exists(
-        `.sidebar-section-categories .sidebar-section-link-${firstCategory.slug}`
+        `.sidebar-section[data-section-name='categories'] .sidebar-section-link[data-link-name='${firstCategory.slug}']`
       ),
       "category section link is not shown in sidebar after being marked as uncategorized"
     );
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-anonymous-community-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-anonymous-community-section-test.js
index 28d186a8f5b..9dcab19f8c3 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-anonymous-community-section-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-anonymous-community-section-test.js
@@ -5,7 +5,6 @@ import { test } from "qunit";
 import {
   acceptance,
   exists,
-  query,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
 import { click, visit } from "@ember/test-helpers";
@@ -13,62 +12,22 @@ import { click, visit } from "@ember/test-helpers";
 acceptance("Sidebar - Anonymous user - Community Section", function (needs) {
   needs.settings({
     navigation_menu: "sidebar",
+    faq_url: "https://discourse.org",
   });
 
-  test("display short site description site setting when it is set", async function (assert) {
-    this.siteSettings.short_site_description =
-      "This is a short description about the site";
+  needs.site({});
 
+  test("topics section link is shown by default ", async function (assert) {
     await visit("/");
 
-    assert.strictEqual(
-      query(
-        ".sidebar-section-community .sidebar-section-message"
-      ).textContent.trim(),
-      this.siteSettings.short_site_description,
-      "displays the short site description under the community section"
-    );
-
     const sectionLinks = queryAll(
-      ".sidebar-section-community .sidebar-section-link"
+      ".sidebar-section[data-section-name='community'] .sidebar-section-link"
     );
 
     assert.strictEqual(
       sectionLinks[0].textContent.trim(),
-      I18n.t("sidebar.sections.community.links.about.content"),
-      "displays the about section link first"
-    );
-  });
-
-  test("everything, users, about and FAQ section links are shown by default ", async function (assert) {
-    await visit("/");
-
-    const sectionLinks = queryAll(
-      ".sidebar-section-community .sidebar-section-link"
-    );
-
-    assert.strictEqual(
-      sectionLinks[0].textContent.trim(),
-      I18n.t("sidebar.sections.community.links.everything.content"),
-      "displays the everything section link first"
-    );
-
-    assert.strictEqual(
-      sectionLinks[1].textContent.trim(),
-      I18n.t("sidebar.sections.community.links.users.content"),
-      "displays the users section link second"
-    );
-
-    assert.strictEqual(
-      sectionLinks[2].textContent.trim(),
-      I18n.t("sidebar.sections.community.links.about.content"),
-      "displays the about section link third"
-    );
-
-    assert.strictEqual(
-      sectionLinks[3].textContent.trim(),
-      I18n.t("sidebar.sections.community.links.faq.content"),
-      "displays the FAQ section link last"
+      I18n.t("sidebar.sections.community.links.topics.content"),
+      "displays the topics section link first"
     );
   });
 
@@ -78,16 +37,18 @@ acceptance("Sidebar - Anonymous user - Community Section", function (needs) {
     await visit("/");
 
     assert.notOk(
-      exists(".sidebar-section-community .sidebar-section-link-users"),
+      exists(
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='users']"
+      ),
       "users section link is not shown in sidebar"
     );
   });
 
-  test("groups and badges section links are shown in more...", async function (assert) {
+  test("users, about, faq, groups and badges section links are shown in more...", async function (assert) {
     await visit("/");
 
     await click(
-      ".sidebar-section-community .sidebar-more-section-links-details-summary"
+      ".sidebar-section[data-section-name='community'] .sidebar-more-section-links-details-summary"
     );
 
     const sectionLinks = queryAll(
@@ -96,12 +57,30 @@ acceptance("Sidebar - Anonymous user - Community Section", function (needs) {
 
     assert.strictEqual(
       sectionLinks[0].textContent.trim(),
+      I18n.t("sidebar.sections.community.links.users.content"),
+      "displays the users section link second"
+    );
+
+    assert.strictEqual(
+      sectionLinks[1].textContent.trim(),
+      I18n.t("sidebar.sections.community.links.about.content"),
+      "displays the about section link third"
+    );
+
+    assert.strictEqual(
+      sectionLinks[2].textContent.trim(),
+      I18n.t("sidebar.sections.community.links.faq.content"),
+      "displays the FAQ section link last"
+    );
+
+    assert.strictEqual(
+      sectionLinks[3].textContent.trim(),
       I18n.t("sidebar.sections.community.links.groups.content"),
       "displays the groups section link first"
     );
 
     assert.strictEqual(
-      sectionLinks[1].textContent.trim(),
+      sectionLinks[4].textContent.trim(),
       I18n.t("sidebar.sections.community.links.badges.content"),
       "displays the badges section link second"
     );
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-anonymous-tags-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-anonymous-tags-section-test.js
deleted file mode 100644
index 715f08aa5f5..00000000000
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-anonymous-tags-section-test.js
+++ /dev/null
@@ -1,78 +0,0 @@
-import { test } from "qunit";
-import { visit } from "@ember/test-helpers";
-import {
-  acceptance,
-  exists,
-  queryAll,
-} from "discourse/tests/helpers/qunit-helpers";
-import Site from "discourse/models/site";
-
-acceptance("Sidebar - Anonymous Tags Section", function (needs) {
-  needs.settings({
-    navigation_menu: "sidebar",
-    suppress_uncategorized_badge: false,
-    tagging_enabled: true,
-  });
-
-  needs.site({
-    top_tags: ["design", "development", "fun"],
-  });
-
-  test("tag section links when site has top tags", async function (assert) {
-    await visit("/");
-
-    const categories = queryAll(
-      ".sidebar-section-tags .sidebar-section-link-wrapper"
-    );
-
-    assert.strictEqual(categories.length, 4);
-    assert.strictEqual(categories[0].textContent.trim(), "design");
-    assert.strictEqual(categories[1].textContent.trim(), "development");
-    assert.strictEqual(categories[2].textContent.trim(), "fun");
-
-    assert.ok(
-      exists("a.sidebar-section-link-all-tags"),
-      "all tags link is visible"
-    );
-  });
-
-  test("tag section links when site has default sidebar tags configured", async function (assert) {
-    const site = Site.current();
-    site.set("anonymous_default_sidebar_tags", ["random", "meta"]);
-
-    await visit("/");
-
-    const categories = queryAll(
-      ".sidebar-section-tags .sidebar-section-link-wrapper"
-    );
-    assert.strictEqual(categories.length, 3);
-    assert.strictEqual(categories[0].textContent.trim(), "random");
-    assert.strictEqual(categories[1].textContent.trim(), "meta");
-
-    assert.ok(
-      exists("a.sidebar-section-link-all-tags"),
-      "all tags link is visible"
-    );
-  });
-
-  test("tag section is hidden when tagging is disabled", async function (assert) {
-    this.siteSettings.tagging_enabled = false;
-
-    await visit("/");
-
-    assert.ok(!exists(".sidebar-section-tags"), "section is not visible");
-  });
-
-  test("tag section is hidden when anonymous has no visible top tags and site has not default sidebar tags configured", async function (assert) {
-    const site = Site.current();
-
-    site.setProperties({
-      top_tags: [],
-      anonymous_default_sidebar_tags: [],
-    });
-
-    await visit("/");
-
-    assert.ok(!exists(".sidebar-section-tags"), "section is not visible");
-  });
-});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-mobile-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-mobile-test.js
deleted file mode 100644
index 071a1bb5cc3..00000000000
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-mobile-test.js
+++ /dev/null
@@ -1,86 +0,0 @@
-import I18n from "I18n";
-import { test } from "qunit";
-
-import { click, visit } from "@ember/test-helpers";
-
-import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
-
-acceptance("Sidebar - Mobile - User with sidebar enabled", function (needs) {
-  needs.user();
-
-  needs.settings({
-    navigation_menu: "sidebar",
-  });
-
-  needs.mobileView();
-
-  test("hidden by default", async function (assert) {
-    await visit("/");
-
-    assert.ok(
-      !exists(".sidebar-hamburger-dropdown"),
-      "sidebar is not displayed"
-    );
-  });
-
-  test("clicking outside sidebar collapses it", async function (assert) {
-    await visit("/");
-
-    await click(".hamburger-dropdown");
-
-    assert.ok(exists(".sidebar-hamburger-dropdown"), "sidebar is displayed");
-
-    await click("#main-outlet");
-
-    assert.ok(!exists(".sidebar-hamburger-dropdown"), "sidebar is collapsed");
-  });
-
-  test("clicking on a link or button in sidebar collapses it", async function (assert) {
-    await visit("/");
-
-    await click(".hamburger-dropdown");
-    await click(".sidebar-section-community .sidebar-section-header-button");
-
-    assert.ok(
-      !exists(".sidebar-hamburger-dropdown"),
-      "sidebar is collapsed when a button in sidebar is clicked"
-    );
-
-    await click(".hamburger-dropdown");
-    await click(".sidebar-section-community .sidebar-section-link-everything");
-
-    assert.ok(
-      !exists(".sidebar-hamburger-dropdown"),
-      "sidebar is collapsed when a link in sidebar is clicked"
-    );
-  });
-
-  test("button to toggle between mobile and desktop view", async function (assert) {
-    await visit("/");
-    await click(".hamburger-dropdown");
-
-    assert.ok(
-      exists(
-        `.sidebar-footer-actions-toggle-mobile-view[title="${I18n.t(
-          "desktop_view"
-        )}"]`
-      ),
-      "displays the right title for the button"
-    );
-
-    assert.ok(
-      exists(".sidebar-footer-actions-toggle-mobile-view .d-icon-desktop"),
-      "displays the desktop icon for the button"
-    );
-  });
-
-  test("keyboard shortcuts button is hidden", async function (assert) {
-    await visit("/");
-    await click(".hamburger-dropdown");
-
-    assert.notOk(
-      exists(".sidebar-footer-actions-keyboard-shortcuts"),
-      "keyboard shortcuts button is not shown on mobile"
-    );
-  });
-});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-narrow-desktop-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-narrow-desktop-test.js
index 7ac9ef275fb..fcbb9f2374f 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-narrow-desktop-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-narrow-desktop-test.js
@@ -1,7 +1,5 @@
 import { test } from "qunit";
-
-import { click, settled, visit, waitUntil } from "@ember/test-helpers";
-
+import { click, settled, visit, waitFor } from "@ember/test-helpers";
 import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Sidebar - Narrow Desktop", function (needs) {
@@ -18,21 +16,18 @@ acceptance("Sidebar - Narrow Desktop", function (needs) {
 
     await click(".header-sidebar-toggle .btn");
 
-    assert.ok(!exists("#d-sidebar"), "widge sidebar is collapsed");
+    assert.ok(!exists("#d-sidebar"), "wide sidebar is collapsed");
 
     await click(".header-sidebar-toggle .btn");
 
     assert.ok(exists("#d-sidebar"), "wide sidebar is displayed");
 
     const bodyElement = document.querySelector("body");
-    bodyElement.style.width = "990px";
+    bodyElement.style.width = "767px";
 
-    await waitUntil(
-      () => document.querySelector(".btn-sidebar-toggle.narrow-desktop"),
-      {
-        timeout: 5000,
-      }
-    );
+    await waitFor(".btn-sidebar-toggle.narrow-desktop", {
+      timeout: 5000,
+    });
     await click(".btn-sidebar-toggle");
 
     assert.ok(
@@ -47,7 +42,7 @@ acceptance("Sidebar - Narrow Desktop", function (needs) {
     );
 
     bodyElement.style.width = "1200px";
-    await waitUntil(() => document.querySelector("#d-sidebar"), {
+    await waitFor("#d-sidebar", {
       timeout: 5000,
     });
     assert.ok(exists("#d-sidebar"), "wide sidebar is displayed");
@@ -60,18 +55,15 @@ acceptance("Sidebar - Narrow Desktop", function (needs) {
     await settled();
 
     const bodyElement = document.querySelector("body");
-    bodyElement.style.width = "990px";
+    bodyElement.style.width = "767px";
 
-    await waitUntil(
-      () => document.querySelector(".btn-sidebar-toggle.narrow-desktop"),
-      {
-        timeout: 5000,
-      }
-    );
+    await waitFor(".btn-sidebar-toggle.narrow-desktop", {
+      timeout: 5000,
+    });
     await click(".btn-sidebar-toggle");
 
     bodyElement.style.width = "1200px";
-    await waitUntil(() => document.querySelector("#d-sidebar"), {
+    await waitFor("#d-sidebar", {
       timeout: 5000,
     });
     await click(".header-dropdown-toggle.current-user");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-plugin-api-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-plugin-api-test.js
index 70f063461e5..d891b6fa528 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-plugin-api-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-plugin-api-test.js
@@ -8,16 +8,21 @@ import {
   queryAll,
   updateCurrentUser,
 } from "discourse/tests/helpers/qunit-helpers";
-import { withPluginApi } from "discourse/lib/plugin-api";
+import { PLUGIN_API_VERSION, withPluginApi } from "discourse/lib/plugin-api";
 import Site from "discourse/models/site";
-import { resetCustomCountables } from "discourse/lib/sidebar/user/categories-section/category-section-link";
-import { UNREAD_LIST_DESTINATION } from "discourse/controllers/preferences/sidebar";
+import {
+  resetCustomCategoryLockIcon,
+  resetCustomCategorySectionLinkPrefix,
+  resetCustomCountables,
+} from "discourse/lib/sidebar/user/categories-section/category-section-link";
+import { resetCustomTagSectionLinkPrefixIcons } from "discourse/lib/sidebar/user/tags-section/base-tag-section-link";
 import { bind } from "discourse-common/utils/decorators";
 
 acceptance("Sidebar - Plugin API", function (needs) {
-  needs.user();
+  needs.user({});
 
   needs.settings({
+    tagging_enabled: true,
     navigation_menu: "sidebar",
   });
 
@@ -30,7 +35,7 @@ acceptance("Sidebar - Plugin API", function (needs) {
   let linkDidInsert, linkDestroy, sectionDestroy;
 
   test("Multiple header actions and links", async function (assert) {
-    withPluginApi("1.3.0", (api) => {
+    withPluginApi(PLUGIN_API_VERSION, (api) => {
       api.addSidebarSection(
         (BaseCustomSidebarSection, BaseCustomSidebarSectionLink) => {
           return class extends BaseCustomSidebarSection {
@@ -98,7 +103,7 @@ acceptance("Sidebar - Plugin API", function (needs) {
                   }
 
                   get prefixValue() {
-                    return "hashtag";
+                    return "d-chat";
                   }
 
                   get prefixColor() {
@@ -201,6 +206,28 @@ acceptance("Sidebar - Plugin API", function (needs) {
                     return "hover button title attribute";
                   }
                 })(),
+
+                new (class extends BaseCustomSidebarSectionLink {
+                  get name() {
+                    return "homepage";
+                  }
+
+                  get classNames() {
+                    return "my-class-name";
+                  }
+
+                  get href() {
+                    return "https://www.discourse.org";
+                  }
+
+                  get title() {
+                    return "Homepage";
+                  }
+
+                  get text() {
+                    return "Homepage";
+                  }
+                })(),
               ];
             }
           };
@@ -218,26 +245,32 @@ acceptance("Sidebar - Plugin API", function (needs) {
 
     assert.strictEqual(
       query(
-        ".sidebar-section-test-chat-channels .sidebar-section-header-text"
+        ".sidebar-section[data-section-name='test-chat-channels'] .sidebar-section-header-text"
       ).textContent.trim(),
       "chat channels text",
       "displays header with correct text"
     );
 
+    assert
+      .dom(
+        ".sidebar-section[data-section-name='test-chat-channels'] .sidebar-section-header-caret"
+      )
+      .exists();
+
     await click(
-      ".sidebar-section-test-chat-channels .sidebar-section-header-dropdown summary"
+      ".sidebar-section[data-section-name='test-chat-channels'] .sidebar-section-header-dropdown summary"
     );
 
     assert.strictEqual(
       queryAll(
-        ".sidebar-section-test-chat-channels .sidebar-section-header-dropdown .select-kit-collection li"
+        ".sidebar-section[data-section-name='test-chat-channels'] .sidebar-section-header-dropdown .select-kit-collection li"
       ).length,
       2,
       "displays two actions"
     );
 
     const actions = queryAll(
-      ".sidebar-section-test-chat-channels .sidebar-section-header-dropdown .select-kit-collection li"
+      ".sidebar-section[data-section-name='test-chat-channels'] .sidebar-section-header-dropdown .select-kit-collection li"
     );
 
     assert.strictEqual(
@@ -253,7 +286,7 @@ acceptance("Sidebar - Plugin API", function (needs) {
     );
 
     const links = queryAll(
-      ".sidebar-section-test-chat-channels .sidebar-section-link"
+      ".sidebar-section[data-section-name='test-chat-channels'] .sidebar-section-link"
     );
 
     assert.strictEqual(
@@ -285,7 +318,7 @@ acceptance("Sidebar - Plugin API", function (needs) {
     );
 
     assert.strictEqual(
-      links[0].children[0].children[0].classList.contains("d-icon-hashtag"),
+      links[0].children[0].children[0].classList.contains("d-icon-d-chat"),
       true,
       "displays prefix icon"
     );
@@ -344,6 +377,18 @@ acceptance("Sidebar - Plugin API", function (needs) {
       "uses correct prefix image url"
     );
 
+    assert.strictEqual(
+      links[3].title,
+      "Homepage",
+      "displays external link with correct title attribute"
+    );
+
+    assert.strictEqual(
+      links[3].href,
+      "https://www.discourse.org/",
+      "displays external link with correct href attribute"
+    );
+
     assert.strictEqual(
       query(".sidebar-section-link-hover button").title,
       "hover button title attribute",
@@ -366,7 +411,7 @@ acceptance("Sidebar - Plugin API", function (needs) {
   });
 
   test("Single header action and no links", async function (assert) {
-    withPluginApi("1.3.0", (api) => {
+    withPluginApi(PLUGIN_API_VERSION, (api) => {
       api.addSidebarSection((BaseCustomSidebarSection) => {
         return class extends BaseCustomSidebarSection {
           get name() {
@@ -402,7 +447,7 @@ acceptance("Sidebar - Plugin API", function (needs) {
 
     assert.strictEqual(
       query(
-        ".sidebar-section-test-chat-channels .sidebar-section-header-text"
+        ".sidebar-section[data-section-name='test-chat-channels'] .sidebar-section-header-text"
       ).textContent.trim(),
       "chat channels text",
       "displays header with correct text"
@@ -414,13 +459,15 @@ acceptance("Sidebar - Plugin API", function (needs) {
     );
 
     assert.ok(
-      !exists(".sidebar-section-test-chat-channels .sidebar-section-content a"),
+      !exists(
+        ".sidebar-section[data-section-name='test-chat-channels'] .sidebar-section-content a"
+      ),
       "displays no links"
     );
   });
 
   test("API bridge for decorating hamburger-menu widget with footer links", async function (assert) {
-    withPluginApi("1.3.0", (api) => {
+    withPluginApi(PLUGIN_API_VERSION, (api) => {
       api.decorateWidget("hamburger-menu:footerLinks", () => {
         return {
           route: "discovery.top",
@@ -433,11 +480,11 @@ acceptance("Sidebar - Plugin API", function (needs) {
     await visit("/");
 
     await click(
-      ".sidebar-section-community .sidebar-more-section-links-details-summary"
+      ".sidebar-section[data-section-name='community'] .sidebar-more-section-links-details-summary"
     );
 
     const myCustomTopSectionLink = query(
-      ".sidebar-section-community .sidebar-more-section-links-details-content-secondary .sidebar-section-link-my-custom-top"
+      ".sidebar-section[data-section-name='community'] .sidebar-more-section-links-details-content-main .sidebar-section-link[data-link-name='my-custom-top']"
     );
 
     assert.ok(
@@ -458,7 +505,7 @@ acceptance("Sidebar - Plugin API", function (needs) {
   });
 
   test("API bridge for decorating hamburger-menu widget with general links", async function (assert) {
-    withPluginApi("1.3.0", (api) => {
+    withPluginApi(PLUGIN_API_VERSION, (api) => {
       api.decorateWidget("hamburger-menu:generalLinks", () => {
         return {
           route: "discovery.latest",
@@ -499,7 +546,7 @@ acceptance("Sidebar - Plugin API", function (needs) {
     await visit("/");
 
     const customLatestSectionLink = query(
-      ".sidebar-section-community .sidebar-section-link-latest"
+      ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='latest']"
     );
 
     assert.ok(
@@ -519,11 +566,11 @@ acceptance("Sidebar - Plugin API", function (needs) {
     );
 
     await click(
-      ".sidebar-section-community .sidebar-more-section-links-details-summary"
+      ".sidebar-section[data-section-name='community'] .sidebar-more-section-links-details-summary"
     );
 
     const customUnreadSectionLink = query(
-      ".sidebar-section-community .sidebar-section-link-my-unreads"
+      ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='my-unreads']"
     );
 
     assert.ok(
@@ -543,7 +590,7 @@ acceptance("Sidebar - Plugin API", function (needs) {
     );
 
     const customTopSectionLInk = query(
-      ".sidebar-section-community .sidebar-section-link-my-custom-top"
+      ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='my-custom-top']"
     );
 
     assert.ok(
@@ -552,7 +599,7 @@ acceptance("Sidebar - Plugin API", function (needs) {
     );
 
     const openBugsSectionLink = query(
-      ".sidebar-section-community .sidebar-section-link-open-bugs"
+      ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='open-bugs']"
     );
 
     assert.ok(
@@ -567,14 +614,14 @@ acceptance("Sidebar - Plugin API", function (needs) {
 
     // close more links
     await click(
-      ".sidebar-section-community .sidebar-more-section-links-details-summary"
+      ".sidebar-section[data-section-name='community'] .sidebar-more-section-links-details-summary"
     );
 
     await visit("/t/internationalization-localization/280");
 
     assert.ok(
       exists(
-        ".sidebar-section-community .sidebar-section-link-my-favourite-topic.active"
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='my-favourite-topic'].active"
       ),
       "displays my favourite topic custom section link when current route matches the link's route"
     );
@@ -583,14 +630,14 @@ acceptance("Sidebar - Plugin API", function (needs) {
 
     assert.notOk(
       exists(
-        ".sidebar-section-community .sidebar-section-link-my-favourite-topic.active"
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link-my-favourite-topic.active"
       ),
       "does not display my favourite topic custom section link when current route does not match the link's route"
     );
   });
 
   test("Section that is not displayed via displaySection", async function (assert) {
-    withPluginApi("1.3.0", (api) => {
+    withPluginApi(PLUGIN_API_VERSION, (api) => {
       api.addSidebarSection((BaseCustomSidebarSection) => {
         return class extends BaseCustomSidebarSection {
           get name() {
@@ -629,14 +676,14 @@ acceptance("Sidebar - Plugin API", function (needs) {
     await visit("/");
 
     assert.notOk(
-      exists(".sidebar-section-test-chat-channels"),
+      exists(".sidebar-section[data-section-name='test-chat-channels']"),
       "does not display the section"
     );
   });
 
   test("Registering a custom countable for a section link in the user's sidebar categories section", async function (assert) {
     try {
-      return await withPluginApi("1.6.0", async (api) => {
+      return await withPluginApi(PLUGIN_API_VERSION, async (api) => {
         const categories = Site.current().categories;
         const category1 = categories[0];
         const category2 = categories[1];
@@ -684,31 +731,36 @@ acceptance("Sidebar - Plugin API", function (needs) {
 
         assert.ok(
           exists(
-            `.sidebar-section-link-${category1.name} .sidebar-section-link-suffix.unread`
+            `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] .sidebar-section-link-suffix.unread`
           ),
           "the right suffix is displayed when custom countable is active"
         );
 
         assert.strictEqual(
-          query(`.sidebar-section-link-${category1.name}`).pathname,
+          query(
+            `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] a`
+          ).pathname,
           `/c/${category1.name}/${category1.id}`,
           "does not use route configured for custom countable when user has elected not to show any counts in sidebar"
         );
 
         assert.notOk(
           exists(
-            `.sidebar-section-link-${category2.name} .sidebar-section-link-suffix.unread`
+            `.sidebar-section-link-wrapper[data-category-id="${category2.id}"] .sidebar-section-link-suffix.unread`
           ),
           "does not display suffix when custom countable is not registered"
         );
 
         updateCurrentUser({
-          sidebar_list_destination: UNREAD_LIST_DESTINATION,
+          user_option: {
+            sidebar_link_to_filtered_list: true,
+            sidebar_show_count_of_new_items: true,
+          },
         });
 
         assert.strictEqual(
           query(
-            `.sidebar-section-link-${category1.name} .sidebar-section-link-content-badge`
+            `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] .sidebar-section-link-content-badge`
           ).innerText.trim(),
           I18n.t("sidebar.unread_count", { count: 1 }),
           "displays the right badge text in section link when unread is present and custom countable is not prioritised over unread"
@@ -722,20 +774,24 @@ acceptance("Sidebar - Plugin API", function (needs) {
 
         assert.strictEqual(
           query(
-            `.sidebar-section-link-${category1.name} .sidebar-section-link-content-badge`
+            `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] .sidebar-section-link-content-badge`
           ).innerText.trim(),
           `some custom ${category1.topic_count}`,
           "displays the right badge text in section link when unread is present but custom countable is prioritised over unread"
         );
 
         assert.strictEqual(
-          query(`.sidebar-section-link-${category1.name}`).pathname,
+          query(
+            `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] a`
+          ).pathname,
           `/c/${category1.name}/${category1.id}/l/latest`,
           "has the right pathname for section link"
         );
 
         assert.strictEqual(
-          query(`.sidebar-section-link-${category1.name}`).search,
+          query(
+            `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] a`
+          ).search,
           "?status=open",
           "has the right query params for section link"
         );
@@ -744,4 +800,272 @@ acceptance("Sidebar - Plugin API", function (needs) {
       resetCustomCountables();
     }
   });
+
+  test("Customizing the icon used in a category section link to indicate that a category is read restricted", async function (assert) {
+    try {
+      return await withPluginApi(PLUGIN_API_VERSION, async (api) => {
+        const categories = Site.current().categories;
+        const category1 = categories[0];
+        category1.read_restricted = true;
+
+        updateCurrentUser({
+          sidebar_category_ids: [category1.id],
+        });
+
+        api.registerCustomCategorySectionLinkLockIcon("wrench");
+
+        await visit("/");
+
+        assert.ok(
+          exists(
+            `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] .prefix-badge.d-icon-wrench`
+          ),
+          "wrench icon is displayed for the section link's prefix badge"
+        );
+      });
+    } finally {
+      resetCustomCategoryLockIcon();
+    }
+  });
+
+  test("Customizing the prefix used in a category section link for a particular category", async function (assert) {
+    try {
+      return await withPluginApi(PLUGIN_API_VERSION, async (api) => {
+        const categories = Site.current().categories;
+        const category1 = categories[0];
+        category1.read_restricted = true;
+
+        updateCurrentUser({
+          sidebar_category_ids: [category1.id],
+        });
+
+        api.registerCustomCategorySectionLinkPrefix({
+          categoryId: category1.id,
+          prefixType: "icon",
+          prefixValue: "wrench",
+          prefixColor: "FF0000", // rgb(255, 0, 0)
+        });
+
+        await visit("/");
+
+        assert.ok(
+          exists(
+            `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] .prefix-icon.d-icon-wrench`
+          ),
+          "wrench icon is displayed for the section link's prefix icon"
+        );
+
+        assert.strictEqual(
+          query(
+            `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] .sidebar-section-link-prefix`
+          ).style.color,
+          "rgb(255, 0, 0)",
+          "section link's prefix icon has the right color"
+        );
+      });
+    } finally {
+      resetCustomCategorySectionLinkPrefix();
+    }
+  });
+
+  test("Customizing the prefix icon used in a tag section link for a particular tag", async function (assert) {
+    try {
+      return await withPluginApi(PLUGIN_API_VERSION, async (api) => {
+        updateCurrentUser({
+          display_sidebar_tags: true,
+          sidebar_tags: [
+            { name: "tag2", pm_only: false },
+            { name: "tag1", pm_only: false },
+            { name: "tag3", pm_only: false },
+          ],
+        });
+
+        api.registerCustomTagSectionLinkPrefixIcon({
+          tagName: "tag1",
+          prefixValue: "wrench",
+          prefixColor: "#FF0000", // rgb(255, 0, 0)
+        });
+
+        await visit("/");
+
+        assert.ok(
+          exists(
+            `.sidebar-section-link-wrapper[data-tag-name="tag1"] .prefix-icon.d-icon-wrench`
+          ),
+          "wrench icon is displayed for tag1 section link's prefix icon"
+        );
+
+        assert.strictEqual(
+          query(
+            `.sidebar-section-link-wrapper[data-tag-name="tag1"] .sidebar-section-link-prefix`
+          ).style.color,
+          "rgb(255, 0, 0)",
+          "tag1 section link's prefix icon has the right color"
+        );
+
+        assert.ok(
+          exists(
+            `.sidebar-section-link-wrapper[data-tag-name="tag2"] .prefix-icon.d-icon-tag`
+          ),
+          "default tag icon is displayed for tag2 section link's prefix icon"
+        );
+      });
+    } finally {
+      resetCustomTagSectionLinkPrefixIcons();
+    }
+  });
+
+  test("New custom sidebar panel and option to set default", async function (assert) {
+    withPluginApi(PLUGIN_API_VERSION, (api) => {
+      api.addSidebarPanel((BaseCustomSidebarPanel) => {
+        const ChatSidebarPanel = class extends BaseCustomSidebarPanel {
+          get key() {
+            return "new-panel";
+          }
+
+          get switchButtonLabel() {
+            "New panel";
+          }
+
+          get switchButtonIcon() {
+            return "d-chat";
+          }
+
+          get switchButtonDefaultUrl() {
+            return "/chat";
+          }
+        };
+        return ChatSidebarPanel;
+      });
+      api.addSidebarSection(
+        (BaseCustomSidebarSection, BaseCustomSidebarSectionLink) => {
+          return class extends BaseCustomSidebarSection {
+            get name() {
+              return "test-chat-channels";
+            }
+
+            get text() {
+              return "chat channels text";
+            }
+
+            get actionsIcon() {
+              return "cog";
+            }
+
+            get links() {
+              return [
+                new (class extends BaseCustomSidebarSectionLink {
+                  get name() {
+                    return "random-channel";
+                  }
+
+                  get classNames() {
+                    return "my-class-name";
+                  }
+
+                  get route() {
+                    return "topic";
+                  }
+
+                  get models() {
+                    return ["some-slug", 1];
+                  }
+
+                  get title() {
+                    return "random channel title";
+                  }
+
+                  get text() {
+                    return "random channel text";
+                  }
+
+                  get prefixType() {
+                    return "icon";
+                  }
+
+                  get prefixValue() {
+                    return "d-chat";
+                  }
+
+                  get prefixColor() {
+                    return "FF0000";
+                  }
+
+                  get prefixBadge() {
+                    return "lock";
+                  }
+
+                  get suffixType() {
+                    return "icon";
+                  }
+
+                  get suffixValue() {
+                    return "circle";
+                  }
+
+                  get suffixCSSClass() {
+                    return "unread";
+                  }
+                })(),
+              ];
+            }
+          };
+        },
+        "new-panel"
+      );
+      api.setSidebarPanel("new-panel");
+    });
+
+    await visit("/");
+
+    assert.strictEqual(
+      query(
+        ".sidebar-section[data-section-name='test-chat-channels'] .sidebar-section-header-text"
+      ).textContent.trim(),
+      "chat channels text",
+      "displays header with correct text"
+    );
+
+    await click(".sidebar__panel-switch-button");
+
+    assert
+      .dom(".sidebar-section[data-section-name='test-chat-channels']")
+      .doesNotExist();
+    assert.dom(".sidebar-sections + button").exists();
+
+    assert
+      .dom("#d-sidebar .sidebar-sections + .sidebar__panel-switch-button")
+      .exists();
+    assert
+      .dom("#d-sidebar .sidebar__panel-switch-button + .sidebar-sections")
+      .doesNotExist();
+
+    this.siteSettings.default_sidebar_switch_panel_position = "top";
+    await visit("/");
+
+    assert
+      .dom("#d-sidebar .sidebar-sections + .sidebar__panel-switch-button")
+      .doesNotExist();
+    assert
+      .dom("#d-sidebar .sidebar__panel-switch-button + .sidebar-sections")
+      .exists();
+
+    assert
+      .dom(
+        ".sidebar-section[data-section-name='test-chat-channels'] .sidebar-section-header-text"
+      )
+      .doesNotExist();
+
+    withPluginApi(PLUGIN_API_VERSION, (api) => {
+      api.setCombinedSidebarMode();
+    });
+    await visit("/");
+    assert.dom(".sidebar__panel-switch-button").doesNotExist();
+
+    assert
+      .dom(
+        ".sidebar-section[data-section-name='test-chat-channels'] .sidebar-section-header-text"
+      )
+      .exists();
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
index dd182b99b9c..0ccb3e5cacd 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
@@ -16,6 +16,7 @@ import discoveryFixture from "discourse/tests/fixtures/discovery-fixtures";
 import categoryFixture from "discourse/tests/fixtures/category-fixtures";
 import { cloneJSON } from "discourse-common/lib/object";
 import { NotificationLevels } from "discourse/lib/notification-levels";
+import { TOP_SITE_CATEGORIES_TO_SHOW } from "discourse/components/sidebar/common/categories-section";
 
 acceptance(
   "Sidebar - Logged on user - Categories Section - allow_uncategorized_topics disabled",
@@ -43,14 +44,16 @@ acceptance(
 
       assert.strictEqual(
         count(
-          ".sidebar-section-categories .sidebar-section-link:not(.sidebar-section-link-all-categories)"
+          ".sidebar-section[data-section-name='categories'] .sidebar-section-link:not(.sidebar-section-link[data-link-name='all-categories'])"
         ),
         1,
         "there should only be one section link under the section"
       );
 
       assert.ok(
-        exists(`.sidebar-section-link-${category1.slug}`),
+        exists(
+          `.sidebar-section-link-wrapper[data-category-id="${category1.id}"]`
+        ),
         `only the ${category1.slug} section link is shown`
       );
     });
@@ -113,10 +116,15 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
     setupUserSidebarCategories();
 
     await visit("/t/280");
-    await click(".sidebar-section-categories .sidebar-section-header");
+
+    await click(
+      ".sidebar-section[data-section-name='categories'] .sidebar-section-header"
+    );
 
     assert.notOk(
-      exists(".sidebar-section-categories .sidebar-section-content"),
+      exists(
+        ".sidebar-section[data-section-name='categories'] .sidebar-section-content"
+      ),
       "hides the content of the section"
     );
   });
@@ -125,54 +133,50 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
     setupUserSidebarCategories();
 
     await visit("/");
-    await click(".sidebar-section-categories .sidebar-section-header-button");
 
-    assert.strictEqual(
-      currentURL(),
-      "/u/eviltrout/preferences/sidebar",
-      "it should transition to user preferences sidebar page"
+    await click(
+      ".sidebar-section[data-section-name='categories'] .sidebar-section-header-button"
+    );
+
+    assert.true(
+      exists(".sidebar-categories-form"),
+      "it shows the categories form modal"
     );
   });
 
-  test("categories section is hidden when user has not added any categories and there are no default categories configured", async function (assert) {
+  test("categories section is shown with site's top categories when user has not added any categories and there are no default categories set for the user", async function (assert) {
     updateCurrentUser({ sidebar_category_ids: [] });
 
     await visit("/");
 
-    assert.notOk(
-      exists(".sidebar-section-categories"),
-      "categories section is not shown"
-    );
-  });
-
-  test("categories section is shown when user has not added any categories but default categories have been configured", async function (assert) {
-    updateCurrentUser({ sidebar_category_ids: [] });
-    const categories = Site.current().categories;
-    this.siteSettings.default_sidebar_categories = `${categories[0].id}|${categories[1].id}`;
-
-    await visit("/");
-
     assert.ok(
-      exists(".sidebar-section-categories"),
+      exists(".sidebar-section[data-section-name='categories']"),
       "categories section is shown"
     );
 
-    assert.ok(
-      exists(
-        ".sidebar-section-categories .sidebar-section-link-configure-categories"
-      ),
-      "section link to add categories to sidebar is displayed"
-    );
-
-    await click(
-      ".sidebar-section-categories .sidebar-section-link-configure-categories"
+    const categorySectionLinks = queryAll(
+      ".sidebar-section[data-section-name='categories'] .sidebar-section-link-wrapper[data-category-id]"
     );
 
     assert.strictEqual(
-      currentURL(),
-      "/u/eviltrout/preferences/sidebar",
-      "it should transition to user preferences sidebar page"
+      categorySectionLinks.length,
+      TOP_SITE_CATEGORIES_TO_SHOW,
+      "the right number of category section links are shown"
     );
+
+    const topCategories = Site.current().categoriesByCount.splice(
+      0,
+      TOP_SITE_CATEGORIES_TO_SHOW
+    );
+
+    topCategories.forEach((category) => {
+      assert.ok(
+        exists(
+          `.sidebar-section-link-wrapper[data-category-id=${category.id}]`
+        ),
+        `${category.name} section link is shown`
+      );
+    });
   });
 
   test("uncategorized category is shown when added to sidebar", async function (assert) {
@@ -187,7 +191,9 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
     await visit("/");
 
     assert.ok(
-      exists(`.sidebar-section-link-${uncategorizedCategory.slug}`),
+      exists(
+        `.sidebar-section-link-wrapper[data-category-id="${uncategorizedCategory.id}"]`
+      ),
       `displays the section link for ${uncategorizedCategory.slug} category`
     );
   });
@@ -235,7 +241,7 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
     await visit("/");
 
     const categorySectionLinks = queryAll(
-      ".sidebar-section-categories .sidebar-section-link:not(.sidebar-section-link-all-categories)"
+      ".sidebar-section[data-section-name='categories'] .sidebar-section-link:not(.sidebar-section-link[data-link-name='all-categories'])"
     );
 
     const categoryNames = [...categorySectionLinks].map((categorySectionLink) =>
@@ -298,7 +304,7 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
     await visit("/");
 
     const categorySectionLinks = queryAll(
-      ".sidebar-section-categories .sidebar-section-link:not(.sidebar-section-link-all-categories)"
+      ".sidebar-section[data-section-name='categories'] .sidebar-section-link:not(.sidebar-section-link[data-link-name='all-categories'])"
     );
 
     const categoryNames = [...categorySectionLinks].map((categorySectionLink) =>
@@ -361,7 +367,7 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
     await visit("/");
 
     const categorySectionLinks = queryAll(
-      ".sidebar-section-categories .sidebar-section-link:not(.sidebar-section-link-all-categories)"
+      ".sidebar-section[data-section-name='categories'] .sidebar-section-link:not(.sidebar-section-link[data-link-name='all-categories'])"
     );
 
     const categoryNames = [...categorySectionLinks].map((categorySectionLink) =>
@@ -389,7 +395,7 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
 
     assert.strictEqual(
       count(
-        ".sidebar-section-categories .sidebar-section-link:not(.sidebar-section-link-all-categories)"
+        ".sidebar-section[data-section-name='categories'] .sidebar-section-link:not(.sidebar-section-link[data-link-name='all-categories'])"
       ),
       4,
       "there should only be 4 section link under the section"
@@ -397,18 +403,22 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
 
     assert.ok(
       exists(
-        `.sidebar-section-link-${category1.slug} .sidebar-section-link-prefix .prefix-span[style="background: linear-gradient(90deg, #${category1.color} 50%, #${category1.color} 50%)"]`
+        `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] .sidebar-section-link-prefix .prefix-span[style="background: linear-gradient(90deg, #${category1.color} 50%, #${category1.color} 50%)"]`
       ),
       "category1 section link is rendered with solid prefix icon color"
     );
 
     assert.strictEqual(
-      query(`.sidebar-section-link-${category1.slug}`).textContent.trim(),
+      query(
+        `.sidebar-section-link-wrapper[data-category-id="${category1.id}"]`
+      ).textContent.trim(),
       category1.name,
       "displays category1's name for the link text"
     );
 
-    await click(`.sidebar-section-link-${category1.slug}`);
+    await click(
+      `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] a`
+    );
 
     assert.strictEqual(
       currentURL(),
@@ -417,17 +427,23 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
     );
 
     assert.strictEqual(
-      count(".sidebar-section-categories .sidebar-section-link.active"),
+      count(
+        ".sidebar-section[data-section-name='categories'] .sidebar-section-link.active"
+      ),
       1,
       "only one link is marked as active"
     );
 
     assert.ok(
-      exists(`.sidebar-section-link-${category1.slug}.active`),
+      exists(
+        `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] a.active`
+      ),
       "the category1 section link is marked as active"
     );
 
-    await click(`.sidebar-section-link-${category2.slug}`);
+    await click(
+      `.sidebar-section-link-wrapper[data-category-id="${category2.id}"] a`
+    );
 
     assert.strictEqual(
       currentURL(),
@@ -436,40 +452,48 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
     );
 
     assert.strictEqual(
-      count(".sidebar-section-categories .sidebar-section-link.active"),
+      count(
+        ".sidebar-section[data-section-name='categories'] .sidebar-section-link.active"
+      ),
       1,
       "only one link is marked as active"
     );
 
     assert.ok(
-      exists(`.sidebar-section-link-${category2.slug}.active`),
+      exists(
+        `.sidebar-section-link-wrapper[data-category-id="${category2.id}"] a.active`
+      ),
       "the category2 section link is marked as active"
     );
 
     assert.ok(
       exists(
-        `.sidebar-section-link-${category3.slug} .sidebar-section-link-prefix .prefix-badge.d-icon-lock`
+        `.sidebar-section-link-wrapper[data-category-id="${category3.id}"] .sidebar-section-link-prefix .prefix-badge.d-icon-lock`
       ),
       "category3 section link is rendered with lock prefix badge icon as it is read restricted"
     );
 
     assert.ok(
       exists(
-        `.sidebar-section-link-${category4.slug} .sidebar-section-link-prefix .prefix-span[style="background: linear-gradient(90deg, #${category4.parentCategory.color} 50%, #${category4.color} 50%)"]`
+        `.sidebar-section-link-wrapper[data-category-id="${category4.id}"] .sidebar-section-link-prefix .prefix-span[style="background: linear-gradient(90deg, #${category4.parentCategory.color} 50%, #${category4.color} 50%)"]`
       ),
       "sub category section link is rendered with double prefix color"
     );
   });
 
-  test("clicking section links - sidebar_list_destination set to unread/new and no unread or new topics", async function (assert) {
+  test("clicking section links - sidebar_link_to_filtered_list set to true and no unread or new topics", async function (assert) {
     updateCurrentUser({
-      sidebar_list_destination: "unread_new",
+      user_option: {
+        sidebar_link_to_filtered_list: true,
+      },
     });
     const { category1 } = setupUserSidebarCategories();
 
     await visit("/");
 
-    await click(`.sidebar-section-link-${category1.slug}`);
+    await click(
+      `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] a`
+    );
 
     assert.strictEqual(
       currentURL(),
@@ -478,18 +502,22 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
     );
 
     assert.strictEqual(
-      count(".sidebar-section-categories .sidebar-section-link.active"),
+      count(
+        ".sidebar-section[data-section-name='categories'] .sidebar-section-link.active"
+      ),
       1,
       "only one link is marked as active"
     );
 
     assert.ok(
-      exists(`.sidebar-section-link-${category1.slug}.active`),
+      exists(
+        `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] a.active`
+      ),
       "the category1 section link is marked as active"
     );
   });
 
-  test("clicking section links - sidebar_list_destination set to unread/new with new topics", async function (assert) {
+  test("clicking section links - sidebar_link_to_filtered_list set to true with new topics", async function (assert) {
     const { category1 } = setupUserSidebarCategories();
     const topicTrackingState = this.container.lookup(
       "service:topic-tracking-state"
@@ -502,12 +530,16 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
       created_in_new_period: true,
     });
     updateCurrentUser({
-      sidebar_list_destination: "unread_new",
+      user_option: {
+        sidebar_link_to_filtered_list: true,
+      },
     });
 
     await visit("/");
 
-    await click(`.sidebar-section-link-${category1.slug}`);
+    await click(
+      `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] a`
+    );
 
     assert.strictEqual(
       currentURL(),
@@ -516,18 +548,22 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
     );
 
     assert.strictEqual(
-      count(".sidebar-section-categories .sidebar-section-link.active"),
+      count(
+        ".sidebar-section[data-section-name='categories'] .sidebar-section-link.active"
+      ),
       1,
       "only one link is marked as active"
     );
 
     assert.ok(
-      exists(`.sidebar-section-link-${category1.slug}.active`),
+      exists(
+        `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] a.active`
+      ),
       "the category1 section link is marked as active"
     );
   });
 
-  test("clicking section links - sidebar_list_destination set to unread/new with new and unread topics", async function (assert) {
+  test("clicking section links - sidebar_link_to_filtered_list set to true with new and unread topics", async function (assert) {
     const { category1 } = setupUserSidebarCategories();
     const topicTrackingState = this.container.lookup(
       "service:topic-tracking-state"
@@ -548,12 +584,16 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
       created_in_new_period: true,
     });
     updateCurrentUser({
-      sidebar_list_destination: "unread_new",
+      user_option: {
+        sidebar_link_to_filtered_list: true,
+      },
     });
 
     await visit("/");
 
-    await click(`.sidebar-section-link-${category1.slug}`);
+    await click(
+      `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] a`
+    );
 
     assert.strictEqual(
       currentURL(),
@@ -562,13 +602,17 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
     );
 
     assert.strictEqual(
-      count(".sidebar-section-categories .sidebar-section-link.active"),
+      count(
+        ".sidebar-section[data-section-name='categories'] .sidebar-section-link.active"
+      ),
       1,
       "only one link is marked as active"
     );
 
     assert.ok(
-      exists(`.sidebar-section-link-${category1.slug}.active`),
+      exists(
+        `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] a.active`
+      ),
       "the category1 section link is marked as active"
     );
   });
@@ -581,7 +625,7 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
 
     assert.ok(
       exists(
-        `.sidebar-section-link-${category1.slug} .sidebar-section-link-prefix .prefix-span[style="background: linear-gradient(90deg, #888 50%, #888 50%)"]`
+        `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] .sidebar-section-link-prefix .prefix-span[style="background: linear-gradient(90deg, #888 50%, #888 50%)"]`
       ),
       "category1 section link is rendered with the right solid prefix icon color"
     );
@@ -600,7 +644,9 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
     await visit("/");
 
     assert.strictEqual(
-      query(`.sidebar-section-link-${category.slug}`).title,
+      query(
+        `.sidebar-section-link-wrapper[data-category-id="${category.id}"] a`
+      ).title,
       category.description_text,
       "category description without HTML entity is used as the link's title"
     );
@@ -612,13 +658,17 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
     await visit(`/c/${category1.slug}/${category1.id}/l/new`);
 
     assert.strictEqual(
-      count(".sidebar-section-categories .sidebar-section-link.active"),
+      count(
+        ".sidebar-section[data-section-name='categories'] .sidebar-section-link.active"
+      ),
       1,
       "only one link is marked as active"
     );
 
     assert.ok(
-      exists(`.sidebar-section-link-${category1.slug}.active`),
+      exists(
+        `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] a.active`
+      ),
       "the category1 section link is marked as active for the new route"
     );
   });
@@ -629,13 +679,17 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
     await visit(`/c/${category1.slug}/${category1.id}/l/unread`);
 
     assert.strictEqual(
-      count(".sidebar-section-categories .sidebar-section-link.active"),
+      count(
+        ".sidebar-section[data-section-name='categories'] .sidebar-section-link.active"
+      ),
       1,
       "only one link is marked as active"
     );
 
     assert.ok(
-      exists(`.sidebar-section-link-${category1.slug}.active`),
+      exists(
+        `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] a.active`
+      ),
       "the category1 section link is marked as active for the unread route"
     );
   });
@@ -646,13 +700,17 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
     await visit(`/c/${category1.slug}/${category1.id}/l/top`);
 
     assert.strictEqual(
-      count(".sidebar-section-categories .sidebar-section-link.active"),
+      count(
+        ".sidebar-section[data-section-name='categories'] .sidebar-section-link.active"
+      ),
       1,
       "only one link is marked as active"
     );
 
     assert.ok(
-      exists(`.sidebar-section-link-${category1.slug}.active`),
+      exists(
+        `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] a.active`
+      ),
       "the category1 section link is marked as active for the top route"
     );
   });
@@ -663,13 +721,17 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
     await visit(`/c/${category1.slug}/${category1.id}/none`);
 
     assert.strictEqual(
-      count(".sidebar-section-categories .sidebar-section-link.active"),
+      count(
+        ".sidebar-section[data-section-name='categories'] .sidebar-section-link.active"
+      ),
       1,
       "only one link is marked as active"
     );
 
     assert.ok(
-      exists(`.sidebar-section-link-${category1.slug}.active`),
+      exists(
+        `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] a.active`
+      ),
       "the category1 section link is marked as active for the none route"
     );
   });
@@ -680,13 +742,17 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
     await visit(`/c/${category1.slug}/${category1.id}/all`);
 
     assert.strictEqual(
-      count(".sidebar-section-categories .sidebar-section-link.active"),
+      count(
+        ".sidebar-section[data-section-name='categories'] .sidebar-section-link.active"
+      ),
       1,
       "only one link is marked as active"
     );
 
     assert.ok(
-      exists(`.sidebar-section-link-${category1.slug}.active`),
+      exists(
+        `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] a.active`
+      ),
       "the category1 section link is marked as active for the all route"
     );
   });
@@ -695,7 +761,9 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
     const { category1 } = setupUserSidebarCategories();
 
     updateCurrentUser({
-      sidebar_list_destination: "default",
+      user_option: {
+        sidebar_show_count_of_new_items: false,
+      },
     });
 
     this.container.lookup("service:topic-tracking-state").loadStates([
@@ -725,7 +793,7 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
 
     assert.ok(
       exists(
-        `.sidebar-section-link-${category1.slug} .sidebar-section-link-suffix`
+        `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] .sidebar-section-link-suffix`
       ),
       "shows suffix indicator for unread content on categories link"
     );
@@ -741,7 +809,7 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
 
     assert.ok(
       exists(
-        `.sidebar-section-link-${category1.slug} .sidebar-section-link-suffix`
+        `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] .sidebar-section-link-suffix`
       ),
       "shows suffix indicator for new topics on categories link"
     );
@@ -757,7 +825,7 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
 
     assert.ok(
       !exists(
-        `.sidebar-section-link-${category1.slug} .sidebar-section-link-suffix`
+        `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] .sidebar-section-link-suffix`
       ),
       "hides suffix indicator when there's no new/unread content on category link"
     );
@@ -767,7 +835,9 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
     const { category1, category2 } = setupUserSidebarCategories();
 
     updateCurrentUser({
-      sidebar_list_destination: "unread_new",
+      user_option: {
+        sidebar_show_count_of_new_items: true,
+      },
     });
 
     this.container.lookup("service:topic-tracking-state").loadStates([
@@ -817,7 +887,7 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
 
     assert.strictEqual(
       query(
-        `.sidebar-section-link-${category1.slug} .sidebar-section-link-content-badge`
+        `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] .sidebar-section-link-content-badge`
       ).textContent.trim(),
       I18n.t("sidebar.unread_count", { count: 1 }),
       `displays 1 unread count for ${category1.slug} section link`
@@ -825,7 +895,7 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
 
     assert.strictEqual(
       query(
-        `.sidebar-section-link-${category2.slug} .sidebar-section-link-content-badge`
+        `.sidebar-section-link-wrapper[data-category-id="${category2.id}"] .sidebar-section-link-content-badge`
       ).textContent.trim(),
       I18n.t("sidebar.unread_count", { count: 2 }),
       `displays 2 unread count for ${category2.slug} section link`
@@ -842,7 +912,7 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
 
     assert.strictEqual(
       query(
-        `.sidebar-section-link-${category1.slug} .sidebar-section-link-content-badge`
+        `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] .sidebar-section-link-content-badge`
       ).textContent.trim(),
       I18n.t("sidebar.new_count", { count: 1 }),
       `displays 1 new count for ${category1.slug} section link`
@@ -859,7 +929,7 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
 
     assert.ok(
       !exists(
-        `.sidebar-section-link-${category1.slug} .sidebar-section-link-content-badge`
+        `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] .sidebar-section-link-content-badge`
       ),
       `does not display any badge ${category1.slug} section link`
     );
@@ -875,7 +945,7 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
 
     assert.strictEqual(
       query(
-        `.sidebar-section-link-${category2.slug} .sidebar-section-link-content-badge`
+        `.sidebar-section-link-wrapper[data-category-id="${category2.id}"] .sidebar-section-link-content-badge`
       ).textContent.trim(),
       I18n.t("sidebar.unread_count", { count: 1 }),
       `displays 1 unread count for ${category2.slug} section link`
@@ -904,22 +974,325 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
   });
 
   test("section link to admin site settings page when default sidebar categories have not been configured", async function (assert) {
-    setupUserSidebarCategories();
     updateCurrentUser({ admin: true });
 
     await visit("/");
 
     assert.ok(
-      exists(".sidebar-section-link-configure-default-sidebar-categories"),
-      "section link to configure default sidebar categories is shown"
+      exists(
+        ".sidebar-section-link[data-link-name='configure-default-navigation-menu-categories']"
+      ),
+      "section link to configure default navigation menu categories is shown"
     );
 
-    await click(".sidebar-section-link-configure-default-sidebar-categories");
+    await click(
+      ".sidebar-section-link[data-link-name='configure-default-navigation-menu-categories']"
+    );
 
     assert.strictEqual(
       currentURL(),
-      "/admin/site_settings/category/all_results?filter=default_sidebar_categories",
+      "/admin/site_settings/category/all_results?filter=default_navigation_menu_categories",
       "it links to the admin site settings page correctly"
     );
   });
 });
+
+acceptance(
+  "Sidebar - Logged on user - Categories Section - New new view experiment enabled",
+  function (needs) {
+    needs.settings({
+      navigation_menu: "sidebar",
+    });
+
+    needs.user({ new_new_view_enabled: true });
+
+    test("count shown next to category link when sidebar_show_count_of_new_items is true", async function (assert) {
+      const categories = Site.current().categories;
+      const category1 = categories[0];
+      const category2 = categories[1];
+      const category3 = categories[2];
+
+      updateCurrentUser({
+        sidebar_category_ids: [category1.id, category2.id, category3.id],
+        user_option: {
+          sidebar_show_count_of_new_items: true,
+        },
+      });
+
+      this.container.lookup("service:topic-tracking-state").loadStates([
+        {
+          topic_id: 1,
+          highest_post_number: 1,
+          last_read_post_number: null,
+          created_at: "2022-05-11T03:09:31.959Z",
+          category_id: category1.id,
+          notification_level: null,
+          created_in_new_period: true,
+          treat_as_new_topic_start_date: "2022-05-09T03:17:34.286Z",
+        },
+        {
+          topic_id: 2,
+          highest_post_number: 12,
+          last_read_post_number: 11,
+          created_at: "2020-02-09T09:40:02.672Z",
+          category_id: category1.id,
+          notification_level: 2,
+          created_in_new_period: false,
+          treat_as_new_topic_start_date: "2022-05-09T03:17:34.286Z",
+        },
+        {
+          topic_id: 3,
+          highest_post_number: 15,
+          last_read_post_number: 15,
+          created_at: "2021-06-14T12:41:02.477Z",
+          category_id: category1.id,
+          notification_level: 2,
+          created_in_new_period: false,
+          treat_as_new_topic_start_date: "2022-05-09T03:17:34.286Z",
+        },
+        {
+          topic_id: 4,
+          highest_post_number: 10,
+          last_read_post_number: null,
+          created_at: "2022-05-11T03:09:31.959Z",
+          category_id: category2.id,
+          notification_level: null,
+          created_in_new_period: true,
+          treat_as_new_topic_start_date: "2022-05-09T03:17:34.286Z",
+        },
+        {
+          topic_id: 5,
+          highest_post_number: 19,
+          last_read_post_number: 18,
+          created_at: "2021-06-14T12:41:02.477Z",
+          category_id: category3.id,
+          notification_level: 2,
+          created_in_new_period: false,
+          treat_as_new_topic_start_date: "2022-05-09T03:17:34.286Z",
+        },
+      ]);
+
+      await visit("/");
+
+      assert.strictEqual(
+        query(
+          `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] .sidebar-section-link-content-badge`
+        ).textContent.trim(),
+        "2",
+        "count for category1 is 2 because it has 1 unread topic and 1 new topic"
+      );
+
+      assert.strictEqual(
+        query(
+          `.sidebar-section-link-wrapper[data-category-id="${category2.id}"] .sidebar-section-link-content-badge`
+        ).textContent.trim(),
+        "1",
+        "count for category2 is 1 because it has 1 new topic"
+      );
+
+      assert.strictEqual(
+        query(
+          `.sidebar-section-link-wrapper[data-category-id="${category3.id}"] .sidebar-section-link-content-badge`
+        ).textContent.trim(),
+        "1",
+        "count for category3 is 1 because it has 1 unread topic"
+      );
+    });
+
+    test("dot shown next to category link when sidebar_show_count_of_new_items is false", async function (assert) {
+      const categories = Site.current().categories;
+      const category1 = categories[0];
+      const category2 = categories[1];
+      const category3 = categories[2];
+
+      updateCurrentUser({
+        sidebar_category_ids: [category1.id, category2.id, category3.id],
+        user_option: {
+          sidebar_show_count_of_new_items: false,
+        },
+      });
+
+      this.container.lookup("service:topic-tracking-state").loadStates([
+        {
+          topic_id: 1,
+          highest_post_number: 1,
+          last_read_post_number: null,
+          created_at: "2022-05-11T03:09:31.959Z",
+          category_id: category1.id,
+          notification_level: null,
+          created_in_new_period: true,
+          treat_as_new_topic_start_date: "2022-05-09T03:17:34.286Z",
+        },
+        {
+          topic_id: 2,
+          highest_post_number: 12,
+          last_read_post_number: 11,
+          created_at: "2020-02-09T09:40:02.672Z",
+          category_id: category2.id,
+          notification_level: 2,
+          created_in_new_period: false,
+          treat_as_new_topic_start_date: "2022-05-09T03:17:34.286Z",
+        },
+      ]);
+
+      await visit("/");
+
+      assert
+        .dom(
+          `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] .sidebar-section-link-suffix.icon.unread`
+        )
+        .exists("category1 has a dot because it has a new topic");
+      assert
+        .dom(
+          `.sidebar-section-link-wrapper[data-category-id="${category2.id}"] .sidebar-section-link-suffix.icon.unread`
+        )
+        .exists("category2 has a dot because it has an unread topic");
+      assert
+        .dom(
+          `.sidebar-section-link-wrapper[data-category-id="${category3.id}"] .sidebar-section-link-suffix.icon.unread`
+        )
+        .doesNotExist(
+          "category3 doesn't have a dot because it has no new or unread topics"
+        );
+    });
+
+    test("category link href is the new topics list of the category when sidebar_link_to_filtered_list is true and there are unread/new topics in the category", async function (assert) {
+      const categories = Site.current().categories;
+      const category1 = categories[0];
+      const category2 = categories[1];
+      const category3 = categories[2];
+
+      updateCurrentUser({
+        sidebar_category_ids: [category1.id, category2.id, category3.id],
+        user_option: {
+          sidebar_link_to_filtered_list: true,
+        },
+      });
+
+      this.container.lookup("service:topic-tracking-state").loadStates([
+        {
+          topic_id: 1,
+          highest_post_number: 1,
+          last_read_post_number: null,
+          created_at: "2022-05-11T03:09:31.959Z",
+          category_id: category1.id,
+          notification_level: null,
+          created_in_new_period: true,
+          treat_as_new_topic_start_date: "2022-05-09T03:17:34.286Z",
+        },
+        {
+          topic_id: 2,
+          highest_post_number: 12,
+          last_read_post_number: 11,
+          created_at: "2020-02-09T09:40:02.672Z",
+          category_id: category2.id,
+          notification_level: 2,
+          created_in_new_period: false,
+          treat_as_new_topic_start_date: "2022-05-09T03:17:34.286Z",
+        },
+        {
+          topic_id: 3,
+          highest_post_number: 4,
+          last_read_post_number: 4,
+          created_at: "2020-02-09T09:40:02.672Z",
+          category_id: category3.id,
+          notification_level: 2,
+          created_in_new_period: false,
+          treat_as_new_topic_start_date: "2022-05-09T03:17:34.286Z",
+        },
+      ]);
+
+      await visit("/");
+
+      assert.true(
+        query(
+          `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] a`
+        ).href.endsWith("/c/meta/3/l/new"),
+        "links to the new topics list for the category because there's 1 new topic"
+      );
+
+      assert.true(
+        query(
+          `.sidebar-section-link-wrapper[data-category-id="${category2.id}"] a`
+        ).href.endsWith("/c/howto/10/l/new"),
+        "links to the new topics list for the category because there's 1 unread topic"
+      );
+
+      assert.true(
+        query(
+          `.sidebar-section-link-wrapper[data-category-id="${category3.id}"] a`
+        ).href.endsWith("/c/feature/spec/26"),
+        "links to the latest topics list for the category because there are no unread or new topics"
+      );
+    });
+
+    test("category link href is always the latest topics list when sidebar_link_to_filtered_list is false", async function (assert) {
+      const categories = Site.current().categories;
+      const category1 = categories[0];
+      const category2 = categories[1];
+      const category3 = categories[2];
+
+      updateCurrentUser({
+        sidebar_category_ids: [category1.id, category2.id, category3.id],
+        user_option: {
+          sidebar_link_to_filtered_list: false,
+        },
+      });
+
+      this.container.lookup("service:topic-tracking-state").loadStates([
+        {
+          topic_id: 1,
+          highest_post_number: 1,
+          last_read_post_number: null,
+          created_at: "2022-05-11T03:09:31.959Z",
+          category_id: category1.id,
+          notification_level: null,
+          created_in_new_period: true,
+          treat_as_new_topic_start_date: "2022-05-09T03:17:34.286Z",
+        },
+        {
+          topic_id: 2,
+          highest_post_number: 12,
+          last_read_post_number: 11,
+          created_at: "2020-02-09T09:40:02.672Z",
+          category_id: category2.id,
+          notification_level: 2,
+          created_in_new_period: false,
+          treat_as_new_topic_start_date: "2022-05-09T03:17:34.286Z",
+        },
+      ]);
+
+      await visit("/");
+
+      assert
+        .dom(
+          `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] a`
+        )
+        .hasAttribute(
+          "href",
+          "/c/meta/3",
+          "category1 links to the latest topics list for the category"
+        );
+
+      assert
+        .dom(
+          `.sidebar-section-link-wrapper[data-category-id="${category2.id}"] a`
+        )
+        .hasAttribute(
+          "href",
+          "/c/howto/10",
+          "category2 links to the latest topics list for the category"
+        );
+
+      assert
+        .dom(
+          `.sidebar-section-link-wrapper[data-category-id="${category3.id}"] a`
+        )
+        .hasAttribute(
+          "href",
+          "/c/feature/spec/26",
+          "category3 links to the latest topics list for the category"
+        );
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-community-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-community-section-test.js
index 41756649fe8..cab4af31383 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-community-section-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-community-section-test.js
@@ -1,5 +1,5 @@
 import I18n from "I18n";
-import { skip, test } from "qunit";
+import { test } from "qunit";
 import {
   click,
   currentRouteName,
@@ -25,6 +25,7 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
     tracked_tags: ["tag1"],
     watched_tags: ["tag2"],
     watching_first_post_tags: ["tag3"],
+    admin: false,
   });
 
   needs.settings({
@@ -45,90 +46,40 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
     });
   });
 
-  test("clicking on section header button", async function (assert) {
-    await visit("/");
-    await click(".sidebar-section-community .sidebar-section-header-button");
-
-    assert.ok(exists("#reply-control"), "it opens the composer");
-  });
-
-  test("clicking on section header button while viewing a category", async function (assert) {
-    await visit("/c/bug");
-    await click(".sidebar-section-community .sidebar-section-header-button");
-
-    assert.ok(exists("#reply-control"), "it opens the composer");
-
-    assert.strictEqual(
-      query(".category-input .selected-name .category-name").textContent,
-      "bug",
-      "the current category is prefilled in the composer input"
-    );
-  });
-
-  test("clicking on section header link", async function (assert) {
-    await visit("/t/280");
-
-    assert.ok(
-      exists(".sidebar-section-community .sidebar-section-content"),
-      "shows content section"
-    );
-
-    assert.strictEqual(
-      query(".sidebar-section-community .sidebar-section-header").title,
-      I18n.t("sidebar.toggle_section"),
-      "caret has the right title"
-    );
-
-    await click(".sidebar-section-community .sidebar-section-header");
-
-    assert.notOk(
-      exists(".sidebar-section-community .sidebar-section-content"),
-      "hides the content of the section"
-    );
-
-    await click(".sidebar-section-community .sidebar-section-header");
-
-    assert.ok(
-      exists(".sidebar-section-community .sidebar-section-content"),
-      "shows content section"
-    );
-  });
-
-  // TODO(tgxworld): Flaky probably due to assertions running before event listener callbacks have completed.
-  skip("clicking on more... link", async function (assert) {
+  test("clicking on more... link", async function (assert) {
     await visit("/");
 
     await click(
-      ".sidebar-section-community .sidebar-more-section-links-details-summary"
+      ".sidebar-section[data-section-name='community'] .sidebar-more-section-links-details-summary"
     );
 
     assert.ok(
       exists(
-        ".sidebar-section-community .sidebar-more-section-links-details-content"
+        ".sidebar-section[data-section-name='community'] .sidebar-more-section-links-details-content"
       ),
       "additional section links are displayed"
     );
 
     await click(
-      ".sidebar-section-community .sidebar-more-section-links-details-summary"
+      ".sidebar-section[data-section-name='community'] .sidebar-more-section-links-details-summary"
     );
 
     assert.notOk(
       exists(
-        ".sidebar-section-community .sidebar-more-section-links-details-content"
+        ".sidebar-section[data-section-name='community'] .sidebar-more-section-links-details-content"
       ),
       "additional section links are hidden"
     );
 
     await click(
-      ".sidebar-section-community .sidebar-more-section-links-details-summary"
+      ".sidebar-section[data-section-name='community'] .sidebar-more-section-links-details-summary"
     );
 
     await click("#main-outlet");
 
     assert.notOk(
       exists(
-        ".sidebar-section-community .sidebar-more-section-links-details-content"
+        ".sidebar-section[data-section-name='community'] .sidebar-more-section-links-details-content"
       ),
       "additional section links are hidden when clicking outside"
     );
@@ -136,7 +87,9 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
 
   test("clicking on everything link", async function (assert) {
     await visit("/t/280");
-    await click(".sidebar-section-community .sidebar-section-link-everything");
+    await click(
+      ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='everything']"
+    );
 
     assert.strictEqual(
       currentURL(),
@@ -145,26 +98,32 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
     );
 
     assert.strictEqual(
-      count(".sidebar-section-community .sidebar-section-link.active"),
+      count(
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link.active"
+      ),
       1,
       "only one link is marked as active"
     );
 
     assert.ok(
       exists(
-        ".sidebar-section-community .sidebar-section-link-everything.active"
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='everything'].active"
       ),
       "the everything link is marked as active"
     );
   });
 
-  test("clicking on everything link - sidebar_list_destination set to unread/new and no unread or new topics", async function (assert) {
+  test("clicking on everything link - sidebar_link_to_filtered_list set to true and no unread or new topics", async function (assert) {
     updateCurrentUser({
-      sidebar_list_destination: "unread_new",
+      user_option: {
+        sidebar_link_to_filtered_list: true,
+      },
     });
 
     await visit("/t/280");
-    await click(".sidebar-section-community .sidebar-section-link-everything");
+    await click(
+      ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='everything']"
+    );
     assert.strictEqual(
       currentURL(),
       "/latest",
@@ -172,20 +131,22 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
     );
 
     assert.strictEqual(
-      count(".sidebar-section-community .sidebar-section-link.active"),
+      count(
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link.active"
+      ),
       1,
       "only one link is marked as active"
     );
 
     assert.ok(
       exists(
-        ".sidebar-section-community .sidebar-section-link-everything.active"
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='everything'].active"
       ),
       "the everything link is marked as active"
     );
   });
 
-  test("clicking on everything link - sidebar_list_destination set to unread/new with new topics", async function (assert) {
+  test("clicking on everything link - sidebar_link_to_filtered_list set to true with new topics", async function (assert) {
     const topicTrackingState = this.container.lookup(
       "service:topic-tracking-state"
     );
@@ -197,10 +158,14 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
       created_in_new_period: true,
     });
     updateCurrentUser({
-      sidebar_list_destination: "unread_new",
+      user_option: {
+        sidebar_link_to_filtered_list: true,
+      },
     });
     await visit("/t/280");
-    await click(".sidebar-section-community .sidebar-section-link-everything");
+    await click(
+      ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='everything']"
+    );
 
     assert.strictEqual(
       currentURL(),
@@ -209,20 +174,22 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
     );
 
     assert.strictEqual(
-      count(".sidebar-section-community .sidebar-section-link.active"),
+      count(
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link.active"
+      ),
       1,
       "only one link is marked as active"
     );
 
     assert.ok(
       exists(
-        ".sidebar-section-community .sidebar-section-link-everything.active"
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='everything'].active"
       ),
       "the everything link is marked as active"
     );
   });
 
-  test("clicking on everything link - sidebar_list_destination set to unread/new with new and unread topics", async function (assert) {
+  test("clicking on everything link - sidebar_link_to_filtered_list set to true with new and unread topics", async function (assert) {
     const topicTrackingState = this.container.lookup(
       "service:topic-tracking-state"
     );
@@ -242,10 +209,14 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
       created_in_new_period: true,
     });
     updateCurrentUser({
-      sidebar_list_destination: "unread_new",
+      user_option: {
+        sidebar_link_to_filtered_list: true,
+      },
     });
     await visit("/t/280");
-    await click(".sidebar-section-community .sidebar-section-link-everything");
+    await click(
+      ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='everything']"
+    );
 
     assert.strictEqual(
       currentURL(),
@@ -254,14 +225,16 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
     );
 
     assert.strictEqual(
-      count(".sidebar-section-community .sidebar-section-link.active"),
+      count(
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link.active"
+      ),
       1,
       "only one link is marked as active"
     );
 
     assert.ok(
       exists(
-        ".sidebar-section-community .sidebar-section-link-everything.active"
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='everything'].active"
       ),
       "the everything link is marked as active"
     );
@@ -271,15 +244,19 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
     await visit("/t/280");
 
     assert.notOk(
-      exists(".sidebar-section-community .sidebar-section-link-users"),
+      exists(
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='users']"
+      ),
       "users link is not displayed in sidebar when it is not the active route"
     );
 
     await click(
-      ".sidebar-section-community .sidebar-more-section-links-details-summary"
+      ".sidebar-section[data-section-name='community'] .sidebar-more-section-links-details-summary"
     );
 
-    await click(".sidebar-section-community .sidebar-section-link-users");
+    await click(
+      ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='users']"
+    );
 
     assert.strictEqual(
       currentURL(),
@@ -288,19 +265,23 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
     );
 
     assert.strictEqual(
-      count(".sidebar-section-community .sidebar-section-link.active"),
+      count(
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link.active"
+      ),
       1,
       "only one link is marked as active"
     );
 
     assert.ok(
-      exists(".sidebar-section-community .sidebar-section-link-users.active"),
+      exists(
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='users'].active"
+      ),
       "the users link is marked as active"
     );
 
     assert.strictEqual(
       query(
-        ".sidebar-section-community .sidebar-more-section-links-details-summary"
+        ".sidebar-section[data-section-name='community'] .sidebar-more-section-links-details-summary"
       ).textContent.trim(),
       I18n.t("sidebar.more"),
       "displays the right count as users link is currently active"
@@ -309,7 +290,9 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
     await visit("/u");
 
     assert.ok(
-      exists(".sidebar-section-community .sidebar-section-link-users.active"),
+      exists(
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='users'].active"
+      ),
       "users link is displayed in sidebar when it is the active route"
     );
   });
@@ -320,11 +303,13 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
     await visit("/");
 
     await click(
-      ".sidebar-section-community .sidebar-more-section-links-details-summary"
+      ".sidebar-section[data-section-name='community'] .sidebar-more-section-links-details-summary"
     );
 
     assert.notOk(
-      exists(".sidebar-section-community .sidebar-section-link-users"),
+      exists(
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='users']"
+      ),
       "users section link is not displayed in sidebar"
     );
   });
@@ -333,10 +318,12 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
     await visit("/");
 
     await click(
-      ".sidebar-section-community .sidebar-more-section-links-details-summary"
+      ".sidebar-section[data-section-name='community'] .sidebar-more-section-links-details-summary"
     );
 
-    await click(".sidebar-section-community .sidebar-section-link-badges");
+    await click(
+      ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='badges']"
+    );
 
     assert.strictEqual(
       currentURL(),
@@ -351,11 +338,13 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
     await visit("/");
 
     await click(
-      ".sidebar-section-community .sidebar-more-section-links-details-summary"
+      ".sidebar-section[data-section-name='community'] .sidebar-more-section-links-details-summary"
     );
 
     assert.notOk(
-      exists(".sidebar-section-community .sidebar-section-link-badges"),
+      exists(
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='badges']"
+      ),
       "badges section link is not shown in sidebar"
     );
   });
@@ -364,15 +353,19 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
     await visit("/t/280");
 
     assert.notOk(
-      exists(".sidebar-section-community .sidebar-section-link-groups"),
+      exists(
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='groups']"
+      ),
       "groups link is not displayed in sidebar when it is not the active route"
     );
 
     await click(
-      ".sidebar-section-community .sidebar-more-section-links-details-summary"
+      ".sidebar-section[data-section-name='community'] .sidebar-more-section-links-details-summary"
     );
 
-    await click(".sidebar-section-community .sidebar-section-link-groups");
+    await click(
+      ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='groups']"
+    );
 
     assert.strictEqual(
       currentURL(),
@@ -381,19 +374,23 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
     );
 
     assert.strictEqual(
-      count(".sidebar-section-community .sidebar-section-link.active"),
+      count(
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link.active"
+      ),
       1,
       "only one link is marked as active"
     );
 
     assert.ok(
-      exists(".sidebar-section-community .sidebar-section-link-groups.active"),
+      exists(
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='groups'].active"
+      ),
       "the groups link is marked as active"
     );
 
     assert.strictEqual(
       query(
-        ".sidebar-section-community .sidebar-more-section-links-details-summary"
+        ".sidebar-section[data-section-name='community'] .sidebar-more-section-links-details-summary"
       ).textContent.trim(),
       I18n.t("sidebar.more"),
       "displays the right count as groups link is currently active"
@@ -402,7 +399,9 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
     await visit("/g");
 
     assert.ok(
-      exists(".sidebar-section-community .sidebar-section-link-groups.active"),
+      exists(
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='groups'].active"
+      ),
       "groups link is displayed in sidebar when it is the active route"
     );
   });
@@ -413,11 +412,13 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
     await visit("/");
 
     await click(
-      ".sidebar-section-community .sidebar-more-section-links-details-summary"
+      ".sidebar-section[data-section-name='community'] .sidebar-more-section-links-details-summary"
     );
 
     assert.notOk(
-      exists(".sidebar-section-community .sidebar-section-link-groups"),
+      exists(
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='groups']"
+      ),
       "groups section link is not shown in sidebar"
     );
   });
@@ -426,10 +427,12 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
     await visit("/");
 
     await click(
-      ".sidebar-section-community .sidebar-more-section-links-details-summary"
+      ".sidebar-section[data-section-name='community'] .sidebar-more-section-links-details-summary"
     );
 
-    await click(".sidebar-section-community .sidebar-section-link-about");
+    await click(
+      ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='about']"
+    );
 
     assert.strictEqual(
       currentURL(),
@@ -438,7 +441,9 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
     );
 
     assert.ok(
-      exists(".sidebar-section-community .sidebar-section-link-about.active"),
+      exists(
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='about'].active"
+      ),
       "about section link link is displayed in the main section and marked as active"
     );
   });
@@ -447,10 +452,12 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
     await visit("/");
 
     await click(
-      ".sidebar-section-community .sidebar-more-section-links-details-summary"
+      ".sidebar-section[data-section-name='community'] .sidebar-more-section-links-details-summary"
     );
 
-    await click(".sidebar-section-community .sidebar-section-link-faq");
+    await click(
+      ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='faq']"
+    );
 
     assert.strictEqual(
       currentURL(),
@@ -465,11 +472,13 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
     await visit("/");
 
     await click(
-      ".sidebar-section-community .sidebar-more-section-links-details-summary"
+      ".sidebar-section[data-section-name='community'] .sidebar-more-section-links-details-summary"
     );
 
     assert.strictEqual(
-      query(".sidebar-section-community .sidebar-section-link-faq").href,
+      query(
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='faq']"
+      ).href,
       "http://some.faq.url/",
       "href attribute is set to custom FAQ URL on the section link"
     );
@@ -477,7 +486,9 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
 
   test("navigating to admin from sidebar", async function (assert) {
     await visit("/");
-    await click(".sidebar-section-community .sidebar-section-link-admin");
+    await click(
+      ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='admin']"
+    );
 
     assert.strictEqual(currentRouteName(), "admin.dashboard.general");
   });
@@ -488,13 +499,17 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
     await visit("/");
 
     assert.notOk(
-      exists(".sidebar-section-community .sidebar-section-link-admin")
+      exists(
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='admin']"
+      )
     );
   });
 
   test("clicking on my posts link", async function (assert) {
     await visit("/t/280");
-    await click(".sidebar-section-community .sidebar-section-link-my-posts");
+    await click(
+      ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='my-posts']"
+    );
 
     assert.strictEqual(
       currentURL(),
@@ -503,14 +518,16 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
     );
 
     assert.strictEqual(
-      count(".sidebar-section-community .sidebar-section-link.active"),
+      count(
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link.active"
+      ),
       1,
       "only one link is marked as active"
     );
 
     assert.ok(
       exists(
-        ".sidebar-section-community .sidebar-section-link-my-posts.active"
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='my-posts'].active"
       ),
       "the my posts link is marked as active"
     );
@@ -519,7 +536,7 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
 
     assert.notOk(
       exists(
-        ".sidebar-section-community .sidebar-section-link-my-posts.active"
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='my-posts'].active"
       ),
       "the my posts link is not marked as active when user has no drafts and visiting the user activity drafts URL"
     );
@@ -532,7 +549,9 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
       draft_count: 1,
     });
 
-    await click(".sidebar-section-community .sidebar-section-link-my-posts");
+    await click(
+      ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='my-posts']"
+    );
 
     assert.strictEqual(
       currentURL(),
@@ -541,14 +560,16 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
     );
 
     assert.strictEqual(
-      count(".sidebar-section-community .sidebar-section-link.active"),
+      count(
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link.active"
+      ),
       1,
       "only one link is marked as active"
     );
 
     assert.ok(
       exists(
-        ".sidebar-section-community .sidebar-section-link-my-posts.active"
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='my-posts'].active"
       ),
       "the my posts link is marked as active"
     );
@@ -557,7 +578,7 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
 
     assert.ok(
       exists(
-        ".sidebar-section-community .sidebar-section-link-my-posts.active"
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='my-posts'].active"
       ),
       "the my posts link is marked as active"
     );
@@ -567,7 +588,7 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
     await visit("/");
 
     assert.strictEqual(
-      query(".sidebar-section-link-my-posts").title,
+      query(".sidebar-section-link[data-link-name='my-posts']").title,
       I18n.t("sidebar.sections.community.links.my_posts.title"),
       "displays the default title when no drafts are present"
     );
@@ -577,24 +598,63 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
     });
 
     assert.strictEqual(
-      query(".sidebar-section-link-my-posts").title,
+      query(".sidebar-section-link[data-link-name='my-posts']").title,
       I18n.t("sidebar.sections.community.links.my_posts.title_drafts"),
       "displays the draft title when drafts are present"
     );
   });
 
+  test("my posts changes its text when drafts are present and new new view experiment is enabled", async function (assert) {
+    updateCurrentUser({
+      user_option: {
+        sidebar_show_count_of_new_items: true,
+      },
+      new_new_view_enabled: true,
+    });
+    await visit("/");
+
+    assert.strictEqual(
+      query(
+        ".sidebar-section-link[data-link-name='my-posts']"
+      ).textContent.trim(),
+      I18n.t("sidebar.sections.community.links.my_posts.content"),
+      "displays the default text when no drafts are present"
+    );
+
+    await publishToMessageBus(`/user-drafts/${loggedInUser().id}`, {
+      draft_count: 1,
+    });
+
+    assert.strictEqual(
+      query(
+        ".sidebar-section-link[data-link-name='my-posts'] .sidebar-section-link-content-text"
+      ).textContent.trim(),
+      I18n.t("sidebar.sections.community.links.my_posts.content_drafts"),
+      "displays the text that's appropriate for when drafts are present"
+    );
+    assert.strictEqual(
+      query(
+        ".sidebar-section-link[data-link-name='my-posts'] .sidebar-section-link-content-badge"
+      ).textContent.trim(),
+      "1",
+      "displays the draft count with no text"
+    );
+  });
+
   test("visiting top route", async function (assert) {
     await visit("/top");
 
     assert.strictEqual(
-      count(".sidebar-section-community .sidebar-section-link.active"),
+      count(
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link.active"
+      ),
       1,
       "only one link is marked as active"
     );
 
     assert.ok(
       exists(
-        ".sidebar-section-community .sidebar-section-link-everything.active"
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='everything'].active"
       ),
       "the everything link is marked as active"
     );
@@ -604,14 +664,16 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
     await visit("/unread");
 
     assert.strictEqual(
-      count(".sidebar-section-community .sidebar-section-link.active"),
+      count(
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link.active"
+      ),
       1,
       "only one link is marked as active"
     );
 
     assert.ok(
       exists(
-        ".sidebar-section-community .sidebar-section-link-everything.active"
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='everything'].active"
       ),
       "the everything link is marked as active"
     );
@@ -621,14 +683,16 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
     await visit("/new");
 
     assert.strictEqual(
-      count(".sidebar-section-community .sidebar-section-link.active"),
+      count(
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link.active"
+      ),
       1,
       "only one link is marked as active"
     );
 
     assert.ok(
       exists(
-        ".sidebar-section-community .sidebar-section-link-everything.active"
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='everything'].active"
       ),
       "the everything link is marked as active"
     );
@@ -636,7 +700,9 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
 
   test("show suffix indicator for unread and new content on everything link", async function (assert) {
     updateCurrentUser({
-      sidebar_list_destination: "default",
+      user_option: {
+        sidebar_show_count_of_new_items: false,
+      },
     });
 
     this.container.lookup("service:topic-tracking-state").loadStates([
@@ -665,10 +731,20 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
     await visit("/");
 
     assert.ok(
-      exists(".sidebar-section-link-everything .sidebar-section-link-suffix"),
+      exists(
+        ".sidebar-section-link[data-link-name='everything'] .sidebar-section-link-suffix"
+      ),
       "shows suffix indicator for unread posts on everything link"
     );
 
+    const topicTrackingState = this.container.lookup(
+      "service:topic-tracking-state"
+    );
+
+    const initialCallbackCount = Object.keys(
+      topicTrackingState.stateChangeCallbacks
+    ).length;
+
     // simulate reading topic 2
     await publishToMessageBus("/unread", {
       topic_id: 2,
@@ -681,10 +757,18 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
     });
 
     assert.ok(
-      exists(".sidebar-section-link-everything .sidebar-section-link-suffix"),
+      exists(
+        ".sidebar-section-link[data-link-name='everything'] .sidebar-section-link-suffix"
+      ),
       "shows suffix indicator for new topics on categories link"
     );
 
+    assert.equal(
+      Object.keys(topicTrackingState.stateChangeCallbacks).length,
+      initialCallbackCount,
+      "it does not add a new topic tracking state callback when the topic is read"
+    );
+
     // simulate reading topic 1
     await publishToMessageBus("/unread", {
       topic_id: 1,
@@ -697,14 +781,18 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
     });
 
     assert.ok(
-      !exists(".sidebar-section-link-everything .sidebar-section-link-suffix"),
+      !exists(
+        ".sidebar-section-link[data-link-name='everything'] .sidebar-section-link-suffix"
+      ),
       "it removes the suffix indicator when all topics are read"
     );
   });
 
   test("new and unread count for everything link", async function (assert) {
     updateCurrentUser({
-      sidebar_list_destination: "unread_new",
+      user_option: {
+        sidebar_show_count_of_new_items: true,
+      },
     });
 
     this.container.lookup("service:topic-tracking-state").loadStates([
@@ -754,7 +842,7 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
 
     assert.strictEqual(
       query(
-        ".sidebar-section-link-everything .sidebar-section-link-content-badge"
+        ".sidebar-section-link[data-link-name='everything'] .sidebar-section-link-content-badge"
       ).textContent.trim(),
       "3 unread",
       "it displays the right unread count"
@@ -773,7 +861,7 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
 
     assert.strictEqual(
       query(
-        ".sidebar-section-link-everything .sidebar-section-link-content-badge"
+        ".sidebar-section-link[data-link-name='everything'] .sidebar-section-link-content-badge"
       ).textContent.trim(),
       "2 unread",
       "it updates the unread count"
@@ -803,7 +891,7 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
 
     assert.strictEqual(
       query(
-        ".sidebar-section-link-everything .sidebar-section-link-content-badge"
+        ".sidebar-section-link[data-link-name='everything'] .sidebar-section-link-content-badge"
       ).textContent.trim(),
       "1 new",
       "it displays the new count once there are no unread topics"
@@ -821,7 +909,7 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
 
     assert.ok(
       !exists(
-        ".sidebar-section-link-everything .sidebar-section-link-content-badge"
+        ".sidebar-section-link[data-link-name='everything'] .sidebar-section-link-content-badge"
       ),
       "it removes new count once there are no new topics"
     );
@@ -833,16 +921,20 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
     await visit("/");
 
     assert.notOk(
-      exists(".sidebar-section-community .sidebar-section-link-review"),
+      exists(
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='review']"
+      ),
       "review link is not shown"
     );
 
     await click(
-      ".sidebar-section-community .sidebar-more-section-links-details-summary"
+      ".sidebar-section[data-section-name='community'] .sidebar-more-section-links-details-summary"
     );
 
     assert.notOk(
-      exists(".sidebar-section-community .sidebar-section-link-review"),
+      exists(
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='review']"
+      ),
       "review link is not shown"
     );
   });
@@ -853,55 +945,61 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
       reviewable_count: 0,
     });
 
-    await visit("/reivew");
+    await visit("/review");
 
-    assert.notOk(
-      exists(".sidebar-section-community .sidebar-section-link-review.active"),
+    assert.ok(
+      exists(
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='review'].active"
+      ),
       "review link is shown as active when visiting the review route even if there are no pending reviewables"
     );
 
     await visit("/");
 
     assert.notOk(
-      exists(".sidebar-section-community .sidebar-section-link-review"),
+      exists(
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='review']"
+      ),
       "review link is not shown as part of the main section links"
     );
 
     await click(
-      ".sidebar-section-community .sidebar-more-section-links-details-summary"
+      ".sidebar-section[data-section-name='community'] .sidebar-more-section-links-details-summary"
     );
 
     assert.ok(
       exists(
-        ".sidebar-section-community .sidebar-more-section-links-details-content .sidebar-section-link-review"
+        ".sidebar-section[data-section-name='community'] .sidebar-more-section-links-details-content .sidebar-section-link[data-link-name='review']"
       ),
       "review link is displayed in the more drawer"
     );
 
-    await publishToMessageBus("/reviewable_counts", {
+    await publishToMessageBus(`/reviewable_counts/${loggedInUser().id}`, {
       reviewable_count: 34,
     });
 
     assert.ok(
-      exists(".sidebar-section-community .sidebar-section-link-review"),
+      exists(
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='review']"
+      ),
       "review link is shown as part of the main section links"
     );
 
     assert.strictEqual(
       query(
-        ".sidebar-section-community .sidebar-section-link-review .sidebar-section-link-content-badge"
+        ".sidebar-section[data-section-name='community'] .sidebar-section-link[data-link-name='review'] .sidebar-section-link-content-badge"
       ).textContent.trim(),
       "34 pending",
       "displays the pending reviewable count"
     );
 
     await click(
-      ".sidebar-section-community .sidebar-more-section-links-details-summary"
+      ".sidebar-section[data-section-name='community'] .sidebar-more-section-links-details-summary"
     );
 
     assert.notOk(
       exists(
-        ".sidebar-section-community .sidebar-more-section-links-details-content .sidebar-section-link-review"
+        ".sidebar-section[data-section-name='community'] .sidebar-more-section-links-details-content .sidebar-section-link[data-link-name='review']"
       ),
       "review link is not displayed in the more drawer"
     );
@@ -914,28 +1012,38 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
         route: "discovery.unread",
         text: "unread topics",
         title: "List of unread topics",
+        icon: "wrench",
       });
     });
 
     await visit("/");
 
     await click(
-      ".sidebar-section-community .sidebar-more-section-links-details-summary"
+      ".sidebar-section[data-section-name='community'] .sidebar-more-section-links-details-summary"
     );
 
     assert.strictEqual(
-      query(".sidebar-section-link-unread").textContent.trim(),
+      query(
+        ".sidebar-section-link[data-link-name='unread']"
+      ).textContent.trim(),
       "unread topics",
       "displays the right text for the link"
     );
 
     assert.strictEqual(
-      query(".sidebar-section-link-unread").title,
+      query(".sidebar-section-link[data-link-name='unread']").title,
       "List of unread topics",
       "displays the right title for the link"
     );
 
-    await click(".sidebar-section-link-unread");
+    assert.ok(
+      exists(
+        ".sidebar-section-link[data-link-name='unread'] .sidebar-section-link-prefix.icon .d-icon-wrench"
+      ),
+      "displays the wrench icon for the link"
+    );
+
+    await click(".sidebar-section-link[data-link-name='unread']");
 
     assert.strictEqual(currentURL(), "/unread", "links to the right URL");
   });
@@ -976,10 +1084,10 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
     await visit("/");
 
     await click(
-      ".sidebar-section-community .sidebar-more-section-links-details-summary"
+      ".sidebar-section[data-section-name='community'] .sidebar-more-section-links-details-summary"
     );
 
-    await click(".sidebar-section-link-user-summary");
+    await click(".sidebar-section-link[data-link-name='user-summary']");
 
     assert.strictEqual(
       currentURL(),
@@ -988,19 +1096,283 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
     );
 
     assert.strictEqual(
-      query(".sidebar-section-link-user-summary").textContent.trim(),
+      query(
+        ".sidebar-section-link[data-link-name='user-summary']"
+      ).textContent.trim(),
       "my summary",
       "displays the right text for the link"
     );
 
     assert.strictEqual(
-      query(".sidebar-section-link-user-summary").title,
+      query(".sidebar-section-link[data-link-name='user-summary']").title,
       "eviltrout summary",
       "displays the right title for the link"
     );
 
+    assert.ok(
+      exists(
+        ".sidebar-section-link[data-link-name='user-summary'] .sidebar-section-link-prefix.icon .d-icon-link"
+      ),
+      "displays the link icon for the link"
+    );
+
     await click(".btn-sidebar-toggle");
 
     assert.ok(teardownCalled, "section link teardown callback was called");
   });
 });
+
+acceptance(
+  "Sidebar - Logged on user - Community Section - New new view experiment enabled",
+  function (needs) {
+    needs.user({
+      new_new_view_enabled: true,
+    });
+
+    needs.settings({
+      navigation_menu: "sidebar",
+    });
+
+    test("count is shown next to the everything link when sidebar_show_count_of_new_items is true", async function (assert) {
+      updateCurrentUser({
+        user_option: {
+          sidebar_show_count_of_new_items: true,
+        },
+      });
+      this.container.lookup("service:topic-tracking-state").loadStates([
+        {
+          topic_id: 1,
+          highest_post_number: 1,
+          last_read_post_number: null,
+          created_at: "2022-05-11T03:09:31.959Z",
+          category_id: 1,
+          notification_level: null,
+          created_in_new_period: true,
+          treat_as_new_topic_start_date: "2022-05-09T03:17:34.286Z",
+        },
+        {
+          topic_id: 2,
+          highest_post_number: 12,
+          last_read_post_number: 11,
+          created_at: "2020-02-09T09:40:02.672Z",
+          category_id: 2,
+          notification_level: 2,
+          created_in_new_period: false,
+          treat_as_new_topic_start_date: "2022-05-09T03:17:34.286Z",
+        },
+        {
+          topic_id: 3,
+          highest_post_number: 12,
+          last_read_post_number: 12,
+          created_at: "2020-02-09T09:40:02.672Z",
+          category_id: 2,
+          notification_level: 2,
+          created_in_new_period: false,
+          treat_as_new_topic_start_date: "2022-05-09T03:17:34.286Z",
+        },
+      ]);
+
+      await visit("/");
+
+      assert.strictEqual(
+        query(
+          ".sidebar-section-link[data-link-name='everything'] .sidebar-section-link-content-badge"
+        ).textContent.trim(),
+        "2",
+        "count is 2 because there's 1 unread topic and 1 new topic"
+      );
+    });
+
+    test("dot is shown next to the everything link when sidebar_show_count_of_new_items is false", async function (assert) {
+      updateCurrentUser({
+        user_option: {
+          sidebar_show_count_of_new_items: false,
+        },
+      });
+      this.container.lookup("service:topic-tracking-state").loadStates([
+        {
+          topic_id: 1,
+          highest_post_number: 1,
+          last_read_post_number: null,
+          created_at: "2022-05-11T03:09:31.959Z",
+          category_id: 1,
+          notification_level: null,
+          created_in_new_period: true,
+          treat_as_new_topic_start_date: "2022-05-09T03:17:34.286Z",
+        },
+        {
+          topic_id: 2,
+          highest_post_number: 12,
+          last_read_post_number: 11,
+          created_at: "2020-02-09T09:40:02.672Z",
+          category_id: 2,
+          notification_level: 2,
+          created_in_new_period: false,
+          treat_as_new_topic_start_date: "2022-05-09T03:17:34.286Z",
+        },
+      ]);
+
+      await visit("/");
+
+      assert
+        .dom(
+          ".sidebar-section-link[data-link-name='everything'] .sidebar-section-link-suffix.icon.unread"
+        )
+        .exists(
+          "everything link has a dot because there are unread or new topics"
+        );
+
+      await publishToMessageBus("/unread", {
+        topic_id: 1,
+        message_type: "read",
+        payload: {
+          last_read_post_number: 1,
+          highest_post_number: 1,
+        },
+      });
+
+      assert
+        .dom(
+          ".sidebar-section-link[data-link-name='everything'] .sidebar-section-link-suffix.icon.unread"
+        )
+        .exists(
+          "everything link has a dot because there are unread or new topics"
+        );
+
+      await publishToMessageBus("/unread", {
+        topic_id: 2,
+        message_type: "read",
+        payload: {
+          last_read_post_number: 12,
+          highest_post_number: 12,
+        },
+      });
+
+      assert
+        .dom(
+          ".sidebar-section-link[data-link-name='everything'] .sidebar-section-link-suffix.icon.unread"
+        )
+        .doesNotExist(
+          "everything link no longer has a dot because there are no more unread or new topics"
+        );
+    });
+
+    test("everything link's href is the new topics list when sidebar_link_to_filtered_list is true", async function (assert) {
+      updateCurrentUser({
+        user_option: {
+          sidebar_link_to_filtered_list: true,
+        },
+      });
+      this.container.lookup("service:topic-tracking-state").loadStates([
+        {
+          topic_id: 1,
+          highest_post_number: 1,
+          last_read_post_number: null,
+          created_at: "2022-05-11T03:09:31.959Z",
+          category_id: 1,
+          notification_level: null,
+          created_in_new_period: true,
+          treat_as_new_topic_start_date: "2022-05-09T03:17:34.286Z",
+        },
+        {
+          topic_id: 2,
+          highest_post_number: 12,
+          last_read_post_number: 11,
+          created_at: "2020-02-09T09:40:02.672Z",
+          category_id: 2,
+          notification_level: 2,
+          created_in_new_period: false,
+          treat_as_new_topic_start_date: "2022-05-09T03:17:34.286Z",
+        },
+      ]);
+
+      await visit("/");
+
+      assert
+        .dom(".sidebar-section-link[data-link-name='everything']")
+        .hasAttribute(
+          "href",
+          "/new",
+
+          "links to /new because there are 1 new and 1 unread topics"
+        );
+
+      await publishToMessageBus("/unread", {
+        topic_id: 1,
+        message_type: "read",
+        payload: {
+          last_read_post_number: 3,
+          highest_post_number: 3,
+        },
+      });
+
+      assert
+        .dom(".sidebar-section-link[data-link-name='everything']")
+        .hasAttribute(
+          "href",
+          "/new",
+          "links to /new because there is 1 unread topic"
+        );
+
+      await publishToMessageBus("/unread", {
+        topic_id: 2,
+        message_type: "read",
+        payload: {
+          last_read_post_number: 12,
+          highest_post_number: 12,
+        },
+      });
+
+      assert
+        .dom(".sidebar-section-link[data-link-name='everything']")
+        .hasAttribute(
+          "href",
+          "/latest",
+          "links to /latest because there are no unread or new topics"
+        );
+
+      await publishToMessageBus("/unread", {
+        topic_id: 1,
+        message_type: "read",
+        payload: {
+          last_read_post_number: null,
+          highest_post_number: 34,
+        },
+      });
+
+      assert
+        .dom(".sidebar-section-link[data-link-name='everything']")
+        .hasAttribute(
+          "href",
+          "/new",
+          "links to /new because there is 1 new topic"
+        );
+    });
+
+    test("everything link's href is always the latest topics list when sidebar_link_to_filtered_list is false", async function (assert) {
+      updateCurrentUser({
+        user_option: {
+          sidebar_link_to_filtered_list: false,
+        },
+      });
+      this.container.lookup("service:topic-tracking-state").loadStates([
+        {
+          topic_id: 1,
+          highest_post_number: 1,
+          last_read_post_number: null,
+          created_at: "2022-05-11T03:09:31.959Z",
+          category_id: 1,
+          notification_level: null,
+          created_in_new_period: true,
+          treat_as_new_topic_start_date: "2022-05-09T03:17:34.286Z",
+        },
+      ]);
+
+      await visit("/");
+
+      assert
+        .dom(".sidebar-section-link[data-link-name='everything']")
+        .hasAttribute("href", "/latest", "everything link href is /latest");
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-messages-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-messages-section-test.js
index 6ae22561611..2e945b38ad1 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-messages-section-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-messages-section-test.js
@@ -29,7 +29,7 @@ acceptance(
       await visit("/");
 
       assert.ok(
-        !exists(".sidebar-section-messages"),
+        !exists(".sidebar-section[data-section-name='messages']"),
         "does not display messages section in sidebar"
       );
     });
@@ -74,7 +74,9 @@ acceptance(
 
     test("clicking on section header button", async function (assert) {
       await visit("/");
-      await click(".sidebar-section-messages .sidebar-section-header-button");
+      await click(
+        ".sidebar-section[data-section-name='messages'] .sidebar-section-header-button"
+      );
 
       assert.ok(
         exists("#reply-control.private-message"),
@@ -84,10 +86,14 @@ acceptance(
 
     test("clicking on section header link", async function (assert) {
       await visit("/");
-      await click(".sidebar-section-messages .sidebar-section-header");
+      await click(
+        ".sidebar-section[data-section-name='messages'] .sidebar-section-header"
+      );
 
       assert.notOk(
-        exists(".sidebar-section-messages .sidebar-section-content"),
+        exists(
+          ".sidebar-section[data-section-name='messages'] .sidebar-section-content"
+        ),
         "hides the content of the section"
       );
     });
@@ -97,30 +103,34 @@ acceptance(
 
       assert.ok(
         exists(
-          ".sidebar-section-messages .sidebar-section-link-personal-messages-inbox"
+          ".sidebar-section[data-section-name='messages'] .sidebar-section-link[data-link-name='personal-messages-inbox']"
         ),
         "displays the personal message inbox link"
       );
 
       assert.strictEqual(
-        count(".sidebar-section-messages .sidebar-section-link"),
+        count(
+          ".sidebar-section[data-section-name='messages'] .sidebar-section-link"
+        ),
         1,
         "only displays the personal message inbox link"
       );
 
       await click(
-        ".sidebar-section-messages .sidebar-section-link-personal-messages-inbox"
+        ".sidebar-section[data-section-name='messages'] .sidebar-section-link[data-link-name='personal-messages-inbox']"
       );
 
       assert.ok(
         exists(
-          ".sidebar-section-messages .sidebar-section-link-personal-messages-inbox.active"
+          ".sidebar-section[data-section-name='messages'] .sidebar-section-link[data-link-name='personal-messages-inbox'].active"
         ),
         "personal message inbox link is marked as active"
       );
 
       assert.strictEqual(
-        count(".sidebar-section-messages .sidebar-section-link"),
+        count(
+          ".sidebar-section[data-section-name='messages'] .sidebar-section-link"
+        ),
         5,
         "expands and displays the links for personal messages"
       );
@@ -131,11 +141,11 @@ acceptance(
         await visit("/");
 
         await click(
-          ".sidebar-section-messages .sidebar-section-link-personal-messages-inbox"
+          ".sidebar-section[data-section-name='messages'] .sidebar-section-link[data-link-name='personal-messages-inbox']"
         );
 
         await click(
-          `.sidebar-section-messages .sidebar-section-link-personal-messages-${type}`
+          `.sidebar-section[data-section-name='messages'] .sidebar-section-link[data-link-name='personal-messages-${type}']`
         );
 
         assert.strictEqual(
@@ -145,28 +155,30 @@ acceptance(
         );
 
         assert.strictEqual(
-          count(".sidebar-section-messages .sidebar-section-link.active"),
+          count(
+            ".sidebar-section[data-section-name='messages'] .sidebar-section-link.active"
+          ),
           2,
           "only two links are marked as active in the sidebar"
         );
 
         assert.ok(
           exists(
-            ".sidebar-section-messages .sidebar-section-link-personal-messages-inbox.active"
+            ".sidebar-section[data-section-name='messages'] .sidebar-section-link[data-link-name='personal-messages-inbox'].active"
           ),
           "personal message inbox link is marked as active"
         );
 
         assert.ok(
           exists(
-            `.sidebar-section-messages .sidebar-section-link-personal-messages-${type}.active`
+            `.sidebar-section[data-section-name='messages'] .sidebar-section-link[data-link-name='personal-messages-${type}'].active`
           ),
           `personal message ${type} link is marked as active`
         );
 
         assert.notOk(
           exists(
-            `.sidebar-section-messages .sidebar-section-link-personal-messages-${type} .sidebar-section-link-prefix`
+            `.sidebar-section[data-section-name='messages'] .sidebar-section-link[data-link-name='personal-messages-${type}'] .sidebar-section-link-prefix`
           ),
           `prefix is not displayed for ${type} personal message section link`
         );
@@ -194,7 +206,7 @@ acceptance(
       await visit("/");
 
       const groupSectionLinks = queryAll(
-        ".sidebar-section-messages .sidebar-section-link"
+        ".sidebar-section[data-section-name='messages'] .sidebar-section-link"
       );
 
       assert.deepEqual(
@@ -208,29 +220,37 @@ acceptance(
       await visit("/u/eviltrout/messages/group/GrOuP1");
 
       assert.strictEqual(
-        count(".sidebar-section-messages .sidebar-section-link"),
+        count(
+          ".sidebar-section[data-section-name='messages'] .sidebar-section-link"
+        ),
         6,
         "expands and displays the links for group1 group messages"
       );
 
       assert.strictEqual(
-        count(".sidebar-section-messages .sidebar-section-link.group1"),
+        count(
+          ".sidebar-section[data-section-name='messages'] .sidebar-section-link.group1"
+        ),
         4,
         "expands the links for group1 group messages"
       );
 
       await click(
-        ".sidebar-section-messages .sidebar-section-link-group-messages-inbox.group3"
+        ".sidebar-section[data-section-name='messages'] .sidebar-section-link[data-link-name='group-messages-inbox'].group3"
       );
 
       assert.strictEqual(
-        count(".sidebar-section-messages .sidebar-section-link.group1"),
+        count(
+          ".sidebar-section[data-section-name='messages'] .sidebar-section-link.group1"
+        ),
         1,
         "collapses the links for group1 group messages"
       );
 
       assert.strictEqual(
-        count(".sidebar-section-messages .sidebar-section-link.group3"),
+        count(
+          ".sidebar-section[data-section-name='messages'] .sidebar-section-link.group3"
+        ),
         4,
         "expands the links for group3 group messages"
       );
@@ -258,11 +278,11 @@ acceptance(
         await visit("/");
 
         await click(
-          `.sidebar-section-messages .sidebar-section-link-group-messages-inbox.group1`
+          `.sidebar-section[data-section-name='messages'] .sidebar-section-link[data-link-name='group-messages-inbox'].group1`
         );
 
         await click(
-          `.sidebar-section-messages .sidebar-section-link-group-messages-${type}.group1`
+          `.sidebar-section[data-section-name='messages'] .sidebar-section-link[data-link-name='group-messages-${type}'].group1`
         );
 
         assert.strictEqual(
@@ -272,21 +292,23 @@ acceptance(
         );
 
         assert.strictEqual(
-          count(".sidebar-section-messages .sidebar-section-link.active"),
+          count(
+            ".sidebar-section[data-section-name='messages'] .sidebar-section-link.active"
+          ),
           2,
           "only two links are marked as active in the sidebar"
         );
 
         assert.ok(
           exists(
-            ".sidebar-section-messages .sidebar-section-link-group-messages-inbox.group1.active"
+            ".sidebar-section[data-section-name='messages'] .sidebar-section-link[data-link-name='group-messages-inbox'].group1.active"
           ),
           "group1 group message inbox link is marked as active"
         );
 
         assert.ok(
           exists(
-            `.sidebar-section-messages .sidebar-section-link-group-messages-${type}.group1.active`
+            `.sidebar-section[data-section-name='messages'] .sidebar-section-link[data-link-name='group-messages-${type}'].group1.active`
           ),
           `group1 group message ${type} link is marked as active`
         );
@@ -306,21 +328,25 @@ acceptance(
       await visit("/t/130");
 
       assert.strictEqual(
-        count(".sidebar-section-messages .sidebar-section-link"),
+        count(
+          ".sidebar-section[data-section-name='messages'] .sidebar-section-link"
+        ),
         5,
         "5 section links are displayed"
       );
 
       assert.strictEqual(
         count(
-          ".sidebar-section-messages .sidebar-section-link.personal-messages"
+          ".sidebar-section[data-section-name='messages'] .sidebar-section-link.personal-messages"
         ),
         1,
         "personal messages inbox filter links are not shown"
       );
 
       assert.strictEqual(
-        count(".sidebar-section-messages .sidebar-section-link.foo_group"),
+        count(
+          ".sidebar-section[data-section-name='messages'] .sidebar-section-link.foo_group"
+        ),
         4,
         "foo_group messages inbox filter links are shown"
       );
@@ -339,21 +365,25 @@ acceptance(
       await visit("/t/34");
 
       assert.strictEqual(
-        count(".sidebar-section-messages .sidebar-section-link"),
+        count(
+          ".sidebar-section[data-section-name='messages'] .sidebar-section-link"
+        ),
         6,
         "6 section links are displayed"
       );
 
       assert.strictEqual(
         count(
-          ".sidebar-section-messages .sidebar-section-link.personal-messages"
+          ".sidebar-section[data-section-name='messages'] .sidebar-section-link.personal-messages"
         ),
         5,
         "personal messages inbox filter links are shown"
       );
 
       assert.strictEqual(
-        count(".sidebar-section-messages .sidebar-section-link.foo_group"),
+        count(
+          ".sidebar-section[data-section-name='messages'] .sidebar-section-link.foo_group"
+        ),
         1,
         "foo_group messages inbox filter links are not shown"
       );
@@ -376,6 +406,10 @@ acceptance(
         "service:pm-topic-tracking-state"
       );
 
+      await click(
+        ".sidebar-section[data-section-name='messages'] .sidebar-section-link[data-link-name='group-messages-inbox'].group1"
+      );
+
       await publishToMessageBus(pmTopicTrackingState.groupChannel(1), {
         topic_id: 1,
         message_type: "unread",
@@ -398,13 +432,9 @@ acceptance(
         },
       });
 
-      await click(
-        ".sidebar-section-messages .sidebar-section-link-group-messages-inbox.group1"
-      );
-
       assert.strictEqual(
         query(
-          ".sidebar-section-messages .sidebar-section-link-group-messages-unread.group1"
+          ".sidebar-section[data-section-name='messages'] .sidebar-section-link[data-link-name='group-messages-unread'].group1"
         ).textContent.trim(),
         I18n.t("sidebar.sections.messages.links.unread_with_count", {
           count: 1,
@@ -414,7 +444,7 @@ acceptance(
 
       assert.strictEqual(
         query(
-          ".sidebar-section-messages .sidebar-section-link-group-messages-new.group1"
+          ".sidebar-section[data-section-name='messages'] .sidebar-section-link[data-link-name='group-messages-new'].group1"
         ).textContent.trim(),
         I18n.t("sidebar.sections.messages.links.new_with_count", {
           count: 1,
@@ -435,7 +465,7 @@ acceptance(
 
       assert.strictEqual(
         query(
-          ".sidebar-section-messages .sidebar-section-link-group-messages-new.group1"
+          ".sidebar-section[data-section-name='messages'] .sidebar-section-link[data-link-name='group-messages-new'].group1"
         ).textContent.trim(),
         I18n.t("sidebar.sections.messages.links.new"),
         "removes count for group1 new inbox filter link"
@@ -449,6 +479,10 @@ acceptance(
         "service:pm-topic-tracking-state"
       );
 
+      await click(
+        ".sidebar-section[data-section-name='messages'] .sidebar-section-link[data-link-name='personal-messages-inbox']"
+      );
+
       await publishToMessageBus(pmTopicTrackingState.userChannel(), {
         topic_id: 1,
         message_type: "unread",
@@ -460,13 +494,9 @@ acceptance(
         },
       });
 
-      await click(
-        ".sidebar-section-messages .sidebar-section-link-personal-messages-inbox"
-      );
-
       assert.strictEqual(
         query(
-          ".sidebar-section-messages .sidebar-section-link-personal-messages-unread"
+          ".sidebar-section[data-section-name='messages'] .sidebar-section-link[data-link-name='personal-messages-unread']"
         ).textContent.trim(),
         I18n.t("sidebar.sections.messages.links.unread_with_count", {
           count: 1,
@@ -487,7 +517,7 @@ acceptance(
 
       assert.strictEqual(
         query(
-          ".sidebar-section-messages .sidebar-section-link-personal-messages-unread"
+          ".sidebar-section[data-section-name='messages'] .sidebar-section-link[data-link-name='personal-messages-unread']"
         ).textContent.trim(),
         I18n.t("sidebar.sections.messages.links.unread_with_count", {
           count: 2,
@@ -508,7 +538,7 @@ acceptance(
 
       assert.strictEqual(
         query(
-          ".sidebar-section-messages .sidebar-section-link-personal-messages-new"
+          ".sidebar-section[data-section-name='messages'] .sidebar-section-link[data-link-name='personal-messages-new']"
         ).textContent.trim(),
         I18n.t("sidebar.sections.messages.links.new_with_count", {
           count: 1,
@@ -529,7 +559,7 @@ acceptance(
 
       assert.strictEqual(
         query(
-          ".sidebar-section-messages .sidebar-section-link-personal-messages-new"
+          ".sidebar-section[data-section-name='messages'] .sidebar-section-link[data-link-name='personal-messages-new']"
         ).textContent.trim(),
         I18n.t("sidebar.sections.messages.links.new"),
         "removes the count from the new inbox filter link"
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-tags-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-tags-section-test.js
index 018d7d3b232..d441ca48968 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-tags-section-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-tags-section-test.js
@@ -7,34 +7,12 @@ import {
   exists,
   publishToMessageBus,
   query,
-  queryAll,
   updateCurrentUser,
 } from "discourse/tests/helpers/qunit-helpers";
 import discoveryFixture from "discourse/tests/fixtures/discovery-fixtures";
 import { cloneJSON } from "discourse-common/lib/object";
 import { NotificationLevels } from "discourse/lib/notification-levels";
 
-acceptance(
-  "Sidebar - Logged on user - Tags section - tagging disabled",
-  function (needs) {
-    needs.settings({
-      tagging_enabled: false,
-      navigation_menu: "sidebar",
-    });
-
-    needs.user();
-
-    test("tags section is not shown", async function (assert) {
-      await visit("/");
-
-      assert.ok(
-        !exists(".sidebar-section-tags"),
-        "does not display the tags section"
-      );
-    });
-  }
-);
-
 acceptance("Sidebar - Logged on user - Tags section", function (needs) {
   needs.settings({
     tagging_enabled: true,
@@ -91,114 +69,42 @@ acceptance("Sidebar - Logged on user - Tags section", function (needs) {
     });
   });
 
-  test("section is not displayed when display_sidebar_tags property is false", async function (assert) {
-    updateCurrentUser({ display_sidebar_tags: false });
-
-    await visit("/");
-
-    assert.notOk(
-      exists(".sidebar-section-tags"),
-      "tags section is not displayed"
-    );
-  });
-
-  test("clicking on section header button", async function (assert) {
-    await visit("/");
-    await click(".sidebar-section-tags .sidebar-section-header-button");
-
-    assert.strictEqual(
-      currentURL(),
-      "/u/eviltrout/preferences/sidebar",
-      "it should transition to user preferences sidebar page"
-    );
-  });
-
-  test("tags section is hidden when user has not added any tags and there are no default tags configured", async function (assert) {
-    updateCurrentUser({
-      sidebar_tags: [],
-    });
-
-    await visit("/");
-
-    assert.notOk(
-      exists(".sidebar-section-tags"),
-      "tags section is not displayed"
-    );
-  });
-
-  test("tags section is shown when user has not added any tags but default tags have been configured", async function (assert) {
-    updateCurrentUser({
-      sidebar_tags: [],
-    });
-
-    this.siteSettings.default_sidebar_tags = "tag1|tag2";
-
-    await visit("/");
-
-    assert.ok(exists(".sidebar-section-tags"), "tags section is shown");
-
-    assert.ok(
-      exists(".sidebar-section-tags .sidebar-section-link-configure-tags"),
-      "section link to add tags to sidebar is displayed"
-    );
-
-    await click(".sidebar-section-tags .sidebar-section-link-configure-tags");
-
-    assert.strictEqual(
-      currentURL(),
-      "/u/eviltrout/preferences/sidebar",
-      "it should transition to user preferences sidebar page"
-    );
-  });
-
-  test("tag section links are sorted alphabetically by tag's name", async function (assert) {
-    await visit("/");
-
-    const tagSectionLinks = queryAll(
-      ".sidebar-section-tags .sidebar-section-link:not(.sidebar-section-link-all-tags)"
-    );
-
-    const tagNames = [...tagSectionLinks].map((tagSectionLink) =>
-      tagSectionLink.textContent.trim()
-    );
-
-    assert.deepEqual(
-      tagNames,
-      ["tag1", "tag2", "tag3", "tag4"],
-      "tag section links are displayed in the right order"
-    );
-  });
-
   test("tag section links for user", async function (assert) {
     await visit("/");
 
     assert.strictEqual(
       count(
-        ".sidebar-section-tags .sidebar-section-link:not(.sidebar-section-link-all-tags)"
+        ".sidebar-section[data-section-name='tags'] .sidebar-section-link:not(.sidebar-section-link[data-link-name='all-tags'])"
       ),
       4,
       "4 section links under the section"
     );
 
     assert.strictEqual(
-      query(".sidebar-section-link-tag1").textContent.trim(),
+      query(
+        ".sidebar-section-link-wrapper[data-tag-name=tag1]"
+      ).textContent.trim(),
       "tag1",
       "displays the tag1 name for the link text"
     );
 
     assert.strictEqual(
-      query(".sidebar-section-link-tag2").textContent.trim(),
+      query(
+        ".sidebar-section-link-wrapper[data-tag-name=tag2]"
+      ).textContent.trim(),
       "tag2",
       "displays the tag2 name for the link text"
     );
 
     assert.strictEqual(
-      query(".sidebar-section-link-tag3").textContent.trim(),
+      query(
+        ".sidebar-section-link-wrapper[data-tag-name=tag3]"
+      ).textContent.trim(),
       "tag3",
       "displays the tag3 name for the link text"
     );
 
-    await click(".sidebar-section-link-tag1");
+    await click(".sidebar-section-link-wrapper[data-tag-name=tag1] a");
 
     assert.strictEqual(
       currentURL(),
@@ -207,17 +113,19 @@ acceptance("Sidebar - Logged on user - Tags section", function (needs) {
     );
 
     assert.strictEqual(
-      count(".sidebar-section-tags .sidebar-section-link.active"),
+      count(
+        ".sidebar-section[data-section-name='tags'] .sidebar-section-link.active"
+      ),
       1,
       "only one link is marked as active"
     );
 
     assert.ok(
-      exists(`.sidebar-section-link-tag1.active`),
+      exists(`.sidebar-section-link-wrapper[data-tag-name=tag1] a.active`),
       "the tag1 section link is marked as active"
     );
 
-    await click(".sidebar-section-link-tag2");
+    await click(".sidebar-section-link-wrapper[data-tag-name=tag2] a");
 
     assert.strictEqual(
       currentURL(),
@@ -226,24 +134,28 @@ acceptance("Sidebar - Logged on user - Tags section", function (needs) {
     );
 
     assert.strictEqual(
-      count(".sidebar-section-tags .sidebar-section-link.active"),
+      count(
+        ".sidebar-section[data-section-name='tags'] .sidebar-section-link.active"
+      ),
       1,
       "only one link is marked as active"
     );
 
     assert.ok(
-      exists(`.sidebar-section-link-tag2.active`),
+      exists(`.sidebar-section-link-wrapper[data-tag-name=tag2] a.active`),
       "the tag2 section link is marked as active"
     );
   });
 
-  test("clicking tag section links - sidebar_list_destination set to unread/new and no unread or new topics", async function (assert) {
+  test("clicking tag section links - sidebar_link_to_filtered_list set to true and no unread or new topics", async function (assert) {
     updateCurrentUser({
-      sidebar_list_destination: "unread_new",
+      user_option: {
+        sidebar_link_to_filtered_list: true,
+      },
     });
 
     await visit("/");
-    await click(".sidebar-section-link-tag1");
+    await click(".sidebar-section-link-wrapper[data-tag-name=tag1] a");
 
     assert.strictEqual(
       currentURL(),
@@ -252,20 +164,24 @@ acceptance("Sidebar - Logged on user - Tags section", function (needs) {
     );
 
     assert.strictEqual(
-      count(".sidebar-section-tags .sidebar-section-link.active"),
+      count(
+        ".sidebar-section[data-section-name='tags'] .sidebar-section-link.active"
+      ),
       1,
       "only one link is marked as active"
     );
 
     assert.ok(
-      exists(`.sidebar-section-link-tag1.active`),
+      exists(`.sidebar-section-link-wrapper[data-tag-name=tag1] a.active`),
       "the tag1 section link is marked as active"
     );
   });
 
-  test("clicking tag section links - sidebar_list_destination set to unread/new with new topics", async function (assert) {
+  test("clicking tag section links - sidebar_link_to_filtered_list set to true with new topics", async function (assert) {
     updateCurrentUser({
-      sidebar_list_destination: "unread_new",
+      user_option: {
+        sidebar_link_to_filtered_list: true,
+      },
     });
 
     this.container.lookup("service:topic-tracking-state").loadStates([
@@ -283,7 +199,7 @@ acceptance("Sidebar - Logged on user - Tags section", function (needs) {
     ]);
 
     await visit("/");
-    await click(".sidebar-section-link-tag1");
+    await click(".sidebar-section-link-wrapper[data-tag-name=tag1] a");
 
     assert.strictEqual(
       currentURL(),
@@ -292,20 +208,24 @@ acceptance("Sidebar - Logged on user - Tags section", function (needs) {
     );
 
     assert.strictEqual(
-      count(".sidebar-section-tags .sidebar-section-link.active"),
+      count(
+        ".sidebar-section[data-section-name='tags'] .sidebar-section-link.active"
+      ),
       1,
       "only one link is marked as active"
     );
 
     assert.ok(
-      exists(`.sidebar-section-link-tag1.active`),
+      exists(`.sidebar-section-link-wrapper[data-tag-name=tag1] a.active`),
       "the tag1 section link is marked as active"
     );
   });
 
-  test("clicking tag section links - sidebar_list_destination set to unread/new with unread topics", async function (assert) {
+  test("clicking tag section links - sidebar_link_to_filtered_list set to true with unread topics", async function (assert) {
     updateCurrentUser({
-      sidebar_list_destination: "unread_new",
+      user_option: {
+        sidebar_link_to_filtered_list: true,
+      },
     });
 
     this.container.lookup("service:topic-tracking-state").loadStates([
@@ -323,7 +243,7 @@ acceptance("Sidebar - Logged on user - Tags section", function (needs) {
     ]);
 
     await visit("/");
-    await click(".sidebar-section-link-tag1");
+    await click(".sidebar-section-link-wrapper[data-tag-name=tag1] a");
 
     assert.strictEqual(
       currentURL(),
@@ -332,13 +252,15 @@ acceptance("Sidebar - Logged on user - Tags section", function (needs) {
     );
 
     assert.strictEqual(
-      count(".sidebar-section-tags .sidebar-section-link.active"),
+      count(
+        ".sidebar-section[data-section-name='tags'] .sidebar-section-link.active"
+      ),
       1,
       "only one link is marked as active"
     );
 
     assert.ok(
-      exists(`.sidebar-section-link-tag1.active`),
+      exists(`.sidebar-section-link-wrapper[data-tag-name=tag1] a.active`),
       "the tag1 section link is marked as active"
     );
   });
@@ -346,7 +268,7 @@ acceptance("Sidebar - Logged on user - Tags section", function (needs) {
   test("private message tag section links for user", async function (assert) {
     await visit("/");
 
-    await click(".sidebar-section-link-tag4");
+    await click(".sidebar-section-link-wrapper[data-tag-name=tag4] a");
 
     assert.strictEqual(
       currentURL(),
@@ -355,13 +277,15 @@ acceptance("Sidebar - Logged on user - Tags section", function (needs) {
     );
 
     assert.strictEqual(
-      count(".sidebar-section-tags .sidebar-section-link.active"),
+      count(
+        ".sidebar-section[data-section-name='tags'] .sidebar-section-link.active"
+      ),
       1,
       "only one link is marked as active"
     );
 
     assert.ok(
-      exists(`.sidebar-section-link-tag4.active`),
+      exists(`.sidebar-section-link-wrapper[data-tag-name=tag4] a.active`),
       "the tag4 section link is marked as active"
     );
   });
@@ -370,13 +294,15 @@ acceptance("Sidebar - Logged on user - Tags section", function (needs) {
     await visit(`/tag/tag1/l/top`);
 
     assert.strictEqual(
-      count(".sidebar-section-tags .sidebar-section-link.active"),
+      count(
+        ".sidebar-section[data-section-name='tags'] .sidebar-section-link.active"
+      ),
       1,
       "only one link is marked as active"
     );
 
     assert.ok(
-      exists(".sidebar-section-link-tag1.active"),
+      exists(".sidebar-section-link-wrapper[data-tag-name=tag1] a.active"),
       "the tag1 section link is marked as active for the top route"
     );
   });
@@ -385,13 +311,15 @@ acceptance("Sidebar - Logged on user - Tags section", function (needs) {
     await visit(`/tag/tag1/l/new`);
 
     assert.strictEqual(
-      count(".sidebar-section-tags .sidebar-section-link.active"),
+      count(
+        ".sidebar-section[data-section-name='tags'] .sidebar-section-link.active"
+      ),
       1,
       "only one link is marked as active"
     );
 
     assert.ok(
-      exists(".sidebar-section-link-tag1.active"),
+      exists(".sidebar-section-link-wrapper[data-tag-name=tag1] a.active"),
       "the tag1 section link is marked as active for the new route"
     );
   });
@@ -400,20 +328,24 @@ acceptance("Sidebar - Logged on user - Tags section", function (needs) {
     await visit(`/tag/tag1/l/unread`);
 
     assert.strictEqual(
-      count(".sidebar-section-tags .sidebar-section-link.active"),
+      count(
+        ".sidebar-section[data-section-name='tags'] .sidebar-section-link.active"
+      ),
       1,
       "only one link is marked as active"
     );
 
     assert.ok(
-      exists(".sidebar-section-link-tag1.active"),
+      exists(".sidebar-section-link-wrapper[data-tag-name=tag1] a.active"),
       "the tag1 section link is marked as active for the unread route"
     );
   });
 
   test("show suffix indicator for new content on tag section links", async function (assert) {
     updateCurrentUser({
-      sidebar_list_destination: "default",
+      user_option: {
+        sidebar_show_count_of_new_items: false,
+      },
     });
 
     this.container.lookup("service:topic-tracking-state").loadStates([
@@ -455,17 +387,23 @@ acceptance("Sidebar - Logged on user - Tags section", function (needs) {
     await visit("/");
 
     assert.ok(
-      exists(`.sidebar-section-link-tag1 .sidebar-section-link-suffix`),
+      exists(
+        `.sidebar-section-link-wrapper[data-tag-name=tag1] .sidebar-section-link-suffix`
+      ),
       "shows suffix indicator for new content on tag1 link"
     );
 
     assert.ok(
-      exists(`.sidebar-section-link-tag2 .sidebar-section-link-suffix`),
+      exists(
+        `.sidebar-section-link-wrapper[data-tag-name=tag2] .sidebar-section-link-suffix`
+      ),
       "shows suffix indicator for new content on tag2 link"
     );
 
     assert.ok(
-      !exists(`.sidebar-section-link-tag3 .sidebar-section-link-suffix`),
+      !exists(
+        `.sidebar-section-link-wrapper[data-tag-name=tag3] .sidebar-section-link-suffix`
+      ),
       "hides suffix indicator when there's no new content on tag3 link"
     );
 
@@ -479,7 +417,9 @@ acceptance("Sidebar - Logged on user - Tags section", function (needs) {
     });
 
     assert.ok(
-      exists(`.sidebar-section-link-tag1 .sidebar-section-link-suffix`),
+      exists(
+        `.sidebar-section-link-wrapper[data-tag-name=tag1] .sidebar-section-link-suffix`
+      ),
       "shows suffix indicator for new topic on tag1 link"
     );
 
@@ -493,14 +433,18 @@ acceptance("Sidebar - Logged on user - Tags section", function (needs) {
     });
 
     assert.ok(
-      !exists(`.sidebar-section-link-tag1 .sidebar-section-link-suffix`),
+      !exists(
+        `.sidebar-section-link-wrapper[data-tag-name=tag1] .sidebar-section-link-suffix`
+      ),
       "hides suffix indicator for tag1 section link"
     );
   });
 
   test("new and unread count for tag section links", async function (assert) {
     updateCurrentUser({
-      sidebar_list_destination: "unread_new",
+      user_option: {
+        sidebar_show_count_of_new_items: true,
+      },
     });
 
     this.container.lookup("service:topic-tracking-state").loadStates([
@@ -554,7 +498,7 @@ acceptance("Sidebar - Logged on user - Tags section", function (needs) {
 
     assert.strictEqual(
       query(
-        `.sidebar-section-link-tag1 .sidebar-section-link-content-badge`
+        `.sidebar-section-link-wrapper[data-tag-name=tag1] .sidebar-section-link-content-badge`
       ).textContent.trim(),
       I18n.t("sidebar.unread_count", { count: 1 }),
       `displays 1 unread count for tag1 section link`
@@ -562,14 +506,16 @@ acceptance("Sidebar - Logged on user - Tags section", function (needs) {
 
     assert.strictEqual(
       query(
-        `.sidebar-section-link-tag2 .sidebar-section-link-content-badge`
+        `.sidebar-section-link-wrapper[data-tag-name=tag2] .sidebar-section-link-content-badge`
       ).textContent.trim(),
       I18n.t("sidebar.unread_count", { count: 1 }),
       `displays 1 unread count for tag2 section link`
     );
 
     assert.ok(
-      !exists(`.sidebar-section-link-tag3 .sidebar-section-link-content-badge`),
+      !exists(
+        `.sidebar-section-link-wrapper[data-tag-name=tag3] .sidebar-section-link-content-badge`
+      ),
       "does not display any badge for tag3 section link"
     );
 
@@ -584,7 +530,7 @@ acceptance("Sidebar - Logged on user - Tags section", function (needs) {
 
     assert.strictEqual(
       query(
-        `.sidebar-section-link-tag1 .sidebar-section-link-content-badge`
+        `.sidebar-section-link-wrapper[data-tag-name=tag1] .sidebar-section-link-content-badge`
       ).textContent.trim(),
       I18n.t("sidebar.new_count", { count: 1 }),
       `displays 1 new count for tag1 section link`
@@ -600,7 +546,9 @@ acceptance("Sidebar - Logged on user - Tags section", function (needs) {
     });
 
     assert.ok(
-      !exists(`.sidebar-section-link-tag1 .sidebar-section-link-content-badge`),
+      !exists(
+        `.sidebar-section-link-wrapper[data-tag-name=tag1] .sidebar-section-link-content-badge`
+      ),
       `does not display any badge tag1 section link`
     );
   });
@@ -625,21 +573,298 @@ acceptance("Sidebar - Logged on user - Tags section", function (needs) {
   });
 
   test("section link to admin site settings page when default sidebar tags have not been configured", async function (assert) {
-    updateCurrentUser({ admin: true });
+    updateCurrentUser({ admin: true, sidebar_tags: [] });
+
+    updateCurrentUser({
+      sidebar_tags: [],
+    });
 
     await visit("/");
 
     assert.ok(
-      exists(".sidebar-section-link-configure-default-sidebar-tags"),
+      exists(
+        ".sidebar-section-link[data-link-name='configure-default-navigation-menu-tags']"
+      ),
       "section link to configure default sidebar tags is shown"
     );
 
-    await click(".sidebar-section-link-configure-default-sidebar-tags");
+    await click(
+      ".sidebar-section-link[data-link-name='configure-default-navigation-menu-tags']"
+    );
 
     assert.strictEqual(
       currentURL(),
-      "/admin/site_settings/category/all_results?filter=default_sidebar_tags",
+      "/admin/site_settings/category/all_results?filter=default_navigation_menu_tags",
       "it links to the admin site settings page correctly"
     );
   });
 });
+
+acceptance(
+  "Sidebar - Logged on user - Tags section - New new view enabled",
+  function (needs) {
+    needs.settings({
+      tagging_enabled: true,
+      navigation_menu: "sidebar",
+    });
+
+    needs.user({
+      new_new_view_enabled: true,
+      display_sidebar_tags: true,
+      sidebar_tags: [
+        { name: "tag2", pm_only: false },
+        { name: "tag1", pm_only: false },
+        { name: "tag3", pm_only: false },
+      ],
+    });
+
+    test("count shown next to tag link when sidebar_show_count_of_new_items is true", async function (assert) {
+      updateCurrentUser({
+        user_option: {
+          sidebar_show_count_of_new_items: true,
+        },
+      });
+
+      this.container.lookup("service:topic-tracking-state").loadStates([
+        {
+          topic_id: 1,
+          highest_post_number: 1,
+          last_read_post_number: null,
+          created_at: "2022-05-11T03:09:31.959Z",
+          category_id: 1,
+          notification_level: null,
+          created_in_new_period: true,
+          treat_as_new_topic_start_date: "2022-05-09T03:17:34.286Z",
+          tags: ["tag1", "tag3"],
+        },
+        {
+          topic_id: 2,
+          highest_post_number: 12,
+          last_read_post_number: 11,
+          created_at: "2020-02-09T09:40:02.672Z",
+          category_id: 2,
+          notification_level: 2,
+          created_in_new_period: false,
+          treat_as_new_topic_start_date: "2022-05-09T03:17:34.286Z",
+          tags: ["tag1", "tag2"],
+        },
+        {
+          topic_id: 3,
+          highest_post_number: 15,
+          last_read_post_number: 15,
+          created_at: "2021-06-14T12:41:02.477Z",
+          category_id: 3,
+          notification_level: 2,
+          created_in_new_period: false,
+          treat_as_new_topic_start_date: "2022-05-09T03:17:34.286Z",
+          tags: ["tag1"],
+        },
+      ]);
+
+      await visit("/");
+
+      assert.strictEqual(
+        query(
+          '.sidebar-section-link-wrapper[data-tag-name="tag1"] .sidebar-section-link-content-badge'
+        ).textContent.trim(),
+        "2",
+        "count for tag1 is 2 because it has 1 unread topic and 1 new topic"
+      );
+
+      assert.strictEqual(
+        query(
+          '.sidebar-section-link-wrapper[data-tag-name="tag2"] .sidebar-section-link-content-badge'
+        ).textContent.trim(),
+        "1",
+        "count for tag2 is 1 because it has 1 unread topic"
+      );
+
+      assert.strictEqual(
+        query(
+          '.sidebar-section-link-wrapper[data-tag-name="tag3"] .sidebar-section-link-content-badge'
+        ).textContent.trim(),
+        "1",
+        "count for tag3 is 1 because it has 1 new topic"
+      );
+    });
+
+    test("dot shown next to tag link when sidebar_show_count_of_new_items is false", async function (assert) {
+      updateCurrentUser({
+        user_option: {
+          sidebar_show_count_of_new_items: false,
+        },
+      });
+
+      this.container.lookup("service:topic-tracking-state").loadStates([
+        {
+          topic_id: 1,
+          highest_post_number: 1,
+          last_read_post_number: null,
+          created_at: "2022-05-11T03:09:31.959Z",
+          category_id: 1,
+          notification_level: null,
+          created_in_new_period: true,
+          treat_as_new_topic_start_date: "2022-05-09T03:17:34.286Z",
+          tags: ["tag1"],
+        },
+        {
+          topic_id: 2,
+          highest_post_number: 12,
+          last_read_post_number: 11,
+          created_at: "2020-02-09T09:40:02.672Z",
+          category_id: 2,
+          notification_level: 2,
+          created_in_new_period: false,
+          treat_as_new_topic_start_date: "2022-05-09T03:17:34.286Z",
+          tags: ["tag2"],
+        },
+      ]);
+
+      await visit("/");
+
+      assert
+        .dom(
+          '.sidebar-section-link-wrapper[data-tag-name="tag1"] .sidebar-section-link-suffix.icon.unread'
+        )
+        .exists("tag1 has a dot because it has a new topic");
+      assert
+        .dom(
+          '.sidebar-section-link-wrapper[data-tag-name="tag2"] .sidebar-section-link-suffix.icon.unread'
+        )
+        .exists("tag2 has a dot because it has an unread topic");
+      assert
+        .dom(
+          '.sidebar-section-link-wrapper[data-tag-name="tag3"] .sidebar-section-link-suffix.icon.unread'
+        )
+        .doesNotExist(
+          "tag3 doesn't have a dot because it has no new or unread topics"
+        );
+    });
+
+    test("tag link href is to the new topics list when sidebar_link_to_filtered_list is true and there are unread/new topics with the tag", async function (assert) {
+      updateCurrentUser({
+        user_option: {
+          sidebar_link_to_filtered_list: true,
+        },
+      });
+
+      this.container.lookup("service:topic-tracking-state").loadStates([
+        {
+          topic_id: 1,
+          highest_post_number: 1,
+          last_read_post_number: null,
+          created_at: "2022-05-11T03:09:31.959Z",
+          category_id: 1,
+          notification_level: null,
+          created_in_new_period: true,
+          treat_as_new_topic_start_date: "2022-05-09T03:17:34.286Z",
+          tags: ["tag1"],
+        },
+        {
+          topic_id: 2,
+          highest_post_number: 12,
+          last_read_post_number: 11,
+          created_at: "2020-02-09T09:40:02.672Z",
+          category_id: 2,
+          notification_level: 2,
+          created_in_new_period: false,
+          treat_as_new_topic_start_date: "2022-05-09T03:17:34.286Z",
+          tags: ["tag2"],
+        },
+        {
+          topic_id: 3,
+          highest_post_number: 15,
+          last_read_post_number: 15,
+          created_at: "2021-06-14T12:41:02.477Z",
+          category_id: 3,
+          notification_level: 2,
+          created_in_new_period: false,
+          treat_as_new_topic_start_date: "2022-05-09T03:17:34.286Z",
+          tags: ["tag3"],
+        },
+      ]);
+
+      await visit("/");
+
+      assert.true(
+        query(
+          '.sidebar-section-link-wrapper[data-tag-name="tag1"] a'
+        ).href.endsWith("/tag/tag1/l/new"),
+        "links to the new topics list for the tag because there's 1 new topic"
+      );
+
+      assert.true(
+        query(
+          '.sidebar-section-link-wrapper[data-tag-name="tag2"] a'
+        ).href.endsWith("/tag/tag2/l/new"),
+        "links to the new topics list for the tag because there's 1 unread topic"
+      );
+
+      assert.true(
+        query(
+          '.sidebar-section-link-wrapper[data-tag-name="tag3"] a'
+        ).href.endsWith("/tag/tag3"),
+        "links to the latest topics list for the tag because there are no unread or new topics"
+      );
+    });
+
+    test("tag link href is always to the latest topics list when sidebar_link_to_filtered_list is false", async function (assert) {
+      updateCurrentUser({
+        user_option: {
+          sidebar_link_to_filtered_list: false,
+        },
+      });
+
+      this.container.lookup("service:topic-tracking-state").loadStates([
+        {
+          topic_id: 1,
+          highest_post_number: 1,
+          last_read_post_number: null,
+          created_at: "2022-05-11T03:09:31.959Z",
+          category_id: 1,
+          notification_level: null,
+          created_in_new_period: true,
+          treat_as_new_topic_start_date: "2022-05-09T03:17:34.286Z",
+          tags: ["tag1"],
+        },
+        {
+          topic_id: 2,
+          highest_post_number: 12,
+          last_read_post_number: 11,
+          created_at: "2020-02-09T09:40:02.672Z",
+          category_id: 2,
+          notification_level: 2,
+          created_in_new_period: false,
+          treat_as_new_topic_start_date: "2022-05-09T03:17:34.286Z",
+          tags: ["tag2"],
+        },
+      ]);
+
+      await visit("/");
+
+      assert
+        .dom('.sidebar-section-link-wrapper[data-tag-name="tag1"] a')
+        .hasAttribute(
+          "href",
+          "/tag/tag1",
+          "tag1 links to the latest topics list for the tag"
+        );
+
+      assert
+        .dom('.sidebar-section-link-wrapper[data-tag-name="tag2"] a')
+        .hasAttribute(
+          "href",
+          "/tag/tag2",
+          "tag2 links to the latest topics list for the tag"
+        );
+
+      assert
+        .dom('.sidebar-section-link-wrapper[data-tag-name="tag3"] a')
+        .hasAttribute(
+          "href",
+          "/tag/tag3",
+          "tag3 links to the latest topics list for the tag"
+        );
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-test.js
index ed2b4c5db32..2bb6c7858ff 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-test.js
@@ -7,9 +7,10 @@ import {
   query,
   updateCurrentUser,
 } from "discourse/tests/helpers/qunit-helpers";
+import Sinon from "sinon";
 
 acceptance(
-  "Sidebar - Logged on user - Experimental sidebar and hamburger setting disabled",
+  "Sidebar - Logged on user - Legacy navigation menu enabled",
   function (needs) {
     needs.user();
 
@@ -27,7 +28,29 @@ acceptance(
 );
 
 acceptance(
-  "Sidebar - Logged on user - Experimental sidebar and hamburger setting enabled - Sidebar disabled",
+  "Sidebar - Logged on user - Mobile view - Header dropdown navigation menu enabled",
+  function (needs) {
+    needs.user();
+    needs.mobileView();
+
+    needs.settings({
+      navigation_menu: "header dropdown",
+    });
+
+    test("sections are collapsable", async function (assert) {
+      await visit("/");
+      await click(".hamburger-dropdown");
+
+      assert.ok(
+        exists(".sidebar-section-header.sidebar-section-header-collapsable"),
+        "sections are collapsable"
+      );
+    });
+  }
+);
+
+acceptance(
+  "Sidebar - Logged on user - Desktop view - Header dropdown navigation menu enabled",
   function (needs) {
     needs.user();
 
@@ -52,23 +75,29 @@ acceptance(
       );
     });
 
-    test("'enable_sidebar' query param override to enable sidebar", async function (assert) {
-      await visit("/?enable_sidebar=1");
-
-      assert.ok(exists(".sidebar-container"), "sidebar is displayed");
-
-      await click(".btn-sidebar-toggle");
+    test("sections are not collapsable", async function (assert) {
+      await visit("/");
+      await click(".hamburger-dropdown");
 
       assert.notOk(
-        exists(".sidebar-hamburger-dropdown"),
-        "does not display the sidebar dropdown"
+        exists(".sidebar-section-header.sidebar-section-header-collapsable"),
+        "sections are not collapsable"
+      );
+    });
+
+    test("'more' dropdown should display as regular list items in header dropdown mode", async function (assert) {
+      await visit("/");
+      await click(".hamburger-dropdown");
+
+      assert.ok(
+        exists("[data-link-name='admin']"),
+        "the admin link is not within the 'more' dropdown"
       );
 
-      assert.notOk(exists(".sidebar-container"), "sidebar is hidden");
-
-      await click(".btn-sidebar-toggle");
-
-      assert.ok(exists(".sidebar-container"), "sidebar is displayed");
+      assert.notOk(
+        exists(".sidebar-more-section-links-details-summary"),
+        "the 'more' dropdown should not be present in header dropdown mode"
+      );
     });
   }
 );
@@ -76,7 +105,7 @@ acceptance(
 acceptance(
   "Sidebar - Experimental sidebar and hamburger setting enabled - Sidebar enabled",
   function (needs) {
-    needs.user();
+    needs.user({});
 
     needs.settings({
       navigation_menu: "sidebar",
@@ -132,29 +161,9 @@ acceptance(
       assert.ok(exists(".sidebar-container"), "displays the sidebar");
     });
 
-    test("'enable_sidebar' query param override to disable sidebar", async function (assert) {
-      await visit("/?enable_sidebar=0");
-
-      assert.notOk(exists(".sidebar-container"), "sidebar is not displayed");
-
-      await click(".hamburger-dropdown");
-
-      assert.ok(
-        exists(".sidebar-hamburger-dropdown"),
-        "displays the sidebar dropdown"
-      );
-
-      await click(".hamburger-dropdown");
-
-      assert.notOk(
-        exists(".sidebar-hamburger-dropdown"),
-        "hides the sidebar dropdown"
-      );
-    });
-
     test("button to toggle between mobile and desktop view on touch devices ", async function (assert) {
-      const capabilities = this.container.lookup("capabilities:main");
-      capabilities.touch = true;
+      const capabilities = this.container.lookup("service:capabilities");
+      Sinon.stub(capabilities, "touch").value(true);
 
       await visit("/");
 
@@ -200,7 +209,7 @@ acceptance(
 
       assert.ok(
         exists(
-          ".sidebar-section-community .sidebar-section-header[aria-expanded='true'][aria-controls='sidebar-section-content-community']"
+          ".sidebar-section[data-section-name='categories'] .sidebar-section-header[aria-expanded='true'][aria-controls='sidebar-section-content-categories']"
         ),
         "accessibility attributes are set correctly on sidebar section header when section is expanded"
       );
@@ -209,7 +218,7 @@ acceptance(
 
       assert.ok(
         exists(
-          ".sidebar-section-community .sidebar-section-header[aria-expanded='false'][aria-controls='sidebar-section-content-community']"
+          ".sidebar-section[data-section-name='categories'] .sidebar-section-header[aria-expanded='false'][aria-controls='sidebar-section-content-categories']"
         ),
         "accessibility attributes are set correctly on sidebar section header when section is collapsed"
       );
diff --git a/app/assets/javascripts/discourse/tests/acceptance/static-test.js b/app/assets/javascripts/discourse/tests/acceptance/static-test.js
index 92a7125128b..b6c47c418a9 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/static-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/static-test.js
@@ -1,42 +1,97 @@
-import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { currentRouteName, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 
-acceptance("Static", function () {
-  test("Static Pages", async function (assert) {
+acceptance("Static pages", function () {
+  test("/faq", async function (assert) {
     await visit("/faq");
-    assert.ok(
+    assert.true(
       document.body.classList.contains("static-faq"),
-      "has the body class"
+      "/faq has the body class"
     );
-    assert.ok(exists(".body-page"), "The content is present");
+    assert.dom(".body-page").exists("The content is present");
+  });
 
+  test("/guidelines", async function (assert) {
     await visit("/guidelines");
-    assert.ok(
+    assert.true(
       document.body.classList.contains("static-guidelines"),
       "has the body class"
     );
-    assert.ok(exists(".body-page"), "The content is present");
+    assert.dom(".body-page").exists("The content is present");
+  });
 
+  test("/conduct", async function (assert) {
+    await visit("/conduct");
+    assert.true(
+      document.body.classList.contains("static-conduct"),
+      "has the body class"
+    );
+    assert.dom(".body-page").exists("The content is present");
+  });
+
+  test("/tos", async function (assert) {
     await visit("/tos");
-    assert.ok(
+    assert.true(
       document.body.classList.contains("static-tos"),
       "has the body class"
     );
-    assert.ok(exists(".body-page"), "The content is present");
+    assert.dom(".body-page").exists("The content is present");
+  });
 
+  test("/privacy", async function (assert) {
     await visit("/privacy");
-    assert.ok(
+    assert.true(
       document.body.classList.contains("static-privacy"),
       "has the body class"
     );
-    assert.ok(exists(".body-page"), "The content is present");
+    assert.dom(".body-page").exists("The content is present");
+  });
 
+  test("/rules", async function (assert) {
+    await visit("/rules");
+    assert.true(
+      document.body.classList.contains("static-rules"),
+      "has the body class"
+    );
+    assert.dom(".body-page").exists("The content is present");
+  });
+
+  test("Login redirect", async function (assert) {
     await visit("/login");
+
     assert.strictEqual(
       currentRouteName(),
       "discovery.latest",
-      "it redirects them to latest unless `login_required`"
+      "it redirects to /latest"
     );
   });
+
+  test("Login-required page", async function (assert) {
+    this.siteSettings.login_required = true;
+    await visit("/login");
+
+    assert.strictEqual(currentRouteName(), "login");
+    assert.dom(".body-page").exists("The content is present");
+    assert.dom(".sign-up-button").exists();
+    assert.dom(".login-button").exists();
+  });
+
+  test("Signup redirect", async function (assert) {
+    await visit("/signup");
+
+    assert.strictEqual(
+      currentRouteName(),
+      "discovery.latest",
+      "it redirects to /latest"
+    );
+  });
+
+  test("Signup redirect with login_required", async function (assert) {
+    this.siteSettings.login_required = true;
+    await visit("/signup");
+
+    assert.strictEqual(currentRouteName(), "login");
+    assert.dom(".body-page").exists("The content is present");
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/tags-test.js b/app/assets/javascripts/discourse/tests/acceptance/tags-test.js
index cfeb1b29446..f7db49b9f4b 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/tags-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/tags-test.js
@@ -542,7 +542,7 @@ acceptance("Tag info", function (needs) {
   test("composer will not set tags if user cannot create them", async function (assert) {
     await visit("/tag/planters");
     await click("#create-topic");
-    let composer = this.owner.lookup("controller:composer");
+    let composer = this.owner.lookup("service:composer");
     assert.strictEqual(composer.get("model").tags, undefined);
   });
 });
@@ -611,7 +611,7 @@ acceptance("Tag show - create topic", function (needs) {
   });
 
   test("composer will not set tags with all/none tags when creating topic", async function (assert) {
-    const composer = this.owner.lookup("controller:composer");
+    const composer = this.owner.lookup("service:composer");
 
     await visit("/tag/none");
     await click("#create-topic");
@@ -623,7 +623,7 @@ acceptance("Tag show - create topic", function (needs) {
   });
 
   test("composer will set tags from selected tag", async function (assert) {
-    const composer = this.owner.lookup("controller:composer");
+    const composer = this.owner.lookup("service:composer");
 
     await visit("/tag/planters");
     await click("#create-topic");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-bulk-actions-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-bulk-actions-test.js
index 0193efa0007..8e9cac03de9 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/topic-bulk-actions-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-bulk-actions-test.js
@@ -1,9 +1,6 @@
 import {
   acceptance,
   count,
-  exists,
-  invisible,
-  query,
   queryAll,
   updateCurrentUser,
 } from "discourse/tests/helpers/qunit-helpers";
@@ -35,85 +32,86 @@ acceptance("Topic - Bulk Actions", function (needs) {
 
     await click(".bulk-select-actions");
 
-    assert.ok(
-      query("#discourse-modal-title").innerHTML.includes(
-        I18n.t("topics.bulk.actions")
-      ),
-      "it opens bulk-select modal"
-    );
+    assert
+      .dom("#discourse-modal-title")
+      .hasText(I18n.t("topics.bulk.actions"), "it opens bulk-select modal");
 
-    assert.ok(
-      query(".bulk-buttons").innerHTML.includes(
-        I18n.t("topics.bulk.change_category")
-      ),
-      "it shows an option to change category"
-    );
+    assert
+      .dom(".bulk-buttons")
+      .includesText(
+        I18n.t("topics.bulk.change_category"),
+        "it shows an option to change category"
+      );
 
-    assert.ok(
-      query(".bulk-buttons").innerHTML.includes(
-        I18n.t("topics.bulk.close_topics")
-      ),
-      "it shows an option to close topics"
-    );
+    assert
+      .dom(".bulk-buttons")
+      .includesText(
+        I18n.t("topics.bulk.close_topics"),
+        "it shows an option to close topics"
+      );
 
-    assert.ok(
-      query(".bulk-buttons").innerHTML.includes(
-        I18n.t("topics.bulk.archive_topics")
-      ),
-      "it shows an option to archive topics"
-    );
+    assert
+      .dom(".bulk-buttons")
+      .includesText(
+        I18n.t("topics.bulk.archive_topics"),
+        "it shows an option to archive topics"
+      );
 
-    assert.ok(
-      query(".bulk-buttons").innerHTML.includes(
-        I18n.t("topics.bulk.notification_level")
-      ),
-      "it shows an option to update notification level"
-    );
+    assert
+      .dom(".bulk-buttons")
+      .includesText(
+        I18n.t("topics.bulk.notification_level"),
+        "it shows an option to update notification level"
+      );
 
-    assert.ok(
-      query(".bulk-buttons").innerHTML.includes(I18n.t("topics.bulk.defer")),
-      "it shows an option to reset read"
-    );
+    assert
+      .dom(".bulk-buttons")
+      .includesText(
+        I18n.t("topics.bulk.defer"),
+        "it shows an option to reset read"
+      );
 
-    assert.ok(
-      query(".bulk-buttons").innerHTML.includes(
-        I18n.t("topics.bulk.unlist_topics")
-      ),
-      "it shows an option to unlist topics"
-    );
+    assert
+      .dom(".bulk-buttons")
+      .includesText(
+        I18n.t("topics.bulk.unlist_topics"),
+        "it shows an option to unlist topics"
+      );
 
-    assert.ok(
-      query(".bulk-buttons").innerHTML.includes(
-        I18n.t("topics.bulk.reset_bump_dates")
-      ),
-      "it shows an option to reset bump dates"
-    );
+    assert
+      .dom(".bulk-buttons")
+      .includesText(
+        I18n.t("topics.bulk.reset_bump_dates"),
+        "it shows an option to reset bump dates"
+      );
 
-    assert.ok(
-      query(".bulk-buttons").innerHTML.includes(
-        I18n.t("topics.bulk.change_tags")
-      ),
-      "it shows an option to replace tags"
-    );
+    assert
+      .dom(".bulk-buttons")
+      .includesText(
+        I18n.t("topics.bulk.change_tags"),
+        "it shows an option to replace tags"
+      );
 
-    assert.ok(
-      query(".bulk-buttons").innerHTML.includes(
-        I18n.t("topics.bulk.append_tags")
-      ),
-      "it shows an option to append tags"
-    );
+    assert
+      .dom(".bulk-buttons")
+      .includesText(
+        I18n.t("topics.bulk.append_tags"),
+        "it shows an option to append tags"
+      );
 
-    assert.ok(
-      query(".bulk-buttons").innerHTML.includes(
-        I18n.t("topics.bulk.remove_tags")
-      ),
-      "it shows an option to remove all tags"
-    );
+    assert
+      .dom(".bulk-buttons")
+      .includesText(
+        I18n.t("topics.bulk.remove_tags"),
+        "it shows an option to remove all tags"
+      );
 
-    assert.ok(
-      query(".bulk-buttons").innerHTML.includes(I18n.t("topics.bulk.delete")),
-      "it shows an option to delete topics"
-    );
+    assert
+      .dom(".bulk-buttons")
+      .includesText(
+        I18n.t("topics.bulk.delete"),
+        "it shows an option to delete topics"
+      );
   });
 
   test("bulk select - delete topics", async function (assert) {
@@ -127,10 +125,9 @@ acceptance("Topic - Bulk Actions", function (needs) {
     await click(".bulk-select-actions");
     await click(".modal-body .delete-topics");
 
-    assert.ok(
-      invisible(".topic-bulk-actions-modal"),
-      "it closes the bulk select modal"
-    );
+    assert
+      .dom(".topic-bulk-actions-modal")
+      .doesNotExist("it closes the bulk select modal");
   });
 
   test("bulk select - Shift click selection", async function (assert) {
@@ -164,10 +161,9 @@ acceptance("Topic - Bulk Actions", function (needs) {
   test("bulk select is not available for users who are not staff or TL4", async function (assert) {
     updateCurrentUser({ moderator: false, admin: false, trust_level: 1 });
     await visit("/latest");
-    assert.notOk(
-      exists(".button.bulk-select"),
-      "non-staff and < TL4 users cannot bulk select"
-    );
+    assert
+      .dom(".button.bulk-select")
+      .doesNotExist("non-staff and < TL4 users cannot bulk select");
   });
 
   test("TL4 users can bulk select", async function (assert) {
@@ -183,86 +179,87 @@ acceptance("Topic - Bulk Actions", function (needs) {
 
     await click(queryAll("input.bulk-select")[0]);
     await click(queryAll("input.bulk-select")[1]);
-
     await click(".bulk-select-actions");
-    assert.ok(
-      query("#discourse-modal-title").innerHTML.includes(
-        I18n.t("topics.bulk.actions")
-      ),
-      "it opens bulk-select modal"
-    );
 
-    assert.ok(
-      query(".bulk-buttons").innerHTML.includes(
-        I18n.t("topics.bulk.change_category")
-      ),
-      "it shows an option to change category"
-    );
+    assert
+      .dom("#discourse-modal-title")
+      .hasText(I18n.t("topics.bulk.actions"), "it opens bulk-select modal");
 
-    assert.ok(
-      query(".bulk-buttons").innerHTML.includes(
-        I18n.t("topics.bulk.close_topics")
-      ),
-      "it shows an option to close topics"
-    );
+    assert
+      .dom(".bulk-buttons")
+      .includesText(
+        I18n.t("topics.bulk.change_category"),
+        "it shows an option to change category"
+      );
 
-    assert.ok(
-      query(".bulk-buttons").innerHTML.includes(
-        I18n.t("topics.bulk.archive_topics")
-      ),
-      "it shows an option to archive topics"
-    );
+    assert
+      .dom(".bulk-buttons")
+      .includesText(
+        I18n.t("topics.bulk.close_topics"),
+        "it shows an option to close topics"
+      );
 
-    assert.ok(
-      query(".bulk-buttons").innerHTML.includes(
-        I18n.t("topics.bulk.notification_level")
-      ),
-      "it shows an option to update notification level"
-    );
+    assert
+      .dom(".bulk-buttons")
+      .includesText(
+        I18n.t("topics.bulk.archive_topics"),
+        "it shows an option to archive topics"
+      );
 
-    assert.notOk(
-      query(".bulk-buttons").innerHTML.includes(I18n.t("topics.bulk.defer")),
-      "it does not show an option to reset read"
-    );
+    assert
+      .dom(".bulk-buttons")
+      .includesText(
+        I18n.t("topics.bulk.notification_level"),
+        "it shows an option to update notification level"
+      );
 
-    assert.ok(
-      query(".bulk-buttons").innerHTML.includes(
-        I18n.t("topics.bulk.unlist_topics")
-      ),
-      "it shows an option to unlist topics"
-    );
+    assert
+      .dom(".bulk-buttons")
+      .doesNotIncludeText(
+        I18n.t("topics.bulk.defer"),
+        "it does not show an option to reset read"
+      );
 
-    assert.ok(
-      query(".bulk-buttons").innerHTML.includes(
-        I18n.t("topics.bulk.reset_bump_dates")
-      ),
-      "it shows an option to reset bump dates"
-    );
+    assert
+      .dom(".bulk-buttons")
+      .includesText(
+        I18n.t("topics.bulk.unlist_topics"),
+        "it shows an option to unlist topics"
+      );
 
-    assert.ok(
-      query(".bulk-buttons").innerHTML.includes(
-        I18n.t("topics.bulk.change_tags")
-      ),
-      "it shows an option to replace tags"
-    );
+    assert
+      .dom(".bulk-buttons")
+      .includesText(
+        I18n.t("topics.bulk.reset_bump_dates"),
+        "it shows an option to reset bump dates"
+      );
 
-    assert.ok(
-      query(".bulk-buttons").innerHTML.includes(
-        I18n.t("topics.bulk.append_tags")
-      ),
-      "it shows an option to append tags"
-    );
+    assert
+      .dom(".bulk-buttons")
+      .includesText(
+        I18n.t("topics.bulk.change_tags"),
+        "it shows an option to replace tags"
+      );
 
-    assert.ok(
-      query(".bulk-buttons").innerHTML.includes(
-        I18n.t("topics.bulk.remove_tags")
-      ),
-      "it shows an option to remove all tags"
-    );
+    assert
+      .dom(".bulk-buttons")
+      .includesText(
+        I18n.t("topics.bulk.append_tags"),
+        "it shows an option to append tags"
+      );
 
-    assert.notOk(
-      query(".bulk-buttons").innerHTML.includes(I18n.t("topics.bulk.delete")),
-      "it does not show an option to delete topics"
-    );
+    assert
+      .dom(".bulk-buttons")
+      .includesText(
+        I18n.t("topics.bulk.remove_tags"),
+        "it shows an option to remove all tags"
+      );
+
+    assert
+      .dom(".bulk-buttons")
+      .doesNotIncludeText(
+        I18n.t("topics.bulk.delete"),
+        "it does not show an option to delete topics"
+      );
   });
 });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-move-posts-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-move-posts-test.js
index 29f46c97df0..5ee88179af7 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/topic-move-posts-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-move-posts-test.js
@@ -1,5 +1,9 @@
-import { acceptance, query } from "discourse/tests/helpers/qunit-helpers";
-import { click, visit } from "@ember/test-helpers";
+import {
+  acceptance,
+  exists,
+  query,
+} from "discourse/tests/helpers/qunit-helpers";
+import { click, fillIn, visit } from "@ember/test-helpers";
 import I18n from "I18n";
 import { test } from "qunit";
 
@@ -85,6 +89,40 @@ acceptance("Topic move posts", function (needs) {
     );
   });
 
+  test("moving posts to existing topic", async function (assert) {
+    await visit("/t/internationalization-localization");
+    await click(".toggle-admin-menu");
+    await click(".topic-admin-multi-select .btn");
+    await click("#post_1 .select-post");
+
+    await click(".selected-posts .move-to-topic");
+
+    assert.ok(
+      query(".choose-topic-modal .radios").innerHTML.includes(
+        I18n.t("topic.merge_topic.radio_label")
+      ),
+      "it shows an option to move to an existing topic"
+    );
+
+    await click(".choose-topic-modal .radios #move-to-existing-topic");
+
+    await fillIn(".choose-topic-modal #choose-topic-title", "Topic");
+
+    assert.notOk(
+      exists(".choose-topic-modal .checkbox-label"),
+      "there is no chronological order checkbox when no topic is selected"
+    );
+
+    await click(".choose-topic-list .existing-topic:first-child input");
+
+    assert.ok(
+      query(".choose-topic-modal .checkbox-label").innerHTML.includes(
+        I18n.t("topic.merge_topic.chronological_order")
+      ),
+      "it shows a checkbox to merge posts in chronological order"
+    );
+  });
+
   test("moving posts from personal message", async function (assert) {
     await visit("/t/pm-for-testing/12");
     await click(".toggle-admin-menu");
@@ -142,4 +180,38 @@ acceptance("Topic move posts", function (needs) {
       "it opens move to modal"
     );
   });
+
+  test("moving posts from personal message to existing message", async function (assert) {
+    await visit("/t/pm-for-testing/12");
+    await click(".toggle-admin-menu");
+    await click(".topic-admin-multi-select .btn");
+    await click("#post_1 .select-post");
+
+    await click(".selected-posts .move-to-topic");
+
+    assert.ok(
+      query(".choose-topic-modal .radios").innerHTML.includes(
+        I18n.t("topic.move_to_existing_message.radio_label")
+      ),
+      "it shows an option to move to an existing message"
+    );
+
+    await click(".choose-topic-modal .radios #move-to-existing-message");
+
+    await fillIn(".choose-topic-modal #choose-message-title", "Topic");
+
+    assert.notOk(
+      exists(".choose-topic-modal .checkbox-label"),
+      "there is no chronological order checkbox when no message is selected"
+    );
+
+    await click(".choose-topic-modal .existing-message:first-of-type input");
+
+    assert.ok(
+      query(".choose-topic-modal .checkbox-label").innerHTML.includes(
+        I18n.t("topic.merge_topic.chronological_order")
+      ),
+      "it shows a checkbox to merge posts in chronological order"
+    );
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-notifications-button-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-notifications-button-test.js
index 9e9410c7e5e..cbdde122f6b 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/topic-notifications-button-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-notifications-button-test.js
@@ -34,7 +34,7 @@ acceptance("Topic Notifications button", function (needs) {
     );
 
     const timelineNotificationOptions = selectKit(
-      ".topic-timeline .widget-component-connector .topic-notifications-options"
+      ".topic-timeline .topic-notifications-options"
     );
 
     assert.strictEqual(
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-post-decorate-cooked-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-post-decorate-cooked-test.js
new file mode 100644
index 00000000000..b9b7c3d07bf
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-post-decorate-cooked-test.js
@@ -0,0 +1,70 @@
+import Component from "@glimmer/component";
+import { hbs } from "ember-cli-htmlbars";
+import { setComponentTemplate } from "@ember/component";
+import { test } from "qunit";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { visit } from "@ember/test-helpers";
+import { withPluginApi } from "discourse/lib/plugin-api";
+
+acceptance("Acceptance | decorateCookedElement", function () {
+  test("decorator with renderGlimmer works", async function (assert) {
+    class DemoComponent extends Component {
+      static eventLog = [];
+      constructor() {
+        DemoComponent.eventLog.push("created");
+        return super(...arguments);
+      }
+      willDestroy() {
+        DemoComponent.eventLog.push("willDestroy");
+      }
+    }
+    setComponentTemplate(
+      hbs`<span class='glimmer-component-content'>Hello world</span>`,
+      DemoComponent
+    );
+
+    withPluginApi(0, (api) => {
+      api.decorateCookedElement(
+        (cooked, helper) => {
+          if (helper.getModel().post_number !== 1) {
+            return;
+          }
+          cooked.innerHTML =
+            "<div class='existing-wrapper'>Some existing content</div>";
+
+          // Create new wrapper element and append
+          cooked.appendChild(
+            helper.renderGlimmer(
+              "div.glimmer-wrapper",
+              hbs`<@data.component />`,
+              { component: DemoComponent }
+            )
+          );
+
+          // Append to existing element
+          helper.renderGlimmer(
+            cooked.querySelector(".existing-wrapper"),
+            hbs` with more content from glimmer`
+          );
+        },
+        { id: "render-glimmer-test" }
+      );
+    });
+
+    await visit("/t/internationalization-localization/280");
+
+    assert.dom("div.glimmer-wrapper").exists();
+    assert.dom("span.glimmer-component-content").exists();
+
+    assert.dom("div.existing-wrapper").exists();
+    assert
+      .dom("div.existing-wrapper")
+      .hasText("Some existing content with more content from glimmer");
+
+    assert.deepEqual(DemoComponent.eventLog, ["created"]);
+
+    await visit("/");
+
+    assert.deepEqual(DemoComponent.eventLog, ["created", "willDestroy"]);
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-quote-button-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-quote-button-test.js
index 241d99d1a32..acf871ed863 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/topic-quote-button-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-quote-button-test.js
@@ -1,6 +1,5 @@
 import {
   acceptance,
-  chromeTest,
   exists,
   query,
   queryAll,
@@ -12,7 +11,6 @@ import { cloneJSON } from "discourse-common/lib/object";
 import topicFixtures from "discourse/tests/fixtures/topic";
 import { test } from "qunit";
 
-// This tests are flaky on Firefox. Fails with `calling set on destroyed object`
 acceptance("Topic - Quote button - logged in", function (needs) {
   needs.user();
   needs.settings({
@@ -33,50 +31,41 @@ acceptance("Topic - Quote button - logged in", function (needs) {
     );
   });
 
-  chromeTest(
-    "Does not show the quote share buttons by default",
-    async function (assert) {
-      await visit("/t/internationalization-localization/280");
-      await selectText("#post_5 blockquote");
-      assert.ok(exists(".insert-quote"), "it shows the quote button");
-      assert.ok(!exists(".quote-sharing"), "it does not show quote sharing");
-    }
-  );
+  test("Does not show the quote share buttons by default", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+    await selectText("#post_5 blockquote");
+    assert.ok(exists(".insert-quote"), "it shows the quote button");
+    assert.ok(!exists(".quote-sharing"), "it does not show quote sharing");
+  });
 
-  chromeTest(
-    "Shows quote share buttons with the right site settings",
-    async function (assert) {
-      this.siteSettings.share_quote_visibility = "all";
+  test("Shows quote share buttons with the right site settings", async function (assert) {
+    this.siteSettings.share_quote_visibility = "all";
 
-      await visit("/t/internationalization-localization/280");
-      await selectText("#post_5 blockquote");
+    await visit("/t/internationalization-localization/280");
+    await selectText("#post_5 blockquote");
 
-      assert.ok(exists(".quote-sharing"), "it shows the quote sharing options");
-      assert.ok(
-        exists(`.quote-sharing .btn[title='${I18n.t("share.twitter")}']`),
-        "it includes the twitter share button"
-      );
-      assert.ok(
-        exists(`.quote-sharing .btn[title='${I18n.t("share.email")}']`),
-        "it includes the email share button"
-      );
-    }
-  );
+    assert.ok(exists(".quote-sharing"), "it shows the quote sharing options");
+    assert.ok(
+      exists(`.quote-sharing .btn[title='${I18n.t("share.twitter")}']`),
+      "it includes the twitter share button"
+    );
+    assert.ok(
+      exists(`.quote-sharing .btn[title='${I18n.t("share.email")}']`),
+      "it includes the email share button"
+    );
+  });
 
-  chromeTest(
-    "Quoting a Onebox should not copy the formatting of the rendered Onebox",
-    async function (assert) {
-      await visit("/t/topic-for-group-moderators/2480");
-      await selectText("#post_3 aside.onebox p");
-      await click(".insert-quote");
+  test("Quoting a Onebox should not copy the formatting of the rendered Onebox", async function (assert) {
+    await visit("/t/topic-for-group-moderators/2480");
+    await selectText("#post_3 aside.onebox p");
+    await click(".insert-quote");
 
-      assert.strictEqual(
-        query(".d-editor-input").value.trim(),
-        '[quote="group_moderator, post:3, topic:2480"]\nhttps://example.com/57350945\n[/quote]',
-        "quote only contains a link"
-      );
-    }
-  );
+    assert.strictEqual(
+      query(".d-editor-input").value.trim(),
+      '[quote="group_moderator, post:3, topic:2480"]\nhttps://example.com/57350945\n[/quote]',
+      "quote only contains a link"
+    );
+  });
 });
 
 acceptance("Closed Topic - Quote button - logged in", function (needs) {
@@ -90,7 +79,7 @@ acceptance("Closed Topic - Quote button - logged in", function (needs) {
     server.get("/t/280.json", () => helper.response(topicResponse));
   });
 
-  chromeTest("Shows quote button in closed topics", async function (assert) {
+  test("Shows quote button in closed topics", async function (assert) {
     await visit("/t/internationalization-localization/280");
     await selectText("#post_1 .cooked p:first-child");
     assert.ok(exists(".insert-quote"), "it shows the quote button");
@@ -111,60 +100,48 @@ acceptance("Topic - Quote button - anonymous", function (needs) {
     share_quote_buttons: "twitter|email",
   });
 
-  chromeTest(
-    "Shows quote share buttons with the right site settings",
-    async function (assert) {
-      await visit("/t/internationalization-localization/280");
-      await selectText("#post_5 blockquote");
+  test("Shows quote share buttons with the right site settings", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+    await selectText("#post_5 blockquote");
 
-      assert.ok(
-        queryAll(".quote-sharing"),
-        "it shows the quote sharing options"
-      );
-      assert.ok(
-        exists(`.quote-sharing .btn[title='${I18n.t("share.twitter")}']`),
-        "it includes the twitter share button"
-      );
-      assert.ok(
-        exists(`.quote-sharing .btn[title='${I18n.t("share.email")}']`),
-        "it includes the email share button"
-      );
-      assert.ok(!exists(".insert-quote"), "it does not show the quote button");
-    }
-  );
+    assert.ok(queryAll(".quote-sharing"), "it shows the quote sharing options");
+    assert.ok(
+      exists(`.quote-sharing .btn[title='${I18n.t("share.twitter")}']`),
+      "it includes the twitter share button"
+    );
+    assert.ok(
+      exists(`.quote-sharing .btn[title='${I18n.t("share.email")}']`),
+      "it includes the email share button"
+    );
+    assert.ok(!exists(".insert-quote"), "it does not show the quote button");
+  });
 
-  chromeTest(
-    "Shows single share button when site setting only has one item",
-    async function (assert) {
-      this.siteSettings.share_quote_buttons = "twitter";
+  test("Shows single share button when site setting only has one item", async function (assert) {
+    this.siteSettings.share_quote_buttons = "twitter";
 
-      await visit("/t/internationalization-localization/280");
-      await selectText("#post_5 blockquote");
+    await visit("/t/internationalization-localization/280");
+    await selectText("#post_5 blockquote");
 
-      assert.ok(exists(".quote-sharing"), "it shows the quote sharing options");
-      assert.ok(
-        exists(`.quote-sharing .btn[title='${I18n.t("share.twitter")}']`),
-        "it includes the twitter share button"
-      );
-      assert.ok(
-        !exists(".quote-share-label"),
-        "it does not show the Share label"
-      );
-    }
-  );
+    assert.ok(exists(".quote-sharing"), "it shows the quote sharing options");
+    assert.ok(
+      exists(`.quote-sharing .btn[title='${I18n.t("share.twitter")}']`),
+      "it includes the twitter share button"
+    );
+    assert.ok(
+      !exists(".quote-share-label"),
+      "it does not show the Share label"
+    );
+  });
 
-  chromeTest(
-    "Shows nothing when visibility is disabled",
-    async function (assert) {
-      this.siteSettings.share_quote_visibility = "none";
+  test("Shows nothing when visibility is disabled", async function (assert) {
+    this.siteSettings.share_quote_visibility = "none";
 
-      await visit("/t/internationalization-localization/280");
-      await selectText("#post_5 blockquote");
+    await visit("/t/internationalization-localization/280");
+    await selectText("#post_5 blockquote");
 
-      assert.ok(!exists(".quote-sharing"), "it does not show quote sharing");
-      assert.ok(!exists(".insert-quote"), "it does not show the quote button");
-    }
-  );
+    assert.ok(!exists(".quote-sharing"), "it does not show quote sharing");
+    assert.ok(!exists(".insert-quote"), "it does not show the quote button");
+  });
 });
 
 acceptance("Topic - Quote button - keyboard shortcut", function (needs) {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-test.js
index 45a40f095d0..df3aa629f10 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/topic-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-test.js
@@ -1,6 +1,5 @@
 import {
   acceptance,
-  chromeTest,
   count,
   exists,
   publishToMessageBus,
@@ -205,7 +204,7 @@ acceptance("Topic", function (needs) {
     await visit("/t/internationalization-localization/280");
 
     assert.strictEqual(
-      query("#suggested-topics .suggested-topics-title").innerText.trim(),
+      query("#suggested-topics-title").innerText.trim(),
       I18n.t("suggested_topics.title")
     );
   });
@@ -376,67 +375,54 @@ acceptance("Topic featured links", function (needs) {
     assert.ok(!exists(".gap"), "it hides gap");
   });
 
-  chromeTest(
-    "Quoting a quote keeps the original poster name",
-    async function (assert) {
-      await visit("/t/internationalization-localization/280");
-      await selectText("#post_5 blockquote");
-      await click(".quote-button .insert-quote");
+  test("Quoting a quote keeps the original poster name", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+    await selectText("#post_5 blockquote");
+    await click(".quote-button .insert-quote");
 
-      assert.ok(
-        query(".d-editor-input").value.includes(
-          'quote="codinghorror said, post:3, topic:280"'
-        )
-      );
-    }
-  );
+    assert.ok(
+      query(".d-editor-input").value.includes(
+        'quote="codinghorror said, post:3, topic:280"'
+      )
+    );
+  });
 
-  chromeTest(
-    "Quoting a quote of a different topic keeps the original topic title",
-    async function (assert) {
-      await visit("/t/internationalization-localization/280");
-      await selectText("#post_9 blockquote");
-      await click(".quote-button .insert-quote");
+  test("Quoting a quote of a different topic keeps the original topic title", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+    await selectText("#post_9 blockquote");
+    await click(".quote-button .insert-quote");
 
-      assert.ok(
-        query(".d-editor-input").value.includes(
-          'quote="A new topic with a link to another topic, post:3, topic:62"'
-        )
-      );
-    }
-  );
+    assert.ok(
+      query(".d-editor-input").value.includes(
+        'quote="A new topic with a link to another topic, post:3, topic:62"'
+      )
+    );
+  });
 
-  chromeTest(
-    "Quoting a quote with the Reply button keeps the original poster name",
-    async function (assert) {
-      await visit("/t/internationalization-localization/280");
-      await selectText("#post_5 blockquote");
-      await click(".reply");
+  test("Quoting a quote with the Reply button keeps the original poster name", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+    await selectText("#post_5 blockquote");
+    await click(".reply");
 
-      assert.ok(
-        query(".d-editor-input").value.includes(
-          'quote="codinghorror said, post:3, topic:280"'
-        )
-      );
-    }
-  );
+    assert.ok(
+      query(".d-editor-input").value.includes(
+        'quote="codinghorror said, post:3, topic:280"'
+      )
+    );
+  });
 
-  // Using J/K on Firefox clean the text selection, so this won't work there
-  chromeTest(
-    "Quoting a quote with replyAsNewTopic keeps the original poster name",
-    async function (assert) {
-      await visit("/t/internationalization-localization/280");
-      await selectText("#post_5 blockquote");
-      await triggerKeyEvent(document, "keypress", "J");
-      await triggerKeyEvent(document, "keypress", "T");
+  test("Quoting a quote with replyAsNewTopic keeps the original poster name", async function (assert) {
+    await visit("/t/internationalization-localization/280");
+    await selectText("#post_5 blockquote");
+    await triggerKeyEvent(document, "keypress", "J");
+    await triggerKeyEvent(document, "keypress", "T");
 
-      assert.ok(
-        query(".d-editor-input").value.includes(
-          'quote="codinghorror said, post:3, topic:280"'
-        )
-      );
-    }
-  );
+    assert.ok(
+      query(".d-editor-input").value.includes(
+        'quote="codinghorror said, post:3, topic:280"'
+      )
+    );
+  });
 
   test("Quoting by selecting text can mark the quote as full", async function (assert) {
     await visit("/t/internationalization-localization/280");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-timeline-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-timeline-test.js
index ec47b6de834..afd2660f9e1 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/topic-timeline-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-timeline-test.js
@@ -1,10 +1,15 @@
-import { visit } from "@ember/test-helpers";
-import { acceptance, query } from "discourse/tests/helpers/qunit-helpers";
+import { click, currentURL, visit } from "@ember/test-helpers";
+import {
+  acceptance,
+  exists,
+  query,
+} from "discourse/tests/helpers/qunit-helpers";
 import { test } from "qunit";
 
-acceptance("Topic Timeline", function (needs) {
-  needs.user();
-
+acceptance("Glimmer Topic Timeline", function (needs) {
+  needs.user({
+    admin: true,
+  });
   needs.pretender((server, helper) => {
     server.get("/t/129.json", () => {
       return helper.response({
@@ -332,8 +337,64 @@ acceptance("Topic Timeline", function (needs) {
     });
   });
 
+  test("it has a topic admin menu", async function (assert) {
+    await visit("/t/internationalization-localization");
+    assert.ok(
+      exists(".timeline-controls .topic-admin-menu-button"),
+      "admin menu is present"
+    );
+  });
+
+  test("it has a reply-to-post button", async function (assert) {
+    await visit("/t/internationalization-localization");
+    assert.ok(
+      exists(".timeline-footer-controls .reply-to-post"),
+      "reply to post button is present"
+    );
+  });
+
+  test("it has a topic notification button", async function (assert) {
+    await visit("/t/internationalization-localization");
+    assert.ok(
+      exists(".timeline-footer-controls .topic-notifications-button"),
+      "topic notifications button is present"
+    );
+  });
+
   test("Shows dates of first and last posts", async function (assert) {
     await visit("/t/deleted-topic-with-whisper-post/129");
-    assert.strictEqual(query(".now-date").innerText, "Jul 2020");
+    assert.strictEqual(
+      query(".timeline-date-wrapper .now-date").innerText,
+      "Jul 2020"
+    );
+  });
+
+  test("selecting start-date navigates you to the first post", async function (assert) {
+    await visit("/t/internationalization-localization/280/2");
+    await click(".timeline-date-wrapper .start-date");
+    assert.strictEqual(
+      currentURL(),
+      "/t/internationalization-localization/280/1",
+      "navigates to the first post"
+    );
+  });
+
+  test("selecting now-date navigates you to the last post", async function (assert) {
+    await visit("/t/internationalization-localization/280/1");
+    await click(".timeline-date-wrapper .now-date");
+    assert.strictEqual(
+      currentURL(),
+      "/t/internationalization-localization/280/11",
+      "navigates to the latest post"
+    );
+  });
+
+  test("clicking the timeline padding updates the position", async function (assert) {
+    await visit("/t/internationalization-localization/280/2");
+    await click(".timeline-scrollarea .timeline-padding");
+    assert.notOk(
+      currentURL().includes("/280/2"),
+      "The position of the currently viewed post has been updated from it's initial position"
+    );
   });
 });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-activity-read-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-activity-read-test.js
index 15aaaa2e14d..b46bc976331 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-activity-read-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-activity-read-test.js
@@ -24,12 +24,11 @@ acceptance("User Activity / Read - bulk actions", function (needs) {
     await click(queryAll("input.bulk-select")[1]);
     await click("button.bulk-select-actions");
 
-    await click("div.bulk-buttons button:nth-child(2)"); // the Close Topics button
+    await click("div.bulk-buttons button.bulk-actions__close-topics");
 
-    assert.notOk(
-      exists("div.bulk-buttons"),
-      "The bulk actions modal was closed"
-    );
+    assert
+      .dom("div.bulk-buttons")
+      .doesNotExist("The bulk actions modal was closed");
   });
 });
 
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-activity-replies-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-activity-replies-test.js
index 431c0d28717..a08ad5b914f 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-activity-replies-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-activity-replies-test.js
@@ -1,6 +1,6 @@
 import { acceptance, query } from "../helpers/qunit-helpers";
 import { test } from "qunit";
-import { click, visit } from "@ember/test-helpers";
+import { visit } from "@ember/test-helpers";
 import I18n from "I18n";
 
 acceptance("User Activity / Replies - empty state", function (needs) {
@@ -33,39 +33,3 @@ acceptance("User Activity / Replies - empty state", function (needs) {
     );
   });
 });
-
-acceptance("User Activity / Replies - Download All", function (needs) {
-  const currentUser = "eviltrout";
-  const anotherUser = "charlie";
-  needs.user();
-  needs.pretender((server, helper) => {
-    server.post("/export_csv/export_entity.json", () => {
-      return helper.response({});
-    });
-  });
-
-  test("Can see and trigger download for own data replies", async function (assert) {
-    await visit(`/u/${currentUser}/activity`);
-
-    assert.ok(query(".user-additional-controls .btn"), "button exists");
-
-    await click(".user-additional-controls .btn");
-    await click("#dialog-holder .btn-primary");
-
-    assert.equal(
-      query(".dialog-body").innerText.trim(),
-      I18n.t("user.download_archive.success")
-    );
-
-    await click("#dialog-holder .btn-primary");
-  });
-
-  test("Cannot see 'Download All' button for another user", async function (assert) {
-    await visit(`/u/${anotherUser}/activity`);
-
-    assert.notOk(
-      query(".user-additional-controls .btn"),
-      "download button is not present"
-    );
-  });
-});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-card-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-card-test.js
index 43904e65b7b..6c8118171b5 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-card-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-card-test.js
@@ -1,3 +1,4 @@
+import I18n from "I18n";
 import {
   acceptance,
   exists,
@@ -14,7 +15,7 @@ acceptance("User Card - Show Local Time", function (needs) {
   needs.settings({ display_local_time_in_user_card: true });
 
   test("user card local time - does not update timezone for another user", async function (assert) {
-    User.current().timezone = "Australia/Brisbane";
+    User.current().user_option.timezone = "Australia/Brisbane";
 
     await visit("/t/internationalization-localization/280");
     await click('a[data-user-card="charlie"]');
@@ -36,7 +37,7 @@ acceptance(
       server.get("/u/eviltrout/card.json", () => helper.response(cardResponse));
     });
 
-    test("it displays the person's username followed by ther fullname", async function (assert) {
+    test("it displays the person's username followed by their fullname", async function (assert) {
       await visit("/t/this-is-a-test-topic/9");
       await click('a[data-user-card="eviltrout"]');
 
@@ -98,3 +99,68 @@ acceptance("User Card - User Status", function (needs) {
     assert.notOk(exists(".user-card h3.user-status"));
   });
 });
+
+acceptance("User Card - Hidden Profile", function (needs) {
+  needs.user();
+  needs.pretender((server, helper) => {
+    server.get("/u/eviltrout/card.json", () =>
+      helper.response({
+        user: {
+          id: 6,
+          username: "eviltrout",
+          name: null,
+          avatar_template: "/letter_avatar_proxy/v4/letter/f/8edcca/{size}.png",
+          profile_hidden: true,
+          title: null,
+          primary_group_name: null,
+        },
+      })
+    );
+  });
+
+  test("it shows less information", async function (assert) {
+    await visit("/t/this-is-a-test-topic/9");
+    await click('a[data-user-card="eviltrout"]');
+
+    assert.equal(
+      query(".user-card .name-username-wrapper").innerText,
+      "eviltrout"
+    );
+    assert.equal(
+      query(".user-card .profile-hidden").innerText,
+      I18n.t("user.profile_hidden")
+    );
+  });
+});
+
+acceptance("User Card - Inactive user", function (needs) {
+  needs.user();
+  needs.pretender((server, helper) => {
+    server.get("/u/eviltrout/card.json", () =>
+      helper.response({
+        user: {
+          id: 6,
+          username: "eviltrout",
+          name: null,
+          avatar_template: "/letter_avatar_proxy/v4/letter/f/8edcca/{size}.png",
+          inactive: true,
+        },
+      })
+    );
+  });
+
+  test("it shows less information", async function (assert) {
+    await visit("/t/this-is-a-test-topic/9");
+    await click('a[data-user-card="eviltrout"]');
+
+    assert.equal(
+      query(".user-card .name-username-wrapper").innerText,
+      "eviltrout"
+    );
+
+    assert.equal(
+      query(".user-card .inactive-user").innerText,
+      I18n.t("user.inactive_user")
+    );
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-deleted-posts-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-deleted-posts-test.js
new file mode 100644
index 00000000000..2b589360ff3
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-deleted-posts-test.js
@@ -0,0 +1,29 @@
+import { acceptance } from "../helpers/qunit-helpers";
+import { test } from "qunit";
+import postFixtures from "discourse/tests/fixtures/post";
+import { cloneJSON } from "discourse-common/lib/object";
+import { visit } from "@ember/test-helpers";
+
+acceptance("User's deleted posts page", function (needs) {
+  needs.user();
+
+  needs.pretender((server, helper) => {
+    server.get(`/posts/eviltrout/deleted`, () => {
+      const post1 = cloneJSON(postFixtures["/posts/398"]);
+      post1.excerpt = "Topic #1";
+      const post2 = cloneJSON(postFixtures["/posts/98737532"]);
+      post2.excerpt = "Another topic's text";
+
+      return helper.response([post1, post2]);
+    });
+  });
+
+  test("Displays the posts", async function (assert) {
+    await visit(`/u/eviltrout/deleted-posts`);
+
+    assert.dom(".user-stream-item [data-topic-id='280']").hasText("Topic #1");
+    assert
+      .dom(".user-stream-item [data-topic-id='34']")
+      .hasText("Another topic's text");
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js
index 34177d934d6..5d2515cb4f2 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js
@@ -17,10 +17,10 @@ import TopicFixtures from "discourse/tests/fixtures/topic";
 import { Promise } from "rsvp";
 import { later } from "@ember/runloop";
 import I18n from "I18n";
+import DButton from "discourse/components/d-button";
 
 acceptance("User menu", function (needs) {
   needs.user({
-    redesigned_user_menu_enabled: true,
     unread_high_priority_notifications: 73,
     trust_level: 3,
     grouped_unread_notifications: {
@@ -120,9 +120,19 @@ acceptance("User menu", function (needs) {
 
   test("clicking on user menu items", async function (assert) {
     updateCurrentUser({ reviewable_count: 1 });
+
     await visit("/");
     await click(".d-header-icons .current-user");
     await click("#user-menu-button-review-queue");
+
+    assert.strictEqual(
+      query(
+        "#user-menu-button-review-queue .badge-notification"
+      ).textContent.trim(),
+      "8",
+      "updates user's reviewable count based on request's response"
+    );
+
     await click("#quick-access-review-queue li.reviewable.pending a");
 
     assert.strictEqual(
@@ -168,7 +178,7 @@ acceptance("User menu", function (needs) {
           }
 
           get panelComponent() {
-            return "d-button";
+            return DButton;
           }
 
           get title() {
@@ -236,7 +246,7 @@ acceptance("User menu", function (needs) {
           }
 
           get panelComponent() {
-            return "d-button";
+            return DButton;
           }
         };
       });
@@ -256,7 +266,7 @@ acceptance("User menu", function (needs) {
           }
 
           get panelComponent() {
-            return "d-button";
+            return DButton;
           }
         };
       });
@@ -656,6 +666,49 @@ acceptance("User menu", function (needs) {
     );
   });
 
+  test("Extra items added to profile tab via plugin API are rendered properly", async function (assert) {
+    withPluginApi("0.1", (api) => {
+      api.addQuickAccessProfileItem({
+        className: "test-1-item",
+        icon: "wrench",
+        content: "test 1",
+        href: "/test_1_path",
+      });
+
+      api.addQuickAccessProfileItem({
+        className: "test-2-item",
+        content: "test 2",
+        href: "/test_2_path",
+      });
+    });
+
+    await visit("/");
+    await click(".d-header-icons .current-user");
+    await click("#user-menu-button-profile");
+
+    const item1 = query("#quick-access-profile ul li.test-1-item");
+
+    assert.ok(
+      item1.querySelector(".d-icon-wrench"),
+      "The first item's icon is rendered"
+    );
+    assert.ok(
+      item1.querySelector("a").href.endsWith("/test_1_path"),
+      "The first item's link is present with correct href"
+    );
+
+    const item2 = query("#quick-access-profile ul li.test-2-item");
+
+    assert.notOk(
+      item2.querySelector(".d-icon"),
+      "The second item doesn't have an icon"
+    );
+    assert.ok(
+      item2.querySelector("a").href.endsWith("/test_2_path"),
+      "The second item's link is present with correct href"
+    );
+  });
+
   test("the active tab can be clicked again to navigate to a page", async function (assert) {
     updateCurrentUser({ reviewable_count: 1 });
     withPluginApi("0.1", (api) => {
@@ -670,7 +723,7 @@ acceptance("User menu", function (needs) {
           }
 
           get panelComponent() {
-            return "d-button";
+            return DButton;
           }
 
           get linkWhenActive() {
@@ -690,7 +743,7 @@ acceptance("User menu", function (needs) {
           }
 
           get panelComponent() {
-            return "d-button";
+            return DButton;
           }
         };
       });
@@ -738,11 +791,38 @@ acceptance("User menu", function (needs) {
       await click("#site-logo");
     }
   });
+
+  test("tabs have hrefs and can be opened in new window/tab", async function (assert) {
+    await visit("/");
+    await click(".d-header-icons .current-user");
+
+    assert
+      .dom("#user-menu-button-replies")
+      .hasAttribute("href", "/u/eviltrout/notifications/responses");
+
+    // Add a top-level click listener to stub attempts to open a new window/tab
+    const newWindowOpenedAssertion = assert.async();
+    const interceptor = (event) => {
+      event.preventDefault();
+
+      newWindowOpenedAssertion();
+      const target = event.target;
+      assert.strictEqual(target.tagName, "A");
+      assert.true(target.href.endsWith("/u/eviltrout/notifications/responses"));
+    };
+
+    window.addEventListener("click", interceptor);
+
+    try {
+      await click("#user-menu-button-replies", { shiftKey: true });
+    } finally {
+      window.removeEventListener("click", interceptor);
+    }
+  });
 });
 
 acceptance("User menu - Dismiss button", function (needs) {
   needs.user({
-    redesigned_user_menu_enabled: true,
     unread_high_priority_notifications: 10,
     grouped_unread_notifications: {
       [NOTIFICATION_TYPES.bookmark_reminder]: 103,
@@ -802,7 +882,9 @@ acceptance("User menu - Dismiss button", function (needs) {
 
     await click(".user-menu .notifications-dismiss");
     assert.strictEqual(
-      query(".dismiss-notification-confirmation").textContent.trim(),
+      query(
+        ".dismiss-notification-confirmation .modal-body"
+      ).textContent.trim(),
       I18n.t("notifications.dismiss_confirmation.body.default", { count: 10 }),
       "confirmation modal is shown when there are unread high pri notifications"
     );
@@ -838,7 +920,9 @@ acceptance("User menu - Dismiss button", function (needs) {
     await click(".user-menu .notifications-dismiss");
 
     assert.strictEqual(
-      query(".dismiss-notification-confirmation").textContent.trim(),
+      query(
+        ".dismiss-notification-confirmation .modal-body"
+      ).textContent.trim(),
       I18n.t("notifications.dismiss_confirmation.body.bookmarks", {
         count: 103,
       }),
@@ -892,7 +976,9 @@ acceptance("User menu - Dismiss button", function (needs) {
     await click(".user-menu .notifications-dismiss");
 
     assert.strictEqual(
-      query(".dismiss-notification-confirmation").textContent.trim(),
+      query(
+        ".dismiss-notification-confirmation .modal-body"
+      ).textContent.trim(),
       I18n.t("notifications.dismiss_confirmation.body.messages", {
         count: 89,
       }),
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-preferences-account-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-account-test.js
index 83d8162c6cc..00f753bbf88 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-preferences-account-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-account-test.js
@@ -307,3 +307,29 @@ acceptance("User Preferences - Account", function (needs) {
     );
   });
 });
+
+acceptance("User Preferences — Account - Download Archive", function (needs) {
+  const currentUser = "eviltrout";
+  needs.user();
+  needs.pretender((server, helper) => {
+    server.post("/export_csv/export_entity.json", () => {
+      return helper.response({});
+    });
+  });
+
+  test("Can see and trigger download for account data", async function (assert) {
+    await visit(`/u/${currentUser}/preferences/account`);
+
+    assert.ok(query(".btn-request-archive"), "button exists");
+
+    await click(".btn-request-archive");
+    await click("#dialog-holder .btn-primary");
+
+    assert.equal(
+      query(".dialog-body").innerText.trim(),
+      I18n.t("user.download_archive.success")
+    );
+
+    await click("#dialog-holder .btn-primary");
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-preferences-admin-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-admin-test.js
new file mode 100644
index 00000000000..2f873673d23
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-admin-test.js
@@ -0,0 +1,25 @@
+import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
+import { test } from "qunit";
+import { visit } from "@ember/test-helpers";
+
+acceptance("User Preferences Admin", function (needs) {
+  needs.user({ admin: true });
+
+  test("Desktop user admin button", async function (assert) {
+    await visit("/u/eviltrout");
+    assert.ok(exists(".user-admin"), "desktop user admin nav button exists");
+  });
+});
+
+acceptance("User Preferences Admin - Mobile", function (needs) {
+  needs.user({ admin: true });
+  needs.mobileView();
+
+  test("Mobile user admin button", async function (assert) {
+    await visit("/u/eviltrout");
+    assert.ok(
+      exists(".user-nav__admin"),
+      "mobile user admin nav button exists"
+    );
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-preferences-navigation-menu-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-navigation-menu-test.js
new file mode 100644
index 00000000000..2a766fc4cfa
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-navigation-menu-test.js
@@ -0,0 +1,164 @@
+import { test } from "qunit";
+
+import { click, visit } from "@ember/test-helpers";
+
+import {
+  acceptance,
+  updateCurrentUser,
+} from "discourse/tests/helpers/qunit-helpers";
+import Site from "discourse/models/site";
+import I18n from "I18n";
+
+acceptance("User Preferences - Navigation Menu", function (needs) {
+  needs.user();
+
+  test("user enabling sidebar_show_count_of_new_items preference", async function (assert) {
+    const categories = Site.current().categories;
+    const category1 = categories[0];
+
+    updateCurrentUser({
+      sidebar_category_ids: [category1.id],
+    });
+
+    this.container.lookup("service:topic-tracking-state").loadStates([
+      {
+        topic_id: 1,
+        highest_post_number: 1,
+        last_read_post_number: null,
+        created_at: "2022-05-11T03:09:31.959Z",
+        category_id: category1.id,
+        notification_level: null,
+        created_in_new_period: true,
+        treat_as_new_topic_start_date: "2022-05-09T03:17:34.286Z",
+      },
+    ]);
+
+    await visit("/u/eviltrout/preferences/navigation-menu");
+
+    assert
+      .dom(
+        '.sidebar-section-link[data-link-name="everything"] .sidebar-section-link-suffix.icon.unread'
+      )
+      .exists("everything link has a dot before the preference is enabled");
+    assert
+      .dom(
+        `.sidebar-section-link[data-link-name="everything"] .sidebar-section-link-content-badge`
+      )
+      .doesNotExist(
+        "everything link doesn't have badge text before the preference is enabled"
+      );
+
+    assert
+      .dom(
+        `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] .sidebar-section-link-suffix.icon.unread`
+      )
+      .exists("category1 has a dot before the preference is enabled");
+    assert
+      .dom(
+        `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] .sidebar-section-link-content-badge`
+      )
+      .doesNotExist(
+        "category1 doesn't have badge text before the preference is enabled"
+      );
+
+    await click(
+      ".preferences-navigation-menu-navigation .pref-show-count-new-items input"
+    );
+    await click(".save-changes");
+
+    assert
+      .dom(
+        '.sidebar-section-link[data-link-name="everything"] .sidebar-section-link-suffix.icon.unread'
+      )
+      .doesNotExist(
+        "everything link no longer has a dot after the preference is enabled"
+      );
+    assert
+      .dom(
+        `.sidebar-section-link[data-link-name="everything"] .sidebar-section-link-content-badge`
+      )
+      .hasText(
+        I18n.t("sidebar.new_count", { count: 1 }),
+        "everything link now has badge text after the preference is enabled"
+      );
+
+    assert
+      .dom(
+        `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] .sidebar-section-link-suffix.icon.unread`
+      )
+      .doesNotExist(
+        "category1 doesn't have a dot anymore after the preference is enabled"
+      );
+    assert
+      .dom(
+        `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] .sidebar-section-link-content-badge`
+      )
+      .hasText(
+        I18n.t("sidebar.new_count", { count: 1 }),
+        "category1 now has badge text after the preference is enabled"
+      );
+  });
+
+  test("user enabling sidebar_link_to_filtered_list preference", async function (assert) {
+    const categories = Site.current().categories;
+    const category1 = categories[0];
+
+    updateCurrentUser({
+      sidebar_category_ids: [category1.id],
+    });
+
+    this.container.lookup("service:topic-tracking-state").loadStates([
+      {
+        topic_id: 1,
+        highest_post_number: 1,
+        last_read_post_number: null,
+        created_at: "2022-05-11T03:09:31.959Z",
+        category_id: category1.id,
+        notification_level: null,
+        created_in_new_period: true,
+        treat_as_new_topic_start_date: "2022-05-09T03:17:34.286Z",
+      },
+    ]);
+
+    await visit("/u/eviltrout/preferences/navigation-menu");
+
+    assert
+      .dom('.sidebar-section-link[data-link-name="everything"]')
+      .hasAttribute(
+        "href",
+        "/latest",
+        "everything link's href is the latest topics list before the preference is enabled"
+      );
+    assert
+      .dom(
+        `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] .sidebar-section-link`
+      )
+      .hasAttribute(
+        "href",
+        "/c/meta/3",
+        "category1's link href is the latest topics list of the category before the preference is enabled"
+      );
+
+    await click(
+      ".preferences-navigation-menu-navigation .pref-link-to-filtered-list input"
+    );
+    await click(".save-changes");
+
+    assert
+      .dom('.sidebar-section-link[data-link-name="everything"]')
+      .hasAttribute(
+        "href",
+        "/new",
+        "everything link's href is the new topics list after the preference is enabled"
+      );
+    assert
+      .dom(
+        `.sidebar-section-link-wrapper[data-category-id="${category1.id}"] .sidebar-section-link`
+      )
+      .hasAttribute(
+        "href",
+        "/c/meta/3/l/new",
+        "category1's link href is the new topics list of the category after the preference is enabled"
+      );
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-preferences-profile-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-profile-test.js
index 344ff4b6071..1a5ceb620fb 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-preferences-profile-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-profile-test.js
@@ -1,8 +1,4 @@
-import {
-  acceptance,
-  exists,
-  query,
-} from "discourse/tests/helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { click, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 import { cloneJSON } from "discourse-common/lib/object";
@@ -22,33 +18,28 @@ acceptance("User - Preferences - Profile - Featured topic", function (needs) {
   test("setting featured topic on profile", async function (assert) {
     await visit("/u/eviltrout/preferences/profile");
 
-    assert.ok(
-      !exists(".featured-topic-link"),
-      "no featured topic link to present"
-    );
-    assert.ok(
-      !exists(".clear-feature-topic-on-profile-btn"),
-      "clear button not present"
-    );
+    assert
+      .dom(".featured-topic-link")
+      .doesNotExist("no featured topic link to present");
+    assert
+      .dom(".clear-feature-topic-on-profile-btn")
+      .doesNotExist("clear button not present");
 
     await click(".feature-topic-on-profile-btn");
 
-    assert.ok(
-      exists(".feature-topic-on-profile"),
-      "topic picker modal is open"
-    );
+    assert
+      .dom(".feature-topic-on-profile")
+      .exists("topic picker modal is open");
 
-    await click(query('input[name="choose_topic_id"]'));
+    await click('input[name="choose_topic_id"]');
     await click(".save-featured-topic-on-profile");
 
-    assert.ok(
-      exists(".featured-topic-link"),
-      "link to featured topic is present"
-    );
-    assert.ok(
-      exists(".clear-feature-topic-on-profile-btn"),
-      "clear button is present"
-    );
+    assert
+      .dom(".featured-topic-link")
+      .exists("link to featured topic is present");
+    assert
+      .dom(".clear-feature-topic-on-profile-btn")
+      .exists("clear button is present");
   });
 
   test("focused item after closing feature topic modal", async function (assert) {
@@ -56,11 +47,9 @@ acceptance("User - Preferences - Profile - Featured topic", function (needs) {
     await click(".feature-topic-on-profile-btn");
     await click(".modal-close");
 
-    assert.equal(
-      document.activeElement,
-      query(".feature-topic-on-profile-btn"),
-      "it keeps focus on the feature topic button"
-    );
+    assert
+      .dom(".feature-topic-on-profile-btn")
+      .isFocused("it keeps focus on the feature topic button");
   });
 });
 
@@ -72,18 +61,18 @@ acceptance(
     needs.pretender((server, helper) => {
       server.get("/u/eviltrout.json", () => {
         const cloned = cloneJSON(userFixtures["/u/eviltrout.json"]);
+        cloned.user.can_edit = true;
         cloned.user.user_option.default_calendar = "none_selected";
-        return helper.response(200, cloned);
+        return helper.response(cloned);
       });
     });
 
     test("default calendar option is not visible", async function (assert) {
       await visit("/u/eviltrout/preferences/profile");
 
-      assert.ok(
-        !exists("#user-default-calendar"),
-        "option to change default calendar is hidden"
-      );
+      assert
+        .dom("#user-default-calendar")
+        .doesNotExist("option to change default calendar is hidden");
     });
   }
 );
@@ -96,18 +85,18 @@ acceptance(
     needs.pretender((server, helper) => {
       server.get("/u/eviltrout.json", () => {
         const cloned = cloneJSON(userFixtures["/u/eviltrout.json"]);
+        cloned.user.can_edit = true;
         cloned.user.user_option.default_calendar = "google";
-        return helper.response(200, cloned);
+        return helper.response(cloned);
       });
     });
 
     test("default calendar can be changed", async function (assert) {
       await visit("/u/eviltrout/preferences/profile");
 
-      assert.ok(
-        exists("#user-default-calendar"),
-        "option to change default calendar"
-      );
+      assert
+        .dom("#user-default-calendar")
+        .exists("option to change default calendar");
     });
   }
 );
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-preferences-second-factor-backup-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-second-factor-backup-test.js
index ebd73c0bc44..1da4c77afd7 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-preferences-second-factor-backup-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-second-factor-backup-test.js
@@ -32,14 +32,14 @@ acceptance("User Preferences - Second Factor Backup", function (needs) {
   test("second factor backup", async function (assert) {
     updateCurrentUser({ second_factor_enabled: true });
     await visit("/u/eviltrout/preferences/second-factor");
-    await click(".edit-2fa-backup");
+    await click(".new-second-factor-backup");
 
     assert.ok(
-      exists(".second-factor-backup-preferences"),
+      exists(".second-factor-backup-edit-modal"),
       "shows the 2fa backup panel"
     );
 
-    await click(".second-factor-backup-preferences .btn-primary");
+    await click(".second-factor-backup-edit-modal .btn-primary");
 
     assert.ok(exists(".backup-codes-area"), "shows backup codes");
   });
@@ -47,10 +47,14 @@ acceptance("User Preferences - Second Factor Backup", function (needs) {
   test("delete backup codes", async function (assert) {
     updateCurrentUser({ second_factor_enabled: true });
     await visit("/u/eviltrout/preferences/second-factor");
-    await click(".edit-2fa-backup");
-    await click(".second-factor-backup-preferences .btn-primary");
-    await click(".modal-close");
-    await click(".pref-second-factor-backup .btn-danger");
+
+    // create backup codes
+    await click(".new-second-factor-backup");
+    await click(".second-factor-backup-edit-modal .btn-primary");
+    await click(".second-factor-backup-edit-modal .modal-close");
+
+    await click(".two-factor-backup-dropdown .select-kit-header");
+    await click("li[data-name='Disable'");
     assert.strictEqual(
       query("#dialog-title").innerText.trim(),
       "Deleting backup codes"
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-preferences-second-factor-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-second-factor-test.js
index 6f8a1dc8102..603cb13eefb 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-preferences-second-factor-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-second-factor-test.js
@@ -41,6 +41,12 @@ acceptance("User Preferences - Second Factor", function (needs) {
       });
     });
 
+    server.put("/u/security_key.json", () => {
+      return helper.response({
+        success: "OK",
+      });
+    });
+
     server.put("/u/second_factors_backup.json", () => {
       return helper.response({
         backup_codes: ["dsffdsd", "fdfdfdsf", "fddsds"],
@@ -60,8 +66,13 @@ acceptance("User Preferences - Second Factor", function (needs) {
     await click(".new-totp");
     assert.ok(exists(".qr-code img"), "shows qr code image");
 
-    await click(".add-totp");
+    await click(".modal a.show-second-factor-key");
+    assert.ok(
+      exists(".modal .second-factor-key"),
+      "displays second factor key"
+    );
 
+    await click(".add-totp");
     assert.ok(
       query(".alert-error").innerHTML.includes("provide a name and the code"),
       "shows name/token missing error message"
@@ -102,21 +113,34 @@ acceptance("User Preferences - Second Factor", function (needs) {
 
     await fillIn("#password", "secrets");
     await click(".user-preferences .btn-primary");
-    await click(".totp .btn-danger");
+    await click(".token-based-auth-dropdown .select-kit-header");
+    await click("li[data-name='Disable']");
+
     assert.strictEqual(
       query("#dialog-title").innerText.trim(),
       "Deleting an authenticator"
     );
     await click(".dialog-close");
 
-    await click(".security-key .btn-danger");
+    assert.ok(
+      exists(".security-key .second-factor-item"),
+      "User has a physical security key"
+    );
+
+    await click(".security-key-dropdown .select-kit-header");
+    await click("li[data-name='Disable'");
+
     assert.strictEqual(
       query("#dialog-title").innerText.trim(),
       "Deleting an authenticator"
     );
-    await click(".dialog-close");
+    await click(".dialog-footer .btn-danger");
+    assert.notOk(
+      exists(".security-key .second-factor-item"),
+      "security key row is removed after a successful delete"
+    );
 
-    await click(".btn-danger.btn-icon-text");
+    await click(".pref-second-factor-disable-all .btn-danger");
     assert.strictEqual(
       query("#dialog-title").innerText.trim(),
       "Are you sure you want to disable two-factor authentication?"
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-preferences-security-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-security-test.js
index 8eddd0c3ce0..a0654d482de 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-preferences-security-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-security-test.js
@@ -64,9 +64,8 @@ acceptance("User Preferences - Security", function (needs) {
     );
   });
 
-  test("Viewing user api keys when user has redesign user page navigation enabled", async function (assert) {
+  test("Viewing user api keys", async function (assert) {
     updateCurrentUser({
-      redesigned_user_page_nav_enabled: true,
       user_api_keys: [
         {
           id: 1,
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-preferences-sidebar-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-sidebar-test.js
deleted file mode 100644
index 1414abe8fb9..00000000000
--- a/app/assets/javascripts/discourse/tests/acceptance/user-preferences-sidebar-test.js
+++ /dev/null
@@ -1,248 +0,0 @@
-import { test } from "qunit";
-
-import { click, visit } from "@ember/test-helpers";
-
-import {
-  acceptance,
-  exists,
-  updateCurrentUser,
-} from "discourse/tests/helpers/qunit-helpers";
-import selectKit from "discourse/tests/helpers/select-kit-helper";
-
-acceptance("User Preferences - Sidebar", function (needs) {
-  needs.user({
-    sidebar_category_ids: [],
-    sidebar_tags: [],
-    display_sidebar_tags: true,
-  });
-
-  needs.settings({
-    navigation_menu: "sidebar",
-    tagging_enabled: true,
-  });
-
-  let updateUserRequestBody = null;
-
-  needs.hooks.afterEach(() => {
-    updateUserRequestBody = null;
-  });
-
-  needs.pretender((server, helper) => {
-    server.put("/u/eviltrout.json", (request) => {
-      updateUserRequestBody = helper.parsePostData(request.requestBody);
-
-      // if only the howto category is updated, intentionally cause an error
-      if (
-        updateUserRequestBody["sidebar_category_ids[]"]?.[0] === "10" ||
-        updateUserRequestBody["sidebar_tag_names[]"]?.[0] === "gazelle"
-      ) {
-        // This request format will cause an error
-        return helper.response(400, {});
-      } else {
-        return helper.response({
-          user: {
-            sidebar_tags: [
-              { name: "monkey", pm_only: false },
-              { name: "gazelle", pm_only: false },
-            ],
-            sidebar_list_destination: "unread_new",
-          },
-        });
-      }
-    });
-  });
-
-  test("sidebar preferences link is not shown when navigation menu is set to legacy", async function (assert) {
-    this.siteSettings.navigation_menu = "legacy";
-
-    await visit("/u/eviltrout/preferences");
-
-    assert.dom(".nav-sidebar").doesNotExist();
-  });
-
-  test("user encountering error when adding categories to sidebar", async function (assert) {
-    updateCurrentUser({ sidebar_category_ids: [6] });
-
-    await visit("/");
-
-    assert.ok(
-      exists(".sidebar-section-categories .sidebar-section-link-support"),
-      "support category is present in sidebar"
-    );
-
-    await click(".sidebar-section-categories .sidebar-section-header-button");
-
-    const categorySelector = selectKit(".category-selector");
-    await categorySelector.expand();
-    await categorySelector.selectKitSelectRowByName("howto");
-    await categorySelector.deselectItemByName("support");
-
-    await click(".save-changes");
-
-    assert.deepEqual(
-      updateUserRequestBody["sidebar_category_ids[]"],
-      ["10"],
-      "contains the right request body to update user's sidebar category links"
-    );
-
-    assert.ok(exists(".dialog-body"), "error message is displayed");
-
-    await click(".dialog-footer .btn-primary");
-
-    assert.ok(
-      !exists(".sidebar-section-categories .sidebar-section-link-howto"),
-      "howto category is not displayed in sidebar"
-    );
-
-    assert.ok(
-      exists(".sidebar-section-categories .sidebar-section-link-support"),
-      "support category is displayed in sidebar"
-    );
-  });
-
-  test("user adding categories to sidebar when default sidebar categories have not been configured", async function (assert) {
-    await visit("/u/eviltrout/preferences/sidebar");
-
-    assert.notOk(exists(".sidebar-section-categories"));
-
-    const categorySelector = selectKit(".category-selector");
-    await categorySelector.expand();
-    await categorySelector.selectKitSelectRowByName("support");
-    await categorySelector.selectKitSelectRowByName("bug");
-
-    await click(".save-changes");
-
-    assert.ok(
-      exists(".sidebar-section-categories .sidebar-section-link-support"),
-      "support category has been added to sidebar"
-    );
-
-    assert.ok(
-      exists(".sidebar-section-categories .sidebar-section-link-bug"),
-      "bug category has been added to sidebar"
-    );
-  });
-
-  test("user adding categories to sidebar when default sidebar categories have been configured", async function (assert) {
-    this.siteSettings.default_sidebar_categories = "5";
-
-    await visit("/");
-    await click(".sidebar-section-categories .sidebar-section-header-button");
-
-    const categorySelector = selectKit(".category-selector");
-    await categorySelector.expand();
-    await categorySelector.selectKitSelectRowByName("support");
-    await categorySelector.selectKitSelectRowByName("bug");
-
-    await click(".save-changes");
-
-    assert.ok(
-      exists(".sidebar-section-categories .sidebar-section-link-support"),
-      "support category has been added to sidebar"
-    );
-
-    assert.ok(
-      exists(".sidebar-section-categories .sidebar-section-link-bug"),
-      "bug category has been added to sidebar"
-    );
-
-    assert.deepEqual(
-      updateUserRequestBody["sidebar_category_ids[]"],
-      ["6", "1"],
-      "contains the right request body to update user's sidebar category links"
-    );
-  });
-
-  test("user encountering error when adding tags to sidebar", async function (assert) {
-    updateCurrentUser({ sidebar_tags: [{ name: "monkey", pm_only: false }] });
-
-    await visit("/");
-
-    assert.ok(
-      exists(".sidebar-section-tags .sidebar-section-link-monkey"),
-      "monkey tag is displayed in sidebar"
-    );
-
-    await click(".sidebar-section-tags .sidebar-section-header-button");
-
-    const tagChooser = selectKit(".tag-chooser");
-    await tagChooser.expand();
-    await tagChooser.selectKitSelectRowByName("gazelle");
-    await tagChooser.deselectItemByName("monkey");
-
-    await click(".save-changes");
-
-    assert.deepEqual(
-      updateUserRequestBody["sidebar_tag_names[]"],
-      ["gazelle"],
-      "contains the right request body to update user's sidebar tag links"
-    );
-
-    assert.ok(exists(".dialog-body"), "error message is displayed");
-
-    await click(".dialog-footer .btn-primary");
-
-    assert.ok(
-      !exists(".sidebar-section-tags .sidebar-section-link-gazelle"),
-      "gazelle tag is not displayed in sidebar"
-    );
-
-    assert.ok(
-      exists(".sidebar-section-tags .sidebar-section-link-monkey"),
-      "monkey tag is displayed in sidebar"
-    );
-  });
-
-  test("user should not see tag chooser when display_sidebar_tags property is false", async function (assert) {
-    updateCurrentUser({ display_sidebar_tags: false });
-
-    await visit("/u/eviltrout/preferences/sidebar");
-
-    assert.ok(!exists(".tag-chooser"), "tag chooser is not displayed");
-  });
-
-  test("user adding tags to sidebar when default tags have not been configured", async function (assert) {
-    await visit("/u/eviltrout/preferences/sidebar");
-
-    const tagChooser = selectKit(".tag-chooser");
-    await tagChooser.expand();
-    await tagChooser.selectKitSelectRowByName("monkey");
-
-    await click(".save-changes");
-
-    assert.ok(
-      exists(".sidebar-section-tags .sidebar-section-link-monkey"),
-      "monkey tag has been added to sidebar"
-    );
-  });
-
-  test("user adding tags to sidebar when default tags have been configured", async function (assert) {
-    this.siteSettings.default_sidebar_tags = "tag1|tag2";
-
-    await visit("/");
-    await click(".sidebar-section-tags .sidebar-section-header-button");
-
-    const tagChooser = selectKit(".tag-chooser");
-    await tagChooser.expand();
-    await tagChooser.selectKitSelectRowByName("monkey");
-    await tagChooser.selectKitSelectRowByName("gazelle");
-
-    await click(".save-changes");
-
-    assert.ok(
-      exists(".sidebar-section-tags .sidebar-section-link-monkey"),
-      "monkey tag has been added to sidebar"
-    );
-
-    assert.ok(
-      exists(".sidebar-section-tags .sidebar-section-link-gazelle"),
-      "gazelle tag has been added to sidebar"
-    );
-
-    assert.deepEqual(
-      updateUserRequestBody["sidebar_tag_names[]"],
-      ["monkey", "gazelle"],
-      "contains the right request body to update user's sidebar tag links"
-    );
-  });
-});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-preferences-tracking-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-tracking-test.js
index 81be6acbbf6..68b8f980ed4 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-preferences-tracking-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-tracking-test.js
@@ -4,9 +4,7 @@ import { test } from "qunit";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
 
 acceptance("User Preferences - Tracking", function (needs) {
-  needs.user({
-    redesigned_user_page_nav_enabled: true,
-  });
+  needs.user();
 
   let putRequestData;
 
@@ -198,6 +196,22 @@ acceptance("User Preferences - Tracking", function (needs) {
     });
   });
 
+  test("additional precedence option when one category is watched and tag is muted", async function (assert) {
+    this.siteSettings.tagging_enabled = true;
+
+    await visit("/u/eviltrout/preferences/tracking");
+
+    const mutedTagsSelector = selectKit(
+      ".tracking-controls__muted-tags .tag-chooser"
+    );
+
+    assert.dom(".user-preferences__watched-precedence-over-muted").doesNotExist;
+    await mutedTagsSelector.expand();
+    await mutedTagsSelector.selectRowByValue("dog");
+
+    assert.dom(".user-preferences__watched-precedence-over-muted").exists();
+  });
+
   test("tracking category which is set to regular notification level for user when mute_all_categories_by_default site setting is disabled", async function (assert) {
     this.siteSettings.tagging_enabled = false;
 
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-private-messages-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-private-messages-test.js
index 9ac356da93e..ae50319aebd 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-private-messages-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-private-messages-test.js
@@ -44,6 +44,27 @@ acceptance(
       );
     });
 
+    test("viewing group messages on subfolder setup", async function (assert) {
+      const router = this.container.lookup("router:main");
+      const originalRootURL = router.rootURL;
+
+      try {
+        router.set("rootURL", "/forum/");
+
+        await visit("/forum/u/eviltrout/messages");
+
+        const messagesDropdown = selectKit(".user-nav-messages-dropdown");
+
+        assert.strictEqual(
+          messagesDropdown.header().name(),
+          I18n.t("user.messages.inbox"),
+          "User personal inbox is selected in dropdown"
+        );
+      } finally {
+        router.set("rootURL", originalRootURL);
+      }
+    });
+
     test("viewing messages of another user", async function (assert) {
       updateCurrentUser({ id: 5, username: "charlie" });
 
@@ -62,16 +83,15 @@ acceptance(
   }
 );
 
-function testUserPrivateMessagesWithGroupMessages(needs, customUserProps) {
-  let fetchedNew;
-  let fetchUserNew;
-  let fetchedGroupNew;
+let fetchedNew;
+let fetchUserNew;
+let fetchedGroupNew;
 
+function withGroupMessagesSetup(needs) {
   needs.user({
     id: 5,
     username: "charlie",
     groups: [{ id: 14, name: "awesome_group", has_messages: true }],
-    ...(customUserProps || {}),
   });
 
   needs.site({
@@ -206,492 +226,425 @@ function testUserPrivateMessagesWithGroupMessages(needs, customUserProps) {
       });
     });
   });
+}
 
-  const publishReadToMessageBus = function (opts = {}) {
-    return publishToMessageBus(
-      `/private-message-topic-tracking-state/user/${opts.userId || 5}`,
-      {
-        topic_id: opts.topicId,
-        message_type: "read",
-        payload: {
-          last_read_post_number: 2,
-          highest_post_number: 2,
-          notification_level: 2,
-        },
-      }
-    );
-  };
-
-  const publishUnreadToMessageBus = function (opts = {}) {
-    return publishToMessageBus(
-      `/private-message-topic-tracking-state/user/${opts.userId || 5}`,
-      {
-        topic_id: opts.topicId,
-        message_type: "unread",
-        payload: {
-          last_read_post_number: 1,
-          highest_post_number: 2,
-          notification_level: 2,
-          group_ids: opts.groupIds || [],
-        },
-      }
-    );
-  };
-
-  const publishNewToMessageBus = function (opts = {}) {
-    return publishToMessageBus(
-      `/private-message-topic-tracking-state/user/${opts.userId || 5}`,
-      {
-        topic_id: opts.topicId,
-        message_type: "new_topic",
-        payload: {
-          last_read_post_number: null,
-          highest_post_number: 1,
-          group_ids: opts.groupIds || [],
-        },
-      }
-    );
-  };
-
-  const publishGroupArchiveToMessageBus = function (opts) {
-    return publishToMessageBus(
-      `/private-message-topic-tracking-state/group/${opts.groupIds[0]}`,
-      {
-        topic_id: opts.topicId,
-        message_type: "group_archive",
-        payload: {
-          group_ids: opts.groupIds,
-          acting_user_id: opts.actingUserId,
-        },
-      }
-    );
-  };
-
-  const publishGroupUnreadToMessageBus = function (opts) {
-    return publishToMessageBus(
-      `/private-message-topic-tracking-state/group/${opts.groupIds[0]}`,
-      {
-        topic_id: opts.topicId,
-        message_type: "unread",
-        payload: {
-          last_read_post_number: 1,
-          highest_post_number: 2,
-          notification_level: 2,
-          group_ids: opts.groupIds || [],
-        },
-      }
-    );
-  };
-
-  const publishGroupNewToMessageBus = function (opts) {
-    return publishToMessageBus(
-      `/private-message-topic-tracking-state/group/${opts.groupIds[0]}`,
-      {
-        topic_id: opts.topicId,
-        message_type: "new_topic",
-        payload: {
-          last_read_post_number: null,
-          highest_post_number: 1,
-          group_ids: opts.groupIds || [],
-        },
-      }
-    );
-  };
-
-  test("incoming group archive message acted by current user", async function (assert) {
-    await visit("/u/charlie/messages");
-
-    await publishGroupArchiveToMessageBus({
-      groupIds: [14],
-      topicId: 1,
-      actingUserId: 5,
-    });
-
-    assert.ok(
-      !exists(".show-mores"),
-      `does not display the topic incoming info`
-    );
-  });
-
-  test("incoming group archive message on inbox and archive filter", async function (assert) {
-    for (const url of [
-      "/u/charlie/messages/group/awesome_group",
-      "/u/charlie/messages/group/awesome_group/archive",
-    ]) {
-      await visit(url);
-
-      await publishGroupArchiveToMessageBus({ groupIds: [14], topicId: 1 });
-
-      assert.ok(
-        exists(".show-mores"),
-        `${url} displays the topic incoming info`
-      );
+const publishReadToMessageBus = function (opts = {}) {
+  return publishToMessageBus(
+    `/private-message-topic-tracking-state/user/${opts.userId || 5}`,
+    {
+      topic_id: opts.topicId,
+      message_type: "read",
+      payload: {
+        last_read_post_number: 2,
+        highest_post_number: 2,
+        notification_level: 2,
+      },
     }
+  );
+};
 
-    for (const url of ["/u/charlie/messages", "/u/charlie/messages/archive"]) {
-      await visit(url);
+const publishUnreadToMessageBus = function (opts = {}) {
+  return publishToMessageBus(
+    `/private-message-topic-tracking-state/user/${opts.userId || 5}`,
+    {
+      topic_id: opts.topicId,
+      message_type: "unread",
+      payload: {
+        last_read_post_number: 1,
+        highest_post_number: 2,
+        notification_level: 2,
+        group_ids: opts.groupIds || [],
+      },
+    }
+  );
+};
 
-      await publishGroupArchiveToMessageBus({ groupIds: [14], topicId: 1 });
+const publishNewToMessageBus = function (opts = {}) {
+  return publishToMessageBus(
+    `/private-message-topic-tracking-state/user/${opts.userId || 5}`,
+    {
+      topic_id: opts.topicId,
+      message_type: "new_topic",
+      payload: {
+        last_read_post_number: null,
+        highest_post_number: 1,
+        group_ids: opts.groupIds || [],
+      },
+    }
+  );
+};
+
+const publishGroupArchiveToMessageBus = function (opts) {
+  return publishToMessageBus(
+    `/private-message-topic-tracking-state/group/${opts.groupIds[0]}`,
+    {
+      topic_id: opts.topicId,
+      message_type: "group_archive",
+      payload: {
+        group_ids: opts.groupIds,
+        acting_user_id: opts.actingUserId,
+      },
+    }
+  );
+};
+
+const publishGroupUnreadToMessageBus = function (opts) {
+  return publishToMessageBus(
+    `/private-message-topic-tracking-state/group/${opts.groupIds[0]}`,
+    {
+      topic_id: opts.topicId,
+      message_type: "unread",
+      payload: {
+        last_read_post_number: 1,
+        highest_post_number: 2,
+        notification_level: 2,
+        group_ids: opts.groupIds || [],
+      },
+    }
+  );
+};
+
+const publishGroupNewToMessageBus = function (opts) {
+  return publishToMessageBus(
+    `/private-message-topic-tracking-state/group/${opts.groupIds[0]}`,
+    {
+      topic_id: opts.topicId,
+      message_type: "new_topic",
+      payload: {
+        last_read_post_number: null,
+        highest_post_number: 1,
+        group_ids: opts.groupIds || [],
+      },
+    }
+  );
+};
+
+acceptance(
+  "User Private Messages - user with group messages",
+  function (needs) {
+    withGroupMessagesSetup(needs);
+
+    test("incoming group archive message acted by current user", async function (assert) {
+      await visit("/u/charlie/messages");
+
+      await publishGroupArchiveToMessageBus({
+        groupIds: [14],
+        topicId: 1,
+        actingUserId: 5,
+      });
 
       assert.ok(
         !exists(".show-mores"),
-        `${url} does not display the topic incoming info`
+        `does not display the topic incoming info`
       );
-    }
-  });
+    });
 
-  test("incoming unread and new messages on all filter", async function (assert) {
-    await visit("/u/charlie/messages");
+    test("incoming group archive message on inbox and archive filter", async function (assert) {
+      for (const url of [
+        "/u/charlie/messages/group/awesome_group",
+        "/u/charlie/messages/group/awesome_group/archive",
+      ]) {
+        await visit(url);
 
-    await publishUnreadToMessageBus({ topicId: 1 });
-    await publishNewToMessageBus({ topicId: 2 });
+        await publishGroupArchiveToMessageBus({ groupIds: [14], topicId: 1 });
 
-    assert.strictEqual(
-      query(".messages-nav li a.new").innerText.trim(),
-      I18n.t("user.messages.new_with_count", { count: 1 }),
-      "displays the right count"
-    );
+        assert.ok(
+          exists(".show-mores"),
+          `${url} displays the topic incoming info`
+        );
+      }
 
-    assert.strictEqual(
-      query(".messages-nav li a.unread").innerText.trim(),
-      I18n.t("user.messages.unread_with_count", { count: 1 }),
-      "displays the right count"
-    );
-  });
+      for (const url of [
+        "/u/charlie/messages",
+        "/u/charlie/messages/archive",
+      ]) {
+        await visit(url);
 
-  test("incoming new messages while viewing new", async function (assert) {
-    await visit("/u/charlie/messages/new");
+        await publishGroupArchiveToMessageBus({ groupIds: [14], topicId: 1 });
 
-    await publishNewToMessageBus({ topicId: 1 });
+        assert.ok(
+          !exists(".show-mores"),
+          `${url} does not display the topic incoming info`
+        );
+      }
+    });
 
-    assert.strictEqual(
-      query(".messages-nav li a.new").innerText.trim(),
-      I18n.t("user.messages.new_with_count", { count: 1 }),
-      "displays the right count"
-    );
+    test("incoming unread and new messages on all filter", async function (assert) {
+      await visit("/u/charlie/messages");
 
-    assert.ok(exists(".show-mores"), "displays the topic incoming info");
-  });
+      await publishUnreadToMessageBus({ topicId: 1 });
+      await publishNewToMessageBus({ topicId: 2 });
 
-  test("incoming unread messages while viewing unread", async function (assert) {
-    await visit("/u/charlie/messages/unread");
+      assert.strictEqual(
+        query(".user-nav__messages-new").innerText.trim(),
+        I18n.t("user.messages.new_with_count", { count: 1 }),
+        "displays the right count"
+      );
 
-    await publishUnreadToMessageBus();
+      assert.strictEqual(
+        query(".user-nav__messages-unread").innerText.trim(),
+        I18n.t("user.messages.unread_with_count", { count: 1 }),
+        "displays the right count"
+      );
+    });
 
-    assert.strictEqual(
-      query(".messages-nav li a.unread").innerText.trim(),
-      I18n.t("user.messages.unread_with_count", { count: 1 }),
-      "displays the right count"
-    );
+    test("incoming new messages while viewing new", async function (assert) {
+      await visit("/u/charlie/messages/new");
 
-    assert.ok(exists(".show-mores"), "displays the topic incoming info");
-  });
+      await publishNewToMessageBus({ topicId: 1 });
 
-  test("incoming unread and new messages while viewing group unread", async function (assert) {
-    await visit("/u/charlie/messages/group/awesome_group/unread");
+      assert.strictEqual(
+        query(".messages-nav .user-nav__messages-new").innerText.trim(),
+        I18n.t("user.messages.new_with_count", { count: 1 }),
+        "displays the right count"
+      );
 
-    await publishUnreadToMessageBus({ groupIds: [14], topicId: 1 });
-    await publishNewToMessageBus({ groupIds: [14], topicId: 2 });
+      assert.ok(exists(".show-mores"), "displays the topic incoming info");
+    });
 
-    assert.strictEqual(
-      query(".messages-nav li a.unread").innerText.trim(),
-      I18n.t("user.messages.unread_with_count", { count: 1 }),
-      "displays the right count"
-    );
+    test("incoming unread messages while viewing unread", async function (assert) {
+      await visit("/u/charlie/messages/unread");
 
-    assert.strictEqual(
-      query(".messages-nav li a.new").innerText.trim(),
-      I18n.t("user.messages.new_with_count", { count: 1 }),
-      "displays the right count"
-    );
+      await publishUnreadToMessageBus();
 
-    assert.ok(exists(".show-mores"), "displays the topic incoming info");
+      assert.strictEqual(
+        query(".messages-nav .user-nav__messages-unread").innerText.trim(),
+        I18n.t("user.messages.unread_with_count", { count: 1 }),
+        "displays the right count"
+      );
 
-    await visit("/u/charlie/messages/unread");
+      assert.ok(exists(".show-mores"), "displays the topic incoming info");
+    });
 
-    assert.strictEqual(
-      query(".messages-nav li a.unread").innerText.trim(),
-      I18n.t("user.messages.unread"),
-      "displays the right count"
-    );
+    test("incoming unread and new messages while viewing group unread", async function (assert) {
+      await visit("/u/charlie/messages/group/awesome_group/unread");
 
-    assert.strictEqual(
-      query(".messages-nav li a.new").innerText.trim(),
-      I18n.t("user.messages.new"),
-      "displays the right count"
-    );
-  });
+      await publishUnreadToMessageBus({ groupIds: [14], topicId: 1 });
+      await publishNewToMessageBus({ groupIds: [14], topicId: 2 });
 
-  test("incoming messages is not tracked on non user messages route", async function (assert) {
-    await visit("/u/charlie/messages");
-    await visit("/t/13");
+      assert.strictEqual(
+        query(
+          ".messages-nav .user-nav__messages-group-unread"
+        ).innerText.trim(),
+        I18n.t("user.messages.unread_with_count", { count: 1 }),
+        "displays the right count"
+      );
 
-    await publishNewToMessageBus({ topicId: 1, userId: 5 });
+      assert.strictEqual(
+        query(".messages-nav .user-nav__messages-group-new").innerText.trim(),
+        I18n.t("user.messages.new_with_count", { count: 1 }),
+        "displays the right count"
+      );
 
-    await visit("/u/charlie/messages");
+      assert.ok(exists(".show-mores"), "displays the topic incoming info");
 
-    assert.ok(
-      !exists(".show-mores"),
-      "does not display the topic incoming info"
-    );
-  });
+      await visit("/u/charlie/messages/unread");
 
-  test("dismissing all unread messages", async function (assert) {
-    await visit("/u/charlie/messages/unread");
+      assert.strictEqual(
+        query(".messages-nav .user-nav__messages-unread").innerText.trim(),
+        I18n.t("user.messages.unread"),
+        "displays the right count"
+      );
 
-    await publishUnreadToMessageBus({ topicId: 1, userId: 5 });
-    await publishUnreadToMessageBus({ topicId: 2, userId: 5 });
-    await publishUnreadToMessageBus({ topicId: 3, userId: 5 });
+      assert.strictEqual(
+        query(".messages-nav .user-nav__messages-new").innerText.trim(),
+        I18n.t("user.messages.new"),
+        "displays the right count"
+      );
+    });
 
-    assert.strictEqual(
-      count(".topic-list-item"),
-      3,
-      "displays the right topic list"
-    );
+    test("incoming messages is not tracked on non user messages route", async function (assert) {
+      await visit("/u/charlie/messages");
+      await visit("/t/13");
 
-    await click(".btn.dismiss-read");
-    await click("#dismiss-read-confirm");
+      await publishNewToMessageBus({ topicId: 1, userId: 5 });
 
-    assert.strictEqual(
-      query(".messages-nav li a.unread").innerText.trim(),
-      I18n.t("user.messages.unread"),
-      "displays the right count"
-    );
+      await visit("/u/charlie/messages");
 
-    assert.strictEqual(
-      count(".topic-list-item"),
-      0,
-      "displays the right topic list"
-    );
-  });
+      assert.ok(
+        !exists(".show-mores"),
+        "does not display the topic incoming info"
+      );
+    });
 
-  test("dismissing personal unread messages", async function (assert) {
-    await visit("/u/charlie/messages/unread");
+    test("dismissing all unread messages", async function (assert) {
+      await visit("/u/charlie/messages/unread");
 
-    assert.strictEqual(
-      count(".topic-list-item"),
-      3,
-      "displays the right topic list"
-    );
+      await publishUnreadToMessageBus({ topicId: 1, userId: 5 });
+      await publishUnreadToMessageBus({ topicId: 2, userId: 5 });
+      await publishUnreadToMessageBus({ topicId: 3, userId: 5 });
 
-    await click(".btn.dismiss-read");
-    await click("#dismiss-read-confirm");
+      assert.strictEqual(
+        count(".topic-list-item"),
+        3,
+        "displays the right topic list"
+      );
 
-    assert.strictEqual(
-      count(".topic-list-item"),
-      0,
-      "displays the right topic list"
-    );
-  });
+      await click(".btn.dismiss-read");
+      await click("#dismiss-read-confirm");
 
-  test("dismissing group unread messages", async function (assert) {
-    await visit("/u/charlie/messages/group/awesome_group/unread");
+      assert.strictEqual(
+        query(".user-nav__messages-unread").innerText.trim(),
+        I18n.t("user.messages.unread"),
+        "displays the right count"
+      );
 
-    assert.strictEqual(
-      count(".topic-list-item"),
-      3,
-      "displays the right topic list"
-    );
+      assert.strictEqual(
+        count(".topic-list-item"),
+        0,
+        "displays the right topic list"
+      );
+    });
 
-    await click(".btn.dismiss-read");
-    await click("#dismiss-read-confirm");
+    test("dismissing personal unread messages", async function (assert) {
+      await visit("/u/charlie/messages/unread");
 
-    assert.strictEqual(
-      count(".topic-list-item"),
-      0,
-      "displays the right topic list"
-    );
-  });
+      assert.strictEqual(
+        count(".topic-list-item"),
+        3,
+        "displays the right topic list"
+      );
 
-  test("dismissing new messages", async function (assert) {
-    await visit("/u/charlie/messages/new");
+      await click(".btn.dismiss-read");
+      await click("#dismiss-read-confirm");
 
-    await publishNewToMessageBus({ topicId: 1, userId: 5 });
-    await publishNewToMessageBus({ topicId: 2, userId: 5 });
-    await publishNewToMessageBus({ topicId: 3, userId: 5 });
+      assert.strictEqual(
+        count(".topic-list-item"),
+        0,
+        "displays the right topic list"
+      );
+    });
 
-    assert.strictEqual(
-      count(".topic-list-item"),
-      3,
-      "displays the right topic list"
-    );
+    test("dismissing group unread messages", async function (assert) {
+      await visit("/u/charlie/messages/group/awesome_group/unread");
 
-    await click(".btn.dismiss-read");
+      assert.strictEqual(
+        count(".topic-list-item"),
+        3,
+        "displays the right topic list"
+      );
 
-    assert.strictEqual(
-      query(".messages-nav li a.new").innerText.trim(),
-      I18n.t("user.messages.new"),
-      "displays the right count"
-    );
+      await click(".btn.dismiss-read");
+      await click("#dismiss-read-confirm");
 
-    assert.strictEqual(
-      count(".topic-list-item"),
-      0,
-      "displays the right topic list"
-    );
-  });
+      assert.strictEqual(
+        count(".topic-list-item"),
+        0,
+        "displays the right topic list"
+      );
+    });
 
-  test("dismissing personal new messages", async function (assert) {
-    await visit("/u/charlie/messages/new");
+    test("dismissing new messages", async function (assert) {
+      await visit("/u/charlie/messages/new");
 
-    assert.strictEqual(
-      count(".topic-list-item"),
-      3,
-      "displays the right topic list"
-    );
+      await publishNewToMessageBus({ topicId: 1, userId: 5 });
+      await publishNewToMessageBus({ topicId: 2, userId: 5 });
+      await publishNewToMessageBus({ topicId: 3, userId: 5 });
 
-    await click(".btn.dismiss-read");
+      assert.strictEqual(
+        count(".topic-list-item"),
+        3,
+        "displays the right topic list"
+      );
 
-    assert.strictEqual(
-      count(".topic-list-item"),
-      0,
-      "displays the right topic list"
-    );
-  });
+      await click(".btn.dismiss-read");
 
-  test("dismissing new group messages", async function (assert) {
-    await visit("/u/charlie/messages/group/awesome_group/new");
+      assert.strictEqual(
+        query(".messages-nav .user-nav__messages-new").innerText.trim(),
+        I18n.t("user.messages.new"),
+        "displays the right count"
+      );
 
-    assert.strictEqual(
-      count(".topic-list-item"),
-      3,
-      "displays the right topic list"
-    );
+      assert.strictEqual(
+        count(".topic-list-item"),
+        0,
+        "displays the right topic list"
+      );
+    });
 
-    await click(".btn.dismiss-read");
+    test("dismissing personal new messages", async function (assert) {
+      await visit("/u/charlie/messages/new");
 
-    assert.strictEqual(
-      count(".topic-list-item"),
-      0,
-      "displays the right topic list"
-    );
-  });
+      assert.strictEqual(
+        count(".topic-list-item"),
+        3,
+        "displays the right topic list"
+      );
 
-  test("viewing messages when highest read cache has been set for a topic", async function (assert) {
-    try {
-      setHighestReadCache(1, 2);
+      await click(".btn.dismiss-read");
 
+      assert.strictEqual(
+        count(".topic-list-item"),
+        0,
+        "displays the right topic list"
+      );
+    });
+
+    test("dismissing new group messages", async function (assert) {
+      await visit("/u/charlie/messages/group/awesome_group/new");
+
+      assert.strictEqual(
+        count(".topic-list-item"),
+        3,
+        "displays the right topic list"
+      );
+
+      await click(".btn.dismiss-read");
+
+      assert.strictEqual(
+        count(".topic-list-item"),
+        0,
+        "displays the right topic list"
+      );
+    });
+
+    test("viewing messages when highest read cache has been set for a topic", async function (assert) {
+      try {
+        setHighestReadCache(1, 2);
+
+        await visit("/u/charlie/messages");
+
+        assert.strictEqual(
+          query(".topic-post-badges").textContent.trim(),
+          "",
+          "does not display unread posts count badge"
+        );
+      } finally {
+        resetHighestReadCache();
+      }
+    });
+
+    test("viewing messages", async function (assert) {
       await visit("/u/charlie/messages");
 
       assert.strictEqual(
-        query(".topic-post-badges").textContent.trim(),
-        "",
-        "does not display unread posts count badge"
+        count(".topic-list-item"),
+        3,
+        "displays the right topic list"
       );
-    } finally {
-      resetHighestReadCache();
-    }
-  });
 
-  test("viewing messages", async function (assert) {
-    await visit("/u/charlie/messages");
+      assert.strictEqual(
+        query(`tr[data-topic-id="1"] .topic-post-badges`).textContent.trim(),
+        "1",
+        "displays the right unread posts count badge"
+      );
 
-    assert.strictEqual(
-      count(".topic-list-item"),
-      3,
-      "displays the right topic list"
-    );
+      await visit("/u/charlie/messages/group/awesome_group");
 
-    assert.strictEqual(
-      query(`tr[data-topic-id="1"] .topic-post-badges`).textContent.trim(),
-      "1",
-      "displays the right unread posts count badge"
-    );
+      assert.strictEqual(
+        count(".topic-list-item"),
+        2,
+        "displays the right topic list"
+      );
 
-    await visit("/u/charlie/messages/group/awesome_group");
+      assert.ok(
+        exists(".group-notifications-button"),
+        "displays the group notifications button"
+      );
+    });
 
-    assert.strictEqual(
-      count(".topic-list-item"),
-      2,
-      "displays the right topic list"
-    );
-
-    assert.ok(
-      exists(".group-notifications-button"),
-      "displays the group notifications button"
-    );
-  });
-
-  test("suggested messages without new or unread", async function (assert) {
-    await visit("/t/12");
-
-    assert.strictEqual(
-      query(".suggested-topics-message").innerText.trim(),
-      "Want to read more? Browse other messages in personal messages.",
-      "displays the right browse more message"
-    );
-  });
-
-  test("suggested messages with new and unread", async function (assert) {
-    await visit("/t/12");
-
-    await publishNewToMessageBus({ userId: 5, topicId: 1 });
-
-    assert.strictEqual(
-      query(".suggested-topics-message").innerText.trim(),
-      "There is 1 new message remaining, or browse other personal messages",
-      "displays the right browse more message"
-    );
-
-    await publishUnreadToMessageBus({ userId: 5, topicId: 2 });
-
-    assert.strictEqual(
-      query(".suggested-topics-message").innerText.trim(),
-      "There is 1 unread and 1 new message remaining, or browse other personal messages",
-      "displays the right browse more message"
-    );
-
-    await publishReadToMessageBus({ userId: 5, topicId: 2 });
-
-    assert.strictEqual(
-      query(".suggested-topics-message").innerText.trim(),
-      "There is 1 new message remaining, or browse other personal messages",
-      "displays the right browse more message"
-    );
-  });
-
-  test("suggested messages for group messages without new or unread", async function (assert) {
-    await visit("/t/13");
-
-    assert.ok(
-      query(".suggested-topics-message")
-        .innerText.trim()
-        .match(
-          /Want to read more\? Browse other messages in\s+awesome_group\./
-        ),
-      "displays the right browse more message"
-    );
-  });
-
-  test("suggested messages for group messages with new and unread", async function (assert) {
-    await visit("/t/13");
-
-    await publishGroupNewToMessageBus({ groupIds: [14], topicId: 1 });
-
-    assert.ok(
-      query(".suggested-topics-message")
-        .innerText.trim()
-        .match(
-          /There is 1 new message remaining, or browse other messages in\s+awesome_group/
-        ),
-      "displays the right browse more message"
-    );
-
-    await publishGroupUnreadToMessageBus({ groupIds: [14], topicId: 2 });
-
-    assert.ok(
-      query(".suggested-topics-message")
-        .innerText.trim()
-        .match(
-          /There is 1 unread and 1 new message remaining, or browse other messages in\s+awesome_group/
-        ),
-      "displays the right browse more message"
-    );
-  });
-
-  if (customUserProps?.redesigned_user_page_nav_enabled) {
     test("navigating between user messages route with dropdown", async function (assert) {
-      await visit("/u/charlie/messages");
+      await visit("/u/Charlie/messages");
 
       const messagesDropdown = selectKit(".user-nav-messages-dropdown");
 
@@ -701,7 +654,7 @@ function testUserPrivateMessagesWithGroupMessages(needs, customUserProps) {
         "User personal inbox is selected in dropdown"
       );
 
-      await click(".messages-sent");
+      await click(".user-nav__messages-sent");
 
       assert.strictEqual(
         messagesDropdown.header().name(),
@@ -724,7 +677,7 @@ function testUserPrivateMessagesWithGroupMessages(needs, customUserProps) {
         "Group inbox is selected in dropdown"
       );
 
-      await click(".messages-group-new");
+      await click(".user-nav__messages-group-new");
 
       assert.strictEqual(
         messagesDropdown.header().name(),
@@ -780,20 +733,93 @@ function testUserPrivateMessagesWithGroupMessages(needs, customUserProps) {
       }
     });
   }
-}
-
-acceptance(
-  "User Private Messages - user with group messages",
-  function (needs) {
-    return testUserPrivateMessagesWithGroupMessages(needs);
-  }
 );
 
 acceptance(
-  "User Private Messages - user with group messages - redesigned user page nav enabled",
+  "User Private Messages - user with group messages - Mobile",
   function (needs) {
-    return testUserPrivateMessagesWithGroupMessages(needs, {
-      redesigned_user_page_nav_enabled: true,
+    withGroupMessagesSetup(needs);
+    needs.mobileView();
+
+    test("suggested messages without new or unread", async function (assert) {
+      await visit("/t/12");
+
+      assert.strictEqual(
+        query(".suggested-topics-message").innerText.trim(),
+        "Want to read more? Browse other messages in personal messages.",
+        "displays the right browse more message"
+      );
+    });
+
+    test("suggested messages with new and unread", async function (assert) {
+      await visit("/t/12");
+
+      await publishNewToMessageBus({ userId: 5, topicId: 1 });
+
+      assert.strictEqual(
+        query(".suggested-topics-message").innerText.trim(),
+        "There is 1 new message remaining, or browse other personal messages",
+        "displays the right browse more message"
+      );
+
+      await publishUnreadToMessageBus({ userId: 5, topicId: 2 });
+
+      assert.ok(
+        query(".suggested-topics-message")
+          .innerText.trim()
+          .match(
+            /There is 1 unread\s+ and 1 new message remaining, or browse other personal messages/
+          ),
+        "displays the right browse more message"
+      );
+
+      await publishReadToMessageBus({ userId: 5, topicId: 2 });
+
+      assert.strictEqual(
+        query(".suggested-topics-message").innerText.trim(),
+        "There is 1 new message remaining, or browse other personal messages",
+        "displays the right browse more message"
+      );
+    });
+
+    test("suggested messages for group messages without new or unread", async function (assert) {
+      await visit("/t/13");
+
+      assert.ok(
+        query(".suggested-topics-message")
+          .innerText.trim()
+          .match(
+            /Want to read more\? Browse other messages in\s+awesome_group\./
+          ),
+        "displays the right browse more message"
+      );
+    });
+
+    test("suggested messages for group messages with new and unread", async function (assert) {
+      needs.mobileView();
+      await visit("/t/13");
+
+      await publishGroupNewToMessageBus({ groupIds: [14], topicId: 1 });
+
+      assert.ok(
+        query(".suggested-topics-message")
+          .innerText.trim()
+          .match(
+            /There is 1 new message remaining, or browse other messages in\s+awesome_group/
+          ),
+        "displays the right browse more message"
+      );
+
+      await publishGroupUnreadToMessageBus({ groupIds: [14], topicId: 2 });
+
+      assert.ok(
+        query(".suggested-topics-message")
+          .innerText.trim()
+          .match(
+            /There is 1 unread\s+ and 1 new message remaining, or browse other messages in\s+awesome_group/
+          ),
+        "displays the right browse more message"
+      );
     });
   }
 );
@@ -953,10 +979,10 @@ acceptance(
       can_tag_topics: true,
     });
 
-    test("tags are not present on private messages - Mobile mode", async function (assert) {
+    test("tags are present on private messages - Mobile mode", async function (assert) {
       await visit("/u/eviltrout/messages");
       await click(".new-private-message");
-      assert.ok(!exists("#reply-control .mini-tag-chooser"));
+      assert.ok(exists("#reply-control .mini-tag-chooser"));
     });
   }
 );
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-profile-summary-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-profile-summary-test.js
index 169cb95748f..7cdc3574974 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-profile-summary-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-profile-summary-test.js
@@ -13,12 +13,6 @@ let deleteAndBlock = null;
 
 acceptance("User Profile - Summary", function (needs) {
   needs.user();
-  needs.pretender((server, helper) => {
-    server.get("/u/eviltrout.json", () => {
-      const response = cloneJSON(userFixtures["/u/eviltrout.json"]);
-      return helper.response(response);
-    });
-  });
 
   test("Viewing Summary", async function (assert) {
     await visit("/u/eviltrout/summary");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-status-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-status-test.js
index 13cf56be2f4..ed63e7f4ea4 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-status-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-status-test.js
@@ -10,8 +10,8 @@ import { test } from "qunit";
 
 async function openUserStatusModal() {
   await click(".header-dropdown-toggle.current-user");
-  await click(".menu-links-row .user-preferences-link");
-  await click(".user-status button");
+  await click("#user-menu-button-profile");
+  await click(".set-user-status button");
 }
 
 async function pickEmoji(emoji) {
@@ -49,33 +49,6 @@ acceptance("User Status", function (needs) {
     );
   });
 
-  test("doesn't show the user status button on the menu by default", async function (assert) {
-    this.siteSettings.enable_user_status = false;
-
-    await visit("/");
-    await click(".header-dropdown-toggle.current-user");
-    await click(".menu-links-row .user-preferences-link");
-
-    assert.notOk(exists("div.quick-access-panel li.user-status"));
-  });
-
-  test("shows the user status button on the menu when enabled in settings", async function (assert) {
-    this.siteSettings.enable_user_status = true;
-
-    await visit("/");
-    await click(".header-dropdown-toggle.current-user");
-    await click(".menu-links-row .user-preferences-link");
-
-    assert.ok(
-      exists("div.quick-access-panel li.user-status"),
-      "shows the button"
-    );
-    assert.ok(
-      exists("div.quick-access-panel li.user-status svg.d-icon-plus-circle"),
-      "shows the icon on the button"
-    );
-  });
-
   test("shows user status on loaded page", async function (assert) {
     this.siteSettings.enable_user_status = true;
     updateCurrentUser({
@@ -84,19 +57,19 @@ acceptance("User Status", function (needs) {
 
     await visit("/");
     await click(".header-dropdown-toggle.current-user");
-    await click(".menu-links-row .user-preferences-link");
+    await click("#user-menu-button-profile");
 
     assert.equal(
       query(
-        "div.quick-access-panel li.user-status span.d-button-label"
+        "div.quick-access-panel li.set-user-status span.item-label"
       ).textContent.trim(),
       userStatus,
       "shows user status description on the menu"
     );
 
     assert.equal(
-      query("div.quick-access-panel li.user-status img.emoji").alt,
-      `:${userStatusEmoji}:`,
+      query("div.quick-access-panel li.set-user-status img.emoji").alt,
+      `${userStatusEmoji}`,
       "shows user status emoji on the menu"
     );
 
@@ -183,18 +156,18 @@ acceptance("User Status", function (needs) {
     );
 
     await click(".header-dropdown-toggle.current-user");
-    await click(".menu-links-row .user-preferences-link");
+    await click("#user-menu-button-profile");
     assert.equal(
       query(
-        "div.quick-access-panel li.user-status span.d-button-label"
+        "div.quick-access-panel li.set-user-status span.item-label"
       ).textContent.trim(),
       userStatus,
       "shows user status description on the menu"
     );
 
     assert.equal(
-      query("div.quick-access-panel li.user-status img.emoji").alt,
-      `:${userStatusEmoji}:`,
+      query("div.quick-access-panel li.set-user-status img.emoji").alt,
+      `${userStatusEmoji}`,
       "shows user status emoji on the menu"
     );
   });
@@ -212,17 +185,17 @@ acceptance("User Status", function (needs) {
     await click(".btn-primary"); // save
 
     await click(".header-dropdown-toggle.current-user");
-    await click(".menu-links-row .user-preferences-link");
+    await click("#user-menu-button-profile");
     assert.equal(
       query(
-        "div.quick-access-panel li.user-status span.d-button-label"
+        "div.quick-access-panel li.set-user-status span.item-label"
       ).textContent.trim(),
       updatedStatus,
       "shows user status description on the menu"
     );
     assert.equal(
-      query("div.quick-access-panel li.user-status img.emoji").alt,
-      `:${userStatusEmoji}:`,
+      query("div.quick-access-panel li.set-user-status img.emoji").alt,
+      `${userStatusEmoji}`,
       "shows user status emoji on the menu"
     );
   });
@@ -250,11 +223,11 @@ acceptance("User Status", function (needs) {
     await click(".btn-primary"); // save
 
     await click(".header-dropdown-toggle.current-user");
-    await click(".menu-links-row .user-preferences-link");
+    await click("#user-menu-button-profile");
 
     assert.equal(
       query(
-        "div.quick-access-panel li.user-status span.relative-date"
+        "div.quick-access-panel li.set-user-status span.relative-date"
       ).textContent.trim(),
       "1h",
       "shows user status timer on the menu"
@@ -474,7 +447,7 @@ acceptance(
   }
 );
 
-acceptance("User Status - new user menu", function (needs) {
+acceptance("User Status - user menu", function (needs) {
   const userStatus = "off to dentist";
   const userStatusEmoji = "tooth";
   const userId = 1;
@@ -482,8 +455,7 @@ acceptance("User Status - new user menu", function (needs) {
 
   needs.user({
     id: userId,
-    timezone: userTimezone,
-    redesigned_user_menu_enabled: true,
+    "user_option.timezone": userTimezone,
   });
 
   needs.pretender((server, helper) => {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-test.js
index 4e143fe3f08..784883f7c65 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-test.js
@@ -24,6 +24,7 @@ acceptance("User Routes", function (needs) {
       helper.response(400, {})
     );
   });
+
   test("Invalid usernames", async function (assert) {
     try {
       await visit("/u/eviltrout%2F..%2F..%2F/summary");
@@ -52,6 +53,7 @@ acceptance("User Routes", function (needs) {
 
   test("Notifications", async function (assert) {
     await visit("/u/eviltrout/notifications");
+
     assert.ok(
       document.body.classList.contains("user-notifications-page"),
       "has the body class"
@@ -66,16 +68,20 @@ acceptance("User Routes", function (needs) {
     );
 
     updateCurrentUser({ moderator: true, admin: false });
+
     await visit("/u/charlie/summary");
+
     assert.notOk(
-      exists(".user-nav > .user-notifications"),
+      exists(".user-nav > .user-nav__notifications"),
       "does not have the notifications tab"
     );
 
     updateCurrentUser({ moderator: false, admin: true });
+
     await visit("/u/charlie/summary");
+
     assert.ok(
-      exists(".user-nav > .user-notifications"),
+      exists(".user-nav > .user-nav__notifications"),
       "has the notifications tab"
     );
   });
@@ -312,14 +318,14 @@ acceptance(
       );
 
       await notificationLevelDropdown.selectRowByValue("changeToIgnored");
-      assert.ok(exists(".ignore-duration-modal"));
+      assert.ok(exists(".ignore-duration-with-username-modal"));
 
       const durationDropdown = selectKit(
-        ".ignore-duration-modal .future-date-input-selector"
+        ".ignore-duration-with-username-modal .future-date-input-selector"
       );
       await durationDropdown.expand();
       await durationDropdown.selectRowByIndex(0);
-      await click(".modal-footer .ignore-duration-save");
+      await click(".modal-footer .btn-primary");
       await notificationLevelDropdown.expand();
       assert.strictEqual(
         notificationLevelDropdown.selectedRow().value(),
@@ -329,6 +335,30 @@ acceptance(
   }
 );
 
+acceptance("User - Invalid view_user_route setting", function (needs) {
+  needs.settings({
+    view_user_route: "X",
+  });
+
+  test("It defaults to summary", async function (assert) {
+    await visit("/u/eviltrout");
+
+    assert.strictEqual(currentRouteName(), "user.summary");
+  });
+});
+
+acceptance("User - Valid view_user_route setting", function (needs) {
+  needs.settings({
+    view_user_route: "activity",
+  });
+
+  test("It defaults to summary", async function (assert) {
+    await visit("/u/eviltrout");
+
+    assert.strictEqual(currentRouteName(), "userActivity.index");
+  });
+});
+
 acceptance("User - Logout", function (needs) {
   needs.user({ username: "eviltrout" });
 
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-tips-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-tips-test.js
index aae76692250..cd450ff5107 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-tips-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-tips-test.js
@@ -5,16 +5,18 @@ import I18n from "I18n";
 import { test } from "qunit";
 
 acceptance("User Tips - first_notification", function (needs) {
-  needs.user({ unread_high_priority_notifications: 1 });
+  needs.user({ new_personal_messages_notifications_count: 1 });
   needs.site({ user_tips: { first_notification: 1 } });
 
   needs.hooks.beforeEach(() => hideAllUserTips());
   needs.hooks.afterEach(() => hideAllUserTips());
 
   test("Shows first notification user tip", async function (assert) {
+    this.siteSettings.enable_user_tips = true;
+
     await visit("/t/internationalization-localization/280");
     assert.equal(
-      query(".user-tip-title").textContent.trim(),
+      query(".user-tip__title").textContent.trim(),
       I18n.t("user_tips.first_notification.title")
     );
   });
@@ -32,7 +34,7 @@ acceptance("User Tips - topic_timeline", function (needs) {
 
     await visit("/t/internationalization-localization/280");
     assert.equal(
-      query(".user-tip-title").textContent.trim(),
+      query(".user-tip__title").textContent.trim(),
       I18n.t("user_tips.topic_timeline.title")
     );
   });
@@ -50,7 +52,7 @@ acceptance("User Tips - post_menu", function (needs) {
 
     await visit("/t/internationalization-localization/280");
     assert.equal(
-      query(".user-tip-title").textContent.trim(),
+      query(".user-tip__title").textContent.trim(),
       I18n.t("user_tips.post_menu.title")
     );
   });
@@ -63,13 +65,13 @@ acceptance("User Tips - topic_notification_levels", function (needs) {
   needs.hooks.beforeEach(() => hideAllUserTips());
   needs.hooks.afterEach(() => hideAllUserTips());
 
-  test("Shows post menu user tip", async function (assert) {
+  test("Shows topic notification levels user tip", async function (assert) {
     this.siteSettings.enable_user_tips = true;
 
     await visit("/t/internationalization-localization/280");
 
     assert.equal(
-      query(".user-tip-title").textContent.trim(),
+      query(".user-tip__title").textContent.trim(),
       I18n.t("user_tips.topic_notification_levels.title")
     );
   });
@@ -82,12 +84,12 @@ acceptance("User Tips - suggested_topics", function (needs) {
   needs.hooks.beforeEach(() => hideAllUserTips());
   needs.hooks.afterEach(() => hideAllUserTips());
 
-  test("Shows post menu user tip", async function (assert) {
+  test("Shows suggested topics user tip", async function (assert) {
     this.siteSettings.enable_user_tips = true;
 
     await visit("/t/internationalization-localization/280");
     assert.equal(
-      query(".user-tip-title").textContent.trim(),
+      query(".user-tip__title").textContent.trim(),
       I18n.t("user_tips.suggested_topics.title")
     );
   });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/users-test.js b/app/assets/javascripts/discourse/tests/acceptance/users-test.js
index d6ffec8bc65..2dfb845c5f0 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/users-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/users-test.js
@@ -14,7 +14,10 @@ acceptance("User Directory", function () {
       document.body.classList.contains("users-page"),
       "has the body class"
     );
-    assert.ok(exists(".directory table tr"), "has a list of users");
+    assert.ok(
+      exists(".directory .directory-table .directory-table__row"),
+      "has a list of users"
+    );
   });
 
   test("Visit All Time", async function (assert) {
@@ -28,7 +31,10 @@ acceptance("User Directory", function () {
       document.body.classList.contains("users-page"),
       "has the body class"
     );
-    assert.ok(exists(".directory table tr"), "has a list of users");
+    assert.ok(
+      exists(".directory .directory-table .directory-table__row"),
+      "has a list of users"
+    );
   });
 
   test("Visit With Group Filter", async function (assert) {
@@ -37,27 +43,27 @@ acceptance("User Directory", function () {
       document.body.classList.contains("users-page"),
       "has the body class"
     );
-    assert.ok(exists(".directory table tr"), "has a list of users");
+    assert.ok(
+      exists(".directory .directory-table .directory-table__row"),
+      "has a list of users"
+    );
   });
 
   test("Custom user fields are present", async function (assert) {
     await visit("/u");
 
-    const firstRow = query(".users-directory table tr");
-    const columnData = firstRow.querySelectorAll("td");
-    const favoriteColorTd = columnData[columnData.length - 1];
-
-    assert.strictEqual(
-      favoriteColorTd.querySelector("span").textContent,
-      "Blue"
+    const firstRowUserField = query(
+      ".directory .directory-table__body .directory-table__row:first-child .directory-table__value--user-field"
     );
+
+    assert.strictEqual(firstRowUserField.textContent, "Blue");
   });
 
   test("Can sort table via keyboard", async function (assert) {
     await visit("/u");
 
     const secondHeading =
-      ".users-directory table th:nth-child(2) .header-contents";
+      ".users-directory .directory-table__header div:nth-child(2) .header-contents";
 
     await triggerKeyEvent(secondHeading, "keypress", "Enter");
 
@@ -78,7 +84,7 @@ acceptance("User directory - Editing columns", function (needs) {
     const columns = queryAll(
       ".edit-directory-columns-container .edit-directory-column"
     );
-    assert.strictEqual(columns.length, 8);
+    assert.strictEqual(columns.length, 9);
 
     const checked = queryAll(
       ".edit-directory-columns-container .edit-directory-column input[type='checkbox']:checked"
@@ -88,7 +94,7 @@ acceptance("User directory - Editing columns", function (needs) {
     const unchecked = queryAll(
       ".edit-directory-columns-container .edit-directory-column input[type='checkbox']:not(:checked)"
     );
-    assert.strictEqual(unchecked.length, 1);
+    assert.strictEqual(unchecked.length, 2);
   });
 
   const fetchColumns = function () {
@@ -128,6 +134,7 @@ acceptance("User directory - Editing columns", function (needs) {
     await click(moveUserFieldColumnUpBtn);
     await click(moveUserFieldColumnUpBtn);
     await click(moveUserFieldColumnUpBtn);
+    await click(moveUserFieldColumnUpBtn);
 
     columns = fetchColumns();
     assert.strictEqual(
@@ -154,6 +161,7 @@ acceptance("User directory - Editing columns", function (needs) {
       "Topics Viewed",
       "Posts Read",
       "Days Visited",
+      "[en.an_extra_field]",
       "Favorite Color",
     ]);
   });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/welcome-topic-banner-test.js b/app/assets/javascripts/discourse/tests/acceptance/welcome-topic-banner-test.js
deleted file mode 100644
index b09dee87c3d..00000000000
--- a/app/assets/javascripts/discourse/tests/acceptance/welcome-topic-banner-test.js
+++ /dev/null
@@ -1,66 +0,0 @@
-import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
-import { test } from "qunit";
-import { visit } from "@ember/test-helpers";
-import Site from "discourse/models/site";
-
-acceptance("Welcome Topic Banner", function (needs) {
-  needs.user({ admin: true });
-  needs.site({ show_welcome_topic_banner: true });
-
-  test("Is shown on latest", async function (assert) {
-    await visit("/latest");
-    assert.ok(exists(".welcome-cta"), "has the welcome topic banner");
-    assert.ok(
-      exists("button.welcome-cta__button"),
-      "has the welcome topic edit button"
-    );
-  });
-
-  test("Does not show if edited", async function (assert) {
-    const site = Site.current();
-    site.set("show_welcome_topic_banner", false);
-
-    await visit("/latest");
-    assert.ok(!exists(".welcome-cta"), "has the welcome topic banner");
-  });
-
-  test("Does not show on latest with query param tracked present", async function (assert) {
-    await visit("/latest?f=tracked");
-    assert.ok(
-      !exists(".welcome-cta"),
-      "does not have the welcome topic banner"
-    );
-  });
-
-  test("Does not show on latest with query param watched present", async function (assert) {
-    await visit("/latest?f=watched");
-    assert.ok(
-      !exists(".welcome-cta"),
-      "does not have the welcome topic banner"
-    );
-  });
-
-  test("Does not show on /categories page", async function (assert) {
-    await visit("/categories");
-    assert.ok(
-      !exists(".welcome-cta"),
-      "does not have the welcome topic banner"
-    );
-  });
-
-  test("Does not show on /top page", async function (assert) {
-    await visit("/top");
-    assert.ok(
-      !exists(".welcome-cta"),
-      "does not have the welcome topic banner"
-    );
-  });
-
-  test("Does not show on /unseen page", async function (assert) {
-    await visit("/unseen");
-    assert.ok(
-      !exists(".welcome-cta"),
-      "does not have the welcome topic banner"
-    );
-  });
-});
diff --git a/app/assets/javascripts/discourse/tests/addons/truth-helpers/integration/helpers/includes-test.js b/app/assets/javascripts/discourse/tests/addons/truth-helpers/integration/helpers/includes-test.js
index adf2000528d..86abc660620 100644
--- a/app/assets/javascripts/discourse/tests/addons/truth-helpers/integration/helpers/includes-test.js
+++ b/app/assets/javascripts/discourse/tests/addons/truth-helpers/integration/helpers/includes-test.js
@@ -11,14 +11,14 @@ module("Addons | truth-helpers | Integration | includes", function (hooks) {
     this.foo = [1];
     this.bar = 1;
     await render(
-      hbs`{{#if (includes foo bar)}}<span class="test"></span>{{/if}}`
+      hbs`{{#if (includes this.foo this.bar)}}<span class="test"></span>{{/if}}`
     );
 
     assert.ok(exists(".test"), "it returns true when element is found");
 
     this.bar = 2;
     await render(
-      hbs`{{#if (includes foo bar)}}<span class="test"></span>{{/if}}`
+      hbs`{{#if (includes this.foo this.bar)}}<span class="test"></span>{{/if}}`
     );
 
     assert.notOk(exists(".test"), "it returns false when element is not found");
@@ -28,14 +28,14 @@ module("Addons | truth-helpers | Integration | includes", function (hooks) {
     this.foo = "foo";
     this.bar = "f";
     await render(
-      hbs`{{#if (includes foo bar)}}<span class="test"></span>{{/if}}`
+      hbs`{{#if (includes this.foo this.bar)}}<span class="test"></span>{{/if}}`
     );
 
     assert.ok(exists(".test"), "it returns true when element is found");
 
     this.bar = "b";
     await render(
-      hbs`{{#if (includes foo bar)}}<span class="test"></span>{{/if}}`
+      hbs`{{#if (includes this.foo this.bar)}}<span class="test"></span>{{/if}}`
     );
 
     assert.notOk(exists(".test"), "it returns false when element is not found");
diff --git a/app/assets/javascripts/discourse/tests/fixtures/badges-fixture.js b/app/assets/javascripts/discourse/tests/fixtures/badges-fixture.js
index 4ef98caae9e..489fd752b2d 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/badges-fixture.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/badges-fixture.js
@@ -141,7 +141,7 @@ export default {
       },
       {
         id: 2,
-        name: "Regular User",
+        name: "Member",
         description: null,
         grant_count: 467,
         allow_title: false,
@@ -170,7 +170,7 @@ export default {
       },
       {
         id: 4,
-        name: "Elder",
+        name: "Leader",
         description: null,
         grant_count: 4,
         allow_title: true,
diff --git a/app/assets/javascripts/discourse/tests/fixtures/concerns/notification-types.js b/app/assets/javascripts/discourse/tests/fixtures/concerns/notification-types.js
index a75d7721a16..512f63e00c8 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/concerns/notification-types.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/concerns/notification-types.js
@@ -38,4 +38,10 @@ export const NOTIFICATION_TYPES = {
   chat_quoted: 33,
   assigned: 34,
   question_answer_user_commented: 35,
+  watching_category_or_tag: 36,
+  new_features: 37,
+  following: 800,
+  following_created_topic: 801,
+  following_replied: 802,
+  circles_activity: 900,
 };
diff --git a/app/assets/javascripts/discourse/tests/fixtures/discovery-fixtures.js b/app/assets/javascripts/discourse/tests/fixtures/discovery-fixtures.js
index fcd1df6fce8..796875aed70 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/discovery-fixtures.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/discovery-fixtures.js
@@ -4077,7 +4077,7 @@ export default {
       tags: [
         {
           id: 1,
-          name: "test",
+          name: "important",
           topic_count: 2,
           staff: false,
         },
diff --git a/app/assets/javascripts/discourse/tests/fixtures/search-fixtures.js b/app/assets/javascripts/discourse/tests/fixtures/search-fixtures.js
index 78747bbaeb0..5d83fea8a23 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/search-fixtures.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/search-fixtures.js
@@ -643,9 +643,9 @@ export default {
       },
       {
         id: 2507,
-        title: "Getting dev instance to send email?",
-        fancy_title: "Getting dev instance to send email?",
-        slug: "getting-dev-instance-to-send-email",
+        title: "Topic with html in title",
+        fancy_title: "<span id='topic-with-html'>Topic with html in title :+1:</span>",
+        slug: "topic-with-html-in-title",
         posts_count: 19,
         reply_count: 13,
         highest_post_number: 21,
@@ -709,6 +709,111 @@ export default {
           "/letter_avatar/devmach/{size}/5_fcf819f9b3791cb8c87edf29c8984f83.png",
       },
     ],
+    "/tag/important/notifications.json": {
+      users: [{ id: 1, username: "sam", avatar_template: "/images/avatar.png" }],
+      primary_groups: [],
+      topic_list: {
+        can_create_topic: true,
+        draft: null,
+        draft_key: "new_topic",
+        draft_sequence: 4,
+        per_page: 30,
+        tags: [
+          {
+            id: 1,
+            name: "important",
+            topic_count: 2,
+            staff: false,
+          },
+        ],
+        topics: [
+          {
+            id: 16,
+            title: "Dinosaurs are the best",
+            fancy_title: "Dinosaurs are the best",
+            slug: "dinosaurs-are-the-best",
+            posts_count: 1,
+            reply_count: 0,
+            highest_post_number: 1,
+            image_url: null,
+            created_at: "2019-11-12T05:19:52.300Z",
+            last_posted_at: "2019-11-12T05:19:52.848Z",
+            bumped: true,
+            bumped_at: "2019-11-12T05:19:52.848Z",
+            unseen: false,
+            last_read_post_number: 1,
+            unread_posts: 0,
+            pinned: false,
+            unpinned: null,
+            visible: true,
+            closed: false,
+            archived: false,
+            notification_level: 3,
+            bookmarked: false,
+            liked: false,
+            tags: ["test"],
+            views: 2,
+            like_count: 0,
+            has_summary: false,
+            archetype: "regular",
+            last_poster_username: "sam",
+            category_id: 1,
+            pinned_globally: false,
+            featured_link: null,
+            posters: [
+              {
+                extras: "latest single",
+                description: "Original Poster, Most Recent Poster",
+                user_id: 1,
+                primary_group_id: null,
+              },
+            ],
+          },
+          {
+            id: 15,
+            title: "This is a test tagged post",
+            fancy_title: "This is a test tagged post",
+            slug: "this-is-a-test-tagged-post",
+            posts_count: 1,
+            reply_count: 0,
+            highest_post_number: 1,
+            image_url: null,
+            created_at: "2019-11-12T05:19:32.032Z",
+            last_posted_at: "2019-11-12T05:19:32.516Z",
+            bumped: true,
+            bumped_at: "2019-11-12T05:19:32.516Z",
+            unseen: false,
+            last_read_post_number: 1,
+            unread_posts: 0,
+            pinned: false,
+            unpinned: null,
+            visible: true,
+            closed: false,
+            archived: false,
+            notification_level: 3,
+            bookmarked: false,
+            liked: false,
+            tags: ["test"],
+            views: 1,
+            like_count: 0,
+            has_summary: false,
+            archetype: "regular",
+            last_poster_username: "sam",
+            category_id: 3,
+            pinned_globally: false,
+            featured_link: null,
+            posters: [
+              {
+                extras: "latest single",
+                description: "Original Poster, Most Recent Poster",
+                user_id: 1,
+                primary_group_id: null,
+              },
+            ],
+          },
+        ],
+      },
+    },
     categories: [
       {
         id: 7,
diff --git a/app/assets/javascripts/discourse/tests/fixtures/session-fixtures.js b/app/assets/javascripts/discourse/tests/fixtures/session-fixtures.js
index fe0c2dc870f..84e4d5077f9 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/session-fixtures.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/session-fixtures.js
@@ -7,7 +7,6 @@ export default {
       avatar_template: "/user_avatar/localhost/eviltrout/{size}/5275.png",
       name: "Robin Ward",
       unread_notifications: 0,
-      unread_private_messages: 0,
       unread_high_priority_notifications: 0,
       admin: true,
       notification_channel_position: null,
@@ -25,7 +24,6 @@ export default {
       custom_fields: {},
       muted_category_ids: [],
       dismissed_banner_key: null,
-      akismet_review_count: 0,
       can_review: true,
       ignored_users: [],
       groups: [
@@ -51,6 +49,88 @@ export default {
         skip_new_user_tips: false,
         should_be_redirected_to_top: false,
       },
+      sidebar_sections: [
+        {
+          id: 111,
+          title: "Community",
+          section_type: "community",
+          slug: "community",
+          links: [
+            {
+              id: 329,
+              name: "Topics",
+              value: "/latest",
+              icon: "layer-group",
+              external: false,
+              segment: "primary",
+            },
+            {
+              id: 330,
+              name: "Users",
+              value: "/u",
+              icon: "users",
+              external: false,
+              segment: "secondary",
+            },
+            {
+              id: 331,
+              name: "About",
+              value: "/about",
+              icon: "info-circle",
+              external: false,
+              segment: "secondary",
+            },
+            {
+              id: 332,
+              name: "Faq",
+              value: "/faq",
+              icon: "question-circle",
+              external: false,
+              segment: "secondary",
+            },
+            {
+              id: 333,
+              name: "My Posts",
+              value: "/my/activity",
+              icon: "user",
+              external: false,
+              segment: "primary",
+            },
+            {
+              id: 334,
+              name: "Review",
+              value: "/review",
+              icon: "flag",
+              external: false,
+              segment: "secondary",
+            },
+            {
+              id: 335,
+              name: "Admin",
+              value: "/admin",
+              icon: "wrench",
+              external: false,
+              segment: "primary",
+            },
+            {
+              id: 336,
+              name: "Groups",
+              value: "/g",
+              icon: "user-friends",
+              external: false,
+              segment: "secondary",
+            },
+            {
+              id: 337,
+              name: "Badges",
+              value: "/badges",
+              icon: "certificate",
+              external: false,
+              segment: "secondary",
+            },
+          ],
+        },
+      ]
     },
   },
 };
diff --git a/app/assets/javascripts/discourse/tests/fixtures/site-fixtures.js b/app/assets/javascripts/discourse/tests/fixtures/site-fixtures.js
index aedd0baef92..2f419f2610f 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/site-fixtures.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/site-fixtures.js
@@ -699,7 +699,90 @@ export default {
       ],
       displayed_about_plugin_stat_groups: ["chat_messages"],
       hashtag_configurations: { "topic-composer": ["category", "tag"] },
-      hashtag_icons: ["folder", "tag"]
+      hashtag_icons: { "category": "folder", "tag": "tag" },
+      anonymous_sidebar_sections: [
+        {
+          id: 111,
+          title: "Community",
+          links: [
+            {
+              id: 329,
+              name: "Topics",
+              value: "/latest",
+              icon: "layer-group",
+              external: false,
+              segment: "primary",
+            },
+            {
+              id: 330,
+              name: "Users",
+              value: "/u",
+              icon: "users",
+              external: false,
+              segment: "secondary",
+            },
+            {
+              id: 331,
+              name: "About",
+              value: "/about",
+              icon: "info-circle",
+              external: false,
+              segment: "secondary",
+            },
+            {
+              id: 332,
+              name: "Faq",
+              value: "/faq",
+              icon: "question-circle",
+              external: false,
+              segment: "secondary",
+            },
+            {
+              id: 333,
+              name: "My Posts",
+              value: "/my/activity",
+              icon: "user",
+              external: false,
+              segment: "primary",
+            },
+            {
+              id: 334,
+              name: "Review",
+              value: "/review",
+              icon: "flag",
+              external: false,
+              segment: "secondary",
+            },
+            {
+              id: 335,
+              name: "Admin",
+              value: "/admin",
+              icon: "wrench",
+              external: false,
+              segment: "primary",
+            },
+            {
+              id: 336,
+              name: "Groups",
+              value: "/g",
+              icon: "user-friends",
+              external: false,
+              segment: "secondary",
+            },
+            {
+              id: 337,
+              name: "Badges",
+              value: "/badges",
+              icon: "certificate",
+              external: false,
+              segment: "secondary",
+            },
+          ],
+          slug: "community",
+          public: true,
+          section_type: "community",
+        },
+      ],
     },
   },
 };
diff --git a/app/assets/javascripts/discourse/tests/fixtures/site-settings.js b/app/assets/javascripts/discourse/tests/fixtures/site-settings.js
index 75f66c1ceca..0a37ea9ab4b 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/site-settings.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/site-settings.js
@@ -78,8 +78,5 @@ export default {
         value: "",
       },
     ],
-    diags: {
-      last_message_processed: null,
-    },
   },
 };
diff --git a/app/assets/javascripts/discourse/tests/fixtures/static-fixtures.js b/app/assets/javascripts/discourse/tests/fixtures/static-fixtures.js
index b6f2f7f925b..64870151243 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/static-fixtures.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/static-fixtures.js
@@ -1,10 +1,14 @@
 export default {
   "faq.html":
     '\u003Cul class="nav-pills"\u003E\n  \u003Cli\u003E\u003Ca class="active" href="/faq"\u003EFAQ\u003C/a\u003E\u003C/li\u003E\n  \u003Cli\u003E\u003Ca href="/tos"\u003ETerms of Service\u003C/a\u003E\u003C/li\u003E\n  \u003Cli\u003E\u003Ca href="/privacy"\u003EPrivacy\u003C/a\u003E\u003C/li\u003E\n\u003C/ul\u003E\n\n\n\n\u003Cdiv id="civilized"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#civilized"\u003EThis is a Civilized Place for Public Discussion\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Please treat this discussion forum with the same respect you would a public park.  We, too, are a shared community resource \u0026mdash; a place to share skills, knowledge and interests through ongoing conversation.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n    These are not hard and fast rules, merely aids to the human judgment of our community. Use these guidelines to keep this a clean, well-lighted place for civilized public discourse.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="improve"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#improve"\u003EImprove the Discussion\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Help us make this a great place for discussion by always working to improve the discussion in some way, however small. If you are not sure your post adds to the discussion or might detract from its usefulness, think over what you want to say and try again later.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n  The topics discussed here matter to us, and we want you to act as if they matter to you, too. Be respectful of the topics and the people discussing them, even if you disagree with some of what is being said.\n  \u003C/p\u003E\n  \u003Cp\u003E\n  One way to improve the discussion is by discovering ones that are already happening. Please spend some time browsing the topics here before replying or starting your own, and you’ll have a better chance of meeting others who share your interests.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="agreeable"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#agreeable"\u003EBe Agreeable, Even When You Disagree\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  You may wish to respond to something by disagreeing with it. That’s fine. But, remember to \u003Cem\u003Ecriticize ideas, not people\u003C/em\u003E.\n  Please avoid:\n  \u003Cul\u003E\n    \u003Cli\u003EName-calling.\u003C/li\u003E\n    \u003Cli\u003EAd hominem attacks.\u003C/li\u003E\n    \u003Cli\u003EResponding to a post’s tone instead of its actual content.\u003C/li\u003E\n    \u003Cli\u003EKnee-jerk contradiction.\u003C/li\u003E\n  \u003C/ul\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n  Instead, provide reasoned counter-arguments that improve the conversation.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="participate"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#participate"\u003EYour Participation Counts\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  The conversations we have here set the tone for everyone. Help us influence the future of this community by choosing to engage in discussions that make this forum an interesting place to be \u0026mdash; and avoiding those that do not.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n  Discourse provides tools that enable the community to collectively identify the best (and worst) contributions: favorites, bookmarks, likes, flags, replies, edits, and so forth. Use these tools to improve your own experience, and everyone else’s, too.\n  \u003C/p\u003E\n  \u003Cp\u003E\n  Let’s try to leave our park better than we found it.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="flag-problems"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#flag-problems"\u003EIf You See a Problem, Flag It\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Moderators have special authority; they are responsible for this forum. But so are you. With your help, moderators can be community facilitators, not just janitors or police.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n  When you see bad behavior, don’t reply. It encourages the bad behavior by acknowledging it, consumes your energy, and wastes everyone’s time. \u003Ci\u003EJust flag it\u003C/i\u003E. If enough flags accrue, action will be taken, either automatically or by moderator intervention.\n  \u003C/p\u003E\n  \u003Cp\u003E\n  In order to maintain our community, moderators reserve the right to remove any content and any user account for any reason at any time. Moderators do not preview new posts in any way; the moderators and site operators take no responsibility for any content posted by the community.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="be-civil"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#be-civil"\u003EAlways Be Civil\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Nothing sabotages a healthy conversation like rudeness:\n  \u003Cul\u003E\n    \u003Cli\u003EBe civil. Don’t post anything that a reasonable person would consider offensive, abusive, or hate speech.\u003C/li\u003E\n    \u003Cli\u003EKeep it clean. Don’t post anything obscene or sexually explicit.\u003C/li\u003E\n    \u003Cli\u003ERespect each other. Don’t harass or grief anyone,\n      impersonate people, or expose their private information.\u003C/li\u003E\n    \u003Cli\u003ERespect our forum. Don’t post spam or otherwise vandalize the forum.\u003C/li\u003E\n  \u003C/ul\u003E\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n  These are not concrete terms with precise definitions \u0026mdash; avoid\n    even the \u003Ci\u003Eappearance\u003C/i\u003E of any of these things. If you’re unsure, ask yourself how you would feel if your post was featured on the front page of the New York Times.\n  \u003C/p\u003E\n  \u003Cp\u003E\n  This is a public forum, and search engines index these discussions. Keep the language, links, and images safe for family and friends.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="keep-tidy"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#keep-tidy"\u003EKeep It Tidy\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Make the effort to put things in the right place, so that we can spend more time discussing and less cleaning up. So:\n  \u003Cul\u003E\n    \u003Cli\u003EDon’t start a topic in the wrong category.\u003C/li\u003E\n    \u003Cli\u003EDon’t cross-post the same thing in multiple topics.\u003C/li\u003E\n    \u003Cli\u003EDon’t post no-content replies.\u003C/li\u003E\n    \u003Cli\u003EDon’t divert a topic by changing it midstream.\u003C/li\u003E\n    \u003Cli\u003EDon’t sign your posts \u0026mdash; every post has your profile information attached to it.\u003C/li\u003E\n  \u003C/ul\u003E\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n  Rather than posting “+1” or “Agreed”, use the Like button. Rather than taking an existing topic in a radically different direction, use Reply as a New Topic.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="stealing"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#stealing"\u003EPost Only Your Own Stuff\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  You may not post anything digital that belongs to someone else without permission. You may not post descriptions of, links to, or methods for stealing someone’s intellectual property (software, video, audio, images), or for breaking any other law.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="tos"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#tos"\u003ETerms of Service\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Yes, legalese is boring, but we must protect ourselves \u0026ndash; and by extension, you and your data \u0026ndash; against unfriendly folks. We have a \u003Ca href="/tos"\u003ETerms of Service\u003C/a\u003E describing your (and our) behavior and rights related to content, privacy, and laws. To use this service, you must agree to abide by our \u003Ca href="/tos"\u003ETOS\u003C/a\u003E.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n\u003C/div\u003E\n\n',
+  "conduct.html":
+    '\u003Cul class="nav-pills"\u003E\n  \u003Cli\u003E\u003Ca class="active" href="/faq"\u003EFAQ\u003C/a\u003E\u003C/li\u003E\n  \u003Cli\u003E\u003Ca href="/tos"\u003ETerms of Service\u003C/a\u003E\u003C/li\u003E\n  \u003Cli\u003E\u003Ca href="/privacy"\u003EPrivacy\u003C/a\u003E\u003C/li\u003E\n\u003C/ul\u003E\n\n\n\n\u003Cdiv id="civilized"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#civilized"\u003EThis is a Civilized Place for Public Discussion\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Please treat this discussion forum with the same respect you would a public park.  We, too, are a shared community resource \u0026mdash; a place to share skills, knowledge and interests through ongoing conversation.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n    These are not hard and fast rules, merely aids to the human judgment of our community. Use these guidelines to keep this a clean, well-lighted place for civilized public discourse.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="improve"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#improve"\u003EImprove the Discussion\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Help us make this a great place for discussion by always working to improve the discussion in some way, however small. If you are not sure your post adds to the discussion or might detract from its usefulness, think over what you want to say and try again later.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n  The topics discussed here matter to us, and we want you to act as if they matter to you, too. Be respectful of the topics and the people discussing them, even if you disagree with some of what is being said.\n  \u003C/p\u003E\n  \u003Cp\u003E\n  One way to improve the discussion is by discovering ones that are already happening. Please spend some time browsing the topics here before replying or starting your own, and you’ll have a better chance of meeting others who share your interests.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="agreeable"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#agreeable"\u003EBe Agreeable, Even When You Disagree\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  You may wish to respond to something by disagreeing with it. That’s fine. But, remember to \u003Cem\u003Ecriticize ideas, not people\u003C/em\u003E.\n  Please avoid:\n  \u003Cul\u003E\n    \u003Cli\u003EName-calling.\u003C/li\u003E\n    \u003Cli\u003EAd hominem attacks.\u003C/li\u003E\n    \u003Cli\u003EResponding to a post’s tone instead of its actual content.\u003C/li\u003E\n    \u003Cli\u003EKnee-jerk contradiction.\u003C/li\u003E\n  \u003C/ul\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n  Instead, provide reasoned counter-arguments that improve the conversation.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="participate"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#participate"\u003EYour Participation Counts\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  The conversations we have here set the tone for everyone. Help us influence the future of this community by choosing to engage in discussions that make this forum an interesting place to be \u0026mdash; and avoiding those that do not.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n  Discourse provides tools that enable the community to collectively identify the best (and worst) contributions: favorites, bookmarks, likes, flags, replies, edits, and so forth. Use these tools to improve your own experience, and everyone else’s, too.\n  \u003C/p\u003E\n  \u003Cp\u003E\n  Let’s try to leave our park better than we found it.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="flag-problems"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#flag-problems"\u003EIf You See a Problem, Flag It\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Moderators have special authority; they are responsible for this forum. But so are you. With your help, moderators can be community facilitators, not just janitors or police.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n  When you see bad behavior, don’t reply. It encourages the bad behavior by acknowledging it, consumes your energy, and wastes everyone’s time. \u003Ci\u003EJust flag it\u003C/i\u003E. If enough flags accrue, action will be taken, either automatically or by moderator intervention.\n  \u003C/p\u003E\n  \u003Cp\u003E\n  In order to maintain our community, moderators reserve the right to remove any content and any user account for any reason at any time. Moderators do not preview new posts in any way; the moderators and site operators take no responsibility for any content posted by the community.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="be-civil"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#be-civil"\u003EAlways Be Civil\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Nothing sabotages a healthy conversation like rudeness:\n  \u003Cul\u003E\n    \u003Cli\u003EBe civil. Don’t post anything that a reasonable person would consider offensive, abusive, or hate speech.\u003C/li\u003E\n    \u003Cli\u003EKeep it clean. Don’t post anything obscene or sexually explicit.\u003C/li\u003E\n    \u003Cli\u003ERespect each other. Don’t harass or grief anyone,\n      impersonate people, or expose their private information.\u003C/li\u003E\n    \u003Cli\u003ERespect our forum. Don’t post spam or otherwise vandalize the forum.\u003C/li\u003E\n  \u003C/ul\u003E\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n  These are not concrete terms with precise definitions \u0026mdash; avoid\n    even the \u003Ci\u003Eappearance\u003C/i\u003E of any of these things. If you’re unsure, ask yourself how you would feel if your post was featured on the front page of the New York Times.\n  \u003C/p\u003E\n  \u003Cp\u003E\n  This is a public forum, and search engines index these discussions. Keep the language, links, and images safe for family and friends.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="keep-tidy"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#keep-tidy"\u003EKeep It Tidy\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Make the effort to put things in the right place, so that we can spend more time discussing and less cleaning up. So:\n  \u003Cul\u003E\n    \u003Cli\u003EDon’t start a topic in the wrong category.\u003C/li\u003E\n    \u003Cli\u003EDon’t cross-post the same thing in multiple topics.\u003C/li\u003E\n    \u003Cli\u003EDon’t post no-content replies.\u003C/li\u003E\n    \u003Cli\u003EDon’t divert a topic by changing it midstream.\u003C/li\u003E\n    \u003Cli\u003EDon’t sign your posts \u0026mdash; every post has your profile information attached to it.\u003C/li\u003E\n  \u003C/ul\u003E\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n  Rather than posting “+1” or “Agreed”, use the Like button. Rather than taking an existing topic in a radically different direction, use Reply as a New Topic.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="stealing"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#stealing"\u003EPost Only Your Own Stuff\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  You may not post anything digital that belongs to someone else without permission. You may not post descriptions of, links to, or methods for stealing someone’s intellectual property (software, video, audio, images), or for breaking any other law.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="tos"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#tos"\u003ETerms of Service\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Yes, legalese is boring, but we must protect ourselves \u0026ndash; and by extension, you and your data \u0026ndash; against unfriendly folks. We have a \u003Ca href="/tos"\u003ETerms of Service\u003C/a\u003E describing your (and our) behavior and rights related to content, privacy, and laws. To use this service, you must agree to abide by our \u003Ca href="/tos"\u003ETOS\u003C/a\u003E.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n\u003C/div\u003E\n\n',
   "tos.html":
     '\u003Cul class="nav-pills"\u003E\n  \u003Cli\u003E\u003Ca href="/faq"\u003EFAQ\u003C/a\u003E\u003C/li\u003E\n  \u003Cli\u003E\u003Ca class="active" href="/tos"\u003ETerms of Service\u003C/a\u003E\u003C/li\u003E\n  \u003Cli\u003E\u003Ca href="/privacy"\u003EPrivacy\u003C/a\u003E\u003C/li\u003E\n\u003C/ul\u003E\n\n\u003Cp\u003E\n  The following terms and conditions govern all use of the discourse.org website and all content, services and products available at or through the website, including, but not limited to, discourse.org Forum Software, discourse.org Support Forums and the discourse.org Hosting service (“Hosting”), (taken together, the Website). The Website is owned and operated by Civilized Discourse Construction Kit, Inc. (“CDCK”). The Website is offered subject to your acceptance without modification of all of the terms and conditions contained herein and all other operating rules, policies (including, without limitation, discourse.org’s \u003Ca href="/privacy"\u003EPrivacy Policy\u003C/a\u003E and \u003Ca href="/faq"\u003ECommunity Guidelines\u003C/a\u003E) and procedures that may be published from time to time on this Site by CDCK (collectively, the “Agreement”).\n\u003C/p\u003E\n\n\u003Cp\u003E\n  Please read this Agreement carefully before accessing or using the Website. By accessing or using any part of the web site, you agree to become bound by the terms and conditions of this agreement. If you do not agree to all the terms and conditions of this agreement, then you may not access the Website or use any services. If these terms and conditions are considered an offer by CDCK, acceptance is expressly limited to these terms. The Website is available only to individuals who are at least 13 years old.\n\u003C/p\u003E\n\n\u003Cdiv id="1"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#1"\u003E1. Your discourse.org Account\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  If you create an account on the Website, you are responsible for maintaining the security of your account and you are fully responsible for all activities that occur under the account. You must immediately notify CDCK of any unauthorized uses of your account or any other breaches of security. CDCK will not be liable for any acts or omissions by you, including any damages of any kind incurred as a result of such acts or omissions.\n\u003C/p\u003E\n\n\u003Cdiv id="2"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#2"\u003E2. Responsibility of Contributors\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003EIf you post material to the Website, post links on the Website, or otherwise make (or allow any third party to make) material available by means of the Website (any such material, “Content”), You are entirely responsible for the content of, and any harm resulting from, that Content. That is the case regardless of whether the Content in question constitutes text, graphics, an audio file, or computer software. By making Content available, you represent and warrant that:\n\u003C/p\u003E\n\u003Cul\u003E\n  \u003Cli\u003Ethe downloading, copying and use of the Content will not infringe the proprietary rights, including but not limited to the copyright, patent, trademark or trade secret rights, of any third party;\u003C/li\u003E\n  \u003Cli\u003Eif your employer has rights to intellectual property you create, you have either (i) received permission from your employer to post or make available the Content, including but not limited to any software, or (ii) secured from your employer a waiver as to all rights in or to the Content;\u003C/li\u003E\n  \u003Cli\u003Eyou have fully complied with any third-party licenses relating to the Content, and have done all things necessary to successfully pass through to end users any required terms;\u003C/li\u003E\n  \u003Cli\u003Ethe Content does not contain or install any viruses, worms, malware, Trojan horses or other harmful or destructive content;\u003C/li\u003E\n  \u003Cli\u003Ethe Content is not spam, is not machine- or randomly-generated, and does not contain unethical or unwanted commercial content designed to drive traffic to third party sites or boost the search engine rankings of third party sites, or to further unlawful acts (such as phishing) or mislead recipients as to the source of the material (such as spoofing);\u003C/li\u003E\n  \u003Cli\u003Ethe Content is not pornographic, does not contain threats or incite violence, and does not violate the privacy or publicity rights of any third party;\u003C/li\u003E\n  \u003Cli\u003Eyour content is not getting advertised via unwanted electronic messages such as spam links on newsgroups, email lists, blogs and web sites, and similar unsolicited promotional methods;\u003C/li\u003E\n  \u003Cli\u003Eyour content is not named in a manner that misleads your readers into thinking that you are another person or company; and\u003C/li\u003E\n  \u003Cli\u003Eyou have, in the case of Content that includes computer code, accurately categorized and/or described the type, nature, uses and effects of the materials, whether requested to do so by CDCK or otherwise.\u003C/li\u003E\n\u003C/ul\u003E\n\n\u003Cdiv id="3"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#3"\u003E3. User Content License\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003EUser contributions are licensed under a \u003Ca href="http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US" rel="nofollow"\u003ECreative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License\u003C/a\u003E. Without limiting any of those representations or warranties, CDCK has the right (though not the obligation) to, in CDCK’s sole discretion (i) refuse or remove any content that, in CDCK’s reasonable opinion, violates any CDCK policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in CDCK’s sole discretion. CDCK will have no obligation to provide a refund of any amounts previously paid.\u003C/p\u003E\n\n\u003Cdiv id="4"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#4"\u003E4. Payment and Renewal\u003C/a\u003E\u003C/h2\u003E\n\u003Ch3\u003EGeneral Terms\u003C/h3\u003E\n\u003Cp\u003E\n  Optional paid services or upgrades may be available on the Website. When utilizing an optional paid service or upgrade, you agree to pay CDCK the monthly or annual subscription fees indicated. Payments will be charged on a pre-pay basis on the day you begin utilizing the service or upgrade and will cover the use of that service or upgrade for a monthly or annual subscription period as indicated. These fees are not refundable.\n\u003C/p\u003E\n\u003Ch3\u003EAutomatic Renewal\u003C/h3\u003E\n\u003Cp\u003EUnless you notify CDCK before the end of the applicable subscription period that you want to cancel a service or upgrade, your subscription will automatically renew and you authorize us to collect the then-applicable annual or monthly subscription fee (as well as any taxes) using any credit card or other payment mechanism we have on record for you. Subscriptions can be canceled at any time.\n\u003C/p\u003E\n\n\u003Cdiv id="5"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#5"\u003E5. Services\u003C/a\u003E\u003C/h2\u003E\n\u003Ch3\u003EHosting, Support Services\u003C/h3\u003E\n\u003Cp\u003EOptional Hosting and Support services may be provided by CDCK under the terms and conditions for each such service. By signing up for a Hosting/Support or Support services account, you agree to abide by such terms and conditions.\n\u003C/p\u003E\n\n\u003Cdiv id="6"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#6"\u003E6. Responsibility of Website Visitors\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  CDCK has not reviewed, and cannot review, all of the material, including computer software, posted to the Website, and cannot therefore be responsible for that material’s content, use or effects. By operating the Website, CDCK does not represent or imply that it endorses the material there posted, or that it believes such material to be accurate, useful or non-harmful. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. The Website may contain content that is offensive, indecent, or otherwise objectionable, as well as content containing technical inaccuracies, typographical mistakes, and other errors. The Website may also contain material that violates the privacy or publicity rights, or infringes the intellectual property and other proprietary rights, of third parties, or the downloading, copying or use of which is subject to additional terms and conditions, stated or unstated. CDCK disclaims any responsibility for any harm resulting from the use by visitors of the Website, or from any downloading by those visitors of content there posted.\n\u003C/p\u003E\n\n\u003Cdiv id="7"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#7"\u003E7. Content Posted on Other Websites\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003EWe have not reviewed, and cannot review, all of the material, including computer software, made available through the websites and webpages to which discourse.org links, and that link to discourse.org. CDCK does not have any control over those non-discourse.org websites and webpages, and is not responsible for their contents or their use. By linking to a non-discourse.org website or webpage, CDCK does not represent or imply that it endorses such website or webpage. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. CDCK disclaims any responsibility for any harm resulting from your use of non-discourse.org websites and webpages.\n\u003C/p\u003E\n\n\u003Cdiv id="8"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#8"\u003E8. Copyright Infringement and DMCA Policy\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  As CDCK asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by discourse.org violates your copyright, and if this website resides in the USA, you are encouraged to notify CDCK in accordance with CDCK’s \u003Ca href="http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act"\u003EDigital Millennium Copyright Act\u003C/a\u003E (“DMCA”) Policy. CDCK will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. CDCK will terminate a visitor’s access to and use of the Website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of the copyrights or other intellectual property rights of CDCK or others. In the case of such termination, CDCK will have no obligation to provide a refund of any amounts previously paid to CDCK.\n\u003C/p\u003E\n\n\u003Cdiv id="9"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#9"\u003E9. Intellectual Property\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  This Agreement does not transfer from CDCK to you any CDCK or third party intellectual property, and all right, title and interest in and to such property will remain (as between the parties) solely with CDCK. CDCK, discourse.org, the discourse.org logo, and all other trademarks, service marks, graphics and logos used in connection with discourse.org, or the Website are trademarks or registered trademarks of CDCK or CDCK’s licensors. Other trademarks, service marks, graphics and logos used in connection with the Website may be the trademarks of other third parties. Your use of the Website grants you no right or license to reproduce or otherwise use any CDCK or third-party trademarks.\n\u003C/p\u003E\n\n\u003Cdiv id="10"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#10"\u003E10. Advertisements\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003ECDCK reserves the right to display advertisements on your content unless you have purchased an Ad-free Upgrade or a Services account.\u003C/p\u003E\n\n\u003Cdiv id="11"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#11"\u003E11. Attribution\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003ECDCK reserves the right to display attribution links such as ‘Powered by discourse.org,’ theme author, and font attribution in your content footer or toolbar. Footer credits and the discourse.org toolbar may not be removed regardless of upgrades purchased.\u003C/p\u003E\n\n\u003Cdiv id="12"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#12"\u003E12. Changes\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\nCDCK reserves the right, at its sole discretion, to modify or replace any part of this Agreement. It is your responsibility to check this Agreement periodically for changes. Your continued use of or access to the Website following the posting of any changes to this Agreement constitutes acceptance of those changes. CDCK may also, in the future, offer new services and/or features through the Website (including, the release of new tools and resources). Such new features and/or services shall be subject to the terms and conditions of this Agreement.\n\u003C/p\u003E\n\n\u003Cdiv id="13"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#13"\u003E13. Termination\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\nCDCK may terminate your access to all or any part of the Website at any time, with or without cause, with or without notice, effective immediately. If you wish to terminate this Agreement or your discourse.org account (if you have one), you may simply discontinue using the Website. All provisions of this Agreement which by their nature should survive termination shall survive termination, including, without limitation, ownership provisions, warranty disclaimers, indemnity and limitations of liability.\n\u003C/p\u003E\n\n\u003Cdiv id="14"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#14"\u003E14. Disclaimer of Warranties\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\nThe Website is provided “as is”. CDCK and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither CDCK nor its suppliers and licensors, makes any warranty that the Website will be error free or that cess thereto will be continuous or uninterrupted. If you’re actually reading this, here’s \u003Ca href="http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html"\u003Ea treat\u003C/a\u003E. You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk.\n\u003C/p\u003E\n\n\u003Cdiv id="15"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#15"\u003E15. Limitation of Liability\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\nIn no event will CDCK, or its suppliers or licensors, be liable with respect to any subject matter of this agreement under any contract, negligence, strict liability or other legal or equitable theory for: (i) any special, incidental or consequential damages; (ii) the cost of procurement for substitute products or services; (iii) for interruption of use or loss or corruption of data; or (iv) for any amounts that exceed the fees paid by you to CDCK under this agreement during the twelve (12) month period prior to the cause of action. CDCK shall have no liability for any failure or delay due to matters beyond their reasonable control. The foregoing shall not apply to the extent prohibited by applicable law.\n\u003C/p\u003E\n\n\u003Cdiv id="16"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#16"\u003E16. General Representation and Warranty\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\nYou represent and warrant that (i) your use of the Website will be in strict accordance with the CDCK \u003Ca href="/privacy"\u003EPrivacy Policy\u003C/a\u003E, \u003Ca href="/faq"\u003ECommunity Guidelines\u003C/a\u003E, with this Agreement and with all applicable laws and regulations (including without limitation any local laws or regulations in your country, state, city, or other governmental area, regarding online conduct and acceptable content, and including all applicable laws regarding the transmission of technical data exported from the country in which this website resides or the country in which you reside) and (ii) your use of the Website will not infringe or misappropriate the intellectual property rights of any third party.\n\u003C/p\u003E\n\n\u003Cdiv id="17"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#17"\u003E17. Indemnification\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\nYou agree to indemnify and hold harmless CDCK, its contractors, and its licensors, and their respective directors, officers, employees and agents from and against any and all claims and expenses, including attorneys’ fees, arising out of your use of the Website, including but not limited to your violation of this Agreement.\n\u003C/p\u003E\n\n\u003Cdiv id="18"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#18"\u003E18. Miscellaneous\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003EThis Agreement constitutes the entire agreement between CDCK and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of CDCK, or by the posting by CDCK of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; CDCK may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns.\u003C/p\u003E\n\n\u003Cp\u003E\n  This document is CC-BY-SA. It was last updated May 31, 2013.\u003Cbr/\u003E\n  Originally adapted from the \u003Ca href="http://en.wordpress.com/tos/"\u003EWordPress Terms of Service\u003C/a\u003E.\n\u003C/p\u003E\n',
   "privacy.html":
     '\u003Cul class="nav-pills"\u003E\n  \u003Cli\u003E\u003Ca href="/faq"\u003EFAQ\u003C/a\u003E\u003C/li\u003E\n  \u003Cli\u003E\u003Ca href="/tos"\u003ETerms of Service\u003C/a\u003E\u003C/li\u003E\n  \u003Cli\u003E\u003Ca class="active" href="/privacy"\u003EPrivacy\u003C/a\u003E\u003C/li\u003E\n\u003C/ul\u003E\n\n\n\n\u003Cdiv id="collect"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#collect"\u003EWhat information do we collect?\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\nWe collect information from you when you register on our site and gather data when you participate in the forum by reading, writing, and evaluating the content shared here.\n\u003C/p\u003E\n\n\u003Cp\u003E\n  When registering on our site, you may be asked to enter your name and e-mail address. You may, however, visit our site without registering. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address.\n\u003C/p\u003E\n\n\u003Cp\u003E\n  When registered and posting, we record the IP address that the post originated from. We also may retain server logs which include the IP address of every request to our server.\n\u003C/p\u003E\n\n\u003Cdiv id="use"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#use"\u003EWhat do we use your information for?\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003EAny of the information we collect from you may be used in one of the following ways:\u003C/p\u003E\n\u003Cul\u003E\n  \u003Cli\u003ETo personalize your experience \u0026mdash; your information helps us to better respond to your individual needs.\u003C/li\u003E\n  \u003Cli\u003ETo improve our site \u0026mdash; we continually strive to improve our site offerings based on the information and feedback we receive from you.\u003C/li\u003E\n  \u003Cli\u003ETo improve customer service \u0026mdash; your information helps us to more effectively respond to your customer service requests and support needs.\u003C/li\u003E\n  \u003Cli\u003ETo send periodic emails \u0026mdash; The email address you provide may be used to send you information, notifications that you request about changes to topics or in response to your user name, respond to inquiries, and/or other requests or questions.\u003C/li\u003E\n\u003C/ul\u003E\n\n\u003Cdiv id="protect"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#use"\u003EHow do we protect your information?\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information.\n\u003C/p\u003E\n\n\u003Cdiv id="data-retention"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#data-retention"\u003EWhat is your data retention policy?\u003C/a\u003E\u003C/h2\u003E\n\n\u003Cp\u003E\n  We will make a good faith effort to:\n\u003C/p\u003E\n\u003Cul\u003E\n  \u003Cli\u003ERetain server logs containing the IP address of all requests to this server no more than 90 days.\u003C/li\u003E\n  \u003Cli\u003ERetain the IP addresses associated with registered users and their posts no more than 5 years.\u003C/li\u003E\n\u003C/ul\u003E\n\u003C/p\u003E\n\n\n\u003Cdiv id="cookies"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#cookies"\u003EDo we use cookies?\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Yes. Cookies are small files that a site or its service provider transfers to your computer\'s hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account.\n\u003C/p\u003E\n\n\u003Cp\u003E\n  We use cookies to understand and save your preferences for future visits and compile aggregate data about site traffic and site interaction so that we can offer better site experiences and tools in the future. We may contract with third-party service providers to assist us in better understanding our site visitors. These service providers are not permitted to use the information collected on our behalf except to help us conduct and improve our business.\n\u003C/p\u003E\n\n\u003Cdiv id="disclose"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#disclose"\u003EDo we disclose any information to outside parties?\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\nWe do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety. However, non-personally identifiable visitor information may be provided to other parties for marketing, advertising, or other uses.\n\u003C/p\u003E\n\n\u003Cdiv id="third-party"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#third-party"\u003EThird party links\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Occasionally, at our discretion, we may include or offer third party products or services on our site. These third party sites have separate and independent privacy policies. We therefore have no responsibility or liability for the content and activities of these linked sites. Nonetheless, we seek to protect the integrity of our site and welcome any feedback about these sites.\n\u003C/p\u003E\n\n\u003Cdiv id="coppa"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#coppa"\u003EChildren\'s Online Privacy Protection Act Compliance\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\nOur site, products and services are all directed to people who are at least 13 years old or older. If this server is in the USA, and you are under the age of 13, per the requirements of COPPA (\u003Ca href="http://en.wikipedia.org/wiki/Children\'s_Online_Privacy_Protection_Act"\u003EChildren\'s Online Privacy Protection Act\u003C/a\u003E), do not use this site.\n\u003C/p\u003E\n\n\u003Cdiv id="online"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#online"\u003EOnline Privacy Policy Only\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\nThis online privacy policy applies only to information collected through our site and not to information collected offline.\n\u003C/p\u003E\n\n\u003Cdiv id="consent"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#consent"\u003EYour Consent\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\nBy using our site, you consent to our web site privacy policy.\n\u003C/p\u003E\n\n\u003Cdiv id="changes"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#changes"\u003EChanges to our Privacy Policy\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\nIf we decide to change our privacy policy, we will post those changes on this page.\n\u003C/p\u003E\n\n\u003Cp\u003E\n  This document is CC-BY-SA. It was last updated May 31, 2013.\n\u003C/p\u003E\n\n',
   "guidelines.html":
     '\u003Cul class="nav-pills"\u003E\n  \u003Cli\u003E\u003Ca class="active" href="/faq"\u003EFAQ\u003C/a\u003E\u003C/li\u003E\n  \u003Cli\u003E\u003Ca href="/tos"\u003ETerms of Service\u003C/a\u003E\u003C/li\u003E\n  \u003Cli\u003E\u003Ca href="/privacy"\u003EPrivacy\u003C/a\u003E\u003C/li\u003E\n\u003C/ul\u003E\n\n\n\n\u003Cdiv id="civilized"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#civilized"\u003EThis is a Civilized Place for Public Discussion\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Please treat this discussion forum with the same respect you would a public park.  We, too, are a shared community resource \u0026mdash; a place to share skills, knowledge and interests through ongoing conversation.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n    These are not hard and fast rules, merely aids to the human judgment of our community. Use these guidelines to keep this a clean, well-lighted place for civilized public discourse.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="improve"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#improve"\u003EImprove the Discussion\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Help us make this a great place for discussion by always working to improve the discussion in some way, however small. If you are not sure your post adds to the discussion or might detract from its usefulness, think over what you want to say and try again later.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n  The topics discussed here matter to us, and we want you to act as if they matter to you, too. Be respectful of the topics and the people discussing them, even if you disagree with some of what is being said.\n  \u003C/p\u003E\n  \u003Cp\u003E\n  One way to improve the discussion is by discovering ones that are already happening. Please spend some time browsing the topics here before replying or starting your own, and you’ll have a better chance of meeting others who share your interests.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="agreeable"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#agreeable"\u003EBe Agreeable, Even When You Disagree\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  You may wish to respond to something by disagreeing with it. That’s fine. But, remember to \u003Cem\u003Ecriticize ideas, not people\u003C/em\u003E.\n  Please avoid:\n  \u003Cul\u003E\n    \u003Cli\u003EName-calling.\u003C/li\u003E\n    \u003Cli\u003EAd hominem attacks.\u003C/li\u003E\n    \u003Cli\u003EResponding to a post’s tone instead of its actual content.\u003C/li\u003E\n    \u003Cli\u003EKnee-jerk contradiction.\u003C/li\u003E\n  \u003C/ul\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n  Instead, provide reasoned counter-arguments that improve the conversation.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="participate"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#participate"\u003EYour Participation Counts\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  The conversations we have here set the tone for everyone. Help us influence the future of this community by choosing to engage in discussions that make this forum an interesting place to be \u0026mdash; and avoiding those that do not.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n  Discourse provides tools that enable the community to collectively identify the best (and worst) contributions: favorites, bookmarks, likes, flags, replies, edits, and so forth. Use these tools to improve your own experience, and everyone else’s, too.\n  \u003C/p\u003E\n  \u003Cp\u003E\n  Let’s try to leave our park better than we found it.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="flag-problems"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#flag-problems"\u003EIf You See a Problem, Flag It\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Moderators have special authority; they are responsible for this forum. But so are you. With your help, moderators can be community facilitators, not just janitors or police.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n  When you see bad behavior, don’t reply. It encourages the bad behavior by acknowledging it, consumes your energy, and wastes everyone’s time. \u003Ci\u003EJust flag it\u003C/i\u003E. If enough flags accrue, action will be taken, either automatically or by moderator intervention.\n  \u003C/p\u003E\n  \u003Cp\u003E\n  In order to maintain our community, moderators reserve the right to remove any content and any user account for any reason at any time. Moderators do not preview new posts in any way; the moderators and site operators take no responsibility for any content posted by the community.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="be-civil"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#be-civil"\u003EAlways Be Civil\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Nothing sabotages a healthy conversation like rudeness:\n  \u003Cul\u003E\n    \u003Cli\u003EBe civil. Don’t post anything that a reasonable person would consider offensive, abusive, or hate speech.\u003C/li\u003E\n    \u003Cli\u003EKeep it clean. Don’t post anything obscene or sexually explicit.\u003C/li\u003E\n    \u003Cli\u003ERespect each other. Don’t harass or grief anyone,\n      impersonate people, or expose their private information.\u003C/li\u003E\n    \u003Cli\u003ERespect our forum. Don’t post spam or otherwise vandalize the forum.\u003C/li\u003E\n  \u003C/ul\u003E\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n  These are not concrete terms with precise definitions \u0026mdash; avoid\n    even the \u003Ci\u003Eappearance\u003C/i\u003E of any of these things. If you’re unsure, ask yourself how you would feel if your post was featured on the front page of the New York Times.\n  \u003C/p\u003E\n  \u003Cp\u003E\n  This is a public forum, and search engines index these discussions. Keep the language, links, and images safe for family and friends.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="keep-tidy"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#keep-tidy"\u003EKeep It Tidy\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Make the effort to put things in the right place, so that we can spend more time discussing and less cleaning up. So:\n  \u003Cul\u003E\n    \u003Cli\u003EDon’t start a topic in the wrong category.\u003C/li\u003E\n    \u003Cli\u003EDon’t cross-post the same thing in multiple topics.\u003C/li\u003E\n    \u003Cli\u003EDon’t post no-content replies.\u003C/li\u003E\n    \u003Cli\u003EDon’t divert a topic by changing it midstream.\u003C/li\u003E\n    \u003Cli\u003EDon’t sign your posts \u0026mdash; every post has your profile information attached to it.\u003C/li\u003E\n  \u003C/ul\u003E\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n  Rather than posting “+1” or “Agreed”, use the Like button. Rather than taking an existing topic in a radically different direction, use Reply as a New Topic.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="stealing"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#stealing"\u003EPost Only Your Own Stuff\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  You may not post anything digital that belongs to someone else without permission. You may not post descriptions of, links to, or methods for stealing someone’s intellectual property (software, video, audio, images), or for breaking any other law.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="tos"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#tos"\u003ETerms of Service\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Yes, legalese is boring, but we must protect ourselves \u0026ndash; and by extension, you and your data \u0026ndash; against unfriendly folks. We have a \u003Ca href="/tos"\u003ETerms of Service\u003C/a\u003E describing your (and our) behavior and rights related to content, privacy, and laws. To use this service, you must agree to abide by our \u003Ca href="/tos"\u003ETOS\u003C/a\u003E.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n\u003C/div\u003E\n\n',
+  "rules.html":
+    '\u003Cul class="nav-pills"\u003E\n  \u003Cli\u003E\u003Ca class="active" href="/faq"\u003EFAQ\u003C/a\u003E\u003C/li\u003E\n  \u003Cli\u003E\u003Ca href="/tos"\u003ETerms of Service\u003C/a\u003E\u003C/li\u003E\n  \u003Cli\u003E\u003Ca href="/privacy"\u003EPrivacy\u003C/a\u003E\u003C/li\u003E\n\u003C/ul\u003E\n\n\n\n\u003Cdiv id="civilized"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#civilized"\u003EThis is a Civilized Place for Public Discussion\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Please treat this discussion forum with the same respect you would a public park.  We, too, are a shared community resource \u0026mdash; a place to share skills, knowledge and interests through ongoing conversation.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n    These are not hard and fast rules, merely aids to the human judgment of our community. Use these guidelines to keep this a clean, well-lighted place for civilized public discourse.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="improve"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#improve"\u003EImprove the Discussion\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Help us make this a great place for discussion by always working to improve the discussion in some way, however small. If you are not sure your post adds to the discussion or might detract from its usefulness, think over what you want to say and try again later.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n  The topics discussed here matter to us, and we want you to act as if they matter to you, too. Be respectful of the topics and the people discussing them, even if you disagree with some of what is being said.\n  \u003C/p\u003E\n  \u003Cp\u003E\n  One way to improve the discussion is by discovering ones that are already happening. Please spend some time browsing the topics here before replying or starting your own, and you’ll have a better chance of meeting others who share your interests.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="agreeable"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#agreeable"\u003EBe Agreeable, Even When You Disagree\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  You may wish to respond to something by disagreeing with it. That’s fine. But, remember to \u003Cem\u003Ecriticize ideas, not people\u003C/em\u003E.\n  Please avoid:\n  \u003Cul\u003E\n    \u003Cli\u003EName-calling.\u003C/li\u003E\n    \u003Cli\u003EAd hominem attacks.\u003C/li\u003E\n    \u003Cli\u003EResponding to a post’s tone instead of its actual content.\u003C/li\u003E\n    \u003Cli\u003EKnee-jerk contradiction.\u003C/li\u003E\n  \u003C/ul\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n  Instead, provide reasoned counter-arguments that improve the conversation.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="participate"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#participate"\u003EYour Participation Counts\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  The conversations we have here set the tone for everyone. Help us influence the future of this community by choosing to engage in discussions that make this forum an interesting place to be \u0026mdash; and avoiding those that do not.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n  Discourse provides tools that enable the community to collectively identify the best (and worst) contributions: favorites, bookmarks, likes, flags, replies, edits, and so forth. Use these tools to improve your own experience, and everyone else’s, too.\n  \u003C/p\u003E\n  \u003Cp\u003E\n  Let’s try to leave our park better than we found it.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="flag-problems"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#flag-problems"\u003EIf You See a Problem, Flag It\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Moderators have special authority; they are responsible for this forum. But so are you. With your help, moderators can be community facilitators, not just janitors or police.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n  When you see bad behavior, don’t reply. It encourages the bad behavior by acknowledging it, consumes your energy, and wastes everyone’s time. \u003Ci\u003EJust flag it\u003C/i\u003E. If enough flags accrue, action will be taken, either automatically or by moderator intervention.\n  \u003C/p\u003E\n  \u003Cp\u003E\n  In order to maintain our community, moderators reserve the right to remove any content and any user account for any reason at any time. Moderators do not preview new posts in any way; the moderators and site operators take no responsibility for any content posted by the community.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="be-civil"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#be-civil"\u003EAlways Be Civil\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Nothing sabotages a healthy conversation like rudeness:\n  \u003Cul\u003E\n    \u003Cli\u003EBe civil. Don’t post anything that a reasonable person would consider offensive, abusive, or hate speech.\u003C/li\u003E\n    \u003Cli\u003EKeep it clean. Don’t post anything obscene or sexually explicit.\u003C/li\u003E\n    \u003Cli\u003ERespect each other. Don’t harass or grief anyone,\n      impersonate people, or expose their private information.\u003C/li\u003E\n    \u003Cli\u003ERespect our forum. Don’t post spam or otherwise vandalize the forum.\u003C/li\u003E\n  \u003C/ul\u003E\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n  These are not concrete terms with precise definitions \u0026mdash; avoid\n    even the \u003Ci\u003Eappearance\u003C/i\u003E of any of these things. If you’re unsure, ask yourself how you would feel if your post was featured on the front page of the New York Times.\n  \u003C/p\u003E\n  \u003Cp\u003E\n  This is a public forum, and search engines index these discussions. Keep the language, links, and images safe for family and friends.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="keep-tidy"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#keep-tidy"\u003EKeep It Tidy\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Make the effort to put things in the right place, so that we can spend more time discussing and less cleaning up. So:\n  \u003Cul\u003E\n    \u003Cli\u003EDon’t start a topic in the wrong category.\u003C/li\u003E\n    \u003Cli\u003EDon’t cross-post the same thing in multiple topics.\u003C/li\u003E\n    \u003Cli\u003EDon’t post no-content replies.\u003C/li\u003E\n    \u003Cli\u003EDon’t divert a topic by changing it midstream.\u003C/li\u003E\n    \u003Cli\u003EDon’t sign your posts \u0026mdash; every post has your profile information attached to it.\u003C/li\u003E\n  \u003C/ul\u003E\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n  Rather than posting “+1” or “Agreed”, use the Like button. Rather than taking an existing topic in a radically different direction, use Reply as a New Topic.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="stealing"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#stealing"\u003EPost Only Your Own Stuff\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  You may not post anything digital that belongs to someone else without permission. You may not post descriptions of, links to, or methods for stealing someone’s intellectual property (software, video, audio, images), or for breaking any other law.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="tos"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#tos"\u003ETerms of Service\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Yes, legalese is boring, but we must protect ourselves \u0026ndash; and by extension, you and your data \u0026ndash; against unfriendly folks. We have a \u003Ca href="/tos"\u003ETerms of Service\u003C/a\u003E describing your (and our) behavior and rights related to content, privacy, and laws. To use this service, you must agree to abide by our \u003Ca href="/tos"\u003ETOS\u003C/a\u003E.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n\u003C/div\u003E\n\n',
 };
diff --git a/app/assets/javascripts/discourse/tests/fixtures/topic.js b/app/assets/javascripts/discourse/tests/fixtures/topic.js
index bbefba6ead5..e809fc44364 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/topic.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/topic.js
@@ -3256,7 +3256,7 @@ export default {
           avatar_template: "/letter_avatar_proxy/v4/letter/b/3be4f8/{size}.png",
           created_at: "2020-07-05T09:28:36.371Z",
           cooked:
-            '<p><span data-date="2021-09-30" data-time="13:00:00" class="discourse-local-date" data-timezone="Africa/Cairo" data-email-preview="2021-09-30T11:00:00Z UTC">2021-09-30T11:00:00Z</span></p>',
+            '<p><span data-date="2021-09-30" data-time="13:00:00" class="discourse-local-date" data-timezone="America/Lima" data-email-preview="2021-09-30T18:00:00Z UTC">2021-09-30T18:00:00Z</span></p>',
           post_number: 1,
           post_type: 1,
           updated_at: "2020-07-05T09:28:36.371Z",
@@ -6736,4 +6736,292 @@ export default {
     ],
     tags: null,
   },
+  "/t/54081.json": {
+    pending_posts: [],
+    post_stream: {
+      posts: [
+      {
+        id: 18,
+        username: "eviltrout",
+        avatar_template: "/images/avatar.png",
+        name: "Evil Trout",
+        uploaded_avatar_id: 9,
+        created_at: "2015-08-13T14:49:11.840Z",
+        cooked:
+          '<div class=\"md-table\">\n<table>\n<thead>\n<tr>\n<th>Make</th>\n<th>Model</th>\n<th>Year</th>\n<th>Price</th>\n<th>Drivetrain</th>\n<th>Engine</th>\n<th>Power</th>\n<th>Type</th>\n<th>Seats</th>\n<th>Wheels</th>\n<th>Mileage</th>\n<th>Induction</th>\n<th>Intake</th>\n<th>Ranking</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>Toyota</td>\n<td>Supra</td>\n<td>1998</td>\n<td>50k</td>\n<td>RWD</td>\n<td>I6</td>\n<td>400HP</td>\n<td>Coupe</td>\n<td>4</td>\n<td>Enkei PF01</td>\n<td>100,000</td>\n<td>Twin Turbo</td>\n<td>Yes</td>\n<td>1</td>\n</tr>\n<tr>\n<td>Nissan</td>\n<td>Skyline</td>\n<td>1999</td>\n<td>100k</td>\n<td>4WD</td>\n<td>I6</td>\n<td>350HP</td>\n<td>Coupe</td>\n<td>4</td>\n<td>TE37</td>\n<td>80,000</td>\n<td>Single Turbo</td>\n<td>No</td>\n<td>2</td>\n</tr>\n<tr>\n<td>Honda</td>\n<td>S2000</td>\n<td>2001</td>\n<td>30k</td>\n<td>RWD</td>\n<td>I4</td>\n<td>230HP</td>\n<td>Roadster</td>\n<td>2</td>\n<td>RPF1</td>\n<td>110,000</td>\n<td>Naturally Aspirated</td>\n<td>No</td>\n<td>3</td>\n</tr>\n</tbody>\n</table>\n',
+        post_number: 1,
+        post_type: 1,
+        updated_at: "2015-08-13T14:49:11.840Z",
+        reply_count: 0,
+        reply_to_post_number: null,
+        quote_count: 0,
+        incoming_link_count: 0,
+        reads: 1,
+        score: 0,
+        yours: true,
+        topic_id: 9,
+        topic_slug: "this-is-a-test-topic",
+        display_username: "",
+        primary_group_name: null,
+        version: 1,
+        can_edit: true,
+        can_delete: false,
+        can_recover: true,
+        read: true,
+        user_title: null,
+        actions_summary: [
+          { id: 3, can_act: true },
+          { id: 4, can_act: true },
+          { id: 5, hidden: true, can_act: true },
+          { id: 7, can_act: true },
+          { id: 8, can_act: true },
+        ],
+        moderator: false,
+        admin: true,
+        staff: true,
+        user_id: 1,
+        hidden: false,
+        hidden_reason_id: null,
+        trust_level: 4,
+        deleted_at: null,
+        user_deleted: false,
+        edit_reason: null,
+        can_view_edit_history: true,
+        wiki: false,
+      },
+      {
+        id: 19,
+        username: "eviltrout",
+        avatar_template: "/images/avatar.png",
+        name: "Evil Trout",
+        uploaded_avatar_id: 9,
+        created_at: "2015-08-13T14:49:18.231Z",
+        cooked:
+          '<p>These are my favourite JDM cars:</p>\n<div class="md-table">\n<table>\n<thead>\n<tr>\n<th>Make</th>\n<th>Model</th>\n<th>Year</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>Toyota</td>\n<td>Supra</td>\n<td>1998</td>\n</tr>\n<tr>\n<td>Nissan</td>\n<td>Skyline</td>\n<td>1999</td>\n</tr>\n<tr>\n<td>Honda</td>\n<td>S2000</td>\n<td>2001</td>\n</tr>\n</tbody>\n</table>\n</div><p>These are my favourite Euro cars:</p>\n<div class="md-table">\n<table>\n<thead>\n<tr>\n<th>Make</th>\n<th>Model</th>\n<th>Year</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>Porsche</td>\n<td>964</td>\n<td>1998</td>\n</tr>\n<tr>\n<td>BMW</td>\n<td>M3</td>\n<td>2005</td>\n</tr>\n<tr>\n<td>Alfa Romeo</td>\n<td>Giulia</td>\n<td>2018</td>\n</tr>\n</tbody>\n</table>\n</div>',
+        post_number: 2,
+        post_type: 1,
+        updated_at: "2015-08-13T14:49:18.231Z",
+        reply_count: 0,
+        reply_to_post_number: null,
+        quote_count: 0,
+        incoming_link_count: 0,
+        reads: 1,
+        score: 0,
+        yours: true,
+        topic_id: 9,
+        topic_slug: "this-is-a-test-topic",
+        display_username: "",
+        primary_group_name: null,
+        version: 1,
+        can_edit: true,
+        can_delete: true,
+        can_recover: true,
+        read: true,
+        user_title: null,
+        actions_summary: [
+          { id: 3, can_act: true },
+          { id: 4, can_act: true },
+          { id: 5, hidden: true, can_act: true },
+          { id: 7, can_act: true },
+          { id: 8, can_act: true },
+        ],
+        moderator: false,
+        admin: true,
+        staff: true,
+        user_id: 1,
+        hidden: false,
+        hidden_reason_id: null,
+        trust_level: 4,
+        deleted_at: null,
+        user_deleted: false,
+        edit_reason: null,
+        can_view_edit_history: true,
+        wiki: false,
+      },
+      {
+        id: 20,
+        username: "eviltrout",
+        avatar_template: "/images/avatar.png",
+        name: "Evil Trout",
+        uploaded_avatar_id: 9,
+        created_at: "2015-08-13T14:49:23.927Z",
+        cooked:
+          '<div class="md-table">\n<table>\n<thead>\n<tr>\n<th>Make</th>\n<th>Model</th>\n<th>Price</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>Toyota</td>\n<td>Supra</td>\n<td>$50,000</td>\n</tr>\n<tr>\n<td></td>\n<td>Celica</td>\n<td>$20,000</td>\n</tr>\n<tr>\n<td>Nissan</td>\n<td>GTR</td>\n<td>$80,000</td>\n</tr>\n</tbody>\n</table>\n</div>',
+        post_number: 3,
+        post_type: 1,
+        updated_at: "2015-08-13T14:49:23.927Z",
+        reply_count: 0,
+        reply_to_post_number: null,
+        quote_count: 0,
+        incoming_link_count: 0,
+        reads: 1,
+        score: 0,
+        yours: true,
+        topic_id: 9,
+        topic_slug: "this-is-a-test-topic",
+        display_username: "",
+        primary_group_name: null,
+        version: 1,
+        can_edit: true,
+        can_delete: true,
+        can_recover: true,
+        read: true,
+        user_title: null,
+        actions_summary: [
+          { id: 3, can_act: true },
+          { id: 4, can_act: true },
+          { id: 5, hidden: true, can_act: true },
+          { id: 7, can_act: true },
+          { id: 8, can_act: true },
+        ],
+        moderator: false,
+        admin: true,
+        staff: true,
+        user_id: 1,
+        hidden: false,
+        hidden_reason_id: null,
+        trust_level: 4,
+        deleted_at: null,
+        user_deleted: false,
+        edit_reason: null,
+        can_view_edit_history: true,
+        wiki: false,
+      },
+      ],
+      stream: [398, 419],
+      gaps: { before: {}, after: { 398: [419] } },
+    },
+    id: 54081,
+    title: "This is a topic with tables!",
+    fancy_title: "This is a topic with tables!",
+    posts_count: 2,
+    created_at: "2013-02-05T21:29:00.174Z",
+    views: 5211,
+    reply_count: 1,
+    participant_count: 2,
+    like_count: 135,
+    last_posted_at: "2015-03-04T15:07:10.487Z",
+    visible: true,
+    closed: false,
+    archived: false,
+    has_summary: false,
+    archetype: "regular",
+    slug: "short-topic-with-two-posts",
+    category_id: 2,
+    word_count: 300,
+    deleted_at: null,
+    draft: null,
+    draft_key: "topic_54079",
+    draft_sequence: 3,
+    posted: true,
+    unpinned: null,
+    pinned_globally: false,
+    pinned: false,
+    pinned_at: null,
+    details: {
+      can_publish_page: true,
+      can_invite_via_email: true,
+      can_toggle_topic_visibility: true,
+      can_pin_unpin_topic: true,
+      auto_close_at: null,
+      auto_close_hours: null,
+      auto_close_based_on_last_post: false,
+      created_by: {
+        id: 255,
+        username: "james_john",
+        uploaded_avatar_id: 5697,
+        avatar_template: "/images/avatar.png",
+      },
+      last_poster: {
+        id: 9,
+        username: "Tim Stone",
+        uploaded_avatar_id: 40181,
+        avatar_template: "/images/avatar.png",
+      },
+      participants: [
+        {
+          id: 9,
+          username: "tms",
+          uploaded_avatar_id: 40181,
+          avatar_template: "/images/avatar.png",
+          post_count: 2,
+        },
+        {
+          id: 255,
+          username: "james_john",
+          uploaded_avatar_id: 5697,
+          avatar_template: "/images/avatar.png",
+          post_count: 1,
+        },
+      ],
+      links: [],
+      notification_level: 2,
+      notifications_reason_id: 4,
+      can_move_posts: true,
+      can_edit: true,
+      can_delete: true,
+      can_recover: true,
+      can_remove_allowed_users: true,
+      can_invite_to: true,
+      can_create_post: true,
+      can_reply_as_new_topic: true,
+      can_flag_topic: true,
+    },
+    highest_post_number: 2,
+    last_read_post_number: 2,
+    deleted_by: null,
+    has_deleted: true,
+    actions_summary: [
+      { id: 4, count: 0, hidden: false, can_act: true },
+      { id: 7, count: 0, hidden: false, can_act: true },
+      { id: 8, count: 0, hidden: false, can_act: true },
+    ],
+    chunk_size: 20,
+    bookmarked: false,
+    bookmarks: [],
+    suggested_topics: [
+      {
+        id: 27331,
+        title: "Polls are still very buggy",
+        fancy_title: "Polls are still very buggy",
+        slug: "polls-are-still-very-buggy",
+        posts_count: 4,
+        reply_count: 1,
+        highest_post_number: 4,
+        image_url: "/uploads/default/_optimized/cd1/b8c/c162528887_690x401.png",
+        created_at: "2015-04-08T09:51:00.357Z",
+        last_posted_at: "2015-04-08T15:59:16.258Z",
+        bumped: true,
+        bumped_at: "2015-04-08T16:05:09.842Z",
+        unseen: false,
+        last_read_post_number: 3,
+        unread_posts: 1,
+        pinned: false,
+        unpinned: null,
+        visible: true,
+        closed: false,
+        archived: false,
+        notification_level: 2,
+        bookmarked: false,
+        bookmarks: [],
+        liked: false,
+        archetype: "regular",
+        like_count: 11,
+        views: 55,
+        category_id: 1,
+        posters: [
+          {
+            extras: "latest single",
+            description: "Original Poster, Most Recent Poster",
+            user: {
+              id: 1,
+              username: "test",
+              avatar_template: "/images/avatar.png",
+            },
+          },
+        ],
+      },
+    ],
+    tags: null,
+  },
 };
diff --git a/app/assets/javascripts/discourse/tests/fixtures/user-fixtures.js b/app/assets/javascripts/discourse/tests/fixtures/user-fixtures.js
index 979543af5d9..464b039152e 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/user-fixtures.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/user-fixtures.js
@@ -3118,8 +3118,8 @@ export default {
         text_size: "normal",
         text_size_seq: 0,
         title_count_mode: "notifications",
+        timezone: "Asia/Tokyo",
       },
-      timezone: "Asia/Tokyo",
     },
   },
   "/u/%E3%83%A9%E3%82%A4%E3%82%AA%E3%83%B3/summary.json": {
diff --git a/app/assets/javascripts/discourse/tests/helpers/component-test.js b/app/assets/javascripts/discourse/tests/helpers/component-test.js
index f4e36d4c988..624fc39d6df 100644
--- a/app/assets/javascripts/discourse/tests/helpers/component-test.js
+++ b/app/assets/javascripts/discourse/tests/helpers/component-test.js
@@ -3,11 +3,10 @@ import Session from "discourse/models/session";
 import Site from "discourse/models/site";
 import TopicTrackingState from "discourse/models/topic-tracking-state";
 import User from "discourse/models/user";
-import { autoLoadModules } from "discourse/initializers/auto-load-modules";
+import { autoLoadModules } from "discourse/instance-initializers/auto-load-modules";
 import QUnit, { test } from "qunit";
 import { setupRenderingTest as emberSetupRenderingTest } from "ember-qunit";
 import { currentSettings } from "discourse/tests/helpers/site-settings";
-import { injectServiceIntoService } from "discourse/pre-initializers/inject-discourse-objects";
 
 export function setupRenderingTest(hooks) {
   emberSetupRenderingTest(hooks);
@@ -50,12 +49,6 @@ export function setupRenderingTest(hooks) {
     this.owner.register("service:current-user", currentUser, {
       instantiate: false,
     });
-    this.owner.inject("component", "currentUser", "service:current-user");
-    injectServiceIntoService({
-      app: this.owner.application,
-      property: "currentUser",
-      specifier: "service:current-user",
-    });
 
     this.owner.unregister("service:topic-tracking-state");
     this.owner.register(
@@ -63,11 +56,6 @@ export function setupRenderingTest(hooks) {
       TopicTrackingState.create({ currentUser }),
       { instantiate: false }
     );
-    injectServiceIntoService({
-      app: this.owner.application,
-      property: "topicTrackingState",
-      specifier: "service:topic-tracking-state",
-    });
 
     autoLoadModules(this.owner, this.registry);
     this.owner.lookup("service:store");
diff --git a/app/assets/javascripts/discourse/tests/helpers/create-pretender.js b/app/assets/javascripts/discourse/tests/helpers/create-pretender.js
index 25364f0ff0e..75fc09e7bdc 100644
--- a/app/assets/javascripts/discourse/tests/helpers/create-pretender.js
+++ b/app/assets/javascripts/discourse/tests/helpers/create-pretender.js
@@ -1,6 +1,7 @@
 import Pretender from "pretender";
 import User from "discourse/models/user";
 import getURL from "discourse-common/lib/get-url";
+import { cloneJSON } from "discourse-common/lib/object";
 
 export function parsePostData(query) {
   const result = {};
@@ -39,6 +40,10 @@ export function success() {
   return response({ success: true });
 }
 
+export function OK(resp = {}, headers = {}) {
+  return [200, headers, resp];
+}
+
 const loggedIn = () => !!User.current();
 const helpers = { response, success, parsePostData };
 
@@ -77,17 +82,18 @@ export function applyDefaultHandlers(pretender) {
   );
 
   pretender.get("/latest.json", () => {
-    const json = fixturesByUrl["/latest.json"];
+    const json = cloneJSON(fixturesByUrl["/latest.json"]);
 
     if (loggedIn()) {
       // Stuff to let us post
       json.topic_list.can_create_topic = true;
     }
+
     return response(json);
   });
 
   pretender.get("/c/bug/1/l/latest.json", () => {
-    const json = fixturesByUrl["/c/bug/1/l/latest.json"];
+    const json = cloneJSON(fixturesByUrl["/c/bug/1/l/latest.json"]);
 
     if (loggedIn()) {
       // Stuff to let us post
@@ -100,8 +106,20 @@ export function applyDefaultHandlers(pretender) {
     return response({
       tags: [
         { id: "eviltrout", count: 1 },
-        { id: "planned", text: "planned", count: 7, pm_only: false },
-        { id: "private", text: "private", count: 0, pm_only: true },
+        {
+          id: "planned",
+          name: "planned",
+          text: "planned",
+          count: 7,
+          pm_only: false,
+        },
+        {
+          id: "private",
+          name: "private",
+          text: "private",
+          count: 0,
+          pm_only: true,
+        },
       ],
       extras: {
         tag_groups: [
@@ -109,24 +127,60 @@ export function applyDefaultHandlers(pretender) {
             id: 2,
             name: "Ford Cars",
             tags: [
-              { id: "Escort", text: "Escort", count: 1, pm_only: false },
-              { id: "focus", text: "focus", count: 3, pm_only: false },
+              {
+                id: "Escort",
+                name: "Escort",
+                text: "Escort",
+                count: 1,
+                pm_only: false,
+              },
+              {
+                id: "focus",
+                name: "focus",
+                text: "focus",
+                count: 3,
+                pm_only: false,
+              },
             ],
           },
           {
             id: 1,
             name: "Honda Cars",
             tags: [
-              { id: "civic", text: "civic", count: 4, pm_only: false },
-              { id: "accord", text: "accord", count: 2, pm_only: false },
+              {
+                id: "civic",
+                name: "civic",
+                text: "civic",
+                count: 4,
+                pm_only: false,
+              },
+              {
+                id: "accord",
+                name: "accord",
+                text: "accord",
+                count: 2,
+                pm_only: false,
+              },
             ],
           },
           {
             id: 1,
             name: "Makes",
             tags: [
-              { id: "ford", text: "ford", count: 5, pm_only: false },
-              { id: "honda", text: "honda", count: 6, pm_only: false },
+              {
+                id: "ford",
+                name: "ford",
+                text: "ford",
+                count: 5,
+                pm_only: false,
+              },
+              {
+                id: "honda",
+                name: "honda",
+                text: "honda",
+                count: 6,
+                pm_only: false,
+              },
             ],
           },
         ],
@@ -184,7 +238,7 @@ export function applyDefaultHandlers(pretender) {
   );
 
   pretender.get("/u/eviltrout.json", () => {
-    const json = fixturesByUrl["/u/eviltrout.json"];
+    const json = cloneJSON(fixturesByUrl["/u/eviltrout.json"]);
     json.user.can_edit = loggedIn();
     return response(json);
   });
@@ -220,7 +274,40 @@ export function applyDefaultHandlers(pretender) {
 
   pretender.get("/u/eviltrout/invited.json", () => {
     return response({
-      invites: [],
+      invites: [
+        {
+          id: 8,
+          invite_key: "hMFT8G1oKP",
+          link: "http://localhost:3000/invites/hMFT8G1oKP",
+          email: "steak@cat.com",
+          domain: null,
+          emailed: false,
+          can_delete_invite: true,
+          custom_message: null,
+          created_at: "2023-06-01T04:47:13.195Z",
+          updated_at: "2023-06-01T04:47:13.195Z",
+          expires_at: "2023-08-30T04:47:00.000Z",
+          expired: false,
+          topics: [],
+          groups: [],
+        },
+        {
+          id: 9,
+          invite_key: "hMFT8G1WHA",
+          link: "http://localhost:3000/invites/hMFT8G1WHA",
+          email: "tomtom@cat.com",
+          domain: null,
+          emailed: false,
+          can_delete_invite: false,
+          custom_message: null,
+          created_at: "2023-06-01T04:47:13.195Z",
+          updated_at: "2023-06-01T04:47:13.195Z",
+          expires_at: "2023-08-30T04:47:00.000Z",
+          expired: false,
+          topics: [],
+          groups: [],
+        },
+      ],
       can_see_invite_details: true,
       counts: {
         pending: 0,
@@ -1043,11 +1130,21 @@ export function applyDefaultHandlers(pretender) {
         },
         {
           id: 9,
+          name: "an_extra_field",
+          type: "plugin",
+          enabled: false,
+          automatic_position: null,
+          position: 8,
+          icon: null,
+          user_field: null,
+        },
+        {
+          id: 10,
           name: null,
           type: "user_field",
           enabled: false,
           automatic_position: null,
-          position: 8,
+          position: 9,
           icon: null,
           user_field: {
             id: 3,
diff --git a/app/assets/javascripts/discourse/tests/helpers/deprecation-counter.js b/app/assets/javascripts/discourse/tests/helpers/deprecation-counter.js
index 166c7e475a9..29ecfa73e1d 100644
--- a/app/assets/javascripts/discourse/tests/helpers/deprecation-counter.js
+++ b/app/assets/javascripts/discourse/tests/helpers/deprecation-counter.js
@@ -34,7 +34,11 @@ export default class DeprecationCounter {
     let { id } = options;
     id ||= "discourse.(unknown)";
 
-    this.incrementDeprecation(id);
+    const matchingConfig = this.#configById.get(id);
+
+    if (matchingConfig !== "silence") {
+      this.incrementDeprecation(id);
+    }
   }
 
   incrementDeprecation(id) {
diff --git a/app/assets/javascripts/discourse/tests/helpers/index.js b/app/assets/javascripts/discourse/tests/helpers/index.js
new file mode 100644
index 00000000000..3d0a13d2aaa
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/helpers/index.js
@@ -0,0 +1,42 @@
+import {
+  setupApplicationTest as upstreamSetupApplicationTest,
+  setupRenderingTest as upstreamSetupRenderingTest,
+  setupTest as upstreamSetupTest,
+} from "ember-qunit";
+
+// This file exists to provide wrappers around ember-qunit's / ember-mocha's
+// test setup functions. This way, you can easily extend the setup that is
+// needed per test type.
+
+function setupApplicationTest(hooks, options) {
+  upstreamSetupApplicationTest(hooks, options);
+
+  // Additional setup for application tests can be done here.
+  //
+  // For example, if you need an authenticated session for each
+  // application test, you could do:
+  //
+  // hooks.beforeEach(async function () {
+  //   await authenticateSession(); // ember-simple-auth
+  // });
+  //
+  // This is also a good place to call test setup functions coming
+  // from other addons:
+  //
+  // setupIntl(hooks); // ember-intl
+  // setupMirage(hooks); // ember-cli-mirage
+}
+
+function setupRenderingTest(hooks, options) {
+  upstreamSetupRenderingTest(hooks, options);
+
+  // Additional setup for rendering tests can be done here.
+}
+
+function setupTest(hooks, options) {
+  upstreamSetupTest(hooks, options);
+
+  // Additional setup for unit tests can be done here.
+}
+
+export { setupApplicationTest, setupRenderingTest, setupTest };
diff --git a/app/assets/javascripts/discourse/tests/helpers/lightbox-helpers.js b/app/assets/javascripts/discourse/tests/helpers/lightbox-helpers.js
new file mode 100644
index 00000000000..f1c18bf616e
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/helpers/lightbox-helpers.js
@@ -0,0 +1,176 @@
+import { htmlSafe } from "@ember/template";
+
+// we use transparent pngs here to avoid loading actual images in tests. We don't care so much about the content of the image
+// we only care that the correct loading state is set and the metadata is correct
+const PNGS = {
+  first: {
+    fullsizeURL:
+      "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAC7gAAAAKCAYAAAAkEBP9AAAAqElEQVR42u3aQQEAIAwAIdfN/pVmDO8BOZizdw8AAAAAAAAAAAAAAHw2gjsAAAAAAAAAAAAAAAWCOwAAAAAAAAAAAAAACYI7AAAAAAAAAAAAAAAJgjsAAAAAAAAAAAAAAAmCOwAAAAAAAAAAAAAACYI7AAAAAAAAAAAAAAAJgjsAAAAAAAAAAAAAAAmCOwAAAAAAAAAAAAAACYI7AAAAAAAAAAAAAAAJD2GpFp8NV4+AAAAAAElFTkSuQmCC",
+    smallURL:
+      "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAfQAAAABCAYAAAAo/lyUAAAAG0lEQVR42mP8z8AARKNgFIyCUTAKRsEoGMoAAJ3mAgDVocSsAAAAAElFTkSuQmCC",
+  },
+  second: {
+    fullsizeURL:
+      "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAA+gAAAACCAYAAADLlPadAAAAJ0lEQVR42u3XMQEAAAgDoNk/pzk0xh5owdzmAgAAAFSNoAMAAEDfA6HNBcm32R2bAAAAAElFTkSuQmCC",
+    smallURL:
+      "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAfQAAAABCAYAAAAo/lyUAAAAHElEQVR42mP8/5ThP8MoGAWjYBSMglEwCoY0AACaegLl/taPAQAAAABJRU5ErkJggg==",
+  },
+  third: {
+    fullsizeURL:
+      "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAA+gAAAACCAYAAADLlPadAAAAJklEQVR42u3XMQEAAAgDoPnZv7DG2AMtmNxeAAAAgKoRdAAAAOh7JuQED1zV49EAAAAASUVORK5CYII=",
+    smallURL:
+      "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAfQAAAABCAYAAAAo/lyUAAAAHElEQVR42mNk+M/xn2EUjIJRMApGwSgYBUMaAADbVwIINvIVWgAAAABJRU5ErkJggg==",
+  },
+  smallerThanViewPort: {
+    fullsizeURL:
+      "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAASwAAAACCAYAAADirOGHAAAAIUlEQVR42u3UAQ0AAAgDoNvE/iU1xzcIwWTvAlBghAW0eNbwBD9majEtAAAAAElFTkSuQmCC",
+    smallURL:
+      "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJYAAAABCAYAAAA8YlcZAAAAE0lEQVR42mNkUPj/n2EUjAIqAwD2IwIg6SI42wAAAABJRU5ErkJggg==",
+  },
+};
+
+const cssVars1 = htmlSafe(
+  `--dominant-color: #F0F1F3;--aspect-ratio: 3000 / 10;--small-url: url(${PNGS.first.smallURL});`
+);
+const cssVars2 = htmlSafe(
+  `--dominant-color: #F0F1F3;--aspect-ratio: 3000 / 10;--small-url: url(${PNGS.second.smallURL});`
+);
+const cssVars3 = htmlSafe(
+  `--dominant-color: #F0F1F3;--aspect-ratio: 3000 / 10;--small-url: url(${PNGS.third.smallURL});`
+);
+const cssVars4 = htmlSafe(
+  `--dominant-color: #F0F1F3;--aspect-ratio: 3000 / 10;--small-url: url(${PNGS.smallerThanViewPort.smallURL});`
+);
+
+export const LIGHTBOX_IMAGE_FIXTURES = {
+  first: {
+    fullsizeURL: PNGS.first.fullsizeURL,
+    smallURL: PNGS.first.smallURL,
+    downloadURL: PNGS.first.fullsizeURL,
+    fileDetails: "3000×10 221 KB",
+    width: 3000,
+    height: 10,
+    aspectRatio: "3000 / 10",
+    dominantColor: "F0F1F3",
+    index: 0,
+    title: "first image title",
+    alt: "first image alt",
+    cssVars: cssVars1,
+  },
+  second: {
+    fullsizeURL: PNGS.second.fullsizeURL,
+    smallURL: PNGS.second.smallURL,
+    downloadURL: PNGS.second.fullsizeURL,
+    fileDetails: "1000×2 166 KB",
+    width: 1000,
+    height: 2,
+    aspectRatio: "1000 / 2",
+    dominantColor: "F9F5F6",
+    index: 1,
+    title: "second image title",
+    alt: "second image alt",
+    cssVars: cssVars2,
+  },
+  third: {
+    fullsizeURL: PNGS.third.fullsizeURL,
+    smallURL: PNGS.third.smallURL,
+    downloadURL: PNGS.third.fullsizeURL,
+    fileDetails: "1000×2 240 KB",
+    width: 1000,
+    height: 2,
+    aspectRatio: "1000 / 2",
+    dominantColor: "EEF0EE",
+    index: 2,
+    title: "third image title",
+    alt: "third image alt",
+    cssVars: cssVars3,
+  },
+  smallerThanViewPort: {
+    fullsizeURL: PNGS.smallerThanViewPort.fullsizeURL,
+    smallURL: PNGS.smallerThanViewPort.smallURL,
+    downloadURL: PNGS.smallerThanViewPort.fullsizeURL,
+    fileDetails: "300×2 92.3 KB",
+    width: 300,
+    height: 2,
+    aspectRatio: "300 / 2",
+    dominantColor: "F0F0F1",
+    index: 3,
+    title: "fourth image title",
+    alt: "fourth image alt",
+    cssVars: cssVars4,
+  },
+  invalidImage: {
+    fullsizeURL: `https:expected-lightbox-invalid/.image/404.png`,
+  },
+};
+
+export function generateLightboxObject() {
+  const trimmedLightboxItem = Object.keys(LIGHTBOX_IMAGE_FIXTURES.first).reduce(
+    (acc, key) => {
+      if (key !== "height" && key !== "width" && key !== "alt") {
+        acc[key] = LIGHTBOX_IMAGE_FIXTURES.first[key];
+      }
+      return acc;
+    },
+    {}
+  );
+
+  return {
+    items: [{ ...trimmedLightboxItem }],
+    startingIndex: 0,
+    callbacks: {},
+    options: {},
+  };
+}
+
+export function generateLightboxMarkup(
+  {
+    fullsizeURL,
+    smallURL,
+    downloadURL,
+    title,
+    fileDetails,
+    dominantColor,
+    aspectRatio,
+    alt,
+    height,
+    width,
+  } = { ...LIGHTBOX_IMAGE_FIXTURES.first }
+) {
+  return `
+  <div class="lightbox-wrapper">
+    <a class="lightbox" href="${fullsizeURL}"
+      data-download-href="${downloadURL}"
+      title="${title}"><img src="${smallURL}" title="${title}" alt="${alt}"
+        width="${width}" height="${height}"
+        data-dominant-color="${dominantColor}" loading="lazy"
+        style="aspect-ratio: ${aspectRatio}" />
+      <div class="meta">
+        <span class="filename">${title}</span><span
+          class="informations">${fileDetails}</span>
+      </div>
+    </a>
+  </div>
+`;
+}
+
+export function generateImageUploaderMarkup(
+  fullsizeURL = LIGHTBOX_IMAGE_FIXTURES.first.fullsizeURL
+) {
+  return `
+<div id="profile-background-uploader" class="image-uploader ember-view">
+  <div class="uploaded-image-preview input-xxlarge"
+    style="background-image: url(${fullsizeURL})">
+    <a class="lightbox"
+      href="${fullsizeURL}"
+      rel="nofollow ugc noopener">
+      <div class="meta">
+        <span class="informations">
+          x
+        </span>
+      </div>
+    </a>
+  </div>
+</div>
+`;
+}
diff --git a/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js b/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js
index 79d7b6453ef..614f8a9324a 100644
--- a/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js
+++ b/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js
@@ -11,7 +11,12 @@ import {
   mergeSettings,
 } from "discourse/tests/helpers/site-settings";
 import { forceMobile, resetMobile } from "discourse/lib/mobile";
-import { getApplication, settled } from "@ember/test-helpers";
+import {
+  fillIn,
+  getApplication,
+  settled,
+  triggerKeyEvent,
+} from "@ember/test-helpers";
 import { getOwner } from "discourse-common/lib/get-owner";
 import { run } from "@ember/runloop";
 import { setupApplicationTest } from "ember-qunit";
@@ -21,7 +26,10 @@ import { _clearSnapshots } from "select-kit/components/composer-actions";
 import { clearHTMLCache } from "discourse/helpers/custom-html";
 import deprecated from "discourse-common/lib/deprecated";
 import { restoreBaseUri } from "discourse-common/lib/get-url";
-import { initSearchData } from "discourse/widgets/search-menu";
+import {
+  initSearchData,
+  resetOnKeyDownCallbacks,
+} from "discourse/widgets/search-menu";
 import { resetPostMenuExtraButtons } from "discourse/widgets/post-menu";
 import { isEmpty } from "@ember/utils";
 import { resetCustomPostMessageCallbacks } from "discourse/controllers/topic";
@@ -36,6 +44,7 @@ import { resetUserSearchCache } from "discourse/lib/user-search";
 import { resetCardClickListenerSelector } from "discourse/mixins/card-contents-base";
 import { resetComposerCustomizations } from "discourse/models/composer";
 import { resetQuickSearchRandomTips } from "discourse/widgets/search-menu-results";
+import { resetUserMenuProfileTabItems } from "discourse/components/user-menu/profile-tab-content";
 import sessionFixtures from "discourse/tests/fixtures/session-fixtures";
 import {
   resetHighestReadCache,
@@ -43,15 +52,18 @@ import {
 } from "discourse/lib/topic-list-tracker";
 import sinon from "sinon";
 import siteFixtures from "discourse/tests/fixtures/site-fixtures";
-import { clearExtraKeyboardShortcutHelp } from "discourse/lib/keyboard-shortcuts";
+import {
+  PLATFORM_KEY_MODIFIER,
+  clearExtraKeyboardShortcutHelp,
+} from "discourse/lib/keyboard-shortcuts";
 import { clearResolverOptions } from "discourse-common/resolver";
-import { clearResolverOptions as clearLegacyResolverOptions } from "discourse-common/lib/legacy-resolver";
 import { clearNavItems } from "discourse/models/nav-item";
 import {
   cleanUpComposerUploadHandler,
   cleanUpComposerUploadMarkdownResolver,
   cleanUpComposerUploadPreProcessor,
 } from "discourse/components/composer-editor";
+import { cleanUpHashtagTypeClasses } from "discourse/lib/hashtag-autocomplete";
 import { resetLastEditNotificationClick } from "discourse/models/post-stream";
 import { clearAuthMethods } from "discourse/models/login-method";
 import { clearTopicFooterDropdowns } from "discourse/lib/register-topic-footer-dropdown";
@@ -71,13 +83,14 @@ import {
 import { clearTagsHtmlCallbacks } from "discourse/lib/render-tags";
 import { clearToolbarCallbacks } from "discourse/components/d-editor";
 import { clearExtraHeaderIcons } from "discourse/widgets/header";
-import { resetSidebarSection } from "discourse/lib/sidebar/custom-sections";
 import { resetNotificationTypeRenderers } from "discourse/lib/notification-types-manager";
+import { resetSidebarPanels } from "discourse/lib/sidebar/custom-sections";
 import { resetUserMenuTabs } from "discourse/lib/user-menu/tab";
 import { reset as resetLinkLookup } from "discourse/lib/link-lookup";
 import { resetMentions } from "discourse/lib/link-mentions";
 import { resetModelTransformers } from "discourse/lib/model-transformers";
 import { cleanupTemporaryModuleRegistrations } from "./temporary-module-helper";
+import { clearBulkButtons } from "discourse/components/modal/topic-bulk-actions";
 
 export function currentUser() {
   return User.create(sessionFixtures["/session/current.json"].current_user);
@@ -180,6 +193,7 @@ export function testCleanup(container, app) {
   resetComposerCustomizations();
   resetQuickSearchRandomTips();
   resetPostMenuExtraButtons();
+  resetUserMenuProfileTabItems();
   clearExtraKeyboardShortcutHelp();
   clearNavItems();
   setTopicList(null);
@@ -190,6 +204,7 @@ export function testCleanup(container, app) {
   clearTopicFooterDropdowns();
   clearTopicFooterButtons();
   clearDesktopNotificationHandlers();
+  cleanUpHashtagTypeClasses();
   resetLastEditNotificationClick();
   clearAuthMethods();
   setTestPresence(true);
@@ -200,17 +215,24 @@ export function testCleanup(container, app) {
   clearBlockDecorateCallbacks();
   clearTextDecorateCallbacks();
   clearResolverOptions();
-  clearLegacyResolverOptions();
   clearTagsHtmlCallbacks();
   clearToolbarCallbacks();
-  resetSidebarSection();
   resetNotificationTypeRenderers();
+  resetSidebarPanels();
   clearExtraHeaderIcons();
+  resetOnKeyDownCallbacks();
   resetUserMenuTabs();
   resetLinkLookup();
   resetModelTransformers();
   resetMentions();
   cleanupTemporaryModuleRegistrations();
+  cleanupCssGeneratorTags();
+  clearBulkButtons();
+}
+
+function cleanupCssGeneratorTags() {
+  document.querySelector("style#category-color-css-generator")?.remove();
+  document.querySelector("style#hashtag-css-generator")?.remove();
 }
 
 export function discourseModule(name, options) {
@@ -311,7 +333,7 @@ export function acceptance(name, optionsOrCallback) {
           updateCurrentUser(userChanges);
         }
 
-        User.current().appEvents = getOwner(this).lookup("service:appEvents");
+        User.current().appEvents = getOwner(this).lookup("service:app-events");
         User.current().trackStatus();
       }
 
@@ -569,6 +591,17 @@ export async function paste(element, text, otherClipboardData = {}) {
   return e;
 }
 
+export async function emulateAutocomplete(inputSelector, text) {
+  await triggerKeyEvent(inputSelector, "keydown", "Backspace");
+  await fillIn(inputSelector, `${text} `);
+  await triggerKeyEvent(inputSelector, "keyup", "Backspace");
+
+  await triggerKeyEvent(inputSelector, "keydown", "Backspace");
+  await fillIn(inputSelector, text);
+  await triggerKeyEvent(inputSelector, "keyup", "Backspace");
+  await settled();
+}
+
 // The order of attributes can vary in different browsers. When comparing
 // HTML strings from the DOM, this function helps to normalize them to make
 // comparison work cross-browser
@@ -577,3 +610,5 @@ export function normalizeHtml(html) {
   resultElement.innerHTML = html;
   return resultElement.innerHTML;
 }
+
+export const metaModifier = { [`${PLATFORM_KEY_MODIFIER}Key`]: true };
diff --git a/app/assets/javascripts/discourse/tests/helpers/raise-on-deprecation.js b/app/assets/javascripts/discourse/tests/helpers/raise-on-deprecation.js
new file mode 100644
index 00000000000..6c6c0ebb6b2
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/helpers/raise-on-deprecation.js
@@ -0,0 +1,49 @@
+import { registerDeprecationHandler } from "@ember/debug";
+import { registerDeprecationHandler as registerDiscourseDeprecationHandler } from "discourse-common/lib/deprecated";
+import QUnit from "qunit";
+
+let disabled = false;
+
+export function configureRaiseOnDeprecation() {
+  const workflows = window.deprecationWorkflow?.config?.workflow;
+  if (!workflows) {
+    return;
+  }
+
+  if (window.EmberENV.RAISE_ON_DEPRECATION !== undefined) {
+    return;
+  }
+
+  registerDeprecationHandler((message, options, next) => {
+    if (disabled || workflows.find((w) => w.matchId === options.id)) {
+      return next(message, options);
+    }
+    raiseDeprecationError(message, options);
+  });
+
+  registerDiscourseDeprecationHandler((message, options) => {
+    if (disabled || workflows.find((w) => w.matchId === options?.id)) {
+      return;
+    }
+    raiseDeprecationError(message, options);
+  });
+}
+
+function raiseDeprecationError(message, options) {
+  message = `DEPRECATION IN CORE TEST: ${message} (deprecation id: ${options.id})\n\nCore test runs must be deprecation-free. Use ember-deprecation-workflow to silence unresolved deprecations.`;
+  if (QUnit.config.current) {
+    QUnit.assert.pushResult({
+      result: false,
+      message,
+    });
+  }
+  throw new Error(message);
+}
+
+export function disableRaiseOnDeprecation() {
+  disabled = true;
+}
+
+export function enableRaiseOnDeprecation() {
+  disabled = false;
+}
diff --git a/app/assets/javascripts/discourse/tests/helpers/review-pretender.js b/app/assets/javascripts/discourse/tests/helpers/review-pretender.js
index b864494a75c..e1952574eab 100644
--- a/app/assets/javascripts/discourse/tests/helpers/review-pretender.js
+++ b/app/assets/javascripts/discourse/tests/helpers/review-pretender.js
@@ -214,6 +214,7 @@ export default function (helpers) {
           is_new_topic: false,
         },
       ],
+      reviewable_count: 8,
       __rest_serializer: "1",
     });
   });
diff --git a/app/assets/javascripts/discourse/tests/helpers/select-kit-helper.js b/app/assets/javascripts/discourse/tests/helpers/select-kit-helper.js
index 648bcaa21f1..612a878febe 100644
--- a/app/assets/javascripts/discourse/tests/helpers/select-kit-helper.js
+++ b/app/assets/javascripts/discourse/tests/helpers/select-kit-helper.js
@@ -1,7 +1,6 @@
 import { click, fillIn, triggerEvent } from "@ember/test-helpers";
 import { exists, query, queryAll } from "discourse/tests/helpers/qunit-helpers";
 import { isEmpty } from "@ember/utils";
-import { moduleForComponent } from "ember-qunit";
 import jQuery from "jquery";
 
 function checkSelectKitIsNotExpanded(selector) {
@@ -307,21 +306,6 @@ export default function selectKit(selector) {
   };
 }
 
-export function testSelectKitModule(moduleName, options = {}) {
-  moduleForComponent(`select-kit/${moduleName}`, {
-    integration: true,
-
-    beforeEach() {
-      this.set("subject", selectKit());
-      options.beforeEach?.call(this);
-    },
-
-    afterEach() {
-      options.afterEach?.call(this);
-    },
-  });
-}
-
 export const DEFAULT_CONTENT = [
   { id: 1, name: "foo" },
   { id: 2, name: "bar" },
diff --git a/app/assets/javascripts/discourse/tests/helpers/store-pretender.js b/app/assets/javascripts/discourse/tests/helpers/store-pretender.js
index 033c0bb5c1d..6094fa5ea5d 100644
--- a/app/assets/javascripts/discourse/tests/helpers/store-pretender.js
+++ b/app/assets/javascripts/discourse/tests/helpers/store-pretender.js
@@ -12,7 +12,14 @@ const fruits = [
   { id: 1, name: "apple", farmer_id: 1, color_ids: [1, 2], category_id: 4 },
   { id: 2, name: "banana", farmer_id: 1, color_ids: [3], category_id: 3 },
   { id: 3, name: "grape", farmer_id: 2, color_ids: [2], category_id: 5 },
-  { id: 4, name: "orange", farmer_id: null, color_ids: [2], category_id: 5 },
+  {
+    id: 4,
+    name: "orange",
+    farmer_id: null,
+    color_ids: [2],
+    category_id: 5,
+    other_fruit_ids: { apple: 1, banana: 2 },
+  },
 ];
 
 const farmers = [
diff --git a/app/assets/javascripts/discourse/tests/index.html b/app/assets/javascripts/discourse/tests/index.html
index 1d71cd54e2f..6ccffa0d23a 100644
--- a/app/assets/javascripts/discourse/tests/index.html
+++ b/app/assets/javascripts/discourse/tests/index.html
@@ -2,20 +2,23 @@
 <html>
   <head>
     <meta charset="utf-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <title>Discourse Tests</title>
     <meta name="description" content="" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta property="og:title" content="Discourse Tests" />
     <meta property="og:url" content="{{rootURL}}" />
-    <meta property="twitter:title" content="Discourse Tests" />
-    <meta property="twitter:url" content="{{rootURL}}" />
+    <meta name="twitter:title" content="Discourse Tests" />
+    <meta name="twitter:url" content="{{rootURL}}" />
+    <meta name="theme-color" content="#ffffff">
+
+    <link rel="canonical" href="{{rootURL}}" />
 
     <meta name="color-scheme" content="light dark">
 
     {{content-for "head"}} {{content-for "test-head"}}
 
     <link rel="stylesheet" href="{{rootURL}}assets/vendor.css" />
+    <link rel="stylesheet" href="{{rootURL}}assets/discourse.css">
     <link rel="stylesheet" href="{{rootURL}}assets/test-support.css" />
     <link rel="stylesheet" href="{{rootURL}}assets/qunit.css" />
     <link rel="stylesheet" href="{{rootURL}}assets/qunit-custom.css" />
diff --git a/app/assets/javascripts/discourse/tests/integration/template-override-test.js b/app/assets/javascripts/discourse/tests/integration/component-templates-test.js
similarity index 63%
rename from app/assets/javascripts/discourse/tests/integration/template-override-test.js
rename to app/assets/javascripts/discourse/tests/integration/component-templates-test.js
index b98d37b3b70..2aaef532776 100644
--- a/app/assets/javascripts/discourse/tests/integration/template-override-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/component-templates-test.js
@@ -5,6 +5,7 @@ import { hbs } from "ember-cli-htmlbars";
 import { registerTemporaryModule } from "../helpers/temporary-module-helper";
 import { setComponentTemplate } from "@glimmer/manager";
 import Component from "@glimmer/component";
+import { forceMobile, resetMobile } from "discourse/lib/mobile";
 
 class MockColocatedComponent extends Component {}
 setComponentTemplate(hbs`Colocated Original`, MockColocatedComponent);
@@ -22,6 +23,10 @@ function registerBaseComponents(namespace = "discourse") {
     `${namespace}/components/mock-colocated`,
     MockColocatedComponent
   );
+  registerTemporaryModule(
+    `${namespace}/templates/mobile/components/mock-colocated`,
+    hbs`Core mobile template`
+  );
   registerTemporaryModule(
     `${namespace}/components/mock-resolved`,
     MockResolvedComponent
@@ -30,6 +35,10 @@ function registerBaseComponents(namespace = "discourse") {
     `${namespace}/templates/components/mock-resolved`,
     MockResolvedComponentTemplate
   );
+  registerTemporaryModule(
+    `${namespace}/templates/mobile/components/mock-resolved`,
+    hbs`Core resolved mobile`
+  );
 }
 
 function registerThemeOverrides() {
@@ -37,10 +46,18 @@ function registerThemeOverrides() {
     "discourse/theme-12/discourse/templates/components/mock-colocated",
     hbs`Colocated Theme Override`
   );
+  registerTemporaryModule(
+    `discourse/theme-12/discourse/templates/mobile/components/mock-colocated`,
+    hbs`Colocated Mobile Theme Override`
+  );
   registerTemporaryModule(
     "discourse/theme-12/discourse/templates/components/mock-resolved",
     hbs`Resolved Theme Override`
   );
+  registerTemporaryModule(
+    "discourse/theme-12/discourse/templates/mobile/components/mock-resolved",
+    hbs`Resolved Mobile Theme Override`
+  );
 }
 
 function registerPluginOverrides() {
@@ -65,7 +82,39 @@ function registerOtherPluginOverrides() {
   );
 }
 
-module("Integration | Initializers | template-overrides", function () {
+function registerTemplateOnlyComponents() {
+  registerTemporaryModule(
+    `discourse/templates/components/core-template-only-definition`,
+    hbs`glimmer template-only component`
+  );
+
+  registerTemporaryModule(
+    `discourse/plugins/some-plugin-name/discourse/templates/components/plugin-template-only-definition`,
+    hbs`classic component`
+  );
+}
+
+module("Integration | Initializers | plugin-component-templates", function () {
+  module("template-only component definition behaviour", function (hooks) {
+    hooks.beforeEach(() => registerTemplateOnlyComponents());
+    setupRenderingTest(hooks);
+
+    test("treats plugin template-only definition as classic component", async function () {
+      await render(hbs`<PluginTemplateOnlyDefinition class='test-class'/>`);
+      assert
+        .dom("div.test-class")
+        .hasText("classic component", "renders as classic component");
+    });
+
+    test("leaves core template-only definition as glimmer template-only component", async function () {
+      await render(hbs`<CoreTemplateOnlyDefinition class='test-class'/>`);
+      assert
+        .dom("div.test-class")
+        .doesNotExist("no classic component rendered");
+      assert.dom().hasText("glimmer template-only component");
+    });
+  });
+
   module("with no overrides", function (hooks) {
     hooks.beforeEach(() => registerBaseComponents());
     setupRenderingTest(hooks);
@@ -81,6 +130,26 @@ module("Integration | Initializers | template-overrides", function () {
     });
   });
 
+  module("with core mobile overrides", function (hooks) {
+    hooks.beforeEach(() => {
+      registerBaseComponents();
+      forceMobile();
+    });
+    hooks.afterEach(resetMobile);
+
+    setupRenderingTest(hooks);
+
+    test("core mobile overrides are used", async function () {
+      await render(TestTemplate);
+      assert
+        .dom("#mock-colocated")
+        .hasText("Core mobile template", "colocated component correct");
+      assert
+        .dom("#mock-resolved")
+        .hasText("Core resolved mobile", "resolved component correct");
+    });
+  });
+
   module("with theme overrides", function (hooks) {
     hooks.beforeEach(() => registerBaseComponents());
     hooks.beforeEach(registerThemeOverrides);
@@ -97,6 +166,33 @@ module("Integration | Initializers | template-overrides", function () {
     });
   });
 
+  module("with mobile theme overrides", function (hooks) {
+    hooks.beforeEach(() => {
+      registerThemeOverrides();
+      forceMobile();
+      registerBaseComponents();
+    });
+    hooks.afterEach(resetMobile);
+
+    setupRenderingTest(hooks);
+
+    test("mobile theme overrides are used", async function () {
+      await render(TestTemplate);
+      assert
+        .dom("#mock-colocated")
+        .hasText(
+          "Colocated Mobile Theme Override",
+          "colocated component correct"
+        );
+      assert
+        .dom("#mock-resolved")
+        .hasText(
+          "Resolved Mobile Theme Override",
+          "resolved component correct"
+        );
+    });
+  });
+
   module("with plugin overrides", function (hooks) {
     hooks.beforeEach(() => registerBaseComponents());
     hooks.beforeEach(registerPluginOverrides);
@@ -114,6 +210,7 @@ module("Integration | Initializers | template-overrides", function () {
   });
 
   module("with theme and plugin overrides", function (hooks) {
+    hooks.beforeEach(() => registerBaseComponents());
     hooks.beforeEach(registerPluginOverrides);
     hooks.beforeEach(registerThemeOverrides);
     setupRenderingTest(hooks);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/ace-editor-test.js b/app/assets/javascripts/discourse/tests/integration/components/ace-editor-test.js
index c70d2a37b60..0c8c12e8420 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/ace-editor-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/ace-editor-test.js
@@ -22,6 +22,11 @@ module("Integration | Component | ace-editor", function (hooks) {
     assert.ok(exists(".ace_editor"), "it renders the ace editor");
   });
 
+  test("yaml editor", async function (assert) {
+    await render(hbs`<AceEditor @mode="yaml" @content="test: true" />`);
+    assert.ok(exists(".ace_editor"), "it renders the ace editor");
+  });
+
   test("disabled editor", async function (assert) {
     await render(hbs`
       <AceEditor @mode="sql" @content="SELECT * FROM users" @disabled=true />
diff --git a/app/assets/javascripts/discourse/tests/integration/components/admin-theme-settings-editor-test.js b/app/assets/javascripts/discourse/tests/integration/components/admin-theme-settings-editor-test.js
new file mode 100644
index 00000000000..c4fdacad53a
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/admin-theme-settings-editor-test.js
@@ -0,0 +1,143 @@
+import { module, test } from "qunit";
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import { render } from "@ember/test-helpers";
+import { hbs } from "ember-cli-htmlbars";
+
+/*
+example valid content for ace editor:
+[
+	{
+		"setting": "whitelisted_fruits",
+		"value": "uudu"
+	},
+	{
+		"setting": "favorite_fruit",
+		"value": "orange"
+	},
+	{
+		"setting": "year",
+		"value": 1992
+	},
+	{
+		"setting": "banner_links",
+		"value": "[{\"icon\":\"info-circle\",\"text\":\"about this site\",\"url\":\"/faq\"}, {\"icon\":\"users\",\"text\":\"meet our staff\",\"url\":\"/about\"}, {\"icon\":\"star\",\"text\":\"your preferences\",\"url\":\"/my/preferences\"}]"
+	}
+]
+ */
+
+function glimmerComponent(owner, componentName, args = {}) {
+  const { class: componentClass } = owner.factoryFor(
+    `component:${componentName}`
+  );
+  let componentManager = owner.lookup("component-manager:glimmer");
+  let component = componentManager.createComponent(componentClass, {
+    named: args,
+  });
+  return component;
+}
+
+module(
+  "Integration | Component | admin-theme-settings-editor",
+  function (hooks) {
+    setupRenderingTest(hooks);
+
+    let model;
+
+    test("renders passed json model object into string in the ace editor", async function (assert) {
+      await render(hbs`<ThemeSettingsEditor @model={{hash
+        model=(hash
+         settings=(array
+          (hash
+            setting='setting1'
+            value='value1')
+          (hash
+            setting='setting2'
+            value='value2')
+          )
+        )
+    }} />`);
+      const lines = document.querySelectorAll(".ace_line");
+      const indexOf = lines[0].innerHTML.indexOf("[");
+      assert.ok(indexOf >= 0);
+    });
+
+    test("input is valid json", async function (assert) {
+      const component = glimmerComponent(this.owner, "theme-settings-editor", {
+        model: [],
+      });
+      component.editedContent = "foo";
+      component.save();
+      assert.strictEqual(component.errors[0].setting, "Syntax Error");
+    });
+
+    test("'setting' key is present for each setting", async function (assert) {
+      const component = glimmerComponent(this.owner, "theme-settings-editor", {
+        model: [],
+      });
+
+      component.editedContent = JSON.stringify([{ value: "value1" }]);
+      component.save();
+      assert.strictEqual(component.errors[0].setting, "Syntax Error");
+    });
+
+    test("'value' key is present for each setting", async function (assert) {
+      const component = glimmerComponent(this.owner, "theme-settings-editor", {
+        model: [],
+      });
+
+      component.editedContent = JSON.stringify([{ setting: "setting1" }]);
+      component.save();
+      assert.strictEqual(component.errors[0].setting, "Syntax Error");
+    });
+
+    test("only 'setting' and 'value' keys are present, no others", async function (assert) {
+      const component = glimmerComponent(this.owner, "theme-settings-editor", {
+        model: [],
+      });
+
+      component.editedContent = JSON.stringify([{ otherkey: "otherkey1" }]);
+      component.save();
+      assert.strictEqual(component.errors[0].setting, "Syntax Error");
+    });
+
+    test("no settings are deleted", async function (assert) {
+      model = {
+        model: {
+          settings: [
+            { setting: "foo", value: "foo" },
+            { setting: "bar", value: "bar" },
+          ],
+        },
+      };
+      const component = glimmerComponent(this.owner, "theme-settings-editor", {
+        model,
+      });
+
+      component.editedContent = JSON.stringify([
+        { setting: "bar", value: "bar" },
+      ]);
+      component.save();
+
+      assert.strictEqual(component.errors[0].setting, "foo");
+    });
+
+    test("no settings are added", async function (assert) {
+      model = {
+        model: {
+          settings: [{ setting: "bar", value: "bar" }],
+        },
+      };
+
+      const component = glimmerComponent(this.owner, "theme-settings-editor", {
+        model,
+      });
+
+      component.editedContent = JSON.stringify([
+        { setting: "foo", value: "foo" },
+        { setting: "bar", value: "bar" },
+      ]);
+      component.save();
+      assert.strictEqual(component.errors[0].setting, "foo");
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/bookmark-alert-test.js b/app/assets/javascripts/discourse/tests/integration/components/bookmark-alert-test.js
deleted file mode 100644
index f90e5415ab4..00000000000
--- a/app/assets/javascripts/discourse/tests/integration/components/bookmark-alert-test.js
+++ /dev/null
@@ -1,70 +0,0 @@
-import { module, test } from "qunit";
-import { setupRenderingTest } from "discourse/tests/helpers/component-test";
-import { render } from "@ember/test-helpers";
-import { exists } from "discourse/tests/helpers/qunit-helpers";
-import { hbs } from "ember-cli-htmlbars";
-
-module("Integration | Component | bookmark-alert", function (hooks) {
-  setupRenderingTest(hooks);
-
-  hooks.beforeEach(function () {
-    this.setProperties({
-      model: {},
-      closeModal: () => {},
-      afterSave: () => {},
-      afterDelete: () => {},
-      registerOnCloseHandler: () => {},
-      onCloseWithoutSaving: () => {},
-    });
-  });
-
-  test("alert exists for reminder in the future", async function (assert) {
-    let name = "test";
-    let futureDate = new Date();
-    futureDate.setDate(futureDate.getDate() + 10);
-
-    let reminderAt = futureDate.toISOString();
-    this.model = { id: 1, name, reminderAt };
-
-    await render(hbs`
-      <Bookmark
-        @model={{this.model}}
-        @afterSave={{this.afterSave}}
-        @afterDelete={{this.afterDelete}}
-        @onCloseWithoutSaving={{this.onCloseWithoutSaving}}
-        @registerOnCloseHandler={{this.registerOnCloseHandler}}
-        @closeModal={{this.closeModal}}
-      />
-    `);
-
-    assert.ok(
-      exists(".existing-reminder-at-alert"),
-      "alert found for future reminder"
-    );
-  });
-
-  test("alert does not exist for reminder in the past", async function (assert) {
-    let name = "test";
-    let pastDate = new Date();
-    pastDate.setDate(pastDate.getDate() - 1);
-
-    let reminderAt = pastDate.toISOString();
-    this.model = { id: 1, name, reminderAt };
-
-    await render(hbs`
-      <Bookmark
-        @model={{this.model}}
-        @afterSave={{this.afterSave}}
-        @afterDelete={{this.afterDelete}}
-        @onCloseWithoutSaving={{this.onCloseWithoutSaving}}
-        @registerOnCloseHandler={{this.registerOnCloseHandler}}
-        @closeModal={{this.closeModal}}
-      />
-    `);
-
-    assert.ok(
-      !exists(".existing-reminder-at-alert"),
-      "alert not found for past reminder"
-    );
-  });
-});
diff --git a/app/assets/javascripts/discourse/tests/integration/components/bookmark-test.js b/app/assets/javascripts/discourse/tests/integration/components/bookmark-test.js
deleted file mode 100644
index f5243652b93..00000000000
--- a/app/assets/javascripts/discourse/tests/integration/components/bookmark-test.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import { module, test } from "qunit";
-import { setupRenderingTest } from "discourse/tests/helpers/component-test";
-import { render } from "@ember/test-helpers";
-import { query } from "discourse/tests/helpers/qunit-helpers";
-import { hbs } from "ember-cli-htmlbars";
-
-module("Integration | Component | bookmark", function (hooks) {
-  setupRenderingTest(hooks);
-
-  hooks.beforeEach(function () {
-    this.setProperties({
-      model: {},
-      closeModal: () => {},
-      afterSave: () => {},
-      afterDelete: () => {},
-      registerOnCloseHandler: () => {},
-      onCloseWithoutSaving: () => {},
-    });
-  });
-
-  test("prefills the custom reminder type date and time", async function (assert) {
-    let name = "test";
-    let reminderAt = "2020-05-15T09:45:00";
-    this.model = { id: 1, name, reminderAt };
-
-    await render(hbs`
-      <Bookmark
-        @model={{this.model}}
-        @afterSave={{this.afterSave}}
-        @afterDelete={{this.afterDelete}}
-        @onCloseWithoutSaving={{this.onCloseWithoutSaving}}
-        @registerOnCloseHandler={{this.registerOnCloseHandler}}
-        @closeModal={{this.closeModal}}
-      />
-    `);
-
-    assert.strictEqual(query("#bookmark-name").value, "test");
-    assert.strictEqual(
-      query("#custom-date > .date-picker").value,
-      "2020-05-15"
-    );
-    assert.strictEqual(query("#custom-time").value, "09:45");
-  });
-});
diff --git a/app/assets/javascripts/discourse/tests/integration/components/category-badge-helper-test.js b/app/assets/javascripts/discourse/tests/integration/components/category-badge-helper-test.js
index 44269f5a556..7a8b8a8c62a 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/category-badge-helper-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/category-badge-helper-test.js
@@ -11,7 +11,7 @@ module("Integration | Component | category-badge helper", function (hooks) {
   test("displays category", async function (assert) {
     this.set("category", Category.findById(1));
 
-    await render(hbs`{{category-badge category}}`);
+    await render(hbs`{{category-badge this.category}}`);
 
     assert.strictEqual(
       query(".category-name").innerText.trim(),
@@ -22,7 +22,7 @@ module("Integration | Component | category-badge helper", function (hooks) {
   test("options.link", async function (assert) {
     this.set("category", Category.findById(1));
 
-    await render(hbs`{{category-badge category link=true}}`);
+    await render(hbs`{{category-badge this.category link=true}}`);
 
     assert.ok(
       exists(
diff --git a/app/assets/javascripts/discourse/tests/integration/components/char-counter-test.js b/app/assets/javascripts/discourse/tests/integration/components/char-counter-test.js
new file mode 100644
index 00000000000..86520006133
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/char-counter-test.js
@@ -0,0 +1,48 @@
+import { module, test } from "qunit";
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import { fillIn, render } from "@ember/test-helpers";
+import { hbs } from "ember-cli-htmlbars";
+
+module("Integration | Component | char-counter", function (hooks) {
+  setupRenderingTest(hooks);
+
+  test("shows the number of characters", async function (assert) {
+    this.value = "Hello World";
+    this.max = 12;
+
+    await render(
+      hbs`<CharCounter @value={{this.value}} @max={{this.max}}></CharCounter>`
+    );
+
+    assert.dom(this.element).includesText("11/12");
+  });
+
+  test("updating value updates counter", async function (assert) {
+    this.max = 50;
+
+    await render(
+      hbs`<CharCounter @value={{this.charCounterContent}} @max={{this.max}}><textarea {{on "input" (action (mut this.charCounterContent) value="target.value")}}></textarea></CharCounter>`
+    );
+
+    assert
+      .dom(this.element)
+      .includesText("/50", "initial value appears as expected");
+
+    await fillIn("textarea", "Hello World, this is a longer string");
+
+    assert
+      .dom(this.element)
+      .includesText("36/50", "updated value appears as expected");
+  });
+
+  test("exceeding max length", async function (assert) {
+    this.max = 10;
+    this.value = "Hello World";
+
+    await render(
+      hbs`<CharCounter @value={{this.value}} @max={{this.max}}></CharCounter>`
+    );
+
+    assert.dom(".char-counter.exceeded").exists("exceeded class is applied");
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/integration/components/composer-editor-test.js b/app/assets/javascripts/discourse/tests/integration/components/composer-editor-test.js
index 28405f9cd36..f652474fb8e 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/composer-editor-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/composer-editor-test.js
@@ -3,6 +3,7 @@ import { setupRenderingTest } from "discourse/tests/helpers/component-test";
 import { fillIn, render } from "@ember/test-helpers";
 import { hbs } from "ember-cli-htmlbars";
 import pretender, { response } from "discourse/tests/helpers/create-pretender";
+import { query } from "discourse/tests/helpers/qunit-helpers";
 
 module("Integration | Component | ComposerEditor", function (hooks) {
   setupRenderingTest(hooks);
@@ -43,4 +44,22 @@ module("Integration | Component | ComposerEditor", function (hooks) {
 
     await fillIn("textarea", "@user-no @user-ok @user-nope");
   });
+
+  test("preview sanitizes HTML", async function (assert) {
+    this.set("model", {});
+    this.set("noop", () => {});
+
+    await render(hbs`
+      <ComposerEditor
+        @composer={{this.model}}
+        @afterRefresh={{this.noop}}
+      />
+    `);
+
+    await fillIn(".d-editor-input", `"><svg onload="prompt(/xss/)"></svg>`);
+    assert.strictEqual(
+      query(".d-editor-preview").innerHTML.trim(),
+      '<p>"&gt;<svg></svg></p>'
+    );
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/integration/components/d-document-test.js b/app/assets/javascripts/discourse/tests/integration/components/d-document-test.js
index 885818fbdbc..0e626cb72e7 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/d-document-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/d-document-test.js
@@ -19,10 +19,9 @@ function triggerTitleUpdate(appEvents) {
 module("Integration | Component | d-document", function (hooks) {
   setupRenderingTest(hooks);
 
-  test("when experimental user menu is enabled", async function (assert) {
+  test("with user menu", async function (assert) {
     const titleBefore = document.title;
     try {
-      this.currentUser.redesigned_user_menu_enabled = true;
       this.currentUser.user_option.title_count_mode = "notifications";
       await render(hbs`<DDocument />`);
       assert.strictEqual(
@@ -46,32 +45,4 @@ module("Integration | Component | d-document", function (hooks) {
       document.title = titleBefore;
     }
   });
-
-  test("when experimental user menu is disabled", async function (assert) {
-    const titleBefore = document.title;
-    try {
-      this.currentUser.redesigned_user_menu_enabled = false;
-      this.currentUser.user_option.title_count_mode = "notifications";
-      await render(hbs`<DDocument />`);
-      assert.strictEqual(
-        getTitleCount(),
-        null,
-        "title doesn't have a count initially"
-      );
-
-      this.currentUser.unread_high_priority_notifications = 1;
-      this.currentUser.unread_notifications = 2;
-      this.currentUser.all_unread_notifications_count = 4;
-      this.currentUser.unseen_reviewable_count = 8;
-      triggerTitleUpdate(this.currentUser.appEvents);
-
-      assert.strictEqual(
-        getTitleCount(),
-        3,
-        "count in the title is the sum of unread_notifications and unread_high_priority_notifications"
-      );
-    } finally {
-      document.title = titleBefore;
-    }
-  });
 });
diff --git a/app/assets/javascripts/discourse/tests/integration/components/d-editor-test.js b/app/assets/javascripts/discourse/tests/integration/components/d-editor-test.js
index 3a6fbdbf8f7..8d46a09206b 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/d-editor-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/d-editor-test.js
@@ -2,7 +2,6 @@ import { module, test } from "qunit";
 import { setupRenderingTest } from "discourse/tests/helpers/component-test";
 import { click, fillIn, render, settled } from "@ember/test-helpers";
 import {
-  chromeTest,
   exists,
   paste,
   query,
@@ -45,16 +44,6 @@ module("Integration | Component | d-editor", function (hooks) {
     );
   });
 
-  test("preview sanitizes HTML", async function (assert) {
-    await render(hbs`<DEditor @value={{this.value}} />`);
-
-    await fillIn(".d-editor-input", `"><svg onload="prompt(/xss/)"></svg>`);
-    assert.strictEqual(
-      query(".d-editor-preview").innerHTML.trim(),
-      '<p>"&gt;</p>'
-    );
-  });
-
   test("updating the value refreshes the preview", async function (assert) {
     this.set("value", "evil trout");
 
@@ -81,7 +70,7 @@ module("Integration | Component | d-editor", function (hooks) {
   }
 
   function testCase(title, testFunc) {
-    chromeTest(title, async function (assert) {
+    test(title, async function (assert) {
       this.set("value", "hello world.");
 
       await render(hbs`<DEditor @value={{this.value}} />`);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/d-lightbox-test.js b/app/assets/javascripts/discourse/tests/integration/components/d-lightbox-test.js
new file mode 100644
index 00000000000..874c75731e4
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/d-lightbox-test.js
@@ -0,0 +1,85 @@
+import { click, render, settled } from "@ember/test-helpers";
+import { query } from "discourse/tests/helpers/qunit-helpers";
+import { module, test } from "qunit";
+
+import domFromString from "discourse-common/lib/dom-from-string";
+import { generateLightboxMarkup } from "discourse/tests/helpers/lightbox-helpers";
+import { hbs } from "ember-cli-htmlbars";
+import { setupLightboxes } from "discourse/lib/lightbox";
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import { SELECTORS } from "discourse/lib/lightbox/constants";
+
+module("Integration | Component | d-lightbox", function (hooks) {
+  setupRenderingTest(hooks);
+
+  test("it renders according to state", async function (assert) {
+    await render(hbs`<DLightbox />`);
+
+    // lightbox container exists but is not visible
+    assert.dom(SELECTORS.LIGHTBOX_CONTAINER).exists();
+    assert.dom(SELECTORS.LIGHTBOX_CONTAINER).doesNotHaveClass("is-visible");
+    assert.dom(SELECTORS.LIGHTBOX_CONTAINER).hasAttribute("tabindex", "-1");
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).doesNotExist();
+
+    // it is hidden from screen readers
+    assert.dom(SELECTORS.LIGHTBOX_CONTAINER).hasAttribute("aria-hidden");
+
+    const container = domFromString(generateLightboxMarkup())[0];
+    await setupLightboxes({
+      container,
+      selector: SELECTORS.DEFAULT_ITEM_SELECTOR,
+    });
+
+    const lightboxedElement = container.querySelector(
+      SELECTORS.DEFAULT_ITEM_SELECTOR
+    );
+    await click(lightboxedElement);
+
+    await settled();
+
+    assert.dom(SELECTORS.LIGHTBOX_CONTAINER).hasClass("is-visible");
+
+    assert
+      .dom(SELECTORS.LIGHTBOX_CONTAINER)
+      .hasClass(/^(is-vertical|is-horizontal)$/);
+
+    assert.dom(SELECTORS.LIGHTBOX_CONTAINER).doesNotHaveClass("is-zoomed");
+    assert.dom(SELECTORS.LIGHTBOX_CONTAINER).doesNotHaveClass("is-rotated");
+    assert.dom(SELECTORS.LIGHTBOX_CONTAINER).doesNotHaveClass("is-fullscreen");
+
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).exists();
+    assert.dom(SELECTORS.LIGHTBOX_CONTAINER).doesNotHaveAria("hidden");
+
+    // the content is tabbable
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).hasAttribute("tabindex", "0");
+
+    // the content has a document role
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).hasAttribute("role", "document");
+
+    // the content has an aria-labelledby attribute
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).hasAttribute("aria-labelledby");
+
+    assert.strictEqual(
+      query(SELECTORS.LIGHTBOX_CONTENT)
+        .getAttribute("style")
+        .match(/--d-lightbox/g).length > 0,
+      true,
+      "the content has the correct css variables added"
+    );
+
+    // it has focus traps for keyboard navigation
+    assert.dom(SELECTORS.FOCUS_TRAP).exists();
+
+    await click(SELECTORS.CLOSE_BUTTON);
+    await settled();
+
+    assert.dom(SELECTORS.LIGHTBOX_CONTAINER).doesNotHaveClass("is-visible");
+    assert.dom(SELECTORS.LIGHTBOX_CONTENT).doesNotExist();
+
+    // it is not tabbable
+    assert.dom(SELECTORS.LIGHTBOX_CONTAINER).hasAttribute("tabindex", "-1");
+
+    // it is hidden from screen readers
+    assert.dom(SELECTORS.LIGHTBOX_CONTAINER).hasAttribute("aria-hidden");
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/integration/components/d-modal-test.js b/app/assets/javascripts/discourse/tests/integration/components/d-modal-test.js
new file mode 100644
index 00000000000..3bb63656186
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/d-modal-test.js
@@ -0,0 +1,114 @@
+import { module, test } from "qunit";
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import { click, render, settled } from "@ember/test-helpers";
+import { hbs } from "ember-cli-htmlbars";
+
+module("Integration | Component | d-modal", function (hooks) {
+  setupRenderingTest(hooks);
+
+  test("title and subtitle", async function (assert) {
+    await render(
+      hbs`<DModal @inline={{true}} @title="Modal Title" @subtitle="Modal Subtitle" />`
+    );
+    assert.dom(".d-modal .title h3").hasText("Modal Title");
+    assert.dom(".d-modal .subtitle").hasText("Modal Subtitle");
+  });
+
+  test("named blocks", async function (assert) {
+    await render(
+      hbs`
+        <DModal @inline={{true}}>
+          <:aboveHeader>aboveHeaderContent</:aboveHeader>
+          <:headerAboveTitle>headerAboveTitleContent</:headerAboveTitle>
+          <:headerBelowTitle>headerBelowTitleContent</:headerBelowTitle>
+          <:belowHeader>belowHeaderContent</:belowHeader>
+          <:body>bodyContent</:body>
+          <:footer>footerContent</:footer>
+          <:belowFooter>belowFooterContent</:belowFooter>
+        </DModal>
+      `
+    );
+
+    assert.dom(".d-modal").includesText("aboveHeaderContent");
+    assert.dom(".d-modal").includesText("headerAboveTitleContent");
+    assert.dom(".d-modal").includesText("headerBelowTitleContent");
+    assert.dom(".d-modal").includesText("belowHeaderContent");
+    assert.dom(".d-modal").includesText("bodyContent");
+    assert.dom(".d-modal").includesText("footerContent");
+    assert.dom(".d-modal").includesText("belowFooterContent");
+  });
+
+  test("flash", async function (assert) {
+    await render(hbs`<DModal @inline={{true}} @flash="Some message"/>`);
+    assert.dom(".d-modal .alert").hasText("Some message");
+  });
+
+  test("flash type", async function (assert) {
+    await render(
+      hbs`<DModal @inline={{true}} @flash="Some message" @flashType="success"/>`
+    );
+    assert.dom(".d-modal .alert").hasClass("alert-success");
+  });
+
+  test("dismissable", async function (assert) {
+    let closeModalCalled = false;
+    this.closeModal = () => (closeModalCalled = true);
+    this.set("dismissable", false);
+
+    await render(
+      hbs`<DModal @inline={{true}} @closeModal={{this.closeModal}} @dismissable={{this.dismissable}}/>`
+    );
+
+    assert
+      .dom(".d-modal .modal-close")
+      .doesNotExist("close button is not shown when dismissable=false");
+
+    this.set("dismissable", true);
+    await settled();
+    assert
+      .dom(".d-modal .modal-close")
+      .exists("close button is visible when dismissable=true");
+
+    await click(".d-modal .modal-close");
+    assert.true(
+      closeModalCalled,
+      "closeModal is called when close button clicked"
+    );
+
+    closeModalCalled = false;
+  });
+
+  test("header and body classes", async function (assert) {
+    await render(
+      hbs`<DModal @inline={{true}} @bodyClass="my-body-class" @headerClass="my-header-class" @title="Hello world" />`
+    );
+
+    assert.dom(".d-modal .modal-header").hasClass("my-header-class");
+    assert.dom(".d-modal .modal-body").hasClass("my-body-class");
+  });
+
+  test("as a form", async function (assert) {
+    let submittedFormData;
+    this.handleSubmit = (event) => {
+      event.preventDefault();
+      submittedFormData = new FormData(event.currentTarget);
+    };
+
+    await render(
+      hbs`
+        <DModal @inline={{true}} @tagName="form" {{on "submit" this.handleSubmit}}>
+          <:body>
+            <input type="text" name="name" value="John Doe" />
+          </:body>
+          <:footer>
+            <button type="submit">Submit</button>
+          </:footer>
+        </DModal>
+        `
+    );
+
+    assert.dom("form.d-modal").exists();
+    await click(".d-modal button[type=submit]");
+    assert.deepEqual(submittedFormData.get("name"), "John Doe");
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/integration/components/d-toggle-switch-test.js b/app/assets/javascripts/discourse/tests/integration/components/d-toggle-switch-test.js
new file mode 100644
index 00000000000..cd7e82d7360
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/d-toggle-switch-test.js
@@ -0,0 +1,66 @@
+import { module, test } from "qunit";
+import { render } from "@ember/test-helpers";
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import { hbs } from "ember-cli-htmlbars";
+import { exists, query } from "discourse/tests/helpers/qunit-helpers";
+import I18n from "I18n";
+
+module("Integration | Component | d-toggle-switch", function (hooks) {
+  setupRenderingTest(hooks);
+
+  test("it renders a toggle button in a disabled state", async function (assert) {
+    this.set("state", false);
+
+    await render(hbs`<DToggleSwitch @state={{this.state}}/>`);
+
+    assert.ok(exists(".d-toggle-switch"), "it renders a toggle switch");
+    assert.strictEqual(
+      query(".d-toggle-switch__checkbox").getAttribute("aria-checked"),
+      "false"
+    );
+  });
+
+  test("it renders a toggle button in a enabled state", async function (assert) {
+    this.set("state", true);
+
+    await render(hbs`<DToggleSwitch @state={{this.state}}/>`);
+
+    assert.ok(exists(".d-toggle-switch"), "it renders a toggle switch");
+    assert.strictEqual(
+      query(".d-toggle-switch__checkbox").getAttribute("aria-checked"),
+      "true"
+    );
+  });
+
+  test("it renders a checkmark icon when enabled", async function (assert) {
+    this.set("state", true);
+
+    await render(hbs`<DToggleSwitch @state={{this.state}}/>`);
+    assert.ok(exists(".d-toggle-switch__checkbox-slider .d-icon-check"));
+  });
+
+  test("it renders a label for the button", async function (assert) {
+    I18n.translations[I18n.locale].js.test = { fooLabel: "foo" };
+    this.set("state", true);
+    await render(
+      hbs`<DToggleSwitch @state={{this.state}}/ @label={{this.label}} @translatedLabel={{this.translatedLabel}} />`
+    );
+
+    this.set("label", "test.fooLabel");
+
+    assert.strictEqual(
+      query(".d-toggle-switch__checkbox-label").innerText,
+      I18n.t("test.fooLabel")
+    );
+
+    this.setProperties({
+      label: null,
+      translatedLabel: "bar",
+    });
+
+    assert.strictEqual(
+      query(".d-toggle-switch__checkbox-label").innerText,
+      "bar"
+    );
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/integration/components/date-input-test.js b/app/assets/javascripts/discourse/tests/integration/components/date-input-test.js
index af0ce661bbc..e2b03834622 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/date-input-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/date-input-test.js
@@ -54,4 +54,20 @@ module("Integration | Component | date-input", function (hooks) {
 
     assert.ok(this.date.isSame(moment("2019-02-02")));
   });
+
+  test("always shows date in timezone of input timestamp", async function (assert) {
+    this.setProperties({
+      date: moment.tz("2023-05-05T10:00:00", "ETC/GMT-12"),
+    });
+
+    await render(
+      hbs`<DateInput @date={{this.date}} @onChange={{this.onChange}} />`
+    );
+    assert.strictEqual(dateInput().value, "2023-05-05");
+
+    this.setProperties({
+      date: moment.tz("2023-05-05T10:00:00", "ETC/GMT+12"),
+    });
+    assert.strictEqual(dateInput().value, "2023-05-05");
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/integration/components/date-time-input-range-test.js b/app/assets/javascripts/discourse/tests/integration/components/date-time-input-range-test.js
index d668975eedf..dda9417e41b 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/date-time-input-range-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/date-time-input-range-test.js
@@ -50,11 +50,25 @@ module("Integration | Component | date-time-input-range", function (hooks) {
     await fillIn(toDateInput(), "2019-01-30");
     await toTimeSelectKit.expand();
     rows = toTimeSelectKit.rows();
-
     assert.equal(rows[0].dataset.name, "00:00");
     assert.equal(rows[rows.length - 1].dataset.name, "23:45");
   });
 
+  test("setting relativeDate results in correct intervals (4x 15m then 30m)", async function (assert) {
+    this.setProperties({ state: { from: DEFAULT_DATE_TIME, to: null } });
+
+    await render(
+      hbs`<DateTimeInputRange @from={{this.state.from}} @to={{this.state.to}} @relativeDate={{this.state.from}} @onChange={{action (mut this.state)}} />`
+    );
+
+    await fillIn(toDateInput(), "2019-01-29");
+    const toTimeSelectKit = selectKit(".to .d-time-input .select-kit");
+    await toTimeSelectKit.expand();
+    let rows = toTimeSelectKit.rows();
+    assert.equal(rows[4].dataset.name, "15:45");
+    assert.equal(rows[5].dataset.name, "16:15");
+  });
+
   test("timezone support", async function (assert) {
     this.setProperties({
       state: {
diff --git a/app/assets/javascripts/discourse/tests/integration/components/date-time-input-test.js b/app/assets/javascripts/discourse/tests/integration/components/date-time-input-test.js
index 52cdbc6f242..d64680a1ab2 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/date-time-input-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/date-time-input-test.js
@@ -63,4 +63,23 @@ module("Integration | Component | date-time-input", function (hooks) {
 
     assert.notOk(exists(timeInput()));
   });
+
+  test("supports swapping timezone without changing visible date/time", async function (assert) {
+    this.setProperties({
+      date: moment.tz("2023-05-05T12:00:00", "Europe/London"),
+      timezone: "Europe/London",
+      onChange: setDate,
+    });
+
+    await render(
+      hbs`<DateTimeInput @date={{this.date}} @timezone={{this.timezone}} @onChange={{this.onChange}} />`
+    );
+    dateInput().dispatchEvent(new Event("change"));
+    assert.strictEqual(this.date.format(), "2023-05-05T12:00:00+01:00");
+
+    this.setProperties({ timezone: "Australia/Sydney" });
+
+    dateInput().dispatchEvent(new Event("change"));
+    assert.strictEqual(this.date.format(), "2023-05-05T12:00:00+10:00");
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/integration/components/dialog-holder-test.js b/app/assets/javascripts/discourse/tests/integration/components/dialog-holder-test.js
index a1ed2606e0c..681fa5dbbce 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/dialog-holder-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/dialog-holder-test.js
@@ -10,6 +10,8 @@ import {
 } from "@ember/test-helpers";
 import { hbs } from "ember-cli-htmlbars";
 import { query } from "discourse/tests/helpers/qunit-helpers";
+import GroupDeleteDialogMessage from "discourse/components/dialog-messages/group-delete";
+import SecondFactorConfirmPhrase from "discourse/components/dialog-messages/second-factor-confirm-phrase";
 
 module("Integration | Component | dialog-holder", function (hooks) {
   setupRenderingTest(hooks);
@@ -89,7 +91,7 @@ module("Integration | Component | dialog-holder", function (hooks) {
     );
 
     // dismiss by pressing Esc
-    await triggerKeyEvent(document, "keydown", "Escape");
+    await triggerKeyEvent(document.activeElement, "keydown", "Escape");
 
     assert.ok(cancelCallbackCalled, "cancel callback called");
     assert.ok(query("#dialog-holder"), "element is still in DOM");
@@ -394,17 +396,41 @@ module("Integration | Component | dialog-holder", function (hooks) {
       ".btn-primary element is not present in the dialog"
     );
   });
-  test("delete confirm with confirmation phase", async function (assert) {
+
+  test("delete confirm with confirmation phrase component", async function (assert) {
     await render(hbs`<DialogHolder />`);
 
     this.dialog.deleteConfirm({
-      message: "A delete confirm message",
-      confirmPhrase: "test",
+      bodyComponent: SecondFactorConfirmPhrase,
+      confirmButtonDisabled: true,
     });
     await settled();
 
     assert.strictEqual(query(".btn-danger").disabled, true);
-    await fillIn("#confirm-phrase", "test");
+    await fillIn("#confirm-phrase", "Disa");
+    assert.strictEqual(query(".btn-danger").disabled, true);
+    await fillIn("#confirm-phrase", "Disable");
     assert.strictEqual(query(".btn-danger").disabled, false);
   });
+
+  test("delete confirm with a component and model", async function (assert) {
+    await render(hbs`<DialogHolder />`);
+    const message_count = 5;
+
+    this.dialog.deleteConfirm({
+      bodyComponent: GroupDeleteDialogMessage,
+      bodyComponentModel: {
+        message_count,
+      },
+    });
+    await settled();
+
+    assert.strictEqual(
+      query(".dialog-body p:first-child").innerText.trim(),
+      I18n.t("admin.groups.delete_with_messages_confirm", {
+        count: message_count,
+      }),
+      "correct message is shown in dialog"
+    );
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/integration/components/form-template-field/checkbox-test.js b/app/assets/javascripts/discourse/tests/integration/components/form-template-field/checkbox-test.js
new file mode 100644
index 00000000000..18945954ca8
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/form-template-field/checkbox-test.js
@@ -0,0 +1,43 @@
+import { module, test } from "qunit";
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import { render } from "@ember/test-helpers";
+import { hbs } from "ember-cli-htmlbars";
+import { exists } from "discourse/tests/helpers/qunit-helpers";
+
+module(
+  "Integration | Component | form-template-field | checkbox",
+  function (hooks) {
+    setupRenderingTest(hooks);
+
+    test("renders a checkbox input", async function (assert) {
+      await render(hbs`<FormTemplateField::Checkbox />`);
+
+      assert.ok(
+        exists(
+          ".form-template-field[data-field-type='checkbox'] input[type='checkbox']"
+        ),
+        "A checkbox component exists"
+      );
+    });
+
+    test("renders a checkbox with a label", async function (assert) {
+      const attributes = {
+        label: "Click this box",
+      };
+      this.set("attributes", attributes);
+
+      await render(
+        hbs`<FormTemplateField::Checkbox @attributes={{this.attributes}} />`
+      );
+
+      assert.ok(
+        exists(
+          ".form-template-field[data-field-type='checkbox'] input[type='checkbox']"
+        ),
+        "A checkbox component exists"
+      );
+
+      assert.dom(".form-template-field__label").hasText("Click this box");
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/form-template-field/dropdown-test.js b/app/assets/javascripts/discourse/tests/integration/components/form-template-field/dropdown-test.js
new file mode 100644
index 00000000000..f48cb8cfb6c
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/form-template-field/dropdown-test.js
@@ -0,0 +1,86 @@
+import { module, test } from "qunit";
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import { render } from "@ember/test-helpers";
+import { hbs } from "ember-cli-htmlbars";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { exists, query, queryAll } from "discourse/tests/helpers/qunit-helpers";
+
+module(
+  "Integration | Component | form-template-field | dropdown",
+  function (hooks) {
+    setupRenderingTest(hooks);
+
+    hooks.beforeEach(function () {
+      this.set("subject", selectKit());
+    });
+
+    test("renders a dropdown with choices", async function (assert) {
+      const choices = ["Choice 1", "Choice 2", "Choice 3"];
+      this.set("choices", choices);
+
+      await render(
+        hbs`<FormTemplateField::Dropdown @choices={{this.choices}}/>`
+      );
+      assert.ok(
+        exists(".form-template-field__dropdown"),
+        "A dropdown component exists"
+      );
+
+      const dropdown = queryAll(
+        ".form-template-field__dropdown option:not(.form-template-field__dropdown-placeholder)"
+      );
+      assert.strictEqual(dropdown.length, 3, "it has 3 choices");
+      assert.strictEqual(
+        dropdown[0].value,
+        "Choice 1",
+        "it has the correct name for choice 1"
+      );
+      assert.strictEqual(
+        dropdown[1].value,
+        "Choice 2",
+        "it has the correct name for choice 2"
+      );
+      assert.strictEqual(
+        dropdown[2].value,
+        "Choice 3",
+        "it has the correct name for choice 3"
+      );
+    });
+
+    test("renders a dropdown with choices and attributes", async function (assert) {
+      const choices = ["Choice 1", "Choice 2", "Choice 3"];
+      const attributes = {
+        none_label: "Select a choice",
+        filterable: true,
+      };
+
+      this.set("choices", choices);
+      this.set("attributes", attributes);
+
+      await render(
+        hbs`<FormTemplateField::Dropdown @choices={{this.choices}} @attributes={{this.attributes}} />`
+      );
+      assert.ok(
+        exists(".form-template-field__dropdown"),
+        "A dropdown component exists"
+      );
+
+      assert.strictEqual(
+        query(".form-template-field__dropdown-placeholder").innerText,
+        attributes.none_label,
+        "None label is correct"
+      );
+    });
+
+    test("doesn't render a label when attribute is missing", async function (assert) {
+      const choices = ["Choice 1", "Choice 2", "Choice 3"];
+      this.set("choices", choices);
+
+      await render(
+        hbs`<FormTemplateField::Dropdown @choices={{this.choices}} />`
+      );
+
+      assert.dom(".form-template-field__label").doesNotExist();
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/form-template-field/input-test.js b/app/assets/javascripts/discourse/tests/integration/components/form-template-field/input-test.js
new file mode 100644
index 00000000000..6c835794e9b
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/form-template-field/input-test.js
@@ -0,0 +1,61 @@
+import { module, test } from "qunit";
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import { render } from "@ember/test-helpers";
+import { hbs } from "ember-cli-htmlbars";
+import { exists, query } from "discourse/tests/helpers/qunit-helpers";
+
+module(
+  "Integration | Component | form-template-field | input",
+  function (hooks) {
+    setupRenderingTest(hooks);
+
+    test("renders a text input", async function (assert) {
+      await render(hbs`<FormTemplateField::Input />`);
+
+      assert.ok(
+        exists(
+          ".form-template-field[data-field-type='input'] input[type='text']"
+        ),
+        "A text input component exists"
+      );
+    });
+
+    test("renders a text input with attributes", async function (assert) {
+      const attributes = {
+        label: "My text label",
+        placeholder: "Enter text here",
+      };
+      this.set("attributes", attributes);
+
+      await render(
+        hbs`<FormTemplateField::Input @attributes={{this.attributes}} />`
+      );
+
+      assert.ok(
+        exists(
+          ".form-template-field[data-field-type='input'] input[type='text']"
+        ),
+        "A text input component exists"
+      );
+
+      assert.dom(".form-template-field__label").hasText("My text label");
+      assert.strictEqual(
+        query(".form-template-field__input").placeholder,
+        "Enter text here"
+      );
+    });
+
+    test("doesn't render a label when attribute is missing", async function (assert) {
+      const attributes = {
+        placeholder: "Enter text here",
+      };
+      this.set("attributes", attributes);
+
+      await render(
+        hbs`<FormTemplateField::Input @attributes={{this.attributes}} />`
+      );
+
+      assert.dom(".form-template-field__label").doesNotExist();
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/form-template-field/multi-select-test.js b/app/assets/javascripts/discourse/tests/integration/components/form-template-field/multi-select-test.js
new file mode 100644
index 00000000000..e8dd72cea1c
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/form-template-field/multi-select-test.js
@@ -0,0 +1,87 @@
+import { module, test } from "qunit";
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import { render } from "@ember/test-helpers";
+import { hbs } from "ember-cli-htmlbars";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { exists, query, queryAll } from "discourse/tests/helpers/qunit-helpers";
+
+module(
+  "Integration | Component | form-template-field | multi-select",
+  function (hooks) {
+    setupRenderingTest(hooks);
+
+    hooks.beforeEach(function () {
+      this.set("subject", selectKit());
+    });
+
+    test("renders a multi-select dropdown with choices", async function (assert) {
+      const choices = ["Choice 1", "Choice 2", "Choice 3"];
+
+      this.set("choices", choices);
+
+      await render(
+        hbs`<FormTemplateField::MultiSelect @choices={{this.choices}}/>`
+      );
+      assert.ok(
+        exists(".form-template-field__multi-select"),
+        "A multiselect component exists"
+      );
+
+      const dropdown = queryAll(
+        ".form-template-field__multi-select option:not(.form-template-field__multi-select-placeholder)"
+      );
+      assert.strictEqual(dropdown.length, 3, "it has 3 choices");
+      assert.strictEqual(
+        dropdown[0].value,
+        "Choice 1",
+        "it has the correct name for choice 1"
+      );
+      assert.strictEqual(
+        dropdown[1].value,
+        "Choice 2",
+        "it has the correct name for choice 2"
+      );
+      assert.strictEqual(
+        dropdown[2].value,
+        "Choice 3",
+        "it has the correct name for choice 3"
+      );
+    });
+
+    test("renders a multi-select with choices and attributes", async function (assert) {
+      const choices = ["Choice 1", "Choice 2", "Choice 3"];
+      const attributes = {
+        none_label: "Select a choice",
+        filterable: true,
+      };
+
+      this.set("choices", choices);
+      this.set("attributes", attributes);
+
+      await render(
+        hbs`<FormTemplateField::MultiSelect @choices={{this.choices}} @attributes={{this.attributes}} />`
+      );
+      assert.ok(
+        exists(".form-template-field__multi-select"),
+        "A multiselect dropdown component exists"
+      );
+
+      assert.strictEqual(
+        query(".form-template-field__multi-select-placeholder").innerText,
+        attributes.none_label,
+        "None label is correct"
+      );
+    });
+
+    test("doesn't render a label when attribute is missing", async function (assert) {
+      const choices = ["Choice 1", "Choice 2", "Choice 3"];
+      this.set("choices", choices);
+
+      await render(
+        hbs`<FormTemplateField::MultiSelect @choices={{this.choices}} />`
+      );
+
+      assert.dom(".form-template-field__label").doesNotExist();
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/form-template-field/textarea-test.js b/app/assets/javascripts/discourse/tests/integration/components/form-template-field/textarea-test.js
new file mode 100644
index 00000000000..b79e4730f2d
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/form-template-field/textarea-test.js
@@ -0,0 +1,57 @@
+import { module, test } from "qunit";
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import { render } from "@ember/test-helpers";
+import { hbs } from "ember-cli-htmlbars";
+import { exists, query } from "discourse/tests/helpers/qunit-helpers";
+
+module(
+  "Integration | Component | form-template-field | textarea",
+  function (hooks) {
+    setupRenderingTest(hooks);
+
+    test("renders a textarea input", async function (assert) {
+      await render(hbs`<FormTemplateField::Textarea />`);
+
+      assert.ok(
+        exists(".form-template-field__textarea"),
+        "A textarea input component exists"
+      );
+    });
+
+    test("renders a text input with attributes", async function (assert) {
+      const attributes = {
+        label: "My text label",
+        placeholder: "Enter text here",
+      };
+      this.set("attributes", attributes);
+
+      await render(
+        hbs`<FormTemplateField::Textarea @attributes={{this.attributes}} />`
+      );
+
+      assert.ok(
+        exists(".form-template-field__textarea"),
+        "A textarea input component exists"
+      );
+
+      assert.dom(".form-template-field__label").hasText("My text label");
+      assert.strictEqual(
+        query(".form-template-field__textarea").placeholder,
+        "Enter text here"
+      );
+    });
+
+    test("doesn't render a label when attribute is missing", async function (assert) {
+      const attributes = {
+        placeholder: "Enter text here",
+      };
+      this.set("attributes", attributes);
+
+      await render(
+        hbs`<FormTemplateField::Textarea @attributes={{this.attributes}} />`
+      );
+
+      assert.dom(".form-template-field__label").doesNotExist();
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/form-template-field/wrapper-test.js b/app/assets/javascripts/discourse/tests/integration/components/form-template-field/wrapper-test.js
new file mode 100644
index 00000000000..908ee7ca53e
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/form-template-field/wrapper-test.js
@@ -0,0 +1,73 @@
+import { module, test } from "qunit";
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import { render } from "@ember/test-helpers";
+import { hbs } from "ember-cli-htmlbars";
+import { exists } from "discourse/tests/helpers/qunit-helpers";
+import pretender, { response } from "discourse/tests/helpers/create-pretender";
+
+module(
+  "Integration | Component | form-template-field | wrapper",
+  function (hooks) {
+    setupRenderingTest(hooks);
+
+    test("does not render a component when template content has invalid YAML", async function (assert) {
+      this.set("content", `- type: checkbox\n  attributes;invalid`);
+      await render(
+        hbs`<FormTemplateField::Wrapper @content={{this.content}} />`
+      );
+
+      assert.notOk(
+        exists(".form-template-field"),
+        "A form template field should not exist"
+      );
+      assert.ok(exists(".alert"), "An alert message should exist");
+    });
+
+    test("renders a component based on the component type found in the content YAML", async function (assert) {
+      const content = `- type: checkbox\n- type: input\n- type: textarea\n- type: dropdown\n- type: upload\n- type: multi-select`;
+      const componentTypes = [
+        "checkbox",
+        "input",
+        "textarea",
+        "dropdown",
+        "upload",
+        "multi-select",
+      ];
+      this.set("content", content);
+
+      await render(
+        hbs`<FormTemplateField::Wrapper @content={{this.content}} />`
+      );
+
+      componentTypes.forEach((componentType) => {
+        assert.ok(
+          exists(`.form-template-field[data-field-type='${componentType}']`),
+          `${componentType} component exists`
+        );
+      });
+    });
+
+    test("renders a component based on the component type found in the content YAML when passed ids", async function (assert) {
+      pretender.get("/form-templates/1.json", () => {
+        return response({
+          form_template: {
+            id: 1,
+            name: "Bug Reports",
+            template:
+              '- type: checkbox\n  choices:\n    - "Option 1"\n    - "Option 2"\n    - "Option 3"\n  attributes:\n    label: "Enter question here"\n    description: "Enter description here"\n    validations:\n      required: true',
+          },
+        });
+      });
+
+      this.set("formTemplateId", [1]);
+      await render(
+        hbs`<FormTemplateField::Wrapper @id={{this.formTemplateId}} />`
+      );
+
+      assert.ok(
+        exists(`.form-template-field[data-field-type='checkbox']`),
+        `Checkbox component renders`
+      );
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/html-safe-helper-test.js b/app/assets/javascripts/discourse/tests/integration/components/html-safe-helper-test.js
index 35a5df3ea30..32d70d8d08b 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/html-safe-helper-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/html-safe-helper-test.js
@@ -10,7 +10,7 @@ module("Integration | Component | html-safe-helper", function (hooks) {
   test("default", async function (assert) {
     this.set("string", "<p class='cookies'>biscuits</p>");
 
-    await render(hbs`{{html-safe string}}`);
+    await render(hbs`{{html-safe this.string}}`);
 
     assert.ok(exists("p.cookies"), "it displays the string as html");
   });
diff --git a/app/assets/javascripts/discourse/tests/integration/components/input-size-test.js b/app/assets/javascripts/discourse/tests/integration/components/input-size-test.js
index a1d8049056b..bf24a842ddb 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/input-size-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/input-size-test.js
@@ -1,7 +1,7 @@
-import { module } from "qunit";
+import { module, test } from "qunit";
 import { setupRenderingTest } from "discourse/tests/helpers/component-test";
 import { render } from "@ember/test-helpers";
-import { chromeTest, query } from "discourse/tests/helpers/qunit-helpers";
+import { query } from "discourse/tests/helpers/qunit-helpers";
 import { hbs } from "ember-cli-htmlbars";
 
 module(
@@ -9,28 +9,24 @@ module(
   function (hooks) {
     setupRenderingTest(hooks);
 
-    // these tests fail on Firefox 78 in CI, skipping for now
-    chromeTest(
-      "icon only button, icon and text button, text only button",
-      async function (assert) {
-        await render(
-          hbs`<DButton @icon="plus" /> <DButton @icon="plus" @label="topic.create" /> <DButton @label="topic.create" />`
-        );
+    test("icon only button, icon and text button, text only button", async function (assert) {
+      await render(
+        hbs`<DButton @icon="plus" /> <DButton @icon="plus" @label="topic.create" /> <DButton @label="topic.create" />`
+      );
 
-        assert.strictEqual(
-          query(".btn:nth-child(1)").offsetHeight,
-          query(".btn:nth-child(2)").offsetHeight,
-          "have equal height"
-        );
-        assert.strictEqual(
-          query(".btn:nth-child(1)").offsetHeight,
-          query(".btn:nth-child(3)").offsetHeight,
-          "have equal height"
-        );
-      }
-    );
+      assert.strictEqual(
+        query(".btn:nth-child(1)").offsetHeight,
+        query(".btn:nth-child(2)").offsetHeight,
+        "have equal height"
+      );
+      assert.strictEqual(
+        query(".btn:nth-child(1)").offsetHeight,
+        query(".btn:nth-child(3)").offsetHeight,
+        "have equal height"
+      );
+    });
 
-    chromeTest("button + text input", async function (assert) {
+    test("button + text input", async function (assert) {
       await render(
         hbs`<TextField /> <DButton @icon="plus" @label="topic.create" />`
       );
@@ -42,7 +38,7 @@ module(
       );
     });
 
-    chromeTest("combo box + input", async function (assert) {
+    test("combo box + input", async function (assert) {
       await render(
         hbs`<ComboBox @options={{hash none="category.none"}} /> <TextField />`
       );
diff --git a/app/assets/javascripts/discourse/tests/integration/components/plugin-outlet-test.js b/app/assets/javascripts/discourse/tests/integration/components/plugin-outlet-test.js
new file mode 100644
index 00000000000..4d44b2c426d
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/plugin-outlet-test.js
@@ -0,0 +1,292 @@
+import { module, test } from "qunit";
+import { count, exists, query } from "discourse/tests/helpers/qunit-helpers";
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import { click, render, settled } from "@ember/test-helpers";
+import { action } from "@ember/object";
+import { extraConnectorClass } from "discourse/lib/plugin-connectors";
+import { hbs } from "ember-cli-htmlbars";
+import { registerTemporaryModule } from "discourse/tests/helpers/temporary-module-helper";
+import { getOwner } from "discourse-common/lib/get-owner";
+import Component from "@glimmer/component";
+import templateOnly from "@ember/component/template-only";
+import { withSilencedDeprecationsAsync } from "discourse-common/lib/deprecated";
+
+const PREFIX = "discourse/plugins/some-plugin/templates/connectors";
+
+module("Integration | Component | plugin-outlet", function (hooks) {
+  setupRenderingTest(hooks);
+
+  hooks.beforeEach(function () {
+    extraConnectorClass("test-name/hello", {
+      actions: {
+        sayHello() {
+          this.set("hello", `${this.hello || ""}hello!`);
+        },
+      },
+    });
+
+    extraConnectorClass("test-name/hi", {
+      setupComponent() {
+        this.appEvents.on("hi:sayHi", this, this.say);
+      },
+
+      teardownComponent() {
+        this.appEvents.off("hi:sayHi", this, this.say);
+      },
+
+      @action
+      say() {
+        this.set("hi", "hi!");
+      },
+
+      @action
+      sayHi() {
+        this.appEvents.trigger("hi:sayHi");
+      },
+    });
+
+    extraConnectorClass("test-name/conditional-render", {
+      shouldRender(args, context) {
+        return args.shouldDisplay || context.siteSettings.always_display;
+      },
+    });
+
+    registerTemporaryModule(
+      `${PREFIX}/test-name/hello`,
+      hbs`<span class='hello-username'>{{this.username}}</span>
+        <button class='say-hello' {{on "click" (action "sayHello")}}></button>
+        <button class='say-hello-using-this' {{on "click" this.sayHello}}></button>
+        <span class='hello-result'>{{this.hello}}</span>`
+    );
+    registerTemporaryModule(
+      `${PREFIX}/test-name/hi`,
+      hbs`<button class='say-hi' {{on "click" (action "sayHi")}}></button>
+        <span class='hi-result'>{{this.hi}}</span>`
+    );
+    registerTemporaryModule(
+      `${PREFIX}/test-name/conditional-render`,
+      hbs`<span class="conditional-render">I only render sometimes</span>`
+    );
+  });
+
+  test("Renders a template into the outlet", async function (assert) {
+    this.set("shouldDisplay", false);
+    await render(
+      hbs`<PluginOutlet @name="test-name" @outletArgs={{hash shouldDisplay=this.shouldDisplay}} />`
+    );
+    assert.strictEqual(count(".hello-username"), 1, "renders the hello outlet");
+    assert.false(
+      exists(".conditional-render"),
+      "doesn't render conditional outlet"
+    );
+
+    await click(".say-hello");
+    assert.strictEqual(
+      query(".hello-result").innerText,
+      "hello!",
+      "actions delegate properly"
+    );
+    await click(".say-hello-using-this");
+    assert.strictEqual(
+      query(".hello-result").innerText,
+      "hello!hello!",
+      "actions are made available on `this` and are bound correctly"
+    );
+
+    await click(".say-hi");
+    assert.strictEqual(
+      query(".hi-result").innerText,
+      "hi!",
+      "actions delegate properly"
+    );
+  });
+
+  test("Reevaluates shouldRender for argument changes", async function (assert) {
+    this.set("shouldDisplay", false);
+    await render(
+      hbs`<PluginOutlet @name="test-name" @outletArgs={{hash shouldDisplay=this.shouldDisplay}} />`
+    );
+    assert.false(
+      exists(".conditional-render"),
+      "doesn't render conditional outlet"
+    );
+
+    this.set("shouldDisplay", true);
+    await settled();
+    assert.true(exists(".conditional-render"), "renders conditional outlet");
+  });
+
+  test("Reevaluates shouldRender for other autotracked changes", async function (assert) {
+    this.set("shouldDisplay", false);
+    await render(
+      hbs`<PluginOutlet @name="test-name" @outletArgs={{hash shouldDisplay=this.shouldDisplay}} />`
+    );
+    assert.false(
+      exists(".conditional-render"),
+      "doesn't render conditional outlet"
+    );
+
+    getOwner(this).lookup("service:site-settings").always_display = true;
+    await settled();
+    assert.true(exists(".conditional-render"), "renders conditional outlet");
+  });
+
+  test("Other outlets are not re-rendered", async function (assert) {
+    this.set("shouldDisplay", false);
+    await render(
+      hbs`<PluginOutlet @name="test-name" @outletArgs={{hash shouldDisplay=this.shouldDisplay}} />`
+    );
+
+    const otherOutletElement = query(".hello-username");
+    otherOutletElement.someUniqueProperty = true;
+
+    this.set("shouldDisplay", true);
+    await settled();
+    assert.true(exists(".conditional-render"), "renders conditional outlet");
+
+    assert.true(
+      query(".hello-username").someUniqueProperty,
+      "other outlet is left untouched"
+    );
+  });
+});
+
+module(
+  "Integration | Component | plugin-outlet | connector class definitions",
+  function (hooks) {
+    setupRenderingTest(hooks);
+
+    hooks.beforeEach(function () {
+      registerTemporaryModule(
+        `${PREFIX}/test-name/my-connector`,
+        hbs`<span class='outletArgHelloValue'>{{@outletArgs.hello}}</span><span class='thisHelloValue'>{{this.hello}}</span>`
+      );
+    });
+
+    test("uses classic PluginConnector by default", async function (assert) {
+      await render(
+        hbs`<PluginOutlet @name="test-name" @outletArgs={{hash hello="world"}} />`
+      );
+
+      assert.dom(".outletArgHelloValue").hasText("world");
+      assert.dom(".thisHelloValue").hasText("world");
+    });
+
+    test("uses templateOnly by default when @defaultGlimmer=true", async function (assert) {
+      await render(
+        hbs`<PluginOutlet @name="test-name" @outletArgs={{hash hello="world"}} @defaultGlimmer={{true}} />`
+      );
+
+      assert.dom(".outletArgHelloValue").hasText("world");
+      assert.dom(".thisHelloValue").hasText(""); // `this.` unavailable in templateOnly components
+    });
+
+    test("uses simple object if provided", async function (assert) {
+      this.set("someBoolean", true);
+
+      extraConnectorClass("test-name/my-connector", {
+        shouldRender(args) {
+          return args.someBoolean;
+        },
+
+        setupComponent(args, component) {
+          component.reopen({
+            get hello() {
+              return args.hello + " from setupComponent";
+            },
+          });
+        },
+      });
+
+      await render(
+        hbs`<PluginOutlet @name="test-name" @outletArgs={{hash hello="world" someBoolean=this.someBoolean}} />`
+      );
+
+      assert.dom(".outletArgHelloValue").hasText("world");
+      assert.dom(".thisHelloValue").hasText("world from setupComponent");
+
+      this.set("someBoolean", false);
+      await settled();
+
+      assert.dom(".outletArgHelloValue").doesNotExist();
+    });
+
+    test("ignores classic hooks for glimmer components", async function (assert) {
+      extraConnectorClass("test-name/my-connector", {
+        setupComponent(args, component) {
+          component.reopen({
+            get hello() {
+              return args.hello + " from setupComponent";
+            },
+          });
+        },
+      });
+
+      await withSilencedDeprecationsAsync(
+        "discourse.plugin-outlet-classic-hooks",
+        async () => {
+          await render(
+            hbs`<PluginOutlet @name="test-name" @outletArgs={{hash hello="world"}} @defaultGlimmer={{true}} />`
+          );
+        }
+      );
+
+      assert.dom(".outletArgHelloValue").hasText("world");
+      assert.dom(".thisHelloValue").hasText("");
+    });
+
+    test("uses custom component class if provided", async function (assert) {
+      this.set("someBoolean", true);
+
+      extraConnectorClass(
+        "test-name/my-connector",
+        class MyOutlet extends Component {
+          static shouldRender(args) {
+            return args.someBoolean;
+          }
+
+          get hello() {
+            return this.args.outletArgs.hello + " from custom component";
+          }
+        }
+      );
+
+      await render(
+        hbs`<PluginOutlet @name="test-name" @outletArgs={{hash hello="world" someBoolean=this.someBoolean}} />`
+      );
+
+      assert.dom(".outletArgHelloValue").hasText("world");
+      assert.dom(".thisHelloValue").hasText("world from custom component");
+
+      this.set("someBoolean", false);
+      await settled();
+
+      assert.dom(".outletArgHelloValue").doesNotExist();
+    });
+
+    test("uses custom templateOnly() if provided", async function (assert) {
+      this.set("someBoolean", true);
+
+      extraConnectorClass(
+        "test-name/my-connector",
+        Object.assign(templateOnly(), {
+          shouldRender(args) {
+            return args.someBoolean;
+          },
+        })
+      );
+
+      await render(
+        hbs`<PluginOutlet @name="test-name" @outletArgs={{hash hello="world" someBoolean=this.someBoolean}} />`
+      );
+
+      assert.dom(".outletArgHelloValue").hasText("world");
+      assert.dom(".thisHelloValue").hasText(""); // `this.` unavailable in templateOnly components
+
+      this.set("someBoolean", false);
+      await settled();
+
+      assert.dom(".outletArgHelloValue").doesNotExist();
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/relative-time-picker-test.js b/app/assets/javascripts/discourse/tests/integration/components/relative-time-picker-test.js
index 5cc16d0ec17..f34169e9d84 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/relative-time-picker-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/relative-time-picker-test.js
@@ -20,6 +20,14 @@ module("Integration | Component | relative-time-picker", function (hooks) {
     assert.strictEqual(prefilledDuration, "5");
   });
 
+  test("prefills and preselects null minutes", async function (assert) {
+    await render(hbs`<RelativeTimePicker @durationMinutes={{null}} />`);
+
+    const prefilledDuration = query(".relative-time-duration").value;
+    assert.strictEqual(this.subject.header().value(), "mins");
+    assert.strictEqual(prefilledDuration, "");
+  });
+
   test("prefills and preselects hours based on translated minutes", async function (assert) {
     await render(hbs`<RelativeTimePicker @durationMinutes="90" />`);
 
@@ -60,6 +68,14 @@ module("Integration | Component | relative-time-picker", function (hooks) {
     assert.strictEqual(prefilledDuration, "5");
   });
 
+  test("prefills and preselects null hours", async function (assert) {
+    await render(hbs`<RelativeTimePicker @durationHours={{null}} />`);
+
+    const prefilledDuration = query(".relative-time-duration").value;
+    assert.strictEqual(this.subject.header().value(), "hours");
+    assert.strictEqual(prefilledDuration, "");
+  });
+
   test("prefills and preselects minutes based on translated hours", async function (assert) {
     await render(hbs`<RelativeTimePicker @durationHours="0.5" />`);
 
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/combo-box-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/combo-box-test.js
index 106985059b7..8899ed8e7d4 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/combo-box-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/combo-box-test.js
@@ -75,8 +75,8 @@ module("Integration | Component | select-kit/combo-box", function (hooks) {
         @value={{this.value}}
         @content={{this.content}}
         @options={{hash
-          caretUpIcon=caretUpIcon
-          caretDownIcon=caretDownIcon
+          caretUpIcon=this.caretUpIcon
+          caretDownIcon=this.caretDownIcon
         }}
       />
     `);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/email-group-user-chooser-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/email-group-user-chooser-test.js
index 386d5f1efcd..8425ea5d67e 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/email-group-user-chooser-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/email-group-user-chooser-test.js
@@ -21,7 +21,73 @@ module(
       await this.subject.expand();
       await paste(query(".filter-input"), "foo,bar");
 
-      assert.equal(this.subject.header().value(), "foo,bar");
+      assert.strictEqual(this.subject.header().value(), "foo,bar");
+
+      await paste(query(".filter-input"), "evil,trout");
+      assert.strictEqual(this.subject.header().value(), "foo,bar,evil,trout");
+
+      await paste(query(".filter-input"), "names with spaces");
+      assert.strictEqual(
+        this.subject.header().value(),
+        "foo,bar,evil,trout,names,with,spaces"
+      );
+
+      await paste(query(".filter-input"), "@osama,@sam");
+      assert.strictEqual(
+        this.subject.header().value(),
+        "foo,bar,evil,trout,names,with,spaces,osama,sam"
+      );
+
+      await paste(query(".filter-input"), "new\nlines");
+      assert.strictEqual(
+        this.subject.header().value(),
+        "foo,bar,evil,trout,names,with,spaces,osama,sam,new,lines"
+      );
+    });
+
+    test("excluding usernames", async function (assert) {
+      pretender.get("/u/search/users", () => {
+        const users = [
+          {
+            username: "osama",
+            avatar_template:
+              "https://avatars.discourse.org/v3/letter/t/41988e/{size}.png",
+          },
+          {
+            username: "joshua",
+            avatar_template:
+              "https://avatars.discourse.org/v3/letter/t/41988e/{size}.png",
+          },
+          {
+            username: "sam",
+            avatar_template:
+              "https://avatars.discourse.org/v3/letter/t/41988e/{size}.png",
+          },
+        ];
+        return response({ users });
+      });
+
+      this.set("excludedUsernames", ["osama", "joshua"]);
+      await render(
+        hbs`<EmailGroupUserChooser @options={{hash excludedUsernames=this.excludedUsernames}} />`
+      );
+
+      await this.subject.expand();
+      await this.subject.fillInFilter("a");
+
+      let suggestions = this.subject.displayedContent().mapBy("id");
+      assert.deepEqual(suggestions, ["sam"]);
+
+      this.set("excludedUsernames", ["osama"]);
+      await render(
+        hbs`<EmailGroupUserChooser @options={{hash excludedUsernames=this.excludedUsernames}} />`
+      );
+
+      await this.subject.expand();
+      await this.subject.fillInFilter("a");
+
+      suggestions = this.subject.displayedContent().mapBy("id").sort();
+      assert.deepEqual(suggestions, ["joshua", "sam"]);
     });
 
     test("doesn't show user status by default", async function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/form-template-chooser-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/form-template-chooser-test.js
new file mode 100644
index 00000000000..09d248f862d
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/form-template-chooser-test.js
@@ -0,0 +1,51 @@
+import { module, test } from "qunit";
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import { render } from "@ember/test-helpers";
+import { hbs } from "ember-cli-htmlbars";
+import pretender, { response } from "discourse/tests/helpers/create-pretender";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+
+module(
+  "Integration | Component | select-kit/form-template-chooser",
+  function (hooks) {
+    setupRenderingTest(hooks);
+
+    hooks.beforeEach(function () {
+      this.set("subject", selectKit());
+      pretender.get("/form-templates.json", () => {
+        return response({
+          form_templates: [
+            { id: 1, name: "template 1", template: "test: true" },
+            { id: 2, name: "template 2", template: "test: false" },
+          ],
+        });
+      });
+    });
+
+    test("displays form templates", async function (assert) {
+      await render(hbs`<FormTemplateChooser />`);
+
+      await this.subject.expand();
+
+      assert.strictEqual(this.subject.rowByIndex(0).value(), "1");
+      assert.strictEqual(this.subject.rowByIndex(1).value(), "2");
+    });
+
+    test("displays selected value", async function (assert) {
+      this.set("value", [1]);
+
+      await render(hbs`<FormTemplateChooser @value={{this.value}} />`);
+
+      assert.strictEqual(this.subject.header().name(), "template 1");
+    });
+
+    test("when no templates are available, the select is disabled", async function (assert) {
+      pretender.get("/form-templates.json", () => {
+        return response({ form_templates: [] });
+      });
+
+      await render(hbs`<FormTemplateChooser />`);
+      assert.ok(this.subject.isDisabled());
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/future-date-input-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/future-date-input-test.js
index b652adc4699..89b80b856cf 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/future-date-input-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/future-date-input-test.js
@@ -129,7 +129,7 @@ module(
       this.set("input", moment("2032-01-01 11:10"));
 
       await render(
-        hbs`<FutureDateInput @input={{this.input}} @onChangeInput={{action (mut input)}} />`
+        hbs`<FutureDateInput @input={{this.input}} @onChangeInput={{action (mut this.input)}} />`
       );
 
       await fillIn(".time-input", "11:15");
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/mini-tag-chooser-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/mini-tag-chooser-test.js
index 4824aea118a..29a68d284a3 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/mini-tag-chooser-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/mini-tag-chooser-test.js
@@ -1,6 +1,6 @@
 import { module, test } from "qunit";
 import { setupRenderingTest } from "discourse/tests/helpers/component-test";
-import { render } from "@ember/test-helpers";
+import { click, render, triggerKeyEvent } from "@ember/test-helpers";
 import { exists, query, queryAll } from "discourse/tests/helpers/qunit-helpers";
 import I18n from "I18n";
 import { hbs } from "ember-cli-htmlbars";
@@ -148,3 +148,83 @@ module(
     });
   }
 );
+
+module(
+  "Integration | Component | select-kit/mini-tag-chooser useHeaderFilter=true",
+  function (hooks) {
+    setupRenderingTest(hooks);
+
+    hooks.beforeEach(function () {
+      this.set("subject", selectKit());
+    });
+
+    test("displays tags and filter in header", async function (assert) {
+      this.set("value", ["apple", "orange", "potato"]);
+
+      await render(
+        hbs`<MiniTagChooser @value={{this.value}} @options={{hash filterable=true useHeaderFilter=true}} />`
+      );
+
+      assert.strictEqual(this.subject.header().value(), "apple,orange,potato");
+
+      assert.dom(".select-kit-header--filter").exists();
+      assert.dom(".select-kit-header button[data-name='apple']").exists();
+      assert.dom(".select-kit-header button[data-name='orange']").exists();
+      assert.dom(".select-kit-header button[data-name='potato']").exists();
+
+      const filterInput = ".select-kit-header .filter-input";
+      await click(filterInput);
+
+      await triggerKeyEvent(filterInput, "keydown", "ArrowDown");
+      await triggerKeyEvent(filterInput, "keydown", "Enter");
+
+      assert.dom(".select-kit-header button[data-name='monkey']").exists();
+
+      await triggerKeyEvent(filterInput, "keydown", "Backspace");
+
+      assert
+        .dom(".select-kit-header button[data-name='monkey']")
+        .doesNotExist();
+
+      await this.subject.fillInFilter("foo");
+      await triggerKeyEvent(filterInput, "keydown", "Backspace");
+
+      assert.dom(".select-kit-header button[data-name='potato']").exists();
+    });
+
+    test("removing a tag does not display the dropdown", async function (assert) {
+      this.set("value", ["apple", "orange", "potato"]);
+
+      await render(
+        hbs`<MiniTagChooser @value={{this.value}} @options={{hash filterable=true useHeaderFilter=true}} />`
+      );
+
+      assert.strictEqual(this.subject.header().value(), "apple,orange,potato");
+
+      await click(".select-kit-header button[data-name='apple']");
+
+      assert.dom(".select-kit-collection").doesNotExist();
+      assert.dom(".select-kit-header button[data-name='apple']").doesNotExist();
+      assert.strictEqual(this.subject.header().value(), "orange,potato");
+
+      assert
+        .dom(".select-kit-header .filter-input")
+        .hasAttribute(
+          "placeholder",
+          "",
+          "Placeholder is empty when there is a selection"
+        );
+
+      await click(".select-kit-header button[data-name='orange']");
+      await click(".select-kit-header button[data-name='potato']");
+
+      assert
+        .dom(".select-kit-header .filter-input")
+        .hasAttribute(
+          "placeholder",
+          "Search...",
+          "Placeholder is back to default when there is no selection"
+        );
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/single-select-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/single-select-test.js
index cc8a13006d4..165303a677d 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/single-select-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/single-select-test.js
@@ -1,6 +1,6 @@
 import { module, test } from "qunit";
 import { setupRenderingTest } from "discourse/tests/helpers/component-test";
-import { render } from "@ember/test-helpers";
+import { render, tab } from "@ember/test-helpers";
 import I18n from "I18n";
 import { hbs } from "ember-cli-htmlbars";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
@@ -63,6 +63,54 @@ module("Integration | Component | select-kit/single-select", function (hooks) {
     );
   });
 
+  test("accessibility", async function (assert) {
+    setDefaultState(this);
+
+    await render(hbs`<SingleSelect @content={{this.content}} />`);
+
+    await this.subject.expand();
+
+    const content = this.subject.displayedContent();
+    assert.strictEqual(content.length, 3, "it shows rows");
+
+    assert
+      .dom(".select-kit-header")
+      .isFocused("it should focus the header first");
+
+    await tab();
+
+    assert
+      .dom(".select-kit-row:first-child")
+      .isFocused("it should focus the first row next");
+
+    await tab();
+
+    assert
+      .dom(".select-kit-row:nth-child(2)")
+      .isFocused("tab moves focus to 2nd row");
+
+    await tab();
+
+    assert
+      .dom(".select-kit-row:nth-child(3)")
+      .isFocused("tab moves focus to 3rd row");
+
+    await tab();
+
+    assert.notOk(
+      this.subject.isExpanded(),
+      "when there are no more rows, Tab collapses the dropdown"
+    );
+
+    await this.subject.expand();
+
+    assert.ok(this.subject.isExpanded(), "dropdown is expanded again");
+
+    await tab({ backwards: true });
+
+    assert.notOk(this.subject.isExpanded(), "Shift+Tab collapses the dropdown");
+  });
+
   test("value", async function (assert) {
     setDefaultState(this);
 
@@ -393,6 +441,24 @@ module("Integration | Component | select-kit/single-select", function (hooks) {
     );
   });
 
+  test("row index", async function (assert) {
+    this.setProperties({
+      content: [
+        { id: 1, name: "john" },
+        { id: 2, name: "jane" },
+      ],
+      value: null,
+    });
+
+    await render(
+      hbs`<SingleSelect @value={{this.value}} @content={{this.content}} />`
+    );
+    await this.subject.expand();
+
+    assert.dom('.select-kit-row[data-index="0"][data-value="1"]').exists();
+    assert.dom('.select-kit-row[data-index="1"][data-value="2"]').exists();
+  });
+
   test("options.verticalOffset", async function (assert) {
     setDefaultState(this, { verticalOffset: -50 });
     await render(hbs`
@@ -411,4 +477,33 @@ module("Integration | Component | select-kit/single-select", function (hooks) {
 
     assert.ok(header.bottom > body.top, "it correctly offsets the body");
   });
+
+  test("options.expandedOnInsert", async function (assert) {
+    setDefaultState(this);
+    await render(hbs`
+      <SingleSelect
+        @value={{this.value}}
+        @content={{this.content}}
+        @options={{hash expandedOnInsert=true}}
+      />
+    `);
+
+    assert.dom(".single-select.is-expanded").exists();
+  });
+
+  test("options.formName", async function (assert) {
+    setDefaultState(this);
+    await render(hbs`
+      <SingleSelect
+        @value={{this.value}}
+        @content={{this.content}}
+        @options={{hash formName="foo"}}
+      />
+    `);
+
+    assert
+      .dom('input[name="foo"]')
+      .hasAttribute("type", "hidden")
+      .hasAttribute("value", "1");
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/topic-notifications-button-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/topic-notifications-button-test.js
index d605269d556..452aa104590 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/topic-notifications-button-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/topic-notifications-button-test.js
@@ -85,7 +85,7 @@ module(
     });
 
     test("notification reason text - user mailing list mode", async function (assert) {
-      this.currentUser.set("mailing_list_mode", true);
+      this.currentUser.set("user_option.mailing_list_mode", true);
       this.set("topic", buildTopic.call(this, { level: 2 }));
 
       await render(hbs`
diff --git a/app/assets/javascripts/discourse/tests/integration/components/sidebar/section-link-test.js b/app/assets/javascripts/discourse/tests/integration/components/sidebar/section-link-test.js
index 1267cff3962..dafb801d1ab 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/sidebar/section-link-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/sidebar/section-link-test.js
@@ -6,30 +6,55 @@ import { render } from "@ember/test-helpers";
 import { setupRenderingTest } from "discourse/tests/helpers/component-test";
 import { query } from "discourse/tests/helpers/qunit-helpers";
 
+function containsExactly(assert, expectation, actual, message) {
+  assert.deepEqual(
+    Array.from(expectation).sort(),
+    Array.from(actual).sort(),
+    message
+  );
+}
+
 module("Integration | Component | sidebar | section-link", function (hooks) {
   setupRenderingTest(hooks);
 
   test("default class attribute for link", async function (assert) {
-    const template = hbs`<Sidebar::SectionLink @linkName="test" @route="discovery.latest" />`;
+    const template = hbs`<Sidebar::SectionLink @linkName="Test   Meta" @route="discovery.latest" />`;
 
     await render(template);
 
-    assert.strictEqual(
-      query("a").className,
-      "sidebar-section-link sidebar-section-link-test sidebar-row ember-view",
+    containsExactly(
+      assert,
+      query("a").classList,
+      ["ember-view", "sidebar-row", "sidebar-section-link"],
       "has the right class attribute for the link"
     );
   });
 
   test("custom class attribute for link", async function (assert) {
-    const template = hbs`<Sidebar::SectionLink @linkName="test" @route="discovery.latest" @class="123 abc" />`;
+    const template = hbs`<Sidebar::SectionLink @linkName="Test   Meta" @route="discovery.latest" @class="123 abc" />`;
 
     await render(template);
 
-    assert.strictEqual(
-      query("a").className,
-      "sidebar-section-link sidebar-section-link-test sidebar-row 123 abc ember-view",
+    containsExactly(
+      assert,
+      query("a").classList,
+      ["123", "abc", "ember-view", "sidebar-row", "sidebar-section-link"],
       "has the right class attribute for the link"
     );
   });
+
+  test("target attribute for link", async function (assert) {
+    const template = hbs`<Sidebar::SectionLink @linkName="test" @href="https://discourse.org" />`;
+    await render(template);
+
+    assert.strictEqual(query("a").target, "_self");
+  });
+
+  test("target attribute for link when user set external links in new tab", async function (assert) {
+    this.currentUser.user_option.external_links_in_new_tab = true;
+    const template = hbs`<Sidebar::SectionLink @linkName="test" @href="https://discourse.org" />`;
+    await render(template);
+
+    assert.strictEqual(query("a").target, "_blank");
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/integration/components/site-header-test.js b/app/assets/javascripts/discourse/tests/integration/components/site-header-test.js
index 7027735604f..4dc3e8203fd 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/site-header-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/site-header-test.js
@@ -21,7 +21,6 @@ module("Integration | Component | site-header", function (hooks) {
 
   test("unread notifications count rerenders when user's notifications count is updated", async function (assert) {
     this.currentUser.set("all_unread_notifications_count", 1);
-    this.currentUser.set("redesigned_user_menu_enabled", true);
 
     await render(hbs`<SiteHeader />`);
     let unreadBadge = query(
@@ -39,6 +38,7 @@ module("Integration | Component | site-header", function (hooks) {
   });
 
   test("hamburger menu icon shows pending reviewables count", async function (assert) {
+    this.siteSettings.navigation_menu = "legacy";
     this.currentUser.set("reviewable_count", 1);
     await render(hbs`<SiteHeader />`);
     let pendingReviewablesBadge = query(
@@ -47,15 +47,14 @@ module("Integration | Component | site-header", function (hooks) {
     assert.strictEqual(pendingReviewablesBadge.textContent, "1");
   });
 
-  test("hamburger menu icon doesn't show pending reviewables count when revamped user menu is enabled", async function (assert) {
+  test("hamburger menu icon doesn't show pending reviewables count for non-legacy navigation menu", async function (assert) {
     this.currentUser.set("reviewable_count", 1);
-    this.currentUser.set("redesigned_user_menu_enabled", true);
+    this.siteSettings.navigation_menu = "sidebar";
     await render(hbs`<SiteHeader />`);
     assert.ok(!exists(".hamburger-dropdown .badge-notification"));
   });
 
   test("clicking outside the revamped menu closes it", async function (assert) {
-    this.currentUser.set("redesigned_user_menu_enabled", true);
     await render(hbs`<SiteHeader />`);
     await click(".header-dropdown-toggle.current-user");
     assert.ok(exists(".user-menu.revamped"));
@@ -67,9 +66,11 @@ module("Integration | Component | site-header", function (hooks) {
     await render(hbs`<SiteHeader />`);
 
     function getProperty() {
-      return getComputedStyle(document.body).getPropertyValue(
+      const rawValue = getComputedStyle(document.body).getPropertyValue(
         "--header-offset"
       );
+      const roundedValue = Math.floor(parseFloat(rawValue));
+      return roundedValue + "px";
     }
 
     document.querySelector(".d-header").style.height = 90 + "px";
@@ -82,7 +83,6 @@ module("Integration | Component | site-header", function (hooks) {
   });
 
   test("arrow up/down keys move focus between the tabs", async function (assert) {
-    this.currentUser.set("redesigned_user_menu_enabled", true);
     this.currentUser.set("can_send_private_messages", true);
     await render(hbs`<SiteHeader />`);
     await click(".header-dropdown-toggle.current-user");
@@ -128,7 +128,6 @@ module("Integration | Component | site-header", function (hooks) {
   });
 
   test("new personal messages bubble is prioritized over unseen reviewables and regular notifications bubbles", async function (assert) {
-    this.currentUser.set("redesigned_user_menu_enabled", true);
     this.currentUser.set("all_unread_notifications_count", 5);
     this.currentUser.set("new_personal_messages_notifications_count", 2);
     this.currentUser.set("unseen_reviewable_count", 3);
@@ -169,7 +168,6 @@ module("Integration | Component | site-header", function (hooks) {
   });
 
   test("unseen reviewables bubble is prioritized over regular notifications", async function (assert) {
-    this.currentUser.set("redesigned_user_menu_enabled", true);
     this.currentUser.set("all_unread_notifications_count", 5);
     this.currentUser.set("new_personal_messages_notifications_count", 0);
     this.currentUser.set("unseen_reviewable_count", 3);
@@ -209,7 +207,6 @@ module("Integration | Component | site-header", function (hooks) {
   });
 
   test("regular notifications bubble is shown if there are neither new personal messages nor unseen reviewables", async function (assert) {
-    this.currentUser.set("redesigned_user_menu_enabled", true);
     this.currentUser.set("all_unread_notifications_count", 5);
     this.currentUser.set("new_personal_messages_notifications_count", 0);
     this.currentUser.set("unseen_reviewable_count", 0);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/site-setting-test.js b/app/assets/javascripts/discourse/tests/integration/components/site-setting-test.js
index 58b7c2dbfcc..63d3e426afc 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/site-setting-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/site-setting-test.js
@@ -1,8 +1,9 @@
 import { module, test } from "qunit";
 import { setupRenderingTest } from "discourse/tests/helpers/component-test";
-import { render } from "@ember/test-helpers";
+import { click, fillIn, render } from "@ember/test-helpers";
 import { query } from "discourse/tests/helpers/qunit-helpers";
 import { hbs } from "ember-cli-htmlbars";
+import pretender, { response } from "discourse/tests/helpers/create-pretender";
 
 module("Integration | Component | site-setting", function (hooks) {
   setupRenderingTest(hooks);
@@ -18,4 +19,44 @@ module("Integration | Component | site-setting", function (hooks) {
 
     assert.strictEqual(query(".formatted-selection").innerText, "a.com, b.com");
   });
+
+  test("Error response with html_message is rendered as HTML", async function (assert) {
+    this.set("setting", {
+      setting: "test_setting",
+      value: "",
+      type: "input-setting-string",
+    });
+
+    const message = "<h1>Unable to update site settings</h1>";
+
+    pretender.put("/admin/site_settings/test_setting", () => {
+      return response(422, { html_message: true, errors: [message] });
+    });
+
+    await render(hbs`<SiteSetting @setting={{this.setting}} />`);
+    await fillIn(query(".setting input"), "value");
+    await click(query(".setting .d-icon-check"));
+
+    assert.strictEqual(query(".validation-error h1").outerHTML, message);
+  });
+
+  test("Error response without html_message is not rendered as HTML", async function (assert) {
+    this.set("setting", {
+      setting: "test_setting",
+      value: "",
+      type: "input-setting-string",
+    });
+
+    const message = "<h1>Unable to update site settings</h1>";
+
+    pretender.put("/admin/site_settings/test_setting", () => {
+      return response(422, { errors: [message] });
+    });
+
+    await render(hbs`<SiteSetting @setting={{this.setting}} />`);
+    await fillIn(query(".setting input"), "value");
+    await click(query(".setting .d-icon-check"));
+
+    assert.strictEqual(query(".validation-error h1"), null);
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/integration/components/user-avatar-flair-test.js b/app/assets/javascripts/discourse/tests/integration/components/user-avatar-flair-test.js
index 06114f47f1c..735b7e5e58a 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/user-avatar-flair-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/user-avatar-flair-test.js
@@ -54,6 +54,7 @@ module("Integration | Component | user-avatar-flair", function (hooks) {
       admin: true,
       moderator: false,
       trust_level: 2,
+      flair_group_id: 12,
     });
     setupSiteGroups(this);
 
@@ -73,6 +74,7 @@ module("Integration | Component | user-avatar-flair", function (hooks) {
       admin: false,
       moderator: true,
       trust_level: 2,
+      flair_group_id: 12,
     });
     setupSiteGroups(this);
 
@@ -92,6 +94,7 @@ module("Integration | Component | user-avatar-flair", function (hooks) {
       admin: false,
       moderator: false,
       trust_level: 2,
+      flair_group_id: 12,
     });
     setupSiteGroups(this);
 
@@ -106,11 +109,26 @@ module("Integration | Component | user-avatar-flair", function (hooks) {
     );
   });
 
+  test("avatar flair for trust level when set to none", async function (assert) {
+    this.set("args", {
+      admin: false,
+      moderator: false,
+      trust_level: 2,
+      flair_group_id: null,
+    });
+    setupSiteGroups(this);
+
+    await render(hbs`<UserAvatarFlair @user={{this.args}} />`);
+
+    assert.ok(!exists(".avatar-flair"), "it does not render a flair");
+  });
+
   test("avatar flair for trust level with fallback", async function (assert) {
     this.set("args", {
       admin: false,
       moderator: false,
       trust_level: 3,
+      flair_group_id: 13,
     });
     setupSiteGroups(this);
 
@@ -130,6 +148,7 @@ module("Integration | Component | user-avatar-flair", function (hooks) {
       admin: false,
       moderator: false,
       trust_level: 3,
+      flair_group_id: 13,
     });
     // Groups not serialized for anon on login_required
     this.site.groups = undefined;
@@ -148,6 +167,7 @@ module("Integration | Component | user-avatar-flair", function (hooks) {
       flair_url: "fa-times",
       flair_bg_color: "123456",
       flair_color: "B0B0B0",
+      flair_group_id: 41,
       primary_group_name: "Band Geeks",
     });
     setupSiteGroups(this);
@@ -168,6 +188,7 @@ module("Integration | Component | user-avatar-flair", function (hooks) {
       admin: false,
       moderator: false,
       trust_level: 1,
+      flair_group_id: 11,
     });
 
     await render(hbs`<UserAvatarFlair @user={{this.args}} />`);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/user-invited-show-test.js b/app/assets/javascripts/discourse/tests/integration/components/user-invited-show-test.js
new file mode 100644
index 00000000000..686a340ad64
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/user-invited-show-test.js
@@ -0,0 +1,19 @@
+import { visit } from "@ember/test-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { test } from "qunit";
+
+acceptance("User invites", function (needs) {
+  needs.user();
+
+  test("hides delete button based on can_delete_invite", async function (assert) {
+    await visit("/u/eviltrout/invited");
+
+    assert.dom("table.user-invite-list tbody tr").exists({ count: 2 });
+    assert
+      .dom("table.user-invite-list tbody tr:nth-child(1) button.cancel")
+      .exists();
+    assert
+      .dom("table.user-invite-list tbody tr:nth-child(2) button.cancel")
+      .doesNotExist();
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/integration/components/user-menu/menu-test.js b/app/assets/javascripts/discourse/tests/integration/components/user-menu/menu-test.js
index 36026d25119..c48d39df7a1 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/user-menu/menu-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/user-menu/menu-test.js
@@ -222,7 +222,8 @@ module("Integration | Component | user-menu", function (hooks) {
           },
         ];
       } else if (
-        queryParams.filter_by_types === "mentioned,posted,quoted,replied"
+        queryParams.filter_by_types ===
+        "mentioned,group_mentioned,posted,quoted,replied"
       ) {
         data = [
           {
@@ -280,7 +281,7 @@ module("Integration | Component | user-menu", function (hooks) {
     assert.ok(exists("#quick-access-replies.quick-access-panel"));
     assert.strictEqual(
       queryParams.filter_by_types,
-      "mentioned,posted,quoted,replied",
+      "mentioned,group_mentioned,posted,quoted,replied",
       "request params has filter_by_types set to `mentioned`, `posted`, `quoted` and `replied`"
     );
     assert.strictEqual(queryParams.silent, "true");
@@ -303,4 +304,23 @@ module("Integration | Component | user-menu", function (hooks) {
     );
     assert.strictEqual(queryAll("#quick-access-review-queue ul li").length, 8);
   });
+
+  test("count on the likes tab", async function (assert) {
+    this.currentUser.set("grouped_unread_notifications", {
+      [NOTIFICATION_TYPES.liked]: 1,
+      [NOTIFICATION_TYPES.liked_consolidated]: 2,
+      [NOTIFICATION_TYPES.reaction]: 3,
+      [NOTIFICATION_TYPES.bookmark_reminder]: 10,
+    });
+    await render(template);
+
+    const likesCountBadge = query(
+      "#user-menu-button-likes .badge-notification"
+    );
+    assert.strictEqual(
+      likesCountBadge.textContent,
+      (1 + 2 + 3).toString(),
+      "combines unread counts for `liked`, `liked_consolidated` and `reaction` types"
+    );
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/integration/components/user-selector-test.js b/app/assets/javascripts/discourse/tests/integration/components/user-selector-test.js
deleted file mode 100644
index e0484728125..00000000000
--- a/app/assets/javascripts/discourse/tests/integration/components/user-selector-test.js
+++ /dev/null
@@ -1,67 +0,0 @@
-import { module, test } from "qunit";
-import { setupRenderingTest } from "discourse/tests/helpers/component-test";
-import { render } from "@ember/test-helpers";
-import { query } from "discourse/tests/helpers/qunit-helpers";
-import { hbs } from "ember-cli-htmlbars";
-import { withSilencedDeprecationsAsync } from "discourse-common/lib/deprecated";
-
-function paste(element, text) {
-  let e = new Event("paste");
-  e.clipboardData = { getData: () => text };
-  element.dispatchEvent(e);
-}
-
-module("Integration | Component | user-selector", function (hooks) {
-  setupRenderingTest(hooks);
-
-  test("pasting a list of usernames", async function (assert) {
-    this.set("usernames", "evil,trout");
-
-    await withSilencedDeprecationsAsync(
-      "discourse.user-selector-component",
-      async () => {
-        await render(
-          hbs`<UserSelector @usernames={{this.usernames}} class="test-selector" />`
-        );
-      }
-    );
-
-    let element = query(".test-selector");
-
-    assert.strictEqual(this.get("usernames"), "evil,trout");
-    paste(element, "zip,zap,zoom");
-    assert.strictEqual(this.get("usernames"), "evil,trout,zip,zap,zoom");
-    paste(element, "evil,abc,abc,abc");
-    assert.strictEqual(this.get("usernames"), "evil,trout,zip,zap,zoom,abc");
-
-    this.set("usernames", "");
-    paste(element, "names with spaces");
-    assert.strictEqual(this.get("usernames"), "names,with,spaces");
-
-    this.set("usernames", null);
-    paste(element, "@eviltrout,@codinghorror sam");
-    assert.strictEqual(this.get("usernames"), "eviltrout,codinghorror,sam");
-
-    this.set("usernames", null);
-    paste(element, "eviltrout\nsam\ncodinghorror");
-    assert.strictEqual(this.get("usernames"), "eviltrout,sam,codinghorror");
-  });
-
-  test("excluding usernames", async function (assert) {
-    this.set("usernames", "mark");
-    this.set("excludedUsernames", ["jeff", "sam", "robin"]);
-
-    await withSilencedDeprecationsAsync(
-      "discourse.user-selector-component",
-      async () => {
-        await render(
-          hbs`<UserSelector @usernames={{this.usernames}} @excludedUsernames={{this.excludedUsernames}} class="test-selector" />`
-        );
-      }
-    );
-
-    let element = query(".test-selector");
-    paste(element, "roman,penar,jeff,robin");
-    assert.strictEqual(this.get("usernames"), "mark,roman,penar");
-  });
-});
diff --git a/app/assets/javascripts/discourse/tests/integration/components/user-status-message-test.js b/app/assets/javascripts/discourse/tests/integration/components/user-status-message-test.js
index 15e174b83aa..9cf52c8fcd0 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/user-status-message-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/user-status-message-test.js
@@ -13,6 +13,7 @@ module("Integration | Component | user-status-message", function (hooks) {
 
   hooks.beforeEach(function () {
     this.currentUser.user_option.timezone = "UTC";
+    this.status = { emoji: "tooth", description: "off to dentist" };
   });
 
   hooks.afterEach(function () {
@@ -22,24 +23,22 @@ module("Integration | Component | user-status-message", function (hooks) {
   });
 
   test("it renders user status emoji", async function (assert) {
-    this.set("status", { emoji: "tooth", description: "off to dentist" });
     await render(hbs`<UserStatusMessage @status={{this.status}} />`);
     assert.ok(exists("img.emoji[alt='tooth']"), "the status emoji is shown");
   });
 
   test("it doesn't render status description by default", async function (assert) {
-    this.set("status", { emoji: "tooth", description: "off to dentist" });
     await render(hbs`<UserStatusMessage @status={{this.status}} />`);
     assert.notOk(exists(".user-status-message-description"));
   });
 
   test("it renders status description if enabled", async function (assert) {
-    this.set("status", { emoji: "tooth", description: "off to dentist" });
     await render(hbs`
       <UserStatusMessage
        @status={{this.status}}
        @showDescription=true/>
     `);
+
     assert.equal(
       query(".user-status-message-description").innerText.trim(),
       "off to dentist"
@@ -52,11 +51,7 @@ module("Integration | Component | user-status-message", function (hooks) {
       this.currentUser.user_option.timezone,
       true
     );
-    this.set("status", {
-      emoji: "tooth",
-      description: "off to dentist",
-      ends_at: "2100-02-01T12:30:00.000Z",
-    });
+    this.status.ends_at = "2100-02-01T12:30:00.000Z";
 
     await render(hbs`<UserStatusMessage @status={{this.status}} />`);
 
@@ -75,11 +70,7 @@ module("Integration | Component | user-status-message", function (hooks) {
       this.currentUser.user_option.timezone,
       true
     );
-    this.set("status", {
-      emoji: "tooth",
-      description: "off to dentist",
-      ends_at: "2100-02-02T12:30:00.000Z",
-    });
+    this.status.ends_at = "2100-02-02T12:30:00.000Z";
 
     await render(hbs`<UserStatusMessage @status={{this.status}} />`);
 
@@ -98,11 +89,7 @@ module("Integration | Component | user-status-message", function (hooks) {
       this.currentUser.user_option.timezone,
       true
     );
-    this.set("status", {
-      emoji: "tooth",
-      description: "off to dentist",
-      ends_at: null,
-    });
+    this.status.ends_at = null;
 
     await render(hbs`<UserStatusMessage @status={{this.status}} />`);
 
@@ -113,11 +100,6 @@ module("Integration | Component | user-status-message", function (hooks) {
   });
 
   test("it shows tooltip by default", async function (assert) {
-    this.set("status", {
-      emoji: "tooth",
-      description: "off to dentist",
-    });
-
     await render(hbs`<UserStatusMessage @status={{this.status}} />`);
     await mouseenter();
 
@@ -127,11 +109,6 @@ module("Integration | Component | user-status-message", function (hooks) {
   });
 
   test("it doesn't show tooltip if disabled", async function (assert) {
-    this.set("status", {
-      emoji: "tooth",
-      description: "off to dentist",
-    });
-
     await render(
       hbs`<UserStatusMessage @status={{this.status}} @showTooltip={{false}} />`
     );
@@ -144,14 +121,20 @@ module("Integration | Component | user-status-message", function (hooks) {
 
   test("doesn't blow up with an anonymous user", async function (assert) {
     this.owner.unregister("service:current-user");
-    this.set("status", {
-      emoji: "tooth",
-      description: "off to dentist",
-      ends_at: "2100-02-02T12:30:00.000Z",
-    });
+    this.status.ends_at = "2100-02-02T12:30:00.000Z";
 
     await render(hbs`<UserStatusMessage @status={{this.status}} />`);
 
     assert.dom(".user-status-message").exists();
   });
+
+  test("accepts a custom css class", async function (assert) {
+    this.set("status", { emoji: "tooth", description: "off to dentist" });
+
+    await render(
+      hbs`<UserStatusMessage @status={{this.status}} @class="foo" />`
+    );
+
+    assert.dom(".user-status-message.foo").exists();
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/button-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/button-test.js
index 81bfad21ccb..0b9fdebede3 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/widgets/button-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/button-test.js
@@ -63,4 +63,12 @@ module("Integration | Component | Widget | button", function (hooks) {
 
     assert.strictEqual(query("button").title, "foo bar");
   });
+
+  test("translatedLabel skips no-text class in icon", async function (assert) {
+    this.set("args", { icon: "plus", translatedLabel: "foo bar" });
+
+    await render(hbs`<MountWidget @widget="button" @args={{this.args}} />`);
+
+    assert.ok(!exists("button.btn.btn-icon.no-text"), "skips no-text class");
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/default-notification-item-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/default-notification-item-test.js
index 509f09bcd66..afd515e5de4 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/widgets/default-notification-item-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/default-notification-item-test.js
@@ -55,7 +55,11 @@ module(
       assert.ok(!exists("li.read"));
 
       await triggerEvent("li", "mouseup", { button: 1, which: 2 });
-      assert.strictEqual(count("li.read"), 1);
+      assert.strictEqual(
+        count("li.read"),
+        1,
+        "only one item is marked as read"
+      );
       assert.strictEqual(requests, 1);
     });
   }
diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/post-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/post-test.js
index 6f7ca2c89a5..3ad97ae96c9 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/widgets/post-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/post-test.js
@@ -495,7 +495,7 @@ module("Integration | Component | Widget | post", function (hooks) {
   });
 
   test("cooked content hidden", async function (assert) {
-    this.set("args", { cooked_hidden: true });
+    this.set("args", { cooked_hidden: true, canSeeHiddenPost: true });
     this.set("expandHidden", () => (this.unhidden = true));
 
     await render(hbs`
@@ -506,6 +506,17 @@ module("Integration | Component | Widget | post", function (hooks) {
     assert.ok(this.unhidden, "triggers the action");
   });
 
+  test(`cooked content hidden - can't view hidden post`, async function (assert) {
+    this.set("args", { cooked_hidden: true, canSeeHiddenPost: false });
+    this.set("expandHidden", () => (this.unhidden = true));
+
+    await render(hbs`
+      <MountWidget @widget="post" @args={{this.args}} @expandHidden={{this.expandHidden}} />
+    `);
+
+    assert.ok(!exists(".topic-body .expand-hidden"), "button is not displayed");
+  });
+
   test("expand first post", async function (assert) {
     const store = getOwner(this).lookup("service:store");
     this.set("args", { expandablePost: true });
@@ -829,12 +840,12 @@ module("Integration | Component | Widget | post", function (hooks) {
     assert.ok(!exists(".toggle-summary"));
   });
 
-  test("topic map - has summary", async function (assert) {
-    this.set("args", { showTopicMap: true, hasTopicSummary: true });
-    this.set("showSummary", () => (this.summaryToggled = true));
+  test("topic map - has top replies summary", async function (assert) {
+    this.set("args", { showTopicMap: true, hasTopRepliesSummary: true });
+    this.set("showTopReplies", () => (this.summaryToggled = true));
 
     await render(
-      hbs`<MountWidget @widget="post" @args={{this.args}} @showSummary={{this.showSummary}} />`
+      hbs`<MountWidget @widget="post" @args={{this.args}} @showTopReplies={{this.showTopReplies}} />`
     );
 
     assert.strictEqual(count(".toggle-summary"), 1);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/quick-access-item-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/quick-access-item-test.js
deleted file mode 100644
index 9e3dbb26168..00000000000
--- a/app/assets/javascripts/discourse/tests/integration/components/widgets/quick-access-item-test.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import { module, test } from "qunit";
-import { setupRenderingTest } from "discourse/tests/helpers/component-test";
-import { render } from "@ember/test-helpers";
-import { query } from "discourse/tests/helpers/qunit-helpers";
-import { hbs } from "ember-cli-htmlbars";
-
-const CONTENT_DIV_SELECTOR = "li > a > div";
-
-module(
-  "Integration | Component | Widget | quick-access-item",
-  function (hooks) {
-    setupRenderingTest(hooks);
-
-    test("content attribute is escaped", async function (assert) {
-      this.set("args", { content: "<b>bold</b>" });
-
-      await render(
-        hbs`<MountWidget @widget="quick-access-item" @args={{this.args}} />`
-      );
-
-      const contentDiv = query(CONTENT_DIV_SELECTOR);
-      assert.strictEqual(contentDiv.innerText, "<b>bold</b>");
-    });
-
-    test("escapedContent attribute is not escaped", async function (assert) {
-      this.set("args", { escapedContent: "&quot;quote&quot;" });
-
-      await render(
-        hbs`<MountWidget @widget="quick-access-item" @args={{this.args}} />`
-      );
-
-      const contentDiv = query(CONTENT_DIV_SELECTOR);
-      assert.strictEqual(contentDiv.innerText, '"quote"');
-    });
-  }
-);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/render-glimmer-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/render-glimmer-test.js
index 53d8b8d62d8..6d9df71943a 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/widgets/render-glimmer-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/render-glimmer-test.js
@@ -4,9 +4,11 @@ import { setupRenderingTest } from "discourse/tests/helpers/component-test";
 import { click, fillIn, render } from "@ember/test-helpers";
 import { hbs } from "ember-cli-htmlbars";
 import widgetHbs from "discourse/widgets/hbs-compiler";
-import Widget from "discourse/widgets/widget";
+import Widget, { deleteFromRegistry } from "discourse/widgets/widget";
 import ClassicComponent from "@ember/component";
-import RenderGlimmer from "discourse/widgets/render-glimmer";
+import RenderGlimmer, {
+  registerWidgetShim,
+} from "discourse/widgets/render-glimmer";
 import { bind } from "discourse-common/utils/decorators";
 
 class DemoWidget extends Widget {
@@ -126,12 +128,18 @@ module("Integration | Component | Widget | render-glimmer", function (hooks) {
     this.registry.register("widget:demo-widget", DemoWidget);
     this.registry.register("widget:toggle-demo-widget", ToggleDemoWidget);
     this.registry.register("component:demo-component", DemoComponent);
+    registerWidgetShim(
+      "render-glimmer-test-shim",
+      "div.my-wrapper",
+      hbs`<span class='shim-content'>{{@data.attr1}}</span>`
+    );
   });
 
   hooks.afterEach(function () {
     this.registry.unregister("widget:demo-widget");
     this.registry.unregister("widget:toggle-demo-widget");
     this.registry.unregister("component:demo-component");
+    deleteFromRegistry("render-glimmer-test-shim");
   });
 
   test("argument handling", async function (assert) {
@@ -150,12 +158,6 @@ module("Integration | Component | Widget | render-glimmer", function (hooks) {
     );
 
     await fillIn("input.dynamic-value-input", "somedynamicvalue");
-    assert.strictEqual(
-      query("div.glimmer-content").innerText,
-      "arg1=val1 dynamicArg=",
-      "changed arguments do not change before rerender"
-    );
-
     await click(".my-widget button");
     assert.strictEqual(
       query("div.glimmer-content").innerText,
@@ -192,16 +194,10 @@ module("Integration | Component | Widget | render-glimmer", function (hooks) {
     DemoComponent.eventLog = [];
 
     await fillIn("input.dynamic-value-input", "somedynamicvalue");
-    assert.deepEqual(
-      DemoComponent.eventLog,
-      [],
-      "component is not notified of attr change before widget rerender"
-    );
-
     await click(".my-widget button");
     assert.deepEqual(
       DemoComponent.eventLog,
-      ["didReceiveAttrs"],
+      ["didReceiveAttrs", "didReceiveAttrs"], // once for input, once for event
       "component is notified of attr change during widget rerender"
     );
 
@@ -310,4 +306,13 @@ module("Integration | Component | Widget | render-glimmer", function (hooks) {
     await click(".toggleButton");
     assert.strictEqual(query("div.glimmer-wrapper").innerText, "One");
   });
+
+  test("registerWidgetShim can register a fake widget", async function (assert) {
+    await render(
+      hbs`<MountWidget @widget="render-glimmer-test-shim" @args={{hash attr1="val1"}} />`
+    );
+
+    assert.dom("div.my-wrapper span.shim-content").exists();
+    assert.dom("div.my-wrapper span.shim-content").hasText("val1");
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/topic-participant-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/topic-participant-test.js
index b49ea9f2267..c52b9f454c9 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/widgets/topic-participant-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/topic-participant-test.js
@@ -34,6 +34,7 @@ module(
         flair_name: "devs",
         flair_url: "/images/d-logo-sketch-small.png",
         flair_bg_color: "222",
+        flair_group_id: "41",
       });
 
       await render(
diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/user-menu-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/user-menu-test.js
deleted file mode 100644
index 5290dd6628f..00000000000
--- a/app/assets/javascripts/discourse/tests/integration/components/widgets/user-menu-test.js
+++ /dev/null
@@ -1,229 +0,0 @@
-import { module, test } from "qunit";
-import { setupRenderingTest } from "discourse/tests/helpers/component-test";
-import { click, render } from "@ember/test-helpers";
-import { exists, query, queryAll } from "discourse/tests/helpers/qunit-helpers";
-import { hbs } from "ember-cli-htmlbars";
-import sinon from "sinon";
-import DiscourseURL from "discourse/lib/url";
-import I18n from "I18n";
-
-module("Integration | Component | Widget | user-menu", function (hooks) {
-  setupRenderingTest(hooks);
-
-  test("basics", async function (assert) {
-    await render(hbs`<MountWidget @widget="user-menu" />`);
-
-    assert.ok(exists(".user-menu"));
-    assert.ok(exists(".user-preferences-link"));
-    assert.ok(exists(".user-notifications-link"));
-    assert.ok(exists(".user-bookmarks-link"));
-    assert.ok(exists(".quick-access-panel"));
-    assert.ok(exists(".notifications-dismiss"));
-  });
-
-  test("notifications", async function (assert) {
-    await render(hbs`<MountWidget @widget="user-menu" />`);
-
-    const links = queryAll(".quick-access-panel li a");
-
-    assert.strictEqual(links.length, 6);
-    assert.ok(links[1].href.includes("/t/a-slug/123"));
-
-    assert.ok(
-      links[2].href.includes(
-        "/u/eviltrout/notifications/likes-received?acting_username=aquaman"
-      )
-    );
-
-    assert.strictEqual(
-      links[2].text,
-      `aquaman ${I18n.t("notifications.liked_consolidated_description", {
-        count: 5,
-      })}`
-    );
-
-    assert.ok(links[3].href.includes("/u/test2/messages/group/test"));
-    assert.ok(
-      links[3].innerHTML.includes(
-        I18n.t("notifications.group_message_summary", {
-          count: 5,
-          group_name: "test",
-        })
-      )
-    );
-
-    assert.ok(links[4].href.includes("/u/test1"));
-    assert.ok(
-      links[4].innerHTML.includes(
-        I18n.t("notifications.invitee_accepted", { username: "test1" })
-      )
-    );
-
-    assert.ok(links[5].href.includes("/g/test"));
-    assert.ok(
-      links[5].innerHTML.includes(
-        I18n.t("notifications.membership_request_accepted", {
-          group_name: "test",
-        })
-      )
-    );
-
-    const routeToStub = sinon.stub(DiscourseURL, "routeTo");
-    await click(".user-notifications-link");
-    assert.ok(
-      routeToStub.calledWith(query(".user-notifications-link").dataset.url),
-      "a second click should redirect to the full notifications page"
-    );
-  });
-
-  test("log out", async function (assert) {
-    this.set("logout", () => (this.loggedOut = true));
-
-    await render(
-      hbs`<MountWidget @widget="user-menu" @logout={{this.logout}} />`
-    );
-
-    await click(".user-preferences-link");
-
-    assert.ok(exists(".logout"));
-
-    await click(".logout button");
-    assert.ok(this.loggedOut);
-  });
-
-  test("private messages - disabled", async function (assert) {
-    this.currentUser.setProperties({
-      admin: false,
-      moderator: false,
-      can_send_private_messages: false,
-    });
-
-    await render(hbs`<MountWidget @widget="user-menu" />`);
-
-    assert.ok(!exists(".user-pms-link"));
-  });
-
-  test("private messages - enabled", async function (assert) {
-    this.currentUser.setProperties({
-      admin: false,
-      moderator: false,
-      can_send_private_messages: true,
-    });
-
-    await render(hbs`<MountWidget @widget="user-menu" />`);
-
-    const userPmsLink = query(".user-pms-link").dataset.url;
-    assert.ok(userPmsLink);
-    await click(".user-pms-link");
-
-    const message = query(".quick-access-panel li a");
-    assert.ok(message);
-
-    assert.ok(
-      message.href.includes("/t/bug-can-not-render-emoji-properly/174/2"),
-      "should link to the next unread post"
-    );
-    assert.ok(
-      message.innerHTML.includes("mixtape"),
-      "should include the last poster's username"
-    );
-    assert.ok(
-      message.innerHTML.match(/<img.*class="emoji".*>/),
-      "should correctly render emoji in message title"
-    );
-
-    const routeToStub = sinon.stub(DiscourseURL, "routeTo");
-    await click(".user-pms-link");
-    assert.ok(
-      routeToStub.calledWith(userPmsLink),
-      "a second click should redirect to the full private messages page"
-    );
-  });
-
-  test("bookmarks", async function (assert) {
-    await render(hbs`<MountWidget @widget="user-menu" />`);
-
-    await click(".user-bookmarks-link");
-
-    const allBookmarks = queryAll(".quick-access-panel li a");
-    const bookmark = allBookmarks[0];
-
-    assert.ok(
-      bookmark.href.includes("/t/yelling-topic-title/119"),
-      "the Post bookmark should have a link to the topic"
-    );
-    assert.ok(
-      bookmark.innerHTML.includes("someguy"),
-      "should include the last poster's username"
-    );
-    assert.ok(
-      bookmark.innerHTML.match(/<img.*class="emoji".*>/),
-      "should correctly render emoji in bookmark title"
-    );
-    assert.ok(
-      bookmark.innerHTML.includes("d-icon-bookmark"),
-      "should use the correct icon based on no reminder_at present"
-    );
-
-    const routeToStub = sinon.stub(DiscourseURL, "routeTo");
-    await click(".user-bookmarks-link");
-    assert.ok(
-      routeToStub.calledWith(query(".user-bookmarks-link").dataset.url),
-      "a second click should redirect to the full bookmarks page"
-    );
-
-    const nonPostBookmarkableBookmark = allBookmarks[1];
-    assert.ok(
-      nonPostBookmarkableBookmark.href.includes("chat/message/2437"),
-      "bookmarkable_type that is not Post or Topic should use bookmarkable_url for the item link"
-    );
-    assert.ok(
-      nonPostBookmarkableBookmark.innerHTML.includes(
-        "d-icon-discourse-bookmark-clock"
-      ),
-      "should use the correct icon based on reminder_at present"
-    );
-  });
-
-  test("anonymous", async function (assert) {
-    this.currentUser.setProperties({ is_anonymous: false, trust_level: 3 });
-    this.siteSettings.allow_anonymous_posting = true;
-    this.siteSettings.anonymous_posting_min_trust_level = 3;
-    this.set("toggleAnonymous", () => (this.anonymous = true));
-
-    await render(hbs`
-        <MountWidget @widget="user-menu" @toggleAnonymous={{this.toggleAnonymous}} />
-      `);
-
-    await click(".user-preferences-link");
-    assert.ok(exists(".enable-anonymous"));
-
-    await click(".enable-anonymous");
-    assert.ok(this.anonymous);
-  });
-
-  test("anonymous - disabled", async function (assert) {
-    this.siteSettings.allow_anonymous_posting = false;
-
-    await render(hbs`<MountWidget @widget="user-menu" />`);
-
-    await click(".user-preferences-link");
-    assert.ok(!exists(".enable-anonymous"));
-  });
-
-  test("anonymous - switch back", async function (assert) {
-    this.currentUser.setProperties({ is_anonymous: true });
-    this.siteSettings.allow_anonymous_posting = true;
-    this.set("toggleAnonymous", () => (this.anonymous = false));
-
-    await render(hbs`
-        <MountWidget @widget="user-menu" @toggleAnonymous={{this.toggleAnonymous}} />
-      `);
-
-    await click(".user-preferences-link");
-    assert.ok(exists(".disable-anonymous"));
-
-    await click(".disable-anonymous");
-    assert.notOk(this.anonymous);
-  });
-});
diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/widget-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/widget-test.js
index f5406662703..8cefc8d900b 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/widgets/widget-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/widget-test.js
@@ -1,6 +1,6 @@
 import { module, test } from "qunit";
 import { setupRenderingTest } from "discourse/tests/helpers/component-test";
-import { click, render } from "@ember/test-helpers";
+import { click, render, settled } from "@ember/test-helpers";
 import { count, exists, query } from "discourse/tests/helpers/qunit-helpers";
 import { hbs } from "ember-cli-htmlbars";
 import widgetHbs from "discourse/widgets/hbs-compiler";
@@ -9,6 +9,7 @@ import { Promise } from "rsvp";
 import { createWidget } from "discourse/widgets/widget";
 import { next } from "@ember/runloop";
 import { withPluginApi } from "discourse/lib/plugin-api";
+import { h } from "virtual-dom";
 
 module("Integration | Component | Widget | base", function (hooks) {
   setupRenderingTest(hooks);
@@ -32,6 +33,24 @@ module("Integration | Component | Widget | base", function (hooks) {
     assert.strictEqual(query(".test").innerText, "Hello Robin");
   });
 
+  test("widget rerenders when args change", async function (assert) {
+    createWidget("hello-test", {
+      tagName: "div.test",
+      template: widgetHbs`Hello {{attrs.name}}`,
+    });
+
+    this.set("args", { name: "Robin" });
+
+    await render(hbs`<MountWidget @widget="hello-test" @args={{this.args}} />`);
+
+    assert.strictEqual(query(".test").innerText, "Hello Robin");
+
+    this.set("args", { name: "David" });
+    await settled();
+
+    assert.strictEqual(query(".test").innerText, "Hello David");
+  });
+
   test("widget services", async function (assert) {
     createWidget("service-test", {
       tagName: "div.base-url-test",
@@ -394,4 +413,75 @@ module("Integration | Component | Widget | base", function (hooks) {
       "renders container with overridden tagName"
     );
   });
+
+  test("avoids rerendering on prepend", async function (assert) {
+    createWidget("prepend-test", {
+      tagName: "div.test",
+      html(attrs) {
+        const result = [];
+        result.push(
+          this.attach("button", {
+            label: "rerender",
+            className: "rerender",
+            action: "dummyAction",
+          })
+        );
+        result.push(
+          h(
+            "div",
+            attrs.array.map((val) => h(`span.val.${val}`, { key: val }, val))
+          )
+        );
+        return result;
+      },
+      dummyAction() {},
+    });
+
+    const array = ["ElementOne", "ElementTwo"];
+    this.set("args", { array });
+
+    await render(
+      hbs`<MountWidget @widget="prepend-test" @args={{this.args}} />`
+    );
+
+    const startElements = Array.from(document.querySelectorAll("span.val"));
+    assert.deepEqual(
+      startElements.map((e) => e.innerText),
+      ["ElementOne", "ElementTwo"]
+    );
+    const elementOneBefore = startElements[0];
+
+    const parent = elementOneBefore.parentNode;
+    const observer = new MutationObserver(function (mutations) {
+      assert.notOk(
+        mutations.some((m) =>
+          Array.from(m.addedNodes).includes(elementOneBefore)
+        )
+      );
+    });
+    observer.observe(parent, { childList: true });
+
+    array.unshift(
+      "PrependedElementOne",
+      "PrependedElementTwo",
+      "PrependedElementThree"
+    );
+
+    await click(".rerender");
+
+    const endElements = Array.from(document.querySelectorAll("span.val"));
+    assert.deepEqual(
+      endElements.map((e) => e.innerText),
+      [
+        "PrependedElementOne",
+        "PrependedElementTwo",
+        "PrependedElementThree",
+        "ElementOne",
+        "ElementTwo",
+      ]
+    );
+    const elementOneAfter = endElements[3];
+
+    assert.strictEqual(elementOneBefore, elementOneAfter);
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/integration/helpers/replace-emoji-test.js b/app/assets/javascripts/discourse/tests/integration/helpers/replace-emoji-test.js
new file mode 100644
index 00000000000..2ce8e73be3c
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/helpers/replace-emoji-test.js
@@ -0,0 +1,29 @@
+import { module, test } from "qunit";
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import { render } from "@ember/test-helpers";
+import { hbs } from "ember-cli-htmlbars";
+
+module("Integration | Helper | replace-emoji", function (hooks) {
+  setupRenderingTest(hooks);
+
+  test("it replaces the emoji", async function (assert) {
+    await render(hbs`<span>{{replace-emoji "some text :heart:"}}</span>`);
+
+    assert.dom(`span`).includesText("some text");
+    assert.dom(`.emoji[title="heart"]`).exists();
+  });
+
+  test("it escapes the text", async function (assert) {
+    await render(
+      hbs`<span>{{replace-emoji "<style>body: {background: red;}</style>"}}</span>`
+    );
+
+    assert.dom(`span`).hasText("<style>body: {background: red;}</style>");
+  });
+
+  test("it renders html-safe text", async function (assert) {
+    await render(hbs`<span>{{replace-emoji (html-safe "safe text")}}</span>`);
+
+    assert.dom(`span`).hasText("safe text");
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/setup-tests.js b/app/assets/javascripts/discourse/tests/setup-tests.js
index 570f1f00e26..a16401e2ac9 100644
--- a/app/assets/javascripts/discourse/tests/setup-tests.js
+++ b/app/assets/javascripts/discourse/tests/setup-tests.js
@@ -39,6 +39,7 @@ import { addModuleExcludeMatcher } from "ember-cli-test-loader/test-support/inde
 import SiteSettingService from "discourse/services/site-settings";
 import jQuery from "jquery";
 import { setupDeprecationCounter } from "discourse/tests/helpers/deprecation-counter";
+import { configureRaiseOnDeprecation } from "discourse/tests/helpers/raise-on-deprecation";
 
 const Plugin = $.fn.modal;
 const Modal = Plugin.Constructor;
@@ -124,31 +125,39 @@ function setupToolbar() {
     )
   );
 
-  QUnit.config.urlConfig.push({
-    id: "qunit_skip_core",
-    label: "Skip Core",
-    value: "1",
-  });
-
-  QUnit.config.urlConfig.push({
-    id: "qunit_skip_plugins",
-    label: "Skip Plugins",
-    value: "1",
-  });
-
   const pluginNames = new Set();
 
-  Object.keys(requirejs.entries).forEach((moduleName) => {
-    const found = moduleName.match(/\/plugins\/([\w-]+)\//);
-    if (found && moduleName.match(/\-test/)) {
-      pluginNames.add(found[1]);
-    }
-  });
+  document
+    .querySelector("#dynamic-test-js")
+    ?.content.querySelectorAll("script[data-discourse-plugin]")
+    .forEach((script) => pluginNames.add(script.dataset.discoursePlugin));
 
   QUnit.config.urlConfig.push({
-    id: "qunit_single_plugin",
-    label: "Plugin",
-    value: Array.from(pluginNames),
+    id: "target",
+    label: "Target",
+    value: ["core", "plugins", "all", "-----", ...Array.from(pluginNames)],
+  });
+
+  QUnit.begin(() => {
+    const select = document.querySelector(
+      `#qunit-testrunner-toolbar [name=target]`
+    );
+
+    const testingThemeId = parseInt(
+      document.querySelector("script[data-theme-id]")?.dataset.themeId,
+      10
+    );
+    if (testingThemeId) {
+      select.innerHTML = `<option selected>theme id ${testingThemeId}</option>`;
+      select.disabled = true;
+      return;
+    }
+
+    select.value ||= "core";
+    select.querySelector("option:not([value])").remove();
+    select.querySelector("option[value=-----]").disabled = true;
+    select.querySelector("option[value=all]").innerText =
+      "all (not recommended)";
   });
 
   // Abort tests when the qunit controls are clicked
@@ -201,6 +210,7 @@ export default function setupTests(config) {
   setupDeprecationCounter(QUnit);
 
   QUnit.config.hidepassed = true;
+  QUnit.config.testTimeout = 60_000;
 
   sinon.config = {
     injectIntoThis: false,
@@ -344,20 +354,9 @@ export default function setupTests(config) {
     QUnit.config.autostart = false;
   }
 
-  let skipCore =
-    getUrlParameter("qunit_single_plugin") ||
-    getUrlParameter("qunit_skip_core") === "1";
+  handleLegacyParameters();
 
-  let singlePlugin = getUrlParameter("qunit_single_plugin");
-  let skipPlugins = !singlePlugin && getUrlParameter("qunit_skip_plugins");
-
-  if (skipCore && !getUrlParameter("qunit_skip_core")) {
-    replaceUrlParameter("qunit_skip_core", "1");
-  }
-
-  if (!skipPlugins && getUrlParameter("qunit_skip_plugins")) {
-    replaceUrlParameter("qunit_skip_plugins", null);
-  }
+  const target = getUrlParameter("target") || "core";
 
   const shouldLoadModule = (name) => {
     if (!/\-test/.test(name)) {
@@ -368,13 +367,15 @@ export default function setupTests(config) {
     const isCore = !isPlugin;
     const pluginName = name.match(/\/plugins\/([\w-]+)\//)?.[1];
 
-    if (skipCore && isCore) {
+    const loadCore = target === "core" || target === "all";
+    const loadAllPlugins = target === "plugins" || target === "all";
+
+    if (isCore && !loadCore) {
       return false;
-    } else if (skipPlugins && isPlugin) {
-      return false;
-    } else if (singlePlugin && singlePlugin !== pluginName) {
+    } else if (isPlugin && !(loadAllPlugins || pluginName === target)) {
       return false;
     }
+
     return true;
   };
 
@@ -386,6 +387,13 @@ export default function setupTests(config) {
   setupToolbar();
   reportMemoryUsageAfterTests();
   patchFailedAssertion();
+
+  const hasPluginJs = !!document.querySelector("script[data-discourse-plugin]");
+  const hasThemeJs = !!document.querySelector("script[data-theme-id]");
+
+  if (!hasPluginJs && !hasThemeJs) {
+    configureRaiseOnDeprecation();
+  }
 }
 
 function getUrlParameter(name) {
@@ -393,28 +401,6 @@ function getUrlParameter(name) {
   return queryParams.get(name);
 }
 
-function replaceUrlParameter(name, value) {
-  const queryParams = new URLSearchParams(window.location.search);
-  if (value === null) {
-    queryParams.delete(name);
-  } else {
-    queryParams.set(name, value);
-  }
-  history.replaceState(null, null, "?" + queryParams.toString());
-
-  QUnit.begin(() => {
-    QUnit.config[name] = value;
-    const formElement = document.querySelector(
-      `#qunit-testrunner-toolbar [name=${name}]`
-    );
-    if (formElement?.type === "checkbox") {
-      formElement.checked = !!value;
-    } else if (formElement) {
-      formElement.value = value;
-    }
-  });
-}
-
 function patchFailedAssertion() {
   const oldPushResult = QUnit.assert.pushResult;
 
@@ -430,3 +416,19 @@ function patchFailedAssertion() {
     oldPushResult.call(this, resultInfo);
   };
 }
+
+function handleLegacyParameters() {
+  for (const param of [
+    "qunit_single_plugin",
+    "qunit_skip_core",
+    "qunit_skip_plugins",
+  ]) {
+    if (getUrlParameter(param)) {
+      QUnit.begin(() => {
+        throw new Error(
+          `${param} is no longer supported. Use the 'target' parameter instead`
+        );
+      });
+    }
+  }
+}
diff --git a/app/assets/javascripts/discourse/tests/test-boot-ember-cli.js b/app/assets/javascripts/discourse/tests/test-boot-ember-cli.js
index c16a0c17680..fd8ffc4f209 100644
--- a/app/assets/javascripts/discourse/tests/test-boot-ember-cli.js
+++ b/app/assets/javascripts/discourse/tests/test-boot-ember-cli.js
@@ -25,7 +25,8 @@ document.addEventListener("discourse-booted", () => {
   }
 
   const params = new URLSearchParams(window.location.search);
-  const skipCore = params.get("qunit_skip_core") === "1";
+  const target = params.get("target");
+  const testingCore = !target || target === "core";
   const disableAutoStart = params.get("qunit_disable_auto_start") === "1";
 
   Ember.ENV.LOG_STACKTRACE_ON_DEPRECATION = false;
@@ -60,7 +61,7 @@ document.addEventListener("discourse-booted", () => {
     setupTestContainer: false,
     loadTests: false,
     startTests: !disableAutoStart,
-    setupEmberOnerrorValidation: !skipCore,
+    setupEmberOnerrorValidation: testingCore,
     setupTestIsolationValidation: true,
   });
 });
diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/admin-customize-themes-show-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/admin-customize-themes-show-test.js
index 8de26d68855..9f929804391 100644
--- a/app/assets/javascripts/discourse/tests/unit/controllers/admin-customize-themes-show-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/controllers/admin-customize-themes-show-test.js
@@ -50,4 +50,40 @@ module("Unit | Controller | admin-customize-themes-show", function (hooks) {
       "returns theme's repo URL to branch"
     );
   });
+
+  test("displays settings editor button with settings", function (assert) {
+    const theme = Theme.create({
+      id: 2,
+      default: true,
+      name: "default",
+      settings: [{}],
+    });
+    const controller = this.owner.lookup(
+      "controller:admin-customize-themes-show"
+    );
+    controller.setProperties({ model: theme });
+    assert.deepEqual(
+      controller.hasSettings,
+      true,
+      "sets the hasSettings property to true with settings"
+    );
+  });
+
+  test("hides settings editor button with no settings", function (assert) {
+    const theme = Theme.create({
+      id: 2,
+      default: true,
+      name: "default",
+      settings: [],
+    });
+    const controller = this.owner.lookup(
+      "controller:admin-customize-themes-show"
+    );
+    controller.setProperties({ model: theme });
+    assert.deepEqual(
+      controller.hasSettings,
+      false,
+      "sets the hasSettings property to true with settings"
+    );
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/admin-site-settings-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/admin-site-settings-test.js
new file mode 100644
index 00000000000..f4f7c159884
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/unit/controllers/admin-site-settings-test.js
@@ -0,0 +1,42 @@
+import { module, test } from "qunit";
+import { setupTest } from "ember-qunit";
+import SiteSetting from "admin/models/site-setting";
+
+module("Unit | Controller | admin-site-settings", function (hooks) {
+  setupTest(hooks);
+
+  test("can perform fuzzy search", async function (assert) {
+    const controller = this.owner.lookup("controller:admin-site-settings");
+    const settings = await SiteSetting.findAll();
+
+    let results = controller.performSearch("top_menu", settings);
+    assert.deepEqual(results[0].siteSettings.length, 1);
+
+    results = controller.performSearch("tmenu", settings);
+    assert.deepEqual(results[0].siteSettings.length, 1);
+
+    const settings2 = [
+      {
+        name: "Required",
+        nameKey: "required",
+        siteSettings: [
+          SiteSetting.create({
+            description: "",
+            value: "",
+            setting: "hpello world",
+          }),
+          SiteSetting.create({
+            description: "",
+            value: "",
+            setting: "hello world",
+          }),
+        ],
+      },
+    ];
+
+    results = controller.performSearch("hello world", settings2);
+    assert.deepEqual(results[0].siteSettings.length, 2);
+    // ensures hello world shows up before fuzzy hpello world
+    assert.deepEqual(results[0].siteSettings[0].setting, "hello world");
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/history-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/history-test.js
deleted file mode 100644
index cb3670e43de..00000000000
--- a/app/assets/javascripts/discourse/tests/unit/controllers/history-test.js
+++ /dev/null
@@ -1,120 +0,0 @@
-import { module, test } from "qunit";
-import { setupTest } from "ember-qunit";
-
-module("Unit | Controller | history", function (hooks) {
-  setupTest(hooks);
-
-  test("displayEdit", async function (assert) {
-    const controller = this.owner.lookup("controller:history");
-
-    controller.setProperties({
-      model: { last_revision: 3, current_revision: 3, can_edit: false },
-      topicController: {},
-    });
-
-    assert.strictEqual(
-      controller.displayEdit,
-      false,
-      "it should not display edit button when user cannot edit the post"
-    );
-
-    controller.set("model.can_edit", true);
-
-    assert.strictEqual(
-      controller.displayEdit,
-      true,
-      "it should display edit button when user can edit the post"
-    );
-
-    controller.set("topicController", null);
-    assert.strictEqual(
-      controller.displayEdit,
-      false,
-      "it should not display edit button when there is not topic controller"
-    );
-    controller.set("topicController", {});
-
-    controller.set("model.current_revision", 2);
-    assert.strictEqual(
-      controller.displayEdit,
-      false,
-      "it should only display the edit button on the latest revision"
-    );
-
-    const html = `<div class="revision-content">
-    <p><img src="/uploads/default/original/1X/6b963ffc13cb0c053bbb90c92e99d4fe71b286ef.jpg" alt="" class="diff-del"><img/src=x onerror=alert(document.domain)>" width="276" height="183"></p>
-  </div>
-  <aside class="onebox allowlistedgeneric">
-    <header class="source">
-      <img src="/uploads/default/original/1X/1b0984d7ee08bce90572f46a1950e1ced436d028.png" class="site-icon" width="32" height="32">
-      <a href="https://meta.discourse.org/t/discourse-version-2-5/125302">Discourse Meta – 9 Aug 19</a>
-    </header>
-    <article class="onebox-body">
-      <img src="/uploads/default/optimized/1X/ecc92a52ee7353e03d5c0d1ea6521ce4541d9c25_2_500x500.png" class="thumbnail onebox-avatar d-lazyload" width="500" height="500">
-      <h3><a href="https://meta.discourse.org/t/discourse-version-2-5/125302" target="_blank">Discourse Version 2.5</a></h3>
-      <div style="clear: both"></div>
-    </article>
-  </aside>
-  <table background="javascript:alert(\"HACKEDXSS\")">
-    <thead>
-      <tr>
-        <th>Column</th>
-        <th style="text-align:left">Test</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td background="javascript:alert('HACKEDXSS')">Osama</td>
-        <td style="text-align:right">Testing</td>
-      </tr>
-    </tbody>
-  </table>`;
-
-    const expectedOutput = `<div class="revision-content">
-    <p><img src="/uploads/default/original/1X/6b963ffc13cb0c053bbb90c92e99d4fe71b286ef.jpg" alt class="diff-del">" width="276" height="183"&gt;</p>
-  </div>
-  <aside class="onebox allowlistedgeneric">
-    <header class="source">
-      <img src="/uploads/default/original/1X/1b0984d7ee08bce90572f46a1950e1ced436d028.png" class="site-icon" width="32" height="32">
-      <a href="https://meta.discourse.org/t/discourse-version-2-5/125302">Discourse Meta – 9 Aug 19</a>
-    </header>
-    <article class="onebox-body">
-      <img src="/uploads/default/optimized/1X/ecc92a52ee7353e03d5c0d1ea6521ce4541d9c25_2_500x500.png" class="thumbnail onebox-avatar d-lazyload" width="500" height="500">
-      <h3><a href="https://meta.discourse.org/t/discourse-version-2-5/125302" target="_blank">Discourse Version 2.5</a></h3>
-      <div style="clear: both"></div>
-    </article>
-  </aside>
-  <table>
-    <thead>
-      <tr>
-        <th>Column</th>
-        <th style="text-align:left">Test</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td>Osama</td>
-        <td style="text-align:right">Testing</td>
-      </tr>
-    </tbody>
-  </table>`;
-
-    controller.setProperties({
-      viewMode: "side_by_side",
-      model: {
-        body_changes: {
-          side_by_side: html,
-        },
-      },
-    });
-
-    await controller.bodyDiffChanged();
-
-    const output = controller.bodyDiff;
-    assert.strictEqual(
-      output,
-      expectedOutput,
-      "it keeps HTML safe and doesn't strip onebox tags"
-    );
-  });
-});
diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/user-notifications-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/user-notifications-test.js
index 7dca41ee75d..f408d41af5c 100644
--- a/app/assets/javascripts/discourse/tests/unit/controllers/user-notifications-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/controllers/user-notifications-test.js
@@ -3,9 +3,7 @@ import { setupTest } from "ember-qunit";
 import sinon from "sinon";
 import pretender, { response } from "discourse/tests/helpers/create-pretender";
 import EmberObject from "@ember/object";
-import * as showModal from "discourse/lib/show-modal";
 import User from "discourse/models/user";
-import I18n from "I18n";
 
 module("Unit | Controller | user-notifications", function (hooks) {
   setupTest(hooks);
@@ -58,29 +56,4 @@ module("Unit | Controller | user-notifications", function (hooks) {
 
     assert.strictEqual(markRead, true);
   });
-
-  test("Shows modal when has high priority notifications", function (assert) {
-    let capturedProperties;
-    sinon
-      .stub(showModal, "default")
-      .withArgs("dismiss-notification-confirmation")
-      .returns({
-        setProperties: (properties) => (capturedProperties = properties),
-      });
-
-    const currentUser = User.create({ unread_high_priority_notifications: 1 });
-    const controller = this.owner.lookup("controller:user-notifications");
-    controller.setProperties({ currentUser });
-    const markReadFake = sinon.fake();
-    sinon.stub(controller, "markRead").callsFake(markReadFake);
-
-    controller.send("resetNew");
-
-    assert.strictEqual(
-      capturedProperties.confirmationMessage,
-      I18n.t("notifications.dismiss_confirmation.body.default", { count: 1 })
-    );
-    capturedProperties.dismissNotifications();
-    assert.strictEqual(markReadFake.callCount, 1);
-  });
 });
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/autocomplete-test.js b/app/assets/javascripts/discourse/tests/unit/lib/autocomplete-test.js
new file mode 100644
index 00000000000..eb33b62f11b
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/unit/lib/autocomplete-test.js
@@ -0,0 +1,259 @@
+import { module, test } from "qunit";
+import autocomplete from "discourse/lib/autocomplete";
+import { compile } from "handlebars";
+
+module("Unit | Utility | autocomplete", function (hooks) {
+  let elements = [];
+
+  function textArea(value) {
+    let element = document.createElement("TEXTAREA");
+    element.value = value;
+    document.getElementById("ember-testing").appendChild(element);
+    elements.push(element);
+    return element;
+  }
+
+  function cleanup() {
+    elements.forEach((e) => {
+      e.remove();
+      autocomplete.call($(e), { cancel: true });
+      autocomplete.call($(e), "destroy");
+    });
+    elements = [];
+  }
+
+  hooks.afterEach(function () {
+    cleanup();
+  });
+
+  function simulateKey(element, key) {
+    let keyCode = key.charCodeAt(0);
+
+    let bubbled = false;
+    let trackBubble = function () {
+      bubbled = true;
+    };
+
+    element.addEventListener("keydown", trackBubble);
+
+    let keyboardEvent = new KeyboardEvent("keydown", {
+      key,
+      keyCode,
+      which: keyCode,
+    });
+
+    element.dispatchEvent(keyboardEvent);
+
+    element.removeEventListener("keydown", trackBubble);
+
+    if (bubbled) {
+      let pos = element.selectionStart;
+      let value = element.value;
+      // backspace
+      if (key === "\b") {
+        element.value = value.slice(0, pos - 1) + value.slice(pos);
+        element.selectionStart = pos - 1;
+        element.selectionEnd = pos - 1;
+      } else {
+        element.value = value.slice(0, pos) + key + value.slice(pos);
+        element.selectionStart = pos + 1;
+        element.selectionEnd = pos + 1;
+      }
+    }
+
+    element.dispatchEvent(
+      new KeyboardEvent("keyup", { key, keyCode, which: keyCode })
+    );
+  }
+
+  test("Autocomplete can complete really short terms correctly", async function (assert) {
+    let element = textArea("");
+    let $element = $(element);
+
+    autocomplete.call($element, {
+      key: ":",
+      transformComplete: () => "sad:",
+      dataSource: () => [":sad:"],
+      template: compile(`<div id='ac-testing' class='autocomplete ac-test'>
+  <ul>
+    {{#each options as |option|}}
+      <li>
+        <a href>
+          {{option}}
+        </a>
+      </li>
+    {{/each}}
+  </ul>
+</div>`),
+    });
+
+    simulateKey(element, "a");
+    simulateKey(element, " ");
+
+    simulateKey(element, ":");
+    simulateKey(element, ")");
+    simulateKey(element, "\r");
+
+    let sleep = (millisecs) =>
+      new Promise((promise) => setTimeout(promise, millisecs));
+    // completeTerm awaits transformComplete
+    // we need to wait for it to be done
+    // Note: this is somewhat questionable given that when people
+    // press ENTER on an autocomplete they do not want to be beholden
+    // to an async function.
+    let inputEquals = async function (value) {
+      let count = 3000;
+      while (count > 0 && element.value !== value) {
+        count -= 1;
+        await sleep(1);
+      }
+    };
+
+    await inputEquals("a :sad: ");
+    assert.strictEqual(element.value, "a :sad: ");
+    assert.strictEqual(element.selectionStart, 8);
+    assert.strictEqual(element.selectionEnd, 8);
+  });
+
+  test("Autocomplete can account for cursor drift correctly", function (assert) {
+    let element = textArea("");
+    let $element = $(element);
+
+    autocomplete.call($element, {
+      key: "@",
+      dataSource: (term) =>
+        ["test1", "test2"].filter((word) => word.includes(term)),
+      template: compile(`<div id='ac-testing' class='autocomplete ac-test'>
+  <ul>
+    {{#each options as |option|}}
+      <li>
+        <a href>
+          {{option}}
+        </a>
+      </li>
+    {{/each}}
+  </ul>
+</div>`),
+    });
+
+    simulateKey(element, "@");
+    simulateKey(element, "\r");
+
+    assert.strictEqual(element.value, "@test1 ");
+    assert.strictEqual(element.selectionStart, 7);
+    assert.strictEqual(element.selectionEnd, 7);
+
+    simulateKey(element, "@");
+    simulateKey(element, "2");
+    simulateKey(element, "\r");
+
+    assert.strictEqual(element.value, "@test1 @test2 ");
+    assert.strictEqual(element.selectionStart, 14);
+    assert.strictEqual(element.selectionEnd, 14);
+
+    element.selectionStart = 6;
+    element.selectionEnd = 6;
+
+    simulateKey(element, "\b");
+    simulateKey(element, "\b");
+    simulateKey(element, "\r");
+
+    assert.strictEqual(element.value, "@test1 @test2 ");
+    assert.strictEqual(element.selectionStart, 7);
+    assert.strictEqual(element.selectionEnd, 7);
+
+    // lets see that deleting last space triggers autocomplete
+    element.selectionStart = element.value.length;
+    element.selectionEnd = element.value.length;
+    simulateKey(element, "\b");
+    let list = document.querySelectorAll("#ac-testing ul li");
+    assert.strictEqual(list.length, 1);
+
+    simulateKey(element, "\b");
+    list = document.querySelectorAll("#ac-testing ul li");
+    assert.strictEqual(list.length, 2);
+
+    // close autocomplete
+    simulateKey(element, "\r");
+
+    // does not trigger by mistake at the start
+    element.value = "test";
+    element.selectionStart = element.value.length;
+    element.selectionEnd = element.value.length;
+
+    simulateKey(element, "\b");
+    list = document.querySelectorAll("#ac-testing ul li");
+    assert.strictEqual(list.length, 0);
+  });
+
+  test("Autocomplete can handle spaces", function (assert) {
+    let element = textArea("");
+    let $element = $(element);
+
+    autocomplete.call($element, {
+      key: "@",
+      dataSource: (term) =>
+        [
+          { username: "jd", name: "jane dale" },
+          { username: "jb", name: "jack black" },
+        ]
+          .filter((user) => {
+            return user.username.includes(term) || user.name.includes(term);
+          })
+          .map((user) => user.username),
+      template: compile(`<div id='ac-testing' class='autocomplete ac-test'>
+  <ul>
+    {{#each options as |option|}}
+      <li>
+        <a href>
+          {{option}}
+        </a>
+      </li>
+    {{/each}}
+  </ul>
+</div>`),
+    });
+
+    simulateKey(element, "@");
+    simulateKey(element, "j");
+    simulateKey(element, "a");
+    simulateKey(element, "n");
+    simulateKey(element, "e");
+    simulateKey(element, " ");
+    simulateKey(element, "d");
+    simulateKey(element, "\r");
+
+    assert.strictEqual(element.value, "@jd ");
+  });
+
+  test("Autocomplete can render on @", function (assert) {
+    let element = textArea("@");
+    let $element = $(element);
+
+    autocomplete.call($element, {
+      key: "@",
+      dataSource: () => ["test1", "test2"],
+      template: compile(`<div id='ac-testing' class='autocomplete ac-test'>
+  <ul>
+    {{#each options as |option|}}
+      <li>
+        <a href>
+          {{option}}
+        </a>
+      </li>
+    {{/each}}
+  </ul>
+</div>`),
+    });
+
+    element.dispatchEvent(new KeyboardEvent("keydown", { key: "@" }));
+    element.dispatchEvent(new KeyboardEvent("keyup", { key: "@" }));
+
+    let list = document.querySelectorAll("#ac-testing ul li");
+    assert.strictEqual(2, list.length);
+
+    let selected = document.querySelectorAll("#ac-testing ul li a.selected");
+    assert.strictEqual(1, selected.length);
+    assert.strictEqual("test1", selected[0].innerText);
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/avatar-utils-test.js b/app/assets/javascripts/discourse/tests/unit/lib/avatar-utils-test.js
new file mode 100644
index 00000000000..8020a9f7149
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/unit/lib/avatar-utils-test.js
@@ -0,0 +1,93 @@
+import {
+  avatarImg,
+  avatarUrl,
+  getRawAvatarSize,
+} from "discourse-common/lib/avatar-utils";
+import { module, test } from "qunit";
+import { setupURL } from "discourse-common/lib/get-url";
+import { setupTest } from "ember-qunit";
+
+module("Unit | Utilities", function (hooks) {
+  setupTest(hooks);
+
+  test("getRawAvatarSize avoids redirects", function (assert) {
+    assert.strictEqual(
+      getRawAvatarSize(1),
+      24,
+      "returns the first size larger on the menu"
+    );
+
+    assert.strictEqual(getRawAvatarSize(2000), 288, "caps at highest");
+  });
+
+  test("avatarUrl", function (assert) {
+    assert.blank(avatarUrl("", "tiny"), "no template returns blank");
+    assert.strictEqual(
+      avatarUrl("/fake/template/{size}.png", "tiny"),
+      "/fake/template/" + getRawAvatarSize(24) + ".png",
+      "simple avatar url"
+    );
+    assert.strictEqual(
+      avatarUrl("/fake/template/{size}.png", "large"),
+      "/fake/template/" + getRawAvatarSize(48) + ".png",
+      "different size"
+    );
+
+    setupURL("https://app-cdn.example.com", "https://example.com", "");
+
+    assert.strictEqual(
+      avatarUrl("/fake/template/{size}.png", "large"),
+      "https://app-cdn.example.com/fake/template/" +
+        getRawAvatarSize(48) +
+        ".png",
+      "uses CDN if present"
+    );
+  });
+
+  let setDevicePixelRatio = function (value) {
+    if (Object.defineProperty && !window.hasOwnProperty("devicePixelRatio")) {
+      Object.defineProperty(window, "devicePixelRatio", { value: 2 });
+    } else {
+      window.devicePixelRatio = value;
+    }
+  };
+
+  test("avatarImg", function (assert) {
+    let oldRatio = window.devicePixelRatio;
+    setDevicePixelRatio(2);
+
+    let avatarTemplate = "/path/to/avatar/{size}.png";
+    assert.strictEqual(
+      avatarImg({ avatarTemplate, size: "tiny" }),
+      "<img loading='lazy' alt='' width='24' height='24' src='/path/to/avatar/48.png' class='avatar'>",
+      "it returns the avatar html"
+    );
+
+    assert.strictEqual(
+      avatarImg({
+        avatarTemplate,
+        size: "tiny",
+        title: "evilest trout",
+      }),
+      "<img loading='lazy' alt='' width='24' height='24' src='/path/to/avatar/48.png' class='avatar' title='evilest trout' aria-label='evilest trout'>",
+      "it adds a title if supplied"
+    );
+
+    assert.strictEqual(
+      avatarImg({
+        avatarTemplate,
+        size: "tiny",
+        extraClasses: "evil fish",
+      }),
+      "<img loading='lazy' alt='' width='24' height='24' src='/path/to/avatar/48.png' class='avatar evil fish'>",
+      "it adds extra classes if supplied"
+    );
+
+    assert.blank(
+      avatarImg({ avatarTemplate: "", size: "tiny" }),
+      "it doesn't render avatars for invalid avatar template"
+    );
+
+    setDevicePixelRatio(oldRatio);
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/build-quote-test.js b/app/assets/javascripts/discourse/tests/unit/lib/build-quote-test.js
new file mode 100644
index 00000000000..fc742da9cdd
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/unit/lib/build-quote-test.js
@@ -0,0 +1,82 @@
+import { module, test } from "qunit";
+import { setupTest } from "ember-qunit";
+import { getOwner } from "discourse-common/lib/get-owner";
+import { buildQuote } from "discourse/lib/quote";
+import PrettyText from "pretty-text/pretty-text";
+
+module("Unit | Utility | build-quote", function (hooks) {
+  setupTest(hooks);
+
+  test("quotes", function (assert) {
+    const store = getOwner(this).lookup("service:store");
+    const post = store.createRecord("post", {
+      cooked: "<p><b>lorem</b> ipsum</p>",
+      username: "eviltrout",
+      post_number: 1,
+      topic_id: 2,
+    });
+
+    assert.strictEqual(
+      buildQuote(post, undefined),
+      "",
+      "empty string for undefined content"
+    );
+    assert.strictEqual(
+      buildQuote(post, null),
+      "",
+      "empty string for null content"
+    );
+    assert.strictEqual(
+      buildQuote(post, ""),
+      "",
+      "empty string for empty string content"
+    );
+
+    assert.strictEqual(
+      buildQuote(post, "lorem"),
+      '[quote="eviltrout, post:1, topic:2"]\nlorem\n[/quote]\n\n',
+      "correctly formats quotes"
+    );
+
+    assert.strictEqual(
+      buildQuote(post, "  lorem \t  "),
+      '[quote="eviltrout, post:1, topic:2"]\nlorem\n[/quote]\n\n',
+      "trims white spaces before & after the quoted contents"
+    );
+
+    assert.strictEqual(
+      buildQuote(post, "lorem ipsum", { full: true }),
+      '[quote="eviltrout, post:1, topic:2, full:true"]\nlorem ipsum\n[/quote]\n\n',
+      "marks quotes as full if the `full` option is passed"
+    );
+
+    assert.strictEqual(
+      buildQuote(post, "**lorem** ipsum"),
+      '[quote="eviltrout, post:1, topic:2"]\n**lorem** ipsum\n[/quote]\n\n',
+      "keeps BBCode formatting"
+    );
+  });
+
+  test("quoting a quote", function (assert) {
+    const store = getOwner(this).lookup("service:store");
+    const post = store.createRecord("post", {
+      cooked: new PrettyText().cook(
+        '[quote="sam, post:1, topic:1, full:true"]\nhello\n[/quote]\n*Test*'
+      ),
+      username: "eviltrout",
+      post_number: 1,
+      topic_id: 2,
+    });
+
+    const quote = buildQuote(
+      post,
+      '[quote="sam, post:1, topic:1, full:true"]\nhello\n[/quote]'
+    );
+
+    assert.strictEqual(
+      quote,
+      '[quote="eviltrout, post:1, topic:2"]\n[quote="sam, post:1, topic:1, full:true"]\nhello\n[/quote]\n[/quote]\n\n',
+      "allows quoting a quote"
+    );
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/columns-test.js b/app/assets/javascripts/discourse/tests/unit/lib/columns-test.js
new file mode 100644
index 00000000000..59fa6985675
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/unit/lib/columns-test.js
@@ -0,0 +1,154 @@
+import { module, test } from "qunit";
+import Columns from "discourse/lib/columns";
+
+module("Unit | Columns", function (hooks) {
+  hooks.afterEach(function () {
+    document.getElementById("qunit-fixture").innerHTML = "";
+  });
+
+  test("works", function (assert) {
+    document.getElementById(
+      "qunit-fixture"
+    ).innerHTML = `<div class="d-image-grid">
+<p><img src="/images/avatar.png" alt role="presentation"><br>
+<img src="/images/avatar.png" alt role="presentation"><br>
+<img src="/images/avatar.png" alt role="presentation"></p>
+</div>`;
+
+    const grid = document.querySelector(".d-image-grid");
+    const cols = new Columns(grid);
+    assert.strictEqual(cols.items.length, 3);
+
+    assert.strictEqual(
+      grid.dataset.columns,
+      "3",
+      "column count attribute is correct"
+    );
+
+    assert.strictEqual(
+      document.querySelectorAll(".d-image-grid > .d-image-grid-column").length,
+      3,
+      "three column elements are rendered"
+    );
+  });
+
+  test("disabled if items < minCount", function (assert) {
+    document.getElementById(
+      "qunit-fixture"
+    ).innerHTML = `<div class="d-image-grid">
+<p><img src="/images/avatar.png" alt role="presentation"><br>
+<img src="/images/avatar.png" alt role="presentation"></p>
+</div>`;
+
+    const grid = document.querySelector(".d-image-grid");
+    const cols = new Columns(grid, { minCount: 3 });
+
+    assert.strictEqual(cols.items.length, 2);
+
+    assert.strictEqual(
+      grid.dataset.disabled,
+      "true",
+      "disabled attribute is added"
+    );
+    assert.strictEqual(
+      document.querySelectorAll(".d-image-grid > .d-image-grid-column").length,
+      0,
+      "no column elements are rendered"
+    );
+  });
+
+  test("4 items shown in 2x2 grid", function (assert) {
+    document.getElementById(
+      "qunit-fixture"
+    ).innerHTML = `<div class="d-image-grid">
+<img src="/images/avatar.png" width="20" height="20" role="presentation">
+<img src="/images/avatar.png" width="20" height="20" role="presentation">
+<img src="/images/avatar.png" width="20" height="20" role="presentation">
+<img src="/images/avatar.png" width="20" height="20" role="presentation">
+</div>`;
+
+    const grid = document.querySelector(".d-image-grid");
+    const cols = new Columns(grid);
+
+    assert.strictEqual(cols.items.length, 4);
+    assert.strictEqual(
+      grid.dataset.columns,
+      "2",
+      "column count attribute is correct"
+    );
+    assert.strictEqual(
+      document.querySelectorAll(".d-image-grid > .d-image-grid-column").length,
+      2,
+      "two columns are rendered"
+    );
+
+    assert.strictEqual(
+      document.querySelectorAll(
+        ".d-image-grid > .d-image-grid-column:first-child .image-wrapper"
+      ).length,
+      2,
+      "two images in column 1"
+    );
+
+    assert.strictEqual(
+      document.querySelectorAll(
+        ".d-image-grid > .d-image-grid-column:nth-child(2) .image-wrapper"
+      ).length,
+      2,
+      "two images in column 2"
+    );
+  });
+
+  test("non-image elements", function (assert) {
+    document.getElementById(
+      "qunit-fixture"
+    ).innerHTML = `<div class="d-image-grid">
+<img src="/images/avatar.png" width="20" height="20" role="presentation">
+<img src="/images/avatar.png" width="20" height="20" role="presentation">
+<img src="/images/avatar.png" width="20" height="20" role="presentation">
+<div style="width: 20px; height: 20px; background-color: red;">hey there</div>
+<div style="width: 20px; height: 20px; background-color: red;">hey there</div>
+</div>`;
+
+    const grid = document.querySelector(".d-image-grid");
+    const cols = new Columns(grid);
+
+    assert.strictEqual(cols.items.length, 5);
+    assert.strictEqual(cols.container, grid);
+
+    assert.strictEqual(
+      grid.dataset.columns,
+      "3",
+      "column count attribute is correct"
+    );
+    assert.strictEqual(
+      document.querySelectorAll(".d-image-grid > .d-image-grid-column").length,
+      3,
+      "three columns are rendered"
+    );
+
+    assert.strictEqual(
+      document.querySelectorAll(
+        ".d-image-grid > .d-image-grid-column:first-child > *"
+      ).length,
+      2,
+      "two elements in column 1"
+    );
+
+    assert.strictEqual(
+      document.querySelectorAll(
+        ".d-image-grid > .d-image-grid-column:nth-child(2) > *"
+      ).length,
+      2,
+      "two elements in column 2"
+    );
+
+    assert.strictEqual(
+      document.querySelectorAll(
+        ".d-image-grid > .d-image-grid-column:nth-child(3) > *"
+      ).length,
+      1,
+      "one element in column 3"
+    );
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/deprecated-test.js b/app/assets/javascripts/discourse/tests/unit/lib/deprecated-test.js
index a6dd4aece1f..1b53cbb2ac4 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/deprecated-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/deprecated-test.js
@@ -3,12 +3,17 @@ import {
   withSilencedDeprecations,
   withSilencedDeprecationsAsync,
 } from "discourse-common/lib/deprecated";
+import {
+  disableRaiseOnDeprecation,
+  enableRaiseOnDeprecation,
+} from "discourse/tests/helpers/raise-on-deprecation";
 import DeprecationCounter from "discourse/tests/helpers/deprecation-counter";
 import { module, test } from "qunit";
 import Sinon from "sinon";
 
 module("Unit | Utility | deprecated", function (hooks) {
   hooks.beforeEach(function () {
+    disableRaiseOnDeprecation();
     this.warnStub = Sinon.stub(console, "warn");
     this.counterStub = Sinon.stub(
       DeprecationCounter.prototype,
@@ -16,6 +21,10 @@ module("Unit | Utility | deprecated", function (hooks) {
     );
   });
 
+  hooks.afterEach(() => {
+    enableRaiseOnDeprecation();
+  });
+
   test("works with just a message", function (assert) {
     deprecated("My message");
     assert.strictEqual(
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/formatter-test.js b/app/assets/javascripts/discourse/tests/unit/lib/formatter-test.js
index 1b632c30f04..cda9778eb08 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/formatter-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/formatter-test.js
@@ -260,6 +260,9 @@ module("Unit | Utility | formatter", function (hooks) {
     assert.strictEqual(elem.dataset.time, d.getTime().toString());
     assert.strictEqual(elem.title, "");
     assert.strictEqual(elem.innerHTML, "1 day");
+
+    elem = domFromString(autoUpdatingRelativeAge(d, { prefix: "test" }))[0];
+    assert.strictEqual(elem.innerHTML, "test 1d");
   });
 
   test("updateRelativeAge", function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/get-url-test.js b/app/assets/javascripts/discourse/tests/unit/lib/get-url-test.js
index 25553f9fe17..1ec66aaf1a0 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/get-url-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/get-url-test.js
@@ -172,4 +172,12 @@ module("Unit | Utility | get-url", function () {
 
     assert.strictEqual(getURLWithCDN(url), expected, "at correct path");
   });
+
+  test("getURLWithCDN when URL includes protocol", function (assert) {
+    setupS3CDN("//awesome.cdn/site", "https://awesome.cdn/site");
+
+    let url = "https://awesome.cdn/site/awesome.png";
+
+    assert.strictEqual(getURLWithCDN(url), url, "at correct path");
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/i18n-test.js b/app/assets/javascripts/discourse/tests/unit/lib/i18n-test.js
index 8deb904b152..4746fad0121 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/i18n-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/i18n-test.js
@@ -1,5 +1,6 @@
 import { module, test } from "qunit";
 import I18n from "I18n";
+import { withSilencedDeprecations } from "discourse-common/lib/deprecated";
 
 module("Unit | Utility | i18n", function (hooks) {
   hooks.beforeEach(function () {
@@ -288,4 +289,11 @@ module("Unit | Utility | i18n", function (hooks) {
       "customtest"
     );
   });
+
+  test("legacy require support", function (assert) {
+    withSilencedDeprecations("discourse.i18n-t-import", () => {
+      const myI18n = require("I18n");
+      assert.strictEqual(myI18n.t("topic.reply.title"), "Répondre");
+    });
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/lightbox/helpers/create-download-link-test.js b/app/assets/javascripts/discourse/tests/unit/lib/lightbox/helpers/create-download-link-test.js
new file mode 100644
index 00000000000..60bad9d3034
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/unit/lib/lightbox/helpers/create-download-link-test.js
@@ -0,0 +1,43 @@
+import { module, test } from "qunit";
+
+import { createDownloadLink } from "discourse/lib/lightbox/helpers";
+import sinon from "sinon";
+
+module(
+  "Unit | lib | Experimental Lightbox | Helpers | createDownloadLink()",
+  function () {
+    test("creates a download link with the correct href and download attributes", async function (assert) {
+      const lightboxItem = {
+        downloadURL: "http://example.com/download.jpg",
+        title: "image.jpg",
+      };
+      const createElementSpy = sinon.spy(document, "createElement");
+      const clickStub = sinon.stub(HTMLAnchorElement.prototype, "click");
+
+      createDownloadLink(lightboxItem);
+
+      assert.strictEqual(
+        createElementSpy.calledWith("a"),
+        true,
+        "creates an anchor element"
+      );
+
+      assert.strictEqual(
+        createElementSpy.returnValues[0].href,
+        "http://example.com/download.jpg",
+        "sets the correct href attribute"
+      );
+
+      assert.strictEqual(
+        createElementSpy.returnValues[0].download,
+        "image.jpg",
+        "sets the correct download attribute"
+      );
+
+      assert.strictEqual(clickStub.called, true, "clicks the link element");
+
+      createElementSpy.restore();
+      clickStub.restore();
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/lightbox/helpers/find-nearest-shared-parent-test.js b/app/assets/javascripts/discourse/tests/unit/lib/lightbox/helpers/find-nearest-shared-parent-test.js
new file mode 100644
index 00000000000..d3f1d3e5f8e
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/unit/lib/lightbox/helpers/find-nearest-shared-parent-test.js
@@ -0,0 +1,28 @@
+import { module, test } from "qunit";
+
+import { findNearestSharedParent } from "discourse/lib/lightbox/helpers";
+
+module(
+  "Unit | lib | Experimental Lightbox | Helpers | findNearestSharedParent()",
+  function () {
+    test("it returns the nearest shared parent for the elements passed in", async function (assert) {
+      const element0 = document.createElement("div");
+      const element1 = document.createElement("div");
+      const element2 = document.createElement("div");
+      const element3 = document.createElement("div");
+      const element4 = document.createElement("div");
+
+      element1.appendChild(element2);
+      element3.appendChild(element4);
+
+      element0.appendChild(element1);
+      element0.appendChild(element3);
+
+      assert.strictEqual(
+        findNearestSharedParent([element2, element4]),
+        element0,
+        "returns the correct nearest shared parent"
+      );
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/lightbox/helpers/get-swipe-direction-test.js b/app/assets/javascripts/discourse/tests/unit/lib/lightbox/helpers/get-swipe-direction-test.js
new file mode 100644
index 00000000000..75f507ccea3
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/unit/lib/lightbox/helpers/get-swipe-direction-test.js
@@ -0,0 +1,66 @@
+import { module, test } from "qunit";
+
+import { SWIPE_DIRECTIONS } from "discourse/lib/lightbox/constants";
+import { getSwipeDirection } from "discourse/lib/lightbox/helpers";
+
+module(
+  "Unit | lib | Experimental Lightbox | Helpers | getSwipeDirection()",
+  function () {
+    test("returns the correct direction based on the difference between touchstart and touchend", function (assert) {
+      assert.strictEqual(
+        getSwipeDirection({
+          touchstartX: 200,
+          touchstartY: 0,
+          touchendX: 50,
+          touchendY: 0,
+        }),
+        SWIPE_DIRECTIONS.RIGHT,
+        "returns 'RIGHT' for swipes with a large negative x-axis difference"
+      );
+
+      assert.strictEqual(
+        getSwipeDirection({
+          touchstartX: 50,
+          touchstartY: 0,
+          touchendX: 200,
+          touchendY: 0,
+        }),
+        SWIPE_DIRECTIONS.LEFT,
+        "returns 'LEFT' for swipes with a large positive x-axis difference"
+      );
+
+      assert.strictEqual(
+        getSwipeDirection({
+          touchstartX: 0,
+          touchstartY: 200,
+          touchendX: 0,
+          touchendY: 50,
+        }),
+        SWIPE_DIRECTIONS.UP,
+        "returns 'UP' for swipes with a large negative y-axis difference"
+      );
+
+      assert.strictEqual(
+        getSwipeDirection({
+          touchstartX: 0,
+          touchstartY: 50,
+          touchendX: 0,
+          touchendY: 200,
+        }),
+        SWIPE_DIRECTIONS.DOWN,
+        "returns 'DOWN' for swipes with a large positive y-axis difference"
+      );
+
+      assert.strictEqual(
+        getSwipeDirection({
+          touchstartX: 50,
+          touchstartY: 50,
+          touchendX: 49,
+          touchendY: 49,
+        }),
+        false,
+        "returns 'false' for swipes with a small x-axis difference and a small y-axis difference"
+      );
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/lightbox/helpers/open-image-in-new-tab-test.js b/app/assets/javascripts/discourse/tests/unit/lib/lightbox/helpers/open-image-in-new-tab-test.js
new file mode 100644
index 00000000000..ebfdd45e97c
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/unit/lib/lightbox/helpers/open-image-in-new-tab-test.js
@@ -0,0 +1,47 @@
+import { module, test } from "qunit";
+
+import { openImageInNewTab } from "discourse/lib/lightbox/helpers";
+import sinon from "sinon";
+
+module(
+  "Unit | lib | Experimental Lightbox | Helpers | openImageinNewTab()",
+  function () {
+    test("opens the fullsize URL of the lightbox item in a new tab", async function (assert) {
+      const lightboxItem = {
+        fullsizeURL: "image.jpg",
+      };
+
+      const openStub = sinon.stub(window, "open");
+
+      await openImageInNewTab(lightboxItem);
+
+      assert.strictEqual(
+        openStub.calledWith("image.jpg", "_blank"),
+        true,
+        "calls window.open with the correct arguments"
+      );
+
+      openStub.restore();
+    });
+
+    test("handles errors when trying to open the new tab", async function (assert) {
+      const lightboxItem = {
+        fullsizeURL: "image.jpg",
+      };
+
+      const openStub = sinon.stub(window, "open").throws();
+      const consoleErrorStub = sinon.stub(console, "error");
+
+      await openImageInNewTab(lightboxItem);
+
+      assert.strictEqual(
+        consoleErrorStub.called,
+        true,
+        "logs an error to the console"
+      );
+
+      openStub.restore();
+      consoleErrorStub.restore();
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/lightbox/helpers/preload-item-images-test.js b/app/assets/javascripts/discourse/tests/unit/lib/lightbox/helpers/preload-item-images-test.js
new file mode 100644
index 00000000000..78b40128486
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/unit/lib/lightbox/helpers/preload-item-images-test.js
@@ -0,0 +1,78 @@
+import {
+  LIGHTBOX_IMAGE_FIXTURES,
+  generateLightboxObject,
+} from "discourse/tests/helpers/lightbox-helpers";
+import { module, test } from "qunit";
+
+import { cloneJSON } from "discourse-common/lib/object";
+import { preloadItemImages } from "discourse/lib/lightbox/helpers";
+
+module(
+  "Unit | lib | Experimental Lightbox | Helpers | preloadItemImages()",
+
+  function () {
+    const baseLightboxItem = generateLightboxObject().items[0];
+
+    test("returns the correct object", async function (assert) {
+      const lightboxItem = cloneJSON(baseLightboxItem);
+
+      const result = await preloadItemImages(lightboxItem);
+
+      assert.ok(result.isLoaded, "isLoaded should be true");
+
+      assert.ok(!result.hasLoadingError, "hasLoadingError should be false");
+
+      assert.strictEqual(
+        result.width,
+        LIGHTBOX_IMAGE_FIXTURES.first.width,
+        "width should be equal to fullsizeImage width"
+      );
+
+      assert.strictEqual(
+        result.height,
+        LIGHTBOX_IMAGE_FIXTURES.first.height,
+        "height should be equal to fullsizeImage height"
+      );
+
+      assert.strictEqual(
+        result.aspectRatio,
+        LIGHTBOX_IMAGE_FIXTURES.first.aspectRatio,
+        "aspectRatio should be equal to image width/height"
+      );
+
+      assert.ok(
+        result.canZoom,
+        "canZoom should be true if fullsizeImage width or height is greater than window inner width or height"
+      );
+    });
+
+    test("handles errors", async function (assert) {
+      const lightboxItem = cloneJSON(baseLightboxItem);
+
+      lightboxItem.fullsizeURL =
+        LIGHTBOX_IMAGE_FIXTURES.invalidImage.fullsizeURL;
+
+      const result = await preloadItemImages(lightboxItem);
+
+      assert.strictEqual(
+        result.hasLoadingError,
+        true,
+        "sets hasLoadingError to true if there is an error"
+      );
+    });
+
+    test("handles images smaller than the viewport", async function (assert) {
+      const lightboxItem = cloneJSON(baseLightboxItem);
+
+      lightboxItem.fullsizeURL =
+        LIGHTBOX_IMAGE_FIXTURES.smallerThanViewPort.fullsizeURL;
+
+      const result = await preloadItemImages(lightboxItem);
+
+      assert.notOk(
+        result.canZoom,
+        "canZoom should be false if fullsizeImage width or height is smaller than window inner width or height"
+      );
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/lightbox/helpers/scroll-parent-to-element-to-center-test.js b/app/assets/javascripts/discourse/tests/unit/lib/lightbox/helpers/scroll-parent-to-element-to-center-test.js
new file mode 100644
index 00000000000..2078b3ecfeb
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/unit/lib/lightbox/helpers/scroll-parent-to-element-to-center-test.js
@@ -0,0 +1,51 @@
+import { module, test } from "qunit";
+
+import { scrollParentToElementCenter } from "discourse/lib/lightbox/helpers";
+
+module(
+  "Unit | lib | Experimental Lightbox | Helpers | scrollParentToElementCenter()",
+  function () {
+    test("scrolls the parent element to the center of the element", async function (assert) {
+      const parent = document.createElement("div");
+      parent.style.width = "200px";
+      parent.style.height = "200px";
+      parent.style.overflow = "scroll";
+
+      const element = document.createElement("div");
+      element.style.width = "400px";
+      element.style.height = "400px";
+      parent.appendChild(element);
+
+      document.body.appendChild(parent);
+
+      const getExpectedX = (element.offsetWidth - parent.offsetWidth) / 2;
+      const expectedY = (element.offsetHeight - parent.offsetHeight) / 2;
+
+      scrollParentToElementCenter({ element, isRTL: false });
+
+      assert.strictEqual(
+        parent.scrollLeft,
+        getExpectedX,
+        "scrolls parent to center of element (LTR - horizontal)"
+      );
+
+      assert.strictEqual(
+        parent.scrollTop,
+        expectedY,
+        "scrolls parent to center of viewport (LTR and RTL - vertical)"
+      );
+
+      parent.style.direction = "rtl";
+
+      scrollParentToElementCenter({ element, isRTL: true });
+
+      assert.strictEqual(
+        parent.scrollLeft,
+        getExpectedX * -1,
+        "scrolls parent to center of viewport (RTL - horizontal)"
+      );
+
+      document.body.removeChild(parent);
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/lightbox/helpers/set-carousel-scroll-position-test.js b/app/assets/javascripts/discourse/tests/unit/lib/lightbox/helpers/set-carousel-scroll-position-test.js
new file mode 100644
index 00000000000..bdc05bcdcb5
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/unit/lib/lightbox/helpers/set-carousel-scroll-position-test.js
@@ -0,0 +1,76 @@
+import { module, test } from "qunit";
+
+import { setCarouselScrollPosition } from "discourse/lib/lightbox/helpers";
+
+module(
+  "Unit | lib | Experimental Lightbox | Helpers | setCarouselScrollPosition()",
+  function () {
+    const carouselItemSize = 100;
+    const target = 9;
+
+    const carousel = document.createElement("div");
+    carousel.style.cssText = `
+        display: grid;
+        height: 400px;
+        width: 400px;
+        overflow: auto;
+        position: relative;
+      `;
+
+    const carouselItem = document.createElement("div");
+    carouselItem.style.cssText = `
+      width: ${carouselItemSize}px;
+      height: ${carouselItemSize}px;
+      `;
+
+    Array(20)
+      .fill(null)
+      .map((_, index) => {
+        const item = carouselItem.cloneNode(true);
+        if (index === target) {
+          item.dataset.lightboxCarouselItem = "current";
+        }
+        carousel.appendChild(item);
+      });
+
+    const expected =
+      target * carouselItemSize - carouselItemSize - carouselItemSize / 2;
+
+    test("scrolls the carousel to the center of the active item ", async function (assert) {
+      const container = carousel.cloneNode(true);
+
+      container.style.cssText += `
+        grid-auto-flow: column;
+        grid-template-columns: repeat(auto, ${carouselItemSize}px);
+      `;
+
+      const fixtureDiv = document.getElementById("qunit-fixture");
+      fixtureDiv.appendChild(container);
+
+      await setCarouselScrollPosition("instant");
+
+      assert.strictEqual(
+        container.scrollLeft,
+        expected,
+        "scrolls carousel to center of active item (horizontal)"
+      );
+
+      container.style.cssText += `
+        grid-auto-flow: row;
+        grid-template-rows: repeat(auto, ${carouselItemSize}px);
+      `;
+
+      await setCarouselScrollPosition("instant");
+
+      assert.strictEqual(
+        container.scrollTop,
+        expected,
+        "scrolls carousel to center of active item (vertical)"
+      );
+    });
+
+    test("test scroll animation", async function (assert) {
+      assert.ok(true);
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/lightbox/helpers/site-theme-color-test.js b/app/assets/javascripts/discourse/tests/unit/lib/lightbox/helpers/site-theme-color-test.js
new file mode 100644
index 00000000000..8a4008bfc2d
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/unit/lib/lightbox/helpers/site-theme-color-test.js
@@ -0,0 +1,69 @@
+import {
+  getSiteThemeColor,
+  setSiteThemeColor,
+} from "discourse/lib/lightbox/helpers";
+import { module, test } from "qunit";
+
+import sinon from "sinon";
+
+module(
+  "Unit | lib | Experimental Lightbox | Helpers | getSiteThemeColor()",
+  function () {
+    test("gets the correct site theme color", async function (assert) {
+      const querySelectorSpy = sinon.spy(document, "querySelector");
+      const MetaSiteColorStub = sinon.stub(
+        HTMLMetaElement.prototype,
+        "content"
+      );
+
+      MetaSiteColorStub.value("#ff0000");
+
+      const themeColor = await getSiteThemeColor();
+
+      assert.strictEqual(
+        querySelectorSpy.calledWith('meta[name="theme-color"]'),
+        true,
+        "Queries the correct element"
+      );
+
+      assert.strictEqual(
+        themeColor,
+        "#ff0000",
+        "returns the correct theme color"
+      );
+
+      querySelectorSpy.restore();
+      MetaSiteColorStub.restore();
+    });
+
+    test("sets the site theme color correctly", async function (assert) {
+      const querySelectorSpy = sinon.spy(document, "querySelector");
+
+      await setSiteThemeColor("0000ff");
+
+      assert.strictEqual(
+        querySelectorSpy.calledWith('meta[name="theme-color"]'),
+        true,
+        "queries the correct element"
+      );
+
+      assert.strictEqual(
+        querySelectorSpy.returnValues[0].content,
+        "#0000ff",
+        "sets the correct theme color"
+      );
+
+      querySelectorSpy.restore();
+    });
+
+    test("invalid color given", async function (assert) {
+      await setSiteThemeColor("##0000ff");
+
+      assert.strictEqual(
+        document.querySelector('meta[name="theme-color"]').content,
+        "#0000ff",
+        "converts to a the correct theme color"
+      );
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/lightbox/process-html-test.js b/app/assets/javascripts/discourse/tests/unit/lib/lightbox/process-html-test.js
new file mode 100644
index 00000000000..d0eb3ddce2c
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/unit/lib/lightbox/process-html-test.js
@@ -0,0 +1,279 @@
+import {
+  LIGHTBOX_IMAGE_FIXTURES,
+  generateImageUploaderMarkup,
+  generateLightboxMarkup,
+} from "discourse/tests/helpers/lightbox-helpers";
+import { module, test } from "qunit";
+
+import { SELECTORS } from "discourse/lib/lightbox/constants";
+import domFromString from "discourse-common/lib/dom-from-string";
+import { processHTML } from "discourse/lib/lightbox/process-html";
+
+module("Unit | lib | Experimental lightbox | processHTML()", function () {
+  const wrap = domFromString(generateLightboxMarkup())[0];
+  const imageUploaderWrap = domFromString(generateImageUploaderMarkup())[0];
+  const selector = SELECTORS.DEFAULT_ITEM_SELECTOR;
+
+  test("returns the correct object from the proccessed element", async function (assert) {
+    const container = wrap.cloneNode(true);
+
+    const { items, startingIndex } = await processHTML({
+      container,
+      selector,
+    });
+
+    assert.strictEqual(items.length, 1);
+
+    const item = items[0];
+
+    assert.strictEqual(
+      item.fullsizeURL,
+      LIGHTBOX_IMAGE_FIXTURES.first.fullsizeURL
+    );
+
+    assert.strictEqual(item.smallURL, LIGHTBOX_IMAGE_FIXTURES.first.smallURL);
+
+    assert.strictEqual(
+      item.downloadURL,
+      LIGHTBOX_IMAGE_FIXTURES.first.downloadURL
+    );
+
+    assert.strictEqual(items[0].title, LIGHTBOX_IMAGE_FIXTURES.first.title);
+
+    assert.strictEqual(
+      item.fileDetails,
+      LIGHTBOX_IMAGE_FIXTURES.first.fileDetails
+    );
+
+    assert.strictEqual(
+      item.dominantColor,
+      LIGHTBOX_IMAGE_FIXTURES.first.dominantColor
+    );
+
+    assert.strictEqual(
+      item.aspectRatio,
+      LIGHTBOX_IMAGE_FIXTURES.first.aspectRatio
+    );
+
+    assert.strictEqual(item.index, LIGHTBOX_IMAGE_FIXTURES.first.index);
+
+    assert.strictEqual(
+      item.cssVars.string,
+      LIGHTBOX_IMAGE_FIXTURES.first.cssVars.string
+    );
+
+    assert.strictEqual(startingIndex, 0);
+  });
+
+  test("returns the correct number of items", async function (assert) {
+    const htmlString = generateLightboxMarkup().repeat(3);
+    const container = domFromString(htmlString);
+
+    const outer = document.createElement("div");
+    outer.append(...container);
+
+    const { items } = await processHTML({
+      container: outer,
+      selector,
+    });
+
+    assert.strictEqual(items.length, 3);
+  });
+
+  test("fallsback to src when no href is defined for fullsizeURL", async function (assert) {
+    const container = wrap.cloneNode(true);
+
+    container.querySelector("a").removeAttribute("href");
+
+    const { items } = await processHTML({
+      container,
+      selector,
+    });
+
+    assert.strictEqual(
+      items[0].fullsizeURL,
+      LIGHTBOX_IMAGE_FIXTURES.first.smallURL
+    );
+  });
+
+  test("handles title fallbacks", async function (assert) {
+    const container = wrap.cloneNode(true);
+
+    container.querySelector("a").removeAttribute("title");
+
+    let { items } = await processHTML({
+      container,
+      selector,
+    });
+
+    assert.strictEqual(items[0].title, LIGHTBOX_IMAGE_FIXTURES.first.title);
+
+    container.querySelector("img").removeAttribute("title");
+
+    ({ items } = await processHTML({
+      container,
+      selector,
+    }));
+
+    assert.strictEqual(items[0].title, LIGHTBOX_IMAGE_FIXTURES.first.alt);
+
+    container.querySelector("img").removeAttribute("alt");
+
+    ({ items } = await processHTML({
+      container,
+      selector,
+    }));
+
+    assert.strictEqual(items[0].title, "");
+  });
+
+  test("correctly escapes the title", async function (assert) {
+    const container = wrap.cloneNode(true);
+
+    container
+      .querySelector("a")
+      .setAttribute("title", `"><\x00script>javascript:alert(1)</script>`);
+
+    const { items } = await processHTML({
+      container,
+      selector,
+    });
+
+    assert.strictEqual(
+      items[0].title,
+      `&quot;&gt;&lt;\x00script&gt;javascript:alert(1)&lt;/script&gt;`
+    );
+  });
+
+  test("handles missing aspect ratio", async function (assert) {
+    const container = wrap.cloneNode(true);
+
+    container.querySelector("img").style.removeProperty("aspect-ratio");
+
+    const { items } = await processHTML({
+      container,
+      selector,
+    });
+
+    assert.strictEqual(items[0].aspectRatio, null);
+
+    assert.strictEqual(
+      items[0].cssVars.string,
+      `--dominant-color: #${LIGHTBOX_IMAGE_FIXTURES.first.dominantColor};--small-url: url(${LIGHTBOX_IMAGE_FIXTURES.first.smallURL});`
+    );
+  });
+
+  test("handles missing file details", async function (assert) {
+    const container = wrap.cloneNode(true);
+
+    container.querySelector(SELECTORS.FILE_DETAILS_CONTAINER).remove();
+
+    const { items } = await processHTML({
+      container,
+      selector,
+    });
+
+    assert.strictEqual(items[0].fileDetails, null);
+  });
+
+  test("handles missing dominant color", async function (assert) {
+    const container = wrap.cloneNode(true);
+
+    container.querySelector("img").removeAttribute("data-dominant-color");
+
+    const { items } = await processHTML({
+      container,
+      selector,
+    });
+
+    assert.strictEqual(items[0].dominantColor, null);
+
+    assert.strictEqual(
+      items[0].cssVars.string,
+      `--aspect-ratio: ${LIGHTBOX_IMAGE_FIXTURES.first.aspectRatio};--small-url: url(${LIGHTBOX_IMAGE_FIXTURES.first.smallURL});`
+    );
+  });
+
+  test("falls back to href when data-download is not defined", async function (assert) {
+    const container = wrap.cloneNode(true);
+
+    container.querySelector("a").removeAttribute("data-download-href");
+
+    const { items } = await processHTML({
+      container,
+      selector,
+    });
+
+    assert.strictEqual(
+      items[0].downloadURL,
+      LIGHTBOX_IMAGE_FIXTURES.first.fullsizeURL
+    );
+  });
+
+  test("handles missing selector", async function (assert) {
+    const container = wrap.cloneNode(true);
+
+    const { items } = await processHTML({
+      container,
+    });
+
+    assert.strictEqual(items.length, 1);
+  });
+
+  test("handles custom selector", async function (assert) {
+    const container = wrap.cloneNode(true);
+    container.querySelector("a").classList.add("custom-selector");
+
+    const { items } = await processHTML({
+      container,
+      selector: ".custom-selector",
+    });
+
+    assert.strictEqual(items.length, 1);
+  });
+
+  test("returns the correct object for image uploader components", async function (assert) {
+    const container = imageUploaderWrap.cloneNode(true);
+
+    const { items } = await processHTML({
+      container,
+      selector,
+    });
+
+    const item = items[0];
+
+    assert.strictEqual(items.length, 1);
+
+    assert.strictEqual(item.title, "");
+
+    assert.strictEqual(item.aspectRatio, null);
+
+    assert.strictEqual(item.dominantColor, null);
+
+    assert.strictEqual(item.fileDetails, "x");
+
+    assert.strictEqual(
+      item.downloadURL,
+      LIGHTBOX_IMAGE_FIXTURES.first.fullsizeURL
+    );
+
+    assert.strictEqual(
+      item.smallURL,
+      LIGHTBOX_IMAGE_FIXTURES.first.fullsizeURL
+    );
+
+    assert.strictEqual(
+      item.fullsizeURL,
+      LIGHTBOX_IMAGE_FIXTURES.first.fullsizeURL
+    );
+
+    assert.strictEqual(
+      item.cssVars.string,
+      `--small-url: url(${LIGHTBOX_IMAGE_FIXTURES.first.fullsizeURL});`
+    );
+  });
+
+  test("throws missing container error when no container / nodelist is passed", async function (assert) {
+    assert.rejects(processHTML({ selector }));
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/plugin-api-test.js b/app/assets/javascripts/discourse/tests/unit/lib/plugin-api-test.js
index 7465a51bb22..8b11b5552e7 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/plugin-api-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/plugin-api-test.js
@@ -87,4 +87,33 @@ module("Unit | Utility | plugin-api", function (hooks) {
     assert.strictEqual(thingy.keep, "hey!");
     assert.strictEqual(thingy.prop, "g'day");
   });
+
+  test("modifyClass works with getters", function (assert) {
+    let Base = EmberObject.extend({
+      get foo() {
+        throw new Error("base getter called");
+      },
+    });
+
+    getOwner(this).register("test-class:main", Base, {
+      instantiate: false,
+    });
+
+    // Performing this lookup triggers `factory._onLookup`. In DEBUG builds, that invokes injectedPropertyAssertion()
+    // https://github.com/emberjs/ember.js/blob/36505f1b42/packages/%40ember/-internals/runtime/lib/system/core_object.js#L1144-L1163
+    // Which in turn invokes `factory.proto()`.
+    // This puts things in a state which will trigger https://github.com/emberjs/ember.js/issues/18860 when a native getter is overridden.
+    withPluginApi("1.1.0", (api) => {
+      api.modifyClass("test-class:main", {
+        get foo() {
+          return "modified getter";
+        },
+      });
+    });
+
+    const obj = Base.create();
+    assert.true(true, "no error thrown while merging mixin with getter");
+
+    assert.strictEqual(obj.foo, "modified getter", "returns correct result");
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/pretty-text-test.js b/app/assets/javascripts/discourse/tests/unit/lib/pretty-text-test.js
index 8e6c8887e97..c909f43b9ac 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/pretty-text-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/pretty-text-test.js
@@ -4,12 +4,10 @@ import {
   deleteCachedInlineOnebox,
 } from "pretty-text/inline-oneboxer";
 import QUnit, { module, test } from "qunit";
-import { buildQuote } from "discourse/lib/quote";
 import { deepMerge } from "discourse-common/lib/object";
 import { extractDataAttribute } from "pretty-text/engines/discourse-markdown-it";
 import { registerEmoji } from "pretty-text/emoji";
 import { IMAGE_VERSION as v } from "pretty-text/emoji/version";
-import { getOwner } from "discourse-common/lib/get-owner";
 
 const rawOpts = {
   siteSettings: {
@@ -18,7 +16,7 @@ const rawOpts = {
     enable_mentions: true,
     emoji_set: "twitter",
     external_emoji_url: "",
-    highlighted_languages: "json|ruby|javascript",
+    highlighted_languages: "json|ruby|javascript|xml",
     default_code_lang: "auto",
     enable_markdown_linkify: true,
     markdown_linkify_tlds: "com",
@@ -440,6 +438,24 @@ eviltrout</p>
 </aside>`,
       "quote has group class"
     );
+
+    assert.cooked(
+      "[quote]\ntest\n[/quote]",
+      '<aside class="quote no-group">\n<blockquote>\n<p>test</p>\n</blockquote>\n</aside>',
+      "it supports quotes without params"
+    );
+
+    assert.cooked(
+      "[quote]\n*test*\n[/quote]",
+      '<aside class="quote no-group">\n<blockquote>\n<p><em>test</em></p>\n</blockquote>\n</aside>',
+      "it doesn't insert a new line for italics"
+    );
+
+    assert.cooked(
+      "[quote=,script='a'><script>alert('test');//':a]\n[/quote]",
+      '<aside class="quote no-group">\n<blockquote></blockquote>\n</aside>',
+      "It will not create a script tag within an attribute"
+    );
   });
 
   test("Incomplete quotes", function (assert) {
@@ -973,6 +989,24 @@ eviltrout</p>
       '<p><a href="http://discourse.org" data-bbcode="true">discourse</a></p>',
       "named links are properly parsed"
     );
+
+    assert.cooked(
+      "[url]https://discourse.org/path[/url]",
+      '<p><a href="https://discourse.org/path" data-bbcode="true">https://discourse.org/path</a></p>',
+      "paths are correctly handled"
+    );
+
+    assert.cooked(
+      "[url]discourse.org/path[/url]",
+      '<p><a href="https://discourse.org/path" data-bbcode="true">discourse.org/path</a></p>',
+      "paths are correctly handled"
+    );
+
+    assert.cooked(
+      "[url][b]discourse.org/path[/b][/url]",
+      '<p><a href="https://discourse.org/path" data-bbcode="true"><span class="bbcode-b">discourse.org/path</span></a></p>',
+      "paths are correctly handled"
+    );
   });
 
   test("images", function (assert) {
@@ -1200,7 +1234,7 @@ eviltrout</p>
     );
     assert.cookedPara(
       "[url]abc.com[/url]",
-      '<a href="http://abc.com">abc.com</a>',
+      '<a href="https://abc.com" data-bbcode="true">abc.com</a>',
       "it magically links using linkify"
     );
     assert.cookedPara(
@@ -1273,90 +1307,6 @@ eviltrout</p>
     );
   });
 
-  test("quotes", function (assert) {
-    const store = getOwner(this).lookup("service:store");
-    const post = store.createRecord("post", {
-      cooked: "<p><b>lorem</b> ipsum</p>",
-      username: "eviltrout",
-      post_number: 1,
-      topic_id: 2,
-    });
-
-    function formatQuote(val, expected, text, opts) {
-      assert.strictEqual(buildQuote(post, val, opts), expected, text);
-    }
-
-    formatQuote(undefined, "", "empty string for undefined content");
-    formatQuote(null, "", "empty string for null content");
-    formatQuote("", "", "empty string for empty string content");
-
-    formatQuote(
-      "lorem",
-      '[quote="eviltrout, post:1, topic:2"]\nlorem\n[/quote]\n\n',
-      "correctly formats quotes"
-    );
-
-    formatQuote(
-      "  lorem \t  ",
-      '[quote="eviltrout, post:1, topic:2"]\nlorem\n[/quote]\n\n',
-      "trims white spaces before & after the quoted contents"
-    );
-
-    formatQuote(
-      "lorem ipsum",
-      '[quote="eviltrout, post:1, topic:2, full:true"]\nlorem ipsum\n[/quote]\n\n',
-      "marks quotes as full if the `full` option is passed",
-      { full: true }
-    );
-
-    formatQuote(
-      "**lorem** ipsum",
-      '[quote="eviltrout, post:1, topic:2"]\n**lorem** ipsum\n[/quote]\n\n',
-      "keeps BBCode formatting"
-    );
-
-    assert.cooked(
-      "[quote]\ntest\n[/quote]",
-      '<aside class="quote no-group">\n<blockquote>\n<p>test</p>\n</blockquote>\n</aside>',
-      "it supports quotes without params"
-    );
-
-    assert.cooked(
-      "[quote]\n*test*\n[/quote]",
-      '<aside class="quote no-group">\n<blockquote>\n<p><em>test</em></p>\n</blockquote>\n</aside>',
-      "it doesn't insert a new line for italics"
-    );
-
-    assert.cooked(
-      "[quote=,script='a'><script>alert('test');//':a]\n[/quote]",
-      '<aside class="quote no-group">\n<blockquote></blockquote>\n</aside>',
-      "It will not create a script tag within an attribute"
-    );
-  });
-
-  test("quoting a quote", function (assert) {
-    const store = getOwner(this).lookup("service:store");
-    const post = store.createRecord("post", {
-      cooked: new PrettyText(defaultOpts).cook(
-        '[quote="sam, post:1, topic:1, full:true"]\nhello\n[/quote]\n*Test*'
-      ),
-      username: "eviltrout",
-      post_number: 1,
-      topic_id: 2,
-    });
-
-    const quote = buildQuote(
-      post,
-      '[quote="sam, post:1, topic:1, full:true"]\nhello\n[/quote]'
-    );
-
-    assert.strictEqual(
-      quote,
-      '[quote="eviltrout, post:1, topic:2"]\n[quote="sam, post:1, topic:1, full:true"]\nhello\n[/quote]\n[/quote]\n\n',
-      "allows quoting a quote"
-    );
-  });
-
   test("quote formatting", function (assert) {
     assert.cooked(
       '[quote="EvilTrout, post:123, topic:456, full:true"]\n[sam]\n[/quote]',
@@ -1640,6 +1590,8 @@ var bar = 'bar';
     assert.cookedOptions("a --> b", enabledTypographer, "<p>a \u2192 b</p>");
     assert.cookedOptions("-->", enabledTypographer, "<p> \u2192 </p>");
     assert.cookedOptions("<--", enabledTypographer, "<p> \u2190 </p>");
+    assert.cookedOptions("<->", enabledTypographer, "<p> \u2194 </p>");
+    assert.cookedOptions("<-->", enabledTypographer, "<p> \u2194 </p>");
 
     // Don't replace arrows
     assert.cookedOptions("<!-- an html comment -->", enabledTypographer, "");
@@ -1648,7 +1600,6 @@ var bar = 'bar';
       enabledTypographer,
       "<p>(&lt;–not an arrow)</p>"
     );
-    assert.cookedOptions("<-->", enabledTypographer, "<p>&lt;–&gt;</p>");
     assert.cookedOptions("asd-->", enabledTypographer, "<p>asd–&gt;</p>");
     assert.cookedOptions(" asd--> ", enabledTypographer, "<p>asd–&gt;</p>");
     assert.cookedOptions(" asd-->", enabledTypographer, "<p>asd–&gt;</p>");
@@ -1732,6 +1683,7 @@ var bar = 'bar';
     const opts = {
       watchedWordsReplace: {
         "(?:\\W|^)(fun)(?=\\W|$)": {
+          word: "fun",
           replacement: "times",
           case_sensitive: false,
         },
@@ -1746,6 +1698,7 @@ var bar = 'bar';
     const opts = {
       watchedWordsLink: {
         "(?:\\W|^)(fun)(?=\\W|$)": {
+          word: "fun",
           replacement: "https://discourse.org",
           case_sensitive: false,
         },
@@ -1760,19 +1713,85 @@ var bar = 'bar';
   });
 
   test("watched words replace with bad regex", function (assert) {
-    const maxMatches = 100; // same limit as MD watched-words-replace plugin
     const opts = {
       siteSettings: { watched_words_regular_expressions: true },
       watchedWordsReplace: {
-        "(\\bu?\\b)": { replacement: "you", case_sensitive: false },
+        "(\\bu?\\b)": {
+          word: "(\\bu?\\b)",
+          replacement: "you",
+          case_sensitive: false,
+        },
       },
     };
 
     assert.cookedOptions(
       "one",
       opts,
-      `<p>${"you".repeat(maxMatches)}one</p>`,
+      `<p>youoneyou</p>`,
       "does not loop infinitely"
     );
   });
+
+  test("highlighted aliased languages", function (assert) {
+    // "js" is an alias of "javascript"
+    assert.cooked(
+      "```js\nvar foo ='foo';\nvar bar = 'bar';\n```",
+      `<pre><code class=\"lang-js\">var foo ='foo';
+var bar = 'bar';
+</code></pre>`,
+      "code block with js alias works"
+    );
+
+    // "html" is an alias of "xml"
+    assert.cooked(
+      "```html\n<strong>fun</strong> times\n```",
+      `<pre><code class=\"lang-html\">&lt;strong&gt;fun&lt;/strong&gt; times
+</code></pre>`,
+      "code block with html alias work"
+    );
+  });
+
+  test("image grid", function (assert) {
+    assert.cooked(
+      "[grid]\n![](http://folksy.com/images/folksy-colour.png)\n[/grid]",
+      `<div class="d-image-grid">
+<p><img src="http://folksy.com/images/folksy-colour.png" alt role="presentation"></p>
+</div>`,
+      "image grid works"
+    );
+
+    assert.cooked(
+      `[grid]
+![](http://folksy.com/images/folksy-colour.png)
+![](http://folksy.com/images/folksy-colour2.png)
+![](http://folksy.com/images/folksy-colour3.png)
+[/grid]`,
+      `<div class="d-image-grid">
+<p><img src="http://folksy.com/images/folksy-colour.png" alt role="presentation"><br>
+<img src="http://folksy.com/images/folksy-colour2.png" alt role="presentation"><br>
+<img src="http://folksy.com/images/folksy-colour3.png" alt role="presentation"></p>
+</div>`,
+      "image grid with 3 images works"
+    );
+
+    assert.cooked(
+      `[grid]
+![](http://folksy.com/images/folksy-colour.png) ![](http://folksy.com/images/folksy-colour2.png)
+![](http://folksy.com/images/folksy-colour3.png)
+[/grid]`,
+      `<div class="d-image-grid">
+<p><img src="http://folksy.com/images/folksy-colour.png" alt role="presentation"> <img src="http://folksy.com/images/folksy-colour2.png" alt role="presentation"><br>
+<img src="http://folksy.com/images/folksy-colour3.png" alt role="presentation"></p>
+</div>`,
+      "image grid with mixed block and inline images works"
+    );
+
+    assert.cooked(
+      "[grid]![](http://folksy.com/images/folksy-colour.png) ![](http://folksy.com/images/folksy-colour2.png)[/grid]",
+      `<div class="d-image-grid">
+<p><img src="http://folksy.com/images/folksy-colour.png" alt role="presentation"> <img src="http://folksy.com/images/folksy-colour2.png" alt role="presentation"></p>
+</div>`,
+      "image grid with inline images works"
+    );
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/uploads-test.js b/app/assets/javascripts/discourse/tests/unit/lib/uploads-test.js
index bede514d279..3170664ceae 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/uploads-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/uploads-test.js
@@ -1,4 +1,3 @@
-import * as Utilities from "discourse/lib/utilities";
 import {
   allowsAttachments,
   allowsImages,
@@ -236,14 +235,16 @@ module("Unit | Utility | uploads", function (hooks) {
   });
 
   test("isImage", function (assert) {
-    ["png", "webp", "jpg", "jpeg", "gif", "ico"].forEach((extension) => {
-      let image = "image." + extension;
-      assert.ok(isImage(image), image + " is recognized as an image");
-      assert.ok(
-        isImage("http://foo.bar/path/to/" + image),
-        image + " is recognized as an image"
-      );
-    });
+    ["png", "webp", "jpg", "jpeg", "gif", "ico", "avif"].forEach(
+      (extension) => {
+        let image = "image." + extension;
+        assert.ok(isImage(image), image + " is recognized as an image");
+        assert.ok(
+          isImage("http://foo.bar/path/to/" + image),
+          image + " is recognized as an image"
+        );
+      }
+    );
     assert.notOk(isImage("file.txt"));
     assert.notOk(isImage("http://foo.bar/path/to/file.txt"));
     assert.notOk(isImage(""));
@@ -346,7 +347,8 @@ module("Unit | Utility | uploads", function (hooks) {
       "![8F2B469B-6B2C-4213-BC68-57B4876365A0|100x200](/uploads/123/abcdef.ext)"
     );
 
-    sinon.stub(Utilities, "isAppleDevice").returns(true);
+    const capabilities = getOwner(this).lookup("service:capabilities");
+    sinon.stub(capabilities, "isIOS").get(() => true);
     assert.strictEqual(
       testUploadMarkdown("8F2B469B-6B2C-4213-BC68-57B4876365A0.jpeg"),
       "![image|100x200](/uploads/123/abcdef.ext)"
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/url-test.js b/app/assets/javascripts/discourse/tests/unit/lib/url-test.js
index 1d1cc04dc89..e7ea1a3d202 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/url-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/url-test.js
@@ -139,7 +139,7 @@ module("Unit | Utility | url", function () {
         { path: "/c/foo/1", default_list_filter: "none" },
         false
       ),
-      "/c/foo/1"
+      "/c/foo/1/none"
     );
   });
 
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/user-search-test.js b/app/assets/javascripts/discourse/tests/unit/lib/user-search-test.js
index 3310fa988a8..8f541b661a7 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/user-search-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/user-search-test.js
@@ -174,4 +174,9 @@ module("Unit | Utility | user-search", function (hooks) {
     });
     assert.strictEqual(results.length, 1);
   });
+
+  test("it uses limit option", async function (assert) {
+    const results = await userSearch({ term: "te", limit: 2 });
+    assert.strictEqual(results.length, 2);
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/utilities-test.js b/app/assets/javascripts/discourse/tests/unit/lib/utilities-test.js
index 281ae9b189f..692bf2834ce 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/utilities-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/utilities-test.js
@@ -1,6 +1,4 @@
 import {
-  avatarImg,
-  avatarUrl,
   caretRowCol,
   clipboardCopyAsync,
   defaultHomepage,
@@ -8,7 +6,6 @@ import {
   escapeExpression,
   extractDomainFromUrl,
   fillMissingDates,
-  getRawSize,
   inCodeBlock,
   initializeDefaultHomepage,
   mergeSortedLists,
@@ -25,7 +22,6 @@ import { chromeTest } from "discourse/tests/helpers/qunit-helpers";
 import { setupRenderingTest } from "discourse/tests/helpers/component-test";
 import { click, render } from "@ember/test-helpers";
 import { hbs } from "ember-cli-htmlbars";
-import { setupURL } from "discourse-common/lib/get-url";
 import { setupTest } from "ember-qunit";
 import { getOwner } from "discourse-common/lib/get-owner";
 
@@ -86,76 +82,6 @@ module("Unit | Utilities", function (hooks) {
     );
   });
 
-  test("avatarUrl", function (assert) {
-    let rawSize = getRawSize;
-    assert.blank(avatarUrl("", "tiny"), "no template returns blank");
-    assert.strictEqual(
-      avatarUrl("/fake/template/{size}.png", "tiny"),
-      "/fake/template/" + rawSize(20) + ".png",
-      "simple avatar url"
-    );
-    assert.strictEqual(
-      avatarUrl("/fake/template/{size}.png", "large"),
-      "/fake/template/" + rawSize(45) + ".png",
-      "different size"
-    );
-
-    setupURL("https://app-cdn.example.com", "https://example.com", "");
-
-    assert.strictEqual(
-      avatarUrl("/fake/template/{size}.png", "large"),
-      "https://app-cdn.example.com/fake/template/" + rawSize(45) + ".png",
-      "uses CDN if present"
-    );
-  });
-
-  let setDevicePixelRatio = function (value) {
-    if (Object.defineProperty && !window.hasOwnProperty("devicePixelRatio")) {
-      Object.defineProperty(window, "devicePixelRatio", { value: 2 });
-    } else {
-      window.devicePixelRatio = value;
-    }
-  };
-
-  test("avatarImg", function (assert) {
-    let oldRatio = window.devicePixelRatio;
-    setDevicePixelRatio(2);
-
-    let avatarTemplate = "/path/to/avatar/{size}.png";
-    assert.strictEqual(
-      avatarImg({ avatarTemplate, size: "tiny" }),
-      "<img loading='lazy' alt='' width='20' height='20' src='/path/to/avatar/40.png' class='avatar'>",
-      "it returns the avatar html"
-    );
-
-    assert.strictEqual(
-      avatarImg({
-        avatarTemplate,
-        size: "tiny",
-        title: "evilest trout",
-      }),
-      "<img loading='lazy' alt='' width='20' height='20' src='/path/to/avatar/40.png' class='avatar' title='evilest trout' aria-label='evilest trout'>",
-      "it adds a title if supplied"
-    );
-
-    assert.strictEqual(
-      avatarImg({
-        avatarTemplate,
-        size: "tiny",
-        extraClasses: "evil fish",
-      }),
-      "<img loading='lazy' alt='' width='20' height='20' src='/path/to/avatar/40.png' class='avatar evil fish'>",
-      "it adds extra classes if supplied"
-    );
-
-    assert.blank(
-      avatarImg({ avatarTemplate: "", size: "tiny" }),
-      "it doesn't render avatars for invalid avatar template"
-    );
-
-    setDevicePixelRatio(oldRatio);
-  });
-
   test("defaultHomepage via meta tag", function (assert) {
     let meta = document.createElement("meta");
     meta.name = "discourse_current_homepage";
diff --git a/app/assets/javascripts/discourse/tests/unit/localization-test.js b/app/assets/javascripts/discourse/tests/unit/localization-test.js
index 9e36d706b2f..237f2c2b669 100644
--- a/app/assets/javascripts/discourse/tests/unit/localization-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/localization-test.js
@@ -1,17 +1,19 @@
 import { module, test } from "qunit";
 import I18n from "I18n";
-import LocalizationInitializer from "discourse/initializers/localization";
-import { getApplication } from "@ember/test-helpers";
+import LocalizationInitializer from "discourse/instance-initializers/localization";
+import { setupTest } from "ember-qunit";
 
-module("initializer:localization", {
-  _locale: I18n.locale,
-  _translations: I18n.translations,
-  _extras: I18n.extras,
-  _compiledMFs: I18n._compiledMFs,
-  _overrides: I18n._overrides,
-  _mfOverrides: I18n._mfOverrides,
+module("initializer:localization", function (hooks) {
+  setupTest(hooks);
+
+  hooks.beforeEach(function () {
+    this._locale = I18n.locale;
+    this._translations = I18n.translations;
+    this._extras = I18n.extras;
+    this._compiledMFs = I18n._compiledMFs;
+    this._overrides = I18n._overrides;
+    this._mfOverrides = I18n._mfOverrides;
 
-  beforeEach() {
     I18n.locale = "fr";
 
     I18n.translations = {
@@ -59,131 +61,131 @@ module("initializer:localization", {
         },
       },
     };
-  },
+  });
 
-  afterEach() {
+  hooks.afterEach(function () {
     I18n.locale = this._locale;
     I18n.translations = this._translations;
     I18n.extras = this._extras;
     I18n._compiledMFs = this._compiledMFs;
     I18n._overrides = this._overrides;
     I18n._mfOverrides = this._mfOverrides;
-  },
-});
+  });
 
-test("translation overrides", function (assert) {
-  I18n._overrides = {
-    fr: {
-      "js.composer.both_languages1": "composer.both_languages1 (FR override)",
-      "js.composer.only_english2": "composer.only_english2 (FR override)",
-    },
-    en: {
-      "js.composer.both_languages2": "composer.both_languages2 (EN override)",
-      "js.composer.only_english1": "composer.only_english1 (EN override)",
-    },
-  };
-  LocalizationInitializer.initialize(getApplication());
+  test("translation overrides", function (assert) {
+    I18n._overrides = {
+      fr: {
+        "js.composer.both_languages1": "composer.both_languages1 (FR override)",
+        "js.composer.only_english2": "composer.only_english2 (FR override)",
+      },
+      en: {
+        "js.composer.both_languages2": "composer.both_languages2 (EN override)",
+        "js.composer.only_english1": "composer.only_english1 (EN override)",
+      },
+    };
+    LocalizationInitializer.initialize(this.owner);
 
-  assert.strictEqual(
-    I18n.t("composer.both_languages1"),
-    "composer.both_languages1 (FR override)",
-    "overrides existing translation in current locale"
-  );
+    assert.strictEqual(
+      I18n.t("composer.both_languages1"),
+      "composer.both_languages1 (FR override)",
+      "overrides existing translation in current locale"
+    );
 
-  assert.strictEqual(
-    I18n.t("composer.only_english1"),
-    "composer.only_english1 (EN override)",
-    "overrides translation in fallback locale"
-  );
+    assert.strictEqual(
+      I18n.t("composer.only_english1"),
+      "composer.only_english1 (EN override)",
+      "overrides translation in fallback locale"
+    );
 
-  assert.strictEqual(
-    I18n.t("composer.only_english2"),
-    "composer.only_english2 (FR override)",
-    "overrides translation that doesn't exist in current locale"
-  );
+    assert.strictEqual(
+      I18n.t("composer.only_english2"),
+      "composer.only_english2 (FR override)",
+      "overrides translation that doesn't exist in current locale"
+    );
 
-  assert.strictEqual(
-    I18n.t("composer.both_languages2"),
-    "composer.both_languages2 (FR)",
-    "prefers translation in current locale over override in fallback locale"
-  );
-});
+    assert.strictEqual(
+      I18n.t("composer.both_languages2"),
+      "composer.both_languages2 (FR)",
+      "prefers translation in current locale over override in fallback locale"
+    );
+  });
 
-test("translation overrides (admin_js)", function (assert) {
-  I18n._overrides = {
-    fr: {
-      "admin_js.admin.api.both_languages1":
-        "admin.api.both_languages1 (FR override)",
-      "admin_js.admin.api.only_english2":
-        "admin.api.only_english2 (FR override)",
-      "admin_js.type_to_filter": "type_to_filter (FR override)",
-    },
-    en: {
-      "admin_js.admin.api.both_languages2":
-        "admin.api.both_languages2 (EN override)",
-      "admin_js.admin.api.only_english1":
-        "admin.api.only_english1 (EN override)",
-    },
-  };
-  LocalizationInitializer.initialize(getApplication());
+  test("translation overrides (admin_js)", function (assert) {
+    I18n._overrides = {
+      fr: {
+        "admin_js.admin.api.both_languages1":
+          "admin.api.both_languages1 (FR override)",
+        "admin_js.admin.api.only_english2":
+          "admin.api.only_english2 (FR override)",
+        "admin_js.type_to_filter": "type_to_filter (FR override)",
+      },
+      en: {
+        "admin_js.admin.api.both_languages2":
+          "admin.api.both_languages2 (EN override)",
+        "admin_js.admin.api.only_english1":
+          "admin.api.only_english1 (EN override)",
+      },
+    };
+    LocalizationInitializer.initialize(this.owner);
 
-  assert.strictEqual(
-    I18n.t("admin.api.both_languages1"),
-    "admin.api.both_languages1 (FR override)",
-    "overrides existing translation in current locale"
-  );
+    assert.strictEqual(
+      I18n.t("admin.api.both_languages1"),
+      "admin.api.both_languages1 (FR override)",
+      "overrides existing translation in current locale"
+    );
 
-  assert.strictEqual(
-    I18n.t("admin.api.only_english1"),
-    "admin.api.only_english1 (EN override)",
-    "overrides translation in fallback locale"
-  );
+    assert.strictEqual(
+      I18n.t("admin.api.only_english1"),
+      "admin.api.only_english1 (EN override)",
+      "overrides translation in fallback locale"
+    );
 
-  assert.strictEqual(
-    I18n.t("admin.api.only_english2"),
-    "admin.api.only_english2 (FR override)",
-    "overrides translation that doesn't exist in current locale"
-  );
+    assert.strictEqual(
+      I18n.t("admin.api.only_english2"),
+      "admin.api.only_english2 (FR override)",
+      "overrides translation that doesn't exist in current locale"
+    );
 
-  assert.strictEqual(
-    I18n.t("admin.api.both_languages2"),
-    "admin.api.both_languages2 (FR)",
-    "prefers translation in current locale over override in fallback locale"
-  );
+    assert.strictEqual(
+      I18n.t("admin.api.both_languages2"),
+      "admin.api.both_languages2 (FR)",
+      "prefers translation in current locale over override in fallback locale"
+    );
 
-  assert.strictEqual(
-    I18n.t("type_to_filter"),
-    "type_to_filter (FR override)",
-    "correctly changes the translation key by removing `admin_js`"
-  );
-});
+    assert.strictEqual(
+      I18n.t("type_to_filter"),
+      "type_to_filter (FR override)",
+      "correctly changes the translation key by removing `admin_js`"
+    );
+  });
 
-test("translation overrides for MessageFormat strings", function (assert) {
-  I18n._mfOverrides = {
-    "js.user.messages.some_key_MF": () =>
+  test("translation overrides for MessageFormat strings", function (assert) {
+    I18n._mfOverrides = {
+      "js.user.messages.some_key_MF": () =>
+        "user.messages.some_key_MF (FR override)",
+    };
+
+    LocalizationInitializer.initialize(this.owner);
+
+    assert.strictEqual(
+      I18n.messageFormat("user.messages.some_key_MF", {}),
       "user.messages.some_key_MF (FR override)",
-  };
+      "overrides existing MessageFormat string"
+    );
+  });
 
-  LocalizationInitializer.initialize(getApplication());
+  test("skip translation override if parent node is not an object", function (assert) {
+    I18n._overrides = {
+      fr: {
+        "js.composer.both_languages1.foo":
+          "composer.both_languages1.foo (FR override)",
+      },
+    };
+    LocalizationInitializer.initialize(this.owner);
 
-  assert.strictEqual(
-    I18n.messageFormat("user.messages.some_key_MF", {}),
-    "user.messages.some_key_MF (FR override)",
-    "overrides existing MessageFormat string"
-  );
-});
-
-test("skip translation override if parent node is not an object", function (assert) {
-  I18n._overrides = {
-    fr: {
-      "js.composer.both_languages1.foo":
-        "composer.both_languages1.foo (FR override)",
-    },
-  };
-  LocalizationInitializer.initialize(getApplication());
-
-  assert.strictEqual(
-    I18n.t("composer.both_languages1.foo"),
-    "[fr.composer.both_languages1.foo]"
-  );
+    assert.strictEqual(
+      I18n.t("composer.both_languages1.foo"),
+      "[fr.composer.both_languages1.foo]"
+    );
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/unit/models/category-test.js b/app/assets/javascripts/discourse/tests/unit/models/category-test.js
index 69ad24f03e7..f7dac2d5eac 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/category-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/category-test.js
@@ -263,6 +263,27 @@ module("Unit | Model | category", function (hooks) {
     });
 
     assert.strictEqual(quux.minimumRequiredTags, null);
+
+    const foobar = store.createRecord("category", {
+      id: 1,
+      slug: "foo",
+      minimum_required_tags: 2,
+      required_tag_groups: [{ name: "bar", min_count: 1 }],
+    });
+
+    assert.strictEqual(foobar.minimumRequiredTags, 2);
+
+    const barfoo = store.createRecord("category", {
+      id: 1,
+      slug: "foo",
+      minimum_required_tags: 2,
+      required_tag_groups: [
+        { name: "foo", min_count: 1 },
+        { name: "bar", min_count: 2 },
+      ],
+    });
+
+    assert.strictEqual(barfoo.minimumRequiredTags, 3);
   });
 
   test("search with category name", function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/unit/models/composer-test.js b/app/assets/javascripts/discourse/tests/unit/models/composer-test.js
index b671ce5dd4a..d35b8f8a535 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/composer-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/composer-test.js
@@ -9,6 +9,10 @@ import AppEvents from "discourse/services/app-events";
 import { module, test } from "qunit";
 import { getOwner } from "discourse-common/lib/get-owner";
 import { setupTest } from "ember-qunit";
+import pretender, {
+  parsePostData,
+  response,
+} from "discourse/tests/helpers/create-pretender";
 
 function createComposer(opts = {}) {
   opts.user ??= currentUser();
@@ -317,6 +321,20 @@ module("Unit | Model | composer", function (hooks) {
     );
   });
 
+  test("initial category when creating PM and there is a default composer category", function (assert) {
+    this.siteSettings.default_composer_category = 2;
+    const composer = openComposer.call(this, {
+      action: PRIVATE_MESSAGE,
+      draftKey: "abcd",
+      draftSequence: 1,
+    });
+    assert.strictEqual(
+      composer.categoryId,
+      null,
+      "it doesn't save the category"
+    );
+  });
+
   test("open with a quote", function (assert) {
     const quote =
       '[quote="neil, post:5, topic:413"]\nSimmer down you two.\n[/quote]';
@@ -426,4 +444,41 @@ module("Unit | Model | composer", function (hooks) {
       { name: "foo@bar.com", type: "email" },
     ]);
   });
+
+  test("can add meta_data", async function (assert) {
+    let saved = false;
+    pretender.post("/posts", function (request) {
+      const data = parsePostData(request.requestBody);
+
+      assert.equal(data.meta_data.some_custom_field, "some_value");
+      saved = true;
+
+      return response(200, {
+        success: true,
+        action: "create_post",
+        post: {
+          id: 12345,
+          topic_id: 280,
+          topic_slug: "internationalization-localization",
+        },
+      });
+    });
+    const composer = createComposer.call(this, {});
+
+    await composer.open({
+      action: CREATE_TOPIC,
+      title: "some topic title here",
+      categoryId: 1,
+      reply: "some reply here some reply here some reply here",
+      draftKey: "abcd",
+      draftSequence: 1,
+    });
+
+    assert.equal(composer.loading, false);
+
+    composer.metaData = { some_custom_field: "some_value" };
+    await composer.save({});
+
+    assert.equal(saved, true);
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/unit/models/report-test.js b/app/assets/javascripts/discourse/tests/unit/models/report-test.js
index c626a5a50b1..8e01d05762d 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/report-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/report-test.js
@@ -370,7 +370,7 @@ module("Unit | Model | report", function (hooks) {
     const computedUsernameLabel = usernameLabel.compute(row);
     assert.strictEqual(
       computedUsernameLabel.formattedValue,
-      "<a href='/admin/users/1/joffrey'><img loading='lazy' alt='' width='20' height='20' src='/' class='avatar' title='joffrey' aria-label='joffrey'><span class='username'>joffrey</span></a>"
+      "<a href='/admin/users/1/joffrey'><img loading='lazy' alt='' width='24' height='24' src='/' class='avatar' title='joffrey' aria-label='joffrey'><span class='username'>joffrey</span></a>"
     );
     assert.strictEqual(computedUsernameLabel.value, "joffrey");
 
@@ -459,7 +459,7 @@ module("Unit | Model | report", function (hooks) {
     const userLink = computedLabels[0].compute(row).formattedValue;
     assert.strictEqual(
       userLink,
-      "<a href='/forum/admin/users/1/joffrey'><img loading='lazy' alt='' width='20' height='20' src='/forum/' class='avatar' title='joffrey' aria-label='joffrey'><span class='username'>joffrey</span></a>"
+      "<a href='/forum/admin/users/1/joffrey'><img loading='lazy' alt='' width='24' height='24' src='/forum/' class='avatar' title='joffrey' aria-label='joffrey'><span class='username'>joffrey</span></a>"
     );
   });
 });
diff --git a/app/assets/javascripts/discourse/tests/unit/models/topic-tracking-state-test.js b/app/assets/javascripts/discourse/tests/unit/models/topic-tracking-state-test.js
index 5885f4370c2..162ed0546e0 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/topic-tracking-state-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/topic-tracking-state-test.js
@@ -335,6 +335,12 @@ module("Unit | Model | topic-tracking-state", function (hooks) {
     trackingState.loadStates([{ topic_id: 111 }, { topic_id: 222 }]);
     trackingState.set("_trackedTopicLimit", 1);
 
+    let stateChangeCallbackCalledTimes = 0;
+
+    trackingState.onStateChange(() => {
+      stateChangeCallbackCalledTimes += 1;
+    });
+
     const list = {
       topics: [
         this.store.createRecord("topic", {
@@ -344,15 +350,36 @@ module("Unit | Model | topic-tracking-state", function (hooks) {
           unread_posts: 0,
           prevent_sync: false,
         }),
+        this.store.createRecord("topic", {
+          id: 333,
+          unseen: false,
+          seen: true,
+          unread_posts: 0,
+          prevent_sync: false,
+        }),
+        this.store.createRecord("topic", {
+          id: 444,
+          unseen: false,
+          seen: true,
+          unread_posts: 0,
+          prevent_sync: false,
+        }),
       ],
     };
 
     trackingState.sync(list, "unread");
+
     assert.notOk(
       trackingState.states.has("t111"),
       "expect state for topic 111 to be deleted"
     );
 
+    assert.equal(
+      stateChangeCallbackCalledTimes,
+      1,
+      "callback is only called once"
+    );
+
     trackingState.loadStates([{ topic_id: 111 }, { topic_id: 222 }]);
     trackingState.set("_trackedTopicLimit", 5);
     trackingState.sync(list, "unread");
@@ -893,6 +920,42 @@ module("Unit | Model | topic-tracking-state | /unread", function (hooks) {
     );
   });
 
+  test("adds unread incoming to the new topic list if new new view is enabled", async function (assert) {
+    this.currentUser.new_new_view_enabled = true;
+
+    this.trackingState.trackIncoming("new");
+    await publishToMessageBus("/unread", unreadTopicPayload);
+
+    assert.deepEqual(
+      this.trackingState.newIncoming,
+      [111],
+      "unread topic is incoming"
+    );
+    assert.strictEqual(
+      this.trackingState.incomingCount,
+      1,
+      "incoming count is increased"
+    );
+  });
+
+  test("doesn't add unread incoming to the new topic list if new new view is disabled", async function (assert) {
+    this.currentUser.new_new_view_enabled = false;
+
+    this.trackingState.trackIncoming("new");
+    await publishToMessageBus("/unread", unreadTopicPayload);
+
+    assert.deepEqual(
+      this.trackingState.newIncoming,
+      [],
+      "unread topic is not incoming"
+    );
+    assert.strictEqual(
+      this.trackingState.incomingCount,
+      0,
+      "incoming count isn't increased"
+    );
+  });
+
   test("correct tag and category filters for different lists", function (assert) {
     this.trackingState.trackIncoming("unread");
     assert.strictEqual(this.trackingState.filterCategory, undefined);
diff --git a/app/assets/javascripts/discourse/tests/unit/models/user-test.js b/app/assets/javascripts/discourse/tests/unit/models/user-test.js
index 51b51d5c20a..47eb9fc1983 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/user-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/user-test.js
@@ -235,16 +235,4 @@ module("Unit | Model | user", function (hooks) {
     assert.ok(hideSpy.calledWith("first_notification"));
     assert.ok(showNextSpy.calledWith());
   });
-
-  test("hideUserTipForever() can hide all the user tips", async function (assert) {
-    const site = getOwner(this).lookup("service:site");
-    site.set("user_tips", { first_notification: 1 });
-    const store = getOwner(this).lookup("service:store");
-    const user = store.createRecord("user", { username: "eviltrout" });
-
-    const hideAllSpy = sinon.spy(userTips, "hideAllUserTips");
-    await user.hideUserTipForever();
-
-    assert.ok(hideAllSpy.calledWith());
-  });
 });
diff --git a/app/assets/javascripts/discourse/tests/unit/routes/review-index-test.js b/app/assets/javascripts/discourse/tests/unit/routes/review-index-test.js
index 489777c775f..d1be337a19d 100644
--- a/app/assets/javascripts/discourse/tests/unit/routes/review-index-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/routes/review-index-test.js
@@ -5,44 +5,14 @@ import { module, test } from "qunit";
 module("Unit | Route | review-index", function (hooks) {
   setupTest(hooks);
 
-  test("subscribes and unsubscribes /reviewable_counts MessageBus channel when user menu not enabled", function (assert) {
-    const currentUser = User.create({ redesigned_user_menu_enabled: false });
-    this.owner.unregister("service:current-user");
-    this.owner.register("service:current-user", currentUser, {
-      instantiate: false,
-    });
-    this.owner.inject("route", "currentUser", "service:current-user");
-
-    const reviewIndexRoute = this.owner.lookup("route:review-index");
-    const messageBus = this.owner.lookup("service:message-bus");
-
-    let channels = messageBus.callbacks.map((c) => c.channel);
-    assert.false(channels.includes("/reviewable_counts"));
-    assert.false(channels.includes("/reviewable_claimed"));
-
-    reviewIndexRoute.activate();
-
-    channels = messageBus.callbacks.map((c) => c.channel);
-    assert.true(channels.includes("/reviewable_counts"));
-    assert.true(channels.includes("/reviewable_claimed"));
-
-    reviewIndexRoute.deactivate();
-
-    channels = messageBus.callbacks.map((c) => c.channel);
-    assert.false(channels.includes("/reviewable_counts"));
-    assert.false(channels.includes("/reviewable_claimed"));
-  });
-
   test("subscribes and unsubscribes /reviewable_counts(with id) when user menu enabled", function (assert) {
     const currentUser = User.create({
-      redesigned_user_menu_enabled: true,
       id: "the-id",
     });
     this.owner.unregister("service:current-user");
     this.owner.register("service:current-user", currentUser, {
       instantiate: false,
     });
-    this.owner.inject("route", "currentUser", "service:current-user");
 
     const reviewIndexRoute = this.owner.lookup("route:review-index");
     const messageBus = this.owner.lookup("service:message-bus");
diff --git a/app/assets/javascripts/discourse/tests/unit/services/lightbox-test.js b/app/assets/javascripts/discourse/tests/unit/services/lightbox-test.js
new file mode 100644
index 00000000000..be359d19c64
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/unit/services/lightbox-test.js
@@ -0,0 +1,188 @@
+import {
+  generateLightboxMarkup,
+  generateLightboxObject,
+} from "discourse/tests/helpers/lightbox-helpers";
+import { module, test } from "qunit";
+import { click } from "@ember/test-helpers";
+import { LIGHTBOX_APP_EVENT_NAMES } from "discourse/lib/lightbox/constants";
+import domFromString from "discourse-common/lib/dom-from-string";
+import { getOwner } from "discourse-common/lib/get-owner";
+import { setupTest } from "ember-qunit";
+import sinon from "sinon";
+
+module("Unit | Service | Experimental Lightbox", function (hooks) {
+  setupTest(hooks);
+
+  const wrap = domFromString(generateLightboxMarkup())[0];
+  const selector = ".lightbox";
+
+  hooks.beforeEach(function () {
+    this.lightbox = getOwner(this).lookup("service:lightbox");
+    this.appEvents = getOwner(this).lookup("service:app-events");
+  });
+
+  test("Lightbox Service has appEvents", async function (assert) {
+    assert.ok(this.lightbox.appEvents);
+  });
+
+  test("Does not add event listener if no lightboxes are found", async function (assert) {
+    const container = document.createElement("div");
+    const addEventListenerSpy = sinon.spy(container, "addEventListener");
+
+    await this.lightbox.setupLightboxes({ container, selector });
+
+    assert.strictEqual(
+      addEventListenerSpy.called,
+      false,
+      "does not add event listener"
+    );
+
+    addEventListenerSpy.restore();
+  });
+
+  test("Adds event listener if lightboxes are found", async function (assert) {
+    const container = wrap.cloneNode(true);
+    const addEventListenerSpy = sinon.spy(container, "addEventListener");
+
+    await this.lightbox.setupLightboxes({ container, selector });
+
+    assert.strictEqual(
+      addEventListenerSpy.calledOnce,
+      true,
+      "adds event listener"
+    );
+
+    addEventListenerSpy.restore();
+  });
+
+  test("Correctly sets event listeners", async function (assert) {
+    const container = wrap.cloneNode(true);
+
+    const openLightboxSpy = sinon.spy(this.lightbox, "openLightbox");
+    const removeEventListenerSpy = sinon.spy(container, "removeEventListener");
+    const clickTarget = container.querySelector(selector);
+
+    await this.lightbox.setupLightboxes({ container, selector, clickTarget });
+
+    await click(container.querySelector(selector));
+
+    container.appendChild(document.createElement("p"));
+
+    await click(container.querySelector("p"));
+
+    assert.strictEqual(
+      openLightboxSpy.calledWith({ container, selector, clickTarget }),
+      true,
+      "calls openLightbox on lightboxed element click"
+    );
+
+    assert.strictEqual(
+      openLightboxSpy.calledOnce,
+      true,
+      "only calls open lightbox when lightboxed element is clicked"
+    );
+
+    assert.strictEqual(
+      this.lightbox.lightboxClickElements.length,
+      1,
+      "correctly stores lightbox click elements for cleanup"
+    );
+
+    await this.lightbox.cleanupLightboxes();
+
+    assert.strictEqual(
+      removeEventListenerSpy.calledOnce,
+      true,
+      "removes event listener from element on cleanup"
+    );
+
+    removeEventListenerSpy.restore();
+
+    assert.strictEqual(
+      this.lightbox.lightboxClickElements.length,
+      0,
+      "correctly removes stored entry from lightboxClickElements on cleanup"
+    );
+
+    openLightboxSpy.restore();
+    removeEventListenerSpy.restore();
+  });
+
+  test(`correctly calls the lightbox:open event`, async function (assert) {
+    const done = assert.async();
+    const container = wrap.cloneNode(true);
+
+    await this.lightbox.setupLightboxes({ container, selector });
+
+    const appEventsTriggerSpy = sinon.spy(this.appEvents, "trigger");
+
+    const expectedObject = {
+      ...generateLightboxObject(),
+      options: this.lightbox.options,
+      callbacks: this.lightbox.callbacks,
+    };
+
+    const expectedEvent = LIGHTBOX_APP_EVENT_NAMES.OPEN;
+
+    this.appEvents.on(LIGHTBOX_APP_EVENT_NAMES.OPEN, (args) => {
+      assert.deepEqual(args, expectedObject);
+      done();
+    });
+
+    await click(container.querySelector(selector));
+
+    assert.ok(appEventsTriggerSpy.calledWith(expectedEvent));
+
+    appEventsTriggerSpy.restore();
+  });
+
+  test(`correctly calls the lightbox:close event`, async function (assert) {
+    const done = assert.async();
+    const container = wrap.cloneNode(true);
+
+    await this.lightbox.setupLightboxes({ container, selector });
+
+    this.appEvents.on(LIGHTBOX_APP_EVENT_NAMES.CLOSE, () => {
+      assert.ok(true);
+      done();
+    });
+
+    await click(container.querySelector(selector));
+
+    await this.lightbox.closeLightbox();
+  });
+
+  test(`correctly responds to the lightbox:clean event`, async function (assert) {
+    const container = wrap.cloneNode(true);
+
+    await this.lightbox.setupLightboxes({ container, selector });
+
+    await click(container.querySelector(".lightbox"));
+
+    assert.strictEqual(
+      this.lightbox.lightboxClickElements.length,
+      1,
+      "correctly stores lightbox click elements for cleanup"
+    );
+
+    assert.strictEqual(
+      this.lightbox.lightboxIsOpen,
+      true,
+      "sets lightboxIsOpen to true"
+    );
+
+    this.appEvents.trigger(LIGHTBOX_APP_EVENT_NAMES.CLEAN);
+
+    assert.strictEqual(
+      this.lightbox.lightboxClickElements.length,
+      0,
+      "correctly removes stored entry from lightboxClickElements on cleanup"
+    );
+
+    assert.strictEqual(
+      this.lightbox.lightboxIsOpen,
+      false,
+      "sets lightboxIsOpen to false"
+    );
+  });
+});
diff --git a/app/assets/javascripts/discourse/tests/unit/services/presence-test.js b/app/assets/javascripts/discourse/tests/unit/services/presence-test.js
index 51ab78b72bc..92be317eb35 100644
--- a/app/assets/javascripts/discourse/tests/unit/services/presence-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/services/presence-test.js
@@ -426,6 +426,43 @@ module("Unit | Service | presence | entering and leaving", function (hooks) {
     );
   });
 
+  test("updates the server presence after going idle", async function (assert) {
+    const presenceService = getOwner(this).lookup("service:presence");
+    presenceService.currentUser = currentUser();
+    const channel = presenceService.getChannel("/test/ch1");
+
+    await channel.enter();
+    requests.pop(); // Throw away this request
+
+    setTestPresence(false);
+
+    await presenceService._updateServer();
+    assert.strictEqual(
+      requests.length,
+      1,
+      "updated the server after going idle"
+    );
+    let request = requests.pop();
+    assert.true(
+      request.getAll("leave_channels[]").includes("/test/ch1"),
+      "left ch1"
+    );
+
+    // Go back online
+    setTestPresence(true);
+    await presenceService._updateServer();
+    assert.strictEqual(
+      requests.length,
+      1,
+      "updated the server after going back online"
+    );
+    request = requests.pop();
+    assert.true(
+      request.getAll("present_channels[]").includes("/test/ch1"),
+      "rejoined ch1"
+    );
+  });
+
   test("handles the onlyWhileActive flag", async function (assert) {
     const presenceService = getOwner(this).lookup("service:presence");
     presenceService.currentUser = currentUser();
diff --git a/app/assets/javascripts/discourse/tests/unit/services/store-test.js b/app/assets/javascripts/discourse/tests/unit/services/store-test.js
index 33129858c94..d156e2c04d8 100644
--- a/app/assets/javascripts/discourse/tests/unit/services/store-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/services/store-test.js
@@ -1,7 +1,10 @@
 import { module, test } from "qunit";
 import { setupTest } from "ember-qunit";
 import { getOwner } from "discourse-common/lib/get-owner";
-import pretender, { response } from "discourse/tests/helpers/create-pretender";
+import pretender, {
+  fixturesByUrl,
+  response,
+} from "discourse/tests/helpers/create-pretender";
 
 module("Unit | Service | store", function (hooks) {
   setupTest(hooks);
@@ -10,17 +13,17 @@ module("Unit | Service | store", function (hooks) {
     const store = getOwner(this).lookup("service:store");
     const widget = store.createRecord("widget", { id: 111, name: "hello" });
 
-    assert.ok(!widget.get("isNew"), "it is not a new record");
-    assert.strictEqual(widget.get("name"), "hello");
-    assert.strictEqual(widget.get("id"), 111);
+    assert.false(widget.isNew, "it is not a new record");
+    assert.strictEqual(widget.name, "hello");
+    assert.strictEqual(widget.id, 111);
   });
 
   test("createRecord without an `id`", function (assert) {
     const store = getOwner(this).lookup("service:store");
     const widget = store.createRecord("widget", { name: "hello" });
 
-    assert.ok(widget.get("isNew"), "it is a new record");
-    assert.ok(!widget.get("id"), "there is no id");
+    assert.true(widget.isNew, "it is a new record");
+    assert.strictEqual(widget.id, undefined, "there is no id");
   });
 
   test("createRecord doesn't modify the input `id` field", function (assert) {
@@ -39,8 +42,8 @@ module("Unit | Service | store", function (hooks) {
     const store = getOwner(this).lookup("service:store");
     const widget = store.createRecord("widget");
 
-    assert.ok(!widget.get("id"), "there is no id");
-    assert.ok(widget.get("isNew"), "it is a new record");
+    assert.strictEqual(widget.id, undefined, "there is no id");
+    assert.true(widget.isNew, "it is a new record");
   });
 
   test("createRecord with a record as attributes returns that record from the map", function (assert) {
@@ -55,11 +58,11 @@ module("Unit | Service | store", function (hooks) {
     const store = getOwner(this).lookup("service:store");
 
     const widget = await store.find("widget", 123);
-    assert.strictEqual(widget.get("name"), "Trout Lure");
-    assert.strictEqual(widget.get("id"), 123);
-    assert.ok(!widget.get("isNew"), "found records are not new");
+    assert.strictEqual(widget.name, "Trout Lure");
+    assert.strictEqual(widget.id, 123);
+    assert.false(widget.isNew, "found records are not new");
     assert.strictEqual(
-      widget.get("extras.hello"),
+      widget.extras.hello,
       "world",
       "extra attributes are set"
     );
@@ -68,7 +71,7 @@ module("Unit | Service | store", function (hooks) {
     const widget2 = await store.find("widget", 123);
     assert.strictEqual(widget, widget2);
     assert.strictEqual(
-      widget.get("extras.hello"),
+      widget.extras.hello,
       "world",
       "extra attributes are set"
     );
@@ -77,24 +80,25 @@ module("Unit | Service | store", function (hooks) {
   test("find with object id", async function (assert) {
     const store = getOwner(this).lookup("service:store");
     const widget = await store.find("widget", { id: 123 });
-    assert.strictEqual(widget.get("firstObject.name"), "Trout Lure");
+    assert.strictEqual(widget.firstObject.name, "Trout Lure");
   });
 
   test("find with query param", async function (assert) {
     const store = getOwner(this).lookup("service:store");
     const widget = await store.find("widget", { name: "Trout Lure" });
-    assert.strictEqual(widget.get("firstObject.id"), 123);
+    assert.strictEqual(widget.firstObject.id, 123);
   });
 
   test("findStale with no stale results", async function (assert) {
     const store = getOwner(this).lookup("service:store");
     const stale = store.findStale("widget", { name: "Trout Lure" });
 
-    assert.ok(!stale.hasResults, "there are no stale results");
-    assert.ok(!stale.results, "results are present");
+    assert.false(stale.hasResults, "there are no stale results");
+    assert.strictEqual(stale.results, undefined, "results are not present");
+
     const widget = await stale.refresh();
     assert.strictEqual(
-      widget.get("firstObject.id"),
+      widget.firstObject.id,
       123,
       "a `refresh()` method provides results for stale"
     );
@@ -129,49 +133,52 @@ module("Unit | Service | store", function (hooks) {
   test("update", async function (assert) {
     const store = getOwner(this).lookup("service:store");
     const result = await store.update("widget", 123, { name: "hello" });
-    assert.ok(result);
+    assert.strictEqual(result.payload.name, "hello");
   });
 
   test("update with a multi world name", async function (assert) {
     const store = getOwner(this).lookup("service:store");
     const result = await store.update("cool-thing", 123, { name: "hello" });
-    assert.ok(result);
     assert.strictEqual(result.payload.name, "hello");
   });
 
   test("findAll", async function (assert) {
     const store = getOwner(this).lookup("service:store");
     const result = await store.findAll("widget");
-    assert.strictEqual(result.get("length"), 2);
+    assert.strictEqual(result.length, 2);
 
     const widget = result.findBy("id", 124);
-    assert.ok(!widget.get("isNew"), "found records are not new");
-    assert.strictEqual(widget.get("name"), "Evil Repellant");
+    assert.false(widget.isNew, "found records are not new");
+    assert.strictEqual(widget.name, "Evil Repellant");
   });
 
   test("destroyRecord", async function (assert) {
     const store = getOwner(this).lookup("service:store");
     const widget = await store.find("widget", 123);
 
-    assert.ok(await store.destroyRecord("widget", widget));
+    const result = await store.destroyRecord("widget", widget);
+    assert.deepEqual(result, { success: true });
   });
 
   test("destroyRecord when new", async function (assert) {
     const store = getOwner(this).lookup("service:store");
     const widget = store.createRecord("widget", { name: "hello" });
 
-    assert.ok(await store.destroyRecord("widget", widget));
+    assert.true(await store.destroyRecord("widget", widget));
   });
 
   test("find embedded", async function (assert) {
     const store = getOwner(this).lookup("service:store");
     const fruit = await store.find("fruit", 1);
-    assert.ok(fruit.get("farmer"), "it has the embedded object");
 
-    const fruitCols = fruit.get("colors");
-    assert.strictEqual(fruitCols.length, 2);
-    assert.strictEqual(fruitCols[0].get("id"), 1);
-    assert.strictEqual(fruitCols[1].get("id"), 2);
+    assert.propContains(
+      fruit.farmer,
+      { id: 1, name: "Old MacDonald" },
+      "it has the embedded object"
+    );
+    assert.strictEqual(fruit.colors.length, 2);
+    assert.strictEqual(fruit.colors[0].id, 1);
+    assert.strictEqual(fruit.colors[1].id, 2);
   });
 
   test("embedded records can be cleared", async function (assert) {
@@ -180,14 +187,14 @@ module("Unit | Service | store", function (hooks) {
     fruit.set("farmer", { dummy: "object" });
 
     fruit = await store.find("fruit", 4);
-    assert.ok(!fruit.get("farmer"));
+    assert.strictEqual(fruit.farmer, null);
   });
 
   test("meta types", async function (assert) {
     const store = getOwner(this).lookup("service:store");
     const barn = await store.find("barn", 1);
     assert.strictEqual(
-      barn.get("owner.name"),
+      barn.owner.name,
       "Old MacDonald",
       "it has the embedded farmer"
     );
@@ -196,24 +203,24 @@ module("Unit | Service | store", function (hooks) {
   test("findAll embedded", async function (assert) {
     const store = getOwner(this).lookup("service:store");
     const fruits = await store.findAll("fruit");
-    assert.strictEqual(fruits.objectAt(0).get("farmer.name"), "Old MacDonald");
+    assert.strictEqual(fruits.objectAt(0).farmer.name, "Old MacDonald");
     assert.strictEqual(
-      fruits.objectAt(0).get("farmer"),
-      fruits.objectAt(1).get("farmer"),
+      fruits.objectAt(0).farmer,
+      fruits.objectAt(1).farmer,
       "points at the same object"
     );
     assert.strictEqual(
-      fruits.get("extras.hello"),
+      fruits.extras.hello,
       "world",
       "it can supply extra information"
     );
 
-    const fruitCols = fruits.objectAt(0).get("colors");
+    const fruitCols = fruits.objectAt(0).colors;
     assert.strictEqual(fruitCols.length, 2);
-    assert.strictEqual(fruitCols[0].get("id"), 1);
-    assert.strictEqual(fruitCols[1].get("id"), 2);
+    assert.strictEqual(fruitCols[0].id, 1);
+    assert.strictEqual(fruitCols[1].id, 2);
 
-    assert.strictEqual(fruits.objectAt(2).get("farmer.name"), "Luke Skywalker");
+    assert.strictEqual(fruits.objectAt(2).farmer.name, "Luke Skywalker");
   });
 
   test("custom primaryKey", async function (assert) {
@@ -232,4 +239,39 @@ module("Unit | Service | store", function (hooks) {
     const users = await store.findAll("user");
     assert.strictEqual(users.objectAt(0).username, "souna");
   });
+
+  test("findFiltered", async function (assert) {
+    pretender.get("/topics/created-by/trout.json", ({ queryParams }) => {
+      assert.deepEqual(queryParams, {
+        order: "latest",
+        tags: ["dev", "bug"],
+      });
+      return response(fixturesByUrl["/c/bug/1/l/latest.json"]);
+    });
+
+    const store = getOwner(this).lookup("service:store");
+    const result = await store.findFiltered("topicList", {
+      filter: "topics/created-by/trout",
+      params: {
+        order: "latest",
+        tags: ["dev", "bug"],
+      },
+    });
+
+    assert.true(result.loaded);
+    assert.true("topic_list" in result);
+    assert.true(Array.isArray(result.topics));
+    assert.strictEqual(result.filter, "topics/created-by/trout");
+  });
+
+  test("Spec incompliant embedded record name", async function (assert) {
+    const store = getOwner(this).lookup("service:store");
+    const fruit = await store.find("fruit", 4);
+
+    assert.propContains(
+      fruit.other_fruit_ids,
+      { apple: 1, banana: 2 },
+      "embedded record remains unhydrated"
+    );
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/unit/utils/decorators-test.js b/app/assets/javascripts/discourse/tests/unit/utils/decorators-test.js
index 1c07f7dcf52..0db211a87b6 100644
--- a/app/assets/javascripts/discourse/tests/unit/utils/decorators-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/utils/decorators-test.js
@@ -6,10 +6,13 @@ import discourseComputed, {
   afterRender,
   debounce,
   observes,
+  on,
 } from "discourse-common/utils/decorators";
+import { observes as nativeClassObserves } from "@ember-decorators/object";
 import { exists } from "discourse/tests/helpers/qunit-helpers";
 import { hbs } from "ember-cli-htmlbars";
 import EmberObject from "@ember/object";
+import { withSilencedDeprecations } from "discourse-common/lib/deprecated";
 
 const fooComponent = Component.extend({
   classNames: ["foo-component"],
@@ -69,15 +72,43 @@ const TestStub = EmberObject.extend({
     this.state = state;
   },
 
-  // Note: it only works in this particular order:
-  // `@observes()` first, then `@debounce()`
   @observes("prop")
+  propChanged() {
+    this.react();
+  },
+
   @debounce(50)
   react() {
     this.otherCounter++;
   },
 });
 
+const ClassSyntaxTestStub = class extends EmberObject {
+  counter = 0;
+  otherCounter = 0;
+  state = null;
+
+  @debounce(50)
+  increment(value) {
+    this.counter += value;
+  }
+
+  @debounce(50, true)
+  setState(state) {
+    this.state = state;
+  }
+
+  @nativeClassObserves("prop")
+  propChanged() {
+    this.react();
+  }
+
+  @debounce(50)
+  react() {
+    this.otherCounter++;
+  }
+};
+
 module("Unit | Utils | decorators", function (hooks) {
   setupRenderingTest(hooks);
 
@@ -165,14 +196,91 @@ module("Unit | Utils | decorators", function (hooks) {
     assert.strictEqual(stub.state, "foo");
   });
 
-  test("debounce works with @observe", async function (assert) {
-    const stub = TestStub.create();
+  test("debounce works with native class syntax", async function (assert) {
+    const stub = ClassSyntaxTestStub.create();
 
-    stub.set("prop", 1);
-    stub.set("prop", 2);
-    stub.set("prop", 3);
+    stub.increment(1);
+    stub.increment(1);
+    stub.increment(1);
     await settled();
 
-    assert.strictEqual(stub.otherCounter, 1);
+    assert.strictEqual(stub.counter, 1);
+
+    stub.increment(500);
+    stub.increment(1000);
+    stub.increment(5);
+    await settled();
+
+    assert.strictEqual(stub.counter, 6);
+  });
+
+  test("@observes works via .extend and native class syntax", async function (assert) {
+    let NativeClassWithObserver;
+    withSilencedDeprecations("discourse.utils-decorators-observes", () => {
+      NativeClassWithObserver = class extends EmberObject {
+        counter = 0;
+        @observes("value")
+        incrementCounter() {
+          this.set("counter", this.counter + 1);
+        }
+      };
+    });
+
+    const ExtendWithObserver = EmberObject.extend({
+      counter: 0,
+      @observes("value")
+      incrementCounter() {
+        this.set("counter", this.counter + 1);
+      },
+    });
+
+    const nativeClassTest = NativeClassWithObserver.create();
+    nativeClassTest.set("value", "one");
+    await settled();
+    nativeClassTest.set("value", "two");
+    await settled();
+    assert.strictEqual(
+      nativeClassTest.counter,
+      2,
+      "observer triggered for native class"
+    );
+
+    const extendTest = ExtendWithObserver.create();
+    extendTest.set("value", "one");
+    await settled();
+    extendTest.set("value", "two");
+    await settled();
+    assert.strictEqual(extendTest.counter, 2, "observer triggered for .extend");
+  });
+
+  test("@on works via .extend and native class syntax", async function (assert) {
+    let NativeClassWithOn;
+    withSilencedDeprecations("discourse.utils-decorators-on", () => {
+      NativeClassWithOn = class extends EmberObject {
+        counter = 0;
+        @on("init")
+        incrementCounter() {
+          this.set("counter", this.counter + 1);
+        }
+      };
+    });
+
+    const ExtendWithOn = EmberObject.extend({
+      counter: 0,
+      @on("init")
+      incrementCounter() {
+        this.set("counter", this.counter + 1);
+      },
+    });
+
+    const nativeClassTest = NativeClassWithOn.create();
+    assert.strictEqual(
+      nativeClassTest.counter,
+      1,
+      "on triggered for native class"
+    );
+
+    const extendTest = ExtendWithOn.create();
+    assert.strictEqual(extendTest.counter, 1, "on triggered for .extend");
   });
 });
diff --git a/app/assets/javascripts/ember-production-deprecations/index.js b/app/assets/javascripts/ember-production-deprecations/index.js
new file mode 100644
index 00000000000..d612546b691
--- /dev/null
+++ b/app/assets/javascripts/ember-production-deprecations/index.js
@@ -0,0 +1,25 @@
+"use strict";
+
+/**
+ * Ember's deprecation and registerDeprecationHandler APIs are stripped from production
+ * builds via the DEBUG flag. This file provides a minimal reimplementation of them
+ * to be used in production.
+ *
+ * Designed to be used alongside our fork of babel-plugin-debug-macros, which maintains
+ * deprecate calls in production builds. This fork is introduced via a custom yarn resolution
+ * in app/assets/javascripts/package.json.
+ *
+ * https://github.com/discourse/babel-plugin-debug-macros/commit/d179d613bf
+ */
+module.exports = {
+  name: require("./package").name,
+
+  included() {
+    this._super.included.apply(this, arguments);
+    this.app.import("vendor/ember-production-deprecations/deprecate-shim.js");
+  },
+
+  isDevelopingAddon() {
+    return true;
+  },
+};
diff --git a/app/assets/javascripts/ember-production-deprecations/package.json b/app/assets/javascripts/ember-production-deprecations/package.json
new file mode 100644
index 00000000000..7482baa6f5e
--- /dev/null
+++ b/app/assets/javascripts/ember-production-deprecations/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "ember-production-deprecations",
+  "version": "1.0.0",
+  "description": "Prevents ember-cli from stripping deprecations in the production build",
+  "author": "Discourse",
+  "license": "GPL-2.0-only",
+  "keywords": [
+    "ember-addon"
+  ],
+  "ember-addon": {
+    "after": "ember-cli-babel",
+    "before": "ember-cli-deprecation-workflow"
+  }
+}
diff --git a/app/assets/javascripts/ember-production-deprecations/vendor/ember-production-deprecations/deprecate-shim.js b/app/assets/javascripts/ember-production-deprecations/vendor/ember-production-deprecations/deprecate-shim.js
new file mode 100644
index 00000000000..eee21f17aca
--- /dev/null
+++ b/app/assets/javascripts/ember-production-deprecations/vendor/ember-production-deprecations/deprecate-shim.js
@@ -0,0 +1,41 @@
+// Ember's deprecation and registerDeprecationHandler APIs are stripped from production
+// builds via the DEBUG flag. This file provides a minimal reimplementation of them
+// to be used in production
+
+define("discourse/lib/deprecate-shim", ["exports"], function (exports) {
+  exports.applyShim = function () {
+    let handler = () => {};
+    require("@ember/debug/lib/deprecate").registerHandler = (fn) => {
+      const next = handler;
+      handler = (message, options) => fn(message, options, next);
+    };
+
+    require("@ember/debug").deprecate = (message, test, options) => {
+      if (test) {
+        return;
+      }
+      handler(message, options);
+    };
+
+    function formatMessage(message, options) {
+      if (options && options.id) {
+        message = message + ` [deprecation id: ${options.id}]`;
+      }
+      if (options && options.url) {
+        message += ` See ${options.url} for more details.`;
+      }
+      return message;
+    }
+
+    require("@ember/debug").registerDeprecationHandler(
+      function shimLogDeprecationToConsole(message, options) {
+        var updatedMessage = formatMessage(message, options);
+        console.warn(`DEPRECATION: ${updatedMessage}`);
+      }
+    );
+  };
+});
+
+if (!require("@glimmer/env").DEBUG) {
+  require("discourse/lib/deprecate-shim").applyShim();
+}
diff --git a/app/assets/javascripts/locales/i18n.js b/app/assets/javascripts/locales/i18n.js
index dab2074fc6d..686363acb5e 100644
--- a/app/assets/javascripts/locales/i18n.js
+++ b/app/assets/javascripts/locales/i18n.js
@@ -266,6 +266,19 @@ I18n.toHumanSize = function (number, options) {
   return number;
 };
 
+I18n.listJoiner = function (listOfStrings, delimiter) {
+  if (listOfStrings.length === 1) {
+    return listOfStrings[0];
+  }
+
+  if (listOfStrings.length === 2) {
+    return listOfStrings[0] + " " + delimiter + " " + listOfStrings[1];
+  }
+
+  var lastString = listOfStrings.pop();
+  return listOfStrings.concat(delimiter).join(`, `) + " " + lastString;
+};
+
 I18n.pluralizer = function (locale) {
   var pluralizer = this.pluralizationRules[locale];
   if (pluralizer !== undefined) return pluralizer;
diff --git a/app/assets/javascripts/package.json b/app/assets/javascripts/package.json
index b1a281a0edc..c896264ae4b 100644
--- a/app/assets/javascripts/package.json
+++ b/app/assets/javascripts/package.json
@@ -1,19 +1,32 @@
 {
   "private": true,
+  "scripts": {
+    "postinstall": "patch-package"
+  },
   "workspaces": [
     "admin",
     "bootstrap-json",
+    "deprecation-silencer",
     "dialog-holder",
     "discourse",
     "discourse-common",
-    "discourse-ensure-deprecation-order",
     "discourse-hbr",
     "discourse-plugins",
     "discourse-widget-hbs",
     "ember-cli-progress-ci",
+    "ember-production-deprecations",
     "pretty-text",
     "select-kit",
     "truth-helpers",
     "wizard"
-  ]
+  ],
+  "resolutions": {
+    "**/babel-plugin-debug-macros": "npm:@discourse/babel-plugin-debug-macros@0.4.0-pre1",
+    "**/babel-plugin-ember-template-compilation": "2.0.0",
+    "**/unset-value": "2.0.1"
+  },
+  "devDependencies": {
+    "patch-package": "^8.0.0",
+    "postinstall-postinstall": "^2.1.0"
+  }
 }
diff --git a/app/assets/javascripts/patches/@ember+jquery+2.0.0.patch b/app/assets/javascripts/patches/@ember+jquery+2.0.0.patch
new file mode 100644
index 00000000000..841388837bf
--- /dev/null
+++ b/app/assets/javascripts/patches/@ember+jquery+2.0.0.patch
@@ -0,0 +1,32 @@
+diff --git a/node_modules/@ember/jquery/vendor/jquery/component.dollar.js b/node_modules/@ember/jquery/vendor/jquery/component.dollar.js
+index 8c0cfd5..4c211e2 100644
+--- a/node_modules/@ember/jquery/vendor/jquery/component.dollar.js
++++ b/node_modules/@ember/jquery/vendor/jquery/component.dollar.js
+@@ -1,8 +1,16 @@
+ import { assert, deprecate } from '@ember/debug';
+-import EmberObject from '@ember/object';
+-import Component from '@ember/component';
+ 
+ (function() {
++  // importing these, specifically, is done so that we don't trigger the
++  // ember-global deprecation
++  //
++  // We had tried to import at the top of this file, but there is a build time transform
++  // removing those, and re-triggering the ember-global deprecation.
++  // See: https://deprecations.emberjs.com/v3.x#toc_ember-global
++  // for more information
++  const EmberObject = require("@ember/object").default;
++  const Component = require("@ember/component").default;
++
+   /*
+    * This non-standard use of `reopen` and `call` allows the component
+    * base class to be reopened without triggering the
+@@ -28,6 +36,8 @@ import Component from '@ember/component';
+       );
+ 
+       if (this.element) {
++        // same technique the shim uses
++        let jQuery = self['jQuery'];
+         return sel ? jQuery(sel, this.element) : jQuery(this.element);
+       }
+     }
diff --git a/app/assets/javascripts/patches/ember-source+3.28.12.patch b/app/assets/javascripts/patches/ember-source+3.28.12.patch
new file mode 100644
index 00000000000..9cd58f05204
--- /dev/null
+++ b/app/assets/javascripts/patches/ember-source+3.28.12.patch
@@ -0,0 +1,18 @@
+diff --git a/node_modules/ember-source/lib/index.js b/node_modules/ember-source/lib/index.js
+index ce887fbeb..8caf078c5 100644
+--- a/node_modules/ember-source/lib/index.js
++++ b/node_modules/ember-source/lib/index.js
+@@ -45,13 +45,6 @@ module.exports = {
+   init() {
+     this._super.init && this._super.init.apply(this, arguments);
+ 
+-    if ('ember' in this.project.bowerDependencies()) {
+-      // TODO: move this to a throw soon.
+-      this.ui.writeWarnLine(
+-        'Ember.js is now provided by node_module `ember-source`, please remove it from bower'
+-      );
+-    }
+-
+     // resets `this.root` to the correct location by default ember-cli
+     // considers `__dirname` here to be the root, but since our main entry
+     // point is within a subfolder we need to correct that
diff --git a/app/assets/javascripts/patches/virtual-dom+2.1.1.patch b/app/assets/javascripts/patches/virtual-dom+2.1.1.patch
new file mode 100644
index 00000000000..a7a0c399b52
--- /dev/null
+++ b/app/assets/javascripts/patches/virtual-dom+2.1.1.patch
@@ -0,0 +1,43 @@
+diff --git a/node_modules/virtual-dom/vtree/diff.js b/node_modules/virtual-dom/vtree/diff.js
+index b5bccbd..058d6b3 100644
+--- a/node_modules/virtual-dom/vtree/diff.js
++++ b/node_modules/virtual-dom/vtree/diff.js
+@@ -311,6 +311,38 @@ function reorder(aChildren, bChildren) {
+     var inserts = []
+     var simulateItem
+ 
++    // handle prepends without reordering old elements
++    var shift = bChildren.length - aChildren.length
++    if (shift > 0 && simulate.length === bChildren.length) {
++        var prepend = true
++        for (var i = 0; prepend && i < simulate.length; i++) {
++            prepend = simulate[i] && simulate[i].key
++        }
++        for (var i = 0; prepend && i < aChildren.length; i++) {
++            prepend = aChildren[i].key === bChildren[i + shift].key
++        }
++
++        if (prepend) {
++            for (var i = 0; i < shift; i++) {
++                removes.push({
++                    from: aChildren.length,
++                    key: bChildren[i].key
++                })
++                inserts.push({
++                    to: i,
++                    key: bChildren[i].key
++                })
++            }
++            return {
++                children: newChildren,
++                moves: {
++                    removes: removes,
++                    inserts: inserts
++                }
++            }
++        }
++    }
++
+     for (var k = 0; k < bChildren.length;) {
+         var wantedItem = bChildren[k]
+         simulateItem = simulate[simulateIndex]
diff --git a/app/assets/javascripts/polyfills.js b/app/assets/javascripts/polyfills.js
index 381b769e394..c5c0caaa899 100644
--- a/app/assets/javascripts/polyfills.js
+++ b/app/assets/javascripts/polyfills.js
@@ -1,325 +1,5 @@
 /* eslint-disable */
 
-// Needed for iOS <= 13.3
-if (!String.prototype.replaceAll) {
-  String.prototype.replaceAll = function (
-    pattern,
-    replacementStringOrFunction
-  ) {
-    let regex;
-
-    if (
-      Object.prototype.toString.call(pattern).toLowerCase() ===
-      "[object regexp]"
-    ) {
-      regex = pattern;
-    } else {
-      const escapedStr = pattern.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-      regex = new RegExp(escapedStr, "g");
-    }
-
-    return this.replace(regex, replacementStringOrFunction);
-  };
-}
-
-// Needed for Safari 15.2 and below
-// from: https://github.com/iamdustan/smoothscroll
-(function () {
-  "use strict";
-
-  function e() {
-    var e = window;
-    var t = document;
-    if (
-      "scrollBehavior" in t.documentElement.style &&
-      e.__forceSmoothScrollPolyfill__ !== true
-    ) {
-      return;
-    }
-    var o = e.HTMLElement || e.Element;
-    var r = 1.8;
-    var l = {
-      scroll: e.scroll || e.scrollTo,
-      scrollBy: e.scrollBy,
-      elementScroll: o.prototype.scroll || s,
-      scrollIntoView: o.prototype.scrollIntoView,
-    };
-    var n =
-      e.performance && e.performance.now
-        ? e.performance.now.bind(e.performance)
-        : Date.now;
-
-    function i(e) {
-      var t = ["MSIE ", "Trident/", "Edge/"];
-      return new RegExp(t.join("|")).test(e);
-    }
-    var f = i(e.navigator.userAgent) ? 1 : 0;
-
-    function s(e, t) {
-      this.scrollLeft = e;
-      this.scrollTop = t;
-    }
-
-    function c(e) {
-      return 0.5 * (1 - Math.cos(Math.PI * e));
-    }
-
-    function a(e) {
-      if (
-        e === null ||
-        typeof e !== "object" ||
-        e.behavior === undefined ||
-        e.behavior === "auto" ||
-        e.behavior === "instant"
-      ) {
-        return true;
-      }
-      if (typeof e === "object" && e.behavior === "smooth") {
-        return false;
-      }
-      throw new TypeError(
-        "behavior member of ScrollOptions " +
-          e.behavior +
-          " is not a valid value for enumeration ScrollBehavior."
-      );
-    }
-
-    function u(e, t) {
-      if (t === "Y") {
-        return e.clientHeight + f < e.scrollHeight;
-      }
-      if (t === "X") {
-        return e.clientWidth + f < e.scrollWidth;
-      }
-    }
-
-    function d(t, o) {
-      var r = e.getComputedStyle(t, null)["overflow" + o];
-      return r === "auto" || r === "scroll";
-    }
-
-    function p(e) {
-      var t = u(e, "Y") && d(e, "Y");
-      var o = u(e, "X") && d(e, "X");
-      return t || o;
-    }
-
-    function h(e) {
-      while (e !== t.body && p(e) === false) {
-        e = e.parentNode || e.host;
-      }
-      return e;
-    }
-
-    function v(e, t) {
-      var o = r / t;
-      var l = Math.pow(1.16, Math.max(e / 80, 1));
-      return o * e * (1 / l);
-    }
-
-    function y(t) {
-      var o = n();
-      var r = e.devicePixelRatio;
-      var l;
-      var i;
-      var f;
-      var s;
-      var a = v(Math.abs(t.x - t.startX), r);
-      var u = v(Math.abs(t.y - t.startY), r);
-      var d = (o - t.startTime) / a;
-      var p = (o - t.startTime) / u;
-      d = d > 1 ? 1 : d;
-      p = p > 1 ? 1 : p;
-      l = c(d);
-      i = c(p);
-      f = t.startX + (t.x - t.startX) * l;
-      s = t.startY + (t.y - t.startY) * i;
-      t.method.call(t.scrollable, f, s);
-      if (f !== t.x || s !== t.y) {
-        e.requestAnimationFrame(y.bind(e, t));
-      }
-    }
-
-    function m(o, r, i) {
-      var f;
-      var c;
-      var a;
-      var u;
-      var d = n();
-      if (o === t.body) {
-        f = e;
-        c = e.scrollX || e.pageXOffset;
-        a = e.scrollY || e.pageYOffset;
-        u = l.scroll;
-      } else {
-        f = o;
-        c = o.scrollLeft;
-        a = o.scrollTop;
-        u = s;
-      }
-      y({
-        scrollable: f,
-        method: u,
-        startTime: d,
-        startX: c,
-        startY: a,
-        x: r,
-        y: i,
-      });
-    }
-    e.scroll = e.scrollTo = function () {
-      if (arguments[0] === undefined) {
-        return;
-      }
-      if (a(arguments[0]) === true) {
-        l.scroll.call(
-          e,
-          arguments[0].left !== undefined
-            ? arguments[0].left
-            : typeof arguments[0] !== "object"
-            ? arguments[0]
-            : e.scrollX || e.pageXOffset,
-          arguments[0].top !== undefined
-            ? arguments[0].top
-            : arguments[1] !== undefined
-            ? arguments[1]
-            : e.scrollY || e.pageYOffset
-        );
-        return;
-      }
-      m.call(
-        e,
-        t.body,
-        arguments[0].left !== undefined
-          ? ~~arguments[0].left
-          : e.scrollX || e.pageXOffset,
-        arguments[0].top !== undefined
-          ? ~~arguments[0].top
-          : e.scrollY || e.pageYOffset
-      );
-    };
-    e.scrollBy = function () {
-      if (arguments[0] === undefined) {
-        return;
-      }
-      if (a(arguments[0])) {
-        l.scrollBy.call(
-          e,
-          arguments[0].left !== undefined
-            ? arguments[0].left
-            : typeof arguments[0] !== "object"
-            ? arguments[0]
-            : 0,
-          arguments[0].top !== undefined
-            ? arguments[0].top
-            : arguments[1] !== undefined
-            ? arguments[1]
-            : 0
-        );
-        return;
-      }
-      m.call(
-        e,
-        t.body,
-        ~~arguments[0].left + (e.scrollX || e.pageXOffset),
-        ~~arguments[0].top + (e.scrollY || e.pageYOffset)
-      );
-    };
-    o.prototype.scroll = o.prototype.scrollTo = function () {
-      if (arguments[0] === undefined) {
-        return;
-      }
-      if (a(arguments[0]) === true) {
-        if (typeof arguments[0] === "number" && arguments[1] === undefined) {
-          throw new SyntaxError("Value could not be converted");
-        }
-        l.elementScroll.call(
-          this,
-          arguments[0].left !== undefined
-            ? ~~arguments[0].left
-            : typeof arguments[0] !== "object"
-            ? ~~arguments[0]
-            : this.scrollLeft,
-          arguments[0].top !== undefined
-            ? ~~arguments[0].top
-            : arguments[1] !== undefined
-            ? ~~arguments[1]
-            : this.scrollTop
-        );
-        return;
-      }
-      var e = arguments[0].left;
-      var t = arguments[0].top;
-      m.call(
-        this,
-        this,
-        typeof e === "undefined" ? this.scrollLeft : ~~e,
-        typeof t === "undefined" ? this.scrollTop : ~~t
-      );
-    };
-    o.prototype.scrollBy = function () {
-      if (arguments[0] === undefined) {
-        return;
-      }
-      if (a(arguments[0]) === true) {
-        l.elementScroll.call(
-          this,
-          arguments[0].left !== undefined
-            ? ~~arguments[0].left + this.scrollLeft
-            : ~~arguments[0] + this.scrollLeft,
-          arguments[0].top !== undefined
-            ? ~~arguments[0].top + this.scrollTop
-            : ~~arguments[1] + this.scrollTop
-        );
-        return;
-      }
-      this.scroll({
-        left: ~~arguments[0].left + this.scrollLeft,
-        top: ~~arguments[0].top + this.scrollTop,
-        behavior: arguments[0].behavior,
-      });
-    };
-    o.prototype.scrollIntoView = function () {
-      if (a(arguments[0]) === true) {
-        l.scrollIntoView.call(
-          this,
-          arguments[0] === undefined ? true : arguments[0]
-        );
-        return;
-      }
-      var o = h(this);
-      var r = o.getBoundingClientRect();
-      var n = this.getBoundingClientRect();
-      if (o !== t.body) {
-        m.call(
-          this,
-          o,
-          o.scrollLeft + n.left - r.left,
-          o.scrollTop + n.top - r.top
-        );
-        if (e.getComputedStyle(o).position !== "fixed") {
-          e.scrollBy({
-            left: r.left,
-            top: r.top,
-            behavior: "smooth",
-          });
-        }
-      } else {
-        e.scrollBy({
-          left: n.left,
-          top: n.top,
-          behavior: "smooth",
-        });
-      }
-    };
-  }
-  if (typeof exports === "object" && typeof module !== "undefined") {
-    module.exports = {
-      polyfill: e,
-    };
-  } else {
-    e();
-  }
-})();
+// Polyfills for old browsers can be added here
 
 /* eslint-enable */
diff --git a/app/assets/javascripts/pretty-text/addon/emoji.js b/app/assets/javascripts/pretty-text/addon/emoji.js
index 4094480496b..6fa708814bb 100644
--- a/app/assets/javascripts/pretty-text/addon/emoji.js
+++ b/app/assets/javascripts/pretty-text/addon/emoji.js
@@ -88,6 +88,11 @@ export function performEmojiUnescape(string, opts) {
       classes += ` ${opts.class}`;
     }
 
+    // hides denied emojis and aliases from the emoji picker
+    if (opts.emojiDenyList?.includes(emojiVal)) {
+      return "";
+    }
+
     const isReplacable =
       (isEmoticon || hasEndingColon || isUnicodeEmoticon) &&
       isReplacableInlineEmoji(string, index, opts.inlineEmoji);
@@ -184,6 +189,7 @@ let toSearch;
 export function emojiSearch(term, options) {
   const maxResults = options?.maxResults;
   const diversity = options?.diversity;
+  const exclude = options?.exclude || [];
   if (maxResults === 0) {
     return [];
   }
@@ -200,7 +206,8 @@ export function emojiSearch(term, options) {
 
   function addResult(t) {
     const val = aliasMap.get(t) || t;
-    if (!results.includes(val)) {
+    // dont add skin tone variations or alias of denied emoji to search results
+    if (!results.includes(val) && !exclude.includes(val)) {
       if (diversity && diversity > 1 && isSkinTonableEmoji(val)) {
         results.push(`${val}:t${diversity}`);
       } else {
diff --git a/app/assets/javascripts/pretty-text/addon/emoji/data.js b/app/assets/javascripts/pretty-text/addon/emoji/data.js
index e24f72e4459..1a28d7beef6 100644
--- a/app/assets/javascripts/pretty-text/addon/emoji/data.js
+++ b/app/assets/javascripts/pretty-text/addon/emoji/data.js
@@ -16,7 +16,6 @@ export const emojis = [
   "blush",
   "slightly_smiling_face",
   "upside_down_face",
-  "relaxed",
   "yum",
   "relieved",
   "heart_eyes",
@@ -2341,6 +2340,7 @@ export const aliases = {
   face_vomiting: ["puke"],
   smile: ["grinning_face_with_smiling_eyes"],
   frowning_with_open_mouth: ["frowning_face_with_open_mouth"],
+  smiling_face: ["relaxed"],
 };
 export const searchAliases = {
   sad: [
@@ -6376,7 +6376,7 @@ export const replacements = {
   "😊": "blush",
   "🙂": "slightly_smiling_face",
   "🙃": "upside_down_face",
-  "☺": "relaxed",
+  "☺": "smiling_face",
   "😋": "yum",
   "😌": "relieved",
   "😍": "heart_eyes",
diff --git a/app/assets/javascripts/pretty-text/addon/highlightjs-aliases.js b/app/assets/javascripts/pretty-text/addon/highlightjs-aliases.js
new file mode 100644
index 00000000000..9a9f27b3ea5
--- /dev/null
+++ b/app/assets/javascripts/pretty-text/addon/highlightjs-aliases.js
@@ -0,0 +1,123 @@
+// DO NOT EDIT THIS FILE!!!
+// Update it by running `rake javascript:update_constants`
+
+export const HLJS_ALIASES = {
+  bash: ["sh"],
+  c: ["h"],
+  cpp: ["cc", "c++", "h++", "hpp", "hh", "hxx", "cxx"],
+  csharp: ["cs", "c#"],
+  diff: ["patch"],
+  go: ["golang"],
+  graphql: ["gql"],
+  ini: ["toml"],
+  java: ["jsp"],
+  javascript: ["js", "jsx", "mjs", "cjs"],
+  kotlin: ["kt", "kts"],
+  makefile: ["mk", "mak", "make"],
+  xml: [
+    "html",
+    "xhtml",
+    "rss",
+    "atom",
+    "xjb",
+    "xsd",
+    "xsl",
+    "plist",
+    "wsf",
+    "svg",
+  ],
+  markdown: ["md", "mkdown", "mkd"],
+  objectivec: ["mm", "objc", "obj-c", "obj-c++", "objective-c++"],
+  perl: ["pl", "pm"],
+  plaintext: ["text", "txt"],
+  python: ["py", "gyp", "ipython"],
+  "python-repl": ["pycon"],
+  ruby: ["rb", "gemspec", "podspec", "thor", "irb"],
+  rust: ["rs"],
+  shell: ["console", "shellsession"],
+  typescript: ["ts", "tsx"],
+  vbnet: ["vb"],
+  yaml: ["yml"],
+  actionscript: ["as"],
+  angelscript: ["asc"],
+  apache: ["apacheconf"],
+  applescript: ["osascript"],
+  arduino: ["ino"],
+  armasm: ["arm"],
+  asciidoc: ["adoc"],
+  autohotkey: ["ahk"],
+  axapta: ["x++"],
+  brainfuck: ["bf"],
+  "c-like": [],
+  capnproto: ["capnp"],
+  clean: ["icl", "dcl"],
+  clojure: ["clj", "edn"],
+  cmake: ["cmake.in"],
+  coffeescript: ["coffee", "cson", "iced"],
+  cos: ["cls"],
+  crmsh: ["crm", "pcmk"],
+  crystal: ["cr"],
+  delphi: ["dpr", "dfm", "pas", "pascal"],
+  django: ["jinja"],
+  dns: ["bind", "zone"],
+  dockerfile: ["docker"],
+  dos: ["bat", "cmd"],
+  dust: ["dst"],
+  elixir: ["ex", "exs"],
+  erlang: ["erl"],
+  excel: ["xlsx", "xls"],
+  fortran: ["f90", "f95"],
+  fsharp: ["fs", "f#"],
+  gams: ["gms"],
+  gauss: ["gss"],
+  gcode: ["nc"],
+  gherkin: ["feature"],
+  handlebars: ["hbs", "html.hbs", "html.handlebars", "htmlbars"],
+  haskell: ["hs"],
+  haxe: ["hx"],
+  htmlbars: ["hbs", "html.hbs", "html.handlebars", "htmlbars"],
+  http: ["https"],
+  hy: ["hylang"],
+  inform7: ["i7"],
+  "jboss-cli": ["wildfly-cli"],
+  "julia-repl": ["jldoctest"],
+  lasso: ["ls", "lassoscript"],
+  latex: ["tex"],
+  livescript: ["ls"],
+  mathematica: ["mma", "wl"],
+  mercury: ["m", "moo"],
+  mipsasm: ["mips"],
+  moonscript: ["moon"],
+  nestedtext: ["nt"],
+  nginx: ["nginxconf"],
+  nimrod: ["nim"],
+  nix: ["nixos"],
+  ocaml: ["ml"],
+  openscad: ["scad"],
+  pf: ["pf.conf"],
+  pgsql: ["postgres", "postgresql"],
+  powershell: ["pwsh", "ps", "ps1"],
+  processing: ["pde"],
+  puppet: ["pp"],
+  purebasic: ["pb", "pbi"],
+  q: ["k", "kdb"],
+  qml: ["qt"],
+  reasonml: ["re"],
+  roboconf: ["graph", "instances"],
+  routeros: ["mikrotik"],
+  scilab: ["sci"],
+  smalltalk: ["st"],
+  sml: ["ml"],
+  sql_more: ["mysql", "oracle"],
+  stan: ["stanfuncs"],
+  stata: ["do", "ado"],
+  step21: ["p21", "step", "stp"],
+  stylus: ["styl"],
+  tcl: ["tk"],
+  twig: ["craftcms"],
+  vbscript: ["vbs"],
+  verilog: ["v", "sv", "svh"],
+  xl: ["tao"],
+  xquery: ["xpath", "xq"],
+  zephir: ["zep"],
+};
diff --git a/app/assets/javascripts/pretty-text/addon/pretty-text.js b/app/assets/javascripts/pretty-text/addon/pretty-text.js
index 631a9fb7f8b..7d572eb5be5 100644
--- a/app/assets/javascripts/pretty-text/addon/pretty-text.js
+++ b/app/assets/javascripts/pretty-text/addon/pretty-text.js
@@ -43,6 +43,7 @@ export function buildOptions(state) {
     customEmojiTranslation,
     watchedWordsReplace,
     watchedWordsLink,
+    emojiDenyList,
     featuresOverride,
     markdownItRules,
     additionalOptions,
@@ -88,6 +89,7 @@ export function buildOptions(state) {
     disableEmojis,
     watchedWordsReplace,
     watchedWordsLink,
+    emojiDenyList,
     featuresOverride,
     markdownItRules,
     additionalOptions,
diff --git a/app/assets/javascripts/pretty-text/addon/sanitizer.js b/app/assets/javascripts/pretty-text/addon/sanitizer.js
index 0800dd41ae5..d765b8889de 100644
--- a/app/assets/javascripts/pretty-text/addon/sanitizer.js
+++ b/app/assets/javascripts/pretty-text/addon/sanitizer.js
@@ -127,6 +127,7 @@ export function sanitize(text, allowLister) {
             hrefAllowed(value, extraHrefMatchers)) ||
           (tag === "iframe" &&
             name === "src" &&
+            !value.match(/\/\.+\//) &&
             allowedIframes.some((i) => {
               return value.toLowerCase().startsWith((i || "").toLowerCase());
             }))
diff --git a/app/assets/javascripts/pretty-text/config/ember-cli-update.json b/app/assets/javascripts/pretty-text/config/ember-cli-update.json
index c4e56160cb7..994928cd9c9 100644
--- a/app/assets/javascripts/pretty-text/config/ember-cli-update.json
+++ b/app/assets/javascripts/pretty-text/config/ember-cli-update.json
@@ -3,14 +3,16 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "3.28.5",
+      "version": "5.0.0",
       "blueprints": [
         {
           "name": "addon",
           "outputRepo": "https://github.com/ember-cli/ember-addon-output",
           "codemodsSource": "ember-addon-codemods-manifest@1",
           "isBaseBlueprint": true,
-          "options": ["--no-welcome"]
+          "options": [
+            "--no-welcome"
+          ]
         }
       ]
     }
diff --git a/app/assets/javascripts/pretty-text/config/ember-try.js b/app/assets/javascripts/pretty-text/config/ember-try.js
deleted file mode 100644
index 3a64030a8a2..00000000000
--- a/app/assets/javascripts/pretty-text/config/ember-try.js
+++ /dev/null
@@ -1,119 +0,0 @@
-"use strict";
-
-const getChannelURL = require("ember-source-channel-url");
-const { embroiderSafe, embroiderOptimized } = require("@embroider/test-setup");
-
-module.exports = async function () {
-  return {
-    useYarn: true,
-    scenarios: [
-      {
-        name: "ember-lts-3.8",
-        npm: {
-          devDependencies: {
-            "ember-source": "~3.8.0",
-          },
-        },
-      },
-      {
-        name: "ember-lts-3.12",
-        npm: {
-          devDependencies: {
-            "ember-source": "~3.12.0",
-          },
-        },
-      },
-      {
-        name: "ember-lts-3.20",
-        npm: {
-          devDependencies: {
-            "ember-source": "~3.20.5",
-          },
-        },
-      },
-      {
-        name: "ember-lts-3.24",
-        npm: {
-          devDependencies: {
-            "ember-source": "~3.24.3",
-          },
-        },
-      },
-      {
-        name: "ember-lts-3.28",
-        npm: {
-          devDependencies: {
-            "ember-source": "~3.28.0",
-          },
-        },
-      },
-      {
-        name: "ember-release",
-        npm: {
-          devDependencies: {
-            "ember-source": await getChannelURL("release"),
-          },
-        },
-      },
-      {
-        name: "ember-beta",
-        npm: {
-          devDependencies: {
-            "ember-source": await getChannelURL("beta"),
-          },
-        },
-      },
-      {
-        name: "ember-canary",
-        npm: {
-          devDependencies: {
-            "ember-source": await getChannelURL("canary"),
-          },
-        },
-      },
-      // The default `.travis.yml` runs this scenario via `yarn test`,
-      // not via `ember try`. It's still included here so that running
-      // `ember try:each` manually or from a customized CI config will run it
-      // along with all the other scenarios.
-      {
-        name: "ember-default",
-        npm: {
-          devDependencies: {},
-        },
-      },
-      {
-        name: "ember-default-with-jquery",
-        env: {
-          EMBER_OPTIONAL_FEATURES: JSON.stringify({
-            "jquery-integration": true,
-          }),
-        },
-        npm: {
-          devDependencies: {
-            "@ember/jquery": "^0.5.1",
-          },
-        },
-      },
-      {
-        name: "ember-classic",
-        env: {
-          EMBER_OPTIONAL_FEATURES: JSON.stringify({
-            "application-template-wrapper": true,
-            "default-async-observers": false,
-            "template-only-glimmer-components": false,
-          }),
-        },
-        npm: {
-          devDependencies: {
-            "ember-source": "~3.28.0",
-          },
-          ember: {
-            edition: "classic",
-          },
-        },
-      },
-      embroiderSafe(),
-      embroiderOptimized(),
-    ],
-  };
-};
diff --git a/app/assets/javascripts/pretty-text/config/environment.js b/app/assets/javascripts/pretty-text/config/environment.js
deleted file mode 100644
index b7238585e61..00000000000
--- a/app/assets/javascripts/pretty-text/config/environment.js
+++ /dev/null
@@ -1,5 +0,0 @@
-"use strict";
-
-module.exports = function (/* environment, appConfig */) {
-  return {};
-};
diff --git a/app/assets/javascripts/pretty-text/ember-cli-build.js b/app/assets/javascripts/pretty-text/ember-cli-build.js
index 60eb15c12a9..da57a67830a 100644
--- a/app/assets/javascripts/pretty-text/ember-cli-build.js
+++ b/app/assets/javascripts/pretty-text/ember-cli-build.js
@@ -3,7 +3,7 @@
 const EmberAddon = require("ember-cli/lib/broccoli/ember-addon");
 
 module.exports = function (defaults) {
-  let app = new EmberAddon(defaults, {
+  const app = new EmberAddon(defaults, {
     autoImport: {
       publicAssetURL: "",
     },
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-inline.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-inline.js
index 27a1a1d4284..681dadf943a 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-inline.js
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-inline.js
@@ -182,56 +182,88 @@ export function setup(helper) {
     const simpleUrlRegex = /^https?:\/\//;
     ruler.push("url", {
       tag: "url",
-      wrap(startToken, endToken, tagInfo, content, state) {
-        const url = (tagInfo.attrs["_default"] || content).trim();
-        let linkifyFound = false;
 
-        if (state.md.options.linkify) {
-          const tokens = state.tokens;
-          const startIndex = tokens.indexOf(startToken);
-          const endIndex = tokens.indexOf(endToken);
+      replace(state, tagInfo, content) {
+        let token;
 
-          // reuse existing tokens from linkify if they exist
-          for (let index = startIndex + 1; index < endIndex; index++) {
-            const token = tokens[index];
+        // we need to tokenize the content and reinsert tokens in the stream
+        // this is because we need to support nested bbcode
+        let tokens = [];
+        md.inline.parse(content, state.md, state.env, tokens);
 
-            if (
-              token.markup === "linkify" &&
-              token.info === "auto" &&
-              token.type === "link_open"
-            ) {
-              linkifyFound = true;
-              token.attrs.push(["data-bbcode", "true"]);
+        let url = tagInfo.attrs["_default"];
+
+        if (!url) {
+          // try to find the actual url in the tokens
+          for (let i = 0; i < tokens.length; i++) {
+            token = tokens[i];
+            // nested linkify or link, just pick it
+            if (token.type === "link_open") {
+              for (let j = 0; j < token.attrs.length; j++) {
+                if (token.attrs[j][0] === "href") {
+                  url = token.attrs[j][1];
+                  break;
+                }
+              }
+              if (url) {
+                break;
+              }
+            }
+            if (token.type === "text") {
+              url = token.content;
               break;
             }
           }
         }
 
-        if (!linkifyFound && simpleUrlRegex.test(url)) {
-          startToken.type = "link_open";
-          startToken.tag = "a";
-          startToken.attrs = [
+        if (md.linkify) {
+          let match = null;
+
+          // linkify has trouble with strings containing spaces, so just ban
+          // them outright
+          if (url && !url.includes(" ")) {
+            match = md.linkify.matchAtStart(url);
+            if (!match) {
+              match = md.linkify.matchAtStart("https://" + url);
+            }
+          }
+
+          if (match) {
+            url = match.url;
+          } else {
+            url = null;
+          }
+        } else if (!url.match(simpleUrlRegex)) {
+          url = "https://" + url;
+        }
+
+        if (url) {
+          token = state.push("link_open", "a", 0);
+          token.attrs = ["href", url];
+          token.attrs = [
             ["href", url],
             ["data-bbcode", "true"],
           ];
-          startToken.content = "";
-          startToken.nesting = 1;
-
-          endToken.type = "link_close";
-          endToken.tag = "a";
-          endToken.content = "";
-          endToken.nesting = -1;
-        } else {
-          // just strip the bbcode tag
-          endToken.content = "";
-          startToken.content = "";
-
-          // edge case, we don't want this detected as a onebox if auto linked
-          // this ensures it is not stripped
-          startToken.type = "html_inline";
+          token.content = "";
+          token.nesting = 1;
         }
 
-        return false;
+        for (let i = 0; i < tokens.length; i++) {
+          token = tokens[i];
+          if (token.type === "link_open" || token.type === "link_close") {
+            // linkify nested tokens, do nothing
+          } else {
+            state.tokens.push(token);
+          }
+        }
+
+        if (url) {
+          token = state.push("link_close", "a", 0);
+          token.nesting = -1;
+          token.content = "";
+        }
+
+        return true;
       },
     });
 
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/code.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/code.js
index fa935ea7682..b79450cc668 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/code.js
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/code.js
@@ -1,3 +1,5 @@
+import { HLJS_ALIASES } from "pretty-text/highlightjs-aliases";
+
 // we need a custom renderer for code blocks cause we have a slightly non compliant
 // format with special handling for text and so on
 const TEXT_CODE_CLASSES = ["text", "pre", "plain"];
@@ -77,10 +79,20 @@ function render(tokens, idx, options, env, slf, md) {
 
 export function setup(helper) {
   helper.registerOptions((opts, siteSettings) => {
-    opts.defaultCodeLang = siteSettings.default_code_lang;
-    opts.acceptableCodeClasses = (siteSettings.highlighted_languages || "")
+    let languageAliases = [];
+    const languages = (siteSettings.highlighted_languages || "")
       .split("|")
-      .filter(Boolean)
+      .filter(Boolean);
+
+    languages.forEach((lang) => {
+      if (HLJS_ALIASES[lang]) {
+        languageAliases = languageAliases.concat(HLJS_ALIASES[lang]);
+      }
+    });
+
+    opts.defaultCodeLang = siteSettings.default_code_lang;
+    opts.acceptableCodeClasses = languages
+      .concat(languageAliases)
       .concat(["auto", "plaintext"]);
   });
 
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/custom-typographer-replacements.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/custom-typographer-replacements.js
index 5ac02093bde..6d29476d961 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/custom-typographer-replacements.js
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/custom-typographer-replacements.js
@@ -5,7 +5,7 @@
 // ... → … (also ?.... → ?.., !.... → !..)
 // ???????? → ???, !!!!! → !!!, `,,` → `,`
 // -- → &ndash;, --- → &mdash;
-// --> <-- -> <- to → ← → ←
+// --> <-- -> <- <-> <--> to → ← → ← ↔ ↔
 // (pa) (PA) → ¶
 //
 // Disabled replacements:
@@ -14,7 +14,7 @@
 // (r) (R) → ®
 // (p) (P) -> §
 
-let RARE_RE = /\+-|\.\.|\?\?\?\?|!!!!|,,|--|-->|<--|->|<-/;
+let RARE_RE = /\+-|\.\.|\?\?\?\?|!!!!|,,|--|-->|<--|->|<-|<->|<-->/;
 
 let SCOPED_ABBR_RE = /\((tm|pa)\)/gi;
 let SCOPED_ABBR = {
@@ -52,6 +52,7 @@ function replaceRare(inlineTokens) {
           // Custom arrows
           .replace(/(^|\s)-{1,2}>(\s|$)/gm, "\u0020\u2192\u0020")
           .replace(/(^|\s)<-{1,2}(\s|$)/gm, "\u0020\u2190\u0020")
+          .replace(/(^|\s)<-{1,2}>(\s|$)/gm, "\u0020\u2194\u0020")
           // .., ..., ....... -> …
           // but ?..... & !..... -> ?.. & !..
           .replace(/\.{2,}/g, "…")
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js
index ce7f619e94b..0d59c83bf03 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js
@@ -196,7 +196,8 @@ function applyEmoji(
   enableShortcuts,
   inlineEmoji,
   customEmojiTranslation,
-  watchedWordsReplacer
+  watchedWordsReplacer,
+  emojiDenyList
 ) {
   let result = null;
   let start = 0;
@@ -224,6 +225,16 @@ function applyEmoji(
     });
   }
 
+  // prevent denied emoji and aliases from being rendered
+  if (emojiDenyList?.length > 0) {
+    emojiDenyList.forEach((emoji) => {
+      if (content?.match(emoji)) {
+        const regex = new RegExp(`:${emoji}:`, "g");
+        content = content.replace(regex, "");
+      }
+    });
+  }
+
   let end = content.length;
 
   for (let i = 0; i < content.length - 1; i++) {
@@ -346,6 +357,7 @@ export function setup(helper) {
     opts.emojiSet = siteSettings.emoji_set || "";
     opts.customEmoji = state.customEmoji;
     opts.emojiCDNUrl = siteSettings.external_emoji_url;
+    opts.emojiDenyList = state.emojiDenyList;
   });
 
   helper.registerPlugin((md) => {
@@ -358,7 +370,8 @@ export function setup(helper) {
           md.options.discourse.features.emojiShortcuts,
           md.options.discourse.features.inlineEmoji,
           md.options.discourse.customEmojiTranslation,
-          md.options.discourse.watchedWordsReplace
+          md.options.discourse.watchedWordsReplace,
+          md.options.discourse.emojiDenyList
         )
       )
     );
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/hashtag-autocomplete.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/hashtag-autocomplete.js
index 65e2fca64bb..42a14b3d2d2 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/hashtag-autocomplete.js
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/hashtag-autocomplete.js
@@ -29,6 +29,7 @@ function addHashtag(buffer, matches, state) {
       ["href", result.relative_url],
       ["data-type", result.type],
       ["data-slug", result.slug],
+      ["data-id", result.id],
     ];
 
     // Most cases these will be the exact same, one standout is categories
@@ -40,20 +41,7 @@ function addHashtag(buffer, matches, state) {
     token.block = false;
     buffer.push(token);
 
-    token = new state.Token("svg_open", "svg", 1);
-    token.block = false;
-    token.attrs = [
-      ["class", `fa d-icon d-icon-${result.icon} svg-icon svg-node`],
-    ];
-    buffer.push(token);
-
-    token = new state.Token("use_open", "use", 1);
-    token.block = false;
-    token.attrs = [["href", `#${result.icon}`]];
-    buffer.push(token);
-
-    buffer.push(new state.Token("use_close", "use", -1));
-    buffer.push(new state.Token("svg_close", "svg", -1));
+    addIconPlaceholder(buffer, state);
 
     token = new state.Token("span_open", "span", 1);
     token.block = false;
@@ -82,24 +70,22 @@ function addHashtag(buffer, matches, state) {
   }
 }
 
+// The svg icon is not baked into the HTML because we want
+// to be able to use icon replacement via renderIcon, and
+// because different hashtag types may render icons/CSS
+// classes differently.
+//
+// Instead, the UI will dynamically replace these where hashtags
+// are rendered, like within posts, using decorateCooked* APIs.
+function addIconPlaceholder(buffer, state) {
+  const token = new state.Token("span_open", "span", 1);
+  token.block = false;
+  token.attrs = [["class", "hashtag-icon-placeholder"]];
+  buffer.push(token);
+  buffer.push(new state.Token("span_close", "span", -1));
+}
+
 export function setup(helper) {
-  const opts = helper.getOptions();
-
-  // we do this because plugins can register their own hashtag data
-  // sources which specify an icon, and each icon must be allowlisted
-  // or it will not render in the markdown pipeline
-  const hashtagIconAllowList = opts.hashtagIcons
-    ? opts.hashtagIcons
-        .concat(["hashtag"])
-        .map((icon) => {
-          return [
-            `svg[class=fa d-icon d-icon-${icon} svg-icon svg-node]`,
-            `use[href=#${icon}]`,
-          ];
-        })
-        .flat()
-    : [];
-
   helper.registerPlugin((md) => {
     if (
       md.options.discourse.limitedSiteSettings
@@ -114,13 +100,13 @@ export function setup(helper) {
     }
   });
 
-  helper.allowList(
-    hashtagIconAllowList.concat([
-      "a.hashtag-cooked",
-      "span.hashtag-raw",
-      "a[data-type]",
-      "a[data-slug]",
-      "a[data-ref]",
-    ])
-  );
+  helper.allowList([
+    "a.hashtag-cooked",
+    "span.hashtag-raw",
+    "span.hashtag-icon-placeholder",
+    "a[data-type]",
+    "a[data-slug]",
+    "a[data-ref]",
+    "a[data-id]",
+  ]);
 }
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/image-controls.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/image-controls.js
index 7918ee3d79b..926c4f8ac2b 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/image-controls.js
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/image-controls.js
@@ -106,6 +106,19 @@ function buildImageDeleteButton() {
    </span>
   `;
 }
+
+function buildImageGalleryControl(imageCount) {
+  return `
+  <span class="wrap-image-grid-button" title="${I18n.t(
+    "composer.toggle_image_grid"
+  )}" data-image-count="${imageCount}">
+    <svg class="fa d-icon d-icon-th svg-icon svg-string" xmlns="http://www.w3.org/2000/svg">
+    <use href="#th"></use>
+    </svg>
+  </span>
+  `;
+}
+
 // We need this to load after `upload-protocol` which is priority 0
 export const priority = 1;
 
@@ -124,6 +137,12 @@ function ruleWithImageControls(oldRule) {
       result += oldRule(tokens, idx, options, env, slf);
 
       result += `<span class="button-wrapper" data-image-index="${index}">`;
+      if (idx === 0) {
+        const imageCount = tokens.filter((x) => x.type === "image").length;
+        if (imageCount > 1) {
+          result += buildImageGalleryControl(imageCount);
+        }
+      }
       result += buildImageShowAltTextControls(
         token.attrs[token.attrIndex("alt")][1]
       );
@@ -181,6 +200,11 @@ export function setup(helper) {
       "svg[class=fa d-icon d-icon-times svg-icon svg-string]",
       "svg[class=fa d-icon d-icon-trash-alt svg-icon svg-string]",
       "use[href=#times]",
+
+      "span.wrap-image-grid-button",
+      "span.wrap-image-grid-button[data-image-count]",
+      "svg[class=fa d-icon d-icon-th svg-icon svg-string]",
+      "use[href=#th]",
     ]);
 
     helper.registerPlugin((md) => {
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/image-grid.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/image-grid.js
new file mode 100644
index 00000000000..c55b3543fa3
--- /dev/null
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/image-grid.js
@@ -0,0 +1,19 @@
+const gridRule = {
+  tag: "grid",
+  before(state) {
+    let token = state.push("bbcode_open", "div", 1);
+    token.attrs = [["class", "d-image-grid"]];
+  },
+
+  after(state) {
+    state.push("bbcode_close", "div", -1);
+  },
+};
+
+export function setup(helper) {
+  helper.allowList(["div.d-image-grid"]);
+
+  helper.registerPlugin((md) => {
+    md.block.bbcode.ruler.push("grid", gridRule);
+  });
+}
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/watched-words.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/watched-words.js
index 6b5228cb2c0..5e0fc48a1b2 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/watched-words.js
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/watched-words.js
@@ -16,22 +16,26 @@ function isLinkClose(str) {
 function findAllMatches(text, matchers) {
   const matches = [];
 
-  let count = 0;
-
-  matchers.forEach((matcher) => {
-    let match;
-    while (
-      (match = matcher.pattern.exec(text)) !== null &&
-      count++ < MAX_MATCHES
-    ) {
-      matches.push({
-        index: match.index + match[0].indexOf(match[1]),
-        text: match[1],
-        replacement: matcher.replacement,
-        link: matcher.link,
-      });
+  for (const { word, pattern, replacement, link } of matchers) {
+    if (matches.length >= MAX_MATCHES) {
+      break;
     }
-  });
+
+    if (word.test(text)) {
+      for (const match of text.matchAll(pattern)) {
+        matches.push({
+          index: match.index + match[0].indexOf(match[1]),
+          text: match[1],
+          replacement,
+          link,
+        });
+
+        if (matches.length >= MAX_MATCHES) {
+          break;
+        }
+      }
+    }
+  }
 
   return matches.sort((a, b) => a.index - b.index);
 }
@@ -43,6 +47,7 @@ const NONE = 0;
 const MENTION = 1;
 const HASHTAG_LINK = 2;
 const HASHTAG_SPAN = 3;
+const HASHTAG_ICON_SPAN = 4;
 
 export function setup(helper) {
   const opts = helper.getOptions();
@@ -51,11 +56,12 @@ export function setup(helper) {
     const matchers = [];
 
     if (md.options.discourse.watchedWordsReplace) {
-      Object.entries(md.options.discourse.watchedWordsReplace).map(
+      Object.entries(md.options.discourse.watchedWordsReplace).forEach(
         ([regexpString, options]) => {
           const word = toWatchedWord({ [regexpString]: options });
 
           matchers.push({
+            word: new RegExp(options.word, options.case_sensitive ? "" : "i"),
             pattern: createWatchedWordRegExp(word),
             replacement: options.replacement,
             link: false,
@@ -65,11 +71,12 @@ export function setup(helper) {
     }
 
     if (md.options.discourse.watchedWordsLink) {
-      Object.entries(md.options.discourse.watchedWordsLink).map(
+      Object.entries(md.options.discourse.watchedWordsLink).forEach(
         ([regexpString, options]) => {
           const word = toWatchedWord({ [regexpString]: options });
 
           matchers.push({
+            word: new RegExp(options.word, options.case_sensitive ? "" : "i"),
             pattern: createWatchedWordRegExp(word),
             replacement: options.replacement,
             link: true,
@@ -97,6 +104,7 @@ export function setup(helper) {
         // We scan once to mark tokens that must be skipped because they are
         // mentions or hashtags
         let lastType = NONE;
+        let currentType = NONE;
         for (let i = 0; i < tokens.length; ++i) {
           const currentToken = tokens[i];
 
@@ -109,14 +117,26 @@ export function setup(helper) {
             currentToken.attrs.some(
               (attr) =>
                 attr[0] === "class" &&
-                (attr[1].includes("hashtag") ||
-                  attr[1].includes("hashtag-cooked"))
+                (attr[1] === "hashtag" ||
+                  attr[1] === "hashtag-cooked" ||
+                  attr[1] === "hashtag-raw")
             )
           ) {
             lastType =
               currentToken.type === "link_open" ? HASHTAG_LINK : HASHTAG_SPAN;
           }
 
+          if (
+            currentToken.type === "span_open" &&
+            currentToken.attrs &&
+            currentToken.attrs.some(
+              (attr) =>
+                attr[0] === "class" && attr[1] === "hashtag-icon-placeholder"
+            )
+          ) {
+            currentType = HASHTAG_ICON_SPAN;
+          }
+
           if (lastType !== NONE) {
             currentToken.skipReplace = true;
           }
@@ -124,7 +144,9 @@ export function setup(helper) {
           if (
             (lastType === MENTION && currentToken.type === "mention_close") ||
             (lastType === HASHTAG_LINK && currentToken.type === "link_close") ||
-            (lastType === HASHTAG_SPAN && currentToken.type === "span_close")
+            (lastType === HASHTAG_SPAN &&
+              currentToken.type === "span_close" &&
+              currentType !== HASHTAG_ICON_SPAN)
           ) {
             lastType = NONE;
           }
diff --git a/app/assets/javascripts/pretty-text/index.js b/app/assets/javascripts/pretty-text/index.js
index d4a9ef20380..7b77a4dfbf6 100644
--- a/app/assets/javascripts/pretty-text/index.js
+++ b/app/assets/javascripts/pretty-text/index.js
@@ -1,7 +1,44 @@
 "use strict";
 
+const Funnel = require("broccoli-funnel");
+const mergeTrees = require("broccoli-merge-trees");
+const path = require("path");
+
 module.exports = {
   name: require("./package").name,
+
+  // custom method to produce the tree for markdown-it-bundle.js
+  // called by ember-cli-build.js in discourse core
+  //
+  // code in here is only needed by the editor and we do not want them included
+  // into the main addon/vendor bundle; instead, it'll be included via a script
+  // tag as needed
+  treeForMarkdownItBundle() {
+    return mergeTrees([this._treeForEngines(), this._treeForMarkdownIt()]);
+  },
+
+  // treat the JS code in /engines like any other JS code in the /addon folder
+  _treeForEngines() {
+    let enginesTreePath = path.resolve(this.root, "engines");
+    let enginesTree = this.treeGenerator(enginesTreePath);
+
+    // we started at /engines, if we just call treeForAddon, the modules will
+    // be under pretty-text/*, but we want pretty-text/engines/*
+    let namespacedTree = new Funnel(enginesTree, {
+      destDir: "engines",
+    });
+
+    return this.treeForAddon.call(this, namespacedTree);
+  },
+
+  _treeForMarkdownIt() {
+    let markdownIt = require.resolve("markdown-it/dist/markdown-it.js");
+
+    return new Funnel(path.dirname(markdownIt), {
+      files: ["markdown-it.js"],
+    });
+  },
+
   isDevelopingAddon() {
     return true;
   },
diff --git a/app/assets/javascripts/pretty-text/package.json b/app/assets/javascripts/pretty-text/package.json
index 4d36c4aa5c6..e9f2b6e61c9 100644
--- a/app/assets/javascripts/pretty-text/package.json
+++ b/app/assets/javascripts/pretty-text/package.json
@@ -7,7 +7,6 @@
   "keywords": [
     "ember-addon"
   ],
-  "repository": "",
   "scripts": {
     "build": "ember build",
     "lint:hbs": "ember-template-lint .",
@@ -15,29 +14,31 @@
     "start": "ember serve"
   },
   "dependencies": {
-    "ember-auto-import": "^2.5.0",
-    "ember-cli-babel": "^7.26.10",
-    "ember-cli-htmlbars": "^6.1.1",
-    "webpack": "^5.75.0",
+    "discourse-common": "1.0.0",
+    "ember-auto-import": "^2.6.3",
+    "ember-cli-babel": "^7.26.11",
+    "ember-cli-htmlbars": "^6.2.0",
     "xss": "^1.0.14"
   },
   "devDependencies": {
-    "@babel/core": "^7.20.12",
+    "@babel/core": "^7.22.9",
     "@ember/optional-features": "^2.0.0",
-    "@embroider/test-setup": "^2.0.2",
+    "@ember/string": "^3.1.1",
+    "@embroider/test-setup": "^3.0.1",
     "@glimmer/component": "^1.1.2",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~3.28.5",
-    "ember-cli-dependency-checker": "^3.3.1",
+    "ember-cli": "~5.0.0",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-load-initializers": "^2.1.1",
-    "ember-resolver": "^8.0.3",
-    "ember-source": "~3.28.11",
+    "ember-resolver": "^10.1.1",
+    "ember-source": "~3.28.12",
     "ember-source-channel-url": "^3.0.0",
-    "loader.js": "^4.7.0"
+    "loader.js": "^4.7.0",
+    "markdown-it": "^13.0.1",
+    "webpack": "^5.88.2"
   },
   "engines": {
     "node": "16.* || >= 18",
diff --git a/app/assets/javascripts/pretty-text/tests/dummy/app/index.html b/app/assets/javascripts/pretty-text/tests/dummy/app/index.html
deleted file mode 100644
index 870306a6ba1..00000000000
--- a/app/assets/javascripts/pretty-text/tests/dummy/app/index.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Dummy</title>
-    <meta name="description" content="">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-
-    {{content-for "head"}}
-
-    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
-    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/dummy.css">
-
-    {{content-for "head-footer"}}
-  </head>
-  <body>
-    {{content-for "body"}}
-
-    <script src="{{rootURL}}assets/vendor.js"></script>
-    <script src="{{rootURL}}assets/dummy.js"></script>
-
-    {{content-for "body-footer"}}
-  </body>
-</html>
\ No newline at end of file
diff --git a/app/assets/javascripts/pretty-text/tests/dummy/app/styles/.gitkeep b/app/assets/javascripts/pretty-text/tests/dummy/app/styles/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/pretty-text/tests/dummy/app/templates/.gitkeep b/app/assets/javascripts/pretty-text/tests/dummy/app/templates/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/pretty-text/tests/dummy/config/.gitkeep b/app/assets/javascripts/pretty-text/tests/dummy/config/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/pretty-text/tests/dummy/public/.gitkeep b/app/assets/javascripts/pretty-text/tests/dummy/public/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/pretty-text/tests/index.html b/app/assets/javascripts/pretty-text/tests/index.html
deleted file mode 100644
index 5c291da716f..00000000000
--- a/app/assets/javascripts/pretty-text/tests/index.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Dummy Tests</title>
-    <meta name="description" content="">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-
-    {{content-for "head"}}
-    {{content-for "test-head"}}
-
-    <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
-    <link rel="stylesheet" href="{{rootURL}}assets/dummy.css">
-    <link rel="stylesheet" href="{{rootURL}}assets/test-support.css">
-
-    {{content-for "head-footer"}}
-    {{content-for "test-head-footer"}}
-  </head>
-  <body>
-    {{content-for "body"}}
-    {{content-for "test-body"}}
-
-    <div id="qunit"></div>
-    <div id="qunit-fixture">
-      <div id="ember-testing-container">
-        <div id="ember-testing"></div>
-      </div>
-    </div>
-
-    <script src="/testem.js" integrity="" data-embroider-ignore></script>
-    <script src="{{rootURL}}assets/vendor.js"></script>
-    <script src="{{rootURL}}assets/test-support.js"></script>
-    <script src="{{rootURL}}assets/dummy.js"></script>
-    <script src="{{rootURL}}assets/tests.js"></script>
-
-    {{content-for "body-footer"}}
-    {{content-for "test-body-footer"}}
-  </body>
-</html>
\ No newline at end of file
diff --git a/app/assets/javascripts/pretty-text/vendor/.gitkeep b/app/assets/javascripts/pretty-text/vendor/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/select-kit/addon/.gitkeep b/app/assets/javascripts/select-kit/addon/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/category-drop/category-drop-header.hbs b/app/assets/javascripts/select-kit/addon/components/category-drop/category-drop-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/category-drop/category-drop-header.hbs
rename to app/assets/javascripts/select-kit/addon/components/category-drop/category-drop-header.hbs
diff --git a/app/assets/javascripts/select-kit/addon/components/category-drop/category-drop-header.js b/app/assets/javascripts/select-kit/addon/components/category-drop/category-drop-header.js
index b4cdf79e531..8abc2821210 100644
--- a/app/assets/javascripts/select-kit/addon/components/category-drop/category-drop-header.js
+++ b/app/assets/javascripts/select-kit/addon/components/category-drop/category-drop-header.js
@@ -1,12 +1,10 @@
 import ComboBoxSelectBoxHeaderComponent from "select-kit/components/combo-box/combo-box-header";
 import discourseComputed from "discourse-common/utils/decorators";
-import layout from "select-kit/templates/components/category-drop/category-drop-header";
 import { readOnly } from "@ember/object/computed";
 import { schedule } from "@ember/runloop";
 import { htmlSafe } from "@ember/template";
 
 export default ComboBoxSelectBoxHeaderComponent.extend({
-  layout,
   classNames: ["category-drop-header"],
   classNameBindings: ["categoryStyleClass"],
   categoryStyleClass: readOnly("site.category_style"),
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/category-row.hbs b/app/assets/javascripts/select-kit/addon/components/category-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/category-row.hbs
rename to app/assets/javascripts/select-kit/addon/components/category-row.hbs
diff --git a/app/assets/javascripts/select-kit/addon/components/category-row.js b/app/assets/javascripts/select-kit/addon/components/category-row.js
index 2368843c53b..0b0147d3969 100644
--- a/app/assets/javascripts/select-kit/addon/components/category-row.js
+++ b/app/assets/javascripts/select-kit/addon/components/category-row.js
@@ -4,12 +4,10 @@ import Category from "discourse/models/category";
 import SelectKitRowComponent from "select-kit/components/select-kit/select-kit-row";
 import { categoryBadgeHTML } from "discourse/helpers/category-link";
 import { computed } from "@ember/object";
-import layout from "select-kit/templates/components/category-row";
 import { setting } from "discourse/lib/computed";
 import { htmlSafe } from "@ember/template";
 
 export default SelectKitRowComponent.extend({
-  layout,
   classNames: ["category-row"],
   hideParentCategory: bool("selectKit.options.hideParentCategory"),
   allowUncategorized: bool("selectKit.options.allowUncategorized"),
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/color-palettes/color-palettes-row.hbs b/app/assets/javascripts/select-kit/addon/components/color-palettes/color-palettes-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/color-palettes/color-palettes-row.hbs
rename to app/assets/javascripts/select-kit/addon/components/color-palettes/color-palettes-row.hbs
diff --git a/app/assets/javascripts/select-kit/addon/components/color-palettes/color-palettes-row.js b/app/assets/javascripts/select-kit/addon/components/color-palettes/color-palettes-row.js
index b72335111df..0e300877e26 100644
--- a/app/assets/javascripts/select-kit/addon/components/color-palettes/color-palettes-row.js
+++ b/app/assets/javascripts/select-kit/addon/components/color-palettes/color-palettes-row.js
@@ -1,11 +1,9 @@
 import SelectKitRowComponent from "select-kit/components/select-kit/select-kit-row";
 import { computed } from "@ember/object";
-import layout from "select-kit/templates/components/color-palettes/color-palettes-row";
 import { htmlSafe } from "@ember/template";
 
 export default SelectKitRowComponent.extend({
   classNames: ["color-palettes-row"],
-  layout,
 
   palettes: computed("item.colors.[]", function () {
     return htmlSafe(
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/combo-box/combo-box-header.hbs b/app/assets/javascripts/select-kit/addon/components/combo-box/combo-box-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/combo-box/combo-box-header.hbs
rename to app/assets/javascripts/select-kit/addon/components/combo-box/combo-box-header.hbs
diff --git a/app/assets/javascripts/select-kit/addon/components/combo-box/combo-box-header.js b/app/assets/javascripts/select-kit/addon/components/combo-box/combo-box-header.js
index 6d6378d3337..fd35ef4eaa9 100644
--- a/app/assets/javascripts/select-kit/addon/components/combo-box/combo-box-header.js
+++ b/app/assets/javascripts/select-kit/addon/components/combo-box/combo-box-header.js
@@ -1,10 +1,8 @@
 import { and, reads } from "@ember/object/computed";
 import SingleSelectHeaderComponent from "select-kit/components/select-kit/single-select-header";
 import { computed } from "@ember/object";
-import layout from "select-kit/templates/components/combo-box/combo-box-header";
 
 export default SingleSelectHeaderComponent.extend({
-  layout,
   classNames: ["combo-box-header"],
   clearable: reads("selectKit.options.clearable"),
   caretUpIcon: reads("selectKit.options.caretUpIcon"),
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/create-color-row.hbs b/app/assets/javascripts/select-kit/addon/components/create-color-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/create-color-row.hbs
rename to app/assets/javascripts/select-kit/addon/components/create-color-row.hbs
diff --git a/app/assets/javascripts/select-kit/addon/components/create-color-row.js b/app/assets/javascripts/select-kit/addon/components/create-color-row.js
index 4f978fe0cb1..2be176a353a 100644
--- a/app/assets/javascripts/select-kit/addon/components/create-color-row.js
+++ b/app/assets/javascripts/select-kit/addon/components/create-color-row.js
@@ -1,10 +1,8 @@
 import SelectKitRowComponent from "select-kit/components/select-kit/select-kit-row";
 import { escapeExpression } from "discourse/lib/utilities";
-import layout from "select-kit/templates/components/create-color-row";
 import { schedule } from "@ember/runloop";
 
 export default SelectKitRowComponent.extend({
-  layout,
   classNames: ["create-color-row"],
 
   didReceiveAttrs() {
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/dropdown-select-box/dropdown-select-box-header.hbs b/app/assets/javascripts/select-kit/addon/components/dropdown-select-box/dropdown-select-box-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/dropdown-select-box/dropdown-select-box-header.hbs
rename to app/assets/javascripts/select-kit/addon/components/dropdown-select-box/dropdown-select-box-header.hbs
diff --git a/app/assets/javascripts/select-kit/addon/components/dropdown-select-box/dropdown-select-box-header.js b/app/assets/javascripts/select-kit/addon/components/dropdown-select-box/dropdown-select-box-header.js
index 76f6d03d4b2..01ce7edd47e 100644
--- a/app/assets/javascripts/select-kit/addon/components/dropdown-select-box/dropdown-select-box-header.js
+++ b/app/assets/javascripts/select-kit/addon/components/dropdown-select-box/dropdown-select-box-header.js
@@ -1,15 +1,15 @@
 import SingleSelectHeaderComponent from "select-kit/components/select-kit/single-select-header";
 import { computed } from "@ember/object";
-import layout from "select-kit/templates/components/dropdown-select-box/dropdown-select-box-header";
 import { readOnly } from "@ember/object/computed";
 
 export default SingleSelectHeaderComponent.extend({
-  layout,
   classNames: ["dropdown-select-box-header"],
-  classNameBindings: ["btnClassName", "btnStyleClass"],
+  classNameBindings: ["btnClassName", "btnStyleClass", "btnCustomClasses"],
   showFullTitle: readOnly("selectKit.options.showFullTitle"),
   customStyle: readOnly("selectKit.options.customStyle"),
 
+  btnCustomClasses: readOnly("selectKit.options.btnCustomClasses"),
+
   btnClassName: computed("showFullTitle", function () {
     return `btn ${this.showFullTitle ? "btn-icon-text" : "no-text btn-icon"}`;
   }),
@@ -19,7 +19,6 @@ export default SingleSelectHeaderComponent.extend({
   }),
 
   caretUpIcon: readOnly("selectKit.options.caretUpIcon"),
-
   caretDownIcon: readOnly("selectKit.options.caretDownIcon"),
 
   caretIcon: computed(
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/dropdown-select-box/dropdown-select-box-row.hbs b/app/assets/javascripts/select-kit/addon/components/dropdown-select-box/dropdown-select-box-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
rename to app/assets/javascripts/select-kit/addon/components/dropdown-select-box/dropdown-select-box-row.hbs
diff --git a/app/assets/javascripts/select-kit/addon/components/dropdown-select-box/dropdown-select-box-row.js b/app/assets/javascripts/select-kit/addon/components/dropdown-select-box/dropdown-select-box-row.js
index 6399da5b2dd..8e526072b07 100644
--- a/app/assets/javascripts/select-kit/addon/components/dropdown-select-box/dropdown-select-box-row.js
+++ b/app/assets/javascripts/select-kit/addon/components/dropdown-select-box/dropdown-select-box-row.js
@@ -1,10 +1,7 @@
 import SelectKitRowComponent from "select-kit/components/select-kit/select-kit-row";
-import layout from "select-kit/templates/components/dropdown-select-box/dropdown-select-box-row";
 import { readOnly } from "@ember/object/computed";
 
 export default SelectKitRowComponent.extend({
-  layout,
   classNames: ["dropdown-select-box-row"],
-
   description: readOnly("item.description"),
 });
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/email-group-user-chooser-row.hbs b/app/assets/javascripts/select-kit/addon/components/email-group-user-chooser-row.hbs
similarity index 59%
rename from app/assets/javascripts/select-kit/addon/templates/components/email-group-user-chooser-row.hbs
rename to app/assets/javascripts/select-kit/addon/components/email-group-user-chooser-row.hbs
index 3a293eaadc8..8ff700b0fd2 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/email-group-user-chooser-row.hbs
+++ b/app/assets/javascripts/select-kit/addon/components/email-group-user-chooser-row.hbs
@@ -1,15 +1,19 @@
 {{#if this.item.isUser}}
   {{avatar this.item imageSize="tiny"}}
-  <span class="identifier">{{format-username this.item.id}}</span>
-  <span class="name">{{this.item.name}}</span>
+  <div>
+    <span class="identifier">{{format-username this.item.id}}</span>
+    <span class="name">{{this.item.name}}</span>
+  </div>
   {{#if (and this.item.showUserStatus this.item.status)}}
     <UserStatusMessage @status={{this.item.status}} @showDescription={{true}} />
   {{/if}}
   {{decorate-username-selector this.item.id}}
 {{else if this.item.isGroup}}
   {{d-icon "users"}}
-  <span class="identifier">{{this.item.id}}</span>
-  <span class="name">{{this.item.full_name}}</span>
+  <div>
+    <span class="identifier">{{this.item.id}}</span>
+    <span class="name">{{this.item.full_name}}</span>
+  </div>
 {{else}}
   {{d-icon "envelope"}}
   <span class="identifier">{{this.item.id}}</span>
diff --git a/app/assets/javascripts/select-kit/addon/components/email-group-user-chooser-row.js b/app/assets/javascripts/select-kit/addon/components/email-group-user-chooser-row.js
index 5426c82fb7a..316dfe1a3df 100644
--- a/app/assets/javascripts/select-kit/addon/components/email-group-user-chooser-row.js
+++ b/app/assets/javascripts/select-kit/addon/components/email-group-user-chooser-row.js
@@ -1,7 +1,5 @@
 import SelectKitRowComponent from "select-kit/components/select-kit/select-kit-row";
-import layout from "select-kit/templates/components/email-group-user-chooser-row";
 
 export default SelectKitRowComponent.extend({
-  layout,
   classNames: ["email-group-user-chooser-row"],
 });
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/flair-row.hbs b/app/assets/javascripts/select-kit/addon/components/flair-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/flair-row.hbs
rename to app/assets/javascripts/select-kit/addon/components/flair-row.hbs
diff --git a/app/assets/javascripts/select-kit/addon/components/flair-row.js b/app/assets/javascripts/select-kit/addon/components/flair-row.js
index 6edbf8cab2b..8210655ef6c 100644
--- a/app/assets/javascripts/select-kit/addon/components/flair-row.js
+++ b/app/assets/javascripts/select-kit/addon/components/flair-row.js
@@ -1,7 +1,5 @@
 import SelectKitRowComponent from "select-kit/components/select-kit/select-kit-row";
-import layout from "select-kit/templates/components/flair-row";
 
 export default SelectKitRowComponent.extend({
-  layout,
   classNames: ["flair-row"],
 });
diff --git a/app/assets/javascripts/select-kit/addon/components/form-template-chooser.js b/app/assets/javascripts/select-kit/addon/components/form-template-chooser.js
new file mode 100644
index 00000000000..9120819d008
--- /dev/null
+++ b/app/assets/javascripts/select-kit/addon/components/form-template-chooser.js
@@ -0,0 +1,56 @@
+import MultiSelectComponent from "select-kit/components/multi-select";
+import FormTemplate from "discourse/models/form-template";
+import { computed } from "@ember/object";
+
+export default MultiSelectComponent.extend({
+  pluginApiIdentifiers: ["form-template-chooser"],
+  classNames: ["form-template-chooser"],
+  selectKitOptions: {
+    none: "form_template_chooser.select_template",
+  },
+
+  init() {
+    this._super(...arguments);
+
+    if (!this.templates) {
+      this._fetchTemplates();
+    }
+  },
+
+  didUpdateAttrs() {
+    this._super(...arguments);
+    this._fetchTemplates();
+  },
+
+  @computed("templates")
+  get content() {
+    if (!this.templates) {
+      return this._fetchTemplates();
+    }
+
+    return this.templates;
+  },
+
+  _fetchTemplates() {
+    FormTemplate.findAll().then((result) => {
+      let sortedTemplates = this._sortTemplatesByName(result);
+
+      if (this.filteredIds) {
+        sortedTemplates = sortedTemplates.filter((t) =>
+          this.filteredIds.includes(t.id)
+        );
+      }
+
+      if (sortedTemplates.length > 0) {
+        return this.set("templates", sortedTemplates);
+      } else {
+        this.set("templates", sortedTemplates);
+        this.set("selectKit.options.disabled", true);
+      }
+    });
+  },
+
+  _sortTemplatesByName(templates) {
+    return templates.sort((a, b) => a.name.localeCompare(b.name));
+  },
+});
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/future-date-input-selector/future-date-input-selector-header.hbs b/app/assets/javascripts/select-kit/addon/components/future-date-input-selector/future-date-input-selector-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/future-date-input-selector/future-date-input-selector-header.hbs
rename to app/assets/javascripts/select-kit/addon/components/future-date-input-selector/future-date-input-selector-header.hbs
diff --git a/app/assets/javascripts/select-kit/addon/components/future-date-input-selector/future-date-input-selector-header.js b/app/assets/javascripts/select-kit/addon/components/future-date-input-selector/future-date-input-selector-header.js
index 6581440616b..24dc65b2b71 100644
--- a/app/assets/javascripts/select-kit/addon/components/future-date-input-selector/future-date-input-selector-header.js
+++ b/app/assets/javascripts/select-kit/addon/components/future-date-input-selector/future-date-input-selector-header.js
@@ -1,7 +1,5 @@
 import ComboBoxHeaderComponent from "select-kit/components/combo-box/combo-box-header";
-import layout from "select-kit/templates/components/future-date-input-selector/future-date-input-selector-header";
 
 export default ComboBoxHeaderComponent.extend({
-  layout,
   classNames: "future-date-input-selector-header",
 });
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/future-date-input-selector/future-date-input-selector-row.hbs b/app/assets/javascripts/select-kit/addon/components/future-date-input-selector/future-date-input-selector-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/future-date-input-selector/future-date-input-selector-row.hbs
rename to app/assets/javascripts/select-kit/addon/components/future-date-input-selector/future-date-input-selector-row.hbs
diff --git a/app/assets/javascripts/select-kit/addon/components/future-date-input-selector/future-date-input-selector-row.js b/app/assets/javascripts/select-kit/addon/components/future-date-input-selector/future-date-input-selector-row.js
index 354746c5207..337d4f6a1bf 100644
--- a/app/assets/javascripts/select-kit/addon/components/future-date-input-selector/future-date-input-selector-row.js
+++ b/app/assets/javascripts/select-kit/addon/components/future-date-input-selector/future-date-input-selector-row.js
@@ -1,7 +1,5 @@
 import SelectKitRowComponent from "select-kit/components/select-kit/select-kit-row";
-import layout from "select-kit/templates/components/future-date-input-selector/future-date-input-selector-row";
 
 export default SelectKitRowComponent.extend({
-  layout,
   classNames: ["future-date-input-selector-row"],
 });
diff --git a/app/assets/javascripts/select-kit/addon/components/icon-picker.js b/app/assets/javascripts/select-kit/addon/components/icon-picker.js
index ab6553acbdf..dead5047cd8 100644
--- a/app/assets/javascripts/select-kit/addon/components/icon-picker.js
+++ b/app/assets/javascripts/select-kit/addon/components/icon-picker.js
@@ -36,7 +36,10 @@ export default MultiSelectComponent.extend({
       return this._cachedIconsList;
     } else {
       return ajax("/svg-sprite/picker-search", {
-        data: { filter },
+        data: {
+          filter,
+          only_available: this.onlyAvailable,
+        },
       }).then((icons) => {
         icons = icons.map(this._processIcon);
         if (filter === "") {
diff --git a/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser.js b/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser.js
index d5e1263a2e5..27d510ab741 100644
--- a/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser.js
+++ b/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser.js
@@ -26,6 +26,7 @@ export default MultiSelectComponent.extend(TagsMixin, {
     closeOnChange: false,
     maximum: "maxTagsPerTopic",
     autoInsertNoneItem: false,
+    useHeaderFilter: false,
   },
 
   modifyComponentForRow(collection, item) {
diff --git a/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser/mini-tag-chooser-header.js b/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser/mini-tag-chooser-header.js
deleted file mode 100644
index fa42aac0976..00000000000
--- a/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser/mini-tag-chooser-header.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import ComboBoxSelectBoxHeaderComponent from "select-kit/components/combo-box/combo-box-header";
-import layout from "select-kit/templates/components/mini-tag-chooser/mini-tag-chooser-header";
-
-export default ComboBoxSelectBoxHeaderComponent.extend({
-  layout,
-  classNames: ["mini-tag-chooser-header"],
-});
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/mini-tag-chooser/selected-collection.hbs b/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser/selected-collection.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/mini-tag-chooser/selected-collection.hbs
rename to app/assets/javascripts/select-kit/addon/components/mini-tag-chooser/selected-collection.hbs
diff --git a/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser/selected-collection.js b/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser/selected-collection.js
index fc563c4698d..4619490286f 100644
--- a/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser/selected-collection.js
+++ b/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser/selected-collection.js
@@ -1,13 +1,9 @@
 import { reads } from "@ember/object/computed";
 import Component from "@ember/component";
 import { computed } from "@ember/object";
-import layout from "select-kit/templates/components/mini-tag-chooser/selected-collection";
 
 export default Component.extend({
   tagName: "",
-
-  layout,
-
   selectedTags: reads("collection.content.selectedTags.[]"),
 
   tags: computed("selectedTags.[]", "selectKit.filter", function () {
diff --git a/app/assets/javascripts/select-kit/addon/components/multi-select.hbs b/app/assets/javascripts/select-kit/addon/components/multi-select.hbs
new file mode 100644
index 00000000000..2e1aa9af9cf
--- /dev/null
+++ b/app/assets/javascripts/select-kit/addon/components/multi-select.hbs
@@ -0,0 +1,56 @@
+{{#unless this.selectKit.isHidden}}
+  {{component
+    this.selectKit.options.headerComponent
+    tabindex=this.tabindex
+    value=this.value
+    selectedContent=this.selectedContent
+    selectKit=this.selectKit
+    id=(concat this.selectKit.uniqueID "-header")
+  }}
+
+  <SelectKit::SelectKitBody
+    @selectKit={{this.selectKit}}
+    @id={{concat this.selectKit.uniqueID "-body"}}
+  >
+    {{#unless this.selectKit.options.useHeaderFilter}}
+      {{component
+        this.selectKit.options.filterComponent
+        selectKit=this.selectKit
+        id=(concat this.selectKit.uniqueID "-filter")
+      }}
+
+      {{#if this.selectedContent.length}}
+        <div class="selected-content">
+          {{#each this.selectedContent as |item|}}
+            {{component
+              this.selectKit.options.selectedChoiceComponent
+              item=item
+              selectKit=this.selectKit
+            }}
+          {{/each}}
+        </div>
+      {{/if}}
+    {{/unless}}
+
+    {{#each this.collections as |collection|}}
+      {{component
+        (component-for-collection collection.identifier this.selectKit)
+        collection=collection
+        selectKit=this.selectKit
+        value=this.value
+      }}
+    {{/each}}
+
+    {{#if this.selectKit.filter}}
+      {{#if this.selectKit.hasNoContent}}
+        <span class="no-content" role="alert">
+          {{i18n "select_kit.no_content"}}
+        </span>
+      {{else}}
+        <span class="results-count" role="alert">
+          {{i18n "select_kit.results_count" count=this.mainCollection.length}}
+        </span>
+      {{/if}}
+    {{/if}}
+  </SelectKit::SelectKitBody>
+{{/unless}}
\ No newline at end of file
diff --git a/app/assets/javascripts/select-kit/addon/components/multi-select.js b/app/assets/javascripts/select-kit/addon/components/multi-select.js
index 247bc49f55d..7ab70bb3c12 100644
--- a/app/assets/javascripts/select-kit/addon/components/multi-select.js
+++ b/app/assets/javascripts/select-kit/addon/components/multi-select.js
@@ -2,12 +2,10 @@ import SelectKitComponent from "select-kit/components/select-kit";
 import { computed } from "@ember/object";
 import { isPresent } from "@ember/utils";
 import { next } from "@ember/runloop";
-import layout from "select-kit/templates/components/multi-select";
 import { makeArray } from "discourse-common/lib/helpers";
 
 export default SelectKitComponent.extend({
   pluginApiIdentifiers: ["multi-select"],
-  layout,
   classNames: ["multi-select"],
   multiSelect: true,
 
@@ -23,6 +21,7 @@ export default SelectKitComponent.extend({
     autoFilterable: true,
     caretDownIcon: "caretIcon",
     caretUpIcon: "caretIcon",
+    useHeaderFilter: false,
   },
 
   caretIcon: computed("value.[]", function () {
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/multi-select/format-selected-content.hbs b/app/assets/javascripts/select-kit/addon/components/multi-select/format-selected-content.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/multi-select/format-selected-content.hbs
rename to app/assets/javascripts/select-kit/addon/components/multi-select/format-selected-content.hbs
diff --git a/app/assets/javascripts/select-kit/addon/components/multi-select/format-selected-content.js b/app/assets/javascripts/select-kit/addon/components/multi-select/format-selected-content.js
index 710122a76b6..f369b7f23d6 100644
--- a/app/assets/javascripts/select-kit/addon/components/multi-select/format-selected-content.js
+++ b/app/assets/javascripts/select-kit/addon/components/multi-select/format-selected-content.js
@@ -1,12 +1,10 @@
 import Component from "@ember/component";
 import { computed } from "@ember/object";
-import layout from "select-kit/templates/components/multi-select/format-selected-content";
 import { makeArray } from "discourse-common/lib/helpers";
 import UtilsMixin from "select-kit/mixins/utils";
 
 export default Component.extend(UtilsMixin, {
   tagName: "",
-  layout,
   content: null,
   selectKit: null,
 
diff --git a/app/assets/javascripts/select-kit/addon/components/multi-select/multi-select-filter.hbs b/app/assets/javascripts/select-kit/addon/components/multi-select/multi-select-filter.hbs
new file mode 100644
index 00000000000..f9099884900
--- /dev/null
+++ b/app/assets/javascripts/select-kit/addon/components/multi-select/multi-select-filter.hbs
@@ -0,0 +1,25 @@
+{{#unless this.isHidden}}
+  {{! filter-input-search prevents 1password from attempting autocomplete }}
+  {{! template-lint-disable no-pointer-down-event-binding }}
+
+  <Input
+    tabindex={{0}}
+    class="filter-input"
+    placeholder={{this.computedPlaceholder}}
+    autocomplete="off"
+    autocorrect="off"
+    autocapitalize="off"
+    name="filter-input-search"
+    spellcheck={{false}}
+    @value={{readonly this.selectKit.filter}}
+    @type="search"
+    {{on "paste" (action "onPaste")}}
+    {{on "keydown" (action "onKeydown")}}
+    {{on "keyup" (action "onKeyup")}}
+    {{on "input" (action "onInput")}}
+  />
+
+  {{#if this.selectKit.options.filterIcon}}
+    {{d-icon this.selectKit.options.filterIcon class="filter-icon"}}
+  {{/if}}
+{{/unless}}
\ No newline at end of file
diff --git a/app/assets/javascripts/select-kit/addon/components/multi-select/multi-select-filter.js b/app/assets/javascripts/select-kit/addon/components/multi-select/multi-select-filter.js
index 0987b2df217..7284d8f8e74 100644
--- a/app/assets/javascripts/select-kit/addon/components/multi-select/multi-select-filter.js
+++ b/app/assets/javascripts/select-kit/addon/components/multi-select/multi-select-filter.js
@@ -1,20 +1,18 @@
-import I18n from "I18n";
 import SelectKitFilterComponent from "select-kit/components/select-kit/select-kit-filter";
 import { isEmpty } from "@ember/utils";
 import discourseComputed from "discourse-common/utils/decorators";
-import layout from "select-kit/templates/components/select-kit/select-kit-filter";
 import { action } from "@ember/object";
 
 export default SelectKitFilterComponent.extend({
-  layout,
   classNames: ["multi-select-filter"],
 
   @discourseComputed("placeholder", "selectKit.hasSelection")
   computedPlaceholder(placeholder, hasSelection) {
-    if (hasSelection) {
+    if (this.hidePlaceholderWithSelection && hasSelection) {
       return "";
     }
-    return isEmpty(placeholder) ? "" : I18n.t(placeholder);
+
+    return isEmpty(placeholder) ? "" : placeholder;
   },
 
   @action
diff --git a/app/assets/javascripts/select-kit/addon/components/multi-select/multi-select-header.hbs b/app/assets/javascripts/select-kit/addon/components/multi-select/multi-select-header.hbs
new file mode 100644
index 00000000000..3bff6e9a7e3
--- /dev/null
+++ b/app/assets/javascripts/select-kit/addon/components/multi-select/multi-select-header.hbs
@@ -0,0 +1,33 @@
+<div class="select-kit-header-wrapper">
+  {{#each this.icons as |icon|}}
+    {{d-icon icon}}
+  {{/each}}
+
+  {{#if this.selectKit.options.useHeaderFilter}}
+    <div class="select-kit-header--filter">
+      {{#if this.selectedContent.length}}
+        {{#each this.selectedContent as |item|}}
+          {{component
+            this.selectKit.options.selectedChoiceComponent
+            item=item
+            selectKit=this.selectKit
+          }}
+        {{/each}}
+      {{/if}}
+
+      {{component
+        this.selectKit.options.filterComponent
+        selectKit=this.selectKit
+        id=(concat this.selectKit.uniqueID "-filter")
+        hidePlaceholderWithSelection=true
+      }}
+    </div>
+  {{else}}
+    <MultiSelect::FormatSelectedContent
+      @content={{or this.selectedContent this.selectKit.noneItem}}
+      @selectKit={{this.selectKit}}
+    />
+
+    {{d-icon this.caretIcon class="caret-icon"}}
+  {{/if}}
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/select-kit/addon/components/multi-select/multi-select-header.js b/app/assets/javascripts/select-kit/addon/components/multi-select/multi-select-header.js
index 14ee8979d1c..6be5eb72292 100644
--- a/app/assets/javascripts/select-kit/addon/components/multi-select/multi-select-header.js
+++ b/app/assets/javascripts/select-kit/addon/components/multi-select/multi-select-header.js
@@ -1,5 +1,4 @@
 import SelectKitHeaderComponent from "select-kit/components/select-kit/select-kit-header";
-import layout from "select-kit/templates/components/multi-select/multi-select-header";
 import { computed } from "@ember/object";
 import { reads } from "@ember/object/computed";
 
@@ -7,11 +6,10 @@ export default SelectKitHeaderComponent.extend({
   tagName: "summary",
   classNames: ["multi-select-header"],
   attributeBindings: ["ariaLabel:aria-label"],
-  layout,
-
   caretUpIcon: reads("selectKit.options.caretUpIcon"),
   caretDownIcon: reads("selectKit.options.caretDownIcon"),
   ariaLabel: reads("selectKit.options.headerAriaLabel"),
+
   caretIcon: computed(
     "selectKit.isExpanded",
     "caretUpIcon",
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/multi-select/selected-category.hbs b/app/assets/javascripts/select-kit/addon/components/multi-select/selected-category.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/multi-select/selected-category.hbs
rename to app/assets/javascripts/select-kit/addon/components/multi-select/selected-category.hbs
diff --git a/app/assets/javascripts/select-kit/addon/components/multi-select/selected-category.js b/app/assets/javascripts/select-kit/addon/components/multi-select/selected-category.js
index 0792ef0fa2b..5c336b2255f 100644
--- a/app/assets/javascripts/select-kit/addon/components/multi-select/selected-category.js
+++ b/app/assets/javascripts/select-kit/addon/components/multi-select/selected-category.js
@@ -1,12 +1,10 @@
 import SelectedNameComponent from "select-kit/components/selected-name";
 import { categoryBadgeHTML } from "discourse/helpers/category-link";
 import { computed } from "@ember/object";
-import layout from "select-kit/templates/components/multi-select/selected-category";
 import { htmlSafe } from "@ember/template";
 
 export default SelectedNameComponent.extend({
   classNames: ["selected-category"],
-  layout,
 
   badge: computed("item", function () {
     return htmlSafe(
diff --git a/app/assets/javascripts/select-kit/addon/components/none-category-row.hbs b/app/assets/javascripts/select-kit/addon/components/none-category-row.hbs
new file mode 100644
index 00000000000..35670d94ae2
--- /dev/null
+++ b/app/assets/javascripts/select-kit/addon/components/none-category-row.hbs
@@ -0,0 +1,19 @@
+{{#if this.category}}
+  <div class="category-status" aria-hidden="true">
+    {{#if this.hasParentCategory}}
+      {{#unless this.hideParentCategory}}
+        {{this.badgeForParentCategory}}
+      {{/unless}}
+    {{/if}}
+    {{this.badgeForCategory}}
+  </div>
+
+  {{#if this.shouldDisplayDescription}}
+    <div class="category-desc" aria-hidden="true">{{dir-span
+        this.descriptionText
+        htmlSafe="true"
+      }}</div>
+  {{/if}}
+{{else}}
+  {{html-safe this.label}}
+{{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/select-kit/addon/components/none-category-row.js b/app/assets/javascripts/select-kit/addon/components/none-category-row.js
index 3d06e23457b..f8edef316f8 100644
--- a/app/assets/javascripts/select-kit/addon/components/none-category-row.js
+++ b/app/assets/javascripts/select-kit/addon/components/none-category-row.js
@@ -1,11 +1,9 @@
 import CategoryRowComponent from "select-kit/components/category-row";
 import { categoryBadgeHTML } from "discourse/helpers/category-link";
 import discourseComputed from "discourse-common/utils/decorators";
-import layout from "select-kit/templates/components/category-row";
 import { htmlSafe } from "@ember/template";
 
 export default CategoryRowComponent.extend({
-  layout,
   classNames: "none category-row",
 
   @discourseComputed("category")
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/notifications-filter/notifications-filter-header.hbs b/app/assets/javascripts/select-kit/addon/components/notifications-filter/notifications-filter-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/notifications-filter/notifications-filter-header.hbs
rename to app/assets/javascripts/select-kit/addon/components/notifications-filter/notifications-filter-header.hbs
diff --git a/app/assets/javascripts/select-kit/addon/components/notifications-filter/notifications-filter-header.js b/app/assets/javascripts/select-kit/addon/components/notifications-filter/notifications-filter-header.js
index d67f2138be1..06ad0447a87 100644
--- a/app/assets/javascripts/select-kit/addon/components/notifications-filter/notifications-filter-header.js
+++ b/app/assets/javascripts/select-kit/addon/components/notifications-filter/notifications-filter-header.js
@@ -1,13 +1,9 @@
 import DropdownSelectBoxHeaderComponent from "select-kit/components/dropdown-select-box/dropdown-select-box-header";
 import discourseComputed from "discourse-common/utils/decorators";
 import { fmt } from "discourse/lib/computed";
-import layout from "select-kit/templates/components/notifications-filter/notifications-filter-header";
 
 export default DropdownSelectBoxHeaderComponent.extend({
-  layout,
-
   classNames: ["notifications-filter-header"],
-
   label: fmt("value", "user.user_notifications.filters.%@"),
 
   @discourseComputed("selectKit.isExpanded")
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/period-chooser/period-chooser-header.hbs b/app/assets/javascripts/select-kit/addon/components/period-chooser/period-chooser-header.hbs
similarity index 50%
rename from app/assets/javascripts/select-kit/addon/templates/components/period-chooser/period-chooser-header.hbs
rename to app/assets/javascripts/select-kit/addon/components/period-chooser/period-chooser-header.hbs
index d8111ba8a8a..13fae3bb97f 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/period-chooser/period-chooser-header.hbs
+++ b/app/assets/javascripts/select-kit/addon/components/period-chooser/period-chooser-header.hbs
@@ -1,4 +1,4 @@
-<h2 class="selected-name" title={{this.title}} role="option">
+<h2 class="selected-name" title={{this.title}}>
   {{period-title
     this.value
     showDateRange=true
diff --git a/app/assets/javascripts/select-kit/addon/components/period-chooser/period-chooser-header.js b/app/assets/javascripts/select-kit/addon/components/period-chooser/period-chooser-header.js
index 31a9c66db84..56e8e93e2ad 100644
--- a/app/assets/javascripts/select-kit/addon/components/period-chooser/period-chooser-header.js
+++ b/app/assets/javascripts/select-kit/addon/components/period-chooser/period-chooser-header.js
@@ -1,9 +1,7 @@
 import DropdownSelectBoxHeaderComponent from "select-kit/components/dropdown-select-box/dropdown-select-box-header";
 import discourseComputed from "discourse-common/utils/decorators";
-import layout from "select-kit/templates/components/period-chooser/period-chooser-header";
 
 export default DropdownSelectBoxHeaderComponent.extend({
-  layout,
   classNames: ["period-chooser-header"],
 
   @discourseComputed("selectKit.isExpanded")
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/period-chooser/period-chooser-row.hbs b/app/assets/javascripts/select-kit/addon/components/period-chooser/period-chooser-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/period-chooser/period-chooser-row.hbs
rename to app/assets/javascripts/select-kit/addon/components/period-chooser/period-chooser-row.hbs
diff --git a/app/assets/javascripts/select-kit/addon/components/period-chooser/period-chooser-row.js b/app/assets/javascripts/select-kit/addon/components/period-chooser/period-chooser-row.js
index 0787fa62ef4..f71accbeda4 100644
--- a/app/assets/javascripts/select-kit/addon/components/period-chooser/period-chooser-row.js
+++ b/app/assets/javascripts/select-kit/addon/components/period-chooser/period-chooser-row.js
@@ -1,10 +1,8 @@
 import DropdownSelectBoxRowComponent from "select-kit/components/dropdown-select-box/dropdown-select-box-row";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
-import layout from "select-kit/templates/components/period-chooser/period-chooser-row";
 
 export default DropdownSelectBoxRowComponent.extend({
-  layout,
   classNames: ["period-chooser-row"],
 
   @discourseComputed("rowName")
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/pinned-button.hbs b/app/assets/javascripts/select-kit/addon/components/pinned-button.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/pinned-button.hbs
rename to app/assets/javascripts/select-kit/addon/components/pinned-button.hbs
diff --git a/app/assets/javascripts/select-kit/addon/components/pinned-button.js b/app/assets/javascripts/select-kit/addon/components/pinned-button.js
index bc1a834becf..2f90964566f 100644
--- a/app/assets/javascripts/select-kit/addon/components/pinned-button.js
+++ b/app/assets/javascripts/select-kit/addon/components/pinned-button.js
@@ -1,14 +1,12 @@
 import Component from "@ember/component";
 import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
-import layout from "select-kit/templates/components/pinned-button";
 
 export default Component.extend({
   pluginApiIdentifiers: ["pinned-button"],
   descriptionKey: "help",
   classNames: "pinned-button",
   classNameBindings: ["isHidden"],
-  layout,
 
   @discourseComputed("topic.pinned_globally", "pinned")
   reasonText(pinnedGlobally, pinned) {
diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit.js b/app/assets/javascripts/select-kit/addon/components/select-kit.js
index 304b6c3f5be..a2c617320bb 100644
--- a/app/assets/javascripts/select-kit/addon/components/select-kit.js
+++ b/app/assets/javascripts/select-kit/addon/components/select-kit.js
@@ -114,6 +114,7 @@ export default Component.extend(
           highlightPrevious: bind(this, this._highlightPrevious),
           highlightLast: bind(this, this._highlightLast),
           highlightFirst: bind(this, this._highlightFirst),
+          deselectLast: bind(this, this._deselectLast),
           change: bind(this, this._onChangeWrapper),
           select: bind(this, this.select),
           deselect: bind(this, this.deselect),
@@ -188,6 +189,14 @@ export default Component.extend(
       this.handleDeprecations();
     },
 
+    didInsertElement() {
+      this._super(...arguments);
+
+      if (this.selectKit.options.expandedOnInsert) {
+        this._open();
+      }
+    },
+
     click(event) {
       event.preventDefault();
       event.stopPropagation();
@@ -207,6 +216,7 @@ export default Component.extend(
     didReceiveAttrs() {
       this._super(...arguments);
 
+      const deprecatedOptions = this._resolveDeprecatedOptions();
       const mergedOptions = Object.assign({}, ...this.selectKitOptions);
       Object.keys(mergedOptions).forEach((key) => {
         if (isPresent(this.options[key])) {
@@ -214,6 +224,11 @@ export default Component.extend(
           return;
         }
 
+        if (isPresent(deprecatedOptions[`options.${key}`])) {
+          this.selectKit.options.set(key, deprecatedOptions[`options.${key}`]);
+          return;
+        }
+
         const value = mergedOptions[key];
 
         if (
@@ -281,6 +296,7 @@ export default Component.extend(
       minimum: null,
       autoInsertNoneItem: true,
       closeOnChange: true,
+      useHeaderFilter: false,
       limitMatches: null,
       placement: isDocumentRTL() ? "bottom-end" : "bottom-start",
       verticalOffset: 3,
@@ -296,6 +312,8 @@ export default Component.extend(
       desktopPlacementStrategy: null,
       hiddenValues: null,
       disabled: false,
+      expandedOnInsert: false,
+      formName: null,
     },
 
     autoFilterable: computed("content.[]", "selectKit.filter", function () {
@@ -785,6 +803,12 @@ export default Component.extend(
       }
     },
 
+    _deselectLast() {
+      if (this.selectKit.hasSelection) {
+        this.deselectByValue(this.value[this.value.length - 1]);
+      }
+    },
+
     select(value, item) {
       if (!isPresent(value)) {
         this._onClearSelection();
@@ -837,7 +861,7 @@ export default Component.extend(
       this.clearErrors();
 
       const inModal = this.element.closest("#discourse-modal");
-      if (inModal && this?.site?.mobileView) {
+      if (inModal && this.site.mobileView) {
         const modalBody = inModal.querySelector(".modal-body");
         modalBody.style = "";
       }
@@ -860,7 +884,7 @@ export default Component.extend(
       this.selectKit.onOpen(event);
 
       if (!this.popper) {
-        const inModal = this.element.closest("#discourse-modal");
+        const inModal = this.element.closest("#discourse-modal .modal-body");
         const anchor = document.querySelector(
           `#${this.selectKit.uniqueID}-header`
         );
@@ -1046,7 +1070,7 @@ export default Component.extend(
     handleDeprecations() {
       this._deprecateValueAttribute();
       this._deprecateMutations();
-      this._deprecateOptions();
+      this._handleDeprecatedArgs();
     },
 
     _computePlacementStrategy() {
@@ -1056,7 +1080,7 @@ export default Component.extend(
         return placementStrategy;
       }
 
-      if (this.capabilities?.isIpadOS || this.site?.mobileView) {
+      if (this.capabilities.isIpadOS || this.site.mobileView) {
         placementStrategy =
           this.selectKit.options.mobilePlacementStrategy || "absolute";
       } else {
@@ -1068,17 +1092,11 @@ export default Component.extend(
     },
 
     _deprecated(text) {
-      const discourseSetup = document.getElementById("data-discourse-setup");
-      if (
-        discourseSetup &&
-        discourseSetup.getAttribute("data-environment") === "development"
-      ) {
-        deprecated(text, {
-          since: "v2.4.0",
-          dropFrom: "2.9.0.beta1",
-          id: "discourse.select-kit",
-        });
-      }
+      deprecated(text, {
+        since: "v2.4.0",
+        dropFrom: "2.9.0.beta1",
+        id: "discourse.select-kit",
+      });
     },
 
     _deprecateValueAttribute() {
@@ -1107,11 +1125,8 @@ export default Component.extend(
       }
     },
 
-    _deprecateOptions() {
+    _resolveDeprecatedOptions() {
       const migrations = {
-        headerIcon: "icon",
-        onExpand: "onOpen",
-        onCollapse: "onClose",
         allowAny: "options.allowAny",
         allowCreate: "options.allowAny",
         filterable: "options.filterable",
@@ -1129,9 +1144,33 @@ export default Component.extend(
         minimum: "options.minimum",
         i18nPostfix: "options.i18nPostfix",
         i18nPrefix: "options.i18nPrefix",
+        btnCustomClasses: "options.btnCustomClasses",
         castInteger: "options.castInteger",
       };
 
+      const resolvedDeprecations = {};
+
+      Object.keys(migrations).forEach((from) => {
+        const to = migrations[from];
+        if (this.get(from) && !this.get(to)) {
+          this._deprecated(
+            `The \`${from}\` attribute is deprecated. Use \`${to}\` instead`
+          );
+
+          resolvedDeprecations[(to, this.get(from))];
+        }
+      });
+
+      return resolvedDeprecations;
+    },
+
+    _handleDeprecatedArgs() {
+      const migrations = {
+        headerIcon: "icon",
+        onExpand: "onOpen",
+        onCollapse: "onClose",
+      };
+
       Object.keys(migrations).forEach((from) => {
         const to = migrations[from];
         if (this.get(from) && !this.get(to)) {
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/select-kit/errors-collection.hbs b/app/assets/javascripts/select-kit/addon/components/select-kit/errors-collection.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/select-kit/errors-collection.hbs
rename to app/assets/javascripts/select-kit/addon/components/select-kit/errors-collection.hbs
diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit/errors-collection.js b/app/assets/javascripts/select-kit/addon/components/select-kit/errors-collection.js
index 099bd7aeba1..44494409ab5 100644
--- a/app/assets/javascripts/select-kit/addon/components/select-kit/errors-collection.js
+++ b/app/assets/javascripts/select-kit/addon/components/select-kit/errors-collection.js
@@ -1,7 +1,5 @@
 import Component from "@ember/component";
-import layout from "select-kit/templates/components/select-kit/errors-collection";
 
 export default Component.extend({
-  layout,
   tagName: "",
 });
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-body.hbs b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-body.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-body.hbs
rename to app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-body.hbs
diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-body.js b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-body.js
index a6d75f83487..37bffd0578e 100644
--- a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-body.js
+++ b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-body.js
@@ -1,10 +1,9 @@
 import Component from "@ember/component";
-import { bind } from "@ember/runloop";
+import { bind } from "discourse-common/utils/decorators";
+import { next } from "@ember/runloop";
 import { computed } from "@ember/object";
-import layout from "select-kit/templates/components/select-kit/select-kit-body";
 
 export default Component.extend({
-  layout,
   classNames: ["select-kit-body"],
   classNameBindings: ["emptyBody:empty-body"],
 
@@ -12,55 +11,53 @@ export default Component.extend({
     return false;
   }),
 
-  rootEventType: "click",
-
-  init() {
-    this._super(...arguments);
-
-    this.handleRootMouseDownHandler = bind(this, this.handleRootMouseDown);
-  },
-
   didInsertElement() {
     this._super(...arguments);
 
     this.element.style.position = "relative";
-
-    document.addEventListener(
-      this.rootEventType,
-      this.handleRootMouseDownHandler,
-      true
-    );
+    document.addEventListener("click", this.handleClick, true);
+    this.selectKit
+      .mainElement()
+      .addEventListener("keydown", this._handleKeydown, true);
   },
 
   willDestroyElement() {
     this._super(...arguments);
-
-    document.removeEventListener(
-      this.rootEventType,
-      this.handleRootMouseDownHandler,
-      true
-    );
+    document.removeEventListener("click", this.handleClick, true);
+    this.selectKit
+      .mainElement()
+      ?.removeEventListener("keydown", this._handleKeydown, true);
   },
 
-  handleRootMouseDown(event) {
-    if (!this.selectKit.isExpanded) {
+  @bind
+  handleClick(event) {
+    if (!this.selectKit.isExpanded || !this.selectKit.mainElement()) {
       return;
     }
 
-    const headerElement = document.querySelector(
-      `#${this.selectKit.uniqueID}-header`
-    );
-
-    if (headerElement && headerElement.contains(event.target)) {
+    if (this.selectKit.mainElement().contains(event.target)) {
       return;
     }
 
-    if (this.element.contains(event.target)) {
+    this.selectKit.close(event);
+  },
+
+  @bind
+  _handleKeydown(event) {
+    if (!this.selectKit.isExpanded || event.key !== "Tab") {
       return;
     }
 
-    if (this.selectKit.mainElement()) {
+    next(() => {
+      if (
+        this.isDestroying ||
+        this.isDestroyed ||
+        this.selectKit.mainElement()?.contains(document.activeElement)
+      ) {
+        return;
+      }
+
       this.selectKit.close(event);
-    }
+    });
   },
 });
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-collection.hbs b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-collection.hbs
similarity index 79%
rename from app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-collection.hbs
rename to app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-collection.hbs
index f17c087bc34..d52ec3e195d 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-collection.hbs
+++ b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-collection.hbs
@@ -1,8 +1,9 @@
 {{#if this.collection.content.length}}
   <ul class="select-kit-collection" aria-live="polite" role="menu">
-    {{#each this.collection.content as |item|}}
+    {{#each this.collection.content as |item index|}}
       {{component
         (component-for-row this.collection.identifier item this.selectKit)
+        index=index
         item=item
         value=this.value
         selectKit=this.selectKit
diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-collection.js b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-collection.js
index 8c4b3e1e2a8..44494409ab5 100644
--- a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-collection.js
+++ b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-collection.js
@@ -1,7 +1,5 @@
 import Component from "@ember/component";
-import layout from "select-kit/templates/components/select-kit/select-kit-collection";
 
 export default Component.extend({
-  layout,
   tagName: "",
 });
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-row.hbs b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-create-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-row.hbs
rename to app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-create-row.hbs
diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-create-row.js b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-create-row.js
index 9ddda685608..21df52df5a7 100644
--- a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-create-row.js
+++ b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-create-row.js
@@ -1,7 +1,5 @@
 import SelectKitRowComponent from "select-kit/components/select-kit/select-kit-row";
-import layout from "select-kit/templates/components/select-kit/select-kit-row";
 
 export default SelectKitRowComponent.extend({
-  layout,
   classNames: "create",
 });
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-filter.hbs b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-filter.hbs
similarity index 90%
rename from app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-filter.hbs
rename to app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-filter.hbs
index 6602ac47195..d0f57faf828 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-filter.hbs
+++ b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-filter.hbs
@@ -1,6 +1,6 @@
 {{#unless this.isHidden}}
   {{! filter-input-search prevents 1password from attempting autocomplete }}
-  {{! template-lint-disable no-down-event-binding }}
+  {{! template-lint-disable no-pointer-down-event-binding }}
 
   <Input
     tabindex={{0}}
diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-filter.js b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-filter.js
index d8782f9ec9f..9c7efdb5ba7 100644
--- a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-filter.js
+++ b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-filter.js
@@ -4,11 +4,9 @@ import UtilsMixin from "select-kit/mixins/utils";
 import { action, computed } from "@ember/object";
 import discourseComputed from "discourse-common/utils/decorators";
 import { isPresent } from "@ember/utils";
-import layout from "select-kit/templates/components/select-kit/select-kit-filter";
 import { not } from "@ember/object/computed";
 
 export default Component.extend(UtilsMixin, {
-  layout,
   classNames: ["select-kit-filter"],
   classNameBindings: ["isExpanded:is-expanded"],
   attributeBindings: ["role"],
@@ -81,6 +79,12 @@ export default Component.extend(UtilsMixin, {
       return true;
     }
 
+    if (event.key === "Backspace" && !this.selectKit.filter) {
+      this.selectKit.deselectLast();
+      event.preventDefault();
+      return false;
+    }
+
     if (event.key === "ArrowUp") {
       this.selectKit.highlightLast();
       event.preventDefault();
@@ -88,6 +92,9 @@ export default Component.extend(UtilsMixin, {
     }
 
     if (event.key === "ArrowDown") {
+      if (!this.selectKit.isExpanded) {
+        this.selectKit.open(event);
+      }
       this.selectKit.highlightFirst();
       event.preventDefault();
       return false;
@@ -96,6 +103,8 @@ export default Component.extend(UtilsMixin, {
     if (event.key === "Escape") {
       this.selectKit.close(event);
       this.selectKit.headerElement().focus();
+      event.preventDefault();
+      event.stopPropagation();
       return false;
     }
 
diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-header.js b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-header.js
index 5bd78815f7b..09c322e4254 100644
--- a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-header.js
+++ b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-header.js
@@ -64,6 +64,12 @@ export default Component.extend(UtilsMixin, {
     event.preventDefault();
     event.stopPropagation();
 
+    if (
+      event.target?.classList.contains("selected-choice") ||
+      event.target.parentNode?.classList.contains("selected-choice")
+    ) {
+      return false;
+    }
     this.selectKit.toggle(event);
   },
 
@@ -74,7 +80,11 @@ export default Component.extend(UtilsMixin, {
   },
 
   keyDown(event) {
-    if (this.selectKit.isDisabled || this.selectKit.options.disabled) {
+    if (
+      this.selectKit.isDisabled ||
+      this.selectKit.options.disabled ||
+      this.selectKit.options.useHeaderFilter
+    ) {
       return;
     }
 
diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-none-row.hbs b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-none-row.hbs
new file mode 100644
index 00000000000..5010ad7782b
--- /dev/null
+++ b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-none-row.hbs
@@ -0,0 +1,7 @@
+{{#each this.icons as |icon|}}
+  {{d-icon icon translatedTitle=this.dasherizedTitle}}
+{{/each}}
+
+<span class="name">
+  {{this.label}}
+</span>
\ No newline at end of file
diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-none-row.js b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-none-row.js
index f860b21e65c..5006771a98e 100644
--- a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-none-row.js
+++ b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-none-row.js
@@ -1,7 +1,5 @@
 import SelectKitRowComponent from "select-kit/components/select-kit/select-kit-row";
-import layout from "select-kit/templates/components/select-kit/select-kit-row";
 
 export default SelectKitRowComponent.extend({
-  layout,
   classNames: "none",
 });
diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-row.hbs b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-row.hbs
new file mode 100644
index 00000000000..5010ad7782b
--- /dev/null
+++ b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-row.hbs
@@ -0,0 +1,7 @@
+{{#each this.icons as |icon|}}
+  {{d-icon icon translatedTitle=this.dasherizedTitle}}
+{{/each}}
+
+<span class="name">
+  {{this.label}}
+</span>
\ No newline at end of file
diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-row.js b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-row.js
index 26330d11282..d8a33cfd99d 100644
--- a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-row.js
+++ b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-row.js
@@ -3,26 +3,27 @@ import Component from "@ember/component";
 import I18n from "I18n";
 import UtilsMixin from "select-kit/mixins/utils";
 import { guidFor } from "@ember/object/internals";
-import layout from "select-kit/templates/components/select-kit/select-kit-row";
 import { makeArray } from "discourse-common/lib/helpers";
 import { reads } from "@ember/object/computed";
 import { dasherize } from "@ember/string";
 
 export default Component.extend(UtilsMixin, {
-  layout,
   classNames: ["select-kit-row"],
   tagName: "li",
   tabIndex: 0,
+
   attributeBindings: [
     "tabIndex",
     "title",
     "rowValue:data-value",
     "rowName:data-name",
+    "index:data-index",
     "role",
     "ariaChecked:aria-checked",
     "guid:data-guid",
     "rowLang:lang",
   ],
+
   classNameBindings: [
     "isHighlighted",
     "isSelected",
@@ -31,24 +32,24 @@ export default Component.extend(UtilsMixin, {
     "item.classNames",
   ],
 
+  index: 0,
   role: "menuitemradio",
 
   didInsertElement() {
     this._super(...arguments);
 
-    if (!this?.site?.mobileView) {
+    if (!this.site.mobileView) {
       this.element.addEventListener("mouseenter", this.handleMouseEnter);
       this.element.addEventListener("focus", this.handleMouseEnter);
-      this.element.addEventListener("blur", this.handleBlur);
     }
   },
 
   willDestroyElement() {
     this._super(...arguments);
-    if (!this?.site?.mobileView && this.element) {
-      this.element.removeEventListener("mouseenter", this.handleBlur);
+
+    if (!this.site.mobileView) {
+      this.element.removeEventListener("mouseenter", this.handleMouseEnter);
       this.element.removeEventListener("focus", this.handleMouseEnter);
-      this.element.removeEventListener("blur", this.handleMouseEnter);
     }
   },
 
@@ -126,26 +127,11 @@ export default Component.extend(UtilsMixin, {
   @action
   handleMouseEnter() {
     if (!this.isDestroying || !this.isDestroyed) {
-      this.element.focus({ preventScroll: true });
       this.selectKit.onHover(this.rowValue, this.item);
     }
     return false;
   },
 
-  @action
-  handleBlur(event) {
-    if (
-      (!this.isDestroying || !this.isDestroyed) &&
-      event.target &&
-      this.selectKit.mainElement()
-    ) {
-      if (!this.selectKit.mainElement().contains(event.target)) {
-        this.selectKit.close(event);
-      }
-    }
-    return false;
-  },
-
   click(event) {
     event.preventDefault();
     event.stopPropagation();
@@ -191,6 +177,8 @@ export default Component.extend(UtilsMixin, {
       } else if (event.key === "Escape") {
         this.selectKit.close(event);
         this.selectKit.headerElement().focus();
+        event.preventDefault();
+        event.stopPropagation();
       } else {
         if (this.isValidInput(event.key)) {
           this.selectKit.set("filter", event.key);
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/select-kit/single-select-header.hbs b/app/assets/javascripts/select-kit/addon/components/select-kit/single-select-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/select-kit/single-select-header.hbs
rename to app/assets/javascripts/select-kit/addon/components/select-kit/single-select-header.hbs
diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit/single-select-header.js b/app/assets/javascripts/select-kit/addon/components/select-kit/single-select-header.js
index 9ccfd0efd31..c1fff8b0588 100644
--- a/app/assets/javascripts/select-kit/addon/components/select-kit/single-select-header.js
+++ b/app/assets/javascripts/select-kit/addon/components/select-kit/single-select-header.js
@@ -2,15 +2,12 @@ import { computed } from "@ember/object";
 import { or } from "@ember/object/computed";
 import SelectKitHeaderComponent from "select-kit/components/select-kit/select-kit-header";
 import UtilsMixin from "select-kit/mixins/utils";
-import layout from "select-kit/templates/components/select-kit/single-select-header";
 import I18n from "I18n";
 
 export default SelectKitHeaderComponent.extend(UtilsMixin, {
   tagName: "summary",
-  layout,
   classNames: ["single-select-header"],
   attributeBindings: ["name", "ariaLabel:aria-label"],
-
   ariaLabel: or("selectKit.options.headerAriaLabel", "name"),
 
   focusIn(event) {
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/selected-choice-category.hbs b/app/assets/javascripts/select-kit/addon/components/selected-choice-category.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/selected-choice-category.hbs
rename to app/assets/javascripts/select-kit/addon/components/selected-choice-category.hbs
diff --git a/app/assets/javascripts/select-kit/addon/components/selected-choice-category.js b/app/assets/javascripts/select-kit/addon/components/selected-choice-category.js
index 0579eb40f6f..6d219e466d5 100644
--- a/app/assets/javascripts/select-kit/addon/components/selected-choice-category.js
+++ b/app/assets/javascripts/select-kit/addon/components/selected-choice-category.js
@@ -1,4 +1,3 @@
-import layout from "select-kit/templates/components/selected-choice-category";
 import SelectedChoiceComponent from "select-kit/components/selected-choice";
 import { categoryBadgeHTML } from "discourse/helpers/category-link";
 import { computed } from "@ember/object";
@@ -6,7 +5,6 @@ import { htmlSafe } from "@ember/template";
 
 export default SelectedChoiceComponent.extend({
   tagName: "",
-  layout,
   extraClass: "selected-choice-category",
 
   badge: computed("item", function () {
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/selected-choice.hbs b/app/assets/javascripts/select-kit/addon/components/selected-choice.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/selected-choice.hbs
rename to app/assets/javascripts/select-kit/addon/components/selected-choice.hbs
diff --git a/app/assets/javascripts/select-kit/addon/components/selected-choice.js b/app/assets/javascripts/select-kit/addon/components/selected-choice.js
index 1768c202fd7..24f9bdebd7b 100644
--- a/app/assets/javascripts/select-kit/addon/components/selected-choice.js
+++ b/app/assets/javascripts/select-kit/addon/components/selected-choice.js
@@ -1,12 +1,10 @@
 import { guidFor } from "@ember/object/internals";
 import Component from "@ember/component";
 import { computed } from "@ember/object";
-import layout from "select-kit/templates/components/selected-choice";
 import UtilsMixin from "select-kit/mixins/utils";
 
 export default Component.extend(UtilsMixin, {
   tagName: "",
-  layout,
   item: null,
   selectKit: null,
   extraClass: null,
diff --git a/app/assets/javascripts/select-kit/addon/components/selected-flair.hbs b/app/assets/javascripts/select-kit/addon/components/selected-flair.hbs
new file mode 100644
index 00000000000..0b011e1ae67
--- /dev/null
+++ b/app/assets/javascripts/select-kit/addon/components/selected-flair.hbs
@@ -0,0 +1,10 @@
+{{#if this.item.url}}
+  <AvatarFlair
+    @flairName={{this.item.name}}
+    @flairUrl={{this.item.url}}
+    @flairBgColor={{this.item.bgColor}}
+    @flairColor={{this.item.color}}
+  />
+{{/if}}
+
+<span>{{this.label}}</span>
\ No newline at end of file
diff --git a/app/assets/javascripts/select-kit/addon/components/selected-flair.js b/app/assets/javascripts/select-kit/addon/components/selected-flair.js
index b4ddf9ac3a4..89313eca5e3 100644
--- a/app/assets/javascripts/select-kit/addon/components/selected-flair.js
+++ b/app/assets/javascripts/select-kit/addon/components/selected-flair.js
@@ -1,7 +1,5 @@
 import SelectedNameComponent from "select-kit/components/selected-name";
-import layout from "select-kit/templates/components/flair-row";
 
 export default SelectedNameComponent.extend({
-  layout,
   tagName: "",
 });
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/selected-name.hbs b/app/assets/javascripts/select-kit/addon/components/selected-name.hbs
similarity index 80%
rename from app/assets/javascripts/select-kit/addon/templates/components/selected-name.hbs
rename to app/assets/javascripts/select-kit/addon/components/selected-name.hbs
index 1f06ff68956..1273b32751e 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/selected-name.hbs
+++ b/app/assets/javascripts/select-kit/addon/components/selected-name.hbs
@@ -4,9 +4,16 @@
     title={{this.title}}
     data-value={{this.value}}
     data-name={{this.name}}
-    role="option"
     class="select-kit-selected-name selected-name choice"
   >
+    {{#if this.selectKit.options.formName}}
+      <input
+        type="hidden"
+        name={{this.selectKit.options.formName}}
+        value={{this.value}}
+      />
+    {{/if}}
+
     {{#if this.item.icon}}
       {{d-icon this.item.icon}}
     {{/if}}
@@ -28,7 +35,6 @@
 {{else}}
   {{#if this.item.icon}}
     <div
-      role="option"
       lang={{this.lang}}
       class="select-kit-selected-name selected-name choice"
     >
diff --git a/app/assets/javascripts/select-kit/addon/components/selected-name.js b/app/assets/javascripts/select-kit/addon/components/selected-name.js
index aad9ebb5646..2324fa5c0ef 100644
--- a/app/assets/javascripts/select-kit/addon/components/selected-name.js
+++ b/app/assets/javascripts/select-kit/addon/components/selected-name.js
@@ -2,13 +2,11 @@ import { guidFor } from "@ember/object/internals";
 import { computed, get } from "@ember/object";
 import Component from "@ember/component";
 import UtilsMixin from "select-kit/mixins/utils";
-import layout from "select-kit/templates/components/selected-name";
 import { makeArray } from "discourse-common/lib/helpers";
 import { reads } from "@ember/object/computed";
 
 export default Component.extend(UtilsMixin, {
   tagName: "",
-  layout,
   name: null,
   value: null,
   headerTitle: null,
diff --git a/app/assets/javascripts/select-kit/addon/components/single-select.hbs b/app/assets/javascripts/select-kit/addon/components/single-select.hbs
new file mode 100644
index 00000000000..c4d684d817d
--- /dev/null
+++ b/app/assets/javascripts/select-kit/addon/components/single-select.hbs
@@ -0,0 +1,43 @@
+{{#unless this.selectKit.isHidden}}
+  {{component
+    this.selectKit.options.headerComponent
+    tabindex=this.tabindex
+    value=this.value
+    selectedContent=this.selectedContent
+    selectKit=this.selectKit
+    id=(concat this.selectKit.uniqueID "-header")
+  }}
+
+  <SelectKit::SelectKitBody
+    @selectKit={{this.selectKit}}
+    @id={{concat this.selectKit.uniqueID "-body"}}
+  >
+    {{component
+      this.selectKit.options.filterComponent
+      selectKit=this.selectKit
+      id=(concat this.selectKit.uniqueID "-filter")
+    }}
+
+    {{#each this.collections as |collection|}}
+      {{component
+        (component-for-collection collection.identifier this.selectKit)
+        collection=collection
+        selectKit=this.selectKit
+        value=this.value
+      }}
+    {{/each}}
+
+    {{#if this.selectKit.filter}}
+      {{#if this.selectKit.hasNoContent}}
+        <span class="no-content" role="alert">
+          {{i18n "select_kit.no_content"}}
+        </span>
+      {{else}}
+        <span class="results-count" role="alert">
+          {{i18n "select_kit.results_count" count=this.mainCollection.length}}
+        </span>
+      {{/if}}
+    {{/if}}
+
+  </SelectKit::SelectKitBody>
+{{/unless}}
\ No newline at end of file
diff --git a/app/assets/javascripts/select-kit/addon/components/single-select.js b/app/assets/javascripts/select-kit/addon/components/single-select.js
index de630a7091a..28a9a1267fd 100644
--- a/app/assets/javascripts/select-kit/addon/components/single-select.js
+++ b/app/assets/javascripts/select-kit/addon/components/single-select.js
@@ -1,11 +1,9 @@
 import SelectKitComponent from "select-kit/components/select-kit";
 import { computed } from "@ember/object";
 import { isEmpty } from "@ember/utils";
-import layout from "select-kit/templates/components/single-select";
 
 export default SelectKitComponent.extend({
   pluginApiIdentifiers: ["single-select"],
-  layout,
   classNames: ["single-select"],
   singleSelect: true,
 
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/tag-chooser-row.hbs b/app/assets/javascripts/select-kit/addon/components/tag-chooser-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/tag-chooser-row.hbs
rename to app/assets/javascripts/select-kit/addon/components/tag-chooser-row.hbs
diff --git a/app/assets/javascripts/select-kit/addon/components/tag-chooser-row.js b/app/assets/javascripts/select-kit/addon/components/tag-chooser-row.js
index 5b40bb1513d..847621a6879 100644
--- a/app/assets/javascripts/select-kit/addon/components/tag-chooser-row.js
+++ b/app/assets/javascripts/select-kit/addon/components/tag-chooser-row.js
@@ -1,7 +1,5 @@
 import SelectKitRowComponent from "select-kit/components/select-kit/select-kit-row";
-import layout from "select-kit/templates/components/tag-chooser-row";
 
 export default SelectKitRowComponent.extend({
-  layout,
   classNames: ["tag-chooser-row"],
 });
diff --git a/app/assets/javascripts/select-kit/addon/components/tag-chooser.js b/app/assets/javascripts/select-kit/addon/components/tag-chooser.js
index 16909e6cf93..634f80ba3b3 100644
--- a/app/assets/javascripts/select-kit/addon/components/tag-chooser.js
+++ b/app/assets/javascripts/select-kit/addon/components/tag-chooser.js
@@ -15,7 +15,11 @@ export default MultiSelectComponent.extend(TagsMixin, {
     maximum: "maximumTagCount",
   },
 
-  modifyComponentForRow() {
+  modifyComponentForRow(collection, item) {
+    if (this.getValue(item) === this.selectKit.filter && !item.count) {
+      return "select-kit/select-kit-row";
+    }
+
     return "tag-chooser-row";
   },
 
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/tag-drop/more-tags-collection.hbs b/app/assets/javascripts/select-kit/addon/components/tag-drop/more-tags-collection.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/tag-drop/more-tags-collection.hbs
rename to app/assets/javascripts/select-kit/addon/components/tag-drop/more-tags-collection.hbs
diff --git a/app/assets/javascripts/select-kit/addon/components/tag-drop/more-tags-collection.js b/app/assets/javascripts/select-kit/addon/components/tag-drop/more-tags-collection.js
index af0865396b7..050cf9134f5 100644
--- a/app/assets/javascripts/select-kit/addon/components/tag-drop/more-tags-collection.js
+++ b/app/assets/javascripts/select-kit/addon/components/tag-drop/more-tags-collection.js
@@ -1,10 +1,6 @@
 import Component from "@ember/component";
-import layout from "select-kit/templates/components/tag-drop/more-tags-collection";
 
 export default Component.extend({
   tagName: "",
-
-  layout,
-
   collection: null,
 });
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/tag-drop/tag-drop-header.hbs b/app/assets/javascripts/select-kit/addon/components/tag-drop/tag-drop-header.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/tag-drop/tag-drop-header.hbs
rename to app/assets/javascripts/select-kit/addon/components/tag-drop/tag-drop-header.hbs
diff --git a/app/assets/javascripts/select-kit/addon/components/tag-drop/tag-drop-header.js b/app/assets/javascripts/select-kit/addon/components/tag-drop/tag-drop-header.js
index 828b7743458..ec95b655b27 100644
--- a/app/assets/javascripts/select-kit/addon/components/tag-drop/tag-drop-header.js
+++ b/app/assets/javascripts/select-kit/addon/components/tag-drop/tag-drop-header.js
@@ -1,7 +1,5 @@
 import ComboBoxSelectBoxHeaderComponent from "select-kit/components/combo-box/combo-box-header";
-import layout from "select-kit/templates/components/tag-drop/tag-drop-header";
 
 export default ComboBoxSelectBoxHeaderComponent.extend({
-  layout,
   classNames: "tag-drop-header",
 });
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/tag-row.hbs b/app/assets/javascripts/select-kit/addon/components/tag-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/tag-row.hbs
rename to app/assets/javascripts/select-kit/addon/components/tag-row.hbs
diff --git a/app/assets/javascripts/select-kit/addon/components/tag-row.js b/app/assets/javascripts/select-kit/addon/components/tag-row.js
index 8d54bfa8576..ec932fbbfbd 100644
--- a/app/assets/javascripts/select-kit/addon/components/tag-row.js
+++ b/app/assets/javascripts/select-kit/addon/components/tag-row.js
@@ -1,7 +1,5 @@
 import SelectKitRowComponent from "select-kit/components/select-kit/select-kit-row";
-import layout from "select-kit/templates/components/tag-row";
 
 export default SelectKitRowComponent.extend({
-  layout,
   classNames: ["tag-row"],
 });
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.hbs b/app/assets/javascripts/select-kit/addon/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.hbs
rename to app/assets/javascripts/select-kit/addon/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.hbs
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/topic-notifications-button.hbs b/app/assets/javascripts/select-kit/addon/components/topic-notifications-button.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/topic-notifications-button.hbs
rename to app/assets/javascripts/select-kit/addon/components/topic-notifications-button.hbs
diff --git a/app/assets/javascripts/select-kit/addon/components/topic-notifications-button.js b/app/assets/javascripts/select-kit/addon/components/topic-notifications-button.js
index 8927c096141..55ab2795291 100644
--- a/app/assets/javascripts/select-kit/addon/components/topic-notifications-button.js
+++ b/app/assets/javascripts/select-kit/addon/components/topic-notifications-button.js
@@ -5,10 +5,8 @@ import { NotificationLevels } from "discourse/lib/notification-levels";
 import discourseComputed from "discourse-common/utils/decorators";
 import getURL from "discourse-common/lib/get-url";
 import Component from "@ember/component";
-import layout from "select-kit/templates/components/topic-notifications-button";
 
 export default Component.extend({
-  layout,
   classNames: ["topic-notifications-button"],
   classNameBindings: ["isLoading"],
   appendReason: true,
@@ -17,6 +15,7 @@ export default Component.extend({
   topic: null,
   showCaret: true,
   isLoading: false,
+
   icon: computed("isLoading", function () {
     return this.isLoading ? "spinner" : null;
   }),
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/topic-row.hbs b/app/assets/javascripts/select-kit/addon/components/topic-row.hbs
similarity index 72%
rename from app/assets/javascripts/select-kit/addon/templates/components/topic-row.hbs
rename to app/assets/javascripts/select-kit/addon/components/topic-row.hbs
index d9b2074909b..fc832e4c640 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/topic-row.hbs
+++ b/app/assets/javascripts/select-kit/addon/components/topic-row.hbs
@@ -1,5 +1,5 @@
 <TopicStatus @topic={{this.item}} @disableActions={{true}} />
-<div class="topic-title">{{replace-emoji this.item.fancy_title}}</div>
+<div class="topic-title">{{replace-emoji this.item.title}}</div>
 <div class="topic-categories">
   {{bound-category-link
     this.item.category
diff --git a/app/assets/javascripts/select-kit/addon/components/topic-row.js b/app/assets/javascripts/select-kit/addon/components/topic-row.js
index 284f9baa281..46d0df1f176 100644
--- a/app/assets/javascripts/select-kit/addon/components/topic-row.js
+++ b/app/assets/javascripts/select-kit/addon/components/topic-row.js
@@ -1,7 +1,5 @@
 import SelectKitRowComponent from "select-kit/components/select-kit/select-kit-row";
-import layout from "select-kit/templates/components/topic-row";
 
 export default SelectKitRowComponent.extend({
-  layout,
   classNames: ["topic-row"],
 });
diff --git a/app/assets/javascripts/select-kit/addon/components/user-chooser.js b/app/assets/javascripts/select-kit/addon/components/user-chooser.js
index be1deb7c7f1..2b7d5a08e5d 100644
--- a/app/assets/javascripts/select-kit/addon/components/user-chooser.js
+++ b/app/assets/javascripts/select-kit/addon/components/user-chooser.js
@@ -29,6 +29,7 @@ export default MultiSelectComponent.extend({
     groupMembersOf: undefined,
     excludeCurrentUser: false,
     customSearchOptions: undefined,
+    excludedUsernames: undefined,
   },
 
   content: computed("value.[]", function () {
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/user-chooser/user-row.hbs b/app/assets/javascripts/select-kit/addon/components/user-chooser/user-row.hbs
similarity index 100%
rename from app/assets/javascripts/select-kit/addon/templates/components/user-chooser/user-row.hbs
rename to app/assets/javascripts/select-kit/addon/components/user-chooser/user-row.hbs
diff --git a/app/assets/javascripts/select-kit/addon/components/user-chooser/user-row.js b/app/assets/javascripts/select-kit/addon/components/user-chooser/user-row.js
index 90c745256fc..87acedef68f 100644
--- a/app/assets/javascripts/select-kit/addon/components/user-chooser/user-row.js
+++ b/app/assets/javascripts/select-kit/addon/components/user-chooser/user-row.js
@@ -1,7 +1,5 @@
 import SelectKitRowComponent from "select-kit/components/select-kit/select-kit-row";
-import layout from "select-kit/templates/components/user-chooser/user-row";
 
 export default SelectKitRowComponent.extend({
-  layout,
   classNames: ["user-row"],
 });
diff --git a/app/assets/javascripts/select-kit/addon/components/user-notifications-dropdown.js b/app/assets/javascripts/select-kit/addon/components/user-notifications-dropdown.js
index e249f49f6fa..daf8436725e 100644
--- a/app/assets/javascripts/select-kit/addon/components/user-notifications-dropdown.js
+++ b/app/assets/javascripts/select-kit/addon/components/user-notifications-dropdown.js
@@ -1,10 +1,13 @@
 import DropdownSelectBox from "select-kit/components/dropdown-select-box";
+import { inject as service } from "@ember/service";
 import I18n from "I18n";
 import { computed } from "@ember/object";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import showModal from "discourse/lib/show-modal";
+import IgnoreDurationModal from "discourse/components/modal/ignore-duration-with-username";
 
 export default DropdownSelectBox.extend({
+  modal: service(),
+
   classNames: ["user-notifications", "user-notifications-dropdown"],
 
   selectKitOptions: {
@@ -55,8 +58,11 @@ export default DropdownSelectBox.extend({
     this.updateNotificationLevel({ level: "mute" }).catch(popupAjaxError);
   },
   changeToIgnored() {
-    showModal("ignore-duration", {
-      model: this.user,
+    this.modal.show(IgnoreDurationModal, {
+      model: {
+        ignoredUsername: this.user.username,
+        enableSelection: false,
+      },
     });
   },
 
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/multi-select.hbs b/app/assets/javascripts/select-kit/addon/templates/components/multi-select.hbs
deleted file mode 100644
index 2e4a1d60189..00000000000
--- a/app/assets/javascripts/select-kit/addon/templates/components/multi-select.hbs
+++ /dev/null
@@ -1,62 +0,0 @@
-{{#unless this.selectKit.isHidden}}
-  {{component
-    this.selectKit.options.headerComponent
-    tabindex=this.tabindex
-    value=this.value
-    selectedContent=this.selectedContent
-    selectKit=this.selectKit
-    id=(concat this.selectKit.uniqueID "-header")
-  }}
-
-  <SelectKit::SelectKitBody
-    @selectKit={{this.selectKit}}
-    @id={{concat this.selectKit.uniqueID "-body"}}
-  >
-    {{component
-      this.selectKit.options.filterComponent
-      selectKit=this.selectKit
-      id=(concat this.selectKit.uniqueID "-filter")
-    }}
-
-    {{#if this.selectedContent.length}}
-      <div class="selected-content">
-        {{#each this.selectedContent as |item|}}
-          {{component
-            this.selectKit.options.selectedChoiceComponent
-            item=item
-            selectKit=this.selectKit
-          }}
-        {{/each}}
-      </div>
-    {{/if}}
-
-    {{#if this.selectKit.isLoading}}
-      <span class="is-loading">
-        {{#if this.site}}
-          {{loading-spinner size="small"}}
-        {{/if}}
-      </span>
-    {{else}}
-      {{#each this.collections as |collection|}}
-        {{component
-          (component-for-collection collection.identifier this.selectKit)
-          collection=collection
-          selectKit=this.selectKit
-          value=this.value
-        }}
-      {{/each}}
-
-      {{#if this.selectKit.filter}}
-        {{#if this.selectKit.hasNoContent}}
-          <span class="no-content" role="alert">
-            {{i18n "select_kit.no_content"}}
-          </span>
-        {{else}}
-          <span class="results-count" role="alert">
-            {{i18n "select_kit.results_count" count=this.mainCollection.length}}
-          </span>
-        {{/if}}
-      {{/if}}
-    {{/if}}
-  </SelectKit::SelectKitBody>
-{{/unless}}
\ No newline at end of file
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/multi-select/multi-select-header.hbs b/app/assets/javascripts/select-kit/addon/templates/components/multi-select/multi-select-header.hbs
deleted file mode 100644
index 9d7c0ce4d64..00000000000
--- a/app/assets/javascripts/select-kit/addon/templates/components/multi-select/multi-select-header.hbs
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="select-kit-header-wrapper">
-  {{#each this.icons as |icon|}}
-    {{d-icon icon}}
-  {{/each}}
-
-  <MultiSelect::FormatSelectedContent
-    @content={{or this.selectedContent this.selectKit.noneItem}}
-    @selectKit={{this.selectKit}}
-  />
-
-  {{d-icon this.caretIcon class="caret-icon"}}
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/single-select.hbs b/app/assets/javascripts/select-kit/addon/templates/components/single-select.hbs
deleted file mode 100644
index 2271eea924d..00000000000
--- a/app/assets/javascripts/select-kit/addon/templates/components/single-select.hbs
+++ /dev/null
@@ -1,50 +0,0 @@
-{{#unless this.selectKit.isHidden}}
-  {{component
-    this.selectKit.options.headerComponent
-    tabindex=this.tabindex
-    value=this.value
-    selectedContent=this.selectedContent
-    selectKit=this.selectKit
-    id=(concat this.selectKit.uniqueID "-header")
-  }}
-
-  <SelectKit::SelectKitBody
-    @selectKit={{this.selectKit}}
-    @id={{concat this.selectKit.uniqueID "-body"}}
-  >
-    {{component
-      this.selectKit.options.filterComponent
-      selectKit=this.selectKit
-      id=(concat this.selectKit.uniqueID "-filter")
-    }}
-
-    {{#if this.selectKit.isLoading}}
-      <span class="is-loading">
-        {{#if this.site}}
-          {{loading-spinner size="small"}}
-        {{/if}}
-      </span>
-    {{else}}
-      {{#each this.collections as |collection|}}
-        {{component
-          (component-for-collection collection.identifier this.selectKit)
-          collection=collection
-          selectKit=this.selectKit
-          value=this.value
-        }}
-      {{/each}}
-
-      {{#if this.selectKit.filter}}
-        {{#if this.selectKit.hasNoContent}}
-          <span class="no-content" role="alert">
-            {{i18n "select_kit.no_content"}}
-          </span>
-        {{else}}
-          <span class="results-count" role="alert">
-            {{i18n "select_kit.results_count" count=this.mainCollection.length}}
-          </span>
-        {{/if}}
-      {{/if}}
-    {{/if}}
-  </SelectKit::SelectKitBody>
-{{/unless}}
\ No newline at end of file
diff --git a/app/assets/javascripts/select-kit/config/ember-cli-update.json b/app/assets/javascripts/select-kit/config/ember-cli-update.json
index c4e56160cb7..994928cd9c9 100644
--- a/app/assets/javascripts/select-kit/config/ember-cli-update.json
+++ b/app/assets/javascripts/select-kit/config/ember-cli-update.json
@@ -3,14 +3,16 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "3.28.5",
+      "version": "5.0.0",
       "blueprints": [
         {
           "name": "addon",
           "outputRepo": "https://github.com/ember-cli/ember-addon-output",
           "codemodsSource": "ember-addon-codemods-manifest@1",
           "isBaseBlueprint": true,
-          "options": ["--no-welcome"]
+          "options": [
+            "--no-welcome"
+          ]
         }
       ]
     }
diff --git a/app/assets/javascripts/select-kit/config/ember-try.js b/app/assets/javascripts/select-kit/config/ember-try.js
deleted file mode 100644
index 3a64030a8a2..00000000000
--- a/app/assets/javascripts/select-kit/config/ember-try.js
+++ /dev/null
@@ -1,119 +0,0 @@
-"use strict";
-
-const getChannelURL = require("ember-source-channel-url");
-const { embroiderSafe, embroiderOptimized } = require("@embroider/test-setup");
-
-module.exports = async function () {
-  return {
-    useYarn: true,
-    scenarios: [
-      {
-        name: "ember-lts-3.8",
-        npm: {
-          devDependencies: {
-            "ember-source": "~3.8.0",
-          },
-        },
-      },
-      {
-        name: "ember-lts-3.12",
-        npm: {
-          devDependencies: {
-            "ember-source": "~3.12.0",
-          },
-        },
-      },
-      {
-        name: "ember-lts-3.20",
-        npm: {
-          devDependencies: {
-            "ember-source": "~3.20.5",
-          },
-        },
-      },
-      {
-        name: "ember-lts-3.24",
-        npm: {
-          devDependencies: {
-            "ember-source": "~3.24.3",
-          },
-        },
-      },
-      {
-        name: "ember-lts-3.28",
-        npm: {
-          devDependencies: {
-            "ember-source": "~3.28.0",
-          },
-        },
-      },
-      {
-        name: "ember-release",
-        npm: {
-          devDependencies: {
-            "ember-source": await getChannelURL("release"),
-          },
-        },
-      },
-      {
-        name: "ember-beta",
-        npm: {
-          devDependencies: {
-            "ember-source": await getChannelURL("beta"),
-          },
-        },
-      },
-      {
-        name: "ember-canary",
-        npm: {
-          devDependencies: {
-            "ember-source": await getChannelURL("canary"),
-          },
-        },
-      },
-      // The default `.travis.yml` runs this scenario via `yarn test`,
-      // not via `ember try`. It's still included here so that running
-      // `ember try:each` manually or from a customized CI config will run it
-      // along with all the other scenarios.
-      {
-        name: "ember-default",
-        npm: {
-          devDependencies: {},
-        },
-      },
-      {
-        name: "ember-default-with-jquery",
-        env: {
-          EMBER_OPTIONAL_FEATURES: JSON.stringify({
-            "jquery-integration": true,
-          }),
-        },
-        npm: {
-          devDependencies: {
-            "@ember/jquery": "^0.5.1",
-          },
-        },
-      },
-      {
-        name: "ember-classic",
-        env: {
-          EMBER_OPTIONAL_FEATURES: JSON.stringify({
-            "application-template-wrapper": true,
-            "default-async-observers": false,
-            "template-only-glimmer-components": false,
-          }),
-        },
-        npm: {
-          devDependencies: {
-            "ember-source": "~3.28.0",
-          },
-          ember: {
-            edition: "classic",
-          },
-        },
-      },
-      embroiderSafe(),
-      embroiderOptimized(),
-    ],
-  };
-};
diff --git a/app/assets/javascripts/select-kit/config/environment.js b/app/assets/javascripts/select-kit/config/environment.js
deleted file mode 100644
index b7238585e61..00000000000
--- a/app/assets/javascripts/select-kit/config/environment.js
+++ /dev/null
@@ -1,5 +0,0 @@
-"use strict";
-
-module.exports = function (/* environment, appConfig */) {
-  return {};
-};
diff --git a/app/assets/javascripts/select-kit/ember-cli-build.js b/app/assets/javascripts/select-kit/ember-cli-build.js
index 60eb15c12a9..da57a67830a 100644
--- a/app/assets/javascripts/select-kit/ember-cli-build.js
+++ b/app/assets/javascripts/select-kit/ember-cli-build.js
@@ -3,7 +3,7 @@
 const EmberAddon = require("ember-cli/lib/broccoli/ember-addon");
 
 module.exports = function (defaults) {
-  let app = new EmberAddon(defaults, {
+  const app = new EmberAddon(defaults, {
     autoImport: {
       publicAssetURL: "",
     },
diff --git a/app/assets/javascripts/select-kit/package.json b/app/assets/javascripts/select-kit/package.json
index a226808c862..43480049ad2 100644
--- a/app/assets/javascripts/select-kit/package.json
+++ b/app/assets/javascripts/select-kit/package.json
@@ -7,7 +7,6 @@
   "keywords": [
     "ember-addon"
   ],
-  "repository": "",
   "scripts": {
     "build": "ember build",
     "lint:hbs": "ember-template-lint .",
@@ -15,28 +14,28 @@
     "start": "ember serve"
   },
   "dependencies": {
-    "ember-auto-import": "^2.5.0",
-    "ember-cli-babel": "^7.26.10",
-    "ember-cli-htmlbars": "^6.1.1",
-    "webpack": "^5.75.0"
+    "ember-auto-import": "^2.6.3",
+    "ember-cli-babel": "^7.26.11",
+    "ember-cli-htmlbars": "^6.2.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.20.12",
+    "@babel/core": "^7.22.9",
     "@ember/optional-features": "^2.0.0",
-    "@embroider/test-setup": "^2.0.2",
+    "@ember/string": "^3.1.1",
+    "@embroider/test-setup": "^3.0.1",
     "@glimmer/component": "^1.1.2",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~3.28.5",
-    "ember-cli-dependency-checker": "^3.3.1",
+    "ember-cli": "~5.0.0",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-load-initializers": "^2.1.1",
-    "ember-resolver": "^8.0.3",
-    "ember-source": "~3.28.11",
+    "ember-resolver": "^10.1.1",
+    "ember-source": "~3.28.12",
     "ember-source-channel-url": "^3.0.0",
-    "loader.js": "^4.7.0"
+    "loader.js": "^4.7.0",
+    "webpack": "^5.88.2"
   },
   "engines": {
     "node": "16.* || >= 18",
diff --git a/app/assets/javascripts/select-kit/tests/dummy/app/index.html b/app/assets/javascripts/select-kit/tests/dummy/app/index.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/select-kit/tests/dummy/app/styles/.gitkeep b/app/assets/javascripts/select-kit/tests/dummy/app/styles/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/select-kit/tests/dummy/app/templates/.gitkeep b/app/assets/javascripts/select-kit/tests/dummy/app/templates/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/select-kit/tests/dummy/config/.gitkeep b/app/assets/javascripts/select-kit/tests/dummy/config/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/select-kit/tests/dummy/public/.gitkeep b/app/assets/javascripts/select-kit/tests/dummy/public/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/select-kit/tests/index.html b/app/assets/javascripts/select-kit/tests/index.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/service-worker.js.erb b/app/assets/javascripts/service-worker.js.erb
index e54831fef04..08a5a120337 100644
--- a/app/assets/javascripts/service-worker.js.erb
+++ b/app/assets/javascripts/service-worker.js.erb
@@ -1,13 +1,25 @@
 'use strict';
 
-importScripts("<%= "#{Discourse.asset_host}#{Discourse.base_path}/javascripts/workbox/workbox-sw.js" %>");
+<%
+  base = if GlobalSetting.use_s3? && GlobalSetting.s3_cdn_url
+    GlobalSetting.s3_asset_cdn_url.presence || GlobalSetting.s3_cdn_url
+  elsif GlobalSetting.cdn_url
+    GlobalSetting.cdn_url + Discourse.base_path
+  else
+    Discourse.base_path
+  end
+
+  workbox_base = "#{base}/assets/#{EmberCli.workbox_dir_name}"
+%>
+
+importScripts("<%= "#{workbox_base}/workbox-sw.js" %>");
 
 workbox.setConfig({
-  modulePathPrefix: "<%= "#{Discourse.asset_host}#{Discourse.base_path}/javascripts/workbox" %>",
+  modulePathPrefix: "<%= workbox_base %>",
   debug: false
 });
 
-var authUrls = ["auth", "session/sso_login", "session/sso"].map(path => `<%= Discourse.base_path %>/${path}`);
+var authUrls = ["auth", "session/sso_login", "session/sso", "srv/status"].map(path => `<%= Discourse.base_path %>/${path}`);
 var chatRegex = /\/chat\/channel\/(\d+)\//;
 var inlineReplyIcon = "<%= UrlHelper.absolute("/images/push-notifications/inline_reply.png") %>";
 
@@ -19,19 +31,20 @@ var externalCacheName = "external-" + cacheVersion;
 // https://bugs.chromium.org/p/chromium/issues/detail?id=1286367
 var chromeVersionMatch = navigator.userAgent.match(/Chrome\/97.0.(\d+)/);
 var isBrokenChrome97 = chromeVersionMatch && parseInt(chromeVersionMatch[1]) <= 4692;
+var isApple = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
 
 // Cache all GET requests, so Discourse can be used while offline
 workbox.routing.registerRoute(
   function(args) {
-    return args.url.origin === location.origin && !authUrls.some(u => args.url.pathname.startsWith(u)) && !isBrokenChrome97;
+    return args.url.origin === location.origin && !authUrls.some(u => args.url.pathname.startsWith(u)) && !isBrokenChrome97 && !isApple;
   }, // Match all except auth routes
   new workbox.strategies.NetworkFirst({ // This will only use the cache when a network request fails
     cacheName: discourseCacheName,
     plugins: [
-      new workbox.cacheableResponse.Plugin({
+      new workbox.cacheableResponse.CacheableResponsePlugin({
         statuses: [200] // opaque responses will return status code '0'
       }), // for s3 secure uploads signed urls
-      new workbox.expiration.Plugin({
+      new workbox.expiration.ExpirationPlugin({
         maxAgeSeconds: 7* 24 * 60 * 60, // 7 days
         maxEntries: 250,
         purgeOnQuotaError: true, // safe to automatically delete if exceeding the available storage
@@ -80,7 +93,10 @@ if (cdnUrls.length > 0) {
         credentials: 'omit'
       },
       plugins: [
-        new workbox.expiration.Plugin({
+        new workbox.cacheableResponse.CacheableResponsePlugin({
+          statuses: [200] // opaque responses will return status code '0'
+        }),
+        new workbox.expiration.ExpirationPlugin({
           maxAgeSeconds: 7* 24 * 60 * 60, // 7 days
           maxEntries: 250,
           purgeOnQuotaError: true, // safe to automatically delete if exceeding the available storage
@@ -108,10 +124,10 @@ workbox.routing.registerRoute(
   new workbox.strategies.NetworkFirst({ // This will only use the cache when a network request fails
     cacheName: externalCacheName,
     plugins: [
-      new workbox.cacheableResponse.Plugin({
+      new workbox.cacheableResponse.CacheableResponsePlugin({
         statuses: [200] // opaque responses will return status code '0'
       }),
-      new workbox.expiration.Plugin({
+      new workbox.expiration.ExpirationPlugin({
         maxAgeSeconds: 7* 24 * 60 * 60, // 7 days
         maxEntries: 250,
         purgeOnQuotaError: true, // safe to automatically delete if exceeding the available storage
diff --git a/app/assets/javascripts/truth-helpers/addon/helpers/and.js b/app/assets/javascripts/truth-helpers/addon/helpers/and.js
index 07db1927c47..95dfae90b00 100644
--- a/app/assets/javascripts/truth-helpers/addon/helpers/and.js
+++ b/app/assets/javascripts/truth-helpers/addon/helpers/and.js
@@ -1,13 +1,13 @@
-import Helper from "@ember/component/helper";
 import truthConvert from "../utils/truth-convert";
 
-export function and(params) {
-  for (let i = 0, len = params.length; i < len; i++) {
-    if (truthConvert(params[i]) === false) {
-      return params[i];
+export default function and(...args) {
+  let arg = false;
+
+  for (arg of args) {
+    if (truthConvert(arg) === false) {
+      return arg;
     }
   }
-  return params[params.length - 1];
-}
 
-export default Helper.helper(and);
+  return arg;
+}
diff --git a/app/assets/javascripts/truth-helpers/addon/helpers/eq.js b/app/assets/javascripts/truth-helpers/addon/helpers/eq.js
index 45d03595b12..61ec613e8e4 100644
--- a/app/assets/javascripts/truth-helpers/addon/helpers/eq.js
+++ b/app/assets/javascripts/truth-helpers/addon/helpers/eq.js
@@ -1,7 +1,3 @@
-import Helper from "@ember/component/helper";
-
-export function eq(params) {
-  return params[0] === params[1];
+export default function eq(left, right) {
+  return left === right;
 }
-
-export default Helper.helper(eq);
diff --git a/app/assets/javascripts/truth-helpers/addon/helpers/gt.js b/app/assets/javascripts/truth-helpers/addon/helpers/gt.js
index c90fc983640..928b665c5c7 100644
--- a/app/assets/javascripts/truth-helpers/addon/helpers/gt.js
+++ b/app/assets/javascripts/truth-helpers/addon/helpers/gt.js
@@ -1,7 +1,5 @@
-import Helper from "@ember/component/helper";
-
-export function gt([left, right], hash) {
-  if (hash.forceNumber) {
+export default function gt(left, right, { forceNumber = false } = {}) {
+  if (forceNumber) {
     if (typeof left !== "number") {
       left = Number(left);
     }
@@ -11,5 +9,3 @@ export function gt([left, right], hash) {
   }
   return left > right;
 }
-
-export default Helper.helper(gt);
diff --git a/app/assets/javascripts/truth-helpers/addon/helpers/gte.js b/app/assets/javascripts/truth-helpers/addon/helpers/gte.js
index e364dc39cd0..a0eaa7d1031 100644
--- a/app/assets/javascripts/truth-helpers/addon/helpers/gte.js
+++ b/app/assets/javascripts/truth-helpers/addon/helpers/gte.js
@@ -1,7 +1,5 @@
-import Helper from "@ember/component/helper";
-
-export function gte([left, right], hash) {
-  if (hash.forceNumber) {
+export default function gte(left, right, { forceNumber = false } = {}) {
+  if (forceNumber) {
     if (typeof left !== "number") {
       left = Number(left);
     }
@@ -11,5 +9,3 @@ export function gte([left, right], hash) {
   }
   return left >= right;
 }
-
-export default Helper.helper(gte);
diff --git a/app/assets/javascripts/truth-helpers/addon/helpers/includes.js b/app/assets/javascripts/truth-helpers/addon/helpers/includes.js
index d2b0a057c7c..2bc9df8eb86 100644
--- a/app/assets/javascripts/truth-helpers/addon/helpers/includes.js
+++ b/app/assets/javascripts/truth-helpers/addon/helpers/includes.js
@@ -1,7 +1,3 @@
-import Helper from "@ember/component/helper";
-
-export function includes(params) {
-  return params[0].includes(params[1]);
+export default function includes(array, item) {
+  return array.includes(item);
 }
-
-export default Helper.helper(includes);
diff --git a/app/assets/javascripts/truth-helpers/addon/helpers/lt.js b/app/assets/javascripts/truth-helpers/addon/helpers/lt.js
index 0546f796e4e..838a5b6d0df 100644
--- a/app/assets/javascripts/truth-helpers/addon/helpers/lt.js
+++ b/app/assets/javascripts/truth-helpers/addon/helpers/lt.js
@@ -1,7 +1,5 @@
-import Helper from "@ember/component/helper";
-
-export function lt([left, right], hash) {
-  if (hash.forceNumber) {
+export default function lt(left, right, { forceNumber = false } = {}) {
+  if (forceNumber) {
     if (typeof left !== "number") {
       left = Number(left);
     }
@@ -11,5 +9,3 @@ export function lt([left, right], hash) {
   }
   return left < right;
 }
-
-export default Helper.helper(lt);
diff --git a/app/assets/javascripts/truth-helpers/addon/helpers/lte.js b/app/assets/javascripts/truth-helpers/addon/helpers/lte.js
index 375a15e839d..4848325376e 100644
--- a/app/assets/javascripts/truth-helpers/addon/helpers/lte.js
+++ b/app/assets/javascripts/truth-helpers/addon/helpers/lte.js
@@ -1,7 +1,5 @@
-import Helper from "@ember/component/helper";
-
-export function lte([left, right], hash) {
-  if (hash.forceNumber) {
+export default function lte(left, right, { forceNumber = false } = {}) {
+  if (forceNumber) {
     if (typeof left !== "number") {
       left = Number(left);
     }
@@ -11,5 +9,3 @@ export function lte([left, right], hash) {
   }
   return left <= right;
 }
-
-export default Helper.helper(lte);
diff --git a/app/assets/javascripts/truth-helpers/addon/helpers/not-eq.js b/app/assets/javascripts/truth-helpers/addon/helpers/not-eq.js
index 8971d1bcd04..dba451edcaa 100644
--- a/app/assets/javascripts/truth-helpers/addon/helpers/not-eq.js
+++ b/app/assets/javascripts/truth-helpers/addon/helpers/not-eq.js
@@ -1,7 +1,3 @@
-import Helper from "@ember/component/helper";
-
-export function notEqualHelper(params) {
-  return params[0] !== params[1];
+export default function notEq(left, right) {
+  return left !== right;
 }
-
-export default Helper.helper(notEqualHelper);
diff --git a/app/assets/javascripts/truth-helpers/addon/helpers/not.js b/app/assets/javascripts/truth-helpers/addon/helpers/not.js
index 8b7942e76d2..a2bcfebd1f5 100644
--- a/app/assets/javascripts/truth-helpers/addon/helpers/not.js
+++ b/app/assets/javascripts/truth-helpers/addon/helpers/not.js
@@ -1,13 +1,11 @@
-import Helper from "@ember/component/helper";
 import truthConvert from "../utils/truth-convert";
 
-export function not(params) {
-  for (let i = 0, len = params.length; i < len; i++) {
-    if (truthConvert(params[i]) === true) {
+export default function not(...args) {
+  for (let arg of args) {
+    if (truthConvert(arg) === true) {
       return false;
     }
   }
+
   return true;
 }
-
-export default Helper.helper(not);
diff --git a/app/assets/javascripts/truth-helpers/addon/helpers/or.js b/app/assets/javascripts/truth-helpers/addon/helpers/or.js
index f0e95747bd9..11234f450d8 100644
--- a/app/assets/javascripts/truth-helpers/addon/helpers/or.js
+++ b/app/assets/javascripts/truth-helpers/addon/helpers/or.js
@@ -1,13 +1,13 @@
-import Helper from "@ember/component/helper";
 import truthConvert from "../utils/truth-convert";
 
-export function or(params) {
-  for (let i = 0, len = params.length; i < len; i++) {
-    if (truthConvert(params[i]) === true) {
-      return params[i];
+export default function or(...args) {
+  let arg = false;
+
+  for (arg of args) {
+    if (truthConvert(arg) === true) {
+      return arg;
     }
   }
-  return params[params.length - 1];
-}
 
-export default Helper.helper(or);
+  return arg;
+}
diff --git a/app/assets/javascripts/truth-helpers/config/ember-cli-update.json b/app/assets/javascripts/truth-helpers/config/ember-cli-update.json
index c4e56160cb7..994928cd9c9 100644
--- a/app/assets/javascripts/truth-helpers/config/ember-cli-update.json
+++ b/app/assets/javascripts/truth-helpers/config/ember-cli-update.json
@@ -3,14 +3,16 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "3.28.5",
+      "version": "5.0.0",
       "blueprints": [
         {
           "name": "addon",
           "outputRepo": "https://github.com/ember-cli/ember-addon-output",
           "codemodsSource": "ember-addon-codemods-manifest@1",
           "isBaseBlueprint": true,
-          "options": ["--no-welcome"]
+          "options": [
+            "--no-welcome"
+          ]
         }
       ]
     }
diff --git a/app/assets/javascripts/truth-helpers/config/ember-try.js b/app/assets/javascripts/truth-helpers/config/ember-try.js
deleted file mode 100644
index 481cd489c32..00000000000
--- a/app/assets/javascripts/truth-helpers/config/ember-try.js
+++ /dev/null
@@ -1,119 +0,0 @@
-"use strict";
-
-const getChannelURL = require("ember-source-channel-url");
-const { embroiderSafe, embroiderOptimized } = require("@embroider/test-setup");
-
-module.exports = async function () {
-  return {
-    useYarn: true,
-    scenarios: [
-      {
-        name: "ember-lts-3.24",
-        npm: {
-          devDependencies: {
-            "ember-source": "~3.24.3",
-          },
-        },
-      },
-      {
-        name: "ember-lts-3.28",
-        npm: {
-          devDependencies: {
-            "ember-source": "~3.28.0",
-          },
-        },
-      },
-      {
-        name: "ember-lts-3.20",
-        npm: {
-          devDependencies: {
-            "ember-source": "~3.20.5",
-          },
-        },
-      },
-      {
-        name: "ember-lts-3.24",
-        npm: {
-          devDependencies: {
-            "ember-source": "~3.24.3",
-          },
-        },
-      },
-      {
-        name: "ember-lts-3.28",
-        npm: {
-          devDependencies: {
-            "ember-source": "~3.28.0",
-          },
-        },
-      },
-      {
-        name: "ember-release",
-        npm: {
-          devDependencies: {
-            "ember-source": await getChannelURL("release"),
-          },
-        },
-      },
-      {
-        name: "ember-beta",
-        npm: {
-          devDependencies: {
-            "ember-source": await getChannelURL("beta"),
-          },
-        },
-      },
-      {
-        name: "ember-canary",
-        npm: {
-          devDependencies: {
-            "ember-source": await getChannelURL("canary"),
-          },
-        },
-      },
-      // The default `.travis.yml` runs this scenario via `yarn test`,
-      // not via `ember try`. It's still included here so that running
-      // `ember try:each` manually or from a customized CI config will run it
-      // along with all the other scenarios.
-      {
-        name: "ember-default",
-        npm: {
-          devDependencies: {},
-        },
-      },
-      {
-        name: "ember-default-with-jquery",
-        env: {
-          EMBER_OPTIONAL_FEATURES: JSON.stringify({
-            "jquery-integration": true,
-          }),
-        },
-        npm: {
-          devDependencies: {
-            "@ember/jquery": "^0.5.1",
-          },
-        },
-      },
-      {
-        name: "ember-classic",
-        env: {
-          EMBER_OPTIONAL_FEATURES: JSON.stringify({
-            "application-template-wrapper": true,
-            "default-async-observers": false,
-            "template-only-glimmer-components": false,
-          }),
-        },
-        npm: {
-          devDependencies: {
-            "ember-source": "~3.28.0",
-          },
-          ember: {
-            edition: "classic",
-          },
-        },
-      },
-      embroiderSafe(),
-      embroiderOptimized(),
-    ],
-  };
-};
diff --git a/app/assets/javascripts/truth-helpers/config/environment.js b/app/assets/javascripts/truth-helpers/config/environment.js
deleted file mode 100644
index b7238585e61..00000000000
--- a/app/assets/javascripts/truth-helpers/config/environment.js
+++ /dev/null
@@ -1,5 +0,0 @@
-"use strict";
-
-module.exports = function (/* environment, appConfig */) {
-  return {};
-};
diff --git a/app/assets/javascripts/truth-helpers/ember-cli-build.js b/app/assets/javascripts/truth-helpers/ember-cli-build.js
index 60eb15c12a9..da57a67830a 100644
--- a/app/assets/javascripts/truth-helpers/ember-cli-build.js
+++ b/app/assets/javascripts/truth-helpers/ember-cli-build.js
@@ -3,7 +3,7 @@
 const EmberAddon = require("ember-cli/lib/broccoli/ember-addon");
 
 module.exports = function (defaults) {
-  let app = new EmberAddon(defaults, {
+  const app = new EmberAddon(defaults, {
     autoImport: {
       publicAssetURL: "",
     },
diff --git a/app/assets/javascripts/truth-helpers/package.json b/app/assets/javascripts/truth-helpers/package.json
index 5378b9fcb03..f3030bb4eaa 100644
--- a/app/assets/javascripts/truth-helpers/package.json
+++ b/app/assets/javascripts/truth-helpers/package.json
@@ -7,7 +7,6 @@
   "keywords": [
     "ember-addon"
   ],
-  "repository": "",
   "scripts": {
     "build": "ember build",
     "lint:hbs": "ember-template-lint .",
@@ -15,28 +14,28 @@
     "start": "ember serve"
   },
   "dependencies": {
-    "ember-auto-import": "^2.5.0",
-    "ember-cli-babel": "^7.26.10",
-    "ember-cli-htmlbars": "^6.1.1",
-    "webpack": "^5.75.0"
+    "ember-auto-import": "^2.6.3",
+    "ember-cli-babel": "^7.26.11",
+    "ember-cli-htmlbars": "^6.2.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.20.12",
+    "@babel/core": "^7.22.9",
     "@ember/optional-features": "^2.0.0",
-    "@embroider/test-setup": "^2.0.2",
+    "@ember/string": "^3.1.1",
+    "@embroider/test-setup": "^3.0.1",
     "@glimmer/component": "^1.1.2",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~3.28.5",
-    "ember-cli-dependency-checker": "^3.3.1",
+    "ember-cli": "~5.0.0",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-load-initializers": "^2.1.1",
-    "ember-resolver": "^8.0.3",
-    "ember-source": "~3.28.11",
+    "ember-resolver": "^10.1.1",
+    "ember-source": "~3.28.12",
     "ember-source-channel-url": "^3.0.0",
-    "loader.js": "^4.7.0"
+    "loader.js": "^4.7.0",
+    "webpack": "^5.88.2"
   },
   "engines": {
     "node": "16.* || >= 18",
diff --git a/app/assets/javascripts/truth-helpers/tests/dummy/app/index.html b/app/assets/javascripts/truth-helpers/tests/dummy/app/index.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/truth-helpers/tests/dummy/app/styles/.gitkeep b/app/assets/javascripts/truth-helpers/tests/dummy/app/styles/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/truth-helpers/tests/dummy/app/templates/.gitkeep b/app/assets/javascripts/truth-helpers/tests/dummy/app/templates/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/truth-helpers/tests/dummy/config/.gitkeep b/app/assets/javascripts/truth-helpers/tests/dummy/config/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/truth-helpers/tests/dummy/public/.gitkeep b/app/assets/javascripts/truth-helpers/tests/dummy/public/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/truth-helpers/tests/index.html b/app/assets/javascripts/truth-helpers/tests/index.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/wizard/addon/templates/components/discourse-logo.hbs b/app/assets/javascripts/wizard/addon/components/discourse-logo.hbs
similarity index 99%
rename from app/assets/javascripts/wizard/addon/templates/components/discourse-logo.hbs
rename to app/assets/javascripts/wizard/addon/components/discourse-logo.hbs
index 2278d63e026..e1218bbdee3 100644
--- a/app/assets/javascripts/wizard/addon/templates/components/discourse-logo.hbs
+++ b/app/assets/javascripts/wizard/addon/components/discourse-logo.hbs
@@ -20,4 +20,4 @@
       d="M24.58 66.41c-7.1032817-13.1205259-4.0652056-29.4212778 7.2876929-39.1020065C43.2205913 17.6272648 59.7966078 17.2028861 71.63 26.29c-11.3513195-11.9524832-29.9818586-13.1756566-42.7984647-2.8098996C16.0149293 33.8458575 13.3153477 52.3203102 22.63 65.92l-3.76 18.9 5.71-18.41z">
     </path>
   </g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/app/assets/javascripts/wizard/addon/components/homepage-preview.js b/app/assets/javascripts/wizard/addon/components/homepage-preview.js
index 3dcf3060d79..9e786b942cf 100644
--- a/app/assets/javascripts/wizard/addon/components/homepage-preview.js
+++ b/app/assets/javascripts/wizard/addon/components/homepage-preview.js
@@ -1,10 +1,9 @@
-import {
-  LOREM,
-  createPreviewComponent,
-  darkLightDiff,
-} from "wizard/lib/preview";
+import { LOREM, darkLightDiff } from "wizard/lib/preview";
+import WizardPreviewBaseComponent from "./wizard-preview-base";
 
-export default createPreviewComponent(628, 322, {
+export default WizardPreviewBaseComponent.extend({
+  width: 628,
+  height: 322,
   logo: null,
   avatar: null,
 
diff --git a/app/assets/javascripts/wizard/addon/templates/components/illustration-finished.hbs b/app/assets/javascripts/wizard/addon/components/illustration-finished.hbs
similarity index 99%
rename from app/assets/javascripts/wizard/addon/templates/components/illustration-finished.hbs
rename to app/assets/javascripts/wizard/addon/components/illustration-finished.hbs
index c8a29a979a1..35016019287 100644
--- a/app/assets/javascripts/wizard/addon/templates/components/illustration-finished.hbs
+++ b/app/assets/javascripts/wizard/addon/components/illustration-finished.hbs
@@ -41,4 +41,4 @@
   <circle class="cls-16" cx="310.76" cy="212.28" r="31" transform="rotate(-80.78 310.775 212.283)"/>
   <path class="cls-16" d="M261.28 232.08s5.1 21.67 30.82 30.83M86.32 654.55c1.89 34 97.58 193.31 283.35 71.79M62.71 713.69c-21-36.73-37.27-123.1 14.16-215.91"/>
   <path class="cls-3" d="M61.26 43.4S78.53 27 81.27 31.97c5.68 10.3-9.68 13.88-9.68 13.88l-10.33-2.46Zm82.78 36.45s.96 10.11-6.5 19.4-7.57-6.43-7.57-6.43l14.07-12.97Z"/>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/app/assets/javascripts/wizard/addon/templates/components/illustration-members.hbs b/app/assets/javascripts/wizard/addon/components/illustration-members.hbs
similarity index 99%
rename from app/assets/javascripts/wizard/addon/templates/components/illustration-members.hbs
rename to app/assets/javascripts/wizard/addon/components/illustration-members.hbs
index 5ee75225dcd..8483528bad8 100644
--- a/app/assets/javascripts/wizard/addon/templates/components/illustration-members.hbs
+++ b/app/assets/javascripts/wizard/addon/components/illustration-members.hbs
@@ -53,4 +53,4 @@
   <path class="cls-2" d="M608.9 386.8c2.15 18.16-10.83 34.62-28.99 36.77a33.102 33.102 0 0 1-30.83-13.63m311.4 44.17s25.43 28.24 25.43 59.87v25.86s-2.94 39.87-27 39.87c-15 0-28.72-10-33.21-21.32a15.538 15.538 0 0 0-16.89-9.53c-7.6 1.17-17.33 1.71-25.8-.86a7.075 7.075 0 0 1-5-7.57c.5-4.6 2-10.72 6.07-12.58 8.18-3.69 16.38-5 26.79-4.8 14.45-.6 28.3 5.81 37.2 17.2v-39.48"/>
   <circle class="cls-2" cx="829.8" cy="441.63" r="33.11"/>
   <path class="cls-2" d="M363.91 434.36s3.77 15.61 0 22.35M71.22 503.56l10.79 30.5"/>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/app/assets/javascripts/wizard/addon/templates/components/illustration-welcome.hbs b/app/assets/javascripts/wizard/addon/components/illustration-welcome.hbs
similarity index 99%
rename from app/assets/javascripts/wizard/addon/templates/components/illustration-welcome.hbs
rename to app/assets/javascripts/wizard/addon/components/illustration-welcome.hbs
index 813f1b7d274..413c959d29f 100644
--- a/app/assets/javascripts/wizard/addon/templates/components/illustration-welcome.hbs
+++ b/app/assets/javascripts/wizard/addon/components/illustration-welcome.hbs
@@ -30,4 +30,4 @@
   <path d="M623.41 372.26c-3.26 7.33-7.32 14.28-12.11 20.71a138.21 138.21 0 0 1-35.07 33.23c-4.75 3.15-10.7 7.2-16.7 11.54-2.49 1.78-4.5 4.15-5.85 6.9.94-25.55-12.82-46.53-30.41-52.16 7.86-5.63 16.23-10.51 25-14.59 39.31-17.82 39.86-22.51 56.41-41.8 3.54-4.17 9.79-4.69 13.97-1.15a9.7 9.7 0 0 1 1.89 2.15c5.1 7.99 9.32 20.24 2.87 35.17Z" stroke="var(--primary)" stroke-linecap="round" stroke-linejoin="round" stroke-width="8.75" fill="#ff5d10"/>
   <circle class="cls-5" cx="424.73" cy="431.81" r="41.67"/>
   <path class="cls-10" d="m643.65 93.98 19.43 59.33a70.213 70.213 0 0 1 3.43 21.76v9c0 3.75-2.2 7.16-5.63 8.69h0a9.51 9.51 0 0 0-5.63 9c.53 18.44 1.81 71.92-.19 92.34 0 .35-.07.7-.1 1a99.551 99.551 0 0 1-17.25 46.57m-199.9 50.71c21.77 7.47 33.35 31.18 25.88 52.94-7.47 21.77-31.18 33.35-52.94 25.88a41.71 41.71 0 0 1-9.18-4.47"/>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/app/assets/javascripts/wizard/addon/components/image-preview-favicon.js b/app/assets/javascripts/wizard/addon/components/image-preview-favicon.js
index 12a47e7ed60..bfb6ec4bf46 100644
--- a/app/assets/javascripts/wizard/addon/components/image-preview-favicon.js
+++ b/app/assets/javascripts/wizard/addon/components/image-preview-favicon.js
@@ -1,7 +1,9 @@
-import { createPreviewComponent } from "wizard/lib/preview";
 import { observes } from "discourse-common/utils/decorators";
+import WizardPreviewBaseComponent from "./wizard-preview-base";
 
-export default createPreviewComponent(371, 124, {
+export default WizardPreviewBaseComponent.extend({
+  width: 371,
+  height: 124,
   tab: null,
   image: null,
 
diff --git a/app/assets/javascripts/wizard/addon/components/image-preview-large-icon.js b/app/assets/javascripts/wizard/addon/components/image-preview-large-icon.js
index 25ff5371256..dad7e02fc43 100644
--- a/app/assets/javascripts/wizard/addon/components/image-preview-large-icon.js
+++ b/app/assets/javascripts/wizard/addon/components/image-preview-large-icon.js
@@ -1,7 +1,9 @@
-import { createPreviewComponent } from "wizard/lib/preview";
 import { observes } from "discourse-common/utils/decorators";
+import WizardPreviewBaseComponent from "./wizard-preview-base";
 
-export default createPreviewComponent(325, 125, {
+export default WizardPreviewBaseComponent.extend({
+  width: 325,
+  height: 125,
   ios: null,
   image: null,
 
diff --git a/app/assets/javascripts/wizard/addon/components/image-preview-logo-small.js b/app/assets/javascripts/wizard/addon/components/image-preview-logo-small.js
index cc692e2aa8b..fe0d1e25930 100644
--- a/app/assets/javascripts/wizard/addon/components/image-preview-logo-small.js
+++ b/app/assets/javascripts/wizard/addon/components/image-preview-logo-small.js
@@ -1,7 +1,10 @@
-import { LOREM, createPreviewComponent, drawHeader } from "wizard/lib/preview";
+import { LOREM, drawHeader } from "wizard/lib/preview";
 import { observes } from "discourse-common/utils/decorators";
+import WizardPreviewBaseComponent from "./wizard-preview-base";
 
-export default createPreviewComponent(375, 100, {
+export default WizardPreviewBaseComponent.extend({
+  width: 375,
+  height: 100,
   image: null,
 
   @observes("field.value")
diff --git a/app/assets/javascripts/wizard/addon/components/image-preview-logo.js b/app/assets/javascripts/wizard/addon/components/image-preview-logo.js
index c48bfa7ba54..5067a37c9f0 100644
--- a/app/assets/javascripts/wizard/addon/components/image-preview-logo.js
+++ b/app/assets/javascripts/wizard/addon/components/image-preview-logo.js
@@ -1,7 +1,10 @@
-import { createPreviewComponent, drawHeader } from "wizard/lib/preview";
+import { drawHeader } from "wizard/lib/preview";
 import { observes } from "discourse-common/utils/decorators";
+import WizardPreviewBaseComponent from "./wizard-preview-base";
 
-export default createPreviewComponent(400, 100, {
+export default WizardPreviewBaseComponent.extend({
+  width: 400,
+  height: 100,
   image: null,
 
   @observes("field.value")
diff --git a/app/assets/javascripts/wizard/addon/templates/components/styling-preview.hbs b/app/assets/javascripts/wizard/addon/components/styling-preview.hbs
similarity index 100%
rename from app/assets/javascripts/wizard/addon/templates/components/styling-preview.hbs
rename to app/assets/javascripts/wizard/addon/components/styling-preview.hbs
diff --git a/app/assets/javascripts/wizard/addon/components/styling-preview.js b/app/assets/javascripts/wizard/addon/components/styling-preview.js
index e44bc998460..e62ff0dcd30 100644
--- a/app/assets/javascripts/wizard/addon/components/styling-preview.js
+++ b/app/assets/javascripts/wizard/addon/components/styling-preview.js
@@ -1,11 +1,8 @@
-import {
-  chooseDarker,
-  createPreviewComponent,
-  darkLightDiff,
-} from "wizard/lib/preview";
+import { chooseDarker, darkLightDiff } from "wizard/lib/preview";
 import I18n from "I18n";
 import { bind, observes } from "discourse-common/utils/decorators";
 import { action } from "@ember/object";
+import WizardPreviewBaseComponent from "./wizard-preview-base";
 
 const LOREM = `
 Lorem ipsum dolor sit amet, consectetur adipiscing.
@@ -13,7 +10,9 @@ Nullam eget sem non elit tincidunt rhoncus. Fusce
 velit nisl, porttitor sed nisl ac, consectetur interdum
 metus. Fusce in consequat augue, vel facilisis felis.`;
 
-export default createPreviewComponent(628, 322, {
+export default WizardPreviewBaseComponent.extend({
+  width: 628,
+  height: 322,
   logo: null,
   avatar: null,
   previewTopic: true,
diff --git a/app/assets/javascripts/wizard/addon/templates/components/wizard-field-checkbox.hbs b/app/assets/javascripts/wizard/addon/components/wizard-field-checkbox.hbs
similarity index 88%
rename from app/assets/javascripts/wizard/addon/templates/components/wizard-field-checkbox.hbs
rename to app/assets/javascripts/wizard/addon/components/wizard-field-checkbox.hbs
index f95ffb46c76..28b755b1654 100644
--- a/app/assets/javascripts/wizard/addon/templates/components/wizard-field-checkbox.hbs
+++ b/app/assets/javascripts/wizard/addon/components/wizard-field-checkbox.hbs
@@ -14,6 +14,6 @@
   </span>
   <PluginOutlet
     @name="below-wizard-checkbox"
-    @args={{hash disabled=this.field.disabled}}
+    @outletArgs={{hash disabled=this.field.disabled}}
   />
 </label>
\ No newline at end of file
diff --git a/app/assets/javascripts/wizard/addon/templates/components/wizard-field-checkboxes.hbs b/app/assets/javascripts/wizard/addon/components/wizard-field-checkboxes.hbs
similarity index 100%
rename from app/assets/javascripts/wizard/addon/templates/components/wizard-field-checkboxes.hbs
rename to app/assets/javascripts/wizard/addon/components/wizard-field-checkboxes.hbs
diff --git a/app/assets/javascripts/wizard/addon/templates/components/wizard-field-dropdown.hbs b/app/assets/javascripts/wizard/addon/components/wizard-field-dropdown.hbs
similarity index 100%
rename from app/assets/javascripts/wizard/addon/templates/components/wizard-field-dropdown.hbs
rename to app/assets/javascripts/wizard/addon/components/wizard-field-dropdown.hbs
diff --git a/app/assets/javascripts/wizard/addon/templates/components/wizard-field-image.hbs b/app/assets/javascripts/wizard/addon/components/wizard-field-image.hbs
similarity index 100%
rename from app/assets/javascripts/wizard/addon/templates/components/wizard-field-image.hbs
rename to app/assets/javascripts/wizard/addon/components/wizard-field-image.hbs
diff --git a/app/assets/javascripts/wizard/addon/templates/components/wizard-field-text.hbs b/app/assets/javascripts/wizard/addon/components/wizard-field-text.hbs
similarity index 100%
rename from app/assets/javascripts/wizard/addon/templates/components/wizard-field-text.hbs
rename to app/assets/javascripts/wizard/addon/components/wizard-field-text.hbs
diff --git a/app/assets/javascripts/wizard/addon/templates/components/wizard-field.hbs b/app/assets/javascripts/wizard/addon/components/wizard-field.hbs
similarity index 100%
rename from app/assets/javascripts/wizard/addon/templates/components/wizard-field.hbs
rename to app/assets/javascripts/wizard/addon/components/wizard-field.hbs
diff --git a/app/assets/javascripts/wizard/addon/templates/components/wizard-image-preview.hbs b/app/assets/javascripts/wizard/addon/components/wizard-image-preview.hbs
similarity index 100%
rename from app/assets/javascripts/wizard/addon/templates/components/wizard-image-preview.hbs
rename to app/assets/javascripts/wizard/addon/components/wizard-image-preview.hbs
diff --git a/app/assets/javascripts/wizard/addon/templates/components/theme-preview.hbs b/app/assets/javascripts/wizard/addon/components/wizard-preview-base.hbs
similarity index 100%
rename from app/assets/javascripts/wizard/addon/templates/components/theme-preview.hbs
rename to app/assets/javascripts/wizard/addon/components/wizard-preview-base.hbs
diff --git a/app/assets/javascripts/wizard/addon/components/wizard-preview-base.js b/app/assets/javascripts/wizard/addon/components/wizard-preview-base.js
new file mode 100644
index 00000000000..a051b86e571
--- /dev/null
+++ b/app/assets/javascripts/wizard/addon/components/wizard-preview-base.js
@@ -0,0 +1,378 @@
+import Component from "@ember/component";
+import PreloadStore from "discourse/lib/preload-store";
+import { Promise } from "rsvp";
+/*eslint no-bitwise:0 */
+import getUrl from "discourse-common/lib/get-url";
+import { htmlSafe } from "@ember/template";
+import { scheduleOnce } from "@ember/runloop";
+import { observes } from "discourse-common/utils/decorators";
+import { darkLightDiff, drawHeader } from "wizard/lib/preview";
+
+export const LOREM = `
+Lorem ipsum dolor sit amet,
+consectetur adipiscing elit.
+Nullam eget sem non elit
+tincidunt rhoncus. Fusce
+velit nisl, porttitor sed
+nisl ac, consectetur interdum
+metus. Fusce in consequat
+augue, vel facilisis felis.`;
+
+const scaled = {};
+
+function canvasFor(image, w, h) {
+  w = Math.ceil(w);
+  h = Math.ceil(h);
+
+  const scale = window.devicePixelRatio;
+
+  const can = document.createElement("canvas");
+  can.width = w * scale;
+  can.height = h * scale;
+
+  const ctx = can.getContext("2d");
+  ctx.scale(scale, scale);
+  ctx.drawImage(image, 0, 0, w, h);
+  return can;
+}
+
+const scale = window.devicePixelRatio;
+export default Component.extend({
+  get elementWidth() {
+    return this.width * scale;
+  },
+
+  get elementHeight() {
+    return this.height * scale;
+  },
+
+  get canvasStyle() {
+    return htmlSafe(`width:${this.width}px;height:${this.height}px`);
+  },
+
+  ctx: null,
+  loaded: false,
+  loadingFontVariants: false,
+
+  didInsertElement() {
+    this._super(...arguments);
+    this.fontMap = PreloadStore.get("fontMap");
+    this.loadedFonts = new Set();
+    const c = this.element.querySelector("canvas");
+    this.ctx = c.getContext("2d");
+    this.ctx.scale(scale, scale);
+    this.reload();
+  },
+
+  @observes("step.fieldsById.{color_scheme,homepage_style}.value")
+  themeChanged() {
+    this.triggerRepaint();
+  },
+
+  @observes("step.fieldsById.{body_font}.value")
+  themeBodyFontChanged() {
+    if (!this.loadingFontVariants) {
+      this.loadFontVariants(this.wizard.font);
+    }
+  },
+
+  @observes("step.fieldsById.{heading_font}.value")
+  themeHeadingFontChanged() {
+    if (!this.loadingFontVariants) {
+      this.loadFontVariants(this.wizard.headingFont);
+    }
+  },
+
+  loadFontVariants(font) {
+    const fontVariantData = this.fontMap[font.id];
+
+    // System font for example does not need to load from a remote source.
+    if (!fontVariantData) {
+      this.loadedFonts.add(font.id);
+    }
+
+    if (fontVariantData && !this.loadedFonts.has(font.id)) {
+      this.loadingFontVariants = true;
+      const fontFaces = fontVariantData.map((fontVariant) => {
+        return new FontFace(font.label, `url(${fontVariant.url})`, {
+          style: "normal",
+          weight: fontVariant.weight,
+        });
+      });
+
+      Promise.all(
+        fontFaces.map((fontFace) =>
+          fontFace.load().then((loadedFont) => {
+            document.fonts.add(loadedFont);
+
+            // We use our own Set because, though document.fonts.check is available,
+            // it does not seem very reliable, returning false for fonts that have
+            // definitely been loaded.
+            this.loadedFonts.add(font.id);
+          })
+        )
+      )
+        .then(() => {
+          this.triggerRepaint();
+        })
+        .finally(() => {
+          this.loadingFontVariants = false;
+        });
+    } else if (this.loadedFonts.has(font.id)) {
+      this.triggerRepaint();
+    }
+  },
+
+  images() {},
+
+  // NOTE: This works for fonts included in a style that is actually using the
+  // @font-faces on load, but for fonts that we aren't using yet we need to
+  // make sure they are loaded before rendering the canvas via loadFontVariants.
+  loadFonts() {
+    return document.fonts.ready;
+  },
+
+  loadImages() {
+    const images = this.images();
+    if (images) {
+      return Promise.all(
+        Object.keys(images).map((id) => {
+          return loadImage(images[id]).then((img) => (this[id] = img));
+        })
+      );
+    }
+    return Promise.resolve();
+  },
+
+  reload() {
+    Promise.all([this.loadFonts(), this.loadImages()]).then(() => {
+      this.loaded = true;
+      this.triggerRepaint();
+    });
+  },
+
+  triggerRepaint() {
+    scheduleOnce("afterRender", this, "repaint");
+  },
+
+  repaint() {
+    if (!this.loaded) {
+      return false;
+    }
+
+    const colorsArray = this.wizard.currentColors;
+    if (!colorsArray) {
+      return;
+    }
+
+    let colors = {};
+    colorsArray.forEach(function (c) {
+      const name = c.name;
+      colors[name] = `#${c.hex}`;
+    });
+
+    const { font, headingFont } = this.wizard;
+    if (!font) {
+      return;
+    }
+
+    const { ctx } = this;
+
+    ctx.fillStyle = colors.secondary;
+    ctx.fillRect(0, 0, this.width, this.height);
+
+    const options = {
+      ctx,
+      colors,
+      font: font?.label,
+      headingFont: headingFont?.label,
+      width: this.width,
+      height: this.height,
+    };
+    this.paint(options);
+  },
+
+  categories() {
+    return [
+      { name: "consecteteur", color: "#652D90" },
+      { name: "ultrices", color: "#3AB54A" },
+      { name: "placerat", color: "#25AAE2" },
+    ];
+  },
+
+  scaleImage(image, x, y, w, h) {
+    w = Math.floor(w);
+    h = Math.floor(h);
+
+    const { ctx } = this;
+
+    const key = `${image.src}-${w}-${h}`;
+
+    if (!scaled[key]) {
+      let copy = image;
+      let ratio = copy.width / copy.height;
+      let newH = copy.height * 0.5;
+      while (newH > h) {
+        copy = canvasFor(copy, ratio * newH, newH);
+        newH = newH * 0.5;
+      }
+
+      scaled[key] = copy;
+    }
+
+    ctx.drawImage(scaled[key], x, y, w, h);
+  },
+
+  drawFullHeader(colors, font, logo) {
+    const { ctx } = this;
+
+    const headerHeight = this.height * 0.15;
+    drawHeader(ctx, colors, this.width, headerHeight);
+
+    const avatarSize = this.height * 0.1;
+    const headerMargin = headerHeight * 0.2;
+
+    if (logo) {
+      const logoHeight = headerHeight - headerMargin * 2;
+
+      const ratio = logoHeight / logo.height;
+      this.scaleImage(
+        logo,
+        headerMargin,
+        headerMargin,
+        logo.width * ratio,
+        logoHeight
+      );
+
+      this.scaleImage(logo, this.width, headerMargin);
+    }
+
+    // Top right menu
+    this.scaleImage(
+      this.avatar,
+      this.width - avatarSize - headerMargin,
+      headerMargin,
+      avatarSize,
+      avatarSize
+    );
+    // accounts for hard-set color variables in solarized themes
+    ctx.fillStyle =
+      colors.primary_low_mid ||
+      darkLightDiff(colors.primary, colors.secondary, 45, 55);
+
+    const pathScale = headerHeight / 1200;
+    // search icon SVG path
+    const searchIcon = new Path2D(
+      "M505 442.7L405.3 343c-4.5-4.5-10.6-7-17-7H372c27.6-35.3 44-79.7 44-128C416 93.1 322.9 0 208 0S0 93.1 0 208s93.1 208 208 208c48.3 0 92.7-16.4 128-44v16.3c0 6.4 2.5 12.5 7 17l99.7 99.7c9.4 9.4 24.6 9.4 33.9 0l28.3-28.3c9.4-9.4 9.4-24.6.1-34zM208 336c-70.7 0-128-57.2-128-128 0-70.7 57.2-128 128-128 70.7 0 128 57.2 128 128 0 70.7-57.2 128-128 128z"
+    );
+    // hamburger icon
+    const hamburgerIcon = new Path2D(
+      "M16 132h416c8.837 0 16-7.163 16-16V76c0-8.837-7.163-16-16-16H16C7.163 60 0 67.163 0 76v40c0 8.837 7.163 16 16 16zm0 160h416c8.837 0 16-7.163 16-16v-40c0-8.837-7.163-16-16-16H16c-8.837 0-16 7.163-16 16v40c0 8.837 7.163 16 16 16zm0 160h416c8.837 0 16-7.163 16-16v-40c0-8.837-7.163-16-16-16H16c-8.837 0-16 7.163-16 16v40c0 8.837 7.163 16 16 16z"
+    );
+    ctx.save(); // Save the previous state for translation and scale
+    ctx.translate(
+      this.width - avatarSize * 3 - headerMargin * 0.5,
+      avatarSize / 2
+    );
+    // need to scale paths otherwise they're too large
+    ctx.scale(pathScale, pathScale);
+    ctx.fill(searchIcon);
+    ctx.restore();
+    ctx.save();
+    ctx.translate(
+      this.width - avatarSize * 2 - headerMargin * 0.5,
+      avatarSize / 2
+    );
+    ctx.scale(pathScale, pathScale);
+    ctx.fill(hamburgerIcon);
+    ctx.restore();
+  },
+
+  drawPills(colors, font, headerHeight, opts) {
+    opts = opts || {};
+
+    const { ctx } = this;
+
+    const categoriesSize = headerHeight * 2;
+    const badgeHeight = categoriesSize * 0.25;
+    const headerMargin = headerHeight * 0.2;
+
+    ctx.beginPath();
+    ctx.strokeStyle = colors.primary;
+    ctx.lineWidth = 0.5;
+    ctx.rect(
+      headerMargin,
+      headerHeight + headerMargin,
+      categoriesSize,
+      badgeHeight
+    );
+    ctx.stroke();
+
+    const fontSize = Math.round(badgeHeight * 0.5);
+
+    ctx.font = `${fontSize}px '${font}'`;
+    ctx.fillStyle = colors.primary;
+    ctx.fillText(
+      "all categories",
+      headerMargin * 1.5,
+      headerHeight + headerMargin * 1.4 + fontSize
+    );
+
+    const pathScale = badgeHeight / 1000;
+    // caret icon
+    const caretIcon = new Path2D(
+      "M0 384.662V127.338c0-17.818 21.543-26.741 34.142-14.142l128.662 128.662c7.81 7.81 7.81 20.474 0 28.284L34.142 398.804C21.543 411.404 0 402.48 0 384.662z"
+    );
+
+    ctx.save();
+    ctx.translate(
+      categoriesSize - headerMargin / 4,
+      headerHeight + headerMargin + badgeHeight / 4
+    );
+    ctx.scale(pathScale, pathScale);
+    ctx.fill(caretIcon);
+    ctx.restore();
+
+    const text = opts.categories ? "Categories" : "Latest";
+
+    const activeWidth = categoriesSize * (opts.categories ? 0.8 : 0.55);
+    ctx.beginPath();
+    ctx.fillStyle = colors.quaternary;
+    ctx.rect(
+      headerMargin * 2 + categoriesSize,
+      headerHeight + headerMargin,
+      activeWidth,
+      badgeHeight
+    );
+    ctx.fill();
+
+    ctx.font = `${fontSize}px '${font}'`;
+    ctx.fillStyle = colors.secondary;
+    let x = headerMargin * 3.0 + categoriesSize;
+    ctx.fillText(
+      text,
+      x - headerMargin * 0.1,
+      headerHeight + headerMargin * 1.5 + fontSize
+    );
+
+    ctx.fillStyle = colors.primary;
+    x += categoriesSize * (opts.categories ? 0.8 : 0.6);
+    ctx.fillText("New", x, headerHeight + headerMargin * 1.5 + fontSize);
+
+    x += categoriesSize * 0.4;
+    ctx.fillText("Unread", x, headerHeight + headerMargin * 1.5 + fontSize);
+
+    x += categoriesSize * 0.6;
+    ctx.fillText("Top", x, headerHeight + headerMargin * 1.5 + fontSize);
+  },
+});
+
+function loadImage(src) {
+  if (!src) {
+    return Promise.resolve();
+  }
+
+  const img = new Image();
+  img.src = getUrl(src);
+  return new Promise((resolve) => (img.onload = () => resolve(img)));
+}
diff --git a/app/assets/javascripts/wizard/addon/templates/components/wizard-step.hbs b/app/assets/javascripts/wizard/addon/components/wizard-step.hbs
similarity index 100%
rename from app/assets/javascripts/wizard/addon/templates/components/wizard-step.hbs
rename to app/assets/javascripts/wizard/addon/components/wizard-step.hbs
diff --git a/app/assets/javascripts/wizard/addon/controllers/wizard-step.js b/app/assets/javascripts/wizard/addon/controllers/wizard-step.js
index 9a3acd6b491..597c0202b18 100644
--- a/app/assets/javascripts/wizard/addon/controllers/wizard-step.js
+++ b/app/assets/javascripts/wizard/addon/controllers/wizard-step.js
@@ -1,8 +1,11 @@
 import getUrl from "discourse-common/lib/get-url";
 import Controller from "@ember/controller";
 import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
 
 export default Controller.extend({
+  router: service(),
+
   wizard: null,
   step: null,
 
@@ -13,14 +16,14 @@ export default Controller.extend({
     if (response?.refresh_required) {
       document.location = getUrl(`/wizard/steps/${next}`);
     } else if (response?.success && next) {
-      this.transitionToRoute("wizard.step", next);
+      this.router.transitionTo("wizard.step", next);
     } else if (response?.success) {
-      this.transitionToRoute("discovery.latest");
+      this.router.transitionTo("discovery.latest");
     }
   },
 
   @action
   goBack() {
-    this.transitionToRoute("wizard.step", this.step.previous);
+    this.router.transitionTo("wizard.step", this.step.previous);
   },
 });
diff --git a/app/assets/javascripts/wizard/addon/lib/preview.js b/app/assets/javascripts/wizard/addon/lib/preview.js
index 27c16f9e758..fc87e5c9c02 100644
--- a/app/assets/javascripts/wizard/addon/lib/preview.js
+++ b/app/assets/javascripts/wizard/addon/lib/preview.js
@@ -1,10 +1,4 @@
-import Component from "@ember/component";
-import { Promise } from "rsvp";
 /*eslint no-bitwise:0 */
-import getUrl from "discourse-common/lib/get-url";
-import { htmlSafe } from "@ember/template";
-import { scheduleOnce } from "@ember/runloop";
-import { observes } from "discourse-common/utils/decorators";
 
 export const LOREM = `
 Lorem ipsum dolor sit amet,
@@ -16,306 +10,6 @@ nisl ac, consectetur interdum
 metus. Fusce in consequat
 augue, vel facilisis felis.`;
 
-const scaled = {};
-
-function canvasFor(image, w, h) {
-  w = Math.ceil(w);
-  h = Math.ceil(h);
-
-  const scale = window.devicePixelRatio;
-
-  const can = document.createElement("canvas");
-  can.width = w * scale;
-  can.height = h * scale;
-
-  const ctx = can.getContext("2d");
-  ctx.scale(scale, scale);
-  ctx.drawImage(image, 0, 0, w, h);
-  return can;
-}
-
-export function createPreviewComponent(width, height, obj) {
-  const scale = window.devicePixelRatio;
-  return Component.extend(
-    {
-      layoutName: "components/theme-preview",
-      width,
-      height,
-      elementWidth: width * scale,
-      elementHeight: height * scale,
-      canvasStyle: htmlSafe(`width:${width}px;height:${height}px`),
-      ctx: null,
-      loaded: false,
-
-      didInsertElement() {
-        this._super(...arguments);
-        const c = this.element.querySelector("canvas");
-        this.ctx = c.getContext("2d");
-        this.ctx.scale(scale, scale);
-        this.reload();
-      },
-
-      @observes(
-        "step.fieldsById.{color_scheme,body_font,heading_font,homepage_style}.value"
-      )
-      themeChanged() {
-        this.triggerRepaint();
-      },
-
-      images() {},
-
-      loadFonts() {
-        return document.fonts.ready;
-      },
-
-      loadImages() {
-        const images = this.images();
-        if (images) {
-          return Promise.all(
-            Object.keys(images).map((id) => {
-              return loadImage(images[id]).then((img) => (this[id] = img));
-            })
-          );
-        }
-        return Promise.resolve();
-      },
-
-      reload() {
-        Promise.all([this.loadFonts(), this.loadImages()]).then(() => {
-          this.loaded = true;
-          this.triggerRepaint();
-        });
-      },
-
-      triggerRepaint() {
-        scheduleOnce("afterRender", this, "repaint");
-      },
-
-      repaint() {
-        if (!this.loaded) {
-          return false;
-        }
-
-        const colorsArray = this.wizard.currentColors;
-        if (!colorsArray) {
-          return;
-        }
-
-        let colors = {};
-        colorsArray.forEach(function (c) {
-          const name = c.name;
-          colors[name] = `#${c.hex}`;
-        });
-
-        const { font, headingFont } = this.wizard;
-        if (!font) {
-          return;
-        }
-
-        const { ctx } = this;
-
-        ctx.fillStyle = colors.secondary;
-        ctx.fillRect(0, 0, width, height);
-
-        const options = {
-          ctx,
-          colors,
-          font,
-          headingFont,
-          width: this.width,
-          height: this.height,
-        };
-        this.paint(options);
-      },
-
-      categories() {
-        return [
-          { name: "consecteteur", color: "#652D90" },
-          { name: "ultrices", color: "#3AB54A" },
-          { name: "placerat", color: "#25AAE2" },
-        ];
-      },
-
-      scaleImage(image, x, y, w, h) {
-        w = Math.floor(w);
-        h = Math.floor(h);
-
-        const { ctx } = this;
-
-        const key = `${image.src}-${w}-${h}`;
-
-        if (!scaled[key]) {
-          let copy = image;
-          let ratio = copy.width / copy.height;
-          let newH = copy.height * 0.5;
-          while (newH > h) {
-            copy = canvasFor(copy, ratio * newH, newH);
-            newH = newH * 0.5;
-          }
-
-          scaled[key] = copy;
-        }
-
-        ctx.drawImage(scaled[key], x, y, w, h);
-      },
-
-      drawFullHeader(colors, font, logo) {
-        const { ctx } = this;
-
-        const headerHeight = height * 0.15;
-        drawHeader(ctx, colors, width, headerHeight);
-
-        const avatarSize = height * 0.1;
-        const headerMargin = headerHeight * 0.2;
-
-        if (logo) {
-          const logoHeight = headerHeight - headerMargin * 2;
-
-          const ratio = logoHeight / logo.height;
-          this.scaleImage(
-            logo,
-            headerMargin,
-            headerMargin,
-            logo.width * ratio,
-            logoHeight
-          );
-
-          this.scaleImage(logo, width, headerMargin);
-        }
-
-        // Top right menu
-        this.scaleImage(
-          this.avatar,
-          width - avatarSize - headerMargin,
-          headerMargin,
-          avatarSize,
-          avatarSize
-        );
-        // accounts for hard-set color variables in solarized themes
-        ctx.fillStyle =
-          colors.primary_low_mid ||
-          darkLightDiff(colors.primary, colors.secondary, 45, 55);
-
-        const pathScale = headerHeight / 1200;
-        // search icon SVG path
-        const searchIcon = new Path2D(
-          "M505 442.7L405.3 343c-4.5-4.5-10.6-7-17-7H372c27.6-35.3 44-79.7 44-128C416 93.1 322.9 0 208 0S0 93.1 0 208s93.1 208 208 208c48.3 0 92.7-16.4 128-44v16.3c0 6.4 2.5 12.5 7 17l99.7 99.7c9.4 9.4 24.6 9.4 33.9 0l28.3-28.3c9.4-9.4 9.4-24.6.1-34zM208 336c-70.7 0-128-57.2-128-128 0-70.7 57.2-128 128-128 70.7 0 128 57.2 128 128 0 70.7-57.2 128-128 128z"
-        );
-        // hamburger icon
-        const hamburgerIcon = new Path2D(
-          "M16 132h416c8.837 0 16-7.163 16-16V76c0-8.837-7.163-16-16-16H16C7.163 60 0 67.163 0 76v40c0 8.837 7.163 16 16 16zm0 160h416c8.837 0 16-7.163 16-16v-40c0-8.837-7.163-16-16-16H16c-8.837 0-16 7.163-16 16v40c0 8.837 7.163 16 16 16zm0 160h416c8.837 0 16-7.163 16-16v-40c0-8.837-7.163-16-16-16H16c-8.837 0-16 7.163-16 16v40c0 8.837 7.163 16 16 16z"
-        );
-        ctx.save(); // Save the previous state for translation and scale
-        ctx.translate(
-          width - avatarSize * 3 - headerMargin * 0.5,
-          avatarSize / 2
-        );
-        // need to scale paths otherwise they're too large
-        ctx.scale(pathScale, pathScale);
-        ctx.fill(searchIcon);
-        ctx.restore();
-        ctx.save();
-        ctx.translate(
-          width - avatarSize * 2 - headerMargin * 0.5,
-          avatarSize / 2
-        );
-        ctx.scale(pathScale, pathScale);
-        ctx.fill(hamburgerIcon);
-        ctx.restore();
-      },
-
-      drawPills(colors, font, headerHeight, opts) {
-        opts = opts || {};
-
-        const { ctx } = this;
-
-        const categoriesSize = headerHeight * 2;
-        const badgeHeight = categoriesSize * 0.25;
-        const headerMargin = headerHeight * 0.2;
-
-        ctx.beginPath();
-        ctx.strokeStyle = colors.primary;
-        ctx.lineWidth = 0.5;
-        ctx.rect(
-          headerMargin,
-          headerHeight + headerMargin,
-          categoriesSize,
-          badgeHeight
-        );
-        ctx.stroke();
-
-        const fontSize = Math.round(badgeHeight * 0.5);
-
-        ctx.font = `${fontSize}px '${font}'`;
-        ctx.fillStyle = colors.primary;
-        ctx.fillText(
-          "all categories",
-          headerMargin * 1.5,
-          headerHeight + headerMargin * 1.4 + fontSize
-        );
-
-        const pathScale = badgeHeight / 1000;
-        // caret icon
-        const caretIcon = new Path2D(
-          "M0 384.662V127.338c0-17.818 21.543-26.741 34.142-14.142l128.662 128.662c7.81 7.81 7.81 20.474 0 28.284L34.142 398.804C21.543 411.404 0 402.48 0 384.662z"
-        );
-
-        ctx.save();
-        ctx.translate(
-          categoriesSize - headerMargin / 4,
-          headerHeight + headerMargin + badgeHeight / 4
-        );
-        ctx.scale(pathScale, pathScale);
-        ctx.fill(caretIcon);
-        ctx.restore();
-
-        const text = opts.categories ? "Categories" : "Latest";
-
-        const activeWidth = categoriesSize * (opts.categories ? 0.8 : 0.55);
-        ctx.beginPath();
-        ctx.fillStyle = colors.quaternary;
-        ctx.rect(
-          headerMargin * 2 + categoriesSize,
-          headerHeight + headerMargin,
-          activeWidth,
-          badgeHeight
-        );
-        ctx.fill();
-
-        ctx.font = `${fontSize}px '${font}'`;
-        ctx.fillStyle = colors.secondary;
-        let x = headerMargin * 3.0 + categoriesSize;
-        ctx.fillText(
-          text,
-          x - headerMargin * 0.1,
-          headerHeight + headerMargin * 1.5 + fontSize
-        );
-
-        ctx.fillStyle = colors.primary;
-        x += categoriesSize * (opts.categories ? 0.8 : 0.6);
-        ctx.fillText("New", x, headerHeight + headerMargin * 1.5 + fontSize);
-
-        x += categoriesSize * 0.4;
-        ctx.fillText("Unread", x, headerHeight + headerMargin * 1.5 + fontSize);
-
-        x += categoriesSize * 0.6;
-        ctx.fillText("Top", x, headerHeight + headerMargin * 1.5 + fontSize);
-      },
-    },
-    obj
-  );
-}
-
-function loadImage(src) {
-  if (!src) {
-    return Promise.resolve();
-  }
-
-  const img = new Image();
-  img.src = getUrl(src);
-  return new Promise((resolve) => (img.onload = () => resolve(img)));
-}
-
 export function parseColor(color) {
   const m = color.match(/^#([0-9a-f]{6})$/i);
   if (m) {
diff --git a/app/assets/javascripts/wizard/addon/models/wizard.js b/app/assets/javascripts/wizard/addon/models/wizard.js
index fbdf8f86c08..a871746eb4c 100644
--- a/app/assets/javascripts/wizard/addon/models/wizard.js
+++ b/app/assets/javascripts/wizard/addon/models/wizard.js
@@ -41,13 +41,13 @@ const Wizard = EmberObject.extend(Evented, {
   get font() {
     const fontChoice = this.steps.findBy("id", "styling")?.fieldsById
       ?.body_font;
-    return fontChoice.choices?.findBy("id", fontChoice.value)?.label;
+    return fontChoice.choices?.findBy("id", fontChoice.value);
   },
 
   get headingFont() {
     const fontChoice = this.steps.findBy("id", "styling")?.fieldsById
       ?.heading_font;
-    return fontChoice.choices?.findBy("id", fontChoice.value)?.label;
+    return fontChoice.choices?.findBy("id", fontChoice.value);
   },
 });
 
diff --git a/app/assets/javascripts/wizard/addon/routes/wizard.js b/app/assets/javascripts/wizard/addon/routes/wizard.js
index 0048317818e..351b95a9580 100644
--- a/app/assets/javascripts/wizard/addon/routes/wizard.js
+++ b/app/assets/javascripts/wizard/addon/routes/wizard.js
@@ -1,28 +1,31 @@
 import Route from "@ember/routing/route";
 import { findWizard } from "wizard/models/wizard";
+import DisableSidebar from "discourse/mixins/disable-sidebar";
 
-export default Route.extend({
+export default Route.extend(DisableSidebar, {
   model() {
     return findWizard();
   },
 
   activate() {
+    this._super(...arguments);
+
     document.body.classList.add("wizard");
 
     this.controllerFor("application").setProperties({
       showTop: false,
       showFooter: false,
-      sidebarDisabledRouteOverride: true,
       showSiteHeader: false,
     });
   },
 
   deactivate() {
+    this._super(...arguments);
+
     document.body.classList.remove("wizard");
 
     this.controllerFor("application").setProperties({
       showTop: true,
-      sidebarDisabledRouteOverride: false,
       showSiteHeader: true,
     });
   },
diff --git a/app/assets/javascripts/wizard/addon/test-helpers/wizard-pretender.js b/app/assets/javascripts/wizard/addon/test-helpers/wizard-pretender.js
index a64aa8b5a78..b560137a06b 100644
--- a/app/assets/javascripts/wizard/addon/test-helpers/wizard-pretender.js
+++ b/app/assets/javascripts/wizard/addon/test-helpers/wizard-pretender.js
@@ -35,7 +35,7 @@ export default function (helpers) {
             index: 2,
             fields: [
               { id: "company_name", type: "text", required: true },
-              { id: "theme_preview", type: "component" },
+              { id: "styling_preview", type: "component" },
             ],
             previous: "styling",
           },
diff --git a/app/assets/javascripts/wizard/config/ember-cli-update.json b/app/assets/javascripts/wizard/config/ember-cli-update.json
new file mode 100644
index 00000000000..994928cd9c9
--- /dev/null
+++ b/app/assets/javascripts/wizard/config/ember-cli-update.json
@@ -0,0 +1,20 @@
+{
+  "schemaVersion": "1.0.0",
+  "packages": [
+    {
+      "name": "ember-cli",
+      "version": "5.0.0",
+      "blueprints": [
+        {
+          "name": "addon",
+          "outputRepo": "https://github.com/ember-cli/ember-addon-output",
+          "codemodsSource": "ember-addon-codemods-manifest@1",
+          "isBaseBlueprint": true,
+          "options": [
+            "--no-welcome"
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/app/assets/javascripts/wizard/ember-cli-build.js b/app/assets/javascripts/wizard/ember-cli-build.js
index 5f61174aea0..653ad41e79c 100644
--- a/app/assets/javascripts/wizard/ember-cli-build.js
+++ b/app/assets/javascripts/wizard/ember-cli-build.js
@@ -3,7 +3,7 @@
 const EmberAddon = require("ember-cli/lib/broccoli/ember-addon");
 
 module.exports = function (defaults) {
-  let app = new EmberAddon(defaults, {
+  const app = new EmberAddon(defaults, {
     autoImport: {
       publicAssetURL: "",
     },
diff --git a/app/assets/javascripts/wizard/index.js b/app/assets/javascripts/wizard/index.js
index f29529cc51a..afc67ba45b9 100644
--- a/app/assets/javascripts/wizard/index.js
+++ b/app/assets/javascripts/wizard/index.js
@@ -1,15 +1,26 @@
 "use strict";
 
 const calculateCacheKeyForTree = require("calculate-cache-key-for-tree");
+const path = require("path");
 
 module.exports = {
   name: require("./package").name,
-  treeForAddon(tree) {
-    let app = this._findHost();
-    app.options.wizardTree = this._super.treeForAddon.call(this, tree);
+
+  // return an empty tree here as we do not want the addon modules to be
+  // included into vendor.js; instead, we will produce a separate bundle
+  // (wizard.js) to be included via a script tag as needed
+  treeForAddon() {
     return;
   },
 
+  // custom method to produce the tree for wizard.js
+  // called by ember-cli-build.js in discourse core
+  treeForAddonBundle() {
+    let addonTreePath = path.resolve(this.root, this.treePaths.addon);
+    let addonTree = this.treeGenerator(addonTreePath);
+    return this._super.treeForAddon.call(this, addonTree);
+  },
+
   cacheKeyForTree(tree) {
     return calculateCacheKeyForTree(tree, this);
   },
diff --git a/app/assets/javascripts/wizard/package.json b/app/assets/javascripts/wizard/package.json
index c582bef904d..4077c49a356 100644
--- a/app/assets/javascripts/wizard/package.json
+++ b/app/assets/javascripts/wizard/package.json
@@ -7,7 +7,6 @@
   "keywords": [
     "ember-addon"
   ],
-  "repository": "",
   "scripts": {
     "build": "ember build",
     "lint:hbs": "ember-template-lint .",
@@ -15,29 +14,28 @@
     "start": "ember serve"
   },
   "dependencies": {
-    "ember-auto-import": "^2.5.0",
-    "ember-cli-babel": "^7.26.10",
-    "ember-cli-htmlbars": "^6.1.1",
-    "webpack": "^5.75.0",
-    "xss": "^1.0.14"
+    "ember-auto-import": "^2.6.3",
+    "ember-cli-babel": "^7.26.11",
+    "ember-cli-htmlbars": "^6.2.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.20.12",
+    "@babel/core": "^7.22.9",
     "@ember/optional-features": "^2.0.0",
-    "@embroider/test-setup": "^2.0.2",
+    "@ember/string": "^3.1.1",
+    "@embroider/test-setup": "^3.0.1",
     "@glimmer/component": "^1.1.2",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~3.28.5",
-    "ember-cli-dependency-checker": "^3.3.1",
+    "ember-cli": "~5.0.0",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-load-initializers": "^2.1.1",
-    "ember-resolver": "^8.0.3",
-    "ember-source": "~3.28.11",
+    "ember-resolver": "^10.1.1",
+    "ember-source": "~3.28.12",
     "ember-source-channel-url": "^3.0.0",
-    "loader.js": "^4.7.0"
+    "loader.js": "^4.7.0",
+    "webpack": "^5.88.2"
   },
   "engines": {
     "node": "16.* || >= 18",
diff --git a/app/assets/javascripts/wizard/tests/dummy/app/index.html b/app/assets/javascripts/wizard/tests/dummy/app/index.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/wizard/tests/dummy/app/styles/.gitkeep b/app/assets/javascripts/wizard/tests/dummy/app/styles/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/wizard/tests/dummy/app/templates/.gitkeep b/app/assets/javascripts/wizard/tests/dummy/app/templates/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/wizard/tests/dummy/config/.gitkeep b/app/assets/javascripts/wizard/tests/dummy/config/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/wizard/tests/dummy/public/.gitkeep b/app/assets/javascripts/wizard/tests/dummy/public/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/wizard/tests/index.html b/app/assets/javascripts/wizard/tests/index.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/yarn.lock b/app/assets/javascripts/yarn.lock
index 2b8a33d8d74..3dce71c05e5 100644
--- a/app/assets/javascripts/yarn.lock
+++ b/app/assets/javascripts/yarn.lock
@@ -2,439 +2,348 @@
 # yarn lockfile v1
 
 
-"@ampproject/remapping@^2.1.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d"
-  integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==
+"@aashutoshrathi/word-wrap@^1.2.3":
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
+  integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
+
+"@ampproject/remapping@^2.2.0":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630"
+  integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==
   dependencies:
-    "@jridgewell/gen-mapping" "^0.1.0"
+    "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@babel/code-frame@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
-  integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
+"@babel/code-frame@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.5.tgz#234d98e1551960604f1246e6475891a570ad5658"
+  integrity sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==
   dependencies:
-    "@babel/highlight" "^7.18.6"
+    "@babel/highlight" "^7.22.5"
 
-"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.4", "@babel/compat-data@^7.16.8", "@babel/compat-data@^7.20.5":
-  version "7.20.10"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.10.tgz#9d92fa81b87542fff50e848ed585b4212c1d34ec"
-  integrity sha512-sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg==
+"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.5.tgz#b1f6c86a02d85d2dd3368a2b67c09add8cd0c255"
+  integrity sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA==
 
-"@babel/core@^7.12.0", "@babel/core@^7.13.8", "@babel/core@^7.16.7", "@babel/core@^7.20.12", "@babel/core@^7.3.4":
-  version "7.20.12"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.12.tgz#7930db57443c6714ad216953d1356dac0eb8496d"
-  integrity sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==
+"@babel/compat-data@^7.22.9":
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.9.tgz#71cdb00a1ce3a329ce4cbec3a44f9fef35669730"
+  integrity sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==
+
+"@babel/core@^7.12.0", "@babel/core@^7.16.10", "@babel/core@^7.16.7", "@babel/core@^7.21.4", "@babel/core@^7.22.9", "@babel/core@^7.3.4":
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.9.tgz#bd96492c68822198f33e8a256061da3cf391f58f"
+  integrity sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==
   dependencies:
-    "@ampproject/remapping" "^2.1.0"
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.20.7"
-    "@babel/helper-compilation-targets" "^7.20.7"
-    "@babel/helper-module-transforms" "^7.20.11"
-    "@babel/helpers" "^7.20.7"
-    "@babel/parser" "^7.20.7"
-    "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.20.12"
-    "@babel/types" "^7.20.7"
+    "@ampproject/remapping" "^2.2.0"
+    "@babel/code-frame" "^7.22.5"
+    "@babel/generator" "^7.22.9"
+    "@babel/helper-compilation-targets" "^7.22.9"
+    "@babel/helper-module-transforms" "^7.22.9"
+    "@babel/helpers" "^7.22.6"
+    "@babel/parser" "^7.22.7"
+    "@babel/template" "^7.22.5"
+    "@babel/traverse" "^7.22.8"
+    "@babel/types" "^7.22.5"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.2"
-    semver "^6.3.0"
+    semver "^6.3.1"
 
-"@babel/generator@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.7.tgz#f8ef57c8242665c5929fe2e8d82ba75460187b4a"
-  integrity sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==
+"@babel/generator@^7.22.7", "@babel/generator@^7.22.9":
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.9.tgz#572ecfa7a31002fa1de2a9d91621fd895da8493d"
+  integrity sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==
   dependencies:
-    "@babel/types" "^7.20.7"
+    "@babel/types" "^7.22.5"
     "@jridgewell/gen-mapping" "^0.3.2"
+    "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
 
-"@babel/helper-annotate-as-pure@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862"
-  integrity sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==
+"@babel/helper-annotate-as-pure@^7.18.6", "@babel/helper-annotate-as-pure@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882"
+  integrity sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz#38d138561ea207f0f69eb1626a418e4f7e6a580b"
-  integrity sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.5.tgz#a3f4758efdd0190d8927fcffd261755937c71878"
+  integrity sha512-m1EP3lVOPptR+2DwD125gziZNcmoNSHGmJROKoy87loWUQyJaVXDgpmruWqDARZSmtYQ+Dl25okU8+qhVzuykw==
   dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.16.7"
-    "@babel/types" "^7.16.7"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-compilation-targets@^7.12.0", "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7", "@babel/helper-compilation-targets@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz#a6cd33e93629f5eb473b021aac05df62c4cd09bb"
-  integrity sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==
+"@babel/helper-compilation-targets@^7.12.0", "@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.22.5", "@babel/helper-compilation-targets@^7.22.9":
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.9.tgz#f9d0a7aaaa7cd32a3f31c9316a69f5a9bcacb892"
+  integrity sha512-7qYrNM6HjpnPHJbopxmb8hSPoZ0gsX8IvUS32JGVoy+pU9e5N0nLr1VjJoR6kA4d9dmGLxNYOjeB8sUDal2WMw==
   dependencies:
-    "@babel/compat-data" "^7.20.5"
-    "@babel/helper-validator-option" "^7.18.6"
-    browserslist "^4.21.3"
+    "@babel/compat-data" "^7.22.9"
+    "@babel/helper-validator-option" "^7.22.5"
+    browserslist "^4.21.9"
     lru-cache "^5.1.1"
+    semver "^6.3.1"
+
+"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.21.0", "@babel/helper-create-class-features-plugin@^7.22.5", "@babel/helper-create-class-features-plugin@^7.5.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.5.tgz#2192a1970ece4685fbff85b48da2c32fcb130b7c"
+  integrity sha512-xkb58MyOYIslxu3gKmVXmjTtUPvBU4odYzbiIQbWwLKIHCsx6UGZGX6F1IznMFVnDdirseUZopzN+ZRt8Xb33Q==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-member-expression-to-functions" "^7.22.5"
+    "@babel/helper-optimise-call-expression" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.5"
     semver "^6.3.0"
 
-"@babel/helper-create-class-features-plugin@^7.13.0", "@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.5.5":
-  version "7.16.10"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.10.tgz#8a6959b9cc818a88815ba3c5474619e9c0f2c21c"
-  integrity sha512-wDeej0pu3WN/ffTxMNCPW5UCiOav8IcLRxSIyp/9+IF2xJUM9h/OYjg0IJLHaL6F8oU8kqMz9nc1vryXhMsgXg==
+"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.5.tgz#bb2bf0debfe39b831986a4efbf4066586819c6e4"
+  integrity sha512-1VpEFOIbMRaXyDeUwUfmTIxExLwQ+zkW+Bh5zXpApA3oQedBx9v/updixWxnx/bZpKw7u8VxWjb/qWpIcmPq8A==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/helper-member-expression-to-functions" "^7.16.7"
-    "@babel/helper-optimise-call-expression" "^7.16.7"
-    "@babel/helper-replace-supers" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    regexpu-core "^5.3.1"
+    semver "^6.3.0"
 
-"@babel/helper-create-regexp-features-plugin@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.7.tgz#0cb82b9bac358eb73bfbd73985a776bfa6b14d48"
-  integrity sha512-fk5A6ymfp+O5+p2yCkXAu5Kyj6v0xh0RBeNcAkYUMDvvAAoxvSKXn+Jb37t/yWFiQVDFK1ELpUTD8/aLhCPu+g==
+"@babel/helper-define-polyfill-provider@^0.4.0":
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.0.tgz#487053f103110f25b9755c5980e031e93ced24d8"
+  integrity sha512-RnanLx5ETe6aybRi1cO/edaRH+bNYWaryCEmjDDYyNr4wnSzyOp8T0dWipmqVHKEY3AbVKUom50AKSlj1zmKbg==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    regexpu-core "^4.7.1"
-
-"@babel/helper-define-polyfill-provider@^0.2.0":
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.0.tgz#a640051772045fedaaecc6f0c6c69f02bdd34bf1"
-  integrity sha512-JT8tHuFjKBo8NnaUbblz7mIu1nnvUDiHVjXXkulZULyidvo/7P6TY7+YqpV37IfF+KUFxmlK04elKtGKXaiVgw==
-  dependencies:
-    "@babel/helper-compilation-targets" "^7.13.0"
-    "@babel/helper-module-imports" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/traverse" "^7.13.0"
+    "@babel/helper-compilation-targets" "^7.17.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
     debug "^4.1.1"
     lodash.debounce "^4.0.8"
     resolve "^1.14.2"
     semver "^6.1.2"
 
-"@babel/helper-define-polyfill-provider@^0.3.1":
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz#52411b445bdb2e676869e5a74960d2d3826d2665"
-  integrity sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==
+"@babel/helper-environment-visitor@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz#f06dd41b7c1f44e1f8da6c4055b41ab3a09a7e98"
+  integrity sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==
+
+"@babel/helper-function-name@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz#ede300828905bb15e582c037162f99d5183af1be"
+  integrity sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.13.0"
-    "@babel/helper-module-imports" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/traverse" "^7.13.0"
-    debug "^4.1.1"
-    lodash.debounce "^4.0.8"
-    resolve "^1.14.2"
-    semver "^6.1.2"
+    "@babel/template" "^7.22.5"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-environment-visitor@^7.16.7", "@babel/helper-environment-visitor@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be"
-  integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==
-
-"@babel/helper-explode-assignable-expression@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz#12a6d8522fdd834f194e868af6354e8650242b7a"
-  integrity sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==
+"@babel/helper-hoist-variables@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
+  integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-function-name@^7.16.7", "@babel/helper-function-name@^7.19.0":
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c"
-  integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==
+"@babel/helper-member-expression-to-functions@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz#0a7c56117cad3372fbf8d2fb4bf8f8d64a1e76b2"
+  integrity sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==
   dependencies:
-    "@babel/template" "^7.18.10"
-    "@babel/types" "^7.19.0"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-hoist-variables@^7.16.7", "@babel/helper-hoist-variables@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678"
-  integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==
+"@babel/helper-module-imports@^7.22.5", "@babel/helper-module-imports@^7.8.3":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz#1a8f4c9f4027d23f520bd76b364d44434a72660c"
+  integrity sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==
   dependencies:
-    "@babel/types" "^7.18.6"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-member-expression-to-functions@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz#42b9ca4b2b200123c3b7e726b0ae5153924905b0"
-  integrity sha512-VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q==
+"@babel/helper-module-transforms@^7.22.5", "@babel/helper-module-transforms@^7.22.9":
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz#92dfcb1fbbb2bc62529024f72d942a8c97142129"
+  integrity sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-module-imports" "^7.22.5"
+    "@babel/helper-simple-access" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/helper-validator-identifier" "^7.22.5"
 
-"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.13.12", "@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.18.6", "@babel/helper-module-imports@^7.8.3":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e"
-  integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==
+"@babel/helper-optimise-call-expression@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz#f21531a9ccbff644fdd156b4077c16ff0c3f609e"
+  integrity sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==
   dependencies:
-    "@babel/types" "^7.18.6"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-module-transforms@^7.16.7", "@babel/helper-module-transforms@^7.20.11":
-  version "7.20.11"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz#df4c7af713c557938c50ea3ad0117a7944b2f1b0"
-  integrity sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295"
+  integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==
+
+"@babel/helper-remap-async-to-generator@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.5.tgz#14a38141a7bf2165ad38da61d61cf27b43015da2"
+  integrity sha512-cU0Sq1Rf4Z55fgz7haOakIyM7+x/uCFwXpLPaeRzfoUtAEAuUZjZvFPjL/rk5rW693dIgn2hng1W7xbT7lWT4g==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-simple-access" "^7.20.2"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/helper-validator-identifier" "^7.19.1"
-    "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.20.10"
-    "@babel/types" "^7.20.7"
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-wrap-function" "^7.22.5"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-optimise-call-expression@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz#a34e3560605abbd31a18546bd2aad3e6d9a174f2"
-  integrity sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==
+"@babel/helper-replace-supers@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.5.tgz#71bc5fb348856dea9fdc4eafd7e2e49f585145dc"
+  integrity sha512-aLdNM5I3kdI/V9xGNyKSF3X/gTyMUBohTZ+/3QdQKAA9vxIiy12E+8E2HoOP1/DjeqU+g6as35QHJNMDDYpuCg==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-member-expression-to-functions" "^7.22.5"
+    "@babel/helper-optimise-call-expression" "^7.22.5"
+    "@babel/template" "^7.22.5"
+    "@babel/traverse" "^7.22.5"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5"
-  integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==
-
-"@babel/helper-remap-async-to-generator@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz#29ffaade68a367e2ed09c90901986918d25e57e3"
-  integrity sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==
+"@babel/helper-simple-access@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de"
+  integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-wrap-function" "^7.16.8"
-    "@babel/types" "^7.16.8"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-replace-supers@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz#e9f5f5f32ac90429c1a4bdec0f231ef0c2838ab1"
-  integrity sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==
+"@babel/helper-skip-transparent-expression-wrappers@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz#007f15240b5751c537c40e77abb4e89eeaaa8847"
+  integrity sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-member-expression-to-functions" "^7.16.7"
-    "@babel/helper-optimise-call-expression" "^7.16.7"
-    "@babel/traverse" "^7.16.7"
-    "@babel/types" "^7.16.7"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-simple-access@^7.16.7", "@babel/helper-simple-access@^7.20.2":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9"
-  integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==
+"@babel/helper-split-export-declaration@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.5.tgz#88cf11050edb95ed08d596f7a044462189127a08"
+  integrity sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ==
   dependencies:
-    "@babel/types" "^7.20.2"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09"
-  integrity sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==
+"@babel/helper-split-export-declaration@^7.22.6":
+  version "7.22.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
+  integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
   dependencies:
-    "@babel/types" "^7.16.0"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-split-export-declaration@^7.16.7", "@babel/helper-split-export-declaration@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075"
-  integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==
+"@babel/helper-string-parser@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
+  integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
+
+"@babel/helper-validator-identifier@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193"
+  integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==
+
+"@babel/helper-validator-option@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz#de52000a15a177413c8234fa3a8af4ee8102d0ac"
+  integrity sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==
+
+"@babel/helper-wrap-function@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.5.tgz#44d205af19ed8d872b4eefb0d2fa65f45eb34f06"
+  integrity sha512-bYqLIBSEshYcYQyfks8ewYA8S30yaGSeRslcvKMvoUk6HHPySbxHq9YRi6ghhzEU+yhQv9bP/jXnygkStOcqZw==
   dependencies:
-    "@babel/types" "^7.18.6"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/template" "^7.22.5"
+    "@babel/traverse" "^7.22.5"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-string-parser@^7.19.4":
-  version "7.19.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63"
-  integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==
-
-"@babel/helper-validator-identifier@^7.16.7", "@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1":
-  version "7.19.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
-  integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
-
-"@babel/helper-validator-option@^7.16.7", "@babel/helper-validator-option@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8"
-  integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==
-
-"@babel/helper-wrap-function@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz#58afda087c4cd235de92f7ceedebca2c41274200"
-  integrity sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==
+"@babel/helpers@^7.22.6":
+  version "7.22.6"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.22.6.tgz#8e61d3395a4f0c5a8060f309fb008200969b5ecd"
+  integrity sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==
   dependencies:
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.16.8"
-    "@babel/types" "^7.16.8"
+    "@babel/template" "^7.22.5"
+    "@babel/traverse" "^7.22.6"
+    "@babel/types" "^7.22.5"
 
-"@babel/helpers@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.7.tgz#04502ff0feecc9f20ecfaad120a18f011a8e6dce"
-  integrity sha512-PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA==
+"@babel/highlight@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.5.tgz#aa6c05c5407a67ebce408162b7ede789b4d22031"
+  integrity sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==
   dependencies:
-    "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.20.7"
-    "@babel/types" "^7.20.7"
-
-"@babel/highlight@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
-  integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.18.6"
+    "@babel/helper-validator-identifier" "^7.22.5"
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.20.7", "@babel/parser@^7.4.5":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.7.tgz#66fe23b3c8569220817d5feb8b9dcdc95bb4f71b"
-  integrity sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==
+"@babel/parser@^7.22.5", "@babel/parser@^7.22.7", "@babel/parser@^7.4.5":
+  version "7.22.7"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.7.tgz#df8cf085ce92ddbdbf668a7f186ce848c9036cae"
+  integrity sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050"
-  integrity sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg==
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz#87245a21cd69a73b0b81bcda98d443d6df08f05e"
+  integrity sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz#cc001234dfc139ac45f6bcf801866198c8c72ff9"
-  integrity sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw==
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz#fef09f9499b1f1c930da8a0c419db42167d792ca"
+  integrity sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
-    "@babel/plugin-proposal-optional-chaining" "^7.16.7"
-
-"@babel/plugin-proposal-async-generator-functions@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz#3bdd1ebbe620804ea9416706cd67d60787504bc8"
-  integrity sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-remap-async-to-generator" "^7.16.8"
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/plugin-transform-optional-chaining" "^7.22.5"
 
 "@babel/plugin-proposal-class-properties@^7.1.0", "@babel/plugin-proposal-class-properties@^7.16.5", "@babel/plugin-proposal-class-properties@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0"
-  integrity sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3"
+  integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-
-"@babel/plugin-proposal-class-static-block@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.7.tgz#712357570b612106ef5426d13dc433ce0f200c2a"
-  integrity sha512-dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/plugin-syntax-class-static-block" "^7.14.5"
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-proposal-decorators@^7.13.5", "@babel/plugin-proposal-decorators@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.16.7.tgz#922907d2e3e327f5b07d2246bcfc0bd438f360d2"
-  integrity sha512-DoEpnuXK14XV9btI1k8tzNGCutMclpj4yru8aXKoHlVmbO1s+2A+g2+h4JhcjrxkFJqzbymnLG6j/niOf3iFXQ==
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.22.5.tgz#dc8cdda048e5aea947efda920e030199806b868d"
+  integrity sha512-h8hlezQ4dl6ixodgXkH8lUfcD7x+WAuIqPUjwGoItynrXOAv4a4Tci1zA/qjzQjjcl0v3QpLdc2LM6ZACQuY7A==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/plugin-syntax-decorators" "^7.16.7"
+    "@babel/helper-create-class-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.5"
+    "@babel/plugin-syntax-decorators" "^7.22.5"
 
-"@babel/plugin-proposal-dynamic-import@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz#c19c897eaa46b27634a00fee9fb7d829158704b2"
-  integrity sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==
+"@babel/plugin-proposal-private-methods@^7.16.5":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz#5209de7d213457548a98436fa2882f52f4be6bea"
+  integrity sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-proposal-export-namespace-from@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz#09de09df18445a5786a305681423ae63507a6163"
-  integrity sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+"@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2":
+  version "7.21.0-placeholder-for-preset-env.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz#7844f9289546efa9febac2de4cfe358a050bd703"
+  integrity sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==
 
-"@babel/plugin-proposal-json-strings@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz#9732cb1d17d9a2626a08c5be25186c195b6fa6e8"
-  integrity sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ==
+"@babel/plugin-proposal-private-property-in-object@^7.16.5":
+  version "7.21.11"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz#69d597086b6760c4126525cfa154f34631ff272c"
+  integrity sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/plugin-syntax-json-strings" "^7.8.3"
-
-"@babel/plugin-proposal-logical-assignment-operators@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz#be23c0ba74deec1922e639832904be0bea73cdea"
-  integrity sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz#141fc20b6857e59459d430c850a0011e36561d99"
-  integrity sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-
-"@babel/plugin-proposal-numeric-separator@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz#d6b69f4af63fb38b6ca2558442a7fb191236eba9"
-  integrity sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
-
-"@babel/plugin-proposal-object-rest-spread@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.7.tgz#94593ef1ddf37021a25bdcb5754c4a8d534b01d8"
-  integrity sha512-3O0Y4+dw94HA86qSg9IHfyPktgR7q3gpNVAeiKQd+8jBKFaU5NQS1Yatgo4wY+UFNuLjvxcSmzcsHqrhgTyBUA==
-  dependencies:
-    "@babel/compat-data" "^7.16.4"
-    "@babel/helper-compilation-targets" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.16.7"
-
-"@babel/plugin-proposal-optional-catch-binding@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz#c623a430674ffc4ab732fd0a0ae7722b67cb74cf"
-  integrity sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-
-"@babel/plugin-proposal-optional-chaining@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz#7cd629564724816c0e8a969535551f943c64c39a"
-  integrity sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
-
-"@babel/plugin-proposal-private-methods@^7.16.11", "@babel/plugin-proposal-private-methods@^7.16.5":
-  version "7.16.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz#e8df108288555ff259f4527dbe84813aac3a1c50"
-  integrity sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.16.10"
-    "@babel/helper-plugin-utils" "^7.16.7"
-
-"@babel/plugin-proposal-private-property-in-object@^7.16.5", "@babel/plugin-proposal-private-property-in-object@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz#b0b8cef543c2c3d57e59e2c611994861d46a3fce"
-  integrity sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-create-class-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-create-class-features-plugin" "^7.21.0"
+    "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.16.7", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz#635d18eb10c6214210ffc5ff4932552de08188a2"
-  integrity sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==
+"@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz#af613d2cd5e643643b65cded64207b15c85cb78e"
+  integrity sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
@@ -457,12 +366,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-decorators@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.16.7.tgz#f66a0199f16de7c1ef5192160ccf5d069739e3d3"
-  integrity sha512-vQ+PxL+srA7g6Rx6I1e15m55gftknl2X8GCUW1JTlkTaXZLJOS0UcaY0eK9jYT7IYf4awn6qwyghVHLDz1WyMw==
+"@babel/plugin-syntax-decorators@^7.16.7", "@babel/plugin-syntax-decorators@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.22.5.tgz#329fe2907c73de184033775637dbbc507f09116a"
+  integrity sha512-avpUOBS7IU6al8MmF1XpAyj9QYeLPuSDJI5D4pVMSMdL7xQokKqJPYQC67RCT0aCTashUXPiGwMJ0DEXXCEmMA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-syntax-dynamic-import@^7.8.3":
   version "7.8.3"
@@ -478,6 +387,27 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
+"@babel/plugin-syntax-import-assertions@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz#07d252e2aa0bc6125567f742cd58619cb14dce98"
+  integrity sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-syntax-import-attributes@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz#ab840248d834410b829f569f5262b9e517555ecb"
+  integrity sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-syntax-import-meta@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
+  integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-syntax-json-strings@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
@@ -541,275 +471,406 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-typescript@^7.12.13", "@babel/plugin-syntax-typescript@^7.2.0":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.13.tgz#9dff111ca64154cef0f4dc52cf843d9f12ce4474"
-  integrity sha512-cHP3u1JiUiG2LFDKbXnwVad81GvfyIOmCD6HIEId6ojrY0Drfy2q1jw7BwN7dE84+kTnBjLkXoL3IEy/3JPu2w==
+"@babel/plugin-syntax-typescript@^7.2.0", "@babel/plugin-syntax-typescript@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz#aac8d383b062c5072c647a31ef990c1d0af90272"
+  integrity sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-arrow-functions@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz#44125e653d94b98db76369de9c396dc14bef4154"
-  integrity sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==
+"@babel/plugin-syntax-unicode-sets-regex@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz#d49a3b3e6b52e5be6740022317580234a6a47357"
+  integrity sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-async-to-generator@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz#b83dff4b970cf41f1b819f8b49cc0cfbaa53a808"
-  integrity sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==
+"@babel/plugin-transform-arrow-functions@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz#e5ba566d0c58a5b2ba2a8b795450641950b71958"
+  integrity sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==
   dependencies:
-    "@babel/helper-module-imports" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-remap-async-to-generator" "^7.16.8"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-block-scoped-functions@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz#4d0d57d9632ef6062cdf354bb717102ee042a620"
-  integrity sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==
+"@babel/plugin-transform-async-generator-functions@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.5.tgz#7336356d23380eda9a56314974f053a020dab0c3"
+  integrity sha512-gGOEvFzm3fWoyD5uZq7vVTD57pPJ3PczPUD/xCFGjzBpUosnklmXyKnGQbbbGs1NPNPskFex0j93yKbHt0cHyg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-remap-async-to-generator" "^7.22.5"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-transform-block-scoping@^7.16.7", "@babel/plugin-transform-block-scoping@^7.8.3":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz#f50664ab99ddeaee5bc681b8f3a6ea9d72ab4f87"
-  integrity sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==
+"@babel/plugin-transform-async-to-generator@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz#c7a85f44e46f8952f6d27fe57c2ed3cc084c3775"
+  integrity sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-module-imports" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-remap-async-to-generator" "^7.22.5"
 
-"@babel/plugin-transform-classes@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz#8f4b9562850cd973de3b498f1218796eb181ce00"
-  integrity sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==
+"@babel/plugin-transform-block-scoped-functions@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz#27978075bfaeb9fa586d3cb63a3d30c1de580024"
+  integrity sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/helper-optimise-call-expression" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-replace-supers" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-block-scoping@^7.22.5", "@babel/plugin-transform-block-scoping@^7.8.3":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.5.tgz#8bfc793b3a4b2742c0983fadc1480d843ecea31b"
+  integrity sha512-EcACl1i5fSQ6bt+YGuU/XGCeZKStLmyVGytWkpyhCLeQVA0eu6Wtiw92V+I1T/hnezUv7j74dA/Ro69gWcU+hg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-class-properties@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz#97a56e31ad8c9dc06a0b3710ce7803d5a48cca77"
+  integrity sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-class-static-block@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.5.tgz#3e40c46f048403472d6f4183116d5e46b1bff5ba"
+  integrity sha512-SPToJ5eYZLxlnp1UzdARpOGeC2GbHvr9d/UV0EukuVx8atktg194oe+C5BqQ8jRTkgLRVOPYeXRSBg1IlMoVRA==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-class-static-block" "^7.14.5"
+
+"@babel/plugin-transform-classes@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.5.tgz#635d4e98da741fad814984639f4c0149eb0135e1"
+  integrity sha512-2edQhLfibpWpsVBx2n/GKOz6JdGQvLruZQfGr9l1qes2KQaWswjBzhQF7UDUZMNaMMQeYnQzxwOMPsbYF7wqPQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-compilation-targets" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-optimise-call-expression" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.5"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz#66dee12e46f61d2aae7a73710f591eb3df616470"
-  integrity sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==
+"@babel/plugin-transform-computed-properties@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz#cd1e994bf9f316bd1c2dafcd02063ec261bb3869"
+  integrity sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/template" "^7.22.5"
 
-"@babel/plugin-transform-destructuring@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.7.tgz#ca9588ae2d63978a4c29d3f33282d8603f618e23"
-  integrity sha512-VqAwhTHBnu5xBVDCvrvqJbtLUa++qZaWC0Fgr2mqokBlulZARGyIvZDoqbPlPaKImQ9dKAcCzbv+ul//uqu70A==
+"@babel/plugin-transform-destructuring@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.5.tgz#d3aca7438f6c26c78cdd0b0ba920a336001b27cc"
+  integrity sha512-GfqcFuGW8vnEqTUBM7UtPd5A4q797LTvvwKxXTgRsFjoqaJiEg9deBG6kWeQYkVEL569NpnmpC0Pkr/8BLKGnQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-dotall-regex@^7.16.7", "@babel/plugin-transform-dotall-regex@^7.4.4":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz#6b2d67686fab15fb6a7fd4bd895d5982cfc81241"
-  integrity sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==
+"@babel/plugin-transform-dotall-regex@^7.22.5", "@babel/plugin-transform-dotall-regex@^7.4.4":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz#dbb4f0e45766eb544e193fb00e65a1dd3b2a4165"
+  integrity sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-duplicate-keys@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz#2207e9ca8f82a0d36a5a67b6536e7ef8b08823c9"
-  integrity sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==
+"@babel/plugin-transform-duplicate-keys@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz#b6e6428d9416f5f0bba19c70d1e6e7e0b88ab285"
+  integrity sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-exponentiation-operator@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz#efa9862ef97e9e9e5f653f6ddc7b665e8536fe9b"
-  integrity sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==
+"@babel/plugin-transform-dynamic-import@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.5.tgz#d6908a8916a810468c4edff73b5b75bda6ad393e"
+  integrity sha512-0MC3ppTB1AMxd8fXjSrbPa7LT9hrImt+/fcj+Pg5YMD7UQyWp/02+JWpdnCymmsXwIx5Z+sYn1bwCn4ZJNvhqQ==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
-"@babel/plugin-transform-for-of@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz#649d639d4617dff502a9a158c479b3b556728d8c"
-  integrity sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==
+"@babel/plugin-transform-exponentiation-operator@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz#402432ad544a1f9a480da865fda26be653e48f6a"
+  integrity sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-function-name@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz#5ab34375c64d61d083d7d2f05c38d90b97ec65cf"
-  integrity sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==
+"@babel/plugin-transform-export-namespace-from@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.5.tgz#57c41cb1d0613d22f548fddd8b288eedb9973a5b"
+  integrity sha512-X4hhm7FRnPgd4nDA4b/5V280xCx6oL7Oob5+9qVS5C13Zq4bh1qq7LU0GgRU6b5dBWBvhGaXYVB4AcN6+ol6vg==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
-"@babel/plugin-transform-literals@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz#254c9618c5ff749e87cb0c0cef1a0a050c0bdab1"
-  integrity sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==
+"@babel/plugin-transform-for-of@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz#ab1b8a200a8f990137aff9a084f8de4099ab173f"
+  integrity sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-member-expression-literals@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz#6e5dcf906ef8a098e630149d14c867dd28f92384"
-  integrity sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==
+"@babel/plugin-transform-function-name@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz#935189af68b01898e0d6d99658db6b164205c143"
+  integrity sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-compilation-targets" "^7.22.5"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-amd@^7.12.1", "@babel/plugin-transform-modules-amd@^7.13.0", "@babel/plugin-transform-modules-amd@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz#b28d323016a7daaae8609781d1f8c9da42b13186"
-  integrity sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==
+"@babel/plugin-transform-json-strings@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.5.tgz#14b64352fdf7e1f737eed68de1a1468bd2a77ec0"
+  integrity sha512-DuCRB7fu8MyTLbEQd1ew3R85nx/88yMoqo2uPSjevMj3yoN7CDM8jkgrY0wmVxfJZyJ/B9fE1iq7EQppWQmR5A==
   dependencies:
-    "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
 
-"@babel/plugin-transform-modules-commonjs@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.8.tgz#cdee19aae887b16b9d331009aa9a219af7c86afe"
-  integrity sha512-oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA==
+"@babel/plugin-transform-literals@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz#e9341f4b5a167952576e23db8d435849b1dd7920"
+  integrity sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==
   dependencies:
-    "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-simple-access" "^7.16.7"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-systemjs@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.7.tgz#887cefaef88e684d29558c2b13ee0563e287c2d7"
-  integrity sha512-DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw==
+"@babel/plugin-transform-logical-assignment-operators@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.5.tgz#66ae5f068fd5a9a5dc570df16f56c2a8462a9d6c"
+  integrity sha512-MQQOUW1KL8X0cDWfbwYP+TbVbZm16QmQXJQ+vndPtH/BoO0lOKpVoEDMI7+PskYxH+IiE0tS8xZye0qr1lGzSA==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.16.7"
-    "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-validator-identifier" "^7.16.7"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-transform-modules-umd@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz#23dad479fa585283dbd22215bff12719171e7618"
-  integrity sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ==
+"@babel/plugin-transform-member-expression-literals@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz#4fcc9050eded981a468347dd374539ed3e058def"
+  integrity sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==
   dependencies:
-    "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz#7f860e0e40d844a02c9dcf9d84965e7dfd666252"
-  integrity sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw==
+"@babel/plugin-transform-modules-amd@^7.13.0", "@babel/plugin-transform-modules-amd@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz#4e045f55dcf98afd00f85691a68fc0780704f526"
+  integrity sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
+    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-new-target@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz#9967d89a5c243818e0800fdad89db22c5f514244"
-  integrity sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==
+"@babel/plugin-transform-modules-commonjs@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz#7d9875908d19b8c0536085af7b053fd5bd651bfa"
+  integrity sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-simple-access" "^7.22.5"
+
+"@babel/plugin-transform-modules-systemjs@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz#18c31410b5e579a0092638f95c896c2a98a5d496"
+  integrity sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ==
+  dependencies:
+    "@babel/helper-hoist-variables" "^7.22.5"
+    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.5"
+
+"@babel/plugin-transform-modules-umd@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz#4694ae40a87b1745e3775b6a7fe96400315d4f98"
+  integrity sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-named-capturing-groups-regex@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz#67fe18ee8ce02d57c855185e27e3dc959b2e991f"
+  integrity sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-new-target@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz#1b248acea54ce44ea06dfd37247ba089fcf9758d"
+  integrity sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-nullish-coalescing-operator@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.5.tgz#f8872c65776e0b552e0849d7596cddd416c3e381"
+  integrity sha512-6CF8g6z1dNYZ/VXok5uYkkBBICHZPiGEl7oDnAx2Mt1hlHVHOSIKWJaXHjQJA5VB43KZnXZDIexMchY4y2PGdA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+
+"@babel/plugin-transform-numeric-separator@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.5.tgz#57226a2ed9e512b9b446517ab6fa2d17abb83f58"
+  integrity sha512-NbslED1/6M+sXiwwtcAB/nieypGw02Ejf4KtDeMkCEpP6gWFMX1wI9WKYua+4oBneCCEmulOkRpwywypVZzs/g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
 "@babel/plugin-transform-object-assign@^7.8.3":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.16.7.tgz#5fe08d63dccfeb6a33aa2638faf98e5c584100f8"
-  integrity sha512-R8mawvm3x0COTJtveuoqZIjNypn2FjfvXZr4pSQ8VhEFBuQGBz4XhHasZtHXjgXU4XptZ4HtGof3NoYc93ZH9Q==
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.22.5.tgz#290c1b9555dcea48bb2c29ad94237777600d04f9"
+  integrity sha512-iDhx9ARkXq4vhZ2CYOSnQXkmxkDgosLi3J8Z17mKz7LyzthtkdVchLD7WZ3aXeCuvJDOW3+1I5TpJmwIbF9MKQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-object-super@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz#ac359cf8d32cf4354d27a46867999490b6c32a94"
-  integrity sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==
+"@babel/plugin-transform-object-rest-spread@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.5.tgz#9686dc3447df4753b0b2a2fae7e8bc33cdc1f2e1"
+  integrity sha512-Kk3lyDmEslH9DnvCDA1s1kkd3YWQITiBOHngOtDL9Pt6BZjzqb6hiOlb8VfjiiQJ2unmegBqZu0rx5RxJb5vmQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-replace-supers" "^7.16.7"
+    "@babel/compat-data" "^7.22.5"
+    "@babel/helper-compilation-targets" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.22.5"
 
-"@babel/plugin-transform-parameters@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz#a1721f55b99b736511cb7e0152f61f17688f331f"
-  integrity sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==
+"@babel/plugin-transform-object-super@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz#794a8d2fcb5d0835af722173c1a9d704f44e218c"
+  integrity sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.5"
 
-"@babel/plugin-transform-property-literals@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz#2dadac85155436f22c696c4827730e0fe1057a55"
-  integrity sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==
+"@babel/plugin-transform-optional-catch-binding@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.5.tgz#842080be3076703be0eaf32ead6ac8174edee333"
+  integrity sha512-pH8orJahy+hzZje5b8e2QIlBWQvGpelS76C63Z+jhZKsmzfNaPQ+LaW6dcJ9bxTpo1mtXbgHwy765Ro3jftmUg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-transform-regenerator@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz#9e7576dc476cb89ccc5096fff7af659243b4adeb"
-  integrity sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q==
+"@babel/plugin-transform-optional-chaining@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.5.tgz#1003762b9c14295501beb41be72426736bedd1e0"
+  integrity sha512-AconbMKOMkyG+xCng2JogMCDcqW8wedQAqpVIL4cOSescZ7+iW8utC6YDZLMCSUIReEA733gzRSaOSXMAt/4WQ==
   dependencies:
-    regenerator-transform "^0.14.2"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-transform-reserved-words@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz#1d798e078f7c5958eec952059c460b220a63f586"
-  integrity sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==
+"@babel/plugin-transform-parameters@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz#c3542dd3c39b42c8069936e48717a8d179d63a18"
+  integrity sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-private-methods@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz#21c8af791f76674420a147ae62e9935d790f8722"
+  integrity sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-private-property-in-object@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.5.tgz#07a77f28cbb251546a43d175a1dda4cf3ef83e32"
+  integrity sha512-/9xnaTTJcVoBtSSmrVyhtSvO3kbqS2ODoh2juEU72c3aYonNF0OMGiaz2gjukyKM2wBBYJP38S4JiE0Wfb5VMQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-create-class-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
+
+"@babel/plugin-transform-property-literals@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz#b5ddabd73a4f7f26cd0e20f5db48290b88732766"
+  integrity sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-regenerator@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.5.tgz#cd8a68b228a5f75fa01420e8cc2fc400f0fc32aa"
+  integrity sha512-rR7KePOE7gfEtNTh9Qw+iO3Q/e4DEsoQ+hdvM6QUDH7JRJ5qxq5AA52ZzBWbI5i9lfNuvySgOGP8ZN7LAmaiPw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    regenerator-transform "^0.15.1"
+
+"@babel/plugin-transform-reserved-words@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz#832cd35b81c287c4bcd09ce03e22199641f964fb"
+  integrity sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-runtime@^7.13.9":
-  version "7.13.15"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.13.15.tgz#2eddf585dd066b84102517e10a577f24f76a9cd7"
-  integrity sha512-d+ezl76gx6Jal08XngJUkXM4lFXK/5Ikl9Mh4HKDxSfGJXmZ9xG64XT2oivBzfxb/eQ62VfvoMkaCZUKJMVrBA==
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.5.tgz#ca975fb5e260044473c8142e1b18b567d33c2a3b"
+  integrity sha512-bg4Wxd1FWeFx3daHFTWk1pkSWK/AyQuiyAoeZAOkAOUBjnZPH6KT7eMxouV47tQ6hl6ax2zyAWBdWZXbrvXlaw==
   dependencies:
-    "@babel/helper-module-imports" "^7.13.12"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    babel-plugin-polyfill-corejs2 "^0.2.0"
-    babel-plugin-polyfill-corejs3 "^0.2.0"
-    babel-plugin-polyfill-regenerator "^0.2.0"
+    "@babel/helper-module-imports" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    babel-plugin-polyfill-corejs2 "^0.4.3"
+    babel-plugin-polyfill-corejs3 "^0.8.1"
+    babel-plugin-polyfill-regenerator "^0.5.0"
     semver "^6.3.0"
 
-"@babel/plugin-transform-shorthand-properties@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz#e8549ae4afcf8382f711794c0c7b6b934c5fbd2a"
-  integrity sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==
+"@babel/plugin-transform-shorthand-properties@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz#6e277654be82b5559fc4b9f58088507c24f0c624"
+  integrity sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-spread@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz#a303e2122f9f12e0105daeedd0f30fb197d8ff44"
-  integrity sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==
+"@babel/plugin-transform-spread@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz#6487fd29f229c95e284ba6c98d65eafb893fea6b"
+  integrity sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
 
-"@babel/plugin-transform-sticky-regex@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz#c84741d4f4a38072b9a1e2e3fd56d359552e8660"
-  integrity sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==
+"@babel/plugin-transform-sticky-regex@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz#295aba1595bfc8197abd02eae5fc288c0deb26aa"
+  integrity sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-template-literals@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz#f3d1c45d28967c8e80f53666fc9c3e50618217ab"
-  integrity sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==
+"@babel/plugin-transform-template-literals@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz#8f38cf291e5f7a8e60e9f733193f0bcc10909bff"
+  integrity sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-typeof-symbol@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz#9cdbe622582c21368bd482b660ba87d5545d4f7e"
-  integrity sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==
+"@babel/plugin-transform-typeof-symbol@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz#5e2ba478da4b603af8673ff7c54f75a97b716b34"
+  integrity sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-typescript@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.13.0.tgz#4a498e1f3600342d2a9e61f60131018f55774853"
-  integrity sha512-elQEwluzaU8R8dbVuW2Q2Y8Nznf7hnjM7+DSCd14Lo5fF63C9qNLbwZYbmZrtV9/ySpSUpkRpQXvJb6xyu4hCQ==
+"@babel/plugin-transform-typescript@^7.13.0", "@babel/plugin-transform-typescript@^7.16.8":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.5.tgz#5c0f7adfc1b5f38c4dbc8f79b1f0f8074134bd7d"
+  integrity sha512-SMubA9S7Cb5sGSFFUlqxyClTA9zWJ8qGQrppNUm05LtFuN1ELRFNndkix4zUJrC9F+YivWwa1dHMSyo0e0N9dA==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.13.0"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/plugin-syntax-typescript" "^7.12.13"
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-create-class-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-typescript" "^7.22.5"
 
 "@babel/plugin-transform-typescript@~7.4.0":
   version "7.4.5"
@@ -828,20 +889,36 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-typescript" "^7.2.0"
 
-"@babel/plugin-transform-unicode-escapes@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz#da8717de7b3287a2c6d659750c964f302b31ece3"
-  integrity sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==
+"@babel/plugin-transform-unicode-escapes@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.5.tgz#ce0c248522b1cb22c7c992d88301a5ead70e806c"
+  integrity sha512-biEmVg1IYB/raUO5wT1tgfacCef15Fbzhkx493D3urBI++6hpJ+RFG4SrWMn0NEZLfvilqKf3QDrRVZHo08FYg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-unicode-regex@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz#0f7aa4a501198976e25e82702574c34cfebe9ef2"
-  integrity sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==
+"@babel/plugin-transform-unicode-property-regex@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz#098898f74d5c1e86660dc112057b2d11227f1c81"
+  integrity sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-unicode-regex@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz#ce7e7bb3ef208c4ff67e02a22816656256d7a183"
+  integrity sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-unicode-sets-regex@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz#77788060e511b708ffc7d42fdfbc5b37c3004e91"
+  integrity sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/polyfill@^7.11.5":
   version "7.12.1"
@@ -852,36 +929,25 @@
     regenerator-runtime "^0.13.4"
 
 "@babel/preset-env@^7.16.5", "@babel/preset-env@^7.16.7":
-  version "7.16.11"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.11.tgz#5dd88fd885fae36f88fd7c8342475c9f0abe2982"
-  integrity sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.22.5.tgz#3da66078b181f3d62512c51cf7014392c511504e"
+  integrity sha512-fj06hw89dpiZzGZtxn+QybifF07nNiZjZ7sazs2aVDcysAZVGjW7+7iFYxg6GLNM47R/thYfLdrXc+2f11Vi9A==
   dependencies:
-    "@babel/compat-data" "^7.16.8"
-    "@babel/helper-compilation-targets" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-validator-option" "^7.16.7"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.16.7"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.16.7"
-    "@babel/plugin-proposal-async-generator-functions" "^7.16.8"
-    "@babel/plugin-proposal-class-properties" "^7.16.7"
-    "@babel/plugin-proposal-class-static-block" "^7.16.7"
-    "@babel/plugin-proposal-dynamic-import" "^7.16.7"
-    "@babel/plugin-proposal-export-namespace-from" "^7.16.7"
-    "@babel/plugin-proposal-json-strings" "^7.16.7"
-    "@babel/plugin-proposal-logical-assignment-operators" "^7.16.7"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.16.7"
-    "@babel/plugin-proposal-numeric-separator" "^7.16.7"
-    "@babel/plugin-proposal-object-rest-spread" "^7.16.7"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.16.7"
-    "@babel/plugin-proposal-optional-chaining" "^7.16.7"
-    "@babel/plugin-proposal-private-methods" "^7.16.11"
-    "@babel/plugin-proposal-private-property-in-object" "^7.16.7"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.16.7"
+    "@babel/compat-data" "^7.22.5"
+    "@babel/helper-compilation-targets" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-validator-option" "^7.22.5"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.22.5"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.22.5"
+    "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
     "@babel/plugin-syntax-class-properties" "^7.12.13"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+    "@babel/plugin-syntax-import-assertions" "^7.22.5"
+    "@babel/plugin-syntax-import-attributes" "^7.22.5"
+    "@babel/plugin-syntax-import-meta" "^7.10.4"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
@@ -891,44 +957,61 @@
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
     "@babel/plugin-syntax-top-level-await" "^7.14.5"
-    "@babel/plugin-transform-arrow-functions" "^7.16.7"
-    "@babel/plugin-transform-async-to-generator" "^7.16.8"
-    "@babel/plugin-transform-block-scoped-functions" "^7.16.7"
-    "@babel/plugin-transform-block-scoping" "^7.16.7"
-    "@babel/plugin-transform-classes" "^7.16.7"
-    "@babel/plugin-transform-computed-properties" "^7.16.7"
-    "@babel/plugin-transform-destructuring" "^7.16.7"
-    "@babel/plugin-transform-dotall-regex" "^7.16.7"
-    "@babel/plugin-transform-duplicate-keys" "^7.16.7"
-    "@babel/plugin-transform-exponentiation-operator" "^7.16.7"
-    "@babel/plugin-transform-for-of" "^7.16.7"
-    "@babel/plugin-transform-function-name" "^7.16.7"
-    "@babel/plugin-transform-literals" "^7.16.7"
-    "@babel/plugin-transform-member-expression-literals" "^7.16.7"
-    "@babel/plugin-transform-modules-amd" "^7.16.7"
-    "@babel/plugin-transform-modules-commonjs" "^7.16.8"
-    "@babel/plugin-transform-modules-systemjs" "^7.16.7"
-    "@babel/plugin-transform-modules-umd" "^7.16.7"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.16.8"
-    "@babel/plugin-transform-new-target" "^7.16.7"
-    "@babel/plugin-transform-object-super" "^7.16.7"
-    "@babel/plugin-transform-parameters" "^7.16.7"
-    "@babel/plugin-transform-property-literals" "^7.16.7"
-    "@babel/plugin-transform-regenerator" "^7.16.7"
-    "@babel/plugin-transform-reserved-words" "^7.16.7"
-    "@babel/plugin-transform-shorthand-properties" "^7.16.7"
-    "@babel/plugin-transform-spread" "^7.16.7"
-    "@babel/plugin-transform-sticky-regex" "^7.16.7"
-    "@babel/plugin-transform-template-literals" "^7.16.7"
-    "@babel/plugin-transform-typeof-symbol" "^7.16.7"
-    "@babel/plugin-transform-unicode-escapes" "^7.16.7"
-    "@babel/plugin-transform-unicode-regex" "^7.16.7"
+    "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6"
+    "@babel/plugin-transform-arrow-functions" "^7.22.5"
+    "@babel/plugin-transform-async-generator-functions" "^7.22.5"
+    "@babel/plugin-transform-async-to-generator" "^7.22.5"
+    "@babel/plugin-transform-block-scoped-functions" "^7.22.5"
+    "@babel/plugin-transform-block-scoping" "^7.22.5"
+    "@babel/plugin-transform-class-properties" "^7.22.5"
+    "@babel/plugin-transform-class-static-block" "^7.22.5"
+    "@babel/plugin-transform-classes" "^7.22.5"
+    "@babel/plugin-transform-computed-properties" "^7.22.5"
+    "@babel/plugin-transform-destructuring" "^7.22.5"
+    "@babel/plugin-transform-dotall-regex" "^7.22.5"
+    "@babel/plugin-transform-duplicate-keys" "^7.22.5"
+    "@babel/plugin-transform-dynamic-import" "^7.22.5"
+    "@babel/plugin-transform-exponentiation-operator" "^7.22.5"
+    "@babel/plugin-transform-export-namespace-from" "^7.22.5"
+    "@babel/plugin-transform-for-of" "^7.22.5"
+    "@babel/plugin-transform-function-name" "^7.22.5"
+    "@babel/plugin-transform-json-strings" "^7.22.5"
+    "@babel/plugin-transform-literals" "^7.22.5"
+    "@babel/plugin-transform-logical-assignment-operators" "^7.22.5"
+    "@babel/plugin-transform-member-expression-literals" "^7.22.5"
+    "@babel/plugin-transform-modules-amd" "^7.22.5"
+    "@babel/plugin-transform-modules-commonjs" "^7.22.5"
+    "@babel/plugin-transform-modules-systemjs" "^7.22.5"
+    "@babel/plugin-transform-modules-umd" "^7.22.5"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.22.5"
+    "@babel/plugin-transform-new-target" "^7.22.5"
+    "@babel/plugin-transform-nullish-coalescing-operator" "^7.22.5"
+    "@babel/plugin-transform-numeric-separator" "^7.22.5"
+    "@babel/plugin-transform-object-rest-spread" "^7.22.5"
+    "@babel/plugin-transform-object-super" "^7.22.5"
+    "@babel/plugin-transform-optional-catch-binding" "^7.22.5"
+    "@babel/plugin-transform-optional-chaining" "^7.22.5"
+    "@babel/plugin-transform-parameters" "^7.22.5"
+    "@babel/plugin-transform-private-methods" "^7.22.5"
+    "@babel/plugin-transform-private-property-in-object" "^7.22.5"
+    "@babel/plugin-transform-property-literals" "^7.22.5"
+    "@babel/plugin-transform-regenerator" "^7.22.5"
+    "@babel/plugin-transform-reserved-words" "^7.22.5"
+    "@babel/plugin-transform-shorthand-properties" "^7.22.5"
+    "@babel/plugin-transform-spread" "^7.22.5"
+    "@babel/plugin-transform-sticky-regex" "^7.22.5"
+    "@babel/plugin-transform-template-literals" "^7.22.5"
+    "@babel/plugin-transform-typeof-symbol" "^7.22.5"
+    "@babel/plugin-transform-unicode-escapes" "^7.22.5"
+    "@babel/plugin-transform-unicode-property-regex" "^7.22.5"
+    "@babel/plugin-transform-unicode-regex" "^7.22.5"
+    "@babel/plugin-transform-unicode-sets-regex" "^7.22.5"
     "@babel/preset-modules" "^0.1.5"
-    "@babel/types" "^7.16.8"
-    babel-plugin-polyfill-corejs2 "^0.3.0"
-    babel-plugin-polyfill-corejs3 "^0.5.0"
-    babel-plugin-polyfill-regenerator "^0.3.0"
-    core-js-compat "^3.20.2"
+    "@babel/types" "^7.22.5"
+    babel-plugin-polyfill-corejs2 "^0.4.3"
+    babel-plugin-polyfill-corejs3 "^0.8.1"
+    babel-plugin-polyfill-regenerator "^0.5.0"
+    core-js-compat "^3.30.2"
     semver "^6.3.0"
 
 "@babel/preset-modules@^0.1.5":
@@ -942,6 +1025,11 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
+"@babel/regjsgen@^0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
+  integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
+
 "@babel/runtime@7.12.18":
   version "7.12.18"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.18.tgz#af137bd7e7d9705a412b3caaf991fe6aaa97831b"
@@ -949,50 +1037,50 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.8.4":
-  version "7.13.10"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.10.tgz#47d42a57b6095f4468da440388fdbad8bebf0d7d"
-  integrity sha512-4QPkjJq6Ns3V/RgpEahRk+AGfL0eO6RHHtTWoNNr5mO49G6B5+X6d6THgWEAvTrznU5xYpbAlVKRYcsCgh/Akw==
+"@babel/runtime@^7.14.0", "@babel/runtime@^7.8.4":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.5.tgz#8564dd588182ce0047d55d7a75e93921107b57ec"
+  integrity sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA==
   dependencies:
-    regenerator-runtime "^0.13.4"
+    regenerator-runtime "^0.13.11"
 
-"@babel/standalone@^7.20.12":
-  version "7.20.12"
-  resolved "https://registry.yarnpkg.com/@babel/standalone/-/standalone-7.20.12.tgz#ae882b8642b4efb1ddd80c8a64a929e028095562"
-  integrity sha512-hK/X+m1il3w1tYS4H8LDaGCEdiT47SVqEXY8RiEAgou26BystipSU8ZL6EvBR6t5l7lTv0ilBiChXWblKJ5iUA==
+"@babel/standalone@^7.22.9":
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/standalone/-/standalone-7.22.9.tgz#8ac034a30867dc50ff5a7904d771832edcd7a192"
+  integrity sha512-RRUFpN2WiHaczMqIhmy7VoruvSw+c3NSq6BczondQ6elJXtKzr9cAWWsWWZvtZ/rYFQpoQlch5VxQe4aWTt8LA==
 
-"@babel/template@^7.16.7", "@babel/template@^7.18.10", "@babel/template@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8"
-  integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==
+"@babel/template@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.5.tgz#0c8c4d944509875849bd0344ff0050756eefc6ec"
+  integrity sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==
   dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/parser" "^7.20.7"
-    "@babel/types" "^7.20.7"
+    "@babel/code-frame" "^7.22.5"
+    "@babel/parser" "^7.22.5"
+    "@babel/types" "^7.22.5"
 
-"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.20.10", "@babel/traverse@^7.20.12", "@babel/traverse@^7.20.7", "@babel/traverse@^7.4.5":
-  version "7.20.12"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.12.tgz#7f0f787b3a67ca4475adef1f56cb94f6abd4a4b5"
-  integrity sha512-MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ==
+"@babel/traverse@^7.22.5", "@babel/traverse@^7.22.6", "@babel/traverse@^7.22.8", "@babel/traverse@^7.4.5":
+  version "7.22.8"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.8.tgz#4d4451d31bc34efeae01eac222b514a77aa4000e"
+  integrity sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==
   dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.20.7"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.19.0"
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.20.7"
-    "@babel/types" "^7.20.7"
+    "@babel/code-frame" "^7.22.5"
+    "@babel/generator" "^7.22.7"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-hoist-variables" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/parser" "^7.22.7"
+    "@babel/types" "^7.22.5"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.18.6", "@babel/types@^7.19.0", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.4.4", "@babel/types@^7.7.2":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz#54ec75e252318423fc07fb644dc6a58a64c09b7f"
-  integrity sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==
+"@babel/types@^7.22.5", "@babel/types@^7.4.4", "@babel/types@^7.7.2":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.5.tgz#cd93eeaab025880a3a47ec881f4b096a5b786fbe"
+  integrity sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==
   dependencies:
-    "@babel/helper-string-parser" "^7.19.4"
-    "@babel/helper-validator-identifier" "^7.19.1"
+    "@babel/helper-string-parser" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.5"
     to-fast-properties "^2.0.0"
 
 "@cnakazawa/watch@^1.0.3":
@@ -1003,6 +1091,11 @@
     exec-sh "^0.3.2"
     minimist "^1.2.0"
 
+"@colors/colors@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
+  integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==
+
 "@discourse/backburner.js@^2.7.1-0":
   version "2.7.1-0"
   resolved "https://registry.yarnpkg.com/@discourse/backburner.js/-/backburner.js-2.7.1-0.tgz#0fc5f93c8f3ee013af2beed55d30ff10362d8f06"
@@ -1026,6 +1119,29 @@
   resolved "https://registry.yarnpkg.com/@ember-data/rfc395-data/-/rfc395-data-0.0.4.tgz#ecb86efdf5d7733a76ff14ea651a1b0ed1f8a843"
   integrity sha512-tGRdvgC9/QMQSuSuJV45xoyhI0Pzjm7A9o/MVVA3HakXIImJbbzx/k/6dO9CUEQXIyS2y0fW6C1XaYOG7rY0FQ==
 
+"@ember-decorators/component@^6.1.1":
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/@ember-decorators/component/-/component-6.1.1.tgz#b360dc4fa8e576ee1c840879399ef1745fd96e06"
+  integrity sha512-Cj8tY/c0MC/rsipqsiWLh3YVN72DK92edPYamD/HzvftwzC6oDwawWk8RmStiBnG9PG/vntAt41l3S7HSSA+1Q==
+  dependencies:
+    "@ember-decorators/utils" "^6.1.1"
+    ember-cli-babel "^7.1.3"
+
+"@ember-decorators/object@^6.1.1":
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/@ember-decorators/object/-/object-6.1.1.tgz#50c922f5ac9af3ddd381cb6a43a031dfd9a70c7a"
+  integrity sha512-cb4CNR9sRoA31J3FCOFLDuR9ztM4wO9w1WlS4JeNRS7Z69SlB/XSXB/vplA3i9OOaXEy/zKWbu5ndZrHz0gvLw==
+  dependencies:
+    "@ember-decorators/utils" "^6.1.1"
+    ember-cli-babel "^7.1.3"
+
+"@ember-decorators/utils@^6.1.1":
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/@ember-decorators/utils/-/utils-6.1.1.tgz#6b619814942b4fb3747cfa9f540c9f05283d7c5e"
+  integrity sha512-0KqnoeoLKb6AyoSU65TRF5T85wmS4uDn06oARddwNPxxf/lt5jQlh41uX3W7V/fWL9tPu8x1L1Vvpc80MN1+YA==
+  dependencies:
+    ember-cli-babel "^7.1.3"
+
 "@ember/edition-utils@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.2.0.tgz#a039f542dc14c8e8299c81cd5abba95e2459cfa6"
@@ -1042,6 +1158,16 @@
     jquery "^3.5.0"
     resolve "^1.15.1"
 
+"@ember/legacy-built-in-components@^0.4.2":
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/@ember/legacy-built-in-components/-/legacy-built-in-components-0.4.2.tgz#79a97d66153ff17909759b368b2a117bc9e168e5"
+  integrity sha512-rJulbyVQIVe1zEDQDqAQHechHy44DsS2qxO24+NmU/AYxwPFSzWC/OZNCDFSfLU+Y5BVd/00qjxF0pu7Nk+TNA==
+  dependencies:
+    "@embroider/macros" "^1.0.0"
+    ember-cli-babel "^7.26.6"
+    ember-cli-htmlbars "^5.7.1"
+    ember-cli-typescript "^4.1.0"
+
 "@ember/optional-features@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@ember/optional-features/-/optional-features-2.0.0.tgz#c809abd5a27d5b0ef3c6de3941334ab6153313f0"
@@ -1054,19 +1180,26 @@
     mkdirp "^1.0.4"
     silent-error "^1.1.1"
 
-"@ember/render-modifiers@^2.0.4":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@ember/render-modifiers/-/render-modifiers-2.0.4.tgz#0ac7af647cb736076dbfcd54ca71e090cd329d71"
-  integrity sha512-Zh/fo5VUmVzYHkHVvzWVjJ1RjFUxA2jH0zCp2+DQa80Bf3DUXauiEByxU22UkN4LFT55DBFttC0xCQSJG3WTsg==
+"@ember/render-modifiers@^2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@ember/render-modifiers/-/render-modifiers-2.1.0.tgz#f4fff95a8b5cfbe947ec46644732d511711c5bf9"
+  integrity sha512-LruhfoDv2itpk0fA0IC76Sxjcnq/7BC6txpQo40hOko8Dn6OxwQfxkPIbZGV0Cz7df+iX+VJrcYzNIvlc3w2EQ==
   dependencies:
     "@embroider/macros" "^1.0.0"
     ember-cli-babel "^7.26.11"
     ember-modifier-manager-polyfill "^1.2.0"
 
-"@ember/test-helpers@^2.9.3":
-  version "2.9.3"
-  resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-2.9.3.tgz#c2a9d6ab1c367af92cf1a334f97eb19b8e06e6e1"
-  integrity sha512-ejVg4Dj+G/6zyLvQsYOvmGiOLU6AS94tY4ClaO1E2oVvjjtVJIRmVLFN61I+DuyBg9hS3cFoPjQRTZB9MRIbxQ==
+"@ember/string@^3.1.1":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@ember/string/-/string-3.1.1.tgz#0a5ac0d1e4925259e41d5c8d55ef616117d47ff0"
+  integrity sha512-UbXJ+k3QOrYN4SRPHgXCqYIJ+yWWUg1+vr0H4DhdQPTy8LJfyqwZ2tc5uqpSSnEXE+/1KopHBE5J8GDagAg5cg==
+  dependencies:
+    ember-cli-babel "^7.26.6"
+
+"@ember/test-helpers@^2.9.4":
+  version "2.9.4"
+  resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-2.9.4.tgz#985022e9ba05cfc918bcf08b77cbb355f85b723e"
+  integrity sha512-z+Qs1NYWyIVDmrY6WdmOS5mdG1lJ5CFfzh6dRhLfs9lq45deDaDrVNcaCYhnNeJZTvUBK2XR2SvPcZm0RloXdA==
   dependencies:
     "@ember/test-waiters" "^3.0.0"
     "@embroider/macros" "^1.10.0"
@@ -1088,20 +1221,20 @@
     semver "^7.3.5"
 
 "@embroider/addon-shim@^1.8.3", "@embroider/addon-shim@^1.8.4":
-  version "1.8.4"
-  resolved "https://registry.yarnpkg.com/@embroider/addon-shim/-/addon-shim-1.8.4.tgz#0e7f32c5506bf0f3eb0840506e31c36c7053763c"
-  integrity sha512-sFhfWC0vI18KxVenmswQ/ShIvBg4juL8ubI+Q3NTSdkCTeaPQ/DIOUF6oR5DCQ8eO/TkIaw+kdG3FkTY6yNJqA==
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@embroider/addon-shim/-/addon-shim-1.8.5.tgz#c0aae417f9583058f40550f206fc53444e325f11"
+  integrity sha512-pDgpdTsC9i/+5hHziygK5VIZc64OG8bupiqL0OxJp+bnINURalHMbu5B3Gikq/a0QIvMPzDFWzKxIZCBpeiHkg==
   dependencies:
-    "@embroider/shared-internals" "^2.0.0"
+    "@embroider/shared-internals" "^2.1.0"
     broccoli-funnel "^3.0.8"
     semver "^7.3.8"
 
-"@embroider/macros@^1.0.0", "@embroider/macros@^1.10.0", "@embroider/macros@^1.8.3", "@embroider/macros@^1.9.0":
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.10.0.tgz#af3844d5db48f001b85cfb096c76727c72ad6c1e"
-  integrity sha512-LMbfQGk/a+f6xtvAv5fq/wf2LRxETnbgSCLUf/z6ebzmuskOUxrke+uP55chF/loWrARi9g6erFQ7RDOUoBMSg==
+"@embroider/macros@^1.0.0", "@embroider/macros@^1.10.0", "@embroider/macros@^1.11.0", "@embroider/macros@^1.8.3":
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.12.0.tgz#da77bca39b3dfd4fa9c3100975586b60feb64dd9"
+  integrity sha512-Ja4AnLy/peU7pYY1uHUJxSXT1DLMC2RR18g4udUIlGm1b0LAjvdssWn0yFBgNmBWvkyQvGmz+UA9LUMaw68lCg==
   dependencies:
-    "@embroider/shared-internals" "2.0.0"
+    "@embroider/shared-internals" "2.2.0"
     assert-never "^1.2.1"
     babel-import-util "^1.1.0"
     ember-cli-babel "^7.26.6"
@@ -1110,10 +1243,10 @@
     resolve "^1.20.0"
     semver "^7.3.2"
 
-"@embroider/shared-internals@2.0.0", "@embroider/shared-internals@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-2.0.0.tgz#d8205ec6944362aeecfbb51143db352430ced316"
-  integrity sha512-qZ2/xky9mWm5YC6noOa6AiAwgISEQ78YTZNv4SNu2PFgEK/H+Ha/3ddngzGSsnXkVnIHZyxIBzhxETonQYHY9g==
+"@embroider/shared-internals@2.2.0", "@embroider/shared-internals@^2.0.0", "@embroider/shared-internals@^2.1.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-2.2.0.tgz#7c4f5cf8f7289b36ffbfc04f6b4c71876713c869"
+  integrity sha512-bQQJezPsgyDWmYllFg5UY88zP6dGWIOpA+hIxXXnN09IG+TyyIfG1YAgMOITnQzoDQuRTCvXvaydYef3nx7cvw==
   dependencies:
     babel-import-util "^1.1.0"
     ember-rfc176-data "^0.3.17"
@@ -1124,31 +1257,43 @@
     semver "^7.3.5"
     typescript-memoize "^1.0.1"
 
-"@embroider/test-setup@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@embroider/test-setup/-/test-setup-2.0.2.tgz#fa9e2e0dbaaba481e889875114727dd78aa280fd"
-  integrity sha512-0rapCTr7T94TprLW11q60Lddeuom+bkBI35zyCsAp7A7idlTUekH9k7BTx9rbnPFuQJkwILGuZ05t03IAyQ4Ig==
+"@embroider/test-setup@^3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@embroider/test-setup/-/test-setup-3.0.1.tgz#603b21a809708ac928fe9f002905ee3711dc6864"
+  integrity sha512-t7R2f10iZDSNw3ovWAPM63GRQTu63uihpVh6CvHev5XkLt8B7tdxcxGyO6RbdF5Hu+pbsUu8sD0kAlR1gopmxg==
   dependencies:
     lodash "^4.17.21"
     resolve "^1.20.0"
 
 "@embroider/util@^1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@embroider/util/-/util-1.9.0.tgz#331c46bdf106c44cb1dd6baaa9030d322c13cfca"
-  integrity sha512-9I63iJK6N01OHJafmS/BX0msUkTlmhFMIEmDl/SRNACVi0nS6QfNyTgTTeji1P/DALf6eobg/9t/N4VhS9G9QA==
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@embroider/util/-/util-1.11.1.tgz#622390932542e6b7f8d5d28e956891306e664eb3"
+  integrity sha512-IqzlEQahM2cfLvo4PULA2WyvROqr9jRmeSv0GGZzpitWCh6l4FDwweOLSArdlKSXdQxHkKhwBMCi//7DhKjRlg==
   dependencies:
-    "@embroider/macros" "^1.9.0"
+    "@embroider/macros" "^1.11.0"
     broccoli-funnel "^3.0.5"
-    ember-cli-babel "^7.23.1"
+    ember-cli-babel "^7.26.11"
 
-"@eslint/eslintrc@^1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.1.tgz#af58772019a2d271b7e2d4c23ff4ddcba3ccfb3e"
-  integrity sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==
+"@eslint-community/eslint-utils@^4.2.0":
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
+  integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
+  dependencies:
+    eslint-visitor-keys "^3.3.0"
+
+"@eslint-community/regexpp@^4.6.1":
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.6.2.tgz#1816b5f6948029c5eaacb0703b850ee0cb37d8f8"
+  integrity sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==
+
+"@eslint/eslintrc@^2.1.1":
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.1.tgz#18d635e24ad35f7276e8a49d135c7d3ca6a46f93"
+  integrity sha512-9t7ZA7NGGK8ckelF0PQCfcxIUzs1Md5rrO6U/c+FIQNanea5UZC0wqKXH4vHBccmu4ZJgZ2idtPeW7+Q2npOEA==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
-    espree "^9.4.0"
+    espree "^9.6.0"
     globals "^13.19.0"
     ignore "^5.2.0"
     import-fresh "^3.2.1"
@@ -1156,6 +1301,11 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
+"@eslint/js@^8.46.0":
+  version "8.46.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.46.0.tgz#3f7802972e8b6fe3f88ed1aabc74ec596c456db6"
+  integrity sha512-a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA==
+
 "@glimmer/component@^1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@glimmer/component/-/component-1.1.2.tgz#892ec0c9f0b6b3e41c112be502fde073cf24d17c"
@@ -1179,27 +1329,27 @@
 "@glimmer/di@^0.1.9":
   version "0.1.11"
   resolved "https://registry.yarnpkg.com/@glimmer/di/-/di-0.1.11.tgz#a6878c07a13a2c2c76fcde598a5c97637bfc4280"
-  integrity sha1-poeMB6E6LCx2/N5ZilyXY3v8QoA=
+  integrity sha512-moRwafNDwHTnTHzyyZC9D+mUSvYrs1Ak0tRPjjmCghdoHHIvMshVbEnwKb/1WmW5CUlKc2eL9rlAV32n3GiItg==
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
-  integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
+  integrity sha512-JKF/a9I9jw6fGoz8kA7LEQslrwJ5jms5CXhu/aqkBWk+PmZ6pTl8mlb/eJ/5ujBGTiQzBhy5AIWF712iA+4/mw==
 
-"@glimmer/interfaces@0.84.2":
-  version "0.84.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.84.2.tgz#764cf92c954adcd1a851e5dc68ec1f6b654dc3bd"
-  integrity sha512-tMZxQpOddUVmHEOuripkNqVR7ba0K4doiYnFd4WyswqoHPlxqpBujbIamQ+bWCWEF0U4yxsXKa31ekS/JHkiBQ==
+"@glimmer/interfaces@0.84.3":
+  version "0.84.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.84.3.tgz#629777a4abe373b0785656f6c8d08989f5784805"
+  integrity sha512-dk32ykoNojt0mvEaIW6Vli5MGTbQo58uy3Epj7ahCgTHmWOKuw/0G83f2UmFprRwFx689YTXG38I/vbpltEjzg==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@^0.84.2":
-  version "0.84.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.84.2.tgz#a3f65e51eec20f6adb79c6159d1ad1166fa5bccd"
-  integrity sha512-SPBd1tpIR9XeaXsXsMRCnKz63eLnIZ0d5G9QC4zIBFBC3pQdtG0F5kWeuRVCdfTIFuR+5WBMfk5jvg+3gbQhjg==
+"@glimmer/syntax@^0.84.3":
+  version "0.84.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.84.3.tgz#4045a1708cef7fd810cff42fe6deeba40c7286d0"
+  integrity sha512-ioVbTic6ZisLxqTgRBL2PCjYZTFIwobifCustrozRU2xGDiYvVIL0vt25h2c1ioDsX59UgVlDkIK4YTAQQSd2A==
   dependencies:
-    "@glimmer/interfaces" "0.84.2"
-    "@glimmer/util" "0.84.2"
+    "@glimmer/interfaces" "0.84.3"
+    "@glimmer/util" "0.84.3"
     "@handlebars/parser" "~2.0.0"
     simple-html-tokenizer "^0.5.11"
 
@@ -1211,13 +1361,13 @@
     "@glimmer/env" "^0.1.7"
     "@glimmer/validator" "^0.44.0"
 
-"@glimmer/util@0.84.2":
-  version "0.84.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.84.2.tgz#2711ba40f25f44b2ea309cad49f5c2622c6211bc"
-  integrity sha512-VbhzE2s4rmU+qJF3gGBTL1IDjq+/G2Th51XErS8MQVMCmE4CU2pdwSzec8PyOowqCGUOrVIWuMzEI6VoPM4L4w==
+"@glimmer/util@0.84.3":
+  version "0.84.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.84.3.tgz#9ae0166982c0b48aa94b02d6ba8c2c81976ade4b"
+  integrity sha512-qFkh6s16ZSRuu2rfz3T4Wp0fylFj3HBsONGXQcrAdZjdUaIS6v3pNj6mecJ71qRgcym9Hbaq/7/fefIwECUiKw==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.84.2"
+    "@glimmer/interfaces" "0.84.3"
     "@simple-dom/interface" "^1.4.0"
 
 "@glimmer/util@^0.44.0":
@@ -1242,10 +1392,10 @@
   resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-2.0.0.tgz#5e8b7298f31ff8f7b260e6b7363c7e9ceed7d9c5"
   integrity sha512-EP9uEDZv/L5Qh9IWuMUGJRfwhXJ4h1dqKTT4/3+tY0eu7sPis7xh23j61SYUnNF4vqCQvvUXpDo9Bh/+q1zASA==
 
-"@humanwhocodes/config-array@^0.11.8":
-  version "0.11.8"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9"
-  integrity sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==
+"@humanwhocodes/config-array@^0.11.10":
+  version "0.11.10"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.10.tgz#5a3ffe32cc9306365fb3fd572596cd602d5e12d2"
+  integrity sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==
   dependencies:
     "@humanwhocodes/object-schema" "^1.2.1"
     debug "^4.1.1"
@@ -1261,53 +1411,50 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
-"@jridgewell/gen-mapping@^0.1.0":
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996"
-  integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==
-  dependencies:
-    "@jridgewell/set-array" "^1.0.0"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-
 "@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
-  integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098"
+  integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==
   dependencies:
     "@jridgewell/set-array" "^1.0.1"
     "@jridgewell/sourcemap-codec" "^1.4.10"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@jridgewell/resolve-uri@^3.0.3":
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz#30cd49820a962aff48c8fffc5cd760151fca61fe"
-  integrity sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==
+"@jridgewell/resolve-uri@3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
+  integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
 
-"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1":
+"@jridgewell/set-array@^1.0.1":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
   integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
 
-"@jridgewell/source-map@^0.3.2":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb"
-  integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==
+"@jridgewell/source-map@^0.3.3":
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.3.tgz#8108265659d4c33e72ffe14e33d6cc5eb59f2fda"
+  integrity sha512-b+fsZXeLYi9fEULmfBrhxn4IrPlINf8fiNarzTof004v3lFdntdwa9PF7vFJqm3mg7s+ScJMxXaE3Acp1irZcg==
   dependencies:
     "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@jridgewell/sourcemap-codec@^1.4.10":
-  version "1.4.13"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz#b6461fb0c2964356c469e115f504c95ad97ab88c"
-  integrity sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==
+"@jridgewell/sourcemap-codec@1.4.14":
+  version "1.4.14"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
+  integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
 
-"@jridgewell/trace-mapping@^0.3.9":
-  version "0.3.13"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz#dcfe3e95f224c8fe97a87a5235defec999aa92ea"
-  integrity sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==
+"@jridgewell/sourcemap-codec@^1.4.10":
+  version "1.4.15"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
+  integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
+
+"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9":
+  version "0.3.18"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz#25783b2086daf6ff1dcb53c9249ae480e4dd4cd6"
+  integrity sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==
   dependencies:
-    "@jridgewell/resolve-uri" "^3.0.3"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
+    "@jridgewell/resolve-uri" "3.1.0"
+    "@jridgewell/sourcemap-codec" "1.4.14"
 
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
@@ -1330,23 +1477,16 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@popperjs/core@^2.11.6", "@popperjs/core@^2.9.0":
-  version "2.11.6"
-  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.6.tgz#cee20bd55e68a1720bdab363ecf0c821ded4cd45"
-  integrity sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==
+"@popperjs/core@^2.11.8", "@popperjs/core@^2.9.0":
+  version "2.11.8"
+  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f"
+  integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==
 
 "@simple-dom/interface@^1.4.0":
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/@simple-dom/interface/-/interface-1.4.0.tgz#e8feea579232017f89b0138e2726facda6fbb71f"
   integrity sha512-l5qumKFWU0S+4ZzMaLXFU8tQZsicHEMEyAxI5kDFGhJsRqDwe0a7/iPA/GdxlGyDKseQQAgIz5kzU7eXTrlSpA==
 
-"@sinonjs/commons@^1.7.0":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d"
-  integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==
-  dependencies:
-    type-detect "4.0.8"
-
 "@sinonjs/commons@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-2.0.0.tgz#fd4ca5b063554307e8327b4564bd56d3b73924a3"
@@ -1354,33 +1494,33 @@
   dependencies:
     type-detect "4.0.8"
 
-"@sinonjs/fake-timers@10.0.2":
-  version "10.0.2"
-  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-10.0.2.tgz#d10549ed1f423d80639c528b6c7f5a1017747d0c"
-  integrity sha512-SwUDyjWnah1AaNl7kxsa7cfLhlTYoiyhDAIgyh+El30YvXs/o7OLXpYH88Zdhyx9JExKrmHDJ+10bwIcY80Jmw==
+"@sinonjs/commons@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-3.0.0.tgz#beb434fe875d965265e04722ccfc21df7f755d72"
+  integrity sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==
   dependencies:
-    "@sinonjs/commons" "^2.0.0"
+    type-detect "4.0.8"
 
-"@sinonjs/fake-timers@^7.0.4":
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz#2524eae70c4910edccf99b2f4e6efc5894aff7b5"
-  integrity sha512-iQADsW4LBMISqZ6Ci1dupJL9pprqwcVFTcOsEmQOEhW+KLCVn/Y4Jrvg2k19fIHCp+iFprriYPTdRcQR8NbUPg==
+"@sinonjs/fake-timers@^10.0.2", "@sinonjs/fake-timers@^10.3.0":
+  version "10.3.0"
+  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz#55fdff1ecab9f354019129daf4df0dd4d923ea66"
+  integrity sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==
   dependencies:
-    "@sinonjs/commons" "^1.7.0"
+    "@sinonjs/commons" "^3.0.0"
 
-"@sinonjs/samsam@^7.0.1":
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-7.0.1.tgz#5b5fa31c554636f78308439d220986b9523fc51f"
-  integrity sha512-zsAk2Jkiq89mhZovB2LLOdTCxJF4hqqTToGP0ASWlhp4I1hqOjcfmZGafXntCN7MDC6yySH0mFHrYtHceOeLmw==
+"@sinonjs/samsam@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-8.0.0.tgz#0d488c91efb3fa1442e26abea81759dfc8b5ac60"
+  integrity sha512-Bp8KUVlLp8ibJZrnvq2foVhP0IVX2CIprMJPK0vqGqgrDa0OHVKeZyBykqskkrdxV6yKBPmGasO8LVjAKR3Gew==
   dependencies:
     "@sinonjs/commons" "^2.0.0"
     lodash.get "^4.4.2"
     type-detect "^4.0.8"
 
 "@sinonjs/text-encoding@^0.7.1":
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz#8da5c6530915653f3a1f38fd5f101d8c3f8079c5"
-  integrity sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz#5981a8db18b56ba38ef0efb7d995b12aa7b51918"
+  integrity sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==
 
 "@socket.io/component-emitter@~3.1.0":
   version "3.1.0"
@@ -1398,29 +1538,29 @@
   integrity sha512-pCvdmea/F3Tn4hAtHqNXmjcixSaroJJ+L3STXlYJdir1g1m2mRQpWbN8a4SvgQtaw2930Ckhdx8qXdXBFMKbAA==
 
 "@types/body-parser@*":
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.0.tgz#0685b3c47eb3006ffed117cdd55164b61f80538f"
-  integrity sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==
+  version "1.19.2"
+  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0"
+  integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==
   dependencies:
     "@types/connect" "*"
     "@types/node" "*"
 
 "@types/chai-as-promised@^7.1.2":
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/@types/chai-as-promised/-/chai-as-promised-7.1.3.tgz#779166b90fda611963a3adbfd00b339d03b747bd"
-  integrity sha512-FQnh1ohPXJELpKhzjuDkPLR2BZCAqed+a6xV4MI/T3XzHfd2FlarfUGUdZYgqYe8oxkYn0fchHEeHfHqdZ96sg==
+  version "7.1.5"
+  resolved "https://registry.yarnpkg.com/@types/chai-as-promised/-/chai-as-promised-7.1.5.tgz#6e016811f6c7a64f2eed823191c3a6955094e255"
+  integrity sha512-jStwss93SITGBwt/niYrkf2C+/1KTeZCZl1LaeezTlqppAKeoQC7jxyqYuP72sxBGKCIbw7oHgbYssIRzT5FCQ==
   dependencies:
     "@types/chai" "*"
 
 "@types/chai@*", "@types/chai@^4.2.9":
-  version "4.2.16"
-  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.2.16.tgz#f09cc36e18d28274f942e7201147cce34d97e8c8"
-  integrity sha512-vI5iOAsez9+roLS3M3+Xx7w+WRuDtSmF8bQkrbcIJ2sC1PcDgVoA0WGpa+bIrJ+y8zqY2oi//fUctkxtIcXJCw==
+  version "4.3.5"
+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.5.tgz#ae69bcbb1bebb68c4ac0b11e9d8ed04526b3562b"
+  integrity sha512-mEo1sAde+UCE6b2hxn332f1g1E8WfYRu6p5SvTKr2ZKC1f7gFJXk4h5PyGP9Dt6gCaG8y8XhwnXWC6Iy2cmBng==
 
 "@types/connect@*":
-  version "3.4.34"
-  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.34.tgz#170a40223a6d666006d93ca128af2beb1d9b1901"
-  integrity sha512-ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ==
+  version "3.4.35"
+  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1"
+  integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==
   dependencies:
     "@types/node" "*"
 
@@ -1430,9 +1570,11 @@
   integrity sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==
 
 "@types/cors@^2.8.12":
-  version "2.8.12"
-  resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080"
-  integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==
+  version "2.8.13"
+  resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.13.tgz#b8ade22ba455a1b8cb3b5d3f35910fd204f84f94"
+  integrity sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==
+  dependencies:
+    "@types/node" "*"
 
 "@types/eslint-scope@^3.7.3":
   version "3.7.4"
@@ -1443,34 +1585,35 @@
     "@types/estree" "*"
 
 "@types/eslint@*":
-  version "8.4.1"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.1.tgz#c48251553e8759db9e656de3efc846954ac32304"
-  integrity sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA==
+  version "8.40.2"
+  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.40.2.tgz#2833bc112d809677864a4b0e7d1de4f04d7dac2d"
+  integrity sha512-PRVjQ4Eh9z9pmmtaq8nTjZjQwKFk7YIHIud3lRoKRBgUQjgjRmoGxxGEPXQkF+lH7QkHJRNr5F4aBgYCW0lqpQ==
   dependencies:
     "@types/estree" "*"
     "@types/json-schema" "*"
 
-"@types/estree@*", "@types/estree@^0.0.51":
-  version "0.0.51"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40"
-  integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==
+"@types/estree@*", "@types/estree@^1.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194"
+  integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==
 
-"@types/express-serve-static-core@^4.17.18":
-  version "4.17.19"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.19.tgz#00acfc1632e729acac4f1530e9e16f6dd1508a1d"
-  integrity sha512-DJOSHzX7pCiSElWaGR8kCprwibCB/3yW6vcT8VG3P0SJjnv19gnWG/AZMfM60Xj/YJIp/YCaDHyvzsFVeniARA==
+"@types/express-serve-static-core@^4.17.33":
+  version "4.17.35"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz#c95dd4424f0d32e525d23812aa8ab8e4d3906c4f"
+  integrity sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==
   dependencies:
     "@types/node" "*"
     "@types/qs" "*"
     "@types/range-parser" "*"
+    "@types/send" "*"
 
 "@types/express@^4.17.2":
-  version "4.17.11"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.11.tgz#debe3caa6f8e5fcda96b47bd54e2f40c4ee59545"
-  integrity sha512-no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg==
+  version "4.17.17"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.17.tgz#01d5437f6ef9cfa8668e616e13c2f2ac9a491ae4"
+  integrity sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==
   dependencies:
     "@types/body-parser" "*"
-    "@types/express-serve-static-core" "^4.17.18"
+    "@types/express-serve-static-core" "^4.17.33"
     "@types/qs" "*"
     "@types/serve-static" "*"
 
@@ -1482,98 +1625,130 @@
     "@types/node" "*"
 
 "@types/fs-extra@^8.1.0":
-  version "8.1.1"
-  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.1.1.tgz#1e49f22d09aa46e19b51c0b013cb63d0d923a068"
-  integrity sha512-TcUlBem321DFQzBNuz8p0CLLKp0VvF/XH9E4KHNmgwyp4E3AfgI5cjiIVZWlbfThBop2qxFIh4+LeY6hVWWZ2w==
+  version "8.1.2"
+  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.1.2.tgz#7125cc2e4bdd9bd2fc83005ffdb1d0ba00cca61f"
+  integrity sha512-SvSrYXfWSc7R4eqnOzbQF4TZmfpNSM9FrSWLU3EUnWBuyZqNBOrv1B1JA3byUDPUl9z4Ab3jeZG2eDdySlgNMg==
   dependencies:
     "@types/node" "*"
 
-"@types/glob@*", "@types/glob@^7.1.1":
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183"
-  integrity sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==
+"@types/glob@*":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-8.1.0.tgz#b63e70155391b0584dce44e7ea25190bbc38f2fc"
+  integrity sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==
+  dependencies:
+    "@types/minimatch" "^5.1.2"
+    "@types/node" "*"
+
+"@types/glob@^7.1.1":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"
+  integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==
   dependencies:
     "@types/minimatch" "*"
     "@types/node" "*"
 
+"@types/http-errors@*":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-2.0.1.tgz#20172f9578b225f6c7da63446f56d4ce108d5a65"
+  integrity sha512-/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ==
+
 "@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
-  version "7.0.9"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
-  integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
+  version "7.0.12"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb"
+  integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==
+
+"@types/mime@*":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10"
+  integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==
 
 "@types/mime@^1":
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
   integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
 
-"@types/minimatch@*", "@types/minimatch@^3.0.3", "@types/minimatch@^3.0.4":
+"@types/minimatch@*", "@types/minimatch@^5.1.2":
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
+  integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
+
+"@types/minimatch@^3.0.3", "@types/minimatch@^3.0.4":
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
   integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
 
 "@types/node@*", "@types/node@>=10.0.0":
-  version "18.11.9"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.9.tgz#02d013de7058cea16d36168ef2fc653464cfbad4"
-  integrity sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==
+  version "20.3.2"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.3.2.tgz#fa6a90f2600e052a03c18b8cb3fd83dd4e599898"
+  integrity sha512-vOBLVQeCQfIcF/2Y7eKFTqrMnizK5lRNQ7ykML/5RuwVXVWxYkgwS7xbt4B6fKCUPgbSL5FSsjHQpaGQP/dQmw==
 
 "@types/qs@*":
-  version "6.9.6"
-  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.6.tgz#df9c3c8b31a247ec315e6996566be3171df4b3b1"
-  integrity sha512-0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA==
+  version "6.9.7"
+  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb"
+  integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==
 
 "@types/range-parser@*":
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c"
-  integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
+  integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
 
 "@types/rimraf@^2.0.2", "@types/rimraf@^2.0.3":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.4.tgz#403887b0b53c6100a6c35d2ab24f6ccc042fec46"
-  integrity sha512-8gBudvllD2A/c0CcEX/BivIDorHFt5UI5m46TsNj8DjWCCTTZT74kEe4g+QsY7P/B9WdO98d82zZgXO/RQzu2Q==
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.5.tgz#368fb04d59630b727fc05a74d2ca557f64a8ef98"
+  integrity sha512-YyP+VfeaqAyFmXoTh3HChxOQMyjByRMsHU7kc5KOJkSlXudhMhQIALbYV7rHh/l8d2lX3VUQzprrcAgWdRuU8g==
   dependencies:
     "@types/glob" "*"
     "@types/node" "*"
 
-"@types/serve-static@*":
-  version "1.13.9"
-  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.9.tgz#aacf28a85a05ee29a11fb7c3ead935ac56f33e4e"
-  integrity sha512-ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA==
+"@types/send@*":
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.1.tgz#ed4932b8a2a805f1fe362a70f4e62d0ac994e301"
+  integrity sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==
   dependencies:
     "@types/mime" "^1"
     "@types/node" "*"
 
+"@types/serve-static@*":
+  version "1.15.2"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.2.tgz#3e5419ecd1e40e7405d34093f10befb43f63381a"
+  integrity sha512-J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw==
+  dependencies:
+    "@types/http-errors" "*"
+    "@types/mime" "*"
+    "@types/node" "*"
+
 "@types/symlink-or-copy@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@types/symlink-or-copy/-/symlink-or-copy-1.2.0.tgz#4151a81b4052c80bc2becbae09f3a9ec010a9c7a"
   integrity sha512-Lja2xYuuf2B3knEsga8ShbOdsfNOtzT73GyJmZyY7eGl2+ajOqrs8yM5ze0fsSoYwvA6bw7/Qr7OZ7PEEmYwWg==
 
-"@uppy/aws-s3-multipart@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@uppy/aws-s3-multipart/-/aws-s3-multipart-3.1.1.tgz#996184d7c73122d9a33b166e2960215e482e57ab"
-  integrity sha512-vL4QtbI5T4cGJLHm2GzKIGeaiy2zbgNW0nn/3LxYQ+wrBHLJoVZ/6uzMiFdNUBNa28rRQ/qxWTmy/kD6co95cg==
+"@uppy/aws-s3-multipart@3.1.3":
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/@uppy/aws-s3-multipart/-/aws-s3-multipart-3.1.3.tgz#eb4e9f40686444cf8fa4d35c6bb5f36947bd7f6b"
+  integrity sha512-V1s9526efZz1T8YWT3g+Y4pZlazoH0mR4R6fql+PdzwYNvlchPe4b/+zFuEiymhHvoQk8pZM6kqI34Cf7FzqrQ==
   dependencies:
-    "@uppy/companion-client" "^3.1.1"
-    "@uppy/utils" "^5.1.1"
+    "@uppy/companion-client" "^3.1.2"
+    "@uppy/utils" "^5.2.0"
 
-"@uppy/aws-s3@^3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@uppy/aws-s3/-/aws-s3-3.0.4.tgz#a2422a2091c57570ff99a77108296f09ba9e46a5"
-  integrity sha512-mcwRYUH1TgcCWAkmvx9SCu7A9ylgBX+b1qyVO7ZiHnSbdg1F0H9hd3KkiUHGHkuV+hHz+l4vM9tQJqhxVhpW8w==
+"@uppy/aws-s3@3.0.6":
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/@uppy/aws-s3/-/aws-s3-3.0.6.tgz#09916ad52fe87fd8f0380a37faf4c0ef0126f253"
+  integrity sha512-T+QC4u8/Dyh4qxW3E/Zy7LPTuT3K8dugrVPF3R3+cwfImmSusQZU6PYww3LhV8iumOwhgfsTll7ip0FcYCm2DA==
   dependencies:
-    "@uppy/companion-client" "^3.0.2"
-    "@uppy/utils" "^5.0.2"
-    "@uppy/xhr-upload" "^3.0.4"
+    "@uppy/companion-client" "^3.1.2"
+    "@uppy/utils" "^5.2.0"
+    "@uppy/xhr-upload" "^3.1.1"
     nanoid "^4.0.0"
 
-"@uppy/companion-client@^3.0.2", "@uppy/companion-client@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@uppy/companion-client/-/companion-client-3.1.1.tgz#8c9974f70b899a40771da9a90113941356f9842e"
-  integrity sha512-S1M37vjWu8gdOgdI3Hh/1fVZ9GaLdyPQjVyUujZDTsr79b4VG7v/zjdqJ0FiOTjfGbpnj8s9kr1uyYi0Zf5VFw==
+"@uppy/companion-client@^3.1.2", "@uppy/companion-client@^3.1.3":
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/@uppy/companion-client/-/companion-client-3.1.3.tgz#b4889cfca6a1d60e044d0594a8da56304ba5d9fa"
+  integrity sha512-l70qOd4P9PSqxPDOFD1LMusDGGi36LCCiQko/e+Uw5hBtzN9vhAG5rQm242FlNoFdxK5T6jmfoZJSVel0UTvzg==
   dependencies:
-    "@uppy/utils" "^5.1.1"
+    "@uppy/utils" "^5.3.0"
     namespace-emitter "^2.0.1"
 
-"@uppy/core@^3.0.4":
+"@uppy/core@3.0.4":
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/@uppy/core/-/core-3.0.4.tgz#3bdc08e50ab72749e6f9afa60eec6c836e8b3442"
   integrity sha512-vFofKmmVVsQE9bnOXozAPy94kLQMUdMH/l8m4ncXmxyyGRc2e9VfvY9wiy2EEsoj11O7YVzHOP70FYdRReUpVw==
@@ -1587,7 +1762,7 @@
     nanoid "^4.0.0"
     preact "^10.5.13"
 
-"@uppy/drop-target@^2.0.1":
+"@uppy/drop-target@2.0.1":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@uppy/drop-target/-/drop-target-2.0.1.tgz#94e106056a846d9de12b0d12231f66c9718a6778"
   integrity sha512-FMO8wj+0dx4mlwXKxFWSTUF+irgr0BVXadyc4qaoBBtZ3vEcwc3jP7SQfwk3JizV/D5MYG8MRICRbPAIrY9M8w==
@@ -1595,151 +1770,160 @@
     "@uppy/utils" "^5.0.2"
 
 "@uppy/store-default@^3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@uppy/store-default/-/store-default-3.0.2.tgz#870724c45a2f671d625123cb4a412e3bfae935d9"
-  integrity sha512-kIQMCjXui6tjF1E9xGo4YHkvt71McXkU0FStrcQuBrRXuOhb+NcuWh3sMh3KryivVNgT6w5Odrlw2FUFkl9cqA==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@uppy/store-default/-/store-default-3.0.3.tgz#37d0e95c8fd360b3283bca7fdf94cce7400008e7"
+  integrity sha512-/zlvQNj4HjkthI+7dNdj/8mOlTg1Zb1gJ/ZsOxof0g3xXD+OAwm7asRnOwpfj2dos+lExdW/zMn8XsRGsuvb6Q==
 
-"@uppy/utils@^5.0.2", "@uppy/utils@^5.1.1":
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/@uppy/utils/-/utils-5.1.1.tgz#9597e8696e17d71413672bd56eb082c7410514a3"
-  integrity sha512-uoI+PcIVQboky0ZbN4PQeK1seZnnJocomzeK7blId9HKJ6QNgZLf2ibk2CQuQxrOuNsWhgrhs5uLO5Si0oM0Yw==
+"@uppy/utils@5.4.0", "@uppy/utils@^5.0.2", "@uppy/utils@^5.2.0", "@uppy/utils@^5.3.0", "@uppy/utils@^5.4.0":
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@uppy/utils/-/utils-5.4.0.tgz#1f0816334ef8cfe3eaaf7c6a1d3dc28ac9bbced8"
+  integrity sha512-X9f43OvTcymhoiDEzA2CqH7W5pADTVv2bhQ/9NUaVwYRLUadDjZc27ZgnNraKSYgnOhKFJlC63nyCwcd0yaQIQ==
   dependencies:
-    lodash.throttle "^4.1.1"
+    lodash "^4.17.21"
 
-"@uppy/xhr-upload@^3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@uppy/xhr-upload/-/xhr-upload-3.0.4.tgz#219a92c832bee1f089992958d27ec71dbe9d9d7d"
-  integrity sha512-uJ1oxcwEaSLnrexvi6Lp57hV3z3DsovgVmYIVwg+z/EnrRcL32wNRE7FcIr8Mk9e1jdMiFYlk6cQmiP2dZep8A==
+"@uppy/xhr-upload@3.1.1":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@uppy/xhr-upload/-/xhr-upload-3.1.1.tgz#7d6b3585e7ae298fb3340a6e327c73f60d25beca"
+  integrity sha512-VoTi17L3Ta9pFLxrHAD1L+PE3rR498Bitml8X8FtVijp+MFz9X4KqXxF1+y8DSn6M+sevuDAnf32cZqou/e/gw==
   dependencies:
-    "@uppy/companion-client" "^3.0.2"
-    "@uppy/utils" "^5.0.2"
+    "@uppy/companion-client" "^3.1.2"
+    "@uppy/utils" "^5.2.0"
     nanoid "^4.0.0"
 
-"@webassemblyjs/ast@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"
-  integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==
+"@uppy/xhr-upload@^3.1.1":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@uppy/xhr-upload/-/xhr-upload-3.3.0.tgz#37b5f16467e32f39da4323113411b0ea159d4732"
+  integrity sha512-tgCVlNSBMj94iazCSQoOXfWYPAv6pZSzXK9ljkchKb2fjN6zmbkOJiQIaDUG+LxM/GX0qDi6sNNxUlhvz5cpbg==
   dependencies:
-    "@webassemblyjs/helper-numbers" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+    "@uppy/companion-client" "^3.1.3"
+    "@uppy/utils" "^5.4.0"
+    nanoid "^4.0.0"
 
-"@webassemblyjs/floating-point-hex-parser@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f"
-  integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==
-
-"@webassemblyjs/helper-api-error@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16"
-  integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==
-
-"@webassemblyjs/helper-buffer@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5"
-  integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==
-
-"@webassemblyjs/helper-numbers@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae"
-  integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==
+"@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.6.tgz#db046555d3c413f8966ca50a95176a0e2c642e24"
+  integrity sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==
   dependencies:
-    "@webassemblyjs/floating-point-hex-parser" "1.11.1"
-    "@webassemblyjs/helper-api-error" "1.11.1"
+    "@webassemblyjs/helper-numbers" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+
+"@webassemblyjs/floating-point-hex-parser@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz#dacbcb95aff135c8260f77fa3b4c5fea600a6431"
+  integrity sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==
+
+"@webassemblyjs/helper-api-error@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768"
+  integrity sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==
+
+"@webassemblyjs/helper-buffer@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz#b66d73c43e296fd5e88006f18524feb0f2c7c093"
+  integrity sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==
+
+"@webassemblyjs/helper-numbers@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz#cbce5e7e0c1bd32cf4905ae444ef64cea919f1b5"
+  integrity sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==
+  dependencies:
+    "@webassemblyjs/floating-point-hex-parser" "1.11.6"
+    "@webassemblyjs/helper-api-error" "1.11.6"
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/helper-wasm-bytecode@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1"
-  integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==
+"@webassemblyjs/helper-wasm-bytecode@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9"
+  integrity sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==
 
-"@webassemblyjs/helper-wasm-section@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a"
-  integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==
+"@webassemblyjs/helper-wasm-section@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz#ff97f3863c55ee7f580fd5c41a381e9def4aa577"
+  integrity sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==
   dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-buffer" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-    "@webassemblyjs/wasm-gen" "1.11.1"
+    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/helper-buffer" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/wasm-gen" "1.11.6"
 
-"@webassemblyjs/ieee754@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614"
-  integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==
+"@webassemblyjs/ieee754@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz#bb665c91d0b14fffceb0e38298c329af043c6e3a"
+  integrity sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/leb128@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5"
-  integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==
+"@webassemblyjs/leb128@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz#70e60e5e82f9ac81118bc25381a0b283893240d7"
+  integrity sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==
   dependencies:
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/utf8@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff"
-  integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==
+"@webassemblyjs/utf8@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a"
+  integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==
 
-"@webassemblyjs/wasm-edit@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6"
-  integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==
+"@webassemblyjs/wasm-edit@^1.11.5":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz#c72fa8220524c9b416249f3d94c2958dfe70ceab"
+  integrity sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==
   dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-buffer" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-    "@webassemblyjs/helper-wasm-section" "1.11.1"
-    "@webassemblyjs/wasm-gen" "1.11.1"
-    "@webassemblyjs/wasm-opt" "1.11.1"
-    "@webassemblyjs/wasm-parser" "1.11.1"
-    "@webassemblyjs/wast-printer" "1.11.1"
+    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/helper-buffer" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/helper-wasm-section" "1.11.6"
+    "@webassemblyjs/wasm-gen" "1.11.6"
+    "@webassemblyjs/wasm-opt" "1.11.6"
+    "@webassemblyjs/wasm-parser" "1.11.6"
+    "@webassemblyjs/wast-printer" "1.11.6"
 
-"@webassemblyjs/wasm-gen@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76"
-  integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==
+"@webassemblyjs/wasm-gen@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz#fb5283e0e8b4551cc4e9c3c0d7184a65faf7c268"
+  integrity sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==
   dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-    "@webassemblyjs/ieee754" "1.11.1"
-    "@webassemblyjs/leb128" "1.11.1"
-    "@webassemblyjs/utf8" "1.11.1"
+    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/ieee754" "1.11.6"
+    "@webassemblyjs/leb128" "1.11.6"
+    "@webassemblyjs/utf8" "1.11.6"
 
-"@webassemblyjs/wasm-opt@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2"
-  integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==
+"@webassemblyjs/wasm-opt@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz#d9a22d651248422ca498b09aa3232a81041487c2"
+  integrity sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==
   dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-buffer" "1.11.1"
-    "@webassemblyjs/wasm-gen" "1.11.1"
-    "@webassemblyjs/wasm-parser" "1.11.1"
+    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/helper-buffer" "1.11.6"
+    "@webassemblyjs/wasm-gen" "1.11.6"
+    "@webassemblyjs/wasm-parser" "1.11.6"
 
-"@webassemblyjs/wasm-parser@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199"
-  integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==
+"@webassemblyjs/wasm-parser@1.11.6", "@webassemblyjs/wasm-parser@^1.11.5":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz#bb85378c527df824004812bbdb784eea539174a1"
+  integrity sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==
   dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-api-error" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-    "@webassemblyjs/ieee754" "1.11.1"
-    "@webassemblyjs/leb128" "1.11.1"
-    "@webassemblyjs/utf8" "1.11.1"
+    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/helper-api-error" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/ieee754" "1.11.6"
+    "@webassemblyjs/leb128" "1.11.6"
+    "@webassemblyjs/utf8" "1.11.6"
 
-"@webassemblyjs/wast-printer@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0"
-  integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==
+"@webassemblyjs/wast-printer@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz#a7bf8dd7e362aeb1668ff43f35cb849f188eff20"
+  integrity sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==
   dependencies:
-    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/ast" "1.11.6"
     "@xtuc/long" "4.2.2"
 
 "@xmldom/xmldom@^0.8.0":
-  version "0.8.5"
-  resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.5.tgz#7f4b797cfda39355b512b4cfcc66b49b5d93d5f3"
-  integrity sha512-0dpjDLeCXYThL2YhqZcd/spuwoH+dmnFoND9ZxZkAYxp1IJUB2GP16ow2MJRsjVxy8j1Qv8BJRmN5GKnbDKCmQ==
+  version "0.8.8"
+  resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.8.tgz#d0d11511cbc1de77e53342ad1546a4d487d6ea72"
+  integrity sha512-0LNz4EY8B/8xXY86wMrQ4tz6zEHZv9ehFMJPm8u2gq5lQ71cfRKdaKyxfJAx5aUoyzx0qzgURblTisPGgz3d+Q==
 
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
@@ -1751,12 +1935,17 @@
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
-a11y-dialog@7.5.2:
-  version "7.5.2"
-  resolved "https://registry.yarnpkg.com/a11y-dialog/-/a11y-dialog-7.5.2.tgz#8174d3f71a05d8d5a02ebae515384c747910391c"
-  integrity sha512-zfWtVvrbGbP3AFnEJ1aJFtu7GvedgjOEKbkyEUSeaNWDzmFJk9O5nuolDQrRDyRDE5fqSJRiBJtD5bUYKveoUg==
+"@yarnpkg/lockfile@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
+  integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
+
+a11y-dialog@8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/a11y-dialog/-/a11y-dialog-8.0.0.tgz#e080be9b0bca2a3c22a526da3f4bca00c0e221ed"
+  integrity sha512-O0u7j+5bWik8B0SEmAJYZBgiVerGP3bvgtLeYVwv03Y2x5j/nqcRpZSibSjUWwmJ3rouo1M51Ly5i1didwLMgA==
   dependencies:
-    focusable-selectors "^0.4.0"
+    focusable-selectors "^0.8.0"
 
 abab@^2.0.6:
   version "2.0.6"
@@ -1776,33 +1965,20 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8:
     mime-types "~2.1.34"
     negotiator "0.6.3"
 
-acorn-globals@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-7.0.1.tgz#0dbf05c44fa7c94332914c02066d5beff62c40c3"
-  integrity sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==
-  dependencies:
-    acorn "^8.1.0"
-    acorn-walk "^8.0.2"
-
-acorn-import-assertions@^1.7.6:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
-  integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
+acorn-import-assertions@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac"
+  integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==
 
 acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn-walk@^8.0.2:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
-  integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
-
-acorn@^8.1.0, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0, acorn@^8.8.1:
-  version "8.8.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73"
-  integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==
+acorn@^8.7.1, acorn@^8.8.2, acorn@^8.9.0:
+  version "8.9.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.9.0.tgz#78a16e3b2bcc198c10822786fa6679e245db5b59"
+  integrity sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==
 
 agent-base@6:
   version "6.0.2"
@@ -1823,14 +1999,14 @@ ajv-keywords@^3.5.2:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
-ajv-keywords@^5.0.0:
+ajv-keywords@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16"
   integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==
   dependencies:
     fast-deep-equal "^3.1.3"
 
-ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5:
+ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -1840,10 +2016,10 @@ ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^8.0.0, ajv@^8.8.0:
-  version "8.9.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.9.0.tgz#738019146638824dea25edcf299dcba1b0e7eb18"
-  integrity sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==
+ajv@^8.0.0, ajv@^8.9.0:
+  version "8.12.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1"
+  integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
   dependencies:
     fast-deep-equal "^3.1.1"
     json-schema-traverse "^1.0.0"
@@ -1861,14 +2037,14 @@ amd-name-resolver@^1.3.1:
 amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
-  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
+  integrity sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg==
 
 ansi-escapes@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
   integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
 
-ansi-escapes@^4.2.1:
+ansi-escapes@^4.2.1, ansi-escapes@^4.3.2:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
   integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
@@ -1878,33 +2054,23 @@ ansi-escapes@^4.2.1:
 ansi-html@^0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
-  integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4=
-
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
+  integrity sha512-JoAxEa1DfP9m2xfB/y2r/aKcwXNlltr4+0QSBC4TrLfcxyvepX2Pv0t/xpgGV5bGsDzCYV8SzjWgyCW0T9yYbA==
 
 ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.1.tgz#123d6479e92ad45ad897d4054e3c7ca7db4944e1"
+  integrity sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==
 
 ansi-regex@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
-  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed"
+  integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==
 
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
-
 ansi-styles@^3.0.0, ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
@@ -1912,7 +2078,7 @@ ansi-styles@^3.0.0, ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
-ansi-styles@^4.1.0:
+ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
   integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
@@ -1929,7 +2095,7 @@ ansi-to-html@^0.6.15, ansi-to-html@^0.6.6:
 ansicolors@~0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.2.1.tgz#be089599097b74a5c9c4a84a0cdbcdb62bd87aef"
-  integrity sha1-vgiVmQl7dKXJxKhKDNvNtivYeu8=
+  integrity sha512-tOIuy1/SK/dr94ZA0ckDohKXNeBNqZ4us6PjMVLs5h1w2GBB6uPtOknp2+VF4F/zcy9LI70W+Z+pE2Soajky1w==
 
 anymatch@^2.0.0:
   version "2.0.0"
@@ -1939,10 +2105,10 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-anymatch@~3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
-  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
+anymatch@^3.1.1, anymatch@~3.1.2:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
+  integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
   dependencies:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
@@ -1975,7 +2141,7 @@ argparse@^2.0.1:
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
-  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
+  integrity sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==
 
 arr-flatten@^1.1.0:
   version "1.1.0"
@@ -1985,29 +2151,25 @@ arr-flatten@^1.1.0:
 arr-union@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
-  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
+  integrity sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==
+
+array-buffer-byte-length@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz#fabe8bc193fea865f317fe7807085ee0dee5aead"
+  integrity sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==
+  dependencies:
+    call-bind "^1.0.2"
+    is-array-buffer "^3.0.1"
 
 array-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
-  integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=
+  integrity sha512-H3LU5RLiSsGXPhN+Nipar0iR0IofH+8r89G2y1tBKxQ/agagKyAjhkAFDRBfodP2caPrNKHpAWNIM/c9yeL7uA==
 
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
-  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
-
-array-to-error@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/array-to-error/-/array-to-error-1.1.1.tgz#d68812926d14097a205579a667eeaf1856a44c07"
-  integrity sha1-1ogSkm0UCXogVXmmZ+6vGFakTAc=
-  dependencies:
-    array-to-sentence "^1.1.0"
-
-array-to-sentence@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/array-to-sentence/-/array-to-sentence-1.1.0.tgz#c804956dafa53232495b205a9452753a258d39fc"
-  integrity sha1-yASVba+lMjJJWyBalFJ1OiWNOfw=
+  integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==
 
 array-union@^2.1.0:
   version "2.1.0"
@@ -2017,7 +2179,7 @@ array-union@^2.1.0:
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
-  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
+  integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==
 
 assert-never@^1.2.1:
   version "1.2.1"
@@ -2027,7 +2189,7 @@ assert-never@^1.2.1:
 assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
-  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
+  integrity sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==
 
 ast-types@0.13.3:
   version "0.13.3"
@@ -2068,27 +2230,27 @@ async-promise-queue@^1.0.3, async-promise-queue@^1.0.5:
     async "^2.4.1"
     debug "^2.6.8"
 
-async@^2.4.1, async@^2.6.2:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
-  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
+async@^2.4.1, async@^2.6.4:
+  version "2.6.4"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
+  integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==
   dependencies:
     lodash "^4.17.14"
 
 async@~0.1.18:
   version "0.1.22"
   resolved "https://registry.yarnpkg.com/async/-/async-0.1.22.tgz#0fc1aaa088a0e3ef0ebe2d8831bab0dcf8845061"
-  integrity sha1-D8GqoIig4+8Ovi2IMbqw3PiEUGE=
+  integrity sha512-2tEzliJmf5fHNafNwQLJXUasGzQCVctvsNkXmnlELHwypU0p08/rHohYvkqKIjyXpx+0rkrYv6QbhJ+UF4QkBg==
 
 async@~0.2.9:
   version "0.2.10"
   resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
-  integrity sha1-trvgsGdLnXGXCMo43owjfLUmw9E=
+  integrity sha512-eAkdoKxU6/LkKDBzLpT+t6Ff5EtfSF4wx1WfJiPEEV7WNLnDaRXk0oVysiEPm262roaachGexwUv94WhSgN5TQ==
 
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
+  integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
 
 at-least-node@^1.0.0:
   version "1.0.0"
@@ -2105,42 +2267,33 @@ available-typed-arrays@^1.0.5:
   resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
   integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
 
-babel-import-util@^1.1.0, babel-import-util@^1.2.0, babel-import-util@^1.2.2, babel-import-util@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-1.3.0.tgz#dc9251ea39a7747bd586c1c13b8d785a42797f8e"
-  integrity sha512-PPzUT17eAI18zn6ek1R3sB4Krc/MbnmT1MkZQFmyhjoaEGBVwNABhfVU9+EKcDSKrrOm9OIpGhjxukx1GCiy1g==
+babel-import-util@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-0.2.0.tgz#b468bb679919601a3570f9e317536c54f2862e23"
+  integrity sha512-CtWYYHU/MgK88rxMrLfkD356dApswtR/kWZ/c6JifG1m10e7tBBrs/366dFzWMAoqYmG5/JSh+94tUSpIwh+ag==
+
+babel-import-util@^1.1.0, babel-import-util@^1.2.2, babel-import-util@^1.3.0, babel-import-util@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-1.4.1.tgz#1df6fd679845df45494bac9ca12461d49497fdd4"
+  integrity sha512-TNdiTQdPhXlx02pzG//UyVPSKE7SNWjY0n4So/ZnjQpWwaM5LvWBLkWa1JKll5u06HNscHD91XZPuwrMg1kadQ==
 
 babel-loader@^8.0.6:
-  version "8.2.2"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz#9363ce84c10c9a40e6c753748e1441b60c8a0b81"
-  integrity sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.3.0.tgz#124936e841ba4fe8176786d6ff28add1f134d6a8"
+  integrity sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==
   dependencies:
     find-cache-dir "^3.3.1"
-    loader-utils "^1.4.0"
+    loader-utils "^2.0.0"
     make-dir "^3.1.0"
     schema-utils "^2.6.5"
 
-babel-plugin-debug-macros@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.2.0.tgz#0120ac20ce06ccc57bf493b667cf24b85c28da7a"
-  integrity sha512-Wpmw4TbhR3Eq2t3W51eBAQSdKlr+uAyF0GI4GtPfMCD12Y4cIdpKC9l0RjNTH/P9isFypSqqewMPm7//fnZlNA==
+babel-plugin-debug-macros@^0.2.0, babel-plugin-debug-macros@^0.3.4, "babel-plugin-debug-macros@npm:@discourse/babel-plugin-debug-macros@0.4.0-pre1":
+  version "0.4.0-pre1"
+  resolved "https://registry.yarnpkg.com/@discourse/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.4.0-pre1.tgz#f1aa632fcf5d0d673edfba7dc84003acc6b507b3"
+  integrity sha512-faMBuks7QDgwS9Vz+lw60z0CHk5jd0NlLtcxXSIJ13X9Fil5v8k0fOztIF9eYkqKuGHuDoCC2mFQlFNftb1RxA==
   dependencies:
     semver "^5.3.0"
 
-babel-plugin-debug-macros@^0.3.4:
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.3.4.tgz#22961d0cb851a80654cece807a8b4b73d85c6075"
-  integrity sha512-wfel/vb3pXfwIDZUrkoDrn5FHmlWI96PCJ3UCDv2a86poJ3EQrnArNW5KfHSVJ9IOgxHbo748cQt7sDU+0KCEw==
-  dependencies:
-    semver "^5.3.0"
-
-babel-plugin-dynamic-import-node@^2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3"
-  integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==
-  dependencies:
-    object.assign "^4.1.0"
-
 babel-plugin-ember-data-packages-polyfill@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/babel-plugin-ember-data-packages-polyfill/-/babel-plugin-ember-data-packages-polyfill-0.1.2.tgz#21154c095ddc703722b1fb8bb06c126c0b6d77dc"
@@ -2155,17 +2308,7 @@ babel-plugin-ember-modules-api-polyfill@^3.5.0:
   dependencies:
     ember-rfc176-data "^0.3.17"
 
-babel-plugin-ember-template-compilation@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-ember-template-compilation/-/babel-plugin-ember-template-compilation-1.0.2.tgz#e0695b8ad5a8fe6b2cbdff1eadb01cf402731ad6"
-  integrity sha512-4HBMksmlYsWEf/C/n3uW5rkBRbUp4FNaspzdQTAHgLbfCJnkLze8R6i6sUSge48y/Wne7mx+vcImI1o6rlUwXQ==
-  dependencies:
-    babel-import-util "^1.2.0"
-    line-column "^1.0.2"
-    magic-string "^0.26.0"
-    string.prototype.matchall "^4.0.5"
-
-babel-plugin-ember-template-compilation@^2.0.0:
+babel-plugin-ember-template-compilation@2.0.0, babel-plugin-ember-template-compilation@^2.0.0, babel-plugin-ember-template-compilation@^2.0.1:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-ember-template-compilation/-/babel-plugin-ember-template-compilation-2.0.0.tgz#41d895874ba6119dd461f61993c16d1154bf8a57"
   integrity sha512-d+4jaB2ik0rt9TH0K9kOlKJeRBHEb373FgFMcU9ZaJL2zYuVXe19bqy+cWlLpLf1tpOBcBG9QTlFBCoImlOt1g==
@@ -2202,74 +2345,39 @@ babel-plugin-module-resolver@^3.2.0:
     reselect "^3.0.1"
     resolve "^1.4.0"
 
-babel-plugin-module-resolver@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-4.1.0.tgz#22a4f32f7441727ec1fbf4967b863e1e3e9f33e2"
-  integrity sha512-MlX10UDheRr3lb3P0WcaIdtCSRlxdQsB1sBqL7W0raF070bGl1HQQq5K3T2vf2XAYie+ww+5AKC/WrkjRO2knA==
+babel-plugin-polyfill-corejs2@^0.4.3:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.3.tgz#75044d90ba5043a5fb559ac98496f62f3eb668fd"
+  integrity sha512-bM3gHc337Dta490gg+/AseNB9L4YLHxq1nGKZZSHbhXv4aTYU2MD2cjza1Ru4S6975YLTaL1K8uJf6ukJhhmtw==
   dependencies:
-    find-babel-config "^1.2.0"
-    glob "^7.1.6"
-    pkg-up "^3.1.0"
-    reselect "^4.0.0"
-    resolve "^1.13.1"
-
-babel-plugin-polyfill-corejs2@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.0.tgz#686775bf9a5aa757e10520903675e3889caeedc4"
-  integrity sha512-9bNwiR0dS881c5SHnzCmmGlMkJLl0OUZvxrxHo9w/iNoRuqaPjqlvBf4HrovXtQs/au5yKkpcdgfT1cC5PAZwg==
-  dependencies:
-    "@babel/compat-data" "^7.13.11"
-    "@babel/helper-define-polyfill-provider" "^0.2.0"
+    "@babel/compat-data" "^7.17.7"
+    "@babel/helper-define-polyfill-provider" "^0.4.0"
     semver "^6.1.1"
 
-babel-plugin-polyfill-corejs2@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz#440f1b70ccfaabc6b676d196239b138f8a2cfba5"
-  integrity sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==
+babel-plugin-polyfill-corejs3@^0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.1.tgz#39248263c38191f0d226f928d666e6db1b4b3a8a"
+  integrity sha512-ikFrZITKg1xH6pLND8zT14UPgjKHiGLqex7rGEZCH2EvhsneJaJPemmpQaIZV5AL03II+lXylw3UmddDK8RU5Q==
   dependencies:
-    "@babel/compat-data" "^7.13.11"
-    "@babel/helper-define-polyfill-provider" "^0.3.1"
-    semver "^6.1.1"
+    "@babel/helper-define-polyfill-provider" "^0.4.0"
+    core-js-compat "^3.30.1"
 
-babel-plugin-polyfill-corejs3@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.0.tgz#f4b4bb7b19329827df36ff56f6e6d367026cb7a2"
-  integrity sha512-zZyi7p3BCUyzNxLx8KV61zTINkkV65zVkDAFNZmrTCRVhjo1jAS+YLvDJ9Jgd/w2tsAviCwFHReYfxO3Iql8Yg==
+babel-plugin-polyfill-regenerator@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.0.tgz#e7344d88d9ef18a3c47ded99362ae4a757609380"
+  integrity sha512-hDJtKjMLVa7Z+LwnTCxoDLQj6wdc+B8dun7ayF2fYieI6OzfuvcLMB32ihJZ4UhCBwNYGl5bg/x/P9cMdnkc2g==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.2.0"
-    core-js-compat "^3.9.1"
-
-babel-plugin-polyfill-corejs3@^0.5.0:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.1.tgz#d66183bf10976ea677f4149a7fcc4d8df43d4060"
-  integrity sha512-TihqEe4sQcb/QcPJvxe94/9RZuLQuF1+To4WqQcRvc+3J3gLCPIPgDKzGLG6zmQLfH3nn25heRuDNkS2KR4I8A==
-  dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.1"
-    core-js-compat "^3.20.0"
-
-babel-plugin-polyfill-regenerator@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.0.tgz#853f5f5716f4691d98c84f8069c7636ea8da7ab8"
-  integrity sha512-J7vKbCuD2Xi/eEHxquHN14bXAW9CXtecwuLrOIDJtcZzTaPzV1VdEfoUf9AzcRBMolKUQKM9/GVojeh0hFiqMg==
-  dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.2.0"
-
-babel-plugin-polyfill-regenerator@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz#2c0678ea47c75c8cc2fbb1852278d8fb68233990"
-  integrity sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==
-  dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.1"
+    "@babel/helper-define-polyfill-provider" "^0.4.0"
 
 babel-plugin-syntax-dynamic-import@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da"
-  integrity sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=
+  integrity sha512-MioUE+LfjCEz65Wf7Z/Rm4XCP5k2c+TbMd2Z2JKc7U9uwjBhAfNPE48KC4GTGKhppMeYVepwDBNO/nGY6NYHBA==
 
 backbone@^1.1.2:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/backbone/-/backbone-1.4.0.tgz#54db4de9df7c3811c3f032f34749a4cd27f3bd12"
-  integrity sha512-RLmDrRXkVdouTg38jcgHhyQ/2zjg7a8E6sz2zxfz21Hh17xDJYUHBZimVIt5fUyS8vbfpeSmTL3gUjTEvUV3qQ==
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/backbone/-/backbone-1.4.1.tgz#099a78184bc07b034048a8332229c2ccca1e3e62"
+  integrity sha512-ADy1ztN074YkWbHi8ojJVFe3vAanO/lrzMGZWUClIP7oDD/Pjy2vrASraUP+2EVCfIiTtCW4FChVow01XneivA==
   dependencies:
     underscore ">=1.8.3"
 
@@ -2278,6 +2386,11 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
+base64-js@^1.3.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
+
 base64id@2.0.0, base64id@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6"
@@ -2318,10 +2431,19 @@ binary-extensions@^2.0.0:
   resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-2.3.0.tgz#1d269cbf7e6243ea886aa41453c3651ccbe13c22"
   integrity sha512-nAihlQsYGyc5Bwq6+EsubvANYGExeJKHDO3RjnvwU042fawQTQfM3Kxn7IHUXQOz4bzfwsGYYHGSvXyW4zOGLg==
 
+bl@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
+  integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
+  dependencies:
+    buffer "^5.5.0"
+    inherits "^2.0.4"
+    readable-stream "^3.4.0"
+
 blank-object@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/blank-object/-/blank-object-1.0.2.tgz#f990793fbe9a8c8dd013fb3219420bec81d5f4b9"
-  integrity sha1-+ZB5P76ajI3QE/syGUIL7IHV9Lk=
+  integrity sha512-kXQ19Xhoghiyw66CUiGypnuRpWlbHAzY/+NyvqTEdTfhfQGH1/dbEMYiXju7fYKIFePpzp/y9dsu5Cu/PkmawQ==
 
 bluebird@^3.4.6, bluebird@^3.7.2:
   version "3.7.2"
@@ -2349,7 +2471,7 @@ body-parser@1.20.1:
 body@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/body/-/body-5.1.0.tgz#e4ba0ce410a46936323367609ecb4e6553125069"
-  integrity sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=
+  integrity sha512-chUsBxGRtuElD6fmw1gHLpvnKdVLK302peeFa9ZqAEk8TyzZ3fygLyUEDDPTJvL9+Bor0dIwn6ePOsRM2y0zQQ==
   dependencies:
     continuable-cache "^0.3.1"
     error "^7.0.0"
@@ -2361,23 +2483,6 @@ bootstrap@3.4.1:
   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.4.1.tgz#c3a347d419e289ad11f4033e3c4132b87c081d72"
   integrity sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA==
 
-bower-config@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/bower-config/-/bower-config-1.4.3.tgz#3454fecdc5f08e7aa9cc6d556e492be0669689ae"
-  integrity sha512-MVyyUk3d1S7d2cl6YISViwJBc2VXCkxF5AUFykvN0PQj5FsUiMNSgAYTso18oRFfyZ6XEtjrgg9MAaufHbOwNw==
-  dependencies:
-    graceful-fs "^4.1.3"
-    minimist "^0.2.1"
-    mout "^1.0.0"
-    osenv "^0.1.3"
-    untildify "^2.1.0"
-    wordwrap "^0.0.3"
-
-bower-endpoint-parser@0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/bower-endpoint-parser/-/bower-endpoint-parser-0.2.2.tgz#00b565adbfab6f2d35addde977e97962acbcb3f6"
-  integrity sha1-ALVlrb+rby01rd3pd+l5Yqy8s/Y=
-
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -2386,6 +2491,13 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
+brace-expansion@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
+  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
+  dependencies:
+    balanced-match "^1.0.0"
+
 braces@^2.3.1:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
@@ -2402,21 +2514,13 @@ braces@^2.3.1:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-braces@^3.0.1, braces@~3.0.2:
+braces@^3.0.2, braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
   dependencies:
     fill-range "^7.0.1"
 
-broccoli-amd-funnel@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/broccoli-amd-funnel/-/broccoli-amd-funnel-2.0.1.tgz#dbdbfd28841731342d538126567c25bea3f15310"
-  integrity sha512-VRE+0PYAN4jQfkIq3GKRj4U/4UV9rVpLan5ll6fVYV4ziVg4OEfR5GUnILEg++QtR4xSaugRxCPU5XJLDy3bNQ==
-  dependencies:
-    broccoli-plugin "^1.3.0"
-    symlink-or-copy "^1.2.0"
-
 broccoli-asset-rev@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/broccoli-asset-rev/-/broccoli-asset-rev-3.0.0.tgz#65a28c8a062d6ee2cffd91ed2a8309e0f8253ac6"
@@ -2457,7 +2561,7 @@ broccoli-babel-transpiler@^7.8.0:
 broccoli-builder@^0.18.14:
   version "0.18.14"
   resolved "https://registry.yarnpkg.com/broccoli-builder/-/broccoli-builder-0.18.14.tgz#4b79e2f844de11a4e1b816c3f49c6df4776c312d"
-  integrity sha1-S3ni+ETeEaThuBbD9Jxt9HdsMS0=
+  integrity sha512-YoUHeKnPi4xIGZ2XDVN9oHNA9k3xF5f5vlA+1wvrxIIDXqQU97gp2FxVAF503Zxdtt0C5CRB5n+47k2hlkaBzA==
   dependencies:
     broccoli-node-info "^1.1.0"
     heimdalljs "^0.2.0"
@@ -2470,7 +2574,7 @@ broccoli-builder@^0.18.14:
 broccoli-caching-writer@^2.2.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/broccoli-caching-writer/-/broccoli-caching-writer-2.3.1.tgz#b93cf58f9264f003075868db05774f4e7f25bd07"
-  integrity sha1-uTz1j5Jk8AMHWGjbBXdPTn8lvQc=
+  integrity sha512-lfoDx98VaU8tG4mUXCxKdKyw2Lr+iSIGUjCgV83KC2zRC07SzYTGuSsMqpXFiOQlOGuoJxG3NRoyniBa1BWOqA==
   dependencies:
     broccoli-kitchen-sink-helpers "^0.2.5"
     broccoli-plugin "1.1.0"
@@ -2482,7 +2586,7 @@ broccoli-caching-writer@^2.2.0:
 broccoli-caching-writer@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/broccoli-caching-writer/-/broccoli-caching-writer-3.0.3.tgz#0bd2c96a9738d6a6ab590f07ba35c5157d7db476"
-  integrity sha1-C9LJapc41qarWQ8HujXFFX19tHY=
+  integrity sha512-g644Kb5uBPsy+6e2DvO3sOc+/cXZQQNgQt64QQzjA9TSdP0dl5qvetpoNIx4sy/XIjrPYG1smEidq9Z9r61INw==
   dependencies:
     broccoli-kitchen-sink-helpers "^0.3.1"
     broccoli-plugin "^1.2.1"
@@ -2491,16 +2595,6 @@ broccoli-caching-writer@^3.0.3:
     rsvp "^3.0.17"
     walk-sync "^0.3.0"
 
-broccoli-clean-css@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/broccoli-clean-css/-/broccoli-clean-css-1.1.0.tgz#9db143d9af7e0ae79c26e3ac5a9bb2d720ea19fa"
-  integrity sha1-nbFD2a9+CuecJuOsWpuy1yDqGfo=
-  dependencies:
-    broccoli-persistent-filter "^1.1.6"
-    clean-css-promise "^0.1.0"
-    inline-source-map-comment "^1.0.5"
-    json-stable-stringify "^1.0.0"
-
 broccoli-concat@^4.2.4, broccoli-concat@^4.2.5:
   version "4.2.5"
   resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-4.2.5.tgz#d578f00094048b5fc87195e82fbdbde20d838d29"
@@ -2528,7 +2622,7 @@ broccoli-config-loader@^1.0.1:
 broccoli-config-replace@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/broccoli-config-replace/-/broccoli-config-replace-1.1.2.tgz#6ea879d92a5bad634d11329b51fc5f4aafda9c00"
-  integrity sha1-bqh52SpbrWNNETKbUfxfSq/anAA=
+  integrity sha512-qLlEY3V7p3ZWJNRPdPgwIM77iau1qR03S9BupMMFngjzBr7S6RSzcg96HbCYXmW9gfTbjRm9FC4CQT81SBusZg==
   dependencies:
     broccoli-kitchen-sink-helpers "^0.3.1"
     broccoli-plugin "^1.2.0"
@@ -2573,9 +2667,9 @@ broccoli-filter@^1.2.2, broccoli-filter@^1.2.3:
 broccoli-funnel-reducer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/broccoli-funnel-reducer/-/broccoli-funnel-reducer-1.0.0.tgz#11365b2a785aec9b17972a36df87eef24c5cc0ea"
-  integrity sha1-ETZbKnha7JsXlyo234fu8kxcwOo=
+  integrity sha512-SaOCEdh+wnt2jFUV2Qb32m7LXyElvFwW3NKNaEJyi5PGQNwxfqpkc0KI6AbQANKgdj/40U2UC0WuGThFwuEUaA==
 
-broccoli-funnel@^2.0.0, broccoli-funnel@^2.0.1, broccoli-funnel@^2.0.2:
+broccoli-funnel@^2.0.0, broccoli-funnel@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-2.0.2.tgz#0edf629569bc10bd02cc525f74b9a38e71366a75"
   integrity sha512-/vDTqtv7ipjEZQOVqO4vGDVAOZyuYzQ/EgGoyewfOgh1M7IQAToBKZI0oAQPgMBeFPPlIbfMuAngk+ohPBuaHQ==
@@ -2610,7 +2704,7 @@ broccoli-funnel@^3.0.3, broccoli-funnel@^3.0.5, broccoli-funnel@^3.0.6, broccoli
 broccoli-kitchen-sink-helpers@^0.2.5:
   version "0.2.9"
   resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.2.9.tgz#a5e0986ed8d76fb5984b68c3f0450d3a96e36ecc"
-  integrity sha1-peCYbtjXb7WYS2jD8EUNOpbjbsw=
+  integrity sha512-C+oEqivDofZv/h80rgN4WJkbZkbfwkrIeu8vFn4bb4m4jPd3ICNNplhkXGl3ps439pzc2yjZ1qIwz0yy8uHcQg==
   dependencies:
     glob "^5.0.10"
     mkdirp "^0.5.1"
@@ -2618,7 +2712,7 @@ broccoli-kitchen-sink-helpers@^0.2.5:
 broccoli-kitchen-sink-helpers@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.3.1.tgz#77c7c18194b9664163ec4fcee2793444926e0c06"
-  integrity sha1-d8fBgZS5ZkFj7E/O4nk0RJJuDAY=
+  integrity sha512-gqYnKSJxBSjj/uJqeuRAzYVbmjWhG0mOZ8jrp6+fnUIOgLN6MvI7XxBECDHkYMIFPJ8Smf4xaI066Q2FqQDnXg==
   dependencies:
     glob "^5.0.10"
     mkdirp "^0.5.1"
@@ -2657,12 +2751,12 @@ broccoli-node-api@^1.6.0, broccoli-node-api@^1.7.0:
 broccoli-node-info@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/broccoli-node-info/-/broccoli-node-info-1.1.0.tgz#3aa2e31e07e5bdb516dd25214f7c45ba1c459412"
-  integrity sha1-OqLjHgflvbUW3SUhT3xFuhxFlBI=
+  integrity sha512-DUohSZCdfXli/3iN6SmxPbck1OVG8xCkrLx47R25his06xVc1ZmmrOsrThiM8BsCWirwyocODiYJqNP5W2Hg1A==
 
 broccoli-node-info@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/broccoli-node-info/-/broccoli-node-info-2.1.0.tgz#ca84560e8570ff78565bea1699866ddbf58ad644"
-  integrity sha512-l6qDuboJThHfRVVWQVaTs++bFdrFTP0gJXgsWenczc1PavRVUmL1Eyb2swTAXXMpDOnr2zhNOBLx4w9AxkqbPQ==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/broccoli-node-info/-/broccoli-node-info-2.2.0.tgz#feb01c13020792f429e01d7f7845dc5b3a7932b3"
+  integrity sha512-VabSGRpKIzpmC+r+tJueCE5h8k6vON7EIMMWu6d/FyPdtijwLQ7QvzShEw+m3mHoDzUaj/kiZsDYrS8X2adsBg==
 
 broccoli-output-wrapper@^3.2.5:
   version "3.2.5"
@@ -2673,7 +2767,7 @@ broccoli-output-wrapper@^3.2.5:
     heimdalljs-logger "^0.1.10"
     symlink-or-copy "^1.2.0"
 
-broccoli-persistent-filter@^1.1.6, broccoli-persistent-filter@^1.4.3:
+broccoli-persistent-filter@^1.4.3:
   version "1.4.6"
   resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-1.4.6.tgz#80762d19000880a77da33c34373299c0f6a3e615"
   integrity sha512-0RejLwoC95kv4kta8KAa+FmECJCK78Qgm8SRDEK7YyU0N9Cx6KpY3UCDy9WELl3mCXLN8TokNxc7/hp3lL4lfw==
@@ -2713,9 +2807,9 @@ broccoli-persistent-filter@^2.2.1, broccoli-persistent-filter@^2.3.0:
     walk-sync "^1.0.0"
 
 broccoli-persistent-filter@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-3.1.2.tgz#41da6b9577be09a170ecde185f2c5a6099f99c4e"
-  integrity sha512-CbU95RXXVyy+eJV9XTiHUC7NnsY3EvdVrGzp3YgyvO2bzXZFE5/GzDp4X/VQqX+jsk4qyT1HvMOF0sD1DX68TQ==
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-3.1.3.tgz#aca815bf3e3b0247bd0a7b567fdb0d0e08c99cc2"
+  integrity sha512-Q+8iezprZzL9voaBsDY3rQVl7c7H5h+bvv8SpzCZXPZgfBFCbx7KFQ2c3rZR6lW5k4Kwoqt7jG+rZMUg67Gwxw==
   dependencies:
     async-disk-cache "^2.0.0"
     async-promise-queue "^1.0.3"
@@ -2732,7 +2826,7 @@ broccoli-persistent-filter@^3.1.2:
 broccoli-plugin@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-1.1.0.tgz#73e2cfa05f8ea1e3fc1420c40c3d9e7dc724bf02"
-  integrity sha1-c+LPoF+OoeP8FCDEDD2efcckvwI=
+  integrity sha512-dY1QsA20of9wWEto8yhN7JQjpfjySmgeIMsvnQ9aBAv1wEJJCe04B0ekdgq7Bduyx9yWXdoC5CngGy81swmp2w==
   dependencies:
     promise-map-series "^0.2.1"
     quick-temp "^0.1.3"
@@ -2784,7 +2878,7 @@ broccoli-source@^2.1.2:
   resolved "https://registry.yarnpkg.com/broccoli-source/-/broccoli-source-2.1.2.tgz#e9ae834f143b607e9ec114ade66731500c38b90b"
   integrity sha512-1lLayO4wfS0c0Sj50VfHJXNWf94FYY0WUhxj0R77thbs6uWI7USiOWFqQV5dRmhAJnoKaGN4WyLGQbgjgiYFwQ==
 
-broccoli-source@^3.0.0:
+broccoli-source@^3.0.0, broccoli-source@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/broccoli-source/-/broccoli-source-3.0.1.tgz#fd581b2f3877ca1338f724f6ef70acec8c7e1444"
   integrity sha512-ZbGVQjivWi0k220fEeIUioN6Y68xjMy0xiLAc0LdieHI99gw+tafU8w0CggBDYVNsJMKUr006AZaM7gNEwCxEg==
@@ -2794,7 +2888,7 @@ broccoli-source@^3.0.0:
 broccoli-sri-hash@^2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/broccoli-sri-hash/-/broccoli-sri-hash-2.1.2.tgz#bc69905ed7a381ad325cc0d02ded071328ebf3f3"
-  integrity sha1-vGmQXtejga0yXMDQLe0HEyjr8/M=
+  integrity sha512-toLD/v7ut2ajcH8JsdCMG2Bpq2qkwTcKM6CMzVMSAJjaz/KpK69fR+gSqe1dsjh+QTdxG0yVvkq3Sij/XMzV6A==
   dependencies:
     broccoli-caching-writer "^2.2.0"
     mkdirp "^0.5.1"
@@ -2838,7 +2932,7 @@ broccoli-terser-sourcemap@^4.1.0:
     walk-sync "^2.2.0"
     workerpool "^6.0.0"
 
-broccoli@^3.5.1:
+broccoli@^3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/broccoli/-/broccoli-3.5.2.tgz#60921167d57b43fb5bad527420d62fe532595ef4"
   integrity sha512-sWi3b3fTUSVPDsz5KsQ5eCQNVAtLgkIE/HYFkEZXR/07clqmd4E/gFiuwSaqa9b+QTXc1Uemfb7TVWbEIURWDg==
@@ -2871,17 +2965,17 @@ broccoli@^3.5.1:
 browser-split@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/browser-split/-/browser-split-0.0.1.tgz#7b097574f8e3ead606fb4664e64adfdda2981a93"
-  integrity sha1-ewl1dPjj6tYG+0Zk5krf3aKYGpM=
+  integrity sha512-JhvgRb2ihQhsljNda3BI8/UcRHVzrVwo3Q+P8vDtSiyobXuFpuZ9mq+MbRGMnC22CjW3RrfXdg6j6ITX8M+7Ow==
 
-browserslist@^4.14.5, browserslist@^4.19.1, browserslist@^4.21.3:
-  version "4.21.3"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.3.tgz#5df277694eb3c48bc5c4b05af3e8b7e09c5a6d1a"
-  integrity sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==
+browserslist@^4.14.5, browserslist@^4.21.5, browserslist@^4.21.9:
+  version "4.21.9"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.9.tgz#e11bdd3c313d7e2a9e87e8b4b0c7872b13897635"
+  integrity sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==
   dependencies:
-    caniuse-lite "^1.0.30001370"
-    electron-to-chromium "^1.4.202"
-    node-releases "^2.0.6"
-    update-browserslist-db "^1.0.5"
+    caniuse-lite "^1.0.30001503"
+    electron-to-chromium "^1.4.431"
+    node-releases "^2.0.12"
+    update-browserslist-db "^1.0.11"
 
 bser@2.1.1:
   version "2.1.1"
@@ -2895,20 +2989,30 @@ buffer-from@^1.0.0:
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
-builtins@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
-  integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og=
+buffer@^5.5.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
+  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
+  dependencies:
+    base64-js "^1.3.1"
+    ieee754 "^1.1.13"
+
+builtins@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/builtins/-/builtins-5.0.1.tgz#87f6db9ab0458be728564fa81d876d8d74552fa9"
+  integrity sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==
+  dependencies:
+    semver "^7.0.0"
 
 bytes@1:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-1.0.0.tgz#3569ede8ba34315fab99c3e92cb04c7220de1fa8"
-  integrity sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=
+  integrity sha512-/x68VkHLeTl3/Ll8IvxdwzhrT+IyKc52e/oyHhA2RwqPqswSnjVbSddfPRwAsJtbilMAPSRWwAlpxdYsSWOTKQ==
 
 bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
-  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
+  integrity sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==
 
 bytes@3.1.2:
   version "3.1.2"
@@ -2951,21 +3055,21 @@ callsites@^3.0.0, callsites@^3.1.0:
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
 camelize@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.0.tgz#164a5483e630fa4321e5af07020e531831b2609b"
-  integrity sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs=
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.1.tgz#89b7e16884056331a35d6b5ad064332c91daa6c3"
+  integrity sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==
 
 can-symlink@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/can-symlink/-/can-symlink-1.0.0.tgz#97b607d8a84bb6c6e228b902d864ecb594b9d219"
-  integrity sha1-l7YH2KhLtsbiKLkC2GTstZS50hk=
+  integrity sha512-RbsNrFyhwkx+6psk/0fK/Q9orOUr9VMxohGd8vTa4djf4TGLfblBgUfqZChrZuW0Q+mz2eBPFLusw9Jfukzmhg==
   dependencies:
     tmp "0.0.28"
 
-caniuse-lite@^1.0.30001370:
-  version "1.0.30001399"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001399.tgz#1bf994ca375d7f33f8d01ce03b7d5139e8587873"
-  integrity sha512-4vQ90tMKS+FkvuVWS5/QY1+d805ODxZiKFzsU8o/RsVJz49ZSRR8EjykLJbqhzdPgadbX6wB538wOzle3JniRA==
+caniuse-lite@^1.0.30001503:
+  version "1.0.30001509"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001509.tgz#2b7ad5265392d6d2de25cd8776d1ab3899570d14"
+  integrity sha512-2uDDk+TRiTX5hMcUYT/7CSyzMZxjfGu0vAUjS2g0LSD8UoXOv0LtpH4LxGMemsiPq6LCVIUjNwVM0erkOkGCDA==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -2977,23 +3081,12 @@ capture-exit@^2.0.0:
 cardinal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-1.0.0.tgz#50e21c1b0aa37729f9377def196b5a9cec932ee9"
-  integrity sha1-UOIcGwqjdyn5N33vGWtanOyTLuk=
+  integrity sha512-INsuF4GyiFLk8C91FPokbKTc/rwHqV4JnfatVZ6GPhguP1qmkRWX2dp5tepYboYdPpGWisLVLI+KsXoXFPRSMg==
   dependencies:
     ansicolors "~0.2.1"
     redeyed "~1.0.0"
 
-chalk@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2:
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -3002,7 +3095,7 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1:
+chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -3010,6 +3103,11 @@ chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
+chalk@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.2.0.tgz#249623b7d66869c673699fb66d65723e54dfcfb3"
+  integrity sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==
+
 chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
@@ -3018,7 +3116,7 @@ chardet@^0.7.0:
 charm@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/charm/-/charm-1.0.2.tgz#8add367153a6d9a581331052c4090991da995e35"
-  integrity sha1-it02cVOm2aWBMxBSxAkJkdqZXjU=
+  integrity sha512-wqW3VdPnlSWT4eRiYX+hcs+C6ViBPUWk1qTCd+37qw9kEm/a5n2qcyQDMBWvSYKN/ctqZzeXNQaeBjOetJJUkw==
   dependencies:
     inherits "^2.0.1"
 
@@ -3042,10 +3140,10 @@ chrome-trace-event@^1.0.2:
   resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
   integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==
 
-ci-info@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
-  integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
+ci-info@^3.7.0:
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91"
+  integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==
 
 class-utils@^0.3.5:
   version "0.3.6"
@@ -3060,24 +3158,7 @@ class-utils@^0.3.5:
 clean-base-url@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/clean-base-url/-/clean-base-url-1.0.0.tgz#c901cf0a20b972435b0eccd52d056824a4351b7b"
-  integrity sha1-yQHPCiC5ckNbDszVLQVoJKQ1G3s=
-
-clean-css-promise@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/clean-css-promise/-/clean-css-promise-0.1.1.tgz#43f3d2c8dfcb2bf071481252cd9b76433c08eecb"
-  integrity sha1-Q/PSyN/LK/BxSBJSzZt2QzwI7ss=
-  dependencies:
-    array-to-error "^1.0.0"
-    clean-css "^3.4.5"
-    pinkie-promise "^2.0.0"
-
-clean-css@^3.4.5:
-  version "3.4.28"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.28.tgz#bf1945e82fc808f55695e6ddeaec01400efd03ff"
-  integrity sha1-vxlF6C/ICPVWlebd6uwBQA79A/8=
-  dependencies:
-    commander "2.8.x"
-    source-map "0.4.x"
+  integrity sha512-9q6ZvUAhbKOSRFY7A/irCQ/rF0KIpa3uXpx6izm8+fp7b2H4hLeUJ+F1YYk9+gDQ/X8Q0MEyYs+tG3cht//HTg==
 
 clean-stack@^2.2.0:
   version "2.2.0"
@@ -3092,7 +3173,7 @@ clean-up-path@^1.0.0:
 cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
-  integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
+  integrity sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw==
   dependencies:
     restore-cursor "^2.0.0"
 
@@ -3103,25 +3184,24 @@ cli-cursor@^3.1.0:
   dependencies:
     restore-cursor "^3.1.0"
 
-cli-spinners@^2.0.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.0.tgz#36c7dc98fb6a9a76bd6238ec3f77e2425627e939"
-  integrity sha512-t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q==
+cli-spinners@^2.0.0, cli-spinners@^2.5.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.9.0.tgz#5881d0ad96381e117bbe07ad91f2008fe6ffd8db"
+  integrity sha512-4/aL9X3Wh0yiMQlE+eeRhWP6vclO3QRtw1JHKIT0FFUs5FjpFmESqtMvYZ0+lbzBw900b95mS0hohy+qn2VK/g==
 
 cli-table3@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.0.tgz#b7b1bc65ca8e7b5cef9124e13dc2b21e2ce4faee"
-  integrity sha512-gnB85c3MGC7Nm9I/FkiasNBOKjOiO1RNuXXarQms37q4QMpWdlbBgD/VnOStA2faG1dpXMv31RFApjX1/QdgWQ==
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.3.tgz#61ab765aac156b52f222954ffc607a6f01dbeeb2"
+  integrity sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==
   dependencies:
-    object-assign "^4.1.0"
     string-width "^4.2.0"
   optionalDependencies:
-    colors "^1.1.2"
+    "@colors/colors" "1.5.0"
 
 cli-table@^0.3.1:
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.6.tgz#e9d6aa859c7fe636981fd3787378c2a20bce92fc"
-  integrity sha512-ZkNZbnZjKERTY5NwC2SeMeLeifSPq/pubeRoTpdr3WchLlnZg6hEgvHkK5zL7KNFdd9PmHN8lxrENUwI3cE8vQ==
+  version "0.3.11"
+  resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.11.tgz#ac69cdecbe81dccdba4889b9a18b7da312a9d3ee"
+  integrity sha512-IqLQi4lO0nIB4tcdTpN4LCB9FI3uqrJZK7RC515EnhZ6qBaglkIgICb1wjeAqpdoOabm1+SuQtkXIPdYC93jhQ==
   dependencies:
     colors "1.0.3"
 
@@ -3135,25 +3215,30 @@ cli-width@^3.0.0:
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
   integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
 
+cli-width@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-4.0.0.tgz#a5622f6a3b0a9e3e711a25f099bf2399f608caf6"
+  integrity sha512-ZksGS2xpa/bYkNzN3BAw1wEjsLV/ZKOf/CCrJ/QOBsxx6fOARIkwTutxp1XIOIohi6HKmOFjMoK/XaqDVUpEEw==
+
 clone@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
-  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
+  integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==
 
 clone@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
-  integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
+  integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==
 
 coffee-script@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.2.0.tgz#b5e61e55f1ca8c4a9eb87d53aa0657ea43125b91"
-  integrity sha1-teYeVfHKjEqeuH1TqgZX6kMSW5E=
+  integrity sha512-vHxLlDOeI7/S+R/fr28ZjAhL3g+qcI+YbN0/S3N3yZa2aTh65XwFfbkeje+R3uSu1yQgXW2NvrzYJ7nznvRQaQ==
 
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
-  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
+  integrity sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==
   dependencies:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
@@ -3175,7 +3260,7 @@ color-convert@^2.0.1:
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
 color-name@~1.1.4:
   version "1.1.4"
@@ -3190,12 +3275,7 @@ color-support@^1.1.3:
 colors@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
-  integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=
-
-colors@^1.1.2:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
-  integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
+  integrity sha512-pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw==
 
 combined-stream@^1.0.8:
   version "1.0.8"
@@ -3204,13 +3284,6 @@ combined-stream@^1.0.8:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2.8.x:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
-  integrity sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=
-  dependencies:
-    graceful-readlink ">= 1.0.0"
-
 commander@7.2.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
@@ -3227,14 +3300,14 @@ commander@^4.1.1:
   integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
 
 common-tags@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
-  integrity sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6"
+  integrity sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==
 
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
+  integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==
 
 component-emitter@^1.2.1:
   version "1.3.0"
@@ -3264,7 +3337,7 @@ compression@^1.7.4:
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
 configstore@^5.0.1:
   version "5.0.1"
@@ -3291,7 +3364,7 @@ connect@^3.6.6:
 console-control-strings@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
+  integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
 
 console-ui@^3.0.4, console-ui@^3.1.2:
   version "3.1.2"
@@ -3319,26 +3392,24 @@ content-disposition@0.5.4:
     safe-buffer "5.2.1"
 
 content-type@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
-  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
+  integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
 
 continuable-cache@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/continuable-cache/-/continuable-cache-0.3.1.tgz#bd727a7faed77e71ff3985ac93351a912733ad0f"
-  integrity sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=
+  integrity sha512-TF30kpKhTH8AGCG3dut0rdd/19B7Z+qCnrMoBLpyQu/2drZdNrrpcjPEoJeSVsQM+8KmWG5O56oPDjSSUsuTyA==
 
 convert-source-map@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
-  integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
-  dependencies:
-    safe-buffer "~5.1.1"
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
+  integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
 
 cookie-signature@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
-  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
+  integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
 
 cookie@0.5.0:
   version "0.5.0"
@@ -3353,20 +3424,19 @@ cookie@~0.4.1:
 copy-dereference@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/copy-dereference/-/copy-dereference-1.0.0.tgz#6b131865420fd81b413ba994b44d3655311152b6"
-  integrity sha1-axMYZUIP2BtBO6mUtE02VTERUrY=
+  integrity sha512-40TSLuhhbiKeszZhK9LfNdazC67Ue4kq/gGwN5sdxEUWPXTIMmKmGmgD9mPfNKVAeecEW+NfEIpBaZoACCQLLw==
 
 copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
-  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
+  integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==
 
-core-js-compat@^3.20.0, core-js-compat@^3.20.2, core-js-compat@^3.9.1:
-  version "3.20.3"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.20.3.tgz#d71f85f94eb5e4bea3407412e549daa083d23bd6"
-  integrity sha512-c8M5h0IkNZ+I92QhIpuSijOxGAcj3lgpsWdkCqmUTZNwidujF4r3pi6x1DCN+Vcs5qTS2XWWMfWSuCqyupX8gw==
+core-js-compat@^3.30.1, core-js-compat@^3.30.2:
+  version "3.31.0"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.31.0.tgz#4030847c0766cc0e803dcdfb30055d7ef2064bf1"
+  integrity sha512-hM7YCu1cU6Opx7MXNu0NuumM0ezNeAeRKadixyiQELWY3vT3De9S4J5ZBMraWV2vZnrE1Cirl0GtFtDtMUXzPw==
   dependencies:
-    browserslist "^4.19.1"
-    semver "7.0.0"
+    browserslist "^4.21.5"
 
 core-js@^2.6.5:
   version "2.6.12"
@@ -3381,9 +3451,9 @@ core-object@^3.1.5:
     chalk "^2.0.0"
 
 core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
+  integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
 cors@~2.8.5:
   version "2.8.5"
@@ -3442,43 +3512,33 @@ cssesc@^3.0.0:
 cssfilter@0.0.10:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/cssfilter/-/cssfilter-0.0.10.tgz#c6d2672632a2e5c83e013e6864a42ce8defd20ae"
-  integrity sha1-xtJnJjKi5cg+AT5oZKQs6N79IK4=
+  integrity sha512-FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw==
 
-cssom@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.5.0.tgz#d254fa92cd8b6fbd83811b9fbaed34663cc17c36"
-  integrity sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==
-
-cssom@~0.3.6:
-  version "0.3.8"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
-  integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
-
-cssstyle@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852"
-  integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==
+cssstyle@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-3.0.0.tgz#17ca9c87d26eac764bb8cfd00583cff21ce0277a"
+  integrity sha512-N4u2ABATi3Qplzf0hWbVCdjenim8F3ojEXpBDF5hBpjzW182MjNGLqfmQ0SkSPeQ+V86ZXgeH8aXj6kayd4jgg==
   dependencies:
-    cssom "~0.3.6"
+    rrweb-cssom "^0.6.0"
 
 dag-map@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/dag-map/-/dag-map-2.0.2.tgz#9714b472de82a1843de2fba9b6876938cab44c68"
-  integrity sha1-lxS0ct6CoYQ94vuptodpOMq0TGg=
+  integrity sha512-xnsprIzYuDeiyu5zSKwilV/ajRHxnoMlAhEREfyfTgTSViMVY2fGP1ZcHJbtwup26oCkofySU/m6oKJ3HrkW7w==
 
 data-uri-to-buffer@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.0.tgz#b5db46aea50f6176428ac05b73be39a57701a64b"
-  integrity sha512-Vr3mLBA8qWmcuschSLAOogKgQ/Jwxulv3RNE4FXnYWRGujzrRWQI4m12fQqRkwX06C0KanhLr4hK+GydchZsaA==
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz#d8feb2b2881e6a4f58c2e08acfd0e2834e26222e"
+  integrity sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==
 
-data-urls@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-3.0.2.tgz#9cf24a477ae22bcef5cd5f6f0bfbc1d2d3be9143"
-  integrity sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==
+data-urls@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-4.0.0.tgz#333a454eca6f9a5b7b0f1013ff89074c3f522dd4"
+  integrity sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g==
   dependencies:
     abab "^2.0.6"
     whatwg-mimetype "^3.0.0"
-    whatwg-url "^11.0.0"
+    whatwg-url "^12.0.0"
 
 debug@2.6.9, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8:
   version "2.6.9"
@@ -3494,58 +3554,59 @@ debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.1, d
   dependencies:
     ms "2.1.2"
 
-debug@^3.0.1, debug@^3.1.0, debug@^3.1.1:
+debug@^3.1.0, debug@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
   integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
   dependencies:
     ms "^2.1.1"
 
-decimal.js@^10.4.2:
-  version "10.4.2"
-  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.2.tgz#0341651d1d997d86065a2ce3a441fbd0d8e8b98e"
-  integrity sha512-ic1yEvwT6GuvaYwBLLY6/aFFgjZdySKTE8en/fkU3QICTmRtgtSlFn0u0BXN06InZwtfCelR7j8LRiDI/02iGA==
+decimal.js@^10.4.3:
+  version "10.4.3"
+  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23"
+  integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==
 
 decode-uri-component@^0.2.0:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
   integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
 
-deep-is@^0.1.3, deep-is@~0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
-  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
+deep-is@^0.1.3:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
+  integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
-deepmerge@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
-  integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
+deepmerge@^4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
+  integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
 
 defaults@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
-  integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.4.tgz#b0b02062c1e2aa62ff5d9528f0f98baa90978d7a"
+  integrity sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==
   dependencies:
     clone "^1.0.2"
 
-define-properties@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
-  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
+define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5"
+  integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==
   dependencies:
-    object-keys "^1.0.12"
+    has-property-descriptors "^1.0.0"
+    object-keys "^1.1.1"
 
 define-property@^0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
-  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
+  integrity sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==
   dependencies:
     is-descriptor "^0.1.0"
 
 define-property@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
-  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
+  integrity sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==
   dependencies:
     is-descriptor "^1.0.0"
 
@@ -3560,12 +3621,12 @@ define-property@^2.0.2:
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
+  integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
 
 delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
+  integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==
 
 depd@2.0.0, depd@~2.0.0:
   version "2.0.0"
@@ -3575,7 +3636,7 @@ depd@2.0.0, depd@~2.0.0:
 depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
+  integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
 
 destroy@1.2.0:
   version "1.2.0"
@@ -3585,22 +3646,22 @@ destroy@1.2.0:
 detect-file@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
-  integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
+  integrity sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==
 
 detect-indent@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.0.0.tgz#0abd0f549f69fc6659a254fe96786186b6f528fd"
-  integrity sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA==
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.1.0.tgz#592485ebbbf6b3b1ab2be175c8393d04ca0d57e6"
+  integrity sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==
 
 detect-newline@3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
   integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
 
-diff@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b"
-  integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==
+diff@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-5.1.0.tgz#bc52d298c5ea8df9194800224445ed43ffc87e40"
+  integrity sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==
 
 dir-glob@^3.0.1:
   version "3.0.1"
@@ -3651,27 +3712,27 @@ editions@^2.2.0:
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
-  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
+  integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
-electron-to-chromium@^1.4.202:
-  version "1.4.250"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.250.tgz#e4535fc00d17b9a719bc688352c4a185acc2a347"
-  integrity sha512-KDLKcPEKPK+Q3/LdKX6knDzqyh8B82EaHccTYuGJR2qp1ymyGAo5HMH2x2OwDgzOPHlINSLIIeVhlFdq6aJgNA==
+electron-to-chromium@^1.4.431:
+  version "1.4.445"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.445.tgz#058d2c5f3a2981ab1a37440f5a5e42d15672aa6d"
+  integrity sha512-++DB+9VK8SBJwC+X1zlMfJ1tMA3F0ipi39GdEp+x3cV2TyBihqAgad8cNMWtLDEkbH39nlDQP7PfGrDr3Dr7HA==
 
-ember-auto-import-chunks-json-generator@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/ember-auto-import-chunks-json-generator/-/ember-auto-import-chunks-json-generator-1.0.0.tgz#c2ca9380854f3cfefc67e3a1bd7f7c7a124f45ec"
-  integrity sha512-4itBcVrK/oAjbS8rycgRFS/f07rGtRgliHQU4BLXGKFm5qPrB6D75H76yCY/tE9+R+yIBV8cfdkVhJcPR1jtwQ==
+ember-auto-import-chunks-json-generator@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/ember-auto-import-chunks-json-generator/-/ember-auto-import-chunks-json-generator-1.1.0.tgz#9b3ee4b6e2f274fdbf722762fc9d72f13942a594"
+  integrity sha512-50JvuBVD5mLx+9YMcBLlV8HIVdtdHHzEfVwID8jo8yRo83x5SAKULdSH+ZwwNTYcUNI7amMKDl9RA5LBGzbDWA==
   dependencies:
     broccoli-merge-trees "^4.2.0"
     broccoli-plugin "^4.0.7"
-    ember-cli-babel "^7.26.6"
-    ember-cli-htmlbars "^5.7.1"
+    ember-cli-babel "^7.26.11"
+    ember-cli-htmlbars "^6.1.1"
 
-ember-auto-import@^2.2.3, ember-auto-import@^2.4.3, ember-auto-import@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.5.0.tgz#627607648e87d154f75cd3f70c435355ef7cced9"
-  integrity sha512-fKERUmpZLn4RJiCwTjS7D5zJxgnbF4E6GiSp1GYh53K96S+5UBs06r7ScDI52rq34z0+qdSrA6qiDJ3i/lWqKg==
+ember-auto-import@^2.2.3, ember-auto-import@^2.6.0, ember-auto-import@^2.6.3:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.6.3.tgz#f18d1b93dd10b08ba5496518436f9d56dd4e000a"
+  integrity sha512-uLhrRDJYWCRvQ4JQ1e64XlSrqAKSd6PXaJ9ZsZI6Tlms9T4DtQFxNXasqji2ZRJBVrxEoLCRYX3RTldsQ0vNGQ==
   dependencies:
     "@babel/core" "^7.16.7"
     "@babel/plugin-proposal-class-properties" "^7.16.7"
@@ -3681,6 +3742,7 @@ ember-auto-import@^2.2.3, ember-auto-import@^2.4.3, ember-auto-import@^2.5.0:
     "@embroider/shared-internals" "^2.0.0"
     babel-loader "^8.0.6"
     babel-plugin-ember-modules-api-polyfill "^3.5.0"
+    babel-plugin-ember-template-compilation "^2.0.1"
     babel-plugin-htmlbars-inline-precompile "^5.2.1"
     babel-plugin-syntax-dynamic-import "^6.18.0"
     broccoli-debug "^0.6.4"
@@ -3722,10 +3784,10 @@ ember-cache-primitive-polyfill@^1.0.1:
     ember-compatibility-helpers "^1.2.1"
     silent-error "^1.1.1"
 
-ember-cached-decorator-polyfill@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ember-cached-decorator-polyfill/-/ember-cached-decorator-polyfill-1.0.1.tgz#320abc0fe45338ee7c54777e32353023c48775c5"
-  integrity sha512-VDgrpIJ6rDDHIfkYrsFR1BM3fpcC0+zFWIOsX0qY44zPrIXjhQWVXs2iVXLIPHprSgf+tFQ3ESxwDscpeRe/0A==
+ember-cached-decorator-polyfill@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/ember-cached-decorator-polyfill/-/ember-cached-decorator-polyfill-1.0.2.tgz#26445056ebee3776c340e28652ce59be73dd3958"
+  integrity sha512-hUX6OYTKltAPAu8vsVZK02BfMTV0OUXrPqvRahYPhgS7D0I6joLjlskd7mhqJMcaXLywqceIy8/s+x8bxF8bpQ==
   dependencies:
     "@embroider/macros" "^1.8.3"
     "@glimmer/tracking" "^1.1.2"
@@ -3734,12 +3796,12 @@ ember-cached-decorator-polyfill@^1.0.1:
     ember-cli-babel "^7.26.11"
     ember-cli-babel-plugin-helpers "^1.1.1"
 
-ember-cli-app-version@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-app-version/-/ember-cli-app-version-5.0.0.tgz#adad17c6f706f419b223707eec66dd1cd28530c3"
-  integrity sha512-afhx/CXDOMNXzoe4NDPy5WUfxWmYYHUzMCiTyvPBxCDBXYcMrtxNWxvgaSaeqcoHVEmqzeyBj8V82tzmT1dcyw==
+ember-cli-app-version@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-app-version/-/ember-cli-app-version-6.0.1.tgz#401cdd440c7fef2059aa54bbadae9ca581d4faa0"
+  integrity sha512-XA1FwkWA5QytmWF0jcJqEr3jcZoiCl9Fb33TZgOVfClL7Voxe+/RwzISEprBRQgbf7j8z1xf8/RJCKfclUy3rQ==
   dependencies:
-    ember-cli-babel "^7.23.1"
+    ember-cli-babel "^7.26.11"
     git-repo-info "^2.1.1"
 
 ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.1:
@@ -3747,7 +3809,7 @@ ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.1:
   resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879"
   integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw==
 
-ember-cli-babel@^7.10.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.21.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.10, ember-cli-babel@^7.26.11, ember-cli-babel@^7.26.3, ember-cli-babel@^7.26.4, ember-cli-babel@^7.26.6, ember-cli-babel@^7.7.3:
+ember-cli-babel@^7.1.3, ember-cli-babel@^7.10.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.21.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.26.10, ember-cli-babel@^7.26.11, ember-cli-babel@^7.26.3, ember-cli-babel@^7.26.4, ember-cli-babel@^7.26.6, ember-cli-babel@^7.7.3:
   version "7.26.11"
   resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.11.tgz#50da0fe4dcd99aada499843940fec75076249a9f"
   integrity sha512-JJYeYjiz/JTn34q7F5DSOjkkZqy8qwFOOxXfE6pe9yEJqWGu4qErKxlz8I22JoVEQ/aBUO+OcKTpmctvykM9YA==
@@ -3783,17 +3845,6 @@ ember-cli-babel@^7.10.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember
     rimraf "^3.0.1"
     semver "^5.5.0"
 
-ember-cli-dependency-checker@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/ember-cli-dependency-checker/-/ember-cli-dependency-checker-3.3.1.tgz#16b44d7a1a1e946f59859fad97f32e616d78323a"
-  integrity sha512-Tg6OeijjXNKWkDm6057Tr0N9j9Vlz/ITewXWpn1A/+Wbt3EowBx5ZKfvoupqz05EznKgL1B/ecG0t+JN7Qm6MA==
-  dependencies:
-    chalk "^2.3.0"
-    find-yarn-workspace-root "^1.1.0"
-    is-git-url "^1.0.0"
-    resolve "^1.5.0"
-    semver "^5.3.0"
-
 ember-cli-deprecation-workflow@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/ember-cli-deprecation-workflow/-/ember-cli-deprecation-workflow-2.1.0.tgz#f0d38ece7ac0ab7b3f83790a3a092e3472f58cff"
@@ -3807,7 +3858,7 @@ ember-cli-deprecation-workflow@^2.1.0:
 ember-cli-get-component-path-option@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ember-cli-get-component-path-option/-/ember-cli-get-component-path-option-1.0.0.tgz#0d7b595559e2f9050abed804f1d8eff1b08bc771"
-  integrity sha1-DXtZVVni+QUKvtgE8djv8bCLx3E=
+  integrity sha512-k47TDwcJ2zPideBCZE8sCiShSxQSpebY2BHcX2DdipMmBox5gsfyVrbKJWIHeSTTKyEUgmBIvQkqTOozEziCZA==
 
 ember-cli-htmlbars@^5.3.2, ember-cli-htmlbars@^5.7.1:
   version "5.7.2"
@@ -3831,13 +3882,13 @@ ember-cli-htmlbars@^5.3.2, ember-cli-htmlbars@^5.7.1:
     strip-bom "^4.0.0"
     walk-sync "^2.2.0"
 
-ember-cli-htmlbars@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-6.1.1.tgz#f5b588572a5d18ad087560122b8dabc90145173d"
-  integrity sha512-DKf2rjzIVw9zWCuFsBGJScrgf5Mz7dSg08Cq+FWFYIxnpssINUbNUoB0NHWnUJK4QqCvaExOyOmjm0kO455CPg==
+ember-cli-htmlbars@^6.1.1, ember-cli-htmlbars@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-6.2.0.tgz#18ec48ee1c93f9eed862a64eb24a9d14604f1dfc"
+  integrity sha512-j5EGixjGau23HrqRiW/JjoAovg5UBHfjbyN7wX5ekE90knIEqUUj1z/Mo/cTx/J2VepQ2lE6HdXW9LWQ/WdMtw==
   dependencies:
     "@ember/edition-utils" "^1.2.0"
-    babel-plugin-ember-template-compilation "^1.0.0"
+    babel-plugin-ember-template-compilation "^2.0.0"
     babel-plugin-htmlbars-inline-precompile "^5.3.0"
     broccoli-debug "^0.6.5"
     broccoli-persistent-filter "^3.1.2"
@@ -3862,46 +3913,44 @@ ember-cli-inject-live-reload@^2.1.0:
 ember-cli-is-package-missing@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ember-cli-is-package-missing/-/ember-cli-is-package-missing-1.0.0.tgz#6e6184cafb92635dd93ca6c946b104292d4e3390"
-  integrity sha1-bmGEyvuSY13ZPKbJRrEEKS1OM5A=
+  integrity sha512-9hEoZj6Au5onlSDdcoBqYEPT8ehlYntZPxH8pBKV0GO7LNel88otSAQsCfXvbi2eKE+MaSeLG/gNaCI5UdWm9g==
 
 ember-cli-lodash-subset@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/ember-cli-lodash-subset/-/ember-cli-lodash-subset-2.0.1.tgz#20cb68a790fe0fde2488ddfd8efbb7df6fe766f2"
-  integrity sha1-IMtop5D+D94kiN39jvu332/nZvI=
+  integrity sha512-QkLGcYv1WRK35g4MWu/uIeJ5Suk2eJXKtZ+8s+qE7C9INmpCPyPxzaqZABquYzcWNzIdw6kYwz3NWAFdKYFxwg==
 
 ember-cli-normalize-entity-name@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ember-cli-normalize-entity-name/-/ember-cli-normalize-entity-name-1.0.0.tgz#0b14f7bcbc599aa117b5fddc81e4fd03c4bad5b7"
-  integrity sha1-CxT3vLxZmqEXtf3cgeT9A8S61bc=
+  integrity sha512-rF4P1rW2P1gVX1ynZYPmuIf7TnAFDiJmIUFI1Xz16VYykUAyiOCme0Y22LeZq8rTzwBMiwBwoE3RO4GYWehXZA==
   dependencies:
     silent-error "^1.0.0"
 
 ember-cli-path-utils@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ember-cli-path-utils/-/ember-cli-path-utils-1.0.0.tgz#4e39af8b55301cddc5017739b77a804fba2071ed"
-  integrity sha1-Tjmvi1UwHN3FAXc5t3qAT7ogce0=
+  integrity sha512-Qq0vvquzf4cFHoDZavzkOy3Izc893r/5spspWgyzLCPTaG78fM3HsrjZm7UWEltbXUqwHHYrqZd/R0jS08NqSA==
 
-ember-cli-preprocess-registry@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-preprocess-registry/-/ember-cli-preprocess-registry-3.3.0.tgz#685837a314fbe57224bd54b189f4b9c23907a2de"
-  integrity sha512-60GYpw7VPeB7TvzTLZTuLTlHdOXvayxjAQ+IxM2T04Xkfyu75O2ItbWlftQW7NZVGkaCsXSRAmn22PG03VpLMA==
+ember-cli-preprocess-registry@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-preprocess-registry/-/ember-cli-preprocess-registry-5.0.1.tgz#d08e549360b7d2a3985384bddfd56cf8545665e9"
+  integrity sha512-Jb2zbE5Kfe56Nf4IpdaQ10zZ72p/RyLdgE5j5/lKG3I94QHlq+7AkAd18nPpb5OUeRUT13yQTAYpU+MbjpKTtg==
   dependencies:
-    broccoli-clean-css "^1.1.0"
-    broccoli-funnel "^2.0.1"
-    debug "^3.0.1"
-    process-relative-require "^1.0.0"
+    broccoli-funnel "^3.0.8"
+    debug "^4.3.2"
 
 ember-cli-sri@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ember-cli-sri/-/ember-cli-sri-2.1.1.tgz#971620934a4b9183cf7923cc03e178b83aa907fd"
-  integrity sha1-lxYgk0pLkYPPeSPMA+F4uDqpB/0=
+  integrity sha512-YG/lojDxkur9Bnskt7xB6gUOtJ6aPl/+JyGYm9HNDk3GECVHB3SMN3rlGhDKHa1ndS5NK2W2TSLb9bzRbGlMdg==
   dependencies:
     broccoli-sri-hash "^2.1.0"
 
 ember-cli-string-utils@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/ember-cli-string-utils/-/ember-cli-string-utils-1.1.0.tgz#39b677fc2805f55173735376fcef278eaa4452a1"
-  integrity sha1-ObZ3/CgF9VFzc1N2/O8njqpEUqE=
+  integrity sha512-PlJt4fUDyBrC/0X+4cOpaGCiMawaaB//qD85AXmDRikxhxVzfVdpuoec02HSiTGTTB85qCIzWBIh8lDOiMyyFg==
 
 ember-cli-terser@^4.0.2:
   version "4.0.2"
@@ -3952,10 +4001,26 @@ ember-cli-typescript@^2.0.2:
     stagehand "^1.0.0"
     walk-sync "^1.0.0"
 
+ember-cli-typescript@^4.1.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-4.2.1.tgz#54d08fc90318cc986f3ea562f93ce58a6cc4c24d"
+  integrity sha512-0iKTZ+/wH6UB/VTWKvGuXlmwiE8HSIGcxHamwNhEC5x1mN3z8RfvsFZdQWYUzIWFN2Tek0gmepGRPTwWdBYl/A==
+  dependencies:
+    ansi-to-html "^0.6.15"
+    broccoli-stew "^3.0.0"
+    debug "^4.0.0"
+    execa "^4.0.0"
+    fs-extra "^9.0.1"
+    resolve "^1.5.0"
+    rsvp "^4.8.1"
+    semver "^7.3.2"
+    stagehand "^1.0.0"
+    walk-sync "^2.2.0"
+
 ember-cli-typescript@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-5.1.0.tgz#460eb848564e29d64f2b36b2a75bbe98172b72a4"
-  integrity sha512-wEZfJPkjqFEZAxOYkiXsDrJ1HY75e/6FoGhQFg8oNFJeGYpIS/3W0tgyl1aRkSEEN1NRlWocDubJ4aZikT+RTA==
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-5.2.1.tgz#553030f1ce3e8958b8e4fc34909acd1218cb35f2"
+  integrity sha512-qqp5TAIuPHxHiGXJKL+78Euyhy0zSKQMovPh8sJpN/ZBYx0H90pONufHR3anaMcp1snVfx4B+mb9+7ijOik8ZA==
   dependencies:
     ansi-to-html "^0.6.15"
     broccoli-stew "^3.0.0"
@@ -4002,101 +4067,96 @@ ember-cli-version-checker@^5.1.1, ember-cli-version-checker@^5.1.2:
     semver "^7.3.4"
     silent-error "^1.1.1"
 
-ember-cli@~3.28.5:
-  version "3.28.5"
-  resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.28.5.tgz#9c91266e412f6d537b47a88e4b63a2b56db35483"
-  integrity sha512-Y/UdbUOTeKHGMCP3XtE5g14JUTYyeQTdjPvHuv11FFx5HQBtHqqWLY6U1ivMDukDkQ4i2v6TyaUcKVo4e8PtyQ==
+ember-cli@~5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-5.0.0.tgz#9a42aea5699c9c34b262dfca614c4f15fb8ef0f5"
+  integrity sha512-poklpwf+GrDhkFRTYvYmpkSA5R0pNy4Vahxjvji5jUl82tot+J95ZY1QH1yx//QzQ7zb1XlcOnceieyd2j1Rbw==
   dependencies:
-    "@babel/core" "^7.13.8"
-    "@babel/plugin-transform-modules-amd" "^7.12.1"
-    amd-name-resolver "^1.3.1"
-    babel-plugin-module-resolver "^4.1.0"
-    bower-config "^1.4.3"
-    bower-endpoint-parser "0.2.2"
-    broccoli "^3.5.1"
-    broccoli-amd-funnel "^2.0.1"
-    broccoli-babel-transpiler "^7.8.0"
+    "@babel/core" "^7.21.4"
+    broccoli "^3.5.2"
     broccoli-builder "^0.18.14"
     broccoli-concat "^4.2.5"
     broccoli-config-loader "^1.0.1"
     broccoli-config-replace "^1.1.2"
     broccoli-debug "^0.6.5"
-    broccoli-funnel "^3.0.5"
+    broccoli-funnel "^3.0.8"
     broccoli-funnel-reducer "^1.0.0"
-    broccoli-merge-trees "^3.0.2"
+    broccoli-merge-trees "^4.2.0"
     broccoli-middleware "^2.1.1"
     broccoli-slow-trees "^3.1.0"
-    broccoli-source "^3.0.0"
+    broccoli-source "^3.0.1"
     broccoli-stew "^3.0.0"
     calculate-cache-key-for-tree "^2.0.0"
     capture-exit "^2.0.0"
-    chalk "^4.1.0"
-    ci-info "^2.0.0"
+    chalk "^4.1.2"
+    ci-info "^3.7.0"
     clean-base-url "^1.0.0"
     compression "^1.7.4"
     configstore "^5.0.1"
     console-ui "^3.1.2"
     core-object "^3.1.5"
     dag-map "^2.0.2"
-    diff "^5.0.0"
+    diff "^5.1.0"
     ember-cli-is-package-missing "^1.0.0"
     ember-cli-lodash-subset "^2.0.1"
     ember-cli-normalize-entity-name "^1.0.0"
-    ember-cli-preprocess-registry "^3.3.0"
+    ember-cli-preprocess-registry "^5.0.1"
     ember-cli-string-utils "^1.1.0"
-    ember-source-channel-url "^3.0.0"
     ensure-posix-path "^1.1.1"
-    execa "^5.0.0"
+    execa "^5.1.1"
     exit "^0.1.2"
-    express "^4.17.1"
-    filesize "^6.1.0"
+    express "^4.18.1"
+    filesize "^10.0.5"
     find-up "^5.0.0"
     find-yarn-workspace-root "^2.0.0"
     fixturify-project "^2.1.1"
-    fs-extra "^9.1.0"
+    fs-extra "^11.1.1"
     fs-tree-diff "^2.0.1"
     get-caller-file "^2.0.5"
     git-repo-info "^2.1.1"
-    glob "^7.1.6"
+    glob "^8.1.0"
     heimdalljs "^0.2.6"
-    heimdalljs-fs-monitor "^1.1.0"
+    heimdalljs-fs-monitor "^1.1.1"
     heimdalljs-graph "^1.0.0"
     heimdalljs-logger "^0.1.10"
     http-proxy "^1.18.1"
-    inflection "^1.12.0"
+    inflection "^2.0.1"
+    inquirer "^9.1.5"
     is-git-url "^1.0.0"
-    is-language-code "^2.0.0"
-    isbinaryfile "^4.0.6"
-    js-yaml "^3.14.0"
-    json-stable-stringify "^1.0.1"
+    is-language-code "^3.1.0"
+    isbinaryfile "^5.0.0"
+    js-yaml "^4.1.0"
     leek "0.0.24"
     lodash.template "^4.5.0"
-    markdown-it "^12.0.4"
-    markdown-it-terminal "0.2.1"
-    minimatch "^3.0.4"
+    markdown-it "^13.0.1"
+    markdown-it-terminal "^0.4.0"
+    minimatch "^7.4.3"
     morgan "^1.10.0"
     nopt "^3.0.6"
-    npm-package-arg "^8.1.1"
+    npm-package-arg "^10.1.0"
+    os-locale "^5.0.0"
     p-defer "^3.0.0"
-    portfinder "^1.0.28"
+    portfinder "^1.0.32"
     promise-map-series "^0.3.0"
-    promise.hash.helper "^1.0.7"
+    promise.hash.helper "^1.0.8"
     quick-temp "^0.1.8"
-    resolve "^1.20.0"
-    resolve-package-path "^3.1.0"
-    sane "^4.1.0"
-    semver "^7.3.4"
+    remove-types "^1.0.0"
+    resolve "^1.22.1"
+    resolve-package-path "^4.0.3"
+    safe-stable-stringify "^2.4.2"
+    sane "^5.0.1"
+    semver "^7.3.5"
     silent-error "^1.1.1"
-    sort-package-json "^1.49.0"
+    sort-package-json "^1.57.0"
     symlink-or-copy "^1.3.1"
     temp "0.9.4"
-    testem "^3.2.0"
+    testem "^3.10.1"
     tiny-lr "^2.0.0"
     tree-sync "^2.1.0"
-    uuid "^8.3.2"
-    walk-sync "^2.2.0"
-    watch-detector "^1.0.0"
-    workerpool "^6.1.4"
+    uuid "^9.0.0"
+    walk-sync "^3.0.0"
+    watch-detector "^1.0.2"
+    workerpool "^6.4.0"
     yam "^1.0.0"
 
 ember-compatibility-helpers@^1.1.2, ember-compatibility-helpers@^1.2.0, ember-compatibility-helpers@^1.2.1, ember-compatibility-helpers@^1.2.5, ember-compatibility-helpers@^1.2.6:
@@ -4110,6 +4170,15 @@ ember-compatibility-helpers@^1.1.2, ember-compatibility-helpers@^1.2.0, ember-co
     fs-extra "^9.1.0"
     semver "^5.4.1"
 
+ember-decorators@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/ember-decorators/-/ember-decorators-6.1.1.tgz#6d770f8999cf5a413a1ee459afd520838c0fc470"
+  integrity sha512-63vZPntPn1aqMyeNRLoYjJD+8A8obd+c2iZkJflswpDRNVIsp2m7aQdSCtPt4G0U/TEq2251g+N10maHX3rnJQ==
+  dependencies:
+    "@ember-decorators/component" "^6.1.1"
+    "@ember-decorators/object" "^6.1.1"
+    ember-cli-babel "^7.7.3"
+
 ember-destroyable-polyfill@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/ember-destroyable-polyfill/-/ember-destroyable-polyfill-2.0.3.tgz#1673ed66609a82268ef270a7d917ebd3647f11e1"
@@ -4122,7 +4191,7 @@ ember-destroyable-polyfill@^2.0.3:
 ember-disable-prototype-extensions@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/ember-disable-prototype-extensions/-/ember-disable-prototype-extensions-1.1.3.tgz#1969135217654b5e278f9fe2d9d4e49b5720329e"
-  integrity sha1-GWkTUhdlS14nj5/i2dTkm1cgMp4=
+  integrity sha512-SB9NcZ27OtoUk+gfalsc3QU17+54OoqR668qHcuvHByk4KAhGxCKlkm9EBlKJcGr7yceOOAJqohTcCEBqfRw9g==
 
 ember-exam@^8.0.0:
   version "8.0.0"
@@ -4144,10 +4213,14 @@ ember-exam@^8.0.0:
     semver "^7.3.2"
     silent-error "^1.1.1"
 
-ember-export-application-global@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/ember-export-application-global/-/ember-export-application-global-2.0.1.tgz#b120a70e322ab208defc9e2daebe8d0dfc2dcd46"
-  integrity sha512-B7wiurPgsxsSGzJuPFkpBWnaeuCu2PGpG2BjyrfA1VcL7//o+5RSnZqiCEY326y7qmxb2GoCgo0ft03KBU0rRw==
+ember-functions-as-helper-polyfill@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ember-functions-as-helper-polyfill/-/ember-functions-as-helper-polyfill-2.1.1.tgz#25240db29b4cd0366a2d2954d2ea26ce0872ff8f"
+  integrity sha512-vZ2w9G/foohwtPm99Jos1m6bhlXyyyiJ4vhLbxyjWB4wh7bcpRzXPgCewDRrwefZQ2BwtHg3c9zvVMlI0g+o2Q==
+  dependencies:
+    ember-cli-babel "^7.26.11"
+    ember-cli-typescript "^5.0.0"
+    ember-cli-version-checker "^5.1.2"
 
 ember-load-initializers@^2.1.1:
   version "2.1.2"
@@ -4177,10 +4250,10 @@ ember-modifier@^3.2.7:
     ember-cli-typescript "^5.0.0"
     ember-compatibility-helpers "^1.2.5"
 
-ember-modifier@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/ember-modifier/-/ember-modifier-4.0.0.tgz#0bb3fae11435fcbe0d3dfa852ce224d81d75ddb2"
-  integrity sha512-OdconmrqKP2haK4kBwNmtnA2NiC2MFmIJC3LgJ1WhwZ49GaktM+bRIuFxF/S5W0oaegzKs1qH2ZDlqMeO2L3nw==
+ember-modifier@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ember-modifier/-/ember-modifier-4.1.0.tgz#cb91efbf8ca4ff4a1a859767afa42dddba5a2bbd"
+  integrity sha512-YFCNpEYj6jdyy3EjslRb2ehNiDvaOrXTilR9+ngq+iUqSHYto2zKV0rleiA1XJQ27ELM1q8RihT29U6Lq5EyqQ==
   dependencies:
     "@embroider/addon-shim" "^1.8.4"
     ember-cli-normalize-entity-name "^1.0.0"
@@ -4196,20 +4269,20 @@ ember-on-resize-modifier@^1.1.0:
     ember-modifier "^3.2.7"
     ember-resize-observer-service "^1.1.0"
 
-ember-qunit@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-6.1.1.tgz#9e2b7835239e7ffd176e08e536975f66e59f75e5"
-  integrity sha512-3/jCpoecltFV6vm7GCtSDNRxBzWx96nP+QrbereJAnioSaGeLe+slKL3l80mGzMYDTvn7ESobZ+Ba+OQ1vMMKQ==
+ember-qunit@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-6.2.0.tgz#4d492951035d1df5c7802c4ae6cf299c8f41d75b"
+  integrity sha512-mC+0bp8DwWzJLn8SW3GS8KDZIkl4yLsNYwMi5Dw6+aFllq7FM2crd/dfY4MuOIHK7GKdjtmWJTMGnjSpeSayaw==
   dependencies:
     broccoli-funnel "^3.0.8"
     broccoli-merge-trees "^3.0.2"
     common-tags "^1.8.0"
-    ember-auto-import "^2.4.3"
+    ember-auto-import "^2.6.0"
     ember-cli-babel "^7.26.11"
     ember-cli-test-loader "^3.0.0"
     resolve-package-path "^4.0.3"
     silent-error "^1.1.1"
-    validate-peer-dependencies "^2.1.0"
+    validate-peer-dependencies "^2.2.0"
 
 ember-resize-observer-service@^1.1.0:
   version "1.1.0"
@@ -4219,22 +4292,17 @@ ember-resize-observer-service@^1.1.0:
     ember-cli-babel "^7.26.6"
     ember-cli-htmlbars "^5.7.1"
 
-ember-resolver@^8.0.3:
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-8.0.3.tgz#40f243aa58281bf195c695fe84a6b291e204690a"
-  integrity sha512-fA53fxfG821BRqNiB9mQDuzZpzSRcSAYZTYBlRQOHsJwoYdjyE7idz4YcytbSsa409G5J2kP6B+PiKOBh0odlw==
+ember-resolver@^10.1.1:
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-10.1.1.tgz#1106a2386337b13a9ee509a9ad2a18b53a728ab3"
+  integrity sha512-y1zzn6C4YGJui+tJzcCKlsf1oSOSVAkRrvmg8OwqVIKnALKKb9ihx2qLCslHg8x0wJvJgMtDMXgrczvQrZW0Lw==
   dependencies:
-    babel-plugin-debug-macros "^0.3.4"
-    broccoli-funnel "^3.0.8"
-    broccoli-merge-trees "^4.2.0"
-    ember-cli-babel "^7.26.6"
-    ember-cli-version-checker "^5.1.2"
-    resolve "^1.20.0"
+    ember-cli-babel "^7.26.11"
 
 ember-rfc176-data@^0.3.17:
-  version "0.3.17"
-  resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.17.tgz#d4fc6c33abd6ef7b3440c107a28e04417b49860a"
-  integrity sha512-EVzTTKqxv9FZbEh6Ktw56YyWRAA0MijKvl7H8C06wVF+8f/cRRz3dXxa4nkwjzyVwx4rzKGuIGq77hxJAQhWWw==
+  version "0.3.18"
+  resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.18.tgz#bb6fdcef49999981317ea81b6cc9210fb4108d65"
+  integrity sha512-JtuLoYGSjay1W3MQAxt3eINWXNYYQliK90tLwtb8aeCuQK8zKGCRbBodVIrkcTqshULMnRuTOS6t1P7oQk3g6Q==
 
 ember-router-generator@^2.0.0:
   version "2.0.0"
@@ -4252,10 +4320,10 @@ ember-source-channel-url@^3.0.0:
   dependencies:
     node-fetch "^2.6.0"
 
-ember-source@~3.28.11:
-  version "3.28.11"
-  resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.28.11.tgz#7b1a7d0483c886af8f38cc058fd647c359803543"
-  integrity sha512-oM3X2lYUWJM+CJEdPvJGVZNUTzUAYbDeOOoAJW7im20LkQrv0ce0MAJ1Gf/SnI3H+ZL7lj8qggP+D9P7ZxBvsw==
+ember-source@~3.28.12:
+  version "3.28.12"
+  resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.28.12.tgz#d8bb33d665d9c5adc858dce9d2d18be5ce58b2c0"
+  integrity sha512-HGrBpY6TN+MAi7F6BS8XYtNFG6vtbKE9ttPcyj0Ps+76kP7isCHyN0hk8ecKciLq7JYDqiPDNWjdIXAn2JfhZA==
   dependencies:
     "@babel/helper-module-imports" "^7.8.3"
     "@babel/plugin-transform-block-scoping" "^7.8.3"
@@ -4284,6 +4352,21 @@ ember-source@~3.28.11:
     semver "^7.3.4"
     silent-error "^1.1.1"
 
+ember-template-imports@^3.4.2:
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/ember-template-imports/-/ember-template-imports-3.4.2.tgz#6cf7de7d4b8348a0fddf3aaec4947aa1211289e6"
+  integrity sha512-OS8TUVG2kQYYwP3netunLVfeijPoOKIs1SvPQRTNOQX4Pu8xGGBEZmrv0U1YTnQn12Eg+p6w/0UdGbUnITjyzw==
+  dependencies:
+    babel-import-util "^0.2.0"
+    broccoli-stew "^3.0.0"
+    ember-cli-babel-plugin-helpers "^1.1.1"
+    ember-cli-version-checker "^5.1.2"
+    line-column "^1.0.2"
+    magic-string "^0.25.7"
+    parse-static-imports "^1.1.0"
+    string.prototype.matchall "^4.0.6"
+    validate-peer-dependencies "^1.1.0"
+
 ember-test-selectors@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/ember-test-selectors/-/ember-test-selectors-6.0.0.tgz#ba9bb19550d9dec6e4037d86d2b13c2cfd329341"
@@ -4314,7 +4397,7 @@ emojis-list@^3.0.0:
 encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
-  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
+  integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
 
 end-of-stream@^1.1.0:
   version "1.4.4"
@@ -4323,15 +4406,15 @@ end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
-engine.io-parser@~5.0.3:
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.4.tgz#0b13f704fa9271b3ec4f33112410d8f3f41d0fc0"
-  integrity sha512-+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg==
+engine.io-parser@~5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.1.0.tgz#d593d6372d7f79212df48f807b8cace1ea1cb1b8"
+  integrity sha512-enySgNiK5tyZFynt3z7iqBR+Bto9EVVVvDFuTT0ioHCGbzirZVGDGiQjZzEp8hWl6hd5FSVytJGuScX1C1C35w==
 
-engine.io@~6.2.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.2.1.tgz#e3f7826ebc4140db9bbaa9021ad6b1efb175878f"
-  integrity sha512-ECceEFcAaNRybd3lsGQKas3ZlMVjN3cyWwMP25D2i0zWfyiytVbTpRPa34qrr+FHddtpBVOmq4H/DCv1O0lZRA==
+engine.io@~6.5.0:
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.5.1.tgz#59725f8593ccc891abb47f1efcdc52a089525a56"
+  integrity sha512-mGqhI+D7YxS9KJMppR6Iuo37Ed3abhU8NdfgSvJSDUafQutrN+sPTncJYTyM9+tkhSmWodKtVYGPPHyXJEwEQA==
   dependencies:
     "@types/cookie" "^0.4.1"
     "@types/cors" "^2.8.12"
@@ -4341,13 +4424,13 @@ engine.io@~6.2.0:
     cookie "~0.4.1"
     cors "~2.8.5"
     debug "~4.3.1"
-    engine.io-parser "~5.0.3"
-    ws "~8.2.3"
+    engine.io-parser "~5.1.0"
+    ws "~8.11.0"
 
-enhanced-resolve@^5.10.0:
-  version "5.10.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz#0dc579c3bb2a1032e357ac45b8f3a6f3ad4fb1e6"
-  integrity sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==
+enhanced-resolve@^5.15.0:
+  version "5.15.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz#1af946c7d93603eb88e9896cee4904dc012e9c35"
+  integrity sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==
   dependencies:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
@@ -4363,19 +4446,9 @@ entities@^2.0.0:
   integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
 
 entities@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174"
-  integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==
-
-entities@~1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
-  integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
-
-entities@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
-  integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
+  integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
 
 entities@~3.0.1:
   version "3.0.1"
@@ -4390,7 +4463,7 @@ errlop@^2.0.0:
 error@^4.3.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/error/-/error-4.4.0.tgz#bf69ff251fb4a279c19adccdaa6b61e90d9bf12a"
-  integrity sha1-v2n/JR+0onnBmtzNqmth6Q2b8So=
+  integrity sha512-SNDKualLUtT4StGFP7xNfuFybL2f6iJujFtrWuvJqGbVQGaN+adE23veqzPz1hjUjTunLi2EnJ+0SJxtbJreKw==
   dependencies:
     camelize "^1.0.0"
     string-template "~0.2.0"
@@ -4403,36 +4476,59 @@ error@^7.0.0:
   dependencies:
     string-template "~0.2.1"
 
-es-abstract@^1.19.1:
-  version "1.19.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3"
-  integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==
+es-abstract@^1.19.0, es-abstract@^1.20.4:
+  version "1.21.2"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.21.2.tgz#a56b9695322c8a185dc25975aa3b8ec31d0e7eff"
+  integrity sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==
   dependencies:
+    array-buffer-byte-length "^1.0.0"
+    available-typed-arrays "^1.0.5"
     call-bind "^1.0.2"
+    es-set-tostringtag "^2.0.1"
     es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    get-intrinsic "^1.1.1"
+    function.prototype.name "^1.1.5"
+    get-intrinsic "^1.2.0"
     get-symbol-description "^1.0.0"
+    globalthis "^1.0.3"
+    gopd "^1.0.1"
     has "^1.0.3"
-    has-symbols "^1.0.2"
-    internal-slot "^1.0.3"
-    is-callable "^1.2.4"
-    is-negative-zero "^2.0.1"
+    has-property-descriptors "^1.0.0"
+    has-proto "^1.0.1"
+    has-symbols "^1.0.3"
+    internal-slot "^1.0.5"
+    is-array-buffer "^3.0.2"
+    is-callable "^1.2.7"
+    is-negative-zero "^2.0.2"
     is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.1"
+    is-shared-array-buffer "^1.0.2"
     is-string "^1.0.7"
-    is-weakref "^1.0.1"
-    object-inspect "^1.11.0"
+    is-typed-array "^1.1.10"
+    is-weakref "^1.0.2"
+    object-inspect "^1.12.3"
     object-keys "^1.1.1"
-    object.assign "^4.1.2"
-    string.prototype.trimend "^1.0.4"
-    string.prototype.trimstart "^1.0.4"
-    unbox-primitive "^1.0.1"
+    object.assign "^4.1.4"
+    regexp.prototype.flags "^1.4.3"
+    safe-regex-test "^1.0.0"
+    string.prototype.trim "^1.2.7"
+    string.prototype.trimend "^1.0.6"
+    string.prototype.trimstart "^1.0.6"
+    typed-array-length "^1.0.4"
+    unbox-primitive "^1.0.2"
+    which-typed-array "^1.1.9"
 
-es-module-lexer@^0.9.0:
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19"
-  integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==
+es-module-lexer@^1.2.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.3.0.tgz#6be9c9e0b4543a60cd166ff6f8b4e9dae0b0c16f"
+  integrity sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==
+
+es-set-tostringtag@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz#338d502f6f674301d710b80c8592de8a15f09cd8"
+  integrity sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==
+  dependencies:
+    get-intrinsic "^1.1.3"
+    has "^1.0.3"
+    has-tostringtag "^1.0.0"
 
 es-to-primitive@^1.2.1:
   version "1.2.1"
@@ -4451,34 +4547,27 @@ escalade@^3.1.1:
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
-  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
+  integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==
 
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
 
 escape-string-regexp@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-escodegen@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd"
-  integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==
-  dependencies:
-    esprima "^4.0.1"
-    estraverse "^5.2.0"
-    esutils "^2.0.2"
-    optionator "^0.8.1"
-  optionalDependencies:
-    source-map "~0.6.1"
+escape-string-regexp@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz#4683126b500b61762f2dbebace1806e8be31b1c8"
+  integrity sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==
 
-eslint-plugin-qunit@^7.3.4:
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-qunit/-/eslint-plugin-qunit-7.3.4.tgz#2465b6f29ff56fbe9b741bde2740dec109ee9bec"
-  integrity sha512-EbDM0zJerH9zVdUswMJpcFF7wrrpvsGuYfNexUpa5hZkkdFhaFcX+yD+RSK4Nrauw4psMGlcqeWUMhaVo+Manw==
+eslint-plugin-qunit@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-qunit/-/eslint-plugin-qunit-8.0.0.tgz#92df9b8cc144a67edaf961e9c4db75d98065ce85"
+  integrity sha512-ly2x/pmJPcS0ztGAPap6qLC13GjOFwhBbvun0K1dAjaxaC6KB3TYjeBo+5pGvXqL3WdicmYxEKhTGwmhvoxMBQ==
   dependencies:
     eslint-utils "^3.0.0"
     requireindex "^1.2.0"
@@ -4491,10 +4580,10 @@ eslint-scope@5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-scope@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642"
-  integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==
+eslint-scope@^7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
+  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
   dependencies:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
@@ -4511,54 +4600,52 @@ eslint-visitor-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
-eslint-visitor-keys@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
-  integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.2:
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz#8c2095440eca8c933bedcadf16fefa44dbe9ba5f"
+  integrity sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==
 
-eslint@^8.31.0:
-  version "8.31.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.31.0.tgz#75028e77cbcff102a9feae1d718135931532d524"
-  integrity sha512-0tQQEVdmPZ1UtUKXjX7EMm9BlgJ08G90IhWh0PKDCb3ZLsgAOHI8fYSIzYVZej92zsgq+ft0FGsxhJ3xo2tbuA==
+eslint@^8.46.0:
+  version "8.46.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.46.0.tgz#a06a0ff6974e53e643acc42d1dcf2e7f797b3552"
+  integrity sha512-cIO74PvbW0qU8e0mIvk5IV3ToWdCq5FYG6gWPHHkx6gNdjlbAYvtfHmlCMXxjcoVaIdwy/IAt3+mDkZkfvb2Dg==
   dependencies:
-    "@eslint/eslintrc" "^1.4.1"
-    "@humanwhocodes/config-array" "^0.11.8"
+    "@eslint-community/eslint-utils" "^4.2.0"
+    "@eslint-community/regexpp" "^4.6.1"
+    "@eslint/eslintrc" "^2.1.1"
+    "@eslint/js" "^8.46.0"
+    "@humanwhocodes/config-array" "^0.11.10"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@nodelib/fs.walk" "^1.2.8"
-    ajv "^6.10.0"
+    ajv "^6.12.4"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
     debug "^4.3.2"
     doctrine "^3.0.0"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^7.1.1"
-    eslint-utils "^3.0.0"
-    eslint-visitor-keys "^3.3.0"
-    espree "^9.4.0"
-    esquery "^1.4.0"
+    eslint-scope "^7.2.2"
+    eslint-visitor-keys "^3.4.2"
+    espree "^9.6.1"
+    esquery "^1.4.2"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
     file-entry-cache "^6.0.1"
     find-up "^5.0.0"
     glob-parent "^6.0.2"
     globals "^13.19.0"
-    grapheme-splitter "^1.0.4"
+    graphemer "^1.4.0"
     ignore "^5.2.0"
-    import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
     is-path-inside "^3.0.3"
-    js-sdsl "^4.1.4"
     js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
     lodash.merge "^4.6.2"
     minimatch "^3.1.2"
     natural-compare "^1.4.0"
-    optionator "^0.9.1"
-    regexpp "^3.2.0"
+    optionator "^0.9.3"
     strip-ansi "^6.0.1"
-    strip-json-comments "^3.1.0"
     text-table "^0.2.0"
 
 esm@^3.2.4:
@@ -4566,16 +4653,16 @@ esm@^3.2.4:
   resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.25.tgz#342c18c29d56157688ba5ce31f8431fbb795cc10"
   integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==
 
-espree@^9.4.0:
-  version "9.4.0"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.0.tgz#cd4bc3d6e9336c433265fc0aa016fc1aaf182f8a"
-  integrity sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==
+espree@^9.6.0, espree@^9.6.1:
+  version "9.6.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
+  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
   dependencies:
-    acorn "^8.8.0"
+    acorn "^8.9.0"
     acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^3.3.0"
+    eslint-visitor-keys "^3.4.1"
 
-esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0:
+esprima@^4.0.0, esprima@~4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
@@ -4583,12 +4670,12 @@ esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0:
 esprima@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.0.0.tgz#53cf247acda77313e551c3aa2e73342d3fb4f7d9"
-  integrity sha1-U88kes2ncxPlUcOqLnM0LT+099k=
+  integrity sha512-xoBq/MIShSydNZOkjkoCEjqod963yHNXTLC40ypBhop6yPqflPz/vTinmCfSrGcywVLnSftRf6a0kJLdFdzemw==
 
-esquery@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
-  integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
+esquery@^1.4.2:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
+  integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
   dependencies:
     estraverse "^5.1.0"
 
@@ -4605,9 +4692,9 @@ estraverse@^4.1.1:
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
 estraverse@^5.1.0, estraverse@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
-  integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
+  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
 
 esutils@^2.0.2:
   version "2.0.3"
@@ -4617,12 +4704,12 @@ esutils@^2.0.2:
 etag@~1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
-  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
+  integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==
 
 ev-store@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/ev-store/-/ev-store-7.0.0.tgz#1ab0c7f82136505dd74b31d17701cb2be6d26558"
-  integrity sha1-GrDH+CE2UF3XSzHRdwHLK+bSZVg=
+  integrity sha512-otazchNRnGzp2YarBJ+GXKVGvhxVATB1zmaStxJBYet0Dyq7A9VhH8IUEB/gRcL6Ch52lfpgPTRJ2m49epyMsQ==
   dependencies:
     individual "^3.0.0"
 
@@ -4634,14 +4721,14 @@ eventemitter3@^4.0.0:
 events-to-array@^1.0.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/events-to-array/-/events-to-array-1.1.2.tgz#2d41f563e1fe400ed4962fe1a4d5c6a7539df7f6"
-  integrity sha1-LUH1Y+H+QA7Uli/hpNXGp1Od9/Y=
+  integrity sha512-inRWzRY7nG+aXZxBzEqYKB3HPgwflZRopAjDCHv0whhRx+MTUr1ei0ICZUypdyE0HRm4L2d5VEcIqLD6yl+BFA==
 
 events@^3.2.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
   integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
 
-exec-sh@^0.3.2:
+exec-sh@^0.3.2, exec-sh@^0.3.4:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.6.tgz#ff264f9e325519a60cb5e273692943483cca63bc"
   integrity sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==
@@ -4689,7 +4776,7 @@ execa@^4.0.0, execa@^4.0.3:
     signal-exit "^3.0.2"
     strip-final-newline "^2.0.0"
 
-execa@^5.0.0:
+execa@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
   integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
@@ -4707,12 +4794,12 @@ execa@^5.0.0:
 exit@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
-  integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
+  integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==
 
 expand-brackets@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
-  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
+  integrity sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==
   dependencies:
     debug "^2.3.3"
     define-property "^0.2.5"
@@ -4725,11 +4812,11 @@ expand-brackets@^2.1.4:
 expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
-  integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=
+  integrity sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==
   dependencies:
     homedir-polyfill "^1.0.1"
 
-express@^4.10.7, express@^4.17.1, express@^4.18.2:
+express@^4.10.7, express@^4.18.1, express@^4.18.2:
   version "4.18.2"
   resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59"
   integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==
@@ -4769,14 +4856,14 @@ express@^4.10.7, express@^4.17.1, express@^4.18.2:
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
-  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
+  integrity sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==
   dependencies:
     is-extendable "^0.1.0"
 
 extend-shallow@^3.0.0, extend-shallow@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
-  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
+  integrity sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==
   dependencies:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
@@ -4820,31 +4907,30 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
 fast-glob@^3.0.3:
-  version "3.2.5"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661"
-  integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==
+  version "3.2.12"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
+  integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
-    glob-parent "^5.1.0"
+    glob-parent "^5.1.2"
     merge2 "^1.3.0"
-    micromatch "^4.0.2"
-    picomatch "^2.2.1"
+    micromatch "^4.0.4"
 
 fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
-fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
+fast-levenshtein@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
-  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
+  integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
 fast-ordered-set@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/fast-ordered-set/-/fast-ordered-set-1.0.3.tgz#3fbb36634f7be79e4f7edbdb4a357dee25d184eb"
-  integrity sha1-P7s2Y097555PftvbSjV97iXRhOs=
+  integrity sha512-MxBW4URybFszOx1YlACEoK52P6lE3xiFcPaGCUZ7QQOZ6uJXKo++Se8wa31SjcZ+NC/fdAWX7UtKEfaGgHS2Vg==
   dependencies:
     blank-object "^1.0.1"
 
@@ -4863,23 +4949,23 @@ fast-sourcemap-concat@^2.1.0:
     sourcemap-validator "^1.1.0"
 
 fastq@^1.6.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz#bb9fb955a07130a918eb63c1f5161cc32a5d0858"
-  integrity sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a"
+  integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==
   dependencies:
     reusify "^1.0.4"
 
 faye-websocket@^0.11.3:
-  version "0.11.3"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz#5c0e9a8968e8912c286639fde977a8b209f2508e"
-  integrity sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==
+  version "0.11.4"
+  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da"
+  integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==
   dependencies:
     websocket-driver ">=0.5.1"
 
-fb-watchman@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85"
-  integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==
+fb-watchman@^2.0.0, fb-watchman@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.2.tgz#e9524ee6b5c77e9e5001af0f85f3adbb8623255c"
+  integrity sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==
   dependencies:
     bser "2.1.1"
 
@@ -4894,7 +4980,7 @@ fetch-blob@^3.1.2, fetch-blob@^3.1.4:
 figures@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
-  integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
+  integrity sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==
   dependencies:
     escape-string-regexp "^1.0.5"
 
@@ -4905,6 +4991,14 @@ figures@^3.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
+figures@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-5.0.0.tgz#126cd055052dea699f8a54e8c9450e6ecfc44d5f"
+  integrity sha512-ej8ksPF4x6e5wvK9yevct0UCXh8TTFlWGVLlgjZuoBH1HwjIfKE/IdL5mq89sFA7zELi1VhKpmtDnrs7zWyeyg==
+  dependencies:
+    escape-string-regexp "^5.0.0"
+    is-unicode-supported "^1.2.0"
+
 file-entry-cache@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
@@ -4912,15 +5006,15 @@ file-entry-cache@^6.0.1:
   dependencies:
     flat-cache "^3.0.4"
 
-filesize@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/filesize/-/filesize-6.1.0.tgz#e81bdaa780e2451d714d71c0d7a4f3238d37ad00"
-  integrity sha512-LpCHtPQ3sFx67z+uh2HnSyWSLLu5Jxo21795uRDuar/EOuYWXib5EmPaGIBuSnRqH2IODiKA2k5re/K9OnN/Yg==
+filesize@^10.0.5:
+  version "10.0.7"
+  resolved "https://registry.yarnpkg.com/filesize/-/filesize-10.0.7.tgz#2237a816ee60a83fd0c3382ae70800e54eced3ad"
+  integrity sha512-iMRG7Qo9nayLoU3PNCiLizYtsy4W1ClrapeCwEgtiQelOAOuRJiw4QaLI+sSr8xr901dgHv+EYP2bCusGZgoiA==
 
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
-  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
+  integrity sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==
   dependencies:
     extend-shallow "^2.0.1"
     is-number "^3.0.0"
@@ -4960,7 +5054,7 @@ finalhandler@1.2.0:
     statuses "2.0.1"
     unpipe "~1.0.0"
 
-find-babel-config@^1.1.0, find-babel-config@^1.2.0:
+find-babel-config@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-1.2.0.tgz#a9b7b317eb5b9860cda9d54740a8c8337a2283a2"
   integrity sha512-jB2CHJeqy6a820ssiqwrKMeyC6nNdmrcgkKWJWmpoxpE8RKciYJXCcXRq1h2AzCo5I5BJeN2tkGEO3hLTuePRA==
@@ -4969,9 +5063,9 @@ find-babel-config@^1.1.0, find-babel-config@^1.2.0:
     path-exists "^3.0.0"
 
 find-cache-dir@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880"
-  integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b"
+  integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==
   dependencies:
     commondir "^1.0.1"
     make-dir "^3.0.2"
@@ -4985,17 +5079,10 @@ find-index@^1.1.0:
 find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
-  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
+  integrity sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==
   dependencies:
     locate-path "^2.0.0"
 
-find-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
-  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
-  dependencies:
-    locate-path "^3.0.0"
-
 find-up@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
@@ -5012,14 +5099,6 @@ find-up@^5.0.0:
     locate-path "^6.0.0"
     path-exists "^4.0.0"
 
-find-yarn-workspace-root@^1.1.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-1.2.1.tgz#40eb8e6e7c2502ddfaa2577c176f221422f860db"
-  integrity sha512-dVtfb0WuQG+8Ag2uWkbG79hOUzEsRrhBzgfn86g2sJPkzmcpGdghbNTfUKGTxymFrY/tLIodDzLoW9nOJ4FY8Q==
-  dependencies:
-    fs-extra "^4.0.3"
-    micromatch "^3.1.4"
-
 find-yarn-workspace-root@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz#f47fb8d239c900eb78179aa81b66673eac88f7bd"
@@ -5077,9 +5156,9 @@ fixturify@^1.2.0:
     matcher-collection "^2.0.0"
 
 fixturify@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fixturify/-/fixturify-2.1.0.tgz#a0437faac9b6e4aeb35910a1214df866aeec5d75"
-  integrity sha512-gHq6UCv8DE91EpiaRSzrmvLoRvFOBzI961IQ3gXE5wfmMM1TtApDcZAonG2hnp6GJrVFCxHwP01wSw9VQJiJ1w==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/fixturify/-/fixturify-2.1.1.tgz#e962d72f062600cb81a9651086f60d822c72d998"
+  integrity sha512-SRgwIMXlxkb6AUgaVjIX+jCEqdhyXu9hah7mcK+lWynjKtX73Ux1TDv71B7XyaQ+LJxkYRHl5yCL8IycAvQRUw==
   dependencies:
     "@types/fs-extra" "^8.1.0"
     "@types/minimatch" "^3.0.3"
@@ -5097,19 +5176,19 @@ flat-cache@^3.0.4:
     rimraf "^3.0.2"
 
 flatted@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469"
-  integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
+  integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
 
-focusable-selectors@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/focusable-selectors/-/focusable-selectors-0.4.0.tgz#c93092bfe65c7cf7ef52aed82fb6f8df31072459"
-  integrity sha512-tc/236hUU3xemsRLu1RKhRQ5UWHjRM9iJTli1zdac43h7b1biRSgG0mILM0qrcsKaGCHcOPJ6NKbk12ouKHLpw==
+focusable-selectors@^0.8.0:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/focusable-selectors/-/focusable-selectors-0.8.1.tgz#ed50e1ace402a3769c203525cea616c80111ac76"
+  integrity sha512-QXOebaidkRK27TmfboyrJZwzNPYtvs01itWrXmSc7rd8/ORql9ZiM1fkQ1IZKcCjYp4J/lWCBkFLxuupvt3y9w==
 
 follow-redirects@^1.0.0:
-  version "1.15.1"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5"
-  integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==
+  version "1.15.2"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
+  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
 
 for-each@^0.3.3:
   version "0.3.3"
@@ -5121,7 +5200,7 @@ for-each@^0.3.3:
 for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
+  integrity sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==
 
 form-data@^4.0.0:
   version "4.0.0"
@@ -5147,19 +5226,19 @@ forwarded@0.2.0:
 fragment-cache@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
-  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
+  integrity sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==
   dependencies:
     map-cache "^0.2.2"
 
 fresh@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
-  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
+  integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
 
 fs-extra@^0.24.0:
   version "0.24.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.24.0.tgz#d4e4342a96675cb7846633a6099249332b539952"
-  integrity sha1-1OQ0KpZnXLeEZjOmCZJJMytTmVI=
+  integrity sha512-w1RvhdLZdU9V3vQdL+RooGlo6b9R9WVoBanOfoJvosWlqSKvrjFlci2oVhwvLwZXBtM7khyPvZ8r3fwsim3o0A==
   dependencies:
     graceful-fs "^4.1.2"
     jsonfile "^2.1.0"
@@ -5167,15 +5246,24 @@ fs-extra@^0.24.0:
     rimraf "^2.2.8"
 
 fs-extra@^10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz#9ff61b655dde53fb34a82df84bb214ce802e17c1"
-  integrity sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
+  integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
   dependencies:
     graceful-fs "^4.2.0"
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
-fs-extra@^4.0.2, fs-extra@^4.0.3:
+fs-extra@^11.1.1:
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.1.tgz#da69f7c39f3b002378b0954bb6ae7efdc0876e2d"
+  integrity sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
+fs-extra@^4.0.2:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
   integrity sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==
@@ -5211,7 +5299,7 @@ fs-extra@^8.0.0, fs-extra@^8.0.1, fs-extra@^8.1.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-extra@^9.0.1, fs-extra@^9.1.0:
+fs-extra@^9.0.0, fs-extra@^9.0.1, fs-extra@^9.1.0:
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
   integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
@@ -5267,7 +5355,7 @@ fs-updater@^1.0.4:
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
 fsevents@~2.3.2:
   version "2.3.2"
@@ -5279,6 +5367,21 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
+function.prototype.name@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621"
+  integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.0"
+    functions-have-names "^1.2.2"
+
+functions-have-names@^1.2.2, functions-have-names@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
+  integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
+
 gauge@^4.0.3:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
@@ -5303,20 +5406,16 @@ get-caller-file@^2.0.5:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385"
-  integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82"
+  integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==
   dependencies:
     function-bind "^1.1.1"
     has "^1.0.3"
+    has-proto "^1.0.1"
     has-symbols "^1.0.3"
 
-get-stdin@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
-  integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
-
 get-stream@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
@@ -5344,10 +5443,17 @@ get-symbol-description@^1.0.0:
     call-bind "^1.0.2"
     get-intrinsic "^1.1.1"
 
-get-value@^2.0.3, get-value@^2.0.6:
+get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
-  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
+  integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==
+
+get-value@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/get-value/-/get-value-3.0.1.tgz#5efd2a157f1d6a516d7524e124ac52d0a39ef5a8"
+  integrity sha512-mKZj9JLQrwMBtj5wxi6MH8Z5eSKaERpAwjg43dPtlGI1ZVEgH/qC7T8/6R2OBSUA+zzHBZgICsVJaEIV2tKTDA==
+  dependencies:
+    isobject "^3.0.1"
 
 git-hooks-list@1.0.3:
   version "1.0.3"
@@ -5359,7 +5465,7 @@ git-repo-info@^2.1.1:
   resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-2.1.1.tgz#220ffed8cbae74ef8a80e3052f2ccb5179aed058"
   integrity sha512-8aCohiDo4jwjOwma4FmYFd3i97urZulL8XL24nIPxuE+GZnfsAyy/g2Shqx6OjUiFKUXZM+Yy+KHnOmmA3FVcg==
 
-glob-parent@^5.1.0, glob-parent@~5.1.2:
+glob-parent@^5.1.2, glob-parent@~5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
@@ -5381,7 +5487,7 @@ glob-to-regexp@^0.4.1:
 glob@^5.0.10:
   version "5.0.15"
   resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
-  integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=
+  integrity sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==
   dependencies:
     inflight "^1.0.4"
     inherits "2"
@@ -5390,21 +5496,32 @@ glob@^5.0.10:
     path-is-absolute "^1.0.0"
 
 glob@^7.0.4, glob@^7.1.2, glob@^7.1.3, glob@^7.1.6:
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
-  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
+  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
     inherits "2"
-    minimatch "^3.0.4"
+    minimatch "^3.1.1"
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
+  integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^5.0.1"
+    once "^1.3.0"
+
 glob@~3.1.9:
   version "3.1.21"
   resolved "https://registry.yarnpkg.com/glob/-/glob-3.1.21.tgz#d29e0a055dea5138f4d07ed40e8982e83c2066cd"
-  integrity sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=
+  integrity sha512-ANhy2V2+tFpRajE3wN4DhkNQ08KDr0Ir1qL12/cUe5+a7STEK8jkW4onUYuY8/06qAFuT5je7mjAqzx0eKI2tQ==
   dependencies:
     graceful-fs "~1.2.0"
     inherits "1"
@@ -5422,7 +5539,7 @@ global-modules@^1.0.0:
 global-prefix@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
-  integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=
+  integrity sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==
   dependencies:
     expand-tilde "^2.0.2"
     homedir-polyfill "^1.0.1"
@@ -5444,12 +5561,19 @@ globals@^11.1.0:
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
 globals@^13.19.0:
-  version "13.19.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.19.0.tgz#7a42de8e6ad4f7242fbcca27ea5b23aca367b5c8"
-  integrity sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==
+  version "13.20.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.20.0.tgz#ea276a1e508ffd4f1612888f9d1bad1e2717bf82"
+  integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==
   dependencies:
     type-fest "^0.20.2"
 
+globalthis@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf"
+  integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==
+  dependencies:
+    define-properties "^1.1.3"
+
 globalyzer@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/globalyzer/-/globalyzer-0.1.0.tgz#cb76da79555669a1519d5a8edf093afaa0bf1465"
@@ -5481,30 +5605,25 @@ gopd@^1.0.1:
   dependencies:
     get-intrinsic "^1.1.3"
 
-graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
-  version "4.2.9"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96"
-  integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==
+graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
+  version "4.2.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
+  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
 
 graceful-fs@~1.2.0:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-1.2.3.tgz#15a4806a57547cb2d2dbf27f42e89a8c3451b364"
-  integrity sha1-FaSAaldUfLLS2/J/QuiajDRRs2Q=
+  integrity sha512-iiTUZ5vZ+2ZV+h71XAgwCSu6+NAizhFU3Yw8aC/hH5SQ3SnISqEqAek40imAFGtDcwJKNhXvSY+hzIolnLwcdQ==
 
-"graceful-readlink@>= 1.0.0":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
-  integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=
-
-grapheme-splitter@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
-  integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
+graphemer@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
+  integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
 
 growly@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
-  integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
+  integrity sha512-+xGQY0YyAWCnqy7Cd++hc2JqMYzlm0dG30Jd0beaA64sROr8C4nt8Yc9V5Ro3avlSUDTN0ulqP/VBKi1/lLygw==
 
 handlebars@^4.0.4, handlebars@^4.3.1, handlebars@^4.7.0, handlebars@^4.7.3, handlebars@^4.7.6, handlebars@^4.7.7:
   version "4.7.7"
@@ -5518,36 +5637,41 @@ handlebars@^4.0.4, handlebars@^4.3.1, handlebars@^4.7.0, handlebars@^4.7.3, hand
   optionalDependencies:
     uglify-js "^3.1.4"
 
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
-  dependencies:
-    ansi-regex "^2.0.0"
-
 has-ansi@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-3.0.0.tgz#36077ef1d15f333484aa7fa77a28606f1c655b37"
-  integrity sha1-Ngd+8dFfMzSEqn+neihgbxxlWzc=
+  integrity sha512-5JRDTvNq6mVkaMHQVXrGnaCXHD6JfqxwCy8LA/DQSqLLqePR9uaJVm2u3Ek/UziJFQz+d1ul99RtfIhE2aorkQ==
   dependencies:
     ansi-regex "^3.0.0"
 
-has-bigints@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
-  integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
+has-bigints@^1.0.1, has-bigints@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
+  integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==
 
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+  integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
 
 has-flag@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-symbols@^1.0.1, has-symbols@^1.0.2, has-symbols@^1.0.3:
+has-property-descriptors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861"
+  integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==
+  dependencies:
+    get-intrinsic "^1.1.1"
+
+has-proto@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0"
+  integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==
+
+has-symbols@^1.0.2, has-symbols@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
   integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
@@ -5562,39 +5686,40 @@ has-tostringtag@^1.0.0:
 has-unicode@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
-
-has-value@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
-  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
-  dependencies:
-    get-value "^2.0.3"
-    has-values "^0.1.4"
-    isobject "^2.0.0"
+  integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
 
 has-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
-  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
+  integrity sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==
   dependencies:
     get-value "^2.0.6"
     has-values "^1.0.0"
     isobject "^3.0.0"
 
-has-values@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
-  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
+has-value@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-2.0.2.tgz#d0f12e8780ba8e90e66ad1a21c707fdb67c25658"
+  integrity sha512-ybKOlcRsK2MqrM3Hmz/lQxXHZ6ejzSPzpNabKB45jb5qDgJvKPa3SdapTsTLwEb9WltgWpOmNax7i+DzNOk4TA==
+  dependencies:
+    get-value "^3.0.0"
+    has-values "^2.0.1"
 
 has-values@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
-  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
+  integrity sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==
   dependencies:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
+has-values@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-2.0.1.tgz#3876200ff86d8a8546a9264a952c17d5fc17579d"
+  integrity sha512-+QdH3jOmq9P8GfdjFg0eJudqx1FqU62NQJ4P16rOEHeRdl7ckgwn6uqQjzYE0ZoHVV/e5E2esuJ5Gl5+HUW19w==
+  dependencies:
+    kind-of "^6.0.2"
+
 has@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
@@ -5614,10 +5739,10 @@ hash-for-dep@^1.0.2, hash-for-dep@^1.4.7, hash-for-dep@^1.5.0, hash-for-dep@^1.5
     resolve "^1.10.0"
     resolve-package-path "^1.0.11"
 
-heimdalljs-fs-monitor@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/heimdalljs-fs-monitor/-/heimdalljs-fs-monitor-1.1.0.tgz#0ad5aa1dac0a30d5940a74edeea3d515e70225e4"
-  integrity sha512-OH1LgPeqRo5kOzN5XhU/I4lUbqDqj0jx4+6vn33RTKcZTFmp/63KWbVrDDlk9iDlQ5j6FxmOeuoWJ2cjLjvNcQ==
+heimdalljs-fs-monitor@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/heimdalljs-fs-monitor/-/heimdalljs-fs-monitor-1.1.1.tgz#bb4021007e88484202402cdf594e3962d70dc4f4"
+  integrity sha512-BHB8oOXLRlrIaON0MqJSEjGVPDyqt2Y6gu+w2PaEZjrCxeVtZG7etEZp7M4ZQ80HNvnr66KIQ2lot2qdeG8HgQ==
   dependencies:
     callsites "^3.1.0"
     clean-stack "^2.2.0"
@@ -5652,12 +5777,12 @@ homedir-polyfill@^1.0.1:
   dependencies:
     parse-passwd "^1.0.0"
 
-hosted-git-info@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz#5e425507eede4fea846b7262f0838456c4209961"
-  integrity sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==
+hosted-git-info@^6.0.0:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-6.1.1.tgz#629442c7889a69c05de604d52996b74fe6f26d58"
+  integrity sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==
   dependencies:
-    lru-cache "^6.0.0"
+    lru-cache "^7.5.1"
 
 html-encoding-sniffer@^3.0.0:
   version "3.0.0"
@@ -5666,10 +5791,10 @@ html-encoding-sniffer@^3.0.0:
   dependencies:
     whatwg-encoding "^2.0.0"
 
-html-entities@^2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.3.tgz#117d7626bece327fc8baace8868fa6f5ef856e46"
-  integrity sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==
+html-entities@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.4.0.tgz#edd0cee70402584c8c76cc2c0556db09d1f45061"
+  integrity sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==
 
 http-errors@2.0.0:
   version "2.0.0"
@@ -5685,7 +5810,7 @@ http-errors@2.0.0:
 http-errors@~1.6.2:
   version "1.6.3"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
-  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
+  integrity sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==
   dependencies:
     depd "~1.1.2"
     inherits "2.0.3"
@@ -5693,9 +5818,9 @@ http-errors@~1.6.2:
     statuses ">= 1.4.0 < 2"
 
 http-parser-js@>=0.5.1:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz#01d2709c79d41698bb01d4decc5e9da4e4a033d9"
-  integrity sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==
+  version "0.5.8"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.8.tgz#af23090d9ac4e24573de6f6aecc9d84a48bf20e3"
+  integrity sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==
 
 http-proxy-agent@^5.0.0:
   version "5.0.0"
@@ -5726,7 +5851,7 @@ https-proxy-agent@^5.0.1:
 https@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https/-/https-1.0.0.tgz#3c37c7ae1a8eeb966904a2ad1e975a194b7ed3a4"
-  integrity sha1-PDfHrhqO65ZpBKKtHpdaGUt+06Q=
+  integrity sha512-4EC57ddXrkaF0x83Oj8sM6SLQHAWXw90Skqu2M4AEWENZ3F02dFJE/GARA8igO79tcgYqGrD7ae4f5L3um2lgg==
 
 human-signals@^1.1.1:
   version "1.1.1"
@@ -5757,17 +5882,27 @@ icss-utils@^5.0.0, icss-utils@^5.1.0:
   resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
   integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==
 
+idb@^7.0.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/idb/-/idb-7.1.1.tgz#d910ded866d32c7ced9befc5bfdf36f572ced72b"
+  integrity sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ==
+
+ieee754@^1.1.13:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
+
 ignore@^5.1.1, ignore@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
-  integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
+  version "5.2.4"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
+  integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
 
 immutable@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.1.0.tgz#f795787f0db780183307b9eb2091fcac1f6fafef"
-  integrity sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.0.tgz#eb1738f14ffb39fd068b1dbe1296117484dd34be"
+  integrity sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg==
 
-import-fresh@^3.0.0, import-fresh@^3.2.1:
+import-fresh@^3.2.1:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
   integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
@@ -5786,22 +5921,27 @@ imports-loader@^4.0.1:
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
+  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
 
 individual@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/individual/-/individual-3.0.0.tgz#e7ca4f85f8957b018734f285750dc22ec2f9862d"
-  integrity sha1-58pPhfiVewGHNPKFdQ3CLsL5hi0=
+  integrity sha512-rUY5vtT748NMRbEMrTNiFfy29BgGZwGXUi2NFUVMWQrogSLzlJvQV9eeMWi+g1aVaQ53tpyLAQtd5x/JH0Nh1g==
 
 inflection@^1.12.0:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.12.0.tgz#a200935656d6f5f6bc4dc7502e1aecb703228416"
-  integrity sha1-ogCTVlbW9fa8TcdQLhrstwMihBY=
+  version "1.13.4"
+  resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.13.4.tgz#65aa696c4e2da6225b148d7a154c449366633a32"
+  integrity sha512-6I/HUDeYFfuNCVS3td055BaXBwKYuzw7K3ExVMStBowKo9oOAMJIXIHvdyR3iboTCp1b+1i5DSkIZTcwIktuDw==
+
+inflection@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/inflection/-/inflection-2.0.1.tgz#bdf3a4c05d4275f41234910cbbe9a102ac72c99b"
+  integrity sha512-wzkZHqpb4eGrOKBl34xy3umnYHx8Si5R1U4fwmdxLo5gdH6mEK8gclckTj/qWqy4Je0bsDYe/qazZYuO7xe3XQ==
 
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
   dependencies:
     once "^1.3.0"
     wrappy "1"
@@ -5809,7 +5949,7 @@ inflight@^1.0.4:
 inherits@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-1.0.2.tgz#ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b"
-  integrity sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js=
+  integrity sha512-Al67oatbRSo3RV5hRqIoln6Y5yMVbJSIn4jEJNL7VCImzq/kLr7vvb6sFRJXqr8rpHc/2kJOM+y0sPKN47VdzA==
 
 inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1:
   version "2.0.4"
@@ -5819,24 +5959,13 @@ inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, i
 inherits@2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+  integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==
 
 ini@^1.3.4:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
-inline-source-map-comment@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/inline-source-map-comment/-/inline-source-map-comment-1.0.5.tgz#50a8a44c2a790dfac441b5c94eccd5462635faf6"
-  integrity sha1-UKikTCp5DfrEQbXJTszVRiY1+vY=
-  dependencies:
-    chalk "^1.0.0"
-    get-stdin "^4.0.1"
-    minimist "^1.1.1"
-    sum-up "^1.0.1"
-    xtend "^4.0.0"
-
 inquirer@^6:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca"
@@ -5875,15 +6004,41 @@ inquirer@^7.3.3:
     strip-ansi "^6.0.0"
     through "^2.3.6"
 
-internal-slot@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c"
-  integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==
+inquirer@^9.1.5:
+  version "9.2.7"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-9.2.7.tgz#61e00658efa9b4c76a83c2c3cb3ceb88fec70ac7"
+  integrity sha512-Bf52lnfvNxGPJPltiNO2tLBp3zC339KNlGMqOkW+dsvNikBhcVDK5kqU2lVX2FTPzuXUFX5WJDlsw//w3ZwoTw==
   dependencies:
-    get-intrinsic "^1.1.0"
+    ansi-escapes "^4.3.2"
+    chalk "^5.2.0"
+    cli-cursor "^3.1.0"
+    cli-width "^4.0.0"
+    external-editor "^3.0.3"
+    figures "^5.0.0"
+    lodash "^4.17.21"
+    mute-stream "1.0.0"
+    ora "^5.4.1"
+    run-async "^3.0.0"
+    rxjs "^7.8.1"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
+    through "^2.3.6"
+    wrap-ansi "^6.0.1"
+
+internal-slot@^1.0.3, internal-slot@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986"
+  integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==
+  dependencies:
+    get-intrinsic "^1.2.0"
     has "^1.0.3"
     side-channel "^1.0.4"
 
+invert-kv@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-3.0.1.tgz#a93c7a3d4386a1dc8325b97da9bb1620c0282523"
+  integrity sha512-CYdFeFexxhv/Bcny+Q0BfOV+ltRlJcd4BBZBYFX/O0u4npJrgZtIcjokegtiSMAvlMTJ+Koq0GBCc//3bueQxw==
+
 ipaddr.js@1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
@@ -5892,7 +6047,7 @@ ipaddr.js@1.9.1:
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
-  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
+  integrity sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==
   dependencies:
     kind-of "^3.0.2"
 
@@ -5911,10 +6066,21 @@ is-arguments@^1.0.4:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
+is-array-buffer@^3.0.1, is-array-buffer@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe"
+  integrity sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.2.0"
+    is-typed-array "^1.1.10"
+
 is-bigint@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.1.tgz#6923051dfcbc764278540b9ce0e6b3213aa5ebc2"
-  integrity sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
+  integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==
+  dependencies:
+    has-bigints "^1.0.1"
 
 is-binary-path@~2.1.0:
   version "2.1.0"
@@ -5924,33 +6090,34 @@ is-binary-path@~2.1.0:
     binary-extensions "^2.0.0"
 
 is-boolean-object@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.0.tgz#e2aaad3a3a8fca34c28f6eee135b156ed2587ff0"
-  integrity sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719"
+  integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==
   dependencies:
-    call-bind "^1.0.0"
+    call-bind "^1.0.2"
+    has-tostringtag "^1.0.0"
 
 is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
-is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.4:
+is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
   integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
-is-core-module@^2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69"
-  integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==
+is-core-module@^2.11.0:
+  version "2.12.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.1.tgz#0c0b6885b6f80011c71541ce15c8d66cf5a4f9fd"
+  integrity sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==
   dependencies:
     has "^1.0.3"
 
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
-  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
+  integrity sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==
   dependencies:
     kind-of "^3.0.2"
 
@@ -5962,9 +6129,11 @@ is-data-descriptor@^1.0.0:
     kind-of "^6.0.0"
 
 is-date-object@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
-  integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
+  integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==
+  dependencies:
+    has-tostringtag "^1.0.0"
 
 is-descriptor@^0.1.0:
   version "0.1.6"
@@ -5992,7 +6161,7 @@ is-docker@^2.0.0:
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
+  integrity sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==
 
 is-extendable@^1.0.1:
   version "1.0.1"
@@ -6004,12 +6173,12 @@ is-extendable@^1.0.1:
 is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
 
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
+  integrity sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==
 
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
@@ -6026,7 +6195,7 @@ is-generator-function@^1.0.7:
 is-git-url@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-git-url/-/is-git-url-1.0.0.tgz#53f684cd143285b52c3244b4e6f28253527af66b"
-  integrity sha1-U/aEzRQyhbUsMkS05vKCU1J69ms=
+  integrity sha512-UCFta9F9rWFSavp9H3zHEHrARUfZbdJvmHKeEpds4BK3v7W2LdXoNypMtXXi5w5YBDEBCTYmbI+vsSwI8LYJaQ==
 
 is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   version "4.0.3"
@@ -6035,25 +6204,34 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
-is-language-code@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-language-code/-/is-language-code-2.0.0.tgz#6f4d59c551d73b98c45cf9f1d3ce65cee060e65b"
-  integrity sha512-6xKmRRcP2YdmMBZMVS3uiJRPQgcMYolkD6hFw2Y4KjqyIyaJlCGxUt56tuu0iIV8q9r8kMEo0Gjd/GFwKrgjbw==
+is-interactive@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e"
+  integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==
 
-is-negative-zero@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
-  integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
+is-language-code@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/is-language-code/-/is-language-code-3.1.0.tgz#b2386b49227e7010636f16d0c2c681ca40136ab5"
+  integrity sha512-zJdQ3QTeLye+iphMeK3wks+vXSRFKh68/Pnlw7aOfApFSEIOhYa8P9vwwa6QrImNNBMJTiL1PpYF0f4BxDuEgA==
+  dependencies:
+    "@babel/runtime" "^7.14.0"
+
+is-negative-zero@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
+  integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
 
 is-number-object@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197"
-  integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc"
+  integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==
+  dependencies:
+    has-tostringtag "^1.0.0"
 
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
-  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
+  integrity sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==
   dependencies:
     kind-of "^3.0.2"
 
@@ -6102,20 +6280,22 @@ is-regex@^1.1.4:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
-is-shared-array-buffer@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6"
-  integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==
+is-shared-array-buffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
+  integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==
+  dependencies:
+    call-bind "^1.0.2"
 
 is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
+  integrity sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==
 
 is-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
-  integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
+  integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
 
 is-string@^1.0.5, is-string@^1.0.7:
   version "1.0.7"
@@ -6125,20 +6305,20 @@ is-string@^1.0.5, is-string@^1.0.7:
     has-tostringtag "^1.0.0"
 
 is-symbol@^1.0.2, is-symbol@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
-  integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
+  integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
   dependencies:
-    has-symbols "^1.0.1"
+    has-symbols "^1.0.2"
 
 is-type@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/is-type/-/is-type-0.0.1.tgz#f651d85c365d44955d14a51d8d7061f3f6b4779c"
-  integrity sha1-9lHYXDZdRJVdFKUdjXBh8/a0d5w=
+  integrity sha512-YwJh/zBVrcJ90aAnPBM0CbHvm7lG9ao7lIFeqTZ1UQj4iFLpM5CikdaU+dGGesrMJwxLqPGmjjrUrQ6Kn3Zh+w==
   dependencies:
     core-util-is "~1.0.0"
 
-is-typed-array@^1.1.10, is-typed-array@^1.1.3:
+is-typed-array@^1.1.10, is-typed-array@^1.1.3, is-typed-array@^1.1.9:
   version "1.1.10"
   resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.10.tgz#36a5b5cb4189b575d1a3e4b08536bfb485801e3f"
   integrity sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==
@@ -6152,9 +6332,19 @@ is-typed-array@^1.1.10, is-typed-array@^1.1.3:
 is-typedarray@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
+  integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
 
-is-weakref@^1.0.1:
+is-unicode-supported@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
+  integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
+
+is-unicode-supported@^1.2.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-1.3.0.tgz#d824984b616c292a2e198207d4a609983842f714"
+  integrity sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==
+
+is-weakref@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
   integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==
@@ -6166,7 +6356,7 @@ is-windows@^1.0.1, is-windows@^1.0.2:
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
   integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 
-is-wsl@^2.2.0:
+is-wsl@^2.1.1, is-wsl@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
   integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
@@ -6176,39 +6366,44 @@ is-wsl@^2.2.0:
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
+  integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==
 
 isarray@1.0.0, isarray@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+  integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
 
-isbinaryfile@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.6.tgz#edcb62b224e2b4710830b67498c8e4e5a4d2610b"
-  integrity sha512-ORrEy+SNVqUhrCaal4hA4fBzhggQQ+BaLntyPOdoEiwlKZW9BZiJXjg3RMiruE4tPEI3pyVPpySHQF/dKWperg==
+isbinaryfile@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-5.0.0.tgz#034b7e54989dab8986598cbcea41f66663c65234"
+  integrity sha512-UDdnyGvMajJUWCkib7Cei/dvyJrrvo4FIrsvSFWdPpXSUorzXrDJ0S+X5Q4ZlasfPjca4yqCNNsjbCeiy8FFeg==
 
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
 isobject@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
+  integrity sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==
   dependencies:
     isarray "1.0.0"
 
 isobject@^3.0.0, isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
+  integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
+
+isobject@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-4.0.0.tgz#3f1c9155e73b192022a80819bacd0343711697b0"
+  integrity sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA==
 
 istextorbinary@2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-2.1.0.tgz#dbed2a6f51be2f7475b68f89465811141b758874"
-  integrity sha1-2+0qb1G+L3R1to+JRlgRFBt1iHQ=
+  integrity sha512-kT1g2zxZ5Tdabtpp9VSdOzW9lb6LXImyWbzbQeTxoRtHhurC9Ej9Wckngr2+uepPL09ky/mJHmN9jeJPML5t6A==
   dependencies:
     binaryextensions "1 || 2"
     editions "^1.1.1"
@@ -6223,36 +6418,31 @@ istextorbinary@^2.5.1:
     editions "^2.2.0"
     textextensions "^2.5.0"
 
-jest-worker@^27.4.1:
-  version "27.4.6"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.4.6.tgz#5d2d93db419566cb680752ca0792780e71b3273e"
-  integrity sha512-gHWJF/6Xi5CTG5QCvROr6GcmpIqNYpDJyc8A1h/DyXqH1tD6SnRCM0d3U5msV31D2LB/U+E0M+W4oyvKV44oNw==
+jest-worker@^27.4.5:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0"
+  integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==
   dependencies:
     "@types/node" "*"
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
 jquery@^3.5.0, jquery@^3.5.1:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
-  integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
-
-js-sdsl@^4.1.4:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.1.5.tgz#1ff1645e6b4d1b028cd3f862db88c9d887f26e2a"
-  integrity sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.7.0.tgz#fe2c01a05da500709006d8790fe21c8a39d75612"
+  integrity sha512-umpJ0/k8X0MvD1ds0P9SfowREz2LenHsQaxSohMZ5OMNEU2r0tf8pdeEFTHMFxWVxKNyU9rTtK3CWzUCTKJUeQ==
 
 js-string-escape@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
-  integrity sha1-4mJbrbwNZ8dTPp7cEGjFh65BN+8=
+  integrity sha512-Smw4xcfIQ5LVjAOuJCvN/zIodzA/BBSsluuoSykP+lUvScIi4U6RJLfwHet5cxFnCswUjISV8oAXaqaJDY3chg==
 
 js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@^3.14.0, js-yaml@^3.2.5, js-yaml@^3.2.7:
+js-yaml@^3.2.5, js-yaml@^3.2.7:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
   integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
@@ -6267,27 +6457,24 @@ js-yaml@^4.0.0, js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
-jsdom@^21.0.0:
-  version "21.0.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-21.0.0.tgz#33e22f2fc44286e50ac853c7b7656c8864a4ea45"
-  integrity sha512-AIw+3ZakSUtDYvhwPwWHiZsUi3zHugpMEKlNPaurviseYoBqo0zBd3zqoUi3LPCNtPFlEP8FiW9MqCZdjb2IYA==
+jsdom@^22.1.0:
+  version "22.1.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-22.1.0.tgz#0fca6d1a37fbeb7f4aac93d1090d782c56b611c8"
+  integrity sha512-/9AVW7xNbsBv6GfWho4TTNjEo9fe6Zhf9O7s0Fhhr3u+awPwAJMKwAMXnkk5vBxflqLW9hTHX/0cs+P3gW+cQw==
   dependencies:
     abab "^2.0.6"
-    acorn "^8.8.1"
-    acorn-globals "^7.0.0"
-    cssom "^0.5.0"
-    cssstyle "^2.3.0"
-    data-urls "^3.0.2"
-    decimal.js "^10.4.2"
+    cssstyle "^3.0.0"
+    data-urls "^4.0.0"
+    decimal.js "^10.4.3"
     domexception "^4.0.0"
-    escodegen "^2.0.0"
     form-data "^4.0.0"
     html-encoding-sniffer "^3.0.0"
     http-proxy-agent "^5.0.0"
     https-proxy-agent "^5.0.1"
     is-potential-custom-element-name "^1.0.1"
-    nwsapi "^2.2.2"
-    parse5 "^7.1.1"
+    nwsapi "^2.2.4"
+    parse5 "^7.1.2"
+    rrweb-cssom "^0.6.0"
     saxes "^6.0.0"
     symbol-tree "^3.2.4"
     tough-cookie "^4.1.2"
@@ -6295,8 +6482,8 @@ jsdom@^21.0.0:
     webidl-conversions "^7.0.0"
     whatwg-encoding "^2.0.0"
     whatwg-mimetype "^3.0.0"
-    whatwg-url "^11.0.0"
-    ws "^8.11.0"
+    whatwg-url "^12.0.1"
+    ws "^8.13.0"
     xml-name-validator "^4.0.0"
 
 jsesc@^2.5.1:
@@ -6307,12 +6494,12 @@ jsesc@^2.5.1:
 jsesc@~0.3.x:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.3.0.tgz#1bf5ee63b4539fe2e26d0c1e99c240b97a457972"
-  integrity sha1-G/XuY7RTn+LibQwemcJAuXpFeXI=
+  integrity sha512-UHQmAeTXV+iwEk0aHheJRqo6Or90eDxI6KIYpHSjKLXKuKlPt1CQ7tGBerFcFA8uKU5mYxiPMlckmFptd5XZzA==
 
 jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
-  integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
+  integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==
 
 json-parse-even-better-errors@^2.3.1:
   version "2.3.1"
@@ -6332,26 +6519,19 @@ json-schema-traverse@^1.0.0:
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
-  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
+  integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
-json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
-  integrity sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=
+json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1, json-stable-stringify@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.2.tgz#e06f23128e0bbe342dc996ed5a19e28b57b580e0"
+  integrity sha512-eunSSaEnxV12z+Z73y/j5N37/In40GK4GmsSy+tEHJMxknvqnA7/djeYtAgW0GsWHUfg+847WJjKaEylk2y09g==
   dependencies:
-    jsonify "~0.0.0"
+    jsonify "^0.0.1"
 
 json5@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
-  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
-
-json5@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
-  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
-  dependencies:
-    minimist "^1.2.0"
+  integrity sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==
 
 json5@^2.1.2, json5@^2.2.2:
   version "2.2.3"
@@ -6361,14 +6541,14 @@ json5@^2.1.2, json5@^2.2.2:
 jsonfile@^2.1.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
-  integrity sha1-NzaitCi4e72gzIO1P6PWM6NcKug=
+  integrity sha512-PKllAqbgLgxHaj8TElYymKCAgrASebJrWpTnEkOaTowt23VKXXN0sUeriJ+eh7y6ufb/CC5ap11pz71/cM0hUw==
   optionalDependencies:
     graceful-fs "^4.1.6"
 
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
-  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
+  integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==
   optionalDependencies:
     graceful-fs "^4.1.6"
 
@@ -6381,10 +6561,10 @@ jsonfile@^6.0.1:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
-jsonify@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
-  integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
+jsonify@^0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.1.tgz#2aa3111dae3d34a0f151c63f3a45d995d9420978"
+  integrity sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==
 
 just-extend@^4.0.2:
   version "4.2.1"
@@ -6394,14 +6574,14 @@ just-extend@^4.0.2:
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
+  integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
-  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
+  integrity sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==
   dependencies:
     is-buffer "^1.1.5"
 
@@ -6415,10 +6595,24 @@ kind-of@^6.0.0, kind-of@^6.0.2:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
+klaw-sync@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/klaw-sync/-/klaw-sync-6.0.0.tgz#1fd2cfd56ebb6250181114f0a581167099c2b28c"
+  integrity sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==
+  dependencies:
+    graceful-fs "^4.1.11"
+
+lcid@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/lcid/-/lcid-3.1.1.tgz#9030ec479a058fc36b5e8243ebaac8b6ac582fd0"
+  integrity sha512-M6T051+5QCGLBQb8id3hdvIW8+zeFV2FyBGFS9IEK5H9Wt4MueD4bW1eWikpHgZp+5xR3l5c8pZUkQsIA0BFZg==
+  dependencies:
+    invert-kv "^3.0.0"
+
 leek@0.0.24:
   version "0.0.24"
   resolved "https://registry.yarnpkg.com/leek/-/leek-0.0.24.tgz#e400e57f0e60d8ef2bd4d068dc428a54345dbcda"
-  integrity sha1-5ADlfw5g2O8r1NBo3EKKVDRdvNo=
+  integrity sha512-6PVFIYXxlYF0o6hrAsHtGpTmi06otkwNrMcmQ0K96SeSRHPREPa9J3nJZ1frliVH7XT0XFswoJFQoXsDukzGNQ==
   dependencies:
     debug "^2.1.0"
     lodash.assign "^3.2.0"
@@ -6432,36 +6626,14 @@ levn@^0.4.1:
     prelude-ls "^1.2.1"
     type-check "~0.4.0"
 
-levn@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
-  dependencies:
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-
 line-column@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/line-column/-/line-column-1.0.2.tgz#d25af2936b6f4849172b312e4792d1d987bc34a2"
-  integrity sha1-0lryk2tvSEkXKzEuR5LR2Ye8NKI=
+  integrity sha512-Ktrjk5noGYlHsVnYWh62FLVs4hTb8A3e+vucNZMgPeAOITdshMSgv4cCZQeRDjm7+goqmo6+liZwTXo+U3sVww==
   dependencies:
     isarray "^1.0.0"
     isobject "^2.0.0"
 
-linkify-it@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.2.0.tgz#e3b54697e78bf915c70a38acd78fd09e0058b1cf"
-  integrity sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==
-  dependencies:
-    uc.micro "^1.0.1"
-
-linkify-it@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.2.tgz#f55eeb8bc1d3ae754049e124ab3bb56d97797fb8"
-  integrity sha512-gDBO4aHNZS6coiZCKVhSNh43F9ioIL4JwRjLZPkoLIY4yZFwg264Y5lu2x6rb1Js42Gh6Yqm2f6L2AJcnkzinQ==
-  dependencies:
-    uc.micro "^1.0.1"
-
 linkify-it@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-4.0.1.tgz#01f1d5e508190d06669982ba31a7d9f56a5751ec"
@@ -6470,28 +6642,19 @@ linkify-it@^4.0.1:
     uc.micro "^1.0.1"
 
 livereload-js@^3.3.1:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-3.3.2.tgz#c88b009c6e466b15b91faa26fd7c99d620e12651"
-  integrity sha512-w677WnINxFkuixAoUEXOStewzLYGI76XVag+0JWMMEyjJQKs0ibWZMxkTlB96Lm3EjZ7IeOxVziBEbtxVQqQZA==
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-3.4.1.tgz#ba90fbc708ed1b9a024bb89c4ee12c96ea03d66f"
+  integrity sha512-5MP0uUeVCec89ZbNOT/i97Mc+q3SxXmiUGhRFOTmhrGPn//uWVQdCvcLJDy64MSBR5MidFdOR7B9viumoavy6g==
 
 loader-runner@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384"
-  integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==
-
-loader-utils@^1.4.0:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.2.tgz#29a957f3a63973883eb684f10ffd3d151fec01a3"
-  integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==
-  dependencies:
-    big.js "^5.2.2"
-    emojis-list "^3.0.0"
-    json5 "^1.0.1"
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1"
+  integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==
 
 loader-utils@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129"
-  integrity sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c"
+  integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==
   dependencies:
     big.js "^5.2.2"
     emojis-list "^3.0.0"
@@ -6505,19 +6668,11 @@ loader.js@^4.7.0:
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
-  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
+  integrity sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==
   dependencies:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
 
-locate-path@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
-  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
-  dependencies:
-    p-locate "^3.0.0"
-    path-exists "^3.0.0"
-
 locate-path@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
@@ -6535,7 +6690,7 @@ locate-path@^6.0.0:
 lodash._baseassign@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
-  integrity sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=
+  integrity sha512-t3N26QR2IdSN+gqSy9Ds9pBu/J1EAFEshKlUHpJG3rvyJOYgcELIxcIeKKfZk7sjOz11cFfzJRsyFry/JyabJQ==
   dependencies:
     lodash._basecopy "^3.0.0"
     lodash.keys "^3.0.0"
@@ -6543,12 +6698,12 @@ lodash._baseassign@^3.0.0:
 lodash._basecopy@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
-  integrity sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=
+  integrity sha512-rFR6Vpm4HeCK1WPGvjZSJ+7yik8d8PVUdCJx5rT2pogG4Ve/2ZS7kfmO5l5T2o5V2mqlNIfSF5MZlr1+xOoYQQ==
 
 lodash._baseflatten@^3.0.0:
   version "3.1.4"
   resolved "https://registry.yarnpkg.com/lodash._baseflatten/-/lodash._baseflatten-3.1.4.tgz#0770ff80131af6e34f3b511796a7ba5214e65ff7"
-  integrity sha1-B3D/gBMa9uNPO1EXlqe6UhTmX/c=
+  integrity sha512-fESngZd+X4k+GbTxdMutf8ohQa0s3sJEHIcwtu4/LsIQ2JTDzdRxDCMQjW+ezzwRitLmHnacVVmosCbxifefbw==
   dependencies:
     lodash.isarguments "^3.0.0"
     lodash.isarray "^3.0.0"
@@ -6556,12 +6711,12 @@ lodash._baseflatten@^3.0.0:
 lodash._bindcallback@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
-  integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4=
+  integrity sha512-2wlI0JRAGX8WEf4Gm1p/mv/SZ+jLijpj0jyaE/AXeuQphzCgD8ZQW4oSpoN8JAopujOFGU3KMuq7qfHBWlGpjQ==
 
 lodash._createassigner@^3.0.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz#838a5bae2fdaca63ac22dee8e19fa4e6d6970b11"
-  integrity sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=
+  integrity sha512-LziVL7IDnJjQeeV95Wvhw6G28Z8Q6da87LWKOPWmzBLv4u6FAT/x5v00pyGW0u38UoogNF2JnD3bGgZZDaNEBw==
   dependencies:
     lodash._bindcallback "^3.0.0"
     lodash._isiterateecall "^3.0.0"
@@ -6570,22 +6725,22 @@ lodash._createassigner@^3.0.0:
 lodash._getnative@^3.0.0:
   version "3.9.1"
   resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
-  integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
+  integrity sha512-RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA==
 
 lodash._isiterateecall@^3.0.0:
   version "3.0.9"
   resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
-  integrity sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=
+  integrity sha512-De+ZbrMu6eThFti/CSzhRvTKMgQToLxbij58LMfM8JnYDNSOjkjTCIaa8ixglOeGh2nyPlakbt5bJWJ7gvpYlQ==
 
 lodash._reinterpolate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
-  integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
+  integrity sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==
 
 lodash.assign@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-3.2.0.tgz#3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa"
-  integrity sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=
+  integrity sha512-/VVxzgGBmbphasTg51FrztxQJ/VgAUpol6zmJuSVSGcNg4g7FA4z7rQV8Ovr9V3vFBNWZhvKWHfpAytjTVUfFA==
   dependencies:
     lodash._baseassign "^3.0.0"
     lodash._createassigner "^3.0.0"
@@ -6594,29 +6749,29 @@ lodash.assign@^3.2.0:
 lodash.assignin@^4.1.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2"
-  integrity sha1-uo31+4QesKPoBEIysOJjqNxqKKI=
+  integrity sha512-yX/rx6d/UTVh7sSVWVSIMjfnz95evAgDFdb1ZozC35I9mSFCkmzptOzevxjgbQUsc78NR44LVHWjsoMQXy9FDg==
 
 lodash.castarray@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.castarray/-/lodash.castarray-4.4.0.tgz#c02513515e309daddd4c24c60cfddcf5976d9115"
-  integrity sha1-wCUTUV4wna3dTCTGDP3c9ZdtkRU=
+  integrity sha512-aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q==
 
 lodash.clonedeep@^4.4.1:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
-  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
+  integrity sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==
 
 lodash.debounce@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-3.1.1.tgz#812211c378a94cc29d5aa4e3346cf0bfce3a7df5"
-  integrity sha1-gSIRw3ipTMKdWqTjNGzwv846ffU=
+  integrity sha512-lcmJwMpdPAtChA4hfiwxTtgFeNAaow701wWUgVUqeD0XJF7vMXIN+bu/2FJSGxT0NUbZy9g9VFrlOFfPjl+0Ew==
   dependencies:
     lodash._getnative "^3.0.0"
 
 lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
-  integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
+  integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
 
 lodash.defaultsdeep@^4.6.1:
   version "4.6.1"
@@ -6626,12 +6781,12 @@ lodash.defaultsdeep@^4.6.1:
 lodash.find@^4.5.1:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.find/-/lodash.find-4.6.0.tgz#cb0704d47ab71789ffa0de8b97dd926fb88b13b1"
-  integrity sha1-ywcE1Hq3F4n/oN6Ll92Sb7iLE7E=
+  integrity sha512-yaRZoAV3Xq28F1iafWN1+a0rflOej93l1DQUejs3SZ41h2O9UJBoS9aueGjPDgAl4B6tPC0NuuchLKaDQQ3Isg==
 
 lodash.flatten@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-3.0.2.tgz#de1cf57758f8f4479319d35c3e9cc60c4501938c"
-  integrity sha1-3hz1d1j49EeTGdNcPpzGDEUBk4w=
+  integrity sha512-jCXLoNcqQRbnT/KWZq2fIREHWeczrzpTR0vsycm96l/pu5hGeAntVBG0t7GuM/2wFqmnZs3d1eGptnAH2E8+xQ==
   dependencies:
     lodash._baseflatten "^3.0.0"
     lodash._isiterateecall "^3.0.0"
@@ -6639,27 +6794,27 @@ lodash.flatten@^3.0.2:
 lodash.foreach@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53"
-  integrity sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=
+  integrity sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==
 
 lodash.get@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
-  integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
+  integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==
 
 lodash.isarguments@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
-  integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=
+  integrity sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==
 
 lodash.isarray@^3.0.0:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
-  integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=
+  integrity sha512-JwObCrNJuT0Nnbuecmqr5DgtuBppuCvGD9lxjFpAzwnVtdGoDQ1zig+5W8k5/6Gcn0gZ3936HDAlGd28i7sOGQ==
 
 lodash.keys@^3.0.0:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
-  integrity sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=
+  integrity sha512-CuBsapFjcubOGMn3VD+24HOAPxM79tH+V6ivJL3CHYjtrawauDJHUk//Yew9Hvc6e9rbCrURGk8z6PC+8WJBfQ==
   dependencies:
     lodash._getnative "^3.0.0"
     lodash.isarguments "^3.0.0"
@@ -6673,12 +6828,12 @@ lodash.merge@^4.6.0, lodash.merge@^4.6.2:
 lodash.omit@^4.1.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.omit/-/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60"
-  integrity sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA=
+  integrity sha512-XeqSp49hNGmlkj2EJlfrQFIzQ6lXdNro9sddtQzcJY8QaoC2GO0DT7xaIokHeyM+mIT0mPMlPvkYzg2xCuHdZg==
 
 lodash.restparam@^3.0.0:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
-  integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
+  integrity sha512-L4/arjjuq4noiUJpt3yS6KIKDtJwNe2fIYgMqyYYKoeIfV1iEqvPwhCx23o+R9dzouGihDAPN1dTIRWa7zk8tw==
 
 lodash.template@^4.5.0:
   version "4.5.0"
@@ -6698,17 +6853,17 @@ lodash.templatesettings@^4.0.0:
 lodash.throttle@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
-  integrity sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=
+  integrity sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==
 
 lodash.uniq@^4.2.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
-  integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
+  integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==
 
 lodash.uniqby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz#d99c07a669e9e6d24e1362dfe266c67616af1302"
-  integrity sha1-2ZwHpmnp5tJOE2Lf4mbGdhavEwI=
+  integrity sha512-e/zcLx6CSbmaEgFHCA7BnoQKyCtKMxnuWrJygbwPs/AIn+IMKl66L8/s+wBUn5LRw2pZx3bUHibiV1b6aTWIww==
 
 lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21:
   version "4.17.21"
@@ -6722,10 +6877,18 @@ log-symbols@^2.2.0:
   dependencies:
     chalk "^2.0.1"
 
+log-symbols@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
+  integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
+  dependencies:
+    chalk "^4.1.0"
+    is-unicode-supported "^0.1.0"
+
 lru-cache@2:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
-  integrity sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=
+  integrity sha512-WpibWJ60c3AgAz8a2iYErDrcT2C7OmKnsWhIcHOjkUHFjkXncJhtLxNSqUmxRxRunpb5I8Vprd7aNSd2NtksJQ==
 
 lru-cache@^5.1.1:
   version "5.1.1"
@@ -6741,17 +6904,15 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-magic-string@^0.25.7:
-  version "0.25.7"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051"
-  integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==
-  dependencies:
-    sourcemap-codec "^1.4.4"
+lru-cache@^7.5.1:
+  version "7.18.3"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89"
+  integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==
 
-magic-string@^0.26.0:
-  version "0.26.2"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.26.2.tgz#5331700e4158cd6befda738bb6b0c7b93c0d4432"
-  integrity sha512-NzzlXpclt5zAbmo6h6jNc8zl2gNRGHvmsZW4IvZhTC4W7k4OlLP+S5YLussa/r3ixNT66KOQfNORlXHSOy/X4A==
+magic-string@^0.25.7:
+  version "0.25.9"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c"
+  integrity sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==
   dependencies:
     sourcemap-codec "^1.4.8"
 
@@ -6762,46 +6923,41 @@ make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
   dependencies:
     semver "^6.0.0"
 
-makeerror@1.0.x:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
-  integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=
+makeerror@1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a"
+  integrity sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==
   dependencies:
-    tmpl "1.0.x"
+    tmpl "1.0.5"
+
+map-age-cleaner@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
+  integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==
+  dependencies:
+    p-defer "^1.0.0"
 
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
-  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
+  integrity sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==
 
 map-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
-  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
+  integrity sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==
   dependencies:
     object-visit "^1.0.0"
 
-markdown-it-terminal@0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/markdown-it-terminal/-/markdown-it-terminal-0.2.1.tgz#670fd5ea824a7dcaa1591dcbeef28bf70aff1705"
-  integrity sha512-e8hbK9L+IyFac2qY05R7paP+Fqw1T4pSQW3miK3VeG9QmpqBjg5Qzjv/v6C7YNxSNRS2Kp8hUFtm5lWU9eK4lw==
+markdown-it-terminal@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/markdown-it-terminal/-/markdown-it-terminal-0.4.0.tgz#d58466e3de0a638d6a5bd7e16ca51d8e55f3a3ac"
+  integrity sha512-NeXtgpIK6jBciHTm9UhiPnyHDdqyVIdRPJ+KdQtZaf/wR74gvhCNbw5li4TYsxRp5u3ZoHEF4DwpECeZqyCw+w==
   dependencies:
     ansi-styles "^3.0.0"
     cardinal "^1.0.0"
     cli-table "^0.3.1"
     lodash.merge "^4.6.2"
-    markdown-it "^8.3.1"
-
-markdown-it@^12.0.4:
-  version "12.0.4"
-  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.0.4.tgz#eec8247d296327eac3ba9746bdeec9cfcc751e33"
-  integrity sha512-34RwOXZT8kyuOJy25oJNJoulO8L0bTHYWXcdZBYZqFnjIy3NgjeoM3FmPXIOFQ26/lSHYMr8oc62B6adxXcb3Q==
-  dependencies:
-    argparse "^2.0.1"
-    entities "~2.1.0"
-    linkify-it "^3.0.1"
-    mdurl "^1.0.1"
-    uc.micro "^1.0.5"
 
 markdown-it@^13.0.1:
   version "13.0.1"
@@ -6814,17 +6970,6 @@ markdown-it@^13.0.1:
     mdurl "^1.0.1"
     uc.micro "^1.0.5"
 
-markdown-it@^8.3.1:
-  version "8.4.2"
-  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.2.tgz#386f98998dc15a37722aa7722084f4020bdd9b54"
-  integrity sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==
-  dependencies:
-    argparse "^1.0.7"
-    entities "~1.1.1"
-    linkify-it "^2.0.0"
-    mdurl "^1.0.1"
-    uc.micro "^1.0.5"
-
 matcher-collection@^1.0.0, matcher-collection@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/matcher-collection/-/matcher-collection-1.1.2.tgz#1076f506f10ca85897b53d14ef54f90a5c426838"
@@ -6843,12 +6988,21 @@ matcher-collection@^2.0.0, matcher-collection@^2.0.1:
 mdurl@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
-  integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
+  integrity sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==
 
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
-  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
+  integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==
+
+mem@^5.0.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-5.1.1.tgz#7059b67bf9ac2c924c9f1cff7155a064394adfb3"
+  integrity sha512-qvwipnozMohxLXG1pOqoLiZKNkC4r4qqRucSoDwXowsNGDSULiqFTRUF05vcZWnwJSG22qTsynQhxbaMtnX9gw==
+  dependencies:
+    map-age-cleaner "^0.1.3"
+    mimic-fn "^2.1.0"
+    p-is-promise "^2.1.0"
 
 memory-streams@^0.1.3:
   version "0.1.3"
@@ -6860,7 +7014,7 @@ memory-streams@^0.1.3:
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
-  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
+  integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==
 
 merge-stream@^2.0.0:
   version "2.0.0"
@@ -6880,15 +7034,15 @@ merge2@^1.2.3, merge2@^1.3.0:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-message-bus-client@^4.3.0:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/message-bus-client/-/message-bus-client-4.3.1.tgz#2107b569131b03d7277801cd3409059e48e9f25e"
-  integrity sha512-gPG8POalZrM6t9xZPIzER3uDCiAfdwMEjx6ulbYICqzJx0CpLSnZRXKuWvhds4dM3iZQZXpH37UCfYYNICKu5g==
+message-bus-client@^4.3.7:
+  version "4.3.7"
+  resolved "https://registry.yarnpkg.com/message-bus-client/-/message-bus-client-4.3.7.tgz#c06c6d0228235571c7addcdfa6065ed8c42b125e"
+  integrity sha512-lpdZWexPtU1chEgW5XxbxK/Ra/r8o1zfPxE76dSAO9DkK7i5lQhUTFdFGHy7CdSX747GqTa8dBk51SJZlWU+vQ==
 
 messageformat@0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/messageformat/-/messageformat-0.1.5.tgz#c7c561de181b04ef0fad36ca89c5cb942e5bb75c"
-  integrity sha1-x8Vh3hgbBO8PrTbKicXLlC5bt1w=
+  integrity sha512-Ppf1WSwINnNdYUnbQnMaRj/3zY+QFJsGf/a2o98a62t3DX7TtUjn9O9CFDxiCkJPPtayf1W0YfvaTDYX6cBxBQ==
   dependencies:
     async "~0.1.18"
     coffee-script "~1.2.0"
@@ -6900,7 +7054,7 @@ messageformat@0.1.5:
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
-  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
+  integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
 
 micromatch@^3.1.4:
   version "3.1.10"
@@ -6921,13 +7075,13 @@ micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
-micromatch@^4.0.2:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
-  integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
+micromatch@^4.0.2, micromatch@^4.0.4:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
+  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
   dependencies:
-    braces "^3.0.1"
-    picomatch "^2.2.3"
+    braces "^3.0.2"
+    picomatch "^2.3.1"
 
 mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":
   version "1.52.0"
@@ -6937,7 +7091,7 @@ mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":
 mime-match@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/mime-match/-/mime-match-1.0.2.tgz#3f87c31e9af1a5fd485fb9db134428b23bbb7ba8"
-  integrity sha1-P4fDHprxpf1IX7nbE0Qosju7e6g=
+  integrity sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==
   dependencies:
     wildcard "^1.1.0"
 
@@ -6966,41 +7120,50 @@ mimic-fn@^2.1.0:
 min-document@^2.19.0:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685"
-  integrity sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=
+  integrity sha512-9Wy1B3m3f66bPPmU5hdA4DR4PB2OfDU/+GS3yAB7IQozE3tqXaVv2zOjgla7MEGSRv95+ILmOuvhLkOK6wJtCQ==
   dependencies:
     dom-walk "^0.1.0"
 
 mini-css-extract-plugin@^2.5.2:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.5.2.tgz#b3b9b98320c2c054d92c16f6a94ddfdbbba13755"
-  integrity sha512-Lwgq9qLNyBK6yNLgzssXnq4r2+mB9Mz3cJWlM8kseysHIvTicFhDNimFgY94jjqlwhNzLPsq8wv4X+vOHtMdYA==
+  version "2.7.6"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.6.tgz#282a3d38863fddcd2e0c220aaed5b90bc156564d"
+  integrity sha512-Qk7HcgaPkGG6eD77mLvZS1nmxlao3j+9PkrT9Uc7HAE1id3F41+DdBRYRYkbyfNRGzm8/YWtzhw7nVPmwhqTQw==
   dependencies:
     schema-utils "^4.0.0"
 
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.2:
+"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
   dependencies:
     brace-expansion "^1.1.7"
 
+minimatch@^5.0.1:
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
+  integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
+  dependencies:
+    brace-expansion "^2.0.1"
+
+minimatch@^7.4.3:
+  version "7.4.6"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-7.4.6.tgz#845d6f254d8f4a5e4fd6baf44d5f10c8448365fb"
+  integrity sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 minimatch@~0.2.11:
   version "0.2.14"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.2.14.tgz#c74e780574f63c6f9a090e90efbe6ef53a6a756a"
-  integrity sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=
+  integrity sha512-zZ+Jy8lVWlvqqeM8iZB7w7KmQkoJn8djM585z88rywrEbzoqawVa9FR5p2hwD+y74nfuKOjmNvi9gtWJNLqHvA==
   dependencies:
     lru-cache "2"
     sigmund "~1.0.0"
 
-minimist@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.2.1.tgz#827ba4e7593464e7c221e8c5bed930904ee2c455"
-  integrity sha512-GY8fANSrTMfBVfInqJAY41QkOM+upUTytK1jZ0c8+3HdHrJxBJ3rF5i9moClXTE8uUSnUo8cAsCoxDXvSY4DHg==
-
-minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
-  integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
+minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
+  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
 minipass@^2.2.0:
   version "2.9.0"
@@ -7018,12 +7181,12 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.5:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
-  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
+mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.5, mkdirp@^0.5.6:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
+  integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
   dependencies:
-    minimist "^1.2.5"
+    minimist "^1.2.6"
 
 mkdirp@^1.0.4:
   version "1.0.4"
@@ -7033,7 +7196,7 @@ mkdirp@^1.0.4:
 mktemp@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/mktemp/-/mktemp-0.4.0.tgz#6d0515611c8a8c84e484aa2000129b98e981ff0b"
-  integrity sha1-bQUVYRyKjITkhKogABKbmOmB/ws=
+  integrity sha512-IXnMcJ6ZyTuhRmJSjzvHSRhlVPiN9Jwc6e59V0bEJ0ba6OBeX2L0E+mRN1QseeOF4mM+F1Rit6Nh7o+rl2Yn/A==
 
 morgan@^1.10.0:
   version "1.10.0"
@@ -7046,15 +7209,10 @@ morgan@^1.10.0:
     on-finished "~2.3.0"
     on-headers "~1.0.2"
 
-mout@^1.0.0:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/mout/-/mout-1.2.4.tgz#9ffd261c4d6509e7ebcbf6b641a89b36ecdf8155"
-  integrity sha512-mZb9uOruMWgn/fw28DG4/yE3Kehfk1zKCLhuDU2O3vlKdnBBr4XaOCqVTflJ5aODavGUPqFHZgrFX3NJVuxGhQ==
-
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+  integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
 
 ms@2.1.2:
   version "2.1.2"
@@ -7074,27 +7232,32 @@ mustache@^4.2.0:
 mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
-  integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
+  integrity sha512-r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ==
 
 mute-stream@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
+mute-stream@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-1.0.0.tgz#e31bd9fe62f0aed23520aa4324ea6671531e013e"
+  integrity sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==
+
 namespace-emitter@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/namespace-emitter/-/namespace-emitter-2.0.1.tgz#978d51361c61313b4e6b8cf6f3853d08dfa2b17c"
   integrity sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==
 
-nanoid@^3.1.30:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c"
-  integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==
+nanoid@^3.3.6:
+  version "3.3.6"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c"
+  integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
 
 nanoid@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-4.0.0.tgz#6e144dee117609232c3f415c34b0e550e64999a5"
-  integrity sha512-IgBP8piMxe/gf73RTQx7hmnhwz0aaEXYakvqZyE302IXW3HyVNhdNGC+O2MwMAVhLEnvXlvKtGbtJf6wvHihCg==
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-4.0.2.tgz#140b3c5003959adbebf521c170f282c5e7f9fb9e"
+  integrity sha512-7ZtY5KTCNheRGfEFxnedV5zFiORN1+Y1N6zvPTnHQd8ENUvfaDBeuJDZb2bN/oXwXxu3qkTXDzy57W5vAmDTBw==
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -7116,7 +7279,7 @@ nanomatch@^1.2.9:
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
-  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
+  integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
 negotiator@0.6.3:
   version "0.6.3"
@@ -7131,20 +7294,20 @@ neo-async@^2.6.0, neo-async@^2.6.2:
 next-tick@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-0.2.2.tgz#75da4a927ee5887e39065880065b7336413b310d"
-  integrity sha1-ddpKkn7liH45BliABltzNkE7MQ0=
+  integrity sha512-f7h4svPtl+QidoBv4taKXUjJ70G2asaZ8G28nS0OkqaalX8dwwrtWtyxEDPK62AC00ur/+/E0pUwBwY5EPn15Q==
 
 nice-try@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
-nise@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/nise/-/nise-5.1.2.tgz#a7b8909c216b3491fd4fc0b124efb69f3939b449"
-  integrity sha512-+gQjFi8v+tkfCuSCxfURHLhRhniE/+IaYbIphxAN2JRR9SHKhY8hgXpaXiYfHdw+gcGe4buxgbprBQFab9FkhA==
+nise@^5.1.4:
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/nise/-/nise-5.1.4.tgz#491ce7e7307d4ec546f5a659b2efe94a18b4bbc0"
+  integrity sha512-8+Ib8rRJ4L0o3kfmyVCL7gzrohyDe0cMFTBa2d364yIrEGMEoetznKJx899YxjybU6bL9SQkYPSBBs1gyYs8Xg==
   dependencies:
     "@sinonjs/commons" "^2.0.0"
-    "@sinonjs/fake-timers" "^7.0.4"
+    "@sinonjs/fake-timers" "^10.0.2"
     "@sinonjs/text-encoding" "^0.7.1"
     just-extend "^4.0.2"
     path-to-regexp "^1.7.0"
@@ -7155,16 +7318,16 @@ node-domexception@^1.0.0:
   integrity sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==
 
 node-fetch@^2.6.0:
-  version "2.6.7"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
-  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
+  version "2.6.11"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.11.tgz#cde7fc71deef3131ef80a738919f999e6edfff25"
+  integrity sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==
   dependencies:
     whatwg-url "^5.0.0"
 
-node-fetch@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.3.0.tgz#37e71db4ecc257057af828d523a7243d651d91e4"
-  integrity sha512-BKwRP/O0UvoMKp7GNdwPlObhYGB5DQqwhEDQlNKuoqwVYSxkSZCSbHjnFFmUEtwSKRPU4kNK8PbDYYitwaE3QA==
+node-fetch@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.3.2.tgz#d1e889bacdf733b4ff3b2b243eb7a12866a0b78b"
+  integrity sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==
   dependencies:
     data-uri-to-buffer "^4.0.0"
     fetch-blob "^3.1.4"
@@ -7173,12 +7336,7 @@ node-fetch@^3.3.0:
 node-int64@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
-  integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
-
-node-modules-path@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/node-modules-path/-/node-modules-path-1.0.2.tgz#e3acede9b7baf4bc336e3496b58e5b40d517056e"
-  integrity sha512-6Gbjq+d7uhkO7epaKi5DNgUJn7H0gEyA4Jg0Mo1uQOi3Rk50G83LtmhhFyw0LxnAFhtlspkiiw52ISP13qzcBg==
+  integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==
 
 node-notifier@^10.0.0:
   version "10.0.1"
@@ -7192,10 +7350,10 @@ node-notifier@^10.0.0:
     uuid "^8.3.2"
     which "^2.0.2"
 
-node-releases@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
-  integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==
+node-releases@^2.0.12:
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.12.tgz#35627cc224a23bfb06fb3380f2b3afaaa7eb1039"
+  integrity sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ==
 
 node-watch@0.7.3:
   version "0.7.3"
@@ -7205,21 +7363,21 @@ node-watch@0.7.3:
 nopt@^3.0.6:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
-  integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
+  integrity sha512-4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg==
   dependencies:
     abbrev "1"
 
 nopt@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-2.0.0.tgz#ca7416f20a5e3f9c3b86180f96295fa3d0b52e0d"
-  integrity sha1-ynQW8gpeP5w7hhgPlilfo9C1Lg0=
+  integrity sha512-uVTsuT8Hm3aN3VttY+BPKw4KU9lVpI0F22UAr/I1r6+kugMr3oyhMALkycikLcdfvGRsgzCYN48DYLBFcJEUVg==
   dependencies:
     abbrev "1"
 
 normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
+  integrity sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==
   dependencies:
     remove-trailing-separator "^1.0.1"
 
@@ -7228,19 +7386,20 @@ normalize-path@^3.0.0, normalize-path@~3.0.0:
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
-npm-package-arg@^8.1.1:
-  version "8.1.5"
-  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.5.tgz#3369b2d5fe8fdc674baa7f1786514ddc15466e44"
-  integrity sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==
+npm-package-arg@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-10.1.0.tgz#827d1260a683806685d17193073cc152d3c7e9b1"
+  integrity sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==
   dependencies:
-    hosted-git-info "^4.0.1"
-    semver "^7.3.4"
-    validate-npm-package-name "^3.0.0"
+    hosted-git-info "^6.0.0"
+    proc-log "^3.0.0"
+    semver "^7.3.5"
+    validate-npm-package-name "^5.0.0"
 
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
-  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
+  integrity sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==
   dependencies:
     path-key "^2.0.0"
 
@@ -7268,20 +7427,20 @@ npmlog@^6.0.0:
     gauge "^4.0.3"
     set-blocking "^2.0.0"
 
-nwsapi@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.2.tgz#e5418863e7905df67d51ec95938d67bf801f0bb0"
-  integrity sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==
+nwsapi@^2.2.4:
+  version "2.2.5"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.5.tgz#a52744c61b3889dd44b0a158687add39b8d935e2"
+  integrity sha512-6xpotnECFy/og7tKSBVmUNft7J3jyXAka4XvG6AUhFWRz+Q/Ljus7znJAA3bxColfQLdS+XsjoodtJfCgeTEFQ==
 
 object-assign@4.1.1, object-assign@^4, object-assign@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
+  integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
 object-copy@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
-  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
+  integrity sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==
   dependencies:
     copy-descriptor "^0.1.0"
     define-property "^0.2.5"
@@ -7292,12 +7451,12 @@ object-hash@^1.3.1:
   resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.1.tgz#fde452098a951cb145f039bb7d455449ddc126df"
   integrity sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==
 
-object-inspect@^1.11.0, object-inspect@^1.9.0:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0"
-  integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==
+object-inspect@^1.12.3, object-inspect@^1.9.0:
+  version "1.12.3"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9"
+  integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==
 
-object-keys@^1.0.12, object-keys@^1.1.1:
+object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
@@ -7305,24 +7464,24 @@ object-keys@^1.0.12, object-keys@^1.1.1:
 object-visit@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
-  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
+  integrity sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==
   dependencies:
     isobject "^3.0.0"
 
-object.assign@^4.1.0, object.assign@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
-  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
+object.assign@^4.1.4:
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
+  integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
   dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-    has-symbols "^1.0.1"
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    has-symbols "^1.0.3"
     object-keys "^1.1.1"
 
 object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
-  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
+  integrity sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==
   dependencies:
     isobject "^3.0.1"
 
@@ -7336,7 +7495,7 @@ on-finished@2.4.1:
 on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
-  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
+  integrity sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==
   dependencies:
     ee-first "1.1.1"
 
@@ -7348,14 +7507,14 @@ on-headers@~1.0.2:
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
   dependencies:
     wrappy "1"
 
 onetime@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
-  integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
+  integrity sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ==
   dependencies:
     mimic-fn "^1.0.0"
 
@@ -7366,29 +7525,25 @@ onetime@^5.1.0, onetime@^5.1.2:
   dependencies:
     mimic-fn "^2.1.0"
 
-optionator@^0.8.1:
-  version "0.8.3"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
-  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
+open@^7.4.2:
+  version "7.4.2"
+  resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321"
+  integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==
   dependencies:
-    deep-is "~0.1.3"
-    fast-levenshtein "~2.0.6"
-    levn "~0.3.0"
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-    word-wrap "~1.2.3"
+    is-docker "^2.0.0"
+    is-wsl "^2.1.1"
 
-optionator@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
-  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
+optionator@^0.9.3:
+  version "0.9.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64"
+  integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==
   dependencies:
+    "@aashutoshrathi/word-wrap" "^1.2.3"
     deep-is "^0.1.3"
     fast-levenshtein "^2.0.6"
     levn "^0.4.1"
     prelude-ls "^1.2.1"
     type-check "^0.4.0"
-    word-wrap "^1.2.3"
 
 ora@^3.4.0:
   version "3.4.0"
@@ -7402,23 +7557,39 @@ ora@^3.4.0:
     strip-ansi "^5.2.0"
     wcwidth "^1.0.1"
 
-os-homedir@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
+ora@^5.4.1:
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18"
+  integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==
+  dependencies:
+    bl "^4.1.0"
+    chalk "^4.1.0"
+    cli-cursor "^3.1.0"
+    cli-spinners "^2.5.0"
+    is-interactive "^1.0.0"
+    is-unicode-supported "^0.1.0"
+    log-symbols "^4.1.0"
+    strip-ansi "^6.0.0"
+    wcwidth "^1.0.1"
 
-os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
+os-locale@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-5.0.0.tgz#6d26c1d95b6597c5d5317bf5fba37eccec3672e0"
+  integrity sha512-tqZcNEDAIZKBEPnHPlVDvKrp7NzgLi7jRmhKiUoa2NUmhl13FtkAGLUVR+ZsYvApBQdBfYm43A4tXXQ4IrYLBA==
+  dependencies:
+    execa "^4.0.0"
+    lcid "^3.0.0"
+    mem "^5.0.0"
+
+os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
+  integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==
 
-osenv@^0.1.3:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
-  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.0"
+p-defer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
+  integrity sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw==
 
 p-defer@^3.0.0:
   version "3.0.0"
@@ -7428,13 +7599,18 @@ p-defer@^3.0.0:
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
+  integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==
 
 p-finally@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561"
   integrity sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==
 
+p-is-promise@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
+  integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
+
 p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
@@ -7442,7 +7618,7 @@ p-limit@^1.1.0:
   dependencies:
     p-try "^1.0.0"
 
-p-limit@^2.0.0, p-limit@^2.2.0:
+p-limit@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
   integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
@@ -7459,17 +7635,10 @@ p-limit@^3.0.2:
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
-  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
+  integrity sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==
   dependencies:
     p-limit "^1.1.0"
 
-p-locate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
-  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
-  dependencies:
-    p-limit "^2.0.0"
-
 p-locate@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
@@ -7487,7 +7656,7 @@ p-locate@^5.0.0:
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
-  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
+  integrity sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==
 
 p-try@^2.0.0:
   version "2.2.0"
@@ -7504,7 +7673,7 @@ parent-module@^1.0.0:
 parse-passwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
-  integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
+  integrity sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==
 
 parse-static-imports@^1.1.0:
   version "1.1.0"
@@ -7516,10 +7685,10 @@ parse5@^6.0.1:
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
   integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
 
-parse5@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.1.tgz#4649f940ccfb95d8754f37f73078ea20afe0c746"
-  integrity sha512-kwpuwzB+px5WUg9pyK0IcK/shltJN5/OVhQagxhCQNtT9Y9QRZqNY2e1cmbu/paRh5LMnz/oVTVLBpjFmMZhSg==
+parse5@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32"
+  integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==
   dependencies:
     entities "^4.4.0"
 
@@ -7531,12 +7700,33 @@ parseurl@~1.3.3:
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
-  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
+  integrity sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==
+
+patch-package@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-8.0.0.tgz#d191e2f1b6e06a4624a0116bcb88edd6714ede61"
+  integrity sha512-da8BVIhzjtgScwDJ2TtKsfT5JFWz1hYoBl9rUQ1f38MC2HwnEIkK8VN3dKMKcP7P7bvvgzNDbfNHtx3MsQb5vA==
+  dependencies:
+    "@yarnpkg/lockfile" "^1.1.0"
+    chalk "^4.1.2"
+    ci-info "^3.7.0"
+    cross-spawn "^7.0.3"
+    find-yarn-workspace-root "^2.0.0"
+    fs-extra "^9.0.0"
+    json-stable-stringify "^1.0.2"
+    klaw-sync "^6.0.0"
+    minimist "^1.2.6"
+    open "^7.4.2"
+    rimraf "^2.6.3"
+    semver "^7.5.3"
+    slash "^2.0.0"
+    tmp "^0.0.33"
+    yaml "^2.2.2"
 
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
+  integrity sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==
 
 path-exists@^4.0.0:
   version "4.0.0"
@@ -7546,12 +7736,12 @@ path-exists@^4.0.0:
 path-is-absolute@1.0.1, path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
 path-key@^2.0.0, path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
+  integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==
 
 path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.1"
@@ -7566,24 +7756,24 @@ path-parse@^1.0.7:
 path-posix@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/path-posix/-/path-posix-1.0.0.tgz#06b26113f56beab042545a23bfa88003ccac260f"
-  integrity sha1-BrJhE/Vr6rBCVFojv6iAA8ysJg8=
+  integrity sha512-1gJ0WpNIiYcQydgg3Ed8KzvIqTsDpNwq+cjBCssvBtuTWjEqY1AW+i+OepiEMqDCzyro9B2sLAe4RBPajMYFiA==
 
 path-root-regex@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
-  integrity sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=
+  integrity sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==
 
 path-root@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
-  integrity sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=
+  integrity sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==
   dependencies:
     path-root-regex "^0.1.0"
 
 path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
-  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
+  integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==
 
 path-to-regexp@^1.7.0:
   version "1.8.0"
@@ -7602,22 +7792,10 @@ picocolors@^1.0.0:
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d"
-  integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==
-
-pinkie-promise@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
-  dependencies:
-    pinkie "^2.0.0"
-
-pinkie@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
+  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
 pkg-dir@^4.1.0:
   version "4.2.0"
@@ -7629,30 +7807,23 @@ pkg-dir@^4.1.0:
 pkg-up@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"
-  integrity sha1-yBmscoBZpGHKscOImivjxJoATX8=
+  integrity sha512-fjAPuiws93rm7mPUu21RdBnkeZNrbfCFCwfAhPWY+rR3zG0ubpe5cEReHOw5fIbfmsxEV/g2kSxGTATY3Bpnwg==
   dependencies:
     find-up "^2.1.0"
 
-pkg-up@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5"
-  integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==
+portfinder@^1.0.32:
+  version "1.0.32"
+  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.32.tgz#2fe1b9e58389712429dc2bea5beb2146146c7f81"
+  integrity sha512-on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg==
   dependencies:
-    find-up "^3.0.0"
-
-portfinder@^1.0.28:
-  version "1.0.28"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778"
-  integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==
-  dependencies:
-    async "^2.6.2"
-    debug "^3.1.1"
-    mkdirp "^0.5.5"
+    async "^2.6.4"
+    debug "^3.2.7"
+    mkdirp "^0.5.6"
 
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
-  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
+  integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==
 
 postcss-modules-extract-imports@^3.0.0:
   version "3.0.0"
@@ -7660,9 +7831,9 @@ postcss-modules-extract-imports@^3.0.0:
   integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==
 
 postcss-modules-local-by-default@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c"
-  integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz#b08eb4f083050708998ba2c6061b50c2870ca524"
+  integrity sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==
   dependencies:
     icss-utils "^5.0.0"
     postcss-selector-parser "^6.0.2"
@@ -7683,9 +7854,9 @@ postcss-modules-values@^4.0.0:
     icss-utils "^5.0.0"
 
 postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
-  version "6.0.9"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.9.tgz#ee71c3b9ff63d9cd130838876c13a2ec1a992b2f"
-  integrity sha512-UO3SgnZOVTwu4kyLR22UQ1xZh086RyNZppb7lLAKBFK8a32ttG5i87Y/P3+2bRSjZNyJ1B7hfFNo273tKe9YxQ==
+  version "6.0.13"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz#d05d8d76b1e8e173257ef9d60b706a8e5e99bf1b"
+  integrity sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==
   dependencies:
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
@@ -7696,29 +7867,29 @@ postcss-value-parser@^4.1.0:
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
 postcss@^8.2.15:
-  version "8.4.5"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.5.tgz#bae665764dfd4c6fcc24dc0fdf7e7aa00cc77f95"
-  integrity sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg==
+  version "8.4.24"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.24.tgz#f714dba9b2284be3cc07dbd2fc57ee4dc972d2df"
+  integrity sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==
   dependencies:
-    nanoid "^3.1.30"
+    nanoid "^3.3.6"
     picocolors "^1.0.0"
-    source-map-js "^1.0.1"
+    source-map-js "^1.0.2"
+
+postinstall-postinstall@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/postinstall-postinstall/-/postinstall-postinstall-2.1.0.tgz#4f7f77441ef539d1512c40bd04c71b06a4704ca3"
+  integrity sha512-7hQX6ZlZXIoRiWNrbMQaLzUUfH+sSx39u8EJ9HYuDc1kLo9IXKWjM5RSquZN1ad5GnH8CGFM78fsAAQi3OKEEQ==
 
 preact@^10.5.13:
-  version "10.5.14"
-  resolved "https://registry.yarnpkg.com/preact/-/preact-10.5.14.tgz#0b14a2eefba3c10a57116b90d1a65f5f00cd2701"
-  integrity sha512-KojoltCrshZ099ksUZ2OQKfbH66uquFoxHSbnwKbTJHeQNvx42EmC7wQVWNuDt6vC5s3nudRHFtKbpY4ijKlaQ==
+  version "10.15.1"
+  resolved "https://registry.yarnpkg.com/preact/-/preact-10.15.1.tgz#a1de60c9fc0c79a522d969c65dcaddc5d994eede"
+  integrity sha512-qs2ansoQEwzNiV5eAcRT1p1EC/dmEzaATVDJNiB3g2sRDWdA7b7MurXdJjB2+/WQktGWZwxvDrnuRFbWuIr64g==
 
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
-prelude-ls@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
-  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
-
 pretender@^3.4.7:
   version "3.4.7"
   resolved "https://registry.yarnpkg.com/pretender/-/pretender-3.4.7.tgz#34a2ae2d1fc9db440a990d50e6c0f5481d8755fc"
@@ -7727,6 +7898,11 @@ pretender@^3.4.7:
     fake-xml-http-request "^2.1.2"
     route-recognizer "^0.3.3"
 
+prettier@^2.5.1:
+  version "2.8.8"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
+  integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
+
 printf@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/printf/-/printf-0.6.1.tgz#b9afa3d3b55b7f2e8b1715272479fc756ed88650"
@@ -7737,22 +7913,20 @@ private@^0.1.8:
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
   integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
 
-process-relative-require@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/process-relative-require/-/process-relative-require-1.0.0.tgz#1590dfcf5b8f2983ba53e398446b68240b4cc68a"
-  integrity sha1-FZDfz1uPKYO6U+OYRGtoJAtMxoo=
-  dependencies:
-    node-modules-path "^1.0.0"
+proc-log@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-3.0.0.tgz#fb05ef83ccd64fd7b20bbe9c8c1070fc08338dd8"
+  integrity sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==
 
 process@^0.11.10:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
-  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
+  integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==
 
 promise-map-series@^0.2.1:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/promise-map-series/-/promise-map-series-0.2.3.tgz#c2d377afc93253f6bd03dbb77755eb88ab20a847"
-  integrity sha1-wtN3r8kyU/a9A9u3d1XriKsgqEc=
+  integrity sha512-wx9Chrutvqu1N/NHzTayZjE1BgIwt6SJykQoCOic4IZ9yUDjKyVYrpLa/4YCNsV61eRENfs29hrEquVuB13Zlw==
   dependencies:
     rsvp "^3.0.14"
 
@@ -7761,10 +7935,10 @@ promise-map-series@^0.3.0:
   resolved "https://registry.yarnpkg.com/promise-map-series/-/promise-map-series-0.3.0.tgz#41873ca3652bb7a042b387d538552da9b576f8a1"
   integrity sha512-3npG2NGhTc8BWBolLLf8l/92OxMGaRLbqvIh9wjCHhDXNvk4zsxaTaCpiCunW09qWPrN2zeNSNwRLVBrQQtutA==
 
-promise.hash.helper@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/promise.hash.helper/-/promise.hash.helper-1.0.7.tgz#2f39d8495df40dcdfbc1d5be9e9e56efeae7f180"
-  integrity sha512-0qhWYyCV9TYDMSooYw1fShIb7R6hsWYja7JLqbeb1MvHqDTvP/uy/R1RsyVqDi6GCiHOI4G5p2Hpr3IA+/l/+Q==
+promise.hash.helper@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/promise.hash.helper/-/promise.hash.helper-1.0.8.tgz#8c5fa0570f6f96821f52364fd72292b2c5a114f7"
+  integrity sha512-KYcnXctWUWyVD3W3Ye0ZDuA1N8Szrh85cVCxpG6xYrOk/0CttRtYCmU30nWsUch0NuExQQ63QXvzRE6FLimZmg==
 
 proxy-addr@~2.0.7:
   version "2.0.7"
@@ -7775,9 +7949,9 @@ proxy-addr@~2.0.7:
     ipaddr.js "1.9.1"
 
 psl@^1.1.33:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
-  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
+  integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
 
 pump@^3.0.0:
   version "3.0.0"
@@ -7787,18 +7961,25 @@ pump@^3.0.0:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
-punycode@^2.1.0, punycode@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+punycode@^2.1.0, punycode@^2.1.1, punycode@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
+  integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
 
-qs@6.11.0, qs@^6.4.0:
+qs@6.11.0:
   version "6.11.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a"
   integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==
   dependencies:
     side-channel "^1.0.4"
 
+qs@^6.4.0:
+  version "6.11.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.2.tgz#64bea51f12c1f5da1bc01496f48ffcff7c69d7d9"
+  integrity sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==
+  dependencies:
+    side-channel "^1.0.4"
+
 querystringify@^2.1.1:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
@@ -7812,7 +7993,7 @@ queue-microtask@^1.2.2:
 quick-temp@^0.1.2, quick-temp@^0.1.3, quick-temp@^0.1.5, quick-temp@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/quick-temp/-/quick-temp-0.1.8.tgz#bab02a242ab8fb0dd758a3c9776b32f9a5d94408"
-  integrity sha1-urAqJCq4+w3XWKPJd2sy+aXZRAg=
+  integrity sha512-YsmIFfD9j2zaFwJkzI6eMG7y0lQP7YeWzgtFgNl38pGWZBSXJooZbOWwkcRot7Vt0Fg9L23pX0tqWU3VvLDsiA==
   dependencies:
     mktemp "~0.4.0"
     rimraf "^2.5.4"
@@ -7828,10 +8009,10 @@ qunit-dom@^2.0.0:
     ember-cli-babel "^7.23.0"
     ember-cli-version-checker "^5.1.1"
 
-qunit@^2.19.3:
-  version "2.19.3"
-  resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.19.3.tgz#bcf81a2e8d176dc19fe8dd358c4cbd08619af03a"
-  integrity sha512-vEnspSZ37u2oR01OA/IZ1Td5V7BvQYFECdKPv86JaBplDNa5IHg0v7jFSPoP5L5o78Dbi8sl7/ATtpRDAKlSdw==
+qunit@^2.19.4:
+  version "2.19.4"
+  resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.19.4.tgz#2d689bb1165edd4b812e3ed2ee06ff907e9f2ece"
+  integrity sha512-aqUzzUeCqlleWYKlpgfdHHw9C6KxkB9H3wNfiBg5yHqQMzy0xw/pbCRHYFkjl8MsP/t8qkTQE+JTYL71azgiew==
   dependencies:
     commander "7.2.0"
     node-watch "0.7.3"
@@ -7862,15 +8043,15 @@ raw-body@2.5.1:
 raw-body@~1.1.0:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-1.1.7.tgz#1d027c2bfa116acc6623bca8f00016572a87d425"
-  integrity sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=
+  integrity sha512-WmJJU2e9Y6M5UzTOkHaM7xJGAPQD8PNzx3bAd2+uhZAim6wDk6dAZxPVYLF67XhbR4hmKGh33Lpmh4XWrCH5Mg==
   dependencies:
     bytes "1"
     string_decoder "0.10"
 
-"readable-stream@2 || 3", readable-stream@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
-  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
+"readable-stream@2 || 3", readable-stream@^3.4.0, readable-stream@^3.6.0:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
+  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
   dependencies:
     inherits "^2.0.3"
     string_decoder "^1.1.1"
@@ -7879,7 +8060,7 @@ raw-body@~1.1.0:
 readable-stream@~1.0.2:
   version "1.0.34"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
-  integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=
+  integrity sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
@@ -7906,31 +8087,31 @@ recast@^0.18.1:
 redeyed@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/redeyed/-/redeyed-1.0.1.tgz#e96c193b40c0816b00aec842698e61185e55498a"
-  integrity sha1-6WwZO0DAgWsArshCaY5hGF5VSYo=
+  integrity sha512-8eEWsNCkV2rvwKLS1Cvp5agNjMhwRe2um+y32B2+3LqOzg4C9BBPs6vzAfV16Ivb8B9HPNKIqd8OrdBws8kNlQ==
   dependencies:
     esprima "~3.0.0"
 
-regenerate-unicode-properties@^8.2.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"
-  integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==
+regenerate-unicode-properties@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c"
+  integrity sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==
   dependencies:
-    regenerate "^1.4.0"
+    regenerate "^1.4.2"
 
-regenerate@^1.4.0:
+regenerate@^1.4.2:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
   integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
-regenerator-runtime@^0.13.4:
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"
-  integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==
+regenerator-runtime@^0.13.11, regenerator-runtime@^0.13.4:
+  version "0.13.11"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
+  integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
 
-regenerator-transform@^0.14.2:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4"
-  integrity sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==
+regenerator-transform@^0.15.1:
+  version "0.15.1"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.1.tgz#f6c4e99fc1b4591f780db2586328e4d9a9d8dc56"
+  integrity sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==
   dependencies:
     "@babel/runtime" "^7.8.4"
 
@@ -7942,47 +8123,48 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
-regexp.prototype.flags@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26"
-  integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==
+regexp.prototype.flags@^1.4.3:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz#fe7ce25e7e4cca8db37b6634c8a2c7009199b9cb"
+  integrity sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
+    define-properties "^1.2.0"
+    functions-have-names "^1.2.3"
 
-regexpp@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
-  integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
-
-regexpu-core@^4.7.1:
-  version "4.7.1"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6"
-  integrity sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==
+regexpu-core@^5.3.1:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b"
+  integrity sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==
   dependencies:
-    regenerate "^1.4.0"
-    regenerate-unicode-properties "^8.2.0"
-    regjsgen "^0.5.1"
-    regjsparser "^0.6.4"
-    unicode-match-property-ecmascript "^1.0.4"
-    unicode-match-property-value-ecmascript "^1.2.0"
+    "@babel/regjsgen" "^0.8.0"
+    regenerate "^1.4.2"
+    regenerate-unicode-properties "^10.1.0"
+    regjsparser "^0.9.1"
+    unicode-match-property-ecmascript "^2.0.0"
+    unicode-match-property-value-ecmascript "^2.1.0"
 
-regjsgen@^0.5.1:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733"
-  integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==
-
-regjsparser@^0.6.4:
-  version "0.6.9"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.9.tgz#b489eef7c9a2ce43727627011429cf833a7183e6"
-  integrity sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==
+regjsparser@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709"
+  integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==
   dependencies:
     jsesc "~0.5.0"
 
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
-  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
+  integrity sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==
+
+remove-types@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/remove-types/-/remove-types-1.0.0.tgz#491119e8fce23f2f961fe2254e5a119a017d9a3d"
+  integrity sha512-G7Hk1Q+UJ5DvlNAoJZObxANkBZGiGdp589rVcTW/tYqJWJ5rwfraSnKSQaETN8Epaytw8J40nS/zC7bcHGv36w==
+  dependencies:
+    "@babel/core" "^7.16.10"
+    "@babel/plugin-syntax-decorators" "^7.16.7"
+    "@babel/plugin-transform-typescript" "^7.16.8"
+    prettier "^2.5.1"
 
 repeat-element@^1.1.2:
   version "1.1.4"
@@ -7992,7 +8174,7 @@ repeat-element@^1.1.2:
 repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
+  integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==
 
 require-from-string@^2.0.2:
   version "2.0.2"
@@ -8007,22 +8189,17 @@ requireindex@^1.2.0:
 requires-port@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
+  integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
 
 reselect@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147"
-  integrity sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc=
-
-reselect@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.0.0.tgz#f2529830e5d3d0e021408b246a206ef4ea4437f7"
-  integrity sha512-qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA==
+  integrity sha512-b/6tFZCmRhtBMa4xGqiiRp9jh9Aqi2A687Lo265cN0/QohJQEBPiQ52f4QB6i0eF3yp3hmLL21LSGBcML2dlxA==
 
 resolve-dir@^1.0.0, resolve-dir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
-  integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=
+  integrity sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==
   dependencies:
     expand-tilde "^2.0.0"
     global-modules "^1.0.0"
@@ -8056,7 +8233,7 @@ resolve-package-path@^3.1.0:
     path-root "^0.1.1"
     resolve "^1.17.0"
 
-resolve-package-path@^4.0.0, resolve-package-path@^4.0.1, resolve-package-path@^4.0.3:
+resolve-package-path@^4.0.1, resolve-package-path@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-4.0.3.tgz#31dab6897236ea6613c72b83658d88898a9040aa"
   integrity sha512-SRpNAPW4kewOaNUt8VPqhJ0UMxawMwzJD8V7m1cJfdSTK9ieZwS6K7Dabsm4bmLFM96Z5Y/UznrpG5kt1im8yA==
@@ -8066,7 +8243,7 @@ resolve-package-path@^4.0.0, resolve-package-path@^4.0.1, resolve-package-path@^
 resolve-path@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/resolve-path/-/resolve-path-1.4.0.tgz#c4bda9f5efb2fce65247873ab36bb4d834fe16f7"
-  integrity sha1-xL2p9e+y/OZSR4c6s2u02DT+Fvc=
+  integrity sha512-i1xevIst/Qa+nA9olDxLWnLk8YZbi8R/7JPbCMcgyWaFR6bKWaexgJgEB5oc2PKMjYdrHynyz0NY+if+H98t1w==
   dependencies:
     http-errors "~1.6.2"
     path-is-absolute "1.0.1"
@@ -8074,21 +8251,21 @@ resolve-path@^1.4.0:
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
-  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
+  integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==
 
-resolve@^1.10.0, resolve@^1.11.1, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.15.1, resolve@^1.17.0, resolve@^1.20.0, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0:
-  version "1.22.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
-  integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
+resolve@^1.10.0, resolve@^1.11.1, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.15.1, resolve@^1.17.0, resolve@^1.20.0, resolve@^1.22.1, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0:
+  version "1.22.2"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f"
+  integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==
   dependencies:
-    is-core-module "^2.9.0"
+    is-core-module "^2.11.0"
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
 restore-cursor@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
-  integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
+  integrity sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q==
   dependencies:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
@@ -8137,6 +8314,11 @@ route-recognizer@^0.3.3:
   resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.3.4.tgz#39ab1ffbce1c59e6d2bdca416f0932611e4f3ca3"
   integrity sha512-2+MhsfPhvauN1O8KaXpXAOfR/fwe8dnUXVM+xw7yt40lJRfPVQxV6yryZm0cgRvAj5fMF/mdRZbL2ptwbs5i2g==
 
+rrweb-cssom@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz#ed298055b97cbddcdeb278f904857629dec5e0e1"
+  integrity sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==
+
 rsvp@^3.0.14, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.0.6, rsvp@^3.1.0:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
@@ -8150,13 +8332,18 @@ rsvp@^4.7.0, rsvp@^4.8.1, rsvp@^4.8.4, rsvp@^4.8.5:
 rsvp@~3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.2.1.tgz#07cb4a5df25add9e826ebc67dcc9fd89db27d84a"
-  integrity sha1-B8tKXfJa3Z6Cbrxn3Mn9idsn2Eo=
+  integrity sha512-Rf4YVNYpKjZ6ASAmibcwTNciQ5Co5Ztq6iZPEykHpkoflnD/K5ryE/rHehFsTm4NJj8nKDhbi3eKBWGogmNnkg==
 
 run-async@^2.2.0, run-async@^2.4.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
   integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
 
+run-async@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-3.0.0.tgz#42a432f6d76c689522058984384df28be379daad"
+  integrity sha512-540WwVDOMxA6dN6We19EcT9sc3hkXPw5mzRNGM3FkdN/vtE9NFvj5lFAPNwUDmJjXidm3v7TC1cTE7t17Ulm1Q==
+
 run-parallel@^1.1.9:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
@@ -8171,7 +8358,14 @@ rxjs@^6.4.0, rxjs@^6.6.0:
   dependencies:
     tslib "^1.9.0"
 
-safe-buffer@5.1.2, safe-buffer@~5.1.1:
+rxjs@^7.8.1:
+  version "7.8.1"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
+  integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
+  dependencies:
+    tslib "^2.1.0"
+
+safe-buffer@5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
@@ -8184,21 +8378,35 @@ safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.1.0, safe-buffer@^5.1.2,
 safe-json-parse@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz#3e76723e38dfdda13c9b1d29a1e07ffee4b30b57"
-  integrity sha1-PnZyPjjf3aE8mx0poeB//uSzC1c=
+  integrity sha512-o0JmTu17WGUaUOHa1l0FPGXKBfijbxK6qoHzlkihsDXxzBHvJcA7zgviKR92Xs841rX9pK16unfphLq0/KqX7A==
+
+safe-regex-test@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295"
+  integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.3"
+    is-regex "^1.1.4"
 
 safe-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
-  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
+  integrity sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==
   dependencies:
     ret "~0.1.10"
 
+safe-stable-stringify@^2.4.2:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz#138c84b6f6edb3db5f8ef3ef7115b8f55ccbf886"
+  integrity sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==
+
 "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0":
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sane@^4.0.0, sane@^4.1.0:
+sane@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz#ed881fd922733a6c461bc189dc2b6c006f3ffded"
   integrity sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==
@@ -8213,10 +8421,25 @@ sane@^4.0.0, sane@^4.1.0:
     minimist "^1.1.1"
     walker "~1.0.5"
 
-sass@^1.57.0:
-  version "1.57.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.57.0.tgz#64c4144ed4e1c0ccb96dc18aef2c424cdbc0c12b"
-  integrity sha512-IZNEJDTK1cF5B1cGA593TPAV/1S0ysUDxq9XHjX/+SMy0QfUny+nfUsq5ZP7wWSl4eEf7wDJcEZ8ABYFmh3m/w==
+sane@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/sane/-/sane-5.0.1.tgz#ae94cb06acf5ad158242ff23f563d8cbe0ec1e4b"
+  integrity sha512-9/0CYoRz0MKKf04OMCO3Qk3RQl1PAwWAhPSQSym4ULiLpTZnrY1JoZU0IEikHu8kdk2HvKT/VwQMq/xFZ8kh1Q==
+  dependencies:
+    "@cnakazawa/watch" "^1.0.3"
+    anymatch "^3.1.1"
+    capture-exit "^2.0.0"
+    exec-sh "^0.3.4"
+    execa "^4.0.0"
+    fb-watchman "^2.0.1"
+    micromatch "^4.0.2"
+    minimist "^1.1.1"
+    walker "~1.0.5"
+
+sass@^1.64.1:
+  version "1.64.1"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.64.1.tgz#6a46f6d68e0fa5ad90aa59ce025673ddaa8441cf"
+  integrity sha512-16rRACSOFEE8VN7SCgBu1MpYCyN7urj9At898tyzdXFhC+a+yOX5dXwAR7L8/IdPJ1NB8OYoXmD55DM30B2kEQ==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"
@@ -8238,44 +8461,39 @@ schema-utils@^2.6.5:
     ajv "^6.12.4"
     ajv-keywords "^3.5.2"
 
-schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
-  integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
+schema-utils@^3.0.0, schema-utils@^3.1.1, schema-utils@^3.2.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe"
+  integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==
   dependencies:
     "@types/json-schema" "^7.0.8"
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
 schema-utils@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7"
-  integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.2.0.tgz#70d7c93e153a273a805801882ebd3bff20d89c8b"
+  integrity sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==
   dependencies:
     "@types/json-schema" "^7.0.9"
-    ajv "^8.8.0"
+    ajv "^8.9.0"
     ajv-formats "^2.1.1"
-    ajv-keywords "^5.0.0"
-
-semver@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
-  integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
+    ajv-keywords "^5.1.0"
 
 semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+  version "5.7.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
+  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
-semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0, semver@^6.3.1:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.8:
-  version "7.3.8"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
-  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
+semver@^7.0.0, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.8, semver@^7.5.3:
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
   dependencies:
     lru-cache "^6.0.0"
 
@@ -8298,10 +8516,10 @@ send@0.18.0:
     range-parser "~1.2.1"
     statuses "2.0.1"
 
-serialize-javascript@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8"
-  integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==
+serialize-javascript@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c"
+  integrity sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==
   dependencies:
     randombytes "^2.1.0"
 
@@ -8318,7 +8536,7 @@ serve-static@1.15.0:
 set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
+  integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
 
 set-value@^2.0.0, set-value@^2.0.1:
   version "2.0.1"
@@ -8343,7 +8561,7 @@ setprototypeof@1.2.0:
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
+  integrity sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==
   dependencies:
     shebang-regex "^1.0.0"
 
@@ -8357,7 +8575,7 @@ shebang-command@^2.0.0:
 shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
+  integrity sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==
 
 shebang-regex@^3.0.0:
   version "3.0.0"
@@ -8381,7 +8599,7 @@ side-channel@^1.0.4:
 sigmund@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
-  integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=
+  integrity sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g==
 
 signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
   version "3.0.7"
@@ -8400,18 +8618,23 @@ simple-html-tokenizer@^0.5.11:
   resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.5.11.tgz#4c5186083c164ba22a7b477b7687ac056ad6b1d9"
   integrity sha512-C2WEK/Z3HoSFbYq8tI7ni3eOo/NneSPRoPpcM7WdLjFOArFuyXEjAoCdOC3DgMfRyziZQ1hCNR4mrNdWEvD0og==
 
-sinon@^15.0.1:
-  version "15.0.1"
-  resolved "https://registry.yarnpkg.com/sinon/-/sinon-15.0.1.tgz#ce062611a0b131892e2c18f03055b8eb6e8dc234"
-  integrity sha512-PZXKc08f/wcA/BMRGBze2Wmw50CWPiAH3E21EOi4B49vJ616vW4DQh4fQrqsYox2aNR/N3kCqLuB0PwwOucQrg==
+sinon@^15.2.0:
+  version "15.2.0"
+  resolved "https://registry.yarnpkg.com/sinon/-/sinon-15.2.0.tgz#5e44d4bc5a9b5d993871137fd3560bebfac27565"
+  integrity sha512-nPS85arNqwBXaIsFCkolHjGIkFo+Oxu9vbgmBJizLAhqe6P2o3Qmj3KCUoRkfhHtvgDhZdWD3risLHAUJ8npjw==
   dependencies:
-    "@sinonjs/commons" "^2.0.0"
-    "@sinonjs/fake-timers" "10.0.2"
-    "@sinonjs/samsam" "^7.0.1"
-    diff "^5.0.0"
-    nise "^5.1.2"
+    "@sinonjs/commons" "^3.0.0"
+    "@sinonjs/fake-timers" "^10.3.0"
+    "@sinonjs/samsam" "^8.0.0"
+    diff "^5.1.0"
+    nise "^5.1.4"
     supports-color "^7.2.0"
 
+slash@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
+  integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
+
 slash@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
@@ -8447,37 +8670,40 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
-socket.io-adapter@~2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz#b50a4a9ecdd00c34d4c8c808224daa1a786152a6"
-  integrity sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==
+socket.io-adapter@~2.5.2:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.5.2.tgz#5de9477c9182fdc171cd8c8364b9a8894ec75d12"
+  integrity sha512-87C3LO/NOMc+eMcpcxUBebGjkpMDkNBS9tf7KJqcDsmL936EChtVva71Dw2q4tQcuVC+hAUy4an2NO/sYXmwRA==
+  dependencies:
+    ws "~8.11.0"
 
-socket.io-parser@~4.2.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.1.tgz#01c96efa11ded938dcb21cbe590c26af5eff65e5"
-  integrity sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g==
+socket.io-parser@~4.2.4:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.4.tgz#c806966cf7270601e47469ddeec30fbdfda44c83"
+  integrity sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==
   dependencies:
     "@socket.io/component-emitter" "~3.1.0"
     debug "~4.3.1"
 
 socket.io@^4.1.2:
-  version "4.5.3"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.5.3.tgz#44dffea48d7f5aa41df4a66377c386b953bc521c"
-  integrity sha512-zdpnnKU+H6mOp7nYRXH4GNv1ux6HL6+lHL8g7Ds7Lj8CkdK1jJK/dlwsKDculbyOHifcJ0Pr/yeXnZQ5GeFrcg==
+  version "4.7.1"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.7.1.tgz#9009f31bf7be25478895145e92fbc972ad1db900"
+  integrity sha512-W+utHys2w//dhFjy7iQQu9sGd3eokCjGbl2r59tyLqNiJJBdIebn3GAKEXBr3osqHTObJi2die/25bCx2zsaaw==
   dependencies:
     accepts "~1.3.4"
     base64id "~2.0.0"
+    cors "~2.8.5"
     debug "~4.3.2"
-    engine.io "~6.2.0"
-    socket.io-adapter "~2.4.0"
-    socket.io-parser "~4.2.0"
+    engine.io "~6.5.0"
+    socket.io-adapter "~2.5.2"
+    socket.io-parser "~4.2.4"
 
 sort-object-keys@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/sort-object-keys/-/sort-object-keys-1.1.3.tgz#bff833fe85cab147b34742e45863453c1e190b45"
   integrity sha512-855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg==
 
-sort-package-json@^1.49.0:
+sort-package-json@^1.57.0:
   version "1.57.0"
   resolved "https://registry.yarnpkg.com/sort-package-json/-/sort-package-json-1.57.0.tgz#e95fb44af8ede0bb6147e3f39258102d4bb23fc4"
   integrity sha512-FYsjYn2dHTRb41wqnv+uEqCUvBpK3jZcTp9rbz2qDTmel7Pmdtf+i2rLaaPMRZeSVM60V3Se31GyWFpmKs4Q5Q==
@@ -8489,7 +8715,7 @@ sort-package-json@^1.49.0:
     is-plain-obj "2.1.0"
     sort-object-keys "^1.1.3"
 
-"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.1:
+"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
   integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
@@ -8516,24 +8742,24 @@ source-map-support@~0.5.20:
 source-map-url@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.3.0.tgz#7ecaf13b57bcd09da8a40c5d269db33799d4aaf9"
-  integrity sha1-fsrxO1e80J2opAxdJp2zN5nUqvk=
+  integrity sha512-QU4fa0D6aSOmrT+7OHpUXw+jS84T0MLaQNtFs8xzLNe6Arj44Magd7WEbyVW5LNYoAPVV35aKs4azxIfVJrToQ==
 
 source-map-url@^0.4.0:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
   integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==
 
-source-map@0.4.x, source-map@^0.4.2:
+source-map@^0.4.2:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
-  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
+  integrity sha512-Y8nIfcb1s/7DcobUz1yOO1GSp7gyL+D9zLHDehT7iRESqGSxjJ448Sg7rvfgsRJCnKLdSl11uGf0s9X80cH0/A==
   dependencies:
     amdefine ">=0.0.4"
 
 source-map@^0.5.6:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
+  integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
 
 source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   version "0.6.1"
@@ -8548,11 +8774,11 @@ source-map@^0.7.4:
 source-map@~0.1.x:
   version "0.1.43"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
-  integrity sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=
+  integrity sha512-VtCvB9SIQhk3aF6h+N85EaqIaBFIAfZ9Cu+NJHHVvc8BbEcnvDcFw6sqQ2dQrT6SlOrZq3tIvyD9+EGq/lJryQ==
   dependencies:
     amdefine ">=0.0.4"
 
-sourcemap-codec@^1.4.4, sourcemap-codec@^1.4.8:
+sourcemap-codec@^1.4.8:
   version "1.4.8"
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
   integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
@@ -8570,7 +8796,7 @@ sourcemap-validator@^1.1.0:
 spawn-args@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/spawn-args/-/spawn-args-0.2.0.tgz#fb7d0bd1d70fd4316bd9e3dec389e65f9d6361bb"
-  integrity sha1-+30L0dcP1DFr2ePew4nmX51jYbs=
+  integrity sha512-73BoniQDcRWgnLAf/suKH6V5H54gd1KLzwYN9FB6J/evqTV33htH9xwV/4BHek+++jzxpVlZQKKZkqstPQPmQg==
 
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
@@ -8579,7 +8805,7 @@ split-string@^3.0.1, split-string@^3.0.2:
   dependencies:
     extend-shallow "^3.0.0"
 
-sprintf-js@^1.0.3:
+sprintf-js@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
   integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
@@ -8587,24 +8813,24 @@ sprintf-js@^1.0.3:
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
+  integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
 sri-toolbox@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/sri-toolbox/-/sri-toolbox-0.2.0.tgz#a7fea5c3fde55e675cf1c8c06f3ebb5c2935835e"
-  integrity sha1-p/6lw/3lXmdc8cjAbz67XCk1g14=
+  integrity sha512-DQIMWCAr/M7phwo+d3bEfXwSBEwuaJL+SJx9cuqt1Ty7K96ZFoHpYnSbhrQZEr0+0/GtmpKECP8X/R4RyeTAfw==
 
 stagehand@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/stagehand/-/stagehand-1.0.0.tgz#79515e2ad3a02c63f8720c7df9b6077ae14276d9"
-  integrity sha512-zrXl0QixAtSHFyN1iv04xOBgplbT4HgC8T7g+q8ESZbDNi5uZbMtxLukFVXPJ5Nl7zCYvYcrT3Mj24WYCH93hw==
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/stagehand/-/stagehand-1.0.1.tgz#0cbca6f906e4a7be36c5830dc31d9cc7091a827e"
+  integrity sha512-GqXBq2SPWv9hTXDFKS8WrKK1aISB0aKGHZzH+uD4ShAgs+Fz20ZfoerLOm8U+f62iRWLrw6nimOY/uYuTcVhvg==
   dependencies:
     debug "^4.1.0"
 
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
-  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
+  integrity sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==
   dependencies:
     define-property "^0.2.5"
     object-copy "^0.1.0"
@@ -8617,12 +8843,12 @@ statuses@2.0.1:
 "statuses@>= 1.4.0 < 2", statuses@~1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
-  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
+  integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
 
 string-template@~0.2.0, string-template@~0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
-  integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=
+  integrity sha512-Yptehjogou2xm4UJbxJ4CxgZx12HBfeystp0y3x7s4Dj32ltVVG1Gg8YhKjHZkHicuKpZX/ffilA8505VbUbpw==
 
 "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
@@ -8641,40 +8867,51 @@ string-width@^2.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string.prototype.matchall@^4.0.5:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.6.tgz#5abb5dabc94c7b0ea2380f65ba610b3a544b15fa"
-  integrity sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg==
+string.prototype.matchall@^4.0.5, string.prototype.matchall@^4.0.6:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz#3bf85722021816dcd1bf38bb714915887ca79fd3"
+  integrity sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
-    get-intrinsic "^1.1.1"
-    has-symbols "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+    get-intrinsic "^1.1.3"
+    has-symbols "^1.0.3"
     internal-slot "^1.0.3"
-    regexp.prototype.flags "^1.3.1"
+    regexp.prototype.flags "^1.4.3"
     side-channel "^1.0.4"
 
-string.prototype.trimend@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
-  integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==
+string.prototype.trim@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz#a68352740859f6893f14ce3ef1bb3037f7a90533"
+  integrity sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
 
-string.prototype.trimstart@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
-  integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==
+string.prototype.trimend@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533"
+  integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+
+string.prototype.trimstart@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4"
+  integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
 
 string_decoder@0.10, string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
+  integrity sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==
 
 string_decoder@^1.1.1:
   version "1.3.0"
@@ -8683,17 +8920,10 @@ string_decoder@^1.1.1:
   dependencies:
     safe-buffer "~5.2.0"
 
-strip-ansi@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
-  dependencies:
-    ansi-regex "^2.0.0"
-
 strip-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
+  integrity sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==
   dependencies:
     ansi-regex "^3.0.0"
 
@@ -8724,14 +8954,14 @@ strip-comments@^2.0.1:
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
+  integrity sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==
 
 strip-final-newline@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
-strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
+strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
@@ -8747,19 +8977,7 @@ style-loader@^2.0.0:
 styled_string@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/styled_string/-/styled_string-0.0.1.tgz#d22782bd81295459bc4f1df18c4bad8e94dd124a"
-  integrity sha1-0ieCvYEpVFm8Tx3xjEutjpTdEko=
-
-sum-up@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sum-up/-/sum-up-1.0.3.tgz#1c661f667057f63bcb7875aa1438bc162525156e"
-  integrity sha1-HGYfZnBX9jvLeHWqFDi8FiUlFW4=
-  dependencies:
-    chalk "^1.0.0"
-
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
+  integrity sha512-DU2KZiB6VbPkO2tGSqQ9n96ZstUPjW7X4sGO6V2m1myIQluX0p1Ol8BrA/l6/EesqhMqXOIXs3cJNOy1UuU2BA==
 
 supports-color@^5.3.0:
   version "5.5.0"
@@ -8841,31 +9059,31 @@ temp@0.9.4:
     mkdirp "^0.5.1"
     rimraf "~2.6.2"
 
-terser-webpack-plugin@^5.1.3:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.0.tgz#21641326486ecf91d8054161c816e464435bae9f"
-  integrity sha512-LPIisi3Ol4chwAaPP8toUJ3L4qCM1G0wao7L3qNv57Drezxj6+VEyySpPw4B1HSO2Eg/hDY/MNF5XihCAoqnsQ==
+terser-webpack-plugin@^5.3.7:
+  version "5.3.9"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz#832536999c51b46d468067f9e37662a3b96adfe1"
+  integrity sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==
   dependencies:
-    jest-worker "^27.4.1"
+    "@jridgewell/trace-mapping" "^0.3.17"
+    jest-worker "^27.4.5"
     schema-utils "^3.1.1"
-    serialize-javascript "^6.0.0"
-    source-map "^0.6.1"
-    terser "^5.7.2"
+    serialize-javascript "^6.0.1"
+    terser "^5.16.8"
 
-terser@^5.16.1, terser@^5.3.0, terser@^5.7.2:
-  version "5.16.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.1.tgz#5af3bc3d0f24241c7fb2024199d5c461a1075880"
-  integrity sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw==
+terser@^5.16.8, terser@^5.19.2, terser@^5.3.0:
+  version "5.19.2"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.19.2.tgz#bdb8017a9a4a8de4663a7983f45c506534f9234e"
+  integrity sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==
   dependencies:
-    "@jridgewell/source-map" "^0.3.2"
-    acorn "^8.5.0"
+    "@jridgewell/source-map" "^0.3.3"
+    acorn "^8.8.2"
     commander "^2.20.0"
     source-map-support "~0.5.20"
 
-testem@^3.2.0:
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/testem/-/testem-3.9.0.tgz#a82ccf01e5a248e3924244186e348c665ab90f7d"
-  integrity sha512-YTxCYKj0cc8uUSKEziJtSC5T/pw4fQnY0ZXNOyvAFgrijfsN9NxmncJZOHLhPgFOuhbRd5i+DBQxw0Cpe0SEFg==
+testem@^3.10.1:
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/testem/-/testem-3.10.1.tgz#bab8a83bec11e975f7d1e47e924eed6135957e5b"
+  integrity sha512-42c4e7qlAelwMd8O3ogtVGRbgbr6fJnX6H51ACOIG1V1IjsKPlcQtxPyOwaL4iikH22Dfh+EyIuJnMG4yxieBQ==
   dependencies:
     "@xmldom/xmldom" "^0.8.0"
     backbone "^1.1.2"
@@ -8900,7 +9118,7 @@ testem@^3.2.0:
 text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
+  integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
 
 "textextensions@1 || 2", textextensions@^2.5.0:
   version "2.6.0"
@@ -8918,7 +9136,7 @@ through2@^3.0.1:
 through@^2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
+  integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
 
 tiny-glob@0.2.9:
   version "0.2.9"
@@ -8950,7 +9168,7 @@ tippy.js@^6.3.7:
 tmp@0.0.28:
   version "0.0.28"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.28.tgz#172735b7f614ea7af39664fa84cf0de4e515d120"
-  integrity sha1-Fyc1t/YU6nrzlmT6hM8N5OUV0SA=
+  integrity sha512-c2mmfiBmND6SOVxzogm1oda0OJ1HZVIk/5n26N59dDTh80MUeavpiCls4PGAdkX1PFkKokLpcf7prSjCeXLsJg==
   dependencies:
     os-tmpdir "~1.0.1"
 
@@ -8968,7 +9186,7 @@ tmp@^0.1.0:
   dependencies:
     rimraf "^2.6.3"
 
-tmpl@1.0.x:
+tmpl@1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
   integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
@@ -8976,19 +9194,19 @@ tmpl@1.0.x:
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
-  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
+  integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==
 
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
-  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
+  integrity sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==
   dependencies:
     kind-of "^3.0.2"
 
 to-regex-range@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
-  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
+  integrity sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==
   dependencies:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
@@ -9016,26 +9234,26 @@ toidentifier@1.0.1:
   integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
 
 tough-cookie@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874"
-  integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf"
+  integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==
   dependencies:
     psl "^1.1.33"
     punycode "^2.1.1"
     universalify "^0.2.0"
     url-parse "^1.5.3"
 
-tr46@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-3.0.0.tgz#555c4e297a950617e8eeddef633c87d4d9d6cbf9"
-  integrity sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==
+tr46@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-4.1.1.tgz#281a758dcc82aeb4fe38c7dfe4d11a395aac8469"
+  integrity sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==
   dependencies:
-    punycode "^2.1.1"
+    punycode "^2.3.0"
 
 tr46@~0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-  integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
+  integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
 
 tree-sync@^1.2.2:
   version "1.4.0"
@@ -9064,6 +9282,11 @@ tslib@^1.9.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
+tslib@^2.1.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.0.tgz#b295854684dbda164e181d259a22cd779dcd7bc3"
+  integrity sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==
+
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -9071,13 +9294,6 @@ type-check@^0.4.0, type-check@~0.4.0:
   dependencies:
     prelude-ls "^1.2.1"
 
-type-check@~0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
-  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
-  dependencies:
-    prelude-ls "~1.1.2"
-
 type-detect@4.0.8, type-detect@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
@@ -9106,6 +9322,15 @@ type-is@~1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
+typed-array-length@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb"
+  integrity sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==
+  dependencies:
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    is-typed-array "^1.1.9"
+
 typedarray-to-buffer@^3.1.5:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
@@ -9114,9 +9339,9 @@ typedarray-to-buffer@^3.1.5:
     is-typedarray "^1.0.0"
 
 typescript-memoize@^1.0.0-alpha.3, typescript-memoize@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.1.0.tgz#4a8f512d06fc995167c703a3592219901db8bc79"
-  integrity sha512-LQPKVXK8QrBBkL/zclE6YgSWn0I8ew5m0Lf+XL00IwMhlotqRLlzHV+BRrljVQIc+NohUAuQP7mg4HQwrx5Xbg==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.1.1.tgz#02737495d5df6ebf72c07ba0d002e8f4cf5ccfa0"
+  integrity sha512-GQ90TcKpIH4XxYTI2F98yEQYZgjNMOGPpOgdjIBhaLaWji5HPWlRnZ4AeA1hfBxtY7bCGDJsqDDHk/KaHOl5bA==
 
 uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"
@@ -9124,60 +9349,60 @@ uc.micro@^1.0.1, uc.micro@^1.0.5:
   integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
 
 uglify-js@^3.1.4:
-  version "3.13.4"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.4.tgz#592588bb9f47ae03b24916e2471218d914955574"
-  integrity sha512-kv7fCkIXyQIilD5/yQy8O+uagsYIOt5cZvs890W40/e/rvjMSzJw81o9Bg0tkURxzZBROtDQhW2LFjOGoK3RZw==
+  version "3.17.4"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c"
+  integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==
 
-unbox-primitive@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
-  integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==
+unbox-primitive@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
+  integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==
   dependencies:
-    function-bind "^1.1.1"
-    has-bigints "^1.0.1"
-    has-symbols "^1.0.2"
+    call-bind "^1.0.2"
+    has-bigints "^1.0.2"
+    has-symbols "^1.0.3"
     which-boxed-primitive "^1.0.2"
 
 underscore.string@^3.2.2, underscore.string@~3.3.4:
-  version "3.3.5"
-  resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.5.tgz#fc2ad255b8bd309e239cbc5816fd23a9b7ea4023"
-  integrity sha512-g+dpmgn+XBneLmXXo+sGlW5xQEt4ErkS3mgeN2GFbremYeMBSJKr9Wf2KJplQVaiPY/f7FN6atosWYNm9ovrYg==
+  version "3.3.6"
+  resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.6.tgz#ad8cf23d7423cb3b53b898476117588f4e2f9159"
+  integrity sha512-VoC83HWXmCrF6rgkyxS9GHv8W9Q5nhMKho+OadDJGzL2oDYbYEppBaCMH6pFlwLeqj2QS+hhkw2kpXkSdD1JxQ==
   dependencies:
-    sprintf-js "^1.0.3"
+    sprintf-js "^1.1.1"
     util-deprecate "^1.0.2"
 
 underscore@>=1.8.3:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.0.tgz#3ccdcbb824230fc6bf234ad0ddcd83dff4eafe5f"
-  integrity sha512-sCs4H3pCytsb5K7i072FAEC9YlSYFIbosvM0tAKAlpSSUgD7yC1iXSEGdl5XrDKQ1YUB+p/HDzYrSG2H2Vl36g==
+  version "1.13.6"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441"
+  integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==
 
 underscore@~1.3.1:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.3.3.tgz#47ac53683daf832bfa952e1774417da47817ae42"
-  integrity sha1-R6xTaD2vgyv6lS4XdEF9pHgXrkI=
+  integrity sha512-ddgUaY7xyrznJ0tbSUZgvNdv5qbiF6XcUBTrHgdCOVUrxJYWozD5KyiRjtIwds1reZ7O1iPLv5rIyqnVAcS6gg==
 
-unicode-canonical-property-names-ecmascript@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
-  integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==
+unicode-canonical-property-names-ecmascript@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
+  integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==
 
-unicode-match-property-ecmascript@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c"
-  integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==
+unicode-match-property-ecmascript@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3"
+  integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==
   dependencies:
-    unicode-canonical-property-names-ecmascript "^1.0.4"
-    unicode-property-aliases-ecmascript "^1.0.4"
+    unicode-canonical-property-names-ecmascript "^2.0.0"
+    unicode-property-aliases-ecmascript "^2.0.0"
 
-unicode-match-property-value-ecmascript@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531"
-  integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==
+unicode-match-property-value-ecmascript@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz#cb5fffdcd16a05124f5a4b0bf7c3770208acbbe0"
+  integrity sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==
 
-unicode-property-aliases-ecmascript@^1.0.4:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4"
-  integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==
+unicode-property-aliases-ecmascript@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd"
+  integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==
 
 union-value@^1.0.0:
   version "1.0.1"
@@ -9214,27 +9439,20 @@ universalify@^2.0.0:
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
-  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
+  integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
 
-unset-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
-  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
+unset-value@2.0.1, unset-value@^1.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-2.0.1.tgz#57bed0c22d26f28d69acde5df9a11b77c74d2df3"
+  integrity sha512-2hvrBfjUE00PkqN+q0XP6yRAOGrR06uSiUoIQGZkc7GxvQ9H7v8quUPNtZjMg4uux69i8HWpIjLPUKwCuRGyNg==
   dependencies:
-    has-value "^0.3.1"
-    isobject "^3.0.0"
+    has-value "^2.0.2"
+    isobject "^4.0.0"
 
-untildify@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/untildify/-/untildify-2.1.0.tgz#17eb2807987f76952e9c0485fc311d06a826a2e0"
-  integrity sha1-F+soB5h/dpUunASF/DEdBqgmouA=
-  dependencies:
-    os-homedir "^1.0.0"
-
-update-browserslist-db@^1.0.5:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz#2924d3927367a38d5c555413a7ce138fc95fcb18"
-  integrity sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==
+update-browserslist-db@^1.0.11:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940"
+  integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==
   dependencies:
     escalade "^3.1.1"
     picocolors "^1.0.0"
@@ -9249,7 +9467,7 @@ uri-js@^4.2.2:
 urix@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
-  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
+  integrity sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==
 
 url-parse@^1.5.3:
   version "1.5.10"
@@ -9265,14 +9483,14 @@ use@^3.1.0:
   integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
 username-sync@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/username-sync/-/username-sync-1.0.2.tgz#0a3697909fb7b5768d29e2921f573acfdd427592"
-  integrity sha512-ayNkOJdoNSGNDBE46Nkc+l6IXmeugbzahZLSMkwvgRWv5y5ZqNY2IrzcgmkR4z32sj1W3tM3TuTUMqkqBzO+RA==
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/username-sync/-/username-sync-1.0.3.tgz#ae41c5c8a4c8c2ecc1443a7d0742742bd7e36732"
+  integrity sha512-m/7/FSqjJNAzF2La448c/aEom0gJy7HY7Y509h6l0ePvEkFictAGptwWaj1msWJ38JbfEDOUoE8kqFee9EHKdA==
 
 util-deprecate@^1.0.1, util-deprecate@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+  integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
 util@^0.12.5:
   version "0.12.5"
@@ -9288,37 +9506,50 @@ util@^0.12.5:
 utils-merge@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
-  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
+  integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
 
 uuid@^8.3.2:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
-validate-npm-package-name@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
-  integrity sha1-X6kS2B630MdK/BQN5zF/DKffQ34=
-  dependencies:
-    builtins "^1.0.3"
+uuid@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5"
+  integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
 
-validate-peer-dependencies@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/validate-peer-dependencies/-/validate-peer-dependencies-2.1.0.tgz#1ad8218b1b168aeb500165f9de2a3f53269ece56"
-  integrity sha512-x+M+mp16g4N+jDQJO6a+AKnMHAViov9mRzYfgMYR6Bq+UTwewf8aTQsP+e1QH0oZrADqP7fuI/bEbl3CzRFhOQ==
+validate-npm-package-name@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz#f16afd48318e6f90a1ec101377fa0384cfc8c713"
+  integrity sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==
   dependencies:
-    resolve-package-path "^4.0.0"
+    builtins "^5.0.0"
+
+validate-peer-dependencies@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/validate-peer-dependencies/-/validate-peer-dependencies-1.2.0.tgz#22aab93c514f4fda457d36c80685e8b1160d2036"
+  integrity sha512-nd2HUpKc6RWblPZQ2GDuI65sxJ2n/UqZwSBVtj64xlWjMx0m7ZB2m9b2JS3v1f+n9VWH/dd1CMhkHfP6pIdckA==
+  dependencies:
+    resolve-package-path "^3.1.0"
     semver "^7.3.2"
 
+validate-peer-dependencies@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/validate-peer-dependencies/-/validate-peer-dependencies-2.2.0.tgz#47b8ff008f66a66fc5d8699123844522c1d874f4"
+  integrity sha512-8X1OWlERjiUY6P6tdeU9E0EwO8RA3bahoOVG7ulOZT5MqgNDUO/BQoVjYiHPcNe+v8glsboZRIw9iToMAA2zAA==
+  dependencies:
+    resolve-package-path "^4.0.3"
+    semver "^7.3.8"
+
 vary@^1, vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
-  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
+  integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
 
 virtual-dom@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/virtual-dom/-/virtual-dom-2.1.1.tgz#80eda2d481b9ede0c049118cefcb4a05f21d1375"
-  integrity sha1-gO2i1IG57eDASRGM78tKBfIdE3U=
+  integrity sha512-wb6Qc9Lbqug0kRqo/iuApfBpJJAq14Sk1faAnSmtqXiwahg7PVTvWMs9L02Z8nNIMqbwsxzBAA90bbtRLbw0zg==
   dependencies:
     browser-split "0.0.1"
     error "^4.3.0"
@@ -9339,7 +9570,7 @@ w3c-xmlserializer@^4.0.0:
 walk-sync@^0.2.5:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-0.2.7.tgz#b49be4ee6867657aeb736978b56a29d10fa39969"
-  integrity sha1-tJvk7mhnZXrrc2l4tWop0Q+jmWk=
+  integrity sha512-OH8GdRMowEFr0XSHQeX5fGweO6zSVHo7bG/0yJQx6LAj9Oukz0C8heI3/FYectT66gY0IPGe89kOvU410/UNpg==
   dependencies:
     ensure-posix-path "^1.0.0"
     matcher-collection "^1.0.0"
@@ -9382,19 +9613,18 @@ walk-sync@^3.0.0:
     minimatch "^3.0.4"
 
 walker@~1.0.5:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
-  integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f"
+  integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==
   dependencies:
-    makeerror "1.0.x"
+    makeerror "1.0.12"
 
-watch-detector@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/watch-detector/-/watch-detector-1.0.0.tgz#c7b722d8695fee9ab6071e0f38f258e6adb22609"
-  integrity sha512-siywMl3fXK30Tlpu/dUBHhlpxhQmHdguZ8OIb813eU9lrVmmsJa9k0+n1HtJ+7p3SzFCPq2XbmR3GUYpPC3TBA==
+watch-detector@^1.0.0, watch-detector@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/watch-detector/-/watch-detector-1.0.2.tgz#95deb9189f8c89c0a9f211739cef6d01cffcf452"
+  integrity sha512-MrJK9z7kD5Gl3jHBnnBVHvr1saVGAfmkyyrvuNzV/oe0Gr1nwZTy5VSA0Gw2j2Or0Mu8HcjUa44qlBvC2Ofnpg==
   dependencies:
     heimdalljs-logger "^0.1.10"
-    semver "^6.3.0"
     silent-error "^1.1.1"
     tmp "^0.1.0"
 
@@ -9409,12 +9639,12 @@ watchpack@^2.4.0:
 watchr@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/watchr/-/watchr-1.0.0.tgz#ce023fd59edae9430523031915c1812ff2302c27"
-  integrity sha1-zgI/1Z7a6UMFIwMZFcGBL/IwLCc=
+  integrity sha512-qaR72INd8EsMZ63VY+o91n6KHyy4gPUb0td2vsQQEWfgApg5NxXWBSh3zSXWoaJc7PS3imSNPggiHnQJfKxpNQ==
 
 wcwidth@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
-  integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=
+  integrity sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==
   dependencies:
     defaults "^1.0.3"
 
@@ -9426,7 +9656,7 @@ web-streams-polyfill@^3.0.3:
 webidl-conversions@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-  integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
+  integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
 
 webidl-conversions@^7.0.0:
   version "7.0.0"
@@ -9438,22 +9668,22 @@ webpack-sources@^3.2.3:
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
-webpack@^5.75.0:
-  version "5.75.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.75.0.tgz#1e440468647b2505860e94c9ff3e44d5b582c152"
-  integrity sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==
+webpack@^5.88.2:
+  version "5.88.2"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.88.2.tgz#f62b4b842f1c6ff580f3fcb2ed4f0b579f4c210e"
+  integrity sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==
   dependencies:
     "@types/eslint-scope" "^3.7.3"
-    "@types/estree" "^0.0.51"
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/wasm-edit" "1.11.1"
-    "@webassemblyjs/wasm-parser" "1.11.1"
+    "@types/estree" "^1.0.0"
+    "@webassemblyjs/ast" "^1.11.5"
+    "@webassemblyjs/wasm-edit" "^1.11.5"
+    "@webassemblyjs/wasm-parser" "^1.11.5"
     acorn "^8.7.1"
-    acorn-import-assertions "^1.7.6"
+    acorn-import-assertions "^1.9.0"
     browserslist "^4.14.5"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.10.0"
-    es-module-lexer "^0.9.0"
+    enhanced-resolve "^5.15.0"
+    es-module-lexer "^1.2.1"
     eslint-scope "5.1.1"
     events "^3.2.0"
     glob-to-regexp "^0.4.1"
@@ -9462,9 +9692,9 @@ webpack@^5.75.0:
     loader-runner "^4.2.0"
     mime-types "^2.1.27"
     neo-async "^2.6.2"
-    schema-utils "^3.1.0"
+    schema-utils "^3.2.0"
     tapable "^2.1.1"
-    terser-webpack-plugin "^5.1.3"
+    terser-webpack-plugin "^5.3.7"
     watchpack "^2.4.0"
     webpack-sources "^3.2.3"
 
@@ -9494,18 +9724,18 @@ whatwg-mimetype@^3.0.0:
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7"
   integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==
 
-whatwg-url@^11.0.0:
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-11.0.0.tgz#0a849eebb5faf2119b901bb76fd795c2848d4018"
-  integrity sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==
+whatwg-url@^12.0.0, whatwg-url@^12.0.1:
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-12.0.1.tgz#fd7bcc71192e7c3a2a97b9a8d6b094853ed8773c"
+  integrity sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ==
   dependencies:
-    tr46 "^3.0.0"
+    tr46 "^4.1.1"
     webidl-conversions "^7.0.0"
 
 whatwg-url@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
-  integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0=
+  integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
   dependencies:
     tr46 "~0.0.3"
     webidl-conversions "^3.0.0"
@@ -9521,7 +9751,7 @@ which-boxed-primitive@^1.0.2:
     is-string "^1.0.5"
     is-symbol "^1.0.3"
 
-which-typed-array@^1.1.2:
+which-typed-array@^1.1.2, which-typed-array@^1.1.9:
   version "1.1.9"
   resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6"
   integrity sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==
@@ -9557,22 +9787,51 @@ wide-align@^1.1.5:
 wildcard@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-1.1.2.tgz#a7020453084d8cd2efe70ba9d3696263de1710a5"
-  integrity sha1-pwIEUwhNjNLv5wup02liY94XEKU=
-
-word-wrap@^1.2.3, word-wrap@~1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
-
-wordwrap@^0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
-  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
+  integrity sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==
 
 wordwrap@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
-  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
+  integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
+
+workbox-cacheable-response@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-7.0.0.tgz#ee27c036728189eed69d25a135013053277482d2"
+  integrity sha512-0lrtyGHn/LH8kKAJVOQfSu3/80WDc9Ma8ng0p2i/5HuUndGttH+mGMSvOskjOdFImLs2XZIimErp7tSOPmu/6g==
+  dependencies:
+    workbox-core "7.0.0"
+
+workbox-core@7.0.0, workbox-core@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-7.0.0.tgz#dec114ec923cc2adc967dd9be1b8a0bed50a3545"
+  integrity sha512-81JkAAZtfVP8darBpfRTovHg8DGAVrKFgHpOArZbdFd78VqHr5Iw65f2guwjE2NlCFbPFDoez3D3/6ZvhI/rwQ==
+
+workbox-expiration@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-7.0.0.tgz#3d90bcf2a7577241de950f89784f6546b66c2baa"
+  integrity sha512-MLK+fogW+pC3IWU9SFE+FRStvDVutwJMR5if1g7oBJx3qwmO69BNoJQVaMXq41R0gg3MzxVfwOGKx3i9P6sOLQ==
+  dependencies:
+    idb "^7.0.1"
+    workbox-core "7.0.0"
+
+workbox-routing@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-7.0.0.tgz#6668438a06554f60645aedc77244a4fe3a91e302"
+  integrity sha512-8YxLr3xvqidnbVeGyRGkaV4YdlKkn5qZ1LfEePW3dq+ydE73hUUJJuLmGEykW3fMX8x8mNdL0XrWgotcuZjIvA==
+  dependencies:
+    workbox-core "7.0.0"
+
+workbox-strategies@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-7.0.0.tgz#dcba32b3f3074476019049cc490fe1a60ea73382"
+  integrity sha512-dg3qJU7tR/Gcd/XXOOo7x9QoCI9nk74JopaJaYAQ+ugLi57gPsXycVdBnYbayVj34m6Y8ppPwIuecrzkpBVwbA==
+  dependencies:
+    workbox-core "7.0.0"
+
+workbox-sw@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-7.0.0.tgz#7350126411e3de1409f7ec243df8d06bb5b08b86"
+  integrity sha512-SWfEouQfjRiZ7GNABzHUKUyj8pCoe+RwjfOIajcx6J5mtgKkN+t8UToHnpaJL5UVVOf5YhJh+OHhbVNIHe+LVA==
 
 workerpool@^3.1.1:
   version "3.1.2"
@@ -9583,15 +9842,24 @@ workerpool@^3.1.1:
     object-assign "4.1.1"
     rsvp "^4.8.4"
 
-workerpool@^6.0.0, workerpool@^6.1.4:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343"
-  integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==
+workerpool@^6.0.0, workerpool@^6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.4.0.tgz#f8d5cfb45fde32fa3b7af72ad617c3369567a462"
+  integrity sha512-i3KR1mQMNwY2wx20ozq2EjISGtQWDIfV56We+yGJ5yDs8jTwQiLLaqHlkBHITlCuJnYlVRmXegxFxZg7gqI++A==
+
+wrap-ansi@^6.0.1:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
+  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
 
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
 write-file-atomic@^3.0.0:
   version "3.0.3"
@@ -9603,25 +9871,25 @@ write-file-atomic@^3.0.0:
     signal-exit "^3.0.2"
     typedarray-to-buffer "^3.1.5"
 
-ws@^8.11.0:
+ws@^8.13.0:
+  version "8.13.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0"
+  integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==
+
+ws@~8.11.0:
   version "8.11.0"
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143"
   integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==
 
-ws@~8.2.3:
-  version "8.2.3"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba"
-  integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==
-
 x-is-array@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/x-is-array/-/x-is-array-0.1.0.tgz#de520171d47b3f416f5587d629b89d26b12dc29d"
-  integrity sha1-3lIBcdR7P0FvVYfWKbidJrEtwp0=
+  integrity sha512-goHPif61oNrr0jJgsXRfc8oqtYzvfiMJpTqwE7Z4y9uH+T3UozkGqQ4d2nX9mB9khvA8U2o/UbPOFjgC7hLWIA==
 
 x-is-string@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/x-is-string/-/x-is-string-0.1.0.tgz#474b50865af3a49a9c4657f05acd145458f77d82"
-  integrity sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI=
+  integrity sha512-GojqklwG8gpzOVEVki5KudKNoq7MbbjYZCbyWzEz7tyPA7eleiE0+ePwOWQQRb5fm86rD3S8Tc0tSFf3AOv50w==
 
 xdg-basedir@^4.0.0:
   version "4.0.0"
@@ -9646,7 +9914,7 @@ xss@^1.0.14:
     commander "^2.20.3"
     cssfilter "0.0.10"
 
-xtend@^4.0.0, xtend@~4.0.0:
+xtend@~4.0.0:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
@@ -9669,6 +9937,11 @@ yam@^1.0.0:
     fs-extra "^4.0.2"
     lodash.merge "^4.6.0"
 
+yaml@^2.2.2:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.1.tgz#02fe0975d23cd441242aa7204e09fc28ac2ac33b"
+  integrity sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==
+
 yocto-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
diff --git a/app/assets/stylesheets/admin_rtl.scss b/app/assets/stylesheets/admin_rtl.scss
new file mode 100644
index 00000000000..1c1bb0974c0
--- /dev/null
+++ b/app/assets/stylesheets/admin_rtl.scss
@@ -0,0 +1 @@
+@import "admin";
diff --git a/app/assets/stylesheets/color_definitions.scss b/app/assets/stylesheets/color_definitions.scss
index e804ebcd536..5211a129cca 100644
--- a/app/assets/stylesheets/color_definitions.scss
+++ b/app/assets/stylesheets/color_definitions.scss
@@ -14,6 +14,8 @@
   --danger: #{$danger};
   --success: #{$success};
   --love: #{$love};
+  --d-selected: #{$selected};
+  --d-hover: #{$hover};
 
   --always-black-rgb: 0, 0, 0;
   --primary-rgb: #{hexToRGB($primary)};
@@ -22,6 +24,8 @@
   --secondary-rgb: #{hexToRGB($secondary)};
   --header_background-rgb: #{hexToRGB($header_background)};
   --tertiary-rgb: #{hexToRGB($tertiary)};
+  --highlight-rgb: #{hexToRGB($highlight)};
+  --success-rgb: #{hexToRGB($success)};
 
   --primary-very-low: #{$primary-very-low};
   --primary-low: #{$primary-low};
@@ -72,6 +76,7 @@
 
   --quaternary-low: #{$quaternary-low};
 
+  --highlight-bg: #{$highlight-bg};
   --highlight-low: #{$highlight-low};
   --highlight-medium: #{$highlight-medium};
   --highlight-high: #{$highlight-high};
@@ -130,4 +135,13 @@
   --gold: #{$gold};
   --silver: #{$silver};
   --bronze: #{$bronze};
+
+  --shadow-modal: 0 8px 60px rgba(0, 0, 0, #{$shadow-opacity-modal});
+  --shadow-composer: 0 -1px 40px rgba(0, 0, 0, #{$shadow-opacity-composer});
+  --shadow-menu-panel: 0 8px 12px rgba(0, 0, 0, #{$shadow-opacity-menu-panel});
+  --shadow-card: 0 4px 14px rgba(0, 0, 0, #{$shadow-opacity-card});
+  --shadow-dropdown: 0 2px 12px 0 rgba(0, 0, 0, #{$shadow-opacity-dropdown});
+  --shadow-header: 0 2px 4px -1px rgba(0, 0, 0, #{$shadow-opacity-header});
+  --shadow-footer-nav: 0 0 2px 0 rgba(0, 0, 0, #{$shadow-opacity-footer-nav});
+  --shadow-focus-danger: 0 0 6px 0 var(--danger);
 }
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index f7ea5d544ef..9ec8d1776c0 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -2,6 +2,7 @@
 @import "vendor/normalize";
 @import "vendor/normalize-ext";
 @import "vendor/pikaday";
+@import "vendor/rotate-center";
 @import "vendor/tippy";
 @import "vendor/svg-arrow";
 @import "common/whcm";
@@ -17,3 +18,4 @@
 @import "common/d-editor";
 @import "common/software-update-prompt";
 @import "common/topic-timeline";
+@import "common/loading-slider";
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index 4a3ae17ffb3..5aa31982d8f 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -1,7 +1,5 @@
 // Styles for /admin section
 
-@import "common/foundation/helpers";
-
 $mobile-breakpoint: 700px;
 
 // Common admin styles
@@ -226,7 +224,7 @@ $mobile-breakpoint: 700px;
     border-bottom: 1px solid var(--primary-low);
     margin-bottom: 0.5em;
     &.overridden {
-      background-color: var(--highlight-medium);
+      background-color: var(--highlight-bg);
     }
     h3 {
       font-weight: normal;
@@ -271,8 +269,13 @@ $mobile-breakpoint: 700px;
   }
   .edit-site-text {
     textarea {
+      display: block;
       width: 100%;
       max-width: 800px;
+      margin: 0;
+    }
+    .save-button {
+      margin-top: 1em;
     }
     .save-button,
     .title {
@@ -286,6 +289,24 @@ $mobile-breakpoint: 700px;
     .go-back {
       margin-top: 1em;
     }
+    .desc {
+      padding-top: 3px;
+      font-size: var(--font-down-1);
+      line-height: var(--line-height-large);
+      color: var(--primary-medium);
+    }
+    .outdated {
+      border: 1px solid var(--primary-low);
+      box-sizing: border-box;
+      color: var(--primary);
+      margin-bottom: 1em;
+      max-width: 800px;
+      padding: 1em;
+
+      p {
+        color: var(--primary-high);
+      }
+    }
   }
   p.warning {
     color: var(--danger);
@@ -382,7 +403,7 @@ $mobile-breakpoint: 700px;
     width: 460px;
     right: 0;
     z-index: z("dropdown");
-    box-shadow: shadow("card");
+    box-shadow: var(--shadow-card);
     margin-top: -2px;
     background-color: var(--secondary);
     padding: 12px 12px 5px;
@@ -413,6 +434,10 @@ $mobile-breakpoint: 700px;
 .admin-container {
   margin-top: 10px;
 
+  .admin-section {
+    margin-bottom: 1em;
+  }
+
   .username {
     input {
       min-width: 15em;
@@ -538,11 +563,6 @@ $mobile-breakpoint: 700px;
       a.active {
         background: var(--primary-medium);
       }
-      &:last-of-type {
-        > a {
-          margin-right: 25px;
-        }
-      }
     }
   }
   h1 {
@@ -625,6 +645,12 @@ $mobile-breakpoint: 700px;
     display: inline-block;
     margin-right: 5px;
   }
+
+  .horizontal-overflow-nav__scroll-right,
+  .horizontal-overflow-nav__scroll-left {
+    --fade-color: var(--primary-low-rgb);
+    background: var(--primary-low);
+  }
 }
 
 .badges,
@@ -801,19 +827,15 @@ section.details {
   }
 }
 
-tr.not-activated {
-  td,
-  td a,
-  td a:visited {
-    color: #bbb;
-  }
-}
-
-.details.not-activated {
-  .username .value,
-  .email .value a,
-  .email .value a:visited {
-    color: #bbb;
+.directory-table {
+  .not-activated {
+    .directory-table__cell {
+      &,
+      a,
+      a:visited {
+        color: #bbb;
+      }
+    }
   }
 }
 
diff --git a/app/assets/stylesheets/common/admin/admin_report.scss b/app/assets/stylesheets/common/admin/admin_report.scss
index 4df36357ff7..598167f8a58 100644
--- a/app/assets/stylesheets/common/admin/admin_report.scss
+++ b/app/assets/stylesheets/common/admin/admin_report.scss
@@ -121,11 +121,11 @@
 
   .average-chart {
     padding: 0.5em;
-    border: 1px solid var(--highlight-high);
-    color: var(--highlight-high);
+    border: 1px solid var(--highlight);
+    color: var(--highlight);
     margin-bottom: 1em;
     text-align: center;
-    background: var(--highlight-low);
+    background: var(--highlight-bg);
   }
 
   .filters {
diff --git a/app/assets/stylesheets/common/admin/customize-install-theme.scss b/app/assets/stylesheets/common/admin/customize-install-theme.scss
index 2b90528a879..41b8086d979 100644
--- a/app/assets/stylesheets/common/admin/customize-install-theme.scss
+++ b/app/assets/stylesheets/common/admin/customize-install-theme.scss
@@ -91,6 +91,11 @@
   padding: 8px 0px;
   display: flex;
   align-items: center;
+
+  @include breakpoint(mobile-extra-large) {
+    flex-direction: column;
+    align-items: initial;
+  }
   .popular-theme-name {
     flex: 1;
     .popular-theme-type {
@@ -115,6 +120,13 @@
     }
   }
   .popular-theme-buttons {
+    @include breakpoint(mobile-extra-large) {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin-top: 0.25em;
+    }
+
     > span {
       font-style: italic;
       font-size: var(--font-down-1);
diff --git a/app/assets/stylesheets/common/admin/customize.scss b/app/assets/stylesheets/common/admin/customize.scss
index cd7405e9a12..39b75d4b0b6 100644
--- a/app/assets/stylesheets/common/admin/customize.scss
+++ b/app/assets/stylesheets/common/admin/customize.scss
@@ -23,6 +23,28 @@
   }
 }
 
+.settings-editor {
+  .ace-wrapper {
+    position: relative;
+    width: 100%;
+    height: 100%;
+    min-height: 300px;
+    .ace_editor {
+      position: absolute;
+      left: 0;
+      right: 0;
+      top: 0;
+      bottom: 0;
+    }
+  }
+}
+
+.theme-settings-editor-dialog {
+  .dialog-footer {
+    display: none;
+  }
+}
+
 .admin-customize.admin-customize-themes {
   .admin-container {
     padding: 0;
@@ -65,7 +87,7 @@
   }
 
   .field-warning {
-    background-color: var(--highlight-low);
+    background-color: var(--highlight-bg);
   }
 
   .admin-container {
@@ -191,9 +213,15 @@
       &.active {
         background-color: var(--quaternary);
         color: var(--secondary);
-        font-weight: 700;
+        .d-icon {
+          color: currentColor;
+        }
       }
     }
+
+    .d-button-label {
+      @include ellipsis;
+    }
   }
 
   .themes-list-container {
@@ -219,15 +247,24 @@
       border-bottom: 1px solid var(--primary-low);
       display: flex;
 
+      &.inactive-theme {
+        color: var(--primary-high);
+        background: var(--primary-very-low);
+        font-size: var(--font-down-1);
+        &:not(.selected):hover {
+          color: var(--primary);
+        }
+      }
+
       &.inactive-indicator {
         border-right: 0;
         border-left: 0;
-        font-weight: bold;
-        color: var(--primary-medium);
+        margin-top: 1em;
+        padding-left: 0.33em;
 
         span.empty {
-          padding-left: 5px;
-          padding-top: 15px;
+          padding-left: 0.33em;
+          padding-top: 1em;
         }
       }
       &:not(.inactive-indicator):not(.selected):hover {
@@ -263,7 +300,6 @@
       .info {
         overflow: hidden;
         display: flex;
-        font-weight: bold;
         font-size: var(--font-up-1);
 
         .icons {
@@ -886,7 +922,7 @@ table.permalinks {
 
 .robots-txt-edit {
   div.overridden {
-    background: var(--highlight-medium);
+    background: var(--highlight-bg);
     padding: 7px;
     margin-bottom: 7px;
   }
@@ -923,3 +959,94 @@ table.permalinks {
     }
   }
 }
+
+.form-templates {
+  &__info {
+    margin-top: 1rem;
+  }
+
+  &__table {
+    margin-bottom: 1rem;
+
+    .admin-list-item .action {
+      text-align: right;
+    }
+  }
+
+  &__form {
+    input {
+      width: 300px;
+    }
+
+    .ace-wrapper {
+      position: relative;
+      height: calc(100vh - 450px);
+      min-height: 200px;
+      width: 100%;
+      box-shadow: var(--shadow-footer-nav);
+      border-radius: 4px;
+    }
+
+    .ace_editor {
+      border-radius: 4px;
+      position: absolute;
+      left: 0;
+      top: 0;
+      right: 0;
+      bottom: 0;
+    }
+
+    .ace_placeholder {
+      font-family: inherit;
+      font-size: var(--font-up-1);
+      color: var(--primary-high);
+    }
+
+    .footer-buttons {
+      display: flex;
+      gap: 0.5rem;
+      .btn-danger {
+        margin-left: auto;
+      }
+    }
+  }
+
+  &__editor {
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+  }
+
+  &__quick-insert-field-buttons {
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    margin-left: 1rem;
+
+    span {
+      margin-right: 0.25rem;
+    }
+
+    .btn {
+      &:not(:last-of-type) {
+        border-right: 1px solid var(--primary-low);
+      }
+    }
+  }
+
+  &__validation-options td {
+    padding: 0.75rem;
+  }
+
+  &__preview-button {
+    margin-left: auto;
+  }
+}
+
+.customize-form-template-view-modal {
+  .modal-footer {
+    .btn:last-child {
+      margin-left: auto;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/admin/dashboard.scss b/app/assets/stylesheets/common/admin/dashboard.scss
index ad5a1ce4c97..7874e517195 100644
--- a/app/assets/stylesheets/common/admin/dashboard.scss
+++ b/app/assets/stylesheets/common/admin/dashboard.scss
@@ -521,7 +521,7 @@
       }
     }
     &:hover {
-      box-shadow: shadow("card");
+      box-shadow: var(--shadow-card);
     }
   }
 }
diff --git a/app/assets/stylesheets/common/admin/json_schema_editor.scss b/app/assets/stylesheets/common/admin/json_schema_editor.scss
index 2fb20a20bb6..c12d074617a 100644
--- a/app/assets/stylesheets/common/admin/json_schema_editor.scss
+++ b/app/assets/stylesheets/common/admin/json_schema_editor.scss
@@ -98,10 +98,25 @@
   .row div[data-schematype="array"] {
     padding: 0.5em;
     background-color: var(--primary-very-low);
+
+    > .card-title {
+      width: 100%;
+      border-bottom: 1px solid var(--primary-low);
+      > .json-editor-btn-collapse {
+        float: right;
+      }
+    }
   }
 
   .desktop-view & .modal-inner-container {
     --modal-max-width: 75vw;
     min-width: 55vw;
   }
+
+  .card-title.level-1,
+  .card-title.je-object__title {
+    > .json-editor-btn-collapse {
+      display: none;
+    }
+  }
 }
diff --git a/app/assets/stylesheets/common/admin/mini_profiler.scss b/app/assets/stylesheets/common/admin/mini_profiler.scss
index 3feddf1f363..355ef193576 100644
--- a/app/assets/stylesheets/common/admin/mini_profiler.scss
+++ b/app/assets/stylesheets/common/admin/mini_profiler.scss
@@ -9,17 +9,22 @@ div.profiler-results.profiler-top {
   top: var(--header-offset);
   z-index: z("header") - 1;
 
+  .profiler-result {
+    font-size: var(--font-down-1);
+  }
+
   .profiler-button {
     background-color: var(--header_background);
     color: var(--header_primary);
     border-bottom: 1px solid var(--header_primary-low);
 
-    .profiler-number {
+    .profiler-number,
+    .profiler-unit {
       color: var(--header_primary);
     }
 
-    .profiler-unit {
-      color: var(--header_primary-medium);
+    .profiler-reqs {
+      font-size: var(--font-down-1);
     }
   }
 
diff --git a/app/assets/stylesheets/common/admin/penalty.scss b/app/assets/stylesheets/common/admin/penalty.scss
index 6e846748c7a..4505a89a4ce 100644
--- a/app/assets/stylesheets/common/admin/penalty.scss
+++ b/app/assets/stylesheets/common/admin/penalty.scss
@@ -1,5 +1,8 @@
 .silence-user-modal,
 .suspend-user-modal {
+  .modal-body {
+    padding-bottom: 0em;
+  }
   .penalty-duration,
   .penalty-suspend-forever,
   .suspend-reason-title,
@@ -87,4 +90,24 @@
       }
     }
   }
+  .penalty-history {
+    position: sticky;
+    bottom: 0;
+    background-color: var(--secondary);
+    padding: 0.5em 0 1em 0;
+  }
+  .penalty-history::before {
+    position: absolute;
+    content: "";
+    display: block;
+    height: 1.5em;
+    top: -1.5em;
+    width: 100%;
+    pointer-events: none;
+    background: linear-gradient(
+      to bottom,
+      rgba(var(--secondary-rgb), 0),
+      rgba(var(--secondary-rgb), 1)
+    );
+  }
 }
diff --git a/app/assets/stylesheets/common/admin/plugins.scss b/app/assets/stylesheets/common/admin/plugins.scss
index 8a0061b5852..a070e836bea 100644
--- a/app/assets/stylesheets/common/admin/plugins.scss
+++ b/app/assets/stylesheets/common/admin/plugins.scss
@@ -11,6 +11,12 @@
       font-weight: bold;
     }
   }
+  td.version {
+    .commit-hash {
+      color: var(--primary-low-mid);
+      font-size: var(--font-down-1);
+    }
+  }
   .grid {
     @media screen and (min-width: 550px) {
       tr {
diff --git a/app/assets/stylesheets/common/admin/settings.scss b/app/assets/stylesheets/common/admin/settings.scss
index bb2bd1936f1..59e68a27ede 100644
--- a/app/assets/stylesheets/common/admin/settings.scss
+++ b/app/assets/stylesheets/common/admin/settings.scss
@@ -109,8 +109,8 @@
     }
   }
   .setting.overridden {
-    input {
-      background-color: var(--highlight-medium);
+    .values input {
+      background-color: var(--highlight-bg);
     }
     h3 {
       position: relative;
@@ -122,7 +122,7 @@
         width: 0.5rem;
         height: 0.5rem;
         border-radius: 100%;
-        background-color: var(--highlight-high);
+        background-color: var(--quaternary-low);
       }
     }
   }
@@ -130,7 +130,7 @@
     input[type="text"],
     input[type="password"],
     textarea {
-      background-color: var(--highlight-medium);
+      background-color: var(--highlight-bg);
     }
   }
   .warning {
diff --git a/app/assets/stylesheets/common/admin/staff_logs.scss b/app/assets/stylesheets/common/admin/staff_logs.scss
index a3252cc1d6d..32ea8af901c 100644
--- a/app/assets/stylesheets/common/admin/staff_logs.scss
+++ b/app/assets/stylesheets/common/admin/staff_logs.scss
@@ -317,6 +317,11 @@ table.screened-ip-addresses {
     margin-bottom: 1em;
   }
 
+  .about {
+    font-size: var(--font-up-1);
+    max-width: 30em;
+  }
+
   .watched-word-controls .btn {
     margin-bottom: 0.25em;
     margin-right: 0.25em;
diff --git a/app/assets/stylesheets/common/admin/users.scss b/app/assets/stylesheets/common/admin/users.scss
index 9dff0bd83b3..e824dbf9a9f 100644
--- a/app/assets/stylesheets/common/admin/users.scss
+++ b/app/assets/stylesheets/common/admin/users.scss
@@ -99,49 +99,55 @@
 }
 
 .admin-users-list {
-  td.username {
-    @include ellipsis;
-    overflow-wrap: break-word;
-  }
-  @media screen and (max-width: 970px) and (min-width: 768px) {
-    td.username {
-      max-width: 23vw; // Prevents horizontal scroll down to 768px
+  .directory-table__cell {
+    &.username {
+      justify-content: start;
     }
-    td.email {
-      max-width: 28vw; // Prevents horizontal scroll down to 768px
-      overflow-wrap: break-word;
+    &.email {
+      justify-content: start;
+      span {
+        display: flex;
+        min-width: 17em;
+        word-break: break-all;
+      }
     }
   }
-  @media screen and (max-width: 767px) {
-    tr {
-      td.username {
-        grid-column-start: 1;
-        grid-column-end: -2;
-        font-weight: bold;
-      }
-      td.user-status {
-        text-align: right;
-        grid-row: 1;
-        grid-column-end: -1;
-        .d-icon {
-          margin-left: 0.25em;
-        }
-      }
-      td.email {
-        grid-column-start: 1;
-        grid-column-end: -1;
-        word-wrap: break-word;
-        overflow-wrap: break-word;
-        overflow: hidden;
-        min-width: 0;
-        margin: 0.5em 0 0 0;
 
-        &:empty {
-          display: none;
+  .directory-table {
+    margin-top: 1em;
+    &__column-header--username,
+    &__column-header--email {
+      .header-contents {
+        text-align: left;
+      }
+    }
+
+    &__cell.username {
+      align-items: center;
+    }
+
+    &__cell.email {
+      @include breakpoint("tablet") {
+        grid-column-start: 1;
+        grid-column-end: -1;
+        span {
+          max-width: 100%;
         }
       }
     }
   }
+
+  .directory-table__cell {
+    padding: 0.5em 0.25em;
+  }
+
+  .user-status span {
+    gap: 0.15em;
+  }
+
+  .avatar {
+    margin-right: 0.25em;
+  }
 }
 
 // mobile styles
diff --git a/app/assets/stylesheets/common/base/_index.scss b/app/assets/stylesheets/common/base/_index.scss
index eb810f8194f..74c56a123c2 100644
--- a/app/assets/stylesheets/common/base/_index.scss
+++ b/app/assets/stylesheets/common/base/_index.scss
@@ -10,6 +10,7 @@
 @import "compose";
 @import "composer-user-selector";
 @import "crawler_layout";
+@import "d-image-grid";
 @import "d-icon";
 @import "d-popover";
 @import "dialog";
@@ -47,14 +48,17 @@
 @import "share_link";
 @import "shared-drafts";
 @import "sidebar";
+@import "sidebar-custom-section";
 @import "sidebar-footer";
 @import "sidebar-section";
 @import "sidebar-more-section-links";
 @import "sidebar-section-link";
+@import "static-login";
 @import "tagging";
 @import "tooltip";
 @import "topic-admin-menu";
 @import "topic-post";
+@import "topic-summary";
 @import "topic";
 @import "upload";
 @import "user-badges";
diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index 2aa063297ad..f4fa950feed 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -260,10 +260,35 @@
       padding-top: 0;
       padding-bottom: 0;
     }
-    .discourse-tag.simple:after,
     .discourse-tag.box {
       margin-right: 0.25em;
     }
+
+    .participant-group-wrapper {
+      display: flex;
+      margin-left: 0.5em;
+
+      .participant-group {
+        padding: 0 5px;
+        border: 1px solid var(--primary-low);
+        border-radius: 0.25em;
+        min-width: 3em;
+        @include ellipsis;
+
+        > a {
+          display: flex;
+          align-items: center;
+          height: 1.25em;
+          color: var(--primary-high);
+          .mobile-view & {
+            height: 1.1em;
+          }
+          .d-icon {
+            margin-right: 5px;
+          }
+        }
+      }
+    }
   }
 
   .topic-featured-link {
diff --git a/app/assets/stylesheets/common/base/alert.scss b/app/assets/stylesheets/common/base/alert.scss
index 912a1a66050..b032f67129c 100644
--- a/app/assets/stylesheets/common/base/alert.scss
+++ b/app/assets/stylesheets/common/base/alert.scss
@@ -24,7 +24,7 @@
     color: var(--primary);
   }
   &.alert-warning {
-    background-color: var(--highlight-low);
+    background-color: var(--highlight-bg);
     color: var(--primary);
   }
   &.alert-info {
diff --git a/app/assets/stylesheets/common/base/category-list.scss b/app/assets/stylesheets/common/base/category-list.scss
index d6c4154eb6a..861c4f62ca4 100644
--- a/app/assets/stylesheets/common/base/category-list.scss
+++ b/app/assets/stylesheets/common/base/category-list.scss
@@ -43,9 +43,8 @@
 
 .category-boxes,
 .category-boxes-with-topics {
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: flex-start;
+  display: grid;
+  gap: 1.5em;
   margin-top: 1em;
   margin-bottom: 1em;
   width: 100%;
@@ -59,7 +58,7 @@
     border-width: 0;
     border-left-width: 6px;
     border-style: solid;
-    border-color: var(--primary-low);
+    border-color: var(--category-color, var(--primary-low));
 
     .mobile-view & {
       width: 100%;
@@ -117,9 +116,8 @@
 }
 
 .category-boxes {
+  grid-template-columns: repeat(auto-fit, minmax(15em, 1fr));
   .category-box {
-    width: 23%;
-    margin: 0 1% 1.5em 1%;
     > a {
       width: 100%;
       padding: 0;
@@ -253,9 +251,8 @@
 }
 
 .category-boxes-with-topics {
+  grid-template-columns: repeat(auto-fit, minmax(18em, 1fr));
   .category-box {
-    width: 31%;
-    margin: 0 1% 1.5em 1%;
     padding: 0;
   }
 
diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index 19de79abcae..4527dd53b7b 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -16,9 +16,19 @@ html.composer-open {
   margin-right: auto;
   max-width: $reply-area-max-width;
   width: 100%;
+
   &.hide-preview {
     max-width: 740px;
   }
+
+  &:has(.has-form-template) {
+    max-width: 740px;
+
+    .toggle-preview {
+      display: none;
+    }
+  }
+
   @media screen and (max-width: 1200px) {
     min-width: 0;
   }
@@ -26,7 +36,7 @@ html.composer-open {
   transition: height 250ms ease, background 250ms ease, transform 250ms ease,
     max-width 250ms ease, padding-bottom 250ms ease;
   background-color: var(--secondary);
-  box-shadow: shadow("composer");
+  box-shadow: var(--shadow-composer);
 
   .reply-area {
     display: flex;
@@ -119,20 +129,20 @@ html.composer-open {
       align-items: center;
       width: auto;
       max-width: 100%;
-
-      .avatar {
-        width: 20px;
-      }
+      min-width: 0; // allows shrinking when needed
 
       .action-title {
+        display: flex;
+        align-items: center;
         line-height: normal;
-        @include ellipsis;
-      }
+        min-width: 0;
 
-      .topic-link,
-      .user-link,
-      .post-link {
-        margin-right: 8px;
+        .topic-link,
+        .user-link,
+        .post-link {
+          margin-right: 8px;
+          @include ellipsis;
+        }
       }
 
       .username {
@@ -270,7 +280,7 @@ html.composer-open {
     }
   }
 
-  .with-tags {
+  .with-tags.with-category {
     .title-and-category {
       flex-wrap: wrap;
     }
@@ -311,8 +321,7 @@ html.composer-open {
 
   .mini-tag-chooser {
     flex-grow: 1;
-    max-width: calc(50% - 4px);
-    margin: 0 0 8px 8px;
+    margin: 0 0 8px 0px;
     z-index: z("composer", "dropdown");
     .select-kit-header {
       color: var(--primary-high);
@@ -337,7 +346,8 @@ html.composer-open {
   .save-or-cancel {
     align-items: center;
     display: flex;
-    flex: 1 1 auto;
+    flex: 0 1 auto;
+    margin-right: 1em;
 
     .btn-primary {
       flex: 0 0 auto;
@@ -358,36 +368,56 @@ html.composer-open {
       }
     }
 
-    #draft-status,
-    #file-uploading {
-      margin-left: 25px;
-    }
-    #file-uploading {
-      display: flex;
-      align-items: center;
-      a {
-        margin-left: 5px;
-        color: var(--primary-high);
-      }
-      .spinner {
-        margin-right: 5px;
-      }
-    }
-    #draft-status .d-icon-user-edit {
-      color: var(--danger);
-      font-size: 20px;
-      vertical-align: -5.5px;
+    .preview-template {
+      margin-left: 0.5rem;
     }
   }
 
   #draft-status,
   #file-uploading {
     color: var(--primary-high);
+    margin-right: 0.5em;
+  }
+
+  #file-uploading {
+    display: flex;
+    align-items: center;
+    margin-right: auto;
+    a {
+      margin-left: 0.33em;
+      color: var(--primary-high);
+    }
+    .spinner {
+      margin-right: 0.33em;
+    }
+  }
+
+  #draft-status {
+    margin-left: auto;
+    .d-icon-user-edit {
+      color: var(--danger);
+      font-size: 20px;
+      vertical-align: -5.5px;
+    }
+    + .btn-mini-toggle {
+      margin-left: 0;
+    }
   }
 
   #file-uploader {
     display: none;
   }
+
+  .composer-select-form-template {
+    margin-bottom: 8px;
+    width: 100%;
+
+    .name,
+    .formatted-selection,
+    .d-icon {
+      color: var(--primary-high);
+    }
+  }
 }
 
 .autocomplete {
@@ -397,7 +427,7 @@ html.composer-open {
   width: 300px;
   background-color: var(--secondary);
   border: 1px solid var(--primary-low);
-  box-shadow: shadow("dropdown-lite");
+  box-shadow: var(--shadow-dropdown);
   border-radius: 8px;
 
   ul {
@@ -423,12 +453,12 @@ html.composer-open {
         padding: 0.3em 1em;
 
         @include hover {
-          background-color: var(--highlight-low);
+          background-color: var(--d-hover);
           text-decoration: none;
         }
 
         &.selected {
-          background-color: var(--tertiary-low);
+          background-color: var(--d-selected);
 
           .username,
           .name,
@@ -447,10 +477,17 @@ html.composer-open {
           color: var(--primary-high);
         }
 
-        .status-description {
-          @include ellipsis;
-          font-size: var(--font-down-2);
-          color: var(--primary-high);
+        .user-status-message {
+          display: flex;
+          align-items: center;
+          gap: 0.25em;
+
+          .user-status-message-description {
+            @include ellipsis;
+            font-size: var(--font-down-2);
+            color: var(--primary-high);
+            margin: 0;
+          }
         }
 
         .relative-date {
@@ -595,7 +632,7 @@ body:not(.ios-safari-composer-hacks) {
 }
 
 .toggle-preview {
-  margin-left: 8px;
+  margin-left: auto;
   transition: all 0.33s ease-out;
 
   &.active {
diff --git a/app/assets/stylesheets/common/base/crawler_layout.scss b/app/assets/stylesheets/common/base/crawler_layout.scss
index cedb89fd949..4615e78d299 100644
--- a/app/assets/stylesheets/common/base/crawler_layout.scss
+++ b/app/assets/stylesheets/common/base/crawler_layout.scss
@@ -5,6 +5,34 @@
 body.crawler,
 body > noscript {
   font-family: serif;
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6 {
+    font-family: serif;
+  }
+  &.browser-update {
+    header {
+      height: 50px;
+      margin-bottom: 1em;
+    }
+    .buorg {
+      position: absolute;
+      top: 50px;
+      width: 100%;
+      background: #fdf2ab;
+      text-align: center;
+      font-family: sans-serif;
+      color: #000;
+      font-size: 14px;
+      margin-bottom: 10px;
+    }
+    #topic-title {
+      margin-top: 2em;
+    }
+  }
 
   &:after,
   &:before {
@@ -52,6 +80,9 @@ body > noscript {
     table-layout: fixed;
     overflow: hidden;
     margin: 2em 0;
+    .posters > a {
+      float: none;
+    }
 
     thead {
       border-bottom: 1px solid #ddd;
@@ -59,39 +90,51 @@ body > noscript {
       th {
         padding: 0 0 0.5em;
       }
-      th:first-of-type {
-        width: 40%;
+      th:nth-child(2) {
+        display: none;
       }
-      @media screen and (min-width: 500px) {
-        th {
-          &.replies,
-          &.views {
-            width: 10%;
-          }
-        }
-        th:first-of-type {
-          width: 50%;
-        }
-        th:last-of-type {
-          width: 15%;
-        }
+      th:first-of-type {
+        width: 60%;
+        padding-left: 0;
+      }
+      th:last-of-type,
+      th.replies,
+      th.views {
+        text-align: center;
+      }
+      th:last-of-type,
+      th.replies {
+        width: 20%;
+      }
+      th.posters {
+        display: none;
       }
     }
 
     td {
       padding: 10px 0;
-      &.posters {
-        padding: 10px 20px;
-      }
     }
-    th:first-of-type {
-      padding-left: 0;
+    td.posters {
+      display: none;
+    }
+    td:last-of-type,
+    td.replies,
+    td.views {
+      text-align: center;
+    }
+    td:first-of-type {
+      width: 60%;
+    }
+    td:last-of-type,
+    td.replies {
+      width: 20%;
     }
 
     @media (max-width: 850px) {
       table-layout: auto;
+      margin: 0;
       td {
-        word-break: break-all;
+        word-break: break-word;
         &.posters {
           a:not(:last-of-type) {
             display: none;
@@ -129,6 +172,9 @@ body > noscript {
       td.main-link {
         padding-right: 1em;
       }
+      p.excerpt {
+        font-size: var(--font-down-1);
+      }
     }
   }
 
@@ -158,6 +204,9 @@ body > noscript {
         height: auto;
       }
     }
+    .topic-body {
+      float: unset;
+    }
   }
 
   .crawler-post {
@@ -215,7 +264,6 @@ body > noscript {
       display: block;
     }
     h1 {
-      font-size: 2em;
       margin-bottom: 0.25em;
     }
   }
@@ -283,3 +331,17 @@ body > noscript {
     }
   }
 }
+
+.buorg div {
+  padding: 8px;
+}
+.buorg a,
+.buorg a:visited {
+  color: #e25600;
+  text-decoration: underline;
+}
+@media print {
+  .buorg {
+    display: none !important;
+  }
+}
diff --git a/app/assets/stylesheets/common/base/d-image-grid.scss b/app/assets/stylesheets/common/base/d-image-grid.scss
new file mode 100644
index 00000000000..e293a31f266
--- /dev/null
+++ b/app/assets/stylesheets/common/base/d-image-grid.scss
@@ -0,0 +1,102 @@
+.d-image-grid:not([data-disabled]) {
+  $grid-column-gap: 6px;
+
+  &[data-columns] {
+    display: flex;
+    flex-wrap: wrap;
+  }
+
+  &[data-columns="2"] > * {
+    flex-basis: calc(50% - ($grid-column-gap / 2));
+    margin-right: $grid-column-gap;
+  }
+
+  &[data-columns="3"] > * {
+    flex-basis: calc(33.33% - ($grid-column-gap * 0.667));
+    margin-right: $grid-column-gap;
+  }
+
+  .d-image-grid-column {
+    box-sizing: border-box;
+    // use flex layout, flex-grow and object-fit: cover
+    // to better have the images fill their containers
+    // and line up vertically (it's not perfect!)
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-start;
+
+    > div,
+    > span {
+      flex-grow: 1;
+      overflow: hidden;
+      // hardcoded max-height here prevents extra tall images
+      // from having an outsized effect on the grid
+      max-height: 1200px;
+
+      img:not(.thumbnail):not(.ytp-thumbnail-image):not(.emoji) {
+        height: 100%;
+        object-fit: cover;
+      }
+    }
+
+    &:last-child {
+      margin-right: 0;
+    }
+
+    > img,
+    > div {
+      margin-bottom: $grid-column-gap;
+    }
+
+    // Forces images in the grid to fill each column width-wise
+    img,
+    > .lightbox-wrapper,
+    > .lightbox-wrapper > .lightbox {
+      width: 100%;
+    }
+
+    .lightbox-wrapper {
+      .meta .informations {
+        display: none;
+      }
+      .meta .filename {
+        flex-grow: 3;
+      }
+      // full-height lightbox element in container
+      > .lightbox {
+        height: 100%;
+      }
+    }
+
+    // when staging edits
+    .image-wrapper {
+      display: block;
+      margin-bottom: $grid-column-gap;
+      padding-bottom: 0em;
+    }
+  }
+
+  .d-editor-preview & {
+    .image-wrapper {
+      margin-bottom: $grid-column-gap;
+      padding-bottom: 0em;
+      .button-wrapper {
+        .scale-btn-container,
+        &[editing] .wrap-image-grid-button {
+          display: none;
+        }
+      }
+    }
+  }
+
+  .mobile-view .d-editor-preview & {
+    .image-wrapper {
+      .button-wrapper {
+        opacity: 0;
+      }
+      &:hover .button-wrapper {
+        opacity: 1;
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/base/d-popover.scss b/app/assets/stylesheets/common/base/d-popover.scss
index 588aa1d2fc9..ba609ff6bc6 100644
--- a/app/assets/stylesheets/common/base/d-popover.scss
+++ b/app/assets/stylesheets/common/base/d-popover.scss
@@ -5,7 +5,11 @@ $d-popover-border: var(--primary-low);
   color: var(--primary);
   background: $d-popover-background;
   border: 1px solid var(--primary-low);
-  box-shadow: shadow("menu-panel");
+  box-shadow: var(--shadow-menu-panel);
+
+  > .tippy-svg-arrow {
+    color: $d-popover-background;
+  }
 }
 
 .tippy-box[data-placement^="top"] .tippy-svg-arrow > svg {
@@ -15,14 +19,10 @@ $d-popover-border: var(--primary-low);
   top: -10px;
 }
 
-.tippy-rounded-arrow {
-  fill: $d-popover-background;
+#tippy-rounded-arrow {
   .svg-arrow {
     fill: $d-popover-border;
   }
-  .svg-content {
-    fill: $d-popover-background;
-  }
 }
 
 [data-tooltip] > *,
diff --git a/app/assets/stylesheets/common/base/dialog.scss b/app/assets/stylesheets/common/base/dialog.scss
index 5f74a25695a..b57f3521a53 100644
--- a/app/assets/stylesheets/common/base/dialog.scss
+++ b/app/assets/stylesheets/common/base/dialog.scss
@@ -37,7 +37,7 @@
   position: relative;
   background-color: var(--secondary);
   animation: fade-in 250ms both;
-  box-shadow: shadow("card");
+  box-shadow: var(--shadow-card);
   min-width: 40vw;
 }
 
diff --git a/app/assets/stylesheets/common/base/directory.scss b/app/assets/stylesheets/common/base/directory.scss
index eb37317f9f1..cd3408a3dec 100644
--- a/app/assets/stylesheets/common/base/directory.scss
+++ b/app/assets/stylesheets/common/base/directory.scss
@@ -1,16 +1,11 @@
+.directory-table-top-scroll {
+  width: 100%;
+  overflow-x: auto;
+}
+
 .directory {
   margin-bottom: 100px;
 
-  .directory-table-container {
-    width: 100%;
-    overflow-x: auto;
-  }
-
-  .directory-table-top-scroll {
-    width: 100%;
-    overflow-x: auto;
-  }
-
   &.users-directory {
     .directory-group-selector {
       vertical-align: top;
@@ -39,58 +34,6 @@
     color: var(--primary-medium);
     font-size: var(--font-down-1);
   }
-
-  table {
-    width: 100%;
-    margin-bottom: 1em;
-
-    td,
-    th {
-      padding: 0.5em;
-      text-align: left;
-      border-bottom: 1px solid var(--primary-low);
-      @media screen and (max-width: $small-width) {
-        padding: 0.5em 0.25em;
-      }
-
-      .number,
-      .time-read {
-        font-size: var(--font-up-3);
-        color: var(--primary-medium);
-        @media screen and (max-width: $small-width) {
-          font-size: var(--font-up-1);
-        }
-      }
-      .time-read {
-        white-space: nowrap;
-      }
-      .user-field-value {
-        font-size: var(--font-up-1);
-        color: var(--primary-medium);
-        @media screen and (max-width: $small-width) {
-          font-size: var(--font-0);
-        }
-      }
-    }
-
-    th.sortable {
-      width: 13%;
-      .d-icon-heart {
-        color: var(--love);
-        margin: 0 0.25em 0 0;
-      }
-    }
-  }
-  .me {
-    background-color: var(--highlight-low-or-medium);
-    .username a,
-    .name a,
-    .title,
-    .number,
-    .time-read {
-      color: var(--primary-medium);
-    }
-  }
 }
 
 .edit-user-directory-columns-modal {
@@ -139,3 +82,244 @@
 .edit-user-directory-columns-modal .modal-inner-container {
   min-width: 450px;
 }
+
+@container (min-width: 47em) {
+  .users-directory {
+    .directory-table {
+      &__value {
+        white-space: nowrap;
+        font-size: var(--font-up-2);
+        &,
+        &--user-field {
+          color: var(--primary-medium);
+        }
+      }
+    }
+  }
+}
+
+.directory-table-container {
+  container-type: inline-size;
+  container-name: directory-table;
+  transform: translateX(0px);
+  // transform here creates a containing blocks which
+  // is used by fixed-positioned dropdowns
+  // if omitted, `overflow-x: auto;` below will clip them
+}
+
+.directory-table {
+  display: grid;
+  gap: 0;
+  width: 100%;
+  margin-top: 1em;
+  overflow-x: auto;
+
+  .me {
+    .directory-table__cell {
+      &,
+      &--user-field {
+        background-color: var(--highlight-low-or-medium);
+      }
+    }
+  }
+
+  &__header,
+  &__body,
+  &__row {
+    display: contents; // we'll be able to remove this with subgrid support
+  }
+
+  &__column-header,
+  &__cell,
+  &__cell--empty,
+  &__cell--user-field {
+    display: flex;
+    border-bottom: 1px solid var(--primary-low);
+    justify-content: center;
+    align-items: center;
+    box-sizing: border-box;
+  }
+
+  &__column-header {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    white-space: nowrap;
+    color: var(--primary-medium);
+    padding: 0.5em;
+    .d-icon {
+      margin-right: 0.25em;
+    }
+
+    &:first-child {
+      .header-contents {
+        text-align: left;
+      }
+    }
+  }
+
+  &__cell {
+    &,
+    &--user-field {
+      padding: 0.75em 0.5em;
+    }
+  }
+
+  &__value {
+    white-space: nowrap;
+    &--user-field {
+      max-width: 30em;
+    }
+  }
+
+  &__label {
+    display: none;
+  }
+
+  .d-icon-heart {
+    font-size: var(--font-down-1);
+    color: var(--love);
+  }
+
+  .user-detail {
+    display: flex;
+    flex-direction: column;
+    min-width: 0; // allow content to shrink and hide overflow
+  }
+
+  .user-info {
+    display: flex;
+    min-width: 0;
+    margin: 0;
+    width: 100%;
+    .user-image {
+      padding-right: 0.5em;
+      margin-right: 0.5em;
+    }
+    .user-detail {
+      padding: 0;
+      width: 100%;
+      @media screen and (max-width: 600px) {
+        // overrides existing media query
+        font-size: var(--font-0);
+      }
+      @include breakpoint("mobile-medium") {
+        font-size: var(--font-down-1);
+      }
+    }
+    .title {
+      margin: 0;
+    }
+  }
+
+  .header-contents {
+    width: 100%;
+    text-align: center;
+  }
+}
+
+// using a container query to switch to a flex-based layout
+// browsers without support for container queries
+// fallback to big horizontal scrolling table
+
+@container (max-width: 47em) {
+  .directory-table {
+    display: flex;
+    flex-direction: column;
+
+    .me {
+      background-color: var(--highlight-low-or-medium);
+    }
+
+    &__label {
+      display: inline-flex;
+      color: var(--primary-medium);
+      padding-right: 0.5em;
+      align-items: baseline;
+      align-self: start;
+      white-space: nowrap;
+      overflow: hidden;
+      flex: 1 0 calc(50% - 0.5em + 5%); // 50% - padding + half the gap
+
+      span {
+        // caution: display flex here can interfere with overflow hiding
+        flex: 0 1 auto; // can shrink if needed
+        margin-right: 0.25em;
+        @include ellipsis;
+      }
+
+      // flexible divider between the label and value
+      &:after {
+        flex: 1 1 0; // can grow or shrink, but should be 0 width if needed
+        color: var(--primary-300);
+        min-width: 0;
+        overflow: hidden;
+        // this needs to be long to account for all possible widths
+        content: "................................................................................................................................................................";
+      }
+
+      .d-icon {
+        font-size: 0.8em;
+        vertical-align: baseline;
+      }
+    }
+
+    &__value {
+      font-size: var(--font-0);
+      color: var(--primary);
+      align-self: start;
+      &--user-field {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        min-width: 0;
+      }
+    }
+
+    &__row {
+      &:first-child {
+        border-top: 1px solid var(--primary-low);
+      }
+      display: grid;
+      grid-template-columns: repeat(auto-fill, minmax(11em, 1fr));
+      border-bottom: 1px solid var(--primary-low);
+      padding: 0.85em 0.5em 1em;
+      gap: 0 10%;
+    }
+
+    &__header {
+      display: none;
+    }
+
+    &__cell {
+      &,
+      &--user-field {
+        padding: 0.25em;
+        border: none;
+        &:first-child {
+          width: 100%;
+          padding: 0.5em 0.25em 1em;
+          justify-content: start;
+          // force full width of the cell
+          grid-column-start: 1;
+          grid-column-end: -1;
+        }
+      }
+
+      &--user-field {
+        display: flex;
+        order: 2;
+        // force full width of the cell
+        // because we don't know how much content there is
+        grid-column-start: 1;
+        grid-column-end: -1;
+        .directory-table__label {
+          margin-right: 0.25em;
+        }
+      }
+    }
+
+    [class*="--empty"] {
+      display: none;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss
index b8782c233d7..d0616c4467d 100644
--- a/app/assets/stylesheets/common/base/discourse.scss
+++ b/app/assets/stylesheets/common/base/discourse.scss
@@ -5,13 +5,17 @@
 
 // Animation Keyframes
 @keyframes ping {
-  from {
-    transform: scale(0.25);
-    opacity: 1;
+  0% {
+    transform: scale(0.6);
+    box-shadow: 0 0 0 0 rgba(var(--success-rgb), 0.7);
   }
-  to {
-    transform: scale(2);
-    opacity: 0;
+  70% {
+    transform: scale(1);
+    box-shadow: 0 0 0 10px rgba(var(--success-rgb), 0);
+  }
+  100% {
+    transform: scale(0.95);
+    box-shadow: 0 0 0 0 rgba(var(--success-rgb), 0);
   }
 }
 
@@ -67,6 +71,7 @@ body {
   background-attachment: fixed;
   background-size: cover;
   min-height: 100%;
+  box-sizing: border-box;
 
   @include clearfix;
 }
@@ -193,7 +198,7 @@ textarea {
 
   &:focus:required:invalid:focus {
     border-color: var(--danger);
-    box-shadow: shadow("focus-danger");
+    box-shadow: var(--shadow-focus-danger);
   }
 }
 
@@ -551,6 +556,7 @@ table {
         &.active {
           font-weight: bold;
           color: var(--primary);
+          background: var(--d-selected);
         }
       }
     }
@@ -564,10 +570,7 @@ table {
     display: inline-block;
     margin-bottom: 0;
     flex: 0 0 auto;
-  }
-
-  .control-group {
-    @include clearfix;
+    max-width: 100%;
   }
 
   .control-label:not(.checkbox-label) {
diff --git a/app/assets/stylesheets/common/base/edit-category.scss b/app/assets/stylesheets/common/base/edit-category.scss
index 0365781b45b..f3316c30a4d 100644
--- a/app/assets/stylesheets/common/base/edit-category.scss
+++ b/app/assets/stylesheets/common/base/edit-category.scss
@@ -176,6 +176,13 @@ div.edit-category {
       margin-bottom: 1em;
     }
   }
+
+  .edit-category-tab-topic-template {
+    .select-category-template__info {
+      margin-block: 0.25rem;
+      font-size: var(--font-down-1);
+    }
+  }
 }
 
 .category-permissions-table {
diff --git a/app/assets/stylesheets/common/base/emoji.scss b/app/assets/stylesheets/common/base/emoji.scss
index 0f04d5e09de..70f86f07c7e 100644
--- a/app/assets/stylesheets/common/base/emoji.scss
+++ b/app/assets/stylesheets/common/base/emoji.scss
@@ -1,7 +1,16 @@
 img.emoji {
   width: 20px;
   height: 20px;
-  vertical-align: middle;
+  vertical-align: text-bottom;
+
+  h1 &,
+  h2 &,
+  h3 &,
+  h4 &,
+  h5 &,
+  h6 & {
+    vertical-align: middle;
+  }
 }
 
 img.emoji.only-emoji {
diff --git a/app/assets/stylesheets/common/base/group.scss b/app/assets/stylesheets/common/base/group.scss
index 458933a8d33..54116873acc 100644
--- a/app/assets/stylesheets/common/base/group.scss
+++ b/app/assets/stylesheets/common/base/group.scss
@@ -2,6 +2,8 @@
 // To style group content differently, use the existing classes with a .group parent class.
 // For example: .group .user-secondary-navigation
 
+@use "sass:math";
+
 .group-details-container {
   background: var(--primary-very-low);
   padding: 20px;
@@ -23,15 +25,27 @@
   display: flex;
   flex-wrap: wrap;
   width: 100%;
+  gap: 0.5em 0;
 
-  input + .group-members-manage {
-    margin-left: auto;
+  .bulk-select + input {
+    margin-left: 0.5em;
   }
 
-  .group-username-filter {
-    margin: 0 0 5px 0;
-    vertical-align: middle;
+  input {
+    margin: 0 auto 0 0;
   }
+
+  .bulk-select-buttons-wrap {
+    margin-right: 0.5em;
+    display: flex;
+    flex-wrap: wrap;
+    gap: 0.5em;
+  }
+}
+
+.group-members-manage {
+  display: flex;
+  gap: 0.5em;
 }
 
 .group-info {
@@ -55,7 +69,7 @@
   }
 
   $size: 50px;
-  $icon-size: $size / 1.8;
+  $icon-size: math.div($size, 1.8);
 
   .avatar-flair-image {
     width: $size;
@@ -116,58 +130,65 @@ table.group-manage-logs {
   }
 }
 
-table.group-members {
-  width: 100%;
+.group-members {
+  grid-template-columns: 3fr repeat(3, minmax(min-content, 1fr));
 
-  th {
-    text-align: center;
-
-    &.bulk-select {
-      height: 30px;
-      width: 30px;
-    }
-
-    &.bulk-select-buttons {
-      text-align: left;
-      white-space: nowrap;
-      width: 1%;
-
-      .bulk-select-buttons-wrap {
-        display: flex;
+  &--can-manage {
+    grid-template-columns: 3fr repeat(4, minmax(min-content, 1fr)) 3em;
+    @container (max-width: 47em) {
+      // positioning the member settings button within the same cell
+      // and avoiding overlap with padding-right on user-info
+      .group-member,
+      .member-settings {
+        grid-row-start: 1;
+        grid-column-start: 1;
+        grid-column-end: -1;
       }
-
-      .btn {
-        margin-right: 0.25em;
+      .member-settings {
+        margin-left: auto;
+      }
+      .user-info {
+        padding-right: 3.5em;
       }
-    }
-
-    &.username {
-      text-align: left;
     }
   }
 
-  td {
-    color: var(--primary-medium);
-    padding: 0.8em 0;
-    text-align: center;
+  &.group-members__requests {
+    grid-template-columns: 3fr repeat(3, minmax(max-content, 1fr));
+  }
 
-    &.group-member {
-      text-align: left;
+  .directory-table__value {
+    font-size: var(--font-0);
+    color: var(--primary);
+  }
+
+  .group-accept-deny-buttons {
+    gap: 0.5em;
+  }
+
+  [class*="group-request-reason__"] {
+    justify-content: start;
+  }
+
+  .group-request-reason__content {
+    .directory-table__value {
+      white-space: normal;
+      max-width: 30em;
     }
   }
 
-  .user-info {
-    display: block;
-
-    .avatar-flair {
-      color: var(--primary);
+  @container (max-width: 47em) {
+    .directory-table__cell {
+      grid-column-start: 1;
+      grid-column-end: -1;
     }
 
-    .user-status-message {
-      img.emoji {
-        width: 1em;
-        height: 1em;
-      }
+    .group-accept-deny-buttons {
+      justify-content: start;
+    }
+
+    .directory-table__cell.group-owner {
+      order: 2;
     }
   }
 }
diff --git a/app/assets/stylesheets/common/base/groups.scss b/app/assets/stylesheets/common/base/groups.scss
index 0fc72d0b996..1aab6046096 100644
--- a/app/assets/stylesheets/common/base/groups.scss
+++ b/app/assets/stylesheets/common/base/groups.scss
@@ -1,3 +1,5 @@
+@use "sass:math";
+
 .groups-header {
   display: flex;
   flex-wrap: wrap;
@@ -44,7 +46,7 @@
       transition: all 0.25s;
 
       &:hover {
-        box-shadow: shadow("card");
+        box-shadow: var(--shadow-card);
         border-color: var(--primary-low-mid-or-secondary-high);
       }
     }
@@ -114,7 +116,7 @@
     }
 
     $size: 40px;
-    $icon-size: $size / 1.8;
+    $icon-size: math.div($size, 1.8);
 
     .group-avatar-flair {
       display: inline-block;
diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss
index 0c96429274a..acca71d247c 100644
--- a/app/assets/stylesheets/common/base/header.scss
+++ b/app/assets/stylesheets/common/base/header.scss
@@ -10,7 +10,7 @@
   width: 100%;
   z-index: z("header");
   background-color: var(--header_background);
-  box-shadow: shadow("header");
+  box-shadow: var(--shadow-header);
   backface-visibility: hidden; /** do magic for scrolling performance **/
 
   > .wrap {
@@ -43,17 +43,32 @@
   }
 
   .title {
+    --d-logo-height: 2.667em;
     display: flex;
     align-items: center;
     height: 100%;
+    animation: fadein 0.5s;
+    // min-width acts as a placeholder if the small logo takes a while to load
+    // it prevents topic title from shifting after the small logo loads
+    // it's set to match the #site-logo height so square small logos don't resize when titles dock
+    min-width: var(--d-logo-height);
     a,
     a:visited {
       color: var(--header_primary);
     }
+
+    &:not(.title--minimized) {
+      // allows large logos to be hidden if there are too many other header elements
+      // this prioritizes nav elements, especially in cases of high zoom levels
+      overflow: hidden;
+    }
   }
 
   #site-logo {
+    height: var(--d-logo-height);
     width: auto;
+    max-width: 100%;
+    object-fit: contain;
   }
 
   #site-text-logo {
@@ -109,14 +124,13 @@
 }
 
 .d-header-icons {
-  text-align: center;
-  margin: 0 0 0 5px;
+  display: flex;
+  margin: 0 0 0 0.5em;
   list-style: none;
 
-  > li {
-    float: left;
-  }
   .icon {
+    box-sizing: content-box;
+    appearance: none;
     position: relative;
     display: flex;
     align-items: center;
@@ -126,9 +140,7 @@
     padding: 0.2143em;
     text-decoration: none;
     cursor: pointer;
-    border-top: 1px solid transparent;
-    border-left: 1px solid transparent;
-    border-right: 1px solid transparent;
+    border: 1px solid transparent;
     transition: all linear 0.15s;
     outline: none;
     img.avatar {
@@ -189,37 +201,11 @@
   .notifications {
     position: relative;
   }
-  .ring {
-    position: absolute;
-    top: -11px;
-    right: 23.5px;
-    z-index: z("base");
-    margin-left: 0;
-    background: radial-gradient(transparent, var(--success));
-    border-radius: 100%;
-    width: 20px;
-    height: 20px;
-    transform-origin: center;
-    animation-iteration-count: infinite;
-    animation-duration: 3s;
-    animation-name: ping;
-
-    &.revamped {
-      right: -4px;
-      top: -6px;
-
-      &.regular-notifications {
-        background: radial-gradient(
-          transparent,
-          var(--tertiary-med-or-tertiary)
-        );
-      }
-    }
-  }
   .header-dropdown-toggle {
     position: relative;
   }
   .badge-notification {
+    border: 2px solid var(--header_background);
     position: absolute;
     z-index: z("base");
     left: 0;
@@ -245,8 +231,7 @@
   .unread-notifications {
     background-color: var(--tertiary-med-or-tertiary);
   }
-  .unread-high-priority-notifications,
-  .ring {
+  .unread-high-priority-notifications {
     left: auto;
     right: 25px;
   }
@@ -277,12 +262,9 @@
   }
 }
 
-.highlight-strong {
-  background-color: var(--highlight-medium);
-}
-
 // topic info in the header
 .extra-info-wrapper {
+  flex: 1 0 0;
   display: flex;
   align-items: center;
   height: 100%;
@@ -433,3 +415,16 @@ $mobile-avatar-height: 1.532em;
     margin-left: 5px;
   }
 }
+
+.d-header-mode .bootstrap-mode {
+  border-radius: 2em;
+  color: var(--primary-medium);
+  font-size: var(--font-down-1);
+  margin-left: 0.5em;
+  padding: 0.25em 0.5em;
+
+  &:focus {
+    background-color: var(--primary-medium);
+    color: var(--secondary);
+  }
+}
diff --git a/app/assets/stylesheets/common/base/history.scss b/app/assets/stylesheets/common/base/history.scss
index b04039880a4..da398a2f761 100644
--- a/app/assets/stylesheets/common/base/history.scss
+++ b/app/assets/stylesheets/common/base/history.scss
@@ -1,6 +1,10 @@
 // styles that apply to the popup that appears when you show the edit history of a post
 
 .modal.history-modal {
+  .modal-body {
+    max-height: 70vh;
+  }
+
   #revision-numbers {
     display: inline-block;
     min-width: 96px;
@@ -27,9 +31,28 @@
     padding: 5px;
   }
 
-  #revisions .row:first-of-type {
-    margin-top: 10px;
+  #revisions {
+    .row:first-of-type {
+      margin-top: 10px;
+    }
+    .revision-content table {
+      thead {
+        th {
+          padding-bottom: 2px;
+          font-weight: bold;
+          color: var(--primary);
+        }
+      }
+
+      td {
+        padding: 3px 3px 3px 0.5em;
+        img {
+          max-width: none;
+        }
+      }
+    }
   }
+
   ins,
   .diff-ins {
     code,
@@ -99,7 +122,7 @@
     font-weight: bold;
   }
   span.edit-reason {
-    background-color: var(--highlight-medium);
+    background-color: var(--highlight-bg);
     padding: 3px 5px 5px 5px;
   }
   .d-icon-ban {
diff --git a/app/assets/stylesheets/common/base/lightbox.scss b/app/assets/stylesheets/common/base/lightbox.scss
index db86e581ca6..4ff9a7add48 100644
--- a/app/assets/stylesheets/common/base/lightbox.scss
+++ b/app/assets/stylesheets/common/base/lightbox.scss
@@ -79,7 +79,6 @@ $meta-element-margin: 6px;
   }
 
   a.lightbox:hover {
-    border-radius: 5px;
     box-shadow: 0 2px 5px 0 rgba(var(--always-black-rgb), 0.2),
       0 2px 10px 0 rgba(var(--always-black-rgb), 0.2);
   }
diff --git a/app/assets/stylesheets/common/base/login.scss b/app/assets/stylesheets/common/base/login.scss
index a54dc91b712..e0aa1932881 100644
--- a/app/assets/stylesheets/common/base/login.scss
+++ b/app/assets/stylesheets/common/base/login.scss
@@ -1,6 +1,3 @@
-$invite-bg: absolute-image-url("/branded-background.svg");
-$invite-mobile-bg: absolute-image-url("/branded-background-mobile.svg");
-
 .caps-lock-warning {
   color: var(--danger);
   font-size: var(--font-down-1);
@@ -36,22 +33,9 @@ $invite-mobile-bg: absolute-image-url("/branded-background-mobile.svg");
 }
 
 body.invite-page {
-  background-image: $invite-bg;
-  background-size: 110vw 110vh; // crops better than cover at various viewport sizes
-  background-repeat: no-repeat;
-  background-position: bottom;
-  background-color: var(--secondary);
+  background-color: var(--primary-50);
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
     Oxygen-Sans, Ubuntu, Cantarell, Arial, sans-serif;
-  @include breakpoint("mobile-extra-large") {
-    background: $invite-mobile-bg;
-    background-size: cover;
-    background-repeat: no-repeat;
-    background-position: bottom;
-  }
-  .d-header .panel.clearfix {
-    display: none;
-  }
 }
 
 // Create Account + Login
@@ -93,7 +77,6 @@ body.invite-page {
     display: grid;
     grid-template-columns: auto 1fr;
     grid-template-rows: auto 1fr;
-    background: var(--secondary);
     max-width: 33em;
     word-break: break-word;
     .login-title {
@@ -364,9 +347,9 @@ body.invite-page {
 
   .invite-form,
   .invite-success {
-    border-radius: 10px;
+    border-radius: 8px;
     margin-top: 25px;
-    border-top: 6px solid var(--tertiary);
+    border: 1px solid var(--primary-low);
     background-color: var(--secondary);
   }
 
diff --git a/app/assets/stylesheets/common/base/magnific-popup.scss b/app/assets/stylesheets/common/base/magnific-popup.scss
index bd23ba1e899..57adf03611c 100644
--- a/app/assets/stylesheets/common/base/magnific-popup.scss
+++ b/app/assets/stylesheets/common/base/magnific-popup.scss
@@ -27,6 +27,8 @@
 // 1. Default Settings
 ////////////////////////
 
+@use "sass:math";
+
 $overlay-color: #0b0b0b !default;
 $overlay-opacity: 0.8 !default;
 $shadow: 0 0 8px rgba(0, 0, 0, 0.6) !default; // shadow on image or iframe
@@ -46,7 +48,7 @@ $include-iframe-type: true !default;
 $iframe-padding-top: 40px !default;
 $iframe-background: #000 !default;
 $iframe-max-width: 900px !default;
-$iframe-ratio: 9/16 !default;
+$iframe-ratio: math.div(9, 16) !default;
 
 // Image-type options
 $include-image-type: true !default;
@@ -479,7 +481,7 @@ button {
     color: $caption-title-color;
     word-wrap: break-word;
     padding-right: 36px; // leave some space for counter at right side
-
+    max-width: 100%;
     // add the download icon
     a.image-source-link .d-icon {
       padding-right: 5px;
diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss
index 3fc9eafc3c2..763f610c907 100644
--- a/app/assets/stylesheets/common/base/menu-panel.scss
+++ b/app/assets/stylesheets/common/base/menu-panel.scss
@@ -1,7 +1,7 @@
 .menu-panel.slide-in {
   position: fixed;
   right: 0;
-  box-shadow: shadow("header");
+  box-shadow: var(--shadow-header);
 
   .panel-body {
     width: 100%;
@@ -21,7 +21,7 @@
 
 .menu-panel {
   border: 1px solid var(--primary-low);
-  box-shadow: shadow("menu-panel");
+  box-shadow: var(--shadow-menu-panel);
   background-color: var(--secondary);
   z-index: z("header");
   padding: 0.5em;
@@ -29,6 +29,8 @@
   overflow: hidden;
   display: flex;
   flex-direction: column;
+  box-sizing: border-box;
+
   hr {
     margin: 3px 0;
   }
@@ -90,6 +92,10 @@
   }
 }
 
+.search-menu .menu-panel {
+  width: 500px;
+}
+
 .user-menu.revamped {
   right: 0;
   width: 320px;
@@ -105,6 +111,7 @@
     border-left: 1px solid var(--primary-low);
     padding: 0.75em 0 0;
     overflow-y: auto;
+    overscroll-behavior: contain;
   }
 
   .tabs-list {
@@ -129,10 +136,10 @@
       }
 
       &.active {
-        background-color: var(--tertiary-low);
+        background-color: var(--d-selected);
       }
       &:hover {
-        background-color: var(--highlight-medium);
+        background-color: var(--d-hover);
       }
     }
   }
@@ -149,6 +156,7 @@
   .quick-access-panel {
     width: 320px;
     padding: 0.75em;
+    padding-bottom: max(env(safe-area-inset-bottom), 0.75em);
     justify-content: space-between;
     box-sizing: border-box;
     min-width: 0; // makes sure menu tabs don't go off screen
@@ -159,6 +167,9 @@
     }
 
     .item-label {
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
       color: var(--primary);
     }
 
@@ -171,12 +182,12 @@
       }
 
       &:hover {
-        background-color: var(--highlight-medium);
+        background-color: var(--d-hover);
         outline: none;
       }
 
       &:focus-within {
-        background: var(--highlight-medium);
+        background: var(--d-hover);
         a {
           // we don't need the link focus because we're styling the parent
           outline: 0;
@@ -205,6 +216,12 @@
         margin: 0;
         padding: 0 0.5em;
       }
+      img.emoji {
+        height: 1em;
+        width: 1em;
+        padding-top: 0.2em;
+        margin-right: 0.5em;
+      }
       .d-icon {
         padding-top: 0;
       }
@@ -239,23 +256,18 @@
   }
 }
 
-// remove when the widgets-based implementation of the user menu is removed
-.user-menu:not(.revamped) {
-  .quick-access-panel {
-    li {
-      span:first-child {
-        color: var(--primary);
-      }
-    }
-  }
-}
-
 .hamburger-panel {
+  // remove once glimmer search menu in place
   a.widget-link {
     width: 100%;
     box-sizing: border-box;
     @include ellipsis;
   }
+  a.search-link {
+    width: 100%;
+    box-sizing: border-box;
+    @include ellipsis;
+  }
   .panel-body {
     overflow-y: auto;
   }
@@ -273,6 +285,7 @@
 }
 
 .menu-panel {
+  // remove once glimmer search menu in place
   .widget-link,
   .categories-link {
     padding: 0.25em 0.5em;
@@ -280,7 +293,34 @@
     color: var(--primary);
     &:hover,
     &:focus {
-      background-color: var(--highlight-medium);
+      background-color: var(--d-hover);
+      outline: none;
+    }
+
+    .d-icon {
+      color: var(--primary-medium);
+    }
+
+    .new {
+      font-size: var(--font-down-1);
+      margin-left: 0.5em;
+      color: var(--primary-med-or-secondary-med);
+    }
+
+    &.show-help,
+    &.filter {
+      color: var(--tertiary);
+    }
+  }
+
+  .search-link,
+  .categories-link {
+    padding: 0.25em 0.5em;
+    display: block;
+    color: var(--primary);
+    &:hover,
+    &:focus {
+      background-color: var(--d-hover);
       outline: none;
     }
 
@@ -398,7 +438,7 @@
     }
 
     li {
-      background-color: var(--tertiary-low);
+      background-color: var(--d-selected);
       box-sizing: border-box;
       list-style-type: none;
 
@@ -441,12 +481,12 @@
       }
 
       &:hover {
-        background-color: var(--highlight-medium);
+        background-color: var(--d-hover);
         outline: none;
       }
 
       &:focus-within {
-        background: var(--highlight-medium);
+        background: var(--d-hover);
         a {
           // we don't need the link focus because we're styling the parent
           outline: 0;
@@ -495,13 +535,6 @@
         padding-top: 0.2em;
         margin-right: 0.5em;
       }
-
-      img.emoji {
-        height: 1em;
-        width: 1em;
-        padding-top: 0.2em;
-        margin-right: 0.5em;
-      }
     }
     .is-warning {
       .d-icon-envelope {
@@ -538,133 +571,6 @@
     }
     /* as a big ol' click target, don't let text inside be selected */
     @include unselectable;
-
-    &.quick-access-profile {
-      display: inline;
-      li:not(.show-all) a {
-        color: var(--primary);
-        display: flex;
-      }
-      ul button {
-        line-height: 1.4; // match 'ul a' link height
-        width: 100%;
-        display: flex;
-      }
-      @media screen and (max-height: 360px) {
-        // two column grid to avoid scroll
-        ul {
-          display: grid;
-          grid-template-columns: repeat(2, minmax(0, 1fr));
-          grid-gap: 0 1em;
-          a {
-            @include ellipsis;
-            > div {
-              display: block;
-            }
-          }
-          button {
-            span:not(.relative-date) {
-              @include ellipsis;
-            }
-          }
-        }
-        li:not(.show-all) a {
-          color: var(--primary);
-          display: flex;
-        }
-      }
-    }
-  }
-}
-
-div.menu-links-header {
-  width: 100%;
-  .menu-links-row {
-    box-sizing: border-box;
-    display: flex;
-    width: 100%;
-    z-index: 2;
-    justify-content: space-between;
-
-    .glyphs {
-      display: inline-flex;
-      align-items: center;
-      flex-wrap: nowrap;
-      width: 100%;
-      justify-content: space-between;
-      padding: 0;
-
-      button {
-        display: flex;
-        flex: 1 1 auto;
-        padding: 0.65em 0.25em 0.75em;
-        justify-content: center;
-
-        svg {
-          pointer-events: none;
-        }
-      }
-    }
-
-    button {
-      // This is to make sure active and inactive tab icons have the same
-      // size. `box-sizing` does not work and I have no idea why.
-      border: 1px solid transparent;
-      &:not(.active):hover {
-        border-bottom: 0;
-        margin-top: -1px;
-      }
-    }
-
-    button.active {
-      border: 1px solid var(--primary-low);
-      border-bottom: 1px solid var(--secondary);
-      position: relative;
-
-      .d-icon {
-        color: var(--primary-high);
-      }
-
-      &:hover {
-        background-color: inherit;
-      }
-    }
-  }
-
-  button:hover,
-  button:focus {
-    background-color: var(--primary-low);
-    outline: none;
-    &.active {
-      background-color: var(--primary-very-low);
-    }
-  }
-  button {
-    padding: 0.3em 0.5em;
-  }
-
-  .glyphs {
-    display: table-cell;
-    width: auto;
-    text-align: center;
-  }
-  .glyphs:first-child {
-    text-align: left;
-  }
-
-  .glyphs:last-child {
-    text-align: right;
-  }
-  .fa,
-  button {
-    color: var(--primary-med-or-secondary-med);
-  }
-}
-
-body.footer-nav-ipad {
-  .hamburger-panel .revamped,
-  .menu-panel.slide-in {
-    margin-top: var(--footer-nav-height);
   }
 }
 
@@ -686,7 +592,7 @@ body.footer-nav-ipad {
   background-color: black;
   --opacity: 0.5;
   opacity: var(--opacity);
-  top: 0;
+  top: var(--header-top);
   left: 0;
   display: none;
   touch-action: pan-y pinch-zoom;
@@ -699,6 +605,24 @@ body.footer-nav-ipad {
 }
 
 .menu-panel.slide-in {
+  top: var(--header-top);
+  box-sizing: border-box;
+  // ensure there's always space to click outside on tiny devices
+  max-width: 90vw;
+
+  --100dvh: 100%;
+  @supports (height: 100dvh) {
+    --100dvh: 100dvh;
+  }
+
+  --base-height: calc(var(--100dvh) - var(--header-top));
+
+  height: var(--base-height);
+
+  body.footer-nav-ipad & {
+    height: calc(var(--base-height) - var(--footer-nav-height));
+  }
+
   transform: translateX(var(--offset));
   @media (prefers-reduced-motion: no-preference) {
     &.animate {
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index c5249f07bc4..abb67544f4c 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -18,7 +18,7 @@
   margin: 0 auto;
   max-width: var(--modal-max-width);
   background-color: var(--secondary);
-  box-shadow: shadow("modal");
+  box-shadow: var(--shadow-modal);
 
   .select-kit {
     width: 220px;
@@ -44,7 +44,7 @@
   overflow: auto;
   height: auto;
   background-color: var(--secondary);
-  box-shadow: shadow("card");
+  box-shadow: var(--shadow-card);
   background-clip: padding-box;
 }
 
@@ -74,6 +74,8 @@
   .modal-close {
     order: 2;
     margin-left: auto;
+    align-self: start;
+    padding: 0.15em 0;
 
     .close {
       color: var(--primary-high);
@@ -133,8 +135,12 @@
     }
   }
 
-  &:not(.history-modal) {
-    .modal-body:not(.reorder-categories):not(.poll-ui-builder):not(.poll-breakdown) {
+  &:not(.bookmark-reminder-modal):not(.history-modal):not(
+      .sidebar__edit-navigation-menu__modal
+    ) {
+    .modal-body:not(.reorder-categories):not(.poll-ui-builder):not(
+        .poll-breakdown
+      ) {
       max-height: 80vh !important;
       @media screen and (max-height: 500px) {
         max-height: 65vh !important;
@@ -153,17 +159,13 @@
   align-items: center;
   padding: 14px 15px 10px;
   border-top: 1px solid var(--primary-low);
-  --btn-bottom-margin: 0.3em;
+  gap: 0.3em 0;
   .btn {
-    margin: 0 0.75em var(--btn-bottom-margin) 0;
+    margin: 0 0.75em 0 0;
     &[href] {
       min-height: unset;
     }
   }
-
-  a {
-    margin-bottom: var(--btn-bottom-margin);
-  }
 }
 
 .modal {
@@ -208,7 +210,7 @@
           position: absolute;
           top: 70%;
           padding: 5px 10px;
-          box-shadow: shadow("card");
+          box-shadow: var(--shadow-card);
           z-index: 5;
           background-color: var(--secondary);
           max-height: 150px;
@@ -221,7 +223,7 @@
             display: block;
             &:hover,
             &:focus {
-              background-color: var(--highlight-medium);
+              background-color: var(--highlight-bg);
             }
             .search-category {
               display: flex;
@@ -279,6 +281,12 @@
 }
 
 .reply-where-modal {
+  .dialog-content {
+    width: 100%;
+    min-width: unset;
+    max-width: 30em;
+  }
+
   .dialog-footer {
     display: block;
   }
@@ -291,19 +299,66 @@
     overflow: hidden;
     width: 100%;
 
-    &:first-of-type {
-      margin-top: 0.25em;
+    &.dialog-close {
+      display: none;
+    }
+
+    &.btn-reply-on-original {
+      --text-color: var(--secondary);
+    }
+
+    &.btn-reply-where__cancel {
+      padding-left: 0;
+      margin: 0;
     }
 
-    &.btn-reply-on-original,
     &.btn-reply-here {
-      font-size: var(--font-up-1);
-      line-height: var(--line-height-medium);
-      font-weight: bold;
+      --text-color: var(--primary);
+      .discourse-no-touch & {
+        &:hover {
+          --text-color: var(--secondary);
+        }
+      }
     }
 
-    .topic-title {
-      font-weight: normal;
+    &.btn-reply-where {
+      min-height: 3em; // for situations when there are no categories/tags
+    }
+
+    .fancy-title {
+      display: inline-block;
+      width: 100%;
+
+      @include ellipsis;
+    }
+
+    .topic-title__top-line {
+      display: flex;
+      align-items: baseline;
+      color: var(--text-color);
+      font-size: var(--font-up-1);
+      .d-icon {
+        color: var(--text-color);
+        margin: 0;
+      }
+    }
+
+    .topic-statuses {
+      display: flex;
+      font-size: 0.95em;
+    }
+
+    .topic-title__bottom-line {
+      margin-top: 0.15em;
+      display: flex;
+      align-items: baseline;
+      .discourse-tags {
+        font-size: var(--font-down-1);
+      }
+      .category-name,
+      .discourse-tag {
+        color: var(--text-color);
+      }
     }
   }
 }
@@ -336,6 +391,8 @@
 }
 
 .incoming-email-modal {
+  max-height: 80vh;
+
   .btn {
     transition: none;
     background-color: transparent;
@@ -547,6 +604,14 @@
       width: 100%;
     }
   }
+
+  #choosing-topic {
+    form {
+      hr {
+        margin-bottom: 0.5em;
+      }
+    }
+  }
 }
 
 .publish-page-modal {
@@ -636,36 +701,21 @@
 }
 
 .topic-bulk-actions-modal {
+  .modal-inner-container {
+    min-width: 0;
+    width: 100%;
+  }
   p {
     margin-top: 0;
   }
-  &.full .modal-body {
-    height: 400px;
-    max-height: 400px;
-  }
-
   .bulk-buttons {
-    display: flex;
-    flex-wrap: wrap;
-    margin-right: -1%;
-
-    .btn {
-      flex: 1 0 30%;
-      margin-bottom: 1em;
-      margin-right: 1%;
-      white-space: nowrap;
-      overflow: hidden;
-      max-width: 33%;
-
-      @media screen and (max-width: 767px) {
-        flex: 1 0 48%;
-        max-width: 48%;
-      }
-
-      @include breakpoint(mobile-extra-large) {
-        flex: 1 1 auto;
-        min-width: 49%;
-      }
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(12em, 1fr));
+    gap: 0.5em;
+    max-width: 100%;
+    min-width: 0;
+    .d-button-label {
+      @include ellipsis;
     }
   }
 }
@@ -719,3 +769,14 @@
     top: 21px;
   }
 }
+
+.json-editor-btn-delete {
+  @extend .btn-danger;
+  @extend .no-text;
+}
+
+.json-editor-btn-collapse {
+  @extend .no-text;
+  @extend .btn-flat;
+  @extend .btn-small;
+}
diff --git a/app/assets/stylesheets/common/base/new-user.scss b/app/assets/stylesheets/common/base/new-user.scss
index b7afd619704..0c5c98c667c 100644
--- a/app/assets/stylesheets/common/base/new-user.scss
+++ b/app/assets/stylesheets/common/base/new-user.scss
@@ -1,5 +1,4 @@
 .new-user-wrapper {
-  margin-top: -15px; // temp, can remove margin from sibling element after nav finalized
   .user-navigation {
     --user-navigation__border-width: 4px;
     border-bottom: 1px solid var(--primary-low);
@@ -132,6 +131,10 @@
       @include breakpoint(extra-large) {
         font-size: var(--font-down-1);
       }
+
+      span {
+        display: inline-flex;
+      }
     }
 
     .nav-pills {
@@ -159,44 +162,15 @@
     }
   }
 
-  .user-nav-dropdown-button {
-    background: transparent;
-  }
-
-  .user-nav-dropdown-submenu {
-    background: var(--secondary);
-    list-style-type: none;
-    margin: 0;
-
-    li a {
-      padding: 0.5em 1em;
-      color: var(--primary);
-
-      .discourse-no-touch & {
-        &:hover {
-          background: var(--highlight-medium);
-          color: currentColor;
-        }
-      }
-
-      &.active {
-        background: var(--tertiary-low);
-        color: currentColor;
-      }
-
-      &:first-of-type {
-        padding-top: 0.5em;
-      }
-      &:last-of-type {
-        padding-bottom: 0.5em;
-      }
-    }
-  }
-
   .empty-state {
     padding: 0;
     margin: 1em 0;
   }
+
+  .solo-preference {
+    grid-column-start: 1;
+    grid-column-end: -1;
+  }
 }
 
 .user-preferences-tracking-page {
diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss
index b35ae31a219..100abfac422 100644
--- a/app/assets/stylesheets/common/base/onebox.scss
+++ b/app/assets/stylesheets/common/base/onebox.scss
@@ -141,7 +141,7 @@ aside.onebox {
       color: var(--tertiary);
     }
 
-    img {
+    img:not(.avatar, .onebox-avatar-inline) {
       max-height: 170px;
       max-width: 20%;
       @media all and (max-width: 600px) {
@@ -268,6 +268,16 @@ aside.onebox {
       .location {
         margin-right: 10px;
       }
+      .user-onebox--joined {
+        color: var(--primary-medium);
+        margin-top: 10px;
+      }
+      .aspect-image {
+        width: 80px;
+        height: 80px;
+        float: left;
+        margin-right: 1em;
+      }
     }
 
     // instagram + reddit fixes
@@ -406,7 +416,7 @@ pre.onebox code ol.lines li {
 }
 
 pre.onebox code li.selected {
-  background-color: var(--highlight-low-or-medium);
+  background-color: var(--highlight-bg);
 }
 
 pre.onebox code {
@@ -669,6 +679,11 @@ aside.onebox.twitterstatus .onebox-body {
       margin-right: 0.25em;
     }
   }
+
+  .is-reply {
+    color: var(--primary-medium);
+    margin-right: 0.25em;
+  }
 }
 
 // Onebox - Imgur/Flickr - Album
@@ -738,7 +753,8 @@ aside.onebox.xkcd .onebox-body img {
 
 // allowlistedgeneric twitter labels
 .onebox.allowlistedgeneric,
-.onebox.whitelistedgeneric {
+.onebox.whitelistedgeneric,
+.onebox.discoursetopic {
   .label1,
   .label2 {
     color: var(--primary-med-or-secondary-med);
@@ -752,15 +768,10 @@ aside.onebox.xkcd .onebox-body img {
 }
 
 .onebox {
-  &.allowlistedgeneric,
-  &.whitelistedgeneric,
-  &.gfycat,
-  &.githubfolder {
-    .site-icon {
-      width: 16px;
-      height: 16px;
-      margin-right: 0.5em;
-    }
+  .site-icon {
+    width: 16px;
+    height: 16px;
+    margin-right: 0.5em;
   }
   &.category-onebox {
     border: 1px solid var(--primary-low);
@@ -769,6 +780,24 @@ aside.onebox.xkcd .onebox-body img {
   }
 }
 
+.onebox.discoursetopic {
+  h3 {
+    width: 100%;
+    margin-bottom: 0.2rem !important;
+  }
+
+  .discourse-tags {
+    vertical-align: bottom;
+    .d-icon-tag {
+      font-size: var(--font-down-1);
+      margin-right: 0.35em;
+      margin-top: 0.15em;
+      color: var(--primary-medium);
+      align-self: center;
+    }
+  }
+}
+
 .onebox.gfycat p {
   span.label1 a {
     white-space: nowrap;
@@ -901,7 +930,7 @@ iframe.vimeo-onebox {
 
 .video-container {
   .notice {
-    background-color: var(--highlight-medium);
+    background-color: var(--highlight-bg);
     padding: 10px 20px;
     position: absolute;
     width: calc(100% - 40px);
@@ -981,3 +1010,81 @@ aside.onebox.preview-error .site-icon {
   height: 16px;
   margin-right: 0.5em;
 }
+
+.onebox.threadsstatus .onebox-body {
+  .thumbnail,
+  .thumbnail.onebox-avatar {
+    width: 36px;
+    height: 36px;
+    margin-right: 12px;
+  }
+  .threads-screen-name {
+    font-size: var(--font-down-1);
+  }
+  h4 {
+    margin-bottom: 0;
+  }
+
+  .thread-contents .thread-description {
+    white-space: pre-line;
+  }
+
+  p,
+  .thread-contents {
+    clear: left;
+    padding: 1em 0;
+
+    .quoted {
+      border: 1px solid var(--primary-low);
+      padding: 0.5em 1em;
+      margin-top: 1em;
+      white-space: normal;
+
+      .quoted-link {
+        color: inherit;
+      }
+
+      .quoted-title {
+        font-weight: bold;
+        margin: 0.5em 0;
+        padding: 0;
+
+        span {
+          font-weight: lighter;
+          color: var(--primary-medium);
+        }
+      }
+
+      div {
+        margin-bottom: 5px;
+      }
+    }
+  }
+
+  .date {
+    display: flex;
+    line-height: var(--line-height-small);
+
+    .timestamp {
+      color: var(--primary-medium);
+    }
+  }
+
+  .like,
+  .replies {
+    align-items: center;
+    color: var(--primary-medium);
+    display: flex;
+    margin-left: 0.75em;
+
+    svg {
+      fill: currentColor;
+      margin-right: 0.25em;
+    }
+  }
+
+  .is-reply {
+    color: var(--primary-medium);
+    margin-right: 0.25em;
+  }
+}
diff --git a/app/assets/stylesheets/common/base/popup-menu.scss b/app/assets/stylesheets/common/base/popup-menu.scss
index 65a1165dfb7..dd31de815fe 100644
--- a/app/assets/stylesheets/common/base/popup-menu.scss
+++ b/app/assets/stylesheets/common/base/popup-menu.scss
@@ -3,7 +3,7 @@
   width: 14em;
   border: 1px solid var(--primary-low);
   z-index: z("dropdown");
-  box-shadow: shadow("card");
+  box-shadow: var(--shadow-card);
 
   ul {
     margin: 0;
@@ -35,7 +35,7 @@
     &:focus,
     &:hover {
       color: var(--primary);
-      background: var(--tertiary-low);
+      background: var(--d-hover);
 
       .d-icon {
         color: var(--primary-medium);
diff --git a/app/assets/stylesheets/common/base/reviewables.scss b/app/assets/stylesheets/common/base/reviewables.scss
index 7b2a48ac706..6af43395c14 100644
--- a/app/assets/stylesheets/common/base/reviewables.scss
+++ b/app/assets/stylesheets/common/base/reviewables.scss
@@ -76,6 +76,7 @@
 }
 
 .reviewable-user-info {
+  max-width: 100%;
   margin: 0.5em 0;
   .reviewable-user-fields {
     margin-bottom: 2em;
@@ -209,8 +210,8 @@
 }
 
 .reviewable-item {
-  padding-top: 2em;
-  border-top: 1px solid var(--primary-low);
+  background: var(--primary-very-low);
+  padding: 1.5rem;
 
   .topic-statuses {
     font-size: var(--font-up-2);
@@ -225,6 +226,21 @@
     align-items: baseline;
     .reviewable-type {
       margin-right: 0.25em;
+      padding: 0.25em 0.5em;
+      text-transform: uppercase;
+      font-size: var(--font-down-2);
+      color: var(--secondary);
+      border-radius: 8px;
+      background-color: var(--secondary-high);
+      &.-flagged-post,
+      &.-flagged-chat-message {
+        background-color: var(--danger);
+      }
+      &.-queued-post,
+      &.-queued-topic,
+      &.-user {
+        background-color: var(--tertiary);
+      }
     }
     .reply-count {
       margin-left: 1em;
@@ -244,16 +260,28 @@
   .reviewable-contents {
     display: flex;
     flex-wrap: wrap;
-    margin-bottom: 2em;
+    margin: 1.5rem 0 1rem;
+    background: var(--secondary);
+    padding: 1rem;
   }
 
   .reviewable-actions {
     display: flex;
     flex-wrap: wrap;
+    gap: 0.5rem;
     width: 100%;
 
     button {
       white-space: nowrap;
+
+      &.approve-post {
+        background-color: var(--success);
+        color: var(--secondary);
+      }
+      &.reject-post {
+        background-color: var(--danger);
+        color: var(--secondary);
+      }
     }
 
     .reviewable-action,
@@ -285,9 +313,18 @@
 }
 
 .reviewable-scores {
+  margin-top: 1rem;
   min-width: 50%;
   color: var(--primary-high);
 
+  &__table-wrapper {
+    overflow-x: scroll;
+  }
+
+  th {
+    white-space: nowrap;
+  }
+
   .reviewed-by {
     .date {
       margin-left: 0.5em;
@@ -313,6 +350,16 @@
     vertical-align: text-top;
   }
 
+  .approved,
+  .approved svg {
+    color: var(--success);
+  }
+
+  .rejected,
+  .rejected svg {
+    color: var(--danger);
+  }
+
   tbody {
     border-width: 1px;
     td {
@@ -324,27 +371,19 @@
         @include ellipsis;
       }
     }
-
-    td:last-of-type {
-      width: 100%;
-      white-space: normal;
-    }
     > tr > th {
       text-align: left;
     }
     > tr > th,
     > tr > td {
       &:not(:empty) {
-        padding: 0.5em 1em 0.5em 0;
+        padding: 0.5em;
       }
       @include breakpoint("mobile-large") {
         @include ellipsis;
         padding-right: 0.5em;
       }
     }
-    .reviewable-score-spacer {
-      padding-right: 1em;
-    }
   }
 }
 
@@ -373,6 +412,7 @@
 }
 
 .reviewable-item {
+  margin-block: 3rem;
   .show-raw-email {
     color: var(--primary-medium);
     font-size: var(--font-down-2);
@@ -407,6 +447,7 @@
     justify-content: space-between;
     width: var(--topic-body-width);
     align-items: center;
+    max-width: 100%;
 
     .reviewable-reply-to {
       display: flex;
@@ -425,16 +466,63 @@
   }
 
   .post-body {
+    position: relative;
     max-width: var(--topic-body-width);
-    max-height: 300px;
     margin-top: 0.5em;
-    overflow-y: auto;
 
-    p,
+    &.is-collapsed {
+      max-height: 50vh;
+      overflow: hidden;
+
+      &:after {
+        content: "";
+        position: absolute;
+        left: 0;
+        bottom: 0;
+        height: 25%;
+        width: 100%;
+        background: linear-gradient(to bottom, transparent, var(--secondary));
+      }
+
+      + .post-body__toggle-btn {
+        transform: translateX(-50%) translateY(-50%);
+      }
+    }
+    p {
+      margin-bottom: 0;
+    }
+    &__toggle-btn {
+      background: var(--primary-very-low);
+      color: var(--primary-high);
+      font-size: var(--font-down-2);
+      box-shadow: var(--shadow-dropdown);
+      margin-left: 50%;
+      transform: translateX(-50%);
+      border-radius: 4px;
+
+      .d-icon {
+        color: var(--primary-high);
+      }
+
+      &:hover {
+        background: var(--primary-very-low);
+        color: var(--tertiary);
+
+        .d-icon {
+          color: var(--tertiary);
+        }
+      }
+    }
+
     aside {
       margin: 0 0 1em 0;
     }
 
+    img {
+      max-width: 100%;
+      height: auto;
+    }
+
     pre,
     code {
       word-break: break-all;
@@ -453,6 +541,10 @@
       margin-right: 0.75em;
     }
   }
+
+  &__context-question {
+    margin-block: 1rem;
+  }
 }
 
 .editable-fields {
@@ -486,28 +578,3 @@
 .flag-modal .modal-inner-container .select-kit.reviewable-action-dropdown {
   width: initial;
 }
-
-@media screen and (max-width: 1000px) {
-  table.reviewable-scores {
-    width: 100%;
-    display: block;
-    tbody {
-      width: calc(100% - 5px);
-      display: block;
-      clear: both;
-    }
-  }
-  tr.reviewable-score {
-    display: grid;
-    grid-template-columns: auto auto 1fr;
-  }
-  td.reviewable-score-spacer {
-    display: none;
-  }
-}
-
-@include breakpoint("mobile-large") {
-  tr.reviewable-score {
-    grid-template-columns: auto auto auto;
-  }
-}
diff --git a/app/assets/stylesheets/common/base/rtl.scss b/app/assets/stylesheets/common/base/rtl.scss
index 74b40404733..6959a71547e 100644
--- a/app/assets/stylesheets/common/base/rtl.scss
+++ b/app/assets/stylesheets/common/base/rtl.scss
@@ -1,50 +1,27 @@
 // Right to left styles.
-// *** These styles are all going to be flipped by the r2 gem ***
-// Adding the !important declaration to a rule prevents it from being flipped.
 
-// This is used to flip the .d-icon-caret-right
-@mixin rotate($degrees) {
-  transform: rotate(#{$degrees}deg);
-}
+.rtl {
+  .d-icon-align-right,
+  .d-icon-angle-double-right,
+  .d-icon-angle-right,
+  .d-icon-arrow-right,
+  .d-icon-caret-right,
+  .d-icon-chevron-right,
+  .d-icon-hand-point-right,
+  .d-icon-quote-right {
+    transform: rotate(180deg);
+  }
 
-// Get the right caret to point left
-.rtl .d-icon-caret-right {
-  @include rotate(180);
-}
-
-// Changes the triangle arrow direction in .nav-stacked .active
-// The 'left' and 'right' in these selectors is not being flipped by r2.
-.rtl .nav-stacked a.active::after {
-  border-left-color: transparent !important;
-  border-right-color: var(--secondary) !important;
-}
-.rtl code {
-  direction: ltr !important;
-  text-align: left !important;
-}
-.rtl .pull-left {
-  float: right !important;
-}
-.rtl .pull-right {
-  float: left !important;
-}
-.rtl .autocomplete {
-  left: 27px;
-}
-
-.rtl .admin-customize .current-style .toggle-mobile {
-  position: static !important;
-  float: left !important;
-}
-.rtl .admin-customize .current-style .toggle-maximize {
-  position: static !important;
-  float: left !important;
-}
-.rtl .dashboard-left {
-  float: right !important;
-}
-.rtl .dashboard-right {
-  float: left !important;
+  .d-icon-align-left,
+  .d-icon-angle-double-left,
+  .d-icon-angle-left,
+  .d-icon-arrow-left,
+  .d-icon-caret-left,
+  .d-icon-chevron-left,
+  .d-icon-hand-point-left,
+  .d-icon-quote-left {
+    transform: rotate(180deg);
+  }
 }
 
 // For the support_mixed_text_direction setting
@@ -57,66 +34,6 @@ html:not(.rtl) .d-editor-preview ul[dir="rtl"],
   margin-right: 1.25em;
 }
 
-// Fixes github oneboxes for RTL sites
-.rtl aside.onebox.githubblob {
-  padding: 12px 25px 12px 12px !important;
-  direction: ltr !important;
-}
-
-.rtl aside.onebox.githubblob .source {
-  background-position: 0 50% !important;
-  padding-right: 20px;
-}
-
-.rtl pre.onebox code ol.lines {
-  margin: 0 0 0 40px !important;
-}
-
-.rtl pre.onebox code ol.lines li:before {
-  right: -40px;
-  padding-left: 5px;
-  padding-right: 0;
-  text-align: right !important;
-}
-
-.rtl pre.onebox code ol.lines li {
-  padding-right: 5px;
-  padding-left: 0;
-  margin-right: 0;
-  border-right: 1px solid #cfcfcf;
-  border-left: none !important;
-}
-
-.rtl {
-  $mobile-breakpoint: 700px;
-
-  .admin-detail.mobile-open {
-    @media (max-width: $mobile-breakpoint) {
-      transition: transform 0.3s ease;
-      @include transform(translateX(-250px));
-    }
-    @media (max-width: 500px) {
-      transition: transform 0.3s ease;
-      @include transform(translateX(-50%));
-    }
-  }
-
-  .admin-detail.mobile-closed {
-    @media (max-width: $mobile-breakpoint) {
-      transition: transform 0.3s ease;
-      @include transform(translateX(0));
-      margin-left: -10px !important;
-      padding-left: 10px !important;
-    }
-  }
-
-  .admin-nav {
-    .nav-stacked {
-      margin: 0 -10px 0 10px !important;
-    }
-  }
-}
-
 .rtl .ace_placeholder {
   direction: rtl !important;
   text-align: right !important;
diff --git a/app/assets/stylesheets/common/base/search-menu.scss b/app/assets/stylesheets/common/base/search-menu.scss
index 189cee2a63a..151198f0d6f 100644
--- a/app/assets/stylesheets/common/base/search-menu.scss
+++ b/app/assets/stylesheets/common/base/search-menu.scss
@@ -39,6 +39,7 @@ $search-pad-horizontal: 0.5em;
     .btn.search-context {
       margin: 2px;
       margin-right: 0;
+      white-space: nowrap;
     }
     &:focus-within {
       @include default-focus;
@@ -94,11 +95,7 @@ $search-pad-horizontal: 0.5em;
           margin-right: 0.5em;
         }
         .discourse-tags .discourse-tag {
-          margin-right: 0.25em;
-
-          .d-icon {
-            margin-right: 0;
-          }
+          margin-right: 0.35em;
         }
       }
     }
@@ -194,23 +191,31 @@ $search-pad-horizontal: 0.5em;
     .search-item-user img.avatar {
       width: 20px;
       height: 20px;
-      margin-right: 5px;
+      margin-right: 0.5em;
     }
 
     .label-suffix {
       color: var(--primary-medium);
+      margin-right: 0.33em;
+    }
+
+    .search-item-tag {
+      color: var(--primary-high);
     }
 
     .extra-hint {
       color: var(--primary-low-mid);
       font-size: var(--font-down-1);
-      float: right;
-      margin-top: 2px;
     }
 
-    .search-item-slug .badge-wrapper {
-      font-size: var(--font-0);
-      margin-left: 2px;
+    .search-item-slug {
+      .keyword {
+        margin-right: 0.33em;
+      }
+      .badge-wrapper {
+        font-size: var(--font-0);
+        margin-left: 2px;
+      }
     }
 
     .search-menu-initial-options {
@@ -225,10 +230,20 @@ $search-pad-horizontal: 0.5em;
     .search-menu-initial-options,
     .search-result-tag,
     .search-menu-assistant {
+      .search-item-prefix {
+        margin-right: 0.33em;
+      }
+      .badge-wrapper {
+        font-size: var(--font-0);
+        margin-right: 0.5em;
+      }
       .search-link {
+        display: flex;
+        flex-wrap: wrap;
+        align-items: baseline;
         @include ellipsis;
         .d-icon {
-          margin-right: 5px;
+          margin-right: 0.33em;
           vertical-align: middle;
         }
         .d-icon-tag {
@@ -325,7 +340,7 @@ $search-pad-horizontal: 0.5em;
     // and the focus/hover styles from the header in those cases wouldn't follow
     &:focus,
     &:hover {
-      background-color: var(--highlight-medium);
+      background-color: var(--highlight-bg);
     }
 
     .topic {
diff --git a/app/assets/stylesheets/common/base/sidebar-custom-section.scss b/app/assets/stylesheets/common/base/sidebar-custom-section.scss
new file mode 100644
index 00000000000..7812529a03b
--- /dev/null
+++ b/app/assets/stylesheets/common/base/sidebar-custom-section.scss
@@ -0,0 +1,49 @@
+.sidebar-custom-sections {
+  .sidebar-section-wrapper {
+    padding-bottom: 0;
+  }
+  .sidebar-section-header {
+    display: flex;
+  }
+
+  .sidebar-section-link-prefix.icon {
+    cursor: move;
+  }
+  .sidebar-section[data-section-name="community"]
+    .sidebar-section-link-prefix.icon {
+    cursor: pointer;
+  }
+
+  a {
+    -webkit-touch-callout: none !important;
+    @include unselectable;
+    cursor: pointer;
+  }
+
+  .sidebar-section-wrapper.disabled {
+    a {
+      pointer-events: none;
+    }
+    .sidebar-section-link-wrapper {
+      .sidebar-section-link-prefix.icon,
+      .sidebar-section-link {
+        background: none;
+        color: var(--primary-low-mid);
+      }
+      .sidebar-section-link.drag {
+        font-weight: bold;
+        color: var(--primary-high);
+        .sidebar-section-link-prefix.icon {
+          color: var(--primary-high);
+        }
+      }
+    }
+  }
+}
+.discourse-touch {
+  .sidebar-custom-sections {
+    a:hover {
+      background: none !important;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/base/sidebar-footer.scss b/app/assets/stylesheets/common/base/sidebar-footer.scss
index 6c0f3fc2cfd..19212ab213e 100644
--- a/app/assets/stylesheets/common/base/sidebar-footer.scss
+++ b/app/assets/stylesheets/common/base/sidebar-footer.scss
@@ -1,5 +1,6 @@
 .sidebar-footer-wrapper {
   box-sizing: border-box;
+  background: var(--d-sidebar-background);
   width: 100%;
   position: sticky;
   bottom: 0;
@@ -8,24 +9,23 @@
     display: flex;
     align-items: stretch;
     position: relative;
-    border-top: 1.5px solid var(--primary-low);
-    background: var(--primary-very-low);
     padding: 0.5em 0.8em;
+    padding-bottom: max(env(safe-area-inset-bottom), 0.5em);
     &:before {
       // fade to make scroll more apparent
       position: absolute;
       content: "";
       display: block;
       height: 1.5em;
-      top: calc(-1.5em - 1px);
+      top: -1.5em;
       left: -0.5em;
       right: -0.5em;
       width: calc(100% + 0.5em);
       pointer-events: none;
       background: linear-gradient(
         to bottom,
-        rgba(var(--primary-very-low-rgb), 0),
-        rgba(var(--primary-very-low-rgb), 1)
+        rgba(var(--secondary-rgb), 0),
+        rgba(var(--secondary-rgb), 1)
       );
     }
   }
@@ -35,18 +35,14 @@
     align-items: center;
     height: 100%;
     font-size: var(--font-down-1);
-    color: var(--primary-high);
+    color: var(--d-sidebar-link-color);
     padding: 0 0.5em;
     &:hover,
     &:focus {
-      background: var(--d-sidebar-highlight-color);
+      background: var(--d-sidebar-highlight-background);
     }
   }
 
-  .sidebar-footer-links-separator {
-    color: var(--primary-low-mid);
-  }
-
   .sidebar-footer-actions {
     margin-left: auto;
   }
@@ -58,11 +54,11 @@
 
     .d-icon {
       font-size: var(--font-down-1);
-      color: var(--primary-medium);
+      color: var(--d-sidebar-link-icon-color);
     }
     &:focus,
     &:hover {
-      background: var(--d-sidebar-highlight-color);
+      background: var(--d-sidebar-highlight-background);
     }
   }
 }
diff --git a/app/assets/stylesheets/common/base/sidebar-more-section-links.scss b/app/assets/stylesheets/common/base/sidebar-more-section-links.scss
index 9d237c57c23..83bf798e758 100644
--- a/app/assets/stylesheets/common/base/sidebar-more-section-links.scss
+++ b/app/assets/stylesheets/common/base/sidebar-more-section-links.scss
@@ -1,74 +1,63 @@
-.sidebar-more-section-links-details {
+.btn-flat.sidebar-more-section-links-details-summary {
   &:focus-within,
+  &:active,
   &:hover {
-    background: var(--d-sidebar-highlight-color);
-  }
-
-  .sidebar-more-section-links-details-summary {
-    color: var(--primary-high);
-    transition: background-color 0.25s;
-    display: flex;
-    align-items: center;
-    list-style: none;
-    box-sizing: border-box;
-
-    .sidebar-more-section-links-icon-wrapper {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      width: var(--d-sidebar-section-link-prefix-width);
-      height: var(--d-sidebar-section-link-prefix-width);
-      margin-right: var(--d-sidebar-section-link-prefix-margin-right);
-
-      .d-icon {
-        color: var(--primary-medium);
-        font-size: var(--font-down-1);
-      }
-    }
-
-    &::before {
-      display: none;
+    background: var(--d-sidebar-highlight-background);
+    svg.d-icon {
+      color: var(--d-sidebar-highlight-color);
     }
   }
 
-  .sidebar-more-section-links-details-content-wrapper {
-    position: absolute;
-    width: 100%;
-    z-index: z("modal", "content") + 1;
-    background: transparent;
-  }
+  height: var(--d-sidebar-row-height);
+  color: var(--d-sidebar-link-color);
+  display: flex;
+  list-style: none;
+  box-sizing: border-box;
+  width: 100%;
+  padding: 0 var(--d-sidebar-row-horizontal-padding);
+  justify-content: left;
 
-  .sidebar-more-section-links-details-content {
-    background-color: var(--secondary);
-    box-shadow: shadow("dropdown");
-    margin: 0 calc(var(--d-sidebar-row-horizontal-padding) * 2 / 3);
-
-    .sidebar-row {
-      // the multiplication by 1 here is a workaround for a bug in the R2 gem
-      // that we use to generate RTL CSS.
-      // the gem generates RTL CSS by converting anything left to right and
-      // vice versa. for example, a `padding-right: 1px;` property becomes
-      // `padding-left: 1px;` when it goes through the gem.
-      // the gem also handles the `padding` property (and similar properties)
-      // when it's in the 4-sides form, e.g. `padding: 1px 2px 3px 4px;` which
-      // gets converted to `padding: 1px 4px 3px 2px;`.
-      // however, the problem is that the gem detects 4-sides properties pretty
-      // naively - it splits the property value on /\s+/ and if it has 4 parts,
-      // it swaps the second and fourth parts.
-      // if you remove the by 1 multiplication in our rule below, we end up
-      // with a value that can be split into 4 parts and that causes the R2 gem
-      // to convert the rule to this:
-      //   padding: 0.33rem 3) / calc(var(--d-sidebar-row-horizontal-padding);
-      // which is clearly invalid and breaks all the rules that come after this
-      // one in the application CSS bundle.
-      // in the long term we should probably find (or write ourselves)
-      // something that's smarter than R2, but for now let's workaround the bug
-      // in R2.
-      padding: 0.33rem calc(1 * var(--d-sidebar-row-horizontal-padding) / 3);
-    }
-  }
-
-  .sidebar-more-section-links-details-content-secondary {
-    border-top: 1.5px solid var(--primary-low);
+  .d-icon {
+    width: var(--d-sidebar-section-link-prefix-width);
+    margin-right: var(--d-sidebar-section-link-prefix-margin-right);
+    color: var(--d-sidebar-link-icon-color);
+    font-size: var(--font-down-1);
   }
 }
+
+.sidebar-more-section-links-details-content {
+  background-color: var(--d-sidebar-background);
+  transition: background-color 0.25s;
+  box-shadow: var(--shadow-card);
+  border: 1px solid var(--primary-low);
+  margin: 0 calc(var(--d-sidebar-row-horizontal-padding) * 2 / 3);
+
+  .sidebar-row {
+    padding: 0.33rem calc(var(--d-sidebar-row-horizontal-padding) / 3);
+  }
+}
+
+.sidebar-more-section-links-details-content-main {
+  position: sticky;
+  margin: 0;
+}
+
+.sidebar-more-section-links-details-content-footer {
+  border-top: 2px solid var(--primary-low);
+  display: flex;
+  width: 100%;
+
+  .sidebar-section-link-wrapper {
+    width: 100%;
+  }
+}
+
+.sidebar-more-section-links-details-content-wrapper {
+  position: absolute;
+  width: 100%;
+  z-index: z("modal", "content") + 1;
+}
+
+.sidebar-more-section-links-details {
+  position: relative;
+}
diff --git a/app/assets/stylesheets/common/base/sidebar-section-link.scss b/app/assets/stylesheets/common/base/sidebar-section-link.scss
index 79a5043c718..3dd4fd76d6d 100644
--- a/app/assets/stylesheets/common/base/sidebar-section-link.scss
+++ b/app/assets/stylesheets/common/base/sidebar-section-link.scss
@@ -1,6 +1,7 @@
 :root {
-  --d-sidebar-section-link-prefix-margin-right: 0.4rem;
-  --d-sidebar-section-link-prefix-width: 20px;
+  --d-sidebar-section-link-prefix-margin-right: 0.35rem;
+  --d-sidebar-section-link-prefix-width: 1.35rem;
+  --d-sidebar-section-link-icon-size: 0.8em;
 }
 
 .sidebar-section-link-wrapper {
@@ -12,22 +13,25 @@
     display: inline-flex;
     width: 100%;
     align-items: center;
-    color: var(--primary-high);
+    color: var(--d-sidebar-link-color);
     transition: background-color 0.25s;
 
     &:focus,
     &:hover {
-      background: var(--d-sidebar-highlight-color);
+      background: var(--d-sidebar-highlight-background);
       outline: none;
+      .prefix-text {
+        background: var(--d-sidebar-highlight-prefix-background);
+      }
     }
 
     &.active {
-      color: var(--primary);
-      background: var(--d-sidebar-highlight-color);
+      color: var(--d-sidebar-highlight-color);
+      background: var(--d-sidebar-highlight-background);
 
       .sidebar-section-link-prefix {
         &.icon {
-          color: var(--primary-high);
+          color: var(--d-sidebar-highlight-color);
         }
       }
     }
@@ -35,17 +39,26 @@
     .sidebar-section-link-content-badge {
       @include ellipsis;
       padding-left: 0.5em;
+      padding-right: 0.1em; // avoids some overflow cropping
       text-align: right;
-      color: var(--primary-high);
-      font-size: var(--font-down-1);
+      color: var(--d-sidebar-link-badge-color);
+      font-size: var(--font-down-2);
       font-weight: normal;
       margin-left: auto;
     }
 
     .sidebar-section-link-suffix {
-      margin-left: 0.25rem;
+      margin-left: 1em;
       font-size: var(--font-down-4);
-      color: var(--tertiary-medium);
+      &.icon {
+        &.urgent svg {
+          color: var(--success);
+        }
+
+        &.unread svg {
+          color: var(--tertiary-med-or-tertiary);
+        }
+      }
     }
 
     .sidebar-section-link-content-text {
@@ -69,13 +82,33 @@
     }
   }
 
-  .sidebar-section-link-personal-messages-sent,
-  .sidebar-section-link-personal-messages-new,
-  .sidebar-section-link-personal-messages-archive,
-  .sidebar-section-link-personal-messages-unread,
-  .sidebar-section-link-group-messages-new,
-  .sidebar-section-link-group-messages-unread,
-  .sidebar-section-link-group-messages-archive {
+  .sidebar-section-link-button {
+    color: var(--d-sidebar-link-color);
+    background-color: var(--secondary);
+    width: 100%;
+    justify-content: flex-start;
+
+    &:hover {
+      color: var(--d-sidebar-link-color);
+      background-color: var(--primary-low);
+
+      .d-icon {
+        color: var(--d-sidebar-link-icon-color);
+      }
+    }
+
+    .d-icon {
+      color: var(--d-sidebar-link-icon-color);
+    }
+  }
+
+  .sidebar-section-link[data-link-name="personal-messages-sent"],
+  .sidebar-section-link[data-link-name="personal-messages-new"],
+  .sidebar-section-link[data-link-name="personal-messages-archive"],
+  .sidebar-section-link[data-link-name="personal-messages-unread"],
+  .sidebar-section-link[data-link-name="group-messages-new"],
+  .sidebar-section-link[data-link-name="group-messages-unread"],
+  .sidebar-section-link[data-link-name="group-messages-archive"] {
     .sidebar-section-link-content-text {
       margin-left: calc(
         var(--d-sidebar-section-link-prefix-margin-right) +
@@ -110,25 +143,15 @@
 
     &.text {
       text-align: center;
-
-      .prefix-text {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        border-radius: 100%;
-        background: rgba(var(--primary-rgb), 0.1);
-        width: calc(var(--d-sidebar-section-link-prefix-width) - 2px);
-        height: calc(var(--d-sidebar-section-link-prefix-width) - 2px);
-      }
     }
 
     &.icon,
     &.span {
       position: relative;
-      color: var(--primary-medium);
+      color: var(--d-sidebar-link-icon-color);
 
       svg {
-        font-size: var(--font-down-1);
+        font-size: var(--d-sidebar-section-link-icon-size);
       }
 
       .prefix-badge {
@@ -136,7 +159,7 @@
         background-color: transparent;
         border-radius: 50%;
         padding: 2px 2px 3px;
-        color: var(--primary-high);
+        color: var(--d-sidebar-link-color);
         height: 0.5rem;
         width: 0.5rem;
         top: -0.2em;
@@ -145,17 +168,28 @@
       }
     }
     .prefix-span {
-      width: 0.9em;
-      height: 0.9em;
+      width: 0.8em;
+      height: 0.8em;
     }
   }
 
+  .prefix-text {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 100%;
+    background: var(--d-sidebar-prefix-background);
+    width: calc(var(--d-sidebar-section-link-prefix-width) - 2px);
+    height: calc(var(--d-sidebar-section-link-prefix-width) - 2px);
+    font-size: var(--font-down-2);
+  }
+
   .sidebar-section-link-hover {
     margin-left: auto;
 
     .sidebar-section-hover-button {
       display: none;
-      color: var(--primary-medium);
+      color: var(--d-sidebar-link-icon-color);
       border: none;
       background: transparent;
       padding: 0 0 0 0.5em;
@@ -165,7 +199,7 @@
       &:focus,
       .discourse-no-touch & {
         &:hover {
-          color: var(--primary);
+          color: var(--d-sidebar-highlight-color);
         }
       }
 
@@ -176,7 +210,7 @@
 
     &:hover {
       .sidebar-section-hover-button {
-        background: var(--primary-low);
+        background: var(--d-sidebar-highlight-background);
       }
     }
   }
diff --git a/app/assets/stylesheets/common/base/sidebar-section.scss b/app/assets/stylesheets/common/base/sidebar-section.scss
index ca2958351f0..98d8636852b 100644
--- a/app/assets/stylesheets/common/base/sidebar-section.scss
+++ b/app/assets/stylesheets/common/base/sidebar-section.scss
@@ -1,7 +1,3 @@
-:root {
-  --d-sidebar-section-header-text-font-size: var(--font-up-1);
-}
-
 .sidebar-section-wrapper {
   .discourse-no-touch & {
     &:hover {
@@ -19,12 +15,19 @@
 
     .discourse-no-touch & {
       &:hover {
-        background: var(--d-sidebar-highlight-color);
+        background: var(--d-sidebar-highlight-background);
+        .d-icon-globe {
+          color: var(--d-sidebar-highlight-color);
+        }
       }
     }
 
     &:focus-within {
-      background: var(--d-sidebar-highlight-color);
+      background: var(--d-sidebar-highlight-background);
+    }
+
+    .sidebar-section-header-button {
+      font-size: var(--font-down-1);
     }
 
     .btn.dropdown-select-box-header,
@@ -46,23 +49,23 @@
 
       .d-icon {
         font-size: var(--font-down-1);
-        color: var(--primary-medium);
+        color: var(--d-sidebar-header-icon-color);
         margin: 0;
       }
 
       &:focus {
         outline: none;
-        background: var(--primary-medium);
+        background: var(--d-sidebar-highlight-hover-background);
         .d-icon {
-          color: var(--primary-very-low);
+          color: var(--d-sidebar-highlight-hover-icon);
         }
       }
 
       .discourse-no-touch & {
         &:hover {
-          background: var(--primary-medium);
+          background: var(--d-sidebar-highlight-hover-background);
           .d-icon {
-            color: var(--primary-very-low);
+            color: var(--d-sidebar-highlight-hover-icon);
           }
         }
       }
@@ -71,7 +74,7 @@
 
   .sidebar-section-header {
     flex: 1 1 auto;
-    color: var(--primary);
+    color: var(--d-sidebar-header-color);
     align-items: center;
     min-width: 0;
     padding: 0;
@@ -88,10 +91,17 @@
   .sidebar-section-header-text {
     line-height: normal;
     margin-right: 0.25em;
-    font-size: var(--d-sidebar-section-header-text-font-size);
     @include ellipsis;
   }
 
+  .sidebar-section-header-global-indicator {
+    margin: 0 0.75em 0 0.25em;
+    font-size: var(--font-down-2);
+    .d-icon {
+      margin-top: -0.125em; // optical alignment
+    }
+  }
+
   .sidebar-section-header-caret {
     display: flex;
     flex: 0 0 auto;
@@ -103,7 +113,7 @@
 
     svg {
       font-size: var(--font-down-1);
-      color: var(--primary-medium);
+      color: var(--d-sidebar-header-icon-color);
     }
   }
 
@@ -133,7 +143,7 @@
   }
 
   .sidebar-section-content {
-    padding-bottom: 1em;
+    padding-bottom: 0.875em;
     margin: 0;
     hr {
       margin: 0em 1.5em;
diff --git a/app/assets/stylesheets/common/base/sidebar.scss b/app/assets/stylesheets/common/base/sidebar.scss
index 91bcbf521d4..c4ba5a41698 100644
--- a/app/assets/stylesheets/common/base/sidebar.scss
+++ b/app/assets/stylesheets/common/base/sidebar.scss
@@ -1,35 +1,64 @@
 :root {
   --d-sidebar-width: #{$d-sidebar-width};
+  @include breakpoint(large) {
+    --d-sidebar-width: #{$d-sidebar-narrow-width};
+  }
   --d-sidebar-animation-time: 0.25s;
   --d-sidebar-animation-ease: ease-in-out;
-  --d-sidebar-row-height: 30px;
   // 1.25rem gets text left-aligned with the hamburger icon
   --d-sidebar-row-horizontal-padding: 1.25rem;
-  --d-sidebar-row-vertical-padding: 0.33rem;
-  --d-sidebar-row-font-size: var(--font-down-1);
+  // ems so height is variable along with font size
+  --d-sidebar-row-height: 2.1em;
+
+  --d-sidebar-background: var(--secondary);
+  --d-sidebar-prefix-background: var(
+    --primary-low
+  ); // example: chat participant count
+
+  --d-sidebar-header-color: var(--primary);
+  --d-sidebar-header-icon-color: var(--primary-medium);
+
+  --d-sidebar-link-color: var(--primary-high);
+  --d-sidebar-link-icon-color: var(--primary-500);
+  --d-sidebar-link-badge-color: var(--primary-700); // example: new count
+
+  --d-sidebar-highlight-background: var(--primary-low);
+  --d-sidebar-highlight-color: var(--primary-high);
+  --d-sidebar-highlight-prefix-background: var(--primary-300);
+  --d-sidebar-highlight-hover-background: var(
+    --primary-medium
+  ); // example: hovering a button within a highlighted section
+  --d-sidebar-highlight-hover-icon: var(
+    --primary-very-low
+  ); // example: hovering a button within a highlighted section
 }
 
 .sidebar-row {
   box-sizing: border-box;
   height: var(--d-sidebar-row-height);
-  padding: var(--d-sidebar-row-vertical-padding)
-    var(--d-sidebar-row-horizontal-padding);
+  padding: 0 var(--d-sidebar-row-horizontal-padding);
   align-items: center;
-  font-size: var(--d-sidebar-row-font-size);
 }
 
 .sidebar-wrapper {
   display: flex;
-  --d-sidebar-highlight-color: var(--primary-low);
-  background-color: var(--primary-very-low);
   grid-area: sidebar;
   position: sticky;
   top: var(--header-offset);
+  background: var(--d-sidebar-background);
 
-  .footer-nav-ipad & {
-    top: calc(var(--header-offset) + var(--footer-nav-height));
+  @include unselectable;
+
+  // 1dvh with fallback for old browsers
+  --1dvh: 1vh;
+  @supports (height: 1dvh) {
+    --1dvh: 1dvh;
   }
-  height: calc(100vh - var(--header-offset, 0));
+
+  height: calc(
+    var(--composer-vh, var(--1dvh)) * 100 - var(--header-offset, 0px)
+  );
+
   align-self: start;
   overflow-y: auto;
 
@@ -40,9 +69,10 @@
     height: 100%;
     width: 100%;
     padding: 0;
+    border-right: 1px solid var(--primary-low);
     overflow-x: hidden;
     // allows sidebar to scroll to the bottom when the composer is open
-    height: calc(100% - var(--composer-height, 0));
+    height: calc(100% - var(--composer-height, 0px));
   }
 
   .sidebar-sections {
@@ -50,7 +80,7 @@
     flex-direction: column;
     box-sizing: border-box;
     flex: 1;
-    padding: 1.5em 0 1em;
+    padding: 1.35em 0 1em;
     overflow-x: hidden;
     overflow-y: overlay;
 
@@ -86,27 +116,175 @@
       transition-delay: 0s;
     }
   }
-}
-
-.sidebar-hamburger-dropdown {
-  .discourse-no-touch & {
-    .sidebar-section-wrapper .sidebar-section-header-wrapper:hover,
-    .sidebar-section-wrapper .sidebar-section-header-wrapper:focus-within {
-      background: transparent;
-    }
-  }
-
   .sidebar-footer-wrapper {
-    margin-top: 1em;
-    .sidebar-footer-container {
-      background: var(--secondary);
-      &:before {
-        background: linear-gradient(
-          to bottom,
-          transparent,
-          rgba(var(--secondary-rgb), 1)
-        );
+    .btn-flat.add-section {
+      padding: 0.25em 0.4em;
+      &:hover {
+        background: var(--d-sidebar-highlight-background);
+        svg {
+          color: var(--d-sidebar-link-icon-color);
+        }
       }
     }
   }
 }
+
+.sidebar-section-form-modal {
+  .draggable {
+    display: flex;
+    height: 100%;
+    width: 100%;
+    justify-content: center;
+    align-items: center;
+    color: var(--primary-medium);
+    align-self: center;
+    margin-left: auto;
+    margin-right: auto;
+    cursor: move;
+    -webkit-user-drag: element;
+    user-drag: element;
+  }
+  .dragging {
+    opacity: 0.4;
+  }
+  .modal-inner-container {
+    width: var(--modal-max-width);
+  }
+  form {
+    margin-bottom: 0;
+  }
+  .input-group input {
+    width: 100%;
+    margin-bottom: 0;
+  }
+  input.warning {
+    border: 1px solid var(--danger);
+  }
+  .icon.warning,
+  .value.warning {
+    position: absolute;
+  }
+  .sidebar-section-form__input-wrapper {
+    margin-bottom: 1em;
+
+    input {
+      width: 100%;
+    }
+  }
+
+  .row-wrapper {
+    display: grid;
+    grid-template-columns: 2em 4.5em repeat(2, 1fr) 2em;
+    padding: 0.55em 0 0.7em;
+    -webkit-user-drag: none;
+    user-drag: none;
+    cursor: default;
+    border-top: 2px solid transparent;
+    border-bottom: 2px solid transparent;
+    margin-bottom: -2px;
+
+    &.header {
+      padding-bottom: 0;
+
+      label {
+        margin-bottom: 0;
+      }
+    }
+
+    &.drag-above {
+      border-top: 2px solid var(--tertiary);
+    }
+    &.drag-below {
+      border-bottom: 2px solid var(--tertiary);
+    }
+    .link-icon {
+      grid-column: 2;
+    }
+    &.mark-public-wrapper {
+      margin-top: 1em;
+      padding-bottom: 0;
+      &.-disabled label {
+        cursor: not-allowed;
+      }
+      label {
+        grid-column: 1 / -1;
+      }
+    }
+    .input-group {
+      margin: 0 0.5em;
+      @include breakpoint(mobile-large) {
+        margin: 0 0.25em;
+      }
+    }
+  }
+  .btn-flat.add-link {
+    margin-top: 0.5em;
+    margin-left: -0.5em;
+    &:active,
+    &:focus {
+      background: none;
+    }
+    svg {
+      color: var(--tertiary);
+      width: 0.75em;
+      height: 0.75em;
+    }
+    &:hover svg {
+      color: var(--tertiary-hover);
+    }
+  }
+  .modal-footer {
+    display: flex;
+    justify-content: space-between;
+
+    .delete {
+      margin-right: 0;
+    }
+  }
+  .select-kit.multi-select .multi-select-header .formatted-selection {
+    display: none;
+  }
+  .modal-inner-container .select-kit {
+    width: 100%;
+    height: 100%;
+    .select-kit-header {
+      height: 100%;
+    }
+  }
+  .select-kit.is-expanded .select-kit-body {
+    min-width: 220px;
+  }
+  .reset-link {
+    margin-right: 0;
+    .discourse-no-touch & {
+      &:hover {
+        .d-icon {
+          color: var(--tertiary-hover);
+        }
+      }
+    }
+    .d-icon {
+      font-size: var(--font-down-1);
+      color: var(--tertiary);
+    }
+  }
+  .delete-link {
+    .d-icon {
+      color: var(--primary-medium);
+    }
+    .discourse-no-touch & {
+      &:hover {
+        .d-icon {
+          color: var(--danger);
+        }
+      }
+    }
+  }
+}
+
+.sidebar__panel-switch-button {
+  margin: 1em 1.3em 0 1.3em;
+  &:last-of-type {
+    margin-bottom: 1em;
+  }
+}
diff --git a/app/assets/stylesheets/common/base/static-login.scss b/app/assets/stylesheets/common/base/static-login.scss
new file mode 100644
index 00000000000..f1971764bcf
--- /dev/null
+++ b/app/assets/stylesheets/common/base/static-login.scss
@@ -0,0 +1,51 @@
+body.static-login {
+  background-color: var(--primary-very-low);
+
+  .d-header {
+    display: none;
+  }
+
+  .body-page {
+    margin: 15% auto;
+  }
+
+  .logo-container {
+    border-bottom: 1px solid var(--primary-low);
+    padding-bottom: 1em;
+    margin-bottom: 1em;
+    display: block;
+  }
+
+  .site-logo {
+    width: auto;
+    object-fit: contain;
+    max-width: 60%;
+    max-height: 150px;
+  }
+
+  .waving-hand {
+    width: 35px;
+    height: 35px;
+    margin-bottom: 1em;
+  }
+
+  .login-welcome {
+    background-color: var(--secondary);
+    border: 1px solid var(--primary-low);
+    text-align: center;
+    padding: 2em;
+    box-shadow: var(--shadow-card);
+    border-radius: 5px;
+    display: grid;
+    place-items: center;
+
+    &__text {
+      order: 4;
+      color: var(--primary-medium);
+    }
+
+    .body-page-button-container {
+      order: 3;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/base/tagging.scss b/app/assets/stylesheets/common/base/tagging.scss
index 8050ece7ca6..d796d75ed48 100644
--- a/app/assets/stylesheets/common/base/tagging.scss
+++ b/app/assets/stylesheets/common/base/tagging.scss
@@ -114,7 +114,7 @@
 .list-tags,
 .search-category {
   .discourse-tag.simple:not(:last-child):after {
-    content: ", ";
+    content: ",\00a0";
     margin-left: 1px;
   }
 }
@@ -124,16 +124,13 @@
     font-size: var(--font-down-1);
   }
   .discourse-tags + .topic-featured-link {
-    margin-left: 8px;
+    margin-left: 0.5em;
   }
 }
 
 .discourse-tags {
   display: inline-flex;
   flex-wrap: wrap;
-  a {
-    margin-right: 0.25em;
-  }
 }
 
 .fps-result .add-full-page-tags {
@@ -147,20 +144,6 @@
   }
 }
 
-.mobile-view .topic-list-item .discourse-tags {
-  display: inline-flex;
-  flex-wrap: wrap;
-  font-size: var(--font-down-1);
-  margin-top: 0;
-  .discourse-tag {
-    margin-right: 0.2em;
-  }
-  .discourse-tag.box {
-    position: relative;
-    top: 0;
-  }
-}
-
 header .discourse-tag {
   color: var(--primary-medium);
 }
@@ -176,6 +159,12 @@ header .discourse-tag {
   max-width: 100%;
 }
 
+#topic-title {
+  .discourse-tags .discourse-tag.box {
+    margin-right: 0.35em;
+  }
+}
+
 .title-wrapper .tag-chooser {
   width: 500px;
 }
diff --git a/app/assets/stylesheets/common/base/tooltip.scss b/app/assets/stylesheets/common/base/tooltip.scss
index af5a4dc4e82..a1f958c5956 100644
--- a/app/assets/stylesheets/common/base/tooltip.scss
+++ b/app/assets/stylesheets/common/base/tooltip.scss
@@ -54,7 +54,7 @@ $discourse-tooltip-border: var(--primary-medium);
     max-width: 250px;
     font-size: var(--font-down-1);
     color: var(--primary);
-    box-shadow: shadow("dropdown");
+    box-shadow: var(--shadow-dropdown);
     line-height: 1.4em;
   }
 }
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index d014a6d6c5c..751f93a7fa5 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -1,5 +1,3 @@
-$quote-share-maxwidth: 150px;
-
 .button-count.has-pending {
   span {
     background-color: var(--danger);
@@ -109,6 +107,7 @@ $quote-share-maxwidth: 150px;
         margin-left: -20px;
         padding-right: 4px;
         position: absolute;
+        z-index: 2;
       }
     }
 
@@ -208,13 +207,13 @@ $quote-share-maxwidth: 150px;
 // add staff color
 .moderator {
   .regular > .cooked {
-    background-color: var(--highlight-low-or-medium);
+    background-color: var(--highlight-bg);
   }
   .clearfix > .topic-meta-data > .names {
     span.user-title {
       color: var(--primary-high-or-secondary-low);
       a {
-        background-color: var(--highlight-low-or-medium);
+        background-color: var(--highlight-bg);
         padding-left: 4px;
         padding-right: 4px;
       }
@@ -316,6 +315,11 @@ nav.post-controls {
       vertical-align: top;
       background: transparent;
       border: none;
+      .d-icon {
+        // this avoids an issue where hovering off the icon
+        // removes the .d-hover class from the button prematurely
+        pointer-events: none;
+      }
       &.d-hover,
       &:focus,
       &:active {
@@ -330,7 +334,7 @@ nav.post-controls {
         position: relative;
       }
       &.delete.d-hover,
-      &.delete:hover,
+      &.delete:active,
       &.delete:focus {
         background: var(--danger);
         color: var(--secondary);
@@ -555,8 +559,9 @@ aside.quote {
   display: none;
   position: absolute;
   z-index: z("dropdown");
-  opacity: 0.9;
-  background-color: var(--secondary-high);
+  background-color: var(--secondary);
+  border: 1px solid var(--primary-low);
+  box-shadow: var(--shadow-card);
   flex-direction: column;
 
   &.animated {
@@ -567,10 +572,6 @@ aside.quote {
     display: flex;
   }
 
-  &.fast-editing {
-    opacity: 1;
-  }
-
   .buttons {
     display: flex;
   }
@@ -599,24 +600,21 @@ aside.quote {
     }
   }
 
-  .btn,
-  .btn:hover,
-  .d-icon,
-  .btn:hover .d-icon {
-    color: var(--secondary-or-primary);
-  }
-
-  .btn-primary,
-  .btn-primary:hover,
-  .btn-primary .d-icon,
-  .btn-primary:hover .d-icon {
-    color: var(--secondary);
-  }
-
   .insert-quote + .quote-sharing {
     border-left: 1px solid rgba(255, 255, 255, 0.3);
   }
 
+  .btn-flat {
+    .d-icon {
+      color: var(--primary-high);
+    }
+    .discourse-no-touch & {
+      &:hover {
+        background-color: var(--tertiary-low);
+      }
+    }
+  }
+
   .quote-sharing {
     vertical-align: middle;
     display: inline-flex;
@@ -629,16 +627,34 @@ aside.quote {
 
     .quote-share-label {
       opacity: 1;
-      max-width: $quote-share-maxwidth;
-      transition: opacity 0.3s ease-in-out, max-width 0.3s ease-in-out,
-        padding 0.3s ease-in-out;
+      transition: opacity 0.3s ease-in-out;
     }
 
-    &:hover .quote-share-label {
-      background: transparent;
-      opacity: 0;
-      max-width: 0px;
-      padding: 6px 0px;
+    &:hover {
+      .quote-share-label {
+        background: transparent;
+        opacity: 0;
+        max-width: 0;
+        padding: 0;
+        overflow: hidden;
+      }
+      .quote-share-label + .quote-share-buttons {
+        max-width: 10em;
+        opacity: 1;
+        transition: opacity 0.3s ease-in-out;
+      }
+      // this pseudo element creates a transition buffer zone
+      // without it, the width change on hover can cause transition jitter
+      // the width is roughly wide enough to cover long translations of "share"
+      &:after {
+        content: "";
+        position: absolute;
+        display: block;
+        background: transparent;
+        height: 100%;
+        padding: 0.5em 4em;
+        z-index: -1; // below the buttons
+      }
     }
 
     .quote-share-label + .quote-share-buttons {
@@ -646,12 +662,7 @@ aside.quote {
       overflow: hidden;
       max-width: 0;
       display: inline-flex;
-      transition: opacity 0.3s ease-in-out, max-width 0.3s ease-in-out;
-    }
-
-    &:hover .quote-share-label + .quote-share-buttons {
-      max-width: $quote-share-maxwidth;
-      opacity: 1;
+      transition: opacity 0.3s ease-in-out;
     }
   }
 }
@@ -668,16 +679,24 @@ aside.quote {
   border-top: none; // would cause double top border
 
   .avatars {
-    > div {
-      float: left;
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    box-sizing: border-box;
+    a {
+      display: block;
       position: relative;
-      margin: 3px 0;
+    }
+
+    .avatar {
+      width: 2.15em;
+      height: 2.15em;
     }
     .post-count {
       position: absolute;
       right: 0;
       border-radius: 100px;
-      padding: 3px 5px;
+      padding: 0.15em 0.4em 0.2em;
       text-align: center;
       font-weight: normal;
       font-size: var(--font-down-2);
@@ -686,8 +705,7 @@ aside.quote {
   }
 
   .avatar {
-    float: left;
-    margin-right: 4px;
+    margin-right: 0.33em;
   }
 
   section {
@@ -695,12 +713,15 @@ aside.quote {
   }
 
   ul {
+    display: flex;
+    flex-wrap: wrap;
     margin: 0;
     list-style: none;
   }
 
   h3 {
-    margin-bottom: 4px;
+    width: 100%;
+    margin-bottom: 0.33em;
     color: var(--primary);
     line-height: var(--line-height-large);
     font-weight: normal;
@@ -803,10 +824,11 @@ aside.quote {
         align-items: center;
         justify-content: center;
         box-sizing: border-box;
-        border-radius: 0 0.25em 0.25em 0;
+        border-radius: 0 var(--border-radius) var(--border-radius) 0;
         padding-top: 0;
         padding-bottom: 0;
-        height: 100%;
+        height: calc(100% + 0.25em);
+        margin-right: -4px;
       }
     }
   }
@@ -959,17 +981,13 @@ aside.quote {
     .widget-button {
       display: flex;
       align-items: center;
-
       .d-button-label {
         order: 0;
         padding-right: 0.25em;
         color: var(--primary-med-or-secondary-med);
-        transition: color 0.25s;
       }
-
       .d-icon {
         order: 1;
-        transition: color 0.25s;
         color: var(--primary-med-or-secondary-med);
       }
       .discourse-no-touch & {
@@ -1016,15 +1034,7 @@ pre {
 
   .codeblock-button-wrapper {
     position: absolute;
-    right: 0;
     display: flex;
-
-    .copy-cmd {
-      right: 0;
-    }
-    .copy-fullscreen {
-      right: 28px;
-    }
   }
 
   .copy-cmd,
@@ -1036,8 +1046,10 @@ pre {
     min-height: 0;
     font-size: var(--font-down-2);
     opacity: 0.7;
+    cursor: pointer;
 
     &.action-complete {
+      cursor: auto;
       .d-icon {
         color: var(--tertiary);
       }
@@ -1057,7 +1069,6 @@ kbd {
   border-bottom-width: 2px;
   border-radius: 3px;
   box-sizing: border-box;
-  color: var(--primary);
   display: inline-flex;
   gap: 0 0.5em; // space between text and images/emoji
   font-size: var(--font-down-1);
@@ -1166,7 +1177,7 @@ blockquote > *:last-child {
 
     p {
       margin: 0;
-      padding-right: 0.5em;
+      padding: 0.15em 0.5em 0 0;
     }
   }
 
@@ -1378,7 +1389,7 @@ span.mention {
         margin-left: 8px;
         background-color: var(--primary-low);
         color: var(--primary);
-        box-shadow: shadow("dropdown");
+        box-shadow: var(--shadow-dropdown);
       }
     }
   }
@@ -1400,7 +1411,7 @@ span.mention {
   box-sizing: border-box;
   max-width: calc(var(--topic-body-width) + 4.5em);
   padding: 3em 5em 2em
-    calc(var(--topic-avatar-width + var(--topic-body-width-padding)));
+    calc(var(--topic-avatar-width) + var(--topic-body-width-padding));
   @include breakpoint(mobile-extra-large) {
     padding: 1.5em 1.5em 0.25em;
   }
@@ -1438,6 +1449,7 @@ span.mention {
 }
 
 .post-notice {
+  box-sizing: border-box;
   align-items: center;
   background-color: var(--tertiary-low);
   border-top: 1px solid var(--primary-low);
@@ -1637,20 +1649,21 @@ iframe {
 
 .open-popup-link {
   position: sticky;
-  left: 0.5rem;
-  top: 0.5rem;
+  left: 1rem;
   opacity: 0%;
   white-space: nowrap;
-  display: block;
 }
 
 .fullscreen-table-wrapper {
   transition: all 0.6s cubic-bezier(0.165, 0.84, 0.44, 1);
   display: block;
-}
+  position: relative;
 
-.expand-table-icon {
-  margin-right: 4px;
+  &--buttons {
+    position: absolute;
+    top: 0.5rem;
+    right: 0.5rem;
+  }
 }
 
 .fullscreen-table-modal .modal-inner-container,
diff --git a/app/assets/stylesheets/common/base/topic-summary.scss b/app/assets/stylesheets/common/base/topic-summary.scss
new file mode 100644
index 00000000000..781f8ddc37b
--- /dev/null
+++ b/app/assets/stylesheets/common/base/topic-summary.scss
@@ -0,0 +1,185 @@
+.topic-map .toggle-summary {
+  .summarization-buttons {
+    display: flex;
+  }
+
+  .ai-summary {
+    &__list {
+      list-style: none;
+      display: flex;
+      flex-wrap: wrap;
+      padding: 0;
+      margin: 0;
+    }
+    &__list-item {
+      background: var(--primary-300);
+      border-radius: var(--d-border-radius);
+      margin-right: 8px;
+      margin-bottom: 8px;
+      height: 18px;
+      opacity: 0;
+      display: block;
+      &:nth-child(1) {
+        width: 10%;
+      }
+
+      &:nth-child(2) {
+        width: 12%;
+      }
+
+      &:nth-child(3) {
+        width: 18%;
+      }
+
+      &:nth-child(4) {
+        width: 14%;
+      }
+
+      &:nth-child(5) {
+        width: 18%;
+      }
+
+      &:nth-child(6) {
+        width: 14%;
+      }
+
+      &:nth-child(7) {
+        width: 22%;
+      }
+
+      &:nth-child(8) {
+        width: 05%;
+      }
+
+      &:nth-child(9) {
+        width: 25%;
+      }
+
+      &:nth-child(10) {
+        width: 14%;
+      }
+
+      &:nth-child(11) {
+        width: 18%;
+      }
+
+      &:nth-child(12) {
+        width: 12%;
+      }
+
+      &:nth-child(13) {
+        width: 22%;
+      }
+
+      &:nth-child(14) {
+        width: 18%;
+      }
+
+      &:nth-child(15) {
+        width: 13%;
+      }
+
+      &:nth-child(16) {
+        width: 22%;
+      }
+
+      &:nth-child(17) {
+        width: 19%;
+      }
+
+      &:nth-child(18) {
+        width: 13%;
+      }
+
+      &:nth-child(19) {
+        width: 22%;
+      }
+
+      &:nth-child(20) {
+        width: 25%;
+      }
+      &.is-shown {
+        opacity: 1;
+      }
+      &.show {
+        animation: appear 0.5s cubic-bezier(0.445, 0.05, 0.55, 0.95) 0s forwards;
+      }
+      &.blink {
+        animation: blink 0.5s cubic-bezier(0.55, 0.085, 0.68, 0.53) both;
+      }
+    }
+    &__generating-text {
+      display: inline-block;
+      margin-left: 3px;
+    }
+    &__indicator-wave {
+      flex: 0 0 auto;
+      display: inline-flex;
+    }
+    &__indicator-dot {
+      display: inline-block;
+      animation: ai-summary__indicator-wave 1.8s linear infinite;
+      &:nth-child(2) {
+        animation-delay: -1.6s;
+      }
+      &:nth-child(3) {
+        animation-delay: -1.4s;
+      }
+    }
+  }
+
+  .placeholder-summary {
+    padding-top: 0.5em;
+  }
+
+  .placeholder-summary-text {
+    display: inline-block;
+    height: 1em;
+    margin-top: 0.6em;
+    width: 100%;
+  }
+
+  .summarized-on {
+    text-align: right;
+
+    .info-icon {
+      margin-left: 3px;
+    }
+  }
+
+  .outdated-summary {
+    color: var(--primary-medium);
+  }
+}
+
+@keyframes ai-summary__indicator-wave {
+  0%,
+  60%,
+  100% {
+    transform: initial;
+  }
+  30% {
+    transform: translateY(-0.2em);
+  }
+}
+
+@keyframes appear {
+  0% {
+    opacity: 0;
+  }
+  100% {
+    opacity: 1;
+  }
+}
+
+@keyframes blink {
+  0% {
+    opacity: 1;
+  }
+  50% {
+    opacity: 0.5;
+  }
+  100% {
+    opacity: 1;
+  }
+}
diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss
index d8a3f23d90c..6540b894ae0 100644
--- a/app/assets/stylesheets/common/base/topic.scss
+++ b/app/assets/stylesheets/common/base/topic.scss
@@ -50,9 +50,6 @@ $topic-progress-height: 42px;
       align-self: start;
       @include sticky;
       top: calc(var(--header-offset, 60px) + 2em);
-      .footer-nav-ipad & {
-        top: calc(var(--header-offset, 60px) + var(--footer-nav-height) + 2em);
-      }
       margin-left: 1em;
       z-index: z("timeline");
 
@@ -72,7 +69,7 @@ $topic-progress-height: 42px;
       overflow-y: auto;
       z-index: z("timeline");
       padding: 10px 10px 35px 10px;
-      box-shadow: shadow("dropdown");
+      box-shadow: var(--shadow-dropdown);
       background: var(--tertiary-low);
 
       .close {
@@ -304,14 +301,16 @@ a.badge-category {
     }
     .category-chooser,
     .mini-tag-chooser {
-      flex: 1 1 49%;
+      flex: 1 1 35%;
       margin: 0 0 9px 0;
       @media all and (max-width: 500px) {
         flex: 1 1 100%;
       }
     }
     .mini-tag-chooser {
-      margin-left: 2%; // category/tag chooser are 49% wide, so this is 1% * 2
+      flex: 1 1 54%;
+      margin: 0 0 9px 0;
+      margin-left: 1%; // category at 40%, tag chooser at 58%
       @media all and (max-width: 500px) {
         margin-left: 0;
       }
@@ -364,47 +363,44 @@ a.badge-category {
   justify-content: space-between;
 
   padding: 0.5em;
-  background-color: var(--highlight-medium);
+  background-color: var(--highlight-bg);
   margin-top: 1em;
   max-width: 757px;
 }
 
-.suggested-topics-wrapper.related-messages-wrapper {
-  .suggested-topics:nth-of-type(n + 2) {
-    thead {
-      display: none;
-    }
-  }
-}
-
 // Target the .badge-category text, the bullet icon needs to maintain `display: block`
-.suggested-topics h3 .badge-wrapper.bullet span.badge-category,
-.suggested-topics h3 .badge-wrapper.box span,
-.suggested-topics h3 .badge-wrapper.bar span {
+.more-content-topics h3 .badge-wrapper.bullet span.badge-category,
+.more-content-topics h3 .badge-wrapper.box span,
+.more-content-topics h3 .badge-wrapper.bar span {
   display: inline;
 }
 
-.suggested-topics h3 .badge-wrapper.bullet span.badge-category {
+.more-content-topicss h3 .badge-wrapper.bullet span.badge-category {
   // Override vertical-align: text-top from `badges.css.scss`
   vertical-align: baseline;
   line-height: var(--line-height-medium);
 }
 
-.suggested-topics h3 .badge-wrapper.bullet,
-.suggested-topics h3 .badge-wrapper.bullet span.badge-category-parent-bg,
-.suggested-topics h3 .badge-wrapper.bullet span.badge-category-bg {
+.more-content-topics h3 .badge-wrapper.bullet,
+.more-content-topics h3 .badge-wrapper.bullet span.badge-category-parent-bg,
+.more-content-topics h3 .badge-wrapper.bullet span.badge-category-bg {
   // Top of bullet aligns with top of line - adjust line height to vertically align bullet.
   line-height: 0.8;
 }
 
-.suggested-topics .badge-wrapper.bullet span.badge-category,
-.suggested-topics .badge-wrapper.bar span.badge-category {
+.more-content-topics .badge-wrapper.bullet span.badge-category,
+.more-content-topics .badge-wrapper.bar span.badge-category {
   max-width: 150px;
 }
 
-.suggested-topics .suggested-topics-title {
-  display: flex;
-  align-items: center;
+.more-content-topics {
+  .topic-list-body {
+    border-top: none;
+
+    .topic-list-item:last-of-type {
+      border-bottom: none;
+    }
+  }
 }
 
 .post-links-container {
diff --git a/app/assets/stylesheets/common/base/user-badges.scss b/app/assets/stylesheets/common/base/user-badges.scss
index 32886dc0ca2..204330fb770 100644
--- a/app/assets/stylesheets/common/base/user-badges.scss
+++ b/app/assets/stylesheets/common/base/user-badges.scss
@@ -127,17 +127,26 @@
 
   .check-display {
     position: absolute;
-    left: 5px;
+    right: 5px;
     top: 5px;
   }
 
+  .badge-granted {
+    display: block;
+    margin-top: 0.5em;
+    color: var(--primary-medium);
+    font-size: var(--font-down-1);
+  }
+
   .grant-count {
-    position: absolute;
-    right: 5px;
-    top: 5px;
     font-weight: bold;
     color: var(--primary-medium);
-    font-size: var(--font-up-2);
+    line-height: 1;
+  }
+
+  .grant-text {
+    color: var(--primary-medium);
+    font-size: var(--font-down-1);
   }
 
   .favorite-btn {
@@ -145,11 +154,11 @@
     right: 0;
     bottom: 0;
   }
-
   .badge-contents {
     display: flex;
-    min-height: 8em;
-    padding: 0 1.5em;
+    align-items: flex-start;
+    gap: 1rem;
+    padding: 1.5em 1.5em;
 
     .badge-link {
       color: var(--primary);
@@ -158,10 +167,8 @@
     .badge-icon {
       display: flex;
       flex-shrink: 0;
-      margin-right: 1.5em;
       align-items: center;
       justify-content: center;
-      width: 64px;
 
       svg {
         font-size: 3.5em;
@@ -187,10 +194,6 @@
     }
 
     .badge-info {
-      display: flex;
-      flex: 1 1 auto;
-      align-items: center;
-      padding: 1em 0;
       color: var(--primary);
 
       h3 {
@@ -213,7 +216,6 @@
     }
 
     .badge-contents {
-      padding: 0 5%;
       h3 {
         font-size: var(--font-up-3);
       }
@@ -245,19 +247,11 @@
 
 .badge-group-list {
   display: grid;
-  grid: auto-flow / repeat(3, 1fr);
+  grid-template-columns: repeat(auto-fit, minmax(18em, 1fr));
   grid-gap: 1em;
   width: 100%;
   margin-bottom: 1.5em;
 
-  @include breakpoint(medium) {
-    grid: auto-flow / repeat(2, 1fr);
-  }
-
-  @include breakpoint(mobile-extra-large) {
-    grid: auto-flow / 1fr;
-  }
-
   .title {
     font-size: var(--font-up-1);
   }
diff --git a/app/assets/stylesheets/common/base/user-tips.scss b/app/assets/stylesheets/common/base/user-tips.scss
index ae1f511825a..ea432faabfe 100644
--- a/app/assets/stylesheets/common/base/user-tips.scss
+++ b/app/assets/stylesheets/common/base/user-tips.scss
@@ -1,39 +1,64 @@
-.user-tip-container {
-  min-width: 300px;
-  padding: 0.5em;
-  text-align: left;
+.tippy-box[data-theme="user-tip"] {
+  background-color: var(--tertiary);
+  color: var(--secondary);
 
-  .user-tip-title {
-    font-size: $font-up-2;
+  .btn-flat {
+    color: var(--secondary);
+
+    &:hover {
+      color: var(--d-hover);
+    }
+  }
+
+  .btn-primary {
+    background: var(--secondary);
+    color: var(--tertiary);
+
+    &:hover {
+      color: var(--tertiary-hover);
+    }
+
+    .d-icon {
+      color: var(--tertiary);
+    }
+  }
+
+  > .tippy-svg-arrow {
+    color: var(--tertiary);
+  }
+}
+
+.user-tip {
+  z-index: z("composer", "content") - 1;
+
+  &__container {
+    font-weight: normal;
+    min-width: 300px;
+    padding: 0.5em;
+    text-align: left;
+  }
+
+  &__title {
+    font-size: var(--font-up-2);
     font-weight: bold;
   }
 
-  .user-tip-content {
+  &__content {
     margin-top: 0.25em;
+
+    a {
+      color: var(--secondary);
+      text-decoration: underline;
+    }
   }
 
-  .user-tip-buttons {
+  &__buttons {
     margin-top: 1em;
   }
 }
 
-.tippy-box[data-theme~="user-tips"][data-placement^="left"]
-  > .tippy-svg-arrow
-  > svg {
-  left: 11px;
-}
-
-.tippy-box[data-theme~="user-tips"][data-placement^="top"]
-  > .tippy-svg-arrow
-  > svg {
-  top: 11px;
-}
-
-.tippy-box[data-theme~="user-tips"][data-placement^="bottom"]
-  > .tippy-svg-arrow
-  > svg {
-  top: -13px;
-  left: -1px;
+.tippy-box[data-placement^="left"] > .tippy-svg-arrow {
+  right: -1px;
 }
 
 .tippy-box[data-theme~="user-tips"] > .tippy-svg-arrow:after,
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index 7efebd72e23..5a568850167 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -80,7 +80,7 @@
 .user-main {
   .about {
     width: 100%;
-    margin-bottom: 15px;
+    margin-bottom: 0;
 
     &.has-background {
       .user-profile-image {
@@ -104,7 +104,7 @@
 
       dl {
         margin: 0;
-        padding: 5px 10px;
+        padding: 0.25em 0;
         div {
           display: inline-flex;
           align-items: baseline;
@@ -148,28 +148,6 @@
       background: rgba(var(--secondary-rgb), 0.8);
       border-bottom: 1px solid var(--primary-low);
 
-      h1 {
-        font-size: var(--font-up-5);
-        font-weight: normal;
-        .d-icon {
-          font-size: 0.8em;
-        }
-      }
-
-      h2 {
-        font-weight: normal;
-        max-width: 100%;
-        @include ellipsis;
-      }
-
-      h3 {
-        font-weight: normal;
-        margin-bottom: 0.5em;
-        .d-icon:not(:first-of-type) {
-          margin-left: 10px;
-        }
-      }
-
       .groups {
         display: inline;
       }
@@ -185,10 +163,7 @@
       .primary {
         width: 100%;
         position: relative;
-
-        h1 {
-          font-weight: bold;
-        }
+        display: flex;
 
         .bio {
           max-height: 300px;
@@ -202,7 +177,7 @@
 
       .user-profile-avatar {
         position: relative;
-        float: left;
+        align-self: flex-start;
         .avatar-flair {
           bottom: 8px;
           right: 16px;
@@ -211,6 +186,7 @@
     }
 
     .controls {
+      margin-left: auto;
       ul {
         list-style-type: none;
         margin-top: 0;
@@ -235,15 +211,17 @@
             height: 45px;
           }
 
-          h1 {
+          .user-profile-names__primary {
             font-size: var(--font-up-3);
           }
 
-          h2 {
+          .user-profile-names__secondary {
             font-size: var(--font-up-1);
           }
-          h3,
-          h3.location-and-website {
+
+          .user-profile-names__title,
+          .user-profile__location-and-website,
+          .user-profile__featured-topic {
             display: none;
           }
         }
@@ -567,7 +545,6 @@
 
   .instructions {
     color: var(--primary-medium);
-    margin-bottom: 10px;
     font-size: var(--font-down-1);
     line-height: var(--line-height-large);
 
@@ -602,59 +579,6 @@
     .second-factor-token-input {
       margin-right: 10px;
     }
-
-    .form-horizontal {
-      .instructions {
-        margin-left: 0;
-      }
-      .actions {
-        margin-top: 5px;
-      }
-    }
-
-    .backup-codes {
-      margin: 2em 0;
-
-      .wrapper {
-        display: inline-block;
-        position: relative;
-        border-radius: 3px;
-        border: 1px solid var(--primary-low);
-        width: 100%;
-      }
-
-      .backup-codes-area {
-        resize: none;
-        padding: 0;
-        height: auto;
-        text-align: center;
-        width: 100%;
-        background: var(--secondary);
-        border: 0;
-        cursor: auto;
-        outline: none;
-        font-family: monospace;
-
-        &:focus {
-          box-shadow: none;
-          border-color: var(--primary-low);
-        }
-      }
-
-      .backup-codes-copy-btn,
-      .backup-codes-download-btn {
-        right: 5px;
-        position: absolute;
-      }
-
-      .backup-codes-copy-btn {
-        top: 5px;
-      }
-
-      .backup-codes-download-btn {
-        top: 40px;
-      }
-    }
   }
 
   .pref-associated-accounts table {
@@ -670,8 +594,11 @@
     font-size: var(--font-down-1);
   }
 
+  .color-scheme .controls {
+    display: flex;
+  }
+
   .control-subgroup {
-    float: left;
     + .controls {
       clear: both;
       padding-top: 1em;
@@ -683,9 +610,16 @@
   }
 
   .instructions {
-    clear: both;
-    display: inline-block;
-    margin-top: 4px;
+    display: block;
+    margin-top: 0.25em;
+  }
+
+  .success-back {
+    display: flex;
+    align-items: center;
+    .d-icon {
+      margin-right: 0.25em;
+    }
   }
 
   @mixin inactiveMode() {
@@ -707,7 +641,13 @@
   }
 
   .undo-preview {
-    margin-bottom: 1em;
+    margin: 1em 0;
+  }
+
+  .save-button {
+    display: flex;
+    align-items: center;
+    gap: 1em;
   }
 }
 
@@ -751,42 +691,140 @@
 }
 
 .second-factor {
-  &.instructions {
-    color: var(--primary-medium);
-    margin-top: 5px;
-    margin-bottom: 10px;
-    font-size: var(--font-down-1);
-  }
   .second-factor-item {
-    margin-top: 0.75em;
-    width: 500px;
+    width: 100%;
     display: flex;
     justify-content: space-between;
-    border-bottom: 1px solid #ddd;
-    margin: 5px 0px;
+    border-top: 1px solid var(--primary-low);
+    margin: 0.25em 0;
+    padding: 0.25em 0;
     align-items: center;
 
-    &:last-child {
-      border-bottom: 0;
-    }
-    .btn-danger .d-icon {
-      color: var(--danger);
+    .select-kit {
+      .select-kit-header {
+        background: transparent;
+        &:hover .d-icon {
+          color: var(--primary-high);
+        }
+      }
+
+      &.is-expanded {
+        .select-kit-header .d-icon {
+          color: var(--primary-high);
+        }
+      }
     }
   }
-  .btn.edit {
-    min-height: auto;
+
+  .-actions {
+    display: flex;
+    align-items: center;
   }
 }
 
+.d-modal[class*="second-factor-"] {
+  .modal-inner-container {
+    max-width: 24em;
+  }
+}
+
+.backup-codes {
+  margin: 1em 0;
+
+  .wrapper {
+    display: flex;
+    border: 1px solid var(--primary-low);
+    width: 100%;
+  }
+
+  textarea.backup-codes-area {
+    flex: 1 1 100%;
+    height: 100%;
+    resize: none;
+    margin: 0;
+    padding: 0.5em;
+    height: auto;
+    background: var(--secondary);
+    border: 0;
+    cursor: auto;
+    outline: none;
+    font-family: monospace;
+    &:focus {
+      box-shadow: none;
+      border-color: var(--primary-low);
+    }
+  }
+
+  .controls {
+    padding: 0.5em;
+    flex: 1 1 2em;
+    margin-left: auto;
+    .btn {
+      margin-bottom: 0.5em;
+    }
+  }
+}
+
+.primary-textual {
+  flex: 1 1 auto;
+  min-width: 0;
+}
+
 .primary-textual .staged,
 .user-card .staged {
   font-style: italic;
 }
 
+.user-profile-names__primary,
+.user-profile-names__secondary {
+  max-width: 100%;
+  margin: 0;
+  @include ellipsis;
+}
+
+.user-profile-names__primary {
+  font-weight: bold;
+  font-size: var(--font-up-5);
+  line-height: var(--line-height-medium);
+  .d-icon {
+    font-size: 0.8em;
+    vertical-align: baseline;
+  }
+  .user-status-message {
+    display: inline-flex;
+    vertical-align: baseline;
+  }
+}
+
+.user-profile-names__secondary {
+  font-size: var(--font-up-3);
+}
+
+.user-profile__featured-topic,
+.user-profile__location-and-website {
+  font-size: var(--font-0);
+  margin-top: 0.5em;
+  @include ellipsis;
+  .d-icon {
+    font-size: var(--font-down-1);
+    color: var(--primary-high);
+    margin-right: 0.33em;
+  }
+}
+
+.user-profile__location-and-website {
+  display: flex;
+  max-width: 100%;
+  .user-profile-location {
+    margin-right: 1em;
+  }
+}
+
 .selectable-avatars {
   max-height: 350px;
   margin-bottom: 1em;
   text-align: justify;
+  overflow-y: auto;
   .selectable-avatar {
     margin: 5px;
     display: inline-block;
diff --git a/app/assets/stylesheets/common/components/_index.scss b/app/assets/stylesheets/common/components/_index.scss
index 361546e0532..c33d212486c 100644
--- a/app/assets/stylesheets/common/components/_index.scss
+++ b/app/assets/stylesheets/common/components/_index.scss
@@ -4,14 +4,18 @@
 @import "bookmark-modal";
 @import "buttons";
 @import "color-input";
+@import "char-counter";
 @import "conditional-loading-section";
 @import "convert-to-public-topic-modal";
+@import "d-lightbox";
 @import "d-tooltip";
+@import "d-toggle-switch";
 @import "date-input";
 @import "date-picker";
 @import "date-time-input-range";
 @import "date-time-input";
 @import "footer-nav";
+@import "form-template-field";
 @import "group-member-dropdown";
 @import "groups-form-membership-fields";
 @import "hashtag";
@@ -20,14 +24,19 @@
 @import "ignored-user-list";
 @import "keyboard_shortcuts";
 @import "navs";
+@import "offline-indicator";
 @import "pick-files-button";
 @import "relative-time-picker";
 @import "share-and-invite-modal";
 @import "download-calendar";
+@import "sidebar/edit-navigation-menu/categories-modal";
+@import "sidebar/edit-navigation-menu/modal";
+@import "sidebar/edit-navigation-menu/tags-modal";
 @import "svg";
 @import "tap-tile";
 @import "time-input";
 @import "time-shortcut-picker";
+@import "topic-query-filter";
 @import "user-card";
 @import "user-info";
 @import "user-status-message";
diff --git a/app/assets/stylesheets/common/components/badges.scss b/app/assets/stylesheets/common/components/badges.scss
index c7372164974..3060a0af81c 100644
--- a/app/assets/stylesheets/common/components/badges.scss
+++ b/app/assets/stylesheets/common/components/badges.scss
@@ -142,6 +142,9 @@
   &.none {
     color: var(--primary-high);
     margin-right: 5px;
+    .badge-category {
+      overflow: hidden;
+    }
   }
 }
 
diff --git a/app/assets/stylesheets/common/components/bookmark-modal.scss b/app/assets/stylesheets/common/components/bookmark-modal.scss
index fc350a83889..91ffd0deb9b 100644
--- a/app/assets/stylesheets/common/components/bookmark-modal.scss
+++ b/app/assets/stylesheets/common/components/bookmark-modal.scss
@@ -3,19 +3,24 @@
     box-sizing: border-box;
     min-width: 310px;
   }
+
   .modal-footer {
     margin: 0;
-    border-top: 0;
-    padding: 10px 0;
 
     .delete-bookmark {
       margin-left: auto;
       margin-right: 0;
     }
   }
+
+  .modal-inner-container {
+    max-width: 375px;
+  }
+
   .modal-body {
     width: 375px;
     box-sizing: border-box;
+    max-height: 70dvh;
 
     @media (max-width: 600px) {
       width: 100%;
diff --git a/app/assets/stylesheets/common/components/buttons.scss b/app/assets/stylesheets/common/components/buttons.scss
index 4767f7308f7..fa142c4d99a 100644
--- a/app/assets/stylesheets/common/components/buttons.scss
+++ b/app/assets/stylesheets/common/components/buttons.scss
@@ -20,10 +20,15 @@
   margin: 0;
   font-weight: normal;
   color: $text-color;
-  background: $bg-color;
+  background-color: $bg-color;
+  background-image: linear-gradient(
+    to bottom,
+    rgba(0, 0, 0, 0),
+    rgba(0, 0, 0, 0)
+  );
   border-radius: var(--d-button-border-radius);
+  transition: background 0.25s, color 0.25s;
   cursor: pointer;
-  transition: all 0.25s;
   .d-icon {
     color: $icon-color;
     margin-right: 0.45em;
@@ -43,7 +48,7 @@
     }
   }
   @include hover {
-    background: $hover-bg-color;
+    background-color: $hover-bg-color;
     color: $hover-text-color;
     .d-icon {
       color: $hover-icon-color;
@@ -55,7 +60,7 @@
   }
   &:focus {
     outline: none;
-    background: $hover-bg-color;
+    background-color: $hover-bg-color;
     color: $hover-text-color;
     .d-icon {
       color: $hover-icon-color;
@@ -67,10 +72,25 @@
   &[href] {
     color: $text-color;
   }
+  .discourse-no-touch &:active:not(:hover):not(:focus),
+  .discourse-no-touch &.btn-active:not(:hover):not(:focus),
+  &:active:not(:hover):not(:focus),
+  &.btn-active:not(:hover):not(:focus) {
+    @include darken-background($bg-color, 0.6);
+    color: $hover-text-color;
+    .d-icon {
+      color: $hover-icon-color;
+    }
+  }
+  .discourse-no-touch &:active,
+  .discourse-no-touch &.btn-active,
   &:active,
   &.btn-active {
-    @include linear-gradient($hover-bg-color 0%, $bg-color 100%);
-    border-bottom-color: $bg-color;
+    @include darken-background($bg-color, 0.3);
+    color: $hover-text-color;
+    .d-icon {
+      color: $hover-icon-color;
+    }
   }
   &[disabled],
   &.disabled {
@@ -182,7 +202,7 @@
   border-radius: var(--d-border-radius);
   &:hover,
   &:focus {
-    box-shadow: shadow("card");
+    box-shadow: var(--shadow-card);
     outline: 1px solid #000;
   }
   &[href] {
@@ -274,9 +294,10 @@
   background: transparent;
   border: 0;
   line-height: var(--line-height-small);
-  transition: color 0.25s, background 0.25s;
+  transition: background 0.25s, color 0.25s;
   .d-icon {
     color: var(--primary-low-mid);
+    transition: color 0.25s;
   }
   @include hover {
     background: transparent;
@@ -318,10 +339,7 @@
 
       &:active,
       &.btn-active {
-        @include linear-gradient(
-          var(--primary-low-mid) 0%,
-          var(--primary-very-low) 100%
-        );
+        @include darken-background(transparent, 0.2);
       }
     }
   }
diff --git a/app/assets/stylesheets/common/components/char-counter.scss b/app/assets/stylesheets/common/components/char-counter.scss
new file mode 100644
index 00000000000..bb95b30d146
--- /dev/null
+++ b/app/assets/stylesheets/common/components/char-counter.scss
@@ -0,0 +1,18 @@
+.char-counter {
+  &__ratio {
+    display: block;
+    text-align: right;
+    margin-top: 0.5rem;
+  }
+
+  &.exceeded {
+    > textarea {
+      border-color: var(--danger);
+      outline-color: var(--danger);
+    }
+
+    &__ratio {
+      color: var(--danger);
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/components/d-lightbox.scss b/app/assets/stylesheets/common/components/d-lightbox.scss
new file mode 100644
index 00000000000..56a0ebfcfb3
--- /dev/null
+++ b/app/assets/stylesheets/common/components/d-lightbox.scss
@@ -0,0 +1,801 @@
+/* Main document */
+
+html.has-lightbox {
+  overflow: hidden;
+
+  &::-webkit-scrollbar {
+    display: none;
+  }
+
+  .profiler-results {
+    display: none;
+  }
+
+  #main {
+    padding-right: var(--document-scrollbar-width);
+  }
+
+  --carousel-item-size: clamp(6.5rem, 12vh, 15rem);
+  --d-lightbox-primary: #ffffff;
+  --d-lightbox-secondary: #000000;
+  --d-lightbox-secondary-translucent: rgba(0, 0, 0, 0.25);
+}
+
+/* Lightbox element*/
+
+// Grid
+
+.d-lightbox {
+  overscroll-behavior: contain;
+
+  * {
+    box-sizing: border-box;
+  }
+
+  &.is-visible {
+    display: grid;
+    place-items: stretch;
+  }
+
+  &__content {
+    display: grid;
+    place-items: stretch;
+  }
+
+  &.is-vertical &__content {
+    grid-template-columns: 1fr;
+    grid-template-rows: auto 1fr auto auto;
+
+    grid-template-areas:
+      "lightbox-header"
+      "lightbox-body"
+      "lightbox-carousel"
+      "lightbox-footer";
+  }
+
+  &.is-horizontal &__content {
+    grid-template-columns: auto 1fr;
+    grid-template-rows: auto 1fr auto;
+    grid-template-areas:
+      "lightbox-carousel lightbox-header"
+      "lightbox-carousel lightbox-body"
+      "lightbox-carousel lightbox-footer";
+  }
+
+  &__header {
+    grid-area: lightbox-header;
+    justify-self: stretch;
+    display: grid;
+    place-items: center start;
+    grid-template-areas: "preview-controls lightbox-header-buttons";
+  }
+
+  &__multi-item-controls {
+    grid-area: preview-controls;
+    place-self: center start;
+    display: grid;
+    gap: 0.5em;
+    place-items: center start;
+    grid-auto-flow: column;
+    grid-template-areas: "lightbox-carousel-toggle lightbox-counter";
+
+    .d-lightbox__carousel-button {
+      grid-area: lightbox-carousel-toggle;
+    }
+  }
+
+  &__counters {
+    grid-area: lightbox-counter;
+  }
+
+  &__header-buttons {
+    grid-area: lightbox-header-buttons;
+    place-self: center end;
+    display: grid;
+    gap: 0 0.25em;
+    place-items: center end;
+    grid-auto-flow: column;
+  }
+
+  &__body {
+    grid-area: lightbox-body;
+    display: grid;
+    place-items: center stretch;
+
+    grid-auto-flow: column;
+    grid-template-columns: auto 1fr auto;
+    grid-template-areas: "lightbox-previous-button lightbox-main-image lightbox-next-button";
+  }
+
+  &__main-image,
+  &__error-message,
+  &__loading-spinner {
+    grid-area: lightbox-main-image;
+    place-self: center;
+    display: grid;
+    place-items: center;
+    grid-auto-flow: column;
+  }
+
+  &__previous-button {
+    grid-area: lightbox-previous-button;
+    place-self: center start;
+  }
+
+  &__next-button {
+    grid-area: lightbox-next-button;
+    place-self: center end;
+  }
+
+  &.has-carousel &,
+  &.is-rotated &,
+  &.is-zoomed & {
+    &__body {
+      grid-auto-flow: row;
+      grid-template-columns: 1fr;
+      grid-template-areas: "lightbox-main-image";
+    }
+  }
+
+  &__footer {
+    grid-area: lightbox-footer;
+    place-self: stretch;
+    display: grid;
+    grid-auto-flow: column;
+    gap: 1.5em;
+    grid-template-columns: 1fr auto;
+    grid-template-areas: "lightbox-title lightbox-footer-buttons";
+  }
+
+  &__main-title {
+    grid-area: lightbox-title;
+    place-self: center start;
+  }
+
+  &__footer-buttons {
+    grid-area: lightbox-footer-buttons;
+    place-self: center end;
+    display: grid;
+    grid-auto-flow: column;
+    gap: 0 0.25em;
+    place-items: center;
+  }
+
+  &__carousel {
+    grid-area: lightbox-carousel;
+    display: grid;
+    place-items: center;
+  }
+
+  &__carousel-items {
+    grid-area: lightbox-preview-images;
+    display: grid;
+    gap: 1em;
+    place-items: center;
+  }
+
+  &__carousel-previous-button {
+    grid-area: lightbox-previous;
+  }
+
+  &__carousel-next-button {
+    grid-area: lightbox-next;
+  }
+
+  &.is-vertical &__carousel {
+    grid-auto-flow: column;
+    grid-template-columns: auto 1fr auto;
+    grid-template-areas: "lightbox-previous lightbox-preview-images lightbox-next";
+  }
+
+  &__carousel-items {
+    grid-auto-flow: column;
+  }
+  &__carousel-item,
+  &__carousel-item.is-current {
+    height: var(--carousel-item-size);
+  }
+
+  &.is-horizontal &__carousel {
+    max-height: 100vh;
+    grid-template-rows: 1fr auto 1fr;
+    place-items: center;
+    grid-template-areas:
+      "lightbox-previous"
+      "lightbox-preview-images"
+      "lightbox-next";
+  }
+
+  &.is-horizontal &__carousel-items {
+    grid-auto-flow: row;
+  }
+
+  &__carousel-item,
+  &__carousel-item.is-current {
+    width: var(--carousel-item-size);
+  }
+
+  &__carousel-previous-button {
+    place-self: self-end center;
+  }
+
+  &__carousel-next-button {
+    place-self: self-start center;
+  }
+}
+
+/* Base styles */
+
+.d-lightbox {
+  &.is-visible {
+    position: fixed;
+    top: 0;
+    left: 0;
+    height: 100dvh;
+    width: 100%;
+    z-index: z("max");
+  }
+
+  &__content {
+    background-color: var(--d-lightbox-secondary);
+
+    &:focus-visible {
+      outline: none;
+    }
+  }
+}
+
+.d-lightbox {
+  &__header {
+    z-index: 1;
+    padding: 0.25em 1px; // 1px for button outlines
+    color: var(--d-lightbox-primary);
+    background: linear-gradient(
+      to right,
+      var(--d-lightbox-secondary),
+      transparent
+    );
+
+    position: relative;
+  }
+}
+
+.d-lightbox {
+  &__body {
+    @include user-select(none);
+    position: relative;
+    outline: none;
+  }
+
+  &__loading-spinner,
+  &__error-message,
+  &__main-image {
+    position: absolute;
+    outline: none;
+  }
+
+  &__backdrop {
+    position: fixed;
+    top: 0;
+    left: 0;
+    height: 100%;
+    width: 100%;
+    background-size: cover;
+    background-position: center;
+    filter: blur(15px) brightness(0.25);
+    background-color: var(--d-lightbox-secondary);
+    background-image: var(--d-lightbox-image-small-url);
+  }
+
+  &__main-image {
+    aspect-ratio: var(--d-lightbox-image-aspect-ratio);
+    background-color: var(--d-lightbox-image-dominant-color);
+    box-sizing: border-box;
+    max-height: 100%;
+    max-width: 100%;
+    box-shadow: shadow("card");
+  }
+
+  &__error-message {
+    color: var(--d-lightbox-primary);
+  }
+
+  &__previous-button,
+  &__next-button {
+    z-index: 1;
+    position: absolute;
+
+    .d-icon {
+      font-size: var(--font-up-2);
+    }
+  }
+}
+
+.d-lightbox {
+  &__footer {
+    z-index: 1;
+    padding: 0.25em 1px;
+    min-width: 0;
+    box-sizing: border-box;
+    color: var(--d-lightbox-primary);
+    background: linear-gradient(
+      to left,
+      var(--d-lightbox-secondary),
+      transparent
+    );
+    position: relative;
+  }
+
+  &__main-title {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: baseline;
+    gap: 0 0.25em;
+    word-break: break-word;
+    max-width: 100%;
+    // right/left padding to align with buttons
+    padding: 0 0.65em;
+    border: 1px solid transparent;
+    width: 100%;
+    min-width: 0;
+    overflow: hidden;
+    &:focus-visible {
+      outline: none;
+      border: 1px solid var(--tertiary);
+      border-radius: 1px;
+    }
+  }
+
+  &__item-title {
+    display: block;
+    @include ellipsis;
+  }
+
+  &__item-file-details {
+    font-size: var(--font-down-2);
+    color: var(--primary-600);
+    white-space: nowrap;
+  }
+}
+
+.d-lightbox {
+  &__carousel {
+    @include user-select(none);
+    box-sizing: border-box;
+    z-index: 1;
+    position: relative;
+    color: var(--d-lightbox-primary);
+  }
+  &__carousel-previous-button,
+  &__carousel-next-button {
+    z-index: 2;
+
+    .d-icon {
+      font-size: var(--font-up-2);
+    }
+  }
+}
+
+.d-lightbox {
+  &__carousel-items {
+    @extend %lightbox-scrollable;
+    max-height: 100%;
+    max-width: 100%;
+    z-index: 0;
+    box-sizing: border-box;
+  }
+
+  &__carousel-item,
+  &__carousel-item.is-current {
+    border: 1px solid transparent;
+    box-shadow: 0 0 2px -1px var(--d-lightbox-primary);
+    border-radius: 5px;
+    cursor: pointer;
+    user-select: none;
+    transition: all var(--d-lightbox-image-animation-duration) ease-in-out;
+    background-color: var(--dominant-color);
+    aspect-ratio: var(--aspect-ratio);
+    filter: saturate(0.5);
+
+    &:focus {
+      outline: none;
+    }
+  }
+
+  &__carousel-item.is-current {
+    border-color: var(--tertiary);
+    pointer-events: none;
+    filter: initial;
+  }
+}
+
+.d-lightbox {
+  &.is-vertical &__carousel {
+    position: relative;
+    background-color: var(--d-lightbox-secondary-translucent);
+    &:before,
+    &:after {
+      content: "";
+      position: absolute;
+      display: block;
+      z-index: 1;
+      pointer-events: none;
+      height: 100%;
+      width: 20%;
+    }
+
+    &:before {
+      left: 0;
+      top: 0;
+      background: var(--d-lightbox-secondary);
+      -webkit-mask-image: linear-gradient(
+        90deg,
+        var(--d-lightbox-secondary),
+        transparent
+      );
+      mask-image: linear-gradient(
+        90deg,
+        var(--d-lightbox-secondary),
+        transparent
+      );
+    }
+
+    &:after {
+      right: 0;
+      bottom: 0;
+      background: var(--d-lightbox-secondary);
+      -webkit-mask-image: linear-gradient(
+        -90deg,
+        var(--d-lightbox-secondary),
+        transparent
+      );
+      mask-image: linear-gradient(
+        -90deg,
+        var(--d-lightbox-secondary),
+        transparent
+      );
+    }
+
+    .rtl & {
+      &:before {
+        left: auto;
+        right: 0;
+      }
+
+      &:after {
+        left: 0;
+        right: auto;
+      }
+    }
+  }
+
+  &.is-vertical &__carousel-items {
+    padding: 1em 2em;
+  }
+
+  &__carousel-previous-button,
+  &__carousel-next-button {
+    position: absolute;
+  }
+}
+
+.d-lightbox {
+  &.is-horizontal &__carousel {
+    position: relative;
+    &:before,
+    &:after {
+      content: "";
+      position: absolute;
+      display: block;
+      z-index: 1;
+      pointer-events: none;
+      height: 20%;
+      width: 100%;
+    }
+
+    &:before {
+      left: 0;
+      top: 0;
+      background: var(--d-lightbox-secondary);
+      -webkit-mask-image: linear-gradient(
+        180deg,
+        var(--d-lightbox-secondary),
+        transparent
+      );
+      mask-image: linear-gradient(
+        180deg,
+        var(--d-lightbox-secondary) 20%,
+        transparent 100%
+      );
+    }
+
+    &:after {
+      right: 0;
+      bottom: 0;
+      background: var(--d-lightbox-secondary);
+      -webkit-mask-image: linear-gradient(
+        0,
+        var(--d-lightbox-secondary),
+        transparent
+      );
+      mask-image: linear-gradient(
+        0,
+        var(--d-lightbox-secondary) 20%,
+        transparent 100%
+      );
+    }
+  }
+
+  &.is-horizontal &__carousel-items {
+    padding: 50% 1em;
+  }
+
+  &__carousel-previous-button,
+  &__carousel-next-button {
+    transform: rotate(90deg);
+
+    .rtl & {
+      transform: rotate(-90deg);
+    }
+  }
+}
+
+.d-lightbox {
+  .btn-flat {
+    .d-icon {
+      margin: 0;
+    }
+
+    &:focus {
+      background: transparent;
+      outline: none;
+
+      .d-icon {
+        color: var(--d-lightbox-primary);
+      }
+    }
+
+    &:focus-visible {
+      outline: 1px solid var(--tertiary);
+      border-radius: 1px;
+      .d-icon {
+        color: var(--tertiary);
+      }
+    }
+
+    @include hover {
+      .d-icon {
+        color: var(--tertiary);
+      }
+    }
+  }
+}
+
+.d-lightbox {
+  &__focus-trap,
+  &__screen-reader-announcer {
+    position: absolute;
+    left: -100%;
+    top: -100%;
+  }
+}
+
+/* State styles */
+
+// Carousel
+.d-lightbox {
+  &.has-carousel {
+    .d-lightbox__content {
+      gap: 2em 0;
+    }
+
+    .btn-flat.d-lightbox__carousel-button .d-icon {
+      color: var(--tertiary);
+
+      @include hover {
+        color: var(--tertiary);
+      }
+    }
+  }
+}
+
+// expanded title
+.d-lightbox {
+  &.has-expanded-title {
+    .d-lightbox__content {
+      gap: 2em;
+    }
+
+    .d-lightbox__main-title {
+      overflow: visible;
+      white-space: normal;
+      text-overflow: unset;
+    }
+  }
+}
+
+// Zoom
+.d-lightbox {
+  &.can-zoom {
+    .d-lightbox__body {
+      @extend %lightbox-scrollable;
+
+      overflow: auto;
+      height: 100%;
+      width: 100%;
+      position: absolute;
+    }
+
+    .d-lightbox__main-image {
+      cursor: zoom-in;
+    }
+  }
+
+  &.is-zoomed {
+    .d-lightbox__content {
+      gap: 0;
+    }
+
+    .d-lightbox {
+      &__body {
+        @extend %lightbox-scrollable;
+        overflow: auto;
+        height: 100%;
+        width: 100%;
+        position: absolute;
+      }
+
+      &__zoomed-image-container {
+        cursor: zoom-out;
+        background-image: var(--d-lightbox-image-full-size-url);
+        background-repeat: no-repeat;
+        backface-visibility: hidden;
+        background-position: center;
+
+        .mobile-view & {
+          width: var(--d-lightbox-image-width);
+          height: var(--d-lightbox-image-height);
+        }
+
+        .desktop-view & {
+          width: 100%;
+          height: 100%;
+        }
+      }
+    }
+
+    .btn-flat.d-lightbox__zoom-button .d-icon {
+      color: var(--tertiary);
+
+      @include hover {
+        color: var(--tertiary);
+      }
+    }
+  }
+}
+
+// Rotate
+.d-lightbox {
+  &.is-rotated {
+    .d-lightbox__body {
+      gap: 0;
+    }
+    .d-lightbox__main-image,
+    .d-lightbox__zoomed-image-container {
+      transform: rotate(var(--d-lightbox-image-rotation));
+    }
+
+    .btn-flat.d-lightbox__rotate-button .d-icon {
+      color: var(--tertiary);
+      transform: rotate(var(--d-lightbox-image-rotation));
+
+      @include hover {
+        color: var(--tertiary);
+      }
+    }
+  }
+}
+
+// Full screen
+.d-lightbox {
+  &.is-fullscreen {
+    .btn-flat.d-lightbox__full-screen-button .d-icon {
+      color: var(--tertiary);
+
+      @include hover {
+        color: var(--tertiary);
+      }
+    }
+  }
+}
+
+/* Animations */
+
+.d-lightbox {
+  &.is-visible &__content {
+    @extend %lightbox-animation-base;
+    animation-name: lightbox-fade-in-scale;
+  }
+
+  &__backdrop,
+  &__main-image,
+  &__loading-spinner,
+  &__zoomed-image-container,
+  &__carousel,
+  &__main-title {
+    @extend %lightbox-animation-base;
+    animation-name: lightbox-fade-in;
+  }
+
+  &__loading-spinner {
+    animation-delay: var(--d-lightbox-image-animation-duration);
+    opacity: 0;
+  }
+
+  &.will-close &__content {
+    animation-name: lightbox-fade-out;
+  }
+}
+
+%lightbox-animation-base {
+  animation-duration: 150ms;
+  animation-fill-mode: forwards;
+  backface-visibility: hidden;
+  will-change: opacity;
+  animation-timing-function: linear;
+}
+
+%lightbox-scrollable {
+  backface-visibility: hidden;
+
+  // MOZ
+  scrollbar-width: none;
+  overflow: auto;
+  // Webkit
+  overflow: overlay;
+  &::-webkit-scrollbar {
+    display: none;
+  }
+}
+
+@keyframes lightbox-fade-out {
+  0% {
+    opacity: 1;
+  }
+  100% {
+    opacity: 0;
+  }
+}
+
+@keyframes lightbox-fade-in {
+  0% {
+    opacity: 0;
+  }
+  100% {
+    opacity: 1;
+  }
+}
+
+@keyframes lightbox-fade-in-scale {
+  0% {
+    opacity: 0;
+    transform: scale(0.85);
+  }
+
+  100% {
+    opacity: 1;
+    transform: scale(1);
+  }
+}
+
+@keyframes lightbox-fade-out-scale {
+  0% {
+    opacity: 1;
+    transform: scale(1);
+  }
+
+  100% {
+    opacity: 0;
+    transform: scale(0.85);
+  }
+}
diff --git a/app/assets/stylesheets/common/components/d-toggle-switch.scss b/app/assets/stylesheets/common/components/d-toggle-switch.scss
new file mode 100644
index 00000000000..8145a45240c
--- /dev/null
+++ b/app/assets/stylesheets/common/components/d-toggle-switch.scss
@@ -0,0 +1,82 @@
+.d-toggle-switch {
+  --toggle-switch-width: 45px;
+  --toggle-switch-height: 24px;
+
+  &:focus {
+    .d-toggle-switch__checkbox-slider {
+      outline: 2px solid var(--tertiary);
+    }
+  }
+
+  &:hover {
+    .d-toggle-switch__checkbox-slider {
+      background-color: var(--primary-high);
+    }
+
+    .d-toggle-switch__checkbox[aria-checked="true"]
+      + .d-toggle-switch__checkbox-slider {
+      background-color: var(--tertiary-hover);
+    }
+  }
+
+  display: flex;
+  align-items: center;
+
+  &__label {
+    position: relative;
+    display: inline-block;
+    cursor: pointer;
+  }
+
+  &__checkbox {
+    position: absolute;
+    visibility: hidden;
+  }
+
+  &__checkbox[aria-checked="true"] + .d-toggle-switch__checkbox-slider {
+    background-color: var(--tertiary);
+  }
+
+  &__checkbox[aria-checked="true"] + .d-toggle-switch__checkbox-slider::before {
+    left: calc(var(--toggle-switch-width) - 22px);
+  }
+
+  &__checkbox-slider {
+    display: inline-block;
+    cursor: pointer;
+    background: var(--primary-low-mid);
+    border-radius: 16px;
+    width: var(--toggle-switch-width);
+    height: var(--toggle-switch-height);
+    margin-right: 0.5em;
+    position: relative;
+    vertical-align: middle;
+    transition: background 0.25s;
+
+    .d-icon {
+      font-size: var(--font-down-1);
+      color: var(--secondary);
+      left: 7px;
+      top: 7px;
+      position: absolute;
+    }
+  }
+
+  &__checkbox-slider::before,
+  &__checkbox-slider::after {
+    content: "";
+    display: block;
+    position: absolute;
+    cursor: pointer;
+  }
+
+  &__checkbox-slider::before {
+    background: var(--secondary);
+    border-radius: 50%;
+    width: calc(var(--toggle-switch-width) / 2.5);
+    height: calc(var(--toggle-switch-width) / 2.5);
+    top: 3.5px;
+    left: 4px;
+    transition: left 0.25s;
+  }
+}
diff --git a/app/assets/stylesheets/common/components/d-tooltip.scss b/app/assets/stylesheets/common/components/d-tooltip.scss
index 3ca748420bf..28433f513db 100644
--- a/app/assets/stylesheets/common/components/d-tooltip.scss
+++ b/app/assets/stylesheets/common/components/d-tooltip.scss
@@ -7,5 +7,6 @@
   color: var(--primary);
   background: var(--secondary);
   border: 1px solid var(--primary-low);
-  box-shadow: shadow("menu-panel");
+  box-shadow: var(--shadow-menu-panel);
+  overflow-wrap: break-word;
 }
diff --git a/app/assets/stylesheets/common/components/footer-nav.scss b/app/assets/stylesheets/common/components/footer-nav.scss
index 52aa485b30f..8e72f4e1399 100644
--- a/app/assets/stylesheets/common/components/footer-nav.scss
+++ b/app/assets/stylesheets/common/components/footer-nav.scss
@@ -30,7 +30,7 @@ body.footer-nav-visible {
 
 .footer-nav {
   background-color: rgba(var(--header_background-rgb), 0.9);
-  box-shadow: shadow("footer-nav");
+  box-shadow: var(--shadow-footer-nav);
   height: var(--footer-nav-height);
   position: fixed;
   bottom: calc(var(--footer-nav-height) * -1);
diff --git a/app/assets/stylesheets/common/components/form-template-field.scss b/app/assets/stylesheets/common/components/form-template-field.scss
new file mode 100644
index 00000000000..da7cc821ac6
--- /dev/null
+++ b/app/assets/stylesheets/common/components/form-template-field.scss
@@ -0,0 +1,64 @@
+.form-template-field {
+  input,
+  textarea,
+  select {
+    width: 100%;
+  }
+
+  // TODO(@keegan): Remove after updating dropdown/multi-select to use select-kit
+  &__dropdown {
+    border: 1px solid var(--primary-medium);
+    border-radius: var(--d-input-border-radius);
+    padding: 0.5em 0.65em;
+    font-size: var(--font-0);
+  }
+
+  &__multi-select {
+    border: 1px solid var(--primary-medium);
+    border-radius: var(--d-input-border-radius);
+    padding: 0.5em 0.65em;
+    font-size: var(--font-0);
+  }
+  // END of what should be removed after updating dropdown/multi-select to use select-kit
+
+  &__required-indicator {
+    color: var(--danger);
+    margin-left: 0.5em;
+    font-size: var(--font-down-4);
+  }
+
+  &__uploaded-files {
+    list-style: none;
+    margin-left: 0;
+
+    li {
+      padding: 0.5rem;
+      margin-block: 0.25rem;
+      border: 1px solid var(--primary-low-mid);
+      background: var(--primary-low);
+      border-radius: var(--d-border-radius);
+      display: flex;
+      align-items: center;
+
+      a {
+        @include ellipsis;
+        width: 70%;
+      }
+
+      span {
+        color: var(--primary-high);
+        margin-left: auto;
+        font-size: var(--font-down-1);
+      }
+    }
+
+    .d-icon {
+      color: var(--tertiary);
+      margin-right: 0.5rem;
+    }
+  }
+
+  &__textarea {
+    min-height: 100px;
+  }
+}
diff --git a/app/assets/stylesheets/common/components/hashtag.scss b/app/assets/stylesheets/common/components/hashtag.scss
index f02d7f2ed78..b4e6cd771ea 100644
--- a/app/assets/stylesheets/common/components/hashtag.scss
+++ b/app/assets/stylesheets/common/components/hashtag.scss
@@ -14,7 +14,7 @@ a.hashtag {
   }
 }
 
-a.hashtag-cooked {
+.hashtag-cooked {
   @include mention;
 
   &:visited,
@@ -23,9 +23,12 @@ a.hashtag-cooked {
   }
 
   .d-icon {
-    color: var(--primary-high);
-    font-size: var(--font-down-1);
-    margin: 0 0.2em 0 0.1em;
+    font-size: var(--font-down-2);
+    margin: 0 0.33em 0 0.1em;
+
+    &.hashtag-missing {
+      color: var(--primary-medium);
+    }
   }
 
   img.emoji {
@@ -33,12 +36,29 @@ a.hashtag-cooked {
     height: 15px;
     vertical-align: text-bottom;
   }
+
+  svg {
+    display: inline;
+  }
+
+  .hashtag-category-badge {
+    flex: 0 0 auto;
+    width: 0.72em;
+    height: 0.72em;
+    margin-right: 0.25em;
+    margin-left: 0.1em;
+    display: inline-block;
+
+    &.hashtag-missing {
+      background-color: var(--primary-medium);
+    }
+  }
 }
 
 .hashtag-autocomplete {
   max-height: 13.5em;
   overflow-y: auto;
-  box-shadow: shadow("dropdown-lite");
+  box-shadow: var(--shadow-dropdown);
   border-radius: 8px;
 
   &__fadeout {
@@ -55,7 +75,7 @@ a.hashtag-cooked {
       background: linear-gradient(
         to bottom,
         rgba(var(--secondary-rgb), 0),
-        rgba(var(--secondary-rgb), 1)
+        rgba(var(--secondary-rgb), 100%)
       );
     }
   }
@@ -78,9 +98,16 @@ a.hashtag-cooked {
     }
 
     .d-icon {
-      color: var(--primary-medium);
       margin-right: 0.25em;
     }
+
+    .hashtag-category-badge {
+      flex: 0 0 auto;
+      width: 15px;
+      height: 15px;
+      margin-right: 5px;
+      display: inline-block;
+    }
   }
 
   &__text {
diff --git a/app/assets/stylesheets/common/components/horizontal-overflow-nav.scss b/app/assets/stylesheets/common/components/horizontal-overflow-nav.scss
index 9f2f817c02e..e50c91dfdfc 100644
--- a/app/assets/stylesheets/common/components/horizontal-overflow-nav.scss
+++ b/app/assets/stylesheets/common/components/horizontal-overflow-nav.scss
@@ -26,6 +26,7 @@
 .horizontal-overflow-nav__scroll-right,
 .horizontal-overflow-nav__scroll-left {
   --fade-width: 1.5em;
+  --fade-color: var(--secondary-rgb); // must be RGB for gradient
   opacity: 1;
   position: absolute;
   z-index: 2;
@@ -56,8 +57,8 @@
     width: var(--fade-width);
     background: linear-gradient(
       to left,
-      rgba(var(--secondary-rgb), 1),
-      rgba(var(--secondary-rgb), 0)
+      rgba(var(--fade-color), 1),
+      rgba(var(--fade-color), 0)
     );
   }
 }
@@ -71,8 +72,8 @@
     width: var(--fade-width);
     background: linear-gradient(
       to right,
-      rgba(var(--secondary-rgb), 1),
-      rgba(var(--secondary-rgb), 0)
+      rgba(var(--fade-color), 1),
+      rgba(var(--fade-color), 0)
     );
   }
 }
diff --git a/app/assets/stylesheets/common/components/ignored-user-list.scss b/app/assets/stylesheets/common/components/ignored-user-list.scss
index 02135f37206..a907aac6025 100644
--- a/app/assets/stylesheets/common/components/ignored-user-list.scss
+++ b/app/assets/stylesheets/common/components/ignored-user-list.scss
@@ -1,3 +1,9 @@
+.user-ignore {
+  .btn-icon-text {
+    margin-top: 0.5em;
+  }
+}
+
 .ignored-list {
   overflow: auto;
   max-height: 150px;
diff --git a/app/assets/stylesheets/common/components/keyboard_shortcuts.scss b/app/assets/stylesheets/common/components/keyboard_shortcuts.scss
index 56925f449c9..42f03026d5e 100644
--- a/app/assets/stylesheets/common/components/keyboard_shortcuts.scss
+++ b/app/assets/stylesheets/common/components/keyboard_shortcuts.scss
@@ -27,22 +27,40 @@
   background-color: inherit;
 }
 
-.keyboard-shortcuts-modal .modal-body {
-  max-height: 560px;
+.keyboard-shortcuts-modal {
+  .modal-inner-container {
+    width: 100%;
+    --modal-max-width: 80vw;
+  }
 }
 
-.keyboard-shortcuts-modal .modal-inner-container {
-  max-width: 880px;
+.modal-body:has(#keyboard-shortcuts-help) {
+  overflow-y: hidden;
 }
 
 #keyboard-shortcuts-help {
-  display: grid;
-  grid-gap: 0.5em 1.25em;
-  grid-template-columns: repeat(3, 1fr);
+  box-sizing: border-box;
+  overflow-x: hidden;
+  overflow-y: auto;
+  max-height: 80vh !important; // overrides a default modal !important for extra space
+
+  .keyboard-shortcuts-help__container {
+    columns: auto 20em;
+    section {
+      display: inline-block;
+      margin-bottom: 1.5em;
+      width: 100%;
+    }
+  }
+
   &:focus {
     outline: none;
   }
 
+  kbd:first-child {
+    margin-left: 0;
+  }
+
   @for $i from 1 through 25 {
     .span-#{$i} {
       grid-row-end: span $i;
@@ -51,8 +69,7 @@
 
   ul {
     list-style: none;
-    margin-bottom: 2rem;
-    margin-left: 0;
+    margin: 0;
 
     li {
       align-items: center;
@@ -62,7 +79,6 @@
     }
 
     span {
-      background: var(--primary-very-low);
       border-radius: 3px;
       display: inline-flex;
       margin: 0 6px;
diff --git a/app/assets/stylesheets/common/components/offline-indicator.scss b/app/assets/stylesheets/common/components/offline-indicator.scss
new file mode 100644
index 00000000000..f2a19795faa
--- /dev/null
+++ b/app/assets/stylesheets/common/components/offline-indicator.scss
@@ -0,0 +1,10 @@
+.offline-indicator {
+  position: fixed;
+  top: var(--header-offset);
+  left: 50%;
+  transform: translate(-50%, 0);
+  padding: 0.5em 1em;
+  background-color: var(--primary-very-low);
+  border-radius: var(--d-nav-pill-border-radius);
+  z-index: z("header") - 10;
+}
diff --git a/app/assets/stylesheets/common/components/sidebar/edit-navigation-menu/categories-modal.scss b/app/assets/stylesheets/common/components/sidebar/edit-navigation-menu/categories-modal.scss
new file mode 100644
index 00000000000..ec00893c6cb
--- /dev/null
+++ b/app/assets/stylesheets/common/components/sidebar/edit-navigation-menu/categories-modal.scss
@@ -0,0 +1,71 @@
+.sidebar-categories-form {
+  .sidebar-categories-form__row {
+    display: flex;
+    flex-direction: column;
+    border: 1px solid var(--primary-low);
+    border-left: 4px solid;
+    margin-bottom: 1em;
+    padding: 0;
+  }
+
+  .sidebar-categories-form__category-row[data-category-level="0"]:not(
+      :only-child
+    ) {
+    border-bottom: 1px solid var(--primary-low);
+  }
+
+  .sidebar-categories-form__category-row[data-category-level="1"] {
+    margin-left: 1em;
+  }
+
+  .sidebar-categories-form__category-row[data-category-level="1"]:not(
+      :nth-of-type(2)
+    ) {
+    border-top: 1px solid var(--primary-low);
+  }
+
+  .sidebar-categories-form__category-row[data-category-level="2"] {
+    margin-left: 2em;
+    border-top: 1px solid var(--primary-low);
+  }
+
+  .sidebar-categories-form__category-label {
+    display: flex;
+    justify-content: space-between;
+    padding: 0.75em 1em;
+    margin: 0;
+    flex-grow: 1;
+    input[type="checkbox"] {
+      margin-right: 0;
+    }
+  }
+
+  .sidebar-categories-form__category-wrapper {
+    min-width: 0;
+  }
+
+  .sidebar-categories-form__category-badge {
+    .badge-wrapper {
+      width: 100%;
+    }
+
+    .badge-category {
+      white-space: normal;
+      word-wrap: break-word;
+    }
+
+    .category-name {
+      color: var(--primary);
+      font-size: var(--font-up-1);
+      @include ellipsis;
+    }
+  }
+
+  .sidebar-categories-form__category-description {
+    color: var(--primary-high);
+    font-size: var(--font-down-1);
+    margin: 0.25em 0;
+    // avoids long words (like urls) from breaking the layou
+    word-break: break-word;
+  }
+}
diff --git a/app/assets/stylesheets/common/components/sidebar/edit-navigation-menu/modal.scss b/app/assets/stylesheets/common/components/sidebar/edit-navigation-menu/modal.scss
new file mode 100644
index 00000000000..202d361a2a8
--- /dev/null
+++ b/app/assets/stylesheets/common/components/sidebar/edit-navigation-menu/modal.scss
@@ -0,0 +1,123 @@
+.modal.sidebar__edit-navigation-menu__modal {
+  @include breakpoint("tablet", min-width) {
+    .modal-inner-container {
+      width: 100%;
+    }
+  }
+  .modal-header {
+    border: none;
+  }
+  .modal-body {
+    border-top: 1px solid var(--primary-low);
+    margin-top: 1em;
+    height: 40dvh;
+  }
+}
+
+.sidebar__edit-navigation-menu__filter {
+  display: flex;
+  gap: 0.5em;
+  padding: 0 0.66em 0;
+  @include breakpoint("tablet", min-width) {
+    padding: 0 1em 0;
+  }
+
+  .sidebar__edit-navigation-menu__filter-dropdown {
+    .select-kit-header {
+      background: var(--secondary);
+      color: var(--primary);
+      border: 1px solid var(--primary-low-mid);
+      font-size: var(--font-0);
+
+      &:hover,
+      &:focus {
+        background: var(--secondary);
+        color: var(--primary);
+
+        .d-icon {
+          color: var(--primary);
+        }
+      }
+    }
+  }
+
+  .sidebar__edit-navigation-menu__filter-input {
+    display: flex;
+    flex-direction: row;
+    margin-right: auto;
+    width: 100%;
+    position: relative;
+    flex: 1 1 70%;
+    input {
+      margin: 0;
+    }
+  }
+
+  .sidebar__edit-navigation-menu__filter-dropdown-wrapper {
+    flex: 1 1 30%;
+    display: flex;
+
+    .select-kit {
+      width: 100%;
+      summary {
+        height: 100%;
+      }
+    }
+  }
+
+  .sidebar__edit-navigation-menu__filter-input-icon {
+    position: absolute;
+    left: 0.5em;
+    top: 0.65em;
+    color: var(--primary-low-mid);
+  }
+
+  .sidebar__edit-navigation-menu__filter-input-field {
+    border-color: var(--primary-low-mid);
+    padding-left: 1.75em;
+    width: 100%;
+
+    &:focus {
+      border-color: var(--tertiary);
+      outline: none;
+      outline-offset: 0;
+      box-shadow: inset 0px 0px 0px 1px var(--tertiary);
+    }
+  }
+}
+
+.sidebar__edit-navigation-menu__footer {
+  display: flex;
+  width: 100%;
+  margin-top: 0.25em;
+
+  .btn.sidebar__edit-navigation-menu__reset-defaults-button {
+    margin-left: auto;
+    margin-right: 0;
+
+    .d-icon {
+      font-size: var(--font-down-1);
+      color: var(--tertiary);
+    }
+
+    &:focus,
+    &:active {
+      background: none;
+    }
+  }
+}
+
+.sidebar__edit-navigation-menu__deselect-wrapper {
+  margin: 0 1em 0 0;
+  line-height: var(--line-height-medium);
+
+  .btn-flat.sidebar__edit-navigation-menu__deselect-button {
+    margin-left: auto;
+    padding: 0;
+
+    &:focus,
+    &:active {
+      background: none;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/components/sidebar/edit-navigation-menu/tags-modal.scss b/app/assets/stylesheets/common/components/sidebar/edit-navigation-menu/tags-modal.scss
new file mode 100644
index 00000000000..2941abf967c
--- /dev/null
+++ b/app/assets/stylesheets/common/components/sidebar/edit-navigation-menu/tags-modal.scss
@@ -0,0 +1,44 @@
+.sidebar-tags-form {
+  height: 100%;
+  display: grid;
+  gap: 0 0.5em;
+  margin: 0;
+  grid-template-columns: repeat(auto-fill, minmax(12em, 1fr));
+  &__no-tags {
+    grid-column-start: 1;
+    grid-column-end: -1;
+  }
+
+  .sidebar-tags-form__tag {
+    display: flex;
+    align-items: center;
+
+    .sidebar-tags-form__tag-label {
+      margin-bottom: 0;
+      min-width: 0;
+      padding: 0.33em 0;
+      @include breakpoint(tablet) {
+        // extra tappable space
+        padding: 0.5em 0;
+      }
+
+      p {
+        overflow: hidden;
+        margin: 0;
+      }
+      &-name {
+        // avoid long tags breaking the layou
+        word-break: break-all;
+      }
+    }
+
+    .sidebar-tags-form__input {
+      margin-top: 0;
+    }
+  }
+
+  .sidebar-tags-form__tag-label-count {
+    color: var(--primary-medium);
+    margin-left: 0.33em;
+  }
+}
diff --git a/app/assets/stylesheets/common/components/tap-tile.scss b/app/assets/stylesheets/common/components/tap-tile.scss
index cbadecd00e7..091c94d757d 100644
--- a/app/assets/stylesheets/common/components/tap-tile.scss
+++ b/app/assets/stylesheets/common/components/tap-tile.scss
@@ -20,7 +20,7 @@
     }
 
     &.active {
-      background-color: var(--highlight-medium);
+      background-color: var(--highlight-bg);
     }
 
     .d-icon {
diff --git a/app/assets/stylesheets/common/components/time-shortcut-picker.scss b/app/assets/stylesheets/common/components/time-shortcut-picker.scss
index 4c0fe065cdb..c50f0137e7a 100644
--- a/app/assets/stylesheets/common/components/time-shortcut-picker.scss
+++ b/app/assets/stylesheets/common/components/time-shortcut-picker.scss
@@ -38,9 +38,6 @@
   &.custom-relative-wrap {
     .relative-time-picker {
       display: flex;
-      .select-kit.combo-box {
-        width: 60px;
-      }
     }
   }
 }
diff --git a/app/assets/stylesheets/common/components/topic-query-filter.scss b/app/assets/stylesheets/common/components/topic-query-filter.scss
new file mode 100644
index 00000000000..e40ebd86ee7
--- /dev/null
+++ b/app/assets/stylesheets/common/components/topic-query-filter.scss
@@ -0,0 +1,43 @@
+.topic-query-filter {
+  display: flex;
+  flex-direction: row;
+  margin-right: auto;
+  margin-bottom: var(--nav-space);
+  width: 100%;
+
+  &__label {
+    background-color: var(--primary-low);
+    display: flex;
+    align-items: center;
+    padding: 0.25em 0.65em;
+    border: 1px solid var(--primary-low-mid);
+    border-right: 0;
+  }
+
+  &__input {
+    position: relative;
+    flex: 1 1;
+  }
+
+  &__icon {
+    position: absolute;
+    left: 0.5em;
+    top: 0.65em;
+    color: var(--primary-low-mid);
+  }
+
+  input.topic-query-filter__filter-term {
+    margin: 0 0.5em 0 0;
+    border-color: var(--primary-low-mid);
+    padding-left: 1.75em;
+    color: var(--primary);
+    width: 100%;
+
+    &:focus {
+      border-color: var(--tertiary);
+      outline: none;
+      outline-offset: 0;
+      box-shadow: inset 0px 0px 0px 1px var(--tertiary);
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/components/user-card.scss b/app/assets/stylesheets/common/components/user-card.scss
index 79074b863ad..3c9a807ca49 100644
--- a/app/assets/stylesheets/common/components/user-card.scss
+++ b/app/assets/stylesheets/common/components/user-card.scss
@@ -1,6 +1,10 @@
-$card_width: 580px;
-$avatar_width: 120px;
-$avatar_margin: -50px; // negative margin makes avatars extend above cards
+@use "sass:math";
+
+.user-card {
+  --card-width: 39em;
+  --avatar-width: 8em;
+  --avatar-margin: -3.3em; // extends the avatar above the card
+}
 
 .animated-placeholder {
   height: 20px;
@@ -8,8 +12,8 @@ $avatar_margin: -50px; // negative margin makes avatars extend above cards
 }
 
 .card-avatar-placeholder {
-  width: $avatar_width;
-  height: $avatar_width;
+  width: var(--avatar-width);
+  height: var(--avatar-width);
   border-radius: 100%;
   position: relative;
   overflow: hidden;
@@ -24,27 +28,21 @@ $avatar_margin: -50px; // negative margin makes avatars extend above cards
       var(--primary-low) 18%,
       var(--primary-very-low) 33%
     );
-    height: $avatar_width;
-    width: $card_width;
+    height: var(--avatar-width);
+    width: var(--card-width);
   }
 }
 
 // shared styles for user and group cards
 .user-card,
 .group-card {
-  width: $card_width;
-  box-shadow: shadow("card");
+  width: var(--card-width);
+  box-shadow: var(--shadow-card);
   color: var(--primary);
   background: var(--secondary) center center;
   background-size: cover;
-  transition: opacity 0.2s, transform 0.2s;
-  opacity: 0;
   outline: 2px solid transparent;
-  @include transform(scale(0.9));
-  &.show {
-    opacity: 1;
-    @include transform(scale(1));
-  }
+
   .card-content {
     padding: 10px;
     background: rgba(var(--secondary-rgb), 0.85);
@@ -144,12 +142,16 @@ $avatar_margin: -50px; // negative margin makes avatars extend above cards
   .first-row {
     display: flex;
     .avatar-placeholder {
-      width: $avatar_width;
-      height: $avatar_width;
+      width: var(--avatar-width);
+      height: var(--avatar-width);
     }
     .user-card-avatar {
-      margin-top: $avatar_margin;
-      max-height: $avatar_width;
+      margin-top: var(--avatar-margin);
+      max-height: var(--avatar-width);
+    }
+    .avatar {
+      width: var(--avatar-width);
+      height: var(--avatar-width);
     }
     .new-user a {
       color: var(--primary-low-mid);
@@ -175,7 +177,8 @@ $avatar_margin: -50px; // negative margin makes avatars extend above cards
         font-weight: bold;
       }
     }
-    .profile-hidden {
+    .profile-hidden,
+    .inactive-user {
       font-size: var(--font-up-1);
       margin-top: 0.5em;
     }
@@ -260,18 +263,18 @@ $avatar_margin: -50px; // negative margin makes avatars extend above cards
   .first-row {
     display: flex;
     .group-card-avatar {
-      margin-top: $avatar_margin;
+      margin-top: var(--avatar-margin);
     }
     .avatar-flair {
       display: flex;
       background-size: contain;
       background-repeat: no-repeat;
-      width: $avatar_width;
-      height: $avatar_width;
+      width: var(--avatar-width);
+      height: var(--avatar-width);
       color: var(--primary);
       .d-icon {
         margin: auto;
-        font-size: $avatar_width / 1.5;
+        font-size: calc(var(--avatar-width) / 1.5);
       }
       &.rounded {
         border-radius: 50%;
@@ -307,6 +310,7 @@ h3.user-status {
   }
 
   .relative-date {
+    flex: 1 0 auto;
     text-align: left;
     font-size: var(--font-down-3);
     padding-top: 0.5em;
diff --git a/app/assets/stylesheets/common/components/user-stream-item.scss b/app/assets/stylesheets/common/components/user-stream-item.scss
index 95452a77d59..ad6efc54148 100644
--- a/app/assets/stylesheets/common/components/user-stream-item.scss
+++ b/app/assets/stylesheets/common/components/user-stream-item.scss
@@ -13,7 +13,7 @@
     list-style: none;
 
     &.moderator-action {
-      background-color: var(--highlight-medium);
+      background-color: var(--highlight-bg);
     }
 
     &.deleted {
@@ -35,6 +35,12 @@
     flex-grow: 1;
   }
 
+  .user-stream-item__metadata {
+    align-items: end;
+    display: flex;
+    flex-direction: column;
+  }
+
   .type,
   span.name {
     color: var(--primary);
@@ -49,15 +55,25 @@
     padding-top: 5px;
   }
 
+  .delete-info {
+    align-items: center;
+    display: flex;
+
+    .d-icon {
+      font-size: var(--font-0);
+      margin-right: 0.5rem;
+    }
+
+    .avatar {
+      margin-right: 0.25rem;
+    }
+  }
+
   .notification .time {
     margin-left: auto;
     float: none;
   }
 
-  .delete-info .d-icon {
-    font-size: var(--font-0);
-  }
-
   .expand-item,
   .collapse-item {
     margin-right: 0.5em;
@@ -78,7 +94,7 @@
   }
 
   .edit-reason {
-    background-color: var(--highlight-medium);
+    background-color: var(--highlight-bg);
     padding: 3px 5px 5px 5px;
   }
 
diff --git a/app/assets/stylesheets/common/components/widget-dropdown.scss b/app/assets/stylesheets/common/components/widget-dropdown.scss
index 9530286a1f0..22a05e807c0 100644
--- a/app/assets/stylesheets/common/components/widget-dropdown.scss
+++ b/app/assets/stylesheets/common/components/widget-dropdown.scss
@@ -11,7 +11,6 @@
   .widget-dropdown-body {
     display: flex;
     flex-direction: column;
-    padding: 0.25em;
     background: var(--secondary);
     z-index: z("dropdown");
     border: 1px solid var(--primary-low);
@@ -22,7 +21,7 @@
 
   .widget-dropdown-item {
     cursor: pointer;
-    padding: 0.25em;
+    padding: 0.5em 1em;
     display: flex;
     flex: 1;
     align-items: center;
@@ -43,7 +42,7 @@
     }
 
     &:hover {
-      background: var(--tertiary-low);
+      background: var(--d-hover);
     }
   }
 
diff --git a/app/assets/stylesheets/common/d-editor.scss b/app/assets/stylesheets/common/d-editor.scss
index 48fa3c633fb..f331354daa2 100644
--- a/app/assets/stylesheets/common/d-editor.scss
+++ b/app/assets/stylesheets/common/d-editor.scss
@@ -2,6 +2,13 @@
   display: flex;
   flex-grow: 1;
   max-width: 100%;
+
+  &.has-form-template {
+    .d-editor-preview-wrapper {
+      display: none;
+      flex: 0;
+    }
+  }
 }
 
 .d-editor {
@@ -183,11 +190,12 @@
     width: 100%;
 
     display: flex;
-    flex-wrap: wrap;
+    flex-wrap: nowrap;
+    align-items: center;
     gap: 0 0.5em;
 
     position: absolute;
-    height: var(--resizer-height);
+    height: calc(var(--resizer-height) + 0.5em);
     bottom: 0;
     left: 0;
     opacity: 0;
@@ -234,15 +242,15 @@
     }
 
     .alt-text-readonly-container {
-      flex: 1 1;
-      width: 100%;
+      flex: 1 1 auto;
+      // arbitrary min-width value allows for correct shrinking
+      min-width: 100px;
 
       .alt-text {
         margin-right: 0.5em;
         overflow: hidden;
         white-space: nowrap;
         text-overflow: ellipsis;
-        max-width: 100%;
       }
 
       .alt-text-edit-btn {
@@ -256,9 +264,9 @@
     }
 
     .alt-text-edit-container {
-      margin-top: 0.25em;
       gap: 0 0.25em;
       flex: 1;
+      max-width: 100%;
 
       .alt-text-input,
       .alt-text-edit-ok,
@@ -267,11 +275,13 @@
       }
 
       .alt-text-input {
+        display: inline-flex;
         flex: 1;
         overflow: hidden;
         white-space: nowrap;
         text-overflow: ellipsis;
         margin: 0;
+        padding-left: 0.25em;
       }
 
       .alt-text-edit-ok,
@@ -294,6 +304,11 @@
       }
     }
 
+    .wrap-image-grid-button {
+      cursor: pointer;
+      color: var(--tertiary);
+    }
+
     svg {
       pointer-events: none;
     }
@@ -344,3 +359,10 @@
     justify-content: center;
   }
 }
+
+.d-editor #form-template-form {
+  overflow: auto;
+  background: var(--primary-very-low);
+  padding: 1rem;
+  border: 1px solid var(--primary-medium);
+}
diff --git a/app/assets/stylesheets/common/foundation/base.scss b/app/assets/stylesheets/common/foundation/base.scss
index 5dc173099eb..cea08f71fe3 100644
--- a/app/assets/stylesheets/common/foundation/base.scss
+++ b/app/assets/stylesheets/common/foundation/base.scss
@@ -7,6 +7,7 @@
   --topic-body-width-padding: #{$topic-body-width-padding};
   --topic-avatar-width: #{$topic-avatar-width};
   --d-border-radius: initial;
+  --d-border-radius-large: initial;
   --d-nav-pill-border-radius: var(--d-border-radius);
   --d-button-border-radius: var(--d-border-radius);
   --d-input-border-radius: var(--d-border-radius);
diff --git a/app/assets/stylesheets/common/foundation/color_transformations.scss b/app/assets/stylesheets/common/foundation/color_transformations.scss
index 761d5e706ce..fa2a1f05408 100644
--- a/app/assets/stylesheets/common/foundation/color_transformations.scss
+++ b/app/assets/stylesheets/common/foundation/color_transformations.scss
@@ -60,9 +60,25 @@ $tertiary-900: dark-light-diff($tertiary, $secondary, 20%, -25%) !default;
 $quaternary-low: dark-light-diff($quaternary, $secondary, 70%, -70%) !default;
 
 //highlight
-$highlight-low: dark-light-diff($highlight, $secondary, 70%, -80%) !default;
-$highlight-medium: dark-light-diff($highlight, $secondary, 50%, -55%) !default;
-$highlight-high: dark-light-diff($highlight, $secondary, -50%, -10%) !default;
+$highlight-bg: dark-light-diff($highlight, $secondary, 70%, -80%) !default;
+$highlight-low: dark-light-diff(
+  $highlight,
+  $secondary,
+  70%,
+  -80%
+) !default; //TO BE REMOVED IF POSS
+$highlight-medium: dark-light-diff(
+  $highlight,
+  $secondary,
+  50%,
+  -55%
+) !default; //TO BE REMOVED IF POSS
+$highlight-high: dark-light-diff(
+  $highlight,
+  $secondary,
+  -50%,
+  -10%
+) !default; //TO BE REMOVED IF POSS
 
 //danger
 $danger-low: dark-light-diff($danger, $secondary, 85%, -64%) !default;
@@ -155,3 +171,12 @@ $hljs-attribute: dark-light-choose(
 $hljs-symbol: dark-light-choose(unquote("#990073"), unquote("#fbe")) !default;
 $hljs-bg: dark-light-choose(unquote("#f8f8f8"), unquote("#333")) !default;
 $hljs-builtin-name: dark-light-choose($tertiary-high, $tertiary-hover) !default;
+
+// shadow opacity variables
+$shadow-opacity-modal: dark-light-choose(0.6, 1) !default;
+$shadow-opacity-composer: dark-light-choose(0.12, 0.35) !default;
+$shadow-opacity-menu-panel: dark-light-choose(0.15, 0.35) !default;
+$shadow-opacity-card: dark-light-choose(0.15, 0.5) !default;
+$shadow-opacity-dropdown: dark-light-choose(0.1, 0.25) !default;
+$shadow-opacity-header: dark-light-choose(0.25, 0.45) !default;
+$shadow-opacity-footer-nav: dark-light-choose(0.2, 0.4) !default;
diff --git a/app/assets/stylesheets/common/foundation/colors.scss b/app/assets/stylesheets/common/foundation/colors.scss
index 5f46814d0b9..89223b35f10 100644
--- a/app/assets/stylesheets/common/foundation/colors.scss
+++ b/app/assets/stylesheets/common/foundation/colors.scss
@@ -4,7 +4,9 @@ $tertiary: #0088cc !default;
 $quaternary: #e45735 !default;
 $header_background: #ffffff !default;
 $header_primary: #333333 !default;
-$highlight: #ffdd4a !default;
+$highlight: #ffff4d !default;
+$selected: #e9e9e9 !default;
+$hover: #f2f2f2 !default;
 $danger: #c80001 !default;
 $success: #009900 !default;
 $love: #fa6c8d !default;
diff --git a/app/assets/stylesheets/common/foundation/math.scss b/app/assets/stylesheets/common/foundation/math.scss
index 4d572575454..02dd4aceea6 100644
--- a/app/assets/stylesheets/common/foundation/math.scss
+++ b/app/assets/stylesheets/common/foundation/math.scss
@@ -4,6 +4,8 @@
 // https://github.com/terkel/mathsass
 
 // Constants
+@use "sass:math";
+
 $E: 2.718281828459045;
 $PI: 3.141592653589793;
 $LN2: 0.6931471805599453;
@@ -48,7 +50,7 @@ $SQRT2: 1.4142135623730951;
     }
   } @else if $x >= 1 {
     @while $x >= 1 {
-      $x: $x / 2;
+      $x: $x * 0.5;
       $exp: $exp + 1;
     }
   }
@@ -59,7 +61,7 @@ $SQRT2: 1.4142135623730951;
 // @param {Number} $x
 // @param {Number} $exp
 @function ldexp($x, $exp) {
-  $b: if($exp >= 0, 2, 1 / 2);
+  $b: if($exp >= 0, 2, 1 * 0.5);
   @if $exp < 0 {
     $exp: $exp * -1;
   }
@@ -80,11 +82,11 @@ $SQRT2: 1.4142135623730951;
 //     log(10) // 2.30259
 @function log($x) {
   @if $x <= 0 {
-    @return 0 / 0;
+    @return math.div(0, 0);
   }
-  $k: nth(frexp($x / $SQRT2), 2);
-  $x: $x / ldexp(1, $k);
-  $x: ($x - 1) / ($x + 1);
+  $k: nth(frexp(math.div($x, $SQRT2)), 2);
+  $x: math.div($x, ldexp(1, $k));
+  $x: math.div($x - 1, $x + 1);
   $x2: $x * $x;
   $i: 1;
   $s: $x;
@@ -93,7 +95,7 @@ $SQRT2: 1.4142135623730951;
     $x: $x * $x2;
     $i: $i + 2;
     $sp: $s;
-    $s: $s + $x / $i;
+    $s: $s + math.div($x, $i);
   }
   @return $LN2 * $k + 2 * $s;
 }
@@ -115,7 +117,7 @@ $SQRT2: 1.4142135623730951;
     $exp: floor($exp * 0.5);
     $base: $base * $base;
   }
-  @return if($s != 0, 1 / $r, $r);
+  @return if($s != 0, math.div(1, $r), $r);
 }
 
 // Returns E^x, where x is the argument, and E is Euler's constant, the base of the natural logarithms.
@@ -126,7 +128,7 @@ $SQRT2: 1.4142135623730951;
 @function exp($x) {
   $ret: 0;
   @for $n from 0 to 24 {
-    $ret: $ret + ipow($x, $n) / fact($n);
+    $ret: $ret + math.div(ipow($x, $n), fact($n));
   }
   @return $ret;
 }
@@ -158,7 +160,7 @@ $SQRT2: 1.4142135623730951;
   }
   $ret: 1;
   @for $i from 1 through 24 {
-    $ret: $ret - (pow($ret, 2) - $x) / (2 * $ret);
+    $ret: $ret - math.div(pow($ret, 2) - $x, 2 * $ret);
   }
   @return $ret;
 }
diff --git a/app/assets/stylesheets/common/foundation/mixins.scss b/app/assets/stylesheets/common/foundation/mixins.scss
index 1a8c2f8fef3..afb712eca77 100644
--- a/app/assets/stylesheets/common/foundation/mixins.scss
+++ b/app/assets/stylesheets/common/foundation/mixins.scss
@@ -5,6 +5,8 @@
 // Media queries
 // --------------------------------------------------
 
+@use "sass:math";
+
 $breakpoints: (
   mobile-small: 320px,
   mobile-medium: 350px,
@@ -17,7 +19,13 @@ $breakpoints: (
 );
 
 @mixin breakpoint($bp, $rule: max-width, $type: screen, $sidebar: false) {
-  @media #{$type} and (#{$rule}: map-get($breakpoints, $bp)) {
+  $bp-value: map-get($breakpoints, $bp);
+
+  @if $rule == min-width {
+    $bp-value: calc(#{$bp-value} + 1px);
+  }
+
+  @media #{$type} and (#{$rule}: #{$bp-value}) {
     @content;
   }
 
@@ -56,6 +64,14 @@ $breakpoints: (
   background-image: linear-gradient(to bottom, $start-color, $end-color);
 }
 
+@mixin darken-background($background-color, $amt) {
+  $overlay: dark-light-choose(
+    rgba(var(--primary-rgb), $amt),
+    rgba(var(--secondary-rgb), $amt)
+  );
+  background-image: linear-gradient(to bottom, $overlay 100%, $overlay 100%);
+}
+
 // Visibility
 // --------------------------------------------------
 
@@ -124,7 +140,7 @@ $hpad: 0.65em;
 
 // Stuff we repeat
 @mixin post-aside {
-  border-left: 5px solid var(--primary-low);
+  border-left: 5px solid var(--primary-300);
   background-color: var(--blend-primary-secondary-5);
 }
 
@@ -162,7 +178,7 @@ $hpad: 0.65em;
   $encoded: "";
   $slice: 2000;
   $index: 0;
-  $loops: ceil(str-length($svg) / $slice);
+  $loops: ceil(math.div(str-length($svg), $slice));
 
   @for $i from 1 through $loops {
     $chunk: str-slice($svg, $index, $index + $slice - 1);
@@ -241,7 +257,7 @@ $hpad: 0.65em;
   font-size: 0.93em;
   font-weight: normal;
   color: var(--primary);
-  padding: 0 0.3em 0.07em;
+  padding: 0 0.4em 0.07em;
   background: var(--primary-low);
   border-radius: 0.6em;
   text-decoration: none;
diff --git a/app/assets/stylesheets/common/foundation/variables.scss b/app/assets/stylesheets/common/foundation/variables.scss
index 7ac2a24d313..5cf234edd63 100644
--- a/app/assets/stylesheets/common/foundation/variables.scss
+++ b/app/assets/stylesheets/common/foundation/variables.scss
@@ -6,6 +6,8 @@
 // Layout dimensions
 // --------------------------------------------------
 
+@use "sass:math";
+
 $small-width: 800px !default;
 $medium-width: 995px !default;
 $large-width: 1110px !default;
@@ -15,7 +17,8 @@ $topic-body-width-padding: 11px;
 $topic-avatar-width: 45px;
 $reply-area-max-width: 1475px !default;
 
-$d-sidebar-width: 16em !default;
+$d-sidebar-width: 17em !default;
+$d-sidebar-narrow-width: 14em !default;
 
 // Brand color variables
 // --------------------------------------------------
@@ -129,30 +132,6 @@ $z-layers: (
   @return map-deep-get($z-layers, $layers...);
 }
 
-// Box-shadow
-// --------------------------------------------------
-
-$box-shadow: (
-  "modal": 0 8px 60px rgba(0, 0, 0, 0.6),
-  "composer": 0 -1px 40px rgba(0, 0, 0, 0.12),
-  "menu-panel": 0 12px 12px rgba(0, 0, 0, 0.15),
-  "card": 0 4px 14px rgba(0, 0, 0, 0.15),
-  "dropdown": 0 2px 3px 0 rgba(0, 0, 0, 0.2),
-  "dropdown-lite": 0px 2px 12px 0px rgba(0, 0, 0, 0.1),
-  "header": 0 2px 4px -1px rgba(0, 0, 0, 0.25),
-  "footer-nav": 0 0 2px 0 rgba(0, 0, 0, 0.25),
-  "kbd": (
-    0 2px 0 rgba(0, 0, 0, 0.2),
-    0 0 0 1px dark-light-choose(#fff, #000) inset,
-  ),
-  "focus": 0 0 3px 0 $tertiary,
-  "focus-danger": 0 0 6px 0 $danger,
-);
-
-@function shadow($key) {
-  @return map-get($box-shadow, $key);
-}
-
 // Color utilities
 // --------------------------------------------------
 
@@ -165,7 +144,7 @@ $box-shadow: (
 
 // Uses an approximation of sRGB blending, GAMMA=2 instead of GAMMA=2.2
 @function srgb-scale($foreground, $background, $percent) {
-  $ratio: ($percent / 100%);
+  $ratio: math.div($percent, 100%);
   $iratio: 1 - $ratio;
   $f_r2: red($foreground) * red($foreground);
   $f_g2: green($foreground) * green($foreground);
diff --git a/app/assets/stylesheets/common/input_tip.scss b/app/assets/stylesheets/common/input_tip.scss
index 77876f4dad9..d429858b6e9 100644
--- a/app/assets/stylesheets/common/input_tip.scss
+++ b/app/assets/stylesheets/common/input_tip.scss
@@ -20,7 +20,7 @@
   &.bad {
     background: var(--danger-medium);
     color: white;
-    box-shadow: shadow("dropdown");
+    box-shadow: var(--shadow-dropdown);
   }
   &.hide,
   &.good {
diff --git a/app/assets/stylesheets/common/loading-slider.scss b/app/assets/stylesheets/common/loading-slider.scss
new file mode 100644
index 00000000000..dc4be5e46aa
--- /dev/null
+++ b/app/assets/stylesheets/common/loading-slider.scss
@@ -0,0 +1,74 @@
+.loading-indicator-container {
+  --loading-width: 0.8;
+  --still-loading-width: 0.9;
+
+  --still-loading-duration: 10s;
+  --done-duration: 0.4s;
+  --fade-out-duration: 0.4s;
+
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: z("header") + 1;
+
+  height: 3px;
+  width: 100%;
+
+  opacity: 0;
+  transition: opacity var(--fade-out-duration) ease var(--done-duration);
+
+  background-color: var(--primary-low);
+
+  .loading-indicator {
+    height: 100%;
+    width: 100%;
+    transform: scaleX(0);
+    transform-origin: left;
+    background-color: var(--tertiary);
+  }
+
+  &.loading,
+  &.still-loading {
+    opacity: 1;
+    transition: opacity 0s;
+  }
+
+  &.loading .loading-indicator {
+    transition: transform var(--loading-duration) ease-in;
+    transform: scaleX(var(--loading-width));
+  }
+
+  &.still-loading .loading-indicator {
+    transition: transform var(--still-loading-duration) linear;
+    transform: scaleX(var(--still-loading-width));
+  }
+
+  &.done .loading-indicator {
+    transition: transform var(--done-duration) ease-out;
+    transform: scaleX(1);
+  }
+
+  &.discourse-hub-webview {
+    // DiscourseHub obscures the top 1px to work around an iOS bug
+    top: 1px;
+  }
+
+  body.footer-nav-ipad & {
+    top: var(--footer-nav-height);
+  }
+}
+
+.loading-slider-fallback-spinner {
+  padding-top: 1.8em;
+  display: none;
+}
+
+body.still-loading {
+  .loading-slider-fallback-spinner {
+    display: block;
+  }
+
+  #main-outlet {
+    display: none;
+  }
+}
diff --git a/app/assets/stylesheets/common/printer-friendly.scss b/app/assets/stylesheets/common/printer-friendly.scss
index b8cef469afa..58649c225e3 100644
--- a/app/assets/stylesheets/common/printer-friendly.scss
+++ b/app/assets/stylesheets/common/printer-friendly.scss
@@ -16,7 +16,7 @@
   #topic-progress,
   .quote-controls,
   .topic-timer-info,
-  div.lazyYT,
+  div.lazy-video-container,
   .post-info.edits,
   .post-action,
   .saving-text,
diff --git a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
index 43d12e6f469..dda97e1fa1b 100644
--- a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
+++ b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
@@ -15,7 +15,7 @@
       .select-kit-body {
         border: 1px solid var(--primary-low);
         background-clip: padding-box;
-        box-shadow: shadow("dropdown");
+        box-shadow: var(--shadow-dropdown);
       }
 
       .select-kit-row {
diff --git a/app/assets/stylesheets/common/select-kit/email-group-user-chooser.scss b/app/assets/stylesheets/common/select-kit/email-group-user-chooser.scss
index f965c82a504..7e01a6fa0a8 100644
--- a/app/assets/stylesheets/common/select-kit/email-group-user-chooser.scss
+++ b/app/assets/stylesheets/common/select-kit/email-group-user-chooser.scss
@@ -7,14 +7,13 @@
     .identifier {
       color: var(--primary);
       white-space: nowrap;
+      line-height: var(--line-height-medium);
     }
     .name {
       color: var(--primary-high);
       font-size: var(--font-down-1);
       margin-left: 0.5em;
-      overflow: hidden;
-      white-space: nowrap;
-      text-overflow: ellipsis;
+      @include ellipsis;
     }
     .avatar,
     .d-icon {
diff --git a/app/assets/stylesheets/common/select-kit/flair-row.scss b/app/assets/stylesheets/common/select-kit/flair-row.scss
index 224ce3836d7..f47142da2fd 100644
--- a/app/assets/stylesheets/common/select-kit/flair-row.scss
+++ b/app/assets/stylesheets/common/select-kit/flair-row.scss
@@ -1,3 +1,5 @@
+@use "sass:math";
+
 $flair-size: 18px;
 
 .select-kit.flair-chooser {
@@ -15,14 +17,14 @@ $flair-size: 18px;
       width: $flair-size;
 
       &.rounded {
-        background-size: ($flair-size / 1.4) ($flair-size / 1.4);
+        background-size: math.div($flair-size, 1.4) math.div($flair-size, 1.4);
         border-radius: 50%;
       }
 
       .d-icon {
         display: block;
-        height: ($flair-size / 1.8);
-        width: ($flair-size / 1.8);
+        height: math.div($flair-size, 1.8);
+        width: math.div($flair-size, 1.8);
       }
     }
 
diff --git a/app/assets/stylesheets/common/select-kit/multi-select.scss b/app/assets/stylesheets/common/select-kit/multi-select.scss
index 4f1ad6f4990..7d3d4d5d468 100644
--- a/app/assets/stylesheets/common/select-kit/multi-select.scss
+++ b/app/assets/stylesheets/common/select-kit/multi-select.scss
@@ -55,6 +55,38 @@
         @include ellipsis;
         display: inline-block;
       }
+
+      .select-kit-header--filter {
+        display: flex;
+        flex-wrap: wrap;
+        margin: -0.35em;
+        margin-left: -0.25em;
+        position: relative;
+        .selected-choice {
+          margin: 0.125em 0.25em 0.125em 0;
+          padding: 0.2em 0.3em;
+          font-size: var(--font-down-1);
+
+          &.selected-choice-color {
+            border-bottom: 2px solid transparent;
+          }
+        }
+
+        .select-kit-filter {
+          display: inline-flex;
+          flex: 1 1 30px;
+          width: auto;
+          margin-left: 0.25em;
+          position: static;
+          min-height: 28px;
+          &.is-expanded {
+            padding: 0;
+          }
+          .filter-input {
+            min-height: auto;
+          }
+        }
+      }
     }
 
     &.is-expanded .multi-select-header,
diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index f19d38e91f2..254d6e1410c 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -40,7 +40,7 @@
       border-radius: 0;
       border: none;
       border: 1px solid var(--primary-low);
-      box-shadow: shadow("dropdown");
+      box-shadow: var(--shadow-dropdown);
       background: var(--secondary);
       max-width: 600px;
     }
@@ -213,15 +213,15 @@
     }
 
     &.is-highlighted {
-      background: var(--highlight-medium);
+      background: var(--d-hover);
     }
 
     &.is-selected {
-      background: var(--tertiary-low);
+      background: var(--d-selected);
     }
 
     &.is-selected.is-highlighted {
-      background: var(--highlight-medium);
+      background: var(--d-hover);
     }
 
     .discourse-tag,
@@ -245,7 +245,7 @@
     width: 100%;
 
     &:hover .select-kit-row.is-highlighted:hover {
-      background: var(--highlight-medium);
+      background: var(--d-hover);
     }
 
     .validation-message {
@@ -278,6 +278,7 @@
     align-items: center;
     justify-content: space-between;
     width: 100%;
+    position: relative;
 
     .filter-input {
       background: none;
@@ -321,7 +322,6 @@
   }
 
   .no-content,
-  .is-loading,
   .results-count {
     display: flex;
     flex: 1 0 auto;
@@ -345,8 +345,25 @@
     white-space: nowrap;
   }
 
-  .is-loading {
-    align-items: flex-start;
-    justify-content: center;
+  @keyframes lineDrawToRight {
+    0% {
+      width: 0;
+    }
+    100% {
+      width: 100%;
+    }
+  }
+
+  &.is-loading {
+    .select-kit-filter::after {
+      content: "";
+      position: absolute;
+      background: var(--tertiary);
+      width: 100%;
+      height: 2px;
+      left: 0;
+      bottom: 0;
+      animation: lineDrawToRight 0.5s ease-in;
+    }
   }
 }
diff --git a/app/assets/stylesheets/common/software-update-prompt.scss b/app/assets/stylesheets/common/software-update-prompt.scss
index 812b7e26872..3fb47e6ee85 100644
--- a/app/assets/stylesheets/common/software-update-prompt.scss
+++ b/app/assets/stylesheets/common/software-update-prompt.scss
@@ -9,7 +9,7 @@
   max-height: 0;
   overflow: hidden;
   transition: max-height 0.3s;
-  box-shadow: shadow("header");
+  box-shadow: var(--shadow-header);
   z-index: z("header") - 10;
 
   .update-prompt-main-content {
diff --git a/app/assets/stylesheets/common/topic-entrance.scss b/app/assets/stylesheets/common/topic-entrance.scss
index 8e04f2e33f0..21fee2bc2b7 100644
--- a/app/assets/stylesheets/common/topic-entrance.scss
+++ b/app/assets/stylesheets/common/topic-entrance.scss
@@ -2,7 +2,7 @@
   border: 1px solid var(--primary-low);
   padding: 5px;
   background: var(--secondary);
-  box-shadow: shadow("card");
+  box-shadow: var(--shadow-card);
   z-index: z("dropdown");
 
   position: absolute;
diff --git a/app/assets/stylesheets/common/topic-timeline.scss b/app/assets/stylesheets/common/topic-timeline.scss
index dcf6afb5236..2d796d0a5ef 100644
--- a/app/assets/stylesheets/common/topic-timeline.scss
+++ b/app/assets/stylesheets/common/topic-timeline.scss
@@ -5,13 +5,8 @@
 .timeline-container {
   box-sizing: border-box;
   z-index: z("timeline");
-  transform: translateZ(0);
 
   &.timeline-docked-bottom {
-    margin-bottom: -4em;
-    @media screen and (prefers-reduced-motion: no-preference) {
-      transition: margin-bottom 0.5s ease-in;
-    }
     .timeline-footer-controls {
       opacity: 0;
       pointer-events: none;
@@ -55,7 +50,7 @@
     left: 0;
     right: 0;
     border-top: 1px solid var(--primary-low);
-    box-shadow: shadow("composer");
+    box-shadow: var(--shadow-composer);
     padding: 20px 0px;
     z-index: z("fullscreen");
     @media screen and (max-height: 425px) {
@@ -139,7 +134,7 @@
       .timeline-scrollarea-wrapper {
         display: table-cell;
         padding-right: 1.5em;
-        width: 100px;
+        width: 7em;
       }
       .timeline-scrollarea {
         border-right: 1px solid var(--tertiary-low-or-tertiary-high);
@@ -184,6 +179,7 @@
   .topic-timeline {
     transition: opacity 0.2s ease-in;
     touch-action: none;
+    min-width: 6em;
 
     .timeline-controls {
       margin-bottom: 1em;
@@ -195,17 +191,17 @@
     }
 
     .timeline-footer-controls {
-      margin-top: 1.5em;
+      // this is absolutely positioned to avoid
+      // adding extra height below short topics
+      // above the topic-footer-controls
+      position: absolute;
+      margin-top: 1em;
       @media (prefers-reduced-motion: no-preference) {
         transition: opacity 0.2s ease-in;
       }
       display: flex;
+      gap: 0.5em;
       flex-wrap: wrap;
-      max-width: 9em;
-
-      .reply-to-post {
-        margin-right: 0.5em;
-      }
 
       button:last-child {
         margin-right: 0;
@@ -251,6 +247,7 @@
       float: left;
       z-index: z("base") + 1;
       outline: 1px solid transparent;
+      margin-left: 0.5px;
     }
 
     .timeline-scroller-content {
@@ -259,11 +256,12 @@
       overflow: hidden;
       padding-left: 1em;
       position: absolute; // prevents text length from impacting width
+      max-height: 3em; // this hides the date when the count + date would wrap to more than 2 lines
     }
 
     .timeline-ago {
       color: var(--primary-med-or-secondary-med);
-      max-width: 70px;
+      max-width: 4.6em;
       overflow: hidden;
       text-overflow: ellipsis;
     }
diff --git a/app/assets/stylesheets/desktop/_index.scss b/app/assets/stylesheets/desktop/_index.scss
index 5dbba18c245..cc19e6532e8 100644
--- a/app/assets/stylesheets/desktop/_index.scss
+++ b/app/assets/stylesheets/desktop/_index.scss
@@ -11,7 +11,6 @@
 @import "login";
 @import "menu-panel";
 @import "modal";
-@import "new-user";
 @import "topic-list";
 @import "topic-post";
 @import "topic";
diff --git a/app/assets/stylesheets/desktop/category-list.scss b/app/assets/stylesheets/desktop/category-list.scss
index 90d95baac6a..9b8b0b06cb1 100644
--- a/app/assets/stylesheets/desktop/category-list.scss
+++ b/app/assets/stylesheets/desktop/category-list.scss
@@ -92,7 +92,7 @@
 
   tbody {
     .category {
-      border-left: 6px solid;
+      border-left: 6px solid var(--category-color, var(--primary-low));
       h3,
       h4 {
         line-height: var(--line-height-medium);
diff --git a/app/assets/stylesheets/desktop/components/user-card.scss b/app/assets/stylesheets/desktop/components/user-card.scss
index b298a5f8cae..e048b9ca956 100644
--- a/app/assets/stylesheets/desktop/components/user-card.scss
+++ b/app/assets/stylesheets/desktop/components/user-card.scss
@@ -1,7 +1,6 @@
 // shared styles for user and group cards
 .user-card,
 .group-card {
-  position: absolute;
   z-index: z("usercard");
   &.fixed {
     position: fixed;
diff --git a/app/assets/stylesheets/desktop/components/user-stream-item.scss b/app/assets/stylesheets/desktop/components/user-stream-item.scss
index 70aa8530aea..d094f02a64b 100644
--- a/app/assets/stylesheets/desktop/components/user-stream-item.scss
+++ b/app/assets/stylesheets/desktop/components/user-stream-item.scss
@@ -1,11 +1,5 @@
 // Desktop styles for "user-stream-item" component
 .user-stream {
-  .time,
-  .delete-info,
-  .draft-type {
-    margin-right: 8px;
-  }
-
   .notification {
     &.unread {
       background-color: var(--tertiary-low);
diff --git a/app/assets/stylesheets/desktop/compose.scss b/app/assets/stylesheets/desktop/compose.scss
index 9c7e1da0617..5b9b4e1cbe2 100644
--- a/app/assets/stylesheets/desktop/compose.scss
+++ b/app/assets/stylesheets/desktop/compose.scss
@@ -75,7 +75,6 @@
   .open {
     .grippie {
       padding: 7px 0;
-      margin-top: -17px;
     }
   }
 }
@@ -90,8 +89,8 @@
   overflow-y: auto;
   z-index: z("composer", "dropdown") + 1;
   padding: 1.5em;
-  box-shadow: shadow("dropdown");
-  background: var(--highlight-medium);
+  box-shadow: var(--shadow-dropdown);
+  background: var(--highlight-bg);
 
   &.urgent {
     background: var(--danger-low);
@@ -227,7 +226,6 @@ a.toggle-preview {
 
 #draft-status,
 #file-uploading {
-  flex-grow: 1;
   text-align: right;
 }
 
@@ -306,4 +304,7 @@ a.toggle-preview {
   padding: 0.5em 0.75em;
   pointer-events: none;
   border-radius: 2px;
+  kbd {
+    background: none;
+  }
 }
diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss
index 32e1fd72a05..90c36632750 100644
--- a/app/assets/stylesheets/desktop/discourse.scss
+++ b/app/assets/stylesheets/desktop/discourse.scss
@@ -200,6 +200,9 @@ body.has-sidebar-page {
   #main-outlet-wrapper {
     grid-template-columns: var(--d-sidebar-width) minmax(0, 1fr);
     gap: 0 2em;
+    @include breakpoint(large) {
+      gap: 0 1em;
+    }
     padding-left: 0;
   }
 }
diff --git a/app/assets/stylesheets/desktop/login.scss b/app/assets/stylesheets/desktop/login.scss
index 6db9f4e7ac2..c369f81a9ef 100644
--- a/app/assets/stylesheets/desktop/login.scss
+++ b/app/assets/stylesheets/desktop/login.scss
@@ -274,7 +274,7 @@
   .login-welcome-header {
     grid-area: header;
     padding: 3em 2em 1em;
-
+    background-color: var(--secondary);
     .login-title {
       font-size: var(--font-up-6);
       line-height: var(--line-height-medium);
@@ -417,7 +417,7 @@
   }
   .invite-form,
   .invite-success {
-    box-shadow: shadow("card");
+    box-shadow: var(--shadow-card);
   }
 }
 
@@ -437,7 +437,9 @@
       width: 100%;
     }
 
-    .modal-body:not(.reorder-categories):not(.poll-ui-builder):not(.poll-breakdown) {
+    .modal-body:not(.reorder-categories):not(.poll-ui-builder):not(
+        .poll-breakdown
+      ) {
       max-height: 90vh !important; // overrides base/modal.scss
     }
     .login-welcome-header,
diff --git a/app/assets/stylesheets/desktop/menu-panel.scss b/app/assets/stylesheets/desktop/menu-panel.scss
index 7e1e4d245a1..31353191325 100644
--- a/app/assets/stylesheets/desktop/menu-panel.scss
+++ b/app/assets/stylesheets/desktop/menu-panel.scss
@@ -11,12 +11,12 @@
 // Sidebar-hamburger hybrid
 
 .hamburger-panel .revamped {
-  --d-sidebar-highlight-color: var(--highlight-medium);
+  --d-sidebar-highlight-background: var(--d-hover);
   --d-sidebar-row-horizontal-padding: 0.5rem;
   --d-sidebar-row-height: 30px;
   // 1.25rem gets text left-aligned with the hamburger icon
   --d-sidebar-row-horizontal-padding: 0.66rem;
-  --d-sidebar-row-vertical-padding: 0.33rem;
+  width: 360px;
 
   .panel-body-content {
     width: 100%;
@@ -30,13 +30,35 @@
 
     .sidebar-section-link.active {
       font-weight: normal;
-      color: var(--primary-high);
-      background: var(--tertiary-low);
+      background: var(--d-hover);
     }
 
     .sidebar-section-header-wrapper .select-kit .btn:hover {
       background: transparent;
     }
+
+    &.sidebar-section {
+      padding-top: 0.5em;
+      .sidebar-section-header-wrapper {
+        margin: 0 0 0.5em;
+        padding-bottom: 0.25em;
+        border-bottom: 1px solid var(--primary-low);
+        .d-icon-globe {
+          color: var(--primary-medium);
+        }
+      }
+      ul {
+        display: grid;
+        grid-template-columns: 1fr 1fr;
+        li {
+          min-width: 0;
+        }
+      }
+    }
+
+    .sidebar-section-message {
+      padding: 0;
+    }
   }
 
   .sidebar-section-link-wrapper
@@ -47,11 +69,28 @@
 
   .sidebar-footer-wrapper {
     padding: 0;
+    margin-top: 1em;
     .sidebar-footer-container {
       padding: 0;
+      border: none;
+      background: var(--secondary);
       &:before {
-        top: calc(-100% + 2px);
+        top: -1.5em;
+        background: linear-gradient(
+          to bottom,
+          transparent,
+          rgba(var(--secondary-rgb), 1)
+        );
       }
     }
   }
 }
+
+.sidebar-hamburger-dropdown {
+  .discourse-no-touch & {
+    .sidebar-section-wrapper .sidebar-section-header-wrapper:hover,
+    .sidebar-section-wrapper .sidebar-section-header-wrapper:focus-within {
+      background: transparent;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/desktop/modal.scss b/app/assets/stylesheets/desktop/modal.scss
index 5c5a63753a8..294c8551c7d 100644
--- a/app/assets/stylesheets/desktop/modal.scss
+++ b/app/assets/stylesheets/desktop/modal.scss
@@ -50,7 +50,7 @@
 .choose-topic-modal {
   .modal-body {
     position: relative;
-    height: 350px;
+    min-height: 350px;
   }
 
   #choosing-topic {
@@ -76,7 +76,6 @@
     button {
       margin-top: 10px;
       display: block;
-      width: 300px;
     }
 
     form {
@@ -123,8 +122,3 @@
     max-width: 100vw; // prevent overflow if user font-size is enormous
   }
 }
-
-.json-editor-btn-delete {
-  @extend .btn-danger !optional;
-  @extend .no-text !optional;
-}
diff --git a/app/assets/stylesheets/desktop/new-user.scss b/app/assets/stylesheets/desktop/new-user.scss
deleted file mode 100644
index 3d9f9801e7d..00000000000
--- a/app/assets/stylesheets/desktop/new-user.scss
+++ /dev/null
@@ -1,69 +0,0 @@
-.new-user-wrapper {
-  .new-user-content-wrapper {
-    // Grid layout
-    width: 100%;
-    display: grid;
-    grid-template-columns: 1fr 5fr;
-    grid-template-rows: auto 1fr;
-    grid-gap: 0;
-
-    .user-navigation-secondary {
-      grid-column-start: 1;
-      grid-column-end: 3;
-      grid-row-start: 1;
-      grid-row-end: 2;
-
-      display: flex;
-      flex-direction: row;
-    }
-
-    .user-navigation-secondary ~ .user-content {
-      grid-column-start: 1;
-      grid-column-end: 3;
-      grid-row-start: 2;
-      grid-row-end: 3;
-    }
-
-    .user-content {
-      padding: 0;
-      margin-top: 2em;
-      grid-column-start: 1;
-      grid-column-end: 3;
-      grid-row-start: 1;
-      grid-row-end: 3;
-    }
-
-    .user-additional-controls {
-      align-self: start;
-      justify-self: start;
-      grid-row-start: 2;
-    }
-
-    // For backwards compatibility with legacy design
-    .user-secondary-navigation {
-      margin-top: 2em;
-      grid-column-start: 1;
-      grid-column-end: 2;
-    }
-
-    // For backwards compatibility with legacy design
-    .user-secondary-navigation ~ .user-content {
-      min-width: 100%;
-      grid-column-start: 2;
-      grid-column-end: 3;
-    }
-  }
-
-  .user-nav-dropdown-list-item {
-    position: relative;
-  }
-
-  .user-nav-dropdown-submenu-wrapper {
-    position: absolute;
-    top: 2em;
-    min-width: 10em;
-    padding: 0;
-    box-shadow: shadow("dropdown");
-    z-index: z("dropdown");
-  }
-}
diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss
index 30d21f8ad1c..ed6382ba705 100644
--- a/app/assets/stylesheets/desktop/topic-list.scss
+++ b/app/assets/stylesheets/desktop/topic-list.scss
@@ -89,9 +89,8 @@
   }
   .posters a:first-child .avatar.latest:not(.single) {
     box-shadow: 0 0 3px 1px rgba(var(--tertiary-rgb), 0.35);
-    border: 2px solid rgba(var(--tertiary-rgb), 0.5);
+    border: 1px solid rgba(var(--tertiary-rgb), 0.5);
     position: relative;
-    top: -2px;
     left: -2px;
   }
 
@@ -203,10 +202,10 @@
     }
     // reduce width for more title space
     .posts {
-      width: 50px;
+      width: 3em;
     }
     .posters {
-      width: 30px;
+      width: 2em;
       text-align: center;
     }
     // show only the first poster
@@ -229,45 +228,24 @@
 }
 
 @include breakpoint(medium) {
-  // slightly smaller font, tighten spacing on nav pills
   .nav-pills {
     > li > a {
       font-size: var(--font-0);
-      padding: 7px 10px;
+      padding: 0.45em 0.67em;
     }
   }
 
   .topic-list {
-    // tighter table header spacing
-    .topic-list-item .topic-list-data:first-of-type {
-      padding: 12px 5px;
-    }
-    // smaller table cell spacing
     .topic-list-data {
-      padding: 10px;
       font-size: var(--font-0);
     }
   }
+
+  .topic-list-header {
+    font-size: var(--font-down-1);
+  }
 }
 
 .container.list-container {
   position: relative;
 }
-
-.welcome-cta {
-  background-color: var(--secondary);
-  border: 1px solid var(--primary-low);
-  box-shadow: shadow("menu-panel");
-  border-radius: 4px;
-  padding: 12px 20px;
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  z-index: z("usercard");
-  &__content {
-    width: 70%;
-  }
-  &__button {
-    align-self: center;
-  }
-}
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 49524a9114b..b998de7272c 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -203,7 +203,7 @@ pre.codeblock-buttons:hover {
     margin-left: var(--topic-avatar-width);
     width: calc(
       var(--topic-body-width) + (var(--topic-body-width-padding) * 2) +
-        var(--topic-avatar-width) - (var(--topic-avatar-width + 2px))
+        var(--topic-avatar-width) - (var(--topic-avatar-width) + 2px)
     ); // 2px accounts for left and right borders
     .row {
       border-bottom: none;
@@ -325,6 +325,14 @@ pre.codeblock-buttons:hover {
       background: var(--primary-low);
     }
   }
+
+  .toggle-summary .summarization-buttons .top-replies {
+    margin-left: 10px;
+  }
+
+  .toggle-summary .summary-box {
+    margin-top: 10px;
+  }
 }
 
 #topic-footer-buttons {
@@ -354,11 +362,17 @@ pre.codeblock-buttons:hover {
   }
 }
 
-.suggested-topics {
-  margin: 4.5em 0 1em;
+.more-content-wrapper.single-list {
+  .more-content-topics {
+    width: 100%;
+  }
+}
 
-  table {
-    margin-top: 10px;
+.more-content-topics {
+  margin-top: 2em;
+
+  .suggested-topics-message {
+    display: none;
   }
 }
 
@@ -543,7 +557,7 @@ blockquote {
   width: 200px;
   position: fixed;
   z-index: z("dropdown") + 1; // 1 higher than .select-posts
-  box-shadow: shadow("card");
+  box-shadow: var(--shadow-card);
   padding: 0.714em;
   margin-bottom: 5px;
   right: 10px;
diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss
index 270e3cf8211..5a33ab04bd4 100644
--- a/app/assets/stylesheets/desktop/topic.scss
+++ b/app/assets/stylesheets/desktop/topic.scss
@@ -101,7 +101,7 @@
 }
 
 #topic-filter {
-  background-color: var(--highlight-medium);
+  background-color: var(--highlight-bg);
   padding: 8px;
   bottom: 0;
   position: fixed;
@@ -135,3 +135,26 @@
     max-width: 100%;
   }
 }
+
+.more-content-wrapper {
+  display: flex;
+  justify-content: space-around;
+
+  .topic-list-header,
+  .posts-map,
+  .views {
+    display: none;
+  }
+
+  .topic-list-body {
+    border-top: none;
+
+    .topic-list-item {
+      padding-left: 5px;
+    }
+
+    .topic-list-item:last-of-type {
+      border-bottom: none;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss
index 461e60a0a43..9444c63de6d 100644
--- a/app/assets/stylesheets/desktop/user.scss
+++ b/app/assets/stylesheets/desktop/user.scss
@@ -88,6 +88,8 @@
 }
 
 .user-content {
+  padding: 0;
+  margin-top: 2em;
   padding-bottom: 12px;
   margin-bottom: 12px;
   background-color: var(--secondary);
@@ -96,10 +98,6 @@
   .btn.right {
     float: right;
   }
-
-  h2 {
-    margin-bottom: 10px;
-  }
 }
 
 .pref-avatar {
@@ -158,30 +156,12 @@ table.user-invite-list {
         margin: 0 20px 10px 0;
       }
 
-      .primary {
-        .primary-textual {
-          padding: 0 4px 4px;
-          h1 {
-            max-width: 100%;
-            @include ellipsis;
-          }
-          .location-and-website {
-            display: flex;
-            max-width: 100%;
-            @include ellipsis;
-            .user-profile-location {
-              margin-right: 1em;
-            }
-          }
-        }
-
-        .bio {
-          max-width: 750px;
-        }
+      .primary-textual {
+        padding: 0 0 0.5em;
       }
 
-      .secondary {
-        margin-top: 16px;
+      .bio {
+        max-width: 750px;
       }
     }
 
@@ -198,8 +178,6 @@ table.user-invite-list {
     }
 
     .controls {
-      padding: 0 0 12px 0;
-      float: right;
       max-width: 13.5em;
 
       li {
@@ -275,19 +253,11 @@ table.user-invite-list {
 }
 
 .user-preferences {
-  padding-top: 10px;
-  padding-left: 30px;
-
   .form-vertical {
     width: 500px;
     max-width: 100%;
   }
 
-  h3 {
-    color: var(--primary);
-    margin: 20px 0 10px 0;
-  }
-
   .category-selector,
   .tag-chooser,
   textarea,
diff --git a/app/assets/stylesheets/embed.scss b/app/assets/stylesheets/embed.scss
index ec80280405d..85d7b15749d 100644
--- a/app/assets/stylesheets/embed.scss
+++ b/app/assets/stylesheets/embed.scss
@@ -84,7 +84,7 @@ article.post {
     color: var(--primary-high);
   }
   a.staff {
-    background-color: var(--highlight-low);
+    background-color: var(--highlight-bg);
   }
 
   a.new-user {
diff --git a/app/assets/stylesheets/mobile/_index.scss b/app/assets/stylesheets/mobile/_index.scss
index 1fc0b0e8d7f..c7e7e42bcbc 100644
--- a/app/assets/stylesheets/mobile/_index.scss
+++ b/app/assets/stylesheets/mobile/_index.scss
@@ -23,7 +23,6 @@
 @import "personal-message";
 @import "push-notifications-mobile";
 @import "reviewables";
-@import "ring";
 @import "search";
 @import "tagging";
 @import "topic-list";
diff --git a/app/assets/stylesheets/mobile/components/user-card.scss b/app/assets/stylesheets/mobile/components/user-card.scss
index dc4b715a950..f114ed1647e 100644
--- a/app/assets/stylesheets/mobile/components/user-card.scss
+++ b/app/assets/stylesheets/mobile/components/user-card.scss
@@ -1,9 +1,6 @@
-$avatar_width: 120px;
-
 // shared styles for user and group cards
 .user-card,
 .group-card {
-  position: fixed;
   // mobile cards should always be on top of everything - 1102
   z-index: z("mobile-composer") + 2;
   max-width: 95vw;
@@ -13,13 +10,16 @@ $avatar_width: 120px;
   .first-row {
     flex-wrap: wrap;
     .names {
-      flex: 1 1 calc(100% - #{$avatar_width});
+      flex: 1 1 auto;
       box-sizing: border-box;
     }
+    .user-card-avatar {
+      flex: 0 0 auto;
+    }
     .usercard-controls {
+      width: 100%; // always wraps to next line
       --usercard-control-margin: 0.25em;
       display: flex;
-      flex: 1;
       flex-wrap: wrap;
       margin: 1em calc(var(--usercard-control-margin) * -1) 0;
       li {
diff --git a/app/assets/stylesheets/mobile/compose.scss b/app/assets/stylesheets/mobile/compose.scss
index 136eb8880a9..fde97dd9771 100644
--- a/app/assets/stylesheets/mobile/compose.scss
+++ b/app/assets/stylesheets/mobile/compose.scss
@@ -94,15 +94,25 @@
   }
 
   .category-input,
-  .with-tags .category-input {
+  .with-tags.with-category .category-input {
     margin-bottom: 6px;
     max-width: calc(50% - 3px);
   }
 
   .submit-panel {
     margin-top: 6px;
+    flex-wrap: wrap;
+    gap: 0.25em 0;
+
+    .create {
+      max-width: 50vw;
+      span {
+        @include ellipsis;
+      }
+    }
 
     .save-or-cancel {
+      margin-right: 0.5em;
       flex: 1 1 auto;
 
       #draft-status,
@@ -199,19 +209,6 @@
       margin: 0 0 6px 6px;
       max-width: calc(50% - 3px);
     }
-
-    .selected-name {
-      .name {
-        font-size: var(--font-down-1);
-        .badge-wrapper {
-          font-size: var(--font-0);
-        }
-      }
-    }
-
-    .formatted-selection {
-      font-size: var(--font-down-1);
-    }
   }
 
   .without-tags {
diff --git a/app/assets/stylesheets/mobile/directory.scss b/app/assets/stylesheets/mobile/directory.scss
index 8965198565c..b1de306686f 100644
--- a/app/assets/stylesheets/mobile/directory.scss
+++ b/app/assets/stylesheets/mobile/directory.scss
@@ -21,35 +21,6 @@
     color: var(--primary-medium);
     padding: 5px;
   }
-
-  .user {
-    border-top: 1px solid var(--primary-low);
-    padding: 1em;
-    display: flex;
-    flex-wrap: wrap;
-
-    .user-info {
-      width: 100%;
-      margin-bottom: 1em;
-    }
-
-    .user-stat {
-      flex: 1 1 50%;
-      .value {
-        font-weight: bold;
-        &.user-field {
-          font-size: var(--font-down-1);
-        }
-      }
-      .label {
-        margin-left: 0.2em;
-        color: var(--primary-medium);
-      }
-      .d-icon-heart {
-        color: var(--love);
-      }
-    }
-  }
 }
 
 .edit-user-directory-columns-modal .modal-inner-container {
diff --git a/app/assets/stylesheets/mobile/group.scss b/app/assets/stylesheets/mobile/group.scss
index b17274c17e0..56a5002b246 100644
--- a/app/assets/stylesheets/mobile/group.scss
+++ b/app/assets/stylesheets/mobile/group.scss
@@ -16,32 +16,6 @@
   position: relative;
 }
 
-.group-members {
-  .group-member {
-    border-top: 1px solid var(--primary-low);
-
-    .user-info {
-      margin: 0;
-      padding: 0.5em;
-      width: 98%;
-    }
-
-    .btn-group {
-      margin-top: 0;
-    }
-
-    .group-member-info {
-      color: var(--primary-medium);
-
-      label {
-        margin-bottom: 0;
-        font-weight: bold;
-        display: inline-block;
-      }
-    }
-  }
-}
-
 .group-info {
   flex-wrap: wrap;
   .group-details-button button {
diff --git a/app/assets/stylesheets/mobile/header.scss b/app/assets/stylesheets/mobile/header.scss
index 2d8b256c23f..84832353ea6 100644
--- a/app/assets/stylesheets/mobile/header.scss
+++ b/app/assets/stylesheets/mobile/header.scss
@@ -5,26 +5,10 @@
 .d-header {
   height: 3.66em;
 
-  // some protection for text-only site titles
   .title {
-    max-width: 75%;
-    @include ellipsis;
-    animation: fadein 0.5s;
-    // This acts as a placeholder if for some reason the small logo takes a while
-    // to load - prevents topic title from shifting after the small logo loads.
-    // It's hardcoded to 36px because that's the width we use inline for the small
-    // logo in the home-logo widget.
-    min-width: 36px;
-    a {
-      display: block;
-      width: 100%;
-    }
+    --d-logo-height: 2.4em;
   }
 
-  #site-logo {
-    max-height: 2.4em;
-    max-width: 100%;
-  }
   #site-text-logo {
     font-size: var(--font-up-1);
   }
@@ -53,7 +37,8 @@
   }
 
   // Hide header avatar + icons while topic title is visible in mobile header
-  .extra-info-wrapper + .panel {
+  .extra-info-wrapper ~ .panel {
+    .before-header-panel-outlet,
     .header-buttons,
     .d-header-icons {
       display: none;
diff --git a/app/assets/stylesheets/mobile/history.scss b/app/assets/stylesheets/mobile/history.scss
index 6890c832b83..0bfb38882e8 100644
--- a/app/assets/stylesheets/mobile/history.scss
+++ b/app/assets/stylesheets/mobile/history.scss
@@ -8,9 +8,6 @@
   .modal-inner-container {
     min-height: 400px;
   }
-  #revisions {
-    max-width: 90vw;
-  }
   #revision-numbers {
     line-height: var(--line-height-large);
   }
diff --git a/app/assets/stylesheets/mobile/menu-panel.scss b/app/assets/stylesheets/mobile/menu-panel.scss
index c5d8a744704..247ab540a82 100644
--- a/app/assets/stylesheets/mobile/menu-panel.scss
+++ b/app/assets/stylesheets/mobile/menu-panel.scss
@@ -1,19 +1,3 @@
-.user-menu .quick-access-panel.quick-access-profile li:not(.show-all) {
-  border-bottom: 1px solid var(--primary-low);
-
-  a,
-  button {
-    // accounts for menu "ears" 4px + border 1px
-    padding: 0.75em calc(0.5em + 4px + 1px);
-    margin: 0.25em;
-    @media screen and (max-height: 500px) {
-      // reduce padding to avoid scroll
-      padding-top: 0.25em;
-      padding-bottom: 0.25em;
-    }
-  }
-}
-
 .panel-body-contents {
   // 2em padding very useful for iOS Safari's overlayed bottom nav
   // padding-bottom: calc(env(safe-area-inset-bottom) + 2em);
@@ -31,10 +15,7 @@
 
 .hamburger-panel .revamped {
   --d-sidebar-row-horizontal-padding: 1rem;
-  --d-sidebar-highlight-color: var(--primary-low);
-  --d-sidebar-row-font-size: var(--font-0);
-  --d-sidebar-row-height: 32px;
-  --d-sidebar-section-header-text-font-size: var(--font-0);
+  --d-sidebar-highlight-backgrond: var(--primary-low);
   box-sizing: border-box;
   padding: 0;
 
@@ -52,10 +33,6 @@
       padding-top: 0;
       padding-bottom: 0.25em;
     }
-
-    .sidebar-section-message {
-      padding: 0;
-    }
   }
 
   .sidebar-section-wrapper {
@@ -86,4 +63,11 @@
   .sidebar-section-content {
     padding-bottom: 0;
   }
+
+  .sidebar-section-header-wrapper {
+    .d-icon-globe {
+      color: var(--primary-medium);
+      font-size: var(--font-down-1);
+    }
+  }
 }
diff --git a/app/assets/stylesheets/mobile/modal.scss b/app/assets/stylesheets/mobile/modal.scss
index d004c9309e4..52449258d69 100644
--- a/app/assets/stylesheets/mobile/modal.scss
+++ b/app/assets/stylesheets/mobile/modal.scss
@@ -68,7 +68,6 @@
   button {
     margin-top: 10px;
     display: block;
-    width: 300px;
   }
 
   form {
diff --git a/app/assets/stylesheets/mobile/new-user.scss b/app/assets/stylesheets/mobile/new-user.scss
index 5dbd5aae741..e123d7b5493 100644
--- a/app/assets/stylesheets/mobile/new-user.scss
+++ b/app/assets/stylesheets/mobile/new-user.scss
@@ -1,33 +1,4 @@
 .new-user-wrapper {
-  .user-navigation {
-    width: 100%;
-
-    .nav-pills {
-      overflow-x: auto;
-      scrollbar-width: none;
-
-      &::-webkit-scrollbar {
-        display: none;
-      }
-    }
-  }
-
-  // For backwards compatibility with legacy design
-  .user-secondary-navigation {
-    margin-top: 1.5em;
-  }
-
-  .user-navigation-secondary {
-    font-size: var(--font-up-1);
-
-    .nav-pills {
-      flex-wrap: nowrap;
-      li {
-        flex: 1 0 auto;
-      }
-    }
-  }
-
   .user-messages-page & {
     .user-navigation-secondary {
       display: grid;
@@ -83,43 +54,10 @@
       }
     }
   }
-
-  .user-nav-dropdown-list-item {
-    flex-direction: column;
-  }
-
-  .user-nav-dropdown-chevron {
-    margin-left: auto;
-  }
-
-  .user-nav-dropdown-button {
-    width: 100%;
-  }
-
-  .user-nav-dropdown-submenu {
-    box-sizing: border-box;
-    position: relative;
-    top: 0;
-    box-shadow: none;
-    display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(50%, 1fr));
-    padding: 0.5em 0 1em 1.65em;
-
-    li a {
-      box-sizing: border-box;
-      padding: 0.75em 1em;
-      width: 100%;
-      @include ellipsis;
-    }
-  }
-
-  #navigation-bar {
-    flex-wrap: nowrap;
-  }
 }
 
 .new-user-content-wrapper {
   .user-content {
-    margin-top: 2em;
+    margin-top: 1em;
   }
 }
diff --git a/app/assets/stylesheets/mobile/reviewables.scss b/app/assets/stylesheets/mobile/reviewables.scss
index 847037fa6f4..46c9418e3ad 100644
--- a/app/assets/stylesheets/mobile/reviewables.scss
+++ b/app/assets/stylesheets/mobile/reviewables.scss
@@ -21,7 +21,34 @@
   }
 
   .reviewable-scores {
+    display: flex;
     width: 100%;
+    overflow-x: scroll;
+    border-top: 1px solid var(--primary-low);
+    thead {
+      tr {
+        display: flex;
+        flex-direction: column;
+        border: 0;
+      }
+    }
+
+    tbody {
+      display: flex;
+      border: 0;
+
+      .reviewable-score {
+        display: flex;
+        flex-direction: column;
+      }
+      tr {
+        border: 0;
+      }
+
+      td {
+        white-space: nowrap;
+      }
+    }
   }
 }
 
@@ -58,7 +85,6 @@
 
   > div,
   > button {
-    flex: 0 1 47%;
     margin-right: 0.25em;
     margin-bottom: 0.5em;
   }
diff --git a/app/assets/stylesheets/mobile/ring.scss b/app/assets/stylesheets/mobile/ring.scss
deleted file mode 100644
index 2da82b54c9e..00000000000
--- a/app/assets/stylesheets/mobile/ring.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.ring {
-  top: -7px !important;
-}
diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss
index 39d4a028785..ca766154a56 100644
--- a/app/assets/stylesheets/mobile/topic-list.scss
+++ b/app/assets/stylesheets/mobile/topic-list.scss
@@ -162,11 +162,6 @@
   }
 
   .topic-item-stats {
-    .category,
-    .discourse-tags {
-      // disabling clicks because these targets are too small on mobile
-      pointer-events: none;
-    }
     position: relative;
     display: flex;
     align-items: baseline;
@@ -186,6 +181,51 @@
     }
   }
 
+  .topic-item-stats {
+    span.relative-date {
+      vertical-align: text-top;
+    }
+  }
+
+  .topic-item-stats__category-tags {
+    margin-right: 0.5em;
+
+    .discourse-tags {
+      display: inline;
+    }
+
+    .badge-wrapper,
+    .discourse-tag {
+      // disabling clicks because these targets are too small on mobile
+      pointer-events: none;
+    }
+
+    .discourse-tags .discourse-tag {
+      margin: 0;
+    }
+
+    .badge-wrapper {
+      vertical-align: bottom;
+    }
+
+    .badge-wrapper {
+      &.bullet {
+        + .discourse-tags {
+          .discourse-tag {
+            vertical-align: bottom;
+          }
+        }
+      }
+      &.box {
+        + .discourse-tags {
+          .discourse-tag {
+            vertical-align: text-bottom;
+          }
+        }
+      }
+    }
+  }
+
   .age {
     white-space: nowrap;
     a {
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index 19d7a3f2e06..3fc6eee640a 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -199,6 +199,16 @@ a.reply-to-tab {
     background: var(--blend-primary-secondary-5);
     width: 100%;
   }
+
+  .toggle-summary {
+    .summarization-buttons {
+      flex-direction: column;
+
+      .top-replies {
+        margin-top: 10px;
+      }
+    }
+  }
 }
 
 #topic-footer-buttons {
@@ -242,17 +252,22 @@ a.reply-to-tab {
   }
 }
 
-.suggested-topics {
+.more-content-wrapper {
+  &:not(.single-list) {
+    .more-topics-title {
+      display: none;
+    }
+  }
+
+  .topic-list-data {
+    padding-left: 5px;
+  }
+}
+
+.more-content-topics {
   clear: left;
   padding: 20px 0 15px 0;
-  th.views,
-  td.views,
-  td.activity,
-  th.activity,
-  th.likes,
-  td.likes {
-    display: none;
-  }
+
   a.badge-category,
   a.badge-category-parent {
     font-size: var(--font-down-1);
@@ -328,7 +343,7 @@ pre.codeblock-buttons code {
 }
 
 span.highlighted {
-  background-color: var(--highlight-low);
+  background-color: var(--highlight-bg);
 }
 
 .topic-avatar {
diff --git a/app/assets/stylesheets/mobile/user.scss b/app/assets/stylesheets/mobile/user.scss
index f55a1ade01e..04f5809fd70 100644
--- a/app/assets/stylesheets/mobile/user.scss
+++ b/app/assets/stylesheets/mobile/user.scss
@@ -5,6 +5,7 @@
   grid-template-columns: 1fr 1fr;
   grid-template-rows: auto auto auto;
   grid-gap: 16px;
+  padding-top: 1em;
   .user-primary-navigation {
     grid-column-start: 1;
     grid-row-start: 1;
@@ -102,14 +103,6 @@
     .details {
       margin-bottom: 12px;
 
-      h1 {
-        line-height: var(--line-height-small);
-      }
-
-      h2 {
-        line-height: var(--line-height-medium);
-      }
-
       .user-profile-avatar {
         .avatar-flair {
           right: 2px;
@@ -207,9 +200,7 @@
     }
 
     .controls {
-      order: 3;
       flex: 1 1 25%;
-      margin-left: auto;
 
       .btn {
         margin-bottom: 16px;
@@ -275,7 +266,7 @@
 
 .user-main .collapsed-info.about .details {
   display: flex;
-  margin-bottom: 16px;
+  margin-bottom: 0;
   .user-profile-avatar {
     margin: 0;
     flex: 0 0 auto;
@@ -339,6 +330,10 @@
   .apps .controls button {
     float: right;
   }
+
+  #change-email {
+    width: 100%;
+  }
 }
 
 .user-right {
diff --git a/app/assets/stylesheets/vendor/rotate-center.scss b/app/assets/stylesheets/vendor/rotate-center.scss
new file mode 100644
index 00000000000..1a822753f2b
--- /dev/null
+++ b/app/assets/stylesheets/vendor/rotate-center.scss
@@ -0,0 +1,32 @@
+/* ----------------------------------------------
+ * Generated by Animista on 2023-7-17 8:32:34
+ * Licensed under FreeBSD License.
+ * See http://animista.net/license for more info. 
+ * w: http://animista.net, t: @cssanimista
+ * ---------------------------------------------- */
+
+/**
+ * ----------------------------------------
+ * animation rotate-center
+ * ----------------------------------------
+ */
+ @-webkit-keyframes rotate-center {
+  0% {
+    -webkit-transform: rotate(0);
+            transform: rotate(0);
+  }
+  100% {
+    -webkit-transform: rotate(360deg);
+            transform: rotate(360deg);
+  }
+}
+@keyframes rotate-center {
+  0% {
+    -webkit-transform: rotate(0);
+            transform: rotate(0);
+  }
+  100% {
+    -webkit-transform: rotate(360deg);
+            transform: rotate(360deg);
+  }
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/wcag.scss b/app/assets/stylesheets/wcag.scss
index c42886e905d..9d360984441 100644
--- a/app/assets/stylesheets/wcag.scss
+++ b/app/assets/stylesheets/wcag.scss
@@ -8,15 +8,16 @@
 }
 
 html.discourse-no-touch {
-  .btn-default:not(.btn-flat),
-  .btn-icon:not(.btn-flat) {
+  .btn-default:not(.btn-flat, .btn-danger, .btn-primary),
+  .btn-icon:not(.btn-flat, .btn-danger, .btn-primary) {
     &.btn-default {
       .d-icon {
         color: var(--primary-medium);
       }
     }
     &:hover,
-    &.btn-hover {
+    &.btn-hover,
+    &:focus {
       .d-icon {
         color: var(--secondary);
       }
@@ -27,7 +28,7 @@ html.discourse-no-touch {
   }
   .btn-icon.ok,
   .btn-icon.cancel,
-  .btn-danger {
+  .btn-danger:not(.btn-flat) {
     .d-icon {
       color: var(--secondary);
     }
@@ -35,12 +36,9 @@ html.discourse-no-touch {
   .btn-flat.delete.d-hover {
     background: var(--danger);
   }
-  .menu-links-header {
-    .btn-icon:hover {
-      .d-icon {
-        color: var(--primary);
-      }
-    }
+
+  .select-kit.single-select .select-kit-header:focus {
+    border-color: var(--primary-medium);
   }
 }
 
@@ -52,7 +50,6 @@ html {
   }
 
   // Composer
-
   #reply-control .reply-to .reply-details .d-icon {
     opacity: 1;
     color: var(--primary-low-mid);
@@ -67,6 +64,11 @@ html {
         }
       }
     }
+    .btn-icon:not(.btn-flat, .btn-danger, .btn-primary):focus {
+      .d-icon {
+        color: currentColor;
+      }
+    }
   }
 
   // Site header
@@ -82,11 +84,6 @@ html {
     }
   }
 
-  div.menu-links-header button:hover,
-  div.menu-links-header button:focus {
-    background: var(--tertiary-high);
-  }
-
   .menu-panel .panel-body-bottom .btn:hover {
     .d-icon {
       color: var(--primary);
@@ -142,6 +139,10 @@ html {
     color: var(--primary-high);
   }
 
+  .topic-list .posters a:first-child .avatar.latest:not(.single) {
+    box-shadow: 0 0 0 2px var(--tertiary);
+  }
+
   // Posts
 
   .discourse-no-touch .topic-body .actions .fade-out {
@@ -297,3 +298,23 @@ html {
     background-color: yellow; // resets to browser default
   }
 }
+
+// chat
+
+.no-touch
+  .chat-messages-container
+  .chat-message:hover
+  .chat-message-react-btn:hover {
+  .d-icon {
+    color: var(--primary) !important;
+  }
+}
+
+// sidebar
+
+.sidebar-wrapper
+  .sidebar-sections
+  .sidebar-section-link-suffix.icon.unread
+  svg {
+  color: var(--tertiary);
+}
diff --git a/app/assets/stylesheets/wizard.scss b/app/assets/stylesheets/wizard.scss
index 52cabdcfe8c..45a6656da36 100644
--- a/app/assets/stylesheets/wizard.scss
+++ b/app/assets/stylesheets/wizard.scss
@@ -1,6 +1,3 @@
-$wizard-bg: absolute-image-url("/branded-background.svg");
-$wizard-mobile-bg: absolute-image-url("/branded-background-mobile.svg");
-
 @keyframes bump {
   0% {
     transform: scale(1);
@@ -16,11 +13,7 @@ $wizard-mobile-bg: absolute-image-url("/branded-background-mobile.svg");
 }
 
 body.wizard {
-  background: $wizard-bg;
-  background-size: 110vw 110vh; // crops better than cover at various viewport sizes
-  background-repeat: no-repeat;
-  background-position: bottom;
-  background-color: var(--secondary);
+  background-color: var(--primary-50);
   color: var(--primary-very-high);
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
     Oxygen-Sans, Ubuntu, Cantarell, Arial, sans-serif;
@@ -51,13 +44,6 @@ body.wizard {
       }
     }
   }
-
-  @include breakpoint("mobile-extra-large") {
-    background: $wizard-mobile-bg;
-    background-size: cover;
-    background-repeat: no-repeat;
-    background-position: bottom;
-  }
 }
 
 // Refactored SCSS
@@ -704,6 +690,7 @@ body.wizard {
   .finish-installation {
     .wizard-congratulations-wrap {
       display: flex;
+      gap: 1em;
       @media screen and (max-width: 750px) {
         flex-direction: column-reverse;
       }
@@ -717,13 +704,9 @@ body.wizard {
       margin: 0 auto 1em 0;
     }
 
-    &-image {
-      margin-bottom: 1em;
-    }
-
     .tada {
       height: 15vw;
-      max-height: 10em;
+      max-height: 9em;
     }
 
     .help-text {
diff --git a/app/assets/stylesheets/wizard_rtl.scss b/app/assets/stylesheets/wizard_rtl.scss
new file mode 100644
index 00000000000..f4274872a20
--- /dev/null
+++ b/app/assets/stylesheets/wizard_rtl.scss
@@ -0,0 +1 @@
+@import "wizard";
diff --git a/app/controllers/admin/backups_controller.rb b/app/controllers/admin/backups_controller.rb
index 4a49ba89e0f..7a86b2ef457 100644
--- a/app/controllers/admin/backups_controller.rb
+++ b/app/controllers/admin/backups_controller.rb
@@ -92,7 +92,7 @@ class Admin::BackupsController < Admin::AdminController
       StaffActionLogger.new(current_user).log_backup_download(backup)
 
       if store.remote?
-        redirect_to backup.source
+        redirect_to backup.source, allow_other_host: true
       else
         headers["Content-Length"] = File.size(backup.source).to_s
         send_file backup.source
@@ -246,11 +246,11 @@ class Admin::BackupsController < Admin::AdminController
   end
 
   def valid_extension?(filename)
-    /\.(tar\.gz|t?gz)$/i =~ filename
+    /\.(tar\.gz|t?gz)\z/i =~ filename
   end
 
   def valid_filename?(filename)
-    !!(/^[a-zA-Z0-9\._\-]+$/ =~ filename)
+    !!(/\A[a-zA-Z0-9\._\-]+\z/ =~ filename)
   end
 
   def render_error(message_key)
diff --git a/app/controllers/admin/badges_controller.rb b/app/controllers/admin/badges_controller.rb
index 4efb86cff89..4723622c25d 100644
--- a/app/controllers/admin/badges_controller.rb
+++ b/app/controllers/admin/badges_controller.rb
@@ -15,7 +15,7 @@ class Admin::BadgesController < Admin::AdminController
           .includes(:badge_grouping)
           .includes(:badge_type, :image_upload)
           .references(:badge_grouping)
-          .order("badge_groupings.position, badge_type_id, badges.name")
+          .order("enabled DESC", "badge_groupings.position, badge_type_id, badges.name")
           .to_a,
       protected_system_fields: Badge.protected_system_fields,
       triggers: Badge.trigger_hash,
diff --git a/app/controllers/admin/email_controller.rb b/app/controllers/admin/email_controller.rb
index b165827f4d0..ce97d029d79 100644
--- a/app/controllers/admin/email_controller.rb
+++ b/app/controllers/admin/email_controller.rb
@@ -167,23 +167,18 @@ class Admin::EmailController < Admin::AdminController
       end
     end
 
-    # TODO: 2022-05-01 Remove this route once all sites have migrated over
-    # to using the new email_encoded param.
     if deprecated_email_param_used
-      render plain:
-               "warning: the email parameter is deprecated. all POST requests to this route should be sent with a base64 strict encoded email_encoded parameter instead. email has been received and is queued for processing"
+      warning =
+        "warning: the email parameter is deprecated. all POST requests to this route should be sent with a base64 strict encoded email_encoded parameter instead. email has been received and is queued for processing"
+
+      Discourse.deprecate(warning, drop_from: "3.3.0")
+
+      render plain: warning
     else
       render plain: "email has been received and is queued for processing"
     end
   end
 
-  def raw_email
-    params.require(:id)
-    incoming_email = IncomingEmail.find(params[:id].to_i)
-    text, html = Email.extract_parts(incoming_email.raw)
-    render json: { raw_email: incoming_email.raw, text_part: text, html_part: html }
-  end
-
   def incoming
     params.require(:id)
     incoming_email = IncomingEmail.find(params[:id].to_i)
diff --git a/app/controllers/admin/embeddable_hosts_controller.rb b/app/controllers/admin/embeddable_hosts_controller.rb
index 96e08759af6..56b44de378f 100644
--- a/app/controllers/admin/embeddable_hosts_controller.rb
+++ b/app/controllers/admin/embeddable_hosts_controller.rb
@@ -25,7 +25,6 @@ class Admin::EmbeddableHostsController < Admin::AdminController
   def save_host(host, action)
     host.host = params[:embeddable_host][:host]
     host.allowed_paths = params[:embeddable_host][:allowed_paths]
-    host.class_name = params[:embeddable_host][:class_name]
     host.category_id = params[:embeddable_host][:category_id]
     host.category_id = SiteSetting.uncategorized_category_id if host.category_id.blank?
 
diff --git a/app/controllers/admin/form_templates_controller.rb b/app/controllers/admin/form_templates_controller.rb
new file mode 100644
index 00000000000..968bc521ba2
--- /dev/null
+++ b/app/controllers/admin/form_templates_controller.rb
@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+class Admin::FormTemplatesController < Admin::StaffController
+  before_action :ensure_form_templates_enabled
+
+  def index
+    form_templates = FormTemplate.all.order(:id)
+    render_serialized(form_templates, AdminFormTemplateSerializer, root: "form_templates")
+  end
+
+  def new
+  end
+
+  def preview
+    params.require(:name)
+    params.require(:template)
+
+    if params[:id].present?
+      template = FormTemplate.find(params[:id])
+      template.assign_attributes(name: params[:name], template: params[:template])
+    else
+      template = FormTemplate.new(name: params[:name], template: params[:template])
+    end
+
+    begin
+      template.validate!
+      render json: success_json
+    rescue FormTemplate::NotAllowed => err
+      render_json_error(err.message)
+    end
+  end
+
+  def create
+    params.require(:name)
+    params.require(:template)
+
+    begin
+      template = FormTemplate.create!(name: params[:name], template: params[:template])
+      render_serialized(template, AdminFormTemplateSerializer, root: "form_template")
+    rescue FormTemplate::NotAllowed => err
+      render_json_error(err.message)
+    end
+  end
+
+  def show
+    template = FormTemplate.find(params[:id])
+    render_serialized(template, AdminFormTemplateSerializer, root: "form_template")
+  end
+
+  def edit
+    FormTemplate.find(params[:id])
+  end
+
+  def update
+    template = FormTemplate.find(params[:id])
+
+    begin
+      template.update!(name: params[:name], template: params[:template])
+      render_serialized(template, AdminFormTemplateSerializer, root: "form_template")
+    rescue FormTemplate::NotAllowed => err
+      render_json_error(err.message)
+    end
+  end
+
+  def destroy
+    template = FormTemplate.find(params[:id])
+    template.destroy!
+
+    render json: success_json
+  end
+
+  private
+
+  def ensure_form_templates_enabled
+    raise Discourse::InvalidAccess.new unless SiteSetting.experimental_form_templates
+  end
+end
diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb
index 4d9e581fd3c..bcc17c9fcc3 100644
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -37,42 +37,13 @@ class Admin::GroupsController < Admin::StaffController
     if group.automatic
       can_not_modify_automatic
     else
-      StaffActionLogger.new(current_user).log_group_deletetion(group)
+      StaffActionLogger.new(current_user).log_group_deletion(group)
 
       group.destroy!
       render json: success_json
     end
   end
 
-  def add_owners
-    group = Group.find_by(id: params.require(:id))
-    raise Discourse::NotFound unless group
-
-    return can_not_modify_automatic if group.automatic
-    guardian.ensure_can_edit_group!(group)
-
-    users = User.where(username: group_params[:usernames].split(","))
-
-    users.each do |user|
-      group_action_logger = GroupActionLogger.new(current_user, group)
-
-      if !group.users.include?(user)
-        group.add(user)
-        group_action_logger.log_add_user_to_group(user)
-      end
-      group.group_users.where(user_id: user.id).update_all(owner: true)
-      group_action_logger.log_make_user_group_owner(user)
-
-      if group_params[:notify_users] == "true" || group_params[:notify_users] == true
-        group.notify_added_to_group(user, owner: true)
-      end
-    end
-
-    group.restore_user_count!
-
-    render json: success_json.merge!(usernames: users.pluck(:username))
-  end
-
   def remove_owner
     group = Group.find_by(id: params.require(:id))
     raise Discourse::NotFound unless group
diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb
index b3e9d3bcb2b..ab49a29aa9d 100644
--- a/app/controllers/admin/reports_controller.rb
+++ b/app/controllers/admin/reports_controller.rb
@@ -9,9 +9,9 @@ class Admin::ReportsController < Admin::StaffController
         ApplicationRequest
           .req_types
           .keys
-          .select { |r| r =~ /^page_view_/ && r !~ /mobile/ }
+          .select { |r| r =~ /\Apage_view_/ && r !~ /mobile/ }
           .map { |r| r + "_reqs" } +
-        Report.singleton_methods.grep(/^report_(?!about|storage_stats)/)
+        Report.singleton_methods.grep(/\Areport_(?!about|storage_stats)/)
 
     reports =
       reports_methods.map do |name|
@@ -63,7 +63,7 @@ class Admin::ReportsController < Admin::StaffController
   def show
     report_type = params[:type]
 
-    raise Discourse::NotFound unless report_type =~ /^[a-z0-9\_]+$/
+    raise Discourse::NotFound unless report_type =~ /\A[a-z0-9\_]+\z/
 
     args = parse_params(params)
 
diff --git a/app/controllers/admin/site_settings_controller.rb b/app/controllers/admin/site_settings_controller.rb
index e14c1f45843..55eaf550d8b 100644
--- a/app/controllers/admin/site_settings_controller.rb
+++ b/app/controllers/admin/site_settings_controller.rb
@@ -6,7 +6,7 @@ class Admin::SiteSettingsController < Admin::AdminController
   end
 
   def index
-    render_json_dump(site_settings: SiteSetting.all_settings, diags: SiteSetting.diags)
+    render_json_dump(site_settings: SiteSetting.all_settings)
   end
 
   def update
@@ -229,7 +229,7 @@ class Admin::SiteSettingsController < Admin::AdminController
   private
 
   def is_sidebar_default_setting?(setting_name)
-    %w[default_sidebar_categories default_sidebar_tags].include?(setting_name.to_s)
+    %w[default_navigation_menu_categories default_navigation_menu_tags].include?(setting_name.to_s)
   end
 
   def user_options
@@ -255,14 +255,21 @@ class Admin::SiteSettingsController < Admin::AdminController
       default_text_size: "text_size_key",
       default_title_count_mode: "title_count_mode_key",
       default_hide_profile_and_presence: "hide_profile_and_presence",
+      default_sidebar_link_to_filtered_list: "sidebar_link_to_filtered_list",
+      default_sidebar_show_count_of_new_items: "sidebar_show_count_of_new_items",
     }
   end
 
   def raise_access_hidden_setting(id)
-    # note, as of Ruby 2.3 symbols are GC'd so this is considered safe
-    if SiteSetting.hidden_settings.include?(id.to_sym)
+    id = id.to_sym
+
+    if SiteSetting.hidden_settings.include?(id)
       raise Discourse::InvalidParameters, "You are not allowed to change hidden settings"
     end
+
+    if SiteSetting.plugins[id] && !Discourse.plugins_by_name[SiteSetting.plugins[id]].configurable?
+      raise Discourse::InvalidParameters, "You are not allowed to change unconfigurable settings"
+    end
   end
 
   def tag_notification_level(id)
diff --git a/app/controllers/admin/site_texts_controller.rb b/app/controllers/admin/site_texts_controller.rb
index 041c59128c8..c7700ab61c8 100644
--- a/app/controllers/admin/site_texts_controller.rb
+++ b/app/controllers/admin/site_texts_controller.rb
@@ -20,17 +20,18 @@ class Admin::SiteTextsController < Admin::AdminController
 
   def index
     overridden = params[:overridden] == "true"
+    outdated = params[:outdated] == "true"
     extras = {}
 
     query = params[:q] || ""
 
     locale = fetch_locale(params[:locale])
 
-    if query.blank? && !overridden
+    if query.blank? && !overridden && !outdated
       extras[:recommended] = true
       results = self.class.preferred_keys.map { |k| record_for(key: k, locale: locale) }
     else
-      results = find_translations(query, overridden, locale)
+      results = find_translations(query, overridden, outdated, locale)
 
       if results.any?
         extras[:regex] = I18n::Backend::DiscourseI18n.create_search_regexp(query, as_string: true)
@@ -127,6 +128,26 @@ class Admin::SiteTextsController < Admin::AdminController
     render_serialized(site_text, SiteTextSerializer, root: "site_text", rest_serializer: true)
   end
 
+  def dismiss_outdated
+    locale = fetch_locale(params[:locale])
+    override = TranslationOverride.find_by(locale: locale, translation_key: params[:id])
+
+    raise Discourse::NotFound if override.blank?
+
+    if override.outdated?
+      override.update!(
+        status: "up_to_date",
+        original_translation:
+          I18n.overrides_disabled do
+            I18n.t(TranslationOverride.transform_pluralized_key(params[:id]), locale: :en)
+          end,
+      )
+      render json: success_json
+    else
+      render json: failed_json.merge(message: "Can only dismiss outdated translations"), status: 422
+    end
+  end
+
   def get_reseed_options
     render_json_dump(
       categories: SeedData::Categories.with_default_locale.reseed_options,
@@ -156,11 +177,15 @@ class Admin::SiteTextsController < Admin::AdminController
   end
 
   def record_for(key:, value: nil, locale:)
+    en_key = TranslationOverride.transform_pluralized_key(key)
     value ||= I18n.with_locale(locale) { I18n.t(key) }
-    { id: key, value: value, locale: locale }
+    interpolation_keys =
+      I18nInterpolationKeysFinder.find(I18n.overrides_disabled { I18n.t(en_key, locale: :en) })
+    custom_keys = TranslationOverride.custom_interpolation_keys(en_key)
+    { id: key, value: value, locale: locale, interpolation_keys: interpolation_keys + custom_keys }
   end
 
-  PLURALIZED_REGEX = /(.*)\.(zero|one|two|few|many|other)$/
+  PLURALIZED_REGEX = /(.*)\.(zero|one|two|few|many|other)\z/
 
   def find_site_text(locale)
     if self.class.restricted_keys.include?(params[:id])
@@ -184,10 +209,18 @@ class Admin::SiteTextsController < Admin::AdminController
     raise Discourse::NotFound
   end
 
-  def find_translations(query, overridden, locale)
+  def find_translations(query, overridden, outdated, locale)
     translations = Hash.new { |hash, key| hash[key] = {} }
     search_results = I18n.with_locale(locale) { I18n.search(query, only_overridden: overridden) }
 
+    if outdated
+      outdated_keys =
+        TranslationOverride.where(status: %i[outdated invalid_interpolation_keys]).pluck(
+          :translation_key,
+        )
+      search_results.select! { |k, _| outdated_keys.include?(k) }
+    end
+
     search_results.each do |key, value|
       if PLURALIZED_REGEX.match(key)
         translations[$1][$2] = value
diff --git a/app/controllers/admin/themes_controller.rb b/app/controllers/admin/themes_controller.rb
index 0193e1a841e..2eddce7d13c 100644
--- a/app/controllers/admin/themes_controller.rb
+++ b/app/controllers/admin/themes_controller.rb
@@ -116,7 +116,7 @@ class Admin::ThemesController < Admin::AdminController
           render json: @theme, status: :created
         rescue RemoteTheme::ImportError => e
           if params[:force]
-            theme_name = params[:remote].gsub(/.git$/, "").split("/").last
+            theme_name = params[:remote].gsub(/.git\z/, "").split("/").last
 
             remote_theme = RemoteTheme.new
             remote_theme.private_key = private_key
@@ -215,13 +215,11 @@ class Admin::ThemesController < Admin::AdminController
       @theme.public_send("#{field}=", theme_params[field]) if theme_params.key?(field)
     end
 
-    if theme_params.key?(:child_theme_ids)
-      add_relative_themes!(:child, theme_params[:child_theme_ids])
-    end
+    @theme.child_theme_ids = theme_params[:child_theme_ids] if theme_params.key?(:child_theme_ids)
 
-    if theme_params.key?(:parent_theme_ids)
-      add_relative_themes!(:parent, theme_params[:parent_theme_ids])
-    end
+    @theme.parent_theme_ids = theme_params[:parent_theme_ids] if theme_params.key?(
+      :parent_theme_ids,
+    )
 
     set_fields
     update_settings
@@ -319,24 +317,6 @@ class Admin::ThemesController < Admin::AdminController
     raise Discourse::InvalidAccess if @theme.remote_theme&.is_git?
   end
 
-  def add_relative_themes!(kind, ids)
-    expected = ids.map(&:to_i)
-
-    relation = kind == :child ? @theme.child_theme_relation : @theme.parent_theme_relation
-
-    relation.to_a.each do |relative|
-      if kind == :child && expected.include?(relative.child_theme_id)
-        expected.reject! { |id| id == relative.child_theme_id }
-      elsif kind == :parent && expected.include?(relative.parent_theme_id)
-        expected.reject! { |id| id == relative.parent_theme_id }
-      else
-        relative.destroy
-      end
-    end
-
-    Theme.where(id: expected).each { |theme| @theme.add_relative_theme!(kind, theme) }
-  end
-
   def update_default_theme
     if theme_params.key?(:default)
       is_default = theme_params[:default].to_s == "true"
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 45c8f9313cb..779ac6ea54c 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -115,7 +115,7 @@ class Admin::UsersController < Admin::StaffController
           "user.already_suspended",
           staff: suspend_record.acting_user.username,
           time_ago:
-            FreedomPatches::Rails4.time_ago_in_words(
+            AgeWords.time_ago_in_words(
               suspend_record.created_at,
               true,
               scope: :"datetime.distance_in_words_verbose",
@@ -368,7 +368,7 @@ class Admin::UsersController < Admin::StaffController
           "user.already_silenced",
           staff: silenced_record.acting_user.username,
           time_ago:
-            FreedomPatches::Rails4.time_ago_in_words(
+            AgeWords.time_ago_in_words(
               silenced_record.created_at,
               true,
               scope: :"datetime.distance_in_words_verbose",
@@ -588,6 +588,7 @@ class Admin::UsersController < Admin::StaffController
   def reset_bounce_score
     guardian.ensure_can_reset_bounce_score!(@user)
     @user.user_stat&.reset_bounce_score!
+    StaffActionLogger.new(current_user).log_reset_bounce_score(@user)
     render json: success_json
   end
 
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index f9fbdc5b7f2..6aeed83ee5d 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -346,7 +346,13 @@ class ApplicationController < ActionController::Base
   # disabled. This allows plugins to be disabled programmatically.
   def self.requires_plugin(plugin_name)
     before_action do
-      raise PluginDisabled.new if Discourse.disabled_plugin_names.include?(plugin_name)
+      if plugin = Discourse.plugins_by_name[plugin_name]
+        raise PluginDisabled.new if !plugin.enabled?
+      elsif Rails.env.test?
+        raise "Required plugin '#{plugin_name}' not found. The string passed to requires_plugin should match the plugin's name at the top of plugin.rb"
+      else
+        Rails.logger.warn("Required plugin '#{plugin_name}' not found")
+      end
     end
   end
 
@@ -645,21 +651,21 @@ class ApplicationController < ActionController::Base
           current_user,
           scope: guardian,
           root: false,
-          enable_sidebar_param: params[:enable_sidebar],
+          navigation_menu_param: params[:navigation_menu],
         ),
       ),
     )
 
     report = TopicTrackingState.report(current_user)
+    serializer = TopicTrackingStateSerializer.new(report, scope: guardian, root: false)
 
-    serializer =
-      ActiveModel::ArraySerializer.new(
-        report,
-        each_serializer: TopicTrackingStateSerializer,
-        scope: guardian,
-      )
+    hash = serializer.as_json
 
-    store_preloaded("topicTrackingStates", MultiJson.dump(serializer))
+    store_preloaded("topicTrackingStates", MultiJson.dump(hash[:data]))
+    store_preloaded("topicTrackingStateMeta", MultiJson.dump(hash[:meta]))
+
+    # This is used in the wizard so we can preload fonts using the FontMap JS API.
+    store_preloaded("fontMap", MultiJson.dump(load_font_map)) if current_user.admin?
   end
 
   def custom_html_json
@@ -679,7 +685,7 @@ class ApplicationController < ActionController::Base
 
     DiscoursePluginRegistry.html_builders.each do |name, _|
       if name.start_with?("client:")
-        data[name.sub(/^client:/, "")] = DiscoursePluginRegistry.build_html(name, self)
+        data[name.sub(/\Aclient:/, "")] = DiscoursePluginRegistry.build_html(name, self)
       end
     end
 
@@ -691,16 +697,15 @@ class ApplicationController < ActionController::Base
   end
 
   def banner_json
-    json = ApplicationController.banner_json_cache["json"]
     return "{}" if !current_user && SiteSetting.login_required?
 
-    unless json
-      topic = Topic.where(archetype: Archetype.banner).first
-      banner = topic.present? ? topic.banner : {}
-      ApplicationController.banner_json_cache["json"] = json = MultiJson.dump(banner)
-    end
-
-    json
+    ApplicationController
+      .banner_json_cache
+      .defer_get_set("json") do
+        topic = Topic.where(archetype: Archetype.banner).first
+        banner = topic.present? ? topic.banner : {}
+        MultiJson.dump(banner)
+      end
   end
 
   def custom_emoji
@@ -1066,19 +1071,44 @@ class ApplicationController < ActionController::Base
     request.get? && !(request.format && request.format.json?) && !request.xhr?
   end
 
-  def fetch_limit_from_params(params: self.params, default:, max:)
-    raise "default limit cannot be greater than max limit" if default.present? && default > max
+  def load_font_map
+    DiscourseFonts
+      .fonts
+      .each_with_object({}) do |font, font_map|
+        next if !font[:variants]
+        font_map[font[:key]] = font[:variants].map do |v|
+          {
+            url: "#{Discourse.base_url}/fonts/#{v[:filename]}?v=#{DiscourseFonts::VERSION}",
+            weight: v[:weight],
+          }
+        end
+      end
+  end
 
-    if params.has_key?(:limit)
-      limit =
+  def fetch_limit_from_params(params: self.params, default:, max:)
+    fetch_int_from_params(:limit, params: params, default: default, max: max)
+  end
+
+  def fetch_int_from_params(key, params: self.params, default:, min: 0, max: nil)
+    key = key.to_sym
+
+    if default.present? && ((max.present? && default > max) || (min.present? && default < min))
+      raise "default #{key.inspect} is not between #{min.inspect} and #{max.inspect}"
+    end
+
+    if params.has_key?(key)
+      value =
         begin
-          Integer(params[:limit])
+          Integer(params[key])
         rescue ArgumentError
-          raise Discourse::InvalidParameters.new(:limit)
+          raise Discourse::InvalidParameters.new(key)
         end
 
-      raise Discourse::InvalidParameters.new(:limit) if limit < 0 || limit > max
-      limit
+      if (min.present? && value < min) || (max.present? && value > max)
+        raise Discourse::InvalidParameters.new(key)
+      end
+
+      value
     else
       default
     end
diff --git a/app/controllers/bootstrap_controller.rb b/app/controllers/bootstrap_controller.rb
index 48a31a6e16c..575dd25f78d 100644
--- a/app/controllers/bootstrap_controller.rb
+++ b/app/controllers/bootstrap_controller.rb
@@ -26,8 +26,8 @@ class BootstrapController < ApplicationController
     else
       add_style(mobile_view? ? :mobile : :desktop)
     end
-    add_style(:admin) if staff?
-    add_style(:wizard) if admin?
+    add_style(rtl? ? :admin_rtl : :admin) if staff?
+    add_style(rtl? ? :wizard_rtl : :wizard) if admin?
 
     assets_fake_request = ActionDispatch::Request.new(request.env.dup)
     assets_for_url = params[:for_url]
@@ -44,6 +44,7 @@ class BootstrapController < ApplicationController
         mobile_view: mobile_view?,
         desktop_view: !mobile_view?,
         request: assets_fake_request,
+        rtl: rtl?,
       )
       .each { |file| add_style(file, plugin: true) }
     add_style(mobile_view? ? :mobile_theme : :desktop_theme) if theme_id.present?
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index c907c3829c7..bb289d1fd39 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -196,6 +196,7 @@ class CategoriesController < ApplicationController
       category_params[:minimum_required_tags] = 0 if category_params[:minimum_required_tags]&.blank?
 
       old_permissions = cat.permissions_params
+      old_permissions = { "everyone" => 1 } if old_permissions.empty?
 
       if result = cat.update(category_params)
         Scheduler::Defer.later "Log staff action change category settings" do
@@ -257,7 +258,8 @@ class CategoriesController < ApplicationController
 
   def find_by_slug
     params.require(:category_slug)
-    @category = Category.find_by_slug_path(params[:category_slug].split("/"))
+    @category =
+      Category.includes(:category_setting).find_by_slug_path(params[:category_slug].split("/"))
 
     raise Discourse::NotFound unless @category.present?
 
@@ -325,11 +327,16 @@ class CategoriesController < ApplicationController
 
     if topics_filter == :latest
       result.topic_list = TopicQuery.new(current_user, topic_options).list_latest
+      result.topic_list.more_topics_url =
+        url_for(
+          public_send("latest_path", sort: topic_options[:order] == "created" ? :created : nil),
+        )
     elsif topics_filter == :top
       result.topic_list =
         TopicQuery.new(current_user, topic_options).list_top_for(
           SiteSetting.top_page_default_timeframe.to_sym,
         )
+      result.topic_list.more_topics_url = url_for(public_send("top_path"))
     end
 
     render_serialized(result, CategoryAndTopicListsSerializer, root: false)
@@ -364,7 +371,7 @@ class CategoriesController < ApplicationController
         if SiteSetting.enable_category_group_moderation?
           params[:reviewable_by_group_id] = Group.where(
             name: params[:reviewable_by_group_name],
-          ).pluck_first(:id) if params[:reviewable_by_group_name]
+          ).pick(:id) if params[:reviewable_by_group_name]
         end
 
         result =
@@ -404,11 +411,13 @@ class CategoriesController < ApplicationController
             :read_only_banner,
             :default_list_filter,
             :reviewable_by_group_id,
+            category_setting_attributes: %i[auto_bump_cooldown_days],
             custom_fields: [custom_field_params],
             permissions: [*p.try(:keys)],
             allowed_tags: [],
             allowed_tag_groups: [],
             required_tag_groups: %i[name min_count],
+            form_template_ids: [],
           )
 
         if result[:required_tag_groups] && !result[:required_tag_groups].is_a?(Array)
diff --git a/app/controllers/composer_controller.rb b/app/controllers/composer_controller.rb
index f558a890eb5..d87441a5615 100644
--- a/app/controllers/composer_controller.rb
+++ b/app/controllers/composer_controller.rb
@@ -102,7 +102,7 @@ class ComposerController < ApplicationController
         :not_allowed
       end
 
-    # Regular users can see only basic information why the users cannot see the topic.
+    # Non-staff users can see only basic information why the users cannot see the topic.
     reason = nil if !guardian.is_staff? && reason != :private && reason != :category
 
     reason
diff --git a/app/controllers/composer_messages_controller.rb b/app/controllers/composer_messages_controller.rb
index 3785e257288..f3fffc7fd8e 100644
--- a/app/controllers/composer_messages_controller.rb
+++ b/app/controllers/composer_messages_controller.rb
@@ -22,7 +22,6 @@ class ComposerMessagesController < ApplicationController
     usernames = params.require(:usernames)
     users = ComposerMessagesFinder.user_not_seen_in_a_while(usernames)
     user_count = users.count
-    warning_message = nil
 
     if user_count > 0
       message_locale =
@@ -37,7 +36,7 @@ class ComposerMessagesController < ApplicationController
       user_count: user_count,
       usernames: users,
       time_ago:
-        FreedomPatches::Rails4.time_ago_in_words(
+        AgeWords.time_ago_in_words(
           SiteSetting.pm_warn_user_last_seen_months_ago.month.ago,
           true,
           scope: :"datetime.distance_in_words_verbose",
diff --git a/app/controllers/directory_items_controller.rb b/app/controllers/directory_items_controller.rb
index 15f1451d5a8..fb1531c19e8 100644
--- a/app/controllers/directory_items_controller.rb
+++ b/app/controllers/directory_items_controller.rb
@@ -2,6 +2,7 @@
 
 class DirectoryItemsController < ApplicationController
   PAGE_SIZE = 50
+  before_action :set_groups_exclusion, if: -> { params[:exclude_groups].present? }
 
   def index
     unless SiteSetting.enable_user_directory?
@@ -24,6 +25,8 @@ class DirectoryItemsController < ApplicationController
       result = result.includes(user: :primary_group)
     end
 
+    result = apply_exclude_groups_filter(result)
+
     if params[:exclude_usernames]
       result =
         result
@@ -55,7 +58,7 @@ class DirectoryItemsController < ApplicationController
     end
 
     result = result.includes(:user_stat) if period_type == DirectoryItem.period_types[:all]
-    page = params[:page].to_i
+    page = fetch_int_from_params(:page, default: 0)
 
     user_ids = nil
     if params[:name].present?
@@ -70,7 +73,7 @@ class DirectoryItemsController < ApplicationController
     end
 
     if params[:username]
-      user_id = User.where(username_lower: params[:username].to_s.downcase).pluck_first(:id)
+      user_id = User.where(username_lower: params[:username].to_s.downcase).pick(:id)
       if user_id
         result = result.where(user_id: user_id)
       else
@@ -78,8 +81,10 @@ class DirectoryItemsController < ApplicationController
       end
     end
 
+    limit = fetch_limit_from_params(default: PAGE_SIZE, max: PAGE_SIZE)
+
     result_count = result.count
-    result = result.limit(PAGE_SIZE).offset(PAGE_SIZE * page).to_a
+    result = result.limit(limit).offset(limit * page).to_a
 
     more_params = params.slice(:period, :order, :asc, :group, :user_field_ids).permit!
     more_params[:page] = page + 1
@@ -92,8 +97,10 @@ class DirectoryItemsController < ApplicationController
 
       # Don't show the record unless you're not in the top positions already
       if (position || 10) >= 10
-        your_item = DirectoryItem.where(period_type: period_type, user_id: current_user.id).first
-        result.insert(0, your_item) if your_item
+        unless @users_in_exclude_groups&.include?(current_user.id)
+          your_item = DirectoryItem.where(period_type: period_type, user_id: current_user.id).first
+          result.insert(0, your_item) if your_item
+        end
       end
     end
 
@@ -127,4 +134,17 @@ class DirectoryItemsController < ApplicationController
       },
     )
   end
+
+  private
+
+  def set_groups_exclusion
+    @exclude_group_names = params[:exclude_groups].split("|")
+    @exclude_group_ids = Group.where(name: @exclude_group_names).pluck(:id)
+    @users_in_exclude_groups = GroupUser.where(group_id: @exclude_group_ids).pluck(:user_id)
+  end
+
+  def apply_exclude_groups_filter(result)
+    result = result.where.not(user_id: @users_in_exclude_groups) if params[:exclude_groups]
+    result
+  end
 end
diff --git a/app/controllers/drafts_controller.rb b/app/controllers/drafts_controller.rb
index 4fdce7821dc..ba767b8a5d8 100644
--- a/app/controllers/drafts_controller.rb
+++ b/app/controllers/drafts_controller.rb
@@ -93,11 +93,26 @@ class DraftsController < ApplicationController
   end
 
   def destroy
+    user =
+      if is_api?
+        if @guardian.is_admin?
+          fetch_user_from_params
+        else
+          raise Discourse::InvalidAccess
+        end
+      else
+        current_user
+      end
+
     begin
-      Draft.clear(current_user, params[:id], params[:sequence].to_i)
+      Draft.clear(user, params[:id], params[:sequence].to_i)
     rescue Draft::OutOfSequence
       # nothing really we can do here, if try clearing a draft that is not ours, just skip it.
+      # rendering an error causes issues in the composer
+    rescue StandardError => e
+      return render json: failed_json.merge(errors: e), status: 401
     end
+
     render json: success_json
   end
 end
diff --git a/app/controllers/edit_directory_columns_controller.rb b/app/controllers/edit_directory_columns_controller.rb
index 4b32ca9fb29..b373ef4cb9b 100644
--- a/app/controllers/edit_directory_columns_controller.rb
+++ b/app/controllers/edit_directory_columns_controller.rb
@@ -2,10 +2,9 @@
 
 class EditDirectoryColumnsController < ApplicationController
   requires_login
+  before_action :ensure_staff
 
   def index
-    raise Discourse::NotFound unless guardian.is_staff?
-
     ensure_user_fields_have_columns
 
     columns = DirectoryColumn.includes(:user_field).all
@@ -13,7 +12,6 @@ class EditDirectoryColumnsController < ApplicationController
   end
 
   def update
-    raise Discourse::NotFound unless guardian.is_staff?
     params.require(:directory_columns)
     directory_column_params = params.permit(directory_columns: {})
     directory_columns = DirectoryColumn.all
@@ -26,16 +24,35 @@ class EditDirectoryColumnsController < ApplicationController
       raise Discourse::InvalidParameters, "Must have at least one column enabled"
     end
 
+    new_values = ""
+    previous_values = ""
+    staff_action_logger = StaffActionLogger.new(current_user)
+
     directory_column_params[:directory_columns].values.each do |column_data|
       existing_column = directory_columns.detect { |c| c.id == column_data[:id].to_i }
       if (
-           existing_column.enabled != column_data[:enabled] ||
+           existing_column.enabled != ActiveModel::Type::Boolean.new.cast(column_data[:enabled]) ||
              existing_column.position != column_data[:position].to_i
          )
-        existing_column.update(enabled: column_data[:enabled], position: column_data[:position])
+        new_value, previous_value =
+          staff_action_logger.edit_directory_columns_details(column_data, existing_column)
+
+        new_values += new_value
+        previous_values += previous_value
+
+        existing_column.update(
+          enabled: column_data[:enabled],
+          position: column_data[:position].to_i,
+        )
       end
     end
 
+    details = {}
+
+    staff_action_logger.log_custom(
+      "update_directory_columns",
+      { previous_value: previous_values, new_value: new_values },
+    )
     render json: success_json
   end
 
@@ -48,7 +65,7 @@ class EditDirectoryColumnsController < ApplicationController
         .where(directory_column: { user_field_id: nil })
         .where("show_on_profile=? OR show_on_user_card=?", true, true)
 
-    return unless user_fields_without_column.count > 0
+    return if user_fields_without_column.count <= 0
 
     next_position = DirectoryColumn.maximum("position") + 1
 
diff --git a/app/controllers/embed_controller.rb b/app/controllers/embed_controller.rb
index 8ff1f870c0c..952b2a58a9d 100644
--- a/app/controllers/embed_controller.rb
+++ b/app/controllers/embed_controller.rb
@@ -28,11 +28,11 @@ class EmbedController < ApplicationController
     end
 
     if @embed_id = params[:discourse_embed_id]
-      raise Discourse::InvalidParameters.new(:embed_id) unless @embed_id =~ /^de\-[a-zA-Z0-9]+$/
+      raise Discourse::InvalidParameters.new(:embed_id) unless @embed_id =~ /\Ade\-[a-zA-Z0-9]+\z/
     end
 
     if @embed_class = params[:embed_class]
-      unless @embed_class =~ /^[a-zA-Z0-9\-_]+$/
+      unless @embed_class =~ /\A[a-zA-Z0-9\-_]+\z/
         raise Discourse::InvalidParameters.new(:embed_class)
       end
     end
@@ -139,7 +139,7 @@ class EmbedController < ApplicationController
     by_url = {}
 
     if embed_urls.present?
-      urls = embed_urls.map { |u| u.sub(/#discourse-comments$/, "").sub(%r{/$}, "") }
+      urls = embed_urls.map { |u| u.sub(/#discourse-comments\z/, "").sub(%r{/\z}, "") }
       topic_embeds = TopicEmbed.where(embed_url: urls).includes(:topic).references(:topic)
 
       topic_embeds.each do |te|
@@ -160,14 +160,30 @@ class EmbedController < ApplicationController
 
   def prepare_embeddable
     response.headers.delete("X-Frame-Options")
-    @embeddable_css_class = ""
-    embeddable_host = EmbeddableHost.record_for_url(request.referer)
-    @embeddable_css_class =
-      " class=\"#{embeddable_host.class_name}\"" if embeddable_host.present? &&
-      embeddable_host.class_name.present?
 
-    @data_referer = request.referer
-    @data_referer = "*" if SiteSetting.embed_any_origin? && @data_referer.blank?
+    embeddable_host = EmbeddableHost.record_for_url(request.referer)
+
+    @embeddable_css_class =
+      if params[:class_name]
+        " class=\"#{CGI.escapeHTML(params[:class_name])}\""
+      elsif embeddable_host.present? && embeddable_host.class_name.present?
+        Discourse.deprecate(
+          "class_name field of EmbeddableHost has been deprecated. Prefer passing class_name as a parameter.",
+          since: "3.1.0.beta1",
+          drop_from: "3.2",
+        )
+
+        " class=\"#{CGI.escapeHTML(embeddable_host.class_name)}\""
+      else
+        ""
+      end
+
+    @data_referer =
+      if SiteSetting.embed_any_origin? && @data_referer.blank?
+        "*"
+      else
+        request.referer
+      end
   end
 
   def ensure_api_request
diff --git a/app/controllers/extra_locales_controller.rb b/app/controllers/extra_locales_controller.rb
index 63fdb5d81c9..a6c04bee718 100644
--- a/app/controllers/extra_locales_controller.rb
+++ b/app/controllers/extra_locales_controller.rb
@@ -71,6 +71,6 @@ class ExtraLocalesController < ApplicationController
   private
 
   def valid_bundle?(bundle)
-    bundle == OVERRIDES_BUNDLE || (bundle =~ /^(admin|wizard)$/ && current_user&.staff?)
+    bundle == OVERRIDES_BUNDLE || (bundle =~ /\A(admin|wizard)\z/ && current_user&.staff?)
   end
 end
diff --git a/app/controllers/form_templates_controller.rb b/app/controllers/form_templates_controller.rb
new file mode 100644
index 00000000000..8a8d3865c7a
--- /dev/null
+++ b/app/controllers/form_templates_controller.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class FormTemplatesController < ApplicationController
+  requires_login
+  before_action :ensure_form_templates_enabled
+
+  def index
+    form_templates = FormTemplate.all.order(:id)
+    render_serialized(form_templates, FormTemplateSerializer, root: "form_templates")
+  end
+
+  def show
+    params.require(:id)
+
+    template = FormTemplate.find_by(id: params[:id])
+    raise Discourse::NotFound if template.nil?
+
+    render_serialized(template, FormTemplateSerializer, root: "form_template")
+  end
+
+  private
+
+  def ensure_form_templates_enabled
+    raise Discourse::InvalidAccess.new unless SiteSetting.experimental_form_templates
+  end
+end
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 5ed1a757cca..bbd465858a2 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -59,7 +59,8 @@ class GroupsController < ApplicationController
 
     if !guardian.is_staff?
       # hide automatic groups from all non stuff to de-clutter page
-      groups = groups.where("automatic IS FALSE OR groups.id = ?", Group::AUTO_GROUPS[:moderators])
+      groups =
+        groups.where("groups.automatic IS FALSE OR groups.id = ?", Group::AUTO_GROUPS[:moderators])
       type_filters.delete(:automatic)
     end
 
@@ -80,12 +81,14 @@ class GroupsController < ApplicationController
       type_filters = type_filters - %i[my owner]
     end
 
+    groups = DiscoursePluginRegistry.apply_modifier(:groups_index_query, groups, self)
+
     type_filters.delete(:non_automatic)
 
     # count the total before doing pagination
     total = groups.count
 
-    page = params[:page].to_i
+    page = fetch_int_from_params(:page, default: 0)
     page_size = MobileDetection.mobile_device?(request.user_agent) ? 15 : 36
     groups = groups.offset(page * page_size).limit(page_size)
 
@@ -122,7 +125,10 @@ class GroupsController < ApplicationController
         groups = Group.visible_groups(current_user)
         if !guardian.is_staff?
           groups =
-            groups.where("automatic IS FALSE OR groups.id = ?", Group::AUTO_GROUPS[:moderators])
+            groups.where(
+              "groups.automatic IS FALSE OR groups.id = ?",
+              Group::AUTO_GROUPS[:moderators],
+            )
         end
 
         render_json_dump(
@@ -237,14 +243,6 @@ class GroupsController < ApplicationController
     raise Discourse::InvalidParameters.new(:offset) if offset < 0
 
     dir = (params[:asc] && params[:asc].present?) ? "ASC" : "DESC"
-    if params[:desc]
-      Discourse.deprecate(
-        ":desc is deprecated please use :asc instead",
-        output_in_test: true,
-        drop_from: "2.9.0",
-      )
-      dir = (params[:desc] && params[:desc].present?) ? "DESC" : "ASC"
-    end
     order = "NOT group_users.owner"
 
     if params[:requesters]
@@ -386,6 +384,32 @@ class GroupsController < ApplicationController
     end
   end
 
+  def add_owners
+    group = Group.find_by(id: params.require(:id))
+    raise Discourse::NotFound unless group
+
+    return can_not_modify_automatic if group.automatic
+    guardian.ensure_can_edit_group!(group)
+
+    users = users_from_params
+    group_action_logger = GroupActionLogger.new(current_user, group)
+
+    users.each do |user|
+      if !group.users.include?(user)
+        group.add(user)
+        group_action_logger.log_add_user_to_group(user)
+      end
+      group.group_users.where(user_id: user.id).update_all(owner: true)
+      group_action_logger.log_make_user_group_owner(user)
+
+      group.notify_added_to_group(user, owner: true) if params[:notify_users].to_s == "true"
+    end
+
+    group.restore_user_count!
+
+    render json: success_json.merge!(usernames: users.pluck(:username))
+  end
+
   def join
     ensure_logged_in
     unless current_user.staff?
@@ -588,10 +612,12 @@ class GroupsController < ApplicationController
         .order(:name)
 
     if (term = params[:term]).present?
-      groups = groups.where("name ILIKE :term OR full_name ILIKE :term", term: "%#{term}%")
+      groups =
+        groups.where("groups.name ILIKE :term OR groups.full_name ILIKE :term", term: "%#{term}%")
     end
 
     groups = groups.where(automatic: false) if params[:ignore_automatic].to_s == "true"
+    groups = DiscoursePluginRegistry.apply_modifier(:groups_search_query, groups, self)
 
     if Group.preloaded_custom_field_names.present?
       Group.preload_custom_fields(groups, Group.preloaded_custom_field_names)
@@ -668,6 +694,12 @@ class GroupsController < ApplicationController
     end
   end
 
+  protected
+
+  def can_not_modify_automatic
+    render_json_error(I18n.t("groups.errors.can_not_modify_automatic"))
+  end
+
   private
 
   def add_user_to_group(group, user, notify = false)
diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb
index 33d05058e9a..843eed21213 100644
--- a/app/controllers/invites_controller.rb
+++ b/app/controllers/invites_controller.rb
@@ -87,7 +87,6 @@ class InvitesController < ApplicationController
       render json: failed_json, status: 422
     end
   rescue Invite::UserExists => e
-    return render json: {}, status: 200 if SiteSetting.hide_email_address_taken?
     render_json_error(e.message)
   rescue ActiveRecord::RecordInvalid => e
     render_json_error(e.record.errors.full_messages.first)
@@ -206,9 +205,6 @@ class InvitesController < ApplicationController
           params.permit(:email, :custom_message, :max_redemptions_allowed, :expires_at),
         )
       rescue ActiveRecord::RecordInvalid => e
-        if SiteSetting.hide_email_address_taken? && e.record.email_already_exists?
-          return render json: {}, status: 200
-        end
         return render_json_error(e.record.errors.full_messages.first)
       end
     end
diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb
index 6e34b868676..1b9500bc019 100644
--- a/app/controllers/list_controller.rb
+++ b/app/controllers/list_controller.rb
@@ -83,6 +83,7 @@ class ListController < ApplicationController
 
       list.more_topics_url = construct_url_with(:next, list_opts)
       list.prev_topics_url = construct_url_with(:prev, list_opts)
+
       if Discourse.anonymous_filters.include?(filter)
         @description = SiteSetting.site_description
         @rss = filter
@@ -91,12 +92,14 @@ class ListController < ApplicationController
         # Note the first is the default and we don't add a title
         if (filter.to_s != current_homepage) && use_crawler_layout?
           filter_title = I18n.t("js.filters.#{filter.to_s}.title", count: 0)
+
           if list_opts[:category] && @category
             @title =
               I18n.t("js.filters.with_category", filter: filter_title, category: @category.name)
           else
             @title = I18n.t("js.filters.with_topics", filter: filter_title)
           end
+
           @title << " - #{SiteSetting.title}"
         elsif @category.blank? && (filter.to_s == current_homepage) &&
               SiteSetting.short_site_description.present?
@@ -117,6 +120,27 @@ class ListController < ApplicationController
     end
   end
 
+  def filter
+    raise Discourse::NotFound if !SiteSetting.experimental_topics_filter
+
+    topic_query_opts = { no_definitions: !SiteSetting.show_category_definitions_in_topic_lists }
+
+    %i[page q].each do |key|
+      if params.key?(key.to_s)
+        value = params[key]
+        raise Discourse::InvalidParameters.new(key) if !TopicQuery.validate?(key, value)
+        topic_query_opts[key] = value
+      end
+    end
+
+    user = list_target_user
+    list = TopicQuery.new(user, topic_query_opts).list_filter
+    list.more_topics_url = construct_url_with(:next, topic_query_opts)
+    list.prev_topics_url = construct_url_with(:prev, topic_query_opts)
+
+    respond_with_list(list)
+  end
+
   def category_default
     canonical_url "#{Discourse.base_url_no_prefix}#{@category.url}"
     view_method = @category.default_view
@@ -456,7 +480,7 @@ class ListController < ApplicationController
   def self.best_period_for(previous_visit_at, category_id = nil)
     default_period =
       (
-        (category_id && Category.where(id: category_id).pluck_first(:default_top_period)) ||
+        (category_id && Category.where(id: category_id).pick(:default_top_period)) ||
           SiteSetting.top_page_default_timeframe
       ).to_sym
 
diff --git a/app/controllers/metadata_controller.rb b/app/controllers/metadata_controller.rb
index 4d75df06f07..0e6eda9c366 100644
--- a/app/controllers/metadata_controller.rb
+++ b/app/controllers/metadata_controller.rb
@@ -47,7 +47,7 @@ class MetadataController < ApplicationController
           SiteSetting.title.truncate(12, separator: " ", omission: ""),
       description: SiteSetting.site_description,
       display: display,
-      start_url: Discourse.base_path.present? ? "#{Discourse.base_path}/" : ".",
+      start_url: Discourse.base_path.present? ? "#{Discourse.base_path}/" : "/",
       background_color: "##{ColorScheme.hex_for_name("secondary", scheme_id)}",
       theme_color: "##{ColorScheme.hex_for_name("header_background", scheme_id)}",
       icons: [],
diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb
index 0afbb3b98bf..75cd9c60b79 100644
--- a/app/controllers/notifications_controller.rb
+++ b/app/controllers/notifications_controller.rb
@@ -31,14 +31,10 @@ class NotificationsController < ApplicationController
 
       include_reviewables = false
 
-      if SiteSetting.legacy_navigation_menu?
-        notifications = Notification.recent_report(current_user, limit, notification_types)
-      else
-        notifications =
-          Notification.prioritized_list(current_user, count: limit, types: notification_types)
-        # notification_types is blank for the "all notifications" user menu tab
-        include_reviewables = notification_types.blank? && guardian.can_see_review_queue?
-      end
+      notifications =
+        Notification.prioritized_list(current_user, count: limit, types: notification_types)
+      # notification_types is blank for the "all notifications" user menu tab
+      include_reviewables = notification_types.blank? && guardian.can_see_review_queue?
 
       if notifications.present? && !(params.has_key?(:silent) || @readonly_mode)
         if current_user.bump_last_seen_notification!
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 5c13e423131..0240cf0791a 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -183,26 +183,25 @@ class PostsController < ApplicationController
   end
 
   def create
-    @manager_params = create_params
-    @manager_params[:first_post_checks] = !is_api?
-    @manager_params[:advance_draft] = !is_api?
+    manager_params = create_params
+    manager_params[:first_post_checks] = !is_api?
+    manager_params[:advance_draft] = !is_api?
 
-    manager = NewPostManager.new(current_user, @manager_params)
+    manager = NewPostManager.new(current_user, manager_params)
 
-    if is_api?
-      memoized_payload =
-        DistributedMemoizer.memoize(signature_for(@manager_params), 120) do
-          result = manager.perform
-          MultiJson.dump(serialize_data(result, NewPostResultSerializer, root: false))
-        end
+    json =
+      if is_api?
+        memoized_payload =
+          DistributedMemoizer.memoize(signature_for(manager_params), 120) do
+            MultiJson.dump(serialize_data(manager.perform, NewPostResultSerializer, root: false))
+          end
 
-      parsed_payload = JSON.parse(memoized_payload)
-      backwards_compatible_json(parsed_payload, parsed_payload["success"])
-    else
-      result = manager.perform
-      json = serialize_data(result, NewPostResultSerializer, root: false)
-      backwards_compatible_json(json, result.success?)
-    end
+        JSON.parse(memoized_payload)
+      else
+        serialize_data(manager.perform, NewPostResultSerializer, root: false)
+      end
+
+    backwards_compatible_json(json)
   end
 
   def update
@@ -466,6 +465,33 @@ class PostsController < ApplicationController
     render body: nil
   end
 
+  def permanently_delete_revisions
+    guardian.ensure_can_permanently_delete_post_revisions!
+
+    post = find_post_from_params
+    raise Discourse::InvalidParameters.new(:post) if post.blank?
+    raise Discourse::NotFound unless post.revisions.present?
+
+    RateLimiter.new(
+      current_user,
+      "admin_permanently_delete_post_revisions",
+      20,
+      1.minute,
+      apply_limit_to_staff: true,
+    ).performed!
+
+    ActiveRecord::Base.transaction do
+      updated_at = Time.zone.now
+      post.revisions.destroy_all
+      post.update(version: 1, public_version: 1, last_version_at: updated_at)
+      StaffActionLogger.new(current_user).log_permanently_delete_post_revisions(post)
+    end
+
+    post.rebake!
+
+    render body: nil
+  end
+
   def show_revision
     post_revision = find_post_revision_from_params
     guardian.ensure_can_show_post_revision!(post_revision)
@@ -515,8 +541,10 @@ class PostsController < ApplicationController
       ] if post_revision.modifications["category_id"].present? &&
         post_revision.modifications["category_id"][0] != topic.category.id
     end
-    return render_json_error(I18n.t("revert_version_same")) unless changes.length > 0
-    changes[:edit_reason] = "reverted to version ##{post_revision.number.to_i - 1}"
+    return render_json_error(I18n.t("revert_version_same")) if changes.length <= 0
+    changes[:edit_reason] = I18n.with_locale(SiteSetting.default_locale) do
+      I18n.t("reverted_to_version", version: post_revision.number.to_i - 1)
+    end
 
     revisor = PostRevisor.new(post, topic)
     revisor.revise!(current_user, changes)
@@ -587,7 +615,7 @@ class PostsController < ApplicationController
         bookmarkable_id: params[:post_id],
         bookmarkable_type: "Post",
         user_id: current_user.id,
-      ).pluck_first(:id)
+      ).pick(:id)
     destroyed_bookmark = BookmarkManager.new(current_user).destroy(bookmark_id)
 
     render json:
@@ -634,32 +662,6 @@ class PostsController < ApplicationController
     render body: nil
   end
 
-  def flagged_posts
-    Discourse.deprecate(
-      "PostsController#flagged_posts is deprecated. Please use /review instead.",
-      since: "2.8.0.beta4",
-      drop_from: "2.9",
-    )
-
-    params.permit(:offset, :limit)
-    guardian.ensure_can_see_flagged_posts!
-
-    user = fetch_user_from_params
-    offset = [params[:offset].to_i, 0].max
-    limit = [(params[:limit] || 60).to_i, 100].min
-
-    posts =
-      user_posts(guardian, user.id, offset: offset, limit: limit).where(
-        id:
-          PostAction
-            .where(post_action_type_id: PostActionType.notify_flag_type_ids)
-            .where(disagreed_at: nil)
-            .select(:post_id),
-      )
-
-    render_serialized(posts, AdminUserActionSerializer)
-  end
-
   DELETED_POSTS_MAX_LIMIT = 100
 
   def deleted_posts
@@ -700,9 +702,13 @@ class PostsController < ApplicationController
   # We can't break the API for making posts. The new, queue supporting API
   # doesn't return the post as the root JSON object, but as a nested object.
   # If a param is present it uses that result structure.
-  def backwards_compatible_json(json_obj, success)
+  def backwards_compatible_json(json_obj)
     json_obj.symbolize_keys!
-    if params[:nested_post].blank? && json_obj[:errors].blank? && json_obj[:action] != :enqueued
+
+    success = json_obj[:success]
+
+    if params[:nested_post].blank? && json_obj[:errors].blank? &&
+         json_obj[:action].to_s != "enqueued"
       json_obj = json_obj[:post]
     end
 
@@ -779,27 +785,25 @@ class PostsController < ApplicationController
       topics = Topic.where(id: topic_ids).with_deleted.where.not(archetype: "private_message")
       topics = topics.secured(guardian)
 
-      posts = posts.where(topic_id: topics.pluck(:id))
+      posts = posts.where(topic_id: topics)
     end
 
     posts.offset(opts[:offset]).limit(opts[:limit])
   end
 
   def create_params
-    permitted = [
-      :raw,
-      :topic_id,
-      :archetype,
-      :category,
-      # TODO remove together with 'targetUsername' deprecations
-      :target_usernames,
-      :target_recipients,
-      :reply_to_post_number,
-      :auto_track,
-      :typing_duration_msecs,
-      :composer_open_duration_msecs,
-      :visible,
-      :draft_key,
+    permitted = %i[
+      raw
+      topic_id
+      archetype
+      category
+      target_recipients
+      reply_to_post_number
+      auto_track
+      typing_duration_msecs
+      composer_open_duration_msecs
+      visible
+      draft_key
     ]
 
     Post.plugin_permitted_create_params.each do |key, value|
@@ -887,15 +891,7 @@ class PostsController < ApplicationController
     result[:user_agent] = request.user_agent
     result[:referrer] = request.env["HTTP_REFERER"]
 
-    if recipients = result[:target_usernames]
-      Discourse.deprecate(
-        "`target_usernames` is deprecated, use `target_recipients` instead.",
-        output_in_test: true,
-        drop_from: "2.9.0",
-      )
-    else
-      recipients = result[:target_recipients]
-    end
+    recipients = result[:target_recipients]
 
     if recipients
       recipients = recipients.split(",").map(&:downcase)
diff --git a/app/controllers/reviewables_controller.rb b/app/controllers/reviewables_controller.rb
index 61af8f0e3ec..112e8980929 100644
--- a/app/controllers/reviewables_controller.rb
+++ b/app/controllers/reviewables_controller.rb
@@ -81,6 +81,7 @@ class ReviewablesController < ApplicationController
           Reviewable.user_menu_list_for(current_user),
           current_user,
         ).as_json,
+      reviewable_count: current_user.reviewable_count,
     }
     render_json_dump(json, rest_serializer: true)
   end
@@ -154,10 +155,21 @@ class ReviewablesController < ApplicationController
   end
 
   def destroy
-    reviewable = Reviewable.find_by(id: params[:reviewable_id], created_by: current_user)
+    user =
+      if is_api?
+        if @guardian.is_admin?
+          fetch_user_from_params
+        else
+          raise Discourse::InvalidAccess
+        end
+      else
+        current_user
+      end
+
+    reviewable = Reviewable.find_by(id: params[:reviewable_id], created_by: user)
     raise Discourse::NotFound.new if reviewable.blank?
 
-    reviewable.perform(current_user, :delete)
+    reviewable.perform(current_user, :delete, { guardian: @guardian })
 
     render json: success_json
   end
diff --git a/app/controllers/session_controller.rb b/app/controllers/session_controller.rb
index a11b1bc7a8f..dc20fbb8696 100644
--- a/app/controllers/session_controller.rb
+++ b/app/controllers/session_controller.rb
@@ -203,12 +203,12 @@ class SessionController < ApplicationController
         end
 
         # If it's not a relative URL check the host
-        if return_path !~ %r{^/[^/]}
+        if return_path !~ %r{\A/[^/]}
           begin
             uri = URI(return_path)
             if (uri.hostname == Discourse.current_hostname)
               return_path = uri.to_s
-            elsif !SiteSetting.discourse_connect_allows_all_return_paths
+            elsif !domain_redirect_allowed?(uri.hostname)
               return_path = path("/")
             end
           rescue StandardError
@@ -808,4 +808,12 @@ class SessionController < ApplicationController
     Rails.logger.warn("SSO invite redemption failed: #{e}")
     raise Invite::RedemptionFailed
   end
+
+  def domain_redirect_allowed?(hostname)
+    allowed_domains = SiteSetting.discourse_connect_allowed_redirect_domains
+    return false if allowed_domains.blank?
+    return true if allowed_domains.split("|").include?("*")
+
+    allowed_domains.split("|").include?(hostname)
+  end
 end
diff --git a/app/controllers/sidebar_sections_controller.rb b/app/controllers/sidebar_sections_controller.rb
new file mode 100644
index 00000000000..5e84793d841
--- /dev/null
+++ b/app/controllers/sidebar_sections_controller.rb
@@ -0,0 +1,147 @@
+# frozen_string_literal: true
+
+class SidebarSectionsController < ApplicationController
+  requires_login
+  before_action :check_access_if_public
+
+  def index
+    sections =
+      SidebarSection
+        .strict_loading
+        .includes(:sidebar_urls)
+        .where("public OR user_id = ?", current_user.id)
+        .order("(public IS TRUE) DESC, title ASC")
+        .map { |section| SidebarSectionSerializer.new(section, root: false) }
+
+    render json: sections
+  end
+
+  def create
+    sidebar_section =
+      SidebarSection.create!(section_params.merge(sidebar_urls_attributes: links_params))
+
+    if sidebar_section.public?
+      StaffActionLogger.new(current_user).log_create_public_sidebar_section(sidebar_section)
+      MessageBus.publish("/refresh-sidebar-sections", nil)
+      Site.clear_anon_cache!
+    end
+
+    render_serialized(sidebar_section, SidebarSectionSerializer)
+  rescue ActiveRecord::RecordInvalid => e
+    render_json_error(e.record.errors.full_messages.first)
+  rescue ActiveRecord::NestedAttributes::TooManyRecords => e
+    render_json_error(e.message)
+  end
+
+  def update
+    sidebar_section = SidebarSection.find_by(id: section_params["id"])
+    @guardian.ensure_can_edit!(sidebar_section)
+
+    ActiveRecord::Base.transaction do
+      sidebar_section.update!(section_params.merge(sidebar_urls_attributes: links_params))
+      sidebar_section.sidebar_section_links.update_all(user_id: sidebar_section.user_id)
+
+      order =
+        sidebar_section
+          .sidebar_urls
+          .sort_by do |url|
+            links_params.index { |link| link["name"] == url.name && link["value"] == url.value } ||
+              -1
+          end
+          .each_with_index
+          .map { |url, index| [url.id, index] }
+          .to_h
+
+      set_order(sidebar_section, order)
+    end
+
+    if sidebar_section.public?
+      StaffActionLogger.new(current_user).log_update_public_sidebar_section(sidebar_section)
+      MessageBus.publish("/refresh-sidebar-sections", nil)
+      Site.clear_anon_cache!
+    end
+
+    render_serialized(sidebar_section.reload, SidebarSectionSerializer)
+  rescue ActiveRecord::RecordInvalid => e
+    render_json_error(e.record.errors.full_messages.first)
+  rescue ActiveRecord::NestedAttributes::TooManyRecords => e
+    render_json_error(e.message)
+  rescue Discourse::InvalidAccess
+    render json: failed_json, status: 403
+  end
+
+  def reset
+    sidebar_section = SidebarSection.find_by(id: params[:id])
+    raise Discourse::InvalidParameters if !sidebar_section
+    @guardian.ensure_can_edit!(sidebar_section)
+
+    case sidebar_section.section_type
+    when "community"
+      sidebar_section.reset_community!
+    end
+
+    render_serialized(sidebar_section, SidebarSectionSerializer)
+  end
+
+  def reorder
+    sidebar_section = SidebarSection.find_by(id: reorder_params["sidebar_section_id"])
+    @guardian.ensure_can_edit!(sidebar_section)
+    order = reorder_params["links_order"].map(&:to_i).each_with_index.to_h
+    set_order(sidebar_section, order)
+
+    render_serialized(sidebar_section, SidebarSectionSerializer)
+  rescue Discourse::InvalidAccess
+    render json: failed_json, status: 403
+  end
+
+  def destroy
+    sidebar_section = SidebarSection.find_by(id: section_params["id"])
+    @guardian.ensure_can_delete!(sidebar_section)
+    sidebar_section.destroy!
+
+    if sidebar_section.public?
+      StaffActionLogger.new(current_user).log_destroy_public_sidebar_section(sidebar_section)
+      MessageBus.publish("/refresh-sidebar-sections", nil)
+    end
+
+    render json: success_json
+  rescue Discourse::InvalidAccess
+    render json: failed_json, status: 403
+  end
+
+  def section_params
+    section_params = params.permit(:id, :title, :public)
+    section_params.merge!(user: current_user) if !params[:public]
+    section_params
+  end
+
+  def links_params
+    params.permit(links: %i[icon name value id _destroy segment])["links"]
+  end
+
+  def reorder_params
+    params.permit(:sidebar_section_id, links_order: [])
+  end
+
+  private
+
+  def set_order(sidebar_section, order)
+    position_generator =
+      (0..sidebar_section.sidebar_section_links.count * 2).excluding(
+        sidebar_section.sidebar_section_links.map(&:position),
+      ).each
+
+    links =
+      sidebar_section
+        .sidebar_section_links
+        .sort_by { |link| order[link.linkable_id] }
+        .map { |link| link.attributes.merge(position: position_generator.next) }
+
+    sidebar_section.sidebar_section_links.upsert_all(links, update_only: [:position])
+  end
+
+  def check_access_if_public
+    return true if !params[:public]
+    raise Discourse::InvalidAccess.new if !guardian.can_create_public_sidebar_section?
+  end
+end
diff --git a/app/controllers/slugs_controller.rb b/app/controllers/slugs_controller.rb
new file mode 100644
index 00000000000..531f8ff4fd8
--- /dev/null
+++ b/app/controllers/slugs_controller.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class SlugsController < ApplicationController
+  requires_login
+
+  MAX_SLUG_GENERATIONS_PER_MINUTE = 20
+
+  def generate
+    params.require(:name)
+
+    raise Discourse::InvalidAccess if !current_user.has_trust_level_or_staff?(TrustLevel[4])
+
+    RateLimiter.new(
+      current_user,
+      "max-slug-generations-per-minute",
+      MAX_SLUG_GENERATIONS_PER_MINUTE,
+      1.minute,
+    ).performed!
+
+    render json: success_json.merge(slug: Slug.for(params[:name], ""))
+  end
+end
diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb
index fde841a46e8..1eb75bd8101 100644
--- a/app/controllers/static_controller.rb
+++ b/app/controllers/static_controller.rb
@@ -193,7 +193,11 @@ class StaticController < ApplicationController
   def brotli_asset
     is_asset_path
 
-    serve_asset(".br") { response.headers["Content-Encoding"] = "br" }
+    if params[:path].end_with?(".map")
+      serve_asset
+    else
+      serve_asset(".br") { response.headers["Content-Encoding"] = "br" }
+    end
   end
 
   def cdn_asset
diff --git a/app/controllers/stylesheets_controller.rb b/app/controllers/stylesheets_controller.rb
index 97edb80b576..24abd4151b2 100644
--- a/app/controllers/stylesheets_controller.rb
+++ b/app/controllers/stylesheets_controller.rb
@@ -39,7 +39,7 @@ class StylesheetsController < ApplicationController
 
     cache_time = request.env["HTTP_IF_MODIFIED_SINCE"]
 
-    if cache_time
+    if cache_time.present?
       begin
         cache_time = Time.rfc2822(cache_time)
       rescue ArgumentError
@@ -59,16 +59,16 @@ class StylesheetsController < ApplicationController
     cache_path = Stylesheet::Manager.cache_fullpath
     location = "#{cache_path}/#{target}#{underscore_digest}#{extension}"
 
-    stylesheet_time = query.pluck_first(:created_at)
+    stylesheet_time = query.pick(:created_at)
 
     handle_missing_cache(location, target, digest) if !stylesheet_time
 
-    if cache_time && stylesheet_time && stylesheet_time <= cache_time
+    if cache_time.present? && stylesheet_time && stylesheet_time <= cache_time
       return render body: nil, status: 304
     end
 
     unless File.exist?(location)
-      if current = query.pluck_first(source_map ? :source_map : :content)
+      if current = query.pick(source_map ? :source_map : :content)
         FileUtils.mkdir_p(cache_path)
         File.write(location, current)
       else
diff --git a/app/controllers/svg_sprite_controller.rb b/app/controllers/svg_sprite_controller.rb
index f073314e200..925de81d1aa 100644
--- a/app/controllers/svg_sprite_controller.rb
+++ b/app/controllers/svg_sprite_controller.rb
@@ -32,26 +32,23 @@ class SvgSpriteController < ApplicationController
   end
 
   def search
-    RailsMultisite::ConnectionManagement.with_hostname(params[:hostname]) do
-      keyword = params.require(:keyword)
-      data = SvgSprite.search(keyword)
+    keyword = params.require(:keyword)
+    data = SvgSprite.search(keyword)
 
-      if data.blank?
-        render body: nil, status: 404
-      else
-        render plain: data.inspect, disposition: nil, content_type: "text/plain"
-      end
+    if data.blank?
+      render body: nil, status: 404
+    else
+      render plain: data.inspect, disposition: nil, content_type: "text/plain"
     end
   end
 
   def icon_picker_search
-    RailsMultisite::ConnectionManagement.with_hostname(params[:hostname]) do
-      params.permit(:filter)
-      filter = params[:filter] || ""
+    params.permit(:filter, :only_available)
+    filter = params[:filter] || ""
+    only_available = params[:only_available]
 
-      icons = SvgSprite.icon_picker_search(filter)
-      render json: icons.take(200), root: false
-    end
+    icons = SvgSprite.icon_picker_search(filter, only_available)
+    render json: icons.take(200), root: false
   end
 
   def svg_icon
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 26a0758bc7f..dae4b9790ec 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -27,6 +27,7 @@ class TagsController < ::ApplicationController
                   update_notifications
                   personal_messages
                   info
+                  list
                 ]
 
   before_action :fetch_tag, only: %i[info create_synonyms destroy_synonym]
@@ -42,17 +43,18 @@ class TagsController < ::ApplicationController
     if SiteSetting.tags_listed_by_group
       ungrouped_tags = Tag.where("tags.id NOT IN (SELECT tag_id FROM tag_group_memberships)")
       ungrouped_tags = ungrouped_tags.used_tags_in_regular_topics(guardian) unless show_all_tags
+      ungrouped_tags = ungrouped_tags.order(:id)
 
       grouped_tag_counts =
         TagGroup
           .visible(guardian)
           .order("name ASC")
-          .includes(:tags)
+          .includes(:none_synonym_tags)
           .map do |tag_group|
             {
               id: tag_group.id,
               name: tag_group.name,
-              tags: self.class.tag_counts_json(tag_group.tags.where(target_tag_id: nil), guardian),
+              tags: self.class.tag_counts_json(tag_group.none_synonym_tags, guardian),
             }
           end
 
@@ -60,23 +62,29 @@ class TagsController < ::ApplicationController
       @extras = { tag_groups: grouped_tag_counts }
     else
       tags = show_all_tags ? Tag.all : Tag.used_tags_in_regular_topics(guardian)
+      tags = tags.order(:id)
       unrestricted_tags = DiscourseTagging.filter_visible(tags.where(target_tag_id: nil), guardian)
 
       categories =
         Category
-          .where("id IN (SELECT category_id FROM category_tags)")
-          .where("id IN (?)", guardian.allowed_category_ids)
-          .includes(:tags)
+          .where(
+            "id IN (SELECT category_id FROM category_tags WHERE category_id IN (?))",
+            guardian.allowed_category_ids,
+          )
+          .includes(:none_synonym_tags)
+          .order(:id)
 
       category_tag_counts =
         categories
           .map do |c|
             category_tags =
               self.class.tag_counts_json(
-                DiscourseTagging.filter_visible(c.tags.where(target_tag_id: nil), guardian),
+                DiscourseTagging.filter_visible(c.none_synonym_tags, guardian),
                 guardian,
               )
+
             next if category_tags.empty?
+
             { id: c.id, tags: category_tags }
           end
           .compact
@@ -92,6 +100,46 @@ class TagsController < ::ApplicationController
     end
   end
 
+  LIST_LIMIT = 51
+
+  def list
+    offset = params[:offset].to_i || 0
+    tags = guardian.can_admin_tags? ? Tag.all : Tag.visible(guardian)
+
+    load_more_query_params = { offset: offset + 1 }
+
+    if filter = params[:filter]
+      tags = tags.where("LOWER(tags.name) ILIKE ?", "%#{filter.downcase}%")
+      load_more_query_params[:filter] = filter
+    end
+
+    if only_tags = params[:only_tags]
+      tags = tags.where("LOWER(tags.name) IN (?)", only_tags.split(",").map(&:downcase))
+      load_more_query_params[:only_tags] = only_tags
+    end
+
+    if exclude_tags = params[:exclude_tags]
+      tags = tags.where("LOWER(tags.name) NOT IN (?)", exclude_tags.split(",").map(&:downcase))
+      load_more_query_params[:exclude_tags] = exclude_tags
+    end
+
+    tags_count = tags.count
+    tags = tags.order("LOWER(tags.name) ASC").limit(LIST_LIMIT).offset(offset * LIST_LIMIT)
+
+    load_more_url = URI("/tags/list.json")
+    load_more_url.query = URI.encode_www_form(load_more_query_params)
+
+    render_serialized(
+      tags,
+      TagSerializer,
+      root: "list_tags",
+      meta: {
+        total_rows_list_tags: tags_count,
+        load_more_list_tags: load_more_url.to_s,
+      },
+    )
+  end
+
   Discourse.filters.each do |filter|
     define_method("show_#{filter}") do
       @tag_id = params[:tag_id].force_encoding("UTF-8")
@@ -240,7 +288,6 @@ class TagsController < ::ApplicationController
     filter_params = {
       for_input: params[:filterForInput],
       selected_tags: params[:selected_tags],
-      limit: params[:limit],
       exclude_synonyms: params[:excludeSynonyms],
       exclude_has_synonyms: params[:excludeHasSynonyms],
     }
@@ -538,6 +585,6 @@ class TagsController < ::ApplicationController
   end
 
   def tag_params
-    [@tag_id].concat(Array(@additional_tags))
+    Array(params[:tags]).concat(Array(@additional_tags))
   end
 end
diff --git a/app/controllers/theme_javascripts_controller.rb b/app/controllers/theme_javascripts_controller.rb
index 63d6484d712..f311ebfe391 100644
--- a/app/controllers/theme_javascripts_controller.rb
+++ b/app/controllers/theme_javascripts_controller.rb
@@ -22,7 +22,7 @@ class ThemeJavascriptsController < ApplicationController
     cache_file = "#{DISK_CACHE_PATH}/#{params[:digest]}.js"
 
     write_if_not_cached(cache_file) do
-      content, has_source_map = query.pluck_first(:content, "source_map IS NOT NULL")
+      content, has_source_map = query.pick(:content, "source_map IS NOT NULL")
       if has_source_map
         content +=
           "\n//# sourceMappingURL=#{params[:digest]}.map?__ws=#{Discourse.current_hostname}\n"
@@ -40,14 +40,14 @@ class ThemeJavascriptsController < ApplicationController
     # Security: safe due to route constraint
     cache_file = "#{DISK_CACHE_PATH}/#{params[:digest]}.map"
 
-    write_if_not_cached(cache_file) { query.pluck_first(:source_map) }
+    write_if_not_cached(cache_file) { query.pick(:source_map) }
 
     serve_file(cache_file)
   end
 
   def show_tests
     digest = params[:digest]
-    raise Discourse::NotFound if !digest.match?(/^\h{40}$/)
+    raise Discourse::NotFound if !digest.match?(/\A\h{40}\z/)
 
     theme = Theme.find_by(id: params[:theme_id])
     raise Discourse::NotFound if theme.blank?
@@ -75,7 +75,7 @@ class ThemeJavascriptsController < ApplicationController
         if params[:action].to_s == "show_tests"
           File.exist?(@cache_file) ? File.ctime(@cache_file) : nil
         else
-          query.pluck_first(:updated_at)
+          query.pick(:updated_at)
         end
       end
   end
diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index 264c5ffba33..5b662283a5f 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -83,13 +83,13 @@ class TopicsController < ApplicationController
 
     # Special case: a slug with a number in front should look by slug first before looking
     # up that particular number
-    if params[:id] && params[:id] =~ /^\d+[^\d\\]+$/
+    if params[:id] && params[:id] =~ /\A\d+[^\d\\]+\z/
       topic = Topic.find_by_slug(params[:id])
       return redirect_to_correct_topic(topic, opts[:post_number]) if topic
     end
 
     if opts[:print]
-      raise Discourse::InvalidAccess unless SiteSetting.max_prints_per_hour_per_user > 0
+      raise Discourse::InvalidAccess if SiteSetting.max_prints_per_hour_per_user.zero?
       begin
         unless @guardian.is_admin?
           RateLimiter.new(
@@ -361,7 +361,14 @@ class TopicsController < ApplicationController
         category = Category.find_by(id: params[:category_id])
 
         if category || (params[:category_id].to_i == 0)
-          guardian.ensure_can_move_topic_to_category!(category)
+          begin
+            guardian.ensure_can_move_topic_to_category!(category)
+          rescue Discourse::InvalidAccess
+            return(
+              render_json_error I18n.t("category.errors.move_topic_to_category_disallowed"),
+                                status: :forbidden
+            )
+          end
         else
           return render_json_error(I18n.t("category.errors.not_found"))
         end
@@ -479,7 +486,12 @@ class TopicsController < ApplicationController
     enabled = params[:enabled] == "true"
 
     check_for_status_presence(:status, status)
-    @topic = Topic.find_by(id: topic_id)
+    @topic =
+      if params[:category_id]
+        Topic.find_by(id: topic_id, category_id: params[:category_id].to_i)
+      else
+        Topic.find_by(id: topic_id)
+      end
 
     case status
     when "closed"
@@ -644,7 +656,9 @@ class TopicsController < ApplicationController
     force_destroy = ActiveModel::Type::Boolean.new.cast(params[:force_destroy])
 
     if force_destroy
-      if !guardian.can_permanently_delete?(topic)
+      if !topic
+        raise Discourse::InvalidAccess
+      elsif !guardian.can_permanently_delete?(topic)
         return render_json_error topic.cannot_permanently_delete_reason(current_user), status: 403
       end
     else
@@ -789,8 +803,16 @@ class TopicsController < ApplicationController
   end
 
   def set_notifications
+    user =
+      if is_api? && @guardian.is_admin? &&
+           (params[:username].present? || params[:external_id].present?)
+        fetch_user_from_params
+      else
+        current_user
+      end
+
     topic = Topic.find(params[:topic_id].to_i)
-    TopicUser.change(current_user, topic.id, notification_level: params[:notification_level].to_i)
+    TopicUser.change(user, topic.id, notification_level: params[:notification_level].to_i)
     render json: success_json
   end
 
@@ -798,6 +820,7 @@ class TopicsController < ApplicationController
     topic_id = params.require(:topic_id)
     destination_topic_id = params.require(:destination_topic_id)
     params.permit(:participants)
+    params.permit(:chronological_order)
     params.permit(:archetype)
 
     raise Discourse::InvalidAccess if params[:archetype] == "private_message" && !guardian.is_staff?
@@ -810,6 +833,7 @@ class TopicsController < ApplicationController
 
     args = {}
     args[:destination_topic_id] = destination_topic_id.to_i
+    args[:chronological_order] = params[:chronological_order] == "true"
 
     if params[:archetype].present?
       args[:archetype] = params[:archetype]
@@ -827,6 +851,7 @@ class TopicsController < ApplicationController
     params.permit(:category_id)
     params.permit(:tags)
     params.permit(:participants)
+    params.permit(:chronological_order)
     params.permit(:archetype)
 
     raise Discourse::InvalidAccess if params[:archetype] == "private_message" && !guardian.is_staff?
@@ -836,7 +861,7 @@ class TopicsController < ApplicationController
 
     if params[:title].present?
       # when creating a new topic, ensure the 1st post is a regular post
-      if Post.where(topic: topic, id: post_ids).order(:post_number).pluck_first(:post_type) !=
+      if Post.where(topic: topic, id: post_ids).order(:post_number).pick(:post_type) !=
            Post.types[:regular]
         return(
           render_json_error(
@@ -1020,17 +1045,34 @@ class TopicsController < ApplicationController
   end
 
   def reset_new
-    topic_scope = TopicQuery.new(current_user).new_results(limit: false)
+    topic_scope =
+      if current_user.new_new_view_enabled?
+        if (params[:dismiss_topics] && params[:dismiss_posts])
+          TopicQuery.new(current_user).new_and_unread_results(limit: false)
+        elsif params[:dismiss_topics]
+          TopicQuery.new(current_user).new_results(limit: false)
+        elsif params[:dismiss_posts]
+          TopicQuery.new(current_user).unread_results(limit: false)
+        else
+          Topic.none
+        end
+      else
+        TopicQuery.new(current_user).new_results(limit: false)
+      end
     if tag_name = params[:tag_id]
       tag_name = DiscourseTagging.visible_tags(guardian).where(name: tag_name).pluck(:name).first
     end
+
     topic_scope =
       if params[:category_id].present?
-        category_ids = [params[:category_id].to_i]
-        if ActiveModel::Type::Boolean.new.cast(params[:include_subcategories])
-          category_ids =
-            category_ids.concat(Category.where(parent_category_id: params[:category_id]).pluck(:id))
-        end
+        category_id = params[:category_id].to_i
+
+        category_ids =
+          if ActiveModel::Type::Boolean.new.cast(params[:include_subcategories])
+            Category.subcategory_ids(category_id)
+          else
+            [category_id]
+          end
 
         category_ids &= guardian.allowed_category_ids
         if category_ids.blank?
@@ -1060,11 +1102,30 @@ class TopicsController < ApplicationController
       topic_scope = topic_scope.where(id: topic_ids)
     end
 
-    dismissed_topic_ids =
-      TopicsBulkAction.new(current_user, topic_scope.pluck(:id), type: "dismiss_topics").perform!
-    TopicTrackingState.publish_dismiss_new(current_user.id, topic_ids: dismissed_topic_ids)
+    dismissed_topic_ids = []
+    dismissed_post_topic_ids = []
 
-    render body: nil
+    if !current_user.new_new_view_enabled? || params[:dismiss_topics]
+      dismissed_topic_ids =
+        TopicsBulkAction.new(current_user, topic_scope.pluck(:id), type: "dismiss_topics").perform!
+    end
+
+    if params[:dismiss_posts]
+      if params[:untrack]
+        dismissed_post_topic_ids =
+          TopicsBulkAction.new(
+            current_user,
+            topic_scope.pluck(:id),
+            type: "change_notification_level",
+            notification_level_id: NotificationLevels.topic_levels[:regular],
+          ).perform!
+      else
+        dismissed_post_topic_ids =
+          TopicsBulkAction.new(current_user, topic_scope.pluck(:id), type: "dismiss_posts").perform!
+      end
+    end
+
+    render_json_dump topic_ids: dismissed_topic_ids.concat(dismissed_post_topic_ids).uniq
   end
 
   def convert_topic
@@ -1111,6 +1172,34 @@ class TopicsController < ApplicationController
     head :ok
   end
 
+  def summary
+    topic = Topic.find(params[:topic_id])
+    guardian.ensure_can_see!(topic)
+    strategy = Summarization::Base.selected_strategy
+
+    if strategy.nil? || !Summarization::Base.can_see_summary?(topic, current_user)
+      raise Discourse::NotFound
+    end
+
+    RateLimiter.new(current_user, "summary", 6, 5.minutes).performed! if current_user
+
+    opts = params.permit(:skip_age_check)
+
+    hijack do
+      summary = TopicSummarization.new(strategy).summarize(topic, current_user, opts)
+
+      render json: {
+               summary: summary.summarized_text,
+               summarized_on: summary.updated_at,
+               summarized_by: summary.algorithm,
+               outdated: summary.outdated,
+               can_regenerate: Summarization::Base.can_request_summary_for?(current_user),
+               new_posts_since_summary:
+                 topic.highest_post_number.to_i - summary.content_range&.max.to_i,
+             }
+    end
+  end
+
   private
 
   def topic_params
@@ -1232,7 +1321,7 @@ class TopicsController < ApplicationController
 
     respond_to do |format|
       format.html do
-        @tags = SiteSetting.tagging_enabled ? @topic_view.topic.tags : []
+        @tags = SiteSetting.tagging_enabled ? @topic_view.topic.tags.visible(guardian) : []
         @breadcrumbs = helpers.categories_breadcrumb(@topic_view.topic) || []
         @description_meta =
           @topic_view.topic.excerpt.present? ? @topic_view.topic.excerpt : @topic_view.summary
@@ -1259,6 +1348,7 @@ class TopicsController < ApplicationController
       :destination_topic_id
     ].present?
     args[:tags] = params[:tags] if params[:tags].present?
+    args[:chronological_order] = params[:chronological_order] == "true"
 
     if params[:archetype].present?
       args[:archetype] = params[:archetype]
@@ -1306,17 +1396,18 @@ class TopicsController < ApplicationController
           topic_query.joined_topic_user,
           whisperer: guardian.is_whisperer?,
         ).listable_topics
+
       topics = TopicQuery.tracked_filter(topics, current_user.id) if params[:tracked].to_s == "true"
 
       if params[:category_id]
-        if params[:include_subcategories]
-          topics = topics.where(<<~SQL, category_id: params[:category_id])
-            category_id in (select id FROM categories WHERE parent_category_id = :category_id) OR
-            category_id = :category_id
-          SQL
-        else
-          topics = topics.where("category_id = ?", params[:category_id])
-        end
+        category_ids =
+          if params[:include_subcategories]
+            Category.subcategory_ids(params[:category_id].to_i)
+          else
+            params[:category_id]
+          end
+
+        topics = topics.where(category_id: category_ids)
       end
 
       if params[:tag_name].present?
diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index 218b5ae88dd..3eeb85e7149 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -221,7 +221,7 @@ class UploadsController < ApplicationController
   def validate_file_size(file_name:, file_size:)
     raise ExternalUploadValidationError.new(I18n.t("upload.size_zero_failure")) if file_size.zero?
 
-    if file_size_too_big?(file_name, file_size)
+    if attachment_too_big?(file_name, file_size)
       raise ExternalUploadValidationError.new(
               I18n.t(
                 "upload.attachments.too_large_humanized",
@@ -232,6 +232,18 @@ class UploadsController < ApplicationController
               ),
             )
     end
+
+    if image_too_big?(file_name, file_size)
+      raise ExternalUploadValidationError.new(
+              I18n.t(
+                "upload.images.too_large_humanized",
+                max_size:
+                  ActiveSupport::NumberHelper.number_to_human_size(
+                    SiteSetting.max_image_size_kb.kilobytes,
+                  ),
+              ),
+            )
+    end
   end
 
   def force_download?
@@ -306,14 +318,20 @@ class UploadsController < ApplicationController
 
   private
 
-  # We can pre-emptively check size for attachments, but not for images
+  # We can preemptively check size for attachments, but not for (most) images
   # as they may be further reduced in size by UploadCreator (at this point
   # they may have already been reduced in size by preprocessors)
-  def file_size_too_big?(file_name, file_size)
+  def attachment_too_big?(file_name, file_size)
     !FileHelper.is_supported_image?(file_name) &&
       file_size >= SiteSetting.max_attachment_size_kb.kilobytes
   end
 
+  # Gifs are not resized on the client and not reduced in size by UploadCreator
+  def image_too_big?(file_name, file_size)
+    FileHelper.is_supported_image?(file_name) && File.extname(file_name) == ".gif" &&
+      file_size >= SiteSetting.max_image_size_kb.kilobytes
+  end
+
   def send_file_local_upload(upload)
     opts = {
       filename: upload.original_filename,
diff --git a/app/controllers/user_actions_controller.rb b/app/controllers/user_actions_controller.rb
index 24326698bb9..a166bca6f5b 100644
--- a/app/controllers/user_actions_controller.rb
+++ b/app/controllers/user_actions_controller.rb
@@ -36,11 +36,6 @@ class UserActionsController < ApplicationController
     render_serialized(UserAction.stream_item(params[:id], guardian), UserActionSerializer)
   end
 
-  def private_messages
-    # DO NOT REMOVE
-    # TODO should preload messages to avoid extra http req
-  end
-
   private
 
   def user_actions_params
diff --git a/app/controllers/user_avatars_controller.rb b/app/controllers/user_avatars_controller.rb
index abf24083139..0fe52b69c34 100644
--- a/app/controllers/user_avatars_controller.rb
+++ b/app/controllers/user_avatars_controller.rb
@@ -39,7 +39,7 @@ class UserAvatarsController < ApplicationController
   def show_proxy_letter
     is_asset_path
 
-    if SiteSetting.external_system_avatars_url !~ %r{^/letter_avatar_proxy}
+    if SiteSetting.external_system_avatars_url !~ %r{\A/letter_avatar_proxy}
       raise Discourse::NotFound
     end
 
@@ -104,7 +104,7 @@ class UserAvatarsController < ApplicationController
     return render_blank if version > OptimizedImage::VERSION
 
     upload_id = upload_id.to_i
-    return render_blank unless upload_id > 0
+    return render_blank if upload_id <= 0
 
     size = params[:size].to_i
     return render_blank if size < 8 || size > 1000
@@ -192,7 +192,9 @@ class UserAvatarsController < ApplicationController
   end
 
   def redirect_s3_avatar(url)
-    immutable_for 1.hour
+    response.cache_control[:max_age] = 1.hour.to_i
+    response.cache_control[:public] = true
+    response.cache_control[:extras] = ["immutable", "stale-while-revalidate=#{1.day.to_i}"]
     redirect_to url, allow_other_host: true
   end
 
diff --git a/app/controllers/user_badges_controller.rb b/app/controllers/user_badges_controller.rb
index 1617f55516d..e06701e6ee7 100644
--- a/app/controllers/user_badges_controller.rb
+++ b/app/controllers/user_badges_controller.rb
@@ -22,14 +22,13 @@ class UserBadgesController < ApplicationController
     grant_count = nil
 
     if params[:username]
-      user_id = User.where(username_lower: params[:username].downcase).pluck_first(:id)
+      user_id = User.where(username_lower: params[:username].downcase).pick(:id)
       user_badges = user_badges.where(user_id: user_id) if user_id
       grant_count = badge.user_badges.where(user_id: user_id).count
     end
 
-    if offset = params[:offset]
-      user_badges = user_badges.offset(offset.to_i)
-    end
+    offset = fetch_int_from_params(:offset, default: 0)
+    user_badges = user_badges.offset(offset) if offset > 0
 
     user_badges_topic_ids = user_badges.map { |user_badge| user_badge.post&.topic_id }.compact
 
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 5ab7268b8bc..92ed0207429 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -110,12 +110,15 @@ class UsersController < ApplicationController
 
     @user =
       fetch_user_from_params(
-        include_inactive:
-          current_user.try(:staff?) || (current_user && SiteSetting.show_inactive_accounts),
+        include_inactive: current_user&.staff? || for_card || SiteSetting.show_inactive_accounts,
       )
 
     user_serializer = nil
-    if guardian.can_see_profile?(@user)
+    if !current_user&.staff? && !@user.active?
+      user_serializer = InactiveUserSerializer.new(@user, scope: guardian, root: "user")
+    elsif !guardian.can_see_profile?(@user)
+      user_serializer = HiddenProfileSerializer.new(@user, scope: guardian, root: "user")
+    else
       serializer_class = for_card ? UserCardSerializer : UserSerializer
       user_serializer = serializer_class.new(@user, scope: guardian, root: "user")
 
@@ -125,8 +128,6 @@ class UsersController < ApplicationController
           topic_id => Post.secured(guardian).where(topic_id: topic_id, user_id: @user.id).count,
         }
       end
-    else
-      user_serializer = HiddenProfileSerializer.new(@user, scope: guardian, root: "user")
     end
 
     track_visit_to_user_profile if !params[:skip_track_visit] && (@user != current_user)
@@ -394,14 +395,9 @@ class UsersController < ApplicationController
     guardian.ensure_can_edit!(user)
 
     report = TopicTrackingState.report(user)
-    serializer =
-      ActiveModel::ArraySerializer.new(
-        report,
-        each_serializer: TopicTrackingStateSerializer,
-        scope: guardian,
-      )
+    serializer = TopicTrackingStateSerializer.new(report, scope: guardian, root: false)
 
-    render json: MultiJson.dump(serializer)
+    render json: MultiJson.dump(serializer.as_json[:data])
   end
 
   def private_message_topic_tracking_state
@@ -473,7 +469,7 @@ class UsersController < ApplicationController
   end
 
   def my_redirect
-    raise Discourse::NotFound if params[:path] !~ %r{^[a-z_\-/]+$}
+    raise Discourse::NotFound if params[:path] !~ %r{\A[a-z_\-/]+\z}
 
     if current_user.blank?
       cookies[:destination_url] = path("/my/#{params[:path]}")
@@ -1241,6 +1237,11 @@ class UsersController < ApplicationController
         groups = block.call(groups, current_user) if params[param_name.to_s]
       end
 
+      # the plugin registry callbacks above are only evaluated when a param
+      # is present matching the name of the callback. Any modifier registered using
+      # register_modifier(:groups_for_users_search) will be evaluated without needing the
+      # param.
+      groups = DiscoursePluginRegistry.apply_modifier(:groups_for_users_search, groups)
       groups = Group.search_groups(term, groups: groups, sort: :auto)
 
       to_render[:groups] = groups.map { |m| { name: m.name, full_name: m.full_name } }
@@ -1859,16 +1860,21 @@ class UsersController < ApplicationController
     if unread_notifications.size < USER_MENU_LIST_LIMIT
       exclude_topic_ids = unread_notifications.filter_map(&:topic_id).uniq
       limit = USER_MENU_LIST_LIMIT - unread_notifications.size
+
       messages_list =
         TopicQuery
           .new(current_user, per_page: limit)
-          .list_private_messages_direct_and_groups(current_user) do |query|
+          .list_private_messages_direct_and_groups(
+            current_user,
+            groups_messages_notification_level: :watching,
+          ) do |query|
             if exclude_topic_ids.present?
               query.where("topics.id NOT IN (?)", exclude_topic_ids)
             else
               query
             end
           end
+
       read_notifications =
         Notification
           .for_user_menu(current_user.id, limit: limit)
@@ -2025,7 +2031,14 @@ class UsersController < ApplicationController
       result.merge!(params.permit(:active, :staged, :approved))
     end
 
-    modify_user_params(result)
+    deprecate_modify_user_params_method
+    result = modify_user_params(result)
+    DiscoursePluginRegistry.apply_modifier(
+      :users_controller_update_user_params,
+      result,
+      current_user,
+      params,
+    )
   end
 
   # Plugins can use this to modify user parameters
@@ -2033,6 +2046,18 @@ class UsersController < ApplicationController
     attrs
   end
 
+  def deprecate_modify_user_params_method
+    # only issue a deprecation warning if the method is overriden somewhere
+    if method(:modify_user_params).source_location[0] !=
+         "#{Rails.root}/app/controllers/users_controller.rb"
+      Discourse.deprecate(
+        "`UsersController#modify_user_params` method is deprecated. Please use the `users_controller_update_user_params` modifier instead.",
+        since: "3.1.0.beta4",
+        drop_from: "3.2.0",
+      )
+    end
+  end
+
   def fail_with(key)
     render json: { success: false, message: I18n.t(key) }
   end
diff --git a/app/controllers/webhooks_controller.rb b/app/controllers/webhooks_controller.rb
index b84d59c269e..021aea1c014 100644
--- a/app/controllers/webhooks_controller.rb
+++ b/app/controllers/webhooks_controller.rb
@@ -6,12 +6,20 @@ class WebhooksController < ActionController::Base
   skip_before_action :verify_authenticity_token
 
   def mailgun
-    return mailgun_failure if SiteSetting.mailgun_api_key.blank?
+    return signature_failure if SiteSetting.mailgun_api_key.blank?
 
     params["event-data"] ? handle_mailgun_new(params) : handle_mailgun_legacy(params)
   end
 
   def sendgrid
+    if SiteSetting.sendgrid_verification_key.present?
+      return signature_failure if !valid_sendgrid_signature?
+    else
+      Rails.logger.warn(
+        "Received a Sendgrid webhook, but no verification key has been configured. This is unsafe behaviour and will be disallowed in the future.",
+      )
+    end
+
     events = params["_json"] || [params]
     events.each do |event|
       message_id = Email::MessageIdService.message_id_clean((event["smtp-id"] || ""))
@@ -32,6 +40,14 @@ class WebhooksController < ActionController::Base
   end
 
   def mailjet
+    if SiteSetting.mailjet_webhook_token.present?
+      return signature_failure if !valid_mailjet_token?
+    else
+      Rails.logger.warn(
+        "Received a Mailjet webhook, but no token has been configured. This is unsafe behaviour and will be disallowed in the future.",
+      )
+    end
+
     events = params["_json"] || [params]
     events.each do |event|
       message_id = event["CustomID"]
@@ -48,24 +64,50 @@ class WebhooksController < ActionController::Base
     success
   end
 
-  def mandrill
-    events = JSON.parse(params["mandrill_events"])
-    events.each do |event|
-      message_id = event.dig("msg", "metadata", "message_id")
-      to_address = event.dig("msg", "email")
-      error_code = event.dig("msg", "diag")
+  def mailpace
+    # see https://docs.mailpace.com/guide/webhooks#email-events
 
-      case event["event"]
-      when "hard_bounce"
-        process_bounce(message_id, to_address, SiteSetting.hard_bounce_score, error_code)
-      when "soft_bounce"
-        process_bounce(message_id, to_address, SiteSetting.soft_bounce_score, error_code)
-      end
+    message_id = Email::MessageIdService.message_id_clean(params["payload"]["message_id"])
+    to_address = params["payload"]["to"]
+    status = params["payload"]["status"]
+
+    case status
+    when "bounced"
+      process_bounce(message_id, to_address, SiteSetting.hard_bounce_score)
+    when "deferred"
+      process_bounce(message_id, to_address, SiteSetting.soft_bounce_score)
     end
 
     success
   end
 
+  def mandrill
+    if SiteSetting.mandrill_authentication_key.present?
+      return signature_failure if !valid_mandrill_signature?
+    else
+      Rails.logger.warn(
+        "Received a Mandrill webhook, but no authentication key has been configured. This is unsafe behaviour and will be disallowed in the future.",
+      )
+    end
+
+    JSON
+      .parse(params["mandrill_events"])
+      .each do |event|
+        message_id = event.dig("msg", "metadata", "message_id")
+        to_address = event.dig("msg", "email")
+        error_code = event.dig("msg", "diag")
+
+        case event["event"]
+        when "hard_bounce"
+          process_bounce(message_id, to_address, SiteSetting.hard_bounce_score, error_code)
+        when "soft_bounce"
+          process_bounce(message_id, to_address, SiteSetting.soft_bounce_score, error_code)
+        end
+      end
+
+    success
+  end
+
   def mandrill_head
     # Mandrill sends a HEAD request to validate the webhook before saving
     # Rails interprets it as a GET request
@@ -73,6 +115,14 @@ class WebhooksController < ActionController::Base
   end
 
   def postmark
+    if SiteSetting.postmark_webhook_token.present?
+      return signature_failure if !valid_postmark_token?
+    else
+      Rails.logger.warn(
+        "Received a Postmark webhook, but no token has been configured. This is unsafe behaviour and will be disallowed in the future.",
+      )
+    end
+
     # see https://postmarkapp.com/developer/webhooks/bounce-webhook#bounce-webhook-data
     # and https://postmarkapp.com/developer/api/bounce-api#bounce-types
 
@@ -90,6 +140,14 @@ class WebhooksController < ActionController::Base
   end
 
   def sparkpost
+    if SiteSetting.sparkpost_webhook_token.present?
+      return signature_failure if !valid_sparkpost_token?
+    else
+      Rails.logger.warn(
+        "Received a Sparkpost webhook, but no token has been configured. This is unsafe behaviour and will be disallowed in the future.",
+      )
+    end
+
     events = params["_json"] || [params]
     events.each do |event|
       message_event = event.dig("msys", "message_event")
@@ -131,7 +189,7 @@ class WebhooksController < ActionController::Base
 
   private
 
-  def mailgun_failure
+  def signature_failure
     render body: nil, status: 406
   end
 
@@ -158,7 +216,7 @@ class WebhooksController < ActionController::Base
 
   def handle_mailgun_legacy(params)
     unless valid_mailgun_signature?(params["token"], params["timestamp"], params["signature"])
-      return mailgun_failure
+      return signature_failure
     end
 
     event = params["event"]
@@ -185,7 +243,7 @@ class WebhooksController < ActionController::Base
              signature["timestamp"],
              signature["signature"],
            )
-      return mailgun_failure
+      return signature_failure
     end
 
     data = params["event-data"]
@@ -205,6 +263,58 @@ class WebhooksController < ActionController::Base
     success
   end
 
+  def valid_sendgrid_signature?
+    signature = request.headers["X-Twilio-Email-Event-Webhook-Signature"]
+    timestamp = request.headers["X-Twilio-Email-Event-Webhook-Timestamp"]
+    request.body.rewind
+    payload = request.body.read
+
+    hashed_payload = Digest::SHA256.digest("#{timestamp}#{payload}")
+    decoded_signature = Base64.decode64(signature)
+
+    begin
+      public_key = OpenSSL::PKey::EC.new(Base64.decode64(SiteSetting.sendgrid_verification_key))
+    rescue StandardError => err
+      Rails.logger.error("Invalid Sendgrid verification key")
+      return false
+    end
+
+    public_key.dsa_verify_asn1(hashed_payload, decoded_signature)
+  end
+
+  def valid_mailjet_token?
+    ActiveSupport::SecurityUtils.secure_compare(params[:t], SiteSetting.mailjet_webhook_token)
+  end
+
+  def valid_mandrill_signature?
+    signature = request.headers["X-Mandrill-Signature"]
+
+    payload = "#{Discourse.base_url}/webhooks/mandrill"
+    params
+      .permit(:mandrill_events)
+      .to_h
+      .sort_by(&:first)
+      .each do |key, value|
+        payload += key.to_s
+        payload += value
+      end
+
+    payload_signature =
+      OpenSSL::HMAC.digest("sha1", SiteSetting.mandrill_authentication_key, payload)
+    ActiveSupport::SecurityUtils.secure_compare(
+      signature,
+      Base64.strict_encode64(payload_signature),
+    )
+  end
+
+  def valid_postmark_token?
+    ActiveSupport::SecurityUtils.secure_compare(params[:t], SiteSetting.postmark_webhook_token)
+  end
+
+  def valid_sparkpost_token?
+    ActiveSupport::SecurityUtils.secure_compare(params[:t], SiteSetting.sparkpost_webhook_token)
+  end
+
   def process_bounce(message_id, to_address, bounce_score, bounce_error_code = nil)
     return if message_id.blank? || to_address.blank?
 
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b4d31c8a2b9..de0a22b0b12 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -50,7 +50,7 @@ module ApplicationHelper
 
   def google_universal_analytics_json(ua_domain_name = nil)
     result = {}
-    result[:cookieDomain] = ua_domain_name.gsub(%r{^http(s)?://}, "") if ua_domain_name
+    result[:cookieDomain] = ua_domain_name.gsub(%r{\Ahttp(s)?://}, "") if ua_domain_name
     result[:userId] = current_user.id if current_user.present?
     result[:allowLinker] = true if SiteSetting.ga_universal_auto_link_domains.present?
     result.to_json
@@ -119,9 +119,9 @@ module ApplicationHelper
       # seconds.
       if !script.start_with?("discourse/tests/")
         if is_brotli_req?
-          path = path.gsub(/\.([^.]+)$/, '.br.\1')
+          path = path.gsub(/\.([^.]+)\z/, '.br.\1')
         elsif is_gzip_req?
-          path = path.gsub(/\.([^.]+)$/, '.gz.\1')
+          path = path.gsub(/\.([^.]+)\z/, '.gz.\1')
         end
       end
     elsif GlobalSetting.cdn_url&.start_with?("https") && is_brotli_req? &&
@@ -192,7 +192,7 @@ module ApplicationHelper
     result << "category-#{@category.slug_path.join("-")}" if @category && @category.url.present?
 
     if current_user.present? && current_user.primary_group_id &&
-         primary_group_name = Group.where(id: current_user.primary_group_id).pluck_first(:name)
+         primary_group_name = Group.where(id: current_user.primary_group_id).pick(:name)
       result << "primary-group-#{primary_group_name.downcase}"
     end
 
@@ -313,6 +313,15 @@ module ApplicationHelper
         result << tag(:meta, { name: "twitter:#{property}", content: content }, nil, true)
       end
     end
+    Array
+      .wrap(opts[:breadcrumbs])
+      .each do |breadcrumb|
+        result << tag(:meta, property: "og:article:section", content: breadcrumb[:name])
+        result << tag(:meta, property: "og:article:section:color", content: breadcrumb[:color])
+      end
+    Array
+      .wrap(opts[:tags])
+      .each { |tag_name| result << tag(:meta, property: "og:article:tag", content: tag_name) }
 
     if opts[:read_time] && opts[:read_time] > 0 && opts[:like_count] && opts[:like_count] > 0
       result << tag(:meta, name: "twitter:label1", value: I18n.t("reading_time"))
@@ -408,6 +417,10 @@ module ApplicationHelper
       end
   end
 
+  def waving_hand_url
+    UrlHelper.cook_url(Emoji.url_for(":wave:t#{rand(2..6)}:"))
+  end
+
   def login_path
     "#{Discourse.base_path}/login"
   end
@@ -537,7 +550,7 @@ module ApplicationHelper
 
     return if theme_id.blank?
 
-    @scheme_id = Theme.where(id: theme_id).pluck_first(:color_scheme_id)
+    @scheme_id = Theme.where(id: theme_id).pick(:color_scheme_id)
   end
 
   def dark_scheme_id
diff --git a/app/helpers/splash_screen_helper.rb b/app/helpers/splash_screen_helper.rb
index af2ec3824d4..275c5452acd 100644
--- a/app/helpers/splash_screen_helper.rb
+++ b/app/helpers/splash_screen_helper.rb
@@ -19,7 +19,7 @@ module SplashScreenHelper
 
   def self.load_js
     File.read("#{Rails.root}/app/assets/javascripts/discourse/dist/assets/splash-screen.js").sub(
-      "//# sourceMappingURL=splash-screen.map\n",
+      "//# sourceMappingURL=splash-screen.map",
       "",
     )
   rescue Errno::ENOENT
diff --git a/app/helpers/user_notifications_helper.rb b/app/helpers/user_notifications_helper.rb
index e92dbeccd96..deb40425015 100644
--- a/app/helpers/user_notifications_helper.rb
+++ b/app/helpers/user_notifications_helper.rb
@@ -20,8 +20,8 @@ module UserNotificationsHelper
 
   def logo_url
     logo_url = SiteSetting.site_digest_logo_url
-    logo_url = SiteSetting.site_logo_url if logo_url.blank? || logo_url =~ /\.svg$/i
-    return nil if logo_url.blank? || logo_url =~ /\.svg$/i
+    logo_url = SiteSetting.site_logo_url if logo_url.blank? || logo_url =~ /\.svg\z/i
+    return nil if logo_url.blank? || logo_url =~ /\.svg\z/i
     logo_url
   end
 
diff --git a/app/jobs/base.rb b/app/jobs/base.rb
index 0f671c95a55..1f6839ad8d6 100644
--- a/app/jobs/base.rb
+++ b/app/jobs/base.rb
@@ -29,7 +29,7 @@ module Jobs
   end
 
   def self.num_email_retry_jobs
-    Sidekiq::RetrySet.new.count { |job| job.klass =~ /Email$/ }
+    Sidekiq::RetrySet.new.count { |job| job.klass =~ /Email\z/ }
   end
 
   class Base
@@ -161,6 +161,15 @@ module Jobs
 
     include Sidekiq::Worker
 
+    def self.cluster_concurrency(val)
+      raise ArgumentError, "cluster_concurrency must be 1 or nil" if val != 1 && val != nil
+      @cluster_concurrency = val
+    end
+
+    def self.get_cluster_concurrency
+      @cluster_concurrency
+    end
+
     def log(*args)
       args.each do |arg|
         Rails.logger.info "#{Time.now.to_formatted_s(:db)}: [#{self.class.name.upcase}] #{arg}"
@@ -216,7 +225,41 @@ module Jobs
       end
     end
 
+    def self.cluster_concurrency_redis_key
+      "cluster_concurrency:#{self}"
+    end
+
+    def self.clear_cluster_concurrency_lock!
+      Discourse.redis.without_namespace.del(cluster_concurrency_redis_key)
+    end
+
+    def self.acquire_cluster_concurrency_lock!
+      !!Discourse.redis.without_namespace.set(cluster_concurrency_redis_key, 0, nx: true, ex: 120)
+    end
+
     def perform(*args)
+      requeued = false
+      keepalive_thread = nil
+      finished = false
+
+      if self.class.get_cluster_concurrency
+        if !self.class.acquire_cluster_concurrency_lock!
+          self.class.perform_in(10.seconds, *args)
+          requeued = true
+          return
+        end
+        parent_thread = Thread.current
+        cluster_concurrency_redis_key = self.class.cluster_concurrency_redis_key
+
+        keepalive_thread =
+          Thread.new do
+            while parent_thread.alive? && !finished
+              Discourse.redis.without_namespace.expire(cluster_concurrency_redis_key, 120)
+              sleep 60
+            end
+          end
+      end
+
       opts = args.extract_options!.with_indifferent_access
 
       Sidekiq.redis { |r| r.set("last_job_perform_at", Time.now.to_i) } if ::Jobs.run_later?
@@ -278,6 +321,12 @@ module Jobs
 
       nil
     ensure
+      if self.class.get_cluster_concurrency && !requeued
+        finished = true
+        keepalive_thread.wakeup
+        keepalive_thread.join
+        self.class.clear_cluster_concurrency_lock!
+      end
       ActiveRecord::Base.connection_handler.clear_active_connections!
     end
   end
diff --git a/app/jobs/onceoff/onceoff.rb b/app/jobs/onceoff/onceoff.rb
index df9c94e54d0..efbc0ae5f5e 100644
--- a/app/jobs/onceoff/onceoff.rb
+++ b/app/jobs/onceoff/onceoff.rb
@@ -4,7 +4,7 @@ class Jobs::Onceoff < ::Jobs::Base
   sidekiq_options retry: false
 
   def self.name_for(klass)
-    klass.name.sub(/^Jobs\:\:/, "")
+    klass.name.sub(/\AJobs\:\:/, "")
   end
 
   def running_key_name
diff --git a/app/jobs/regular/anonymize_user.rb b/app/jobs/regular/anonymize_user.rb
index 7ae14c11732..71069f2c79c 100644
--- a/app/jobs/regular/anonymize_user.rb
+++ b/app/jobs/regular/anonymize_user.rb
@@ -3,6 +3,9 @@
 module Jobs
   class AnonymizeUser < ::Jobs::Base
     sidekiq_options queue: "low"
+    # this is an extremely expensive job
+    # we are limiting it so only 1 per cluster runs
+    cluster_concurrency 1
 
     def execute(args)
       @user_id = args[:user_id]
diff --git a/app/jobs/regular/backfill_sidebar_site_settings.rb b/app/jobs/regular/backfill_sidebar_site_settings.rb
index 9313a9afcab..2489d5debea 100644
--- a/app/jobs/regular/backfill_sidebar_site_settings.rb
+++ b/app/jobs/regular/backfill_sidebar_site_settings.rb
@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
 class Jobs::BackfillSidebarSiteSettings < Jobs::Base
+  # There should only be one of these jobs running at a time and it will be ordered based on the order in which the job
+  # was enqueued.
+  cluster_concurrency 1
+
   def execute(args)
     SidebarSiteSettingsBackfiller.new(
       args[:setting_name],
diff --git a/app/jobs/regular/change_display_name.rb b/app/jobs/regular/change_display_name.rb
new file mode 100644
index 00000000000..2c1aea46f80
--- /dev/null
+++ b/app/jobs/regular/change_display_name.rb
@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+module Jobs
+  class ChangeDisplayName < ::Jobs::Base
+    sidekiq_options queue: "low"
+
+    # Avoid race conditions if a user's name is updated several times
+    # in quick succession.
+    cluster_concurrency 1
+
+    def execute(args)
+      @user = User.find_by(id: args[:user_id])
+
+      return unless user.present?
+
+      # We need to account for the case where the instance allows
+      # name to be empty by falling back to username.
+      @old_display_name = (args[:old_name].presence || user.username).unicode_normalize
+      @new_display_name = (args[:new_name].presence || user.username).unicode_normalize
+
+      @quote_rewriter = QuoteRewriter.new(user.id)
+
+      update_posts
+      update_revisions
+    end
+
+    private
+
+    attr_reader :user, :old_display_name, :new_display_name, :quote_rewriter
+
+    def update_posts
+      Post
+        .with_deleted
+        .joins(quoted("posts.id"))
+        .where("p.user_id = :user_id", user_id: user.id)
+        .find_each { |post| update_post(post) }
+    end
+
+    def update_revisions
+      PostRevision
+        .joins(quoted("post_revisions.post_id"))
+        .where("p.user_id = :user_id", user_id: user.id)
+        .find_each { |revision| update_revision(revision) }
+    end
+
+    def quoted(post_id_column)
+      <<~SQL
+        JOIN quoted_posts AS q ON (q.post_id = #{post_id_column})
+        JOIN posts AS p ON (q.quoted_post_id = p.id)
+      SQL
+    end
+
+    def update_post(post)
+      post.raw = update_raw(post.raw)
+      post.cooked = update_cooked(post.cooked)
+
+      post.update_columns(raw: post.raw, cooked: post.cooked)
+
+      SearchIndexer.index(post, force: true) if post.topic
+    rescue => e
+      Discourse.warn_exception(e, message: "Failed to update post with id #{post.id}")
+    end
+
+    def update_revision(revision)
+      if revision.modifications["raw"] || revision.modifications["cooked"]
+        revision.modifications["raw"].map! { |raw| update_raw(raw) }
+        revision.modifications["cooked"].map! { |cooked| update_cooked(cooked) }
+        revision.save!
+      end
+    rescue => e
+      Discourse.warn_exception(e, message: "Failed to update post revision with id #{revision.id}")
+    end
+
+    def update_raw(raw)
+      @quote_rewriter.rewrite_raw_display_name(raw, old_display_name, new_display_name)
+    end
+
+    # Uses Nokogiri instead of rebake, because it works for posts and revisions
+    # and there is no reason to invalidate oneboxes, run the post analyzer etc.
+    # when only the display name changes.
+    def update_cooked(cooked)
+      doc = Nokogiri::HTML5.fragment(cooked)
+
+      @quote_rewriter.rewrite_cooked_display_name(doc, old_display_name, new_display_name)
+
+      doc.to_html
+    end
+  end
+end
diff --git a/app/jobs/regular/enable_bootstrap_mode.rb b/app/jobs/regular/enable_bootstrap_mode.rb
index 8b7d456f4cc..811eee8475c 100644
--- a/app/jobs/regular/enable_bootstrap_mode.rb
+++ b/app/jobs/regular/enable_bootstrap_mode.rb
@@ -5,11 +5,12 @@ module Jobs
     sidekiq_options queue: "critical"
 
     def execute(args)
-      raise Discourse::InvalidParameters.new(:user_id) unless args[:user_id].present?
+      raise Discourse::InvalidParameters.new(:user_id) if !args[:user_id].present?
+
       return if SiteSetting.bootstrap_mode_enabled
 
       user = User.find_by(id: args[:user_id])
-      return unless user.is_singular_admin?
+      return if !user.is_singular_admin?
 
       # let's enable bootstrap mode settings
       if SiteSetting.default_trust_level == TrustLevel[0]
diff --git a/app/jobs/regular/export_csv_file.rb b/app/jobs/regular/export_csv_file.rb
index b725ab5dd2f..11c850d1185 100644
--- a/app/jobs/regular/export_csv_file.rb
+++ b/app/jobs/regular/export_csv_file.rb
@@ -86,26 +86,9 @@ module Jobs
 
       filename = entities[0][:filename] # use first entity as a name for this export
       user_export = UserExport.create(file_name: filename, user_id: @current_user.id)
-
       filename = "#{filename}-#{user_export.id}"
-      dirname = "#{UserExport.base_directory}/#{filename}"
 
-      # ensure directory exists
-      FileUtils.mkdir_p(dirname) unless Dir.exist?(dirname)
-
-      # Generate a compressed CSV file
-      begin
-        entities.each do |entity|
-          CSV.open("#{dirname}/#{entity[:filename]}.csv", "w") do |csv|
-            csv << get_header(entity[:name]) if entity[:name] != "report"
-            public_send(entity[:method]).each { |d| csv << d }
-          end
-        end
-
-        zip_filename = Compression::Zip.new.compress(UserExport.base_directory, filename)
-      ensure
-        FileUtils.rm_rf(dirname)
-      end
+      zip_filename = write_to_csv_and_zip(filename, entities)
 
       # create upload
       upload = nil
@@ -172,12 +155,14 @@ module Jobs
 
       staff_action_data =
         if @current_user.admin?
-          UserHistory.only_staff_actions.order("id DESC")
+          UserHistory.only_staff_actions
         else
-          UserHistory.where(admin_only: false).only_staff_actions.order("id DESC")
+          UserHistory.where(admin_only: false).only_staff_actions
         end
 
-      staff_action_data.each { |staff_action| yield get_staff_action_fields(staff_action) }
+      staff_action_data.find_each(order: :desc) do |staff_action|
+        yield get_staff_action_fields(staff_action)
+      end
     end
 
     def screened_email_export
@@ -185,7 +170,7 @@ module Jobs
 
       ScreenedEmail
         .order("last_match_at DESC")
-        .each { |screened_email| yield get_screened_email_fields(screened_email) }
+        .find_each { |screened_email| yield get_screened_email_fields(screened_email) }
     end
 
     def screened_ip_export
@@ -475,5 +460,22 @@ module Jobs
 
       post
     end
+
+    def write_to_csv_and_zip(filename, entities)
+      dirname = "#{UserExport.base_directory}/#{filename}"
+      FileUtils.mkdir_p(dirname) unless Dir.exist?(dirname)
+      begin
+        entities.each do |entity|
+          CSV.open("#{dirname}/#{entity[:filename]}.csv", "w") do |csv|
+            csv << get_header(entity[:name]) if entity[:name] != "report"
+            public_send(entity[:method]) { |d| csv << d }
+          end
+        end
+
+        Compression::Zip.new.compress(UserExport.base_directory, filename)
+      ensure
+        FileUtils.rm_rf(dirname)
+      end
+    end
   end
 end
diff --git a/app/jobs/regular/export_user_archive.rb b/app/jobs/regular/export_user_archive.rb
index 59c60740b37..873b78bac3f 100644
--- a/app/jobs/regular/export_user_archive.rb
+++ b/app/jobs/regular/export_user_archive.rb
@@ -459,7 +459,7 @@ module Jobs
 
       # Most Reviewable fields staff-private, but post content needs to be exported.
       ReviewableQueuedPost
-        .where(created_by: @current_user.id)
+        .where(target_created_by_id: @current_user.id)
         .order(:created_at)
         .each do |rev|
           yield(
diff --git a/app/jobs/regular/notify_reviewable.rb b/app/jobs/regular/notify_reviewable.rb
index a59adc4ac19..ed8bdbc8509 100644
--- a/app/jobs/regular/notify_reviewable.rb
+++ b/app/jobs/regular/notify_reviewable.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class Jobs::NotifyReviewable < ::Jobs::Base
-  # remove all the legacy stuff here when redesigned_user_menu_enabled is
-  # removed
   def execute(args)
     return unless reviewable = Reviewable.find_by(id: args[:reviewable_id])
 
@@ -22,73 +20,49 @@ class Jobs::NotifyReviewable < ::Jobs::Base
         end
     end
 
-    counts = Hash.new(0)
+    DistributedMutex.synchronize("notify_reviewable_job", validity: 120) do
+      counts = Hash.new(0)
+      Reviewable
+        .default_visible
+        .pending
+        .group(:reviewable_by_moderator, :reviewable_by_group_id)
+        .pluck(:reviewable_by_moderator, :reviewable_by_group_id, "count(*)")
+        .each do |reviewable_by_moderator, reviewable_by_group_id, count|
+          counts[:admins] += count
+          counts[:moderators] += count if reviewable_by_moderator
+          counts[reviewable_by_group_id] += count if reviewable_by_group_id
+        end
 
-    Reviewable.default_visible.pending.each do |r|
-      counts[:admins] += 1
-      counts[:moderators] += 1 if r.reviewable_by_moderator?
-      counts[r.reviewable_by_group_id] += 1 if r.reviewable_by_group_id
-    end
-
-    if SiteSetting.legacy_navigation_menu?
-      notify_legacy(
-        User.real.admins.pluck(:id),
-        count: counts[:admins],
-        updates: all_updates[:admins],
-      )
-    else
       notify_users(User.real.admins, all_updates[:admins])
-    end
 
-    if reviewable.reviewable_by_moderator?
-      if SiteSetting.legacy_navigation_menu?
-        notify_legacy(
-          User.real.moderators.where("id NOT IN (?)", @contacted).pluck(:id),
-          count: counts[:moderators],
-          updates: all_updates[:moderators],
-        )
-      else
+      if reviewable.reviewable_by_moderator?
         notify_users(
           User.real.moderators.where("id NOT IN (?)", @contacted),
           all_updates[:moderators],
         )
       end
-    end
 
-    if SiteSetting.enable_category_group_moderation? && (group = reviewable.reviewable_by_group)
-      users = group.users.includes(:group_users).where("users.id NOT IN (?)", @contacted)
+      if SiteSetting.enable_category_group_moderation? && (group = reviewable.reviewable_by_group)
+        users = group.users.includes(:group_users).where("users.id NOT IN (?)", @contacted)
 
-      users.find_each do |user|
-        count = 0
-        updates = {}
-        user.group_users.each do |gu|
-          updates.merge!(all_updates[gu.group_id])
-          count += counts[gu.group_id]
-        end
+        users.find_each do |user|
+          count = 0
+          updates = {}
+          user.group_users.each do |gu|
+            updates.merge!(all_updates[gu.group_id])
+            count += counts[gu.group_id]
+          end
 
-        if SiteSetting.legacy_navigation_menu?
-          notify_legacy([user.id], count: count, updates: updates)
-        else
           notify_user(user, updates)
         end
-      end
 
-      @contacted += users.pluck(:id)
+        @contacted += users.pluck(:id)
+      end
     end
   end
 
   protected
 
-  def notify_legacy(user_ids, count:, updates:)
-    return if user_ids.blank?
-
-    data = { reviewable_count: count }
-    data[:updates] = updates if updates.present?
-
-    MessageBus.publish("/reviewable_counts", data, user_ids: user_ids)
-    @contacted += user_ids
-  end
-
   def notify_users(users, updates)
     users.find_each { |user| notify_user(user, updates) }
     @contacted += users.pluck(:id)
diff --git a/app/jobs/regular/pull_hotlinked_images.rb b/app/jobs/regular/pull_hotlinked_images.rb
index 43a64f519eb..ec8a7c78d6b 100644
--- a/app/jobs/regular/pull_hotlinked_images.rb
+++ b/app/jobs/regular/pull_hotlinked_images.rb
@@ -24,6 +24,7 @@ module Jobs
       extract_images_from(post.cooked).each do |node|
         download_src =
           original_src = node["src"] || node[PrettyText::BLOCKED_HOTLINKED_SRC_ATTR] || node["href"]
+        download_src = replace_encoded_src(download_src)
         download_src =
           "#{SiteSetting.force_https ? "https" : "http"}:#{original_src}" if original_src.start_with?(
           "//",
@@ -198,6 +199,10 @@ module Jobs
 
     protected
 
+    def replace_encoded_src(src)
+      PostHotlinkedMedia.normalize_src(src, reset_scheme: false)
+    end
+
     def normalize_src(src)
       PostHotlinkedMedia.normalize_src(src)
     end
diff --git a/app/jobs/regular/toggle_topic_closed.rb b/app/jobs/regular/toggle_topic_closed.rb
index a02831ca61c..6a1c811eead 100644
--- a/app/jobs/regular/toggle_topic_closed.rb
+++ b/app/jobs/regular/toggle_topic_closed.rb
@@ -1,10 +1,13 @@
 # frozen_string_literal: true
 
 module Jobs
-  # TODO: DEPRECATED - Use OpenTopic and CloseTopic instead.
-  # (martin - 2021-05-01) - Delete once topic timer revamp is completed.
   class ToggleTopicClosed < ::Jobs::Base
     def execute(args)
+      Discourse.deprecate(
+        "ToggleTopicClosed is deprecated. Use OpenTopic and CloseTopic instead.",
+        drop_from: "3.3.0",
+      )
+
       topic_timer = TopicTimer.find_by(id: args[:topic_timer_id] || args[:topic_status_update_id])
 
       # state false is Open Topic
diff --git a/app/jobs/regular/update_username.rb b/app/jobs/regular/update_username.rb
index 3a0ed3194ef..df7cd667b11 100644
--- a/app/jobs/regular/update_username.rb
+++ b/app/jobs/regular/update_username.rb
@@ -11,8 +11,11 @@ module Jobs
 
       @old_username = args[:old_username].unicode_normalize
       @new_username = args[:new_username].unicode_normalize
+
       @avatar_img = PrettyText.avatar_img(args[:avatar_template], "tiny")
 
+      @quote_rewriter = QuoteRewriter.new(@user_id)
+
       @raw_mention_regex =
         /
         (?:
@@ -26,13 +29,10 @@ module Jobs
         )
       /ix
 
-      @raw_quote_regex = /(\[quote\s*=\s*["'']?)#{@old_username}(\,?[^\]]*\])/i
-
       cooked_username = PrettyText::Helpers.format_username(@old_username)
-      @cooked_mention_username_regex = /^@#{cooked_username}$/i
+      @cooked_mention_username_regex = /\A@#{cooked_username}\z/i
       @cooked_mention_user_path_regex =
-        %r{^/u(?:sers)?/#{UrlHelper.encode_component(cooked_username)}$}i
-      @cooked_quote_username_regex = /(?<=\s)#{cooked_username}(?=:)/i
+        %r{\A/u(?:sers)?/#{UrlHelper.encode_component(cooked_username)}\z}i
 
       update_posts
       update_revisions
@@ -46,6 +46,7 @@ module Jobs
     def update_posts
       updated_post_ids = Set.new
 
+      # Other people mentioning this user
       Post
         .with_deleted
         .joins(mentioned("posts.id"))
@@ -55,6 +56,16 @@ module Jobs
           updated_post_ids << post.id
         end
 
+      # User mentioning self (not included in post_actions table)
+      Post
+        .with_deleted
+        .where("raw ILIKE ?", "%@#{@old_username}%")
+        .where("posts.user_id = :user_id", user_id: @user_id)
+        .find_each do |post|
+          update_post(post)
+          updated_post_ids << post.id
+        end
+
       Post
         .with_deleted
         .joins(quoted("posts.id"))
@@ -64,8 +75,7 @@ module Jobs
 
     def update_revisions
       PostRevision
-        .joins(mentioned("post_revisions.post_id"))
-        .where("a.user_id = :user_id", user_id: @user_id)
+        .where("modifications SIMILAR TO ?", "%(raw|cooked)%@#{@old_username}%")
         .find_each { |revision| update_revision(revision) }
 
       PostRevision
@@ -150,9 +160,10 @@ module Jobs
     end
 
     def update_raw(raw)
-      raw.gsub(@raw_mention_regex, "@#{@new_username}").gsub(
-        @raw_quote_regex,
-        "\\1#{@new_username}\\2",
+      @quote_rewriter.rewrite_raw_username(
+        raw.gsub(@raw_mention_regex, "@#{@new_username}"),
+        @old_username,
+        @new_username,
       )
     end
 
@@ -172,36 +183,9 @@ module Jobs
           ) if a["href"]
         end
 
-      doc
-        .css("aside.quote")
-        .each do |aside|
-          next unless div = aside.at_css("div.title")
-
-          username_replaced = false
-
-          aside["data-username"] = @new_username if aside["data-username"] == @old_username
-
-          div.children.each do |child|
-            if child.text?
-              content = child.content
-              username_replaced =
-                content.gsub!(@cooked_quote_username_regex, @new_username).present?
-              child.content = content if username_replaced
-            end
-          end
-
-          if username_replaced || quotes_correct_user?(aside)
-            div.at_css("img.avatar")&.replace(@avatar_img)
-          end
-        end
+      @quote_rewriter.rewrite_cooked_username(doc, @old_username, @new_username, @avatar_img)
 
       doc.to_html
     end
-
-    def quotes_correct_user?(aside)
-      Post.where(topic_id: aside["data-topic"], post_number: aside["data-post"]).pluck_first(
-        :user_id,
-      ) == @user_id
-    end
   end
 end
diff --git a/app/jobs/regular/user_email.rb b/app/jobs/regular/user_email.rb
index 6bbbe6be8fb..f12165e2c94 100644
--- a/app/jobs/regular/user_email.rb
+++ b/app/jobs/regular/user_email.rb
@@ -34,11 +34,13 @@ module Jobs
       # of extra work when emails are disabled.
       return if quit_email_early?
 
+      args[:type] = args[:type].to_s
+
       send_user_email(args)
 
-      if args[:user_id].present? && args[:type].to_s == "digest"
+      if args[:type] == "digest"
         # Record every attempt at sending a digest email, even if it was skipped
-        UserStat.where(user_id: args[:user_id]).update_all(digest_attempted_at: Time.zone.now)
+        UserStat.where(user_id: args[:user_id]).update_all(digest_attempted_at: Time.current)
       end
     end
 
@@ -108,11 +110,15 @@ module Jobs
         return skip_message(SkippedEmailLog.reason_types[:user_email_anonymous_user])
       end
 
-      if user.suspended? && !%w[user_private_message account_suspended].include?(type.to_s)
-        return skip_message(SkippedEmailLog.reason_types[:user_email_user_suspended_not_pm])
+      if user.suspended?
+        if !type.in?(%w[user_private_message account_suspended])
+          return skip_message(SkippedEmailLog.reason_types[:user_email_user_suspended_not_pm])
+        elsif post&.topic&.group_pm?
+          return skip_message(SkippedEmailLog.reason_types[:user_email_user_suspended])
+        end
       end
 
-      if type.to_s == "digest"
+      if type == "digest"
         return if user.staged
         if user.last_emailed_at &&
              user.last_emailed_at >
@@ -184,26 +190,26 @@ module Jobs
       if email_token.present?
         email_args[:email_token] = email_token
 
-        if type.to_s == "confirm_new_email"
+        if type == "confirm_new_email"
           change_req = EmailChangeRequest.find_by_new_token(email_token)
 
           email_args[:requested_by_admin] = change_req.requested_by_admin? if change_req
         end
       end
 
-      email_args[:new_email] = args[:new_email] || user.email if type.to_s == "notify_old_email" ||
-        type.to_s == "notify_old_email_add"
+      email_args[:new_email] = args[:new_email] || user.email if type == "notify_old_email" ||
+        type == "notify_old_email_add"
 
       if args[:client_ip] && args[:user_agent]
         email_args[:client_ip] = args[:client_ip]
         email_args[:user_agent] = args[:user_agent]
       end
 
-      if EmailLog.reached_max_emails?(user, type.to_s)
+      if EmailLog.reached_max_emails?(user, type)
         return skip_message(SkippedEmailLog.reason_types[:exceeded_emails_limit])
       end
 
-      if !EmailLog::CRITICAL_EMAIL_TYPES.include?(type.to_s) &&
+      if !EmailLog::CRITICAL_EMAIL_TYPES.include?(type) &&
            user.user_stat.bounce_score >= SiteSetting.bounce_score_threshold
         return skip_message(SkippedEmailLog.reason_types[:exceeded_bounces_limit])
       end
@@ -266,12 +272,12 @@ module Jobs
     end
 
     def always_email_private_message?(user, type)
-      type.to_s == "user_private_message" &&
+      type == "user_private_message" &&
         user.user_option.email_messages_level == UserOption.email_level_types[:always]
     end
 
     def always_email_regular?(user, type)
-      type.to_s != "user_private_message" &&
+      type != "user_private_message" &&
         user.user_option.email_level == UserOption.email_level_types[:always]
     end
   end
diff --git a/app/jobs/scheduled/admin_problems.rb b/app/jobs/scheduled/admin_problems.rb
new file mode 100644
index 00000000000..5e221066a32
--- /dev/null
+++ b/app/jobs/scheduled/admin_problems.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Jobs
+  class AdminProblems < ::Jobs::Scheduled
+    every 30.minutes
+
+    def execute(args)
+      Notification
+        .where(notification_type: Notification.types[:admin_problems])
+        .where("created_at < ?", 7.days.ago)
+        .destroy_all
+
+      return if !persistent_problems?
+
+      notified_user_ids =
+        Notification.where(notification_type: Notification.types[:admin_problems]).pluck(:user_id)
+
+      users = Group[:admins].users.where.not(id: notified_user_ids)
+
+      users.each do |user|
+        Notification.create!(
+          notification_type: Notification.types[:admin_problems],
+          user_id: user.id,
+          data: "{}",
+        )
+      end
+    end
+
+    private
+
+    def persistent_problems?
+      problems_started_at = AdminDashboardData.problems_started_at
+      problems_started_at && problems_started_at < 2.days.ago
+    end
+  end
+end
diff --git a/app/jobs/scheduled/auto_queue_handler.rb b/app/jobs/scheduled/auto_queue_handler.rb
index 66150fb8c97..7cb7ca54b62 100644
--- a/app/jobs/scheduled/auto_queue_handler.rb
+++ b/app/jobs/scheduled/auto_queue_handler.rb
@@ -7,14 +7,14 @@ module Jobs
     every 1.day
 
     def execute(args)
-      return unless SiteSetting.auto_handle_queued_age.to_i > 0
+      return if SiteSetting.auto_handle_queued_age.to_i.zero?
 
       Reviewable
         .pending
         .where("created_at < ?", SiteSetting.auto_handle_queued_age.to_i.days.ago)
         .each do |reviewable|
           if reviewable.is_a?(ReviewableFlaggedPost)
-            reviewable.perform(Discourse.system_user, :ignore, expired: true)
+            reviewable.perform(Discourse.system_user, :ignore_and_do_nothing, expired: true)
           elsif reviewable.is_a?(ReviewableQueuedPost)
             reviewable.perform(Discourse.system_user, :reject_post)
           elsif reviewable.is_a?(ReviewableUser)
diff --git a/app/jobs/scheduled/check_translation_overrides.rb b/app/jobs/scheduled/check_translation_overrides.rb
new file mode 100644
index 00000000000..5efed5592dc
--- /dev/null
+++ b/app/jobs/scheduled/check_translation_overrides.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Jobs
+  class CheckTranslationOverrides < ::Jobs::Scheduled
+    every 1.day
+
+    def execute(args)
+      deprecated_ids = []
+      invalid_ids = []
+      outdated_ids = []
+
+      TranslationOverride.find_each do |override|
+        if override.original_translation_deleted?
+          deprecated_ids << override.id
+        elsif override.invalid_interpolation_keys.present?
+          invalid_ids << override.id
+        elsif override.original_translation_updated?
+          outdated_ids << override.id
+        end
+      end
+
+      TranslationOverride.where(id: deprecated_ids).update_all(status: "deprecated")
+      TranslationOverride.where(id: outdated_ids).update_all(status: "outdated")
+      TranslationOverride.where(id: invalid_ids).update_all(status: "invalid_interpolation_keys")
+    end
+  end
+end
diff --git a/app/jobs/scheduled/clean_up_inactive_users.rb b/app/jobs/scheduled/clean_up_inactive_users.rb
index b52ae8d5e21..183a5f44600 100644
--- a/app/jobs/scheduled/clean_up_inactive_users.rb
+++ b/app/jobs/scheduled/clean_up_inactive_users.rb
@@ -8,17 +8,19 @@ module Jobs
       return if SiteSetting.clean_up_inactive_users_after_days <= 0
 
       User
-        .joins("LEFT JOIN posts ON posts.user_id = users.id")
         .where(
           last_posted_at: nil,
           trust_level: TrustLevel.levels[:newuser],
           admin: false,
           moderator: false,
         )
+        .where("users.created_at < ?", SiteSetting.clean_up_inactive_users_after_days.days.ago)
         .where(
-          "posts.user_id IS NULL AND users.last_seen_at < ?",
+          "users.last_seen_at < ? OR users.last_seen_at IS NULL",
           SiteSetting.clean_up_inactive_users_after_days.days.ago,
         )
+        .where
+        .missing(:posts, :topics)
         .limit(1000)
         .pluck(:id)
         .each_slice(50) { |slice| destroy(slice) }
diff --git a/app/jobs/scheduled/dashboard_stats.rb b/app/jobs/scheduled/dashboard_stats.rb
deleted file mode 100644
index a81d0b5d7b3..00000000000
--- a/app/jobs/scheduled/dashboard_stats.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module Jobs
-  class DashboardStats < ::Jobs::Scheduled
-    every 30.minutes
-
-    def execute(args)
-      if persistent_problems?
-        # If there have been problems reported on the dashboard for a while,
-        # send a message to admins no more often than once per week.
-        group_message =
-          GroupMessage.new(Group[:admins].name, :dashboard_problems, limit_once_per: 7.days.to_i)
-        Topic.transaction do
-          group_message.delete_previous!
-          group_message.create
-        end
-      end
-    end
-
-    private
-
-    def persistent_problems?
-      problems_started_at = AdminDashboardData.problems_started_at
-      problems_started_at && problems_started_at < 2.days.ago
-    end
-  end
-end
diff --git a/app/jobs/scheduled/disable_bootstrap_mode.rb b/app/jobs/scheduled/disable_bootstrap_mode.rb
index e9d1db42881..67812c1f7a5 100644
--- a/app/jobs/scheduled/disable_bootstrap_mode.rb
+++ b/app/jobs/scheduled/disable_bootstrap_mode.rb
@@ -5,21 +5,22 @@ module Jobs
     every 1.day
 
     def execute(args)
-      return unless SiteSetting.bootstrap_mode_enabled
-      total_users = User.human_users.count
+      return if !SiteSetting.bootstrap_mode_enabled
 
-      if SiteSetting.bootstrap_mode_min_users == 0 ||
-           total_users > SiteSetting.bootstrap_mode_min_users
-        if SiteSetting.default_trust_level == TrustLevel[1]
-          SiteSetting.set_and_log("default_trust_level", TrustLevel[0])
-        end
-
-        if SiteSetting.default_email_digest_frequency == 1440
-          SiteSetting.set_and_log("default_email_digest_frequency", 10_080)
-        end
-
-        SiteSetting.set_and_log("bootstrap_mode_enabled", false)
+      if SiteSetting.bootstrap_mode_min_users != 0 &&
+           User.human_users.count <= SiteSetting.bootstrap_mode_min_users
+        return
       end
+
+      if SiteSetting.default_trust_level == TrustLevel[1]
+        SiteSetting.set_and_log("default_trust_level", TrustLevel[0])
+      end
+
+      if SiteSetting.default_email_digest_frequency == 1440
+        SiteSetting.set_and_log("default_email_digest_frequency", 10_080)
+      end
+
+      SiteSetting.set_and_log("bootstrap_mode_enabled", false)
     end
   end
 end
diff --git a/app/jobs/scheduled/grant_anniversary_badges.rb b/app/jobs/scheduled/grant_anniversary_badges.rb
index c244a2e92ee..06e35cb3684 100644
--- a/app/jobs/scheduled/grant_anniversary_badges.rb
+++ b/app/jobs/scheduled/grant_anniversary_badges.rb
@@ -6,34 +6,13 @@ module Jobs
 
     def execute(args)
       return unless SiteSetting.enable_badges?
-      badge = Badge.find_by(id: Badge::Anniversary, enabled: true)
-      return unless badge
+      return unless badge = Badge.find_by(id: Badge::Anniversary, enabled: true)
 
       start_date = args[:start_date] || 1.year.ago
       end_date = start_date + 1.year
 
-      fmt_end_date = end_date.iso8601(6)
-      fmt_start_date = start_date.iso8601(6)
-
-      user_ids = DB.query_single <<~SQL
-        SELECT u.id AS user_id
-        FROM users AS u
-        INNER JOIN posts AS p ON p.user_id = u.id
-        INNER JOIN topics AS t ON p.topic_id = t.id
-        LEFT OUTER JOIN user_badges AS ub ON ub.user_id = u.id AND
-          ub.badge_id = #{Badge::Anniversary} AND
-          ub.granted_at BETWEEN '#{fmt_start_date}' AND '#{fmt_end_date}'
-        WHERE u.active AND
-          u.silenced_till IS NULL AND
-          NOT p.hidden AND
-          p.deleted_at IS NULL AND
-          t.visible AND
-          t.archetype <> 'private_message' AND
-          p.created_at BETWEEN '#{fmt_start_date}' AND '#{fmt_end_date}' AND
-          u.created_at <= '#{fmt_start_date}'
-        GROUP BY u.id
-        HAVING COUNT(p.id) > 0 AND COUNT(ub.id) = 0
-      SQL
+      sql = BadgeQueries.anniversaries(start_date, end_date)
+      user_ids = DB.query_single(sql)
 
       User
         .where(id: user_ids)
diff --git a/app/jobs/scheduled/pending_queued_posts_reminder.rb b/app/jobs/scheduled/pending_queued_posts_reminder.rb
index 78f5220adbd..e0f1d557834 100644
--- a/app/jobs/scheduled/pending_queued_posts_reminder.rb
+++ b/app/jobs/scheduled/pending_queued_posts_reminder.rb
@@ -5,7 +5,7 @@ module Jobs
     every 15.minutes
 
     def execute(args)
-      return true unless SiteSetting.notify_about_queued_posts_after > 0
+      return true if SiteSetting.notify_about_queued_posts_after.zero?
 
       queued_post_ids = should_notify_ids
 
diff --git a/app/jobs/scheduled/pending_reviewables_reminder.rb b/app/jobs/scheduled/pending_reviewables_reminder.rb
index deb784934ef..fcc85d5ed4b 100644
--- a/app/jobs/scheduled/pending_reviewables_reminder.rb
+++ b/app/jobs/scheduled/pending_reviewables_reminder.rb
@@ -9,12 +9,15 @@ module Jobs
     def execute(args)
       @sent_reminder = false
 
-      if SiteSetting.notify_about_flags_after > 0
+      if SiteSetting.notify_about_reviewable_item_after > 0
         reviewable_ids =
           Reviewable
             .pending
             .default_visible
-            .where("latest_score < ?", SiteSetting.notify_about_flags_after.to_f.hours.ago)
+            .where(
+              "latest_score < ?",
+              SiteSetting.notify_about_reviewable_item_after.to_f.hours.ago,
+            )
             .order("id DESC")
             .pluck(:id)
 
@@ -30,7 +33,7 @@ module Jobs
                 limit_once_per: false,
                 message_params: {
                   mentions: mentions,
-                  count: SiteSetting.notify_about_flags_after,
+                  count: SiteSetting.notify_about_reviewable_item_after,
                 },
               },
             )
diff --git a/app/jobs/scheduled/poll_mailbox.rb b/app/jobs/scheduled/poll_mailbox.rb
index f4535bc0779..48922da83fb 100644
--- a/app/jobs/scheduled/poll_mailbox.rb
+++ b/app/jobs/scheduled/poll_mailbox.rb
@@ -12,6 +12,12 @@ module Jobs
     def execute(args)
       @args = args
       poll_pop3 if should_poll?
+
+      DiscoursePluginRegistry.mail_pollers.each do |poller|
+        return if !poller.enabled?
+
+        poller.poll_mailbox(method(:process_popmail))
+      end
     end
 
     def should_poll?
diff --git a/app/mailers/group_smtp_mailer.rb b/app/mailers/group_smtp_mailer.rb
index 5d0fe11f7ad..5cd5836752a 100644
--- a/app/mailers/group_smtp_mailer.rb
+++ b/app/mailers/group_smtp_mailer.rb
@@ -40,7 +40,7 @@ class GroupSmtpMailer < ActionMailer::Base
       template: "user_notifications.user_posted_pm",
       use_topic_title_subject: true,
       topic_title: op_incoming_email&.subject || post.topic.title,
-      add_re_to_subject: true,
+      add_re_to_subject: !post.is_first_post?,
       locale: SiteSetting.default_locale,
       delivery_method_options: delivery_options,
       from: from_group.smtp_from_address,
diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb
index d5580858274..555681a361b 100644
--- a/app/mailers/user_notifications.rb
+++ b/app/mailers/user_notifications.rb
@@ -291,6 +291,7 @@ class UserNotifications < ActionMailer::Base
       end
       @counts = [
         {
+          id: "new_topics",
           label_key: "user_notifications.digest.new_topics",
           value: new_topics_count,
           href: "#{Discourse.base_url}/new",
@@ -303,6 +304,7 @@ class UserNotifications < ActionMailer::Base
       value = user.unread_notifications + user.unread_high_priority_notifications
       if value > 0
         @counts << {
+          id: "unread_notifications",
           label_key: "user_notifications.digest.unread_notifications",
           value: value,
           href: "#{Discourse.base_url}/my/notifications",
@@ -310,9 +312,10 @@ class UserNotifications < ActionMailer::Base
       end
 
       if @counts.size < 3
-        value = user.unread_notifications_of_type(Notification.types[:liked])
+        value = user.unread_notifications_of_type(Notification.types[:liked], since: min_date)
         if value > 0
           @counts << {
+            id: "likes_received",
             label_key: "user_notifications.digest.liked_received",
             value: value,
             href: "#{Discourse.base_url}/my/notifications",
@@ -324,6 +327,7 @@ class UserNotifications < ActionMailer::Base
         value = summary_new_users_count(min_date)
         if value > 0
           @counts << {
+            id: "new_users",
             label_key: "user_notifications.digest.new_users",
             value: value,
             href: "#{Discourse.base_url}/about",
@@ -504,7 +508,7 @@ class UserNotifications < ActionMailer::Base
     user_name = notification_data[:original_username]
 
     if post && SiteSetting.enable_names && SiteSetting.display_name_on_email_from
-      name = User.where(id: notification_data[:original_user_id] || post.user_id).pluck_first(:name)
+      name = User.where(id: notification_data[:original_user_id] || post.user_id).pick(:name)
       user_name = name unless name.blank?
     end
 
@@ -589,7 +593,7 @@ class UserNotifications < ActionMailer::Base
       # subcategory case
       if !category.parent_category_id.nil?
         show_category_in_subject =
-          "#{Category.where(id: category.parent_category_id).pluck_first(:name)}/#{show_category_in_subject}"
+          "#{Category.where(id: category.parent_category_id).pick(:name)}/#{show_category_in_subject}"
       end
     else
       show_category_in_subject = nil
@@ -597,12 +601,20 @@ class UserNotifications < ActionMailer::Base
 
     # tag names
     if opts[:show_tags_in_subject] && post.topic_id
+      max_tags =
+        if SiteSetting.enable_max_tags_per_email_subject
+          SiteSetting.max_tags_per_email_subject
+        else
+          SiteSetting.max_tags_per_topic
+        end
+
       tags =
         DiscourseTagging
           .visible_tags(Guardian.new(user))
           .joins(:topic_tags)
           .where("topic_tags.topic_id = ?", post.topic_id)
-          .limit(SiteSetting.max_tags_per_topic)
+          .order("tags.public_topic_count DESC", "tags.name ASC")
+          .limit(max_tags)
           .pluck(:name)
 
       show_tags_in_subject = tags.any? ? tags.join(" ") : nil
diff --git a/app/models/about.rb b/app/models/about.rb
index 1901fccc663..7252c71ab07 100644
--- a/app/models/about.rb
+++ b/app/models/about.rb
@@ -1,24 +1,13 @@
 # frozen_string_literal: true
 
 class About
-  cattr_reader :plugin_stat_groups
-
-  def self.add_plugin_stat_group(prefix, show_in_ui: false, &block)
-    @@displayed_plugin_stat_groups << prefix if show_in_ui
-    @@plugin_stat_groups[prefix] = block
-  end
-
-  def self.clear_plugin_stat_groups
-    @@displayed_plugin_stat_groups = Set.new
-    @@plugin_stat_groups = {}
-  end
-
   def self.displayed_plugin_stat_groups
-    @@displayed_plugin_stat_groups.to_a
+    DiscoursePluginRegistry
+      .about_stat_groups
+      .select { |stat_group| stat_group[:show_in_ui] }
+      .map { |stat_group| stat_group[:name] }
   end
 
-  clear_plugin_stat_groups
-
   class CategoryMods
     include ActiveModel::Serialization
     attr_reader :category_id, :moderators
@@ -103,13 +92,13 @@ class About
 
   def plugin_stats
     final_plugin_stats = {}
-    @@plugin_stat_groups.each do |plugin_stat_group_name, stat_group|
+    DiscoursePluginRegistry.about_stat_groups.each do |stat_group|
       begin
-        stats = stat_group.call
+        stats = stat_group[:block].call
       rescue StandardError => err
         Discourse.warn_exception(
           err,
-          message: "Unexpected error when collecting #{plugin_stat_group_name} About stats.",
+          message: "Unexpected error when collecting #{stat_group[:name]} About stats.",
         )
         next
       end
@@ -117,11 +106,11 @@ class About
       if !stats.key?(:last_day) || !stats.key?("7_days") || !stats.key?("30_days") ||
            !stats.key?(:count)
         Rails.logger.warn(
-          "Plugin stat group #{plugin_stat_group_name} for About stats does not have all required keys, skipping.",
+          "Plugin stat group #{stat_group[:name]} for About stats does not have all required keys, skipping.",
         )
       else
         final_plugin_stats.merge!(
-          stats.transform_keys { |key| "#{plugin_stat_group_name}_#{key}".to_sym },
+          stats.transform_keys { |key| "#{stat_group[:name]}_#{key}".to_sym },
         )
       end
     end
diff --git a/app/models/admin_dashboard_data.rb b/app/models/admin_dashboard_data.rb
index 8c3245a803b..1e3c3c75356 100644
--- a/app/models/admin_dashboard_data.rb
+++ b/app/models/admin_dashboard_data.rb
@@ -205,7 +205,10 @@ class AdminDashboardData
                       :email_polling_errored_recently,
                       :out_of_date_themes,
                       :unreachable_themes,
-                      :watched_words_check
+                      :watched_words_check,
+                      :google_analytics_version_check,
+                      :translation_overrides_check,
+                      :legacy_navigation_menu_check
 
     register_default_scheduled_problem_checks
 
@@ -295,7 +298,7 @@ class AdminDashboardData
 
   def queue_size_check
     queue_size = Jobs.queued
-    I18n.t("dashboard.queue_size_warning", queue_size: queue_size) unless queue_size < 100_000
+    I18n.t("dashboard.queue_size_warning", queue_size: queue_size) if queue_size >= 100_000
   end
 
   def ram_check
@@ -359,6 +362,18 @@ class AdminDashboardData
     end
   end
 
+  def translation_overrides_check
+    if TranslationOverride.exists?(status: %i[outdated invalid_interpolation_keys])
+      I18n.t("dashboard.outdated_translations_warning", base_path: Discourse.base_path)
+    end
+  end
+
+  def legacy_navigation_menu_check
+    if SiteSetting.navigation_menu == "legacy"
+      I18n.t("dashboard.legacy_navigation_menu_deprecated", base_path: Discourse.base_path)
+    end
+  end
+
   def image_magick_check
     if SiteSetting.create_thumbnails && !system("command -v convert >/dev/null;")
       I18n.t("dashboard.image_magick_warning")
@@ -377,7 +392,11 @@ class AdminDashboardData
   end
 
   def subfolder_ends_in_slash_check
-    I18n.t("dashboard.subfolder_ends_in_slash") if Discourse.base_path =~ %r{/$}
+    I18n.t("dashboard.subfolder_ends_in_slash") if Discourse.base_path =~ %r{/\z}
+  end
+
+  def google_analytics_version_check
+    I18n.t("dashboard.v3_analytics_deprecated") if SiteSetting.ga_version == "v3_analytics"
   end
 
   def email_polling_errored_recently
diff --git a/app/models/api_key.rb b/app/models/api_key.rb
index dc66d2fb40e..5c53ea52912 100644
--- a/app/models/api_key.rb
+++ b/app/models/api_key.rb
@@ -17,6 +17,8 @@ class ApiKey < ActiveRecord::Base
           where(key_hash: hashed)
         }
 
+  validates :description, length: { maximum: 255 }
+
   after_initialize :generate_key
 
   def generate_key
diff --git a/app/models/api_key_scope.rb b/app/models/api_key_scope.rb
index c0d072d0bca..27f9162035a 100644
--- a/app/models/api_key_scope.rb
+++ b/app/models/api_key_scope.rb
@@ -6,7 +6,7 @@ class ApiKeyScope < ActiveRecord::Base
 
   class << self
     def list_actions
-      actions = %w[list#category_feed]
+      actions = %w[list#category_feed list#category_default list#latest_feed]
 
       %i[latest unread new top].each { |f| actions.concat(["list#category_#{f}", "list##{f}"]) }
 
@@ -28,12 +28,15 @@ class ApiKeyScope < ActiveRecord::Base
             params: %i[topic_id],
           },
           update: {
-            actions: %w[topics#update],
-            params: %i[topic_id],
+            actions: %w[topics#update topics#status],
+            params: %i[topic_id category_id],
+          },
+          delete: {
+            actions: %w[topics#destroy],
           },
           read: {
-            actions: %w[topics#show topics#feed topics#posts],
-            params: %i[topic_id],
+            actions: %w[topics#show topics#feed topics#posts topics#show_by_external_id],
+            params: %i[topic_id external_id],
             aliases: {
               topic_id: :id,
             },
@@ -45,12 +48,27 @@ class ApiKeyScope < ActiveRecord::Base
               category_id: :category_slug_path_with_id,
             },
           },
+          status: {
+            actions: %w[topics#status],
+            params: %i[topic_id category_id status enabled],
+          },
         },
         posts: {
           edit: {
             actions: %w[posts#update],
             params: %i[id],
           },
+          delete: {
+            actions: %w[posts#destroy],
+          },
+          list: {
+            actions: %w[posts#latest],
+          },
+        },
+        tags: {
+          list: {
+            actions: %w[tags#index],
+          },
         },
         categories: {
           list: {
@@ -101,6 +119,9 @@ class ApiKeyScope < ActiveRecord::Base
           anonymize: {
             actions: %w[admin/users#anonymize],
           },
+          suspend: {
+            actions: %w[admin/users#suspend],
+          },
           delete: {
             actions: %w[admin/users#destroy],
           },
@@ -121,6 +142,11 @@ class ApiKeyScope < ActiveRecord::Base
             actions: %w[admin/email#handle_mail admin/email#smtp_should_reject],
           },
         },
+        invites: {
+          create: {
+            actions: %w[invites#create],
+          },
+        },
         badges: {
           create: {
             actions: %w[admin/badges#create],
@@ -146,6 +172,31 @@ class ApiKeyScope < ActiveRecord::Base
             actions: %w[user_badges#destroy],
           },
         },
+        groups: {
+          manage_groups: {
+            actions: %w[groups#members groups#add_members groups#remove_members],
+            params: %i[id],
+          },
+          administer_groups: {
+            actions: %w[
+              admin/groups#create
+              admin/groups#destroy
+              groups#show
+              groups#update
+              groups#index
+            ],
+          },
+        },
+        search: {
+          show: {
+            actions: %w[search#show],
+            params: %i[q page],
+          },
+          query: {
+            actions: %w[search#query],
+            params: %i[term],
+          },
+        },
         wordpress: {
           publishing: {
             actions: %w[site#site posts#create topics#update topics#status topics#show],
diff --git a/app/models/application_request.rb b/app/models/application_request.rb
index d422a08c960..a91c67571ed 100644
--- a/app/models/application_request.rb
+++ b/app/models/application_request.rb
@@ -32,22 +32,14 @@ class ApplicationRequest < ActiveRecord::Base
   end
 
   def self.write_cache!(req_type, count, date)
-    id = req_id(date, req_type)
-    where(id: id).update_all(["count = count + ?", count])
-  end
-
-  def self.req_id(date, req_type, retries = 0)
     req_type_id = req_types[req_type]
 
-    # a poor man's upsert
-    id = where(date: date, req_type: req_type_id).pluck_first(:id)
-    id ||= create!(date: date, req_type: req_type_id, count: 0).id
-  rescue StandardError # primary key violation
-    if retries == 0
-      req_id(date, req_type, 1)
-    else
-      raise
-    end
+    DB.exec(<<~SQL, date: date, req_type_id: req_type_id, count: count)
+      INSERT INTO application_requests (date, req_type, count)
+      VALUES (:date, :req_type_id, :count)
+      ON CONFLICT (date, req_type)
+      DO UPDATE SET count = application_requests.count + excluded.count
+    SQL
   end
 
   def self.stats
diff --git a/app/models/backup_metadata.rb b/app/models/backup_metadata.rb
index 3fdcd071d31..92ea233ba50 100644
--- a/app/models/backup_metadata.rb
+++ b/app/models/backup_metadata.rb
@@ -4,7 +4,7 @@ class BackupMetadata < ActiveRecord::Base
   LAST_RESTORE_DATE = "last_restore_date"
 
   def self.value_for(name)
-    where(name: name).pluck_first(:value).presence
+    where(name: name).pick(:value).presence
   end
 
   def self.last_restore_date
diff --git a/app/models/badge.rb b/app/models/badge.rb
index d8b1ce794da..6f97eeb1a9f 100644
--- a/app/models/badge.rb
+++ b/app/models/badge.rb
@@ -115,10 +115,12 @@ class Badge < ActiveRecord::Base
   has_many :user_badges, dependent: :destroy
   has_many :upload_references, as: :target, dependent: :destroy
 
-  validates :name, presence: true, uniqueness: true
+  validates :name, presence: true, uniqueness: true, length: { maximum: 100 }
   validates :badge_type, presence: true
   validates :allow_title, inclusion: [true, false]
   validates :multiple_grant, inclusion: [true, false]
+  validates :description, length: { maximum: 500 }
+  validates :long_description, length: { maximum: 1000 }
 
   scope :enabled, -> { where(enabled: true) }
 
@@ -190,7 +192,7 @@ class Badge < ActiveRecord::Base
     SQL
     DB.exec(<<~SQL, badge_id: self.id)
       UPDATE user_profiles AS up
-      SET badge_granted_title = false, granted_title_badge_id = NULL
+      SET granted_title_badge_id = NULL
       WHERE up.granted_title_badge_id = :badge_id
     SQL
   end
@@ -220,7 +222,7 @@ class Badge < ActiveRecord::Base
   end
 
   def self.i18n_name(name)
-    name.downcase.tr(" ", "_")
+    name.to_s.downcase.tr(" ", "_")
   end
 
   def self.display_name(name)
diff --git a/app/models/badge_grouping.rb b/app/models/badge_grouping.rb
index c0afcbdbb10..cb60e4f715c 100644
--- a/app/models/badge_grouping.rb
+++ b/app/models/badge_grouping.rb
@@ -9,6 +9,9 @@ class BadgeGrouping < ActiveRecord::Base
 
   has_many :badges
 
+  validates :name, length: { maximum: 100 }
+  validates :description, length: { maximum: 500 }
+
   def system?
     id && id <= 5
   end
diff --git a/app/models/bookmark.rb b/app/models/bookmark.rb
index 3e1a6dab387..239824566ba 100644
--- a/app/models/bookmark.rb
+++ b/app/models/bookmark.rb
@@ -1,41 +1,28 @@
 # frozen_string_literal: true
 
 class Bookmark < ActiveRecord::Base
-  self.ignored_columns = [
-    "post_id", # TODO (martin) (2022-08-01) remove
-    "for_topic", # TODO (martin) (2022-08-01) remove
+  DEFAULT_BOOKMARKABLES = [
+    RegisteredBookmarkable.new(PostBookmarkable),
+    RegisteredBookmarkable.new(TopicBookmarkable),
   ]
 
-  cattr_accessor :registered_bookmarkables
-  self.registered_bookmarkables = []
+  def self.registered_bookmarkables
+    Set.new(DEFAULT_BOOKMARKABLES | DiscoursePluginRegistry.bookmarkables)
+  end
 
   def self.registered_bookmarkable_from_type(type)
-    Bookmark.registered_bookmarkables.find { |bm| bm.model.name == type }
-  end
+    begin
+      resolved_type = Bookmark.polymorphic_class_for(type).name
+      Bookmark.registered_bookmarkables.find { |bm| bm.model.name == resolved_type }
 
-  def self.register_bookmarkable(bookmarkable_klass)
-    return if Bookmark.registered_bookmarkable_from_type(bookmarkable_klass.model.name).present?
-    Bookmark.registered_bookmarkables << RegisteredBookmarkable.new(bookmarkable_klass)
+      # If the class cannot be found from the provided type using polymorphic_class_for,
+      # then the type is not valid and thus there will not be any registered bookmarkable.
+    rescue NameError
+    end
   end
 
-  ##
-  # This is called when the app loads, similar to AdminDashboardData.reset_problem_checks,
-  # so the default Post and Topic bookmarkables are registered on
-  # boot.
-  #
-  # This method also can be used in testing to reset bookmarkables between
-  # tests. It will also fire multiple times in development mode because
-  # classes are not cached.
-  def self.reset_bookmarkables
-    self.registered_bookmarkables = []
-
-    Bookmark.register_bookmarkable(PostBookmarkable)
-    Bookmark.register_bookmarkable(TopicBookmarkable)
-  end
-  reset_bookmarkables
-
   def self.valid_bookmarkable_types
-    Bookmark.registered_bookmarkables.map(&:model).map(&:to_s)
+    Bookmark.registered_bookmarkables.map { |bm| bm.model.polymorphic_name }
   end
 
   belongs_to :user
@@ -136,6 +123,10 @@ class Bookmark < ActiveRecord::Base
     update!(reminder_last_sent_at: Time.zone.now, reminder_set_at: nil)
   end
 
+  def reminder_at_in_zone(timezone)
+    self.reminder_at.in_time_zone(timezone)
+  end
+
   scope :with_reminders, -> { where("reminder_at IS NOT NULL") }
 
   scope :pending_reminders,
diff --git a/app/models/category.rb b/app/models/category.rb
index f717b62ab57..db6ece10344 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -46,8 +46,14 @@ class Category < ActiveRecord::Base
   has_many :topic_timers, dependent: :destroy
   has_many :upload_references, as: :target, dependent: :destroy
 
+  has_one :category_setting, dependent: :destroy
+
+  delegate :auto_bump_cooldown_days, to: :category_setting, allow_nil: true
+
   has_and_belongs_to_many :web_hooks
 
+  accepts_nested_attributes_for :category_setting, update_only: true
+
   validates :user_id, presence: true
 
   validates :name,
@@ -73,6 +79,12 @@ class Category < ActiveRecord::Base
   validate :ensure_slug
   validate :permissions_compatibility_validator
 
+  validates :default_slow_mode_seconds,
+            numericality: {
+              only_integer: true,
+              greater_than: 0,
+            },
+            allow_nil: true
   validates :auto_close_hours,
             numericality: {
               greater_than: 0,
@@ -88,6 +100,7 @@ class Category < ActiveRecord::Base
   before_save :apply_permissions
   before_save :downcase_email
   before_save :downcase_name
+  before_save :ensure_category_setting
 
   after_save :publish_discourse_stylesheet
   after_save :publish_category
@@ -125,6 +138,10 @@ class Category < ActiveRecord::Base
 
   has_many :category_tags, dependent: :destroy
   has_many :tags, through: :category_tags
+  has_many :none_synonym_tags,
+           -> { where(target_tag_id: nil) },
+           through: :category_tags,
+           source: :tag
   has_many :category_tag_groups, dependent: :destroy
   has_many :tag_groups, through: :category_tag_groups
 
@@ -132,6 +149,9 @@ class Category < ActiveRecord::Base
   has_many :sidebar_section_links, as: :linkable, dependent: :delete_all
   has_many :embeddable_hosts, dependent: :destroy
 
+  has_many :category_form_templates, dependent: :destroy
+  has_many :form_templates, through: :category_form_templates
+
   belongs_to :reviewable_by_group, class_name: "Group"
 
   scope :latest, -> { order("topic_count DESC") }
@@ -184,21 +204,65 @@ class Category < ActiveRecord::Base
   @topic_id_cache = DistributedCache.new("category_topic_ids")
 
   def self.topic_ids
-    @topic_id_cache["ids"] || reset_topic_ids_cache
+    @topic_id_cache.defer_get_set("ids") { Set.new(Category.pluck(:topic_id).compact) }
   end
 
   def self.reset_topic_ids_cache
-    @topic_id_cache["ids"] = Set.new(Category.pluck(:topic_id).compact)
+    @topic_id_cache.clear
   end
 
   def reset_topic_ids_cache
     Category.reset_topic_ids_cache
   end
 
+  # Accepts an array of slugs with each item in the array
+  # Returns the category ids of the last slug in the array. The slugs array has to follow the proper category
+  # nesting hierarchy. If any of the slug in the array is invalid or if the slugs array does not follow the proper
+  # category nesting hierarchy, nil is returned.
+  #
+  # When only a single slug is provided, the category id of all the categories with that slug is returned.
+  def self.ids_from_slugs(slugs)
+    return [] if slugs.blank?
+
+    params = {}
+    params_index = 0
+
+    sqls =
+      slugs.map do |slug|
+        category_slugs =
+          slug.split(":").first(SiteSetting.max_category_nesting).map { Slug.for(_1, "") }
+
+        sql = ""
+
+        if category_slugs.length == 1
+          params[:"slug_#{params_index}"] = category_slugs.first
+          sql = "SELECT id FROM categories WHERE slug = :slug_#{params_index}"
+          params_index += 1
+        else
+          category_slugs.each_with_index do |category_slug, index|
+            params[:"slug_#{params_index}"] = category_slug
+
+            sql =
+              if index == 0
+                "SELECT id FROM categories WHERE slug = :slug_#{params_index} AND parent_category_id IS NULL"
+              else
+                "SELECT id FROM categories WHERE parent_category_id = (#{sql}) AND slug = :slug_#{params_index}"
+              end
+
+            params_index += 1
+          end
+        end
+
+        sql
+      end
+
+    DB.query_single(sqls.join("\nUNION ALL\n"), params)
+  end
+
   @@subcategory_ids = DistributedCache.new("subcategory_ids")
 
   def self.subcategory_ids(category_id)
-    @@subcategory_ids[category_id] ||= begin
+    @@subcategory_ids.defer_get_set(category_id.to_s) do
       sql = <<~SQL
             WITH RECURSIVE subcategories AS (
                 SELECT :category_id id, 1 depth
@@ -373,7 +437,7 @@ class Category < ActiveRecord::Base
     @@cache_text ||= LruRedux::ThreadSafeCache.new(1000)
     @@cache_text.getset(self.description) do
       text = Nokogiri::HTML5.fragment(self.description).text.strip
-      Rack::Utils.escape_html(text).html_safe
+      ERB::Util.html_escape(text).html_safe
     end
   end
 
@@ -421,7 +485,7 @@ class Category < ActiveRecord::Base
     end
 
     # only allow to use category itself id.
-    match_id = /^(\d+)-category/.match(self.slug)
+    match_id = /\A(\d+)-category/.match(self.slug)
     if match_id.present?
       errors.add(:slug, :invalid) if new_record? || (match_id[1] != self.id.to_s)
     end
@@ -667,7 +731,7 @@ class Category < ActiveRecord::Base
         .exclude_scheduled_bump_topics
         .where(category_id: self.id)
         .where("id <> ?", self.topic_id)
-        .where("bumped_at < ?", 1.day.ago)
+        .where("bumped_at < ?", (self.auto_bump_cooldown_days || 1).days.ago)
         .where("pinned_at IS NULL AND NOT closed AND NOT archived")
         .order("bumped_at ASC")
         .limit(1)
@@ -778,9 +842,8 @@ class Category < ActiveRecord::Base
 
   def self.query_parent_category(parent_slug)
     encoded_parent_slug = CGI.escape(parent_slug) if SiteSetting.slug_generation_method == "encoded"
-    self.where(slug: (encoded_parent_slug || parent_slug), parent_category_id: nil).pluck_first(
-      :id,
-    ) || self.where(id: parent_slug.to_i).pluck_first(:id)
+    self.where(slug: (encoded_parent_slug || parent_slug), parent_category_id: nil).pick(:id) ||
+      self.where(id: parent_slug.to_i).pick(:id)
   end
 
   def self.query_category(slug_or_id, parent_category_id)
@@ -830,16 +893,6 @@ class Category < ActiveRecord::Base
     end
   end
 
-  def url_with_id
-    Discourse.deprecate(
-      "Category#url_with_id is deprecated. Use `Category#url` instead.",
-      output_in_test: true,
-      drop_from: "2.9.0",
-    )
-
-    url
-  end
-
   # If the name changes, try and update the category definition topic too if it's an exact match
   def rename_category_definition
     return unless topic.present?
@@ -897,7 +950,7 @@ class Category < ActiveRecord::Base
       slug_path.inject(nil) do |parent_id, slug|
         category = Category.where(slug: slug, parent_category_id: parent_id)
 
-        if match_id = /^(\d+)-category/.match(slug).presence
+        if match_id = /\A(\d+)-category/.match(slug).presence
           category = category.or(Category.where(id: match_id[1], parent_category_id: parent_id))
         end
 
@@ -1026,6 +1079,10 @@ class Category < ActiveRecord::Base
 
   private
 
+  def ensure_category_setting
+    self.build_category_setting if self.category_setting.blank?
+  end
+
   def should_update_reviewables?
     SiteSetting.enable_category_group_moderation? && saved_change_to_reviewable_by_group_id?
   end
diff --git a/app/models/category_form_template.rb b/app/models/category_form_template.rb
new file mode 100644
index 00000000000..04d2350641f
--- /dev/null
+++ b/app/models/category_form_template.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class CategoryFormTemplate < ActiveRecord::Base
+  belongs_to :category
+  belongs_to :form_template
+end
+
+# == Schema Information
+#
+# Table name: category_form_templates
+#
+#  id               :bigint           not null, primary key
+#  category_id      :bigint           not null
+#  form_template_id :bigint           not null
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
+#
+# Indexes
+#
+#  index_category_form_templates_on_category_id       (category_id)
+#  index_category_form_templates_on_form_template_id  (form_template_id)
+#
diff --git a/app/models/category_list.rb b/app/models/category_list.rb
index 38a55042a78..8eee48792e2 100644
--- a/app/models/category_list.rb
+++ b/app/models/category_list.rb
@@ -8,6 +8,21 @@ class CategoryList
 
   attr_accessor :categories, :uncategorized
 
+  def self.register_included_association(association)
+    @included_assocations ||= []
+    @included_assocations << association if !@included_assocations.include?(association)
+  end
+
+  def self.included_associations
+    [
+      :uploaded_background,
+      :uploaded_logo,
+      :uploaded_logo_dark,
+      :topic_only_relative_url,
+      subcategories: [:topic_only_relative_url],
+    ].concat(@included_assocations || [])
+  end
+
   def initialize(guardian = nil, options = {})
     @guardian = guardian || Guardian.new
     @options = options
@@ -71,12 +86,17 @@ class CategoryList
 
     if @guardian.authenticated?
       @all_topics =
-        @all_topics.joins(
-          "LEFT JOIN topic_users tu ON topics.id = tu.topic_id AND tu.user_id = #{@guardian.user.id.to_i}",
-        ).where(
-          "COALESCE(tu.notification_level,1) > :muted",
-          muted: TopicUser.notification_levels[:muted],
-        )
+        @all_topics
+          .joins(
+            "LEFT JOIN topic_users tu ON topics.id = tu.topic_id AND tu.user_id = #{@guardian.user.id.to_i}",
+          )
+          .joins(
+            "LEFT JOIN category_users ON category_users.category_id = topics.category_id AND category_users.user_id = #{@guardian.user.id}",
+          )
+          .where(
+            "COALESCE(tu.notification_level,1) > :muted",
+            muted: TopicUser.notification_levels[:muted],
+          )
     end
 
     @all_topics = TopicQuery.remove_muted_tags(@all_topics, @guardian.user).includes(:last_poster)
@@ -104,24 +124,19 @@ class CategoryList
   end
 
   def find_categories
-    @categories =
-      Category.includes(
-        :uploaded_background,
-        :uploaded_logo,
-        :uploaded_logo_dark,
-        :topic_only_relative_url,
-        subcategories: [:topic_only_relative_url],
-      ).secured(@guardian)
+    query = Category.includes(CategoryList.included_associations).secured(@guardian)
 
-    @categories =
-      @categories.where(
+    query =
+      query.where(
         "categories.parent_category_id = ?",
         @options[:parent_category_id].to_i,
       ) if @options[:parent_category_id].present?
 
-    @categories = self.class.order_categories(@categories)
+    query = self.class.order_categories(query)
+    query =
+      DiscoursePluginRegistry.apply_modifier(:category_list_find_categories_query, query, self)
 
-    @categories = @categories.to_a
+    @categories = query.to_a
 
     include_subcategories = @options[:include_subcategories] == true
 
diff --git a/app/models/category_setting.rb b/app/models/category_setting.rb
new file mode 100644
index 00000000000..4506d634af8
--- /dev/null
+++ b/app/models/category_setting.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+class CategorySetting < ActiveRecord::Base
+  belongs_to :category
+
+  validates :num_auto_bump_daily,
+            numericality: {
+              only_integer: true,
+              greater_than_or_equal_to: 0,
+              allow_nil: true,
+            }
+
+  validates :auto_bump_cooldown_days,
+            numericality: {
+              only_integer: true,
+              greater_than_or_equal_to: 0,
+              allow_nil: true,
+            }
+end
+
+# == Schema Information
+#
+# Table name: category_settings
+#
+#  id                      :bigint           not null, primary key
+#  category_id             :bigint           not null
+#  require_topic_approval  :boolean
+#  require_reply_approval  :boolean
+#  num_auto_bump_daily     :integer
+#  created_at              :datetime         not null
+#  updated_at              :datetime         not null
+#  auto_bump_cooldown_days :integer          default(1)
+# Indexes
+#
+#  index_category_settings_on_category_id  (category_id) UNIQUE
+#
diff --git a/app/models/category_tag_stat.rb b/app/models/category_tag_stat.rb
index 478aa069cc2..0432c528645 100644
--- a/app/models/category_tag_stat.rb
+++ b/app/models/category_tag_stat.rb
@@ -44,23 +44,38 @@ class CategoryTagStat < ActiveRecord::Base
 
   # Recalculate all topic counts if they got out of sync
   def self.update_topic_counts
+    # Add new records or update existing records
     DB.exec <<~SQL
-      UPDATE category_tag_stats stats
-      SET topic_count = x.topic_count
-      FROM (
-        SELECT COUNT(topics.id) AS topic_count,
+      WITH stats AS (
+        SELECT topics.category_id as category_id,
                tags.id AS tag_id,
-               topics.category_id as category_id
+               COUNT(topics.id) AS topic_count
         FROM tags
         INNER JOIN topic_tags ON tags.id = topic_tags.tag_id
         INNER JOIN topics ON topics.id = topic_tags.topic_id
                AND topics.deleted_at IS NULL
                AND topics.category_id IS NOT NULL
-        GROUP BY tags.id, topics.category_id
-      ) x
-      WHERE stats.tag_id = x.tag_id
-        AND stats.category_id = x.category_id
-        AND x.topic_count <> stats.topic_count
+        GROUP BY topics.category_id, tags.id
+      )
+      INSERT INTO category_tag_stats(category_id, tag_id, topic_count)
+      SELECT category_id, tag_id, topic_count FROM stats
+      ON CONFLICT (category_id, tag_id) DO
+      UPDATE SET topic_count = EXCLUDED.topic_count
+    SQL
+
+    # Delete old records
+    DB.exec <<~SQL
+      DELETE FROM category_tag_stats
+      WHERE (category_id, tag_id) NOT IN (
+        SELECT topics.category_id as category_id,
+               tags.id AS tag_id
+        FROM tags
+        INNER JOIN topic_tags ON tags.id = topic_tags.tag_id
+        INNER JOIN topics ON topics.id = topic_tags.topic_id
+               AND topics.deleted_at IS NULL
+               AND topics.category_id IS NOT NULL
+        GROUP BY topics.category_id, tags.id
+      )
     SQL
   end
 end
diff --git a/app/models/category_user.rb b/app/models/category_user.rb
index 4623567656f..d7cee509c71 100644
--- a/app/models/category_user.rb
+++ b/app/models/category_user.rb
@@ -289,7 +289,8 @@ end
 #
 # Indexes
 #
-#  idx_category_users_category_id_user_id            (category_id,user_id) UNIQUE
-#  idx_category_users_user_id_category_id            (user_id,category_id) UNIQUE
-#  index_category_users_on_user_id_and_last_seen_at  (user_id,last_seen_at)
+#  idx_category_users_category_id_user_id                      (category_id,user_id) UNIQUE
+#  idx_category_users_user_id_category_id                      (user_id,category_id) UNIQUE
+#  index_category_users_on_category_id_and_notification_level  (category_id,notification_level)
+#  index_category_users_on_user_id_and_last_seen_at            (user_id,last_seen_at)
 #
diff --git a/app/models/color_scheme.rb b/app/models/color_scheme.rb
index 99a1ee75fff..00fdcbeb7cd 100644
--- a/app/models/color_scheme.rb
+++ b/app/models/color_scheme.rb
@@ -7,11 +7,13 @@ class ColorScheme < ActiveRecord::Base
     Dark: {
       "primary" => "dddddd",
       "secondary" => "222222",
-      "tertiary" => "0f82af",
+      "tertiary" => "099dd7",
       "quaternary" => "c14924",
       "header_background" => "111111",
       "header_primary" => "dddddd",
       "highlight" => "a87137",
+      "selected" => "2c2c2c",
+      "hover" => "313131",
       "danger" => "e45735",
       "success" => "1ca551",
       "love" => "fa6c8d",
@@ -25,6 +27,8 @@ class ColorScheme < ActiveRecord::Base
       "header_background" => "333333",
       "header_primary" => "f3f3f3",
       "highlight" => "ecec70",
+      "selected" => "e6e6e6",
+      "hover" => "f0f0f0",
       "danger" => "b85e48",
       "success" => "518751",
       "love" => "fa6c8d",
@@ -38,6 +42,8 @@ class ColorScheme < ActiveRecord::Base
       "header_background" => "36393e",
       "header_primary" => "d9d9d9",
       "highlight" => "fdd459",
+      "selected" => "272727",
+      "hover" => "2F2F30",
       "danger" => "e45735",
       "success" => "fdd459",
       "love" => "fdd459",
@@ -51,6 +57,8 @@ class ColorScheme < ActiveRecord::Base
       "header_background" => "86bddb",
       "header_primary" => "203243",
       "highlight" => "86bddb",
+      "selected" => "bee0f2",
+      "hover" => "d2efff",
       "danger" => "bf3c3c",
       "success" => "70db82",
       "love" => "fc94cb",
@@ -64,6 +72,8 @@ class ColorScheme < ActiveRecord::Base
       "header_background" => "d7c9aa",
       "header_primary" => "262322",
       "highlight" => "d7c9aa",
+      "selected" => "3e2a14",
+      "hover" => "4c3319",
       "danger" => "db9584",
       "success" => "78be78",
       "love" => "8f6201",
@@ -77,6 +87,8 @@ class ColorScheme < ActiveRecord::Base
       "header_background" => "96ccbf",
       "header_primary" => "fff1e7",
       "highlight" => "f3c07f",
+      "selected" => "f5eaea",
+      "hover" => "f9f3f3",
       "danger" => "cfebdc",
       "success" => "fcb4b5",
       "love" => "f3c07f",
@@ -89,7 +101,9 @@ class ColorScheme < ActiveRecord::Base
       "quaternary" => "7e566a",
       "header_background" => "a97189",
       "header_primary" => "d9b2bb",
-      "highlight" => "6c3e63",
+      "highlight" => "bd36a3",
+      "selected" => "2a1620",
+      "hover" => "331b27",
       "danger" => "6c3e63",
       "success" => "d9b2bb",
       "love" => "d9b2bb",
@@ -103,10 +117,12 @@ class ColorScheme < ActiveRecord::Base
       "quaternary" => "3369FF",
       "header_background" => "ffffff",
       "header_primary" => "000000",
-      "highlight" => "3369FF",
+      "highlight" => "ffff00",
       "highlight-high" => "0036E6",
       "highlight-medium" => "e0e9ff",
       "highlight-low" => "e0e9ff",
+      "selected" => "E2E9FE",
+      "hover" => "F0F4FE",
       "danger" => "BB1122",
       "success" => "3d854d",
       "love" => "9D256B",
@@ -121,6 +137,8 @@ class ColorScheme < ActiveRecord::Base
       "header_background" => "000000",
       "header_primary" => "ffffff",
       "highlight" => "3369FF",
+      "selected" => "0d2569",
+      "hover" => "002382",
       "danger" => "BB1122",
       "success" => "3d854d",
       "love" => "9D256B",
@@ -158,8 +176,9 @@ class ColorScheme < ActiveRecord::Base
       "header_primary" => "f2f2f2",
       "highlight_low" => "686D55",
       "highlight_medium" => "52592B",
-      "highlight" => "52592B",
       "highlight_high" => "C0C879",
+      "selected" => "4A4463",
+      "hover" => "61597f",
       "danger_low" => "957279",
       "danger" => "ff5555",
       "success_low" => "386D50",
@@ -202,6 +221,8 @@ class ColorScheme < ActiveRecord::Base
       "highlight_medium" => "E3D0A3",
       "highlight" => "F2F481",
       "highlight_high" => "BCAA7F",
+      "selected" => "E8E6D3",
+      "hover" => "F0EBDA",
       "danger_low" => "F8D9C2",
       "danger" => "e45735",
       "success_low" => "CFE5B9",
@@ -235,7 +256,7 @@ class ColorScheme < ActiveRecord::Base
       "secondary" => "002B36",
       "tertiary_low" => "003E54",
       "tertiary_medium" => "00557A",
-      "tertiary" => "0088cc",
+      "tertiary" => "1a97d5",
       "tertiary_high" => "006C9F",
       "quaternary_low" => "944835",
       "quaternary" => "e45735",
@@ -245,6 +266,8 @@ class ColorScheme < ActiveRecord::Base
       "highlight_medium" => "464C33",
       "highlight" => "F2F481",
       "highlight_high" => "BFCA47",
+      "selected" => "143B44",
+      "hover" => "21454E",
       "danger_low" => "443836",
       "danger_medium" => "944835",
       "danger" => "e45735",
@@ -386,13 +409,13 @@ class ColorScheme < ActiveRecord::Base
   def self.lookup_hex_for_name(name, scheme_id = nil)
     enabled_color_scheme = find_by(id: scheme_id) if scheme_id
     enabled_color_scheme ||= Theme.where(id: SiteSetting.default_theme_id).first&.color_scheme
-    (enabled_color_scheme || base).colors.find { |c| c.name == name }.try(:hex) || "nil"
+    (enabled_color_scheme || base).colors.find { |c| c.name == name }.try(:hex)
   end
 
   def self.hex_for_name(name, scheme_id = nil)
-    cache_key = scheme_id ? name + "_#{scheme_id}" : name
-    hex_cache[cache_key] ||= lookup_hex_for_name(name, scheme_id)
-    hex_cache[cache_key] == "nil" ? nil : hex_cache[cache_key]
+    hex_cache.defer_get_set(scheme_id ? name + "_#{scheme_id}" : name) do
+      lookup_hex_for_name(name, scheme_id)
+    end
   end
 
   def colors=(arr)
@@ -425,13 +448,28 @@ class ColorScheme < ActiveRecord::Base
   end
 
   def resolved_colors
-    resolved = ColorScheme.base_colors.dup
-    if base_scheme_id && base_scheme_id != "Light"
-      if scheme = CUSTOM_SCHEMES[base_scheme_id.to_sym]
-        scheme.each { |name, value| resolved[name] = value }
-      end
-    end
-    colors.each { |c| resolved[c.name] = c.hex }
+    from_base = ColorScheme.base_colors
+    from_custom_scheme = base_colors
+    from_db = colors.map { |c| [c.name, c.hex] }.to_h
+
+    resolved = from_base.merge(from_custom_scheme).except("hover", "selected").merge(from_db)
+
+    # Equivalent to primary-100 in light mode, or primary-low in dark mode
+    resolved["hover"] ||= ColorMath.dark_light_diff(
+      resolved["primary"],
+      resolved["secondary"],
+      0.94,
+      -0.78,
+    )
+
+    # Equivalent to primary-low in light mode, or primary-100 in dark mode
+    resolved["selected"] ||= ColorMath.dark_light_diff(
+      resolved["primary"],
+      resolved["secondary"],
+      0.9,
+      -0.8,
+    )
+
     resolved
   end
 
@@ -472,8 +510,8 @@ class ColorScheme < ActiveRecord::Base
   def is_dark?
     return if colors.to_a.empty?
 
-    primary_b = brightness(colors_by_name["primary"].hex)
-    secondary_b = brightness(colors_by_name["secondary"].hex)
+    primary_b = ColorMath.brightness(resolved_colors["primary"])
+    secondary_b = ColorMath.brightness(resolved_colors["secondary"])
 
     primary_b > secondary_b
   end
@@ -481,12 +519,6 @@ class ColorScheme < ActiveRecord::Base
   def is_wcag?
     base_scheme_id&.start_with?("WCAG")
   end
-
-  # Equivalent to dc-color-brightness() in variables.scss
-  def brightness(color)
-    rgb = color.scan(/../).map { |c| c.to_i(16) }
-    (rgb[0].to_i * 299 + rgb[1].to_i * 587 + rgb[2].to_i * 114) / 1000.0
-  end
 end
 
 # == Schema Information
diff --git a/app/models/concerns/cached_counting.rb b/app/models/concerns/cached_counting.rb
index 7598c7be22b..1080fce9123 100644
--- a/app/models/concerns/cached_counting.rb
+++ b/app/models/concerns/cached_counting.rb
@@ -83,9 +83,14 @@ module CachedCounting
   end
 
   def self.flush
-    @flush = true
-    @thread.wakeup
-    sleep 0.001 while @flush
+    if @thread && @thread.alive?
+      @flush = true
+      @thread.wakeup
+      sleep 0.001 while @flush
+    else
+      flush_in_memory
+      flush_to_db
+    end
   end
 
   COUNTER_REDIS_HASH = "CounterCacheHash"
@@ -163,9 +168,30 @@ module CachedCounting
   end
 
   class_methods do
-    def perform_increment!(key)
-      CachedCounting.ensure_thread!
-      CachedCounting.queue(key, self)
+    if Rails.env.test?
+      # perform increment is a risky call in test,
+      # it shifts stuff to background threads and leaks
+      # data in the DB
+      # Require caller is deliberate if they want that
+      #
+      # Splitting implementation to avoid any perf impact
+      # given this is a method that is called a lot
+      def perform_increment!(key, async: false)
+        if async
+          CachedCounting.ensure_thread!
+          CachedCounting.queue(key, self)
+        else
+          CachedCounting.queue(key, self)
+          CachedCounting.clear_flush_to_db_lock!
+          CachedCounting.flush_in_memory
+          CachedCounting.flush_to_db
+        end
+      end
+    else
+      def perform_increment!(key)
+        CachedCounting.ensure_thread!
+        CachedCounting.queue(key, self)
+      end
     end
 
     def write_cache!(key, count, date)
diff --git a/app/models/concerns/category_hashtag.rb b/app/models/concerns/category_hashtag.rb
index 52d4d01b5b5..00f4e3e74f3 100644
--- a/app/models/concerns/category_hashtag.rb
+++ b/app/models/concerns/category_hashtag.rb
@@ -9,8 +9,8 @@ module CategoryHashtag
     # TODO (martin) Remove this when enable_experimental_hashtag_autocomplete
     # becomes the norm, it is reimplemented below for CategoryHashtagDataSourcee
     def query_from_hashtag_slug(category_slug)
-      slug_path = category_slug.split(SEPARATOR)
-      return nil if slug_path.empty? || slug_path.size > 2
+      slug_path = split_slug_path(category_slug)
+      return if slug_path.blank?
 
       slug_path.map! { |slug| CGI.escape(slug) } if SiteSetting.slug_generation_method == "encoded"
 
@@ -34,7 +34,9 @@ module CategoryHashtag
       category_slugs
         .map(&:downcase)
         .map do |slug|
-          slug_path = slug.split(":")
+          slug_path = split_slug_path(slug)
+          next if slug_path.blank?
+
           if SiteSetting.slug_generation_method == "encoded"
             slug_path.map! { |slug| CGI.escape(slug) }
           end
@@ -44,21 +46,29 @@ module CategoryHashtag
           # is no child then the "parent" part of the slug is just the
           # entire slug we look for.
           #
-          # Otherwise if the child slug is present, we find the parent
-          # by its slug then find the child by its slug and its parent's
-          # ID to make sure they match.
+          # Otherwise if the child slug is present, we find the child
+          # by its slug then find the parent by its slug and the child's
+          # parent ID to make sure they match.
           if child_slug.present?
-            parent_category = categories.find { |cat| cat.slug.casecmp?(parent_slug) }
-            if parent_category.present?
-              categories.find do |cat|
-                cat.slug.downcase == child_slug && cat.parent_category_id == parent_category.id
+            categories.find do |cat|
+              if cat.slug.casecmp?(child_slug) && cat.parent_category_id
+                categories.find do |parent_category|
+                  parent_category.id == cat.parent_category_id &&
+                    parent_category.slug.casecmp?(parent_slug)
+                end
               end
             end
           else
-            categories.find { |cat| cat.slug.downcase == parent_slug && cat.top_level? }
+            categories.find { |cat| cat.slug.casecmp?(parent_slug) && cat.top_level? }
           end
         end
         .compact
     end
+
+    def split_slug_path(slug)
+      slug_path = slug.split(SEPARATOR)
+      return if slug_path.empty? || slug_path.size > 2
+      slug_path
+    end
   end
 end
diff --git a/app/models/concerns/has_custom_fields.rb b/app/models/concerns/has_custom_fields.rb
index 2b2f64f08a3..1b592733528 100644
--- a/app/models/concerns/has_custom_fields.rb
+++ b/app/models/concerns/has_custom_fields.rb
@@ -20,7 +20,7 @@ module HasCustomFields
 
       sorted_types = types.keys.select { |k| k.end_with?("*") }.sort_by(&:length).reverse
 
-      sorted_types.each { |t| return types[t] if key =~ /^#{t}/i }
+      sorted_types.each { |t| return types[t] if key =~ /\A#{t}/i }
 
       types[key]
     end
@@ -60,12 +60,19 @@ module HasCustomFields
     end
   end
 
-  included do
-    has_many :_custom_fields, dependent: :destroy, class_name: "#{name}CustomField"
-    after_save :save_custom_fields
+  CUSTOM_FIELDS_MAX_ITEMS = 100
+  CUSTOM_FIELDS_MAX_VALUE_LENGTH = 10_000_000
 
+  included do
     attr_reader :preloaded_custom_fields
 
+    has_many :_custom_fields, dependent: :destroy, class_name: "#{name}CustomField"
+
+    validate :custom_fields_max_items, unless: :custom_fields_clean?
+    validate :custom_fields_value_length, unless: :custom_fields_clean?
+
+    after_save :save_custom_fields
+
     def custom_fields_fk
       @custom_fields_fk ||= "#{_custom_fields.reflect_on_all_associations(:belongs_to)[0].name}_id"
     end
@@ -133,6 +140,28 @@ module HasCustomFields
           end
       end
     end
+
+    private
+
+    def custom_fields_max_items
+      if custom_fields.size > CUSTOM_FIELDS_MAX_ITEMS
+        errors.add(
+          :base,
+          I18n.t("custom_fields.validations.max_items", max_items_number: CUSTOM_FIELDS_MAX_ITEMS),
+        )
+      end
+    end
+
+    def custom_fields_value_length
+      return if custom_fields.values.all? { _1.to_s.size <= CUSTOM_FIELDS_MAX_VALUE_LENGTH }
+      errors.add(
+        :base,
+        I18n.t(
+          "custom_fields.validations.max_value_length",
+          max_value_length: CUSTOM_FIELDS_MAX_VALUE_LENGTH,
+        ),
+      )
+    end
   end
 
   def reload(options = nil)
diff --git a/app/models/concerns/reports/bookmarks.rb b/app/models/concerns/reports/bookmarks.rb
index 3dac869021e..ab6ba95610d 100644
--- a/app/models/concerns/reports/bookmarks.rb
+++ b/app/models/concerns/reports/bookmarks.rb
@@ -8,7 +8,7 @@ module Reports::Bookmarks
       report.icon = "bookmark"
 
       category_filter = report.filters.dig(:category)
-      report.add_filter("category", default: category_filter)
+      report.add_filter("category", type: "category", default: category_filter)
 
       report.data = []
       Bookmark
diff --git a/app/models/concerns/reports/consolidated_api_requests.rb b/app/models/concerns/reports/consolidated_api_requests.rb
index 60184f92dde..242f67e2e32 100644
--- a/app/models/concerns/reports/consolidated_api_requests.rb
+++ b/app/models/concerns/reports/consolidated_api_requests.rb
@@ -9,12 +9,9 @@ module Reports::ConsolidatedApiRequests
 
       report.modes = [:stacked_chart]
 
-      tertiary = ColorScheme.hex_for_name("tertiary") || "0088cc"
-      danger = ColorScheme.hex_for_name("danger") || "e45735"
-
       requests =
         filters.map do |filter|
-          color = filter == "api" ? report.rgba_color(tertiary) : report.rgba_color(danger)
+          color = filter == "api" ? report.colors[0] : report.colors[1]
 
           {
             req: filter,
diff --git a/app/models/concerns/reports/consolidated_page_views.rb b/app/models/concerns/reports/consolidated_page_views.rb
index 41854f56686..dbccc395d5a 100644
--- a/app/models/concerns/reports/consolidated_page_views.rb
+++ b/app/models/concerns/reports/consolidated_page_views.rb
@@ -9,16 +9,11 @@ module Reports::ConsolidatedPageViews
 
       report.modes = [:stacked_chart]
 
-      tertiary = ColorScheme.hex_for_name("tertiary") || "0088cc"
-      danger = ColorScheme.hex_for_name("danger") || "e45735"
-
       requests =
         filters.map do |filter|
-          color = report.rgba_color(tertiary)
-
-          color = report.lighten_color(tertiary, 0.25) if filter == "page_view_anon"
-
-          color = report.rgba_color(danger, 0.75) if filter == "page_view_crawler"
+          color = report.colors[0]
+          color = report.colors[1] if filter == "page_view_anon"
+          color = report.colors[2] if filter == "page_view_crawler"
 
           {
             req: filter,
diff --git a/app/models/concerns/reports/top_uploads.rb b/app/models/concerns/reports/top_uploads.rb
index d5e2955b7d9..b9caaa63fab 100644
--- a/app/models/concerns/reports/top_uploads.rb
+++ b/app/models/concerns/reports/top_uploads.rb
@@ -66,7 +66,7 @@ module Reports::TopUploads
       builder.where("up.created_at < :end_date", end_date: report.end_date)
 
       if extension_filter
-        builder.where("up.extension = :extension", extension: extension_filter.sub(/^\./, ""))
+        builder.where("up.extension = :extension", extension: extension_filter.sub(/\A\./, ""))
       end
 
       builder.query.each do |row|
diff --git a/app/models/concerns/reports/trust_level_growth.rb b/app/models/concerns/reports/trust_level_growth.rb
index d1f82f06891..3b393426c08 100644
--- a/app/models/concerns/reports/trust_level_growth.rb
+++ b/app/models/concerns/reports/trust_level_growth.rb
@@ -49,16 +49,12 @@ module Reports::TrustLevelGrowth
         end
       end
 
-      tertiary = ColorScheme.hex_for_name("tertiary") || "0088cc"
-      quaternary = ColorScheme.hex_for_name("quaternary") || "e45735"
-
       requests =
         filters.map do |filter|
-          color = report.rgba_color(quaternary)
-
-          color = report.lighten_color(tertiary, 0.25) if filter == "tl1_reached"
-          color = report.rgba_color(tertiary) if filter == "tl2_reached"
-          color = report.lighten_color(quaternary, 0.25) if filter == "tl3_reached"
+          color = report.colors[0]
+          color = report.colors[1] if filter == "tl1_reached"
+          color = report.colors[2] if filter == "tl2_reached"
+          color = report.colors[3] if filter == "tl3_reached"
 
           {
             req: filter,
diff --git a/app/models/concerns/second_factor_manager.rb b/app/models/concerns/second_factor_manager.rb
index dc74d541e08..0adad926788 100644
--- a/app/models/concerns/second_factor_manager.rb
+++ b/app/models/concerns/second_factor_manager.rb
@@ -263,12 +263,10 @@ module SecondFactorManager
   end
 
   def hash_backup_code(code, salt)
-    Pbkdf2.hash_password(
-      code,
-      salt,
-      Rails.configuration.pbkdf2_iterations,
-      Rails.configuration.pbkdf2_algorithm,
-    )
+    # Backup codes have high entropy, so we can afford to use
+    # a lower number of iterations than for user-specific passwords
+    iterations = Rails.env.test? ? 10 : 64_000
+    Pbkdf2.hash_password(code, salt, iterations, "sha256")
   end
 
   def require_rotp
diff --git a/app/models/concerns/trashable.rb b/app/models/concerns/trashable.rb
index cdd52c08425..bc75463de7c 100644
--- a/app/models/concerns/trashable.rb
+++ b/app/models/concerns/trashable.rb
@@ -6,6 +6,7 @@ module Trashable
   included do
     default_scope { where(deleted_at: nil) }
     scope :with_deleted, -> { unscope(where: :deleted_at) }
+    scope :only_deleted, -> { with_deleted.where.not(deleted_at: nil) }
 
     belongs_to :deleted_by, class_name: "User"
   end
diff --git a/app/models/developer.rb b/app/models/developer.rb
index ee25a849c92..9ba023ba3c7 100644
--- a/app/models/developer.rb
+++ b/app/models/developer.rb
@@ -9,11 +9,11 @@ class Developer < ActiveRecord::Base
   @id_cache = DistributedCache.new("developer_ids")
 
   def self.user_ids
-    @id_cache["ids"] || rebuild_cache
+    @id_cache.defer_get_set("ids") { Set.new(Developer.pluck(:user_id)) }
   end
 
   def self.rebuild_cache
-    @id_cache["ids"] = Set.new(Developer.pluck(:user_id))
+    @id_cache.clear
   end
 
   def rebuild_cache
diff --git a/app/models/discourse_connect.rb b/app/models/discourse_connect.rb
index 0d24cf63e7d..d10917812a8 100644
--- a/app/models/discourse_connect.rb
+++ b/app/models/discourse_connect.rb
@@ -267,7 +267,16 @@ class DiscourseConnect < DiscourseConnectBase
           ReviewableUser.set_approved_fields!(user, Discourse.system_user)
         end
 
-        user.save!
+        begin
+          user.save!
+        rescue ActiveRecord::RecordInvalid => e
+          if SiteSetting.verbose_discourse_connect_logging
+            Rails.logger.error(
+              "Verbose SSO log: User creation failed. External id: #{external_id}, New User (user_id: #{user.id}) Params: #{user_params} User Params: #{user.attributes} User Errors: #{user.errors.full_messages} Email: #{user.primary_email.attributes} Email Error: #{user.primary_email.errors.full_messages}",
+            )
+          end
+          raise e
+        end
 
         if SiteSetting.verbose_discourse_connect_logging
           Rails.logger.warn(
diff --git a/app/models/draft.rb b/app/models/draft.rb
index a9dff7f2774..5e1ae358747 100644
--- a/app/models/draft.rb
+++ b/app/models/draft.rb
@@ -7,6 +7,8 @@ class Draft < ActiveRecord::Base
 
   belongs_to :user
 
+  has_many :upload_references, as: :target, dependent: :delete_all
+
   after_commit :update_draft_count, on: %i[create destroy]
 
   class OutOfSequence < StandardError
@@ -134,12 +136,14 @@ class Draft < ActiveRecord::Base
   end
 
   def self.clear(user, key, sequence)
-    return if !user || !user.id || !User.human_user_id?(user.id)
+    if !user || !user.id || !User.human_user_id?(user.id)
+      raise StandardError.new("user not present")
+    end
 
     current_sequence = DraftSequence.current(user, key)
 
     # bad caller is a reason to complain
-    raise Draft::OutOfSequence if sequence != current_sequence
+    raise Draft::OutOfSequence.new("bad draft sequence") if sequence != current_sequence
 
     # corrupt data is not a reason not to leave data
     Draft.where(user_id: user.id, draft_key: key).destroy_all
@@ -252,7 +256,7 @@ class Draft < ActiveRecord::Base
     reply = JSON.parse(data)["reply"] || ""
     return if reply.length < SiteSetting.backup_drafts_to_pm_length
 
-    post_id = BackupDraftPost.where(user_id: user.id, key: key).pluck_first(:post_id)
+    post_id = BackupDraftPost.where(user_id: user.id, key: key).pick(:post_id)
     post = Post.where(id: post_id).first if post_id
 
     BackupDraftPost.where(user_id: user.id, key: key).delete_all if post_id && !post
@@ -305,7 +309,7 @@ class Draft < ActiveRecord::Base
   end
 
   def self.ensure_draft_topic!(user)
-    topic_id = BackupDraftTopic.where(user_id: user.id).pluck_first(:topic_id)
+    topic_id = BackupDraftTopic.where(user_id: user.id).pick(:topic_id)
     topic = Topic.find_by(id: topic_id) if topic_id
 
     BackupDraftTopic.where(user_id: user.id).delete_all if topic_id && !topic
diff --git a/app/models/embeddable_host.rb b/app/models/embeddable_host.rb
index b271d37b025..285c6fd1b79 100644
--- a/app/models/embeddable_host.rb
+++ b/app/models/embeddable_host.rb
@@ -6,8 +6,8 @@ class EmbeddableHost < ActiveRecord::Base
   after_destroy :reset_embedding_settings
 
   before_validation do
-    self.host.sub!(%r{^https?://}, "")
-    self.host.sub!(%r{/.*$}, "")
+    self.host.sub!(%r{\Ahttps?://}, "")
+    self.host.sub!(%r{/.*\z}, "")
   end
 
   # TODO(2021-07-23): Remove
diff --git a/app/models/emoji.rb b/app/models/emoji.rb
index 94b85eb154d..4d85b4eb530 100644
--- a/app/models/emoji.rb
+++ b/app/models/emoji.rb
@@ -28,6 +28,14 @@ class Emoji
     Discourse.cache.fetch(cache_key("standard_emojis")) { load_standard }
   end
 
+  def self.allowed
+    Discourse.cache.fetch(cache_key("allowed_emojis")) { load_allowed }
+  end
+
+  def self.denied
+    Discourse.cache.fetch(cache_key("denied_emojis")) { load_denied }
+  end
+
   def self.aliases
     db["aliases"]
   end
@@ -59,25 +67,22 @@ class Emoji
 
   def self.[](name)
     name = name.delete_prefix(":").delete_suffix(":")
-    is_toned = name.match?(/.+:t[1-6]/)
-    normalized_name = name.gsub(/(.+):t[1-6]/, '\1')
+    is_toned = name.match?(/\A.+:t[1-6]\z/)
+    normalized_name = name.gsub(/\A(.+):t[1-6]\z/, '\1')
 
     found_emoji = nil
 
     [[global_emoji_cache, :standard], [site_emoji_cache, :custom]].each do |cache, list_key|
-      cache_postfix, found_emoji =
+      found_emoji =
         cache.defer_get_set(normalized_name) do
-          emoji =
+          [
             Emoji
               .public_send(list_key)
-              .detect { |e| e.name == normalized_name && (!is_toned || (is_toned && e.tonable)) }
-          [self.cache_postfix, emoji]
-        end
-
-      if found_emoji && (cache_postfix != self.cache_postfix)
-        cache.delete(normalized_name)
-        redo
-      end
+              .detect { |e| e.name == normalized_name && (!is_toned || (is_toned && e.tonable)) },
+          ]
+        end[
+          0
+        ]
 
       break if found_emoji
     end
@@ -117,7 +122,7 @@ class Emoji
   end
 
   def self.clear_cache
-    %w[custom standard translations all].each do |key|
+    %w[custom standard translations allowed denied all].each do |key|
       Discourse.cache.delete(cache_key("#{key}_emojis"))
     end
     global_emoji_cache.clear
@@ -153,6 +158,26 @@ class Emoji
     db["emojis"].map { |e| Emoji.create_from_db_item(e) }.compact
   end
 
+  def self.load_allowed
+    denied_emojis = denied
+    all_emojis = load_standard + load_custom
+
+    if denied_emojis.present?
+      all_emojis.reject { |e| denied_emojis.include?(e.name) }
+    else
+      all_emojis
+    end
+  end
+
+  def self.load_denied
+    if SiteSetting.emoji_deny_list.present?
+      denied_emoji = SiteSetting.emoji_deny_list.split("|")
+      if denied_emoji.size > 0
+        denied_emoji.concat(denied_emoji.flat_map { |e| Emoji.aliases[e] }.compact)
+      end
+    end
+  end
+
   def self.load_custom
     result = []
 
@@ -173,7 +198,7 @@ class Emoji
       emojis.each do |name, url|
         result << Emoji.new.tap do |e|
           e.name = name
-          url = (Discourse.base_path + url) if url[%r{^/[^/]}]
+          url = (Discourse.base_path + url) if url[%r{\A/[^/]}]
           e.url = url
           e.group = group || DEFAULT_GROUP
         end
@@ -232,7 +257,6 @@ class Emoji
         replacements["\u{263B}"] = "slight_smile"
         replacements["\u{2661}"] = "heart"
         replacements["\u{2665}"] = "heart"
-        replacements["\u{263A}"] = "relaxed"
 
         replacements
       end
@@ -247,6 +271,8 @@ class Emoji
   end
 
   def self.lookup_unicode(name)
+    return "" if denied&.include?(name)
+
     @reverse_map ||=
       begin
         map = {}
diff --git a/app/models/external_upload_stub.rb b/app/models/external_upload_stub.rb
index 99ed046b97e..10004f29069 100644
--- a/app/models/external_upload_stub.rb
+++ b/app/models/external_upload_stub.rb
@@ -43,9 +43,6 @@ class ExternalUploadStub < ActiveRecord::Base
     @statuses ||= Enum.new(created: 1, uploaded: 2, failed: 3)
   end
 
-  # TODO (martin): Lifecycle rule would be best to clean stuff up in the external
-  # systems, I don't think we really want to be calling out to the external systems
-  # here right?
   def self.cleanup!
     expired_created.delete_all
     expired_uploaded.delete_all
diff --git a/app/models/form_template.rb b/app/models/form_template.rb
new file mode 100644
index 00000000000..b73b42e9577
--- /dev/null
+++ b/app/models/form_template.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+class FormTemplate < ActiveRecord::Base
+  validates :name,
+            presence: true,
+            uniqueness: true,
+            length: {
+              maximum: SiteSetting.max_form_template_title_length,
+            }
+  validates :template,
+            presence: true,
+            length: {
+              maximum: SiteSetting.max_form_template_content_length,
+            }
+  validates_with FormTemplateYamlValidator
+
+  has_many :category_form_templates, dependent: :destroy
+  has_many :categories, through: :category_form_templates
+end
+
+# == Schema Information
+#
+# Table name: form_templates
+#
+#  id         :bigint           not null, primary key
+#  name       :string(100)      not null
+#  template   :text             not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+# Indexes
+#
+#  index_form_templates_on_name  (name) UNIQUE
+#
diff --git a/app/models/global_setting.rb b/app/models/global_setting.rb
index efd83403a06..a942b8b3909 100644
--- a/app/models/global_setting.rb
+++ b/app/models/global_setting.rb
@@ -5,7 +5,7 @@ class GlobalSetting
     define_singleton_method(key) { provider.lookup(key, default) }
   end
 
-  VALID_SECRET_KEY ||= /^[0-9a-f]{128}$/
+  VALID_SECRET_KEY ||= /\A[0-9a-f]{128}\z/
   # this is named SECRET_TOKEN as opposed to SECRET_KEY_BASE
   # for legacy reasons
   REDIS_SECRET_KEY ||= "SECRET_TOKEN"
@@ -63,14 +63,12 @@ class GlobalSetting
 
         define_singleton_method(key) do
           val = instance_variable_get("@#{key}_cache")
-          unless val.nil?
-            val == :missing ? nil : val
-          else
+          if val.nil?
             val = provider.lookup(key, default)
             val = :missing if val.nil?
             instance_variable_set("@#{key}_cache", val)
-            val == :missing ? nil : val
           end
+          val == :missing ? nil : val
         end
       end
   end
@@ -251,7 +249,7 @@ class GlobalSetting
   class BaseProvider
     def self.coerce(setting)
       return setting == "true" if setting == "true" || setting == "false"
-      return $1.to_i if setting.to_s.strip =~ /^([0-9]+)$/
+      return $1.to_i if setting.to_s.strip =~ /\A([0-9]+)\z/
       setting
     end
 
@@ -283,7 +281,7 @@ class GlobalSetting
         .result()
         .split("\n")
         .each do |line|
-          if line =~ /^\s*([a-z_]+[a-z0-9_]*)\s*=\s*(\"([^\"]*)\"|\'([^\']*)\'|[^#]*)/
+          if line =~ /\A\s*([a-z_]+[a-z0-9_]*)\s*=\s*(\"([^\"]*)\"|\'([^\']*)\'|[^#]*)/
             @data[$1.strip.to_sym] = ($4 || $3 || $2).strip
           end
         end
@@ -314,7 +312,7 @@ class GlobalSetting
     end
 
     def keys
-      ENV.keys.select { |k| k =~ /^DISCOURSE_/ }.map { |k| k[10..-1].downcase.to_sym }
+      ENV.keys.select { |k| k =~ /\ADISCOURSE_/ }.map { |k| k[10..-1].downcase.to_sym }
     end
   end
 
diff --git a/app/models/group.rb b/app/models/group.rb
index c31436815a9..6f34d571ed7 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -65,6 +65,7 @@ class Group < ActiveRecord::Base
   after_commit :automatic_group_membership, on: %i[create update]
   after_commit :trigger_group_created_event, on: :create
   after_commit :trigger_group_updated_event, on: :update
+  before_destroy :cache_group_users_for_destroyed_event, prepend: true
   after_commit :trigger_group_destroyed_event, on: :destroy
   after_commit :set_default_notifications, on: %i[create update]
 
@@ -88,6 +89,10 @@ class Group < ActiveRecord::Base
   validate :incoming_email_validator
   validate :can_allow_membership_requests, if: :allow_membership_requests
   validate :validate_grant_trust_level, if: :will_save_change_to_grant_trust_level?
+  validates :automatic_membership_email_domains, length: { maximum: 1000 }
+  validates :bio_raw, length: { maximum: 3000 }
+  validates :membership_request_template, length: { maximum: 5000 }
+  validates :full_name, length: { maximum: 100 }
 
   AUTO_GROUPS = {
     everyone: 0,
@@ -160,7 +165,18 @@ class Group < ActiveRecord::Base
             if user.blank?
               sql = "groups.visibility_level = :public"
             elsif is_staff
-              sql = "groups.visibility_level IN (:public, :logged_on_users, :members, :staff)"
+              sql = <<~SQL
+                groups.visibility_level IN (:public, :logged_on_users, :members, :staff)
+                OR
+                groups.id IN (
+                  SELECT g.id
+                    FROM groups g
+                    JOIN group_users gu ON gu.group_id = g.id
+                    AND gu.user_id = :user_id
+                    AND gu.owner
+                  WHERE g.visibility_level = :owners
+                )
+              SQL
             else
               sql = <<~SQL
           groups.id IN (
@@ -204,8 +220,18 @@ class Group < ActiveRecord::Base
             if user.blank?
               sql = "groups.members_visibility_level = :public"
             elsif is_staff
-              sql =
-                "groups.members_visibility_level IN (:public, :logged_on_users, :members, :staff)"
+              sql = <<~SQL
+                groups.members_visibility_level IN (:public, :logged_on_users, :members, :staff)
+                OR
+                groups.id IN (
+                  SELECT g.id
+                    FROM groups g
+                    JOIN group_users gu ON gu.group_id = g.id
+                    AND gu.user_id = :user_id
+                    AND gu.owner
+                  WHERE g.members_visibility_level = :owners
+                )
+              SQL
             else
               sql = <<~SQL
           groups.id IN (
@@ -249,12 +275,12 @@ class Group < ActiveRecord::Base
   scope :messageable,
         lambda { |user|
           where(
-            "messageable_level in (:levels) OR
+            "groups.messageable_level in (:levels) OR
           (
-            messageable_level = #{ALIAS_LEVELS[:members_mods_and_admins]} AND id in (
+            groups.messageable_level = #{ALIAS_LEVELS[:members_mods_and_admins]} AND groups.id in (
             SELECT group_id FROM group_users WHERE user_id = :user_id)
           ) OR (
-            messageable_level = #{ALIAS_LEVELS[:owners_mods_and_admins]} AND id in (
+            groups.messageable_level = #{ALIAS_LEVELS[:owners_mods_and_admins]} AND groups.id in (
             SELECT group_id FROM group_users WHERE user_id = :user_id AND owner IS TRUE)
           )",
             levels: alias_levels(user),
@@ -264,14 +290,14 @@ class Group < ActiveRecord::Base
 
   def self.mentionable_sql_clause(include_public: true)
     clause = +<<~SQL
-      mentionable_level in (:levels)
+      groups.mentionable_level in (:levels)
       OR (
-        mentionable_level = #{ALIAS_LEVELS[:members_mods_and_admins]}
-        AND id in (
+        groups.mentionable_level = #{ALIAS_LEVELS[:members_mods_and_admins]}
+        AND groups.id in (
           SELECT group_id FROM group_users WHERE user_id = :user_id)
       ) OR (
-        mentionable_level = #{ALIAS_LEVELS[:owners_mods_and_admins]}
-        AND id in (
+        groups.mentionable_level = #{ALIAS_LEVELS[:owners_mods_and_admins]}
+        AND groups.id in (
           SELECT group_id FROM group_users WHERE user_id = :user_id AND owner IS TRUE)
       )
       SQL
@@ -652,14 +678,17 @@ class Group < ActiveRecord::Base
     groups ||= Group
 
     relation =
-      groups.where("name ILIKE :term_like OR full_name ILIKE :term_like", term_like: "%#{name}%")
+      groups.where(
+        "groups.name ILIKE :term_like OR groups.full_name ILIKE :term_like",
+        term_like: "%#{name}%",
+      )
 
     if sort == :auto
       prefix = "#{name.gsub("_", "\\_")}%"
       relation =
         relation.reorder(
           DB.sql_fragment(
-            "CASE WHEN name ILIKE :like OR full_name ILIKE :like THEN 0 ELSE 1 END ASC, name ASC",
+            "CASE WHEN groups.name ILIKE :like OR groups.full_name ILIKE :like THEN 0 ELSE 1 END ASC, groups.name ASC",
             like: prefix,
           ),
         )
@@ -681,7 +710,7 @@ class Group < ActiveRecord::Base
 
   def self.lookup_groups(group_ids: [], group_names: [])
     if group_ids.present?
-      group_ids = group_ids.split(",") if group_ids.is_a?(String)
+      group_ids = group_ids.to_s.split(",") if !group_ids.is_a?(Array)
       group_ids.map!(&:to_i)
       groups = Group.where(id: group_ids) if group_ids.present?
     end
@@ -792,22 +821,27 @@ class Group < ActiveRecord::Base
     group_user = self.group_users.find_by(user: user)
     return false if group_user.blank?
 
-    has_webhooks = WebHook.active_web_hooks(:group_user)
-    payload =
-      WebHook.generate_payload(:group_user, group_user, WebHookGroupUserSerializer) if has_webhooks
     group_user.destroy
     trigger_user_removed_event(user)
-    if has_webhooks
-      WebHook.enqueue_hooks(
-        :group_user,
-        :user_removed_from_group,
-        id: group_user.id,
-        payload: payload,
-      )
-    end
+    enqueue_user_removed_from_group_webhook_events(group_user)
+
     true
   end
 
+  def enqueue_user_removed_from_group_webhook_events(group_user)
+    return if !WebHook.active_web_hooks(:group_user)
+
+    payload = WebHook.generate_payload(:group_user, group_user, WebHookGroupUserSerializer)
+
+    WebHook.enqueue_hooks(
+      :group_user,
+      :user_removed_from_group,
+      id: group_user.id,
+      payload: payload,
+      group_ids: [self.id],
+    )
+  end
+
   def trigger_user_added_event(user, automatic)
     DiscourseEvent.trigger(:user_added_to_group, user, self, automatic: automatic)
   end
@@ -865,14 +899,7 @@ class Group < ActiveRecord::Base
       User.where(id: user_ids).update_all(user_attributes) if user_attributes.present?
 
       # update group user count
-      DB.exec <<~SQL
-        UPDATE groups g
-        SET user_count =
-          (SELECT COUNT(gu.user_id)
-           FROM group_users gu
-           WHERE gu.group_id = g.id)
-        WHERE g.id = #{self.id};
-      SQL
+      recalculate_user_count
     end
 
     if self.grant_trust_level.present?
@@ -882,6 +909,31 @@ class Group < ActiveRecord::Base
     self
   end
 
+  def bulk_remove(user_ids)
+    Group.transaction do
+      group_users_to_be_destroyed = group_users.includes(:user).where(user_id: user_ids).destroy_all
+      group_users_to_be_destroyed.each do |group_user|
+        trigger_user_removed_event(group_user.user)
+        enqueue_user_removed_from_group_webhook_events(group_user)
+      end
+    end
+
+    recalculate_user_count
+
+    true
+  end
+
+  def recalculate_user_count
+    DB.exec <<~SQL
+      UPDATE groups g
+      SET user_count =
+        (SELECT COUNT(gu.user_id)
+         FROM group_users gu
+         WHERE gu.group_id = g.id)
+      WHERE g.id = #{self.id};
+    SQL
+  end
+
   def add_automatically(user, subject: nil)
     if users.exclude?(user) && add(user)
       logger = GroupActionLogger.new(Discourse.system_user, self)
@@ -911,13 +963,22 @@ class Group < ActiveRecord::Base
     self.member_of(groups, user).where("gu.owner")
   end
 
-  %i[group_created group_updated group_destroyed].each do |event|
+  def cache_group_users_for_destroyed_event
+    @cached_group_user_ids = group_users.pluck(:user_id)
+  end
+
+  %i[group_created group_updated].each do |event|
     define_method("trigger_#{event}_event") do
       DiscourseEvent.trigger(event, self)
       true
     end
   end
 
+  def trigger_group_destroyed_event
+    DiscourseEvent.trigger(:group_destroyed, self, @cached_group_user_ids)
+    true
+  end
+
   def flair_type
     return :icon if flair_icon.present?
     return :image if flair_upload.present?
@@ -1005,7 +1066,7 @@ class Group < ActiveRecord::Base
     user = email_username_user
     domain = email_username_domain
     if user.present? && domain.present?
-      /^#{Regexp.escape(user)}(\+[^@]*)?@#{Regexp.escape(domain)}$/i
+      /\A#{Regexp.escape(user)}(\+[^@]*)?@#{Regexp.escape(domain)}\z/i
     end
   end
 
@@ -1160,8 +1221,8 @@ class Group < ActiveRecord::Base
     value
       .split("|")
       .each do |domain|
-        domain.sub!(%r{^https?://}, "")
-        domain.sub!(%r{/.*$}, "")
+        domain.sub!(%r{\Ahttps?://}, "")
+        domain.sub!(%r{/.*\z}, "")
 
         if domain =~ Group::VALID_DOMAIN_REGEX
           valid_domains << domain
diff --git a/app/models/group_manager.rb b/app/models/group_manager.rb
deleted file mode 100644
index b8c94b4f4ff..00000000000
--- a/app/models/group_manager.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-class GroupManager < ActiveRecord::Base
-  belongs_to :group
-  belongs_to :manager, class_name: "User", foreign_key: :user_id
-end
-
-# == Schema Information
-#
-# Table name: group_managers
-#
-#  id         :integer          not null, primary key
-#  group_id   :integer          not null
-#  user_id    :integer          not null
-#  created_at :datetime
-#  updated_at :datetime
-#
-# Indexes
-#
-#  index_group_managers_on_group_id_and_user_id  (group_id,user_id) UNIQUE
-#
diff --git a/app/models/group_request.rb b/app/models/group_request.rb
index c923622aac3..eb6a6d5f059 100644
--- a/app/models/group_request.rb
+++ b/app/models/group_request.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class GroupRequest < ActiveRecord::Base
-  REASON_CHARACTER_LIMIT = 280
+  REASON_CHARACTER_LIMIT = 5000
 
   belongs_to :group
   belongs_to :user
diff --git a/app/models/incoming_link.rb b/app/models/incoming_link.rb
index acb7d0b3955..694ce06e503 100644
--- a/app/models/incoming_link.rb
+++ b/app/models/incoming_link.rb
@@ -37,7 +37,7 @@ class IncomingLink < ActiveRecord::Base
     if host != opts[:host] && (user_id || referer)
       post_id = opts[:post_id]
       post_id ||=
-        Post.where(topic_id: opts[:topic_id], post_number: opts[:post_number] || 1).pluck_first(:id)
+        Post.where(topic_id: opts[:topic_id], post_number: opts[:post_number] || 1).pick(:id)
 
       cid = current_user ? (current_user.id) : (nil)
       ip_address = nil if cid
diff --git a/app/models/invite.rb b/app/models/invite.rb
index dae62e32317..191da0818ca 100644
--- a/app/models/invite.rb
+++ b/app/models/invite.rb
@@ -31,6 +31,7 @@ class Invite < ActiveRecord::Base
 
   validates_presence_of :invited_by_id
   validates :email, email: true, allow_blank: true
+  validates :custom_message, length: { maximum: 1000 }
   validate :ensure_max_redemptions_allowed
   validate :valid_redemption_count
   validate :valid_domain, if: :will_save_change_to_domain?
@@ -273,10 +274,12 @@ class Invite < ActiveRecord::Base
   end
 
   def self.invalidate_for_email(email)
-    invite = Invite.find_by(email: Email.downcase(email))
-    invite.update!(invalidated_at: Time.zone.now) if invite
+    Invite.find_by(email: Email.downcase(email))&.invalidate!
+  end
 
-    invite
+  def invalidate!
+    update_attribute(:invalidated_at, Time.current)
+    self
   end
 
   def resend_invite
@@ -349,7 +352,9 @@ class Invite < ActiveRecord::Base
   end
 
   def user_exists_error_msg(email)
-    I18n.t("invite.user_exists", email: CGI.escapeHTML(email))
+    error_key = SiteSetting.hide_email_address_taken? ? "generic_error_response" : "user_exists"
+
+    I18n.t("invite.#{error_key}", email: CGI.escapeHTML(email))
   end
 end
 
diff --git a/app/models/notification.rb b/app/models/notification.rb
index f8aeab2b73d..3673a3798f8 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -152,9 +152,11 @@ class Notification < ActiveRecord::Base
         question_answer_user_commented: 35, # Used by https://github.com/discourse/discourse-question-answer
         watching_category_or_tag: 36,
         new_features: 37,
+        admin_problems: 38,
         following: 800, # Used by https://github.com/discourse/discourse-follow
         following_created_topic: 801, # Used by https://github.com/discourse/discourse-follow
         following_replied: 802, # Used by https://github.com/discourse/discourse-follow
+        circles_activity: 900, # Used by https://github.com/discourse/discourse-circles
       )
   end
 
@@ -277,7 +279,6 @@ class Notification < ActiveRecord::Base
     notifications.to_a
   end
 
-  # TODO(osama): deprecate this method when redesigned_user_menu_enabled is removed
   def self.recent_report(user, count = nil, types = [])
     return unless user && user.user_option
 
@@ -347,7 +348,7 @@ class Notification < ActiveRecord::Base
   end
 
   def post_id
-    Post.where(topic: topic_id, post_number: post_number).pluck_first(:id)
+    Post.where(topic: topic_id, post_number: post_number).pick(:id)
   end
 
   protected
diff --git a/app/models/optimized_image.rb b/app/models/optimized_image.rb
index e5a8b4fdb3f..ec1827e36c6 100644
--- a/app/models/optimized_image.rb
+++ b/app/models/optimized_image.rb
@@ -24,7 +24,7 @@ class OptimizedImage < ActiveRecord::Base
   end
 
   def self.create_for(upload, width, height, opts = {})
-    return unless width > 0 && height > 0
+    return if width <= 0 || height <= 0
     return if upload.try(:sha1).blank?
 
     # no extension so try to guess it
@@ -80,6 +80,7 @@ class OptimizedImage < ActiveRecord::Base
         target_quality =
           upload.target_image_quality(original_path, SiteSetting.image_preview_jpg_quality)
         opts = opts.merge(quality: target_quality) if target_quality
+        opts = opts.merge(upload_id: upload.id)
 
         if upload.extension == "svg"
           FileUtils.cp(original_path, temp_path)
@@ -137,7 +138,7 @@ class OptimizedImage < ActiveRecord::Base
   end
 
   def local?
-    !(url =~ %r{^(https?:)?//})
+    !(url =~ %r{\A(https?:)?//})
   end
 
   def calculate_filesize
@@ -145,7 +146,7 @@ class OptimizedImage < ActiveRecord::Base
       if local?
         Discourse.store.path_for(self)
       else
-        Discourse.store.download(self).path
+        Discourse.store.download!(self).path
       end
     File.size(path)
   end
@@ -174,7 +175,7 @@ class OptimizedImage < ActiveRecord::Base
     paths.each { |path| raise Discourse::InvalidAccess unless safe_path?(path) }
   end
 
-  IM_DECODERS ||= /\A(jpe?g|png|ico|gif|webp)\z/i
+  IM_DECODERS ||= /\A(jpe?g|png|ico|gif|webp|avif)\z/i
 
   def self.prepend_decoder!(path, ext_path = nil, opts = nil)
     opts ||= {}
@@ -332,13 +333,19 @@ class OptimizedImage < ActiveRecord::Base
     else
       error = +"Failed to optimize image:"
 
-      if e.message =~ /^convert:([^`]+)/
+      if e.message =~ /\Aconvert:([^`]+)/
         error << $1
       else
         error << " unknown reason"
       end
 
-      Discourse.warn(error, location: to, error_message: e.message, instructions: instructions)
+      Discourse.warn(
+        error,
+        upload_id: opts[:upload_id],
+        location: to,
+        error_message: e.message,
+        instructions: instructions,
+      )
       false
     end
   end
diff --git a/app/models/post.rb b/app/models/post.rb
index 3f97171bb79..86cfa5962a4 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -61,6 +61,7 @@ class Post < ActiveRecord::Base
   belongs_to :image_upload, class_name: "Upload"
 
   has_many :post_hotlinked_media, dependent: :destroy, class_name: "PostHotlinkedMedia"
+  has_many :reviewables, as: :target, dependent: :destroy
 
   validates_with PostValidator, unless: :skip_validation
   validates :edit_reason, length: { maximum: 1000 }
@@ -437,7 +438,7 @@ class Post < ActiveRecord::Base
     # percent rank has tons of ties
     where(topic_id: topic_id).where(
       [
-        "id = ANY(
+        "posts.id = ANY(
           (
             SELECT posts.id
             FROM posts
@@ -550,10 +551,14 @@ class Post < ActiveRecord::Base
   end
 
   def is_flagged?
+    flags.count != 0
+  end
+
+  def flags
     post_actions.where(
       post_action_type_id: PostActionType.flag_types_without_custom.values,
       deleted_at: nil,
-    ).count != 0
+    )
   end
 
   def reviewable_flag
@@ -1007,6 +1012,29 @@ class Post < ActiveRecord::Base
       upload = nil
       upload = Upload.find_by(sha1: sha1) if sha1.present?
       upload ||= Upload.get_from_url(src)
+
+      # Link any video thumbnails
+      if SiteSetting.video_thumbnails_enabled && upload.present? &&
+           FileHelper.supported_video.include?(upload.extension&.downcase)
+        # Video thumbnails have the filename of the video file sha1 with a .png or .jpg extension.
+        # This is because at time of upload in the composer we don't know the topic/post id yet
+        # and there is no thumbnail info added to the markdown to tie the thumbnail to the topic/post after
+        # creation.
+        thumbnail =
+          Upload
+            .where("original_filename like ?", "#{upload.sha1}.%")
+            .order(id: :desc)
+            .first if upload.sha1.present?
+        if thumbnail.present? && self.is_first_post? && !self.topic.image_upload_id
+          upload_ids << thumbnail.id
+          self.topic.update_column(:image_upload_id, thumbnail.id)
+          extra_sizes =
+            ThemeModifierHelper.new(
+              theme_ids: Theme.user_selectable.pluck(:id),
+            ).topic_thumbnail_sizes
+          self.topic.generate_thumbnails!(extra_sizes: extra_sizes)
+        end
+      end
       upload_ids << upload.id if upload.present?
     end
 
@@ -1035,7 +1063,7 @@ class Post < ActiveRecord::Base
   end
 
   def update_uploads_secure_status(source:)
-    if Discourse.store.external?
+    if Discourse.store.external? && SiteSetting.secure_uploads?
       Jobs.enqueue(:update_post_uploads_secure_status, post_id: self.id, source: source)
     end
   end
@@ -1085,8 +1113,8 @@ class Post < ActiveRecord::Base
       next if Rails.configuration.multisite && src.exclude?(current_db)
 
       src = "#{SiteSetting.force_https ? "https" : "http"}:#{src}" if src.start_with?("//")
-      unless Discourse.store.has_been_uploaded?(src) || Upload.secure_uploads_url?(src) ||
-               (include_local_upload && src =~ %r{\A/[^/]}i)
+      if !Discourse.store.has_been_uploaded?(src) && !Upload.secure_uploads_url?(src) &&
+           !(include_local_upload && src =~ %r{\A/[^/]}i)
         next
       end
 
@@ -1149,7 +1177,7 @@ class Post < ActiveRecord::Base
             end
 
             upload_id = nil
-            upload_id = Upload.where(sha1: sha1).pluck_first(:id) if sha1.present?
+            upload_id = Upload.where(sha1: sha1).pick(:id) if sha1.present?
             upload_id ||= yield(post, src, path, sha1)
 
             if upload_id.blank?
@@ -1285,16 +1313,18 @@ end
 #
 # Indexes
 #
-#  idx_posts_created_at_topic_id             (created_at,topic_id) WHERE (deleted_at IS NULL)
-#  idx_posts_deleted_posts                   (topic_id,post_number) WHERE (deleted_at IS NOT NULL)
-#  idx_posts_user_id_deleted_at              (user_id) WHERE (deleted_at IS NULL)
-#  index_for_rebake_old                      (id) WHERE (((baked_version IS NULL) OR (baked_version < 2)) AND (deleted_at IS NULL))
-#  index_posts_on_id_and_baked_version       (id DESC,baked_version) WHERE (deleted_at IS NULL)
-#  index_posts_on_image_upload_id            (image_upload_id)
-#  index_posts_on_reply_to_post_number       (reply_to_post_number)
-#  index_posts_on_topic_id_and_percent_rank  (topic_id,percent_rank)
-#  index_posts_on_topic_id_and_post_number   (topic_id,post_number) UNIQUE
-#  index_posts_on_topic_id_and_sort_order    (topic_id,sort_order)
-#  index_posts_on_user_id_and_created_at     (user_id,created_at)
-#  index_posts_user_and_likes                (user_id,like_count DESC,created_at DESC) WHERE (post_number > 1)
+#  idx_posts_created_at_topic_id                          (created_at,topic_id) WHERE (deleted_at IS NULL)
+#  idx_posts_deleted_posts                                (topic_id,post_number) WHERE (deleted_at IS NOT NULL)
+#  idx_posts_user_id_deleted_at                           (user_id) WHERE (deleted_at IS NULL)
+#  index_for_rebake_old                                   (id) WHERE (((baked_version IS NULL) OR (baked_version < 2)) AND (deleted_at IS NULL))
+#  index_posts_on_id_and_baked_version                    (id DESC,baked_version) WHERE (deleted_at IS NULL)
+#  index_posts_on_id_topic_id_where_not_deleted_or_empty  (id,topic_id) WHERE ((deleted_at IS NULL) AND (raw <> ''::text))
+#  index_posts_on_image_upload_id                         (image_upload_id)
+#  index_posts_on_reply_to_post_number                    (reply_to_post_number)
+#  index_posts_on_topic_id_and_created_at                 (topic_id,created_at)
+#  index_posts_on_topic_id_and_percent_rank               (topic_id,percent_rank)
+#  index_posts_on_topic_id_and_post_number                (topic_id,post_number) UNIQUE
+#  index_posts_on_topic_id_and_sort_order                 (topic_id,sort_order)
+#  index_posts_on_user_id_and_created_at                  (user_id,created_at)
+#  index_posts_user_and_likes                             (user_id,like_count DESC,created_at DESC) WHERE (post_number > 1)
 #
diff --git a/app/models/post_action.rb b/app/models/post_action.rb
index a02c8908cf6..d339316367e 100644
--- a/app/models/post_action.rb
+++ b/app/models/post_action.rb
@@ -242,7 +242,7 @@ class PostAction < ActiveRecord::Base
       end
     end
 
-    topic_id = Post.with_deleted.where(id: post_id).pluck_first(:topic_id)
+    topic_id = Post.with_deleted.where(id: post_id).pick(:topic_id)
 
     # topic_user
     if post_action_type_key == :like
diff --git a/app/models/post_action_type.rb b/app/models/post_action_type.rb
index db785c307fe..3f2f8d7e977 100644
--- a/app/models/post_action_type.rb
+++ b/app/models/post_action_type.rb
@@ -7,8 +7,8 @@ class PostActionType < ActiveRecord::Base
   include AnonCacheInvalidator
 
   def expire_cache
-    ApplicationSerializer.expire_cache_fragment!(/^post_action_types_/)
-    ApplicationSerializer.expire_cache_fragment!(/^post_action_flag_types_/)
+    ApplicationSerializer.expire_cache_fragment!(/\Apost_action_types_/)
+    ApplicationSerializer.expire_cache_fragment!(/\Apost_action_flag_types_/)
   end
 
   class << self
diff --git a/app/models/post_custom_field.rb b/app/models/post_custom_field.rb
index 58c8705fd5a..56cf46a90b6 100644
--- a/app/models/post_custom_field.rb
+++ b/app/models/post_custom_field.rb
@@ -17,7 +17,6 @@ end
 #
 # Indexes
 #
-#  idx_post_custom_fields_akismet                (post_id) WHERE (((name)::text = 'AKISMET_STATE'::text) AND (value = 'needs_review'::text))
 #  index_post_custom_fields_on_name_and_value    (name, "left"(value, 200))
 #  index_post_custom_fields_on_notice            (post_id) UNIQUE WHERE ((name)::text = 'notice'::text)
 #  index_post_custom_fields_on_post_id           (post_id) UNIQUE WHERE ((name)::text = 'missing uploads'::text)
diff --git a/app/models/post_hotlinked_media.rb b/app/models/post_hotlinked_media.rb
index de7d6aca7a5..53477bf7563 100644
--- a/app/models/post_hotlinked_media.rb
+++ b/app/models/post_hotlinked_media.rb
@@ -10,10 +10,10 @@ class PostHotlinkedMedia < ActiveRecord::Base
          upload_create_failed: "upload_create_failed",
        }
 
-  def self.normalize_src(src)
+  def self.normalize_src(src, reset_scheme: true)
     uri = Addressable::URI.heuristic_parse(src)
     uri.normalize!
-    uri.scheme = nil
+    uri.scheme = nil if reset_scheme
     uri.to_s
   rescue URI::Error, Addressable::URI::InvalidURIError
     src
diff --git a/app/models/post_mover.rb b/app/models/post_mover.rb
index ac6e90471ae..fd2d4793e89 100644
--- a/app/models/post_mover.rb
+++ b/app/models/post_mover.rb
@@ -14,8 +14,9 @@ class PostMover
     @move_to_pm = move_to_pm
   end
 
-  def to_topic(id, participants: nil)
+  def to_topic(id, participants: nil, chronological_order: false)
     @move_type = PostMover.move_types[:existing_topic]
+    @chronological_order = chronological_order
 
     topic = Topic.find_by_id(id)
     if topic.archetype != @original_topic.archetype &&
@@ -84,8 +85,13 @@ class PostMover
         .count
     moving_all_posts = original_topic_posts_count == posts.length
 
+    @first_post_number_moved =
+      posts.first.is_first_post? ? posts[1]&.post_number : posts.first.post_number
+
     create_temp_table
     move_each_post
+    handle_moved_references
+
     create_moderator_post_in_original_topic
     update_statistics
     update_user_actions
@@ -118,7 +124,30 @@ class PostMover
     SQL
   end
 
+  def handle_moved_references
+    move_incoming_emails
+    move_notifications
+    update_reply_counts
+    update_quotes
+    move_first_post_replies
+    delete_post_replies
+    copy_shifted_post_timings_to_temp
+    delete_invalid_post_timings
+    copy_shifted_post_timings_from_temp
+    move_post_timings
+    copy_first_post_timings
+    copy_topic_users
+  end
+
   def move_each_post
+    if @chronological_order
+      move_each_post_chronological
+    else
+      move_each_post_sequential
+    end
+  end
+
+  def move_each_post_sequential
     max_post_number = destination_topic.max_post_number + 1
 
     @post_creator = nil
@@ -133,7 +162,7 @@ class PostMover
     end
 
     posts.each do |post|
-      metadata = movement_metadata(post)
+      metadata = movement_metadata(post, new_post_number: @move_map[post.post_number])
       new_post = post.is_first_post? ? create_first_post(post) : move(post)
 
       store_movement(metadata, new_post)
@@ -142,17 +171,72 @@ class PostMover
         destination_topic.topic_allowed_users.create!(user_id: post.user_id)
       end
     end
+  end
 
-    move_incoming_emails
-    move_notifications
-    update_reply_counts
-    update_quotes
-    move_first_post_replies
-    delete_post_replies
-    delete_invalid_post_timings
-    copy_first_post_timings
-    move_post_timings
-    copy_topic_users
+  def move_each_post_chronological
+    destination_posts = destination_topic.ordered_posts.with_deleted
+
+    # drops posts from destination_topic until it finds one that was created after posts.first
+    min_created_at = posts.first.created_at
+    moved_posts = destination_posts.drop_while { |post| post.created_at <= min_created_at }
+
+    # if no post in destination_topic was created after posts.first it's equal to sequential
+    if moved_posts.empty?
+      initial_post_number = destination_topic.max_post_number + 1
+    else
+      initial_post_number = moved_posts.first.post_number
+    end
+
+    last_index = 0
+    posts.each do |post|
+      while last_index < moved_posts.length && moved_posts[last_index].created_at <= post.created_at
+        last_index += 1
+      end
+
+      moved_posts.insert(last_index, post)
+    end
+
+    @post_creator = nil
+    @move_map = {}
+    @shift_map = {}
+    @reply_count = {}
+    next_post_number = initial_post_number
+    moved_posts.each do |post|
+      if post.topic_id == destination_topic.id
+        # avoid shifting to a lower post number
+        next_post_number = post.post_number if post.post_number > next_post_number
+
+        @shift_map[post.post_number] = next_post_number
+      else
+        @move_map[post.post_number] = next_post_number
+
+        if post.reply_to_post_number.present?
+          @reply_count[post.reply_to_post_number] = (@reply_count[post.reply_to_post_number] || 0) +
+            1
+        end
+      end
+
+      next_post_number += 1
+    end
+
+    moved_posts.reverse_each do |post|
+      if post.topic_id == destination_topic.id
+        metadata = movement_metadata(post, new_post_number: @shift_map[post.post_number])
+        new_post = move_same_topic(post)
+      else
+        metadata = movement_metadata(post, new_post_number: @move_map[post.post_number])
+        new_post = post.is_first_post? ? create_first_post(post) : move(post)
+
+        if @move_to_pm && !destination_topic.topic_allowed_users.exists?(user_id: post.user_id)
+          destination_topic.topic_allowed_users.create!(user_id: post.user_id)
+        end
+      end
+
+      store_movement(metadata, new_post)
+    end
+
+    # change topic owner if there's a new first post
+    destination_topic.update_column(:user_id, posts.first.user_id) if initial_post_number == 1
   end
 
   def create_first_post(post)
@@ -175,7 +259,15 @@ class PostMover
     move_email_logs(post, new_post)
 
     PostAction.copy(post, new_post)
-    new_post.update_column(:reply_count, @reply_count[1] || 0)
+
+    attrs_to_update = { reply_count: @reply_count[1] || 0 }
+
+    if new_post.post_number != @move_map[post.post_number]
+      attrs_to_update[:post_number] = @move_map[post.post_number]
+      attrs_to_update[:sort_order] = @move_map[post.post_number]
+    end
+
+    new_post.update_columns(attrs_to_update)
     new_post.custom_fields = post.custom_fields
     new_post.save_custom_fields
 
@@ -189,8 +281,6 @@ class PostMover
   end
 
   def move(post)
-    @first_post_number_moved ||= post.post_number
-
     update = {
       reply_count: @reply_count[post.post_number] || 0,
       post_number: @move_map[post.post_number],
@@ -213,13 +303,30 @@ class PostMover
     post
   end
 
-  def movement_metadata(post)
+  def move_same_topic(post)
+    update = {
+      post_number: @shift_map[post.post_number],
+      sort_order: @shift_map[post.post_number],
+      baked_version: nil,
+    }
+
+    if @shift_map[post.reply_to_post_number]
+      update[:reply_to_post_number] = @shift_map[post.reply_to_post_number]
+    end
+
+    post.attributes = update
+    post.save(validate: false)
+
+    post
+  end
+
+  def movement_metadata(post, new_post_number: nil)
     {
       old_topic_id: post.topic_id,
       old_post_id: post.id,
       old_post_number: post.post_number,
       new_topic_id: destination_topic.id,
-      new_post_number: @move_map[post.post_number],
+      new_post_number: new_post_number,
       new_topic_title: destination_topic.title,
     }
   end
@@ -240,6 +347,7 @@ class PostMover
           post_id = mp.new_post_id
       FROM moved_posts mp
       WHERE ie.topic_id = mp.old_topic_id AND ie.post_id = mp.old_post_id
+        AND mp.old_topic_id <> mp.new_topic_id
     SQL
   end
 
@@ -311,6 +419,31 @@ class PostMover
     SQL
   end
 
+  def copy_shifted_post_timings_to_temp
+    DB.exec("DROP TABLE IF EXISTS temp_post_timings") if Rails.env.test?
+
+    # copy post_timings for shifted posts to a temp table using the new_post_number
+    # they'll be copied back after delete_invalid_post_timings makes room for them
+    DB.exec <<~SQL
+      CREATE TEMPORARY TABLE temp_post_timings ON COMMIT DROP
+        AS (
+          SELECT pt.topic_id, mp.new_post_number as post_number, pt.user_id, pt.msecs
+          FROM post_timings pt
+          JOIN moved_posts mp
+            ON mp.old_topic_id = pt.topic_id
+              AND mp.old_post_number = pt.post_number
+              AND mp.old_topic_id = mp.new_topic_id
+        )
+    SQL
+  end
+
+  def copy_shifted_post_timings_from_temp
+    DB.exec <<~SQL
+      INSERT INTO post_timings (topic_id, user_id, post_number, msecs)
+      SELECT topic_id, user_id, post_number, msecs FROM temp_post_timings
+    SQL
+  end
+
   def copy_first_post_timings
     DB.exec <<~SQL
       INSERT INTO post_timings (topic_id, user_id, post_number, msecs)
@@ -342,6 +475,7 @@ class PostMover
       WHERE pt.topic_id = mp.old_topic_id
         AND pt.post_number = mp.old_post_number
         AND mp.old_post_id = mp.new_post_id
+        AND mp.old_topic_id <> mp.new_topic_id
     SQL
   end
 
@@ -371,12 +505,14 @@ class PostMover
                FROM moved_posts lr
                WHERE lr.old_topic_id = tu.topic_id
                  AND lr.old_post_number <= tu.last_read_post_number
+                 AND lr.old_topic_id <> lr.new_topic_id
              )                                           AS last_read_post_number,
              (
                SELECT MAX(le.new_post_number)
                FROM moved_posts le
                WHERE le.old_topic_id = tu.topic_id
                  AND le.old_post_number <= tu.last_emailed_post_number
+                 AND le.old_topic_id <> le.new_topic_id
              )                                           AS last_emailed_post_number,
              GREATEST(tu.first_visited_at, t.created_at) AS first_visited_at,
              GREATEST(tu.last_visited_at, t.created_at)  AS last_visited_at,
@@ -389,7 +525,7 @@ class PostMover
         AND GREATEST(
                 tu.last_read_post_number,
                 tu.last_emailed_post_number
-              ) >= (SELECT MIN(old_post_number) FROM moved_posts)
+              ) >= (SELECT MIN(mp.old_post_number) FROM moved_posts mp WHERE mp.old_topic_id <> mp.new_topic_id)
       ON CONFLICT (topic_id, user_id) DO UPDATE
         SET posted                   = excluded.posted,
             last_read_post_number    = CASE
diff --git a/app/models/published_page.rb b/app/models/published_page.rb
index 937ba59310e..5fd47bb9236 100644
--- a/app/models/published_page.rb
+++ b/app/models/published_page.rb
@@ -8,7 +8,7 @@ class PublishedPage < ActiveRecord::Base
 
   validate :slug_format
   def slug_format
-    if slug !~ /^[a-zA-Z\-\_0-9]+$/
+    if slug !~ /\A[a-zA-Z\-\_0-9]+\z/
       errors.add(:slug, I18n.t("publish_page.slug_errors.invalid"))
     elsif %w[check-slug by-topic].include?(slug)
       errors.add(:slug, I18n.t("publish_page.slug_errors.unavailable"))
diff --git a/app/models/quoted_post.rb b/app/models/quoted_post.rb
index 54d68c9a926..131a9d98aae 100644
--- a/app/models/quoted_post.rb
+++ b/app/models/quoted_post.rb
@@ -68,7 +68,7 @@ class QuotedPost < ActiveRecord::Base
 
     if post.reply_to_post_number
       reply_post_id =
-        Post.where(topic_id: post.topic_id, post_number: post.reply_to_post_number).pluck_first(:id)
+        Post.where(topic_id: post.topic_id, post_number: post.reply_to_post_number).pick(:id)
       reply_quoted =
         reply_post_id.present? &&
           QuotedPost.where(post_id: post.id, quoted_post_id: reply_post_id).count > 0
diff --git a/app/models/remote_theme.rb b/app/models/remote_theme.rb
index baed6456548..f80bbf26980 100644
--- a/app/models/remote_theme.rb
+++ b/app/models/remote_theme.rb
@@ -13,10 +13,19 @@ class RemoteTheme < ActiveRecord::Base
   class ImportError < StandardError
   end
 
-  ALLOWED_FIELDS = %w[scss embedded_scss head_tag header after_header body_tag footer]
+  ALLOWED_FIELDS = %w[
+    scss
+    embedded_scss
+    embedded_header
+    head_tag
+    header
+    after_header
+    body_tag
+    footer
+  ]
 
-  GITHUB_REGEXP = %r{^https?://github\.com/}
-  GITHUB_SSH_REGEXP = %r{^ssh://git@github\.com:}
+  GITHUB_REGEXP = %r{\Ahttps?://github\.com/}
+  GITHUB_SSH_REGEXP = %r{\Assh://git@github\.com:}
 
   has_one :theme, autosave: false
   scope :joined_remotes,
@@ -329,7 +338,7 @@ class RemoteTheme < ActiveRecord::Base
 
   def github_diff_link
     if github_repo_url.present? && local_version != remote_version
-      "#{github_repo_url.gsub(/\.git$/, "")}/compare/#{local_version}...#{remote_version}"
+      "#{github_repo_url.gsub(/\.git\z/, "")}/compare/#{local_version}...#{remote_version}"
     end
   end
 
diff --git a/app/models/report.rb b/app/models/report.rb
index cd9b7623ac1..d5e9240369e 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -129,14 +129,6 @@ class Report
   end
 
   def add_filter(name, options = {})
-    if options[:type].blank?
-      options[:type] = name
-      Discourse.deprecate(
-        "#{name} filter should define a `:type` option. Temporarily setting type to #{name}.",
-        drop_from: "2.9.0",
-      )
-    end
-
     available_filters[name] = options
   end
 
@@ -268,8 +260,8 @@ class Report
         wrap_slow_query do
           if respond_to?(report_method)
             public_send(report_method, report)
-          elsif type =~ /_reqs$/
-            req_report(report, type.split(/_reqs$/)[0].to_sym)
+          elsif type =~ /_reqs\z/
+            req_report(report, type.split(/_reqs\z/)[0].to_sym)
           else
             return nil
           end
@@ -422,20 +414,15 @@ class Report
     add_counts report, subject, "topics.created_at"
   end
 
-  def lighten_color(hex, amount)
-    hex = adjust_hex(hex)
-    rgb = hex.scan(/../).map { |color| color.hex }
-    rgb[0] = [(rgb[0].to_i + 255 * amount).round, 255].min
-    rgb[1] = [(rgb[1].to_i + 255 * amount).round, 255].min
-    rgb[2] = [(rgb[2].to_i + 255 * amount).round, 255].min
-    "#%02x%02x%02x" % rgb
-  end
-
   def rgba_color(hex, opacity = 1)
     rgbs = hex_to_rgbs(adjust_hex(hex))
     "rgba(#{rgbs.join(",")},#{opacity})"
   end
 
+  def colors
+    %w[#1EB8D1 #9BC53D #721D8D #E84A5F #8A6916]
+  end
+
   private
 
   def adjust_hex(hex)
diff --git a/app/models/reviewable.rb b/app/models/reviewable.rb
index 8f389cb6700..6f7efb86f88 100644
--- a/app/models/reviewable.rb
+++ b/app/models/reviewable.rb
@@ -36,6 +36,8 @@ class Reviewable < ActiveRecord::Base
   enum :priority, { low: 0, medium: 5, high: 10 }, scopes: false, suffix: true
   enum :sensitivity, { disabled: 0, low: 9, medium: 6, high: 3 }, scopes: false, suffix: true
 
+  validates :reject_reason, length: { maximum: 500 }
+
   after_create { log_history(:created, created_by) }
 
   after_commit(on: :create) { DiscourseEvent.trigger(:reviewable_created, self) }
@@ -60,7 +62,7 @@ class Reviewable < ActiveRecord::Base
   end
 
   def self.valid_type?(type)
-    return false unless type =~ /^Reviewable[A-Za-z]+$/
+    return false unless Reviewable.types.include?(type)
     type.constantize <= Reviewable
   rescue NameError
     false
@@ -85,7 +87,7 @@ class Reviewable < ActiveRecord::Base
   def created_new!
     self.created_new = true
     self.topic = target.topic if topic.blank? && target.is_a?(Post)
-    self.target_created_by_id = target.is_a?(Post) ? target.user_id : nil
+    self.target_created_by_id ||= target.is_a?(Post) ? target.user_id : nil
     self.category_id = topic.category_id if category_id.blank? && topic.present?
   end
 
@@ -99,7 +101,8 @@ class Reviewable < ActiveRecord::Base
     created_by:,
     payload: nil,
     reviewable_by_moderator: false,
-    potential_spam: true
+    potential_spam: true,
+    target_created_by: nil
   )
     reviewable =
       new(
@@ -109,6 +112,7 @@ class Reviewable < ActiveRecord::Base
         reviewable_by_moderator: reviewable_by_moderator,
         payload: payload,
         potential_spam: potential_spam,
+        target_created_by: target_created_by,
       )
     reviewable.created_new!
 
@@ -129,7 +133,7 @@ class Reviewable < ActiveRecord::Base
       update_args = {
         status: statuses[:pending],
         id: target.id,
-        type: target.class.name,
+        type: target.class.polymorphic_name,
         potential_spam: potential_spam == true ? true : nil,
       }
 
@@ -314,7 +318,7 @@ class Reviewable < ActiveRecord::Base
     valid = [action_id, aliases.to_a.select { |k, v| v == action_id }.map(&:first)].flatten
 
     # Ensure the user has access to the action
-    actions = actions_for(Guardian.new(performed_by), args)
+    actions = actions_for(args[:guardian] || Guardian.new(performed_by), args)
     raise InvalidAction.new(action_id, self.class) unless valid.any? { |a| actions.has?(a) }
 
     perform_method = "perform_#{aliases[action_id] || action_id}".to_sym
@@ -347,6 +351,12 @@ class Reviewable < ActiveRecord::Base
     result
   end
 
+  # Override this in specific reviewable type to include scores for
+  # non-pending reviewables
+  def updatable_reviewable_scores
+    reviewable_scores.pending
+  end
+
   def transition_to(status_symbol, performed_by)
     self.status = status_symbol
     save!
@@ -355,7 +365,7 @@ class Reviewable < ActiveRecord::Base
     DiscourseEvent.trigger(:reviewable_transitioned_to, status_symbol, self)
 
     if score_status = ReviewableScore.score_transitions[status_symbol]
-      reviewable_scores.pending.update_all(
+      updatable_reviewable_scores.update_all(
         status: score_status,
         reviewed_by_id: performed_by.id,
         reviewed_at: Time.zone.now,
@@ -365,14 +375,6 @@ class Reviewable < ActiveRecord::Base
     status_previously_changed?(from: "pending")
   end
 
-  def post_options
-    Discourse.deprecate(
-      "Reviewable#post_options is deprecated. Please use #payload instead.",
-      output_in_test: true,
-      drop_from: "2.9.0",
-    )
-  end
-
   def self.bulk_perform_targets(performed_by, action, type, target_ids, args = nil)
     args ||= {}
     viewable_by(performed_by)
@@ -459,7 +461,8 @@ class Reviewable < ActiveRecord::Base
 
     result = by_status(result, status)
     result = result.where(id: ids) if ids
-    result = result.where("reviewables.type = ?", type) if type
+
+    result = result.where("reviewables.type = ?", Reviewable.sti_class_for(type).sti_name) if type
     result = result.where("reviewables.category_id = ?", category_id) if category_id
     result = result.where("reviewables.topic_id = ?", topic_id) if topic_id
     result = result.where("reviewables.created_at >= ?", from_date) if from_date
@@ -499,10 +502,11 @@ class Reviewable < ActiveRecord::Base
     end
 
     # If a reviewable doesn't have a target, allow us to filter on who created that reviewable.
+    # A ReviewableQueuedPost may have a target_created_by_id even before a target get's assigned
     if user_id
       result =
         result.where(
-          "(reviewables.target_created_by_id IS NULL AND reviewables.created_by_id = :user_id)
+          "(reviewables.target_id IS NULL AND reviewables.created_by_id = :user_id)
         OR (reviewables.target_created_by_id = :user_id)",
           user_id: user_id,
         )
diff --git a/app/models/reviewable_flagged_post.rb b/app/models/reviewable_flagged_post.rb
index 8015cd6e127..a144845f437 100644
--- a/app/models/reviewable_flagged_post.rb
+++ b/app/models/reviewable_flagged_post.rb
@@ -10,6 +10,7 @@ class ReviewableFlaggedPost < Reviewable
       agree_and_silence: :agree_and_keep,
       agree_and_suspend: :agree_and_keep,
       disagree_and_restore: :disagree,
+      ignore_and_do_nothing: :ignore,
     }
   end
 
@@ -56,6 +57,20 @@ class ReviewableFlaggedPost < Reviewable
       build_action(actions, :agree_and_keep, icon: "thumbs-up", bundle: agree)
     end
 
+    if guardian.can_delete_post_or_topic?(post)
+      build_action(actions, :delete_and_agree, icon: "far-trash-alt", bundle: agree)
+
+      if post.reply_count > 0
+        build_action(
+          actions,
+          :delete_and_agree_replies,
+          icon: "far-trash-alt",
+          bundle: agree,
+          confirm: true,
+        )
+      end
+    end
+
     if guardian.can_suspend?(target_created_by)
       build_action(
         actions,
@@ -74,48 +89,43 @@ class ReviewableFlaggedPost < Reviewable
     end
 
     build_action(actions, :agree_and_restore, icon: "far-eye", bundle: agree) if post.user_deleted?
-
     if post.hidden?
       build_action(actions, :disagree_and_restore, icon: "thumbs-down")
     else
       build_action(actions, :disagree, icon: "thumbs-down")
     end
 
-    build_action(actions, :ignore, icon: "external-link-alt")
-
-    delete_user_actions(actions) if potential_spam? && guardian.can_delete_user?(target_created_by)
+    ignore =
+      actions.add_bundle(
+        "#{id}-ignore",
+        icon: "thumbs-up",
+        label: "reviewables.actions.ignore.title",
+      )
 
+    if !post.hidden?
+      build_action(actions, :ignore_and_do_nothing, icon: "external-link-alt", bundle: ignore)
+    end
     if guardian.can_delete_post_or_topic?(post)
-      delete =
-        actions.add_bundle(
-          "#{id}-delete",
-          icon: "far-trash-alt",
-          label: "reviewables.actions.delete.title",
-        )
-      build_action(actions, :delete_and_ignore, icon: "external-link-alt", bundle: delete)
+      build_action(actions, :delete_and_ignore, icon: "far-trash-alt", bundle: ignore)
       if post.reply_count > 0
         build_action(
           actions,
           :delete_and_ignore_replies,
-          icon: "external-link-alt",
-          confirm: true,
-          bundle: delete,
-        )
-      end
-      build_action(actions, :delete_and_agree, icon: "thumbs-up", bundle: delete)
-      if post.reply_count > 0
-        build_action(
-          actions,
-          :delete_and_agree_replies,
-          icon: "external-link-alt",
-          bundle: delete,
+          icon: "far-trash-alt",
           confirm: true,
+          bundle: ignore,
         )
       end
     end
+
+    delete_user_actions(actions) if potential_spam? && guardian.can_delete_user?(target_created_by)
   end
 
   def perform_ignore(performed_by, args)
+    perform_ignore_and_do_nothing(performed_by, args)
+  end
+
+  def perform_ignore_and_do_nothing(performed_by, args)
     actions =
       PostAction
         .active
@@ -221,13 +231,13 @@ class ReviewableFlaggedPost < Reviewable
   end
 
   def perform_delete_and_ignore(performed_by, args)
-    result = perform_ignore(performed_by, args)
+    result = perform_ignore_and_do_nothing(performed_by, args)
     destroyer(performed_by, post).destroy
     result
   end
 
   def perform_delete_and_ignore_replies(performed_by, args)
-    result = perform_ignore(performed_by, args)
+    result = perform_ignore_and_do_nothing(performed_by, args)
     PostDestroyer.delete_with_replies(performed_by, post, self)
 
     result
diff --git a/app/models/reviewable_queued_post.rb b/app/models/reviewable_queued_post.rb
index ecf6297cdcd..5b63aaf2ab7 100644
--- a/app/models/reviewable_queued_post.rb
+++ b/app/models/reviewable_queued_post.rb
@@ -16,6 +16,12 @@ class ReviewableQueuedPost < Reviewable
 
   after_commit :compute_user_stats, only: %i[create update]
 
+  def updatable_reviewable_scores
+    # Approvals are possible for already rejected queued posts. We need the
+    # scores to be updated when this happens.
+    reviewable_scores.pending.or(reviewable_scores.disagreed)
+  end
+
   def build_actions(actions, guardian, args)
     unless approved?
       if topic&.closed?
@@ -25,37 +31,41 @@ class ReviewableQueuedPost < Reviewable
           a.confirm_message = "reviewables.actions.approve_post.confirm_closed"
         end
       else
-        actions.add(:approve_post) do |a|
-          a.icon = "check"
-          a.label = "reviewables.actions.approve_post.title"
+        if target_created_by.present?
+          actions.add(:approve_post) do |a|
+            a.icon = "check"
+            a.label = "reviewables.actions.approve_post.title"
+          end
         end
       end
     end
 
-    unless rejected?
+    if pending?
       actions.add(:reject_post) do |a|
         a.icon = "times"
         a.label = "reviewables.actions.reject_post.title"
       end
     end
 
-    delete_user_actions(actions) if pending? && guardian.can_delete_user?(created_by)
+    delete_user_actions(actions) if pending? && guardian.can_delete_user?(target_created_by)
 
     actions.add(:delete) if guardian.can_delete?(self)
   end
 
   def build_editable_fields(fields, guardian, args)
-    # We can edit category / title if it's a new topic
-    if topic_id.blank?
-      # Only staff can edit category for now, since in theory a category group reviewer could
-      # post in a category they don't have access to.
-      fields.add("category_id", :category) if guardian.is_staff?
+    if pending?
+      # We can edit category / title if it's a new topic
+      if topic_id.blank?
+        # Only staff can edit category for now, since in theory a category group reviewer could
+        # post in a category they don't have access to.
+        fields.add("category_id", :category) if guardian.is_staff?
 
-      fields.add("payload.title", :text)
-      fields.add("payload.tags", :tags)
+        fields.add("payload.title", :text)
+        fields.add("payload.tags", :tags)
+      end
+
+      fields.add("payload.raw", :editor)
     end
-
-    fields.add("payload.raw", :editor)
   end
 
   def create_options
@@ -77,7 +87,7 @@ class ReviewableQueuedPost < Reviewable
       )
     opts.merge!(guardian: Guardian.new(performed_by)) if performed_by.staff?
 
-    creator = PostCreator.new(created_by, opts)
+    creator = PostCreator.new(target_created_by, opts)
     created_post = creator.create
 
     unless created_post && creator.errors.blank?
@@ -88,7 +98,7 @@ class ReviewableQueuedPost < Reviewable
     self.topic_id = created_post.topic_id if topic_id.nil?
     save
 
-    UserSilencer.unsilence(created_by, performed_by) if created_by.silenced?
+    UserSilencer.unsilence(target_created_by, performed_by) if target_created_by.silenced?
 
     StaffActionLogger.new(performed_by).log_post_approved(created_post) if performed_by.staff?
 
@@ -97,7 +107,7 @@ class ReviewableQueuedPost < Reviewable
 
     Notification.create!(
       notification_type: Notification.types[:post_approved],
-      user_id: created_by.id,
+      user_id: target_created_by.id,
       data: { post_url: created_post.url }.to_json,
       topic_id: created_post.topic_id,
       post_number: created_post.post_number,
@@ -146,9 +156,12 @@ class ReviewableQueuedPost < Reviewable
   private
 
   def delete_user(performed_by, delete_options)
-    reviewable_ids = Reviewable.where(created_by: created_by).pluck(:id)
-    UserDestroyer.new(performed_by).destroy(created_by, delete_options)
-    create_result(:success) { |r| r.remove_reviewable_ids = reviewable_ids }
+    reviewable_ids = Reviewable.where(created_by: target_created_by).pluck(:id)
+
+    UserDestroyer.new(performed_by).destroy(target_created_by, delete_options)
+    update_column(:target_created_by_id, nil)
+
+    create_result(:success, :rejected) { |r| r.remove_reviewable_ids += reviewable_ids }
   end
 
   def delete_opts
@@ -162,7 +175,7 @@ class ReviewableQueuedPost < Reviewable
 
   def compute_user_stats
     return unless status_changed_from_or_to_pending?
-    created_by.user_stat.update_pending_posts
+    target_created_by&.user_stat&.update_pending_posts
   end
 
   def status_changed_from_or_to_pending?
diff --git a/app/models/screened_ip_address.rb b/app/models/screened_ip_address.rb
index ed6cc3d800b..136164ecb0a 100644
--- a/app/models/screened_ip_address.rb
+++ b/app/models/screened_ip_address.rb
@@ -147,7 +147,7 @@ class ScreenedIpAddress < ActiveRecord::Base
               .where("masklen(ip_address) IN (?)", from_masklen)
 
           sum_match_count, max_last_match_at, min_created_at =
-            old_ips.pluck_first("SUM(match_count), MAX(last_match_at), MIN(created_at)")
+            old_ips.pick("SUM(match_count), MAX(last_match_at), MIN(created_at)")
 
           ScreenedIpAddress.create!(
             ip_address: subnet,
diff --git a/app/models/screened_url.rb b/app/models/screened_url.rb
index 0e827cf522d..dcc19bc3e31 100644
--- a/app/models/screened_url.rb
+++ b/app/models/screened_url.rb
@@ -17,7 +17,7 @@ class ScreenedUrl < ActiveRecord::Base
 
   def normalize
     self.url = ScreenedUrl.normalize_url(self.url) if self.url
-    self.domain = self.domain.downcase.sub(/^www\./, "") if self.domain
+    self.domain = self.domain.downcase.sub(/\Awww\./, "") if self.domain
   end
 
   def self.watch(url, domain, opts = {})
@@ -30,8 +30,8 @@ class ScreenedUrl < ActiveRecord::Base
 
   def self.normalize_url(url)
     normalized = url.gsub(%r{http(s?)://}i, "")
-    normalized.gsub!(%r{(/)+$}, "") # trim trailing slashes
-    normalized.gsub!(%r{^([^/]+)(?:/)?}) { |m| m.downcase } # downcase the domain part of the url
+    normalized.gsub!(%r{(/)+\z}, "") # trim trailing slashes
+    normalized.gsub!(%r{\A([^/]+)(?:/)?}) { |m| m.downcase } # downcase the domain part of the url
     normalized
   end
 end
diff --git a/app/models/sidebar_section.rb b/app/models/sidebar_section.rb
new file mode 100644
index 00000000000..3b564c3faf0
--- /dev/null
+++ b/app/models/sidebar_section.rb
@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+class SidebarSection < ActiveRecord::Base
+  MAX_TITLE_LENGTH = 30
+
+  belongs_to :user
+  has_many :sidebar_section_links, -> { order("position") }, dependent: :destroy
+
+  has_many :sidebar_urls,
+           through: :sidebar_section_links,
+           source: :linkable,
+           source_type: "SidebarUrl"
+
+  accepts_nested_attributes_for :sidebar_urls,
+                                allow_destroy: true,
+                                limit: -> { SiteSetting.max_sidebar_section_links }
+
+  before_save :set_system_user_for_public_section
+
+  validates :title,
+            presence: true,
+            uniqueness: {
+              scope: %i[user_id],
+            },
+            length: {
+              maximum: MAX_TITLE_LENGTH,
+            }
+
+  scope :public_sections, -> { where("public") }
+  enum :section_type, { community: 0 }, scopes: false, suffix: true
+
+  def reset_community!
+    ActiveRecord::Base.transaction do
+      self.update!(title: "Community")
+      self.sidebar_section_links.destroy_all
+      community_urls =
+        SidebarUrl::COMMUNITY_SECTION_LINKS.map do |url_data|
+          "('#{url_data[:name]}', '#{url_data[:path]}', '#{url_data[:icon]}', '#{url_data[:segment]}', false, now(), now())"
+        end
+
+      result = DB.query <<~SQL
+      INSERT INTO sidebar_urls(name, value, icon, segment, external, created_at, updated_at)
+      VALUES #{community_urls.join(",")}
+      RETURNING sidebar_urls.id
+      SQL
+
+      sidebar_section_links =
+        result.map.with_index do |url, index|
+          "(-1, #{url.id}, 'SidebarUrl', #{self.id}, #{index},  now(), now())"
+        end
+
+      DB.query <<~SQL
+      INSERT INTO sidebar_section_links(user_id, linkable_id, linkable_type, sidebar_section_id, position, created_at, updated_at)
+      VALUES #{sidebar_section_links.join(",")}
+      SQL
+    end
+  end
+
+  private
+
+  def set_system_user_for_public_section
+    self.user_id = Discourse.system_user.id if self.public
+  end
+end
+
+# == Schema Information
+#
+# Table name: sidebar_sections
+#
+#  id           :bigint           not null, primary key
+#  user_id      :integer          not null
+#  title        :string(30)       not null
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#  public       :boolean          default(FALSE), not null
+#  section_type :integer
+#
+# Indexes
+#
+#  index_sidebar_sections_on_section_type       (section_type) UNIQUE
+#  index_sidebar_sections_on_user_id_and_title  (user_id,title) UNIQUE
+#
diff --git a/app/models/sidebar_section_link.rb b/app/models/sidebar_section_link.rb
index b6b23a73571..68be317e82f 100644
--- a/app/models/sidebar_section_link.rb
+++ b/app/models/sidebar_section_link.rb
@@ -3,15 +3,31 @@
 class SidebarSectionLink < ActiveRecord::Base
   belongs_to :user
   belongs_to :linkable, polymorphic: true
+  belongs_to :sidebar_section
 
   validates :user_id, presence: true, uniqueness: { scope: %i[linkable_type linkable_id] }
   validates :linkable_id, presence: true
   validates :linkable_type, presence: true
   validate :ensure_supported_linkable_type, if: :will_save_change_to_linkable_type?
 
-  SUPPORTED_LINKABLE_TYPES = %w[Category Tag]
+  SUPPORTED_LINKABLE_TYPES = %w[Category Tag SidebarUrl]
 
-  private def ensure_supported_linkable_type
+  before_validation :inherit_user_id
+  before_create do
+    if self.user_id && self.sidebar_section
+      self.position = self.sidebar_section.sidebar_section_links.maximum(:position).to_i + 1
+    end
+  end
+
+  after_destroy { self.linkable.destroy! if self.linkable_type == "SidebarUrl" }
+
+  private
+
+  def inherit_user_id
+    self.user_id = sidebar_section.user_id if sidebar_section
+  end
+
+  def ensure_supported_linkable_type
     if (!SUPPORTED_LINKABLE_TYPES.include?(self.linkable_type)) ||
          (self.linkable_type == "Tag" && !SiteSetting.tagging_enabled)
       self.errors.add(
@@ -26,14 +42,18 @@ end
 #
 # Table name: sidebar_section_links
 #
-#  id            :bigint           not null, primary key
-#  user_id       :integer          not null
-#  linkable_id   :integer          not null
-#  linkable_type :string           not null
-#  created_at    :datetime         not null
-#  updated_at    :datetime         not null
+#  id                 :bigint           not null, primary key
+#  user_id            :integer          not null
+#  linkable_id        :integer          not null
+#  linkable_type      :string           not null
+#  created_at         :datetime         not null
+#  updated_at         :datetime         not null
+#  sidebar_section_id :integer
+#  position           :integer          default(0), not null
 #
 # Indexes
 #
-#  idx_unique_sidebar_section_links  (user_id,linkable_type,linkable_id) UNIQUE
+#  idx_sidebar_section_links_on_sidebar_section_id               (sidebar_section_id,user_id,position) UNIQUE
+#  idx_unique_sidebar_section_links                              (user_id,linkable_type,linkable_id) UNIQUE
+#  index_sidebar_section_links_on_linkable_type_and_linkable_id  (linkable_type,linkable_id)
 #
diff --git a/app/models/sidebar_url.rb b/app/models/sidebar_url.rb
new file mode 100644
index 00000000000..174ae2da361
--- /dev/null
+++ b/app/models/sidebar_url.rb
@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+class SidebarUrl < ActiveRecord::Base
+  enum :segment, { primary: 0, secondary: 1 }, scopes: false, suffix: true
+
+  FULL_RELOAD_LINKS_REGEX = [%r{\A/my/[a-z_\-/]+\z}, %r{\A/pub/[a-z_\-/]+\z}, %r{\A/safe-mode\z}]
+  MAX_ICON_LENGTH = 40
+  MAX_NAME_LENGTH = 80
+  MAX_VALUE_LENGTH = 200
+  COMMUNITY_SECTION_LINKS = [
+    {
+      name: "Topics",
+      path: "/latest",
+      icon: "layer-group",
+      segment: SidebarUrl.segments["primary"],
+    },
+    {
+      name: "My Posts",
+      path: "/my/activity",
+      icon: "user",
+      segment: SidebarUrl.segments["primary"],
+    },
+    { name: "Review", path: "/review", icon: "flag", segment: SidebarUrl.segments["primary"] },
+    { name: "Admin", path: "/admin", icon: "wrench", segment: SidebarUrl.segments["primary"] },
+    { name: "Users", path: "/u", icon: "users", segment: SidebarUrl.segments["secondary"] },
+    {
+      name: "About",
+      path: "/about",
+      icon: "info-circle",
+      segment: SidebarUrl.segments["secondary"],
+    },
+    {
+      name: "FAQ",
+      path: "/faq",
+      icon: "question-circle",
+      segment: SidebarUrl.segments["secondary"],
+    },
+    { name: "Groups", path: "/g", icon: "user-friends", segment: SidebarUrl.segments["secondary"] },
+    {
+      name: "Badges",
+      path: "/badges",
+      icon: "certificate",
+      segment: SidebarUrl.segments["secondary"],
+    },
+  ]
+
+  validates :icon, presence: true, length: { maximum: MAX_ICON_LENGTH }
+  validates :name, presence: true, length: { maximum: MAX_NAME_LENGTH }
+  validates :value, presence: true, length: { maximum: MAX_VALUE_LENGTH }
+
+  validate :path_validator
+
+  before_validation :remove_internal_hostname, :set_external
+
+  def path_validator
+    return true if !external?
+    raise ActionController::RoutingError.new("Not Found") if value !~ Discourse::Utils::URI_REGEXP
+  rescue ActionController::RoutingError
+    errors.add(
+      :value,
+      I18n.t("activerecord.errors.models.sidebar_section_link.attributes.linkable_type.invalid"),
+    )
+  end
+
+  def remove_internal_hostname
+    self.value = self.value.sub(%r{\Ahttp(s)?://#{Discourse.current_hostname}}, "")
+  end
+
+  def set_external
+    self.external = value.start_with?("http://", "https://")
+  end
+
+  def full_reload?
+    FULL_RELOAD_LINKS_REGEX.any? { |regex| value =~ regex }
+  end
+end
+
+# == Schema Information
+#
+# Table name: sidebar_urls
+#
+#  id         :bigint           not null, primary key
+#  name       :string(80)       not null
+#  value      :string(200)      not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#  icon       :string(40)       not null
+#  external   :boolean          default(FALSE), not null
+#  segment    :integer          default("primary"), not null
+#
diff --git a/app/models/site.rb b/app/models/site.rb
index 5d3b4565bc2..e56709499e5 100644
--- a/app/models/site.rb
+++ b/app/models/site.rb
@@ -71,19 +71,27 @@ class Site
       .cache
       .fetch(categories_cache_key, expires_in: 30.minutes) do
         categories =
-          Category
-            .includes(
-              :uploaded_logo,
-              :uploaded_logo_dark,
-              :uploaded_background,
-              :tags,
-              :tag_groups,
-              category_required_tag_groups: :tag_group,
-            )
-            .joins("LEFT JOIN topics t on t.id = categories.topic_id")
-            .select("categories.*, t.slug topic_slug")
-            .order(:position)
-            .to_a
+          begin
+            query =
+              Category
+                .includes(
+                  :uploaded_logo,
+                  :uploaded_logo_dark,
+                  :uploaded_background,
+                  :tags,
+                  :tag_groups,
+                  :form_templates,
+                  category_required_tag_groups: :tag_group,
+                )
+                .joins("LEFT JOIN topics t on t.id = categories.topic_id")
+                .select("categories.*, t.slug topic_slug")
+                .order(:position)
+
+            query =
+              DiscoursePluginRegistry.apply_modifier(:site_all_categories_cache_query, query, self)
+
+            query.to_a
+          end
 
         if preloaded_category_custom_fields.present?
           Category.preload_custom_fields(categories, preloaded_category_custom_fields)
@@ -150,7 +158,13 @@ class Site
   end
 
   def groups
-    Group.visible_groups(@guardian.user, "name ASC", include_everyone: true).includes(:flair_upload)
+    query =
+      Group.visible_groups(@guardian.user, "groups.name ASC", include_everyone: true).includes(
+        :flair_upload,
+      )
+    query = DiscoursePluginRegistry.apply_modifier(:site_groups_query, query, self)
+
+    query
   end
 
   def archetypes
@@ -215,37 +229,4 @@ class Site
     # the cache is validated based on the sequence
     MessageBus.publish(SITE_JSON_CHANNEL, "")
   end
-
-  def self.welcome_topic_banner_cache_key(user_id)
-    "show_welcome_topic_banner:#{user_id}"
-  end
-
-  def self.welcome_topic_exists_and_is_not_edited?
-    Post
-      .joins(:topic)
-      .where(
-        "topics.id = :topic_id AND topics.deleted_at IS NULL AND posts.post_number = 1 AND posts.version = 1 AND posts.created_at > :created_at",
-        topic_id: SiteSetting.welcome_topic_id,
-        created_at: 1.month.ago,
-      )
-      .exists?
-  end
-
-  def self.show_welcome_topic_banner?(guardian)
-    return false if !guardian.is_admin?
-    user_id = guardian.user.id
-
-    show_welcome_topic_banner = Discourse.cache.read(welcome_topic_banner_cache_key(user_id))
-    return show_welcome_topic_banner unless show_welcome_topic_banner.nil?
-
-    show_welcome_topic_banner =
-      if (user_id == User.first_login_admin_id)
-        welcome_topic_exists_and_is_not_edited?
-      else
-        false
-      end
-
-    Discourse.cache.write(welcome_topic_banner_cache_key(user_id), show_welcome_topic_banner)
-    show_welcome_topic_banner
-  end
 end
diff --git a/app/models/site_setting.rb b/app/models/site_setting.rb
index 01af33da64c..b6f0636f3e9 100644
--- a/app/models/site_setting.rb
+++ b/app/models/site_setting.rb
@@ -20,16 +20,22 @@ class SiteSetting < ActiveRecord::Base
     end
   end
 
-  def self.load_settings(file, plugin: nil)
-    SiteSettings::YamlLoader
-      .new(file)
-      .load do |category, name, default, opts|
-        setting(name, default, opts.merge(category: category, plugin: plugin))
-      end
-  end
-
   load_settings(File.join(Rails.root, "config", "site_settings.yml"))
 
+  if Rails.env.test?
+    SAMPLE_TEST_PLUGIN =
+      Plugin::Instance.new(
+        Plugin::Metadata.new.tap { |metadata| metadata.name = "discourse-sample-plugin" },
+      )
+
+    Discourse.plugins_by_name[SAMPLE_TEST_PLUGIN.name] = SAMPLE_TEST_PLUGIN
+
+    load_settings(
+      File.join(Rails.root, "spec", "support", "sample_plugin_site_settings.yml"),
+      plugin: SAMPLE_TEST_PLUGIN.name,
+    )
+  end
+
   if GlobalSetting.load_plugins?
     Dir[File.join(Rails.root, "plugins", "*", "config", "settings.yml")].each do |file|
       load_settings(file, plugin: file.split("/")[-3])
@@ -109,7 +115,8 @@ class SiteSetting < ActiveRecord::Base
   end
 
   def self.email_polling_enabled?
-    SiteSetting.manual_polling_enabled? || SiteSetting.pop3_polling_enabled?
+    SiteSetting.manual_polling_enabled? || SiteSetting.pop3_polling_enabled? ||
+      DiscoursePluginRegistry.mail_pollers.any?(&:enabled?)
   end
 
   def self.blocked_attachment_content_types_regex
@@ -254,47 +261,6 @@ class SiteSetting < ActiveRecord::Base
     SiteSetting.navigation_menu == "legacy"
   end
 
-  ALLOWLIST_DEPRECATED_SITE_SETTINGS = {
-    email_domains_blacklist: "blocked_email_domains",
-    email_domains_whitelist: "allowed_email_domains",
-    unicode_username_character_whitelist: "allowed_unicode_username_characters",
-    user_website_domains_whitelist: "allowed_user_website_domains",
-    whitelisted_link_domains: "allowed_link_domains",
-    embed_whitelist_selector: "allowed_embed_selectors",
-    auto_generated_whitelist: "auto_generated_allowlist",
-    attachment_content_type_blacklist: "blocked_attachment_content_types",
-    attachment_filename_blacklist: "blocked_attachment_filenames",
-    use_admin_ip_whitelist: "use_admin_ip_allowlist",
-    blacklist_ip_blocks: "blocked_ip_blocks",
-    whitelist_internal_hosts: "allowed_internal_hosts",
-    whitelisted_crawler_user_agents: "allowed_crawler_user_agents",
-    blacklisted_crawler_user_agents: "blocked_crawler_user_agents",
-    onebox_domains_blacklist: "blocked_onebox_domains",
-    inline_onebox_domains_whitelist: "allowed_inline_onebox_domains",
-    white_listed_spam_host_domains: "allowed_spam_host_domains",
-    embed_blacklist_selector: "blocked_embed_selectors",
-    embed_classname_whitelist: "allowed_embed_classnames",
-  }
-
-  ALLOWLIST_DEPRECATED_SITE_SETTINGS.each_pair do |old_method, new_method|
-    self.define_singleton_method(old_method) do
-      Discourse.deprecate(
-        "#{old_method.to_s} is deprecated, use the #{new_method.to_s}.",
-        drop_from: "2.6",
-        raise_error: true,
-      )
-      send(new_method)
-    end
-    self.define_singleton_method("#{old_method}=") do |args|
-      Discourse.deprecate(
-        "#{old_method.to_s} is deprecated, use the #{new_method.to_s}.",
-        drop_from: "2.6",
-        raise_error: true,
-      )
-      send("#{new_method}=", args)
-    end
-  end
-
   protected
 
   def self.clear_cache!
diff --git a/app/models/summarization_strategy.rb b/app/models/summarization_strategy.rb
new file mode 100644
index 00000000000..cb8b6d7c0ba
--- /dev/null
+++ b/app/models/summarization_strategy.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require "enum_site_setting"
+
+class SummarizationStrategy < EnumSiteSetting
+  def self.valid_value?(val)
+    true
+  end
+
+  def self.values
+    @values ||=
+      Summarization::Base.available_strategies.map do |strategy|
+        { name: strategy.display_name, value: strategy.model }
+      end
+  end
+end
diff --git a/app/models/summary_section.rb b/app/models/summary_section.rb
new file mode 100644
index 00000000000..21c8ab639fd
--- /dev/null
+++ b/app/models/summary_section.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class SummarySection < ActiveRecord::Base
+  belongs_to :target, polymorphic: true
+
+  def mark_as_outdated
+    @outdated = true
+  end
+
+  def outdated
+    @outdated || false
+  end
+end
+
+# == Schema Information
+#
+# Table name: summary_sections
+#
+#  id                   :bigint           not null, primary key
+#  target_id            :integer          not null
+#  target_type          :string           not null
+#  content_range        :int4range
+#  summarized_text      :string           not null
+#  meta_section_id      :integer
+#  original_content_sha :string           not null
+#  algorithm            :string           not null
+#  created_at           :datetime         not null
+#  updated_at           :datetime         not null
+#
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 71435ef046f..f3bdedc41a6 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -38,6 +38,7 @@ class Tag < ActiveRecord::Base
         ->(guardian) { where("tags.#{Tag.topic_count_column(guardian)} > 0") }
 
   scope :base_tags, -> { where(target_tag_id: nil) }
+  scope :visible, ->(guardian = nil) { merge(DiscourseTagging.visible_tags(guardian)) }
 
   has_many :tag_users, dependent: :destroy # notification settings
 
diff --git a/app/models/tag_group.rb b/app/models/tag_group.rb
index 54ee33bc1cc..802ab651ac2 100644
--- a/app/models/tag_group.rb
+++ b/app/models/tag_group.rb
@@ -5,6 +5,10 @@ class TagGroup < ActiveRecord::Base
 
   has_many :tag_group_memberships, dependent: :destroy
   has_many :tags, through: :tag_group_memberships
+  has_many :none_synonym_tags,
+           -> { where(target_tag_id: nil) },
+           through: :tag_group_memberships,
+           source: "tag"
   has_many :category_tag_groups, dependent: :destroy
   has_many :category_required_tag_groups, dependent: :destroy
   has_many :categories, through: :category_tag_groups
diff --git a/app/models/theme.rb b/app/models/theme.rb
index 23701642e55..73225814553 100644
--- a/app/models/theme.rb
+++ b/app/models/theme.rb
@@ -6,15 +6,15 @@ require "json_schemer"
 class Theme < ActiveRecord::Base
   include GlobalPath
 
-  BASE_COMPILER_VERSION = 69
+  BASE_COMPILER_VERSION = 71
 
   attr_accessor :child_components
 
-  @cache = DistributedCache.new("theme:compiler#{BASE_COMPILER_VERSION}")
+  @cache = DistributedCache.new("theme:compiler:#{BASE_COMPILER_VERSION}")
 
   belongs_to :user
   belongs_to :color_scheme
-  has_many :theme_fields, dependent: :destroy
+  has_many :theme_fields, dependent: :destroy, validate: false
   has_many :theme_settings, dependent: :destroy
   has_many :theme_translation_overrides, dependent: :destroy
   has_many :child_theme_relation,
@@ -33,6 +33,7 @@ class Theme < ActiveRecord::Base
   has_many :color_schemes
   belongs_to :remote_theme, dependent: :destroy
   has_one :theme_modifier_set, dependent: :destroy
+  has_one :theme_svg_sprite, dependent: :destroy
 
   has_one :settings_field,
           -> { where(target_id: Theme.targets[:settings], name: "yaml") },
@@ -58,6 +59,7 @@ class Theme < ActiveRecord::Base
            class_name: "ThemeField"
 
   validate :component_validations
+  validate :validate_theme_fields
 
   after_create :update_child_components
 
@@ -115,7 +117,7 @@ class Theme < ActiveRecord::Base
     update_javascript_cache!
 
     remove_from_cache!
-    DB.after_commit { ColorScheme.hex_cache.clear }
+    ColorScheme.hex_cache.clear
     notify_theme_change(with_scheme: notify_with_scheme)
 
     if theme_setting_requests_refresh
@@ -299,6 +301,12 @@ class Theme < ActiveRecord::Base
     errors.add(:base, I18n.t("themes.errors.component_no_default")) if default?
   end
 
+  def validate_theme_fields
+    theme_fields.each do |field|
+      field.errors.full_messages.each { |message| errors.add(:base, message) } unless field.valid?
+    end
+  end
+
   def switch_to_component!
     return if component
 
@@ -330,13 +338,11 @@ class Theme < ActiveRecord::Base
 
     theme_ids = !skip_transformation ? transform_ids(theme_id) : [theme_id]
     cache_key = "#{theme_ids.join(",")}:#{target}:#{field}:#{Theme.compiler_version}"
-    lookup = @cache[cache_key]
-    return lookup.html_safe if lookup
 
-    target = target.to_sym
-    val = resolve_baked_field(theme_ids, target, field)
-
-    get_set_cache(cache_key) { val || "" }.html_safe
+    get_set_cache(cache_key) do
+      target = target.to_sym
+      resolve_baked_field(theme_ids, target, field) || ""
+    end.html_safe
   end
 
   def self.lookup_modifier(theme_ids, modifier_name)
@@ -352,7 +358,7 @@ class Theme < ActiveRecord::Base
   end
 
   def self.clear_cache!
-    DB.after_commit { @cache.clear }
+    @cache.clear
   end
 
   def self.targets
@@ -495,11 +501,11 @@ class Theme < ActiveRecord::Base
 
     value ||= ""
 
-    field =
-      theme_fields.find { |f| f.name == name && f.target_id == target_id && f.type_id == type_id }
+    field = theme_fields.find_by(name: name, target_id: target_id, type_id: type_id)
+
     if field
       if value.blank? && !upload_id
-        theme_fields.delete field.destroy
+        field.destroy
       else
         if field.value != value || field.upload_id != upload_id
           field.value = value
@@ -521,6 +527,16 @@ class Theme < ActiveRecord::Base
     end
   end
 
+  def child_theme_ids=(theme_ids)
+    super(theme_ids)
+    Theme.clear_cache!
+  end
+
+  def parent_theme_ids=(theme_ids)
+    super(theme_ids)
+    Theme.clear_cache!
+  end
+
   def add_relative_theme!(kind, theme)
     new_relation =
       if kind == :child
@@ -762,12 +778,13 @@ class Theme < ActiveRecord::Base
     return if !keys
 
     current_values = CSV.parse(setting_row.value, **{ col_sep: "|" }).flatten
-    new_values = []
-    current_values.each do |item|
-      parts = CSV.parse(item, **{ col_sep: "," }).flatten
-      props = parts.map.with_index { |p, idx| [keys[idx], p] }.to_h
-      new_values << props
-    end
+
+    new_values =
+      current_values.map do |item|
+        parts = CSV.parse(item, **{ col_sep: "," }).flatten
+        raise "Schema validation failed" if keys.size < parts.size
+        parts.zip(keys).map(&:reverse).to_h
+      end
 
     schemer = JSONSchemer.schema(schema)
     raise "Schema validation failed" if !schemer.valid?(new_values)
diff --git a/app/models/theme_field.rb b/app/models/theme_field.rb
index 3489f8e729b..b63a796c522 100644
--- a/app/models/theme_field.rb
+++ b/app/models/theme_field.rb
@@ -5,6 +5,8 @@ class ThemeField < ActiveRecord::Base
   has_one :javascript_cache, dependent: :destroy
   has_one :upload_reference, as: :target, dependent: :destroy
 
+  validates :value, { length: { maximum: 1024**2 } }
+
   after_save do
     if self.type_id == ThemeField.types[:theme_upload_var] && saved_change_to_upload_id?
       UploadReference.ensure_exist!(upload_ids: [self.upload_id], target: self)
@@ -44,6 +46,11 @@ class ThemeField < ActiveRecord::Base
             .select("DISTINCT ON (X.theme_sort_column) *")
         }
 
+  scope :svg_sprite_fields,
+        -> {
+          where(type_id: ThemeField.theme_var_type_ids, name: SvgSprite.theme_sprite_variable_name)
+        }
+
   def self.types
     @types ||=
       Enum.new(
@@ -94,7 +101,7 @@ class ThemeField < ActiveRecord::Base
       .css('script[type="text/x-handlebars"]')
       .each do |node|
         name = node["name"] || node["data-template-name"] || "broken"
-        is_raw = name =~ /\.(raw|hbr)$/
+        is_raw = name =~ /\.(raw|hbr)\z/
         hbs_template = node.inner_html
 
         begin
@@ -332,7 +339,7 @@ class ThemeField < ActiveRecord::Base
   end
 
   def self.html_fields
-    @html_fields ||= %w[body_tag head_tag header footer after_header]
+    @html_fields ||= %w[body_tag head_tag header footer after_header embedded_header]
   end
 
   def self.scss_fields
@@ -387,22 +394,22 @@ class ThemeField < ActiveRecord::Base
         translation_field? ? process_translation : process_html(self.value)
       self.error = nil unless self.error.present?
       self.compiler_version = Theme.compiler_version
-      DB.after_commit { CSP::Extension.clear_theme_extensions_cache! }
+      CSP::Extension.clear_theme_extensions_cache!
     elsif extra_js_field? || js_tests_field?
       self.error = nil
       self.value_baked = "baked"
       self.compiler_version = Theme.compiler_version
     elsif basic_scss_field?
       ensure_scss_compiles!
-      DB.after_commit { Stylesheet::Manager.clear_theme_cache! }
+      Stylesheet::Manager.clear_theme_cache!
     elsif settings_field?
       validate_yaml!
-      DB.after_commit { CSP::Extension.clear_theme_extensions_cache! }
-      DB.after_commit { SvgSprite.expire_cache }
+      CSP::Extension.clear_theme_extensions_cache!
+      SvgSprite.expire_cache
       self.value_baked = "baked"
       self.compiler_version = Theme.compiler_version
     elsif svg_sprite_field?
-      DB.after_commit { SvgSprite.expire_cache }
+      SvgSprite.expire_cache
       self.error = validate_svg_sprite_xml
       self.value_baked = "baked"
       self.compiler_version = Theme.compiler_version
@@ -455,7 +462,7 @@ class ThemeField < ActiveRecord::Base
       else
         self.error = nil unless error.nil?
       end
-    rescue SassC::SyntaxError => e
+    rescue SassC::SyntaxError, SassC::NotRenderedError => e
       self.error = e.message unless self.destroyed?
     end
     self.compiler_version = Theme.compiler_version
@@ -518,63 +525,63 @@ class ThemeField < ActiveRecord::Base
   FILE_MATCHERS = [
     ThemeFileMatcher.new(
       regex:
-        %r{^(?<target>(?:mobile|desktop|common))/(?<name>(?:head_tag|header|after_header|body_tag|footer))\.html$},
+        %r{\A(?<target>(?:mobile|desktop|common))/(?<name>(?:head_tag|header|after_header|body_tag|footer))\.html\z},
       targets: %i[mobile desktop common],
       names: %w[head_tag header after_header body_tag footer],
       types: :html,
       canonical: ->(h) { "#{h[:target]}/#{h[:name]}.html" },
     ),
     ThemeFileMatcher.new(
-      regex: %r{^(?<target>(?:mobile|desktop|common))/(?:\k<target>)\.scss$},
+      regex: %r{\A(?<target>(?:mobile|desktop|common))/(?:\k<target>)\.scss\z},
       targets: %i[mobile desktop common],
       names: "scss",
       types: :scss,
       canonical: ->(h) { "#{h[:target]}/#{h[:target]}.scss" },
     ),
     ThemeFileMatcher.new(
-      regex: %r{^common/embedded\.scss$},
+      regex: %r{\Acommon/embedded\.scss\z},
       targets: :common,
       names: "embedded_scss",
       types: :scss,
       canonical: ->(h) { "common/embedded.scss" },
     ),
     ThemeFileMatcher.new(
-      regex: %r{^common/color_definitions\.scss$},
+      regex: %r{\Acommon/color_definitions\.scss\z},
       targets: :common,
       names: "color_definitions",
       types: :scss,
       canonical: ->(h) { "common/color_definitions.scss" },
     ),
     ThemeFileMatcher.new(
-      regex: %r{^(?:scss|stylesheets)/(?<name>.+)\.scss$},
+      regex: %r{\A(?:scss|stylesheets)/(?<name>.+)\.scss\z},
       targets: :extra_scss,
       names: nil,
       types: :scss,
       canonical: ->(h) { "stylesheets/#{h[:name]}.scss" },
     ),
     ThemeFileMatcher.new(
-      regex: %r{^javascripts/(?<name>.+)$},
+      regex: %r{\Ajavascripts/(?<name>.+)\z},
       targets: :extra_js,
       names: nil,
       types: :js,
       canonical: ->(h) { "javascripts/#{h[:name]}" },
     ),
     ThemeFileMatcher.new(
-      regex: %r{^test/(?<name>.+)$},
+      regex: %r{\Atest/(?<name>.+)\z},
       targets: :tests_js,
       names: nil,
       types: :js,
       canonical: ->(h) { "test/#{h[:name]}" },
     ),
     ThemeFileMatcher.new(
-      regex: /^settings\.ya?ml$/,
+      regex: /\Asettings\.ya?ml\z/,
       names: "yaml",
       types: :yaml,
       targets: :settings,
       canonical: ->(h) { "settings.yml" },
     ),
     ThemeFileMatcher.new(
-      regex: %r{^locales/(?<name>(?:#{I18n.available_locales.join("|")}))\.yml$},
+      regex: %r{\Alocales/(?<name>(?:#{I18n.available_locales.join("|")}))\.yml\z},
       names: I18n.available_locales.map(&:to_s),
       types: :yaml,
       targets: :translations,
@@ -651,9 +658,41 @@ class ThemeField < ActiveRecord::Base
     end
   end
 
-  after_save { dependent_fields.each(&:invalidate_baked!) }
+  def upsert_svg_sprite!
+    begin
+      content = upload.content
+    rescue => e
+      Discourse.warn_exception(e, message: "Failed to fetch svg sprite for theme field #{id}")
+    else
+      if content.length > 4 * 1024**2
+        Rails.logger.warn(
+          "can't store theme svg sprite for theme #{theme_id} and upload #{upload_id}, sprite too big",
+        )
+      else
+        ThemeSvgSprite.upsert(
+          { theme_id: theme_id, upload_id: upload_id, sprite: content },
+          unique_by: :theme_id,
+        )
+      end
+    end
+  end
 
-  after_destroy { DB.after_commit { SvgSprite.expire_cache } if svg_sprite_field? }
+  after_save do
+    dependent_fields.each(&:invalidate_baked!)
+
+    if upload && svg_sprite_field?
+      upsert_svg_sprite!
+      SvgSprite.expire_cache
+    end
+  end
+
+  after_destroy do
+    if svg_sprite_field?
+      ThemeSvgSprite.where(theme_id: theme_id).delete_all
+
+      SvgSprite.expire_cache
+    end
+  end
 
   private
 
diff --git a/app/models/theme_svg_sprite.rb b/app/models/theme_svg_sprite.rb
new file mode 100644
index 00000000000..0bc9581bd54
--- /dev/null
+++ b/app/models/theme_svg_sprite.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class ThemeSvgSprite < ActiveRecord::Base
+  belongs_to :theme
+
+  def self.refetch!
+    ThemeField.svg_sprite_fields.find_each(&:upsert_svg_sprite!)
+    SvgSprite.expire_cache
+  end
+end
+
+# == Schema Information
+#
+# Table name: theme_svg_sprites
+#
+#  id         :bigint           not null, primary key
+#  theme_id   :integer          not null
+#  upload_id  :integer          not null
+#  sprite     :binary           not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+# Indexes
+#
+#  index_theme_svg_sprites_on_theme_id  (theme_id) UNIQUE
+#
diff --git a/app/models/topic.rb b/app/models/topic.rb
index aa494fa1ea4..d8f458f9728 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -28,7 +28,7 @@ class Topic < ActiveRecord::Base
   def_delegator :notifier, :mute!, :notify_muted!
   def_delegator :notifier, :toggle_mute, :toggle_mute
 
-  attr_accessor :allowed_user_ids, :tags_changed, :includes_destination_category
+  attr_accessor :allowed_user_ids, :allowed_group_ids, :tags_changed, :includes_destination_category
 
   def self.max_fancy_title_length
     400
@@ -58,7 +58,7 @@ class Topic < ActiveRecord::Base
 
   def thumbnail_info(enqueue_if_missing: false, extra_sizes: [])
     return nil unless original = image_upload
-    return nil unless original.filesize < SiteSetting.max_image_size_kb.kilobytes
+    return nil if original.filesize >= SiteSetting.max_image_size_kb.kilobytes
     return nil unless original.read_attribute(:width) && original.read_attribute(:height)
 
     infos = []
@@ -99,7 +99,7 @@ class Topic < ActiveRecord::Base
   def generate_thumbnails!(extra_sizes: [])
     return nil unless SiteSetting.create_thumbnails
     return nil unless original = image_upload
-    return nil unless original.filesize < SiteSetting.max_image_size_kb.kilobytes
+    return nil if original.filesize >= SiteSetting.max_image_size_kb.kilobytes
     return nil unless original.width && original.height
     extra_sizes = [] unless extra_sizes.kind_of?(Array)
 
@@ -293,6 +293,7 @@ class Topic < ActiveRecord::Base
 
   attr_accessor :posters # TODO: can replace with posters_summary once we remove old list code
   attr_accessor :participants
+  attr_accessor :participant_groups
   attr_accessor :topic_list
   attr_accessor :meta_data
   attr_accessor :include_last_poster
@@ -893,7 +894,7 @@ class Topic < ActiveRecord::Base
 
   # If a post is deleted we have to update our highest post counters and last post information
   def self.reset_highest(topic_id)
-    archetype = Topic.where(id: topic_id).pluck_first(:archetype)
+    archetype = Topic.where(id: topic_id).pick(:archetype)
 
     # ignore small_action replies for private messages
     post_type =
@@ -1103,14 +1104,13 @@ class Topic < ActiveRecord::Base
       topic_user = topic_allowed_users.find_by(user_id: user.id)
 
       if topic_user
-        topic_user.destroy
-
         if user.id == removed_by&.id
           add_small_action(removed_by, "user_left", user.username)
         else
           add_small_action(removed_by, "removed_user", user.username)
         end
 
+        topic_user.destroy
         return true
       end
     end
@@ -1200,7 +1200,7 @@ class Topic < ActiveRecord::Base
       else
         !!invite_to_topic(invited_by, target_user, group_ids, guardian)
       end
-    elsif username_or_email =~ /^.+@.+$/ && guardian.can_invite_via_email?(self)
+    elsif username_or_email =~ /\A.+@.+\z/ && guardian.can_invite_via_email?(self)
       !!Invite.generate(
         invited_by,
         email: username_or_email,
@@ -1237,7 +1237,11 @@ class Topic < ActiveRecord::Base
       )
 
     if opts[:destination_topic_id]
-      topic = post_mover.to_topic(opts[:destination_topic_id], participants: opts[:participants])
+      topic =
+        post_mover.to_topic(
+          opts[:destination_topic_id],
+          **opts.slice(:participants, :chronological_order),
+        )
 
       DiscourseEvent.trigger(:topic_merged, post_mover.original_topic, post_mover.destination_topic)
 
@@ -1271,6 +1275,10 @@ class Topic < ActiveRecord::Base
     @participants_summary ||= TopicParticipantsSummary.new(self, options).summary
   end
 
+  def participant_groups_summary(options = {})
+    @participant_groups_summary ||= TopicParticipantGroupsSummary.new(self, options).summary
+  end
+
   def make_banner!(user, bannered_until = nil)
     if bannered_until
       bannered_until =
@@ -1895,8 +1903,6 @@ class Topic < ActiveRecord::Base
   def incoming_email_addresses(group: nil, received_before: Time.zone.now)
     email_addresses = Set.new
 
-    # TODO(martin) Look at improving this N1, it will just get slower the
-    # more replies/incoming emails there are for the topic.
     self
       .incoming_email
       .where("created_at <= ?", received_before)
@@ -2035,6 +2041,10 @@ class Topic < ActiveRecord::Base
     end
   end
 
+  def group_pm?
+    private_message? && all_allowed_users.count > 2
+  end
+
   def visible_tags(guardian)
     tags.reject { |tag| guardian.hidden_tag_names.include?(tag[:name]) }
   end
diff --git a/app/models/topic_converter.rb b/app/models/topic_converter.rb
index 8eab3a31d0c..3c0b9652a95 100644
--- a/app/models/topic_converter.rb
+++ b/app/models/topic_converter.rb
@@ -20,7 +20,7 @@ class TopicConverter
             .where(read_restricted: false)
             .where.not(id: SiteSetting.uncategorized_category_id)
             .order("id asc")
-            .pluck_first(:id)
+            .pick(:id)
         end
 
       PostRevisor.new(@topic.first_post, @topic).revise!(
diff --git a/app/models/topic_embed.rb b/app/models/topic_embed.rb
index a318f7e576e..3ac5de7d8f8 100644
--- a/app/models/topic_embed.rb
+++ b/app/models/topic_embed.rb
@@ -41,7 +41,7 @@ class TopicEmbed < ActiveRecord::Base
 
   # Import an article from a source (RSS/Atom/Other)
   def self.import(user, url, title, contents, category_id: nil, cook_method: nil, tags: nil)
-    return unless url =~ %r{^https?\://}
+    return unless url =~ %r{\Ahttps?\://}
 
     contents = first_paragraph_from(contents) if SiteSetting.embed_truncate && cook_method.nil?
     contents ||= ""
@@ -118,10 +118,8 @@ class TopicEmbed < ActiveRecord::Base
   end
 
   def self.find_remote(url)
-    require "ruby-readability"
-
     url = UrlHelper.normalized_encode(url)
-    original_uri = URI.parse(url)
+    URI.parse(url) # ensure url parses, will raise if not
     fd = FinalDestination.new(url, validate_uri: true, max_redirects: 5, follow_canonical: true)
 
     uri = fd.resolve
@@ -140,7 +138,7 @@ class TopicEmbed < ActiveRecord::Base
     require "ruby-readability"
 
     opts = {
-      tags: %w[div p code pre h1 h2 h3 b em i strong a img ul li ol blockquote],
+      tags: %w[div p code pre h1 h2 h3 b em i strong a img ul li ol blockquote figure figcaption],
       attributes: %w[href src class],
       remove_empty_nodes: false,
     }
@@ -214,7 +212,7 @@ class TopicEmbed < ActiveRecord::Base
           end
       end
 
-    response.body = doc.to_html
+    response.body = doc.at("body").children.to_html
     response
   end
 
@@ -302,7 +300,7 @@ class TopicEmbed < ActiveRecord::Base
     Discourse
       .cache
       .fetch("embed-topic:#{post.topic_id}", expires_in: 10.minutes) do
-        url = TopicEmbed.where(topic_id: post.topic_id).pluck_first(:embed_url)
+        url = TopicEmbed.where(topic_id: post.topic_id).pick(:embed_url)
         response = TopicEmbed.find_remote(url)
 
         body = response.body
diff --git a/app/models/topic_group.rb b/app/models/topic_group.rb
index f9e0f65fb01..8a05b36a7e8 100644
--- a/app/models/topic_group.rb
+++ b/app/models/topic_group.rb
@@ -51,8 +51,7 @@ class TopicGroup < ActiveRecord::Base
         AND tag.topic_id = :topic_id
     SQL
 
-    query +=
-      "AND NOT(tag.group_id IN (:already_updated_groups))" unless updated_group_ids.length.zero?
+    query += "AND NOT(tag.group_id IN (:already_updated_groups))" if updated_group_ids.present?
 
     query += <<~SQL
       ON CONFLICT(topic_id, group_id)
diff --git a/app/models/topic_link.rb b/app/models/topic_link.rb
index 03bc3587b45..05d35f55ae6 100644
--- a/app/models/topic_link.rb
+++ b/app/models/topic_link.rb
@@ -175,7 +175,7 @@ class TopicLink < ActiveRecord::Base
 
     lookup = {}
     results.each do |tl|
-      normalized = tl.url.downcase.sub(%r{^https?://}, "").sub(%r{/$}, "")
+      normalized = tl.url.downcase.sub(%r{\Ahttps?://}, "").sub(%r{/\z}, "")
       lookup[normalized] = {
         domain: tl.domain,
         username: tl.user.username_lower,
diff --git a/app/models/topic_link_click.rb b/app/models/topic_link_click.rb
index a1f121ee844..8dde67f47f0 100644
--- a/app/models/topic_link_click.rb
+++ b/app/models/topic_link_click.rb
@@ -10,8 +10,6 @@ class TopicLinkClick < ActiveRecord::Base
   validates_presence_of :topic_link_id
 
   ALLOWED_REDIRECT_HOSTNAMES = Set.new(%W[www.youtube.com youtu.be])
-  include ActiveSupport::Deprecation::DeprecatedConstantAccessor
-  deprecate_constant "WHITELISTED_REDIRECT_HOSTNAMES", "TopicLinkClick::ALLOWED_REDIRECT_HOSTNAMES"
 
   # Create a click from a URL and post_id
   def self.create_from(args = {})
@@ -21,9 +19,9 @@ class TopicLinkClick < ActiveRecord::Base
     uri = UrlHelper.relaxed_parse(url)
     urls = Set.new
     urls << url
-    if url =~ /^http/
-      urls << url.sub(/^https/, "http")
-      urls << url.sub(/^http:/, "https:")
+    if url =~ /\Ahttp/
+      urls << url.sub(/\Ahttps/, "http")
+      urls << url.sub(/\Ahttp:/, "https:")
       urls << UrlHelper.schemaless(url)
     end
     urls << UrlHelper.absolute_without_cdn(url)
@@ -90,7 +88,7 @@ class TopicLinkClick < ActiveRecord::Base
     # If no link is found...
     unless link.present?
       # ... return the url for relative links or when using the same host
-      return url if url =~ %r{^/[^/]} || uri.try(:host) == Discourse.current_hostname
+      return url if url =~ %r{\A/[^/]} || uri.try(:host) == Discourse.current_hostname
 
       # If we have it somewhere else on the site, just allow the redirect.
       # This is likely due to a onebox of another topic.
diff --git a/app/models/topic_list.rb b/app/models/topic_list.rb
index b4be8c367fd..de50712dc79 100644
--- a/app/models/topic_list.rb
+++ b/app/models/topic_list.rb
@@ -97,12 +97,15 @@ class TopicList
 
     # Create a lookup for all the user ids we need
     user_ids = []
+    group_ids = []
     @topics.each do |ft|
       user_ids << ft.user_id << ft.last_post_user_id << ft.featured_user_ids << ft.allowed_user_ids
+      group_ids |= (ft.allowed_group_ids || [])
     end
 
     user_ids = TopicList.preload_user_ids(@topics, user_ids, self)
     user_lookup = UserLookup.new(user_ids)
+    group_lookup = GroupLookup.new(group_ids)
 
     @topics.each do |ft|
       ft.user_data = @topic_lookup[ft.id] if @topic_lookup.present?
@@ -120,6 +123,8 @@ class TopicList
       ft.posters = ft.posters_summary(user_lookup: user_lookup)
 
       ft.participants = ft.participants_summary(user_lookup: user_lookup, user: @current_user)
+      ft.participant_groups =
+        ft.participant_groups_summary(group_lookup: group_lookup, group: @opts[:group])
       ft.topic_list = self
     end
 
diff --git a/app/models/topic_participant_groups_summary.rb b/app/models/topic_participant_groups_summary.rb
new file mode 100644
index 00000000000..6ee323fed71
--- /dev/null
+++ b/app/models/topic_participant_groups_summary.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+# This is used on a topic page
+class TopicParticipantGroupsSummary
+  attr_reader :topic, :options
+
+  def initialize(topic, options = {})
+    @topic = topic
+    @options = options
+    @group = options[:group]
+  end
+
+  def summary
+    group_participants.compact
+  end
+
+  def group_participants
+    return [] if group_ids.blank?
+    group_ids.map { |id| group_lookup[id] }
+  end
+
+  def group_ids
+    ids = topic.allowed_group_ids
+    ids = ids - [@group.id] if @group.present?
+    ids
+  end
+
+  def group_lookup
+    @group_lookup ||= options[:group_lookup] || GroupLookup.new(group_ids)
+  end
+end
diff --git a/app/models/topic_tracking_state.rb b/app/models/topic_tracking_state.rb
index 490bf9a5141..b2ef7441428 100644
--- a/app/models/topic_tracking_state.rb
+++ b/app/models/topic_tracking_state.rb
@@ -29,8 +29,16 @@ class TopicTrackingState
   DESTROY_MESSAGE_TYPE = "destroy"
   READ_MESSAGE_TYPE = "read"
   DISMISS_NEW_MESSAGE_TYPE = "dismiss_new"
+  DISMISS_NEW_POSTS_MESSAGE_TYPE = "dismiss_new_posts"
   MAX_TOPICS = 5000
 
+  NEW_MESSAGE_BUS_CHANNEL = "/new"
+  LATEST_MESSAGE_BUS_CHANNEL = "/latest"
+  UNREAD_MESSAGE_BUS_CHANNEL = "/unread"
+  RECOVER_MESSAGE_BUS_CHANNEL = "/recover"
+  DELETE_MESSAGE_BUS_CHANNEL = "/delete"
+  DESTROY_MESSAGE_BUS_CHANNEL = "/destroy"
+
   def self.publish_new(topic)
     return unless topic.regular?
 
@@ -55,7 +63,7 @@ class TopicTrackingState
 
     group_ids = secure_category_group_ids(topic)
 
-    MessageBus.publish("/new", message.as_json, group_ids: group_ids)
+    MessageBus.publish(NEW_MESSAGE_BUS_CHANNEL, message.as_json, group_ids: group_ids)
     publish_read(topic.id, 1, topic.user)
   end
 
@@ -86,8 +94,7 @@ class TopicTrackingState
       else
         secure_category_group_ids(topic)
       end
-
-    MessageBus.publish("/latest", message.as_json, group_ids: group_ids)
+    MessageBus.publish(LATEST_MESSAGE_BUS_CHANNEL, message.as_json, group_ids: group_ids)
   end
 
   def self.unread_channel_key(user_id)
@@ -107,8 +114,10 @@ class TopicTrackingState
         .limit(100)
         .pluck(:user_id)
     return if user_ids.blank?
+
     message = { topic_id: topic.id, message_type: MUTED_MESSAGE_TYPE }
-    MessageBus.publish("/latest", message.as_json, user_ids: user_ids)
+
+    MessageBus.publish(LATEST_MESSAGE_BUS_CHANNEL, message.as_json, user_ids: user_ids)
   end
 
   def self.publish_unmuted(topic)
@@ -122,8 +131,10 @@ class TopicTrackingState
         .limit(100)
         .pluck(:id)
     return if user_ids.blank?
+
     message = { topic_id: topic.id, message_type: UNMUTED_MESSAGE_TYPE }
-    MessageBus.publish("/latest", message.as_json, user_ids: user_ids)
+
+    MessageBus.publish(LATEST_MESSAGE_BUS_CHANNEL, message.as_json, user_ids: user_ids)
   end
 
   def self.publish_unread(post)
@@ -172,7 +183,7 @@ class TopicTrackingState
 
     message = { topic_id: post.topic_id, message_type: UNREAD_MESSAGE_TYPE, payload: payload }
 
-    MessageBus.publish("/unread", message.as_json, user_ids: user_ids)
+    MessageBus.publish(UNREAD_MESSAGE_BUS_CHANNEL, message.as_json, user_ids: user_ids)
   end
 
   def self.publish_recover(topic)
@@ -182,7 +193,7 @@ class TopicTrackingState
 
     message = { topic_id: topic.id, message_type: RECOVER_MESSAGE_TYPE }
 
-    MessageBus.publish("/recover", message.as_json, group_ids: group_ids)
+    MessageBus.publish(RECOVER_MESSAGE_BUS_CHANNEL, message.as_json, group_ids: group_ids)
   end
 
   def self.publish_delete(topic)
@@ -202,7 +213,7 @@ class TopicTrackingState
 
     message = { topic_id: topic.id, message_type: DESTROY_MESSAGE_TYPE }
 
-    MessageBus.publish("/destroy", message.as_json, group_ids: group_ids)
+    MessageBus.publish(DESTROY_MESSAGE_BUS_CHANNEL, message.as_json, group_ids: group_ids)
   end
 
   def self.publish_read(topic_id, last_read_post_number, user, notification_level = nil)
@@ -221,6 +232,11 @@ class TopicTrackingState
     MessageBus.publish(self.unread_channel_key(user_id), message.as_json, user_ids: [user_id])
   end
 
+  def self.publish_dismiss_new_posts(user_id, topic_ids: [])
+    message = { message_type: DISMISS_NEW_POSTS_MESSAGE_TYPE, payload: { topic_ids: topic_ids } }
+    MessageBus.publish(self.unread_channel_key(user_id), message.as_json, user_ids: [user_id])
+  end
+
   def self.new_filter_sql
     TopicQuery
       .new_filter(Topic, treat_as_new_topic_clause_sql: treat_as_new_topic_clause)
@@ -288,6 +304,7 @@ class TopicTrackingState
           topic_id: topic_id,
           min_new_topic_date: Time.at(SiteSetting.min_new_topics_time).to_datetime,
           max_topics: TopicTrackingState::MAX_TOPICS,
+          user_first_unread_at: user.user_stat.first_unread_at,
         }.merge(treat_as_new_topic_params),
       )
 
@@ -366,7 +383,7 @@ class TopicTrackingState
 
     filter_old_unread_sql =
       if filter_old_unread
-        " topics.updated_at >= us.first_unread_at AND "
+        " topics.updated_at >= :user_first_unread_at AND "
       else
         ""
       end
@@ -378,6 +395,13 @@ class TopicTrackingState
         new_filter_sql
       end
 
+    category_topic_id_column_select =
+      if SiteSetting.show_category_definitions_in_topic_lists
+        ""
+      else
+        "c.topic_id AS category_topic_id,"
+      end
+
     select_sql =
       select ||
         "
@@ -388,8 +412,8 @@ class TopicTrackingState
            #{highest_post_number_column_select(whisperer)},
            last_read_post_number,
            c.id as category_id,
+           #{category_topic_id_column_select}
            tu.notification_level,
-           us.first_unread_at,
            GREATEST(
               CASE
               WHEN COALESCE(uo.new_topic_duration_minutes, :default_duration) = :always THEN u.created_at
@@ -451,7 +475,6 @@ class TopicTrackingState
       SELECT #{select_sql}
       FROM topics
       JOIN users u on u.id = :user_id
-      JOIN user_stats AS us ON us.user_id = u.id
       JOIN user_options AS uo ON uo.user_id = u.id
       JOIN categories c ON c.id = topics.category_id
       LEFT JOIN topic_users tu ON tu.topic_id = topics.id AND tu.user_id = u.id
@@ -561,6 +584,8 @@ class TopicTrackingState
   def self.secure_category_group_ids(topic)
     category = topic.category
 
+    return [Group::AUTO_GROUPS[:admins]] if category.nil?
+
     if category.read_restricted
       ids = [Group::AUTO_GROUPS[:admins]]
       ids.push(*category.secure_group_ids)
diff --git a/app/models/topic_user.rb b/app/models/topic_user.rb
index 0e00f68f2de..e8c15fd6d51 100644
--- a/app/models/topic_user.rb
+++ b/app/models/topic_user.rb
@@ -275,8 +275,7 @@ class TopicUser < ActiveRecord::Base
             attrs[:notification_level] = notification_levels[:watching]
           end
         else
-          auto_track_after =
-            UserOption.where(user_id: user_id).pluck_first(:auto_track_topics_after_msecs)
+          auto_track_after = UserOption.where(user_id: user_id).pick(:auto_track_topics_after_msecs)
           auto_track_after ||= SiteSetting.default_other_auto_track_topics_after_msecs
 
           if auto_track_after >= 0 && auto_track_after <= (attrs[:total_msecs_viewed].to_i || 0)
@@ -583,6 +582,7 @@ end
 #
 # Indexes
 #
-#  index_topic_users_on_topic_id_and_user_id  (topic_id,user_id) UNIQUE
-#  index_topic_users_on_user_id_and_topic_id  (user_id,topic_id) UNIQUE
+#  index_topic_users_on_topic_id_and_notification_level  (topic_id,notification_level)
+#  index_topic_users_on_topic_id_and_user_id             (topic_id,user_id) UNIQUE
+#  index_topic_users_on_user_id_and_topic_id             (user_id,topic_id) UNIQUE
 #
diff --git a/app/models/translation_override.rb b/app/models/translation_override.rb
index 73137243ed0..23a81a1fbc1 100644
--- a/app/models/translation_override.rb
+++ b/app/models/translation_override.rb
@@ -35,26 +35,28 @@ class TranslationOverride < ActiveRecord::Base
       optional_cat
       optional_tags
     ],
+    %w[system_messages.welcome_user] => %w[username name name_or_username],
   }
 
   include HasSanitizableFields
-  include ActiveSupport::Deprecation::DeprecatedConstantAccessor
-  deprecate_constant "CUSTOM_INTERPOLATION_KEYS_WHITELIST",
-                     "TranslationOverride::ALLOWED_CUSTOM_INTERPOLATION_KEYS"
 
   validates_uniqueness_of :translation_key, scope: :locale
   validates_presence_of :locale, :translation_key, :value
 
   validate :check_interpolation_keys
 
+  enum :status, %i[up_to_date outdated invalid_interpolation_keys deprecated]
+
   def self.upsert!(locale, key, value)
     params = { locale: locale, translation_key: key }
 
     translation_override = find_or_initialize_by(params)
     sanitized_value =
       translation_override.sanitize_field(value, additional_attributes: ["data-auto-route"])
+    original_translation =
+      I18n.overrides_disabled { I18n.t(transform_pluralized_key(key), locale: :en) }
 
-    data = { value: sanitized_value }
+    data = { value: sanitized_value, original_translation: original_translation }
     if key.end_with?("_MF")
       _, filename = JsLocaleHelper.find_message_format_locale([locale], fallback_to_english: false)
       data[:compiled_js] = JsLocaleHelper.compile_message_format(filename, locale, sanitized_value)
@@ -107,48 +109,76 @@ class TranslationOverride < ActiveRecord::Base
     true
   end
 
+  # We use English as the source of truth when extracting interpolation keys,
+  # but some languages, like Arabic, have plural forms (zero, two, few, many)
+  # which don't exist in English (one, other), so we map that here in order to
+  # find the correct, English translation key in which to look.
+  def self.transform_pluralized_key(key)
+    match = key.match(/(.*)\.(zero|two|few|many)\z/)
+    match ? match.to_a.second + ".other" : key
+  end
+
+  def self.custom_interpolation_keys(translation_key)
+    ALLOWED_CUSTOM_INTERPOLATION_KEYS.find do |keys, value|
+      break value if keys.any? { |k| translation_key.start_with?(k) }
+    end || []
+  end
+
   private_class_method :reload_locale!
   private_class_method :clear_cached_keys!
   private_class_method :i18n_changed
   private_class_method :expire_cache
 
-  private
-
-  def check_interpolation_keys
-    transformed_key = transform_pluralized_key(translation_key)
-
-    original_text = I18n.overrides_disabled { I18n.t(transformed_key, locale: :en) }
-
-    if original_text
-      original_interpolation_keys = I18nInterpolationKeysFinder.find(original_text)
-      new_interpolation_keys = I18nInterpolationKeysFinder.find(value)
-      custom_interpolation_keys = []
-
-      ALLOWED_CUSTOM_INTERPOLATION_KEYS.select do |keys, value|
-        custom_interpolation_keys = value if keys.any? { |key| transformed_key.start_with?(key) }
-      end
-
-      invalid_keys =
-        (original_interpolation_keys | new_interpolation_keys) - original_interpolation_keys -
-          custom_interpolation_keys
-
-      if invalid_keys.present?
-        self.errors.add(
-          :base,
-          I18n.t(
-            "activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys",
-            keys: invalid_keys.join(", "),
-          ),
-        )
-
-        false
-      end
-    end
+  def original_translation_deleted?
+    !I18n.overrides_disabled { I18n.t!(transformed_key, locale: :en) }.is_a?(String)
+  rescue I18n::MissingTranslationData
+    true
   end
 
-  def transform_pluralized_key(key)
-    match = key.match(/(.*)\.(zero|two|few|many)$/)
-    match ? match.to_a.second + ".other" : key
+  def original_translation_updated?
+    return false if original_translation.blank?
+
+    original_translation != current_default
+  end
+
+  def invalid_interpolation_keys
+    return [] if current_default.blank?
+
+    original_interpolation_keys = I18nInterpolationKeysFinder.find(current_default)
+    new_interpolation_keys = I18nInterpolationKeysFinder.find(value)
+    custom_interpolation_keys = []
+
+    ALLOWED_CUSTOM_INTERPOLATION_KEYS.select do |keys, value|
+      custom_interpolation_keys = value if keys.any? { |key| transformed_key.start_with?(key) }
+    end
+
+    (original_interpolation_keys | new_interpolation_keys) - original_interpolation_keys -
+      custom_interpolation_keys
+  end
+
+  def current_default
+    I18n.overrides_disabled { I18n.t(transformed_key, locale: :en) }
+  end
+
+  private
+
+  def transformed_key
+    @transformed_key ||= self.class.transform_pluralized_key(translation_key)
+  end
+
+  def check_interpolation_keys
+    invalid_keys = invalid_interpolation_keys
+
+    return if invalid_keys.blank?
+
+    self.errors.add(
+      :base,
+      I18n.t(
+        "activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys",
+        keys: invalid_keys.join(I18n.t("word_connector.comma")),
+        count: invalid_keys.size,
+      ),
+    )
   end
 end
 
@@ -156,13 +186,15 @@ end
 #
 # Table name: translation_overrides
 #
-#  id              :integer          not null, primary key
-#  locale          :string           not null
-#  translation_key :string           not null
-#  value           :string           not null
-#  created_at      :datetime         not null
-#  updated_at      :datetime         not null
-#  compiled_js     :text
+#  id                   :integer          not null, primary key
+#  locale               :string           not null
+#  translation_key      :string           not null
+#  value                :string           not null
+#  created_at           :datetime         not null
+#  updated_at           :datetime         not null
+#  compiled_js          :text
+#  original_translation :text
+#  status               :integer          default("up_to_date"), not null
 #
 # Indexes
 #
diff --git a/app/models/upload.rb b/app/models/upload.rb
index f4bbfbac7ae..cea39988f8e 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -100,6 +100,10 @@ class Upload < ActiveRecord::Base
     self.url
   end
 
+  def to_markdown
+    UploadMarkdown.new(self).to_markdown
+  end
+
   def thumbnail(width = self.thumbnail_width, height = self.thumbnail_height)
     optimized_images.find_by(width: width, height: height)
   end
@@ -140,7 +144,7 @@ class Upload < ActiveRecord::Base
     external_copy = nil
 
     if original_path.blank?
-      external_copy = Discourse.store.download(self)
+      external_copy = Discourse.store.download!(self)
       original_path = external_copy.path
     end
 
@@ -258,20 +262,20 @@ class Upload < ActiveRecord::Base
   end
 
   def local?
-    !(url =~ %r{^(https?:)?//})
+    !(url =~ %r{\A(https?:)?//})
   end
 
   def fix_dimensions!
     return if !FileHelper.is_supported_image?("image.#{extension}")
 
-    path =
-      if local?
-        Discourse.store.path_for(self)
-      else
-        Discourse.store.download(self).path
-      end
-
     begin
+      path =
+        if local?
+          Discourse.store.path_for(self)
+        else
+          Discourse.store.download!(self).path
+        end
+
       if extension == "svg"
         w, h =
           begin
@@ -369,6 +373,8 @@ class Upload < ActiveRecord::Base
               "10",
               "convert",
               local_path,
+              "-depth",
+              "8",
               "-resize",
               "1x1",
               "-define",
@@ -515,7 +521,7 @@ class Upload < ActiveRecord::Base
             # keep track of the url
             previous_url = upload.url.dup
             # where is the file currently stored?
-            external = previous_url =~ %r{^//}
+            external = previous_url =~ %r{\A//}
             # download if external
             if external
               url = SiteSetting.scheme + ":" + previous_url
diff --git a/app/models/upload_reference.rb b/app/models/upload_reference.rb
index 73de830f545..ea5401e1233 100644
--- a/app/models/upload_reference.rb
+++ b/app/models/upload_reference.rb
@@ -4,6 +4,8 @@ class UploadReference < ActiveRecord::Base
   belongs_to :upload
   belongs_to :target, polymorphic: true
 
+  delegate :to_markdown, to: :upload
+
   def self.ensure_exist!(upload_ids: [], target: nil, target_type: nil, target_id: nil)
     if !target && !(target_type && target_id)
       raise "target OR target_type and target_id are required"
diff --git a/app/models/user.rb b/app/models/user.rb
index 51dd41348b5..997d64e48ca 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -9,6 +9,10 @@ class User < ActiveRecord::Base
 
   DEFAULT_FEATURED_BADGE_COUNT = 3
 
+  PASSWORD_SALT_LENGTH = 16
+  TARGET_PASSWORD_ALGORITHM =
+    "$pbkdf2-#{Rails.configuration.pbkdf2_algorithm}$i=#{Rails.configuration.pbkdf2_iterations},l=32$"
+
   # not deleted on user delete
   has_many :posts
   has_many :topics
@@ -49,7 +53,7 @@ class User < ActiveRecord::Base
   has_many :pending_posts,
            -> { merge(Reviewable.pending) },
            class_name: "ReviewableQueuedPost",
-           foreign_key: :created_by_id
+           foreign_key: :target_created_by_id
 
   has_one :user_option, dependent: :destroy
   has_one :user_avatar, dependent: :destroy
@@ -82,6 +86,7 @@ class User < ActiveRecord::Base
   has_many :muted_user_records, class_name: "MutedUser", dependent: :delete_all
   has_many :ignored_user_records, class_name: "IgnoredUser", dependent: :delete_all
   has_many :do_not_disturb_timings, dependent: :delete_all
+  has_many :sidebar_sections, dependent: :destroy
   has_one :user_status, dependent: :destroy
 
   # dependent deleting handled via before_destroy (special cases)
@@ -132,13 +137,6 @@ class User < ActiveRecord::Base
   belongs_to :uploaded_avatar, class_name: "Upload"
 
   has_many :sidebar_section_links, dependent: :delete_all
-  has_many :category_sidebar_section_links,
-           -> { where(linkable_type: "Category") },
-           class_name: "SidebarSectionLink"
-  has_many :custom_sidebar_tags,
-           through: :sidebar_section_links,
-           source: :linkable,
-           source_type: "Tag"
 
   delegate :last_sent_email_address, to: :email_logs
 
@@ -148,7 +146,7 @@ class User < ActiveRecord::Base
   validate :name_validator, if: :will_save_change_to_name?
   validates :name, user_full_name: true, if: :will_save_change_to_name?, length: { maximum: 255 }
   validates :ip_address, allowed_ip_address: { on: :create, message: :signup_not_allowed }
-  validates :primary_email, presence: true
+  validates :primary_email, presence: true, unless: :skip_email_validation
   validates :validatable_user_fields_values, watched_words: true, unless: :custom_fields_clean?
   validates_associated :primary_email,
                        message: ->(_, user_email) { user_email[:value]&.errors[:email]&.first }
@@ -165,16 +163,14 @@ class User < ActiveRecord::Base
   after_create :ensure_in_trust_level_group
   after_create :set_default_categories_preferences
   after_create :set_default_tags_preferences
-  after_create :add_default_sidebar_section_links
-
-  after_update :update_default_sidebar_section_links, if: Proc.new { self.saved_change_to_admin? }
-
-  after_update :add_default_sidebar_section_links, if: Proc.new { self.saved_change_to_staged? }
+  after_create :set_default_sidebar_section_links
+  after_update :set_default_sidebar_section_links, if: Proc.new { self.saved_change_to_staged? }
 
   after_update :trigger_user_updated_event,
                if: Proc.new { self.human? && self.saved_change_to_uploaded_avatar_id? }
 
   after_update :trigger_user_automatic_group_refresh, if: :saved_change_to_staged?
+  after_update :change_display_name, if: :saved_change_to_name?
 
   before_save :update_usernames
   before_save :ensure_password_is_hashed
@@ -293,7 +289,7 @@ class User < ActiveRecord::Base
         ->(filter) {
           if filter.is_a?(String) && filter =~ /.+@.+/
             # probably an email so try the bypass
-            if user_id = UserEmail.where("lower(email) = ?", filter.downcase).pluck_first(:user_id)
+            if user_id = UserEmail.where("lower(email) = ?", filter.downcase).pick(:user_id)
               return where("users.id = ?", user_id)
             end
           end
@@ -350,12 +346,26 @@ class User < ActiveRecord::Base
         post_menu: 3,
         topic_notification_levels: 4,
         suggested_topics: 5,
+        admin_guide: 6,
       )
   end
 
+  def secured_sidebar_category_ids(user_guardian = nil)
+    user_guardian ||= guardian
+
+    SidebarSectionLink.where(user_id: self.id, linkable_type: "Category").pluck(:linkable_id) &
+      user_guardian.allowed_category_ids
+  end
+
   def visible_sidebar_tags(user_guardian = nil)
     user_guardian ||= guardian
-    DiscourseTagging.filter_visible(custom_sidebar_tags, user_guardian)
+
+    DiscourseTagging.filter_visible(
+      Tag.where(
+        id: SidebarSectionLink.where(user_id: self.id, linkable_type: "Tag").select(:linkable_id),
+      ),
+      user_guardian,
+    )
   end
 
   def self.max_password_length
@@ -396,7 +406,7 @@ class User < ActiveRecord::Base
       .reserved_usernames
       .unicode_normalize
       .split("|")
-      .any? { |reserved| username.match?(/^#{Regexp.escape(reserved).gsub('\*', ".*")}$/) }
+      .any? { |reserved| username.match?(/\A#{Regexp.escape(reserved).gsub('\*', ".*")}\z/) }
   end
 
   def self.editable_user_custom_fields(by_staff: false)
@@ -587,7 +597,6 @@ class User < ActiveRecord::Base
     @unread_pms = nil
     @unread_bookmarks = nil
     @unread_high_prios = nil
-    @user_fields_cache = nil
     @ignored_user_ids = nil
     @muted_user_ids = nil
     @belonging_to_group_ids = nil
@@ -602,7 +611,7 @@ class User < ActiveRecord::Base
     @muted_user_ids ||= muted_users.pluck(:id)
   end
 
-  def unread_notifications_of_type(notification_type)
+  def unread_notifications_of_type(notification_type, since: nil)
     # perf critical, much more efficient than AR
     sql = <<~SQL
         SELECT COUNT(*)
@@ -612,10 +621,11 @@ class User < ActiveRecord::Base
            AND n.notification_type = :notification_type
            AND n.user_id = :user_id
            AND NOT read
+           #{since ? "AND n.created_at > :since" : ""}
     SQL
 
     # to avoid coalesce we do to_i
-    DB.query_single(sql, user_id: id, notification_type: notification_type)[0].to_i
+    DB.query_single(sql, user_id: id, notification_type: notification_type, since: since)[0].to_i
   end
 
   def unread_notifications_of_priority(high_priority:)
@@ -652,14 +662,6 @@ class User < ActiveRecord::Base
     results.to_h
   end
 
-  ###
-  # DEPRECATED: This is only maintained for backwards compat until v2.5. There
-  # may be inconsistencies with counts in the UI because of this, because unread
-  # high priority includes PMs AND bookmark reminders.
-  def unread_private_messages
-    @unread_pms ||= unread_high_priority_notifications
-  end
-
   def unread_high_priority_notifications
     @unread_high_prios ||= unread_notifications_of_priority(high_priority: true)
   end
@@ -755,7 +757,7 @@ class User < ActiveRecord::Base
   end
 
   def reviewable_count
-    Reviewable.list_for(self, include_claimed_by_others: !redesigned_user_menu_enabled?).count
+    Reviewable.list_for(self, include_claimed_by_others: false).count
   end
 
   def saw_notification_id(notification_id)
@@ -802,20 +804,8 @@ class User < ActiveRecord::Base
     MessageBus.publish("/reviewable_counts/#{self.id}", data, user_ids: [self.id])
   end
 
-  TRACK_FIRST_NOTIFICATION_READ_DURATION = 1.week.to_i
-
   def read_first_notification?
-    if (
-         trust_level > TrustLevel[1] ||
-           (
-             first_seen_at.present? &&
-               first_seen_at < TRACK_FIRST_NOTIFICATION_READ_DURATION.seconds.ago
-           ) || user_option.skip_new_user_tips
-       )
-      return true
-    end
-
-    self.seen_notification_id == 0 ? false : true
+    self.seen_notification_id != 0 || user_option.skip_new_user_tips
   end
 
   def publish_notifications_state
@@ -854,7 +844,6 @@ class User < ActiveRecord::Base
 
     payload = {
       unread_notifications: unread_notifications,
-      unread_private_messages: unread_private_messages,
       unread_high_priority_notifications: unread_high_priority_notifications,
       read_first_notification: read_first_notification?,
       last_notification: json,
@@ -862,13 +851,9 @@ class User < ActiveRecord::Base
       seen_notification_id: seen_notification_id,
     }
 
-    if self.redesigned_user_menu_enabled?
-      payload[:all_unread_notifications_count] = all_unread_notifications_count
-      payload[:grouped_unread_notifications] = grouped_unread_notifications
-      payload[
-        :new_personal_messages_notifications_count
-      ] = new_personal_messages_notifications_count
-    end
+    payload[:all_unread_notifications_count] = all_unread_notifications_count
+    payload[:grouped_unread_notifications] = grouped_unread_notifications
+    payload[:new_personal_messages_notifications_count] = new_personal_messages_notifications_count
 
     MessageBus.publish("/notification/#{id}", payload, user_ids: [id])
   end
@@ -926,8 +911,20 @@ class User < ActiveRecord::Base
   end
 
   def confirm_password?(password)
-    return false unless password_hash && salt
-    self.password_hash == hash_password(password, salt)
+    return false unless password_hash && salt && password_algorithm
+    confirmed = self.password_hash == hash_password(password, salt, password_algorithm)
+
+    if confirmed && persisted? && password_algorithm != TARGET_PASSWORD_ALGORITHM
+      # Regenerate password_hash with new algorithm and persist
+      salt = SecureRandom.hex(PASSWORD_SALT_LENGTH)
+      update_columns(
+        password_algorithm: TARGET_PASSWORD_ALGORITHM,
+        salt: salt,
+        password_hash: hash_password(password, salt, TARGET_PASSWORD_ALGORITHM),
+      )
+    end
+
+    confirmed
   end
 
   def new_user_posting_on_first_day?
@@ -1117,7 +1114,7 @@ class User < ActiveRecord::Base
     # TODO it may be worth caching this in a distributed cache, should be benched
     if SiteSetting.external_system_avatars_enabled
       url = SiteSetting.external_system_avatars_url.dup
-      url = +"#{Discourse.base_path}#{url}" unless url =~ %r{^https?://}
+      url = +"#{Discourse.base_path}#{url}" unless url =~ %r{\Ahttps?://}
       url.gsub! "{color}", letter_avatar_color(normalized_username)
       url.gsub! "{username}", UrlHelper.encode_component(username)
       url.gsub! "{first_letter}",
@@ -1196,13 +1193,6 @@ class User < ActiveRecord::Base
     user_warnings.count
   end
 
-  def flags_received_count
-    posts
-      .includes(:post_actions)
-      .where("post_actions.post_action_type_id" => PostActionType.flag_types_without_custom.values)
-      .count
-  end
-
   def private_topics_count
     topics_allowed.where(archetype: Archetype.private_message).count
   end
@@ -1501,15 +1491,7 @@ class User < ActiveRecord::Base
   def user_fields(field_ids = nil)
     field_ids = (@all_user_field_ids ||= UserField.pluck(:id)) if field_ids.nil?
 
-    @user_fields_cache ||= {}
-
-    # Memoize based on requested fields
-    @user_fields_cache[field_ids.join(":")] ||= {}.tap do |hash|
-      field_ids.each do |fid|
-        # The hash keys are strings for backwards compatibility
-        hash[fid.to_s] = custom_fields["#{USER_FIELD_PREFIX}#{fid}"]
-      end
-    end
+    field_ids.map { |fid| [fid.to_s, custom_fields["#{USER_FIELD_PREFIX}#{fid}"]] }.to_h
   end
 
   def validatable_user_fields_values
@@ -1522,7 +1504,9 @@ class User < ActiveRecord::Base
 
   def apply_watched_words
     validatable_user_fields.each do |id, value|
-      set_user_field(id, WordWatcher.apply_to_text(value))
+      field = WordWatcher.censor_text(value)
+      field = WordWatcher.replace_text(field)
+      set_user_field(id, field)
     end
   end
 
@@ -1539,11 +1523,17 @@ class User < ActiveRecord::Base
   end
 
   def number_of_flagged_posts
-    ReviewableFlaggedPost.where(target_created_by: self.id).count
+    posts
+      .with_deleted
+      .includes(:post_actions)
+      .where("post_actions.post_action_type_id" => PostActionType.flag_types_without_custom.values)
+      .where("post_actions.agreed_at IS NOT NULL")
+      .count
   end
+  alias_method :flags_received_count, :number_of_flagged_posts
 
   def number_of_rejected_posts
-    ReviewableQueuedPost.rejected.where(created_by_id: self.id).count
+    ReviewableQueuedPost.rejected.where(target_created_by_id: self.id).count
   end
 
   def number_of_flags_given
@@ -1682,11 +1672,11 @@ class User < ActiveRecord::Base
       group_titles_query.order("groups.id = #{primary_group_id} DESC") if primary_group_id
     group_titles_query = group_titles_query.order("groups.primary_group DESC").limit(1)
 
-    if next_best_group_title = group_titles_query.pluck_first(:title)
+    if next_best_group_title = group_titles_query.pick(:title)
       return next_best_group_title
     end
 
-    next_best_badge_title = badges.where(allow_title: true).pluck_first(:name)
+    next_best_badge_title = badges.where(allow_title: true).pick(:name)
     next_best_badge_title ? Badge.display_name(next_best_badge_title) : nil
   end
 
@@ -1807,8 +1797,20 @@ class User < ActiveRecord::Base
     user_status && !user_status.expired?
   end
 
-  def redesigned_user_menu_enabled?
-    !SiteSetting.legacy_navigation_menu?
+  def new_new_view_enabled?
+    in_any_groups?(SiteSetting.experimental_new_new_view_groups_map)
+  end
+
+  def experimental_search_menu_groups_enabled?
+    in_any_groups?(SiteSetting.experimental_search_menu_groups_map)
+  end
+
+  def watched_precedence_over_muted
+    if user_option.watched_precedence_over_muted.nil?
+      SiteSetting.watched_precedence_over_muted
+    else
+      user_option.watched_precedence_over_muted
+    end
   end
 
   protected
@@ -1855,8 +1857,9 @@ class User < ActiveRecord::Base
 
   def ensure_password_is_hashed
     if @raw_password
-      self.salt = SecureRandom.hex(16)
-      self.password_hash = hash_password(@raw_password, salt)
+      self.salt = SecureRandom.hex(PASSWORD_SALT_LENGTH)
+      self.password_algorithm = TARGET_PASSWORD_ALGORITHM
+      self.password_hash = hash_password(@raw_password, salt, password_algorithm)
     end
   end
 
@@ -1872,14 +1875,9 @@ class User < ActiveRecord::Base
     end
   end
 
-  def hash_password(password, salt)
+  def hash_password(password, salt, algorithm)
     raise StandardError.new("password is too long") if password.size > User.max_password_length
-    Pbkdf2.hash_password(
-      password,
-      salt,
-      Rails.configuration.pbkdf2_iterations,
-      Rails.configuration.pbkdf2_algorithm,
-    )
+    PasswordHasher.hash_password(password: password, salt: salt, algorithm: algorithm)
   end
 
   def add_trust_level
@@ -1961,7 +1959,7 @@ class User < ActiveRecord::Base
       end
     end
 
-    CategoryUser.insert_all!(values) if values.present?
+    CategoryUser.insert_all(values) if values.present?
   end
 
   def set_default_tags_preferences
@@ -2029,9 +2027,7 @@ class User < ActiveRecord::Base
   def match_primary_group_changes
     return unless primary_group_id_changed?
 
-    if title == Group.where(id: primary_group_id_was).pluck_first(:title)
-      self.title = primary_group&.title
-    end
+    self.title = primary_group&.title if Group.exists?(id: primary_group_id_was, title: title)
 
     self.flair_group_id = primary_group&.id if flair_group_id == primary_group_id_was
   end
@@ -2042,7 +2038,7 @@ class User < ActiveRecord::Base
       .human_users
       .joins(:user_auth_tokens)
       .order("user_auth_tokens.created_at")
-      .pluck_first(:id)
+      .pick(:id)
   end
 
   private
@@ -2051,18 +2047,8 @@ class User < ActiveRecord::Base
     return if SiteSetting.legacy_navigation_menu?
     return if staged? || bot?
 
-    if SiteSetting.default_sidebar_categories.present?
-      categories_to_update = SiteSetting.default_sidebar_categories.split("|")
-
-      if update
-        filtered_default_category_ids =
-          Category.secured(self.guardian).where(id: categories_to_update).pluck(:id)
-        existing_category_ids =
-          SidebarSectionLink.where(user: self, linkable_type: "Category").pluck(:linkable_id)
-
-        categories_to_update =
-          existing_category_ids + (filtered_default_category_ids & self.secure_category_ids)
-      end
+    if SiteSetting.default_navigation_menu_categories.present?
+      categories_to_update = SiteSetting.default_navigation_menu_categories.split("|")
 
       SidebarSectionLinksUpdater.update_category_section_links(
         self,
@@ -2070,40 +2056,14 @@ class User < ActiveRecord::Base
       )
     end
 
-    if SiteSetting.tagging_enabled && SiteSetting.default_sidebar_tags.present?
-      tags_to_update = SiteSetting.default_sidebar_tags.split("|")
-
-      if update
-        default_tag_ids = Tag.where(name: tags_to_update).pluck(:id)
-        filtered_default_tags =
-          DiscourseTagging
-            .filter_visible(Tag, self.guardian)
-            .where(id: default_tag_ids)
-            .pluck(:name)
-
-        existing_tag_ids =
-          SidebarSectionLink.where(user: self, linkable_type: "Tag").pluck(:linkable_id)
-        existing_tags =
-          DiscourseTagging
-            .filter_visible(Tag, self.guardian)
-            .where(id: existing_tag_ids)
-            .pluck(:name)
-
-        tags_to_update = existing_tags + (filtered_default_tags & DiscourseTagging.hidden_tag_names)
-      end
-
-      SidebarSectionLinksUpdater.update_tag_section_links(self, tag_names: tags_to_update)
+    if SiteSetting.tagging_enabled && SiteSetting.default_navigation_menu_tags.present?
+      SidebarSectionLinksUpdater.update_tag_section_links(
+        self,
+        tag_ids: Tag.where(name: SiteSetting.default_navigation_menu_tags.split("|")).pluck(:id),
+      )
     end
   end
 
-  def add_default_sidebar_section_links
-    set_default_sidebar_section_links
-  end
-
-  def update_default_sidebar_section_links
-    set_default_sidebar_section_links(update: true)
-  end
-
   def stat
     user_stat || create_user_stat
   end
@@ -2125,10 +2085,7 @@ class User < ActiveRecord::Base
           badges.find do |badge|
             badge.allow_title? && (badge.display_name == title || badge.name == title)
           end
-      user_profile.update(
-        badge_granted_title: badge_matching_title.present?,
-        granted_title_badge_id: badge_matching_title&.id,
-      )
+      user_profile.update!(granted_title_badge_id: badge_matching_title&.id)
     end
   end
 
@@ -2141,6 +2098,10 @@ class User < ActiveRecord::Base
     update_column(:previous_visit_at, last_seen_at) if previous_visit_at_update_required?(timestamp)
   end
 
+  def change_display_name
+    Jobs.enqueue(:change_display_name, user_id: id, old_name: name_before_last_save, new_name: name)
+  end
+
   def trigger_user_created_event
     DiscourseEvent.trigger(:user_created, self)
     true
@@ -2226,15 +2187,18 @@ end
 #  secure_identifier         :string
 #  flair_group_id            :integer
 #  last_seen_reviewable_id   :integer
+#  password_algorithm        :string(64)
 #
 # Indexes
 #
-#  idx_users_admin                    (id) WHERE admin
-#  idx_users_moderator                (id) WHERE moderator
-#  index_users_on_last_posted_at      (last_posted_at)
-#  index_users_on_last_seen_at        (last_seen_at)
-#  index_users_on_secure_identifier   (secure_identifier) UNIQUE
-#  index_users_on_uploaded_avatar_id  (uploaded_avatar_id)
-#  index_users_on_username            (username) UNIQUE
-#  index_users_on_username_lower      (username_lower) UNIQUE
+#  idx_users_admin                     (id) WHERE admin
+#  idx_users_moderator                 (id) WHERE moderator
+#  index_users_on_last_posted_at       (last_posted_at)
+#  index_users_on_last_seen_at         (last_seen_at)
+#  index_users_on_name_trgm            (name) USING gist
+#  index_users_on_secure_identifier    (secure_identifier) UNIQUE
+#  index_users_on_uploaded_avatar_id   (uploaded_avatar_id)
+#  index_users_on_username             (username) UNIQUE
+#  index_users_on_username_lower       (username_lower) UNIQUE
+#  index_users_on_username_lower_trgm  (username_lower) USING gist
 #
diff --git a/app/models/user_action.rb b/app/models/user_action.rb
index d605324de47..f53ce04a6bf 100644
--- a/app/models/user_action.rb
+++ b/app/models/user_action.rb
@@ -69,7 +69,7 @@ class UserAction < ActiveRecord::Base
     UserAction
       .where(user_id: user_id, target_topic_id: topic_id, action_type: [RESPONSE, MENTION, QUOTE])
       .order("created_at DESC")
-      .pluck_first(:target_post_id)
+      .pick(:target_post_id)
   end
 
   def self.stats(user_id, guardian)
@@ -411,9 +411,7 @@ class UserAction < ActiveRecord::Base
       visible_post_types: visible_post_types,
     )
 
-    unless (guardian.user && guardian.user.id == user_id) || guardian.is_staff?
-      builder.where("t.visible")
-    end
+    builder.where("t.visible") if guardian.user&.id != user_id && !guardian.is_staff?
 
     filter_private_messages(builder, user_id, guardian, ignore_private_messages)
     filter_categories(builder, guardian)
diff --git a/app/models/user_avatar.rb b/app/models/user_avatar.rb
index 20f0e1d21bb..fa830b3fa46 100644
--- a/app/models/user_avatar.rb
+++ b/app/models/user_avatar.rb
@@ -144,13 +144,13 @@ class UserAvatar < ActiveRecord::Base
         user.update!(uploaded_avatar_id: upload.id)
       end
     end
-  rescue Net::ReadTimeout, OpenURI::HTTPError
-    # skip saving, we are not connected to the net
+  rescue Net::ReadTimeout, OpenURI::HTTPError, FinalDestination::SSRFError
+    # Skip saving. We are not connected to the net, or SSRF checks failed.
   ensure
     tempfile.close! if tempfile && tempfile.respond_to?(:close!)
   end
 
-  def self.ensure_consistency!
+  def self.ensure_consistency!(max_optimized_avatars_to_remove: 20_000)
     DB.exec <<~SQL
       UPDATE user_avatars
       SET gravatar_upload_id = NULL
@@ -174,6 +174,29 @@ class UserAvatar < ActiveRecord::Base
           up.id IS NULL
       )
     SQL
+
+    ids =
+      DB.query_single(<<~SQL, sizes: Discourse.avatar_sizes, limit: max_optimized_avatars_to_remove)
+      SELECT oi.id FROM user_avatars a
+      JOIN optimized_images oi ON oi.upload_id = a.custom_upload_id
+      LEFT JOIN upload_references ur ON ur.upload_id = a.custom_upload_id and ur.target_type <> 'UserAvatar'
+      WHERE oi.width not in (:sizes) AND oi.height not in (:sizes) AND ur.upload_id IS NULL
+      LIMIT :limit
+    SQL
+
+    warnings_reported = 0
+
+    ids.each do |id|
+      begin
+        OptimizedImage.find(id).destroy!
+      rescue ActiveRecord::RecordNotFound
+      rescue => e
+        if warnings_reported < 10
+          Discourse.warn_exception(e, message: "Failed to remove optimized image")
+          warnings_reported += 1
+        end
+      end
+    end
   end
 end
 
diff --git a/app/models/user_badge.rb b/app/models/user_badge.rb
index dd919156314..618632656c1 100644
--- a/app/models/user_badge.rb
+++ b/app/models/user_badge.rb
@@ -48,7 +48,9 @@ class UserBadge < ActiveRecord::Base
     Badge.decrement_counter "grant_count", self.badge_id
     UserStat.update_distinct_badge_count self.user_id
     UserBadge.update_featured_ranks! self.user_id
+
     DiscourseEvent.trigger(:user_badge_removed, self.badge_id, self.user_id)
+    DiscourseEvent.trigger(:user_badge_revoked, user_badge: self)
   end
 
   def self.ensure_consistency!
diff --git a/app/models/user_history.rb b/app/models/user_history.rb
index e3a98fe9b27..796dcd48bcb 100644
--- a/app/models/user_history.rb
+++ b/app/models/user_history.rb
@@ -119,6 +119,11 @@ class UserHistory < ActiveRecord::Base
         watched_word_create: 97,
         watched_word_destroy: 98,
         delete_group: 99,
+        permanently_delete_post_revisions: 100,
+        create_public_sidebar_section: 101,
+        update_public_sidebar_section: 102,
+        destroy_public_sidebar_section: 103,
+        reset_bounce_score: 104,
       )
   end
 
@@ -213,6 +218,17 @@ class UserHistory < ActiveRecord::Base
       watched_word_create
       watched_word_destroy
       delete_group
+      permanently_delete_post_revisions
+      create_public_sidebar_section
+      update_public_sidebar_section
+      destroy_public_sidebar_section
+      reset_bounce_score
+      update_directory_columns
+      deleted_unused_tags
+      renamed_tag
+      deleted_tag
+      chat_channel_status_change
+      chat_auto_remove_membership
     ]
   end
 
diff --git a/app/models/user_option.rb b/app/models/user_option.rb
index 70d80d80522..87232465f5d 100644
--- a/app/models/user_option.rb
+++ b/app/models/user_option.rb
@@ -3,6 +3,7 @@
 class UserOption < ActiveRecord::Base
   self.ignored_columns = [
     "disable_jump_reply", # Remove once 20210706091905 is promoted from post_deploy to regular migration
+    "sidebar_list_destination", # TODO(osama): Remove in January 2024
   ]
 
   self.primary_key = :user_id
@@ -14,12 +15,6 @@ class UserOption < ActiveRecord::Base
   scope :human_users, -> { where("user_id > 0") }
 
   enum default_calendar: { none_selected: 0, ics: 1, google: 2 }, _scopes: false
-  enum sidebar_list_destination: {
-         none_selected: 0,
-         default: 0,
-         unread_new: 1,
-       },
-       _prefix: "sidebar_list"
 
   def self.ensure_consistency!
     sql = <<~SQL
@@ -94,6 +89,8 @@ class UserOption < ActiveRecord::Base
     self.title_count_mode = SiteSetting.default_title_count_mode
 
     self.hide_profile_and_presence = SiteSetting.default_hide_profile_and_presence
+    self.sidebar_link_to_filtered_list = SiteSetting.default_sidebar_link_to_filtered_list
+    self.sidebar_show_count_of_new_items = SiteSetting.default_sidebar_show_count_of_new_items
 
     true
   end
@@ -291,10 +288,14 @@ end
 #  chat_email_frequency                 :integer          default(1), not null
 #  enable_experimental_sidebar          :boolean          default(FALSE)
 #  seen_popups                          :integer          is an Array
-#  sidebar_list_destination             :integer          default("none_selected"), not null
+#  chat_header_indicator_preference     :integer          default(0), not null
+#  sidebar_link_to_filtered_list        :boolean          default(FALSE), not null
+#  sidebar_show_count_of_new_items      :boolean          default(FALSE), not null
+#  watched_precedence_over_muted        :boolean
 #
 # Indexes
 #
-#  index_user_options_on_user_id                       (user_id) UNIQUE
-#  index_user_options_on_user_id_and_default_calendar  (user_id,default_calendar)
+#  index_user_options_on_user_id                        (user_id) UNIQUE
+#  index_user_options_on_user_id_and_default_calendar   (user_id,default_calendar)
+#  index_user_options_on_watched_precedence_over_muted  (watched_precedence_over_muted)
 #
diff --git a/app/models/user_profile.rb b/app/models/user_profile.rb
index 2ed6d1b0279..dc621885653 100644
--- a/app/models/user_profile.rb
+++ b/app/models/user_profile.rb
@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
 class UserProfile < ActiveRecord::Base
+  # TODO Remove `badge_granted_title` after 2023-09-01
+  self.ignored_columns = ["badge_granted_title"]
+
   BAKED_VERSION = 1
 
   belongs_to :user, inverse_of: :user_profile
@@ -45,7 +48,7 @@ class UserProfile < ActiveRecord::Base
 
   def bio_excerpt(length = 350, opts = {})
     return nil if bio_cooked.blank?
-    excerpt = PrettyText.excerpt(bio_cooked, length, opts).sub(/<br>$/, "")
+    excerpt = PrettyText.excerpt(bio_cooked, length, opts).sub(/<br>\z/, "")
     return excerpt if excerpt.blank? || (user.has_trust_level?(TrustLevel[1]) && !user.suspended?)
     PrettyText.strip_links(excerpt)
   end
@@ -227,7 +230,6 @@ end
 #  bio_cooked                   :text
 #  dismissed_banner_key         :integer
 #  bio_cooked_version           :integer
-#  badge_granted_title          :boolean          default(FALSE)
 #  views                        :integer          default(0), not null
 #  profile_background_upload_id :integer
 #  card_background_upload_id    :integer
diff --git a/app/models/user_search.rb b/app/models/user_search.rb
index 7b21ff6b7fe..5f848666721 100644
--- a/app/models/user_search.rb
+++ b/app/models/user_search.rb
@@ -26,6 +26,7 @@ class UserSearch
 
   def scoped_users
     users = User.where(active: true)
+    users = users.where(approved: true) if SiteSetting.must_approve_users?
     users = users.where(staged: false) unless @include_staged_users
     users = users.not_suspended unless @searching_user&.staff?
 
@@ -160,6 +161,8 @@ class UserSearch
         .each { |id| users << id }
     end
 
+    return users.to_a if users.size >= @limit
+
     # 5. last seen users (for search auto-suggestions)
     if @last_seen_users
       scoped_users
@@ -169,6 +172,27 @@ class UserSearch
         .each { |id| users << id }
     end
 
+    return users.to_a if users.size >= @limit
+
+    # 6. similar usernames / names
+    if @term.present? && SiteSetting.user_search_similar_results
+      if SiteSetting.enable_names?
+        scoped_users
+          .where("username_lower <-> ? < 1 OR name <-> ? < 1", @term, @term)
+          .order(["LEAST(username_lower <-> ?, name <-> ?) ASC", @term, @term])
+          .limit(@limit - users.size)
+          .pluck(:id)
+          .each { |id| users << id }
+      else
+        scoped_users
+          .where("username_lower <-> ? < 1", @term)
+          .order(["username_lower <-> ? ASC", @term])
+          .limit(@limit - users.size)
+          .pluck(:id)
+          .each { |id| users << id }
+      end
+    end
+
     users.to_a
   end
 
diff --git a/app/models/user_status.rb b/app/models/user_status.rb
index 08cb9dea1ea..d163119ad70 100644
--- a/app/models/user_status.rb
+++ b/app/models/user_status.rb
@@ -1,8 +1,12 @@
 # frozen_string_literal: true
 
 class UserStatus < ActiveRecord::Base
+  MAX_DESCRIPTION_LENGTH = 100
+
   belongs_to :user
 
+  validate :emoji_exists
+  validates :description, length: { maximum: MAX_DESCRIPTION_LENGTH }
   validate :ends_at_greater_than_set_at,
            if: Proc.new { |t| t.will_save_change_to_set_at? || t.will_save_change_to_ends_at? }
 
@@ -10,6 +14,10 @@ class UserStatus < ActiveRecord::Base
     ends_at && ends_at < Time.zone.now
   end
 
+  def emoji_exists
+    errors.add(:emoji, :invalid) if emoji && !Emoji.exists?(emoji)
+  end
+
   def ends_at_greater_than_set_at
     if ends_at && set_at > ends_at
       errors.add(:ends_at, I18n.t("user_status.errors.ends_at_should_be_greater_than_set_at"))
diff --git a/app/models/username_validator.rb b/app/models/username_validator.rb
index 8c82653b205..9e909401ea8 100644
--- a/app/models/username_validator.rb
+++ b/app/models/username_validator.rb
@@ -40,13 +40,40 @@ class UsernameValidator
     errors.empty?
   end
 
-  CONFUSING_EXTENSIONS ||= /\.(js|json|css|htm|html|xml|jpg|jpeg|png|gif|bmp|ico|tif|tiff|woff)$/i
+  CONFUSING_EXTENSIONS ||= /\.(js|json|css|htm|html|xml|jpg|jpeg|png|gif|bmp|ico|tif|tiff|woff)\z/i
   MAX_CHARS ||= 60
 
   ASCII_INVALID_CHAR_PATTERN ||= /[^\w.-]/
-  UNICODE_INVALID_CHAR_PATTERN ||= /[^\p{Alnum}\p{M}._-]/
-  INVALID_LEADING_CHAR_PATTERN ||= /^[^\p{Alnum}\p{M}_]+/
-  INVALID_TRAILING_CHAR_PATTERN ||= /[^\p{Alnum}\p{M}]+$/
+  # All Unicode characters except for alphabetic and numeric character, marks and underscores are invalid.
+  # In addition to that, the following letters and nonspacing marks are invalid:
+  #   (U+034F) Combining Grapheme Joiner
+  #   (U+115F) Hangul Choseong Filler
+  #   (U+1160) Hangul Jungseong Filler
+  #   (U+17B4) Khmer Vowel Inherent Aq
+  #   (U+17B5) Khmer Vowel Inherent Aa
+  #   (U+180B - U+180D) Mongolian Free Variation Selectors
+  #   (U+3164) Hangul Filler
+  #   (U+FFA0) Halfwidth Hangul Filler
+  #   (U+FE00 - U+FE0F) "Variation Selectors" block
+  #   (U+E0100 - U+E01EF) "Variation Selectors Supplement" block
+  UNICODE_INVALID_CHAR_PATTERN ||=
+    /
+      [^\p{Alnum}\p{M}._-]|
+      [
+        \u{034F}
+        \u{115F}
+        \u{1160}
+        \u{17B4}
+        \u{17B5}
+        \u{180B}-\u{180D}
+        \u{3164}
+        \u{FFA0}
+        \p{In Variation Selectors}
+        \p{In Variation Selectors Supplement}
+      ]
+    /x
+  INVALID_LEADING_CHAR_PATTERN ||= /\A[^\p{Alnum}\p{M}_]+/
+  INVALID_TRAILING_CHAR_PATTERN ||= /[^\p{Alnum}\p{M}]+\z/
   REPEATED_SPECIAL_CHAR_PATTERN ||= /[-_.]{2,}/
 
   private
diff --git a/app/models/watched_word.rb b/app/models/watched_word.rb
index e493f50e416..3e9b4d5b575 100644
--- a/app/models/watched_word.rb
+++ b/app/models/watched_word.rb
@@ -19,7 +19,7 @@ class WatchedWord < ActiveRecord::Base
 
   before_validation do
     self.word = self.class.normalize_word(self.word)
-    if self.action == WatchedWord.actions[:link] && !(self.replacement =~ %r{^https?://})
+    if self.action == WatchedWord.actions[:link] && !(self.replacement =~ %r{\Ahttps?://})
       self.replacement =
         "#{Discourse.base_url}#{self.replacement&.starts_with?("/") ? "" : "/"}#{self.replacement}"
     end
diff --git a/app/models/web_crawler_request.rb b/app/models/web_crawler_request.rb
index c1660f65555..8be7be49e01 100644
--- a/app/models/web_crawler_request.rb
+++ b/app/models/web_crawler_request.rb
@@ -24,7 +24,7 @@ class WebCrawlerRequest < ActiveRecord::Base
   protected
 
   def self.request_id(date:, user_agent:, retries: 0)
-    id = where(date: date, user_agent: user_agent).pluck_first(:id)
+    id = where(date: date, user_agent: user_agent).pick(:id)
     id ||= create!({ date: date, user_agent: user_agent }.merge(count: 0)).id
   rescue StandardError # primary key violation
     if retries == 0
diff --git a/app/models/web_hook.rb b/app/models/web_hook.rb
index 7ebfd01de10..4263f27fa1a 100644
--- a/app/models/web_hook.rb
+++ b/app/models/web_hook.rb
@@ -68,7 +68,7 @@ class WebHook < ActiveRecord::Base
     if active_web_hooks("topic").exists? && topic.present?
       payload ||=
         begin
-          topic_view = TopicView.new(topic.id, Discourse.system_user)
+          topic_view = TopicView.new(topic.id, Discourse.system_user, skip_staff_action: true)
           WebHook.generate_payload(:topic, topic_view, WebHookTopicViewSerializer)
         end
 
diff --git a/app/serializers/admin_form_template_serializer.rb b/app/serializers/admin_form_template_serializer.rb
new file mode 100644
index 00000000000..e6bdf3c1d5a
--- /dev/null
+++ b/app/serializers/admin_form_template_serializer.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class AdminFormTemplateSerializer < ApplicationSerializer
+  attributes :id, :name, :template
+end
diff --git a/app/serializers/admin_plugin_serializer.rb b/app/serializers/admin_plugin_serializer.rb
index 75a0771612c..e80e157fc94 100644
--- a/app/serializers/admin_plugin_serializer.rb
+++ b/app/serializers/admin_plugin_serializer.rb
@@ -10,7 +10,9 @@ class AdminPluginSerializer < ApplicationSerializer
              :enabled,
              :enabled_setting,
              :has_settings,
-             :is_official
+             :is_official,
+             :commit_hash,
+             :commit_url
 
   def id
     object.directory_name
@@ -68,4 +70,12 @@ class AdminPluginSerializer < ApplicationSerializer
   def is_official
     Plugin::Metadata::OFFICIAL_PLUGINS.include?(object.name)
   end
+
+  def commit_hash
+    object.commit_hash
+  end
+
+  def commit_url
+    object.commit_url
+  end
 end
diff --git a/app/serializers/basic_group_serializer.rb b/app/serializers/basic_group_serializer.rb
index ab64df800a1..f5d4c80d365 100644
--- a/app/serializers/basic_group_serializer.rb
+++ b/app/serializers/basic_group_serializer.rb
@@ -31,6 +31,7 @@ class BasicGroupSerializer < ApplicationSerializer
              :members_visibility_level,
              :can_see_members,
              :can_admin_group,
+             :can_edit_group,
              :publish_read_state
 
   def include_display_name?
@@ -73,6 +74,14 @@ class BasicGroupSerializer < ApplicationSerializer
     owner_group_ids.present?
   end
 
+  def can_edit_group
+    scope.can_edit_group?(object)
+  end
+
+  def include_can_edit_group?
+    scope.can_edit_group?(object)
+  end
+
   def can_admin_group
     scope.can_admin_group?(object)
   end
diff --git a/app/serializers/basic_theme_serializer.rb b/app/serializers/basic_theme_serializer.rb
new file mode 100644
index 00000000000..c0affe8c61a
--- /dev/null
+++ b/app/serializers/basic_theme_serializer.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class BasicThemeSerializer < ApplicationSerializer
+  attributes :id, :name, :created_at, :updated_at, :default, :component
+
+  def include_default?
+    object.id == SiteSetting.default_theme_id
+  end
+
+  def default
+    true
+  end
+end
diff --git a/app/serializers/category_serializer.rb b/app/serializers/category_serializer.rb
index d2bfbb16121..08b92ac6a5e 100644
--- a/app/serializers/category_serializer.rb
+++ b/app/serializers/category_serializer.rb
@@ -1,6 +1,13 @@
 # frozen_string_literal: true
 
 class CategorySerializer < SiteCategorySerializer
+  class CategorySettingSerializer < ApplicationSerializer
+    attributes :auto_bump_cooldown_days,
+               :num_auto_bump_daily,
+               :require_reply_approval,
+               :require_topic_approval
+  end
+
   attributes :read_restricted,
              :available_groups,
              :auto_close_hours,
@@ -22,6 +29,8 @@ class CategorySerializer < SiteCategorySerializer
              :reviewable_by_group_name,
              :default_slow_mode_seconds
 
+  has_one :category_setting, serializer: CategorySettingSerializer, embed: :objects
+
   def reviewable_by_group_name
     object.reviewable_by_group.name
   end
@@ -30,6 +39,10 @@ class CategorySerializer < SiteCategorySerializer
     SiteSetting.enable_category_group_moderation? && object.reviewable_by_group_id.present?
   end
 
+  def include_category_setting?
+    object.association(:category_setting).loaded?
+  end
+
   def group_permissions
     @group_permissions ||=
       begin
diff --git a/app/serializers/color_scheme_serializer.rb b/app/serializers/color_scheme_serializer.rb
index f8ae507a86c..cbc492db8c9 100644
--- a/app/serializers/color_scheme_serializer.rb
+++ b/app/serializers/color_scheme_serializer.rb
@@ -11,4 +11,11 @@ class ColorSchemeSerializer < ApplicationSerializer
   def theme_id
     object.theme&.id
   end
+
+  def colors
+    db_colors = object.colors.index_by(&:name)
+    object.resolved_colors.map do |name, default|
+      db_colors[name] || ColorSchemeColor.new(name: name, hex: default, color_scheme: object)
+    end
+  end
 end
diff --git a/app/serializers/concerns/navigation_menu_tags_mixin.rb b/app/serializers/concerns/navigation_menu_tags_mixin.rb
new file mode 100644
index 00000000000..55adb1be0ae
--- /dev/null
+++ b/app/serializers/concerns/navigation_menu_tags_mixin.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module NavigationMenuTagsMixin
+  def serialize_tags(tags)
+    topic_count_column = Tag.topic_count_column(scope)
+
+    tags
+      .select(:name, topic_count_column, :pm_topic_count, :description)
+      .order(topic_count_column => :desc)
+      .map { |tag| SidebarTagSerializer.new(tag, scope: scope, root: false).as_json }
+  end
+end
diff --git a/app/serializers/concerns/user_primary_group_mixin.rb b/app/serializers/concerns/user_primary_group_mixin.rb
index 0bd2538b1eb..3a0de3e4c45 100644
--- a/app/serializers/concerns/user_primary_group_mixin.rb
+++ b/app/serializers/concerns/user_primary_group_mixin.rb
@@ -7,6 +7,7 @@ module UserPrimaryGroupMixin
                      :flair_url,
                      :flair_bg_color,
                      :flair_color,
+                     :flair_group_id,
                      :admin,
                      :moderator,
                      :trust_level
@@ -24,7 +25,7 @@ module UserPrimaryGroupMixin
     object&.flair_group&.name
   end
 
-  def include_flair_group_name?
+  def include_flair_name?
     object&.flair_group.present?
   end
 
@@ -44,6 +45,14 @@ module UserPrimaryGroupMixin
     object&.flair_group&.flair_bg_color.present?
   end
 
+  def flair_group_id
+    object&.flair_group_id
+  end
+
+  def include_flair_group_id?
+    object&.flair_group_id.present?
+  end
+
   def flair_color
     object&.flair_group&.flair_color
   end
diff --git a/app/serializers/concerns/user_sidebar_mixin.rb b/app/serializers/concerns/user_sidebar_mixin.rb
index 5f8c5add0a1..549ca54c695 100644
--- a/app/serializers/concerns/user_sidebar_mixin.rb
+++ b/app/serializers/concerns/user_sidebar_mixin.rb
@@ -1,15 +1,10 @@
 # frozen_string_literal: true
 
 module UserSidebarMixin
-  def sidebar_tags
-    topic_count_column = Tag.topic_count_column(scope)
+  include NavigationMenuTagsMixin
 
-    object
-      .visible_sidebar_tags(scope)
-      .pluck(:name, topic_count_column, :pm_topic_count)
-      .reduce([]) do |tags, sidebar_tag|
-        tags.push(name: sidebar_tag[0], pm_only: sidebar_tag[1] == 0 && sidebar_tag[2] > 0)
-      end
+  def sidebar_tags
+    serialize_tags(object.visible_sidebar_tags(scope))
   end
 
   def display_sidebar_tags
@@ -25,28 +20,29 @@ module UserSidebarMixin
   end
 
   def sidebar_category_ids
-    object.category_sidebar_section_links.pluck(:linkable_id) & scope.allowed_category_ids
+    object.secured_sidebar_category_ids(scope)
   end
 
   def include_sidebar_category_ids?
     sidebar_navigation_menu?
   end
 
-  def sidebar_list_destination
-    if object.user_option.sidebar_list_none_selected?
-      SiteSetting.default_sidebar_list_destination
-    else
-      object.user_option.sidebar_list_destination
-    end
+  def sidebar_sections
+    object
+      .sidebar_sections
+      .order(created_at: :asc)
+      .includes(sidebar_section_links: :linkable)
+      .map { |section| SidebarSectionSerializer.new(section, root: false) }
   end
 
-  def include_sidebar_list_destination?
+  def include_sidebar_sections?
     sidebar_navigation_menu?
   end
 
   private
 
   def sidebar_navigation_menu?
-    !SiteSetting.legacy_navigation_menu? || options[:enable_sidebar_param] == "1"
+    !SiteSetting.legacy_navigation_menu? ||
+      %w[sidebar header_dropdown].include?(options[:navigation_menu_param])
   end
 end
diff --git a/app/serializers/current_user_option_serializer.rb b/app/serializers/current_user_option_serializer.rb
index 93c57a49049..09810ff33f7 100644
--- a/app/serializers/current_user_option_serializer.rb
+++ b/app/serializers/current_user_option_serializer.rb
@@ -17,7 +17,9 @@ class CurrentUserOptionSerializer < ApplicationSerializer
              :seen_popups,
              :should_be_redirected_to_top,
              :redirected_to_top,
-             :treat_as_new_topic_start_date
+             :treat_as_new_topic_start_date,
+             :sidebar_link_to_filtered_list,
+             :sidebar_show_count_of_new_items
 
   def likes_notifications_disabled
     object.likes_notifications_disabled?
diff --git a/app/serializers/current_user_serializer.rb b/app/serializers/current_user_serializer.rb
index 9a7cb1d9f11..d012d70052d 100644
--- a/app/serializers/current_user_serializer.rb
+++ b/app/serializers/current_user_serializer.rb
@@ -6,7 +6,6 @@ class CurrentUserSerializer < BasicUserSerializer
 
   attributes :name,
              :unread_notifications,
-             :unread_private_messages,
              :unread_high_priority_notifications,
              :all_unread_notifications_count,
              :read_first_notification?,
@@ -63,19 +62,27 @@ class CurrentUserSerializer < BasicUserSerializer
              :pending_posts_count,
              :status,
              :grouped_unread_notifications,
-             :redesigned_user_menu_enabled,
-             :redesigned_user_page_nav_enabled,
-             :redesigned_topic_timeline_enabled,
              :display_sidebar_tags,
              :sidebar_tags,
              :sidebar_category_ids,
-             :sidebar_list_destination
+             :sidebar_sections,
+             :new_new_view_enabled?,
+             :experimental_search_menu_groups_enabled?
 
   delegate :user_stat, to: :object, private: true
   delegate :any_posts, :draft_count, :pending_posts_count, :read_faq?, to: :user_stat
 
   has_one :user_option, embed: :object, serializer: CurrentUserOptionSerializer
 
+  def sidebar_sections
+    SidebarSection
+      .public_sections
+      .or(SidebarSection.where(user_id: object.id))
+      .includes(:sidebar_urls)
+      .order("(section_type IS NOT NULL) DESC, (public IS TRUE) DESC")
+      .map { |section| SidebarSectionSerializer.new(section, root: false) }
+  end
+
   def groups
     owned_group_ids = GroupUser.where(user_id: id, owner: true).pluck(:group_id).to_set
 
@@ -271,42 +278,4 @@ class CurrentUserSerializer < BasicUserSerializer
   def unseen_reviewable_count
     Reviewable.unseen_reviewable_count(object)
   end
-
-  def redesigned_user_menu_enabled
-    object.redesigned_user_menu_enabled?
-  end
-
-  def include_all_unread_notifications_count?
-    redesigned_user_menu_enabled
-  end
-
-  def include_grouped_unread_notifications?
-    redesigned_user_menu_enabled
-  end
-
-  def include_unseen_reviewable_count?
-    redesigned_user_menu_enabled
-  end
-
-  def include_new_personal_messages_notifications_count?
-    redesigned_user_menu_enabled
-  end
-
-  def redesigned_user_page_nav_enabled
-    if SiteSetting.enable_new_user_profile_nav_groups.present?
-      object.in_any_groups?(SiteSetting.enable_new_user_profile_nav_groups_map)
-    else
-      false
-    end
-  end
-
-  def redesigned_topic_timeline_enabled
-    if SiteSetting.enable_experimental_topic_timeline_groups.present?
-      object.in_any_groups?(
-        SiteSetting.enable_experimental_topic_timeline_groups.split("|").map(&:to_i),
-      )
-    else
-      false
-    end
-  end
 end
diff --git a/app/serializers/form_template_serializer.rb b/app/serializers/form_template_serializer.rb
new file mode 100644
index 00000000000..6b7418c1752
--- /dev/null
+++ b/app/serializers/form_template_serializer.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class FormTemplateSerializer < ApplicationSerializer
+  attributes :id, :name, :template
+end
diff --git a/app/serializers/found_user_serializer.rb b/app/serializers/found_user_serializer.rb
index 6bdf045563f..4c2da44e614 100644
--- a/app/serializers/found_user_serializer.rb
+++ b/app/serializers/found_user_serializer.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class FoundUserSerializer < ApplicationSerializer
-  attributes :username, :name, :avatar_template
+  attributes :id, :username, :name, :avatar_template
 
   def include_name?
     SiteSetting.enable_names?
diff --git a/app/serializers/inactive_user_serializer.rb b/app/serializers/inactive_user_serializer.rb
new file mode 100644
index 00000000000..f76a02e6cf7
--- /dev/null
+++ b/app/serializers/inactive_user_serializer.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class InactiveUserSerializer < BasicUserSerializer
+  attributes :inactive
+
+  def inactive
+    !object.active?
+  end
+end
diff --git a/app/serializers/invite_serializer.rb b/app/serializers/invite_serializer.rb
index 5ca6021c9a1..9e49bdfa640 100644
--- a/app/serializers/invite_serializer.rb
+++ b/app/serializers/invite_serializer.rb
@@ -7,6 +7,7 @@ class InviteSerializer < ApplicationSerializer
              :email,
              :domain,
              :emailed,
+             :can_delete_invite,
              :max_redemptions_allowed,
              :redemption_count,
              :custom_message,
@@ -30,6 +31,10 @@ class InviteSerializer < ApplicationSerializer
     object.emailed_status != Invite.emailed_status_types[:not_required]
   end
 
+  def can_delete_invite
+    scope.is_admin? || object.invited_by_id == scope.current_user.id
+  end
+
   def include_custom_message?
     email.present?
   end
diff --git a/app/serializers/post_action_type_serializer.rb b/app/serializers/post_action_type_serializer.rb
index a829d91fd8e..c898b582a11 100644
--- a/app/serializers/post_action_type_serializer.rb
+++ b/app/serializers/post_action_type_serializer.rb
@@ -18,11 +18,11 @@ class PostActionTypeSerializer < ApplicationSerializer
   end
 
   def description
-    i18n("description", tos_url: tos_path, base_path: Discourse.base_path)
+    i18n("description", tos_url: tos_url, base_path: Discourse.base_path)
   end
 
   def short_description
-    i18n("short_description", tos_url: tos_path, base_path: Discourse.base_path)
+    i18n("short_description", tos_url: tos_url, base_path: Discourse.base_path)
   end
 
   def name_key
diff --git a/app/serializers/post_serializer.rb b/app/serializers/post_serializer.rb
index 78e559c031a..2998a074e5f 100644
--- a/app/serializers/post_serializer.rb
+++ b/app/serializers/post_serializer.rb
@@ -37,11 +37,13 @@ class PostSerializer < BasicPostSerializer
              :flair_url,
              :flair_bg_color,
              :flair_color,
+             :flair_group_id,
              :version,
              :can_edit,
              :can_delete,
              :can_permanently_delete,
              :can_recover,
+             :can_see_hidden_post,
              :can_wiki,
              :link_counts,
              :read,
@@ -179,6 +181,10 @@ class PostSerializer < BasicPostSerializer
     scope.can_recover_post?(object)
   end
 
+  def can_see_hidden_post
+    scope.can_see_hidden_post?(object)
+  end
+
   def can_wiki
     scope.can_wiki?(object)
   end
@@ -213,6 +219,10 @@ class PostSerializer < BasicPostSerializer
     object.user&.flair_group&.flair_color
   end
 
+  def flair_group_id
+    object.user&.flair_group_id
+  end
+
   def link_counts
     return @single_post_link_counts if @single_post_link_counts.present?
 
@@ -305,8 +315,14 @@ class PostSerializer < BasicPostSerializer
         summary.delete(:can_act)
       end
 
+      if actions.present? && SiteSetting.allow_anonymous_likes && sym == :like &&
+           !scope.can_delete_post_action?(actions[id])
+        summary.delete(:can_act)
+      end
+
       if actions.present? && actions.has_key?(id)
         summary[:acted] = true
+
         summary[:can_undo] = true if scope.can_delete?(actions[id])
       end
 
@@ -561,15 +577,22 @@ class PostSerializer < BasicPostSerializer
   end
 
   def mentioned_users
-    if @topic_view && (mentions = @topic_view.mentions[object.id])
-      users = mentions.map { |username| @topic_view.mentioned_users[username] }.compact
-    else
-      users = User.where(username: object.mentions)
-    end
+    users =
+      if @topic_view && (mentioned_users = @topic_view.mentioned_users[object.id])
+        mentioned_users
+      else
+        query = User
+        query = query.includes(:user_status) if SiteSetting.enable_user_status
+        query = query.where(username: object.mentions)
+      end
 
     users.map { |user| BasicUserWithStatusSerializer.new(user, root: false) }
   end
 
+  def include_mentioned_users?
+    SiteSetting.enable_user_status
+  end
+
   private
 
   def can_review_topic?
diff --git a/app/serializers/queued_post_serializer.rb b/app/serializers/queued_post_serializer.rb
index 91d64f26bfb..b8f59be95b7 100644
--- a/app/serializers/queued_post_serializer.rb
+++ b/app/serializers/queued_post_serializer.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-# Deprecated, should be removed once users have sufficient opportunity to do so
 class QueuedPostSerializer < ApplicationSerializer
   attributes(
     :id,
@@ -19,6 +18,11 @@ class QueuedPostSerializer < ApplicationSerializer
   has_one :created_by, serializer: AdminUserListSerializer, root: :users
   has_one :topic, serializer: BasicTopicSerializer
 
+  def initialize(object, options = {})
+    Discourse.deprecate("QueuedPostSerializer is deprecated.", drop_from: "3.3.0")
+    super
+  end
+
   def queue
     "default"
   end
diff --git a/app/serializers/remote_theme_serializer.rb b/app/serializers/remote_theme_serializer.rb
new file mode 100644
index 00000000000..4ba798ca479
--- /dev/null
+++ b/app/serializers/remote_theme_serializer.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+class RemoteThemeSerializer < ApplicationSerializer
+  attributes :id,
+             :remote_url,
+             :remote_version,
+             :local_version,
+             :commits_behind,
+             :branch,
+             :remote_updated_at,
+             :updated_at,
+             :github_diff_link,
+             :last_error_text,
+             :is_git?,
+             :license_url,
+             :about_url,
+             :authors,
+             :theme_version,
+             :minimum_discourse_version,
+             :maximum_discourse_version
+
+  # wow, AMS has some pretty nutty logic where it tries to find the path here
+  # from action dispatch, tell it not to
+  def about_url
+    object.about_url
+  end
+
+  def include_github_diff_link?
+    github_diff_link.present?
+  end
+end
diff --git a/app/serializers/reviewable_perform_result_serializer.rb b/app/serializers/reviewable_perform_result_serializer.rb
index 84b8974fa6d..5850d344c50 100644
--- a/app/serializers/reviewable_perform_result_serializer.rb
+++ b/app/serializers/reviewable_perform_result_serializer.rb
@@ -48,8 +48,4 @@ class ReviewablePerformResultSerializer < ApplicationSerializer
   def unseen_reviewable_count
     Reviewable.unseen_reviewable_count(scope.user)
   end
-
-  def include_unseen_reviewable_count?
-    scope.user.redesigned_user_menu_enabled?
-  end
 end
diff --git a/app/serializers/reviewable_score_type_serializer.rb b/app/serializers/reviewable_score_type_serializer.rb
index e31e5fafd9a..5db84b89201 100644
--- a/app/serializers/reviewable_score_type_serializer.rb
+++ b/app/serializers/reviewable_score_type_serializer.rb
@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
 class ReviewableScoreTypeSerializer < ApplicationSerializer
-  attributes :id, :title, :reviewable_priority, :icon
+  attributes :id, :title, :reviewable_priority, :icon, :type
+
+  def type
+    ReviewableScore.types[id]
+  end
 
   # Allow us to share post action type translations for backwards compatibility
   def title
diff --git a/app/serializers/search_post_serializer.rb b/app/serializers/search_post_serializer.rb
index 4d58c06ae2a..9c3cbd5eca2 100644
--- a/app/serializers/search_post_serializer.rb
+++ b/app/serializers/search_post_serializer.rb
@@ -6,7 +6,9 @@ class SearchPostSerializer < BasicPostSerializer
   attributes :like_count, :blurb, :post_number, :topic_title_headline
 
   def include_topic_title_headline?
-    if SiteSetting.use_pg_headlines_for_excerpt
+    if options[:result]
+      options[:result].use_pg_headlines_for_excerpt
+    elsif SiteSetting.use_pg_headlines_for_excerpt
       object.topic_title_headline.present?
     else
       false
diff --git a/app/serializers/sidebar_section_serializer.rb b/app/serializers/sidebar_section_serializer.rb
new file mode 100644
index 00000000000..a1b184589c1
--- /dev/null
+++ b/app/serializers/sidebar_section_serializer.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class SidebarSectionSerializer < ApplicationSerializer
+  attributes :id, :title, :links, :slug, :public, :section_type
+
+  def links
+    object.sidebar_urls.map { |sidebar_url| SidebarUrlSerializer.new(sidebar_url, root: false) }
+  end
+
+  def slug
+    object.title.parameterize
+  end
+end
diff --git a/app/serializers/sidebar_tag_serializer.rb b/app/serializers/sidebar_tag_serializer.rb
new file mode 100644
index 00000000000..7433950c423
--- /dev/null
+++ b/app/serializers/sidebar_tag_serializer.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class SidebarTagSerializer < ApplicationSerializer
+  attributes :name, :description, :pm_only
+
+  def pm_only
+    topic_count_column = Tag.topic_count_column(scope)
+    object.public_send(topic_count_column) == 0 && object.pm_topic_count > 0
+  end
+end
diff --git a/app/serializers/sidebar_url_serializer.rb b/app/serializers/sidebar_url_serializer.rb
new file mode 100644
index 00000000000..993aa92f6f2
--- /dev/null
+++ b/app/serializers/sidebar_url_serializer.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class SidebarUrlSerializer < ApplicationSerializer
+  attributes :id, :name, :value, :icon, :external, :full_reload, :segment
+
+  def external
+    object.external?
+  end
+
+  def full_reload
+    object.full_reload?
+  end
+end
diff --git a/app/serializers/site_category_serializer.rb b/app/serializers/site_category_serializer.rb
index 869e9b7868a..67a27c980b2 100644
--- a/app/serializers/site_category_serializer.rb
+++ b/app/serializers/site_category_serializer.rb
@@ -1,10 +1,18 @@
 # frozen_string_literal: true
 
 class SiteCategorySerializer < BasicCategorySerializer
-  attributes :allowed_tags, :allowed_tag_groups, :allow_global_tags, :read_only_banner
+  attributes :allowed_tags,
+             :allowed_tag_groups,
+             :allow_global_tags,
+             :read_only_banner,
+             :form_template_ids
 
   has_many :category_required_tag_groups, key: :required_tag_groups, embed: :objects
 
+  def form_template_ids
+    object.form_template_ids.sort
+  end
+
   def include_allowed_tags?
     SiteSetting.tagging_enabled
   end
diff --git a/app/serializers/site_serializer.rb b/app/serializers/site_serializer.rb
index 4aa21862328..ee8b027ebc9 100644
--- a/app/serializers/site_serializer.rb
+++ b/app/serializers/site_serializer.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class SiteSerializer < ApplicationSerializer
+  include NavigationMenuTagsMixin
+
   attributes(
     :default_archetype,
     :notification_types,
@@ -21,6 +23,7 @@ class SiteSerializer < ApplicationSerializer
     :can_tag_pms,
     :tags_filter_regexp,
     :top_tags,
+    :navigation_menu_site_top_tags,
     :can_associate_groups,
     :wizard_required,
     :topic_featured_link_allowed_category_ids,
@@ -37,9 +40,12 @@ class SiteSerializer < ApplicationSerializer
     :hashtag_configurations,
     :hashtag_icons,
     :displayed_about_plugin_stat_groups,
-    :show_welcome_topic_banner,
-    :anonymous_default_sidebar_tags,
+    :anonymous_default_navigation_menu_tags,
+    :anonymous_sidebar_sections,
     :whispers_allowed_groups_names,
+    :denied_emojis,
+    :tos_url,
+    :privacy_policy_url,
   )
 
   has_many :archetypes, embed: :objects, serializer: ArchetypeSerializer
@@ -184,7 +190,7 @@ class SiteSerializer < ApplicationSerializer
   end
 
   def top_tags
-    Tag.top_tags(guardian: scope)
+    @top_tags ||= Tag.top_tags(guardian: scope)
   end
 
   def wizard_required
@@ -204,7 +210,7 @@ class SiteSerializer < ApplicationSerializer
   end
 
   def censored_regexp
-    WordWatcher.serializable_word_matcher_regexp(:censor)
+    WordWatcher.serializable_word_matcher_regexp(:censor, engine: :js)
   end
 
   def custom_emoji_translation
@@ -220,11 +226,11 @@ class SiteSerializer < ApplicationSerializer
   end
 
   def watched_words_replace
-    WordWatcher.word_matcher_regexps(:replace)
+    WordWatcher.word_matcher_regexps(:replace, engine: :js)
   end
 
   def watched_words_link
-    WordWatcher.word_matcher_regexps(:link)
+    WordWatcher.word_matcher_regexps(:link, engine: :js)
   end
 
   def categories
@@ -240,24 +246,58 @@ class SiteSerializer < ApplicationSerializer
   end
 
   def hashtag_icons
-    HashtagAutocompleteService.data_source_icons
+    HashtagAutocompleteService.data_source_icon_map
   end
 
   def displayed_about_plugin_stat_groups
     About.displayed_plugin_stat_groups
   end
 
-  def show_welcome_topic_banner
-    Site.show_welcome_topic_banner?(scope)
+  SIDEBAR_TOP_TAGS_TO_SHOW = 5
+
+  def navigation_menu_site_top_tags
+    if top_tags.present?
+      tag_names = top_tags[0...SIDEBAR_TOP_TAGS_TO_SHOW]
+      serialized = serialize_tags(Tag.where(name: tag_names))
+
+      # Ensures order of top tags is preserved
+      serialized.sort_by { |tag| tag_names.index(tag[:name]) }
+    else
+      []
+    end
   end
 
-  def anonymous_default_sidebar_tags
-    SiteSetting.default_sidebar_tags.split("|") - DiscourseTagging.hidden_tag_names(scope)
+  def include_navigation_menu_site_top_tags?
+    !SiteSetting.legacy_navigation_menu? && SiteSetting.tagging_enabled
   end
 
-  def include_anonymous_default_sidebar_tags?
+  def anonymous_default_navigation_menu_tags
+    @anonymous_default_navigation_menu_tags ||=
+      begin
+        tag_names =
+          SiteSetting.default_navigation_menu_tags.split("|") -
+            DiscourseTagging.hidden_tag_names(scope)
+
+        serialize_tags(Tag.where(name: tag_names))
+      end
+  end
+
+  def include_anonymous_default_navigation_menu_tags?
     scope.anonymous? && !SiteSetting.legacy_navigation_menu? && SiteSetting.tagging_enabled &&
-      SiteSetting.default_sidebar_tags.present?
+      SiteSetting.default_navigation_menu_tags.present? &&
+      anonymous_default_navigation_menu_tags.present?
+  end
+
+  def anonymous_sidebar_sections
+    SidebarSection
+      .public_sections
+      .includes(:sidebar_urls)
+      .order("(section_type IS NOT NULL) DESC, (public IS TRUE) DESC")
+      .map { |section| SidebarSectionSerializer.new(section, root: false) }
+  end
+
+  def include_anonymous_sidebar_sections?
+    scope.anonymous?
   end
 
   def whispers_allowed_groups_names
@@ -268,6 +308,30 @@ class SiteSerializer < ApplicationSerializer
     scope.can_see_whispers?
   end
 
+  def denied_emojis
+    @denied_emojis ||= Emoji.denied
+  end
+
+  def include_denied_emojis?
+    denied_emojis.present?
+  end
+
+  def tos_url
+    Discourse.tos_url
+  end
+
+  def include_tos_url?
+    tos_url.present?
+  end
+
+  def privacy_policy_url
+    Discourse.privacy_policy_url
+  end
+
+  def include_privacy_policy_url?
+    privacy_policy_url.present?
+  end
+
   private
 
   def ordered_flags(flags)
diff --git a/app/serializers/site_text_serializer.rb b/app/serializers/site_text_serializer.rb
index 0946eb2fb73..aeea09cb574 100644
--- a/app/serializers/site_text_serializer.rb
+++ b/app/serializers/site_text_serializer.rb
@@ -1,7 +1,15 @@
 # frozen_string_literal: true
 
 class SiteTextSerializer < ApplicationSerializer
-  attributes :id, :value, :overridden?, :can_revert?
+  attributes :id,
+             :value,
+             :status,
+             :old_default,
+             :new_default,
+             :interpolation_keys,
+             :has_interpolation_keys?,
+             :overridden?,
+             :can_revert?
 
   def id
     object[:id]
@@ -11,13 +19,43 @@ class SiteTextSerializer < ApplicationSerializer
     object[:value]
   end
 
+  def status
+    if override.present?
+      override.status
+    else
+      "up_to_date"
+    end
+  end
+
+  def old_default
+    override.original_translation if override.present?
+  end
+
+  def new_default
+    override.current_default if override.present?
+  end
+
+  def interpolation_keys
+    object[:interpolation_keys]
+  end
+
+  def has_interpolation_keys?
+    object[:interpolation_keys].present?
+  end
+
   def overridden?
     if options[:overridden_keys]
       options[:overridden_keys].include?(object[:id])
     else
-      TranslationOverride.exists?(locale: object[:locale], translation_key: object[:id])
+      override.present?
     end
   end
 
   alias_method :can_revert?, :overridden?
+
+  private
+
+  def override
+    TranslationOverride.find_by(locale: object[:locale], translation_key: object[:id])
+  end
 end
diff --git a/app/serializers/suggested_topics_mixin.rb b/app/serializers/suggested_topics_mixin.rb
index a899d73f7d1..e257a9436d6 100644
--- a/app/serializers/suggested_topics_mixin.rb
+++ b/app/serializers/suggested_topics_mixin.rb
@@ -33,7 +33,7 @@ module SuggestedTopicsMixin
           object.topic_allowed_group_ids,
           scope.user.id,
         )
-        .pluck_first(:name)
+        .pick(:name)
     end
   end
 
diff --git a/app/serializers/theme_field_serializer.rb b/app/serializers/theme_field_serializer.rb
new file mode 100644
index 00000000000..927b4305e25
--- /dev/null
+++ b/app/serializers/theme_field_serializer.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+class ThemeFieldSerializer < ApplicationSerializer
+  attributes :name, :target, :value, :error, :type_id, :upload_id, :url, :filename
+
+  def include_url?
+    object.upload
+  end
+
+  def include_upload_id?
+    object.upload
+  end
+
+  def include_filename?
+    object.upload
+  end
+
+  def url
+    object.upload&.url
+  end
+
+  def filename
+    object.upload&.original_filename
+  end
+
+  def include_value?
+    @options[:include_value] || false
+  end
+
+  def target
+    Theme.lookup_target(object.target_id)&.to_s
+  end
+
+  def include_error?
+    object.error.present?
+  end
+end
diff --git a/app/serializers/theme_serializer.rb b/app/serializers/theme_serializer.rb
index d3307a6825d..b1cbd1cb743 100644
--- a/app/serializers/theme_serializer.rb
+++ b/app/serializers/theme_serializer.rb
@@ -2,80 +2,6 @@
 
 require "base64"
 
-class ThemeFieldSerializer < ApplicationSerializer
-  attributes :name, :target, :value, :error, :type_id, :upload_id, :url, :filename
-
-  def include_url?
-    object.upload
-  end
-
-  def include_upload_id?
-    object.upload
-  end
-
-  def include_filename?
-    object.upload
-  end
-
-  def url
-    object.upload&.url
-  end
-
-  def filename
-    object.upload&.original_filename
-  end
-
-  def target
-    Theme.lookup_target(object.target_id)&.to_s
-  end
-
-  def include_error?
-    object.error.present?
-  end
-end
-
-class BasicThemeSerializer < ApplicationSerializer
-  attributes :id, :name, :created_at, :updated_at, :default, :component
-
-  def include_default?
-    object.id == SiteSetting.default_theme_id
-  end
-
-  def default
-    true
-  end
-end
-
-class RemoteThemeSerializer < ApplicationSerializer
-  attributes :id,
-             :remote_url,
-             :remote_version,
-             :local_version,
-             :commits_behind,
-             :branch,
-             :remote_updated_at,
-             :updated_at,
-             :github_diff_link,
-             :last_error_text,
-             :is_git?,
-             :license_url,
-             :about_url,
-             :authors,
-             :theme_version,
-             :minimum_discourse_version,
-             :maximum_discourse_version
-
-  # wow, AMS has some pretty nutty logic where it tries to find the path here
-  # from action dispatch, tell it not to
-  def about_url
-    object.about_url
-  end
-
-  def include_github_diff_link?
-    github_diff_link.present?
-  end
-end
-
 class ThemeSerializer < BasicThemeSerializer
   attributes :color_scheme,
              :color_scheme_id,
@@ -87,12 +13,12 @@ class ThemeSerializer < BasicThemeSerializer
              :supported?,
              :description,
              :enabled?,
-             :disabled_at
+             :disabled_at,
+             :theme_fields
 
   has_one :user, serializer: UserNameSerializer, embed: :object
   has_one :disabled_by, serializer: UserNameSerializer, embed: :object
 
-  has_many :theme_fields, serializer: ThemeFieldSerializer, embed: :objects
   has_many :child_themes, serializer: BasicThemeSerializer, embed: :objects
   has_many :parent_themes, serializer: BasicThemeSerializer, embed: :objects
   has_one :remote_theme, serializer: RemoteThemeSerializer, embed: :objects
@@ -100,11 +26,27 @@ class ThemeSerializer < BasicThemeSerializer
 
   def initialize(theme, options = {})
     super
+    @include_theme_field_values = options[:include_theme_field_values] || false
     @errors = []
 
     object.theme_fields.each { |o| @errors << o.error if o.error }
   end
 
+  def theme_fields
+    ActiveModel::ArraySerializer.new(
+      object.theme_fields,
+      each_serializer: ThemeFieldSerializer,
+      include_value: include_theme_field_values?,
+    ).as_json
+  end
+
+  def include_theme_field_values?
+    # This is passed into each `ThemeFieldSerializer` to determine if `value` will be serialized.
+    # We only want to serialize if we are viewing staff_action_logs (for diffing changes), or if
+    # the theme is a local theme, so the saved values appear in the theme field editor.
+    @include_theme_field_values || object.remote_theme_id.nil?
+  end
+
   def child_themes
     object.child_themes
   end
diff --git a/app/serializers/topic_list_item_serializer.rb b/app/serializers/topic_list_item_serializer.rb
index 3d43c0848a8..f6189a23f99 100644
--- a/app/serializers/topic_list_item_serializer.rb
+++ b/app/serializers/topic_list_item_serializer.rb
@@ -14,11 +14,16 @@ class TopicListItemSerializer < ListableTopicSerializer
              :liked_post_numbers,
              :featured_link,
              :featured_link_root_domain,
-             :allowed_user_count
+             :allowed_user_count,
+             :participant_groups
 
   has_many :posters, serializer: TopicPosterSerializer, embed: :objects
   has_many :participants, serializer: TopicPosterSerializer, embed: :objects
 
+  def include_participant_groups?
+    object.private_message?
+  end
+
   def posters
     object.posters || object.posters_summary || []
   end
@@ -44,6 +49,10 @@ class TopicListItemSerializer < ListableTopicSerializer
     object.participants_summary || []
   end
 
+  def participant_groups
+    object.participant_groups_summary || []
+  end
+
   def include_liked_post_numbers?
     include_post_action? :like
   end
diff --git a/app/serializers/topic_post_count_serializer.rb b/app/serializers/topic_post_count_serializer.rb
index 5283910f168..02736f18605 100644
--- a/app/serializers/topic_post_count_serializer.rb
+++ b/app/serializers/topic_post_count_serializer.rb
@@ -7,6 +7,7 @@ class TopicPostCountSerializer < BasicUserSerializer
              :flair_url,
              :flair_color,
              :flair_bg_color,
+             :flair_group_id,
              :admin,
              :moderator,
              :trust_level
@@ -44,6 +45,10 @@ class TopicPostCountSerializer < BasicUserSerializer
     object[:user]&.flair_group&.flair_color
   end
 
+  def flair_group_id
+    object[:user]&.flair_group_id
+  end
+
   def include_admin?
     object[:user].admin
   end
diff --git a/app/serializers/topic_tracking_state_item_serializer.rb b/app/serializers/topic_tracking_state_item_serializer.rb
new file mode 100644
index 00000000000..919a645294a
--- /dev/null
+++ b/app/serializers/topic_tracking_state_item_serializer.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+class TopicTrackingStateItemSerializer < ApplicationSerializer
+  attributes :topic_id,
+             :highest_post_number,
+             :last_read_post_number,
+             :created_at,
+             :category_id,
+             :is_category_topic,
+             :notification_level,
+             :created_in_new_period,
+             :treat_as_new_topic_start_date,
+             :tags
+
+  def created_in_new_period
+    return true if !scope
+    object.created_at >= treat_as_new_topic_start_date
+  end
+
+  def include_tags?
+    object.respond_to?(:tags)
+  end
+
+  def is_category_topic
+    object.topic_id == object.category_topic_id
+  end
+
+  def include_is_category_topic?
+    object.respond_to?(:category_topic_id)
+  end
+
+  def object=(value)
+    @object = value
+  end
+end
diff --git a/app/serializers/topic_tracking_state_serializer.rb b/app/serializers/topic_tracking_state_serializer.rb
index 72736a13be0..37294c154c6 100644
--- a/app/serializers/topic_tracking_state_serializer.rb
+++ b/app/serializers/topic_tracking_state_serializer.rb
@@ -1,22 +1,27 @@
 # frozen_string_literal: true
 
 class TopicTrackingStateSerializer < ApplicationSerializer
-  attributes :topic_id,
-             :highest_post_number,
-             :last_read_post_number,
-             :created_at,
-             :category_id,
-             :notification_level,
-             :created_in_new_period,
-             :treat_as_new_topic_start_date,
-             :tags
+  attributes :data, :meta
 
-  def created_in_new_period
-    return true if !scope
-    object.created_at >= treat_as_new_topic_start_date
+  def data
+    serializer = TopicTrackingStateItemSerializer.new(nil, scope: scope, root: false)
+    # note we may have 1000 rows, avoiding serializer instansitation saves significant time
+    # for 1000 rows this takes it down from 10ms to 3ms on a reasonably fast machine
+    object.map do |item|
+      serializer.object = item
+      serializer.as_json
+    end
   end
 
-  def include_tags?
-    object.respond_to?(:tags)
+  def meta
+    MessageBus.last_ids(
+      TopicTrackingState::LATEST_MESSAGE_BUS_CHANNEL,
+      TopicTrackingState::RECOVER_MESSAGE_BUS_CHANNEL,
+      TopicTrackingState::DELETE_MESSAGE_BUS_CHANNEL,
+      TopicTrackingState::DESTROY_MESSAGE_BUS_CHANNEL,
+      TopicTrackingState::NEW_MESSAGE_BUS_CHANNEL,
+      TopicTrackingState::UNREAD_MESSAGE_BUS_CHANNEL,
+      TopicTrackingState.unread_channel_key(scope.user.id),
+    )
   end
 end
diff --git a/app/serializers/topic_view_serializer.rb b/app/serializers/topic_view_serializer.rb
index 91eb2a6f2f1..e65181b26b5 100644
--- a/app/serializers/topic_view_serializer.rb
+++ b/app/serializers/topic_view_serializer.rb
@@ -78,6 +78,7 @@ class TopicViewSerializer < ApplicationSerializer
     :user_last_posted_at,
     :is_shared_draft,
     :slow_mode_enabled_until,
+    :summarizable,
   )
 
   has_one :details, serializer: TopicViewDetailsSerializer, root: false, embed: :objects
@@ -283,7 +284,7 @@ class TopicViewSerializer < ApplicationSerializer
           owner: true,
         },
       )
-      .pluck_first(:name)
+      .pick(:name)
   end
 
   def include_requested_group_name?
@@ -311,4 +312,8 @@ class TopicViewSerializer < ApplicationSerializer
   def slow_mode_enabled_until
     object.topic.slow_mode_topic_timer&.execute_at
   end
+
+  def summarizable
+    object.summarizable?
+  end
 end
diff --git a/app/serializers/user_card_serializer.rb b/app/serializers/user_card_serializer.rb
index d2c32facdc9..301082cab61 100644
--- a/app/serializers/user_card_serializer.rb
+++ b/app/serializers/user_card_serializer.rb
@@ -113,7 +113,7 @@ class UserCardSerializer < BasicUserSerializer
       end
 
     return if uri.nil? || uri.host.nil?
-    uri.host.sub(/^www\./, "") + uri.path
+    uri.host.sub(/\Awww\./, "") + uri.path
   end
 
   def ignored
diff --git a/app/serializers/user_option_serializer.rb b/app/serializers/user_option_serializer.rb
index d78dad82ebd..562a06ba8c3 100644
--- a/app/serializers/user_option_serializer.rb
+++ b/app/serializers/user_option_serializer.rb
@@ -36,7 +36,10 @@ class UserOptionSerializer < ApplicationSerializer
              :skip_new_user_tips,
              :default_calendar,
              :oldest_search_log_date,
-             :seen_popups
+             :seen_popups,
+             :sidebar_link_to_filtered_list,
+             :sidebar_show_count_of_new_items,
+             :watched_precedence_over_muted
 
   def auto_track_topics_after_msecs
     object.auto_track_topics_after_msecs || SiteSetting.default_other_auto_track_topics_after_msecs
diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb
index 91c267d9ad6..2da59c7e787 100644
--- a/app/serializers/user_serializer.rb
+++ b/app/serializers/user_serializer.rb
@@ -64,7 +64,6 @@ class UserSerializer < UserCardSerializer
                      :use_logo_small_as_avatar,
                      :sidebar_tags,
                      :sidebar_category_ids,
-                     :sidebar_list_destination,
                      :display_sidebar_tags
 
   untrusted_attributes :bio_raw, :bio_cooked, :profile_background_upload_url
diff --git a/app/serializers/watched_word_list_serializer.rb b/app/serializers/watched_word_list_serializer.rb
index 4b47ce16f78..9d0929a9fa9 100644
--- a/app/serializers/watched_word_list_serializer.rb
+++ b/app/serializers/watched_word_list_serializer.rb
@@ -18,7 +18,7 @@ class WatchedWordListSerializer < ApplicationSerializer
   def compiled_regular_expressions
     expressions = {}
     actions.each do |action|
-      expressions[action] = WordWatcher.serializable_word_matcher_regexp(action)
+      expressions[action] = WordWatcher.serializable_word_matcher_regexp(action, engine: :js)
     end
     expressions
   end
diff --git a/app/serializers/watched_word_serializer.rb b/app/serializers/watched_word_serializer.rb
index a798091f282..0ba4f7cc5da 100644
--- a/app/serializers/watched_word_serializer.rb
+++ b/app/serializers/watched_word_serializer.rb
@@ -4,7 +4,7 @@ class WatchedWordSerializer < ApplicationSerializer
   attributes :id, :word, :regexp, :replacement, :action, :case_sensitive
 
   def regexp
-    WordWatcher.word_to_regexp(word, whole: true)
+    WordWatcher.word_to_regexp(word, engine: :js)
   end
 
   def action
diff --git a/app/serializers/web_hook_post_serializer.rb b/app/serializers/web_hook_post_serializer.rb
index f804e00833e..c4b737703d2 100644
--- a/app/serializers/web_hook_post_serializer.rb
+++ b/app/serializers/web_hook_post_serializer.rb
@@ -20,6 +20,7 @@ class WebHookPostSerializer < PostSerializer
     can_edit
     can_delete
     can_recover
+    can_see_hidden_post
     can_wiki
     actions_summary
     can_view_edit_history
diff --git a/app/serializers/web_hook_topic_view_serializer.rb b/app/serializers/web_hook_topic_view_serializer.rb
index ff11424db15..4ec6eb280e6 100644
--- a/app/serializers/web_hook_topic_view_serializer.rb
+++ b/app/serializers/web_hook_topic_view_serializer.rb
@@ -22,6 +22,7 @@ class WebHookTopicViewSerializer < TopicViewSerializer
     slow_mode_seconds
     slow_mode_enabled_until
     bookmarks
+    summarizable
   ].each { |attr| define_method("include_#{attr}?") { false } }
 
   def include_show_read_indicator?
diff --git a/app/services/badge_granter.rb b/app/services/badge_granter.rb
index f32d1321f33..07b9dc3eaeb 100644
--- a/app/services/badge_granter.rb
+++ b/app/services/badge_granter.rb
@@ -500,7 +500,6 @@ class BadgeGranter
       WHERE u.title IS NOT NULL
         AND u.title <> ''
         AND up.user_id = u.id
-        AND up.badge_granted_title
         AND up.granted_title_badge_id IS NOT NULL
         AND NOT EXISTS(
           SELECT 1
@@ -514,12 +513,11 @@ class BadgeGranter
 
     DB.exec <<~SQL
       UPDATE user_profiles up
-      SET badge_granted_title    = FALSE,
-          granted_title_badge_id = NULL
+      SET granted_title_badge_id = NULL
       FROM users u
       WHERE up.user_id = u.id
         AND (u.title IS NULL OR u.title = '')
-        AND (up.badge_granted_title OR up.granted_title_badge_id IS NOT NULL)
+        AND up.granted_title_badge_id IS NOT NULL
     SQL
   end
 
diff --git a/app/services/base_bookmarkable.rb b/app/services/base_bookmarkable.rb
index 77c19c7147f..c7da12abc88 100644
--- a/app/services/base_bookmarkable.rb
+++ b/app/services/base_bookmarkable.rb
@@ -2,7 +2,7 @@
 
 ##
 # Anything that we want to be able to bookmark must be registered as a
-# bookmarkable type using Bookmark.register_bookmarkable(bookmarkable_klass),
+# bookmarkable type using Plugin::Instance#register_bookmarkable(bookmarkable_klass),
 # where the bookmarkable_klass is a class that implements this BaseBookmarkable
 # interface. Some examples are TopicBookmarkable and PostBookmarkable.
 #
diff --git a/app/services/category_hashtag_data_source.rb b/app/services/category_hashtag_data_source.rb
index fe8f63caa8e..960c383ad89 100644
--- a/app/services/category_hashtag_data_source.rb
+++ b/app/services/category_hashtag_data_source.rb
@@ -4,6 +4,10 @@
 # results when looking up a category slug via markdown or searching for
 # categories via the # autocomplete character.
 class CategoryHashtagDataSource
+  def self.enabled?
+    SiteSetting.enable_experimental_hashtag_autocomplete
+  end
+
   def self.icon
     "folder"
   end
@@ -19,6 +23,7 @@ class CategoryHashtagDataSource
       item.description = category.description_text
       item.icon = icon
       item.relative_url = category.url
+      item.id = category.id
 
       # Single-level category heirarchy should be enough to distinguish between
       # categories here.
@@ -32,7 +37,11 @@ class CategoryHashtagDataSource
   end
 
   def self.lookup(guardian, slugs)
-    user_categories = Category.secured(guardian).includes(:parent_category)
+    user_categories =
+      Category
+        .secured(guardian)
+        .includes(:parent_category)
+        .order("parent_category_id ASC NULLS FIRST, id ASC")
     Category
       .query_loaded_from_slugs(slugs, user_categories)
       .map { |category| category_to_hashtag_item(category) }
diff --git a/app/services/external_upload_manager.rb b/app/services/external_upload_manager.rb
index 23523ab4bc0..58823158ff4 100644
--- a/app/services/external_upload_manager.rb
+++ b/app/services/external_upload_manager.rb
@@ -149,8 +149,6 @@ class ExternalUploadManager
       raise ChecksumMismatchError if external_sha1 && external_sha1 != actual_sha1
     end
 
-    # TODO (martin): See if these additional opts will be needed
-    # - check if retain_hours is needed
     opts = {
       type: external_upload_stub.upload_type,
       existing_external_upload_key: external_upload_stub.key,
diff --git a/app/services/hashtag_autocomplete_service.rb b/app/services/hashtag_autocomplete_service.rb
index b13940382b5..65ee0a2e061 100644
--- a/app/services/hashtag_autocomplete_service.rb
+++ b/app/services/hashtag_autocomplete_service.rb
@@ -15,6 +15,8 @@ class HashtagAutocompleteService
 
   attr_reader :guardian
 
+  # NOTE: This is not meant to be called directly; use `enabled_data_sources`
+  # or the individual data_source_X methods instead.
   def self.data_sources
     # Category and Tag data sources are in core and always should be
     # included for searches and lookups.
@@ -30,16 +32,20 @@ class HashtagAutocompleteService
     )
   end
 
-  def self.data_source_types
-    data_sources.map(&:type)
+  def self.enabled_data_sources
+    self.data_sources.filter(&:enabled?)
   end
 
-  def self.data_source_icons
-    data_sources.map(&:icon)
+  def self.data_source_types
+    self.enabled_data_sources.map(&:type)
+  end
+
+  def self.data_source_icon_map
+    self.enabled_data_sources.map { |ds| [ds.type, ds.icon] }.to_h
   end
 
   def self.data_source_from_type(type)
-    data_sources.find { |ds| ds.type == type }
+    self.enabled_data_sources.find { |ds| ds.type == type }
   end
 
   def self.find_priorities_for_context(context)
@@ -51,7 +57,10 @@ class HashtagAutocompleteService
   end
 
   def self.ordered_types_for_context(context)
-    find_priorities_for_context(context).sort_by { |ctp| -ctp[:priority] }.map { |ctp| ctp[:type] }
+    find_priorities_for_context(context)
+      .sort_by { |ctp| -ctp[:priority] }
+      .map { |ctp| ctp[:type] }
+      .reject { |type| data_source_types.exclude?(type) }
   end
 
   def self.contexts_with_ordered_types
@@ -88,6 +97,10 @@ class HashtagAutocompleteService
     # item, used for the cooked hashtags, e.g. /c/2/staff
     attr_accessor :relative_url
 
+    # The ID of the resource that is represented by the autocomplete item,
+    # e.g. category.id, tag.id
+    attr_accessor :id
+
     def initialize(params = {})
       @relative_url = params[:relative_url]
       @text = params[:text]
@@ -96,6 +109,7 @@ class HashtagAutocompleteService
       @type = params[:type]
       @ref = params[:ref]
       @slug = params[:slug]
+      @id = params[:id]
     end
 
     def to_h
@@ -107,6 +121,7 @@ class HashtagAutocompleteService
         type: self.type,
         ref: self.ref,
         slug: self.slug,
+        id: self.id,
       }
     end
   end
@@ -218,16 +233,16 @@ class HashtagAutocompleteService
   )
     raise Discourse::InvalidParameters.new(:order) if !types_in_priority_order.is_a?(Array)
     limit = [limit, SEARCH_MAX_LIMIT].min
+    types_in_priority_order =
+      types_in_priority_order.select do |type|
+        HashtagAutocompleteService.data_source_types.include?(type)
+      end
 
     return search_without_term(types_in_priority_order, limit) if term.blank?
 
     limited_results = []
     top_ranked_type = nil
     term = term.downcase
-    types_in_priority_order =
-      types_in_priority_order.select do |type|
-        HashtagAutocompleteService.data_source_types.include?(type)
-      end
 
     # Float exact matches by slug to the top of the list, any of these will be excluded
     # from further results.
@@ -273,7 +288,7 @@ class HashtagAutocompleteService
     # Any items that are _not_ the top-ranked type (which could possibly not be
     # the same as the first item in the types_in_priority_order if there was
     # no data for that type) that have conflicting slugs with other items for
-    # other types need to have a ::type suffix added to their ref.
+    # other higher-ranked types need to have a ::type suffix added to their ref.
     #
     # This will be used for the lookup method above if one of these items is
     # chosen in the UI, otherwise there is no way to determine whether a hashtag is
@@ -281,7 +296,7 @@ class HashtagAutocompleteService
     #
     # For example, if there is a category with the slug #general and a tag
     # with the slug #general, then the tag will have its ref changed to #general::tag
-    append_types_to_conflicts(limited_results, top_ranked_type, limit)
+    append_types_to_conflicts(limited_results, top_ranked_type, types_in_priority_order, limit)
   end
 
   # TODO (martin) Remove this once plugins are not relying on the old lookup
@@ -425,13 +440,22 @@ class HashtagAutocompleteService
     )
   end
 
-  def append_types_to_conflicts(limited_results, top_ranked_type, limit)
+  def append_types_to_conflicts(limited_results, top_ranked_type, types_in_priority_order, limit)
     limited_results.each do |hashtag_item|
       next if hashtag_item.type == top_ranked_type
 
-      other_slugs = limited_results.reject { |r| r.type === hashtag_item.type }.map(&:slug)
-      if other_slugs.include?(hashtag_item.slug)
-        hashtag_item.ref = "#{hashtag_item.slug}::#{hashtag_item.type}"
+      # We only need to change the ref to include the type if there is a
+      # higher-ranked hashtag slug that conflicts with this one.
+      higher_ranked_types =
+        types_in_priority_order.slice(0, types_in_priority_order.index(hashtag_item.type))
+      higher_ranked_slugs =
+        limited_results
+          .reject { |r| r.type === hashtag_item.type }
+          .select { |r| higher_ranked_types.include?(r.type) }
+          .map(&:slug)
+
+      if higher_ranked_slugs.include?(hashtag_item.slug)
+        hashtag_item.ref = "#{hashtag_item.ref}::#{hashtag_item.type}"
       end
     end
 
diff --git a/app/services/post_alerter.rb b/app/services/post_alerter.rb
index b792a6e701d..b0cb9310a2e 100644
--- a/app/services/post_alerter.rb
+++ b/app/services/post_alerter.rb
@@ -55,12 +55,9 @@ class PostAlerter
 
     if user.push_subscriptions.exists?
       if user.seen_since?(SiteSetting.push_notification_time_window_mins.minutes.ago)
-        Jobs.enqueue_in(
-          SiteSetting.push_notification_time_window_mins.minutes,
-          :send_push_notification,
-          user_id: user.id,
-          payload: payload,
-        )
+        delay =
+          (SiteSetting.push_notification_time_window_mins - (Time.now - user.last_seen_at) / 60)
+        Jobs.enqueue_in(delay.minutes, :send_push_notification, user_id: user.id, payload: payload)
       else
         Jobs.enqueue(:send_push_notification, user_id: user.id, payload: payload)
       end
@@ -154,8 +151,15 @@ class PostAlerter
 
       expand_group_mentions(mentioned_groups, post) do |group, users|
         users = only_allowed_users(users, post)
+        to_notify =
+          DiscoursePluginRegistry.apply_modifier(
+            :expand_group_mention_users,
+            users - notified,
+            group,
+          )
+
         notified +=
-          notify_users(users - notified, :group_mentioned, post, mentioned_opts.merge(group: group))
+          notify_users(to_notify, :group_mentioned, post, mentioned_opts.merge(group: group))
       end
 
       if mentioned_here
@@ -196,10 +200,12 @@ class PostAlerter
 
     DiscourseEvent.trigger(:post_alerter_before_post, post, new_record, notified)
 
+    notified = notified + category_or_tag_muters(post.topic)
+
     if new_record
       if post.topic.private_message?
         # private messages
-        notified += notify_pm_users(post, reply_to_user, quoted_users, notified)
+        notified += notify_pm_users(post, reply_to_user, quoted_users, notified, new_record)
       elsif notify_about_reply?(post)
         # posts
         notified +=
@@ -261,6 +267,29 @@ class PostAlerter
       .pluck(:user_id)
   end
 
+  def category_or_tag_muters(topic)
+    user_option_condition_sql_fragment =
+      if SiteSetting.watched_precedence_over_muted
+        "uo.watched_precedence_over_muted IS false"
+      else
+        "(uo.watched_precedence_over_muted IS NULL OR uo.watched_precedence_over_muted IS false)"
+      end
+
+    user_ids_sql = <<~SQL
+        SELECT uo.user_id FROM user_options uo
+        LEFT JOIN topic_users tus ON tus.user_id = uo.user_id AND tus.topic_id = #{topic.id}
+        LEFT JOIN category_users cu ON cu.user_id = uo.user_id AND cu.category_id = #{topic.category_id.to_i}
+        LEFT JOIN tag_users tu ON tu.user_id = uo.user_id
+        JOIN topic_tags tt ON tt.tag_id = tu.tag_id AND tt.topic_id = #{topic.id}
+        WHERE
+          (tus.id IS NULL OR tus.notification_level != #{TopicUser.notification_levels[:watching]})
+          AND (cu.notification_level = #{CategoryUser.notification_levels[:muted]} OR tu.notification_level = #{TagUser.notification_levels[:muted]})
+          AND #{user_option_condition_sql_fragment}
+        SQL
+
+    User.where("id IN (#{user_ids_sql})")
+  end
+
   def notify_first_post_watchers(post, user_ids, notified = nil)
     return [] if user_ids.blank?
     user_ids.uniq!
@@ -385,8 +414,7 @@ class PostAlerter
     stats = (@group_stats[topic.id] ||= group_stats(topic))
     return unless stats
 
-    group_id =
-      topic.topic_allowed_groups.where(group_id: user.groups.pluck(:id)).pluck_first(:group_id)
+    group_id = topic.topic_allowed_groups.where(group_id: user.groups).pick(:group_id)
 
     stat = stats.find { |s| s[:group_id] == group_id }
     return unless stat
@@ -467,8 +495,7 @@ class PostAlerter
       return
     end
 
-    # Make sure the user can see the post
-    return unless Guardian.new(user).can_see?(post)
+    return if !Guardian.new(user).can_receive_post_notifications?(post)
 
     return if user.staged? && topic.category&.mailinglist_mirror?
 
@@ -586,6 +613,9 @@ class PostAlerter
     end
 
     # Create the notification
+    notification_data =
+      DiscoursePluginRegistry.apply_modifier(:notification_data, notification_data)
+
     created =
       user.notifications.consolidate_or_create!(
         notification_type: type,
@@ -729,7 +759,7 @@ class PostAlerter
     end
   end
 
-  def notify_pm_users(post, reply_to_user, quoted_users, notified)
+  def notify_pm_users(post, reply_to_user, quoted_users, notified, new_record = false)
     return [] unless post.topic
 
     warn_if_not_sidekiq
@@ -766,7 +796,12 @@ class PostAlerter
       when TopicUser.notification_levels[:watching]
         create_pm_notification(user, post, emails_to_skip_send)
       when TopicUser.notification_levels[:tracking]
-        if is_replying?(user, reply_to_user, quoted_users)
+        # TopicUser is the canonical source of topic notification levels, except for
+        # new topics created within a group with default notification level set to
+        # `watching_first_post`. TopicUser notification level is set to `tracking`
+        # for these.
+        if is_replying?(user, reply_to_user, quoted_users) ||
+             (new_record && group_watched_first_post?(user, post))
           create_pm_notification(user, post, emails_to_skip_send)
         else
           notify_group_summary(user, post.topic)
@@ -1014,4 +1049,8 @@ class PostAlerter
       notification_level: TopicUser.notification_levels[:watching],
     )
   end
+
+  def group_watched_first_post?(user, post)
+    post.is_first_post? && group_watchers(post.topic).include?(user.id)
+  end
 end
diff --git a/app/services/push_notification_pusher.rb b/app/services/push_notification_pusher.rb
index 736f3ea2bf6..0c6891d8591 100644
--- a/app/services/push_notification_pusher.rb
+++ b/app/services/push_notification_pusher.rb
@@ -157,6 +157,8 @@ class PushNotificationPusher
       end
     rescue Timeout::Error => e
       handle_generic_error(subscription, e, user, endpoint, message)
+    rescue OpenSSL::SSL::SSLError => e
+      handle_generic_error(subscription, e, user, endpoint, message)
     end
   end
 
diff --git a/app/services/random_topic_selector.rb b/app/services/random_topic_selector.rb
index 85f3334864a..9ed13c53f9e 100644
--- a/app/services/random_topic_selector.rb
+++ b/app/services/random_topic_selector.rb
@@ -91,8 +91,4 @@ class RandomTopicSelector
   def self.cache_key(category = nil)
     "random_topic_cache_#{category&.id}"
   end
-
-  def self.clear_cache!
-    Discourse.redis.delete_prefixed(cache_key)
-  end
 end
diff --git a/app/services/registered_bookmarkable.rb b/app/services/registered_bookmarkable.rb
index 50cd45735a9..e71f45156b2 100644
--- a/app/services/registered_bookmarkable.rb
+++ b/app/services/registered_bookmarkable.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 #
-# Should only be created via the Bookmark.register_bookmarkable
+# Should only be created via the Plugin::Instance#register_bookmarkable
 # method; this is used to let the BookmarkQuery class query and
 # search additional bookmarks for the user bookmark list, and
 # also to enumerate on the registered RegisteredBookmarkable types.
@@ -11,7 +11,7 @@
 # when trying to save the Bookmark record. All things that are bookmarkable
 # must be registered in this way.
 #
-# See Bookmark#reset_bookmarkables for some examples on how registering
+# See Plugin::Instance#register_bookmarkable for some examples on how registering
 # bookmarkables works.
 #
 # See BaseBookmarkable for documentation on what return types should be
diff --git a/app/services/search_indexer.rb b/app/services/search_indexer.rb
index a17ac7b34ba..75ae8e99821 100644
--- a/app/services/search_indexer.rb
+++ b/app/services/search_indexer.rb
@@ -1,13 +1,17 @@
 # frozen_string_literal: true
 
 class SearchIndexer
-  POST_INDEX_VERSION = 4
-  MIN_POST_REINDEX_VERSION = 3
-  TOPIC_INDEX_VERSION = 3
+  MIN_POST_BLURB_INDEX_VERSION = 4
+
+  POST_INDEX_VERSION = 5
+  TOPIC_INDEX_VERSION = 4
   CATEGORY_INDEX_VERSION = 3
   USER_INDEX_VERSION = 3
   TAG_INDEX_VERSION = 3
+
+  # version to apply when issuing a background reindex
   REINDEX_VERSION = 0
+  TS_VECTOR_PARSE_REGEX = /('([^']*|'')*'\:)(([0-9]+[A-D]?,?)+)/
 
   def self.disable
     @disabled = true
@@ -45,17 +49,24 @@ class SearchIndexer
     tsvector = DB.query_single("SELECT #{ranked_index}", indexed_data)[0]
     additional_lexemes = []
 
+    # we also want to index parts of a domain name
+    # that way stemmed single word searches will match
+    additional_words = []
+
     tsvector
       .scan(/'(([a-zA-Z0-9]+\.)+[a-zA-Z0-9]+)'\:([\w+,]+)/)
       .reduce(additional_lexemes) do |array, (lexeme, _, positions)|
         count = 0
 
-        if lexeme !~ /^(\d+\.)?(\d+\.)*(\*|\d+)$/
+        if lexeme !~ /\A(\d+\.)?(\d+\.)*(\*|\d+)\z/
           loop do
             count += 1
             break if count >= 10 # Safeguard here to prevent infinite loop when a term has many dots
             term, _, remaining = lexeme.partition(".")
             break if remaining.blank?
+
+            additional_words << [term, positions]
+
             array << "'#{remaining}':#{positions}"
             lexeme = remaining
           end
@@ -64,7 +75,59 @@ class SearchIndexer
         array
       end
 
-    tsvector = "#{tsvector} #{additional_lexemes.join(" ")}"
+    extra_domain_word_terms =
+      if additional_words.length > 0
+        DB
+          .query_single(
+            "SELECT to_tsvector(?, ?)",
+            stemmer,
+            additional_words.map { |term, _| term }.join(" "),
+          )
+          .first
+          .scan(TS_VECTOR_PARSE_REGEX)
+          .map do |term, _, indexes|
+            new_indexes =
+              indexes
+                .split(",")
+                .map do |index|
+                  existing_positions = additional_words[index.to_i - 1]
+                  if existing_positions
+                    existing_positions[1]
+                  else
+                    index
+                  end
+                end
+                .join(",")
+            "#{term}#{new_indexes}"
+          end
+          .join(" ")
+      end
+
+    tsvector = "#{tsvector} #{additional_lexemes.join(" ")} #{extra_domain_word_terms}"
+
+    if (max_dupes = SiteSetting.max_duplicate_search_index_terms) > 0
+      reduced = []
+      tsvector
+        .scan(TS_VECTOR_PARSE_REGEX)
+        .each do |term, _, indexes|
+          family_counts = Hash.new(0)
+          new_index_array = []
+
+          indexes
+            .split(",")
+            .each do |index|
+              family = nil
+              family = index[-1] if index[-1].match?(/[A-D]/)
+              # title dupes can completely dominate the index
+              # so we limit them to 1
+              if (family_counts[family] += 1) <= (family == "A" ? 1 : max_dupes)
+                new_index_array << index
+              end
+            end
+          reduced << "#{term.strip}#{new_index_array.join(",")}"
+        end
+      tsvector = reduced.join(" ")
+    end
 
     indexed_data =
       if table.to_s == "post"
@@ -335,7 +398,7 @@ class SearchIndexer
     end
 
     MENTION_CLASSES ||= %w[mention mention-group]
-    ATTRIBUTES ||= %w[alt title href data-youtube-title]
+    ATTRIBUTES ||= %w[alt title href data-video-title]
 
     def start_element(_name, attributes = [])
       attributes = Hash[*attributes.flatten]
diff --git a/app/services/sidebar_section_links_updater.rb b/app/services/sidebar_section_links_updater.rb
index b3faacb4f08..682372aafb3 100644
--- a/app/services/sidebar_section_links_updater.rb
+++ b/app/services/sidebar_section_links_updater.rb
@@ -5,18 +5,15 @@ class SidebarSectionLinksUpdater
     if category_ids.blank?
       delete_section_links(user: user, linkable_type: "Category")
     else
-      category_ids = Category.secured(Guardian.new(user)).where(id: category_ids).pluck(:id)
+      category_ids = Category.where(id: category_ids).pluck(:id)
       update_section_links(user: user, linkable_type: "Category", new_linkable_ids: category_ids)
     end
   end
 
-  def self.update_tag_section_links(user, tag_names:)
-    if tag_names.blank?
+  def self.update_tag_section_links(user, tag_ids:)
+    if tag_ids.blank?
       delete_section_links(user: user, linkable_type: "Tag")
     else
-      tag_ids =
-        DiscourseTagging.filter_visible(Tag, Guardian.new(user)).where(name: tag_names).pluck(:id)
-
       update_section_links(user: user, linkable_type: "Tag", new_linkable_ids: tag_ids)
     end
   end
@@ -46,6 +43,7 @@ class SidebarSectionLinksUpdater
           linkable_id: to_delete,
         ).delete_all
       end
+
       SidebarSectionLink.insert_all(to_insert_attributes) if to_insert_attributes.present?
     end
   end
diff --git a/app/services/sidebar_site_settings_backfiller.rb b/app/services/sidebar_site_settings_backfiller.rb
index 7fe13f8162b..0a61ec1dac4 100644
--- a/app/services/sidebar_site_settings_backfiller.rb
+++ b/app/services/sidebar_site_settings_backfiller.rb
@@ -13,9 +13,9 @@ class SidebarSiteSettingsBackfiller
 
     @linkable_klass, previous_ids, new_ids =
       case setting_name
-      when "default_sidebar_categories"
+      when "default_navigation_menu_categories"
         [Category, previous_value.split("|"), new_value.split("|")]
-      when "default_sidebar_tags"
+      when "default_navigation_menu_tags"
         klass = Tag
 
         [
@@ -81,7 +81,7 @@ class SidebarSiteSettingsBackfiller
       FROM users
       WHERE users.id NOT IN (
         SELECT
-          sidebar_section_links.user_id
+          DISTINCT(sidebar_section_links.user_id)
         FROM sidebar_section_links
         WHERE sidebar_section_links.linkable_type = '#{@linkable_klass.to_s}'
         AND sidebar_section_links.linkable_id IN (#{@added_ids.join(",")})
diff --git a/app/services/staff_action_logger.rb b/app/services/staff_action_logger.rb
index 70c937e5613..f23d494161b 100644
--- a/app/services/staff_action_logger.rb
+++ b/app/services/staff_action_logger.rb
@@ -46,6 +46,23 @@ class StaffActionLogger
     UserHistory.create!(attrs)
   end
 
+  def edit_directory_columns_details(column_data, directory_column)
+    directory_column = directory_column.attributes.transform_values(&:to_s)
+    previous_value = directory_column
+    new_value = directory_column.clone
+
+    directory_column.each do |key, value|
+      if column_data[key] != value && column_data[key].present?
+        new_value[key] = column_data[key]
+      elsif key != "name"
+        previous_value.delete key
+        new_value.delete key
+      end
+    end
+
+    [previous_value.to_json, new_value.to_json]
+  end
+
   def log_post_deletion(deleted_post, opts = {})
     unless deleted_post && deleted_post.is_a?(Post)
       raise Discourse::InvalidParameters.new(:deleted_post)
@@ -219,7 +236,7 @@ class StaffActionLogger
   end
 
   def theme_json(theme)
-    ThemeSerializer.new(theme, root: false).to_json
+    ThemeSerializer.new(theme, root: false, include_theme_field_values: true).to_json
   end
 
   def strip_duplicates(old, cur)
@@ -779,8 +796,8 @@ class StaffActionLogger
 
     topic = reviewable.topic || Topic.with_deleted.find_by(id: reviewable.topic_id)
     topic_title = topic&.title || I18n.t("staff_action_logs.not_found")
-    username = reviewable.created_by&.username || I18n.t("staff_action_logs.unknown")
-    name = reviewable.created_by&.name || I18n.t("staff_action_logs.unknown")
+    username = reviewable.target_created_by&.username || I18n.t("staff_action_logs.unknown")
+    name = reviewable.target_created_by&.name || I18n.t("staff_action_logs.unknown")
 
     details = [
       "created_at: #{reviewable.created_at}",
@@ -940,7 +957,7 @@ class StaffActionLogger
     )
   end
 
-  def log_group_deletetion(group)
+  def log_group_deletion(group)
     raise Discourse::InvalidParameters.new(:group) if group.nil?
 
     details = ["name: #{group.name}", "id: #{group.id}"]
@@ -954,6 +971,50 @@ class StaffActionLogger
     )
   end
 
+  def log_permanently_delete_post_revisions(post)
+    raise Discourse::InvalidParameters.new(:post) if post.nil?
+
+    UserHistory.create!(
+      action: UserHistory.actions[:permanently_delete_post_revisions],
+      acting_user_id: @admin.id,
+      post_id: post.id,
+    )
+  end
+
+  def log_create_public_sidebar_section(section)
+    UserHistory.create!(
+      action: UserHistory.actions[:create_public_sidebar_section],
+      acting_user_id: @admin.id,
+      subject: section.title,
+      details: custom_section_details(section),
+    )
+  end
+
+  def log_update_public_sidebar_section(section)
+    UserHistory.create!(
+      action: UserHistory.actions[:update_public_sidebar_section],
+      acting_user_id: @admin.id,
+      subject: section.title,
+      details: custom_section_details(section),
+    )
+  end
+
+  def log_destroy_public_sidebar_section(section)
+    UserHistory.create!(
+      action: UserHistory.actions[:destroy_public_sidebar_section],
+      acting_user_id: @admin.id,
+      subject: section.title,
+    )
+  end
+
+  def log_reset_bounce_score(user, opts = {})
+    raise Discourse::InvalidParameters.new(:user) unless user
+
+    UserHistory.create!(
+      params(opts).merge(action: UserHistory.actions[:reset_bounce_score], target_user_id: user.id),
+    )
+  end
+
   private
 
   def get_changes(changes)
@@ -980,4 +1041,9 @@ class StaffActionLogger
   def validate_category(category)
     raise Discourse::InvalidParameters.new(:category) unless category && category.is_a?(Category)
   end
+
+  def custom_section_details(section)
+    urls = section.sidebar_urls.map { |url| "#{url.name} - #{url.value}" }
+    "links: #{urls.join(", ")}"
+  end
 end
diff --git a/app/services/tag_hashtag_data_source.rb b/app/services/tag_hashtag_data_source.rb
index b186ca12c42..caaf8d3c4b4 100644
--- a/app/services/tag_hashtag_data_source.rb
+++ b/app/services/tag_hashtag_data_source.rb
@@ -4,6 +4,10 @@
 # results when looking up a tag slug via markdown or searching for
 # tags via the # autocomplete character.
 class TagHashtagDataSource
+  def self.enabled?
+    SiteSetting.enable_experimental_hashtag_autocomplete && SiteSetting.tagging_enabled
+  end
+
   def self.icon
     "tag"
   end
@@ -27,12 +31,12 @@ class TagHashtagDataSource
       item.slug = tag.name
       item.relative_url = tag.url
       item.icon = icon
+      item.id = tag.id
     end
   end
   private_class_method :tag_to_hashtag_item
 
   def self.lookup(guardian, slugs)
-    return [] if !SiteSetting.tagging_enabled
     DiscourseTagging
       .filter_visible(Tag.where_name(slugs), guardian)
       .map { |tag| tag_to_hashtag_item(tag, guardian) }
@@ -44,8 +48,6 @@ class TagHashtagDataSource
     limit,
     condition = HashtagAutocompleteService.search_conditions[:contains]
   )
-    return [] if !SiteSetting.tagging_enabled
-
     tags_with_counts, _ =
       DiscourseTagging.filter_allowed_tags(
         guardian,
@@ -66,7 +68,11 @@ class TagHashtagDataSource
     TagsController
       .tag_counts_json(tags_with_counts, guardian)
       .take(limit)
-      .map { |tag| tag_to_hashtag_item(tag, guardian) }
+      .map do |tag|
+        # We want the actual ID here not the `name` as tag_counts_json gives us.
+        tag[:id] = tags_with_counts.find { |t| t.name == tag[:name] }.id
+        tag_to_hashtag_item(tag, guardian)
+      end
   end
 
   def self.search_sort(search_results, _)
@@ -74,8 +80,6 @@ class TagHashtagDataSource
   end
 
   def self.search_without_term(guardian, limit)
-    return [] if !SiteSetting.tagging_enabled
-
     tags_with_counts, _ =
       DiscourseTagging.filter_allowed_tags(
         guardian,
diff --git a/app/services/topic_summarization.rb b/app/services/topic_summarization.rb
new file mode 100644
index 00000000000..6321831f7c3
--- /dev/null
+++ b/app/services/topic_summarization.rb
@@ -0,0 +1,125 @@
+# frozen_string_literal: true
+
+class TopicSummarization
+  def initialize(strategy)
+    @strategy = strategy
+  end
+
+  def summarize(topic, user, opts = {})
+    existing_summary = SummarySection.find_by(target: topic, meta_section_id: nil)
+
+    # Existing summary shouldn't be nil in this scenario because the controller checks its existence.
+    return if !user && !existing_summary
+
+    targets_data = summary_targets(topic).pluck(:post_number, :raw, :username)
+
+    current_topic_sha = build_sha(targets_data.map(&:first))
+    can_summarize = Summarization::Base.can_request_summary_for?(user)
+
+    if use_cached?(existing_summary, can_summarize, current_topic_sha, !!opts[:skip_age_check])
+      # It's important that we signal a cached summary is outdated
+      if can_summarize && new_targets?(existing_summary, current_topic_sha)
+        existing_summary.mark_as_outdated
+      end
+
+      return existing_summary
+    end
+
+    delete_cached_summaries_of(topic) if existing_summary
+
+    content = {
+      resource_path: "#{Discourse.base_path}/t/-/#{topic.id}",
+      content_title: topic.title,
+      contents: [],
+    }
+
+    targets_data.map do |(pn, raw, username)|
+      content[:contents] << { poster: username, id: pn, text: raw }
+    end
+
+    summarization_result = strategy.summarize(content)
+
+    cache_summary(summarization_result, targets_data.map(&:first), topic)
+  end
+
+  def summary_targets(topic)
+    topic.has_summary? ? best_replies(topic) : pick_selection(topic)
+  end
+
+  private
+
+  attr_reader :strategy
+
+  def best_replies(topic)
+    Post
+      .summary(topic.id)
+      .where("post_type = ?", Post.types[:regular])
+      .where("NOT hidden")
+      .joins(:user)
+      .order(:post_number)
+  end
+
+  def pick_selection(topic)
+    posts =
+      Post
+        .where(topic_id: topic.id)
+        .where("post_type = ?", Post.types[:regular])
+        .where("NOT hidden")
+        .order(:post_number)
+
+    post_numbers = posts.limit(5).pluck(:post_number)
+    post_numbers += posts.reorder("posts.score desc").limit(50).pluck(:post_number)
+    post_numbers += posts.reorder("post_number desc").limit(5).pluck(:post_number)
+
+    Post
+      .where(topic_id: topic.id)
+      .joins(:user)
+      .where("post_number in (?)", post_numbers)
+      .order(:post_number)
+  end
+
+  def delete_cached_summaries_of(topic)
+    SummarySection.where(target: topic).destroy_all
+  end
+
+  # For users without permissions to generate a summary or fresh summaries, we return what we have cached.
+  def use_cached?(existing_summary, can_summarize, current_sha, skip_age_check)
+    existing_summary &&
+      !(
+        can_summarize && new_targets?(existing_summary, current_sha) &&
+          (skip_age_check || existing_summary.created_at < 1.hour.ago)
+      )
+  end
+
+  def new_targets?(summary, current_sha)
+    summary.original_content_sha != current_sha
+  end
+
+  def cache_summary(result, post_numbers, topic)
+    main_summary =
+      SummarySection.create!(
+        target: topic,
+        algorithm: strategy.model,
+        content_range: (post_numbers.first..post_numbers.last),
+        summarized_text: result[:summary],
+        original_content_sha: build_sha(post_numbers),
+      )
+
+    result[:chunks].each do |chunk|
+      SummarySection.create!(
+        target: topic,
+        algorithm: strategy.model,
+        content_range: chunk[:ids].min..chunk[:ids].max,
+        summarized_text: chunk[:summary],
+        original_content_sha: build_sha(chunk[:ids]),
+        meta_section_id: main_summary.id,
+      )
+    end
+
+    main_summary
+  end
+
+  def build_sha(ids)
+    Digest::SHA256.hexdigest(ids.join)
+  end
+end
diff --git a/app/services/user_anonymizer.rb b/app/services/user_anonymizer.rb
index 6f1b317c6c7..8dd04bd5bd0 100644
--- a/app/services/user_anonymizer.rb
+++ b/app/services/user_anonymizer.rb
@@ -3,6 +3,8 @@
 class UserAnonymizer
   attr_reader :user_history
 
+  EMAIL_SUFFIX = "@anonymized.invalid"
+
   # opts:
   #   anonymize_ip  - an optional new IP to update their logs with
   def initialize(user, actor = nil, opts = nil)
@@ -38,7 +40,7 @@ class UserAnonymizer
       end
 
       @user.save!
-      @user.primary_email.update_attribute(:email, "#{@user.username}@anonymized.invalid")
+      @user.primary_email.update_attribute(:email, "#{@user.username}#{EMAIL_SUFFIX}")
 
       options = @user.user_option
       options.mailing_list_mode = false
@@ -58,6 +60,8 @@ class UserAnonymizer
         )
       end
 
+      @user.clear_status!
+
       @user.user_avatar&.destroy!
       @user.single_sign_on_record&.destroy!
       @user.oauth2_user_infos.destroy_all
diff --git a/app/services/user_merger.rb b/app/services/user_merger.rb
index 96af036a464..eef3c81cb51 100644
--- a/app/services/user_merger.rb
+++ b/app/services/user_merger.rb
@@ -286,7 +286,7 @@ class UserMerger
         bio_cooked_version   = COALESCE(t.bio_cooked_version, s.bio_cooked_version),
         profile_background_upload_id = COALESCE(t.profile_background_upload_id, s.profile_background_upload_id),
         dismissed_banner_key = COALESCE(t.dismissed_banner_key, s.dismissed_banner_key),
-        badge_granted_title  = t.badge_granted_title OR s.badge_granted_title,
+        granted_title_badge_id = COALESCE(t.granted_title_badge_id, s.granted_title_badge_id),
         card_background_upload_id = COALESCE(t.card_background_upload_id, s.card_background_upload_id),
         views                = t.views + s.views
       FROM user_profiles AS s
diff --git a/app/services/user_silencer.rb b/app/services/user_silencer.rb
index 50ae7b4ab72..27adfa83d02 100644
--- a/app/services/user_silencer.rb
+++ b/app/services/user_silencer.rb
@@ -23,42 +23,39 @@ class UserSilencer
 
   def silence
     hide_posts unless @opts[:keep_posts]
-    unless @user.silenced_till.present?
-      @user.silenced_till = @opts[:silenced_till] || 1000.years.from_now
-      if @user.save
-        message_type = @opts[:message] || :silenced_by_staff
+    return false if @user.silenced_till.present?
+    @user.silenced_till = @opts[:silenced_till] || 1000.years.from_now
+    if @user.save
+      message_type = @opts[:message] || :silenced_by_staff
 
-        details = StaffMessageFormat.new(:silence, @opts[:reason], @opts[:message_body]).format
+      details = StaffMessageFormat.new(:silence, @opts[:reason], @opts[:message_body]).format
 
-        context = "#{message_type}: #{@opts[:reason]}"
+      context = "#{message_type}: #{@opts[:reason]}"
 
-        if @by_user
-          log_params = { context: context, details: details }
-          log_params[:post_id] = @opts[:post_id].to_i if @opts[:post_id]
+      if @by_user
+        log_params = { context: context, details: details }
+        log_params[:post_id] = @opts[:post_id].to_i if @opts[:post_id]
 
-          @user_history = StaffActionLogger.new(@by_user).log_silence_user(@user, log_params)
-        end
-
-        silence_message_params = {}
-        DiscourseEvent.trigger(
-          :user_silenced,
-          user: @user,
-          silenced_by: @by_user,
-          reason: @opts[:reason],
-          message: @opts[:message_body],
-          user_history: @user_history,
-          post_id: @opts[:post_id],
-          silenced_till: @user.silenced_till,
-          silenced_at: DateTime.now,
-          silence_message_params: silence_message_params,
-        )
-
-        silence_message_params.merge!(post_alert_options: { skip_send_email: true })
-        SystemMessage.create(@user, message_type, silence_message_params)
-        true
+        @user_history = StaffActionLogger.new(@by_user).log_silence_user(@user, log_params)
       end
-    else
-      false
+
+      silence_message_params = {}
+      DiscourseEvent.trigger(
+        :user_silenced,
+        user: @user,
+        silenced_by: @by_user,
+        reason: @opts[:reason],
+        message: @opts[:message_body],
+        user_history: @user_history,
+        post_id: @opts[:post_id],
+        silenced_till: @user.silenced_till,
+        silenced_at: DateTime.now,
+        silence_message_params: silence_message_params,
+      )
+
+      silence_message_params.merge!(post_alert_options: { skip_send_email: true })
+      SystemMessage.create(@user, message_type, silence_message_params)
+      true
     end
   end
 
diff --git a/app/services/user_updater.rb b/app/services/user_updater.rb
index 511755628f4..4b6e4bc6781 100644
--- a/app/services/user_updater.rb
+++ b/app/services/user_updater.rb
@@ -48,8 +48,10 @@ class UserUpdater
     skip_new_user_tips
     seen_popups
     default_calendar
-    sidebar_list_destination
     bookmark_auto_delete_preference
+    sidebar_link_to_filtered_list
+    sidebar_show_count_of_new_items
+    watched_precedence_over_muted
   ]
 
   NOTIFICATION_SCHEDULE_ATTRS = -> do
@@ -63,6 +65,7 @@ class UserUpdater
 
   def initialize(actor, user)
     @user = user
+    @user_guardian = Guardian.new(user)
     @guardian = Guardian.new(actor)
     @actor = actor
   end
@@ -151,10 +154,10 @@ class UserUpdater
 
     # special handling for theme_id cause we need to bump a sequence number
     if attributes.key?(:theme_ids)
-      user_guardian = Guardian.new(user)
       attributes[:theme_ids].reject!(&:blank?)
       attributes[:theme_ids].map!(&:to_i)
-      if user_guardian.allow_themes?(attributes[:theme_ids])
+
+      if @user_guardian.allow_themes?(attributes[:theme_ids])
         user.user_option.theme_key_seq += 1 if user.user_option.theme_ids != attributes[:theme_ids]
       else
         attributes.delete(:theme_ids)
@@ -209,14 +212,22 @@ class UserUpdater
       if attributes.key?(:sidebar_category_ids)
         SidebarSectionLinksUpdater.update_category_section_links(
           user,
-          category_ids: attributes[:sidebar_category_ids],
+          category_ids:
+            Category
+              .secured(@user_guardian)
+              .where(id: attributes[:sidebar_category_ids])
+              .pluck(:id),
         )
       end
 
       if attributes.key?(:sidebar_tag_names) && SiteSetting.tagging_enabled
         SidebarSectionLinksUpdater.update_tag_section_links(
           user,
-          tag_names: attributes[:sidebar_tag_names],
+          tag_ids:
+            DiscourseTagging
+              .filter_visible(Tag, @user_guardian)
+              .where(name: attributes[:sidebar_tag_names])
+              .pluck(:id),
         )
       end
 
@@ -237,6 +248,7 @@ class UserUpdater
           attributes.fetch(:name) { "" },
         )
       end
+      DiscourseEvent.trigger(:within_user_updater_transaction, user, attributes)
     rescue Addressable::URI::InvalidURIError => e
       # Prevent 500 for crazy url input
       return saved
@@ -251,7 +263,11 @@ class UserUpdater
         end
       end
       if attributes.key?(:seen_popups) || attributes.key?(:skip_new_user_tips)
-        MessageBus.publish("/user-tips", user.user_option.seen_popups, user_ids: [user.id])
+        MessageBus.publish(
+          "/user-tips/#{user.id}",
+          user.user_option.seen_popups,
+          user_ids: [user.id],
+        )
       end
       DiscourseEvent.trigger(:user_updated, user)
     end
@@ -347,6 +363,6 @@ class UserUpdater
 
   def format_url(website)
     return nil if website.blank?
-    website =~ /^http/ ? website : "http://#{website}"
+    website =~ /\Ahttp/ ? website : "http://#{website}"
   end
 end
diff --git a/app/services/word_watcher.rb b/app/services/word_watcher.rb
index 90529705c43..f37f48fe2d1 100644
--- a/app/services/word_watcher.rb
+++ b/app/services/word_watcher.rb
@@ -2,7 +2,7 @@
 
 class WordWatcher
   REPLACEMENT_LETTER ||= CGI.unescape_html("&#9632;")
-  CACHE_VERSION = 2
+  CACHE_VERSION ||= 3
 
   def initialize(raw)
     @raw = raw
@@ -24,8 +24,9 @@ class WordWatcher
       .limit(WatchedWord::MAX_WORDS_PER_ACTION)
       .order(:id)
       .pluck(:word, :replacement, :case_sensitive)
-      .map { |w, r, c| [w, { replacement: r, case_sensitive: c }.compact] }
-      .to_h
+      .to_h do |w, r, c|
+        [w, { word: word_to_regexp(w, whole: false), replacement: r, case_sensitive: c }.compact]
+      end
   end
 
   def self.words_for_action_exists?(action)
@@ -44,23 +45,23 @@ class WordWatcher
     end
   end
 
-  def self.serializable_word_matcher_regexp(action)
-    word_matcher_regexp_list(action).map { |r| { r.source => { case_sensitive: !r.casefold? } } }
+  def self.serializable_word_matcher_regexp(action, engine: :ruby)
+    word_matcher_regexp_list(action, engine: engine).map do |r|
+      { r.source => { case_sensitive: !r.casefold? } }
+    end
   end
 
   # This regexp is run in miniracer, and the client JS app
   # Make sure it is compatible with major browsers when changing
   # hint: non-chrome browsers do not support 'lookbehind'
-  def self.word_matcher_regexp_list(action, raise_errors: false)
+  def self.word_matcher_regexp_list(action, engine: :ruby, raise_errors: false)
     words = get_cached_words(action)
     return [] if words.blank?
 
     grouped_words = { case_sensitive: [], case_insensitive: [] }
 
-    words.each do |w, attrs|
-      word = word_to_regexp(w)
-      word = "(#{word})" if SiteSetting.watched_words_regular_expressions?
-
+    words.each do |word, attrs|
+      word = word_to_regexp(word, whole: SiteSetting.watched_words_regular_expressions?)
       group_key = attrs[:case_sensitive] ? :case_sensitive : :case_insensitive
       grouped_words[group_key] << word
     end
@@ -68,10 +69,7 @@ class WordWatcher
     regexps = grouped_words.select { |_, w| w.present? }.transform_values { |w| w.join("|") }
 
     if !SiteSetting.watched_words_regular_expressions?
-      regexps.transform_values! do |regexp|
-        regexp = "(#{regexp})"
-        "(?:\\W|^)#{regexp}(?=\\W|$)"
-      end
+      regexps.transform_values! { |regexp| wrap_regexp(regexp, engine: engine) }
     end
 
     regexps.map { |c, regexp| Regexp.new(regexp, c == :case_sensitive ? nil : Regexp::IGNORECASE) }
@@ -80,29 +78,40 @@ class WordWatcher
     [] # Admin will be alerted via admin_dashboard_data.rb
   end
 
-  def self.word_matcher_regexps(action)
-    if words = get_cached_words(action)
-      words.map { |w, opts| [word_to_regexp(w, whole: true), opts] }.to_h
-    end
+  def self.word_matcher_regexps(action, engine: :ruby)
+    get_cached_words(action)&.to_h { |word, attrs| [word_to_regexp(word, engine: engine), attrs] }
   end
 
-  def self.word_to_regexp(word, whole: false)
+  def self.word_to_regexp(word, engine: :ruby, whole: true)
     if SiteSetting.watched_words_regular_expressions?
-      # Strip ruby regexp format if present
+      # Strip Ruby regexp format if present
       regexp = word.start_with?("(?-mix:") ? word[7..-2] : word
       regexp = "(#{regexp})" if whole
       return regexp
     end
 
-    regexp = Regexp.escape(word).gsub("\\*", '\S*')
+    # Escape regular expression. Avoid using Regexp.escape because it escapes
+    # more characters than it should (for example, whitespaces)
+    regexp = word.gsub(/([.*+?^${}()|\[\]\\])/, '\\\\\1')
 
-    if whole && !SiteSetting.watched_words_regular_expressions?
-      regexp = "(?:\\W|^)(#{regexp})(?=\\W|$)"
-    end
+    # Handle wildcards
+    regexp = regexp.gsub("\\*", '\S*')
+
+    regexp = wrap_regexp(regexp, engine: engine) if whole
 
     regexp
   end
 
+  def self.wrap_regexp(regexp, engine: :ruby)
+    if engine == :js
+      "(?:\\P{L}|^)(#{regexp})(?=\\P{L}|$)"
+    elsif engine == :ruby
+      "(?:[^[:word:]]|^)(#{regexp})(?=[^[:word:]]|$)"
+    else
+      "(?:\\W|^)(#{regexp})(?=\\W|$)"
+    end
+  end
+
   def self.word_matcher_regexp_key(action)
     "watched-words-list:v#{CACHE_VERSION}:#{action}"
   end
@@ -132,18 +141,18 @@ class WordWatcher
 
   def self.replace_text(text)
     return text if text.blank?
+    replace(text, :replace)
+  end
 
-    %i[replace link]
-      .flat_map { |type| word_matcher_regexps(type).to_a }
-      .reduce(text) do |t, (word_regexp, attrs)|
-        case_flag = attrs[:case_sensitive] ? nil : Regexp::IGNORECASE
-        replace_text_with_regexp(t, Regexp.new(word_regexp, case_flag), attrs[:replacement])
-      end
+  def self.replace_link(text)
+    return text if text.blank?
+    replace(text, :link)
   end
 
   def self.apply_to_text(text)
     text = censor_text(text)
     text = replace_text(text)
+    text = replace_link(text)
     text
   end
 
@@ -212,10 +221,8 @@ class WordWatcher
   end
 
   def word_matches?(word, case_sensitive: false)
-    Regexp.new(
-      WordWatcher.word_to_regexp(word, whole: true),
-      case_sensitive ? nil : Regexp::IGNORECASE,
-    ).match?(@raw)
+    options = case_sensitive ? nil : Regexp::IGNORECASE
+    Regexp.new(WordWatcher.word_to_regexp(word), options).match?(@raw)
   end
 
   def self.replace_text_with_regexp(text, regexp, replacement)
@@ -246,4 +253,15 @@ class WordWatcher
   end
 
   private_class_method :censor_text_with_regexp
+
+  private
+
+  def self.replace(text, watch_word_type)
+    word_matcher_regexps(watch_word_type)
+      .to_a
+      .reduce(text) do |t, (word_regexp, attrs)|
+        case_flag = attrs[:case_sensitive] ? nil : Regexp::IGNORECASE
+        replace_text_with_regexp(t, Regexp.new(word_regexp, case_flag), attrs[:replacement])
+      end
+  end
 end
diff --git a/app/views/categories/index.html.erb b/app/views/categories/index.html.erb
index 93d3e170330..1812aca8367 100644
--- a/app/views/categories/index.html.erb
+++ b/app/views/categories/index.html.erb
@@ -20,6 +20,13 @@
                 </a>
               </h3>
               <div itemprop='description'><%= c.description&.html_safe %></div>
+              <% if c.subcategory_list.present? %>
+                <div class='subcategories'>
+                  <% c.subcategory_list.each_with_index do |sc, index| %>
+                    <a href='<%= sc.url %>'><%= sc.name %></a>&nbsp;
+                  <% end %>
+                </div>
+              <% end %>
             </div>
           </td>
           <td class='topics'>
diff --git a/app/views/common/_discourse_preload_stylesheet.html.erb b/app/views/common/_discourse_preload_stylesheet.html.erb
index 06402715769..efe1ac15d44 100644
--- a/app/views/common/_discourse_preload_stylesheet.html.erb
+++ b/app/views/common/_discourse_preload_stylesheet.html.erb
@@ -7,14 +7,22 @@
 <%- end %>
 
 <%- if staff? %>
-  <%= discourse_stylesheet_preload_tag(:admin) %>
+  <%- if rtl? %>
+    <%= discourse_stylesheet_preload_tag(:admin_rtl) %>
+  <%- else %>
+    <%= discourse_stylesheet_preload_tag(:admin) %>
+  <%- end %>
 <%- end %>
 
 <%- if admin? %>
-  <%= discourse_stylesheet_preload_tag(:wizard) %>
+  <%- if rtl? %>
+    <%= discourse_stylesheet_preload_tag(:wizard_rtl) %>
+  <%- else %>
+    <%= discourse_stylesheet_preload_tag(:wizard) %>
+  <%- end %>
 <%- end %>
 
-<%- Discourse.find_plugin_css_assets(include_official: allow_plugins?, include_unofficial: allow_third_party_plugins?, mobile_view: mobile_view?, desktop_view: !mobile_view?, request: request).each do |file| %>
+<%- Discourse.find_plugin_css_assets(include_official: allow_plugins?, include_unofficial: allow_third_party_plugins?, mobile_view: mobile_view?, desktop_view: !mobile_view?, request: request, rtl: rtl?).each do |file| %>
   <%= discourse_stylesheet_preload_tag(file) %>
 <%- end %>
 
diff --git a/app/views/common/_discourse_publish_stylesheet.html.erb b/app/views/common/_discourse_publish_stylesheet.html.erb
index 9429b0cd8dd..5a7b6a9bb72 100644
--- a/app/views/common/_discourse_publish_stylesheet.html.erb
+++ b/app/views/common/_discourse_publish_stylesheet.html.erb
@@ -1,6 +1,6 @@
 <%= discourse_stylesheet_link_tag 'publish', theme_id: nil %>
 
-<%- Discourse.find_plugin_css_assets(include_official: allow_plugins?, include_unofficial: allow_third_party_plugins?, mobile_view: mobile_view?, desktop_view: !mobile_view?, request: request).each do |file| %>
+<%- Discourse.find_plugin_css_assets(include_official: allow_plugins?, include_unofficial: allow_third_party_plugins?, mobile_view: mobile_view?, desktop_view: !mobile_view?, request: request, rtl: rtl?).each do |file| %>
   <%= discourse_stylesheet_link_tag(file) %>
 <%- end %>
 
diff --git a/app/views/common/_discourse_stylesheet.html.erb b/app/views/common/_discourse_stylesheet.html.erb
index ca92af30768..68dd71ab7bb 100644
--- a/app/views/common/_discourse_stylesheet.html.erb
+++ b/app/views/common/_discourse_stylesheet.html.erb
@@ -7,14 +7,22 @@
 <%- end %>
 
 <%- if staff? %>
-  <%= discourse_stylesheet_link_tag(:admin) %>
+  <%- if rtl? %>
+    <%= discourse_stylesheet_link_tag(:admin_rtl) %>
+  <%- else %>
+    <%= discourse_stylesheet_link_tag(:admin) %>
+  <%- end %>
 <%- end %>
 
 <%- if admin? %>
-  <%= discourse_stylesheet_link_tag(:wizard) %>
+  <%- if rtl? %>
+    <%= discourse_stylesheet_link_tag(:wizard_rtl) %>
+  <%- else %>
+    <%= discourse_stylesheet_link_tag(:wizard) %>
+  <%- end %>
 <%- end %>
 
-<%- Discourse.find_plugin_css_assets(include_official: allow_plugins?, include_unofficial: allow_third_party_plugins?, mobile_view: mobile_view?, desktop_view: !mobile_view?, request: request).each do |file| %>
+<%- Discourse.find_plugin_css_assets(include_official: allow_plugins?, include_unofficial: allow_third_party_plugins?, mobile_view: mobile_view?, desktop_view: !mobile_view?, request: request, rtl: rtl?).each do |file| %>
   <%= discourse_stylesheet_link_tag(file) %>
 <%- end %>
 
diff --git a/app/views/layouts/_noscript_footer.html.erb b/app/views/layouts/_noscript_footer.html.erb
index 76770aaa049..1d1f706b641 100644
--- a/app/views/layouts/_noscript_footer.html.erb
+++ b/app/views/layouts/_noscript_footer.html.erb
@@ -16,16 +16,20 @@
           <a href='<%= path "/guidelines" %>' itemprop="url"><%= t 'guidelines_topic.title' %> </a>
         </span>
       </li>
-      <li itemscope itemtype='http://schema.org/SiteNavigationElement'>
-        <span itemprop='name'>
-          <a href='<%= path "/tos" %>' itemprop="url"><%= t 'tos_topic.title' %> </a>
-        </span>
-      </li>
-      <li itemscope itemtype='http://schema.org/SiteNavigationElement'>
-        <span itemprop='name'>
-          <a href='<%= path "/privacy" %>' itemprop="url"><%= t 'privacy_topic.title' %> </a>
-        </span>
-      </li>
+      <% if tos_url.present? %>
+        <li itemscope itemtype='http://schema.org/SiteNavigationElement'>
+          <span itemprop='name'>
+            <a href='<%= tos_url %>' itemprop="url"><%= t 'tos_topic.title' %> </a>
+          </span>
+        </li>
+      <% end %>
+      <% if privacy_policy_url.present? %>
+        <li itemscope itemtype='http://schema.org/SiteNavigationElement'>
+          <span itemprop='name'>
+            <a href='<%= privacy_policy_url %>' itemprop="url"><%= t 'privacy_topic.title' %> </a>
+          </span>
+        </li>
+      <% end %>
     </ul>
   </nav>
   <p class='powered-by-link'><%= t 'powered_by_html' %></p>
diff --git a/app/views/layouts/crawler.html.erb b/app/views/layouts/crawler.html.erb
index cc8c28779da..699a0e61abf 100644
--- a/app/views/layouts/crawler.html.erb
+++ b/app/views/layouts/crawler.html.erb
@@ -9,12 +9,9 @@
     <%= theme_lookup("head_tag") %>
     <%= render_google_universal_analytics_code %>
     <%= yield :head %>
-    <% if show_browser_update? %>
-      <style>.buorg {position:absolute; z-index:111111; width:100%; top:0px; left:0px; background:#FDF2AB; text-align:left; font-family: sans-serif; color:#000; font-size: 14px;} .buorg div {padding: 8px;} .buorg a, .buorg a:visited {color:#E25600; text-decoration: underline;} @media print { .buorg { display: none !important; } }</style>
-    <% end %>
     <%= build_plugin_html 'server:before-head-close-crawler' %>
   </head>
-  <body class="crawler">
+  <body class="crawler <% if show_browser_update? %>browser-update<% end %>">
     <%= theme_lookup("header") %>
     <%= render partial: "layouts/noscript_header" %>
     <div id="main-outlet" class="wrap" role="main">
diff --git a/app/views/layouts/embed.html.erb b/app/views/layouts/embed.html.erb
index 90711df5d2c..8c095e69d99 100644
--- a/app/views/layouts/embed.html.erb
+++ b/app/views/layouts/embed.html.erb
@@ -19,6 +19,7 @@
     <%= yield :head %>
   </head>
   <body>
+    <%= theme_lookup("embedded_header") %>
     <%= yield %>
   </body>
 </html>
diff --git a/app/views/list/list.erb b/app/views/list/list.erb
index 8d35d0f0c87..e322560d233 100644
--- a/app/views/list/list.erb
+++ b/app/views/list/list.erb
@@ -38,7 +38,7 @@
   <% end %>
 <% end %>
 
-<div itemscope itemtype='http://schema.org/ItemList'>
+<div class="topic-list-container" itemscope itemtype='http://schema.org/ItemList'>
   <meta itemprop='itemListOrder' content='http://schema.org/ItemListOrderDescending'>
 
   <table class='topic-list'>
@@ -109,7 +109,7 @@
 </div>
 
 <% if @list.topics.length > 0 && @list.more_topics_url %>
-  <div role='navigation' itemscope itemtype='http://schema.org/SiteNavigationElement'>
+  <div class="navigation" role='navigation' itemscope itemtype='http://schema.org/SiteNavigationElement'>
     <% if params[:page].to_i > 0 %>
       <span itemprop='name'><a href='<%= @list.prev_topics_url %>' rel='prev' itemprop='url'><%= t 'prev_page' %></a> &nbsp;</span>
     <% end %>
diff --git a/app/views/static/login.html.erb b/app/views/static/login.html.erb
index f0128a9dd10..d6ab9644eeb 100644
--- a/app/views/static/login.html.erb
+++ b/app/views/static/login.html.erb
@@ -1,8 +1,19 @@
-<% if SiteSetting.login_required %>
-  <div class='login-required'>
-    <%= PrettyText.cook(I18n.t("login_required.#{SiteSetting.invite_only? ? "welcome_message_invite_only" : "welcome_message"}", title: SiteSetting.title)).html_safe %>
-  </div>
-<% end %>
+<%- if application_logo_url.present? %>
+  <picture class="logo-container">
+    <%- if application_logo_dark_url.present? %>
+      <source srcset="<%= application_logo_dark_url %>" media="(prefers-color-scheme: dark)" />
+    <%- end %>
+    <img src="<%= application_logo_url %>" alt="<%= SiteSetting.title %>" class="site-logo" />
+  </picture>
+<%- else %>
+  <img src="<%= waving_hand_url %>" alt="" class="waving-hand" />
+<%- end %>
+
+<div class='login-welcome__title'>
+  <%= PrettyText.cook(I18n.t("login_required.welcome_message", title: SiteSetting.title)).html_safe %>
+
+  <p class='login-welcome__description'><%= SiteSetting.site_description %></p>
+</div>
 
 <% content_for :title do %><%= @title %><% end %>
 <% content_for :head do %>
diff --git a/app/views/static/show.html.erb b/app/views/static/show.html.erb
index b82fff8fa3b..be8c9cd830f 100644
--- a/app/views/static/show.html.erb
+++ b/app/views/static/show.html.erb
@@ -10,8 +10,12 @@
         <li class='nav-item-faq'><a class='<%= @page == 'faq' ? 'active' : '' %>' href='<%=faq_path%>'><%= t 'js.faq' %></a></li>
       <% end %>
     <% end %>
-    <li class='nav-item-tos'><a href='<%= tos_path %>' class='<%= @page == 'tos' ? 'active' : '' %>'><%= t 'js.tos' %></a></li>
-    <li class='nav-item-privacy'><a href='<%= privacy_path %>' class='<%= @page == 'privacy' ? 'active' : '' %>'><%= t 'js.privacy' %></a></li>
+    <% if tos_url.present? %>
+      <li class='nav-item-tos'><a href='<%= tos_url %>' class='<%= @page == 'tos' ? 'active' : '' %>'><%= t 'js.tos' %></a></li>
+    <% end %>
+    <% if privacy_policy_url.present? %>
+      <li class='nav-item-privacy'><a href='<%= privacy_policy_url %>' class='<%= @page == 'privacy' ? 'active' : '' %>'><%= t 'js.privacy' %></a></li>
+    <% end %>
   </ul>
 
   <% if staff? %>
diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb
index d949ebb2b0e..5ddec148677 100644
--- a/app/views/topics/show.html.erb
+++ b/app/views/topics/show.html.erb
@@ -34,88 +34,87 @@
   <%= server_plugin_outlet "topic_header" %>
 
   <%- if include_crawler_content? %>
-
-  <% @topic_view.posts.each_with_index do |post, idx| %>
-    <% if (u = post.user) %>
-      <div id='post_<%= post.post_number %>' itemscope itemtype='http://schema.org/DiscussionForumPosting' class='topic-body crawler-post'>
-        <div class='crawler-post-meta'>
-          <div itemprop='publisher' itemscope itemtype="http://schema.org/Organization">
-            <meta itemprop='name' content='<%= SiteSetting.company_name.presence || SiteSetting.title %>'>
-            <% if application_logo_url.present? %>
-              <div itemprop='logo' itemscope itemtype="http://schema.org/ImageObject">
-                <meta itemprop='url' content='<%= application_logo_url %>'>
-              </div>
-            <% end %>
+    <div itemscope itemtype='http://schema.org/DiscussionForumPosting'>
+      <meta itemprop='headline' content='<%= @topic_view.title %>'>
+      <% if @topic_view.topic.category.present? %>
+        <meta itemprop='articleSection' content='<%= @topic_view.topic.category.name %>'>
+      <% end %>
+      <meta itemprop='keywords' content='<%= @tags.map(&:name).join(', ') %>'>
+      <div itemprop='publisher' itemscope itemtype="http://schema.org/Organization">
+        <meta itemprop='name' content='<%= SiteSetting.company_name.presence || SiteSetting.title %>'>
+        <% if application_logo_url.present? %>
+          <div itemprop='logo' itemscope itemtype="http://schema.org/ImageObject">
+            <meta itemprop='url' content='<%= application_logo_url %>'>
           </div>
-          <span class="creator" itemprop="author" itemscope itemtype="http://schema.org/Person">
-            <a itemprop="url" href='<%= Discourse.base_url %>/u/<%= u.username %>'><span itemprop='name'><%= u.username %></span></a>
-            <%= "(#{u.name})" if (SiteSetting.display_name_on_posts && SiteSetting.enable_names? && !u.name.blank?) %>
-            <%
-              post_custom_fields = @topic_view.post_custom_fields[post.id] || {}
-              who_username = post_custom_fields["action_code_who"] || ""
-              small_action_href = post_custom_fields["action_code_path"] || ""
-              if post.action_code
-            %>
-              <%= t("js.action_codes.#{post.action_code}", when: "", who: who_username, href: small_action_href).html_safe %>
-            <% end %>
-          </span>
-
-          <link itemprop="mainEntityOfPage" href="<%= post.topic.url %>">
-
-          <% if post.image_url %>
-            <link itemprop="image" href="<%= post.image_url %>">
-          <% end %>
-
-          <span class="crawler-post-infos">
-              <time itemprop='datePublished' datetime='<%= post.created_at.to_formatted_s(:iso8601) %>' class='post-time'>
-                <%= l post.created_at, format: :long %>
-              </time>
-            <% if post.version > 1 %>
-              <meta itemprop='dateModified' content='<%= post.last_version_at.to_formatted_s(:iso8601) %>'>
-            <% else %>
-              <meta itemprop='dateModified' content='<%= post.created_at.to_formatted_s(:iso8601) %>'>
-            <% end %>
-          <span itemprop='position'>#<%= post.post_number %></span>
-          </span>
-        </div>
-        <div class='post' itemprop='articleBody'>
-          <%= post.hidden ? t('flagging.user_must_edit').html_safe : post.cooked.html_safe %>
-        </div>
-
-        <meta itemprop='headline' content='<%= @topic_view.title %>'>
-        <% if idx == 0 %>
-          <meta itemprop='keywords' content='<%= @tags.map(&:name).join(', ') %>'>
         <% end %>
-
-        <div itemprop="interactionStatistic" itemscope itemtype="http://schema.org/InteractionCounter">
-           <meta itemprop="interactionType" content="http://schema.org/LikeAction"/>
-           <meta itemprop="userInteractionCount" content="<%= post.like_count %>" />
-           <span class='post-likes'><%= post.like_count > 0 ? t('post.has_likes', count: post.like_count) : '' %></span>
-         </div>
-
-         <div itemprop="interactionStatistic" itemscope itemtype="http://schema.org/InteractionCounter">
-            <meta itemprop="interactionType" content="http://schema.org/CommentAction"/>
-            <meta itemprop="userInteractionCount" content="<%= post.reply_count %>" />
-          </div>
-
-          <% if @topic_view.link_counts[post.id] && @topic_view.link_counts[post.id].filter { |l| l[:reflection] }.length > 0 %>
-            <div class='crawler-linkback-list' itemscope itemtype='http://schema.org/ItemList'>
-              <% @topic_view.link_counts[post.id].each_with_index do |link, i| %>
-                <% if link[:reflection] && link[:title].present? %>
-                  <div itemprop='itemListElement' itemscope itemtype='http://schema.org/ListItem'>
-                    <a href="<%=link[:url]%>" itemscope itemtype='http://schema.org/DiscussionForumPosting' itemprop='item'>
-                      <meta itemprop='url' content='<%=link[:url]%>'>
-                      <span itemprop='name'><%=link[:title]%></span>
-                    </a>
-                    <meta itemprop='position' content='<%= i+1 %>'>
-                  </div>
-                <% end %>
-              <% end %>
-            </div>
-         <% end %>
       </div>
-    <% end %>
-  <% end %>
+
+      <% @topic_view.posts.each do |post| %>
+        <% if (u = post.user) %>
+          <div id='post_<%= post.post_number %>' <%= post.is_first_post? ? "" : "itemprop='comment' itemscope itemtype='http://schema.org/Comment'".html_safe %> class='topic-body crawler-post'>
+            <div class='crawler-post-meta'>
+              <span class="creator" itemprop="author" itemscope itemtype="http://schema.org/Person">
+                <a itemprop="url" href='<%= Discourse.base_url %>/u/<%= u.username %>'><span itemprop='name'><%= u.username %></span></a>
+                <%= "(#{u.name})" if (SiteSetting.display_name_on_posts && SiteSetting.enable_names? && !u.name.blank?) %>
+                <%
+                  post_custom_fields = @topic_view.post_custom_fields[post.id] || {}
+                  who_username = post_custom_fields["action_code_who"] || ""
+                  small_action_href = post_custom_fields["action_code_path"] || ""
+                  if post.action_code
+                %>
+                  <%= t("js.action_codes.#{post.action_code}", when: "", who: who_username, href: small_action_href).html_safe %>
+                <% end %>
+              </span>
+
+              <link itemprop="mainEntityOfPage" href="<%= post.topic.url %>">
+
+              <% if post.image_url %>
+                <link itemprop="image" href="<%= post.image_url %>">
+              <% end %>
+
+              <span class="crawler-post-infos">
+                  <time itemprop='datePublished' datetime='<%= post.created_at.to_formatted_s(:iso8601) %>' class='post-time'>
+                    <%= l post.created_at, format: :long %>
+                  </time>
+                <% if post.version > 1 %>
+                  <meta itemprop='dateModified' content='<%= post.last_version_at.to_formatted_s(:iso8601) %>'>
+                <% else %>
+                  <meta itemprop='dateModified' content='<%= post.created_at.to_formatted_s(:iso8601) %>'>
+                <% end %>
+              <span itemprop='position'><%= post.post_number %></span>
+              </span>
+            </div>
+            <div class='post' itemprop='<%= post.is_first_post? ? 'articleBody' : 'text'  %>'>
+              <%= post.hidden ? t('flagging.user_must_edit').html_safe : post.cooked.html_safe %>
+            </div>
+
+            <div itemprop="interactionStatistic" itemscope itemtype="http://schema.org/InteractionCounter">
+              <meta itemprop="interactionType" content="http://schema.org/LikeAction"/>
+              <meta itemprop="userInteractionCount" content="<%= post.like_count %>" />
+              <span class='post-likes'><%= post.like_count > 0 ? t('post.has_likes', count: post.like_count) : '' %></span>
+            </div>
+
+            <div itemprop="interactionStatistic" itemscope itemtype="http://schema.org/InteractionCounter">
+                <meta itemprop="interactionType" content="http://schema.org/CommentAction"/>
+                <meta itemprop="userInteractionCount" content="<%= post.reply_count %>" />
+              </div>
+
+              <% if @topic_view.link_counts[post.id] && @topic_view.link_counts[post.id].filter { |l| l[:reflection] }.length > 0 %>
+                <div class='crawler-linkback-list' itemscope itemtype='http://schema.org/ItemList'>
+                  <% @topic_view.link_counts[post.id].each_with_index do |link, i| %>
+                    <% if link[:reflection] && link[:title].present? %>
+                      <div itemprop='itemListElement' itemscope itemtype='http://schema.org/ListItem'>
+                        <a itemprop='url' href="<%=link[:url]%>"><%=link[:title]%></a>
+                        <meta itemprop='position' content='<%= i+1 %>'>
+                      </div>
+                    <% end %>
+                  <% end %>
+                </div>
+            <% end %>
+          </div>
+        <% end %>
+      <% end %>
+    </div>
 
   <% if @topic_view.prev_page || @topic_view.next_page %>
     <div role='navigation' itemscope itemtype='http://schema.org/SiteNavigationElement' class="topic-body crawler-post">
@@ -132,7 +131,7 @@
 
   <% content_for :head do %>
     <%= auto_discovery_link_tag(@topic_view, {action: :feed, slug: @topic_view.topic.slug, topic_id: @topic_view.topic.id}, rel: 'alternate nofollow', title: t('rss_posts_in_topic', topic: @topic_view.title), type: 'application/rss+xml') %>
-    <%= raw crawlable_meta_data(title: @topic_view.title, description: @topic_view.summary(strip_images: true), image: @topic_view.image_url, read_time: @topic_view.read_time, like_count: @topic_view.like_count, ignore_canonical: true, published_time: @topic_view.published_time) %>
+    <%= raw crawlable_meta_data(title: @topic_view.title, description: @topic_view.summary(strip_images: true), image: @topic_view.image_url, read_time: @topic_view.read_time, like_count: @topic_view.like_count, ignore_canonical: true, published_time: @topic_view.published_time, breadcrumbs: @breadcrumbs, tags: @tags.map(&:name)) %>
 
     <% if @topic_view.prev_page || @topic_view.next_page %>
       <% if @topic_view.prev_page %>
diff --git a/app/views/user_notifications/digest.html.erb b/app/views/user_notifications/digest.html.erb
index b55ee1976ad..71b6531bec9 100644
--- a/app/views/user_notifications/digest.html.erb
+++ b/app/views/user_notifications/digest.html.erb
@@ -4,13 +4,12 @@
   </span>
   <table border="0" cellspacing="0" width="100%">
     <tr>
-      <td></td>
-      <td width="650">
+      <td>
         <%- if I18n.t('user_notifications.digest.custom.html.header').present? %>
           <table width="100%" class="digest-header logo-header" dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="border-spacing:0;padding:0;">
             <tr>
               <td></td>
-              <td style="padding:0;">
+              <td width="650" style="padding:0;">
                 <%= raw(t 'user_notifications.digest.custom.html.header') %>
               </td>
               <td></td>
@@ -20,7 +19,7 @@
           <table width="100%" class="digest-header text-header with-dir" style="background-color:#<%= @header_bgcolor -%>;">
             <tr>
               <td></td>
-              <td align="center" style="text-align: center;padding: 20px 0; font-family:Arial,sans-serif;">
+              <td width="650" align="center" style="text-align: center;padding: 20px 0; font-family:Arial,sans-serif;">
                 <a href="<%= Discourse.base_url %>" style="color:#<%= @header_color -%>;font-size:22px;text-decoration:none;">
                 <%- if logo_url.blank? %>
                   <%= SiteSetting.title %>
@@ -35,7 +34,7 @@
         <%- end %>
         <table width="100%" class="body digest-content with-dir" style="background:#f3f3f3;padding:0;border-spacing:0;font-family:Arial,sans-serif;font-size:14px;font-weight:200;line-height:1.3;vertical-align:top;">
           <tr>
-            <td class="side-spacer" style="width:5%;vertical-align:top;padding:0;">
+            <td class="side-spacer" style="vertical-align:top;padding:0;">
               <div class="with-accent-colors">
                 <table class="spacer with-accent-colors" style="border-spacing:0;padding:0;width:100%">
                   <tbody>
@@ -46,7 +45,7 @@
                 </table>
               </div>
             </td>
-            <td style="vertical-align:top;padding:0;font-family:Arial,sans-serif;">
+            <td  width="650" style="vertical-align:top;padding:0;font-family:Arial,sans-serif;">
               <table align="center" class="digest-content-header with-accent-colors with-dir" style="border-spacing:0;margin:0;padding:0;vertical-align:top;width:100%">
                 <tbody>
                   <tr>
@@ -57,14 +56,14 @@
                         <tbody>
                           <tr class="header-stat-count">
                             <%- @counts.each do |count| -%>
-                              <td style="text-align:center;font-size:36px;font-weight:400;">
+                              <td id="<%= count[:id] %>_stat_count" style="text-align:center;font-size:36px;font-weight:400;">
                                 <a class="with-accent-colors" href="<%= count[:href] -%>"><strong><%= count[:value] -%></strong></a>
                               </td>
                             <%- end -%>
                           </tr>
                           <tr class="header-stat-description">
                             <%- @counts.each do |count| -%>
-                              <td style="font-size:14px;font-weight:400;text-align:center;">
+                              <td id="<%= count[:id] %>_stat_description" style="font-size:14px;font-weight:400;text-align:center;">
                                 <a class="with-accent-colors" href="<%= count[:href] -%>"><strong><%=t count[:label_key] -%></strong></a>
                               </td>
                             <%- end -%>
@@ -186,7 +185,7 @@
                 </tbody>
               </table>
             </td>
-            <td class="side-spacer" style="width:5%;vertical-align:top;padding:0;">
+            <td class="side-spacer" style="vertical-align:top;padding:0;">
               <!-- Background that goes down part-way behind content -->
               <div class="with-accent-colors">
                 <table class="spacer with-dir with-accent-colors" style="border-spacing:0;padding:0;width:100%">
@@ -208,8 +207,8 @@
       
           <table width="100%" class="body with-dir" style="background:#f3f3f3;border-spacing:0;border-collapse:collapse!important;font-family:Arial,sans-serif;font-size:14px;font-weight:200;line-height:1.3;padding:0;vertical-align:top;">
             <tr>
-              <td class="side-spacer" style="width:5%;padding:0;">&nbsp;</td>
-              <td class="with-dir" align="center" valign="top" style="border-collapse:collapse!important;line-height:1.3;margin:0;padding:0;vertical-align:top;">
+              <td class="side-spacer" style="padding:0;">&nbsp;</td>
+              <td class="with-dir" width="650" align="center" valign="top" style="border-collapse:collapse!important;line-height:1.3;margin:0;padding:0;vertical-align:top;">
 
                 <% @popular_posts.each do |post| %>
 
@@ -270,7 +269,7 @@
                 <% end %>
 
               </td>
-              <td class="side-spacer" style="width:5%;padding:0;">&nbsp;</td>
+              <td class="side-spacer" style="padding:0;">&nbsp;</td>
             </tr>
           </table>
         <% end %>
@@ -283,8 +282,8 @@
          
           <table width="100%" class="digest-new-topics body with-dir" style="background:#f3f3f3;border-spacing:0;border-collapse:collapse!important;font-family:Arial,sans-serif;font-size:14px;font-weight:200;line-height:1.3;padding:0;vertical-align:top;">
             <tr>
-              <td class="side-spacer" style="width:5%;padding:0;">&nbsp;</td>
-              <td align="center" valign="top" style="border-collapse:collapse!important;margin:0;padding:0;">
+              <td class="side-spacer" style="padding:0;">&nbsp;</td>
+              <td width="650" align="center" valign="top" style="border-collapse:collapse!important;margin:0;padding:0;">
 
                 <table class="digest-new-topic with-dir" style="padding:0;vertical-align:top;width:100%">
                   <tbody>
@@ -323,7 +322,7 @@
                 </table>
 
               </td>
-              <td class="side-spacer" style="width:5%;padding:0;">&nbsp;</td>
+              <td class="side-spacer" style="padding:0;">&nbsp;</td>
             </tr>
           </table>
 
@@ -374,7 +373,7 @@
         <table width="100%" class='summary-footer with-dir'>
           <tr>
             <td></td>
-            <td align="center">
+            <td width="650" align="center">
               <%=raw(t 'user_notifications.digest.unsubscribe',
                       site_link: html_site_link,
                       email_preferences_link: link_to(t('user_notifications.digest.your_email_settings'), Discourse.base_url + '/my/preferences/emails'),
diff --git a/bin/bundle b/bin/bundle
index a71368e3230..27a9357d17e 100755
--- a/bin/bundle
+++ b/bin/bundle
@@ -73,7 +73,7 @@ m = Module.new do
 
     requirement = bundler_gem_version.approximate_recommendation
 
-    return requirement unless Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.7.0")
+    return requirement if Gem::Version.new(Gem::VERSION) >= Gem::Version.new("2.7.0")
 
     requirement += ".a" if bundler_gem_version.prerelease?
 
diff --git a/bin/docker/boot_dev b/bin/docker/boot_dev
index 33e3b2dd3f2..24e3521b017 100755
--- a/bin/docker/boot_dev
+++ b/bin/docker/boot_dev
@@ -110,6 +110,9 @@ if [ "${initialize}" = "initialize" ]; then
     echo "Installing gems..."
     "${SCRIPTPATH}/bundle" install
 
+    echo "Yarn install..."
+    "${SCRIPTPATH}/exec" yarn install --cwd app/assets/javascripts/discourse
+
     echo "Migrating database..."
     "${SCRIPTPATH}/rake" db:migrate
     RAILS_ENV=test "${SCRIPTPATH}/rake" db:migrate
diff --git a/bin/turbo_rspec b/bin/turbo_rspec
index 7d4c4278163..1ce0290c5f4 100755
--- a/bin/turbo_rspec
+++ b/bin/turbo_rspec
@@ -1,78 +1,90 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-ENV['RAILS_ENV'] ||= 'test'
+ENV["RAILS_ENV"] ||= "test"
 
-require './lib/turbo_tests'
-require 'optparse'
+require "./lib/turbo_tests"
+require "optparse"
 
 requires = []
 formatters = []
 verbose = false
 fail_fast = nil
+seed = rand(2**16)
+profile = false
+profile_print_slowest_examples_count = 10
+use_runtime_info = nil
 
-OptionParser.new do |opts|
-  opts.on("-r", "--require PATH", "Require a file.") do |filename|
-    requires << filename
-  end
+OptionParser
+  .new do |opts|
+    opts.on("-r", "--require PATH", "Require a file.") { |filename| requires << filename }
 
-  opts.on("-f", "--format FORMATTER", "Choose a formatter.") do |name|
-    formatters << {
-      name: name,
-      outputs: []
-    }
-  end
-
-  opts.on("-o", "--out FILE", "Write output to a file instead of $stdout") do |filename|
-    if formatters.empty?
-      formatters << {
-        name: "progress",
-        outputs: []
-      }
+    opts.on("-f", "--format FORMATTER", "Choose a formatter.") do |name|
+      formatters << { name: name, outputs: [] }
     end
-    formatters.last[:outputs] << filename
-  end
 
-  opts.on("-v", "--verbose", "More output") do
-    verbose = true
-  end
+    opts.on("-o", "--out FILE", "Write output to a file instead of $stdout") do |filename|
+      formatters << { name: "progress", outputs: [] } if formatters.empty?
+      formatters.last[:outputs] << filename
+    end
 
-  opts.on("--fail-fast=[N]") do |n|
-    n = Integer(n) rescue nil
-    fail_fast = (n.nil? || n < 1) ? 1 : n
-  end
+    opts.on("-v", "--verbose", "More output") { verbose = true }
 
-end.parse!(ARGV)
+    opts.on(
+      "-p",
+      "--profile=[COUNT]",
+      "Benchmark the runtime of each example and list the slowest examples (default: 10)",
+    ) do |count|
+      profile = true
+      profile_print_slowest_examples_count = count.to_i if count
+    end
+
+    opts.on("--fail-fast=[N]") do |n|
+      n =
+        begin
+          Integer(n)
+        rescue StandardError
+          nil
+        end
+      fail_fast = (n.nil? || n < 1) ? 1 : n
+    end
+
+    opts.on("--seed SEED", "The seed for the random order") { |s| seed = s.to_i }
+
+    opts.on("--use-runtime-info", "Use runtime info for tests group splitting") do
+      use_runtime_info = true
+    end
+  end
+  .parse!(ARGV)
 
 requires.each { |f| require(f) }
 
-if formatters.empty?
-  formatters << {
-    name: "progress",
-    outputs: []
-  }
+formatters << { name: "progress", outputs: [] } if formatters.empty?
+
+formatters.each { |formatter| formatter[:outputs] << "-" if formatter[:outputs].empty? }
+
+if ARGV.empty?
+  files = TurboTests::Runner.default_spec_folders
+  use_runtime_info = true if use_runtime_info.nil?
+else
+  files = ARGV
+  use_runtime_info = false if use_runtime_info.nil?
 end
 
-formatters.each do |formatter|
-  if formatter[:outputs].empty?
-    formatter[:outputs] << '-'
-  end
-end
+puts "::group::Run turbo_rspec" if ENV["GITHUB_ACTIONS"]
+puts "Running turbo_rspec (seed: #{seed}) using files in: #{files}"
+puts "::endgroup::" if ENV["GITHUB_ACTIONS"]
 
-# We do not want to include system specs by default, they are super
-# slow and require a selenium server to be running.
-default_spec_dirs = Dir.entries("#{Rails.root}/spec").reject do |entry|
-  !File.directory?("spec/#{entry}") || ["..", ".", "system"].include?(entry)
-end.map { |entry| "spec/#{entry}" }
-files = ARGV.empty? ? default_spec_dirs : ARGV
-
-puts "Running turbo_rspec using files in #{files}"
 success =
   TurboTests::Runner.run(
     formatters: formatters,
     files: files,
     verbose: verbose,
-    fail_fast: fail_fast
+    fail_fast: fail_fast,
+    use_runtime_info: use_runtime_info,
+    seed: seed.to_s,
+    profile:,
+    profile_print_slowest_examples_count:,
   )
 
 if success
diff --git a/bin/yarn-app b/bin/yarn-app
new file mode 100755
index 00000000000..2fde5b9ed6e
--- /dev/null
+++ b/bin/yarn-app
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+yarn --cwd "`dirname $0`"/../app/assets/javascripts/discourse "$@"
diff --git a/config/application.rb b/config/application.rb
index aece9b79d4f..9664112df22 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.7.0")
-  STDERR.puts "Discourse requires Ruby 2.7 or above"
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.2.0")
+  STDERR.puts "Discourse requires Ruby 3.2 or above"
   exit 1
 end
 
@@ -94,7 +94,6 @@ module Discourse
     config.active_record.cache_versioning = false # our custom cache class doesn’t support this
     config.action_controller.forgery_protection_origin_check = false
     config.active_record.belongs_to_required_by_default = false
-    config.active_record.legacy_connection_handling = true
     config.active_record.yaml_column_permitted_classes = [
       Hash,
       HashWithIndifferentAccess,
@@ -144,7 +143,7 @@ module Discourse
     config.active_record.use_schema_cache_dump = false
 
     # per https://www.owasp.org/index.php/Password_Storage_Cheat_Sheet
-    config.pbkdf2_iterations = 64_000
+    config.pbkdf2_iterations = 600_000
     config.pbkdf2_algorithm = "sha256"
 
     # rack lock is nothing but trouble, get rid of it
diff --git a/config/dev_defaults.yml b/config/dev_defaults.yml
index dcdb65dfa09..0420be8feb1 100644
--- a/config/dev_defaults.yml
+++ b/config/dev_defaults.yml
@@ -35,6 +35,8 @@ topic:
     max: 3
 user:
   count: 30
+email_logs:
+  count: 2
 
 new_user:
   username: new_user
diff --git a/config/discourse_defaults.conf b/config/discourse_defaults.conf
index 74b202d0645..3c14bb975cd 100644
--- a/config/discourse_defaults.conf
+++ b/config/discourse_defaults.conf
@@ -365,3 +365,15 @@ preload_link_header = false
 
 # When using an external upload store, redirect `user_avatar` requests instead of proxying
 redirect_avatar_requests = false
+
+# Force the entire cluster into postgres readonly mode. Equivalent to running `Discourse.enable_pg_force_readonly_mode`
+pg_force_readonly_mode = false
+
+# default DNS query timeout for FinalDestination (used when not explicitely given programmatically)
+dns_query_timeout_secs =
+
+# Default global regex timeout
+regex_timeout_seconds = 2
+
+# Allow impersonation function on the cluster to admins
+allow_impersonation = true
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 62b3dd28438..1ea67794833 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -9,8 +9,7 @@ Discourse::Application.configure do
   config.cache_classes = false
   config.file_watcher = ActiveSupport::EventedFileUpdateChecker
 
-  # Log error messages when you accidentally call methods on nil.
-  config.eager_load = false
+  config.eager_load = ENV["DISCOURSE_ZEITWERK_EAGER_LOAD"] == "1"
 
   # Use the schema_cache.yml file generated during db:migrate (via db:schema:cache:dump)
   config.active_record.use_schema_cache_dump = true
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 5b6cd924561..4d57a995857 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -67,4 +67,10 @@ Discourse::Application.configure do
   end
 
   config.active_record.dump_schema_after_migration = false
+
+  if ENV["RAILS_LOG_TO_STDOUT"].present?
+    config.logger = ActiveSupport::TaggedLogging.new(Logger.new(STDOUT))
+  end
+
+  config.active_record.action_on_strict_loading_violation = :log
 end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index e80e4f7a648..aa539725753 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -44,7 +44,7 @@ Discourse::Application.configure do
   config.assets.compile = true
   config.assets.digest = false
 
-  config.eager_load = false
+  config.eager_load = ENV["DISCOURSE_ZEITWERK_EAGER_LOAD"] == "1"
 
   if ENV["RAILS_ENABLE_TEST_LOG"]
     config.logger = Logger.new(STDOUT)
diff --git a/config/initializers/000-development_reload_warnings.rb b/config/initializers/000-development_reload_warnings.rb
index bc1f74718f8..bc7acc57851 100644
--- a/config/initializers/000-development_reload_warnings.rb
+++ b/config/initializers/000-development_reload_warnings.rb
@@ -20,8 +20,11 @@ if Rails.env.development? && !Rails.configuration.cache_classes && Discourse.run
 
       not_autoloaded =
         files.filter_map do |file|
-          autoloaded = Rails.autoloaders.main.autoloads.key? file
-          Pathname.new(file).relative_path_from(Rails.root) if !autoloaded
+          autoloaded = Rails.autoloaders.main.__autoloads.key? file
+
+          if !autoloaded && !file.match(%r{/spec/})
+            Pathname.new(file).relative_path_from(Rails.root)
+          end
         end
 
       if not_autoloaded.length > 0
diff --git a/config/initializers/002-rails_failover.rb b/config/initializers/002-rails_failover.rb
index 276e6d951bb..d5ee5c2da24 100644
--- a/config/initializers/002-rails_failover.rb
+++ b/config/initializers/002-rails_failover.rb
@@ -69,7 +69,11 @@ if defined?(RailsFailover::ActiveRecord)
   end
 
   RailsFailover::ActiveRecord.register_force_reading_role_callback do
-    Discourse.redis.exists?(Discourse::PG_READONLY_MODE_KEY, Discourse::PG_FORCE_READONLY_MODE_KEY)
+    GlobalSetting.pg_force_readonly_mode ||
+      Discourse.redis.exists?(
+        Discourse::PG_READONLY_MODE_KEY,
+        Discourse::PG_FORCE_READONLY_MODE_KEY,
+      )
   rescue => e
     if !e.is_a?(Redis::CannotConnectError)
       Rails.logger.warn "#{e.class} #{e.message}: #{e.backtrace.join("\n")}"
diff --git a/config/initializers/004-message_bus.rb b/config/initializers/004-message_bus.rb
index 2fa74be763d..383d8a01134 100644
--- a/config/initializers/004-message_bus.rb
+++ b/config/initializers/004-message_bus.rb
@@ -62,6 +62,11 @@ def setup_message_bus_env(env)
 
     extra_headers["Discourse-Logged-Out"] = "1" if env[Auth::DefaultCurrentUserProvider::BAD_TOKEN]
 
+    if Rails.env.development?
+      # Adding no-transform prevents the expressjs ember-cli proxy buffering/compressing the response
+      extra_headers["Cache-Control"] = "no-transform, must-revalidate, private, max-age=0"
+    end
+
     hash = {
       extra_headers: extra_headers,
       user_id: user_id,
diff --git a/config/initializers/006-mini_profiler.rb b/config/initializers/006-mini_profiler.rb
index 2972a981106..3ea4a6fa798 100644
--- a/config/initializers/006-mini_profiler.rb
+++ b/config/initializers/006-mini_profiler.rb
@@ -29,31 +29,33 @@ if defined?(Rack::MiniProfiler) && defined?(Rack::MiniProfiler::Config)
     GlobalSetting.mini_profiler_snapshots_transport_url
   Rack::MiniProfiler.config.snapshots_transport_auth_key =
     GlobalSetting.mini_profiler_snapshots_transport_auth_key
-  Rack::MiniProfiler.config.skip_paths = [
-    %r{^/message-bus},
-    %r{^/extra-locales},
-    %r{topics/timings},
-    /assets/,
-    %r{/user_avatar/},
-    %r{/letter_avatar/},
-    %r{/letter_avatar_proxy/},
-    %r{/highlight-js/},
-    %r{/svg-sprite/},
-    /qunit/,
-    %r{srv/status},
-    /commits-widget/,
-    %r{^/cdn_asset},
-    %r{^/logs},
-    %r{^/site_customizations},
-    %r{^/uploads},
-    %r{^/secure-media-uploads},
-    %r{^/secure-uploads},
-    %r{^/javascripts/},
-    %r{^/images/},
-    %r{^/stylesheets/},
-    %r{^/favicon/proxied},
-    %r{^/theme-javascripts},
-  ]
+  Rack::MiniProfiler.config.skip_paths =
+    %w[
+      /assets/
+      /cdn_asset/
+      /extra-locales/
+      /favicon/proxied
+      /highlight-js/
+      /images/
+      /javascripts/
+      /letter_avatar_proxy/
+      /letter_avatar/
+      /logs
+      /manifest.webmanifest
+      /message-bus/
+      /opensearch.xml
+      /presence/
+      /secure-media-uploads/
+      /secure-uploads/
+      /srv/status
+      /stylesheets/
+      /svg-sprite/
+      /theme-javascripts
+      /topics/timings
+      /uploads/
+      /user_avatar/
+      /theme-qunit
+    ].map { |path| "#{Discourse.base_path}#{path}" }
 
   # we DO NOT WANT mini-profiler loading on anything but real desktops and laptops
   # so let's rule out all handheld, tablet, and mobile devices
diff --git a/config/initializers/012-web_hook_events.rb b/config/initializers/012-web_hook_events.rb
index 520f4ecd6fc..d7a7e2979b8 100644
--- a/config/initializers/012-web_hook_events.rb
+++ b/config/initializers/012-web_hook_events.rb
@@ -55,12 +55,18 @@ end
   DiscourseEvent.on(event) { |tag| WebHook.enqueue_object_hooks(:tag, tag, event, TagSerializer) }
 end
 
-%i[user_badge_granted].each do |event|
-  # user_badge_revoked
-  DiscourseEvent.on(event) do |badge, user_id|
-    ub = UserBadge.find_by(badge: badge, user_id: user_id)
-    WebHook.enqueue_object_hooks(:user_badge, ub, event, UserBadgeSerializer)
-  end
+DiscourseEvent.on(:user_badge_granted) do |badge_id, user_id|
+  ub = UserBadge.find_by(badge_id: badge_id, user_id: user_id)
+  WebHook.enqueue_object_hooks(:user_badge, ub, :user_badge_granted, UserBadgeSerializer)
+end
+
+DiscourseEvent.on(:user_badge_revoked) do |args|
+  WebHook.enqueue_object_hooks(
+    :user_badge,
+    args[:user_badge],
+    :user_badge_revoked,
+    UserBadgeSerializer,
+  )
 end
 
 %i[reviewable_created reviewable_score_updated].each do |event|
@@ -94,6 +100,7 @@ DiscourseEvent.on(:user_added_to_group) do |user, group, options|
     group_user,
     :user_added_to_group,
     WebHookGroupUserSerializer,
+    group_ids: [group.id],
   )
 end
 
diff --git a/config/initializers/014-track-setting-changes.rb b/config/initializers/014-track-setting-changes.rb
index 410b8091d70..d6b3d750338 100644
--- a/config/initializers/014-track-setting-changes.rb
+++ b/config/initializers/014-track-setting-changes.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+PRIVATE_BOOTSTRAP_MODE_MIN_USERS = 10
+
 DiscourseEvent.on(:site_setting_changed) do |name, old_value, new_value|
   Category.clear_subcategory_ids if name === :max_category_nesting
 
@@ -29,6 +31,20 @@ DiscourseEvent.on(:site_setting_changed) do |name, old_value, new_value|
     end
   end
 
+  # Set bootstrap min users for private sites to a lower default
+  if name == :login_required && SiteSetting.bootstrap_mode_enabled == true
+    if new_value == true &&
+         SiteSetting.bootstrap_mode_min_users == SiteSetting.defaults.get(:bootstrap_mode_min_users)
+      SiteSetting.bootstrap_mode_min_users = PRIVATE_BOOTSTRAP_MODE_MIN_USERS
+    end
+
+    # Set bootstrap min users for public sites back to the default
+    if new_value == false &&
+         SiteSetting.bootstrap_mode_min_users == PRIVATE_BOOTSTRAP_MODE_MIN_USERS
+      SiteSetting.bootstrap_mode_min_users = SiteSetting.defaults.get(:bootstrap_mode_min_users)
+    end
+  end
+
   Stylesheet::Manager.clear_color_scheme_cache! if %i[base_font heading_font].include?(name)
 
   Report.clear_cache(:storage_stats) if %i[backup_location s3_backup_bucket].include?(name)
@@ -47,4 +63,28 @@ DiscourseEvent.on(:site_setting_changed) do |name, old_value, new_value|
   if name == :reviewable_low_priority_threshold && Reviewable.min_score_for_priority(:medium) > 0
     Reviewable.set_priorities(low: new_value)
   end
+
+  Emoji.clear_cache && Discourse.request_refresh! if name == :emoji_deny_list
+
+  Discourse.clear_urls! if %i[tos_topic_id privacy_topic_id].include?(name)
+
+  # Update seeded topics
+  if %i[title site_description].include?(name)
+    topics = SeedData::Topics.with_default_locale
+    topics.update(site_setting_names: ["welcome_topic_id"], skip_changed: true)
+  elsif %i[company_name contact_email governing_law city_for_disputes].include?(name)
+    topics = SeedData::Topics.with_default_locale
+    %w[tos_topic_id privacy_topic_id].each do |site_setting|
+      topic_id = SiteSetting.get(site_setting)
+      if topic_id > 0 && Topic.with_deleted.exists?(id: topic_id)
+        if SiteSetting.company_name.blank?
+          topics.delete(site_setting_names: [site_setting], skip_changed: true)
+        else
+          topics.update(site_setting_names: [site_setting], skip_changed: true)
+        end
+      elsif SiteSetting.company_name.present?
+        topics.create(site_setting_names: [site_setting])
+      end
+    end
+  end
 end
diff --git a/config/initializers/100-logster.rb b/config/initializers/100-logster.rb
index 8bbbc2a7a1c..5c227b99834 100644
--- a/config/initializers/100-logster.rb
+++ b/config/initializers/100-logster.rb
@@ -7,15 +7,6 @@ if GlobalSetting.skip_redis?
   return
 end
 
-if Rails.env.development? && RUBY_VERSION.match?(/^2\.5\.[23]/)
-  STDERR.puts "WARNING: Discourse development environment runs slower on Ruby 2.5.3 or below"
-  STDERR.puts "We recommend you upgrade to the latest Ruby 2.x for the optimal development performance"
-
-  # we have to used to older and slower version of the logger cause the new one exposes a Ruby bug in
-  # the Queue class which causes segmentation faults
-  Logster::Scheduler.disable
-end
-
 if Rails.env.development? && !Sidekiq.server? && ENV["RAILS_LOGS_STDOUT"] == "1"
   Rails.application.config.after_initialize do
     console = ActiveSupport::Logger.new(STDOUT)
diff --git a/config/initializers/100-regex-timeout.rb b/config/initializers/100-regex-timeout.rb
new file mode 100644
index 00000000000..9a9ffe0b4e4
--- /dev/null
+++ b/config/initializers/100-regex-timeout.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+Regexp.timeout =
+  GlobalSetting.regex_timeout_seconds.to_i if GlobalSetting.regex_timeout_seconds.present?
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 191f6acc288..d23916150b9 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -51,6 +51,7 @@ Rails.application.config.assets.precompile += %w[
   embed-application.js
   scripts/discourse-test-listen-boot
   scripts/discourse-boot
+  workbox-*/*
 ]
 
 Rails.application.config.assets.precompile += EmberCli.assets.map { |name| name.sub(".js", ".map") }
@@ -80,7 +81,8 @@ start_path = ::Rails.root.join("app/assets").to_s
 exclude = [".es6", ".hbs", ".hbr", ".js", ".css", ".lock", ".json", ".log", ".html", ""]
 Rails.application.config.assets.precompile << lambda do |logical_path, filename|
   filename.start_with?(start_path) && !filename.include?("/node_modules/") &&
-    !filename.include?("/dist/") && !exclude.include?(File.extname(logical_path))
+    !filename.include?("/dist/") && !filename.include?("/patches/") &&
+    !exclude.include?(File.extname(logical_path))
 end
 
 Discourse
diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index a29c49713ee..7852c7aa98a 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -296,16 +296,6 @@ ar:
     software_update_prompt:
       message: "لقد حدَّثنا هذا الموقع، <span>يُرجى التحديث </span>، أو قد تواجه سلوكًا غير متوقَّع."
       dismiss: "تجاهل"
-    bootstrap_mode_enabled:
-      zero: "أنت في وضع تمهيد التشغيل لتسهيل إطلاق موقعك الجديد. سيتم منح جميع المستخدمين الجُدد مستوى الثقة 1 وتفعيل الرسائل الإلكترونية التلخيصية لهم. وسيتم إيقاف هذا الوضع تلقائيًا عند انضمام %{count} مستخدم."
-      one: "أنت في وضع تمهيد التشغيل لتسهيل إطلاق موقعك الجديد. سيتم منح جميع المستخدمين الجُدد مستوى الثقة 1 وتفعيل الرسائل الإلكترونية التلخيصية لهم. وسيتم إيقاف هذا الوضع تلقائيًا عند انضمام مستخدم واحد (%{count})."
-      two: "أنت في وضع تمهيد التشغيل لتسهيل إطلاق موقعك الجديد. سيتم منح جميع المستخدمين الجُدد مستوى الثقة 1 وتفعيل الرسائل الإلكترونية التلخيصية لهم. وسيتم إيقاف هذا الوضع تلقائيًا عند انضمام مستخدمَين (%{count})."
-      few: "أنت في وضع تمهيد التشغيل لتسهيل إطلاق موقعك الجديد. سيتم منح جميع المستخدمين الجُدد مستوى الثقة 1 وتفعيل الرسائل الإلكترونية التلخيصية لهم. وسيتم إيقاف هذا الوضع تلقائيًا عند انضمام %{count} مستخدمين."
-      many: "أنت في وضع تمهيد التشغيل لتسهيل إطلاق موقعك الجديد. سيتم منح جميع المستخدمين الجُدد مستوى الثقة 1 وتفعيل الرسائل الإلكترونية التلخيصية لهم. وسيتم إيقاف هذا الوضع تلقائيًا عند انضمام %{count} مستخدمًا."
-      other: "أنت في وضع تمهيد التشغيل لتسهيل إطلاق موقعك الجديد. سيتم منح جميع المستخدمين الجُدد مستوى الثقة 1 وتفعيل الرسائل الإلكترونية التلخيصية لهم. وسيتم إيقاف هذا الوضع تلقائيًا عند انضمام %{count} مستخدم."
-    bootstrap_mode_disabled: "سيتم إيقاف وضع تمهيد التشغيل خلال 24 ساعة."
-    bootstrap_invite_button_title: "إرسال الدعوات"
-    bootstrap_wizard_link_title: "إنهاء معالج الإعداد"
     themes:
       default_description: "افتراضي"
       broken_theme_alert: "قد لا يعمل موقعك كما ينبغي بسبب وجود أخطاء في السمة/المكوِّن."
@@ -430,11 +420,9 @@ ar:
       edit_bookmark: "تعديل الإشارة المرجعية"
       clear_bookmarks: "مسح الإشارات المرجعية"
       help:
-        bookmark: "انقر لإضافة إشارة مرجعية على المنشور الأول في هذا الموضوع"
-        edit_bookmark: "انقر لتعديل الإشارة المرجعية في هذا الموضوع"
         edit_bookmark_for_topic: "انقر لتعديل الإشارة المرجعية لهذا الموضوع"
         unbookmark: "انقر لإزالة كل الإشارات المرجعية في هذا الموضوع"
-        unbookmark_with_reminder: "انقر لإزالة جميع الإشارات المرجعية والتذكيرات في هذا الموضوع."
+        unbookmark_with_reminder: "انقر لإزالة جميع الإشارات المرجعية والتذكيرات في هذا الموضوع"
     bookmarks:
       created: "لقد وضعت إشارة مرجعية على هذا المنشور. %{name}"
       created_generic: "لقد وضعت إشارة مرجعية على هذا. %{name}"
@@ -478,7 +466,6 @@ ar:
       new_topic: "مسودة موضوع جديد"
       new_private_message: "مسودة رسالة خاصة جديدة"
       abandon:
-        confirm: "لديك مسودة محفوظة لهذا الموضوع. ماذا تريد أن تفعل بها؟"
         yes_value: "تجاهل"
         no_value: "استئناف التعديل"
     topic_count_categories:
@@ -699,11 +686,9 @@ ar:
       scores:
         about: "يتم احتساب هذه النقاط بناءً على مستوى الثقة للمُبلِغ، وصحة بلاغاته السابقة، وأولوية العنصر الذي يتم الإبلاغ عنه."
         score: "النقاط"
-        date: "التاريخ"
-        type: "النوع"
+        type: "السبب"
         status: "الحالة"
-        submitted_by: "تم الإرسال بواسطة"
-        reviewed_by: "تمت المراجعة بواسطة"
+        submitted_by: "تم الإبلاغ بواسطة"
       statuses:
         pending:
           title: "قيد الانتظار"
@@ -711,14 +696,12 @@ ar:
           title: "تمت الموافقة"
         rejected:
           title: "تم الرفض"
-        ignored:
-          title: "تم التجاهل"
-        deleted:
-          title: "تم الحذف"
         reviewed:
-          title: "(تمت مراجعة الكل)"
+          title: "تمت مراجعة الكل"
         all:
-          title: "(كل شيء)"
+          title: "كل شىء"
+      context_question:
+        delimiter: "أو"
       types:
         reviewable_flagged_post:
           title: "المنشورات المُبلَغ عنها"
@@ -1057,6 +1040,7 @@ ar:
         make_all_primary_description: "جعل هذه المجموعة هي المجموعة الأساسية للمستخدمين المحدَّدين"
         remove_all_primary: "الإزالة كمجموعة أساسية"
         remove_all_primary_description: "إزالة هذه المجموعة كمجموعة أساسية"
+        status: "الحالة"
         owner: "المالك"
         primary: "أساسي"
         forbidden: "غير مسموح لك بعرض الأعضاء."
@@ -1204,11 +1188,6 @@ ar:
       profile: "الملف الشخصي"
       mute: "كتم"
       edit: "تعديل التفضيلات"
-      download_archive:
-        button_text: "تنزيل الكل"
-        confirm: "هل تريد بالتأكيد تنزيل منشوراتك؟"
-        success: "لقد بدأ التنزيل، وسنُرسل إليك رسالة إشعار عند اكتمال العملية."
-        rate_limit_error: "يمكن تنزيل المنشورات مرة واحدة يوميًا. يُرجى إعادة المحاولة غدًا."
       new_private_message: "رسالة جديدة"
       private_message: "رسالة"
       private_messages: "الرسائل"
@@ -1280,7 +1259,7 @@ ar:
         perm_denied_expl: "لقد رفضت منح الإذن بإرسال الإشعارات. يمكنك السماح بالإشعارات في إعدادات المتصفح."
         disable: "إيقاف الإشعارات"
         enable: "تفعيل الإشعارات"
-        each_browser_note: 'ملاحظة: عليك تغيير هذا الإعداد في كل متصفح تستخدمه. سيتم تعطيل جميع الإشعارات إذا أوقفت الإشعارات من قائمة المستخدم، بغض النظر عن هذا الإعداد.'
+        each_browser_note: "ملاحظة: عليك تغيير هذا الإعداد في كل متصفح تستخدمه. سيتم تعطيل جميع الإشعارات إذا أوقفت الإشعارات من قائمة المستخدم، بغض النظر عن هذا الإعداد."
         consent_prompt: "هل تريد تلقي إشعارات فورية عند رد الأشخاص على منشوراتك؟"
       dismiss: "تجاهل"
       dismiss_notifications: "تجاهل الكل"
@@ -1331,14 +1310,7 @@ ar:
       experimental_sidebar:
         enable: "تفعيل الشريط الجانبي"
         options: "الخيارات"
-        categories_section: "قسم الفئات"
-        categories_section_instruction: "سيتم عرض الفئات المحدَّدة ضمن قسم فئات الشريط الجانبي."
-        tags_section: "قسم الوسوم"
-        tags_section_instruction: "سيتم عرض الوسوم المحدَّدة ضمن قسم وسوم الشريط الجانبي."
         navigation_section: "التنقل"
-        list_destination_instruction: "عند وجود محتوى جديد في الشريط الجانبي..."
-        list_destination_default: "استخدام الرابط الافتراضي وعرض شارة للعناصر الجديدة"
-        list_destination_unread_new: "رابط إلى غير المقروءة/الجديدة وعرض عدد العناصر الجديدة"
       change: "تغيير"
       featured_topic: "الموضوع المميز"
       moderator: "‏%{user} مشرف في الموقع"
@@ -1408,13 +1380,6 @@ ar:
       save_to_change_theme: 'سيتم تحديث السمة بعد النقر على "%{save_text}"'
       home: "الصفحة الرئيسية المبدئية"
       staged: "مؤقت"
-      staff_counters:
-        flags_given: "بلاغ مفيد"
-        flagged_posts: "منشور مُبلَغ عنه"
-        deleted_posts: "منشور محذوف"
-        suspensions: "حالة تعليق"
-        warnings_received: "تحذير"
-        rejected_posts: "منشور مرفوض"
       messages:
         all: "جميع صناديق الوارد"
         inbox: "صندوق الوارد"
@@ -1539,7 +1504,6 @@ ar:
         tags: "الوسوم"
         interface: "الواجهة"
         apps: "التطبيقات"
-        sidebar: "الشريط الجانبي"
       change_password:
         success: "(تم إرسال رسالة البريد الإلكتروني)"
         in_progress: "(جارٍ إرسال رسالة البريد الإلكتروني)"
@@ -1553,15 +1517,13 @@ ar:
         title: "الرموز الاحياطية للمصادقة الثنائية"
         regenerate: "أعِد التوليد"
         disable: "إيقاف"
-        enable: "تفعيل"
-        enable_long: "تفعيل الرموز الاحتياطية"
         manage:
-          zero: "يمكنك إدارة الرموز الاحتياطية. متبقٍ لديك <strong>%{count}</strong> رمز احتياطي."
-          one: "يمكنك إدارة الرموز الاحتياطية. متبقٍ لديك رمز احتياطي واحد (<strong>%{count}</strong>)."
-          two: "يمكنك إدارة الرموز الاحتياطية. متبقٍ لديك رمزان احتياطيان (<strong>%{count}</strong>)."
-          few: "يمكنك إدارة الرموز الاحتياطية. متبقٍ لديك <strong>%{count}</strong> رموز احتياطية."
-          many: "يمكنك إدارة الرموز الاحتياطية. متبقٍ لديك <strong>%{count}</strong> رمزًا احتياطيًا."
-          other: "يمكنك إدارة الرموز الاحتياطية. متبقٍ لديك <strong>%{count}</strong> رمز احتياطي."
+          zero: "متبقٍ لديك <strong>%{count}</strong> رمز احتياطي."
+          one: "متبقٍ لديك رمز احتياطي واحد (<strong>%{count}</strong>)."
+          two: "متبقٍ لديك رمزان احتياطيان (<strong>%{count}</strong>)."
+          few: "متبقٍ لديك <strong>%{count}</strong> رموز احتياطية."
+          many: "متبقٍ لديك <strong>%{count}</strong> رمزًا احتياطيًا."
+          other: "بقيَ <strong>%{count}</strong> رمز احتياطي."
         copy_to_clipboard: "انسخ إلى الحافظة"
         copy_to_clipboard_error: "حدث خطأ في نسخ البيانات إلى الحافظة"
         copied_to_clipboard: "تم النسخ إلى الحافظة"
@@ -2043,8 +2005,7 @@ ar:
       pause_notifications: "إيقاف الإشعارات مؤقتًا"
       remove_status: "إزالة الحالة"
     user_tips:
-      primary: "فهمت!"
-      secondary: "عدم عرض هذه النصائح لي"
+      button: "فهمت!"
       first_notification:
         title: "أول إشعار لك!"
         content: "تُستخدَم الإشعارات لإبقائك على اطِّلاع بما يحدث في المجتمع."
@@ -2094,60 +2055,6 @@ ar:
       logout_disabled: "يتم إيقاف تسجيل الخروج عندما يكون الموقع في وضع القراءة فقط."
     staff_writes_only_mode:
       enabled: "هذا الموقع في وضع القراءة فقط. يُرجى المتابعة للتصفح، لكن سيقتصر التصفح والرد وتسجيل الإعجاب والإجراءات الأخرى على الأعضاء في طاقم العمل فقط."
-    too_few_topics_and_posts_notice_MF: |
-      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">لنبدأ المناقشة!</a> هناك { currentTopics, plural,
-          zero {}one {<strong></strong>موضوع واحد}
-          two {<strong></strong>موضوعان}
-          few {<strong>#</strong> موضوعات}
-          many {<strong>#</strong> موضوعًا}
-        other {<strong>#</strong> موضوع}
-      } و{ currentPosts, plural,
-          zero {}one {<strong></strong>منشور واحد}
-          two {<strong></strong>منشوران}
-          few {<strong>#</strong> منشورات}
-          many {<strong>#</strong> منشورًا}
-        other {<strong>#</strong> منشور}
-      }. يحتاج الزوار إلى المزيد لقراءته والرد عليه – نحن نقترح على الأقل { requiredTopics, plural,
-          zero {}one {<strong></strong>موضوعًا واحدًا}
-          two {<strong></strong>موضوعين}
-          few {<strong>#</strong> موضوعات}
-          many {<strong>#</strong> موضوعًا}
-        other {<strong>#</strong> موضوع}
-      } و{ requiredPosts, plural,
-          zero {}one {<strong></strong>منشورًا واحدًا}
-          two {<strong></strong>منشورين}
-          few {<strong>#</strong> منشورات}
-          many {<strong>#</strong> منشورًا}
-        other {<strong>#</strong> منشور}
-      }. لا يمكن إلا لفريق العمل رؤية هذه الرسالة.
-    too_few_topics_notice_MF: |
-      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">لنبدأ المناقشة!</a> هناك { currentTopics, plural,
-          zero {}one {<strong></strong>موضوع واحد}
-          two {<strong></strong>موضوعان}
-          few {<strong>#</strong> موضوعات}
-          many {<strong>#</strong> موضوعًا}
-        other {<strong>#</strong> موضوع}
-      }. يحتاج الزوار إلى المزيد لقراءته والرد عليه – نحن نقترح على الأقل { requiredTopics, plural,
-          zero {}one {<strong></strong>موضوعًا واحدًا}
-          two {<strong></strong>موضوعين}
-          few {<strong>#</strong> موضوعات}
-          many {<strong>#</strong> موضوعًا}
-        other {<strong>#</strong> موضوع}
-      }. لا يمكن إلا لفريق العمل رؤية هذه الرسالة.
-    too_few_posts_notice_MF: |
-      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">لنبدأ المناقشة!</a> هناك { currentPosts, plural,
-          zero {}one {<strong></strong>منشور واحد}
-          two {<strong></strong>منشوران}
-          few {<strong>#</strong> منشورات}
-          many {<strong>#</strong> منشورًا}
-        other {<strong>#</strong> منشور}
-      }. يحتاج الزوار إلى المزيد لقراءته والرد عليه – نحن نقترح على الأقل { requiredPosts, plural,
-          zero {}one {<strong></strong>منشورًا واحدًا}
-          two {<strong></strong>منشورين}
-          few {<strong>#</strong> منشورات}
-          many {<strong>#</strong> منشورًا}
-        other {<strong>#</strong> منشور}
-      }. لا يمكن إلا لفريق العمل رؤية هذه الرسالة.
     logs_error_rate_notice:
       reached_hour_MF: |
         <b>{relativeAge}</b> – لقد بلغ معدل الخطأ <a href='{url}' target='_blank'>{rate, plural, zero {<strong>#</strong> خطأ/الساعة} one {خطأ واحد (#)/الساعة} two {خطآن (#)/الساعة} few {# أخطاء/الساعة} many {# خطأ/الساعة} other {# خطأ/الساعة}}</a> حد إعدادات الموقع البالغ {limit, plural, zero {<strong>#</strong> خطأ/الساعة} one {خطأ واحد (#)/الساعة} two {خطآن (#)/الساعة} few {# أخطاء/الساعة} many {# خطأ/الساعة} other {# خطأ/الساعة}}.
@@ -2182,7 +2089,6 @@ ar:
       intro: "مرحبًا! يبدو أنك تستمتع بالمناقشة، لكنك لم تشترك للحصول على حساب حتى الآن."
       value_prop: "هل سئمت من التمرير عبر المنشورات نفسها؟ عندما تُنشئ حسابًا، فستستأنف دائمًا من حيث توقفت. عند إنشاء حساب، ستتمكن أيضًا من تلقي إشعارات بالردود الجديدة وحفظ الإشارات المرجعية وتسجيل الإعجاب لشكر الآخرين. يمكننا جميعًا العمل معًا للارتقاء بهذا المجتمع. :heart:"
     summary:
-      enabled_description: "أنت تعرض ملخصًا لهذا الموضوع: المنشورات الأكثر إثارة للاهتمام وفقًا للمجتمع."
       description:
         zero: "هناك <b>%{count}</b> من الردود."
         one: "هناك رد واحد (<b>%{count}</b>)."
@@ -2192,10 +2098,7 @@ ar:
         other: "هناك <b>%{count}</b> من الردود."
       description_time_MF: |
         هناك {replyCount, plural, zero {<strong>#</strong> رد} one {رد واحد (<strong>#</strong>)} two {ردَّان (<strong>#</strong>)} few {<strong>#</strong> ردود} many {<strong>#</strong> ردًا} other {<strong>#</strong> رد}} والوقت المقدَّر للقراءة هو <b>{readingTime, plural, zero {<strong>#</strong> دقيقة} one {دقيقة واحدة (<strong>#</strong>)} two {دقيقتان (<strong>#</strong>)} few {<strong>#</strong> دقائق} many {<strong>#</strong> دقيقة} other {<strong>#</strong> دقيقة}}</b>
-      enable: "تلخيص هذا الموضوع"
       disable: "عرض كل المنشورات"
-      short_label: "تلخيص"
-      short_title: "إظهار ملخص لهذا الموضوع: المشاركات الأكثر إثارة للاهتمام كما يحددها المجتمع"
     deleted_filter:
       enabled_description: "يتتضمَّن هذا الموضوع منشورات محذوفة، والتي تم إخفاؤها."
       disabled_description: "يتم عرض المنشورات المحذوفة في الموضوع."
@@ -2550,8 +2453,6 @@ ar:
         topic_template_not_modified: "يُرجى إضافة التفاصيل والمواصفات المحدَّدة إلى موضوعك من خلال تعديل نموذج الموضوع."
       save_edit: "حفظ التعديل"
       overwrite_edit: "استبدال التعديل"
-      reply_original: "كتابة رد على الموضوع الأصلي"
-      reply_here: "الرد هنا"
       reply: "الرد"
       cancel: "إلغاء"
       create_topic: "إنشاء موضوع"
@@ -2752,6 +2653,7 @@ ar:
       reaction_2: "<span>%{username} و%{username2}</span> %{description}"
       votes_released: "%{description} - اكتمل"
       new_features: "تتوفر ميزات جديدة!"
+      admin_problems: "نصيحة جديدة بشأن لوحة معلومات موقعك"
       dismiss_confirmation:
         body:
           default:
@@ -3132,7 +3034,7 @@ ar:
         top: "لا توجد موضوعات في الأكثر نشاطًا."
         educate:
           new: '<p>ستظهر موضوعاتك الجديدة هنا. تُعتبَر الموضوعات جديدة بشكلٍ افتراضي وستعرض مؤشر <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span> إذا كان قد تم إنشاؤها في آخر يومين.</p><p>يمكنك الانتقال إلى <a href="%{userPrefsUrl}">تفضيلاتك</a> لتغيير ذلك.</p>'
-          unread: "<p>ستظهر موضوعاتك غير المقروءة هنا.</p><p>تُعتبَر الموضوعات غير مقروءة بشكلٍ افتراضي وستعرض الأعداد غير المقروءة <span class=\"badge unread-posts badge-notification\">1</span> إذا كنت قد:</p><ul><li>أنشأت الموضوع</li><li>رددت على الموضوع</li><li>قرأت الموضوع لأكثر من 4 دقائق</li></ul><p>أو إذا وضعت الموضوع صراحةً تحت \"المراقبة\" أو \"التتبُّع\" عبر \U0001F514 في كل موضوع.</p><p>يمكنك الانتقال إلى <a href=\"%{userPrefsUrl}\">التفضيلات</a> لتغيير ذلك.</p>"
+          unread: "<p>ستظهر موضوعاتك غير المقروءة هنا.</p><p>تُعتبَر الموضوعات غير مقروءة بشكلٍ افتراضي وستعرض أعداد الموضوعات غير المقروءة <span class=\"badge unread-posts badge-notification\">1</span> إذا كنت قد:</p><ul><li>أنشأت الموضوع</li><li>رددت على الموضوع</li><li>قرأت الموضوع لأكثر من 5 دقائق</li></ul><p>أو إذا وضعت الموضوع صراحةً تحت \"المراقبة\" أو \"التتبُّع\" عبر \U0001F514 في كل موضوع.</p><p>يمكنك الانتقال إلى <a href=\"%{userPrefsUrl}\">التفضيلات</a> لتغيير ذلك.</p>"
       bottom:
         latest: "لا يوجد المزيد من الموضوعات الحديثة."
         posted: "لا يوجد المزيد من الموضوعات المنشورة."
@@ -3267,8 +3169,6 @@ ar:
       browse_all_categories_latest_or_top: "<a href='%{basePath}/categories'>استعرض كل الفئات</a> أو <a href='%{basePath}/latest'>شاهد آخر الموضوعات</a>، أو انظر أبرز:"
       browse_all_tags_or_latest: "<a href='%{basePath}/tags'>استعرض كل الوسوم</a> أو <a href='%{basePath}/latest'>شاهد آخر الموضوعات</a>."
       suggest_create_topic: هل أنت مستعد <a href>لبدء محادثة جديدة؟</a>
-      jump_reply_up: الانتقال إلى الرد السابق
-      jump_reply_down: الانتقال إلى الرد التالي
       deleted: "لقد تم حذف الموضوع"
       slow_mode_update:
         title: "الوضع البطيء"
@@ -3693,13 +3593,6 @@ ar:
       collapse: "طي"
       sr_collapse_replies: "طي الردود المضمَّنة"
       sr_date: "تاريخ المنشور"
-      sr_expand_replies:
-        zero: "هناك %{count} رد على هذا المنشور. انقر للتوسيع"
-        one: "هناك رد واحد (%{count}) على هذا المنشور. انقر للتوسيع"
-        two: "هناك ردَّان (%{count}) على هذا المنشور. انقر للتوسيع"
-        few: "هناك %{count} ردود على هذا المنشور. انقر للتوسيع"
-        many: "هناك %{count} ردًا على هذا المنشور. انقر للتوسيع"
-        other: "هناك %{count} رد على هذا المنشور. انقر للتوسيع"
       expand_collapse: "توسيع/طي"
       sr_below_embedded_posts_description: "ردود المنشور #%{post_number}"
       sr_embedded_reply_description: "رد بواسطة @%{username} على المنشور #%{post_number}"
@@ -3983,7 +3876,6 @@ ar:
       filtered_replies:
         viewing_posts_by: "يتم الآن عرض %{post_count} منشور بواسطة"
         viewing_subset: "بعض الردود مطوية"
-        viewing_summary: "يتم الآن عرض ملخص لهذا الموضوع"
         post_number: "%{username}، المنشور #%{post_number}"
         show_all: "إظهار الكل"
       share:
@@ -4000,7 +3892,6 @@ ar:
       back: "الرجوع إلى الفئة"
       general: "عام"
       settings: "الإعدادات"
-      topic_template: "نموذج الموضوع"
       tags: "الوسوم"
       tags_allowed_tags: "حصر هذه الوسوم على هذه الفئة:"
       tags_allowed_tag_groups: "حصر مجموعات الوسوم هذه على هذه الفئة:"
@@ -4059,8 +3950,6 @@ ar:
       email_in: "العنوان المخصَّص للبريد الوارد:"
       email_in_tooltip: "يمكنك فصل عدة عناوين بريد إلكتروني باستخدام الرمز |."
       email_in_allow_strangers: "قبول الرسائل الإلكترونية من المستخدمين المجهولين الذين لا يملكون حسابات"
-      email_in_disabled: "تم إيقاف نشر الموضوعات الجديدة عبر البريد الإلكتروني في إعدادات الموقع. لتفعيل نشر الموضوعات الجديدة عبر البريد الإلكتروني، "
-      email_in_disabled_click: 'فعليك تفعيل خيار "email in" في الإعدادات.'
       mailinglist_mirror: "الفئة تعكس قائمة بريدية"
       show_subcategory_list: "اعرض قائمة الفئات الفرعية أعلى الموضوعات في هذه الفئة."
       read_only_banner: "نص البانر عندما لا يستطيع المستخدم إنشاء موضوع في هذه الفئة:"
@@ -4304,6 +4193,10 @@ ar:
     filters:
       with_topics: "موضوعات %{filter}"
       with_category: "موضوعات %{filter} في %{category}"
+      filter:
+        title: "المرشح"
+        button:
+          label: "المرشح"
       latest:
         title: "الحديثة"
         title_with_count:
@@ -4398,7 +4291,6 @@ ar:
         this_week: "الأسبوع"
         today: "اليوم"
     browser_update: 'عذرًا، <a href="https://www.discourse.org/faq/#browser">متصفحك غير مدعوم</a>. يُرجى <a href="https://browsehappy.com">التبديل إلى متصفح مدعوم</a> لعرض المحتوى الغني، وتسجيل الدخول والرد.'
-    safari_13_warning: سيزيل هذا الموقع الدعم لإصدارات 13 من iOS وSafari، والإصدارات الأقدم. ستظل هناك نسخة مبسَّطة متاحة للقراءة فقط. (<a href="https://meta.discourse.org/t/224747">المزيد من المعلومات</a>)
     permission_types:
       full: "الإنشاء/الرد/العرض"
       create_post: "الرد/العرض"
@@ -4413,6 +4305,9 @@ ar:
       close: "إغلاق (Esc)"
       content_load_error: 'تعذَّر تحميل <a href="%url%">المحتوى</a>.'
       image_load_error: 'تعذَّر تحميل <a href="%url%">الصورة</a>.'
+    experimental_lightbox:
+      buttons:
+        close: "إغلاق (Esc)"
     cannot_render_video: لا يمكن عرض هذا الفيديو لأن متصفحك لا يدعم برنامج الترميز.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
@@ -4509,7 +4404,6 @@ ar:
         many: "تم منحك هذه الشارة %{count} مرة"
         other: "تم منحك هذه الشارة %{count} مرة"
       granted_on: "تم منحه بتاريخ %{date}"
-      others_count: "الآخرون الذين تم منحهم هذه الشارة (%{count})"
       title: الشارات
       allow_title: "يمكنك استخدام هذة الشارة كلقب"
       multiple_grant: "يمكن أن يتم منحك هذه الشارة أكثر من مرة"
@@ -4740,13 +4634,11 @@ ar:
     pause_notifications:
       title: "إيقاف الإشعارات مؤقتًا لمدة..."
       label: "إيقاف الإشعارات مؤقتًا"
-      remaining: "المتبقية: %{remaining}"
       options:
         half_hour: "30 دقيقة"
         one_hour: "ساعة واحدة"
         two_hours: "ساعتان"
         tomorrow: "حتى الغد"
-        custom: "مخصَّصة"
       set_schedule: "تعيين جدول للإشعارات"
     trust_levels:
       names:
@@ -4803,7 +4695,21 @@ ar:
       more: "المزيد"
       all_categories: "كل الفئات"
       all_tags: "كل الوسوم"
+      edit_navigation_modal_form:
+        filter_dropdown:
+          all: "الكل"
       sections:
+        custom:
+          save: "حفظ"
+          delete: "حذف"
+          links:
+            reset: "إعادة الضبط إلى الإعداد الافتراضي"
+            icon:
+              label: "الأيقونة"
+            name:
+              label: "الاسم"
+            value:
+              label: "رابط"
         about:
           header_link_text: "نبذة"
         messages:
@@ -4818,28 +4724,20 @@ ar:
             unread_with_count: "غير المقروءة (%{count})"
             archive: "الأرشيف"
         tags:
-          links:
-            add_tags:
-              content: "إضافة وسوم"
-              title: "لم تُضف أي وسوم. انقر للبدء."
           none: "لم تضف أي وسوم."
           click_to_get_started: "انقر هنا للبدء."
           header_link_text: "الوسوم"
           header_action_title: "تعديل وسوم الشريط الجانبي"
           configure_defaults: "تكوين الإعدادات الافتراضية"
         categories:
-          links:
-            add_categories:
-              content: "إضافة فئات"
-              title: "لم تُضف أي فئات. انقر للبدء."
           none: "لم تضف أي فئات."
           click_to_get_started: "انقر هنا للبدء."
           header_link_text: "الفئات"
           header_action_title: "تعديل فئات الشريط الجانبي"
           configure_defaults: "تكوين الإعدادات الافتراضية"
         community:
-          header_link_text: "المجتمع"
-          header_action_title: "إنشاء موضوع"
+          edit_section:
+            header_dropdown: "تخصيص"
           links:
             about:
               content: "نبذة"
@@ -4850,8 +4748,8 @@ ar:
             badges:
               content: "الشارات"
               title: "كل الشارات الممكن منحها لك"
-            everything:
-              content: "كل شيء"
+            topics:
+              content: "الموضوعات"
               title: "كل الموضوعات"
             faq:
               content: "الأسئلة الشائعة"
@@ -4882,6 +4780,11 @@ ar:
       description: "إن موضوعك الترحيبي هو أول ما يقرأه الأعضاء الجُدد. انظر إليه على أنه \"عرض ترويجي\" أو \"بيان مهمة\". دَع الجميع يعرفون الجمهور المستهدف بهذا المجتمع، وما يتوقعون العثور عليه هنا، وما تريد منهم أن يفعلوه أولًا."
       button_title: "بدء التعديل"
     until: "حتى:"
+    form_templates:
+      errors:
+        typeMismatch:
+          default: "يُرجى إدخال قيمة صالحة."
+          email: "يُرجى إدخال عنوان بريد إلكتروني صالح."
   admin_js:
     type_to_filter: "اكتب للتصفية..."
     admin:
@@ -5048,14 +4951,6 @@ ar:
         about: "يمكنك تعديل عضوية المجموعة والأسماء من هنا"
         group_members: "أعضاء المجموعة"
         delete: "حذف"
-        delete_confirm: "هل تريد بالتأكيد حذف هذه المجموعة؟"
-        delete_with_messages_confirm:
-          zero: "سيؤدي حذف هذه المجموعة إلى عزل %{count} رسالة، وسيفقد أعضاء المجموعة الوصول إليها."
-          one: "سيؤدي حذف هذه المجموعة إلى عزل رسالة واحدة (%{count})، وسيفقد أعضاء المجموعة الوصول إليها."
-          two: "سيؤدي حذف هذه المجموعة إلى عزل رسالتين (%{count})، وسيفقد أعضاء المجموعة الوصول إليها."
-          few: "سيؤدي حذف هذه المجموعة إلى عزل %{count} رسائل، وسيفقد أعضاء المجموعة الوصول إليهما."
-          many: "سيؤدي حذف هذه المجموعة إلى عزل %{count} رسالةً، وسيفقد أعضاء المجموعة الوصول إليها."
-          other: "سيؤدي حذف هذه المجموعة إلى عزل %{count} رسالة، وسيفقد أعضاء المجموعة الوصول إليها."
         delete_failed: "يتعذَّر حذف المجموعة. إذا كانت هذه مجموعة تلقائية، فلا يمكن تدميرها."
         delete_automatic_group: هذه مجموعة تلقائية ولا يمكن حذفها.
         delete_owner_confirm: "هل تريد إزالة صلاحيات المالك من \"%{username}\"؟"
@@ -5121,7 +5016,7 @@ ar:
             topics:
               read: قراءة موضوع أو منشور محدَّد فيه. يتم دعم RSS أيضًا.
               write: إنشاء موضوع جديد أو النشر في موضوع موجود
-              update: تحديث الموضوع. غيِّر العنوان والفئة والوسوم، إلى آخره.
+              update: تحديث موضوع. يمكنك تغيير العنوان، والفئة، والوسوم، والحالة، والنموذج الأولي، والرابط المميز، وما إلى ذلك.
               read_lists: قراءة قوائم الموضوعات مثل الأكثر نشاطًا، والجديدة، والحديثة، وما إلى ذلك. يتم دعم RSS أيضًا.
             posts:
               edit: تعديل أي منشور أو منشور معيَّن.
@@ -5218,9 +5113,6 @@ ar:
         user_promoted_event:
           name: "حدث يروِّج له المستخدم"
           details: "عندما تتم ترقية المستخدم من مستوى ثقة إلى آخر."
-        user_badge_event:
-          name: "حدث منح الشارة"
-          details: "عند حصول المستخدم على شارة."
         group_user_event:
           name: "حدث مستخدم المجموعة"
           details: "عند إضافة مستخدم أو إزالته في مجموعة."
@@ -5271,7 +5163,6 @@ ar:
         enabled: "مفعَّلة؟"
         is_enabled: "نعم"
         not_enabled: "لا"
-        change_settings: "تغيير الإعدادات"
         change_settings_short: "الإعدادات"
         howto: "كيف يمكنني تثبيت الإضافات؟"
         official: "المكوِّن الإضافي الرسمي"
@@ -5607,6 +5498,8 @@ ar:
           love:
             name: "الإعجاب"
             description: "لون زر تسجيل الإعجاب."
+          selected:
+            name: "محدَّد"
         robots:
           title: "تجاوز ملف robots.txt لموقعك:"
           warning: "سيؤدي ذلك إلى تجاوز أي إعدادات ذات صلة بالموقع بشكلٍ دائم."
@@ -5895,14 +5788,8 @@ ar:
           silence: "كتم"
           link: "رابط"
         action_descriptions:
-          block: "منع المنشورات التي تتضمَّن هذه الكلمات من النشر. سيرى المستخدم رسالة خطأ عندما يحاول إرسال منشوره."
-          censor: "السماح بالمنشورات التي تتضمَّن هذه الكلمات بعد استبدالها بأحرف تخفي الكلمات الخاضعة للرقابة"
-          require_approval: "ستتطلب المنشورات التي تتضمَّن هذه الكلمات موافقة فريق العمل قبل أن تصبح رؤيتها ممكنة."
-          flag: "اسمح بالمنشورات التي تتضمَّن هذه الكلمات، ولكن أبلغ عنها كغير لائقة حتى يتمكن المشرفون من مراجعتها."
-          replace: "استبدال الكلمات في المنشورات بكلمات أخرى"
-          tag: "وضع وسوم على الموضوعات تلقائيًا بناءً على أول منشور"
-          silence: "ستتطلب المنشورات الأولى للمستخدمين والتي تتضمَّن هذه الكلمات موافقة فريق العمل قبل رؤيتها وسيتم كتم المستخدم تلقائيًا."
-          link: "استبدال الكلمات في المنشورات بروابط"
+          replace: "استبدال الكلمات في المنشورات بكلمات أخرى."
+          link: "استبدال الكلمات في المنشورات بروابط."
         form:
           label: "تتضمَّن كلمة أو عبارة"
           placeholder: "إدخال الكلمة أو العبارة (الرمز * هو حرف بدل)"
@@ -5925,6 +5812,37 @@ ar:
           description: "إدخال النص أدناه للتحقُّق من التطابقات مع الكلمات المُراقَبة"
           found_matches: "التطابقات التي تم العثور عليها:"
           no_matches: "لم يتم العثور على نتائج مطابقة"
+      form_templates:
+        nav_title: "القوالب"
+        list_table:
+          headings:
+            name: "الاسم"
+            actions: "الإجراءات"
+        view_template:
+          close: "إغلاق"
+          edit: "تعديل"
+          delete: "حذف"
+        new_template_form:
+          submit: "حفظ"
+          cancel: "إلغاء"
+          preview: "معاينة"
+        quick_insert_fields:
+          add_new_field: "إضافة"
+          dropdown: "قائمة منسدلة"
+        validations_modal:
+          table_headers:
+            key: "المفتاح"
+            type: "النوع"
+            description: "الوصف"
+          validations:
+            required:
+              key: "مطلوب"
+            minimum:
+              key: "الحد الأدنى"
+            maximum:
+              key: "الحد الأقصى"
+            type:
+              key: "النوع"
       impersonate:
         title: "الانتحال"
         help: "استخدم هذه الأداة لانتحال شخصية حساب مستخدم لأغراض تصحيح الأخطاء. عليك تسجيل الخروج بعد الانتهاء."
@@ -5937,6 +5855,7 @@ ar:
         not_found: "عذرًا، اسم المستخدم غير موجود في نظامنا."
         id_not_found: "عذرًا، معرِّف المستخدم غير موجود في نظامنا."
         active: "نشط"
+        status: "الحالة"
         show_emails: "إظهار عناوين البريد الإلكتروني"
         hide_emails: "إخفاء عناوين البريد الإلكتروني"
         nav:
@@ -6025,7 +5944,6 @@ ar:
         show_admin_profile: "مسؤول"
         manage_user: "إدارة المستخدم"
         show_public_profile: "إظهار الملف الشخصي العام"
-        impersonate: "انتحال"
         action_logs: "سجلات الإجراءات"
         ip_lookup: "البحث عن عنوان IP"
         log_out: "تسجيل الخروج"
@@ -6283,6 +6201,8 @@ ar:
         show_overriden: "إظهار النصوص المخصَّصة فقط"
         locale: "اللغة:"
         more_than_50_results: "هناك أكثر من 50 نتيجة. يُرجى تحسين البحث."
+        outdated:
+          dismiss: "تجاهل"
       settings:
         show_overriden: "إظهار النصوص المخصَّصة فقط"
         history: "عرض سجل التغييرات"
@@ -6295,7 +6215,6 @@ ar:
             label: "إضافة رمز تعبيري"
         title: "الإعدادات"
         no_results: "لم يتم العثور على نتائج."
-        more_than_30_results: "هناك أكثر من 30 نتيجة. يُرجى تحسين البحث أو تحديد فئة."
         clear_filter: "مسح"
         add_url: "إضافة عنوان URL"
         add_host: "إضافة مضيف"
@@ -6382,7 +6301,7 @@ ar:
         allow_title: السماح للمستخدمين باستخدام الشارة كعنوان
         multiple_grant: يمكن منحها عدة مرات
         listable: عرض الشارة في صفحة الشارات العامة
-        enabled: فعّل الشارة
+        disabled: متوقف
         icon: الأيقونة
         image: الصورة
         graphic: رمز الشارة
@@ -6456,10 +6375,8 @@ ar:
       embedding:
         get_started: "إذا كنت تريد تضمين Discourse في موقع آخر، فابدأ بإضافة مضيفه."
         confirm_delete: "هل تريد بالتأكيد حذف هذا المضيف؟"
-        sample: "الصق رمز HTML التالي في موقعك لإنشاء موضوعات Discourse وتضمينها. استبدل <b>REPLACE_ME</b> بعنوان URL الأساسي للصفحة التي تضمِّنه فيها."
         title: "التضمين"
         host: "المضيفون المسموح بهم"
-        class_name: "اسم الفئة"
         allowed_paths: "قائمة السماح بالمسارات"
         edit: "تعديل"
         category: "النشر في الفئة"
diff --git a/config/locales/client.be.yml b/config/locales/client.be.yml
index e90eedaceff..1ee6b030ffc 100644
--- a/config/locales/client.be.yml
+++ b/config/locales/client.be.yml
@@ -75,8 +75,10 @@ be:
     share:
       topic_html: 'Тэма: <span class="topic-title">%{topicTitle}</span>'
       close: "схаваць"
+    action_codes:
+      tags_changed: "Тэгі абноўлены %{when}"
+      category_changed: "Катэгорыя абноўлена %{when}"
     emails_are_disabled: "Адпраўка паведамленняў па электроннай пошце было глабальна адключана адміністратарам. Ні адно апавяшчэнне па электроннай пошце не будзе даслана."
-    bootstrap_invite_button_title: "Адправіць запрашэнні"
     themes:
       default_description: "Default"
     s3:
@@ -161,7 +163,7 @@ be:
       title: "Абранае"
       clear_bookmarks: "Выдаліць з абранага"
       help:
-        bookmark: "Націсніце каб закласці першы паведамленне ў гэтай тэме"
+        bookmark: "Націсніце, каб дадаць гэтую тэму ў закладкі"
         unbookmark: "Націсніце каб выдаліць усе закладкі ў гэтай тэме"
     bookmarks:
       not_bookmarked: "закладка гэты пост"
@@ -224,7 +226,7 @@ be:
           score: "кошт"
       scores:
         score: "кошт"
-        type: "тып"
+        type: "прычына"
       statuses:
         pending:
           title: "чакаецца"
@@ -232,6 +234,15 @@ be:
           title: "Адобрана"
         rejected:
           title: "адхілена"
+        rejected_post:
+          title: "Публікацыя адхілена"
+        deleted:
+          title: "Тэма альбо паведамленне выдалена"
+        all:
+          title: "Усё"
+      context_question:
+        delimiter: "або"
+        something_else_wrong: "Штосьці не так з гэтай публікацыяй?"
       types:
         reviewable_user:
           title: "Карыстальнік"
@@ -359,6 +370,7 @@ be:
         title: "Удзельнікі"
         filter_placeholder_admin: "імя карыстальніка або email"
         filter_placeholder: "імя карыстальніка"
+        status: "Статус"
       topics: "тэмы"
       posts: "паведамленні"
       mentions: "згадкі"
@@ -513,7 +525,6 @@ be:
       second_factor_backup:
         regenerate: "Перагенераваць"
         disable: "Адключыць"
-        enable: "Уключыць"
       second_factor:
         name: "Імя"
         disable: "Адключыць"
@@ -724,7 +735,6 @@ be:
       sign_up: "рэгістрацыя"
       hide_forever: "няма дзякуй"
     summary:
-      enable: "Падсумаваць гэтую тэму"
       disable: "Усе паведамленні"
     deleted_filter:
       enabled_description: "Гэтая тэма ўтрымлівае выдаленыя паведамленні, якія былі схаваныя."
@@ -814,8 +824,6 @@ be:
         title_missing: "Загаловак неабходна"
         category_missing: "Вы павінны выбраць катэгорыю"
       save_edit: "захаваць змены"
-      reply_original: "Адказаць у пачатковай тэме"
-      reply_here: "Адказаць тут"
       reply: "Адказаць"
       cancel: "Адмяніць"
       create_topic: "Стварыць Тэму"
@@ -860,6 +868,7 @@ be:
       ignore: "ігнараваць"
     notifications:
       watching_first_post_label: "Стварыць новую тэму"
+      admin_problems: "Новыя рэкамендацыі на вашым сайце прыборнай панэлі"
       dismiss_confirmation:
         cancel: "Адмяніць"
       popup:
@@ -977,8 +986,6 @@ be:
       back_to_list: "Вярнуцца да спісу тым"
       options: "Налады тэмы"
       show_links: "паказаць спасылкі ў гэтай тэме"
-      jump_reply_up: перайсці да больш ранняй адказы
-      jump_reply_down: перайсці да больш позняй адказы
       deleted: "Тэма была выдаленая"
       slow_mode_update:
         enable: "Уключыць"
@@ -1121,6 +1128,7 @@ be:
       view: "Прагляд тэм па катэгорыям"
       general: "Агульныя"
       settings: "Налады"
+      topic_template: "Шаблон"
       tags: "Тэгі"
       required_tag_group:
         delete: "Выдаліць"
@@ -1191,6 +1199,7 @@ be:
       notify_action: "паведамленне"
       delete_spammer: "выдаліць спамера"
       yes_delete_spammer: "Так, выдаліць спамера"
+      notify_moderators_textarea_label: "Паведамленне для мадэратараў"
     flagging_topic:
       notify_action: "паведамленне"
     topic_map:
@@ -1220,6 +1229,10 @@ be:
     category_title: "Катэгорыя"
     categories_list: "Спіс катэгорый"
     filters:
+      filter:
+        title: "Filter"
+        button:
+          label: "Filter"
       latest:
         title: "Апошнія"
         help: "тэмы са свежымі паведамленнямі"
@@ -1297,6 +1310,7 @@ be:
         mark_tracking: "%{shortcut}Сачыць за тэмай"
     badges:
       title: значкі
+      awarded: узнагароджаны
       select_badge_for_title: Выберыце значок, будзе вашым званнем
       badge_grouping:
         community:
@@ -1350,7 +1364,30 @@ be:
     sidebar:
       more: "Больш"
       all_categories: "Усе катэгорыі"
+      edit_navigation_modal_form:
+        filter_dropdown:
+          all: "Усё"
       sections:
+        custom:
+          save: "захаваць"
+          delete: "выдаляць"
+          links:
+            add: "Дадаць іншую спасылку"
+            delete: "Выдаліць спасылку"
+            icon:
+              label: "Абразка"
+            name:
+              label: "імя"
+              validation:
+                blank: "Імя не можа быць пустым"
+            value:
+              label: "Спасылка"
+              validation:
+                blank: "Спасылка не можа быць пустой"
+                maximum: "Спасылка павінна быць карацейшай за %{count} сімвалаў"
+          title:
+            validation:
+              blank: "Загаловак ня можа быць пустым"
         about:
           header_link_text: "Аб тэме"
         messages:
@@ -1366,7 +1403,8 @@ be:
         categories:
           header_link_text: "катэгорыі"
         community:
-          header_link_text: "супольнасць"
+          edit_section:
+            header_dropdown: "Кастамізаваць"
           links:
             about:
               content: "Аб тэме"
@@ -1374,6 +1412,8 @@ be:
               content: "адміністратар"
             badges:
               content: "значкі"
+            topics:
+              content: "тэмы"
             faq:
               content: "Пытанні і адказы"
             groups:
@@ -1382,8 +1422,14 @@ be:
               content: "карыстальнікаў"
             my_posts:
               content: "мае паведамленні"
+              content_drafts: "Мае чарнавікі"
             review:
               content: "Патрабуе перагляду"
+    form_templates:
+      errors:
+        typeMismatch:
+          default: "Калі ласка, увядзіце карэктнае значэнне."
+          email: "Калі ласка, увядзіце верны email."
   admin_js:
     admin:
       moderator: "Мадэратар"
@@ -1479,6 +1525,13 @@ be:
         continue: Працягнуць
         scopes:
           action: дзеянне
+          descriptions:
+            topics:
+              delete: Выдаліць тэму.
+            posts:
+              delete: Выдаліць паведамленне.
+            invites:
+              create: Адправіць запрашэнні па электроннай пошце альбо стварыць спасылкі для запрашэнняў.
       web_hooks:
         create: "стварыць"
         edit: "рэдагаваць"
@@ -1757,6 +1810,47 @@ be:
         form:
           add: "дадаць"
           success: "поспех"
+      form_templates:
+        nav_title: "шаблоны"
+        new_template: "Новы шаблон"
+        list_table:
+          headings:
+            name: "Імя"
+            active_categories: "Актыўныя катэгорыі"
+            actions: "Дзеянні"
+        view_template:
+          close: "зачыніць"
+          edit: "Рэдагаваць"
+          delete: "Выдаліць"
+        new_template_form:
+          submit: "Захаваць"
+          cancel: "Адмяніць"
+          name:
+            label: "Назва шаблона"
+          template:
+            label: "Шаблон"
+          preview: "Папярэдні прагляд"
+        quick_insert_fields:
+          add_new_field: "Дадаць"
+          checkbox: "Птушка"
+          input: "Кароткі адказ"
+          textarea: "Доўгі адказ"
+          dropdown: "Выпадаючы спіс"
+          upload: "Загрузіць файл"
+        validations_modal:
+          table_headers:
+            type: "Тып"
+            description: "Апісанне"
+          validations:
+            required:
+              key: "абавязкова"
+            type:
+              key: "тып"
+        field_placeholders:
+          choices:
+            first: "Варыянт 1"
+            second: "Варыянт 2"
+            third: "Варыянт 3"
       impersonate:
         title: "ўвасобіцца"
         not_found: "Карыстача не ўдалося знайсці."
@@ -1767,6 +1861,7 @@ be:
         last_emailed: "Апошні емэйл"
         not_found: "Выбачайце, такога імя карыстальніка няма ў нашай сістэме."
         id_not_found: "Выбачайце, карыстальніка з такім нумарам няма ў нашай сістэме."
+        status: "Статус"
         show_emails: "Паказаць емейл"
         nav:
           new: "Новыя"
@@ -1791,7 +1886,6 @@ be:
         suspended: "Прыпынена?"
         show_admin_profile: "Адміністратар"
         show_public_profile: "Паказаць публічны профіль"
-        impersonate: "ўвасобіцца"
         ip_lookup: "пошук IP"
         log_out: "Выйсці"
         logged_out: "Карыстальнік выйшаў з сістэмы на ўсіх прыладах"
@@ -1966,6 +2060,7 @@ be:
         no_user_badges: " %{Name} не атрымліваў ні аднаго."
         no_badges: Тут няма значкоў, якія могуць быць прадастаўлены.
         allow_title: Дазволіць выкарыстанне значкоў як званняў
+        disabled: адключана
         icon: Абразка
         image: Выява
         trigger: Трыггер старту
diff --git a/config/locales/client.bg.yml b/config/locales/client.bg.yml
index ab63df4a4b2..74deda4bf5a 100644
--- a/config/locales/client.bg.yml
+++ b/config/locales/client.bg.yml
@@ -144,6 +144,8 @@ bg:
       facebook: "Споделете във Facebook"
       email: "Изпратете чрез имейл"
       url: "Копирайте и споделете линка"
+    word_connector:
+      comma: ", "
     action_codes:
       public_topic: "Направи тази тема публична на %{when}"
       open_topic: "Преобразува това в тема %{when}"
@@ -155,6 +157,8 @@ bg:
       removed_user: "Изтри %{who} на %{when}"
       removed_group: "Изтри %{who} на %{when}"
       autobumped: "Автоматично вдигната %{when}"
+      tags_changed: "Етикетите са актуализирани %{when}"
+      category_changed: "Категорията е актуализирана %{when}"
       autoclosed:
         enabled: "Затворена %{when}"
         disabled: "Отворена %{when}"
@@ -179,14 +183,12 @@ bg:
       forwarded: "Препратих горния имейл"
     topic_admin_menu: "действия по темата"
     skip_to_main_content: "Прескачане към основното съдържание"
+    skip_user_nav: "Преминаване към съдържанието на профила"
     emails_are_disabled: "Всички изходящи имейли са изцяло забранени от администратора. Няма да бъдат изпращани никакви имейл известия."
     emails_are_disabled_non_staff: "Изходящият имейл е деактивиран за потребители, които не са от екипа"
     software_update_prompt:
       message: "Актуализирахме този сайт, <span>моля, презаредете</span>, или може да изпитате неочаквано поведение."
       dismiss: "Отмени"
-    bootstrap_mode_disabled: "Режимът на стартиране ще бъде изключен в следващите 24 часа. "
-    bootstrap_invite_button_title: "Изпрати поканите"
-    bootstrap_wizard_link_title: "Завършване на съветника за настройка"
     themes:
       default_description: "По подразбиране"
       broken_theme_alert: "Вашият сайт може да не работи, защото тема/компонент има грешки."
@@ -296,11 +298,11 @@ bg:
       edit_bookmark: "Редактиране на отметка"
       clear_bookmarks: "Изчисти отметките"
       help:
-        bookmark: "Щракнете за да добавите в отметки първата публикация в тази тема"
-        edit_bookmark: "Кликнете, за да редактирате отметката на тази тема"
+        bookmark: "Кликнете, за да добавите тази тема в отметки"
+        edit_bookmark: "Кликнете, за да редактирате отметката на публикация в тази тема"
         edit_bookmark_for_topic: "Кликнете, за да редактирате отметката за тази тема"
         unbookmark: "Щракнете тук за да изтриите всички отметки в тази тема"
-        unbookmark_with_reminder: "Щракнете, за да премахнете всички отметки и напомняния в тази тема."
+        unbookmark_with_reminder: "Щракнете, за да премахнете всички отметки и напомняния в тази тема"
     bookmarks:
       created: "Отбелязахте тази публикация. %{name}"
       created_generic: "Отбелязахте тази публикация. %{name}"
@@ -344,7 +346,7 @@ bg:
       new_topic: "Проект на нова тема"
       new_private_message: "Нова чернова на лично съобщение"
       abandon:
-        confirm: "Имате чернова за тази тема. Какво бихте искали да направите с нея?"
+        confirm: "Вече имате чернова за тази тема. Какво бихте искали да направите с нея?"
         yes_value: "Отхвърляне"
         no_value: "Възобновете редактирането"
     topic_count_categories:
@@ -517,26 +519,43 @@ bg:
       scores:
         about: "Този резултат се изчислява въз основа на нивото на доверие на репортера, точността на предишните му флагове и приоритета на елемента, за който се съобщава."
         score: "Точки"
-        date: "Дата"
-        type: "Тип"
+        date: "Дата на доклада"
+        type: "Причина"
         status: "Статус"
-        submitted_by: "Изпратено от"
+        submitted_by: "Докладвано от"
         reviewed_by: "Прегледан от"
+        reviewed_timestamp: "Дата на преглед"
       statuses:
         pending:
           title: "Чакащи"
         approved:
           title: "Одобрена"
+        approved_flag:
+          title: "Сигналът е одобрен"
+        approved_user:
+          title: "Потребителят е одобрен"
+        approved_post:
+          title: "Публикацията е одобрена"
         rejected:
           title: "Отхвърлени"
+        rejected_flag:
+          title: "Сигналът е отхвърлен"
+        rejected_user:
+          title: "Потребителят е отхвърлен"
+        rejected_post:
+          title: "Публикацията е отхвърлена"
         ignored:
-          title: "Игнориран"
+          title: "Сигналът е игнориран"
         deleted:
-          title: "Изтрита"
+          title: "Темата или публикацията са изтрити"
         reviewed:
-          title: "(всички прегледани)"
+          title: "Всички прегледани"
         all:
-          title: "(всичко)"
+          title: "Всичко"
+      context_question:
+        is_this_post: "Тази публикация %{reviewable_human_score_types}ли е?"
+        delimiter: "или"
+        something_else_wrong: "Има ли нещо нередно с тази публикация?"
       types:
         reviewable_flagged_post:
           title: "Маркирана публикация"
@@ -837,6 +856,7 @@ bg:
         make_all_primary_description: "Направете това основна група за всички избрани потребители"
         remove_all_primary: "Премахване като Основна"
         remove_all_primary_description: "Премахнете тази група като основна"
+        status: "Статус"
         owner: "Собественик"
         primary: "Основен"
         forbidden: "Нямате право да преглеждате потребителите."
@@ -965,10 +985,12 @@ bg:
       mute: "Заглуши"
       edit: "Редактирай настройките"
       download_archive:
-        button_text: "Изтегли всичко"
-        confirm: "Сигурни ли сте, че искате да свалите своите публикации?"
-        success: "Свалянето е инициирано, ще бъдете уведомени чрез съобщение когато процесът е завършен."
-        rate_limit_error: "Публикации могат да бъдат сваляни веднъж дневно, моля опитайте отново утре."
+        title: "Експортирайте вашите данни"
+        description: "Изтеглете архив на активността и предпочитанията на вашия акаунт."
+        button_text: "Заявяване за архив"
+        confirm: "Наистина ли искате да изтеглите архив на активността и предпочитанията на вашия акаунт?"
+        success: "Започнахме да събираме вашия архив, ще получите съобщение, когато процесът приключи."
+        rate_limit_error: "Архивите на акаунта могат да се изтеглят веднъж на ден, моля, опитайте отново утре."
       new_private_message: "Ново Съобщение"
       private_message: "Съобщение"
       private_messages: "Съобщения"
@@ -1021,6 +1043,7 @@ bg:
           warning: "Наистина ли искате да изчистите представената си тема?"
       use_current_timezone: "Използвайте текущата часова зона"
       profile_hidden: "Публичният профил на този потребител е скрит."
+      inactive_user: "Този потребител вече не е активен."
       expand_profile: "Разшири"
       sr_expand_profile: "Разгънете подробностите за профила"
       collapse_profile: "Намали"
@@ -1040,7 +1063,7 @@ bg:
         perm_denied_expl: "Вие сте забранили известията. Моля разрешете ги чрез настройките на браузъра си."
         disable: "Деактивиране на Известията"
         enable: "Активиране на Известията"
-        each_browser_note: 'Забележка: Трябва да промените тази настройка във всеки браузър, който използвате. Всички известия ще бъдат деактивирани, ако поставите на пауза известията от потребителското меню, независимо от тази настройка.'
+        each_browser_note: "Забележка: Трябва да промените тази настройка във всеки браузър, който използвате. Всички известия ще бъдат деактивирани, ако поставите на пауза известията от потребителското меню, независимо от тази настройка."
         consent_prompt: "Искате ли известявания в реално време, когато хората отговарят на вашите публикации?"
       dismiss: "Отмени"
       dismiss_notifications: "Отмени всички"
@@ -1091,14 +1114,7 @@ bg:
       experimental_sidebar:
         enable: "Активиране на страничната лента"
         options: "Опции"
-        categories_section: "Раздел Категории"
-        categories_section_instruction: "Избраните категории ще бъдат показани в раздел \"Категории\" на страничната лента."
-        tags_section: "Раздел за етикети"
-        tags_section_instruction: "Избраните етикети ще бъдат показани в секцията с етикети на страничната лента."
         navigation_section: "Навигация"
-        list_destination_instruction: "Когато има ново съдържание в страничната лента..."
-        list_destination_default: "използвайте връзката по подразбиране и покажете значка за нови елементи"
-        list_destination_unread_new: "връзка към непрочетени/нови и показване на броя нови елементи"
       change: "промени"
       featured_topic: "Представена тема"
       moderator: "%{user} е модератор"
@@ -1169,12 +1185,24 @@ bg:
       home: "Начална страница по подразбиране"
       staged: "Поставен"
       staff_counters:
-        flags_given: "полезни сигнали"
-        flagged_posts: "публикации със сигнали"
-        deleted_posts: "изтрити публикации"
-        suspensions: "отстранявания"
-        warnings_received: "предупреждения"
-        rejected_posts: "отхвърлени публикации"
+        flags_given:
+          one: '<span class="%{className}">%{count}</span> полезен сигнал'
+          other: '<span class="%{className}">%{count}</span> полезни сигнала'
+        flagged_posts:
+          one: '<span class="%{className}">%{count}</span> публикация със сигнал'
+          other: '<span class="%{className}">%{count}</span> публикации със сигнал'
+        deleted_posts:
+          one: '<span class="%{className}">%{count}</span> изтрита публикация'
+          other: '<span class="%{className}">%{count}</span> изтрити публикации'
+        suspensions:
+          one: '<span class="%{className}">%{count}</span> спиране'
+          other: '<span class="%{className}">%{count}</span> спирания'
+        warnings_received:
+          one: '<span class="%{className}">%{count}</span> предупреждение'
+          other: '<span class="%{className}">%{count}</span> предупреждения'
+        rejected_posts:
+          one: '<span class="%{className}">%{count}</span> отхвърлена публикация'
+          other: '<span class="%{className}">%{count}</span> отхвърлени публикации'
       messages:
         all: "всички пощенски кутии"
         inbox: "Входяща кутия"
@@ -1267,7 +1295,6 @@ bg:
         tags: "Етикети"
         interface: "Интерфейс"
         apps: "Апликации"
-        sidebar: "Странична лента"
       change_password:
         success: "(имейлът е изпратен)"
         in_progress: "(изпраща се имейл)"
@@ -1281,11 +1308,12 @@ bg:
         title: "Двуфакторни резервни кодове"
         regenerate: "Регенерирай"
         disable: "Деактивиране"
-        enable: "Позволи"
-        enable_long: "Активиране на резервни кодове"
+        enable: "Създаване на резервни кодове"
+        enable_long: "Добавяне на резервни кодове"
+        not_enabled: "Все още не сте създали никакви резервни кодове."
         manage:
-          one: "Управление на резервни кодове. Остава ви <strong>%{count}</strong> резервен код."
-          other: "Управление на резервни кодове. Остават ви <strong>%{count}</strong> резервни кода."
+          one: "Остава ви <strong>%{count}</strong> резервен код."
+          other: "Остават ви <strong>%{count}</strong> резервни кода."
         copy_to_clipboard: "Копиране в клипборда"
         copy_to_clipboard_error: "Грешка при копирането на данни в клипборда"
         copied_to_clipboard: "Копирано в клипборда"
@@ -1369,6 +1397,7 @@ bg:
         success: "Изпратихме съобщение на този адрес. Моля, следвайте инструкциите за потвърждаване."
         success_via_admin: "Изпратихме имейл на този адрес. Потребителят ще трябва да следва инструкциите за потвърждение в имейла."
         success_staff: "Изпратихме съобщение на този адрес. Моля, следвайте инструкциите за потвърждаване."
+        back_to_preferences: "Обратно към предпочитанията"
       change_avatar:
         title: "Сменете аватара на вашия профил "
         gravatar: "<a href='//%{gravatarBaseUrl}%{gravatarLoginUrl}' target='_blank'>%{gravatarName}</a>, въз основа на"
@@ -1723,8 +1752,7 @@ bg:
       pause_notifications: "Пауза на известията"
       remove_status: "Премахване на статуса"
     user_tips:
-      primary: "Схванах го!"
-      secondary: "не ми показвай тези съвети"
+      button: "Схванах го!"
       first_notification:
         title: "Вашето първо известие!"
         content: "Известията се използват, за да ви информират какво се случва в общността."
@@ -1774,36 +1802,6 @@ bg:
       logout_disabled: "Излизане от сайта е временно спряно, докато е пуснат режим \"само за четене\"."
     staff_writes_only_mode:
       enabled: "Този сайт е в режим само за персонал. Моля, продължете да сърфирате, но отговарянето, харесванията и други действия са ограничени само до членове на персонала."
-    too_few_topics_and_posts_notice_MF: |
-      Нека <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">започнем дискусията!</a> Там { currentTopics, plural,
-          one {е <strong>#</strong> тема}
-        other {са <strong>#</strong> теми}
-      } и { currentPosts, plural,
-          one {<strong>#</strong> публикация}
-        other {<strong>#</strong> публикации}
-      }. Посетителите се нуждаят от повече за четене и отговор – препоръчваме поне { requiredTopics, plural,
-          one {<strong>#</strong> тема}
-        other {<strong>#</strong> теми}
-      } и { requiredPosts, plural,
-          one {<strong>#</strong> публикация}
-        other {<strong>#</strong> публикации}
-      }. Само служителите могат да видят това съобщение.
-    too_few_topics_notice_MF: |
-      Нека <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">започнем дискусията!</a> Там { currentTopics, plural,
-          one {е <strong>#</strong> тема}
-        other {са <strong>#</strong> теми}
-      }. Посетителите се нуждаят от повече за четене и отговор – препоръчваме поне { requiredTopics, plural,
-          one {<strong>#</strong> тема}
-        other {<strong>#</strong> теми}
-      }. Само служителите могат да видят това съобщение.
-    too_few_posts_notice_MF: |
-      Нека <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">започнем дискусията!</a> Там { currentPosts, plural,
-          one {е <strong>#</strong> публикация}
-        other {са <strong>#</strong> публикации}
-      }. Посетителите се нуждаят от повече за четене и отговор – препоръчваме поне { requiredPosts, plural,
-          one {<strong>#</strong> публикация}
-        other {<strong>#</strong> публикации}
-      }. Само служителите могат да видят това съобщение.
     logs_error_rate_notice:
       reached_hour_MF: |
         <b>{relativeAge}</b> – <a href='{url}' target='_blank'>{ rate, plural,
@@ -1840,13 +1838,9 @@ bg:
       intro: "Здравейте! Изглежда, че следите дискусията, но все още не сте създали собствен профил."
       value_prop: "Уморихте ли се да превъртате едни и същи публикации? Когато създадете акаунт, винаги ще се връщате там, до където сте стигнали. С акаунт можете също да получавате известия за нови отговори, да запазвате отметки и да използвате харесвания, за да благодарите на другите. Всички можем да работим заедно, за да направим тази общност страхотна. :heart:"
     summary:
-      enabled_description: "В момента гледате резюме на тази тема: най-интересните публикации определени от общността."
       description_time_MF: |
         Има{replyCount, plural, one {<b>#</b> reply} other { <b>#</b> отговора}} с очаквано време за четене <b>{readingTime, plural, one {# минута} other {# минути}}</b>.
-      enable: "Обобщи Тази Тема"
       disable: "Покажи всички публикации"
-      short_label: "Обобщаване"
-      short_title: "Покажете обобщение на тази тема: най-интересните публикации, определени от общността"
     deleted_filter:
       enabled_description: "Тази тема има изтрити публикации, които са скрити."
       disabled_description: "Изтритите публикации в тази тема са показани."
@@ -2132,8 +2126,6 @@ bg:
         topic_template_not_modified: "Моля, добавете подробности към вашата тема, като редактирате шаблона на темата."
       save_edit: "Запази редакцията"
       overwrite_edit: "Презаписване Редактиране"
-      reply_original: "Отговори на Оригинална Тема"
-      reply_here: "Отговори тук"
       reply: "Отговорете"
       cancel: "Прекрати"
       create_topic: "Създай тема"
@@ -2433,6 +2425,7 @@ bg:
         bookmarks: "Все още нямате теми в Отметки."
         category: "Няма теми в категория %{category}."
         top: "Няма топ теми."
+        filter: "Няма теми."
       bottom:
         latest: "Няма повече теми в Последни."
         posted: "Няма повече публикувани теми."
@@ -2443,8 +2436,10 @@ bg:
         tag: "Няма повече теми в %{tag}"
         top: "Няма повече топ теми."
         bookmarks: "Няма теми в Отметки"
+        filter: "Няма повече теми."
     topic:
       create: "Нова тема"
+      create_disabled_category: "Нямате право да създавате теми в тази категория"
       create_long: "Създайте нова тема"
       open_draft: "Довърши ревизия"
       private_message: "Започни съобщение"
@@ -2485,8 +2480,8 @@ bg:
       back_to_list: "Назад към Списъка с теми"
       options: "Настройки на темата"
       show_links: "покажи връзките в тази тема"
-      jump_reply_up: към по ранен отговор
-      jump_reply_down: към по-късен отговор
+      jump_reply: "Отидете до първоначалното местоположение на публикацията"
+      jump_reply_aria: "Отидете до публикацията на @%{username} в първоначалното й местоположение"
       deleted: "Темата беше изтрита"
       slow_mode_update:
         title: "Бавен режим"
@@ -2779,6 +2774,7 @@ bg:
       ignored: "Игнорирано съдържание"
       wiki_last_edited_on: "wiki последно редактирано на %{dateTime}"
       last_edited_on: "последна редакция на публикацията на %{dateTime}"
+      edit_history: "история на редактиране на публикацията"
       reply_as_new_topic: "Отговори като свързана тема"
       reply_as_new_private_message: "Отговорете като ново съобщение до същите получатели"
       continue_discussion: "Продължаване на дискусията от %{postLink}: "
@@ -2787,6 +2783,9 @@ bg:
       show_hidden: "Преглед на игнорираното съдържание."
       deleted_by_author_simple: "(публикацията е изтрита от автора)"
       collapse: "намали"
+      sr_expand_replies:
+        one: "Тази публикация има %{count} отговор"
+        other: "Тази публикация има %{count} отговора"
       expand_collapse: "разшири/намали "
       locked: "служител е блокирал тази публикация от редактиране"
       gap:
@@ -2891,6 +2890,8 @@ bg:
           last: "Последна ревизия"
           hide: "Скрий ревизията"
           show: "Покажи ревизията"
+          destroy: "Изтриване на ревизии"
+          destroy_confirm: "Сигурни ли сте, че искате да изтриете всички ревизии на тази публикация? Това действие е необратимо."
           edit_wiki: "Редактиране на Wiki"
           edit_post: "Редактиране на публикацията"
         displays:
@@ -2917,6 +2918,7 @@ bg:
         edit: "Редактиране на отметката"
         name: "Име"
         name_placeholder: "За какво е тази отметка?"
+        name_input_label: "Име на отметка"
         set_reminder: "Напомни ми"
         options: "Опции"
         actions:
@@ -2932,7 +2934,7 @@ bg:
       view: "Покажи темите в категория "
       general: "Основни"
       settings: "Настройки"
-      topic_template: "Шаблон на темата"
+      topic_template: "Шаблон"
       tags: "Етикети"
       tags_placeholder: "(По желание) списък на позволените етикети"
       required_tag_group:
@@ -2971,8 +2973,7 @@ bg:
       images: "Изображения"
       email_in: "Персонализиран входящ имейл адрес: "
       email_in_allow_strangers: "Приемай имейли от анонимни потребители, които нямат регистрация"
-      email_in_disabled: "Публикуването на нови теми чрез имейл е забранено от настройките на сайта. За да разрешите публикуването на нови теми чрез имейл,"
-      email_in_disabled_click: 'разрешете "email in" настройката '
+      email_in_disabled: "Публикуването на нови теми по имейл е забранено. За да активирате публикуването на нови теми по имейл, активирайте настройката <a href='%{setting_url}'>'имейл в'</a>."
       show_subcategory_list: "Показване на списъка с подкатегории над темите в тази категория."
       num_featured_topics: "Брой на темите, показвани на страницата с категории:"
       subcategory_num_featured_topics: "Брой на включените теми на страницата на родителската категория:"
@@ -2986,6 +2987,7 @@ bg:
       default_position: "Позиция по подразбиране "
       minimum_required_tags: "Минимален брой етикети на тема"
       parent: "Главна категория"
+      auto_bump_cooldown_days: "Минимум дни преди да попаднете повторно на същата тема:"
       notifications:
         watching:
           title: "Наблюдаване"
@@ -3047,7 +3049,9 @@ bg:
         inappropriate: "Неподходяща е"
         spam: "Съдържа спам"
       custom_placeholder_notify_user: "Бъдете точни, конструктивни и учтиви."
+      notify_user_textarea_label: "Съобщение за потребителя"
       custom_placeholder_notify_moderators: "Споделете ни какви точно са Вашите притеснения и ако е възможно ни дайте съответните връзки или примери, които имат отношение по темата."
+      notify_moderators_textarea_label: "Съобщение за модераторите"
     flagging_topic:
       title: "Благодарим ви, че помагате да поддържаме дискусията цивилизована."
       action: "Сигнализирай темата"
@@ -3113,6 +3117,10 @@ bg:
     filters:
       with_topics: "%{filter} теми"
       with_category: "%{filter} %{category} теми"
+      filter:
+        title: "Филтър"
+        button:
+          label: "Филтър"
       latest:
         title: "Последни"
         title_with_count:
@@ -3224,6 +3232,7 @@ bg:
       composing:
         title: "Съставяне"
         return: "%{shortcut} Връщане към редактора"
+        insert_current_time: "%{shortcut} Вмъкване на текущото време"
       actions:
         title: "Действия"
         bookmark_topic: "%{shortcut} Отменете статуса на темата в отментки."
@@ -3244,12 +3253,12 @@ bg:
         mark_watching: "%{shortcut} Наблюдаване на темата"
     badges:
       granted_on: "Разрешен %{date}"
-      others_count: "Други са такава значка (%{count})"
       title: Значки
       allow_title: "Може да използвате тази значка като титла."
       more_badges:
         one: "+Още %{count}"
         other: "+Още %{count}"
+      awarded: присъдени
       select_badge_for_title: Изберете значка за титла?
       none: "(никой)"
       successfully_granted: "Успешно дадохте %{badge}на %{username}"
@@ -3326,7 +3335,6 @@ bg:
         half_hour: "30 минути"
         one_hour: "1 час"
         two_hours: "2 часа"
-        custom: "По избор"
     trust_levels:
       names:
         newuser: "нов потребител"
@@ -3343,7 +3351,31 @@ bg:
         other: "%{count} нови"
       more: "Повече"
       all_categories: "Всички категории"
+      edit_navigation_modal_form:
+        filter_dropdown:
+          all: "Всички"
       sections:
+        custom:
+          add: "Добавяне на персонализиран раздел"
+          edit: "Редактиране на персонализиран раздел"
+          save: "Запази"
+          delete: "Изтрий"
+          delete_confirm: "Сигурни ли сте, че искате да изтриете този раздел?"
+          public: "Направете този раздел публичен и видим от всички"
+          links:
+            add: "Добавете друга връзка"
+            delete: "Изтриване на връзката"
+            reset: "Обновявам до първоначалното"
+            icon:
+              label: "Икона"
+              validation:
+                blank: "Иконата не може да бъде празна"
+                maximum: "Иконата трябва да е по-къса от %{count} знака"
+            name:
+              label: "Име "
+              validation:
+                blank: "Името не може да бъде празно"
+                maximum: "Името трябва да е по-кратко от %{count} знака"
         about:
           header_link_text: "Относно"
         messages:
@@ -3361,7 +3393,8 @@ bg:
         categories:
           header_link_text: "Категории"
         community:
-          header_link_text: "Общност "
+          edit_section:
+            header_dropdown: "Персонализация"
           links:
             about:
               content: "Относно"
@@ -3369,8 +3402,8 @@ bg:
               content: "Администратор"
             badges:
               content: "Значки"
-            everything:
-              content: "Всичко"
+            topics:
+              content: "Теми"
             faq:
               content: "FAQ"
             groups:
@@ -3381,6 +3414,13 @@ bg:
               content: "Моите публикации"
             review:
               content: "Преглед"
+    form_template_chooser:
+      select_template: "Изберете шаблони за формуляри"
+    form_templates:
+      errors:
+        typeMismatch:
+          default: "Моля, въведете валидна стойност."
+          email: "Моля, въведете валиден имейл адрес."
   admin_js:
     type_to_filter: "филтрирай..."
     admin:
@@ -3513,7 +3553,6 @@ bg:
         enabled: "Да е включен?"
         is_enabled: "Y "
         not_enabled: "N "
-        change_settings: "Промени Настройките"
         change_settings_short: "Настройки"
         howto: "Как да инсталирам софтуерни приставки?"
       backups:
@@ -3663,6 +3702,8 @@ bg:
           love:
             name: "любов"
             description: "Цвят на бутона харесвам. "
+          selected:
+            name: "избрани"
         email_style:
           css: "CSS"
           reset: "Обновявам до първоначалното"
@@ -3853,6 +3894,74 @@ bg:
           add: "Добави"
         test:
           no_matches: "Няма намерени съвпадения"
+      form_templates:
+        nav_title: "Шаблони"
+        list_table:
+          headings:
+            name: "Име"
+            actions: "Действия"
+        view_template:
+          close: "Затвори"
+          edit: "Редактирай"
+          delete: "Изтрий"
+          toggle_preview: "Превключване на преглед"
+        new_template_form:
+          submit: "Запази "
+          cancel: "Прекрати"
+          name:
+            label: "Име на шаблон"
+            placeholder: "Въведете име за този шаблон..."
+          template:
+            label: "Шаблон"
+            placeholder: "Създайте YAML шаблон тук..."
+          preview: "Преглед"
+        delete_confirm: "Сигурни ли сте, че искате да изтриете този шаблон?"
+        quick_insert_fields:
+          add_new_field: "Добави "
+          checkbox: "Квадратче за отметка"
+          input: "Кратък отговор"
+          textarea: "Дълъг отговор"
+          dropdown: "Падащо"
+          upload: "Качване на файл"
+          multiselect: "Множествен избор"
+        validations_modal:
+          button_title: "Валидации"
+          modal_title: "Опции за валидиране"
+          table_headers:
+            key: "Ключ"
+            type: "Тип"
+            description: "Описание"
+          validations:
+            required:
+              key: "задължително"
+              type: "булево"
+              description: "Изисква полето да бъде попълнено, за да изпратите формуляра."
+            minimum:
+              key: "минимум"
+              type: "цяло число"
+            maximum:
+              key: "максимум"
+              type: "цяло число"
+            pattern:
+              key: "модел"
+            type:
+              key: "тип"
+        preview_modal:
+          title: "Преглед на шаблон"
+        field_placeholders:
+          validations: "въведете валидациите тук"
+          label: "Въведете етикета тук"
+          placeholder: "Въведете заместител тук"
+          none_label: "Изберете елемент"
+          choices:
+            first: "Опция 1"
+            second: "Опция 2"
+            third: "Опция 3"
+        edit_category:
+          toggle_freeform: "шаблонът на формуляра е деактивиран"
+          toggle_form_template: "шаблон на формуляр е активиран"
+          select_template: "Изберете шаблони за формуляри"
+          select_template_help: "Добавяне/редактиране на шаблони на формуляри"
       impersonate:
         title: "Представи"
         help: "Използвайте този инструмент, за да предоставите потребителски профили за отстраняване на грешките. Трябва да излезете когато приключите."
@@ -3864,6 +3973,7 @@ bg:
         last_emailed: "Последен имейл"
         not_found: "Съжаляваме, това потребителско име не съществува при нас."
         id_not_found: "Съжаляваме, това потребителско име не съществува при нас. "
+        status: "Статус"
         show_emails: "Покажи имейла"
         nav:
           new: "Нови"
@@ -3904,7 +4014,6 @@ bg:
         staged: "Поставен?"
         show_admin_profile: "Админ"
         show_public_profile: "Покажи публичния профил "
-        impersonate: "Представени "
         ip_lookup: "IP търсене "
         log_out: "Изход "
         logged_out: "Потребителя беше разлогнат от всички устройства "
@@ -4060,6 +4169,8 @@ bg:
         go_back: "Към търсачката"
         recommended: "За вашите нужди, Ви препоръчваме да редактирате следният текст:"
         show_overriden: "Избери само презаписаните"
+        outdated:
+          dismiss: "Отмени"
       settings:
         show_overriden: "Показване само на презаписаните"
         reset: "изчисти"
@@ -4067,7 +4178,6 @@ bg:
       site_settings:
         title: "Настройки"
         no_results: "Няма резултати"
-        more_than_30_results: "Има повече от 30 резултата. Моля, прецизирайте търсенето си или изберете категория."
         clear_filter: "Изчисти"
         add_url: "добавяне на URL"
         add_host: "добави хост"
@@ -4139,7 +4249,8 @@ bg:
         allow_title: Позволете значките да бъдат ползвани като титли.
         multiple_grant: Може да бъде присъдена няколко пъти
         listable: Показвай значката на страницата със значки
-        enabled: Разрешете значката
+        enabled: да е включен
+        disabled: деактивирани
         icon: Икона
         image: Изображение
         query: Badge Query (SQL)
@@ -4188,6 +4299,12 @@ bg:
       embedding:
         get_started: "Ако искате да внедрите Discourse в друг сайт, започнете с добавянето на хоста му."
         confirm_delete: "Сигурни ли сте, че искате да изтриете този хост?"
+        sample: |
+          <p>Поставете следния HTML код във вашия сайт, за да създадете и вградите теми за Discourse. Заменете <b>EMBED_URL</b> с каноничния URL адрес на страницата, в която го вграждате.</p>
+
+          <p>Ако искате да персонализирате стила, премахнете коментарите и заменете <b>CLASS_NAME</b> с CSS клас, дефиниран във <i>Вградения CSS</i> на вашата тема.</p>
+
+          <p>Заменете <b>DISCOURSE_USERNAME</b> с потребителското име на Discourse на автора, който трябва да създаде темата. Discourse автоматично ще търси потребителя по атрибута <code>content</code> на етикетите <code>&lt;meta&gt;</code> с атрибут <code>name</code> , зададен на <code>discourse-username</code> или <code>author</code>. Параметърът <code>discourseUserName</code> е отменен и ще бъде премахнат в Discourse 3.2.</p>
         title: "Ембедване"
         host: "Позволени хостове"
         edit: "редактирай"
diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml
index 27490c8e24c..1d7db96a61f 100644
--- a/config/locales/client.bs_BA.yml
+++ b/config/locales/client.bs_BA.yml
@@ -180,8 +180,6 @@ bs_BA:
     emails_are_disabled: "Sve odlazeće email poruke su globalno onemogućene od strane administratora. Ni jedna notifikacija bilo koje vrste neće biti poslana."
     software_update_prompt:
       dismiss: "Odpusti"
-    bootstrap_mode_disabled: "Bootstrap način rada će biti isključen u toku 24 sata."
-    bootstrap_invite_button_title: "Pošalji Pozivnice"
     themes:
       default_description: "Uobičajen"
     s3:
@@ -282,7 +280,6 @@ bs_BA:
       title: "Zabilješka"
       clear_bookmarks: "Odstrani zabilješku"
       help:
-        bookmark: "Klikni kako bi dodao zabilješku na prvu objavu u temi"
         unbookmark: "Klikni za uklanjanje svih zabilješki sa ove teme"
     bookmarks:
       created: "Zabilježili ste ovu objavu. %{name}"
@@ -487,11 +484,9 @@ bs_BA:
       scores:
         about: "Ovaj rezultat se izračunava na osnovu nivoa pouzdanosti reportera, tačnosti njihovih prethodnih zastavica i prioriteta stavke koja se prijavljuje."
         score: "bodovi"
-        date: "Datum"
-        type: "Tip"
+        type: "Reason"
         status: "Status"
-        submitted_by: "Poslao je"
-        reviewed_by: "Pregledao je"
+        submitted_by: "prijavio"
       statuses:
         pending:
           title: "Na čekanju"
@@ -499,14 +494,12 @@ bs_BA:
           title: "Dozvojeno"
         rejected:
           title: "Odbijeni"
-        ignored:
-          title: "Ignorisano"
-        deleted:
-          title: "Isbrisano"
         reviewed:
-          title: "(sve pregledano)"
+          title: "Sve pregledano"
         all:
-          title: "(sve)"
+          title: "Sve"
+      context_question:
+        delimiter: "ili"
       types:
         reviewable_flagged_post:
           title: "Kažnjen post"
@@ -740,6 +733,7 @@ bs_BA:
         make_owner_description: "Napravi<b>%{username}</b> vlasnikom ove grupe"
         remove_owner: "Ukloni kao vlasnika"
         remove_owner_description: "Ukloni <b>%{username}</b> kao vlasnika ove grupe"
+        status: "Status"
         owner: "Vlasnik"
         forbidden: "Nije vam dozvoljeno da vidite članove."
       topics: "Teme"
@@ -857,11 +851,6 @@ bs_BA:
       profile: "Profil"
       mute: "Mutiraj"
       edit: "Uredi Postavke"
-      download_archive:
-        button_text: "Preuzmi sve"
-        confirm: "Da li ste sigurni da želite preuzeti svoju objavu?"
-        success: "Preuzimanje je započeto, bit će te obavješteni porukom kada proces bude završen."
-        rate_limit_error: "Objava može biti preuzeta samo jedanput na dan, molimo vas da pokušate sutra ponovo."
       new_private_message: "Nova poruka"
       private_message: "Poruka"
       private_messages: "Poruke"
@@ -1008,13 +997,6 @@ bs_BA:
       save_to_change_theme: 'Tema će biti ažurirana nakon što kliknete "%{save_text}"'
       home: "Uobičajena početna stranica"
       staged: "Priređen"
-      staff_counters:
-        flags_given: "pomoćne prijave"
-        flagged_posts: "prijavljene objave"
-        deleted_posts: "obrisane objave"
-        suspensions: "suspenzije"
-        warnings_received: "upozorenja"
-        rejected_posts: "odbijeni postovi"
       messages:
         inbox: "Inbox"
         latest: "Zadnje"
@@ -1060,8 +1042,6 @@ bs_BA:
       second_factor_backup:
         regenerate: "Regenerate"
         disable: "Onemogući"
-        enable: "Omogući"
-        enable_long: "Omogućite rezervne kodove"
         copy_to_clipboard: "Kopirati u clipboard"
         copy_to_clipboard_error: "Pogreška pri kopiranju podataka u međuspremnik"
         copied_to_clipboard: "Kopirano u međuspremnik"
@@ -1458,8 +1438,6 @@ bs_BA:
       hide_forever: "ne hvala"
       intro: "Zdravo! Čini se da uživate u raspravi, ali još se niste prijavili za račun."
     summary:
-      enabled_description: "Trenutno gledate sažetak ove teme: objave koje drugi članovi smatraju kao najinteresantnije."
-      enable: "Napravi sažetak ove teme"
       disable: "Prikaži sve objave"
     deleted_filter:
       enabled_description: "Ova tema sadrži obrisane objave, vidljive za administratore dok su za ostale korisnike skrivene."
@@ -1671,8 +1649,6 @@ bs_BA:
         topic_template_not_modified: "Molimo da dodate detalje i specifikacije za vašu temu tako što ćete izmijeniti template teme."
       save_edit: "Sačuvaj izmjene"
       overwrite_edit: "Overwrite Edit"
-      reply_original: "Odgovori na Originalnu temu"
-      reply_here: "Odgovori Ovdje"
       reply: "Odgovori"
       cancel: "Odustani"
       create_topic: "Pokreni temu"
@@ -2041,8 +2017,6 @@ bs_BA:
       back_to_list: "Vrati se na Listu Tema"
       options: "Opcije Teme"
       show_links: "pokaži linkove unutar ove teme"
-      jump_reply_up: jump to earlier reply
-      jump_reply_down: jump to later reply
       deleted: "Ova tema je obrisana"
       slow_mode_update:
         enable: "Omogući"
@@ -2497,7 +2471,6 @@ bs_BA:
       view: "View Topics in Category"
       general: "General"
       settings: "Postavke"
-      topic_template: "Tematski predložak"
       tags: "Oznake"
       tags_allowed_tags: "Ograničite ove oznake na ovu kategoriju:"
       tags_allowed_tag_groups: "Ograničite ove grupe oznaka na ovu kategoriju:"
@@ -2540,8 +2513,6 @@ bs_BA:
       images: "Images"
       email_in: "Custom incoming email address:"
       email_in_allow_strangers: "Accept emails from anonymous users with no accounts"
-      email_in_disabled: "Posting new topics via email is disabled in the Site Settings. To enable posting new topics via email, "
-      email_in_disabled_click: 'enable the "email in" setting.'
       mailinglist_mirror: "Kategorija odražava mailing listu"
       show_subcategory_list: "Prikaži listu podkategorija iznad tema u ovoj kategoriji."
       subcategory_num_featured_topics: "Broj istaknutih tema na stranici roditeljske kategorije:"
@@ -2725,6 +2696,10 @@ bs_BA:
     filters:
       with_topics: "%{filter} teme"
       with_category: "%{filter} %{category} teme"
+      filter:
+        title: "Filter"
+        button:
+          label: "Filter"
       latest:
         title: "Zadnje"
         title_with_count:
@@ -2809,6 +2784,9 @@ bs_BA:
       close: "Zatvori (Esc)"
       content_load_error: '<a href="%url%">Sadržaj</a> nije moguće učitati.'
       image_load_error: '<a href="%url%">Slika</a> se ne može učitati.'
+    experimental_lightbox:
+      buttons:
+        close: "Zatvori (Esc)"
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", \\ T"
       shortcut_key_delimiter_plus: "+"
@@ -2895,7 +2873,6 @@ bs_BA:
         few: "Zaradili ste ovu oznaku %{count} puta"
         other: "Zaradili ste ovu oznaku %{count} puta"
       granted_on: "Odobren %{date}"
-      others_count: "Ostale sa ovom značkom (%{count}) \\ t"
       title: Bedž
       allow_title: "Ovu značku možete koristiti kao naslov"
       multiple_grant: "To možete zaraditi više puta"
@@ -3044,10 +3021,6 @@ bs_BA:
     safe_mode:
       enabled: "Bezbedan režim je omogućen, da biste izašli iz bezbednog režima, zatvorite ovaj prozor pregledača"
     image_removed: "(slika uklonjena)"
-    pause_notifications:
-      remaining: "%{remaining} preostalo"
-      options:
-        custom: "Custom"
     trust_levels:
       names:
         newuser: "novi korisnik"
@@ -3066,7 +3039,20 @@ bs_BA:
         other: "%{count} novih"
       more: "Još"
       all_categories: "Sve kategorije"
+      edit_navigation_modal_form:
+        filter_dropdown:
+          all: "All"
       sections:
+        custom:
+          save: "Save"
+          delete: "Delete"
+          links:
+            icon:
+              label: "Icon"
+            name:
+              label: "Ime"
+            value:
+              label: "Link"
         about:
           header_link_text: "O nama"
         messages:
@@ -3084,7 +3070,8 @@ bs_BA:
         categories:
           header_link_text: "Kategorije"
         community:
-          header_link_text: "Zajednica"
+          edit_section:
+            header_dropdown: "Customize"
           links:
             about:
               content: "O nama"
@@ -3092,8 +3079,8 @@ bs_BA:
               content: "Admin"
             badges:
               content: "Bedž"
-            everything:
-              content: "Sve"
+            topics:
+              content: "Topics"
             faq:
               content: "Česta pitanja"
             groups:
@@ -3105,6 +3092,10 @@ bs_BA:
             review:
               content: "Pregled"
     until: "Sve do:"
+    form_templates:
+      errors:
+        typeMismatch:
+          default: "Molim unesite ispravnu vrijednost."
   admin_js:
     type_to_filter: "kucaj da sortiraš..."
     admin:
@@ -3383,7 +3374,6 @@ bs_BA:
         enabled: "Omogućen?"
         is_enabled: "Da"
         not_enabled: "Ne"
-        change_settings: "Izmijeni postavke"
         change_settings_short: "Postavke"
         howto: "Kako instaliram pluginove?"
         official: "Officionalni Plugin"
@@ -3653,6 +3643,8 @@ bs_BA:
           love:
             name: "love"
             description: "The like button's color."
+          selected:
+            name: "označeno"
         robots:
           title: "Poništite datoteku robots.txt web-lokacije:"
           warning: "Ovo će trajno poništiti sve srodne postavke web-lokacije."
@@ -3903,11 +3895,6 @@ bs_BA:
           replace: "Zamijeni"
           silence: "Stišaj"
           link: "Link"
-        action_descriptions:
-          block: "Spriječite postavljanje postova koji sadrže ove riječi. Korisnik će vidjeti poruku o pogrešci kada pokuša da pošalje svoj post."
-          censor: "Dopustite poruke koje sadrže te riječi, ali ih zamijenite znakovima koji kriju cenzurirane riječi."
-          require_approval: "Postovi koji sadrže ove riječi će zahtijevati odobrenje osoblja prije nego što se mogu vidjeti."
-          flag: "Dozvoli objave koje sadrže ove riječi, ali prijavi ih kao neadekvatne kako bi ih moderatori mogli analizirati gledajući na kontekst i značenje"
         form:
           placeholder_regexp: "regularni izraz"
           link_label: "Link"
@@ -3919,6 +3906,33 @@ bs_BA:
           upload_successful: "Otpremanje je uspješno. Riječi su dodane."
         test:
           no_matches: "Nije pronađen traženi pojam"
+      form_templates:
+        nav_title: "Predlošci"
+        list_table:
+          headings:
+            name: "Ime"
+            actions: "Akcije"
+        view_template:
+          close: "Zatvori"
+          edit: "Edit"
+          delete: "Delete"
+        new_template_form:
+          submit: "Save"
+          cancel: "Odustani"
+          preview: "Pregled"
+        quick_insert_fields:
+          add_new_field: "Add"
+          dropdown: "Ispustiti"
+        validations_modal:
+          table_headers:
+            key: "Ključ"
+            type: "Tip"
+            description: "Opis"
+          validations:
+            required:
+              key: "required"
+            type:
+              key: "tip"
       impersonate:
         title: "Impersonate"
         help: "Use this tool to impersonate a user account for debugging purposes. You will have to log out once finished."
@@ -3931,6 +3945,7 @@ bs_BA:
         not_found: "Sorry, that username doesn't exist in our system."
         id_not_found: "Nažalost, taj korisnički ID ne postoji u našem sistemu."
         active: "Aktivirano"
+        status: "Status"
         show_emails: "Prikaži e-mailove"
         hide_emails: "Hide Emails"
         nav:
@@ -4001,7 +4016,6 @@ bs_BA:
         staged: "Staged?"
         show_admin_profile: "Admin"
         show_public_profile: "Show Public Profile"
-        impersonate: "Impersonate"
         action_logs: "Logovi akcija"
         ip_lookup: "IP Lookup"
         log_out: "Log Out"
@@ -4179,6 +4193,8 @@ bs_BA:
         recommended: "Preporučujemo da prilagodite sledeći tekst tako da odgovara vašim potrebama:"
         show_overriden: "Only show overridden"
         more_than_50_results: "Postoji više od 50 rezultata. Pročistite pretraživanje."
+        outdated:
+          dismiss: "Odbaci"
       settings:
         show_overriden: "Only show overridden"
         reset: "reset"
@@ -4186,7 +4202,6 @@ bs_BA:
       site_settings:
         title: "Postavke"
         no_results: "No results found."
-        more_than_30_results: "Postoji više od 30 rezultata. Pročistite pretraživanje ili odaberite kategoriju."
         clear_filter: "Clear"
         add_url: "add URL"
         add_host: "add host"
@@ -4266,7 +4281,8 @@ bs_BA:
         allow_title: Allow badge to be used as a title
         multiple_grant: Can be granted multiple times
         listable: Show badge on the public badges page
-        enabled: Enable badge
+        enabled: omogućen
+        disabled: deaktiviran
         icon: Icon
         image: Slika
         icon_help: "Unesite ime ikone fonta Awesome (upotrebite prefiks „daleko“ za regularne ikone i „fab-“ za ikone marke)"
@@ -4318,7 +4334,6 @@ bs_BA:
         confirm_delete: "Jeste li sigurni da želite izbrisati taj host?"
         title: "Embedding"
         host: "Dozvoljeni domaćini"
-        class_name: "Naziv klase"
         edit: "uredi"
         category: "Post u kategoriju"
         add_host: "Dodaj host"
diff --git a/config/locales/client.ca.yml b/config/locales/client.ca.yml
index 197c1552917..a6b6d2600bd 100644
--- a/config/locales/client.ca.yml
+++ b/config/locales/client.ca.yml
@@ -165,8 +165,6 @@ ca:
     software_update_prompt:
       message: "Hem actualitzat aquest lloc, <span>si us plau actualitzeu</span>, o podeu experimentar un comportament inesperat."
       dismiss: "Descarta-ho"
-    bootstrap_mode_disabled: "El mode d'arrencada serà desactivat d'aquí a 24 hores."
-    bootstrap_invite_button_title: "Envia invitacions"
     themes:
       default_description: "Per defecte"
     s3:
@@ -273,11 +271,9 @@ ca:
       edit_bookmark: "Edita el marcador"
       clear_bookmarks: "Neteja preferits"
       help:
-        bookmark: "Feu clic per a marcar com a preferit la primera publicació d'aquest tema"
-        edit_bookmark: "Feu clic per editar el marcador sobre aquest tema"
         edit_bookmark_for_topic: "Cliqueu per editar el marcador d'aquest tema"
         unbookmark: "Feu clic per a eliminar tots els preferits d'aquest tema"
-        unbookmark_with_reminder: "Feu clic per eliminar tots els marcadors i recordatoris d’aquest tema."
+        unbookmark_with_reminder: "Feu clic per eliminar tots els marcadors i recordatoris d’aquest tema"
     bookmarks:
       created: "Heu marcat com a preferida aquesta publicació. %{name}"
       create: "Crea un marcador"
@@ -311,7 +307,6 @@ ca:
       new_topic: "Esborrany de tema nou"
       new_private_message: "Nou esborrany de missatge personal"
       abandon:
-        confirm: "Teniu un esborrany en curs per a aquest tema. Què t'agradaria fer-hi?"
         yes_value: "Descarta"
         no_value: "Reprèn l'edició"
     topic_count_categories:
@@ -479,11 +474,9 @@ ca:
       scores:
         about: "Aquesta puntuació es calcula en funció del nivell de confiança del reportador, de l'exactitud de les banderes prèvies i de la prioritat de l'element del qual es reporta."
         score: "Puntuació"
-        date: "Data"
-        type: "Tipus"
+        type: "Motiu"
         status: "Estat"
-        submitted_by: "Enviat per"
-        reviewed_by: "Revisat per"
+        submitted_by: "Reportat per"
       statuses:
         pending:
           title: "Pendent"
@@ -491,14 +484,12 @@ ca:
           title: "Aprovat"
         rejected:
           title: "Rebutjat"
-        ignored:
-          title: "Ignorat"
-        deleted:
-          title: "Suprimit"
         reviewed:
-          title: "(tots revisats)"
+          title: "Tots revisats"
         all:
-          title: "(qualsevol cosa)"
+          title: "Qualsevol cosa"
+      context_question:
+        delimiter: "o"
       types:
         reviewable_flagged_post:
           title: "Publicació amb bandera"
@@ -728,6 +719,7 @@ ca:
         make_owner_description: "Fes <b>%{username}</b> propietari del grup"
         remove_owner: "Elimina com a propietari"
         remove_owner_description: "Elimina <b>%{username}</b> com a propietari del grup"
+        status: "Estat"
         owner: "Propietari"
         forbidden: "No teniu permís per a veure els membres."
       topics: "Temes"
@@ -838,11 +830,6 @@ ca:
       profile: "Perfil"
       mute: "Silencia"
       edit: "Edita preferències"
-      download_archive:
-        button_text: "Descarrega-ho tot"
-        confirm: "Esteu segur que voleu descarregar les vostres publicacions?"
-        success: "Descàrrega iniciada. Quan el procés s'acabi, us ho notificarem amb un missatge."
-        rate_limit_error: "Les publicacions es poden descarregar una vegada al dia. Torneu a provar-ho demà."
       new_private_message: "Missatge nou"
       private_message: "Missatge"
       private_messages: "Missatges"
@@ -979,12 +966,6 @@ ca:
       theme: "Aparença"
       home: "Pàgina d'inici per defecte"
       staged: "Fictici"
-      staff_counters:
-        flags_given: "banderes útils"
-        flagged_posts: "publicacions amb banderes"
-        deleted_posts: "publicacions suprimides"
-        suspensions: "suspensions"
-        warnings_received: "avisos"
       messages:
         inbox: "Safata d'entrada"
         latest: "Més recents"
@@ -1027,8 +1008,6 @@ ca:
       second_factor_backup:
         regenerate: "Regenera"
         disable: "Desactiva"
-        enable: "Activa"
-        enable_long: "Activa els codis de còpia de seguretat"
         copy_to_clipboard: "Copia al porta-retalls"
         copy_to_clipboard_error: "Error copiant dades al porta-retalls"
         copied_to_clipboard: "Copiat al porta-retalls."
@@ -1403,8 +1382,6 @@ ca:
       hide_forever: "no, gràcies"
       intro: "Bon dia! Sembla que gaudiu de la discussió, però no heu registrat un compte."
     summary:
-      enabled_description: "Ara veieu un resum del tema: les publicacions més interessants segons la comunitat."
-      enable: "Resumeix aquest tema"
       disable: "Mostra totes les publicacions"
     deleted_filter:
       enabled_description: "Aquest tema conté publicacions suprimides, que han estat amagades."
@@ -1610,8 +1587,6 @@ ca:
         topic_template_not_modified: "Afegiu detalls i especificacions al tema editant la plantilla."
       save_edit: "Desa l'edició"
       overwrite_edit: "Sobreescriu l'edició"
-      reply_original: "Respon en el tema original"
-      reply_here: "Respon aquí"
       reply: "Respon"
       cancel: "Cancel·la"
       create_topic: "Crea un tema"
@@ -1738,6 +1713,7 @@ ca:
       membership_request_accepted: "Membre acceptat en '%{group_name}'"
       reaction: "<span>%{username}</span> %{description}"
       reaction_2: "<span>%{username}, %{username2}</span> %{description}"
+      admin_problems: "Nou consell al tauler de control del vostre lloc web"
       dismiss_confirmation:
         dismiss: "Descarta-ho"
         cancel: "Cancel·la"
@@ -1969,8 +1945,6 @@ ca:
       options: "Opcions del tema"
       show_links: "mostra enllaços dins d'aquest tema"
       unread_indicator: "Cap membre encara no ha llegit la darrera publicació d'aquest tema."
-      jump_reply_up: salta a la resposta anterior
-      jump_reply_down: salta a la resposta posterior
       deleted: "El tema ha estat suprimit"
       slow_mode_update:
         enable: "Activa"
@@ -2400,7 +2374,6 @@ ca:
       view: "Mostra temes per categories"
       general: "General"
       settings: "Configuració"
-      topic_template: "Plantilla de tema"
       tags: "Etiquetes"
       tags_allowed_tags: "Restringeix aquestes etiquetes per a aquesta categoria:"
       tags_allowed_tag_groups: "Restringeix aquests grups d'etiquetes a aquesta categoria:"
@@ -2446,8 +2419,6 @@ ca:
       images: "Imatges"
       email_in: "Adreça de correu electrònic entrant personalitzada:"
       email_in_allow_strangers: "Accepta missatges de correu d'usuaris anònims sense compte"
-      email_in_disabled: "Les publicacions des del correu electrònic estan desactivades en les preferències del lloc web. Per a activar les publicacions des del correu electrònic, "
-      email_in_disabled_click: 'activa l''opció "email in".'
       mailinglist_mirror: "Una categoria reflecteix una llista de correu"
       show_subcategory_list: "Mostra la llista de subcategories de temes en aquesta categoria. "
       num_featured_topics: "Nombre de temes mostrats en la pàgina de categories:"
@@ -2623,6 +2594,10 @@ ca:
     filters:
       with_topics: "%{filter} temes"
       with_category: "%{filter} %{category} temes"
+      filter:
+        title: "Filtre"
+        button:
+          label: "Filtre"
       latest:
         title: "Més recents"
         title_with_count:
@@ -2701,6 +2676,9 @@ ca:
       close: "Tanca (Esc)"
       content_load_error: 'No s''ha pogut carregar <a href="%url%">el contingut</a>. '
       image_load_error: 'No s''ha pogut carregar la <a href="%url%">imatge</a>.'
+    experimental_lightbox:
+      buttons:
+        close: "Tanca (Esc)"
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
       shortcut_key_delimiter_plus: "+"
@@ -2768,7 +2746,6 @@ ca:
         one: "Ha rebut aquesta insígnia %{count} vegada."
         other: "Ha rebut aquesta insígnia%{count} vegades."
       granted_on: "Concedit %{date}"
-      others_count: "Altres amb aquesta insígnia (%{count})"
       title: Insígnies
       allow_title: "Podeu fer servir aquesta insígnia com a títol"
       multiple_grant: "Podeu guanyar-la diverses vegades"
@@ -2883,10 +2860,6 @@ ca:
       dismiss: "Descarta-ho"
     safe_mode:
       enabled: "El mode segur està activat. Per a sortir-ne tanqueu aquesta finestra del navegador."
-    pause_notifications:
-      remaining: "%{remaining} restant"
-      options:
-        custom: "Personalitzat"
     trust_levels:
       names:
         newuser: "usuari nou"
@@ -2903,7 +2876,19 @@ ca:
         other: "%{count} nous"
       more: "Més"
       all_categories: "Totes les categories"
+      edit_navigation_modal_form:
+        filter_dropdown:
+          all: "Tot"
       sections:
+        custom:
+          save: "Desa"
+          delete: "Suprimeix"
+          links:
+            reset: "Restableix el valor predeterminat"
+            icon:
+              label: "Icona"
+            name:
+              label: "Nom"
         about:
           header_link_text: "Quant a"
         messages:
@@ -2921,7 +2906,8 @@ ca:
         categories:
           header_link_text: "Categories"
         community:
-          header_link_text: "Comunitat"
+          edit_section:
+            header_dropdown: "Personalitza"
           links:
             about:
               content: "Quant a"
@@ -2929,8 +2915,8 @@ ca:
               content: "Administració"
             badges:
               content: "Insígnies"
-            everything:
-              content: "Qualsevol cosa"
+            topics:
+              content: "Temes"
             faq:
               content: "PMF"
             groups:
@@ -2942,6 +2928,11 @@ ca:
             review:
               content: "Revisa"
     until: "Fins a:"
+    form_templates:
+      errors:
+        typeMismatch:
+          default: "Introduïu un valor vàlid."
+          email: "Introduïu una adreça vàlida de correu electrònic."
   admin_js:
     type_to_filter: "escriu per a filtrar..."
     admin:
@@ -3217,7 +3208,6 @@ ca:
         enabled: "Activat?"
         is_enabled: "S"
         not_enabled: "N"
-        change_settings: "Canvia la configuració"
         change_settings_short: "Configuració"
         howto: "Com s'instal·len els connectors?"
         official: "Connector (plugin) oficial"
@@ -3490,6 +3480,8 @@ ca:
           love:
             name: "amor"
             description: "El color del botó M'agrada"
+          selected:
+            name: "seleccionat"
         robots:
           title: "Substitueix el fitxer robots.txt del lloc web:"
           warning: "Això substituirà permanentment qualsevol configuració del lloc web relacionada."
@@ -3741,11 +3733,6 @@ ca:
           flag: "Bandera"
           replace: "Reemplaça"
           silence: "Silencia"
-        action_descriptions:
-          block: "Impedeix que es publiquin texts que continguin aquestes paraules. L'usuari veurà un missatge d'error quan intenti enviar la publicació. "
-          censor: "Permet publicacions que contenen aquestes paraules, però reemplaça-les amb caràcters que amaguin les paraules censurades."
-          require_approval: "Les publicacions que continguin aquestes paraules requeriran aprovació per l'equip responsable abans que puguin ser vistes. "
-          flag: "Permet publicacions que contenen aquestes paraules, però senyala-les amb bandera com a inapropiades de manera que els moderadors puguin revisar-les"
         form:
           placeholder_regexp: "expressió regular"
           link_placeholder: "https://example.com"
@@ -3759,6 +3746,33 @@ ca:
           description: "Introduïu un text per a comprovar coincidències amb paraules vigilades."
           found_matches: "Coincidències trobades:"
           no_matches: "No s'han trobat coincidències"
+      form_templates:
+        nav_title: "Plantilles"
+        list_table:
+          headings:
+            name: "Nom"
+            actions: "Accions"
+        view_template:
+          close: "Tanca"
+          edit: "Edita"
+          delete: "Suprimeix"
+        new_template_form:
+          submit: "Desa"
+          cancel: "Cancel·la"
+          preview: "Previsualitza"
+        quick_insert_fields:
+          add_new_field: "Afegeix"
+          dropdown: "Desplega"
+        validations_modal:
+          table_headers:
+            key: "Clau"
+            type: "Tipus"
+            description: "Descripció"
+          validations:
+            required:
+              key: "necessari"
+            type:
+              key: "tipus"
       impersonate:
         title: "Suplanta"
         help: "Feu servir aquesta eina per a suplantar comptes amb l'objectiu de depurar. Haureu de tancar la sessió quan acabeu."
@@ -3771,6 +3785,7 @@ ca:
         not_found: "Aquest nom d'usuari no existeix en el nostre sistema. "
         id_not_found: "Aquest ID d'usuari no existeix en el nostre sistema. "
         active: "Activat"
+        status: "Estat"
         show_emails: "Mostra correus"
         hide_emails: "Amaga els correus "
         nav:
@@ -3842,7 +3857,6 @@ ca:
         staged: "Fictici?"
         show_admin_profile: "Administració"
         show_public_profile: "Mostra el perfil públic"
-        impersonate: "Suplanta"
         action_logs: "Registres d'accions (logs)"
         ip_lookup: "Cerca IP"
         log_out: "Tanca la sessió"
@@ -4025,6 +4039,8 @@ ca:
         recommended: "Recomanem personalitzar el text següent segons us convingui:"
         show_overriden: "Mostra sols texts editats"
         more_than_50_results: "Hi ha més de 50 resultats. Restringiu la cerca."
+        outdated:
+          dismiss: "Descarta-ho"
       settings:
         show_overriden: "Mostra només els sobreescrits"
         reset: "restableix"
@@ -4032,7 +4048,6 @@ ca:
       site_settings:
         title: "Configuració"
         no_results: "Sense resultats"
-        more_than_30_results: "Hi ha més de 30 resultats. Restringiu la cerca o seleccioneu una categoria."
         clear_filter: "Neteja"
         add_url: "afegeix URL"
         add_host: "afegeix amfitrió"
@@ -4114,7 +4129,8 @@ ca:
         allow_title: Permet que es faci servir la insígnia com a títol
         multiple_grant: Pot concedir-se moltes vegades
         listable: Mostra la insígnia en la pàgina pública d'insígnies
-        enabled: Activa la insígnia
+        enabled: activat
+        disabled: desactivat
         icon: Icona
         image: Imatge
         icon_help: "Introduïu un nom d'icona Awesome Font (feu servir el prefix \"far-\" per a les icones normals i \"fab-\" per a les icones de marca)"
@@ -4165,7 +4181,6 @@ ca:
         confirm_delete: "Esteu segur que voleu suprimir aquest amfitrió?"
         title: "Incrustant"
         host: "Amfitrions permesos"
-        class_name: "Nom de la classe"
         edit: "edita"
         category: "Publica en la categoria"
         add_host: "Afegeix amfitrió"
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index 85cc926cf09..c0d1980b0cd 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -205,14 +205,6 @@ cs:
     software_update_prompt:
       message: "Aktualizovali jsme tento web, <span>prosím obnovte stránku</span>, jinak může dojít k neočekávanému chování."
       dismiss: "Označit jako přečtené"
-    bootstrap_mode_enabled:
-      one: "Aby spuštění vaší webové stránky bylo jednodušší, tak se nachází v bootstrap režimu. Všichni noví uživatelé dostanou vernostní úroveň 1 a mohou mít zapnuté denní emailové shrnutí. Toto se automaticky vypne, když %{count} uživatelů se připojí."
-      few: "Aby se váš web jednodušeji rozjel, nachází se v režimu bootstrap. Všichni noví uživatelé začínají s důveryhodností 1 a mají povolené denní odesílání souhrnných emailů. Tento režim se automaticky vypne, jakmile se zaregistruje alespoň %{count} uživatelů."
-      many: "Aby se váš web jednodušeji rozjel, nachází se v režimu bootstrap. Všichni noví uživatelé začínají s důveryhodností 1 a mají povolené denní odesílání souhrnných emailů. Tento režim se automaticky vypne, jakmile se zaregistruje alespoň %{count} uživatelů."
-      other: "Aby se váš web jednodušeji rozjel, nachází se v režimu bootstrap. Všichni noví uživatelé začínají s důveryhodností 1 a mají povolené denní odesílání souhrnných emailů. Tento režim se automaticky vypne, jakmile se zaregistruje alespoň %{count} uživatelů."
-    bootstrap_mode_disabled: "Režim bootstrap bude deaktivován v následujících 24 hodinách."
-    bootstrap_invite_button_title: "Poslat pozvánky"
-    bootstrap_wizard_link_title: "Dokončete průvodce nastavením"
     themes:
       default_description: "Výchozí"
       broken_theme_alert: "Váš web nemusí fungovat, protože motiv/komponenta obsahuje chyby."
@@ -331,11 +323,9 @@ cs:
       edit_bookmark: "Upravit záložku"
       clear_bookmarks: "Odstranit záložky"
       help:
-        bookmark: "Kliknutím vložíte záložku na první příspěvek tohoto tématu"
-        edit_bookmark: "Kliknutím upravíte záložku tohoto tématu"
         edit_bookmark_for_topic: "Kliknutím upravíte záložku pro toto téma"
         unbookmark: "Kliknutím odstraníte všechny záložky v tématu"
-        unbookmark_with_reminder: "Kliknutím odeberete všechny záložky a připomenutí v tomto tématu."
+        unbookmark_with_reminder: "Kliknutím odeberete všechny záložky a připomenutí v tomto tématu"
     bookmarks:
       created: "Tento příspěvek jste přidali do záložek. %{name}"
       created_generic: "Toto jste si přidali do záložek. %{name}"
@@ -379,7 +369,6 @@ cs:
       new_topic: "Nový koncept tématu"
       new_private_message: "Nový koncept soukromé zprávy"
       abandon:
-        confirm: "Máte rozpracovaný koncept tohoto tématu. Co byste s ním chtěli udělat?"
         yes_value: "Zahodit"
         no_value: "Pokračovat v úpravách"
     topic_count_categories:
@@ -550,11 +539,8 @@ cs:
       scores:
         about: "Toto skóre je vypočítáno na základě důvěryhodnosti oznamovatele, přesnost jeho předchozích označení a prioritu oznamované položky."
         score: "Skóre"
-        date: "Datum"
-        type: "Typ"
+        type: "Reason"
         status: "Stav"
-        submitted_by: "Odeslal"
-        reviewed_by: "Zkontroloval"
       statuses:
         pending:
           title: "Čeká na schválení"
@@ -562,14 +548,12 @@ cs:
           title: "Schváleno"
         rejected:
           title: "Odmítnutých"
-        ignored:
-          title: "Ignorováno"
-        deleted:
-          title: "Smazáno"
         reviewed:
-          title: "(vše zkontrolováno)"
+          title: "Vše zkontrolováno"
         all:
-          title: "(vše)"
+          title: "Vše"
+      context_question:
+        delimiter: "nebo"
       types:
         reviewable_flagged_post:
           title: "Nahlášený příspěvek"
@@ -834,6 +818,7 @@ cs:
         make_all_primary_description: "Nastavit jako primární skupinu pro všechny vybrané uživatele"
         remove_all_primary: "Odebrat jako primární"
         remove_all_primary_description: "Odebrat tuto skupinu jako primární"
+        status: "Stav"
         owner: "Vlastník"
         primary: "Primární"
         forbidden: "Nejste oprávněni prohlížet členy."
@@ -945,11 +930,6 @@ cs:
       profile: "Profil"
       mute: "Ignorovat"
       edit: "Upravit nastavení"
-      download_archive:
-        button_text: "Stáhnout vše"
-        confirm: "Jste si jistí, že chcete stáhnout všechny své příspěvky?"
-        success: "Stahování zahájeno, až bude dokončeno, přijde ti zpráva."
-        rate_limit_error: "Příspěvky mohou být staženy jen jednou za den. Zkus to, prosím, zítra."
       new_private_message: "Nová zpráva"
       private_message: "Zpráva"
       private_messages: "Zprávy"
@@ -1043,12 +1023,7 @@ cs:
       experimental_sidebar:
         enable: "Povolit postranní panel"
         options: "Možnosti"
-        categories_section: "Sekce kategorií"
-        categories_section_instruction: "Vybrané kategorie se zobrazí v sekci Kategorie na postranním panelu."
-        tags_section: "Sekce štítků"
-        tags_section_instruction: "Vybrané štítky budou zobrazeny v sekci štítků postranního panelu."
         navigation_section: "Navigace"
-        list_destination_instruction: "Když je na postranním panelu nový obsah..."
       change: "změnit"
       featured_topic: "Doporučené téma"
       moderator: "%{user} je moderátor"
@@ -1110,13 +1085,6 @@ cs:
       theme: "Motiv"
       home: "Výchozí domovská stránka"
       staged: "Staged"
-      staff_counters:
-        flags_given: "užitečná nahlášení"
-        flagged_posts: "nahlášených příspěvků"
-        deleted_posts: "smazaných příspěvků"
-        suspensions: "suspendování"
-        warnings_received: "varování"
-        rejected_posts: "zamítnuté příspěvky"
       messages:
         all: "všechny schránky"
         inbox: "Doručené"
@@ -1155,7 +1123,6 @@ cs:
         tags: "Štítky"
         interface: "Rozhraní"
         apps: "Aplikace"
-        sidebar: "Postranní panel"
       change_password:
         success: "(email odeslán)"
         in_progress: "(odesílám)"
@@ -1169,8 +1136,6 @@ cs:
         title: "Dvoufaktorové záložní kódy"
         regenerate: "Vytvořit znovu"
         disable: "Vypnout"
-        enable: "Zapnout"
-        enable_long: "Povolit záložní kódy"
         copy_to_clipboard: "Kopírovat do schránky"
         copy_to_clipboard_error: "Chyba při kopírování dat do schránky"
         copied_to_clipboard: "Zkopírováno do schránky"
@@ -1540,52 +1505,6 @@ cs:
       enabled: "Tato stránka je v režimu jen pro čtení. Prosim pokračujte v prohlížení, ale odpovídání a ostatní operace jsou momentálně vypnuté."
       login_disabled: "Přihlášení je zakázáno jelikož je stránka v režimu jen pro čtení."
       logout_disabled: "Odhlášení je zakázáno zatímco je stránka v režimu jen pro čtení."
-    too_few_topics_and_posts_notice_MF: |
-      Pojďme <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">zahájit diskusi!</a>{ currentTopics, plural,
-          one {Je tu <strong>#</strong> téma }
-          few {Jsou tu <strong>#</strong> témata}
-          many {Je tu <strong>#</strong> témat}
-        other {Je tu <strong>#</strong> témat}
-      } a { currentPosts, plural,
-          one {<strong>#</strong> příspěvek}
-          few {<strong>#</strong> příspěvků}
-          many {<strong>#</strong> příspěvků}
-        other {<strong>#</strong> příspěvků}
-      }. Návštěvníci jich potřebují více, aby si mohli číst a odpovídat na ně - doporučujeme alespoň { requiredTopics, plural,
-          one {<strong>#</strong> téma}
-          few {<strong>#</strong> témat}
-          many {<strong>#</strong> témat}
-        other {<strong>#</strong> témat}
-      } a { requiredPosts, plural,
-          one {<strong>#</strong> příspěvek}
-          few {<strong>#</strong> příspěvky}
-          many {<strong>#</strong> příspěvků}
-        other {<strong>#</strong> příspěvků}
-      }. Tuto zprávu mohou vidět pouze členové redakce.
-    too_few_topics_notice_MF: |
-      Pojďme <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">zahájit diskusi!</a>{ currentTopics, plural,
-          one {Je tu <strong>#</strong> téma}
-          few {Jsou tu <strong>#</strong> témata}
-          many {Je tu <strong>#</strong> témat}
-        other {Je tu <strong>#</strong> témat}
-      }. Návštěvníci jich potřebují více, aby si mohli číst a odpovídat na ně - doporučujeme alespoň { requiredTopics, plural,
-          one {<strong>#</strong> téma}
-          few {<strong>#</strong> témata}
-          many {<strong>#</strong> témat}
-        other {<strong>#</strong> témat}
-      }. Tuto zprávu mohou vidět pouze členové redakce.
-    too_few_posts_notice_MF: |
-      Pojďme <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">zahájit diskusi!</a>{ currentPosts, plural,
-          one {Je tu <strong>#</strong> příspěvek}
-          few {Jsou tu <strong>#</strong> příspěvky}
-          many {Je tu <strong>#</strong> příspěvků}
-        other {Je tu <strong>#</strong> příspěvků}
-      }. Návštěvníci jich potřebují více, aby si mohli číst a odpovídat na ně - doporučujeme alespoň { requiredPosts, plural,
-          one {<strong>#</strong> příspěvek}
-          few {<strong>#</strong> příspěvky}
-          many {<strong>#</strong> příspěvků}
-        other {<strong>#</strong> příspěvků}
-      }. Tuto zprávu mohou vidět pouze členové redakce.
     learn_more: "více informací..."
     mute: Ignorovat
     unmute: Zrušit ignorování
@@ -1605,8 +1524,6 @@ cs:
       hide_forever: "děkuji, ne"
       intro: "Zdravíčko! Vypadá to, že si užíváte naše diskuze, ale ještě nemáte vlastní účet."
     summary:
-      enabled_description: "Čtete shrnutí tohoto tématu: nejzajímavější příspěvky podle komunity."
-      enable: "Přepnout na \"nejlepší příspěvky\""
       disable: "Přepnout na normální zobrazení"
     deleted_filter:
       enabled_description: "Toto téma obsahuje schované smazané příspěvky."
@@ -1792,8 +1709,6 @@ cs:
         category_missing: "Musíte vybrat kategorii"
       save_edit: "Uložit změnu"
       overwrite_edit: "Přepsat úpravu"
-      reply_original: "Odpovědět na původní téma"
-      reply_here: "Odpovědět sem"
       reply: "Odpovědět"
       cancel: "Zrušit"
       create_topic: "Vytvořit téma"
@@ -1918,6 +1833,7 @@ cs:
       watching_first_post: "<span>Nové téma</span> %{description}"
       reaction: "<span>%{username}</span> %{description}"
       reaction_2: "<span>%{username}, %{username2}</span> %{description}"
+      admin_problems: "Na administrační nástěnce vašeho webu jsou nová doporučení"
       dismiss_confirmation:
         dismiss: "Označit jako přečtené"
         cancel: "Zrušit"
@@ -2143,8 +2059,6 @@ cs:
       back_to_list: "Zpátky na seznam témat"
       options: "Možnosti"
       show_links: "zobrazit odkazy v tomto tématu"
-      jump_reply_up: přejít na předchozí odpověď
-      jump_reply_down: přejít na následující odpověď
       deleted: "Téma bylo smazáno"
       slow_mode_update:
         enable: "Zapnout"
@@ -2613,7 +2527,6 @@ cs:
       view: "Zobrazit témata v kategorii"
       general: "Základní"
       settings: "Nastavení"
-      topic_template: "Šablona tématu"
       tags: "Štítky"
       tags_allowed_tags: "Omezit tyto štítky na tuto kategorii:"
       tags_placeholder: "(Volitelné) seznam dovolených štítků"
@@ -2654,8 +2567,6 @@ cs:
       images: "Obrázky"
       email_in: "Vlastní příchozí emailová adresa:"
       email_in_allow_strangers: "Přijímat emaily i od neregistrovaných uživatelů"
-      email_in_disabled: "Přidávání nových témat před email je zakázáno v Nastavení fóra. K povolení nových témat přes email,"
-      email_in_disabled_click: 'povolit nastavení "email in"'
       mailinglist_mirror: "Kategorie kopíruje mailing list"
       show_subcategory_list: "Ukázat seznam podkategorií nad tématy v této kategorii."
       num_featured_topics: "Počet témat, která se zobrazují na stránce kategorie "
@@ -2845,6 +2756,10 @@ cs:
     filters:
       with_topics: "%{filter} témata"
       with_category: "%{filter} %{category} témata"
+      filter:
+        title: "Filtr"
+        button:
+          label: "Filtr"
       latest:
         title: "Aktuální"
         title_with_count:
@@ -2926,7 +2841,6 @@ cs:
         this_week: "Týden"
         today: "Dnes"
     browser_update: 'Prohlížeč <a href="https://www.discourse.org/faq/#browser">bohužel není podporován</a>. Chcete-li zobrazit bohatý obsah, přihlásit se a odpovídat, přepněte prosím <a href="https://browsehappy.com">na podporovaný prohlížeč</a> .'
-    safari_13_warning: Tento web brzy odstraní podporu pro iOS a Safari verze 13 a nižší. Zjednodušená verze pouze pro čtení zůstane k dispozici. (<a href="https://meta.discourse.org/t/224747">více informací</a>)
     permission_types:
       full: "Vytvářet / Odpovídat / Prohlížet"
       create_post: "Odpovídat / Prohlížet"
@@ -2941,6 +2855,9 @@ cs:
       close: "Zavřít (Esc)"
       content_load_error: '<a href="%url%">Obsah</a> se nepodařilo načíst.'
       image_load_error: '<a href="%url%">Obrázek</a> se nepodařilo načíst.'
+    experimental_lightbox:
+      buttons:
+        close: "Zavřít (Esc)"
     cannot_render_video: Toto video nelze zobrazit, protože váš prohlížeč nepodporuje daný kodek.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
@@ -3014,7 +2931,6 @@ cs:
         many: "Získal tento odznak %{count} krát"
         other: "Získal tento odznak %{count} krát"
       granted_on: "Získán %{date}"
-      others_count: "Ostatní s tímto odznakem (%{count})"
       title: Odznaky
       allow_title: "Tento odznak můžeš použít jako titul"
       multiple_grant: "Toto si můžeš zasloužit několikrát"
@@ -3144,10 +3060,6 @@ cs:
       dismiss: "Označit jako přečtené"
     safe_mode:
       enabled: "Bezpečný režim je povolený, k jeho zakázání zavři toto okno prohlížeče"
-    pause_notifications:
-      remaining: "%{remaining} zbývá"
-      options:
-        custom: "Přizpůsobené"
     trust_levels:
       names:
         newuser: "nový uživatel"
@@ -3173,7 +3085,19 @@ cs:
       more: "Více"
       all_categories: "Všechny kategorie"
       all_tags: "Všechny štítky"
+      edit_navigation_modal_form:
+        filter_dropdown:
+          all: "Celkem"
       sections:
+        custom:
+          save: "Uložit"
+          delete: "Smazat"
+          links:
+            reset: "Obnovit výchozí"
+            icon:
+              label: "Ikona"
+            name:
+              label: "Název"
         about:
           header_link_text: "O fóru"
         messages:
@@ -3190,7 +3114,8 @@ cs:
         categories:
           header_link_text: "Kategorie"
         community:
-          header_link_text: "Komunita"
+          edit_section:
+            header_dropdown: "Přizpůsobení"
           links:
             about:
               content: "O fóru"
@@ -3198,8 +3123,8 @@ cs:
               content: "Administrace"
             badges:
               content: "Odznaky"
-            everything:
-              content: "Vše"
+            topics:
+              content: "Témata"
             faq:
               content: "FAQ"
             groups:
@@ -3209,6 +3134,11 @@ cs:
             my_posts:
               content: "Mé příspěvky"
     until: "dokud:"
+    form_templates:
+      errors:
+        typeMismatch:
+          default: "Prosím zadejte platnou hodnotu."
+          email: "Zadejte prosím správnou emailovou adresu."
   admin_js:
     type_to_filter: "text pro filtrování..."
     admin:
@@ -3450,7 +3380,6 @@ cs:
         enabled: "Zapnutý?"
         is_enabled: "A"
         not_enabled: "N"
-        change_settings: "Změnit nastavení"
         change_settings_short: "Nastavení"
         howto: "Jak nainstaluji pluginy?"
       backups:
@@ -3653,6 +3582,8 @@ cs:
           love:
             name: "láska"
             description: "Barva tlačítka \"Líbí se\"."
+          selected:
+            name: "vybrané"
         robots:
           warning: "Toto trvale přepíše všechna související nastavení webu."
         email_style:
@@ -3856,11 +3787,6 @@ cs:
           require_approval: "Vyžádat schválení"
           flag: "Nahlášení"
           silence: "Ztišit"
-        action_descriptions:
-          block: "Zabránit přidání příspěvků obsahující tato slova. Uživatel uvidí chybovou hlášku ve chvíli, kdy se pokusí odeslat svůj příspěvek."
-          censor: "Povolit příspěvky obsahující tato slova, ale nahradit je symboly, které skryjí cenzurovaná slova."
-          require_approval: "Před zobrazením budou příspěvky obsahující tato slova vyžadovat schválení redaktorů."
-          flag: "Povolit příspěvky obsahující tato slova, ale oflagovat je jako nevhodně, aby je mohli moderátoři kontrolovat."
         form:
           placeholder_regexp: "obvyklý výraz"
           link_placeholder: "https://example.com"
@@ -3869,6 +3795,32 @@ cs:
           upload_successful: "Nahráno úspěšně. Slova byla přidána "
         test:
           no_matches: "Nebyly nalezeny žádné výsledky"
+      form_templates:
+        nav_title: "Šablony"
+        list_table:
+          headings:
+            name: "Jméno"
+            actions: "Akce"
+        view_template:
+          close: "Zavřít"
+          edit: "Upravit"
+          delete: "Smazat"
+        new_template_form:
+          submit: "Uložit"
+          cancel: "Zrušit"
+          preview: "Náhled"
+        quick_insert_fields:
+          add_new_field: "přidat"
+          dropdown: "Menu"
+        validations_modal:
+          table_headers:
+            type: "Typ"
+            description: "Popis"
+          validations:
+            required:
+              key: "povinné"
+            type:
+              key: "typ"
       impersonate:
         title: "Přihlásit se jako"
         help: "Použijte tento nástroj k přihlášení za jiného uživatele pro ladící a vývojové potřeby. Po dokončení se budete muset odhlásit."
@@ -3880,6 +3832,7 @@ cs:
         last_emailed: "Email naposledy zaslán"
         not_found: "Bohužel uživatel s tímto jménem není v našem systému."
         id_not_found: "Bohužel uživatel s tímto id není v našem systému."
+        status: "Stav"
         show_emails: "Ukázat emailové adresy"
         nav:
           new: "Noví"
@@ -3942,7 +3895,6 @@ cs:
         staged: "Staged?"
         show_admin_profile: "Administrace"
         show_public_profile: "Zobrazit veřejný profil"
-        impersonate: "Vydávat se za uživatele"
         action_logs: "Logy akcí"
         ip_lookup: "Vyhledávání IP adresy"
         log_out: "Odhlásit se"
@@ -4131,6 +4083,8 @@ cs:
         go_back: "Zpět na hledání"
         recommended: "Doporučujeme uzpůsobit následující text tak, aby vám vyhovoval:"
         show_overriden: "Zobrazit pouze změněná nastavení"
+        outdated:
+          dismiss: "Označit jako přečtené"
       settings:
         show_overriden: "Zobrazit pouze přepsané"
         reset: "resetovat"
@@ -4208,7 +4162,7 @@ cs:
         allow_title: Povolit užití odzanku jako titul
         multiple_grant: Může být přiděleno několikrát
         listable: Zobrazit odznak na veřejné stránce s odzanky
-        enabled: Povolit odznaky
+        enabled: zapnutý
         icon: Ikona
         image: Obrázek
         query: Dotaz na odznak (SQL)
@@ -4256,7 +4210,6 @@ cs:
         confirm_delete: "Opravdu chcete smazat tento host?"
         title: "Zabudování"
         host: "Povolené hosty"
-        class_name: "název třídy"
         edit: "upravit"
         category: "Příspěvek do kategorie"
         add_host: "Přidat host"
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index 13c17842d21..a4bc9c07567 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -162,11 +162,6 @@ da:
     software_update_prompt:
       message: "Vi har opdateret dette websted, <span>genindlæs venligst siden</span>, ellers vil du kunne opleve uventet opførsel eller begrændset funktionalitet."
       dismiss: "Ignorer Alle"
-    bootstrap_mode_enabled:
-      one: "For at gøre lanceringen af dit nye forum lettere er du i \"bootstrap-tilstand\". Alle nye brugere tildeles tillidsniveau 1 og har dagligt email resume aktiveret. Dette deaktiveres automatisk, når %{count} bruger er tilsluttet."
-      other: "For at gøre lanceringen af dit nye forum lettere er du i bootstrap-tilstand. Alle nye brugere tildeles tillidsniveau 1 og har dagligt email resume aktiveret. Dette deaktiveres automatisk, når %{count} brugere er tilsluttet."
-    bootstrap_mode_disabled: "Bootstrap-tilstand deaktiveres inden for 24 timer."
-    bootstrap_invite_button_title: "Send Invitationer"
     themes:
       default_description: "Standard"
       broken_theme_alert: "Dit websted fungerer muligvis ikke, fordi et tema/en komponent har fejl."
@@ -276,11 +271,9 @@ da:
       edit_bookmark: "Rediger Bogmærke"
       clear_bookmarks: "Fjern bogmærker"
       help:
-        bookmark: "Klik for at sætte et bogmærke i det første indlæg i denne tråd"
-        edit_bookmark: "Klik for at redigere bogmærket for dette emne"
         edit_bookmark_for_topic: "Klik for at redigere bogmærket for dette emne"
         unbookmark: "Klik for at fjerne alle bogmærker i dette emne"
-        unbookmark_with_reminder: "Klik for at fjerne alle bogmærker og påmindelser i dette emne."
+        unbookmark_with_reminder: "Klik for at fjerne alle bogmærker og påmindelser i dette emne"
     bookmarks:
       created: "Du har sat et bogmærke for dette indlæg. %{name}"
       created_generic: "Du har bogmærket dette. %{name}"
@@ -323,7 +316,6 @@ da:
       new_topic: "Nyt emne-kladde"
       new_private_message: "Ny personlig meddelelseskladde"
       abandon:
-        confirm: "Du har et udkast i gang for dette emne. Hvad vil du gerne gøre med det?"
         yes_value: "Kassér"
         no_value: "Genoptag redigering"
     topic_count_categories:
@@ -495,11 +487,9 @@ da:
       scores:
         about: "Denne score er beregnet på baggrund af anmelders tillidsniveau, nøjagtigheden af deres tidligere markeringer og prioriteten for det som rapporteres."
         score: "Score"
-        date: "Dato"
-        type: "Type"
+        type: "Begrundelse"
         status: "Status"
-        submitted_by: "Indsendt af"
-        reviewed_by: "Gennemgået Af"
+        submitted_by: "Rapporteret af"
       statuses:
         pending:
           title: "Afventende"
@@ -507,14 +497,12 @@ da:
           title: "Godkendt"
         rejected:
           title: "Afvist"
-        ignored:
-          title: "Ignoreret"
-        deleted:
-          title: "Slettet"
         reviewed:
-          title: "(alle gennemgåede)"
+          title: "Alle gennemgåede"
         all:
-          title: "(alting)"
+          title: "Alting"
+      context_question:
+        delimiter: "eller"
       types:
         reviewable_flagged_post:
           title: "Markeret indlæg"
@@ -813,6 +801,7 @@ da:
         make_all_primary_description: "Gør dette til den primære gruppe for alle valgte brugere"
         remove_all_primary: "Fjern som primær"
         remove_all_primary_description: "Fjern denne gruppe som primær"
+        status: "Status"
         owner: "Ejer"
         primary: "Primær"
         forbidden: "Du har ikke tilladelse til at se medlemmerne."
@@ -940,11 +929,6 @@ da:
       profile: "Profil"
       mute: "Ignorer"
       edit: "Redigér indstillinger"
-      download_archive:
-        button_text: "Hent alle"
-        confirm: "Er du sikker på, at du vil hente dine indlæg?"
-        success: "Hentningen er startet. Du vil blive notificeret via en besked, når processen er færdig."
-        rate_limit_error: "Indlæg kan hentes én gang om dagen, prøv igen i morgen."
       new_private_message: "Ny Besked"
       private_message: "Besked"
       private_messages: "Beskeder"
@@ -1015,7 +999,7 @@ da:
         perm_denied_expl: "Du nægtede adgang for notifikationer. Tillad notifikationer via indstillingerne i din browser."
         disable: "Deaktiver notifikationer"
         enable: "Aktiver notifikationer"
-        each_browser_note: 'Bemærk: Du skal ændre denne indstilling på hver browser, du bruger. Alle underretninger vil blive deaktiveret, hvis du pauserer underretninger fra brugermenuen, uanset denne indstilling.'
+        each_browser_note: "Bemærk: Du skal ændre denne indstilling på hver browser, du bruger. Alle underretninger vil blive deaktiveret, hvis du pauserer underretninger fra brugermenuen, uanset denne indstilling."
         consent_prompt: "Ønsker du live notifikationer, når folk svarer på dine indlæg?"
       dismiss: "Ignorer Alle"
       dismiss_notifications: "Skjul Alle"
@@ -1127,13 +1111,6 @@ da:
       save_to_change_theme: 'Tema vil blive opdateret efter du har trykket på“%{save_text}„'
       home: "Standard startside"
       staged: "Iscenesat"
-      staff_counters:
-        flags_given: "hjælpsomme rapporteringer"
-        flagged_posts: "markerede indlæg"
-        deleted_posts: "slettede indlæg"
-        suspensions: "suspenderinger"
-        warnings_received: "advarsler"
-        rejected_posts: "afviste indlæg"
       messages:
         all: "alle indbakker"
         inbox: "Indbakke"
@@ -1181,11 +1158,9 @@ da:
         title: "To-faktor backup koder"
         regenerate: "Regenerér"
         disable: "Deaktiver"
-        enable: "Aktiver"
-        enable_long: "Aktivér backup koder"
         manage:
-          one: "Administrér backup koder. Du har <strong>%{count}</strong> backup kode tilbage."
-          other: "Administrér backup koder. Du har <strong>%{count}</strong> backup koder tilbage."
+          one: "Du har <strong>%{count}</strong> backup kode tilbage."
+          other: "Du har <strong>%{count}</strong> backup koder tilbage."
         copy_to_clipboard: "Kopiér til udklipsholder"
         copy_to_clipboard_error: "Fejl ved kopiering til udklipsholder"
         copied_to_clipboard: "Kopieret til udklipsholder"
@@ -1600,8 +1575,7 @@ da:
       save: "Gem"
       remove_status: "Fjern status"
     user_tips:
-      primary: "Forstået!"
-      secondary: "vis mig ikke disse tips"
+      button: "Forstået!"
       post_menu:
         content: "Se, hvordan du ellers kan interagere med indlægget ved at klikke på de tre prikker!"
       topic_notification_levels:
@@ -1640,8 +1614,6 @@ da:
       enabled: "Dette websted er i skrivebeskyttet tilstand lige nu. Fortsæt endelig med at kigge, men der kan ikke svares, sendes 'Synes godt om' eller andet indtil videre."
       login_disabled: "Login er deaktiveret, mens webstedet er i skrivebeskyttet tilstand."
       logout_disabled: "Log ud er deaktiveret mens webstedet er i skrivebeskyttet tilstand."
-    too_few_posts_notice_MF: |
-      Lad os <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">starte diskussionen!</a> Der {currentPosts, plural, one {er <strong>#</strong> indlæg} other {er <strong>#</strong> indlæg}}. Besøgende har brug for mere at læse og svare på — vi anbefaler i det mindste {requiredPosts, plural, one {<strong>#</strong> indlæg} other {<strong>#</strong> indlæg}}. Kun administratorer kan se denne besked.
     logs_error_rate_notice:
       reached_hour_MF: |
         <b>{relativeAge}</b> - <a href='{url}' target='_blank'>{rate, plural, one {# fejl/minut} other {# fejl/minut}}</a> har overskredet webstedsindstillingsgrænsen på {limit, plural, one {# fejl / minut} other {# fejl/minut}}.
@@ -1670,13 +1642,11 @@ da:
       hide_forever: "nej tak"
       intro: "Hej! Det ser ud til, at du nyder diskussionen, men du har ikke tilmeldt dig en konto endnu."
     summary:
-      enabled_description: "Du ser et sammendrag af dette emne: kun de mest interessante indlæg som andre finder interresante."
       description:
         one: "Der er <b>%{count}</b> svar."
         other: "Der er <b>%{count}</b> svar."
       description_time_MF: |
         Der {replyCount, plural, one {er <b>#</b> svar} other {er <b>#</b> svar}} med en anslået læsetid på <b>{readingTime, plural, one {# minut} other {# minutter}}</b>.
-      enable: "Opsummér dette emne"
       disable: "Vis alle indlæg"
     deleted_filter:
       enabled_description: "Dette emne indeholder slettede indlæg, som er blevet skjult."
@@ -1949,8 +1919,6 @@ da:
         topic_template_not_modified: "Tilføj venligst detaljer og specifikationer til dit emne ved at redigere emneskabelonen."
       save_edit: "Gem ændringer"
       overwrite_edit: "Overskriv redigering"
-      reply_original: "Svar på det oprindelige emne"
-      reply_here: "Svar her"
       reply: "Svar"
       cancel: "Annuller"
       create_topic: "Opret emne"
@@ -2337,7 +2305,7 @@ da:
         top: "Der er ingen top emner"
         educate:
           new: '<p>Dine nye emner vil blive vist her. Som standard betragtes emner som nye og vil vise en <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span> indikator, hvis de blev oprettet inden for de sidste 2 dage.</p><p>Besøg dine <a href="%{userPrefsUrl}">præferencer</a> for at ændre dette.</p>'
-          unread: "<p>Dine ulæste emner vises her.</p><p>Som standard betragtes emner som ulæste og vil vise antal af ulæste <span class=\"badge unread-posts badge-notification\">1</span> hvis du:</p><ul><li>Oprettede emnet</li><li>Svarede på emnet</li><li>Læste emnet i mere end 4 minutter</li></ul><p>Eller hvis du udtrykkeligt har indstillet emnet til fulgt eller overvåget via \U0001F514 i hvert emne.</p><p>Besøg dine <a href=\"%{userPrefsUrl}\">præferencer</a> for at ændre dette.</p>"
+          unread: "<p>Dine ulæste emner vises her.</p><p>Som standard betragtes emner som ulæste og vil vise antal af ulæste <span class=\"badge unread-posts badge-notification\">1</span> hvis du:</p><ul><li>Oprettede emnet</li><li>Svarede på emnet</li><li>Læste emnet i mere end 5 minutter</li></ul><p>Eller hvis du udtrykkeligt har indstillet emnet til fulgt eller overvåget via \U0001F514 i hvert emne.</p><p>Besøg dine <a href=\"%{userPrefsUrl}\">præferencer</a> for at ændre dette.</p>"
       bottom:
         latest: "Der er ikke flere populære emner."
         posted: "Der er ikke flere emner."
@@ -2397,8 +2365,6 @@ da:
       show_links: "vis links i dette emne"
       unread_indicator: "Intet medlem har læst det sidste indlæg i dette emne endnu."
       suggest_create_topic: Klar til <a href>at starte en ny samtale?</a>
-      jump_reply_up: hop til tidligere svar
-      jump_reply_down: hop til senere svar
       deleted: "Emnet er blevet slettet"
       slow_mode_update:
         title: "Langsom Tilstand"
@@ -2946,7 +2912,6 @@ da:
       filtered_replies:
         viewing_posts_by: "Viser %{post_count} indlæg af"
         viewing_subset: "Nogle svar er foldet sammen"
-        viewing_summary: "Viser en oversigt over dette emne"
         post_number: "%{username}, indlæg #%{post_number}"
         show_all: "Vis alle"
       share:
@@ -2962,7 +2927,6 @@ da:
       back: "Tilbage til kategori"
       general: "Overordnet"
       settings: "Indstillinger"
-      topic_template: "Skabelon for emne"
       tags: "Mærker"
       tags_allowed_tags: "Begræns disse mærker til denne kategori:"
       tags_allowed_tag_groups: "Begræns disse mærkegrupper til denne kategori:"
@@ -3016,8 +2980,6 @@ da:
       images: "Billeder"
       email_in: "Brugerindstillet ingående email adresse:"
       email_in_allow_strangers: "Accepter emails fra ikke oprettede brugere"
-      email_in_disabled: "Nye emner via email er deaktiveret i Site opsætning. For at aktivere oprettelse af nye emner via email,"
-      email_in_disabled_click: 'aktiver "email ind" indstilligen.'
       mailinglist_mirror: "Kategori spejler en mailing liste"
       show_subcategory_list: "Vis oversigt med subkategorier ovenover emner i denne kategori."
       read_only_banner: "Bannertekst, når en bruger ikke kan oprette et emne i denne kategori:"
@@ -3217,6 +3179,10 @@ da:
     filters:
       with_topics: "%{filter} emner"
       with_category: "%{filter} %{category} emner"
+      filter:
+        title: "Filter"
+        button:
+          label: "Filter"
       latest:
         title: "Seneste"
         title_with_count:
@@ -3299,6 +3265,9 @@ da:
       close: "Luk (Esc)"
       content_load_error: '<a href="%url%">Indholdet</a> kunne ikke indlæses.'
       image_load_error: '<a href="%url%">Billedet</a> kunne ikke indlæses.'
+    experimental_lightbox:
+      buttons:
+        close: "Luk (Esc)"
     cannot_render_video: Denne video kan ikke afspilles, fordi din browser ikke understøtter codec.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
@@ -3388,7 +3357,6 @@ da:
         one: "Blev tildelt dette emblem %{count} gang"
         other: "Blev tildelt dette emblem %{count} gange"
       granted_on: "Tildelt %{date}"
-      others_count: "Andre med dette emblem (%{count})"
       title: Emblemer
       allow_title: "Du kan bruge dette emblem som en titel"
       multiple_grant: "Du kan optjene dette flere gange"
@@ -3558,13 +3526,11 @@ da:
       enabled: "Sikker tilstand er slået til - for at forlade sikker tilstand, så luk dette browservindue"
     image_removed: "(billede fjernet)"
     pause_notifications:
-      remaining: "%{remaining} tilbage"
       options:
         half_hour: "30 minutter"
         one_hour: "1 time"
         two_hours: "2 timer"
         tomorrow: "Indtil i morgen"
-        custom: "Tilpasset"
       set_schedule: "Indstil en Tidsplan for notifikation"
     trust_levels:
       names:
@@ -3604,7 +3570,21 @@ da:
       more: "Flere"
       all_categories: "Alle kategorier"
       all_tags: "Alle mærker"
+      edit_navigation_modal_form:
+        filter_dropdown:
+          all: "Alle"
       sections:
+        custom:
+          save: "Gem"
+          delete: "Slet"
+          links:
+            reset: "Nulstil til standard"
+            icon:
+              label: "Ikon"
+            name:
+              label: "Navn"
+            value:
+              label: "Link"
         about:
           header_link_text: "Om"
         messages:
@@ -3618,9 +3598,6 @@ da:
             unread_with_count: "Ulæst (%{count})"
             archive: "Arkiv"
         tags:
-          links:
-            add_tags:
-              content: "Tilføj mærker"
           click_to_get_started: "Klik her for at komme i gang."
           header_link_text: "Tags"
           configure_defaults: "Konfigurer standardindstillinger"
@@ -3629,7 +3606,8 @@ da:
           header_link_text: "Kategorier"
           configure_defaults: "Konfigurer standardindstillinger"
         community:
-          header_link_text: "Fællesskab"
+          edit_section:
+            header_dropdown: "Tilpasning"
           links:
             about:
               content: "Om"
@@ -3637,8 +3615,8 @@ da:
               content: "Admin"
             badges:
               content: "Emblemer"
-            everything:
-              content: "Alting"
+            topics:
+              content: "Emner"
             faq:
               content: "OSS"
             groups:
@@ -3651,6 +3629,11 @@ da:
             review:
               content: "Anmeldelse"
     until: "Indtil:"
+    form_templates:
+      errors:
+        typeMismatch:
+          default: "Indtast venligst en gyldig værdi."
+          email: "Indtast venligst en gyldig email adresse."
   admin_js:
     type_to_filter: "skriv for at filtrere…"
     admin:
@@ -3944,9 +3927,6 @@ da:
         notification_event:
           name: "Meddelelsesbegivenhed"
           details: "Når en bruger modtager en underretning i deres beskedstrøm."
-        user_badge_event:
-          name: "Emblem Tildelings Begivenhed"
-          details: "Når en bruger modtager et emblem."
         group_user_event:
           name: "Gruppe Bruger Begivenhed"
           details: "Når en bruger tilføjes eller fjernes en gruppe."
@@ -3989,7 +3969,6 @@ da:
         enabled: "Aktiveret?"
         is_enabled: "J"
         not_enabled: "N"
-        change_settings: "Skift indstillinger"
         change_settings_short: "Indstillinger"
         howto: "Hvordan installerer jeg plugins?"
         official: "Officielt plugin"
@@ -4312,6 +4291,8 @@ da:
           love:
             name: "kærlighed"
             description: "Like knappens farve."
+          selected:
+            name: "valgte"
         robots:
           title: "Tilsidesæt dit websteds robots.txt-fil:"
           warning: "Dette vil tilsidesætte alle relaterede sideindstillinger permanent."
@@ -4593,13 +4574,8 @@ da:
           silence: "Mådehold (silence)"
           link: "Link"
         action_descriptions:
-          block: "Undgå, at indlæg, der indeholder disse ord, bliver sendt. Brugeren vil se en fejlmeddelelse, når de prøver at indsende deres post."
-          censor: "Tillad indlæg, der indeholder disse ord, men erstat dem med tegn, der skjuler de censurerede ord."
-          require_approval: "Indlæg, der indeholder disse ord, kræver godkendelse af hjælperteam, før de kan ses."
-          flag: "Tillad indlæg, der indeholder disse ord, men markér dem som upassende, så moderatorer kan gennemgå dem."
-          replace: "Erstat ord i indlæg med andre ord"
-          tag: "Mærk automatisk emner baseret på første indlæg"
-          link: "Erstat ord i indlæg med links"
+          replace: "Erstat ord i indlæg med andre ord."
+          link: "Erstat ord i indlæg med links."
         form:
           placeholder: "Indtast ord eller sætning (* er et jokertegn)"
           placeholder_regexp: "almindelig udtryk"
@@ -4618,6 +4594,37 @@ da:
           description: "Indtast tekst nedenfor for at kontrollere, om den indeholder overvågede ord"
           found_matches: "Fundne resultater:"
           no_matches: "Ingen match fundet"
+      form_templates:
+        nav_title: "Skabeloner"
+        list_table:
+          headings:
+            name: "Navn"
+            actions: "Handlinger"
+        view_template:
+          close: "Luk"
+          edit: "Redigér"
+          delete: "Slet"
+        new_template_form:
+          submit: "Gem"
+          cancel: "Annuller"
+          preview: "Forhåndsvisning"
+        quick_insert_fields:
+          add_new_field: "Tilføj"
+          dropdown: "Rulleboks"
+        validations_modal:
+          table_headers:
+            key: "Nøgle"
+            type: "Type"
+            description: "Beskrivelse"
+          validations:
+            required:
+              key: "krævet"
+            minimum:
+              key: "minimum"
+            maximum:
+              key: "maksimum"
+            type:
+              key: "type"
       impersonate:
         title: "Skift personlighed"
         help: "Brug dette værktøj til at udgive dig for en anden bruger til brug for debugging. Du skal logge ud når du er færdig."
@@ -4630,6 +4637,7 @@ da:
         not_found: "Beklager, brugernavnet findes ikke i vores system."
         id_not_found: "Desværre, dette bruger id findes ikke på vores system."
         active: "Aktiveret"
+        status: "Status"
         show_emails: "Vis Emails"
         hide_emails: "Skjul emails"
         nav:
@@ -4713,7 +4721,6 @@ da:
         show_admin_profile: "Admin"
         manage_user: "Administrer bruger"
         show_public_profile: "Vis offentlig profil"
-        impersonate: "Impersonate"
         action_logs: "Aktivitetslog"
         ip_lookup: "IP opslag"
         log_out: "Log ud"
@@ -4936,6 +4943,8 @@ da:
         show_overriden: "Vis kun tilsidesatte"
         locale: "Sprog:"
         more_than_50_results: "Der er mere end 50 resultater. Begræns din søgning."
+        outdated:
+          dismiss: "Ignorer Alle"
       settings:
         show_overriden: "Vis kun tilsidesatte"
         history: "Vis ændringshistorik"
@@ -4948,7 +4957,6 @@ da:
             label: "Tilføj Humørikon"
         title: "Indstillinger"
         no_results: "Ingen resultater fundet."
-        more_than_30_results: "Der er mere end 30 resultater. Foruddefiner din søgning, eller vælg en kategori."
         clear_filter: "Ryd"
         add_url: "tilføj URL"
         add_host: "tilføj server"
@@ -5035,7 +5043,8 @@ da:
         allow_title: Tillad at bruge dette emblem som titel
         multiple_grant: Kan tildeles flere gange
         listable: Vis emblemer på den offentlige emblem side
-        enabled: Aktiver emblem
+        enabled: aktiveret
+        disabled: deaktiveret
         icon: Ikon
         image: Billede
         graphic: Grafik
@@ -5106,7 +5115,6 @@ da:
         confirm_delete: "Er du sikker på at du vil slette denne server?"
         title: "Indlejring"
         host: "Tilladte servere"
-        class_name: "Klasse Navn"
         allowed_paths: "Sti Tilladelsesliste"
         edit: "redigér"
         category: "Opret i kategorien"
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index 4cb6585fd5a..b902a6f2425 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -144,6 +144,8 @@ de:
       facebook: "Auf Facebook teilen"
       email: "Per E-Mail senden"
       url: "URL kopieren und teilen"
+    word_connector:
+      comma: ", "
     action_codes:
       public_topic: "Hat dieses Thema öffentlich gemacht, %{when}"
       open_topic: "Hat dies in ein Thema umgewandelt, %{when}"
@@ -155,6 +157,8 @@ de:
       removed_user: "Hat %{who} entfernt, %{when}"
       removed_group: "Hat %{who} entfernt, %{when}"
       autobumped: "Thema wurde automatisch nach oben geschoben, %{when}"
+      tags_changed: "Schlagwörter aktualisiert %{when}"
+      category_changed: "Kategorie aktualisiert %{when}"
       autoclosed:
         enabled: "Geschlossen, %{when}"
         disabled: "Geöffnet, %{when}"
@@ -179,17 +183,13 @@ de:
       forwarded: "Hat die obige E-Mail weitergeleitet"
     topic_admin_menu: "Themen-Administration"
     skip_to_main_content: "Zum Hauptinhalt springen"
+    skip_user_nav: "Zum Profilinhalt springen"
     emails_are_disabled: "Die ausgehende E-Mail-Kommunikation wurde von einem Administrator global deaktiviert. Es werden keinerlei Benachrichtigungen per E-Mail verschickt."
     emails_are_disabled_non_staff: "Ausgehende E-Mails wurden für Benutzer, die nicht zum Team gehören, deaktiviert."
     software_update_prompt:
       message: "Wir haben ein Update dieser Website durchgeführt. <span>Bitte aktualisiere</span>, da es sonst zu unerwartetem Verhalten kommen kann."
       dismiss: "Verwerfen"
-    bootstrap_mode_enabled:
-      one: "Damit du mit deiner Website einfacher loslegen kannst, befindest du dich im Starthilfe-Modus. Alle neuen Benutzer erhalten die Vertrauensstufe 1 und bekommen eine tägliche E-Mail-Zusammenfassung. Der Modus wird automatisch deaktiviert, sobald sich mehr als %{count} Benutzer registriert hat."
-      other: "Damit du mit deiner Website einfacher loslegen kannst, befindest du dich im Starthilfe-Modus. Alle neuen Benutzer erhalten die Vertrauensstufe 1 und bekommen eine tägliche E-Mail-Zusammenfassung. Der Modus wird automatisch deaktiviert, sobald sich mehr als %{count} Benutzer registriert haben."
-    bootstrap_mode_disabled: "Der Starthilfe-Modus wird in den nächsten 24 Stunden deaktiviert."
-    bootstrap_invite_button_title: "Einladungen versenden"
-    bootstrap_wizard_link_title: "Setup-Assistenten beenden"
+    bootstrap_mode: "Erste Schritte"
     themes:
       default_description: "Standard"
       broken_theme_alert: "Deine Website funktioniert vielleicht nicht, weil ein Theme/eine Komponente Fehler hat."
@@ -302,11 +302,11 @@ de:
       edit_bookmark: "Lesezeichen bearbeiten"
       clear_bookmarks: "Lesezeichen entfernen"
       help:
-        bookmark: "Klicke hier, um den ersten Beitrag in diesem Thema mit einem Lesezeichen zu versehen."
-        edit_bookmark: "Klicke, um das Lesezeichen zu diesem Thema zu bearbeiten"
+        bookmark: "Klicke, um dieses Thema mit einem Lesezeichen zu markieren"
+        edit_bookmark: "Klicke, um das Lesezeichen für einen Beitrag in diesem Thema zu bearbeiten"
         edit_bookmark_for_topic: "Klicke, um das Lesezeichen für dieses Thema zu bearbeiten"
         unbookmark: "Klicke hier, um alle Lesezeichen in diesem Thema zu entfernen."
-        unbookmark_with_reminder: "Klicke, um alle Lesezeichen und Erinnerungen in diesem Thema zu entfernen."
+        unbookmark_with_reminder: "Klicke, um alle Lesezeichen und Erinnerungen in diesem Thema zu entfernen"
     bookmarks:
       created: "Du hast diesen Beitrag mit einem Lesezeichen versehen. %{name}"
       created_generic: "Du hast dies mit einem Lesezeichen versehen: %{name}"
@@ -350,7 +350,7 @@ de:
       new_topic: "Neuer Entwurf für Thema"
       new_private_message: "Neuer Entwurf für persönliche Nachricht"
       abandon:
-        confirm: "Du hast einen Entwurf für dieses Thema in Arbeit. Was würdest du gerne damit machen?"
+        confirm: "Du hast bereits einen Entwurf in Arbeit. Was möchtest du damit machen?"
         yes_value: "Verwerfen"
         no_value: "Bearbeitung fortsetzen"
     topic_count_categories:
@@ -403,6 +403,8 @@ de:
         search: "Suche nach einer Nachricht"
         placeholder: "gib hier den Titel, die URL oder die ID der Nachricht ein"
     review:
+      show_more: "Mehr anzeigen"
+      show_less: "Weniger anzeigen"
       order_by: "Sortieren nach"
       date_filter: "Gepostet zwischen"
       in_reply_to: "Antwort auf"
@@ -523,26 +525,43 @@ de:
       scores:
         about: "Dieser Score wird basierend auf der Vertrauensstufe des Meldenden, der Richtigkeit der vorhergehenden Meldungen sowie der Priorität des gemeldeten Elements berechnet."
         score: "Score"
-        date: "Datum"
-        type: "Typ"
+        date: "Datum der Meldung"
+        type: "Grund"
         status: "Status"
-        submitted_by: "Abgesendet von"
+        submitted_by: "Gemeldet von"
         reviewed_by: "Überprüft von"
+        reviewed_timestamp: "Datum der Überprüfung"
       statuses:
         pending:
           title: "Ausstehend"
         approved:
           title: "Genehmigt"
+        approved_flag:
+          title: "Meldung genehmigt"
+        approved_user:
+          title: "Benutzer genehmigt"
+        approved_post:
+          title: "Beitrag genehmigt"
         rejected:
           title: "Abgelehnt"
+        rejected_flag:
+          title: "Meldung abgelehnt"
+        rejected_user:
+          title: "Benutzer abgelehnt"
+        rejected_post:
+          title: "Beitrag abgelehnt"
         ignored:
-          title: "Ignoriert"
+          title: "Meldung ignoriert"
         deleted:
-          title: "Gelöscht"
+          title: "Thema oder Beitrag gelöscht"
         reviewed:
-          title: "(alle überprüft)"
+          title: "Alle überprüft"
         all:
-          title: "(alles)"
+          title: "Alles"
+      context_question:
+        is_this_post: "Ist dieser Beitrag %{reviewable_human_score_types}?"
+        delimiter: "oder"
+        something_else_wrong: "Stimmt etwas mit diesem Beitrag nicht?"
       types:
         reviewable_flagged_post:
           title: "Gemeldeter Beitrag"
@@ -555,6 +574,8 @@ de:
           title: "Benutzer"
         reviewable_post:
           title: "Beitrag"
+        reviewable_chat_message:
+          title: "Markierte Chat-Nachricht"
       approval:
         title: "Beitrag muss genehmigt werden"
         description: "Wir haben deinen neuen Beitrag erhalten. Dieser muss jedoch von einem Moderator genehmigt werden, bevor er angezeigt wird. Bitte habe etwas Geduld."
@@ -849,6 +870,7 @@ de:
         make_all_primary_description: "Mache diese Gruppe zur primären Gruppe für alle ausgewählten Benutzer"
         remove_all_primary: "Als primäre Gruppe entfernen"
         remove_all_primary_description: "Diese Gruppe als primäre Gruppe entfernen"
+        status: "Status"
         owner: "Eigentümer"
         primary: "Primär"
         forbidden: "Du hast nicht das Recht, die Mitglieder zu sehen."
@@ -977,10 +999,12 @@ de:
       mute: "Stummschalten"
       edit: "Einstellungen bearbeiten"
       download_archive:
-        button_text: "Alle herunterladen"
-        confirm: "Möchtest du wirklich deine Beiträge herunterladen?"
-        success: "Der Export wurde gestartet. Du erhältst eine Nachricht, sobald der Vorgang abgeschlossen ist."
-        rate_limit_error: "Beiträge können pro Tag nur einmal heruntergeladen werden. Bitte versuch es morgen wieder."
+        title: "Exportiere deine Daten"
+        description: "Lade ein Archiv deiner Kontoaktivitäten und Einstellungen herunter."
+        button_text: "Archiv anfordern"
+        confirm: "Möchtest du wirklich ein Archiv deiner Kontoaktivitäten und Einstellungen herunterladen?"
+        success: "Wir haben mit dem Zusammentragen deines Archivs begonnen. Du erhältst eine Nachricht, wenn der Vorgang abgeschlossen ist."
+        rate_limit_error: "Kontoarchive können nur einmal pro Tag heruntergeladen werden, bitte versuche es morgen noch einmal."
       new_private_message: "Neue Nachricht"
       private_message: "Nachricht"
       private_messages: "Nachrichten"
@@ -1033,6 +1057,7 @@ de:
           warning: "Bist du sicher, dass du dein hervorgehobenes Thema löschen möchtest?"
       use_current_timezone: "Aktuelle Zeitzone verwenden"
       profile_hidden: "Das öffentliche Profil des Benutzers ist ausgeblendet."
+      inactive_user: "Dieser Benutzer ist nicht mehr aktiv."
       expand_profile: "Erweitern"
       sr_expand_profile: "Profildetails erweitern"
       collapse_profile: "Zuklappen"
@@ -1052,7 +1077,7 @@ de:
         perm_denied_expl: "Du hast das Anzeigen von Benachrichtigungen verboten. Aktiviere die Benachrichtigungen über deine Browser-Einstellungen."
         disable: "Benachrichtigungen deaktivieren"
         enable: "Benachrichtigungen aktivieren"
-        each_browser_note: 'Hinweis: Du musst diese Einstellung in jedem Browser, den du verwendest, ändern. Alle Benachrichtigungen werden unabhängig von dieser Einstellung deaktiviert, wenn du die Benachrichtigungen im Benutzermenü pausierst.'
+        each_browser_note: "Hinweis: Du musst diese Einstellung in jedem Browser, den du verwendest, ändern. Alle Benachrichtigungen werden unabhängig von dieser Einstellung deaktiviert, wenn du die Benachrichtigungen im Benutzermenü pausierst."
         consent_prompt: "Möchtest du Live-Benachrichtigungen erhalten, wenn jemand auf deine Beiträge antwortet?"
       dismiss: "Alles gelesen"
       dismiss_notifications: "Alles gelesen"
@@ -1103,14 +1128,10 @@ de:
       experimental_sidebar:
         enable: "Seitenleiste aktivieren"
         options: "Optionen"
-        categories_section: "Abschnitt „Kategorien“"
-        categories_section_instruction: "Ausgewählte Kategorien werden im Abschnitt „Kategorien“ der Seitenleiste angezeigt."
-        tags_section: "Abschnitt „Schlagwörter“"
-        tags_section_instruction: "Ausgewählte Schlagwörter werden im Abschnitt „Schlagwörter“ der Seitenleiste angezeigt."
         navigation_section: "Navigation"
-        list_destination_instruction: "Wenn es neue Inhalte in der Seitenleiste gibt …"
-        list_destination_default: "den Standardlink verwenden und ein Symbol für neue Elemente anzeigen"
-        list_destination_unread_new: "auf ungelesen/neu verlinken und die Anzahl der neuen Elemente anzeigen"
+        navigation_section_instruction: "Wenn eine Themenliste im Navigationsmenü neue oder ungelesene Elemente enthält …"
+        link_to_filtered_list_checkbox_description: "Gefilterte Liste verlinken"
+        show_count_new_items_checkbox_description: "Zähler für die neuen Elemente anzeigen"
       change: "ändern"
       featured_topic: "Hervorgehobenes Thema"
       moderator: "%{user} ist ein Moderator"
@@ -1149,6 +1170,7 @@ de:
       watched_first_post_categories_instructions: "Du erhältst eine Benachrichtigung für den ersten Beitrag in jedem neuen Thema in diesen Kategorien."
       watched_first_post_tags: "Ersten Beitrag beobachten"
       watched_first_post_tags_instructions: "Du erhältst eine Benachrichtigung für den ersten Beitrag in jedem neuen Thema mit diesen Schlagwörtern."
+      watched_precedence_over_muted: "Benachrichtige mich über Themen in Kategorien oder mit Schlagwörtern, die ich beobachte und die auch zu einem Thema gehören, das ich stummgeschaltet habe"
       muted_categories: "Stummgeschaltet"
       muted_categories_instructions: "Du erhältst keine Benachrichtigungen über neue Themen in diesen Kategorien und sie werden auch nicht in der Liste der Kategorien oder der aktuellen Themen erscheinen."
       muted_categories_instructions_dont_hide: "Du erhältst keine Benachrichtigungen über neue Themen in diesen Kategorien."
@@ -1181,12 +1203,24 @@ de:
       home: "Standard-Startseite"
       staged: "Vorbereitet"
       staff_counters:
-        flags_given: "hilfreiche Meldungen"
-        flagged_posts: "gemeldete Beiträge"
-        deleted_posts: "gelöschte Beiträge"
-        suspensions: "Sperren"
-        warnings_received: "Warnungen"
-        rejected_posts: "abgelehnte Beiträge"
+        flags_given:
+          one: '<span class="%{className}">%{count}</span> hilfreiche Meldung'
+          other: '<span class="%{className}">%{count}</span> hilfreiche Meldungen'
+        flagged_posts:
+          one: '<span class="%{className}">%{count}</span> gemeldeter Beitrag'
+          other: '<span class="%{className}">%{count}</span> gemeldete Beiträge'
+        deleted_posts:
+          one: '<span class="%{className}">%{count}</span> gelöschter Beitrag'
+          other: '<span class="%{className}">%{count}</span> gelöschte Beiträge'
+        suspensions:
+          one: '<span class="%{className}">%{count}</span> Sperre'
+          other: '<span class="%{className}">%{count}</span> Sperren'
+        warnings_received:
+          one: '<span class="%{className}">%{count}</span> Warnung'
+          other: '<span class="%{className}">%{count}</span> Warnungen'
+        rejected_posts:
+          one: '<span class="%{className}">%{count}</span> abgelehnter Beitrag'
+          other: '<span class="%{className}">%{count}</span> abgelehnte Beiträge'
       messages:
         all: "alle Posteingänge"
         inbox: "Posteingang"
@@ -1279,7 +1313,7 @@ de:
         tags: "Schlagwörter"
         interface: "Oberfläche"
         apps: "Apps"
-        sidebar: "Seitenleiste"
+        navigation_menu: "Navigationsmenü"
       change_password:
         success: "(E-Mail gesendet)"
         in_progress: "(E-Mail wird gesendet)"
@@ -1293,11 +1327,12 @@ de:
         title: "Wiederherstellungscodes für Zwei-Faktor-Authentifizierung"
         regenerate: "Erneuern"
         disable: "Deaktivieren"
-        enable: "Aktivieren"
-        enable_long: "Wiederherstellungscodes aktivieren"
+        enable: "Wiederherstellungscodes erstellen"
+        enable_long: "Wiederherstellungscodes hinzufügen"
+        not_enabled: "Du hast noch keine Wiederherstellungscodes erstellt."
         manage:
-          one: "Verwalte deine Wiederherstellungscodes. Du hast noch <strong>%{count}</strong> verbleibenden Wiederherstellungscode."
-          other: "Verwalte deine Wiederherstellungscodes. Du hast noch <strong>%{count}</strong> verbleibende Wiederherstellungscodes."
+          one: "Du hast noch <strong>%{count}</strong> verbleibenden Wiederherstellungscode."
+          other: "Du hast noch <strong>%{count}</strong> verbleibende Wiederherstellungscodes."
         copy_to_clipboard: "In Zwischenablage kopieren"
         copy_to_clipboard_error: "Beim Kopieren in die Zwischenablage trat ein Fehler auf"
         copied_to_clipboard: "Wurde in Zwischenablage kopiert"
@@ -1381,6 +1416,7 @@ de:
         success: "Wir haben eine E-Mail an die angegebene E-Mail-Adresse gesendet. Folge zur Bestätigung der Adresse bitte den darin enthaltenen Anweisungen."
         success_via_admin: "Wir haben eine E-Mail an diese Adresse gesendet. Der Benutzer muss den Bestätigungsanweisungen in der E-Mail folgen."
         success_staff: "Wir haben eine E-Mail an deine aktuelle Adresse geschickt. Bitte folge den Bestätigungsanweisungen."
+        back_to_preferences: "Zurück zu den Einstellungen"
       change_avatar:
         title: "Ändere dein Profilbild"
         gravatar: "<a href='//%{gravatarBaseUrl}%{gravatarLoginUrl}' target='_blank'>%{gravatarName}</a>, basierend auf"
@@ -1735,8 +1771,7 @@ de:
       pause_notifications: "Benachrichtigungen pausieren"
       remove_status: "Status entfernen"
     user_tips:
-      primary: "Verstanden!"
-      secondary: "diese Tipps nicht anzeigen"
+      button: "Verstanden!"
       first_notification:
         title: "Deine erste Benachrichtigung!"
         content: "Benachrichtigungen dienen dazu, dich auf dem Laufenden zu halten, was in der Community passiert."
@@ -1752,6 +1787,10 @@ de:
       suggested_topics:
         title: "Lies weiter!"
         content: "Hier sind einige Themen, von denen wir denken, dass du sie als Nächstes lesen möchtest."
+      admin_guide:
+        title: "Willkommen auf deiner neuen Website!"
+        content: "Lies den Administrator-Leitfaden, um deine Website und deine Community weiter auszubauen."
+        button: "Los geht's!"
     loading: "Wird geladen …"
     errors:
       prev_page: "während des Ladens"
@@ -1786,36 +1825,6 @@ de:
       logout_disabled: "Die Abmeldung ist deaktiviert, während sich die Website im Nur-Lesen-Modus befindet."
     staff_writes_only_mode:
       enabled: "Diese Website befindet sich im Nur-Team-Modus. Du kannst weiterhin Inhalte lesen, aber das Antworten, Vergeben von „Gefällt mir“ und Durchführen einiger weiterer Aktionen ist derzeit nur für Team-Mitglieder möglich."
-    too_few_topics_and_posts_notice_MF: |
-      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">Beginnen wir die Diskussion!</a> Es { currentTopics, plural,
-          one {gibt <strong>#</strong> Thema}
-        other {gibt <strong>#</strong> Themen}
-      } und { currentPosts, plural,
-          one {<strong>#</strong> Beitrag}
-        other {<strong>#</strong> Beiträge}
-      }. Besucher brauchen mehr zum Lesen und Beantworten – wir empfehlen mindestens { requiredTopics, plural,
-          one {<strong>#</strong> Thema}
-        other {<strong>#</strong> Themen}
-      } und { requiredPosts, plural,
-          one {<strong>#</strong> Beitrag}
-        other {<strong>#</strong> Beiträge}
-      }. Nur das Team kann diese Nachricht sehen.
-    too_few_topics_notice_MF: |
-      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">Beginnen wir die Diskussion!</a> Es { currentTopics, plural,
-          one {gibt <strong>#</strong> Thema}
-        other {gibt <strong>#</strong> Themen}
-      }. Besucher brauchen mehr zum Lesen und Beantworten – wir empfehlen mindestens { requiredTopics, plural,
-          one {<strong>#</strong> Thema}
-        other {<strong>#</strong> Themen}
-      }. Nur das Team kann diese Nachricht sehen.
-    too_few_posts_notice_MF: |
-      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">Beginnen wir die Diskussion!</a> Es { currentPosts, plural,
-          one {gibt <strong>#</strong> Beitrag}
-        other {gibt <strong>#</strong> Beiträge}
-      }. Besucher brauchen mehr zum Lesen und Beantworten – wir empfehlen mindestens { requiredPosts, plural,
-          one {<strong>#</strong> Beitrag}
-        other {<strong>#</strong> Beiträge}
-      }. Nur das Team kann diese Nachricht sehen.
     logs_error_rate_notice:
       reached_hour_MF: |
         <b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# Fehler/Stunde} other {# Fehler/Stunde}}</a> hat die Grenze der Website-Einstellung von {limit, plural, one {# Fehler/Stunde} other {# Fehlern/Stunde}} erreicht.
@@ -1845,17 +1854,31 @@ de:
       hidden_for_session: "In Ordnung, wir fragen dich morgen wieder. Du kannst dir auch jederzeit unter „Anmelden“ ein Benutzerkonto erstellen."
       intro: "Hallo! Es sieht so aus, als ob dir diese Diskussion gefällt, aber du hast bislang noch kein Konto angelegt."
       value_prop: "Hast du es satt, dich durch die gleichen Beiträge zu scrollen? Wenn du ein Konto erstellst, kommst du immer wieder dorthin zurück, wo du aufgehört hast. Mit einem Konto kannst du auch über neue Antworten benachrichtigt werden, Lesezeichen speichern und anderen mit „Gefällt mir“ danken. Wir können alle zusammenarbeiten, um diese Community zu etwas Großartigem zu machen. :heart:"
+    offline_indicator:
+      no_internet: "Keine Internetverbindung."
+      refresh_page: "Seite aktualisieren"
     summary:
-      enabled_description: "Du siehst gerade eine Zusammenfassung des Themas: die interessantesten Beiträge, die von der Community bestimmt wurden."
+      in_progress: "Thema wird mithilfe von KI zusammengefasst …"
+      summarized_on: "Zusammengefasst mit KI am %{date}"
+      model_used: "KI verwendet: %{model}"
+      outdated: "Zusammenfassung ist veraltet"
+      outdated_posts:
+        one: "(%{count} Beitrag fehlt)"
+        other: "(%{count} Beiträge fehlen)"
+      enabled_description: "Du siehst dir die Top-Antworten zu diesem Thema an: die interessantesten Beiträge, die von der Community ermittelt wurden."
       description:
         one: "Es gibt <b>%{count}</b> Antwort."
         other: "Es gibt <b>%{count}</b> Antworten."
+      buttons:
+        hide: "Zusammenfassung ausblenden"
+        generate: "Zusammenfassen mit KI"
+        regenerate: "Zusammenfassung neu generieren"
       description_time_MF: |
         Es gibt {replyCount, plural, one {<b>#</b> Antwort} other {<b>#</b> Antworten}} mit einer geschätzten Lesezeit von <b>{readingTime, plural, one {# Minute} other {# Minuten}}</b>.
-      enable: "Dieses Thema zusammenfassen"
+      enable: "Top-Antworten anzeigen"
       disable: "Alle Beiträge anzeigen"
-      short_label: "Zusammenfassen"
-      short_title: "Eine Zusammenfassung dieses Themas anzeigen: die laut der Community interessantesten Beiträge"
+      short_label: "Top Antworten"
+      short_title: "Top-Antworten zu diesem Thema anzeigen: die interessantesten Beiträge, wie von der Community ermittelt"
     deleted_filter:
       enabled_description: "Dieses Thema enthält gelöschte Beiträge, die derzeit versteckt sind."
       disabled_description: "Gelöschte Beiträge werden in diesem Thema angezeigt."
@@ -2154,8 +2177,6 @@ de:
         topic_template_not_modified: "Bitte füge Details und Spezifikationen zu deinem Thema hinzu, indem du die Themenvorlage anpasst."
       save_edit: "Bearbeitung speichern"
       overwrite_edit: "Bearbeitung überschreiben"
-      reply_original: "Auf das ursprüngliche Thema antworten"
-      reply_here: "Hier antworten"
       reply: "Antworten"
       cancel: "Abbrechen"
       create_topic: "Thema erstellen"
@@ -2257,6 +2278,7 @@ de:
       image_alt_text:
         aria_label: Alternativ-Text für Bild
       delete_image_button: Bild löschen
+      toggle_image_grid: Bildraster umschalten
     notifications:
       tooltip:
         regular:
@@ -2320,6 +2342,7 @@ de:
       reaction_2: "<span>%{username}, %{username2}</span> %{description}"
       votes_released: "%{description} – abgeschlossen"
       new_features: "Neue Funktionen verfügbar!"
+      admin_problems: "Neue Ratschläge auf deinem Website-Dashboard"
       dismiss_confirmation:
         body:
           default:
@@ -2585,6 +2608,11 @@ de:
         dismiss_tooltip: "Nur die neuen Beiträge ignorieren oder Themen nicht mehr verfolgen"
         also_dismiss_topics: "Diese Themen nicht mehr verfolgen, sodass mir diese nicht mehr als ungelesen angezeigt werden"
         dismiss_new: "Neue Themen ignorieren"
+        dismiss_new_modal:
+          title: "Neu verwerfen"
+          topics: "Neue Themen verwerfen"
+          posts: "Neue Beiträge verwerfen"
+          untrack: "Hör auf, diese Themen zu verfolgen, damit sie nicht mehr in deiner \"neuen\" Liste auftauchen"
         dismiss_new_with_selected:
           one: "Neues Thema ignorieren (%{count})"
           other: "Neue Themen ignorieren (%{count})"
@@ -2622,9 +2650,11 @@ de:
         bookmarks: "Du hast noch keine Themen mit einem Lesezeichen versehen."
         category: "Es gibt keine Themen in %{category}."
         top: "Es gibt keine angesagten Themen."
+        filter: "Es gibt keine Themen."
         educate:
           new: '<p>Hier werden deine neuen Themen angezeigt. Standardmäßig werden Themen als neu erachtet und mit einem <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span>-Indikator dargestellt, wenn sie in den letzten 2 Tagen erstellt wurden. </p><p>Besuche deine <a href="%{userPrefsUrl}">Einstellungen</a>, um dies zu ändern.</p>'
-          unread: "<p>Hier werden deine ungelesenen Themen angezeigt.</p><p>Standardmäßig werden Themen als ungelesen erachtet und mit einem Zähler für ungelesene Beiträge <span class=\"badge unread-posts badge-notification\">1</span> dargestellt, wenn du:</p><ul><li>das Thema erstellt hast;</li><li>auf das Thema geantwortet hast;</li><li>das Thema für mehr als 4 Minuten gelesen hast.</li></ul><p>Oder falls du das Thema über \U0001F514 ausdrücklich auf „Verfolgen“ oder „Beobachten“ eingestellt hast.</p><p>Besuche deine <a href=\"%{userPrefsUrl}\">Einstellungen</a>, um dies zu ändern.</p>"
+          unread: "<p>Hier werden deine ungelesenen Themen angezeigt.</p><p>Standardmäßig werden Themen als ungelesen erachtet und mit einem Zähler für ungelesene Beiträge <span class=\"badge unread-posts badge-notification\">1</span> dargestellt, wenn du:</p><ul><li>das Thema erstellt hast;</li><li>auf das Thema geantwortet hast;</li><li>das Thema für mehr als 5 Minuten gelesen hast.</li></ul><p>Oder falls du das Thema über \U0001F514 ausdrücklich auf „Verfolgen“ oder „Beobachten“ eingestellt hast.</p><p>Besuche deine <a href=\"%{userPrefsUrl}\">Einstellungen</a>, um dies zu ändern.</p>"
+          new_new: "<p>Hier erscheinen deine neuen Themen und deine ungelesenen Themen werden ebenfalls angezeigt. Standardmäßig gelten Themen als neu und werden mit <span class=\"badge new-topic badge-notification\" style=\"vertical-align:middle;line-height:inherit;\"></span> gekennzeichnet, wenn sie in den letzten 2 Tagen erstellt wurden. Ungelesene Themen werden <span class=\"badge unread-posts badge-notification\">1</span> angezeigt, wenn du: das Thema erstellt hast, auf das Thema geantwortet hast, das Thema länger als 5 Minuten gelesen hast oder wenn du das Thema über das \U0001F514 in jedem Thema explizit auf Verfolgt oder Beobachtet gesetzt hast.</p><p>Besuche deine <a href=\"%{userPrefsUrl}\">Einstellungen</a> , um dies zu ändern.</p>"
       bottom:
         latest: "Das waren die aktuellen Themen."
         posted: "Das waren alle Themen."
@@ -2636,11 +2666,13 @@ de:
         tag: "Das waren alle Themen mit dem Schlagwort „%{tag}“."
         top: "Das waren alle angesagten Themen."
         bookmarks: "Das waren alle Themen, die du mit einem Lesezeichen versehen hast."
+        filter: "Es gibt keine weiteren Themen."
     topic:
       filter_to:
         one: "%{count} Beitrag im Thema"
         other: "%{count} Beiträge im Thema"
       create: "Neues Thema"
+      create_disabled_category: "Du darfst keine Themen in dieser Kategorie erstellen"
       create_long: "Ein neues Thema erstellen"
       open_draft: "Entwurf öffnen"
       private_message: "Eine Unterhaltung beginnen"
@@ -2687,6 +2719,7 @@ de:
       read_more_in_category: "Willst du mehr lesen? Durchstöbere andere Themen in %{categoryLink} oder <a href='%{latestLink}'>sieh dir die aktuellen Themen an</a>."
       read_more: "Willst du mehr lesen? <a href='%{categoryLink}'>Durchstöbere alle Kategorien</a> oder <a href='%{latestLink}'>sieh dir die aktuellen Themen an</a>."
       unread_indicator: "Kein Mitglied hat den letzten Beitrag dieses Themas bisher gelesen."
+      participant_groups: "Teilnehmergruppen"
       read_more_MF: |
         { HAS_UNREAD_AND_NEW, select,
           true {
@@ -2727,8 +2760,8 @@ de:
       browse_all_categories_latest_or_top: "<a href='%{basePath}/categories'>Durchstöbere alle Kategorien</a>, <a href='%{basePath}/latest'>sieh dir die aktuellen Themen</a> oder die Top-Themen an:"
       browse_all_tags_or_latest: "<a href='%{basePath}/tags'>Durchstöbere alle Schlagwörter</a> oder <a href='%{basePath}/latest'>sieh dir die aktuellen Themen an</a>."
       suggest_create_topic: Bereit, <a href>eine neue Unterhaltung zu beginnen?</a>
-      jump_reply_up: zur vorherigen Antwort springen
-      jump_reply_down: zur nachfolgenden Antwort springen
+      jump_reply: "Zur ursprünglichen Position des Beitrags springen"
+      jump_reply_aria: "Springe zu @%{username}s Beitrag an seinem ursprünglichen Ort"
       deleted: "Das Thema wurde gelöscht"
       slow_mode_update:
         title: "Langsamer Modus"
@@ -2996,6 +3029,7 @@ de:
         instructions:
           one: "Bitte wähle das Thema, in welches du den Beitrag verschieben möchtest."
           other: "Bitte wähle das Thema, in welches du die <b>%{count}</b> Beiträge verschieben möchtest."
+        chronological_order: "die chronologische Reihenfolge nach dem Zusammenführen beibehalten"
       move_to_new_message:
         title: "Verschieben in neue Unterhaltung"
         action: "verschieben in neue Unterhaltung"
@@ -3083,6 +3117,7 @@ de:
       ignored: "Ignorierter Inhalt"
       wiki_last_edited_on: "Wiki zuletzt bearbeitet am %{dateTime}"
       last_edited_on: "Beitrag zuletzt bearbeitet am %{dateTime}"
+      edit_history: "Beitragsbearbeitungsverlauf"
       reply_as_new_topic: "Mit verknüpftem Thema antworten"
       reply_as_new_private_message: "Antworte als neue Nachricht an die gleichen Empfänger"
       continue_discussion: "Fortsetzung der Diskussion von %{postLink}:"
@@ -3094,8 +3129,8 @@ de:
       sr_collapse_replies: "Eingebettete Antworten einklappen"
       sr_date: "Beitragsdatum"
       sr_expand_replies:
-        one: "Dieser Beitrag hat %{count} Antwort. Zum Erweitern klicken"
-        other: "Dieser Beitrag hat %{count} Antworten. Zum Erweitern klicken"
+        one: "Dieser Beitrag hat %{count} Antwort"
+        other: "Dieser Beitrag hat %{count} Antworten"
       expand_collapse: "erweitern/zuklappen"
       sr_below_embedded_posts_description: "Beitrag #%{post_number} Antworten"
       sr_embedded_reply_description: "Antwort von @%{username} auf Beitrag #%{post_number}"
@@ -3253,6 +3288,8 @@ de:
           last: "Letzte Überarbeitung"
           hide: "Überarbeitung verstecken"
           show: "Überarbeitung anzeigen"
+          destroy: "Revisionen löschen"
+          destroy_confirm: "Bist du sicher, dass du alle Änderungen an diesem Beitrag löschen willst? Diese Aktion ist dauerhaft."
           revert: "Auf Überarbeitung %{revision} zurücksetzen"
           edit_wiki: "Wiki bearbeiten"
           edit_post: "Beitrag bearbeiten"
@@ -3286,6 +3323,7 @@ de:
         updated: "Aktualisiert"
         name: "Name"
         name_placeholder: "Wofür dient dieses Lesezeichen?"
+        name_input_label: "Name des Lesezeichens"
         set_reminder: "Erinnere mich"
         options: "Optionen"
         actions:
@@ -3307,7 +3345,7 @@ de:
       filtered_replies:
         viewing_posts_by: "Zeige %{post_count} Beiträge von"
         viewing_subset: "Einige Antworten sind reduziert"
-        viewing_summary: "Eine Zusammenfassung dieses Themas anzeigen"
+        viewing_summary: "Top-Antworten zu diesem Thema anzeigen"
         post_number: "%{username}, Beitrag #%{post_number}"
         show_all: "Alle anzeigen"
       share:
@@ -3324,7 +3362,7 @@ de:
       back: "Zurück zur Kategorie"
       general: "Allgemeines"
       settings: "Einstellungen"
-      topic_template: "Themenvorlage"
+      topic_template: "Vorlage"
       tags: "Schlagwörter"
       tags_allowed_tags: "Schlagwörter auf diese Kategorie einschränken:"
       tags_allowed_tag_groups: "Schlagwortgruppen auf diese Kategorie einschränken:"
@@ -3383,8 +3421,7 @@ de:
       email_in: "Benutzerdefinierte Adresse für eingehende E-Mails:"
       email_in_tooltip: "Du kannst mehrere E-Mail-Adressen mit dem Zeichen | trennen."
       email_in_allow_strangers: "Akzeptiere E-Mails von anonymen Benutzern."
-      email_in_disabled: "Das Erstellen von neuen Themen per E-Mail ist in den Website-Einstellungen deaktiviert. Um das Erstellen von neuen Themen per E-Mail zu erlauben, "
-      email_in_disabled_click: 'Aktiviere die Einstellung „email in“.'
+      email_in_disabled: "Das Veröffentlichen neuer Themen per E-Mail ist deaktiviert. Um das Veröffentlichen neuer Themen per E-Mail zu ermöglichen, aktiviere die Einstellung <a href='%{setting_url}'>'email in'</a> ."
       mailinglist_mirror: "Kategorie spiegelt eine Mailingliste"
       show_subcategory_list: "Zeige Liste von Unterkategorien oberhalb von Themen in dieser Kategorie."
       read_only_banner: "Bannertext, wenn ein Benutzer kein Thema in dieser Kategorie erstellen kann:"
@@ -3411,6 +3448,7 @@ de:
       default_slow_mode: '„Langsamer Modus“ für neue Themen in dieser Kategorie aktivieren.'
       parent: "Übergeordnete Kategorie"
       num_auto_bump_daily: "Anzahl der offenen Themen, die automatisch täglich nach oben verschoben werden:"
+      auto_bump_cooldown_days: "Mindestanzahl an Tagen, bevor das gleiche Thema erneut angesprochen wird:"
       navigate_to_first_post_after_read: "Gehe zum ersten Beitrag, nachdem Themen gelesen wurden"
       notifications:
         title: "Benachrichtigungsstufe für diese Kategorie ändern"
@@ -3496,7 +3534,9 @@ de:
         inappropriate: "Unangemessen"
         spam: "Spam"
       custom_placeholder_notify_user: "Sei konkret, konstruktiv und immer freundlich."
+      notify_user_textarea_label: "Nachricht für den Benutzer"
       custom_placeholder_notify_moderators: "Bitte lass uns wissen, was genau dich beunruhigt. Verweise, wenn möglich, auf relevante Links und Beispiele."
+      notify_moderators_textarea_label: "Nachricht für die Moderatoren"
       custom_message:
         at_least:
           one: "gib mindestens %{count} Zeichen ein"
@@ -3592,6 +3632,10 @@ de:
     filters:
       with_topics: "%{filter}"
       with_category: "%{filter} in %{category}"
+      filter:
+        title: "Filter"
+        button:
+          label: "Filter"
       latest:
         title: "Aktuell"
         title_with_count:
@@ -3662,7 +3706,6 @@ de:
         this_week: "Woche"
         today: "Heute"
     browser_update: 'Leider wird <a href="https://www.discourse.org/faq/#browser">dein Browser nicht unterstützt</a>. Bitte <a href="https://browsehappy.com">wechsle zu einem unterstützten Browser</a>, um die Inhalte in vollem Umfang zu sehen, dich anzumelden und zu antworten.'
-    safari_13_warning: Diese Website wird bald die Unterstützung für iOS und Safari Version 13 und darunter entfernen. Eine vereinfachte Nur-Lesen-Version wird weiterhin verfügbar sein. (<a href="https://meta.discourse.org/t/224747">Mehr Informationen</a>)
     permission_types:
       full: "Erstellen/Antworten/Ansehen"
       create_post: "Antworten/Ansehen"
@@ -3677,6 +3720,20 @@ de:
       close: "Schließen (Esc)"
       content_load_error: '<a href="%url%">Der Inhalt</a> konnte nicht geladen werden.'
       image_load_error: '<a href="%url%">Das Bild</a> konnte nicht geladen werden.'
+    experimental_lightbox:
+      image_load_error: "Das Bild konnte nicht geladen werden."
+      screen_reader_image_title: "Bild %{current} von %{total}: %{title}"
+      buttons:
+        next: "Weiter (Pfeiltaste rechts oder unten)"
+        previous: "Zurück (Pfeiltaste nach links oder oben)"
+        close: "Schließen (Esc)"
+        download: "Bild herunterladen"
+        newtab: "Bild in einer neuen Registerkarte öffnen"
+        zoom: "Bild vergrößern/verkleinern (Taste Z)"
+        rotate: "Bild drehen (Taste R)"
+        fullscreen: "Umschalten des Browser-Vollbildmodus (Taste M)"
+        carousel: "Alle Bilder in einem Karussell anzeigen (Taste A)"
+        retry: "Versuche das Bild erneut zu laden"
     cannot_render_video: Dieses Video kann nicht gerendert werden, da dein Browser den Codec nicht unterstützt.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
@@ -3724,6 +3781,7 @@ de:
         title: "Schreiben"
         return: "%{shortcut} Zurück zum Editor"
         fullscreen: "%{shortcut} Vollbild-Editor"
+        insert_current_time: "%{shortcut} Aktuelle Uhrzeit einfügen"
       bookmarks:
         title: "Lesezeichen setzen"
         enter: "%{shortcut} Speichern und schließen"
@@ -3769,7 +3827,9 @@ de:
         one: "Abzeichen %{count}-mal erhalten"
         other: "Abzeichen %{count}-mal erhalten"
       granted_on: "Verliehen %{date}"
-      others_count: "Andere mit diesem Abzeichen (%{count})"
+      others_count:
+        one: "%{count} Mal an andere vergeben"
+        other: "%{count} Mal an andere vergeben"
       title: Abzeichen
       allow_title: "Du kannst dieses Abzeichen als Titel verwenden"
       multiple_grant: "Du kannst dieses Abzeichen mehrmals verliehen bekommen"
@@ -3782,6 +3842,7 @@ de:
       granted:
         one: "%{count}-mal verliehen"
         other: "%{count}-mal verliehen"
+      awarded: prämiert
       select_badge_for_title: Wähle ein Abzeichen als deinen Titel aus
       none: "(keines)"
       successfully_granted: "%{badge} erfolgreich verliehen an %{username}"
@@ -3952,13 +4013,11 @@ de:
     pause_notifications:
       title: "Benachrichtigungen pausieren für …"
       label: "Benachrichtigungen pausieren"
-      remaining: "%{remaining} verbleibend"
       options:
         half_hour: "30 Minuten"
         one_hour: "1 Stunde"
         two_hours: "2 Stunden"
         tomorrow: "Bis morgen"
-        custom: "Benutzerdefiniert"
       set_schedule: "Zeitplan für Benachrichtigungen festlegen"
     trust_levels:
       names:
@@ -4007,7 +4066,61 @@ de:
       more: "Mehr"
       all_categories: "Alle Kategorien"
       all_tags: "Alle Schlagwörter"
+      categories_form_modal:
+        title: "Kategorien-Navigation bearbeiten"
+        subtitle:
+          text: "und wir zeigen automatisch die beliebtesten Kategorien dieser Seite an"
+        filter_placeholder: "Kategorien filtern"
+        no_categories: "Es gibt keine Kategorien, die dem angegebenen Begriff entsprechen."
+      tags_form_modal:
+        title: "Schlagwörter-Navigation bearbeiten"
+        filter_placeholder: "Schlagwörter filtern"
+        no_tags: "Es gibt keine Schlagwörter, die auf den angegebenen Begriff passen."
+        subtitle:
+          text: "und wir werden automatisch die Top-Schlagwörter dieser Seite anzeigen"
+      edit_navigation_modal_form:
+        deselect_button_text: "Alle abwählen"
+        reset_to_defaults: "Auf Standards zurücksetzen"
+        filter_dropdown:
+          all: "Gesamt"
+          selected: "Ausgewählt"
+          unselected: "Nicht ausgewählt"
       sections:
+        custom:
+          add: "Benutzerdefinierten Abschnitt hinzufügen"
+          edit: "Benutzerdefinierten Abschnitt bearbeiten"
+          save: "Speichern"
+          delete: "Löschen"
+          delete_confirm: "Bist du sicher, dass du diesen Abschnitt löschen willst?"
+          reset_confirm: "Bist du sicher, dass du diesen Abschnitt auf die Standardeinstellungen zurücksetzen willst?"
+          public: "Mache diesen Bereich öffentlich und für alle sichtbar"
+          always_public: "Die Inhalte in diesem Bereich sind immer öffentlich"
+          more_menu: "Mehr Menü"
+          links:
+            add: "Einen weiteren Link hinzufügen"
+            delete: "Link löschen"
+            reset: "Auf Standard zurücksetzen"
+            icon:
+              label: "Symbol"
+              validation:
+                blank: "Das Symbol darf nicht leer sein"
+                maximum: "Symbol muss kürzer als %{count} Zeichen sein"
+            name:
+              label: "Name"
+              validation:
+                blank: "Der Name darf nicht leer sein"
+                maximum: "Der Name muss kürzer als %{count} Zeichen sein"
+            value:
+              label: "Link"
+              validation:
+                blank: "Link darf nicht leer sein"
+                maximum: "Der Link muss kürzer als %{count} Zeichen sein"
+                invalid: "Format ist ungültig"
+          title:
+            label: "Titel des Abschnitts"
+            validation:
+              blank: "Der Titel darf nicht leer sein"
+              maximum: "Titel muss kürzer als %{count} Zeichen sein"
         about:
           header_link_text: "Über uns"
         messages:
@@ -4022,28 +4135,21 @@ de:
             unread_with_count: "Ungelesen (%{count})"
             archive: "Archiv"
         tags:
-          links:
-            add_tags:
-              content: "Schlagwörter hinzufügen"
-              title: "Du hast noch keine Schlagwörter hinzugefügt. Klicke, um loszulegen."
           none: "Du hast keine Schlagwörter hinzugefügt."
           click_to_get_started: "Klicke hier, um zu beginnen."
           header_link_text: "Schlagwörter"
           header_action_title: "Bearbeite die Schlagwörter in deiner Seitenleiste"
           configure_defaults: "Standardeinstellungen konfigurieren"
         categories:
-          links:
-            add_categories:
-              content: "Kategorien hinzufügen"
-              title: "Du hast noch keine Kategorien hinzugefügt. Klicke, um loszulegen."
           none: "Du hast keine Kategorien hinzugefügt."
           click_to_get_started: "Klicke hier, um zu beginnen."
           header_link_text: "Kategorien"
           header_action_title: "Bearbeite die Kategorien in deiner Seitenleiste"
           configure_defaults: "Standardeinstellungen konfigurieren"
         community:
-          header_link_text: "Community"
-          header_action_title: "Thema erstellen"
+          edit_section:
+            sidebar: "Diesen Abschnitt anpassen"
+            header_dropdown: "Anpassen"
           links:
             about:
               content: "Über uns"
@@ -4054,8 +4160,8 @@ de:
             badges:
               content: "Abzeichen"
               title: "Alle Abzeichen, die es zu verdienen gibt"
-            everything:
-              content: "Alles"
+            topics:
+              content: "Themen"
               title: "Alle Themen"
             faq:
               content: "FAQ"
@@ -4068,6 +4174,7 @@ de:
               title: "Liste aller Benutzer"
             my_posts:
               content: "Meine Beiträge"
+              content_drafts: "Meine Entwürfe"
               title: "Meine aktuelle Themenaktivität"
               title_drafts: "Meine nicht geposteten Entwürfe"
               draft_count:
@@ -4077,11 +4184,43 @@ de:
               content: "Überprüfen"
               title: "Gemeldete Beiträge und andere Elemente in der Warteschlange"
               pending_count: "%{count} ausstehend"
+        global_section: "Globaler Bereich, für alle sichtbar"
+      panels:
+        forum:
+          label: Forum
     welcome_topic_banner:
       title: "Erstelle dein Willkommensthema"
       description: "Dein Willkommen-Thema ist das erste, was neue Mitglieder lesen. Betrachte es als dein „Fahrstuhl-Vorstellungsgespräch“ oder „Leitbild“. Hier erfährt jeder, für wen diese Community gedacht ist, was einen hier erwartet und was man direkt zu Beginn tun soll."
       button_title: "Bearbeitung beginnen"
     until: "Bis:"
+    char_counter:
+      exceeded: "Die maximal zulässige Anzahl von Zeichen wurde überschritten."
+    form_template_chooser:
+      select_template: "Formularvorlagen auswählen"
+    form_templates:
+      errors:
+        valueMissing:
+          default: "Bitte fülle dieses Feld aus."
+          text: "Bitte fülle dieses Feld aus."
+          select-one: "Bitte wähle ein Element aus der Liste aus."
+          select-multiple: "Bitte wähle mindestens ein Element aus der Liste aus."
+          checkbox: "Bitte markiere dieses Feld, wenn du fortfahren möchtest."
+        typeMismatch:
+          default: "Bitte gib einen gültigen Wert ein."
+          color: "Bitte gib eine Farbe ein."
+          date: "Bitte gib ein Datum ein."
+          email: "Bitte gib eine gültige E-Mail-Adresse ein."
+          number: "Bitte gib eine Zahl ein."
+          password: "Bitte gib ein gültiges Passwort ein."
+          tel: "Bitte gib eine gültige Telefonnummer ein."
+          text: "Bitte gib einen Textwert ein."
+          url: "Bitte gib eine gültige URL ein."
+        tooShort: "Die Eingabe muss %{minLength} Zeichen oder länger sein."
+        tooLong: "Die Eingabe muss weniger als %{maxLength} Zeichen umfassen."
+        rangeOverflow: "Der Eingang muss kleiner als %{max} sein."
+        rangeUnderflow: "Die Eingabe muss mehr als %{min} betragen."
+        patternMismatch: "Bitte beachte das gewünschte Format."
+        badInput: "Bitte gib eine gültige Eingabe ein."
   admin_js:
     type_to_filter: "zum Filtern hier eingeben …"
     admin:
@@ -4240,10 +4379,14 @@ de:
         about: "Hier kannst du Gruppenzugehörigkeiten und Gruppennamen bearbeiten."
         group_members: "Gruppenmitglieder"
         delete: "Löschen"
-        delete_confirm: "Bist du sicher, dass du diese Gruppe löschen willst?"
+        delete_confirm: "Möchtest du wirklich %{group} löschen?"
+        delete_details:
+          one: "%{count} Person wird den Zugang zu dieser Gruppe verlieren"
+          other: "%{count} Personen werden den Zugang zu dieser Gruppe verlieren"
         delete_with_messages_confirm:
-          one: "Wenn du diese Gruppe löschst, wird %{count} Nachricht verwaist sein, die Gruppenmitglieder haben keinen Zugriff mehr darauf."
-          other: "Wenn du diese Gruppe löschst, werden %{count} Nachrichten verwaist sein, die Gruppenmitglieder haben keinen Zugriff mehr darauf."
+          one: "%{count} Nachricht wird für Gruppenmitglieder unzugänglich"
+          other: "%{count} Nachrichten werden für Gruppenmitglieder unzugänglich"
+        delete_warning: "Gelöschte Gruppen können nicht wiederhergestellt werden"
         delete_failed: "Gruppe konnte nicht gelöscht werden. Wenn dies eine automatische Gruppe ist, kann sie nicht gelöscht werden."
         delete_automatic_group: Dies ist eine automatische Gruppe und sie kann nicht gelöscht werden.
         delete_owner_confirm: "Eigentümerrechte für „%{username}“ entfernen?"
@@ -4309,10 +4452,16 @@ de:
             topics:
               read: Lies ein Thema oder einen bestimmten Beitrag darin. RSS wird ebenfalls unterstützt.
               write: Erstelle ein neues Thema oder schreibe einen Beitrag zu einem bestehenden.
-              update: Aktualisiere ein Thema. Ändere den Titel, die Kategorie, Schlagwörter usw.
+              update: Aktualisiere ein Thema. Ändere den Titel, die Kategorie, die Tags, den Status, den Archetyp, den featured_link usw.
+              delete: Ein Thema löschen.
               read_lists: Lies Themenlisten wie „Angesagt“, „Neu“, „Aktuell“ usw. RSS wird ebenfalls unterstützt.
+              status: "Aktualisiere den Status eines Themas. Status: geschlossen, archiviert, sichtbar, angeheftet. Aktiviert: true, false. Gib hier und im Request Payload eine category_id an, um Statusänderungen nur für Themen dieser Kategorie zuzulassen."
             posts:
               edit: Bearbeite jeden Beitrag oder einen bestimmten.
+              delete: Einen Beitrag löschen.
+              list: Listet die neuesten Beiträge und privaten Beiträge auf. RSS wird ebenfalls unterstützt.
+            tags:
+              list: Tags auflisten.
             categories:
               list: Eine Liste der Kategorien abrufen.
               show: Eine einzelne Kategorie nach ID abrufen.
@@ -4326,6 +4475,7 @@ de:
               update: Benutzerprofil-Informationen aktualisieren.
               log_out: Alle Sitzungen für einen Benutzer abmelden.
               anonymize: Benutzerkonten anonymisieren.
+              suspend: Benutzerkonten sperren.
               delete: Benutzerkonten löschen.
               list: Benutzerliste abrufen.
             user_status:
@@ -4333,6 +4483,8 @@ de:
               update: Benutzerstatus aktualisieren.
             email:
               receive_emails: Kombiniere diesen Bereich mit dem E-Mail-Empfänger, um eingehende E-Mails zu verarbeiten.
+            invites:
+              create: Versende Einladungen per E-Mail oder generiere Einladungslinks.
             badges:
               create: Ein neues Abzeichen erstellen.
               show: Informationen über ein Abzeichen abrufen.
@@ -4341,6 +4493,12 @@ de:
               list_user_badges: Abzeichen eines Benutzers auflisten.
               assign_badge_to_user: Einem Benutzer ein Abzeichen zuweisen.
               revoke_badge_from_user: Einem Benutzer ein Abzeichen entziehen.
+            groups:
+              manage_groups: Gruppenmitglieder auflisten, hinzufügen und entfernen.
+              administer_groups: Gruppen auflisten, anzeigen, erstellen, aktualisieren und löschen.
+            search:
+              show: Suche mit dem Endpunkt `/search.json?q=term`.
+              query: Suche mit dem Endpunkt `/search/query?term=term`.
             wordpress:
               publishing: Erforderlich für die Veröffentlichungsfunktionen des WP-Discourse-Plug-ins (erforderlich).
               commenting: Erforderlich für die Kommentarfunktionen des WP-Discourse-Plug-ins.
@@ -4407,8 +4565,8 @@ de:
           name: "Benutzer-Beförderungs-Ereignis"
           details: "Wenn ein Benutzer von einer Vertrauensstufe zur nächsten befördert wird."
         user_badge_event:
-          name: "Abzeichen-Verleihungs-Ereignis"
-          details: "Wenn ein Benutzer ein Abzeichen erhält."
+          name: "Abzeichen-Ereignis"
+          details: "Wenn ein Abzeichen erteilt oder widerrufen wird."
         group_user_event:
           name: "Gruppenbenutzer-Ereignis"
           details: "Wenn ein Benutzer in einer Gruppe hinzugefügt oder entfernt wird."
@@ -4451,7 +4609,7 @@ de:
         enabled: "Aktiviert?"
         is_enabled: "J"
         not_enabled: "N"
-        change_settings: "Einstellungen ändern"
+        change_settings: "Plugin-Einstellungen"
         change_settings_short: "Einstellungen"
         howto: "Wie installiere ich Plug-ins?"
         official: "Offizielles Plug-in"
@@ -4705,6 +4863,9 @@ de:
           embedded_scss:
             text: "Eingebettetes CSS"
             title: "Gib benutzerdefiniertes CSS ein, das mit eingebetteten Versionen von Kommentaren übermittelt wird"
+          embedded_header:
+            text: "Eingebettete Kopfzeile"
+            title: "HTML eingeben, das über der eingebetteten Version der Kommentare angezeigt wird"
           color_definitions:
             text: "Farbdefinitionen"
             title: "Benutzerdefinierte Farbdefinitionen eingeben (nur für fortgeschrittene Benutzer)"
@@ -4783,6 +4944,12 @@ de:
           love:
             name: "Liebe"
             description: "Die Farbe der „Gefällt mir“-Schaltfläche."
+          selected:
+            name: "ausgewählt"
+            description: "Die Hintergrundfarbe von Elementen wie Listeneinträgen, wenn sie ausgewählt/aktiv sind."
+          hover:
+            name: "schweben"
+            description: "Die Hintergrundfarbe von Elementen wie Listeneinträgen, wenn sie mit dem Mauszeiger bewegt werden oder den Tastaturfokus haben."
         robots:
           title: "Überschreibe die robots.txt-Datei deiner Website:"
           warning: "Dies wird sämtliche zugehörigen Website-Einstellungen dauerhaft überschreiben."
@@ -4913,6 +5080,7 @@ de:
           no_previous: "Es gibt keinen vorherigen Wert."
           deleted: "Kein neuer Wert. Der Eintrag wurde gelöscht."
           actions:
+            permanently_delete_post_revisions: "Beitragsrevisionen dauerhaft löschen"
             delete_user: "Benutzer löschen"
             change_trust_level: "Vertrauensstufe ändern"
             change_username: "Benutzernamen ändern"
@@ -4946,6 +5114,7 @@ de:
             revoke_moderation: "Moderationsrechte entziehen"
             backup_create: "Backup erstellen"
             deleted_tag: "Schlagwort gelöscht"
+            update_directory_columns: "Verzeichnisspalten aktualisieren"
             deleted_unused_tags: "nicht verwendete Schlagwörter gelöscht"
             renamed_tag: "Schlagwort umbenannt"
             revoke_email: "E-Mail widerrufen"
@@ -5004,6 +5173,10 @@ de:
             delete_group: "Gruppe löschen"
             watched_word_create: "beobachtetes Wort hinzufügen"
             watched_word_destroy: "beobachtetes Wort löschen"
+            create_public_sidebar_section: "Öffentlichen Seitenleistenbereich erstellen"
+            update_public_sidebar_section: "Öffentlichen Seitenleistenbereich aktualisieren"
+            destroy_public_sidebar_section: "Öffentlichen Seitenleistenbereich zerstören"
+            reset_bounce_score: "Bounce-Score zurücksetzen"
         screened_emails:
           title: "Gefilterte E-Mails"
           description: "Wenn jemand ein Konto erstellt, werden die folgenden E-Mail-Adressen überprüft und es wird die Registrierung blockiert oder eine andere Aktion ausgeführt."
@@ -5067,14 +5240,14 @@ de:
           silence: "Stummschalten"
           link: "Link"
         action_descriptions:
-          block: "Verhindert, dass Beiträge mit diesen Wörtern abgeschickt werden. Benutzer werden eine Fehlermeldung sehen, wenn sie ihren Beitrag abschicken."
-          censor: "Erlaube Beiträge mit diesen Wörtern, aber ersetze sie mit Zeichen, die die zensierten Wörter verstecken."
-          require_approval: "Beiträge mit diesen Wörtern werden eine Genehmigung vom Team erfordern, bevor sie sichtbar sind."
-          flag: "Erlaube Beiträge mit diesen Wörtern, aber markiere sie als unangemessen, damit Moderatoren sie überprüfen können."
-          replace: "Wörter in Beiträgen durch andere Wörter ersetzen"
-          tag: "Themen basierend auf dem ersten Beitrag automatisch mit Schlagwort versehen"
-          silence: "Erste Beiträge von Benutzern, die diese Wörter enthalten, müssen vom Team genehmigt werden, bevor sie gesehen werden können, und der Benutzer wird automatisch stummgeschaltet."
-          link: "Wörter in Beiträgen durch Links ersetzen"
+          block: "Beim Versuch, einen Beitrag zu erstellen, der diese Wörter enthält, wird eine Fehlermeldung angezeigt werden."
+          censor: "Erlaube Beiträge, die diese Wörter enthalten, aber ersetze sie durch Zeichen, die die zensierten Wörter verbergen."
+          require_approval: "Erfordere die Genehmigung der Mitarbeiter/innen für Beiträge, die diese Wörter enthalten, bevor sie für andere sichtbar sind."
+          flag: "Erlaube Beiträge, die diese Wörter enthalten, kennzeichne sie jedoch als unangemessen für die Überprüfung durch Moderatoren."
+          replace: "Wörter in Beiträgen durch andere Wörter ersetzen."
+          tag: "Themen automatisch markieren, wenn der erste Beitrag ein bestimmtes Wort enthält."
+          silence: "Bringe neue Konten zum Schweigen, wenn ihr allererster Beitrag eines dieser Wörter enthält. Der Beitrag wird automatisch ausgeblendet, bis Mitarbeiter ihn freigeben."
+          link: "Wörter in Beiträgen durch Links ersetzen."
         form:
           label: "Hat Wort oder Wortgruppe"
           placeholder: "Wort oder Ausdruck eingeben (* ist ein Platzhalter)"
@@ -5097,6 +5270,88 @@ de:
           description: "Füge unten Text ein, um auf Übereinstimmungen mit beobachteten Wörtern zu prüfen"
           found_matches: "Gefundene Übereinstimmungen:"
           no_matches: "Keine Übereinstimmungen gefunden"
+      form_templates:
+        nav_title: "Vorlagen"
+        title: "Formularvorlagen"
+        help: "Erstelle eine Vorlagenstruktur, mit der du neue Themen, Beiträge und Nachrichten erstellen kannst."
+        new_template: "Neue Vorlage"
+        list_table:
+          headings:
+            name: "Name"
+            active_categories: "Aktive Kategorien"
+            actions: "Aktionen"
+          actions:
+            view: "Vorlage ansehen"
+            edit: "Vorlage bearbeiten"
+            delete: "Vorlage löschen"
+        view_template:
+          close: "Beenden"
+          edit: "Bearbeiten"
+          delete: "Löschen"
+          toggle_preview: "Vorschau umschalten"
+        new_template_form:
+          submit: "Speichern"
+          cancel: "Abbrechen"
+          name:
+            label: "Vorlagenname"
+            placeholder: "Gib einen Namen für diese Vorlage ein..."
+          template:
+            label: "Vorlage"
+            placeholder: "Erstelle hier eine YAML-Vorlage..."
+          preview: "Vorschau"
+        delete_confirm: "Bist du sicher, dass du diese Vorlage löschen möchtest?"
+        quick_insert_fields:
+          add_new_field: "Hinzufügen"
+          checkbox: "Kontrollkästchen"
+          input: "Kurze Antwort"
+          textarea: "Lange Antwort"
+          dropdown: "Drop-down-Liste"
+          upload: "Eine Datei hochladen"
+          multiselect: "Mehrfachauswahl"
+        validations_modal:
+          button_title: "Validierungen"
+          modal_title: "Validierungsoptionen"
+          table_headers:
+            key: "Schlüssel"
+            type: "Art"
+            description: "Beschreibung"
+          validations:
+            required:
+              key: "erforderlich"
+              type: "Boolescher Wert"
+              description: "Das Feld muss ausgefüllt werden, um das Formular abzuschicken."
+            minimum:
+              key: "Minimum"
+              type: "Ganzzahl"
+              description: "Legt für Textfelder die zulässige Mindestanzahl von Zeichen fest."
+            maximum:
+              key: "Maximum"
+              type: "Ganzzahl"
+              description: "Legt für Textfelder die zulässige Höchstanzahl von Zeichen fest."
+            pattern:
+              key: "Muster"
+              type: "Regex-Zeichenfolge"
+              description: "Ein regulärer Ausdruck für Textfelder, der die zulässige Eingabe beschreibt."
+            type:
+              key: "Art"
+              type: "Zeichenfolge"
+              description: "Für Eingabefelder kannst du die Art der Eingabe angeben, die erwartet wird (text|email|date|number|url|tel|color)"
+        preview_modal:
+          title: "Vorschau der Vorlage"
+        field_placeholders:
+          validations: "Validierungen hier eingeben"
+          label: "Bezeichnung hier eingeben"
+          placeholder: "Platzhalter hier eingeben"
+          none_label: "Wähle ein Element aus"
+          choices:
+            first: "Option 1"
+            second: "Option 2"
+            third: "Option 3"
+        edit_category:
+          toggle_freeform: "Formularvorlage deaktiviert"
+          toggle_form_template: "Formularvorlage aktiviert"
+          select_template: "Formularvorlagen auswählen"
+          select_template_help: "Formularvorlagen hinzufügen/bearbeiten"
       impersonate:
         title: "Nutzersicht"
         help: "Benutze dieses Werkzeug, um zur Fehlersuche in die Rolle eines anderen Benutzers zu schlüpfen. Du musst dich abmelden, wenn du fertig bist."
@@ -5109,6 +5364,7 @@ de:
         not_found: "Entschuldige, dieser Benutzername ist im System nicht vorhanden."
         id_not_found: "Entschuldige, diese Benutzerkennung ist im System nicht vorhanden."
         active: "Aktiviert"
+        status: "Status"
         show_emails: "E-Mails anzeigen"
         hide_emails: "E-Mails ausblenden"
         nav:
@@ -5197,7 +5453,6 @@ de:
         show_admin_profile: "Administration"
         manage_user: "Benutzer verwalten"
         show_public_profile: "Zeige öffentliches Profil"
-        impersonate: "Nutzersicht"
         action_logs: "Aktionsprotokolle"
         ip_lookup: "IP-Abfrage"
         log_out: "Abmelden"
@@ -5433,8 +5688,16 @@ de:
         go_back: "Zurück zur Suche"
         recommended: "Wir empfehlen, dass du den folgenden Text an deine Bedürfnisse anpasst:"
         show_overriden: "Nur geänderte Texte anzeigen"
+        show_outdated: "Nur veraltete/ungültige Elemente anzeigen"
         locale: "Sprache:"
         more_than_50_results: "Es gibt mehr als 50 Ergebnisse. Bitte grenze deine Suche weiter ein."
+        interpolation_keys: "Verfügbare Variablennamen:"
+        outdated:
+          title: "Diese Übersetzung ist veraltet"
+          description: "Die Standardübersetzung für diesen Schlüssel hat sich geändert, seit diese Überschreibung erstellt wurde. Bitte überprüfe unten, ob deine Übersetzung mit den Änderungen übereinstimmt, die an der ursprünglichen Aussage vorgenommen wurden."
+          old_default: "Alter Standard"
+          new_default: "Neuer Standard"
+          dismiss: "Verwerfen"
       settings:
         show_overriden: "Nur geänderte Texte anzeigen"
         history: "Änderungsverlauf ansehen"
@@ -5447,7 +5710,9 @@ de:
             label: "Emoji hinzufügen"
         title: "Einstellungen"
         no_results: "Keine Ergebnisse gefunden."
-        more_than_30_results: "Es gibt mehr als 30 Ergebnisse. Bitte grenze deine Suche weiter ein oder wähle eine Kategorie aus."
+        more_site_setting_results:
+          one: "Es gibt mehr als %{count} Ergebnis. Bitte verfeinere deine Suche oder wähle eine Kategorie."
+          other: "Es gibt mehr als %{count} Ergebnisse. Bitte verfeinere deine Suche oder wähle eine Kategorie."
         clear_filter: "Filter zurücksetzen"
         add_url: "URL hinzufügen"
         add_host: "Host hinzufügen"
@@ -5534,7 +5799,8 @@ de:
         allow_title: Abzeichen darf als Titel verwendet werden
         multiple_grant: Kann mehrfach verliehen werden
         listable: Zeige Abzeichen auf der öffentlichen Abzeichenseite an
-        enabled: Abzeichen aktivieren
+        enabled: aktiviert
+        disabled: deaktiviert
         icon: Symbol
         image: Bild
         graphic: Grafik
@@ -5604,10 +5870,14 @@ de:
       embedding:
         get_started: "Wenn du Discourse in einer anderen Website einbetten möchtest, beginne mit dem Hinzufügen des Hosts."
         confirm_delete: "Möchtest du wirklich diesen Host löschen?"
-        sample: "Verwende den folgenden HTML-Code auf deiner Website, um Discourse-Themen zu erstellen und einzubetten. Ersetze <b>REPLACE_ME</b> mit der URL der Seite, auf der du den Inhalt einbettest."
+        sample: |
+          <p>Füge den folgenden HTML-Code in deiner Website ein, um Themen in Discourse zu erstellen und diese daraus einzubetten. Ersetze <b>EMBED_URL</b> durch die kanonische URL der Seite, auf der du sie einbettest.</p>
+
+          <p>Wenn du den Stil anpassen möchtest, dann entferne das Kommentarzeichen und ersetze <b>CLASS_NAME</b> durch eine CSS-Klasse, die in <i>Embedded CSS</i> deines Designs definiert ist.</p>
+
+          <p>Ersetze <b>DISCOURSE_USERNAME</b> durch den Discourse-Benutzernamen des Autors, der das Thema erstellen soll. Discourse sucht den Benutzer automatisch anhand des <code>content</code>-Attributes in den <code>&lt;meta&gt;</code>-Schlagwörtern, wenn das Attribut <code>name</code> den Wert <code>discourse-username</code> oder <code>author</code> hat. Der Parameter <code>discourseUserName</code> ist veraltet und wird in Discourse 3.2 entfernt.</p>
         title: "Einbettung"
         host: "Erlaubte Hosts"
-        class_name: "Klassenname"
         allowed_paths: "Pfad-Positivliste"
         edit: "bearbeiten"
         category: "In Kategorie posten"
diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml
index 47dd64ca1e4..39a053ea796 100644
--- a/config/locales/client.el.yml
+++ b/config/locales/client.el.yml
@@ -164,9 +164,6 @@ el:
     software_update_prompt:
       message: "Ενημερώσαμε αυτόν τον ιστότοπο, <span>παρακαλώ ανανεώστε</span>, διαφορετικά ενδέχεται να αντιμετωπίσετε απροσδόκητη συμπεριφορά."
       dismiss: "Απόρριψη"
-    bootstrap_mode_disabled: "Η λειτουργία bootstrap θα απενεργοποιηθεί εντός 24 ωρών."
-    bootstrap_invite_button_title: "Αποστολή Προσκλήσεων"
-    bootstrap_wizard_link_title: "Ολοκλήρωση του οδηγού εγκατάστασης"
     themes:
       default_description: "Προεπιλογή"
     s3:
@@ -274,11 +271,8 @@ el:
       edit_bookmark: "Επεξεργασία Σελιδοδείκτη"
       clear_bookmarks: "Καθαρισμός σελιδοδεικτών"
       help:
-        bookmark: "Πάτήστε εδώ για να μπει σελιδοδείκτης στην πρώτη ανάρτηση του θέματος."
-        edit_bookmark: "Κάντε κλικ για να επεξεργαστείτε τον σελιδοδείκτη σε αυτό το θέμα"
         edit_bookmark_for_topic: "Κάντε κλικ για να επεξεργαστείτε τον σελιδοδείκτη για αυτό το θέμα"
         unbookmark: "Πατήστε εδώ για να αφαιρεθούν όλοι οι σελιδοδείκτες από αυτό το θέμα."
-        unbookmark_with_reminder: "Κάντε κλικ για να αφαιρέσετε όλους τους σελιδοδείκτες και τις υπενθυμίσεις σε αυτό το θέμα."
     bookmarks:
       created: "Έχετε προσθέσει σελιδοδείκτη σε αυτήν την ανάρτηση. %{name}"
       created_generic: "Το έχετε βάλει σε σελιδοδείκτη. %{name}"
@@ -322,7 +316,6 @@ el:
       new_topic: "Νέο προσχέδιο θέματος"
       new_private_message: "Νέο πρόχειρο προσωπικό μήνυμα"
       abandon:
-        confirm: "Έχετε ένα πρόχειρο σε εξέλιξη για αυτό το θέμα. Τι θα θέλατε να κάνετε με αυτό;"
         yes_value: "Απόρριψη"
         no_value: "Συνέχιση επεξεργασίας"
     topic_count_categories:
@@ -491,11 +484,9 @@ el:
       scores:
         about: "Αυτή η βαθμολογία υπολογίζεται με βάση το επίπεδο εμπιστοσύνης του αναφέροντα, την ακρίβεια των προηγούμενων αναφορών του και την προτεραιότητα του αντικειμένου που αναφέρεται."
         score: "Βαθμολογία"
-        date: "Ημερομηνία"
-        type: "Τύπος"
+        type: "Αιτία"
         status: "Κατάσταση"
-        submitted_by: "Υποβλήθηκε από"
-        reviewed_by: "Αναθεωρήθηκε από"
+        submitted_by: "Αναφέρθηκε από"
       statuses:
         pending:
           title: "Εκκρεμή"
@@ -503,14 +494,12 @@ el:
           title: "Εγκρίθηκε "
         rejected:
           title: "Απορρίφθηκε"
-        ignored:
-          title: "Αγνοήθηκε "
-        deleted:
-          title: "Διαγράφηκε"
         reviewed:
-          title: "(όλα αναθεωρημένα)"
+          title: "Όλα αναθεωρημένα"
         all:
-          title: "(τα πάντα)"
+          title: "Τα πάνΤα"
+      context_question:
+        delimiter: "ή"
       types:
         reviewable_flagged_post:
           title: "Επισημασμένη ανάρτηση"
@@ -778,6 +767,7 @@ el:
         remove_owner_description: "Αφαίρεση του/της <b>%{username}</b> ως κατόχου αυτής της ομάδας"
         remove_members: "Αφαίρεση Μελών"
         remove_owners: "Αφαίρεση Κατόχων"
+        status: "Κατάσταση"
         owner: "Ιδιοκτήτης"
         forbidden: "Δε σας επιτρέπεται να δείτε τα μέλη."
       topics: "Θέματα"
@@ -894,10 +884,11 @@ el:
       mute: "Σίγαση"
       edit: "Επεξεργασία Ρυθμίσεων"
       download_archive:
-        button_text: "Λήψη Όλων"
-        confirm: "Είσαι σίγουρος πως θέλεις να κάνεις λήψη των αναρτήσεών σου;"
-        success: "Ξεκίνησε η διαδικασία λήψης. Θα ειδοποιηθείτε μόλις ολοκληρωθεί η διαδικασία."
-        rate_limit_error: "Μπορείς να κάνεις λήψη των αναρτήσεών σου μια φορά την ημέρα, προσπάθησε ξανά αύριο."
+        title: "Εξαγωγή των δεδομένων σας"
+        description: "Κατεβάστε ένα αρχείο της δραστηριότητας και των προτιμήσεων του λογαριασμού σας."
+        button_text: "Αίτημα λήψης αρχείου"
+        confirm: "Θέλετε πραγματικά να κατεβάσετε ένα αρχείο της δραστηριότητας και των προτιμήσεων του λογαριασμού σας?"
+        success: "Ξεκινήσαμε τη συλλογή του αρχείου σας, θα λάβετε ένα μήνυμα όταν ολοκληρωθεί η διαδικασία."
       new_private_message: "Νέο Μήνυμα"
       private_message: "Μήνυμα"
       private_messages: "Μηνύματα"
@@ -968,7 +959,7 @@ el:
         perm_denied_expl: "Απορρίψατε την άδεια για ειδοποιήσεις. Επιτρέψτε τις ειδοποιήσεις μέσω των ρυθμίσεων του browser σας."
         disable: "Απενεργοποίηση Ειδοποιήσεων"
         enable: "Ενεργοποίηση Ειδοποιήσεων"
-        each_browser_note: 'Σημείωση: Πρέπει να αλλάξετε αυτή τη ρύθμιση σε κάθε πρόγραμμα περιήγησης που χρησιμοποιείτε. Όλες οι ειδοποιήσεις θα απενεργοποιηθούν αν διακόψετε τις ειδοποιήσεις από το μενού του χρήστη, ανεξάρτητα από αυτή τη ρύθμιση.'
+        each_browser_note: "Σημείωση: Πρέπει να αλλάξετε αυτή τη ρύθμιση σε κάθε πρόγραμμα περιήγησης που χρησιμοποιείτε. Όλες οι ειδοποιήσεις θα απενεργοποιηθούν αν διακόψετε τις ειδοποιήσεις από το μενού του χρήστη, ανεξάρτητα από αυτή τη ρύθμιση."
         consent_prompt: "Θέλετε ζωντανές ειδοποιήσεις όταν οι χρήστες απαντούν στις αναρτήσεις σας;"
       dismiss: "Απόρριψη"
       dismiss_notifications: "Απόρριψη Όλων"
@@ -1000,8 +991,6 @@ el:
       experimental_sidebar:
         enable: "Ενεργοποίηση πλαϊνής γραμμής"
         options: "Επιλογές"
-        categories_section: "Ενότητα Κατηγοριών"
-        tags_section: "Ενότητα Ετικετών"
         navigation_section: "Πλοήγηση"
       change: "αλλαγή"
       featured_topic: "Επιλεγμένο θέμα"
@@ -1074,13 +1063,6 @@ el:
       save_to_change_theme: 'Το θέμα θα ενημερωθεί αφού κάνετε κλικ στο "%{save_text}"'
       home: "Προεπιλεγμένη Αρχική Σελίδα"
       staged: "Υπό μετάβαση"
-      staff_counters:
-        flags_given: "χρήσιμες σημάνσεις"
-        flagged_posts: "επισημασμένες αναρτήσεις"
-        deleted_posts: "διαγραμμένες αναρτήσεις"
-        suspensions: "αποβολές"
-        warnings_received: "προειδοποιήσεις"
-        rejected_posts: "απορριφθείσες αναρτήσεις"
       messages:
         inbox: "Εισερχόμενα"
         latest: "Πρόσφατες"
@@ -1125,8 +1107,6 @@ el:
       second_factor_backup:
         regenerate: "Αναδημιουγία"
         disable: "Απενεργοποίηση"
-        enable: "Ενεργοποίηση"
-        enable_long: "Ενεργοποίηση εφεδρικών κωδικών"
         copy_to_clipboard: "Αντιγραφή στο Clipboard"
         copy_to_clipboard_error: "Σφάλμα αντιγραφής δεδομένων στο Clipboard"
         copied_to_clipboard: "Αντιγράφτηκε στο Clipboard"
@@ -1551,11 +1531,9 @@ el:
       hide_forever: "όχι ευχαριστώ"
       intro: "Γεια! Φαίνεται ότι απολαμβάνεις τη συζήτηση, αλλά δεν έχεις εγγραφεί ακόμα για λογαριασμό."
     summary:
-      enabled_description: "Βλέπεις μια περίληψη αυτού του νήματος: οι πιο ενδιαφέρουσες αναρτήσεις, όπως αυτές καθορίστηκαν από την κοινότητα."
       description:
         one: "Υπάρχει <b>%{count}</b> απάντηση."
         other: "Υπάρχουν <b>%{count}</b> απαντήσεις."
-      enable: "Σύνοψη Αυτού του Θέματος"
       disable: "Εμφάνιση όλων των αναρτήσεων"
     deleted_filter:
       enabled_description: "Αυτό το νήμα περιέχει σβησμένες αναρτήσεις, οι οποίες αποκρύπτονται."
@@ -1808,8 +1786,6 @@ el:
         topic_template_not_modified: "Παρακαλώ προσθέστε λεπτομέρειες στο θέμα σας με την επεξεργασία του προτύπου θέματος."
       save_edit: "Αποθήκευση Επεξεργασίας"
       overwrite_edit: "Αντικατάσταση επεξεργασίας"
-      reply_original: "Απάντηση στο αρχικό νήμα"
-      reply_here: "Απάντησε Εδώ"
       reply: "Απάντηση"
       cancel: "Ακύρωση"
       create_topic: "Δημιουργία Θέματος"
@@ -2224,8 +2200,6 @@ el:
       show_links: "εμφάνιση συνδέσμων εντός του θέματος"
       unread_indicator: "Κανένα μέλος δεν έχει διαβάσει ακόμη την τελευταία ανάρτηση αυτού του θέματος."
       browse_all_tags_or_latest: "<a href='%{basePath}/tags'>Περιηγηθείτε σε όλες τις ετικέτες</a> ή <a href='%{basePath}/latest'>δείτε τα τελευταία θέματα</a>."
-      jump_reply_up: μετάβαση στην απάντηση που προηγείται
-      jump_reply_down: μετάβαση στην απάντηση που ακολουθεί
       deleted: "Το θέμα έχει διαγραφεί"
       slow_mode_update:
         enable: "Ενεργοποίηση"
@@ -2738,7 +2712,6 @@ el:
       back: "Επιστροφή στην κατηγορία"
       general: "Γενικά"
       settings: "Ρυθμίσεις"
-      topic_template: "Πρότυπο Νήματος"
       tags: "Ετικέτες"
       tags_allowed_tags: "Περιορίστε αυτές τις ετικέτες σε αυτήν την κατηγορία:"
       tags_allowed_tag_groups: "Περιορίστε αυτές τις ομάδες ετικετών σε αυτήν την κατηγορία:"
@@ -2790,8 +2763,6 @@ el:
       images: "Εικόνες"
       email_in: "Προσαρμοσμένη διεύθυνση εισερχόμενων email:"
       email_in_allow_strangers: "Αποδοχή emails από ανώνυμους χρήστες χωρίς λογαριασμό"
-      email_in_disabled: "Η δημοσίευση νέων θεμάτων μέσω email είναι απενεργοποιημένη στις Ρυθμίσεις Ιστότοπου. Για να ενεργοποιήσετε την ανάρτηση νέων θεμάτων μέσω email, "
-      email_in_disabled_click: 'ενεργοποιήστε τη ρύθμιση "email in".'
       mailinglist_mirror: "Η κατηγορία αντικατοπτρίζει μια λίστα αλληλογραφίας"
       show_subcategory_list: "Προβολή λίστας υποκατηγοριών πάνω απο τα νήματα αυτής της κατηγορίας "
       read_only_banner: "Κείμενο banner όταν ένας χρήστης δε μπορεί να δημιουργήσει ένα θέμα σε αυτήν την κατηγορία:"
@@ -2976,6 +2947,10 @@ el:
     filters:
       with_topics: "%{filter} νήματα"
       with_category: "%{filter} %{category} νήματα"
+      filter:
+        title: "Φίλτρο"
+        button:
+          label: "Φίλτρο"
       latest:
         title: "Τελευταία"
         title_with_count:
@@ -3054,6 +3029,9 @@ el:
       close: "Κλείσιμο (Esc)"
       content_load_error: 'Δεν ήταν δυνατή η φόρτωση <a href="%url%">του περιεχομένου</a>.'
       image_load_error: 'Δεν ήταν δυνατή η φόρτωση <a href="%url%">της εικόνας</a>.'
+    experimental_lightbox:
+      buttons:
+        close: "Κλείσιμο (Esc)"
     cannot_render_video: Αυτό το βίντεο δεν μπορεί να αποδοθεί επειδή το πρόγραμμα περιήγησής σας δεν υποστηρίζει τον κωδικοποιητή.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
@@ -3143,7 +3121,6 @@ el:
         one: "Κέρδισε αυτό το παράσημο %{count} φορά"
         other: "Κέρδισε αυτό το παράσημο %{count} φορές"
       granted_on: "Χορηγήθηκε στις %{date}"
-      others_count: "Άλλοι με αυτό το παράσημο (%{count})"
       title: Παράσημα
       allow_title: "Μπορείς να χρησιμοποιήσεις αυτό το παράσημο σαν τίτλο"
       multiple_grant: "Μπορείς να το κερδίσεις πολλές φορές"
@@ -3299,13 +3276,11 @@ el:
     pause_notifications:
       title: "Παύση ειδοποιήσεων για..."
       label: "Παύση ειδοποιήσεων"
-      remaining: "%{remaining} απομένει"
       options:
         half_hour: "30 λεπτά"
         one_hour: "1 ώρα"
         two_hours: "2 ώρες"
         tomorrow: "Μέχρι αύριο"
-        custom: "Προσαρμοσμένο"
     trust_levels:
       names:
         newuser: "νέος χρήστης"
@@ -3329,7 +3304,21 @@ el:
       more: "Περισσότερα"
       all_categories: "Όλες οι κατηγορίες"
       all_tags: "Όλες οι ετικέτες"
+      edit_navigation_modal_form:
+        filter_dropdown:
+          all: "Όλα"
       sections:
+        custom:
+          save: "Αποθήκευση"
+          delete: "Σβήσιμο"
+          links:
+            reset: "Επαναφορά στο προεπιλεγμένο"
+            icon:
+              label: "Σύμβολο"
+            name:
+              label: "Πλήρες Όνομα"
+            value:
+              label: "Σύνδεσμος"
         about:
           header_link_text: "Σχετικά"
         messages:
@@ -3344,26 +3333,19 @@ el:
             unread_with_count: "Μη αναγνωσμένα (%{count})"
             archive: "Αρχείο"
         tags:
-          links:
-            add_tags:
-              content: "Προσθήκη ετικετών"
-              title: "Δεν έχετε προσθέσει καμία ετικέτα. Κάντε κλικ για να ξεκινήσετε."
           none: "Δεν έχετε προσθέσει ετικέτες."
           click_to_get_started: "Κάντε κλικ εδώ για να ξεκινήσετε."
           header_link_text: "Ετικέτες"
           header_action_title: "Επεξεργασία των ετικετών πλαϊνής γραμμής"
           configure_defaults: "Ρύθμιση προεπιλογών"
         categories:
-          links:
-            add_categories:
-              content: "Προσθέστε κατηγορίες"
           none: "Δεν έχετε προσθέσει καμία κατηγορία."
           click_to_get_started: "Κάντε κλικ εδώ για να ξεκινήσετε."
           header_link_text: "Κατηγορίες"
           configure_defaults: "Ρύθμιση προεπιλογών"
         community:
-          header_link_text: "Κοινότητα"
-          header_action_title: "Δημιουργήστε ένα θέμα"
+          edit_section:
+            header_dropdown: "Προσαρμογή"
           links:
             about:
               content: "Σχετικά"
@@ -3371,8 +3353,8 @@ el:
               content: "Διαχείριση"
             badges:
               content: "Παράσημα"
-            everything:
-              content: "Τα πάνΤα"
+            topics:
+              content: "Θέματα"
               title: "Όλα τα θέματα"
             faq:
               content: "Συχνές ερωτήσεις"
@@ -3389,6 +3371,11 @@ el:
       title: "Δημιουργήστε το θέμα καλωσορίσματος"
       button_title: "Έναρξη Επεξεργασίας"
     until: "Μέχρι:"
+    form_templates:
+      errors:
+        typeMismatch:
+          default: "Παρακαλώ εισάγετε μια έγκυρη αξία."
+          email: "Παρακαλώ δώσε μία έγκυρη διεύθυνση email."
   admin_js:
     type_to_filter: "γράψε εδώ για φιλτράρισμα..."
     admin:
@@ -3651,9 +3638,6 @@ el:
         notification_event:
           name: "Συμβάν ειδοποίησης"
           details: "Όταν ένας χρήστης λαμβάνει μια ειδοποίηση στη ροή του."
-        user_badge_event:
-          name: "Συμβάν απονομής σήματος"
-          details: "Όταν ένας χρήστης λαμβάνει ένα σήμα."
         delivery_status:
           title: "Κατάσταση διανομής"
           inactive: "Ανενεργό"
@@ -3690,7 +3674,6 @@ el:
         enabled: "Ενεργοποιημένο;"
         is_enabled: "Υ"
         not_enabled: "Ν"
-        change_settings: "Αλλαγή Ρυθμίσεων"
         change_settings_short: "Ρυθμίσεις"
         howto: "Πως εγκαθιστώ πρόσθετα;"
         official: "Επίσημο πρόσθετο"
@@ -3979,6 +3962,8 @@ el:
           love:
             name: "αγάπη"
             description: "Το χρώμα του κουμπιού «μου αρέσει»."
+          selected:
+            name: "επιλεγμένη"
         robots:
           title: "Παράκαμψη του αρχείου robots.txt του ιστότοπού σας:"
           warning: "Αυτό θα παρακάμψει οριστικά τυχόν σχετικές ρυθμίσεις ιστότοπου."
@@ -4247,11 +4232,6 @@ el:
           replace: "Αντικατάσταση"
           silence: "Σίγαση"
           link: "Σύνδεσμος"
-        action_descriptions:
-          block: "Αποτροπή της καταχώρησης αναρτήσεων που περιέχουν αυτές τις λέξεις. Ο χρήστης θα ενημερωθεί με μήνυμα λάθους όταν προσπαθήσει να καταχωρήσει την αναρτηση."
-          censor: "Επίτρεψε τις αναρτήσεις με αυτές τις λέξεις, αλλά αντικατέστησε τις λογοκριμένες λέξεις με άλλους χαρακτήρες."
-          require_approval: "Οι αναρτήσεις που περιέχουν αυτές τις λέξεις, χρειάζονται έγκριση από το προσωπικό πριν αναρτηθούν."
-          flag: "Επίτρεψε τις αναρτήσεις που περιέχουν αυτές τις λέξεις, αλλά επισήμανέ τες ως ανάρμοστες για έλεγχο από συντονιστή."
         form:
           placeholder_regexp: "regular expression"
           link_label: "Σύνδεσμος"
@@ -4266,6 +4246,35 @@ el:
           description: "Εισαγάγετε κείμενο παρακάτω για να ελέγξετε για αντιστοιχίες με τις παρακολουθούμενες λέξεις"
           found_matches: "Βρέθηκαν αντιστοιχίες:"
           no_matches: "Δεν βρέθηκαν αποτελέσματα"
+      form_templates:
+        nav_title: "Πρότυπα"
+        list_table:
+          headings:
+            name: "Όνομα"
+            actions: "Ενέργειες"
+        view_template:
+          close: "Κλείσιμο"
+          edit: "Επεξεργασία"
+          delete: "Σβήσιμο"
+        new_template_form:
+          submit: "Αποθήκευση"
+          cancel: "Ακύρωση"
+          preview: "Προεπισκόπηση"
+        quick_insert_fields:
+          add_new_field: "Προσθήκη"
+          dropdown: "Dropdown"
+        validations_modal:
+          table_headers:
+            key: "Κλειδί"
+            type: "Τύπος"
+            description: "Περιγραφή"
+          validations:
+            required:
+              key: "απαραίτητο"
+            minimum:
+              key: "ελάχιστο"
+            type:
+              key: "τύπος"
       impersonate:
         title: "Υποδυθείτε"
         help: "Χρησιμοποίησε αυτό το εργαλείο για να εντοπίσεις λάθη υποδυόμενος κάποιον άλλο χρήστη. Θα πρέπει να αποσυνδεθείς όταν τελειώσεις."
@@ -4278,6 +4287,7 @@ el:
         not_found: "Λυπούμαστε αλλά αυτό το όνομα χρήστη δεν υπάρχει στο σύστημα."
         id_not_found: "Λυπούμαστε αλλά αυτή η ταυτότητα χρήστη δεν υπάρχει στο σύστημα."
         active: "Ενεργοποιήθηκε"
+        status: "Κατάσταση"
         show_emails: "Προβολή Emails"
         hide_emails: "Απόκρυψη emails"
         nav:
@@ -4348,7 +4358,6 @@ el:
         staged: "Στάδιο Μετάβασης;"
         show_admin_profile: "Διαχείριση"
         show_public_profile: "Εμφάνισε το Δημόσιο Προφίλ"
-        impersonate: "Υποδυθείτε"
         action_logs: "Καταγραφές Ενεργειών"
         ip_lookup: "Αναζήτηση διεύθυνσης IP"
         log_out: "Αποσύνδεση"
@@ -4547,6 +4556,8 @@ el:
         recommended: "Σου προτείνουμε να προσαρμόσεις το ακόλουθο κείμενο στις ανάγκες σου:"
         show_overriden: "Δείξε μόνο αυτά που άλλαξαν"
         more_than_50_results: "Υπάρχουν περισσότερα από 50 αποτελέσματα. Κάντε πιο συγκεκριμένη την αναζήτησή σας."
+        outdated:
+          dismiss: "Απόρριψη"
       settings:
         show_overriden: "Δείξε μόνο αυτά που άλλαξαν"
         reset: "επαναφορά"
@@ -4554,7 +4565,6 @@ el:
       site_settings:
         title: "Ρυθμίσεις"
         no_results: "Δεν βρέθηκαν αποτελέσματα."
-        more_than_30_results: "Υπάρχουν περισσότερα από 30 αποτελέσματα. Κάντε πιο συγκεκριμένη την αναζήτησή σας ή επιλέξτε μια κατηγορία."
         clear_filter: "Καθάρισμα φίλτρου"
         add_url: "προσθήκη URL"
         add_host: "προσθήκη host"
@@ -4638,7 +4648,7 @@ el:
         allow_title: Το παράσημο μπορεί να χρησιμοποιηθεί σαν τίτλος
         multiple_grant: Μπορεί να απονεμηθεί πολλές φορές
         listable: Εμφάνιση του παράσημου στη δημόσια σελίδα παρασήμων
-        enabled: Ενεργοποίηση παράσημου
+        disabled: απενεργοποιημένα
         icon: Σύμβολο
         image: Εικόνα
         icon_help: "Εισαγάγετε ένα όνομα εικονιδίου FontAwesome (χρησιμοποιήστε το πρόθεμα «far-» για κανονικά εικονίδια και «fab-» για εικονίδια επωνυμίας)"
@@ -4699,7 +4709,6 @@ el:
         confirm_delete: "Είσαι βέβαιος πως θέλεις να διαγράψεις το host;"
         title: "Ενσωμάτωση"
         host: "Επιτρεπόμενα hosts"
-        class_name: "Class Name"
         allowed_paths: "Λίστα επιτρεπόμενων διαδρομών"
         edit: "επεξεργασία"
         category: "Ανάρτηση στην Κατηγορία"
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index a807ded6f47..0a3cb03adcc 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -161,6 +161,9 @@ en:
       email: "Send via email"
       url: "Copy and share URL"
 
+    word_connector:
+      comma: ", "
+
     action_codes:
       public_topic: "Made this topic public %{when}"
       open_topic: "Converted this to a topic %{when}"
@@ -172,6 +175,8 @@ en:
       removed_user: "Removed %{who} %{when}"
       removed_group: "Removed %{who} %{when}"
       autobumped: "Automatically bumped %{when}"
+      tags_changed: "Tags updated %{when}"
+      category_changed: "Category updated %{when}"
       autoclosed:
         enabled: "Closed %{when}"
         disabled: "Opened %{when}"
@@ -197,6 +202,7 @@ en:
 
     topic_admin_menu: "topic actions"
     skip_to_main_content: "Skip to main content"
+    skip_user_nav: "Skip to profile content"
 
     emails_are_disabled: "All outgoing email has been globally disabled by an administrator. No email notifications of any kind will be sent."
     emails_are_disabled_non_staff: "Outgoing email has been disabled for non-staff users."
@@ -205,12 +211,7 @@ en:
       message: "We've updated this site, <span>please refresh</span>, or you may experience unexpected behavior."
       dismiss: "Dismiss"
 
-    bootstrap_mode_enabled:
-      one: "To make launching your new site easier, you are in bootstrap mode. All new users will be granted trust level 1 and have daily email summary emails enabled. This will be automatically turned off when %{count} user has joined."
-      other: "To make launching your new site easier, you are in bootstrap mode. All new users will be granted trust level 1 and have daily email summary emails enabled. This will be automatically turned off when %{count} users have joined."
-    bootstrap_mode_disabled: "Bootstrap mode will be disabled within 24 hours."
-    bootstrap_invite_button_title: "Send Invites"
-    bootstrap_wizard_link_title: "Finish setup wizard"
+    bootstrap_mode: "Getting started"
 
     themes:
       default_description: "Default"
@@ -300,10 +301,12 @@ en:
 
     related_messages:
       title: "Related Messages"
+      pill: "Related Messages"
       see_all: 'See <a href="%{path}">all messages</a> from @%{username}...'
 
     suggested_topics:
-      title: "Suggested Topics"
+      title: "New & Unread Topics"
+      pill: "Suggested"
       pm_title: "Suggested Messages"
 
     about:
@@ -331,11 +334,11 @@ en:
       edit_bookmark: "Edit Bookmark"
       clear_bookmarks: "Clear Bookmarks"
       help:
-        bookmark: "Click to bookmark the first post on this topic"
-        edit_bookmark: "Click to edit the bookmark on this topic"
+        bookmark: "Click to bookmark this topic"
+        edit_bookmark: "Click to edit the bookmark on a post in this topic"
         edit_bookmark_for_topic: "Click to edit the bookmark for this topic"
         unbookmark: "Click to remove all bookmarks in this topic"
-        unbookmark_with_reminder: "Click to remove all bookmarks and reminders in this topic."
+        unbookmark_with_reminder: "Click to remove all bookmarks and reminders in this topic"
 
     bookmarks:
       created: "You've bookmarked this post. %{name}"
@@ -382,7 +385,7 @@ en:
       new_topic: "New topic draft"
       new_private_message: "New personal message draft"
       abandon:
-        confirm: "You have a draft in progress for this topic. What would you like to do with it?"
+        confirm: "You already have a draft in progress. What would you like to do with it?"
         yes_value: "Discard"
         no_value: "Resume editing"
 
@@ -452,6 +455,8 @@ en:
         placeholder: "type the message title, url or id here"
 
     review:
+      show_more: "Show more"
+      show_less: "Show less"
       order_by: "Order by"
       date_filter: "Posted between"
       in_reply_to: "in reply to"
@@ -577,27 +582,45 @@ en:
       scores:
         about: "This score is calculated based on the trust level of the reporter, the accuracy of their previous flags, and the priority of the item being reported."
         score: "Score"
-        date: "Date"
-        type: "Type"
+        date: "Report date"
+        type: "Reason"
         status: "Status"
-        submitted_by: "Submitted By"
-        reviewed_by: "Reviewed By"
+        submitted_by: "Reported by"
+        reviewed_by: "Reviewed by"
+        reviewed_timestamp: "Review date"
 
       statuses:
         pending:
           title: "Pending"
         approved:
           title: "Approved"
+        approved_flag:
+          title: "Flag approved"
+        approved_user:
+          title: "User approved"
+        approved_post:
+          title: "Post approved"
         rejected:
           title: "Rejected"
+        rejected_flag:
+          title: "Flag rejected"
+        rejected_user:
+          title: "User rejected"
+        rejected_post:
+          title: "Post rejected"
         ignored:
-          title: "Ignored"
+          title: "Flag ignored"
         deleted:
-          title: "Deleted"
+          title: "Topic or post deleted"
         reviewed:
-          title: "(all reviewed)"
+          title: "All reviewed"
         all:
-          title: "(everything)"
+          title: "Everything"
+
+      context_question:
+        is_this_post: "Is this post %{reviewable_human_score_types}?"
+        delimiter: "or"
+        something_else_wrong: "Is there something wrong with this post?"
 
       types:
         reviewable_flagged_post:
@@ -611,6 +634,8 @@ en:
           title: "User"
         reviewable_post:
           title: "Post"
+        reviewable_chat_message:
+          title: "Flagged chat message"
       approval:
         title: "Post Needs Approval"
         description: "We've received your new post but it needs to be approved by a moderator before it will appear. Please be patient."
@@ -913,6 +938,7 @@ en:
         make_all_primary_description: "Make this the primary group for all selected users"
         remove_all_primary: "Remove as Primary"
         remove_all_primary_description: "Remove this group as primary"
+        status: "Status"
         owner: "Owner"
         primary: "Primary"
         forbidden: "You're not allowed to view the members."
@@ -1046,10 +1072,12 @@ en:
       mute: "Mute"
       edit: "Edit Preferences"
       download_archive:
-        button_text: "Download All"
-        confirm: "Are you sure you want to download your posts?"
-        success: "Download initiated, you will be notified via message when the process is complete."
-        rate_limit_error: "Posts can be downloaded once per day, please try again tomorrow."
+        title: "Export your data"
+        description: "Download an archive of your account activity and preferences."
+        button_text: "Request archive"
+        confirm: "Do you really want to download an archive of your account activity and preferences?"
+        success: "We've started collecting your archive, you will receive a message when the process is complete."
+        rate_limit_error: "Account archives can be downloaded once per day, please try again tomorrow."
       new_private_message: "New Message"
       private_message: "Message"
       private_messages: "Messages"
@@ -1102,6 +1130,7 @@ en:
           warning: "Are you sure you want to clear your featured topic?"
       use_current_timezone: "Use Current Timezone"
       profile_hidden: "This user's public profile is hidden."
+      inactive_user: "This user is no longer active."
       expand_profile: "Expand"
       sr_expand_profile: "Expand profile details"
       collapse_profile: "Collapse"
@@ -1121,7 +1150,7 @@ en:
         perm_denied_expl: "You denied permission for notifications. Allow notifications via your browser settings."
         disable: "Disable Notifications"
         enable: "Enable Notifications"
-        each_browser_note: 'Note: You have to change this setting on every browser you use. All notifications will be disabled if you pause notifications from user menu, regardless of this setting.'
+        each_browser_note: "Note: You have to change this setting on every browser you use. All notifications will be disabled if you pause notifications from user menu, regardless of this setting."
         consent_prompt: "Do you want live notifications when people reply to your posts?"
       dismiss: "Dismiss"
       dismiss_notifications: "Dismiss All"
@@ -1179,14 +1208,10 @@ en:
       experimental_sidebar:
         enable: "Enable sidebar"
         options: "Options"
-        categories_section: "Categories Section"
-        categories_section_instruction: "Selected categories will be displayed under Sidebar's categories section."
-        tags_section: "Tags Section"
-        tags_section_instruction: "Selected tags will be displayed under Sidebar's tags section."
         navigation_section: "Navigation"
-        list_destination_instruction: "When there's new content in the sidebar..."
-        list_destination_default: "use the default link and show a badge for new items"
-        list_destination_unread_new: "link to unread/new and show a count of new items"
+        navigation_section_instruction: "When a topic list in the navigation menu has new or unread items…"
+        link_to_filtered_list_checkbox_description: "Link to the filtered list"
+        show_count_new_items_checkbox_description: "Show a count of the new items"
       change: "change"
       featured_topic: "Featured Topic"
       moderator: "%{user} is a moderator"
@@ -1225,6 +1250,7 @@ en:
       watched_first_post_categories_instructions: "You will be notified of the first post in each new topic in these categories."
       watched_first_post_tags: "Watching First Post"
       watched_first_post_tags_instructions: "You will be notified of the first post in each new topic with these tags."
+      watched_precedence_over_muted: "Notify me about topics in categories or tags I’m watching that also belong to one I have muted"
 
       muted_categories: "Muted"
       muted_categories_instructions: "You will not be notified of anything about new topics in these categories, and they will not appear on the categories or latest pages."
@@ -1259,12 +1285,24 @@ en:
       staged: "Staged"
 
       staff_counters:
-        flags_given: "helpful flags"
-        flagged_posts: "flagged posts"
-        deleted_posts: "deleted posts"
-        suspensions: "suspensions"
-        warnings_received: "warnings"
-        rejected_posts: "rejected posts"
+        flags_given:
+          one: '<span class="%{className}">%{count}</span> helpful flag'
+          other: '<span class="%{className}">%{count}</span> helpful flags'
+        flagged_posts:
+          one: '<span class="%{className}">%{count}</span> flagged post'
+          other: '<span class="%{className}">%{count}</span> flagged posts'
+        deleted_posts:
+          one: '<span class="%{className}">%{count}</span> deleted post'
+          other: '<span class="%{className}">%{count}</span> deleted posts'
+        suspensions:
+          one: '<span class="%{className}">%{count}</span> suspension'
+          other: '<span class="%{className}">%{count}</span> suspensions'
+        warnings_received:
+          one: '<span class="%{className}">%{count}</span> warning'
+          other: '<span class="%{className}">%{count}</span> warnings'
+        rejected_posts:
+          one: '<span class="%{className}">%{count}</span> rejected post'
+          other: '<span class="%{className}">%{count}</span> rejected posts'
 
       messages:
         all: "all inboxes"
@@ -1369,7 +1407,7 @@ en:
         tags: "Tags"
         interface: "Interface"
         apps: "Apps"
-        sidebar: "Sidebar"
+        navigation_menu: "Navigation Menu"
 
       change_password:
         success: "(email sent)"
@@ -1385,11 +1423,12 @@ en:
         title: "Two-Factor Backup Codes"
         regenerate: "Regenerate"
         disable: "Disable"
-        enable: "Enable"
-        enable_long: "Enable backup codes"
+        enable: "Create backup codes"
+        enable_long: "Add backup codes"
+        not_enabled: "You haven't created any backup codes yet."
         manage:
-          one: "Manage backup codes. You have <strong>%{count}</strong> backup code remaining."
-          other: "Manage backup codes. You have <strong>%{count}</strong> backup codes remaining."
+          one: "You have <strong>%{count}</strong> backup code remaining."
+          other: "You have <strong>%{count}</strong> backup codes remaining."
         copy_to_clipboard: "Copy to Clipboard"
         copy_to_clipboard_error: "Error copying data to Clipboard"
         copied_to_clipboard: "Copied to Clipboard"
@@ -1478,6 +1517,7 @@ en:
         success: "We've sent an email to that address. Please follow the confirmation instructions."
         success_via_admin: "We've sent an email to that address. The user will need to follow the confirmation instructions in the email."
         success_staff: "We've sent an email to your current address. Please follow the confirmation instructions."
+        back_to_preferences: "Back to preferences"
 
       change_avatar:
         title: "Change your profile picture"
@@ -1871,8 +1911,7 @@ en:
       remove_status: "Remove status"
 
     user_tips:
-      primary: "Got it!"
-      secondary: "don't show me these tips"
+      button: "Got it!"
 
       first_notification:
         title: "Your first notification!"
@@ -1894,6 +1933,11 @@ en:
         title: "Keep reading!"
         content: "Here are some topics we think you might like to read next."
 
+      admin_guide:
+        title: "Welcome to your new site!"
+        content: "<a href='%{admin_guide_url}'>Read the admin guide</a> to continue building your site and community."
+        content_no_url: "Read the admin guide to continue building your site and community."
+
     loading: "Loading..."
     errors:
       prev_page: "while trying to load"
@@ -1929,42 +1973,6 @@ en:
     staff_writes_only_mode:
       enabled: "This site is in staff only mode. Please continue to browse, but replying, likes, and other actions are limited to staff members only."
 
-    # This string uses the ICU Message Format. See https://meta.discourse.org/t/7035 for translation guidelines.
-    too_few_topics_and_posts_notice_MF: |
-      Let's <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">start the discussion!</a> There { currentTopics, plural,
-          one {is <strong>#</strong> topic}
-        other {are <strong>#</strong> topics}
-      } and { currentPosts, plural,
-          one {<strong>#</strong> post}
-        other {<strong>#</strong> posts}
-      }. Visitors need more to read and reply to – we recommend at least { requiredTopics, plural,
-          one {<strong>#</strong> topic}
-        other {<strong>#</strong> topics}
-      } and { requiredPosts, plural,
-          one {<strong>#</strong> post}
-        other {<strong>#</strong> posts}
-      }. Only staff can see this message.
-
-    # This string uses the ICU Message Format. See https://meta.discourse.org/t/7035 for translation guidelines.
-    too_few_topics_notice_MF: |
-      Let's <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">start the discussion!</a> There { currentTopics, plural,
-          one {is <strong>#</strong> topic}
-        other {are <strong>#</strong> topics}
-      }. Visitors need more to read and reply to – we recommend at least { requiredTopics, plural,
-          one {<strong>#</strong> topic}
-        other {<strong>#</strong> topics}
-      }. Only staff can see this message.
-
-    # This string uses the ICU Message Format. See https://meta.discourse.org/t/7035 for translation guidelines.
-    too_few_posts_notice_MF: |
-      Let's <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">start the discussion!</a> There { currentPosts, plural,
-          one {is <strong>#</strong> post}
-        other {are <strong>#</strong> posts}
-      }. Visitors need more to read and reply to – we recommend at least { requiredPosts, plural,
-          one {<strong>#</strong> post}
-        other {<strong>#</strong> posts}
-      }. Only staff can see this message.
-
     logs_error_rate_notice:
       # This string uses the ICU Message Format. See https://meta.discourse.org/t/7035 for translation guidelines.
       reached_hour_MF: |
@@ -2029,11 +2037,26 @@ en:
       intro: "Hello! Looks like you’re enjoying the discussion, but you haven’t signed up for an account yet."
       value_prop: "Tired of scrolling through the same posts? When you create an account you’ll always come back to where you left off. With an account you can also be notified of new replies, save bookmarks, and use likes to thank others. We can all work together to make this community great. :heart:"
 
+    offline_indicator:
+      no_internet: "No internet connection."
+      refresh_page: "Refresh page"
+
     summary:
-      enabled_description: "You're viewing a summary of this topic: the most interesting posts as determined by the community."
+      in_progress: "Summarizing topic using AI"
+      summarized_on: "Summarized with AI on %{date}"
+      model_used: "AI used: %{model}"
+      outdated: "Summary is outdated"
+      outdated_posts:
+        one: "(%{count} post missing)"
+        other: "(%{count} posts missing)"
+      enabled_description: "You're viewing this topic top replies: the most interesting posts as determined by the community."
       description:
         one: "There is <b>%{count}</b> reply."
         other: "There are <b>%{count}</b> replies."
+      buttons:
+        hide: "Hide summary"
+        generate: "Summarize with AI"
+        regenerate: "Regenerate summary"
 
       # This string uses the ICU Message Format. See https://meta.discourse.org/t/7035 for translation guidelines.
       description_time_MF: |
@@ -2045,10 +2068,10 @@ en:
           other {# minutes}
         }</b>.
 
-      enable: "Summarize This Topic"
+      enable: "Show top replies"
       disable: "Show All Posts"
-      short_label: "Summarize"
-      short_title: "Show a summary of this topic: the most interesting posts as determined by the community"
+      short_label: "Top replies"
+      short_title: "Show this topic top replies: the most interesting posts as determined by the community"
 
     deleted_filter:
       enabled_description: "This topic contains deleted posts, which have been hidden."
@@ -2372,8 +2395,6 @@ en:
 
       save_edit: "Save Edit"
       overwrite_edit: "Overwrite Edit"
-      reply_original: "Reply on Original Topic"
-      reply_here: "Reply Here"
       reply: "Reply"
       cancel: "Cancel"
       create_topic: "Create Topic"
@@ -2482,6 +2503,7 @@ en:
         aria_label: Alt text for image
 
       delete_image_button: Delete Image
+      toggle_image_grid: Toggle image grid
 
     notifications:
       tooltip:
@@ -2546,6 +2568,7 @@ en:
       reaction_2: "<span>%{username}, %{username2}</span> %{description}"
       votes_released: "%{description} - completed"
       new_features: "New features available!"
+      admin_problems: "New advice on your site dashboard"
       dismiss_confirmation:
         body:
           default:
@@ -2822,6 +2845,11 @@ en:
         dismiss_tooltip: "Dismiss just new posts or stop tracking topics"
         also_dismiss_topics: "Stop tracking these topics so they never show up as unread for me again"
         dismiss_new: "Dismiss New"
+        dismiss_new_modal:
+          title: "Dismiss new"
+          topics: "Dismiss new topics"
+          posts: "Dismiss new posts"
+          untrack: "Stop tracking these topics so they stop appearing in my new list"
         dismiss_new_with_selected:
           one: "Dismiss New (%{count})"
           other: "Dismiss New (%{count})"
@@ -2860,9 +2888,11 @@ en:
         bookmarks: "You have no bookmarked topics yet."
         category: "There are no %{category} topics."
         top: "There are no top topics."
+        filter: "There are no topics."
         educate:
           new: '<p>Your new topics will appear here. By default, topics are considered new and will show a <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span> indicator if they were created in the last 2 days.</p><p>Visit your <a href="%{userPrefsUrl}">preferences</a> to change this.</p>'
-          unread: '<p>Your unread topics appear here.</p><p>By default, topics are considered unread and will show unread counts <span class="badge unread-posts badge-notification">1</span> if you:</p><ul><li>Created the topic</li><li>Replied to the topic</li><li>Read the topic for more than 4 minutes</li></ul><p>Or if you have explicitly set the topic to Tracked or Watched via the 🔔 in each topic.</p><p>Visit your <a href="%{userPrefsUrl}">preferences</a> to change this.</p>'
+          unread: '<p>Your unread topics appear here.</p><p>By default, topics are considered unread and will show unread counts <span class="badge unread-posts badge-notification">1</span> if you:</p><ul><li>Created the topic</li><li>Replied to the topic</li><li>Read the topic for more than 5 minutes</li></ul><p>Or if you have explicitly set the topic to Tracked or Watched via the 🔔 in each topic.</p><p>Visit your <a href="%{userPrefsUrl}">preferences</a> to change this.</p>'
+          new_new: '<p>Your new topics will appear here, and your unread topics will also be displayed. By default, topics are considered new and will show a <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span> indicator if they were created in the last 2 days. Unread topics will show unread counts <span class="badge unread-posts badge-notification">1</span> if you: created the topic, replied to the topic, read the topic for more than 5 minutes, or if you have explicitly set the topic to Tracked or Watched via the 🔔 in each topic.</p><p>Visit your <a href="%{userPrefsUrl}">preferences</a> to change this.</p>'
       bottom:
         latest: "There are no more latest topics."
         posted: "There are no more posted topics."
@@ -2874,12 +2904,14 @@ en:
         tag: "There are no more %{tag} topics."
         top: "There are no more top topics."
         bookmarks: "There are no more bookmarked topics."
+        filter: "There are no more topics."
 
     topic:
       filter_to:
         one: "%{count} post in topic"
         other: "%{count} posts in topic"
       create: "New Topic"
+      create_disabled_category: "You're not allowed to create topics in this category"
       create_long: "Create a new Topic"
       open_draft: "Open Draft"
       private_message: "Start a message"
@@ -2927,6 +2959,7 @@ en:
       read_more_in_category: "Want to read more? Browse other topics in %{categoryLink} or <a href='%{latestLink}'>view latest topics</a>."
       read_more: "Want to read more? <a href='%{categoryLink}'>Browse all categories</a> or <a href='%{latestLink}'>view latest topics</a>."
       unread_indicator: "No member has read the last post of this topic yet."
+      participant_groups: "Participant groups"
 
       # This string uses the ICU Message Format. See https://meta.discourse.org/t/7035 for translation guidelines.
       #
@@ -2975,8 +3008,8 @@ en:
       browse_all_tags_or_latest: "<a href='%{basePath}/tags'>Browse all tags</a> or <a href='%{basePath}/latest'>view latest topics</a>."
 
       suggest_create_topic: Ready to <a href>start a new conversation?</a>
-      jump_reply_up: jump to earlier reply
-      jump_reply_down: jump to later reply
+      jump_reply: "Jump to post's original location"
+      jump_reply_aria: "Jump to @%{username}'s post in its original location"
       deleted: "The topic has been deleted"
 
       slow_mode_update:
@@ -3266,6 +3299,7 @@ en:
         instructions:
           one: "Please choose the topic you'd like to move that post to."
           other: "Please choose the topic you'd like to move those <b>%{count}</b> posts to."
+        chronological_order: "preserve chronological order after merging"
 
       move_to_new_message:
         title: "Move to New Message"
@@ -3361,6 +3395,7 @@ en:
       ignored: "Ignored content"
       wiki_last_edited_on: "wiki last edited on %{dateTime}"
       last_edited_on: "post last edited on %{dateTime}"
+      edit_history: "post edit history"
       reply_as_new_topic: "Reply as linked Topic"
       reply_as_new_private_message: "Reply as new message to the same recipients"
       continue_discussion: "Continuing the discussion from %{postLink}:"
@@ -3372,8 +3407,8 @@ en:
       sr_collapse_replies: "Collapse embedded replies"
       sr_date: "Post date"
       sr_expand_replies:
-        one: "This post has %{count} reply. Click to expand"
-        other: "This post has %{count} replies. Click to expand"
+        one: "This post has %{count} reply"
+        other: "This post has %{count} replies"
       expand_collapse: "expand/collapse"
       sr_below_embedded_posts_description: "post #%{post_number} replies"
       sr_embedded_reply_description: "reply by @%{username} to post #%{post_number}"
@@ -3548,6 +3583,8 @@ en:
           last: "Last revision"
           hide: "Hide revision"
           show: "Show revision"
+          destroy: "Delete revisions"
+          destroy_confirm: "Are you sure you want to delete all of the revisions on this post? This action is permanent."
           revert: "Revert to revision %{revision}"
           edit_wiki: "Edit Wiki"
           edit_post: "Edit Post"
@@ -3583,6 +3620,7 @@ en:
         updated: "Updated"
         name: "Name"
         name_placeholder: "What is this bookmark for?"
+        name_input_label: "Bookmark name"
         set_reminder: "Remind me"
         options: "Options"
         actions:
@@ -3605,7 +3643,7 @@ en:
       filtered_replies:
         viewing_posts_by: "Viewing %{post_count} posts by"
         viewing_subset: "Some replies are collapsed"
-        viewing_summary: "Viewing a summary of this topic"
+        viewing_summary: "Viewing this topic top replies"
         post_number: "%{username}, post #%{post_number}"
         show_all: "Show all"
 
@@ -3624,7 +3662,7 @@ en:
       back: "Back to category"
       general: "General"
       settings: "Settings"
-      topic_template: "Topic Template"
+      topic_template: "Template"
       tags: "Tags"
       tags_allowed_tags: "Restrict these tags to this category:"
       tags_allowed_tag_groups: "Restrict these tag groups to this category:"
@@ -3683,8 +3721,7 @@ en:
       email_in: "Custom incoming email address:"
       email_in_tooltip: "You can separate multiple email addresses with the | character."
       email_in_allow_strangers: "Accept emails from anonymous users with no accounts"
-      email_in_disabled: "Posting new topics via email is disabled in the Site Settings. To enable posting new topics via email, "
-      email_in_disabled_click: 'enable the "email in" setting.'
+      email_in_disabled: "Posting new topics via email is disabled. To enable posting new topics via email, enable the <a href='%{setting_url}'>'email in'</a> setting."
       mailinglist_mirror: "Category mirrors a mailing list"
       show_subcategory_list: "Show subcategory list above topics in this category."
       read_only_banner: "Banner text when a user cannot create a topic in this category:"
@@ -3711,6 +3748,7 @@ en:
       default_slow_mode: 'Enable "Slow Mode" for new topics in this category.'
       parent: "Parent Category"
       num_auto_bump_daily: "Number of open topics to automatically bump daily:"
+      auto_bump_cooldown_days: "Minimum days before bumping the same topic again:"
       navigate_to_first_post_after_read: "Navigate to first post after topics are read"
       notifications:
         title: "change notification level for this category"
@@ -3806,7 +3844,9 @@ en:
         inappropriate: "It's Inappropriate"
         spam: "It's Spam"
       custom_placeholder_notify_user: "Be specific, be constructive, and always be kind."
+      notify_user_textarea_label: "Message for the user"
       custom_placeholder_notify_moderators: "Let us know specifically what you are concerned about, and provide relevant links and examples where possible."
+      notify_moderators_textarea_label: "Message for the moderators"
       custom_message:
         at_least:
           one: "enter at least %{count} character"
@@ -3915,6 +3955,10 @@ en:
     filters:
       with_topics: "%{filter} topics"
       with_category: "%{filter} %{category} topics"
+      filter:
+        title: "Filter"
+        button:
+          label: "Filter"
       latest:
         title: "Latest"
         title_with_count:
@@ -3987,8 +4031,6 @@ en:
 
     browser_update: 'Unfortunately, <a href="https://www.discourse.org/faq/#browser">your browser is unsupported</a>. Please <a href="https://browsehappy.com">switch to a supported browser</a> to view rich content, log in and reply.'
 
-    safari_13_warning: This site will soon remove support for iOS and Safari versions 13 and below. A simplified read-only version will remain available. (<a href="https://meta.discourse.org/t/224747">more information</a>)
-
     permission_types:
       full: "Create / Reply / See"
       create_post: "Reply / See"
@@ -4006,6 +4048,21 @@ en:
       content_load_error: '<a href="%url%">The content</a> could not be loaded.'
       image_load_error: '<a href="%url%">The image</a> could not be loaded.'
 
+    experimental_lightbox:
+      image_load_error: "The image could not be loaded."
+      screen_reader_image_title: "Image %{current} of %{total}: %{title}"
+      buttons:
+        next: "Next (Right or down arrow key)"
+        previous: "Previous (Left or up arrow key)"
+        close: "Close (Esc)"
+        download: "Download image"
+        newtab: "Open image in a new tab"
+        zoom: "Zoom image in/out (Z key)"
+        rotate: "Rotate image (R key)"
+        fullscreen: "Toggle browser full screen mode (M key)"
+        carousel: "Display all images in a carousel (A key)"
+        retry: "Retry loading the image"
+
     cannot_render_video: This video cannot be rendered because your browser does not support the codec.
 
     keyboard_shortcuts_help:
@@ -4054,6 +4111,7 @@ en:
         title: "Composing"
         return: "%{shortcut} Return to composer"
         fullscreen: "%{shortcut} Fullscreen composer"
+        insert_current_time: "%{shortcut} Insert current time"
       bookmarks:
         title: "Bookmarking"
         enter: "%{shortcut} Save and close"
@@ -4100,7 +4158,9 @@ en:
         one: "Earned this badge %{count} time"
         other: "Earned this badge %{count} times"
       granted_on: "Granted %{date}"
-      others_count: "Others with this badge (%{count})"
+      others_count:
+        one: "Granted to others %{count} time"
+        other: "Granted to others %{count} times"
       title: Badges
       allow_title: "You can use this badge as a title"
       multiple_grant: "You can earn this multiple times"
@@ -4110,9 +4170,9 @@ en:
       more_badges:
         one: "+%{count} More"
         other: "+%{count} More"
-      granted:
-        one: "%{count} granted"
-        other: "%{count} granted"
+      awarded:
+        one: "%{number} awarded"
+        other: "%{number} awarded"
       select_badge_for_title: Select a badge to use as your title
       none: "(none)"
       successfully_granted: "Successfully granted %{badge} to %{username}"
@@ -4294,13 +4354,11 @@ en:
     pause_notifications:
       title: "Pause notifications for..."
       label: "Pause notifications"
-      remaining: "%{remaining} remaining"
       options:
         half_hour: "30 minutes"
         one_hour: "1 hour"
         two_hours: "2 hours"
         tomorrow: "Until tomorrow"
-        custom: "Custom"
       set_schedule: "Set a notification schedule"
 
     trust_levels:
@@ -4356,7 +4414,62 @@ en:
       more: "More"
       all_categories: "All categories"
       all_tags: "All tags"
+      categories_form_modal:
+        title: "Edit categories navigation"
+        subtitle:
+          text: "and we'll automatically show this site's most popular categories"
+        filter_placeholder: "Filter categories"
+        no_categories: "There are no categories matching the given term."
+      tags_form_modal:
+        title: "Edit tags navigation"
+        filter_placeholder: "Filter tags"
+        no_tags: "There are no tags matching the given term."
+        subtitle:
+          text: "and we'll automatically show this site's top tags"
+      edit_navigation_modal_form:
+        deselect_button_text: "Deselect all"
+        reset_to_defaults: "Reset to defaults"
+        filter_dropdown:
+          all: "All"
+          selected: "Selected"
+          unselected: "Unselected"
+
       sections:
+        custom:
+          add: "Add custom section"
+          edit: "Edit custom section"
+          save: "Save"
+          delete: "Delete"
+          delete_confirm: "Are you sure you want to delete this section?"
+          reset_confirm: "Are you sure you want to reset this section to default?"
+          public: "Make this section public and visible to everyone"
+          always_public: "Content in this section is always public"
+          more_menu: "More menu"
+          links:
+            add: "Add another link"
+            delete: "Delete link"
+            reset: "Reset to default"
+            icon:
+              label: "Icon"
+              validation:
+                blank: "Icon cannot be blank"
+                maximum: "Icon must be shorter than %{count} characters"
+            name:
+              label: "Name"
+              validation:
+                blank: "Name cannot be blank"
+                maximum: "Name must be shorter than %{count} characters"
+            value:
+              label: "Link"
+              validation:
+                blank: "Link cannot be blank"
+                maximum: "Link must be shorter than %{count} characters"
+                invalid: "Format is invalid"
+          title:
+            label: "Section title"
+            validation:
+              blank: "Title cannot be blank"
+              maximum: "Title must be shorter than %{count} characters"
         about:
           header_link_text: "About"
         messages:
@@ -4371,28 +4484,21 @@ en:
             unread_with_count: "Unread (%{count})"
             archive: "Archive"
         tags:
-          links:
-            add_tags:
-              content: "Add tags"
-              title: "You have not added any tags. Click to get started."
           none: "You have not added any tags."
           click_to_get_started: "Click here to get started."
           header_link_text: "Tags"
           header_action_title: "Edit your sidebar tags"
           configure_defaults: "Configure defaults"
         categories:
-          links:
-            add_categories:
-              content: "Add categories"
-              title: "You have not added any categories. Click to get started."
           none: "You have not added any categories."
           click_to_get_started: "Click here to get started."
           header_link_text: "Categories"
           header_action_title: "Edit your sidebar categories"
           configure_defaults: "Configure defaults"
         community:
-          header_link_text: "Community"
-          header_action_title: "Create a topic"
+          edit_section:
+            sidebar: "Customize this section"
+            header_dropdown: "Customize"
           links:
             about:
               content: "About"
@@ -4403,8 +4509,8 @@ en:
             badges:
               content: "Badges"
               title: "All the badges available to earn"
-            everything:
-              content: "Everything"
+            topics:
+              content: "Topics"
               title: "All topics"
             faq:
               content: "FAQ"
@@ -4417,6 +4523,7 @@ en:
               title: "List of all users"
             my_posts:
               content: "My Posts"
+              content_drafts: "My Drafts"
               title: "My recent topic activity"
               title_drafts: "My unposted drafts"
               draft_count:
@@ -4426,6 +4533,10 @@ en:
               content: "Review"
               title: "Flagged posts and other queued items"
               pending_count: "%{count} pending"
+        global_section: "Global section, visible to everyone"
+      panels:
+        forum:
+          label: Forum
 
     welcome_topic_banner:
       title: "Create your Welcome Topic"
@@ -4434,6 +4545,36 @@ en:
 
     until: "Until:"
 
+    char_counter:
+      exceeded: "The maximum number of characters allowed has been exceeded."
+
+    form_template_chooser:
+      select_template: "Select form templates"
+    form_templates:
+      errors:
+        valueMissing:
+          default: "Please fill out this field."
+          text: "Please fill out this field."
+          select-one: "Please select an item in the list."
+          select-multiple: "Please select at least one item in the list."
+          checkbox: "Please check this box if you want to proceed."
+        typeMismatch:
+          default: "Please enter a valid value."
+          color: "Please enter a color."
+          date: "Please enter a date."
+          email: "Please enter a valid email address."
+          number: "Please enter a number."
+          password: "Please enter a valid password."
+          tel: "Please enter a valid telephone number."
+          text: "Please enter a text value."
+          url: "Please enter a valid URL."
+        tooShort: "The input must be %{minLength} characters or longer."
+        tooLong: "The input must be less than %{maxLength} characters."
+        rangeOverflow: "The input must be less than %{max}."
+        rangeUnderflow: "The input must be more than %{min}."
+        patternMismatch: "Please match the requested format."
+        badInput: "Please enter a valid input."
+
   # This section is exported to the javascript for i18n in the admin section
   admin_js:
     type_to_filter: "type to filter..."
@@ -4600,10 +4741,14 @@ en:
         about: "Edit your group membership and names here"
         group_members: "Group members"
         delete: "Delete"
-        delete_confirm: "Are you sure you want to delete this group?"
+        delete_confirm: "Are you sure you want to delete %{group}?"
+        delete_details:
+          one: "%{count} person will lose access to this group"
+          other: "%{count} people will lose access to this group"
         delete_with_messages_confirm:
-          one: "Deleting this group will cause %{count} message to be orphaned, group members will no longer have access to it."
-          other: "Deleting this group will cause %{count} messages to be orphaned, group members will no longer have access to them."
+          one: "%{count} message will become inaccessible to group members"
+          other: "%{count} messages will become inaccessible to group members"
+        delete_warning: "Deleted groups can not be recovered"
         delete_failed: "Unable to delete group. If this is an automatic group, it cannot be destroyed."
         delete_automatic_group: This is an automatic group and cannot be deleted.
         delete_owner_confirm: "Remove owner privilege for '%{username}'?"
@@ -4670,10 +4815,16 @@ en:
             topics:
               read: Read a topic or a specific post in it. RSS is also supported.
               write: Create a new topic or post to an existing one.
-              update: Update a topic. Change the title, category, tags, etc.
+              update: Update a topic. Change the title, category, tags, status, archetype, featured_link etc.
+              delete: Delete a topic.
               read_lists: Read topic lists like top, new, latest, etc. RSS is also supported.
+              status: "Update a topic's status. Status: closed, archive, visible, pinned. Enabled: true, false. Specify a category_id here and in the request payload to only allow status changes on topics in that category."
             posts:
               edit: Edit any post or a specific one.
+              delete: Delete a post.
+              list: List latest posts and private posts. RSS is also supported.
+            tags:
+              list: List tags.
             categories:
               list: Get a list of categories.
               show: Get a single category by id.
@@ -4687,6 +4838,7 @@ en:
               update: Update user profile information.
               log_out: Log out all sessions for a user.
               anonymize: Anonymize user accounts.
+              suspend: Suspend user accounts.
               delete: Delete user accounts.
               list: Get a list of users.
             user_status:
@@ -4694,6 +4846,8 @@ en:
               update: Update user status.
             email:
               receive_emails: Combine this scope with the mail-receiver to process incoming emails.
+            invites:
+              create: Send email invites or generate invite links.
             badges:
               create: Create a new badge.
               show: Obtain information about a badge.
@@ -4702,6 +4856,12 @@ en:
               list_user_badges: List user badges.
               assign_badge_to_user: Assign a badge to a user.
               revoke_badge_from_user: Revoke a badge from a user.
+            groups:
+              manage_groups: List, add, and remove group members.
+              administer_groups: List, show, create, update, and delete groups.
+            search:
+              show: Search using the `/search.json?q=term` endpoint.
+              query: Search using the `/search/query?term=term` endpoint.
             wordpress:
               publishing: Necessary for the WP Discourse plugin publishing features (required).
               commenting: Necessary for the WP Discourse plugin commenting features.
@@ -4769,8 +4929,8 @@ en:
           name: "User Promoted Event"
           details: "When a user is promoted from one trust level to another."
         user_badge_event:
-          name: "Badge Grant Event"
-          details: "When a user receives a badge."
+          name: "Badge Event"
+          details: "When a badge is granted or revoked."
         group_user_event:
           name: "Group User Event"
           details: "When a user is added or removed in a group."
@@ -4813,7 +4973,7 @@ en:
         enabled: "Enabled?"
         is_enabled: "Y"
         not_enabled: "N"
-        change_settings: "Change Settings"
+        change_settings: "Plugin Settings"
         change_settings_short: "Settings"
         howto: "How do I install plugins?"
         official: "Official Plugin"
@@ -4904,6 +5064,11 @@ en:
         title: "Customize"
         preview: "preview"
         explain_preview: "See the site with this theme enabled"
+        syntax_error: "Syntax Error"
+        settings_editor: "Settings Editor"
+        validation_settings_keys: "Each item must have only a 'setting' key and a 'value' key."
+        validation_settings_deleted: "These settings were deleted. Please restore them and try again."
+        validation_settings_added: "These settings were added. Please remove them and try again."
         save: "Save"
         new: "New"
         new_style: "New Style"
@@ -4942,6 +5107,7 @@ en:
           create: "Create"
           create_type: "Type"
           create_name: "Name"
+          save: "Save"
           long_title: "Amend colors, CSS and HTML contents of your site"
           edit: "Edit"
           edit_confirm: "This is a remote theme, if you edit CSS/HTML your changes will be erased next time you update the theme."
@@ -4957,6 +5123,7 @@ en:
           extra_files_upload: "Export theme to view these files."
           extra_files_remote: "Export theme or check the git repository to view these files."
           preview: "Preview"
+          settings_editor: "Settings Editor"
           show_advanced: "Show advanced fields"
           hide_advanced: "Hide advanced fields"
           hide_unused_fields: "Hide unused fields"
@@ -5073,6 +5240,9 @@ en:
           embedded_scss:
             text: "Embedded CSS"
             title: "Enter custom CSS to deliver with embedded version of comments"
+          embedded_header:
+            text: "Embedded Header"
+            title: "Enter HTML to display above the embedded version of comments"
           color_definitions:
             text: "Color Definitions"
             title: "Enter custom color definitions (advanced users only)"
@@ -5156,6 +5326,12 @@ en:
           love:
             name: "love"
             description: "The like button's color."
+          selected:
+            name: "selected"
+            description: "The background-color of elements such as list-items when they are selected/active."
+          hover:
+            name: "hover"
+            description: "The background-color of elements such as list-items when they are hovered on or have keyboard focus."
         robots:
           title: "Override your site's robots.txt file:"
           warning: "This will permanently override any related site settings."
@@ -5289,6 +5465,7 @@ en:
           no_previous: "There is no previous value."
           deleted: "No new value. The record was deleted."
           actions:
+            permanently_delete_post_revisions: "permanently delete post revisions"
             delete_user: "delete user"
             change_trust_level: "change trust level"
             change_username: "change username"
@@ -5322,6 +5499,7 @@ en:
             revoke_moderation: "revoke moderation"
             backup_create: "create backup"
             deleted_tag: "deleted tag"
+            update_directory_columns: "update directory columns"
             deleted_unused_tags: "deleted unused tags"
             renamed_tag: "renamed tag"
             revoke_email: "revoke email"
@@ -5380,6 +5558,10 @@ en:
             delete_group: "delete group"
             watched_word_create: "add watched word"
             watched_word_destroy: "delete watched word"
+            create_public_sidebar_section: "create public sidebar section"
+            update_public_sidebar_section: "update public sidebar section"
+            destroy_public_sidebar_section: "destroy public sidebar section"
+            reset_bounce_score: "reset bounce score"
         screened_emails:
           title: "Screened Emails"
           description: "When someone tries to create a new account, the following email addresses will be checked and the registration will be blocked, or some other action performed."
@@ -5444,14 +5626,14 @@ en:
           silence: "Silence"
           link: "Link"
         action_descriptions:
-          block: "Prevent posts containing these words from being posted. The user will see an error message when they try to submit their post."
-          censor: "Allow posts containing these words, but replace them with characters that hide the censored words."
-          require_approval: "Posts containing these words will require approval by staff before they can be seen."
-          flag: "Allow posts containing these words, but flag them as inappropriate so moderators can review them."
-          replace: "Replace words in posts with other words"
-          tag: "Automatically tag topics based on first post"
-          silence: "First posts of users containing these words will require approval by staff before they can be seen and the user will be automatically silenced."
-          link: "Replace words in posts with links"
+          block: "An error message will be displayed when attempting to create a post containing these words."
+          censor: "Allow posts that contain these words, but replace them with characters that hide the censored words."
+          require_approval: "Require staff approval for posts that contain these words before they can be visible to others."
+          flag: "Allow posts that contain these words, but flag them as inappropriate for review by moderators."
+          replace: "Replace words in posts with other words."
+          tag: "Automatically tag topics if the first post contains a specific word."
+          silence: "Silence new accounts if their very first post contains any of these words. The post will be automatically hidden until staff approves it."
+          link: "Replace words in posts with links."
         form:
           label: "Has word or phrase"
           placeholder: "Enter word or phrase (* is a wildcard)"
@@ -5475,6 +5657,89 @@ en:
           found_matches: "Found matches:"
           no_matches: "No matches found"
 
+      form_templates:
+        nav_title: "Templates"
+        title: "Form Templates"
+        help: "Create a template structure that can be used to create new topics, posts, and messages."
+        new_template: "New Template"
+        list_table:
+          headings:
+            name: "Name"
+            active_categories: "Active Categories"
+            actions: "Actions"
+          actions:
+            view: "View Template"
+            edit: "Edit Template"
+            delete: "Delete Template"
+        view_template:
+          close: "Close"
+          edit: "Edit"
+          delete: "Delete"
+          toggle_preview: "Toggle Preview"
+        new_template_form:
+          submit: "Save"
+          cancel: "Cancel"
+          name:
+            label: "Template Name"
+            placeholder: "Enter a name for this template..."
+          template:
+            label: "Template"
+            placeholder: "Create a YAML template here..."
+          preview: "Preview"
+        delete_confirm: "Are you sure you would like to delete this template?"
+        quick_insert_fields:
+          add_new_field: "Add"
+          checkbox: "Checkbox"
+          input: "Short answer"
+          textarea: "Long answer"
+          dropdown: "Dropdown"
+          upload: "Upload a file"
+          multiselect: "Multiple choice"
+        validations_modal:
+          button_title: "Validations"
+          modal_title: "Validation Options"
+          table_headers:
+            key: "Key"
+            type: "Type"
+            description: "Description"
+          validations:
+            required:
+              key: "required"
+              type: "boolean"
+              description: "Requires the field to be completed to submit the form."
+            minimum:
+              key: "minimum"
+              type: "integer"
+              description: "For text fields, specifies the minimum number of characters allowed."
+            maximum:
+              key: "maximum"
+              type: "integer"
+              description: "For text fields, specifies the maximum number of characters allowed."
+            pattern:
+              key: "pattern"
+              type: "regex string"
+              description: "For text fields, a regular expression specifying the allowed input."
+            type:
+              key: "type"
+              type: "string"
+              description: "For input fields, you can specify the type of input that should be expected (text|email|date|number|url|tel|color)"
+        preview_modal:
+          title: "Preview Template"
+        field_placeholders:
+          validations: "enter validations here"
+          label: "Enter label here"
+          placeholder: "Enter placeholder here"
+          none_label: "Select an item"
+          choices:
+            first: "Option 1"
+            second: "Option 2"
+            third: "Option 3"
+        edit_category:
+          toggle_freeform: "form template disabled"
+          toggle_form_template: "form template enabled"
+          select_template: "Select form templates"
+          select_template_help: "Add/Edit Form Templates"
+
       impersonate:
         title: "Impersonate"
         help: "Use this tool to impersonate a user account for debugging purposes. You will have to log out once finished."
@@ -5488,6 +5753,7 @@ en:
         not_found: "Sorry, that username doesn't exist in our system."
         id_not_found: "Sorry, that user id doesn't exist in our system."
         active: "Activated"
+        status: "Status"
         show_emails: "Show Emails"
         hide_emails: "Hide Emails"
         nav:
@@ -5598,7 +5864,6 @@ en:
         show_admin_profile: "Admin"
         manage_user: "Manage user"
         show_public_profile: "Show Public Profile"
-        impersonate: "Impersonate"
         action_logs: "Action Logs"
         ip_lookup: "IP Lookup"
         log_out: "Log Out"
@@ -5842,8 +6107,16 @@ en:
         go_back: "Back to Search"
         recommended: "We recommend customizing the following text to suit your needs:"
         show_overriden: "Only show overridden"
+        show_outdated: "Only show outdated/invalid"
         locale: "Language:"
         more_than_50_results: "There are more than 50 results. Please refine your search."
+        interpolation_keys: "Available interpolation keys:"
+        outdated:
+          title: "This translation is outdated"
+          description: "The default translation for this key has changed since this override was created. Please check below that your translation matches any changes that have been made to the original intent."
+          old_default: "Old default"
+          new_default: "New default"
+          dismiss: "Dismiss"
 
       settings: # used by theme and site settings
         show_overriden: "Only show overridden"
@@ -5857,7 +6130,9 @@ en:
             label: "Add Emoji"
         title: "Settings"
         no_results: "No results found."
-        more_than_30_results: "There are more than 30 results. Please refine your search or select a category."
+        more_site_setting_results:
+          one: "There is more than %{count} result. Please refine your search or select a category."
+          other: "There are more than %{count} results. Please refine your search or select a category."
         clear_filter: "Clear"
         add_url: "add URL"
         add_host: "add host"
@@ -5945,7 +6220,8 @@ en:
         allow_title: Allow badge to be used as a title
         multiple_grant: Can be granted multiple times
         listable: Show badge on the public badges page
-        enabled: Enable badge
+        enabled: enabled
+        disabled: disabled
         icon: Icon
         image: Image
         graphic: Graphic
@@ -6017,10 +6293,14 @@ en:
       embedding:
         get_started: "If you'd like to embed Discourse on another website, begin by adding its host."
         confirm_delete: "Are you sure you want to delete that host?"
-        sample: "Paste the following HTML code into your site to create and embed Discourse topics. Replace <b>REPLACE_ME</b> with the canonical URL of the page you are embedding it on."
+        sample: |
+          <p>Paste the following HTML code into your site to create and embed Discourse topics. Replace <b>EMBED_URL</b> with the canonical URL of the page you are embedding it on.</p>
+
+          <p>If you want to customize the style, uncomment and replace <b>CLASS_NAME</b> with a CSS class defined in the <i>Embedded CSS</i> of your theme.</p>
+
+          <p>Replace <b>DISCOURSE_USERNAME</b> with the Discourse username of the author that should create the topic. Discourse will automatically lookup the user by the <code>content</code> attribute of the <code>&lt;meta&gt;</code> tags with <code>name</code> attribute set to <code>discourse-username</code> or <code>author</code>. The <code>discourseUserName</code> parameter has been deprecated and will be removed in Discourse 3.2.</p>
         title: "Embedding"
         host: "Allowed Hosts"
-        class_name: "Class Name"
         allowed_paths: "Path Allowlist"
         edit: "edit"
         category: "Post to Category"
diff --git a/config/locales/client.en_GB.yml b/config/locales/client.en_GB.yml
index 2cdd3aa67f9..8028cb00401 100644
--- a/config/locales/client.en_GB.yml
+++ b/config/locales/client.en_GB.yml
@@ -30,7 +30,6 @@ en_GB:
         date_year: "MMM 'YY"
       medium:
         date_year: "D MMM 'YY"
-    bootstrap_invite_button_title: "Send invitations"
     groups:
       manage:
         email:
@@ -61,8 +60,6 @@ en_GB:
     read_only_mode:
       login_disabled: "Login is disabled whilst the site is in read only mode."
       logout_disabled: "Logout is disabled whilst the site is in read only mode."
-    summary:
-      enable: "Summarise This Topic"
     composer:
       italic_text: "emphasised text"
       collapse: "minimise the composer panel"
@@ -89,6 +86,11 @@ en_GB:
       colors_disabled: "You can’t select colours because you have a category style of none."
     tagging:
       manage_groups_description: "Define groups to organise tags"
+    sidebar:
+      sections:
+        community:
+          edit_section:
+            header_dropdown: "Customise"
   admin_js:
     admin:
       dashboard:
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index 9ea753121f2..0a81dc8587e 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -144,6 +144,8 @@ es:
       facebook: "Compartir en Facebook"
       email: "Enviar por correo electrónico"
       url: "Copiar y compartir la URL"
+    word_connector:
+      comma: ", "
     action_codes:
       public_topic: "Hizo este tema público %{when}"
       open_topic: "Convirtió esto en un tema %{when}"
@@ -155,6 +157,8 @@ es:
       removed_user: "Eliminó a %{who} %{when}"
       removed_group: "Eliminó a %{who} %{when}"
       autobumped: "Reflotado automáticamente %{when}"
+      tags_changed: "Etiquetas actualizadas %{when}"
+      category_changed: "Categoría actualizada %{when}"
       autoclosed:
         enabled: "Cerrado %{when}"
         disabled: "Abierto %{when}"
@@ -179,17 +183,13 @@ es:
       forwarded: "Reenvió el correo electrónico de arriba"
     topic_admin_menu: "acciones del tema"
     skip_to_main_content: "Saltar al contenido principal"
+    skip_user_nav: "Saltar al contenido del perfil"
     emails_are_disabled: "Todos los correos electrónicos salientes han sido desactivados globalmente por un administrador. No se enviarán notificaciones por correo electrónico de ningún tipo."
     emails_are_disabled_non_staff: "El correo electrónico saliente se ha desactivado para los usuarios que no pertenecen al personal."
     software_update_prompt:
       message: "Hemos actualizado este sitio, <span>vuelve a cargarlo</span>, o podrías experimentar un comportamiento inesperado."
       dismiss: "Descartar"
-    bootstrap_mode_enabled:
-      one: "Para hacer que la inauguración de tu sitio sea más fácil, el modo de arranque está activado. Todas las cuentas tendrán nivel de confianza 1 y los correos electrónicos de resumen diarios están activados. Esto se desactivará automáticamente cuando se haya registrado %{count} usuario."
-      other: "Para hacer que la inauguración de tu sitio sea más fácil, el modo arranque está activado. Todas las cuentas tendrán nivel de confianza 1 y los correos electrónicos de resumen diarios están activados. Esto se desactivará automáticamente cuando se hayan registrado %{count} usuarios."
-    bootstrap_mode_disabled: "El modo de arranque se desactivará dentro de las próximas 24 horas."
-    bootstrap_invite_button_title: "Enviar invitaciones"
-    bootstrap_wizard_link_title: "Finalizar asistente de configuración"
+    bootstrap_mode: "Cómo empezar"
     themes:
       default_description: "Por defecto"
       broken_theme_alert: "Puede que tu sitio no funcione, un tema o componente está causando errores."
@@ -302,11 +302,11 @@ es:
       edit_bookmark: "Editar marcador"
       clear_bookmarks: "Quitar marcadores"
       help:
-        bookmark: "Haz clic para añadir a marcadores la primera publicación de este tema"
-        edit_bookmark: "Haga clic para editar el marcador sobre este tema"
+        bookmark: "Haz clic para marcar este tema como favorito"
+        edit_bookmark: "Haz clic para editar el marcador de una publicación de este tema"
         edit_bookmark_for_topic: "Haz clic para editar el marcador de este tema"
         unbookmark: "Haz clic para eliminar todos los marcadores de este tema"
-        unbookmark_with_reminder: "Haz clic para eliminar todos los marcadores y recordatorios de este tema."
+        unbookmark_with_reminder: "Haz clic para eliminar todos los marcadores y recordatorios de este tema"
     bookmarks:
       created: "Has guardado esta publicación en marcadores. %{name}"
       created_generic: "Has añadido esto a marcadores. %{name}"
@@ -350,7 +350,7 @@ es:
       new_topic: "Nuevo borrador de tema"
       new_private_message: "Nuevo borrador de mensaje personal"
       abandon:
-        confirm: "Tienes un borrador en curso para este tema. ¿Qué te gustaría hacer?"
+        confirm: "Ya tienes un borrador en curso. ¿Qué te gustaría hacer con él?"
         yes_value: "Descartar"
         no_value: "Reanudar edición"
     topic_count_categories:
@@ -403,6 +403,8 @@ es:
         search: "Busca un mensaje"
         placeholder: "escribe el título, URL ID del mensaje aquí"
     review:
+      show_more: "Mostrar más"
+      show_less: "Mostrar menos"
       order_by: "Ordenar por"
       date_filter: "Publicado entre"
       in_reply_to: "en respuesta a"
@@ -523,26 +525,43 @@ es:
       scores:
         about: "Esta puntuación se calcula en función del nivel de confianza de quien denuncia, la precisión de sus denuncias anteriores y la prioridad del elemento que se denuncia."
         score: "Puntuación"
-        date: "Fecha"
-        type: "Tipo"
+        date: "Fecha de la denuncia"
+        type: "Motivo"
         status: "Estado"
-        submitted_by: "Enviado por"
+        submitted_by: "Denunciado por"
         reviewed_by: "Revisado por"
+        reviewed_timestamp: "Fecha de revisión"
       statuses:
         pending:
           title: "Pendiente"
         approved:
           title: "Aprobado"
+        approved_flag:
+          title: "Denuncia aprobada"
+        approved_user:
+          title: "Usuario aprobado"
+        approved_post:
+          title: "Publicación aprobada"
         rejected:
           title: "Rechazado"
+        rejected_flag:
+          title: "Denuncia rechazada"
+        rejected_user:
+          title: "Usuario rechazado"
+        rejected_post:
+          title: "Publicación rechazada"
         ignored:
-          title: "Ignorado"
+          title: "Denuncia ignorada"
         deleted:
-          title: "Eliminado"
+          title: "Tema o publicación eliminada"
         reviewed:
-          title: "(todo revisado)"
+          title: "Todo revisado"
         all:
-          title: "(todo)"
+          title: "Todo"
+      context_question:
+        is_this_post: "¿Esta publicación es %{reviewable_human_score_types}?"
+        delimiter: "o"
+        something_else_wrong: "¿Hay algún problema con esta publicación?"
       types:
         reviewable_flagged_post:
           title: "Publicación denunciada"
@@ -555,6 +574,8 @@ es:
           title: "Usuario"
         reviewable_post:
           title: "Publicación"
+        reviewable_chat_message:
+          title: "Mensaje de chat denunciado"
       approval:
         title: "La publicación requiere aprobación"
         description: "Hemos recibido tu nueva publicación, pero debe ser aprobada por un moderador antes de que aparezca. Por favor, ten paciencia."
@@ -849,6 +870,7 @@ es:
         make_all_primary_description: "Hacer este grupo el principal de todos los usuarios seleccionados"
         remove_all_primary: "Quitar como principal"
         remove_all_primary_description: "Quitar este grupo como principal"
+        status: "Estado"
         owner: "Propietario"
         primary: "Principal"
         forbidden: "No tienes permitido ver los miembros del grupo."
@@ -977,10 +999,12 @@ es:
       mute: "Silenciar"
       edit: "Editar preferencias"
       download_archive:
-        button_text: "Descargar todo"
-        confirm: "¿Seguro de que quieres descargar tus publicaciones?"
-        success: "Descarga iniciada, se te notificará por mensaje cuando el proceso se haya completado."
-        rate_limit_error: "Solo se pueden descargar las publicaciones una vez al día. Inténtalo de nuevo mañana."
+        title: "Exporta tus datos"
+        description: "Descarga un archivo con la actividad y preferencias de tu cuenta."
+        button_text: "Solicitar archivo"
+        confirm: "¿Realmente quieres descargar un archivo con la actividad y preferencias de tu cuenta?"
+        success: "Hemos empezado a recopilar tu archivo, recibirás un mensaje cuando se complete el proceso."
+        rate_limit_error: "Los archivos de la cuenta solo pueden descargarse una vez al día, inténtalo de nuevo mañana."
       new_private_message: "Nuevo mensaje"
       private_message: "Mensaje"
       private_messages: "Mensajes"
@@ -1033,6 +1057,7 @@ es:
           warning: "¿Estás seguro de que quieres quitar tu tema destacado?"
       use_current_timezone: "Usar zona horaria actual"
       profile_hidden: "El perfil público de este usuario está oculto."
+      inactive_user: "Este usuario ya no está activo."
       expand_profile: "Expandir"
       sr_expand_profile: "Expandir detalles del perfil"
       collapse_profile: "Contraer"
@@ -1052,7 +1077,7 @@ es:
         perm_denied_expl: "Has denegado el permiso para las notificaciones. Configura tu navegador para permitir notificaciones. "
         disable: "Desactivar notificaciones"
         enable: "Activar notificaciones"
-        each_browser_note: 'Nota: Hay que cambiar esta configuración en cada navegador que utilices. Todas las notificaciones se desactivarán si pausas las notificaciones desde el menú de usuario, independientemente de este ajuste.'
+        each_browser_note: "Nota: Hay que cambiar esta configuración en cada navegador que utilices. Todas las notificaciones se desactivarán si pausas las notificaciones desde el menú de usuario, independientemente de este ajuste."
         consent_prompt: "¿Quieres recibir notificaciones en tiempo real cuando alguien responda a tus mensajes?"
       dismiss: "Descartar"
       dismiss_notifications: "Descartar todo"
@@ -1103,14 +1128,10 @@ es:
       experimental_sidebar:
         enable: "Activar barra lateral"
         options: "Opciones"
-        categories_section: "Sección de categorías"
-        categories_section_instruction: "Las categorías que elijas aparecerán en esta categoría de la barra lateral."
-        tags_section: "Sección de etiquetas"
-        tags_section_instruction: "Las etiquetas seleccionadas aparecerán en esta sección de la barra lateral."
         navigation_section: "Navegación"
-        list_destination_instruction: "Cuando hay contenido nuevo en la barra lateral..."
-        list_destination_default: "usar el enlace por defecto y mostrar una insignia para nuevos elementos"
-        list_destination_unread_new: "vincular a no leído/nuevo y mostrar un recuento de elementos nuevos"
+        navigation_section_instruction: "Cuando una lista de temas del menú de navegación tiene elementos nuevos o no leídos..."
+        link_to_filtered_list_checkbox_description: "Enlace a la lista filtrada"
+        show_count_new_items_checkbox_description: "Mostrar un recuento de los elementos nuevos"
       change: "cambio"
       featured_topic: "Tema destacado"
       moderator: "%{user} es un moderador"
@@ -1149,6 +1170,7 @@ es:
       watched_first_post_categories_instructions: "Se te notificará la primera publicación en cada tema nuevo en estas categorías."
       watched_first_post_tags: "Vigilando la primera publicación"
       watched_first_post_tags_instructions: "Se te notificará la primera publicación en cada tema nuevo con estas etiquetas."
+      watched_precedence_over_muted: "Notificarme sobre temas en categorías o etiquetas que estoy viendo y que también pertenezcan a una que haya silenciado"
       muted_categories: "Silenciado"
       muted_categories_instructions: "No se te notificará acerca de ningún tema en estas categorías y no aparecerán en la página de categorías o mensajes recientes."
       muted_categories_instructions_dont_hide: "No se te notificará nada acerca de temas nuevos en estas categorías."
@@ -1181,12 +1203,24 @@ es:
       home: "Página de inicio por defecto"
       staged: "Temporal"
       staff_counters:
-        flags_given: "denuncias útiles"
-        flagged_posts: "publicaciones denunciadas"
-        deleted_posts: "publicaciones eliminadas"
-        suspensions: "suspensiones"
-        warnings_received: "avisos"
-        rejected_posts: "publicaciones rechazadas"
+        flags_given:
+          one: '<span class="%{className}">%{count}</span> denuncia útil'
+          other: '<span class="%{className}">%{count}</span> denuncias útiles'
+        flagged_posts:
+          one: '<span class="%{className}">%{count}</span> publicación denunciada'
+          other: '<span class="%{className}">%{count}</span> publicaciones denunciadas'
+        deleted_posts:
+          one: '<span class="%{className}">%{cuenta}</span> publicación eliminada'
+          other: '<span class="%{className}">%{cuenta}</span> publicaciones eliminadas'
+        suspensions:
+          one: '<span class="%{className}">%{cuenta}</span> suspensión'
+          other: '<span class="%{className}">%{count}</span> suspensiones'
+        warnings_received:
+          one: '<span class="%{className}">%{count}</span> advertencia'
+          other: '<span class="%{className}">%{count}</span> advertencias'
+        rejected_posts:
+          one: '<span class="%{className}">%{cuenta}</span> publicación rechazada'
+          other: '<span class="%{className}">%{count}</span> publicaciones rechazadas'
       messages:
         all: "todas las bandejas de entrada"
         inbox: "Bandeja de entrada"
@@ -1279,7 +1313,7 @@ es:
         tags: "Etiquetas"
         interface: "Interfaz"
         apps: "Aplicaciones"
-        sidebar: "Barra lateral"
+        navigation_menu: "Menú de navegación"
       change_password:
         success: "(correo electrónico enviado)"
         in_progress: "(enviando correo electrónico)"
@@ -1293,11 +1327,12 @@ es:
         title: "Códigos de respaldo de la verificación en dos factores"
         regenerate: "Generar nuevos"
         disable: "Desactivar"
-        enable: "Activar"
-        enable_long: "Activar códigos de respaldo"
+        enable: "Crear códigos de copia de seguridad"
+        enable_long: "Añadir códigos de copia de seguridad"
+        not_enabled: "Aún no has creado ningún código de copia de seguridad."
         manage:
-          one: "Gestiona tus códigos de respaldo. Te queda <strong>%{count}</strong> código sin usar."
-          other: "Gestiona tus códigos de respaldo. Te quedan <strong>%{count}</strong> códigos sin usar."
+          one: "Te queda <strong>%{count}</strong> código de copia de seguridad sin usar todavía."
+          other: "Te quedan <strong>%{count}</strong> códigos de copia de seguridad sin usar todavía."
         copy_to_clipboard: "Copiar al portapapeles"
         copy_to_clipboard_error: "Error al copiar datos al portapapeles"
         copied_to_clipboard: "Copiado al portapapeles"
@@ -1381,6 +1416,7 @@ es:
         success: "Te hemos enviado un correo electrónico a esa dirección. Sigue las instrucciones de confirmación."
         success_via_admin: "Hemos enviado un correo electrónico a esa dirección. El usuario tendrá que seguir las instrucciones de confirmación."
         success_staff: "Hemos enviado un correo electrónico a tu dirección actual. Sigue las instrucciones de confirmación."
+        back_to_preferences: "Volver a preferencias"
       change_avatar:
         title: "Cambiar tu imagen de perfil"
         gravatar: "<a href='//%{gravatarBaseUrl}%{gravatarLoginUrl}' target='_blank'>%{gravatarName}</a>, basado en"
@@ -1735,8 +1771,7 @@ es:
       pause_notifications: "Pausar notificaciones"
       remove_status: "Quitar estado"
     user_tips:
-      primary: "¡Entendido!"
-      secondary: "no mostrarme estos consejos"
+      button: "¡Entendido!"
       first_notification:
         title: "¡Tu primera notificación!"
         content: "Las notificaciones se utilizan para mantenerte al día de lo que ocurre en la comunidad."
@@ -1752,6 +1787,10 @@ es:
       suggested_topics:
         title: "¡Sigue leyendo!"
         content: "Estos son algunos de los temas que creemos que te gustaría leer a continuación."
+      admin_guide:
+        title: "¡Te damos la bienvenida a tu nuevo sitio!"
+        content: "Lee la guía del administrador para seguir construyendo tu sitio y tu comunidad."
+        button: "¡Vamos!"
     loading: "Cargando..."
     errors:
       prev_page: "mientras se intentaba cargar"
@@ -1786,23 +1825,6 @@ es:
       logout_disabled: "No se puede cerrar sesión mientras el sitio se encuentre en modo de solo lectura."
     staff_writes_only_mode:
       enabled: "Este sitio está en modo solo para el personal. Sigue navegando, pero las respuestas, los «me gusta» y otras acciones están limitadas solo a los miembros del personal."
-    too_few_topics_and_posts_notice_MF: |
-      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">¡Comencemos la discusión!</a> Hay { currentTopics, plural,
-          one {<strong>#</strong> tema}
-        other {<strong>#</strong> temas}
-      } y { currentPosts, plural,
-          one {<strong>#</strong> publicación}
-        other {<strong>#</strong> publicaciones}
-      }. Los visitantes necesitan más contenido para leer y responder: nosotros recomendamos al menos { requiredTopics, plural,
-          one {<strong>#</strong> tema}
-        other {<strong>#</strong> temas}
-      } y { requiredPosts, plural,
-          one {<strong>#</strong> publicación}
-        other {<strong>#</strong> publicaciones}
-      }. Solo los miembros del equipo pueden ver este mensaje.
-    too_few_topics_notice_MF: "<a href=\"https://blog.discourse.org/2014/08/building-a-discourse-community/\" target=\"_blank\" rel=\"noopener noreferrer\">¡Comencemos la discusión!</a> Hay { currentTopics, plural, \n    one {<strong>#</strong> tema}\n  other {<strong>#</strong> temas}}.\nLos visitantes necesitan más contenido para leer y responder: nosotros recomendamos al menos { requiredTopics, plural, \n    one {<strong>#</strong> tema} \n  other {<strong>#</strong> temas}}. \nSolo los miembros del equipo pueden ver este mensaje.\n"
-    too_few_posts_notice_MF: |
-      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">¡Comencemos la discusión!</a> Hay { currentPosts, plural, one {<strong>#</strong> publicación} other {<strong>#</strong> publicaciones}}. Los visitantes necesitan más contenido para leer y responder – nosotros recomendamos al menos { requiredPosts, plural, one {<strong>#</strong> publicación} other {<strong>#</strong> publicaciones}}. Solo los miembros del equipo pueden ver este mensaje.
     logs_error_rate_notice:
       reached_hour_MF: |
         <b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/hora} other {# errores/hora}}</a> alcanzó el límite de la configuración del sitio de {limit, plural, one {# error/hora} other {# errores/hora}}.
@@ -1832,17 +1854,31 @@ es:
       hidden_for_session: "Vale, te preguntamos mañana. También puedes darle a «Iniciar sesión» para crear tu cuenta."
       intro: "¡Hola! Parece que estás disfrutando del tema, pero no has creado una cuenta todavía."
       value_prop: "¿Cansado de recorrer las mismas publicaciones? Si creas una cuenta, siempre volverás al punto donde lo dejaste. Con una cuenta también puedes recibir notificaciones de nuevas respuestas, guardar marcadores y utilizar los «me gusta» para dar las gracias a los demás. Podemos trabajar todos juntos para hacer grande esta comunidad :heart:"
+    offline_indicator:
+      no_internet: "Sin conexión a Internet."
+      refresh_page: "Actualizar página"
     summary:
-      enabled_description: "Estás viendo un resumen de este tema: las publicaciones más interesantes de acuerdo a la comunidad."
+      in_progress: "Resumir tema utilizando IA..."
+      summarized_on: "Resumido con AI el %{date}"
+      model_used: "IA utilizada: %{model}"
+      outdated: "El resumen está obsoleto"
+      outdated_posts:
+        one: "(Falta %{count} publicación)"
+        other: "(Faltan %{count} publicaciones)"
+      enabled_description: "Estás viendo las principales respuestas de este tema: las publicaciones más interesantes según la comunidad."
       description:
         one: "Hay <b>%{count}</b> respuesta."
         other: "Hay <b>%{count}</b> respuestas."
+      buttons:
+        hide: "Ocultar resumen"
+        generate: "Resumir con IA"
+        regenerate: "Regenerar resumen"
       description_time_MF: |
         Hay {replyCount, plural, one {Hay <b>#</b> respuesta} other {Hay <b>#</b> respuestas}} con un tiempo estimado de lectura de <b>{readingTime, plural, one {# minuto} other {# minutos}}</b>.
-      enable: "Resumir este tema"
+      enable: "Mostrar las respuestas principales"
       disable: "Mostrar todas las publicaciones"
-      short_label: "Resumir"
-      short_title: "Muestra un resumen de este tema: los mensajes más interesantes según la comunidad"
+      short_label: "Respuestas principales"
+      short_title: "Mostrar las principales respuestas de este tema: las publicaciones más interesantes según la comunidad"
     deleted_filter:
       enabled_description: "Este tema contiene publicaciones eliminadas que se han ocultado."
       disabled_description: "Se muestran las publicaciones eliminadas de este tema. "
@@ -2141,8 +2177,6 @@ es:
         topic_template_not_modified: "Añade detalles y especificaciones a tu tema editando la plantilla de tema."
       save_edit: "Guardar edición"
       overwrite_edit: "Sobrescribir edición"
-      reply_original: "Responder en el tema original"
-      reply_here: "Responder aquí"
       reply: "Responder"
       cancel: "Cancelar"
       create_topic: "Crear tema"
@@ -2244,6 +2278,7 @@ es:
       image_alt_text:
         aria_label: Texto alternativo para imagen
       delete_image_button: Eliminar imagen
+      toggle_image_grid: Alternar cuadrícula de imágenes
     notifications:
       tooltip:
         regular:
@@ -2307,6 +2342,7 @@ es:
       reaction_2: "<span>%{username}, %{username2}</span> %{description}"
       votes_released: "%{description} - completado"
       new_features: "¡Nuevas características disponibles!"
+      admin_problems: "Nuevos consejos en tu panel de control del sitio"
       dismiss_confirmation:
         body:
           default:
@@ -2572,6 +2608,11 @@ es:
         dismiss_tooltip: "Descartar solamente las nuevas publicaciones o dejar de seguir los temas"
         also_dismiss_topics: "Dejar de seguir estos temas para que no aparezcan más en mis mensajes no leídos"
         dismiss_new: "Descartar nuevos"
+        dismiss_new_modal:
+          title: "Descartar nuevo"
+          topics: "Rechazar nuevos temas"
+          posts: "Rechazar nuevas publicaciones"
+          untrack: "Dejar de seguir estos temas para que dejen de aparecer en mi nueva lista"
         dismiss_new_with_selected:
           one: "Descartar nuevo (%{count})"
           other: "Descartar nuevos (%{count})"
@@ -2609,9 +2650,11 @@ es:
         bookmarks: "Todavía no tienes temas guardados en marcadores."
         category: "No hay temas con la categoría %{category}."
         top: "No hay temas destacados."
+        filter: "No hay temas."
         educate:
           new: '<p>Tus nuevos temas aparecerán aquí. Por defecto, los temas se consideran nuevos y mostrarán un <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span> indicador si se crearon hace menos de 2 días.</p><p>Visita tus <a href="%{userPrefsUrl}">preferencias</a> para cambiarlo.</p>'
-          unread: "<p>Los temas sin leer aparecerán aquí.</p><p>Por defecto, se consideran sin leer y tendrán un marcador <span class=\"badge unread-posts badge-notification\">1</span> si:</p><ul><li>Has creado el tema</li><li>Has respondido al tema</li><li>Has leído el tema durante más de 4 minutos</li></ul><p>O si has seguido o vigilado el tema a través de la \U0001F514 individualmente en cada tema.</p><p>Visita tus <a href=\"%{userPrefsUrl}\">preferencias</a> para cambiar esto.</p>"
+          unread: "<p>Los temas sin leer aparecerán aquí.</p><p>Por defecto, se consideran sin leer y tendrán un marcador <span class=\"badge unread-posts badge-notification\">1</span> si:</p><ul><li>Has creado el tema</li><li>Has respondido al tema</li><li>Has leído el tema durante más de 5 minutos</li></ul><p>O si has seguido o vigilado el tema a través de la \U0001F514 individualmente en cada tema.</p><p>Visita tus <a href=\"%{userPrefsUrl}\">preferencias</a> para cambiar esto.</p>"
+          new_new: "<p>Tus temas nuevos aparecerán aquí, y también se mostrarán tus temas no leídos. Por defecto, los temas se consideran nuevos y mostrarán un indicador <span class=\"badge new-topic badge-notification\" style=\"vertical-align:middle;line-height:inherit;\"></span> si se han creado en los últimos 2 días. Los temas no leídos tendrán un marcador <pan class=\"badge unread-posts badge-notification\">1</span> si: has creado el tema, has respondido al tema, has leído el tema durante más de 5 minutos, o si has seguido o vigilado el tema a través de la \U0001F514 individualmente en cada tema.</p><p>Visita tus <a href=\"%{userPrefsUrl}\">preferencias</a> para cambiar esto.</p>"
       bottom:
         latest: "No hay más temas recientes."
         posted: "No hay más temas publicados."
@@ -2623,11 +2666,13 @@ es:
         tag: "No hay más temas con la etiqueta %{tag}."
         top: "No hay más temas destacados."
         bookmarks: "No hay más temas guardados en marcadores."
+        filter: "No hay más temas."
     topic:
       filter_to:
         one: "%{count} publicación en el tema"
         other: "%{count} publicaciones en el tema"
       create: "Nuevo tema"
+      create_disabled_category: "No tienes permiso para crear temas en esta categoría."
       create_long: "Crear un tema nuevo"
       open_draft: "Abrir borrador"
       private_message: "Comenzar un mensaje"
@@ -2674,6 +2719,7 @@ es:
       read_more_in_category: "¿Quieres leer más? Explora otros temas en %{categoryLink} o <a href='%{latestLink}'>consulta los últimos temas</a>."
       read_more: "¿Quieres leer más? <a href='%{categoryLink}'>Examina todas las categorías</a> o <a href='%{latestLink}'>consulta los últimos temas</a>."
       unread_indicator: "Ningún miembro ha leído todavía la última publicación de este tema."
+      participant_groups: "Grupos participantes"
       read_more_MF: |
         { HAS_UNREAD_AND_NEW, select,
           true {
@@ -2714,8 +2760,8 @@ es:
       browse_all_categories_latest_or_top: "<a href='%{basePath}/categories'>Explorar todas las categorías</a>, <a href='%{basePath}/latest'>ver los temas más recientes</a> o ver la parte superior:"
       browse_all_tags_or_latest: "<a href='%{basePath}/tags'>Explorar todas las etiquetas</a> o <a href='%{basePath}/latest'>ver los temas más recientes</a>."
       suggest_create_topic: '¿Listo para <a href>iniciar una nueva conversación?</a>'
-      jump_reply_up: saltar a la primera respuesta
-      jump_reply_down: saltar a la última respuesta
+      jump_reply: "Saltar a la ubicación original del mensaje"
+      jump_reply_aria: "Saltar al mensaje de @%{username} en su ubicación original"
       deleted: "El tema ha sido eliminado"
       slow_mode_update:
         title: "Modo lento"
@@ -2983,6 +3029,7 @@ es:
         instructions:
           one: "Escoge el tema al que quieres mover esa publicación."
           other: "Escoge el tema al que quieres mover estas <b>%{count}</b> publicaciones."
+        chronological_order: "preservar el orden cronológico tras la fusión"
       move_to_new_message:
         title: "Mover a un mensaje nuevo"
         action: "mover a un mensaje nuevo"
@@ -3070,6 +3117,7 @@ es:
       ignored: "Contenido ignorado"
       wiki_last_edited_on: "wiki editada por última vez el %{dateTime}"
       last_edited_on: "publicación editada por última vez el %{dateTime}"
+      edit_history: "historial de edición de la publicación"
       reply_as_new_topic: "Responder como tema enlazado"
       reply_as_new_private_message: "Responder como mensaje nuevo a los mismos destinatarios"
       continue_discussion: "Continuando la discusión desde %{postLink}:"
@@ -3081,8 +3129,8 @@ es:
       sr_collapse_replies: "Contraer respuestas inscrustadas"
       sr_date: "Fecha de publicación"
       sr_expand_replies:
-        one: "Esta publicación tiene %{count} respuesta. Haz clic para expandir"
-        other: "Esta publicación tiene %{count} respuestas. Haz clic para expandir"
+        one: "Este mensaje tiene %{count} respuesta"
+        other: "Este mensaje tiene %{count} respuestas"
       expand_collapse: "expandir/contraer"
       sr_below_embedded_posts_description: "respuestas de la publicación n.º %{post_number}"
       sr_embedded_reply_description: "respuesta de @%{username} a la publicación n.º %{post_number}"
@@ -3240,6 +3288,8 @@ es:
           last: "Última edición"
           hide: "Ocultar edición"
           show: "Mostrar edición"
+          destroy: "Eliminar revisiones"
+          destroy_confirm: "¿Seguro que quieres eliminar todas las revisiones de esta publicación? Esta acción es permanente."
           revert: "Volver a la edición %{revision}"
           edit_wiki: "Editar wiki"
           edit_post: "Editar publicación"
@@ -3273,6 +3323,7 @@ es:
         updated: "Actualizado"
         name: "Nombre"
         name_placeholder: "¿Para qué es este marcador?"
+        name_input_label: "Nombre del marcador"
         set_reminder: "Recordarme"
         options: "Opciones"
         actions:
@@ -3294,7 +3345,7 @@ es:
       filtered_replies:
         viewing_posts_by: "Viendo %{post_count} publicaciones de"
         viewing_subset: "Algunas respuestas no se muestran"
-        viewing_summary: "Estás viendo un resumen de este tema"
+        viewing_summary: "Ver las respuestas principales de este tema"
         post_number: "%{username}, publicación nº %{post_number}"
         show_all: "Mostrar todas"
       share:
@@ -3311,7 +3362,7 @@ es:
       back: "Volver a la categoría"
       general: "General"
       settings: "Ajustes"
-      topic_template: "Plantilla de tema"
+      topic_template: "Plantilla"
       tags: "Etiquetas"
       tags_allowed_tags: "Restringir estas etiquetas a esta categoría:"
       tags_allowed_tag_groups: "Restringir estos grupos de etiquetas a esta categoría:"
@@ -3370,8 +3421,7 @@ es:
       email_in: "Dirección de correo electrónico personalizada para el correo entrante:"
       email_in_tooltip: "Puedes separar varias direcciones de correo electrónico con el carácter |."
       email_in_allow_strangers: "Aceptar correo electrónicos de usuarios anónimos sin cuenta"
-      email_in_disabled: "La posibilidad de publicar temas nuevos por correo electrónico está desactivada en los ajustes del sitio. Para activar la publicación de temas nuevos por correo electrónico,"
-      email_in_disabled_click: 'activa la opción «correo electrónico»'
+      email_in_disabled: "La publicación de nuevos temas por correo electrónico está desactivada. Para activar la publicación de nuevos temas por correo electrónico, activa el ajuste <a href='%{setting_url}'>'email in'</a>."
       mailinglist_mirror: "La categoría es el reflejo de una lista de correo"
       show_subcategory_list: "Mostrar la lista de subcategorías arriba de la lista de temas en esta categoría."
       read_only_banner: "Texto de banner cuando un usuario no pueda crear un tema en esta categoría:"
@@ -3398,6 +3448,7 @@ es:
       default_slow_mode: 'Activar «modo lento» en los nuevos temas de esta categoría'
       parent: "Categoría principal"
       num_auto_bump_daily: "Número de temas abiertos que se reflotarán diariamente de forma automática:"
+      auto_bump_cooldown_days: "Mínimo de días antes de reactivar el mismo tema:"
       navigate_to_first_post_after_read: "Ir a la primera publicación después de haber leído los temas"
       notifications:
         title: "cambiar el nivel de notificación de esta categoría"
@@ -3483,7 +3534,9 @@ es:
         inappropriate: "Es inapropiado"
         spam: "Es spam"
       custom_placeholder_notify_user: "Sé específico, constructivo y siempre amable."
+      notify_user_textarea_label: "Mensaje para el usuario"
       custom_placeholder_notify_moderators: "Haznos saber qué te preocupa específicamente y, siempre que sea posible, incluye enlaces y ejemplos relevantes."
+      notify_moderators_textarea_label: "Mensaje para los moderadores"
       custom_message:
         at_least:
           one: "introduce al menos %{count} caracteres"
@@ -3579,6 +3632,10 @@ es:
     filters:
       with_topics: "%{filter} temas"
       with_category: "%{filter} Foro de %{category}"
+      filter:
+        title: "Filtrar"
+        button:
+          label: "Filtrar"
       latest:
         title: "Recientes"
         title_with_count:
@@ -3649,7 +3706,6 @@ es:
         this_week: "Semana"
         today: "Hoy"
     browser_update: 'Por desgracia, <a href="https://www.discourse.org/faq/#browser">tu navegador no es compatible</a>. Por favor, <a href="https://browsehappy.com">usa otro navegador</a> para ver el contenido completo, iniciar sesión y responder.'
-    safari_13_warning: Este sitio pronto dejará de ser compatible con las versiones 13 y anteriores de iOS y Safari. En su lugar, verás una versión simplificada y de solo lectura. (<a href="https://meta.discourse.org/t/224747">más información</a>)
     permission_types:
       full: "Crear / Responder / Ver"
       create_post: "Responder / Ver"
@@ -3664,6 +3720,20 @@ es:
       close: "Cerrar (Esc)"
       content_load_error: '<a href="%url%">El contenido</a> no se pudo cargar.'
       image_load_error: '<a href="%url%">La imagen</a> no se pudo cargar.'
+    experimental_lightbox:
+      image_load_error: "No se ha podido cargar la imagen."
+      screen_reader_image_title: "Imagen %{current} de %{total}: %{title}"
+      buttons:
+        next: "Siguiente (tecla de flecha derecha o abajo)"
+        previous: "Anterior (tecla de flecha izquierda o arriba)"
+        close: "Cerrar (Esc)"
+        download: "Descargar imagen"
+        newtab: "Abrir la imagen en una pestaña nueva"
+        zoom: "Acercar/alejar la imagen (tecla Z)"
+        rotate: "Girar la imagen (tecla R)"
+        fullscreen: "Alternar el modo de pantalla completa del navegador (tecla M)"
+        carousel: "Mostrar todas las imágenes en un carrusel (tecla A)"
+        retry: "Reintentar cargar la imagen"
     cannot_render_video: Este vídeo no se puede mostrar porque tu navegador no es compatible con el códec.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
@@ -3711,6 +3781,7 @@ es:
         title: "Redactando"
         return: "%{shortcut} Regresar al editor"
         fullscreen: "%{shortcut} Edición en pantalla completa"
+        insert_current_time: "%{shortcut} Insertar hora actual"
       bookmarks:
         title: "Marcadores"
         enter: "%{shortcut} Guardar y cerrar"
@@ -3756,7 +3827,9 @@ es:
         one: "Insignia ganada %{count} vez"
         other: "Insignia ganada %{count} veces"
       granted_on: "Concedido hace %{date}"
-      others_count: "Otras personas con esta insignia (%{count})"
+      others_count:
+        one: "Concedido a otros %{count} vez"
+        other: "Concedido a otros %{count} veces"
       title: Insignias
       allow_title: "Puedes usar esta insignia como título"
       multiple_grant: "Puedes ganar esta insignia varias veces"
@@ -3769,6 +3842,7 @@ es:
       granted:
         one: "%{count} concedida"
         other: "%{count} concedidas"
+      awarded: concedido
       select_badge_for_title: Selecciona una insignia para utilizar como tu título
       none: "(ninguna)"
       successfully_granted: "%{badge} concedida exitosamente a %{username}"
@@ -3939,13 +4013,11 @@ es:
     pause_notifications:
       title: "Pausar notificaciones para..."
       label: "Pausar notificaciones"
-      remaining: "%{remaining} restante"
       options:
         half_hour: "30 minutos"
         one_hour: "1 hora"
         two_hours: "2 horas"
         tomorrow: "Hasta mañana"
-        custom: "Personalizado"
       set_schedule: "Establecer un horario de notificaciones"
     trust_levels:
       names:
@@ -3994,7 +4066,61 @@ es:
       more: "Más"
       all_categories: "Todas las categorías"
       all_tags: "Todas las etiquetas"
+      categories_form_modal:
+        title: "Editar navegación de las categorías"
+        subtitle:
+          text: "y mostraremos automáticamente las categorías más populares de este sitio"
+        filter_placeholder: "Filtrar categorías"
+        no_categories: "No hay categorías que coincidan con el término proporcionado."
+      tags_form_modal:
+        title: "Editar etiquetas navegación"
+        filter_placeholder: "Filtrar etiquetas"
+        no_tags: "No hay etiquetas que coincidan con el término proporcionado."
+        subtitle:
+          text: "y mostraremos automáticamente las etiquetas principales de este sitio"
+      edit_navigation_modal_form:
+        deselect_button_text: "Deseleccionar todo"
+        reset_to_defaults: "Restablecer valores por defecto"
+        filter_dropdown:
+          all: "Todos"
+          selected: "Seleccionado"
+          unselected: "No seleccionado"
       sections:
+        custom:
+          add: "Añadir sección personalizada"
+          edit: "Editar sección personalizada"
+          save: "Guardar"
+          delete: "Eliminar"
+          delete_confirm: "¿Seguro que quieres eliminar esta sección?"
+          reset_confirm: "¿Seguro que quieres restablecer esta sección a los valores predeterminados?"
+          public: "Hacer que esta sección sea pública y visible para todos"
+          always_public: "El contenido de esta sección es siempre público"
+          more_menu: "Menú Más"
+          links:
+            add: "Añadir otro enlace"
+            delete: "Eliminar enlace"
+            reset: "Restablecer valores por defecto"
+            icon:
+              label: "Icono"
+              validation:
+                blank: "El icono no puede estar en blanco"
+                maximum: "El icono debe tener menos de %{count} caracteres"
+            name:
+              label: "Nombre"
+              validation:
+                blank: "El nombre no puede estar en blanco"
+                maximum: "El nombre debe tener menos de %{count} caracteres"
+            value:
+              label: "Enlace"
+              validation:
+                blank: "El enlace no puede estar en blanco"
+                maximum: "El enlace debe tener menos de %{count} caracteres"
+                invalid: "El formato no es válido"
+          title:
+            label: "Título de la sección"
+            validation:
+              blank: "El título no puede estar en blanco"
+              maximum: "El título debe tener menos de %{count} caracteres"
         about:
           header_link_text: "Acerca de"
         messages:
@@ -4009,28 +4135,21 @@ es:
             unread_with_count: "Sin leer (%{count})"
             archive: "Archivo"
         tags:
-          links:
-            add_tags:
-              content: "Añadir etiquetas"
-              title: "No has añadido ninguna etiqueta. Haz clic para empezar."
           none: "No has añadido ninguna etiqueta."
           click_to_get_started: "Haz clic aquí para empezar."
           header_link_text: "Etiquetas"
           header_action_title: "Editar las etiquetas de tu barra lateral"
           configure_defaults: "Configurar valores predeterminados"
         categories:
-          links:
-            add_categories:
-              content: "Añadir categorías"
-              title: "No has añadido ninguna categoría. Haz clic para empezar."
           none: "No has añadido ninguna categoría."
           click_to_get_started: "Haz clic aquí para empezar."
           header_link_text: "Categorías"
           header_action_title: "Editar las categorías de tu barra lateral"
           configure_defaults: "Configurar valores predeterminados"
         community:
-          header_link_text: "Comunidad"
-          header_action_title: "Crear un tema"
+          edit_section:
+            sidebar: "Personaliza esta sección"
+            header_dropdown: "Personalizar"
           links:
             about:
               content: "Acerca de"
@@ -4041,8 +4160,8 @@ es:
             badges:
               content: "Insignias"
               title: "Todas las insignias disponibles para ganar"
-            everything:
-              content: "Todo"
+            topics:
+              content: "Temas"
               title: "Todos los temas"
             faq:
               content: "Preguntas frecuentes"
@@ -4055,6 +4174,7 @@ es:
               title: "Lista de todos los usuarios"
             my_posts:
               content: "Mis publicaciones"
+              content_drafts: "Mis borradores"
               title: "Mi actividad de tema reciente"
               title_drafts: "Mis borradores no publicados"
               draft_count:
@@ -4064,11 +4184,43 @@ es:
               content: "Revisión"
               title: "Publicaciones denunciadas y otros elementos en cola"
               pending_count: "%{count} pendiente(s)"
+        global_section: "Sección global, visible para todos"
+      panels:
+        forum:
+          label: Foro
     welcome_topic_banner:
       title: "Crea tu tema de bienvenida"
       description: "Tu tema de bienvenida es lo primero que leerán los nuevos miembros. Piensa en él como tu «discurso breve» o una «declaración de misión». Haz que todos sepan para quién es esta comunidad, qué pueden esperar encontrar aquí y qué te gustaría que hicieran primero."
       button_title: "Empezar a editar"
     until: "Hasta:"
+    char_counter:
+      exceeded: "Se ha superado el número máximo de caracteres permitidos."
+    form_template_chooser:
+      select_template: "Seleccionar plantillas de formulario"
+    form_templates:
+      errors:
+        valueMissing:
+          default: "Rellena este campo."
+          text: "Rellena este campo."
+          select-one: "Selecciona un elemento de la lista."
+          select-multiple: "Selecciona al menos un elemento de la lista."
+          checkbox: "Marca esta casilla si quieres continuar."
+        typeMismatch:
+          default: "Introduce un valor válido."
+          color: "Introduce un color."
+          date: "Introduce una fecha."
+          email: "Introduce una dirección de correo electrónico válida."
+          number: "Introduce un número."
+          password: "Introduce una contraseña válida."
+          tel: "Introduce un número de teléfono válido."
+          text: "Introduce un valor de texto."
+          url: "Introduce una URL válida."
+        tooShort: "La entrada debe tener %{minLength} caracteres o más."
+        tooLong: "La entrada debe tener menos de %{maxLength} caracteres."
+        rangeOverflow: "La entrada debe ser menor que %{max}."
+        rangeUnderflow: "La entrada debe ser mayor que %{min}."
+        patternMismatch: "Utiliza el formato solicitado."
+        badInput: "Introduce una entrada válida."
   admin_js:
     type_to_filter: "filtrar opciones..."
     admin:
@@ -4227,10 +4379,14 @@ es:
         about: "Edita la membresía de tu grupo y sus nombres aquí"
         group_members: "Miembros del grupo"
         delete: "Eliminar"
-        delete_confirm: "¿Seguro que quieres eliminar este grupo?"
+        delete_confirm: "¿Seguro que quieres eliminar %{group}?"
+        delete_details:
+          one: "%{count} persona perderá el acceso a este grupo"
+          other: "%{count} personas perderán el acceso a este grupo"
         delete_with_messages_confirm:
-          one: "Al eliminar este grupo, %{count} mensaje se quedará huérfano, y los miembros del grupo dejarán de tener acceso a él."
-          other: "Al eliminar este grupo, %{count} mensajes se quedará huérfanos, y los miembros del grupo dejarán de tener acceso a ellos."
+          one: "%{count} mensaje será inaccesible para los miembros del grupo"
+          other: "%{count} mensajes serán inaccesibles para los miembros del grupo"
+        delete_warning: "Los grupos eliminados no se pueden recuperar"
         delete_failed: "No se pudo eliminar el grupo. Si este es un grupo automático, no se puede destruir."
         delete_automatic_group: Este grupo se ha creado automáticamente y no se puede eliminar.
         delete_owner_confirm: "¿Quitar los privilegios de propietario a «%{username}»?"
@@ -4295,10 +4451,16 @@ es:
             topics:
               read: Leer un tema o una publicación específica del mismo. También usando RSS.
               write: Crear un nuevo tema o publicar en uno existente.
-              update: Actualizar un tema. Cambiar el título, categoría, etiquetas, etc.
+              update: Actualiza un tema. Cambia el título, la categoría, las etiquetas, el estado, el arquetipo, el enlace_destacado, etc.
+              delete: Eliminar un tema.
               read_lists: Lea listas de temas como destacados, nuevos, recientes, etc. También se admite RSS.
+              status: "Actualiza el estado de un tema. Estado: cerrado, archivado, visible, anclado. Activado: verdadero, falso. Especifica un category_id aquí y en la carga útil de la solicitud para permitir solo cambios de estado en temas de esa categoría."
             posts:
               edit: Edita cualquier publicación o una específica.
+              delete: Eliminar una publicación.
+              list: Listar las últimas publicaciones y publicaciones privadas. También se admite RSS.
+            tags:
+              list: Listar etiquetas.
             categories:
               list: Obtener la lista de categorías.
               show: Obtener una sola categoría por id.
@@ -4312,6 +4474,7 @@ es:
               update: Actualizar información del perfil de usuario.
               log_out: Cerrar sesión todas las sesiones del usuario.
               anonymize: Anonimizar cuentas de usuario.
+              suspend: Suspender cuentas de usuario.
               delete: Eliminar cuentas de usuario.
               list: Obtener una lista de usuarios.
             user_status:
@@ -4319,6 +4482,8 @@ es:
               update: Actualizar estado de usuario.
             email:
               receive_emails: Combinar este ámbito con el ámbito mail-receiver para procesar correos entrantes.
+            invites:
+              create: Enviar invitaciones por correo electrónico o generar enlaces de invitación.
             badges:
               create: Crear nuevas medallas.
               show: Obtener información sobre las medallas.
@@ -4327,6 +4492,12 @@ es:
               list_user_badges: Listar las medallas de los usuarios.
               assign_badge_to_user: Dar medallas a los usuarios.
               revoke_badge_from_user: Quitar medallas de los usuarios.
+            groups:
+              manage_groups: Listar, añadir y eliminar miembros del grupo.
+              administer_groups: Listar, mostrar, crear, actualizar y eliminar grupos.
+            search:
+              show: Buscar utilizando la ruta `/search.json?q=term`.
+              query: Buscar utilizando la ruta `/search/query?term=term`.
             wordpress:
               publishing: Necesario para las funcionalidades de publicación del plugin WP Discourse (obligatorio).
               commenting: Necesario para las funcionalidades de comentarios del plugin WP Discourse.
@@ -4393,8 +4564,8 @@ es:
           name: "Evento por ascenso de usuario"
           details: "Cuando un usuario asciende de nivel de confianza."
         user_badge_event:
-          name: "Evento por obtención de insignia"
-          details: "Cuando un usuario recibe una insignia."
+          name: "Evento de insignia"
+          details: "Cuando se concede o se revoca una insignia."
         group_user_event:
           name: "Evento de usuario de grupo"
           details: "Cuando se agrega o elimina un usuario en un grupo."
@@ -4437,7 +4608,7 @@ es:
         enabled: "¿Activado?"
         is_enabled: "S"
         not_enabled: "N"
-        change_settings: "Cambiar ajustes"
+        change_settings: "Ajustes del plugin"
         change_settings_short: "Ajustes"
         howto: "¿Cómo instalo plugins?"
         official: "Plugin oficial"
@@ -4691,6 +4862,9 @@ es:
           embedded_scss:
             text: "CSS incrustado"
             title: "Introduce el CSS personalizado para mostrar en la versión insertada de los comentarios"
+          embedded_header:
+            text: "Encabezado incrustado"
+            title: "Introduce el HTML que se mostrará encima de la versión incrustada de los comentarios"
           color_definitions:
             text: "Definiciones de color"
             title: "Introducir definiciones de colores personalizadas (para usuarios avanzados)"
@@ -4769,6 +4943,12 @@ es:
           love:
             name: "me encanta"
             description: "El color del botón de me gusta"
+          selected:
+            name: "seleccionado"
+            description: "El color de fondo de elementos como los elementos de lista cuando están seleccionados/activos."
+          hover:
+            name: "pasar el ratón por encima"
+            description: "El color de fondo de elementos como los elementos de lista cuando se pasa el ratón sobre ellos o tienen el foco del teclado."
         robots:
           title: "Sobrescribe el archivo robots.txt de tu sitio:"
           warning: "Esto sobrescribirá permanentemente cualquier configuración del sitio relacionada."
@@ -4899,6 +5079,7 @@ es:
           no_previous: "No existe un valor anterior."
           deleted: "No hay un valor nuevo. El registro ha sido eliminado."
           actions:
+            permanently_delete_post_revisions: "eliminar permanentemente las revisiones de publicaciones"
             delete_user: "eliminar usuario"
             change_trust_level: "cambiar nivel de confianza"
             change_username: "cambiar nombre de usuario"
@@ -4932,6 +5113,7 @@ es:
             revoke_moderation: "revocar moderación"
             backup_create: "crear copia de seguridad"
             deleted_tag: "etiqueta eliminada"
+            update_directory_columns: "actualizar columnas del directorio"
             deleted_unused_tags: "etiquetas sin usar eliminadas"
             renamed_tag: "etiqueta renombrada"
             revoke_email: "revocar correo electrónico"
@@ -4990,6 +5172,10 @@ es:
             delete_group: "eliminar grupo"
             watched_word_create: "añadir palabra vigilada"
             watched_word_destroy: "eliminar palabra vigilada"
+            create_public_sidebar_section: "crear una sección pública en la barra lateral"
+            update_public_sidebar_section: "actualizar la sección pública de la barra lateral"
+            destroy_public_sidebar_section: "destruir la sección pública de la barra lateral"
+            reset_bounce_score: "restablecer puntuación de rebote"
         screened_emails:
           title: "Correos bloqueados"
           description: "Cuando alguien trate de crear una cuenta nueva, los siguientes correos electrónicos se revisarán y el registro se bloqueará, o se realizará alguna otra acción."
@@ -5053,14 +5239,14 @@ es:
           silence: "Silenciar"
           link: "Enlace"
         action_descriptions:
-          block: "Impedir la publicación de mensajes que contengan estas palabras. El usuario verá un mensaje de error cuando trate de publicar su mensaje."
-          censor: "Permitir mensajes que contengan estas palabras, pero reemplazar estas palabras por caracteres que las censuren."
-          require_approval: "Las publicaciones que contengan estas palabras deberán ser aprobadas por el personal antes de que se puedan visualizar."
-          flag: "Permitir publicaciones que contengan estas palabras, pero denunciar el mensaje como inapropiado para que los moderadores puedan revisarlo."
-          replace: "Reemplazar palabras en publicaciones por otras palabras"
-          tag: "Etiquetar temas automáticamente basándose en su primera publicación."
-          silence: "Las primeras publicaciones de usuarios que contengan estas palabras deberán ser aprobadas por el personal antes de que se puedan ver, y el usuario será silenciado automáticamente."
-          link: "Reemplazar palabras en publicaciones por enlaces"
+          block: "Aparecerá un mensaje de error al intentar crear una publicación que contenga estas palabras."
+          censor: "Permitir las publicaciones que contengan estas palabras, pero sustituirlas por caracteres que oculten las palabras censuradas."
+          require_approval: "Requiere la aprobación del personal para las publicaciones que contengan estas palabras antes de que puedan ser visibles para los demás."
+          flag: "Permitir las publicaciones que contengan estas palabras, pero marcarlas como inapropiadas para que las revisen los moderadores."
+          replace: "Reemplazar palabras en publicaciones por otras palabras."
+          tag: "Etiquetar temas automáticamente si el primer mensaje contiene una palabra específica."
+          silence: "Silenciar las cuentas nuevas si su primera publicación contiene alguna de estas palabras. La publicación se ocultará automáticamente hasta que el personal la apruebe."
+          link: "Reemplazar palabras en publicaciones por enlaces."
         form:
           label: "Contiene palabra o frase"
           placeholder: "Escribe una palabra o frase (* es un comodín)"
@@ -5083,6 +5269,88 @@ es:
           description: "Escribe el texto más abajo para buscar coincidencias con las palabras vigiladas"
           found_matches: "Coincidencias encontradas:"
           no_matches: "No se encontraron coincidencias"
+      form_templates:
+        nav_title: "Plantillas"
+        title: "Plantillas de formularios"
+        help: "Crea una estructura de plantillas que pueda utilizarse para crear nuevos temas, publicaciones y mensajes."
+        new_template: "Nueva plantilla"
+        list_table:
+          headings:
+            name: "Nombre"
+            active_categories: "Categorías activas"
+            actions: "Acciones"
+          actions:
+            view: "Ver plantilla"
+            edit: "Editar plantilla"
+            delete: "Eliminar plantilla"
+        view_template:
+          close: "Cerrar"
+          edit: "Editar"
+          delete: "Eliminar"
+          toggle_preview: "Alternar vista previa"
+        new_template_form:
+          submit: "Guardar"
+          cancel: "Cancelar"
+          name:
+            label: "Nombre de la plantilla"
+            placeholder: "Introduce un nombre para esta plantilla..."
+          template:
+            label: "Plantilla"
+            placeholder: "Crea aquí una plantilla YAML..."
+          preview: "Vista previa"
+        delete_confirm: "¿Seguro que quieres eliminar esta plantilla?"
+        quick_insert_fields:
+          add_new_field: "Añadir"
+          checkbox: "Casilla de verificación"
+          input: "Respuesta corta"
+          textarea: "Respuesta larga"
+          dropdown: "Desplegable"
+          upload: "Subir un archivo"
+          multiselect: "Múltiples opciones"
+        validations_modal:
+          button_title: "Validaciones"
+          modal_title: "Opciones de validación"
+          table_headers:
+            key: "Clave"
+            type: "Tipo"
+            description: "Descripción"
+          validations:
+            required:
+              key: "obligatorio"
+              type: "booleano"
+              description: "Requiere que se rellene el campo para enviar el formulario."
+            minimum:
+              key: "mínimo"
+              type: "entero"
+              description: "Para los campos de texto, especifica el número mínimo de caracteres permitidos."
+            maximum:
+              key: "máximo"
+              type: "entero"
+              description: "Para los campos de texto, especifica el número máximo de caracteres permitidos."
+            pattern:
+              key: "patrón"
+              type: "cadena de expresiones regulares"
+              description: "Para los campos de texto, una expresión regular que especifique la entrada permitida."
+            type:
+              key: "tipo"
+              type: "cadena"
+              description: "Para los campos de entrada, puedes especificar el tipo de entrada que se espera (texto|email|fecha|número|url|tel|color)"
+        preview_modal:
+          title: "Plantilla de vista previa"
+        field_placeholders:
+          validations: "introduce aquí las validaciones"
+          label: "Introduce aquí la etiqueta"
+          placeholder: "Introduce aquí el marcador de posición"
+          none_label: "Selecciona un elemento"
+          choices:
+            first: "Opción 1"
+            second: "Opción 2"
+            third: "Opción 3"
+        edit_category:
+          toggle_freeform: "plantilla de formulario desactivada"
+          toggle_form_template: "plantilla de formulario activada"
+          select_template: "Seleccionar plantillas de formularios"
+          select_template_help: "Añadir/editar plantillas de formulario"
       impersonate:
         title: "Suplantar"
         help: "Utiliza esta herramienta para suplantar una cuenta de usuario con fines de depuración. Tendrás que cerrar sesión al terminar."
@@ -5095,6 +5363,7 @@ es:
         not_found: "Lo sentimos, ese usuario no existe en nuestro sistema."
         id_not_found: "Lo sentimos, esa ID de usuario no existe en nuestro sistema."
         active: "Activados"
+        status: "Estado"
         show_emails: "Mostrar correos electrónicos"
         hide_emails: "Ocultar correos electrónicos"
         nav:
@@ -5183,7 +5452,6 @@ es:
         show_admin_profile: "Administrador"
         manage_user: "Administrar usuario"
         show_public_profile: "Ver perfil público"
-        impersonate: "Suplantar"
         action_logs: "Registros de acciones"
         ip_lookup: "Búsqueda de IP"
         log_out: "Cerrar sesión"
@@ -5419,8 +5687,16 @@ es:
         go_back: "Volver a la búsqueda"
         recommended: "Te recomendamos que ajustes los siguientes textos a tu comunidad:"
         show_overriden: "Mostrar solo los sobrescritos"
+        show_outdated: "Mostrar solo obsoletos/no válidos"
         locale: "Idioma:"
         more_than_50_results: "Hay más de 50 resultados. Por favor, afina tu búsqueda."
+        interpolation_keys: "Claves de interpolación disponibles:"
+        outdated:
+          title: "Esta traducción está anticuada"
+          description: "La traducción por defecto de esta clave ha cambiado desde que se creó esta anulación. Comprueba a continuación que tu traducción coincide con cualquier cambio que se haya hecho en la intención original."
+          old_default: "Antiguo valor predeterminado"
+          new_default: "Nuevo valor predeterminado"
+          dismiss: "Descartar"
       settings:
         show_overriden: "Mostrar solo los sobrescritos"
         history: "Ver historial de cambios"
@@ -5433,7 +5709,9 @@ es:
             label: "Añadir emoji"
         title: "Ajustes"
         no_results: "No se encontró ningún resultado."
-        more_than_30_results: "Hay más de 30 resultados. Por favor, afina tu búsqueda o selecciona una categoría."
+        more_site_setting_results:
+          one: "Hay más de %{count} resultado. Afina tu búsqueda o selecciona una categoría."
+          other: "Hay más de %{count} resultados. Afina tu búsqueda o selecciona una categoría."
         clear_filter: "Quitar filtros"
         add_url: "añadir URL"
         add_host: "añadir host"
@@ -5520,7 +5798,8 @@ es:
         allow_title: Permitir que se use la insignia como título
         multiple_grant: Se puede conceder varias veces
         listable: Mostrar insignia en la página pública de insignias
-        enabled: Activar insignias
+        enabled: activado
+        disabled: desactivado
         icon: Icono
         image: Imagen
         graphic: Gráfico
@@ -5590,10 +5869,14 @@ es:
       embedding:
         get_started: "Si quieres insertar Discourse en otro sitio web, empieza por añadir su host."
         confirm_delete: "¿Seguro que quieres eliminar este host?"
-        sample: "Incluye el siguiente código HTML en tu página para crear e incrustar en ella temas de Discourse. Sustituye <b>REPLACE_ME</b> con la dirección URL real de la página en la que estés incrustando el código."
+        sample: |
+          <p>Pega el siguiente código HTML en tu sitio para crear e incrustar temas de Discourse. Sustituye <b>EMBED_URL</b> por la URL canónica de la página en la que lo vas a incrustar.
+
+          <p>Si quieres personalizar el estilo, descomenta y sustituye <b>CLASS_NAME</b> por una clase CSS definida en el <i>Embedded CSS</i> de tu tema.</p> <p>
+
+          <p>Sustituye <b>DISCOURSE_USERNAME</b> por el nombre de usuario de Discourse del autor que debe crear el tema. Discourse buscará automáticamente al usuario por el atributo <code>content</code> de las etiquetas <code>&lt;meta&gt;</code> con el atributo <code>name</code> establecido en <code>discourse-username</code> o <code>author</code>. El parámetro <code>discourseUserName</code> ha quedado obsoleto y será eliminado en Discourse 3.2.</p> <p>
         title: "Incrustado"
         host: "Hosts permitidos"
-        class_name: "Nombre de clase"
         allowed_paths: "Lista de rutas permitidas"
         edit: "editar"
         category: "Publicar en categoría"
diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml
index 57ea330fe9e..8ee62b0bf36 100644
--- a/config/locales/client.et.yml
+++ b/config/locales/client.et.yml
@@ -152,7 +152,6 @@ et:
     emails_are_disabled: "Kõik väljuvad meilid on administraatori poolt blokeeritud. Ühtegi teavitust meili teel ei saadeta."
     software_update_prompt:
       dismiss: "Ignoreeri"
-    bootstrap_invite_button_title: "Saada kutsed"
     themes:
       default_description: "Vaikimisi"
     s3:
@@ -246,7 +245,6 @@ et:
       title: "Järjehoidja"
       clear_bookmarks: "Kustuta järjehoidjad"
       help:
-        bookmark: "Kliki selle teema esimesele postitusele järjehoidja lisamiseks"
         unbookmark: "Kliki selle teema kõigi järjehoidjate eemaldamiseks"
     bookmarks:
       created: "Oled selle postituse järjehoidjatesse lisanud. %{name}"
@@ -375,8 +373,7 @@ et:
           high: "Kõrge"
       scores:
         score: "Skoor"
-        date: "Date"
-        type: "Liik"
+        type: "Põhjus"
         status: "Staatus"
       statuses:
         pending:
@@ -385,8 +382,8 @@ et:
           title: "Heakskiidetud"
         rejected:
           title: "Tagasi lükatud"
-        ignored:
-          title: "Ignoreeritud"
+      context_question:
+        delimiter: "või"
       types:
         reviewable_user:
           title: "Kasutaja"
@@ -598,6 +595,7 @@ et:
         remove_owners_description: "Eemalda valitud kasutajad selle grupi omanike hulgast"
         make_all_primary: "Tee kõik primaarseks"
         remove_all_primary: "Eemalda kui primaarne"
+        status: "Staatus"
         owner: "Omanik"
         forbidden: "Sul pole lubatud liikmeid vaadata."
       topics: "Teemat"
@@ -712,11 +710,6 @@ et:
       profile: "Profiil"
       mute: "Vaigista"
       edit: "Muuda Eelistusi"
-      download_archive:
-        button_text: "Laadi kõik alla"
-        confirm: "Oled kindel, et soovid enda postitused alla laadida?"
-        success: "Allalaadimine käivitatud. Protsessi lõppemisel saadetakse Sulle teade."
-        rate_limit_error: "Postitusi saab alla laadida üks kord ööpäevas. Palun proovi homme uuesti."
       new_private_message: "Uus sõnum"
       private_message: "Sõnum"
       private_messages: "Sõnumid"
@@ -840,13 +833,6 @@ et:
       save_to_change_theme: 'Teema uuendatakse pärast seda, kui klõpsad "%{save_text}”'
       home: "aikimisi avaleht"
       staged: "Ettevalmistamisel"
-      staff_counters:
-        flags_given: "kasulikud tähised"
-        flagged_posts: "tähistatud postitused"
-        deleted_posts: "kustutatud postitused"
-        suspensions: "ajutised peatamised"
-        warnings_received: "hoiatused"
-        rejected_posts: "tagasilükatud postitused"
       messages:
         inbox: "Postkast"
         latest: "Viimased"
@@ -890,8 +876,6 @@ et:
         title: "Kahefaktorilise autentimise varukoodid"
         regenerate: "Genereeri uus"
         disable: "Keela"
-        enable: "Luba"
-        enable_long: "Lülita varukoodid sisse"
         copy_to_clipboard: "Kopeeri lõikelauale"
         copy_to_clipboard_error: "Tõrge kopeerimisel"
         copied_to_clipboard: "Kopeeritud lõikelauale"
@@ -1209,8 +1193,6 @@ et:
       sign_up: "Liitu"
       hide_forever: "tänan, ei"
     summary:
-      enabled_description: "Vaatad selle teema kokkuvõtet: kõige huvipakkuvamad postitused valib kogukond."
-      enable: "Võta see teema kokku"
       disable: "Näita kõiki postitusi"
     deleted_filter:
       enabled_description: "See teema sisaldab kustutatud postitusi, mis on peidetud."
@@ -1360,8 +1342,6 @@ et:
         category_missing: "Pead valima foorumi"
       save_edit: "Salvesta muudatused"
       overwrite_edit: "Kirjuta muutmine üle"
-      reply_original: "Vasta algsesse teemasse"
-      reply_here: "Vasta siin"
       reply: "Vasta"
       cancel: "Tühista"
       create_topic: "Loo teema"
@@ -1661,8 +1641,6 @@ et:
       options: "Teema Suvandid"
       show_links: "näita viiteid selles teemas"
       unread_indicator: "Ükski liige pole veel selle teema viimast postitust lugenud."
-      jump_reply_up: hüppa varasema vastuse juurde
-      jump_reply_down: hüppa hilisema vastuse juurde
       deleted: "See teema on kustutatud"
       slow_mode_update:
         title: "Aeglane režiim"
@@ -2074,7 +2052,6 @@ et:
       filtered_replies:
         viewing_posts_by: "Vaatad %{post_count} sõnumit autorilt"
         viewing_subset: "Mõned vastused on peidetud"
-        viewing_summary: "Vaatad teema kokkuvõtet"
         show_all: "Näita kõiki"
     category:
       none: "(foorum puudub)"
@@ -2086,7 +2063,6 @@ et:
       back: "Tagasi kategooriasse"
       general: "Üldine"
       settings: "Sätted"
-      topic_template: "Teema mall"
       tags: "Sildid"
       tags_placeholder: "(Valikuline) loetelu lubatud silte"
       tag_groups_placeholder: "(Valikuline) loetelu lubatud siltide gruppe"
@@ -2132,8 +2108,6 @@ et:
       images: "Pildid"
       email_in: "Sissetuleva meili individuaalne aadress:"
       email_in_allow_strangers: "Aktsepteeri meile kontota anonüümsetelt kasutajatelt"
-      email_in_disabled: "Uute teemade avamine meili teel on saidi sätetes välja lülitatud. Avamiseks"
-      email_in_disabled_click: 'aktiveeri säte "sissetulev meil".'
       show_subcategory_list: "Näita selles foorumis alamfoorumite nimekirja teemadest üleval pool."
       read_only_banner: "Bänneri tekst, mis on näha kui kasutaja ei saa sellesse kategooriasse uusi teemasid lisada:"
       num_featured_topics: "Kategooriate lehel kuvatud teemade arv:"
@@ -2296,6 +2270,10 @@ et:
     filters:
       with_topics: "%{filter} teemat"
       with_category: "%{filter} %{category} teemat"
+      filter:
+        title: "Filter"
+        button:
+          label: "Filter"
       latest:
         title: "Värskeimad"
         title_with_count:
@@ -2423,7 +2401,6 @@ et:
         one: "Teenis selle märgise %{count} kord"
         other: "Teenis selle märgise %{count} korda"
       granted_on: "Märgistatud %{date}"
-      others_count: "Teised selle märgisega (%{count})"
       title: Märgised
       badge_count:
         one: "%{count} märgis"
@@ -2513,12 +2490,10 @@ et:
     safe_mode:
       enabled: "Kaitstud režiim on aktiivne, väljumiseks sulge see brauseri aken."
     pause_notifications:
-      remaining: "%{remaining} jäänud"
       options:
         half_hour: "30 minutit"
         one_hour: "1 tund"
         two_hours: "2 tundi"
-        custom: "Individuaalne"
     trust_levels:
       names:
         newuser: "uus kasutaja"
@@ -2535,7 +2510,18 @@ et:
         other: "%{count} uut"
       more: "Veel"
       all_categories: "Kõik foorumid"
+      edit_navigation_modal_form:
+        filter_dropdown:
+          all: "Kõik"
       sections:
+        custom:
+          save: "Salvesta"
+          delete: "Kustuta"
+          links:
+            icon:
+              label: "Ikoon"
+            name:
+              label: "Nimi"
         about:
           header_link_text: "Teave"
         messages:
@@ -2553,7 +2539,8 @@ et:
         categories:
           header_link_text: "Liigid"
         community:
-          header_link_text: "Kogukond"
+          edit_section:
+            header_dropdown: "Kohanda"
           links:
             about:
               content: "Teave"
@@ -2561,6 +2548,8 @@ et:
               content: "Admin"
             badges:
               content: "Märgised"
+            topics:
+              content: "Teemasid"
             faq:
               content: "KKK"
             groups:
@@ -2571,6 +2560,11 @@ et:
               content: "Minu"
             review:
               content: "Vaata üle"
+    form_templates:
+      errors:
+        typeMismatch:
+          default: "Palun sisesta korrektne väärtus."
+          email: "Sisesta palun korrektne meiliaadress."
   admin_js:
     type_to_filter: "filtreerimiseks trüki..."
     admin:
@@ -2775,7 +2769,6 @@ et:
         enabled: "Sisse lülitatud?"
         is_enabled: "J"
         not_enabled: "E"
-        change_settings: "Muuda sätteid"
         change_settings_short: "Sätted"
         howto: "Kuidas pluginaid paigaldada?"
       backups:
@@ -2952,6 +2945,8 @@ et:
           love:
             name: "armastus"
             description: "Meeldimise nupu värvus."
+          selected:
+            name: "valitud"
         email_style:
           css: "CSS"
       email:
@@ -3149,6 +3144,36 @@ et:
         test:
           button_label: "Proovi"
           no_matches: "Midagi ei leitud"
+      form_templates:
+        nav_title: "Mallid"
+        list_table:
+          headings:
+            name: "Nimi"
+            actions: "Tegevused"
+        view_template:
+          close: "Sulge"
+          edit: "Muuda"
+          delete: "Kustuta"
+        new_template_form:
+          submit: "Salvesta"
+          cancel: "Tühista"
+          preview: "Eelvaade"
+        quick_insert_fields:
+          add_new_field: "isa"
+          dropdown: "Rippmenüü"
+        validations_modal:
+          table_headers:
+            type: "Tüüp"
+            description: "Kirjeldus"
+          validations:
+            required:
+              key: "nõutud"
+            minimum:
+              key: "miinimum"
+            maximum:
+              key: "maksimum"
+            type:
+              key: "tüüp"
       impersonate:
         title: "Kehasta"
         help: "Kasuta seda töövahendit kasutajakonto ülevõtmiseks silumise eesmärgil. Tühistamiseks pead välja logima."
@@ -3161,6 +3186,7 @@ et:
         not_found: "Vabanda, sellist kasutajanime ei eksisteeri meie süsteemis."
         id_not_found: "Vabanda, sellist kasutajatunnust ei eksisteeri meie süsteemis."
         active: "Aktiveeritud"
+        status: "Staatus"
         show_emails: "Näita meile"
         nav:
           new: "Uus"
@@ -3212,7 +3238,6 @@ et:
         staged: "Ettevalmistamisel?"
         show_admin_profile: "Admin"
         show_public_profile: "Näita avalikku profiili"
-        impersonate: "Kehasta"
         action_logs: "Toimingute logi"
         ip_lookup: "IP otsimine"
         log_out: "Logi välja"
@@ -3380,6 +3405,8 @@ et:
         go_back: "Tagasi otsingusse"
         recommended: "Soovitame järgnevat teksti oma vajadustele vastavalt kohandada:"
         show_overriden: "Näita vaid käsitsi muudetuid"
+        outdated:
+          dismiss: "Ignoreeri"
       settings:
         show_overriden: "Näita vaid käsitsi muudetuid"
         reset: "lähtesta"
@@ -3457,7 +3484,8 @@ et:
         allow_title: Luba märgise kasutamist tiitlina
         multiple_grant: Võib olla määratud mitmeid kordi
         listable: Näita märgist avalike märgiste lehel
-        enabled: Luba märgis
+        enabled: sisse lülitatud
+        disabled: välja lülitatud
         icon: Ikoon
         image: Pilt
         query: Märgise päring (SQL)
@@ -3503,7 +3531,6 @@ et:
         confirm_delete: "Oled Sa kindel, et soovid kustutada selle teenusepakkuja?"
         title: "Sängitamine"
         host: "Lubatud hostid"
-        class_name: "Klassi nimi"
         edit: "muuda"
         category: "Postita foorumisse"
         add_host: "Lisa host"
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index ed0d18e60ac..cbbed532cd8 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -166,8 +166,6 @@ fa_IR:
     software_update_prompt:
       message: "سایت بروز رسانی شده٬ لطفا برای پرهیز از بروز خطای احتمالی صفحه خود را دوباره <span>بارگزاری/ریفرش</span> کنید."
       dismiss: "رد کردن"
-    bootstrap_mode_disabled: "حالت خود راه انداز در 24 ساعت آینده غیر‌فعال خواهد شد."
-    bootstrap_invite_button_title: "ارسال دعوت‌نامه"
     themes:
       default_description: "پیش‌فرض"
     s3:
@@ -276,11 +274,9 @@ fa_IR:
       edit_bookmark: "ویرایش نشانک"
       clear_bookmarks: "پاک کردن نشانک‌ها"
       help:
-        bookmark: "کلیک کنید تا به اولین نوشته این موضوع نشانک بزنید"
-        edit_bookmark: "برای ویرایش نشانک مربوط در این موضوع کلیک کنید"
         edit_bookmark_for_topic: "برای ویرایش نشانک مربوط به این موضوع کلیک کنید"
         unbookmark: "کلیک کنید تا همهٔ نشانک‌های این موضوع را حذف کنید"
-        unbookmark_with_reminder: "برای حذف همه نشانک‌ها و یادآورها در این موضوع کلیک کنید."
+        unbookmark_with_reminder: "برای حذف همه نشانک‌ها و یادآورها در این موضوع کلیک کنید"
     bookmarks:
       created: "شما این نوشته را نشانک کردید. %{name}"
       created_generic: "شما این را نشانک گذاری کرده‌اید. %{name}"
@@ -320,7 +316,6 @@ fa_IR:
       new_topic: "پیش‌نویس‌ موضوع جدید"
       new_private_message: "پیش‌نویس پیام شخصی جدید"
       abandon:
-        confirm: "شما یک پیش‌نویس در این موضوع دارید. دوست داری باهاش چیکار کنی؟"
         yes_value: "حذف"
         no_value: "ادامه"
     topic_count_categories:
@@ -493,26 +488,37 @@ fa_IR:
       scores:
         about: "این امتیاز بر اساس سطح اعتماد گزارش دهنده، دقت پرچم‌های قبلی ایشان، و اولویت مورد گزارش شده حساب میشود، "
         score: "امتیاز"
-        date: "تاریخ"
-        type: "نوع"
+        type: "دلیل"
         status: "وضعیت"
-        submitted_by: "ارسال شده توسط"
-        reviewed_by: "بازنگری شده توسط"
+        submitted_by: "گزارش شده توسط"
       statuses:
         pending:
           title: "در انتظار"
         approved:
           title: "پذیرفته شده"
+        approved_flag:
+          title: "پرچم تایید شده"
+        approved_user:
+          title: "کاربر تایید شده"
+        approved_post:
+          title: "نوشته تایید شده"
         rejected:
           title: "رد شده"
-        ignored:
-          title: "صرف نظر شده"
+        rejected_flag:
+          title: "پرچم رد شده"
+        rejected_user:
+          title: "کاربر رد شده"
+        rejected_post:
+          title: "نوشته رد شده"
         deleted:
-          title: "حذف شده"
+          title: "موضوع یا نوشته حذف شده"
         reviewed:
-          title: "(همه مرور شده)"
+          title: "همه بررسی شده"
         all:
-          title: "«همه چیز»"
+          title: "همه چیز"
+      context_question:
+        delimiter: "یا"
+        something_else_wrong: "آیا مشکلی در این نوشته وجود دارد؟"
       types:
         reviewable_flagged_post:
           title: "نوشته پرچم شده"
@@ -796,6 +802,7 @@ fa_IR:
         remove_members: "اخراج عضو‌ها"
         make_owners: "اعطای مالکیت"
         make_owners_description: "کاربران انتخاب شده را مالک این گروه کن"
+        status: "وضعیت"
         owner: "مالک"
         primary: "اصلی"
         forbidden: "شما مجاز به دیدن کاربران نیستید."
@@ -914,11 +921,6 @@ fa_IR:
       profile: "نمایه"
       mute: "بی‌صدا"
       edit: "ویرایش تنظیمات"
-      download_archive:
-        button_text: "دانلود همه"
-        confirm: "آیا مطمئنید که می‌خواهید نوشته‌هایتان را دانلود کنید؟"
-        success: "شروع فرایند دانلود، وقتی این فرایند تکمیل شود به شما از طریق پیام، اطلاع رسانی خواهد شد."
-        rate_limit_error: "نوشته‌ها را می توانید فقط یک بار در روز می‌توانید دانلود کنید. لطفا فردا دوباره امتحان کنید."
       new_private_message: "پیام جدید"
       private_message: "پیام"
       private_messages: "پیام‌ها"
@@ -990,7 +992,7 @@ fa_IR:
         perm_denied_expl: "شما دسترسی دریافت اعلان را بسته‌اید. در تنظیمات مرورگر خود آن‌را فعال کنید."
         disable: "غیرفعال کردن آگاه‌سازی"
         enable: "فعال کردن آگاه‌سازی"
-        each_browser_note: 'توجه: شما باید این تنظیمات را در هر مرورگری که استفاده می‌کنید، تغییر دهید. اگر آگاه‌سازی‌ها را از منوی کاربر متوقف کنید، صرف‌نظر از این تنظیم، همه آگاه‌سازی‌ها غیرفعال می‌شوند.'
+        each_browser_note: "توجه: شما باید این تنظیمات را در هر مرورگری که استفاده می‌کنید، تغییر دهید. اگر آگاه‌سازی‌ها را از منوی کاربر متوقف کنید، صرف‌نظر از این تنظیم، همه آگاه‌سازی‌ها غیرفعال می‌شوند."
         consent_prompt: "آیا مایلید وقتی دیگران به شما پاسخ می‌دهند، آگاه‌سازی زنده دریافت کنید؟"
       dismiss: "نخواستیم"
       dismiss_notifications: "پنهان کردن همه"
@@ -1024,14 +1026,7 @@ fa_IR:
       experimental_sidebar:
         enable: "فعال کردن نوار کناری"
         options: "تنظیمات"
-        categories_section: "بخش دسته‌بندی‌ها"
-        categories_section_instruction: "دسته‌بندی‌های انتخاب شده در بخش دسته‌بندی نوار کناری نمایش داده می‌شود."
-        tags_section: "بخش برچسب‌ها"
-        tags_section_instruction: "برچسب‌های انتخاب شده در بخش برچسب‌ها نوار کناری نمایش داده می‌شود."
         navigation_section: "ناوبری"
-        list_destination_instruction: "وقتی محتوای جدیدی در نوار کناری وجود دارد..."
-        list_destination_default: "از پیوند پیش‌فرض استفاده کنید و یک نشان برای موارد جدید نشان دهید"
-        list_destination_unread_new: "پیوند به خوانده نشده/جدید و نمایش تعداد موارد جدید"
       change: "تغییر"
       featured_topic: "مبحث برجسته"
       moderator: "%{user} یک مدیر است"
@@ -1095,13 +1090,6 @@ fa_IR:
       theme: "قالب"
       home: "صفحه خانگی پیشفرض"
       staged: "کاربر از راه دور"
-      staff_counters:
-        flags_given: "پرچم گذاری‌های مفید"
-        flagged_posts: "نوشته های پرچم گذاری شده"
-        deleted_posts: "پست های حذف شده"
-        suspensions: "تعلیق‌ها"
-        warnings_received: "هشدارها"
-        rejected_posts: "پست های رد شده"
       messages:
         all: "تمام صندوق‌های ورودی"
         inbox: "صندوق دریافت"
@@ -1136,7 +1124,6 @@ fa_IR:
         tags: "برچسب‌‌ها"
         interface: "رابط"
         apps: "برنامه‌ها"
-        sidebar: "نوار کناری"
       change_password:
         success: "(ایمیل ارسال شد)"
         in_progress: "(فرستادن ایمیل)"
@@ -1149,8 +1136,6 @@ fa_IR:
       second_factor_backup:
         regenerate: "ایجاد مجدد"
         disable: "ازکاراندازی"
-        enable: "فعال کردن"
-        enable_long: "کدهای پشتیبان را به کار بگیر"
         copy_to_clipboard: "کپی در clipboard"
         copy_to_clipboard_error: "خطا در کپی اطلاعات"
         copied_to_clipboard: "کپی شد"
@@ -1551,8 +1536,7 @@ fa_IR:
       pause_notifications: "مکث کردن آگاه‌سازی‌ها"
       remove_status: "حذف وضعیت"
     user_tips:
-      primary: "فهمیدم!"
-      secondary: "این نکات را به من نشان نده"
+      button: "فهمیدم!"
       first_notification:
         title: "اولین آگاه‌سازی شما!"
         content: "آگاه‌سازی‌ها برای این است که هر آنچه در انجمن اتفاق می‌افتد را به شما اطلاع بدهد، مورد استفاده قرار می‌گیرد."
@@ -1628,11 +1612,11 @@ fa_IR:
       hide_forever: "نه ممنون"
       intro: "سلام! :heart_eyes: به نظر میاد شما از بحث لذت می‌برید، اما هنوز برای یک حساب کاربری ثبت نام نکرده‌اید."
     summary:
-      enabled_description: "شما خلاصه ای از این موضوع را می بینید: بالاترین‌ نوشته‌هایی که توسط انجمن انتخاب شده."
       description:
         one: "<b>%{count}</b> پاسخ داده شده."
         other: "<b>%{count}</b> پاسخ داده شده."
-      enable: "خلاصه‌ی این موضوع"
+      buttons:
+        hide: "پنهان کردن خلاصه"
       disable: "نمایش همه‌ی نوشته‌ها"
     deleted_filter:
       enabled_description: "این موضوع شامل نوشته‌های حذف شده‌ای است، که مخفی شده‌اند."
@@ -1895,8 +1879,6 @@ fa_IR:
         category_missing: "باید یک دسته‌بندی انتخاب کنید"
       save_edit: "ذخیره ویرایش"
       overwrite_edit: "بازنویسی ویرایش"
-      reply_original: "پاسخ دادن در موضوع اصلی"
-      reply_here: "در اینجا پاسخ دهید"
       reply: "پاسخ"
       cancel: "لغو کردن"
       create_topic: "ایجاد موضوع"
@@ -2042,6 +2024,7 @@ fa_IR:
       reaction_2: "<span>%{username}، %{username2}</span> %{description}"
       votes_released: "%{description} - تکمیل شد"
       new_features: "ویژگی‌های جدید در دسترس است!"
+      admin_problems: "توصیه‌های جدید در پیشخوان سایت شما"
       dismiss_confirmation:
         body:
           default:
@@ -2286,6 +2269,7 @@ fa_IR:
         bookmarks: "هنوز هیچ موضوع نشانک‌داری ندارید."
         category: "هیچ موضوعی در %{category} نیست."
         top: "موضوع برتری وجود ندارد."
+        filter: "هنوز هیچ موضوعی وجود ندارد."
       bottom:
         latest: "موضوع تازه‌ی دیگری وجود ندارد."
         posted: "هیچ موضوعات نوشته شده ای وجود ندارد"
@@ -2296,11 +2280,13 @@ fa_IR:
         tag: "هیچ موضوع دیگری در %{tag} نیست."
         top: "موضوع برتر دیگری وجود ندارد"
         bookmarks: "موضوع نشانک‌دار دیگری وجود ندارد."
+        filter: "هیچ موضوع بیشتری وجود ندارد."
     topic:
       filter_to:
         one: "%{count} نوشته در این موضوع وجود دارد"
         other: "%{count} نوشته در این موضوع وجود دارد"
       create: "موضوع جدید"
+      create_disabled_category: "شما مجاز به ایجاد موضوع در این دسته‌بندی نیستید"
       create_long: "ساخت یک موضوع جدید"
       open_draft: "بازکردن پیشنویس"
       private_message: "شروع یک پیام"
@@ -2346,8 +2332,6 @@ fa_IR:
       read_more: "می‌خواهید بیشتر بخوانید؟ <a href='%{categoryLink}'>همه دسته‌‌بندی‌ها را مرور کنید</a> یا <a href='%{latestLink}'>آخرین موضوعات را مشاهده کنید</a>."
       unread_indicator: "هیچ کاربری آخرین فرستهٔ این مبحث را نخوانده است."
       suggest_create_topic: برای <a href>شروع یک موضوع جدید آماده‌اید؟</a>
-      jump_reply_up: رفتن به جدید ترین پاسخ
-      jump_reply_down: رفتن به پاسخ بعدی
       deleted: "موضوع پاک شده است"
       slow_mode_update:
         title: "حالت آهسته"
@@ -2644,6 +2628,7 @@ fa_IR:
       ignored: "محتوای نادیده گرفته‌شد"
       wiki_last_edited_on: "آخرین ویرایش ویکی در %{dateTime} انجام شده"
       last_edited_on: "آخرین ویرایش نوشته در %{dateTime} انجام شده"
+      edit_history: "تاریخچه ویرایش نوشته"
       reply_as_new_topic: "پاسخگویی به عنوان یک موضوع لینک شده"
       reply_as_new_private_message: "پاسخ به عنوان پیام جدید به همین دریافت کنندگان"
       continue_discussion: "ادامه دادن بحث از %{postLink}:"
@@ -2652,6 +2637,9 @@ fa_IR:
       show_hidden: "دیدن محتوای نادیده گرفته‌شد"
       collapse: "جمع کردن"
       sr_date: "تاریخ ارسال"
+      sr_expand_replies:
+        one: "این نوشته %{count} پاسخ دارد"
+        other: "این نوشته %{count} پاسخ دارد"
       expand_collapse: "باز کردن/بستن"
       locked: "یکی از دست‌اندرکاران انجمن این پست را جهت جلوگیری از ویرایش قفل کرده است"
       gap:
@@ -2798,6 +2786,7 @@ fa_IR:
         updated: "به روز شده"
         name: "نام"
         name_placeholder: "این نشانک برای چی است؟"
+        name_input_label: "نام نشانک"
         set_reminder: "به من یادآوری کن"
         options: "گزینه‌ها"
         actions:
@@ -2817,7 +2806,6 @@ fa_IR:
       back: "بازگشت به دسته‌بندی"
       general: "عمومی"
       settings: "تنظیمات"
-      topic_template: "قالب موضوع"
       tags: "برچسب‌ها"
       tags_allowed_tags: "محدودکردن این برچسب‌ها به این دسته‌بندی:"
       tags_placeholder: "(اختیاری) فهرست برچسب‌های قابل استفاده"
@@ -2863,8 +2851,6 @@ fa_IR:
       email_in: "آدرس ایمیل های دریافتی سفارشی:"
       email_in_tooltip: "شما می‌توانید چندیدن آدرس ایمیل را با کارکتر | جدا کنید."
       email_in_allow_strangers: "تایید ایمیل ها از کاربران ناشناس بدون حساب کاربری"
-      email_in_disabled: "ارسال موضوعات جدید با ایمیل در تنظیمات سایت غیر فعال است. برای فعال سازی موضوعات جدید را با ایمیل ارسال کنید،"
-      email_in_disabled_click: 'فعال کردن تنظیمات "email in".'
       show_subcategory_list: "تعداد دسته‌بندی‌های فرزند که بالای موضوعات این دسته‌بندی نمایش داده می‌شوند."
       num_featured_topics: "تعداد موضوعاتی که در صفحه دسته‌بندی نمایش داده می‌شوند:"
       subcategory_num_featured_topics: "تعداد موضوعات برجسته که در دسته‌بندی مادر نمایش داده می‌شوند:"
@@ -3039,6 +3025,10 @@ fa_IR:
     filters:
       with_topics: "%{filter} موضوعات"
       with_category: "%{filter} %{category} موضوعات"
+      filter:
+        title: "فیلتر"
+        button:
+          label: "فیلتر"
       latest:
         title: "آخرین"
         title_with_count:
@@ -3107,7 +3097,6 @@ fa_IR:
         this_month: "ماه"
         this_week: "هفته"
         today: "امروز"
-    safari_13_warning: این سایت به زودی از iOS و Safari، نسخه ۱۳ به بالا پشتیبانی نخواهد کرد. یک نسخه فقط خواندنی ساده در دسترس باقی خواهد ماند. (<a href="https://meta.discourse.org/t/224747">اطلاعات بیشتر</a>)
     permission_types:
       full: "ساختن / پاسخ دادن / دیدن"
       create_post: "پاسخ دادن / دیدن"
@@ -3119,6 +3108,9 @@ fa_IR:
       next: "بعدی (مکان‌نمای راست)"
       counter: "%curr% از %total%"
       close: "بستن (خروج)"
+    experimental_lightbox:
+      buttons:
+        close: "بستن (خروج)"
     cannot_render_video: این ویدیو قابل ارائه نیست، چون مرورگر شما از کدک پشتیبانی نمی‌کند.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
@@ -3200,7 +3192,6 @@ fa_IR:
         one: "این مدال را %{count} بار به دست آورده"
         other: "این مدال را %{count} بار به دست آورده"
       granted_on: "اعطا شده %{date}"
-      others_count: "سایرین با این مدال (%{count})"
       title: نشان‌ها
       allow_title: "می‌توانید از این نشان برای عنوان کاربری استفاده کنید"
       multiple_grant: "می‌توانید این را چند بار به‌دست آورید"
@@ -3213,6 +3204,7 @@ fa_IR:
       granted:
         one: "%{count} اعطا شده"
         other: "%{count} اعطا شده"
+      awarded: اعطا شده
       select_badge_for_title: انتخاب یک نشان برای استفاده در عنوان خود
       none: "(هیچی)"
       successfully_granted: "%{badge} به %{username} با موفقیت اعطا شد"
@@ -3330,13 +3322,11 @@ fa_IR:
     pause_notifications:
       title: "مکث آگاه‌سازی‌ها برای..."
       label: "مکث کردن آگاه‌سازی‌ها"
-      remaining: "%{remaining} باقی‌مانده"
       options:
         half_hour: "۳۰ دقیقه"
         one_hour: "۱ ساعت"
         two_hours: "۲ ساعت"
         tomorrow: "تا فردا"
-        custom: "سفارشی"
       set_schedule: "تنظیم زمان‌بندی آگاه‌سازی"
     trust_levels:
       names:
@@ -3364,7 +3354,26 @@ fa_IR:
       more: "بیشتر"
       all_categories: "همه‌ی دسته‌بندی‌ها"
       all_tags: "همه برچسب‌ها"
+      edit_navigation_modal_form:
+        filter_dropdown:
+          all: "همه"
       sections:
+        custom:
+          add: "افزودن بخش سفارشی"
+          edit: "ویرایش بخش سفارشی"
+          save: "ذخیره"
+          delete: "حذف"
+          delete_confirm: "آیا مطمئن هستید که می‌خواهید این بخش را حذف کنید؟"
+          always_public: "محتوای این بخش همیشه عمومی است"
+          links:
+            delete: "حذف پیوند"
+            reset: "بازگردانی به پیش‌فرض"
+            icon:
+              label: "آیکن"
+            name:
+              label: "نام"
+          title:
+            label: "عنوان بخش"
         about:
           header_link_text: "درباره"
         messages:
@@ -3391,8 +3400,8 @@ fa_IR:
           header_action_title: "ويرايش دسته‌بندی‌های نوار کناری خود"
           configure_defaults: "تنظیمات پیش‌فرض"
         community:
-          header_link_text: "انجمن"
-          header_action_title: "ایجاد موضوع"
+          edit_section:
+            header_dropdown: "سفارشی‌سازی"
           links:
             about:
               content: "درباره"
@@ -3402,8 +3411,8 @@ fa_IR:
               title: "تنظیمات و گزارش‌های سایت"
             badges:
               content: "نشان‌ها"
-            everything:
-              content: "همه چیز"
+            topics:
+              content: "موضوعات"
               title: "همه موضوعات"
             faq:
               content: "پرسش‌های متداول"
@@ -3422,7 +3431,15 @@ fa_IR:
             review:
               content: "بازنگری"
               pending_count: "%{count} در انتظار"
+      panels:
+        forum:
+          label: انجمن
     until: "تا وقتی که:"
+    form_templates:
+      errors:
+        typeMismatch:
+          default: "یک مقدار معتبر وارد کنید."
+          email: "لطفا یک آدرس ایمیل معتبر وارد کنید."
   admin_js:
     type_to_filter: "بنویسید تا فیلتر کنید..."
     admin:
@@ -3551,7 +3568,6 @@ fa_IR:
         about: "عضویت و نام‌های گروه را در اینجا ویرایش کنید"
         group_members: "اعضای گروه"
         delete: "حذف"
-        delete_confirm: "آیا مطمئن هستید که می‌خواهید این گروه را حذف کنید؟"
         delete_failed: "قادر به حذف گروه نیستیم. اگر این یک گروه خودکار است، نمی توان آن را از بین برد."
         delete_owner_confirm: "حذف حق مالکیت برای '%{username}'؟"
         add: "اضافه کردن"
@@ -3584,7 +3600,11 @@ fa_IR:
           action: اقدام
           descriptions:
             topics:
-              update: به‌روزرسانی موضوع. تغییر عنوان، دسته‌بندی، برچسب‌ها و غیره.
+              delete: حذف موضوع.
+            posts:
+              delete: حذف نوشته.
+            tags:
+              list: فهرست برچسب‌ها.
             user_status:
               read: خواندن وضعیت کاربر.
               update: به‌روزرسانی وضعیت کاربر.
@@ -3595,6 +3615,9 @@ fa_IR:
               list_user_badges: فهرست نشان‌های کاربر.
               assign_badge_to_user: یک نشان را به یک کاربر اختصاص دهید.
               revoke_badge_from_user: یک نشان را از کاربر بگیرید.
+            groups:
+              manage_groups: اعضای گروه را فهرست، اضافه و حذف کنید.
+              administer_groups: گروه‌ها را فهرست، نمایش، ایجاد، به‌روزرسانی و حذف کنید.
       web_hooks:
         title: "webhook ها"
         none: "در حال حاضر webhook‌ی وجود ندارد"
@@ -3680,7 +3703,6 @@ fa_IR:
         enabled: "فعال شده؟"
         is_enabled: "بله"
         not_enabled: "خیر"
-        change_settings: "تغییر تنظیمات"
         change_settings_short: "تنظیمات"
         howto: "چگونه یک افزونه نصب کنیم؟"
         official: "پلاگین رسمی"
@@ -3926,6 +3948,8 @@ fa_IR:
           love:
             name: "دوست داشتن"
             description: "رنگ دکمه‌ی پسند"
+          selected:
+            name: "انتخاب شده"
         email_style:
           html: "قالب HTML"
           css: "سی اس اس"
@@ -4121,9 +4145,6 @@ fa_IR:
           flag: "پرچم"
           replace: "جایگزینی"
           tag: "برچسب"
-        action_descriptions:
-          block: "از فرستادن فرسته‌هایی که دارای این واژه‌ها هستند جلوگیری کنید. کاربر هنگام ارسال فرسته با پیام خطا مواجه می‌شود."
-          require_approval: "فرسته‌های دارای این واژه‌ها پیش از دیده شدن نیاز به تائید کارکنان دارند."
         form:
           tag_label: "برچسب"
           link_placeholder: "https://example.com"
@@ -4133,6 +4154,37 @@ fa_IR:
           case_sensitivity_label: "به حروف بزرگ و کوچک حساس است"
         test:
           no_matches: "چیزی یافت نشد."
+      form_templates:
+        nav_title: "قالب‌ها"
+        list_table:
+          headings:
+            name: "نام"
+            actions: "عملیات"
+        view_template:
+          close: "بستن"
+          edit: "ویرایش"
+          delete: "حذف"
+        new_template_form:
+          submit: "ذخیره"
+          cancel: "انصراف"
+          preview: "پیش‌نمایش"
+        quick_insert_fields:
+          add_new_field: "اضافه کردن"
+          dropdown: "کرکره‌ای"
+        validations_modal:
+          table_headers:
+            key: "کلید"
+            type: "نوع"
+            description: "توضیح"
+          validations:
+            required:
+              key: "مورد نیاز "
+            minimum:
+              key: "حداقل"
+            maximum:
+              key: "حداکثر"
+            type:
+              key: "نوع"
       impersonate:
         title: "جعل هویت کردن"
         help: "با استفاده از ابزار جعل هویت کردن یک حساب کاربری را برای اشکال زدایی انتخاب نمایید، شما باید بعد از اتمام کار یک بار خارج شوید."
@@ -4145,6 +4197,7 @@ fa_IR:
         not_found: "متاسفیم٬ این کاربر در سیستم ما وجود ندارد."
         id_not_found: "متاسفیم٬ این شناسه کاربری در سیستم ما وجود ندارد."
         active: "فعال شد"
+        status: "وضعیت"
         show_emails: "ایمیل ها را نشان بده"
         hide_emails: "مخفی کردن رایانامه‌ها"
         nav:
@@ -4195,7 +4248,6 @@ fa_IR:
         show_admin_profile: "مدیر ارشد"
         manage_user: "مدیریت کاربر"
         show_public_profile: "نمایش نمایه عمومی"
-        impersonate: "جعل هویت کردن"
         action_logs: "گزارش گار"
         ip_lookup: "بررسی IP"
         log_out: "خروج"
@@ -4367,6 +4419,8 @@ fa_IR:
         recommended: "ما پیشنهاد میکنیم این متن را بر اساس نیاز های خود ویرایش کنید:"
         show_overriden: "تنها بازنویسی‌شده‌ها را نمایش بده"
         locale: "زبان:"
+        outdated:
+          dismiss: "رد کردن"
       settings:
         show_overriden: "تنها بازنویسی‌شده‌ها را نمایش بده"
         history: "مشاهده تاریخچه تغییر"
@@ -4379,6 +4433,9 @@ fa_IR:
             label: "افزودن شکلک"
         title: "تنظیمات"
         no_results: "چیزی یافت نشد."
+        more_site_setting_results:
+          one: "بیش از %{count} نتیجه وجود دارد. لطفا جستجوی خود را اصلاح کنید یا یک دسته‌بندی را انتخاب کنید."
+          other: "بیش از %{count} نتیجه وجود دارد. لطفا جستجوی خود را اصلاح کنید یا یک دسته‌بندی را انتخاب کنید."
         clear_filter: "واضح"
         add_url: "اضافه کردن URL"
         add_host: "اضافه کردن هاست"
@@ -4451,7 +4508,8 @@ fa_IR:
         allow_title: اجازه‌ی استفاده نشان برای عنوان
         multiple_grant: نمی توان چندین بار اعطا کرد
         listable: نشان دادن نشان در صفحه نشان‌های عمومی
-        enabled: فعالسازی نشان
+        enabled: فعال شده
+        disabled: غیرفعال شده
         icon: آیکن
         image: تصویر
         query: پرس جوی نشان (SQL)
@@ -4498,7 +4556,6 @@ fa_IR:
         confirm_delete: "آیا مطمئن هستید که میخواهید آن میزبان را حذف کنید؟"
         title: "جاسازی"
         host: "میزبان های مجاز"
-        class_name: "نام کلاس"
         edit: "ویرایش"
         category: "ارسال به دسته بندی"
         add_host: "اضافه کردن میزبان"
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index 803a9a07ea7..a7b7319991e 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -144,6 +144,8 @@ fi:
       facebook: "Jaa Facebookissa"
       email: "Lähetä sähköpostitse"
       url: "Kopioi ja jaa URL"
+    word_connector:
+      comma: ", "
     action_codes:
       public_topic: "Muutettu ketju julkiseksi %{when}"
       open_topic: "Muunsi tämän ketjuksi %{when}"
@@ -155,6 +157,8 @@ fi:
       removed_user: "Poistettu käyttäjä %{who} %{when}"
       removed_group: "Poistettu käyttäjä %{who} %{when}"
       autobumped: "Nostettu automaattisesti %{when}"
+      tags_changed: "Tunnisteet on päivitetty %{when}"
+      category_changed: "Alue on päivitetty %{when}"
       autoclosed:
         enabled: "Suljettu %{when}"
         disabled: "Avattu %{when}"
@@ -179,17 +183,12 @@ fi:
       forwarded: "Välitetty yllä oleva sähköposti"
     topic_admin_menu: "ketjun toiminnot"
     skip_to_main_content: "Siirry pääsisältöön"
+    skip_user_nav: "Siirry profiilin sisältöön"
     emails_are_disabled: "Ylläpitäjä on estänyt kaiken lähtevän sähköpostiliikenteen. Mitään sähköposti-ilmoituksia ei lähetetä."
     emails_are_disabled_non_staff: "Lähtevät sähköpostit on poistettu käytöstä muilta kuin henkilökunnan käyttäjiltä."
     software_update_prompt:
       message: "Sivusto on juuri päivitetty, <span>päivitä sivu</span>, tai sivusto voi käyttäytyä odottamattomasti."
       dismiss: "Sulje"
-    bootstrap_mode_enabled:
-      one: "Jotta sivusto saisi lentävämmän lähdön, olet aloitustilassa. Kaikki käyttäjät nousevat heti luottamustasolle 1, ja päivittäiset sähköpostitiivistelmät kytketään päälle. Tila kytkeytyy pois päältä, kun %{count} käyttäjä on liittynyt."
-      other: "Jotta sivusto saisi lentävämmän lähdön, olet aloitustilassa. Kaikki käyttäjät nousevat heti luottamustasolle 1, ja päivittäiset sähköpostitiivistelmät kytketään päälle. Tila kytkeytyy pois päältä, kun %{count} käyttäjää on liittynyt."
-    bootstrap_mode_disabled: "Aloitustila poistetaan käytöstä seuraavan 24 tunnin aikana."
-    bootstrap_invite_button_title: "Lähetä kutsuja"
-    bootstrap_wizard_link_title: "Viimeistele ohjattu määritys"
     themes:
       default_description: "Oletus"
       broken_theme_alert: "Sivustosi ei välttämättä toimi, koska teemassa tai komponentissa on virheitä."
@@ -302,11 +301,9 @@ fi:
       edit_bookmark: "Muokkaa kirjanmerkkiä"
       clear_bookmarks: "Tyhjennä kirjanmerkit"
       help:
-        bookmark: "Klikkaa lisätäksesi ketjun ensimmäisen viestin kirjanmerkkeihin"
-        edit_bookmark: "Klikkaa muokataksesi tämän ketjun kirjanmerkkiä"
         edit_bookmark_for_topic: "Klikkaa muokataksesi tämän ketjun kirjanmerkkiä"
         unbookmark: "Klikkaa poistaaksesi kaikki tämän ketjun kirjanmerkit"
-        unbookmark_with_reminder: "Klikkaa poistaaksesi kaikki tämän ketjun kirjanmerkit ja muistutukset."
+        unbookmark_with_reminder: "Klikkaa poistaaksesi kaikki tämän ketjun kirjanmerkit ja muistutukset"
     bookmarks:
       created: "Olet kirjanmerkinnyt tämän viestin. %{name}"
       created_generic: "Olet kirjanmerkinnyt tämän. %{name}"
@@ -350,7 +347,7 @@ fi:
       new_topic: "Uusi ketjuluonnos"
       new_private_message: "Uusi yksityisviestin luonnos"
       abandon:
-        confirm: "Sinulla on meneillään luonnos tätä ketjua varten. Mitä haluaisit tehdä sen kanssa?"
+        confirm: "Sinulla on jo keskeneräinen luonnos. Mitä haluat tehdä sille?"
         yes_value: "Hylkää"
         no_value: "Jatka muokkausta"
     topic_count_categories:
@@ -523,11 +520,9 @@ fi:
       scores:
         about: "Pisteet perustuvat ilmoittajan luottamustasoon, heidän aiempien liputusten osuvuuteen ja raportoidun asian prioriteettiin."
         score: "Arvo"
-        date: "Päivämäärä"
-        type: "Tyyppi"
+        type: "Syy"
         status: "Tila"
-        submitted_by: "Lähettäjä"
-        reviewed_by: "Käsittelijä"
+        submitted_by: "Ilmoittaja"
       statuses:
         pending:
           title: "Odottaa"
@@ -535,14 +530,12 @@ fi:
           title: "Hyväksytty"
         rejected:
           title: "Hylätty"
-        ignored:
-          title: "Sivuutettu"
-        deleted:
-          title: "Poistettu"
         reviewed:
-          title: "(kaikki käsitellyt)"
+          title: "Kaikki käsitellyt"
         all:
-          title: "(kaikki)"
+          title: "Kaikki"
+      context_question:
+        delimiter: "tai"
       types:
         reviewable_flagged_post:
           title: "Liputettu viesti"
@@ -555,6 +548,8 @@ fi:
           title: "Käyttäjä"
         reviewable_post:
           title: "Viesti"
+        reviewable_chat_message:
+          title: "Liputettu chat-viesti"
       approval:
         title: "Viesti odottaa hyväksyntää"
         description: "Viestisi saapui perille, mutta valvojan on vielä hyväksyttävä se, jotta se näkyy sivustolla. Ole kärsivällinen."
@@ -849,6 +844,7 @@ fi:
         make_all_primary_description: "Aseta tämä ryhmä ensisijaiseksi kaikille valituille käyttäjille"
         remove_all_primary: "Poista kaikilta ensisijaisuus"
         remove_all_primary_description: "Poista tämä ryhmä kaikilta ensisijaisena ryhmänä"
+        status: "Tila"
         owner: "Isäntä"
         primary: "Ensisijainen"
         forbidden: "Et voi tarkastella jäseniä."
@@ -976,11 +972,6 @@ fi:
       profile: "Profiili"
       mute: "Vaimenna"
       edit: "Muokkaa asetuksia"
-      download_archive:
-        button_text: "Lataa kaikki"
-        confirm: "Haluatko varmasti ladata viestisi?"
-        success: "Lataus aloitettu. Saat ilmoituksen yksityisviestinä, kun prosessi on valmis."
-        rate_limit_error: "Viestit voi ladata kerran vuorokaudessa. Yritä huomenna uudelleen."
       new_private_message: "Uusi viesti"
       private_message: "Viesti"
       private_messages: "Viestit"
@@ -1033,6 +1024,7 @@ fi:
           warning: "Haluatko varmasti nollata valikoimasi ketjun?"
       use_current_timezone: "Käytä nykyistä aikavyöhykettäni"
       profile_hidden: "Käyttäjän julkinen profiili ei ole nähtävillä."
+      inactive_user: "Käyttäjä ei ole enää aktiivinen."
       expand_profile: "Laajenna"
       sr_expand_profile: "Laajenna profiilin tiedot"
       collapse_profile: "Supista"
@@ -1052,7 +1044,7 @@ fi:
         perm_denied_expl: "Olet kieltänyt ilmoitukset. Salli ilmoitukset selaimesi asetuksista."
         disable: "Poista ilmoitukset käytöstä"
         enable: "Näytä ilmoituksia"
-        each_browser_note: 'Huomautus: Tätä asetusta on muutettava jokaisessa käyttämässäsi selaimessa. Kaikki ilmoitukset poistetaan käytöstä, kun keskeytät ilmoitukset käyttäjävalikosta riippumatta tästä asetuksesta.'
+        each_browser_note: "Huomautus: Tätä asetusta on muutettava jokaisessa käyttämässäsi selaimessa. Kaikki ilmoitukset poistetaan käytöstä, kun keskeytät ilmoitukset käyttäjävalikosta riippumatta tästä asetuksesta."
         consent_prompt: "Haluatko reaaliaikaisia ilmoituksia, kun ihmiset vastaavat viesteihisi?"
       dismiss: "Kuittaa"
       dismiss_notifications: "Kuittaa kaikki"
@@ -1103,14 +1095,10 @@ fi:
       experimental_sidebar:
         enable: "Ota sivupalkki käyttöön"
         options: "Asetukset"
-        categories_section: "Alueet-osio"
-        categories_section_instruction: "Valitut alueet näkyvät sivupalkin alueet-osiossa."
-        tags_section: "Tunnisteet-osio"
-        tags_section_instruction: "Valitut tunnisteet näkyvät sivupalkin tunnisteet-osiossa."
         navigation_section: "Navigointi"
-        list_destination_instruction: "Kun sivupalkissa on uutta sisältöä..."
-        list_destination_default: "käytä oletuslinkkiä ja näytä merkki uusissa kohteissa"
-        list_destination_unread_new: "linkki lukemattomiin/uusiin ja näytä uusien kohteiden määrä"
+        navigation_section_instruction: "Kun navigointivalikon aihelistalla on uusia tai lukemattomia kohteita…"
+        link_to_filtered_list_checkbox_description: "Linkki suodatettuun listaan"
+        show_count_new_items_checkbox_description: "Näytä uusien kohteiden lukumäärä"
       change: "vaihda"
       featured_topic: "Valikoitu ketju"
       moderator: "%{user} on valvoja"
@@ -1181,12 +1169,21 @@ fi:
       home: "Oletusaloitussivu"
       staged: "Esikäyttäjä"
       staff_counters:
-        flags_given: "hyödyllistä liputusta"
-        flagged_posts: "liputettua viestiä"
-        deleted_posts: "poistettua viestiä"
-        suspensions: "estoa"
-        warnings_received: "varoituksia"
-        rejected_posts: "hylättyjä viestejä"
+        flagged_posts:
+          one: '<span class="%{className}">%{count}</span> merkitty julkaisu'
+          other: '<span class="%{className}">%{count}</span> merkittyä julkaisua'
+        deleted_posts:
+          one: '<span class="%{className}">%{count}</span> poistettu julkaisu'
+          other: '<span class="%{className}">%{count}</span> poistettua julkaisua'
+        suspensions:
+          one: '<span class="%{className}">%{count}</span> jäädytys'
+          other: '<span class="%{className}">%{count}</span> jäädytystä'
+        warnings_received:
+          one: '<span class="%{className}">%{count}</span> varoitus'
+          other: '<span class="%{className}">%{count}</span> varoitusta'
+        rejected_posts:
+          one: '<span class="%{className}">%{count}</span> hylätty julkaisu'
+          other: '<span class="%{className}">%{count}</span> hylättyä julkaisua'
       messages:
         all: "kaikki postilaatikot"
         inbox: "Saapuneet"
@@ -1279,7 +1276,6 @@ fi:
         tags: "Tunnisteet"
         interface: "Käyttöliittymä"
         apps: "Sovellukset"
-        sidebar: "Sivupalkki"
       change_password:
         success: "(sähköposti lähetetty)"
         in_progress: "(sähköpostia lähetetään)"
@@ -1293,11 +1289,9 @@ fi:
         title: "Kaksivaiheisen tunnistuksen varakoodit"
         regenerate: "Tee uusi"
         disable: "Poista käytöstä"
-        enable: "Ota käyttöön"
-        enable_long: "Ota varakoodit käyttöön"
         manage:
-          one: "Hallitse varakoodeja. Sinulla on <strong>%{count}</strong> varakoodi jäljellä."
-          other: "Hallitse varakoodeja. Sinulla on <strong>%{count}</strong> varakoodia jäljellä."
+          one: "<strong>%{count}</strong> varakoodi jäljellä."
+          other: "<strong>%{count}</strong> varakoodia jäljellä."
         copy_to_clipboard: "Kopioi leikepöydälle"
         copy_to_clipboard_error: "Virhe kopioimisessa leikepöydälle"
         copied_to_clipboard: "Kopioitiin leikepöydälle"
@@ -1735,8 +1729,7 @@ fi:
       pause_notifications: "Keskeytä ilmoitukset"
       remove_status: "Poista tila"
     user_tips:
-      primary: "Selvä!"
-      secondary: "älä näytä minulle näitä vinkkejä"
+      button: "Selvä!"
       first_notification:
         title: "Ensimmäinen ilmoituksesi!"
         content: "Ilmoitusten avulla pysyt ajan tasalla siitä, mitä yhteisössä tapahtuu."
@@ -1752,6 +1745,8 @@ fi:
       suggested_topics:
         title: "Jatka lukemista!"
         content: "Tässä on muutamia ketjuja, joita saatat haluta lukea seuraavaksi."
+      admin_guide:
+        button: "Mennään!"
     loading: "Ladataan..."
     errors:
       prev_page: "yrittäessä ladata"
@@ -1786,36 +1781,6 @@ fi:
       logout_disabled: "Et voi kirjautua ulos, kun sivusto on vain luku -tilassa."
     staff_writes_only_mode:
       enabled: "Sivusto on vain henkilökunta -tilassa. Voit jatkaa selailua, mutta vastaaminen, tykkääminen ja muita toimintoja on rajoitettu vain henkilökunnan jäsenille."
-    too_few_topics_and_posts_notice_MF: |
-      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">Aloitetaan keskustelu!</a> Sivustolla on { currentTopics, plural,
-          one {<strong>#</strong> ketju}
-        other {<strong>#</strong> ketjua}
-      } ja { currentPosts, plural,
-          one {<strong>#</strong> viesti}
-        other {<strong>#</strong> viestiä}
-      }. Vierailijat tarvitsevat enemmän luettavaa ja vastattavaa – suosittelemme, että sivustolla olisi vähintään { requiredTopics, plural,
-          one {<strong>#</strong> ketju}
-        other {<strong>#</strong> ketjua}
-      } ja { requiredPosts, plural,
-          one {<strong>#</strong> viesti}
-        other {<strong>#</strong> viestiä}
-      }. Vain henkilökunta voi nähdä tämän viestin.
-    too_few_topics_notice_MF: |
-      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">Aloitetaan keskustelu!</a> Sivustolla on { currentTopics, plural,
-          one {<strong>#</strong> ketju}
-        other {<strong>#</strong> ketjua}
-      }. Vierailijat tarvitset enemmän luettavaa ja vastattavaa – suosittelemme, että sivustolla olisi vähintään { requiredTopics, plural,
-          one {<strong>#</strong> ketju}
-        other {<strong>#</strong> ketjua}
-      }. Vain henkilökunta voi nähdä tämän viestin.
-    too_few_posts_notice_MF: |
-      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">Aloitetaan keskustelu!</a> Sivustolla on { currentPosts, plural,
-          one {<strong>#</strong> viesti}
-        other {<strong>#</strong> viestiä}
-      }. Vierailijat tarvitset enemmän luettavaa ja vastattavaa – suosittelemme, että sivustolla olisi vähintään { requiredPosts, plural,
-          one {<strong>#</strong> viesti}
-        other {<strong>#</strong> viestiä}
-      }. Vain henkilökunta voi nähdä tämän viestin.
     logs_error_rate_notice:
       reached_hour_MF: |
         <b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# virhe/tunti} other {# virhettä/tunti}}</a> saavutti sivustoasetusrajan {limit, plural, one {# virhe/tunti} other {# virhettä/tunti}}.
@@ -1845,17 +1810,22 @@ fi:
       hidden_for_session: "OK, kysymme sinulta huomenna. Voit myös aina käyttää 'Kirjaudu sisään' -linkkiä tilin luomiseen."
       intro: "Hei! Vaikuttaa siltä, että olet pitänyt keskusteluista, muttet ole luonut käyttäjätiliä."
       value_prop: "Oletko kyllästynyt selaamaan samoja viestejä? Kun luot tilin, palaat aina siihen, mihin jäit. Tilin avulla voit myös saada ilmoituksia uusista vastauksista, tallentaa kirjanmerkkejä ja käyttää tykkäyksiä kiittääksesi muita. Voimme kaikki työskennellä yhdessä tehdäksemme tästä yhteisöstä mahtavan. :heart:"
+    offline_indicator:
+      no_internet: "Ei Internet-yhteyttä."
+      refresh_page: "Päivitä sivu"
     summary:
-      enabled_description: "Tarkastelet yhteenvetoa tästä ketjusta, sen mielenkiintoisimpia viestejä käyttäjien toiminnan perusteella."
+      in_progress: "Tekoäly tiivistää aihetta..."
+      summarized_on: "Tiivistetty tekoälyllä %{date}"
+      model_used: "Käytetty tekoälyä: %{model}"
       description:
         one: "Ketjussa on <b>%{count}</b> vastaus."
         other: "Ketjussa on <b>%{count}</b> vastausta."
+      buttons:
+        hide: "Piilota yhteenveto"
+        generate: "Tekoälyn tiivistämä"
       description_time_MF: |
         Ketjussa {replyCount, plural, one {on <b>#</b> vastaus} other {on <b>#</b> vastausta}}, joiden arvioitu lukuaika on <b>{readingTime, plural, one {# minuutti} other {# minuuttia}}</b>.
-      enable: "Näytä ketjun tiivistelmä"
       disable: "Näytä kaikki viestit"
-      short_label: "Tee yhteenveto"
-      short_title: "Näytä tämän ketjun yhteenveto: mielenkiintoisimmat viestit käyttäjien toiminnan perusteella"
     deleted_filter:
       enabled_description: "Tämä ketju sisältää poistettuja viestejä, jotka on piilotettu."
       disabled_description: "Ketjun poistetut viestit näytetään."
@@ -2154,8 +2124,6 @@ fi:
         topic_template_not_modified: "Lisää ketjuun tietoja ja yksityiskohtia muokkaamalla ketjun mallipohjaa."
       save_edit: "Tallenna muokkaus"
       overwrite_edit: "Korvaa muokkaus"
-      reply_original: "Vastaa alkuperäiseen ketjuun"
-      reply_here: "Vastaa tänne"
       reply: "Vastaa"
       cancel: "Peruuta"
       create_topic: "Aloita ketju"
@@ -2320,6 +2288,7 @@ fi:
       reaction_2: "<span>%{username}, %{username2}</span> %{description}"
       votes_released: "%{description} – valmis"
       new_features: "Uusia ominaisuuksia saatavilla!"
+      admin_problems: "Uusia suosituksia sivustosi hallintapaneelissa"
       dismiss_confirmation:
         body:
           default:
@@ -2624,7 +2593,7 @@ fi:
         top: "Suosittuja ketjuja ei ole."
         educate:
           new: '<p>Sinulle uudet ketjut näytetään tässä. Oletuksena ketju tulkitaan uudeksi ja sen yhteydessä näytetään <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span>-merkintä, jos se on aloitettu edellisten kahden päivän aikana.</p><p>Aikarajaa voit muuttaa <a href="%{userPrefsUrl}">käyttäjäasetuksissasi</a>.</p>'
-          unread: '<p>Lukemattomia viestejä sisältävät ketjut näytetään tässä.</p><p>Ketjun yhteydessä näytetään lukemattomien viestien lukumäärä <span class="badge unread-posts badge-notification">1</span>, jos olet:</p><ul><li>aloittanut ketjun</li><li>vastannut ketjuun</li><li>lukenut ketjua pidempään kuin 4 minuuttia</li></ul><p>tai, jos olet erikseen merkannut ketjun seurattavaksi tai tarkkailtavaksi ketjun lopusta löytyvälä painikkeella.</p><p>Voit muuttaa tätä <a href="%{userPrefsUrl}">käyttäjäasetuksissasi</a>.</p>'
+          unread: '<p>Lukemattomia viestejä sisältävät ketjut näytetään tässä.</p><p>Ketjun yhteydessä näytetään lukemattomien viestien lukumäärä <span class="badge unread-posts badge-notification">1</span>, jos olet:</p><ul><li>aloittanut ketjun</li><li>vastannut ketjuun</li><li>lukenut ketjua pidempään kuin 5 minuuttia</li></ul><p>tai, jos olet erikseen merkannut ketjun seurattavaksi tai tarkkailtavaksi ketjun lopusta löytyvälä painikkeella.</p><p>Voit muuttaa tätä <a href="%{userPrefsUrl}">käyttäjäasetuksissasi</a>.</p>'
       bottom:
         latest: "Tuoreimpia ketjuja ei ole enempää."
         posted: "Ketjuja, joihin olet kirjoittanut, ei ole enempää."
@@ -2687,6 +2656,7 @@ fi:
       read_more_in_category: "Haluatko lukea lisää? Selaa muita ketjuja alueelta %{categoryLink} tai <a href='%{latestLink}'>katso viimeisimmät ketjut</a>."
       read_more: "Haluatko lukea lisää? <a href='%{categoryLink}'>Selaa kaikkia alueita</a> tai <a href='%{latestLink}'>katso viimeisimmät ketjut</a>."
       unread_indicator: "Kukaan jäsen ei ole lukenut ketjun viimeistä viestiä vielä."
+      participant_groups: "Osallistujaryhmät"
       read_more_MF: |
         { HAS_UNREAD_AND_NEW, select,
           true {
@@ -2727,8 +2697,6 @@ fi:
       browse_all_categories_latest_or_top: "<a href='%{basePath}/categories'>Selaa kaikkia alueita</a>, <a href='%{basePath}/latest'>katso viimeisimmät ketjut</a> tai katso suosituimmat:"
       browse_all_tags_or_latest: "<a href='%{basePath}/tags'>Selaa kaikkia tunnisteita</a> tai <a href='%{basePath}/latest'>katso viimeisimmät ketjut</a>."
       suggest_create_topic: Valmiina <a href>aloittamaan uuden keskustelun?</a>
-      jump_reply_up: siirry aiempaan vastaukseen
-      jump_reply_down: siirry myöhempään vastaukseen
       deleted: "Tämä ketju on poistettu"
       slow_mode_update:
         title: "Hidas tila"
@@ -2996,6 +2964,7 @@ fi:
         instructions:
           one: "Valitse ketju, johon haluat siirtää valitun viestin."
           other: "Valitse ketju, johon haluat siirtää valitut <b>%{count}</b> viestiä."
+        chronological_order: "säilytä kronologinen järjestys yhdistämisen jälkeen"
       move_to_new_message:
         title: "Siirrä uuteen viestiin"
         action: "siirrä uuteen viestiin"
@@ -3093,9 +3062,6 @@ fi:
       collapse: "kutista"
       sr_collapse_replies: "Kutista upotetut vastaukset"
       sr_date: "Viestin päivämäärä"
-      sr_expand_replies:
-        one: "Tällä viestillä on %{count} vastaus. Laajenna klikkaamalla."
-        other: "Tällä viestillä on %{count} vastausta. Laajenna klikkaamalla."
       expand_collapse: "laajenna/kutista"
       sr_below_embedded_posts_description: "viestin %{post_number} vastaukset"
       sr_embedded_reply_description: "käyttäjän %{username} vastaus viestiin %{post_number}"
@@ -3307,7 +3273,6 @@ fi:
       filtered_replies:
         viewing_posts_by: "Katsellaan %{post_count} viestiä käyttäjältä"
         viewing_subset: "Jotkin vastaukset on kutistettu"
-        viewing_summary: "Katsellaan ketjun yhteenvetoa"
         post_number: "%{username}, viesti #%{post_number}"
         show_all: "Näytä kaikki"
       share:
@@ -3324,7 +3289,6 @@ fi:
       back: "Takaisin alueelle"
       general: "Yleistä"
       settings: "Asetukset"
-      topic_template: "Ketjun mallipohja"
       tags: "Tunnisteet"
       tags_allowed_tags: "Rajaa nämä tunnisteet tälle alueelle:"
       tags_allowed_tag_groups: "Rajaa nämä tunnisteryhmät tälle alueelle:"
@@ -3383,8 +3347,6 @@ fi:
       email_in: "Mukautettu saapuvan postin sähköpostiosoite:"
       email_in_tooltip: "Voit erottaa useita sähköpostiosoitteita |-merkillä."
       email_in_allow_strangers: "Hyväksy sähköpostit anonyymeiltä käyttäjiltä, joilla ei ole tiliä"
-      email_in_disabled: "Uusien ketjujen aloittaminen sähköpostitse on poistettu käytöstä sivuston asetuksissa. Salliaksesi uusien ketjujen luomisen sähköpostilla, "
-      email_in_disabled_click: 'ota käyttöön saapuvien sähköpostien asetus.'
       mailinglist_mirror: "Alue jäljittelee postituslistaa"
       show_subcategory_list: "Näytä ala-alueiden luettelo ketjujen yläpuolella tällä alueella."
       read_only_banner: "Banneriteksti, joka näytetään, jos käyttäjä ei voi aloittaa ketjua tälle alueelle:"
@@ -3592,6 +3554,10 @@ fi:
     filters:
       with_topics: "%{filter} ketjut"
       with_category: "%{filter} %{category} ketjut"
+      filter:
+        title: "Suodatin"
+        button:
+          label: "Suodatin"
       latest:
         title: "Tuoreimmat"
         title_with_count:
@@ -3662,7 +3628,6 @@ fi:
         this_week: "Viikko"
         today: "Tänään"
     browser_update: 'Valitettavasti <a href="https://www.discourse.org/faq/#browser">selaintasi ei tueta</a>. <a href="https://browsehappy.com">Vaihda tuettuun selaimeen</a>, niin voit katsella monipuolista sisältöä, kirjautua sisään ja vastata.'
-    safari_13_warning: Tämä sivusto poistaa pian iOS:n ja Safarin version 13 ja sitä vanhempien versioiden tuen. Yksinkertaistettu vain luku -versio on edelleen käytettävissä. (<a href="https://meta.discourse.org/t/224747">Lisätietoja</a>)
     permission_types:
       full: "Luoda / Vastata / Nähdä"
       create_post: "Vastata / Nähdä"
@@ -3677,6 +3642,20 @@ fi:
       close: "Sulje (Esc)"
       content_load_error: '<a href="%url%">Sisällön</a> lataaminen ei onnistunut.'
       image_load_error: '<a href="%url%">Kuvan</a> lataaminen ei onnistunut.'
+    experimental_lightbox:
+      image_load_error: "Kuvaa ei voitu ladata."
+      screen_reader_image_title: "Kuva %{current}/%{total}: %{title}"
+      buttons:
+        next: "Seuraava (oikealle- tai alas-nuolinäppäin)"
+        previous: "Edellinen (vasemmalle- tai ylös-nuolinäppäin)"
+        close: "Sulje (Esc)"
+        download: "Lataa kuva"
+        newtab: "Avaa kuva uuteen välilehteen"
+        zoom: "Lähennä/loitonna kuvaa (Z-näppäin)"
+        rotate: "Kierrä kuvaa (R-näppäin)"
+        fullscreen: "Kytke selaimen koko näytön tila (M-näppäin)"
+        carousel: "Näytä kaikki kuvat karusellissa (A-näppäin)"
+        retry: "Yritä ladata kuva uudelleen"
     cannot_render_video: Tätä videota ei voida toistaa, koska selaimesi ei tue tarvittavaa koodekkia.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
@@ -3769,7 +3748,9 @@ fi:
         one: "On ansainnut tämän kunniamerkin %{count} kerran"
         other: "On ansainnut tämän kunniamerkin %{count} kertaa"
       granted_on: "Myönnetty %{date}"
-      others_count: "Muita, joilla on tämä kunniamerkki (%{count})"
+      others_count:
+        one: "Myönnetty muille %{count} kerran"
+        other: "Myönnetty muille %{count} kertaa"
       title: Kunniamerkit
       allow_title: "Voit käyttää tätä kunniamerkkiä tittelinä"
       multiple_grant: "Voit ansaita tämän useasti"
@@ -3952,13 +3933,11 @@ fi:
     pause_notifications:
       title: "Keskeytä ilmoitukset..."
       label: "Keskeytä ilmoitukset"
-      remaining: "%{remaining} jäljellä"
       options:
         half_hour: "30 minuuttiin"
         one_hour: "1 tuntiin"
         two_hours: "2 tuntiin"
         tomorrow: "Ennen huomista"
-        custom: "Mukautettu"
       set_schedule: "Aseta ilmoitusten aikataulu"
     trust_levels:
       names:
@@ -4007,7 +3986,23 @@ fi:
       more: "Lisää"
       all_categories: "Kaikki alueet"
       all_tags: "Kaikki tunnisteet"
+      edit_navigation_modal_form:
+        filter_dropdown:
+          all: "Kaikki"
       sections:
+        custom:
+          save: "Tallenna"
+          delete: "Poista"
+          reset_confirm: "Haluatko varmasti palauttaa osion oletukset?"
+          more_menu: "Lisää-valikko"
+          links:
+            reset: "Palauta oletukset"
+            icon:
+              label: "Kuvake"
+            name:
+              label: "Nimi"
+            value:
+              label: "Linkki"
         about:
           header_link_text: "Tietoa"
         messages:
@@ -4022,28 +4017,21 @@ fi:
             unread_with_count: "Lukematta (%{count})"
             archive: "Arkisto"
         tags:
-          links:
-            add_tags:
-              content: "Lisää tunnisteita"
-              title: "Et ole lisännyt tunnisteita. Aloita klikkaamalla."
           none: "Et ole lisännyt tunnisteita."
           click_to_get_started: "Aloita klikkaamalla tätä."
           header_link_text: "Tunnisteet"
           header_action_title: "Muokkaa sivupalkin tunnisteitasi"
           configure_defaults: "Määritä oletukset"
         categories:
-          links:
-            add_categories:
-              content: "Lisää alueita"
-              title: "Et ole lisännyt alueita. Aloita klikkaamalla."
           none: "Et ole lisännyt alueita."
           click_to_get_started: "Aloita klikkaamalla tätä."
           header_link_text: "Alueet"
           header_action_title: "Muokkaa sivupalkin alueitasi"
           configure_defaults: "Määritä oletukset"
         community:
-          header_link_text: "Yhteisö"
-          header_action_title: "Aloita ketju"
+          edit_section:
+            sidebar: "Mukauta osiota"
+            header_dropdown: "Mukauta"
           links:
             about:
               content: "Tietoa"
@@ -4054,8 +4042,8 @@ fi:
             badges:
               content: "Kunniamerkit"
               title: "Kaikki ansaittavissa olevat kunniamerkit"
-            everything:
-              content: "Kaikki"
+            topics:
+              content: "Ketjut"
               title: "Kaikki ketjut"
             faq:
               content: "UKK"
@@ -4077,11 +4065,21 @@ fi:
               content: "Käsittele"
               title: "Liputetut viestit ja muut jonossa olevat kohteet"
               pending_count: "%{count} odottaa"
+      panels:
+        forum:
+          label: Keskustelualuea
     welcome_topic_banner:
       title: "Luo tervetuloketjusi"
       description: "Tervetuloketjusi on ensimmäinen asia, jonka uudet jäsenet lukevat. Ajattele sitä \"hissipuheenasi\" tai \"tavoitelausumanasi\". Kerro kaikille, kenelle tämä yhteisö on tarkoitettu, mitä he voivat odottaa löytävänsä täältä ja mitä haluat heidän tekevän ensin."
       button_title: "Aloita muokkaaminen"
     until: "Asti:"
+    form_template_chooser:
+      select_template: "Valitse malleista"
+    form_templates:
+      errors:
+        typeMismatch:
+          default: "Anna kelvollinen arvo."
+          email: "Anna kelvollinen sähköpostiosoite."
   admin_js:
     type_to_filter: "kirjoita suodattaaksesi..."
     admin:
@@ -4240,10 +4238,6 @@ fi:
         about: "Muokkaa ryhmien jäsenyyksiä ja nimiä täällä"
         group_members: "Ryhmän jäsenet"
         delete: "Poista"
-        delete_confirm: "Oletko varma, että haluat poistaa tämän ryhmän?"
-        delete_with_messages_confirm:
-          one: "Tämän ryhmän poistaminen aiheuttaa %{count} viestin orpoutumisen, ja ryhmän jäsenillä ei ole tämän jälkeen pääsyä siihen."
-          other: "Tämän ryhmän poistaminen aiheuttaa %{count} viestin orpoutumisen, ja ryhmän jäsenillä ei ole tämän jälkeen pääsyä siihen."
         delete_failed: "Ryhmän poistaminen ei onnistu. Jos tämä on automaattinen ryhmä, sitä ei voi poistaa."
         delete_automatic_group: Tämä on automaattisesti luotu ryhmä, eikä sitä voi poistaa.
         delete_owner_confirm: "Perutaanko käyttäjältä '%{username}' isännyys?"
@@ -4308,10 +4302,10 @@ fi:
             topics:
               read: Lue ketjua tai tiettyä sen viestiä. RSS on myös tuettu.
               write: Aloita uusi ketju tai kirjoita olemassa olevaan.
-              update: Päivitä ketju. Muuta otsikkoa, aluetta, tunnisteita jne.
               read_lists: Lue ketjuluetteloita, kuten suositut, uudet, tuoreimmat jne. RSS on myös tuettu.
             posts:
               edit: Muokkaa mitä tahansa viestiä tai tiettyä viestiä.
+              list: Listaa viimeisimmät viestit ja yksityisviestit. Myös RSS on tuettu.
             categories:
               list: Hae luettelo alueista.
               show: Hae yksittäinen alue tunnuksen perusteella.
@@ -4406,8 +4400,8 @@ fi:
           name: "Käyttäjän ylennustapahtuma"
           details: "Kun käyttäjä ylennetään luottamustasolta toiselle."
         user_badge_event:
-          name: "Kunniamerkin myöntämistapahtuma"
-          details: "Kun käyttäjä saa kunniamerkin."
+          name: "Merkittävä tapahtuma"
+          details: "Kun kunniamerkki myönnetään tai mitätöidään."
         group_user_event:
           name: "Käyttäjäryhmän tapahtuma"
           details: "Kun käyttäjä lisätään tai poistetaan ryhmästä."
@@ -4450,7 +4444,6 @@ fi:
         enabled: "Otettu käyttöön?"
         is_enabled: "K"
         not_enabled: "E"
-        change_settings: "Muuta asetuksia"
         change_settings_short: "Asetukset"
         howto: "Kuinka asennan lisäosia?"
         official: "Virallinen lisäosa"
@@ -4782,6 +4775,8 @@ fi:
           love:
             name: "tykkäys"
             description: "Tykkäyspainikkeen väri."
+          selected:
+            name: "valittu"
         robots:
           title: "Ohita sivustosi robots.txt-tiedosto:"
           warning: "Tämä ohittaa pysyvästi kaikki asiaankuuluvat sivuston asetukset."
@@ -5066,14 +5061,8 @@ fi:
           silence: "Hiljennä"
           link: "Linkki"
         action_descriptions:
-          block: "Estä lähettämästä viestiä, jossa esiintyy joku näistä sanoista. Käyttäjälle näytetään virheilmoitus, kun hän yrittää lähettää viestinsä."
-          censor: "Salli viesti, jossa esiintyy joku näistä sanoista, mutta korvaa ne merkeillä, jotka piilottavat sensuroidut sanat."
-          require_approval: "Viesti, jossa esiintyy joku näistä sanoista, tarvitsee henkilökunnan hyväksynnän ennen sen julkaisemista."
-          flag: "Salli viesti, jossa esiintyy joku näistä sanoista, mutta liputa se sopimattomaksi, jotta valvojat voivat tarkastella sitä."
-          replace: "Korvaa sanoja viesteissä vaihtoehtoisilla sanoilla"
-          tag: "Merkitse automaattisesti ketjuja tunnisteilla ensimmäisen viestin perusteella"
-          silence: "Ensimmäiset käyttäjän viestit, jotka sisältävät nämä sanat, tarvitsevat henkilökunnan hyväksynnän ennen kuin ne voidaan nähdä, ja käyttäjä hiljennetään automaattisesti."
-          link: "Korvaa sanoja viesteissä linkeillä"
+          replace: "Korvaa sanoja viesteissä vaihtoehtoisilla sanoilla."
+          link: "Korvaa sanoja viesteissä linkeillä."
         form:
           label: "Sisältää sanan tai lauseen"
           placeholder: "Syötä sana tai lause (* on jokerimerkki)"
@@ -5096,6 +5085,37 @@ fi:
           description: "Tarkastele tekstin osuvuutta tarkkailtuihin sanoihin kirjoittamalla alle"
           found_matches: "Löytyneitä osumia:"
           no_matches: "Ei osumia"
+      form_templates:
+        nav_title: "Mallit"
+        list_table:
+          headings:
+            name: "Nimi"
+            actions: "Toiminnot"
+        view_template:
+          close: "Sulje"
+          edit: "Muokkaa"
+          delete: "Poista"
+        new_template_form:
+          submit: "Tallenna"
+          cancel: "Peruuta"
+          preview: "Esikatselu"
+        quick_insert_fields:
+          add_new_field: "Lisää"
+          dropdown: "Pudotusvalikko"
+        validations_modal:
+          table_headers:
+            key: "Avain"
+            type: "Tyyppi"
+            description: "Kuvaus"
+          validations:
+            required:
+              key: "pakollinen"
+            minimum:
+              key: "vähintään"
+            maximum:
+              key: "enintään"
+            type:
+              key: "tyyppi"
       impersonate:
         title: "Esiinny käyttäjänä"
         help: "Tällä työkalulla voi esiintyä toisena käyttäjänä virheiden paikantamista varten. Sinun täytyy kirjautua ulos, kun olet valmis."
@@ -5108,6 +5128,7 @@ fi:
         not_found: "Tätä käyttäjätunnusta ei löydy järjestelmästä."
         id_not_found: "Tätä käyttäjän tunnusta ei löydy järjestelmästä."
         active: "Aktivoitu"
+        status: "Tila"
         show_emails: "Näytä sähköpostit"
         hide_emails: "Piilota sähköpostit"
         nav:
@@ -5196,7 +5217,6 @@ fi:
         show_admin_profile: "Ylläpito"
         manage_user: "Hallitse käyttäjää"
         show_public_profile: "Näytä julkinen profiili"
-        impersonate: "Esiinny käyttäjänä"
         action_logs: "Toimintaloki"
         ip_lookup: "IP-haku"
         log_out: "Kirjaa ulos"
@@ -5434,6 +5454,12 @@ fi:
         show_overriden: "Näytä vain korvatut"
         locale: "Kieli:"
         more_than_50_results: "Hakutuloksia on yli 50. Rajaa hakuasi."
+        outdated:
+          title: "Käännös on vanhentunut"
+          description: "Avaimen oletuskäännös on muuttunut ohituksen luonnin jälkeen. Varmista alta, että käännöksesi vastaa avaimen alkuperäisen tarkoituksen muutoksia."
+          old_default: "Vanha oletus"
+          new_default: "Uusi oletus"
+          dismiss: "Selvä"
       settings:
         show_overriden: "Näytä vain korvatut"
         history: "Näytä muutoshistoria"
@@ -5446,7 +5472,9 @@ fi:
             label: "Lisää Emoji"
         title: "Asetukset"
         no_results: "Ei tuloksia."
-        more_than_30_results: "Tuloksia on yli 30. Rajaa hakuasi tai valitse luokka."
+        more_site_setting_results:
+          one: "Tuloksia on enemmän kuin %{count}. Rajaa hakua tai valitse kategoria."
+          other: "Tuloksia on enemmän kuin %{count}. Rajaa hakua tai valitse kategoria."
         clear_filter: "Tyhjennä"
         add_url: "lisää URL"
         add_host: "lisää isäntä"
@@ -5533,7 +5561,8 @@ fi:
         allow_title: Salli kunniamerkin käyttäminen tittelinä
         multiple_grant: Voidaan myöntää useita kertoja
         listable: Näytä kunniamerkki julkisella kunniamerkkisivulla
-        enabled: Ota kunniamerkki käyttöön
+        enabled: otettu käyttöön
+        disabled: poistettu käytöstä
         icon: Kuvake
         image: Kuva
         graphic: Kuvake
@@ -5603,10 +5632,8 @@ fi:
       embedding:
         get_started: "Jos haluat upottaa Discoursen toiselle sivustolle, aloita lisäämällä sen isäntä."
         confirm_delete: "Oletko varma, että haluat poistaa tämän isännän?"
-        sample: "Liitä seuraava HTML-koodi sivustollesi, jotta voit luoda ja upottaa Discourse-ketjuja. Korvaa <b>REPLACE_ME</b> sen sivun kanonisella URL-osoitteella, jolle upotat sen."
         title: "Upottaminen"
         host: "Sallitut isännät"
-        class_name: "Luokan nimi"
         allowed_paths: "Sallittu polkulistaus"
         edit: "muokkaa"
         category: "Julkaise alueelle"
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index e9b91a16c7b..a892b7f86b1 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -144,6 +144,8 @@ fr:
       facebook: "Partager sur Facebook"
       email: "Envoyer par e-mail"
       url: "Copier et partager l'URL"
+    word_connector:
+      comma: ", "
     action_codes:
       public_topic: "A rendu ce sujet public (%{when})"
       open_topic: "A converti ceci en sujet (%{when})"
@@ -155,6 +157,8 @@ fr:
       removed_user: "A retiré %{who} (%{when})"
       removed_group: "A retiré %{who} (%{when})"
       autobumped: "Remonté automatiquement dans la liste (%{when})"
+      tags_changed: "Tags mis à jour %{when}"
+      category_changed: "Catégorie mise à jour %{when}"
       autoclosed:
         enabled: "A fermé ce sujet (%{when})"
         disabled: "A ouvert ce sujet (%{when})"
@@ -179,17 +183,12 @@ fr:
       forwarded: "A transmis l'e-mail ci-dessus"
     topic_admin_menu: "actions du sujet"
     skip_to_main_content: "Passer au contenu principal"
+    skip_user_nav: "Aller au contenu du profil"
     emails_are_disabled: "L'e-mail sortant a été désactivé par un administrateur. Aucune notification par e-mail ne sera envoyée."
     emails_are_disabled_non_staff: "L'envoi d'e-mail est désactivé pour les utilisateurs ne faisant pas partie des responsables."
     software_update_prompt:
       message: "Nous avons fait une mise à jour du site, nous vous invitons donc à <span>actualiser cette page</span> pour éviter d'éventuels dysfonctionnements."
       dismiss: "Ignorer"
-    bootstrap_mode_enabled:
-      one: "Pour faciliter son lancement, votre nouveau site se trouve en mode d'amorçage. Chaque nouvel utilisateur se verra accorder le niveau de confiance 1 et recevra des résumés quotidiens par e-mail. Ce mode sera automatiquement désactivé dès que votre site possédera %{count} utilisateur."
-      other: "Pour faciliter son lancement, votre nouveau site se trouve en mode d'amorçage. Chaque nouvel utilisateur se verra accorder le niveau de confiance 1 et recevra des résumés quotidiens par e-mail. Ce mode sera automatiquement désactivé dès que votre site possédera %{count} utilisateurs."
-    bootstrap_mode_disabled: "Le mode d'amorçage sera désactivé dans les prochaines 24 heures."
-    bootstrap_invite_button_title: "Envoyer des invitations"
-    bootstrap_wizard_link_title: "Terminer l'assistant de configuration"
     themes:
       default_description: "Par défaut"
       broken_theme_alert: "Votre site risque de ne pas fonctionner, car un thème ou un composant comprend des erreurs."
@@ -302,11 +301,10 @@ fr:
       edit_bookmark: "Modifier le signet"
       clear_bookmarks: "Retirer les signets"
       help:
-        bookmark: "Cliquez pour mettre un signet sur le premier message de ce sujet"
-        edit_bookmark: "Cliquez pour modifier le signet sur ce sujet"
+        bookmark: "Cliquez pour mettre ce sujet en favori"
         edit_bookmark_for_topic: "Cliquez pour modifier le signet associé à ce sujet"
         unbookmark: "Cliquez pour retirer tous les signets de ce sujet"
-        unbookmark_with_reminder: "Cliquez pour retirer tous les signets et rappels de ce sujet."
+        unbookmark_with_reminder: "Cliquez pour retirer tous les signets et rappels de ce sujet"
     bookmarks:
       created: "Vous avez mis un signet à ce message. %{name}"
       created_generic: "Vous avez mis ceci en signet. %{name}"
@@ -350,7 +348,6 @@ fr:
       new_topic: "Nouveau brouillon de sujet"
       new_private_message: "Nouveau brouillon de message direct"
       abandon:
-        confirm: "Vous avez un brouillon en cours pour ce sujet. Que voulez-vous en faire ?"
         yes_value: "Abandonner"
         no_value: "Reprendre l'édition"
     topic_count_categories:
@@ -523,11 +520,9 @@ fr:
       scores:
         about: "Ce score est calculé en fonction du niveau de confiance de l'utilisateur qui a signalé le message, de l'exactitude de ses signalements précédents et de la priorité de l'élément signalé."
         score: "Score"
-        date: "Date"
-        type: "Type"
+        type: "Motif d'attribution"
         status: "État"
-        submitted_by: "Soumis par"
-        reviewed_by: "Examiné par"
+        submitted_by: "Signalé par"
       statuses:
         pending:
           title: "En attente"
@@ -535,14 +530,12 @@ fr:
           title: "Acceptés"
         rejected:
           title: "Rejetés"
-        ignored:
-          title: "Ignorés"
-        deleted:
-          title: "Supprimés"
         reviewed:
-          title: "(examinés)"
+          title: "Examinés"
         all:
-          title: "(tous)"
+          title: "Tout"
+      context_question:
+        delimiter: "ou"
       types:
         reviewable_flagged_post:
           title: "Message signalé"
@@ -849,6 +842,7 @@ fr:
         make_all_primary_description: "Attribuer le statut de groupe principal pour tous les utilisateurs sélectionnés"
         remove_all_primary: "Supprimer le statut de groupe principal"
         remove_all_primary_description: "Supprimer le statut de groupe principal de ce groupe"
+        status: "État"
         owner: "Propriétaire"
         primary: "Principal"
         forbidden: "Vous n'avez pas l'autorisation de voir les membres."
@@ -976,11 +970,6 @@ fr:
       profile: "Profil"
       mute: "Mettre en sourdine"
       edit: "Modifier les préférences"
-      download_archive:
-        button_text: "Tout télécharger"
-        confirm: "Voulez-vous vraiment télécharger vos messages ?"
-        success: "Le téléchargement a démarré ; vous recevrez une notification lorsqu'il sera terminé."
-        rate_limit_error: "Les messages peuvent être téléchargés une fois par jour, veuillez réessayer demain."
       new_private_message: "Créer un message direct"
       private_message: "Message direct"
       private_messages: "Messages directs"
@@ -1052,7 +1041,7 @@ fr:
         perm_denied_expl: "Vous n'avez pas autorisé les notifications. Autorisez-les à partir des paramètres de votre navigateur."
         disable: "Désactiver les notifications"
         enable: "Activer les notifications"
-        each_browser_note: 'Remarque : vous devez modifier ce paramètre sur chaque navigateur utilisé. Toutes les notifications seront désactivées si vous suspendez les notifications à partir du menu utilisateur, quel que soit ce paramètre.'
+        each_browser_note: "Remarque : vous devez modifier ce paramètre sur chaque navigateur utilisé. Toutes les notifications seront désactivées si vous suspendez les notifications à partir du menu utilisateur, quel que soit ce paramètre."
         consent_prompt: "Souhaitez-vous recevoir des notifications en temps réel en cas de réponse à vos messages ?"
       dismiss: "Vu"
       dismiss_notifications: "Tout vu"
@@ -1103,14 +1092,7 @@ fr:
       experimental_sidebar:
         enable: "Activer la barre latérale"
         options: "Options"
-        categories_section: "Section Catégories"
-        categories_section_instruction: "Les catégories sélectionnées seront affichées dans la section Catégories de la barre latérale."
-        tags_section: "Section Étiquettes"
-        tags_section_instruction: "Les étiquettes sélectionnées seront affichées dans la section Étiquettes de la barre latérale."
         navigation_section: "Navigation"
-        list_destination_instruction: "Quand il y a du nouveau contenu dans la barre latérale…"
-        list_destination_default: "utiliser le lien par défaut et afficher un badge pour les nouveaux éléments"
-        list_destination_unread_new: "lien vers les éléments non lus ou nouveaux et afficher le nombre de nouveaux éléments"
       change: "modifier"
       featured_topic: "Sujet vedette"
       moderator: "%{user} a le rôle de modérateur(rice)"
@@ -1180,13 +1162,6 @@ fr:
       save_to_change_theme: 'Le thème sera mis à jour après un clic sur « %{save_text} »'
       home: "Page d'accueil par défaut"
       staged: "Distant"
-      staff_counters:
-        flags_given: "signalements utiles"
-        flagged_posts: "messages signalés"
-        deleted_posts: "messages supprimés"
-        suspensions: "suspensions"
-        warnings_received: "avertissements"
-        rejected_posts: "messages rejetés"
       messages:
         all: "toutes les boîtes de réception"
         inbox: "Boîte de réception"
@@ -1279,7 +1254,6 @@ fr:
         tags: "Étiquettes"
         interface: "Interface"
         apps: "Applications"
-        sidebar: "Barre latérale"
       change_password:
         success: "(e-mail envoyé)"
         in_progress: "(e-mail en cours d'envoi)"
@@ -1293,11 +1267,9 @@ fr:
         title: "Codes de secours de l'authentification à deux facteurs"
         regenerate: "Régénérer"
         disable: "Désactiver"
-        enable: "Activer"
-        enable_long: "Activer les codes de secours"
         manage:
-          one: "Gérer les codes de secours. Il vous reste <strong>%{count}</strong> code de secours."
-          other: "Gérer les codes de secours. Il vous reste <strong>%{count}</strong> codes de secours."
+          one: "Il vous reste <strong>%{count}</strong> code de secours."
+          other: "Il vous reste <strong>%{count}</strong> codes de secours."
         copy_to_clipboard: "Copier dans le presse-papier"
         copy_to_clipboard_error: "Erreur en copiant les données dans le presse-papier"
         copied_to_clipboard: "Copié dans le presse-papier"
@@ -1735,8 +1707,7 @@ fr:
       pause_notifications: "Suspendre les notifications"
       remove_status: "Supprimer le statut"
     user_tips:
-      primary: "J'ai compris !"
-      secondary: "ne me montrez pas ces conseils"
+      button: "J'ai compris !"
       first_notification:
         title: "Votre première notification !"
         content: "Les notifications sont utilisées pour vous tenir au courant de ce qui se passe dans la communauté."
@@ -1786,36 +1757,6 @@ fr:
       logout_disabled: "La déconnexion est désactivée quand le site est en lecture seule."
     staff_writes_only_mode:
       enabled: "Ce site est en mode réservé aux responsables. Vous pouvez continuer à naviguer, mais les réponses, les j'aime et les autres actions sont limitées aux responsables uniquement."
-    too_few_topics_and_posts_notice_MF: |
-      Commençons <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">la discussion !</a> Il y a { currentTopics, plural,
-          one {<strong>#</strong> sujet}
-        other {<strong>#</strong> sujets}
-      } et { currentPosts, plural,
-          one {<strong>#</strong> message}
-        other {<strong>#</strong> messages}
-      }. Il en faudrait davantage pour les visiteurs. Nous recommandons de proposer au moins { requiredTopics, plural,
-          one {<strong>#</strong> sujet}
-        other {<strong>#</strong> sujets}
-      } et { requiredPosts, plural,
-          one {<strong>#</strong> message}
-        other {<strong>#</strong> messages}
-      }. Seul les responsables peuvent voir ce message.
-    too_few_topics_notice_MF: |
-      Commençons <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">la discussion !</a> Il y a { currentTopics, plural,
-          one {<strong>#</strong> sujet}
-        other {<strong>#</strong> sujets}
-      }. Il en faudrait davantage pour les visiteurs. Nous recommandons de proposer au moins { requiredTopics, plural,
-          one {<strong>#</strong> sujet}
-        other {<strong>#</strong> sujets}
-      }. Seuls les responsables peuvent voir ce message.
-    too_few_posts_notice_MF: |
-      Commençons <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">la discussion !</a> Il y a { currentPosts, plural,
-          one {<strong>#</strong> message}
-        other {<strong>#</strong> messages}
-      }. Il en faudrait davantage pour les visiteurs. Nous recommandons de proposer au moins { requiredPosts, plural,
-          one {<strong>#</strong> message}
-        other {<strong>#</strong> messages}
-      }. Seuls les responsables peuvent voir ce message.
     logs_error_rate_notice:
       reached_hour_MF: |
         <b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# erreur/heure} other {# erreurs/heure}}</a> arrive à la limite paramétrée de {limit, plural, one {# erreur/heure} other {# erreurs/heure}}.
@@ -1846,16 +1787,12 @@ fr:
       intro: "Bonjour ! Vous semblez apprécier la discussion, mais n'avez pas encore créé de compte."
       value_prop: "Vous en avez assez de faire défiler les mêmes messages ? En créant un compte, vous pourrez toujours revenir là où vous en étiez. Avec un compte, vous pouvez aussi recevoir des notifications de nouvelles réponses, enregistrer des signets et utiliser des cœurs pour remercier les autres utilisateurs. Nous pouvons travailler ensemble pour rendre cette communauté formidable. :heart:"
     summary:
-      enabled_description: "Vous visualisez un résumé de ce sujet : les messages les plus intéressants choisis par la communauté."
       description:
         one: "Il y a <b>%{count}</b> réponse."
         other: "Il y a <b>%{count}</b> réponses."
       description_time_MF: |
         Il y a {replyCount, plural, one {<b>#</b> réponse} other {<b>#</b> réponses}} avec un temps de lecture estimé à <b>{readingTime, plural, one {# minute} other {# minutes}}</b>.
-      enable: "Résumer ce sujet"
       disable: "Afficher tous les messages"
-      short_label: "Résumer"
-      short_title: "Afficher un résumé de ce sujet : les publications les plus intéressantes telles que déterminées par la communauté"
     deleted_filter:
       enabled_description: "Ce sujet contient des messages supprimés, qui ont été masqués."
       disabled_description: "Les messages supprimés du sujet sont visibles."
@@ -2154,8 +2091,6 @@ fr:
         topic_template_not_modified: "Veuillez ajouter des détails à votre sujet en modifiant le modèle de sujet."
       save_edit: "Enregistrer les modifications"
       overwrite_edit: "Écraser la modification"
-      reply_original: "Répondre dans le sujet d'origine"
-      reply_here: "Répondre ici"
       reply: "Répondre"
       cancel: "Annuler"
       create_topic: "Créer le sujet"
@@ -2320,6 +2255,7 @@ fr:
       reaction_2: "<span>%{username}, %{username2}</span> %{description}"
       votes_released: "%{description} - terminé"
       new_features: "Nouvelles fonctionnalités disponibles !"
+      admin_problems: "Des nouveaux conseils sur votre tableau de bord"
       dismiss_confirmation:
         body:
           default:
@@ -2624,7 +2560,7 @@ fr:
         top: "Il n'y a pas de meilleurs sujets."
         educate:
           new: '<p>Vos nouveaux sujets vont apparaître ici. Par défaut, les sujets sont considérés comme nouveaux et affichent l''indicateur <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span> lorsqu''ils ont été créés depuis moins de 2 jours.</p><p>Vous pouvez modifier cela dans vos <a href="%{userPrefsUrl}">préférences</a>.</p>'
-          unread: "<p>Vos sujets non lus apparaissent ici.</p><p>Par défaut, les sujets considérés comme non lus et qui affichent le nombre de messages non lus <span class=\"badge unread-posts badge-notification\">1</span> sont ceux :</p> <ul><li>que vous avez créés</li><li>auxquels vous avez répondu</li><li>que vous avez lus plus de 4 minutes</li></ul><p>ou que vous avez explicitement suivis ou surveillés via le menu \U0001F514 de chaque sujet.</p><p>Vous pouvez modifier cela dans vos <a href=\"%{userPrefsUrl}\">préférences</a>.</p>"
+          unread: "<p>Vos sujets non lus apparaissent ici.</p><p>Par défaut, les sujets considérés comme non lus et qui affichent le nombre de messages non lus <span class=\"badge unread-posts badge-notification\">1</span> sont ceux :</p> <ul><li>que vous avez créés</li><li>auxquels vous avez répondu</li><li>que vous avez lus plus de 5 minutes</li></ul><p>ou que vous avez explicitement suivis ou surveillés via le menu \U0001F514 de chaque sujet.</p><p>Vous pouvez modifier cela dans vos <a href=\"%{userPrefsUrl}\">préférences</a>.</p>"
       bottom:
         latest: "Il n'y a pas d'autres sujets récents à consulter."
         posted: "Il n'y a pas d'autres sujets publiés à consulter."
@@ -2727,8 +2663,6 @@ fr:
       browse_all_categories_latest_or_top: "<a href='%{basePath}/categories'>Parcourez toutes les catégories</a>, <a href='%{basePath}/latest'>consultez les derniers sujets</a> ou consultez les principaux sujets :"
       browse_all_tags_or_latest: "<a href='%{basePath}/tags'>Parcourez toutes les étiquettes</a> ou <a href='%{basePath}/latest'>consultez les derniers sujets</a>."
       suggest_create_topic: Prêt à <a href>démarrer une nouvelle conversation ?</a>
-      jump_reply_up: accéder aux réponses précédentes
-      jump_reply_down: accéder aux réponses ultérieures
       deleted: "Ce sujet a été supprimé"
       slow_mode_update:
         title: "Mode ralenti"
@@ -3093,9 +3027,6 @@ fr:
       collapse: "réduire"
       sr_collapse_replies: "Masquer les réponses"
       sr_date: "Date de publication"
-      sr_expand_replies:
-        one: "Ce message a reçu %{count} réponse. Cliquez pour développer l'affichage"
-        other: "Ce message a reçu %{count} réponses. Cliquez pour développer l'affichage"
       expand_collapse: "développer/réduire"
       sr_below_embedded_posts_description: "réponses à la publication #%{post_number}"
       sr_embedded_reply_description: "réponse de @%{username} au message #%{post_number}"
@@ -3307,7 +3238,6 @@ fr:
       filtered_replies:
         viewing_posts_by: "Affichage de %{post_count} messages par"
         viewing_subset: "Certaines réponses sont réduites"
-        viewing_summary: "Affichage d'un résumé de ce sujet"
         post_number: "%{username}, message #%{post_number}"
         show_all: "Tout afficher"
       share:
@@ -3324,7 +3254,6 @@ fr:
       back: "Retour à la catégorie"
       general: "Général"
       settings: "Paramètres"
-      topic_template: "Modèle de sujet"
       tags: "Étiquettes"
       tags_allowed_tags: "Réserver l'utilisation de ces étiquettes à cette catégorie :"
       tags_allowed_tag_groups: "Réserver l'utilisation de ces groupes d'étiquettes à cette catégorie :"
@@ -3383,8 +3312,6 @@ fr:
       email_in: "Adresse e-mail entrant personnalisée :"
       email_in_tooltip: "Vous pouvez séparer plusieurs adresses e-mail avec le caractère | ."
       email_in_allow_strangers: "Accepter les e-mails d'utilisateurs anonymes sans compte"
-      email_in_disabled: "La création de nouveaux sujets par e-mail est désactivée dans les paramètres. Pour activer la création de nouveaux sujets par e-mail, "
-      email_in_disabled_click: 'activez le paramètre « e-mail entrant ».'
       mailinglist_mirror: "La catégorie reflète une liste de diffusion"
       show_subcategory_list: "Afficher la liste des sous-catégories au-dessus des sujets dans cette catégorie."
       read_only_banner: "Texte du bandeau à afficher lorsqu'un utilisateur ne peut pas créer un sujet dans cette catégorie :"
@@ -3592,6 +3519,10 @@ fr:
     filters:
       with_topics: "Sujets %{filter}"
       with_category: "Sujets %{filter} sur %{category}"
+      filter:
+        title: "Filtrer"
+        button:
+          label: "Filtrer"
       latest:
         title: "Récents"
         title_with_count:
@@ -3662,7 +3593,6 @@ fr:
         this_week: "Semaine"
         today: "Aujourd'hui"
     browser_update: 'Malheureusement, <a href="https://www.discourse.org/faq/#browser">votre navigateur n''est pas pris en charge</a>. Merci de <a href="https://browsehappy.com">mettre à jour votre navigateur</a> pour afficher le contenu enrichi, vous connecter et répondre.'
-    safari_13_warning: Ce site va bientôt supprimer la prise en charge des versions 13 et inférieures d'iOS et de Safari. Une version simplifiée en lecture seule restera disponible. (<a href="https://meta.discourse.org/t/224747">plus d'informations</a>)
     permission_types:
       full: "Créer/Répondre/Voir"
       create_post: "Répondre/Voir"
@@ -3677,6 +3607,9 @@ fr:
       close: "Fermer (Échap)"
       content_load_error: '<a href="%url%">Ce contenu</a> n''a pas pu être chargé.'
       image_load_error: '<a href="%url%">Cette image</a> n''a pas pu être chargée.'
+    experimental_lightbox:
+      buttons:
+        close: "Fermer (Échap)"
     cannot_render_video: Cette vidéo ne peut pas être lue car votre navigateur ne prend pas en charge le codec requis.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
@@ -3769,7 +3702,6 @@ fr:
         one: "A reçu ce badge %{count} fois"
         other: "A reçu ce badge %{count} fois"
       granted_on: "Attribué le %{date}"
-      others_count: "Autres utilisateurs avec ce badge (%{count})"
       title: Badges
       allow_title: "Vous pouvez utiliser ce badge comme titre"
       multiple_grant: "Vous pouvez obtenir plusieurs fois ce badge"
@@ -3952,13 +3884,11 @@ fr:
     pause_notifications:
       title: "Suspendre les notifications pour…"
       label: "Suspendre les notifications"
-      remaining: "Encore %{remaining}"
       options:
         half_hour: "30 minutes"
         one_hour: "1 heure"
         two_hours: "2 heures"
         tomorrow: "Jusqu'à demain"
-        custom: "Personnalisé"
       set_schedule: "Planifier les notifications"
     trust_levels:
       names:
@@ -4007,7 +3937,21 @@ fr:
       more: "Plus"
       all_categories: "Toutes les catégories"
       all_tags: "Toutes les étiquettes"
+      edit_navigation_modal_form:
+        filter_dropdown:
+          all: "Tout"
       sections:
+        custom:
+          save: "Enregistrer"
+          delete: "Supprimer"
+          links:
+            reset: "Rétablir les valeurs par défaut"
+            icon:
+              label: "Icône"
+            name:
+              label: "Nom"
+            value:
+              label: "Insérer un lien"
         about:
           header_link_text: "À propos"
         messages:
@@ -4022,28 +3966,20 @@ fr:
             unread_with_count: "Non lus (%{count})"
             archive: "Archivés"
         tags:
-          links:
-            add_tags:
-              content: "Ajouter des étiquettes"
-              title: "Vous n'avez ajouté aucune étiquette. Cliquez pour commencer."
           none: "Vous n'avez ajouté aucune étiquette."
           click_to_get_started: "Cliquez ici pour commencer."
           header_link_text: "Étiquettes"
           header_action_title: "Modifier les étiquettes de votre barre latérale"
           configure_defaults: "Configurer les valeurs par défaut"
         categories:
-          links:
-            add_categories:
-              content: "Ajouter des catégories"
-              title: "Vous n'avez ajouté aucune catégorie. Cliquez pour commencer."
           none: "Vous n'avez ajouté aucune catégorie."
           click_to_get_started: "Cliquez ici pour commencer."
           header_link_text: "Catégories"
           header_action_title: "Modifier les catégories de votre barre latérale"
           configure_defaults: "Configurer les valeurs par défaut"
         community:
-          header_link_text: "Communauté"
-          header_action_title: "Créer un sujet"
+          edit_section:
+            header_dropdown: "Personnaliser"
           links:
             about:
               content: "À propos"
@@ -4054,8 +3990,8 @@ fr:
             badges:
               content: "Badges"
               title: "Tous les badges disponibles à gagner"
-            everything:
-              content: "Tout"
+            topics:
+              content: "Sujets"
               title: "Tous les sujets"
             faq:
               content: "FAQ"
@@ -4082,6 +4018,11 @@ fr:
       description: "Votre sujet de bienvenue est la première chose que les nouveaux membres liront. Considérez-le comme votre « argumentaire » ou votre « énoncé de mission ». Faites savoir à tout le monde à qui est destinée cette communauté, ce qu'ils peuvent s'attendre à y trouver et ce que vous aimeriez qu'ils fassent en premier."
       button_title: "Commencer l'édition"
     until: "Jusqu'à :"
+    form_templates:
+      errors:
+        typeMismatch:
+          default: "Veuillez saisir une valeur valide."
+          email: "Veuillez saisir une adresse e-mail valide."
   admin_js:
     type_to_filter: "commencez votre saisie pour filtrer…"
     admin:
@@ -4240,10 +4181,6 @@ fr:
         about: "Modifier votre adhésion et les noms ici"
         group_members: "Membres du groupe"
         delete: "Supprimer"
-        delete_confirm: "Voulez-vous vraiment supprimer ce groupe ?"
-        delete_with_messages_confirm:
-          one: "La suppression de ce groupe rendra %{count} message orphelin, les membres du groupe n'y auront plus accès."
-          other: "La suppression de ce groupe rendra %{count} messages orphelins, les membres du groupe n'y auront plus accès."
         delete_failed: "Impossible de supprimer le groupe. S'il s'agit d'un groupe automatique, il ne peut pas être détruit."
         delete_automatic_group: Ce groupe ne peut pas être supprimé car il est constitué de façon automatique.
         delete_owner_confirm: "Retirer les privilèges de propriétaire pour %{username} ?"
@@ -4309,7 +4246,7 @@ fr:
             topics:
               read: Lire un sujet ou un message spécifique qu'il contient. Le RSS est aussi accepté.
               write: Créer un nouveau sujet ou publier sur un sujet existant.
-              update: Mettre à jour un sujet. Modifiez le titre, la catégorie, les étiquettes, etc.
+              update: Mettre à jour un sujet. Modifiez le titre, la catégorie, les étiquettes, le statut, l'archétype, le lien en vedette, etc.
               read_lists: Lire les listes de sujets comme top, nouveaux, récents, etc. Le RSS est aussi accepté.
             posts:
               edit: Modifiez n'importe quel message ou un message spécifique.
@@ -4406,9 +4343,6 @@ fr:
         user_promoted_event:
           name: "Événement sponsorisé par l'utilisateur"
           details: "Lorsqu'un utilisateur est promu d'un niveau de confiance à un autre."
-        user_badge_event:
-          name: "Événement d'attribution de badge"
-          details: "Lorsqu'un utilisateur reçoit un badge."
         group_user_event:
           name: "Évènement d'appartenance à un groupe"
           details: "Lorsqu'un utilisateur est ajouté ou supprimé d'un groupe."
@@ -4451,7 +4385,6 @@ fr:
         enabled: "Activée ?"
         is_enabled: "O"
         not_enabled: "N"
-        change_settings: "Changer les paramètres"
         change_settings_short: "Paramètres"
         howto: "Comment installer des extensions ?"
         official: "Extension officielle"
@@ -4783,6 +4716,8 @@ fr:
           love:
             name: "aimer"
             description: "La couleur du bouton « J'aime »."
+          selected:
+            name: "sélectionné"
         robots:
           title: "Remplacez le fichier robots.txt de votre site :"
           warning: "Cela remplacera définitivement tous les paramètres associés."
@@ -5067,14 +5002,8 @@ fr:
           silence: "Mettre en sourdine"
           link: "Insérer un lien"
         action_descriptions:
-          block: "Empêcher les messages contenant ces mots d'être publiés. L'utilisateur verra un message d'erreur lorsqu'il essaiera de publier son message."
-          censor: "Autoriser les messages contenant ces mots, mais les remplacer par des caractères qui masquent les mots censurés."
-          require_approval: "Obtenir l'approbation d'un responsable avant de publier les messages contenant ces mots."
-          flag: "Autoriser les messages qui contiennent ces mots, mais les marquer comme étant signalés pour que les modérateurs puissent les examiner."
-          replace: "Remplacer ces mots par d'autres mots"
-          tag: "Étiqueter automatiquement les sujets en fonction de leur premier message."
-          silence: "Mettre automatiquement en sourdine les utilisateurs dont le premier message contient ces mots, et nécessiter l'approbation d'un responsable avant sa publication."
-          link: "Remplacer ces mots par des liens"
+          replace: "Remplacer ces mots par d'autres mots."
+          link: "Remplacer ces mots par des liens."
         form:
           label: "Contient le mot ou l'expression"
           placeholder: "Saisissez un mot ou une expression (* sert de caractère générique)"
@@ -5097,6 +5026,37 @@ fr:
           description: "Saisissez du texte dans le champ ci-dessous pour vérifier le fonctionnement des mots ou expressions surveillés"
           found_matches: "Correspondances trouvées :"
           no_matches: "Aucune correspondance trouvée"
+      form_templates:
+        nav_title: "Modèles"
+        list_table:
+          headings:
+            name: "Nom"
+            actions: "Actions"
+        view_template:
+          close: "Fermer"
+          edit: "Modifier"
+          delete: "Supprimer"
+        new_template_form:
+          submit: "Enregistrer"
+          cancel: "Annuler"
+          preview: "Aperçu"
+        quick_insert_fields:
+          add_new_field: "Ajouter"
+          dropdown: "Menu déroulant"
+        validations_modal:
+          table_headers:
+            key: "Clé"
+            type: "Type"
+            description: "Description"
+          validations:
+            required:
+              key: "obligatoire"
+            minimum:
+              key: "minimum"
+            maximum:
+              key: "maximum"
+            type:
+              key: "type"
       impersonate:
         title: "Incarner"
         help: "Utilisez cet outil pour incarner un compte utilisateur à des fins de tests. Vous devrez vous déconnecter une fois que vous aurez terminé."
@@ -5109,6 +5069,7 @@ fr:
         not_found: "Nous sommes désolés, ce nom d'utilisateur n'existe pas dans notre système."
         id_not_found: "Désolé cet identifiant d'utilisateur n'existe pas dans notre système."
         active: "Activé"
+        status: "État"
         show_emails: "Afficher les adresses e-mail"
         hide_emails: "Masquer les adresses e-mail"
         nav:
@@ -5197,7 +5158,6 @@ fr:
         show_admin_profile: "Administration"
         manage_user: "Gérer l'utilisateur"
         show_public_profile: "Afficher le profil public"
-        impersonate: "Incarner"
         action_logs: "Journaux d'actions"
         ip_lookup: "Localiser l'adresse IP"
         log_out: "Déconnecter l'utilisateur"
@@ -5435,6 +5395,8 @@ fr:
         show_overriden: "Afficher uniquement les textes modifiés"
         locale: "Langue :"
         more_than_50_results: "Il y a plus de 50 résultats. Veuillez affiner votre recherche."
+        outdated:
+          dismiss: "Fermer"
       settings:
         show_overriden: "Afficher uniquement les paramètres modifiés"
         history: "Afficher l'historique des modifications"
@@ -5447,7 +5409,6 @@ fr:
             label: "Ajouter émoji"
         title: "Paramètres"
         no_results: "Aucun résultat trouvé."
-        more_than_30_results: "Il y a plus de 30 résultats. Veuillez affiner votre recherche ou sélectionner une catégorie."
         clear_filter: "Effacer"
         add_url: "ajouter une URL"
         add_host: "ajouter un hôte"
@@ -5534,7 +5495,8 @@ fr:
         allow_title: Permettre d'utiliser ce badge comme titre sur le profil utilisateur
         multiple_grant: Peut être attribué plusieurs fois
         listable: Afficher le badge sur la page publique des badges
-        enabled: Activer le badge
+        enabled: activée 
+        disabled: désactivée
         icon: Icône
         image: Image
         graphic: Graphique
@@ -5604,10 +5566,8 @@ fr:
       embedding:
         get_started: "Si vous souhaitez intégrer Discourse dans un autre site, commencez par ajouter son hôte."
         confirm_delete: "Voulez-vous vraiment supprimer cet hôte ?"
-        sample: "Collez le code HTML suivant sur votre site pour créer et intégrer des sujets Discourse. Remplacez <b>REPLACE_ME</b> par l'URL canonique de la page sur laquelle vous souhaitez l'intégrer."
         title: "Intégration externe"
         host: "Hôtes autorisés"
-        class_name: "Nom de classe"
         allowed_paths: "Liste des chemins autorisés"
         edit: "modifier"
         category: "Publier dans la catégorie"
diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml
index fdc2b9dbddd..209c8051d75 100644
--- a/config/locales/client.gl.yml
+++ b/config/locales/client.gl.yml
@@ -158,11 +158,6 @@ gl:
     emails_are_disabled: "Todos as mensaxes de correo saíntes foron desactivadas globalmente por un administrador. Non se enviará ningún tipo de notificación por correo electrónico."
     software_update_prompt:
       dismiss: "Desbotar"
-    bootstrap_mode_enabled:
-      one: "Para facilitar o lanzamento do seu novo sitio, está en modo de arranque. Todos os novos usuarios recibirán o nivel de confianza 1 e terán activadas as mensaxes de correo de resumo diario. Isto desactivarase automaticamente cando se una %{count} usuario."
-      other: "Para facilitar o lanzamento do seu novo sitio, está en modo de arranque. Todos os novos usuarios recibirán nivel de confianza 1 e terán activadas as mensaxes de correo de resumo diario. Isto desactivarase automaticamente cando se unan %{count} usuarios."
-    bootstrap_mode_disabled: "O modo Bootstrap desactivarase nun prazo de 24 horas."
-    bootstrap_invite_button_title: "Enviar convites"
     themes:
       default_description: "Predeterminado"
     s3:
@@ -262,7 +257,6 @@ gl:
       title: "Marcador"
       clear_bookmarks: "Limpar marcadores"
       help:
-        bookmark: "Prema para engadir aos marcadores a publicación inicial deste tema"
         unbookmark: "Prema para retirar todos os marcadores deste tema"
     bookmarks:
       created: "Fixou como marcador esta publicación. %{name}"
@@ -296,7 +290,6 @@ gl:
       remove_confirmation: "Confirma que quere retirar este borrador?"
       new_topic: "Borrador de novo tema"
       abandon:
-        confirm: "Ten un borrador en curso neste tema. Que lle gustaría facer con iso?"
         yes_value: "Desbotar"
         no_value: "Retomar a edición"
     topic_count_categories:
@@ -465,11 +458,9 @@ gl:
       scores:
         about: "A puntuación calcúlase con base no nivel de fiabilidade do informador, a precisión das súas alertas anteriores e a prioridade do elemento que se recolle."
         score: "Puntuación"
-        date: "Data"
-        type: "Tipo"
+        type: "Motivo"
         status: "Estado"
-        submitted_by: "Enviado por"
-        reviewed_by: "Revisado por"
+        submitted_by: "Recollido por"
       statuses:
         pending:
           title: "Pendente"
@@ -477,14 +468,12 @@ gl:
           title: "Aprobado"
         rejected:
           title: "Rexeitado"
-        ignored:
-          title: "Ignorado"
-        deleted:
-          title: "Eliminado"
         reviewed:
-          title: "(todas revisadas)"
+          title: "Todas revisadas"
         all:
-          title: "(todo)"
+          title: "Todo"
+      context_question:
+        delimiter: "ou"
       types:
         reviewable_flagged_post:
           title: "Publicación sinalada"
@@ -756,6 +745,7 @@ gl:
         make_all_primary_description: "Facer deste o grupo primario para todos os usuarios seleccionados"
         remove_all_primary: "Retirar como primario"
         remove_all_primary_description: "Retirar este grupo como primario"
+        status: "Estado"
         owner: "Propietario"
         primary: "Primario"
         forbidden: "Non ten permiso para ver os membros."
@@ -879,11 +869,6 @@ gl:
       profile: "Perfil"
       mute: "Silenciar"
       edit: "Editar preferencias"
-      download_archive:
-        button_text: "Descargar todo"
-        confirm: "Confirma a descarga das súas publicacións?"
-        success: "Iniciouse a descarga, notificarémoslle cunha mensaxe o remate do proceso."
-        rate_limit_error: "Só se poden descargar as publicacións unha vez por día. Ténteo de novo mañá."
       new_private_message: "Nova mensaxe"
       private_message: "Mensaxe"
       private_messages: "Mensaxes"
@@ -1049,13 +1034,6 @@ gl:
       save_to_change_theme: 'Para actualizar o tema, prema "%{save_text}"'
       home: "Páxina de inicio predeterminada"
       staged: "Transitorio"
-      staff_counters:
-        flags_given: "alertas útiles"
-        flagged_posts: "publicacións sinaladas"
-        deleted_posts: "publicacións eliminadas"
-        suspensions: "suspensións"
-        warnings_received: "advertencias"
-        rejected_posts: "publicacións rexeitadas"
       messages:
         inbox: "Caixa de entrada"
         latest: "Últimos"
@@ -1100,11 +1078,9 @@ gl:
         title: "Códigos de copia de seguranza de dobre paso"
         regenerate: "Rexenerar"
         disable: "Desactivar"
-        enable: "Activar"
-        enable_long: "Activar códigos de copia de seguranza"
         manage:
-          one: "Xestionar os códigos de copia de seguranza. Quédanlle <strong>%{count}</strong> de código de copia de seguranza."
-          other: "Xestionar os códigos de copia de seguranza. Quédanlle <strong>%{count}</strong> de códigos de copia de seguranza."
+          one: "Quédanlle <strong>%{count}</strong> de código de copia de seguranza."
+          other: "Quédanlle <strong>%{count}</strong> de códigos de copia de seguranza."
         copy_to_clipboard: "Copiar ao portapapeis"
         copy_to_clipboard_error: "Produciuse un erro ao copiar os datos ao portapapeis"
         copied_to_clipboard: "Copiado ao portapapeis"
@@ -1531,8 +1507,6 @@ gl:
       enabled: "Este sitio está en modo só-lectura. Continúe navegando pero responder, gustar e outras accións estarán desactivadas polo de agora."
       login_disabled: "Cando o sitio está no modo de só-lectura, desactívase o inicio de sesión."
       logout_disabled: "O peche de sesión desactívase mentres o sitio está en modo de só lectura."
-    too_few_posts_notice_MF: |
-      Comecemos <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">a discusión!</a> E {currentPosts, plural, one {hai <strong>#</strong> publicación} other {hai <strong>#</strong> publicacións}}. Os visitantes necesitan máis para ler e responder – recomendamos que haxa cando menos {requiredPosts, plural, one {<strong>#</strong> publicación} other {<strong>#</strong> publicacións}}. Soamente o equipo pode ver esta mensaxe.
     logs_error_rate_notice:
       reached_hour_MF: |
         <b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/hour} other {# errors/hour}}</a> acadou o límite configurado no sitio de {limit, plural, one {# erro/hora} other {# erros/hora}}.
@@ -1560,13 +1534,11 @@ gl:
       hide_forever: "non grazas"
       intro: "Ola! Todo indica que goza coa discusión pero aínda non solicitou inscrición dunha conta."
     summary:
-      enabled_description: "Está vendo un resumo deste tema: as publicacións máis interesantes determinadas pola comunidade."
       description:
         one: "Hai <b>%{count}</b> resposta."
         other: "Hai <b>%{count}</b> respostas."
       description_time_MF: |
         Hai {replyCount, plural, one {<b>#</b> resposta} other {<b>#</b> respostas}} que supoñen un tempo estimado de lectura de <b>{readingTime, plural, one {# minuto} other {# minutos}}</b>.
-      enable: "Resumir este tema"
       disable: "Amosar todas as publicacións"
     deleted_filter:
       enabled_description: "Este tema contén publicacións eliminadas, que se ocultaron."
@@ -1817,8 +1789,6 @@ gl:
         topic_template_not_modified: "Engada detalles e aspectos específicos ao tema editando o modelo de tema."
       save_edit: "Gardar a edición"
       overwrite_edit: "Sobrescribir a edición"
-      reply_original: "Responder no tema orixinal"
-      reply_here: "Responder aquí"
       reply: "Responder"
       cancel: "Cancelar"
       create_topic: "Crear tema"
@@ -1960,6 +1930,7 @@ gl:
       reaction: "<span>%{username}</span> %{description}"
       reaction_2: "<span>%{username}, %{username2}</span> %{description}"
       votes_released: "%{description} - completado"
+      admin_problems: "Novo consello no seu panel de sitio"
       dismiss_confirmation:
         dismiss: "Desbotar"
         cancel: "Cancelar"
@@ -2161,7 +2132,6 @@ gl:
         top: "Non hai temas destacados."
         educate:
           new: '<p>Aquí aparecen os seus temas novos. De xeito predeterminado, os temas considéranse novos e amosarán un indicador de <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">novo</span> se se crearon nos últimos dous días.</p><p>Vexa as súas <a href="%{userPrefsUrl}">preferencias</a> para cambiar este axuste.</p>'
-          unread: "<p>Os seus temas pendentes aparecen aquí.</p><p>De xeito predeterminado, os temas considéranse pendentes e amosarase o número dos non lidos. <span class=\"badge unread-posts badge-notification\">1</span> se vostede:</p><ul><li>Creou o tema</li><li>Respondeu ao tema</li><li>Leu o tema durante máis de catro minutos</li></ul><p>Ou estabeleceu explicitamente o tema para ser observado ou seguido con \U0001F514 de cada tema.</p><p>Vaia ás súas <a href=\"%{userPrefsUrl}\">preferencias</a> se quere cambiar isto.</p>"
       bottom:
         latest: "Non hai máis temas."
         posted: "Non hai máis temas publicados."
@@ -2219,8 +2189,6 @@ gl:
       options: "Opcións de temas"
       show_links: "amosar as ligazóns a este tema"
       unread_indicator: "Ningún membro leu aínda a última publicación neste tema."
-      jump_reply_up: ir a unha resposta anterior
-      jump_reply_down: ir a unha resposta posterior
       deleted: "Eliminouse o tema"
       slow_mode_update:
         title: "Modo lento"
@@ -2747,7 +2715,6 @@ gl:
       filtered_replies:
         viewing_posts_by: "Vendo %{post_count} publicacións de"
         viewing_subset: "Algunhas respostas están repregadas"
-        viewing_summary: "Vendo un resumo deste tema"
         post_number: "%{username}, publicación #%{post_number}"
         show_all: "Amosar todas"
     category:
@@ -2760,7 +2727,6 @@ gl:
       back: "Volver á categoría"
       general: "Xeral"
       settings: "Configuración"
-      topic_template: "Modelo para o tema"
       tags: "Etiquetas"
       tags_allowed_tags: "Restrinxir estas etiquetas a esta categoría:"
       tags_allowed_tag_groups: "Restrinxir estes grupos de etiquetas a esta categoría:"
@@ -2814,8 +2780,6 @@ gl:
       images: "Imaxes"
       email_in: "Personalizar enderezos de mensaxes de correo entrantes:"
       email_in_allow_strangers: "Aceptar correo de usuarios anónimos sen contas"
-      email_in_disabled: "A publicación de novos temas vía correo está desactivada na configuración do sitio. Para activala, "
-      email_in_disabled_click: 'activar o axuste «correo de entrada».'
       mailinglist_mirror: "A categoría replica unha lista de correo"
       show_subcategory_list: "Amosar a lista de subcategorías por riba dos temas desta categoría."
       read_only_banner: "Texto do báner cando o usuario non poida crear un tema nesta categoría:"
@@ -3011,6 +2975,10 @@ gl:
     filters:
       with_topics: "%{filter} temas"
       with_category: "Temas de %{filter} %{category}"
+      filter:
+        title: "Filtro"
+        button:
+          label: "Filtro"
       latest:
         title: "Últimos"
         title_with_count:
@@ -3089,6 +3057,9 @@ gl:
       close: "Pechar (Esc)"
       content_load_error: '<a href="%url%">O contido</a> non puido cargarse.'
       image_load_error: '<a href="%url%">A imaxe</a> non puido cargarse.'
+    experimental_lightbox:
+      buttons:
+        close: "Pechar (Esc)"
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
       shortcut_key_delimiter_plus: "+"
@@ -3176,7 +3147,6 @@ gl:
         one: "Gañou esta insignia %{count} vez"
         other: "Gañou esta insignia %{count} veces"
       granted_on: "Concedida %{date}"
-      others_count: "Outros con esta insignia (%{count})"
       title: Insignias
       allow_title: "Pode usar esta insignia como título"
       multiple_grant: "Pode gañala múltiples veces"
@@ -3321,13 +3291,11 @@ gl:
       enabled: "O modo seguro está activado; para saír do modo seguro peche esta xanela do navegador"
     image_removed: "(imaxe retirada)"
     pause_notifications:
-      remaining: "queda %{remaining}"
       options:
         half_hour: "30 minutos"
         one_hour: "1 hora"
         two_hours: "2 horas"
         tomorrow: "Ata mañá"
-        custom: "Personalizado"
       set_schedule: "Estabelecer un calendario de notificacións"
     trust_levels:
       names:
@@ -3345,7 +3313,21 @@ gl:
         other: "%{count} novos"
       more: "Máis"
       all_categories: "Todas as categorías"
+      edit_navigation_modal_form:
+        filter_dropdown:
+          all: "Todas"
       sections:
+        custom:
+          save: "Gardar"
+          delete: "Eliminar"
+          links:
+            reset: "Restabelecer cos valores predeterminados"
+            icon:
+              label: "Icona"
+            name:
+              label: "Nome"
+            value:
+              label: "Ligazón"
         about:
           header_link_text: "Verbo de"
         messages:
@@ -3363,7 +3345,8 @@ gl:
         categories:
           header_link_text: "Categorías"
         community:
-          header_link_text: "Comunidade"
+          edit_section:
+            header_dropdown: "Personalizar"
           links:
             about:
               content: "Verbo de"
@@ -3371,8 +3354,8 @@ gl:
               content: "Administración"
             badges:
               content: "Insignias"
-            everything:
-              content: "Todo"
+            topics:
+              content: "Temas"
             faq:
               content: "PMF"
             groups:
@@ -3384,6 +3367,11 @@ gl:
             review:
               content: "Revisar"
     until: "Ata:"
+    form_templates:
+      errors:
+        typeMismatch:
+          default: "Introduza un valor correcto."
+          email: "Introduza un enderezo de correo electrónico correcto."
   admin_js:
     type_to_filter: "escriba para filtrar..."
     admin:
@@ -3661,9 +3649,6 @@ gl:
         notification_event:
           name: "Evento de notificación"
           details: "Cando o usuario recibe unha notificación na fonte."
-        user_badge_event:
-          name: "Evento de concesión de insignias"
-          details: "Cando se recibe unha insignia."
         delivery_status:
           title: "Estado de entrega"
           inactive: "Inactivo"
@@ -3700,7 +3685,6 @@ gl:
         enabled: "Activado?"
         is_enabled: "S"
         not_enabled: "N"
-        change_settings: "Cambiar a configuración"
         change_settings_short: "Configuración"
         howto: "Como podo instalar un complemento?"
         official: "Complemento oficial"
@@ -4016,6 +4000,8 @@ gl:
           love:
             name: "amor"
             description: "Cor do botón gústame."
+          selected:
+            name: "seleccionado"
         robots:
           title: "Sobrescribir o ficheiro robots.txt do sitio:"
           warning: "Isto sobrescribirá definitivamente calquera configuración relativa ao sitio."
@@ -4291,11 +4277,6 @@ gl:
           tag: "Etiqueta"
           silence: "Silenciar"
           link: "Ligazón"
-        action_descriptions:
-          block: "Evitar as publicacións que conteñen estas palabras. O usuario verá unha mensaxe de erro cando tente enviar a publicación."
-          censor: "Permitir publicacións que conteñan estas palabras pero substitúeas por caracteres que oculten as palabras censuradas."
-          require_approval: "As publicacións que conteñan estas palabras requiren a aprobación do equipo antes de ser visíbeis."
-          flag: "Permitir as publicacións que conteñen estas palabras, pero marcalas como inadecuadas para que os moderadores poidan revisalas."
         form:
           placeholder_regexp: "expresión regular"
           replace_label: "Substitución"
@@ -4312,6 +4293,37 @@ gl:
           description: "Escriba texto a continuación para comprobar coincidencias con palabras observadas"
           found_matches: "Coincidencias atopadas:"
           no_matches: "Non se atoparon coincidencias"
+      form_templates:
+        nav_title: "Modelos"
+        list_table:
+          headings:
+            name: "Nome"
+            actions: "Accións"
+        view_template:
+          close: "Pechar"
+          edit: "Editar"
+          delete: "Eliminar"
+        new_template_form:
+          submit: "Gardar"
+          cancel: "Cancelar"
+          preview: "Visualizar"
+        quick_insert_fields:
+          add_new_field: "Engadir"
+          dropdown: "Despregábel"
+        validations_modal:
+          table_headers:
+            key: "Chave"
+            type: "Tipo"
+            description: "Descrición"
+          validations:
+            required:
+              key: "obrigatorio"
+            minimum:
+              key: "mínimo"
+            maximum:
+              key: "máximo"
+            type:
+              key: "tipo"
       impersonate:
         title: "Suplantar"
         help: "Usar esta ferramenta para suplantar unha conta de usuario co obxecto de detectar e corrixir erros. Deberá saír da sesión ao rematar."
@@ -4324,6 +4336,7 @@ gl:
         not_found: "Sentímolo pero o nome do usuario non existe no sistema."
         id_not_found: "Sentímolo pero o usuario non existe no sistema."
         active: "Activado"
+        status: "Estado"
         show_emails: "Amosar correos"
         hide_emails: "Agochar correos"
         nav:
@@ -4404,7 +4417,6 @@ gl:
         staged: "Transitorio?"
         show_admin_profile: "Administración"
         show_public_profile: "Amosar o perfil público"
-        impersonate: "Suplantar"
         action_logs: "Rexistros de accións"
         ip_lookup: "Busca de IP"
         log_out: "Saír da sesión"
@@ -4617,6 +4629,8 @@ gl:
         show_overriden: "Amosar só os cambios"
         locale: "Idioma:"
         more_than_50_results: "Hai máis de 50 resultados. Restrinxa a busca."
+        outdated:
+          dismiss: "Desbotar"
       settings:
         show_overriden: "Amosar só os cambios"
         history: "Ver o historial de cambios"
@@ -4625,7 +4639,6 @@ gl:
       site_settings:
         title: "Axustes"
         no_results: "Non se atoparon resultados."
-        more_than_30_results: "Hai máis de 30 resultados. Restrinxa a busca ou seleccione unha categoría."
         clear_filter: "Borrar"
         add_url: "engadir URL"
         add_host: "engadir servidor"
@@ -4712,7 +4725,8 @@ gl:
         allow_title: Permitir que se use a insignia como un título
         multiple_grant: Pode concederse múltiples veces
         listable: Amosar a insignia na páxina de insignias públicas
-        enabled: Activar a insignia
+        enabled: activado
+        disabled: desactivado
         icon: Icona
         image: Imaxe
         graphic: Gráfico
@@ -4778,7 +4792,6 @@ gl:
         confirm_delete: "Confirma a eliminación deste servidor?"
         title: "Incorporando"
         host: "Servidores permitidos"
-        class_name: "Nome da clase"
         allowed_paths: "Lista de camiños admitidos"
         edit: "editar"
         category: "Publicación na categoría"
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index 291f29c49a2..60c6a28931b 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -200,6 +200,8 @@ he:
       facebook: "שיתוף בפייסבוק"
       email: "שליחה בדוא״ל"
       url: "העתקה ושיתוף של כתובת"
+    word_connector:
+      comma: ", "
     action_codes:
       public_topic: "נושא זה הפך לציבורי ב־%{when}"
       open_topic: "המרה לנושא ב־%{when}"
@@ -211,6 +213,8 @@ he:
       removed_user: "הוסר ע״י %{who} ב־%{when}"
       removed_group: "הוסר ע״י %{who} ב־%{when}"
       autobumped: "הוקפץ אוטומטית ב־%{when}"
+      tags_changed: "התגיות עודכנו ב־%{when}"
+      category_changed: "הקטגוריה עודכנה ב־%{when}"
       autoclosed:
         enabled: "נסגר ב־%{when}"
         disabled: "נפתח ב־%{when}"
@@ -235,19 +239,13 @@ he:
       forwarded: "העברת ההודעה שלעיל"
     topic_admin_menu: "פעולות על נושא"
     skip_to_main_content: "דילוג לתוכן הראשי"
+    skip_user_nav: "דילוג לתוכן הפרופיל"
     emails_are_disabled: "כל הדוא״ל היוצא נוטרל באופן גורף על ידי מנהל אתר. שום הודעת דוא״ל, מכל סוג שהוא, לא תשלח."
     emails_are_disabled_non_staff: "דוא״ל יוצא הושבת עבור משתמשים שאינם מהסגל."
     software_update_prompt:
       message: "עדכנו את האתר הזה, <span>נא לרענן</span> או שיתכן שתופענה כל מיני תופעות בלתי מוסברות."
       dismiss: "התעלמות"
-    bootstrap_mode_enabled:
-      one: "כדי להקל על הקמת האתר החדש שלך, כרגע המערכת במצב אתחול ראשוני. לכל המשתמשים החדשים תוענק דרגת האמון 1 ויישלח אליהם תמצות יומי בדוא״ל. אפשרות זו תכבה אוטומטית לאחר שהצטרף משתמש %{count}."
-      two: "כדי להקל על הקמת האתר החדש שלך, כרגע המערכת במצב אתחול ראשוני. לכל המשתמשים החדשים תוענק דרגת האמון 1 ויישלח אליהם תמצות יומי בדוא״ל. אפשרות זו תכבה אוטומטית לאחר שהצטרפו %{count} משתמשים."
-      many: "כדי להקל על הקמת האתר החדש שלך, כרגע המערכת במצב אתחול ראשוני. לכל המשתמשים החדשים תוענק דרגת האמון 1 ויישלח אליהם תמצות יומי בדוא״ל. אפשרות זו תכבה אוטומטית לאחר שהצטרפו %{count} משתמשים."
-      other: "כדי להקל על הקמת האתר החדש שלך, כרגע המערכת במצב אתחול ראשוני. לכל המשתמשים החדשים תוענק דרגת האמון 1 ויישלח אליהם תמצות יומי בדוא״ל. אפשרות זו תכבה אוטומטית לאחר שהצטרפו %{count} משתמשים."
-    bootstrap_mode_disabled: "מצב Bootstrap יבוטל תוך 24 שעות."
-    bootstrap_invite_button_title: "שליחת הזמנות"
-    bootstrap_wizard_link_title: "סיום אשף ההקמה"
+    bootstrap_mode: "איך מתחילים"
     themes:
       default_description: "ברירת מחדל"
       broken_theme_alert: "יתכן שהאתר שלך לא יתפקד כיוון שבערכת העיצוב / הרכיב יש שגיאות."
@@ -366,11 +364,11 @@ he:
       edit_bookmark: "עריכת סימנייה"
       clear_bookmarks: "מחיקת סימניות"
       help:
-        bookmark: "יש ללחוץ כדי ליצור סימנייה לפוסט הראשון בנושא זה"
-        edit_bookmark: "יש ללחוץ כדי לערוך את הסימניה בנושא זה"
+        bookmark: "יש ללחוץ כדי להוסיף סימנייה לנושא הזה"
+        edit_bookmark: "יש ללחוץ כדי לערוך את הסימנייה לפוסט בנושא זה"
         edit_bookmark_for_topic: "יש ללחוץ כדי לערוך את הסימניה לנושא זה"
         unbookmark: "יש ללחוץ כדי להסיר את כל הסימניות בנושא זה"
-        unbookmark_with_reminder: "יש ללחוץ כדי להסיר את כל הסימניות והתזכורות בנושא זה."
+        unbookmark_with_reminder: "יש ללחוץ כדי להסיר את כל הסימניות והתזכורות בנושא זה"
     bookmarks:
       created: "הוספת את הפוסט הזה לסימניות. %{name}"
       created_generic: "הוספת את זה לסימניות. %{name}"
@@ -414,7 +412,7 @@ he:
       new_topic: "טיוטת נושא חדשה"
       new_private_message: "טיוטת הודעה אישית חדשה"
       abandon:
-        confirm: "יש טיוטה שהתחלת לערוך לנושא הזה. מה לעשות אתה?"
+        confirm: "כבר יש טיוטה שהתחלת לערוך. מה לעשות אתה?"
         yes_value: "להשליך"
         no_value: "לחזור לעריכה"
     topic_count_categories:
@@ -477,6 +475,8 @@ he:
         search: "חיפוש אחר הודעה"
         placeholder: "נא להקליד כאן את כותרת ההודעה, הכתובת או את המזהה"
     review:
+      show_more: "להציג יותר"
+      show_less: "להציג פחות"
       order_by: "סידור לפי"
       date_filter: "פורסם בין"
       in_reply_to: "בתגובה ל"
@@ -611,26 +611,43 @@ he:
       scores:
         about: "ניקוד זה מחושב בהתאם לדרגת האמון של המדווח, הדיוק בסימונים הקודמים ועדיפות הפריט המדווח."
         score: "ניקוד"
-        date: "תאריך"
-        type: "סוג"
+        date: "תאריך דיווח"
+        type: "סיבה"
         status: "מצב"
-        submitted_by: "הוגש על ידי"
+        submitted_by: "דווח ע״י"
         reviewed_by: "נסקר על ידי"
+        reviewed_timestamp: "תאריך סקירה"
       statuses:
         pending:
           title: "בהמתנה"
         approved:
           title: "אושר"
+        approved_flag:
+          title: "הסימון אושר"
+        approved_user:
+          title: "המשתמש אישר"
+        approved_post:
+          title: "הפוסט אושר"
         rejected:
           title: "נדחה"
+        rejected_flag:
+          title: "הסימון נדחה"
+        rejected_user:
+          title: "המשתמש דחה"
+        rejected_post:
+          title: "הפוסט נדחה"
         ignored:
-          title: "זכה להתעלמות"
+          title: "הסימון זכה להתעלמות"
         deleted:
-          title: "נמחק"
+          title: "הנושא או הפוסט נמחקו"
         reviewed:
-          title: "(כל אלו שנסקרו)"
+          title: "כל אלו שנסקרו"
         all:
-          title: "(הכול)"
+          title: "הכול"
+      context_question:
+        is_this_post: "הפוסט הזה %{reviewable_human_score_types}?"
+        delimiter: "או"
+        something_else_wrong: "משהו לא בסדר עם הפוסט הזה?"
       types:
         reviewable_flagged_post:
           title: "פוסט שדוגל"
@@ -643,6 +660,8 @@ he:
           title: "משתמש"
         reviewable_post:
           title: "פוסט"
+        reviewable_chat_message:
+          title: "הודעת צ׳אט מסומנת"
       approval:
         title: "הפוסט זקוק לאישור"
         description: "הפוסט התקבל אך הוא נתון לאישור מפקח בטרם הצגתו. נא להתאזר בסבלנות."
@@ -953,6 +972,7 @@ he:
         make_all_primary_description: "להפוך את הקבוצה הזאת לראשית עבור כל המשתמשים הנבחרים"
         remove_all_primary: "הסרה כראשית"
         remove_all_primary_description: "הסרת הקבוצה הזאת כראשית"
+        status: "מצב"
         owner: "בעלות"
         primary: "ראשית"
         forbidden: "אין לך הרשאות לצפות ברשימת החברים."
@@ -1091,10 +1111,12 @@ he:
       mute: "השתקה"
       edit: "עריכת העדפות"
       download_archive:
-        button_text: "להוריד הכול"
-        confirm: "להוריד את הפוסטים שלך?"
-        success: "ההורדה החלה, תישלח אליך הודעה עם סיום התהליך."
-        rate_limit_error: "ניתן להוריד פוסטים פעם אחת ביום, נא לנסות שוב מחר."
+        title: "ייצוא הנתונים שלך"
+        description: "הורדת ארכיון של פעילות והעדפות החשבון שלך."
+        button_text: "בקשת ארכיון"
+        confirm: "להוריד ארכיון של פעילות והעדפות החשבון שלך?"
+        success: "התחלנו לאסוף את הארכיון שלך, תישלח הודעה כשהתהליך יסתיים."
+        rate_limit_error: "ניתן להוריד ארכיוני חשבון פעם ביום, נא לנסות שוב מחר."
       new_private_message: "הודעה חדשה"
       private_message: "הודעה"
       private_messages: "הודעות"
@@ -1147,6 +1169,7 @@ he:
           warning: "למחוק את הנושאים המומלצים שלך?"
       use_current_timezone: "להשתמש באזור הזמן הנוכחי"
       profile_hidden: "הפרופיל הציבורי של משתמש זה מוסתר"
+      inactive_user: "משתמש זה אינו פעיל עוד."
       expand_profile: "הרחב"
       sr_expand_profile: "הרחבת פרטי הפרופיל"
       collapse_profile: "הקטן"
@@ -1166,7 +1189,7 @@ he:
         perm_denied_expl: "דחית הרשאה לקבלת התראות. יש לאפשר התראות בהגדרות הדפדפן שלך."
         disable: "השבתת התראות"
         enable: "הפעלת התראות"
-        each_browser_note: 'הערה: עליך לשנות הגדרה זו בכל דפדפן שמשמש אותך. כל ההודעות יושבתו אם בחרת להשהות התראות מתפריט המשתמש, ללא קשר להגדרה זו.'
+        each_browser_note: "הערה: עליך לשנות הגדרה זו בכל דפדפן שמשמש אותך. כל ההודעות יושבתו אם בחרת להשהות התראות מתפריט המשתמש, ללא קשר להגדרה זו."
         consent_prompt: "לקבל התראות חיות כשמתקבלות תגובות לפוסטים שלך?"
       dismiss: "דחה"
       dismiss_notifications: "להתעלם מהכול"
@@ -1217,14 +1240,10 @@ he:
       experimental_sidebar:
         enable: "הפעלת סרגל צד"
         options: "אפשרויות"
-        categories_section: "סעיף קטגוריות"
-        categories_section_instruction: "הקטגוריות הנבחרות תוצגנה תחת סעיף הקטגוריות של סרגל הצד."
-        tags_section: "סעיף תגיות"
-        tags_section_instruction: "התגיות הנבחרות תוצגנה תחת סעיף התגיות של סרגל הצד."
         navigation_section: "ניווט"
-        list_destination_instruction: "כשיש תוכן חדש בסרגל הצד…"
-        list_destination_default: "להשתמש בקישור ברירת המחדל ולהציג עיטור לפריטים חדשים"
-        list_destination_unread_new: "קישור לכאלו שלא נקראו/חדשים ולהציג את מניין הפריטים החדשים"
+        navigation_section_instruction: "כאשר לנושא בתפריט הניווט יש פריטים חדשים או שלא נקראו…"
+        link_to_filtered_list_checkbox_description: "קישור לרשימה המסוננת"
+        show_count_new_items_checkbox_description: "הצגת מניין הפריטים החדשים"
       change: "שנה"
       featured_topic: "נושא מומלץ"
       moderator: "ל־%{user} יש תפקיד פיקוח"
@@ -1263,6 +1282,7 @@ he:
       watched_first_post_categories_instructions: "אתם תיודעו לגבי הפוסט הראשון בכל נושא חדש בקטגוריות אלו."
       watched_first_post_tags: "צפייה בפוסט ראשון"
       watched_first_post_tags_instructions: "אתם תיודעו לגבי הפוסט הראשון בכל נושא חדש בתגיות אלו."
+      watched_precedence_over_muted: "להודיע לי על נושאים בקטגוריות או תגיות שאני עוקב אחריהם שגם שייכים לזה שהשתקתי"
       muted_categories: "מושתק"
       muted_categories_instructions: "לא תקבל הודעה בנוגע לנושאים חדשים בקטגוריות אלה, והם לא יופיעו בקטגוריות או בדפים האחרונים."
       muted_categories_instructions_dont_hide: "לא תישלחנה אליך התראות על שום דבר שנוגע לנושאים בקטגוריות האלו."
@@ -1295,12 +1315,36 @@ he:
       home: "דף בית ברירת מחדל"
       staged: "מבוים"
       staff_counters:
-        flags_given: "דגלים שעוזרים"
-        flagged_posts: "פסטים מדוגלים"
-        deleted_posts: "פוסטים שנמחקו"
-        suspensions: "השעיות"
-        warnings_received: "אזהרות"
-        rejected_posts: "פוסטים שנדחו"
+        flags_given:
+          one: 'סימון <span class="%{className}">%{count}</span> מועיל'
+          two: '<span class="%{className}">%{count}</span> סימונים מועילים'
+          many: '<span class="%{className}">%{count}</span> סימונים מועילים'
+          other: '<span class="%{className}">%{count}</span> סימונים מועילים'
+        flagged_posts:
+          one: 'פוסט <span class="%{className}">%{count}</span> מסומן'
+          two: '<span class="%{className}">%{count}</span> פוסטים מסומנים'
+          many: '<span class="%{className}">%{count}</span> פוסטים מסומנים'
+          other: '<span class="%{className}">%{count}</span> פוסטים מסומנים'
+        deleted_posts:
+          one: 'פוסט <span class="%{className}">%{count}</span> נמחק'
+          two: '<span class="%{className}">%{count}</span> פוסטים נמחקו'
+          many: '<span class="%{className}">%{count}</span> פוסטים נמחקו'
+          other: '<span class="%{className}">%{count}</span> פוסטים נמחקו'
+        suspensions:
+          one: 'השעיה <span class="%{className}">%{count}</span>'
+          two: '<span class="%{className}">%{count}</span> השעיות'
+          many: '<span class="%{className}">%{count}</span> השעיות'
+          other: '<span class="%{className}">%{count}</span> השעיות'
+        warnings_received:
+          one: 'אזהרה <span class="%{className}">%{count}</span>'
+          two: '<span class="%{className}">%{count}</span> אזהרות'
+          many: '<span class="%{className}">%{count}</span> אזהרות'
+          other: '<span class="%{className}">%{count}</span> אזהרות'
+        rejected_posts:
+          one: 'פוסט <span class="%{className}">%{count}</span> נדחה'
+          two: '<span class="%{className}">%{count}</span> פוסטים נדחו'
+          many: '<span class="%{className}">%{count}</span> פוסטים נדחו'
+          other: '<span class="%{className}">%{count}</span> פוסטים נדחו'
       messages:
         all: "כל תיבות הדואר הנכנס"
         inbox: "דואר נכנס"
@@ -1413,7 +1457,7 @@ he:
         tags: "תגיות"
         interface: "מנשק"
         apps: "יישומים"
-        sidebar: "סרגל צד"
+        navigation_menu: "תפריט ניווט"
       change_password:
         success: "(דוא״ל נשלח)"
         in_progress: "(דוא״ל בשליחה)"
@@ -1427,13 +1471,14 @@ he:
         title: "קודים כגיבוי לאימות דו־שלבי"
         regenerate: "חדש"
         disable: "בטל"
-        enable: "הפעלה"
-        enable_long: "הפעלת קודים לגיבוי"
+        enable: "יצירת קודים לגיבוי"
+        enable_long: "הוספת קודים לגיבוי"
+        not_enabled: "לא יצרת קודים לגיבוי עדיין."
         manage:
-          one: "ניהול קודים כגיבוי. נותר לרשותך קוד <strong>%{count}</strong> כגיבוי."
-          two: "ניהול קודים כגיבוי. נותרו לרשותך <strong>%{count}</strong> קודים כגיבוי."
-          many: "ניהול קודים כגיבוי. נותרו לרשותך <strong>%{count}</strong> קודים כגיבוי."
-          other: "ניהול קודים כגיבוי. נותרו לרשותך <strong>%{count}</strong> קודים כגיבוי."
+          one: "נותר לרשותך קוד <strong>%{count}</strong> כגיבוי."
+          two: "נותרו לרשותך <strong>%{count}</strong> קודים כגיבוי."
+          many: "נותרו לרשותך <strong>%{count}</strong> קודים כגיבוי."
+          other: "נותרו לרשותך <strong>%{count}</strong> קודים כגיבוי."
         copy_to_clipboard: "העתקה ללוח"
         copy_to_clipboard_error: "שגיאה בהעתקת מידע ללוח"
         copied_to_clipboard: "הועתק ללוח"
@@ -1519,6 +1564,7 @@ he:
         success: "שלחנו דואר אלקטרוני לכתובת הדואר הזו. בבקשה עיקבו אחרי הוראות האישור שם."
         success_via_admin: "שלחנו הודעה לכתובת הדוא״ל הזו. על המשתמש יהיה לעקוב אחר הוראות האישור שבהודעה."
         success_staff: "שלחנו דואר אלקטרוני לכתובת הדואר הזו. אנא עיקבו אחרי הוראות האישור."
+        back_to_preferences: "חזרה להעדפות"
       change_avatar:
         title: "שינוי תמונת הפרופיל"
         gravatar: "<a href='//%{gravatarBaseUrl}%{gravatarLoginUrl}' target='_blank'>%{gravatarName}</a>, מבוסס על"
@@ -1895,8 +1941,7 @@ he:
       pause_notifications: "השהיית התראות"
       remove_status: "הסרת מצב"
     user_tips:
-      primary: "הבנתי!"
-      secondary: "לא להציג יותר את העצות האלה"
+      button: "הבנתי!"
       first_notification:
         title: "ההתראה הראשונה שלך!"
         content: "התראות משמשות לעדכן אותך במה שקורה בקהילה."
@@ -1912,6 +1957,10 @@ he:
       suggested_topics:
         title: "אפשר להמשיך לקרוא!"
         content: "הינה כמה נושאים שלדעתנו יעניין אותך לקרוא בהמשך."
+      admin_guide:
+        title: "ברוך בואך לאתר החדש שלך!"
+        content: "כדאי לקרוא את המדריך למנהלים בטרם בניית האתר והקהילה שלך."
+        button: "קדימה!"
     loading: "טוען..."
     errors:
       prev_page: "בזמן הניסיון לטעון"
@@ -1946,12 +1995,6 @@ he:
       logout_disabled: "היציאה מושבתת בזמן שהאתר במצב של קריאה בלבד."
     staff_writes_only_mode:
       enabled: "אתר זה נמצא במצב סגל בלבד. אפשר להמשיך לשוטט, אך תגובות, לייקים, ופעולות נוספות כרגע מוגבלות לחברי הסגל בלבד."
-    too_few_topics_and_posts_notice_MF: |
-      הבה <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">נתחיל להתדיין!</a> כרגע יש {currentTopics, plural, one {נושא <strong>אחד</strong>} other {<strong>#</strong> נושאים}} ו{currentPosts, plural, one {פוסט <strong>אחד</strong>} other {־<strong>#</strong> פוסטים}}. המבקרים זקוקים ליותר מכך כדי לקרוא ולהיות מעורבים – אנו ממליצים על {requiredTopics, plural, one {נושא<strong>אחד</strong>} other {<strong>#</strong> נושאים}} ו{requiredPosts, plural, one {פוסט <strong>אחד</strong>} other {־<strong>#</strong> פוסטים}} לפחות. רק חברי הסגל יכולים לראות את ההודעה הזאת.
-    too_few_topics_notice_MF: |
-      הבה <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">נתחיל להתדיין!</a> כרגע יש {currentTopics, plural, one {נושא <strong>אחד</strong>} other {<strong>#</strong> נושאים}}. המבקרים זקוקים ליותר מכך כדי לקרוא ולהיות מעורבים – אנו ממליצים על {requiredTopics, plural, one {נושא <strong>אחד</strong>} other {<strong>#</strong> נושאים}} לפחות. רק חברי הסגל יכולים לראות את ההודעה הזאת.
-    too_few_posts_notice_MF: |
-      הבה <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">נתחיל להתדיין!</a> כרגע יש {currentPosts, plural, one {פוסט <strong>אחד</strong>} other {<strong>#</strong> פוסטים}}. המבקרים זקוקים ליותר מכך כדי לקרוא ולהיות מעורבים – אנו ממליצים על {requiredPosts, plural, one {פוסט <strong>אחד</strong>} other {<strong>#</strong> פוסטים}} לפחות. רק חברי הסגל יכולים לראות את ההודעה הזאת.
     logs_error_rate_notice:
       reached_hour_MF: |
         <b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {שגיאה אחת בשעה הגיעה} other {# שגיאות בשעה הגיעו}}</a> למגבלת האתר שהיא {limit, plural, one {שגיאה אחת בשעה} other {# שגיאות בשעה}}.
@@ -1983,19 +2026,35 @@ he:
       hidden_for_session: "סבבה, השאלה תופיע מחר. תמיד ניתן להשתמש ב‚כניסה’ גם כדי ליצור חשבון."
       intro: "שלום! נראה שאתם נהנים מהדיון, אבל לא נרשמתם לחשבון עדיין."
       value_prop: "נמאס לך לעיין באותם הפוסטים? יצירת חשבון תאפשר לך לחזור בדיוק לנקודה בה עזבת בפעם האחרונה. חשבון מאפשר לך גם לקבל התראות על תגובות חדשות, לשמור סימניות ולהשתמש בלייקים כדי להודות לאחרים. כולנו יכולים לפעול ביחד כדי שהקהילה הזאת תהיה מצוינת. :heart:"
+    offline_indicator:
+      no_internet: "אין חיבור לאינטרנט."
+      refresh_page: "רענון עמוד"
     summary:
-      enabled_description: "אתם צופים בסיכום נושא זה: הפוסטים המעניינים ביותר כפי שסומנו על ידי הקהילה."
+      in_progress: "הנושא מסוכם באמצעות בינה מלאכותית…"
+      summarized_on: "סוכם עם בינה מלאכותית ב־%{date}"
+      model_used: "בינה מלאכותית בשימוש: %{model}"
+      outdated: "הסיכום מיושן"
+      outdated_posts:
+        one: "(פוסט חסר)"
+        two: "(%{count} פוסטים חסרים)"
+        many: "(%{count} פוסטים חסרים)"
+        other: "(%{count} פוסטים חסרים)"
+      enabled_description: "בחרת לצפות בתגובות המובילות של הנושא הזה: הפוסטים המעניינים ביותר בהתאם להחלטות הקהילה."
       description:
         one: "יש תגובה <b>%{count}</b>."
         two: "יש <b>%{count}</b> תגובות."
         many: "יש <b>%{count}</b> תגובות."
         other: "יש <b>%{count}</b> תגובות."
+      buttons:
+        hide: "הסתרת סיכום"
+        generate: "לסכם עם בינה מלאכותית"
+        regenerate: "לסכם מחדש"
       description_time_MF: |
         יש {replyCount, plural, one {תגובה <b>אחת</b>} other {<b>#</b> תגובות}} עם זמן קריאה משוערך של <b>{readingTime, plural, one {דקה} other {# דקות}}</b>.
-      enable: "סכם נושא זה"
+      enable: "הצגת תגובות מובילות"
       disable: "הצג את כל הפוסטים"
-      short_label: "סיכום"
-      short_title: "הצגת סיכום לנושא זה: הפוסטים המעניינים ביותר כפי שסומנו על ידי הקהילה"
+      short_label: "תגובות מובילות"
+      short_title: "להציג את התגובות המובילות של הנושא הזה: הפוסטים המעניינים ביותר בהתאם להחלטות הקהילה"
     deleted_filter:
       enabled_description: "נושא זה מכיל פוסטים שנמחקו ולכן אינם מוצגים."
       disabled_description: "פוסטים שנמחקו בנושא זה מוצגים כעת."
@@ -2322,8 +2381,6 @@ he:
         topic_template_not_modified: "נא להוסיף פרטים ותיאורים מדויקים לנושא שלך על ידי עריכת תבנית הנושא."
       save_edit: "שמירת עריכה"
       overwrite_edit: "שכתוב על עריכה"
-      reply_original: "תגובה לנושא המקורי"
-      reply_here: "תגובה כאן"
       reply: "תגובה"
       cancel: "ביטול"
       create_topic: "יצירת נושא"
@@ -2425,6 +2482,7 @@ he:
       image_alt_text:
         aria_label: כיתוב חלופי לתמונה
       delete_image_button: מחיקת תמונ
+      toggle_image_grid: החלפת מצב רשת תמונות
     notifications:
       tooltip:
         regular:
@@ -2506,6 +2564,7 @@ he:
       reaction_2: "<span>%{username}, %{username2}</span> %{description}"
       votes_released: "%{description} - הסתיים"
       new_features: "יכולות חדשות זמינות!"
+      admin_problems: "עצה חדשה בלוח המחוונים של האתר שלך"
       dismiss_confirmation:
         body:
           default:
@@ -2801,6 +2860,11 @@ he:
         dismiss_tooltip: "ביטול הצגת פוסטים חדשים או מעקב אחר נושאים"
         also_dismiss_topics: "הפסיקו לעקוב אחרי נושאים אלו כדי שהם לא יופיעו שוב בתור לא-נקראו"
         dismiss_new: "ביטול חדשים"
+        dismiss_new_modal:
+          title: "התעלמות מחדשים"
+          topics: "התעלמות מנושאים חדשים"
+          posts: "התעלמות מפוסטים חדשים"
+          untrack: "הפסקת המעקב אחר הנושאים האלו כדי שלא יופיעו עוד ברשימת החדשים שלי"
         dismiss_new_with_selected:
           one: "להתעלם מחדש (%{count})"
           two: "להתעלם מחדשים (%{count})"
@@ -2846,9 +2910,11 @@ he:
         bookmarks: "אין לך עדיין סימניות לנושאים."
         category: "אין נושאים בקטגוריה %{category}."
         top: "אין נושאים מובילים."
+        filter: "אין נושאים."
         educate:
           new: '<p>הנושאים החדשים שלך יופיעו כאן. כבררת מחדל, נושאים נחשבים חדשים ויופיעו עם המחוון <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span> אם הם נוצרו ביומיים האחרונים. </p><p>ניתן לבקר בעמוד ה<a href="%{userPrefsUrl}">העדפות</a> שלך כדי לשנות זאת.</p>'
-          unread: "<p>הנושאים שלא קראת יופיעו כאן.</p><p>כברירת מחדל, נושאים ייחשבו שטרם קראת אותם ויוצג עליהם מונה <span class=\"badge unread-posts badge-notification\">1</span> בספירה של הפריטים שלא נקראו אם: </p> <ul><li>יצרת את הנושא</li><li>הגבת לנושא</li><li>קראת את הנושא במשך יותר מ־4 דקות</li></ul><p>או אם בחרת לעקוב או לצפות בנושא דרך \U0001F514 המופיע בכל נושא.</p><p>ניתן לבקר בעמוד ה<a href=\"%{userPrefsUrl}\">העדפות</a> שלך כדי לשנות זאת.</p>"
+          unread: "<p>הנושאים שלא קראת יופיעו כאן.</p><p>כברירת מחדל, נושאים ייחשבו שטרם קראת אותם ויוצג עליהם מונה <span class=\"badge unread-posts badge-notification\">1</span> בספירה של הפריטים שלא נקראו אם: </p> <ul><li>יצרת את הנושא</li><li>הגבת לנושא</li><li>קראת את הנושא במשך יותר מ־5 דקות</li></ul><p>או אם בחרת לעקוב או לצפות בנושא דרך \U0001F514 המופיע בכל נושא.</p><p>ניתן לבקר בעמוד ה<a href=\"%{userPrefsUrl}\">העדפות</a> שלך כדי לשנות זאת.</p>"
+          new_new: "<p>הנושאים החדשים שלך יופיעו כאן לצד הנושאים שטרם קראת. כברירת מחדל, נושאים נחשבים חדשים ויופיע לידם מחוון <span class=\"badge new-topic badge-notification\" style=\"vertical-align:middle;line-height:inherit;\"></span> אם נוצרו ביומיים האחרונים. ליד נושאים שלא נקראו יופיע הסימון <span class=\"badge unread-posts badge-notification\">1</span> אם: יצרת את הנושא, הגבת לנושא, קראת את הנושא במשך למעלה מ־5 דקות או אם ביקשת מפורשות לעקוב או להשגיח אחר הנושא באמצעות \U0001F514 בכל נושא ונושא.</p><p>נא לגשת אל ה<a href=\"%{userPrefsUrl}\">העדפות</a> כדי לשנות זאת.</p>"
       bottom:
         latest: "אין עוד נושאים אחרונים."
         posted: "אין עוד נושאים שפורסמו."
@@ -2860,6 +2926,7 @@ he:
         tag: "אין יותר נושאי %{tag}."
         top: "אין עוד נושאים מובילים."
         bookmarks: "אין עוד סימניות לנושאים."
+        filter: "אין נושאים נוספים."
     topic:
       filter_to:
         one: "פוסט אחד בנושא"
@@ -2867,6 +2934,7 @@ he:
         many: "%{count} פוסטים בנושא"
         other: "%{count} פוסטים בנושא"
       create: "נושא חדש"
+      create_disabled_category: "אסור לך ליצור נושאים בקטגוריה הזאת"
       create_long: "יצירת נושא חדש"
       open_draft: "פתח טיוטה"
       private_message: "תחילת הודעה"
@@ -2921,6 +2989,7 @@ he:
       read_more_in_category: "רוצה לקרוא עוד? אפשר לעיין בנושאים שתחת %{categoryLink} או <a href='%{latestLink}'>להציג את הנושאים האחרונים</a>."
       read_more: "מעניין אותך לקרוא עוד? אפשר <a href='%{categoryLink}'>לעיין בכל הקטגוריות</a> או <a href='%{latestLink}'>לצפות בנושאים העדכניים ביותר</a>."
       unread_indicator: "אף אחד מהחברים לא קרא את הפוסט האחרון של הנושא הזה עדיין."
+      participant_groups: "קבוצות משתתפים"
       read_more_MF: |
         { HAS_UNREAD_AND_NEW, select,
           true {
@@ -2969,8 +3038,8 @@ he:
       browse_all_categories_latest_or_top: "<a href='%{basePath}/categories'>עיון בכל הקטגוריות</a>, <a href='%{basePath}/latest'>הצגת הנושאים העדכניים ביותר</a> או צפייה במובילים:"
       browse_all_tags_or_latest: "<a href='%{basePath}/tags'>עיון בכל התגיות</a> או <a href='%{basePath}/latest'>הצגת הנושאים העדכניים ביותר</a>."
       suggest_create_topic: מעניין אותך <a href>לפתוח בדיון חדש?</a>
-      jump_reply_up: קפיצה לתגובה קודמת
-      jump_reply_down: קפיצה לתגובה מאוחרת
+      jump_reply: "קפיצה למיקום המקורי של הפוסט"
+      jump_reply_aria: "קפיצה לפוסט של ‎@%{username} במיקומו המקורי"
       deleted: "הנושא הזה נמחק"
       slow_mode_update:
         title: "מצב אטי"
@@ -3258,6 +3327,7 @@ he:
           two: "בבקשה בחרו את הנושא אליו תרצה להעביר את <b>%{count}</b> הפוסטים."
           many: "בבקשה בחרו את הנושא אליו תרצה להעביר את <b>%{count}</b> הפוסטים."
           other: "בבקשה בחרו את הנושא אליו תרצה להעביר את <b>%{count}</b> הפוסטים."
+        chronological_order: "שמירה על סדר כרונולוגי לאחר המיזוג"
       move_to_new_message:
         title: "העבר להודעה חדשה"
         action: "העבר להודעה חדשה"
@@ -3355,6 +3425,7 @@ he:
       ignored: "תוכן בהתעלמות"
       wiki_last_edited_on: "הוויקי נערך לאחרונה ב־%{dateTime}"
       last_edited_on: "הפוסט נערך לאחרונה ב־%{dateTime}"
+      edit_history: "היסטוריית העריכה של הפוסט"
       reply_as_new_topic: "תגובה כנושא מקושר"
       reply_as_new_private_message: "תגובה כהודעה חדשה לאותם נמענים"
       continue_discussion: "ממשיך את הדיון מ %{postLink}:"
@@ -3366,10 +3437,10 @@ he:
       sr_collapse_replies: "צמצום תשובות מוטמעות"
       sr_date: "תאריך פרסום"
       sr_expand_replies:
-        one: "לפוסט הזה יש תגובה %{count}. יורחב בלחיצה"
-        two: "לפוסט הזה יש %{count} תגובות. יורחב בלחיצה"
-        many: "לפוסט הזה יש %{count} תגובות. יורחב בלחיצה"
-        other: "לפוסט הזה יש %{count} תגובות. יורחב בלחיצה"
+        one: "לפוסט הזה יש תגובה אחת"
+        two: "לפוסט הזה יש %{count} תגובות"
+        many: "לפוסט הזה יש %{count} תגובות"
+        other: "לפוסט הזה יש %{count} תגובות"
       expand_collapse: "הרחב/צמצם"
       sr_below_embedded_posts_description: "תגובות לפוסט מס׳ %{post_number}"
       sr_embedded_reply_description: "תגובה מאת ‎@%{username} לפוסט %{post_number}"
@@ -3563,6 +3634,8 @@ he:
           last: "מהדורה אחרונה"
           hide: "הסתרת שינויים"
           show: "הצגת שינויים"
+          destroy: "מחיקת מהדורות"
+          destroy_confirm: "למחוק את כל המהדורות של הפוסט הזה? זו פעולה בלתי הפיכה."
           revert: "החזרה לגרסה %{revision}"
           edit_wiki: "עריכת וויקי"
           edit_post: "עריכת פוסט"
@@ -3596,6 +3669,7 @@ he:
         updated: "עודכן"
         name: "שם"
         name_placeholder: "עבור מה הסימנייה?"
+        name_input_label: "שם סימנייה"
         set_reminder: "להזכיר לי"
         options: "אפשרויות"
         actions:
@@ -3617,7 +3691,7 @@ he:
       filtered_replies:
         viewing_posts_by: "מוצגים %{post_count} פוסטים מאת"
         viewing_subset: "חלק מהתגובות מצומצמות"
-        viewing_summary: "מוצג סיכום של הפוסט הזה"
+        viewing_summary: "צפייה בתגובות המובילות של הנושא הזה"
         post_number: "%{username}, פוסט מס׳ %{post_number}"
         show_all: "להציג הכול"
       share:
@@ -3634,7 +3708,7 @@ he:
       back: "חזרה לקטגוריה"
       general: "כללי"
       settings: "הגדרות"
-      topic_template: "תבנית נושא"
+      topic_template: "תבנית"
       tags: "תגיות"
       tags_allowed_tags: "הגבלת התגיות האלו לקטגוריה הזו:"
       tags_allowed_tag_groups: "הגבלת קבוצות תגיות אלו לקטגוריה זו:"
@@ -3693,8 +3767,7 @@ he:
       email_in: "כתובת דואר נכנס מותאמת אישית:"
       email_in_tooltip: "אפשר להפריד בין כתובות דוא״ל עם התו |."
       email_in_allow_strangers: "קבלת דוא״ל ממשתמשים אלמוניים ללא חשבונות במערכת הפורומים"
-      email_in_disabled: "האפשרות לשליחת נושאים חדשים בדוא״ל הושבתה בהגדרות האתר. כדי להפעיל פרסום של נושאים חדשים דרך דוא״ל,"
-      email_in_disabled_click: 'הפעלת ההגדרה „דוא״ל נכנס”.'
+      email_in_disabled: "פרסום נושאים חדשים בדוא״ל מושבת. כדי לאפשר פרסום נושאים חדשים בדוא״ל, יש להפעיל את ההגדרה <a href='%{setting_url}'>‚דוא״ל נכנס’</a>."
       mailinglist_mirror: "קטגוריה שמשקפת רשימת תפוצה"
       show_subcategory_list: "הצגת רשימת קטגוריות משנה מעל נושאים בקטגוריה זו."
       read_only_banner: "טקסט כרזה כאשר משתמש לא יכול ליצור נושא בקטגוריה הזו:"
@@ -3721,6 +3794,7 @@ he:
       default_slow_mode: 'להפעיל „מצב אטי” לנושאים חדשים בקטגוריה הזאת.'
       parent: "קטגורית אם"
       num_auto_bump_daily: "מספר הנושאים הפתוחים להקפצה מדי יום:"
+      auto_bump_cooldown_days: "כמות הימים המזערית להקפצת אותו הנושא שוב:"
       navigate_to_first_post_after_read: "ניווט לפוסט הראשוני לאחר שהנושאים נקראו"
       notifications:
         title: "שינוי רמת ההתראות לקטגוריה הזו"
@@ -3806,7 +3880,9 @@ he:
         inappropriate: "לא ראוי"
         spam: "זהו ספאם"
       custom_placeholder_notify_user: "היו ממוקדים, חיובים ותמיד אדיבים."
+      notify_user_textarea_label: "הודעה למשתמש"
       custom_placeholder_notify_moderators: "נשמח לשמוע בדיוק מה מטריד אותך ולספק קישורים מתאימים ודוגמאות היכן שניתן."
+      notify_moderators_textarea_label: "הודעה למפקחים"
       custom_message:
         at_least:
           one: "הכניסו לפחות תו אחד"
@@ -3920,6 +3996,10 @@ he:
     filters:
       with_topics: "%{filter} נושאים"
       with_category: "%{filter} %{category} נושאים"
+      filter:
+        title: "סינון"
+        button:
+          label: "סינון"
       latest:
         title: "העדכני ביותר"
         title_with_count:
@@ -4002,7 +4082,6 @@ he:
         this_week: "שבוע"
         today: "היום"
     browser_update: 'אתרע מזלך וכי <a href="https://www.discourse.org/faq/#browser">דפדפנך אינו נתמך עוד</a>. נא <a href="https://browsehappy.com">לעבור לדפדפן נתמך</a> כדי לצפות בתוכן עשיר, להיכנס ולהגיב.'
-    safari_13_warning: אתר זה יסיר בקרוב את התמיכה בגרסאות 13 ומטה של Safari ושל iOS. גרסה מופשאת לקריאה בלבד תישאר זמינה עבורם. (<a href="https://meta.discourse.org/t/224747">מידע נוסף</a>)
     permission_types:
       full: "יצירה / תגובה / צפייה"
       create_post: "תגובה / צפייה"
@@ -4017,6 +4096,20 @@ he:
       close: "סגירה (Esc)"
       content_load_error: 'אין אפשרות לטעון את ה<a href="%url%">תוכן הזה</a>.'
       image_load_error: 'אין אפשרות לטעון את ה<a href="%url%">תמונה הזו</a>.'
+    experimental_lightbox:
+      image_load_error: "לא ניתן לטעון את התמונה."
+      screen_reader_image_title: "תמונה %{current} מתוך %{total}: %{title}"
+      buttons:
+        next: "הבא (מקשים ימינה או למטה)"
+        previous: "הקודם (מקשים שמאלה או למעלה)"
+        close: "סגירה (Esc)"
+        download: "הורדת תמונה"
+        newtab: "פתיחת תמונה בלשונית חדשה"
+        zoom: "התקרבות/התרחקות מהתמונה (מקש Z)"
+        rotate: "סיבוב תמונה (מקש R)"
+        fullscreen: "החלפת מצב מסך מלא של דפדפן (מקש M)"
+        carousel: "הצגת כל התמונות בסחרחרה (מקש A)"
+        retry: "לנסות לטעון את התמונה שוב"
     cannot_render_video: לא ניתן לעבד את הסרטון הזה מכיוון שהדפדפן שלך אינו תומך במקודד.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
@@ -4064,6 +4157,7 @@ he:
         title: "חיבור"
         return: "%{shortcut} חזרה לכתיבת פוסט"
         fullscreen: "%{shortcut} כתיבת פוסט במסך מלא"
+        insert_current_time: "%{shortcut} הוספת השעה הנוכחית"
       bookmarks:
         title: "ניהול סימניות"
         enter: "%{shortcut} שמירה וסגירה"
@@ -4111,7 +4205,11 @@ he:
         many: "עיטור זה הוענק %{count} פעמים"
         other: "עיטור זה הוענק %{count} פעמים"
       granted_on: "הוענק לפני %{date}"
-      others_count: "אחרים עם עיטור זה (%{count})"
+      others_count:
+        one: "הוענק לאחרים פעם אחת"
+        two: "הוענק לאחרים פעמיים"
+        many: "הוענק לאחרים %{count} פעמים"
+        other: "הוענק לאחרים %{count} פעם"
       title: עיטורים
       allow_title: "ניתן להשתמש בעיטור זה ככותרת"
       multiple_grant: "ניתן לזכות בו מספר פעמים"
@@ -4130,6 +4228,7 @@ he:
         two: "%{count} הוענקו"
         many: "%{count} הוענקו"
         other: "%{count} הוענקו"
+      awarded: הוענק
       select_badge_for_title: נא לבחור עיטור לשימוש בכותרת שלך
       none: "(ללא)"
       successfully_granted: "העיטור %{badge} הוענק בהצלחה למשתמש %{username}"
@@ -4318,13 +4417,11 @@ he:
     pause_notifications:
       title: "השהיית התראות למשך…"
       label: "השהיית התראות"
-      remaining: "%{remaining} נותרו"
       options:
         half_hour: "חצי שעה"
         one_hour: "שעה"
         two_hours: "שעתיים"
         tomorrow: "עד מחר"
-        custom: "מותאם"
       set_schedule: "הגדרת תזמון התראות"
     trust_levels:
       names:
@@ -4377,7 +4474,61 @@ he:
       more: "עוד"
       all_categories: "כל הקטגוריות"
       all_tags: "כל התגיות"
+      categories_form_modal:
+        title: "עריכת ניווט בקטגוריות"
+        subtitle:
+          text: "ואנו נציג לך את הקטגוריות הנפוצות ביותר באתר אוטומטית"
+        filter_placeholder: "סינון קטגוריות"
+        no_categories: "אין קטגוריות שעונות למונח שצוין."
+      tags_form_modal:
+        title: "עריכת ניווט בתגיות"
+        filter_placeholder: "סינון תגיות"
+        no_tags: "אין תגיות שתואמות לביטוי שסופק."
+        subtitle:
+          text: "ואנו נציג לך את התגיות המובילות באתר אוטומטית"
+      edit_navigation_modal_form:
+        deselect_button_text: "ביטול בחירה בהכול"
+        reset_to_defaults: "איפוס לברירות מחדל"
+        filter_dropdown:
+          all: "הכול"
+          selected: "נבחרים"
+          unselected: "לא נבחרו"
       sections:
+        custom:
+          add: "הוספת מקטע משלך"
+          edit: "עריכת מקטע משלך"
+          save: "שמירה"
+          delete: "מחיקה"
+          delete_confirm: "למחוק את המקטע הזה?"
+          reset_confirm: "לאפס את המקטע הזה לברירת המחדל?"
+          public: "להפוך את הסעיף הזה לציבורי וגלוי לכולם"
+          always_public: "התוכן בסעיף הזה הוא תמיד ציבורי"
+          more_menu: "תפריט נוסף"
+          links:
+            add: "הוספת קישור נוסף"
+            delete: "מחיקת קישור"
+            reset: "איפוס לברירת מחדל"
+            icon:
+              label: "סמל"
+              validation:
+                blank: "הסמל לא יכול להיות ריק"
+                maximum: "הסמל חייב להיות קצר מ־%{count} תווים"
+            name:
+              label: "שם"
+              validation:
+                blank: "השם לא יכול להיות ריק"
+                maximum: "השם חייב להיות קצר מ־%{count} תווים"
+            value:
+              label: "קישור"
+              validation:
+                blank: "הקישור לא יכול להיות ריק"
+                maximum: "הקישור חייב להיות קצר מ־%{count} תווים"
+                invalid: "התבנית שגויה"
+          title:
+            label: "כותרת מקטע"
+            validation:
+              blank: "הכותרת לא יכולה להיות ריקה"
+              maximum: "הכותרת חייבת להיות קצרה מ־%{count} תווים"
         about:
           header_link_text: "אודות"
         messages:
@@ -4392,28 +4543,21 @@ he:
             unread_with_count: "לא נקראה (%{count})"
             archive: "ארכיון"
         tags:
-          links:
-            add_tags:
-              content: "הוספת תגיות"
-              title: "לא הוספת תגיות כלל. יש ללחוץ כדי להתחיל."
           none: "עדיין לא הוספת תגיות."
           click_to_get_started: "ללחוץ כאן כדי להתחיל."
           header_link_text: "תגיות"
           header_action_title: "לערוך את תגיות סרגל הצד שלך"
           configure_defaults: "הגדרת ברירות מחדל"
         categories:
-          links:
-            add_categories:
-              content: "הוספת קטגוריות"
-              title: "לא הוספת קטגוריות כלל. יש ללחוץ כדי להתחיל."
           none: "עדיין לא הוספת קטגוריות."
           click_to_get_started: "ללחוץ כאן כדי להתחיל."
           header_link_text: "קטגוריות"
           header_action_title: "לערוך את קטגוריות סרגל הצד שלך"
           configure_defaults: "הגדרת ברירות מחדל"
         community:
-          header_link_text: "קהילה"
-          header_action_title: "יצירת נושא"
+          edit_section:
+            sidebar: "עריכת הסעיף הזה"
+            header_dropdown: "התאמה אישית"
           links:
             about:
               content: "על אודות"
@@ -4424,8 +4568,8 @@ he:
             badges:
               content: "עיטורים"
               title: "כל העיטורים שאפשר לקבל"
-            everything:
-              content: "הכול"
+            topics:
+              content: "נושאים"
               title: "כל הנושאים"
             faq:
               content: "שאלות נפוצות"
@@ -4438,6 +4582,7 @@ he:
               title: "רשימת כל המשתמשים"
             my_posts:
               content: "הפוסטים שלי"
+              content_drafts: "הטיוטות שלי"
               title: "הפעילות האחרונה שלי בנושא"
               title_drafts: "הטיוטות שלא פרסמתי"
               draft_count:
@@ -4449,11 +4594,43 @@ he:
               content: "סקירה"
               title: "פוסטים מסומנים ופריטים אחרים בתור"
               pending_count: "%{count} ממתינים"
+        global_section: "סעיף כללי, גלוי לכולם"
+      panels:
+        forum:
+          label: פורום
     welcome_topic_banner:
       title: "כאן ניתן ליצור את נושא קבלת הפנים שלך"
       description: "נושא קבלת הפנים שלך הוא הדבר הראשון שחברים חדשים יקראו. אפשר לחשוב על זה כמו על „נאום מעלית” או „הצהרת כוונות”. כדאי לתאר למי מיועדת הקהילה הזאת, מה אפשר לצפות למצוא כאן ומה מומלץ לעשות בהתחלה."
       button_title: "להתחיל לערוך"
     until: "עד:"
+    char_counter:
+      exceeded: "חרגת ממספר התווים המרבי המותר."
+    form_template_chooser:
+      select_template: "בחירת תבניות טופס"
+    form_templates:
+      errors:
+        valueMissing:
+          default: "נא למלא את השדה הזה."
+          text: "נא למלא את השדה הזה."
+          select-one: "נא לבחור פריט מהרשימה."
+          select-multiple: "נא לבחור לפחות פריט אחד מהרשימה."
+          checkbox: "נא לסמן תיבה זו כדי להמשיך."
+        typeMismatch:
+          default: "נא למלא ערך תקין."
+          color: "נא לבחור צבע."
+          date: "נא למלא תאריך."
+          email: "נא למלא כתובת דוא״ל תקינה."
+          number: "נא למלא מספר."
+          password: "נא למלא סיסמה תקינה."
+          tel: "נא למלא מספר טלפון תקני."
+          text: "נא למלא ערך טקסט."
+          url: "נא למלא כתובת תקינה."
+        tooShort: "הקלט חייב להיות באורך של %{minLength} תווים ומעלה."
+        tooLong: "הקלט חייב להיות פחות מ־%{maxLength} תווים."
+        rangeOverflow: "הקלט חייב להיות פחות מ־%{max}."
+        rangeUnderflow: "הקלט חייב להיות יותר מ־%{min}."
+        patternMismatch: "נא לתאם מול התבנית המבוקשת."
+        badInput: "נא למלא קלט תקין."
   admin_js:
     type_to_filter: "הקלידו לסינון..."
     admin:
@@ -4616,12 +4793,18 @@ he:
         about: "עריכת חברות הקבוצה שלך והשמות כאן"
         group_members: "חברי הקבוצה"
         delete: "מחיקה"
-        delete_confirm: "למחוק את הקבוצה הזאת?"
+        delete_confirm: "למחוק את %{group}?"
+        delete_details:
+          one: "משתמש %{count} יאבד את הגישה לקבוצה הזאת"
+          two: "%{count} משתמשים יאבדו את הגישה לקבוצה הזאת"
+          many: "%{count} משתמשים יאבדו את הגישה לקבוצה הזאת"
+          other: "%{count} משתמשים יאבדו את הגישה לקבוצה הזאת"
         delete_with_messages_confirm:
-          one: "מחיקת הקבוצה הזאת תוביל להתייתמותה של הודעה %{count}, חברי הקבוצה לא יוכלו לגשת אליה עוד."
-          two: "מחיקת הקבוצה הזאת תוביל להתייתמותן של %{count} הודעות, חברי הקבוצה לא יוכלו לגשת אליהן עוד."
-          many: "מחיקת הקבוצה הזאת תוביל להתייתמותן של %{count} הודעות, חברי הקבוצה לא יוכלו לגשת אליהן עוד."
-          other: "מחיקת הקבוצה הזאת תוביל להתייתמותן של %{count} הודעות, חברי הקבוצה לא יוכלו לגשת אליהן עוד."
+          one: "תיחסם הגישה להודעה %{count} לחברי הקבוצה"
+          two: "תיחסם הגישה ל־%{count} הודעות לחברי הקבוצה"
+          many: "תיחסם הגישה ל־%{count} הודעות לחברי הקבוצה"
+          other: "תיחסם הגישה ל־%{count} הודעות לחברי הקבוצה"
+        delete_warning: "לא ניתן לשחזר קבוצות שנמחקו"
         delete_failed: "לא ניתן להסיר קבוצה זו. אם זו קבוצה אוטומטית, היא בלתי ניתנת למחיקה."
         delete_automatic_group: זו קבוצה אוטומטית ולא ניתן למחוק אותה.
         delete_owner_confirm: "להסיר את הרשאות הניהול של ‚%{username}’?"
@@ -4687,10 +4870,16 @@ he:
             topics:
               read: קריאת נושא או פוסט מסוים בתוכו. יש גם תמיכה ב־RSS.
               write: יצירת נושא חדש או פרסום לאחד קיים.
-              update: עדכון נושא. החלפת הכותרת, הקטגוריה, התגיות וכו׳.
+              update: עדכון נושא. אפשר לערוך את הכותרת, הקטגוריה, התגיות, המצב, סוג שימוש, קישור מובילים וכו׳.
+              delete: מחיקת נושא.
               read_lists: לקרוא רשימת נושאים כמו מובילים, חדשים, אחרונים וכו׳. יש גם תמיכה ב־RSS.
+              status: "עדכון מצב של נושא. מצב: סגור, ארכיון, גלוי, נעוץ. זמין: אמת, שקר. יש לציין כאן category_id (מזהה קטגוריה) ובמטען של הבקשה כדי לאפשר שינויי מצב בלבד על נושאים בקטגוריה הזאת."
             posts:
               edit: לערוך כל פוסט שהוא או אחד מסוים.
+              delete: מחיקת פוסט.
+              list: הצגת הפוסטים העדכניים ביותר ופוסטים פרטיים. יש תמיכה גם ב־RSS.
+            tags:
+              list: הצגת תגיות.
             categories:
               list: קבלת רשימת קטגוריות.
               show: קבלת קטגוריה יחידה לפי מזהה.
@@ -4704,6 +4893,7 @@ he:
               update: עדכון פרטי פרופיל המשתמש.
               log_out: להוציא משתמש מכל ההפעלות שלו.
               anonymize: הפיכת חשבונות משתמשים לאלמוניים.
+              suspend: השעיית חשבונות משתמשים.
               delete: מחיקת חשבונות משתמשים.
               list: קבלת רשימת משתמשים.
             user_status:
@@ -4711,6 +4901,8 @@ he:
               update: עדכון מצב המשתמש.
             email:
               receive_emails: לשלב את התחום הזה עם מקבל הודעות הדוא״ל כדי לעבד הודעות דוא״ל נכנסות.
+            invites:
+              create: לשלוח הזמנות בדוא״ל או לייצר קישורי הצטרפות.
             badges:
               create: יצירת עיטור חדש.
               show: קבלת מידע על עיטור.
@@ -4719,6 +4911,12 @@ he:
               list_user_badges: הצגת עיטורי המשתמש.
               assign_badge_to_user: הקצאת עיטור למשתמש.
               revoke_badge_from_user: שלילת עיטור ממשתמש.
+            groups:
+              manage_groups: להציג, להוסיף ולהסיר חברים מהקבוצה.
+              administer_groups: להציג, לפרט, ליצור, לעדכן ולמחוק קבוצות.
+            search:
+              show: לחפש באמצעות נקודת הקצה ‎`/search.json?q=term`.
+              query: לחפש באמצעות נקודת הקצה `‎/search/query?term=term`.
             wordpress:
               publishing: הכרחי לטובת יכולות הפרסום של תוסף ה־Discourse של WordPress (חובה).
               commenting: הכרחי לטובת יכולות התגובות של תוסף ה־Discourse של WordPress.
@@ -4785,8 +4983,8 @@ he:
           name: "אירוע שקודם על ידי משתמש"
           details: "כאשר משתמש מקודם מדרגת אמון אחת לאחרת."
         user_badge_event:
-          name: "אירוע הענקת עיטור"
-          details: "כמשתמש מקבל עיטור."
+          name: "אירוע עיטור"
+          details: "מתי עיטור מוענק או נשלל."
         group_user_event:
           name: "אירוע משתמש בקבוצה"
           details: "כאשר משתמש מתווסף או נגרע מקבוצה."
@@ -4833,7 +5031,7 @@ he:
         enabled: "מאופשר?"
         is_enabled: "Y"
         not_enabled: "N"
-        change_settings: "שינוי הגדרות"
+        change_settings: "הגדרות תוסף"
         change_settings_short: "הגדרות"
         howto: "איך אני מתקין/ה הרחבות?"
         official: "תוסף רשמי"
@@ -5089,6 +5287,9 @@ he:
           embedded_scss:
             text: "CSS משולב"
             title: "הכניסו CSS מותאם לשליחה עם הגרסה המשולבת של ההערות"
+          embedded_header:
+            text: "כותרת מוטבעת"
+            title: "נא למלא HTML כדי להציג מעל הגרסה המוטבעת של הערות"
           color_definitions:
             text: "ערכות צבע"
             title: "למלא ערכות צבע מותאמות אישית (משתמשים מתקדמים בלבד)"
@@ -5167,6 +5368,12 @@ he:
           love:
             name: "חבב"
             description: "צבע הרקע של הכפתור \"חבב\""
+          selected:
+            name: "נבחרים"
+            description: "צבע הרקע של רכיבים כגון פריטי רשימות כשהם נבחרים/פעילים."
+          hover:
+            name: "ריחוף"
+            description: "צבע הרקע של רכיבים כגון פריטי רשימות כשעוברים מעליהם עם העכבר או שהמיקוד עובר אליהם מהמקלדת."
         robots:
           title: "דריסת קובץ ה־robots.txt של האתר שלך:"
           warning: "הגדרה זו תדרוס הגדרות אתר כלשהן שקשורות לכך."
@@ -5297,6 +5504,7 @@ he:
           no_previous: "אין ערך קודם."
           deleted: "אין ערך חדש. הרשומה נמחקה."
           actions:
+            permanently_delete_post_revisions: "מחיקת המהדורות של הפוסט לצמיתות"
             delete_user: "מחיקת משתמש"
             change_trust_level: "שנוי דרגת אמון"
             change_username: "שינוי שם משתמש/ת"
@@ -5330,6 +5538,7 @@ he:
             revoke_moderation: "שלילת פיקוח"
             backup_create: "יצירת גיבוי"
             deleted_tag: "תגית נמחקה"
+            update_directory_columns: "עדכון עמודות תיקייה"
             deleted_unused_tags: "נמחקו תגיות שאינן בשימוש"
             renamed_tag: "תגית שונתה"
             revoke_email: "שלילת דוא״ל"
@@ -5388,6 +5597,10 @@ he:
             delete_group: "הסרת קבוצה"
             watched_word_create: "הוספת מילה בהשגחה"
             watched_word_destroy: "מחיקת מילה בהשגחה"
+            create_public_sidebar_section: "יצירת סעיף ציבורי בסרגל הצד"
+            update_public_sidebar_section: "עדכון סעיף ציבורי בסרגל הצד"
+            destroy_public_sidebar_section: "השמדת סעיף ציבורי בסרגל הצד"
+            reset_bounce_score: "איפוס ניקוד-החזר"
         screened_emails:
           title: "הודעות דואר מסוננות"
           description: "כשמישהו מנסה ליצור חשבון חדש, כתובות הדואר האלקטרוני הבאות ייבדקו וההרשמה תחסם או שיבוצו פעולות אחרות."
@@ -5453,14 +5666,14 @@ he:
           silence: "השתקה"
           link: "קישור"
         action_descriptions:
-          block: "למנוע פרסום של פוסטים שמכילים את המילים הללו. בפני המשתמש תופיע הודעת שגיאה בעת ניסיון פרסום הפוסט."
+          block: "תופיע הודעת שגיאה בעת ניסיון ליצור פוסט שמכיל את המילים האלו."
           censor: "להרשות פוסטים שמכילים מילים אלו, אבל להחליף אותן בתווים שמסתירים את המילים המצונזרות."
-          require_approval: "פוסטים שמכילים מילים אלו יצטרכו לקבל אישור מהסגל לפני שניתן יהיה לצפות בהם."
-          flag: "להרשות פוסטים שמכילים מילים אלו, אבל לסמן אותם כבלתי הולמים כדי שמפקחים יוכלו לסקור אותם."
-          replace: "להחליף מילים בפוסטים במילים אחרות"
-          tag: "לתייג אוטומטית נושאים לפי הפוסט הראשון בהם"
-          silence: "פוסטים ראשונים של משתמשים המכילים מילים אלה ידרשו אישור של הסגל לפני הצגתם והמשתמש יושתק אוטומטית."
-          link: "החלפת מילים בפוסטים בקישורים"
+          require_approval: "לדרוש את אישור הסגל לפוסטים שמכילים את המילים האלה לפני שיהיו גלויים לשאר."
+          flag: "לאפשר פוסטים שמכילים את המילים האלו אך לסמן אותם כבלתי הולמים כדי שיעברו סקירה על ידי המפקחים."
+          replace: "להחליף מילים בפוסטים במילים אחרות."
+          tag: "לתייג נושאים אוטומטית אם הפוסט הראשון מכיל מילה מסוימת."
+          silence: "להשתיק חשבונות חדשים אם הפוסט הראשון שלהם מכיל אחת מהמילים האלו. הפוסט יוסתר אוטומטית עד לאישור הסגל."
+          link: "החלפת מילים בפוסטים בקישורים."
         form:
           label: "יש מילה או ביטוי"
           placeholder: "נא למלא מילה או ביטוי (* הוא תו כללי)"
@@ -5483,6 +5696,88 @@ he:
           description: "נא להקליד טקסט להלן כדי לבדוק התאמות מול מילים שבמעקב"
           found_matches: "נמצאו התאמות:"
           no_matches: "לא נמצאו התאמות"
+      form_templates:
+        nav_title: "תבניות"
+        title: "תבניות טפסים"
+        help: "יצירת מבנה תבנית בו ניתן להשתמש ליצירת נושאים, פוסטים והודעות חדשים."
+        new_template: "תבנית חדשה"
+        list_table:
+          headings:
+            name: "שם"
+            active_categories: "קטגוריות פעילות"
+            actions: "פעולות"
+          actions:
+            view: "הצגת תבנית"
+            edit: "עריכת תבנית"
+            delete: "מחיקת תבנית"
+        view_template:
+          close: "סגירה"
+          edit: "עריכה"
+          delete: "מחיקה"
+          toggle_preview: "החלפת מצב תצוגה מקדימה"
+        new_template_form:
+          submit: "שמירה"
+          cancel: "ביטול"
+          name:
+            label: "שם התבנית"
+            placeholder: "נא למלא שם לתבנית…"
+          template:
+            label: "תבנית"
+            placeholder: "יצירת תבנית YAML כאן…"
+          preview: "תצוגה מקדימה"
+        delete_confirm: "למחוק את התבנית הזאת?"
+        quick_insert_fields:
+          add_new_field: "הוספה"
+          checkbox: "תיבת סימון"
+          input: "תשובה קצרה"
+          textarea: "תשובה ארוכה"
+          dropdown: "נפתח"
+          upload: "העלאת קובץ"
+          multiselect: "מגוון אפשרויות"
+        validations_modal:
+          button_title: "אמצעי וידוא"
+          modal_title: "אפשרויות וידוא"
+          table_headers:
+            key: "מפתח"
+            type: "סוג"
+            description: "תיאור"
+          validations:
+            required:
+              key: "נדרש"
+              type: "בוליאני"
+              description: "נדרשת השלמת השדה כדי להגיש את הטופס."
+            minimum:
+              key: "מזערי"
+              type: "מספר שלם וחיובי"
+              description: "לשדות טקסט, מציין את כמות התווים המזערית המותרת."
+            maximum:
+              key: "מרבי"
+              type: "מספר שלם וחיובי"
+              description: "לשדות טקסט, מציין את כמות התווים המרבית המותרת."
+            pattern:
+              key: "תבנית"
+              type: "מחרוזת ביטוי רגולרי"
+              description: "בשדות טקסט, ביטוי רגולרי המציין את הקלט המותר."
+            type:
+              key: "סוג"
+              type: "מחרוזת"
+              description: "לשדות קלט, אפשר לציין את סוג הקלט הצפוי (text|email|date|number|url|tel|color)"
+        preview_modal:
+          title: "תצוגה מקדימה של תבנית"
+        field_placeholders:
+          validations: "נא למלא כאן אמצעי וידוא"
+          label: "נא למלא כאן תווית"
+          placeholder: "נא למלא כאן ממלא מקום"
+          none_label: "נא לבחור פריט"
+          choices:
+            first: "אפשרות 1"
+            second: "אפשרות 2"
+            third: "אפשרות 3"
+        edit_category:
+          toggle_freeform: "תבנית טופס מושבתת"
+          toggle_form_template: "תבנית טופס פעילה"
+          select_template: "בחירת תבניות טופס"
+          select_template_help: "הוספה/עריכה של תבניות טופס"
       impersonate:
         title: "התחזות"
         help: "ניתן להשתמש בכלי הזה כדי להתחזות לחשבון משתמש למטרות טיפול בשגיאות. יהיה עליך לצאת לאחר הסיום."
@@ -5495,6 +5790,7 @@ he:
         not_found: "סליחה, שם המשתמש הזה אינו קיים במערכת שלנו."
         id_not_found: "מצטערים, זהות המשתמש/ת אינה קיימת במערכת שלנו."
         active: "מופעל"
+        status: "מצב"
         show_emails: "הצגת כתובות דוא״ל"
         hide_emails: "הסתרת כתובות דוא״ל"
         nav:
@@ -5583,7 +5879,6 @@ he:
         show_admin_profile: "מנהל ראשי"
         manage_user: "ניהול משתמש"
         show_public_profile: "הצג פרופיל פומבי"
-        impersonate: "התחזה"
         action_logs: "יומני פעולות"
         ip_lookup: "חיפוש IP"
         log_out: "יציאה"
@@ -5829,8 +6124,16 @@ he:
         go_back: "חזרה לחיפוש"
         recommended: "אנו ממליצים לערוך את הטקסט הבא כדי שיתאים לצרכים שלך:"
         show_overriden: "להציג רק את אלו שנדרסו"
+        show_outdated: "להציג רק מיושן/שגוי"
         locale: "שפה:"
         more_than_50_results: "יש למעלה מ־50 תוצאות. נא למקד את החיפוש שלך."
+        interpolation_keys: "מפתחות השילוב הזמינים:"
+        outdated:
+          title: "התרגום אינו עדכני"
+          description: "תרגום ברירת המחדל למפתח הזה נערך מאז שהעקיפה הזאת נוצרה. נא לבדוק להלן שהתרגום שלך תואם לשינויים שנערכו לכוונה המקורית."
+          old_default: "ברירת מחדל ישנה"
+          new_default: "ברירת מחדל חדשה"
+          dismiss: "התעלמות"
       settings:
         show_overriden: "להציג רק את אלו שנדרסו"
         history: "הצגת היסטוריית שינויים"
@@ -5843,7 +6146,11 @@ he:
             label: "הוספת אמוג׳י"
         title: "הגדרות"
         no_results: "לא נמצאו תוצאות."
-        more_than_30_results: "יש למעלה מ־50 תוצאות. נא למקד את החיפוש שלך."
+        more_site_setting_results:
+          one: "יש למעלה מתוצאה אחת. נא למקד את החיפוש שלך."
+          two: "יש למעלה משתי תוצאות. נא למקד את החיפוש שלך."
+          many: "יש למעלה מ־%{count} תוצאות. נא למקד את החיפוש שלך."
+          other: "יש למעלה מ־%{count} תוצאות. נא למקד את החיפוש שלך."
         clear_filter: "ניקוי"
         add_url: "הוספת כתובת URL"
         add_host: "הוספת שרת"
@@ -5930,7 +6237,8 @@ he:
         allow_title: לאפשר להשתמש בעיטור ככותרת
         multiple_grant: יכולים להינתן מספר פעמים
         listable: הצגת עיטורים בעמוד העיטורים הפומבי
-        enabled: הפעלת עיטור
+        enabled: פעיל
+        disabled: מושבת
         icon: סמליל
         image: תמונה
         graphic: גרפיקה
@@ -6002,10 +6310,14 @@ he:
       embedding:
         get_started: "כדי להטמיע את Discourse באתר אחר, יש להתחיל בהוספת השרת שלו."
         confirm_delete: "האם ברצונכם להסיר את הhost הזה? "
-        sample: "יש להדביק את קוד ה־HTML הבא באתר שלך כדי ליצור ולהטמיע נושאים של Discourse. יש להחליף את <b>REPLACE_ME</b> בכתובת היחסית של העמוד בו תתבצע ההטמעה."
+        sample: |
+          <p>יש להדביק את קוד ה־HTML לאתר שלך כדי ליצור ולהטמיע נושאים מ־Discourse. את <b>EMBED_URL</b> רצוי להחליף לשם הקנוני של העמוד אליו מבוצעת ההטמעה.</p>
+
+          p>כדי להתאים את הסגנון יש להסיר את ההערה ולהחליף את <b>CLASS_NAME</b> במחלקת ה־CSS שמוגדרת ב־<i>CSS המוטמע</i> של ערכת העיצוב שלך.</p>
+
+          <p>יש להחליף את <b>DISCOURSE_USERNAME</b> בשם המשתמש ב־Discourse של מי שאמור ליצור את הנושא. Discourse יחפש את המשתמש אוטומטית לפי המאפיין <code>content</code> (תוכן) של התגיות <code>&lt;meta&gt;</code> עם המאפיין <code>name</code> (שם) שמוגדר ל־<code>discourse-username</code> או ל־<code>author</code> (מחבר). המשתנה <code>discourseUserName</code> לא בשימוש עוד והוא יוסר ב־Discourse 3.2.</p>
         title: "שילוב (embedding)"
         host: "שרתים מורשים"
-        class_name: "שם מחלקה"
         allowed_paths: "רשימת נתיבים מותרים"
         edit: "עריכה"
         category: "פרסם לקטגוריה"
diff --git a/config/locales/client.hr.yml b/config/locales/client.hr.yml
index ed878089d7c..d02dfe7d579 100644
--- a/config/locales/client.hr.yml
+++ b/config/locales/client.hr.yml
@@ -212,13 +212,6 @@ hr:
     software_update_prompt:
       message: "Ažurirali smo ovu stranicu, <span>osvježite</span>ili ćete možda doživjeti neočekivano ponašanje."
       dismiss: "Skloni"
-    bootstrap_mode_enabled:
-      one: "Kako bi vam olakšali pokretanje novog foruma, nalazite se u bootstrap načinu rada. Svim novim korisnicima biti će dodijeljena razina povjerenja 1 i omogućeni dnevni e-mailovi sa sažecima. Bootstrap će se automatski isključiti čim se učlani minimalno %{count} korisnika."
-      few: "Kako bi vam olakšali pokretanje vašeg novog foruma, u bootstrap modu ste. Svim novim korisnicima biti će dodijeljena razina povjerenja 1 i omogućeni dnevni e-mailovi sa sažecima. Ovo će automatski biti isključeno kada se učlani minimalno %{count} korisnika."
-      other: "Kako bi vam olakšali pokretanje novog foruma, nalazite se u bootstrap načinu rada. Svim novim korisnicima biti će dodijeljena razina povjerenja 1 i omogućeni dnevni e-mailovi sa sažecima. Bootstrap će se automatski isključiti čim se učlani minimalno %{count} korisnika."
-    bootstrap_mode_disabled: "Bootstrap mod biti će isključen u sljedećih 24 sata."
-    bootstrap_invite_button_title: "Pošalji pozivnice"
-    bootstrap_wizard_link_title: "Završi postavljanje"
     themes:
       default_description: "Zadano"
       broken_theme_alert: "Vaša stranica možda neće raditi jer tema/komponenta ima pogreške."
@@ -334,11 +327,9 @@ hr:
       edit_bookmark: "Uredi oznaku"
       clear_bookmarks: "Očisti oznake"
       help:
-        bookmark: "Kliknite za označavanje prvog posta u ovoj temi"
-        edit_bookmark: "Kliknite za uređivanje oznake na ovu temu"
         edit_bookmark_for_topic: "Kliknite za uređivanje oznake na ovu temu"
         unbookmark: "Klikni za uklananje svih oznaka u ovoj temi"
-        unbookmark_with_reminder: "Kliknite da biste uklonili sve oznake i podsjetnike u ovoj temi."
+        unbookmark_with_reminder: "Kliknite da biste uklonili sve oznake i podsjetnike u ovoj temi"
     bookmarks:
       created: "Označili ste ovu objavu %{name}"
       created_generic: "Označili ste ovo. %{name}"
@@ -382,7 +373,6 @@ hr:
       new_topic: "Nova skica teme"
       new_private_message: "Nova skica osobne poruke"
       abandon:
-        confirm: "Imate nacrt u tijeku za ovu temu. Što biste željeli učiniti s njom?"
         yes_value: "Odbaci"
         no_value: "Nastavi uređivati"
     topic_count_categories:
@@ -567,11 +557,9 @@ hr:
       scores:
         about: "Ocjena se računa na bazi razine povjerenja izvjestitelja, točnosti njihovih prethodnih zastavica i prioriteta stavke o kojoj se izvješćuje."
         score: "Ocjena"
-        date: "Datum"
-        type: "Tip"
+        type: "Razlog"
         status: "Statust"
-        submitted_by: "Podnio zahtjev"
-        reviewed_by: "Pregledao"
+        submitted_by: "Prijavio"
       statuses:
         pending:
           title: "Na čekanju"
@@ -579,14 +567,12 @@ hr:
           title: "Odobrio"
         rejected:
           title: "Odbio"
-        ignored:
-          title: "Ignorirao"
-        deleted:
-          title: "Izbrisao"
         reviewed:
-          title: "(svi pregledani)"
+          title: "Svi pregledani"
         all:
-          title: "(sve)"
+          title: "Sve"
+      context_question:
+        delimiter: "ili"
       types:
         reviewable_flagged_post:
           title: "Post označen zastavicom"
@@ -901,6 +887,7 @@ hr:
         make_all_primary_description: "Učinite primarnom grupom za sve odabrane korisnike"
         remove_all_primary: "Ukloni kao primarnu"
         remove_all_primary_description: "Ukloni ovu grupu kao primarnu"
+        status: "Statust"
         owner: "Vlasnik"
         primary: "Primarna"
         forbidden: "Nemate dozvolu vidjeti članove."
@@ -1033,11 +1020,6 @@ hr:
       profile: "Profil"
       mute: "Utišaj"
       edit: "Uredi postavke"
-      download_archive:
-        button_text: "Preuzmi sve"
-        confirm: "Želite li preuzeti objave?"
-        success: "Preuzimanje započeto, biti ćete obaviješteni porukom kada proces bude završen."
-        rate_limit_error: "Objave mogu biti preuzimane jednom na dan, molimo pokušajte sutra."
       new_private_message: "Nova poruka"
       private_message: "Poruka"
       private_messages: "Poruke"
@@ -1109,7 +1091,7 @@ hr:
         perm_denied_expl: "Odbili ste dopuštenje za obavijesti. Dopusti obavijesti putem postavki preglednika."
         disable: "Isključi obavijesti"
         enable: "Uključi obavijesti"
-        each_browser_note: 'Napomena: ovu postavku morate promijeniti na svakom pregledniku koji koristite. Sve će obavijesti biti onemogućene ako pauzirate obavijesti iz korisničkog izbornika, bez obzira na ovu postavku.'
+        each_browser_note: "Napomena: ovu postavku morate promijeniti na svakom pregledniku koji koristite. Sve će obavijesti biti onemogućene ako pauzirate obavijesti iz korisničkog izbornika, bez obzira na ovu postavku."
         consent_prompt: "Želite li obavijesti (uživo) kada ljudi odgovaraju na vaše postove?"
       dismiss: "Skloni"
       dismiss_notifications: "Skloni sve"
@@ -1160,14 +1142,7 @@ hr:
       experimental_sidebar:
         enable: "Omogući bočnu traku"
         options: "Mogućnosti"
-        categories_section: "Odjeljak s kategorijama"
-        categories_section_instruction: "Odabrane kategorije bit će prikazane u odjeljku kategorija na bočnoj traci."
-        tags_section: "Odjeljak s oznakama"
-        tags_section_instruction: "Odabrane oznake bit će prikazane u odjeljku oznaka na bočnoj traci."
         navigation_section: "Navigacija"
-        list_destination_instruction: "Kada se pojavi novi sadržaj na bočnoj traci..."
-        list_destination_default: "koristite zadanu vezu i prikažite značku za nove stavke"
-        list_destination_unread_new: "poveži na nepročitano/novo i prikaži broj novih stavki"
       change: "promijeni"
       featured_topic: "Istaknuta tema"
       moderator: "%{user} je moderator"
@@ -1237,13 +1212,6 @@ hr:
       save_to_change_theme: 'Tema će biti ažurirana nakon što kliknete "%{save_text}"'
       home: "Zadana početna stranica"
       staged: "Priređen"
-      staff_counters:
-        flags_given: "pomočne oznake"
-        flagged_posts: "označene objave"
-        deleted_posts: "obrisane objave"
-        suspensions: "suspenzije"
-        warnings_received: "upozorenja"
-        rejected_posts: "odbijenih postova"
       messages:
         all: "sve pristigle pošte"
         inbox: "Primljeno"
@@ -1346,7 +1314,6 @@ hr:
         tags: "Oznake"
         interface: "Sučelje"
         apps: "Aplikacije"
-        sidebar: "Bočna traka"
       change_password:
         success: "(email je poslan)"
         in_progress: "(email se šalje)"
@@ -1360,12 +1327,10 @@ hr:
         title: "Dva faktorski rezervni kodovi"
         regenerate: "Regeneriraj"
         disable: "Onemogući"
-        enable: "Omogući"
-        enable_long: "Omogući rezervu sigurnosni kodova"
         manage:
-          one: "Upravljanje rezervnim kopijama kodova. Preostale su vam <strong>%{count}</strong> sigurnosne kopija."
-          few: "Upravljanje rezervnim kopijama kodova. Preostale su vam <strong>%{count}</strong> sigurnosne kopija."
-          other: "Upravljanje rezervnim kopijama kodova. Preostale su vam <strong>%{count}</strong> sigurnosne kopija."
+          one: "Preostalo vam je <strong>%{count}</strong> rezervni kodova."
+          few: "Preostalo vam je <strong>%{count}</strong> rezervni kodova."
+          other: "Preostalo vam je <strong>%{count}</strong> rezervni kodova."
         copy_to_clipboard: "Kopirati u međuspremnik"
         copy_to_clipboard_error: "Greška pri kopiranju podataka u međuspremnik"
         copied_to_clipboard: "Kopirano u međuspremnik"
@@ -1814,8 +1779,7 @@ hr:
       pause_notifications: "Pauziraj obavijesti"
       remove_status: "Ukloni status"
     user_tips:
-      primary: "Kužim!"
-      secondary: "ne pokazuj mi ove savjete"
+      button: "Kužim!"
       first_notification:
         title: "Vaša prva obavijest!"
         content: "Obavijesti se koriste kako biste bili u tijeku s onim što se događa u zajednici."
@@ -1865,36 +1829,6 @@ hr:
       logout_disabled: "Odjava je onemogućena dok je forum u načinu rada samo za čitanje."
     staff_writes_only_mode:
       enabled: "Ova stranica je u načinu rada samo za osoblje. Nastavite s pregledavanjem, ali odgovaranje, sviđanje i druge radnje ograničeni su samo na članove osoblja."
-    too_few_topics_and_posts_notice_MF: |
-      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">raspravu!</a> Tamo { currentTopics, plural,
-          one {je <strong>#</strong> tema}
-          few {su <strong>#</strong> tema}
-        other {su <strong>#</strong> tema}
-      } i { currentPosts, plural,
-          one {<strong>#</strong> post}
-          few {<strong>#</strong> postovi}
-        other {<strong>#</strong> postovi}
-      }. Posjetitelji trebaju više za čitanje i odgovaranje – preporučujemo barem { requiredTopics, plural,
-          one {<strong>#</strong> tema}
-          few {<strong>#</strong> tema}
-        other {<strong>#</strong> tema}
-      } i { requiredPosts, plural,
-          one {<strong>#</strong> post}
-          few {<strong>#</strong> postova}
-        other {<strong>#</strong> postova}
-      }. Samo osoblje može vidjeti ovu poruku.
-    too_few_topics_notice_MF: |
-      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">raspravu!</a> Tamo { currentTopics, plural,
-          one {je <strong>#</strong> tema}
-          few {su <strong>#</strong> tema}
-        other {su <strong>#</strong> tema}
-      }. Posjetitelji trebaju više za čitanje i odgovaranje – preporučujemo barem { requiredTopics, plural,
-          one {<strong>#</strong> tema}
-          few {<strong>#</strong> tema}
-        other {<strong>#</strong> tema}
-      }. Samo osoblje može vidjeti ovu poruku.
-    too_few_posts_notice_MF: |
-      Hajde da <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">započnemo diskusiju!</a> Tamo {currentPosts, plural, one {je <strong>#</strong> tema} few {su <strong>#</strong> teme} other {su <strong>#</strong> teme}}. Posjetiteljima je potrebno više čitati i odgovoriti na — preporučujemo barem {requiredPosts, plural, one {<strong>#</strong> tema} few {<strong>#</strong> teme} other {<strong>#</strong> teme}}. Samo osoblje može vidjeti ovu poruku.
     logs_error_rate_notice:
       reached_hour_MF: |
         <b>{relativeAge}</b> — <a href='{url}' target='_blank'>{rate, plural, one {# Greška/sat} few {# greške/sat} other {# greške/sat}}</a> dosegao ograničenje za postavljanje stranice {limit, plural, one {# Greška/sat} few {# greške/sat} other {# greške/sat}}.
@@ -1926,17 +1860,13 @@ hr:
       intro: "Zdravo! Čini se da uživate u raspravi, ali još se niste prijavili za račun."
       value_prop: "Umorni ste od listanja istih postova? Kada kreirate račun uvijek ćete se vraćati tamo gdje ste stali. S računom također možete primati obavijesti o novim odgovorima, spremati oznake i koristiti lajkove da zahvalite drugima. Svi možemo raditi zajedno kako bismo ovu zajednicu učinili sjajnom. :heart:"
     summary:
-      enabled_description: "Gledate pregled ove teme: najzanimljivije članke odabire zajednica."
       description:
         one: "Postoji <b>%{count}</b> odgovor."
         few: "Postoji <b>%{count}</b> odgovora."
         other: "Ima <b>%{count}</b> odgovora."
       description_time_MF: |
         Tamo {replyCount, plural, one {je <b>#</b> odgovor} few {su <b>#</b> odgovora} other {su <b>#</b> odgovora}} s predviđenim vremenom čitanja <b>{readingTime, plural, one {# minuta} few {# minuta} other {# minuta}}</b>.
-      enable: "Sažmi ovu temu"
       disable: "Prikaži sve članke"
-      short_label: "Rezimirati"
-      short_title: "Prikaži sažetak ove teme: najzanimljiviji postovi prema odluci zajednice"
     deleted_filter:
       enabled_description: "Ova tema sadrži prisane članke, koji su skriveni."
       disabled_description: "Obrisani članci u temi su prikazani."
@@ -2249,8 +2179,6 @@ hr:
         topic_template_not_modified: "Uređivanjem predloška teme dodajte detalje i pojedinosti svojoj temi."
       save_edit: "Spremi izmjenu"
       overwrite_edit: "Prebriši Uređivanje"
-      reply_original: "Odgovori na originalnu temu"
-      reply_here: "Odgovori ovdje"
       reply: "Odgovori"
       cancel: "Odustani"
       create_topic: "Pokreni temu"
@@ -2424,6 +2352,7 @@ hr:
       reaction_2: "<span>%{username}, %{username2}</span> %{description}"
       votes_released: "%{description} - dovršeno"
       new_features: "Dostupne su nove značajke!"
+      admin_problems: "Novi savjeti na vašoj nadzornoj ploči"
       dismiss_confirmation:
         body:
           default:
@@ -2747,7 +2676,7 @@ hr:
         top: "Nema glavnih tema."
         educate:
           new: '<p>Vaše nove teme će se pojaviti ovdje. Prema zadanim postavkama teme se smatraju novim i pokazat će indikator <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span> ako su stvorene u posljednja 2 dana.</p><p>Posjetite <a href="%{userPrefsUrl}">preferenci</a> da biste to promijenili.</p>'
-          unread: "<p>Vaše nepročitane teme pojavljuju se ovdje.</p><p>Prema zadanim postavkama, teme se smatraju nepročitanima i prikazat će se nepročitane brojke <span class=\"badge unread-posts badge-notification\">1</span> ako:</p><ul><li>Izrađeno je temu</li><li>Odgovoreno na temu</li><li>Pročitajte temu više od 4 minute</li></ul><p>Ili ako ste izričito postavili temu na Praćeni ili promatrani putem \U0001F514 u svakoj temi.</p><p>Posjetite <a href=\"%{userPrefsUrl}\">preferenci</a> da biste to promijenili.</p>"
+          unread: "<p>Vaše nepročitane teme pojavljuju se ovdje.</p><p>Prema zadanim postavkama, teme se smatraju nepročitanima i prikazat će se nepročitane brojke <span class=\"badge unread-posts badge-notification\">1</span> ako:</p><ul><li>Izrađeno je temu</li><li>Odgovoreno na temu</li><li>Pročitajte temu više od 5 minute</li></ul><p>Ili ako ste izričito postavili temu na Praćeni ili promatrani putem \U0001F514 u svakoj temi.</p><p>Posjetite <a href=\"%{userPrefsUrl}\">preferenci</a> da biste to promijenili.</p>"
       bottom:
         latest: "Nema više najnovijih tema."
         posted: "Nema više objavljenih članaka."
@@ -2859,8 +2788,6 @@ hr:
       browse_all_categories_latest_or_top: "<a href='%{basePath}/categories'>Pregledajte sve kategorije</a>, <a href='%{basePath}/latest'>pogledajte najnovije teme</a> ili pogledajte vrh:"
       browse_all_tags_or_latest: "<a href='%{basePath}/tags'>Pregledajte sve oznake</a> ili <a href='%{basePath}/latest'>pogledajte najnovije teme</a>."
       suggest_create_topic: Spremni za <a href>započeti novi razgovor?</a>
-      jump_reply_up: skoči na raniji odgovor
-      jump_reply_down: skoči na kasniji odgovor
       deleted: "Tema je obrisana."
       slow_mode_update:
         title: "Usporeni način rada"
@@ -3240,10 +3167,6 @@ hr:
       collapse: "sakrij"
       sr_collapse_replies: "Sažmi ugrađene odgovore"
       sr_date: "Datum objave"
-      sr_expand_replies:
-        one: "Ovaj post ima %{count} odgovora. Kliknite za proširenje"
-        few: "Ovaj post ima %{count} odgovora. Kliknite za proširenje"
-        other: "Ovaj post ima %{count} odgovora. Kliknite za proširenje"
       expand_collapse: "proširi/sruši"
       sr_below_embedded_posts_description: "objavi #%{post_number} odgovora"
       sr_embedded_reply_description: "odgovorite sa @%{username} na objavu broj%{post_number}"
@@ -3473,7 +3396,6 @@ hr:
       filtered_replies:
         viewing_posts_by: "Pregledavanje %{post_count} postova od"
         viewing_subset: "Neki odgovori su sažeti"
-        viewing_summary: "Pregled sažetka ove teme"
         post_number: "%{username}, post #%{post_number}"
         show_all: "Prikaži sve"
       share:
@@ -3490,7 +3412,6 @@ hr:
       back: "Natrag u kategoriju"
       general: "Općenito"
       settings: "Postavke"
-      topic_template: "Predložak teme"
       tags: "Oznake"
       tags_allowed_tags: "Ograniči ove oznake na ovu kategoriju:"
       tags_allowed_tag_groups: "Ograniči ove grupe oznaka na ovu kategoriju:"
@@ -3549,8 +3470,6 @@ hr:
       email_in: "Prilagođena adresa dolaznog e-maila."
       email_in_tooltip: "Možete odvojiti na više adresa e-pošte s | znakom."
       email_in_allow_strangers: "Prihvati emailove anonimnih korisnika bez računa"
-      email_in_disabled: "Objavljivanje novih tema preko emaila je onemogućeno postavkama stranice. Da to omogućite objavljivanje tema preko emaila"
-      email_in_disabled_click: 'omogućite "pošalji email u" opciju.'
       mailinglist_mirror: "Kategorija odražava mailing listu"
       show_subcategory_list: "Prikaži popis potkategorija iznad tema u ovoj kategoriji."
       read_only_banner: "Tekst bannera kada korisnik ne može stvoriti temu u ovoj kategoriji:"
@@ -3662,7 +3581,9 @@ hr:
         inappropriate: "Neprikladno je."
         spam: "Nepoželjno je."
       custom_placeholder_notify_user: "Budite specifični, konstruktivni i ljubazni."
+      notify_user_textarea_label: "Poruka za korisnika"
       custom_placeholder_notify_moderators: "Recite nam točno što vas brine, i gdje je moguće dajte relevantne poveznice i primjere."
+      notify_moderators_textarea_label: "Poruka za moderatore"
       custom_message:
         at_least:
           one: "unesite barem %{count} znak"
@@ -3767,6 +3688,10 @@ hr:
     filters:
       with_topics: "%{filter} teme"
       with_category: "%{filter} %{category} teme"
+      filter:
+        title: "Filter"
+        button:
+          label: "Filter"
       latest:
         title: "Zadnje"
         title_with_count:
@@ -3843,7 +3768,6 @@ hr:
         this_week: "Tjedan"
         today: "Danas"
     browser_update: 'Nažalost, <a href="https://www.discourse.org/faq/#browser">vaš preglednik nije podržan</a>. Prebacite se <a href="https://browsehappy.com">na podržani preglednik</a> za pregled bogatog sadržaja, prijavite se i odgovorite.'
-    safari_13_warning: Ova će stranica uskoro ukloniti podršku za iOS i Safari verzije 13 i starije. Pojednostavljena verzija samo za čitanje ostat će dostupna. (<a href="https://meta.discourse.org/t/224747">više informacija</a>)
     permission_types:
       full: "Otvoriti / Odgovoriti / Vidjeti"
       create_post: "Odgovoriti / Vidjeti"
@@ -3858,6 +3782,9 @@ hr:
       close: "Zatvori (Esc)"
       content_load_error: '<a href="%url%">Sadržaj</a> nije moguće učitati.'
       image_load_error: '<a href="%url%">Slika</a> nije mogla biti učitana.'
+    experimental_lightbox:
+      buttons:
+        close: "Zatvori (Esc)"
     cannot_render_video: Ovaj videozapis nije moguće prikazati jer vaš preglednik ne podržava kodek.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
@@ -3951,7 +3878,6 @@ hr:
         few: "Dobio ovu značku %{count} puta"
         other: "Dobio ovu značku %{count} puta"
       granted_on: "Odobreno %{date}"
-      others_count: "Ostali s ovom značkom (%{count})"
       title: Značke
       allow_title: "Ovu značku možete upotrijebiti kao naslov"
       multiple_grant: "To možete zaraditi više puta"
@@ -4146,13 +4072,11 @@ hr:
     pause_notifications:
       title: "Pauziraj obavijesti za..."
       label: "Pauziraj obavijesti"
-      remaining: "%{remaining} preostalih"
       options:
         half_hour: "30 minuta"
         one_hour: "1 sat"
         two_hours: "2 sata"
         tomorrow: "Do sutra"
-        custom: "Posebna"
       set_schedule: "Postavite raspored obavijesti"
     trust_levels:
       names:
@@ -4203,7 +4127,29 @@ hr:
       more: "Više"
       all_categories: "Sve kategorije"
       all_tags: "Sve oznake"
+      categories_form_modal:
+        title: "Uređivanje navigacije kategorijama"
+        subtitle:
+          text: "i automatski ćemo prikazati najpopularnije kategorije ove stranice"
+        filter_placeholder: "Filtrirajte kategorije"
+        no_categories: "Nema kategorija koje odgovaraju danom pojmu."
+      edit_navigation_modal_form:
+        deselect_button_text: "Odznači sve"
+        reset_to_defaults: "Vrati na zadane postavke"
+        filter_dropdown:
+          all: "Sve"
       sections:
+        custom:
+          save: "Spremi"
+          delete: "Pobriši"
+          links:
+            reset: "Vrati na zadano"
+            icon:
+              label: "Ikona"
+            name:
+              label: "Naziv"
+            value:
+              label: "Veza"
         about:
           header_link_text: "O nama"
         messages:
@@ -4218,28 +4164,20 @@ hr:
             unread_with_count: "Nepročitano (%{count})"
             archive: "Arhiva"
         tags:
-          links:
-            add_tags:
-              content: "Dodaj oznake"
-              title: "Niste dodali nijednu oznaku. Kliknite za početak."
           none: "Niste dodali nijednu oznaku."
           click_to_get_started: "Kliknite ovdje da biste započeli."
           header_link_text: "Oznake"
           header_action_title: "Uredite oznake bočne trake"
           configure_defaults: "Konfigurirajte zadane postavke"
         categories:
-          links:
-            add_categories:
-              content: "Dodajte kategorije"
-              title: "Niste dodali nijednu kategoriju. Kliknite za početak."
           none: "Niste dodali nijednu kategoriju."
           click_to_get_started: "Kliknite ovdje da biste započeli."
           header_link_text: "Kategorije"
           header_action_title: "Uredite svoje kategorije bočne trake"
           configure_defaults: "Konfigurirajte zadane postavke"
         community:
-          header_link_text: "Zajednica"
-          header_action_title: "Napravite temu"
+          edit_section:
+            header_dropdown: "Prilagodba"
           links:
             about:
               content: "O nama"
@@ -4250,8 +4188,8 @@ hr:
             badges:
               content: "Značke"
               title: "Sve značke dostupne za osvajanje"
-            everything:
-              content: "Sve"
+            topics:
+              content: "Tema"
               title: "Sve teme"
             faq:
               content: "ČPP"
@@ -4279,6 +4217,30 @@ hr:
       description: "Vaša tema dobrodošlice prva je stvar koju će novi članovi pročitati. Zamislite to kao svoj \"elevator pitch\" ili \"izjavu o misiji\". Recite svima za koga je ova zajednica, što mogu očekivati da će ovdje pronaći i što biste željeli da prvo učine."
       button_title: "Započnite s uređivanjem"
     until: "Do:"
+    form_templates:
+      errors:
+        valueMissing:
+          default: "Molimo ispunite ovo polje."
+          text: "Molimo ispunite ovo polje."
+          select-one: "Odaberite stavku na popisu."
+          select-multiple: "Odaberite barem jednu stavku na popisu."
+          checkbox: "Označite ovaj okvir ako želite nastaviti."
+        typeMismatch:
+          default: "Molimo unesite valjanu vrijednost."
+          color: "Unesite boju."
+          date: "Unesite datum."
+          email: "Molimo unesite valjanu e-mail adresu."
+          number: "Unesite broj."
+          password: "Unesite valjanu lozinku."
+          tel: "Unesite valjani telefonski broj."
+          text: "Unesite tekstualnu vrijednost."
+          url: "Unesite valjanu URL adresu."
+        tooShort: "Unos mora imati %{minLength} znakova ili više."
+        tooLong: "Unos mora imati manje od %{maxLength} znakova."
+        rangeOverflow: "Unos mora biti manji od %{max}."
+        rangeUnderflow: "Unos mora biti veći od %{min}."
+        patternMismatch: "Molimo uskladite s traženim formatom."
+        badInput: "Unesite valjani unos."
   admin_js:
     type_to_filter: "upiši za filtriranje"
     admin:
@@ -4439,11 +4401,6 @@ hr:
         about: "Ovdje izmijenite svoje članstvo u grupama i imena grupa"
         group_members: "Članovi grupe"
         delete: "Obriši"
-        delete_confirm: "Jeste li sigurni da želite izbrisati ovu grupu?"
-        delete_with_messages_confirm:
-          one: "Brisanjem ove grupe %{count} poruka će ostati bez roditelja, članovi grupe joj više neće imati pristup. Jeste li sigurni?"
-          few: "Brisanjem ove grupe %{count} poruke će ostati bez roditelja, članovi grupe im više neće imati pristup. Jeste li sigurni?"
-          other: "Brisanjem ove grupe %{count} poruka će ostati bez roditelja, članovi grupe im više neće imati pristup. Jeste li sigurni?"
         delete_failed: "Nemoguće obrisati grupu. Ako je ovo automatska grupa, ne možete ju obrisati."
         delete_automatic_group: Ovo je automatska grupa i ne može se izbrisati.
         delete_owner_confirm: "Ukloniti vlasničku privilegiju za \"%{username}\"?"
@@ -4509,7 +4466,6 @@ hr:
             topics:
               read: Pročitajte temu ili određeni post u njoj. RSS je također podržan.
               write: Napravite novu temu ili objavite postojeću.
-              update: Ažurirajte temu. Promijenite naslov, kategoriju, oznake itd.
               read_lists: Čitajte popise tema kao što su vrhunski, novi, najnoviji itd. RSS je također podržan.
             posts:
               edit: Uredite bilo koji post ili određeni.
@@ -4606,9 +4562,6 @@ hr:
         user_promoted_event:
           name: "Događaj koji promovira korisnik"
           details: "Kada se korisnik unaprijedi s jedne razine povjerenja na drugu."
-        user_badge_event:
-          name: "Događaj za dodjelu značke"
-          details: "Kada korisnik dobije značku."
         group_user_event:
           name: "Grupni korisnički događaj"
           details: "Kada se korisnik doda ili ukloni u grupi."
@@ -4653,7 +4606,6 @@ hr:
         enabled: "Omogućeno?"
         is_enabled: "D"
         not_enabled: "N"
-        change_settings: "Promijenite postavke"
         change_settings_short: "Postavke"
         howto: "Kako instalirati dodatke?"
         official: "Službeni dodatak"
@@ -4986,6 +4938,8 @@ hr:
           love:
             name: "like"
             description: "Boja gumba za like."
+          selected:
+            name: "odabran"
         robots:
           title: "Nadjačaj datoteku robots.txt vaše web stranice:"
           warning: "To će trajno nadjačati sve povezane postavke web lokacije."
@@ -5271,14 +5225,8 @@ hr:
           silence: "Utišaj"
           link: "Veza"
         action_descriptions:
-          block: "Spriječite objave koje sadrže ove riječi. Autor objave dobiti će poruku o grešci kada pokuša poslati objavu."
-          censor: "Dopustite postove koji sadrže ove riječi, ali ih zamijenite znakovima koji skrivaju cenzurirane riječi."
-          require_approval: "Objave koje sadrže ove riječi zahtijevat će odobrenje osoblja prije nego što budu vidljive."
-          flag: "Dopustite postove koji sadrže ove riječi, ali ih označite kao neprikladne kako bi ih moderatori mogli pregledati."
-          replace: "Zamijenite riječi u objavama drugim riječima"
-          tag: "Automatski označi teme na temelju prvog posta"
-          silence: "Prve objave korisnika koje sadrže ove riječi zahtijevat će odobrenje osoblja prije nego što budu vidljive i korisnik će biti automatski ušutkan."
-          link: "Zamijenite riječi u objavama vezama"
+          replace: "Zamijenite riječi u objavama drugim riječima."
+          link: "Zamijenite riječi u objavama vezama."
         form:
           label: "Ima riječ ili frazu"
           placeholder: "Unesite riječ ili izraz (* je zamjenski znak)"
@@ -5301,6 +5249,37 @@ hr:
           description: "Unesite tekst ispod da provjerite podudaranja s gledanim riječima"
           found_matches: "Pronađeno podudaranja:"
           no_matches: "Nema pronađenih podudaranja"
+      form_templates:
+        nav_title: "Predlošci"
+        list_table:
+          headings:
+            name: "Ime"
+            actions: "Akcije"
+        view_template:
+          close: "Zatvori"
+          edit: "Uredi"
+          delete: "Pobriši"
+        new_template_form:
+          submit: "Spremi"
+          cancel: "Odustani"
+          preview: "Pregled"
+        quick_insert_fields:
+          add_new_field: "Dodaj"
+          dropdown: "Padajući izbornik"
+        validations_modal:
+          table_headers:
+            key: "Ključ"
+            type: "Tip"
+            description: "Opis"
+          validations:
+            required:
+              key: "potrebno"
+            minimum:
+              key: "minimum"
+            maximum:
+              key: "maksimum"
+            type:
+              key: "tip"
       impersonate:
         title: "Predstavi se kao"
         help: "Koristite ovaj alat da se predstavljate kao određeni korisnički račun za potrebe ispravljanja grešaka. Morat će te se odjaviti kad završite."
@@ -5313,6 +5292,7 @@ hr:
         not_found: "Žao nam je, taj korisnik ne postoji."
         id_not_found: "Žao nam je, taj korisnički ID ne postoji."
         active: "Aktivirano"
+        status: "Statust"
         show_emails: "Pokaži emailove"
         hide_emails: "Sakrij e-poštu"
         nav:
@@ -5401,7 +5381,6 @@ hr:
         show_admin_profile: "Administrator"
         manage_user: "Upravljanje korisnikom"
         show_public_profile: "Pokaži javni profil"
-        impersonate: "Predstavi se kao"
         action_logs: "Dnevnici akcija"
         ip_lookup: "IP pregled"
         log_out: "Odjava"
@@ -5644,6 +5623,8 @@ hr:
         show_overriden: "Pokazuj samo promijenjeno"
         locale: "Jezik:"
         more_than_50_results: "Postoji više od 50 rezultata. Molimo suzite kriterije vaše pretrage."
+        outdated:
+          dismiss: "Skloni"
       settings:
         show_overriden: "Pokazuj samo promijenjeno"
         history: "Prikaz povijesti promjena"
@@ -5656,7 +5637,6 @@ hr:
             label: "Dodaj emotikone"
         title: "Postavke"
         no_results: "Nema pronađenih rezultata"
-        more_than_30_results: "Postoji više od 30 rezultata. Molimo suzite kriterije vaše pretrage ili odaberite kategoriju."
         clear_filter: "Izbriši"
         add_url: "dodaj URL"
         add_host: "dodaj host"
@@ -5743,7 +5723,8 @@ hr:
         allow_title: Dopusti da se značka koristi kao titula
         multiple_grant: Može biti dodijeljena više puta
         listable: Prikaži značku na javnoj stranici sa značkama
-        enabled: Omogući značku
+        enabled: omogućeno
+        disabled: onemogućen
         icon: Ikona
         image: Slika
         graphic: Grafički
@@ -5814,10 +5795,8 @@ hr:
       embedding:
         get_started: "Ako želite ugraditi Discourse na drugu web-stranicu, počnite dodavanjem njegovog hosta."
         confirm_delete: "Jeste li sigurni da želite izbrisati tog hosta?"
-        sample: "Zalijepite sljedeći HTML kod na svoju web-lokaciju kako biste stvorili i ugradili teme diskursa. Zamijenite <b>ZAMJENI_ME</b> kanonskim URL-om stranice na koju ga ugrađujete."
         title: "Ugrađivanje"
         host: "Dopušteni hostovi"
-        class_name: "Naziv klase"
         allowed_paths: "Dopuštane putanje"
         edit: "izmijeni"
         category: "Post u kategoriju"
diff --git a/config/locales/client.hu.yml b/config/locales/client.hu.yml
index 0bd8b49dcf4..63622393290 100644
--- a/config/locales/client.hu.yml
+++ b/config/locales/client.hu.yml
@@ -184,12 +184,6 @@ hu:
     software_update_prompt:
       message: "Frissítettük a webhelyet, <span>frissítse az oldalt</span>, különben váratlan viselkedést tapasztalhat."
       dismiss: "Elvetés"
-    bootstrap_mode_enabled:
-      one: "Hogy könnyebbé tegyük az új oldala elindítását, most előkészítési módban van. Minden új felhasználó 1-es szintet kap, és be lesz állítva, hogy napi kivonat e-mailt kapjanak. Ez a beállítás automatikusan kikapcsol, ha legalább %{count} felhasználó regisztrált."
-      other: "Hogy könnyebbé tegyük az új oldala elindítását, most előkészítési módban van. Minden új felhasználó 1-es szintet kap, és be lesz állítva, hogy napi kivonat e-mailt kapjanak. Ez a beállítás automatikusan kikapcsol, ha legalább %{count} felhasználó regisztrált."
-    bootstrap_mode_disabled: "Az előkészítési mód 24 órán belül kikapcsol."
-    bootstrap_invite_button_title: "Meghívók küldése"
-    bootstrap_wizard_link_title: "Beállítási varázsló befejezése"
     themes:
       default_description: "Alapértelmezett"
       broken_theme_alert: "Lehet, hogy webhelye nem működik, mert a téma/összetevő hibába ütközött."
@@ -302,11 +296,11 @@ hu:
       edit_bookmark: "Könyvjelző szerkesztése"
       clear_bookmarks: "Könyvjelzők törlése"
       help:
-        bookmark: "Kattintson a téma első bejegyzésének könyvjelzőzéséhez"
-        edit_bookmark: "Kattintson a témán szereplő könyvjelző szerkesztéséhez"
+        bookmark: "Kattintson a téma könyvjelzővé tételéhez"
+        edit_bookmark: "Kattintson a témában lévő hozzászólás könyvjelzőjének szerkesztéséhez."
         edit_bookmark_for_topic: "Kattintson a témához tartozó könyvjelző szerkesztéséhez"
         unbookmark: "Kattintson a téma valamennyi könyvjelzőjének törléséhez"
-        unbookmark_with_reminder: "Kattintson a téma valamennyi könyvjelzőjének és emlékeztetőjének törléséhez."
+        unbookmark_with_reminder: "Kattintson ide a téma összes könyvjelzőjének és emlékeztetőjének eltávolításához."
     bookmarks:
       created: "Könyvjelzőzte ezt a bejegyzést. %{name}"
       created_generic: "Könyvjelzőzte ezt. %{name}"
@@ -350,7 +344,7 @@ hu:
       new_topic: "Új témavázlat"
       new_private_message: "Új személyesüzenet-vázlat"
       abandon:
-        confirm: "Van egy folyamatban lévő vázlata ehhez a témához. Mit szeretne vele tenni?"
+        confirm: "Már van egy folyamatban lévő tervezete. Mit szeretne vele kezdeni?"
         yes_value: "Elvetés"
         no_value: "Szerkesztés folytatása"
     topic_count_categories:
@@ -523,26 +517,33 @@ hu:
       scores:
         about: "Ez a pontszám a jelentő bizalmi szintje, a korábbi megjelöléseinek pontossága és a jelentett elem prioritása alapján számított."
         score: "Pontszám"
-        date: "Dátum"
-        type: "Típus"
+        type: "Ok"
         status: "Állapot"
-        submitted_by: "Beküldte"
-        reviewed_by: "Jóváhagyta"
+        submitted_by: "Jelentette"
       statuses:
         pending:
           title: "Folyamatban"
         approved:
           title: "Jóváhagyva"
+        approved_flag:
+          title: "Jóváhagyott zászló"
+        approved_post:
+          title: "Hozzászólás jóváhagyva"
         rejected:
           title: "Elutasítva"
-        ignored:
-          title: "Figyelmen kívül hagyva"
-        deleted:
-          title: "Törölve"
+        rejected_flag:
+          title: "Megjelölés elutasítva"
+        rejected_user:
+          title: "Felhasználó elutasítva"
+        rejected_post:
+          title: "A bejegyzés elutasítva"
         reviewed:
-          title: "(összes jóváhagyott)"
+          title: "Minden áttekintve"
         all:
-          title: "(összes)"
+          title: "Összes"
+      context_question:
+        delimiter: "vagy"
+        something_else_wrong: "Valami baj van ezzel a bejegyzéssel?"
       types:
         reviewable_flagged_post:
           title: "Megjelölt bejegyzés"
@@ -849,6 +850,7 @@ hu:
         make_all_primary_description: "Ez legyen az összes kijelölt felhasználó elsődleges csoportja"
         remove_all_primary: "Eltávolítás, mint elsődleges"
         remove_all_primary_description: "Csoport eltávolítása, mint elsődleges"
+        status: "Állapot"
         owner: "Tulajdonos"
         primary: "Elsődleges"
         forbidden: "Nem láthatja a tagokat."
@@ -977,10 +979,12 @@ hu:
       mute: "Némítás"
       edit: "Beállítások szerkesztése"
       download_archive:
-        button_text: "Összes letöltése"
-        confirm: "Biztos, hogy letölti a bejegyzéseit?"
-        success: "A letöltés elkezdődött, értesítjük, amint a folyamat véget ért."
-        rate_limit_error: "A bejegyzések naponta csak egyszer töltetők le, próbálja újra holnap."
+        title: "Adatok exportálása"
+        description: "Töltse le a fiók tevékenységének és beállításainak archívumát."
+        button_text: "Archívum kérése"
+        confirm: "Szeretné letölteni a fiók tevékenységének és beállításainak archívumát?"
+        success: "Megkezdtük az archívum összegyűjtését, üzenetet fog kapni, ha a folyamat befejeződik."
+        rate_limit_error: "A fiókarchívumokat naponta egyszer lehet letölteni, kérjük, próbálja meg holnap újra."
       new_private_message: "Új üzenet"
       private_message: "Üzenet"
       private_messages: "Üzenetek"
@@ -1052,7 +1056,7 @@ hu:
         perm_denied_expl: "Letiltotta a figyelmeztetéseket. Engedélyezze őket a böngésző beállításaiban."
         disable: "Értesítések kikapcsolása"
         enable: "Értesítések bekapcsolása"
-        each_browser_note: 'Megjegyzés: Ezt a beállítást minden használt böngészőben módosítania kell. Ettől a beállítástól függetlenül minden értesítés le lesz tiltva, ha szünetelteti az értesítéseket a felhasználói menüből.'
+        each_browser_note: "Megjegyzés: Ezt a beállítást minden használt böngészőben módosítania kell. Ettől a beállítástól függetlenül minden értesítés le lesz tiltva, ha szünetelteti az értesítéseket a felhasználói menüből."
         consent_prompt: "Szeretne élő értesítéseket kapni, ha valaki válaszol a hozzászólásaira?"
       dismiss: "Elvetés"
       dismiss_notifications: "Összes elvetése"
@@ -1103,12 +1107,7 @@ hu:
       experimental_sidebar:
         enable: "Oldalsáv engedélyezése"
         options: "Beállítások"
-        categories_section: "Kategóriák szakasz"
-        categories_section_instruction: "A kiválasztott kategóriák az oldalsáv kategóriák szakaszában jelennek meg."
-        tags_section: "Címkék szakasz"
-        tags_section_instruction: "A kiválasztott címkék az oldalsáv címkék szakaszában jelennek meg."
         navigation_section: "Navigáció"
-        list_destination_instruction: "Amikor új tartalom van az oldalsávon..."
       change: "módosítás"
       featured_topic: "Kiemelt téma"
       moderator: "%{user} egy moderátor"
@@ -1180,12 +1179,24 @@ hu:
       home: "Alapértelmezett főoldal"
       staged: "Lépcsőzetes"
       staff_counters:
-        flags_given: "hasznos megjelölések"
-        flagged_posts: "megjelölt bejegyzések"
-        deleted_posts: "törölt bejegyzések"
-        suspensions: "felfüggesztések"
-        warnings_received: "figyelmeztetések"
-        rejected_posts: "elutasított bejegyzések"
+        flags_given:
+          one: '<span class="%{className}">%{count}</span> hasznos jelentés'
+          other: '<span class="%{className}">%{count}</span> hasznos jelentés'
+        flagged_posts:
+          one: '<span class="%{className}">%{count}</span> jelentett bejegyzés'
+          other: '<span class="%{className}">%{count}</span> jelentett bejegyzés'
+        deleted_posts:
+          one: '<span class="%{className}">%{count}</span> törölt bejegyzés'
+          other: '<span class="%{className}">%{count}</span> törölt bejegyzés'
+        suspensions:
+          one: '<span class="%{className}">%{count}</span> felfüggesztés'
+          other: '<span class="%{className}">%{count}</span> felfüggesztés'
+        warnings_received:
+          one: '<span class="%{className}">%{count}</span> figyelmeztetés'
+          other: '<span class="%{className}">%{count}</span> figyelmeztetés'
+        rejected_posts:
+          one: '<span class="%{className}">%{count}</span> elutasított bejegyzés'
+          other: '<span class="%{className}">%{count}</span> elutasított bejegyzés'
       messages:
         all: "összes bejövő postaláda"
         inbox: "Bejövő"
@@ -1222,7 +1233,6 @@ hu:
         tags: "Címkék"
         interface: "Felület"
         apps: "Alkalmazások"
-        sidebar: "Oldalsáv"
       change_password:
         success: "(az e-mail elküldve)"
         in_progress: "(az e-mail küldése folyamatban)"
@@ -1236,11 +1246,12 @@ hu:
         title: "Kétfaktoros biztonsági kódok"
         regenerate: "Újragenerálás"
         disable: "Letiltás"
-        enable: "Engedélyezés"
-        enable_long: "Biztonsági kódok engedélyezése"
+        enable: "Biztonsági kódok létrehozása"
+        enable_long: "Biztonsági kódok hozzáadása"
+        not_enabled: "Még nem hoztál létre biztonsági kódokat."
         manage:
-          one: "Biztonsági kódok kezelése. <strong>%{count}</strong> biztonsági kód maradt."
-          other: "Biztonsági kódok kezelése. <strong>%{count}</strong> biztonsági kód maradt."
+          one: "<strong>%{count}</strong> biztonsági kódja maradt."
+          other: "<strong>%{count}</strong> biztonsági kódja maradt."
         copy_to_clipboard: "Vágólapra másolás"
         copy_to_clipboard_error: "Hiba az adatok vágólapra másolásakor"
         copied_to_clipboard: "Vágólapra másolva"
@@ -1322,6 +1333,7 @@ hu:
         success: "Küldtünk egy levelet a megadott e-mail-címre. Kövesse a megerősítési utasításokat."
         success_via_admin: "Küldtünk egy levelet a megadott e-mail-címre. A felhasználónak követnie kell a levélben szereplő megerősítési utasításokat."
         success_staff: "Küldtünk egy levelet a jelenlegi e-mail-címére. Kövesse a megerősítési utasításokat."
+        back_to_preferences: "Vissza a beállításokhoz"
       change_avatar:
         title: "Profilkép megváltoztatása"
         gravatar: "<a href='//%{gravatarBaseUrl}%{gravatarLoginUrl}' target='_blank'>%{gravatarName}</a>, ez alapján:"
@@ -1675,8 +1687,7 @@ hu:
       pause_notifications: "Értesítések szüneteltetése"
       remove_status: "Állapot eltávolítása"
     user_tips:
-      primary: "Értem!"
-      secondary: "ne mutasd nekem ezeket a tippeket"
+      button: "Értem!"
       first_notification:
         title: "Az első értesítésed!"
         content: "Az értesítések arra szolgálnak, hogy naprakészen tájékoztassuk Önt arról, hogy mi történik a közösségben."
@@ -1721,8 +1732,6 @@ hu:
       logout_disabled: "A kilépés le van tiltva, amíg az oldal írásvédett módban van."
     staff_writes_only_mode:
       enabled: "Ez az oldal csak a munkatársaknak van fenntartva. Továbbra is böngészheted, de a válaszadás és egyéb műveletek csak a munkatársak számára elérhetők."
-    too_few_posts_notice_MF: |
-      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">Kezdjük el a beszélgetést!</a> Jelenleg {currentPosts, plural, one {<strong>#</strong> bejegyzés} other {<strong>#</strong> bejegyzés}} található. A látogatóknak több olvasnivalóra van szükségük – azt javasoljuk, hogy legalább {requiredPosts, plural, one {<strong>#</strong> bejegyzés} other {<strong>#</strong> bejegyzés}} legyen. Csak a stáb láthatja ezt az üzenetet.
     logs_error_rate_notice:
       reached_hour_MF: |
         <b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# hiba/óra} other {# hiba/óra}}</a>, elérte az oldal beállításiban megadott {limit, plural, one {# hiba/órás} other {# hiba/órás}} korlátot.
@@ -1753,16 +1762,12 @@ hu:
       intro: "Üdv! Úgy tűnik, hogy tetszik Önnek a fórumunk, de még nem regisztrált fiókot."
       value_prop: "Unja már, hogy ugyanazokat a bejegyzéseket görgeti? Ha létrehoz egy fiókot, mindig oda tér vissza, ahol abbahagyta. Egy fiókkal értesítést is kaphat az új válaszokról, könyvjelzőket menthet, és egy kedveléssel megköszönheti másoknak. Mindannyian együtt dolgozhatunk azon, hogy ezt a közösséget nagyszerűvé tegyük. :heart:"
     summary:
-      enabled_description: "A téma összefoglalását látja: a legérdekesebb bejegyzéseket a közösség határozta meg."
       description:
         one: "<b>%{count}</b> válasz van."
         other: "<b>%{count}</b> válasz van."
       description_time_MF: |
         {replyCount, plural, one {<b>#</b> válasz} other {<b>#</b> válasz}} található, a becsült olvasási idő <b>{readingTime, plural, one {# perc} other {# perc}}</b>.
-      enable: "Téma összefoglalása"
       disable: "Összes bejegyzés megjelenítése"
-      short_label: "Összefoglalás"
-      short_title: "A téma összefoglalásának megjelenítése: a legérdekesebb bejegyzéseket a közösség határozta meg"
     deleted_filter:
       enabled_description: "Ez a téma törölt bejegyzéseket is tartalmaz, melyek el lettek rejtve."
       disabled_description: "A téma törölt bejegyzései is megjelennek."
@@ -2053,8 +2058,6 @@ hu:
         topic_template_not_modified: "Adjon hozzá részleteket és konkrétumokat a témájához a témasablon szerkesztésével."
       save_edit: "Módosítások mentése"
       overwrite_edit: "Módosítások felülírása"
-      reply_original: "Válasz az eredeti témára"
-      reply_here: "Válasz ide"
       reply: "Válasz"
       cancel: "Mégse"
       create_topic: "Téma létrehozása"
@@ -2213,6 +2216,7 @@ hu:
       reaction_2: "<span>%{username}, %{username2}</span> %{description}"
       votes_released: "%{description} – kész"
       new_features: "Új funkciók érhetők el!"
+      admin_problems: "Új tanácsok a webhely irányítópultján"
       dismiss_confirmation:
         body:
           default:
@@ -2517,7 +2521,7 @@ hu:
         top: "Nincsenek népszerű témák."
         educate:
           new: '<p>Az új témák fognak itt megjelenni. Alapértelmezésként itt jelennek meg a friss témák, és egy ilyen jelet <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span> talál majd azok mellett, amelyek az elmúlt két napban lettek közzétéve.</p><p>A beállításait <a href="%{userPrefsUrl}">ezen az oldalon</a> tudja módosítani.</p>'
-          unread: "<p>Az Ön olvasatlan témái itt jelennek meg.</p><p>Alapértelmezés szerint a témák olvasatlannak minősülnek, és az olvasatlan témák száma <span class=\"badge unread-posts badge-notification\">1</span> lesz látható, ha:</p><ul><li>Létrehozta a témát</li><li>Válaszolt a témára</li><li>Olvasta a témát több mint 4 percig</li></ul><p>Vagy ha a témát kifejezetten Nyomon követte vagy Figyelt témának állította be az egyes témákban található \U0001F514 segítségével.</p><p>Ennek megváltoztatásához látogasson el a <a href=\"%{userPrefsUrl}\">beállítások</a> oldalára.</p>"
+          unread: "<p>Az Ön olvasatlan témái itt jelennek meg.</p><p>Alapértelmezés szerint a témák olvasatlannak minősülnek, és az olvasatlan témák száma <span class=\"badge unread-posts badge-notification\">1</span> lesz látható, ha:</p><ul><li>Létrehozta a témát</li><li>Válaszolt a témára</li><li>Olvasta a témát több mint 5 percig</li></ul><p>Vagy ha a témát kifejezetten Nyomon követte vagy Figyelt témának állította be az egyes témákban található \U0001F514 segítségével.</p><p>Ennek megváltoztatásához látogasson el a <a href=\"%{userPrefsUrl}\">beállítások</a> oldalára.</p>"
       bottom:
         latest: "Nincs több friss téma."
         posted: "Nincs több közzétett téma."
@@ -2534,6 +2538,7 @@ hu:
         one: "%{count} bejegyzés a témában"
         other: "%{count} bejegyzés a témában"
       create: "Új téma"
+      create_disabled_category: "Ebben a kategóriában nem hozhatsz létre témákat"
       create_long: "Új téma létrehozása"
       open_draft: "Vázlat megnyitása"
       private_message: "Üzenet indítása"
@@ -2582,8 +2587,8 @@ hu:
         Első bejegyzés: %{createdAtDate}
         Elküldve: %{bumpedAtDate}
       suggest_create_topic: Készen áll, hogy <a href>új beszélgetést kezdjen?</a>
-      jump_reply_up: ugrás a korábbi válaszhoz
-      jump_reply_down: ugrás a későbbi válaszhoz
+      jump_reply: "Ugrás a hozzászólás eredeti helyére"
+      jump_reply_aria: "Ugrás @%{username} bejegyzésére az eredeti helyén"
       deleted: "A téma törölve lett"
       slow_mode_update:
         title: "Lassú mód"
@@ -3064,7 +3069,6 @@ hu:
             description: "Törölje az emlékeztető dátumát és időpontját"
       filtered_replies:
         viewing_subset: "Néhány válasz össze van csukva"
-        viewing_summary: "A téma összefoglalójának megtekintése"
         show_all: "Mutasd mindet"
     category:
       none: "(nincs kategória)"
@@ -3077,7 +3081,7 @@ hu:
       back: "Vissza a kategóriához"
       general: "Általános"
       settings: "Beállítások"
-      topic_template: "Téma sablonja"
+      topic_template: "Sablon"
       tags: "Címkék"
       required_tag_group:
         delete: "Törlés"
@@ -3116,8 +3120,7 @@ hu:
       email_in: "Egyéni e-mail cím a bejövő üzeneteknek:"
       email_in_tooltip: "Több e-mail címet elválaszthat a | karakterrel."
       email_in_allow_strangers: "E-mailek fogadása fiók nélküli névtelen felhasználóktól"
-      email_in_disabled: "Az új témák e-mailben történő közzététele le van tiltva az oldal beállításaiban. Az új témák e-mailben történő közzétételének engedélyezéséhez "
-      email_in_disabled_click: 'engedélyezd az "e-mail be" beállítást.'
+      email_in_disabled: "Az új témák e-mailben történő közzététele le van tiltva. Ha engedélyezni szeretné az új témák e-mailben történő közzétételét, engedélyezze a <a href='%{setting_url}'>„e-mail in”</a> beállítást."
       num_featured_topics: "A kategóriák oldalon megjelenő témák száma:"
       subcategory_num_featured_topics: "A kiemelt témák száma a szülő kategória oldalán:"
       sort_order: "Témakörök csoportosítása:"
@@ -3131,6 +3134,7 @@ hu:
       default_position: "Alapértelmezett pozíció"
       parent: "Szülő kategória"
       num_auto_bump_daily: "A naponta automatikusan előrehozandó nyitott témák száma:"
+      auto_bump_cooldown_days: "Minimum napok száma, mielőtt újra feldobná ugyanazt a témát:"
       navigate_to_first_post_after_read: "A témák elolvasása után navigáljon az első hozzászóláshoz"
       notifications:
         watching:
@@ -3281,6 +3285,10 @@ hu:
     filters:
       with_topics: "%{filter} témák"
       with_category: "%{filter} %{category} Témák"
+      filter:
+        title: "Szűrő"
+        button:
+          label: "Szűrő"
       latest:
         title: "Legújabb"
         title_with_count:
@@ -3359,6 +3367,9 @@ hu:
       open: "eredeti kép"
       counter: "%curr% / %total%"
       close: "Bezárás (Esc)"
+    experimental_lightbox:
+      buttons:
+        close: "Bezárás (Esc)"
     cannot_render_video: A videó nem jeleníthető meg, mert a böngésző nem támogatja ezt a kodeket.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
@@ -3431,7 +3442,6 @@ hu:
         one: "Nyerte ezt a jelvényt %{count} idővel"
         other: "%{count} alkalommal szerezte meg ezt a jelvényt"
       granted_on: "Kiadva %{date}"
-      others_count: "A jelvényt birtoklók száma (%{count})"
       title: Jelvények
       allow_title: "Ezt a jelvényt címként használhatod"
       multiple_grant: "Ezt többször is megkeresheted"
@@ -3444,6 +3454,7 @@ hu:
       granted:
         one: "%{count} kiadva"
         other: "%{count} kiadva"
+      awarded: elnyerte
       select_badge_for_title: Válassz egy jelvényt, hogy címként használd
       none: "(semmi)"
       successfully_granted: "Sikeresen megadta a(z) %{badge} jelvényt %{username} számára"
@@ -3571,13 +3582,11 @@ hu:
     image_removed: "(kép eltávolítva)"
     pause_notifications:
       label: "Értesítések szüneteltetése"
-      remaining: "%{remaining} van hátra"
       options:
         half_hour: "30 percig"
         one_hour: "1 óráig"
         two_hours: "2 óráig"
         tomorrow: "Holnapig"
-        custom: "Egyéni"
     trust_levels:
       names:
         newuser: "új felhasználó"
@@ -3621,7 +3630,37 @@ hu:
       more: "Több"
       all_categories: "Minden kategória"
       all_tags: "Összes címke"
+      edit_navigation_modal_form:
+        filter_dropdown:
+          all: "Összes"
       sections:
+        custom:
+          save: "Mentés"
+          delete: "Törlés"
+          public: "Tegye ezt a részt nyilvánossá és mindenki számára láthatóvá"
+          links:
+            reset: "Alapértelmezés visszaállítása"
+            icon:
+              label: "Ikon"
+              validation:
+                blank: "Az ikon nem lehet üres"
+                maximum: "Az ikonnak rövidebbnek kell lennie %{count} karakternél"
+            name:
+              label: "Név"
+              validation:
+                blank: "A név nem lehet üres"
+                maximum: "A névnek %{count} karakternél rövidebbnek kell lennie"
+            value:
+              label: "Hivatkozás"
+              validation:
+                blank: "A link nem lehet üres"
+                maximum: "A linknek %{count} karakternél rövidebbnek kell lennie"
+                invalid: "A formátum érvénytelen"
+          title:
+            label: "A szakasz címe"
+            validation:
+              blank: "A cím nem lehet üres"
+              maximum: "A címnek %{count} karakternél rövidebbnek kell lennie"
         about:
           header_link_text: "Névjegy"
         messages:
@@ -3636,26 +3675,18 @@ hu:
             unread_with_count: "Olvasatlan (%{count})"
             archive: "Archívum"
         tags:
-          links:
-            add_tags:
-              content: "Címkék hozzáadása"
-              title: "Még nem adott hozzá címkéket. Kattintson a kezdéshez."
           none: "Még nem adott hozzá címkéket."
           click_to_get_started: "Kattintson ide a kezdéshez."
           header_link_text: "Címkék"
           configure_defaults: "Alapértelmezések beállítása"
         categories:
-          links:
-            add_categories:
-              content: "Kategóriák hozzáadása"
-              title: "Még nem adott hozzá kategóriákat. Kattintson a kezdéshez."
           none: "Még nem adott hozzá kategóriákat."
           click_to_get_started: "Kattintson ide a kezdéshez."
           header_link_text: "Kategóriák"
           configure_defaults: "Alapértelmezések beállítása"
         community:
-          header_link_text: "Közösség"
-          header_action_title: "Téma létrehozása"
+          edit_section:
+            header_dropdown: "Személyre szabás"
           links:
             about:
               content: "Névjegy"
@@ -3666,8 +3697,8 @@ hu:
             badges:
               content: "Jelvények"
               title: "Az összes megszerezhető jelvény"
-            everything:
-              content: "Összes"
+            topics:
+              content: "Témák"
               title: "Minden téma"
             faq:
               content: "GYIK"
@@ -3691,6 +3722,15 @@ hu:
       description: "Az üdvözlő téma az első dolog, amit az új tagok elolvasnak. Gondoljon rá úgy, mint egy \"lendületbe hozó beszéd\"-re vagy \"küldetésnyilatkozat\"-ra. Tudassa mindenkivel, kiknek szól ez a közösség, mire számíthatnak itt, és mit szeretne, mit csináljanak először."
       button_title: "Szerkesztés megkezdése"
     until: "Eddig:"
+    char_counter:
+      exceeded: "Túllépte a megengedett maximális karakterszámot."
+    form_template_chooser:
+      select_template: "Űrlapsablonok kiválasztása"
+    form_templates:
+      errors:
+        typeMismatch:
+          default: "Adjon meg egy érvényes dátumot."
+          email: "Adjon meg egy érvényes e-mail-címet."
   admin_js:
     type_to_filter: "Írj ide a szűréshez.."
     admin:
@@ -3835,7 +3875,8 @@ hu:
         refresh: "Frissítés"
         group_members: "A csoport tagjai"
         delete: "Törlés"
-        delete_confirm: "Biztos, hogy törölni szeretné ezt a csoportot?"
+        delete_confirm: "Biztos, hogy törölni szeretné a(z) %{group} csoportot?"
+        delete_warning: "A törölt csoportok nem állíthatók vissza"
         delete_failed: "A csoport törlése sikertelen. Ha ez egy automatikusan létrehozott csoport, akkor nem törölhető."
         delete_automatic_group: Ez egy automatikus csoport, nem törölhető.
         delete_owner_confirm: "Eltávolítja „%{username}” tulajdonosi jogosultságát?"
@@ -3891,10 +3932,14 @@ hu:
             topics:
               read: Olvasson el egy témát vagy egy adott hozzászólást. Az RSS is támogatva van.
               write: Hozzon létre új témát, vagy írjon egy meglévő témához.
-              update: Téma frissítése. A cím, kategória, címkék stb. módosítása.
+              update: Téma frissítése. Módosíthatja a címet, kategóriát, címkéket, státuszt, archetípust, featured_linket stb.
+              delete: Téma törlése.
               read_lists: Témalisták olvasása, mint a top, új, legújabb, stb. Az RSS is támogatva van.
             posts:
               edit: Bármelyik hozzászólás vagy egy adott hozzászólás szerkesztése.
+              delete: Hozzászólás törlése.
+            tags:
+              list: Címkék listázása.
             categories:
               list: A kategóriák listájának lekérdezése.
               show: Egyetlen kategória kinyerése az azonosító alapján.
@@ -3918,6 +3963,11 @@ hu:
               list_user_badges: A felhasználó jelvényeinek felsorolása.
               assign_badge_to_user: Jelvény kiosztása egy felhasználónak.
               revoke_badge_from_user: Jelvény elvétele egy felhasználótól.
+            groups:
+              manage_groups: Csoporttagok listázása, hozzáadása és eltávolítása.
+              administer_groups: Csoportok listázása, megjelenítése, létrehozása, frissítése és törlése.
+            search:
+              query: Keresés a `/search/query?term=term` végpont használatával.
       web_hooks:
         title: "Webhooks"
         create: "Létrehoz"
@@ -3957,6 +4007,9 @@ hu:
         reviewable_event:
           name: "Áttekinthető esemény"
           details: "Ha egy új elem készen áll a felülvizsgálatra és állapota frissül."
+        user_badge_event:
+          name: "Jelvény esemény"
+          details: "A jelvény megadásakor vagy visszavonásakor."
         delivery_status:
           title: "Kiszállítás állapota"
           inactive: "Inaktív"
@@ -3985,7 +4038,7 @@ hu:
         enabled: "Engedélyezed?"
         is_enabled: "Y"
         not_enabled: "N"
-        change_settings: "Beállítások változtatása"
+        change_settings: "Beépülő modul beállításai"
         change_settings_short: "Beállítások"
         howto: "Hogyan lehet plugin-eket telepíteni?"
         official: "Hivatalos bővítmény"
@@ -4249,6 +4302,8 @@ hu:
           love:
             name: "szerelem"
             description: "A kedvelés gomb színe."
+          selected:
+            name: "kiválasztott"
         email_style:
           title: "E-mail stílus"
           heading: "E-mail stílus testreszabása"
@@ -4357,6 +4412,7 @@ hu:
           no_previous: "Nincsen előzőleges érték"
           deleted: "Nincs új érték. A feljegyzés törölve lett"
           actions:
+            permanently_delete_post_revisions: "véglegesen törölni a hozzászólás módosításait"
             delete_user: "felhasználó törlése"
             change_trust_level: "bizalmi szint megváltoztatása"
             change_username: "Felhasználónév módosítása"
@@ -4434,6 +4490,9 @@ hu:
             delete_group: "csoport törlése"
             watched_word_create: "figyelt szó hozzáadása"
             watched_word_destroy: "figyelt szó törlése"
+            create_public_sidebar_section: "nyilvános oldalsáv szakasz létrehozása"
+            update_public_sidebar_section: "frissítse a nyilvános oldalsáv szakaszt"
+            destroy_public_sidebar_section: "semmisítse meg a nyilvános oldalsáv szakaszt"
         screened_emails:
           title: "Szűrt e-mailek"
           email: "E-mail cím"
@@ -4477,8 +4536,6 @@ hu:
           replace: "Csere"
           silence: "Elnémítás"
           link: "Hivatkozás"
-        action_descriptions:
-          flag: "Az ezen szavakat tartalmazó bejegyzések engedélyezése, de ide nem illőnek jelölése, hogy a moderátorok átnézhessék azokat."
         form:
           placeholder_regexp: "reguláris kifejezés"
           replace_placeholder: "példa"
@@ -4491,6 +4548,68 @@ hu:
         test:
           button_label: "Teszt"
           no_matches: "Nem található egyezés"
+      form_templates:
+        nav_title: "Sablonok"
+        new_template: "Új sablon"
+        list_table:
+          headings:
+            name: "Név"
+            actions: "Műveletek"
+          actions:
+            view: "Sablon megtekintése"
+            edit: "Sablon szerkesztése"
+            delete: "Sablon törlése"
+        view_template:
+          close: "Lezárás"
+          edit: "Szerkesztés"
+          delete: "Törlés"
+          toggle_preview: "Előnézet átkapcsolása"
+        new_template_form:
+          submit: "Mentés"
+          cancel: "Mégse"
+          name:
+            label: "Sablon neve"
+            placeholder: "Adja meg a sablon nevét..."
+          template:
+            label: "Sablon"
+            placeholder: "Hozzon létre egy YAML-sablont itt..."
+          preview: "Előnézet"
+        delete_confirm: "Biztosan törölni szeretné ezt a sablont?"
+        quick_insert_fields:
+          add_new_field: "Hozzáad"
+          checkbox: "Jelölőnégyzet"
+          input: "Rövid válasz"
+          textarea: "Hosszú válasz"
+          dropdown: "Legördülő menü"
+          upload: "Fájl feltöltése"
+          multiselect: "Több választási lehetőség"
+        validations_modal:
+          button_title: "Érvényesítések"
+          modal_title: "Érvényesítési lehetőségek"
+          table_headers:
+            key: "Kulcs"
+            type: "Típus"
+            description: "Leírás"
+          validations:
+            required:
+              key: "kötelező"
+              type: "logikai érték"
+              description: "Az űrlap elküldéséhez a mező kitöltése szükséges."
+            minimum:
+              key: "legalább"
+              type: "egész szám"
+            maximum:
+              key: "legfeljebb"
+            pattern:
+              key: "minta"
+              type: "regex karakterlánc"
+            type:
+              key: "típus"
+        edit_category:
+          toggle_freeform: "űrlap sablon letiltva"
+          toggle_form_template: "űrlap sablon engedélyezve"
+          select_template: "Űrlapsablonok kiválasztása"
+          select_template_help: "Űrlapsablonok hozzáadása/szerkesztése"
       impersonate:
         title: "Megszemélyesít"
         not_found: "A felhasználó nem található."
@@ -4501,6 +4620,7 @@ hu:
         not_found: "Sajnos ez a felhasználónév nem létezik."
         id_not_found: "Sajnos ez a felhasználó id nem található a rendszerben."
         active: "Aktíválva"
+        status: "Állapot"
         show_emails: "E-mailek megjelenítése"
         hide_emails: "E-mailek elrejtése"
         nav:
@@ -4574,7 +4694,6 @@ hu:
         staged: "Lépcsőzetes?"
         show_admin_profile: "Adminisztrátor"
         show_public_profile: "Publikus profil megjelenítése"
-        impersonate: "Megszemélyesít"
         ip_lookup: "IP-cím keresés"
         log_out: "Kijelentkezés"
         revoke_admin: "Admin jog visszavonása"
@@ -4689,6 +4808,8 @@ hu:
         recommended: "Azt tanácsoljuk, hogy módosítsd a következő szöveget az igényeidnek megfelelően:"
         show_overriden: "Csak a felülírtak megjelenítése"
         locale: "Nyelv:"
+        outdated:
+          dismiss: "Elvetés"
       settings:
         show_overriden: "Csak a felülírtak megjelenítése"
         reset: "alaphelyzet"
@@ -4700,7 +4821,6 @@ hu:
             label: "Emodzsi hozzáadása"
         title: "Beállítások"
         no_results: "Nincs találat."
-        more_than_30_results: "A keresés több, mint 30 találatot adott. Kérlek, pontosítsd a keresést vagy válassz egy kategóriát!"
         clear_filter: "Törlés"
         add_url: "URL hozzáadása"
         uploaded_image_list:
@@ -4769,7 +4889,8 @@ hu:
         none_selected: "A kezdéshez válasszon egy jelvényt"
         allow_title: Jelvény címként való használatának engedélyezése
         listable: Jelvény megjelenítése a nyilvános jelvények oldalon
-        enabled: Jelvény engedélyezése
+        enabled: engedélyezve
+        disabled: kikapcsolva
         icon: Ikon
         image: Kép
         select_an_icon: "Válasszon ikont"
diff --git a/config/locales/client.hy.yml b/config/locales/client.hy.yml
index 5420d02cdf7..037976d228e 100644
--- a/config/locales/client.hy.yml
+++ b/config/locales/client.hy.yml
@@ -154,8 +154,6 @@ hy:
     emails_are_disabled: "Բոլոր ելքային էլ. նամակները անջատվել են ադմինիստրատորի կողմից: Էլ. փոստով ոչ մի տեսակի ծանուցում չի ուղարկվի:"
     software_update_prompt:
       dismiss: "Չեղարկել"
-    bootstrap_mode_disabled: "Սկզբնաբեռնման(Bootstrap) ռեժիմը կանջատվի 24 ժամվա ընթացքում:"
-    bootstrap_invite_button_title: "Ուղարկել Հրավերներ"
     themes:
       default_description: "Լռելյայն"
     s3:
@@ -253,7 +251,6 @@ hy:
       title: "Էջանշել"
       clear_bookmarks: "Ջնջել Էջանշանները"
       help:
-        bookmark: "Սեղմեք՝ այս թեմայի առաջին գրառումն էջանշելու համար"
         unbookmark: "Սեղմեք՝ այս թեմայի բոլոր էջանշանները ջնջելու համար"
     bookmarks:
       create: "Ստեղծել էջանշան"
@@ -428,11 +425,9 @@ hy:
       scores:
         about: "Այս գնահատականը հաշվարկվում է՝ ելնելով զեկուցողի վստահության մակարդակից, նրանց նախորդ բողքների ճշգրտությունից և հաղորդվող գրառումի գերակայությունից:"
         score: "Միավոր"
-        date: "Ամսաթիվ"
-        type: "Տիպ"
+        type: "Պատճառ"
         status: "Ստատուս"
-        submitted_by: "Ներկայացվել է"
-        reviewed_by: "Վերանայվել է"
+        submitted_by: "Հաղորդվում է"
       statuses:
         pending:
           title: "Սպասող"
@@ -440,14 +435,12 @@ hy:
           title: "Հաստատված է"
         rejected:
           title: "Մերժված"
-        ignored:
-          title: "Անտեսված"
-        deleted:
-          title: "Ջնջված է"
         reviewed:
-          title: "(բոլորը վերանայված են)"
+          title: "Բոլորը վերանայված են"
         all:
-          title: "(բոլորը)"
+          title: "Բոլորը"
+      context_question:
+        delimiter: "կամ"
       types:
         reviewable_flagged_post:
           title: "Դրոշակավորված Գրառումներ"
@@ -646,6 +639,7 @@ hy:
         make_owner_description: "Դարձնել <b>%{username}</b>-ին այս խմբի սեփականատեր"
         remove_owner: "Զրկել սեփականատիրոջ իրավունքից"
         remove_owner_description: "Զրկել <b>%{username}</b>-ին այս խմբի սեփականատիրոջ իրավունքից"
+        status: "Ստատուս"
         owner: "Սեփականատեր"
         forbidden: "Ձեզ թույլատրված չէ դիտել դա:"
       topics: "Թեմաներ"
@@ -756,11 +750,6 @@ hy:
       profile: "Պրոֆիլ"
       mute: "Խլացնել"
       edit: "Խմբագրել Նախընտրությունները"
-      download_archive:
-        button_text: "Ներբեռնել Բոլորը"
-        confirm: "Դուք համոզվա՞ծ եք, որ ցանկանում եք ներբեռնել Ձեր գրառումները:"
-        success: "Ներբեռնումը սկսված է, Դուք կստանաք ծանուցում հաղորդագրության միջոցով, երբ գործընթացն ավարտվի:"
-        rate_limit_error: "Գրառումները կարելի է ներբեռնել միայն օրը մեկ անգամ, խնդրում ենք կրկին փորձել վաղը:"
       new_private_message: "Նոր Հաղորդագրություն"
       private_message: "Հաղորդագրություն"
       private_messages: "Հաղորդագրություններ"
@@ -894,13 +883,6 @@ hy:
       theme: "Թեմա"
       home: "Լռելյայն Գլխավոր Էջ"
       staged: "Աստիճանավորված (Staged)"
-      staff_counters:
-        flags_given: "օգտակար դրոշակավորում"
-        flagged_posts: "դրոշակավորված գրառում"
-        deleted_posts: "ջնջված գրառում"
-        suspensions: "սառեցում"
-        warnings_received: "զգուշացում"
-        rejected_posts: "մերժված հաղորդագրություներ"
       messages:
         inbox: "Մուտքերի արկղ"
         latest: "Վերջինները"
@@ -944,8 +926,6 @@ hy:
       second_factor_backup:
         regenerate: "Վերագեներացնել"
         disable: "Անջատել"
-        enable: "Միացնել"
-        enable_long: "Միացնել պահուստային կոդերը"
         copy_to_clipboard: "Կրկնօրինակել Փոխանակման Հարթակում"
         copy_to_clipboard_error: "Փոխանակման հարթակում տվյալների կրկնօրինակման սխալ"
         copied_to_clipboard: "Կրնօրինակված է Փոխանակման հարթակում"
@@ -1316,8 +1296,6 @@ hy:
       hide_forever: "ոչ, շնորհակալություն"
       intro: "Ողջույն! Կարծես թե Դուք վայելում եք քննարկումը, սակայն դեռևս հաշիվ չեք գրանցել:"
     summary:
-      enabled_description: "Դուք դիտում եք այս թեմայի ամփոփումը՝ համայնքի կողմից որոշված ամենահետաքրքիր գրառումները:"
-      enable: "Ամփոփել Այս Թեման"
       disable: "Ցուցադրել Բոլոր Գրառումները"
     deleted_filter:
       enabled_description: "Այս թեման պարունակում է հեռացված գրառումներ, որոնք թաքցվել են:"
@@ -1527,8 +1505,6 @@ hy:
         topic_template_not_modified: "Դետալները գրանցել թեմայի մեջ և խմբագրել ձևանմուշը: "
       save_edit: "Պահել Խմբագրումը"
       overwrite_edit: "Վերասահմանել Խմբագրումը"
-      reply_original: "Պատասխանել Սկզբնական Թեմային"
-      reply_here: "Պատասխանել Այստեղ"
       reply: "Պատասխանել"
       cancel: "Չեղարկել"
       create_topic: "Ստեղծել Թեմա"
@@ -1656,6 +1632,7 @@ hy:
       membership_request_accepted: "Անդամակցության հարցումը ընդունվել է՝ '%{group_name}'"
       reaction: "<span>%{username}</span> %{description}"
       reaction_2: "<span>%{username}, %{username2}</span> %{description}"
+      admin_problems: "Նոր խորհուրդ Ձեր կայքի կառավարման հարթակում"
       dismiss_confirmation:
         dismiss: "Չեղարկել"
         cancel: "Չեղարկել"
@@ -1892,8 +1869,6 @@ hy:
       options: "Թեմաների Տարբերակները"
       show_links: "ցուցադրել այս թեմայի հղումները"
       unread_indicator: "Ոչ մի անդամ դեռ չի կարդացել այս թեմայի մինչև վերջին գրառումը: "
-      jump_reply_up: ցատկել դեպի ավելի վաղ պատասխան
-      jump_reply_down: ցատկել դեպի ավելի հին պատասխան
       deleted: "Թեման ջնջվել է"
       slow_mode_update:
         enable: "Միացնել"
@@ -2343,7 +2318,6 @@ hy:
       view: "Դիտել Կատեգորիայի Թեմաները"
       general: "Ընդհանուր"
       settings: "Կարգավորումներ"
-      topic_template: "Թեմայի Ձևանմուշ"
       tags: "Թեգեր"
       tags_allowed_tags: "Սահմանափակել այս թեգերը՝ այս կատեգորիայում. "
       tags_allowed_tag_groups: "Սահմանափակել այս թեգերը՝ այս կատեգորիայում."
@@ -2390,8 +2364,6 @@ hy:
       images: "Նկարներ"
       email_in: "Անհատական մուտքային էլ. հասցե՝"
       email_in_allow_strangers: "Ընդունել էլ. նամակներ հաշիվ չունեցող անանուն օգտատերերից"
-      email_in_disabled: "Էլ. փոստի միջոցով նոր թեմաների հրապարակումը անջատված է Կայքի Կարգավորումներում: Էլ. փոստի միջոցով նոր թեմաների հրապարակումը միացնելու համար, "
-      email_in_disabled_click: 'միացրեք "email in" կարգավորումը:'
       mailinglist_mirror: "Կատեգորիան արտապատճենում է փոստային ցուցակ"
       show_subcategory_list: "Այս կատեգորիայում ցուցադրել ենթակատեգորիաների ցանկը թեմաների վերևում:"
       read_only_banner: "Բանների տեքստը, երբ օգտատերը չի կարող այս կատեգորիայում թեմա ստեղծել. "
@@ -2568,6 +2540,10 @@ hy:
     filters:
       with_topics: "%{filter} թեմա"
       with_category: "%{filter} %{category} թեմա"
+      filter:
+        title: "Ֆիլտր"
+        button:
+          label: "Ֆիլտր"
       latest:
         title: "Վերջինները"
         title_with_count:
@@ -2646,6 +2622,9 @@ hy:
       close: "Փակել (Esc)"
       content_load_error: '<a href="%url%"> Բովանդակությունը </a> հնարավոր չէ բեռնել:'
       image_load_error: '<a href="%url%"> Պատկերը </a> հնարավոր չէ բեռնել:'
+    experimental_lightbox:
+      buttons:
+        close: "Փակել (Esc)"
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ","
       shortcut_key_delimiter_plus: "+"
@@ -2731,7 +2710,6 @@ hy:
         one: "Վաստակել է այս կրծքանշանը %{count} անգամ"
         other: "Վաստակել է այս կրծքանշանը %{count} անգամ"
       granted_on: "Շնորհված է %{date}"
-      others_count: "Այս կրծքանշանով այլոք (%{count})"
       title: Կրծքանշաններ
       allow_title: "Դուք կարող եք օգտագործել այս կրծքանշանը որպես վերնագիր"
       multiple_grant: "Դուք կարող եք վաստակել սա բազմակի անգամ"
@@ -2857,10 +2835,6 @@ hy:
       dismiss: "Չեղարկել"
     safe_mode:
       enabled: "Անվտանգ ռեժիմը միացված է, փակեք բրաուզերի այս պատուհանը՝ անվտանգ ռեժիմից դուրս գալու համար:"
-    pause_notifications:
-      remaining: "%{remaining}-ը մնում է"
-      options:
-        custom: "Մասնավոր"
     trust_levels:
       names:
         newuser: "նոր օգտատեր"
@@ -2877,7 +2851,19 @@ hy:
         other: "%{count} նոր"
       more: "Ավելին"
       all_categories: "Բոլոր կատեգորիաները"
+      edit_navigation_modal_form:
+        filter_dropdown:
+          all: "Բոլորը"
       sections:
+        custom:
+          save: "Պահպանել"
+          delete: "Ջնջել"
+          links:
+            reset: "Վերականգնել լռելյայն"
+            icon:
+              label: "Պատկերակ"
+            name:
+              label: "Անվանում"
         about:
           header_link_text: "Մասին"
         messages:
@@ -2895,7 +2881,8 @@ hy:
         categories:
           header_link_text: "Կատեգորիաներ"
         community:
-          header_link_text: "Համայնք"
+          edit_section:
+            header_dropdown: "Անհատականացնել"
           links:
             about:
               content: "Մասին"
@@ -2903,8 +2890,8 @@ hy:
               content: "Ադմին"
             badges:
               content: "Կրծքանշաններ"
-            everything:
-              content: "Բոլորը"
+            topics:
+              content: "Թեմա"
             faq:
               content: "ՀՏՀ"
             groups:
@@ -2915,6 +2902,11 @@ hy:
               content: "Իմ Գրառումները"
             review:
               content: "Վերանայում"
+    form_templates:
+      errors:
+        typeMismatch:
+          default: "Խնդրում ենք մուտքագրել վավեր արժեք:"
+          email: "Խնդրում ենք մուտքագրել վավեր էլ. հասցե."
   admin_js:
     type_to_filter: "գրեք ֆիլտրելու համար..."
     admin:
@@ -3159,9 +3151,6 @@ hy:
         notification_event:
           name: "Ծանուցման Իրադարձություն"
           details: "Երբ օգտատերը ծանուցումների ժապավենին նոր էլեմենտի ավելացման մասին ծանուցում է ստանում:"
-        user_badge_event:
-          name: "Կրծքանշանի Պարգևատրման Իրադարձություն"
-          details: "Երբ օգտատերը ստանում է կրծքանշան:"
         delivery_status:
           title: "Ուղարկման Կարգավիճակը"
           inactive: "Ոչ ակտիվ"
@@ -3198,7 +3187,6 @@ hy:
         enabled: "Միացվա՞ծ է:"
         is_enabled: "Ա"
         not_enabled: "Ո"
-        change_settings: "Փոխել Կարգավորումները"
         change_settings_short: "Կարգավորումներ"
         howto: "Ինչպե՞ս կարող եմ ես տեղադրել հավելումներ:"
         official: "Պաշտոնական Հավելում"
@@ -3481,6 +3469,8 @@ hy:
           love:
             name: "սեր"
             description: "Հավանման կոճակի գույնը:"
+          selected:
+            name: "ընտրված"
         robots:
           title: "Վերասահմանեք ձեր կայքի robots.txt ֆայլը."
           warning: "Սա ընդմիշտ կվերասահմանի կայքի հետ կապված ցանկացած կարգավորում :"
@@ -3738,11 +3728,6 @@ hy:
           flag: "Դրոշակավորել"
           replace: "Փոխարինել"
           silence: "Լռեցնել"
-        action_descriptions:
-          block: "Արգելել այս բառերը պարունակող գրառումների հրապարակումը: Օգտատերը կտեսնի սխալի հաղորդագրություն, երբ փորձի կատարել գրառում:"
-          censor: "Թույլատրել այս բառերը պարունակող գրառումները, սակայն փոխարինել դրանք սիմվոլներով, որոնք կթաքցնեն գրաքննության ենթարկված բառերը:"
-          require_approval: "Այս բառերը պարունակող հրապարակումների համար կպահանջվի հաստատում անձնակազմի կողմից՝ մինչև դրանց տեսանելի դառնալը:"
-          flag: "Թույլատրել այս բառերը պարունակող գրառումները, սակայն դրոշակավորել դրանք որպես անհամապատասխան, որպեսզի մոդերատորները կարողանան վերանայել դրանք:"
         form:
           placeholder_regexp: "regular expression"
           link_placeholder: "https://example.com"
@@ -3756,6 +3741,33 @@ hy:
           description: "Մուտքագրեք տեքստը ներքևում՝ դիտված բառերի համընկնումները ստուգելու համար"
           found_matches: "Գտնված համընկնումներ՝ "
           no_matches: "Համընկնումներ չեն գտնվել"
+      form_templates:
+        nav_title: "Ձևանմուշներ"
+        list_table:
+          headings:
+            name: "Անուն"
+            actions: "Գործողություններ"
+        view_template:
+          close: "Փակել"
+          edit: "Խմբագրել"
+          delete: "Ջնջել"
+        new_template_form:
+          submit: "Պահպանել"
+          cancel: "Չեղարկել"
+          preview: "Նախադիտում"
+        quick_insert_fields:
+          add_new_field: "Ավելացնել"
+          dropdown: "Բացվող Ցուցակ"
+        validations_modal:
+          table_headers:
+            key: "Բանալի"
+            type: "Տիպը"
+            description: "Նկարագրությունը"
+          validations:
+            required:
+              key: "պարտադիր է"
+            type:
+              key: "տիպը"
       impersonate:
         title: "Նմանակել"
         help: "Օգտագործեք այս գործիքը՝ վրիպազերծման նպատակով օգտատիրոջ հաշիվը նմանակելու համար: Դուք պետք է ավարտելուց հետո դուրս գրվեք:"
@@ -3768,6 +3780,7 @@ hy:
         not_found: "Ներողություն, այդ օգտանունը գոյություն չունի մեր համակարգում:"
         id_not_found: "Ներողություն, այդ օգտատիրոջ id-ն գոյություն չունի մեր համակարգում:"
         active: "Ակտիվացված"
+        status: "Ստատուս"
         show_emails: "Ցուցադրել Էլ. հասցեները"
         hide_emails: "Թաքցնել Էլ. նամակները"
         nav:
@@ -3839,7 +3852,6 @@ hy:
         staged: "Աստիճանավորվա՞ծ"
         show_admin_profile: "Ադմին"
         show_public_profile: "Ցուցադրել Հանրային Պրոֆիլը"
-        impersonate: "Նմանակել"
         action_logs: "Գործողությունների Գրառումները"
         ip_lookup: "IP-ի Որոնում"
         log_out: "Դուրս Գրվել"
@@ -4039,6 +4051,8 @@ hy:
         recommended: "Մենք խորհուրդ ենք տալիս անհատականացնել հետևյալ տեքստը՝ Ձեր պահանջներին համապատասխանեցնելու համար՝ "
         show_overriden: "Ցուցադրել միայն վերասահմանվածները"
         more_than_50_results: "Կա 50-ից ավել արդյունք: Խնդրում ենք հստակեցնել Ձեր որոնումը:"
+        outdated:
+          dismiss: "Չեղարկել"
       settings:
         show_overriden: "Ցուցադրել միայն վերասահմանվածները"
         reset: "վերահաստատել"
@@ -4046,7 +4060,6 @@ hy:
       site_settings:
         title: "Կարգավորումներ"
         no_results: "Արդյունքներ չեն գտնվել:"
-        more_than_30_results: "Կա 30-ից ավելի արդյունք: Խնդրում ենք հստակեցնել Ձեր որոնումը կամ ընտրել կատեգորիա:"
         clear_filter: "Ջնջել"
         add_url: "ավելացնել URL"
         add_host: "ավելացնել հոսթ"
@@ -4128,7 +4141,7 @@ hy:
         allow_title: Թույլ տալ, որ կրծքանշանն օգտագործվի որպես վերնագիր
         multiple_grant: Կարող է շնորհվել բազմակի անգամ
         listable: Ցուցադրել կրծքանշանը հանրային կրծքանշանների էջում
-        enabled: Միացնել կրծքանշանը
+        disabled: անջատված
         icon: Պատկերակ
         image: Նկար
         icon_help: "Մուտքագրեք Font Awesome պատկերակի անունը (օգտագործեք 'far-' նախածանցը՝ սովորական և 'fab-' ՝ բրենդային պատկերակների համար): \n "
@@ -4189,7 +4202,6 @@ hy:
         confirm_delete: "Դուք համոզվա՞ծ եք, որ ցանկանում եք ջնջել այդ հոսթը:"
         title: "Զետեղում"
         host: "Թույլատրված Հոսթերը"
-        class_name: "Class-ի Անունը"
         edit: "խմբագրել"
         category: "Հրապարակել Կատեգորայում"
         add_host: "Ավելացնել Հոսթ"
diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml
index c790340c8f8..25c9a517ed9 100644
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@@ -116,6 +116,8 @@ id:
       facebook: "Bagikan di Facebook"
       email: "Kirim lewat email"
       url: "Salin dan bagikan URL"
+    word_connector:
+      comma: ", "
     action_codes:
       public_topic: "Membuat topik ini umum %{when}"
       open_topic: "Diubah menjadi topik ini %{when}"
@@ -127,6 +129,8 @@ id:
       removed_user: "%{who}Dikeluarkan %{when}"
       removed_group: "%{who}Dikeluarkan %{when}"
       autobumped: "Otomatis dibenturkan %{when}"
+      tags_changed: "Tag diperbarui %{when}"
+      category_changed: "Kategori diperbarui %{when}"
       autoclosed:
         enabled: "Ditutup %{when}"
         disabled: "Dibuka %{when}"
@@ -151,16 +155,13 @@ id:
       forwarded: "Meneruskan email di atas"
     topic_admin_menu: "tindakan topik"
     skip_to_main_content: "Lewati ke konten utama"
+    skip_user_nav: "Lewati ke konten profil"
     emails_are_disabled: "Semua surel yang keluar telah dinonaktifkan oleh administrator. Tidak ada pemberitahuan email yang akan dikirimkan."
     emails_are_disabled_non_staff: "Surel keluar telah dimatikan untuk pengguna yang bukan staf."
     software_update_prompt:
       message: "Kami telah memperbarui situs ini, <span>silakan refresh</span>, atau Anda mungkin mengalami perilaku yang tidak terduga."
       dismiss: "Bubar"
-    bootstrap_mode_enabled:
-      other: "Untuk lebih memudahkan peluncuran situs baru Anda, Anda berada di mode bootstrap. Semua pengguna baru akan mendapat level 1 dan mendapat ringkasan email harian diaktifkan. Hal ini akan otomatis dimatikan ketika pengguna %{count} sudah ikut."
-    bootstrap_mode_disabled: "Mode bootstrap akan dinonaktifkan dalam 24 jam."
-    bootstrap_invite_button_title: "Kirim Undangan"
-    bootstrap_wizard_link_title: "Selesaikan panduan penyiapan"
+    bootstrap_mode: "Memulai"
     themes:
       default_description: "Asal"
       broken_theme_alert: "Situs Anda mungkin tidak akan bekerja karena suatu tema/komponen memiliki masalah."
@@ -270,11 +271,11 @@ id:
       edit_bookmark: "Edit Bookmark"
       clear_bookmarks: "Bersihkan Penandaan"
       help:
-        bookmark: "Klik untuk membuat penandaan pos pertama di topik ini"
-        edit_bookmark: "Klik untuk menyunting penanda pada topik ini"
+        bookmark: "Klik untuk bookmark topik ini"
+        edit_bookmark: "Klik untuk mengedit bookmark pada post di topik ini"
         edit_bookmark_for_topic: "Klik untuk menyunting penanda pada topik ini"
         unbookmark: "Klik untuk menghapus semua penandaan di topik ini"
-        unbookmark_with_reminder: "Klik untuk menghapus semua penanda dan pengingat pada topik ini."
+        unbookmark_with_reminder: "Klik untuk menghapus semua penanda dan pengingat pada topik ini"
     bookmarks:
       created: "Anda telah menandai kiriman ini. %{name}"
       created_generic: "Anda telah menandai ini. %{name}"
@@ -318,7 +319,7 @@ id:
       new_topic: "Konsep topik baru"
       new_private_message: "Rancangan pesan pribadi baru"
       abandon:
-        confirm: "Anda memiliki rancangan yang sedang diproses untuk topik ini. Apa yang ingin Anda lakukan dengannya?"
+        confirm: "Anda sudah memiliki draf yang sedang diproses. Apa yang ingin Anda lakukan dengannya?"
         yes_value: "Batalkan"
         no_value: "Lanjut menyunting"
     topic_count_categories:
@@ -366,6 +367,8 @@ id:
         search: "Cari Pesan"
         placeholder: "ketikkan judul pesan, url atau id di sini"
     review:
+      show_more: "Tampilkan lebih banyak"
+      show_less: "Tampilkan lebih sedikit"
       order_by: "Urutkan berdasarkan"
       date_filter: "Diposting antara"
       in_reply_to: "sebagai balasan"
@@ -479,26 +482,43 @@ id:
       scores:
         about: "Skor ini dihitung berdasarkan tingkat kepercayaan pelapor, keakuratan bendera mereka sebelumnya, dan tingkat prioritas butir yang dilaporkan."
         score: "Skor"
-        date: "Tanggal"
-        type: "Tipe"
+        date: "Tanggal laporan"
+        type: "Alasan"
         status: "Status"
-        submitted_by: "Dikirim Oleh"
-        reviewed_by: "Diperiksa Oleh"
+        submitted_by: "Dilaporkan oleh"
+        reviewed_by: "Diperiksa oleh"
+        reviewed_timestamp: "Tanggal pemeriksaan"
       statuses:
         pending:
           title: "Tertunda"
         approved:
           title: "Disetujui"
+        approved_flag:
+          title: "Penanda disetujui"
+        approved_user:
+          title: "Pengguna disetujui"
+        approved_post:
+          title: "Post disetujui"
         rejected:
           title: "Ditolak"
+        rejected_flag:
+          title: "Penanda ditolak"
+        rejected_user:
+          title: "Pengguna ditolak"
+        rejected_post:
+          title: "Post ditolak"
         ignored:
-          title: "Diabaikan"
+          title: "Penandaan diabaikan"
         deleted:
-          title: "Dihapus"
+          title: "Topik atau posti dihapus"
         reviewed:
-          title: "(semua ditinjau)"
+          title: "Semua ditinjau"
         all:
-          title: "(semuanya)"
+          title: "Semuanya"
+      context_question:
+        is_this_post: "Apakah postingan ini %{reviewable_human_score_types}?"
+        delimiter: "atau"
+        something_else_wrong: "Apakah ada yang salah dengan post ini?"
       types:
         reviewable_flagged_post:
           title: "Pos yang Dipanji"
@@ -511,6 +531,8 @@ id:
           title: "Pengguna"
         reviewable_post:
           title: "Postingan"
+        reviewable_chat_message:
+          title: "Pesan obrolan yang ditandai"
       approval:
         title: "Pesan Membutuhkan Persetujuan"
         description: "Kami telah menerima posting baru Anda, tetapi diperlukan persetujuan dari moderator sebelum posting tersebut tampil. Mohon kesabarannya. Terima kasih!"
@@ -762,6 +784,7 @@ id:
         make_all_primary: "Jadikan Semua Utama"
         remove_all_primary: "Hapus sebagai Utama"
         remove_all_primary_description: "Hapus grup ini sebagai utama"
+        status: "Status"
         owner: "Pemilik"
         primary: "Utama"
         forbidden: "Anda tidak diizinkan melihat anggota."
@@ -873,8 +896,12 @@ id:
       mute: "Redam"
       edit: "Ubah Preferensi"
       download_archive:
-        button_text: "Unduh Semua"
-        confirm: "Anda yakin ingin mengunduh pos-pos Anda?"
+        title: "Ekspor data Anda"
+        description: "Unduh arsip aktivitas dan preferensi akun Anda."
+        button_text: "Permintaan arsip"
+        confirm: "Apakah Anda benar-benar ingin mengunduh arsip aktivitas dan preferensi akun Anda?"
+        success: "Kami telah mulai mengumpulkan arsip Anda, Anda akan menerima pesan saat proses selesai."
+        rate_limit_error: "Arsip akun dapat diunduh sekali per hari, silakan coba lagi besok."
       new_private_message: "Pesan Baru"
       private_message: "pesan"
       private_messages: "Messages"
@@ -921,6 +948,7 @@ id:
           warning: "Yakin ingin menghapus topik unggulan Anda?"
       use_current_timezone: "Gunakan Zona Waktu Saat Ini"
       profile_hidden: "Profil publik pengguna ini disembunyikan."
+      inactive_user: "Pengguna ini sudah tidak aktif lagi."
       expand_profile: "Perluas"
       collapse_profile: "Persempit"
       sr_collapse_profile: "Ciutkan detail profil"
@@ -963,9 +991,10 @@ id:
       experimental_sidebar:
         enable: "Aktifkan bilah sisi"
         options: "Pilihan"
-        categories_section: "Bagian Kategori"
-        tags_section: "Bagian Tag"
         navigation_section: "Navigasi"
+        navigation_section_instruction: "Saat daftar topik di menu navigasi memiliki item baru atau belum dibaca…"
+        link_to_filtered_list_checkbox_description: "Tautkan ke daftar yang difilter"
+        show_count_new_items_checkbox_description: "Menampilkan jumlah item baru"
       change: "ubah"
       featured_topic: "Topik Unggulan"
       moderator: "%{user} adalah moderator"
@@ -995,6 +1024,7 @@ id:
       watched_first_post_categories_instructions: "Anda akan diberitahu tentang pos pertama di setiap topik baru dalam kategori ini."
       watched_first_post_tags: "Sedang Melihat Pos Pertama"
       watched_first_post_tags_instructions: "Anda akan diberitahu tentang tulisan pertama di setiap topik baru dengan label ini."
+      watched_precedence_over_muted: "Beri tahu saya tentang topik dalam kategori atau tag yang saya ikuti yang juga termasuk dalam kategori yang telah saya nonaktifkan"
       muted_categories: "Diredam"
       muted_categories_instructions: "Anda tidak akan diberitahu tentang topik baru dalam kategori ini, dan tidak akan muncul di kategori atau halaman terbaru."
       muted_categories_instructions_dont_hide: "Anda tidak akan diberitahu tentang topik baru dalam kategori ini."
@@ -1018,10 +1048,18 @@ id:
       theme: "Tema"
       home: "Halaman Utama"
       staff_counters:
-        flagged_posts: "tulisan yang dipanji"
-        deleted_posts: "menghapus posting"
-        suspensions: "penangguhan"
-        warnings_received: "peringatan"
+        flags_given:
+          other: '<span class="%{className}">%{count}</span> penanda yang membantu'
+        flagged_posts:
+          other: '<span class="%{className}">%{count}</span> post yang ditandai'
+        deleted_posts:
+          other: '<span class="%{className}">%{count}</span> post dihapus'
+        suspensions:
+          other: '<span class="%{className}">%{count}</span> penangguhan'
+        warnings_received:
+          other: '<span class="%{className}">%{count}</span> peringatan'
+        rejected_posts:
+          other: '<span class="%{className}">%{count}</span> post ditolak'
       messages:
         inbox: "Kotak Masuk"
         latest: "Terbaru"
@@ -1047,6 +1085,7 @@ id:
         tags: "Label"
         interface: "Antarmuka"
         apps: "Aplikasi"
+        navigation_menu: "Menu Navigasi"
       change_password:
         success: "(surel terkirim)"
         in_progress: "(mengirimkan surel)"
@@ -1057,7 +1096,11 @@ id:
         choose: "Pilih kata sandi"
       second_factor_backup:
         disable: "Nonaktifkan"
-        enable: "Aktifkan"
+        enable: "Buat kode cadangan"
+        enable_long: "Tambah kode cadangan"
+        not_enabled: "Anda belum membuat kode cadangan apa pun."
+        manage:
+          other: "Anda memiliki sisa <strong>%{count}</strong> kode cadangan."
         use: "Gunakan kode cadangan"
         codes:
           title: "Kode Cadangan Dibuat"
@@ -1087,6 +1130,7 @@ id:
         taken: "Maaf, alamat surel tersebut tidak tersedia."
         error: "Ada kesalahan dalam merubah alamat email Anda. Alamat ini telah digunakan oleh pengguna lain?"
         success: "Kami telah mengirimkan surel kepada alamat itu. Silahkan mengikuti petunjuk konfirmasi didalamnya."
+        back_to_preferences: "Kembali ke preferensi"
       change_avatar:
         title: "Ganti gambar profil anda"
         uploaded_avatar: "Gambar kustom"
@@ -1292,6 +1336,12 @@ id:
         the_topic: "Topik"
     user_status:
       save: "Simpan"
+    user_tips:
+      button: "Mengerti!"
+      admin_guide:
+        title: "Selamat datang di situs baru Anda!"
+        content: "Baca panduan admin untuk terus membangun situs dan komunitas Anda."
+        button: "Ayo berangkat!"
     loading: "Diproses..."
     errors:
       reasons:
@@ -1329,11 +1379,27 @@ id:
     signup_cta:
       sign_up: "Mendaftar"
       hide_forever: "tidak, terima kasih"
+    offline_indicator:
+      no_internet: "Tidak ada koneksi internet."
+      refresh_page: "Segarkan halaman"
     summary:
+      in_progress: "Meringkas topik menggunakan AI..."
+      summarized_on: "Dirangkum dengan AI pada %{date}"
+      model_used: "AI yang digunakan: %{model}"
+      outdated: "Ringkasan sudah usang"
+      outdated_posts:
+        other: "(%{count} post hilang)"
+      enabled_description: "Anda sedang melihat balasan teratas topik ini: post yang paling menarik seperti yang ditentukan oleh komunitas."
       description:
         other: "Terdapat <b>%{count}</b> balasan."
-      enable: "Rangkum Topik Ini"
+      buttons:
+        hide: "Sembunyikan ringkasan"
+        generate: "Meringkas dengan AI"
+        regenerate: "Buat ulang ringkasan"
+      enable: "Tampilkan balasan teratas"
       disable: "Tampilkan Semua Postingan"
+      short_label: "Balasan teratas"
+      short_title: "Tampilkan balasan teratas topik ini: post paling menarik seperti yang ditentukan oleh komunitas"
     deleted_filter:
       enable: "Sembunyikan Tulisan Terhapus"
       disable: "Tunjukkan Tulisan yang Dihapus"
@@ -1460,8 +1526,6 @@ id:
         tags_missing:
           other: "Anda harus memilih setidaknya %{count} label"
       save_edit: "Simpah Ubahan"
-      reply_original: "Balas pada Topik Asal"
-      reply_here: "Balas Disini"
       reply: "Balas"
       cancel: "Batal"
       create_topic: "Buat Topik"
@@ -1514,6 +1578,7 @@ id:
         shared_draft:
           label: "Konsep Bersama"
       ignore: "Abaikan"
+      toggle_image_grid: Beralih kisi gambar
     notifications:
       tooltip:
         message:
@@ -1526,6 +1591,7 @@ id:
         other: "menyukai %{count} dari tulisan Anda"
       invitee_accepted: "<span>%{username}</span> menerima undangan Anda"
       granted_badge: "Mendapatkan &#39;%{description}&#39;"
+      admin_problems: "Saran baru di dasbor situs Anda"
       dismiss_confirmation:
         dismiss: "Bubar"
         cancel: "Batal"
@@ -1578,11 +1644,20 @@ id:
       bulk:
         select_all: "Pilih Semua"
         dismiss: "Bubar"
+        dismiss_new_modal:
+          title: "Abaikan yang baru"
+          topics: "Abaikan topik baru"
+          posts: "Abaikan post baru"
+          untrack: "Berhenti melacak topik ini agar tidak lagi muncul di daftar baru saya"
         move_messages_to_inbox: "Pindah ke Kotak Masuk"
         notification_level: "Pemberitahuan..."
         choose_new_tags: "Silahkan pilih tag baru untuk topik-topik ini:"
       none:
         new: "Anda tidak memiliki topik baru"
+        filter: "Tidak ada topik."
+        educate:
+          unread: "<p>Topik Anda yang belum dibaca muncul di sini.</p><p>Secara bawaan, topik dianggap belum dibaca dan akan menampilkan jumlah yang belum dibaca <span class=\"badge unread-posts badge-notification\">1</span> jika Anda:</p><ul><li>Membuat topik</li><li>Membalas topik</li><li>Membaca topik lebih dari 5 menit</li></ul><p>Atau jika Anda secara eksplisit atur topik ke Dilacak atau Diikuti melalui \U0001F514 di setiap topik.</p><p>Kunjungi <a href=\"%{userPrefsUrl}\">preferensi </a> Anda untuk mengubahnya.</p>"
+          new_new: "<p>Topik baru Anda akan muncul di sini, dan topik Anda yang belum dibaca juga akan ditampilkan. Secara bawaan, topik dianggap baru dan akan menampilkan indikator <span class=\"badge new-topic badge-notification\" style=\"vertical-align:middle;line-height:inherit;\"></span> jika dibuat dalam 2 hari terakhir. Topik yang belum dibaca akan menampilkan jumlah yang belum dibaca <span class=\"badge unread-posts badge-notification\">1</span> jika Anda: membuat topik, membalas topik, membaca topik selama lebih dari 5 menit, atau jika Anda secara eksplisit menyetel topik ke Dilacak atau Diikuti melalui \U0001F514 di setiap topik.</p><p>Kunjungi <a href=\"%{userPrefsUrl}\">preferensi</a> Anda untuk mengubahnya.</p>"
       bottom:
         new: "Tidak ada topik baru lagi"
     topic:
@@ -1607,7 +1682,7 @@ id:
       back_to_list: "Kembali ke Daftar Topik"
       options: "Opsi Topik"
       show_links: "tampilkan pranala dalam topik ini"
-      jump_reply_up: lompat ke balasan sebelumnya
+      participant_groups: "Kelompok peserta"
       slow_mode_update:
         enable: "Aktifkan"
         remove: "Nonaktifkan"
@@ -1665,6 +1740,8 @@ id:
         action: "pindahkan sebagai topik baru"
         radio_label: "Topik Baru"
         error: "Ada kesalahan dalam memindahkan posting sebagai topik baru"
+      merge_topic:
+        chronological_order: "mempertahankan urutan kronologis setelah penggabungan"
       move_to_new_message:
         radio_label: "Pesan Baru"
       publish_page:
@@ -1699,6 +1776,8 @@ id:
             name: "Hapus penanda"
           edit_bookmark:
             name: "Sunting penanda"
+      filtered_replies:
+        viewing_summary: "Melihat balasan teratas topik ini"
     category:
       all: "Semua kategori"
       edit: "Ubah"
@@ -1771,6 +1850,10 @@ id:
     filters:
       with_topics: "%{filter} topik"
       with_category: "%{filter} %{category} topik"
+      filter:
+        title: "Filter"
+        button:
+          label: "Filter"
       latest:
         title: "Terbaru"
       read:
@@ -1798,6 +1881,20 @@ id:
     preloader_text: "Memuat"
     lightbox:
       download: "unduh"
+    experimental_lightbox:
+      image_load_error: "Gambar tidak dapat dimuat."
+      screen_reader_image_title: "Gambar %{current} dari %{total}: %{title}"
+      buttons:
+        next: "Berikutnya (Tombol panah kanan atau bawah)"
+        previous: "Sebelumnya (Tombol panah kiri atau atas)"
+        close: "Tutup (Esc)"
+        download: "Unduh gambar"
+        newtab: "Buka gambar di tab baru"
+        zoom: "Memperbesar/memperkecil gambar (tombol Z)"
+        rotate: "Putar gambar (tombol R)"
+        fullscreen: "Alihkan mode layar penuh browser (tombol M)"
+        carousel: "Menampilkan semua gambar dalam carousel (tombol A)"
+        retry: "Coba muat ulang gambar"
     keyboard_shortcuts_help:
       jump_to:
         new: "%{shortcut} Baru"
@@ -1810,6 +1907,8 @@ id:
       actions:
         title: "Aksi"
     badges:
+      others_count:
+        other: "Diberi kepada orang lain %{count} kali"
       more_badges:
         other: "+%{count} lainnya"
       none: "(kosong)"
@@ -1863,7 +1962,36 @@ id:
         other: "%{count} baru"
       more: "Selengkapnya"
       all_categories: "Semua kategori"
+      categories_form_modal:
+        title: "Edit navigasi kategori"
+        subtitle:
+          text: "dan kami akan menampilkan kategori paling populer dari situs ini secara otomatis"
+        filter_placeholder: "Kategori filter"
+        no_categories: "Tidak ada kategori yang cocok dengan istilah yang diberikan."
+      tags_form_modal:
+        title: "Edit navigasi tag"
+        filter_placeholder: "Filter tag"
+        no_tags: "Tidak ada tag yang cocok dengan istilah yang diberikan."
+        subtitle:
+          text: "dan kami akan menampilkan tag teratas situs ini secara otomatis"
+      edit_navigation_modal_form:
+        deselect_button_text: "Batalkan pilihan semua"
+        reset_to_defaults: "Setel ulang ke bawaan"
+        filter_dropdown:
+          all: "Semua"
+          selected: "Dipilih"
+          unselected: "Tidak dipilih"
       sections:
+        custom:
+          save: "Simpan"
+          delete: "Hapus"
+          reset_confirm: "Yakin ingin menyetel ulang bagian ini ke bawaan?"
+          always_public: "Konten di bagian ini selalu bersifat publik"
+          more_menu: "Lebih banyak menu"
+          links:
+            reset: "Setel ulang ke bawaan"
+            name:
+              label: "Name"
         about:
           header_link_text: "Tentang"
         messages:
@@ -1880,13 +2008,17 @@ id:
         categories:
           header_link_text: "Kategori"
         community:
+          edit_section:
+            sidebar: "Sesuaikan bagian ini"
+            header_dropdown: "Sesuaikan"
           links:
             about:
               content: "Tentang"
             admin:
               content: "Admin"
-            everything:
-              content: "Semuanya"
+            topics:
+              content: "Topik"
+              title: "Semua topik"
             faq:
               content: "FAQ"
             groups:
@@ -1895,7 +2027,34 @@ id:
               content: "Pengguna"
             review:
               content: "Ulasan"
+        global_section: "Bagian global, dapat dilihat oleh semua orang"
     until: "Sampai:"
+    form_template_chooser:
+      select_template: "Pilih templat formulir"
+    form_templates:
+      errors:
+        valueMissing:
+          default: "Harap isi kolom ini."
+          text: "Harap isi kolom ini."
+          select-one: "Harap pilih item dalam daftar."
+          select-multiple: "Pilih setidaknya satu item dalam daftar."
+          checkbox: "Harap centang kotak ini jika Anda ingin melanjutkan."
+        typeMismatch:
+          default: "Harap masukkan nilai yang valid."
+          color: "Harap masukkan warna."
+          date: "Harap masukkan tanggal."
+          email: "Harap masukkan alamat email yang valid."
+          number: "Harap masukkan nomor."
+          password: "Harap masukkan sandi dengan benar."
+          tel: "Harap masukkan nomor telepon yang valid."
+          text: "Harap masukkan nilai teks."
+          url: "Harap masukkan URL yang valid."
+        tooShort: "Input harus %{minLength} karakter atau lebih."
+        tooLong: "Input harus kurang dari %{maxLength} karakter."
+        rangeOverflow: "Masukan harus kurang dari %{max}."
+        rangeUnderflow: "Masukan harus lebih dari %{min}."
+        patternMismatch: "Harap sesuaikan dengan format yang diminta."
+        badInput: "Harap masukkan masukan yang valid."
   admin_js:
     type_to_filter: "ketik untuk memfilter..."
     admin:
@@ -1956,10 +2115,15 @@ id:
         continue: Lanjutkan
         scopes:
           action: Aksi
+          descriptions:
+            posts:
+              list: Daftar post terbaru dan post pribadi. RSS juga didukung.
       web_hooks:
         edit: "Ubah"
         save: "Simpan"
         active: "Aktif"
+        user_badge_event:
+          details: "Ketika badge diberikan atau dicabut."
         delivery_status:
           failed: "Gagal"
           disabled: "Dinonaktifkan"
@@ -2069,6 +2233,7 @@ id:
           modal_title: "Detil"
           deleted: "Tidak ada nilai baru. Catatan telah dihapus."
           actions:
+            update_directory_columns: "perbarui kolom direktori"
             post_approved: "tulisan disetujui"
         screened_emails:
           email: "Alamat Email"
@@ -2087,10 +2252,39 @@ id:
           add: "Menambahkan"
         test:
           no_matches: "Tidak ditemukan yang cocok"
+      form_templates:
+        list_table:
+          headings:
+            name: "Nama"
+            actions: "Aksi"
+        view_template:
+          close: "Tutup"
+          edit: "Ubah"
+          delete: "Hapus"
+        new_template_form:
+          submit: "Simpan"
+          cancel: "Batal"
+        quick_insert_fields:
+          add_new_field: "Menambahkan"
+        validations_modal:
+          table_headers:
+            type: "Tipe"
+          validations:
+            minimum:
+              description: "Untuk bidang teks, tentukan jumlah minimum karakter yang diperbolehkan."
+            maximum:
+              description: "Untuk bidang teks, tentukan jumlah maksimum karakter yang diperbolehkan."
+            pattern:
+              description: "Untuk bidang teks, ekspresi reguler menentukan input yang diizinkan."
+            type:
+              key: "tipe"
+              type: "string"
+              description: "Untuk bidang input, Anda dapat menentukan jenis masukan yang diharapkan (teks|email|tanggal|nomor|url|tel|warna)"
       users:
         title: "Pengguna"
         last_emailed: "Terakhir Surel Dikirimkan"
         not_found: "Maaf, username tersebut tidak ada ditemukan."
+        status: "Status"
         nav:
           new: "Baru"
           active: "Aktif"
@@ -2155,11 +2349,21 @@ id:
         options: "Pilihan"
       site_text:
         edit: "ubah"
+        show_outdated: "Hanya tampilkan yang usang/tidak valid"
+        interpolation_keys: "Kunci interpolasi yang tersedia:"
+        outdated:
+          title: "Terjemahan ini sudah usang"
+          description: "Terjemahan bawaan untuk kunci ini telah berubah sejak penggantian ini dibuat. Periksa di bawah apakah terjemahan Anda cocok dengan perubahan apa pun yang telah dibuat pada maksud aslinya."
+          old_default: "Bawaan lama"
+          new_default: "Bawaan baru"
+          dismiss: "Bubar"
       settings:
         reset: "reset"
         none: "Tak ada"
       site_settings:
         title: "Pengaturan"
+        more_site_setting_results:
+          other: "Ada lebih dari %{count} hasil. Silakan persempit pencarian Anda atau pilih kategori."
         clear_filter: "Bersihkan"
         uploaded_image_list:
           upload:
@@ -2185,6 +2389,7 @@ id:
         revoke: Cabut
         reason: Alasan
         expand: Perluas &hellip;
+        disabled: dinonaktifkan
       emoji:
         uploading: "Mengunggah..."
         name: "Nama"
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index e2451705184..f89414b8870 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -144,6 +144,8 @@ it:
       facebook: "Condividi su Facebook"
       email: "Invia per email"
       url: "Copia e condividi l'URL"
+    word_connector:
+      comma: ", "
     action_codes:
       public_topic: "Ha reso questo argomento pubblico il %{when}"
       open_topic: "Ha convertito questo contenuto in un argomento il %{when}"
@@ -155,6 +157,8 @@ it:
       removed_user: "Ha rimosso %{who} %{when}"
       removed_group: "Ha rimosso %{who} %{when}"
       autobumped: "Riproposto automaticamente %{when}"
+      tags_changed: "Etichette aggiornate il %{when}"
+      category_changed: "Categoria aggiornata il %{when}"
       autoclosed:
         enabled: "Chiuso %{when}"
         disabled: "Aperto %{when}"
@@ -179,17 +183,13 @@ it:
       forwarded: "Ha inoltrato l'email sopra"
     topic_admin_menu: "azioni argomento"
     skip_to_main_content: "Passa al contenuto principale"
+    skip_user_nav: "Passa al contenuto del profilo"
     emails_are_disabled: "Tutte le e-mail in uscita sono state disabilitate a livello globale da un amministratore. Non sarà inviato nessun tipo di notifica via e-mail."
     emails_are_disabled_non_staff: "La posta in uscita è stata disattivata per gli utenti al di fuori dello staff."
     software_update_prompt:
       message: "Abbiamo aggiornato il sito, <span>si prega di aggiornare</span> o potrebbe verificarsi un comportamento imprevisto."
       dismiss: "Ignora"
-    bootstrap_mode_enabled:
-      one: "Per rendere più facile il lancio del nuovo sito, sei in modalità bootstrap. A tutti i nuovi utenti verrà concesso il livello di attendibilità 1 e verranno attivate le email di riepilogo giornaliere. Questa modalità verrà disattivata automaticamente quando %{count} utente si sarà unito."
-      other: "Per rendere più facile il lancio del nuovo sito, sei in modalità bootstrap. A tutti i nuovi utenti verrà concesso il livello di attendibilità 1 e verranno attivate le email di riepilogo giornaliere. Questa modalità verrà disattivata automaticamente quando %{count} utenti si saranno uniti."
-    bootstrap_mode_disabled: "La modalità bootstrap sarà disattivata entro 24 ore."
-    bootstrap_invite_button_title: "Manda Inviti"
-    bootstrap_wizard_link_title: "Completa la configurazione guidata"
+    bootstrap_mode: "Per iniziare"
     themes:
       default_description: "Predefinito"
       broken_theme_alert: "Il sito potrebbe non funzionare a causa di errori in un tema / componente."
@@ -302,11 +302,11 @@ it:
       edit_bookmark: "Modifica Segnalibro"
       clear_bookmarks: "Cancella Segnalibri"
       help:
-        bookmark: "Clicca per aggiungere un segnalibro al primo messaggio di questo argomento"
-        edit_bookmark: "Clicca per modificare il segnalibro a questo argomento"
+        bookmark: "Clicca per memorizzare il segnalibro a questo argomento"
+        edit_bookmark: "Clicca per modificare il segnalibro di un messaggio in questo argomento"
         edit_bookmark_for_topic: "Fai clic per modificare il segnalibro per quest'argomento"
         unbookmark: "Clicca per rimuovere tutti i segnalibri a questo argomento"
-        unbookmark_with_reminder: "Clicca per rimuovere tutti i segnalibri e i promemoria a questo argomento."
+        unbookmark_with_reminder: "Clicca per rimuovere tutti i segnalibri e i promemoria a questo argomento"
     bookmarks:
       created: "Hai aggiunto questo messaggio ai segnalibri %{name}"
       created_generic: "L'hai aggiunto ai segnalibri. %{name}"
@@ -350,7 +350,7 @@ it:
       new_topic: "Nuovo argomento in bozza"
       new_private_message: "Nuovo messaggio personale in bozza"
       abandon:
-        confirm: "Hai una bozza in corso per questo argomento. Cosa vorresti fare?"
+        confirm: "Hai gia una bozza in corso. Cosa vorresti fare?"
         yes_value: "Elimina"
         no_value: "Riprendi la modifica"
     topic_count_categories:
@@ -403,6 +403,8 @@ it:
         search: "Cerca un messaggio"
         placeholder: "digita qui il titolo del messaggio, l'URL o l'id"
     review:
+      show_more: "Mostra altro"
+      show_less: "Mostra meno"
       order_by: "Ordina per"
       date_filter: "Pubblicazione tra"
       in_reply_to: "in risposta a"
@@ -523,26 +525,43 @@ it:
       scores:
         about: "Questo punteggio è calcolato sulla base del Livello di attendibilità dell'autore della segnalazione, dell'accuratezza delle precedenti segnalazioni e della priorità dell'elemento segnalato."
         score: "Punteggio"
-        date: "Data"
-        type: "Tipo"
+        date: "Data report"
+        type: "Motivo"
         status: "Stato"
-        submitted_by: "Inviato da"
+        submitted_by: "Segnalato da"
         reviewed_by: "Rivisto da"
+        reviewed_timestamp: "Data di revisione"
       statuses:
         pending:
           title: "In attesa"
         approved:
           title: "Approvato"
+        approved_flag:
+          title: "Segnalazione approvata"
+        approved_user:
+          title: "Utente approvato"
+        approved_post:
+          title: "Messaggio approvato"
         rejected:
           title: "Rifiutato"
+        rejected_flag:
+          title: "Segnalazione rifiutata"
+        rejected_user:
+          title: "Utente rifiutato"
+        rejected_post:
+          title: "Messaggio respinto"
         ignored:
-          title: "Ignorato"
+          title: "Segnalazione ignorata"
         deleted:
-          title: "Eliminato"
+          title: "Argomento o messaggio eliminato"
         reviewed:
-          title: "(tutti i revisionati)"
+          title: "Tutti i revisionati"
         all:
-          title: "(tutto)"
+          title: "Tutti"
+      context_question:
+        is_this_post: "questo messaggio è %{reviewable_human_score_types}?"
+        delimiter: "o"
+        something_else_wrong: "Cosa non va in questo messaggio?"
       types:
         reviewable_flagged_post:
           title: "Messaggio segnalato"
@@ -849,6 +868,7 @@ it:
         make_all_primary_description: "Rendi questo il gruppo principale per tutti gli utenti selezionati"
         remove_all_primary: "Rimuovi dai primari"
         remove_all_primary_description: "Rimuovi questo gruppo dai primari"
+        status: "Stato"
         owner: "Proprietario"
         primary: "Primario"
         forbidden: "Non puoi visualizzare i membri."
@@ -976,11 +996,6 @@ it:
       profile: "Profilo"
       mute: "Silenzia"
       edit: "Modifica opzioni"
-      download_archive:
-        button_text: "Scarica Tutto"
-        confirm: "Vuoi scaricare i tuoi messaggi?"
-        success: "Esportazione iniziata, verrai avvertito con un messaggio al termine del processo."
-        rate_limit_error: "I messaggi possono essere scaricati una volta al giorno, riprova domani."
       new_private_message: "Nuovo Messaggio"
       private_message: "Messaggio"
       private_messages: "Messaggi"
@@ -1052,7 +1067,7 @@ it:
         perm_denied_expl: "Hai negato il permesso per le notifiche. Autorizza le notifiche tramite le impostazioni del tuo browser."
         disable: "Disabilita Notifiche"
         enable: "Abilita Notifiche"
-        each_browser_note: 'Nota: devi modificare questa impostazione su ogni browser che utilizzi. Tutte le notifiche verranno disabilitate quando le notifiche sono messe in pausa nel menu utente, indipendentemente da questa impostazione.'
+        each_browser_note: "Nota: devi modificare questa impostazione su ogni browser che utilizzi. Tutte le notifiche verranno disabilitate quando le notifiche sono messe in pausa nel menu utente, indipendentemente da questa impostazione."
         consent_prompt: "Desideri ricevere notifiche in tempo reale quando qualcuno risponde a un tuo messaggio?"
       dismiss: "Ignora"
       dismiss_notifications: "Ignora tutti"
@@ -1103,14 +1118,7 @@ it:
       experimental_sidebar:
         enable: "Abilita barra laterale"
         options: "Opzioni"
-        categories_section: "Sezione Categorie"
-        categories_section_instruction: "Le categorie selezionate saranno visualizzate nella sezione Categorie della barra laterale."
-        tags_section: "Sezione etichette"
-        tags_section_instruction: "Le etichette selezionate appariranno nella sezione Etichette della barra laterale."
         navigation_section: "Navigazione"
-        list_destination_instruction: "Quando ci sono nuovi contenuti nella barra laterale..."
-        list_destination_default: "usa il link predefinito e mostra un distintivo per i nuovi elementi"
-        list_destination_unread_new: "collega a elementi non letti/nuovi e mostra un contatore dei nuovi elementi"
       change: "cambia"
       featured_topic: "Argomento in primo piano"
       moderator: "%{user} è un moderatore"
@@ -1180,13 +1188,6 @@ it:
       save_to_change_theme: 'Il tema verrà aggiornato dopo aver cliccato su "%{save_text}"'
       home: "Home Page Predefinita"
       staged: "Temporaneo"
-      staff_counters:
-        flags_given: "segnalazioni utili"
-        flagged_posts: "messaggi segnalati"
-        deleted_posts: "messaggi cancellati"
-        suspensions: "sospensioni"
-        warnings_received: "avvisi"
-        rejected_posts: "messaggi rifiutati"
       messages:
         all: "tutti i messaggi in arrivo"
         inbox: "In arrivo"
@@ -1279,7 +1280,6 @@ it:
         tags: "Etichette"
         interface: "Interfaccia"
         apps: "App"
-        sidebar: "Barra laterale"
       change_password:
         success: "(email inviata)"
         in_progress: "(invio email in corso)"
@@ -1293,11 +1293,9 @@ it:
         title: "Codice di backup per l'autenticazione a due fattori"
         regenerate: "Rigenera"
         disable: "Disabilita"
-        enable: "Abilita"
-        enable_long: "Abilita codici di backup"
         manage:
-          one: "Gestisci i codici di backup. Ti è rimasto <strong>%{count}</strong> codice di backup."
-          other: "Gestisci i codici di backup. Ti sono rimasti <strong>%{count}</strong> codici di backup."
+          one: "Ti è rimasto <strong>%{count}</strong> codice di backup."
+          other: "Ti sono rimasti <strong>%{count}</strong> codici di backup."
         copy_to_clipboard: "Copia negli Appunti"
         copy_to_clipboard_error: "Errore durante la copia negli appunti"
         copied_to_clipboard: "Copiato negli Appunti"
@@ -1735,8 +1733,7 @@ it:
       pause_notifications: "Metti in pausa le notifiche"
       remove_status: "Rimuovi lo stato"
     user_tips:
-      primary: "Fatto!"
-      secondary: "non mostrarmi questi suggerimenti"
+      button: "Ho capito!"
       first_notification:
         title: "La tua prima notifica!"
         content: "Le notifiche vengono utilizzate per tenerti aggiornato su ciò che sta accadendo nella community."
@@ -1752,6 +1749,8 @@ it:
       suggested_topics:
         title: "Continua a leggere!"
         content: "Ecco alcuni argomenti che riteniamo gradiresti leggere in seguito."
+      admin_guide:
+        button: "Andiamo!"
     loading: " Caricamento..."
     errors:
       prev_page: "durante il caricamento"
@@ -1786,24 +1785,6 @@ it:
       logout_disabled: "La disconnessione è disabilitata quando il sito è in modalità di sola lettura."
     staff_writes_only_mode:
       enabled: "Questo sito è in modalità di sola lettura per lo staff. Puoi continuare a navigare nel sito, ma le risposte, i \"Mi piace\" e altre azioni sono limitate ai soli membri dello staff."
-    too_few_topics_and_posts_notice_MF: |
-      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">Cominciamo la discussione!</a> { currentTopics, plural,
-          one {C'è <strong>#</strong> argomento}
-        other {Ci sono <strong>#</strong> argomenti}
-      } e { currentPosts, plural,
-          one {<strong>#</strong> messaggio}
-        other {<strong>#</strong> messaggi}
-      }. I visitatori hanno bisogno di altri contenuti per leggere e rispondere: consigliamo almeno { requiredTopics, plural,
-          one {<strong>#</strong> argomento}
-        other {<strong>#</strong> argomenti}
-      } e { requiredPosts, plural,
-          one {<strong>#</strong> messaggio}
-        other {<strong>#</strong> messaggi}
-      }. Solo lo staff può vedere questo messaggio.
-    too_few_topics_notice_MF: |
-      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">Cominciamo la discussione!</a> { currentTopics, plural, one {C'è <strong>#</strong> argomento} other {Ci sono<strong>#</strong> argomenti}}. I visitatori hanno bisogno di altri contenuti per leggere e rispondere: consigliamo almeno { requiredTopics, plural, one {<strong>#</strong> argomento} other {<strong>#</strong> argomenti}}. Solo lo staff può vedere questo messaggio.
-    too_few_posts_notice_MF: |
-      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">Cominciamo la discussione!</a> { currentPosts, plural, one {C'è <strong>#</strong> messaggio} other {Ci sono <strong>#</strong> messaggi}}. I visitatori hanno bisogno di altri contenuti per leggere e rispondere: consigliamo almeno { requiredPosts, plural, one {<strong>#</strong> messaggio} other {<strong>#</strong> messaggi}}. Solo lo staff può vedere questo messaggio.
     logs_error_rate_notice:
       reached_hour_MF: |
         <b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# errore/ora} other {# errori/ore}}</a> ha raggiunto il limite di {limit, plural, one {# errore/ora} other {# errori/ora}} impostato dal sito.
@@ -1834,16 +1815,24 @@ it:
       intro: "Ciao! Sembra che la discussione ti interessi, ma non hai ancora registrato un account."
       value_prop: "Non ti piace dover scorrere gli stessi messaggi? Quando crei un account, riprenderai sempre dall'ultimo messaggio letto. Potrai anche ricevere notifiche di nuove risposte, salvare segnalibri e usare i \"mi piace\" per ringraziare gli altri. Possiamo lavorare tutti insieme per rendere questa community un posto fantastico. :heart:"
     summary:
-      enabled_description: "Stai visualizzando un riepilogo dell'argomento: è la comunità a determinare quali sono i messaggi più interessanti."
+      in_progress: "Riepilogo dell'argomento utilizzando l'AI in corso..."
+      outdated: "Il riepilogo è obsoleto"
+      outdated_posts:
+        one: "(%{count} messaggio mancante)"
+        other: "(%{count} messaggi mancanti)"
+      enabled_description: "Stai visualizzando le risposte principali di questo argomento: i post più interessanti secondo quanto stabilito dalla community."
       description:
         one: "C'è <b>%{count}</b> risposta."
         other: "Ci sono <b>%{count}</b> risposte."
+      buttons:
+        hide: "Nascondi il riepilogo"
+        generate: "Riassumi con l'intelligenza artificiale"
+        regenerate: "Rigenera riepilogo"
       description_time_MF: |
         {replyCount, plural, one {C'è <b>#</b> risposta} other {Ci sono <b>#</b> risposte}} con un tempo di lettura stimato di <b>{readingTime, plural, one {# minuto} other {# minuti}}</b>.
-      enable: "Riassumi Questo Argomento"
       disable: "Mostra Tutti i Messaggi"
-      short_label: "Riassumi"
-      short_title: "Mostra un riassunto di questo argomento: i messaggi più interessanti secondo la community"
+      short_label: "Migliori risposte"
+      short_title: "Mostra le risposte principali di questo argomento: i post più interessanti secondo quanto stabilito dalla community"
     deleted_filter:
       enabled_description: "Questo argomento contiene messaggi eliminati, che sono quindi nascosti."
       disabled_description: "I messaggi eliminati di questo argomento sono ora visibili."
@@ -2142,8 +2131,6 @@ it:
         topic_template_not_modified: "Aggiungi dettagli e specificità al tuo argomento modificando il modello di argomento."
       save_edit: "Salva Modifiche"
       overwrite_edit: "Sovrascrivi modifica"
-      reply_original: "Rispondi all'Argomento Originale"
-      reply_here: "Rispondi Qui"
       reply: "Rispondi"
       cancel: "Annulla"
       create_topic: "Crea Argomento"
@@ -2308,6 +2295,7 @@ it:
       reaction_2: "<span>%{username}, %{username2}</span> %{description}"
       votes_released: "%{description} - completato"
       new_features: "Nuove funzionalità disponibili!"
+      admin_problems: "Nuovo avviso sul dashboard del tuo sito"
       dismiss_confirmation:
         body:
           default:
@@ -2612,7 +2600,7 @@ it:
         top: "Non ci sono argomenti popolari."
         educate:
           new: '<p>I tuoi nuovi argomenti appariranno qui. Per impostazione predefinita, gli argomenti sono considerati nuovi e mostreranno un <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span>indicatore se sono stati creati negli ultimi 2 giorni.</p><p>Visita le tue <a href="%{userPrefsUrl}">preferenze</a> per cambiare questa opzione.</p>'
-          unread: "<p>I tuoi argomenti non letti appaiono qui.</p><p>Per impostazione predefinita, gli argomenti sono considerati non letti e mostreranno un contatore <span class=\"badge unread-posts badge-notification\">1</span> se :</p><ul><li>Hai creato l'argomento</li><li>Hai risposto all'argomento</li><li>Hai letto l'argomento per più di 4 minuti</li></ul><p>Oppure se hai esplicitamente impostato l'argomento come Seguito o in Osservazione attivando \U0001F514 in ogni argomento.</p><p>Visita le tue <a href=\"%{userPrefsUrl}\">preferenze</a> per cambiare queste impostazioni.</p>"
+          unread: "<p>I tuoi argomenti non letti appaiono qui.</p><p>Per impostazione predefinita, gli argomenti sono considerati non letti e mostreranno un contatore <span class=\"badge unread-posts badge-notification\">1</span> se :</p><ul><li>Hai creato l'argomento</li><li>Hai risposto all'argomento</li><li>Hai letto l'argomento per più di 5 minuti</li></ul><p>Oppure se hai esplicitamente impostato l'argomento come Seguito o in Osservazione attivando \U0001F514 in ogni argomento.</p><p>Visita le tue <a href=\"%{userPrefsUrl}\">preferenze</a> per cambiare queste impostazioni.</p>"
       bottom:
         latest: "Non ci sono altri argomenti più recenti."
         posted: "Non ci sono altri argomenti pubblicati."
@@ -2715,8 +2703,6 @@ it:
       browse_all_categories_latest_or_top: "<a href='%{basePath}/categories'>Sfoglia tutte le categorie</a>, <a href='%{basePath}/latest'>visualizza gli argomenti più recenti</a> oppure guarda dall'inizio:"
       browse_all_tags_or_latest: "<a href='%{basePath}/tags'>Sfoglia tutte le etichette</a> o <a href='%{basePath}/latest'>visualizza gli argomenti più recenti</a>."
       suggest_create_topic: Pronto per <a href>iniziare una nuova conversazione?</a>
-      jump_reply_up: passa a una risposta precedente
-      jump_reply_down: passa a una risposta successiva
       deleted: "L'argomento è stato eliminato"
       slow_mode_update:
         title: "Modalità lenta"
@@ -3081,9 +3067,6 @@ it:
       collapse: "comprimi"
       sr_collapse_replies: "Comprimi risposte incorporate"
       sr_date: "Data di pubblicazione"
-      sr_expand_replies:
-        one: "Questo messaggio ha %{count} risposta. Clicca per espandere"
-        other: "Questo messaggio ha %{count} risposte. Clicca per espandere"
       expand_collapse: "espandi/comprimi"
       sr_below_embedded_posts_description: "risposte al messaggio n°%{post_number}"
       sr_embedded_reply_description: "risposta di @%{username} al messaggio n°%{post_number}"
@@ -3295,7 +3278,7 @@ it:
       filtered_replies:
         viewing_posts_by: "Visualizzazione di %{post_count} messaggi di"
         viewing_subset: "Alcune risposte sono compresse"
-        viewing_summary: "Visualizza un riepilogo di questo argomento"
+        viewing_summary: "Leggendo le risposte principali di questo argomento"
         post_number: "%{username}, messaggio n. %{post_number}"
         show_all: "Mostra tutto"
       share:
@@ -3312,7 +3295,6 @@ it:
       back: "Torna alla categoria"
       general: "Generale"
       settings: "Impostazioni"
-      topic_template: "Modello di Argomento"
       tags: "Etichette"
       tags_allowed_tags: "Limita queste Etichette a questa Categoria:"
       tags_allowed_tag_groups: "Limita questi gruppi di Etichette a questa Categoria:"
@@ -3371,8 +3353,6 @@ it:
       email_in: "Indirizzo email personalizzato:"
       email_in_tooltip: "Puoi separare più indirizzi e-mail con il carattere |."
       email_in_allow_strangers: "Accetta email da utenti anonimi senza alcun account"
-      email_in_disabled: "Le Impostazioni Sito non permettono di creare nuovi argomenti via email. Per abilitare la creazione di argomenti via email,"
-      email_in_disabled_click: 'abilita l''impostazione "email in".'
       mailinglist_mirror: "La categoria si comporta come una mailing list"
       show_subcategory_list: "Mostra la lista delle sottocategorie sopra agli argomenti in questa categoria."
       read_only_banner: "Testo dell'annuncio quando un utente non può creare un argomento in questa categoria:"
@@ -3580,6 +3560,10 @@ it:
     filters:
       with_topics: "%{filter} argomenti"
       with_category: "%{filter} %{category} argomenti"
+      filter:
+        title: "Filtro"
+        button:
+          label: "Filtro"
       latest:
         title: "Recenti"
         title_with_count:
@@ -3650,7 +3634,6 @@ it:
         this_week: "Settimana"
         today: "Oggi"
     browser_update: 'Purtroppo, <a href="https://www.discourse.org/faq/#browser">il tuo browser non è supportato</a>. Per visualizzare i contenuti multimediali, <a href="https://browsehappy.com">passa a un browser supportato</a>, accedi e rispondi.'
-    safari_13_warning: Questo sito a breve non supporterà più iOS e Safari nelle versioni 13 e precedenti. Rimarrà disponibile una versione semplificata a sola lettura. (<a href="https://meta.discourse.org/t/224747">Altre informazioni</a>)
     permission_types:
       full: "Crea / Rispondi / Visualizza"
       create_post: "Rispondi / Visualizza"
@@ -3665,6 +3648,20 @@ it:
       close: "Chiudi (Esc)"
       content_load_error: 'Caricamento <a href="%url%">del contenuto</a> non riuscito.'
       image_load_error: 'Caricamento <a href="%url%">dell''immagine</a> non riuscito.'
+    experimental_lightbox:
+      image_load_error: "Caricamento dell'immagine non riuscito."
+      screen_reader_image_title: "Immagine %{current} di %{total}: %{title}"
+      buttons:
+        next: "Successivo (tasto freccia destra o giù)"
+        previous: "Precedente (tasto freccia sinistra o freccia su)"
+        close: "Chiudi (Esc)"
+        download: "Scarica l'immagine"
+        newtab: "Apri l'immagine in una nuova scheda"
+        zoom: "Zoom immagine in/out (tasto Z)"
+        rotate: "Ruota immagine (tasto R)"
+        fullscreen: "Attiva/Disattiva modalità a schermo intero del browser (tasto M)"
+        carousel: "Visualizza tutte le immagini in un carosello (tasto A)"
+        retry: "Riprova a caricare l'immagine"
     cannot_render_video: Questo video non può essere visualizzato perché il tuo browser non supporta il codec.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
@@ -3757,7 +3754,6 @@ it:
         one: "Ha guadagnato questo distintivo %{count} volta"
         other: "Ha guadagnato questo distintivo %{count} volte"
       granted_on: "Assegnato il %{date}"
-      others_count: "Altri utenti con questo distintivo (%{count})"
       title: Distintivi
       allow_title: "Puoi usare questo distintivo come titolo"
       multiple_grant: "Puoi guadagnarlo più volte"
@@ -3940,13 +3936,11 @@ it:
     pause_notifications:
       title: "Metti in pausa le notifiche per..."
       label: "Metti in pausa le notifiche"
-      remaining: "%{remaining} rimanenti"
       options:
         half_hour: "30 minuti"
         one_hour: "1 ora"
         two_hours: "2 ore"
         tomorrow: "Fino a domani"
-        custom: "Personalizzato"
       set_schedule: "Imposta una pianificazione delle notifiche"
     trust_levels:
       names:
@@ -3995,7 +3989,32 @@ it:
       more: "Altro"
       all_categories: "Tutte le categorie"
       all_tags: "Tutte le etichette"
+      categories_form_modal:
+        title: "Modifica la navigazione delle categorie"
+        subtitle:
+          text: "e mostreremo automaticamente le categorie più popolari di questo sito"
+        filter_placeholder: "Filtra le categorie"
+        no_categories: "Non ci sono categorie corrispondenti al termine specificato."
+      edit_navigation_modal_form:
+        deselect_button_text: "Deseleziona tutto"
+        reset_to_defaults: "Ripristina le impostazioni predefinite"
+        filter_dropdown:
+          all: "Tutte"
+          selected: "Selezionato"
+          unselected: "Deselezionato"
       sections:
+        custom:
+          save: "Salva"
+          delete: "Elimina"
+          always_public: "Il contenuto di questa sezione è sempre pubblico"
+          links:
+            reset: "Ripristina impostazioni predefinite"
+            icon:
+              label: "Icona"
+            name:
+              label: "Nome"
+            value:
+              label: "Link"
         about:
           header_link_text: "Informazioni"
         messages:
@@ -4010,28 +4029,20 @@ it:
             unread_with_count: "Non letti (%{count})"
             archive: "Archiviati"
         tags:
-          links:
-            add_tags:
-              content: "Aggiungi etichette"
-              title: "Non hai aggiunto alcuna etichetta. Fai clic per iniziare."
           none: "Non hai aggiunto nessuna etichetta."
           click_to_get_started: "Clicca qui per iniziare."
           header_link_text: "Etichette"
           header_action_title: "Modifica le etichette nella barra laterale"
           configure_defaults: "Configura impostazioni predefinite"
         categories:
-          links:
-            add_categories:
-              content: "Aggiungi categorie"
-              title: "Non hai aggiunto alcuna categoria. Fai clic per iniziare."
           none: "Non hai aggiunto nessuna categoria."
           click_to_get_started: "Clicca qui per iniziare."
           header_link_text: "Categorie"
           header_action_title: "Modifica le categorie nella barra laterale"
           configure_defaults: "Configura impostazioni predefinite"
         community:
-          header_link_text: "Community"
-          header_action_title: "Crea un argomento"
+          edit_section:
+            header_dropdown: "Personalizza"
           links:
             about:
               content: "Informazioni"
@@ -4042,8 +4053,8 @@ it:
             badges:
               content: "Distintivi"
               title: "Tutti i distintivi disponibili"
-            everything:
-              content: "Tutti"
+            topics:
+              content: "Argomenti"
               title: "Tutti gli argomenti"
             faq:
               content: "FAQ"
@@ -4070,6 +4081,30 @@ it:
       description: "Il tuo argomento di benvenuto è la prima cosa che leggeranno i nuovi membri. Consideralo come un \"discorso fatto in ascensore\" o una \"dichiarazione di intenti\". Fai sapere a tutti a chi si rivolge questa community, cosa possono aspettarsi di trovare qui e cosa vorresti che facessero prima."
       button_title: "Inizia a modificare"
     until: "Fino a:"
+    form_templates:
+      errors:
+        valueMissing:
+          default: "Per favore compila questo campo."
+          text: "Per favore compila questo campo."
+          select-one: "Per favore seleziona un elemento nella lista."
+          select-multiple: "Per favore selezione almeno un elemento nella lista."
+          checkbox: "Per favore seleziona questa casella se vuoi procedere."
+        typeMismatch:
+          default: "Per favore inserisci un valore valido."
+          color: "Inserisci un colore."
+          date: "Per favore inserisci una data."
+          email: "Inserisci un indirizzo email valido."
+          number: "Per favore inserisci un numero."
+          password: "Per favore inserisci una password valida."
+          tel: "Per favore inserisci un numero di telefono valido."
+          text: "Per favore inserisci un valore testuale."
+          url: "Per favore, inserisci un URL valido."
+        tooShort: "L'input deve contenere almeno %{minLength} caratteri."
+        tooLong: "L'input deve contenere meno di %{maxLength} caratteri."
+        rangeOverflow: "L'input deve essere minore di %{max}."
+        rangeUnderflow: "L'input deve essere maggiore di %{min}."
+        patternMismatch: "Per favore, rispetta il formato richiesto."
+        badInput: "Per favore, inserisci un input valido."
   admin_js:
     type_to_filter: "digita per filtrare..."
     admin:
@@ -4228,10 +4263,6 @@ it:
         about: "Modifica qui la tua appartenenza ai gruppi e i loro nomi"
         group_members: "Membri del gruppo"
         delete: "Cancella"
-        delete_confirm: "Vuoi davvero cancellare questo gruppo?"
-        delete_with_messages_confirm:
-          one: "La cancellazione di questo gruppo farà diventare orfano %{count} messaggio e i membri del gruppo non potranno più accedervi."
-          other: "La cancellazione di questo gruppo farà diventare orfani %{count} messaggi e i membri del gruppo non potranno più accedervi."
         delete_failed: "Impossibile cancellare il gruppo. Se questo è un gruppo automatico, non può essere eliminato."
         delete_automatic_group: Questo è un gruppo automatico e non può essere eliminato.
         delete_owner_confirm: "Rimuovere i privilegi per '%{username}'?"
@@ -4297,7 +4328,6 @@ it:
             topics:
               read: Leggi un argomento o un messaggio specifico in esso. È supportato anche RSS.
               write: Crea un nuovo argomento o pubblica un messaggio su uno esistente.
-              update: Aggiorna un argomento. Modifica il titolo, la categoria, le etichette, ecc.
               read_lists: Leggi liste di argomenti come Popolari, Nuovi, Recenti, ecc. E' supportato anche l'RSS.
             posts:
               edit: Modifica qualsiasi messaggio o uno specifico.
@@ -4394,9 +4424,6 @@ it:
         user_promoted_event:
           name: "Evento promosso dall'utente"
           details: "Quando un utente viene promosso da un livello di attendibilità a un altro."
-        user_badge_event:
-          name: "Evento Assegnazione Distintivo"
-          details: "Quando un utente riceve un distintivo."
         group_user_event:
           name: "Evento Utente in un gruppo"
           details: "Quando un utente viene aggiunto o rimosso da un gruppo."
@@ -4439,7 +4466,6 @@ it:
         enabled: "Abilitato?"
         is_enabled: "S"
         not_enabled: "N"
-        change_settings: "Cambia Impostazioni"
         change_settings_short: "Impostazioni"
         howto: "Come installo i plugin?"
         official: "Plugin Ufficiale"
@@ -4771,6 +4797,8 @@ it:
           love:
             name: "Mi piace"
             description: "Il colore del pulsante \"Mi piace\"."
+          selected:
+            name: "selezionato"
         robots:
           title: "Sostituisci il file robots.txt del tuo sito:"
           warning: "Questo sostituirà in modo permanente tutte le impostazioni relative al sito."
@@ -5055,14 +5083,8 @@ it:
           silence: "Silenzia"
           link: "Link"
         action_descriptions:
-          block: "Impedisci che i messaggi contenenti queste parole siano pubblicati. L'utente visualizzerà un messaggio di errore quando cercherà di pubblicare il messaggio."
-          censor: "Consenti i messaggi contenenti queste parole, ma sostituiscile con caratteri che nascondono le parole censurate."
-          require_approval: "I messaggi contenenti queste parole richiederanno l'approvazione dello staff prima di poter essere visualizzati."
-          flag: "Consenti i messaggi contenenti queste parole, ma segnalale come inappropriate in modo che i moderatori possano revisionarle."
-          replace: "Sostituisci le parole nei messaggi con altre parole"
-          tag: "Etichetta automaticamente gli argomenti in base al primo messaggio"
-          silence: "I primi post degli utenti che contengono queste parole richiederanno l'approvazione dello staff prima di essere visibili, e l'utente verrà automaticamente silenziato."
-          link: "Nei messaggi sostituisce le parole con link"
+          replace: "Sostituisci le parole nei messaggi con altre parole."
+          link: "Nei messaggi sostituisce le parole con link."
         form:
           label: "Ha una parola o frase"
           placeholder: "Inserisci parola o frase (* è un carattere jolly)"
@@ -5085,6 +5107,37 @@ it:
           description: "Inserisci il testo qui sotto per verificare la corrispondenza con le parole osservate"
           found_matches: "Trovate corrispondenze:"
           no_matches: "Nessun risultato trovato"
+      form_templates:
+        nav_title: "Modelli"
+        list_table:
+          headings:
+            name: "Nome"
+            actions: "Azioni"
+        view_template:
+          close: "Chiudi"
+          edit: "Modifica"
+          delete: "Cancella"
+        new_template_form:
+          submit: "Salva"
+          cancel: "Annulla"
+          preview: "Anteprima"
+        quick_insert_fields:
+          add_new_field: "Aggiungi"
+          dropdown: "A discesa"
+        validations_modal:
+          table_headers:
+            key: "Chiave"
+            type: "Tipo"
+            description: "Descrizione"
+          validations:
+            required:
+              key: "obbligatorio"
+            minimum:
+              key: "minimo"
+            maximum:
+              key: "massimo"
+            type:
+              key: "tipo"
       impersonate:
         title: "Impersona utente"
         help: "Usa questo strumento per impersonare un account utente ai fini del debugging. Una volta finito dovrai disconnetterti."
@@ -5097,6 +5150,7 @@ it:
         not_found: "Spiacenti, questo nome utente non esiste nel sistema."
         id_not_found: "Spiacenti, nel nostro sistema non esiste questo id utente."
         active: "Attivati"
+        status: "Stato"
         show_emails: "Mostra email"
         hide_emails: "Nascondi email"
         nav:
@@ -5185,7 +5239,6 @@ it:
         show_admin_profile: "Amministratore"
         manage_user: "Gestisci utente"
         show_public_profile: "Mostra Profilo Pubblico"
-        impersonate: "Impersona utente"
         action_logs: "Log Azioni"
         ip_lookup: "Ricerca IP"
         log_out: "Disconnetti"
@@ -5421,8 +5474,11 @@ it:
         go_back: "Torna alla Ricerca"
         recommended: "Consigliamo di personalizzare il seguente testo per adattarlo alle tue necessità:"
         show_overriden: "Mostra solo le opzioni sovrascritte"
+        show_outdated: "Mostra solo obsoleti/non validi"
         locale: "Lingua:"
         more_than_50_results: "Ci sono più di 50 risultati. Restringi i criteri di ricerca."
+        outdated:
+          dismiss: "Ignora"
       settings:
         show_overriden: "Mostra solo le opzioni sovrascritte"
         history: "Visualizza la cronologia delle modifiche"
@@ -5435,7 +5491,6 @@ it:
             label: "Aggiungi Emoji"
         title: "Impostazioni"
         no_results: "Nessun risultato trovato."
-        more_than_30_results: "Ci sono più di 30 risultati. Restringi i criteri di ricerca o seleziona una categoria."
         clear_filter: "Pulisci"
         add_url: "aggiungi URL"
         add_host: "aggiungi host"
@@ -5522,7 +5577,8 @@ it:
         allow_title: Permetti di utilizzare un distintivo come titolo
         multiple_grant: Può essere assegnato più volte
         listable: Mostra distintivo sulla pagina pubblica dei distintivi
-        enabled: Attiva distintivo
+        enabled: abilitato
+        disabled: disabilitata
         icon: Icona
         image: Immagine
         graphic: Grafico
@@ -5592,10 +5648,8 @@ it:
       embedding:
         get_started: "Se lo desideri, puoi incorporare Discourse in un altro sito web. Comincia aggiungendo il nome dell'host."
         confirm_delete: "Sicuro di voler cancellare questo host?"
-        sample: "Incolla il seguente codice HTML nel tuo sito per creare e incorporare argomenti Discourse. Sostituire <b>REPLACE_ME</b> con l'URL canonico della pagina su cui stai eseguendo l'operazione."
         title: "Integrato"
         host: "Host Abilitati"
-        class_name: "Nome Classe"
         allowed_paths: "Lista percorsi permessi"
         edit: "modifica"
         category: "Pubblica nella Categoria"
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index 87348306611..04de185b92b 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -156,11 +156,6 @@ ja:
     software_update_prompt:
       message: "このサイトを更新したので、<span>再読み込みしてください</span>。再読み込みしない場合、予期しない動作が発生する可能性があります。"
       dismiss: "閉じる"
-    bootstrap_mode_enabled:
-      other: "新しいサイトを簡単に立ち上げられるように、ブートストラップモードになっています。すべての新規ユーザーの信頼レベルは 1 となり、要約メールを毎日受け取るように設定されています。この設定は %{count} 名のユーザーが参加すると自動的に無効になります。"
-    bootstrap_mode_disabled: "ブートストラップモードは 24 時間以内に無効になります。"
-    bootstrap_invite_button_title: "招待を送信"
-    bootstrap_wizard_link_title: "セットアップウィザードの終了"
     themes:
       default_description: "デフォルト"
       broken_theme_alert: "テーマ/コンポーネントにエラーがあるため、サイトが動作しない可能性があります。"
@@ -270,11 +265,8 @@ ja:
       edit_bookmark: "ブックマークを編集"
       clear_bookmarks: "ブックマークをクリア"
       help:
-        bookmark: "クリックしてこのトピックの最初の投稿をブックマークします"
-        edit_bookmark: "クリックしてこのトピックのブックマークを編集します"
         edit_bookmark_for_topic: "クリックしてこのトピックのブックマークを編集します"
         unbookmark: "クリックしてこのトピック内のすべてのブックマークを削除します"
-        unbookmark_with_reminder: "クリックしてこのトピック内のすべてのブックマークとリマインダーを削除します。"
     bookmarks:
       created: "この投稿をブックマークしました。%{name}"
       created_generic: "これをブックマークしました。%{name}"
@@ -318,7 +310,6 @@ ja:
       new_topic: "新しいトピックの下書き"
       new_private_message: "新しい個人メッセージの下書き"
       abandon:
-        confirm: "このトピックの作成中の下書きがあります。どうしますか？"
         yes_value: "破棄"
         no_value: "編集を再開"
     topic_count_categories:
@@ -479,11 +470,9 @@ ja:
       scores:
         about: "このスコアは、報告者の信頼レベル、以前のフラグの正確性、および報告されている項目の優先度に基づいて計算されます。"
         score: "スコア"
-        date: "日付"
-        type: "タイプ"
+        type: "理由"
         status: "ステータス"
-        submitted_by: "送信者:"
-        reviewed_by: "レビュー者:"
+        submitted_by: "報告者:"
       statuses:
         pending:
           title: "保留中"
@@ -491,14 +480,12 @@ ja:
           title: "承認済み"
         rejected:
           title: "却下"
-        ignored:
-          title: "無視"
-        deleted:
-          title: "削除済み"
         reviewed:
-          title: "(すべてレビュー済み)"
+          title: "すべてレビュー済み"
         all:
-          title: "(全ステータス)"
+          title: "すべて"
+      context_question:
+        delimiter: "または"
       types:
         reviewable_flagged_post:
           title: "通報された投稿"
@@ -797,6 +784,7 @@ ja:
         make_all_primary_description: "これを選択したすべてのユーザーのプライマリーグループにします"
         remove_all_primary: "プライマリーとして削除"
         remove_all_primary_description: "このグループをプライマリーとして削除します"
+        status: "ステータス"
         owner: "オーナー"
         primary: "プライマリー"
         forbidden: "メンバーの表示は許可されていません。"
@@ -919,11 +907,6 @@ ja:
       profile: "プロファイル"
       mute: "ミュート"
       edit: "プロファイルを編集"
-      download_archive:
-        button_text: "すべてダウンロード"
-        confirm: "投稿をダウンロードしてもよろしいですか？"
-        success: "ダウンロードが始まりました。処理が完了するとメッセージで通知されます。"
-        rate_limit_error: "投稿のダウンロードは 1 日に 1 回のみ可能です。明日再度お試しください。"
       new_private_message: "新規メッセージ"
       private_message: "メッセージ"
       private_messages: "メッセージ"
@@ -995,7 +978,7 @@ ja:
         perm_denied_expl: "通知へのアクセスが拒否されました。ブラウザの設定から通知を許可してください。"
         disable: "通知を無効にする"
         enable: "通知を有効にする"
-        each_browser_note: '注意: 使用するすべてのブラウザでこの設定を変更する必要があります。ユーザーメニューから通知を一時停止にした場合、この設定に関係なくすべての通知が無効になります。'
+        each_browser_note: "注意: 使用するすべてのブラウザでこの設定を変更する必要があります。ユーザーメニューから通知を一時停止にした場合、この設定に関係なくすべての通知が無効になります。"
         consent_prompt: "あなたの投稿に返信があったときライブ通知しますか？"
       dismiss: "閉じる"
       dismiss_notifications: "すべて閉じる"
@@ -1046,14 +1029,7 @@ ja:
       experimental_sidebar:
         enable: "サイドバーを有効にする"
         options: "オプション"
-        categories_section: "カテゴリセクション"
-        categories_section_instruction: "選択されたカテゴリは、サイドバーのカテゴリセクションに表示されます。"
-        tags_section: "タグセクション"
-        tags_section_instruction: "選択されたタグは、サイドバーのタグセクションに表示されます。"
         navigation_section: "ナビゲーション"
-        list_destination_instruction: "サイドバーに新しいコンテンツがある場合..."
-        list_destination_default: "デフォルトのリンクを使用して新しい項目のバッジを表示する"
-        list_destination_unread_new: "未読/新規にリンクし、新しい項目の件数を表示する"
       change: "変更"
       featured_topic: "注目のトピック"
       moderator: "%{user} はモデレーターです"
@@ -1123,13 +1099,6 @@ ja:
       save_to_change_theme: '「%{save_text}」をクリックするとテーマが更新されます'
       home: "デフォルトのホームページ"
       staged: "ステージング"
-      staff_counters:
-        flags_given: "役に立った通報"
-        flagged_posts: "通報された投稿"
-        deleted_posts: "削除された投稿"
-        suspensions: "凍結"
-        warnings_received: "警告"
-        rejected_posts: "拒否された投稿"
       messages:
         all: "すべての受信トレイ"
         inbox: "受信トレイ"
@@ -1212,7 +1181,6 @@ ja:
         tags: "タグ"
         interface: "表示設定"
         apps: "アプリ連携"
-        sidebar: "サイドバー"
       change_password:
         success: "(メール送信済み)"
         in_progress: "(メール送信中)"
@@ -1226,10 +1194,8 @@ ja:
         title: "二要素認証のバックアップコード"
         regenerate: "再生成"
         disable: "無効化"
-        enable: "有効化"
-        enable_long: "バックアップコードを有効にする"
         manage:
-          other: "バックアップコードを管理してください。 <strong>%{count}</strong> 個のバックアップコードが残っています。"
+          other: "<strong>%{count}</strong> 個のバックアップコードが残っています。"
         copy_to_clipboard: "クリップボードにコピー"
         copy_to_clipboard_error: "データをクリップボードにコピーする際にエラーが発生しました"
         copied_to_clipboard: "クリップボードにコピーしました"
@@ -1656,8 +1622,7 @@ ja:
       pause_notifications: "通知を停止する"
       remove_status: "ステータスを削除する"
     user_tips:
-      primary: "了解！"
-      secondary: "これらのヒントを表示しない"
+      button: "了解！"
       first_notification:
         title: "はじめての通知です！"
         content: "通知は、コミュニティーで起きていることに関する最新情報を提供するために使用されます。"
@@ -1707,28 +1672,6 @@ ja:
       logout_disabled: "閲覧専用モードのため、ログアウトできません。"
     staff_writes_only_mode:
       enabled: "このサイトはスタッフ専用モードになっています。このまま閲覧できますが、返信や「いいね！」、その他の操作はスタッフメンバーのみに制限されています。"
-    too_few_topics_and_posts_notice_MF: |
-      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">ディスカッションを始めましょう！</a>現在、{ currentTopics, plural,
-          other {<strong>#</strong> 件のトピック}
-      }と{ currentPosts, plural,
-          other {<strong>#</strong> 件の投稿}
-      }があります。訪問者が読んで返信するトピックと投稿がもっと必要です。少なくとも { requiredTopics, plural,
-          other {<strong>#</strong> 件のトピック}
-      }と { requiredPosts, plural,
-          other {<strong>#</strong> 件の投稿}
-      }を用意することをお勧めします。このメッセージはスタッフのみに表示されます。
-    too_few_topics_notice_MF: |
-      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">ディスカッションを始めましょう！</a>現在、{ currentTopics, plural,
-          other {<strong>#</strong> 件のトピック}
-      }があります。訪問者が読んで返信できるトピックがもっと必要です。少なくとも { requiredTopics, plural,
-          other {<strong>#</strong> 件のトピック}
-      }を用意することをお勧めします。このメッセージはスタッフのみに表示されます。
-    too_few_posts_notice_MF: |
-      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">ディスカッションを始めましょう！</a>現在、{ currentPosts, plural,
-          other {<strong>#</strong> 件の投稿}
-      }があります。訪問者が読んで返信できる投稿がもっと必要です。少なくとも { requiredPosts, plural,
-          other {<strong>#</strong> 件の投稿}
-      }を用意することをお勧めします。このメッセージはスタッフのみに表示されます。
     logs_error_rate_notice:
       reached_hour_MF: |
         <b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, other {1 時間当たりのエラー件数 (#)}}</a> がサイトで設定されている{limit, plural, other {エラー件数 (#)}} の制限に達しました。
@@ -1758,15 +1701,11 @@ ja:
       intro: "こんにちは！ ディスカッションを楽しんでいるようですね。ですが、アカウント登録はまだのようです。"
       value_prop: "同じ投稿をスクロールするのにうんざりしていませんか？アカウントを作成すると、中断した場所にいつでも戻ることができます。アカウントを使うと、新しい返信の通知を受け取ったり、ブックマークを保存したり、「いいね！」を使って感謝の気持ちを伝えたりすることも可能です。このコミュニティーを一緒に盛り上げていきましょう。:heart:"
     summary:
-      enabled_description: "このトピックの要約を閲覧しています。コミュニティーが最も面白いとした投稿のまとめです。"
       description:
         other: "<b>%{count}</b> 件の返信があります。"
       description_time_MF: |
         {replyCount, plural, other {<b>#</b> 件の返信}}があります。読了目安時間は <b>{readingTime, plural, other {# 分}}</b>です。
-      enable: "このトピックを要約する"
       disable: "すべての投稿を表示"
-      short_label: "要約"
-      short_title: "このトピックの要約を表示: コミュニティーが最も面白いと判断した投稿"
     deleted_filter:
       enabled_description: "削除された投稿は非表示になっています。"
       disabled_description: "削除された投稿は表示されています。"
@@ -2051,8 +1990,6 @@ ja:
         topic_template_not_modified: "トピックテンプレートを編集して、トピックに詳細を追加してください。"
       save_edit: "編集内容を保存"
       overwrite_edit: "上書き編集"
-      reply_original: "オリジナルトピックへ返信"
-      reply_here: "ここに返信"
       reply: "返信"
       cancel: "キャンセル"
       create_topic: "トピックを作成"
@@ -2208,6 +2145,7 @@ ja:
       reaction_2: "<span>%{username}、%{username2}</span> %{description}"
       votes_released: "%{description} - 完了"
       new_features: "新機能が公開されました！"
+      admin_problems: "サイトダッシュボードに関する新しいアドバイス"
       dismiss_confirmation:
         body:
           default:
@@ -2493,7 +2431,7 @@ ja:
         top: "人気のトピックはありません。"
         educate:
           new: '<p>新しいトピックがここに表示されます。デフォルトでは、2 日以内に作成されたトピックは新しいトピックとみなされ、<span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span> が表示されます。</p><p>この設定はユーザー<a href="%{userPrefsUrl}">設定</a>で変更できます。</p>'
-          unread: "<p>新しいトピックがここに表示されます。</p><p>デフォルトでは次の場合にトピックは未読とされ未読数 <span class=\"badge unread-posts badge-notification\">1</span> が表示されます。</p><ul><li>トピックを作成した場合</li><li>トピックに返信した場合</li><li>トピックを 4 分以上閲覧した場合</li></ul><p>または各トピックの \U0001F514 を通じて明示的にトピックを「追跡」または「ウォッチ中」に設定した場合</p><p>これを変更するには、<a href=\"%{userPrefsUrl}\">設定</a>にアクセスしてください。</p>"
+          unread: "<p>新しいトピックがここに表示されます。</p><p>デフォルトでは次の場合にトピックは未読とされ未読数 <span class=\"badge unread-posts badge-notification\">1</span> が表示されます。</p><ul><li>トピックを作成した場合</li><li>トピックに返信した場合</li><li>トピックを 5 分以上閲覧した場合</li></ul><p>または各トピックの \U0001F514 を通じて明示的にトピックを「追跡」または「ウォッチ中」に設定した場合</p><p>これを変更するには、<a href=\"%{userPrefsUrl}\">設定</a>にアクセスしてください。</p>"
       bottom:
         latest: "最新のトピックは以上です。"
         posted: "投稿のあるトピックは以上です。"
@@ -2587,8 +2525,6 @@ ja:
       browse_all_categories_latest_or_top: "<a href='%{basePath}/categories'>すべてのカテゴリを閲覧</a>するか、<a href='%{basePath}/latest'>最新のトピックを表示</a>するか、トップを見ます。"
       browse_all_tags_or_latest: "<a href='%{basePath}/tags'>すべてのタグを閲覧</a>するか<a href='%{basePath}/latest'>最新のトピックを表示</a>します。"
       suggest_create_topic: <a href>新しい会話を開始しますか？</a>
-      jump_reply_up: 以前の返信へジャンプ
-      jump_reply_down: 以後の返信へジャンプ
       deleted: "トピックは削除されました"
       slow_mode_update:
         title: "低速モード"
@@ -2938,8 +2874,6 @@ ja:
       collapse: "折りたたむ"
       sr_collapse_replies: "埋め込まれた返信を折りたたむ"
       sr_date: "投稿日"
-      sr_expand_replies:
-        other: "この投稿には %{count} 件の返信があります。クリックして展開"
       expand_collapse: "展開/折りたたむ"
       sr_below_embedded_posts_description: "投稿 #%{post_number} の返信"
       sr_embedded_reply_description: "投稿 #%{post_number} に対する @%{username} からの返信"
@@ -3133,7 +3067,6 @@ ja:
       filtered_replies:
         viewing_posts_by: "次の投稿者の %{post_count} 件の投稿を閲覧中"
         viewing_subset: "一部の返信は折りたたまれています"
-        viewing_summary: "このトピックの要約を表示中"
         post_number: "%{username}、投稿 #%{post_number}"
         show_all: "すべて表示"
       share:
@@ -3150,7 +3083,6 @@ ja:
       back: "カテゴリに戻る"
       general: "一般"
       settings: "設定"
-      topic_template: "トピックテンプレート"
       tags: "タグ"
       tags_allowed_tags: "これらのタグをこのカテゴリに制限する:"
       tags_allowed_tag_groups: "これらのタググループをこのカテゴリに制限する:"
@@ -3209,8 +3141,6 @@ ja:
       email_in: "カスタム受信メールアドレス:"
       email_in_tooltip: "複数のメールアドレスは「|」文字で区切ることができます。"
       email_in_allow_strangers: "登録されていない匿名のユーザーからのメールを受け取る"
-      email_in_disabled: "メールによる新しいトピックの投稿は、サイトの設定で無効になっています。メールによる新しいトピックの投稿を有効にするには、 "
-      email_in_disabled_click: '"email in" 設定を有効にする。'
       mailinglist_mirror: "カテゴリはメーリングリストを反映"
       show_subcategory_list: "このカテゴリのトピックの上にサブカテゴリのリストを表示します。"
       read_only_banner: "ユーザーがこのカテゴリにトピックを作成できない場合のバナーテキスト:"
@@ -3409,6 +3339,10 @@ ja:
     filters:
       with_topics: "%{filter} トピック"
       with_category: "%{filter} %{category} トピック"
+      filter:
+        title: "フィルタ"
+        button:
+          label: "フィルタ"
       latest:
         title: "最新"
         title_with_count:
@@ -3473,7 +3407,6 @@ ja:
         this_week: "今週"
         today: "今日"
     browser_update: '残念ながら、<a href="https://www.discourse.org/faq/#browser">あなたのブラウザはサポートされていません</a>。リッチコンテンツを表示するには<a href="https://browsehappy.com">サポートされているブラウザに切り替え</a>てから、ログインして返信してください。'
-    safari_13_warning: このサイトは、まもなく iOS と Safari バージョン 13 以下のサポートを終了します。簡易版の読み取り専用バージョンは、引き続き利用可能です。(<a href="https://meta.discourse.org/t/224747">詳細</a>)
     permission_types:
       full: "作成 / 返信 / 閲覧"
       create_post: "返信 / 閲覧"
@@ -3488,6 +3421,9 @@ ja:
       close: "閉じる (Esc)"
       content_load_error: '<a href="%url%">コンテンツ</a>を読み込めませんでした。'
       image_load_error: '<a href="%url%">画像</a>を読み込めませんでした。'
+    experimental_lightbox:
+      buttons:
+        close: "閉じる (Esc)"
     cannot_render_video: ブラウザがコーデックをサポートしていないため、この動画をレンダリングできません。
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: "、"
@@ -3579,7 +3515,6 @@ ja:
       earned_n_times:
         other: "このバッジを %{count} 回獲得しました"
       granted_on: "%{date} にゲット！"
-      others_count: "このバッジを獲得した他のユーザー (%{count})"
       title: バッジ
       allow_title: "このバッジをタグラインとして使用できます"
       multiple_grant: "これは何度でも獲得できます"
@@ -3750,13 +3685,11 @@ ja:
     pause_notifications:
       title: "次の通知を停止する..."
       label: "通知を停止する"
-      remaining: "残り %{remaining}"
       options:
         half_hour: "30 分"
         one_hour: "１時間"
         two_hours: "２時間"
         tomorrow: "明日まで"
-        custom: "カスタム"
       set_schedule: "通知スケジュールを設定する"
     trust_levels:
       names:
@@ -3803,7 +3736,21 @@ ja:
       more: "もっと"
       all_categories: "すべてのカテゴリ"
       all_tags: "すべてのタグ"
+      edit_navigation_modal_form:
+        filter_dropdown:
+          all: "すべて"
       sections:
+        custom:
+          save: "保存"
+          delete: "削除"
+          links:
+            reset: "デフォルトにリセット"
+            icon:
+              label: "アイコン"
+            name:
+              label: "名前"
+            value:
+              label: "リンク"
         about:
           header_link_text: "サイト情報"
         messages:
@@ -3818,28 +3765,20 @@ ja:
             unread_with_count: "未読 (%{count})"
             archive: "アーカイブ"
         tags:
-          links:
-            add_tags:
-              content: "タグを追加"
-              title: "タグをまだ追加していません。クリックして始めましょう。"
           none: "追加したタグはまだありません"
           click_to_get_started: "ここをクリックして開始してください。"
           header_link_text: "タグ"
           header_action_title: "サイドバーのタグを編集"
           configure_defaults: "デフォルトの構成"
         categories:
-          links:
-            add_categories:
-              content: "カテゴリを追加"
-              title: "カテゴリをまだ追加していません。クリックして始めましょう。"
           none: "追加したカテゴリはありません"
           click_to_get_started: "ここをクリックして開始してください。"
           header_link_text: "カテゴリ"
           header_action_title: "サイドバーのカテゴリを編集"
           configure_defaults: "デフォルトの構成"
         community:
-          header_link_text: "コミュニティー"
-          header_action_title: "トピックの作成"
+          edit_section:
+            header_dropdown: "カスタマイズ"
           links:
             about:
               content: "サイト情報"
@@ -3850,8 +3789,8 @@ ja:
             badges:
               content: "バッジ"
               title: "獲得可能なすべてのバッジ"
-            everything:
-              content: "すべて"
+            topics:
+              content: "トピック"
               title: "すべてのトピック"
             faq:
               content: "FAQ"
@@ -3877,6 +3816,11 @@ ja:
       description: "ウェルカムトピックは、新しいメンバーが最初に読むものです。「エレベーターピッチ」や「ミッションステートメント」と考えると良いでしょう。このコミュニティーの対象者、ここで期待できること、最初にしてほしいことを伝えましょう。"
       button_title: "編集を開始"
     until: "終了日:"
+    form_templates:
+      errors:
+        typeMismatch:
+          default: "有効な値を入力してください。"
+          email: "正しいメールアドレスを入力してください."
   admin_js:
     type_to_filter: "フィルタの種類..."
     admin:
@@ -4033,9 +3977,6 @@ ja:
         about: "グループのメンバーシップとグループ名を編集"
         group_members: "グループメンバー"
         delete: "削除"
-        delete_confirm: "このグループを削除してもよろしいですか？"
-        delete_with_messages_confirm:
-          other: "このグループを削除すると %{count} 件のメッセージが孤立し、グループメンバーがアクセスできなくなります。"
         delete_failed: "グループを削除できません。自動作成グループを削除することはできません。"
         delete_automatic_group: これは自動グループであるため削除できません。
         delete_owner_confirm: "'%{username}' のオーナー権限を削除しますか？"
@@ -4101,7 +4042,6 @@ ja:
             topics:
               read: トピックまたはその中の特定の投稿を読み取ります。RSS もサポートされています。
               write: 新しいトピックまたは既存のトピックに投稿を作成します。
-              update: トピックを更新します。タイトル、カテゴリ、タグなどを変更します。
               read_lists: 人気、新規、最新などのトピックリストを読み取ります。RSS もサポートされています。
             posts:
               edit: 任意の投稿または特定の投稿を編集します。
@@ -4198,9 +4138,6 @@ ja:
         user_promoted_event:
           name: "ユーザー昇格イベント"
           details: "ユーザーがある信頼レベルから別の信頼レベルに昇格したとき。"
-        user_badge_event:
-          name: "バッジ付与イベント"
-          details: "ユーザーがバッジを受け取った場合。"
         group_user_event:
           name: "グループユーザーイベント"
           details: "ユーザーがグループに追加またはグループから削除された場合。"
@@ -4241,7 +4178,6 @@ ja:
         enabled: "有効化？"
         is_enabled: "はい"
         not_enabled: "いいえ"
-        change_settings: "設定を変更"
         change_settings_short: "設定"
         howto: "プラグインをインストールするには？"
         official: "公式プラグイン"
@@ -4572,6 +4508,8 @@ ja:
           love:
             name: "ラブ"
             description: "「いいね！」ボタンの色。"
+          selected:
+            name: "選択済み"
         robots:
           title: "サイトの robots.txt ファイルをオーバーライド:"
           warning: "これにより、関連するすべてのサイト設定が永久にオーバーライドされます。"
@@ -4855,14 +4793,8 @@ ja:
           silence: "投稿禁止"
           link: "リンク"
         action_descriptions:
-          block: "これらの語を含む投稿が投稿されないようにします。投稿しようとすると、エラーメッセージが表示されます。"
-          censor: "これらの語を含む投稿を許可しますが、検閲された語を非表示にする文字に置き換えられます。"
-          require_approval: "これらの語を含む投稿は、表示される前にスタッフによる承認が必要です。"
-          flag: "これらの言葉を含む投稿を許可しますが、モデレーターがこれをレビューできるよう、不適切として通報されます。"
-          replace: "投稿内の語を他の語に置き換えます"
-          tag: "最初の投稿に基づいてトピックに自動的にタグを付けます"
-          silence: "これらの語を含むユーザーの最初の投稿には、表示される前とユーザーが自動的に投稿禁止になる前にスタッフによる承認が必要です。"
-          link: "投稿内の語をリンクに置き換える"
+          replace: "投稿内の語を他の語に置き換えます."
+          link: "投稿内の語をリンクに置き換える."
         form:
           label: "語またはフレーズがある"
           placeholder: "語またはフレーズを入力してください (* はワイルカード)"
@@ -4885,6 +4817,37 @@ ja:
           description: "テキストを入力して、ウォッチ語に一致しているかどうかを確認します"
           found_matches: "見つかった一致:"
           no_matches: "一致する項目が見つかりませんでした"
+      form_templates:
+        nav_title: "テンプレート"
+        list_table:
+          headings:
+            name: "名前"
+            actions: "操作"
+        view_template:
+          close: "クローズ"
+          edit: "編集"
+          delete: "削除"
+        new_template_form:
+          submit: "保存"
+          cancel: "キャンセル"
+          preview: "プレビュー"
+        quick_insert_fields:
+          add_new_field: "追加"
+          dropdown: "ドロップダウン"
+        validations_modal:
+          table_headers:
+            key: "キー"
+            type: "タイプ"
+            description: "説明"
+          validations:
+            required:
+              key: "必須"
+            minimum:
+              key: "最小"
+            maximum:
+              key: "最大"
+            type:
+              key: "タイプ"
       impersonate:
         title: "代理操作"
         help: "このツールを使用して、デバッグ目的でユーザーアカウントを代理操作します。作業を終了したら、ログアウトしてください。"
@@ -4897,6 +4860,7 @@ ja:
         not_found: "申し訳ありません。そのユーザー名はシステムに存在しません。"
         id_not_found: "申し訳ありません。そのユーザー ID はシステムに存在しません。"
         active: "有効"
+        status: "ステータス"
         show_emails: "メールアドレスを表示"
         hide_emails: "メールを非表示"
         nav:
@@ -4985,7 +4949,6 @@ ja:
         show_admin_profile: "管理者"
         manage_user: "ユーザーの管理"
         show_public_profile: "公開プロファイルを表示"
-        impersonate: "代理操作"
         action_logs: "操作ログ"
         ip_lookup: "IP アドレスを検索"
         log_out: "ログアウト"
@@ -5218,6 +5181,8 @@ ja:
         show_overriden: "上書き部分のみ表示"
         locale: "言語:"
         more_than_50_results: "結果が 50 件以上あります。検索を絞り込んでください。"
+        outdated:
+          dismiss: "閉じる"
       settings:
         show_overriden: "上書き部分のみ表示"
         history: "変更履歴を表示する"
@@ -5230,7 +5195,6 @@ ja:
             label: "絵文字を追加"
         title: "設定"
         no_results: "何も見つかりませんでした。"
-        more_than_30_results: "結果が 30 件以上あります。検索を絞り込むかカテゴリを選択してください。"
         clear_filter: "クリア"
         add_url: "URL を追加"
         add_host: "ホストを追加"
@@ -5317,7 +5281,7 @@ ja:
         allow_title: バッジをタグラインとして使用することを許可する
         multiple_grant: 何度でも付与できる
         listable: バッジの公開ページにバッジを表示する
-        enabled: バッジを有効にする
+        disabled: 無効
         icon: アイコン
         image: 画像
         graphic: グラフィック
@@ -5386,10 +5350,8 @@ ja:
       embedding:
         get_started: "ほかのウェブサイトに Discourse を埋め込む場合は、まずホストを追加してください。"
         confirm_delete: "このホストを削除してもよろしいですか？"
-        sample: "次の HTML コードをサイトに貼り付けて、Discourse のトピックを作成して埋め込みます。<b>REPLACE_ME</b> を埋め込み先の正規 URL に置き換えてください。"
         title: "埋め込み"
         host: "許可されたホスト"
-        class_name: "クラス名"
         allowed_paths: "パスのホワイトリスト"
         edit: "編集"
         category: "カテゴリへ投稿"
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index 7adb3dc9448..be9b32ab9a9 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -155,11 +155,6 @@ ko:
     software_update_prompt:
       message: "사이트가 업데이트되어 <span>새로고침</span>이 필요합니다. 그렇지 않으면 예기치 않은 동작이 발생할 수 있습니다."
       dismiss: "무시"
-    bootstrap_mode_enabled:
-      other: "신규 사이트를 편리하게 출시할 수 있도록 부트스트랩 모드로 구동합니다. 모든 신규 사용자는 신뢰 레벨 1이 부여되며 매일 요약 이메일을 받게 됩니다. %{count}명의 사용자가 가입하면 이 기능은 자동으로 비활성화됩니다."
-    bootstrap_mode_disabled: "부트스트랩 모드가 24시간 내에 해제됩니다."
-    bootstrap_invite_button_title: "초대장 보내기"
-    bootstrap_wizard_link_title: "설정 마법사 완료"
     themes:
       default_description: "디폴트"
       broken_theme_alert: "테마/구성 요소에 오류가 있어 사이트가 작동하지 않을 수 있습니다."
@@ -268,11 +263,9 @@ ko:
       edit_bookmark: "북마크 편집"
       clear_bookmarks: "북마크 지우기"
       help:
-        bookmark: "이 주제의 첫 번째 게시물을 북마크하려면 클릭하세요"
-        edit_bookmark: "이 주제의 북마크를 편집하려면 클릭하세요"
         edit_bookmark_for_topic: "이 주제의 북마크를 편집하려면 클릭하세요"
         unbookmark: "이 주제의 모든 북마크를 제거하려면 클릭하세요"
-        unbookmark_with_reminder: "이 주제의 모든 북마크 및 미리 알림을 제거하려면 클릭하세요"
+        unbookmark_with_reminder: "이 항목의 모든 북마크 및 미리 알림을 제거하려면 클릭하십시오"
     bookmarks:
       created: "이 게시물을 북마크했습니다. %{name}"
       create: "북마크 만들기"
@@ -313,7 +306,6 @@ ko:
       new_topic: "새 주제 초안"
       new_private_message: "새 개인 메시지 초안"
       abandon:
-        confirm: "이 주제에 대한 초안이 있습니다. 어떻게 진행할까요?"
         yes_value: "버리기"
         no_value: "편집 재개"
     topic_count_categories:
@@ -474,11 +466,9 @@ ko:
       scores:
         about: "이 점수는 보고자의 신뢰 레벨, 이전 신고의 정확도 및 신고된 항목의 우선순위를 기준으로 계산됩니다."
         score: "점수"
-        date: "날짜"
-        type: "유형"
+        type: "이유"
         status: "상태"
-        submitted_by: "제출자"
-        reviewed_by: "검토자"
+        submitted_by: "신고자"
       statuses:
         pending:
           title: "보류 중"
@@ -486,14 +476,12 @@ ko:
           title: "승인됨"
         rejected:
           title: "거부됨"
-        ignored:
-          title: "무시됨"
-        deleted:
-          title: "삭제됨"
         reviewed:
-          title: "(모두 검토됨)"
+          title: "모두 검토됨"
         all:
-          title: "(모두)"
+          title: "모두"
+      context_question:
+        delimiter: "또는"
       types:
         reviewable_flagged_post:
           title: "신고된 게시물"
@@ -790,6 +778,7 @@ ko:
         make_all_primary_description: "선택한 모든 사용자의 기본 그룹으로 만들기"
         remove_all_primary: "기본에서 제거"
         remove_all_primary_description: "이 그룹을 기본 그룹에서 제거"
+        status: "상태"
         owner: "소유자"
         primary: "기본"
         forbidden: "회원을 볼 권한이 없습니다."
@@ -911,11 +900,6 @@ ko:
       profile: "프로필"
       mute: "뮤트"
       edit: "환경설정 편집"
-      download_archive:
-        button_text: "모두 다운로드"
-        confirm: "게시물을 다운로드할까요?"
-        success: "다운로드가 시작되었습니다. 다운로드 과정이 완료되면 메시지로 알림이 전송됩니다."
-        rate_limit_error: "게시물은 하루에 한 번만 다운로드할 수 있습니다. 내일 다시 시도하세요."
       new_private_message: "새 메시지"
       private_message: "메시지"
       private_messages: "메시지"
@@ -1029,10 +1013,7 @@ ko:
       experimental_sidebar:
         enable: "사이드바 활성화"
         options: "옵션"
-        categories_section: "카테고리 섹션"
-        tags_section: "태그 섹션"
         navigation_section: "내비게이션"
-        list_destination_instruction: "사이드바에 새로운 콘텐츠가 있을 때..."
       change: "변경"
       featured_topic: "추천 주제"
       moderator: "%{user} 님은 운영자입니다"
@@ -1103,12 +1084,16 @@ ko:
       home: "디폴트 홈페이지"
       staged: "스테이징됨"
       staff_counters:
-        flags_given: "유용한 신고"
-        flagged_posts: "신고된 게시물"
-        deleted_posts: "삭제된 글"
-        suspensions: "정지"
-        warnings_received: "경고"
-        rejected_posts: "거부된 게시물"
+        flagged_posts:
+          other: '<span class="%{className}">%{count}</span> 신고된 게시물'
+        deleted_posts:
+          other: '<span class="%{className}">%{count}</span> 삭제된 게시물'
+        suspensions:
+          other: '<span class="%{className}">%{count}</span> 차단'
+        warnings_received:
+          other: '<span class="%{className}">%{count}</span> 경고'
+        rejected_posts:
+          other: '<span class="%{className}">%{count}</span> 거부된 게시물'
       messages:
         all: "모든 받은 편지함"
         inbox: "받은 편지함"
@@ -1142,7 +1127,6 @@ ko:
         tags: "태그"
         interface: "인터페이스"
         apps: "앱"
-        sidebar: "사이드바"
       change_password:
         success: "(이메일 전송됨)"
         in_progress: "(이메일 전송 중)"
@@ -1156,10 +1140,11 @@ ko:
         title: "2단계 백업 코드"
         regenerate: "재생성"
         disable: "비활성화"
-        enable: "활성화"
-        enable_long: "백업 코드 활성화"
+        enable: "백업 코드 생성"
+        enable_long: "백업 코드 추가"
+        not_enabled: "아직 백업 코드를 생성하지 않았습니다."
         manage:
-          other: "백업 코드를 관리합니다. <strong>%{count}</strong>개의 백업 코드가 남아 있습니다."
+          other: "<strong>%{count}</strong>개의 백업 코드가 남아 있습니다."
         copy_to_clipboard: "클립보드에 복사"
         copy_to_clipboard_error: "데이터를 클립보드로 복사하는 중 오류 발생"
         copied_to_clipboard: "클립보드에 복사됨"
@@ -1233,6 +1218,7 @@ ko:
         success: "이 주소로 이메일을 전송했습니다. 확인 지침을 따라주세요."
         success_via_admin: "이 주소로 이메일을 전송했습니다. 사용자는 이메일에 있는 확인 지침을 따라야 합니다."
         success_staff: "현재 주소로 이메일을 전송했습니다. 확인 지침을 따라주세요."
+        back_to_preferences: "환경설정으로 돌아가기"
       change_avatar:
         title: "프로필 사진 변경"
         gravatar: "<a href='//%{gravatarBaseUrl}%{gravatarLoginUrl}' target='_blank'>%{gravatarName}</a>, 기반:"
@@ -1563,8 +1549,7 @@ ko:
     user_status:
       save: "저장"
     user_tips:
-      primary: "알았어요!"
-      secondary: "이 도움말을 표시하지 않음"
+      button: "알았어요!"
       first_notification:
         title: "첫 번째 알림!"
       post_menu:
@@ -1601,8 +1586,6 @@ ko:
       enabled: "이 사이트는 현재 읽기 전용 모드입니다. 탐색은 가능하지만 댓글, 좋아요 및 기타 작업은 일시적으로 비활성화되었습니다."
       login_disabled: "사이트가 읽기 전용 모드인 동안에는 로그인이 비활성화됩니다."
       logout_disabled: "사이트가 읽기 전용 모드인 동안에는 로그아웃이 비활성화됩니다."
-    too_few_posts_notice_MF: |
-      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">토론을 시작</a> 합시다 <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">!</a> {currentPosts, plural, one {is <strong>#</strong> post} other {are <strong>#</strong> posts}}가 있습니다. 방문자는 더 읽고 답장해야합니다. – {requiredPosts, plural, one { <strong>#</strong> post} other { <strong>#</strong> posts}} 이상을 권장합니다. 직원 만이 메시지를 볼 수 있습니다.
     logs_error_rate_notice:
       reached_hour_MF: |
         <b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {#개의 오류/시간} other {#개의 오류/시간}}</a>이 사이트 설정 한계인 {limit, plural, one {#개의 오류/시간} other {#개의 오류/시간}}에 도달했습니다.
@@ -1631,13 +1614,9 @@ ko:
       hidden_for_session: "알겠습니다. 내일 알려드리겠습니다. 언제든 '로그인'을 통해서도 계정을 만들 수 있습니다."
       intro: "환영합니다! 토론에 관심이 있지만 아직 계정을 만들지 않은 것 같습니다."
     summary:
-      enabled_description: "이 주제의 요약을 보고 있습니다. 커뮤니티에서 선정한 가장 흥미로운 게시물입니다."
       description:
         other: "<b>%{count}</b>개의 댓글이 있습니다."
-      enable: "이 주제 요약"
       disable: "모든 게시물 표시"
-      short_label: "요약하기"
-      short_title: "이 주제의 요약 표시: 커뮤니티에서 선정한 가장 흥미로운 게시물입니다"
     deleted_filter:
       enabled_description: "이 주제에는 숨김 처리된 삭제된 게시물이 있습니다."
       disabled_description: "주제에 삭제된 게시물이 표시됩니다."
@@ -1900,8 +1879,6 @@ ko:
         topic_template_not_modified: "주제 템플릿을 편집하여 주제에 상세 정보와 세부 사항을 추가하세요."
       save_edit: "편집 저장"
       overwrite_edit: "편집 덮어쓰기"
-      reply_original: "원래 주제에 댓글 달기"
-      reply_here: "여기에 댓글을 작성하세요"
       reply: "댓글 달기"
       cancel: "취소"
       create_topic: "주제 생성"
@@ -2047,6 +2024,7 @@ ko:
       reaction: "<span>%{username}</span> %{description}"
       reaction_2: "<span>%{username}, %{username2}</span> %{description}"
       votes_released: "%{description} - 완료됨"
+      admin_problems: "사이트 대시 보드에 대한 새로운 조언"
       dismiss_confirmation:
         body:
           default:
@@ -2308,7 +2286,7 @@ ko:
         top: "주요 주제가 없습니다."
         educate:
           new: '<p>새 주제가 여기에 표시됩니다. 기본적으로 지난 2일 이내에 작성된 주제는 새 주제로 간주되며 <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span> 표시로 확인할 수 있습니다.</p><p>이 기준을 변경하려면 <a href="%{userPrefsUrl}">환경설정</a>에서 변경하세요.</p>'
-          unread: '<p>읽지 않은 주제는 여기에 표시됩니다.</p><p>기본적으로 주제는 읽지 않은 것으로 간주되며 다음과 같은 조건 중 하나를 만족하면 읽지 않은 주제 개수 <span class="badge unread-posts badge-notification">1</span>이 표시됩니다.</p><ul><li>새 주제 작성</li><li>주제에 댓글 작성</li><li>주제를 4분 이상 읽음</li></ul><p>또는 각 주제의 알림 아이콘에서 주제를 추적하거나 구독하도록 설정하는 경우도 포함됩니다.</p><p>설정을 변경하려면 <a href="%{userPrefsUrl}">환경설정</a> 페이지로 이동하세요.</p>'
+          unread: '<p>읽지 않은 글은 여기에 표시됩니다.</p><p>기본적으로 글은 읽지 않은 것으로 간주하고 다음과 같은 조건 중 하나를 만족하면 읽지 않은 글수 <span class="badge unread-posts badge-notification">1</span> 을 표시합니다:</p><ul><li>새로운 글 작성</li><li>글에 댓글 작성</li><li>글을 5분 이상 읽기</li></ul><p>또는 글을 팔로우 하거나 지켜보기 위해 각 글의 밑부분에 달린 알림 제어판에서 설정하는 경우도 포함됩니다.</p><p>설정을 바꾸려면 <a href="%{userPrefsUrl}">환경설정</a> 페이지로 가세요.</p>'
       bottom:
         latest: "더 이상 최근 주제가 없습니다."
         posted: "더 이상 게시한 주제가 없습니다."
@@ -2366,8 +2344,6 @@ ko:
       read_more_in_category: "더 읽고 싶으신가요? %{categoryLink}의 다른 토픽을 살펴보거나 <a href='%{latestLink}'>최신 토픽</a>을 확인해 보세요."
       unread_indicator: "아직 이 주제의 마지막 게시물을 읽은 회원이 없습니다."
       suggest_create_topic: <a href>새 대화를 시작</a>할 준비가 되었나요?
-      jump_reply_up: 이전 댓글로 이동
-      jump_reply_down: 다음 댓글로 이동
       deleted: "글이 삭제되었습니다."
       slow_mode_update:
         title: "느린 모드"
@@ -2894,7 +2870,6 @@ ko:
       filtered_replies:
         viewing_posts_by: "다음 사용자의 %{post_count}개의 게시물 보기"
         viewing_subset: "일부 댓글이 접혀 있습니다"
-        viewing_summary: "이 주제의 요약 보기"
         post_number: "%{username}, 게시물 #%{post_number}"
         show_all: "모두 표시"
       share:
@@ -2911,7 +2886,6 @@ ko:
       back: "카테고리로 돌아가기"
       general: "일반"
       settings: "설정"
-      topic_template: "주제 템플릿"
       tags: "태그"
       tags_allowed_tags: "이 태그를 이 카테고리로 제한:"
       tags_allowed_tag_groups: "이 태그 그룹을 이 카테고리로 제한:"
@@ -2968,8 +2942,6 @@ ko:
       email_in: "수신 메일 주소 사용자 지정:"
       email_in_tooltip: "| 문자로 여러 이메일 주소를 구분할 수 있습니다."
       email_in_allow_strangers: "계정이 없는 익명 사용자의 이메일을 수신합니다"
-      email_in_disabled: "이메일을 통한 새 주제 게시가 사이트 설정에서 비활성화되었습니다. 이메일을 통해 새 주제를 게시하려면 "
-      email_in_disabled_click: '''이메일'' 설정에서 활성화하세요.'
       mailinglist_mirror: "카테고리가 메일링 목록 반영"
       show_subcategory_list: "이 카테고리에서 주제 위에 서브카테고리 목록을 표시합니다."
       read_only_banner: "사용자가 이 카테고리에서 주제를 생성할 수 없는 경우의 배너 텍스트:"
@@ -3160,6 +3132,10 @@ ko:
     filters:
       with_topics: "%{filter} 주제"
       with_category: "%{filter} %{category} 주제"
+      filter:
+        title: "필터"
+        button:
+          label: "필터"
       latest:
         title: "최신"
         title_with_count:
@@ -3223,7 +3199,6 @@ ko:
         this_week: "주"
         today: "오늘"
     browser_update: '<a href="https://www.discourse.org/faq/#browser">브라우저 버전이 너무 낮아 이 사이트에서 작동하지 않습니다</a>. <a href="https://browsehappy.com">브라우저를 업그레이드</a>하여 서식 있는 콘텐츠를 표시하고 로그인하여 댓글도 달아보세요.'
-    safari_13_warning: 이 사이트는 곧 iOS 및 Safari 버전 13 이하에 대한 지원을 중단할 예정입니다. 단순화된 읽기 전용 버전은 계속 사용할 수 있습니다. (<a href="https://meta.discourse.org/t/224747">더 보기</a>)
     permission_types:
       full: "생성 / 댓글 / 보기"
       create_post: "댓글 / 보기"
@@ -3238,6 +3213,9 @@ ko:
       close: "닫기(Esc)"
       content_load_error: '<a href="%url%">콘텐츠</a>를 로드할 수 없습니다.'
       image_load_error: '<a href="%url%">이미지</a>를 로드할 수 없습니다.'
+    experimental_lightbox:
+      buttons:
+        close: "닫기 (Esc)"
     cannot_render_video: 브라우저가 코덱을 지원하지 않기 때문에 이 비디오를 렌더링할 수 없습니다.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ","
@@ -3328,7 +3306,6 @@ ko:
       earned_n_times:
         other: "이 배지를 %{count}번 획득했습니다"
       granted_on: "%{date}에 획득"
-      others_count: "이 배지를 획득한 다른 사용자(%{count}명)"
       title: 배지
       allow_title: "이 배지를 타이틀로 사용할 수 있습니다"
       multiple_grant: "이 배지는 중복해서 획득할 수 있습니다"
@@ -3494,13 +3471,11 @@ ko:
       enabled: "안전 모드가 활성화되었습니다. 안전 모드를 종료하려면 이 브라우저 창을 닫으세요."
     image_removed: "(이미지 제거됨)"
     pause_notifications:
-      remaining: "%{remaining} 남음"
       options:
         half_hour: "30분"
         one_hour: "1시간"
         two_hours: "2시간"
         tomorrow: "내일까지"
-        custom: "사용자 정의"
       set_schedule: "알림 일정 설정"
     trust_levels:
       names:
@@ -3536,7 +3511,21 @@ ko:
       more: "더 보기"
       all_categories: "모든 카테고리"
       all_tags: "모든 태그"
+      edit_navigation_modal_form:
+        filter_dropdown:
+          all: "전체"
       sections:
+        custom:
+          save: "저장"
+          delete: "삭제하기"
+          links:
+            reset: "기본값으로 재설정"
+            icon:
+              label: "아이콘"
+            name:
+              label: "그룹명"
+            value:
+              label: "링크"
         about:
           header_link_text: "소개"
         messages:
@@ -3550,22 +3539,17 @@ ko:
             unread_with_count: "읽지 않음(%{count})"
             archive: "보관"
         tags:
-          links:
-            add_tags:
-              content: "태그 추가"
           none: "태그를 추가하지 않았습니다."
           click_to_get_started: "시작하려면 여기를 클릭하십시오."
           header_link_text: "태그"
           configure_defaults: "기본값 구성"
         categories:
-          links:
-            add_categories:
-              content: "카테고리 추가"
           click_to_get_started: "시작하려면 여기를 클릭하십시오."
           header_link_text: "카테고리"
           configure_defaults: "기본값 구성"
         community:
-          header_link_text: "커뮤니티"
+          edit_section:
+            header_dropdown: "사용자 지정"
           links:
             about:
               content: "소개"
@@ -3573,8 +3557,8 @@ ko:
               content: "관리자"
             badges:
               content: "배지"
-            everything:
-              content: "모두"
+            topics:
+              content: "글"
               title: "모든 글"
             faq:
               content: "자주하는 질문"
@@ -3592,6 +3576,10 @@ ko:
       title: "환영 글 만들기"
       button_title: "편집 시작"
     until: "까지:"
+    form_templates:
+      errors:
+        typeMismatch:
+          default: "유효한 값을 입력하십시오."
   admin_js:
     type_to_filter: "필터링하려면 입력..."
     admin:
@@ -3892,9 +3880,6 @@ ko:
         notification_event:
           name: "알림 이벤트"
           details: "사용자가 피드에서 알림을 받은 경우"
-        user_badge_event:
-          name: "배지 부여 이벤트"
-          details: "사용자가 배지를 받은 경우"
         group_user_event:
           name: "그룹 사용자 이벤트"
           details: "사용자가 그룹에 추가 또는 제거된 경우"
@@ -3935,7 +3920,6 @@ ko:
         enabled: "활성화되었나요?"
         is_enabled: "예"
         not_enabled: "아니요"
-        change_settings: "설정 변경"
         change_settings_short: "설정"
         howto: "플러그인은 어떻게 설치하나요?"
         official: "공식 플러그인"
@@ -4258,6 +4242,8 @@ ko:
           love:
             name: "하트"
             description: "좋아요 버튼 색입니다."
+          selected:
+            name: "선택됨"
         robots:
           title: "사이트의 robots.txt 파일 오버라이드:"
           warning: "관련된 모든 사이트 설정이 영구적으로 오버라이드됩니다."
@@ -4541,14 +4527,8 @@ ko:
           silence: "차단"
           link: "링크"
         action_descriptions:
-          block: "이 단어가 포함된 게시물이 작성되지 않도록 합니다. 사용자가 게시물을 제출하려고 하면 오류 메시지가 표시됩니다."
-          censor: "이 단어가 포함된 게시물을 허용하되, 단어를 문자로 대체하여 검열된 단어를 숨깁니다."
-          require_approval: "이 단어가 포함된 게시물이 표시되려면 운영진의 승인이 필요합니다."
-          flag: "이 단어가 포함된 게시물을 허용하지만 운영자가 검토할 수 있도록 부적절 항목으로 신고합니다."
-          replace: "게시물의 단어를 다른 단어로 대체"
-          tag: "첫 게시물을 기반으로 주제에 자동으로 태그 지정"
-          silence: "이 단어가 포함된 사용자의 첫 게시물은 운영진의 승인을 받아야 표시될 수 있으며 해당 사용자는 자동으로 차단됩니다."
-          link: "게시물의 단어를 링크로 대체"
+          replace: "게시물의 단어를 다른 단어로 바꾸기."
+          link: "게시물의 단어를 링크로 바꾸기."
         form:
           label: "단어 또는 구문 포함"
           placeholder: "단어 또는 구문 입력(*는 와일드카드)"
@@ -4571,6 +4551,37 @@ ko:
           description: "감시 단어와 일치하는지 확인하려면 아래에 텍스트를 입력하세요"
           found_matches: "일치 결과:"
           no_matches: "일치하는 항목이 없음"
+      form_templates:
+        nav_title: "템플릿"
+        list_table:
+          headings:
+            name: "그룹명"
+            actions: "작업"
+        view_template:
+          close: "닫기"
+          edit: "수정"
+          delete: "삭제하기"
+        new_template_form:
+          submit: "저장"
+          cancel: "취소"
+          preview: "미리 보기"
+        quick_insert_fields:
+          add_new_field: "추가"
+          dropdown: "드롭다운"
+        validations_modal:
+          table_headers:
+            key: "키"
+            type: "유형"
+            description: "내용"
+          validations:
+            required:
+              key: "필수"
+            minimum:
+              key: "최소"
+            maximum:
+              key: "최대"
+            type:
+              key: "유형"
       impersonate:
         title: "가장"
         help: "이 툴을 사용하면 디버깅을 위해 사용자 계정으로 로그인할 수 있습니다. 사용이 끝나면 로그아웃해야 합니다."
@@ -4583,6 +4594,7 @@ ko:
         not_found: "이 아이디는 시스템에 없습니다."
         id_not_found: "이 사용자 아이디는 시스템에 없습니다."
         active: "활성화됨"
+        status: "상태"
         show_emails: "이메일 표시"
         hide_emails: "이메일 숨기기"
         nav:
@@ -4666,7 +4678,6 @@ ko:
         show_admin_profile: "관리자"
         manage_user: "사용자 관리"
         show_public_profile: "공개 프로필 표시"
-        impersonate: "가장"
         action_logs: "작업 로그"
         ip_lookup: "IP Lookup"
         log_out: "로그아웃"
@@ -4895,6 +4906,8 @@ ko:
         show_overriden: "오버라이드된 항목만 표시"
         locale: "언어:"
         more_than_50_results: "50개 이상의 결과가 있습니다. 검색 범위를 좁혀보세요."
+        outdated:
+          dismiss: "무시"
       settings:
         show_overriden: "오버라이드된 항목만 표시"
         history: "변경 히스토리 보기"
@@ -4907,7 +4920,6 @@ ko:
             label: "이모티콘 추가"
         title: "사이트 설정"
         no_results: "검색 결과가 없습니다."
-        more_than_30_results: "30개 이상의 결과가 있습니다. 검색 범위를 좁히거나 카테고리를 선택하세요."
         clear_filter: "Clear"
         add_url: "URL 추가"
         add_host: "Host 추가"
@@ -4994,7 +5006,8 @@ ko:
         allow_title: 배지를 타이틀로 사용하도록 허용
         multiple_grant: 중복 부여 가능
         listable: 공개 배지 페이지에 표시
-        enabled: 배지 기능 사용
+        enabled: 활성화
+        disabled: 비활성
         icon: 아이콘
         image: 이미지
         graphic: 그래픽
@@ -5064,7 +5077,6 @@ ko:
         confirm_delete: "호스트를 삭제할까요?"
         title: "임베딩"
         host: "허용 Host"
-        class_name: "클래스 이름"
         allowed_paths: "경로 허용 목록"
         edit: "편집"
         category: "카테고리에 게시"
diff --git a/config/locales/client.lt.yml b/config/locales/client.lt.yml
index 237ad7cd651..a8e9e1dd57b 100644
--- a/config/locales/client.lt.yml
+++ b/config/locales/client.lt.yml
@@ -203,14 +203,6 @@ lt:
     software_update_prompt:
       message: "Mes atnaujinome šią svetainę. <span>prašome perkrauti puslapį</span>, kitaip galite patirti nenumatytas klaidas."
       dismiss: "Praleisti"
-    bootstrap_mode_enabled:
-      one: "Kad būtų lengviau paleisti naują svetainę, esate įkrovos režimu. Visiems naujiems vartotojams bus suteiktas 1 patikimumo lygis ir įjungti kasdieniai el. Laiškų suvestiniai el. Laiškai. Tai bus automatiškai išjungta, kai %{count} vartotojų."
-      few: "Norėdami palengvinti naujos svetainės paleidimą, jūs esate paleidimo režime. Visiems naujiems vartotojams bus suteiktas 1 lygio pasitikėjimas ir bus įgalinti kasdieniniai elektroninio pašto santraukos atnaujinimai. Tai bus automatiškai išjungta, kai pasieksite %{count} vartotojų ribą."
-      many: "Norėdami palengvinti naujos svetainės paleidimą, jūs esate paleidimo režime. Visiems naujiems vartotojams bus suteiktas 1 lygio pasitikėjimas ir bus įgalinti kasdieniniai elektroninio pašto santraukos atnaujinimai. Tai bus automatiškai išjungta, kai pasieksite %{count} vartotojų ribą."
-      other: "Norėdami palengvinti naujos svetainės paleidimą, jūs esate paleidimo režime. Visiems naujiems vartotojams bus suteiktas 1 lygio pasitikėjimas ir bus įgalinti kasdieniniai elektroninio pašto santraukos atnaujinimai. Tai bus automatiškai išjungta, kai pasieksite %{count} vartotojų ribą."
-    bootstrap_mode_disabled: "Paleidimo režimas bus išjungtas per 24 valandas."
-    bootstrap_invite_button_title: "Siųsti pakvietimą"
-    bootstrap_wizard_link_title: "Baigti sąrankos vedlį"
     themes:
       default_description: "Numatytasis"
       broken_theme_alert: "Jūsų svetainė gali neveikti, nes temoje / komponente yra klaidų."
@@ -328,11 +320,9 @@ lt:
       edit_bookmark: "Redaguoti žymę"
       clear_bookmarks: "Pašalinti žymes"
       help:
-        bookmark: "Paspausk, kad pažymėtum pirmą įrašą šioje temoje"
-        edit_bookmark: "Spustelėkite, jei norite redaguoti šios temos žymę"
         edit_bookmark_for_topic: "Spustelėkite, jei norite redaguoti šios temos žymę"
         unbookmark: "Paspausk, kad pašalintum visas žymęs šioje temoje"
-        unbookmark_with_reminder: "Spustelėkite, kad pašalintumėte visas šios temos žymes ir priminimus."
+        unbookmark_with_reminder: "Spustelėkite, kad pašalintumėte visas šios temos žymes ir priminimus"
     bookmarks:
       created: "Jūs pažymėjote šį įrašą. %{name}"
       created_generic: "Jūs tai pažymėjote. %{name}"
@@ -375,7 +365,6 @@ lt:
       new_topic: "Naujos temos juodraštis"
       new_private_message: "Naujas asmeninės žinutės juodraštis"
       abandon:
-        confirm: "Jūs turite nebaigtą juodraštį šiai tema. Ką norėtumėte daryti su juo?"
         yes_value: "Išmesti"
         no_value: "Tęsti redagavimą"
     topic_count_categories:
@@ -541,11 +530,9 @@ lt:
       scores:
         about: "Šis balas apskaičiuojamas remiantis pranešėjo patikimumo lygiu, ankstesnių vėliavų tikslumu ir pranešimo elemento prioritetu."
         score: "Rezultatas"
-        date: "Data"
-        type: "Tipas"
+        type: "Priežastis"
         status: "Statusas"
-        submitted_by: "Pateikė"
-        reviewed_by: "Peržiūrėjo"
+        submitted_by: "Pranešė"
       statuses:
         pending:
           title: "Laukiama"
@@ -553,14 +540,12 @@ lt:
           title: "Patvirtinta"
         rejected:
           title: "Atmesta"
-        ignored:
-          title: "Nepaisoma"
-        deleted:
-          title: "Ištrinta"
         reviewed:
-          title: "(visi peržiūrėti)"
+          title: "Visi peržiūrėti"
         all:
-          title: "(viskas)"
+          title: "Viskas"
+      context_question:
+        delimiter: "arba"
       types:
         reviewable_flagged_post:
           title: "Pažymėtas pranešimas"
@@ -869,6 +854,7 @@ lt:
         make_all_primary_description: "Padarykite tai pagrindine visų pasirinktų vartotojų grupe"
         remove_all_primary: "Pašalinti kaip pagrindinį"
         remove_all_primary_description: "Pašalinkite šią grupę kaip pagrindinę"
+        status: "Statusas"
         owner: "Savininkas"
         primary: "Pagrindinė"
         forbidden: "Jums neleidžiama peržiūrėti narių."
@@ -985,11 +971,6 @@ lt:
       profile: "Profilis"
       mute: "Nutildyti"
       edit: "Redaguoti Nustatymus"
-      download_archive:
-        button_text: "Atsisiųsti viską"
-        confirm: "Ar tikrai norite atsisiųsti savo įrašus?"
-        success: "Eksportavimas pradėtas. Kai procesas bus baigtas, gausite pranešimą"
-        rate_limit_error: "Įrašai gali būti atsiunčiami vieną kartą per dieną, prašome pakartoti operaciją rytoj."
       new_private_message: "Nauja žinutė"
       private_message: "Žinutės"
       private_messages: "Žinutės"
@@ -1167,13 +1148,6 @@ lt:
       save_to_change_theme: 'Tema bus atnaujinta spustelėjus „%{save_text}“'
       home: "Numatytasis pagrindinis puslapis"
       staged: "Inscenizuotas"
-      staff_counters:
-        flags_given: "naudingos vėliavos"
-        flagged_posts: "įrašai su vėliavomis"
-        deleted_posts: "ištrinti įrašai"
-        suspensions: "nušalinimai"
-        warnings_received: "perspejimai"
-        rejected_posts: "atmesti įrašai"
       messages:
         all: "visos pašto dėžutes"
         inbox: "Pranešimų dežutė"
@@ -1226,8 +1200,6 @@ lt:
         title: "Dviejų veiksnių atsarginiai kodai"
         regenerate: "Pergeneruoti"
         disable: "Išjungti"
-        enable: "Įgalinti"
-        enable_long: "Įgalinti atsarginius kodus"
         copy_to_clipboard: "Nukopijuoti į iškarpinę"
         copy_to_clipboard_error: "Klaida kopijuojant duomenis į iškarpinę"
         copied_to_clipboard: "Nukopijuota į iškirptę"
@@ -1675,11 +1647,7 @@ lt:
       hidden_for_session: "Gerai, paklausime rytoj. Jūs taip pat visada galite naudoti „Prisijungti“, kad sukurtumėte paskyrą."
       intro: "Sveiki! Panašu, kad jums patinka diskusija, tačiau dar nesate prisiregistravę prie paskyros."
     summary:
-      enabled_description: "Tu šiuo metu žiūri temos aprašymą: pačius įdomiausius įrašus, kuriuos išrinko bendruomenė."
-      enable: "Apibendrinkite šią Temą"
       disable: "Peržiūrėti visus Įrašus"
-      short_label: "Apibendrinti"
-      short_title: "Rodyti šios temos santrauką: įdomiausius pranešimus, kuriuos nustato bendruomenė"
     deleted_filter:
       enabled_description: "Šioje temoje yra ištrintų įrašų, kurie yra paslėpti."
       disabled_description: "Ištrinti temos įrašai vėl rodomi."
@@ -1926,8 +1894,6 @@ lt:
         topic_template_not_modified: "Redaguodami temos šabloną, pridėkite prie temos išsamią informaciją ir specifiką."
       save_edit: "Išsaugoti pakeitimus"
       overwrite_edit: "Perrašyti Redaguoti"
-      reply_original: "Atsakyti į Originalią Temą"
-      reply_here: "Atsakyti"
       reply: "Atsakyti"
       cancel: "Atšaukti"
       create_topic: "Sukurti Temą"
@@ -2065,6 +2031,7 @@ lt:
       reaction: "<span>%{username}</span> %{description}"
       reaction_2: "<span>%{username}, %{username2}</span> %{description}"
       votes_released: "%{description} - baigtas"
+      admin_problems: "Nauji patarimai jūsų svetainės informacijos suvestinėje"
       dismiss_confirmation:
         body:
           default:
@@ -2311,7 +2278,7 @@ lt:
         category: "Nėra jokių temų kategorijoje %{category}."
         top: "Nėra jokių TOP temų."
         educate:
-          unread: "<p>Jūsų neskaitytos temos rodomos čia.</p><p>Pagal numatytuosius nustatymus temos laikomos neskaitytomis ir bus rodomas neskaitytų skaičius <span class=\"badge unread-posts badge-notification\">1</span> jei:</p><ul><li>sukūrėte temą</li><li>atsakėte į temą</li><li>Temą skaitėte ilgiau nei 4 minutes</li></ul><p>Arba aiškiai kiekvienoje temoje nustatykite temą į Stebimą arba Stebimą naudodami \U0001F514.</p><p>Norėdami tai pakeisti, aplankykite savo <a href=\"%{userPrefsUrl}\">nustatymus</a></p>"
+          unread: "<p>Jūsų neskaitytos temos rodomos čia.</p><p>Pagal numatytuosius nustatymus temos laikomos neskaitytomis ir bus rodomas neskaitytų skaičius <span class=\"badge unread-posts badge-notification\">1</span> jei:</p><ul><li>sukūrėte temą</li><li>atsakėte į temą</li><li>Temą skaitėte ilgiau nei 5 minutes</li></ul><p>Arba aiškiai kiekvienoje temoje nustatykite temą į Stebimą arba Stebimą naudodami \U0001F514.</p><p>Norėdami tai pakeisti, aplankykite savo <a href=\"%{userPrefsUrl}\">nustatymus</a></p>"
       bottom:
         latest: "Daugiau nėra jokių naujausių temų."
         posted: "Daugiau nėra jokių paskelbtų temų."
@@ -2383,8 +2350,6 @@ lt:
       expand_details: "išplėsti temos informaciją"
       unread_indicator: "Nė vienas narys dar neperskaitė paskutinio šios temos įrašo."
       suggest_create_topic: Pasirengę <a href>pradėti naują pokalbį?</a>
-      jump_reply_up: Pereiti į ankstesnį atsakymą
-      jump_reply_down: Pereitį į sekantį atsakymą
       deleted: "Tema buvo ištrinta"
       slow_mode_update:
         title: "Lėtas režimas"
@@ -2911,7 +2876,6 @@ lt:
             description: "Atsegti žymą. Jis nebebus rodoma jūsų žymų sąrašo viršuje."
       filtered_replies:
         viewing_posts_by: "Peržiūrimi %{post_count} pranešimai pagal"
-        viewing_summary: "Peržiūri šios temos santrauką"
         post_number: "%{username}, įrašas #%{post_number}"
         show_all: "Rodyti viską"
     category:
@@ -2924,7 +2888,6 @@ lt:
       back: "Atgal į kategoriją"
       general: "Bendriniai"
       settings: "Nustatymai"
-      topic_template: "Temos šablonas"
       tags: "Žymos"
       tags_allowed_tags: "Apribokite šias žymas šioje kategorijoje:"
       tags_allowed_tag_groups: "Apribokite šias žymų grupes šioje kategorijoje:"
@@ -2975,8 +2938,6 @@ lt:
       images: "Paveiksliukai"
       email_in: " papildomas naujas el. pašto adresas:"
       email_in_allow_strangers: "Gauti el. laiškus iš anoniminių paskyrų neturinčių vartotojų "
-      email_in_disabled: "Naujų temų kūrimas per el. paštą yra negalimas Puslapio Nustatymuose. Jei nori skelbti naujas temas per el. paštą,"
-      email_in_disabled_click: 'nustatykite "email in" nustatymus.'
       mailinglist_mirror: "Kategorija atspindi adresatų sąrašą"
       show_subcategory_list: "Rodyti subkategorijų sąrašą virš šios kategorijos temų."
       read_only_banner: "Reklamjuostės tekstas, kai vartotojas negali sukurti temos šioje kategorijoje:"
@@ -3187,6 +3148,10 @@ lt:
     filters:
       with_topics: "%{filter} temos"
       with_category: "%{filter} %{category} temos"
+      filter:
+        title: "Filtruoti"
+        button:
+          label: "Filtruoti"
       latest:
         title: "Paskutinės"
         title_with_count:
@@ -3280,6 +3245,9 @@ lt:
       counter: "%curr% iš %total%"
       close: "Uždaryti (Esc)"
       content_load_error: '<a href="%url%">Turinio</a> nepavyko įkelti.'
+    experimental_lightbox:
+      buttons:
+        close: "Uždaryti (Esc)"
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
       shortcut_key_delimiter_plus: "+"
@@ -3363,7 +3331,6 @@ lt:
         full_page_search: "%{shortcut} Paleidžiama viso puslapio paieška"
     badges:
       granted_on: "Suteikta %{date}"
-      others_count: "Kiti, turintys šį ženklelį (%{count})"
       title: Ženkleliai
       allow_title: "Šį ženklelį galite naudoti kaip pavadinimą"
       multiple_grant: "Jūs galite uždirbti šį kelis kartus"
@@ -3516,13 +3483,11 @@ lt:
       enabled: "Saugus režimas įjungtas, norėdami išeiti iš saugaus režimo uždarykite šį naršyklės langą"
     image_removed: "(vaizdas pašalintas)"
     pause_notifications:
-      remaining: "Liko %{remaining}"
       options:
         half_hour: "30 minučių"
         one_hour: "1 valanda"
         two_hours: "2 valandos"
         tomorrow: "Iki rytojaus"
-        custom: "Išskirtinės"
       set_schedule: "Nustatykite pranešimų tvarkaraštį"
     trust_levels:
       names:
@@ -3564,7 +3529,21 @@ lt:
         other: "%{count} nauja"
       more: "Daugiau"
       all_categories: "Visos kategorijos"
+      edit_navigation_modal_form:
+        filter_dropdown:
+          all: "Visos"
       sections:
+        custom:
+          save: "Išsaugoti"
+          delete: "Pašalinti"
+          links:
+            reset: "Atstatyti numatytuosius nustatymus"
+            icon:
+              label: "Ikona"
+            name:
+              label: "Pavadinimas"
+            value:
+              label: "nuoroda"
         about:
           header_link_text: "Apie"
         messages:
@@ -3582,7 +3561,8 @@ lt:
         categories:
           header_link_text: "Kategorijos"
         community:
-          header_link_text: "Bendruomenė"
+          edit_section:
+            header_dropdown: "Pakeisti"
           links:
             about:
               content: "Apie"
@@ -3590,8 +3570,8 @@ lt:
               content: "Adminas"
             badges:
               content: "Trofėjai"
-            everything:
-              content: "Viskas"
+            topics:
+              content: "Temos"
               title: "Visos temos"
             faq:
               content: "DUK"
@@ -3604,6 +3584,11 @@ lt:
             review:
               content: "Peržiūra"
     until: "Iki:"
+    form_templates:
+      errors:
+        typeMismatch:
+          default: "Prašome įrašyti tinkamą reikšmę."
+          email: "Prašom įrašyti teisingą elektroninį adresą."
   admin_js:
     type_to_filter: "įrašyk kažką dėl filtro..."
     admin:
@@ -3875,9 +3860,6 @@ lt:
         notification_event:
           name: "Pranešimo įvykis"
           details: "Kai vartotojas gauna pranešimą savo sklaidos kanale."
-        user_badge_event:
-          name: "Renginys dėl ženklelio suteikimo"
-          details: "Kai vartotojas gauna ženklelį."
         group_user_event:
           name: "Grupės vartotojo įvykis"
           details: "Kai vartotojas įtraukiamas arba pašalinamas iš grupės."
@@ -3910,7 +3892,6 @@ lt:
         enabled: "Galimas?"
         is_enabled: "Taip"
         not_enabled: "Ne"
-        change_settings: "Pakeisti nustatymus"
         change_settings_short: "Nustatymai"
         howto: "Kaip galiu instaliuoti plungin'us?"
         official: "Oficialus papildinys"
@@ -4194,6 +4175,8 @@ lt:
           love:
             name: "patinka"
             description: "Mygtuko \"Patinka\" spalva."
+          selected:
+            name: "pasirinktas"
         robots:
           title: "Nepaisykite savo svetainės robots.txt failo:"
           warning: "Tai visam laikui pakeis visus susijusius svetainės nustatymus."
@@ -4454,12 +4437,7 @@ lt:
           silence: "Nutildyti"
           link: "Nuoroda"
         action_descriptions:
-          block: "Neleisti skelbti įrašų, kuriuose yra šie žodžiai. Vartotojas matys klaidos pranešimą, kai bandys pateikti savo įrašą."
-          censor: "Leiskite pranešimus, kuriuose yra šie žodžiai, bet pakeiskite juos simboliais, kurie slepia cenzūruotus žodžius."
-          require_approval: "Įrašams, kuriuose yra šie žodžiai, reikės darbuotojų patvirtinimo, kad jie būtų matomi."
-          flag: "Leisti įrašus, kuriuose yra šių žodžių, bet pažymėti juos kaip netinkamus, kad moderatoriai galėtų juos peržiūrėti."
-          replace: "Pakeiskite žodžius įrašuose kitais žodžiais"
-          tag: "Automatiškai žymėti temas pagal pirmąjį įrašą"
+          replace: "Pakeiskite žodžius įrašuose kitais žodžiais."
         form:
           label: "Turi žodį ar frazę"
           placeholder_regexp: "Įprasta išraiška"
@@ -4478,6 +4456,37 @@ lt:
           modal_title: "%{action}: išbandykite žiūrėtus žodžius"
           found_matches: "Rastos atitiktys:"
           no_matches: "Atitikmenų nerasta"
+      form_templates:
+        nav_title: "Juodraščiai"
+        list_table:
+          headings:
+            name: "Vardas"
+            actions: "Veiksmai"
+        view_template:
+          close: "Uždaryti"
+          edit: "Redaguoti"
+          delete: "Pašalinti"
+        new_template_form:
+          submit: "Išsaugoti"
+          cancel: "Atšaukti"
+          preview: "Peržiūrėti"
+        quick_insert_fields:
+          add_new_field: "Pridėti"
+          dropdown: "Išskleidimas"
+        validations_modal:
+          table_headers:
+            key: "Raktas"
+            type: "Tipas"
+            description: "Aprašymas"
+          validations:
+            required:
+              key: "privalomi"
+            minimum:
+              key: "minimumas"
+            maximum:
+              key: "maksimalus"
+            type:
+              key: "tipas"
       impersonate:
         title: "Apsimesti"
         help: "Naudok šį įrankį, kad pavaizduotum kito vartotojo paskyrą dėl klaidų paieškos ir sistemos atstatymo. Kai tik baigsi procedūrą, turėsi atsijungti."
@@ -4490,6 +4499,7 @@ lt:
         not_found: "Atsiprašome, toks slapyvardis neegzistuoja mūsų sistemoje."
         id_not_found: "Atsiprašome, tačiau toks vartotojo ID sistemoje neegzistuoja"
         active: "aktyvuota"
+        status: "Statusas"
         show_emails: "Rodyti el. pašto adresus"
         hide_emails: "Slėpti laiškus"
         nav:
@@ -4564,7 +4574,6 @@ lt:
         staged: "Inscenizuotas?"
         show_admin_profile: "Administravimas"
         show_public_profile: "Rodyti viešą profilį"
-        impersonate: "Apsimesti"
         action_logs: "Veiksmų įrašai"
         ip_lookup: "IP Peržiūra"
         log_out: "Atsijungti"
@@ -4773,6 +4782,8 @@ lt:
         show_overriden: "Rodyti tik pakeistus"
         locale: "Kalba:"
         more_than_50_results: "Yra daugiau nei 50 rezultatų. Prašome patikslinti paiešką."
+        outdated:
+          dismiss: "Praleisti"
       settings:
         show_overriden: "Rodyti tik pakeistus"
         history: "Peržiūrėti pakeitimų istoriją"
@@ -4785,7 +4796,6 @@ lt:
             label: "Pridėti jaustukus"
         title: "Nustatymai"
         no_results: "Nerasta jokių rezultatų."
-        more_than_30_results: "Yra daugiau nei 30 rezultatų. Patikslinkite paiešką arba pasirinkite kategoriją."
         clear_filter: "Išvalyti"
         add_url: "pridėti URL"
         add_host: "pridėti šeimininką"
@@ -4870,7 +4880,8 @@ lt:
         allow_title: Leisti naudoti ženklelį kaip antraštę
         multiple_grant: Gali būti suteikta keleta kartų
         listable: Rodyti trofėjų viešame trofėjų puslapyje
-        enabled: Įjungti ženklelį
+        enabled: galimas
+        disabled: uždrausta
         icon: Ikona
         image: Paveikslėlis
         graphic: Grafinis
@@ -4935,7 +4946,6 @@ lt:
         confirm_delete: "Ar tikrai nori ištrinti šį šeimininką?"
         title: "Įterpimai"
         host: "Šeimininkai"
-        class_name: "Klasės pavadinimas"
         edit: "redaguoti"
         category: "Rašyti Kategorijoje"
         add_host: "Pridėti Šeimininką"
diff --git a/config/locales/client.lv.yml b/config/locales/client.lv.yml
index 9b4cd68cd82..4dc87261555 100644
--- a/config/locales/client.lv.yml
+++ b/config/locales/client.lv.yml
@@ -169,8 +169,6 @@ lv:
     software_update_prompt:
       message: "Mēs esam atjauninājuši šo vietni, <span>lūdzu, atjaunojiet to</span>, pretējā gadījumā var rasties kļūdas."
       dismiss: "Nerādīt"
-    bootstrap_mode_disabled: "Bootstrap režīms tiks atspējots 24 stundu laikā."
-    bootstrap_invite_button_title: "Nosūtīt ielūgumus"
     themes:
       default_description: "Noklusējums"
     s3:
@@ -277,10 +275,8 @@ lv:
       edit_bookmark: "Rediģēt grāmatzīmi"
       clear_bookmarks: "Noņemt grāmatzīmi"
       help:
-        bookmark: "Uzklikšķiniet, lai pievienot šīs tēmas pirmo ierakstu grāmatzīmēm"
-        edit_bookmark: "Noklikšķiniet, lai rediģētu šīs tēmas grāmatzīmi"
         unbookmark: "Uzklikšķiniet, lai noņemtu visas grāmatzīmes šai temā"
-        unbookmark_with_reminder: "Noklikšķiniet, lai šajā tēmā noņemtu visas grāmatzīmes un atgādinājumus."
+        unbookmark_with_reminder: "Noklikšķiniet, lai šajā tēmā noņemtu visas grāmatzīmes un atgādinājumus"
     bookmarks:
       created: "Jūs esat atzīmējis šo ziņu ar grāmatzīmi. %{name}"
       not_bookmarked: "atzīmējiet šo ziņu ar grāmatzīmi"
@@ -311,7 +307,6 @@ lv:
       new_topic: "Jaunas tēmas melnraksts"
       new_private_message: "Jauns personīgā ziņojuma melnraksts"
       abandon:
-        confirm: "Šim tematam tiek izstrādāts melnraksts. Ko jūs vēlētos ar to darīt?"
         yes_value: "Izmest"
         no_value: "Atsākt rediģēšanu"
     preview: "priekšskatījums"
@@ -453,11 +448,9 @@ lv:
       scores:
         about: "Šis rādītājs tiek aprēķināts, pamatojoties uz ziņotāja uzticības līmeni, viņa iepriekšējo karodziņu precizitāti un ziņotā vienuma prioritāti."
         score: "Rezultāts"
-        date: "Datums"
-        type: "Tips"
+        type: "Iemesls"
         status: "Statuss"
-        submitted_by: "Iesniedzis"
-        reviewed_by: "Pārskatīja"
+        submitted_by: "Ziņoja"
       statuses:
         pending:
           title: "Gaidošie"
@@ -465,14 +458,12 @@ lv:
           title: "Apstiprināts"
         rejected:
           title: "Noraidīts"
-        ignored:
-          title: "Ignorēts"
-        deleted:
-          title: "Dzēsts"
         reviewed:
-          title: "(visi pārskatīti)"
+          title: "Visi pārskatīti"
         all:
-          title: "(viss)"
+          title: "Viss"
+      context_question:
+        delimiter: "vai"
       types:
         reviewable_flagged_post:
           title: "Marķētie ieraksts"
@@ -744,6 +735,7 @@ lv:
         make_all_primary_description: "Padariet to par galveno grupu visiem atlasītajiem lietotājiem"
         remove_all_primary: "Noņemt kā primāro"
         remove_all_primary_description: "Noņemt šo grupu kā galveno"
+        status: "Statuss"
         owner: "Īpašnieks"
         primary: "Primārais"
         forbidden: "Jums nav atļauts skatīt dalībniekus."
@@ -858,11 +850,6 @@ lv:
       profile: "Profils"
       mute: "Klusināt"
       edit: "Mainīt iestatījumus"
-      download_archive:
-        button_text: "Lejupielādēt visu"
-        confirm: "Vai esat droši, ka vēlaties lejuplādēt savus ierakstus?"
-        success: "Lejuplāde uzsākta; pavēstīsim jums ziņā, kad šis process būs beidzies."
-        rate_limit_error: "Ierakstus var lejuplādēt reizi dienā, lūdzu mēģiniet atkal rītdien."
       new_private_message: "Jauns ziņa"
       private_message: "Ziņa"
       private_messages: "Ziņas"
@@ -1035,13 +1022,6 @@ lv:
       save_to_change_theme: 'Tēma tiks atjaunināta pēc noklikšķināšanas uz "%{save_text}"'
       home: "Noklusējuma sākumlapa"
       staged: "Izveidots"
-      staff_counters:
-        flags_given: "noderīgas sūdzības"
-        flagged_posts: "ieraksti ar sūdzībām"
-        deleted_posts: "izdzēstie ieraksti"
-        suspensions: "īslaicīgās bloķēšanas"
-        warnings_received: "brīdinājumi"
-        rejected_posts: "noraidītās ziņas"
       messages:
         all: "visas iesūtnes"
         inbox: "Iesūtne"
@@ -1091,8 +1071,6 @@ lv:
         title: "Divu faktoru rezerves kodi"
         regenerate: "Atkārtoti radīt"
         disable: "Atslēgt"
-        enable: "Ieslēgt"
-        enable_long: "Iespējot rezerves kodus"
         copy_to_clipboard: "Kopēt uz starpliktuvi (clipboard)"
         copy_to_clipboard_error: "Radās kļūda, kopējot uz starpliktuvi (clipboard)"
         copied_to_clipboard: "Nokopēts uz starpliktuvi (clipboard)"
@@ -1507,8 +1485,6 @@ lv:
       hide_forever: "nē, paldies"
       hidden_for_session: "Labi, mēs jums jautāsim rīt. Jūs vienmēr varat izmantot arī “Pieteikties”, lai izveidotu kontu."
     summary:
-      enabled_description: "Jūs skatāties šīs tēmas kopsavilkumu: pašus interesantākos ierakstus, pēc kopienas domām."
-      enable: "Tēmas kopsavilkums"
       disable: "Parādīt visus ierakstus"
     deleted_filter:
       enabled_description: "Šī tēma satur dzēstus ierakstus, kuri ir paslēpti."
@@ -1711,8 +1687,6 @@ lv:
         title_missing: "Vajadzīgs nosaukums"
         category_missing: "Jums ir jāizvēlas sadaļa"
       save_edit: "Saglabāt izmaiņas"
-      reply_original: "Atbildēt sākotnējā tēmā"
-      reply_here: "Atbildēt šeit"
       reply: "Atbildēt"
       cancel: "Atcelt"
       create_topic: "Izveidot tēmu"
@@ -2004,8 +1978,6 @@ lv:
       back_to_list: "Atpakaļ pie tēmu saraksta "
       options: "Tēmas iestatījumi "
       show_links: "rādīt saites šajā tēmā"
-      jump_reply_up: pāriet uz agrāku atbildi
-      jump_reply_down: pāriet uz vēlāku atbildi
       deleted: "Tēma ir dzēsta "
       slow_mode_update:
         enable: "Ieslēgt"
@@ -2360,7 +2332,6 @@ lv:
       view: "Aplūkot sadaļas ierakstus"
       general: "Vispārīgi"
       settings: "Iestatījumi"
-      topic_template: "Tēmas šablons"
       tags: "Tagi"
       tags_placeholder: "(Pēc izvēles) atļauto tagu saraksts"
       tag_groups_placeholder: "(Pēc izvēles) atļauto tagu grupu saraksts"
@@ -2397,7 +2368,6 @@ lv:
       images: "Attēli"
       email_in: "Īpašas ienākošā e-pasta adreses:"
       email_in_allow_strangers: "Pieņemt e-pastus no anonīmiem lietotājiem bez profiliem"
-      email_in_disabled: "Jaunu tēmu ievietošana, izmantojot e-pastu, ir atcelta foruma iestatījumos. Lai atļautu ievietot jaunas tēmas, izmantojot e-pastu,"
       show_subcategory_list: "Rādīt apakšsadaļu sarakstu virs tēmām šai sadaļā."
       num_featured_topics: "Sadaļu lapā parādīto tēmu skaits:"
       subcategory_list_style: "Apakšsadaļu saraksta stils:"
@@ -2559,6 +2529,10 @@ lv:
     filters:
       with_topics: "%{filter} tēmas"
       with_category: "%{filter} Sadaļas %{category} tēmas"
+      filter:
+        title: "Filtrs"
+        button:
+          label: "Filtrs"
       latest:
         title: "Pēdējie"
         title_with_count:
@@ -2695,7 +2669,6 @@ lv:
         one: "Nopelnīja šo žetonu %{count} reizi"
         other: "Nopelnīja šo žetonu %{count} reizes"
       granted_on: "Piešķirts %{date}"
-      others_count: "Citi ar šo žetonu (%{count})"
       title: Žetoni
       allow_title: "Jūs varat izmantot šo žetonu kā titulu"
       multiple_grant: "Jūs esat nopelnījis šo vairākkārt"
@@ -2787,8 +2760,6 @@ lv:
       dismiss: "Nerādīt"
     safe_mode:
       enabled: "Ir ieslēgts drošais režīms; lai pamestu drošo režīmu, aizveriet šo pārlūkprogrammas logu"
-    pause_notifications:
-      remaining: "palicis %{remaining}"
     trust_levels:
       names:
         newuser: "jauns lietotājs"
@@ -2805,7 +2776,19 @@ lv:
         other: "%{count} jauna"
       more: "Vairāk"
       all_categories: "Visas sadaļas"
+      edit_navigation_modal_form:
+        filter_dropdown:
+          all: "Viss"
       sections:
+        custom:
+          save: "Saglabāt"
+          delete: "Dzēst"
+          links:
+            reset: "Atiestatīt uz noklusējumu"
+            icon:
+              label: "Ikona"
+            name:
+              label: "Nosaukums"
         about:
           header_link_text: "Par"
         messages:
@@ -2823,7 +2806,8 @@ lv:
         categories:
           header_link_text: "Sadaļas"
         community:
-          header_link_text: "Kopiena"
+          edit_section:
+            header_dropdown: "Pielāgot"
           links:
             about:
               content: "Par"
@@ -2831,8 +2815,8 @@ lv:
               content: "Administrators"
             badges:
               content: "Žetoni"
-            everything:
-              content: "Viss"
+            topics:
+              content: "Tēmas"
             faq:
               content: "BUJ"
             groups:
@@ -2843,6 +2827,11 @@ lv:
               content: "Mani ieraksti"
             review:
               content: "Pārskats"
+    form_templates:
+      errors:
+        typeMismatch:
+          default: "Lūdzu ievadiet derīgu vērtību "
+          email: "Lūdzu ievadiet derīgu e-pasta adresi."
   admin_js:
     type_to_filter: "ievadiet, lai atlasītu..."
     admin:
@@ -3016,7 +3005,6 @@ lv:
         enabled: "Ieslēgts?"
         is_enabled: "Jā"
         not_enabled: "Nē"
-        change_settings: "Mainīt iestatījumus"
         change_settings_short: "Iestatījumi"
         howto: "Kā instalēt spraudņus?"
       backups:
@@ -3333,15 +3321,40 @@ lv:
           censor: "Cenzēt"
           require_approval: "Pieprasīt apstiprinājumu"
           flag: "Sūdzība"
-        action_descriptions:
-          block: "Neļaut publicēt ierakstus, kas satur šos vārdus. Lietotājs redzēs kļūdas paziņojumu, kad mēģinās nosūtīt savu ierakstu."
-          censor: "Atļaut ierakstus, kas satur šos vārdus, taču aizvietot tos ar simboliem, kas tos paslēps."
-          require_approval: "Ierakstiem, kas satur šos vārdus, būs nepieciešams darbinieku apstiprinājums, pirms tos varēs redzēt citi."
-          flag: "Atļaut ierakstus, kas satur šos vārdus, taču atzīmēt tos kā nepiedienīgus, lai moderatori var tos pārbaudīt."
         form:
           add: "Pievienot"
           success: "Veiksmīgi"
           upload_successful: "Augšupielāde ir veiksmīga. Vārdi ir pievienoti."
+      form_templates:
+        nav_title: "Veidnes"
+        list_table:
+          headings:
+            name: "Vārds"
+            actions: "Darbības"
+        view_template:
+          close: "Aizvērt"
+          edit: "Rediģēt"
+          delete: "Dzēst"
+        new_template_form:
+          submit: "Saglabāt"
+          cancel: "Atcelt"
+          preview: "Priekšskatījums"
+        quick_insert_fields:
+          add_new_field: "Pievienot"
+          dropdown: "Nolaižams izvēļu saraksts"
+        validations_modal:
+          table_headers:
+            type: "Tips"
+            description: "Apraksts"
+          validations:
+            required:
+              key: "obligāts"
+            minimum:
+              key: "minimums"
+            maximum:
+              key: "maksimums"
+            type:
+              key: "tips"
       impersonate:
         title: "Izlikties (impersonate)"
         help: "Use this tool to impersonate a user account for debugging purposes. You will have to log out once finished.\nIzmanto šo rīku lai izkliktos (impersonate) par lietotāju priekš kļūdu (bugs) meklēšanas. Vajadzēs izlogoties pēc sesijas beigām."
@@ -3353,6 +3366,7 @@ lv:
         last_emailed: "Pēdējo reizi saņēmis e-pastu"
         not_found: "Piedod, šāds lietotājvārds neeksistē mūsu sistēmā."
         id_not_found: "Piedod, šāds lietotāja ID neeksistē mūsu sistēmā."
+        status: "Statuss"
         show_emails: "Parādīt E-pastus"
         nav:
           new: "Jauns"
@@ -3393,7 +3407,6 @@ lv:
         staged: "Izveidots?"
         show_admin_profile: "Administrators"
         show_public_profile: "Parādīt publisko profilu"
-        impersonate: "Izlikties (Impersonate)"
         action_logs: "Aktivitāšu saraksts"
         ip_lookup: "IP meklēšana"
         log_out: "Iziet"
@@ -3565,6 +3578,8 @@ lv:
         go_back: "Atpakaļ pie meklētāja"
         recommended: "Iesakām pielāgot šo tekstu jūsu vajadzībām:"
         show_overriden: "Rādīt tikai aizstātos"
+        outdated:
+          dismiss: "Nerādīt"
       settings:
         show_overriden: "Rādīt tikai aizstātos"
         reset: "atiestatīt"
@@ -3644,7 +3659,8 @@ lv:
         allow_title: Atļaut žetonam parādīties titulā
         multiple_grant: Var tikt piešķirts vairākas reizes
         listable: Rādīt žetonu publisko žeotnu lapā
-        enabled: Atļaut žetonu
+        enabled: ieslēgts
+        disabled: atslēgt
         icon: Ikona
         image: Bilde
         query: Vaicājums Žetons (SQL)
@@ -3691,7 +3707,6 @@ lv:
         confirm_delete: "Vai tiešām vēlies dzēst šo?"
         title: "Ieguldīšana"
         host: "Atļautie lietotāji"
-        class_name: "Klases Nosaukums"
         edit: "labot"
         category: "Ieraksti kategorijā"
         add_host: "Pievienot lietotāju"
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index 5cb13068d79..1adddcb0a05 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -163,8 +163,6 @@ nb_NO:
     software_update_prompt:
       message: "Vi har oppdatert dette nettstedet, <span>Oppdater</span>, eller du kan oppleve uventet oppførsel."
       dismiss: "Avslå"
-    bootstrap_mode_disabled: "Oppstartsmodus vil bli deaktivert i løpet av 24 timer."
-    bootstrap_invite_button_title: "Send invitasjoner"
     themes:
       default_description: "Forvalg"
     s3:
@@ -268,10 +266,8 @@ nb_NO:
       edit_bookmark: "Rediger bokmerke"
       clear_bookmarks: "Fjern bokmerker"
       help:
-        bookmark: "Klikk for å bokmerke det første innlegget i dette emnet"
-        edit_bookmark: "Klikk for å redigere bokmerket på dette emnet"
         unbookmark: "Klikk for å fjerne alle bokmerker i dette emnet"
-        unbookmark_with_reminder: "Klikk for å fjerne alle bokmerkene og påminnelsene i dette emnet."
+        unbookmark_with_reminder: "Klikk for å fjerne alle bokmerkene og påminnelsene i dette emnet"
     bookmarks:
       created: "Du har bokmerket dette innlegget. %{name}"
       create: "Opprett bokmerke"
@@ -306,7 +302,6 @@ nb_NO:
       new_topic: "Nytt emneutkast"
       new_private_message: "Nytt personlig meldingsutkast"
       abandon:
-        confirm: "Du har et pågående utkast for dette emnet. Hva vil du gjøre med det?"
         yes_value: "Forkast"
         no_value: "Gjenoppta redigering"
     topic_count_categories:
@@ -477,11 +472,9 @@ nb_NO:
       scores:
         about: "Denne scoren beregnes ut fra tillitsnivået til eksportøren, nøyaktigheten til deres forrige flagg, og prioriteten til posten som skal rapporteres."
         score: "Poeng"
-        date: "Dato"
-        type: "Type"
+        type: "Begrunnelse"
         status: "Status"
-        submitted_by: "Innsendt av"
-        reviewed_by: "Gjennomgått av"
+        submitted_by: "Rapporter av"
       statuses:
         pending:
           title: "På vent"
@@ -489,14 +482,12 @@ nb_NO:
           title: "Godkjent"
         rejected:
           title: "Avvist"
-        ignored:
-          title: "Ignorert"
-        deleted:
-          title: "Slettet"
         reviewed:
-          title: "(alle gjennomgått)"
+          title: "Alle gjennomgått"
         all:
-          title: "(alt)"
+          title: "Alt"
+      context_question:
+        delimiter: "eller"
       types:
         reviewable_flagged_post:
           title: "Rapportert innlegg"
@@ -795,6 +786,7 @@ nb_NO:
         make_all_primary_description: "Gjør denne hovedgruppen til alle valgte brukere"
         remove_all_primary: "Fjern som primær"
         remove_all_primary_description: "Fjern denne gruppen som primær"
+        status: "Status"
         owner: "Eier"
         primary: "Primær"
         forbidden: "Du har ikke tillatelse til å vise medlemmene."
@@ -907,11 +899,6 @@ nb_NO:
       profile: "Profil"
       mute: "Ignorer"
       edit: "Rediger innstillinger"
-      download_archive:
-        button_text: "Last ned alle"
-        confirm: "Er du sikker på at du vil laste ned innleggene dine?"
-        success: "Nedlasting iverksatt. Du vil bli varslet med en melding når prosessen er fullført."
-        rate_limit_error: "Innlegg kan lastes ned en gang om dagen, prøv igjen i morgen."
       new_private_message: "Ny Melding"
       private_message: "Melding"
       private_messages: "Meldinger"
@@ -1086,13 +1073,6 @@ nb_NO:
       save_to_change_theme: 'Temaet vil bli oppdatert etter at du klikker på "%{save_text}»'
       home: "Forvalgt hjemmeside"
       staged: "Arrangert"
-      staff_counters:
-        flags_given: "nyttige rapporteringer"
-        flagged_posts: "rapporterte innlegg"
-        deleted_posts: "slettede innlegg"
-        suspensions: "suspenderinger"
-        warnings_received: "advarsler"
-        rejected_posts: "avviste innlegg"
       messages:
         inbox: "Innboks"
         latest: "Siste"
@@ -1138,11 +1118,6 @@ nb_NO:
         title: "To-faktor backup koder"
         regenerate: "Regenerer"
         disable: "Deaktiver"
-        enable: "Aktiver"
-        enable_long: "Aktiver reservekoder"
-        manage:
-          one: "Administrer sikkerhetskoder. Du har <strong>%{count}</strong> reservekode igjen."
-          other: "Administrer sikkerhetskoder. Du har igjen <strong>%{count}</strong> reservekoder."
         copy_to_clipboard: "Kopier til utklippstavle"
         copy_to_clipboard_error: "Feil ved kopiering til utklippstavlen"
         copied_to_clipboard: "Kopiert til utklippstavlen"
@@ -1572,8 +1547,6 @@ nb_NO:
       enabled: "Dette nettstedet er i lesemodus. Fortsett gjerne å lese, men du kan ikke svare, gi likes eller utføre andre handlinger som er slått av."
       login_disabled: "Innlogging er deaktivert mens nettsiden er i skrivebeskyttet modus."
       logout_disabled: "Du kan ikke logge ut når nettstedet er i lese-modus."
-    too_few_posts_notice_MF: |
-      La oss <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">starte diskusjonen!</a> Der {currentPosts, plural, one {er <strong>#</strong> innlegg} other {er <strong>#</strong> innlegg}}. Besøkende trenger mer å lese og svare på — vi anbefaler minst {requiredPosts, plural, one {<strong>#</strong> innlegg} other {<strong>#</strong> innlegg}}. Bare ansatte kan se denne meldingen.
     logs_error_rate_notice:
       reached_hour_MF: |
         <b>{relativeAge}</b> — <a href='{url}' target='_blank'>{rate, plural, one {# feil/time} other {# feil/time}}</a> nådd området innstillingen grense for {limit, plural, one {# feil/time} other {# feil/time}}.
@@ -1602,10 +1575,8 @@ nb_NO:
       hidden_for_session: "OK, vi vil spørre deg i morgen. Du kan alltid bruke \"Logg Inn\" for å opprette en konto."
       intro: "Hei! Ser ut som du liker diskusjonen, men du har ikke registrert deg for en konto ennå."
     summary:
-      enabled_description: "Du ser for øyeblikket en oppsummering av dette emnet: de mest interessante innleggene ifølge brukerne."
       description_time_MF: |
         Det {replyCount, plural, one {er <b>#</b> svar} other {er <b>#</b> svarer}} med en estimert lesetid på <b>{readingTime, plural, one {# minutt} other {# minutter}}</b>.
-      enable: "Oppsummer dette emnet"
       disable: "Vis alle innlegg"
     deleted_filter:
       enabled_description: "Dette emnet inneholder slettede innlegg, som er blitt skjult."
@@ -1845,8 +1816,6 @@ nb_NO:
         topic_template_not_modified: "Vennligst legg til detaljer og spesifikasjoner for emnet ditt ved å redigere emnemalen."
       save_edit: "Lagre endring"
       overwrite_edit: "Overskriv Rediger"
-      reply_original: "Svar på det opprinnelige emnet"
-      reply_here: "Svar her"
       reply: "Svar"
       cancel: "Avbryt"
       create_topic: "Opprett emne"
@@ -2192,7 +2161,7 @@ nb_NO:
         top: "Det finnes ingen populære emner."
         educate:
           new: '<p>Dine nye emner vil vises her. Som standard betraktes emner som nye, og vil vise en <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span> indikator hvis de ble opprettet i de siste 2 dagene.</p><p>Besøk dine <a href="%{userPrefsUrl}">preferanser</a> for å endre dette.</p>'
-          unread: '<p>Dine uleste emner vil vises her.</p><p>Som forvalg anses emner som ulest og vil vise ulest-tall <span class="badge unread-posts badge-notification">1</span> dersom du:</p><ul><li>Opprettet emnet</li><li>Svarte på emnet</li><li>Leste emnet i mer enn 4 minutter</li></ul><p>Eller dersom du uttrykkelig har satt emnet som overvåkes eller følges via varselkontrollen nederst i hvert emne.</p><p>Gå til<a href="%{userPrefsUrl}">innstillingene</a> dine for å endre dette.</p>'
+          unread: '<p>Dine uleste emner vil vises her.</p><p>Som forvalg anses emner som ulest og vil vise ulest-tall <span class="badge unread-posts badge-notification">1</span> dersom du:</p><ul><li>Opprettet emnet</li><li>Svarte på emnet</li><li>Leste emnet i mer enn 5 minutter</li></ul><p>Eller dersom du uttrykkelig har satt emnet som overvåkes eller følges via varselkontrollen nederst i hvert emne.</p><p>Gå til<a href="%{userPrefsUrl}">innstillingene</a> dine for å endre dette.</p>'
       bottom:
         latest: "Det finnes ingen flere siste emner."
         posted: "Det finnes ingen flere emner med innlegg."
@@ -2253,8 +2222,6 @@ nb_NO:
       expand_details: "utvid emnebeskrivelse"
       unread_indicator: "Ingen medlem har lest den siste posten i dette emnet ennå."
       suggest_create_topic: Klar til å <a href>starte en ny samtale?</a>
-      jump_reply_up: hopp til tidligere svar
-      jump_reply_down: hopp til senere svar
       deleted: "Emnet ble slettet"
       slow_mode_update:
         title: "Langsom Modus"
@@ -2787,7 +2754,6 @@ nb_NO:
       filtered_replies:
         viewing_posts_by: "Viser %{post_count} innlegg av"
         viewing_subset: "Noen svar er kollapset"
-        viewing_summary: "Vise et sammendrag av dette emnet"
         post_number: "%{username}, post #%{post_number}"
         show_all: "Vis alle"
     category:
@@ -2800,7 +2766,6 @@ nb_NO:
       back: "Tilbake til kategori"
       general: "Generelt"
       settings: "Innstillinger"
-      topic_template: "Mal for emne"
       tags: "Stikkord"
       tags_allowed_tags: "Begrens disse taggene til denne kategorien:"
       tags_allowed_tag_groups: "Begrens disse tagggruppene til denne kategorien:"
@@ -2854,8 +2819,6 @@ nb_NO:
       images: "Bilder"
       email_in: "Egendefinert innkommende e-postadresse:"
       email_in_allow_strangers: "Godta e-post fra anonyme brukere uten brukerkonto"
-      email_in_disabled: "Publisering av nye emner via e-post er deaktivert i innstillingene for nettstedet. For å aktivere publisering av nye emner via e-post,"
-      email_in_disabled_click: 'aktiver innstillingen "e-post inn".'
       mailinglist_mirror: "Kategorien gjenspeiler en e-postliste"
       show_subcategory_list: "Plasser listen over underkategorien i toppen av emner i denne kategorien."
       read_only_banner: "Banner-tekst når en bruker ikke kan opprette et emne i denne kategorien:"
@@ -3054,6 +3017,10 @@ nb_NO:
     filters:
       with_topics: "%{filter} emner"
       with_category: "%{filter} %{category} emner"
+      filter:
+        title: "Filtrer"
+        button:
+          label: "Filtrer"
       latest:
         title: "Siste"
         title_with_count:
@@ -3132,6 +3099,9 @@ nb_NO:
       close: "Lukk (Esc)"
       content_load_error: '<a href="%url%">Innholdet</a> kunne ikke lastes.'
       image_load_error: '<a href="%url%">Bildet</a> kunne ikke lastes.'
+    experimental_lightbox:
+      buttons:
+        close: "Lukk (Esc)"
     cannot_render_video: Denne videoen kan ikke lages fordi nettleseren din ikke støtter koden.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
@@ -3221,7 +3191,6 @@ nb_NO:
         one: "Har gjort seg fortjent til dette merket"
         other: "Har gjort seg fortjent til dette merket %{count} ganger"
       granted_on: "Tildelt %{date}"
-      others_count: "(%{count}) andre har dette merket"
       title: Merker
       allow_title: "Du kan bruke dette merket som tittel"
       multiple_grant: "Du kan oppnå dette flere ganger"
@@ -3378,13 +3347,11 @@ nb_NO:
       enabled: "Sikkert modus er påskrudd, for å skru av sikkert modus, lukk dette nettleservinduet"
     image_removed: "(bilde fjernet)"
     pause_notifications:
-      remaining: "%{remaining} gjenstående"
       options:
         half_hour: "30 minutter"
         one_hour: "1 time"
         two_hours: "2 timer"
         tomorrow: "Frem til i morgen"
-        custom: "Egendefinert"
       set_schedule: "Angi en varslingsplan"
     trust_levels:
       names:
@@ -3407,7 +3374,19 @@ nb_NO:
         other: "%{count} nye"
       more: "Mer"
       all_categories: "Alle kategorier"
+      edit_navigation_modal_form:
+        filter_dropdown:
+          all: "Alle"
       sections:
+        custom:
+          save: "Lagre"
+          delete: "Slett"
+          links:
+            reset: "Tilbakestill til standard"
+            icon:
+              label: "Ikon"
+            name:
+              label: "Navn"
         about:
           header_link_text: "Om"
         messages:
@@ -3425,7 +3404,8 @@ nb_NO:
         categories:
           header_link_text: "Kategorier"
         community:
-          header_link_text: "Gemenskap"
+          edit_section:
+            header_dropdown: "Tilpasse"
           links:
             about:
               content: "Om"
@@ -3433,8 +3413,8 @@ nb_NO:
               content: "Administrator"
             badges:
               content: "Merker"
-            everything:
-              content: "Alt"
+            topics:
+              content: "Emner"
             faq:
               content: "O-S-S"
             groups:
@@ -3446,6 +3426,11 @@ nb_NO:
             review:
               content: "Gjennomgang"
     until: "Inntil:"
+    form_templates:
+      errors:
+        typeMismatch:
+          default: "Skriv inn en gyldig verdi."
+          email: "Oppgi en gyldig e-postadresse."
   admin_js:
     type_to_filter: "skriv for å filtrere…"
     admin:
@@ -3675,9 +3660,6 @@ nb_NO:
         notification_event:
           name: "Varslingshendelse"
           details: "Når en bruker mottar et varsel i feeden."
-        user_badge_event:
-          name: "Badge Tillat hendelse"
-          details: "Når en bruker mottar et merke."
         group_user_event:
           name: "Gruppebrukerhendelse"
           details: "Når en bruker er lagt til eller fjernet i en gruppe."
@@ -3720,7 +3702,6 @@ nb_NO:
         enabled: "Aktivert?"
         is_enabled: "J"
         not_enabled: "N"
-        change_settings: "Endre instillinger"
         change_settings_short: "Innstillinger"
         howto: "Hvordan installerer jeg utvidelser?"
         official: "Offisiell Plugin"
@@ -3973,6 +3954,8 @@ nb_NO:
           love:
             name: "liker"
             description: "Fargen til Liker-knappen."
+          selected:
+            name: "valgt"
         robots:
           title: "Overstyr nettstedets robots.txt fil:"
           warning: "Dette vil permanent overstyre alle relaterte nettstedsinnstillinger."
@@ -4235,11 +4218,6 @@ nb_NO:
           require_approval: "Krev godkjenning"
           flag: "Flagg"
           silence: "Demp"
-        action_descriptions:
-          block: "Forhindre innlegg som inneholder disse ordene, fra å bli opprettet. Brukeren vil se en feilmelding når vedkommende prøver å opprette innlegget sitt."
-          censor: "Tillat innlegg som inneholder disse ordene, men erstatt dem med bokstaver som skjuler de sensurerte ordene."
-          require_approval: "Innlegg som inneholder disse ordene, vil måtte godkjennes av staben før de kan bli sett."
-          flag: "Tillat innlegg som inneholder disse ordene, men flagg dem som upassende slik at moderatorer kan se over dem."
         form:
           placeholder_regexp: "regulært uttrykk"
           add: "Legg til"
@@ -4249,6 +4227,36 @@ nb_NO:
         test:
           button_label: "Test"
           no_matches: "Ingen treff funnet"
+      form_templates:
+        nav_title: "Maler"
+        list_table:
+          headings:
+            name: "Navn"
+            actions: "Handlinger"
+        view_template:
+          close: "Lukk"
+          edit: "Endre"
+          delete: "Slett"
+        new_template_form:
+          submit: "Lagre"
+          cancel: "Avbryt"
+          preview: "Forhåndsvis"
+        quick_insert_fields:
+          add_new_field: "Legg til"
+          dropdown: "Nedtrekk"
+        validations_modal:
+          table_headers:
+            type: "Type"
+            description: "Beskrivelse"
+          validations:
+            required:
+              key: "nødvendig"
+            minimum:
+              key: "minst"
+            maximum:
+              key: "største"
+            type:
+              key: "type"
       impersonate:
         title: "Fremstå som"
         help: "Bruk dette verktøyet for å fremstå som en annen bruker for feilsøking. Du må logge ut når du er ferdig."
@@ -4260,6 +4268,7 @@ nb_NO:
         last_emailed: "Sist kontaktet"
         not_found: "Beklager, det brukernavner eksisterer ikke i systemet vårt."
         id_not_found: "Beklager, den bruker-ID-en eksisterer ikke i systemet vårt."
+        status: "Status"
         show_emails: "Vis e-poster"
         nav:
           new: "Ny"
@@ -4327,7 +4336,6 @@ nb_NO:
         staged: "Arrangert?"
         show_admin_profile: "Admin"
         show_public_profile: "Vis offentlig profil"
-        impersonate: "Gi deg ut for å være en annen"
         action_logs: "Handlingslogger"
         ip_lookup: "IP Lookup"
         log_out: "Logg ut"
@@ -4505,6 +4513,8 @@ nb_NO:
         go_back: "Tilbake til søk"
         recommended: "Skreddersøm av følgende tekst for å kle dine behov anbefales:"
         show_overriden: "Bare vis overstyrte"
+        outdated:
+          dismiss: "Avslå"
       settings:
         show_overriden: "Vis kun overstyrte"
         reset: "tilbakestill"
@@ -4512,7 +4522,6 @@ nb_NO:
       site_settings:
         title: "Innstillinger"
         no_results: "Ingen treff funnet."
-        more_than_30_results: "Det er over 30 resultater. Vennligst skjerp søket eller velg en kategori."
         clear_filter: "Tøm"
         add_url: "legg til URL"
         add_host: "legg til vert"
@@ -4590,7 +4599,8 @@ nb_NO:
         allow_title: Tillat merke å bli benyttet som en tittel
         multiple_grant: Kan bli tildelt flere ganger
         listable: Vis merket på den offentlige merkesiden
-        enabled: Aktiver merke
+        enabled: aktivert
+        disabled: deaktivert
         icon: Ikon
         image: Bilde
         query: Spørring for merke (SQL)
@@ -4636,7 +4646,6 @@ nb_NO:
         confirm_delete: "Er du sikker på at du vil slette den verten?"
         title: "Innbygging"
         host: "Tillatte verter"
-        class_name: "Klassenavn"
         edit: "rediger"
         category: "Legg til innlegg i kategori"
         add_host: "Legg til vert"
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index c1629bb0259..742be721f1c 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -184,12 +184,6 @@ nl:
     software_update_prompt:
       message: "We hebben deze site bijgewerkt, dus <span>vernieuw de pagina</span>, anders kan er onverwacht gedrag optreden."
       dismiss: "Negeren"
-    bootstrap_mode_enabled:
-      one: "Om het opzetten van je nieuwe website makkelijker te maken, bevind je je in de bootstrapmodus. Aan alle nieuwe gebruikers wordt vertrouwensniveau 1 toegekend en dagelijkse e-mailsamenvattingen zijn ingeschakeld voor hen. Dit wordt automatisch uitgeschakeld zodra %{count} gebruiker lid is geworden."
-      other: "Om het opzetten van je nieuwe website makkelijker te maken, bevind je je in de bootstrapmodus. Aan alle nieuwe gebruikers wordt vertrouwensniveau 1 toegekend en dagelijkse e-mailsamenvattingen zijn ingeschakeld voor hen. Dit wordt automatisch uitgeschakeld zodra %{count} gebruikers lid zijn geworden."
-    bootstrap_mode_disabled: "De bootstrapmodus wordt binnen 24 uur uitgeschakeld."
-    bootstrap_invite_button_title: "Uitnodigingen sturen"
-    bootstrap_wizard_link_title: "Instelwizard voltooien"
     themes:
       default_description: "Standaard"
       broken_theme_alert: "Je website werkt mogelijk niet, omdat het thema/onderdeel fouten bevat."
@@ -302,11 +296,9 @@ nl:
       edit_bookmark: "Bladwijzer bewerken"
       clear_bookmarks: "Bladwijzers wissen"
       help:
-        bookmark: "Klik om een bladwijzer voor het eerste bericht van dit topic te maken"
-        edit_bookmark: "Klik om de bladwijzer voor dit topic te bewerken"
         edit_bookmark_for_topic: "Klik om de bladwijzer voor dit topic te bewerken"
         unbookmark: "Klik om alle bladwijzers in dit topic te verwijderen"
-        unbookmark_with_reminder: "Klik om alle bladwijzers en herinneringen in dit topic te verwijderen."
+        unbookmark_with_reminder: "Klik om alle bladwijzers en herinneringen in dit topic te verwijderen"
     bookmarks:
       created: "Je hebt een bladwijzer voor dit bericht gemaakt. %{name}"
       created_generic: "Je hebt een bladwijzer hiervoor gemaakt. %{name}"
@@ -350,7 +342,6 @@ nl:
       new_topic: "Nieuw topicconcept"
       new_private_message: "Nieuw privéberichtconcept"
       abandon:
-        confirm: "Je hebt een concept in uitvoering voor dit topic. Wat wil je ermee doen?"
         yes_value: "Weggooien"
         no_value: "Bewerken hervatten"
     topic_count_categories:
@@ -523,11 +514,9 @@ nl:
       scores:
         about: "Deze score wordt berekend op basis van het vertrouwen van de melder, de nauwkeurigheid van diens eerdere markeringen en de prioriteit van het item dat wordt gemeld."
         score: "Score"
-        date: "Datum"
-        type: "Type"
+        type: "Reden"
         status: "Status"
-        submitted_by: "Ingediend door"
-        reviewed_by: "Beoordeeld door"
+        submitted_by: "Gemeld door"
       statuses:
         pending:
           title: "Wachtend"
@@ -535,14 +524,12 @@ nl:
           title: "Goedgekeurd"
         rejected:
           title: "Geweigerd"
-        ignored:
-          title: "Genegeerd"
-        deleted:
-          title: "Verwijderd"
         reviewed:
-          title: "(alle beoordeelde)"
+          title: "Alle beoordeelde"
         all:
-          title: "(alles)"
+          title: "Alles"
+      context_question:
+        delimiter: "of"
       types:
         reviewable_flagged_post:
           title: "Gemarkeerd bericht"
@@ -849,6 +836,7 @@ nl:
         make_all_primary_description: "Maak dit de primaire groep voor alle geselecteerde gebruikers."
         remove_all_primary: "Verwijderen als primair"
         remove_all_primary_description: "Verwijder deze groep als primair"
+        status: "Status"
         owner: "Eigenaar"
         primary: "Primair"
         forbidden: "Je mag de leden niet bekijken."
@@ -976,11 +964,6 @@ nl:
       profile: "Profiel"
       mute: "Dempen"
       edit: "Voorkeuren bewerken"
-      download_archive:
-        button_text: "Alles downloaden"
-        confirm: "Weet je zeker dat je je berichten wilt downloaden?"
-        success: "Download is gestart, je ontvangt een melding zodra het proces is voltooid."
-        rate_limit_error: "Berichten kunnen één keer per dag worden gedownload. Probeer het morgen opnieuw."
       new_private_message: "Nieuw bericht"
       private_message: "Bericht"
       private_messages: "Berichten"
@@ -1052,7 +1035,7 @@ nl:
         perm_denied_expl: "Je hebt toestemming voor meldingen geweigerd. Sta meldingen toe via je browserinstellingen."
         disable: "Meldingen uitschakelen"
         enable: "Meldingen inschakelen"
-        each_browser_note: 'Opmerking: je moet deze instelling wijzigen in elke browser die je gebruikt. Alle meldingen worden uitgeschakeld als je meldingen onderbreekt vanuit het gebruikersmenu, ongeacht deze instelling.'
+        each_browser_note: "Opmerking: je moet deze instelling wijzigen in elke browser die je gebruikt. Alle meldingen worden uitgeschakeld als je meldingen onderbreekt vanuit het gebruikersmenu, ongeacht deze instelling."
         consent_prompt: "Wil je live meldingen ontvangen als mensen antwoorden op je berichten?"
       dismiss: "Negeren"
       dismiss_notifications: "Alles negeren"
@@ -1103,14 +1086,7 @@ nl:
       experimental_sidebar:
         enable: "Zijbalk inschakelen"
         options: "Opties"
-        categories_section: "Categorieënsectie"
-        categories_section_instruction: "Geselecteerde categorieën worden weergegeven onder de sectie Categorieën van de zijbalk."
-        tags_section: "Tagssectie"
-        tags_section_instruction: "Geselecteerde tags worden weergegeven onder de sectie Tags van de zijbalk."
         navigation_section: "Navigatie"
-        list_destination_instruction: "Wanneer er nieuwe inhoud in de zijbalk is..."
-        list_destination_default: "standaardlink gebruiken en een badge weergeven voor nieuwe items"
-        list_destination_unread_new: "linken naar ongelezen/nieuw en het aantal nieuwe items weergeven"
       change: "wijzigen"
       featured_topic: "Uitgelicht topic"
       moderator: "%{user} is een moderator"
@@ -1180,13 +1156,6 @@ nl:
       save_to_change_theme: 'Thema wordt bijgewerkt nadat je op ''%{save_text}'' klikt'
       home: "Standaard startpagina"
       staged: "Gefaseerd"
-      staff_counters:
-        flags_given: "nuttige markeringen"
-        flagged_posts: "gemarkeerde berichten"
-        deleted_posts: "verwijderde berichten"
-        suspensions: "schorsingen"
-        warnings_received: "waarschuwingen"
-        rejected_posts: "geweigerde berichten"
       messages:
         all: "alle inboxen"
         inbox: "Inbox"
@@ -1279,7 +1248,6 @@ nl:
         tags: "Tags"
         interface: "Interface"
         apps: "Apps"
-        sidebar: "Zijbalk"
       change_password:
         success: "(e-mail verzonden)"
         in_progress: "(e-mail verzenden)"
@@ -1293,11 +1261,9 @@ nl:
         title: "Back-upcodes voor tweeledige verificatie"
         regenerate: "Opnieuw genereren"
         disable: "Uitschakelen"
-        enable: "Inschakelen"
-        enable_long: "Back-upcodes inschakelen"
         manage:
-          one: "Back-upcodes beheren. Je hebt nog <strong>%{count}</strong> back-upcode over."
-          other: "Back-upcodes beheren. Je hebt nog <strong>%{count}</strong> back-upcodes over."
+          one: "Je hebt nog <strong>%{count}</strong> back-upcode over."
+          other: "Je hebt nog <strong>%{count}</strong> back-upcodes over."
         copy_to_clipboard: "Kopiëren naar klembord"
         copy_to_clipboard_error: "Fout bij kopiëren van gegevens naar klembord"
         copied_to_clipboard: "Gekopieerd naar klembord"
@@ -1735,8 +1701,7 @@ nl:
       pause_notifications: "Meldingen pauzeren"
       remove_status: "Status verwijderen"
     user_tips:
-      primary: "Begrepen!"
-      secondary: "laat me deze tips niet zien"
+      button: "Begrepen!"
       first_notification:
         title: "Je eerste melding!"
         content: "Meldingen worden gebruikt om je op de hoogte te houden van wat er gaande is in de community."
@@ -1786,36 +1751,6 @@ nl:
       logout_disabled: "Afmelden is uitgeschakeld zolang de website zich in de alleen-lezenmodus bevindt."
     staff_writes_only_mode:
       enabled: "Deze site is in de medewerkermodus. Ga door met bekijken, maar antwoorden, liken en andere acties zijn beperkt tot medewerkers."
-    too_few_topics_and_posts_notice_MF: |
-      Laten we <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">de discussie starten!</a> Er { currentTopics, plural,
-          one {is <strong>#</strong> topic}
-        other {zijn <strong>#</strong> topics}
-      } en { currentPosts, plural,
-          one {<strong>#</strong> bericht}
-        other {<strong>#</strong> berichten}
-      }. Bezoekers hebben meer nodig om te lezen en op te antwoorden – wij raden minimaal { requiredTopics, plural,
-          one {<strong>#</strong> topic}
-        other {<strong>#</strong> topics}
-      } en { requiredPosts, plural,
-          one {<strong>#</strong> bericht}
-        other {<strong>#</strong> berichten}
-      } aan. Alleen personeel kan dit bericht zien.
-    too_few_topics_notice_MF: |
-      Laten we <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">de discussie starten!</a> Er { currentTopics, plural,
-          one {is <strong>#</strong> topic}
-        other {zijn <strong>#</strong> topics}
-      }. Bezoekers hebben meer nodig om te lezen en op te antwoorden – wij raden minimaal { requiredTopics, plural,
-          one {<strong>#</strong> topic}
-        other {<strong>#</strong> topics}
-      } aan. Alleen personeel kan dit bericht zien.
-    too_few_posts_notice_MF: |
-      Laten we <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">de discussie starten!</a> Er { currentPosts, plural,
-          one {is <strong>#</strong> post}
-        other {zijn <strong>#</strong> posts}
-      }. Bezoekers hebben meer nodig om te lezen en op te antwoorden – wij raden minimaal { requiredPosts, plural,
-          one {<strong>#</strong> bericht}
-        other {<strong>#</strong> berichten}
-      } aan. Alleen personeel kan dit bericht zien.
     logs_error_rate_notice:
       reached_hour_MF: |
         <b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# fout/uur} other {# fouten/uur}}</a> heeft de limiet voor de website-instelling van {limit, plural, one {# fout/uur} other {# fouten/uur}} bereikt.
@@ -1846,16 +1781,12 @@ nl:
       intro: "Hallo! Zo te zien heb je plezier aan de discussie, maar heb je je nog niet geregistreerd voor een account."
       value_prop: "Ben je het zat om door dezelfde berichten te scrollen? Wanneer je een account maakt, kom je altijd terug waar je was gebleven. Met een account kun je ook op de hoogte worden gehouden van nieuwe antwoorden, bladwijzers opslaan en likes gebruiken om anderen te bedanken. We kunnen allemaal samenwerken om deze community geweldig te maken. :heart:"
     summary:
-      enabled_description: "Je bekijkt een samenvatting van dit topic: de interessantste berichten volgens de community."
       description:
         one: "Er is <b>%{count}</b> antwoord."
         other: "Er zijn <b>%{count}</b> antwoorden."
       description_time_MF: |
         Er {replyCount, plural, one {is <b>#</b> antwoord} other {zijn <b>#</b> antwoorden}} met een geschatte leestijd van <b>{readingTime, plural, one {# minuut} other {# minuten}}</b>.
-      enable: "Vat dit topic samen"
       disable: "Alle berichten weergeven"
-      short_label: "Samenvatten"
-      short_title: "Bekijk een samenvatting van dit topic: de interessantste berichten volgens de community"
     deleted_filter:
       enabled_description: "Dit topic bevat verwijderde berichten, die zijn verborgen."
       disabled_description: "Verwijderde berichten in het topic worden weergegeven."
@@ -2154,8 +2085,6 @@ nl:
         topic_template_not_modified: "Voeg details en specifieke informatie toe aan je topic door het topicsjabloon te bewerken."
       save_edit: "Bewerking opslaan"
       overwrite_edit: "Bewerking overschrijven"
-      reply_original: "Antwoorden op oorspronkelijke topic"
-      reply_here: "Hier antwoorden"
       reply: "Antwoorden"
       cancel: "Annuleren"
       create_topic: "Topic maken"
@@ -2320,6 +2249,7 @@ nl:
       reaction_2: "<span>%{username}, %{username2}</span> %{description}"
       votes_released: "%{description} - voltooid"
       new_features: "Nieuwe functies beschikbaar!"
+      admin_problems: "Nieuw advies op je websitedashboard"
       dismiss_confirmation:
         body:
           default:
@@ -2624,7 +2554,7 @@ nl:
         top: "Er zijn geen toptopics."
         educate:
           new: '<p>Hier worden je nieuwe topics weergegeven. Standaard worden topics als nieuw beschouwd en wordt de indicator <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span> weergegeven als ze de afgelopen 2 dagen zijn gemaakt.</p><p>Ga naar je <a href="%{userPrefsUrl}">voorkeuren</a> om dit te wijzigen.</p>'
-          unread: "<p>Je ongelezen topics worden hier weergegeven.</p><p>Standaard worden topics als ongelezen beschouwd en wordt het aantal ongelezen berichten aangegeven <span class=\"badge unread-posts badge-notification\">1</span> als je:</p><ul><li>Het topic hebt gemaakt</li><li>Op het topic hebt geantwoord</li><li>Het topic langer dan 4 minuten hebt gelezen</li></ul><p>Of als je het topic expliciet hebt ingesteld op \"Gevolgd\" of \"Geobserveerd\" via de \U0001F514 in elk topic.</p><p>Ga naar je <a href=\"%{userPrefsUrl}\">voorkeuren</a> om dit te wijzigen.</p>"
+          unread: "<p>Je ongelezen topics worden hier weergegeven.</p><p>Standaard worden topics als ongelezen beschouwd en wordt het aantal ongelezen berichten aangegeven <span class=\"badge unread-posts badge-notification\">1</span> als je:</p><ul><li>Het topic hebt gemaakt</li><li>Op het topic hebt geantwoord</li><li>Het topic langer dan 5 minuten hebt gelezen</li></ul><p>Of als je het topic expliciet hebt ingesteld op \"Gevolgd\" of \"Geobserveerd\" via de \U0001F514 in elk topic.</p><p>Ga naar je <a href=\"%{userPrefsUrl}\">voorkeuren</a> om dit te wijzigen.</p>"
       bottom:
         latest: "Er zijn verder geen nieuwste topics."
         posted: "Er zijn verder geen geplaatste topics."
@@ -2727,8 +2657,6 @@ nl:
       browse_all_categories_latest_or_top: "<a href='%{basePath}/categories'>Blader door alle categorieën</a>, <a href='%{basePath}/latest'>bekijk de nieuwste topics</a> of zie de top:"
       browse_all_tags_or_latest: "<a href='%{basePath}/tags'>Blader door alle tags</a> of <a href='%{basePath}/latest'>bekijk de nieuwste topics</a>."
       suggest_create_topic: Klaar om <a href>een nieuw gesprek te beginnen?</a>
-      jump_reply_up: naar eerder antwoord springen
-      jump_reply_down: naar later antwoord springen
       deleted: "Het topic is verwijderd"
       slow_mode_update:
         title: "Langzame modus"
@@ -3093,9 +3021,6 @@ nl:
       collapse: "samenvouwen"
       sr_collapse_replies: "Ingesloten antwoorden samenvouwen"
       sr_date: "Plaatsingsdatum"
-      sr_expand_replies:
-        one: "Dit bericht heeft %{count} reactie. Klik om uit te vouwen"
-        other: "Dit bericht heeft %{count} reacties. Klik om uit te vouwen"
       expand_collapse: "uitvouwen/samenvouwen"
       sr_below_embedded_posts_description: "antwoorden op bericht %{post_number}"
       sr_embedded_reply_description: "antwoord van @%{username} op bericht %{post_number}"
@@ -3307,7 +3232,6 @@ nl:
       filtered_replies:
         viewing_posts_by: "%{post_count} berichten weergegeven van"
         viewing_subset: "Sommige antwoorden zijn samengevouwen"
-        viewing_summary: "Samenvatting van dit topic weergegeven"
         post_number: "%{username}, bericht #%{post_number}"
         show_all: "Alles weergeven"
       share:
@@ -3324,7 +3248,6 @@ nl:
       back: "Terug naar categorie"
       general: "Algemeen"
       settings: "Instellingen"
-      topic_template: "Topicsjabloon"
       tags: "Tags"
       tags_allowed_tags: "Deze tags beperken tot deze categorie:"
       tags_allowed_tag_groups: "Deze taggroepen beperken tot deze categorie:"
@@ -3383,8 +3306,6 @@ nl:
       email_in: "Aangepast adres voor inkomende e-mail:"
       email_in_tooltip: "Je kunt meerdere e-mailadressen scheiden met het teken |."
       email_in_allow_strangers: "E-mails van anonieme gebruikers zonder account accepteren"
-      email_in_disabled: "Het plaatsen van nieuwe topics via e-mail is uitgeschakeld in de webite-instellingen. Om het plaatsen van nieuwe topics via e-mail mogelijk te maken, "
-      email_in_disabled_click: 'schakel de instelling ''e-mail in'' in.'
       mailinglist_mirror: "Categorie weerspiegelt een mailinglijst"
       show_subcategory_list: "Lijst van subcategorieën weergeven boven topics in deze categorie"
       read_only_banner: "Bannertekst wanneer een gebruiker geen topic in deze categorie kan maken:"
@@ -3592,6 +3513,10 @@ nl:
     filters:
       with_topics: "%{filter} topics"
       with_category: "%{filter} topics in %{category}"
+      filter:
+        title: "Filter"
+        button:
+          label: "Filter"
       latest:
         title: "Nieuwste"
         title_with_count:
@@ -3662,7 +3587,6 @@ nl:
         this_week: "Week"
         today: "Vandaag"
     browser_update: '<a href="https://www.discourse.org/faq/#browser">Je browser wordt niet ondersteund</a> helaas. <a href="https://browsehappy.com">Schakel over naar een ondersteunde browser</a> om rijke inhoud te bekijken, je aan te melden en te antwoorden.'
-    safari_13_warning: Deze website verwijdert binnenkort de ondersteuning voor iOS- en Safari-versie 13 en lager. Er blijft een vereenvoudigde alleen-lezen versie beschikbaar. (<a href="https://meta.discourse.org/t/224747">Meer informatie</a>)
     permission_types:
       full: "Maken / Antwoorden / Weergeven"
       create_post: "Antwoorden / Weergeven"
@@ -3677,6 +3601,9 @@ nl:
       close: "Sluiten (Esc)"
       content_load_error: '<a href="%url%">De inhoud</a> kon niet worden geladen.'
       image_load_error: '<a href="%url%">De afbeelding</a> kon niet worden geladen.'
+    experimental_lightbox:
+      buttons:
+        close: "Sluiten (Esc)"
     cannot_render_video: Deze video kan niet worden weergegeven omdat je browser de codec niet ondersteunt.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
@@ -3769,7 +3696,6 @@ nl:
         one: "Deze badge is %{count} keer verdiend"
         other: "Deze badge is %{count} keer verdiend"
       granted_on: "Toegekend op %{date}"
-      others_count: "Anderen met deze badge (%{count})"
       title: Badges
       allow_title: "Je kunt deze badge als een titel gebruiken"
       multiple_grant: "Je kunt dit meerdere keren verdienen"
@@ -3952,13 +3878,11 @@ nl:
     pause_notifications:
       title: "Meldingen pauzeren voor..."
       label: "Meldingen pauzeren"
-      remaining: "%{remaining} resterend"
       options:
         half_hour: "30 minuten"
         one_hour: "1 uur"
         two_hours: "2 uur"
         tomorrow: "Tot morgen"
-        custom: "Aangepast"
       set_schedule: "Stel een meldingsschema in"
     trust_levels:
       names:
@@ -4007,7 +3931,21 @@ nl:
       more: "Meer"
       all_categories: "Alle categorieën"
       all_tags: "Alle tags"
+      edit_navigation_modal_form:
+        filter_dropdown:
+          all: "Alles"
       sections:
+        custom:
+          save: "Opslaan"
+          delete: "Verwijderen"
+          links:
+            reset: "Standaard herstellen"
+            icon:
+              label: "Pictogram"
+            name:
+              label: "Naam"
+            value:
+              label: "Link"
         about:
           header_link_text: "Over"
         messages:
@@ -4022,28 +3960,20 @@ nl:
             unread_with_count: "Ongelezen (%{count})"
             archive: "Archief"
         tags:
-          links:
-            add_tags:
-              content: "Tags toevoegen"
-              title: "Je hebt geen tags toegevoegd. Klik om te beginnen."
           none: "Je hebt geen tags toegevoegd."
           click_to_get_started: "Klik hier om te beginnen."
           header_link_text: "Tags"
           header_action_title: "Bewerk je zijbalktags"
           configure_defaults: "Standaardinstellingen configureren"
         categories:
-          links:
-            add_categories:
-              content: "Categorieën toevoegen"
-              title: "Je hebt geen categorieën toegevoegd. Klik om te beginnen."
           none: "Je hebt geen categorieën toegevoegd."
           click_to_get_started: "Klik hier om te beginnen."
           header_link_text: "Categorieën"
           header_action_title: "Bewerk je zijbalkcategorieën"
           configure_defaults: "Standaardinstellingen configureren"
         community:
-          header_link_text: "Community"
-          header_action_title: "Maak een topic"
+          edit_section:
+            header_dropdown: "Aanpassen"
           links:
             about:
               content: "Over"
@@ -4054,8 +3984,8 @@ nl:
             badges:
               content: "Badges"
               title: "Alle beschikbare badges om te verdienen"
-            everything:
-              content: "Alles"
+            topics:
+              content: "Topics"
               title: "Alle topics"
             faq:
               content: "FAQ"
@@ -4082,6 +4012,11 @@ nl:
       description: "Je welkomsttopic is het eerste dat nieuwe leden lezen. Zie het als je \"elevator pitch\" of \"missiestatement\". Laat iedereen eerst weten voor wie deze community is, wat ze hier kunnen verwachten en wat je wilt dat ze doen."
       button_title: "Beginnen met bewerken"
     until: "Tot:"
+    form_templates:
+      errors:
+        typeMismatch:
+          default: "Voer een geldige waarde in."
+          email: "Voer een geldig e-mailadres in."
   admin_js:
     type_to_filter: "typ om te filteren..."
     admin:
@@ -4240,10 +4175,6 @@ nl:
         about: "Bewerk hier je groepslidmaatschap en namen"
         group_members: "Groepsleden"
         delete: "Verwijderen"
-        delete_confirm: "Weet je zeker dat je deze groep wilt verwijderen?"
-        delete_with_messages_confirm:
-          one: "Als je deze groep verwijdert, wordt %{count} bericht verweesd en hebben groepsleden er geen toegang meer toe."
-          other: "Als je deze groep verwijdert, worden %{count} berichten verweesd en hebben groepsleden er geen toegang meer toe."
         delete_failed: "Kan groep niet verwijderen. Als dit een automatische groep is, kan deze niet worden verwijderd."
         delete_automatic_group: Dit is een automatische groep en kan niet worden verwijderd.
         delete_owner_confirm: "Eigenaarsprivileges van '%{username}' verwijderen?"
@@ -4309,7 +4240,6 @@ nl:
             topics:
               read: Een topic of een specifiek bericht erin lezen. RSS wordt ook ondersteund.
               write: Een nieuw topic maken of bericht in een bestaand topic plaatsen.
-              update: Werk een topic bij. Wijzig de titel, categorie, tags, enz.
               read_lists: Topiclijsten zoals Top, Nieuw, Nieuwste, etc. lezen. RSS wordt ook ondersteund.
             posts:
               edit: Bewerk elk bericht of een specifieke.
@@ -4406,9 +4336,6 @@ nl:
         user_promoted_event:
           name: "Door gebruiker gepromoot evenement"
           details: "Wanneer een gebruiker wordt gepromoveerd van het ene vertrouwensniveau naar het andere."
-        user_badge_event:
-          name: "Badgetoekenningsgebeurtenis"
-          details: "Wanneer een gebruiker een badge ontvangt."
         group_user_event:
           name: "Groepgebruikersgebeurtenis"
           details: "Wanneer een gebruiker wordt toegevoegd of verwijderd in een groep."
@@ -4451,7 +4378,6 @@ nl:
         enabled: "Ingeschakeld?"
         is_enabled: "J"
         not_enabled: "N"
-        change_settings: "Instellingen wijzigen"
         change_settings_short: "Instellingen"
         howto: "Hoe kan ik plug-ins installeren?"
         official: "Officiële plug-in"
@@ -4783,6 +4709,8 @@ nl:
           love:
             name: "liefde"
             description: "De kleur van de likeknop."
+          selected:
+            name: "geselecteerd"
         robots:
           title: "Bestand robots.txt van je website negeren:"
           warning: "Gerelateerde website-instellingen worden hierdoor blijvend genegeerd."
@@ -5067,14 +4995,8 @@ nl:
           silence: "Dempen"
           link: "Link"
         action_descriptions:
-          block: "Het plaatsen van berichten die deze woorden bevatten tegengaan. Gebruikers zien een foutbericht wanneer ze hun bericht proberen te verzenden."
-          censor: "Berichten met deze woorden toestaan, maar deze vervangen door tekens die de gecensureerde woorden verbergen."
-          require_approval: "Berichten die deze woorden bevatten, vereisen goedkeuring door medewerkers voordat ze kunnen worden bekeken."
-          flag: "Sta berichten met deze woorden toe, maar markeer ze als ongepast, zodat moderators ze kunnen beoordelen."
-          replace: "Vervang woorden in berichten door andere woorden"
-          tag: "Tag topics automatisch op basis van het eerste bericht"
-          silence: "Eerste berichten van gebruikers die deze woorden bevatten, moeten door een medewerker worden goedgekeurd voordat ze zichtbaar worden en de gebruiker wordt automatisch gedempt."
-          link: "Woorden in berichten vervangen door links"
+          replace: "Vervang woorden in berichten door andere woorden."
+          link: "Woorden in berichten vervangen door links."
         form:
           label: "Bevat woord of zin"
           placeholder: "Voer woord of zin in (* is een joker)"
@@ -5097,6 +5019,37 @@ nl:
           description: "Voer hieronder tekst in om te controleren op matches met geobserveerde woorden"
           found_matches: "Gevonden overeenkomsten:"
           no_matches: "Geen overeenkomsten gevonden"
+      form_templates:
+        nav_title: "Sjablonen"
+        list_table:
+          headings:
+            name: "Naam"
+            actions: "Acties"
+        view_template:
+          close: "Sluiten"
+          edit: "Bewerken"
+          delete: "Verwijderen"
+        new_template_form:
+          submit: "Opslaan"
+          cancel: "Annuleren"
+          preview: "Voorbeeld"
+        quick_insert_fields:
+          add_new_field: "Toevoegen"
+          dropdown: "Vervolgkeuzelijst"
+        validations_modal:
+          table_headers:
+            key: "Sleutel"
+            type: "Type"
+            description: "Beschrijving"
+          validations:
+            required:
+              key: "vereist"
+            minimum:
+              key: "minimum"
+            maximum:
+              key: "maximum"
+            type:
+              key: "type"
       impersonate:
         title: "Imiteren"
         help: "Gebruik deze tool om een gebruikersaccount te imiteren voor debugdoeleinden. Je moet je afmelden wanneer je klaar bent."
@@ -5109,6 +5062,7 @@ nl:
         not_found: "Sorry, die gebruikersnaam bestaat niet in ons systeem."
         id_not_found: "Sorry, die gebruikers-ID bestaat niet in ons systeem."
         active: "Geactiveerd"
+        status: "Status"
         show_emails: "E-mailadressen weergeven"
         hide_emails: "E-mailadressen verbergen"
         nav:
@@ -5197,7 +5151,6 @@ nl:
         show_admin_profile: "Beheerder"
         manage_user: "Gebruiker beheren"
         show_public_profile: "Openbaar profiel weergeven"
-        impersonate: "Imiteren"
         action_logs: "Actielogs"
         ip_lookup: "IP-adres zoeken"
         log_out: "Afmelden"
@@ -5435,6 +5388,8 @@ nl:
         show_overriden: "Alleen aangepaste weergeven"
         locale: "Taal:"
         more_than_50_results: "Er zijn meer dan 50 resultaten. Verfijn je zoekopdracht."
+        outdated:
+          dismiss: "Sluiten"
       settings:
         show_overriden: "Alleen aangepaste weergeven"
         history: "Wijzigingsgeschiedenis weergeven"
@@ -5447,7 +5402,6 @@ nl:
             label: "Emoji toevoegen"
         title: "Instellingen"
         no_results: "Geen resultaten gevonden."
-        more_than_30_results: "Er zijn meer dan 30 resultaten. Verfijn je zoekopdracht of selecteer een categorie."
         clear_filter: "Wissen"
         add_url: "URL toevoegen"
         add_host: "host toevoegen"
@@ -5534,7 +5488,8 @@ nl:
         allow_title: Badge mag als titel worden gebruikt
         multiple_grant: Kan meerdere malen worden toegekend
         listable: Badge weergeven op de openbare badgespagina
-        enabled: Badge inschakelen
+        enabled: ingeschakeld
+        disabled: uitgeschakeld
         icon: Pictogram
         image: Afbeelding
         graphic: Grafisch
@@ -5604,10 +5559,8 @@ nl:
       embedding:
         get_started: "Als je Discourse wilt insluiren op een andere website, begin dan door de host ervan toe te voegen."
         confirm_delete: "Weet je zeker dat je die host wilt verwijderen?"
-        sample: "Plak de volgende HTML-code in je website om Discourse-topics te maken en in te sluiten. Vervang <b>REPLACE_ME</b> door de canonieke URL van de pagina waarop je deze insluit."
         title: "Insluiting"
         host: "Toegestane hosts"
-        class_name: "Klassenaam"
         allowed_paths: "Pad-acceptatielijst"
         edit: "bewerken"
         category: "Bericht naar categorie"
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index ae6fb7f33c7..e84432c564f 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -200,6 +200,8 @@ pl_PL:
       facebook: "Udostępnij na Facebooku"
       email: "Wyślij e-mailem"
       url: "Skopiuj i udostępnij adres URL"
+    word_connector:
+      comma: ", "
     action_codes:
       public_topic: "Upublicznij ten temat %{when}"
       open_topic: "Przekonwertowano to na temat %{when}"
@@ -211,6 +213,8 @@ pl_PL:
       removed_user: "%{who} Został usunięty %{when}"
       removed_group: "%{who} Został usunięty %{when}"
       autobumped: "Automatycznie podbity %{when}"
+      tags_changed: "Tagi zaktualizowane %{when}"
+      category_changed: "Kategoria zaktualizowana %{when}"
       autoclosed:
         enabled: "Zamknięcie %{when}"
         disabled: "Otworzenie %{when}"
@@ -235,19 +239,13 @@ pl_PL:
       forwarded: "Przekazano powyższy email"
     topic_admin_menu: "akcje tematu"
     skip_to_main_content: "Przejdź do głównej zawartości"
+    skip_user_nav: "Przejdź do treści profilu"
     emails_are_disabled: "Wszystkie wychodzące wiadomości e-mail zostały globalnie wyłączone przez administratora. Żadne powiadomienia e-mail nie będą wysyłane."
     emails_are_disabled_non_staff: "Poczta wychodząca została wyłączona dla użytkowników niebędących pracownikami."
     software_update_prompt:
       message: "Zaktualizowaliśmy tę witrynę, <span>prosimy ją odświeżyć</span>, aby uniknąć nieoczekiwanego zachowania."
       dismiss: "Odrzuć"
-    bootstrap_mode_enabled:
-      one: "Aby ułatwić uruchomienie Twojej strony, jesteś w trybie bootstrap. Wszyscy nowi użytkownicy otrzymają poziom zaufania 1 i będą otrzymywać codzienne wiadomości e-mail z podsumowaniem aktywności na forum. To zostanie automatycznie wyłączone, kiedy %{count} osoba dołączy."
-      few: "Aby ułatwić uruchomienie Twojej strony, jesteś w trybie bootstrap. Wszyscy nowi użytkownicy otrzymają poziom zaufania 1 i będą otrzymywać codzienne wiadomości e-mail z podsumowaniem aktywności na forum. To zostanie automatycznie wyłączone, kiedy %{count} osoby dołączy."
-      many: "Aby ułatwić uruchomienie Twojej strony, jesteś w trybie bootstrap. Wszyscy nowi użytkownicy otrzymają poziom zaufania 1 i będą otrzymywać codzienne wiadomości e-mail z podsumowaniem aktywności na forum. To zostanie automatycznie wyłączone, kiedy %{count} osób dołączy."
-      other: "Aby ułatwić uruchomienie Twojej strony, jesteś w trybie bootstrap. Wszyscy nowi użytkownicy otrzymają poziom zaufania 1 i będą otrzymywać codzienne wiadomości e-mail z podsumowaniem aktywności na forum. To zostanie automatycznie wyłączone, kiedy %{count} osób dołączy."
-    bootstrap_mode_disabled: "Tryb bootstrap zostanie wyłączony w ciągu 24 godzin."
-    bootstrap_invite_button_title: "Wyślij zaproszenia"
-    bootstrap_wizard_link_title: "Zakończ kreator konfiguracji"
+    bootstrap_mode: "Pierwsze kroki"
     themes:
       default_description: "Domyślny"
       broken_theme_alert: "Twoja strona może nie działać, ponieważ motyw / komponent ma błędy."
@@ -366,11 +364,11 @@ pl_PL:
       edit_bookmark: "Edytuj zakładkę"
       clear_bookmarks: "Wyczyść zakładki"
       help:
-        bookmark: "Kliknij, aby dodać pierwszy post tematu do zakładek"
-        edit_bookmark: "Kliknij, aby edytować zakładkę w tym temacie"
+        bookmark: "Kliknij, aby dodać ten temat do zakładek"
+        edit_bookmark: "Kliknij, aby edytować zakładkę w poście w tym temacie"
         edit_bookmark_for_topic: "Kliknij, aby edytować zakładkę dla tego tematu"
         unbookmark: "Kliknij, aby usunąć wszystkie zakładki z tego tematu"
-        unbookmark_with_reminder: "Kliknij, aby usunąć wszystkie zakładki i przypomnienia w tym temacie."
+        unbookmark_with_reminder: "Kliknij, aby usunąć wszystkie zakładki i przypomnienia w tym temacie"
     bookmarks:
       created: "Dodano post do zakładek. %{name}"
       created_generic: "Dodałeś to do zakładek. %{name}"
@@ -414,7 +412,7 @@ pl_PL:
       new_topic: "Nowy szkic tematu"
       new_private_message: "Nowy szkic wiadomości osobistej"
       abandon:
-        confirm: "Masz projekt w toku dla tego tematu. Co chcesz z nim zrobić?"
+        confirm: "Masz już wersję roboczą w toku. Co chcesz z nią zrobić?"
         yes_value: "Odrzuć"
         no_value: "Wznów edycję"
     topic_count_categories:
@@ -477,6 +475,8 @@ pl_PL:
         search: "Wyszukaj wiadomość"
         placeholder: "wpisz tutaj tytuł wiadomości, adres URL lub id"
     review:
+      show_more: "Pokaż więcej"
+      show_less: "Pokaż mniej"
       order_by: "Segreguj według:"
       date_filter: "Opublikowane między"
       in_reply_to: "w odpowiedzi na"
@@ -611,26 +611,43 @@ pl_PL:
       scores:
         about: "Wynik jest obliczany na podstawie poziomu zaufania raportującego, akceptacji poprzednich flag i priorytetu raportowanego postu."
         score: "Wynik"
-        date: "Data"
-        type: "Typ"
+        date: "Data zgłoszenia"
+        type: "Powód"
         status: "Status"
-        submitted_by: "Wysłany przez"
+        submitted_by: "Zgłoszony przez"
         reviewed_by: "Sprawdzony przez"
+        reviewed_timestamp: "Data sprawdzenia"
       statuses:
         pending:
           title: "Oczekujące"
         approved:
           title: "Zaakceptowany"
+        approved_flag:
+          title: "Flaga zatwierdzona"
+        approved_user:
+          title: "Użytkownik zatwierdzony"
+        approved_post:
+          title: "Post zatwierdzony"
         rejected:
           title: "Odrzucony"
+        rejected_flag:
+          title: "Flaga odrzucona"
+        rejected_user:
+          title: "Użytkownik odrzucony"
+        rejected_post:
+          title: "Post odrzucony"
         ignored:
-          title: "Zignorowany"
+          title: "Flaga zignorowana"
         deleted:
-          title: "Usunięty"
+          title: "Temat lub post usunięty"
         reviewed:
-          title: "(wszystkie sprawdzone)"
+          title: "Wszystkie sprawdzone"
         all:
-          title: "(wszystko)"
+          title: "Wszystko"
+      context_question:
+        is_this_post: "Czy ten post %{reviewable_human_score_types}?"
+        delimiter: "lub"
+        something_else_wrong: "Czy coś jest nie tak z tym postem?"
       types:
         reviewable_flagged_post:
           title: "Oflagowany wpis"
@@ -643,6 +660,8 @@ pl_PL:
           title: "Użytkownik"
         reviewable_post:
           title: "Post"
+        reviewable_chat_message:
+          title: "Oflagowana wiadomość na czacie"
       approval:
         title: "Post wymaga zatwierdzenia"
         description: "Twój nowy wpis został umieszczony w kolejce i pojawi się po zatwierdzeniu przez moderatora. Prosimy o cierpliwość."
@@ -953,6 +972,7 @@ pl_PL:
         make_all_primary_description: "Ustaw tę grupę jako podstawową dla wszystkich wybranych użytkowników"
         remove_all_primary: "Usuń jako podstawowy"
         remove_all_primary_description: "Usuń tę grupę jako podstawową"
+        status: "Status"
         owner: "Właściciel"
         primary: "Podstawowy"
         forbidden: "Nie możesz oglądać profili użytkowników."
@@ -1091,10 +1111,12 @@ pl_PL:
       mute: "Wycisz"
       edit: "Edytuj ustawienia"
       download_archive:
-        button_text: "Pobierz Wszystko"
-        confirm: "Czy na pewno chcesz pobrać swoje posty?"
-        success: "Rozpoczęto eksport: otrzymasz wiadomość, gdy proces zostanie zakończony."
-        rate_limit_error: "Posty mogą być pobierane raz dziennie, spróbuj ponownie jutro."
+        title: "Eksportuj swoje dane"
+        description: "Pobierz archiwum aktywności i preferencji konta."
+        button_text: "Poproś o archiwum"
+        confirm: "Czy na pewno chcesz pobrać archiwum aktywności i preferencji swojego konta?"
+        success: "Rozpoczęliśmy gromadzenie Twojego archiwum, otrzymasz wiadomość, gdy proces się zakończy."
+        rate_limit_error: "Archiwa konta można pobrać raz dziennie, spróbuj ponownie jutro."
       new_private_message: "Nowa wiadomość"
       private_message: "Wiadomość"
       private_messages: "Wiadomości"
@@ -1147,6 +1169,7 @@ pl_PL:
           warning: "Czy na pewno chcesz wyczyścić polecany temat?"
       use_current_timezone: "Użyj aktualnej strefy czasowej"
       profile_hidden: "Publiczny profil użytkownika jest ukryty."
+      inactive_user: "Ten użytkownik nie jest już aktywny."
       expand_profile: "Rozwiń"
       sr_expand_profile: "Rozwiń szczegóły profilu"
       collapse_profile: "Zwiń"
@@ -1166,7 +1189,7 @@ pl_PL:
         perm_denied_expl: "Odmówiłeś/łaś dostępu dla powiadomień. Pozwól na powiadomienia w ustawieniach przeglądarki."
         disable: "Wyłącz powiadomienia"
         enable: "Włącz powiadomienia"
-        each_browser_note: 'Uwaga: musisz zmienić to ustawienie w każdej używanej przeglądarce. Wszystkie powiadomienia zostaną wyłączone, jeśli wstrzymasz powiadomienia z menu użytkownika, niezależnie od tego ustawienia.'
+        each_browser_note: "Uwaga: musisz zmienić to ustawienie w każdej używanej przeglądarce. Wszystkie powiadomienia zostaną wyłączone, jeśli wstrzymasz powiadomienia z menu użytkownika, niezależnie od tego ustawienia."
         consent_prompt: "Czy chcesz otrzymywać natychmiastowe powiadomienia, gdy ktoś odpowiada na twoje posty?"
       dismiss: "Odrzuć"
       dismiss_notifications: "Odrzuć wszystkie"
@@ -1217,14 +1240,10 @@ pl_PL:
       experimental_sidebar:
         enable: "Włącz pasek boczny"
         options: "Opcje"
-        categories_section: "Sekcja kategorii"
-        categories_section_instruction: "Wybrane kategorie będą wyświetlane w sekcji kategorii paska bocznego."
-        tags_section: "Sekcja tagów"
-        tags_section_instruction: "Wybrane tagi będą wyświetlane w sekcji tagów paska bocznego."
         navigation_section: "Nawigacja"
-        list_destination_instruction: "Gdy na pasku bocznym pojawi się nowa zawartość..."
-        list_destination_default: "użyj linku domyślnego i pokaż odznakę dla nowych elementów"
-        list_destination_unread_new: "linkuj do nieprzeczytanych/nowych i pokaż liczbę nowych pozycji"
+        navigation_section_instruction: "Gdy lista tematów w menu nawigacyjnym zawiera nowe lub nieprzeczytane elementy…"
+        link_to_filtered_list_checkbox_description: "Link do przefiltrowanej listy"
+        show_count_new_items_checkbox_description: "Pokaż liczbę nowych elementów"
       change: "zmień"
       featured_topic: "Wyróżniony temat"
       moderator: "%{user} jest moderatorem"
@@ -1262,6 +1281,7 @@ pl_PL:
       watched_first_post_categories_instructions: "Zostaniesz powiadomiony o pierwszym wpisie w każdym nowym temacie w tych kategoriach."
       watched_first_post_tags: "Oglądasz pierwszy wpis"
       watched_first_post_tags_instructions: "Zostaniesz powiadomiony tylko o pierwszym wpisie w każdym nowym temacie oznaczonym tymi tagami."
+      watched_precedence_over_muted: "Powiadamiaj mnie o tematach w obserwowanych przeze mnie kategoriach lub tagach, które również należą do tych, które wyciszyłem."
       muted_categories: "Wyciszone"
       muted_categories_instructions: "Nie będziesz powiadamiany o nowych tematach w tych kategoriach. Nie pojawią się na liście nieprzeczytanych."
       muted_categories_instructions_dont_hide: "Nie otrzymasz powiadomień o nowych tematach w tych kategoriach. "
@@ -1294,12 +1314,36 @@ pl_PL:
       home: "Domyślna strona domowa"
       staged: "Wystawiany na scenie"
       staff_counters:
-        flags_given: "uczynnych oflagowań"
-        flagged_posts: "oflagowane wpisy"
-        deleted_posts: "usunięte wpisy"
-        suspensions: "zawieszone"
-        warnings_received: "otrzymanych ostrzeżeń"
-        rejected_posts: "odrzucone wpisy"
+        flags_given:
+          one: '<span class="%{className}">%{count}</span> pomocna flaga'
+          few: '<span class="%{className}">%{count}</span> pomocne flagi'
+          many: '<span class="%{className}">%{count}</span> pomocne flagi'
+          other: '<span class="%{className}">%{count}</span> pomocne flagi'
+        flagged_posts:
+          one: '<span class="%{className}">%{count}</span> oflagowany post'
+          few: '<span class="%{className}">%{count}</span> oflagowane posty'
+          many: '<span class="%{className}">%{count}</span> oflagowanych postów'
+          other: '<span class="%{className}">%{count}</span> oflagowanych postów'
+        deleted_posts:
+          one: '<span class="%{className}">%{count}</span> usunięty post'
+          few: '<span class="%{className}">%{count}</span> usunięte posty'
+          many: '<span class="%{className}">%{count}</span> usuniętych postów'
+          other: '<span class="%{className}">%{count}</span> usuniętych postów'
+        suspensions:
+          one: '<span class="%{className}">%{count}</span> zawieszenie'
+          few: '<span class="%{className}">%{count}</span> zawieszenia'
+          many: '<span class="%{className}">%{count}</span> zawieszeń'
+          other: '<span class="%{className}">%{count}</span> zawieszeń'
+        warnings_received:
+          one: '<span class="%{className}">%{count}</span> ostrzeżenie'
+          few: '<span class="%{className}">%{count}</span> ostrzeżenia'
+          many: '<span class="%{className}">%{count}</span> ostrzeżeń'
+          other: '<span class="%{className}">%{count}</span> ostrzeżeń'
+        rejected_posts:
+          one: '<span class="%{className}">%{count}</span> odrzucony post'
+          few: '<span class="%{className}">%{count}</span> odrzucone posty'
+          many: '<span class="%{className}">%{count}</span> odrzuconych postów'
+          other: '<span class="%{className}">%{count}</span> odrzuconych postów'
       messages:
         all: "wszystkie skrzynki odbiorcze"
         inbox: "Skrzynka odbiorcza"
@@ -1412,7 +1456,7 @@ pl_PL:
         tags: "Tagi"
         interface: "Interfejs"
         apps: "Aplikacje"
-        sidebar: "Pasek boczny"
+        navigation_menu: "Menu nawigacji"
       change_password:
         success: "(email wysłany)"
         in_progress: "(email wysyłany)"
@@ -1426,13 +1470,14 @@ pl_PL:
         title: "Kody zapasowe weryfikacji dwuskładnikowej"
         regenerate: "Odnów"
         disable: "Wyłącz"
-        enable: "Włącz"
-        enable_long: "Włącz kody zapasowe"
+        enable: "Utwórz kody zapasowe"
+        enable_long: "Dodaj kody zapasowe"
+        not_enabled: "Nie utworzyłeś jeszcze żadnych kodów zapasowych."
         manage:
-          one: "Zarządzaj kodami zapasowymi. Pozostał Ci <strong>%{count}</strong> kod zapasowy."
-          few: "Zarządzaj kodami zapasowymi. Pozostały Ci <strong>%{count}</strong> kody zapasowe."
-          many: "Zarządzaj kodami zapasowymi. Pozostało Ci <strong>%{count}</strong> kodów zapasowych."
-          other: "Zarządzaj kodami zapasowymi. Pozostało Ci <strong>%{count}</strong> kodów zapasowych."
+          one: "Pozostał Ci <strong>%{count}</strong> kod zapasowy."
+          few: "Pozostały Ci <strong>%{count}</strong> kody zapasowe."
+          many: "Pozostało Ci <strong>%{count}</strong> kodów zapasowych."
+          other: "Pozostało Ci <strong>%{count}</strong> kodów zapasowych."
         copy_to_clipboard: "Skopiuj do schowka"
         copy_to_clipboard_error: "Wystąpił błąd w trakcie kopiowania do schowka"
         copied_to_clipboard: "Skopiowane do schowka"
@@ -1518,6 +1563,7 @@ pl_PL:
         success: "Wysłaliśmy wiadomość do potwierdzenia na podany adres email."
         success_via_admin: "Wysłaliśmy wiadomość e-mail na ten adres. Użytkownik będzie musiał postępować zgodnie z instrukcjami potwierdzenia zawartymi w wiadomości e-mail."
         success_staff: "Wysłaliśmy wiadomość na bieżący adres. Proszę przestrzegać informacji dotyczących potwierdzenia adresu."
+        back_to_preferences: "Powrót do preferencji"
       change_avatar:
         title: "Zmień swój awatar"
         gravatar: "<a href='//%{gravatarBaseUrl}%{gravatarLoginUrl}' target='_blank'>%{gravatarName}</a> , na podstawie"
@@ -1892,8 +1938,7 @@ pl_PL:
       pause_notifications: "Wstrzymaj powiadomienia"
       remove_status: "Usuń status"
     user_tips:
-      primary: "Zrozumiano!"
-      secondary: "nie pokazuj mi tych wskazówek"
+      button: "Zrozumiano!"
       first_notification:
         title: "Twoje pierwsze powiadomienie!"
         content: "Powiadomienia służą do informowania na bieżąco o tym, co dzieje się w społeczności."
@@ -1909,6 +1954,8 @@ pl_PL:
       suggested_topics:
         title: "Czytaj dalej!"
         content: "Oto kilka tematów, które naszym zdaniem warto przeczytać w następnej kolejności."
+      admin_guide:
+        title: "Witaj w swojej nowej witrynie!"
     loading: "Wczytuję…"
     errors:
       prev_page: "podczas próby wczytania"
@@ -1943,22 +1990,6 @@ pl_PL:
       logout_disabled: "Wylogowanie jest zablokowane gdy strona jest w trybie tylko do odczytu."
     staff_writes_only_mode:
       enabled: "Ta strona jest w trybie tylko dla personelu. Kontynuuj przeglądanie, ale odpowiadanie, polubienia i inne działania są ograniczone tylko do członków personelu."
-    too_few_topics_and_posts_notice_MF: |
-      Zacznijmy <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">dyskutować!</a> Mamy {currentTopics, plural, one {<strong>#</strong> temat}  few {<strong>#</strong> tematy} other {<strong>#</strong> tematów}} i {currentPosts, plural, one {<strong>#</strong> wpis} few {<strong>#</strong> wpisy} other {<strong>#</strong> wpisów}}. Odwiedzający potrzebują więcej do dyskusji – zalecamy przynajmniej {requiredTopics, plural, one {<strong>#</strong> temat} few {<strong>#</strong> tematy} other {<strong>#</strong> tematów}} i {requiredPosts, plural, one {<strong>#</strong> wpis} few {<strong>#</strong> wpisy} other {<strong>#</strong> wpisów}}. Tylko członkowie personelu widzą tę wiadomość.
-    too_few_topics_notice_MF: |
-      Zacznijmy <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">dyskusję!</a> Tam { currentTopics, plural,
-          one {jest <strong>#</strong> temat}
-          few {są <strong>#</strong> tematy}
-          many {są <strong>#</strong> tematy}
-        other {są <strong>#</strong> tematy}
-      }. Odwiedzający potrzebują więcej do czytania i odpowiadania - zalecamy co najmniej { requiredTopics, plural,
-          one {<strong>#</strong> temat}
-          few {<strong>#</strong> tematy}
-          many {<strong>#</strong> tematy}
-        other {<strong>#</strong> tematy}
-      }. Tylko personel może zobaczyć tę wiadomość.
-    too_few_posts_notice_MF: |
-      Zacznijmy <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">dyskutować!</a> Mamy {currentPosts, plural, one {<strong>#</strong> wpis} few {<strong>#</strong> wpisy} other {<strong>#</strong> wpisów}}. Odwiedzający potrzebują więcej do dyskusji – zalecamy przynajmniej {requiredPosts, plural, one {<strong>#</strong> wpis} few {<strong>#</strong> wpisy} other {<strong>#</strong> wpisów}}. Tylko członkowie zespołu widzą tę wiadomość.
     logs_error_rate_notice:
       reached_hour_MF: |
         <b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# error/hour} few {# errors/hour} many {# errors/hour} other {# errors/hour}}</a> osiągnięto limit ustawień witryny wynoszący {limit, plural, one {# error/hour} few {# errors/hour} many {# errors/hour} other {# errors/hour}}.
@@ -1990,8 +2021,10 @@ pl_PL:
       hidden_for_session: "OK, zapytamy Cię jutro. Zawsze możesz też użyć opcji „Zaloguj się”, aby utworzyć konto."
       intro: "Hej! Wygląda na to, że zainteresowała Cię ta dyskusja, ale nie posiadasz jeszcze konta."
       value_prop: "Masz dość przewijania tych samych postów? Kiedy stworzysz konto, zawsze wrócisz do miejsca, w którym przerwałeś. Z kontem możesz również otrzymywać powiadomienia o nowych odpowiedziach, zapisywać zakładki i używać polubień, aby podziękować innym. Wszyscy możemy współpracować, aby ta społeczność była świetna. :heart:"
+    offline_indicator:
+      no_internet: "Brak połączenia z internetem."
+      refresh_page: "Odśwież stronę"
     summary:
-      enabled_description: "Przeglądasz podsumowanie tego tematu: widoczne są jedynie najbardziej wartościowe wpisy zdaniem uczestników. "
       description:
         one: "Jest <b>%{count}</b> odpowiedź."
         few: "Jest <b>%{count}</b> odpowiedzi."
@@ -1999,10 +2032,8 @@ pl_PL:
         other: "Jest <b>%{count}</b> odpowiedzi."
       description_time_MF: |
         Istnieje {replyCount, plural, one {<b>#</b> odpowiedź} few {<b>#</b> odpowiedzi} many {<b>#</b> odpowiedzi} other {<b>#</b> odpowiedzi}} z szacowanym czasem czytania <b>{readingTime, plural, one {# minuty} few {# minut} many {# minut} other {# minut}}</b>.
-      enable: "Podsumuj ten temat"
+      enable: "Pokaż najlepsze odpowiedzi"
       disable: "Pokaż wszystkie posty"
-      short_label: "Podsumuj"
-      short_title: "Pokaż podsumowanie tego tematu: najciekawsze posty określone przez społeczność"
     deleted_filter:
       enabled_description: "Ten temat posiada usunięte wpisy, które zostały ukryte."
       disabled_description: "Usunięte wpisy w tym temacie są widoczne."
@@ -2329,8 +2360,6 @@ pl_PL:
         topic_template_not_modified: "Dodaj szczegóły i szczegóły do swojego tematu, edytując szablon tematu."
       save_edit: "Zapisz zmiany"
       overwrite_edit: "Zastąp edycję"
-      reply_original: "Odpowiedz na Oryginalny Temat"
-      reply_here: "Odpowiedz tutaj"
       reply: "Odpowiedz"
       cancel: "Anuluj"
       create_topic: "Utwórz temat"
@@ -2432,6 +2461,7 @@ pl_PL:
       image_alt_text:
         aria_label: Tekst alternatywny dla obrazu
       delete_image_button: Usuń obraz
+      toggle_image_grid: Przełącz siatkę obrazu
     notifications:
       tooltip:
         regular:
@@ -2513,6 +2543,7 @@ pl_PL:
       reaction_2: "<span>%{username}, %{username2}</span> %{description}"
       votes_released: "%{description} - zakończone"
       new_features: "Dostępne są nowe funkcje!"
+      admin_problems: "Nowe porady w panelu administratora"
       dismiss_confirmation:
         body:
           default:
@@ -2808,6 +2839,11 @@ pl_PL:
         dismiss_tooltip: "Wyczyść nowe wpisy lub przestań śledzić tematy"
         also_dismiss_topics: "Przestać śledzić wskazane tematy. Nie chcę, aby pojawiały się w zakładce nieprzeczytane."
         dismiss_new: "Wyczyść nowe"
+        dismiss_new_modal:
+          title: "Odrzuć nowe"
+          topics: "Odrzuć nowe tematy"
+          posts: "Odrzuć nowe posty"
+          untrack: "Przestań śledzić te tematy, aby przestały pojawiać się na mojej nowej liście"
         dismiss_new_with_selected:
           one: "Oddalenie nowe (%{count})"
           few: "Oddalenie nowe (%{count})"
@@ -2853,9 +2889,10 @@ pl_PL:
         bookmarks: "Nie posiadasz tematów dodanych do zakładek."
         category: "Nie ma tematów w kategorii %{category}."
         top: "Brak najlepszych tematów."
+        filter: "Brak tematów."
         educate:
           new: '<p>Twoje nowe tematy pojawią się tutaj. Domyślnie tematy są uważane za nowe i będą pokazywać wskaźnik <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span>, jeśli zostały utworzone w ciągu ostatnich 2 dni.</p><p>Odwiedź swoje <a href="%{userPrefsUrl}">ustawienia</a>, aby to zmienić.</p>'
-          unread: "<p>Twoje nie przeczytane tematy będą pojawiać się tutaj.</p><p>Domyślnie tematy są określane jako nieprzeczytane a ich liczba zostanie wyświetlona<span class=\"badge unread-posts badge-notification\">1</span> Jeśli:</p><ul><li>Utworzyłeś/łaś temat</li><li>Odpowiedziałeś/łaś w temacie</li><li>Czytałeś/łaś temat dłużej niż 4 minuty</li></ul><p>Albo ustawiłeś/łaś śledzenie lub obserwowanie tematu przez \U0001F514 na dole każdej dyskusji.</p><p>Odwiedź swoje <a href=\"%{userPrefsUrl}\">ustawienia</a> by to zmienić.</p>"
+          unread: "<p>Twoje nie przeczytane tematy będą pojawiać się tutaj.</p><p>Domyślnie tematy są określane jako nieprzeczytane a ich liczba zostanie wyświetlona<span class=\"badge unread-posts badge-notification\">1</span> Jeśli:</p><ul><li>Utworzyłeś/łaś temat</li><li>Odpowiedziałeś/łaś w temacie</li><li>Czytałeś/łaś temat dłużej niż 5 minuty</li></ul><p>Albo ustawiłeś/łaś śledzenie lub obserwowanie tematu przez \U0001F514 na dole każdej dyskusji.</p><p>Odwiedź swoje <a href=\"%{userPrefsUrl}\">ustawienia</a> by to zmienić.</p>"
       bottom:
         latest: "Nie ma więcej najnowszych tematów."
         posted: "Nie ma więcej tematów w których pisałeś."
@@ -2867,6 +2904,7 @@ pl_PL:
         tag: "Nie ma więcej tematów z %{tag}."
         top: "Nie ma już więcej najlepszych tematów."
         bookmarks: "Nie ma więcej zakładek."
+        filter: "Nie ma więcej tematów."
     topic:
       filter_to:
         one: "%{count} post w temacie"
@@ -2874,6 +2912,7 @@ pl_PL:
         many: "%{count} postów w temacie"
         other: "%{count} postów w temacie"
       create: "Nowy temat"
+      create_disabled_category: "Nie masz uprawnień do tworzenia tematów w tej kategorii"
       create_long: "Utwórz nowy temat"
       open_draft: "Otwórz szkic"
       private_message: "Napisz wiadomość"
@@ -2928,6 +2967,7 @@ pl_PL:
       read_more_in_category: "Chcesz przeczytać więcej? Przeglądaj inne tematy w %{categoryLink} lub <a href='%{latestLink}'>przeglądaj najnowsze tematy</a>."
       read_more: "Chcesz przeczytać więcej? <a href='%{categoryLink}'>Przeglądaj wszystkie kategorie</a> lub <a href='%{latestLink}'>przeglądaj najnowsze tematy</a>."
       unread_indicator: "Nikt jeszcze nie czytał ostatniego postu w tym temacie."
+      participant_groups: "Grupy uczestników"
       read_more_MF: |
         { HAS_UNREAD_AND_NEW, select,
           true {
@@ -2976,8 +3016,8 @@ pl_PL:
       browse_all_categories_latest_or_top: "<a href='%{basePath}/categories'>Przeglądaj wszystkie kategorie</a>, <a href='%{basePath}/latest'>zobacz najnowsze tematy</a> lub zobacz popularne:"
       browse_all_tags_or_latest: "<a href='%{basePath}/tags'>Przeglądaj wszystkie tagi</a> lub <a href='%{basePath}/latest'>zobacz najnowsze tematy</a>."
       suggest_create_topic: Gotowy na <a href>rozpoczęcie nowej rozmowy?</a>
-      jump_reply_up: skocz do wcześniejszej odpowiedzi
-      jump_reply_down: skocz do późniejszej odpowiedzi
+      jump_reply: "Przejdź do pierwotnej lokalizacji posta"
+      jump_reply_aria: "Przejdź do postu @%{username} w jego oryginalnej lokalizacji"
       deleted: "Temat został usunięty"
       slow_mode_update:
         title: "Tryb powolny"
@@ -3265,6 +3305,7 @@ pl_PL:
           few: "Wybierz temat, do którego chcesz przenieść wybrane <b>%{count}</b> wpisy."
           many: "Wybierz temat, do którego chcesz przenieść <b>%{count}</b> wybranych wpisów."
           other: "Wybierz temat, do którego chcesz przenieść <b>%{count}</b> wybranych wpisów."
+        chronological_order: "zachować porządek chronologiczny po połączeniu"
       move_to_new_message:
         title: "Przejdź do nowej wiadomości"
         action: "przejdź do nowej wiadomości"
@@ -3362,6 +3403,7 @@ pl_PL:
       ignored: "Zignorowana treść"
       wiki_last_edited_on: "wiki ostatnio edytowane %{dateTime}"
       last_edited_on: "post ostatnio edytowany %{dateTime}"
+      edit_history: "historia edycji posta"
       reply_as_new_topic: "Odpowiedz w nowym temacie"
       reply_as_new_private_message: "Odpowiedź w nowej wiadomości do tego samego odbiorcy"
       continue_discussion: "Kontynuując dyskusję z %{postLink}:"
@@ -3373,10 +3415,10 @@ pl_PL:
       sr_collapse_replies: "Zwiń osadzone odpowiedzi"
       sr_date: "Data wysłania"
       sr_expand_replies:
-        one: "Ten post ma %{count} odpowiedź. Kliknij, aby rozwinąć"
-        few: "Ten post ma %{count} odpowiedzi. Kliknij, aby rozwinąć"
-        many: "Ten post ma %{count} odpowiedzi. Kliknij, aby rozwinąć"
-        other: "Ten post ma %{count} odpowiedzi. Kliknij, aby rozwinąć"
+        one: "Ten post ma %{count} odpowiedź"
+        few: "Ten post ma %{count} odpowiedzi"
+        many: "Ten post ma %{count} odpowiedzi"
+        other: "Ten post ma %{count} odpowiedzi"
       expand_collapse: "rozwiń/zwiń"
       sr_below_embedded_posts_description: "post #%{post_number} odpowiedzi"
       sr_embedded_reply_description: "odpowiedź od @%{username} na post #%{post_number}"
@@ -3570,6 +3612,8 @@ pl_PL:
           last: "Ostatnia wersja"
           hide: "Ukryj tę wersję"
           show: "Pokaż tę wersję"
+          destroy: "Usuń wersje"
+          destroy_confirm: "Czy na pewno chcesz usunąć wszystkie wersje tego posta? Ta czynność jest trwała."
           revert: "Przywróć rewizję %{revision}"
           edit_wiki: "Edytuj Wiki"
           edit_post: "Edytuj wpis"
@@ -3603,6 +3647,7 @@ pl_PL:
         updated: "Zaktualizowane"
         name: "Imię"
         name_placeholder: "Do czego ma służyć ta zakładka?"
+        name_input_label: "Nazwa zakładki"
         set_reminder: "Przypomnij mi"
         options: "Opcje"
         actions:
@@ -3624,7 +3669,6 @@ pl_PL:
       filtered_replies:
         viewing_posts_by: "Przeglądanie %{post_count} postów autorstwa"
         viewing_subset: "Niektóre odpowiedzi są zwinięte"
-        viewing_summary: "Przeglądanie podsumowania tego tematu"
         post_number: "%{username}, post #%{post_number}"
         show_all: "Pokaż wszystkie"
       share:
@@ -3641,7 +3685,7 @@ pl_PL:
       back: "Powrót do kategorii"
       general: "Ogólne"
       settings: "Ustawienia"
-      topic_template: "Szablon tematu"
+      topic_template: "Szablon"
       tags: "Tagi"
       tags_allowed_tags: "Zabroń następujących tagów w tej kategorii: "
       tags_allowed_tag_groups: "Zabroń następujących grup tagów w tej kategorii:"
@@ -3700,8 +3744,7 @@ pl_PL:
       email_in: "Dedykowany adres email kategorii:"
       email_in_tooltip: "Możesz oddzielić kilka adresów e-mail znakiem |."
       email_in_allow_strangers: "Akceptuj wiadomości email od anonimowych, nieposiadających kont użytkowników "
-      email_in_disabled: "Tworzenie nowych tematów emailem jest wyłączone w ustawieniach serwisu. "
-      email_in_disabled_click: 'Kliknij tu, aby włączyć.'
+      email_in_disabled: "Publikowanie nowych tematów przez e-mail jest wyłączone. Aby umożliwić publikowanie nowych tematów przez e-mail, włącz ustawienie <a href='%{setting_url}'>'email in'</a>."
       mailinglist_mirror: "Kategoria odzwierciedla listę mailingową"
       show_subcategory_list: "Pokaż listę subkategorii powyżej tematów w tej kategorii."
       read_only_banner: "Tekst banera, gdy użytkownik nie może utworzyć tematu w tej kategorii:"
@@ -3728,6 +3771,7 @@ pl_PL:
       default_slow_mode: 'Włącz „Tryb powolny” dla nowych tematów w tej kategorii.'
       parent: "Kategoria rodzica"
       num_auto_bump_daily: "Liczba otwartych tematów do automatycznego podbicia każdego dnia"
+      auto_bump_cooldown_days: "Minimalna liczba dni przed ponownym podbiciem tego samego tematu:"
       navigate_to_first_post_after_read: "Przejdź do pierwszego postu po przeczytaniu tematów"
       notifications:
         title: "zmień poziom powiadomień dla tej kategorii"
@@ -3813,7 +3857,9 @@ pl_PL:
         inappropriate: "Jest nieodpowiednie"
         spam: "Jest odebrane jako spam"
       custom_placeholder_notify_user: "Napisz konkretnie, konstuktywnie i kulturalnie."
+      notify_user_textarea_label: "Wiadomość dla użytkownika"
       custom_placeholder_notify_moderators: "Dlaczego ten wpis wymaga uwagi moderatora? Opisz co konkretnie Cię zaniepokoiło i jeśli to możliwe umieść odpowiednie odnośniki."
+      notify_moderators_textarea_label: "Wiadomość dla moderatorów"
       custom_message:
         at_least:
           one: "wprowadź co najmniej %{count} znak"
@@ -3927,6 +3973,10 @@ pl_PL:
     filters:
       with_topics: "%{filter} tematy"
       with_category: "%{filter} tematy w %{category} "
+      filter:
+        title: "Filtr"
+        button:
+          label: "Filtr"
       latest:
         title: "Aktualne"
         title_with_count:
@@ -4009,7 +4059,6 @@ pl_PL:
         this_week: "Tydzień"
         today: "Dzisiaj"
     browser_update: 'Niestety, <a href="https://www.discourse.org/faq/#browser">twoja przeglądarka nie jest obsługiwana</a>. Proszę <a href="https://browsehappy.com">przełączyć się na obsługiwaną przeglądarkę</a>, aby móc oglądać bogatą zawartość, zalogować się i odpowiedzieć.'
-    safari_13_warning: Ta strona wkrótce przestanie obsługiwać systemy iOS i Safari w wersji 13 i niższej. Nadal będzie dostępna uproszczona wersja tylko do odczytu. (<a href="https://meta.discourse.org/t/224747">więcej informacji</a>)
     permission_types:
       full: "tworzyć / odpowiadać / przeglądać"
       create_post: "odpowiadać / przeglądać"
@@ -4024,6 +4073,20 @@ pl_PL:
       close: "Zamknij (Esc)"
       content_load_error: '<a href="%url%">Zawartość</a> nie może zostać wczytana.'
       image_load_error: '<a href="%url%">Obraz</a> nie może zostać wczytany.'
+    experimental_lightbox:
+      image_load_error: "Nie można załadować obrazu."
+      screen_reader_image_title: "Obraz %{current} z %{total}: %{title}"
+      buttons:
+        next: "Następny (klawisz strzałki w prawo lub w dół)"
+        previous: "Poprzedni (klawisz strzałki w lewo lub w górę)"
+        close: "Zamknij (Esc)"
+        download: "Pobierz obraz"
+        newtab: "Otwórz obraz w nowej karcie"
+        zoom: "Powiększ/zmniejsz obraz (klawisz Z)"
+        rotate: "Obróć obraz (klawisz R)"
+        fullscreen: "Przełącz tryb pełnoekranowy przeglądarki (klawisz M)"
+        carousel: "Wyświetl wszystkie obrazy w karuzeli (klawisz A)"
+        retry: "Spróbuj ponownie załadować obraz"
     cannot_render_video: Nie można wyrenderować tego wideo, ponieważ Twoja przeglądarka nie obsługuje tego kodeka.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
@@ -4071,6 +4134,7 @@ pl_PL:
         title: "Komponowanie"
         return: "%{shortcut} Powróć do kompozytora"
         fullscreen: "%{shortcut} Pełnoekranowy kompozytor"
+        insert_current_time: "%{shortcut} Wstaw aktualny czas"
       bookmarks:
         title: "Tworzenie zakładek"
         enter: "%{shortcut} Zapisz i zamknij"
@@ -4118,7 +4182,11 @@ pl_PL:
         many: "Otrzymano tą odznakę %{count} razy"
         other: "Otrzymano tą odznakę %{count} razy"
       granted_on: "Przyznano %{date}"
-      others_count: "Inni użytkownicy z tą odznaką (%{count})"
+      others_count:
+        one: "Przyznane innym %{count} raz"
+        few: "Przyznane innym %{count} razy"
+        many: "Przyznane innym %{count} razy"
+        other: "Przyznane innym %{count} razy"
       title: Odznaki
       allow_title: "Możesz użyć tej odznaki jako tytułu"
       multiple_grant: "Możesz zdobyć tę odznakę wiele razy"
@@ -4137,6 +4205,7 @@ pl_PL:
         few: "%{count} przyznanych"
         many: "%{count} przyznanych"
         other: "%{count} przyznanych"
+      awarded: nagrodzony
       select_badge_for_title: Wybierz odznakę do użycia jako twój tytuł
       none: "(brak)"
       successfully_granted: "Przyznano %{badge} użytkownikowi %{username}"
@@ -4325,13 +4394,11 @@ pl_PL:
     pause_notifications:
       title: "Wstrzymaj powiadomienia na..."
       label: "Wstrzymaj powiadomienia"
-      remaining: "%{remaining} pozostało"
       options:
         half_hour: "30 minut"
         one_hour: "1 godzina"
         two_hours: "2 godziny"
         tomorrow: "Do jutra"
-        custom: "Niestandardowe"
       set_schedule: "Ustaw harmonogram powiadomień"
     trust_levels:
       names:
@@ -4384,7 +4451,60 @@ pl_PL:
       more: "Więcej"
       all_categories: "Wszystkie kategorie"
       all_tags: "Wszystkie tagi"
+      categories_form_modal:
+        title: "Edytuj nawigację kategorii"
+        subtitle:
+          text: "i automatycznie pokażemy najpopularniejsze kategorie tej witryny"
+        filter_placeholder: "Filtruj kategorie"
+        no_categories: "Brak kategorii pasujących do podanego terminu."
+      tags_form_modal:
+        title: "Edytuj nawigację tagów"
+        filter_placeholder: "Filtruj tagi"
+        no_tags: "Brak tagów pasujących do podanego terminu."
+        subtitle:
+          text: "a my automatycznie pokażemy najlepsze tagi tej witryny"
+      edit_navigation_modal_form:
+        deselect_button_text: "Odznacz wszystkie"
+        reset_to_defaults: "Przywróć domyślne"
+        filter_dropdown:
+          all: "Wszystkie"
+          selected: "Wybrany"
+          unselected: "Niewybrany"
       sections:
+        custom:
+          add: "Dodaj niestandardową sekcję"
+          edit: "Edytuj niestandardową sekcję"
+          save: "Zapisz"
+          delete: "Usuń"
+          delete_confirm: "Czy na pewno chcesz usunąć tę sekcję?"
+          reset_confirm: "Czy na pewno chcesz przywrócić tę sekcję do ustawień domyślnych?"
+          public: "Ustaw tę sekcję jako publiczną i widoczną dla wszystkich"
+          more_menu: "Menu więcej"
+          links:
+            add: "Dodaj kolejny link"
+            delete: "Usuń link"
+            reset: "Przywróć ustawienia domyślne"
+            icon:
+              label: "Ikona"
+              validation:
+                blank: "Ikona nie może być pusta"
+                maximum: "Ikona musi być krótsza niż %{count} znaków"
+            name:
+              label: "Pełna nazwa"
+              validation:
+                blank: "Nazwa nie może być pusta"
+                maximum: "Nazwa musi być krótsza niż %{count} znaków"
+            value:
+              label: "Odnośnik"
+              validation:
+                blank: "Link nie może być pusty"
+                maximum: "Link musi być krótszy niż %{count} znaków"
+                invalid: "Format jest nieprawidłowy"
+          title:
+            label: "Tytuł sekcji"
+            validation:
+              blank: "Tytuł nie może być pusty"
+              maximum: "Tytuł musi być krótszy niż %{count} znaków"
         about:
           header_link_text: "O stronie"
         messages:
@@ -4399,28 +4519,20 @@ pl_PL:
             unread_with_count: "Nieprzeczytane (%{count})"
             archive: "Archiwum"
         tags:
-          links:
-            add_tags:
-              content: "Dodaj tagi"
-              title: "Nie dodałeś żadnych tagów. Kliknij, aby rozpocząć."
           none: "Nie dodałeś żadnych tagów."
           click_to_get_started: "Kliknij tutaj, aby rozpocząć."
           header_link_text: "Etykiety"
           header_action_title: "Edytuj tagi paska bocznego"
           configure_defaults: "Skonfiguruj ustawienia domyślne"
         categories:
-          links:
-            add_categories:
-              content: "Dodaj kategorie"
-              title: "Nie dodano żadnych kategorii. Kliknij, aby rozpocząć."
           none: "Nie dodałeś żadnych kategorii."
           click_to_get_started: "Kliknij tutaj, aby rozpocząć."
           header_link_text: "Kategorie"
           header_action_title: "Edytuj kategorie paska bocznego"
           configure_defaults: "Skonfiguruj ustawienia domyślne"
         community:
-          header_link_text: "Społeczność"
-          header_action_title: "Utwórz temat"
+          edit_section:
+            header_dropdown: "Wygląd"
           links:
             about:
               content: "O stronie"
@@ -4431,8 +4543,8 @@ pl_PL:
             badges:
               content: "Odznaki"
               title: "Wszystkie odznaki dostępne do zdobycia"
-            everything:
-              content: "Wszystko"
+            topics:
+              content: "Tematy"
               title: "Wszystkie tematy"
             faq:
               content: "FAQ"
@@ -4445,6 +4557,7 @@ pl_PL:
               title: "Lista wszystkich użytkowników"
             my_posts:
               content: "Wysłane"
+              content_drafts: "Moje szkice"
               title: "Moja ostatnia aktywność w temacie"
               title_drafts: "Moje nieopublikowane wersje robocze"
               draft_count:
@@ -4456,11 +4569,40 @@ pl_PL:
               content: "Sprawdź"
               title: "Oflagowane posty i inne elementy w kolejce"
               pending_count: "%{count} oczekujących"
+        global_section: "Sekcja globalna, widoczna dla wszystkich"
     welcome_topic_banner:
       title: "Stwórz swój temat powitalny"
       description: "Twój temat powitalny to pierwsza rzecz, którą przeczytają nowi członkowie. Pomyśl o tym jako o swoim „przemówieniu” lub „deklaracji misji”. Poinformuj wszystkich, dla kogo jest ta społeczność, czego mogą się tu spodziewać, i co chcesz, aby zrobili najpierw."
       button_title: "Rozpocznij edycję"
     until: "Aż do:"
+    char_counter:
+      exceeded: "Przekroczono maksymalną dozwoloną liczbę znaków."
+    form_template_chooser:
+      select_template: "Wybierz szablony formularzy"
+    form_templates:
+      errors:
+        valueMissing:
+          default: "Proszę wypełnić to pole."
+          text: "Proszę wypełnić to pole."
+          select-one: "Wybierz pozycję z listy."
+          select-multiple: "Wybierz co najmniej jedną pozycję z listy."
+          checkbox: "Zaznacz to pole, jeśli chcesz kontynuować."
+        typeMismatch:
+          default: "Wprowadź poprawną wartość."
+          color: "Proszę wprowadzić kolor."
+          date: "Proszę wprowadzić kolor."
+          email: "Podaj poprawny adres email."
+          number: "Wprowadź liczbę."
+          password: "Wprowadź prawidłowe hasło."
+          tel: "Wprowadź prawidłowy numer telefonu."
+          text: "Wprowadź wartość tekstową."
+          url: "Wprowadź prawidłowy adres URL."
+        tooShort: "Wprowadzane dane muszą zawierać %{minLength} znaków lub więcej."
+        tooLong: "Wprowadzane dane muszą zawierać mniej niż %{maxLength} znaków."
+        rangeOverflow: "Dane wejściowe muszą być mniejsze niż %{max}."
+        rangeUnderflow: "Dane wejściowe muszą być większe niż %{min}."
+        patternMismatch: "Proszę dopasować żądany format."
+        badInput: "Wprowadź prawidłowe dane wejściowe."
   admin_js:
     type_to_filter: "pisz, aby filtrować…"
     admin:
@@ -4623,12 +4765,18 @@ pl_PL:
         about: "Tu możesz edytować przypisania do grup oraz ich nazwy"
         group_members: "Członkowie grupy"
         delete: "Usuń"
-        delete_confirm: "Czy na pewno chcesz usunąć tę grupę?"
+        delete_confirm: "Czy na pewno chcesz usunąć %{group}?"
+        delete_details:
+          one: "%{count} osoba straci dostęp do tej grupy"
+          few: "%{count} osoby stracą dostęp do tej grupy"
+          many: "%{count} osób straci dostęp do tej grupy"
+          other: "%{count} osób straci dostęp do tej grupy"
         delete_with_messages_confirm:
-          one: "Usunięcie tej grupy spowoduje osierocenie %{count} wiadomości, a członkowie grupy utracą do niej dostęp."
-          few: "Usunięcie tej grupy spowoduje osierocenie %{count} wiadomości, a członkowie grupy utracą do niej dostęp."
-          many: "Usunięcie tej grupy spowoduje osierocenie %{count} wiadomości, a członkowie grupy utracą do niej dostęp."
-          other: "Usunięcie tej grupy spowoduje osierocenie %{count} wiadomości, a członkowie grupy utracą do niej dostęp."
+          one: "%{count} wiadomość stanie się niedostępna dla członków grupy"
+          few: "%{count} wiadomości staną się niedostępna dla członków grupy"
+          many: "%{count} wiadomości staną się niedostępna dla członków grupy"
+          other: "%{count} wiadomości staną się niedostępna dla członków grupy"
+        delete_warning: "Usuniętych grup nie można odzyskać"
         delete_failed: "Nie można usunąć grupy. Jeżeli jest to grupa automatyczna, nie może zostać zniszczona."
         delete_automatic_group: To jest grupa automatyczna i nie można jej usunąć.
         delete_owner_confirm: "Usunąć status właściciela dla '%{username}'?"
@@ -4694,10 +4842,16 @@ pl_PL:
             topics:
               read: Przeczytaj temat lub konkretny post w nim. Obsługiwany jest również format RSS.
               write: Utwórz nowy temat lub post w istniejącym.
-              update: Zaktualizuj temat. Zmień tytuł, kategorię, tagi itp.
+              update: Zaktualizuj temat. Zmień tytuł, kategorię, tagi, status, archetyp, featured_link itp.
+              delete: Usuń temat.
               read_lists: Czytaj listy tematów, takie jak najpopularniejsze, nowe, najnowsze itp. Obsługiwany jest również format RSS.
+              status: "Zaktualizuj status tematu. Status: zamknięty, archiwalny, widoczny, przypięty. Włączone: prawda, fałsz. Określ identyfikator kategorii_id tutaj i w żądaniu payload, aby zezwalać na zmiany statusu tylko w tematach z tej kategorii."
             posts:
               edit: Edytuj dowolny post lub konkretny.
+              delete: Usuń post.
+              list: Lista najnowszych postów i postów prywatnych. Obsługiwany jest również RSS.
+            tags:
+              list: Lista tagów.
             categories:
               list: Uzyskaj listę kategorii.
               show: Uzyskaj pojedynczą kategorię według identyfikatora.
@@ -4711,6 +4865,7 @@ pl_PL:
               update: Zaktualizuj informacje o profilu użytkownika.
               log_out: Wyloguj wszystkie sesje użytkownika.
               anonymize: Anonimizuj konta użytkowników.
+              suspend: Zawieś konta użytkowników.
               delete: Usuń konta użytkowników.
               list: Uzyskaj listę użytkowników.
             user_status:
@@ -4718,6 +4873,8 @@ pl_PL:
               update: Zaktualizuj status użytkownika.
             email:
               receive_emails: Połącz ten zakres z odbiorcą poczty w celu przetwarzania przychodzących wiadomości e-mail.
+            invites:
+              create: Wysyłaj zaproszenia e-mailem lub generuj linki do zaproszeń.
             badges:
               create: Utwórz nową odznakę.
               show: Uzyskaj informacje o odznace.
@@ -4726,6 +4883,12 @@ pl_PL:
               list_user_badges: Lista odznak użytkownika.
               assign_badge_to_user: Przypisz odznakę użytkownikowi.
               revoke_badge_from_user: Odbierz odznakę użytkownikowi.
+            groups:
+              manage_groups: Wyświetlaj, dodawaj i usuwaj członków grupy.
+              administer_groups: Wyświetlaj, pokazuj, twórz, aktualizuj i usuwaj grupy.
+            search:
+              show: Szukaj przy użyciu punktu końcowego `/search.json?q=term`.
+              query: Szukaj przy użyciu punktu końcowego `/search/query?term=term`.
             wordpress:
               publishing: Niezbędne do funkcji publikowania wtyczki WP Discourse (wymagane).
               commenting: Niezbędne do funkcji komentowania wtyczki WP Discourse.
@@ -4792,8 +4955,7 @@ pl_PL:
           name: "Wydarzenie promowania użytkownika"
           details: "Gdy użytkownik awansuje z jednego poziomu zaufania na inny."
         user_badge_event:
-          name: "Wydarzenie przyznania odznak"
-          details: "Gdy użytkownik otrzymuje odznakę."
+          details: "Kiedy odznaka zostaje przyznana lub odebrana."
         group_user_event:
           name: "Grupowy event użytkownika"
           details: "Gdy użytkownik jest dodany lub usunięty w grupie."
@@ -4840,7 +5002,7 @@ pl_PL:
         enabled: "Włączona?"
         is_enabled: "T"
         not_enabled: "N"
-        change_settings: "Zmień ustawienia"
+        change_settings: "Ustawienia wtyczki"
         change_settings_short: "Ustawienia"
         howto: "Jak zainstalować wtyczkę?"
         official: "Oficjalna wtyczka"
@@ -5174,6 +5336,12 @@ pl_PL:
           love:
             name: "polubienie"
             description: "Kolor przycisku polubień"
+          selected:
+            name: "zaznaczone"
+            description: "Kolor tła elementów, takich jak elementy listy, gdy są zaznaczone/aktywne."
+          hover:
+            name: "najechanie"
+            description: "Kolor tła elementów, takich jak elementy listy, gdy są one najechane kursorem lub mają fokus klawiatury."
         robots:
           title: "Nadpisz plik robots.txt swojej witryny:"
           warning: "To ustawienie permanentnie nadpisze wszystkie powiązane ustawienia witryny."
@@ -5304,6 +5472,7 @@ pl_PL:
           no_previous: "Nie ma wcześniejszej wartości."
           deleted: "Nie ma nowej wartości. Zapis został usunięty."
           actions:
+            permanently_delete_post_revisions: "trwale usuń wersje posta"
             delete_user: "usunięcie użytkownika"
             change_trust_level: "zmiana poziomu zaufania"
             change_username: "zmień nazwę użytkownika"
@@ -5337,6 +5506,7 @@ pl_PL:
             revoke_moderation: "cofnąć moderację"
             backup_create: "Wykonaj kopię zapasową"
             deleted_tag: "usunięty tag"
+            update_directory_columns: "zaktualizuj kolumny katalogu"
             deleted_unused_tags: "usunięto nieużywane tagi"
             renamed_tag: "zmieniona nazwa tag'u"
             revoke_email: "cofnąć e-mail"
@@ -5395,6 +5565,9 @@ pl_PL:
             delete_group: "usuń grupę"
             watched_word_create: "dodaj obserwowane słowo"
             watched_word_destroy: "usuń obserwowane słowo"
+            create_public_sidebar_section: "utwórz publiczną sekcję paska bocznego"
+            update_public_sidebar_section: "aktualizuj publiczną sekcję paska bocznego"
+            destroy_public_sidebar_section: "zniszcz publiczną sekcję paska bocznego"
         screened_emails:
           title: "Ekranowane emaile"
           description: "Kiedy ktoś próbuje założyć nowe konto, jego adres email zostaje sprawdzony i rejestracja zostaje zablokowana, lub inna akcja jest podejmowana."
@@ -5460,14 +5633,14 @@ pl_PL:
           silence: "Wycisz"
           link: "Odnośnik"
         action_descriptions:
-          block: "Zapobiegaj publikacji postów zawierających te słowa. Użytkownicy zobaczą błąd próbując wysłać taki wpis."
-          censor: "Zezwalaj na wysyłanie wpisów zawierających te słowa, ale zamień na znaki ukrywające ocenzurowane słowa."
-          require_approval: "Wpisy zawierające te słowa będą wymagały zatwierdzenia przez członka zespołu zarządzającego zanim zostaną opublikowane."
-          flag: "Zezwalaj na publikację takich wpisów, ale oflaguj je jako nieodpowiednie, aby moderatorzy mogli przejrzeć ich zawartość."
-          replace: "Zastąp słowa w postach innymi słowami"
-          tag: "Automatycznie otaguj tematy na podstawie pierwszego postu"
-          silence: "Pierwsze posty użytkowników zawierające te słowa będą wymagały zatwierdzenia przez personel, zanim będą widoczne, a użytkownik zostanie automatycznie wyciszony."
-          link: "Zastąp słowa w postach linkami"
+          block: "Komunikat o błędzie zostanie wyświetlony podczas próby utworzenia posta zawierającego te słowa."
+          censor: "Zezwalaj na posty zawierające te słowa, ale zastąp je znakami ukrywającymi ocenzurowane słowa."
+          require_approval: "Wymagaj zatwierdzenia przez personel postów zawierających te słowa, zanim będą one widoczne dla innych."
+          flag: "Zezwalaj na posty zawierające te słowa, ale oflaguj je jako nieodpowiednie do sprawdzenia przez moderatorów."
+          replace: "Zastąp słowa w postach innymi słowami."
+          tag: "Automatycznie otaguj tematy, jeśli pierwszy post zawiera konkretne słowo."
+          silence: "Wycisz nowe konta, jeśli ich pierwszy post zawiera którekolwiek z tych słów. Post zostanie automatycznie ukryty, dopóki personel go nie zatwierdzi."
+          link: "Zastąp słowa w postach linkami."
         form:
           label: "Zawiera słowo lub frazę"
           placeholder: "Wpisz słowo lub frazę (* to symbol wieloznaczny)"
@@ -5490,6 +5663,87 @@ pl_PL:
           description: "Wpisz tekst poniżej, aby sprawdzić dopasowania z obserwowanymi słowami"
           found_matches: "Znalezione wyniki:"
           no_matches: "Nie znaleziono dopasowań"
+      form_templates:
+        nav_title: "Szablony"
+        title: "Szablony formularzy"
+        help: "Utwórz strukturę szablonów, której można użyć do tworzenia nowych tematów, postów i wiadomości."
+        new_template: "Nowy szablon"
+        list_table:
+          headings:
+            name: "Nazwa"
+            active_categories: "Aktywne kategorie"
+            actions: "Akcje"
+          actions:
+            view: "Zobacz szablon"
+            edit: "Edytuj szablon"
+            delete: "Usuń szablon"
+        view_template:
+          close: "Zamknij"
+          edit: "Edytuj"
+          delete: "Usuń"
+          toggle_preview: "Przełącz podgląd"
+        new_template_form:
+          submit: "Zapisz"
+          cancel: "Anuluj"
+          name:
+            label: "Nazwa szablonu"
+            placeholder: "Wpisz nazwę tego szablonu..."
+          template:
+            label: "Szablon"
+            placeholder: "Utwórz szablon YAML tutaj..."
+          preview: "Podgląd"
+        delete_confirm: "Czy na pewno chcesz usunąć ten szablon?"
+        quick_insert_fields:
+          add_new_field: "Dodaj"
+          checkbox: "Pole wyboru"
+          input: "Krótka odpowiedź"
+          textarea: "Długa odpowiedź"
+          dropdown: "Lista rozwijana"
+          upload: "Prześlij plik"
+          multiselect: "Wielokrotny wybór"
+        validations_modal:
+          button_title: "Walidacje"
+          modal_title: "Opcje walidacji"
+          table_headers:
+            key: "Klucz"
+            type: "Typ"
+            description: "Opis"
+          validations:
+            required:
+              key: "wymagane"
+              type: "wart. logiczna"
+              description: "Wymaga wypełnienia pola w celu wysłania formularza."
+            minimum:
+              key: "minimum"
+              type: "liczba całk."
+              description: "W przypadku pól tekstowych określa minimalną dozwoloną liczbę znaków."
+            maximum:
+              key: "maksimum"
+              type: "liczba całk."
+              description: "W przypadku pól tekstowych określa maksymalną dozwoloną liczbę znaków."
+            pattern:
+              key: "wzór"
+              type: "ciąg regex"
+              description: "W przypadku pól tekstowych, wyrażenie regularne określające dozwolone dane wejściowe."
+            type:
+              key: "typ"
+              type: "ciąg znaków"
+              description: "W przypadku pól wejściowych można określić typ danych wejściowych, których należy się spodziewać (text|email|date|number|url|tel|color)"
+        preview_modal:
+          title: "Podgląd szablonu"
+        field_placeholders:
+          validations: "wprowadź walidacje tutaj"
+          label: "Wprowadź etykietę tutaj"
+          none_label: "Wybierz element"
+          choices:
+            first: "Opcja 1"
+            second: "Opcja 2"
+            third: "Opcja 3"
+        edit_category:
+          toggle_freeform: "szablon formularza wyłączony"
+          toggle_form_template: "szablon formularza włączony"
+          select_template: "Wybierz szablony formularzy"
+          select_template_help: "Dodaj/edytuj szablony formularzy"
       impersonate:
         title: "Podszywaj się"
         help: "Użyj tego narzędzia, aby podszywać się pod konto użytkownika do celów debugowania. Będziesz musiał się wylogować po zakończeniu."
@@ -5502,6 +5756,7 @@ pl_PL:
         not_found: "Przepraszamy, taka nazwa użytkownika nie istnieje w naszym systemie."
         id_not_found: "Przepraszamy, ten identyfikator użytkownika nie istnieje w naszym systemie."
         active: "Aktywowane"
+        status: "Status"
         show_emails: "Pokaż e-maile"
         hide_emails: "Ukryj e-maile"
         nav:
@@ -5590,7 +5845,6 @@ pl_PL:
         show_admin_profile: "Administrator"
         manage_user: "Zarządzaj użytkownikiem"
         show_public_profile: "Pokaż profil publiczny"
-        impersonate: "Podszywaj się"
         action_logs: "Logi akcji"
         ip_lookup: "Wyszukiwanie IP"
         log_out: "Wyloguj"
@@ -5838,6 +6092,9 @@ pl_PL:
         show_overriden: "Pokaż tylko nadpisane"
         locale: "Język:"
         more_than_50_results: "Istnieje ponad 50 wyników. Zawęź wyszukiwanie."
+        interpolation_keys: "Dostępne klucze interpolacji:"
+        outdated:
+          dismiss: "Odrzuć"
       settings:
         show_overriden: "Pokaż tylko nadpisane"
         history: "Wyświetl historię zmian"
@@ -5850,7 +6107,11 @@ pl_PL:
             label: "Dodaj emoji"
         title: "Ustawienia"
         no_results: "Brak wyników wyszukiwania"
-        more_than_30_results: "Istnieje ponad 30 wyników. Zawęź wyszukiwanie lub wybierz kategorię."
+        more_site_setting_results:
+          one: "Jest więcej niż %{count} wynik. Zawęź wyszukiwanie lub wybierz kategorię."
+          few: "Jest więcej niż %{count} wyników. Zawęź wyszukiwanie lub wybierz kategorię."
+          many: "Jest więcej niż %{count} wyników. Zawęź wyszukiwanie lub wybierz kategorię."
+          other: "Jest więcej niż %{count} wyników. Zawęź wyszukiwanie lub wybierz kategorię."
         clear_filter: "Wyczyść"
         add_url: "dodaj URL"
         add_host: "dodaj host"
@@ -5937,7 +6198,8 @@ pl_PL:
         allow_title: Pozwól wykorzystywać odznakę jako tytuł
         multiple_grant: Może być przyznana wielokrotnie
         listable: Wyświetlaj odznakę na publicznych listach odznak
-        enabled: Włącz odznakę
+        enabled: włączona
+        disabled: wyłączone
         icon: Ikona
         image: Grafika
         graphic: Grafika
@@ -6009,10 +6271,8 @@ pl_PL:
       embedding:
         get_started: "Jeśli chcesz osadzić Discourse na innej stronie, rozpocznij podając jej host."
         confirm_delete: "Czy na pewno chcesz usunąć ten host?"
-        sample: "Wklej poniższy kod HTML na swojej stronie, aby tworzyć i osadzać tematy Discourse. Zastąp <b>REPLACE_ME</b> kanonicznym adresem URL strony, na której go osadzasz."
         title: "Osadzanie"
         host: "Dozwolone hosty"
-        class_name: "Nazwa klasy"
         allowed_paths: "Lista dozwolonych ścieżek"
         edit: "edytuj"
         category: "Publikuj w kategorii"
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index c2149862882..38e58e13998 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -179,17 +179,12 @@ pt:
       forwarded: "Encaminhou o e-mail acima"
     topic_admin_menu: "ações do tópico"
     skip_to_main_content: "Saltar para o conteúdo principal"
+    skip_user_nav: "Saltar para o conteúdo do perfil"
     emails_are_disabled: "Todos os envios de e-mail foram globalmente desativados por um administrador. Nenhum e-mail de notificação será enviado."
     emails_are_disabled_non_staff: "O envio de e-mail foi desativado para usuários que não são da equipe."
     software_update_prompt:
       message: "Atualizámos este site, <span>por favor recarregue a página</span> ou poderá experienciar um comportamento inesperado."
       dismiss: "Marcar como visto"
-    bootstrap_mode_enabled:
-      one: "Para que o início do teu Site seja o mais simples possível, estás agora em modo de inicialização simples. A todos os novos utilizadores será concedido o Nível de Confiança 1 e o resumo por e-mail enviado diariamente estará ativado. Isto será automaticamente desligado quando %{count} utilizador se tiver juntado ao fórum."
-      other: "Para que o início do teu Site seja o mais simples possível, estás agora em modo de inicialização simples. A todos os novos utilizadores será concedido o Nível de Confiança 1 e o resumo por e-mail enviado diariamente estará ativado. Isto será automaticamente desligado quando %{count} utilizadores se tiverem juntado ao fórum."
-    bootstrap_mode_disabled: "O modo de inicialização simples será desactivado em 24 horas."
-    bootstrap_invite_button_title: "Enviar Convites"
-    bootstrap_wizard_link_title: "Concluir assistente de configuração"
     themes:
       default_description: "Predefinição"
       broken_theme_alert: "Seu site pode não funcionar porque um tema ou componente têm erros."
@@ -299,10 +294,8 @@ pt:
       edit_bookmark: "Editar Favorito"
       clear_bookmarks: "Remover Marcadores"
       help:
-        bookmark: "Clique para adicionar um marcador à primeira publicação neste tópico"
-        edit_bookmark: "Clique para editar o favorito neste tópico"
         unbookmark: "Clique para remover todos os marcadores deste tópico"
-        unbookmark_with_reminder: "Clique para remover todos os favoritos e lembretes neste tópico."
+        unbookmark_with_reminder: "Clique para remover todos os favoritos e lembretes neste tópico"
     bookmarks:
       created: "Adicionou este post aos favoritos. %{name}"
       create: "Criar favorito"
@@ -337,7 +330,6 @@ pt:
       remove_confirmation: "Tem a certeza que pretende eliminar este rascunho?"
       new_topic: "Novo rascunho de tópico"
       abandon:
-        confirm: "Tem um rascunho em andamento neste tópico. O que gostaria de fazer com ele?"
         yes_value: "Descartar"
         no_value: "Retomar a edição"
     topic_count_categories:
@@ -507,11 +499,9 @@ pt:
       scores:
         about: "Esta pontuação é calculada com base no nível de confiança do utilizador que sinaliza, a precisão das suas anteriores denúncias e a prioridade do item sinalizado."
         score: "Pontuação"
-        date: "Data"
-        type: "Tipo"
+        type: "Motivo"
         status: "Estado"
-        submitted_by: "Enviado por"
-        reviewed_by: "Revisto por"
+        submitted_by: "Reportado por"
       statuses:
         pending:
           title: "Pendente"
@@ -519,14 +509,12 @@ pt:
           title: "Aprovado"
         rejected:
           title: "Rejeitado"
-        ignored:
-          title: "Ignorados"
-        deleted:
-          title: "Eliminado"
         reviewed:
-          title: "(todos revistos)"
+          title: "Todos revistos"
         all:
-          title: "(tudo)"
+          title: "Tudo"
+      context_question:
+        delimiter: "ou"
       types:
         reviewable_flagged_post:
           title: "Publicação Sinalizada"
@@ -831,6 +819,7 @@ pt:
         make_all_primary_description: "Tornar este o grupo principal para todos os usuários selecionados"
         remove_all_primary: "Remover como Principal"
         remove_all_primary_description: "Remover este grupo como principal"
+        status: "Estado"
         owner: "Dono(a)"
         primary: "Principal"
         forbidden: "Não tem permissão para visualizar os membros."
@@ -953,11 +942,6 @@ pt:
       profile: "Perfil"
       mute: "Silenciar"
       edit: "Editar Preferências"
-      download_archive:
-        button_text: "Transferir Tudo"
-        confirm: "Tem a certeza que deseja transferir as suas mensagens?"
-        success: "Transferência iniciada, será notificado via mensagem assim que o processo estiver concluído."
-        rate_limit_error: "As mensagens podem ser transferidas uma vez por dia, por favor, tente novamente amanhã."
       new_private_message: "Nova Mensagem"
       private_message: "Mensagem"
       private_messages: "Mensagens"
@@ -1135,13 +1119,6 @@ pt:
       save_to_change_theme: 'O tema será atualizado após clicar em "%{save_text}"'
       home: "Página Principal Por Defeito"
       staged: "Não Confirmado"
-      staff_counters:
-        flags_given: "denúncias úteis"
-        flagged_posts: "publicações sinalizadas"
-        deleted_posts: "mensagens eliminadas"
-        suspensions: "suspensões"
-        warnings_received: "avisos"
-        rejected_posts: "mensagens rejeitadas"
       messages:
         all: "todas as caixas de entrada"
         inbox: "Caixa de Entrada"
@@ -1176,7 +1153,6 @@ pt:
         tags: "Etiquetas"
         interface: "Interface"
         apps: "Aplicações"
-        sidebar: "Barra Lateral"
       change_password:
         success: "(email enviado)"
         in_progress: "(a enviar email)"
@@ -1190,11 +1166,9 @@ pt:
         title: "Códigos de Reserva para Autenticação em Dois Passos"
         regenerate: "Regenerar"
         disable: "Desativar"
-        enable: "Ativar"
-        enable_long: "Ativar códigos de reserva"
         manage:
-          one: "Gerir códigos de reserva. Resta <strong>%{count}</strong> código de reserva."
-          other: "Gerir códigos de reserva. Restam <strong>%{count}</strong> códigos de reserva."
+          one: "Resta <strong>%{count}</strong> código de reserva."
+          other: "Restam <strong>%{count}</strong> códigos de reserva."
         copy_to_clipboard: "Copiar para a Área de Transferência"
         copy_to_clipboard_error: "Erro a copiar dados para a Área de Transferência"
         copied_to_clipboard: "Copiado para a Área de Transferência"
@@ -1607,8 +1581,7 @@ pt:
       pause_notifications: "Pausar notificações"
       remove_status: "Remover status"
     user_tips:
-      primary: "Entendi!"
-      secondary: "não me mostre essas dicas"
+      button: "Entendi!"
       first_notification:
         title: "Sua primeira notificação!"
       topic_timeline:
@@ -1670,11 +1643,7 @@ pt:
       hidden_for_session: "OK, perguntaremos a você amanhã. Você sempre pode usar 'Efetuar Login' para criar uma conta, também."
       intro: "Olá! Parece que está a gostar da conversa, mas ainda não tem uma conta."
     summary:
-      enabled_description: "Está a ver um resumo deste tópico: as respostas mais interessantes são determinadas pela comunidade."
-      enable: "Resumir Este Tópico"
       disable: "Mostrar Todas As Publicações"
-      short_label: "Resumir"
-      short_title: "Mostrar um resumo deste tópico: as discussões mais interessantes conforme determinado pela comunidade"
     deleted_filter:
       enabled_description: "Este tópico contém respostas eliminadas, que foram ocultadas."
       disabled_description: "As publicações eliminadas no tópico são exibidas."
@@ -1934,8 +1903,6 @@ pt:
         topic_template_not_modified: "Adicione detalhes e especificações ao tópico, editando o modelo de tópico."
       save_edit: "Guardar Edição"
       overwrite_edit: "Guardar Edição"
-      reply_original: "Responder no Tópico Original"
-      reply_here: "Responda Aqui"
       reply: "Responder"
       cancel: "Cancelar"
       create_topic: "Criar Tópico"
@@ -2321,7 +2288,7 @@ pt:
         top: "Não existem tópicos recentes."
         educate:
           new: '<p>Os seus novos tópicos irão aparecer aqui. Por defeito, os tópicos são considerados novos e mostrarão o indicador <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span> caso tenham sido criados nos últimos 2 dias.</p><p>Pode alterar isto nas suas <a href="%{userPrefsUrl}"> preferências</a>.</p>'
-          unread: "<p>As suas publicações não lidas aparecem aqui.</p><p>Por defeito, tópicos são considerados não lidos e mostrarão contadores de não lidos <span class=\"badge unread-posts badge-notification\">1</span> se você:</p><ul><li>Criou o tópico</li><li>Respondeu ao tópico</li><li>Leu o tópico durante mais de 4 minutos</li></ul><p>Ou marcou explicitamente o tópico como Seguido ou Vigiado através do \U0001F514 em cada tópico.</p><p>Visite as suas <a href=\"%{userPrefsUrl}\">preferências</a> para alterar isto.</p>"
+          unread: "<p>As suas publicações não lidas aparecem aqui.</p><p>Por defeito, tópicos são considerados não lidos e mostrarão contadores de não lidos <span class=\"badge unread-posts badge-notification\">1</span> se você:</p><ul><li>Criou o tópico</li><li>Respondeu ao tópico</li><li>Leu o tópico durante mais de 5 minutos</li></ul><p>Ou marcou explicitamente o tópico como Seguido ou Vigiado através do \U0001F514 em cada tópico.</p><p>Visite as suas <a href=\"%{userPrefsUrl}\">preferências</a> para alterar isto.</p>"
       bottom:
         latest: "Não existem mais tópicos recentes."
         posted: "Não existem mais tópicos publicados."
@@ -2382,8 +2349,6 @@ pt:
       expand_details: "expandir detalhes do tópico"
       unread_indicator: "Nenhum membro leu o último post deste tópico ainda."
       suggest_create_topic: Pronto para <a href>iniciar uma nova conversa?</a>
-      jump_reply_up: avançar para resposta mais recente
-      jump_reply_down: avançar para resposta mais antiga
       deleted: "Este tópico foi eliminado"
       slow_mode_update:
         title: "Modo lento"
@@ -2858,6 +2823,8 @@ pt:
           last: "Última revisão"
           hide: "Esconder revisão"
           show: "Mostrar revisão"
+          destroy: "Apagar revisões"
+          destroy_confirm: "Tem certeza de que deseja apagar todas as revisões deste post? Esta ação é permanente."
           revert: "Reverter para a versão %{revision}"
           edit_wiki: "Editar Wiki"
           edit_post: "Editar Mensagem"
@@ -2906,7 +2873,6 @@ pt:
       filtered_replies:
         viewing_posts_by: "Visualizando %{post_count} posts por"
         viewing_subset: "Algumas respostas estão recolhidas"
-        viewing_summary: "Vendo um resumo deste tópico"
         post_number: "%{username}, post #%{post_number}"
         show_all: "Mostrar tudo"
     category:
@@ -2919,7 +2885,6 @@ pt:
       back: "Voltar para a categoria"
       general: "Geral"
       settings: "Configurações"
-      topic_template: "Modelo do Tópico"
       tags: "Etiquetas"
       tags_allowed_tags: "Restringir essas tags a esta categoria:"
       tags_allowed_tag_groups: "Restringir esses grupos de tags a esta categoria:"
@@ -2973,8 +2938,6 @@ pt:
       images: "Imagens"
       email_in: "Endereço de email personalizado para emails recebidos:"
       email_in_allow_strangers: "Aceitar emails de utilizadores anónimos sem conta"
-      email_in_disabled: "Publicar novos tópicos através do email está desactivado nas Configurações do Sítio. Para permitir a publicação de novos tópicos através do email,"
-      email_in_disabled_click: 'ative a definição "email em".'
       mailinglist_mirror: "Categoria espelha uma lista de e-mails"
       show_subcategory_list: "Mostrar lista de subcategorias acima dos tópicos desta categoria."
       read_only_banner: "Texto do banner para quando um usuário não pode criar um tópico nesta categoria:"
@@ -3068,7 +3031,9 @@ pt:
         inappropriate: "É inapropriado"
         spam: "É Spam"
       custom_placeholder_notify_user: "Seja específico, seja construtivo e seja sempre amável."
+      notify_user_textarea_label: "Mensagem para o utilizador"
       custom_placeholder_notify_moderators: "Diga-nos especificamente quais são as suas preocupações, e forneça-nos hiperligações relevantes e exemplo se possível."
+      notify_moderators_textarea_label: "Mensagem para os moderadores"
       custom_message:
         at_least:
           one: "insira pelo menos %{count} caráter"
@@ -3148,6 +3113,10 @@ pt:
     filters:
       with_topics: "%{filter} tópicos"
       with_category: "%{filter} %{category} tópicos"
+      filter:
+        title: "Filtrar"
+        button:
+          label: "Filtrar"
       latest:
         title: "Recente"
         title_with_count:
@@ -3227,6 +3196,9 @@ pt:
       close: "Fechar (Esc)"
       content_load_error: '<a href="%url%">O conteúdo</a> não pôde ser carregado.'
       image_load_error: '<a href="%url%">A imagem</a> não pôde ser carregada.'
+    experimental_lightbox:
+      buttons:
+        close: "Fechar (Esc)"
     cannot_render_video: Este vídeo não pode ser renderizado porque seu navegador não suporta o codec.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
@@ -3312,7 +3284,6 @@ pt:
         one: "Ganhou este distintivo %{count} vez"
         other: "Ganhou este crachá %{count} vezes"
       granted_on: "Concedido %{date}"
-      others_count: "Outros com este crachá (%{count})"
       title: Crachás
       allow_title: "Pode usar este crachá como título"
       multiple_grant: "Você pode ganhar isto várias vezes"
@@ -3464,13 +3435,11 @@ pt:
     image_removed: "(imagem removida)"
     pause_notifications:
       label: "Pausar notificações"
-      remaining: "%{remaining} restante"
       options:
         half_hour: "30 minutos"
         one_hour: "1 hora"
         two_hours: "2 horas"
         tomorrow: "Até amanhã"
-        custom: "Personalizar"
       set_schedule: "Definir um horário de notificação"
     trust_levels:
       names:
@@ -3489,7 +3458,19 @@ pt:
         other: "%{count} novos"
       more: "Mais"
       all_categories: "Todas as categorias"
+      edit_navigation_modal_form:
+        filter_dropdown:
+          all: "Tudo"
       sections:
+        custom:
+          save: "Guardar"
+          delete: "Eliminar"
+          links:
+            reset: "Restaurar ao padrão"
+            icon:
+              label: "Ícone"
+            name:
+              label: "Nome"
         about:
           header_link_text: "Sobre"
         messages:
@@ -3507,7 +3488,8 @@ pt:
         categories:
           header_link_text: "Categorias"
         community:
-          header_link_text: "Comunidade"
+          edit_section:
+            header_dropdown: "Personalizar"
           links:
             about:
               content: "Sobre"
@@ -3515,8 +3497,8 @@ pt:
               content: "Administrador"
             badges:
               content: "Crachás"
-            everything:
-              content: "Tudo"
+            topics:
+              content: "Tópicos"
             faq:
               content: "FAQ"
             groups:
@@ -3528,6 +3510,11 @@ pt:
             review:
               content: "Revisão"
     until: "Até:"
+    form_templates:
+      errors:
+        typeMismatch:
+          default: "Por favor introduza um valor válido."
+          email: "Por favor introduza um endereço de email válido."
   admin_js:
     type_to_filter: "digite para filtrar..."
     admin:
@@ -3737,8 +3724,14 @@ pt:
             topics:
               read: Ler um tópico ou um post específico nele. RSS também é suportado.
               write: Criar um novo tópico ou poste em um já existente.
+              update: Atualize um tópico. Altere o título, categoria, tags, status, arquétipo, feature_link etc.
             users:
               show: Obter informações sobre um utilizador.
+              suspend: Suspender contas de utilizador.
+            invites:
+              create: Envie convites por e-mail ou gere links de convite.
+            search:
+              show: Pesquise usando o endpoint `/search.json?q=term`.
       web_hooks:
         title: "Webhooks"
         none: "Não existem webhooks neste momento."
@@ -3811,7 +3804,6 @@ pt:
         enabled: "Ativado?"
         is_enabled: "S"
         not_enabled: "N"
-        change_settings: "Alterar Configurações"
         change_settings_short: "Configurações"
         howto: "Como instalo plugins?"
       navigation_menu:
@@ -4067,6 +4059,8 @@ pt:
           love:
             name: "amor"
             description: "A cor do botão 'gosto'."
+          selected:
+            name: "selecionado"
         robots:
           title: "Substitua o arquivo robots.txt do seu site:"
           warning: "Isso substituirá permanentemente todas as configurações de site relacionadas."
@@ -4291,11 +4285,6 @@ pt:
         actions:
           block: "Bloquear"
           flag: "Denunciar"
-        action_descriptions:
-          block: "Impede que posts que contenham estas palavras sejam publicados. O usuário irá receber uma mensagem de erro ao tentar enviar o seu post."
-          censor: "Permite posts que contenham estas palavras, mas substitui-as por caracteres que ocultam as palavras censuradas."
-          require_approval: "As publicações que contenham estas palavras terão de ser aprovadas pelo pessoal antes de poderem ser vistas."
-          flag: "Permite posts que contenham estas palavras, mas sinaliza-as como inapropriadas para que os moderadores as possam rever."
         form:
           link_placeholder: "https://example.com"
           add: "Adicionar"
@@ -4303,6 +4292,37 @@ pt:
           button_label: "Testar"
           description: "Insira o texto abaixo para verificar as correspondências com palavras vigiadas"
           no_matches: "Não foram encontradas correspondências"
+      form_templates:
+        nav_title: "Templates"
+        list_table:
+          headings:
+            name: "Nome"
+            actions: "Ações"
+        view_template:
+          close: "Fechar"
+          edit: "Editar"
+          delete: "Eliminar"
+        new_template_form:
+          submit: "Guardar"
+          cancel: "Cancelar"
+          preview: "Pré-visualização"
+        quick_insert_fields:
+          add_new_field: "Adicionar"
+          dropdown: "Lista pendente"
+        validations_modal:
+          table_headers:
+            key: "Chave"
+            type: "Tipo"
+            description: "Descrição"
+          validations:
+            required:
+              key: "obrigatório"
+            minimum:
+              key: "mínimo"
+            maximum:
+              key: "máximo"
+            type:
+              key: "tipo"
       impersonate:
         title: "Personificar"
         help: "Utilize este ferramenta de forma a personificar uma conta de utilizador para fins de depuração. Terá de encerrar a sessão assim que terminar."
@@ -4314,6 +4334,7 @@ pt:
         last_emailed: "Último email enviado"
         not_found: "Pedimos desculpa, esse nome de utilizador não existe no nosso sistema."
         id_not_found: "Pedimos desculpa, esse id de utilizador não existe no nosso sistema."
+        status: "Estado"
         show_emails: "Mostrar Emails"
         nav:
           new: "Novo"
@@ -4366,7 +4387,6 @@ pt:
         staged: "Temporário?"
         show_admin_profile: "Administração"
         show_public_profile: "Mostrar Perfil Público"
-        impersonate: "Personificar"
         ip_lookup: "Pesquisa de IP"
         log_out: "Sair"
         logged_out: "Sessão do utilizador encerrada em todos os dispositivos"
@@ -4533,6 +4553,8 @@ pt:
         go_back: "De volta à Pesquisa"
         recommended: "Recomendamos personalizar o seguinte texto para que se aplique às suas necessidades."
         show_overriden: "Apenas mostrar valores alterados"
+        outdated:
+          dismiss: "Marcar Visto"
       settings:
         show_overriden: "Apenas mostrar valores alterados"
         history: "Ver histórico de alterações"
@@ -4611,7 +4633,8 @@ pt:
         allow_title: Permitir que o crachá seja usado como título
         multiple_grant: Pode ser concedido múltiplas vezes
         listable: Mostrar crachá na página pública de crachás
-        enabled: Ativar crachá
+        enabled: ativado
+        disabled: desativado
         icon: Ícone
         image: Imagem
         graphic: Gráfico
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index 546b8de237a..dd314562487 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -144,6 +144,8 @@ pt_BR:
       facebook: "Compartilhar no Facebook"
       email: "Enviar por e-mail"
       url: "Copiar e compartilhar a URL"
+    word_connector:
+      comma: ", "
     action_codes:
       public_topic: "Tornou este tópico público %{when}"
       open_topic: "Converteu isto em um tópico %{when}"
@@ -155,6 +157,8 @@ pt_BR:
       removed_user: "Removeu %{who} %{when}"
       removed_group: "Removeu %{who} %{when}"
       autobumped: "Automaticamente promovido %{when}"
+      tags_changed: "Etiquetas atualizadas em %{when}"
+      category_changed: "Categoria atualizada em %{when}"
       autoclosed:
         enabled: "Fechado %{when}"
         disabled: "Aberto %{when}"
@@ -184,12 +188,6 @@ pt_BR:
     software_update_prompt:
       message: "Nós atualizamos este site, <span>atualize a página</span>, ou você poderá enfrentar uma situação inesperada."
       dismiss: "Descartar"
-    bootstrap_mode_enabled:
-      one: "Para facilitar o lançamento do seu novo site, você está no modo de inicialização. Todos os usuários novos receberão o nível de confiança 1 e terão os e-mails diários do resumo de e-mails ativados. Isso será desativado automaticamente quando %{count} usuários se registrarem."
-      other: "Para facilitar o lançamento do seu novo site, você está no modo de inicialização. Todos os usuários novos receberão o nível de confiança 1 e terão os e-mails diários do resumo de e-mails ativados. Isso será desativado automaticamente quando %{count} usuários se registrarem."
-    bootstrap_mode_disabled: "O modo de inicialização será desativado em 24 horas."
-    bootstrap_invite_button_title: "Enviar convites"
-    bootstrap_wizard_link_title: "Concluir o assistente de configuração"
     themes:
       default_description: "Padrão"
       broken_theme_alert: "Seu site pode não funcionar porque o tema/componente tem erros."
@@ -302,11 +300,9 @@ pt_BR:
       edit_bookmark: "Editar favorito"
       clear_bookmarks: "Limpar favoritos"
       help:
-        bookmark: "Clique para adicionar a primeira postagem deste tópico aos favoritos"
-        edit_bookmark: "Clique para editar o favorito neste tópico"
         edit_bookmark_for_topic: "Clique para editar o favorito para este tópico"
         unbookmark: "Clique para remover todos os favoritos neste tópico"
-        unbookmark_with_reminder: "Clique para remover todos os favoritos e lembretes neste tópico."
+        unbookmark_with_reminder: "Clique para remover todos os favoritos e lembretes neste tópico"
     bookmarks:
       created: "Você marcou esta postagem como favorita. %{name}"
       created_generic: "Você favoritou isso. %{name}"
@@ -350,7 +346,6 @@ pt_BR:
       new_topic: "Novo rascunho de tópico"
       new_private_message: "Novo rascunho de mensagem"
       abandon:
-        confirm: "Você tem um rascunho em andamento para este tópico. O que deseja fazer com ele?"
         yes_value: "Descartar"
         no_value: "Retomar a edição"
     topic_count_categories:
@@ -523,26 +518,40 @@ pt_BR:
       scores:
         about: "Esta pontuação é calculada com base no nível de confiança do relator, na precisão de suas sinalizações anteriores e na prioridade do item que está sendo relatado."
         score: "Pontuação"
-        date: "Data"
-        type: "Tipo"
+        date: "Data do relatório"
+        type: "Motivo"
         status: "Status"
-        submitted_by: "Enviado por"
+        submitted_by: "Relatado por"
         reviewed_by: "Revisado por"
       statuses:
         pending:
           title: "Pendentes"
         approved:
           title: "Aprovado"
+        approved_user:
+          title: "Usuário aprovado"
+        approved_post:
+          title: "Publicação aprovada"
         rejected:
           title: "Rejeitado"
+        rejected_flag:
+          title: "Sinalização recusada"
+        rejected_user:
+          title: "Usuário(a) recusado(a)"
+        rejected_post:
+          title: "Publicação recusada"
         ignored:
-          title: "Ignorados(as)"
+          title: "Sinalizador ignorado"
         deleted:
-          title: "Excluído"
+          title: "Tópico ou publicação excluído"
         reviewed:
-          title: "(Tudo revisado)"
+          title: "Tudo revisado"
         all:
-          title: "(tudo)"
+          title: "Tudo"
+      context_question:
+        is_this_post: "Essa publicação é %{reviewable_human_score_types}?"
+        delimiter: "ou"
+        something_else_wrong: "Existe algo errado com essa publicação?"
       types:
         reviewable_flagged_post:
           title: "Postagem sinalizada"
@@ -849,6 +858,7 @@ pt_BR:
         make_all_primary_description: "Tornar este grupo primário para todos os(as) usuários(as) selecionados(as)"
         remove_all_primary: "Remover como primário"
         remove_all_primary_description: "Remover este grupo como primário"
+        status: "Status"
         owner: "Proprietário(a)"
         primary: "Primário"
         forbidden: "Você não tem permissão para visualizar membros."
@@ -977,10 +987,8 @@ pt_BR:
       mute: "Silenciar"
       edit: "Editar preferências"
       download_archive:
-        button_text: "Baixar tudo"
-        confirm: "Tem certeza de que deseja baixar suas postagens?"
-        success: "Transferência iniciada, você receberá notificação por mensagem quando o processo estiver concluído."
-        rate_limit_error: "Postagens podem ser baixadas somente uma vez por dia, tente novamente amanhã."
+        title: "Exportar seus dados"
+        button_text: "Solicitar arquivo"
       new_private_message: "Nova mensagem"
       private_message: "Mensagem"
       private_messages: "Mensagens"
@@ -1052,7 +1060,7 @@ pt_BR:
         perm_denied_expl: "Você negou permissão para notificações. Permita as notificações nas configurações do seu navegador."
         disable: "Desativar notificações"
         enable: "Ativar notificações"
-        each_browser_note: 'Observação: é preciso alterar esta configuração em todos os navegadores que você usar. Todas as notificações serão desativadas se você pausar as notificações no menu do usuário, independentemente desta configuração.'
+        each_browser_note: "Observação: é preciso alterar esta configuração em todos os navegadores que você usar. Todas as notificações serão desativadas se você pausar as notificações no menu do usuário, independentemente desta configuração."
         consent_prompt: "Você quer notificações em tempo real quando as pessoas responderem às suas postagens?"
       dismiss: "Descartar"
       dismiss_notifications: "Descartar tudo"
@@ -1103,14 +1111,7 @@ pt_BR:
       experimental_sidebar:
         enable: "Habilitar barra lateral"
         options: "Opções"
-        categories_section: "Seção de Categorias"
-        categories_section_instruction: "As categorias selecionadas serão exibidas na seção de categorias do painel lateral."
-        tags_section: "Seção de Etiquetas"
-        tags_section_instruction: "As etiquetas selecionadas serão exibidas na seção de etiquetas da barra lateral."
         navigation_section: "Navegação"
-        list_destination_instruction: "Quando houver conteúdo novo na barra lateral..."
-        list_destination_default: "usar o link padrão e mostrar um emblema para novos itens"
-        list_destination_unread_new: "link para novos/não lidos e mostrar contagem de itens novos"
       change: "alterar"
       featured_topic: "Tópico em destaque"
       moderator: "%{user} é moderador(a)"
@@ -1180,13 +1181,6 @@ pt_BR:
       save_to_change_theme: 'O tema será atualizado quando você clicar em "%{save_text}"'
       home: "Página inicial padrão"
       staged: "Encenado(a)"
-      staff_counters:
-        flags_given: "sinalizações úteis"
-        flagged_posts: "postagens sinalizadas"
-        deleted_posts: "postagens excluídas"
-        suspensions: "suspensões"
-        warnings_received: "avisos"
-        rejected_posts: "postagens rejeitadas"
       messages:
         all: "todas as caixas de entrada"
         inbox: "Caixa de entrada"
@@ -1279,7 +1273,6 @@ pt_BR:
         tags: "Etiquetas"
         interface: "Interface"
         apps: "Aplicativos"
-        sidebar: "Barra Lateral"
       change_password:
         success: "(e-mail enviado)"
         in_progress: "(enviando e-mail)"
@@ -1293,11 +1286,9 @@ pt_BR:
         title: "Códigos de backup de dois fatores"
         regenerate: "Gerar novamente"
         disable: "Desativar"
-        enable: "Ativar"
-        enable_long: "Ativar códigos de backup"
         manage:
-          one: "Gerenciar códigos de backup. Você tem <strong>%{count}</strong> código de backup restante."
-          other: "Gerenciar códigos de backup. Você tem <strong>%{count}</strong> códigos de backup restantes."
+          one: "Você tem <strong>%{count}</strong> código de backup restante."
+          other: "Você tem <strong>%{count}</strong> códigos de backup restantes."
         copy_to_clipboard: "Copiar para área de transferência"
         copy_to_clipboard_error: "Erro ao copiar dados para a área de transferência"
         copied_to_clipboard: "Copiou para a área de transferência"
@@ -1735,8 +1726,7 @@ pt_BR:
       pause_notifications: "Pausar notificações"
       remove_status: "Remover status"
     user_tips:
-      primary: "Entendi!"
-      secondary: "não me mostre essas dicas"
+      button: "Entendi!"
       first_notification:
         title: "Sua primeira notificação!"
         content: "As notificações são usadas para que você se atualize sobre o que está acontecendo na comunidade."
@@ -1786,36 +1776,6 @@ pt_BR:
       logout_disabled: "Não é possível sair enquanto o site estiver em modo somente leitura. Esse recurso está desativado."
     staff_writes_only_mode:
       enabled: "Este site está no modo apenas para funcionários. Continue navegando, mas as respostas, curtidas e outras ações são limitadas apenas aos membros da equipe."
-    too_few_topics_and_posts_notice_MF: |
-      Vamos <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">iniciar a discussão!</a> Há { currentTopics, plural,
-          one {<strong>#</strong> tópico}
-        other {<strong>#</strong> tópicos}
-      } e { currentPosts, plural,
-          one {<strong>#</strong> postagem}
-        other {<strong>#</strong> postagens}
-      }. Os visitantes precisam de mais para ler e responder. Recomendamos pelo menos { requiredTopics, plural,
-          one {<strong>#</strong> tópico}
-        other {<strong>#</strong> tópicos}
-      } e { requiredPosts, plural,
-          one {<strong>#</strong> postagem}
-        other {<strong>#</strong> postagens}
-      }. Somente a equipe pode ver esta mensagem.
-    too_few_topics_notice_MF: |
-      Vamos <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">iniciar a discussão!</a> Há { currentTopics, plural,
-          one {<strong>#</strong> tópico}
-        other {<strong>#</strong> tópicos}
-      }. Os visitantes precisam de mais para ler e responder. Recomendamos pelo menos { requiredTopics, plural,
-          one {<strong>#</strong> tópico}
-        other {<strong>#</strong> tópicos}
-      }. Somente a equipe pode ver esta mensagem.
-    too_few_posts_notice_MF: |
-      Vamos <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">iniciar a discussão!</a> Há { currentPosts, plural,
-          one {<strong>#</strong> postagem}
-        other {<strong>#</strong> postagens}
-      }. Os visitantes precisam de mais para ler e responder. Recomendamos pelo menos { requiredPosts, plural,
-          one {<strong>#</strong> postagem}
-        other {<strong>#</strong> postagens}
-      }. Somente a equipe pode ver esta mensagem.
     logs_error_rate_notice:
       reached_hour_MF: |
         <b>{relativeAge}</b> – <a href='{url}' target='_blank'>a quantidade de {rate, plural, one {# erro/hora} other {# erros/hora}}</a> alcançou o limite de configuração do site de {limit, plural, one {# erro/hora} other {# erros/hora}}.
@@ -1846,16 +1806,12 @@ pt_BR:
       intro: "Olá! Parece que você está gostando da discussão, mas ainda não cadastou uma conta."
       value_prop: "Cansou de ver as mesmas postagens? Ao criar uma conta, você sempre volta de onde parou. Com uma conta, você também pode receber notificações de novas respostas, salvar favoritos e usar curtidas para agradecer aos outros. Todos nós podemos trabalhar juntos para tornar esta comunidade excelente. :heart:"
     summary:
-      enabled_description: "Você está vendo um resumo deste tópico: as postagens mais interessantes segundo a comunidade."
       description:
         one: "Existe <b>%{count}</b> resposta."
         other: "Existem <b>%{count}</b> respostas."
       description_time_MF: |
         Há {replyCount, plural, one {<b>#</b> resposta} other {<b>#</b> respostas}} com um tempo de leitura estimado de <b>{readingTime, plural, one {# minuto} other {# minutos}}</b>.
-      enable: "Resumir este tópico"
       disable: "Exibir todas as postagens"
-      short_label: "Resumir"
-      short_title: "Exibir um resumo deste tópico: as postagens mais interessantes segundo a comunidade"
     deleted_filter:
       enabled_description: "Este tópico contém postagens excluídas, que foram ocultadas."
       disabled_description: "As postagens excluídas deste tópico estão sendo exibidas."
@@ -2154,8 +2110,6 @@ pt_BR:
         topic_template_not_modified: "Adicione detalhes e especificações ao seu tópico editando o modelo do tópico."
       save_edit: "Salvar edição"
       overwrite_edit: "Sobrescrever edição"
-      reply_original: "Responder no tópico original"
-      reply_here: "Responder aqui"
       reply: "Responder"
       cancel: "Cancelar"
       create_topic: "Criar tópico"
@@ -2320,6 +2274,7 @@ pt_BR:
       reaction_2: "<span>%{username}, %{username2}</span> %{description}"
       votes_released: "%{description} - concluído(a)"
       new_features: "Novos recursos disponíveis!"
+      admin_problems: "Nova recomendação no painel de controle do seu site"
       dismiss_confirmation:
         body:
           default:
@@ -2622,9 +2577,10 @@ pt_BR:
         bookmarks: "Você ainda não tem nenhum tópico favorito."
         category: "Não há tópicos na categoria %{category}."
         top: "Não há melhores tópicos."
+        filter: "Não existem tópicos."
         educate:
           new: '<p>Seus novos tópicos serão exibidos aqui. Por padrão, os tópicos serão considerados novos e exibirão um <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span> indicador se tiverem tido criados nos últimos dois dias.</p><p>Acesse suas <a href="%{userPrefsUrl}">preferências</a> para alterar essa configuração.</p>'
-          unread: "<p>Seus tópicos não lidos são exibidos aqui.</p><p>Por padrão, os tópicos são considerados como não lidos e exibirão contadores <span class=\"badge unread-posts badge-notification\">1</span> se você tiver:</p><ul><li>criado o tópico</li><li>respondido ao tópico</li><li>lido o tópico por mais de 4 minutos</li></ul><p>ou marcado o tópico como Monitorado ou Acompanhado pelo \U0001F514 em cada tópico.</p><p>Acesse suas <a href=\"%{userPrefsUrl}\">preferências</a> para alterar essa configuração.</p>"
+          unread: "<p>Seus tópicos não lidos são exibidos aqui.</p><p>Por padrão, os tópicos são considerados como não lidos e exibirão contadores <span class=\"badge unread-posts badge-notification\">1</span> se você tiver:</p><ul><li>criado o tópico</li><li>respondido ao tópico</li><li>lido o tópico por mais de 5 minutos</li></ul><p>ou marcado o tópico como Monitorado ou Acompanhado pelo \U0001F514 em cada tópico.</p><p>Acesse suas <a href=\"%{userPrefsUrl}\">preferências</a> para alterar essa configuração.</p>"
       bottom:
         latest: "Não há mais últimos tópicos."
         posted: "Não há mais tópicos postados."
@@ -2636,11 +2592,13 @@ pt_BR:
         tag: "Não há mais tópicos na categoria %{tag}."
         top: "Não há mais melhores tópicos."
         bookmarks: "Não há mais tópicos favoritos."
+        filter: "Não existem mais tópicos."
     topic:
       filter_to:
         one: "%{count} postagem no tópico"
         other: "%{count} postagens no tópico"
       create: "Novo tópico"
+      create_disabled_category: "Você não possui permissão para criar tópicos nesta categoria"
       create_long: "Criar um novo tópico"
       open_draft: "Rascunho aberto"
       private_message: "Iniciar uma mensagem"
@@ -2727,8 +2685,7 @@ pt_BR:
       browse_all_categories_latest_or_top: "<a href='%{basePath}/categories'>Navegue por todas as categorias</a>, <a href='%{basePath}/latest'>veja os tópicos mais recentes</a> ou veja os principais:"
       browse_all_tags_or_latest: "<a href='%{basePath}/tags'>Navegue por todas as etiquetas</a> ou <a href='%{basePath}/latest'>visualize os tópicos mais recentes</a>."
       suggest_create_topic: Tudo pronto para <a href>começar uma nova conversa?</a>
-      jump_reply_up: pular para a primeira resposta
-      jump_reply_down: pular para a última resposta
+      jump_reply: "Ir para o local da publicação original"
       deleted: "Este tópico foi excluído"
       slow_mode_update:
         title: "Modo lento"
@@ -3083,6 +3040,7 @@ pt_BR:
       ignored: "Conteúdo ignorado"
       wiki_last_edited_on: "última edição do wiki em %{dateTime}"
       last_edited_on: "última edição da postagem em %{dateTime}"
+      edit_history: "histórico de edição da publicação"
       reply_as_new_topic: "Responder como um tópico vinculado"
       reply_as_new_private_message: "Responder como nova mensagem aos mesmos destinatários"
       continue_discussion: "Continuando a discussão de %{postLink}:"
@@ -3094,8 +3052,8 @@ pt_BR:
       sr_collapse_replies: "Recolher respostas incorporadas"
       sr_date: "Data da postagem"
       sr_expand_replies:
-        one: "Esta postagem tem %{count} resposta. Clique para expandir"
-        other: "Esta postagem tem %{count} respostas. Clique para expandir"
+        one: "Esta publicação tem %{count} resposta"
+        other: "Esta publicação tem %{count} respostas"
       expand_collapse: "expandir/recolher"
       sr_below_embedded_posts_description: "poste #%{post_number} respostas"
       sr_embedded_reply_description: "resposta por @%{username} à postagem #%{post_number}"
@@ -3253,6 +3211,7 @@ pt_BR:
           last: "Última revisão"
           hide: "Ocultar revisão"
           show: "Exibir revisão"
+          destroy: "Excluir revisões"
           revert: "Reverter para a revisão %{revision}"
           edit_wiki: "Editar wiki"
           edit_post: "Editar postagem"
@@ -3307,7 +3266,6 @@ pt_BR:
       filtered_replies:
         viewing_posts_by: "Vendo %{post_count} postagens de"
         viewing_subset: "Algumas respostas foram recolhidas"
-        viewing_summary: "visualizando um resumo deste tópico"
         post_number: "%{username}, postagem #%{post_number}"
         show_all: "Exibir tudo"
       share:
@@ -3324,7 +3282,6 @@ pt_BR:
       back: "Voltar para a categoria"
       general: "Geral"
       settings: "Configurações"
-      topic_template: "Modelo de tópico"
       tags: "Etiquetas"
       tags_allowed_tags: "Restringir estas etiquetas a esta categoria:"
       tags_allowed_tag_groups: "Restringir estes grupos de etiquetas a esta categoria:"
@@ -3383,8 +3340,6 @@ pt_BR:
       email_in: "Endereço de e-mail de entrada personalizado:"
       email_in_tooltip: "Você pode separar múltiplos endereços de e-mail com o caractere |."
       email_in_allow_strangers: "Aceitar e-mails de usuários anônimos sem contas"
-      email_in_disabled: "Postar novos tópicos via e-mail está desativado nas configurações do site. Para ativar respostas em novos tópicos via e-mail, "
-      email_in_disabled_click: 'ative a configuração de "e-mail em".'
       mailinglist_mirror: "A categoria espelha uma lista de endereçamento"
       show_subcategory_list: "Exibir lista de subcategorias acima dos tópicos nesta categoria."
       read_only_banner: "Texto do banner quando um usuário não pode criar um tópico nesta categoria:"
@@ -3592,6 +3547,10 @@ pt_BR:
     filters:
       with_topics: "%{filter} tópicos"
       with_category: "%{filter} %{category} tópicos"
+      filter:
+        title: "Filtro"
+        button:
+          label: "Filtro"
       latest:
         title: "Recentes"
         title_with_count:
@@ -3662,7 +3621,6 @@ pt_BR:
         this_week: "Semana"
         today: "Hoje"
     browser_update: 'Infelizmente, <a href="https://www.discourse.org/faq/#browser">seu navegador não é compatível</a>. <a href="https://browsehappy.com">Use um navegador compatível</a> para visualizar um conteúdo interessante, entrar com a conta e responder.'
-    safari_13_warning: Este site em breve removerá o suporte para iOS e Safari versões 13 e anteriores. Uma versão simplificada somente para leitura permanecerá disponível. (<a href="https://meta.discourse.org/t/224747">mais informações</a>)
     permission_types:
       full: "Criar/Responder/Ver"
       create_post: "Responder/Ver"
@@ -3677,6 +3635,9 @@ pt_BR:
       close: "Fechar (Esc)"
       content_load_error: '<a href="%url%">O conteúdo</a> não pôde ser carregado.'
       image_load_error: '<a href="%url%">A imagem</a> não pôde ser carregada.'
+    experimental_lightbox:
+      buttons:
+        close: "Fechar (Esc)"
     cannot_render_video: Este vídeo não pode ser renderizado porque o seu navegador não é compatível com o codec.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ","
@@ -3769,7 +3730,6 @@ pt_BR:
         one: "Emblema obtido %{count} vez"
         other: "Emblema obtido %{count} vezes"
       granted_on: "Concedido em %{date}"
-      others_count: "Outros(as) com este emblema (%{count})"
       title: Emblemas
       allow_title: "Você pode usar este emblema como um título"
       multiple_grant: "Você pode ganhar isto várias vezes"
@@ -3952,13 +3912,11 @@ pt_BR:
     pause_notifications:
       title: "Pausar notificações para..."
       label: "Pausar notificações"
-      remaining: "%{remaining} restante(s)"
       options:
         half_hour: "30 minutos"
         one_hour: "1 hora"
         two_hours: "2 horas"
         tomorrow: "Até amanhã"
-        custom: "Personalizado(a)"
       set_schedule: "Definir agendamento de notificação"
     trust_levels:
       names:
@@ -4007,7 +3965,25 @@ pt_BR:
       more: "Mais"
       all_categories: "Todas as categorias"
       all_tags: "Todas as etiquetas"
+      edit_navigation_modal_form:
+        filter_dropdown:
+          all: "Tudo"
       sections:
+        custom:
+          save: "Salvar"
+          delete: "Excluir"
+          links:
+            add: "Adicionar outro link"
+            delete: "Excluir link"
+            reset: "Redefinir para padrão"
+            icon:
+              label: "Ícone"
+              validation:
+                blank: "O ícone não pode estar em branco"
+            name:
+              label: "Nome"
+            value:
+              label: "Link"
         about:
           header_link_text: "Sobre"
         messages:
@@ -4022,28 +3998,20 @@ pt_BR:
             unread_with_count: "Não lido(s) (%{count})"
             archive: "Arquivo"
         tags:
-          links:
-            add_tags:
-              content: "Adicionar etiquetas"
-              title: "Você não adicionou nenhuma etiqueta. Clique para começar."
           none: "Você não adicionou nenhuma etiqueta."
           click_to_get_started: "Clique aqui para começar."
           header_link_text: "Etiquetas"
           header_action_title: "Editar suas etiquetas da barra lateral"
           configure_defaults: "Configurar padrões"
         categories:
-          links:
-            add_categories:
-              content: "Adicionar categorias"
-              title: "Você não adicionou nenhuma categoria. Clique para começar."
           none: "Você não adicionou nenhuma categoria."
           click_to_get_started: "Clique aqui para começar."
           header_link_text: "Categorias"
           header_action_title: "Editar suas categorias de barra lateral"
           configure_defaults: "Configurar padrões"
         community:
-          header_link_text: "Comunidade"
-          header_action_title: "Criar um tópico"
+          edit_section:
+            header_dropdown: "Personalizar"
           links:
             about:
               content: "Sobre"
@@ -4054,8 +4022,8 @@ pt_BR:
             badges:
               content: "Emblemas"
               title: "Todos os emblemas disponíveis para ganhar"
-            everything:
-              content: "Tudo"
+            topics:
+              content: "Tópicos"
               title: "Todos os Tópicos"
             faq:
               content: "FAQ"
@@ -4082,6 +4050,11 @@ pt_BR:
       description: "Seu tópico de boas-vindas é a primeira coisa que os novos membros vão ler. Pense nisso como seu “argumento de elevador” ou “declaração de missão”. Informe a todos sobre quem é o público desta comunidade, o que eles podem esperar encontrar aqui e o que você gostaria que eles fizessem primeiro."
       button_title: "Começar a Editar"
     until: "Até:"
+    form_templates:
+      errors:
+        typeMismatch:
+          default: "Digite um valor válido."
+          email: "Insira um endereço de e-mail válido."
   admin_js:
     type_to_filter: "Digite para filtrar..."
     admin:
@@ -4240,10 +4213,6 @@ pt_BR:
         about: "Edite a associação no seu grupo e os nomes aqui"
         group_members: "Membros do grupo"
         delete: "Apagar"
-        delete_confirm: "Tem certeza de que deseja excluir este grupo?"
-        delete_with_messages_confirm:
-          one: "Excluir este grupo fará com que %{count} mensagem fique órfã. Os membros do grupo não poderão mais acessá-la."
-          other: "Excluir este grupo fará com que %{count} mensagens fiquem órfãs. Os membros do grupo não poderão mais acessá-las."
         delete_failed: "Não é possível excluir o grupo. Se for um grupo automático, não poderá ser desfeito."
         delete_automatic_group: Este é um grupo automático e não pode ser excluído.
         delete_owner_confirm: "Remover privilégio de proprietário(a) de \"%{username}\"?"
@@ -4309,7 +4278,7 @@ pt_BR:
             topics:
               read: Leia um tópico ou uma postagem específica nele. RSS também é compatível.
               write: Crie um novo tópico ou poste em algum que já existe.
-              update: Atualize um tópico. Altere o título, categoria, etiquetas, etc.
+              update: Atualize um tópico. Altere o título, categoria, etiquetas, status, arquétipo, featured_link etc.
               read_lists: Leia listas de tópico como melhores, novidades, mais recentes. RSS também é compatível.
             posts:
               edit: Edite qualquer postagem ou especifique uma.
@@ -4406,9 +4375,6 @@ pt_BR:
         user_promoted_event:
           name: "Evento promovido pelo usuário"
           details: "Quando um usuário é promovido de um nível de confiança para outro."
-        user_badge_event:
-          name: "Evento de concessão de emblema"
-          details: "Quando um(a) usuário(a) recebe um emblema."
         group_user_event:
           name: "Evento de usuário(a) em grupo"
           details: "Quando um(a) usuário(a) for adicionado(a) ou removido(a) em um grupo."
@@ -4451,7 +4417,6 @@ pt_BR:
         enabled: "Ativado(a)?"
         is_enabled: "S"
         not_enabled: "N"
-        change_settings: "Alterar configurações"
         change_settings_short: "Configurações"
         howto: "Como instalo plug-ins?"
         official: "Plug-in oficial"
@@ -4783,6 +4748,8 @@ pt_BR:
           love:
             name: "curtir"
             description: "A cor do botão curtir."
+          selected:
+            name: "selecionado(a)"
         robots:
           title: "Substituir o arquivo robots.txt do seu site:"
           warning: "Isso vai substituir permanentemente qualquer configuração relacionada do site."
@@ -5067,14 +5034,8 @@ pt_BR:
           silence: "Silenciar"
           link: "Vincular"
         action_descriptions:
-          block: "Evite que postagens contendo essas palavras sejam postadas. O(a) usuário(a) verá uma mensagem de erro quando tentar enviar a postagem."
-          censor: "Permita postagens contendo essas palavras, mas substitua-as por caracteres que ocultem as palavras censuradas."
-          require_approval: "As postagens contendo essas palavras exigirão aprovação da equipe antes que possam ser vistas."
-          flag: "Permita postagens contendo estas palavras, mas sinalize-as como impróprias para que a moderação possa analisá-las."
-          replace: "Substituir palavras em postagens com outras palavras"
-          tag: "Etiquete tópicos automaticamente conforme a primeira postagem"
-          silence: "As primeiras postagens de usuários(as) com estas palavras precisarão de aprovação da equipe antes que sejam exibidas e o(a) usuário(a) será silenciado(a) automaticamente."
-          link: "Substitua palavras em postagens por links"
+          replace: "Substituir palavras em postagens com outras palavras."
+          link: "Substitua palavras em postagens por links."
         form:
           label: "Tem palavra ou frase"
           placeholder: "Digite uma palavra ou frase (* é um curinga)"
@@ -5097,6 +5058,37 @@ pt_BR:
           description: "Digite o texto abaixo para verificar as correspondências com palavras acompanhadas"
           found_matches: "Correspondências encontradas:"
           no_matches: "Nenhuma correspondência encontrada"
+      form_templates:
+        nav_title: "Modelos"
+        list_table:
+          headings:
+            name: "Nome"
+            actions: "Ações"
+        view_template:
+          close: "Fechar"
+          edit: "Editar"
+          delete: "Excluir"
+        new_template_form:
+          submit: "Salvar"
+          cancel: "Cancelar"
+          preview: "Pré-visualizar"
+        quick_insert_fields:
+          add_new_field: "Adicionar"
+          dropdown: "Menu suspenso"
+        validations_modal:
+          table_headers:
+            key: "Chave"
+            type: "Tipo"
+            description: "Descrição"
+          validations:
+            required:
+              key: "necessário(a)"
+            minimum:
+              key: "mínimo"
+            maximum:
+              key: "máximo"
+            type:
+              key: "tipo"
       impersonate:
         title: "Representar"
         help: "Use esta ferramenta para representar uma conta de usuário(a) para efeitos de depuração. Você terá que sair dela assim que terminar."
@@ -5109,6 +5101,7 @@ pt_BR:
         not_found: "Desculpe, este nome de usuário(a) não existe no nosso sistema."
         id_not_found: "Desculpe, esta ID de usuário(a) não existe no nosso sistema."
         active: "Ativado(a)"
+        status: "Status"
         show_emails: "Exibir e-mails"
         hide_emails: "Ocultar e-mails"
         nav:
@@ -5197,7 +5190,6 @@ pt_BR:
         show_admin_profile: "Administrador(a)"
         manage_user: "Gerenciar usuário"
         show_public_profile: "Exibir perfil público"
-        impersonate: "Representar"
         action_logs: "Registro de atividades"
         ip_lookup: "Pesquisa do IP"
         log_out: "Sair"
@@ -5435,6 +5427,8 @@ pt_BR:
         show_overriden: "Exibir apenas substituídos"
         locale: "Idioma:"
         more_than_50_results: "Existem mais de 50 resultados. Refine sua pesquisa."
+        outdated:
+          dismiss: "Descartar"
       settings:
         show_overriden: "Exibir apenas substituídos"
         history: "Visualizar histórico de alterações"
@@ -5447,7 +5441,6 @@ pt_BR:
             label: "Adicionar emoji"
         title: "Configurações"
         no_results: "Nenhum resultado encontrado."
-        more_than_30_results: "Existem mais de 30 resultados. Refine sua pesquisa ou selecione uma categoria."
         clear_filter: "Limpar"
         add_url: "adicionar URL"
         add_host: "adicionar host"
@@ -5534,7 +5527,7 @@ pt_BR:
         allow_title: Permitir que o emblema seja usado como título
         multiple_grant: Pode ser concedido várias vezes
         listable: Exibir emblema na página pública de emblemas
-        enabled: Ativar emblema
+        disabled: desativado
         icon: Ícone
         image: Imagem
         graphic: Gráfico
@@ -5604,10 +5597,8 @@ pt_BR:
       embedding:
         get_started: "Se você deseja incorporar Discourse em outro site, começe adicionando seu host."
         confirm_delete: "Você tem certeza que deseja excluir este host?"
-        sample: "Cole o seguinte código HTML no seu site para criar e incorporar tópicos do discourse. Substitua <b>REPLACE_ME</b> pela URL canônica da página na qual você está incorporando."
         title: "Incorporar"
         host: "Hosts permitidos"
-        class_name: "Nome da classe"
         allowed_paths: "Caminho Allowlist"
         edit: "editar"
         category: "Postar na categoria"
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index 62e1e1341b9..002499005ef 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -187,12 +187,6 @@ ro:
     software_update_prompt:
       message: "Site-ul a fost actualizat! <span>Reîmprospătează pagina</span>."
       dismiss: "Renunță"
-    bootstrap_mode_enabled:
-      one: "Pentru a simplifica lansarea noului site, sunteți în modul bootstrap. Toți utilizatorii noi vor primi nivelul 1 de încredere și vor avea activată primirea zilnică de e-mail-uri rezumat. Această funcționalitate va fi oprită automat după ce se înregistrează primii %{count} membri."
-      few: "Pentru a simplifica lansarea noului dv. site, sunteți în modul bootstrap. Toți utilizatorii noi vor primi nivelul 1 de încredere și vor avea activată primirea zilnică de e-mail-uri rezumat. Această funcționalitate va fi oprită automat după ce se înregistrează primii %{count} membri."
-      other: "Pentru a simplifica lansarea noului dv. site, sunteți în modul bootstrap. Toți utilizatorii noi vor primi nivelul 1 de încredere și vor avea activată primirea zilnică de e-mail-uri rezumat. Această funcționalitate va fi oprită automat după ce se înregistrează primii %{count} membri."
-    bootstrap_mode_disabled: "Modul bootstrap va fi dezactivat în următoarele 24 de ore"
-    bootstrap_invite_button_title: "Trimite invitații"
     themes:
       default_description: "Implicit"
     s3:
@@ -298,8 +292,6 @@ ro:
       edit_bookmark: "Editați marcajul"
       clear_bookmarks: "Șterge semnele de carte"
       help:
-        bookmark: "Click pentru a adăuga semn de carte la subiectul acesta"
-        edit_bookmark: "Faceți clic pentru a edita marcajul pe acest subiect"
         edit_bookmark_for_topic: "Faceți clic pentru a edita marcajul pentru acest subiect"
         unbookmark: "Click pentru a șterge semnele de carte"
     bookmarks:
@@ -342,7 +334,6 @@ ro:
       remove_confirmation: "Ești sigur că vrei să ștergi această ciornă?"
       new_topic: "Ciornă subiect nou"
       abandon:
-        confirm: "Ai o schiță în curs pentru acest subiect. Ce ai vrea să faci mai departe?"
         yes_value: "Renunță"
         no_value: "Reia editarea"
     topic_count_categories:
@@ -517,11 +508,9 @@ ro:
       scores:
         about: "Acest scor este calculat pe baza nivelului de încredere al reclamantului, a acurateței notificărilor anterioare și a priorității elementului raportat."
         score: "Scor"
-        date: "Dată"
-        type: "Tip"
+        type: "Motiv"
         status: "Status"
-        submitted_by: "Trimis de"
-        reviewed_by: "Evaluat de"
+        submitted_by: "Raportat de"
       statuses:
         pending:
           title: "În așteptare"
@@ -529,14 +518,12 @@ ro:
           title: "Aprobat"
         rejected:
           title: "Respinse"
-        ignored:
-          title: "Ignorat"
-        deleted:
-          title: "Șters"
         reviewed:
-          title: "(toate revizuite)"
+          title: "Toate revizuite"
         all:
-          title: "(totul)"
+          title: "Totul"
+      context_question:
+        delimiter: "sau"
       types:
         reviewable_flagged_post:
           title: "Postare semnalată"
@@ -792,6 +779,7 @@ ro:
         make_owner_description: "Fă utilizatorul <b>%{username}</b> un deținător al acestui grup"
         remove_owner: "Elimină ca deținător"
         remove_owner_description: "Elimină <b>%{username}</b> ca deținător al acestui grup"
+        status: "Status"
         owner: "Deținător"
         forbidden: "Nu ai permisiuni să vezi membrii."
       topics: "Subiecte"
@@ -900,11 +888,6 @@ ro:
       profile: "Profil"
       mute: "Silențios"
       edit: "Editează preferințe"
-      download_archive:
-        button_text: "Descarcă tot"
-        confirm: "Ești sigur că vrei să îți descarci postările?"
-        success: "Descărcarea a început, vei fi notificat printr-un mesaj atunci când procesul se va termina."
-        rate_limit_error: "Postările pot fi descărcate doar o singură dată pe zi, te rugăm să încerci din nou mâine."
       new_private_message: "Mesaj nou"
       private_message: "Mesaj"
       private_messages: "Mesaje"
@@ -1069,13 +1052,6 @@ ro:
       save_to_change_theme: 'Tema va fi actualizată după ce faceți clic pe „%{save_text}”'
       home: "Pagina inițială implicită"
       staged: "Pus în scenă"
-      staff_counters:
-        flags_given: "Marcaje ajutătoare"
-        flagged_posts: "Postări marcate"
-        deleted_posts: "Postări șterse"
-        suspensions: "Suspendări"
-        warnings_received: "Avertizări"
-        rejected_posts: "postări respinse"
       messages:
         inbox: "Primite"
         latest: "Cele mai recente"
@@ -1120,7 +1096,6 @@ ro:
       second_factor_backup:
         regenerate: "Regenerare"
         disable: "Dezactivează"
-        enable: "Activează"
         copy_to_clipboard: "Copiază în clipboard"
         copy_to_clipboard_error: "Eroare la copierea datelor în clipboard"
         copied_to_clipboard: "Copiat în clipboard"
@@ -1495,8 +1470,6 @@ ro:
       hide_forever: "Nu, mulțumesc"
       intro: "Salut! Se pare că îți place discuția, dar încă nu te-ai înscris pentru un cont."
     summary:
-      enabled_description: "Vizualizezi un rezumat al acestui subiect: cea mai interesantă postare, așa cum a fost desemnată de comunitate. "
-      enable: "Fă rezumatul acestui subiect"
       disable: "Arată toate postările"
     deleted_filter:
       enabled_description: "Acest subiect conține postări șterse, care au fost ascunse. "
@@ -1690,8 +1663,6 @@ ro:
         try_like: "Ai încercat butonul %{heart}?"
         category_missing: "Trebuie să alegi o categorie"
       save_edit: "Salvează editarea"
-      reply_original: "Răspunde la subiectul inițial"
-      reply_here: "Răspunde aici"
       reply: "Răspunde"
       cancel: "Anulează"
       create_topic: "Creează un subiect"
@@ -1968,7 +1939,7 @@ ro:
         top: "Nu exită niciun subiect de top."
         educate:
           new: '<p>Subiectele noi vor apărea aici.Implicit, subiectele vor fi considerate noi și vor afișa un indicator <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span> dacă au fost create în ultimele 2 zile.</p><p>Mergi la <a href="%{userPrefsUrl}">preferințe</a> pentru a schimba această setare.</p>'
-          unread: '<p>Subiectele necitite vor apărea aici</p><p>Implicit, subiectele sunt considerate necitite și se va afișa numărul celor necitite <span class="badge unread-posts badge-notification">1</span>dacă ai:</p><ul><li>Creat subiectul</li><li>Răspuns la subiect</li><li>Citit subiectul de mai mult de 4 minute</li></ul><p>Sau dacă ai setat în mod explicit subiectul pe Urmărire sau Urmărire activă prin intermediul contorului de notificare de la sfârșitul fiecărui subiect.</p><p>Mergi la <a href="%{userPrefsUrl}">preferințe</a> pentru a schimba această setare.</p>'
+          unread: '<p>Subiectele necitite vor apărea aici</p><p>Implicit, subiectele sunt considerate necitite și se va afișa numărul celor necitite <span class="badge unread-posts badge-notification">1</span>dacă ai:</p><ul><li>Creat subiectul</li><li>Răspuns la subiect</li><li>Citit subiectul de mai mult de 5 minute</li></ul><p>Sau dacă ai setat în mod explicit subiectul pe Urmărire sau Urmărire activă prin intermediul contorului de notificare de la sfârșitul fiecărui subiect.</p><p>Mergi la <a href="%{userPrefsUrl}">preferințe</a> pentru a schimba această setare.</p>'
       bottom:
         latest: "Nu mai există niciun subiect recent."
         posted: "Nu mai există subiecte postate."
@@ -2030,8 +2001,6 @@ ro:
       options: "Opțiuni pentru subiect"
       show_links: "arată link-urile din acest subiect"
       suggest_create_topic: Ești gata să <a href>începi o nouă conversație?</a>
-      jump_reply_up: sări la un răspuns mai vechi
-      jump_reply_down: sări la un răspuns mai nou
       deleted: "Subiectul a fost șters"
       slow_mode_update:
         title: "Modul lent"
@@ -2462,7 +2431,6 @@ ro:
       view: "Arată subiectele din categorie"
       general: "General"
       settings: "Setări"
-      topic_template: "Șablon subiect"
       tags: "Etichete"
       tags_placeholder: "(Opțional) lista etichetelor permise"
       tag_groups_placeholder: "(Opțional) lista grupurilor de etichete permise"
@@ -2502,8 +2470,6 @@ ro:
       images: "Imagini"
       email_in: "Adresa email de primire preferențială:"
       email_in_allow_strangers: "Acceptă emailuri de la utilizatori anonimi fără cont"
-      email_in_disabled: "Postarea subiectelor noi prin email este dezactivată din setările siteului. Pentru a activa postarea subiectelor noi prin email,"
-      email_in_disabled_click: 'activează opțiunea "primire email ".'
       sort_order: "Sortează lista de subiecte după:"
       default_view: "Listă implicită de subiecte:"
       allow_badges_label: "Permite acordarea de ecusoane în această categorie"
@@ -2668,6 +2634,10 @@ ro:
     filters:
       with_topics: "%{filter} subiecte"
       with_category: "%{filter} %{category} subiecte"
+      filter:
+        title: "Filtru"
+        button:
+          label: "Filtru"
       latest:
         title: "Cele mai recente"
         title_with_count:
@@ -2813,7 +2783,6 @@ ro:
         few: "A primit acest ecuson de %{count} ori"
         other: "A primit acest ecuson de %{count} de ori"
       granted_on: "Acordat %{date}"
-      others_count: "Alții cu acest ecuson (%{count})"
       title: Ecusoane
       multiple_grant: "Poți primi asta de mai multe ori"
       badge_count:
@@ -2916,13 +2885,11 @@ ro:
     safe_mode:
       enabled: "Modul sigur este activat, pentru a ieși din modul sigur închide această fereastră de browser"
     pause_notifications:
-      remaining: "a mai rămas %{remaining} ..."
       options:
         half_hour: "30 de minute"
         one_hour: "1 oră"
         two_hours: "2 ore"
         tomorrow: "Până mâine"
-        custom: "Personalizat"
       set_schedule: "Setați un program de notificare"
     trust_levels:
       names:
@@ -2951,7 +2918,19 @@ ro:
         other: "%{count} nou"
       more: "Mai multe"
       all_categories: "Toate categoriile"
+      edit_navigation_modal_form:
+        filter_dropdown:
+          all: "Toate"
       sections:
+        custom:
+          save: "Salvare"
+          delete: "Șterge"
+          links:
+            reset: "Resetare la valorile implicite"
+            icon:
+              label: "Pictogramă"
+            name:
+              label: "Nume"
         about:
           header_link_text: "Despre"
         messages:
@@ -2969,7 +2948,8 @@ ro:
         categories:
           header_link_text: "Categorii"
         community:
-          header_link_text: "Comunitate"
+          edit_section:
+            header_dropdown: "Personalizare"
           links:
             about:
               content: "Despre"
@@ -2977,8 +2957,8 @@ ro:
               content: "Administrator"
             badges:
               content: "Ecusoane"
-            everything:
-              content: "Totul"
+            topics:
+              content: "Discuții"
             faq:
               content: "Întrebări frecvente"
             groups:
@@ -2990,6 +2970,10 @@ ro:
             review:
               content: "Revizuire"
     until: "Pana cand:"
+    form_templates:
+      errors:
+        typeMismatch:
+          default: "Introduceţi o valoare validă."
   admin_js:
     type_to_filter: "tastează pentru a filtra..."
     admin:
@@ -3181,7 +3165,6 @@ ro:
         enabled: "Activat?"
         is_enabled: "D"
         not_enabled: "N"
-        change_settings: "Schimbă setările"
         change_settings_short: "Setări"
         howto: "Cum instalez un plugin?"
       backups:
@@ -3368,6 +3351,8 @@ ro:
           love:
             name: "apreciere"
             description: "Culoarea butonului de apreciere."
+          selected:
+            name: "selectat"
         email_style:
           css: "CSS"
           reset: "Resetare la valorile implicite"
@@ -3567,6 +3552,36 @@ ro:
         test:
           button_label: "Test"
           no_matches: "Nu s-au găsit potriviri"
+      form_templates:
+        nav_title: "Șabloane"
+        list_table:
+          headings:
+            name: "Nume"
+            actions: "Acțiuni"
+        view_template:
+          close: "Închide sondajul"
+          edit: "Modifică"
+          delete: "Șterge"
+        new_template_form:
+          submit: "Salvare"
+          cancel: "Anulare"
+          preview: "Previzualizează"
+        quick_insert_fields:
+          add_new_field: "Adaugă"
+          dropdown: "Meniu derulant"
+        validations_modal:
+          table_headers:
+            type: "Tip"
+            description: "Descriere"
+          validations:
+            required:
+              key: "necesar"
+            minimum:
+              key: "minim"
+            maximum:
+              key: "maxim"
+            type:
+              key: "tip"
       impersonate:
         title: "Joacă rolul utilizatorului"
         help: "Folosește această unealtă pentru a imita un cont de utilizator pentru depanare. Va trebui să te deconectezi după ce termini."
@@ -3578,6 +3593,7 @@ ro:
         last_emailed: "Ultimul email trimis"
         not_found: "Ne pare rău, acest nume de utilizator nu există în sistem."
         id_not_found: "Ne pare rău, dar acest utilizator nu există în sistem."
+        status: "Status"
         show_emails: "Arată email"
         nav:
           new: "Noi"
@@ -3628,7 +3644,6 @@ ro:
         staged: "În așteptare?"
         show_admin_profile: "Admin"
         show_public_profile: "Arată profilul public"
-        impersonate: "Joacă rolul utilizatorului"
         ip_lookup: "Căutare IP"
         log_out: "Ieșire"
         logged_out: "Acest utilizator a ieșit de pe toate dispozitivele"
@@ -3802,6 +3817,8 @@ ro:
         go_back: "Înapoi la căutare"
         recommended: "Îți recomandăm să personalizezi următorul text pentru a se adapta nevoilor tale:"
         show_overriden: "Arată doar ignorate"
+        outdated:
+          dismiss: "Renunță"
       settings:
         show_overriden: "Arată doar ignorate"
         reset: "Resetează"
@@ -3879,7 +3896,8 @@ ro:
         allow_title: Permite ca ecusonul să fie folosit ca titlu
         multiple_grant: Poate fi acordat de mai multe ori
         listable: Arată ecuson pe pagina publică a ecusoanelor
-        enabled: Activează ecuson
+        enabled: activat
+        disabled: dezactivat
         icon: Pictogramă
         image: Imagine
         query: Interogare ecusoane (SQL)
@@ -3926,7 +3944,6 @@ ro:
         confirm_delete: "Ești sigur că vrei să ștergi acest host?"
         title: "Embedding"
         host: "Host-uri permise"
-        class_name: "Numele clasei"
         edit: "editează"
         category: "Postează în categoria"
         add_host: "Adaugă host"
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index 78d587207df..ed1496bb589 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -240,14 +240,6 @@ ru:
     software_update_prompt:
       message: "Сайт обновлён. <span>Перезагрузите страницу</span> (иначе вы можете столкнуться с неожиданным поведением)."
       dismiss: "Закрыть"
-    bootstrap_mode_enabled:
-      one: "Для скорейшего развития сайта был включен специальный режим работы. В этом режиме всем новым пользователям присваивается 1-й уровень доверия и включается ежедневная почтовая рассылка сводки новостей. Этот режим будет автоматически выключен, как только количество зарегистрированных пользователей достигнет %{count}."
-      few: "Для скорейшего развития сайта был включен специальный режим работы. В этом режиме всем новым пользователям присваивается 1-й уровень доверия и включается ежедневная почтовая рассылка сводки новостей. Этот режим будет автоматически выключен, как только количество зарегистрированных пользователей достигнет %{count}."
-      many: "Для скорейшего развития сайта был включен специальный режим работы. В этом режиме всем новым пользователям присваивается 1-й уровень доверия и включается ежедневная почтовая рассылка сводки новостей. Этот режим будет автоматически выключен, как только количество зарегистрированных пользователей достигнет %{count}."
-      other: "Для скорейшего развития сайта был включен специальный режим работы. В этом режиме всем новым пользователям присваивается 1-й уровень доверия и включается ежедневная почтовая рассылка сводки новостей. Этот режим будет автоматически выключен, как только количество зарегистрированных пользователей достигнет %{count}."
-    bootstrap_mode_disabled: "Специальный режим будет отключён в течение 24 часов."
-    bootstrap_invite_button_title: "Отправить приглашения"
-    bootstrap_wizard_link_title: "Завершить работу мастера настройки"
     themes:
       default_description: "По умолчанию"
       broken_theme_alert: "Сайт может не работать: в теме (компоненте) есть ошибки."
@@ -366,11 +358,9 @@ ru:
       edit_bookmark: "Изменить закладку"
       clear_bookmarks: "Очистить закладки"
       help:
-        bookmark: "Добавить первое сообщение темы в закладки"
-        edit_bookmark: "Изменить закладку в этой теме"
         edit_bookmark_for_topic: "Изменить закладку для этой темы"
         unbookmark: "Удалить все закладки в этой теме"
-        unbookmark_with_reminder: "Удалить все закладки и напоминания из этой темы."
+        unbookmark_with_reminder: "Удалить все закладки и напоминания из этой темы"
     bookmarks:
       created: "Вы добавили это сообщение в закладки: «%{name}»"
       created_generic: "Добавлено в закладки: «%{name}»"
@@ -414,7 +404,6 @@ ru:
       new_topic: "Черновик новой темы"
       new_private_message: "Черновик нового личного сообщения"
       abandon:
-        confirm: "По этой теме есть сохранённый черновик. Что с ним сделать?"
         yes_value: "Удалить"
         no_value: "Возобновить редактирование"
     topic_count_categories:
@@ -611,11 +600,9 @@ ru:
       scores:
         about: "Оценка рассчитывается на основе уровня доверия сообщающего, точности его предыдущих жалоб и приоритета предмета жалобы."
         score: "Оценка"
-        date: "Дата"
-        type: "Тип"
+        type: "Причина"
         status: "Статус"
-        submitted_by: "Отправлено"
-        reviewed_by: "Проверено"
+        submitted_by: "Жалоба от"
       statuses:
         pending:
           title: "В ожидании"
@@ -623,14 +610,12 @@ ru:
           title: "Одобренные"
         rejected:
           title: "Отклонённые"
-        ignored:
-          title: "Проигнорированные"
-        deleted:
-          title: "Удалённые"
         reviewed:
-          title: "(все рассмотренные)"
+          title: "Все рассмотренные"
         all:
-          title: "(все)"
+          title: "Все"
+      context_question:
+        delimiter: "или"
       types:
         reviewable_flagged_post:
           title: "На это сообщение поступила жалоба"
@@ -953,6 +938,7 @@ ru:
         make_all_primary_description: "Сделать основной группой для всех выбранных пользователей"
         remove_all_primary: "Удалить как основную"
         remove_all_primary_description: "Удалить как основную группу"
+        status: "Статус"
         owner: "Владелец"
         primary: "Основная"
         forbidden: "Вы не можете просматривать участников."
@@ -1090,11 +1076,6 @@ ru:
       profile: "Профиль"
       mute: "Отключить"
       edit: "Изменить настройки"
-      download_archive:
-        button_text: "Скачать всё"
-        confirm: "Действительно скачать сообщения?"
-        success: "Скачивание началось, вы будете уведомлены об окончании процесса."
-        rate_limit_error: "Сообщения могут быть скачаны лишь раз в день, попробуйте завтра."
       new_private_message: "Новое сообщение"
       private_message: "Сообщение"
       private_messages: "Сообщения"
@@ -1166,7 +1147,7 @@ ru:
         perm_denied_expl: "Вы запретили уведомления в браузере. Разрешите уведомления в настройках браузера."
         disable: "Отключить уведомления"
         enable: "Включить уведомления"
-        each_browser_note: 'Примечание: этот параметр необходимо изменить в каждом используемом браузере. Если приостановить уведомления в меню пользователя, они будут отключены независимо от этого параметра.'
+        each_browser_note: "Примечание: этот параметр необходимо изменить в каждом используемом браузере. Если приостановить уведомления в меню пользователя, они будут отключены независимо от этого параметра."
         consent_prompt: "Вы хотите получать уведомления в реальном времени, когда пользователи отвечают на ваши сообщения?"
       dismiss: "Пометить прочитанными"
       dismiss_notifications: "Отклонить всё"
@@ -1217,14 +1198,7 @@ ru:
       experimental_sidebar:
         enable: "Включить боковую панель"
         options: "Параметры"
-        categories_section: "Раздел категорий"
-        categories_section_instruction: "Выбранные категории будут отображаться в соответствующем разделе боковой панели."
-        tags_section: "Раздел тегов"
-        tags_section_instruction: "Выбранные теги будут отображаться в соответствующем разделе боковой панели."
         navigation_section: "Навигация"
-        list_destination_instruction: "Когда на боковой панели появляется новый контент…"
-        list_destination_default: "использовать ссылку по умолчанию и показать значок для нового"
-        list_destination_unread_new: "использовать ссылку на непрочитанные (новые) и показать количество нового"
       change: "изменить"
       featured_topic: "Избранная тема"
       moderator: "%{user} — модератор"
@@ -1294,13 +1268,6 @@ ru:
       save_to_change_theme: 'Тема будет обновлена после нажатия на кнопку «%{save_text}».'
       home: "Домашняя страница"
       staged: "Сымитированный"
-      staff_counters:
-        flags_given: "полезные жалобы"
-        flagged_posts: "сообщения с жалобами"
-        deleted_posts: "удалённые сообщения"
-        suspensions: "заморозки"
-        warnings_received: "предупреждения"
-        rejected_posts: "отклоненные сообщения"
       messages:
         all: "все"
         inbox: "Входящие"
@@ -1413,7 +1380,6 @@ ru:
         tags: "Теги"
         interface: "Интерфейс"
         apps: "Приложения"
-        sidebar: "Боковая панель"
       change_password:
         success: "(письмо отправлено)"
         in_progress: "(отправка письма)"
@@ -1427,13 +1393,11 @@ ru:
         title: "Резервные коды двухфакторной аутентификации"
         regenerate: "Сгенерировать заново"
         disable: "Отключить"
-        enable: "Включить"
-        enable_long: "Включить резервные коды"
         manage:
-          one: "Управление резервными кодами. У вас остался <strong>%{count}</strong> резервный код."
-          few: "Управление резервными кодами. У вас осталось <strong>%{count}</strong> резервных кода."
-          many: "Управление резервными кодами. У вас осталось <strong>%{count}</strong> резервных кодов."
-          other: "Управление резервными кодами. У вас осталось <strong>%{count}</strong> резервного кода."
+          one: "У вас остался <strong>%{count}</strong> резервный код."
+          few: "У вас осталось <strong>%{count}</strong> резервных кода."
+          many: "У вас осталось <strong>%{count}</strong> резервных кодов."
+          other: "У вас осталось <strong>%{count}</strong> резервного кода."
         copy_to_clipboard: "Скопировать в буфер"
         copy_to_clipboard_error: "Ошибка при копировании данных в буфер обмена"
         copied_to_clipboard: "Скопировано в буфер"
@@ -1893,8 +1857,7 @@ ru:
       pause_notifications: "Приостановить уведомления"
       remove_status: "Удалить статус"
     user_tips:
-      primary: "Понятно!"
-      secondary: "Не показывать советы"
+      button: "Понятно!"
       first_notification:
         title: "Ваше первое уведомление!"
         content: "Уведомления используются для того, чтобы держать вас в курсе происходящего в сообществе."
@@ -1944,52 +1907,6 @@ ru:
       logout_disabled: "Выход отключён, пока сайт находится в режиме «только для чтения»"
     staff_writes_only_mode:
       enabled: "Сайт находится в режиме «только для персонала». Продолжайте просмотр, но отвечать, ставить лайки и выполнять другие действия, влияющие на контент, могут только сотрудники."
-    too_few_topics_and_posts_notice_MF: |
-      Давайте <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">приступим к обсуждению!</a> Есть { currentTopics, plural,
-          one {<strong>#</strong> тема}
-          few {<strong>#</strong> темы}
-          many {<strong>#</strong> тем}
-        other {<strong>#</strong> темы}
-      } и { currentPosts, plural,
-          one {<strong>#</strong> сообщение}
-          few {<strong>#</strong> сообщения}
-          many {<strong>#</strong> сообщений}
-        other {<strong>#</strong> сообщения}
-      }. Пользователи должны больше читать и отвечать — мы рекомендуем по крайней мере {requiredTopics, plural,
-          one {<strong>#</strong> тему}
-          few {<strong>#</strong> темы}
-          many {<strong>#</strong> тем}
-        other {<strong>#</strong> темы}
-      } и { requiredPosts, plural,
-          one {<strong>#</strong> сообщение}
-          few {<strong>#</strong> сообщения}
-          many {<strong>#</strong> сообщений}
-        other {<strong>#</strong> сообщения}
-      }. Только персонал может видеть это сообщение.
-    too_few_topics_notice_MF: |
-      Давайте <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">приступим к обсуждению!</a> Есть { currentTopics, plural,
-          one {<strong>#</strong> тема}
-          few {<strong>#</strong> темы}
-          many {<strong>#</strong> тем}
-        other {<strong>#</strong> темы}
-      }. Пользователи должны больше читать и отвечать — мы рекомендуем по крайней мере {requiredTopics, plural,
-          one {<strong>#</strong> тему}
-          few {<strong>#</strong> темы}
-          many {<strong>#</strong> тем}
-        other {<strong>#</strong> темы}
-      }. Только персонал может видеть это сообщение.
-    too_few_posts_notice_MF: |
-      Давайте <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">приступим к обсуждению!</a> Есть { currentPosts, plural,
-          one {<strong>#</strong> сообщение}
-          few {<strong>#</strong> сообщения}
-          many {<strong>#</strong> сообщений}
-        other {<strong>#</strong> сообщения}
-      }. Пользователи должны больше читать и отвечать — мы рекомендуем по крайней мере {requiredPosts, plural,
-          one {<strong>#</strong> сообщение}
-          few {<strong>#</strong> сообщения}
-          many {<strong>#</strong> сообщений}
-        other {<strong>#</strong> сообщения}
-      }. Только персонал может видеть это сообщение.
     logs_error_rate_notice:
       reached_hour_MF: |
         <b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# ошибка в час} few {# ошибки в час} many {# ошибок в час} other {# ошибки в час}}</a>: достигнут предел для настроек сайта — {limit, plural, one {# ошибка в час} few {# ошибки в час} many {# ошибок в час} other {# ошибки в час}}.
@@ -2022,7 +1939,6 @@ ru:
       intro: "Здравствуйте! Похоже, вам нравится обсуждение, но вы ещё не зарегистрировали аккаунт."
       value_prop: "Устали листать одни и те же темы? Создав аккаунт, вы всегда будете возвращаться туда, где остановились. Также вы сможете получать уведомления о новых ответах, сохранять закладки и ставить лайки. Общими усилиями мы сможем сделать сообщество интересным. :heart:"
     summary:
-      enabled_description: "Вы просматриваете сводку из темы — только самые интересные сообщения по мнению сообщества."
       description:
         one: "Есть <b>%{count}</b> ответ."
         few: "Есть <b>%{count}</b> ответа."
@@ -2030,10 +1946,7 @@ ru:
         other: "Есть <b>%{count}</b> ответа."
       description_time_MF: |
         Есть {replyCount, plural, one { <b>#</b> ответ} few { <b>#</b> ответа} many { <b>#</b> ответов} other { <b>#</b> ответа}} с расчётным временем чтения <b>{readingTime, plural, one {# минута} few {# минуты} many {# минут} other {# минуты}}</b>.
-      enable: "Сводка по теме"
       disable: "Показать все сообщения"
-      short_label: "Сводка"
-      short_title: "Просмотр сводки по этой теме: отображаются самые интересные сообщения по мнению сообщества."
     deleted_filter:
       enabled_description: "Эта тема содержит удаленные сообщения, которые сейчас скрыты."
       disabled_description: "Показаны удаленные сообщения темы."
@@ -2360,8 +2273,6 @@ ru:
         topic_template_not_modified: "Впишите подробности темы в шаблон."
       save_edit: "Сохранить"
       overwrite_edit: "Перезаписать"
-      reply_original: "Ответить в первоначальной теме"
-      reply_here: "Ответить в текущей теме"
       reply: "Ответить"
       cancel: "Отмена"
       create_topic: "Создать тему"
@@ -2544,6 +2455,7 @@ ru:
       reaction_2: "<span>%{username}, %{username2}</span> %{description}"
       votes_released: "%{description} — завершено"
       new_features: "Появились новые функции!"
+      admin_problems: "Новые советы в панели администратора"
       dismiss_confirmation:
         body:
           default:
@@ -2886,7 +2798,7 @@ ru:
         top: "Нет обсуждаемых тем."
         educate:
           new: '<p>Здесь появятся ваши новые темы. По умолчанию темы считаются новыми и обозначаются индикатором <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span>, если были созданы за последние 2 дня.</p><p>Изменить этот период можно в <a href="%{userPrefsUrl}">настройках</a>.</p>'
-          unread: "<p>Ваши непрочитанные темы скоро появятся тут.</p><p>По умолчанию темы получают счетчик <span class=\"badge unread-posts badge-notification\">1</span>, если:</p><ul><li>Создана тема.</li><li>Получен ответ на сообщение в теме.</li><li>Время чтения темы пользователем превышает 4 минуты.</li></ul><p>Изменить настройки уведомлений можно, нажав на значок \U0001F514 в интересующей вас теме.</p><p>Изменить этот период можно в <a href=\"%{userPrefsUrl}\">настройках</a>.</p>"
+          unread: "<p>Ваши непрочитанные темы скоро появятся тут.</p><p>По умолчанию темы получают счетчик <span class=\"badge unread-posts badge-notification\">1</span>, если:</p><ul><li>Создана тема.</li><li>Получен ответ на сообщение в теме.</li><li>Время чтения темы пользователем превышает 5 минуты.</li></ul><p>Изменить настройки уведомлений можно, нажав на значок \U0001F514 в интересующей вас теме.</p><p>Изменить этот период можно в <a href=\"%{userPrefsUrl}\">настройках</a>.</p>"
       bottom:
         latest: "Обновлённых тем больше нет."
         posted: "Новых тем больше нет."
@@ -3007,8 +2919,6 @@ ru:
       browse_all_categories_latest_or_top: "<a href='%{basePath}/categories'>Просмотрите все категории</a>, <a href='%{basePath}/latest'>ознакомьтесь с последними</a> или самыми популярными темами:"
       browse_all_tags_or_latest: "<a href='%{basePath}/tags'>Просмотрите все теги</a> или <a href='%{basePath}/latest'>ознакомьтесь с последними темами</a>."
       suggest_create_topic: Готовы <a href>начать новое обсуждение</a>?
-      jump_reply_up: Перейти к более ранним ответам
-      jump_reply_down: Перейти к более поздним ответам
       deleted: "Тема удалена"
       slow_mode_update:
         title: "Замедленный режим"
@@ -3403,11 +3313,6 @@ ru:
       collapse: "свернуть"
       sr_collapse_replies: "Свернуть встроенные ответы"
       sr_date: "Дата сообщения"
-      sr_expand_replies:
-        one: "На это сообщение есть %{count} ответ. Нажмите для просмотра."
-        few: "На это сообщение есть %{count} ответа. Нажмите для просмотра."
-        many: "На это сообщение есть %{count} ответов. Нажмите для просмотра."
-        other: "На это сообщение есть %{count} ответа. Нажмите для просмотра."
       expand_collapse: "развернуть/свернуть"
       sr_below_embedded_posts_description: "ответы на сообщение #%{post_number}"
       sr_embedded_reply_description: "ответ пользователя @%{username} на запись #%{post_number}"
@@ -3655,7 +3560,6 @@ ru:
       filtered_replies:
         viewing_posts_by: "Просмотр сообщений (%{post_count}) от"
         viewing_subset: "Некоторые ответы свернуты"
-        viewing_summary: "Просмотр сводки по этой теме"
         post_number: "%{username}, сообщение #%{post_number}"
         show_all: "Показать все"
       share:
@@ -3672,7 +3576,6 @@ ru:
       back: "Вернуться в категорию"
       general: "Основная"
       settings: "Настройки"
-      topic_template: "Шаблон темы"
       tags: "Теги"
       tags_allowed_tags: "Ограничить теги этой категорией:"
       tags_allowed_tag_groups: "Ограничить группы тегов этой категорией:"
@@ -3731,8 +3634,6 @@ ru:
       email_in: "Специальный адрес для входящих писем:"
       email_in_tooltip: "Адреса электронной почты разделяются символом вертикальной черты «|»."
       email_in_allow_strangers: "Принимать письма от анонимных пользователей, не имеющих аккаунтов"
-      email_in_disabled: "Создание новых тем через электронную почту отключено в настройках сайта. Чтобы разрешить создание новых тем через электронную почту, "
-      email_in_disabled_click: 'включите настройку «email in».'
       mailinglist_mirror: "Категория отражает список рассылки"
       show_subcategory_list: "Показывать список подкатегорий над списком тем в этой категории."
       read_only_banner: "Текст баннера, когда пользователь не может создавать темы в этой категории:"
@@ -3958,6 +3859,10 @@ ru:
     filters:
       with_topics: "%{filter} темы"
       with_category: "%{category} — %{filter} темы"
+      filter:
+        title: "Фильтр"
+        button:
+          label: "Фильтр"
       latest:
         title: "Последние"
         title_with_count:
@@ -4040,7 +3945,6 @@ ru:
         this_week: "За неделю"
         today: "Сегодня"
     browser_update: '<a href="https://www.discourse.org/faq/#browser">Ваш браузер не поддерживается</a>. <a href="https://browsehappy.com">Обновите его</a> для полноценной работы с сайтом.'
-    safari_13_warning: Этот сайт скоро прекратит поддержку iOS и Safari версии 13 и ниже. Упрощённая версия только для чтения останется доступной. (<a href="https://meta.discourse.org/t/224747">больше информации</a>)
     permission_types:
       full: "Создавать / Отвечать / Просматривать"
       create_post: "Отвечать / Просматривать"
@@ -4055,6 +3959,9 @@ ru:
       close: "Закрыть (Esc)"
       content_load_error: '<a href="%url%">Контент</a> не удалось загрузить.'
       image_load_error: '<a href="%url%">Изображение</a> не удалось загрузить.'
+    experimental_lightbox:
+      buttons:
+        close: "Закрыть (Esc)"
     cannot_render_video: 'Это видео невозможно отобразить: видеокодек не поддерживается браузером.'
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
@@ -4149,7 +4056,6 @@ ru:
         many: "Заработал(а) эту награду %{count} раз"
         other: "Заработал(а) эту награду %{count} раза"
       granted_on: "Выдана %{date}"
-      others_count: "Другие пользователи с этой наградой (%{count})"
       title: Награды
       allow_title: "Вы можете использовать эту награду в качестве титула."
       multiple_grant: "Вы можете получать эту награду несколько раз"
@@ -4356,13 +4262,11 @@ ru:
     pause_notifications:
       title: "Приостановить уведомления на…"
       label: "Приостановить уведомления"
-      remaining: "Осталось %{remaining}"
       options:
         half_hour: "В течение 30 минут"
         one_hour: "В течение 1 часа"
         two_hours: "В течение 2 часов"
         tomorrow: "До завтра"
-        custom: "Указать продолжительность"
       set_schedule: "Настроить расписание уведомлений"
     trust_levels:
       names:
@@ -4415,7 +4319,21 @@ ru:
       more: "Ещё"
       all_categories: "Все категории"
       all_tags: "Все теги"
+      edit_navigation_modal_form:
+        filter_dropdown:
+          all: "Все настройки"
       sections:
+        custom:
+          save: "Сохранить"
+          delete: "Удалить"
+          links:
+            reset: "Сбросить на значения по умолчанию"
+            icon:
+              label: "Иконка"
+            name:
+              label: "Название"
+            value:
+              label: "Ссылки"
         about:
           header_link_text: "Информация"
         messages:
@@ -4430,28 +4348,20 @@ ru:
             unread_with_count: "Непрочитанные (%{count})"
             archive: "Архив"
         tags:
-          links:
-            add_tags:
-              content: "Добавить теги"
-              title: "Вы не добавили ни одного тега. Чтобы добавить их, нажмите сюда."
           none: "Вы не добавили ни одного тега."
           click_to_get_started: "Нажмите здесь, чтобы начать."
           header_link_text: "Теги"
           header_action_title: "Редактировать теги боковой панели"
           configure_defaults: "Настроить значения по умолчанию"
         categories:
-          links:
-            add_categories:
-              content: "Добавить категории"
-              title: "Вы не добавили ни одной категории. Чтобы добавить их, нажмите сюда."
           none: "Вы не добавили ни одной категории."
           click_to_get_started: "Нажмите здесь, чтобы начать."
           header_link_text: "Категории"
           header_action_title: "Редактировать категории боковой панели"
           configure_defaults: "Настроить значения по умолчанию"
         community:
-          header_link_text: "Сообщество"
-          header_action_title: "Создать тему"
+          edit_section:
+            header_dropdown: "Оформление"
           links:
             about:
               content: "О форуме"
@@ -4462,8 +4372,8 @@ ru:
             badges:
               content: "Награды"
               title: "Все награды, которые можно получить"
-            everything:
-              content: "Все"
+            topics:
+              content: "Новые темы"
               title: "Все темы"
             faq:
               content: "Правила"
@@ -4492,6 +4402,11 @@ ru:
       description: "Ваша приветственная тема — это первое, что прочитают новички. Постарайтесь максимально коротко и ярко выразить в ней наиболее важную информацию, которую вы хотите донести до новых пользователей форума."
       button_title: "Начать редактирование"
     until: "До:"
+    form_templates:
+      errors:
+        typeMismatch:
+          default: "Введите корректное значение."
+          email: "Введите действующий адрес электронной почты."
   admin_js:
     type_to_filter: "Фильтрация настроек…"
     admin:
@@ -4654,12 +4569,6 @@ ru:
         about: "Здесь можно редактировать членство в группе и её название"
         group_members: "Участники группы"
         delete: "Удалить"
-        delete_confirm: "Действительно удалить эту группу?"
-        delete_with_messages_confirm:
-          one: "Удаление приведет к тому, что участники группы утратят доступ к %{count} сообщению."
-          few: "Удаление приведет к тому, что участники группы утратят доступ к %{count} сообщениям."
-          many: "Удаление приведет к тому, что участники группы утратят доступ к %{count} сообщениям."
-          other: "Удаление приведет к тому, что участники группы утратят доступ к %{count} сообщения."
         delete_failed: "Невозможно удалить группу. Если группа была создана автоматически, то она не может быть удалена."
         delete_automatic_group: Это автоматическая группа и она не может быть удалена.
         delete_owner_confirm: "Отозвать права владельца у пользователя «%{username}»?"
@@ -4725,7 +4634,6 @@ ru:
             topics:
               read: Чтение темы или конкретного сообщения в ней. RSS также поддерживается.
               write: Создание новой темы или сообщения в уже существующей теме.
-              update: Обновление темы. Изменение названия, категории, тегов и т. д.
               read_lists: Чтение тем в разделах «Последние», «Новые», «Обсуждаемые» и т. д. RSS также поддерживается.
             posts:
               edit: Редактирование сообщения.
@@ -4822,9 +4730,6 @@ ru:
         user_promoted_event:
           name: "Событие повышения уровня доверия"
           details: "При повышении уровня доверия пользователя."
-        user_badge_event:
-          name: "Событие награждения"
-          details: "При получении пользователем награды."
         group_user_event:
           name: "Событие группового пользователя"
           details: "При добавлении или удалении пользователя из группы."
@@ -4871,7 +4776,6 @@ ru:
         enabled: "Включён?"
         is_enabled: "Д"
         not_enabled: "Н"
-        change_settings: "Настроить"
         change_settings_short: "Настройки"
         howto: "Как установить плагин?"
         official: "Официальный плагин"
@@ -5205,6 +5109,8 @@ ru:
           love:
             name: "лайки"
             description: "Цвет кнопки «Лайк»."
+          selected:
+            name: "выбрано"
         robots:
           title: "Изменить настройки в файле robots.txt:"
           warning: "Это повлияет на соответствующие настройки сайта."
@@ -5490,15 +5396,6 @@ ru:
           tag: "Теги"
           silence: "Заморозить"
           link: "Ссылки"
-        action_descriptions:
-          block: "Запретить публикацию сообщений, содержащих эти слова. При попытке отправить сообщение пользователь увидит ошибку."
-          censor: "Разрешить сообщения, содержащие эти слова, но заменять их символами, которые скрывают нецензурные выражения."
-          require_approval: "Сообщения, содержащие эти слова, будут требовать одобрения персонала, прежде чем их можно будет увидеть."
-          flag: "Разрешить сообщения, содержащие эти слова, но помечать их как неприемлемые, чтобы модераторы могли их оценить."
-          replace: "Заменить слова в сообщениях другими словами."
-          tag: "Автоматически помечать тегами темы, содержащие эти слова в первом сообщении."
-          silence: "Первые сообщения пользователя, содержащие эти слова, потребуют одобрения персонала, прежде чем они будут доступны; пользователь будет автоматически заморожен."
-          link: "Заменить слова в сообщениях ссылками."
         form:
           label: "Слово или фраза"
           placeholder: "Введите слово или фразу (* — подстановочный знак)"
@@ -5521,6 +5418,37 @@ ru:
           description: "Введите текст, чтобы проверить совпадения с контролируемыми словами:"
           found_matches: "Найденные совпадения:"
           no_matches: "Совпадений не найдено"
+      form_templates:
+        nav_title: "Шаблоны"
+        list_table:
+          headings:
+            name: "Название"
+            actions: "Темы"
+        view_template:
+          close: "Завершить"
+          edit: "Отредактировать"
+          delete: "Удалить"
+        new_template_form:
+          submit: "Сохранить"
+          cancel: "Нет"
+          preview: "Предпросмотр"
+        quick_insert_fields:
+          add_new_field: "Добавить"
+          dropdown: "Выпадающий список"
+        validations_modal:
+          table_headers:
+            key: "Ключ"
+            type: "Тип опроса"
+            description: "Описание"
+          validations:
+            required:
+              key: "Обязательное"
+            minimum:
+              key: "минимум"
+            maximum:
+              key: "максимум"
+            type:
+              key: "тип опроса"
       impersonate:
         title: "Войти от имени пользователя"
         help: "Позволяет войти от имени пользователя в целях отладки. По окончании отладки необходимо выйти из системы и зайти снова под своим аккаунтом."
@@ -5533,6 +5461,7 @@ ru:
         not_found: "Такое имя пользователя не зарегистрировано."
         id_not_found: "Этот пользователь не зарегистрирован."
         active: "Активирован"
+        status: "Статус"
         show_emails: "Показать адреса эл. почты"
         hide_emails: "Скрыть адреса эл. почты"
         nav:
@@ -5631,7 +5560,6 @@ ru:
         show_admin_profile: "Администратор"
         manage_user: "Управление пользователем"
         show_public_profile: "Показать публичный профиль"
-        impersonate: "Войти от имени пользователя"
         action_logs: "Журналы действий"
         ip_lookup: "Поиск IP"
         log_out: "Выйти"
@@ -5879,6 +5807,8 @@ ru:
         show_overriden: "Показывать только изменённые значения"
         locale: "Язык:"
         more_than_50_results: "Найдено более 50 результатов. Уточните параметры поиска."
+        outdated:
+          dismiss: "Закрыть"
       settings:
         show_overriden: "Показывать только изменённые значения"
         history: "Просмотреть историю изменений"
@@ -5891,7 +5821,6 @@ ru:
             label: "Добавить эмодзи"
         title: "Настройки"
         no_results: "Ничего не найдено."
-        more_than_30_results: "Найдено более 30 результатов. Уточните параметры поиска или выберите раздел."
         clear_filter: "Очистить"
         add_url: "Добавить URL"
         add_host: "Добавить хост"
@@ -5978,7 +5907,8 @@ ru:
         allow_title: Разрешить использовать название награды в качестве титула
         multiple_grant: Может быть предоставлена несколько раз
         listable: Отображать награду на публичной странице наград
-        enabled: Активировать использование этой награды
+        enabled: включён
+        disabled: отключён
         icon: Иконка
         image: Изображение
         graphic: Иконка награды
@@ -6050,10 +5980,8 @@ ru:
       embedding:
         get_started: "Для встраивания на другой сайт необходимо добавить соответствующий хост."
         confirm_delete: "Действительно удалить этот хост?"
-        sample: "Используйте следующий HTML-код на своём сайте для создания и встраивания тем Discourse. Замените <b>REPLACE_ME</b> канонической ссылкой страницы, в которую производится встраивание."
         title: "Встраивание"
         host: "Разрешённые хосты"
-        class_name: "Имя класса"
         allowed_paths: "Список разрешённых путей"
         edit: "изменить"
         category: "Опубликовать в категории"
diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml
index d1f00bd686f..ffa4c6f5ca2 100644
--- a/config/locales/client.sk.yml
+++ b/config/locales/client.sk.yml
@@ -188,8 +188,6 @@ sk:
     emails_are_disabled: "Odosielanie emailov bolo globálne vypnuté administrátorom. Žiadne emailové notifikácie nebudú odoslané."
     software_update_prompt:
       dismiss: "Zahodiť"
-    bootstrap_mode_disabled: "Zavádzací režim bude zrušený v priebehu nasledujúcich 24 hodín."
-    bootstrap_invite_button_title: "Poslať pozvánky"
     themes:
       default_description: "Predvolené"
     s3:
@@ -285,7 +283,6 @@ sk:
       title: "Záložka"
       clear_bookmarks: "Odstrániť záložku"
       help:
-        bookmark: "Kliknutím vložíte záložku na prvý príspevok tejto témy"
         unbookmark: "Kliknutím odstánite všetky záložky v tejto téme"
     bookmarks:
       not_bookmarked: "Vytvor záložku na tento príspevok"
@@ -387,8 +384,7 @@ sk:
         refresh: "Obnoviť"
         category: "Kategória"
       scores:
-        date: "Dátum"
-        type: "Typ"
+        type: "Dôvod"
       statuses:
         pending:
           title: "Čakajúce správy"
@@ -396,6 +392,8 @@ sk:
           title: "Schválený"
         rejected:
           title: "Zamietnuté"
+      context_question:
+        delimiter: "alebo"
       types:
         reviewable_user:
           title: "Používateľ"
@@ -674,11 +672,6 @@ sk:
       profile: "Profil"
       mute: "Ignorovať"
       edit: "Upraviť nastavenia"
-      download_archive:
-        button_text: "Stiahnuť všetko"
-        confirm: "Si si istý, že si chceš uložiť svoje príspevky na disk?"
-        success: "Sťahovanie bolo spustené, o jeho ukončení budeš informovaný správou."
-        rate_limit_error: "Príspevky možu byť stiahnuté len raz za deň. Skús opäť zajtra prosím."
       new_private_message: "Nová správa"
       private_message: "Správa"
       private_messages: "Správy"
@@ -788,12 +781,6 @@ sk:
       theme: "Téma"
       home: "Predvolená domovská stránka"
       staged: "Dočasný"
-      staff_counters:
-        flags_given: "nápomocné značky"
-        flagged_posts: "označkované príspevky"
-        deleted_posts: "vymazané príspevky"
-        suspensions: "pozastavenia"
-        warnings_received: "varovania"
       messages:
         inbox: "Prijatá pošta"
         latest: "Najnovšie"
@@ -840,8 +827,6 @@ sk:
       second_factor_backup:
         regenerate: "Znovu vygenerovať"
         disable: "Zakázať"
-        enable: "Povoliť"
-        enable_long: "Povoliť kódy zálohy"
         copy_to_clipboard_error: "Chyba pri kopírovaní dát do schránky"
         copied_to_clipboard: "Skopírované do schránky"
         codes:
@@ -1162,8 +1147,6 @@ sk:
       sign_up: "Registrovať sa"
       hide_forever: "nie, ďakujem"
     summary:
-      enabled_description: "Pozeráte sa na zhrnutie tejto témy: najzaujímavejšie príspevky podľa výberu komunity."
-      enable: "Zhrnutie tejto témy"
       disable: "Zobraziť všetky príspevky"
     deleted_filter:
       enabled_description: "Táto téma obsahuje zmazané príspevky, ktoré boli skryté."
@@ -1291,8 +1274,6 @@ sk:
         title_missing: "Názov je povinný"
         category_missing: "Musíte vybrať kategóriu"
       save_edit: "Uložiť úpravy"
-      reply_original: "Odpovedať na pôvodnú tému"
-      reply_here: "Odpovedať tu"
       reply: "Odpovedať"
       cancel: "Zrušiť"
       create_topic: "Vytvoriť tému"
@@ -1548,8 +1529,6 @@ sk:
       options: "Možnosti tém"
       show_links: "zobrazovať odkazy v tejto téme"
       suggest_create_topic: Ste pripravení <a href>začať novú konverzáciu?</a>
-      jump_reply_up: prejsť na predchádzajúcu odpoveď
-      jump_reply_down: prejsť na nasledujúcu odpoveď
       deleted: "Téma bola vymazaná"
       slow_mode_update:
         enable: "Zapnúť"
@@ -1883,7 +1862,6 @@ sk:
       view: "Prezerať témy v kategórii"
       general: "Všeobecné"
       settings: "Nastavenia"
-      topic_template: "Formulár témy"
       tags: "Štítky"
       tags_placeholder: "(Voliteľné) zoznam povolených štítkov"
       tag_groups_placeholder: "(Voliteľné) zoznam povolených skupín štítkov"
@@ -1922,8 +1900,6 @@ sk:
       images: "Obrázky"
       email_in: "Vlastná e-mailová adresa pre príchodziu poštu:"
       email_in_allow_strangers: "Prijímať emaily od anonymných používateľov bez účtu"
-      email_in_disabled: "Vkladanie nových tém cez email je zablokované v Nastaveniach stránky. Ak chcete povoliť vkladanie nových téme cez email,"
-      email_in_disabled_click: 'povoľte nastavenie "email in"'
       allow_badges_label: "Povoliť získavanie odznakov v tejto kategórii"
       edit_permissions: "Upraviť práva"
       review_group_name: "názov skupiny"
@@ -2069,6 +2045,10 @@ sk:
     filters:
       with_topics: "%{filter} témy"
       with_category: "%{filter} %{category} témy"
+      filter:
+        title: "Filter"
+        button:
+          label: "Filter"
       latest:
         title: "Najnovšie"
         title_with_count:
@@ -2209,7 +2189,6 @@ sk:
         many: "Získal tento odkaz %{count}-krát"
         other: "Získal tento odkaz %{count}-krát"
       granted_on: "Udelený dňa %{date}"
-      others_count: "Ostatní s týmto odznakom (%{count})"
       title: Odznaky
       more_badges:
         one: "+%{count} Ďalší"
@@ -2290,10 +2269,6 @@ sk:
       back: "Späť"
       share: "Zdieľať"
       dismiss: "Zahodiť"
-    pause_notifications:
-      remaining: "%{remaining} zostáva"
-      options:
-        custom: "Vlastné"
     trust_levels:
       names:
         newuser: "nový používateľ"
@@ -2314,7 +2289,18 @@ sk:
         other: "%{count} nových"
       more: "Viac"
       all_categories: "Všetky kategórie"
+      edit_navigation_modal_form:
+        filter_dropdown:
+          all: "Všetky"
       sections:
+        custom:
+          save: "Uložiť"
+          delete: "Odstrániť"
+          links:
+            icon:
+              label: "Ikona"
+            name:
+              label: "Názov"
         about:
           header_link_text: "O stránke"
         messages:
@@ -2332,7 +2318,8 @@ sk:
         categories:
           header_link_text: "Kategórie"
         community:
-          header_link_text: "Komunita"
+          edit_section:
+            header_dropdown: "Upraviť"
           links:
             about:
               content: "O stránke"
@@ -2340,8 +2327,8 @@ sk:
               content: "Administrátor"
             badges:
               content: "Odznaky"
-            everything:
-              content: "Všetko"
+            topics:
+              content: "Témy"
             faq:
               content: "Časté otázky"
             groups:
@@ -2350,6 +2337,11 @@ sk:
               content: "Používatelia"
             my_posts:
               content: "Moje príspevky"
+    form_templates:
+      errors:
+        typeMismatch:
+          default: "Prosím zadajte platnú hodnotu."
+          email: "Zadajte prosím platný email."
   admin_js:
     type_to_filter: "zadajte, čo chcete filtrovať ..."
     admin:
@@ -2497,7 +2489,6 @@ sk:
         enabled: "Povolené?"
         is_enabled: "A"
         not_enabled: "N"
-        change_settings: "Zmeniť nastavenia"
         change_settings_short: "Nastavenia"
         howto: "Ako nainštalujem pluginy?"
       backups:
@@ -2661,6 +2652,8 @@ sk:
           love:
             name: "obľúbené"
             description: "Farba tlačidla \"Páči sa\""
+          selected:
+            name: "vybraté"
         email_style:
           css: "CSS"
       email:
@@ -2830,6 +2823,35 @@ sk:
           add: "Pridať"
         test:
           button_label: "Test"
+      form_templates:
+        nav_title: "Šablóny"
+        list_table:
+          headings:
+            name: "Meno"
+            actions: "Akcie"
+        view_template:
+          close: "Zavrieť"
+          edit: "Upraviť"
+          delete: "Odstrániť"
+        new_template_form:
+          submit: "Uložiť"
+          cancel: "Zrušiť"
+          preview: "Ukážka"
+        quick_insert_fields:
+          add_new_field: "Pridať"
+          dropdown: "Zoznam"
+        validations_modal:
+          table_headers:
+            type: "Typ"
+            description: "Popis"
+          validations:
+            required:
+              key: "povinné"
+            type:
+              key: "typ"
+        edit_category:
+          select_template: "Výber šablón formulárov"
+          select_template_help: "Pridanie/úprava šablón formulárov"
       impersonate:
         title: "Privlastniť"
         help: "Použite tento nástroj na privlastnenie si používateľského účtu na účely debugovania. Po skončení sa budete musieť odhlásiť."
@@ -2841,6 +2863,7 @@ sk:
         last_emailed: "Posledný odemailovaný"
         not_found: "Prepáčte, toto používateľské meno sa nenachádza v našom systéme."
         id_not_found: "Prepáčte, toto používateľské id sa nenachádza v našom systéme."
+        status: "Stav"
         show_emails: "Ukázať Emaily"
         nav:
           new: "Nový"
@@ -2882,7 +2905,6 @@ sk:
         staged: "Dočasný?"
         show_admin_profile: "Admin"
         show_public_profile: "Ukázať verejný profil"
-        impersonate: "Privlastniť"
         ip_lookup: "Vyhľadávanie IP"
         log_out: "Odhlásiť sa"
         logged_out: "Používateľ bol odhlásený na všetkých zariadeniach"
@@ -3038,6 +3060,13 @@ sk:
         go_back: "Návrat na vyhľadávanie"
         recommended: "Odporúčame prispôsobenie nasledujúceho textu podľa vašich potrieb:"
         show_overriden: "Ukázať iba zmenené"
+        show_outdated: "Zobraziť len neaktuálne/neplatné"
+        interpolation_keys: "Dostupné interpolačné kľúče:"
+        outdated:
+          title: "Tento preklad je zastaraný"
+          old_default: "Staré predvolené nastavenie"
+          new_default: "Nové predvolené nastavenie"
+          dismiss: "Zahodiť"
       settings:
         show_overriden: "Ukázať iba zmenené"
         reset: "zrušiť"
@@ -3113,7 +3142,8 @@ sk:
         allow_title: Povoliť použitie odznaku namiesto názvu
         multiple_grant: Môže byť udelené viacnásobne
         listable: Zobraziť odznak na stránke verejných odznakov
-        enabled: Povoliť odznak
+        enabled: povolené
+        disabled: vypnuté
         icon: Ikona
         image: Obrázok
         query: Požiadavka na Odznak (SQL)
diff --git a/config/locales/client.sl.yml b/config/locales/client.sl.yml
index 4a8d0ca02d4..09f15e7a4b6 100644
--- a/config/locales/client.sl.yml
+++ b/config/locales/client.sl.yml
@@ -202,8 +202,6 @@ sl:
     emails_are_disabled: "Vsa odhodna e-pošta je bila globalno onemogočena iz strani administratorja. E-poštna obvestila ne bodo poslana."
     software_update_prompt:
       dismiss: "Opusti"
-    bootstrap_mode_disabled: "Zagonski način bo onemogočen v 24 urah."
-    bootstrap_invite_button_title: "Pošlji povabila"
     themes:
       default_description: "Privzeto"
     s3:
@@ -311,7 +309,6 @@ sl:
       title: "Zaznamek"
       clear_bookmarks: "Odstrani zaznamke"
       help:
-        bookmark: "ustvari zaznamek prvega prispevka v tej temi"
         unbookmark: "odstrani vse zaznamke v tej temi"
     bookmarks:
       created: "To objavo ste dodali med zaznamke. %{name}"
@@ -484,11 +481,9 @@ sl:
       scores:
         about: "Ta ocena je izračunana na podlagi nivoja zaupanja prijavitelja, ustreznosti njihovih prejšnjih prijav in prioritete prispevka, ki je bil prijavljen."
         score: "Ocena"
-        date: "Datum"
-        type: "Tip"
+        type: "Razlog"
         status: "Stanje"
-        submitted_by: "Poslano od"
-        reviewed_by: "Pregledano od"
+        submitted_by: "Prijavljen od"
       statuses:
         pending:
           title: "Za potrditev"
@@ -496,14 +491,12 @@ sl:
           title: "Potrjeno"
         rejected:
           title: "Zavrnjeno"
-        ignored:
-          title: "Prezrto"
-        deleted:
-          title: "Izbrisano"
         reviewed:
-          title: "(vsi pregledani)"
+          title: "Vsi pregledani"
         all:
-          title: "(vse)"
+          title: "Vse"
+      context_question:
+        delimiter: "ali"
       types:
         reviewable_flagged_post:
           title: "Prijavljen prispevek"
@@ -777,6 +770,7 @@ sl:
         make_all_primary_description: "Naj bo to primarna skupina za vse izbrane uporabnike"
         remove_all_primary: "Odstrani kot primarno"
         remove_all_primary_description: "Odstrani to skupino kot primarno"
+        status: "Stanje"
         owner: "Skrbnik"
         primary: "Primarna"
         forbidden: "Nimate dovoljenja da vidite člane."
@@ -908,11 +902,6 @@ sl:
       profile: "Profil"
       mute: "Utišaj"
       edit: "Uredi Nastavitve"
-      download_archive:
-        button_text: "Prenesi vse"
-        confirm: "Ste prepričani, da želite prenesti svoje prispevke?"
-        success: "Prenos se je začel, obveščeni boste s sporočilom, ko bo prenos končan."
-        rate_limit_error: "Prispevki so lahko prevešene enkrat dnevno, poskusi ponovno jutri."
       new_private_message: "Novo ZS"
       private_message: "Zasebno sporočilo"
       private_messages: "Zasebna sporočila"
@@ -1079,13 +1068,6 @@ sl:
       save_to_change_theme: 'Tema bo posodobljena, ko kliknete "%{save_text}"'
       home: "Privzeta začetna stran"
       staged: "Prirejen"
-      staff_counters:
-        flags_given: "oznake v pomoč"
-        flagged_posts: "prijavljeni prispevki"
-        deleted_posts: "izbrisani prispevki"
-        suspensions: "suspendiranih"
-        warnings_received: "opozorila"
-        rejected_posts: "zavrnjene objave"
       messages:
         inbox: "Prejeto"
         latest: "Najnovejše"
@@ -1134,8 +1116,6 @@ sl:
         title: "Rezervne potrditvene kode za preverjanje v dveh korakih"
         regenerate: "Ponovno ustvari"
         disable: "Onemogoči"
-        enable: "Omogoči"
-        enable_long: "Omogočite rezervne potrditvene kode"
         copy_to_clipboard: "Kopiraj v odložišče"
         copy_to_clipboard_error: "Napaka pri prenosu na odlagališče"
         copied_to_clipboard: "Kopirano v odložišče"
@@ -1572,13 +1552,11 @@ sl:
       hide_forever: "ne, hvala"
       intro: "Pozdravljeni! Vidimo, da uživate v branju razprave, vendar se še niste registrirali kot uporabnik."
     summary:
-      enabled_description: "Ogledujete si povzetek teme: najbolj zanimive prispevke, kot jih je določila skupnost."
       description:
         one: "Obstaja <b>%{count}</b> odgovor."
         two: "Obstajata <b>%{count}</b> odgovora."
         few: "Obstajajo <b>%{count}</b> odgovori."
         other: "Obstaja <b>%{count}</b> odgovorov."
-      enable: "Pripravi povzetek teme"
       disable: "Prikaži vse prispevke"
     deleted_filter:
       enabled_description: "Ta tema vsebuje izbrisane prispevke, ki so skriti."
@@ -1826,8 +1804,6 @@ sl:
         topic_template_not_modified: "Dodajte podrobnosti in značilnosti v vašo temo tako da uredite predlogo teme."
       save_edit: "Shrani spremembe"
       overwrite_edit: "Prepiši spremembo"
-      reply_original: "Odgovori v izvorni temi"
-      reply_here: "Odgovori tu"
       reply: "Odgovori"
       cancel: "Prekliči"
       create_topic: "Objavi temo"
@@ -1968,6 +1944,7 @@ sl:
       membership_request_accepted: "Sprejeti v članstvo v '%{group_name}'"
       reaction: "<span>%{username}</span> %{description}"
       reaction_2: "<span>%{username}, %{username2}</span> %{description}"
+      admin_problems: "Nov nasvet na vaši nadzorni plošči"
       dismiss_confirmation:
         dismiss: "Opusti"
         cancel: "Prekliči"
@@ -2230,8 +2207,6 @@ sl:
       options: "Možnosti teme"
       show_links: "pokaži povezave v tej temi"
       unread_indicator: "Noben član ni še prebral zadnjega prispevka v tej temi."
-      jump_reply_up: pojdi na prejšni odgovor
-      jump_reply_down: pojdi na naslednji odgovor
       deleted: "Tema je bila izbrisana"
       slow_mode_update:
         title: "Počasni način"
@@ -2750,7 +2725,6 @@ sl:
       filtered_replies:
         viewing_posts_by: "Ogled %{post_count} objav avtorja"
         viewing_subset: "Nekateri odgovori so strnjeni"
-        viewing_summary: "Ogled povzetka te teme"
         post_number: "%{username}, objava #%{post_number}"
         show_all: "Pokaži vse"
     category:
@@ -2762,7 +2736,6 @@ sl:
       view: "Poglej teme v kategoriji"
       general: "Splošno"
       settings: "Nastavitve"
-      topic_template: "Predloga teme"
       tags: "Oznake"
       tags_allowed_tags: "Omeji te oznake na to kategorijo:"
       tags_allowed_tag_groups: "Omeji te skupine oznak na to kategorijo:"
@@ -2814,8 +2787,6 @@ sl:
       images: "Slike"
       email_in: "Dohodni e-naslov po meri:"
       email_in_allow_strangers: "Dovoli e-sporočila od anonimnih uporabnikov brez računa"
-      email_in_disabled: "Objavljanje novih tem preko e-sporočila je onemogočeno v Nastavitvah strani. Za omogočanje objave novih tem preko e-sporočila, "
-      email_in_disabled_click: 'vključite "email in" nastavitev.'
       mailinglist_mirror: "Kategorija zrcali poštni seznam"
       show_subcategory_list: "Prikaži seznam podkategorij nad temami za to kategorijo."
       num_featured_topics: "Število tem prikazanih na seznamu kategorij:"
@@ -3010,6 +2981,10 @@ sl:
     filters:
       with_topics: "%{filter} teme"
       with_category: "%{filter} %{category} teme"
+      filter:
+        title: "Filter"
+        button:
+          label: "Filter"
       latest:
         title: "Najnovejše"
         title_with_count:
@@ -3100,6 +3075,9 @@ sl:
       close: "Zapri (Esc)"
       content_load_error: '<a href="%url%">Te vsebina</a> ne moremo naložiti.'
       image_load_error: '<a href="%url%">Te slike</a> ne moremo naložiti.'
+    experimental_lightbox:
+      buttons:
+        close: "Zapri (Esc)"
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
       shortcut_key_delimiter_plus: "+"
@@ -3189,7 +3167,6 @@ sl:
         few: "Prislužili to značko %{count} krat"
         other: "Prislužili to značko %{count} krat"
       granted_on: "Podeljeno %{date}"
-      others_count: "Drugi s to značko (%{count})"
       title: Značke
       allow_title: "To značko lahko uporabite kot naziv"
       multiple_grant: "To lahko prislužite večkrat."
@@ -3352,13 +3329,11 @@ sl:
       enabled: "Varni način je vklopljen, za izklop varnega načina zaprite okno brskalnika."
     image_removed: "(slika odstranjena)"
     pause_notifications:
-      remaining: "%{remaining} preostalo"
       options:
         half_hour: "30 minut"
         one_hour: "1 ura"
         two_hours: "2 uri"
         tomorrow: "Do jutri"
-        custom: "Po meri"
       set_schedule: "Nastavi razpored obveščanja"
     trust_levels:
       names:
@@ -3380,7 +3355,20 @@ sl:
         other: "%{count} novih"
       more: "Več"
       all_categories: "Vse kategorije"
+      edit_navigation_modal_form:
+        filter_dropdown:
+          all: "Vse"
       sections:
+        custom:
+          save: "Shrani"
+          delete: "Izbriši"
+          links:
+            icon:
+              label: "Ikona"
+            name:
+              label: "Ime"
+            value:
+              label: "Povezava"
         about:
           header_link_text: "O nas"
         messages:
@@ -3398,7 +3386,8 @@ sl:
         categories:
           header_link_text: "Kategorije"
         community:
-          header_link_text: "Skupnost"
+          edit_section:
+            header_dropdown: "Prilagodi"
           links:
             about:
               content: "O nas"
@@ -3406,8 +3395,8 @@ sl:
               content: "Admin"
             badges:
               content: "Značke"
-            everything:
-              content: "Vse"
+            topics:
+              content: "Tem"
             faq:
               content: "Pravila skupnosti"
             groups:
@@ -3419,6 +3408,10 @@ sl:
             review:
               content: "Pregled"
     until: "Do:"
+    form_templates:
+      errors:
+        typeMismatch:
+          default: "Vnesite veljavno vsebino"
   admin_js:
     type_to_filter: "vnesite za filter..."
     admin:
@@ -3627,7 +3620,6 @@ sl:
         enabled: "Vključeno?"
         is_enabled: "Y"
         not_enabled: "N"
-        change_settings: "Spremeni nastavitve"
         change_settings_short: "Nastavitve"
         howto: "Kako namestim vtičnike?"
       backups:
@@ -3742,6 +3734,8 @@ sl:
             name: "nevarnost"
           success:
             name: "uspeh"
+          selected:
+            name: "izbran"
         email_style:
           css: "CSS"
       email:
@@ -3912,11 +3906,6 @@ sl:
           replace: "Zamenjaj"
           silence: "Utišaj"
           link: "Povezava"
-        action_descriptions:
-          block: "Onemogoči objavo prispevkov, ki vsebujejo te besede. Uporabnik bo dobil sporočilo o napaki, ko bo hotel objaviti prispevek."
-          censor: "Dovoli prispevke s temi besedami, ampak jih zamenjaj z znaki, ki skrijejo cenzurirane besede."
-          require_approval: "Prispevki, ki vsebujejo te besede bodo zahtevali potrditev s strani osebja preden jih lahko kdo vidi."
-          flag: "Dovoli prispevke, ki vsebujejo te besede, vendar jih prijavi kot neprimerne, tako da jih lahko moderatorji preverijo."
         form:
           placeholder_regexp: "Regularni izraz"
           replace_label: "Zamenjava"
@@ -3925,6 +3914,36 @@ sl:
           success: "Uspeh"
         test:
           no_matches: "Ni zadetkov"
+      form_templates:
+        nav_title: "Predloge"
+        list_table:
+          headings:
+            name: "Ime"
+            actions: "Akcije"
+        view_template:
+          close: "Zapri"
+          edit: "Uredi"
+          delete: "Izbriši"
+        new_template_form:
+          submit: "Shrani"
+          cancel: "Prekliči"
+          preview: "Predogled"
+        quick_insert_fields:
+          add_new_field: "Dodaj"
+          dropdown: "Spustni meni"
+        validations_modal:
+          table_headers:
+            type: "Tip"
+            description: "Opis"
+          validations:
+            required:
+              key: "zahtevano"
+            minimum:
+              key: "najmanj"
+            maximum:
+              key: "največ"
+            type:
+              key: "tip"
       impersonate:
         title: "Poosebi uporabnika"
         help: "Uporabljajte to orodje za poosebljanje uporabnika za iskanje in odpravljanje napak. Ko končate se morate odjaviti."
@@ -3933,6 +3952,7 @@ sl:
         title: "Uporabniki"
         last_emailed: "Zadnja e-pošta"
         active: "Aktiviran"
+        status: "Stanje"
         show_emails: "Pokaži e-naslove"
         hide_emails: "Skrij e-naslove"
         nav:
@@ -4001,7 +4021,6 @@ sl:
         staged: "Prirejen?"
         show_admin_profile: "Admin"
         show_public_profile: "Pokaži javni profil"
-        impersonate: "Poosebi uporabnika"
         action_logs: "Dnevnik akcij"
         ip_lookup: "Poizvedba IP"
         log_out: "Odjava"
@@ -4167,6 +4186,8 @@ sl:
         show_overriden: "Prikaži samo preglašene/spremenjene"
         locale: "Jezik:"
         more_than_50_results: "Našli smo več kot 50 zadetkov. Določite bolj natančno iskalne kriterije."
+        outdated:
+          dismiss: "Opusti"
       settings:
         show_overriden: "Prikaži samo preglašene/spremenjene"
         history: "Ogled zgodovine sprememb"
@@ -4244,7 +4265,8 @@ sl:
         allow_title: Dovoli da se značka uporablja kot naziv
         multiple_grant: Se lahko podeli večkrat
         listable: Prikaži značko na strani javnih značk
-        enabled: Omogoči značko
+        enabled: vključeno
+        disabled: onemogočeno
         icon: Ikona
         image: Slika
         read_only_setting_help: "Prilagodite besedilo"
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index 259ec3d4ba0..e30f19f628d 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -138,7 +138,6 @@ sq:
     emails_are_disabled: "Emailat janë çaktivizuar globalisht nga administratori i faqes. Asnjë njoftim me email nuk do të dërgohet. "
     software_update_prompt:
       dismiss: "Hiqe"
-    bootstrap_invite_button_title: "Dërgo ftesa"
     themes:
       default_description: "Paracaktuar"
     s3:
@@ -220,7 +219,6 @@ sq:
       title: "Të preferuarat"
       clear_bookmarks: "Pastro të preferuarat"
       help:
-        bookmark: "Kliko për të shtuar tek të preferuarat e tua postimin e parë të kësaj teme."
         unbookmark: "Kliko për të hequr të preferuarat nga kjo temë"
     bookmarks:
       not_bookmarked: "shto postimin tek të preferuarat"
@@ -280,7 +278,7 @@ sq:
         refresh: "Rifresko"
         category: "Kategori"
       scores:
-        type: "Lloji"
+        type: "Arsye"
       statuses:
         pending:
           title: "Në pritje"
@@ -288,6 +286,8 @@ sq:
           title: "Aprovuar më"
         rejected:
           title: "Rejected"
+      context_question:
+        delimiter: "ose"
       types:
         reviewable_user:
           title: "User"
@@ -498,10 +498,6 @@ sq:
       profile: "Profili"
       mute: "Hesht"
       edit: "Ndrysho preferencat"
-      download_archive:
-        confirm: "Vërtet doni t'i shkarkoni postimet tuaja?"
-        success: "Shkarkimi filloi, do të njoftoheni me një mesazh kur të jetë gati. "
-        rate_limit_error: "Postimet mund të shkarkohen një herë në ditë, provoni përsëri nesër. "
       new_private_message: "Mesazh i ri"
       private_message: "Mesazh"
       private_messages: "Mesazhet"
@@ -592,12 +588,6 @@ sq:
       api_approved: "Aprovuar më:"
       theme: "Tema"
       staged: "Staged"
-      staff_counters:
-        flags_given: "sinjalizime të dobishme"
-        flagged_posts: "postimet e sinjalizuara"
-        deleted_posts: "postimet e fshira"
-        suspensions: "pezullimet"
-        warnings_received: "paralajmërimet"
       messages:
         inbox: "Inbox"
         latest: "Të fundit"
@@ -639,7 +629,6 @@ sq:
       second_factor_backup:
         regenerate: "Rigjenero"
         disable: "Çaktivizo"
-        enable: "Aktivizo"
       second_factor:
         name: "Emri"
         disable: "Çaktivizo"
@@ -911,8 +900,6 @@ sq:
       sign_up: "Regjistrohu"
       hide_forever: "jo faleminderit"
     summary:
-      enabled_description: "Po lexoni një përmbledhje të kësaj teme: postimet më interesante sipas vlerësimit të komunitetit."
-      enable: "Përmblidhe këtë Temë"
       disable: "Shfaq të gjithë postimet"
     deleted_filter:
       enabled_description: "Kjo temë përmban postime të fshira, që tani janë fshehur."
@@ -1032,8 +1019,6 @@ sq:
         title_missing: "Titulli është i nevojshëm"
         category_missing: "Duhet të zgjidhni një kategori"
       save_edit: "Ruani modifikimet"
-      reply_original: "Përgjigjuni temës origjinale"
-      reply_here: "Përgjigju këtu"
       reply: "Përgjigju"
       cancel: "Anulo"
       create_topic: "Krijo temën"
@@ -1240,8 +1225,6 @@ sq:
       back_to_list: "Kthehu tek lista e temave"
       options: "Opsionet e temës"
       show_links: "trego lidhjet në këtë temë"
-      jump_reply_up: hidhe tek përgjigja paraardhëse
-      jump_reply_down: hidhu tek përgjigja pasardhëse
       deleted: "Tema është fshirë"
       slow_mode_update:
         enable: "Aktivizo"
@@ -1539,7 +1522,6 @@ sq:
       view: "Shiko temat në kategorinë"
       general: "Karakteristika të përgjithshme"
       settings: "Rregullimet"
-      topic_template: "Shabllon i Temës"
       tags: "Etiketat"
       tags_placeholder: "(Opsionale) lista e etiketave të lejuara"
       tag_groups_placeholder: "(Opsionale) lista e grupeve të etiketave"
@@ -1577,8 +1559,6 @@ sq:
       images: "Imazhet"
       email_in: "Custom incoming email address:"
       email_in_allow_strangers: "Prano emaila nga anëtarë anonimë pa llogari në faqe"
-      email_in_disabled: "Postimi i temave të reja me email është çaktivizuar në Rregullimet e faqes. Për të aktivizuar postimet e temave të reja me email,"
-      email_in_disabled_click: 'aktivizo rregullimin "email in".'
       allow_badges_label: "Lejo të jepen stemat në këtë kategori"
       edit_permissions: "Ndryshoni autorizimet"
       review_group_name: "emri i grupit"
@@ -1712,6 +1692,10 @@ sq:
     filters:
       with_topics: "Temat nga %{filter}"
       with_category: "Temat nga: %{filter}, %{category}"
+      filter:
+        title: "Filtro"
+        button:
+          label: "Filtro"
       latest:
         title: "Më të fundit"
         title_with_count:
@@ -1839,7 +1823,6 @@ sq:
         one: "Kjo stemë është fituar %{count} herë"
         other: "Kjo stemë është fituar %{count} herë"
       granted_on: "Atribuar më %{date}"
-      others_count: "Të tjerë me këtë stemë (%{count})"
       title: Stemat
       allow_title: "Mund t'a përdorësh këtë stemë si titull"
       multiple_grant: "Kjo stemë mund të fitohet disa herë"
@@ -1923,10 +1906,6 @@ sq:
       back: "Kthehu mbrapa"
       share: "Shpërndaje"
       dismiss: "Hiqe"
-    pause_notifications:
-      remaining: "edhe %{remaining} gërmë"
-      options:
-        custom: "Grupet e krijuara"
     trust_levels:
       names:
         newuser: "anëtar i ri"
@@ -1943,7 +1922,18 @@ sq:
         other: "%{count} të reja"
       more: "Më shumë"
       all_categories: "Të gjitha kategoritë"
+      edit_navigation_modal_form:
+        filter_dropdown:
+          all: "Të Gjithë"
       sections:
+        custom:
+          save: "Ruaj"
+          delete: "Fshij"
+          links:
+            icon:
+              label: "Ikonë"
+            name:
+              label: "Emri juaj"
         about:
           header_link_text: "Rreth"
         messages:
@@ -1961,7 +1951,8 @@ sq:
         categories:
           header_link_text: "Categories"
         community:
-          header_link_text: "Komuniteti"
+          edit_section:
+            header_dropdown: "Personalizo"
           links:
             about:
               content: "Rreth"
@@ -1969,6 +1960,8 @@ sq:
               content: "Admin"
             badges:
               content: "Stemat"
+            topics:
+              content: "Topics"
             faq:
               content: "Pyetje të shpeshta"
             groups:
@@ -1977,6 +1970,11 @@ sq:
               content: "Users"
             my_posts:
               content: "Postimet e mia"
+    form_templates:
+      errors:
+        typeMismatch:
+          default: "Ju lutem shkruani një vlerë të vlefshme."
+          email: "Ju lutemi të vendosni një email të vlefshëm."
   admin_js:
     type_to_filter: "shkruaj për kërkim"
     admin:
@@ -2104,7 +2102,6 @@ sq:
         enabled: "Aktivizuar?"
         is_enabled: "Y"
         not_enabled: "N"
-        change_settings: "Ndrysho Rregullimet"
         change_settings_short: "Rregullimet"
         howto: "Si mund të instaloj një plugin?"
       backups:
@@ -2414,6 +2411,32 @@ sq:
           flag: "Sinjalizoni"
         form:
           add: "Shto"
+      form_templates:
+        nav_title: "Shabllonet"
+        list_table:
+          headings:
+            name: "Emri"
+            actions: "Veprimet"
+        view_template:
+          close: "Mbyll"
+          edit: "Redakto"
+          delete: "Fshij"
+        new_template_form:
+          submit: "Ruaj"
+          cancel: "Anulo"
+          preview: "Parashikimi"
+        quick_insert_fields:
+          add_new_field: "Shto"
+          dropdown: "Listë Dropdown"
+        validations_modal:
+          table_headers:
+            type: "Lloji"
+            description: "Përshkrimi"
+          validations:
+            required:
+              key: "i nevojshëm"
+            type:
+              key: "lloji"
       impersonate:
         title: "Personifiko"
         help: "Use this tool to impersonate a user account for debugging purposes. You will have to log out once finished."
@@ -2465,7 +2488,6 @@ sq:
         staged: "Staged?"
         show_admin_profile: "Admin"
         show_public_profile: "Shfaq Profilin Publik"
-        impersonate: "Personifiko"
         ip_lookup: "Shiko IP"
         log_out: "Shkëputu"
         logged_out: "Përdoruesi i shkëput nga të gjitha paisjet"
@@ -2620,6 +2642,8 @@ sq:
         go_back: "Kthehu tek kërkimi"
         recommended: "Ju rekomandojmë të ndryshoni tekstin më poshtë sipas nevojave tuaja: "
         show_overriden: "Shfaq vetëm të ndryshuarat"
+        outdated:
+          dismiss: "Hiqe"
       settings:
         show_overriden: "Shfaq vetëm të ndryshuarat"
         reset: "rivendos"
@@ -2697,7 +2721,7 @@ sq:
         allow_title: Lejoni stemën të përdoret si titull
         multiple_grant: Mund të akordohet disa herë
         listable: Shfaqni stemën në faqen publike të stemave
-        enabled: Aktivizoni stemën
+        enabled: aktivizuar
         icon: Ikonë
         image: Imazh
         query: Query Steme (SQL)
diff --git a/config/locales/client.sr.yml b/config/locales/client.sr.yml
index cc9a38c53f5..74487c753f4 100644
--- a/config/locales/client.sr.yml
+++ b/config/locales/client.sr.yml
@@ -191,7 +191,6 @@ sr:
     software_update_prompt:
       message: "Ажурирали смо сајт. <span>Освежите страницу</span> да бисте избегли непријатности."
       dismiss: "Одбаци"
-    bootstrap_mode_disabled: "Режим покретања ће бити искључен у року од 24 сата."
     themes:
       default_description: "Подразумевано"
     s3:
@@ -298,10 +297,8 @@ sr:
       edit_bookmark: "Uredi marker"
       clear_bookmarks: "Očisti markere"
       help:
-        bookmark: "Klikni da markiraš prvi post u ovoj temi"
-        edit_bookmark: "Klikni da bi obirsao sve markere sa ove teme"
         unbookmark: "Klikni da bi obirsao sve markere sa ove teme"
-        unbookmark_with_reminder: "Klikni da bi obirsao sve markere sa ove teme."
+        unbookmark_with_reminder: "Klikni da bi obirsao sve markere sa ove teme"
     bookmarks:
       created: "Obeležili ste ovu poruku. %{name}"
       not_bookmarked: "obeleži ovu poruku"
@@ -334,7 +331,6 @@ sr:
       new_topic: "Novi nacrt teme"
       new_private_message: "Nacrt nove privatne poruke"
       abandon:
-        confirm: "Imate nacrt za ovu temu. Sta želite da učinite sa njim?"
         yes_value: "Odbaci"
         no_value: "Nastavi sa uređivanjem"
     topic_count_categories:
@@ -441,13 +437,14 @@ sr:
       conversation:
         view_full: "pogledaj ceo razgovor"
       scores:
-        type: "Tip"
-        reviewed_by: "Pregledano od strane"
+        type: "Razlog"
       statuses:
         pending:
           title: "U toku"
         approved:
           title: "Potvrđenji"
+      context_question:
+        delimiter: "ili"
       types:
         reviewable_user:
           title: "Korisnik"
@@ -654,8 +651,6 @@ sr:
       profile: "Profil"
       mute: "Utišaj"
       edit: "Uredi postavke"
-      download_archive:
-        rate_limit_error: "Poruke mogu biti preuzimate jednom na dan, molimo pokušajte sutra."
       new_private_message: "Nova privatna poruka"
       private_message: "Privatna poruka"
       private_messages: "Poruke"
@@ -717,12 +712,6 @@ sr:
       muted_users: "Utišano"
       tracked_topics_link: "Prikaži"
       api_approved: "Potvrđenji:"
-      staff_counters:
-        flags_given: "pomoćne oznake"
-        flagged_posts: "označene poruke"
-        deleted_posts: "obrisane poruke"
-        suspensions: "suspenzije"
-        warnings_received: "upozorenja"
       messages:
         inbox: "Primljeno"
         latest: "Poslednje"
@@ -755,7 +744,6 @@ sr:
       second_factor_backup:
         regenerate: "Regeneriši"
         disable: "Onemogući"
-        enable: "Omogući"
       second_factor:
         name: "Ime foruma"
         disable: "Onemogući"
@@ -1015,8 +1003,6 @@ sr:
     signup_cta:
       sign_up: "Registrujte se"
     summary:
-      enabled_description: "Gledate pregled ove teme: najzanimljivije poruke su odabrane od strane zajednice."
-      enable: "Sumirajte Ovu Temu"
       disable: "Prikaži Sve Poruke"
     deleted_filter:
       enabled_description: "Ova tema sadrži brisane poruke, koji su skriveni."
@@ -1101,8 +1087,6 @@ sr:
         title_missing: "Naslov je obavezan"
         category_missing: "Morate odabrati kategoriju"
       save_edit: "Sačuvaj izmenu"
-      reply_original: "Odgovori na originalnu temu"
-      reply_here: "Odgovori ovde"
       reply: "Odgovori"
       cancel: "Odustani"
       create_topic: "Kreiraj temu"
@@ -1276,8 +1260,6 @@ sr:
       back_to_list: "Nazad na listu tema"
       options: "Opcije Teme"
       show_links: "Prikaži linkove u ovoj temi"
-      jump_reply_up: skoči na raniji odgovor
-      jump_reply_down: skoči na kasniji odgovor
       deleted: "Tema je obrisana"
       slow_mode_update:
         enable: "Omogući"
@@ -1526,8 +1508,6 @@ sr:
       images: "Slike"
       email_in: "Prilagođena adresa dolaznog e-maila."
       email_in_allow_strangers: "Prihvati emailove anonimnih korisnika bez naloga"
-      email_in_disabled: "Objavljivanje novih tema preko emaila je onemogućeno u podešavanjima stranice. Da omogućite objavljivanje tema preko emaila,"
-      email_in_disabled_click: 'omogućite "pošalji email u" podešavanjima.'
       allow_badges_label: "Dozvoli dodjeljivanje značaka u ovoj kategoriji."
       edit_permissions: "Izmeni dozvole"
       review_group_name: "ime grupe"
@@ -1637,6 +1617,10 @@ sr:
     filters:
       with_topics: "%{filter} teme"
       with_category: "%{filter} %{category} teme"
+      filter:
+        title: "Filter"
+        button:
+          label: "Filter"
       latest:
         title: "Poslednje"
         title_with_count:
@@ -1807,9 +1791,6 @@ sr:
       back: "Nazad"
       share: "Podeli"
       dismiss: "Одбаци"
-    pause_notifications:
-      options:
-        custom: "Posebna"
     trust_levels:
       names:
         member: "član"
@@ -1825,7 +1806,18 @@ sr:
         few: "%{count} novih"
         other: "%{count} nova"
       more: "Više"
+      edit_navigation_modal_form:
+        filter_dropdown:
+          all: "sve"
       sections:
+        custom:
+          save: "Sačuvaj"
+          delete: "Obriši"
+          links:
+            icon:
+              label: "Ikona"
+            name:
+              label: "Ime"
         about:
           header_link_text: "O nama"
         messages:
@@ -1841,7 +1833,8 @@ sr:
         categories:
           header_link_text: "Kategorije"
         community:
-          header_link_text: "Zajednica"
+          edit_section:
+            header_dropdown: "Prilagođavanje"
           links:
             about:
               content: "O nama"
@@ -1849,6 +1842,8 @@ sr:
               content: "Admin"
             badges:
               content: "Značke"
+            topics:
+              content: "Teme"
             faq:
               content: "FAQ (često postavljana pitanja)"
             groups:
@@ -1857,6 +1852,11 @@ sr:
               content: "Korisnici"
             my_posts:
               content: "Moje poruke"
+    form_templates:
+      errors:
+        typeMismatch:
+          default: "Molimo unesite validnu vrednost"
+          email: "Molimo unesite validnu e-mail adresu."
   admin_js:
     type_to_filter: "upiši za filtriranje"
     admin:
@@ -2215,6 +2215,29 @@ sr:
           flag: "Označi Zastavom"
         form:
           add: "Dodaj"
+      form_templates:
+        list_table:
+          headings:
+            name: "Ime foruma"
+            actions: "Akcije"
+        view_template:
+          close: "Zatvori"
+          edit: "Izmeni"
+          delete: "Obriši"
+        new_template_form:
+          submit: "Sačuvaj"
+          cancel: "Odustani"
+        quick_insert_fields:
+          add_new_field: "Dodaj"
+        validations_modal:
+          table_headers:
+            type: "Tip"
+            description: "Opis"
+          validations:
+            required:
+              key: "potrebno"
+            type:
+              key: "tip"
       impersonate:
         title: "Predstavi se kao"
         help: "Koristite ovaj alat da se predstavite kao određeni korisnički nalog za potrebe ispravljanja grešaka. Moraćete se odjaviti kad završite."
@@ -2262,7 +2285,6 @@ sr:
         suspended: "Suspendovan?"
         show_admin_profile: "Administrator"
         show_public_profile: "Pokaži javni profil"
-        impersonate: "Predstavi se kao"
         ip_lookup: "IP Pregled"
         log_out: "Odjava"
         logged_out: "Korisnik je odjavljen sa svih uređaja"
@@ -2401,6 +2423,8 @@ sr:
       site_text:
         edit: "izmeni"
         show_overriden: "Pokazuj samo promenjeno"
+        outdated:
+          dismiss: "Одбаци"
       settings:
         show_overriden: "Pokazuj samo promenjeno"
         reset: "resetuj"
@@ -2470,7 +2494,6 @@ sr:
         allow_title: Dopusti da se značka koristi kao titula
         multiple_grant: Može biti dodeljena više puta
         listable: Prikaži značku na javnoj stranici sa značkama
-        enabled: Omogući značku
         icon: Ikona
         image: Slika
         query: Upitnik Značke (SQL)
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index 58a1b3647f2..8c1b1e279e6 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -144,6 +144,8 @@ sv:
       facebook: "Dela på Facebook"
       email: "Skicka via e-post"
       url: "Kopiera och dela URL"
+    word_connector:
+      comma: ", "
     action_codes:
       public_topic: "Gjorde det här ämnet offentligt %{when}"
       open_topic: "Konverterade detta till ett ämne %{when}"
@@ -155,6 +157,8 @@ sv:
       removed_user: "Tog bort %{who} %{when}"
       removed_group: "Tog bort %{who} %{when}"
       autobumped: "Automatiskt positionerad %{when}"
+      tags_changed: "Taggar uppdaterade %{when}"
+      category_changed: "Kategori uppdaterad %{when}"
       autoclosed:
         enabled: "Stängdes %{when}"
         disabled: "Öppnades %{when}"
@@ -179,17 +183,13 @@ sv:
       forwarded: "Vidarebefordrade ovanstående e-post"
     topic_admin_menu: "ämnesåtgärder"
     skip_to_main_content: "Hoppa till huvudinnehållet"
+    skip_user_nav: "Hoppa till profilinnehållet"
     emails_are_disabled: "All utgående e-post har blivit globalt inaktiverad av en administratör. Inga e-postaviseringar av något slag kommer att skickas ut."
     emails_are_disabled_non_staff: "Utgående e-post har inaktiverats för användare som inte är anställda."
     software_update_prompt:
       message: "Vi har uppdaterat den här webbplatsen, och <span>ber dig uppdatera sidan</span>, annars kan du uppleva oväntad funktion."
       dismiss: "Avfärda"
-    bootstrap_mode_enabled:
-      one: "Du är i bootstrap-läge för att göra lanseringen av din nya webbplats enklare. Alla nya användare kommer att beviljas förtroendenivå 1 och få dagliga sammanfattningar skickade via e-post. Det här stängs automatiskt av när antalet användare når %{count}."
-      other: "Du är i bootstrap-läge för att göra lanseringen av din nya webbplats enklare. Alla nya användare kommer att beviljas förtroendenivå 1 och få dagliga sammanfattningar skickade via e-post. Det här stängs automatiskt av när antalet användare når %{count}."
-    bootstrap_mode_disabled: "Bootstrap-läge stängs av om 24 timmar."
-    bootstrap_invite_button_title: "Skicka inbjudningar"
-    bootstrap_wizard_link_title: "Slutför installationsguiden"
+    bootstrap_mode: "Komma igång"
     themes:
       default_description: "Standard"
       broken_theme_alert: "Din webbplats kanske inte fungerar eftersom ett tema / komponent har fel."
@@ -302,11 +302,11 @@ sv:
       edit_bookmark: "Redigera bokmärke"
       clear_bookmarks: "Töm bokmärken"
       help:
-        bookmark: "Klicka för att bokmärka första inlägget i ämnet"
-        edit_bookmark: "Klicka för att redigera bokmärket för detta ämne"
+        bookmark: "Klicka för att bokmärka detta ämne"
+        edit_bookmark: "Klicka för att redigera bokmärket på ett inlägg i detta ämne"
         edit_bookmark_for_topic: "Klicka för att redigera bokmärket för detta ämne"
         unbookmark: "Klicka för att radera alla bokmärken i ämnet"
-        unbookmark_with_reminder: "Klicka för att ta bort alla bokmärken och påminnelser i detta ämne."
+        unbookmark_with_reminder: "Klicka för att ta bort alla bokmärken och påminnelser i detta ämne"
     bookmarks:
       created: "Du har bokmärkt detta inlägg. %{name}"
       created_generic: "Du har bokmärkt detta. %{name}"
@@ -350,7 +350,7 @@ sv:
       new_topic: "Nytt utkast för ämne"
       new_private_message: "Nytt utkast för personligt meddelande"
       abandon:
-        confirm: "Du har ett pågående utkast för detta ämne. Vad vill du göra med det?"
+        confirm: "Du har redan ett pågående utkast. Vad vill du göra med det?"
         yes_value: "Förkasta"
         no_value: "Återuppta redigering"
     topic_count_categories:
@@ -403,6 +403,8 @@ sv:
         search: "Sök efter ett meddelande"
         placeholder: "skriv meddelandets titel, url eller id här"
     review:
+      show_more: "Visa mer"
+      show_less: "Visa mindre"
       order_by: "Sortera efter"
       date_filter: "Publicerat mellan"
       in_reply_to: "som svar till"
@@ -523,26 +525,43 @@ sv:
       scores:
         about: "Denna poäng beräknas på förtroendenivån för de som rapporterar, deras träffsäkerhet på deras tidigare flaggor, samt på prioriteringen av föremål som rapporteras."
         score: "Poäng"
-        date: "Datum"
-        type: "Typ"
+        date: "Rapportdatum"
+        type: "Anledning"
         status: "Status"
-        submitted_by: "Inskickade av"
+        submitted_by: "Rapporterad av"
         reviewed_by: "Granskade av"
+        reviewed_timestamp: "Granskningsdatum"
       statuses:
         pending:
           title: "Väntar"
         approved:
           title: "Godkända"
+        approved_flag:
+          title: "Flaggning godkänd"
+        approved_user:
+          title: "Användaren godkändes"
+        approved_post:
+          title: "Inlägget godkändes"
         rejected:
           title: "Avvisade"
+        rejected_flag:
+          title: "Flaggning avvisades"
+        rejected_user:
+          title: "Användaren avvisades"
+        rejected_post:
+          title: "Inlägget avvisades"
         ignored:
-          title: "Ignorerade"
+          title: "Flaggning ignoreras"
         deleted:
-          title: "Raderade"
+          title: "Ämne eller inlägg raderat"
         reviewed:
-          title: "(alla granskade)"
+          title: "Alla granskade"
         all:
-          title: "(allting)"
+          title: "Allting"
+      context_question:
+        is_this_post: "Är detta inlägg %{reviewable_human_score_types}?"
+        delimiter: "eller"
+        something_else_wrong: "Är det något fel med detta inlägg?"
       types:
         reviewable_flagged_post:
           title: "Flaggat inlägg"
@@ -555,6 +574,8 @@ sv:
           title: "Användare"
         reviewable_post:
           title: "Inlägg"
+        reviewable_chat_message:
+          title: "Flaggat chattmeddelande"
       approval:
         title: "Inlägget behöver godkännande"
         description: "Vi har mottagit ditt nya inlägg men det måste godkännas av en moderator innan det kan visas. Ha tålamod."
@@ -849,6 +870,7 @@ sv:
         make_all_primary_description: "Gör denna till primär grupp för alla markerade användare"
         remove_all_primary: "Ta bort som primär"
         remove_all_primary_description: "Ta bort denna grupp som primär"
+        status: "Status"
         owner: "Ägare"
         primary: "Primär"
         forbidden: "Du är inte tillåten att se medlemmarna."
@@ -977,10 +999,12 @@ sv:
       mute: "Tysta"
       edit: "Redigera inställningar"
       download_archive:
-        button_text: "Ladda ner alla"
-        confirm: "Är du säker på att du vill ladda ner dina inlägg?"
-        success: "Nedladdning påbörjad, du kommer att aviseras via meddelande när processen är klar."
-        rate_limit_error: "Inlägg kan laddas ner en gång per dag, försök igen imorgon."
+        title: "Exportera dina data"
+        description: "Ladda ner ett arkiv med din kontoaktivitet och dina inställningar."
+        button_text: "Begär arkiv"
+        confirm: "Vill du verkligen ladda ner ett arkiv med din kontoaktivitet och dina inställningar?"
+        success: "Vi har börjat samla in ditt arkiv och meddelar dig när den processen är klar."
+        rate_limit_error: "Kontoarkiv kan laddas ner en gång per dag, försök igen imorgon."
       new_private_message: "Nytt meddelande"
       private_message: "Meddelande"
       private_messages: "Meddelanden"
@@ -1033,6 +1057,7 @@ sv:
           warning: "Är du säker på att du vill rensa ditt utvalda ämne?"
       use_current_timezone: "Använd nuvarande tidszon"
       profile_hidden: "Den här användarens offentliga profil är dold."
+      inactive_user: "Den här användaren är inte längre aktiv."
       expand_profile: "Utvidga"
       sr_expand_profile: "Expandera profilinformation"
       collapse_profile: "Förminska"
@@ -1052,7 +1077,7 @@ sv:
         perm_denied_expl: "Du nekade tillåtelse för aviseringar. Tillåt aviseringar via din webbläsares inställningar."
         disable: "Inaktivera aviseringar"
         enable: "Aktivera aviseringar"
-        each_browser_note: 'Obs: Du måste ändra den här inställningen i varje webbläsare du använder. Alla aviseringar kommer att inaktiveras om du pausar aviseringar från användarmenyn, oavsett denna inställning.'
+        each_browser_note: "Obs: Du måste ändra den här inställningen i varje webbläsare du använder. Alla aviseringar kommer att inaktiveras om du pausar aviseringar från användarmenyn, oavsett denna inställning."
         consent_prompt: "Vill du ha realtidsaviseringar när personer svarar på dina inlägg?"
       dismiss: "Avfärda"
       dismiss_notifications: "Avfärda alla"
@@ -1103,14 +1128,10 @@ sv:
       experimental_sidebar:
         enable: "Aktivera sidofältet"
         options: "Alternativ"
-        categories_section: "Sektion Kategorier"
-        categories_section_instruction: "Valda kategorier kommer att visas under sidofältets kategorisektion."
-        tags_section: "Sektion Taggar"
-        tags_section_instruction: "Valda taggar kommer att visas under sidofältets tagg-sektion."
         navigation_section: "Navigering"
-        list_destination_instruction: "När det finns nytt innehåll i sidofältet..."
-        list_destination_default: "använd standardlänken och visa en utmärkelse för nya objekt"
-        list_destination_unread_new: "länka till oläst/nytt och visa ett antal nya objekt"
+        navigation_section_instruction: "När en ämneslista i navigeringsmenyn har nya eller olästa objekt…"
+        link_to_filtered_list_checkbox_description: "Länk till den filtrerade listan"
+        show_count_new_items_checkbox_description: "Visa antalet nya objekt"
       change: "ändra"
       featured_topic: "Utvalt ämne"
       moderator: "%{user} är en moderator"
@@ -1180,12 +1201,24 @@ sv:
       home: "Standardhemsida"
       staged: "Arrangerad"
       staff_counters:
-        flags_given: "hjälpsamma flaggor"
-        flagged_posts: "flaggade inlägg"
-        deleted_posts: "raderade inlägg"
-        suspensions: "avstängningar"
-        warnings_received: "varningar"
-        rejected_posts: "avvisade inlägg"
+        flags_given:
+          one: '<span class="%{className}">%{count}</span> hjälpsam flagga'
+          other: '<span class="%{className}">%{count}</span> hjälpsamma flaggor'
+        flagged_posts:
+          one: '<span class="%{className}">%{count}</span> flaggat inlägg'
+          other: '<span class="%{className}">%{count}</span> flaggade inlägg'
+        deleted_posts:
+          one: '<span class="%{className}">%{count}</span> raderat inlägg'
+          other: '<span class="%{className}">%{count}</span> raderade inlägg'
+        suspensions:
+          one: '<span class="%{className}">%{count}</span> avstängning'
+          other: '<span class="%{className}">%{count}</span> avstängningar'
+        warnings_received:
+          one: '<span class="%{className}">%{count}</span> varning'
+          other: '<span class="%{className}">%{count}</span> varningar'
+        rejected_posts:
+          one: '<span class="%{className}">%{count}</span> avvisat inlägg'
+          other: '<span class="%{className}">%{count}</span> avvisade inlägg'
       messages:
         all: "alla inkorgar"
         inbox: "Inkorg"
@@ -1278,7 +1311,7 @@ sv:
         tags: "Taggar"
         interface: "Gränssnitt"
         apps: "Appar"
-        sidebar: "Sidofält"
+        navigation_menu: "Navigeringsmeny"
       change_password:
         success: "(e-post skickat)"
         in_progress: "(skickar e-post)"
@@ -1292,11 +1325,12 @@ sv:
         title: "Tvåfaktorsreservkoder"
         regenerate: "Generera ny"
         disable: "Inaktivera"
-        enable: "Aktivera"
-        enable_long: "Aktivera reservkoder"
+        enable: "Skapa reservkoder"
+        enable_long: "Lägg till reservkoder"
+        not_enabled: "Du har inte skapat några reservkoder än."
         manage:
-          one: "Hantera reservkoder. Du har <strong>%{count}</strong> reservkod kvar."
-          other: "Hantera reservkoder. Du har <strong>%{count}</strong> reservkoder kvar."
+          one: "Du har <strong>%{count}</strong> reservkod kvar."
+          other: "Du har <strong>%{count}</strong> reservkoder kvar."
         copy_to_clipboard: "Kopiera till urklipp"
         copy_to_clipboard_error: "Fel vid kopiering av data till urklipp"
         copied_to_clipboard: "Kopierad till urklipp"
@@ -1381,6 +1415,7 @@ sv:
         success: "Vi har skickat e-post till den adressen. Var god följ bekräftelseinstruktionerna."
         success_via_admin: "Vi har skickat e-post till den adressen. Var god följ bekräftelseinstruktionerna."
         success_staff: "Vi har skickat e-post till din nuvarande adress. Vänligen följ instruktionerna för konfirmering."
+        back_to_preferences: "Tillbaka till inställningarna"
       change_avatar:
         title: "Ändra din profilbild"
         gravatar: "<a href='//%{gravatarBaseUrl}%{gravatarLoginUrl}' target='_blank'>%{gravatarName}</a>, baserat på"
@@ -1735,8 +1770,7 @@ sv:
       pause_notifications: "Pausa aviseringar"
       remove_status: "Ta bort status"
     user_tips:
-      primary: "Jag förstår!"
-      secondary: "visa mig inte dessa tips"
+      button: "Jag förstår!"
       first_notification:
         title: "Din första avisering!"
         content: "Aviseringar används för att hålla dig uppdaterad om vad som händer i samhället."
@@ -1752,6 +1786,10 @@ sv:
       suggested_topics:
         title: "Fortsätt läsa!"
         content: "Här är några ämnen som vi tror att du kanske vill läsa härnäst."
+      admin_guide:
+        title: "Välkommen till din nya webbplats!"
+        content: "Läs administratörshandboken för att fortsätta bygga upp din webbplats och ditt forum."
+        button: "Nu kör vi!"
     loading: "Laddar..."
     errors:
       prev_page: "medan vi försökte ladda"
@@ -1786,12 +1824,6 @@ sv:
       logout_disabled: "Det går inte att logga ut medan webbplatsen är i skrivskyddat läge."
     staff_writes_only_mode:
       enabled: "Webbplatsen är i läget endast för personal. Du kan fortsätta bläddra på sidan, men att skriva inlägg, gilla och andra åtgärder är begränsat till personal."
-    too_few_topics_and_posts_notice_MF: |
-      Låt oss <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">inleda diskussionen!</a> Det {currentTopics, plural, one {finns <strong>#</strong> ämne} other {finns <strong>#</strong> ämnen}} och {currentPosts, plural, one {<strong>#</strong> inlägg} other {<strong>#</strong> inlägg}}. Besökare behöver mer att läsa och svara på – vi rekommenderar åtminstone {requiredTopics, plural, one {<strong>#</strong> ämne} other {<strong>#</strong> ämnen}} och {requiredPosts, plural, one {<strong>#</strong> inlägg} other {<strong>#</strong> inlägg}}. Enbart personal kan se detta meddelande.
-    too_few_topics_notice_MF: |
-      Låt oss <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">inleda diskussionen!</a> Det {currentTopics, plural, one {finns <strong>#</strong> ämne} other {finns <strong>#</strong> ämnen}}. Besökare behöver mer att läsa och svara på – vi rekommenderar minst {requiredTopics, plural, one {<strong>#</strong> ämne} other {<strong>#</strong> ämnen}}. Enbart personal kan se detta meddelande.
-    too_few_posts_notice_MF: |
-      Låt oss <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">inleda diskussionen!</a> Det {currentPosts, plural, one {finns <strong>#</strong> inlägg} other {finns <strong>#</strong> inlägg}}. Besökare behöver mer att läsa och svara på – vi rekommenderar minst {requiredPosts, plural, one {<strong>#</strong> inlägg} other {<strong>#</strong> inlägg}}. Enbart personal kan se detta meddelande.
     logs_error_rate_notice:
       reached_hour_MF: |
         <b>{relativeAge}</b> - <a href='{url}' target='_blank'>{rate, plural, one {# fel/timma} other  {# fel/timma}}</a> har uppnått webbplatsinställningarnas gräns som är {limit, plural, one {# fel/timma} other {# fel/timma}}.
@@ -1821,17 +1853,31 @@ sv:
       hidden_for_session: "Ok, vi frågar dig imorgon. Du kan alltid använda 'Logga in' för att skapa ett konto, också."
       intro: "Hejsan! Det verkar som du gillar diskussionen, men du har ännu inte registrerat dig för ett konto."
       value_prop: "Trött på att bläddra igenom samma inlägg? När du skapar ett konto kommer du alltid tillbaka där du slutade. Med ett konto kan du också bli aviserad om nya svar, spara bokmärken och använda gillningar för att tacka andra. Vi kan alla arbeta tillsammans för att göra denna gemenskap fantastisk. :heart:"
+    offline_indicator:
+      no_internet: "Ingen internetanslutning."
+      refresh_page: "Uppdatera sida"
     summary:
-      enabled_description: "Sammanfattning över de inlägg som användarna tycker är mest intressanta."
+      in_progress: "Sammanfatta ämne med hjälp av AI..."
+      summarized_on: "Sammanfattat med AI på %{date}"
+      model_used: "AI som används: %{model}"
+      outdated: "Sammanfattningen är inaktuell"
+      outdated_posts:
+        one: "(%{count} inlägg saknas)"
+        other: "(%{count} inlägg saknas)"
+      enabled_description: "Toppsvar i detta ämne som forumets användare tycker är mest intressanta."
       description:
         one: "Det finns <b>%{count}</b> svar."
         other: "Det finns <b>%{count}</b> svar."
+      buttons:
+        hide: "Dölj sammanfattning"
+        generate: "Sammanfatta med AI"
+        regenerate: "Generera ny sammanfattning"
       description_time_MF: |
         Det {replyCount, plural, one {finns <b>#</b> svar} other {finns <b>#</b> svar}} med en uppskattad lästid på <b>{readingTime, plural, one {# minut} other {# minuter}}</b>.
-      enable: "Sammanfatta detta ämne"
+      enable: "Visa toppsvar"
       disable: "Visa alla inlägg"
-      short_label: "Sammanfatta"
-      short_title: "Visa en sammanfattning av detta ämne: de mest intressanta inläggen enligt forumet"
+      short_label: "Toppsvar"
+      short_title: "Visa toppsvaren i detta ämne som forumets användare tycker är mest intressanta"
     deleted_filter:
       enabled_description: "Det här ämnet innehåller borttagna inlägg som har dolts."
       disabled_description: "Raderade inlägg i ämnet visas."
@@ -2130,8 +2176,6 @@ sv:
         topic_template_not_modified: "Lägg till detaljer och specifikationer till ditt ämne genom att redigera ämnesmallen."
       save_edit: "Spara ändring"
       overwrite_edit: "Överskriv redigering"
-      reply_original: "Svara på ursprungsämnet"
-      reply_here: "Svara här"
       reply: "Svara"
       cancel: "Avbryt"
       create_topic: "Skapa ämne"
@@ -2233,6 +2277,7 @@ sv:
       image_alt_text:
         aria_label: Alternativ text för bild
       delete_image_button: Radera bild
+      toggle_image_grid: Växla bildrutnät
     notifications:
       tooltip:
         regular:
@@ -2296,6 +2341,7 @@ sv:
       reaction_2: "<span>%{username}, %{username2}</span>%{description}"
       votes_released: "%{description} - slutförd"
       new_features: "Nya funktioner tillgängliga!"
+      admin_problems: "Nytt råd på din webbplats översiktspanel"
       dismiss_confirmation:
         body:
           default:
@@ -2561,6 +2607,11 @@ sv:
         dismiss_tooltip: "Avfärda nya inlägg eller sluta följa ämnen"
         also_dismiss_topics: "Sluta följa de här ämnena så att de aldrig syns som olästa för mig igen"
         dismiss_new: "Avfärda nya"
+        dismiss_new_modal:
+          title: "Avfärda nya"
+          topics: "Avfärda nya ämnen"
+          posts: "Avfärda nya inlägg"
+          untrack: "Sluta spåra dessa ämnen så att de inte längre visas i min lista över nya"
         dismiss_new_with_selected:
           one: "Avfärda nya (%{count})"
           other: "Avfärda nya (%{count})"
@@ -2598,9 +2649,11 @@ sv:
         bookmarks: "Du har inga bokmärkta ämnen ännu."
         category: "Det finns inga ämnen i %{category}."
         top: "Det finns inga toppämnen."
+        filter: "Det finns inga ämnen."
         educate:
           new: '<p>Dina nya ämnen hamnar här. Standard är att ämnen anses nya och kommer att visa en <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span>-indikator om de skapades de senaste 2 dagarna.</p><p>Gå till dina <a href="%{userPrefsUrl}">användarinställningar</a> för att ändra detta.</p>'
-          unread: "<p>Dina olästa ämnen visas här.</p><p>Som standard betraktas ämnen som olästa och visar olästa värden <span class=\"badge unread-posts badge-notification\">1</span> om du:</p><ul><li>skapade ämnet</li><li>svarade på ämnet</li><li>läste ämnet i mer än 4 minuter</li></ul><p>eller om du uttryckligen har satt ämnet till Följt eller Bevakat via \U0001F514 i varje ämne.</p><p>Gå till dina <a href=\"%{userPrefsUrl}\">inställningar</a> för att ändra detta.</p>"
+          unread: "<p>Dina olästa ämnen visas här.</p><p>Som standard betraktas ämnen som olästa och visar olästa värden <span class=\"badge unread-posts badge-notification\">1</span> om du:</p><ul><li>skapade ämnet</li><li>svarade på ämnet</li><li>läste ämnet i mer än 5 minuter</li></ul><p>eller om du uttryckligen har satt ämnet till Följt eller Bevakat via \U0001F514 i varje ämne.</p><p>Gå till dina <a href=\"%{userPrefsUrl}\">inställningar</a> för att ändra detta.</p>"
+          new_new: "<p>Dina nya ämnen kommer att visas här, och dina olästa ämnen kommer också att visas. Som standard betraktas ämnen som nya, med en <span class=\"badge new-topic badge-notification\" style=\"vertical-align:middle;line-height:inherit;\"></span>-indikator om de skapades under de senaste 2 dagarna. Olästa ämnen visar oläst-antalet <span class=\"badge unread-posts badge-notification\">1</span> om du: skapade ämnet, svarade på ämnet, läste ämnet i mer än 5 minuter eller om du uttryckligen har ställt in ämnet till Följt eller Bevakat via \U0001F514 i varje ämne.</p><p>Gå till dina <a href=\"%{userPrefsUrl}\">inställningar</a> för att ändra detta.</p>"
       bottom:
         latest: "Det finns inga fler senaste ämnen."
         posted: "Det finns inga fler postade ämnen."
@@ -2612,11 +2665,13 @@ sv:
         tag: "Det finns inga fler %{tag}-ämnen."
         top: "Det finns inga fler toppämnen."
         bookmarks: "Inga fler bokmärkta ämnen hittades."
+        filter: "Det finns inga fler ämnen."
     topic:
       filter_to:
         one: "%{count} inlägg i ämnet"
         other: "%{count} inlägg i ämnet"
       create: "Nytt ämne"
+      create_disabled_category: "Du får inte skapa ämnen i den här kategorin"
       create_long: "Skapa ett nytt ämne"
       open_draft: "Öppna utkast"
       private_message: "Skriv meddelande"
@@ -2663,6 +2718,7 @@ sv:
       read_more_in_category: "Vill du läsa mer? Bläddra bland andra ämnen i %{categoryLink} eller <a href='%{latestLink}'>visa senaste ämnen</a>."
       read_more: "Vill du läsa mer? <a href='%{categoryLink}'>Bläddra bland alla kategorier</a> eller <a href='%{latestLink}'>visa senaste ämnen</a>."
       unread_indicator: "Ingen medlem har läst det senaste inlägget ännu."
+      participant_groups: "Deltagargrupper"
       read_more_MF: |
         { HAS_UNREAD_AND_NEW, select,
           true {
@@ -2703,8 +2759,8 @@ sv:
       browse_all_categories_latest_or_top: "<a href='%{basePath}/categories'>Bläddra bland alla kategorier</a>, <a href='%{basePath}/latest'>visa senaste ämnen</a> eller se toppämnen:"
       browse_all_tags_or_latest: "<a href='%{basePath}/tags'>Bläddra bland alla taggar</a> eller <a href='%{basePath}/latest'>visa senaste ämnen</a>."
       suggest_create_topic: Redo att <a href>starta ett nytt samtal?</a>
-      jump_reply_up: hoppa till tidigare svar
-      jump_reply_down: hoppa till senare svar
+      jump_reply: "Hoppa till inläggets ursprungliga plats"
+      jump_reply_aria: "Hoppa till @%{username}s inlägg på dess ursprungliga plats"
       deleted: "Ämnet har raderats"
       slow_mode_update:
         title: "Långsamt läge"
@@ -2972,6 +3028,7 @@ sv:
         instructions:
           one: "Välj vilket ämne du vill flytta det inlägget till."
           other: "Välj vilket ämne du vill flytta de <b>%{count}</b> inläggen till."
+        chronological_order: "bevara kronologisk ordning efter sammanslagning"
       move_to_new_message:
         title: "Flytta till nytt meddelande"
         action: "flytta till nytt meddelande"
@@ -3059,6 +3116,7 @@ sv:
       ignored: "Ignorerat innehåll"
       wiki_last_edited_on: "wiki redigerades senast den %{dateTime}"
       last_edited_on: "inlägget redigerades senast den %{dateTime}"
+      edit_history: "inläggets redigeringshistorik"
       reply_as_new_topic: "Svara som länkat ämne"
       reply_as_new_private_message: "Svara som nytt meddelande till samma mottagare"
       continue_discussion: "Fortsätter diskussionen från %{postLink}:"
@@ -3070,8 +3128,8 @@ sv:
       sr_collapse_replies: "Förminska inbäddade svar"
       sr_date: "Datum för inlägg"
       sr_expand_replies:
-        one: "Detta inlägg har %{count} svar. Klicka för att utvidga"
-        other: "Detta inlägg har %{count} svar. Klicka för att utvidga"
+        one: "Detta inlägg har %{count} svar"
+        other: "Detta inlägg har %{count} svar"
       expand_collapse: "utvidga/förminska"
       sr_below_embedded_posts_description: "inlägg #%{post_number} svar"
       sr_embedded_reply_description: "svar från @%{username} på inlägg #%{post_number}"
@@ -3229,6 +3287,8 @@ sv:
           last: "Senaste versionen"
           hide: "Göm version"
           show: "Visa version"
+          destroy: "Ta bort versioner"
+          destroy_confirm: "Är du säker på att du vill ta bort alla versioner av det här inlägget? Denna åtgärd är permanent."
           revert: "Återgå till version %{revision}"
           edit_wiki: "Uppdatera Wiki"
           edit_post: "Ändra inlägg"
@@ -3262,6 +3322,7 @@ sv:
         updated: "Uppdaterade"
         name: "Namn"
         name_placeholder: "Vad används detta bokmärke till?"
+        name_input_label: "Namn på bokmärke"
         set_reminder: "Påminn mig"
         options: "Alternativ"
         actions:
@@ -3283,7 +3344,7 @@ sv:
       filtered_replies:
         viewing_posts_by: "Visar %{post_count} inlägg av"
         viewing_subset: "Vissa svar har förminskats"
-        viewing_summary: "Visar en sammanfattning av detta ämne"
+        viewing_summary: "Visa detta ämnes toppsvar"
         post_number: "%{username}, inlägg nr %{post_number}"
         show_all: "Visa alla"
       share:
@@ -3300,7 +3361,7 @@ sv:
       back: "Tillbaka till kategorin"
       general: "Allmänt"
       settings: "Inställningar"
-      topic_template: "Ämnesmall"
+      topic_template: "Mall"
       tags: "Taggar"
       tags_allowed_tags: "Begränsa dessa taggar till följande kategori:"
       tags_allowed_tag_groups: "Begränsa dessa tagg-grupper till denna kategori:"
@@ -3359,8 +3420,7 @@ sv:
       email_in: "Egenvald inkommande e-postadress:"
       email_in_tooltip: "Du kan skilja på flera e-postadresser med tecknet |."
       email_in_allow_strangers: "Ta emot e-post från anonyma användare utan konton"
-      email_in_disabled: "Att skapa nya ämnen via e-post är inaktiverat i webbplatsinställningarna. För att aktivera ämnen skapade via e-post "
-      email_in_disabled_click: 'aktiverar du inställningen "inkommande e-post".'
+      email_in_disabled: "Att lägga upp nya ämnen via e-post är inaktiverat. För att aktivera inlägg av nya ämnen via e-post, aktivera inställningen <a href='%{setting_url}'>'e-post in'</a>."
       mailinglist_mirror: "Kategorin speglar en e-postlista"
       show_subcategory_list: "Visa listan med underkategorier ovanför ämnen i denna kategori."
       read_only_banner: "Banderolltext när en användare inte kan skapa ett ämne i denna kategori:"
@@ -3387,6 +3447,7 @@ sv:
       default_slow_mode: 'Aktivera "Långsamt läge" för nya ämnen i denna kategori.'
       parent: "Överordnad kategori"
       num_auto_bump_daily: "Antalet öppnade ämnen för att dagligen automatiskt knuffa ett ämne:"
+      auto_bump_cooldown_days: "Minsta antal dagar innan samma ämne får knuffas:"
       navigate_to_first_post_after_read: "Navigera till första inlägget efter att ämnen är lästa"
       notifications:
         title: "ändra aviseringsnivå för denna kategori"
@@ -3472,7 +3533,9 @@ sv:
         inappropriate: "Det är olämpligt"
         spam: "Det är skräppost"
       custom_placeholder_notify_user: "Var specifik, var konstruktiv och var alltid trevlig."
+      notify_user_textarea_label: "Meddelande till användaren"
       custom_placeholder_notify_moderators: "Låt oss veta i detalj vad du är bekymrad över, och skicka om möjligt med relevanta länkar och exempel."
+      notify_moderators_textarea_label: "Meddelande till moderatorerna"
       custom_message:
         at_least:
           one: "skriv åtminstone %{count} tecken"
@@ -3568,6 +3631,10 @@ sv:
     filters:
       with_topics: "%{filter} ämnen"
       with_category: "%{filter} %{category} ämnen"
+      filter:
+        title: "Filter"
+        button:
+          label: "Filter"
       latest:
         title: "Senaste"
         title_with_count:
@@ -3638,7 +3705,6 @@ sv:
         this_week: "Vecka"
         today: "Idag"
     browser_update: 'Tyvärr stöds inte <a href="https://www.discourse.org/faq/#browser">din webbläsare</a>. Vänligen <a href="https://browsehappy.com">byt till en webbläsare som stöds</a> för att se innehåll, logga in och svara.'
-    safari_13_warning: Webbplatsen har fullt stöd för redigering av innehåll med webbläsare på iOS 12.5 och 13 till januari 2023. Därefter krävs iOS 14 eller senare. Äldre versioner av iOS kan då endast läsa förenklat innehåll. (<a href="https://meta.discourse.org/t/224747">mer information</a>)
     permission_types:
       full: "Skapa / svara / se"
       create_post: "Svara / se"
@@ -3653,6 +3719,20 @@ sv:
       close: "Stäng (Esc)"
       content_load_error: '<a href="%url%">Innehållet</a> kunde inte laddas.'
       image_load_error: '<a href="%url%">Bilden</a> kunde inte laddas.'
+    experimental_lightbox:
+      image_load_error: "Bilden kunde inte laddas."
+      screen_reader_image_title: "Bild %{current} av %{total}: %{title}"
+      buttons:
+        next: "Nästa (höger- eller ner-piltangent)"
+        previous: "Föregående (vänster- eller upp-piltangent)"
+        close: "Stäng (Esc)"
+        download: "Ladda ner bild"
+        newtab: "Öppna bilden i en ny flik"
+        zoom: "Zooma in/ut bilden (Z-tangent)"
+        rotate: "Rotera bilden (R-tangent)"
+        fullscreen: "Växla webbläsarens helskärmsläge (M-tangent)"
+        carousel: "Visa alla bilder i en karusell (A-nyckel)"
+        retry: "Försök att ladda bilden igen"
     cannot_render_video: Den här videon kan inte renderas eftersom din webbläsare inte stöder denna kodek.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
@@ -3700,6 +3780,7 @@ sv:
         title: "Skapar"
         return: "%{shortcut} Återgå till skaparen"
         fullscreen: "%{shortcut} Helskärmsläge för skaparen"
+        insert_current_time: "%{shortcut} Infoga aktuell tid"
       bookmarks:
         title: "Bokmärkning"
         enter: "%{shortcut} Spara och stäng"
@@ -3745,7 +3826,9 @@ sv:
         one: "Förtjänade den här utmärkelsen %{count} gång"
         other: "Förtjänade den här utmärkelsen %{count} gånger"
       granted_on: "Utfärdad %{date}"
-      others_count: "Andra med den här utmärkelsen (%{count})"
+      others_count:
+        one: "Beviljad till andra %{count} gång"
+        other: "Beviljad till andra %{count} gånger"
       title: Utmärkelser
       allow_title: "Du kan använda denna utmärkelse som en titel"
       multiple_grant: "Du kan förtjäna denna flera gånger"
@@ -3758,6 +3841,7 @@ sv:
       granted:
         one: "%{count} utfärdad"
         other: "%{count} utfärdade"
+      awarded: tilldelad
       select_badge_for_title: Välj en utmärkelse att använda som din titel
       none: "(ingen)"
       successfully_granted: "Beviljade %{badge} till %{username}"
@@ -3928,13 +4012,11 @@ sv:
     pause_notifications:
       title: "Pausa aviseringar för..."
       label: "Pausa aviseringar"
-      remaining: "%{remaining} kvar"
       options:
         half_hour: "30 minuter"
         one_hour: "1 timme"
         two_hours: "2 timmar"
         tomorrow: "Tills imorgon"
-        custom: "Anpassad"
       set_schedule: "Ange ett aviseringsschema"
     trust_levels:
       names:
@@ -3983,7 +4065,61 @@ sv:
       more: "Mer"
       all_categories: "Alla kategorier"
       all_tags: "Alla taggar"
+      categories_form_modal:
+        title: "Redigera kategorinavigering"
+        subtitle:
+          text: "så visar vi automatiskt de mest populära kategorierna på denna webbplats"
+        filter_placeholder: "Filterkategorier"
+        no_categories: "Det finns inga kategorier som matchar den angivna termen."
+      tags_form_modal:
+        title: "Redigera taggnavigering"
+        filter_placeholder: "Filtrera taggar"
+        no_tags: "Det finns inga taggar som matchar den angivna termen."
+        subtitle:
+          text: "så visar vi automatiskt den här webbplatsens topptaggar"
+      edit_navigation_modal_form:
+        deselect_button_text: "Avmarkera alla"
+        reset_to_defaults: "Återställ till standardvärden"
+        filter_dropdown:
+          all: "Alla"
+          selected: "Markerat"
+          unselected: "Avmarkerat"
       sections:
+        custom:
+          add: "Lägg till ett anpassat avsnitt"
+          edit: "Redigera anpassat avsnitt"
+          save: "Spara"
+          delete: "Radera"
+          delete_confirm: "Är du säker på att du vill radera det här avsnittet?"
+          reset_confirm: "Är du säker på att du vill återställa den här sektionen till standardvärdet?"
+          public: "Gör denna sektion offentligt och synligt för alla"
+          always_public: "Innehållet i det här avsnittet är alltid offentligt"
+          more_menu: "Menyn Mer"
+          links:
+            add: "Lägg till ytterligare en länk"
+            delete: "Ta bort länk"
+            reset: "Återställ till standard"
+            icon:
+              label: "Ikon"
+              validation:
+                blank: "Ikonen får inte vara tom"
+                maximum: "Ikonen måste vara kortare än %{count} tecken"
+            name:
+              label: "Namn"
+              validation:
+                blank: "Namnet får inte vara tomt"
+                maximum: "Namnet måste vara kortare än %{count} tecken"
+            value:
+              label: "Länk"
+              validation:
+                blank: "Länken får inte vara tom"
+                maximum: "Länken måste vara kortare än %{count} tecken"
+                invalid: "Formatet är ogiltigt"
+          title:
+            label: "Avsnittstitel"
+            validation:
+              blank: "Titeln får inte vara tom"
+              maximum: "Titeln måste vara kortare än %{count} tecken"
         about:
           header_link_text: "Om"
         messages:
@@ -3998,28 +4134,21 @@ sv:
             unread_with_count: "Oläst (%{count})"
             archive: "Arkiv"
         tags:
-          links:
-            add_tags:
-              content: "Lägg till taggar"
-              title: "Du har inte lagt till några taggar. Klicka för att komma igång."
           none: "Du har inte lagt till några taggar."
           click_to_get_started: "Klicka här för att komma igång."
           header_link_text: "Taggar"
           header_action_title: "Redigera ditt sidofälts taggar"
           configure_defaults: "Konfigurera standardvärden"
         categories:
-          links:
-            add_categories:
-              content: "Lägg till kategorier"
-              title: "Du har inte lagt till några kategorier. Klicka för att komma igång."
           none: "Du har inte lagt till några kategorier."
           click_to_get_started: "Klicka här för att komma igång."
           header_link_text: "Kategorier"
           header_action_title: "Redigera ditt sidofälts kategorier"
           configure_defaults: "Konfigurera standardvärden"
         community:
-          header_link_text: "Community"
-          header_action_title: "Skapa ett ämne"
+          edit_section:
+            sidebar: "Anpassa detta avsnitt"
+            header_dropdown: "Anpassa"
           links:
             about:
               content: "Om"
@@ -4030,8 +4159,8 @@ sv:
             badges:
               content: "Utmärkelser"
               title: "Alla utmärkelser som kan förtjänas"
-            everything:
-              content: "Allting"
+            topics:
+              content: "Ämnen"
               title: "Alla ämnen"
             faq:
               content: "Vanliga frågor och svar"
@@ -4044,6 +4173,7 @@ sv:
               title: "Lista över alla användare"
             my_posts:
               content: "Mina inlägg"
+              content_drafts: "Mina utkast"
               title: "Min senaste ämnesaktivitet"
               title_drafts: "Mina utkast som inte har publicerats"
               draft_count:
@@ -4053,11 +4183,43 @@ sv:
               content: "Granska"
               title: "Flaggade inlägg och andra objekt i kö"
               pending_count: "%{count} väntande"
+        global_section: "Globalt avsnitt, synligt för alla"
+      panels:
+        forum:
+          label: Forum
     welcome_topic_banner:
       title: "Skapa ditt välkomstämne"
       description: "Ditt välkomstämne är det första som nya medlemmar kommer att läsa. Tänk på det som din \"snabbpresentation\" eller \"målbeskrivning\". Låt alla veta vem den här gruppen är till för, vad de kan förvänta sig att hitta här och vad du vill att de ska göra först."
       button_title: "Börja redigera"
     until: "T.o.m.:"
+    char_counter:
+      exceeded: "Det maximala antalet tillåtna tecken har överskridits."
+    form_template_chooser:
+      select_template: "Välj formulärmallar"
+    form_templates:
+      errors:
+        valueMissing:
+          default: "Fyll i detta fält."
+          text: "Fyll i detta fält."
+          select-one: "Välj ett objekt i listan."
+          select-multiple: "Välj minst ett objekt i listan."
+          checkbox: "Markera den här rutan om du vill fortsätta."
+        typeMismatch:
+          default: "Ange ett giltigt värde."
+          color: "Ange en färg."
+          date: "Ange ett datum."
+          email: "Vi ber dig ange en giltig e-postadress."
+          number: "Ange ett tal."
+          password: "Ange ett giltigt lösenord."
+          tel: "Ange ett giltigt telefonnummer."
+          text: "Ange ett textvärde."
+          url: "Ange en giltig URL."
+        tooShort: "Inmatningen måste vara %{minLength} tecken eller längre."
+        tooLong: "Inmatningen måste vara kortare än %{maxLength} tecken."
+        rangeOverflow: "Inmatningen måste vara mindre än %{max}."
+        rangeUnderflow: "Inmatningen måste vara mer än %{min}."
+        patternMismatch: "Matcha det begärda formatet."
+        badInput: "Ange en giltig inmatning."
   admin_js:
     type_to_filter: "skriv för att filtrera..."
     admin:
@@ -4216,10 +4378,14 @@ sv:
         about: "Redigera dina gruppmedlemskap och -namn här."
         group_members: "Gruppmedlemmar"
         delete: "Radera"
-        delete_confirm: "Är du säker på att du vill ta bort den här gruppen?"
+        delete_confirm: "Är du säker på att du vill radera %{group}?"
+        delete_details:
+          one: "%{count} person kommer att förlora åtkomst till denna grupp"
+          other: "%{count} personer kommer att förlora åtkomst till denna grupp"
         delete_with_messages_confirm:
-          one: "Om du raderar den här gruppen blir %{count} meddelande ägarlöst, och gruppmedlemmarna får inte längre tillgång till det."
-          other: "Om du raderar den här gruppen blir %{count} meddelanden ägarlösa, och gruppmedlemmarna får inte längre tillgång till dem."
+          one: "%{count} meddelande kommer att bli otillgängligt för gruppmedlemmar"
+          other: "%{count} meddelanden kommer att bli otillgängligt för gruppmedlemmar"
+        delete_warning: "Det går inte att återställa raderade grupper"
         delete_failed: "Det går inte att ta bort grupp. Om det här är en automatisk grupp så kan den inte raderas."
         delete_automatic_group: Detta är en automatisk grupp och kan inte raderas.
         delete_owner_confirm: "Vill du ta bort användarprivilegier för '%{username}'?"
@@ -4285,10 +4451,16 @@ sv:
             topics:
               read: Läs ett ämne eller ett specifikt inlägg i det. RSS stöds också.
               write: Skapa ett nytt ämne eller inlägg till en befintligt sådan.
-              update: Uppdatera ett ämne. Ändra titel, kategori, taggar, etc.
+              update: Uppdatera ett ämne. Ändra titel, kategori, taggar, status, arketyp, featured_link etc.
+              delete: Ta bort ett ämne.
               read_lists: Läs ämneslistor som topp, ny, senaste osv. RSS stöds också.
+              status: "Uppdatera ett ämnes status. Status: stängt, arkiv, synligt, fäst. Aktiverad: sant, falskt. Ange ett kategori-id här och i förfrågans nyttolast för att endast tillåta statusändringar för ämnen i den kategorin."
             posts:
               edit: Redigera ett inlägg eller ett specifikt inlägg.
+              delete: Ta bort ett inlägg.
+              list: Lista över senaste inlägg och privata inlägg. RSS stöds också.
+            tags:
+              list: Lista etiketter
             categories:
               list: Hämta en lista över kategorier.
               show: Hämta en enskild kategori efter id.
@@ -4302,6 +4474,7 @@ sv:
               update: Uppdatera information om användarprofil.
               log_out: Logga ut alla sessioner för en användare.
               anonymize: Anonymisera användarkonton.
+              suspend: Stäng av användarkonton.
               delete: Ta bort användarkonton.
               list: Få en lista över användare.
             user_status:
@@ -4309,6 +4482,8 @@ sv:
               update: Uppdatera användarstatistik.
             email:
               receive_emails: Kombinera detta omfång med e-postmottagaren för att bearbeta inkommande e-post.
+            invites:
+              create: Skicka e-postinbjudningar eller generera inbjudningslänkar.
             badges:
               create: Skapa ett nytt märke.
               show: Hämta information om ett märke.
@@ -4317,6 +4492,12 @@ sv:
               list_user_badges: Lista användarens märken.
               assign_badge_to_user: Tilldela ett märke till en användare.
               revoke_badge_from_user: Återkalla ett märke från en användare.
+            groups:
+              manage_groups: Lista, lägg till och ta bort gruppmedlemmar.
+              administer_groups: Lista, visa, skapa, uppdatera och ta bort grupper.
+            search:
+              show: Sök med slutpunkten `/search.json?q=term`.
+              query: Sök med slutpunkten `/search/query?term=term`.
             wordpress:
               publishing: Nödvändigt för WP Discourse-tilläggets publiceringsfunktioner (krävs).
               commenting: Nödvändigt för WP Discourse-tilläggets kommentarsfunktioner.
@@ -4383,8 +4564,8 @@ sv:
           name: "Användarfrämjande händelse"
           details: "När en användare befordras från en förtroendenivå till en annan."
         user_badge_event:
-          name: "Utmärkelsetilldelning"
-          details: "När en användare får en utmärkelse."
+          name: "Utmärkelsehändelse"
+          details: "När en utmärkelse beviljas eller återkallas."
         group_user_event:
           name: "Gruppanvändarhändelse"
           details: "När en användare läggs till i, eller tas bort från, en grupp."
@@ -4427,7 +4608,7 @@ sv:
         enabled: "Aktiverad?"
         is_enabled: "J"
         not_enabled: "N"
-        change_settings: "Ändra inställningar"
+        change_settings: "Plugin-inställningar"
         change_settings_short: "Inställningar"
         howto: "Hur installerar jag tillägg?"
         official: "Officiellt tillägg"
@@ -4681,6 +4862,9 @@ sv:
           embedded_scss:
             text: "Inbäddad CSS"
             title: "Ange anpassad CSS som ska levereras med inbäddad version av kommentarer"
+          embedded_header:
+            text: "Inbäddad rubrik"
+            title: "Ange HTML som ska visas ovanför den inbäddade versionen av kommentarerna"
           color_definitions:
             text: "Färgdefinitioner"
             title: "Ange anpassade färgdefinitioner (endast avancerade användare)"
@@ -4759,6 +4943,12 @@ sv:
           love:
             name: "älska"
             description: "Gillaknappens färg."
+          selected:
+            name: "markerad"
+            description: "Bakgrundsfärgen för element som listobjekt när de är markerade/aktiva."
+          hover:
+            name: "hovra"
+            description: "Bakgrundsfärgen för element som listobjekt när de hovras eller har tangentbordsfokus."
         robots:
           title: "Åsidosätt din sidas robots.txt-fil:"
           warning: "Detta kommer att permanent åsidosätta alla relaterade webbplatsinställningar."
@@ -4889,6 +5079,7 @@ sv:
           no_previous: "Det finns inget tidigare värde."
           deleted: "Inget nytt värde. Registreringen raderades."
           actions:
+            permanently_delete_post_revisions: "radera inläggsversioner permanent"
             delete_user: "radera användare"
             change_trust_level: "ändra förtroendenivå"
             change_username: "ändra användarnamn"
@@ -4922,6 +5113,7 @@ sv:
             revoke_moderation: "återkalla moderering"
             backup_create: "Skapa en säkerhetskopia"
             deleted_tag: "raderad tagg"
+            update_directory_columns: "uppdatera katalogkolumner"
             deleted_unused_tags: "radera oanvända taggar"
             renamed_tag: "omdöpt tagg"
             revoke_email: "återkalla e-post"
@@ -4980,6 +5172,10 @@ sv:
             delete_group: "radera grupp"
             watched_word_create: "lägg till bevakat ord"
             watched_word_destroy: "radera bevakat ord"
+            create_public_sidebar_section: "skapa offentlig sektion i sidopanel"
+            update_public_sidebar_section: "uppdatera offentlig sektion i sidopanel"
+            destroy_public_sidebar_section: "förstöra doffentlig sektion i sidopanel"
+            reset_bounce_score: "återställ antalet studsar"
         screened_emails:
           title: "Kontrollerade e-postadresser"
           description: "När någon försöker skapa ett nytt konto, kommer följande e-postadresser att kontrolleras och registreringen blockeras, eller någon annan åtgärd vidtas."
@@ -5043,14 +5239,14 @@ sv:
           silence: "Tysta"
           link: "Länk"
         action_descriptions:
-          block: "Förhindra att inlägg med dessa ord publiceras. Användaren kommer att se ett felmeddelande när de försöker skicka inlägget."
-          censor: "Tillåt inlägg med dessa ord, men ersätt orden med tecken som döljer det censurerade orden."
-          require_approval: "Inlägg som innehåller dessa ord kommer att behöva godkännande av personal innan de visas."
-          flag: "Tillåt inlägg med dessa ord, men flagga orden som olämpliga så att moderatorer kan granska dem."
-          replace: "Ersätt ord i inlägg med andra ord"
-          tag: "Tagga ämnen automatiskt baserat på första inlägget"
-          silence: "Användares första inlägg som innehåller dessa ord kommer att kräva godkännande av personalen innan de kan ses och användaren kommer automatiskt att tystas."
-          link: "Ersätt ord i inlägg med länkar"
+          block: "Ett felmeddelande kommer att visas när du försöker skapa ett inlägg som innehåller dessa ord."
+          censor: "Tillåt inlägg som innehåller dessa ord, men ersätt orden med tecken som döljer det censurerade orden."
+          require_approval: "Kräv personalens godkännande för inlägg som innehåller dessa ord innan de blir synliga för andra."
+          flag: "Tillåt inlägg som innehåller dessa ord, men flagga dem som olämpliga för granskning av moderatorer."
+          replace: "Ersätt ord i inlägg med andra ord."
+          tag: "Tagga ämnen automatiskt om det första inlägget innehåller ett specifikt ord."
+          silence: "Tysta nya konton om deras allra första inlägg innehåller något av dessa ord. Inlägget döljs automatiskt tills personalen godkänner det."
+          link: "Ersätt ord i inlägg med länkar."
         form:
           label: "Har ord eller fras"
           placeholder: "Ange ord eller fras (* är ett jokertecken)"
@@ -5073,6 +5269,88 @@ sv:
           description: "Ange text nedan för att leta efter matchningar med bevakade ord"
           found_matches: "Hittade matchande:"
           no_matches: "Hittades inga matchningar"
+      form_templates:
+        nav_title: "Mallar"
+        title: "Formulärmallar"
+        help: "Skapa en mallstruktur som kan användas för att skapa nya ämnen, inlägg och meddelanden."
+        new_template: "Ny mall"
+        list_table:
+          headings:
+            name: "Namn"
+            active_categories: "Aktiva kategorier"
+            actions: "Åtgärder"
+          actions:
+            view: "Visa mall"
+            edit: "Redigera mall"
+            delete: "Ta bort mall"
+        view_template:
+          close: "Stäng"
+          edit: "Redigera"
+          delete: "Radera"
+          toggle_preview: "Växla förhandsgranskning"
+        new_template_form:
+          submit: "Spara"
+          cancel: "Avbryt"
+          name:
+            label: "Mallens namn"
+            placeholder: "Ange ett namn för den här mallen..."
+          template:
+            label: "Mall"
+            placeholder: "Skapa en YAML-mall här..."
+          preview: "Förhandsgranska"
+        delete_confirm: "Är du säker på att du vill ta bort den här mallen?"
+        quick_insert_fields:
+          add_new_field: "Lägg till"
+          checkbox: "Kryssruta"
+          input: "Kort svar"
+          textarea: "Långt svar"
+          dropdown: "Rullgardinsmeny"
+          upload: "Ladda upp en fil"
+          multiselect: "Flera val"
+        validations_modal:
+          button_title: "Valideringar"
+          modal_title: "Valideringsalternativ"
+          table_headers:
+            key: "Key"
+            type: "Typ"
+            description: "Beskrivning"
+          validations:
+            required:
+              key: "krävs"
+              type: "booleskt"
+              description: "Fältet måste fyllas i för att formuläret ska kunna skickas in."
+            minimum:
+              key: "minst"
+              type: "heltal"
+              description: "För textfält anges det minsta tillåtna antalet tecken."
+            maximum:
+              key: "maximalt"
+              type: "heltal"
+              description: "För textfält anges det största tillåtna antalet tecken."
+            pattern:
+              key: "mönster"
+              type: "regex-sträng"
+              description: "För textfält är detta ett reguljärt uttryck som anger tillåten inmatning."
+            type:
+              key: "typ"
+              type: "sträng"
+              description: "För inmatningsfält kan du ange vilken typ av inmatning som bör förväntas (text|e-post|datum|nummer|url|tel|färg)"
+        preview_modal:
+          title: "Förhandsgranskningsmall"
+        field_placeholders:
+          validations: "ange valideringar här"
+          label: "Ange etikett här"
+          placeholder: "Ange platshållare här"
+          none_label: "Välj ett föremål"
+          choices:
+            first: "Alternativ 1"
+            second: "Alternativ 2"
+            third: "Alternativ 3"
+        edit_category:
+          toggle_freeform: "formulärmall inaktiverad"
+          toggle_form_template: "formulärmall aktiverad"
+          select_template: "Välj formulärmallar"
+          select_template_help: "Lägg till/redigera formulärmallar"
       impersonate:
         title: "Imitera"
         help: "Använd det här verktyget för att imitera ett användarkonto för felsökningssyften. Du kommer behöva logga ut när du är klar."
@@ -5085,6 +5363,7 @@ sv:
         not_found: "Det användarnamnet finns tyvärr inte i vårt system."
         id_not_found: "Detta användar-ID finns tyvärr inte i vårt system."
         active: "Aktiverad"
+        status: "Status"
         show_emails: "Visa e-post"
         hide_emails: "Dölj e-post"
         nav:
@@ -5173,7 +5452,6 @@ sv:
         show_admin_profile: "Administratör"
         manage_user: "Hantera användare"
         show_public_profile: "Visa offentlig profil"
-        impersonate: "Imitera"
         action_logs: "Åtgärdslogg"
         ip_lookup: "Slå upp IP-adress"
         log_out: "Logga ut"
@@ -5409,8 +5687,16 @@ sv:
         go_back: "Tillbaka till sökningen"
         recommended: "Vi rekommenderar att du anpassar följande texter:"
         show_overriden: "Visa bara överskrivna"
+        show_outdated: "Visa endast inaktuella/ogiltiga"
         locale: "Språk:"
         more_than_50_results: "Det blev fler än 50 resultat. Förfina din sökning."
+        interpolation_keys: "Tillgängliga interpolationsnycklar:"
+        outdated:
+          title: "Denna översättning är inaktuell"
+          description: "Standardöversättningen för denna nyckel har ändrats sedan denna åsidosättning skapades. Kontrollera nedan att din översättning matchar alla ändringar av den ursprungliga avsikten."
+          old_default: "Gammal standard"
+          new_default: "Ny standard"
+          dismiss: "Avfärda"
       settings:
         show_overriden: "Visa bara överskrivna"
         history: "Visa ändringshistorik"
@@ -5423,7 +5709,9 @@ sv:
             label: "Lägg till emoji"
         title: "Webbplatsinställningar"
         no_results: "Inga resultat hittades."
-        more_than_30_results: "Det är fler än 30 resultat. Förfina din sökning eller välj en kategori."
+        more_site_setting_results:
+          one: "Det är över %{count} resultat. Förfina din sökning eller välj en kategori."
+          other: "Det är över %{count} resultat. Förfina din sökning eller välj en kategori."
         clear_filter: "Rensa"
         add_url: "lägg till URL"
         add_host: "lägg till värd"
@@ -5510,7 +5798,8 @@ sv:
         allow_title: Tillåt att utmärkelse används som titel
         multiple_grant: Kan utfärdas flera gånger
         listable: Visa utmärkelse på den offentliga utmärkelsesidan
-        enabled: Aktivera utmärkelse
+        enabled: aktiverad
+        disabled: inaktiverade
         icon: Ikon
         image: Bild
         graphic: Grafik
@@ -5580,10 +5869,14 @@ sv:
       embedding:
         get_started: "Börja genom att lägga till värden, om du vill bädda in Discourse på en annan hemsida. "
         confirm_delete: "Är du säker på att du vill ta bort värden?"
-        sample: "Klistra in följande HTML-kod på din webbplats för att skapa och bädda in Discourse-ämnen. Byt ut <b>REPLACE_ME</b> mot den vägledande URL-en för sidan som du bäddar in den i."
+        sample: |
+          <p>Klistra in följande HTML-kod på din webbplats för att skapa och bädda in Discourse-ämnen. Ersätt <b>EMBED_URL</b> med den kanoniska webbadressen till sidan du bäddar in den på.</p>
+
+          <p>Om du vill anpassa stilen, avkommentera och ersätt <b>CLASS_NAME</b> med en CSS-klass som definierats i <i>Embedded CSS</i> i ditt tema.</p>
+
+          <p>Ersätt <b>DISCOURSE_USERNAME</b> med Discourse-användarnamnet för författaren som ska skapa ämnet. Discourse kommer automatiskt att söka efter användaren med <code>&lt;meta&gt;</code> taggarnas <code>innehåll</code> sattribut med <code>namn</code>attributet inställt på <code>discourse-användarnamn</code> eller <code>författare</code>. Parametern <code>discourseUserName</code> har fasats ut och kommer att tas bort i Discourse 3.2.</p>
         title: "Inbäddning"
         host: "Tillåtna värdar"
-        class_name: "Klassnamn"
         allowed_paths: "Sökväg till vitlista"
         edit: "ändra"
         category: "Inlägg till kategori"
diff --git a/config/locales/client.sw.yml b/config/locales/client.sw.yml
index 20bab692245..ae49ea67882 100644
--- a/config/locales/client.sw.yml
+++ b/config/locales/client.sw.yml
@@ -141,8 +141,6 @@ sw:
     emails_are_disabled: "Utumaji wa barua pepe umezuiliwa na msimamizi. Hakuna taarifa za utumwaji wa barua pepe zitakazotumwa."
     software_update_prompt:
       dismiss: "Ondosha"
-    bootstrap_mode_disabled: "Halitumizi ya Bootstrap itasitishwa baada ya masaa 24."
-    bootstrap_invite_button_title: "Tuma Mialiko"
     themes:
       default_description: "Halisi"
     s3:
@@ -224,7 +222,6 @@ sw:
       title: "Alamisho"
       clear_bookmarks: "Futa Maalamisho"
       help:
-        bookmark: "Bonyeza kualamisha chapisho la kwanza kwenye mada hii"
         unbookmark: "Bofya kuondoa mialamisho yote kwenye mada hii"
     bookmarks:
       not_bookmarked: "alamisha chapisho hili"
@@ -305,8 +302,7 @@ sw:
         refresh: "Rudisha Tena"
         category: "Kategoria"
       scores:
-        date: "Tarehe"
-        type: "Aina"
+        type: "Sababu"
       statuses:
         pending:
           title: "subiria"
@@ -314,6 +310,8 @@ sw:
           title: "Wamekubaliwa"
         rejected:
           title: "Imekataliwa"
+      context_question:
+        delimiter: "au"
       types:
         reviewable_user:
           title: "Mtumiaji"
@@ -584,11 +582,6 @@ sw:
       profile: "Maelezo Mafupi "
       mute: "Nyamazisha"
       edit: "Hariri Mapendekezo"
-      download_archive:
-        button_text: "Pakua Zote"
-        confirm: "Una uhakika unataka kupakua machapisho yako?"
-        success: "Upakuaji umeanza, utajulishwa kwa njia ya ujumbe mfumo ukimaliza."
-        rate_limit_error: "Machapisho yanaweza kupakuliwa mara moja kwa siku, tafadhali jaribu tena kesho."
       new_private_message: "Ujumbe Mpya"
       private_message: "Ujumbe"
       private_messages: "Ujumbe"
@@ -697,12 +690,6 @@ sw:
       theme: "Mandhari"
       home: "Chaguo-msingi mwanzo"
       staged: "Sehemu ya kujaribu"
-      staff_counters:
-        flags_given: "bendera za usaidizi"
-        flagged_posts: "Machapisho yenye bendera."
-        deleted_posts: "Machapisho yaliyofutwa"
-        suspensions: "masitisho"
-        warnings_received: "maonyo"
       messages:
         inbox: "Kisanduku-pokezi"
         latest: "Hivi Karibuni"
@@ -742,8 +729,6 @@ sw:
       second_factor_backup:
         regenerate: "Tengeneza Upya"
         disable: "Sitisha"
-        enable: "Wezesha"
-        enable_long: "Wezesha kodi za backup"
         copy_to_clipboard: "Umenakili kwenye Ubao Nakili"
         copy_to_clipboard_error: "Makosa kwenye Kunakili"
         copied_to_clipboard: "Nakili"
@@ -1043,8 +1028,6 @@ sw:
       sign_up: "Jiunge"
       hide_forever: "hapana asante"
     summary:
-      enabled_description: "Unaangalia muhtasari wa hii mada; machapisho yote yanayovutia yanachaguliwa na jukwaa."
-      enable: "Tengeneza Muhtasari wa Hii Mada."
       disable: "Onyesha Machapisho Yote"
     deleted_filter:
       enabled_description: "Mada hii ina machapisho yaliyofutwa, ambayo yamefichwa."
@@ -1215,8 +1198,6 @@ sw:
         title_missing: "Kichwa cha habari ni muhimu"
         category_missing: "Ni sharti uchague kategoria"
       save_edit: "Hifadhi Uhariri"
-      reply_original: "Jibu kwenye Mada ya Kwanza"
-      reply_here: "Jibu hapa"
       reply: "Jibu"
       cancel: "Ghairi"
       create_topic: "Unda mada"
@@ -1527,8 +1508,6 @@ sw:
       back_to_list: "Rudi tena kwenye Orodha ya Mada"
       options: "Machaguo ya Mada"
       show_links: "onyesha viungo ndani ya hii mada"
-      jump_reply_up: fikia jibu la awali
-      jump_reply_down: fikia jibu la baadaye
       deleted: "Mada imefutwa"
       slow_mode_update:
         enable: "Ruhusu"
@@ -1872,7 +1851,6 @@ sw:
       view: "Angalia Mada kwenye Kategoria"
       general: "Jumla"
       settings: "Mipangilio"
-      topic_template: "kiolezo cha kawaida"
       tags: "Lebo"
       tags_placeholder: "(Sio muhimu) orodha ya lebo zilizoruhusiwa."
       tag_groups_placeholder: "(Sio muhimu) orodha ya vikundi vyenye lebo zilizoruhusiwa."
@@ -1909,8 +1887,6 @@ sw:
       images: "Picha"
       email_in: "Barua Pepe inayoingia:"
       email_in_allow_strangers: "Pokea barua pepe kutoka kwa watumiaji wasiojulikana ambao hawana akaunti"
-      email_in_disabled: "Uchapishaji wa mada mpya kupitia barua pepe umesitishwa kwenye Mipangilio ya Tovuti. Kuruhusu uchapishaji wa mada mpya kupitia barua pepe,"
-      email_in_disabled_click: 'ruhusu mpangilio wa "barua pepe ndani"'
       num_featured_topics: "Idadi ya mada zitakazo onyeshwa ndani ya ukurasa wa kategoria:"
       all_topics_wiki: "Hifadhi mada mpya kama chaguo msingi"
       sort_order: "Orodha ya Maneno Imepangwa Kulingana Na:"
@@ -2038,6 +2014,10 @@ sw:
     filters:
       with_topics: "mada %{filter}"
       with_category: "mada %{filter}%{category}"
+      filter:
+        title: "Chuja"
+        button:
+          label: "Chuja"
       latest:
         title: "Hivi Karibuni"
         title_with_count:
@@ -2160,7 +2140,6 @@ sw:
         print: "%{shortcut} Chapisha mada:"
     badges:
       granted_on: "Imetolewa %{date}"
-      others_count: "Wengine wenye hii beji (%{count})"
       title: Beji
       allow_title: "Unaweza kutumia beji hii kama cheo"
       multiple_grant: "Unaweza kuipata mara nyingi"
@@ -2247,9 +2226,6 @@ sw:
       back: "Nyuma"
       share: "Shirikisha"
       dismiss: "Ondosha"
-    pause_notifications:
-      options:
-        custom: "Binafsi"
     trust_levels:
       names:
         newuser: "mtumiaji mpya"
@@ -2266,7 +2242,18 @@ sw:
         other: "Mada mpya %{count} "
       more: "Zaidi"
       all_categories: "Kategoria Zote"
+      edit_navigation_modal_form:
+        filter_dropdown:
+          all: "Vyote"
       sections:
+        custom:
+          save: "Hifadhi"
+          delete: "Futa"
+          links:
+            icon:
+              label: "ikoni"
+            name:
+              label: "Jina"
         about:
           header_link_text: "Kuhusu"
         messages:
@@ -2283,7 +2270,8 @@ sw:
         categories:
           header_link_text: "Kategoria"
         community:
-          header_link_text: "Jumuiya"
+          edit_section:
+            header_dropdown: "Geuza Kukufaa"
           links:
             about:
               content: "Kuhusu"
@@ -2291,6 +2279,8 @@ sw:
               content: "Msimamizi"
             badges:
               content: "Beji"
+            topics:
+              content: "Mada"
             faq:
               content: "FAQ"
             groups:
@@ -2299,6 +2289,11 @@ sw:
               content: "Watumiaji"
             my_posts:
               content: "Machapisho Yangu"
+    form_templates:
+      errors:
+        typeMismatch:
+          default: "Tafadhali andika thamani sahihi."
+          email: "Andika barua pepe iliyo sahihi."
   admin_js:
     type_to_filter: "andika kuchuja..."
     admin:
@@ -2496,7 +2491,6 @@ sw:
         enabled: "Imeruhusiwa?"
         is_enabled: "N"
         not_enabled: "H"
-        change_settings: "Badilisha Mipangilio"
         change_settings_short: "Mipangilio"
         howto: "Ninawekaje programu-jalizi?"
         official: "Programu-jalizi Rasmi"
@@ -2690,6 +2684,8 @@ sw:
           love:
             name: "upendo"
             description: "Rangi ya kitufe cha upendo."
+          selected:
+            name: "imechaguliwa"
         email_style:
           css: "CSS"
       email:
@@ -2890,11 +2886,6 @@ sw:
           require_approval: "Inahitaji Uthibitisho"
           flag: "Bendera"
           silence: "Imenyamazishwa"
-        action_descriptions:
-          block: "Zuia machapisho yenye maneno haya kuchapishwa. Mtumiaji ataona ujumbe wa hitilafu akijaribu kuwasilisha chapisho."
-          censor: "Ruhusu machapisho yenye maneno yafuatayo, lakini badilisha maneno hayo na herufi zinazoficha maneno yanayokatazwa."
-          require_approval: "Machapicho yenye maneno yafuatayo yatahitaji kibali kutoka kwa wafanyakazi kabla hayajaonwa."
-          flag: "Ruhusu machapisho yawe na maneno haya, ila ripoti kuonyesha kuwa hazifai ili wasimamizi waweze kuzikagua."
         form:
           placeholder_regexp: "muonekano wa kawaida"
           link_placeholder: "https://example.com"
@@ -2905,6 +2896,32 @@ sw:
         test:
           button_label: "Majaribio"
           no_matches: "Hakuna uwiano uliopatikana"
+      form_templates:
+        nav_title: "Violezo"
+        list_table:
+          headings:
+            name: "Jina"
+            actions: "Vitendo"
+        view_template:
+          close: "Funga"
+          edit: "Hariri"
+          delete: "Futa"
+        new_template_form:
+          submit: "Hifadhi"
+          cancel: "Ghairi"
+          preview: "Kihakiki"
+        quick_insert_fields:
+          add_new_field: "ongeza"
+          dropdown: "Shusha Chini"
+        validations_modal:
+          table_headers:
+            type: "Aina"
+            description: "Elezo"
+          validations:
+            required:
+              key: "muhimu"
+            type:
+              key: "aina"
       impersonate:
         title: "Iga Utambulisho"
         help: "Tumia kifaa hiki kuiga utambulisho wa mtumiaji ili uweze kutatua matatizo. Itabidi utoke ukishamaliza."
@@ -2978,7 +2995,6 @@ sw:
         staged: "Sehemu ya kujaribu?"
         show_admin_profile: "Msimamizi"
         show_public_profile: "Onyesha Taarifa za Umma"
-        impersonate: "Chukua Utambulisho wa Mtu Mwingine"
         action_logs: "Taarifa za Shughuli Tofauti"
         ip_lookup: "Uangalizi wa anwani ya mtandao"
         log_out: "Jitoe"
@@ -3150,6 +3166,8 @@ sw:
         go_back: "Rudi kwenye Utafiti"
         recommended: "Tunakushauri ugeuze maneno yafuatayo yaweze kufaa mahitaji yako:"
         show_overriden: "Onyesha vilivyobatilishwa pekee"
+        outdated:
+          dismiss: "Ondosha..."
       settings:
         show_overriden: "Onyesha vilivyobatilishwa pekee"
         reset: "weka au anza upya"
@@ -3230,7 +3248,8 @@ sw:
         allow_title: Ruhusu beji iweze kutumika kama cheo
         multiple_grant: Inaweza kutolewa mara nyingi
         listable: Onyesha beji kwenye karatasi ya beji ya umma
-        enabled: Ruhusu beji
+        enabled: imeruhusiwa
+        disabled: imezuiwa
         icon: ikoni
         image: Picha
         query: Maswala ya Beji (SQL)
@@ -3271,7 +3290,6 @@ sw:
         confirm_delete: "Una uhakika unataka kumfuta mwenyeji?"
         title: "Ambatanisha"
         host: "Ruhusu Wenyeji"
-        class_name: "Jina la Class"
         edit: "hariri"
         category: "Andika kwenye Kikundi"
         add_host: "Ongeza Mwenyeji"
diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml
index fd1511ed9e7..fb24f24e40b 100644
--- a/config/locales/client.te.yml
+++ b/config/locales/client.te.yml
@@ -100,7 +100,6 @@ te:
     share:
       close: "మూసివేయి"
     emails_are_disabled: "బయటకు వెళ్లే అన్ని ఈమెయిల్లూ అధికారి నిశేధించాడు. ఇప్పుడు ఎటువంటి ఈమెయిల్ ప్రకటనలూ పంపవీలవదు."
-    bootstrap_invite_button_title: "ఆహ్వానాలు పంపు"
     themes:
       default_description: "అప్రమేయ"
     edit: "ఈ విషయపు శీర్షిక మరియు వర్గం సవరించు"
@@ -162,7 +161,6 @@ te:
       title: "పేజీక"
       clear_bookmarks: "పేజీక లను తుడిచివేయి"
       help:
-        bookmark: "ఈ అంశంపై మొదటి టపాకి పేజీకలను పెట్టండి"
         unbookmark: "ఈ అంశంపై అన్ని పేజీకలను తొలగించడానికి నొక్కండి"
     bookmarks:
       not_bookmarked: "ఈ టపాకు పేజీక ఉంచు"
@@ -210,10 +208,12 @@ te:
         refresh: "తాజా పరుచు"
         category: "వర్గం"
       scores:
-        type: "రకం"
+        type: "కారణం"
       statuses:
         pending:
           title: "పెండింగు"
+      context_question:
+        delimiter: "లేదా"
       types:
         reviewable_user:
           title: "సభ్యుడు"
@@ -378,9 +378,6 @@ te:
       profile: "ప్రవర"
       mute: "నిశ్శబ్దం"
       edit: "అభిరుచులు సవరించు"
-      download_archive:
-        confirm: "మీరు నిజంగా మీ టపాల దిగుమతి కోరుకుంటున్నారా ?"
-        rate_limit_error: "టపాలు కేవలం రోజుకు ఒకసారి మాత్రమే దిగుమతించుకోగలరు. దయచేసి రేపు ప్రయత్నించండి."
       private_messages: "సందేశాలు"
       user_notifications:
         filters:
@@ -433,12 +430,6 @@ te:
       muted_users: "నిశ్శబ్దం"
       tracked_topics_link: "చూపు"
       theme: "అలంకారం"
-      staff_counters:
-        flags_given: "సహాయకారి కేతనాలు"
-        flagged_posts: "కేతనించిన టపాలు"
-        deleted_posts: "తొగలించిన టపాలు"
-        suspensions: "సస్పెన్షన్లు"
-        warnings_received: "హెచ్చరికలు"
       messages:
         inbox: "ఇన్ బాక్స్"
         latest: "తాజా"
@@ -464,7 +455,6 @@ te:
       second_factor_backup:
         regenerate: "పునరుత్పత్తించు"
         disable: "అచేతనం"
-        enable: "చేతనం"
       second_factor:
         name: "పేరు"
         disable: "అచేతనం"
@@ -650,8 +640,6 @@ te:
     signup_cta:
       sign_up: "సైన్ అప్"
     summary:
-      enabled_description: "మీరు ఈ విషయపు సారాంశము చదువుతున్నారు. ఆసక్తికర టపాలు కమ్యునిటీ ఎంచుకుంటుంది. "
-      enable: "ఈ విషయాన్ని సంగ్రహించు"
       disable: "అన్ని టపాలూ చూపు"
     deleted_filter:
       enabled_description: "ఈ విషయం తొలగించిన టపాలు కలిగి ఉంది. అవి దాయబడ్డాయి."
@@ -733,8 +721,6 @@ te:
         title_missing: "శీర్షిక తప్పనిసరి"
         category_missing: "మీరు ఒక వర్గాన్ని ఎంచుకోవాలి"
       save_edit: "దాచి సవరించు"
-      reply_original: "మూల విషయంకు జవాబివ్వు"
-      reply_here: "ఇక్కడ జవాబివ్వు"
       reply: "జవాబు"
       cancel: "రద్దుచేయి"
       title_placeholder: "ఈ చర్చ దేనిగురించో ఒక లైనులో చెప్పండి?"
@@ -879,8 +865,6 @@ te:
       back_to_list: "విషయాల జాబితాకు మరలు"
       options: "విషయపు ఐచ్చికాలు"
       show_links: "ఈ విషయంలో లంకెలు చూపు"
-      jump_reply_up: పాత జవాబుకు వెళ్లు
-      jump_reply_down: తరువాతి జవాబుకు వెళ్లు
       deleted: "ఈ విషయం తొలగించబడింది"
       slow_mode_update:
         enable: "చేతనం"
@@ -1108,8 +1092,6 @@ te:
       images: "బొమ్మలు"
       email_in: "అనురూప లోపలికి వచ్చే ఈమెయిల్ చిరునామా:"
       email_in_allow_strangers: "ఎటువంటి ఖాతాలు లేని అనామక సభ్యుల నుండి వచ్చే ఈమెయిల్లు అంగీకరించు"
-      email_in_disabled: "సైటు అమరికల్లో ఈమెయిల్ ద్వారా కొత్త విషయాలు రాయుడ అచేతనమైంది. ఈమెయిల్ ద్వారా కొత్త విషయాలు రాయుట చేతనం చేయుటకు,"
-      email_in_disabled_click: '"ఈమెయిల్ ఇన్" అమరికను చేతనం చేయి.'
       allow_badges_label: "ఈ వర్గంలో బ్యాడ్జిలు బహూకరించుట అనుమతించు"
       edit_permissions: "అనుమతులు సవరించు"
       review_group_name: "గుంపు పేరు"
@@ -1205,6 +1187,10 @@ te:
     filters:
       with_topics: "%{filter} విషయాలు"
       with_category: "%{filter} %{category} విషయాలు"
+      filter:
+        title: "జల్లెడ"
+        button:
+          label: "జల్లెడ"
       latest:
         title: "తాజా"
         help: "ఇటీవలి టపాలతోని విషయాలు"
@@ -1338,9 +1324,6 @@ te:
     footer_nav:
       back: "వెనుకకు"
       share: "పంచు"
-    pause_notifications:
-      options:
-        custom: "అనురూప"
     trust_levels:
       names:
         newuser: "కొత్త సభ్యుడు"
@@ -1356,7 +1339,18 @@ te:
         one: "%{count} కొత్త"
         other: "%{count} కొత్త"
       more: "ఇంకా"
+      edit_navigation_modal_form:
+        filter_dropdown:
+          all: "అన్ని"
       sections:
+        custom:
+          save: "భద్రపరుచు"
+          delete: "తొలగించు"
+          links:
+            icon:
+              label: "ఐకాన్"
+            name:
+              label: "పేరు"
         about:
           header_link_text: "గురించి"
         messages:
@@ -1371,7 +1365,8 @@ te:
         categories:
           header_link_text: "వర్గాలు"
         community:
-          header_link_text: "కమ్యునిటీ"
+          edit_section:
+            header_dropdown: "కస్టమైజ్"
           links:
             about:
               content: "గురించి"
@@ -1379,6 +1374,8 @@ te:
               content: "అధికారి"
             badges:
               content: "బ్యాడ్జీలు"
+            topics:
+              content: "విషయాలు"
             faq:
               content: "తవసం"
             groups:
@@ -1387,6 +1384,10 @@ te:
               content: "సభ్యులు"
             my_posts:
               content: "నా టపాలు"
+    form_templates:
+      errors:
+        typeMismatch:
+          default: "దయచేసి చెల్లే విలువ రాయండి"
   admin_js:
     type_to_filter: "జల్లించుటకు రాయి..."
     admin:
@@ -1490,7 +1491,6 @@ te:
         none_installed: "ఎటువంటి చొప్పింతలు ప్రతిష్టించిలేవు."
         version: "సంచిక"
         enabled: "చేతమైందా?"
-        change_settings: "అమరికలు మార్చు"
         change_settings_short: "అమరికలు"
         howto: "పొడిగింతలు నేను ఎలా ప్రతిష్టించగలను?"
       backups:
@@ -1749,6 +1749,29 @@ te:
           flag: "కేతనం"
         form:
           add: "కలుపు"
+      form_templates:
+        list_table:
+          headings:
+            name: "పేరు"
+            actions: "చర్యలు"
+        view_template:
+          close: "మూసివేయి"
+          edit: "సవరణ"
+          delete: "తొలగించు"
+        new_template_form:
+          submit: "భద్రపరుచు"
+          cancel: "రద్దుచేయి"
+        quick_insert_fields:
+          add_new_field: "కలుపు"
+        validations_modal:
+          table_headers:
+            type: "రకం"
+            description: "వివరణ"
+          validations:
+            required:
+              key: "కావాలి"
+            type:
+              key: "రకం"
       impersonate:
         title: "పరకాయప్రవేశించు"
         help: "అనుకరించిన వినియోగదారుని ఖాతా దోషవిశ్లేషణ ప్రయోజనాలకు ఈ ఉపకరణం వినియోగించండి.పూర్తి అయిన తర్వాత మీరు లాగవుట్ చేయండి."
@@ -1796,7 +1819,6 @@ te:
         suspended: "సస్పెండయ్యాడా? "
         show_admin_profile: "అధికారి"
         show_public_profile: "ప్రజా ప్రవర చూపు"
-        impersonate: "పరకాయప్రవేశం చేయి"
         ip_lookup: "ఐపీ లుకప్"
         log_out: "లాగవుట్"
         logged_out: "వినియోగదారుడు అన్ని పరికరాలు లాగవుట్ చేశారు"
@@ -1993,7 +2015,6 @@ te:
         allow_title: చిహ్నాన్ని శీర్షికగా వాడుకోవడానికి అనుమతి ఇవ్వండి.
         multiple_grant: అనేకసార్లు మంజూరు చేయవచ్చు
         listable: బహిరంగ చిహ్నాల పుటలో చూపండి
-        enabled: బ్యాడ్జి చేతనం చేయి
         icon: ఐకాన్
         image: బొమ్మ
         target_posts: టపాలు లక్ష్యంగా ప్రశ్న
diff --git a/config/locales/client.th.yml b/config/locales/client.th.yml
index 01747bceeb7..64681e7df1d 100644
--- a/config/locales/client.th.yml
+++ b/config/locales/client.th.yml
@@ -153,7 +153,6 @@ th:
     software_update_prompt:
       message: "เราอัปเดตไซต์นี้เมื่อสักครู่ โปรด<span>รีเฟรช</span>หน้านี้ หรือคุณอาจเกิดเหตุการณ์ที่ไม่ตรงตามต้องการ"
       dismiss: "ซ่อน"
-    bootstrap_invite_button_title: "ส่งคำเชิญ"
     themes:
       default_description: "ค่าเริ่มต้น"
       only_admins: "(ข้อความนี้จะแสดงเฉพาะผู้ดูแลไซต์เท่านั้น)"
@@ -257,7 +256,6 @@ th:
       edit_bookmark: "แก้ไขบุ๊กมาร์ก"
       clear_bookmarks: "ล้างบุ๊กมาร์ก"
       help:
-        bookmark: "คลิกเพื่อ บุ๊คมาร์ค ที่โพสแรกของกระทู้นี้"
         unbookmark: "คลิกเพื่อลบบุ๊กมาร์กทั้งหมดในกระทู้นี้"
     bookmarks:
       created: "คุณได้บุ๊กมาร์กโพสต์นี้ %{name}"
@@ -395,11 +393,8 @@ th:
         view_full: "ดูบทสนทนาทั้งหมด"
       scores:
         score: "คะแนน"
-        date: "วันที่"
-        type: "ชนิด"
+        type: "เหตุผล"
         status: "สถานะ"
-        submitted_by: "ยืนยันโดย"
-        reviewed_by: "รีวิวโดย"
       statuses:
         pending:
           title: "อยู่ระหว่างการพิจารณา"
@@ -407,14 +402,12 @@ th:
           title: "อนุมัติ"
         rejected:
           title: "ปฏิเสธ"
-        ignored:
-          title: "ละเว้น"
-        deleted:
-          title: "ลบ"
         reviewed:
-          title: "(ถูกรีวิวทั้งหมด)"
+          title: "ถูกรีวิวทั้งหมด"
         all:
-          title: "(ทุกสิ่ง)"
+          title: "ทุกสิ่ง"
+      context_question:
+        delimiter: "หรือ"
       types:
         reviewable_flagged_post:
           title: "โพสต์ที่ถูกปักธง"
@@ -595,6 +588,7 @@ th:
         make_owner_description: "แต่งตั้ง<b>%{username}</b>เป็นเจ้าของกลุ่มนี้"
         remove_owner: "ลบในสถานะเจ้าของ"
         remove_owner_description: "ลบ<b>%{username}</b>ในสถานะเจ้าของกลุ่มนี้"
+        status: "สถานะ"
         owner: "เจ้าของ"
         forbidden: "คุณไม่ได้รับอนุญาตให้ดูสมาชิก"
       topics: "กระทู้"
@@ -697,11 +691,6 @@ th:
       profile: "โปรไฟล์"
       mute: "ปิด"
       edit: "แก้ไขการตั้งค่า"
-      download_archive:
-        button_text: "ดาวน์โหลดทั้งหมด"
-        confirm: "คุณแน่ใจหรือว่าต้องการดาวน์โหลดโพสต์ของคุณ"
-        success: "เริ่มดาวน์โหลด คุณจะได้รับการแจ้งเตือนทางข้อความเมื่อขั้นตอนเสร็จสิ้น"
-        rate_limit_error: "สามารถดาวน์โหลดโพสต์ได้วันละหนึ่งครั้งเท่านั้น กรุณาลองใหม่พรุ่งนี้"
       new_private_message: "สร้างข้อความส่วนตัวใหม่"
       private_message: "ข้อความส่วนตัว"
       private_messages: "ข้อความ"
@@ -821,13 +810,6 @@ th:
       theme: "ธีม"
       save_to_change_theme: 'ธีมจะถูกอัปเดตเมื่อคุณคลิก "%{save_text}"'
       home: "หน้าเริ่มต้น"
-      staff_counters:
-        flags_given: "ธงที่เป็นประโยชน์"
-        flagged_posts: "โพสต์ที่ปักธง"
-        deleted_posts: "โพสต์ที่ลบ"
-        suspensions: "ระงับการใช้งาน"
-        warnings_received: "คำเตือน"
-        rejected_posts: "โพสต์ที่ถูกปฏิเสธ"
       messages:
         inbox: "กล่องจดหมายเข้า"
         latest: "ล่าสุด"
@@ -866,7 +848,6 @@ th:
         choose: "เลือกรหัสผ่าน"
       second_factor_backup:
         disable: "ปิดใช้งาน"
-        enable: "เปิดใช้งาน"
       second_factor:
         forgot_password: "ลืมรหัสผ่านใช่ไหม"
         confirm_password_description: "กรุณายืนยันรหัสผ่านเพื่อดำเนินการต่อ"
@@ -1195,10 +1176,8 @@ th:
       sign_up: "สมัครสมาชิก"
       hide_forever: "ไม่เป็นไร"
     summary:
-      enabled_description: "คุณกำลังดูสรุปของกระทู้นี้ : นี่คือโพสที่น่าสนใจที่สุดที่หลายๆคนแนะนำ"
       description:
         other: "มี <b>%{count}</b> คำตอบ"
-      enable: "สรุปกระทู้นี้"
       disable: "แสดงโพสต์ทั้งหมด"
     deleted_filter:
       enabled_description: "กระทู้นี้ซ่อนโพสต์ที่ถูกลบไปแล้ว"
@@ -1381,8 +1360,6 @@ th:
         tags_missing:
           other: "คุณต้องเลือกอย่างน้อย %{count} แท็ก"
       save_edit: "บันทึกการแก้ไข"
-      reply_original: "ตอบบนกระทู้ต้นฉบับ"
-      reply_here: "ตอบที่นี่"
       reply: "ตอบกลับ"
       cancel: "ยกเลิก"
       create_topic: "สร้างกระทู้"
@@ -1693,8 +1670,6 @@ th:
       options: "ตัวเลือกกระทู้"
       show_links: "แสดงลิงก์ในกระทู้นี้"
       unread_indicator: "ยังไม่มีสมาชิกอ่านโพสต์ล่าสุดของกระทู้นี้"
-      jump_reply_up: ข้ามไปยังคำตอบก่อนหน้านี้
-      jump_reply_down: ข้ามไปยังคำตอบหลังจากนี้
       deleted: "กระทู้ถูกลบ"
       slow_mode_update:
         enable: "เปิดใช้งาน"
@@ -2059,7 +2034,6 @@ th:
       view: "ดูกระทู้ในหมวดหมู่"
       general: "ทั่วไป"
       settings: "การตั้งค่า"
-      topic_template: "รูปแบบกระทู้"
       tags: "แท็ก"
       allow_global_tags_label: "อนุญาตแท็กอื่นด้วย"
       required_tag_group:
@@ -2275,6 +2249,9 @@ th:
     lightbox:
       download: "ดาวน์โหลด"
       close: "ปิด (Esc)"
+    experimental_lightbox:
+      buttons:
+        close: "ปิด (Esc)"
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ","
       shortcut_key_delimiter_plus: "+"
@@ -2432,8 +2409,6 @@ th:
       forward: "ส่งต่อ"
       share: "แบ่งปัน"
       dismiss: "ซ่อน"
-    pause_notifications:
-      remaining: "เหลืออีก %{remaining}"
     trust_levels:
       names:
         member: "สมาชิก"
@@ -2445,7 +2420,20 @@ th:
         other: "%{count} ใหม่"
       more: "อื่น"
       all_categories: "หมวดหมู่ทั้งหมด"
+      edit_navigation_modal_form:
+        filter_dropdown:
+          all: "ทั้งหมด"
       sections:
+        custom:
+          save: "บันทึก"
+          delete: "ลบ"
+          links:
+            icon:
+              label: "ไอคอน"
+            name:
+              label: "ชื่อ"
+            value:
+              label: "ลิงก์"
         about:
           header_link_text: "เกี่ยวกับ"
         messages:
@@ -2463,7 +2451,8 @@ th:
         categories:
           header_link_text: "หมวดหมู่"
         community:
-          header_link_text: "ชุมชน"
+          edit_section:
+            header_dropdown: "การปรับแต่ง"
           links:
             about:
               content: "เกี่ยวกับ"
@@ -2471,8 +2460,8 @@ th:
               content: "แอดมิน"
             badges:
               content: "เหรียญ"
-            everything:
-              content: "ทุกสิ่ง"
+            topics:
+              content: "หัวข้อ"
             faq:
               content: "คำถามที่พบบ่อย"
             groups:
@@ -2486,6 +2475,11 @@ th:
             review:
               content: "รีวิว"
     until: "จนถึง:"
+    form_templates:
+      errors:
+        typeMismatch:
+          default: "กรอกค่าที่ถูกต้อง"
+          email: "กรุณาใส่อีเมลที่ถูกต้อง."
   admin_js:
     type_to_filter: "พิมพ์เพื่อกรอง..."
     admin:
@@ -2614,8 +2608,6 @@ th:
         save: "บันทึก"
         wildcard_event: "ส่งทุกอย่างหาฉัน"
         active: "ใช้งานอยู่"
-        user_badge_event:
-          details: "เมื่อผู้ใช้ได้รับเหรียญ"
         delivery_status:
           title: "สถานะการส่ง"
           inactive: "ไม่ใช้งาน"
@@ -2638,7 +2630,6 @@ th:
         enabled: "เปิดใช้"
         is_enabled: "Y"
         not_enabled: "N"
-        change_settings: "การตั้งค่าการเปลี่ยนแปลง"
         change_settings_short: "การตั้งค่า"
       backups:
         title: "สำรอง"
@@ -2732,6 +2723,8 @@ th:
             name: "หลัก"
           success:
             name: "สำเร็จ"
+          selected:
+            name: "เลือกแล้ว"
         email_style:
           css: "CSS"
           save_error_with_reason: "การเปลี่ยนแปลงไม่ได้ถูกบันทึก %{error}"
@@ -2885,12 +2878,39 @@ th:
           upload_successful: "อัปโหลดสำเร็จแล้ว เพิ่มคำเรียบร้อย"
         test:
           no_matches: "ไม่พบผลลัพธ์ที่ตรงกัน"
+      form_templates:
+        nav_title: "รูปแบบ"
+        list_table:
+          headings:
+            name: "ชื่อ"
+            actions: "การกระทำ"
+        view_template:
+          close: "ปิด"
+          edit: "แก้ไข"
+          delete: "ลบ"
+        new_template_form:
+          submit: "บันทึก"
+          cancel: "ยกเลิก"
+          preview: "แสดงตัวอย่าง"
+        quick_insert_fields:
+          add_new_field: "เพิ่ม"
+          dropdown: "ดร็อปดาวน์"
+        validations_modal:
+          table_headers:
+            type: "ชนิด"
+            description: "รายละเอียด"
+          validations:
+            required:
+              key: "ต้องการ"
+            type:
+              key: "ชนิด"
       impersonate:
         not_found: "ไม่พบผู้ใช้นั้น"
       users:
         title: "ผู้ใช้"
         last_emailed: "อีเมลล่าสุด"
         active: "เปิดใช้งานแล้ว"
+        status: "สถานะ"
         show_emails: "แสดงอีเมล"
         hide_emails: "ซ่อนอีเมล"
         nav:
@@ -3056,6 +3076,8 @@ th:
         revert_confirm: "คุณแน่ใจหรือว่าจะย้อนกลับการแก้ไข"
         go_back: "กลับไปค้นหา"
         recommended: "เราแนะนำให้คุณแก้ไขข้อความให้ตรงกับความต้องการของคุณ:"
+        outdated:
+          dismiss: "ซ่อน"
       settings:
         reset: "ล้าง"
         none: "ไม่มี"
@@ -3121,6 +3143,7 @@ th:
         revoke: เอาออก
         reason: เหตุผล
         edit_badges: แก้ไขเหรียญ
+        disabled: ปิดใช้งานแล้ว
         icon: ไอคอน
         image: ภาพ
         trigger_type:
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index 5308a2b5155..37e39925245 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -144,6 +144,8 @@ tr_TR:
       facebook: "Facebook'ta paylaş"
       email: "E-posta ile gönder"
       url: "URL'yi kopyala ve paylaş"
+    word_connector:
+      comma: ", "
     action_codes:
       public_topic: "Bu konuyu herkese açık yaptı, %{when}"
       open_topic: "Bunu bir konuya dönüştürdü, %{when}"
@@ -155,6 +157,8 @@ tr_TR:
       removed_user: "%{who} adlı kullanıcıyı çıkardı, %{when}"
       removed_group: "%{who} adlı kullanıcıyı çıkardı, %{when}"
       autobumped: "Otomatik olarak üste sıçradı, %{when}"
+      tags_changed: "Etiketler güncellendi (%{when})"
+      category_changed: "Kategori güncellendi (%{when})"
       autoclosed:
         enabled: "Kapattı, %{when}"
         disabled: "Açtı, %{when}"
@@ -179,17 +183,13 @@ tr_TR:
       forwarded: "Yukarıdaki e-postayı iletti"
     topic_admin_menu: "konu eylemleri"
     skip_to_main_content: "Ana içeriğe atla"
+    skip_user_nav: "Profil içeriğine atla"
     emails_are_disabled: "Giden tüm e-postalar bir yönetici tarafından devre dışı bırakıldı. Herhangi bir e-posta bildirimi gönderilmeyecek."
     emails_are_disabled_non_staff: "Giden e-posta, personel olmayan kullanıcılar için devre dışı bırakıldı."
     software_update_prompt:
       message: "Siteyi güncelledik, <span>lütfen sayfayı yenileyin</span>, aksi takdirde beklenmedik davranışlarla karşılaşabilirsiniz."
       dismiss: "Kapat"
-    bootstrap_mode_enabled:
-      one: "Yeni sitenizi başlatmayı kolaylaştırmak için önyükleme modundasınız. Tüm yeni kullanıcılara 1. güven seviyesi verilir ve günlük e-posta özeti e-postaları etkinleştirilir. Bu, %{count} kullanıcı katıldığında otomatik olarak kapatılır."
-      other: "Yeni sitenizi başlatmayı kolaylaştırmak için önyükleme modundasınız. Tüm yeni kullanıcılara 1. güven seviyesi verilir ve günlük e-posta özeti e-postaları etkinleştirilir. Bu, %{count} kullanıcı katıldığında otomatik olarak kapatılır."
-    bootstrap_mode_disabled: "Önyükleme modu 24 saat içinde devre dışı bırakılır."
-    bootstrap_invite_button_title: "Davet Gönder"
-    bootstrap_wizard_link_title: "Kurulum sihirbazını bitir"
+    bootstrap_mode: "Başlarken"
     themes:
       default_description: "Varsayılan"
       broken_theme_alert: "Bir temada / bileşende hata olduğu için siteniz çalışmayabilir."
@@ -302,11 +302,11 @@ tr_TR:
       edit_bookmark: "Yer İmini Düzenle"
       clear_bookmarks: "Yer İmlerini Temizle"
       help:
-        bookmark: "Bu konudaki ilk gönderiyi yer imlerine eklemek için tıklayın"
-        edit_bookmark: "Bu konudaki yer imini düzenlemek için tıklayın"
+        bookmark: "Bu konuyu yer imlerine eklemek için tıklayın"
+        edit_bookmark: "Bu konuda hakkında bir gönderi üzerine yer imini düzenlemek için tıklayın"
         edit_bookmark_for_topic: "Bu konunun yer imini düzenlemek için tıklayın"
         unbookmark: "Bu konudaki tüm yer imlerini kaldırmak için tıklayın"
-        unbookmark_with_reminder: "Bu konudaki tüm yer imlerini ve anımsatıcıları kaldırmak için tıklayın."
+        unbookmark_with_reminder: "Bu konudaki tüm yer imlerini ve anımsatıcıları kaldırmak için tıklayın"
     bookmarks:
       created: "Bu gönderiyi yer imlerine eklediniz. %{name}"
       created_generic: "Bunu yer imlerine eklediniz. %{name}"
@@ -350,7 +350,7 @@ tr_TR:
       new_topic: "Yeni konu taslağı"
       new_private_message: "Yeni kişisel ileti taslağı"
       abandon:
-        confirm: "Bu konu için devam eden bir taslağınız var. Bununla ne yapmak istersiniz?"
+        confirm: "Halihazırda bir taslağınız var. Bununla ne yapmak istersiniz?"
         yes_value: "Kapat"
         no_value: "Düzenlemeyi sürdür"
     topic_count_categories:
@@ -403,6 +403,8 @@ tr_TR:
         search: "Mesaj Arama"
         placeholder: "mesaj başlığını, url'yi veya kimliği buraya yazın"
     review:
+      show_more: "Daha fazla göster"
+      show_less: "Daha az göster"
       order_by: "Şuna göre sırala"
       date_filter: "Şu tarihler arasında gönderildi"
       in_reply_to: "şuna yanıt olarak"
@@ -523,26 +525,43 @@ tr_TR:
       scores:
         about: "Bu puan, bildiren kişinin güven seviyesine, önceki bayraklarının doğruluğuna ve bildirilen ögenin önceliğine göre hesaplanır."
         score: "Puan"
-        date: "Tarih"
-        type: "Tür"
+        date: "Rapor tarihi"
+        type: "Sebep"
         status: "Durum"
-        submitted_by: "Gönderen"
-        reviewed_by: "İnceleyen"
+        submitted_by: "Bildiren"
+        reviewed_by: "İnceleyen:"
+        reviewed_timestamp: "İnceleme tarihi"
       statuses:
         pending:
           title: "Bekleyen"
         approved:
           title: "Onaylandı"
+        approved_flag:
+          title: "Bayrak onaylandı"
+        approved_user:
+          title: "Kullanıcı onaylandı"
+        approved_post:
+          title: "Gönderi onaylandı"
         rejected:
           title: "Reddedildi"
+        rejected_flag:
+          title: "Bayrak reddedildi"
+        rejected_user:
+          title: "Kullanıcı reddedildi"
+        rejected_post:
+          title: "Gönderi reddedildi"
         ignored:
-          title: "Yok sayıldı"
+          title: "Bayrak yok sayıldı"
         deleted:
-          title: "Silindi"
+          title: "Konu veya gönderi silindi"
         reviewed:
-          title: "(tümü incelendi)"
+          title: "Tümü incelendi"
         all:
-          title: "(her şey)"
+          title: "Her şey"
+      context_question:
+        is_this_post: "Bu gönderi %{reviewable_human_score_types} özelliği taşıyor mu?"
+        delimiter: "veya"
+        something_else_wrong: "Bu gönderide bir sorun var mı?"
       types:
         reviewable_flagged_post:
           title: "Bayrak Eklenen Gönderi"
@@ -555,6 +574,8 @@ tr_TR:
           title: "Kullanıcı"
         reviewable_post:
           title: "Gönderi"
+        reviewable_chat_message:
+          title: "Bayraklı sohbet mesajı"
       approval:
         title: "Gönderi Onay Gerektiriyor"
         description: "Yeni gönderinizi aldık fakat görünmeden önce moderatör tarafından onaylanması gerekiyor. Lütfen sabırlı olun."
@@ -849,6 +870,7 @@ tr_TR:
         make_all_primary_description: "Bunu tüm seçili kullanıcılar için birincil grup yap"
         remove_all_primary: "Birincillikten çıkar"
         remove_all_primary_description: "Bu grubu birincil olarak kaldır"
+        status: "Durum"
         owner: "Sahip"
         primary: "Birincil"
         forbidden: "Üyeleri görüntülemenize izin verilmiyor."
@@ -977,10 +999,12 @@ tr_TR:
       mute: "Sessiz"
       edit: "Tercihleri Düzenle"
       download_archive:
-        button_text: "Tümünü İndir"
-        confirm: "Gönderilerinizi indirmek istediğinize emin misiniz?"
-        success: "İndirme işlemi başlatıldı. İşlem tamamlandığında mesaj yoluyla bildirim alırsınız."
-        rate_limit_error: "Gönderiler günde bir kez indirilebilir, lütfen yarın tekrar deneyin."
+        title: "Verilerinizi dışa aktarın"
+        description: "Hesap aktivitenizin ve tercihlerinizin arşivini indirin."
+        button_text: "Arşiv talep edin"
+        confirm: "Hesap aktivitenizin ve tercihlerinizin arşivini indirmeyi gerçekten istiyor musunuz?"
+        success: "Arşivinizi toplamaya başladık, işlem tamamlandığında bir mesaj alacaksınız."
+        rate_limit_error: "Hesap arşivleri günde bir kez indirilebilir, lütfen yarın tekrar deneyin."
       new_private_message: "Yeni Mesaj"
       private_message: "Mesaj"
       private_messages: "Mesajlar"
@@ -1033,6 +1057,7 @@ tr_TR:
           warning: "Öne çıkarılan konunuzu silmek istediğinizden emin misiniz?"
       use_current_timezone: "Mevcut Saat Dilimini Kullan"
       profile_hidden: "Bu kullanıcının genel profili gizli."
+      inactive_user: "Bu kullanıcı artık aktif değil."
       expand_profile: "Genişlet"
       sr_expand_profile: "Profil detaylarını genişlet"
       collapse_profile: "Daralt"
@@ -1052,7 +1077,7 @@ tr_TR:
         perm_denied_expl: "Bildirim izinlerini reddettiniz. Bildirimlere tarayıcı ayarlarınızdan izin verebilirsiniz."
         disable: "Bildirimleri Devre Dışı Bırak"
         enable: "Bildirimleri Etkinleştir"
-        each_browser_note: 'Not: Kullandığınız her tarayıcıda bu ayarı değiştirmeniz gerekir. Bu ayardan bağımsız olarak, kullanıcı menüsünden bildirimleri duraklattığınızda tüm bildirimler devre dışı bırakılır.'
+        each_browser_note: "Not: Kullandığınız her tarayıcıda bu ayarı değiştirmeniz gerekir. Bu ayardan bağımsız olarak, kullanıcı menüsünden bildirimleri duraklattığınızda tüm bildirimler devre dışı bırakılır."
         consent_prompt: "Gönderilerinize yanıt verildiğinde canlı bildirim almak ister misiniz?"
       dismiss: "Kapat"
       dismiss_notifications: "Tümünü Kapat"
@@ -1103,14 +1128,10 @@ tr_TR:
       experimental_sidebar:
         enable: "Kenar çubuğunu etkinleştir"
         options: "Seçenekler"
-        categories_section: "Kategoriler Bölümü"
-        categories_section_instruction: "Seçilen kategoriler Kenar Çubuğunun kategoriler bölümünde görüntülenir."
-        tags_section: "Etiketler Bölümü"
-        tags_section_instruction: "Seçilen etiketler Kenar Çubuğunun etiketler bölümünde görüntülenir."
         navigation_section: "Gezinti"
-        list_destination_instruction: "Kenar çubuğunda yeni içerik olduğunda..."
-        list_destination_default: "varsayılan bağlantıyı kullan ve yeni ögeler için bir rozet göster"
-        list_destination_unread_new: "okunmamış/yeniye bağla ve yeni ögelerin sayısını göster"
+        navigation_section_instruction: "Gezinme menüsündeki bir konu listesinde yeni veya okunmamış öğeler olduğunda…"
+        link_to_filtered_list_checkbox_description: "Filtrelenmiş liste bağlantısı"
+        show_count_new_items_checkbox_description: "Yeni öğelerin sayısını göster"
       change: "değiştir"
       featured_topic: "Öne Çıkan Konu"
       moderator: "%{user} bir moderatör"
@@ -1149,6 +1170,7 @@ tr_TR:
       watched_first_post_categories_instructions: "Bu kategorilerdeki tüm yeni konuların ilk gönderileri için bildirim alacaksınız."
       watched_first_post_tags: "İlk Gönderi izleniyor"
       watched_first_post_tags_instructions: "Bu etiketlere sahip olan her yeni konunun ilk gönderisi için bildirim alacaksınız."
+      watched_precedence_over_muted: "Sessize aldıklarım dahil, izlediğim kategorilerdeki veya etiketlerdeki konular hakkında beni bilgilendir"
       muted_categories: "Sessize alındı"
       muted_categories_instructions: "Bu kategorilerdeki yeni konular hakkında bildirim almayacaksınız ve kategorilerde ya da en son sayfalarda görünmeyecekler."
       muted_categories_instructions_dont_hide: "Bu kategorilerdeki yeni konular hakkında bildirim almayacaksınız."
@@ -1181,12 +1203,24 @@ tr_TR:
       home: "Varsayılan Ana Sayfa"
       staged: "Aşamalı"
       staff_counters:
-        flags_given: "yardımcı bayraklar"
-        flagged_posts: "bayrak eklenen gönderiler"
-        deleted_posts: "silinen gönderiler"
-        suspensions: "uzaklaştırmalar"
-        warnings_received: "uyarılar"
-        rejected_posts: "reddedilen gönderiler"
+        flags_given:
+          one: '<span class="%{className}">%{count}</span> faydalı bayrak'
+          other: '<span class="%{className}">%{count}</span> faydalı bayrak'
+        flagged_posts:
+          one: '<span class="%{className}">%{count}</span> bayrak eklenmiş gönderi'
+          other: '<span class="%{className}">%{count}</span> bayrak eklenmiş gönderi'
+        deleted_posts:
+          one: '<span class="%{className}">%{count}</span> silinmiş gönderi'
+          other: '<span class="%{className}">%{count}</span> silinmiş gönderi'
+        suspensions:
+          one: '<span class="%{className}">%{count}</span> askıya alma'
+          other: '<span class="%{className}">%{count}</span> askıya alma'
+        warnings_received:
+          one: '<span class="%{className}">%{count}</span> uyarı'
+          other: '<span class="%{className}">%{count}</span> uyarı'
+        rejected_posts:
+          one: '<span class="%{className}">%{count}</span> reddedilmiş gönderi'
+          other: '<span class="%{className}">%{count}</span> reddedilmiş gönderi'
       messages:
         all: "tüm gelen kutuları"
         inbox: "Gelen Kutusu"
@@ -1279,7 +1313,7 @@ tr_TR:
         tags: "Etiketler"
         interface: "Arayüz"
         apps: "Uygulamalar"
-        sidebar: "Kenar çubuğu"
+        navigation_menu: "Navigasyon Menüsü"
       change_password:
         success: "(e-posta gönderildi)"
         in_progress: "(e-posta gönderiliyor)"
@@ -1293,11 +1327,12 @@ tr_TR:
         title: "İki Adımlı Yedek Kodları"
         regenerate: "Yeniden oluştur"
         disable: "Devre dışı bırak"
-        enable: "Etkinleştir"
-        enable_long: "Yedek kodları etkinleştir"
+        enable: "Yedek kodları oluştur"
+        enable_long: "Yedek kodları ekle"
+        not_enabled: "Henüz yedek kod oluşturmadınız."
         manage:
-          one: "Yedek kodları yönetin. <strong>%{count}</strong> yedek kodunuz kaldı."
-          other: "Yedek kodları yönetin. <strong>%{count}</strong> yedek kodunuz kaldı."
+          one: "<strong>%{count}</strong> yedek kodunuz kaldı."
+          other: "<strong>%{count}</strong> yedek kodunuz kaldı."
         copy_to_clipboard: "Panoya kopyala"
         copy_to_clipboard_error: "Veriler Panoya kopyalanırken hata oluştu"
         copied_to_clipboard: "Panoya kopyalandı"
@@ -1381,6 +1416,7 @@ tr_TR:
         success: "Adrese bir e-posta gönderdik. Lütfen onaylama talimatlarını izleyin."
         success_via_admin: "Bu adrese bir e-posta gönderdik. Kullanıcının e-postadaki onay talimatlarını izlemesi gerekiyor."
         success_staff: "Mevcut adresinize bir e-posta gönderdik. Lütfen onay talimatlarını izleyin."
+        back_to_preferences: "Tercihlere geri dön"
       change_avatar:
         title: "Profil resminizi değiştirin"
         gravatar: "<a href='//%{gravatarBaseUrl}%{gravatarLoginUrl}' target='_blank'>%{gravatarName}</a>, şuna dayalı"
@@ -1735,8 +1771,7 @@ tr_TR:
       pause_notifications: "Bildirimleri duraklat"
       remove_status: "Durumu kaldır"
     user_tips:
-      primary: "Anladım!"
-      secondary: "bana bu ipuçlarını gösterme"
+      button: "Anladım!"
       first_notification:
         title: "İlk bildiriminiz!"
         content: "Bildirimler, sizi toplulukta olup bitenlerden haberdar etmek için kullanılır."
@@ -1752,6 +1787,10 @@ tr_TR:
       suggested_topics:
         title: "Okumaya devam edin!"
         content: "İşte daha sonra okumak isteyebileceğinizi düşündüğümüz bazı konular."
+      admin_guide:
+        title: "Yeni sitenize hoş geldiniz!"
+        content: "Sitenizi ve topluluğunuzu oluşturmaya devam etmek için yönetici kılavuzunu okuyun."
+        button: "Hadi başlayalım!"
     loading: "Yükleniyor..."
     errors:
       prev_page: "şunu yüklemeye çalışırken:"
@@ -1786,12 +1825,6 @@ tr_TR:
       logout_disabled: "Site salt okunur moddayken çıkış yapma devre dışı bırakılır."
     staff_writes_only_mode:
       enabled: "Bu site sadece personel modundadır. Lütfen göz atmaya devam edin, ancak yanıtlama, beğenme ve diğer işlemler yalnızca personel üyeleriyle sınırlıdır."
-    too_few_topics_and_posts_notice_MF: |
-      Hadi <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">tartışmayı başlatalım!</a> {currentTopics, plural, one { <strong>#</strong> konu} other { <strong>#</strong> konu}} ve {currentPosts, plural, one {<strong>#</strong> gönderi} other {<strong>#</strong> gönderi}} var. Ziyaretçilerin okumak ve yanıtlamak için daha fazlasına ihtiyacı var, en azından {requiredTopics, plural, one {<strong>#</strong> konu} other {<strong>#</strong> konu}} ve {requiredPosts, plural, one {<strong>#</strong> gönderi} other {<strong>#</strong> gönderi}} var. Bu mesajı sadece personel görebilir.
-    too_few_topics_notice_MF: |
-      Hadi <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">tartışmayı başlatalım!</a> Şu an {currentTopics, plural, one { <strong>#</strong> konu} other { <strong>#</strong> konu}} var. Ziyaretçilerin okumak ve yanıtlamak için daha fazlasına ihtiyacı var, en azından {requiredTopics, plural, one {<strong>#</strong> konu} other {<strong>#</strong> konu}} olmasını tavsiye ediyoruz. Bu mesajı yalnızca personel görebilir.
-    too_few_posts_notice_MF: |
-      Hadi <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">tartışma başlatalım!</a> Şu an {currentPosts, plural, one { <strong>#</strong> gönderi} other { <strong>#</strong> gönderi}} var. Ziyaretçilerin okumak ve yanıtlamak için daha fazlasına ihtiyacı var; en azından {requiredPosts, plural, one {<strong>#</strong> gönderi} other {<strong>#</strong> gönderi}} olmasını tavsiye ediyoruz. Bu mesajı yalnızca personel görebilir.
     logs_error_rate_notice:
       reached_hour_MF: |
         <b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# hata/saat} other {# hata/saat}}</a> site limitlerine ulaştı {limit, plural, one {# hata/saat} other {# hata/saat}}.
@@ -1821,17 +1854,31 @@ tr_TR:
       hidden_for_session: "Tamam, yarın yine sorarız. Hesap oluşturmak için dilediğiniz zaman \"Giriş Yap\"ı da kullanabilirsiniz."
       intro: "Merhaba! Tartışmanın tadını çıkarıyor gibisiniz, ancak henüz bir hesap açmadınız."
       value_prop: "Aynı gönderiler arasında gezinmekten bıktınız mı? Hesap oluşturduğunuzda kaldığınız yere geri dönebilirsiniz. Ayrıca hesabınız olursa yeni yanıtlar için bildirim alabilir, yer imlerini kaydedebilir ve başkalarına teşekkür etmek için beğenileri kullanabilirsiniz. Bu topluluğu harika kılmak için hep birlikte çalışabiliriz. :heart:"
+    offline_indicator:
+      no_internet: "İnternet bağlantısı yok."
+      refresh_page: "Sayfayı yenileyin"
     summary:
-      enabled_description: "Bu konunun bir özetini görüntülüyorsunuz: Topluluk tarafından belirlenen en ilginç gönderiler."
+      in_progress: "Yapay zeka kullanılarak konu özetleniyor..."
+      summarized_on: "%{date} tarihinde yapay zeka ile özetlendi"
+      model_used: "Kullanılan yapay zeka: %{model}"
+      outdated: "Özet güncel değil"
+      outdated_posts:
+        one: "(%{count} gönderi eksik)"
+        other: "(%{count} gönderi eksik)"
+      enabled_description: "Bu konunun en iyi yanıtlarını görüntülüyorsunuz: topluluk tarafından belirlenen en ilginç gönderiler."
       description:
         one: "<b>%{count}</b> yanıt var."
         other: "<b>%{count}</b> yanıt var."
+      buttons:
+        hide: "Özeti gizle"
+        generate: "Yapay zeka ile özetle"
+        regenerate: "Özeti yeniden oluştur"
       description_time_MF: |
         Tahmini okuma süresi <b>{readingTime, plural, one {# dakika} other {# dakika}}</b> olan {replyCount, plural, one {<b># yanıt</b>} other {<b># yanıt</b>}} var.
-      enable: "Bu Konuyu Özetle"
+      enable: "En iyi yanıtları göster"
       disable: "Tüm Gönderileri Göster"
-      short_label: "Özetle"
-      short_title: "Bu konunun özetini göster: Topluluk tarafından belirlenen en ilginç gönderiler"
+      short_label: "En iyi yanıtlar"
+      short_title: "Bu konuya en çok verilen yanıtları göster: topluluk tarafından belirlenen en ilginç gönderiler"
     deleted_filter:
       enabled_description: "Bu konu gizli durumdaki silinen gönderiler içeriyor."
       disabled_description: "Konudaki silinen gönderiler gösteriliyor."
@@ -2130,8 +2177,6 @@ tr_TR:
         topic_template_not_modified: "Lütfen konu şablonunu düzenleyerek daha fazla ayrıntı ekleyin."
       save_edit: "Düzenlemeyi Kaydet"
       overwrite_edit: "Düzenlemenin Üzerine Yaz"
-      reply_original: "Asıl Konuda yanıtla"
-      reply_here: "Buradan Yanıtla"
       reply: "Yanıtla"
       cancel: "İptal et"
       create_topic: "Konu Oluştur"
@@ -2233,6 +2278,7 @@ tr_TR:
       image_alt_text:
         aria_label: Görüntü için alternatif metin
       delete_image_button: Görüntüyü Sil
+      toggle_image_grid: Resim ızgarasını aç/kapat
     notifications:
       tooltip:
         regular:
@@ -2296,6 +2342,7 @@ tr_TR:
       reaction_2: "<span>%{username}, %{username2}</span> %{description}"
       votes_released: "%{description} - tamamlandı"
       new_features: "Yeni özellikler mevcut!"
+      admin_problems: "Sitenizin kontrol panelinde yeni öneriler mevcut"
       dismiss_confirmation:
         body:
           default:
@@ -2561,6 +2608,11 @@ tr_TR:
         dismiss_tooltip: "Yeni gönderileri kapat veya konuları takip etmeyi durdur"
         also_dismiss_topics: "Yeniden okunmamış olarak gösterilmemesi için bu konuları takip etmeyi durdur"
         dismiss_new: "Yenileri Kapat"
+        dismiss_new_modal:
+          title: "Yeniyi kapat"
+          topics: "Yeni konuları kapat"
+          posts: "Yeni gönderileri kapat"
+          untrack: "Yeni listemde görünmemeleri için bu konuları izlemeyi durdur"
         dismiss_new_with_selected:
           one: "Yenileri (%{count}) kapat"
           other: "Yenileri (%{count}) kapat"
@@ -2598,9 +2650,11 @@ tr_TR:
         bookmarks: "Henüz hiçbir konuya yer imi eklemediniz."
         category: "%{category} konusu yok."
         top: "Popüler konu yok."
+        filter: "Konu yok."
         educate:
           new: '<p>Yeni konularınız burada görünür. Varsayılan olarak, konular yeni kabul edilir ve son 2 gün içinde oluşturulmuşlarsa <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span> göstergesi görünür.</p><p>Bunu değiştirmek için <a href="%{userPrefsUrl}"> tercihlerinizi</a> ziyaret edin.</p>'
-          unread: "<p>Okunmamış konularınız burada görünür.</p><p>Konular varsayılan olarak okunmamış sayılır ve şu durumlarda okunmamış ileti sayısı <span class=\"badge unread-posts badge-notification\">1</span> olarak gösterilir: </p><ul><li>Konuyu siz oluşturmuşsanız</li><li>Konuya yanıt vermişseniz</li><li>Konuyu 4 dakikadan fazla okumuşsanız</li></ul><p>Her bir konuda \U0001F514 aracılığıyla konuyu Takip Edildi veya İzlendi olarak seçmişseniz.</p><p><a href=\"%{userPrefsUrl}\">Tercihler</a> bölümünden bunu değiştirebilirsiniz.</p>"
+          unread: "<p>Okunmamış konularınız burada görünür.</p><p>Konular varsayılan olarak okunmamış sayılır ve şu durumlarda okunmamış ileti sayısı <span class=\"badge unread-posts badge-notification\">1</span> olarak gösterilir: </p><ul><li>Konuyu siz oluşturmuşsanız</li><li>Konuya yanıt vermişseniz</li><li>Konuyu 5 dakikadan fazla okumuşsanız</li></ul><p>Her bir konuda \U0001F514 aracılığıyla konuyu Takip Edildi veya İzlendi olarak seçmişseniz.</p><p><a href=\"%{userPrefsUrl}\">Tercihler</a> bölümünden bunu değiştirebilirsiniz.</p>"
+          new_new: "<p>Yeni konularınız burada görünecek ve okunmamış konularınız da görüntülenecektir. Varsayılan olarak, konular yeni olarak kabul edilir ve son 2 gün içinde oluşturulmuşlarsa bir <span class=\"badge new-topic badge-notification\" style=\"vertical-align:middle;line-height:inherit;\"></span> göstergesi gösterilir. Okunmamış konular, aşağıdaki durumlarda okunmamış sayıları <span class=\"badge unread-posts badge-notification\">1</span> gösterecektir: Konuyu oluşturduysanız, konuya yanıt verdiyseniz, konuyu 5 dakikadan fazla okuduysanız veya konuyu her konudaki \U0001F514 işareti aracılığıyla açıkça İzlendi veya İzleniyor olarak ayarladıysanız.</p><p>Bunu değiştirmek için <a href=\"%{userPrefsUrl}\">tercihlerinizi</a> ziyaret edin.</p>"
       bottom:
         latest: "Başka en son konu yok."
         posted: "Başka gönderi yapılan konu yok."
@@ -2612,11 +2666,13 @@ tr_TR:
         tag: "Başka %{tag} konusu yok."
         top: "Başka popüler konu yok."
         bookmarks: "Başka yer imli konu yok."
+        filter: "Başka konu kalmadı."
     topic:
       filter_to:
         one: "Konuda %{count} gönderi"
         other: "Konuda %{count} gönderi"
       create: "Yeni Konu"
+      create_disabled_category: "Bu kategoride konu oluşturma izniniz yok"
       create_long: "Yeni bir Konu oluştur"
       open_draft: "Taslağı aç"
       private_message: "Mesaj başlat"
@@ -2663,6 +2719,7 @@ tr_TR:
       read_more_in_category: "Daha fazla okumak ister misiniz? %{categoryLink} kategorisindeki diğer konulara göz atın veya <a href='%{latestLink}'>en son konuları görüntüleyin</a>."
       read_more: "Daha fazla okumak ister misiniz? <a href='%{categoryLink}'>Tüm kategorilere göz atın</a> veya <a href='%{latestLink}'>en son konuları görüntüleyin</a>."
       unread_indicator: "Bu konunun son gönderisini henüz hiçbir üye okumadı."
+      participant_groups: "Katılımcı grupları"
       read_more_MF: |
         { HAS_UNREAD_AND_NEW, select,
           true {
@@ -2703,8 +2760,8 @@ tr_TR:
       browse_all_categories_latest_or_top: "<a href='%{basePath}/categories'>Tüm kategorilere göz atın</a>, <a href='%{basePath}/latest'>en son konuları görüntüleyin</a> veya en üste bakın:"
       browse_all_tags_or_latest: "<a href='%{basePath}/tags'>Tüm etiketlere göz atın</a> veya <a href='%{basePath}/latest'>en son konuları görüntüleyin</a>."
       suggest_create_topic: <a href>Yeni bir konuşma başlatmaya</a> hazır mısınız?
-      jump_reply_up: önceki yanıta geç
-      jump_reply_down: sonraki yanıta geç
+      jump_reply: "Gönderinin orijinal konumuna atla"
+      jump_reply_aria: "@%{username} adlı kullanıcının gönderisine orijinal konumunda atla"
       deleted: "Konu silindi"
       slow_mode_update:
         title: "Yavaş Mod"
@@ -2972,6 +3029,7 @@ tr_TR:
         instructions:
           one: "Lütfen bu gönderiyi taşımak istediğiniz konuyu seçin."
           other: "Lütfen bu <b>%{count}</b> gönderiyi taşımak istediğiniz konuyu seçin."
+        chronological_order: "birleştirdikten sonra kronolojik sırayı koru"
       move_to_new_message:
         title: "Yeni Mesaja Taşı"
         action: "yeni mesaja taşı"
@@ -3059,6 +3117,7 @@ tr_TR:
       ignored: "Yok sayılan içerik"
       wiki_last_edited_on: "wiki son düzenleme zamanı: %{dateTime}"
       last_edited_on: "gönderi en son %{dateTime} tarihinde düzenlendi"
+      edit_history: "gönderi düzenleme geçmişi"
       reply_as_new_topic: "Bağlantılı Konu olarak yanıtlayın"
       reply_as_new_private_message: "Aynı alıcılara yeni mesaj olarak yanıt ver"
       continue_discussion: "%{postLink} gönderisinden tartışılmaya devam ediliyor:"
@@ -3070,8 +3129,8 @@ tr_TR:
       sr_collapse_replies: "Gömülü yanıtları daralt"
       sr_date: "Gönderi tarihi"
       sr_expand_replies:
-        one: "Bu gönderide %{count} yanıt var. Genişletmek için tıklayın"
-        other: "Bu gönderide %{count} yanıt var. Genişletmek için tıklayın"
+        one: "Bu gönderinin %{count} yanıtı var"
+        other: "Bu gönderinin %{count} yanıtı var"
       expand_collapse: "genişlet/daralt"
       sr_below_embedded_posts_description: "#%{post_number} numaralı gönderiye gelen yanıtlar"
       sr_embedded_reply_description: "#%{post_number} numaralı gönderiye @%{username} adlı kullanıcının yanıtı"
@@ -3229,6 +3288,8 @@ tr_TR:
           last: "Son revizyon"
           hide: "Revizyonu gizle"
           show: "Revizyonu göster"
+          destroy: "Revizyonları sil"
+          destroy_confirm: "Bu gönderideki tüm revizyonları silmek istediğinizden emin misiniz? Bu işlem kalıcıdır."
           revert: "Revizyona geri dönün %{revision}"
           edit_wiki: "Wiki'yi düzenle"
           edit_post: "Gönderiyi düzenle"
@@ -3262,6 +3323,7 @@ tr_TR:
         updated: "Güncellendi"
         name: "Ad"
         name_placeholder: "Bu yer imi ne için?"
+        name_input_label: "Yer imi adı"
         set_reminder: "Bana anımsat"
         options: "Seçenekler"
         actions:
@@ -3283,7 +3345,7 @@ tr_TR:
       filtered_replies:
         viewing_posts_by: "Şu kişinin %{post_count} gönderisi görüntüleniyor:"
         viewing_subset: "Bazı yanıtlar daraltıldı"
-        viewing_summary: "Bu konunun özeti görüntüleniyor"
+        viewing_summary: "Bu konunun en iyi yanıtları görüntüleniyor"
         post_number: "%{username}, gönderi #%{post_number}"
         show_all: "Tümünü göster"
       share:
@@ -3300,7 +3362,7 @@ tr_TR:
       back: "Kategoriye dön"
       general: "Genel"
       settings: "Ayarlar"
-      topic_template: "Konu Şablonu"
+      topic_template: "Şablon"
       tags: "Etiketler"
       tags_allowed_tags: "Bu etiketleri bu kategoriyle sınırla:"
       tags_allowed_tag_groups: "Bu etiket gruplarını bu kategoriyle sınırla:"
@@ -3359,8 +3421,7 @@ tr_TR:
       email_in: "Kişiselleştirilmiş gelen e-posta adresi:"
       email_in_tooltip: "Birden fazla e-posta adresini | karakteri ile ayırabilirsiniz."
       email_in_allow_strangers: "Hesabı olmayan anonim kullanıcılardan gelen e-postaları kabul edin"
-      email_in_disabled: "E-posta yoluyla yeni konuların gönderilmesi Site Ayarlarında devre dışı bırakılmış. Yeni konuların e-posta yoluyla gönderilmesini etkinleştirmek için "
-      email_in_disabled_click: '"email in" ayarını etkinleştirin.'
+      email_in_disabled: "Yeni konuların e-posta yoluyla gönderilmesi devre dışı bırakıldı. Yeni konuların e-posta yoluyla gönderilmesini etkinleştirmek için <a href='%{setting_url}'>'email in'</a> ayarını etkinleştirin."
       mailinglist_mirror: "Kategori bir posta listesini yansıtır"
       show_subcategory_list: "Bu kategorideki konuların üzerinde alt kategori listesini göster."
       read_only_banner: "Bir kullanıcı bu kategoride konu oluşturamadığında banner metni:"
@@ -3387,6 +3448,7 @@ tr_TR:
       default_slow_mode: 'Bu kategorideki yeni konular için "Yavaş Modu" etkinleştirin.'
       parent: "Ana Kategori"
       num_auto_bump_daily: "Günlük olarak otomatik olarak üste çıkacak açık konu sayısı:"
+      auto_bump_cooldown_days: "Aynı konuyu tekrar açmadan önce geçmesi gereken gün sayısı:"
       navigate_to_first_post_after_read: "Konular okunduktan sonra ilk gönderiye gidin"
       notifications:
         title: "bu kategori için bildirim seviyesini değiştirin"
@@ -3472,7 +3534,9 @@ tr_TR:
         inappropriate: "Uygunsuz"
         spam: "Spam"
       custom_placeholder_notify_user: "Spesifik, yapıcı ve her zaman kibar olun."
+      notify_user_textarea_label: "Kullanıcı için mesaj"
       custom_placeholder_notify_moderators: "Bize özellikle ne konuda endişe duyduğunuzu bildirin ve mümkünse ilgili bağlantı ve örnekler ekleyin."
+      notify_moderators_textarea_label: "Moderatörler için mesaj"
       custom_message:
         at_least:
           one: "en az %{count} karakter girin"
@@ -3568,6 +3632,10 @@ tr_TR:
     filters:
       with_topics: "%{filter} konular"
       with_category: "%{filter} %{category} konular"
+      filter:
+        title: "Filtrele"
+        button:
+          label: "Filtrele"
       latest:
         title: "En son"
         title_with_count:
@@ -3638,7 +3706,6 @@ tr_TR:
         this_week: "Hafta"
         today: "Bugün"
     browser_update: 'Ne yazık ki <a href="https://www.discourse.org/faq/#browser">tarayıcınız desteklenmiyor</a>. Lütfen zengin içeriği görüntülemek, giriş yapmak ve yanıtlamak için <a href="https://browsehappy.com">desteklenen bir tarayıcıya geçin.</a>'
-    safari_13_warning: Bu site yakında iOS ve Safari sürüm 13 ve altını desteklemeyecek. Basitleştirilmiş ve salt okunur bir sürüm kullanılabilir olmaya devam edecek. (<a href="https://meta.discourse.org/t/224747">daha fazla bilgi</a>)
     permission_types:
       full: "Oluştur / Yanıtla / Bak"
       create_post: "Yanıtla / Bak"
@@ -3653,6 +3720,20 @@ tr_TR:
       close: "Kapat (Esc)"
       content_load_error: '<a href="%url%">İçerik</a> yüklenemedi.'
       image_load_error: '<a href="%url%">Görüntü</a> yüklenemedi.'
+    experimental_lightbox:
+      image_load_error: "Resim yüklenemedi."
+      screen_reader_image_title: "Resim %{current} / %{total}: %{title}"
+      buttons:
+        next: "İleri (Sağ veya aşağı ok tuşu)"
+        previous: "Önceki (Sol veya yukarı ok tuşu)"
+        close: "Kapat (Esc)"
+        download: "Resmi indir"
+        newtab: "Resmi yeni bir sekmede aç"
+        zoom: "Görüntüyü yakınlaştır/uzaklaştır (Z tuşu)"
+        rotate: "Görüntüyü döndür (R tuşu)"
+        fullscreen: "Tarayıcı tam ekran modunu aç/kapat (M tuşu)"
+        carousel: "Tüm resimleri bir karuselde göster (A tuşu)"
+        retry: "Resmi yüklemeyi yeniden dene"
     cannot_render_video: Tarayıcınız codec'i desteklemediği için bu video işlenemiyor.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
@@ -3700,6 +3781,7 @@ tr_TR:
         title: "Beste yapma"
         return: "%{shortcut} Besteciye dön"
         fullscreen: "%{shortcut} Tam ekran besteci"
+        insert_current_time: "%{shortcut} Mevcut saati girin"
       bookmarks:
         title: "Yer İmi Ekleme"
         enter: "%{shortcut} Kaydet ve kapat"
@@ -3745,7 +3827,9 @@ tr_TR:
         one: "Bu rozeti %{count} kez kazandı"
         other: "Bu rozeti %{count} kez kazandı"
       granted_on: "%{date} tarihinde verildi"
-      others_count: "Bu rozete sahip diğer kişiler (%{count})"
+      others_count:
+        one: "Başkalarına %{count} kez verildi"
+        other: "Başkalarına %{count} kez verildi"
       title: Rozetler
       allow_title: "Bu rozeti başlık olarak kullanabilirsiniz"
       multiple_grant: "Bunu birden çok kez kazanabilirsiniz"
@@ -3758,6 +3842,7 @@ tr_TR:
       granted:
         one: "%{count} verildi"
         other: "%{count} verildi"
+      awarded: etiketi verildi
       select_badge_for_title: Başlığınız olarak kullanmak için bir rozet seçin
       none: "(hiçbiri)"
       successfully_granted: "%{username} adlı kullanıcıya başarıyla %{badge} verildi"
@@ -3928,13 +4013,11 @@ tr_TR:
     pause_notifications:
       title: "Şunlar için bildirimleri duraklat..."
       label: "Bildirimleri duraklat"
-      remaining: "%{remaining} kaldı"
       options:
         half_hour: "30 dakika"
         one_hour: "1 saat"
         two_hours: "2 saat"
         tomorrow: "Yarına kadar"
-        custom: "Özel"
       set_schedule: "Bildirim zamanlaması ayarla"
     trust_levels:
       names:
@@ -3983,7 +4066,61 @@ tr_TR:
       more: "Daha fazla"
       all_categories: "Tüm kategoriler"
       all_tags: "Tüm etiketler"
+      categories_form_modal:
+        title: "Kategorilerde gezinmeyi düzenle"
+        subtitle:
+          text: "ve bu sitenin en popüler kategorilerini otomatik olarak göstereceğiz"
+        filter_placeholder: "Kategorileri filtrele"
+        no_categories: "Bu terimle eşleşen kategori yok."
+      tags_form_modal:
+        title: "Etiketlerde gezinmeyi düzenle"
+        filter_placeholder: "Etiketleri filtrele"
+        no_tags: "Verilen terimle eşleşen etiket yok."
+        subtitle:
+          text: "ve bu sitenin en popüler etiketlerini otomatik olarak göstereceğiz"
+      edit_navigation_modal_form:
+        deselect_button_text: "Hiçbirini seçme"
+        reset_to_defaults: "Varsayılanlara dön"
+        filter_dropdown:
+          all: "Hepsi"
+          selected: "Seçili"
+          unselected: "Seçilmemiş"
       sections:
+        custom:
+          add: "Özel bölüm ekle"
+          edit: "Özel bölüm düzenle"
+          save: "Kaydet"
+          delete: "Sil"
+          delete_confirm: "Bu bölümü silmek istediğinizden emin misiniz?"
+          reset_confirm: "Bu bölümü varsayılana sıfırlamak istediğinizden emin misiniz?"
+          public: "Bu bölümü herkese açık ve herkes tarafından görülebilir hale getir"
+          always_public: "Bu bölümdeki içerik her zaman herkese açıktır"
+          more_menu: "Daha fazla menü"
+          links:
+            add: "Başka bir bağlantı ekle"
+            delete: "Bağlantıyı sil"
+            reset: "Varsayılana sıfırla"
+            icon:
+              label: "Simge"
+              validation:
+                blank: "Simge boş olamaz"
+                maximum: "Simge %{count} karakterden kısa olmalıdır"
+            name:
+              label: "Ad"
+              validation:
+                blank: "İsim boş olamaz"
+                maximum: "İsim %{count} karakterden kısa olmalıdır"
+            value:
+              label: "Bağlantı"
+              validation:
+                blank: "Bağlantı boş olamaz"
+                maximum: "Bağlantı %{count} karakterden kısa olmalıdır"
+                invalid: "Biçim geçersiz"
+          title:
+            label: "Bölüm başlığı"
+            validation:
+              blank: "Başlık boş olamaz"
+              maximum: "Başlık %{count} karakterden kısa olmalıdır"
         about:
           header_link_text: "Hakkında"
         messages:
@@ -3998,28 +4135,21 @@ tr_TR:
             unread_with_count: "Okunmamış (%{count})"
             archive: "Arşiv"
         tags:
-          links:
-            add_tags:
-              content: "Etiket ekle"
-              title: "Etiket eklemediniz. Başlamak için tıklayın."
           none: "Etiket eklemediniz."
           click_to_get_started: "Başlamak için buraya tıklayın."
           header_link_text: "Etiketler"
           header_action_title: "Kenar çubuğu etiketlerinizi düzenleyin"
           configure_defaults: "Varsayılanları yapılandır"
         categories:
-          links:
-            add_categories:
-              content: "Kategori ekle"
-              title: "Kategori eklemediniz. Başlamak için tıklayın."
           none: "Kategori eklemediniz."
           click_to_get_started: "Başlamak için buraya tıklayın."
           header_link_text: "Kategoriler"
           header_action_title: "Kenar çubuğu kategorilerinizi düzenleyin"
           configure_defaults: "Varsayılanları yapılandır"
         community:
-          header_link_text: "Topluluk"
-          header_action_title: "Yeni konu oluşturun"
+          edit_section:
+            sidebar: "Bu bölümü kişiselleştirin"
+            header_dropdown: "Kişiselleştir"
           links:
             about:
               content: "Hakkında"
@@ -4030,8 +4160,8 @@ tr_TR:
             badges:
               content: "Rozetler"
               title: "Kazanılabilecek tüm rozetler"
-            everything:
-              content: "Her şey"
+            topics:
+              content: "Konular"
               title: "Tüm konular"
             faq:
               content: "SSS"
@@ -4044,6 +4174,7 @@ tr_TR:
               title: "Tüm kullanıcıların listesi"
             my_posts:
               content: "Gönderilerim"
+              content_drafts: "Taslaklarım"
               title: "Son konu etkinliğim"
               title_drafts: "Gönderilmemiş taslaklarım"
               draft_count:
@@ -4053,11 +4184,43 @@ tr_TR:
               content: "İncele"
               title: "Bayrak eklenen gönderiler ve diğer sıraya alınmış ögeler"
               pending_count: "%{count} beklemede"
+        global_section: "Genel bölüm, herkes tarafından görülebilir"
+      panels:
+        forum:
+          label: Forum
     welcome_topic_banner:
       title: "Karşılama Konunuzu oluşturun"
       description: "Karşılama konunuz, yeni üyelerin okuyacağı ilk şeydir. Bunu “asansör konuşmanız” veya “hedef tanımınız” olarak düşünün. Herkese bu topluluğun kimler için olduğunu, burada ne bulmayı bekleyebileceklerini ve önce ne yapmalarını istediğinizi açıklayın."
       button_title: "Düzenlemeye Başla"
     until: "Şuna kadar:"
+    char_counter:
+      exceeded: "İzin verilen maksimum karakter sayısı aşıldı."
+    form_template_chooser:
+      select_template: "Form şablonlarını seçin"
+    form_templates:
+      errors:
+        valueMissing:
+          default: "Lütfen bu alanı doldurun."
+          text: "Lütfen bu alanı doldurun."
+          select-one: "Lütfen listeden bir öge seçin."
+          select-multiple: "Lütfen listeden en az bir öge seçin."
+          checkbox: "Devam etmek istiyorsanız lütfen bu kutuyu işaretleyin."
+        typeMismatch:
+          default: "Lütfen geçerli bir değer girin."
+          color: "Lütfen bir renk girin."
+          date: "Lütfen bir tarih girin."
+          email: "Lütfen geçerli bir e-posta adresi girin."
+          number: "Lütfen bir sayı girin."
+          password: "Lütfen geçerli bir şifre girin."
+          tel: "Lütfen geçerli bir telefon numarası girin."
+          text: "Lütfen bir metin değeri girin."
+          url: "Lütfen geçerli bir URL girin."
+        tooShort: "Girdi %{minLength} karakter veya daha uzun olmalıdır."
+        tooLong: "Girdi %{maxLength} karakterden az olmalıdır."
+        rangeOverflow: "Girdi en fazla %{max} olmalıdır"
+        rangeUnderflow: "Girdi en az %{min} olmalıdır."
+        patternMismatch: "Lütfen istenen formata uyun."
+        badInput: "Lütfen geçerli bir girdi girin."
   admin_js:
     type_to_filter: "filtrelemek için yazın..."
     admin:
@@ -4216,10 +4379,14 @@ tr_TR:
         about: "Grup üyeliğinizi ve adlarınızı burada düzenleyin"
         group_members: "Grup üyeleri"
         delete: "Sil"
-        delete_confirm: "Bu grubu silmek istediğinizden emin misiniz?"
+        delete_confirm: "%{group} adlı grubu silmek istediğinizden emin misiniz?"
+        delete_details:
+          one: "%{count} kişi bu gruba erişimini kaybedecek"
+          other: "%{count} kişi bu gruba erişimi kaybedecek"
         delete_with_messages_confirm:
-          one: "Bu grubun silinmesi %{count} mesajın artık olmasına neden olacak, grup üyeleri artık mesaja erişemeyecek."
-          other: "Bu grubun silinmesi %{count} mesajın artık olmasına neden olacak, grup üyeleri artık bu mesajlara erişemeyecek."
+          one: "%{count} mesaj grup üyeleri tarafından erişilemez hale gelecek"
+          other: "%{count} mesaj grup üyeleri tarafından erişilemez hale gelecek"
+        delete_warning: "Silinen gruplar kurtarılamaz"
         delete_failed: "Grup silinemiyor. Bu otomatik bir grupsa yok edilemez."
         delete_automatic_group: Bu otomatik bir grup ve silinemez.
         delete_owner_confirm: "\"%{username}\" için sahiplik ayrıcalığı kaldırılsın mı?"
@@ -4285,10 +4452,16 @@ tr_TR:
             topics:
               read: Bir konuyu veya içindeki belirli bir gönderiyi okuyun. RSS de desteklenir.
               write: Yeni bir konu oluşturun veya mevcut bir konuya gönderin.
-              update: Bir konuyu güncelleyin. Başlığı, kategoriyi, etiketleri vb. değiştirin.
+              update: Bir konuyu güncelleyin. Başlığı, kategoriyi, etiketleri, durumu, arketipi, öne çıkan_bağlantıyı vb. değiştirin.
+              delete: Bir konuyu sil.
               read_lists: En iyi, yeni, en son vb. gibi konu listelerini okuyun. RSS de desteklenir.
+              status: "Bir konunun durumunu güncelleyin. Durum: kapalı, arşiv, görünür, sabitlenmiş. Etkin: true, false. Yalnızca o kategorideki konuların durum değişikliklerine izin vermek için burada ve istek yükünde bir category_id belirtin."
             posts:
               edit: Herhangi bir gönderiyi veya belirli bir gönderiyi düzenleyin.
+              delete: Bir gönderiyi sil.
+              list: Son gönderileri ve özel gönderileri listeleyin. RSS de desteklenir.
+            tags:
+              list: Etiketleri listele.
             categories:
               list: Kategorilerin bir listesini alın.
               show: Kimliğe göre tek bir kategori alın.
@@ -4302,6 +4475,7 @@ tr_TR:
               update: Kullanıcı profili bilgilerini güncelleyin.
               log_out: Bir kullanıcı için tüm oturumları kapatın.
               anonymize: Kullanıcı hesaplarını anonimleştirin.
+              suspend: Kullanıcı hesaplarını askıya alın.
               delete: Kullanıcı hesaplarını silin.
               list: Kullanıcıların bir listesini alın.
             user_status:
@@ -4309,6 +4483,8 @@ tr_TR:
               update: Kullanıcı durumunu güncelleyin.
             email:
               receive_emails: Gelen e-postaları işlemek için bu kapsamı posta alıcısı ile birleştirin.
+            invites:
+              create: E-posta davetiyeleri gönderin veya davet bağlantıları oluşturun.
             badges:
               create: Yeni bir rozet oluşturun.
               show: Bir rozet hakkında bilgi edinin.
@@ -4317,6 +4493,12 @@ tr_TR:
               list_user_badges: Kullanıcı rozetlerini listeleyin.
               assign_badge_to_user: Kullanıcıya bir rozet atayın.
               revoke_badge_from_user: Kullanıcıdan bir rozeti iptal edin.
+            groups:
+              manage_groups: Grup üyelerini listele, ekle ve kaldır.
+              administer_groups: Grupları listele, göster, oluştur, güncelle ve sil.
+            search:
+              show: '`/search.json?q=term` uç noktasını kullanarak arama yapın.'
+              query: '`/search/query?term=term` uç noktasını kullanarak arama yapın.'
             wordpress:
               publishing: WP Discourse eklentisi yayınlama özellikleri için gerekli (zorunlu).
               commenting: WP Discourse eklentisi yorumlama özellikleri için gerekli.
@@ -4383,8 +4565,8 @@ tr_TR:
           name: "Kullanıcı Tarafından Tanıtılan Olay"
           details: "Bir kullanıcı bir güven seviyesinden diğerine terfi ettiğinde."
         user_badge_event:
-          name: "Rozet Verme Olayı"
-          details: "Bir kullanıcı bir rozet aldığında."
+          name: "Rozet Olayı"
+          details: "Bir rozet verildiğinde veya iptal edildiğinde."
         group_user_event:
           name: "Grup Kullanıcı Olayı"
           details: "Bir kullanıcı bir gruba eklendiğinde veya gruptan çıkarıldığında."
@@ -4427,7 +4609,7 @@ tr_TR:
         enabled: "Etkin mi?"
         is_enabled: "E"
         not_enabled: "H"
-        change_settings: "Ayarları Değiştir"
+        change_settings: "Eklenti Ayarları"
         change_settings_short: "Ayarlar"
         howto: "Eklentileri nasıl yüklerim?"
         official: "Resmi Eklenti"
@@ -4681,6 +4863,9 @@ tr_TR:
           embedded_scss:
             text: "Gömülü CSS"
             title: "Yorumların gömülü sürümü ile teslim etmek için özel CSS girin"
+          embedded_header:
+            text: "Gömülü Başlık"
+            title: "Yorumların gömülü sürümünün üzerinde gösterilecek HTML'yi girin"
           color_definitions:
             text: "Renk Tanımları"
             title: "Özel renk tanımları girin (yalnızca ileri seviye kullanıcılar)"
@@ -4759,6 +4944,12 @@ tr_TR:
           love:
             name: "sevgi"
             description: "Beğen düğmesinin rengi."
+          selected:
+            name: "seçili"
+            description: "Liste ögeleri gibi ögelerin seçildiklerinde/etkin olduklarında arka plan rengi."
+          hover:
+            name: "üzerine gelin"
+            description: "Liste ögeleri gibi ögelerin üzerine gelindiğinde veya klavye odağına sahip olduklarında arka plan rengi."
         robots:
           title: "Sitenizin robots.txt dosyasını geçersiz kılın:"
           warning: "Bu, ilgili tüm site ayarlarını kalıcı olarak geçersiz kılar."
@@ -4889,6 +5080,7 @@ tr_TR:
           no_previous: "Bir önceki değer yok."
           deleted: "Yeni değer yok. Kayıt silindi."
           actions:
+            permanently_delete_post_revisions: "gönderi revizyonlarını kalıcı olarak sil"
             delete_user: "kullanıcıyı sil"
             change_trust_level: "güven seviyesini değiştir"
             change_username: "kullanıcı adını değiştir"
@@ -4922,6 +5114,7 @@ tr_TR:
             revoke_moderation: "moderasyonu iptal et"
             backup_create: "yedekleme oluştur"
             deleted_tag: "silinmiş etiket"
+            update_directory_columns: "dizin sütunlarını güncelle"
             deleted_unused_tags: "kullanılmayan etiketler silindi"
             renamed_tag: "yeniden adlandırılmış etiket"
             revoke_email: "e-postayı iptal et"
@@ -4980,6 +5173,10 @@ tr_TR:
             delete_group: "grubu sil"
             watched_word_create: "izlenen kelime ekle"
             watched_word_destroy: "izlenen kelimeyi sil"
+            create_public_sidebar_section: "herkese açık kenar çubuğu bölümü oluştur"
+            update_public_sidebar_section: "herkese açık kenar çubuğu bölümünü güncelle"
+            destroy_public_sidebar_section: "herkese açık kenar çubuğu bölümünü yok et"
+            reset_bounce_score: "geri dönme puanını sıfırla"
         screened_emails:
           title: "Taranan E-postalar"
           description: "Biri yeni bir hesap oluşturmaya çalıştığında, aşağıdaki e-posta adresleri kontrol edilir ve kayıt engellenir veya başka bir işlem gerçekleştirilir."
@@ -5043,14 +5240,14 @@ tr_TR:
           silence: "Sustur"
           link: "Bağlantı"
         action_descriptions:
-          block: "Bu kelimeleri içeren gönderilerin yayınlanmasını engelleyin. Kullanıcı, gönderisini göndermeye çalıştığında bir hata mesajı görür."
+          block: "Bu kelimeleri içeren bir gönderi oluşturulmaya çalışıldığında bir hata mesajı görüntülenir."
           censor: "Bu kelimeleri içeren gönderilere izin verin, ancak bunları sansürlü kelimeleri gizleyen karakterlerle değiştirin."
-          require_approval: "Bu kelimeleri içeren gönderilerin görülebilmesi için personel tarafından onaylanması gerekir."
-          flag: "Bu kelimeleri içeren gönderilere izin verin, ancak moderatörlerin inceleyebilmesi için bunlara uygunsuz bayrağı ekleyin."
-          replace: "Gönderilerdeki kelimeleri başka kelimelerle değiştirin"
-          tag: "Konuları ilk gönderiye göre otomatik olarak etiketleyin"
-          silence: "Kullanıcıların bu kelimeleri içeren ilk gönderilerinin görülebilmesi için personel tarafından onaylanması gerekir ve kullanıcı otomatik olarak susturulur."
-          link: "Gönderilerdeki kelimeleri bağlantılarla değiştirin"
+          require_approval: "Bu kelimeleri içeren gönderilerin başkaları tarafından görülebilmesi için önce personel onayı gerektirin."
+          flag: "Bu kelimeleri içeren gönderilere izin verin, ancak moderatörlerin incelemesi için uygunsuz olarak bayrak ekleyin."
+          replace: "Gönderilerdeki kelimeleri başka kelimelerle değiştirin."
+          tag: "İlk gönderi belirli bir kelime içeriyorsa konuları otomatik olarak etiketleyin."
+          silence: "İlk gönderileri bu kelimelerden herhangi birini içeriyorsa yeni hesapları sessize alın. Personel onaylayana kadar gönderi otomatik olarak gizlenir."
+          link: "Gönderilerdeki kelimeleri bağlantılarla değiştirin."
         form:
           label: "Kelime veya kelime öbeği içerir"
           placeholder: "Kelime veya kelime öbeği girin (* joker karakterdir)"
@@ -5073,6 +5270,88 @@ tr_TR:
           description: "İzlenen kelimelerle eşleşmeleri kontrol etmek için aşağıya metin girin"
           found_matches: "Bulunan eşlemeler:"
           no_matches: "Eşleşme bulunamadı"
+      form_templates:
+        nav_title: "Şablonlar"
+        title: "Form Şablonları"
+        help: "Yeni konular, gönderiler ve mesajlar oluşturmak için kullanılabilecek bir şablon yapısı oluşturun."
+        new_template: "Yeni Şablon"
+        list_table:
+          headings:
+            name: "Ad"
+            active_categories: "Aktif Kategoriler"
+            actions: "Eylemler"
+          actions:
+            view: "Şablonu Görüntüle"
+            edit: "Şablonu Düzenle"
+            delete: "Şablonu Sil"
+        view_template:
+          close: "Bitir"
+          edit: "Düzenle"
+          delete: "Sil"
+          toggle_preview: "Ön İzlemeyi aç/kapat"
+        new_template_form:
+          submit: "Kaydet"
+          cancel: "İptal et"
+          name:
+            label: "Şablon Adı"
+            placeholder: "Bu şablon için bir ad girin..."
+          template:
+            label: "Şablon"
+            placeholder: "Burada bir YAML şablonu oluşturun..."
+          preview: "Ön izleme"
+        delete_confirm: "Bu şablonu silmek istediğinizden emin misiniz?"
+        quick_insert_fields:
+          add_new_field: "Ekle"
+          checkbox: "Onay kutusu"
+          input: "Kısa cevap"
+          textarea: "Uzun cevap"
+          dropdown: "Açılır Menü"
+          upload: "Dosya yükle"
+          multiselect: "Çoktan seçmeli"
+        validations_modal:
+          button_title: "Doğrulamalar"
+          modal_title: "Doğrulama Seçenekleri"
+          table_headers:
+            key: "Anahtar"
+            type: "Tür"
+            description: "Açıklama"
+          validations:
+            required:
+              key: "zorunlu"
+              type: "mantıksal"
+              description: "Formu göndermek için alanın doldurulması gerekir."
+            minimum:
+              key: "en az"
+              type: "tamsayı"
+              description: "Metin alanları için, izin verilen minimum karakter sayısı."
+            maximum:
+              key: "en fazla"
+              type: "tamsayı"
+              description: "Metin alanları için izin verilen maksimum karakter sayısı."
+            pattern:
+              key: "desen"
+              type: "regex dizesi"
+              description: "Metin alanları için, izin verilen girdiyi belirten düzenli ifade."
+            type:
+              key: "tür"
+              type: "metin"
+              description: "Giriş alanları için, beklenen giriş türünü belirtebilirsiniz (metin|e-posta|tarih|numara|url|tel|renk)"
+        preview_modal:
+          title: "Şablon Önizlemesi"
+        field_placeholders:
+          validations: "doğrulamaları buraya girin"
+          label: "Etiketi buraya girin"
+          placeholder: "Yer tutucuyu buraya girin"
+          none_label: "Bir öğe seçin"
+          choices:
+            first: "Seçenek 1"
+            second: "Seçenek 2"
+            third: "Seçenek 3"
+        edit_category:
+          toggle_freeform: "form şablonu devre dışı"
+          toggle_form_template: "form şablonu etkin"
+          select_template: "Form şablonları seçin"
+          select_template_help: "Form Şablonları Ekle/Düzenle"
       impersonate:
         title: "Kimliğine Bürün"
         help: "Hata ayıklama amacıyla bir kullanıcı hesabının kimliğine bürünmek için bu aracı kullanın. Bittiğinde oturumu kapatmanız gerekecek."
@@ -5085,6 +5364,7 @@ tr_TR:
         not_found: "Üzgünüz, bu kullanıcı adı sistemimizde bulunmuyor."
         id_not_found: "Üzgünüz, bu kullanıcı kimliği sistemimizde bulunmuyor."
         active: "Etkinleştirildi"
+        status: "Durum"
         show_emails: "E-postaları Göster"
         hide_emails: "E-postaları gizle"
         nav:
@@ -5173,7 +5453,6 @@ tr_TR:
         show_admin_profile: "Yönetici"
         manage_user: "Kullanıcıyı yönet"
         show_public_profile: "Herkese Açık Profili Göster"
-        impersonate: "Kimliğine Bürün"
         action_logs: "Eylem Günlükleri"
         ip_lookup: "IP Arama"
         log_out: "Çıkış Yap"
@@ -5409,8 +5688,16 @@ tr_TR:
         go_back: "Aramaya geri dön"
         recommended: "Aşağıdaki metni ihtiyaçlarınıza göre özelleştirmenizi öneririz:"
         show_overriden: "Yalnızca geçersiz kılınanları göster"
+        show_outdated: "Yalnızca eski/geçersiz olanları göster"
         locale: "Dil:"
         more_than_50_results: "50'den fazla sonuç var. Lütfen aramanızı daraltın."
+        interpolation_keys: "Mevcut enterpolasyon tuşları:"
+        outdated:
+          title: "Bu çeviri güncel değil"
+          description: "Bu anahtar için varsayılan çeviri, bu geçersiz kılma oluşturulduktan sonra değişti. Lütfen aşağıdan çevirinizin orijinal amaçta yapılan değişikliklerle eşleşip eşleşmediğini kontrol edin."
+          old_default: "Eski varsayılan"
+          new_default: "Yeni varsayılan"
+          dismiss: "Kapat"
       settings:
         show_overriden: "Yalnızca geçersiz kılınanları göster"
         history: "Değişiklik geçmişini görüntüle"
@@ -5423,7 +5710,9 @@ tr_TR:
             label: "Emoji ekle"
         title: "Ayarlar"
         no_results: "Sonuç bulunamadı."
-        more_than_30_results: "30'dan fazla sonuç var. Lütfen aramanızı daraltın veya bir kategori seçin."
+        more_site_setting_results:
+          one: "Birden çok sonuç var. Lütfen aramanızı daraltın veya bir kategori seçin."
+          other: "%{count} adetten çok sonuç var. Lütfen aramanızı daraltın veya bir kategori seçin."
         clear_filter: "Temizle"
         add_url: "URL ekle"
         add_host: "sunucu ekle"
@@ -5510,7 +5799,8 @@ tr_TR:
         allow_title: Rozetin başlık olarak kullanılmasına izin verin
         multiple_grant: Birden çok kez verilebilir
         listable: Rozeti herkese açık rozetler sayfasında gösterin
-        enabled: Rozeti etkinleştir
+        enabled: etkin mi
+        disabled: devre Dışı
         icon: Simge
         image: Görsel
         graphic: Grafik
@@ -5580,10 +5870,14 @@ tr_TR:
       embedding:
         get_started: "Discourse'u başka bir web sitesine yerleştirmek istiyorsanız bu sitenin sunucusunu eklemekle işe başlayın."
         confirm_delete: "Bu sunucuyu silmek istediğinizden emin misiniz?"
-        sample: "Discourse konuları oluşturmak ve gömmek için aşağıdaki HTML kodunu sitenize yapıştırın. <b>REPLACE_ME</b> kısmını, gömdüğünüz sayfanın standart URL'si ile değiştirin."
+        sample: |
+          <p>Discourse konuları oluşturmak ve gömmek için aşağıdaki HTML kodunu sitenize yapıştırın. <b>EMBED_URL</b> yerine bunu gömdüğünüz sayfanın kanonik URL'sini yazın.</p>
+
+          <p>Stili özelleştirmek istiyorsanız <b>CLASS_NAME</b> ifadesini kaldırın ve temanızın <i>Embedded CSS</i> bölümünde tanımlanan bir CSS sınıfı ile değiştirin.</p>
+
+          <p> <b>DISCOURSE_USERNAME</b> yerine konuyu oluşturacak yazarın Discourse kullanıcı adını yazın. Discourse kullanıcıyı otomatik olarak <code>name</code> niteliği <code>discourse-username</code> veya <code>author</code>olarak ayarlanmış <code>&lt;meta&gt;</code> etiketlerinin <code>content</code> niteliğine göre arayacaktır. <code>discourseUserName</code> parametresi kullanımdan kaldırıldı ve Discourse 3.2'de kaldırılacaktır.</p>
         title: "Yerleştirme"
         host: "İzin Verilen Sunucular"
-        class_name: "Sınıf adı"
         allowed_paths: "Yol İzin Verilenler Listesi"
         edit: "düzenle"
         category: "Kategoriye Gönder"
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index 18f587c5a10..eddb0256fee 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -200,6 +200,8 @@ uk:
       facebook: "Поділитися у Facebook"
       email: "Надіслати електронною поштою"
       url: "Скопіювати та поширити посилання"
+    word_connector:
+      comma: ", "
     action_codes:
       public_topic: "Робить цю тему публічною %{when}"
       open_topic: "Перетворив це на тему %{when}"
@@ -211,6 +213,8 @@ uk:
       removed_user: "Вилучив %{who} %{when}"
       removed_group: "Вилучив %{who} %{when}"
       autobumped: "Автоматично піднято %{when}"
+      tags_changed: "Теги оновлено %{when}"
+      category_changed: "Категорія оновлена %{when}"
       autoclosed:
         enabled: "Закрито %{when}"
         disabled: "Відкрито %{when}"
@@ -235,19 +239,13 @@ uk:
       forwarded: "Переслано вказаний вище електронний лист"
     topic_admin_menu: "дії теми"
     skip_to_main_content: "Перейти до основного вмісту"
+    skip_user_nav: "Перейти до вмісту профілю"
     emails_are_disabled: "Надсилання повідомлень електронною поштою було глобально вимкнено адміністратором. Жодне сповіщення електронною поштою не буде надіслано."
     emails_are_disabled_non_staff: "Надсилання листів електронною поштою було вимкнено для користувачів, які не є членами команди обслуговування."
     software_update_prompt:
       message: "Ми оновили цей сайт, <span>оновіть сторінку</span>, інакше у вас може виникнути неочікувана поведінка."
       dismiss: "Відхилити"
-    bootstrap_mode_enabled:
-      one: "Щоб полегшити запуск вашого нового сайту, ви перебуваєте в режимі початкового завантаження. Усім новим користувачам буде надано рівень довіри 1 і їм буде ввімкнено щоденні електронні листи з підсумками. Це буде автоматично вимкнено, коли приєднається %{count} користувач."
-      few: "Щоб полегшити запуск вашого нового сайту, ви перебуваєте в режимі початкового завантаження. Усім новим користувачам буде надано рівень довіри 1 і їм буде ввімкнено щоденні електронні листи з підсумками. Це буде автоматично вимкнено, коли приєднається %{count} користувачі."
-      many: "Щоб полегшити запуск вашого нового сайту, ви перебуваєте в режимі початкового завантаження. Усім новим користувачам буде надано рівень довіри 1 і їм буде ввімкнено щоденні електронні листи з підсумками. Це буде автоматично вимкнено, коли приєднається %{count} користувачів."
-      other: "Щоб полегшити запуск вашого нового сайту, ви перебуваєте в режимі початкового завантаження. Усім новим користувачам буде надано рівень довіри 1 і їм буде ввімкнено щоденні електронні листи з підсумками. Це буде автоматично вимкнено, коли приєднається %{count} користувачів."
-    bootstrap_mode_disabled: "Режим початкового завантаження буде вимкнено протягом 24 годин."
-    bootstrap_invite_button_title: "Надіслати запрошення"
-    bootstrap_wizard_link_title: "Завершити роботу майстра налаштування"
+    bootstrap_mode: "Початок роботи"
     themes:
       default_description: "Типово"
       broken_theme_alert: "Ваш сайт не може працювати, оскільки тема / компонент має помилки."
@@ -366,11 +364,11 @@ uk:
       edit_bookmark: "Редагувати закладку"
       clear_bookmarks: "Очистити закладки"
       help:
-        bookmark: "Клацніть, щоб додати перший допис на цю тему в закладки"
-        edit_bookmark: "Натисніть, щоб редагувати закладку на цю тему"
+        bookmark: "Натисніть, щоб додати цю тему до закладок"
+        edit_bookmark: "Натисніть, щоб змінити закладку на повідомлення в цій темі"
         edit_bookmark_for_topic: "Натисніть, щоб редагувати закладку для цієї теми"
         unbookmark: "Натисніть, щоб видалити всі закладки в цій темі"
-        unbookmark_with_reminder: "Натисніть, щоб видалити всі закладки та нагадування в цій темі."
+        unbookmark_with_reminder: "Натисніть, щоб видалити всі закладки та нагадування в цій темі"
     bookmarks:
       created: "Ви додали цей допис в закладки. %{name}"
       created_generic: "Ви створили закладку. %{name}"
@@ -414,7 +412,7 @@ uk:
       new_topic: "Чернетка нової теми"
       new_private_message: "Чернетка нового приватного повідомлення"
       abandon:
-        confirm: "У вас є чернетка цієї теми. Які дії виконати щодо неї?"
+        confirm: "У вас вже є чернетка. Які дії виконати з нею?"
         yes_value: "Відхилити"
         no_value: "Продовжити редагування"
     topic_count_categories:
@@ -477,6 +475,8 @@ uk:
         search: "Пошук повідомлення"
         placeholder: "введіть тут назву, URL-адресу або ідентифікатор"
     review:
+      show_more: "Показати більше"
+      show_less: "Показати менше"
       order_by: "Сортувати за"
       date_filter: "Опубліковано між"
       in_reply_to: "у відповідь на"
@@ -611,26 +611,43 @@ uk:
       scores:
         about: "Цей бал розраховується на основі рівня довіри доповідача, відповідності їхніх попередніх скарг та пріоритету елемента, про який було сповіщено."
         score: "Бал"
-        date: "Дата"
-        type: "Тип"
+        date: "Дата звіту"
+        type: "Причина"
         status: "Статус"
-        submitted_by: "Подано"
+        submitted_by: "Повідомлення від"
         reviewed_by: "Розглянуто"
+        reviewed_timestamp: "Дата розгляду"
       statuses:
         pending:
           title: "В очікуванні"
         approved:
           title: "Схвалено"
+        approved_flag:
+          title: "Прапор затверджено"
+        approved_user:
+          title: "Користувач затверджений"
+        approved_post:
+          title: "Допис затверджено"
         rejected:
           title: "Відхилено"
+        rejected_flag:
+          title: "Прапор відхилено"
+        rejected_user:
+          title: "Користувача відхилено"
+        rejected_post:
+          title: "Допис відхилено"
         ignored:
-          title: "Проігноровано"
+          title: "Прапор ігнорується"
         deleted:
-          title: "Вилучено"
+          title: "Тему або допис видалено"
         reviewed:
-          title: "(усі розглянуті)"
+          title: "Усі розглянуті"
         all:
-          title: "(усе)"
+          title: "Усе"
+      context_question:
+        is_this_post: "Це повідомлення %{reviewable_human_score_types}?"
+        delimiter: "або"
+        something_else_wrong: "Щось не так з цим дописом?"
       types:
         reviewable_flagged_post:
           title: "Позначений допис"
@@ -643,6 +660,8 @@ uk:
           title: "Користувач"
         reviewable_post:
           title: "Допис"
+        reviewable_chat_message:
+          title: "Позначене повідомлення чату"
       approval:
         title: "Допис потребує схвалення"
         description: "Ми отримали ваш новий допис, але він потребує схвалення модератором, перш ніж зʼявитися. Будь ласка, будьте терплячі."
@@ -953,6 +972,7 @@ uk:
         make_all_primary_description: "Зробити основною групою для всіх вибраних користувачів"
         remove_all_primary: "Видалити як основну"
         remove_all_primary_description: "Видалити цю групу як основну"
+        status: "Статус"
         owner: "Власник"
         primary: "Основна"
         forbidden: "Ви не можете переглядати учасників."
@@ -1091,10 +1111,12 @@ uk:
       mute: "Приглушити"
       edit: "Редагувати налаштування"
       download_archive:
-        button_text: "Завантажити все"
-        confirm: "Ви впевнені, що хочете завантажити свої дописи?"
-        success: "Завантаження розпочато, ви отримаєте повідомлення, коли процес завершиться."
-        rate_limit_error: "Дописи можна завантажити раз на день, будь ласка, спробуйте завтра."
+        title: "Експортуйте свої дані"
+        description: "Завантажте архів активності та налаштувань свого облікового запису."
+        button_text: "Запит архіву"
+        confirm: "Ви справді хочете завантажити архів активності та налаштувань вашого облікового запису?"
+        success: "Ми почали збирати ваш архів, після завершення процесу ви отримаєте повідомлення."
+        rate_limit_error: "Архіви можна завантажувати один раз на добу, будь ласка, повторіть спробу завтра."
       new_private_message: "Нове повідомлення"
       private_message: "Повідомлення"
       private_messages: "Повідомлення"
@@ -1147,6 +1169,7 @@ uk:
           warning: "Ви впевнені, що хочете очистити свої закріплені теми?"
       use_current_timezone: "Використовувати поточний часовий пояс"
       profile_hidden: "Публічний профіль цього користувача прихований."
+      inactive_user: "Цей користувач більше не активний."
       expand_profile: "Розгорнути"
       sr_expand_profile: "Розгорнути детальну інформацію"
       collapse_profile: "Згорнути"
@@ -1166,7 +1189,7 @@ uk:
         perm_denied_expl: "Ви заборонили сповіщення. Дозвольте сповіщення у налаштуваннях свого оглядача."
         disable: "Вимкнути сповіщення"
         enable: "Увімкнути сповіщення"
-        each_browser_note: 'Примітка. Вам потрібно змінити це налаштування в кожному браузері, який ви використовуєте. Усі сповіщення буде вимкнено, якщо призупинити сповіщення в меню користувача, незалежно від цього налаштування.'
+        each_browser_note: "Примітка. Вам потрібно змінити це налаштування в кожному браузері, який ви використовуєте. Усі сповіщення буде вимкнено, якщо призупинити сповіщення в меню користувача, незалежно від цього налаштування."
         consent_prompt: "Хочете отримувати сповіщення в реальному часі, коли люди відповідають на ваші дописи?"
       dismiss: "Відкинути"
       dismiss_notifications: "Відхилити всі"
@@ -1217,14 +1240,10 @@ uk:
       experimental_sidebar:
         enable: "Увімкнути бічну панель"
         options: "Параметри"
-        categories_section: "Розділи"
-        categories_section_instruction: "Вибрані розділи будуть показуватись у списку розділів бічної панелі."
-        tags_section: "Теґи"
-        tags_section_instruction: "Вибрані теґи показуватимуться в розділі теґів бічної панелі."
         navigation_section: "Навігація"
-        list_destination_instruction: "Коли на бічній панелі є новий вміст…"
-        list_destination_default: "використовувати типове посилання і показати значок для нових елементів"
-        list_destination_unread_new: "посилання на непрочитане/нове і показати кількість нових елементів"
+        navigation_section_instruction: "Коли список тем у навігаційному меню містить нові або непрочитані елементи…"
+        link_to_filtered_list_checkbox_description: "Посилання на відфільтрований список"
+        show_count_new_items_checkbox_description: "Показати кількість нових елементів"
       change: "змінити"
       featured_topic: "Закріплені теми"
       moderator: "%{user} є модератором"
@@ -1263,6 +1282,7 @@ uk:
       watched_first_post_categories_instructions: "Ви отримуватимете сповіщення про перший допис у кожній новій темі у цих розділах."
       watched_first_post_tags: "Слідкувати за першим дописом"
       watched_first_post_tags_instructions: "Ви отримуватимете сповіщення про перший допис у кожній новій темі з цими теґами."
+      watched_precedence_over_muted: "Сповіщати мене про теми в категоріях або тегах, які я переглядаю і які також належать до тих, які я вимкнув"
       muted_categories: "Приглушено"
       muted_categories_instructions: "Ви не будете отримувати жодних сповіщень про нові теми у цих розділах, і вони не зʼявлятимуться на сторінках розділів чи найсвіжіших."
       muted_categories_instructions_dont_hide: "Ви не отримуватимете сповіщень про нові теми в цих розділах."
@@ -1295,12 +1315,36 @@ uk:
       home: "Типова головна сторінка"
       staged: "Попередньо"
       staff_counters:
-        flags_given: "корисні позначки"
-        flagged_posts: "позначені дописи"
-        deleted_posts: "видалені дописи"
-        suspensions: "тимчасові призупинення"
-        warnings_received: "попередження"
-        rejected_posts: "відхилені дописи"
+        flags_given:
+          one: '<span class="%{className}">%{count}</span> корисний прапор'
+          few: '<span class="%{className}">%{count}</span> корисні прапори'
+          many: '<span class="%{className}">%{count}</span> корисних прапорів'
+          other: '<span class="%{className}">%{count}</span> корисні прапори'
+        flagged_posts:
+          one: '<span class="%{className}">%{count}</span> позначений допис'
+          few: '<span class="%{className}">%{count}</span> позначених дописів'
+          many: '<span class="%{className}">%{count}</span> позначених дописів'
+          other: '<span class="%{className}">%{count}</span> позначених дописів'
+        deleted_posts:
+          one: '<span class="%{className}">%{count}</span> видалений допис'
+          few: '<span class="%{className}">%{count}</span> видалені дописи'
+          many: '<span class="%{className}">%{count}</span> видалених дописів'
+          other: '<span class="%{className}">%{count}</span> видалені дописи'
+        suspensions:
+          one: '<span class="%{className}">%{count}</span> призупинено'
+          few: '<span class="%{className}">%{count}</span> призупинено'
+          many: '<span class="%{className}">%{count}</span> призупинено'
+          other: '<span class="%{className}">%{count}</span> призупинено'
+        warnings_received:
+          one: '<span class="%{className}">%{count}</span> попереджено'
+          few: '<span class="%{className}">%{count}</span> попереджено'
+          many: '<span class="%{className}">%{count}</span> попереджено'
+          other: '<span class="%{className}">%{count}</span> попереджено'
+        rejected_posts:
+          one: '<span class="%{className}">%{count}</span> відхилений допис'
+          few: '<span class="%{className}">%{count}</span> відхилені дописи'
+          many: '<span class="%{className}">%{count}</span> відхилених дописів'
+          other: '<span class="%{className}">%{count}</span> відхилених дописів'
       messages:
         all: "усі вхідні"
         inbox: "Вхідні"
@@ -1413,7 +1457,7 @@ uk:
         tags: "Теґи"
         interface: "Інтерфейс"
         apps: "Застосунки"
-        sidebar: "Бічна панель"
+        navigation_menu: "Навігаційне меню"
       change_password:
         success: "(лист надіслано)"
         in_progress: "(надсилання листа)"
@@ -1427,13 +1471,14 @@ uk:
         title: "Резервні коди двофакторної авторизації"
         regenerate: "Перегенерувати"
         disable: "Вимкнути"
-        enable: "Увімкнути"
-        enable_long: "Увімкнути резервні коди"
+        enable: "Створення резервних кодів"
+        enable_long: "Додати резервні коди"
+        not_enabled: "Ви ще не створили жодного резервного коду."
         manage:
-          one: "Керування резервними кодами. У вас є <strong>%{count}</strong> резервний код."
-          few: "Керування резервними кодами. У вас є <strong>%{count}</strong> резервних коди."
-          many: "Керування резервними кодами. У вас є <strong>%{count}</strong> резервних кодів."
-          other: "Керування резервними кодами. У вас є <strong>%{count}</strong> резервних кодів."
+          one: "У вас залишився <strong>%{count}</strong> резервний код."
+          few: "У вас залишилося <strong>%{count}</strong> резервних коди."
+          many: "У вас залишилося <strong>%{count}</strong> резервних кодів."
+          other: "У вас залишилося <strong>%{count}</strong> резервних кодів."
         copy_to_clipboard: "Скопіювати в буфер"
         copy_to_clipboard_error: "Помилка під час копіювання даних у буфер обміну"
         copied_to_clipboard: "Скопійовано у буфер обміну"
@@ -1519,6 +1564,7 @@ uk:
         success: "Ми надіслали листа на цю скриньку. Будь ласка, виконайте інструкції щодо підтвердження."
         success_via_admin: "Ми надіслали листа на цю скриньку. Будь ласка, виконайте інструкції з листа для підтвердження."
         success_staff: "Ми надіслали листа на вашу поточну скриньку. Будь ласка, виконайте інструкції щодо підтвердження."
+        back_to_preferences: "Повернутися до налаштувань"
       change_avatar:
         title: "Змінити своє зображення профілю"
         gravatar: "На основі <a href='//%{gravatarBaseUrl}%{gravatarLoginUrl}' target='_blank'>%{gravatarName}</a>"
@@ -1893,8 +1939,7 @@ uk:
       pause_notifications: "Призупинити сповіщення"
       remove_status: "Видалити статус"
     user_tips:
-      primary: "Зрозуміло!"
-      secondary: "не показувати ці поради"
+      button: "Зрозуміло!"
       first_notification:
         title: "Ваше перше сповіщення!"
         content: "Сповіщення використовуються для того, щоб тримати вас в курсі того, що відбувається в спільноті."
@@ -1910,6 +1955,9 @@ uk:
       suggested_topics:
         title: "Продовжуйте читати!"
         content: "Ось кілька тем, які, на нашу думку, ви можете прочитати далі."
+      admin_guide:
+        title: "Ласкаво просимо на ваш новий сайт!"
+        button: "Поїхали!"
     loading: "Завантаження…"
     errors:
       prev_page: "при спробі завантаження"
@@ -1944,42 +1992,6 @@ uk:
       logout_disabled: "Вихід вимкнено, поки сайт перебуває в режимі лише для читання."
     staff_writes_only_mode:
       enabled: "Сайт працює в режимі \"тільки для команди обслуговування\". Зараз ви можете продовжувати переглядати сайт, але інші дії доступні лише членам команди обслуговування."
-    too_few_topics_and_posts_notice_MF: |
-      Давайте <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">почнемо дискусію!</a> Є { currentTopics, plural,
-          one {це <strong>#</strong> тема}
-          few {є <strong>#</strong> тем}
-          many {є <strong>#</strong> тем}
-        other {є <strong>#</strong> тем}
-      } і { currentPosts, plural,
-          one {<strong>#</strong> допис}
-          few {<strong>#</strong> дописи}
-          many {<strong>#</strong> дописів}
-        other {<strong>#</strong> дописів}
-      }. Відвідувачам потрібно більше читати та відповідати – ми рекомендуємо принаймні { requiredTopics, plural,
-          one {<strong>#</strong> тема}
-          few {<strong>#</strong> теми}
-          many {<strong>#</strong> тем}
-        other {<strong>#</strong> теми}
-      } і { requiredPosts, plural,
-          one {<strong>#</strong> пост}
-          few {<strong>#</strong> повідомлення}
-          many {<strong>#</strong> повідомлень}
-        other {<strong>#</strong> повідомлень}
-      }. Лише співробітники можуть бачити це повідомлення.
-    too_few_topics_notice_MF: |
-      Давайте <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">почнемо обговорення!</a> Є { currentTopics, plural,
-          one {це <strong>#</strong> тема}
-          few {це <strong>#</strong> тем}
-          many {це <strong>#</strong> тем}
-        other {це <strong>#</strong> тем}
-      }. Відвідувачам потрібно більше читати та відповідати – ми рекомендуємо принаймні { requiredTopics, plural,
-          one {<strong>#</strong> тема}
-          few {<strong>#</strong> теми}
-          many {<strong>#</strong> теми}
-        other {<strong>#</strong> теми}
-      }. Лише співробітники можуть бачити це повідомлення.
-    too_few_posts_notice_MF: |
-      Почнемо <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">старт дискусії!</a> Тут {currentPosts, plural, one {<strong>#</strong> допис} few {<strong>#</strong> дописи} many {<strong>#</strong> дописів} other {<strong>#</strong> дописів}}. Відвідувачам потрібно більше читати та відповідати – ми рекомендуємо {requiredPosts, plural, one {<strong>#</strong> допис} few {<strong>#</strong> дописи} many {<strong>#</strong> дописів} other {<strong>#</strong> дописів}}. Це повідомлення може бачити лише члени команди обслуговування.
     logs_error_rate_notice:
       reached_hour_MF: |
         <b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# помилка/година} other {# помилок/година}}</a> досягнуто обмеження налаштувань сайту {limit, plural, one {# помилка/година} other {# помилок/година}}.
@@ -2011,19 +2023,35 @@ uk:
       hidden_for_session: "Гаразд, ми запитаємо вас завтра. Ви завжди можете використати меню 'Увійти', щоб створити обліковий запис теж."
       intro: "Вітаємо! Схоже, вам подобається обговорення, але ви ще не зареєстрували обліковий запис."
       value_prop: "Втомились від прокручування тих самих дописів? Якщо ви створите обліковий запис, ви завжди будете повертатися до тих дописів, на яких зупинилися. За допомогою облікового запису ви також зможете отримувати повідомлення про нові відповіді, зберігати закладки і використовувати вподобання, щоб подякувати іншим. Ми можемо працювати разом, щоб зробити цю спільноту цікавою. :heart:"
+    offline_indicator:
+      no_internet: "Немає з’єднання з Інтернетом."
+      refresh_page: "Оновити сторінку"
     summary:
-      enabled_description: "Ви переглядаєте витяг з теми – тільки найцікавіші дописи на думку спільноти."
+      in_progress: "Підбиття підсумків теми за допомогою ШІ..."
+      summarized_on: "Підсумовано з AI на %{date}"
+      model_used: "ШІ використано: %{model}"
+      outdated: "Резюме застаріло"
+      outdated_posts:
+        one: "(%{count} допис відсутній)"
+        few: "(%{count} повідомлення відсутні)"
+        many: "(%{count} повідомлень відсутні)"
+        other: "(%{count} повідомлень відсутні)"
+      enabled_description: "Ви переглядаєте найкращі відповіді на цю тему: найцікавіші публікації, визначені спільнотою."
       description:
         one: "Тут <b>%{count}</b> відповідь."
         few: "Тут <b>%{count}</b> відповіді."
         many: "Тут <b>%{count}</b> відповідей."
         other: "Тут <b>%{count}</b> відповідей."
+      buttons:
+        hide: "Приховати підсумок"
+        generate: "Підведіть підсумки за допомогою ШІ"
+        regenerate: "Регенерувати підсумок"
       description_time_MF: |
         Тут є {replyCount, plural, one {<b>#</b> відповідь} few {<b>#</b> відповіді} many {<b>#</b> відповідей} other {<b>#</b> відповідей}} з розрахунковим часом читання <b>{readingTime, plural, one {# хвилина} few {# хвилини} many {# хвилин} other {# хвилин}}</b>.
-      enable: "Підсумки цієї теми"
+      enable: "Показати найкращі відповіді"
       disable: "Показати всі дописи"
-      short_label: "Підсумок"
-      short_title: "Показати підсумок цієї теми: найцікавіші дописи, визначені спільнотою"
+      short_label: "Найпопулярніші відповіді"
+      short_title: "Показати в цій темі найпопулярніші відповіді: найцікавіші публікації, визначені спільнотою"
     deleted_filter:
       enabled_description: "Ця тема містить видалені дописи, які були сховані."
       disabled_description: "Показуються видалені дописи в темі."
@@ -2350,8 +2378,6 @@ uk:
         topic_template_not_modified: "Будь ласка, додайте деталі та особливості до вашої теми, відредагувавши шаблон теми."
       save_edit: "Зберегти зміни"
       overwrite_edit: "Перезаписати зміни"
-      reply_original: "Відповісти в початковій темі"
-      reply_here: "Відповісти тут"
       reply: "Відповісти"
       cancel: "Скасувати"
       create_topic: "Створити тему"
@@ -2453,6 +2479,7 @@ uk:
       image_alt_text:
         aria_label: Альтернативний текст для зображення
       delete_image_button: Видалити зображення
+      toggle_image_grid: Перемкнути сітку зображень
     notifications:
       tooltip:
         regular:
@@ -2534,6 +2561,7 @@ uk:
       reaction_2: "<span>%{username}, %{username2}</span> %{description}"
       votes_released: "%{description} - завершено"
       new_features: "Доступні нові функції!"
+      admin_problems: "Нова порада на інформаційній панелі вашого сайту"
       dismiss_confirmation:
         body:
           default:
@@ -2829,6 +2857,11 @@ uk:
         dismiss_tooltip: "Відхилити нові дописи, або перестати стежити за цими темами"
         also_dismiss_topics: "Перестати стежити за цими темами, щоб вони ніколи більше не показувались як непрочитані"
         dismiss_new: "Відхилити Нові"
+        dismiss_new_modal:
+          title: "Відхилити нові"
+          topics: "Відхилити нові теми"
+          posts: "Відхилити нові повідомлення"
+          untrack: "Припинити відстежувати ці теми, щоб вони більше не з’являлися в моєму списку нового"
         dismiss_new_with_selected:
           one: "Відхилити (%{count}) новий…"
           few: "Відхилити (%{count}) нових…"
@@ -2874,9 +2907,11 @@ uk:
         bookmarks: "У вас немає обраних тем."
         category: "В розділі %{category} немає тем."
         top: "Топових тем немає."
+        filter: "Немає тем."
         educate:
           new: '<p>Ваші нові теми з’являтимуться тут. Типово теми вважаються новими і показуватимуть індикатор <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span>, якщо її створено за останні 2 дні.</p><p>Відвідайте свої <a href="%{userPrefsUrl}">налаштування</a>, щоб змінити це.</p>'
-          unread: "<p>Ваші непрочитані теми показуватимуться тут.</p><p>Типово теми вважаються непрочитаними та показують кількість непрочитаних <span class=\"badge unread-posts badge-notification\">1</span>, якщо ви:</p><ul><li>створили тему</li><li>відповіли на тему</li><li>читали тему більше ніж 4 хвилини,</li></ul><p>або якщо ви явно додасте тему у перелік на Відстеження або Перегляд за допомогою \U0001F514 в кожній темі.</p><p>Відвідайте свої <a href=\"%{userPrefsUrl}\">налаштування</a>, щоб змінити це.</p>"
+          unread: "<p>Ваші непрочитані теми показуватимуться тут.</p><p>Типово теми вважаються непрочитаними та показують кількість непрочитаних <span class=\"badge unread-posts badge-notification\">1</span>, якщо ви:</p><ul><li>створили тему</li><li>відповіли на тему</li><li>читали тему більше ніж 5 хвилини,</li></ul><p>або якщо ви явно додасте тему у перелік на Відстеження або Перегляд за допомогою \U0001F514 в кожній темі.</p><p>Відвідайте свої <a href=\"%{userPrefsUrl}\">налаштування</a>, щоб змінити це.</p>"
+          new_new: "<p>Тут з’являться ваші нові теми, а також непрочитані теми. За замовчуванням теми вважаються новими та відображатимуть індикатор <span class=\"badge new-topic badge-notification\" style=\"vertical-align:middle;line-height:inherit;\"></span> , якщо вони були створені протягом останніх 2 днів. Непрочитані теми відображатимуть кількість непрочитаних <span class=\"badge unread-posts badge-notification\">1</span> , якщо ви: створили тему, відповіли на тему, читали тему більше 5 хвилин, або якщо ви явно встановили тему як Відстежувана або Спостережувана через \U0001F514 у кожній темі.</p><p>Відвідайте свої <a href=\"%{userPrefsUrl}\">налаштування</a> , щоб змінити це.</p>"
       bottom:
         latest: "Більше немає останніх тем."
         posted: "Створених тем більше немає."
@@ -2888,6 +2923,7 @@ uk:
         tag: "Немає більше %{tag} тем."
         top: "Топових тем більше немає."
         bookmarks: "Більше немає обраних тем."
+        filter: "Більше немає тем."
     topic:
       filter_to:
         one: "%{count} допис в темі"
@@ -2895,6 +2931,7 @@ uk:
         many: "%{count} дописів в темі"
         other: "%{count} дописів в темі"
       create: "Нова тема"
+      create_disabled_category: "Ви не можете створювати теми в цій категорії"
       create_long: "Створити нову тему"
       open_draft: "Відкрити чернетку"
       private_message: "Нове приватне повідомлення"
@@ -2949,6 +2986,7 @@ uk:
       read_more_in_category: "Хочете прочитати більше? Перегляньте інші теми на %{categoryLink} або <a href='%{latestLink}'>перегляньте останні теми</a>."
       read_more: "Хочете прочитати більше? <a href='%{categoryLink}'>Перегляньте всі категорії</a> або <a href='%{latestLink}'>перегляньте останні теми</a>."
       unread_indicator: "Поки що ніхто з учасників не прочитав останній допис цієї теми."
+      participant_groups: "Групи учасників"
       read_more_MF: |
         { HAS_UNREAD_AND_NEW, select,
           true {
@@ -2997,8 +3035,8 @@ uk:
       browse_all_categories_latest_or_top: "<a href='%{basePath}/categories'>Перегляньте всі категорії</a>, <a href='%{basePath}/latest'>перегляньте останні теми</a> або перегляньте топ:"
       browse_all_tags_or_latest: "<a href='%{basePath}/tags'>Переглянути всі теги</a> або <a href='%{basePath}/latest'>переглянути останні теми</a>."
       suggest_create_topic: Готові <a href>почати нову розмову?</a>
-      jump_reply_up: перейти до попередньої відповіді
-      jump_reply_down: перейти до пізнішої відповіді
+      jump_reply: "Перейти до початкового розташування публікації"
+      jump_reply_aria: "Перейти до повідомлення @%{username} в його оригінальному розташуванні"
       deleted: "Тему було видалено"
       slow_mode_update:
         title: "Повільний режим"
@@ -3286,6 +3324,7 @@ uk:
           few: "Будь ласка, виберіть тему, в яку ви хотіли б перемістити ці <b>%{count}</b> дописи."
           many: "Будь ласка, виберіть тему, в яку ви хотіли б перемістити цих <b>%{count}</b> дописів."
           other: "Будь ласка, виберіть тему, в яку ви хотіли б перемістити цих <b>%{count}</b> дописів."
+        chronological_order: "зберегти хронологічний порядок після злиття"
       move_to_new_message:
         title: "Перейти до нового повідомленням"
         action: "перейти до нового повідомлення"
@@ -3383,6 +3422,7 @@ uk:
       ignored: "Ігнорований вміст"
       wiki_last_edited_on: "останнє редагування wiki %{dateTime}"
       last_edited_on: "останнє редагування допису %{dateTime}"
+      edit_history: "історія редагування публікацій"
       reply_as_new_topic: "Відповісти в новій пов’язаної темі"
       reply_as_new_private_message: "Відповісти новим повідомленням тим же адресатам"
       continue_discussion: "В продовження дискусії %{postLink}:"
@@ -3394,10 +3434,10 @@ uk:
       sr_collapse_replies: "Згорнути відповіді на допис"
       sr_date: "Дата допису"
       sr_expand_replies:
-        one: "Цей допис має %{count} відповідь. Натисніть, щоб переглянути"
-        few: "Цей допис має %{count} відповіді. Натисніть, щоб переглянути"
-        many: "Цей допис має %{count} відповідей. Натисніть, щоб переглянути"
-        other: "Цей допис має %{count} відповідей. Натисніть, щоб переглянути"
+        one: "Цей допис має %{count} відповідь"
+        few: "Цей допис має %{count} відповіді"
+        many: "Цей допис має %{count} відповідей"
+        other: "Цей допис має %{count} відповідей"
       expand_collapse: "розгорнути/згорнути"
       sr_below_embedded_posts_description: "Відповіді на допис #%{post_number}"
       sr_embedded_reply_description: "відповідь @%{username} на допис #%{post_number}"
@@ -3591,6 +3631,8 @@ uk:
           last: "Остання версія"
           hide: "Приховати версію"
           show: "Показати версію"
+          destroy: "Видалити редакції"
+          destroy_confirm: "Ви дійсно хочете видалити всі зміни цього повідомлення? Ця дія є незворотною."
           revert: "Повернутися до версії %{revision}"
           edit_wiki: "редагувати Wiki"
           edit_post: "Редагувати допис"
@@ -3624,6 +3666,7 @@ uk:
         updated: "Оновлено"
         name: "Назва"
         name_placeholder: "Для чого ця закладка?"
+        name_input_label: "Назва закладки"
         set_reminder: "Нагадати мені"
         options: "Параметри"
         actions:
@@ -3645,7 +3688,7 @@ uk:
       filtered_replies:
         viewing_posts_by: "Перегляд %{post_count} дописів від"
         viewing_subset: "Деякі відповіді згорнуті"
-        viewing_summary: "Перегляд резюме цієї теми"
+        viewing_summary: "Перегляд найкращих відповідей на цю тему"
         post_number: "%{username}, допис #%{post_number}"
         show_all: "Показати всі"
       share:
@@ -3662,7 +3705,7 @@ uk:
       back: "Повернутися до розділу"
       general: "Основне"
       settings: "Налаштування"
-      topic_template: "Шаблон теми"
+      topic_template: "Шаблон"
       tags: "Теґи"
       tags_allowed_tags: "Обмежити ці теґи цим розділом:"
       tags_allowed_tag_groups: "Обмежити ці групи теґів цим розділом:"
@@ -3721,8 +3764,7 @@ uk:
       email_in: "Custom incoming email address:"
       email_in_tooltip: "Ви можете розділити кілька адрес за допомогою символу |."
       email_in_allow_strangers: "Приймати листи від анонімних користувачів без облікових записів"
-      email_in_disabled: "Створення нових тем електронною поштою вимкнено в налаштуваннях сайту. Щоб увімкнути публікацію нових тем електронною поштою, "
-      email_in_disabled_click: 'активуйте налаштування "email in".'
+      email_in_disabled: "Надсилання нових тем електронною поштою вимкнено. Щоб увімкнути надсилання нових тем електронною поштою, увімкніть параметр <a href='%{setting_url}'>'email in'</a> ."
       mailinglist_mirror: "Розділ показує список розсилки"
       show_subcategory_list: "Показувати список підрозділів над списком тем в цьому розділі."
       read_only_banner: "Текст банера, коли користувач не може створити тему в цьому розділі:"
@@ -3749,6 +3791,7 @@ uk:
       default_slow_mode: 'Увімкнути "Повільний режим" для нових тем в цьому розділі.'
       parent: "Батьківський розділ"
       num_auto_bump_daily: "Кількість відкритих тем для автоматичного підняття щодня:"
+      auto_bump_cooldown_days: "Мінімальна кількість днів до повторного підняття тієї самої теми:"
       navigate_to_first_post_after_read: "Перейдіть до першого допису після прочитання тем"
       notifications:
         title: "змінити рівень сповіщень для цього розділу"
@@ -3834,7 +3877,9 @@ uk:
         inappropriate: "Це не прийнятно"
         spam: "Це спам"
       custom_placeholder_notify_user: "Будьте конкретні, конструктивні та доброзичливі."
+      notify_user_textarea_label: "Повідомлення для користувача"
       custom_placeholder_notify_moderators: "Поясніть суть проблеми: на що потрібно звернути увагу. Надайте відповідні посилання, якщо це можливо."
+      notify_moderators_textarea_label: "Повідомлення для модераторів"
       custom_message:
         at_least:
           one: "Введіть хоча б %{count} символ"
@@ -3948,6 +3993,10 @@ uk:
     filters:
       with_topics: "%{filter} теми"
       with_category: "%{filter}%{category} теми"
+      filter:
+        title: "Filter"
+        button:
+          label: "Filter"
       latest:
         title: "Останні"
         title_with_count:
@@ -4030,7 +4079,6 @@ uk:
         this_week: "Тиждень"
         today: "Today"
     browser_update: 'На жаль, <a href="https://www.discourse.org/faq/#browser">ваш браузер не підтримується</a>. Будь ласка, <a href="https://browsehappy.com">перейдіть на підтримуваний браузер</a> , щоб повноцінно переглянути вміст, увійти та відповісти.'
-    safari_13_warning: Цей сайт незабаром перестане підтримувати версії iOS і Safari 13 і нижче. Спрощена версія "тільки для читання" залишиться доступною. (<a href="https://meta.discourse.org/t/224747">більше інформації</a>)
     permission_types:
       full: "Створювати / Відповідати / Бачити"
       create_post: "Відповісти / Див"
@@ -4045,6 +4093,9 @@ uk:
       close: "Закрити (Esc)"
       content_load_error: '<a href="%url%">Вміст</a> не вдалося завантажити.'
       image_load_error: '<a href="%url%">Зображення</a> не вдалося завантажити.'
+    experimental_lightbox:
+      buttons:
+        close: "Закрити (Esc)"
     cannot_render_video: Це відео неможливо відтворити, оскільки ваш браузер не підтримує цей кодек.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
@@ -4092,6 +4143,7 @@ uk:
         title: "Редагування"
         return: "%{shortcut} Повернутися в редактор"
         fullscreen: "%{shortcut} Повноекранний редактор"
+        insert_current_time: "%{shortcut} Вставити поточний час"
       bookmarks:
         title: "Закладка"
         enter: "%{shortcut} Зберегти і закрити"
@@ -4139,7 +4191,11 @@ uk:
         many: "Заробили цю нагороду %{count} раз"
         other: "Заробили цю нагороду %{count} раз"
       granted_on: "Видана %{date}"
-      others_count: "Інші з цією нагородою (%{count})"
+      others_count:
+        one: "Надано іншим %{count} раз"
+        few: "Надано іншим %{count} рази"
+        many: "Надано іншим %{count} разів"
+        other: "Надано іншим %{count} разів"
       title: Значки
       allow_title: "Ви можете использовать эту нагороду в качестве титула."
       multiple_grant: "Ви можете получить её несколько раз"
@@ -4158,6 +4214,7 @@ uk:
         few: "видано %{count}"
         many: "видано %{count}"
         other: "видано %{count}"
+      awarded: нагороджений
       select_badge_for_title: Оберіть значок, що буде вашим званням
       none: "(немає)"
       successfully_granted: "Нагорода %{badge} успішно присвоєна %{username}"
@@ -4346,13 +4403,11 @@ uk:
     pause_notifications:
       title: "Призупинити сповіщення для..."
       label: "Призупинити сповіщення"
-      remaining: "%{remaining} залишилось"
       options:
         half_hour: "30 хвилин"
         one_hour: "1 година"
         two_hours: "2 години"
         tomorrow: "До завтра"
-        custom: "Користувацька"
       set_schedule: "Налаштування розкладу сповіщень"
     trust_levels:
       names:
@@ -4405,7 +4460,48 @@ uk:
       more: "Більше"
       all_categories: "Всі розділи"
       all_tags: "Всі теґи"
+      categories_form_modal:
+        title: "Редагувати навігацію по категоріях"
+        filter_placeholder: "Фільтр категорій"
+        no_categories: "Немає категорій, що відповідають даним умовам."
+      edit_navigation_modal_form:
+        filter_dropdown:
+          all: "Все"
       sections:
+        custom:
+          add: "Додати власний розділ"
+          edit: "Редагувати користувацький розділ"
+          save: "Зберегти"
+          delete: "Видалити"
+          delete_confirm: "Ви впевнені, що хочете видалити цей розділ?"
+          reset_confirm: "Ви впевнені, що бажаєте повернути цей розділ до стандартних?"
+          public: "Зробіть цей розділ загальнодоступним і видимим для всіх"
+          more_menu: "Більше меню"
+          links:
+            add: "Додати ще одне посилання"
+            delete: "Видалити посилання"
+            reset: "Відновити типові"
+            icon:
+              label: "Іконка"
+              validation:
+                blank: "Іконка не може бути порожньою"
+                maximum: "Значок має бути коротшим за %{count} символів"
+            name:
+              label: "Імʼя"
+              validation:
+                blank: "Ім’я не може бути порожнім"
+                maximum: "Назва має бути коротшою за %{count} символів"
+            value:
+              label: "Посилання"
+              validation:
+                blank: "Посилання не може бути порожнім"
+                maximum: "Посилання має бути коротшим за %{count} символів"
+                invalid: "Невірний формат"
+          title:
+            label: "Назва розділу"
+            validation:
+              blank: "Назва не може бути порожньою"
+              maximum: "Назва має бути коротшою за %{count} символів"
         about:
           header_link_text: "Про"
         messages:
@@ -4420,28 +4516,20 @@ uk:
             unread_with_count: "Непрочитані (%{count})"
             archive: "Архів"
         tags:
-          links:
-            add_tags:
-              content: "Додати теґи"
-              title: "Ви не додали жодного теґу. Натисніть, щоб почати."
           none: "Ви не додали жодного теґу."
           click_to_get_started: "Натисніть тут, щоб почати."
           header_link_text: "Теґи"
           header_action_title: "Редагувати теги бічної панелі"
           configure_defaults: "Налаштувати типові значення"
         categories:
-          links:
-            add_categories:
-              content: "Всі розділи"
-              title: "Ви не додали жодного розділу. Натисніть, щоб почати."
           none: "Ви не додали жодного розділу."
           click_to_get_started: "Натисніть тут, щоб почати."
           header_link_text: "Розділи"
           header_action_title: "Редагувати розділи бічної панелі"
           configure_defaults: "Налаштувати типові значення"
         community:
-          header_link_text: "Спільнота"
-          header_action_title: "Створити тему"
+          edit_section:
+            header_dropdown: "Customize"
           links:
             about:
               content: "Про"
@@ -4452,8 +4540,8 @@ uk:
             badges:
               content: "Нагороди"
               title: "Всі значки доступні для отримання"
-            everything:
-              content: "Усе"
+            topics:
+              content: "Теми"
               title: "Всі теми"
             faq:
               content: "Часті запитання"
@@ -4466,6 +4554,7 @@ uk:
               title: "Список усіх користувачів"
             my_posts:
               content: "Мої дописи"
+              content_drafts: "Мої чернетки"
               title: "Моя нещодавня активність в темі"
               title_drafts: "Мої неопубліковані чернетки"
               draft_count:
@@ -4477,11 +4566,21 @@ uk:
               content: "Переглянути"
               title: "Позначені публікації та інші елементи в черзі"
               pending_count: "%{count} очікує на розгляд"
+        global_section: "Глобальний розділ, видимий для всіх"
     welcome_topic_banner:
       title: "Створіть тему привітання"
       description: "Ваша привітальна тема – це перше, що прочитають нові учасники. Думайте про це як про свою «початкову презентацію» або «програмну заяву». Повідомте всім, для кого ця спільнота, що вони можуть очікувати тут знайти та що ви хочете, щоб вони зробили в першу чергу."
       button_title: "Почати редагування"
     until: "До:"
+    char_counter:
+      exceeded: "Перевищено максимальну кількість символів."
+    form_template_chooser:
+      select_template: "Виберіть шаблони форм"
+    form_templates:
+      errors:
+        typeMismatch:
+          default: "Будь ласка, введіть коректне значення."
+          email: "Будь ласка, введіть вірну адресу електронної пошти."
   admin_js:
     type_to_filter: "введіть, щоб фільтрувати…"
     admin:
@@ -4644,12 +4743,18 @@ uk:
         about: "Edit your group membership and names here"
         group_members: "Учасники групи"
         delete: "Видалити"
-        delete_confirm: "Ви впевнені, що хочете видалити цю групу?"
+        delete_confirm: "Ви дійсно бажаєте видалити %{group}?"
+        delete_details:
+          one: "%{count} людина втратить доступ до цієї групи"
+          few: "%{count} особи втратить доступ до цієї групи"
+          many: "%{count} осіб втратять доступ до цієї групи"
+          other: "%{count} осіб втратять доступ до цієї групи"
         delete_with_messages_confirm:
-          one: "Видалення цієї групи призведе до втрати %{count} повідомлення, учасники групи більше не матимуть до нього доступу."
-          few: "Видалення цієї групи призведе до втрати %{count} повідомлень, учасники групи більше не матимуть до них доступу."
-          many: "Видалення цієї групи призведе до втрати %{count} повідомлень, учасники групи більше не матимуть до них доступу."
-          other: "Видалення цієї групи призведе до втрати %{count} повідомлень, учасники групи більше не матимуть до них доступу."
+          one: "%{count} повідомлення стане недоступним для учасників групи"
+          few: "%{count} повідомлення стане недоступним для учасників групи"
+          many: "%{count} повідомлень стануть недоступними для учасників групи"
+          other: "%{count} повідомлень стануть недоступними для учасників групи"
+        delete_warning: "Видалені групи не можуть бути відновлені"
         delete_failed: "Не вдалося видалити групу. Якщо це - автоматична група, її неможливо знищити."
         delete_automatic_group: Це автоматична група, яку не можна видалити.
         delete_owner_confirm: "Відкликати права власника у користувача '%{username}'?"
@@ -4715,10 +4820,16 @@ uk:
             topics:
               read: Читати тему або певні дописи в ній. Також підтримується RSS.
               write: Створіть нову тему чи допис в наявній.
-              update: Оновіть тему. Змініть назву, розділ, теґи тощо.
+              update: Оновлення теми. Змініть заголовок, категорію, теги, статус, архетип, featured_link тощо.
+              delete: Видалити тему.
               read_lists: Читайте списки тем, як топ, нові, останні тощо. RSS також підтримується.
+              status: "Оновлення статусу теми. Статуси: закрита, архівна, видима, закріплена. Увімкнено: true, false. Укажіть category_id тут і в параметрах запиту, щоб дозволити зміну статусу лише для тем у цій категорії."
             posts:
               edit: Редагуйте будь-який допис або якийсь конкретний.
+              delete: Видалити допис.
+              list: Список останніх публікацій і приватних повідомлень. Також підтримується RSS.
+            tags:
+              list: Список тегів.
             categories:
               list: Отримати список розділів.
               show: Отримайте розділ за його ID.
@@ -4732,6 +4843,7 @@ uk:
               update: Оновити інформацію в профілі користувача.
               log_out: Вийти з усіх сессій для користувача.
               anonymize: Анонімізувати облікові записи.
+              suspend: Призупинити облікові записи користувачів.
               delete: Видалення облікових записів користувачів.
               list: Отримання списку користувачів.
             user_status:
@@ -4739,6 +4851,8 @@ uk:
               update: Оновити статус користувача.
             email:
               receive_emails: Об'єднайте цю область з поштовим отримувачем для обробки вхідних листів електронної пошти.
+            invites:
+              create: Надсилайте запрошення електронною поштою або генеруйте посилання для запрошення.
             badges:
               create: Створити нову нагороду.
               show: Отримати інформацію про нагороду.
@@ -4747,6 +4861,12 @@ uk:
               list_user_badges: Список нагород користувача.
               assign_badge_to_user: Призначити користувачеві нагороду.
               revoke_badge_from_user: Відкликати нагороду у користувача.
+            groups:
+              manage_groups: Список, додавання та видалення учасників групи.
+              administer_groups: Список, показ, створення, оновлення та видалення груп.
+            search:
+              show: Пошук за кінцевою точкою `/search.json?q=term`.
+              query: Пошук з використанням кінцевої точки `/search/query?term=term`.
             wordpress:
               publishing: Необхідно для функцій публікації втулка WP Discourse (обов’язково).
               commenting: Необхіднj для функцій коментування плагіна WP Discourse.
@@ -4813,8 +4933,8 @@ uk:
           name: "Подія підвищення рівня довіри користувача"
           details: "Коли користувач переходить з одного рівня довіри до іншого."
         user_badge_event:
-          name: "Подія вручення значка"
-          details: "Коли користувач отримує значок."
+          name: "Значок Події"
+          details: "Коли значок надається або відкликано."
         group_user_event:
           name: "Подія користувача групи"
           details: "Коли користувач додається або видаляється з групи."
@@ -4861,7 +4981,7 @@ uk:
         enabled: "Включено?"
         is_enabled: "Т"
         not_enabled: "Н"
-        change_settings: "Зміна налаштувань"
+        change_settings: "Налаштування плагіна"
         change_settings_short: "Налаштування"
         howto: "Як встановити плагін?"
         official: "Офіційний плагін"
@@ -5117,6 +5237,9 @@ uk:
           embedded_scss:
             text: "Вбудований CSS"
             title: "Введіть CSS для вбудовування коментарів"
+          embedded_header:
+            text: "Вбудований заголовок"
+            title: "Введіть HTML для відображення над вбудованою версією коментарів"
           color_definitions:
             text: "Визначення кольорів"
             title: "Введіть власні визначення кольорів (лише для досвідчених користувачів)"
@@ -5195,6 +5318,12 @@ uk:
           love:
             name: "любов"
             description: "Колір кнопки \"Подобається\"."
+          selected:
+            name: "обраний"
+            description: "Колір фону елементів, таких як елементи списку, коли вони вибрані/активні."
+          hover:
+            name: "навести курсор"
+            description: "Колір фону елементів, наприклад елементів списку, коли на них наведено курсор миші або вони мають фокус клавіатури."
         robots:
           title: "Перевизначите файл robots.txt вашого сайту:"
           warning: "Це назавжди перевизначити будь-які пов’язані налаштування сайту."
@@ -5325,6 +5454,7 @@ uk:
           no_previous: "Немає попереднього значення."
           deleted: "Немає нового значення. Запис видалено."
           actions:
+            permanently_delete_post_revisions: "назавжди видалити редакції публікації"
             delete_user: "видалення користувача"
             change_trust_level: "зміна рівня довіри"
             change_username: "зміна імені користувача"
@@ -5358,6 +5488,7 @@ uk:
             revoke_moderation: "відкликати повноваження модератора"
             backup_create: "створити резервну копію"
             deleted_tag: "вилучити теґ"
+            update_directory_columns: "оновити стовпці каталогу"
             deleted_unused_tags: "вилучити теґи, що не використовуються"
             renamed_tag: "перейменований теґ"
             revoke_email: "відкликати e-mail"
@@ -5416,6 +5547,10 @@ uk:
             delete_group: "видалити групу"
             watched_word_create: "додати контрольоване слово"
             watched_word_destroy: "видалити контрольоване слово"
+            create_public_sidebar_section: "створити загальнодоступний розділ бічної панелі"
+            update_public_sidebar_section: "оновити публічний розділ бічної панелі"
+            destroy_public_sidebar_section: "знищити публічний розділ бічної панелі"
+            reset_bounce_score: "скинути рахунок відмов"
         screened_emails:
           title: "Screened Emails"
           description: "Коли хтось намагатиметься створити новий обліковий запис, наступні електронні скриньки буде перевірено, і реєстрацію заблоковано, або вжито якихось інших дій."
@@ -5481,14 +5616,14 @@ uk:
           silence: "Відключити"
           link: "Посилання"
         action_descriptions:
-          block: "Заборонити публікацію дописів, що містять ці слова. Користувач побачить повідомлення про помилку, коли спробує надіслати свій допис."
-          censor: "Дозволити дописи, що містять ці слова, але замінювати їх символами, що приховують нецензурні вирази."
-          require_approval: "Коментарі, що містять ці слова, вимагатимуть схвалення команди обслуговування, перш ніж їх можна буде побачити."
-          flag: "Дозволити дописи, що містять ці слова, але позначати їх як неприйнятні, щоб модератори могли їх оцінювати."
-          replace: "Замінити слова в дописах іншими словами"
-          tag: "Автоматично додавати теґи темі на основі першого допису"
-          silence: "Перші дописи користувачів, що містять ці слова, вимагатимуть схвалення від команди обслуговування, перш ніж їх можна буде побачити, і користувача буде автоматично заблоковано."
-          link: "Замінити слова в дописах посиланнями"
+          block: "При спробі створити допис, що містить ці слова, буде відображено повідомлення про помилку."
+          censor: "Дозволити дописи, що містять ці слова, але замінити їх символами, що приховують нецензурні слова."
+          require_approval: "Вимагати схвалення персоналу для публікацій, які містять ці слова, перш ніж вони стануть видимими для інших."
+          flag: "Дозволяти дописи, що містять ці слова, але позначати їх як неприйнятні для перегляду модераторами."
+          replace: "Замінити слова в дописах іншими словами."
+          tag: "Автоматично позначати теми, якщо перше повідомлення містить певне слово."
+          silence: "Ігнорувати нові акаунти, якщо їхній перший допис містить будь-яке з цих слів. Допис буде автоматично приховано, доки співробітники не схвалять його."
+          link: "Замінити слова в дописах посиланнями."
         form:
           label: "Має слово або словосполучення"
           placeholder: "Введіть слово або фразу (* - символ підстановки)"
@@ -5511,6 +5646,88 @@ uk:
           description: "Введіть текст нижче, щоб перевірити збіги зі стоп словами"
           found_matches: "Знайдені збіги:"
           no_matches: "Збігів, не знайдено"
+      form_templates:
+        nav_title: "Шаблони"
+        title: "Шаблони форм"
+        help: "Створіть структуру шаблону, яку можна використовувати для створення нових тем, дописів і повідомлень."
+        new_template: "Новий шаблон"
+        list_table:
+          headings:
+            name: "Імʼя"
+            active_categories: "Активні категорії"
+            actions: "Дії"
+          actions:
+            view: "Переглянути шаблон"
+            edit: "Редагувати шаблон"
+            delete: "Видалити шаблон"
+        view_template:
+          close: "Закрити"
+          edit: "Редагувати"
+          delete: "Видалити"
+          toggle_preview: "Переключити попередній перегляд"
+        new_template_form:
+          submit: "Зберегти"
+          cancel: "Скасувати"
+          name:
+            label: "Назва шаблону"
+            placeholder: "Введіть назву для цього шаблону..."
+          template:
+            label: "Шаблон"
+            placeholder: "Створіть YAML шаблон тут..."
+          preview: "Попередній перегляд"
+        delete_confirm: "Ви справді бажаєте вилучити цей шаблон?"
+        quick_insert_fields:
+          add_new_field: "Додати"
+          checkbox: "Прапорець"
+          input: "Коротка відповідь"
+          textarea: "Довга відповідь"
+          dropdown: "Випадаючий список"
+          upload: "Завантажити файл"
+          multiselect: "Множинний вибір"
+        validations_modal:
+          button_title: "Погодження"
+          modal_title: "Параметри перевірки"
+          table_headers:
+            key: "Ключ"
+            type: "Тип"
+            description: "Опис"
+          validations:
+            required:
+              key: "Обов’язкове"
+              type: "boolean"
+              description: "Потрібно заповнити поле, щоб надіслати форму."
+            minimum:
+              key: "мінімум"
+              type: "ціле число"
+              description: "Для текстових полів вкажіть мінімально допустиму кількість символів."
+            maximum:
+              key: "максимум"
+              type: "ціле число"
+              description: "Для текстових полів вкажіть максимально дозволену кількість символів."
+            pattern:
+              key: "шаблон"
+              type: "регулярний вираз"
+              description: "Для текстових полів — регулярний вираз, що визначає дозволене введення."
+            type:
+              key: "тип"
+              type: "рядок"
+              description: "Для полів введення ви можете вказати тип введення, який слід очікувати (text|email|date|number|url|tel|color)"
+        preview_modal:
+          title: "Попередній перегляд шаблону"
+        field_placeholders:
+          validations: "введіть перевірки тут"
+          label: "Введіть мітку тут"
+          placeholder: "Введіть заповнювач тут"
+          none_label: "Виберіть елемент"
+          choices:
+            first: "Варіант 1"
+            second: "Варіант 2"
+            third: "Варіант 3"
+        edit_category:
+          toggle_freeform: "шаблон форми вимкнено"
+          toggle_form_template: "шаблон форми ввімкнено"
+          select_template: "Виберіть шаблони форм"
+          select_template_help: "Додати/редагувати шаблони форм"
       impersonate:
         title: "Втілитися"
         help: "Використовуйте цей інструмент, щоб увійти від імені користувача. Може бути корисно для налагодження. Після цього необхідно вийти та зайти під своїм обліковим записом знову."
@@ -5523,6 +5740,7 @@ uk:
         not_found: "Даруйте, такого імені користувача немає в нашій системі."
         id_not_found: "Даруйте, користувача за таким номером немає в нашій системі."
         active: "Активоване"
+        status: "Статус"
         show_emails: "Показати електронну пошту"
         hide_emails: "приховати E-mails"
         nav:
@@ -5611,7 +5829,6 @@ uk:
         show_admin_profile: "Адмін"
         manage_user: "Керування користувачем"
         show_public_profile: "Показати публічний профіль"
-        impersonate: "Втілитися"
         action_logs: "Журнал дій"
         ip_lookup: "Пошук IP"
         log_out: "Вийти"
@@ -5859,6 +6076,12 @@ uk:
         show_overriden: "Показувати тільки перевизначені"
         locale: "Мова:"
         more_than_50_results: "Знайдено понад 50 результатів. Будь ласка виправте параметри пошуку."
+        outdated:
+          title: "Цей переклад застарів"
+          description: "Переклад за замовчуванням для цього ключа змінився після створення цього перевизначення. Будь ласка, перевірте нижче, чи ваш переклад відповідає будь-яким змінам, які були внесені до оригіналу."
+          old_default: "Старе значення"
+          new_default: "Нове за замовчуванням"
+          dismiss: "Відхилити"
       settings:
         show_overriden: "Показувати тільки перевизначені"
         history: "Переглянути історію змін"
@@ -5871,7 +6094,11 @@ uk:
             label: "Додати емодзі"
         title: "Налаштування"
         no_results: "Не знайдено результатів."
-        more_than_30_results: "Знайдено понад 30 результатів. Будь ласка виправте параметри пошуку або виберіть розділ."
+        more_site_setting_results:
+          one: "Є більше %{count} результату. Уточніть пошук або виберіть категорію."
+          few: "Є більше %{count} результатів. Уточніть пошук або виберіть категорію."
+          many: "Є більше %{count} результатів. Уточніть пошук або виберіть категорію."
+          other: "Є більше ніж %{count} результатів. Уточніть пошук або виберіть категорію."
         clear_filter: "Очистити"
         add_url: "додати URL"
         add_host: "додати хост"
@@ -5958,7 +6185,8 @@ uk:
         allow_title: Дозволити використання значків як звань
         multiple_grant: Можуть бути надані декілька разів
         listable: Відображати нагороди на публічній сторінці Нагороди
-        enabled: Включити відзнаки
+        enabled: включено
+        disabled: вимкнуто
         icon: Іконка
         image: Зображення
         graphic: Іконка бейджа
@@ -6030,10 +6258,14 @@ uk:
       embedding:
         get_started: "Для вбудовування на Інший сайт необхідно додати відповідний хост."
         confirm_delete: "Ви впевнені, що хочете видалити цей хост?"
-        sample: "Вставте наступний HTML-код на свій сайт, щоб створити та вставити теми Discourse. Замініть <b>REPLACE_ME</b> на канонічну URL-адресу сторінки, на яку ви його вставляєте."
+        sample: |
+          <p>Щоб створити та вбудувати теми Discourse, вставте наступний HTML-код на свій сайт. Замініть <b>EMBED_URL</b> на канонічну URL-адресу сторінки, на яку ви її вставляєте.</p>
+
+          <p>Якщо ви хочете налаштувати стиль, видаліть коментар і замініть <b>CLASS_NAME</b> на клас CSS, визначений у <i>Embedded CSS</i> вашої теми.</p>
+
+          <p>Замініть <b>DISCOURSE_USERNAME</b> на ім'я користувача Discourse автора, який має створити тему. Дискурс автоматично шукатиме користувача за атрибутом <code>content</code> тегів <code>&lt;meta&gt;</code> з атрибутом <code>name</code> , встановленим у значення <code>discourse-username</code> або <code>author</code>. Параметр <code>discourseUserName</code> є застарілим і його буде вилучено у Discourse 3.2.</p>
         title: "Взаємодія"
         host: "Дозволені Хости"
-        class_name: "Назва класу"
         allowed_paths: "Список дозволених шляхів"
         edit: "редагувати"
         category: "Написати у Розділ"
diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml
index 096d9daff3e..9a6b57112b9 100644
--- a/config/locales/client.ur.yml
+++ b/config/locales/client.ur.yml
@@ -164,11 +164,6 @@ ur:
     software_update_prompt:
       message: "ہم نے اس سائٹ کواپڈیٹ کردیا <span>براہ مہربانی ریفریش کریں</span> ، یا آپ کا تجربہ غیر متوقع ہو سکتا ہے۔"
       dismiss: "بر خاست کریں"
-    bootstrap_mode_enabled:
-      one: "اپنی نئی سائٹ کو شروع کرنے کوآسان بنانے کے لیے، آپ بوٹسٹریپ موڈ میں ہیں۔ تمام نئے صارفین کو اعتماد کی سطح 1 دی جائے گی اور روزانہ ای میل سمری ای میلز کو فعال کیا جائے گا۔ %{count} صارف کے شامل ہونے پر یہ خود بخود بند ہو جائے گا۔"
-      other: "اپنی نئی سائٹ کو شروع کرنے کوآسان بنانے کے لیے، آپ بوٹسٹریپ موڈ میں ہیں۔ تمام نئے صارفین کو اعتماد کی سطح 1 دی جائے گی اور روزانہ ای میل سمری ای میلز کو فعال کیا جائے گا۔ %{count} صارفین کے شامل ہونے پر یہ خود بخود بند ہو جائے گا۔"
-    bootstrap_mode_disabled: "بُوٹسٹرَیپ مَوڈ 24 گھنٹوں کے اندر غیر فعال کر دیا جائے گا۔"
-    bootstrap_invite_button_title: "دعوت بھیجیں"
     themes:
       default_description: "ڈِیفالٹ"
       broken_theme_alert: "ہو سکتا ہے آپ کی سائٹ کام نہ کرے کیونکہ تھیم/جزو میں خامیاں ہیں۔"
@@ -279,11 +274,8 @@ ur:
       edit_bookmark: "بک مارک میں ترمیم کریں"
       clear_bookmarks: "بک مارکس ختم کریں"
       help:
-        bookmark: "اِس ٹاپک کی پہلی پوسٹ بُک مارک کرنے کے لئے کلک کریں"
-        edit_bookmark: "اس موضوع پر بک مارک میں ترمیم کرنے کے لیے کلک کریں"
         edit_bookmark_for_topic: "اس موضوع پر بک مارک میں ترمیم کرنے کے لیے کلک کریں"
         unbookmark: "اِس ٹاپک کے تمام بُک مارک ہٹانے کے لئے کلک کریں"
-        unbookmark_with_reminder: "اس موضوع میں تمام بک مارکس اور یاد دہانیوں کو مٹانے کے لیے کلک کریں۔"
     bookmarks:
       created: "آپ نے اس %{name} پوسٹ کو بک مارک کیا ہے۔"
       create: "بک مارک بنائیں"
@@ -325,7 +317,6 @@ ur:
       new_topic: "نئے ٹاپک کا ڈرافٹ"
       new_private_message: "نیے ذاتی پیغام کا مسودہ"
       abandon:
-        confirm: "آپ کے پاس اس عنوان کے لئے ایک مسودہ ہے۔ آپ اس کے ساتھ کیا کرنا چاہیں گے؟"
         yes_value: "منسوخ"
         no_value: "ترمیم دوبارہ شروع کریں"
     topic_count_categories:
@@ -497,11 +488,9 @@ ur:
       scores:
         about: "یہ اسکور رپورٹ کرنے والے کے ٹرسٹ لَیول پر مبنی ہے، اُن کے سابق فلَیگز کی درستگی، اور رپورٹ کردہ چیز کی ترجیح پر۔"
         score: "اسکور"
-        date: "تاریخ"
-        type: "قِسم"
+        type: "وجہ"
         status: "سٹیٹس"
-        submitted_by: "کی طرف سے شائع کردہ"
-        reviewed_by: "کی طرف سے جائزہ کردہ"
+        submitted_by: "کی طرف سے رپورٹ کردہ"
       statuses:
         pending:
           title: "زیرِاِلتوَاء"
@@ -509,14 +498,12 @@ ur:
           title: "منظورشدہ"
         rejected:
           title: "مسترد کر دی گئی"
-        ignored:
-          title: "نظر انداز کردہ"
-        deleted:
-          title: "مٹائیں"
         reviewed:
-          title: "(تمام جائزہ کردہ)"
+          title: "تمام جائزہ کردہ"
         all:
-          title: "(تمام)"
+          title: "تمام"
+      context_question:
+        delimiter: "یا"
       types:
         reviewable_flagged_post:
           title: "فلَیگ کردہ پوسٹ"
@@ -817,6 +804,7 @@ ur:
         make_all_primary_description: "اس کو تمام منتخب کردہ صارفین کے لئے بنیادی گروپ بنائیں"
         remove_all_primary: "بطور بنیادی ہٹائیں"
         remove_all_primary_description: "اس گروپ کو بنیادی طور پر ہٹا دیں"
+        status: "سٹیٹس"
         owner: "مالِک"
         primary: "بنیادی"
         forbidden: "آپ کو ممبران دیکھنے کی اجازت نہیں ہے۔"
@@ -942,11 +930,6 @@ ur:
       profile: "پروفائل"
       mute: "خاموش کردیں"
       edit: "ترجیحات میں ترمیم کردیں"
-      download_archive:
-        button_text: "تمام ڈاؤن لوڈ کریں"
-        confirm: "کیا آپ واقعی اپنی پوسٹس ڈاؤن لوڈ کرنا چاہتے ہیں؟"
-        success: "ڈاؤن لوڈ کا آغاز کر دیا گیا ہے، عمل مکمل ہونے پر آپ کو پیغام کے ذریعے مطلع کر دیا جائے گا۔"
-        rate_limit_error: "پوسٹس فی دن ایک بار ہی ڈاؤن لوڈ کی جا سکتی ہیں، براہ مہربانی کل دوبارہ کوشش کریں۔"
       new_private_message: "نیا پیغام"
       private_message: "پیغام"
       private_messages: "پیغامات"
@@ -1127,13 +1110,6 @@ ur:
       save_to_change_theme: 'آپ کے "%{save_text}" پر کلک کرنے کے بعد تھیم کو اپ ڈیٹ کر دیا جائے گا۔'
       home: "ڈیفالٹ ہوم پیج"
       staged: "سٹَیجڈ"
-      staff_counters:
-        flags_given: "مدد گار فلَیگ"
-        flagged_posts: "فلَیگ کی گئی پوسٹس"
-        deleted_posts: "مٹائی گئی پوسٹس"
-        suspensions: "معطلیاں"
-        warnings_received: "تنبیہات"
-        rejected_posts: "مسترد شدہ پوسٹس"
       messages:
         all: "تمام ان باکسز"
         inbox: "اِن باکس"
@@ -1183,11 +1159,9 @@ ur:
         title: "دو فیکٹر بیک اپ کوڈز"
         regenerate: "دوبارہ تخلیق کریں"
         disable: "غیر فعال کریں"
-        enable: "فعال کریں"
-        enable_long: "بیک اپ کوڈ فعال کریں"
         manage:
-          one: "بیک اپ کوڈز کا نظم کریں۔ آپ کے پاس <strong>%{count}</strong> بیک اپ کوڈ باقی ہے۔"
-          other: "بیک اپ کوڈز کا نظم کریں۔ آپ کے پاس <strong>%{count}</strong> بیک اپ کوڈز باقی ہیں۔"
+          one: "آپ کے <strong>%{count}</strong> بیک اپ کوڈ باقی ہے۔"
+          other: "آپ کے <strong>%{count}</strong> بیک اپ کوڈز باقی ہیں۔"
         copy_to_clipboard: "کلِپ بورڈ میں کاپی کریں"
         copy_to_clipboard_error: "کلِپ بورڈ میں ڈیٹا کاپی کرنے پر خرابی کا سامنا کر نا پرا"
         copied_to_clipboard: "کلِپ بورڈ میں کاپی کر لیا گیا"
@@ -1651,16 +1625,12 @@ ur:
       hidden_for_session: "ٹھیک ہے ، ہم کل آپ سے پوچھیں گے۔ آپ ہمیشہ بھی ایک اکاؤنٹ بنانے کے لئے 'لاگ ان' کا استعمال کرسکتے ہیں۔"
       intro: "ہیلو! ایسا لگتا ہے کہ آپ بحث سے لطف اندوز ہو رہے ہیں، لیکن آپ نے اکاؤنٹ کے لئے سائن اَپ نہیں کیا۔"
     summary:
-      enabled_description: "آپ اس ٹاپک کا خلاصہ ملاحظہ کررہے ہیں: سب سے دلچسپ پوسٹ کمیونٹی کی طرف سے متعین کی جاتی ہیں۔"
       description:
         one: "یہاں<b>%{count}</b> جواب ہے۔"
         other: "یہاں<b>%{count}</b> جوابات ہیں۔"
       description_time_MF: |
         وہاں {replyCount, plural, one { <b>#</b> جواب ہے} other { <b>#</b> جوابات ہیں}} ایک متوقع مطالعہ <b>{readingTime, plural, one {# منٹ} other {# منٹ}}</b>۔
-      enable: "اس ڑاپک کا خلاصہ کریں"
       disable: "تمام پوسٹیں دکھائیں"
-      short_label: "خلاصہ"
-      short_title: "اس موضوع کا خلاصہ دکھائیں: سب سے دلچسپ پوسٹس جیسا کہ کمیونٹی کے ذریعہ طے کیا گیا ہے۔"
     deleted_filter:
       enabled_description: "اِس ٹاپک میں حذف شدہ پوسٹ شامل ہیں، جو چھپا دی گئی ہیں۔"
       disabled_description: "ٹاپک کی حذف شدہ پوسٹ دکھائی گئی ہیں۔"
@@ -1929,8 +1899,6 @@ ur:
         topic_template_not_modified: "براہ مہربانی ٹاپک ٹَیمپلیٹ میں ترمیم کرکے اپنے ٹاپک میں تفصیلات اور مخصوصیات شامل کریں۔"
       save_edit: "ترمیم محفوظ کریں"
       overwrite_edit: "دوسری ترمیم کے اوپر لکھ ڈالیں"
-      reply_original: "حقیقی ٹاپک پر جواب دیں"
-      reply_here: "یہاں جواب دیں"
       reply: "جواب"
       cancel: "منسوخ"
       create_topic: "ٹاپک بنائیں"
@@ -2080,6 +2048,7 @@ ur:
       reaction: "<span>%{username}</span> %{description}"
       reaction_2: "<span>%{username}, %{username2}</span> %{description}"
       votes_released: "%{description} - مکمل"
+      admin_problems: "آپ کی سائٹ ڈَیش بورڈ پر نیا مشورہ"
       dismiss_confirmation:
         body:
           default:
@@ -2329,7 +2298,6 @@ ur:
         top: "کوئی ٹاپ ٹاپک موجود نہیں ہیں۔"
         educate:
           new: '<p>آپ کے نئے عنوانات یہاں ظاہر ہوں گے۔ پہلے سے طے شدہ طور پر، عنوانات کو نئے تصور کیا جاتا ہے اور اگر وہ پچھلے 2 دنوں میں بنائے گئے تھے تو وہ <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span> دکھائے گا۔</p><p>اسے تبدیل کرنے کے لیے اپنی <a href="%{userPrefsUrl}">ترجیحات</a> دیکھیں۔</p>'
-          unread: "<p>آپ کے بغیر پڑھے ہوئے موضوعات یہاں ظاہر ہوتے ہیں۔</p><p>پہلے سے طے شدہ طور پر، عنوانات کو بغیر پڑھے ہوئے سمجھا جاتا ہے اور یہ بغیر پڑھے ہوئے شماروں کو دکھائے گا اگر آپ: <span class=\"badge unread-posts badge-notification\"></p></span> موضوع بنایا<li><ul>موضوع کا جواب دیا<li></li>موضوع</li><p><li></li></ul>نے واضح طور پر ہر عنوان میں \U0001F514 کے ذریعے موضوع کو ٹریک یا دیکھا گیا پر سیٹ کریں۔</p><p>اسے تبدیل کرنے کے لیے اپنی <a href=\"%{userPrefsUrl}\">ترجیحات</a> دیکھیں۔</p>"
       bottom:
         latest: "کوئی مزید تازہ ترین ٹاپک موجود نہیں ہیں۔"
         posted: "کوئی مزید پوسٹ کیے گئے ٹاپک موجود نہیں ہیں۔"
@@ -2391,8 +2359,6 @@ ur:
       expand_details: "موضوع کی تفصیلات کو پھیلائیں"
       unread_indicator: "کسی ممبر نے ابھی تک اِس ٹاپک کی آخری پوسٹ نہیں پڑھی ہے۔"
       suggest_create_topic: <a href>نئی گفتگو شروع</a> کرنے کے لیے تیار ہیں؟
-      jump_reply_up: اِس سے پرانے جواب پر جائیں
-      jump_reply_down: اِس سے نئے جواب پر جائیں
       deleted: "ٹاپک مٹادیا گیا ہے"
       slow_mode_update:
         title: "سست موڈ"
@@ -2946,7 +2912,6 @@ ur:
       filtered_replies:
         viewing_posts_by: "%{post_count} پوسٹس دیکھ رہے ہیں بذریعہ"
         viewing_subset: "کچھ جوابات سمٹ گئے"
-        viewing_summary: "اس موضوع کا خلاصہ دیکھنا"
         post_number: "%{username}، پوسٹ نمبر%{post_number}"
         show_all: "تمام دکھائیں"
       share:
@@ -2962,7 +2927,6 @@ ur:
       back: "واپس زمرے میں"
       general: "عام"
       settings: "سیٹِنگ"
-      topic_template: "ٹاپک ٹَیمپلیٹ"
       tags: "ٹیگز"
       tags_allowed_tags: "اس زُمرہ میں اِن ٹیگز کو محدود کریں:"
       tags_allowed_tag_groups: "اس زُمرہ میں اِن ٹیگ گروپس کو محدود کریں:"
@@ -3016,8 +2980,6 @@ ur:
       images: "تصاویر"
       email_in: "اپنی مرضی کا اِنکَمِنگ اِیمیل ایڈریس:"
       email_in_allow_strangers: "اکاؤنٹس نہ رکھنے والے گمنام صارفین کی طرف سے اِیمیلز کو قبول کریں"
-      email_in_disabled: "ای میل کے ذریعے نئے عنوانات پوسٹ کرنا سائٹ کی ترتیبات میں غیر فعال ہے۔ ای میل کے ذریعے نئے عنوانات کی اشاعت کو فعال کرنے کے لیے، "
-      email_in_disabled_click: 'سیٹِنگ میں "اِیمیل اِن" فعال کریں۔'
       mailinglist_mirror: "زُمرہ میلنگ فہرست کا عکس ہے"
       show_subcategory_list: "اس زمرہ میں ذیلی زمرہ جات کی فہرست ٹاپکس سے مندرجہ بالا دکھائیں۔"
       read_only_banner: "بینر ٹیکسٹ جب کوئی صارف اس زمرے میں موضوع نہیں بنا سکتا:"
@@ -3224,6 +3186,10 @@ ur:
     filters:
       with_topics: "%{filter} ٹاپک"
       with_category: "%{filter} %{category} ٹاپک"
+      filter:
+        title: "فِلٹر"
+        button:
+          label: "فِلٹر"
       latest:
         title: "تازہ ترین"
         title_with_count:
@@ -3307,6 +3273,9 @@ ur:
       close: "بند (Esc)"
       content_load_error: '<a href="%url%">مواد</a> لوڈ نہیں کیا جا سکا۔'
       image_load_error: '<a href="%url%">تصویر</a> لوڈ نہیں کی جا سکی۔'
+    experimental_lightbox:
+      buttons:
+        close: "بند (Esc)"
     cannot_render_video: اس ویڈیو کو رینڈر نہیں کیا جا سکتا کیونکہ آپ کا براؤزر کوڈیک کو سپورٹ نہیں کرتا ہے۔
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: "، "
@@ -3397,7 +3366,6 @@ ur:
         one: "یہ بَیج %{count} دفعہ حاصل کیا"
         other: "یہ بَیج %{count} مرتبہ حاصل کیا"
       granted_on: "عطا کیا گیا %{date}"
-      others_count: "دوسرے جن کے پاس یہ بَیج ہے (%{count})"
       title: بَیج
       allow_title: "آپ اِس بَیج کو عنوان کے طور پر استعمال کر سکتے ہیں"
       multiple_grant: "آپ اِس کو ایک سے زیادہ مرتبہ حاصل کر سکتے ہیں"
@@ -3573,13 +3541,11 @@ ur:
       enabled: "سیف موڈ فعال ہے، سیف موڈ سے باہر نکلنے کے لئے اِس براؤزر وِنڈو کو بند کریں"
     image_removed: "(تصویر ہٹا دی گئی)"
     pause_notifications:
-      remaining: "%{remaining} باقی رہتا ہے..."
       options:
         half_hour: "30 منٹ"
         one_hour: "1 گھنٹہ"
         two_hours: "2 گھنٹے"
         tomorrow: "کل تک"
-        custom: "اپنی مرضی کا"
       set_schedule: "اطلاع کا شیڈول مرتب کریں"
     trust_levels:
       names:
@@ -3619,7 +3585,21 @@ ur:
         other: "%{count} نئے"
       more: "مزید"
       all_categories: "تمام زُمرَہ جات"
+      edit_navigation_modal_form:
+        filter_dropdown:
+          all: "تمام"
       sections:
+        custom:
+          save: "محفوظ کریں"
+          delete: "مٹائیں"
+          links:
+            reset: "دوبارہ پہلے جیسا کر دیں"
+            icon:
+              label: "آئیکن"
+            name:
+              label: "نام"
+            value:
+              label: "لنک"
         about:
           header_link_text: "بارے میں"
         messages:
@@ -3637,7 +3617,8 @@ ur:
         categories:
           header_link_text: "زُمرَہ جات"
         community:
-          header_link_text: "کمیونٹی"
+          edit_section:
+            header_dropdown: "مرضی کے مطابق بنائیں"
           links:
             about:
               content: "بارے میں"
@@ -3645,8 +3626,8 @@ ur:
               content: "ایڈمن"
             badges:
               content: "بَیج"
-            everything:
-              content: "تمام"
+            topics:
+              content: "ٹاپکس"
             faq:
               content: "عمومی سوالات"
             groups:
@@ -3658,6 +3639,11 @@ ur:
             review:
               content: "جائزہ لیں"
     until: "جب تک:"
+    form_templates:
+      errors:
+        typeMismatch:
+          default: "براہ کرم، ایک قابلِ قبول قدر درج کریں۔"
+          email: "براہ کرم، ایک قابلِ قبول ایِ میل ایڈریس درج کریں."
   admin_js:
     type_to_filter: "فِلٹر کرنے کے لئے ٹائپ کریں..."
     admin:
@@ -3878,7 +3864,6 @@ ur:
             topics:
               read: اس میں کوئی موضوع یا کوئی مخصوص پوسٹ پڑھیں۔ آر ایس ایس کی بھی حمایت حاصل ہے۔
               write: ایک نیا موضوع بنائیں یا موجودہ موضوع پر پوسٹ کریں۔
-              update: ایک موضوع کو اپ ڈیٹ کریں۔ عنوان، زمرہ، ٹیگز وغیرہ تبدیل کریں۔
               read_lists: ٹاپک، نیا، تازہ ترین، وغیرہ جیسے عنوانات کی فہرستیں پڑھیں۔ RSS بھی تعاون یافتہ ہے۔
             posts:
               edit: کسی بھی پوسٹ یا مخصوص میں ترمیم کریں۔
@@ -3966,9 +3951,6 @@ ur:
         user_promoted_event:
           name: "یوزر پروموٹڈ ایونٹ"
           details: "جب کسی صارف کو ایک اعتماد کی سطح سے دوسری سطح پر ترقی دی جاتی ہے۔"
-        user_badge_event:
-          name: "بیج گرانٹ ایونٹ"
-          details: "جب صارف کو بیج ملتا ہے۔"
         group_user_event:
           name: "گروپ یوزر ایونٹ"
           details: "جب کسی صارف کو گروپ میں شامل یا ہٹا دیا جاتا ہے۔"
@@ -4011,7 +3993,6 @@ ur:
         enabled: "فعال؟"
         is_enabled: "Y"
         not_enabled: "N"
-        change_settings: "سیٹنگ تبدیل کریں"
         change_settings_short: "سیٹِنگ"
         howto: "میں پلَگ اِنز کیسے انسٹال کروں؟"
         official: "آفیشل پلَگ اِن"
@@ -4333,6 +4314,8 @@ ur:
           love:
             name: "محبت"
             description: "لائیک بٹن کا رنگ۔"
+          selected:
+            name: "منتخب کیا ہوا"
         robots:
           title: "آپ کی سائٹ کی robots.txt فائل کی جگہ لے لیتی ہے:"
           warning: "یہ مستقل طور پر کسی بھی متعلقہ سائٹ ترتیبات کی جگہ لے لیگی۔"
@@ -4613,14 +4596,8 @@ ur:
           silence: "خاموش کریں"
           link: "لنک"
         action_descriptions:
-          block: "اِن الفاظ پر مشتمل پوسٹس شائع ہونے سے روکیں۔ جب صارف اپنی پوسٹ شائع کرنے کی کوشش کرے گا تو اُسے ایک خرابی کا پیغام دکھایا جائے گا۔"
-          censor: "اِن الفاظ پر مشتمل پوسٹس کوشائع ہونے دیں، لیکن سینسر کیے گئے الفاظ کو چھپانے والے حروف کے ساتھ تبدیل کریں۔"
-          require_approval: "اِن الفاظ پر مشتمل پوسٹس کے نظر آنے سے پہلے اسٹاف کی طرف سے منظوری کی ضرورت ہوگی۔"
-          flag: "اِن الفاظ پر مشتمل پوسٹس کوشائع ہونے دیں، لیکن ان کو غیر مناسب کے طور پر فلَیگ کریں تاکہ منتظمین ان کا جائزہ لے سکیں۔"
-          replace: "پوسٹس میں الفاظ کو دوسرے الفاظ سے بدلیں"
-          tag: "پہلی پوسٹ کی بنیاد پر موضوعات کو خودکار طور پر ٹیگ کریں"
-          silence: "ان الفاظ پر مشتمل صارفین کی پہلی پوسٹس کو دیکھنے سے پہلے عملے کی منظوری درکار ہوگی اور صارف خود بخود خاموش ہو جائے گا۔"
-          link: "پوسٹس میں الفاظ کو لنکس سے بدلیں"
+          replace: "پوسٹس میں الفاظ کو دوسرے الفاظ سے بدلیں."
+          link: "پوسٹس میں الفاظ کو لنکس سے بدلیں."
         form:
           label: "لفظ یا جملہ ہے۔"
           placeholder: "لفظ یا جملہ درج کریں (* سب کیلیے )"
@@ -4641,6 +4618,37 @@ ur:
           description: "نظر رکھے ہوئے الفاظ کے ساتھ مَیچ چَیک کرنے کیلئے نیچے ٹَیکسٹ درج کریں۔"
           found_matches: "ملے مَیچ:"
           no_matches: "کوئی میل نہیں ملے"
+      form_templates:
+        nav_title: "ٹَیمپلیٹ"
+        list_table:
+          headings:
+            name: "نام"
+            actions: "عمل"
+        view_template:
+          close: "بند کریں"
+          edit: "ترمیم کریں"
+          delete: "مٹائیں"
+        new_template_form:
+          submit: "محفوظ کریں"
+          cancel: "منسوخ"
+          preview: "پیشگی دیکھیں"
+        quick_insert_fields:
+          add_new_field: "اضافہ کریں"
+          dropdown: "ڈراپ ڈاؤن"
+        validations_modal:
+          table_headers:
+            key: "کی"
+            type: "قِسم"
+            description: "تفصیل"
+          validations:
+            required:
+              key: "درکار ہے"
+            minimum:
+              key: "کم از کم"
+            maximum:
+              key: "زیادہ سے زیادہ"
+            type:
+              key: "قِسم"
       impersonate:
         title: "نقالی"
         help: "ڈِیبَگ مقاصد کیلئے اِس آلے کو استعمال کر کہ ایک صارف کے اکاؤنٹ کی نقالی کریں۔ کام ختم ہونے کے بعد آپ کے ایک دفعہ لاگ آؤٹ کرنا ہو گا۔"
@@ -4653,6 +4661,7 @@ ur:
         not_found: "معذرت، وہ صارف نام ہمارے سِسٹم میں موجود نہیں ہے۔"
         id_not_found: "معذرت، وہ صارف ID ہمارے سِسٹم میں موجود نہیں ہے۔"
         active: "فعال کردہ"
+        status: "سٹیٹس"
         show_emails: "اِیمیل دکھائیں"
         hide_emails: "ای میلز چھپائیں"
         nav:
@@ -4734,7 +4743,6 @@ ur:
         staged: "سٹَیجڈ؟"
         show_admin_profile: "ایڈمن"
         show_public_profile: "پبلک پروفائل دکھائیں"
-        impersonate: "نقالی"
         action_logs: "عوامل کے لاگز"
         ip_lookup: "IP کا سراغ"
         log_out: "لاگ آُوٹ"
@@ -4960,6 +4968,8 @@ ur:
         show_overriden: "صرف اووَر رائیڈ ہوئے دکھائیں"
         locale: "زبان:"
         more_than_50_results: "50 سے زائد نتائج ہیں۔ برائے مہربانی اپنی تلاش کو تنگ کریں۔"
+        outdated:
+          dismiss: "بر خاست کریں"
       settings:
         show_overriden: "صرف اووَر رائیڈ ہوئے دکھائیں"
         history: "تبدیلی کی تاریخ دیکھیں"
@@ -4972,7 +4982,6 @@ ur:
             label: "ایموجی شامل کریں"
         title: "سیٹِنگ"
         no_results: "کوئی نتائج نہیں پائے گئے۔"
-        more_than_30_results: "30 سے زائد نتائج ہیں۔ برائے مہربانی اپنی تلاش کو تنگ کریں یا ایک زمرہ منتخب کریں۔"
         clear_filter: "صاف کریں"
         add_url: "URL شامل کریں"
         add_host: "ہَوسٹ شامل کریں"
@@ -5059,7 +5068,7 @@ ur:
         allow_title: عنوان کے طور پر بَیج وں کے استعمال کی اجازت دیں
         multiple_grant: ایک سے زیادہ مرتبہ عطا کیا جا سکتا ہے
         listable: پبلک بَیجز کے صفحے پر بَیج دکھائیں
-        enabled: بَیج فعال کریں
+        disabled: غیر فعال
         icon: آئیکن
         image: تصویر
         graphic: گرافک
@@ -5131,7 +5140,6 @@ ur:
         confirm_delete: "کیا آپ واقعی اس ہَوسٹ کو حذف کرنا چاہتے ہیں؟"
         title: "اَیمبَیڈ کرنا"
         host: "اجازت یافتہ ہَوسٹ"
-        class_name: "کلاس کا نام"
         allowed_paths: "پاتھ کی اجازت کی فہرست"
         edit: "ترمیم"
         category: "زمرہ میں پوسٹ کریں"
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index ecdffab91fd..38d37e35aff 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -155,11 +155,6 @@ vi:
     software_update_prompt:
       message: "Chúng tôi đã cập nhật trang web này, <span>vui lòng làm mới</span>, nếu không bạn có thể gặp phải hành vi không mong muốn."
       dismiss: "Hủy bỏ"
-    bootstrap_mode_enabled:
-      other: "Để đơn giản hoá quá trình triển khai trang web, bạn đang ở trong chế độ bootstrap. Mọi người dùng mới đều có mức độ tin cậy 1 và sẽ nhận được email cập nhật thông tin mỗi ngày. Chế độ này sẽ tự động tắt khi số người dùng vượt qua %{count}"
-    bootstrap_mode_disabled: "Chế độ bootstrap sẽ bị vô hiệu trong 24 giờ tới."
-    bootstrap_invite_button_title: "Gửi Lời Mời"
-    bootstrap_wizard_link_title: "Hoàn tất trình hướng dẫn thiết lập"
     themes:
       default_description: "Mặc định"
       broken_theme_alert: "Trang web của bạn có thể không hoạt động vì một chủ đề / thành phần có lỗi."
@@ -267,11 +262,9 @@ vi:
       edit_bookmark: "Chỉnh sửa Dấu trang"
       clear_bookmarks: "Xoá dấu trang"
       help:
-        bookmark: "Chọn bài viết đầu tiên của chủ đề cho vào dấu trang"
-        edit_bookmark: "Nhấp để chỉnh sửa dấu trang về chủ đề này"
         edit_bookmark_for_topic: "Nhấp để chỉnh sửa dấu trang cho chủ đề này"
         unbookmark: "Chọn để xoá toàn bộ dấu trang trong chủ đề này"
-        unbookmark_with_reminder: "Nhấp để xóa tất cả dấu trang và lời nhắc trong chủ đề này."
+        unbookmark_with_reminder: "Nhấp để xóa tất cả dấu trang và lời nhắc trong chủ đề này"
     bookmarks:
       created: "Bạn đã đánh dấu bài đăng này. %{name}"
       created_generic: "Bạn đã đánh dấu trang này. %{name}"
@@ -315,7 +308,6 @@ vi:
       new_topic: "Chủ đề nháp mới"
       new_private_message: "Bản nháp tin nhắn cá nhân mới"
       abandon:
-        confirm: "Bạn đang có một bản nháp cho chủ đề này. Bạn muốn làm gì với nó?"
         yes_value: "Hủy bỏ"
         no_value: "Tiếp tục chỉnh sửa"
     topic_count_categories:
@@ -476,11 +468,9 @@ vi:
       scores:
         about: "Điểm số này được tính toán dựa trên mức độ tin cậy của người báo cáo, độ chính xác của những gắn cờ trước đó, và mức độ ưu tiên của mục được báo cáo."
         score: "Điểm số"
-        date: "Ngày"
-        type: "Loại"
+        type: "Lý do"
         status: "Trạng thái"
-        submitted_by: "Được gửi bởi"
-        reviewed_by: "Được đánh giá bởi"
+        submitted_by: "Báo cáo bởi"
       statuses:
         pending:
           title: "Đang treo"
@@ -488,14 +478,12 @@ vi:
           title: "Đã phê duyệt"
         rejected:
           title: "Từ chối"
-        ignored:
-          title: "Đã bỏ qua"
-        deleted:
-          title: "Đã xóa"
         reviewed:
-          title: "(tất cả đã đánh giá)"
+          title: "Tất cả đã đánh giá"
         all:
-          title: "(mọi thứ)"
+          title: "Mọi thứ"
+      context_question:
+        delimiter: "hoặc"
       types:
         reviewable_flagged_post:
           title: "Bài viết bị gắn cờ"
@@ -788,6 +776,7 @@ vi:
         remove_owners_description: "Xóa những người dùng đã chọn làm chủ sở hữu của nhóm này"
         make_all_primary: "Đặt tất cả là chính"
         make_all_primary_description: "Đặt nhóm này thành nhóm chính cho tất cả người dùng đã chọn"
+        status: "Trạng thái"
         owner: "Chủ sở hữu"
         primary: "Chính"
         forbidden: "Bạn không được phép xem thành viên."
@@ -908,11 +897,6 @@ vi:
       profile: "Tiểu sử"
       mute: "Im lặng"
       edit: "Tùy chỉnh"
-      download_archive:
-        button_text: "Tải tất c"
-        confirm: "Bạn có chắc chắn muốn download các bài viết của mình?"
-        success: "Quá trình tải về đã bắt đầu, bạn sẽ được thông báo qua tin nhắn khi quá trình hoàn tất."
-        rate_limit_error: "Bài viết chỉ được tải về một lần mỗi người, hãy thử lại vào ngày mai."
       new_private_message: "Tin nhắn mới"
       private_message: "Tin nhắn"
       private_messages: "Tin nhắn"
@@ -1024,14 +1008,7 @@ vi:
       experimental_sidebar:
         enable: "Bật thanh bên"
         options: "Tùy chọn"
-        categories_section: "Phần danh mục"
-        categories_section_instruction: "Các danh mục đã chọn sẽ được hiển thị trong phần danh mục của Thanh bên."
-        tags_section: "Phần thẻ"
-        tags_section_instruction: "Các thẻ đã chọn sẽ được hiển thị trong phần thẻ của Thanh bên."
         navigation_section: "Điều hướng"
-        list_destination_instruction: "Khi có nội dung mới trong thanh bên..."
-        list_destination_default: "sử dụng liên kết mặc định và hiển thị huy hiệu cho các mục mới"
-        list_destination_unread_new: "liên kết đến chưa đọc/mới và hiển thị số lượng mục mới"
       change: "thay đổi"
       featured_topic: "Chủ đề nổi bật"
       moderator: "%{user} trong ban quản trị"
@@ -1103,13 +1080,6 @@ vi:
       save_to_change_theme: 'Chủ đề sẽ được cập nhật sau khi bạn nhấp vào "%{save_text}"'
       home: "Trang chủ mặc định"
       staged: "Theo giai đoạn"
-      staff_counters:
-        flags_given: "cờ hữu ích"
-        flagged_posts: "bài viết gắn cờ"
-        deleted_posts: "bài viết bị xoá"
-        suspensions: "đình chỉ"
-        warnings_received: "cảnh báo"
-        rejected_posts: "bài viết bị từ chối"
       messages:
         all: "tất cả hộp thư đến"
         inbox: "Hộp thư"
@@ -1144,7 +1114,6 @@ vi:
         tags: "Thẻ"
         interface: "Giao diện"
         apps: "Ứng dụng"
-        sidebar: "Thanh bên"
       change_password:
         success: "(email đã gửi)"
         in_progress: "(đang gửi email)"
@@ -1158,10 +1127,8 @@ vi:
         title: "Mã dự phòng đăng nhập hai yếu tố"
         regenerate: "Khởi tạo lại"
         disable: "Vô hiệu hóa"
-        enable: "Kích hoạt"
-        enable_long: "Bật backup codes"
         manage:
-          other: "Quản lý mã dự phòng. Bạn còn lại <strong>%{count}</strong> mã dự phòng."
+          other: "Bạn còn lại <strong>%{count}</strong> mã dự phòng."
         copy_to_clipboard: "Sao chép vào clipboard"
         copy_to_clipboard_error: "Lỗi sao chép dữ liệu vào Clipboard"
         copied_to_clipboard: "Sao chép vào Clipboard"
@@ -1597,8 +1564,6 @@ vi:
       enabled: "Website đang ở chế độ chỉ đọc, bạn có thể duyệt xem nhưng không thể trả lời, likes, hay thực hiện các hành động khác."
       login_disabled: "Chức năng Đăng nhập đã bị tắt khi website trong trạng thái chỉ đọc"
       logout_disabled: "Chức năng đăng xuất đã bị tắt khi website đang trong trạng thái chỉ đọc."
-    too_few_posts_notice_MF: |
-      Hãy cùng <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">bắt đầu thảo luận!</a> Đó {currentPosts, plural, other {là <strong>bài #</strong> }}. Khách truy cập cần nhiều hơn để đọc và trả lời - chúng tôi khuyên bạn nên ít nhất {requiredPosts, plural, other {<strong>#</strong> bài viết}}. Chỉ nhân viên mới có thể nhìn thấy thông báo này.
     logs_error_rate_notice:
       reached_hour_MF: |
         <b>{relativeAge}</b> - <a href='{url}' target='_blank'>{rate, plural, other {# lỗi / giờ}}</a> trang web đạt đến giới hạn thiết lập của {limit, plural, other {# lỗi / giờ}}.
@@ -1628,13 +1593,9 @@ vi:
       intro: "Xin chào! Có vẻ như bạn đang quan tâm chủ đề này, nhưng bạn chưa đăng ký tài khoản."
       value_prop: "Bạn mệt mỏi khi phải cuộn qua các bài viết giống nhau? Khi tạo tài khoản, bạn sẽ luôn quay lại nơi bạn đã dừng lại. Với một tài khoản, bạn cũng có thể được thông báo về các câu trả lời mới, lưu dấu trang và sử dụng lượt thích để cảm ơn người khác. Tất cả chúng ta có thể làm việc cùng nhau để làm cho cộng đồng này trở nên tuyệt vời. :heart:"
     summary:
-      enabled_description: "Bạn đang xem một bản tóm tắt của chủ đề này: các bài viết thú vị nhất được xác định bởi cộng đồng."
       description:
         other: "Có <b>%{count}</b> trả lời."
-      enable: "Tóm tắt lại chủ đề"
       disable: "HIển thị tất cả các bài viết"
-      short_label: "Tóm tắt"
-      short_title: "Hiển thị tóm tắt về chủ đề này: các bài đăng thú vị nhất do cộng đồng xác định"
     deleted_filter:
       enabled_description: "Chủ để này có chứa các bài viết bị xoá, chúng đã bị ẩn đi"
       disabled_description: "Xoá các bài viết trong các chủ để được hiển thị"
@@ -1903,8 +1864,6 @@ vi:
         topic_template_not_modified: "Vui lòng thêm chi tiết và cụ thể cho chủ đề của bạn bằng cách chỉnh sửa mẫu chủ đề."
       save_edit: "Lưu chỉnh sửa"
       overwrite_edit: "Ghi đè Chỉnh sửa"
-      reply_original: "Trả lời cho bài viết gốc"
-      reply_here: "Trả lời đây "
       reply: "Trả lời "
       cancel: "Huỷ"
       create_topic: "Tạo chủ đề"
@@ -2051,6 +2010,7 @@ vi:
       reaction: "<span>%{username}</span> %{description}"
       reaction_2: "<span>%{username}, %{username2}</span> %{description}"
       votes_released: "%{description} - hoàn thành"
+      admin_problems: "Lời khuyên mới trên bảng điều khiển trang web của bạn"
       dismiss_confirmation:
         body:
           default:
@@ -2326,7 +2286,7 @@ vi:
         top: "Không có chủ đề top."
         educate:
           new: '<p>Các chủ đề mới của bạn sẽ xuất hiện ở đây. Theo mặc định, các chủ đề được coi là mới và sẽ hiển thị chỉ báo <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span> nếu chúng được tạo trong 2 ngày qua.</p><p>Truy cập <a href="%{userPrefsUrl}">tùy chọn</a> của bạn để thay đổi.</p>'
-          unread: "<p>Các chủ đề chưa đọc của bạn xuất hiện ở đây.</p><p>Theo mặc định, các chủ đề được coi là chưa đọc và sẽ hiển thị số lượng chưa đọc <span class=\"badge unread-posts badge-notification\">1</span> nếu bạn:</p><ul><li>Đã tạo chủ đề</li><li>Đã trả lời chủ đề</li><li>Đọc chủ đề trong hơn 4 phút</li></ul><p>Hoặc nếu bạn đã đặt chủ đề một cách rõ ràng thành Theo dõi hoặc Đã theo dõi qua \U0001F514 trong mỗi chủ đề.</p><p>Truy cập <a href=\"%{userPrefsUrl}\">tùy chọn</a> của bạn để thay đổi điều này.</p>"
+          unread: "<p>Các chủ đề chưa đọc của bạn xuất hiện ở đây.</p><p>Theo mặc định, các chủ đề được coi là chưa đọc và sẽ hiển thị số lượng chưa đọc <span class=\"badge unread-posts badge-notification\">1</span> nếu bạn:</p><ul><li>Đã tạo chủ đề</li><li>Đã trả lời chủ đề</li><li>Đọc chủ đề trong hơn 5 phút</li></ul><p>Hoặc nếu bạn đã đặt chủ đề một cách rõ ràng thành Theo dõi hoặc Đã theo dõi qua \U0001F514 trong mỗi chủ đề.</p><p>Truy cập <a href=\"%{userPrefsUrl}\">tùy chọn</a> của bạn để thay đổi điều này.</p>"
       bottom:
         latest: "Không còn thêm chủ đề nào nữa."
         posted: "Ở đây không có thêm chủ đề nào được đăng."
@@ -2383,8 +2343,6 @@ vi:
       expand_details: "mở rộng chi tiết chủ đề"
       unread_indicator: "Chưa có thành viên nào đọc bài cuối cùng của chủ đề này."
       suggest_create_topic: Bạn đã sẵn sàng để <a href>đầu một cuộc trò chuyện mới chưa?</a>
-      jump_reply_up: nhảy đến những trả lời trước đó
-      jump_reply_down: nhảy tới những trả lời sau đó
       deleted: "Chủ đề này đã bị xóa"
       slow_mode_update:
         title: "Chế độ chậm"
@@ -2733,8 +2691,6 @@ vi:
       collapse: "Thu nhỏ"
       sr_collapse_replies: "Thu gọn các câu trả lời đã nhúng"
       sr_date: "Ngày đăng"
-      sr_expand_replies:
-        other: "Bài đăng này có %{count} câu trả lời. Bấm để mở rộng"
       expand_collapse: "mở/đóng"
       locked: "MOD đã khóa bài đăng này không được chỉnh sửa"
       gap:
@@ -2920,7 +2876,6 @@ vi:
       filtered_replies:
         viewing_posts_by: "Đang xem %{post_count} bài viết của"
         viewing_subset: "Một số câu trả lời bị thu gọn"
-        viewing_summary: "Xem tóm tắt về chủ đề này"
         post_number: "%{username}, bài số #%{post_number}"
         show_all: "Hiển thị tất cả"
       share:
@@ -2936,7 +2891,6 @@ vi:
       back: "Quay lại danh mục"
       general: "Chung"
       settings: "Cấu hình"
-      topic_template: "Mẫu Chủ đề"
       tags: "Thẻ"
       tags_allowed_tags: "Hạn chế các thẻ này trong danh mục này:"
       tags_allowed_tag_groups: "Hạn chế các nhóm thẻ này trong danh mục này:"
@@ -2993,8 +2947,6 @@ vi:
       images: "Hình ảnh"
       email_in: "Tùy chỉnh địa chỉ nhận thư điện tử "
       email_in_allow_strangers: "Nhận thư điện tử từ người gửi vô danh không tài khoản"
-      email_in_disabled: "Tạo chủ đề mới thông qua email đã được tắt trong thiết lập. Để bật tính năng này, "
-      email_in_disabled_click: 'kích hoạt thiết lập thư điện tử'
       mailinglist_mirror: "Danh mục phản ánh một danh sách gửi thư"
       show_subcategory_list: "Hiển thị danh sách danh mục phụ ở trên các chủ đề trong danh mục này."
       read_only_banner: "Văn bản biểu ngữ khi người dùng không thể tạo chủ đề trong danh mục này:"
@@ -3190,6 +3142,10 @@ vi:
     filters:
       with_topics: "%{filter} chủ đề"
       with_category: "%{filter} %{category} chủ đề"
+      filter:
+        title: "Lọc"
+        button:
+          label: "Lọc"
       latest:
         title: "Mới nhất"
         title_with_count:
@@ -3267,6 +3223,9 @@ vi:
       close: "Đóng (Esc)"
       content_load_error: '<a href="%url%">Không thể tải nội dung</a>.'
       image_load_error: '<a href="%url%">Không thể tải hình ảnh</a>.'
+    experimental_lightbox:
+      buttons:
+        close: "Đóng (Esc)"
     cannot_render_video: Không thể hiển thị video này vì trình duyệt của bạn không hỗ trợ codec.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
@@ -3357,7 +3316,6 @@ vi:
       earned_n_times:
         other: "Đã giành được huy hiệu này %{count} lần"
       granted_on: "Cấp ngày %{date}"
-      others_count: "Người có huy hiệu này (%{count})"
       title: Huy hiệu
       allow_title: "Bạn có thể sử dụng huy hiệu này làm tiêu đề"
       multiple_grant: "Bạn có thể có được nhiều lần"
@@ -3526,13 +3484,11 @@ vi:
       enabled: "Chế độ an toàn được bật, để thoát khỏi chế độ an toàn, hãy đóng cửa sổ trình duyệt này"
     image_removed: "(hình ảnh đã bị xóa)"
     pause_notifications:
-      remaining: "còn lại %{remaining}"
       options:
         half_hour: "30 phút"
         one_hour: "1 tiếng"
         two_hours: "2 tiếng"
         tomorrow: "Cho tới ngày mai"
-        custom: "Tùy biến"
       set_schedule: "Đặt lịch thông báo"
     trust_levels:
       names:
@@ -3574,7 +3530,21 @@ vi:
       more: "Thêm"
       all_categories: "Tất cả danh mục"
       all_tags: "Tất cả các thẻ"
+      edit_navigation_modal_form:
+        filter_dropdown:
+          all: "All"
       sections:
+        custom:
+          save: "Lưu lại"
+          delete: "Xóa"
+          links:
+            reset: "Đặt lại về mặc định"
+            icon:
+              label: "Biểu tượng"
+            name:
+              label: "T"
+            value:
+              label: "Liên kết"
         about:
           header_link_text: "Giới thiệu"
         messages:
@@ -3596,7 +3566,8 @@ vi:
           click_to_get_started: "Bấm vào đây để bắt đầu."
           header_link_text: "Thư mục"
         community:
-          header_link_text: "Cộng đồng"
+          edit_section:
+            header_dropdown: "Tùy biến"
           links:
             about:
               content: "Giới thiệu"
@@ -3604,8 +3575,8 @@ vi:
               content: "Quản trị"
             badges:
               content: "Huy hiệu"
-            everything:
-              content: "Mọi thứ"
+            topics:
+              content: "Chủ đề"
               title: "Tất cả các chủ đề"
             faq:
               content: "Câu hỏi thường gặp"
@@ -3620,6 +3591,11 @@ vi:
             review:
               content: "Review"
     until: "Cho đến khi:"
+    form_templates:
+      errors:
+        typeMismatch:
+          default: "Hãy nhập giá trị hợp lệ."
+          email: "Vùi lòng nhập một thư điện tử hợp lệ."
   admin_js:
     type_to_filter: "gõ để lọc..."
     admin:
@@ -3838,7 +3814,6 @@ vi:
             topics:
               read: Đọc một chủ đề hoặc một bài viết cụ thể trong đó. RSS cũng được hỗ trợ.
               write: Tạo một chủ đề mới hoặc đăng một chủ đề hiện có.
-              update: Cập nhật chủ đề. Thay đổi tiêu đề, danh mục, thẻ, v.v.
               read_lists: Đọc danh sách chủ đề như hàng đầu, mới, mới nhất, v.v. RSS cũng được hỗ trợ.
             posts:
               edit: Chỉnh sửa bất kỳ bài đăng nào hoặc một bài đăng cụ thể.
@@ -3931,9 +3906,6 @@ vi:
         user_promoted_event:
           name: "Sự kiện do người dùng quảng cáo"
           details: "Khi người dùng được thăng cấp từ cấp độ tin cậy này sang cấp độ tin cậy khác."
-        user_badge_event:
-          name: "Sự kiện cấp huy hiệu"
-          details: "Khi người dùng nhận được một huy hiệu."
         group_user_event:
           name: "Sự kiện người dùng nhóm"
           details: "Khi một người dùng được thêm vào hoặc bị xóa trong một nhóm."
@@ -3974,7 +3946,6 @@ vi:
         enabled: "Kích hoạt"
         is_enabled: "Có"
         not_enabled: "Không"
-        change_settings: "Đổi Cấu hình"
         change_settings_short: "Cấu hình"
         howto: "Plugin cài như thế nào?"
         official: "Plugin chính thức"
@@ -4285,6 +4256,8 @@ vi:
           love:
             name: "đáng yêu"
             description: "Màu của nút like"
+          selected:
+            name: "đã chọn"
         robots:
           title: "Ghi đè tệp robots.txt của trang web của bạn:"
           warning: "Điều này sẽ ghi đè vĩnh viễn mọi cài đặt trang web liên quan."
@@ -4557,10 +4530,6 @@ vi:
           replace: "Thay thế"
           silence: "Im lặng"
           link: "Liên kết"
-        action_descriptions:
-          censor: "Cho phép các bài đăng có chứa những từ này nhưng hãy thay thế chúng bằng các ký tự ẩn các từ đã được kiểm duyệt."
-          tag: "Tự động gắn thẻ các chủ đề dựa trên bài đăng đầu tiên"
-          silence: "Các bài đăng đầu tiên của người dùng có chứa những từ này sẽ yêu cầu nhân viên phê duyệt trước khi họ có thể được nhìn thấy và người dùng sẽ tự động bị tắt tiếng."
         form:
           replace_label: "Sự thay thế"
           replace_placeholder: "thí dụ"
@@ -4573,6 +4542,37 @@ vi:
           upload_successful: "Tải lên thành công. Các từ đã được thêm vào."
         test:
           no_matches: "Không tìm thấy"
+      form_templates:
+        nav_title: "Templates"
+        list_table:
+          headings:
+            name: "Tên"
+            actions: "Hành động"
+        view_template:
+          close: "Đóng"
+          edit: "Sửa"
+          delete: "Xóa"
+        new_template_form:
+          submit: "Lưu lại"
+          cancel: "Huỷ"
+          preview: "Xem trước"
+        quick_insert_fields:
+          add_new_field: "Thêm"
+          dropdown: "Xổ xuống"
+        validations_modal:
+          table_headers:
+            key: "Phím"
+            type: "Loại"
+            description: "Mô tả"
+          validations:
+            required:
+              key: "bắt buộc"
+            minimum:
+              key: "tối thiểu"
+            maximum:
+              key: "tối đa"
+            type:
+              key: "loại"
       impersonate:
         title: "Mạo danh"
         help: "Sử dụng công cụ này để mạo danh một tài khoản thành viên cho mục đích gỡ lỗi, bạn sẽ phải đăng xuất sau khi hoàn tất."
@@ -4585,6 +4585,7 @@ vi:
         not_found: "Xin lỗi, username không tồn tại trong hệ thống."
         id_not_found: "Xin lỗi, id người dùng không tồn tại trong hệ thống."
         active: "Đã kích hoạt"
+        status: "Trạng thái"
         show_emails: "Hiện địa chỉ Email"
         hide_emails: "Ẩn Email"
         nav:
@@ -4658,7 +4659,6 @@ vi:
         staged: "Cấp bậc?"
         show_admin_profile: "Quản trị"
         show_public_profile: "Hiển thị hồ sơ công khai"
-        impersonate: "Mạo danh"
         action_logs: "Nhật ký hành động"
         ip_lookup: "Tìm kiếm địa chỉ IP"
         log_out: "Đăng xuất"
@@ -4877,6 +4877,8 @@ vi:
         show_overriden: "Chỉ hiển thị chỗ ghi đè"
         locale: "Ngôn ngữ:"
         more_than_50_results: "Có hơn 50 kết quả. Vui lòng tinh chỉnh tìm kiếm của bạn."
+        outdated:
+          dismiss: "Bỏ qua"
       settings:
         show_overriden: "Chỉ hiển thị chỗ ghi đè"
         history: "Xem lịch sử thay đổi"
@@ -4889,7 +4891,6 @@ vi:
             label: "Thêm biểu tượng cảm xúc"
         title: "Cài đặt"
         no_results: "Không tìm thấy kết quả."
-        more_than_30_results: "Có hơn 30 kết quả. Vui lòng tinh chỉnh tìm kiếm của bạn hoặc chọn một danh mục."
         clear_filter: "Xóa"
         add_url: "thêm URL"
         add_host: "thêm host"
@@ -4976,7 +4977,7 @@ vi:
         allow_title: Cho phép huy hiệu được sử dụng như là tên
         multiple_grant: Có thể được cấp nhiều lần
         listable: Hiện huy hiệu trên trang huy hiệu công khai
-        enabled: Bật huy hiệu
+        disabled: vô hiệu hóa
         icon: Biểu tượng
         image: Hình ảnh
         graphic: Đồ họa
@@ -5047,7 +5048,6 @@ vi:
         confirm_delete: "Bạn muốn xóa host này?"
         title: "Nhúng"
         host: "Cho phép Host"
-        class_name: "Tên lớp"
         allowed_paths: "Danh sách cho phép đường dẫn"
         edit: "sửa"
         category: "Đăng vào Danh mục"
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index a2c53b4ce45..351b2bfa39d 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -116,6 +116,8 @@ zh_CN:
       facebook: "分享到 Facebook"
       email: "通过电子邮件发送"
       url: "复制并分享 URL"
+    word_connector:
+      comma: ", "
     action_codes:
       public_topic: "%{when}将此话题设为公开"
       open_topic: "%{when}将此转换为话题"
@@ -127,6 +129,8 @@ zh_CN:
       removed_user: "%{when}移除了 %{who}"
       removed_group: "%{when}移除了 %{who}"
       autobumped: "%{when}自动提升"
+      tags_changed: "标签已更新 %{when}"
+      category_changed: "类别已更新 %{when}"
       autoclosed:
         enabled: "%{when}关闭"
         disabled: "%{when}打开"
@@ -151,16 +155,13 @@ zh_CN:
       forwarded: "转发了上述电子邮件"
     topic_admin_menu: "话题操作"
     skip_to_main_content: "跳转到主要内容"
+    skip_user_nav: "跳到个人资料内容"
     emails_are_disabled: "所有外发电子邮件已被管理员全局禁用。任何类型的电子邮件通知都不会发出。"
     emails_are_disabled_non_staff: "非管理员用户无法向外发送电子邮件。"
     software_update_prompt:
       message: "我们已经更新此站点，请 <span>刷新页面</span>，否则可能会遇到意外行为。"
       dismiss: "忽略"
-    bootstrap_mode_enabled:
-      other: "为了更轻松地启动您的新站点，您现在处于引导模式。所有新用户都将被授予信任级别 1，并且已启用每日摘要电子邮件。引导模式会在达到 %{count} 个用户时自动关闭。"
-    bootstrap_mode_disabled: "引导模式将在 24 小时内禁用。"
-    bootstrap_invite_button_title: "发送邀请"
-    bootstrap_wizard_link_title: "完成设置向导"
+    bootstrap_mode: "开始入门"
     themes:
       default_description: "默认"
       broken_theme_alert: "您的站点可能无法运行，因为主题/组件有错误。"
@@ -270,11 +271,11 @@ zh_CN:
       edit_bookmark: "编辑书签"
       clear_bookmarks: "清除书签"
       help:
-        bookmark: "点击以将此话题的第一个帖子加入书签"
-        edit_bookmark: "点击以编辑有关此话题的书签"
+        bookmark: "点击以添加此话题的书签"
+        edit_bookmark: "点击以编辑有关此话题中帖子的书签"
         edit_bookmark_for_topic: "点击以编辑此话题的书签"
         unbookmark: "点击以移除此话题中的所有书签"
-        unbookmark_with_reminder: "点击以移除此话题中的所有书签和提醒。"
+        unbookmark_with_reminder: "点击以移除此话题中的所有书签和提醒"
     bookmarks:
       created: "您已将此帖子加入书签。%{name}"
       created_generic: "您已将此加入书签。%{name}"
@@ -318,7 +319,7 @@ zh_CN:
       new_topic: "新话题草稿"
       new_private_message: "新个人消息草稿"
       abandon:
-        confirm: "您在此话题下有一个进行中的草稿。您想对它做什么？"
+        confirm: "您已经有一个正在进行的草稿。你想用它做什么？"
         yes_value: "舍弃"
         no_value: "恢复编辑"
     topic_count_categories:
@@ -366,6 +367,8 @@ zh_CN:
         search: "搜索消息"
         placeholder: "在此处输入消息标题、URL 或 ID"
     review:
+      show_more: "显示更多"
+      show_less: "显示更少"
       order_by: "排序依据"
       date_filter: "发布时间介于"
       in_reply_to: "回复给"
@@ -479,26 +482,43 @@ zh_CN:
       scores:
         about: "此分数是根据举报人的信任级别、该用户以往举报的准确性以及被举报条目的优先级计算得出的。"
         score: "分数"
-        date: "日期"
-        type: "类型"
+        date: "举报日期"
+        type: "原因"
         status: "状态"
-        submitted_by: "提交人"
+        submitted_by: "举报人"
         reviewed_by: "审核人"
+        reviewed_timestamp: "审核日期"
       statuses:
         pending:
           title: "待处理"
         approved:
           title: "已批准"
+        approved_flag:
+          title: "举报已批准"
+        approved_user:
+          title: "用户已批准"
+        approved_post:
+          title: "帖子已批准"
         rejected:
           title: "已拒绝"
+        rejected_flag:
+          title: "举报被拒绝"
+        rejected_user:
+          title: "用户被拒绝"
+        rejected_post:
+          title: "帖子被拒绝"
         ignored:
-          title: "已忽略"
+          title: "被忽略的标记"
         deleted:
-          title: "已删除"
+          title: "话题或帖子已被删除"
         reviewed:
-          title: "（所有已审核）"
+          title: "所有已审核"
         all:
-          title: "（全部）"
+          title: "一切"
+      context_question:
+        is_this_post: "这个帖子属于 %{reviewable_human_score_types}吗？"
+        delimiter: "或者"
+        something_else_wrong: "这个帖子有什么问题吗？"
       types:
         reviewable_flagged_post:
           title: "被举报的帖子"
@@ -511,6 +531,8 @@ zh_CN:
           title: "用户"
         reviewable_post:
           title: "帖子"
+        reviewable_chat_message:
+          title: "标记聊天消息"
       approval:
         title: "帖子需要审批"
         description: "我们已收到您的帖子，不过需要由版主批准才能显示。请耐心等待。"
@@ -797,6 +819,7 @@ zh_CN:
         make_all_primary_description: "将此群组设为全部所选用户的主要群组"
         remove_all_primary: "移除主要群组状态"
         remove_all_primary_description: "将此群组从主要群组中移除"
+        status: "状态"
         owner: "所有者"
         primary: "主要"
         forbidden: "您无权查看成员列表。"
@@ -920,10 +943,12 @@ zh_CN:
       mute: "免打扰"
       edit: "编辑偏好设置"
       download_archive:
-        button_text: "全部下载"
-        confirm: "确定要下载您的帖子吗？"
-        success: "下载已开始，完成后将通过消息通知您。"
-        rate_limit_error: "帖子每天只能下载一次，请明天再试。"
+        title: "导出您的数据"
+        description: "下载您的帐户活动和偏好设置的归档。"
+        button_text: "请求归档"
+        confirm: "您确定要下载您的帐户活动和偏好设置的归档吗？"
+        success: "我们已经开始收集您的归档，您将在该过程完成后收到一条消息。"
+        rate_limit_error: "帐户归档每天只能下载一次，请明天再试。"
       new_private_message: "新消息"
       private_message: "私信"
       private_messages: "消息"
@@ -976,6 +1001,7 @@ zh_CN:
           warning: "确定要清除精选话题吗？"
       use_current_timezone: "使用当前时区"
       profile_hidden: "此用户的公开个人资料已被隐藏。"
+      inactive_user: "该用户不再活跃。"
       expand_profile: "展开"
       sr_expand_profile: "展开个人资料详细信息"
       collapse_profile: "收起"
@@ -995,7 +1021,7 @@ zh_CN:
         perm_denied_expl: "您拒绝了通知的权限。通过您的浏览器设置允许通知。"
         disable: "禁用通知"
         enable: "启用通知"
-        each_browser_note: '注意：您必须在使用的每个浏览器上更改此设置。如果您从用户菜单暂停通知，则无论此设置如何，所有通知都将被禁用。'
+        each_browser_note: "注意：您必须在使用的每个浏览器上更改此设置。如果您从用户菜单暂停通知，则无论此设置如何，所有通知都将被禁用。"
         consent_prompt: "当其他人回复您的帖子时是否接收实时通知？"
       dismiss: "忽略"
       dismiss_notifications: "全部忽略"
@@ -1046,14 +1072,10 @@ zh_CN:
       experimental_sidebar:
         enable: "启用边栏"
         options: "选项"
-        categories_section: "类别版块"
-        categories_section_instruction: "所选类别将显示在边栏的类别版块下。"
-        tags_section: "标签版块"
-        tags_section_instruction: "所选标签将显示在边栏的标签版块下。"
         navigation_section: "导航"
-        list_destination_instruction: "当边栏中有新内容时…"
-        list_destination_default: "使用默认链接并为新条目显示徽章"
-        list_destination_unread_new: "链接到未读/新条目并显示新条目的数量"
+        navigation_section_instruction: "当导航菜单中的话题列表有新的或未读的项目时…"
+        link_to_filtered_list_checkbox_description: "链接到过滤后的列表"
+        show_count_new_items_checkbox_description: "显示新项目的数量"
       change: "更改"
       featured_topic: "精选话题"
       moderator: "%{user} 是版主"
@@ -1092,6 +1114,7 @@ zh_CN:
       watched_first_post_categories_instructions: "您将收到这些类别中每个新话题的第一个帖子的通知。"
       watched_first_post_tags: "关注第一个帖子"
       watched_first_post_tags_instructions: "您将收到带有这些标签的每个新话题的第一个帖子的通知。"
+      watched_precedence_over_muted: "如果我正在关注的类别或标签中有我已静音的主题，请通知我。"
       muted_categories: "已设为免打扰"
       muted_categories_instructions: "您不会收到有关这些类别中新话题的任何通知，它们也不会出现在类别或最新话题页面上。"
       muted_categories_instructions_dont_hide: "您不会收到有关这些类别中新话题的任何通知。"
@@ -1124,12 +1147,18 @@ zh_CN:
       home: "默认首页"
       staged: "暂存"
       staff_counters:
-        flags_given: "有用的举报"
-        flagged_posts: "被举报的帖子"
-        deleted_posts: "已删除的帖子"
-        suspensions: "封禁"
-        warnings_received: "警告"
-        rejected_posts: "被拒绝的帖子"
+        flags_given:
+          other: '<span class="%{className}">%{count}</span> 有用的举报'
+        flagged_posts:
+          other: '<span class="%{className}">%{count}</span> 标记的帖子'
+        deleted_posts:
+          other: '<span class="%{className}">%{count}</span> 删除的帖子'
+        suspensions:
+          other: '<span class="%{className}">%{count}</span> 暂停'
+        warnings_received:
+          other: '<span class="%{className}">%{count}</span> 警告'
+        rejected_posts:
+          other: '<span class="%{className}">%{count}</span> 被拒绝的帖子'
       messages:
         all: "所有收件箱"
         inbox: "收件箱"
@@ -1212,7 +1241,7 @@ zh_CN:
         tags: "标签"
         interface: "界面"
         apps: "应用"
-        sidebar: "边栏"
+        navigation_menu: "导航菜单"
       change_password:
         success: "（电子邮件已发送）"
         in_progress: "（正在发送电子邮件）"
@@ -1226,10 +1255,11 @@ zh_CN:
         title: "双重备份代码"
         regenerate: "重新生成"
         disable: "禁用"
-        enable: "启用"
-        enable_long: "启用备份代码"
+        enable: "创建备份代码"
+        enable_long: "添加备份代码"
+        not_enabled: "你还没有创建任何备份代码。"
         manage:
-          other: "管理备份代码。您还有 <strong>%{count}</strong> 个备份代码。"
+          other: "您还有 <strong>%{count}</strong> 个备份代码。"
         copy_to_clipboard: "复制到剪贴板"
         copy_to_clipboard_error: "复制到剪贴板时出错"
         copied_to_clipboard: "已复制到剪贴板"
@@ -1312,6 +1342,7 @@ zh_CN:
         success: "我们已向该地址发送一封电子邮件。请按照确认说明进行操作。"
         success_via_admin: "我们已向该地址发送一封电子邮件。用户需要按照电子邮件中的确认说明进行操作。"
         success_staff: "我们已向您当前的地址发送一封电子邮件。请按照确认说明进行操作。"
+        back_to_preferences: "返回偏好设置"
       change_avatar:
         title: "更改个人资料照片"
         gravatar: "<a href='//%{gravatarBaseUrl}%{gravatarLoginUrl}' target='_blank'>%{gravatarName}</a>，基于"
@@ -1656,8 +1687,7 @@ zh_CN:
       pause_notifications: "暂停通知"
       remove_status: "移除状态"
     user_tips:
-      primary: "知道了！"
-      secondary: "不要为我显示这些提示"
+      button: "我知道了！"
       first_notification:
         title: "您的第一个通知！"
         content: "通知用于让您了解社区中发生的最新情况。"
@@ -1673,6 +1703,10 @@ zh_CN:
       suggested_topics:
         title: "继续阅读！"
         content: "下面是我们认为您接下来可能想要阅读的一些话题。"
+      admin_guide:
+        title: "欢迎来到你的新网站！"
+        content: "阅读管理指南以继续构建你的网站和社区。"
+        button: "让我们开始吧！"
     loading: "正在加载…"
     errors:
       prev_page: "无法加载"
@@ -1707,28 +1741,6 @@ zh_CN:
       logout_disabled: "当站点处于只读模式时，退出被禁用。"
     staff_writes_only_mode:
       enabled: "此站点处于管理人员专用模式。请继续浏览，但回复、赞和其他操作仅限于管理人员。"
-    too_few_topics_and_posts_notice_MF: |
-      让我们<a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">开始讨论</a>吧！现在有 { currentTopics, plural,
-          other {<strong>#</strong> 个话题}
-      }和 { currentPosts, plural,
-          other {<strong>#</strong> 篇帖子}
-      }。访客需要阅读和回复更多 – 我们建议至少有 { requiredTopics, plural,
-          other {<strong>#</strong> 个话题}
-      }和 { requiredPosts, plural,
-          other {<strong>#</strong> 篇帖子}
-      }。只有管理人员可以看到此消息。
-    too_few_topics_notice_MF: |
-      让我们<a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">开始讨论</a>吧！/a>现在有 { currentTopics, plural,
-          other {<strong>#</strong> 个话题}
-      }。访客需要阅读和回复更多 - 我们建议至少有 { requiredTopics, plural,
-          other {<strong>#</strong> 个话题}
-      }。只有管理人员可以看到此消息。
-    too_few_posts_notice_MF: |
-      让我们<a href="https://blog.discourse.org/2014/08/building-a-discourse-community/" target="_blank" rel="noopener noreferrer">开始讨论</a>吧！现在有{ currentPosts, plural,
-          other {<strong>#</strong> 篇帖子}
-      }。访客需要阅读和回复更多 - 我们建议至少有 { requiredPosts, plural,
-          other {<strong>#</strong> 篇帖子}
-      }。只有管理人员可以看到此消息。
     logs_error_rate_notice:
       reached_hour_MF: |
         <b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# 个错误/小时} other {# 个错误/小时}}</a>达到了站点设置中 {limit, plural, one {# 个错误/小时} other {# 个错误/小时}}的限制。
@@ -1757,16 +1769,29 @@ zh_CN:
       hidden_for_session: "好的，我们会在明天问您。您也可以随时使用“登录”来创建帐户。"
       intro: "您好！看起来您很喜欢讨论，但您还没有注册帐户。"
       value_prop: "厌倦了滚动浏览相同的帖子？当您创建帐户后，您将始终回到您离开的地方。使用帐户，您还可以收到新回复通知、保存书签，以及使用“赞”来感谢他人。我们可以共同努力，使这个社区变得更好。:heart:"
+    offline_indicator:
+      no_internet: "没有网络连接。"
+      refresh_page: "刷新页面"
     summary:
-      enabled_description: "您正在查看此话题的摘要：社区确定的最有趣的帖子。"
+      in_progress: "使用 AI 总结主题..."
+      summarized_on: "已使用 AI 在 %{date} 总结"
+      model_used: "使用的 AI：%{model}"
+      outdated: "摘要已过时"
+      outdated_posts:
+        other: "（%{count} 个帖子缺失）"
+      enabled_description: "你正在浏览的是该主题的热门回复：由社区决定的最有趣的帖子。"
       description:
         other: "有 <b>%{count}</b> 个回复。"
+      buttons:
+        hide: "隐藏摘要"
+        generate: "使用 AI 总结"
+        regenerate: "重新生成摘要"
       description_time_MF: |
         有 {replyCount, plural, one {<b>#</b> 个回复} other {<b>#</b> 个回复}}，预计阅读时间为 <b>{readingTime, plural,one {# 分钟}other {# 分钟}}</b>。
-      enable: "总结此话题"
+      enable: "显示热门回复"
       disable: "显示所有帖子"
-      short_label: "摘要"
-      short_title: "显示此话题的摘要：由社区决定的最有趣的帖子"
+      short_label: "热门回复"
+      short_title: "显示此话题的热门回复：由社区决定的最有趣的帖子"
     deleted_filter:
       enabled_description: "此话题包含已删除的帖子，它们已被隐藏。"
       disabled_description: "已显示话题中已删除的帖子。"
@@ -2051,8 +2076,6 @@ zh_CN:
         topic_template_not_modified: "请通过编辑话题模板为您的话题添加详细信息和细节。"
       save_edit: "保存编辑"
       overwrite_edit: "覆盖编辑"
-      reply_original: "回复原始话题"
-      reply_here: "在此回复"
       reply: "回复"
       cancel: "取消"
       create_topic: "创建话题"
@@ -2154,6 +2177,7 @@ zh_CN:
       image_alt_text:
         aria_label: 图片的替换文字
       delete_image_button: 删除图片
+      toggle_image_grid: 切换图像网格
     notifications:
       tooltip:
         regular:
@@ -2208,6 +2232,7 @@ zh_CN:
       reaction_2: "<span>%{username}、%{username2}</span> %{description}"
       votes_released: "%{description} - 已完成"
       new_features: "有新功能可用！"
+      admin_problems: "站点信息中心的新建议"
       dismiss_confirmation:
         body:
           default:
@@ -2458,6 +2483,11 @@ zh_CN:
         dismiss_tooltip: "仅忽略新帖子或停止跟踪话题"
         also_dismiss_topics: "停止跟踪这些话题，以便它们不再显示为我的未读话题"
         dismiss_new: "忽略新话题"
+        dismiss_new_modal:
+          title: "忽略新话题"
+          topics: "忽略新话题"
+          posts: "忽略新帖子"
+          untrack: "停止跟踪这些话题，以便它们不再出现在我的新列表中"
         dismiss_new_with_selected:
           other: "忽略新话题（%{count} 个）…"
         toggle: "切换话题批量选择"
@@ -2491,9 +2521,11 @@ zh_CN:
         bookmarks: "您还没有将任何话题加入书签。"
         category: "没有%{category}话题。"
         top: "没有热门话题。"
+        filter: "没有话题。"
         educate:
           new: '<p>您的新话题将显示在这里。默认情况下，如果是在过去 2 天内创建的，话题会被视为新话题，还会显示 <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span> 指示器。</p><p>访问您的<a href="%{userPrefsUrl}">偏好设置</a>可以更改此设置。</p>'
-          unread: "<p>您的未读话题显示在这里。</p><p>默认情况下，如果符合以下条件，话题会被视为未读并且还将显示未读计数 <span class=\"badge unread-posts badge-notification\">1</span>：</p><ul><li>您创建了该话题</li><li>您回复了该话题</li><li>您阅读该话题超过 4 分钟</li></ul><p>或者如果您在每个话题中通过 \U0001F514 将话题显式设为“已跟踪”或“已关注”。</p><p>访问您的<a href=\"%{userPrefsUrl}\">偏好设置</a>可以更改此设置。</p>"
+          unread: "<p>您的未读话题显示在这里。</p><p>默认情况下，如果符合以下条件，话题会被视为未读并且还将显示未读计数 <span class=\"badge unread-posts badge-notification\">1</span>：</p><ul><li>您创建了该话题</li><li>您回复了该话题</li><li>您阅读该话题超过 5 分钟</li></ul><p>或者如果您在每个话题中通过 \U0001F514 将话题显式设为“已跟踪”或“已关注”。</p><p>访问您的<a href=\"%{userPrefsUrl}\">偏好设置</a>可以更改此设置。</p>"
+          new_new: "<p>你的新话题会出现在这里，你的未读话题也会显示出来。默认情况下，如果它们是在最近 2 天内创建的，话题会被视为新话题，并且会显示 <span class=\"badge new-topic badge-notification\" style=\"vertical-align:middle;line-height:inherit;\"></span> 指示符。未读主题将显示未读计数 <span class=\"badge unread-posts badge-notification\">1</span> 如果你：创建主题、回复主题、阅读主题超过 5 分钟，或者通过每个话题中的\U0001F514 明确将话题设置为已跟踪或已读。</p><p>访问你的 <a href=\"%{userPrefsUrl}\">选项</a> 以更改此设置。</p>"
       bottom:
         latest: "没有更多最新话题了。"
         posted: "没有更多已发布话题了。"
@@ -2505,10 +2537,12 @@ zh_CN:
         tag: "没有更多%{tag}话题了。"
         top: "没有更多热门话题了。"
         bookmarks: "没有更多已加入书签的话题了。"
+        filter: "没有更多话题了。"
     topic:
       filter_to:
         other: "话题中的 %{count} 个帖子"
       create: "新建话题"
+      create_disabled_category: "你不可以在这个类别中创建话题"
       create_long: "创建新话题"
       open_draft: "打开草稿"
       private_message: "开始消息"
@@ -2551,6 +2585,7 @@ zh_CN:
       read_more_in_category: "想阅读更多？请浏览%{categoryLink}中的其他话题或<a href='%{latestLink}'>查看最新话题</a>。"
       read_more: "想阅读更多？请<a href='%{categoryLink}'>浏览所有类别</a>或<a href='%{latestLink}'>查看最新话题</a>。"
       unread_indicator: "还没有成员读过此话题的最新帖子。"
+      participant_groups: "参与群组"
       read_more_MF: |
         { HAS_UNREAD_AND_NEW, select,
           true {
@@ -2587,8 +2622,8 @@ zh_CN:
       browse_all_categories_latest_or_top: "<a href='%{basePath}/categories'>浏览所有类别</a>、<a href='%{basePath}/latest'>查看最新话题</a>或查看热门话题："
       browse_all_tags_or_latest: "<a href='%{basePath}/tags'>浏览所有标签</a>或<a href='%{basePath}/latest'>查看最新话题</a>。"
       suggest_create_topic: 准备好<a href>开始新对话</a>了吗？
-      jump_reply_up: 跳转到较早的回复
-      jump_reply_down: 跳转到较晚的回复
+      jump_reply: "跳转到帖子的原始位置"
+      jump_reply_aria: "跳转到@%{username}帖子的原始位置"
       deleted: "该话题已被删除"
       slow_mode_update:
         title: "慢速模式"
@@ -2846,6 +2881,7 @@ zh_CN:
         radio_label: "现有话题"
         instructions:
           other: "请选择您要将这 <b>%{count}</b> 个帖子移至的话题。"
+        chronological_order: "合并后保留时间顺序"
       move_to_new_message:
         title: "移至新消息"
         action: "移至新消息"
@@ -2928,6 +2964,7 @@ zh_CN:
       ignored: "忽略的内容"
       wiki_last_edited_on: "Wiki 最后编辑于 %{dateTime}"
       last_edited_on: "帖子最后编辑于 %{dateTime}"
+      edit_history: "帖子编辑历史"
       reply_as_new_topic: "作为链接话题回复"
       reply_as_new_private_message: "作为新消息回复给相同的收件人"
       continue_discussion: "从%{postLink}继续讨论："
@@ -2939,7 +2976,7 @@ zh_CN:
       sr_collapse_replies: "收起嵌入式回复"
       sr_date: "发布日期"
       sr_expand_replies:
-        other: "此帖子有 %{count} 个回复。点击展开"
+        other: "这个帖子有 %{count} 的回复"
       expand_collapse: "展开/收起"
       sr_below_embedded_posts_description: "帖子#%{post_number} 回复"
       sr_embedded_reply_description: "@%{username} 回复帖子 #%{post_number}"
@@ -3079,6 +3116,8 @@ zh_CN:
           last: "上次修订"
           hide: "隐藏修订"
           show: "显示修订"
+          destroy: "删除修订"
+          destroy_confirm: "你确定要删除这个帖子上的所有修订吗？此操作是永久性的。"
           revert: "还原到修订 %{revision}"
           edit_wiki: "编辑 Wiki"
           edit_post: "编辑帖子"
@@ -3112,6 +3151,7 @@ zh_CN:
         updated: "更新"
         name: "名称"
         name_placeholder: "此书签有什么用？"
+        name_input_label: "书签名"
         set_reminder: "提醒我"
         options: "选项"
         actions:
@@ -3133,7 +3173,7 @@ zh_CN:
       filtered_replies:
         viewing_posts_by: "正在查看此用户的 %{post_count} 个帖子："
         viewing_subset: "某些回复已被收起"
-        viewing_summary: "正在查看此话题的摘要"
+        viewing_summary: "查看此话题的热门回复"
         post_number: "%{username}，帖子 #%{post_number}"
         show_all: "全部显示"
       share:
@@ -3150,7 +3190,7 @@ zh_CN:
       back: "返回类别"
       general: "常规"
       settings: "设置"
-      topic_template: "话题模板"
+      topic_template: "模板"
       tags: "标签"
       tags_allowed_tags: "将这些标签限制在此类别："
       tags_allowed_tag_groups: "将这些标签组限制在此类别："
@@ -3209,8 +3249,7 @@ zh_CN:
       email_in: "自定义传入电子邮件地址："
       email_in_tooltip: "您可以使用 | 字符分隔多个电子邮件地址。"
       email_in_allow_strangers: "接受来自没有帐户的匿名用户的电子邮件"
-      email_in_disabled: "通过电子邮件发布新话题的功能在站点设置中禁用。要启用通过电子邮件发布新话题，"
-      email_in_disabled_click: '请启用“email in”设置。'
+      email_in_disabled: "通过电子邮件发布新主题被禁用。要启用通过电子邮件发布新主题功能，请启用 <a href='%{setting_url}'>电子邮件</a> 设置。"
       mailinglist_mirror: "类别镜像一个邮寄名单"
       show_subcategory_list: "在此类别中的话题上方显示子类别列表。"
       read_only_banner: "用户无法在此类别中创建话题时的横幅文本："
@@ -3237,6 +3276,7 @@ zh_CN:
       default_slow_mode: '为此类别中的新话题启用“慢速模式”。'
       parent: "父类别"
       num_auto_bump_daily: "每天自动顶贴的开放话题的数量："
+      auto_bump_cooldown_days: "在再次顶贴同一话题之前，最少需要几天时间。"
       navigate_to_first_post_after_read: "阅读话题后导航到第一个帖子"
       notifications:
         title: "更改此类别的通知级别"
@@ -3322,7 +3362,9 @@ zh_CN:
         inappropriate: "不当言论"
         spam: "垃圾信息"
       custom_placeholder_notify_user: "具体，有建设性，并始终保持友善。"
+      notify_user_textarea_label: "给用户的消息"
       custom_placeholder_notify_moderators: "让我们具体了解您关心的问题，并尽可能提供相关的链接和示例。"
+      notify_moderators_textarea_label: "给版主的消息"
       custom_message:
         at_least:
           other: "至少输入 %{count} 个字符"
@@ -3409,6 +3451,10 @@ zh_CN:
     filters:
       with_topics: "%{filter}话题"
       with_category: "%{filter}%{category}话题"
+      filter:
+        title: "筛选器"
+        button:
+          label: "筛选器"
       latest:
         title: "最新"
         title_with_count:
@@ -3473,7 +3519,6 @@ zh_CN:
         this_week: "周"
         today: "今天"
     browser_update: '很抱歉，<a href="https://www.discourse.org/faq/#browser">您的浏览器不受支持</a>。请<a href="https://browsehappy.com">切换到支持的浏览器</a>查看富内容、登录和回复。'
-    safari_13_warning: 此站点将很快移除对 iOS 和 Safari 13 及以下版本的支持。简化的只读版本将保持可用。（<a href="https://meta.discourse.org/t/224747">更多信息</a>）
     permission_types:
       full: "创建/回复/查看"
       create_post: "回复/查看"
@@ -3488,6 +3533,20 @@ zh_CN:
       close: "关闭 (Esc)"
       content_load_error: '<a href="%url%">内容</a>无法加载。'
       image_load_error: '<a href="%url%">图片</a>无法加载。'
+    experimental_lightbox:
+      image_load_error: "图片无法加载。"
+      screen_reader_image_title: "第 %{current} 张图片，共 %{total} 张： %{title}"
+      buttons:
+        next: "下一个 (向右或向下箭头键)"
+        previous: "上一页 (向左或向上箭头键)"
+        close: "关闭 (Esc)"
+        download: "下载图片"
+        newtab: "在新标签页中打开图片"
+        zoom: "放大/缩小图像(Z 键)"
+        rotate: "旋转图像(R键)"
+        fullscreen: "切换浏览器全屏模式(M 键)"
+        carousel: "显示轮播中的所有图像(A 键)"
+        retry: "重试加载图像"
     cannot_render_video: 无法呈现此视频，因为您的浏览器不支持编解码器。
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: "，"
@@ -3535,6 +3594,7 @@ zh_CN:
         title: "撰写"
         return: "%{shortcut} 返回编辑器"
         fullscreen: "%{shortcut} 全屏编辑器"
+        insert_current_time: "%{shortcut} 插入当前时间"
       bookmarks:
         title: "书签"
         enter: "%{shortcut} 保存并关闭"
@@ -3579,7 +3639,8 @@ zh_CN:
       earned_n_times:
         other: "已获得此徽章 %{count} 次"
       granted_on: "%{date}授予"
-      others_count: "其他拥有此徽章的人 (%{count})"
+      others_count:
+        other: "授予他人 %{count} 次"
       title: 徽章
       allow_title: "您可以将此徽章用作头衔"
       multiple_grant: "您可以多次获得"
@@ -3589,6 +3650,7 @@ zh_CN:
         other: "其他 (+%{count})"
       granted:
         other: "已被授予 %{count} 个"
+      awarded: 授予
       select_badge_for_title: 选择一个徽章作为您的头衔使用
       none: "（无）"
       successfully_granted: "已成功将“%{badge}”授予 %{username}"
@@ -3750,13 +3812,11 @@ zh_CN:
     pause_notifications:
       title: "暂停通知…"
       label: "暂停通知"
-      remaining: "剩余 %{remaining}"
       options:
         half_hour: "30 分钟"
         one_hour: "1 小时"
         two_hours: "2 小时"
         tomorrow: "直到明天"
-        custom: "自定义"
       set_schedule: "设置通知时间表"
     trust_levels:
       names:
@@ -3803,7 +3863,61 @@ zh_CN:
       more: "更多"
       all_categories: "所有类别"
       all_tags: "所有标签"
+      categories_form_modal:
+        title: "编辑类别导航"
+        subtitle:
+          text: "我们将自动显示本网站最受欢迎的类别"
+        filter_placeholder: "筛选类别"
+        no_categories: "没有匹配到指定条件的类别。"
+      tags_form_modal:
+        title: "编辑标签导航"
+        filter_placeholder: "筛选标签"
+        no_tags: "没有匹配到指定的标签。"
+        subtitle:
+          text: "我们将自动显示本网站最受欢迎的标签"
+      edit_navigation_modal_form:
+        deselect_button_text: "取消全选"
+        reset_to_defaults: "重置为默认值"
+        filter_dropdown:
+          all: "所有"
+          selected: "已选择"
+          unselected: "未选择"
       sections:
+        custom:
+          add: "添加自定义部分"
+          edit: "编辑自定义部分"
+          save: "保存"
+          delete: "删除"
+          delete_confirm: "确定要删除此板块吗？"
+          reset_confirm: "你确定要把这部分重置为默认值吗？"
+          public: "将此板块公开并对所有人可见"
+          always_public: "此部分中的内容始终是公开的"
+          more_menu: "更多菜单"
+          links:
+            add: "添加另一个链接"
+            delete: "删除链接"
+            reset: "重置为默认值"
+            icon:
+              label: "图标"
+              validation:
+                blank: "图标不能为空"
+                maximum: "图标必须短于 %{count} 个字符"
+            name:
+              label: "名称"
+              validation:
+                blank: "名称不能为空"
+                maximum: "标题必须短于 %{count} 个字符"
+            value:
+              label: "链接"
+              validation:
+                blank: "链接不能为空"
+                maximum: "链接必须短于 %{count} 个字符"
+                invalid: "格式无效"
+          title:
+            label: "章节标题"
+            validation:
+              blank: "标题不能为空"
+              maximum: "标题必须短于 %{count} 个字符"
         about:
           header_link_text: "关于"
         messages:
@@ -3818,28 +3932,21 @@ zh_CN:
             unread_with_count: "未读 (%{count})"
             archive: "归档"
         tags:
-          links:
-            add_tags:
-              content: "添加标签"
-              title: "您尚未添加任何标签。点击以开始。"
           none: "您还没有添加任何标签。"
           click_to_get_started: "点击此处开始。"
           header_link_text: "标签"
           header_action_title: "编辑边栏标签"
           configure_defaults: "配置默认值"
         categories:
-          links:
-            add_categories:
-              content: "添加类别"
-              title: "您尚未添加任何类别。点击以开始。"
           none: "您还没有添加任何类别。"
           click_to_get_started: "点击此处开始。"
           header_link_text: "类别"
           header_action_title: "编辑边栏类别"
           configure_defaults: "配置默认值"
         community:
-          header_link_text: "社区"
-          header_action_title: "创建话题"
+          edit_section:
+            sidebar: "自定义此部分"
+            header_dropdown: "自定义"
           links:
             about:
               content: "关于"
@@ -3850,8 +3957,8 @@ zh_CN:
             badges:
               content: "徽章"
               title: "所有可获得的徽章"
-            everything:
-              content: "一切"
+            topics:
+              content: "话题"
               title: "所有话题"
             faq:
               content: "常见问题解答"
@@ -3864,6 +3971,7 @@ zh_CN:
               title: "所有用户列表"
             my_posts:
               content: "我的帖子"
+              content_drafts: "我的草稿"
               title: "我最近的话题活动"
               title_drafts: "我的未发布草稿"
               draft_count:
@@ -3872,11 +3980,43 @@ zh_CN:
               content: "审核"
               title: "被举报的帖子和其他排队的条目"
               pending_count: "%{count} 待处理"
+        global_section: "全球部分，所有人可见"
+      panels:
+        forum:
+          label: 论坛
     welcome_topic_banner:
       title: "创建您的欢迎话题"
       description: "您的欢迎话题是新成员首先会阅读的内容。把它想象成您的“电梯推销”或“使命宣言”。让每个人都知道这个社区是为谁服务的，他们可以在这里找到什么，以及您希望他们首先做什么。"
       button_title: "开始编辑"
     until: "直到："
+    char_counter:
+      exceeded: "已超过允许的最大字符数。"
+    form_template_chooser:
+      select_template: "选择表单模板"
+    form_templates:
+      errors:
+        valueMissing:
+          default: "请填写此字段。"
+          text: "请填写此字段。"
+          select-one: "请在列表中选择一个项目。"
+          select-multiple: "请在列表中至少选择一个项目。"
+          checkbox: "如果你想继续，请勾选此框。"
+        typeMismatch:
+          default: "请输入一个有效值。"
+          color: "请输入一种颜色。"
+          date: "请输入日期。"
+          email: "请输入有效的电子邮件地址."
+          number: "请输入一个数字。"
+          password: "请输入一个有效的密码。"
+          tel: "请输入一个有效的电话号码。"
+          text: "请输入一个文本值。"
+          url: "请输入一个有效的 URL。"
+        tooShort: "输入的内容必须有 %{minLength} 或更长的字符。"
+        tooLong: "输入的内容必须少于 %{maxLength} 字符。"
+        rangeOverflow: "输入必须小于 %{max}。"
+        rangeUnderflow: "输入必须大于 %{min}。"
+        patternMismatch: "请匹配要求的格式。"
+        badInput: "请输入有效的输入。"
   admin_js:
     type_to_filter: "输入以筛选…"
     admin:
@@ -4033,9 +4173,12 @@ zh_CN:
         about: "在此处编辑您的群组成员资格和名称"
         group_members: "群组成员"
         delete: "删除"
-        delete_confirm: "确定要删除此群组吗？"
+        delete_confirm: "确定要删除“%{group}”吗？"
+        delete_details:
+          other: "%{count} 人将无法访问此群组"
         delete_with_messages_confirm:
-          other: "删除此群组将导致 %{count} 条消息成为孤立消息，群组成员将无法再访问它们。"
+          other: "%{count} 条信息将无法被群组成员访问"
+        delete_warning: "删除的群组无法恢复"
         delete_failed: "无法删除群组。如果此群组是自动生成的，则无法删除。"
         delete_automatic_group: 这是一个自动生成的群组，无法删除。
         delete_owner_confirm: "移除 '%{username}' 的所有者权限？"
@@ -4101,10 +4244,16 @@ zh_CN:
             topics:
               read: 阅读一个话题或其中的一个帖子。也支持 RSS。
               write: 创建一个新话题或发布到现有话题。
-              update: 更新话题。更改标题、类别、标签等。
+              update: 更新一个话题。更改标题、类别、标签、状态、原型、特色链接等。
+              delete: 删除话题。
               read_lists: 阅读诸如热门、新、最新等话题列表。也支持 RSS。
+              status: "更新一个话题的状态。状态：关闭、存档、可见、已置顶。启用: true, false. 在此处和请求有效负载中指定一个 category_id，以仅允许在该类别中更改主题状态。"
             posts:
               edit: 编辑任意帖子或特定帖子。
+              delete: 删除帖子。
+              list: 列出最新的帖子和私人帖子。也支持 RSS。
+            tags:
+              list: 列出标签。
             categories:
               list: 获取类别列表。
               show: 通过 id 获取单个类别。
@@ -4118,6 +4267,7 @@ zh_CN:
               update: 更新用户个人资料信息。
               log_out: 退出用户的所有会话。
               anonymize: 对用户帐户进行匿名化处理。
+              suspend: 封禁用户帐户。
               delete: 删除用户帐户。
               list: 获取用户列表。
             user_status:
@@ -4125,6 +4275,8 @@ zh_CN:
               update: 更新用户状态。
             email:
               receive_emails: 将此范围与邮件收件人结合来处理传入电子邮件。
+            invites:
+              create: 发送电子邮件邀请或生成邀请链接。
             badges:
               create: 创建新徽章。
               show: 获取有关徽章的信息。
@@ -4133,6 +4285,12 @@ zh_CN:
               list_user_badges: 列出用户的徽章。
               assign_badge_to_user: 向用户授予徽章。
               revoke_badge_from_user: 撤销用户的徽章。
+            groups:
+              manage_groups: 列出、添加和移除群组成员。
+              administer_groups: 列出、显示、创建、更新和删除群组。
+            search:
+              show: 使用 `/search.json?q=term` 端点进行搜索。
+              query: 使用 `/search/query?term=term` 端点进行搜索。
             wordpress:
               publishing: WP Discourse 插件发布功能所需（必需）。
               commenting: WP Discourse 插件评论功能所需。
@@ -4199,8 +4357,8 @@ zh_CN:
           name: "用户信任级别提升事件"
           details: "当用户从一个信任级别提升到另一个信任级别时。"
         user_badge_event:
-          name: "徽章授予事件"
-          details: "当用户收到徽章时。"
+          name: "徽章活动"
+          details: "当徽章被授予或撤销时。"
         group_user_event:
           name: "群组用户事件"
           details: "在群组中添加或移除用户时。"
@@ -4241,7 +4399,7 @@ zh_CN:
         enabled: "已启用？"
         is_enabled: "是"
         not_enabled: "否"
-        change_settings: "更改设置"
+        change_settings: "插件设置"
         change_settings_short: "设置"
         howto: "如何安装插件？"
         official: "官方插件"
@@ -4494,6 +4652,9 @@ zh_CN:
           embedded_scss:
             text: "嵌入式 CSS"
             title: "输入要随嵌入式版本的注释传送的自定义 CSS"
+          embedded_header:
+            text: "嵌入式页眉/标题/标头"
+            title: "输入在嵌入式评论的上方显示的 HTML"
           color_definitions:
             text: "颜色定义"
             title: "输入自定义颜色定义（仅限高级用户）"
@@ -4572,6 +4733,12 @@ zh_CN:
           love:
             name: "爱"
             description: "点赞按钮的颜色。"
+          selected:
+            name: "已选择"
+            description: "元素（例如列表项）在被框选或被激活时的背景色。"
+          hover:
+            name: "悬停"
+            description: "元素（例如列表项）在鼠标悬停或具有键盘焦点时的背景色。"
         robots:
           title: "替换您的站点的 robots.txt 文件："
           warning: "这将永久替换任何相关的站点设置。"
@@ -4702,6 +4869,7 @@ zh_CN:
           no_previous: "没有之前的值。"
           deleted: "没有新值。记录已被删除。"
           actions:
+            permanently_delete_post_revisions: "永久删除帖子的修订记录"
             delete_user: "删除用户"
             change_trust_level: "更改信任级别"
             change_username: "更改用户名"
@@ -4735,6 +4903,7 @@ zh_CN:
             revoke_moderation: "撤消审核权限"
             backup_create: "创建备份"
             deleted_tag: "删除的标签"
+            update_directory_columns: "更新目录列"
             deleted_unused_tags: "已被删除的未使用的标签"
             renamed_tag: "重命名的标签"
             revoke_email: "撤消电子邮件"
@@ -4793,6 +4962,10 @@ zh_CN:
             delete_group: "删除群组"
             watched_word_create: "添加关注词"
             watched_word_destroy: "删除关注词"
+            create_public_sidebar_section: "创建公共侧边栏部分"
+            update_public_sidebar_section: "更新公共侧边栏部分"
+            destroy_public_sidebar_section: "销毁公共侧边栏部分"
+            reset_bounce_score: "重置退回分数"
         screened_emails:
           title: "已屏蔽的电子邮件"
           description: "当有人尝试创建新帐户时，将检查以下电子邮件地址并禁止注册，或执行某些其他操作。"
@@ -4855,14 +5028,14 @@ zh_CN:
           silence: "禁言"
           link: "链接"
         action_descriptions:
-          block: "禁止发布包含这些字词的帖子。用户在尝试提交帖子时会看到一条错误消息。"
+          block: "试图创建一个包含这些词的帖子时，将显示一条错误信息。"
           censor: "允许包含这些字词的帖子，但将其替换为隐藏敏感词的字符。"
-          require_approval: "包含这些字词的帖子需通过管理人员批准才能被看到。"
-          flag: "允许包含这些字词的帖子，但将其举报为不当，以便版主对其进行审核。"
-          replace: "使用其他字词替换帖子中的字词"
-          tag: "根据第一个帖子自动为话题添加标签"
-          silence: "用户包含这些字词的第一个帖子需要管理人员批准才能被看到，该用户将被自动禁言。"
-          link: "使用链接替换帖子中的字词"
+          require_approval: "包含这些词的帖子需要管理人员批准后才能被其他人看到。"
+          flag: "允许包含这些词的帖子，但将它们举报为不当言论以供版主审查。"
+          replace: "使用其他字词替换帖子中的字词."
+          tag: "自动为首个帖子含特定词的话题添加标签。"
+          silence: "如果新帐户的第一篇帖子包含这些词中的任何一个，则自动禁言用户。在管理人员批准之前，该帖子将自动隐藏。"
+          link: "使用链接替换帖子中的字词."
         form:
           label: "包含字词或短语"
           placeholder: "包含字词或短语（* 为通配符）"
@@ -4885,6 +5058,88 @@ zh_CN:
           description: "在下方输入文本以检查有无与关注词的匹配"
           found_matches: "找到匹配："
           no_matches: "未找到匹配项"
+      form_templates:
+        nav_title: "模板"
+        title: "表单模板"
+        help: "创建可用于创建新话题、帖子和消息的模板。"
+        new_template: "新模板"
+        list_table:
+          headings:
+            name: "名称"
+            active_categories: "活动类别"
+            actions: "操作"
+          actions:
+            view: "查看模板"
+            edit: "编辑模板"
+            delete: "删除模板"
+        view_template:
+          close: "关闭"
+          edit: "编辑"
+          delete: "删除"
+          toggle_preview: "切换预览"
+        new_template_form:
+          submit: "保存"
+          cancel: "取消"
+          name:
+            label: "模板名称"
+            placeholder: "输入此模板的名称..."
+          template:
+            label: "模板"
+            placeholder: "在此处创建 YAML 模板..."
+          preview: "预览"
+        delete_confirm: "确定要删除此模板吗？"
+        quick_insert_fields:
+          add_new_field: "添加"
+          checkbox: "复选框"
+          input: "简要回答"
+          textarea: "长答案"
+          dropdown: "下拉菜单"
+          upload: "上传一个文件"
+          multiselect: "多选"
+        validations_modal:
+          button_title: "验证"
+          modal_title: "验证选项"
+          table_headers:
+            key: "密钥"
+            type: "类型"
+            description: "描述"
+          validations:
+            required:
+              key: "必选"
+              type: "布尔值"
+              description: "需要填写该字段才能提交表单。"
+            minimum:
+              key: "最小值"
+              type: "整数"
+              description: "对于文本字段，指定允许的最小字符数。"
+            maximum:
+              key: "最大值"
+              type: "整数"
+              description: "对于文本字段，指定允许的最大字符数。"
+            pattern:
+              key: "模式"
+              type: "正则表达式"
+              description: "对于文本字段，指定允许输入的正则表达式。"
+            type:
+              key: "类型"
+              type: "字符串"
+              description: "对于输入字段，你可以指定预期的输入类型(text|email|date|number|url|tel|color)。"
+        preview_modal:
+          title: "预览模板"
+        field_placeholders:
+          validations: "在此输入验证信息"
+          label: "在此处输入标签"
+          placeholder: "在此处输入占位符"
+          none_label: "选择条目"
+          choices:
+            first: "选项1"
+            second: "选项2"
+            third: "选项3"
+        edit_category:
+          toggle_freeform: "禁用表单模板"
+          toggle_form_template: "启用表单模板"
+          select_template: "选择表单模板"
+          select_template_help: "添加/编辑表单模板"
       impersonate:
         title: "模拟"
         help: "使用此工具模拟用户帐户以进行调试。完成后，您必须退出。"
@@ -4897,6 +5152,7 @@ zh_CN:
         not_found: "抱歉，该用户名在我们的系统中不存在。"
         id_not_found: "抱歉，该用户 ID 在我们的系统中不存在。"
         active: "已激活"
+        status: "状态"
         show_emails: "显示电子邮件"
         hide_emails: "隐藏电子邮件"
         nav:
@@ -4985,7 +5241,6 @@ zh_CN:
         show_admin_profile: "管理员"
         manage_user: "管理用户"
         show_public_profile: "显示公开个人资料"
-        impersonate: "模拟"
         action_logs: "操作日志"
         ip_lookup: "IP 查询"
         log_out: "退出"
@@ -5216,8 +5471,16 @@ zh_CN:
         go_back: "返回搜索"
         recommended: "我们建议自定义以下文本以符合您的需求："
         show_overriden: "只显示被替换"
+        show_outdated: "仅显示过期/无效"
         locale: "语言："
         more_than_50_results: "结果超过 50 个。请优化您的搜索。"
+        interpolation_keys: "可用的插值键："
+        outdated:
+          title: "此翻译已过时"
+          description: "自创建此替换以来，此键的默认翻译已更改。请在下面检查您的翻译是否与对原始意图所做的任何更改相符。"
+          old_default: "旧默认值"
+          new_default: "新默认值"
+          dismiss: "忽略"
       settings:
         show_overriden: "只显示被替换"
         history: "查看变更历史记录"
@@ -5230,7 +5493,8 @@ zh_CN:
             label: "添加表情符号"
         title: "设置"
         no_results: "找不到结果。"
-        more_than_30_results: "结果超过 30 个。请优化您的搜索或选择一个类别。"
+        more_site_setting_results:
+          other: "结果超过 %{count} 个。请优化你的搜索或选择一个类别。"
         clear_filter: "清除"
         add_url: "添加 URL"
         add_host: "添加主机"
@@ -5317,7 +5581,8 @@ zh_CN:
         allow_title: 允许将徽章用作头衔
         multiple_grant: 可以多次授予
         listable: 在公共徽章页面上显示徽章
-        enabled: 启用徽章
+        enabled: 已启用
+        disabled: 已禁用
         icon: 图标
         image: 图片
         graphic: 图形
@@ -5386,10 +5651,14 @@ zh_CN:
       embedding:
         get_started: "如果您想将 Discourse 嵌入另一个网站，请先添加其主机。"
         confirm_delete: "确定要删除该主机吗？"
-        sample: "将以下 HTML 代码粘贴到您的站点中以创建和嵌入 Discourse 话题。将 <b>REPLACE_ME</b> 替换为您要嵌入它的页面的规范 URL。"
+        sample: |
+          <p>将以下 HTML 代码粘贴到您的站点以创建和嵌入 Discourse 话题。将 <b>EMBED_URL</b> 替换为您要嵌入它的页面的规范 URL。</p>
+
+          <p>如果要自定义样式，请取消注释并将 <b>CLASS_NAME</b> 替换为主题 <i>Embedded CSS</i> 中定义的 CSS 类。</p>
+
+          <p>将 <b>DISCOURSE_USERNAME</b> 替换为话题作者的 Discourse 用户名。 Discourse 将通过 <code>&lt;meta&gt;</code> 标签的 <code>content</code> 属性自动查找用户，其中 <code>name</code> 属性设置为 <code>discourse-username</code> 或 <code>author</code>。 <code>discourseUserName</code> 参数已被弃用，并将在 Discourse 3.2 版本移除。</p>
         title: "嵌入"
         host: "允许的主机"
-        class_name: "类名"
         allowed_paths: "路径许可名单"
         edit: "编辑"
         category: "发布到类别"
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index bf9b1341b32..8df7f8b8be9 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -150,16 +150,12 @@ zh_TW:
         disabled: "已於 %{when} 移除該橫幅主題。將不再出現於任何頁面。"
     topic_admin_menu: "話題動作"
     skip_to_main_content: "跳到主要內容"
+    skip_user_nav: "跳至個人檔案內容"
     emails_are_disabled: "管理員已停用了全域的外部信件功能。將不再寄出任何類型的電子郵件。"
     emails_are_disabled_non_staff: "非員工用戶的外發電子郵件已被禁用。"
     software_update_prompt:
       message: "我們更新了這個網站， <span>請重新整理</span>，否則您可能會遇到預期之外的狀況。"
       dismiss: "忽略"
-    bootstrap_mode_enabled:
-      other: "為了讓您更輕鬆地建設網站，您正處於初始模式。將會自動授予所有新註冊的使用者信任等級 1，並自動啟用每日摘要電子郵件。該功能將於 %{count} 個使用者註冊後自動關閉。"
-    bootstrap_mode_disabled: "初始模式將會在 24 小時後自動禁用。"
-    bootstrap_invite_button_title: "送出邀請"
-    bootstrap_wizard_link_title: "完成安裝精靈"
     themes:
       default_description: "預設"
       broken_theme_alert: "您的網站可能無法運行，因為主題/組件有錯誤。"
@@ -267,11 +263,8 @@ zh_TW:
       edit_bookmark: "編輯書籤"
       clear_bookmarks: "清除書籤"
       help:
-        bookmark: "點擊以將此話題的第一篇貼文加入書籤"
-        edit_bookmark: "點擊以編輯此主題的書籤"
         edit_bookmark_for_topic: "按一下以編輯此主題的書籤"
         unbookmark: "點擊以移除此話題所有書籤"
-        unbookmark_with_reminder: "點擊以移除此話題所有書籤和提醒。"
     bookmarks:
       created: "你已將這篇文章加入書籤。 %{name}"
       create: "建立書籤"
@@ -313,7 +306,6 @@ zh_TW:
       new_topic: "新話題草稿"
       new_private_message: "新個人訊息草稿"
       abandon:
-        confirm: "您有針對此主題的草稿。您想用它做什麼？"
         yes_value: "捨棄"
         no_value: "繼續編輯"
     topic_count_categories:
@@ -468,11 +460,9 @@ zh_TW:
       scores:
         about: "該分數基於報告者的信任級別，其先前標誌的準確性以及報告的項目的優先級來計算。"
         score: "分數"
-        date: "日期"
-        type: "類型"
+        type: "原因"
         status: "狀態"
-        submitted_by: "送出者"
-        reviewed_by: "審核由"
+        submitted_by: "回報由"
       statuses:
         pending:
           title: "申請中"
@@ -480,12 +470,10 @@ zh_TW:
           title: "已同意"
         rejected:
           title: "被拒絕"
-        ignored:
-          title: "忽略"
-        deleted:
-          title: "刪除"
         all:
-          title: "(所有)"
+          title: "所有"
+      context_question:
+        delimiter: "或"
       types:
         reviewable_flagged_post:
           title: "標記的貼文"
@@ -732,6 +720,7 @@ zh_TW:
         remove_members: "移除成員"
         remove_owners: "移除擁有者"
         make_all_primary: "將全部設為主要"
+        status: "狀態"
         owner: "擁有者"
         primary: "主要"
       topics: "話題"
@@ -846,10 +835,7 @@ zh_TW:
       mute: "靜音"
       edit: "編輯喜好設定"
       download_archive:
-        button_text: "全部下載"
-        confirm: "你確定要下載你的貼文嗎？"
-        success: "已開始下載，下載完畢後將以訊息通知您"
-        rate_limit_error: "每天僅可下載貼文一次，請明天再重試。"
+        title: "匯出您的資料"
       new_private_message: "新訊息"
       private_message: "訊息"
       private_messages: "訊息"
@@ -949,14 +935,7 @@ zh_TW:
       experimental_sidebar:
         enable: "啟用側選單"
         options: "選項"
-        categories_section: "選擇分類"
-        categories_section_instruction: "選定的分類將顯示在側選單的分類段落中。"
-        tags_section: "選擇標籤"
-        tags_section_instruction: "選定的標籤將顯示在側選單的標籤段落中。"
         navigation_section: "導覽"
-        list_destination_instruction: "當側邊欄中有新內容時..."
-        list_destination_default: "使用預設連結並顯示新項目的徽章"
-        list_destination_unread_new: "連結至未讀/新的並顯示新項目的數量"
       change: "修改"
       featured_topic: "特色主題"
       moderator: "%{user} 是板主"
@@ -1020,12 +999,6 @@ zh_TW:
       theme: "佈景主題"
       home: "預設首頁"
       staged: "暫存"
-      staff_counters:
-        flags_given: "有幫助的檢舉"
-        flagged_posts: "已檢舉的貼文"
-        deleted_posts: "已刪除的貼文"
-        suspensions: "停權"
-        warnings_received: "警告"
       messages:
         inbox: "收件匣"
         personal: "個人的"
@@ -1057,7 +1030,6 @@ zh_TW:
         tags: "標籤"
         interface: "界面"
         apps: "應用"
-        sidebar: "側選單"
       change_password:
         success: "( 寄出的郵件 )"
         in_progress: "( 正在傳送郵件 )"
@@ -1069,8 +1041,8 @@ zh_TW:
       second_factor_backup:
         regenerate: "重新產生"
         disable: "禁用"
-        enable: "啟用"
-        enable_long: "啟用備用碼"
+        manage:
+          other: "你還剩下 <strong>%{count}</strong> 個可使用的備用碼"
         copy_to_clipboard: "複製至剪貼簿"
         copy_to_clipboard_error: "複製至剪貼簿時發生錯誤"
         copied_to_clipboard: "複製至剪貼簿"
@@ -1431,10 +1403,8 @@ zh_TW:
       hide_forever: "不了"
       intro: "你好！:heart_eyes: 看起來你挺喜歡這樣的討論，可是你還沒有註冊帳號。"
     summary:
-      enabled_description: "你正在檢視此話題的摘要：在這個社群裡最熱門的貼文。"
       description:
         other: "有 <b>%{count}</b> 個回覆。"
-      enable: "以摘要檢視此話題"
       disable: "顯示所有貼文"
     deleted_filter:
       enabled_description: "這個話題含有被刪除的回覆，這些回覆已被隱藏。"
@@ -1635,8 +1605,6 @@ zh_TW:
           other: "您至少必須選擇%{count}個標籤"
       save_edit: "儲存編輯"
       overwrite_edit: "覆寫編輯"
-      reply_original: "回覆至原始的話題"
-      reply_here: "在此回覆"
       reply: "回覆"
       cancel: "取消"
       create_topic: "開啟話題"
@@ -1755,6 +1723,7 @@ zh_TW:
       watching_first_post: "<span>新話題</span> %{description}"
       reaction: "<span>%{username}</span> %{description}"
       reaction_2: "<span>%{username}、%{username2}</span> %{description}"
+      admin_problems: "有新的建議出現在後台儀表板"
       dismiss_confirmation:
         dismiss: "忽略"
         cancel: "取消"
@@ -1961,8 +1930,6 @@ zh_TW:
       options: "話題選項"
       show_links: "在話題裡顯示連結"
       suggest_create_topic: 準備好 <a href>開始新的對話了嗎？</a>
-      jump_reply_up: 跳到更早的回覆
-      jump_reply_down: 跳到更晚的回覆
       deleted: "此話題已被刪除"
       slow_mode_update:
         title: "慢速模式"
@@ -2351,6 +2318,8 @@ zh_TW:
           last: "最新版"
           hide: "隱藏修訂紀錄"
           show: "顯示修訂紀錄"
+          destroy: "刪除修訂"
+          destroy_confirm: "您確定要刪除此帖子的所有修訂嗎？此操作是永久性的。"
           edit_wiki: "編輯共筆"
           edit_post: "編輯貼文"
           comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong>%{icon}<strong>%{current}</strong>/%{total}"
@@ -2396,7 +2365,6 @@ zh_TW:
       back: "回到類別"
       general: "一般"
       settings: "設定"
-      topic_template: "話題範本"
       tags: "標記"
       tags_allowed_tags: "將這些標籤（Tags）限制為此分類做使用："
       tags_allowed_tag_groups: "將這些標籤群組限制在此類別使用："
@@ -2441,8 +2409,6 @@ zh_TW:
       images: "圖片"
       email_in: "自訂外來電郵地址:"
       email_in_allow_strangers: "接受非使用者的電郵"
-      email_in_disabled: "\"用電子郵件張貼新的話題\"功能已被關閉。若要使用此功能，"
-      email_in_disabled_click: '請啟用"email in"功能'
       mailinglist_mirror: "以類別來區分郵件列表"
       show_subcategory_list: "在此分類中，將子分類顯示在話題上方。"
       num_featured_topics: "分類頁面中顯示的話題數量："
@@ -2610,6 +2576,10 @@ zh_TW:
     filters:
       with_topics: "%{filter} 話題"
       with_category: "%{filter} %{category} 話題"
+      filter:
+        title: "過濾"
+        button:
+          label: "過濾"
       latest:
         title: "最新"
         title_with_count:
@@ -2685,6 +2655,9 @@ zh_TW:
       close: "關閉（Esc）"
       content_load_error: '無法加載<a href="%url%">內容</a>。'
       image_load_error: '無法加載<a href="%url%">圖片</a>。'
+    experimental_lightbox:
+      buttons:
+        close: "關閉（Esc）"
     keyboard_shortcuts_help:
       title: "快捷鍵"
       jump_to:
@@ -2745,7 +2718,6 @@ zh_TW:
       earned_n_times:
         other: "授予徽章 %{count} 次"
       granted_on: "授予於%{date}"
-      others_count: "其他有該徽章的人（%{count}）"
       title: 徽章
       allow_title: "您能使用此徽章作為稱號"
       multiple_grant: "您能多次獲得此徽章"
@@ -2863,13 +2835,11 @@ zh_TW:
     safe_mode:
       enabled: "安全模式已經開啟，關閉該瀏覽器窗口以退出安全模式"
     pause_notifications:
-      remaining: "剩餘 %{remaining}"
       options:
         half_hour: "30 分鐘"
         one_hour: "1 小時"
         two_hours: "2 小時"
         tomorrow: "直到明天"
-        custom: "客製"
       set_schedule: "設定通知時程"
     trust_levels:
       names:
@@ -2893,7 +2863,21 @@ zh_TW:
       more: "更多"
       all_categories: "所有分類"
       all_tags: "所有標籤"
+      tags_form_modal:
+        title: "編輯標記導航"
+      edit_navigation_modal_form:
+        filter_dropdown:
+          all: "全部"
       sections:
+        custom:
+          save: "保存"
+          delete: "刪除"
+          links:
+            reset: "重設為預設值"
+            icon:
+              label: "圖示"
+            name:
+              label: "姓名"
         about:
           header_link_text: "關於"
         messages:
@@ -2907,9 +2891,6 @@ zh_TW:
             unread_with_count: "未讀 (%{count})"
             archive: "封存"
         tags:
-          links:
-            add_tags:
-              content: "新增標記"
           none: "您尚未新增任何標籤。"
           click_to_get_started: "按一下這裡開始。"
           header_link_text: "標籤"
@@ -2921,7 +2902,8 @@ zh_TW:
           header_link_text: "分類"
           configure_defaults: "設定預設值"
         community:
-          header_link_text: "社群"
+          edit_section:
+            header_dropdown: "客製化"
           links:
             about:
               content: "關於"
@@ -2929,8 +2911,8 @@ zh_TW:
               content: "管理員"
             badges:
               content: "徽章"
-            everything:
-              content: "所有"
+            topics:
+              content: "討論話題"
               title: "所有話題"
             faq:
               content: "常見問答"
@@ -2947,6 +2929,10 @@ zh_TW:
               pending_count: "剩餘 %{count}"
     welcome_topic_banner:
       title: "建立您的歡迎主題"
+    form_templates:
+      errors:
+        typeMismatch:
+          default: "請輸入一個有效的值。"
   admin_js:
     type_to_filter: "輸入要搜尋的文字..."
     admin:
@@ -3192,7 +3178,6 @@ zh_TW:
         enabled: "啟用?"
         is_enabled: "是"
         not_enabled: "否"
-        change_settings: "更改設定"
         change_settings_short: "設定"
         howto: "如何安裝外掛?"
         official: "官方套件"
@@ -3461,6 +3446,8 @@ zh_TW:
           love:
             name: "愛"
             description: "按讚按鈕的顏色"
+          selected:
+            name: "已選取"
         email_style:
           heading: "自訂電子郵件風格"
           css: "CSS"
@@ -3578,6 +3565,7 @@ zh_TW:
           no_previous: "無舊設定值。"
           deleted: "無新設定值，記錄已刪除。"
           actions:
+            permanently_delete_post_revisions: "永久刪除貼文修訂"
             delete_user: "刪除使用者"
             change_trust_level: "修改信任等級"
             change_username: "修改使用者名稱"
@@ -3698,11 +3686,6 @@ zh_TW:
           replace: "取代"
           tag: "標記"
           silence: "靜音"
-        action_descriptions:
-          block: "防止含有這些文字的貼文被發佈，當使用者嘗試發送貼文時，會看見錯誤訊息。"
-          censor: "允許貼文含有這些文字，但以符碼來取代被禁用的文字。"
-          require_approval: "含有這些文字的貼文需要經過管理員審查才能被發佈。"
-          flag: "允許貼文含有這些文字，但標註成不當的用字以讓管理員能審核。"
         form:
           placeholder_regexp: "正規表示法"
           tag_label: "標記"
@@ -3713,6 +3696,33 @@ zh_TW:
           upload_successful: "上傳成功，文字已被添加。"
         test:
           no_matches: "找不到符合的項目"
+      form_templates:
+        nav_title: "模板"
+        list_table:
+          headings:
+            name: "名字"
+            actions: "動作"
+        view_template:
+          close: "關閉"
+          edit: "編輯"
+          delete: "刪除"
+        new_template_form:
+          submit: "保存"
+          cancel: "取消"
+          preview: "預覽"
+        quick_insert_fields:
+          add_new_field: "加入"
+          checkbox: "核取方塊"
+          dropdown: "下拉"
+        validations_modal:
+          table_headers:
+            type: "類型"
+            description: "簡述"
+          validations:
+            required:
+              key: "必填"
+            type:
+              key: "類型"
       impersonate:
         title: "檢視角度"
         help: "使用此工具以使用者的檢視角度進行除錯。完成後將需登出。"
@@ -3725,6 +3735,7 @@ zh_TW:
         not_found: "抱歉，系統裡無此使用者名稱。"
         id_not_found: "抱歉，系統裡無此使用者名稱。"
         active: "已啟動"
+        status: "狀態"
         show_emails: "顯示電子郵件"
         hide_emails: "隱藏 email"
         nav:
@@ -3797,7 +3808,6 @@ zh_TW:
         staged: "暫存？"
         show_admin_profile: "管理員"
         show_public_profile: "顯示公開的基本資料"
-        impersonate: "檢視角度"
         action_logs: "操作紀錄"
         ip_lookup: "IP 反查"
         log_out: "登出"
@@ -3978,6 +3988,8 @@ zh_TW:
         recommended: "我們建議自定義以下文本以符合你的需求："
         show_overriden: "只顯示修改過的項目"
         more_than_50_results: "有超過50個搜尋結果。請嘗試重新定義搜尋關鍵字。"
+        outdated:
+          dismiss: "忽略"
       settings:
         show_overriden: "只顯示被覆寫的內容"
         reset: "重置"
@@ -3985,7 +3997,6 @@ zh_TW:
       site_settings:
         title: "設定"
         no_results: "未找到任何結果。"
-        more_than_30_results: "共有超過 30 筆搜尋結果，請輸入更精確的文字或選擇特定分類搜尋。"
         clear_filter: "清除"
         add_url: "加入網址"
         add_host: "新增主機"
@@ -4065,7 +4076,8 @@ zh_TW:
         allow_title: 允許使用徽章作為稱號
         multiple_grant: 可多次授予
         listable: 在徽章頁面上顯示徽章
-        enabled: 啟用徽章
+        enabled: 啟用
+        disabled: 停用
         icon: 圖示
         image: 圖片
         read_only_setting_help: "自訂文字"
@@ -4115,7 +4127,6 @@ zh_TW:
         confirm_delete: "你確定要刪除此主機？"
         title: "嵌入"
         host: "允許的主機"
-        class_name: "階級名稱"
         edit: "編輯"
         category: "張貼到分類"
         add_host: "新增主機"
diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
index a776d1b2e21..1097711cb6b 100644
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@@ -52,6 +52,11 @@ ar:
   remove_posts_deleted_by_author: "تم الحذف بواسطة المؤلف"
   redirect_warning: "تعذَّر علينا التحقُّق من نشر الرابط الذي حدَّدته في المنتدى. إذا كنت تريد المتابعة على أي حال، فحدِّد الرابط أدناه."
   on_another_topic: "في موضوع آخر"
+  topic_category_changed: "من %{from} إلى %{to}"
+  topic_tag_changed:
+    added_and_removed: "تمت إضافة %{added} وإزالة %{removed}"
+    added: "تمت إضافة %{added}"
+    removed: "تمت إزالة %{removed}"
   inline_oneboxer:
     topic_page_title_post_number: "#%{post_number}"
     topic_page_title_post_number_by_user: "#%{post_number} بواسطة %{username}"
@@ -215,12 +220,12 @@ ar:
       invalid_site_setting: "لا يوجد إعداد موجود باسم \"%{name}\""
       invalid_category_id: "الفئة التي حدَّدتها غير موجودة"
       invalid_choice:
-        zero: "لقد حدَّدت الخيارات غير الصالحة %{name}"
-        one: "لقد حدَّدت الخيار غير الصالح %{name}"
-        two: "لقد حدَّدت الخيارَين غير الصالحَين %{name}"
-        few: "لقد حدَّدت الخيارات غير الصالحة %{name}"
-        many: "لقد حدَّدت الخيارات غير الصالحة %{name}"
-        other: "لقد حدَّدت الخيارات غير الصالحة %{name}"
+        zero: "'%{name}' هو خيار غير صالح."
+        one: "'%{name}' هو خيار غير صالح."
+        two: "'%{name}' هما خيارين غير صالحين."
+        few: "'%{name}' هي خيارات غير صالحة."
+        many: "'%{name}' هي خيارات غير صالحة."
+        other: "'%{name}' هي خيارات غير صالحة."
       default_categories_already_selected: "لا يمكنك تحديد فئة مُستخدَمة في قائمة أخرى."
       default_tags_already_selected: "لا يمكنك تحديد وسم مُستخدَم في قائمة أخرى."
       s3_upload_bucket_is_required: "لا يمكنك تفعيل التحميلات إلى S3 قبل تقديم 's3_upload_bucket'."
@@ -228,7 +233,8 @@ ar:
       page_publishing_requirements: "لا يمكن تفعيل نشر الصفحة في حال تفعيل الوسائط الآمنة."
       s3_backup_requires_s3_settings: "لا يمكنك استخدام S3 كمكان للنسخ الاحتياطي ما لم تُدخِل \"%{setting_name}\"."
       s3_bucket_reused: "لا يمكنك استخدام الحاوية نفسها لـ \"s3_upload_bucket\" و\"s3_backup_bucket\" معًا. اختر حاويةً أخرى أو استخدم مسارًا مختلفًا لكل حاوية."
-      secure_uploads_requirements: "يجب تفعيل التحميل إلى S3 قبل تفعيل التحميلات الآمنة."
+      secure_uploads_requirements: "يجب تمكين التحميل إلى S3 وقوائم التحكم في الوصول (ACL) إلى S3 قبل تمكين التحميلات الآمنة."
+      s3_use_acls_requirements: "يجب تمكين قوائم التحكم في الوصول إلى S3 عند تمكين التحميلات الآمنة."
       share_quote_facebook_requirements: "يجب عليك تعيين معرِّف تطبيق Facebook لتفعيل مشاركة الاقتباسات على Facebook."
       second_factor_cannot_enforce_with_socials: "لا يمكنك فرض المصادقة الثنائية عند تفعيل عمليات تسجيل الدخول بحسابات التواصل الاجتماعي. يجب عليك أولًا إيقاف تسجيل الدخول عبر: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "لا يمكنك فرض المصادقة الثنائية في حال إيقاف عمليات تسجيل الدخول المحلية."
@@ -253,6 +259,10 @@ ar:
         other: "عذرًا، لم نتمكن من إنشاء معاينة لصفحة الويب هذه، نظرًا لتعذر العثور على وسوم oEmbed/OpenGraph التالية: %{missing_attributes}"
   word_connector:
     comma: "، "
+  custom_fields:
+    validations:
+      max_items: "تم الوصول إلى الحد الأقصى لعدد الحقول المخصَّصة لهذا الكيان (%{max_items_number})"
+      max_value_length: "تم الوصول إلى الحد الأقصى لطول قيمة الحقل المخصَّص (%{max_value_length})"
   invite:
     expired: "انتهت صلاحية رمز الدعوة الخاص بك. يُرجى <a href='%{base_url}/about'>التواصل مع فريق العمل</a>."
     not_found: "رمز الدعوة الخاص بك غير صالح. يُرجى <a href='%{base_url}/about'>التواصل مع فريق العمل</a>."
@@ -271,6 +281,7 @@ ar:
     user_exists: "ليست هناك حاجة لدعوة <b>%{email}</b>، فلديه حساب بالفعل!"
     invite_exists: "لقد أرسلت بالفعل دعوة إلى <b>%{email}</b>."
     invalid_email: "%{email} ليس عنوان بريد إلكتروني صالحًا."
+    generic_error_response: "حدثت مشكلة في طلبك."
     rate_limit:
       zero: "لقد أرسلت بالفعل %{count} دعوة في اليوم الماضي، يُرجى الانتظار %{time_left} قبل إعادة المحاولة."
       one: "لقد أرسلت بالفعل دعوة واحدة (%{count}) في اليوم الماضي، يُرجى الانتظار %{time_left} قبل إعادة المحاولة."
@@ -484,6 +495,7 @@ ar:
   too_late_to_edit: "تم إنشاء هذا المنشور منذ فترة طويلة جدًا، ولم يعد من الممكن تعديله أو حذفه."
   edit_conflict: "تم تعديل هذا المنشور بواسطة مستخدم آخر ولم يعُد من الممكن حفظ تغييراتك."
   revert_version_same: "الإصدار الحالي هو الإصدار نفسه الذي تحاول استرجاعه."
+  reverted_to_version: "تم الرجوع إلى الإصدار %{version}"
   cannot_edit_on_slow_mode: "هذا الموضوع في الوضع البطيء. لتشجيع المناقشة عميقة الفكر والمدروسة، فإنه غير مسموح حاليًا بتعديل المنشورات القديمة في هذا الموضوع في أثناء تفعيل الوضع البطيء."
   excerpt_image: "صورة"
   bookmarks:
@@ -602,6 +614,7 @@ ar:
       يسهُل على الجميع قراءة الموضوعات التي يوجد بها عدد قليل من الردود التفصيلية بدلًا من الكثير من الردود الفردية الصغيرة.
     dominating_topic: لقد نشرت كثيرًا في هذا الموضوع! فكِّر في منح الآخرين فرصة للرد هنا ومناقشة الأمور مع بعضهم البعض أيضًا.
     get_a_room: لقد رددت على @%{reply_username} %{count} من المرات، هل تعلم أنه يمكنك إرسال رسالة شخصية إليه بدلًا من ذلك؟
+    dont_feed_the_trolls: تم الإبلاغ عن هذا المنشور بالفعل لجذب انتباه المشرف. هل تريد بالتأكيد الرد عليه؟ تميل الردود على المحتوى السلبي إلى تشجيع المزيد من السلوك السلبي.
     too_many_replies: |
       ### لقد بلغت حد الردود في هذا الموضوع
 
@@ -688,10 +701,6 @@ ar:
             duration_minutes:
               cannot_be_zero: "يجب أن تكون أكبر من 0."
               exceeds_maximum: "لا يمكن أن يتجاوز 20 سنة."
-        translation_overrides:
-          attributes:
-            value:
-              invalid_interpolation_keys: 'مفتاح (مفاتيح) الاستكمال التالي غير صالح: "%{keys}"'
         watched_word:
           attributes:
             word:
@@ -712,22 +721,22 @@ ar:
   staff_category_name: "فريق العمل"
   staff_category_description: "فئة خاصة لمناقشات فريق العمل. تكون الموضوعات مرئية للمسؤولين والمشرفين فقط."
   discourse_welcome_topic:
-    title: "مرحبًا بك في مجتمعنا!"
-    body: |2
+    title: "مرحبًا بك في %{site_title}! :wave:"
+    body: |
+      نحن سعداء للغاية بانضمامك إلينا.
 
-      ستكون الفقرة الأولى من هذا الموضوع المثبَّت مرئية كرسالة ترحيب لجميع الزوار الجُدد على صفحتك الرئيسية. إنه مهم!
+      %{site_info_quote}
 
-      **عدِّل هذا** إلى وصف موجز لمجتمعك:
+      إليك بعض الأشياء التي يمكنك القيام بها للبدء:
 
-      - لمن هو؟
-      - ما الذي يمكنهم العثور عليه هنا؟
-      - لماذا يجب أن يأتوا إلى هنا؟
-      - أين يمكنهم قراءة المزيد (الروابط، الموارد، إلخ)؟
+      :speaking_head: **عرَّف نفسك** بإضافة صورتك ومعلومات عنك وعن اهتماماتك إلى [ملفك الشخصي](%{base_path}/my/preferences/account). ما الشيء الوحيد الذي تود أن تسأل عنه؟
 
-      <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+      :open_book: **تعرَّف على المجتمع** من خلال [تصفح المناقشات](%{base_path}/top) التي تحدث بالفعل هنا. عندما تجد منشورًا مثيرًا للاهتمام أو غنيًا بالمعلومات أو ممتعًا، استخدم :heart: لإظهار تقديرك أو دعمك!
 
-      قد ترغب في إغلاق هذا الموضوع من خلال المسؤول :wrench: (في أعلى اليمين والأسفل)؛ حتى لا تتراكم الردود في إعلان.
-  admin_quick_start_title: "اقرأني أولًا: دليل البدء السريع للمسؤولين"
+      :handshake: **ساهم** بالتعليق أو مشاركة وجهة نظرك أو طرح الأسئلة أو تقديم التعليقات في المناقشة. قبل الرد أو البدء في موضوعات جديدة، يُرجى مراجعة [إرشادات المجتمع](%{base_path}/faq).
+
+      إذا كنت بحاجة إلى مساعدة أو لديك اقتراح، فلا تتردد في السؤال في [#feedback](%{base_path}/c/site-feedback) أو [تواصل مع المسؤولين](%{base_path}/about).
+  admin_quick_start_title: "دليل المسؤولين: خطوات البدء"
   category:
     topic_prefix: "نبذة عن الفئة %{category}"
     replace_paragraph: "(استبدل هذه الفقرة الأولى بوصف موجز لفئتك الجديدة. سيظهر هذا التوجيه في منطقة تحديد الفئة؛ لذا حاول جعلها أقل من 200 حرف.)"
@@ -746,6 +755,7 @@ ar:
       disallowed_tags_generic: "يتضمَّن الموضوع وسومًا غير مسموح بها."
       slug_contains_non_ascii_chars: "يتضمَّن حروفًا لا تنتمي إلى ترميز ASCII"
       is_already_in_use: "قيد الاستخدام بالفعل"
+      move_topic_to_category_disallowed: "لا يمكنك نقل هذا الموضوع إلى فئة ليس لديك إذن بإنشاء موضوعات جديدة فيها."
     cannot_delete:
       uncategorized: "هذه الفئة خاصة. والغرض منها هو أن تكون منطقة للاحتفاظ بالموضوعات التي ليس لها فئة؛ لا يمكن حذفها."
       has_subcategories: "لا يمكن حذف هذه الفئة لأنها تتضمَّن فئات فرعية."
@@ -1313,7 +1323,7 @@ ar:
       title: "المستخدمون النشطون يوميًا/المستخدمون النشطون شهريًا"
       xaxis: "اليوم"
       yaxis: "المستخدمون النشطون يوميًا/المستخدمون النشطون شهريًا"
-      description: "عدد الأعضاء الذين سجَّلوا الدخول في اليوم الماضي مقسومًا على عدد الأعضاء الذين سجَّلوا الدخول في الشهر الماضي - يتم عرض نسبة مئوية تشير إلى \"الاستمرار في المتابعة\" للمجتمع. ننصحك بالبقاء فوق 30%."
+      description: "عدد الأعضاء الذين سجَّلوا الدخول في اليوم الماضي مقسومًا على عدد الأعضاء الذين سجَّلوا الدخول في الشهر الماضي - يتم عرض نسبة مئوية تشير إلى \"الاستمرار في المتابعة\" للمجتمع. ننصحك بالبقاء فوق 20%."
     daily_engaged_users:
       title: "المستخدمون المتفاعلون يوميًا"
       xaxis: "اليوم"
@@ -1582,6 +1592,7 @@ ar:
     image_magick_warning: 'تم إعداد الخادم لإنشاء صور مصغَّرة للصور الكبيرة، ولكن لم يتم تثبيت ImageMagick. ثبِّت ImageMagick باستخدام مدير الحزم المفضَّل لديك أو <a href="https://www.imagemagick.org/script/download.php" target="_blank">نزِّل أحدث إصدار</a>.'
     failing_emails_warning: 'هناك %{num_failed_jobs} مهمة بريد إلكتروني فشلت. تحقَّق من app.yml وتأكَّد من صحة إعدادات خادم البريد. <a href="%{base_path}/sidekiq/retries" target="_blank">راجع المهام التي فشلت في Sidekiq</a>.'
     subfolder_ends_in_slash: "إعداد المجلد الفرعي غير صحيح، تنتهي قيمة DISCOURSE_RELATIVE_URL_ROOT بشرطة مائلة."
+    outdated_translations_warning: "بعض عمليات استبدال الترجمة لديك قديمة. يُرجى التحقق من <a href='%{base_path}/admin/customize/site_texts?outdated=true'>تخصيصاتك النصية</a>."
     email_polling_errored_recently:
       zero: "نتج عن استقصاء تلقي الرسائل الإلكترونية %{count} خطأ في آخر 24 ساعة. راجع <a href='%{base_path}/logs' target='_blank'>السجلات</a> لمزيد من التفاصيل."
       one: "نتج عن استقصاء تلقي الرسائل الإلكترونية خطأ واحد (%{count}) في آخر 24 ساعة. راجع <a href='%{base_path}/logs' target='_blank'>السجلات</a> لمزيد من التفاصيل."
@@ -1597,6 +1608,8 @@ ar:
     out_of_date_themes: "تتوفَّر تحديثات للسمات التالية:"
     unreachable_themes: "لم نتمكن من التحقُّق من وجود تحديثات للسمات التالية:"
     watched_word_regexp_error: "التعبير العادي للكلمات المُراقَبة للإجراء \"%{action}\" غير صالح. يُرجى التحقُّق من <a href='%{base_path}/admin/customize/watched_words'>إعدادات الكلمات المُراقَبة</a>، أو إيقاف إعداد الموقع `watched words regular expressions`."
+    v3_analytics_deprecated: "يستخدم Discourse لديك حاليًا Google Analytics 3، والذي سيتوقف دعمه بعد يوليو 2023. <a href='https://meta.discourse.org/t/260498'>قم بالترقية إلى Google Analytics 4</a> الآن للاستمرار في تلقي رؤى وتحليلات قيمة لأداء موقعك الإلكتروني."
+    legacy_navigation_menu_deprecated: "يستخدم Discourse لديك حاليًا قائمة التنقل \"القديمة\"، والتي <a href='https://meta.discourse.org/t/removing-the-legacy-hamburger-navigation-menu-option/265274'>ستتم إزالتها في الإصدار التجريبي الأول من Discourse 3.2</a>. انتقل إلى قائمة التنقل الجديدة عن طريق تحديث <a href='%{base_path}/admin/site_settings/category/all_results?filter=navigation_menu'>إعداد موقع قائمة التنقل</a> إلى \"الشريط الجانبي\" أو \"القائمة المنسدلة للرأس\"."
   site_settings:
     allow_bulk_invite: "السماح بالدعوات الجماعية عن طريق تحميل ملف CSV"
     disabled: "متوقف"
@@ -1662,8 +1675,11 @@ ar:
     fixed_category_positions_on_create: "في حال تحديده، سيتم الاحتفاظ بترتيب الفئات في مربع حوار إنشاء الموضوع (requires fixed_category_positions)."
     add_rel_nofollow_to_user_content: 'أضِف rel=nofollow إلى كل المحتوى الذي قدَّمه المستخدم، باستثناء الروابط الخارجية (بما في ذلك النطاقات الرئيسية). في حال تغيير ذلك، يجب عليك إعادة إنشاء جميع المنشورات باستخدام: "rake posts:rebake"'
     exclude_rel_nofollow_domains: "قائمه النطاقات التي لا ينبغي إضافة rel=nofollow إلى روابطها. سيسمح example.com تلقائيًا بالرابط sub.example.com أيضًا. ينبغي إضافة نطاق هذا الموقع كحدٍ أدنى لمساعدة زاحفات الويب في العثور على كل المحتوى. إذا كانت هناك أجزاء أخرى من موقعك الإلكتروني في نطاقات أخرى، فأضِفها أيضًا."
+    max_form_template_title_length: "أقصى طول مسموح به لعناوين قوالب النماذج"
+    max_form_template_content_length: "أقصى طول مسموح به لمحتوى قوالب النماذج"
     post_excerpt_maxlength: "الحد الأقصى لطول مقتطف/ملخص منشور."
     topic_excerpt_maxlength: "الحد الأقصى لطول مقتطف الموضوع/ملخص الموضوع الذي تم إنشاؤه من أول منشور في الموضوع."
+    default_subcategory_on_read_only_category: "يفعِّل زر \"موضوع جديد\" ويختار فئة فرعية افتراضية للنشر على الفئات التي لا يُسمَح فيها للمستخدم بإنشاء موضوع جديد."
     show_pinned_excerpt_mobile: "إظهار المقتطف في الموضوعات المثبَّتة فى طريقة عرض الجوَّال."
     show_pinned_excerpt_desktop: "إظهار المقتطف في الموضوعات المثبَّتة فى طريقة عرض سطح المكتب"
     post_onebox_maxlength: "الحد الأقصى لطول منشور Discourse في لوحة المعاينة بالأحرف."
@@ -1685,7 +1701,7 @@ ar:
     manifest_icon: "الصورة المُستخدَمة كشعار/صورة البداية على Android. سيتم تغيير حجمها تلقائيًا إلى 512 × 512. وإذا تركتها فارغة، فسيتم استخدام large_icon."
     manifest_screenshots: "لقطات شاشة تعرض ميزات المثيل ووظيفته على صفحة رسالة التثبيت الخاصة به. يجب أن تكون جميع الصور من تحميلات محلية وبالأبعاد نفسها."
     favicon: "الرمز المفضَّل لموقعك، راجع <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://en.wikipedia.org/wiki/Favicon</a> للعمل بشكلٍ صحيح على شبكة توصيل المحتوى، يجب أن تكون الصورة بتنسيق png. سيتم تغيير حجمها إلى 32 × 32. وإذا تركتها فارغة، فسيتم استخدام large_icon."
-    apple_touch_icon: "الصورة المُستخدَمة كشعار/صورة البداية على Android. سيتم تغيير حجمها تلقائيًا إلى 512 × 512. وإذا تركتها فارغة، فسيتم استخدام large_icon."
+    apple_touch_icon: "الشعار المُستخدَم على أجهزة Apple اللمسية. سيتم تغيير حجمها تلقائيًا إلى 512 × 512. وإذا تركتها فارغة، فسيتم استخدام large_icon."
     opengraph_image: "صورة opengraph افتراضية، يتم استخدامها عندما لا تحتوي الصفحة على صورة أخرى مناسبة. وإذا تركتها فارغة، فسيتم استخدام large_icon."
     twitter_summary_large_image: "بطاقة Twitter 'summary large image' (ينبغي ألا يقل عرضها عن 280، وارتفاعها عن 150، وألا تكون بتنسيق .svg). في حال تركها فارغة، يتم إنشاء البيانات الوصفية التقليدية باستخدام opengraph_image ما دامت هي أيضًا ليست بتنسيق .svg"
     notification_email: "عنوان البريد الإلكتروني المُستخدَم في حقل \"من:\" عند إرسال جميع رسائل النظام الأساسية. يجب تعيين سجلات SPF وDKIM وreverse PTR للنطاق المحدَّد هنا بشكلٍ صحيح لتصل الرسالة الإلكترونية."
@@ -1701,6 +1717,8 @@ ar:
     summary_percent_filter: "يظهر أعلى % من المنشورات عندما يضغط المستخدم على \"تلخيص هذا الموضوع\""
     summary_max_results: "الحد الأقصى لعدد المنشورات التي تم إرجاعها بواسطة \"تلخيص هذا الموضوع\""
     summary_timeline_button: "إظهار زر 'تلخيص' في الجدول الزمني"
+    summarization_strategy: "طرق إضافية لتلخيص المحتوى المسجَّل بواسطة المكونات الإضافية"
+    custom_summarization_allowed_groups: "المجموعات المسموح لها بتلخيص المحتويات باستخدام `summarization_strategy`"
     enable_personal_messages: "تم إيقافه، استخدم إعداد 'personal message enabled groups' بدلًا من ذلك. اسمح للمستخدمين من مستوى الثقة 1 (قابل للإعداد عبر الحد الأدنى لمستوى الثقة لإرسال الرسائل) بإنشاء رسائل والرد على الرسائل. لاحظ أن فريق العمل يمكنه دائمًا إرسال الرسائل بغض النظر عن أي شيء."
     personal_message_enabled_groups: "اسمح للمستخدمين داخل هذه المجموعات بإنشاء رسائل والرد على الرسائل. تتضمن مجموعات مستوى الثقة جميع مستويات الثقة التي تزيد عن هذا الرقم؛ على سبيل المثال، يتيح اختيار trust_level_1 أيضًا لمستخدمي trust_level_2 و3 و4 إرسال رسائل خاصة. لاحظ أن الموظفين يمكنهم دائمًا إرسال الرسائل بغض النظر عن السبب."
     enable_system_message_replies: "يسمح للمستخدمين بالرد على رسائل النظام، حتى إذا كانت الرسائل الشخصية متوقفة."
@@ -1795,6 +1813,7 @@ ar:
     enable_badges: "تفعيل نظام الشارات"
     max_favorite_badges: "الحد الأقصى لعدد الشارات التي يمكن للمستخدم تحديدها"
     whispers_allowed_groups: "السماح بالاتصالات الخاصة داخل الموضوعات لأعضاء المجموعات المحدَّدة."
+    hidden_post_visible_groups: "السماح لأعضاء تلك المجموعات بعرض المنشورات المخفية. يمكن دائمًا للمستخدمين من فريق العمل عرض المنشورات المخفية."
     allow_index_in_robots_txt: "حدِّد في ملف robots.txt أن هذا الموقع يسمح لمحركات بحث الويب بفهرسته. وفي حالات استثنائية، يمكنك <a href='%{base_path}/admin/customize/robots'>تجاوز ملف robots.txt</a> بشكلٍ دائم."
     blocked_email_domains: "قائمة مفصولة بشرائط عمودية لنطاقات البريد الإلكتروني التي لا يُسمَح للمستخدمين باستخدامها في تسجيل الحسابات. رمزا حرف البدل * و؟ غير مدعومَين. مثال: mailinator.com|trashmail.net"
     allowed_email_domains: "قائمة مفصولة بشرائط عمودية لنطاقات البريد الإلكتروني التي يجب على المستخدمين استخدامها في تسجيل الحسابات. تتم معالجة النطاقات الفرعية للنطاقات المحدَّدة تلقائيًا. رمزا حرف البدل * و؟ غير مدعومَين. تحذير: لن يُسمَح بالمستخدمين ذوي نطاقات البريد الإلكتروني غير المُدرَجة!"
@@ -1821,7 +1840,7 @@ ar:
     enable_discourse_connect: "تفعيل تسجيل الدخول عبر DiscourseConnect (المعروف سابقًا باسم \"Discourse SSO\") (تحذير: *يجب* التحقُّق من صحة عناوين البريد الإلكتروني للمستخدمين من خلال الموقع الخارجي!)"
     verbose_discourse_connect_logging: "تسجيل تشخصيات DiscourseConnect المطوَّلة ذات الصلة في <a href='%{base_path}/logs' target='_blank'>/logs</a>"
     enable_discourse_connect_provider: "تنفيذ بروتوكول موفِّر DiscourseConnect (المعروف سابقًا باسم \"Discourse SSO\") في نقطة نهاية /session/sso_provider، يتطلب تعيين discourse_connect_provider_secrets"
-    discourse_connect_url: "عنوان URL لنقطة نهاية DiscourseConnect (يجب أن يتضمَّن http:// أو https://)"
+    discourse_connect_url: "عنوان URL لنقطة نهاية DiscourseConnect (يجب أن يتضمن البروتوكول http:// أو https://، ويجب ألا يتضمن شرطة مائلة لاحقة)"
     discourse_connect_secret: "السلسلة السرية المُستخدَمة لمصادقة معلومات DiscourseConnect بشكلٍ مشفَّر، تأكد من أنها تتكوَّن من 10 أحرف أو أكثر"
     discourse_connect_provider_secrets: "قائمة بالأزواج السرية للنطاق والتي تستخدم DiscourseConnect. تأكَّد من أن طول رمز DiscourseConnect السري هو 10 أحرف أو أكثر. يمكن استخدام رمز حرف البدل * لمطابقة أي نطاق أو جزء منه فقط (على سبيل المثال، *.example.com)."
     discourse_connect_overrides_bio: "تجاوز النبذة التعريفية في الملف الشخصي للمستخدم ومنعه من تغييرها"
@@ -1835,7 +1854,7 @@ ar:
     discourse_connect_overrides_profile_background: "يستبدل خلفية الملف الشخصي للمستخدم بالصورة الرمزية للموقع الخارجي من حمولة DiscourseConnect."
     discourse_connect_overrides_card_background: "يستبدل خلفية بطاقة المستخدم بالصورة الرمزية للموقع الخارجي من حمولة DiscourseConnect."
     discourse_connect_not_approved_url: "إعادة توجيه حسابات DiscourseConnect غير المعتمدة إلى عنوان URL هذا"
-    discourse_connect_allows_all_return_paths: "عدم تقييد نطاق return_paths الذي يقدِّمه DiscourseConnect (يجب أن يكون مسار الإرجاع الافتراضي على الموقع الحالي)"
+    discourse_connect_allowed_redirect_domains: "التقييد إلى هذه النطاقات لمسارات الإرجاع return_paths التي يوفرها DiscourseConnect (يجب أن يكون مسار الإرجاع على الموقع الحالي بشكلٍ افتراضي). استخدم * للسماح بأي نطاق لمسار الإرجاع. غير مسموح بأحرف البدل للنطاق الفرعي (`*.foobar.com`)."
     enable_local_logins: "تفعيل الحسابات المحلية التي تعتمد على اسم المستخدم وكلمة المرور في تسجيل الدخول. تحذير: إذا تم إيقاف هذا الإعداد، فقد لا تتمكن من تسجيل الدخول إذا كنت لم تُعدَّ مسبقًا طريقة تسجيل دخول بديلة واحدة على الأقل."
     enable_local_logins_via_email: "السماح للمستخدمين بطلب رابط تسجيل الدخول بنقرة واحدة ليتم إرساله إليهم عبر البريد الإلكتروني"
     allow_new_registrations: "السماح بعمليات تسجيل جديدة من المستخدمين. يمكنك إلغاء تحديد هذا الإعداد لمنع أي شخص من إنشاء حساب جديد."
@@ -1871,6 +1890,7 @@ ar:
     s3_configure_tombstone_policy: "تفعيل سياسة الحذف التلقائي للتحميلات التي تم حذفها من الدليل ولم تتم إزالتها من قاعدة البيانات. مهم: إذا تم إيقاف هذا الإعداد، فلن تتم استعادة أي مساحة بعد حذف التحميلات."
     s3_disable_cleanup: "منع إزالة النسخ الاحتياطية القديمة من S3 عندما يكون هناك نسخ احتياطية أكثر من الحد الأقصى المسموح به"
     enable_s3_inventory: "إنشاء التقارير والتحقُّق من التحميلات باستخدام تخزين Amazon S3. مهم: يتطلب بيانات اعتماد S3 صالحة (كلٌ من معرِّف مفتاح الوصول ومفتاح الوصول السري)."
+    s3_use_acls: "توصي AWS بعدم استخدام قوائم ACL في حاويات S3؛ إذا كنت تتبع هذه النصيحة، فقم بإلغاء تحديد هذا الخيار. يجب تمكين هذا الخيار إذا كنت تستخدم تحميلات آمنة."
     backup_time_of_day: "الوقت من اليوم (بالتوقيت العالمي الموحَّد) الذي يجب أن يتم فيه النسخ الاحتياطي"
     backup_with_uploads: "تضمين عمليات التحميل في النسخ الاحتياطية المجدولة. سيؤدي إيقاف هذا الإعداد إلى نسخ قاعدة البيانات احتياطيًا فقط."
     backup_location: "موقع تخزين النسخ الاحتياطية. هام: يتطلب S3 إدخال بيانات اعتماد S3 صالحة في إعدادات الملفات."
@@ -1920,6 +1940,7 @@ ar:
     s3_secret_access_key: "مفتاح الوصول السري لخدمة Amazon S3 الذي سيتم استخدامه لتحميل الصور والمرفقات والنسخ الاحتياطية"
     s3_region: "اسم منطقة خدمة Amazon S3 الذي سيتم استخدامه لتحميل الصور والنسخ الاحتياطية"
     s3_cdn_url: "عنوان URL لشبكة توصيل المحتوى (CDN) الذي سيتم استخدامه لجميع أصول s3 (على سبيل المثال: https://cdn.somewhere.com). تحذير: بعد تغيير هذا الإعداد، يجب عليك إعادة إنشاء جميع المنشورات القديمة."
+    s3_use_cdn_url_for_all_uploads: "استخدم عنوان URL لشبكة CDN لجميع الملفات التي تم تحميلها إلى s3 بدلًا من استخدامه للصور فقط."
     avatar_sizes: "قائمة بأحجام الصور الرمزية التي يتم إنشاؤها تلقائيًا"
     external_system_avatars_enabled: "استخدام خدمة خارجية لصور النظام"
     external_system_avatars_url: "عنوان URL لخدمة الصور الرمزية الخارجية للنظام. الاستبدالات المسموح بها هي {username} {first_letter} {color} {size}"
@@ -1939,7 +1960,7 @@ ar:
     composer_media_optimization_image_bytes_optimization_threshold: "الحد الأدنى لحجم ملف الصورة لبدء التحسين من جانب العميل"
     composer_media_optimization_image_resize_dimensions_threshold: "الحد الأدنى لعرض الصورة لتشغيل تغيير الحجم من جانب العميل"
     composer_media_optimization_image_resize_width_target: "سيتم تغيير حجم الصور التي يزيد عرضها عن `composer_media_optimization_image_dimensions_resize_threshold` إلى هذا العرض. يجب أن تكون أكبر من أو تساوي `composer_media_optimization_image_dimensions_resize_threshold`."
-    composer_media_optimization_image_encode_quality: "جودة ترميز JPEG المُستخدَم في عملية إعادة الترميز"
+    composer_media_optimization_image_encode_quality: "جودة ترميز JPEG المُستخدَمة في عملية إعادة الترميز"
     min_ratio_to_crop: "النسبة المُستخدَمة لاقتصاص الصور الطويلة. أدخل نتيجة العرض/الارتفاع."
     simultaneous_uploads: "أقصى عدد من الملفات التي يمكن سحبها وإسقاطها في أداة الإنشاء"
     default_invitee_trust_level: "مستوى الثقة الافتراضي (0-4) للمستخدمين المدعوين"
@@ -1968,7 +1989,9 @@ ar:
     tl3_requires_likes_given: "الحد الأدنى لعدد تسجيلات الإعجاب التي يجب منحها في آخر (الفترة الزمنية المطلوبة للوصول إلى مستوى الثقة 3) للتأهُّل للترقية إلى مستوى الثقة 3"
     tl3_requires_likes_received: "الحد الأدنى لعدد تسجيلات الإعجاب التي يجب تلقيها في آخر (الفترة الزمنية المطلوبة للوصول إلى مستوى الثقة 3) يوم للتأهُّل للترقية إلى مستوى الثقة 3"
     tl3_links_no_follow: "عدم إزالة rel=nofollow من الروابط المنشورة بواسطة مستخدمين من مستوى الثقة 3"
-    trusted_users_can_edit_others: "السماح للمستخدمين من مستويات الثقة العالية بتعديل محتوى المستخدمين الآخرين"
+    tl4_delete_posts_and_topics: "السماح للمستخدمين في مستوى الثقة 4 بحذف المنشورات والموضوعات التي أنشأها مستخدمون آخرون. سيتمكن أيضًا المستخدمون في مستوى الثقة 4 من رؤية الموضوعات والمنشورات المحذوفة."
+    edit_all_topic_groups: "السماح للمستخدمين في هذه المجموعة من تعديل عناوين الموضوعات ووسومها وفئاتها للمستخدمين الآخرين"
+    edit_all_post_groups: "السماح للمستخدمين في هذه المجموعة بتعديل مشاركات المستخدمين الآخرين"
     min_trust_to_create_topic: "الحد الأدنى لمستوى الثقة المطلوب لإنشاء موضوع جديد"
     allow_flagging_staff: "في حال التفعيل، يمكن للمستخدمين الإبلاغ عن المنشورات من حسابات فريق العمل."
     min_trust_to_edit_wiki_post: "الحد الأدنى لمستوى الثقة المطلوب لتعديل منشور من نوع Wiki."
@@ -2004,7 +2027,7 @@ ar:
     title_min_entropy: "الحد الأدنى للإنتروبيا (يتم احتساب الحروف الفريدة وغير الإنجليزية بأكثر من عددها) المطلوبة لعنوان الموضوع"
     body_min_entropy: "الحد الأدنى للإنتروبيا (يتم احتساب الحروف الفريدة وغير الإنجليزية بأكثر من عددها) المطلوبة لنص الموضوع"
     allow_uppercase_posts: "السماح بجميع بكتابة عنوان الموضوع أو نص المنشور بأكمله بأحرف كبيرة"
-    max_consecutive_replies: "عدد المنشورات التي يجب على المستخدم إنشاؤها على التوالي في موضوع قبل منعه من إضافة رد آخر"
+    max_consecutive_replies: "عدد المنشورات المتتالية التي يمكن للمستخدم وضعها في موضوع قبل منعه من إضافة ردٍ آخر. لا ينطبق هذا الحد على مالك الموضوع أو فريق عمل الموقع أو مشرفي الفئات."
     enable_filtered_replies_view: 'يؤدي الزر "(n) رد" إلى طي جميع المنشورات الأخرى وعرض المنشور الحالي والردود عليه فقط.'
     title_fancy_entities: "تحويل أحرف ASCII الشائعة إلى كيانات HTML خيالية في عناوين الموضوعات، مثل <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</a>"
     min_title_similar_length: "الحد الأدنى لطول العنوان قبل التحقُّق من وجود موضوعات مشابهة"
@@ -2084,6 +2107,11 @@ ar:
     block_auto_generated_emails: "حظر الرسائل الإلكترونية الواردة التي تم تحديدها على أنها منشأة تلقائيًا."
     ignore_by_title: "تجاهل الرسائل الإلكترونية الواردة بناءً على عنوانها"
     mailgun_api_key: "مفتاح API السري لمحرك Mailgun والمُستخدَم في التحقُّق من رسائل خطاف الويب"
+    sendgrid_verification_key: "مفتاح التحقق Sendgrid المُستخدَم للتحقق من رسائل خطاف الويب."
+    mailjet_webhook_token: "الرمز المُستخدَم للتحقق من حمولة خطاف الويب. يجب تمريره في صورة معلمة الاستعلام 't' لخطاف الويب؛ على سبيل المثال: https://example.com/webhook/mailjet?t=supersecret"
+    mandrill_authentication_key: "مفتاح المصادقة Mandrill المُستخدَم للتحقق من رسائل خطاف الويب."
+    postmark_webhook_token: "الرمز المُستخدَم للتحقق من حمولة خطاف الويب. يجب تمريره في صورة معلمة الاستعلام 't' لخطاف الويب؛ على سبيل المثال: https://example.com/webhook/postmark?t=supersecret"
+    sparkpost_webhook_token: "الرمز المُستخدَم للتحقق من حمولة خطاف الويب. يجب تمريره في صورة معلمة الاستعلام 't' لخطاف الويب؛ على سبيل المثال: https://example.com/webhook/sparkpost?t=supersecret"
     soft_bounce_score: "نقاط الارتداد التي تتم إضافتها إلى المستخدم عند حدوث ارتداد مؤقت"
     hard_bounce_score: "نقاط الارتداد التي تتم إضافتها إلى المستخدم عند حدوث ارتداد دائم"
     bounce_score_threshold: "أقصى عدد من نقاط الارتداد قبل أن نتوقف عن مراسلة مستخدم عبر البريد الإلكتروني"
@@ -2111,7 +2139,7 @@ ar:
     pop3_polling_password: "كلمة مرور حساب POP3 لاستقصاء تلقي الرسائل الإلكترونية"
     pop3_polling_delete_from_server: "حذف الرسائل الإلكترونية من الخادم. ملاحظة: إذا أوقفت هذا الإعداد، فستحتاج إلى تنظيف صندوق البريد الوارد يدويًا"
     log_mail_processing_failures: "تسجيل جميع حالات فشل معالجة البريد الإلكتروني في <a href='%{base_path}/logs' target='_blank'>/logs</a>"
-    email_in: 'السماح للمستخدمين بنشر موضوعات جديدة عبر البريد الإلكتروني (يتطلب الاستقصاء يدويًا أو عبر POP3). يمكنك إعداد العناوين في علامة التبويب "الإعدادات" لكل فئة.'
+    email_in: "السماح للمستخدمين بنشر موضوعات جديدة عبر البريد الإلكتروني. بعد تمكين هذا الإعداد، ستتمكن من تكوين عناوين البريد الإلكتروني الوارد للمجموعات والفئات."
     email_in_min_trust: "الحد الأدنى لمستوى الثقة الذي يحتاجه المستخدم ليتم السماح له بنشر موضوعات جديدة عبر البريد الإلكتروني"
     email_in_authserv_id: "معرِّف الخدمة التي تفحص المصادقة على الرسائل الإلكترونية الواردة. راجع <a href='https://meta.discourse.org/t/134358'>https://meta.discourse.org/t/134358</a> للحصول على إرشادات بشأن كيفية إعداده."
     email_in_spam_header: "رأس البريد الإلكتروني لاكتشاف الرسائل غير المرغوب فيها"
@@ -2157,6 +2185,7 @@ ar:
     enable_category_group_moderation: "السماح للمجموعات بالإشراف على المحتوى في فئات معيَّنة"
     group_in_subject: "لتعيين %%{optional_pm} في موضوع الرسالة الإلكترونية على اسم المجموعة الأولى في رسالة خاصة، راجع: <a href='https://meta.discourse.org/t/customize-specific-email-templates/88323' target='_blank'>تخصيص تنسيق الموضوع للرسائل الإلكترونية القياسية</a>"
     allow_anonymous_posting: "السماح للمستخدمين بالتبديل إلى الوضع المجهول"
+    allow_anonymous_likes: "السماح للمستخدمين المجهولين بتسجيل إعجابهم بالمنشورات"
     anonymous_posting_min_trust_level: "الحد الأدنى لمستوى الثقة المطلوب لتفعيل النشر المجهول"
     anonymous_account_duration_minutes: "لحماية إخفاء الهوية، أنشئ حسابًا مجهولًا جديدًا كل N دقيقة لكل مستخدم. مثال: إذا تم التعيين إلى 600، سيتم إنشاء حساب مجهول جديد بمجرد مرور 600 دقيقة على آخر منشور وتحوُّل المستخدم إلى مجهول."
     hide_user_profiles_from_public: "إيقاف بطاقات المستخدمين والملفات الشخصية لهم ودليل المستخدم للمستخدمين المجهولين"
@@ -2175,6 +2204,7 @@ ar:
     allow_profile_backgrounds: "السماح للمستخدمين بتحميل خلفيات للملفات الشخصية"
     sequential_replies_threshold: "عدد المنشورات التي يجب على المستخدم إنشاؤها في على التوالي في الموضوع قبل أن يتم تذكيره بوجود عدد كبير جدًا من الردود المتسلسلة"
     get_a_room_threshold: "عدد المنشورات التي يجب على المستخدم إنشاؤها للشخص نفسه في الموضوع نفسه قبل أن يتم تحذيره"
+    dont_feed_the_trolls_threshold: "عدد البلاغات من المستخدمين الآخرين قبل تحذير المستخدم"
     enable_mobile_theme: "تستخدم الأجهزة الجوَّالة سمة متوافقة مع الجوَّال، مع إمكانية التبديل إلى الموقع الكامل. يمكنك إيقاف هذا إذا كنت تريد استخدام ورقة أنماط مخصَّصة تستجيب بشكلٍ كامل."
     dominating_topic_minimum_percent: "ما النسبة المئوية للمنشورات التي يجب على المستخدم إنشاؤها في الموضوع قبل أن يتم تذكيره بالسيطرة الزائدة على الموضوع."
     disable_avatar_education_message: "إيقاف الرسالة التعليمية لتغيير الصورة الرمزية"
@@ -2184,22 +2214,22 @@ ar:
     permalink_normalizations: "تطبيق التعبير العادي التالي قبل مطابقة الروابط الثابتة، على سبيل المثال: سيؤدي استخدام /(topic.*)\\?.*/\\1 إلى إزالة سلاسل الاستعلام من مسارات الموضوع. التنسيق هو regex+string. استخدم \\1 وما إلى ذلك للوصول إلى الالتقاطات."
     global_notice: "عرض بانر عام عاجل وطارئ وغير قابل للتجاهل لجميع الزائرين. قم بالتغيير إلى قيمة فارغة لإخفائه (مسموح باستخدام HTML)."
     disable_system_edit_notifications: "إيقاف إشعارات التعديل بواسطة مستخدم النظام عندما يكون \"download_remote_images_to_local\" نشطًا."
-    disable_category_edit_notifications: "إيقاف إشعارات تعديل الفئة في الموضوعات."
-    disable_tags_edit_notifications: "إيقاف إشعارات تعديل الوسوم في الموضوعات."
+    disable_category_edit_notifications: "إيقاف الإشعارات لتعديلات فئة الموضوع"
+    disable_tags_edit_notifications: "إيقاف الإشعارات لتعديلات وسوم الموضوع"
     notification_consolidation_threshold: "عدد إشعارات الإعجاب أو طلبات العضوية المتلقاة قبل دمج الإشعارات في رسالة واحدة. اتعيين القيمة على 0 للإيقاف."
     likes_notification_consolidation_window_mins: "المدة بالدقائق التي يتم فيها دمج إشعارات الإعجاب في إشعار واحد بمجرد الوصول إلى الحد الأقصى. يمكن إعداد الحد الأقصى عبر `SiteSetting.notification_consolidation_threshold`."
     automatically_unpin_topics: "إلغاء تثبيت الموضوعات تلقائيًا عندما يصل المستخدم إلى النهاية"
     read_time_word_count: "عدد الكلمات في الدقيقة لحساب الوقت المقدَّر للقراءة"
     topic_page_title_includes_category: "يتضمَّن <a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title' target='_blank'>وسم العنوان</a> لصفحة الموضوع اسم الفئة."
-    native_app_install_banner_ios: "يعرض بانر تطبيق DiscourseHub على أجهزة iOS للمستخدمين المنتظمين (مستوى الثقة 1 وأعلى)."
-    native_app_install_banner_android: "يعرض بانر تطبيق DiscourseHub على أجهزة Android للمستخدمين المنتظمين (مستوى الثقة 1 وأعلى)."
+    native_app_install_banner_ios: "يعرض بانر تطبيق DiscourseHub على أجهزة iOS للمستخدمين المنتظمين (مستوى الثقة 1) وأعلى."
+    native_app_install_banner_android: "يعرض بانر تطبيق DiscourseHub على أجهزة Android للمستخدمين المنتظمين (مستوى الثقة 1) وأعلى."
     app_association_android: "محتويات نقطة نهاية <a href='%{base_path}/.well-known/assetlinks.json'>.well-known/assetlinks.json</a> المُستخدَمة في API لروابط الأصول الرقمية من Google"
     app_association_ios: "محتويات نقطة نهاية <a href='%{base_path}/apple-app-site-association'>apple-app-site-association</a> المُستخدَمة لإنشاء روابط عامة بين هذا الموقع وتطبيقات iOS"
     share_anonymized_statistics: "مشاركة إحصاءات الاستخدام المجهولة"
     auto_handle_queued_age: "التعامل تلقائيًا مع السجلات التي تنتظر المراجعة بعد هذا العدد من الأيام. سيتم تجاهل البلاغات. وسيتم رفض المنشورات والمستخدمين في قائمة الانتظار. اتعيين القيمة على 0 لإيقاف هذه الميزة."
     penalty_step_hours: "العقوبات الافتراضية لكتم المستخدمين أو تعليقهم بالساعات. يتم إعداد الإساءة الأولى بشكلٍ افتراضي على القيمة الأولى، والإساءة الثانية بشكلٍ افتراضي على القيمة الثانية وهكذا."
     svg_icon_subset: "إضافة 5 أيقونات إضافية من FontAwesome ترغب في تضمينها في أصولك. استخدم البادئة \"-fa\" للرموز الثابتة، و\"-far\" للرموز العادية و\"-fab\" لرموز الوسوم التجارية."
-    max_prints_per_hour_per_user: "الحد الأقصى لعدد مرات ظهور الصفحة /print (اتعيين القيمة على 0 للإيقاف)"
+    max_prints_per_hour_per_user: "الحد الأقصى لعدد مرات ظهور الصفحة /print (اضبط القيمة على 0 لإيقاف الطباعة)"
     full_name_required: "حقل الاسم الكامل مطلوب في الملف الشخصي للمستخدم"
     enable_names: "إظهار الاسم الكامل للمستخدم في ملفه الشخصي وبطاقة المستخدم والرسائل الإلكترونية. يمكنك إيقاف هذا الإعداد لإخفاء الاسم الكامل في كل مكان."
     display_name_on_posts: "إظهار الاسم الكامل للمستخدم في منشوراته بالإضافة إلى اسم المستخدم الخاص به @اسم المستخدم"
@@ -2220,17 +2250,13 @@ ar:
     allowed_href_schemes: "الأنظمة المسموح بها في الروابط بالإضافة إلى http وhttps"
     embed_post_limit: "الحد الأقصى لعدد المنشورات التي سيتم تضمينها"
     embed_username_required: "اسم المستخدم مطلوب لإنشاء الموضوع"
-    notify_about_flags_after: "إرسال رسالة خاصة إلى المشرفين إذا كانت هناك بلاغات لم يتم التعامل معها بعد هذا العدد من الساعات. اتعيين القيمة على 0 للإيقاف."
-    show_create_topics_notice: "إظهار إشعار يطلب من المسؤولين إنشاء بعض الموضوعات إذا كان الموقع يحتوي على أقل من 5 موضوعات عامة"
+    notify_about_reviewable_item_after: "إرسال رسالة شخصية إلى المشرفين إذا كانت هناك عناصر قابلة للمراجعة لم يتم التعامل معها بعد هذا العدد من الساعات. اضبط القيمة على 0 للإيقاف."
     delete_drafts_older_than_n_days: "حذف المسودات الأقدم من (n) يوم"
     delete_merged_stub_topics_after_days: "عدد الأيام التي يجب انتظارها قبل حذف الموضوعات البديلة المدمجة بالكامل تلقائيًا. اتعيين القيمة على 0 لعدم حذف الموضوعات البديلة أبدًا."
-    bootstrap_mode_min_users: "الحد الأدنى لعدد المستخدمين المطلوب لإيقاف وضع التمهيد (اتعيين القيمة على 0 للإيقاف)"
+    bootstrap_mode_min_users: "الحد الأدنى لعدد المستخدمين المطلوب لإيقاف وضع التمهيد (اضبط القيمة على 0 للإيقاف. يمكن أن تستغرق العملية 24 ساعة)"
     prevent_anons_from_downloading_files: "منع المستخدمين المجهولين من تنزيل المرفقات"
-    secure_media: "تم إيقافه: استخدم الإعداد secure_uploads بدلًا من ذلك، ستتم إزالته في Discourse 3.0."
     secure_uploads: 'يقيِّد الوصول إلى كل التحميلات (الصور ومقاطع الفيديو والمقاطع الصوتية والنصوص وملفات PDF وملفات ZIP وغير ذلك). بخلاف ذلك، سيكون الوصول مقيَّدًا فقط لتحميلات الوسائط في الرسائل والفئات الخاصة. تحذير: هذا الإعداد معقَّد ويتطلب فهمًا إداريًا عميقًا. انظر <a target="_blank" href="https://meta.discourse.org/t/-/140017">موضوع التحميلات الآمنة على Meta</a> لمعرفة التفاصيل.'
-    secure_media_allow_embed_images_in_emails: "تم إيقافه: استخدام secure_uploads_allow_embed_images_in_emails، ستتم إزالته في Discourse 3.0."
     secure_uploads_allow_embed_images_in_emails: "يسمح بتضمين الصور الآمنة التي عادةً ما يتم تنقيحها في الرسائل الإلكترونية، إذا كان حجمها أصغر من الإعداد `secure uploads max email embed image size kb`."
-    secure_media_max_email_embed_image_size_kb: "تم إيقافه: استخدام secure_uploads_max_email_embed_image_size_kb، ستتم إزالته في Discourse 3.0."
     secure_uploads_max_email_embed_image_size_kb: "اقتطاع حجم الصور الآمنة التي سيتم تضمينها في الرسائل الإلكترونية إذا تم تفعيل الإعداد `secure uploads allow embed in emails`. سيكون هذا الإعداد بلا أي تأثير دون تفعيله."
     slug_generation_method: "اختيار طريقة إنشاء المسار. سيُنشئ الخيار \"ترميز\" سلسلة ترميز النسبة المئوية، بينما سيوقف الخيار \"لا يوجد\" المسار تمامًا."
     enable_emoji: "تفعيل الرموز التعبيرية"
@@ -2238,6 +2264,7 @@ ar:
     emoji_set: "كيف تفضِّل الرموز التعبيرية الخاصة بك؟"
     emoji_autocomplete_min_chars: "الحد الأدنى لعدد الأحرف المطلوب لتشغيل النافذة المنبثقة الخاصة بالإكمال التلقائي للرموز التعبيرية"
     enable_inline_emoji_translation: "يسمح بتفعيل ترجمة الرموز التعبيرية المضمَّنة (بلا أي مسافات أو علامات ترقيم قبلها)"
+    emoji_deny_list: "لن تكون هذه الرموز التعبيرية متاحة للاستخدام في القوائم أو الرموز القصيرة."
     approve_post_count: "عدد المنشورات التي يجب الموافقة عليها من مستخدم جديد أو أولي"
     approve_unless_trust_level: "ضرورة الموافقة على المنشورات للمستخدمين دون مستوى الثقة هذا"
     approve_new_topics_unless_trust_level: "ضرورة الموافقة على المنشورات للمستخدمين دون مستوى الثقة هذا"
@@ -2292,18 +2319,26 @@ ar:
     default_tags_watching_first_post: "قائمة الوسوم التي سيتم مراقبة أول منشور في كل موضوع جديد فيها بشكلِ افتراضي"
     default_text_size: "حجم النص المحدَّد بشكلٍ افتراضي"
     default_title_count_mode: "الوضع الافتراضي لعداد عنوان الصفحة"
+    enable_offline_indicator: "عرض رسالة للمستخدمين عند اكتشاف عدم وجود اتصال بالشبكة لديهم"
+    default_sidebar_link_to_filtered_list: "جعل روابط قائمة التنقل مرتبطة افتراضيًا بالقائمة قيد التصفية"
+    default_sidebar_show_count_of_new_items: "جعل روابط قائمة التنقل تعرض عدد العناصر الجديدة افتراضيًا بدلًا من الشارات"
+    default_sidebar_switch_panel_position: "موضع أزرار لوحة تبديل الشريط الجانبي"
     retain_web_hook_events_period_days: "عدد أيام الاحتفاظ بسجلات أحداث خطافات الويب"
     retry_web_hook_events: "إعادة المحاولة تلقائيًا 4 مرات لأحداث خطافات الويب التي فشلت. الفجوات الزمنية بين مرات إعادة المحاولة هي 1 و5 و25 و125 دقيقة."
     revoke_api_keys_days: "عدد الأيام قبل إلغاء مفتاح API غير المُستخدَم تلقائيًا (0 للتعيين على \"أبدًا\")"
     allow_user_api_keys: "السماح بإنشاء مفاتيح API للمستخدم"
     allow_user_api_key_scopes: "قائمة النطاقات المسموح بها لمفاتيح API للمستخدم"
-    min_trust_level_for_user_api_key: "مستوى الثقة المطلوب لإنشاء مفاتيح API للمستخدم"
+    min_trust_level_for_user_api_key: |
+      مستوى الثقة المطلوب لإنشاء مفاتيح واجهة برمجة تطبيقات المستخدم<br>
+      <b>تحذير</b>: سيؤدي تغيير مستوى الثقة إلى منع المستخدمين في مستويات الثقة الأقل من تسجيل الدخول عبر Discourse Hub
     allowed_user_api_auth_redirects: "عنوان URL المسموح به لإعادة توجيه المصادقة لمفاتيح API للمستخدم. يمكن استخدام رمز البدل * لمطابقة أي جزء منه (على سبيل المثال،www.example.com/*)."
     allowed_user_api_push_urls: "عناوين URL المسموح لها بإرسال المعلومات إلى API للمستخدم قبل طلبها من الخادم"
     expire_user_api_keys_days: "عدد الأيام قبل انتهاء صلاحية مفتاح API للمستخدم تلقائيًا (0 للتعيين على \"أبدًا\")"
     tagging_enabled: "السماح بالوسوم في الموضوعات؟"
     min_trust_to_create_tag: "الحد الأدنى لمستوى الثقة المطلوب لإنشاء وسم"
     max_tags_per_topic: "الحد الأقصى لعدد الوسوم التي يمكن تطبيقها على موضوع"
+    enable_max_tags_per_email_subject: "استخدام max_tags_per_email_subject عند إنشاء موضوع بريد إلكتروني"
+    max_tags_per_email_subject: "الحد الأقصى لعدد الوسوم التي يمكن وضعها في موضوع الرسالة الإلكترونية"
     max_tag_length: "الحد الأقصى لعدد الأحرف التي يمكن استخدامها في وسم"
     max_tag_search_results: "الحد الأقصى لعدد النتائج التي يتم عرضها عند البحث عن الوسوم"
     max_tags_in_filter_list: "الحد الأقصى لعدد الوسوم التي يتم عرضها في القائمة المنسدلة للتصفية. سيتم عرض الوسوم الأكثر استخدامًا."
@@ -2315,6 +2350,8 @@ ar:
     suppress_overlapping_tags_in_list: "عدم عرض الوسم إذا كانت الوسوم تتطابق تمامًا مع الكلمات الموجودة في عناوين الموضوعات"
     remove_muted_tags_from_latest: "عدم عرض الموضوعات التي تم وضع وسم الكتم فقط عليها في قائمة الموضوعات الحديثة"
     force_lowercase_tags: "فرض استخدام الحروف الصغيرة فقط في جميع الوسوم الجديدة"
+    create_post_for_category_and_tag_changes: "إنشاء منشور صغير بالإجراء الذي تم اتخاذه عند تغيير فئة موضوع أو وسومه"
+    watched_precedence_over_muted: "إرسال إشعار إليَّ بشأن الفئات أو الوسوم التي أراقبها وتنتمي أيضًا إلى الفئات أو الوسوم التي كتمتها"
     company_name: "اسم الشركة"
     governing_law: "القانون المعمول به"
     city_for_disputes: "مدينة النزاعات"
@@ -2329,7 +2366,7 @@ ar:
     enable_sitemap: "إنشاء خريطة موقع لموقعك وتضمينها في ملف robots.txt."
     sitemap_page_size: "عدد عناوين URL المراد تضمينها في كل صفحة من خريطة الموقع. الحد الأقصى: 50.000"
     enable_user_status: "(تجريبي) السماح للمستخدمين بتحديد رسالة حالة مخصَّصة (رمز تعبيري + وصف)."
-    enable_user_tips: "(تجريبي) تفعيل نصائح المستخدم الجديدة التي توضِّح الميزات الرئيسية للمستخدمين"
+    enable_user_tips: "تمكين نصائح المستخدم الجديدة التي توضِّح الميزات الرئيسية للمستخدمين"
     short_title: "سيتم استخدام العنوان القصير على الشاشة الرئيسية للمستخدم، أو المشغِّل، أو الأماكن الأخرى التي قد تكون المساحة فيها محدودة. يجب أن يقتصر على 12 حرفًا."
     dashboard_hidden_reports: "السماح بإخفاء التقارير المحدَّدة من لوحة المعلومات"
     dashboard_visible_tabs: "اختيار علامات التبويب المرئية في لوحة المعلومات"
@@ -2346,11 +2383,15 @@ ar:
     suggest_weekends_in_date_pickers: "تضمين عطلات نهاية الأسبوع (السبت والأحد) في اقتراحات منتقي التاريخ (يمكنك إيقاف هذا الإعداد إذا كنت تستخدم Discouse في أيام الأسبوع فقط؛ أي من الاثنين إلى الجمعة)."
     splash_screen: "يعرض شاشة تحميل مؤقتة أثناء تحميل أصول الموقع"
     navigation_menu: "تحديد قائمة التنقل التي سيتم استخدامها. يمكن للمستخدمين تخصيص الشريط الجانبي وقائمة التنقل في رأس الصفحة. يتوفَّر خيار \"القائمة القديمة\" للتوافق مع الإصدارات السابقة."
-    default_sidebar_categories: "سيتم عرض الفئات المحدَّدة ضمن قسم فئات الشريط الجانبي بشكلٍ افتراضي."
-    default_sidebar_tags: "سيتم عرض الوسوم المحدَّدة ضمن قسم فئات الشريط الجانبي بشكلٍ افتراضي."
-    enable_new_user_profile_nav_groups: "تجريبي: سيتم عرض قائمة التنقل الخاصة بملف تعريف المستخدم الجديد لمستخدمي المجموعات المحدَّدة"
-    enable_experimental_topic_timeline_groups: "تجريبي: سيظهر الجدول الزمني المُعاد تصميمه لمستخدمي المجموعات المحدَّدة"
+    default_navigation_menu_categories: "سيتم عرض الفئات المحدَّدة ضمن قسم فئات قائمة التنقل بشكلٍ افتراضي."
+    default_navigation_menu_tags: "سيتم عرض الفئات المحدَّدة ضمن قسم وسوم قائمة التنقل بشكلٍ افتراضي."
     enable_experimental_hashtag_autocomplete: "تجريبي: استخدم نظام الإكمال التلقائي #hashtag الجديد للفئات والوسوم التي تعرض العنصر المحدَّد بشكلٍ مختلف وحسَّنت نتائج البحث"
+    experimental_new_new_view_groups: 'تجريبي: تمكين قائمة موضوعات جديدة تجمع بين الموضوعات الجديدة وغير المقروءة، ووضع رابط "الكل" في رابط الشريط الجانبي إليها'
+    enable_custom_sidebar_sections: "تجريبي: تمكين أقسام الشريط الجانبي المخصَّصة"
+    experimental_topics_filter: "تجريبي: تمكين مسار تصفية الموضوعات التجريبية في /filter"
+    experimental_search_menu_groups: "تجريبي: تمكين قائمة البحث الجديدة التي تمت ترقيتها لاستخدام glimmer"
+    enable_experimental_lightbox: "تجريبي: استبدال الصور المبسَّطة الافتراضية بالتصميم الذي تم تجديده"
+    page_loading_indicator: "تكوين مؤشر التحميل الذي يظهر في أثناء التنقل في الصفحة داخل Discourse. يكون 'Spinner' مؤشرًا لصفحة كاملة، بينما يعرض 'Slider' شريطًا ضيقًا أعلى الشاشة."
     errors:
       invalid_css_color: "لون غير صالح. أدخِل اسم لون أو قيمة سداسية عشرية."
       invalid_email: "عنوان البريد الإلكتروني غير صالح."
@@ -2376,7 +2417,7 @@ ar:
       pop3_polling_password_is_empty: "يجب عليك تعيين `pop3 polling password` قبل تفعيل استقصاء POP3."
       pop3_polling_authentication_failed: "فشلت مصادقة POP3. يُرجى التحقُّق من بيانات اعتماد pop3 لديك."
       reply_by_email_address_is_empty: "يجب عليك تعيين `reply by email address` قبل تفعيل الرد عن طريق البريد الإلكتروني."
-      email_polling_disabled: "يجب عليك تعيين الاستقصاء اليدوي أو من خلال POP3 قبل تفعيل الرد عن طريق البريد الإلكتروني."
+      email_polling_disabled: "يجب عليك تمكين الاستقصاء اليدوي أو الاستقصاء عبر بروتوكول POP3، أو تمكين أداة الاستقصاء عبر البريد الإلكتروني المخصَّصة قبل تمكين الرد عبر البريد الإلكتروني."
       user_locale_not_enabled: "يجب عليك تفعيل `allow user locale` أولًا قبل تفعيل هذا الإعداد."
       personal_message_enabled_groups_invalid: "يجب عليك تحديد مجموعة واحدة على الأقل لهذا الإعداد. إذا كنت لا تريد أن يقوم أي شخص باستثناء فريق العمل بإرسال الرسائل الشخصية، فاختر مجموعة فريق العمل."
       invalid_regex: "التعبير العادي غير صالح أو غير مسموح به."
@@ -2385,7 +2426,6 @@ ar:
       staged_users_disabled: "يجب عليك تفعيل `staged users` أولًا قبل تفعيل هذا الإعداد."
       reply_by_email_disabled: "يجب عليك تفعيل `reply by email` أولًا قبل تفعيل هذا الإعداد."
       discourse_connect_url_is_empty: "يجب عليك تعيين `discourse connect url` قبل تفعيل هذا الإعداد."
-      discourse_connect_invite_only: "لا يمكنك تفعيل DiscourseConnect والدعوة فقط في الوقت نفسه."
       enable_local_logins_disabled: "يجب عليك تفعيل `enable local logins` أولًا قبل تفعيل هذا الإعداد."
       min_username_length_exists: "لا يمكنك تعيين الحد الأدنى لطول اسم المستخدم على قيمة أطول من أقصر اسم مستخدم (%{username})."
       min_username_length_range: "لا يمكنك تعيين الحد الأدنى ليكون أكبر من الحد الأقصى."
@@ -2407,7 +2447,8 @@ ar:
       search_tokenize_japanese_enabled: "يجب عليك إيقاف 'search_tokenize_japanese' قبل تفعيل هذا الإعداد."
       discourse_connect_cannot_be_enabled_if_second_factor_enforced: "لا يمكنك تفعيل DiscourseConnect في حال فرض المصادقة الثنائية."
       delete_rejected_email_after_days: "لا يمكن تعيين هذا الإعداد على أقل من الإعداد delete_email_logs_after_days أو أكثر من %{max}"
-      invalid_uncategorized_category_setting: "لا يمكن تحديد الفئة غير المصنَّفة إذا كان السماح بالموضوعات غير المصنَّفة غير مسموح به"
+      invalid_uncategorized_category_setting: 'لا يمكن تحديد الفئة "غير المصنَّفة" إذا لم يتم تمكين ''allow uncategorized topics''.'
+      invalid_search_ranking_weights: "القيمة غير صالحة لإعداد الموقع search_ranking_weights. مثال: '{0.1,0.2,0.3,1.0}'. لاحظ أن الحد الأقصى لقيمة كل وزن هو 1.0."
     placeholder:
       discourse_connect_provider_secrets:
         key: "www.example.com"
@@ -2682,7 +2723,6 @@ ar:
     activated_by_staff: "تم التفعيل بواسطة فريق العمل"
     new_user_typed_too_fast: "كتب المستخدم الجديد بسرعة كبيرة"
     content_matches_auto_silence_regex: "يتطابق المحتوى مع التعبير العادي للكتم التلقائي"
-    content_matches_auto_block_regex: "يتطابق المحتوى مع التعبير العادي للحظر التلقائي"
     username:
       short: "يجب ألا يقل عدد الأحرف عن %{min}"
       long: "يجب ألا يزيد عدد الأحرف عن %{max}"
@@ -3395,7 +3435,7 @@ ar:
 
         تم كتم المستخدم الجديد [%{username}](%{user_url}) تلقائيًا بسبب تلقي منشورات %{username} الكثير من البلاغات من المستخدمين.
 
-        يُرجى [مراجعة البلاغات](%{base_url}/admin/flags). إذا تم كتم %{username} بشكلٍ غير صحيح من النشر، فانقر على زر إلغاء الكتم على [صفحة المسؤول لهذا المستخدم](%{user_url}).
+        يُرجى [مراجعة البلاغات](%{base_url}/review). إذا تم كتم %{username} بشكلٍ غير صحيح من النشر، فانقر على زر إلغاء الكتم على [صفحة المسؤول لهذا المستخدم](%{user_url}).
 
         يمكن تغيير هذا الحد من خلال إعدادات الموقع `silence_new_user`.
     spam_post_blocked:
@@ -3435,15 +3475,6 @@ ar:
       title: "تم إيقاف تنزيل الصور البعيدة"
       subject_template: "تم إيقاف تنزيل الصور البعيدة"
       text_body_template: "تم إيقاف الإعداد \"download_remote_images_to_local\" بسبب الوصول إلى حد مساحة القرص في \"download_remote_images_threshold\"."
-    dashboard_problems:
-      title: "مشاكل لوحة المعلومات"
-      subject_template: "نصيحة جديدة بشأن لوحة معلومات موقعك"
-      text_body_template: |
-        لدينا بعض النصائح والتوصيات الجديدة لك بناءً على إعدادات موقعك الحالية.
-
-        [انتقل إلى لوحة معلومات موقعك](%{base_url}/admin) لرؤيتها
-
-        إذا لم ترَ شيئًا في لوحة معلوماتك، فربما يكون عضو آخر في فريق العمل قد اتخذ إجراءً بناءً على هذه النصيحة. يمكن العثور على قائمة بإجراءات فريق العمل في [سجلات إجراءات فريق العمل](%{base_url}/admin/logs/staff_action_logs).
     new_user_of_the_month:
       title: "أنت المستخدم الجديد لهذا الشهر!"
       subject_template: "أنت المستخدم الجديد لهذا الشهر!"
@@ -3488,9 +3519,6 @@ ar:
       many: "تنبيه: نحن نُرسل يوميًا %{count} رسالة إلكترونية كحدٍ أقصى. تحقَّق من الموقع لمعرفة الرسائل التي قد يتم احتجازها. شكرًا على كونك مشهورًا!"
       other: "تنبيه: نحن نُرسل يوميًا %{count} رسالة إلكترونية كحدٍ أقصى. تحقَّق من الموقع لمعرفة الرسائل التي قد يتم احتجازها. شكرًا على كونك مشهورًا!"
     in_reply_to: "ردًا على"
-    unsubscribe:
-      title: "إلغاء الاشتراك"
-      description: "لست مهتمًا بالحصول على هذه الرسائل الإلكترونية؟ لا مشكلة! انقر أدناه لإلغاء الاشتراك على الفور:"
     reply_by_email: "يمكنك [زيارة الموضوع](%{base_url}%{url}) أو الرد على هذه الرسالة الإلكترونية للرد."
     reply_by_email_pm: "[انتقل إلى الرسالة](%{base_url}%{url}) أو قم بالرد على هذه الرسالة الإلكتروني للرد على %{participants}."
     only_reply_by_email: "قم بالرد على هذه الرسالة للرد."
@@ -3791,7 +3819,6 @@ ar:
       liked_received: "تسجيلات الإعجاب المتلقاة"
       new_users: "المستخدمون الجُدد"
       popular_topics: "الموضوعات الرائجة"
-      follow_topic: "تابع هذا الموضوع"
       join_the_discussion: "قراءة المزيد"
       popular_posts: "المنشورات الرائجة"
       more_new: "الجديد لك"
@@ -3977,14 +4004,7 @@ ar:
     title: "لا يمكن تحميل التطبيق"
     offline_page_message: "يبدو أنك غير متصل! يُرجى التحقُّق من اتصال الشبكة وإعادة المحاولة."
   login_required:
-    welcome_message: |
-      ## [مرحبًا بك في %{title}](#welcome)
-      مطلوب حساب. يُرجى إنشاء حساب أو تسجيل الدخول للمتابعة.
-    welcome_message_invite_only: |
-      ## [مرحبًا بك في %{title}](#welcome)
-      مطلوب حساب. يُرجى مطالبة أحد الأعضاء الحاليين بدعوة أو تسجيل الدخول للمتابعة.
-  deleted: "تم الحذف"
-  image: "صورة"
+    welcome_message: "# [مرحبًا بك في %{title}](#welcome)"
   upload:
     edit_reason: "تم تنزيل نسخ محلية من الصور"
     unauthorized: "عذرًا، الملف الذي تحاول تحميله غير مسموح به (الامتدادات المسموح بها: %{authorized_extensions})."
@@ -4088,10 +4108,184 @@ ar:
     body: "<a name=\"civilized\"> ## [هذا مكان متحضر للنقاش العام](#civilized)\n\nيُرجى التعامل مع منتدى المناقشة هذا بالاحترام نفسه الذي تتعامل به في الحديقة العامة. نحن أيضًا مورد مجتمعي مشترك &mdash; مكان لتبادل المهارات والمعارف والاهتمامات من خلال المحادثة المستمرة.\n\nهذه ليست قواعد صارمة وسريعة. إنها مبادئ توجيهية لمساعدة الحكم الإنساني لمجتمعنا والحفاظ على هذا المكان لطيفًا وودودًا للخطاب العام المتحضر.\n\n<a name=\"improve\"></a>\n\n## [تحسين المناقشة](#improve)\n\nساعدنا في جعل هذا مكانًا رائعًا للمناقشة من خلال إضافة شيء إيجابي دائمًا إلى المناقشة، مهما كان صغيرًا. إذا لم تكن متأكدًا من أن منشورك يضيف إلى المحادثة، ففكر فيما تريد قوله وحاول مرة أخرى لاحقًا.\n\nتتمثل إحدى طرق تحسين المناقشة في استكشاف المحادثات الجارية بالفعل. استغرق بعض الوقت في تصفُّح الموضوعات هنا قبل الرد أو البدء في موضوع خاص بك، وستكون لديك فرصة أفضل لمقابلة الآخرين الذين يشاركونك اهتماماتك.\n\nالموضوعات التي تتم مناقشتها هنا تهمنا، ونريدك أن تتصرف كما لو كانت تهمك أيضًا. احترم الموضوعات والأشخاص الذين يناقشونها، حتى لو كنت لا توافق على بعضها.\n\n<a name=\"agreeable\"></a>\n\n## [كُن لطيفًا، حتى عندما لا توافق](#agreeable)\n\nقد ترغب في الرد بمخالفة الرأي. هذا جيد. لكن تذكر أن \"تنتقد الأفكار وليس الأشخاص\". يُرجى تجنُّب:\n\n* التنابز بالألقاب\n* الهجوم الشخصي\n* الرد على نبرة المنشور بدلًا من محتواه الفعلي\n* مخالفة الرأي المتوقعة\n\nبدلًا من ذلك، قدِّم رؤًى عميقة الفكر تعمل على تحسين المحادثة.\n\n<a name=\"participate\"></a>\n\n## [مشاركاتك مهمة](#participate)\n\nتحدِّد المحادثات التي لدينا هنا المناخ العام لكل وافد جديد. ساعدنا في التأثير على مستقبل هذا المجتمع من خلال اختيار المشاركة في المناقشات التي تجعل هذا المنتدى مكانًا مثيرًا للاهتمام &mdash; وتجنَّب أولئك الذين لا يفعلون ذلك.\n\nيوفِّر Discourse الأدوات التي تتيح للمجتمع تحديد أفضل (وأسوأ) المساهمات بشكلٍ جماعي: الإشارات المرجعية وتسجيلات الإعجاب والبلاغات والردود والتعديلات والمراقبة والكتم وما إلى ذلك. استخدم هذه الأدوات لتحسين تجربتك الخاصة وتجربة الآخرين أيضًا.\n\nلنترك مجتمعنا أفضل مما وجدناه.\n\n<a name=\"flag-problems\"></a>\n\n## [إذا رأيت مشكلة، فأبلغ عنها](#flag-problems)\n\nيتمتَّع المشرفون بسلطة خاصة؛ فهم مسؤولون عن هذا المنتدى. وكذلك أنت. فبمساعدتك، يمكن أن يصبح المشرفون ميسرين للمجتمع، وليس مجرد عمال نظافة أو شرطة.\n\nعندما ترى سلوكًا سيئًا، لا ترد. يشجع الرد على السلوك السيئ من خلال الاعتراف به ويستهلك طاقتك ويضيع وقت الجميع. _أبلغ عنه فحسب_. إذا تراكم عدد كافٍ من البلاغات، فسيتم اتخاذ الإجراء، إما تلقائيًا أو عن طريق تدخل المشرف.\n\nللحفاظ على مجتمعنا، يحتفظ المشرفون بالحق في إزالة أي محتوى وأي حساب مستخدم لأي سبب في أي وقت. لا يستعرض المشرفون المنشورات الجديدة؛ ولا يتحمَّل المشرفون ومشغِّلو الموقع أي مسؤولية عن أي محتوى ينشره المجتمع.\n\n<a name=\"be-civil\"></a>\n\n## [كُن متحضرًا دائمًا](#be-civil)\n\nلا شيء يفسد المحادثة الصحية مثل الوقاحة:\n\n* كُن متحضرًا. لا تنشر أي شيء يعتبره أي شخص عاقل مسيئًا أو يحض على الكراهية.\n* حافظ على الأدب. لا تنشر أي شيء فاحش أو جنسي صريح.\n* احترم الآخرين. لا تضايق أو تحزن أي شخص، أو تنتحل صفة الأشخاص، أو تكشف عن معلوماتهم الخاصة.\n* احترم منتدانا. لا تنشر محتوى غير مرغوب فيه أو تفسد المنتدى بأي طريقة أخرى.\n\nهذه ليست مصطلحات محدَّدة ذات تعريفات دقيقة &mdash; تجنَّب حتى _ظهور_ أي من هذه الأشياء. إذا لم تكن متأكدًا، فاسأل نفسك كيف ستشعر إذا ظهر منشورك في الصفحة الأولى لموقع إخباري رئيسي.\n\nهذا منتدى عام، وتقوم محركات البحث بفهرسة هذه المناقشات. حافظ على اللغة والروابط والصور آمنة للعائلة والأصدقاء.\n\n<a name=\"keep-tidy\"></a>\n\n## [حافظ على النظام](#keep-tidy)\n\nابذل جهدًا لوضع الأشياء في مكانها الصحيح؛ حتى نتمكن من قضاء المزيد من الوقت في المناقشة وليس التنظيم. وبالتالي:\n\n* لا تبدأ موضوعًا في فئة خاطئة. يُرجى قراءة تعريفات الفئات.\n* لا تنشر الشيء نفسه في موضوعات متعددة.\n* لا تنشر ردودًا دون وجود محتوى.\n* لا تحوِّل موضوعًا عن طريق تغييره في منتصف الطريق.\n* لا توقِّع منشوراتك &mdash; معلومات ملفك الشخصي مرفقة بكل منشور. \n\nبدلًا من نشر \"+1\" أو \"أتفق\"، استخدم الزر \"أعجبني\". بدلًا من أخذ موضوع موجود في اتجاه مختلف جذريًا، استخدم \"الرد في موضوع متربط\".\n\n<a name=\"stealing\"></a>\n\n## [انشر المحتوى الذي أنشأته بنفسك فقط](#stealing)\n\nلا يجوز لك نشر أي محتوى رقمي يخص شخص آخر دون إذن. لا يجوز لك نشر أوصاف أو روابط أو طرق لسرقة الملكية الفكرية لشخص ما (البرامج أو الفيديوهات أو الملفات الصوتية أو الصور) أو لخرق أي قانون آخر.\n\n<a name=\"power\"></a>\n\n## [بدعمٍ منك](#power)\n\nيتم تشغيل هذا الموقع بواسطة [فريق العمل المحلي](%{base_path}/about) والمستخدمين *أمثالك*؛ أي المجتمع. إذا كانت لديك أي أسئلة أخرى بشأن كيفية عمل الأشياء هنا، فافتح موضوعًا جديدًا في [فئة ملاحظات الموقع](%{base_path}/c/site-feedback) ولنناقشها! إذا كانت هناك مشكلة حرجة أو عاجلة لا يمكن معالجتها من خلال موضوع أو علامة وصفية، فتواصل معنا من خلال [صفحة فريق العمل](%{base_path}/about).\n\n<a name=\"tos\"></a>\n\n## [شروط الخدمة](#tos)\n\nنعم، الحديث القانوني ممل، ولكن يجب علينا حماية أنفسنا &ndash; وبالتبعية حمايتك أنت وبياناتك &ndash; ضد الأشخاص غير الودودين. لدينا [شروط الخدمة](%{base_path}/tos) التي تصف سلوكك (وسلوكنا) والحقوق المتعلقة بالمحتوى والخصوصية والقوانين. لاستخدام هذه الخدمة، يجب أن توافق على الالتزام بشروط الخدمة [TOS](%{base_path}/tos).\n"
   tos_topic:
     title: "شروط الخدمة"
-    body: "تحكم هذه الشروط استخدام منتدى الإنترنت على <%{base_url}>. لاستخدام المنتدى، يجب عليك الموافقة على هذه الشروط مع %{company_name}، وهي الشركة التي تدير المنتدى.\n\nقد تقدِّم الشركة منتجات وخدمات أخرى بشروط مختلفة. تنطبق هذه الشروط على استخدام المنتدى فقط.\n\nانتقل إلى:\n\n- [الشروط المهمة](#heading--important-terms)\n- [أذنك لاستخدام المنتدى](#heading--permission)\n- [شروط استخدام المنتدى](#heading--conditions) - [الاستخدام المقبول](#heading--acceptable-use)\n- [معايير المحتوى](#heading--content-standards)\n- [إنفاذ القانون](#heading--enforcement)\n- [حسابك](#heading--your-account)\n- [محتواك](#heading--your-content)\n- [مسؤوليتك](#heading--responsibility)\n- [إخلاء المسؤولية](#heading--disclaimers)\n- [حدود المسؤولية](#heading--liability)\n- [الملاحظات](#heading--feedback)\n- [الإنهاء](#heading--termination)\n- [النزاعات](#heading--disputes)\n- [الشروط العامة](#heading--general)\n- [التواصل](#heading--contact)\n- [التغييرات](#heading--changes)\n\n<h2 id=\"heading--important-terms\"><a href=\"#heading--important-terms\">الشروط المهمة</a></h2>\n\n***تتضمَّن هذه الشروط عددًا من الأحكام المهمة التي تؤثر على حقوقك ومسؤولياتك، مثل إخلاء المسؤولية في [إخلاء المسؤولية](#heading--disclaimers)، وحدود مسؤولية الشركة تجاهك في [حدود المسؤولية](#heading--liability)، وموافقتك على تغطية الشركة للأضرار الناجمة عن إساءة استخدامك للمنتدى في [المسؤولية عن استخدامك](#heading--responsibility)، واتفاقية التحكيم في النزاعات في [النزاعات](#heading--disputes).***\n\n<h2 id=\"heading--permission\"><a href=\"#heading--permission\">أذنك لاستخدام المنتدى</a></h2>\n\nمع مراعاة هذه الشروط، تمنحك الشركة الإذن باستخدام المنتدى. يجب على الجميع الموافقة على هذه الشروط لاستخدام المنتدى.\n\n<h2 id=\"heading--conditions\"><a href=\"#heading--conditions\">شروط استخدام المنتدى</a></h2>\n\nيخضع إذنك لاستخدام المنتدى للشروط التالية:\n\n1. يجب ألا يقل عمرك عن ثلاثة عشر عامًا.\n\n2. قد لا تتمكن من استخدام المنتدى إذا تواصلت معك الشركة مباشرةً لتخبرك بذلك.\n\n3. يجب عليك استخدام المنتدى وفقًا لسياسة [الاستخدام المقبول](#heading--acceptable-use) و[معايير المحتوى](#heading--content-standards).\n\n<h2 id=\"heading--acceptable-use\"><a href=\"#heading--acceptable-use\">الاستخدام المقبول</a></h2>\n\n1. لا يجوز لك خرق القانون باستخدام المنتدى.\n\n2. لا يجوز لك استخدام أو محاولة استخدام حساب شخص آخر في المنتدى دون الحصول على إذن خاص منه.\n\n3. لا يجوز لك شراء أو بيع أو المتاجرة في أسماء المستخدمين أو غيرها من المعرِّفات الفريدة في المنتدى.\n\n4. لا يجوز لك إرسال إعلانات أو رسائل متسلسلة أو التماسات أخرى من خلال المنتدى، أو استخدام المنتدى لجمع العناوين أو البيانات الشخصية الأخرى لقوائم البريد التجارية أو قواعد البيانات.\n\n5. لا يجوز لك أتمتة الوصول إلى المنتدى أو مراقبة المنتدى، كما هو الحال مع زاحفات الويب أو المكوِّنات الإضافية أو الوظائف الإضافية للمتصفح أو برنامج كمبيوتر آخر ليس متصفح ويب. يمكنك الزحف إلى المنتدى لفهرسته من أجل محرك بحث متاح للجمهور إذا كنت تدير أحدها.\n\n6. لا يجوز لك استخدام المنتدى لإرسال رسائل إلكترونية إلى قوائم التوزيع أو مجموعات الأخبار أو الأسماء المستعارة لبريد جماعي.\n\n7. لا يجوز لك الإيحاء بشكلٍ خاطئ بأنك تابع للشركة أو معتمد منها.\n\n8. لا يجوز لك إنشاء رابط تشعبي للصور أو أي محتوى آخر بلا نص تشعبي على المنتدى ووضعه على صفحات ويب أخرى.\n\n9. لا يجوز لك إزالة أي علامات تُظهِر الملكية الخاصة من المواد التي تقوم بتنزيلها من المنتدى.\n\n10. لا يجوز لك عرض أي جزء من المنتدى على مواقع ويب أخرى داخل \"< iframe >`.\n\n11. لا يجوز لك إيقاف أو تجنُّب أو التحايل على أي قيود أمنية أو قيود على الوصول إلى المنتدى.\n\n12. لا يجوز لك إرهاق البنية التحتية للمنتدى بكمية غير معقولة من الطلبات أو الطلبات المصمَّمة لفرض عبء غير معقول على أنظمة المعلومات التي يقوم عليها المنتدى.\n\n13. لا يجوز لك انتحال شخصية الآخرين من خلال المنتدى.\n\n14. لا يجوز لك تشجيع أو مساعدة أي شخص ينتهك هذه الشروط.\n\n<h2 id=\"heading--content-standards\"><a href=\"#heading--content-standards\">معايير المحتوى</a></h2>\n\n1. لا يجوز لك إرسال محتوى غير قانوني أو مسيء أو ضار بالآخرين إلى المنتدى. يتضمَّن ذلك المحتوى المزعج أو غير المناسب أو المسيء.\n\n2. لا يجوز لك إرسال محتوى إلى المنتدى ينتهك القانون أو ينتهك حقوق الملكية الفكرية لأي شخص أو ينتهك خصوصية أي شخص أو ينتهك الاتفاقيات التي أبرمتها مع الآخرين.\n\n3. لا يجوز لك إرسال محتوى إلى المنتدى يحتوي على تعليمات برمجية خبيثة للكمبيوتر، مثل فيروسات الكمبيوتر أو برامج التجسس.\n\n4. لا يجوز لك إرسال محتوى إلى المنتدى كعنصر نائب فقط لحجز عنوان أو اسم مستخدم معيَّن أو معرِّف فريد آخر.\n\n5. لا يجوز لك استخدام المنتدى للكشف عن معلومات لا يحق لك الكشف عنها، مثل المعلومات السرية أو الشخصية للآخرين.\n\n<h2 id=\"heading--enforcement\"><a href=\"#heading--enforcement\">إنفاذ القانون</a></h2>\n\nيجوز للشركة التحقيق ومقاضاة أي انتهاكات لهذه الشروط إلى أقصى حد يسمح به القانون. ويجوز للشركة إخطار سلطات إنفاذ القانون والتعاون معها في مقاضاة انتهاكات القانون وهذه الشروط.\n\nتحتفظ الشركة بالحق في تغيير المحتوى في المنتدى وتنقيحه وحذفه لأي سبب من الأسباب. إذا كنت تعتقد أن شخصًا ما قد أرسل محتوى إلى المنتدى بما ينتهك هذه الشروط، [فتواصل معنا على الفور](#heading--contact).\n\n<h2 id=\"heading--your-account\"><a href=\"#heading--your-account\">حسابك</a></h2>\n\nيجب عليك إنشاء حساب وتسجيل الدخول إليه لاستخدام بعض ميزات المنتدى.\n\nلإنشاء حساب، يجب عليك تقديم بعض المعلومات عن نفسك. إذا أنشأت حسابًا، فإنك توافق على تقديم عنوان بريد إلكتروني صالح على الأقل، وتحديثه أولًا بأول. يمكنك إغلاق حسابك في أي وقت من خلال مراسلة عنوان البريد الإلكتروني <%{contact_email}>. \n\nأنت توافق على أن تكون مسؤولًا عن جميع الإجراءات التي يتم اتخاذها باستخدام حسابك، سواءً كان مصرحًا بها أم لا، حتى تغلق حسابك أو تخطر الشركة بأن حسابك قد تعرض للاختراق. أنت توافق على إخطار الشركة على الفور إذا كنت تشك في تعرُّض حسابك للاختراق. أنت توافق على تحديد كلمة مرور آمنة لحسابك، والحفاظ على سريتها.\n\nيجوز للشركة تقييد حسابك في المنتدى أو تعليقه أو إغلاقه وفقًا لسياستها في التعامل مع طلبات الإزالة المتعلقة بحقوق الطبع والنشر، أو إذا اعتقدت الشركة بشكلٍ معقول أنك انتهكت أي قاعدة في هذه الشروط.\n\n<h2 id=\"heading--your-content\"><a href=\"#heading--your-content\">محتواك</a></h2>\n\nلا شيء في هذه الشروط يمنح الشركة أي حقوق ملكية في الملكية الفكرية التي تشاركها مع المنتدى، مثل معلومات حسابك أو منشوراتك أو أي محتوى آخر تُرسله إلى المنتدى. لا شيء في هذه الشروط يمنحك أي حقوق ملكية في الملكية الفكرية للشركة أيضًا.\n\nبينك وبين الشركة، تظل المسؤول الوحيد عن المحتوى الذي تُرسله إلى المنتدى. أنت توافق على عدم الإيحاء بشكلٍ خاطئ بأن المحتوى الذي تُرسله إلى المنتدى معتمد من الشركة أو برعايتها. لا تُلزِم هذه الشروط الشركة بتخزين نسخ من المحتوى الذي تُرسله أو تحتفظ بها أو تقدِّمها، أو بتغيير المحتوى وفقًا لهذه الشروط.\n\nالمحتوى الذي ترسله إلى المنتدى ملك لك، وأنت تقرر نوع الإذن الذي تمنحه للآخرين. ولكن على الأقل، أنت تمنح الشركة ترخيصًا بتقديم المحتوى الذي تُرسله إلى المنتدى للمستخدمين الآخرين في المنتدى. يسمح هذا الترخيص الخاص للشركة بنسخ المحتوى الذي تُرسله إلى المنتدى ونشره وتحليله.\n\nعندما تتم إزالة المحتوى الذي تُرسله من المنتدى، سواءً بواسطتك أو بواسطة الشركة، ينتهي الترخيص الخاص للشركة عندما تختفي النسخة الأخيرة من النسخ الاحتياطية، وذاكرة التخزين المؤقت، والأنظمة الأخرى للشركة. قد تستمر التراخيص الأخرى التي تطبِّقها على المحتوى الذي تُرسله، مثل تراخيص [Creative Commons](https://creativecommons.org)، بعد إزالة محتواك. قد تمنح هذه التراخيص للآخرين، أو للشركة نفسها، الحق في مشاركة محتواك من خلال المنتدى مرة أخرى.\n\nقد ينتهك الآخرون الذين يتلقون المحتوى الذي تُرسله إلى المنتدى الشروط التي تمنح بموجبها ترخيصًا لمحتواك. أنت توافق على أن الشركة لن تكون مسؤولة تجاهك عن تلك الانتهاكات أو عواقبها.\n\n<h2 id=\"heading--responsibility\"><a href=\"#heading--responsibility\">مسؤوليتك</a></h2>\n\nأنت توافق على تعويض الشركة بشأن المطالبات القانونية من الآخرين والمتعلقة بخرقك لهذه الشروط، أو خرق هذه الشروط بواسطة آخرين يستخدمون حسابك في المنتدى. توافق أنت والشركة على إخطار الجانب الآخر بأي مطالبات قانونية قد يتعيَّن عليك تعويض الشركة بشأنها في أقرب وقتٍ ممكن. إذا فشلت الشركة في إخطارك بالمطالبة القانونية على الفور، فلن تضطر إلى تعويض الشركة عن الأضرار التي كان بإمكانك الوقوف ضدها أو تخفيفها في حال الإخطار الفوري. أنت توافق على السماح للشركة بقيادة التحقيق والدفاع وتسوية المطالبات القانونية التي يتعيَّن عليك تعويض الشركة بشأنها، والتعاون مع هذه الجهود. توافق الشركة على عدم الموافقة على أي تسوية تقر بخطأك أو تفرض عليك التزامات دون موافقتك المسبقة.\n\n<h2 id=\"heading--disclaimers\"><a href=\"#heading--disclaimers\">إخلاء المسؤولية</a></h2>\n\n***أنت تقبل جميع مخاطر استخدام المنتدى والمحتوى الموجود في المنتدى. بقدر ما يسمح به القانون، ستقدِّم الشركة ومورِّدوها المنتدى كما هو، دون أي ضمان على الإطلاق.***\n\nقد يرتبط المنتدى ارتباطًا تشعبيًا بالمنتديات والخدمات التي يديرها الآخرون ويدمجها. لا تقدِّم الشركة أي ضمانات بشأن الخدمات التي يديرها الآخرون، أو المحتوى الذي قد يقدِّمونه. قد يخضع استخدام الخدمات التي يديرها الآخرون لشروط أخرى بينك وبين الخدمة قيد التشغيل.\n\n<h2 id=\"heading--liability\"><a href=\"#heading--liability\">حدود المسؤولية</a></h2> \n\n***لن تتحمل الشركة أو موردونها المسؤولية تجاهك عن الأضرار التي تلحق بسبب خرق العقد والتي لم يكن بإمكان موظفيها توقُّعها بشكلٍ معقول عند موافقتك على هذه الشروط.***\n\n***بقدر ما يسمح به القانون، ستقتصر المسؤولية الكاملة تجاهك عن المطالبات من أي نوع والتي تتعلق بالمنتدى أو المحتوى في المنتدى على 50 دولارًا.***\n\n<h2 id=\"heading--feedback\"><a href=\"#heading--feedback\">الملاحظات</a></h2>\n\nترحِّب الشركة بملاحظاتك واقتراحاتك لتحسين المنتدى. راجع قسم [التواصل](#heading--contact) أدناه للتعرُّف على طرق التواصل معنا.\n\nأنت توافق على أن الشركة ستكون حرة في التصرف بناءً على الملاحظات والاقتراحات التي تقدِّمها، وأن الشركة لن تضطر إلى إخطارك باستخدام ملاحظاتك أو الحصول على إذن منك لاستخدامها أو الدفع لك. أنت توافق على عدم إرسال ملاحظات أو اقتراحات تعتقد أنها قد تكون سرية أو مملوكة لك أو للآخرين.\n\n<h2 id=\"heading--termination\"><a href=\"#heading--termination\">الإنهاء</a></h2>\n\nيجوز لك أو للشركة إنهاء الاتفاقية المكتوبة في هذه الشروط في أي وقت. وعندما تنتهي اتفاقيتنا، ينتهي إذنك باستخدام المنتدى.\n\nتظل البنود التالية سارية حتى نهاية الاتفاقية: [محتواك](#heading--your-content)، و[الملاحظات](#heading--feedback)، و[مسؤوليتك](#heading--responsibility)، و[إخلاء المسؤولية](#heading--disclaimers)، و[حدود المسؤولية](#heading--liability)، و[الشروط العامة](#heading--general).\n\n<h2 id=\"heading--disputes\"><a href=\"#heading--disputes\">النزاعات</a></h2>\n\nسيحكم %{governing_law} أي نزاع يتعلق بهذه الشروط أو استخدامك للمنتدى.\n\nتوافق أنت والشركة على طلب الإنذارات القضائية المتعلقة بهذه البنود في محكمة الولاية أو المحكمة الفيدرالية في %{city_for_disputes} فقط. ولن تعترض أنت أو الشركة على الاختصاص القضائي أو الساحة أو المكان في تلك المحاكم.\n\n***بخلاف السعي للحصول على أمر قضائي أو المطالبات بموجب قانون الاحتيال وإساءة استخدام الكمبيوتر، ستحل أنت والشركة أي نزاع عن طريق التحكيم المُلزِم الصادر عن جمعية التحكيم الأمريكية. سيتبع التحكيم قواعد التحكيم التجاري والإجراءات التكميلية الخاصة بجمعية التحكيم الأمريكية بشأن المنازعات المتعلقة بالمستهلكين. سيتم إجراء التحكيم في %{city_for_disputes}}. ستقوم بتسوية أي نزاع كفرد، وليس كجزء من دعوى جماعية أو دعوى تمثيلية أخرى، سواءً كنت مدعيًا أو عضوًا في الدعوى. لن يدمج أي محكِّم أي نزاع مع أي تحكيم آخر دون إذن الشركة.***\n\nسيتضمَّن أي قرار تحكيم تكاليف التحكيم وأتعاب المحاماة المعقولة والتكاليف المعقولة للشهود. يجوز لك وللشركة الدخول في قرارات التحكيم في أي محكمة ذات اختصاص.\n\n<h2 id=\"heading--general\"><a href=\"#heading--general\">الشروط العامة</a></h2>\n\nإذا كان أحد أحكام هذه الشروط غير قابل للتنفيذ كما هو مكتوب، ولكن يمكن تغييره لجعله قابلًا للتنفيذ، فإنه يجب تعديل هذا الحكم إلى الحد الأدنى الضروري لجعله قابلًا للتنفيذ. بخلاف ذلك، ينبغي إزالة هذا الحكم.\n\nلا يجوز لك التنازل عن اتفاقيتك مع الشركة. ويجوز للشركة التنازل عن موافقتك إلى أي شركة تابعة للشركة، أو أي شركة أخرى تستولي على الشركة، أو أي شركة أخرى تشتري أصول الشركة المتعلقة بالمنتدى. ليس هناك أي أثر قانوني للتنازل عن هذه الشروط.\n\nلا تؤدي ممارسة أي حق بموجب هذه الاتفاقية أو التنازل عن أي انتهاك لهذه الاتفاقية إلى التنازل عن أي انتهاك آخر لهذه الاتفاقية.\n\nتجسِّد هذه الشروط جميع شروط الاتفاق بينك وبين الشركة بشأن استخدام المنتدى. وتحل هذه الشروط بالكامل محل أي اتفاقيات أخرى بشأن استخدامك للمنتدى، سواءً كانت مكتوبة أو لا.\n\n<h2 id=\"heading--contact\"><a href=\"#heading--contact\">التواصل</a></h2>\n\nيمكنك إخطار الشركة بموجب هذه الشروط، وإرسال الأسئلة إلى الشركة على <%{contact_email}>.\n\nقد تخطرك الشركة بموجب هذه الشروط باستخدام عنوان البريد الإلكتروني الذي تقدِّمه لحسابك في المنتدى، أو عن طريق نشر رسالة على الصفحة الرئيسية للمنتدى أو صفحة حسابك.\n\n<h2 id=\"heading--changes\"><a href=\"#heading--changes\">التغييرات</a></h2>\n\nأجرت الشركة آخر تحديث لهذه الشروط في 12 يوليو 2018، وقد تجري تحديثات أخرى عليها. ستنشر الشركة جميع التحديثات في المنتدى. بالنسبة إلى التحديثات التي تتضمَّن تغييرات جوهرية، توافق الشركة على إرسال رسالة إلكترونية إليك، إذا كنت قد أنشأت حسابًا وقدَّمت عنوان بريد إلكتروني صالحًا. قد تعلن الشركة أيضًا عن التحديثات في رسائل خاصة أو تنبيهات على المنتدى.\n\nبمجرد أن تتلقى إشعارًا بتحديث هذه الشروط، يجب أن توافق على الشروط الجديدة لمواصلة استخدام المنتدى.\n"
+    body: |
+      <h2 id="heading--change-me"><a href="#heading--change-me">امنحني اسمًا</a></h2>
+
+      مسؤول المنتدى، يُرجى الاطلاع أدناه على مثال لقالب البدء لسياسة الخصوصية التي ينبغي لك تخصيصها لتلبية احتياجات موقعك.
+
+      لا تحكم هذه المصطلحات استخدام منتدى الإنترنت على <%{base_url}>، لكنها قد تحكمه يومًا ما. في هذه الحالة، يجب عليك الاتفاق مع <%{company_name}>؛ أي الشركة التي تدير المنتدى، على هذه الشروط لاستخدام المنتدى.
+
+      قد تقدِّم الشركة منتجات وخدمات أخرى، بشروط مختلفة. تنطبق هذه الشروط على استخدام المنتدى فقط.
+
+      انتقل إلى:
+
+      - [مصطلحات مهمة](#heading--important-terms)
+      - [منحك الإذن باستخدام المنتدى](#heading--permission)
+      - [شروط استخدام المنتدى](#heading--conditions)
+      - [الاستخدام المقبول](#heading--acceptable-use)
+      - [معايير المحتوى](#heading--content-standards)
+      - [الإنفاذ](#heading--enforcement)
+      - [حسابك](#heading--your-account)
+      - [محتواك](#heading--your-content)
+      - [مسؤوليتك](#heading--responsibility)
+      - [إخلاء المسؤولية](#heading--disclaimers)
+      - [حدود المسؤولية](#heading--liability)
+      - [الملاحظات](#heading--feedback)
+      - [الإنهاء](#heading--termination)
+      - [النزاعات](#heading--disputes)
+      - [الشروط العامة](#heading--general)
+      - [التواصل](#heading--contact)
+      - [التغييرات](#heading--changes)
+
+      <h2 id="heading--important-terms"><a href="#heading--important-terms">مصطلحات مهمة</a></h2>
+
+      ***تتضمن هذه الشروط عددًا من الأحكام المهمة التي تؤثر على حقوقك ومسؤولياتك، مثل إخلاء المسؤولية في [إخلاء المسؤولية](#heading--disclaimers)، وحدود مسؤولية الشركة تجاهك في [حدود المسؤولية](#heading--liability)، وموافقتك على تغطية الشركة للأضرار الناجمة عن إساءة استخدامك للمنتدى في [المسؤولية عن استخدامك](#heading--responsibility)، والاتفاق على التحكيم في النزاعات في [النزاعات](#heading--disputes).***
+
+      <h2 id="heading--permission"><a href="#heading--permission">منحك الإذن باستخدام المنتدى</a></h2>
+
+      مع مراعاة هذه الشروط، تمنحك الشركة الإذن باستخدام المنتدى. يجب على الجميع الموافقة على هذه الشروط لاستخدام المنتدى.
+
+      <h2 id="heading--conditions"><a href="#heading--conditions">شروط استخدام المنتدى</a></h2>
+
+      يخضع منحك الإذن باستخدام المنتدى للشروط التالية:
+
+      1. يجب ألا يقل عمرك عن ثلاثة عشر عامًا.
+
+      2. لا يجوز لك استخدام المنتدى بعد الآن إذا اتصلت بك الشركة مباشرةً لتخبرك بأنه لا يجوز لك ذلك.
+
+      3. يجب عليك استخدام المنتدى وفقًا لشروط [الاستخدام المقبول](#heading--acceptable-use) و[معايير المحتوى](#heading--content-standards).
+
+      <h2 id="heading--acceptable-use"><a href="#heading--acceptable-use">الاستخدام المقبول</a></h2>
+
+      1. لا يجوز لك خرق القانون باستخدام المنتدى.
+
+      2. لا يجوز لك استخدام أو محاولة استخدام حساب شخص آخر في المنتدى دون الحصول على إذن خاص منه.
+
+      3. لا يجوز لك شراء أو بيع أو المتاجرة بطريقة أخرى في أسماء المستخدمين أو غيرها من المعرِّفات الفريدة في المنتدى.
+
+      4. لا يجوز لك إرسال إعلانات أو رسائل متسلسلة أو طلبات أخرى من خلال المنتدى، أو استخدام المنتدى لجمع عناوين أو بيانات شخصية أخرى لقوائم بريدية أو قواعد بيانات تجارية.
+
+      5. لا يجوز لك أتمتة الوصول إلى المنتدى أو مراقبة المنتدى، مثل استخدام متتبع ارتباطات الويب أو استخدام إضافة أو مكوِّن إضافي أو برنامج كمبيوتر آخر ليس متصفح ويب. يمكنك تسجيل المنتدى في الفهرس من أجل محرك بحث متاح للجمهور، إذا كنت تدير واحدًا.
+
+      6. لا يجوز لك استخدام المنتدى لإرسال رسالة إلكترونية إلى قوائم التوزيع أو مجموعات الأخبار أو الأسماء المستعارة للبريد الجماعي.
+
+      7. لا يجوز لك الإيحاء بشكلٍ خاطئ بأنك تابع للشركة أو معتمد من قِبلها.
+
+      8. لا يجوز لك إنشاء رابط تشعبي لصور أو محتوى آخر غير نص تشعبي في المنتدى على صفحات ويب أخرى.
+
+      9. لا يجوز لك إزالة أي علامات تظهر ملكية خاصة من المواد التي تقوم بتنزيلها من المنتدى.
+
+      10. لا يجوز لك إظهار أي جزء من المنتدى على المواقع الإلكترونية الأخرى باستخدام `<iframe>`.
+
+      11. لا يجوز لك تعطيل أو تجنب أو التحايل على أي قيود أمنية أو قيود وصول خاصة بالمنتدى.
+
+      12. لا يجوز لك إرهاق البنية التحتية للمنتدى بكمية غير معقولة من الطلبات، أو الطلبات المصمَّمة لفرض عبء غير معقول على أنظمة المعلومات التي يقوم عليها المنتدى.
+
+      13. لا يجوز لك انتحال شخصية الآخرين من خلال المنتدى.
+
+      14. لا يجوز لك تشجيع أو مساعدة أي شخص ينتهك هذه الشروط.
+
+      <h2 id="heading--content-standards"><a href="#heading--content-standards">معايير المحتوى</a></h2>
+
+      1. لا يجوز لك إرسال محتوى غير قانوني أو مسيئ أو ضار بالآخرين إلى المنتدى. يتضمن ذلك المحتوى الذي يمثِّل سلوكًا مزعجًا أو غير لائق أو مسيئًا أو بغيضًا.
+
+      2. لا يجوز لك إرسال محتوى إلى المنتدى ينتهك القانون أو ينتهك حقوق الملكية الفكرية لأي شخص أو ينتهك خصوصية أي شخص أو ينتهك الاتفاقيات التي أبرمتها مع الآخرين.
+
+      3. لا يجوز لك إرسال محتوى إلى المنتدى يحتوي على تعليمات برمجية خبيثة للكمبيوتر، مثل فيروسات الكمبيوتر أو برامج التجسس.
+
+      4. لا يجوز لك إرسال محتوى إلى المنتدى كمجرد عنصر نائب، أو للاحتفاظ بعنوان معيَّن أو اسم مستخدم أو معرِّف فريد آخر.
+
+      5. لا يجوز لك استخدام المنتدى للكشف عن معلومات لا يحق لك الكشف عنها، مثل المعلومات السرية أو الشخصية للآخرين.
+
+      <h2 id="heading--enforcement"><a href="#heading--enforcement">الإنفاذ</a></h2>
+
+      يجوز للشركة التحقيق وملاحقة انتهاكات هذه الشروط إلى أقصى حد يسمح به القانون. يجوز للشركة إخطار سلطات إنفاذ القانون والتعاون معها في مقاضاة انتهاكات القانون وهذه الشروط.
+
+      تحتفظ الشركة بالحق في تغيير وتنقيح وحذف المحتوى في المنتدى لأي سبب من الأسباب. إذا كنت تعتقد أن شخصًا ما قد أرسل محتوى إلى المنتدى بما ينتهك هذه الشروط، [فتواصل معنا على الفور](#heading--contact).
+
+      <h2 id="heading--your-account"><a href="#heading--your-account">حسابك</a></h2>
+
+      يجب عليك إنشاء حساب وتسجيل الدخول إليه لاستخدام بعض ميزات المنتدى.
+
+      لإنشاء حساب، يجب عليك تقديم بعض المعلومات عن نفسك. بإنشاء حساب، فإنك توافق على تقديم عنوان بريد إلكتروني صالح على الأقل، وإبقاء ذلك العنوان محدثًا. يمكنك إغلاق حسابك في أي وقت عن طريق البريد الإلكتروني <%{contact_email}>.
+
+      أنت توافق على أن تكون مسؤولًا عن جميع الإجراءات التي يتم اتخاذها باستخدام حسابك، سواءً أكانت مصرحًا بها أم لا، وذلك حتى إغلاق حسابك أو إخطار الشركة بأن حسابك قد تعرَّض للاختراق. أنت توافق على إخطار الشركة على الفور إذا كنت تشك في تعرُّض حسابك للاختراق. أنت توافق على تحديد كلمة مرور آمنة لحسابك، والحفاظ على سريتها.
+
+      يجوز للشركة تقييد حسابك في المنتدى أو تعليقه أو إغلاقه وفقًا لسياستها في التعامل مع طلبات الإزالة المتعلقة بحقوق الطبع والنشر، أو إذا اعتقدت الشركة بشكلٍ معقول أنك انتهكت أي قاعدة في هذه الشروط.
+
+      <h2 id="heading--your-content"><a href="#heading--your-content">محتواك</a></h2>
+
+      لا شيء في هذه الشروط يمنح الشركة أي حقوق ملكية في الملكية الفكرية التي تشاركها مع المنتدى، مثل معلومات حسابك أو منشوراتك أو أي محتوى آخر ترسله إلى المنتدى. لا شيء في هذه الشروط يمنحك أي حقوق ملكية في الملكية الفكرية للشركة أيضًا.
+
+      بينك وبين الشركة، تظل أنت المسؤول الوحيد عن المحتوى الذي ترسله إلى المنتدى. أنت توافق على عدم الإيحاء خطًا بأن المحتوى الذي ترسله إلى المنتدى ترعاه الشركة أو توافق عليه. لا تلزم هذه الشروط الشركة بتخزين أو الاحتفاظ أو توفير نسخ من المحتوى الذي ترسله، وتغييره، وفقًا لهذه الشروط.
+
+      المحتوى الذي ترسله إلى المنتدى ملك لك، وأنت تقرر أي إذن تمنحه للآخرين. لكنك على الأقل ترخِّص للشركة تقديم المحتوى الذي ترسله إلى المنتدى للمستخدمين الآخرين في المنتدى. يسمح هذا الترخيص الخاص للشركة بنسخ ونشر وتحليل المحتوى الذي ترسله إلى المنتدى.
+
+      عند إزالة المحتوى الذي ترسله من المنتدى، سواءً بواسطتك أو بواسطة الشركة، ينتهي الترخيص الخاص للشركة عندما تختفي النسخة الأخيرة من النسخ الاحتياطية للشركة، وذاكرة التخزين المؤقت، والأنظمة الأخرى. قد تستمر التراخيص الأخرى التي تطبقها على المحتوى الذي ترسله، مثل تراخيص [Creative Commons](https://creativecommons.org)، بعد إزالة محتواك. قد تمنح هذه التراخيص للآخرين، أو للشركة نفسها، الحق في مشاركة محتواك عبر المنتدى مرة أخرى.
+
+      قد ينتهك الآخرون الذين يتلقون المحتوى الذي ترسله إلى المنتدى الشروط التي تقوم بموجبها بترخيص محتواك. أنت توافق على أن الشركة لن تكون مسؤولة تجاهك عن تلك الانتهاكات أو عواقبها.
+
+      <h2 id="heading--responsibility"><a href="#heading--responsibility">مسؤوليتك</a></h2>
+
+      أنت توافق على تعويض الشركة عن المطالبات القانونية من قِبل الآخرين فيما يتعلق بخرقك لهذه الشروط، أو خرق هذه الشروط من قِبل الآخرين الذين يستخدمون حسابك في المنتدى. توافق أنت والشركة على إخطار الجانب الآخر بأي مطالبات قانونية قد يتعيَّن عليك تعويض الشركة عنها في أقرب وقتٍ ممكن. إذا فشلت الشركة في إخطارك بالدعوى القانونية على الفور، فلن تضطر إلى تعويض الشركة عن الأضرار التي كان بإمكانك الدفاع عن نفسك ضدها أو تخفيفها بإشعارٍ فوري. أنت توافق على السماح للشركة بالتحكم في التحقيق والدفاع وتسوية الدعاوى القانونية التي يتعيَّن عليك تعويض الشركة عنها، والتعاون مع هذه الجهود. توافق الشركة على عدم الموافقة على أي تسوية تعترف بخطأك أو تفرض عليك التزامات دون موافقتك المسبقة.
+
+      <h2 id="heading--disclaimers"><a href="#heading--disclaimers">إخلاء المسؤولية</a></h2>
+
+      ***أنت تقبل جميع مخاطر استخدام المنتدى والمحتوى الموجود في المنتدى. توفر الشركة ومورِّدوها المنتدى كما هو بالقدر الذي يسمح به القانون، دون أي ضمان على الإطلاق.***
+
+      قد يرتبط المنتدى ارتباطًا تشعبيًا بالمنتديات والخدمات التي يديرها الآخرون ويدمجها. لا تقدِّم الشركة أي ضمانات بشأن الخدمات التي يديرها الآخرون، أو المحتوى الذي قد يقدِّمونه. قد يخضع استخدام الخدمات التي يديرها الآخرون لشروط أخرى بينك وبين الخدمة قيد التشغيل.
+
+      <h2 id="heading--liability"><a href="#heading--liability">حدود المسؤولية</a></h2>
+
+      ***لن تكون الشركة أو مورِّدوها مسؤولين تجاهك عن الأضرار التي تلحق بسبب خرق العقد والتي لم يكن بإمكان موظفيها توقُّعها بشكلٍ معقول عند موافقتك على هذه الشروط.***
+
+      ***بالقدر الذي يسمح به القانون، ستقتصر المسؤولية الكاملة تجاهك عن المطالبات من أي نوع، والتي تتعلق بالمنتدى أو المحتوى في المنتدى، على 50 دولارًا أمريكيًا.***
+
+      <h2 id="heading--feedback"><a href="#heading--feedback">الملاحظات</a></h2>
+
+      ترحِّب الشركة بآرائك واقتراحاتك للمنتدى. راجع قسم [التواصل](#heading--contact) أدناه للتعرف على طرق التواصل معنا.
+
+      أنت توافق على أن الشركة ستكون حرة في التصرف بناءً على الملاحظات والاقتراحات التي تقدِّمِّها، وأن الشركة لن تضطر إلى إخطارك باستخدامها لملاحظاتك أو الحصول على إذن منك لاستخدامها أو الدفع لك. أنت توافق على عدم إرسال ملاحظات أو اقتراحات تعتقد أنها قد تكون سرية أو مملوكة لك أو للآخرين.
+
+      <h2 id="heading--termination"><a href="#heading--termination">الإنهاء</a></h2>
+
+      يجوز لك أو للشركة إنهاء الاتفاقية المكتوبة في هذه الشروط في أي وقت. عندما تنتهي اتفاقيتنا، ينتهي إذنك باستخدام المنتدى.
+
+      تظل البنود التالية سارية حتى نهاية الاتفاقية: [محتواك](#heading--your-content)، [الملاحظات](#heading--feedback)، [مسؤوليتك](#heading--responsibility)، [إخلاء المسؤولية](#heading--disclaimers)، [حدود المسؤولية](#heading--liability)، و[الشروط العامة](#heading--general).
+
+      <h2 id="heading--disputes"><a href="#heading--disputes">النزاعات</a></h2>
+
+      سيحكم %{governing_law} أي نزاع يتعلق بهذه الشروط أو استخدامك للمنتدى.
+
+      توافق أنت والشركة على طلب الإنذارات القضائية المتعلقة بهذه البنود في محكمة الولاية أو المحكمة الفيدرالية في %{city_for_disputes} فقط. لن تعترض أنت أو الشركة على الاختصاص القضائي أو الميدان أو المكان لتلك المحاكم.
+
+      ***بخلاف السعي للحصول على أمر قضائي أو المطالبات بموجب قانون الاحتيال وإساءة استخدام الكمبيوتر، ستقوم أنت والشركة بحل أي نزاع عن طريق التحكيم الملزم لجمعية التحكيم الأمريكية. سيتبع التحكيم قواعد التحكيم التجاري والإجراءات التكميلية الخاصة بجمعية التحكيم الأمريكية بشأن المنازعات المتعلقة بالمستهلكين. سيُجرى التحكيم في %{city_for_disputes}. ستقوم بتسوية أي نزاع كفرد، وليس كجزء من دعوى جماعية أو إجراءات تمثيلية أخرى، سواءً أكنت مدعيًا أو عضوًا في مجموعة. لن يقوم أي محكِّم بدمج أي نزاع مع أي تحكيم آخر دون إذن الشركة.***
+
+      سيتضمن أي قرار تحكيم تكاليف التحكيم وأتعاب المحاماة المعقولة والتكاليف المعقولة للشهود. يجوز لك وللشركة الدخول في قرارات التحكيم في أي محكمة ذات اختصاص.
+
+      <h2 id="heading--general"><a href="#heading--general">الشروط العامة</a></h2>
+
+      إذا كان أحد أحكام هذه الشروط غير قابل للتنفيذ كما هو مكتوب، ولكن يمكن تغييره لجعله قابلًا للتنفيذ، يجب تعديل هذا الحكم إلى الحد الأدنى الضروري لجعله قابلًا للتنفيذ. وبخلاف ذلك، ينبغي إزالة هذا الحكم.
+
+      لا يجوز لك التنازل عن اتفاقيتك مع الشركة. يجوز للشركة التنازل عن موافقتك إلى أي شركة تابعة للشركة، أو أي شركة أخرى تسيطر على الشركة، أو أي شركة أخرى تشتري أصول الشركة المتعلقة بالمنتدى. أي محاولة للتنازل مقابل هذه الشروط ليس لها أي أثر قانوني.
+
+      لا تؤدي ممارسة أي حق بموجب هذه الاتفاقية أو التنازل عن أي خرق لهذه الاتفاقية إلى التنازل عن أي خرق آخر لهذه الاتفاقية.
+
+      تجسد هذه الشروط جميع شروط الاتفاق بينك وبين الشركة حول استخدام المنتدى. تحل هذه الشروط بالكامل محل أي اتفاقيات أخرى حول استخدامك للمنتدى، سواء كانت مكتوبة أم لا.
+
+      <h2 id="heading--contact"><a href="#heading--contact">التواصل</a></h2>
+
+      يمكنك إخطار الشركة بموجب هذه الشروط، وإرسال أسئلة إلى الشركة على <%{contact_email}>.
+
+      قد تقوم الشركة بإخطارك بموجب هذه الشروط باستخدام عنوان البريد الإلكتروني الذي تقدِّمه لحسابك في المنتدى، أو عن طريق إرسال رسالة إلى الصفحة الرئيسية للمنتدى أو صفحة حسابك.
+
+      <h2 id="heading--changes"><a href="#heading--changes">التغييرات</a></h2>
+
+      قامت الشركة بآخر تحديث لهذه الشروط في [INSERT LAST UPDATE DATE HERE]، وقد تقوم بتحديث هذه الشروط مرة أخرى. ستقوم الشركة بنشر جميع التحديثات في المنتدى. بالنسبة إلى التحديثات التي تحتوي على تغييرات جوهرية، توافق الشركة على إرسال رسالة إلكترونية إليك، إذا كنت قد أنشأت حسابًا وأدخلت عنوان بريد إلكتروني صالحًا. قد تعلن الشركة أيضًا عن التحديثات من خلال الرسائل أو التنبيهات الخاصة في المنتدى.
+
+      بمجرد أن تتلقى إشعارًا بتحديث هذه الشروط، يجب أن توافق على الشروط الجديدة من أجل الاستمرار في استخدام المنتدى.
   privacy_topic:
     title: "سياسة الخصوصية"
-    body: "<a name=\"collect\"> </a> \n \n ## [ما المعلومات التي نجمعها؟](#collect)\n\nإننا نجمع معلومات منك عند تسجيلك على موقعنا ونجمع البيانات عند المشاركة في المنتدى من خلال قراءة المحتوى الذي تمت مشاركته هنا وكتابته وتقييمه.\n\nعند التسجيل على موقعنا، قد يُطلَب منك إدخال اسمك وعنوان بريدك الإلكتروني. ومع ذلك، يمكنك زيارة موقعنا دون التسجيل. سيتم التحقُّق من عنوان بريدك الإلكتروني عن طريق رسالة إلكترونية تحتوي على رابط فريد. إذا تمت زيارة هذا الرابط، فسنعلم أنك تتحكم في عنوان البريد الإلكتروني.\n\nعند التسجيل والنشر، نسجِّل عنوان IP الذي تم إنشاء المنشور من خلاله. قد نحتفظ أيضًا بسجلات الخادم التي تتضمَّن عنوان IP لكل طلب يتم إرساله إلى خادمنا.\n\n<a name=\"use\"> </a>\n\n## [كيف نستخدم معلوماتك الخاصة؟](#use)\n\nيمكن استخدام أي من المعلومات التي نجمعها منك بإحدى الطرق التالية:\n\n* لتخصيص تجربتك - تساعدنا معلوماتك على الاستجابة بشكلٍ أفضل لاحتياجاتك الفردية.\n* لتحسين موقعنا - نحن نسعى باستمرار لتحسين عروض موقعنا بناءً على المعلومات والتعليقات التي نتلقاها منك.\n* لتحسين خدمة العملاء - تساعدنا معلوماتك على الاستجابة بشكلٍ أكثر فعالية لطلبات خدمة العملاء واحتياجات الدعم.\n* لإرسال رسائل بريد إلكتروني دورية - يمكن استخدام عنوان البريد الإلكتروني الذي تقدِّمه لإرسال المعلومات والإشعارات التي تطلبها بشأن التغييرات التي تطرأ على الموضوعات أو ردًا على اسم المستخدم الخاص بك أو الاستفسارات أو الطلبات أو الأسئلة الأخرى.\n\n<a name=\"protect\"></a>\n\n## [كيف نحمي معلوماتك؟](#protect)\n\nنحن ننفذ مجموعة متنوعة من الإجراءات الأمنية للحفاظ على سلامة المعلومات الشخصية عند دخولك إلى معلوماتك الشخصية أو إرسالها أو الوصول إليها.\n\n<a name=\"data-retention\"> </a>\n\n## [ما سياسة الاحتفاظ بالبيانات لديك؟](#data-retention)\n\nسنبذل قصارى جهدنا من أجل:\n\n* الاحتفاظ بسجلات الخادم التي تحتوي على عنوان IP لجميع الطلبات إلى هذا الخادم لمدة لا تزيد عن 90 يومًا.\n* الاحتفاظ بعناوين IP المرتبطة بالمستخدمين المسجَّلين ومنشوراتهم لمدة لا تزيد عن 5 سنوات.\n\n<a name=\"cookies\"> </a> \n\n## [هل نحن استخدام ملفات تعريف الارتباط؟](#cookies)\n\nنعم. ملفات تعريف الارتباط هي ملفات صغيرة ينقلها الموقع أو مقدِّم الخدمة إلى محرك الأقراص الثابتة بجهاز الكمبيوتر الخاص بك من خلال متصفح الويب (إذا سمحت بذلك). تمكِّن ملفات تعريف الارتباط هذا الموقع من التعرُّف على متصفحك، وربطه بحسابك المسجَّل إذا كان لديك واحد.\n\nإننا نستخدم ملفات تعريف الارتباط لفهم تفضيلاتك وحفظها للزيارات المستقبلية وتجميع البيانات المجمَّعة بشأن زيارات الموقع والتفاعل معه حتى نتمكَّن من تقديم تجارب وأدوات أفضل للموقع في المستقبل. بجوز لنا التعاقد مع مقدِّمي خدمة خارجيين لمساعدتنا في فهم زوار موقعنا بشكلٍ أفضل. لا يُسمَح لمقدِّمي الخدمات هؤلاء باستخدام المعلومات التي تم جمعها نيابةً عنا إلا لمساعدتنا في إدارة أعمالنا وتحسينها.\n\n<a name=\"disclose\"> </a>\n\n## [هل نفصح عن أي معلومات لجهات خارجية؟](#disclose)\n\nإننا لا نبيع معلوماتك الشخصية لجهات خارجية أو نتاجر بها أو ننقلها. لا يشمل ذلك الجهات الخارجية الموثوقة التي تساعدنا في تشغيل موقعنا أو إدارة أعمالنا أو تقديم الخدمات لك ما دامت هذه الأطراف توافق على الحفاظ على سرية هذه المعلومات. يجوز لنا أيضًا الإفصاح عن معلوماتك عندما نعتقد أن الكشف عنها هو التصرف الصحيح للامتثال للقانون أو فرض سياسات موقعنا أو حماية حقوقنا أو حقوق الآخرين أو ممتلكاتنا أو سلامتنا. ومع ذلك، يمكن تقديم معلومات الزائر غير الشخصية إلى جهات أخرى للتسويق أو الإعلان أو استخدامات أخرى.\n\n<a name=\"third-party\"></a>\n\n## [الروابط التابعة لجهات الخارجية](#third-party)\n\nيجوز لنا في بعض الأحيان، ووفقًا لتقديرنا، تضمين أو تقديم منتجات أو خدمات تابعة لجهات خارجية على موقعنا. تملك مواقع الجهات الخارجية هذه سياسات خصوصية منفصلة ومستقلة. لذلك، لا نتحمل أي مسؤولية أو التزام تجاه محتوى هذه المواقع وأنشطتها. ومع ذلك، فإننا نسعى لحماية سلامة موقعنا ونرحب بأي ملاحظات بشأن هذه المواقع.\n\n<a name=\"coppa\"></a>\n\n## [قانون حماية خصوصية الأطفال على الإنترنت](#coppa)\n\nيتم توجيه موقعنا ومنتجاتنا وخدماتنا جميعها إلى الأشخاص الذين تبلغ أعمارهم 13 عامًا على الأقل أو أكبر. إذا كان هذا الخادم في الولايات المتحدة، وكان عمرك أقل من 13 عامًا، وفقًا لمتطلبات COPPA ([قانون حماية خصوصية الأطفال على الإنترنت](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act))، فلا تستخدم هذا الموقع.\n\n<a name=\"online\"></a>\n\n## [سياسة الخصوصية على الإنترنت فقط](#online)\n\nتنطبق سياسة الخصوصية على الإنترنت فقط على المعلومات التي يتم جمعها من خلال موقعنا وليس على المعلومات التي يتم جمعها في وضع عدم الاتصال.\n\n<a name=\"consent\"></a>\n\n## [موافقتك](#consent)\n\nباستخدام موقعنا، فإنك توافق على سياسة الخصوصية لموقع الويب الخاص بنا.\n\n<a name=\"changes\"> </a>\n\n## [التغييرات في سياسة الخصوصية لدينا](#changes)\n\nإذا قررنا تغيير سياسة الخصوصية لدينا، فسننشر التغييرات على هذه الصفحة.\n\nهذا المستند هو CC-BY-SA. وتم تحديثه آخر مرة في 31 مايو 2013.\n"
   badges:
     mass_award:
       errors:
@@ -4420,10 +4614,8 @@ ar:
       message: "<p> لقد أعدنا إرسال الرسالة الإلكترونية للتنشيط إلى <b>%{email}</b>"
   safe_mode:
     title: "الدخول إلى الوضع الآمن"
-    description: "يسمح لك الوضع الآمن باختبار موقعك دون تحميل المكوِّنات الإضافية أو السمات."
+    description: "يسمح لك الوضع الآمن باختبار موقعك دون تحميل السمات أو تخصيصات المكونات الإضافية من جانب العميل. تظل تخصيصات المكونات الإضافية من جانب الخادم قيد التمكين."
     no_themes: "إيقاف السمات ومكوِّنات السمات"
-    no_unofficial_plugins: "إيقاف المكوِّنات الإضافية غير الرسمية"
-    no_plugins: "إيقاف كل المكوِّنات الإضافية"
     enter: "الدخول إلى الوضع الآمن"
     must_select: "يجب عليك تحديد خيار واحد على الأقل للدخول إلى الوضع الآمن."
   wizard:
@@ -4538,7 +4730,6 @@ ar:
           <p>استمتع، وحظًا سعيدًا في <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>بناء مجتمعك الجديد!</a></p>
   search_logs:
     graph_title: "عدد مرات البحث"
-  joined: "تاريخ الانضمام"
   discourse_push_notifications:
     popup:
       mentioned: 'أشار %{username} إليك في "%{topic}" - %{site_title}'
@@ -4605,50 +4796,31 @@ ar:
         category: إعدادات الفئة
     actions:
       agree:
-        title: "الموافقة..."
-      agree_and_keep:
-        title: "الاحتفاظ بالمنشور"
-        description: "الموافقة على البلاغ والاحتفاظ بالمنشور دون تغيير"
-      agree_and_keep_hidden:
-        title: "إبقاء المنشور مخفيًا"
-        description: "الموافقة على البلاغ وترك المنشور مخفيًا"
+        title: "نعم"
       agree_and_suspend:
-        title: "تعليق المستخدم"
         description: "الموافقة على البلاغ وتعليق المستخدم"
       agree_and_silence:
-        title: "كتم المستخدم"
         description: "الموافقة على البلاغ وكتم المستخدم"
       agree_and_restore:
-        title: "استعادة المنشور"
         description: "استعادة المنشور حتى يتمكن جميع المستخدمين من رؤيته"
-      agree_and_hide:
-        title: "إخفاء المنشور"
-        description: "إخفاء هذا المنشور وإرسال رسالة إلى المستخدم تلقائيًا تحثه فيها على تعديله"
       delete_single:
         title: "حذف"
       delete:
         title: "الحذف..."
       delete_and_ignore:
-        title: "حذف المنشور والتجاهل"
-        description: "حذف المنشور؛ وحذف الموضوع أيضًا إذا كان المنشور الأول"
+        title: "تجاهل البلاغ وحذف المنشور"
       delete_and_ignore_replies:
-        title: "حذف المنشور + الردود والتجاهل"
-        description: "حذف المنشور وجميع الردود عليه؛ وحذف الموضوع أيضًا إذا كان المنشور الأول"
         confirm: "هل تريد بالتأكيد حذف الردود على المنشور أيضًا؟"
-      delete_and_agree:
-        title: "حذف المنشور والموافقة"
-        description: "حذف المنشور؛ وحذف الموضوع أيضًا إذا كان المنشور الأول"
       delete_and_agree_replies:
-        title: "حذف المنشور + الردود والموافقة"
-        description: "حذف المنشور وجميع الردود عليه؛ وحذف الموضوع أيضًا إذا كان المنشور الأول"
         confirm: "هل تريد بالتأكيد حذف الردود على المنشور أيضًا؟"
       disagree_and_restore:
-        title: "عدم الموافقة واستعادة المنشور"
         description: "استعادة المنشور حتى يتمكن جميع المستخدمين من رؤيته"
       disagree:
-        title: "عدم الموافقة"
+        title: "لا"
       ignore:
         title: "تجاهل"
+      ignore_and_do_nothing:
+        title: "عدم اتخاذ أي إجراء"
       approve:
         title: "الموافقة"
       approve_post:
diff --git a/config/locales/server.be.yml b/config/locales/server.be.yml
index cdc39908841..32f2b1cc6a0 100644
--- a/config/locales/server.be.yml
+++ b/config/locales/server.be.yml
@@ -328,10 +328,6 @@ be:
           attributes:
             execute_at:
               in_the_past: "павінна быць у будучыні."
-        translation_overrides:
-          attributes:
-            value:
-              invalid_interpolation_keys: 'Наступны раздзел (ы) інтэрпаляцыі з''яўляюцца недапушчальнымі: "%{keys}"'
         watched_word:
           attributes:
             word:
@@ -343,7 +339,6 @@ be:
   meta_category_description: "Абмеркаванне гэтага сайта, яго арганізацыя, як яна працуе, і як мы можам палепшыць яго."
   staff_category_name: "персанал"
   staff_category_description: "Асобная катэгорыя для абмеркавання персаналу. Тэмы бачныя толькі адміністратарам і мадэратарам."
-  admin_quick_start_title: "READ ME FIRST: Адміністратар Quick Start Guide"
   category:
     topic_prefix: "Аб %{category} катэгорыі"
     replace_paragraph: "(Замяніце гэты першы абзац з кароткім апісаннем вашай новай катэгорыі. Дадзеная падказка будзе адлюстроўвацца ў катэгорыі вобласці выбару, таму паспрабуйце умясціць яго ў 200 літар.)"
@@ -918,7 +913,6 @@ be:
     mobile_logo: "Лагатып выкарыстоўваецца на мабільную версію сайта. Выкарыстоўвайце шырокае прамавугольнае малюнак з вышынёй 120 і суадносінамі бакоў больш, чым 3: 1. Калі пакінуць пустым, то будзе выкарыстоўвацца малюнак з `налады logo`."
     large_icon: "Малюнак выкарыстоўваецца ў якасці асновы для іншых абразкоў метададзеных. Калі ў ідэале быць больш, чым 512 х 512. Калі пакінуць пустым, logo_small будзе выкарыстоўвацца."
     manifest_icon: "Малюнак выкарыстоўваецца ў якасці лагатыпа"
-    apple_touch_icon: "Значок выкарыстоўваецца для сэнсарных прылад Apple. Будзе аўтаматычна змяняць памер 180x180. Калі пакінуць пустым, то будзе выкарыстоўвацца вялікі значок."
     opengraph_image: "Па змаўчанні адкрытага графіка малюнка выкарыстоўваецца, калі старонка не мае іншае падыходнае малюнка. Калі пакінуць пустым, то будзе выкарыстоўвацца вялікі значок"
     notification_email: "Ад: адрас электроннай пошты выкарыстоўваецца пры адпраўцы ўсе неабходныя сістэмы электроннай пошты. Дамен, паказаны тут павінен мець SPF, DKIM і зваротны PTR запісы зададзены правільна для электроннай пошты, каб прыбыць."
     email_custom_headers: "Труба косак спісу карыстацкіх загалоўкаў паведамленняў электроннай пошты"
@@ -1074,7 +1068,6 @@ be:
     tl3_promotion_min_duration: "Мінімальная колькасць дзён, што прасоўванне па службе давяраць 3-га ўзроўню доўжыцца да таго, як карыстальнік можа быць паніжаны назад давяраць 2-га ўзроўню."
     tl3_requires_likes_given: "Мінімальная колькасць падобных, якія павінны быць прадастаўлены ў мінулым (перыяд часу TL3) дзён, каб прэтэндаваць на прасоўванне давяраць 3-га ўзроўню."
     tl3_requires_likes_received: "Мінімальная колькасць падобных, якія павінны быць атрыманы ў мінулым (перыяд часу TL3) дзён, каб прэтэндаваць на прасоўванне давяраць 3-га ўзроўню."
-    trusted_users_can_edit_others: "Дазволіць карыстальнікам з высокім узроўнем даверу для рэдагавання змесціва ад іншых карыстальнікаў"
     min_trust_to_create_topic: "Мінімальны ўзровень даверу, неабходны для стварэння новай тэмы."
     allow_flagging_staff: "Калі гэты параметр уключаны, карыстальнікі могуць сцяжкоў з рахункаў супрацоўнікаў."
     min_trust_to_edit_wiki_post: "Мінімальны ўзровень даверу патрабуецца адрэдагаваць запіс пазначаецца як віка."
@@ -1098,7 +1091,6 @@ be:
     title_min_entropy: "Мінімальная энтрапія (унікальныя сімвалы, не англійская граф больш) патрабуецца для назвы тэмы."
     body_min_entropy: "Мінімальная энтрапія (унікальныя сімвалы, не англійская лічыльнік для больш), неабходнай для паштовага цела."
     allow_uppercase_posts: "Вырашыць усе загалоўныя літары ў тэме назвы ці паштовага цела."
-    max_consecutive_replies: "Колькасць паведамленняў карыстальнік павінен зрабіць запар у тэме перад тым, як прадухіліць даданне іншага адказу."
     min_title_similar_length: "Мінімальная даўжыня загалоўка, перш чым ён будзе правераны на падобныя тэмы."
     desktop_category_page_style: "Візуальны стыль для"
     category_colors: "Спіс шаснаццатковых значэнняў колеру дапускаецца для катэгорый."
@@ -1149,7 +1141,6 @@ be:
     pop3_polling_username: "Імя карыстальніка для POP3 ўліковага запісу для апытання па электроннай пошце."
     pop3_polling_password: "Пароль для POP3 ўліковага запісу для апытання па электроннай пошце."
     pop3_polling_delete_from_server: "Выдаленне паведамленняў электроннай пошты з сервера. Заўвага: Калі адключыць гэта неабходна ўручную ачысціць ваш паштовую скрыню"
-    email_in: 'Дазволіць карыстальнікам ствараць новыя тэмы па электроннай пошце (патрабуецца ўручную або pop3 апытання). Настройка адрасы на ўкладцы «Настройкі» кожнай катэгорыі.'
     email_in_min_trust: "Мінімальны ўзровень даверу неабходны карыстачу прыйдзецца мець магчымасць ствараць новыя тэмы па электроннай пошце."
     email_in_spam_header: "Загаловак электроннай пошты для выяўлення спаму."
     email_prefix: "[Пазнака] выкарыстоўваецца ў тэме лістоў. Гэта будзе па змаўчанні «тытул», калі не ўсталяваны."
@@ -1203,8 +1194,6 @@ be:
     disable_system_edit_notifications: "Адключае рэдагаваць апавяшчэння карыстальніка сістэмы, калі «download_remote_images_to_local» актыўна."
     automatically_unpin_topics: "Аўтаматычна распушчае мацаваньне тэмы, калі карыстальнік дасягае дна."
     read_time_word_count: "Колькасць слоў у хвіліну для разліку разліковага часу чытання."
-    native_app_install_banner_ios: "Адлюстроўвае DiscourseHub прыкладанне банэр на IOS прылад для звычайных карыстальнікаў (мэтавай ўзровень 1 і вышэй)."
-    native_app_install_banner_android: "Адлюстроўвае DiscourseHub прыкладання банера на Android прылад для звычайных карыстальнікаў (мэтавай ўзровень 1 і вышэй)."
     share_anonymized_statistics: "Доля ананімнай статыстыкі выкарыстання."
     auto_handle_queued_age: "Аўтаматычна апрацоўваць запісы, якія чакаюць быць перагледжаны пасля гэтага шмат дзён. Сцягі будуць ігнаравацца. Паведамленні і якія знаходзяцца ў чарзе карыстальнікі будуць адпрэчаны. Усталюйце 0, каб адключыць гэтую функцыю."
     svg_icon_subset: "Даданне дадатковых FontAwesome 5 абразкоў, якія вы хацелі б уключыць у вашых актывах. Выкарыстоўвайце прэфікс «fa-» для цвёрдых абразкоў, «далёка» для звычайных абразкоў і «FAB-» для значкоў брэнда."
@@ -1220,10 +1209,7 @@ be:
     allowed_href_schemes: "Схемы дазволілі ў сувязі ў дадатак да HTTP і HTTPS."
     embed_post_limit: "Максімальную колькасць паведамленняў для ўбудавання."
     embed_username_required: "Імя карыстальніка для стварэння тэмы патрабуецца."
-    notify_about_flags_after: "Калі ёсць сцягі, якія не былі апрацаваны пасля гэтага шмат гадзін, адправіць асабістае паведамленне для мадэратараў. Усталюйце 0, каб адключыць."
-    show_create_topics_notice: "Калі сайт мае менш за 5 грамадскія тэма, паказаць апавяшчэнне з просьбай адмін стварыць некаторыя тэмы."
     delete_drafts_older_than_n_days: "Выдаліць чарнавікі старэй (п) дзён."
-    bootstrap_mode_min_users: "Мінімальная колькасць карыстальнікаў, неабходных для адключэння рэжыму пачатковай загрузкі (вызначана нацыянальным 0, каб адключыць)"
     slug_generation_method: "Выбар спосабу генерацыі кулі. «Закадаваны» будзе генераваць працэнт радок кадавання. «Ніхто» не адключыць смоўж наогул."
     enable_emoji: "ўключыць смайлікі"
     enable_emoji_shortcuts: "Агульны смайлік тэкст, такія як :): р :( будзе ператвораны ў смайлікі"
@@ -1269,7 +1255,6 @@ be:
     retry_web_hook_events: "Аўтаматычна паўтараць няўдалы вэб гаплікі падзея ў 4 разы. прамежкі часу паміж паўторнымі роўныя 1, 5, 25 і 125 хвілін."
     allow_user_api_keys: "Дазволіць генерацыю ключоў API карыстацкіх"
     allow_user_api_key_scopes: "Спіс абласцей дазволена для ключоў карыстальнікаў API"
-    min_trust_level_for_user_api_key: "ўзровень даверу, неабходны для генерацыі ключоў API карыстацкіх"
     allowed_user_api_auth_redirects: "Дазволена URL для праверкі сапраўднасці перасылак для ключоў карыстальнікаў API. Зорачкі * Джокер можа быць выкарыстаны, каб адпавядаць любой яго часткі (напрыклад, www.example.com"
     allowed_user_api_push_urls: "Дазволеныя URL-адрас для сервера штуршка да карыстацкага API"
     tagging_enabled: "Ўключыць тэг на тэмы?"
@@ -1298,7 +1283,6 @@ be:
       pop3_polling_password_is_empty: "Вы павінны ўсталяваць «pop3 апытання пароль» перад уключэннем POP3 апытання."
       pop3_polling_authentication_failed: "Праверка сапраўднасці POP3 не ўдалося. Калі ласка, праверце свае ўліковыя дадзеныя pop3."
       reply_by_email_address_is_empty: "Вы павінны ўсталяваць «адказ на адрас электроннай пошты», перад тым як уключыць адказ па электроннай пошце."
-      email_polling_disabled: "Вы павінны ўключыць альбо ўручную або POP3 апытанне перад уключэннем адказу па электроннай пошце."
       user_locale_not_enabled: "Вы павінны спачатку ўключыць «дазволіць рэгіянальныя налады карыстальніка» перад уключэннем гэтага параметру."
       invalid_regex: "Regex з'яўляецца несапраўдным або не дапускаецца."
       email_editable_enabled: "Вы павінны адключыць «электронную пошту рэдагуемы» перад уключэннем гэтага параметру."
@@ -1379,7 +1363,6 @@ be:
     deactivated_by_staff: "Дэактываваны персаналам"
     activated_by_staff: "Актываваны персаналам"
     new_user_typed_too_fast: "Новы карыстальнік надрукаваў занадта хутка"
-    content_matches_auto_block_regex: "Змест адпавядае аўтаматычнай блакаванні рэгулярных выразаў"
     username:
       too_long: "занадта доўга"
       unique: "павінен быць унікальным"
@@ -1644,8 +1627,6 @@ be:
     user_automatically_silenced:
       title: "Карыстальнік аўтаматычна глушыцелем"
       subject_template: "Новы карыстальнік% {імя карыстальніка} прыціхлі абшчына сцягамі"
-      text_body_template: |
-        Гэта аўтаматычнае паведамленне.Новы карыстальнік [% {імя карыстальніка}] (% {user_url}) быў аўтаматычна прыціхлі, таму што некалькі карыстальнікаў заўважана% {імя карыстальніка} пост (ы) 's.Калі ласка [праглядзець сцягі] (% {base_url}
     spam_post_blocked:
       title: "Спам паведамленне Blocked"
       subject_template: "Новы карыстальнік% {імя карыстальніка} паведамленняў заблякаваныя з-за паўтаральных звёнаў"
@@ -1664,9 +1645,6 @@ be:
       title: "Загрузіць выдаленыя выявы з абмежаванымі фізічнымі магчымасцямі"
       subject_template: "Загрузка аддаленых малюнкаў адключаная"
       text_body_template: "The `download_remote_images_to_local` setting was disabled because the disk space limit at `download_remote_images_threshold` was reached."
-    dashboard_problems:
-      title: "праблемы Dashboard"
-      subject_template: "Новыя рэкамендацыі на вашым сайце прыборнай панэлі"
     new_user_of_the_month:
       title: "Вы новы карыстальнік месяцы!"
       subject_template: "Вы новы карыстальнік месяцы!"
@@ -1693,9 +1671,6 @@ be:
   user_notifications:
     previous_discussion: "папярэднія адказы"
     in_reply_to: "У адказ на"
-    unsubscribe:
-      title: "Адмовіцца ад падпіскі"
-      description: "Не зацікаўленыя ў атрыманні гэтых лістоў? Няма праблем! Націсніце ніжэй, каб адмовіцца ад падпіскі імгненна:"
     reply_by_email: "[Visit Topic](%{base_url}%{url}) or reply to this email to respond."
     reply_by_email_pm: "[Visit Message](%{base_url}%{url}) or reply to this email to respond to %{participants}."
     only_reply_by_email: "Адказаць на гэтае паведамленне, каб адказаць."
@@ -1910,7 +1885,6 @@ be:
       liked_received: "сімпатыі"
       new_users: "новыя карыстальнікі"
       popular_topics: "папулярныя тэмы"
-      follow_topic: "Сачыць за тэмай"
       join_the_discussion: "Чытаць далей"
       popular_posts: "Папулярныя паведамленні"
       more_new: "Новае для вас"
@@ -2010,13 +1984,6 @@ be:
   offline:
     title: "Не ўдаецца загрузіць дадатак"
     offline_page_message: "Падобна на тое, што вы знаходзіцеся ў аўтаномным рэжыме! Калі ласка, праверце падключэнне да сеткі і паспрабуйце ізноў."
-  login_required:
-    welcome_message: |
-      ## [Сардэчна запрашаем% {назву}] (# вітаецца)Рахунак. Калі ласка, стварыце ўліковы запіс або ўвайсці ў сістэму, каб працягнуць.
-    welcome_message_invite_only: |
-      ## [Сардэчна запрашаем% {назву}] (# вітаецца)Рахунак. Калі ласка, звярніцеся існуючы элемент для запрашэння або ўвайсці ў сістэму, каб працягнуць.
-  deleted: "аддалены"
-  image: "малюнак"
   upload:
     edit_reason: "загружаныя лакальныя копіі малюнкаў"
     unauthorized: "Sorry, the file you are trying to upload is not authorized (authorized extensions: %{authorized_extensions})."
@@ -2090,8 +2057,6 @@ be:
     title: "Ўмовы абслугоўвання"
   privacy_topic:
     title: "Палітыка прыватнасці"
-    body: |
-      <a name="collect"> <
   badges:
     editor:
       name: рэдактар
@@ -2355,8 +2320,6 @@ be:
       message: "<Р> Мы паўторна адправілі ліст актывацыі на <б>% {электроннай пошты} <"
   safe_mode:
     title: "Калі ласка, увядзіце бяспечны рэжым"
-    no_unofficial_plugins: "Адключыць неафіцыйны убудовы"
-    no_plugins: "Адключыць усе ўбудовы"
     enter: "Уваход у бяспечным рэжыме"
     must_select: "Вы павінны выбраць, па меншай меры, адзін параметр, каб увайсці ў бяспечным рэжыме."
   wizard:
@@ -2407,7 +2370,6 @@ be:
         title: "Ваш Дыскурс гатова!"
   search_logs:
     graph_title: "пошук граф"
-  joined: "рэгістрацыя"
   discourse_push_notifications:
     popup:
       mentioned: '% {Імя карыстальніка} згадаў вас у "% {} тэме" -% {SITE_TITLE}'
@@ -2434,45 +2396,25 @@ be:
     conflict: "Быў абнаўленне канфлікт перашкаджае вам рабіць гэта."
     actions:
       agree:
-        title: "Пагадзіцеся ..."
-      agree_and_keep:
-        title: "трымаеце пост"
-        description: "Пагадзіцеся са сцягамі і трымаць пост без зменаў."
+        title: "ды"
       agree_and_suspend:
-        title: "прыпыненне карыстальніка"
         description: "Пагадзіцеся са сцягамі і падвесіць карыстальнік."
       agree_and_silence:
-        title: "Silence Карыстальнік"
         description: "Пагадзіцеся са сцягамі і маўчанне карыстальніка."
       agree_and_restore:
-        title: "аднаўленне Пост"
         description: "Аднаўленне паста так, што можа бачыць усе карыстальнікі."
-      agree_and_hide:
-        title: "схаваць паведамленне"
-        description: "Схаваць гэты пост і аўтаматычна адправіць карыстачу паведамленне, пераконваючы іх, каб змяніць яго."
       delete_single:
         title: "выдаляць"
       delete:
         title: "Выдаліць ..."
-      delete_and_ignore:
-        title: "Выдаліць паведамленне і Ігнараваць"
-        description: "Выдаліць паведамленне; калі першы пост, выдаліць тэму, а таксама"
       delete_and_ignore_replies:
-        title: "Выдаліць паведамленне Адказаў і Ігнараваць"
-        description: "Сцерці допіс і ўсе яго адказы; калі першы пост, выдаліць тэму, а таксама"
         confirm: "Вы ўпэўненыя, што жадаеце выдаліць адказы на пост, а?"
-      delete_and_agree:
-        title: "Выдаліць паведамленне і згодны"
-        description: "Выдаліць паведамленне; калі першы пост, выдаліць тэму, а таксама"
       delete_and_agree_replies:
-        title: "Выдаліць паведамленне Адказы і згодны"
-        description: "Сцерці допіс і ўсе яго адказы; калі першы пост, выдаліць тэму, а таксама"
         confirm: "Вы ўпэўненыя, што жадаеце выдаліць адказы на пост, а?"
       disagree_and_restore:
-        title: "Не згодны і аднаўленне Post"
         description: "Аднаўленне паста так, што можа бачыць усе карыстальнікі."
       disagree:
-        title: "не згаджацца"
+        title: "няма"
       ignore:
         title: "ігнараваць"
       approve:
diff --git a/config/locales/server.bg.yml b/config/locales/server.bg.yml
index 32b35496997..677f80348b2 100644
--- a/config/locales/server.bg.yml
+++ b/config/locales/server.bg.yml
@@ -43,6 +43,11 @@ bg:
   disable_remote_images_download_reason: "Изтеглянето на отдалечени изображения беше изключено, защото няма достатъчно място на хард диска."
   anonymous: "Анонимен"
   remove_posts_deleted_by_author: "Изтрит от автора"
+  topic_category_changed: "От %{from} до %{to}"
+  topic_tag_changed:
+    added_and_removed: "Добавен е %{added} и е премахнат %{removed}"
+    added: "Добавен %{added}"
+    removed: "Премахнат %{removed}"
   inline_oneboxer:
     topic_page_title_post_number: "#%{post_number}"
     topic_page_title_post_number_by_user: "#%{post_number} от %{username} "
@@ -108,7 +113,17 @@ bg:
       load_from_remote: "Получи се грешка при зареждането на тази публикация."
     site_settings:
       invalid_site_setting: "Не съществува настройка с име „%{name}“."
+      invalid_choice:
+        one: "„%{name}“ е невалиден избор."
+        other: "'%{name}' са невалидни избори."
+      secure_uploads_requirements: "S3 качванията и S3 ACL трябва да бъдат активирани, преди да се активират защитени качвания."
+      s3_use_acls_requirements: "Трябва да имате активирани S3 ACL, когато защитените качвания са активирани."
+  custom_fields:
+    validations:
+      max_items: "Достигнат е максималният брой персонализирани полета за този обект (%{max_items_number})"
+      max_value_length: "Достигната е максимална дължина за стойността на потребителското поле (%{max_value_length})"
   invite:
+    generic_error_response: "Имаше проблем с вашата заявка."
     disabled_errors:
       invalid_access: "Вие нямате права да разглеждате този ресурс."
   topic_invite:
@@ -193,6 +208,7 @@ bg:
     user_topics: "Последни теми от @%{username}"
   too_late_to_edit: "Това мнение е създадено много отдавна. То вече не може да се променя или да бъде изтрито."
   revert_version_same: "Текущата версия е същата като версията, към която се опитвате да се върнете."
+  reverted_to_version: "върнато към версия #%{version}"
   excerpt_image: "изображение"
   bookmarks:
     reminders:
@@ -223,6 +239,7 @@ bg:
     until_posts:
       one: "%{count} публикация"
       other: "%{count} публикации"
+    dont_feed_the_trolls: За тази публикация вече е подаден сигнал за преглед от модератор. Сигурни ли сте, че искате да ѝ отговорите? Отговорите на отрицателно съдържание са склонни да насърчават по-негативно поведение.
   activerecord:
     attributes:
       category:
@@ -253,12 +270,20 @@ bg:
           attributes:
             hex:
               invalid: "този цвят не е валиден "
+        translation_overrides:
+          attributes:
+            value:
+              invalid_interpolation_keys:
+                one: "Следният ключ за интерполация е невалиден: %{keys}"
+                other: "Следните ключове за интерполация са невалидни: %{keys}"
       <<: *errors
   general_category_name: "Основни"
   meta_category_name: "Заявка към сайта"
   meta_category_description: "Дискусия за сайта, неговата организация, как той работи, и как можем да го подобрим."
   staff_category_name: "Персонал"
   staff_category_description: "Частна категория за дискусии на персонала. Темите са видими само за админи и модератори."
+  discourse_welcome_topic:
+    title: "Добре дошли в %{site_title}! :wave:"
   category:
     topic_prefix: "За %{category} категория"
     errors:
@@ -268,6 +293,7 @@ bg:
       invalid_email_in: "'%{email}' е невалиден имейл адрес."
       email_already_used_in_group: "'%{email}' е вече използван от групата '%{group_name}'."
       email_already_used_in_category: "'%{email}' е вече използван за категорията '%{category_name}'."
+      move_topic_to_category_disallowed: "Не можете да преместите тази тема в категория, в която нямате разрешение да създавате нови теми."
     cannot_delete:
       has_subcategories: "Не можете да изтриете тази категория, защото има подкатегории."
       topic_exists_no_oldest: "Не можете да изтриете тази категория, защото броят на темите е %{count}."
@@ -484,6 +510,7 @@ bg:
       yaxis: "Ден"
     dau_by_mau:
       xaxis: "Ден"
+      description: "Броят на членовете, които са влезли в системата през последния ден, разделен на броя на членовете, които са влезли в системата през последния месец - дава %, който показва \"привързаността\" на общността. Стремете се към >20%."
     daily_engaged_users:
       xaxis: "Ден"
     profile_views:
@@ -657,6 +684,7 @@ bg:
     queue_size_warning: "Броят на чакащите задачи е %{queue_size}, и е голям. Това може да означава проблем с процеса(сите) Sidekiq, или може да се наложи да добавите още Sidekiq работници."
     memory_warning: "Вашият сървър използва по-малко от 1 ГБ от общата памет. Препоръчва се най-малко 1 ГБ."
     subfolder_ends_in_slash: "Вашата настройка за подпапка е неправилна; DISCOURSE_RELATIVE_URL_ROOT завършва с наклонена черта."
+    v3_analytics_deprecated: "Вашият Discourse в момента използва Google Analytics 3, който няма да се поддържа след юли 2023 г. <a href='https://meta.discourse.org/t/260498'>Актуализирайте до Google Analytics 4</a> сега, за да продължите да получавате ценни сведения и анализи за работата на уебсайта си."
   site_settings:
     disabled: "деактивирани"
     censored_words: "Думите които ще бъдат автоматично заменени с &#9632;&#9632;&#9632;&#9632;"
@@ -685,6 +713,7 @@ bg:
     add_rel_nofollow_to_user_content: 'Добави "rel nofollow" към всички връзки с изключение на вътрешните ( включително домейн майките). Промяната на тази настройка изисква актуализация на всички публикации със "rake posts:rebake"'
     post_excerpt_maxlength: "Максимална дължина на откъс / резюме от публикацията."
     post_onebox_maxlength: "Максимална дължина на oneboxed Discourse публикация в писмени знаци."
+    apple_touch_icon: "Икона, използвана за сензорни устройства на Apple. Не се препоръчва прозрачен фон. Ще бъде автоматично преоразмерена до 180x180. Ако се остави празно, ще се използва large_icon."
     notification_email: "Подател: имейлът се използва при изпращане на всички системни съобщения. Посоченият тук домейн трябва да се конфигурира правилно със SPF, DKIM и PTR данни за успешна доставка."
     email_custom_headers: "Разделен със знака \"|\" списък от персонализирани имейл хедъри. "
     summary_score_threshold: "Минимална оценка необходима за една публикация, за да бъде включена в \"Обобщи тази тема\""
@@ -728,6 +757,8 @@ bg:
     min_password_length: "Минимална дължина на парола."
     min_admin_password_length: "Минимална дължина на парола за Админ."
     block_common_passwords: "Не са разрешени паролите, които са в топ 10,000 от най-често използваните."
+    discourse_connect_url: "URL на крайната точка на DiscourseConnect (трябва да включва http:// или https:// и не трябва да включва наклонена черта в края)"
+    discourse_connect_allowed_redirect_domains: "Ограничете до тези домейни за return_paths, предоставени от DiscourseConnect (по подразбиране пътят за връщане трябва да е на текущия сайт). Използвайте *, за да разрешите всеки домейн за обратен път. Заместващите символи на поддомейни (`*.foobar.com`) не са разрешени."
     allow_new_registrations: "Позволи регистрация на нови потребители. Махни отметката, за да не може никой да създаде нов акаунт."
     google_oauth2_client_id: "Client ID за Google приложение."
     google_oauth2_client_secret: "Client secret за Google приложение."
@@ -755,6 +786,7 @@ bg:
     s3_upload_bucket: "Име на Amazon S3 bucket в което ще се качват файловете. ВНИМАНИЕ: трябва да съдържа само малки букви, без разстояния и долни черти."
     s3_cdn_url: "URL адресът на URL да се използва за всички s3 авоари (например: https://cdn.somewhere.com). ВНИМАНИЕ: след промяната на тази настройка трябва да преработите всичките си публикации."
     avatar_sizes: "Списък от автоматично генерираните размери на аватари"
+    composer_media_optimization_image_encode_quality: "Качеството на JPG кодиране, използвано в процеса на повторно кодиране."
     default_invitee_trust_level: "По подразбиране ниво на доверие (0-4) за невалидни потребители."
     default_trust_level: "Ниво на доверие (0-4) по подразбиране за всички нови потребители. ВНИМАНИЕ! Промяната на това ще ви постави в сериозен риск за спам."
     tl1_requires_topics_entered: "Колко теми трябва да отвори нов потребител, за да премине към ниво на доверие 1."
@@ -772,6 +804,7 @@ bg:
     tl3_requires_posts_read_all_time: "Общ минимален брой публикации, които потребителят трябва да прочете, за да се класира за ниво на доверие 3."
     tl3_promotion_min_duration: "Минимален брой дни, през които трае повишението на ниво на доверие 3 преди потребителят да бъде понижен обратно на ниво на доверие 2."
     tl3_links_no_follow: "Не премахвайте rel=nofollow от линковете, публикувани от потребители с ниво на доверие 3."
+    tl4_delete_posts_and_topics: "Позволете на потребителите на TL4 да изтриват публикации и теми, създадени от други потребители. Потребителите на TL4 също ще могат да виждат изтритите теми и публикации."
     min_trust_to_create_topic: "Минимално ниво на доверие изисквано за създаване на нова тема"
     min_trust_to_edit_wiki_post: "Минимално ниво на доверие изисквано за редактиране на wiki."
     newuser_max_links: "Колко линка може да добави в публикация нов потребител."
@@ -820,6 +853,11 @@ bg:
     reply_by_email_address: "Шаблон за отговор по имейла на входящ имейл адрес, например: %%{reply_key}@reply.example.com or replies+%%{reply_key}@example.com"
     strip_images_from_short_emails: "Премахни от имейлите по-малките от 2800 байта изображения"
     short_email_length: "Колко байта имейл се счита за кратък"
+    sendgrid_verification_key: "Ключ за проверка на Sendgrid, използван за проверка на съобщенията на Webhook."
+    mailjet_webhook_token: "Токен, използван за проверка на полезния товар на webhook. Той трябва да бъде предаден като параметър на заявката \"t\" на webhook, например: https://example.com/webhook/mailjet?t=supersecret"
+    mandrill_authentication_key: "Ключ за удостоверение Mandrill, който се използва за проверка на webhook съобщения"
+    postmark_webhook_token: "Токен, използван за проверка на полезния товар на webhook. Той трябва да бъде предаден като параметър на заявката \"t\" на webhook, например: https://example.com/webhook/postmark?t=supersecret"
+    sparkpost_webhook_token: "Токен, използван за проверка на полезния товар на webhook. Той трябва да бъде предаден като параметър на заявката \"t\" на webhook, например: https://example.com/webhook/sparkpost?t=supersecret"
     pop3_polling_enabled: "Проверка чрез POP3 за имейл отговорите."
     pop3_polling_ssl: "Използвай SSL при свързване със сървъра POP3. (Препоръчително) "
     pop3_polling_period_mins: "Срок в минути за проверката на POP3 акаунта за имейл. ЗАБЕЛЕЖКА: изисква рестарт."
@@ -844,10 +882,13 @@ bg:
     anonymous_posting_min_trust_level: "Минимално ниво на доверие което се изисвка за да се разреши анонимното публикуване."
     anonymous_account_duration_minutes: "За да се защити анонимността създавай нови анонимни акаунти на всеки N минути за всеки потребител. Например: Ако е настроено на 600, означава, че 600 минути след последния пост на потребителя, след като той излезе, ще бъде създаден анонимен акаунт."
     allow_profile_backgrounds: "Позволи на потребителите да качват фонове на профилите си."
+    dont_feed_the_trolls_threshold: "Брой сигнали от други потребители, преди да бъдат предупредени."
     enable_mobile_theme: "Мобилните устройства използват адаптирана тема с възможност за преминаване към нормален изглед. Забранете тази настройка, ако искате да използвате свой собствен стил за мобилните устройства."
     dominating_topic_minimum_percent: "Какъв процент публикации може да направи един потребител преди да бъде предупреден за доминиране в тема."
     suppress_uncategorized_badge: "Не показвай значката в списъците с теми за тези, които не са категоризирани. "
     disable_system_edit_notifications: "Забрани редактирането на уведомления от системните потребители когато 'download_remote_images_to_local' е активно."
+    native_app_install_banner_ios: "Показва банер на приложението DiscourseHub на устройства с iOS на основни потребители (ниво на доверие 1) и нагоре."
+    native_app_install_banner_android: "Показва банер на приложението DiscourseHub на устройства с Android на основни потребители (ниво на доверие 1) и нагоре."
     full_name_required: "Полето 'Пълно име' е задължително в потребителския профил"
     enable_names: "Покажи пълното име на потребителите на техните профили, потребителски карти, и имейли. Деактивирай за скриване на пълното име навсякъде."
     display_name_on_posts: "Покажи пълните имена на потребителите в техните публикации като допълнение към потребителските им имена @username."
@@ -857,11 +898,12 @@ bg:
     autohighlight_all_code: "Оцветявай всички предварително форматирани кодови блокове, дори когато няма изрично посочен език."
     embed_truncate: "Премахване на вградените публикации."
     embed_post_limit: "Максимален брой публикации за вграждане."
-    show_create_topics_notice: "Ако на сайта има по-малко от 5 теми, покажи на персонала съобщение с молба за създаване на още теми."
     delete_drafts_older_than_n_days: "Изтрий чернови по-стари от (n) дни."
+    bootstrap_mode_min_users: "Минимален брой потребители, необходими за деактивиране на Bootstrap режима (настройте на 0 за деактивиране, може да отнеме до 24 часа)"
     slug_generation_method: "Изберете метод за генериране на URL. 'кодирано' ще използва букви URL, кодирани с проценти. 'не' ще откаже генерацията като цяло."
     enable_emoji: "Разреши емотикони"
     emoji_set: "Как бихте искали да е вашата емотикона?"
+    emoji_deny_list: "Тези емотикони няма да бъдат налични за използване в менюта или кратки кодове."
     approve_unless_trust_level: "Постовете на потребители с по-ниско от това ниво на доверие трябва да бъдат одобрени"
     default_email_mailing_list_mode: "Изпращай ми имейл по подразбиране за всяка нова публикация."
     default_other_new_topic_duration_minutes: "Глобално състояние по подразбиране за всяка тема, която се счита за нова."
@@ -873,6 +915,9 @@ bg:
     default_categories_watching: "Списък с категории, които са прегледани, по подразбиране."
     default_categories_tracking: "Списък с категории, които са следени, по подразбиране."
     default_categories_muted: "Списък с категории, които са заглушени, по подразбиране."
+    create_post_for_category_and_tag_changes: "Създайте малка публикация за действие, когато категорията или етикетите на тема се променят"
+    experimental_new_new_view_groups: 'ЕКСПЕРИМЕНТАЛНО: Активирайте нов списък с теми, който комбинира непрочетени и нови теми и направете връзката „Всичко“ в страничната лента връзка към него.'
+    enable_custom_sidebar_sections: "ЕКСПЕРИМЕНТАЛНО: Активирайте персонализирани раздели в страничната лента"
     errors:
       invalid_email: "Невалиден имейл адрес."
       invalid_username: "Няма потребител с такова потребителско име."
@@ -887,6 +932,8 @@ bg:
       invalid_string_min: "Трябва да бъде минимум %{min} символа."
       invalid_string_max: "Трябва да не бъде с повече от %{max} символа."
       invalid_reply_by_email_address: "Стойността трябва да съдържа '%{reply_key}' и да бъде различна от известяващия имейл."
+      invalid_uncategorized_category_setting: 'Категорията „Некатегоризирани“ не може да бъде избрана, ако „разрешаване на некатегоризирани теми“ не е активирано.'
+      invalid_search_ranking_weights: "Стойността е невалидна за настройката на сайта „search_ranking_weights\". Пример: „{0.1,0.2,0.3,1.0}“. Имайте предвид, че максималната стойност за всяко тегло е 1.0."
   search:
     within_post: "#%{post_number} от %{username}"
     types:
@@ -1081,6 +1128,15 @@ bg:
         %{post_error}
 
         Ако можете да отстраните проблема, моля опитайте отново.
+    user_automatically_silenced:
+      text_body_template: |
+        Това е автоматизирано съобщение.
+
+        Новият потребител [%{username}](%{user_url}) беше автоматично заглушен, защото множество потребители сигнализираха за публикациите на %{username}.
+
+        Моля [прегледайте сигналите](%{base_url}/преглед). Ако %{username} е бил неправилно заглушен за публикуване, щракнете върху бутона за деактивиране на [административната страница за този потребител] (%{user_url}).
+
+        Този праг може да бъде променен чрез настройките на сайта `silence_new_user`.
     spam_post_blocked:
       subject_template: "Публикациите на новия потребител %{username} са блокирани заради повторящите се линкове "
     pending_users_reminder:
@@ -1095,9 +1151,6 @@ bg:
   user_notifications:
     previous_discussion: "Предишни Отговори"
     in_reply_to: "В отговор до"
-    unsubscribe:
-      title: "Отписвам"
-      description: "Не сте заинтересувани от тези имейли? Няма проблем! Кликнете по-долу, за да се отпишете веднага:"
     posted_by: "Публикувано от &{username} на %{post_date}"
     user_replied:
       title: "Потребителят е отговорил"
@@ -1120,8 +1173,8 @@ bg:
     see_more: "Повече"
     search_title: "Търси този сайт"
     search_button: "Търсене"
-  deleted: "изтрит"
-  image: "изображение"
+  login_required:
+    welcome_message: "# [Добре дошли в %{title}](#добре дошли)"
   upload:
     edit_reason: "изтеглено локално копие на изображенията"
     unauthorized: "Съжеляваме, Файлът е забранен за качване (разрешени разширения : %{authorized_extensions})."
@@ -1161,8 +1214,267 @@ bg:
     title: "FAQ/Насоки"
   tos_topic:
     title: "Правила за ползване"
+    body: |
+      <h2 id="heading--change-me"><a href="#heading--change-me">Промени ме</a></h2>
+
+      Администратор на форума, моля, намерете по-долу примерен начален шаблон за политика за поверителност, който трябва да персонализирате, за да отговаря на нуждите на вашия сайт.
+
+      Тези условия не уреждат, но един ден може да уредят използването на интернет форума на адрес <%{base_url}>. В такъв случай, за да използвате форума, трябва да се споразумеете за тези условия с %{company_name}, компанията, която управлява форума.
+
+      Дружеството може да предлага други продукти и услуги при различни условия. Тези условия се отнасят само за използването на форума.
+
+      Премини към:
+
+      - [Важни условия](#heading--important-terms)
+      - [Вашето разрешение да използвате форума](#heading--permission)
+      - [Условия за използване на форума](#heading--conditions)
+      - [Приемливо използване](#heading--acceptable-use)
+      - [Стандарти за съдържание](#heading--content-standards)
+      - [Enforcement](#heading--enforcement)
+      - [Вашият акаунт](#heading--your-account)
+      - [Вашето съдържание](#heading--your-content)
+      - [Вашият акаунт](#heading--your-content) [Вашата отговорност](#heading--responsibility)
+      - [Disclaimers](#heading--disclaimers)
+      - [Ограничения на отговорността](#heading--liability)
+      - [Feedback](#heading--feedback)
+      - [Termination](#heading--termination)
+      - [Disputes](#heading--disputes)
+      - [Общи условия](#заглавие--общи)
+      - [Contact](#заглавие--контакт)
+      - [Changes](#заглавие--промени)
+
+      <h2 id="heading--important-terms"><a href="#heading--important-terms">Важни условия</a></h2>
+
+      ***Тези условия включват редица важни разпоредби, които засягат Вашите права и задължения, като например отказите от отговорност в [Disclaimers](#heading--disclaimers), ограниченията на отговорността на компанията към Вас в [Limits on Liability](#heading--liability), Вашето съгласие да покриете щетите, причинени от неправилното използване на форума от страна на компанията в [Responsibility for Your Use](#heading--responsibility) и споразумението за арбитраж на спорове в [Disputes](#heading--disputes).***
+
+      <h2 id="heading--permission"><a href="#heading--permission">Вашето разрешение да използвате форума</a></h2>
+
+      При спазване на настоящите условия компанията ви дава разрешение да използвате форума. Всеки трябва да се съгласи с тези условия, за да използва форума.
+
+      <h2 id="heading--conditions"><a href="#heading--conditions">Условия за използване на форума</a></h2>
+
+      Вашето разрешение да използвате форума е предмет на следните условия:
+
+      1. Трябва да сте навършили поне тринадесет години.
+
+      2. Нямате право да използвате повече форума, ако компанията се свърже директно с вас, за да ви каже, че нямате право.
+
+      3. Трябва да използвате форума в съответствие с [Приемлива употреба](#heading--acceptable-use) и [Стандарти за съдържание](#heading--content-standards).
+
+      <h2 id="heading--acceptable-use"><a href="#heading--acceptable-use">Приемлива употреба</a></h2>
+
+      1. Нямате право да нарушавате закона, като използвате форума.
+
+      2. Не можете да използвате или да се опитвате да използвате чужд акаунт във форума без неговото изрично разрешение.
+
+      3. Нямате право да купувате, продавате или по друг начин да търгувате с потребителски имена или други уникални идентификатори във форума.
+
+      4. Нямате право да изпращате реклами, верижни писма или други покани чрез форума, както и да използвате форума за събиране на адреси или други лични данни за търговски списъци или бази данни.
+
+      5. Нямате право да автоматизирате достъпа до форума или да наблюдавате форума, например с помощта на уеб браузър, плъгин или добавка за браузър или друга компютърна програма, която не е уеб браузър. Можете да претърсвате форума, за да го индексирате за публично достъпна търсачка, ако използвате такава.
+
+      6. Не можете да използвате форума за изпращане на електронна поща до списъци за разпространение, новинарски групи или групови псевдоними за поща.
+
+      7. Нямате право да внушавате невярно, че сте свързани с компанията или сте одобрени от нея.
+
+      8. Не можете да поставяте хипервръзки към изображения или друго нехипертекстово съдържание на форума на други уебстраници.
+
+      9. Нямате право да премахвате знаци, показващи собственост, от материали, които изтегляте от форума.
+
+      10. Нямате право да показвате каквато и да е част от форума на други уебсайтове с `<iframe>`.
+
+      11. Нямате право да деактивирате, избягвате или заобикаляте каквито и да било ограничения за сигурност или достъп до форума.
+
+      12. Нямате право да натоварвате инфраструктурата на форума с неразумен обем заявки или заявки, целящи да наложат неразумно натоварване на информационните системи, на които се основава форумът.
+
+      13. Нямате право да се представяте за други лица чрез форума.
+
+      14. Нямате право да насърчавате или да помагате на когото и да било в нарушение на тези условия.
+
+      <h2 id="heading--content-standards"><a href="#heading--content-standards">Стандарти за съдържание</a></h2>
+
+      1. Нямате право да изпращате във форума съдържание, което е незаконно, обидно или по друг начин вреди на другите. Това включва съдържание, което представлява тормоз, неподходящо, обидно или омразно поведение.
+
+      2. Нямате право да изпращате във форума съдържание, което нарушава закона, нарушава нечии права на интелектуална собственост, нарушава нечия лична неприкосновеност или нарушава споразумения, които сте сключили с други лица.
+
+      3. Нямате право да изпращате във форума съдържание, съдържащо злонамерен компютърен код, като например компютърни вируси или шпионски софтуер.
+
+      4. Нямате право да изпращате съдържание във форума като обикновен заместител, който да съдържа определен адрес, потребителско име или друг уникален идентификатор.
+
+      5. Нямате право да използвате форума за разкриване на информация, която нямате право да разкривате, като поверителна или лична информация на други хора.
+
+      <h2 id="heading--enforcement"><a href="#heading--enforcement">Прилагане на правилата</a></h2>
+
+      Компанията може да разследва и преследва нарушенията на тези условия до пълната законова степен. Компанията може да уведомява и да сътрудничи на правоприлагащите органи при преследване на нарушения на закона и тези условия.
+
+      Компанията си запазва правото да променя, редактира и изтрива съдържанието на форума по каквато и да е причина. Ако смятате, че някой е изпратил съдържание във форума в нарушение на тези условия, [свържете се с нас незабавно](#head--contact).
+
+      <h2 id="heading--your-account"><a href="#heading--your-account">Вашият акаунт</a></h2>
+
+      Трябва да създадете и да влезете в акаунт, за да използвате някои функции на форума.
+
+      За да създадете акаунт, трябва да предоставите известна информация за себе си. Ако създадете акаунт, вие се съгласявате да предоставите поне валиден имейл адрес и да поддържате този адрес актуален. Можете да закриете акаунта си по всяко време, като изпратите имейл на адрес <%{contact_email}>.
+
+      Съгласявате се да носите отговорност за всички действия, предприети чрез вашия акаунт, независимо дали са разрешени от вас или не, докато не затворите акаунта си или не уведомите компанията, че акаунтът ви е бил компрометиран. Съгласявате се да уведомите компанията незабавно, ако подозирате, че акаунтът ви е бил компрометиран. Съгласявате се да изберете сигурна парола за профила си и да я пазите в тайна.
+
+      Компанията може да ограничи, спре или закрие акаунта ви във форума в съответствие с политиката си за обработване на искания за сваляне, свързани с авторските права, или ако компанията основателно смята, че сте нарушили някое от правилата в тези условия.
+
+      <h2 id="heading--your-content"><a href="#heading--your-content">Вашето съдържание</a></h2>
+
+      Нищо в настоящите условия не дава на компанията права на собственост върху интелектуалната собственост, която споделяте с форума, като например информация за профила ви, публикации или друго съдържание, което изпращате във форума. Нищо в тези условия не ви дава права на собственост върху интелектуалната собственост на компанията.
+
+      Между вас и компанията, вие оставате единствено отговорни за съдържанието, което изпращате във форума. Съгласявате се да не внушавате погрешно, че съдържанието, което изпращате във форума, е спонсорирано или одобрено от компанията. Настоящите условия не задължават компанията да съхранява, поддържа или предоставя копия на съдържанието, което изпращате, и да го променя, съгласно настоящите условия.
+
+      Съдържанието, което изпращате във форума, принадлежи на вас и вие решавате какво разрешение да дадете на другите за него. Но като минимум разрешавате на компанията да предоставя съдържанието, което изпращате във форума, на други потребители на форума. Този специален лиценз позволява на компанията да копира, публикува и анализира съдържанието, което изпращате във форума.
+
+      Когато съдържанието, което предоставяте, бъде премахнато от форума, независимо дали от вас или от компанията, специалният лиценз на компанията се прекратява, когато последното копие изчезне от резервните копия, кеша и други системи на компанията. Други лицензи, които прилагате към изпратеното от вас съдържание, като например лицензите [Creative Commons](https://creativecommons.org), могат да продължат да действат и след като съдържанието ви бъде премахнато. Тези лицензи могат да дадат право на други лица или на самата компания да споделят отново вашето съдържание чрез форума.
+
+      Други лица, които получават съдържанието, което изпращате във форума, могат да нарушат условията, при които лицензирате съдържанието си. Вие се съгласявате, че компанията няма да носи отговорност пред вас за тези нарушения или техните последици.
+
+      <h2 id="heading--responsibility"><a href="#heading--responsibility">Вашата отговорност</a></h2>
+
+      Вие се съгласявате да обезщетите компанията за правни искове от други лица, свързани с нарушаване на тези условия от Ваша страна или с нарушаване на тези условия от други лица, които използват Вашия акаунт във форума. Както вие, така и компанията се съгласявате да уведомите другата страна за всякакви правни претенции, за които може да се наложи да обезщетите компанията, възможно най-скоро. Ако компанията не успее да ви уведоми своевременно за правен иск, няма да ви се наложи да обезщетите компанията за щети, срещу които сте могли да се защитите или да намалите вредите при своевременно уведомяване. Съгласявате се да позволите на дружеството да контролира разследването, защитата и уреждането на правни искове, за които би трябвало да обезщетите дружеството, и да сътрудничите на тези усилия. Дружеството се съгласява да не се съгласява с каквото и да е споразумение, което признава ваша вина или ви налага задължения без вашето предварително съгласие.
+
+      <h2 id="heading--disclaimers"><a href="#heading--disclaimers">Отказ от отговорност</a></h2>
+
+      ***Приемате целия риск от използването на форума и съдържанието му. Доколкото позволява законът, дружеството и неговите доставчици предоставят форума такъв, какъвто е, без каквато и да е гаранция. ***
+
+      Форумът може да съдържа хипервръзки и да интегрира форуми и услуги, управлявани от други лица. Дружеството не дава никакви гаранции за услугите, управлявани от други лица, или за съдържанието, което те могат да предоставят. Използването на услуги, управлявани от други лица, може да се урежда от други условия между вас и този, който управлява услугата.
+
+      <h2 id="heading--liability"><a href="#heading--liability">Ограничения на отговорността</a></h2>
+
+      ***Нито компанията, нито нейните доставчици ще носят отговорност пред вас за вреди, причинени от нарушение на договора, които техният персонал не е могъл разумно да предвиди, когато сте се съгласили с тези условия.***
+
+      ***Като позволява законът, общата отговорност към вас за искове от всякакъв вид, които са свързани с форума или съдържанието на форума, ще бъде ограничена до 50 USD.***
+
+      <h2 id="heading--feedback"><a href="#heading--feedback">Обратна връзка</a></h2>
+
+      Компанията приветства вашата обратна връзка и предложения за форума. Вижте раздела [Contact](#заглавие--контакт) по-долу за начините да се свържете с нас.
+
+      Съгласявате се, че компанията ще може свободно да действа по предоставените от вас мнения и предложения и че няма да е необходимо да ви уведомява, че вашите мнения са били използвани, да получава вашето разрешение за използването им или да ви плаща. Съгласявате се да не предоставяте обратна връзка или предложения, които смятате, че биха могли да бъдат поверителни или собственост, на вас или на други лица.
+
+      <h2 id="heading--termination"><a href="#heading--termination">Прекратяване</a></h2>
+
+      Или вие, или компанията може да прекрати споразумението, записано в тези условия, по всяко време. Когато нашето споразумение бъде прекратено, вашето разрешение да използвате форума също се прекратява.
+
+      Следните разпоредби остават в сила и след прекратяването на нашето споразумение: [Вашето съдържание](#заглавие--Вашето съдържание), [Feedback](#заглавие--обратна връзка), [Вашата отговорност](#заглавие--отговорност), [Disclaimers](#заглавие--изключения), [Ограничения на отговорността](#заглавие--отговорност) и [Общи условия](#заглавие--общо).
+
+      <h2 id="heading--disputes"><a href="#heading--disputes">Спорове</a></h2>
+
+      %{governing_law} ще урежда всички спорове, свързани с настоящите условия или с използването на форума от ваша страна.
+
+      Вие и компанията се съгласявате да търсите съдебни забрани, свързани с тези условия, само в щатски или федерален съд в %{city_for_disputes}. Нито вие, нито компанията ще възразите срещу юрисдикцията, форума или мястото на действие в тези съдилища.
+
+      *** Освен за търсене на съдебна забрана или за искове по Закона за компютърните измами и злоупотреби, вие и компанията ще решавате всички спорове чрез задължителен арбитраж на Американската арбитражна асоциация. Арбитражът ще следва правилата за търговски арбитраж на ААА и допълнителните процедури за спорове, свързани с потребителите. Арбитражът ще се проведе в %{city_for_disputes}. Вие ще разрешавате всеки спор като физическо лице, а не като част от колективен иск или друго представително производство, независимо дали като ищец или член на група. Никой арбитър няма да обединява спорове с друг арбитраж без разрешението на компанията.***
+
+      Всяко арбитражно решение ще включва разходите по арбитража, разумни адвокатски хонорари и разумни разходи за свидетели. Вие и дружеството можете да впишете арбитражните решения във всеки компетентен съд.
+
+      <h2 id="heading--general"><a href="#heading--general">Общи условия</a></h2>
+
+      Ако дадена разпоредба от тези условия е неприложима в писмения си вид, но може да бъде променена, за да стане приложима, тази разпоредба трябва да бъде променена до минимално необходимата степен, за да стане приложима. В противен случай тази разпоредба следва да бъде премахната.
+
+      Нямате право да прехвърляте споразумението си с компанията. Компанията може да прехвърли вашето споразумение на всеки филиал на компанията, на всяка друга компания, която получи контрол над компанията, или на всяка друга компания, която закупи активи на компанията, свързани с форума. Всеки опит за преотстъпване в противоречие с тези условия няма правно действие.
+
+      Нито упражняването на което и да е право по настоящото споразумение, нито отказът от което и да е нарушение на настоящото споразумение не отменя друго нарушение на настоящото споразумение.
+
+      Тези условия въплъщават всички условия на споразумението между вас и компанията относно използването на форума. Тези условия изцяло заместват всички други споразумения относно използването на форума от ваша страна, писмени или не.
+
+      <h2 id="heading--contact"><a href="#heading--contact">Контакти</a></h2>
+
+      Можете да уведомявате компанията съгласно тези условия и да изпращате въпроси на компанията на адрес <%{contact_email}>.
+
+      Компанията може да ви уведоми съгласно тези условия, като използва имейл адреса, който сте предоставили за профила си във форума, или като публикува съобщение на началната страница на форума или на страницата на профила ви.
+
+      <h2 id="heading--changes"><a href="#heading--changes">Промени</a></h2>
+
+      Компанията последно е актуализирала тези условия на [ВЪВЕДЕТЕ ДАТА НА ПОСЛЕДНАТА АКТУАЛИЗАЦИЯ ТУК] и може да актуализира тези условия отново. Компанията ще публикува всички актуализации във форума. За актуализациите, които съдържат съществени промени, компанията се съгласява да ви изпрати имейл, ако сте създали акаунт и сте предоставили валиден имейл адрес. Дружеството може също така да обявява актуализациите със специални съобщения или предупреждения във форума.
+
+      След като получите известие за актуализация на тези условия, трябва да се съгласите с новите условия, за да продължите да използвате форума.
   privacy_topic:
     title: "Декларация за поверителност"
+    body: |
+      ## [Администратор на форума, моля, намерете по-долу примерен начален шаблон за политика за поверителност, който трябва да адаптирате към вашия сайт.]
+
+      <a name="collect"></a>
+
+      ## [Каква информация събираме?](#collect)
+
+      Ние събираме информация от вас, когато се регистрирате на нашия сайт, и събираме данни, когато участвате във форума, като четете, пишете и оценявате споделеното тук съдържание.
+
+      Когато се регистрирате на нашия сайт, може да бъдете помолени да въведете името си и имейл адреса си. Можете обаче да посещавате нашия сайт, без да се регистрирате. Вашият адрес на електронна поща ще бъде потвърден чрез имейл, съдържащ уникална връзка. Ако тази връзка бъде посетена, ние знаем, че вие контролирате имейл адреса.
+
+      Когато сте регистрирани и публикувате, ние записваме IP адреса, от който е изпратена публикацията. Възможно е също така да запазваме сървърни логове, които включват IP адреса на всяка заявка към нашия сървър.
+
+      <a name="use"></a>
+
+      ## [За какво използваме вашата информация?](#използване)
+
+      Всяка информация, която събираме от вас, може да бъде използвана по един от следните начини:
+
+      * За да персонализираме вашето преживяване &mdash; вашата информация ни помага да отговорим по-добре на вашите индивидуални нужди.
+      * За подобряване на нашия сайт &mdash; ние непрекъснато се стремим да подобряваме предложенията на нашия сайт въз основа на информацията и обратната връзка, която получаваме от вас.
+      * За подобряване на обслужването на клиенти &mdash; Вашата информация ни помага да отговорим по-ефективно на Вашите заявки за обслужване на клиенти и нужди от поддръжка.
+      * За изпращане на периодични имейли &mdash; Предоставеният от вас имейл адрес може да се използва за изпращане на информация, известия, които сте поискали, за промени в темите или в отговор на вашето потребителско име, за отговор на запитвания и/или други заявки или въпроси.
+
+      <a name="protect"></a>
+
+      ## [Как защитаваме вашата информация?] (#protect)
+
+      Ние прилагаме различни мерки за сигурност, за да поддържаме безопасността на вашата лична информация, когато въвеждате, предоставяте или имате достъп до вашата лична информация.
+
+      <a name="data-retention"></a>
+
+      ## [Каква е вашата политика за запазване на данни?](#data-retention)
+
+      Ние ще положим добросъвестни усилия да:
+
+      * Ще запазим сървърните логове, съдържащи IP адреса на всички заявки към този сървър, не повече от [БРОЙ ДНИ] дни.
+
+      <a name="cookies"></a>
+
+      ## [Използваме ли бисквитки?](#cookies)
+
+      Да. Бисквитките са малки файлове, които даден сайт или негов доставчик на услуги прехвърля на твърдия диск на компютъра ви чрез вашия уеб браузър (ако разрешите). Тези "бисквитки" позволяват на сайта да разпознае вашия браузър и, ако имате регистриран акаунт, да го свърже с вашия регистриран акаунт.
+
+      Използваме "бисквитките", за да разберем и запазим Вашите предпочитания за бъдещи посещения и да съберем обобщени данни за трафика и взаимодействието със сайта, за да можем в бъдеще да предложим по-добри възможности и инструменти на сайта. Възможно е да сключим договори с трети страни - доставчици на услуги, които да ни помогнат да разберем по-добре посетителите на сайта. На тези доставчици на услуги не е разрешено да използват събраната от наше име информация, освен за да ни помагат да извършваме и подобряваме дейността си.
+
+      <a name="disclose"></a>
+
+      ## [Разкриваме ли някаква информация на външни страни?] (#disclose)
+
+      Ние не продаваме, не търгуваме и не предаваме по друг начин на външни страни вашата лична информация. Това не включва доверени трети страни, които ни помагат в работата на нашия сайт, в осъществяването на нашия бизнес или в обслужването ви, стига тези страни да се съгласят да запазят поверителността на тази информация. Можем също така да разкрием вашата информация, когато смятаме, че разкриването е подходящо, за да спазим закона, да приложим правилата на нашия сайт или да защитим нашите или чужди права, собственост или безопасност. Въпреки това информация за посетителите, която не може да бъде идентифицирана лично, може да бъде предоставена на други страни за маркетингови, рекламни или други цели.
+
+      <a name="third-party"></a>
+
+      ## [Връзки с трети страни](#трети страни)
+
+      Понякога, по наша преценка, можем да включваме или предлагаме продукти или услуги на трети страни на нашия сайт. Тези сайтове на трети страни имат отделни и независими политики за поверителност. Поради това ние не носим никаква отговорност за съдържанието и дейностите на тези свързани сайтове. Въпреки това се стремим да защитаваме целостта на нашия сайт и приветстваме всякаква обратна връзка за тези сайтове.
+
+      <a name="coppa"></a>
+
+      ## [Съответствие със Закона за защита на личните данни на децата в интернет](#coppa)
+
+      Всички наши сайтове, продукти и услуги са насочени към хора, които са навършили 13 години. Ако този сървър се намира в САЩ и вие сте на възраст под 13 години, съгласно изискванията на COPPA ([Children's Online Privacy Protection Act](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)), не използвайте този сайт.
+
+      <a name="online"></a>
+
+      ## [Политика за поверителност само онлайн](#online)
+
+      Тази онлайн политика за поверителност се отнася само за информация, събрана чрез нашия сайт, а не за информация, събрана офлайн.
+
+      <a name="consent"></a>
+
+      ## [Вашето съгласие](#consent)
+
+      Използвайки нашия сайт, Вие се съгласявате с нашата политика за поверителност на уебсайта.
+
+      <a name="changes"></a>
+
+      ## [Промени в нашата политика за поверителност](#промени)
+
+      Ако решим да променим нашата политика за поверителност, ще публикуваме тези промени на тази страница.
+
+      Този документ е CC-BY-SA. Той е последно актуализиран [ВЪВЕДЕТЕ ДАТА НА ПОСЛЕДНАТА АКТУАЛИЗАЦИЯ ТУК].
   badges:
     editor:
       name: Редактор
@@ -1281,6 +1593,7 @@ bg:
     initial_topic_title: Репорти за производителноста на сайта
   tags:
     title: "Тагове"
+    limited_to_one_tag_from_group: "Етикетите %{tags} не могат да се използват едновременно. Моля, включете само един от тях."
   finish_installation:
     register:
       button: "Регистриране"
@@ -1291,6 +1604,9 @@ bg:
       title: "Изпрати отново активационен имейл "
   safe_mode:
     title: "Влизане в безопасен режим"
+    description: "Безопасният режим ви позволява да тествате сайта си, без да зареждате теми или персонализации на плъгини от страна на клиента. Персонализирането на плъгини от страна на сървъра остава активирано."
+    no_unofficial_plugins: "Деактивирайте неофициалните персонализации на приставки от страна на клиента"
+    no_plugins: "Деактивирайте всички персонализации на приставки от страна на клиента"
   wizard:
     step:
       privacy:
@@ -1317,7 +1633,9 @@ bg:
         title: "Вашият Discourse е готов!"
   search_logs:
     graph_title: "Брой търсения"
-  joined: "Присъединен"
+  onebox:
+    discourse:
+      user_joined_community: "Присъединен на %{date}"
   discourse_push_notifications:
     popup:
       mentioned: '%{username} ви спомена в "%{topic}" - %{site_title}'
@@ -1340,20 +1658,48 @@ bg:
       medium: "Среден"
       high: "Висок"
     actions:
+      agree:
+        title: "Да"
+      agree_and_keep:
+        title: "Запазете публикацията"
+        description: "Съгласен съм със сигнала, но запази публикацията непроменена."
+      agree_and_keep_hidden:
+        title: "Запазете публикацията скрита"
+        description: "Съгласен съм със сигнала и запази публикацията скрита."
       agree_and_suspend:
-        title: "Преустанови потребител"
+        title: "Спиране на потребителя"
+      agree_and_silence:
+        title: "Заглушаване на потребителя"
       agree_and_restore:
+        title: "Възстановяване на публикацията"
         description: "Възстанови тази публикация така че всички потребители да могат да я виждат."
       agree_and_hide:
-        description: "Скрий тази публикация и автоматично изпрати съобщение към потребителия спешно да я редактира."
+        title: "Скриване на публикацията"
+        description: "Съгласете се със сигнала и скрийте тази публикация + автоматично изпратете на потребителя съобщение, призовавайки го да го редактира."
       delete_single:
         title: "Изтрий"
+      delete_and_ignore:
+        title: "Игнорирайте сигнала и изтрийте публикацията"
+        description: "Игнорирайте сигнала, като го премахнете от опашката и изтрийте публикацията; ако е първата публикация, изтрийте и темата. "
+      delete_and_ignore_replies:
+        title: "Игнориране на сигнала, изтриване на публикацията и отговорите"
+        description: "Игнорирайте сигнала, като го премахнете от опашката, изтрийте публикацията и всички нейни отговори; ако е първата публикация, изтрийте и темата"
+      delete_and_agree:
+        title: "Изтрий публикацията"
+        description: "Съгласете се със сигнала и изтрийте публикацията; ако това е първата публикация, изтрийте и темата."
+      delete_and_agree_replies:
+        title: "Изтриване на публикацията и отговорите"
+        description: "Съгласете се със сигнала и изтрийте публикацията и всички нейни отговори; ако това е първата публикация, изтрийте и темата."
       disagree_and_restore:
+        title: "Не, възстанови публикацията"
         description: "Възстанови тази публикация така че всички потребители да могат да я виждат."
       disagree:
-        title: "Не съм съгласен "
+        title: "Не"
       ignore:
         title: "Игнорирай"
+      ignore_and_do_nothing:
+        title: "Не прави нищо"
+        description: "Игнорирайте сигнала, като го премахнете от опашката, без да предприемате никакви действия. Скритите публикации ще останат скрити и ще бъдат обработвани от автоматичните инструменти."
       approve:
         title: "Одобри"
       reject_user:
@@ -1362,6 +1708,11 @@ bg:
       reject:
         title: "Отхвърли"
   fallback_username: "потребител"
+  form_templates:
+    errors:
+      invalid_yaml: "не е валиден YAML низ"
+      invalid_type: "съдържа невалиден тип шаблон: %{type} (валидните типове са: %{valid_types})"
+      missing_type: "липсва тип на полето"
   time:
     <<: *datetime_formats
   activemodel:
diff --git a/config/locales/server.bs_BA.yml b/config/locales/server.bs_BA.yml
index 30a45ddff48..c4a21284ee0 100644
--- a/config/locales/server.bs_BA.yml
+++ b/config/locales/server.bs_BA.yml
@@ -761,7 +761,6 @@ bs_BA:
     autohighlight_all_code: "Force apply code highlighting to all preformatted code blocks even when they didn't explicitly specify the language."
     embed_truncate: "Truncate the embedded posts."
     embed_post_limit: "Maximum number of posts to embed."
-    show_create_topics_notice: "If the site has fewer than 5 public topics, show a notice asking admins to create some topics."
     enable_emoji: "Omogući smajlije"
     default_other_skip_new_user_tips: "Preskoči savjete i upute za novoregistrirane korisnike."
     errors:
@@ -901,9 +900,6 @@ bs_BA:
   subject_pm: "[PM] "
   user_notifications:
     previous_discussion: "Prošli Postovi"
-    unsubscribe:
-      title: "Odjavi se"
-      description: "Niste zainteresovani za ove email-e? Nema problema! Kliknite ovdje da se odjavite:"
     posted_by: "Kreirano od %{username} na dan %{post_date}"
     digest:
       why: "Ukratko šta se dešavalo na %{site_link} od vaše zadnje posjete %{last_seen_at}."
@@ -932,8 +928,6 @@ bs_BA:
     see_more: "Više"
     search_title: "Pretraži stranicu"
     search_button: "Pretraži"
-  deleted: "obrisano"
-  image: "slika"
   upload:
     edit_reason: "downloaded local copies of images"
     unauthorized: "Sorry, the file you are trying to upload is not authorized (authorized extensions: %{authorized_extensions})."
@@ -1057,7 +1051,6 @@ bs_BA:
         fields:
           contact_url:
             placeholder: "https://www.example.com/contact-us"
-  joined: "Registrovan"
   discourse_push_notifications:
     popup:
       mentioned: '%{username} vas je spomenuo/la u "%{topic}" - %{site_title}'
@@ -1081,20 +1074,20 @@ bs_BA:
       medium: "Srednije"
       high: "Visoko"
     actions:
-      agree_and_keep:
-        description: "Složij se sa prijavom ali ostavi prijavljenu objavu neizmjenjenom"
+      agree:
+        title: "Da"
       agree_and_suspend:
-        title: "Suspend User"
         description: "Složij se sa prijavom i suspendiraj prijavljenog korisnika (suspend)"
       agree_and_silence:
-        title: "Stišaj korisnika"
         description: "Složij se sa prijavom i utišaj prijavljenog korisnika (silence)"
       delete_single:
         title: "Delete"
       disagree:
-        title: "Disagree"
+        title: "Ne"
       ignore:
         title: "Zanemari"
+      ignore_and_do_nothing:
+        title: "Ne radi ništa"
       approve:
         title: "Odobri"
       reject_user:
diff --git a/config/locales/server.ca.yml b/config/locales/server.ca.yml
index 7d4b86b76c4..fac98108310 100644
--- a/config/locales/server.ca.yml
+++ b/config/locales/server.ca.yml
@@ -165,9 +165,6 @@ ca:
       load_from_remote: "Hi ha hagut un error en carregar aquesta publicació."
     site_settings:
       invalid_category_id: "Heu especificat una categoria que no existeix"
-      invalid_choice:
-        one: "Heu fet la tria no vàlida %{name}"
-        other: "Heu fet tries no vàlides %{name}"
       default_categories_already_selected: "No podeu triar una categoria emprada en una altra llista."
       s3_upload_bucket_is_required: "No podeu activar càrregues a S3 si no heu proporcionat el 's3_upload_bucket'."
       enable_s3_uploads_is_required: "No podeu habilitar l'inventari a S3 si no heu habilitat la càrrega a S3."
@@ -434,10 +431,6 @@ ca:
           attributes:
             execute_at:
               in_the_past: "ha de ser en el futur."
-        translation_overrides:
-          attributes:
-            value:
-              invalid_interpolation_keys: 'Les claus d''interpolació següents no són vàlides: "%{keys}"'
         watched_word:
           attributes:
             word:
@@ -449,22 +442,6 @@ ca:
   meta_category_description: "Discussió sobre aquest lloc web, la seva organització, com funciona i com podem millorar-lo."
   staff_category_name: "Equip responsable"
   staff_category_description: "Categoria privada per a converses de l'equip responsable. Els temes només seran visibles per a discussions entre moderadors i administradors."
-  discourse_welcome_topic:
-    body: |2
-
-      El primer paràgraf d'aquest tema afixat serà visible com a missatge de benvinguda per a totes les noves visites a la vostra pàgina principal. És important!
-
-      **Editeu-lo** i convertiu-lo en una breu descripció de la vostra comunitat:
-
-      - Per a qui és?
-      - Què hi poden trobar?
-      - Per què haurien de venir aquí?
-      - On poden llegir-ne més (enllaços, recursos, etc.)?
-
-      <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
-
-      Potser voleu tancar el tema amb l'eina d'administració :wrench: (dalt a la dreta i a baix), perquè les respostes no s'amunteguin sobre una comunicació.
-  admin_quick_start_title: "LLEGIU-ME PRIMER DE TOT: Guia ràpida d'inici per a administradors"
   category:
     topic_prefix: "Quant a la categoria %{category} "
     replace_paragraph: "(Substituïu aquest primer paràgraf per una descripció breu de la vostra nova categoria. Aquesta guia apareixerà en l'àrea de selecció de categories, de manera que intenteu mantenir-la per sota dels 200 caràcters.)"
@@ -879,7 +856,7 @@ ca:
       title: "DAU/MAU"
       xaxis: "Dia"
       yaxis: "DAU/MAU"
-      description: "Nombre de membres que han iniciat sessió el darrer dia dividit pel nombre de membres que ha iniciat sessió el darrer mes. Dóna un % que indica l'_adhesivitat_ de la comunitat. Objectiu >30%."
+      description: "Nombre de membres que han iniciat sessió el darrer dia dividit pel nombre de membres que ha iniciat sessió el darrer mes. Dóna un % que indica l'_adhesivitat_ de la comunitat. Objectiu >20%."
     daily_engaged_users:
       title: "Usuaris diaris compromesos"
       xaxis: "Dia"
@@ -1204,7 +1181,6 @@ ca:
     large_icon: "Imatge utilitzada com a base per a altres icones de metadades. Idealment hauria de ser superior a 512 x 512. Si es deixa en blanc, s'utilitzarà logo_small."
     manifest_icon: "Imatge utilitzada com a imatge de logo/splash en Android. Es redimensionarà automàticament a 512 × 512. Si es deixa en blanc, s'utilitzarà large_icon."
     favicon: "Icona per al vostre lloc web (favicon). Vegeu <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://ca.wikipedia.org/wiki/Icona_de_web</a>. Per a treballar correctament sobre un CDN, ha de ser PNG. Es redimensionarà a 32x32. Si es deixa en blanc, s'utilitzarà large_icon."
-    apple_touch_icon: "Icona utilitzada per als dispositius tàctils d'Apple. Es redimensionarà automàticament a 180x180. Si es deixa en blanc, s'utilitzarà large_icon."
     opengraph_image: "Imatge predeterminada opengraph, utilitzada quan la pàgina no té cap altra imatge adequada. Si es deixa en blanc, s'utilitzarà large_icon."
     notification_email: "Adreça de correu en el \"de:\" emprada en enviar tots els correus essencials de sistema. El domini especificat aquí ha de tenir registres SPF, DKIM i PTR inversos, configurats correctament perquè arribi el correu."
     email_custom_headers: "Llista de capçaleres de correu personalitzades, delimitada amb barres verticals"
@@ -1394,7 +1370,6 @@ ca:
     tl3_requires_likes_given: "Nombre mínim de 'M'agrada' que cal donar durant els darrers dies (període de temps nivell 3) per a optar al nivell de confiança 3."
     tl3_requires_likes_received: "Nombre mínim de 'M'agrada' que cal rebre durant els darrers dies (període de temps nivell 3) per a optar al nivell de confiança 3."
     tl3_links_no_follow: "No elimineu l'atribut rel=\"nofollow\" dels enllaços publicats per usuaris de nivell de confiança 3."
-    trusted_users_can_edit_others: "Permet als usuaris amb nivells de confiança elevats editar contingut d'altres usuaris"
     min_trust_to_create_topic: "Nivell mínim de confiança necessària per a crear un tema nou."
     allow_flagging_staff: "Si està activat, els usuaris poden marcar amb bandera publicacions de comptes de l'equip responsable. "
     min_trust_to_edit_wiki_post: "Nivell de confiança mínim necessari per a editar una publicació marcada com a wiki."
@@ -1419,7 +1394,6 @@ ca:
     title_min_entropy: "Entropia mínima (caràcters únics; els caràcters amb diacrítics compten més) necessària per al títol d'un tema."
     body_min_entropy: "Entropia mínima (caràcters únics; els caràcters amb diacrítics compten més) necessària per al cos d'una publicació."
     allow_uppercase_posts: "Permet tot majúscules en el títol o en el cos d'una publicació."
-    max_consecutive_replies: "Nombre de publicacions que un usuari ha de fer d'una tirada en un tema abans que se li impedeixi afegir una altra resposta."
     title_fancy_entities: "Converteix els caràcters comuns ASCII a entitats HTML en títols de temes, a l'estil SmartyPants <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</a>"
     min_title_similar_length: "Longitud mínima d'un títol abans que sigui consultat per a temes semblants."
     desktop_category_page_style: "Estil visual per a la pàgina /categories."
@@ -1510,7 +1484,6 @@ ca:
     pop3_polling_password: "Contrasenya del compte POP3 per a la consulta de correu."
     pop3_polling_delete_from_server: "Suprimeix els correus electrònics del servidor. NOTA: Si ho desactiveu, haureu de buidar manualment la vostra bústia de correu."
     log_mail_processing_failures: "Registra tots els errors de processament de correu electrònic en <a href='%{base_path}/logs' target='_blank'>/logs</a>"
-    email_in: 'Permet als usuaris publicar temes nous per correu (requereix consulta manual o POP3). Configureu les adreces en la pestanya "Configuració" de cada categoria.'
     email_in_min_trust: "El nivell de confiança mínim que un usuari necessita per a tenir permís per a publicar temes nous des del correu."
     email_in_spam_header: "La capçalera del correu electrònic per a detectar correu brossa."
     email_prefix: "L'[etiqueta] utilitzada en l'assumpte dels correus. Per defecte serà 'títol'."
@@ -1570,14 +1543,11 @@ ca:
     automatically_unpin_topics: "Desafixa temes automàticament quan l'usuari arribi al capdavall."
     read_time_word_count: "Recompte de paraules per minut per a calcular el temps estimat de lectura."
     topic_page_title_includes_category: "L'<a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title' target='_blank'>etiqueta del títol</a>  de la pàgina del tema inclou el nom de la categoria."
-    native_app_install_banner_ios: "Mostra el bàner de l'aplicació DiscourseHub en els dispositius iOS a usuaris habituals (nivell de confiança 1 i superior)."
-    native_app_install_banner_android: "Mostra el bàner de l'aplicació DiscourseHub en els dispositius Android a usuaris habituals (nivell de confiança 1 i superior)."
     app_association_android: "Contingut del punt final (endpoint) <a href='%{base_path}/.well-known/assetlinks.json'>.well-known/assetlinks.json</a>, utilitzat per a l’API de Digital Asset Links de Google."
     app_association_ios: "Contingut del punt final (endpoint) <a href='%{base_path}/apple-app-site-association'>apple-app-site-association</a>, utilitzat per a crear enllaços universals entre aquest lloc i les aplicacions iOS."
     share_anonymized_statistics: "Comparteix estadístiques d'ús anonimitzades."
     auto_handle_queued_age: "Tracta automàticament els registres que esperen ser revisats després d'aquest nombre de dies. Les banderes s'ignoraran. Les publicacions en cua i els usuaris seran rebutjats. Poseu-ho a 0 per a desactivar la funció."
     svg_icon_subset: "Afegiu 5 icones FontAwesome addicionals que voleu incloure en els vostres actius. Utilitzeu el prefix \"fa-\" per a icones sòlides, \"far-\" per a les icones habituals i \"fab-\" per a les icones de marca."
-    max_prints_per_hour_per_user: "Nombre màxim d'impressions de pàgina /print (deixeu-ho 0 per inhabilitar)"
     full_name_required: "El nom complet és un camp obligatori del perfil d'usuari."
     enable_names: "Mostra el nom complet de l'usuari en el seu perfil, la seva targeta d'usuari i els seus correus. Desactiveu-ho per a amagar el nom complet a tot arreu."
     display_name_on_posts: "Mostra el nom complet de l'usuari en les seves publicacions a més del seu @nomdusuari."
@@ -1594,10 +1564,7 @@ ca:
     allowed_href_schemes: "Esquemes permesos en enllaços a més de http i https."
     embed_post_limit: "Nombre màxim de publicacions que s'incrusten."
     embed_username_required: "Cal un nom d'usuari per a crear un tema."
-    notify_about_flags_after: "Si hi ha banderes que no s'han gestionat després d'aquest nombre d'hores, envia un missatge personal als moderadors. 0 per desactivar."
-    show_create_topics_notice: "Si el lloc web té menys de 5 temes públics, mostra un avís demanant als administradors que en creï uns quants. "
     delete_drafts_older_than_n_days: "Suprimeix esborranys amb més de (n) dies."
-    bootstrap_mode_min_users: "Nombre mínim d'usuaris necessaris per a desactivar el mode d'arrencada (deixeu-ho a 0 per a desactivar-lo)."
     slug_generation_method: "Trieu un mètode de generació de slugs (adreces amigables). 'encoded' generarà una cadena amb codificacions %. 'none' anul·larà totalment l'adreça amigable."
     enable_emoji: "Activa emojis"
     enable_emoji_shortcuts: "El text típic d'emojis com ara :): p :( serà convertit en emojis."
@@ -1649,7 +1616,6 @@ ca:
     revoke_api_keys_days: "Nombre de dies abans que una clau d’API no utilitzada sigui revocada  automàticament (0 per a mai)"
     allow_user_api_keys: "Permet la generació de claus API d'usuari"
     allow_user_api_key_scopes: "Llista d'àmbits permesos per a les claus d'API d'usuari"
-    min_trust_level_for_user_api_key: "Nivell de confiança necessari per a generar claus API d'usuari."
     allowed_user_api_auth_redirects: "URL permès per a la redirecció d'autenticació per a les claus de l'API d'usuari. El símbol de comodí * es pot utilitzar per a fer coincidir qualsevol part de l'URL (p. ex. www.example.com/*)."
     allowed_user_api_push_urls: "Adreces URL permeses per al 'server push' a l'API d'usuari"
     expire_user_api_keys_days: "Nombre de dies abans de l'extinció automàtica d'una clau d'API d'usuari (0 vol dir mai)"
@@ -1694,7 +1660,6 @@ ca:
       pop3_polling_password_is_empty: "Cal configurar 'pop3 polling password' abans d'activar la consulta POP3."
       pop3_polling_authentication_failed: "L'autenticació POP3 ha fallat. Verifiqueu les credencials POP3."
       reply_by_email_address_is_empty: "Cal definir 'reply by email address' abans de respondre per correu."
-      email_polling_disabled: "Cal activar la consulta manual o POP3 o manuals abans d'activar la resposta per correu."
       user_locale_not_enabled: "Cal configurar 'allow user locale' abans d'activar aquest paràmetre."
       invalid_regex: "L'expressió regular no és vàlida o no és permesa."
       email_editable_enabled: "Cal desactivar \"editable per correu\" abans d'activar aquest paràmetre."
@@ -1861,7 +1826,6 @@ ca:
     deactivated_by_staff: "Desactivat per l'equip responsable"
     activated_by_staff: "Activat per l'equip responsable"
     new_user_typed_too_fast: "Un usuari nou ha teclejat massa de pressa"
-    content_matches_auto_block_regex: "El contingut coincideix amb l'expressió regular (regex) de blocatge automàtic"
     username:
       short: "ha de tenir almenys %{min} caràcters"
       long: "no ha de ser més llarg de %{max} caràcters"
@@ -2191,7 +2155,6 @@ ca:
     user_automatically_silenced:
       title: "Usuari silenciat automàticament"
       subject_template: "El nou usuari %{username} ha estat silenciat per banderes de la comunitat"
-      text_body_template: "Això és un missatge automàtic. \n\nEl nou usuari [%{username}](%{user_url}) ha estat silenciat automàticament perquè diversos usuaris han marcat amb bandera les publicacions de %{username}. \n\n[Reviseu les banderes](%{base_url}/admin/flags). Si %{username} ha estat silenciat de manera incorrecta, feu clic en el botó de 'Desfés el silenciament' en [la pàgina d'administració per a aquest usuari](%{user_url}). \n\nAquest llindar es pot canviar mitjançant el paràmetre de configuració del lloc web `silence_new_user`.\n"
     spam_post_blocked:
       title: "Publicació de brossa blocada"
       subject_template: "L'usuari nou %{username} té entrades blocades a causa d'enllaços repetits."
@@ -2209,10 +2172,6 @@ ca:
       title: "Descarrega imatges remotes inhabilitades"
       subject_template: "Descarregant imatges remotes inhabilitades"
       text_body_template: "S'ha inhabilitat el paràmetre `download_remote_images_to_local` perquè s'ha arribat al límit d'espai de disc en `download_remote_images_threshold`."
-    dashboard_problems:
-      title: "Problemes del tauler de control"
-      subject_template: "Nou consell al tauler de control del vostre lloc web"
-      text_body_template: "Tenim uns quants consells i recomanacions basats en la configuració actual del lloc web. \n\nVisiteu el [tauler de control del lloc web](%{base_url}/admin) per a veure-ho.\n\nSi no hi ha res visible en el tauler de control, algun altre membre del personal responsable pot haver actuat segons aquestes recomanacions. Es pot veure una llista d'accions de l'equip responsable en el [registre d'accions de l'equip responsable](%{base_url}/admin/logs/staff_action_logs).\n"
     new_user_of_the_month:
       title: "Sou el nou usuari del mes!"
       subject_template: "Sou un nou usuari del mes!"
@@ -2245,9 +2204,6 @@ ca:
       one: "Alerta! Hem superat el màxim de %{count} correu diari. Comproveu el lloc web per a veure els que poden haver quedat retinguts. PS: Gràcies per ser popular!"
       other: "Alerta! Hem superat el màxim de %{count} correus diaris. Comproveu el lloc web per a veure els que poden haver quedat retinguts. PS: Gràcies per ser popular!"
     in_reply_to: "En resposta a "
-    unsubscribe:
-      title: "Cancel·la la subscripció!"
-      description: "No us interessa rebre aquests correus? Cap problema! Feu clic ací per a cancel·lar la subscripció de seguida:"
     reply_by_email: "[Visita el tema](%{base_url}%{url}) o respon a aquest correu per a contestar."
     reply_by_email_pm: "[Visiteu el missatge](%{base_url}%{url}) o responeu a aquest correu per a respondre a %{participants}."
     only_reply_by_email: "Responeu a aquest correu per a contestar."
@@ -2491,7 +2447,6 @@ ca:
       liked_received: "M'agrades rebuts"
       new_users: "Usuaris nous"
       popular_topics: "Temes populars"
-      follow_topic: "Segueix aquest tema"
       join_the_discussion: "Llegeix-ne més"
       popular_posts: "Publicacions populars"
       more_new: "Nou per a vós"
@@ -2568,15 +2523,6 @@ ca:
   offline:
     title: "No es pot carregar l'aplicació"
     offline_page_message: "Sembla que esteu fora de línia! Comproveu la connexió de xarxa i torneu-ho a provar."
-  login_required:
-    welcome_message: |
-      ## [Benvingut a %{title}](#welcome)
-      Cal tenir un compte. Creeu un compte o inicieu sessió per a continuar.
-    welcome_message_invite_only: |
-      ## [Benvingut a %{title}](#welcome)
-      Cal tenir un compte. Demaneu a un membre existent una invitació o inicieu sessió per a continuar.
-  deleted: "suprimit"
-  image: "imatge"
   upload:
     edit_reason: "còpia local d'imatges descarregada"
     unauthorized: "El fitxer que intenteu carregar no està autoritzat (extensions permeses: %{authorized_extensions})."
@@ -2653,7 +2599,6 @@ ca:
     title: "Condicions del servei"
   privacy_topic:
     title: "Política de privacitat"
-    body: "<a name=\"collect\"></a> \n\n## [Quina informació recopilem?](#collect)\n\nRecopilem informació quan us registreu en el nostre lloc web i recopilem dades quan participeu en el fòrum llegint, escrivint i avaluant el contingut que s'hi comparteix. \n\nQuan us registreu en el nostre lloc web, se us pot demanar que introduïu el nom i l'adreça de correu electrònic. Així i tot, podeu visitar el lloc web sense registrar-vos. La vostra adreça de correu electrònic es verificarà mitjançant un correu electrònic que conté un enllaç únic. Si es visita aquest enllaç, sabem que controleu l'adreça de correu. \n\nEn registrar-vos i publicar, registrem l'adreça IP des de la qual s'origina la publicació. També podem conservar els registres (logs) del servidor que incloguin l'adreça IP de cada sol·licitud al nostre servidor. \n\n<a name=\"use\"></a> \n\n## [Per a què utilitzem la vostra informació?](#use)\n\nQualsevol de les informacions que recopilem es poden utilitzar d'una de les maneres següents: \n\n* Per a personalitzar la vostra experiència: la vostra informació ens ajuda a respondre millor a les vostres necessitats individuals. \n* Per a millorar el nostre lloc web: ens esforcem contínuament per millorar el que oferim basant-nos en la informació i els comentaris que rebem de vosaltres. \n* Per a millorar el servei al client: la vostra informació ens ajuda a respondre amb més eficàcia a les vostres peticions d'atenció al client i a les vostres necessitats de suport. \n* Per a enviar correus electrònics periòdics: l'adreça de correu electrònic que proporcioneu pot utilitzar-se per a enviar-vos informació, notificacions que sol·liciteu sobre canvis en temes o en resposta al vostre nom d'usuari, respondre a consultes o altres sol·licituds o preguntes. \n\n<a name=\"protect\"></a> \n\n## [Com protegim la vostra informació?](#protect) \n\nImplementem diverses mesures de seguretat per a mantenir segura la vostra informació personal quan introduïu, envieu o accediu a la vostra informació personal. \n\n<a name=\"data-retention\"></a> \n\n## [Quina és la vostra política de retenció de dades?](#data-retention)\n\nFarem un esforç de bona fe per a: \n* Conservar els registres del servidor que continguin l'adreça IP de totes les sol·licituds a aquest servidor no més enllà de 90 dies. \n* Conservar les adreces IP associades amb els usuaris registrats i les seves publicacions no més enllà de 5 anys. \n\n<a name=\"cookies\"></a> \n\n## [Utilitzem galetes?](#cookies)\n\nSí. Les galetes (cookies) són petits fitxers que un lloc web o el seu proveïdor de serveis transfereixen al disc dur del vostre ordinador per mitjà del navegador web (si ho permeteu). Aquestes galetes permeten al lloc web reconèixer el vostre navegador i, si teniu un compte registrat, associar-lo amb el vostre compte registrat. Utilitzem galetes per a entendre i desar les vostres preferències per a visites futures i compilar dades agregades sobre el tràfic i les interaccions del lloc web de manera que puguem oferir millors experiències i eines en el futur. Podem contractar amb proveïdors de serveis de tercers per a ajudar-nos a entendre millor els visitants del nostre lloc web. Aquests proveïdors de serveis no estan autoritzats a utilitzar la informació recopilada en el nostre nom excepte per a ajudar-nos a dur a terme i millorar el nostre negoci. \n\n<a name=\"disclose\"></a>\n\n## [¿Revelem cap informació a parts externes?](#disclose)\n\nNo venem, comercialitzem ni transferim a tercers les vostres dades d'identificació personal. Això no inclou terceres parts de confiança que ens ajudin a operar el lloc web, dur a terme el nostre negoci o atendre-us, sempre que aquestes parts acordin mantenir confidencial aquesta informació. També podem publicar la vostra informació quan creiem que la publicació és adequada per a complir amb la llei, fer complir les polítiques del lloc web o protegir els nostres drets, propietat o seguretat, o els d'altri. Tanmateix, es pot proporcionar informació sobre visitants no identificables individualment a altres parts per a màrqueting, publicitat o altres usos. \n\n<a name=\"third-party\"></a> \n\n## [Enllaços de tercers](#third-party) \n\nA vegades, a la nostra discreció, podem incloure o oferir productes o serveis de tercers en el nostre lloc web. Aquests llocs de tercers tenen polítiques de privacitat separades i independents. Per tant, no tenim cap responsabilitat  pel contingut i les activitats d'aquests llocs enllaçats. Tot i això, mirem de protegir la integritat del nostre lloc web i qualsevol comentari sobre aquests llocs és benvingut. \n\n<a name=\"coppa\"></a> \n\n## [Children's Online Privacy Protection Act Compliance](#coppa) \n\nEl nostre lloc web, els nostres productes i serveis estan dirigits a persones que tinguin almenys 13 anys o més. Si aquest servidor es troba als Estats Units i teniu menys de 13 anys, segons els requisits de COPPA ([Llei de protecció de la privacitat en línia de l'infant](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)), no utilitzeu aquest lloc web. \n\n<a name=\"online\"></a>\n\n## [Política de privacitat sols en línia només](#online)\n\nAquesta política de privacitat en línia només s'aplica a la informació recopilada per mitjà del nostre lloc web i no a la informació recopilada fora de línia. \n\n<a name=\"consent\"></a>\n\n## [El vostre consentiment](#consent)\n\nEn utilitzar el nostre lloc web, accepteu la nostra política de privacitat del lloc web. \n\n<a name=\"changes\"></a>\n\n## [Canvis en la nostra política de privacitat](#changes)\n\nSi decidim canviar la nostra política de privacitat, publicarem els canvis en aquesta pàgina. Aquest document és CC-BY-SA. Es va actualitzar per darrera vegada el 31 de maig de 2013.\n"
   badges:
     editor:
       name: Editor
@@ -2931,8 +2876,6 @@ ca:
       message: "<p>Hem tornat a enviar el correu d'activació a <b>%{email}</b>"
   safe_mode:
     title: "Entra en mode segur"
-    no_unofficial_plugins: "Inhabilita tots els connectors no oficials"
-    no_plugins: "Inhabilita tots els connectors"
     enter: "Entra en mode segur"
     must_select: "Cal seleccionar almenys una opció per a entrar en mode segur."
   wizard:
@@ -2983,7 +2926,6 @@ ca:
         title: "El vostre Discourse està a punt!"
   search_logs:
     graph_title: "Recompte de cerques"
-  joined: "Registrat"
   discourse_push_notifications:
     popup:
       mentioned: '%{username} us ha mencionat en "%{topic}" - %{site_title}'
@@ -3025,50 +2967,29 @@ ca:
     conflict: "Hi ha hagut un conflicte d'actualització que us impedeix fer això."
     actions:
       agree:
-        title: "D'acord..."
-      agree_and_keep:
-        title: "Manté la publicació"
-        description: "D'acord amb la bandera i manté la publicació sense canviar. "
-      agree_and_keep_hidden:
-        title: "Manté la publicació oculta"
-        description: "D’acord amb la bandera i deixa la publicació oculta."
+        title: "Sí"
       agree_and_suspend:
-        title: "Suspèn l'usuari"
         description: "D'acord amb la bandera i suspèn l'usuari. "
       agree_and_silence:
-        title: "Silencia l'usuari"
         description: "D'acord amb la bandera i silencia l'usuari. "
       agree_and_restore:
-        title: "Restaura la publicació"
         description: "Restaura la publicació de manera que tots els usuaris puguin veure-la."
-      agree_and_hide:
-        title: "Amaga la publicació"
-        description: "Amaga aquesta publicació i envia automàticament a l'usuari un missatge que l'insti a editar-la."
       delete_single:
         title: "Suprimeix"
       delete:
         title: "Suprimeix ..."
-      delete_and_ignore:
-        title: "Elimina la publicació i ignora-la"
-        description: "Suprimeix la publicació; si és la primera, suprimeix també el tema"
       delete_and_ignore_replies:
-        title: "Suprimeix publicacions + respostes i ignora"
-        description: "Suprimeix la publicació i totes les respostes; si és la primera publicació, elimina també el tema."
         confirm: "Esteu segur que també voleu suprimir les respostes a la publicació?"
-      delete_and_agree:
-        title: "Suprimeix la publicació i accepta"
-        description: "Suprimeix la publicació; si és la primera, suprimeix també el tema"
       delete_and_agree_replies:
-        title: "Elimina publicació + respostes i accepta"
-        description: "Suprimeix la publicació i totes les respostes; si és la primera publicació, suprimeix també el tema."
         confirm: "Esteu segur que també voleu suprimir les respostes a la publicació?"
       disagree_and_restore:
-        title: "No estic d'acord i restaura la publicació"
         description: "Restaura la publicació de manera que tots els usuaris puguin veure-la."
       disagree:
-        title: "En desacord"
+        title: "No"
       ignore:
         title: "Ignora"
+      ignore_and_do_nothing:
+        title: "No facis res"
       approve:
         title: "Aprova"
       approve_post:
diff --git a/config/locales/server.cs.yml b/config/locales/server.cs.yml
index 5f366c9d345..be7793bcadf 100644
--- a/config/locales/server.cs.yml
+++ b/config/locales/server.cs.yml
@@ -361,21 +361,6 @@ cs:
   meta_category_description: "Diskutuje tento web, jeho organizaci, jak funguje a jak ho vylepšit."
   staff_category_name: "Redakce"
   staff_category_description: "Privátní kategorie pro diskuze redakce. Témata jsou viditelná pouze pro moderátory a správce."
-  discourse_welcome_topic:
-    body: |2
-
-      První odstavec tohoto připnutého tématu se zobrazí na domovské stránce jako uvítací zpráva pro všechny nové návštěvníky. Je to důležité!
-
-      **Upravte tento text** do stručného popisu Vaší komunity:
-
-      - Pro koho tu je?
-      - Co zde lze nalézt?
-      - Proč by sem měli lidé chodit?
-      - Kde se lze dozvědět víc (odkazy, zdroje, atd.)?
-
-      <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
-
-      Možná budete chtít toto téma v administraci (vpravo nahoře a dole) zavřít, aby se nehromadily odpovědi na oznámeních.
   category:
     topic_prefix: "O kategorii %{category}"
     post_template: "%{replace_paragraph}\n\nPoužijte následující odstavce pro delší popis, nebo pro vytvoření pokynů ke kategorii nebo pravidel:\n\n- Proč by lidé měli používat tuto kategorii? K čemu slouží?\n\n- Jak přesně je tato kategorie odlišná od ostatních, které již máme?\n\n- Co by měly témata v této kategorii obvykle obsahovat?\n\n- Potřebujeme tuto kategorii? Můžeme ji sloučit s jinou kategorií nebo subkategorií?\n"
@@ -960,15 +945,6 @@ cs:
         few: "%{count} users waiting for approval"
         many: "%{count} users waiting for approval"
         other: "%{count} users waiting for approval"
-    dashboard_problems:
-      title: "Problémy s administrační nástěnkou"
-      subject_template: "Nové rady na administrační nástěnce vašeho webu"
-      text_body_template: |
-        Máme pro vás několik nových rad a doporučení na základě aktuálního nastavení webu.
-
-        [Navštivte administrační nástěnku webu] (%{base_url}/admin), abyste si je mohli prohlédnout.
-
-        Pokud na vaší administrační nástěnce není nic vidět, možná již podle této rady postupoval jiný člen redakce. Seznam akcí redaktorů najdete ve vašich [protokolech akcí redakce] (%{base_url}/admin/logs/staff_action_logs).
   unsubscribe_link: |
     Pro zrušení zasílání těchto emailů [klikněte zde](%{unsubscribe_url}).
   unsubscribe_link_and_mail: |
@@ -979,9 +955,6 @@ cs:
     Pro zrušení zasílání těchto emailů [klikněte zde](%{unsubscribe_url}).
   user_notifications:
     previous_discussion: "Předchozí diskuze"
-    unsubscribe:
-      title: "Odhlásit z odběru emailů"
-      description: "Nechcete již od nás dostávat emaily? Žádný problém! Klikněte na odkaz níže pro okamžité odhlášení z odběru emailů:"
     reply_by_email: "K odpovědi [navštivte téma](%{base_url}%{url}) nebo odepište na tento email."
     visit_link_to_respond: "K odpovědi [navštivte téma](%{base_url}%{url})."
     posted_by: "Zaslal uživatel %{username} dne %{post_date}"
@@ -1020,8 +993,6 @@ cs:
     see_more: "Více"
     search_title: "Hledat na tomto webu"
     search_button: "Vyhledat"
-  deleted: "smazáno"
-  image: "obrázek"
   upload:
     unauthorized: "Bohužel, soubor, který se snažíte nahrát, není povolený (povolené přípony: %{authorized_extensions})."
     pasted_image_filename: "Vložený obrázek"
@@ -1162,7 +1133,6 @@ cs:
         title: "Pozvi redaktory"
       finished:
         title: "Váš Discourse je připraven!"
-  joined: "Účet vytvořen"
   discourse_push_notifications:
     popup:
       mentioned: 'Uživatel %{username} vás zmínil v "%{topic}" - %{site_title}'
@@ -1181,28 +1151,24 @@ cs:
       medium: "Střední"
       high: "Vysoká"
     actions:
-      agree_and_keep:
-        title: "Uchovat příspěvek"
-        description: "Schválit nahlášení a zanechat příspěvek nepozměněný. "
+      agree:
+        title: "Ano"
       agree_and_suspend:
-        title: "Zakázat uživatele"
         description: "Schválit nahlášení a pozastavit uživatele."
       agree_and_silence:
-        title: "Ztišit uživatele"
         description: "Schválit nahlášení a ztišit uživatele."
       agree_and_restore:
         description: "Obnov příspěvek, aby ho mohli vidět všichni ostatní uživatelé."
-      agree_and_hide:
-        title: "Schovat příspěvek"
-        description: "Schovat tento příspěvek a automaticky poslat uživateli zprávu, aby ho urychleně upravil."
       delete_single:
         title: "Smazat"
       disagree_and_restore:
         description: "Obnov příspěvek, aby ho mohli vidět všichni ostatní uživatelé."
       disagree:
-        title: "Neschvaluji"
+        title: "Ne"
       ignore:
         title: "ignorovat"
+      ignore_and_do_nothing:
+        title: "Nic nedělat"
       approve:
         title: "Schválit"
       reject_user:
diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml
index 16699cc9263..999a255dd1f 100644
--- a/config/locales/server.da.yml
+++ b/config/locales/server.da.yml
@@ -179,9 +179,6 @@ da:
       load_from_remote: "Der opstod en fejl ved indlæsningen af dette indlæg."
     site_settings:
       invalid_category_id: "Du angav en kategori, der ikke findes"
-      invalid_choice:
-        one: "Du angav det ugyldige valg %{name}"
-        other: "Du angav de ugyldige valg %{name}"
       default_categories_already_selected: "Du kan ikke vælge en kategori der er brugt i en anden liste."
       default_tags_already_selected: "Du kan ikke vælge et mærke, der bruges i en anden liste."
       s3_upload_bucket_is_required: "Du kan ikke aktivere overførsler til S3 med mindre du har angivet 's3_upload_bucket'."
@@ -548,10 +545,6 @@ da:
             duration_minutes:
               cannot_be_zero: "skal være større end 0."
               exceeds_maximum: "kan ikke være mere end 20 år."
-        translation_overrides:
-          attributes:
-            value:
-              invalid_interpolation_keys: 'Følgende interpolationsnøgle(r) er ugyldige: "%{keys}"'
         watched_word:
           attributes:
             word:
@@ -565,21 +558,6 @@ da:
   meta_category_description: "Diskussion om dette websted, hvordan det er organiseret, hvordan det virker og hvordan vi kan forbedre det."
   staff_category_name: "Personale"
   staff_category_description: "Privat kategori for personale diskussioner. Emner er kun synlige for administratorer og moderatorer."
-  discourse_welcome_topic:
-    body: |2
-
-      Det første afsnit af dette fastgjorte emne vil kunne ses som en velkomstbesked for alle nye besøgende på din hjemmeside. Dette er vigtigt!
-
-      **Redigér dette** til en kortfattet beskrivelse af dit fællesskab:
-
-      - Hvem er det rettet mod?
-      - Hvad kan de finde her?
-      - Hvorfor bør de komme her?
-      - Hvor finde de mere information (links, ressourcer, osv.)?
-      <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
-
-      Du bør eventuelt lukke dette emne via administratorfunktionen :wrench: (øverst til højre og i bunden), således at der ikke hober sig svar op til denne meddelelse.
-  admin_quick_start_title: "LÆS ME FØRST: Admin Quick Start Guide"
   category:
     topic_prefix: "Kategoridefinition for %{category}"
     replace_paragraph: "(Erstat dette første afsnit med en kort beskrivelse af din nye kategori. Denne vejledning vises i kategoriudvælgelsesområdet, så prøv at holde det under 200 tegn)."
@@ -1280,6 +1258,7 @@ da:
     force_https_warning: "Dit websted bruger SSL. Men '<a href='%{base_path}/admin/site_settings/category/all_results?filter=force_https'>force_https</a>' er endnu ikke aktiveret i dine webstedsindstillinger."
     out_of_date_themes: "Opdateringer er tilgængelige for følgende temaer:"
     unreachable_themes: "Vi kunne ikke tjekke for opdateringer til følgende temaer:"
+    v3_analytics_deprecated: "Din Discourse bruger i øjeblikket Google Analytics 3, som ikke længere vil blive understøttet efter juli 2023. <a href='https://meta.discourse.org/t/260498'>Opgrader til Google Analytics 4</a> nu for fortsat at modtage værdifulde indsigter og analyser af dit websteds ydeevne."
   site_settings:
     disabled: "deaktiveret"
     display_local_time_in_user_card: "Vis den lokale tid baseret på en brugers tidszone, når deres brugerkort åbnes."
@@ -1335,7 +1314,6 @@ da:
     facebook_app_access_token: "Et token genereret fra dit Facebook-app-id og hemmelighed. Bruges til at generere Instagram oneboxes."
     mobile_logo: "Logoet, der bruges på mobilversionen af dit websted. Brug et bredt rektangulært billede med en højde på 120 og et billedformat, der er større end 3: 1. Hvis det er tomt, bruges billedet fra 'logo'-indstillingen."
     favicon: "Et favicon til dit websted, se <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://en.wikipedia.org/wiki/Favicon</a>. For at fungere korrekt over et CDN skal det være en png. Ændres til 32x32. Hvis det er tomt, vil large_icon blive brugt."
-    apple_touch_icon: "Ikon der bruges til Apple touch-enheder. Vil automatisk blive skaleret til 180x180. Hvis feltet er tomt, vil large_icon blive brugt."
     notification_email: "Afsender email adresse, anvendt når der sendes esentielle system emails. Domænet her skal have korrekt opsatte SPF, DKIM og 'PTR records', for succesfuld afskibning af mails."
     email_custom_headers: "En liste af brugerdefinerede e-mail-headers adskilt af |-tegn."
     detailed_404: "Giver flere detaljer til brugerne om, hvorfor de ikke kan få adgang til et bestemt emne. Bemærk: Dette er mindre sikkert, fordi brugerne vil vide, om en URL oversættes til et gyldigt emne."
@@ -1424,12 +1402,10 @@ da:
     enable_discourse_connect: "Aktivér loin via DiscourseConnect (tidligere 'Discourse SSO') (ADVARSEL: BRUGERNES e-mailadresser *SKAL* VALIDERES AF DEN EKSTERNE SIDE!)"
     verbose_discourse_connect_logging: "Log detaljeret DiscourseConnect relateret diagnostik til <a href='%{base_path}/logs' target='_blank'>/logs</a>"
     enable_discourse_connect_provider: "Implementer DiscourseConnect (tidligere 'Discourse SSO') providerprotokollen på /session/sso_provider slutpunktet, kræver, at discourse_connect_provider_secrets indstilles"
-    discourse_connect_url: "URL til DiscourseConnect-slutpunkt (skal indeholde http:// eller https://)"
     discourse_connect_secret: "Hemmelig streng, der bruges til kryptografisk godkendelse af DiscourseConnect-oplysninger, sørg for at der er 10 tegn eller mere"
     discourse_connect_overrides_bio: "Tilsidesætter brugerbio i brugerprofilen og forhindrer brugeren i at ændre den"
     discourse_connect_overrides_groups: "Synkronisér alle manuelle gruppemedlemskaber med grupper angivet i grupper-attributten (ADVARSEL: hvis du ikke angiver grupper, vil alle manuelle gruppemedlemmer blive ryddet for brugeren)"
     discourse_connect_not_approved_url: "Omdiriger ikke-godkendte DiscourseConnect konti til denne URL"
-    discourse_connect_allows_all_return_paths: "Begræns ikke domænet for retur_stier leveret af DiscourseConnect (som standard skal retur_sti være på nuværende websted)"
     enable_local_logins: "Aktivér lokale \"brugernavn og adgangskode\" login-baserede konti. ADVARSEL: Hvis deaktiveret, kan du muligvis ikke logge ind, hvis du ikke tidligere har konfigureret mindst én alternativ loginmetode."
     enable_local_logins_via_email: "Tillad brugere at anmode om et enkelt-klik login link bliver sendt til dem via e-mail."
     allow_new_registrations: "Tillad nye brugerregistreringer. Fjern markeringen for at forhindre enhver i at oprette en ny konto."
@@ -1499,7 +1475,6 @@ da:
     tl3_requires_max_flagged: "Brugere må ikke have mere end x indlæg anmeldt af x forskellige brugere i løbet a de sidste (tl3 time period) dage for at kvalificere sig til forfremmelse til tillidsniveau 3. Hvor x er indstillingens værdi (0 eller mere)."
     tl3_promotion_min_duration: "Det mindste antal dage, som en forfremmelse til tillidsniveau 3 varer, før en bruger kan degraderes tilbage til tillidsniveau 2."
     tl3_links_no_follow: "Fjern ikke rel=nofollow fra links indsendt af tillidsniveau 3-brugere."
-    trusted_users_can_edit_others: "Tillad brugere med højt tillidsniveau at redigere indhold fra andre brugere"
     min_trust_to_create_topic: "Det mindste tillidsniveau der skal til for at oprette et nyt emne."
     allow_flagging_staff: "Hvis aktiveret, kan brugerne anmelde indlæg fra personalekonti."
     min_trust_to_edit_wiki_post: "Det mindste tillidsniveau, der kræves for at redigere indlæg markeret som wiki."
@@ -1619,7 +1594,6 @@ da:
     allowed_embed_selectors: "En kommasepareret liste over CSS-elementer, der er tilladt i embeds."
     embed_post_limit: "Maksimum antal indlæg, der skal indlejres."
     embed_username_required: "Brugernavnet til oprettelse af emne er påkrævet."
-    notify_about_flags_after: "Hvis der er anmeldelser, der ikke er blevet håndteret efter mange timer, skal der sendes en personlig besked til moderatorer. Sæt til 0 for at deaktivere."
     delete_drafts_older_than_n_days: "Slet kladder, der er ældre end (n) dage."
     delete_merged_stub_topics_after_days: "Antal dage, der skal ventes, før automatisk sletning af fuldt sammenflettede stub emner. Sæt til 0 for aldrig at slette stub emner."
     enable_emoji: "Aktivér humørikon"
@@ -1651,7 +1625,6 @@ da:
     default_tags_watching_first_post: "Liste over mærker, hvor første indlæg i hvert nyt emne vil blive overvåget som standard."
     allow_user_api_keys: "Tillad generering af bruger API nøgler"
     allow_user_api_key_scopes: "Liste over tilladte anvendelsesområder for bruger-API-nøgler"
-    min_trust_level_for_user_api_key: "Tillidsniveau påkrævet til generering af bruger API-nøgler"
     expire_user_api_keys_days: "Antal dage før en bruger API-nøgle automatisk udløber (0 for aldrig)"
     tagging_enabled: "Aktivér mærker på emner?"
     max_tags_per_topic: "Det maksimale antal mærker, der kan anvendes i et emne."
@@ -2368,14 +2341,6 @@ da:
         Se venligst vores [Retningslinjer](%{base_url}/guidelines) for yderligere vejledning.
     user_automatically_silenced:
       subject_template: "Ny bruger %{username} er blevet gjort tavs af fællesskabsanmeldelse"
-      text_body_template: |
-        Dette er en automatisk besked.
-
-        Den nye bruger [%{username}](%{user_url}) blev automatisk gjort lydløs, fordi flere brugere anmeldte %{username}'s indlæg.
-
-        Venligst [gennemse anmeldelsen](%{base_url}/admin/flags). Hvis %{username} fejlagtigt blev gjort lydløs pga. indlæg, skal du klikke på Mådeholdt (silenced) knappen på [admin siden for denne bruger](%{user_url}).
-
-        Denne tærskel kan ændres via webstedsindstillingerne 'silence_new_user'.
     spam_post_blocked:
       title: "Spam-indlæg blokeret"
       subject_template: "Ny bruger %{username} indlæg blokeret på grund af gentagne links"
@@ -2395,13 +2360,6 @@ da:
     download_remote_images_disabled:
       subject_template: "Download af eksterne billeder er slået fra"
       text_body_template: "Indstillingen `download_remote_images_to_local` blev slået fra fordi grænsen for bug af diskplads i `download_remote_images_threshold` blev nået."
-    dashboard_problems:
-      text_body_template: |
-        Vi har nogle nye råd og anbefalinger til dig baseret på dine nuværende webstedsindstillinger.
-
-        [Besøg dit webside dashboard](%{base_url}/admin) for at se det.
-
-        Hvis intet er synligt på dit dashboard, kan en anden medarbejder muligvis allerede have handlet på dette råd. En liste over medarbejderhandlinger kan findes under dine [Personale Handlingslogs] (%{base_url}/admin/logs/staff_action_logs).
     new_user_of_the_month:
       title: "Du er månedens nye bruger!"
       subject_template: "Du er månedens nye bruger!"
@@ -2426,9 +2384,6 @@ da:
   user_notifications:
     previous_discussion: "Tidligere Svar"
     in_reply_to: "Som svar på"
-    unsubscribe:
-      title: "Frameld"
-      description: "Ønsker du ikke at modtage disse e-mails? Intet problem! Klik herunder for at framelde med det samme:"
     reply_by_email: "[Besøg emnet](%{base_url}%{url}) eller svar på denne email for at svare."
     reply_by_email_pm: "[Besøg Meddelelse](%{base_url}%{url}) eller svar på denne e-mail for at svare %{participants}."
     only_reply_by_email: "Besvar denne mail for at svare."
@@ -2709,7 +2664,6 @@ da:
       liked_received: "Modtagne \"Synes godt om\""
       new_users: "Nye Brugere"
       popular_topics: "Populære Emner"
-      follow_topic: "Følg dette emne"
       join_the_discussion: "Læs mere"
       popular_posts: "Populære Indlæg"
       more_new: "Nyt for dig"
@@ -2882,12 +2836,6 @@ da:
     see_more: "Flere"
     search_title: "Søg på dette websted"
     search_button: "Søg"
-  login_required:
-    welcome_message: |
-      ## [Velkommen til %{title}](#welcome)
-      En konto er påkrævet. Opret venligst en konto eller log ind for at fortsætte.
-  deleted: "slettet"
-  image: "billede"
   upload:
     unauthorized: "Beklager, filen, som du forsøger at overføre er ikke godkendt (godkente filendelser: %{authorized_extensions})."
     pasted_image_filename: "Indsat billede"
@@ -2970,88 +2918,6 @@ da:
     title: "Vilkår"
   privacy_topic:
     title: "Privatlivspolitik"
-    body: |
-      <a name="collect"></a>
-
-      ## [Hvilke oplysninger indsamler vi?](#collect)
-
-      Vi indsamler oplysninger fra dig når du registrerer dig på vores websted og indsamler data når du deltager i forummet ved læsning, skrift, og vurdering af indhold delt her.
-
-      Når du registerer dig på vores websted, kan du blive spurgt om at indtaste dit navn og e-mail adresse. Du må dog, besøge vores websted uden registrering. Din e-mail adresse vil blive bekræftet ved at sende en e-mail, indeholdende et unikt link. Hvis dette link besøges, ved vi, at du styrer e-mail-adressen.
-
-      Når du er registreret og skriver indlæg, gemmer vi IP adressen som indlægget bliver skrevet fra. Vi kan også gemme server-logfiler, der indeholder IP adressen for hver forespørgsel til vores server.
-
-      <a name="use"></a>
-
-      ## [Hvad bruger vi dine oplysninger til?](#use)
-
-      Enhver af de oplysninger, vi indsamler fra dig, kan bruges på en af følgende måder:
-
-      * Til at personalisere din oplevelse &mdash; dine oplysninger hjælper os til bedre at reagere på dine individuelle behov.
-      * Til at forbedre vores websted &mdash; vi stræber løbende efter at forbedre vores webstedstilbud baseret på den information og feedback, vi modtager fra dig.
-      * Til at forbedre kundeservice &mdash; dine oplysninger hjælper os til mere effektiv behandling af din kundeservice forespørgsel og support behov.
-      * Til at sende periodiske e-mails &mdash; E-mail adressen du angiver, kan blive brugt til at sende dig information, notifikationer som din forespørgsel vedr. ændringer til emner eller som svar til dit brugernavn, svar på forespørgsler, og/eller andre forespørgsler eller spørgsmål.
-
-      <a name="protect"></a>
-
-      ## [Hvordan beskytter vi dine oplysninger?](#protect)
-
-      Vi implementerer en række sikkerhedsforanstaltninger for at opretholde sikkerheden af dine personlige oplysninger, når du indtaster, indsender eller får adgang til dine personlige oplysninger.
-
-      <a name="data-retention"></a>
-
-      ## [Hvad er din politik for opbevaring af data?](#data-retention)
-
-      Vi bestræber os i god tro på at:
-
-      * Gem serverlogfiler, der indeholder IP-adressen på alle anmodninger til denne server, i ikke mere end 90 dage.
-      * Beholde IP-adresserne, der er knyttet til registrerede brugere, og deres indlæg i ikke mere end 5 år.
-
-      <a name="cookies"></a>
-
-      ## [Benytter vi cookies?](#cookies)
-
-      Ja. Cookies er små filer, som et websted eller dets tjenesteudbyder overfører til din computers harddisk gennem din webbrowser (hvis du tillader det). Disse cookies gør det muligt for webstedet at genkende din browser, og hvis du har en registreret konto, knytte den til din registrerede konto.
-
-      Vi bruger cookies til at forstå og gemme dine præferencer til fremtidige besøg og samle samlede data om webstrafik og webstedsinteraktion, så vi kan tilbyde bedre webstedsoplevelser og værktøjer i fremtiden. Vi kan indgå kontrakt med tredjepartsudbydere for at hjælpe os med bedre forståelse af vores besøgende. Disse tjenesteudbydere har ikke tilladelse til at bruge de oplysninger, der er indsamlet på vores vegne, undtagen for at hjælpe os med at drive og forbedre vores forretning.
-
-      <a name="disclose"></a>
-
-      ## [Videregiver vi nogen oplysninger til eksterne parter?](#disclose)
-
-      Vi sælger, handler eller på anden måde overfører ikke dine personligt identificerbare oplysninger til eksterne parter. Dette inkluderer ikke pålidelige tredjeparter, der hjælper os med at betjene vores websted, drive vores forretning eller servicere dig, så længe disse parter er enige om at holde disse oplysninger fortrolige. Vi kan også frigive dine oplysninger, når vi mener, at frigivelse er passende for at overholde loven, håndhæve vores webstedspolitikker eller beskytte vores eller andres rettigheder, ejendom eller sikkerhed. Ikke-personligt identificerbar besøgsinformation kan dog leveres til andre parter til markedsføring, reklame eller anden anvendelse.
-
-      <a name="third-party"></a>
-
-      ## [Tredjeparts links](#third-party)
-
-      Lejlighedsvis kan vi, efter vores skøn, inkludere eller tilbyde tredjepartsprodukter eller tjenester på vores websted. Disse tredjepartswebsteder har separate og uafhængige privatlivspolitikker. Vi har derfor intet ansvar eller ansvar for indholdet og aktiviteterne på disse linkede sider. Ikke desto mindre forsøger vi at beskytte integriteten af vores websted og hilser enhver feedback om disse websteder velkommen.
-
-      <a name="coppa"></a>
-
-      ## [Overholdelse af børns online privatlivslov](#coppa)
-
-      Vores side, produkter og tjenester er alle rettet mod mennesker, der er mindst 13 år eller ældre. Hvis denne server er i USA, og du er under 13 år, i henhold til kravene i COPPA ([Children's Online Privacy Protection Act] (https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)), skal du ikke bruge dette websted.
-
-      <a name="online"></a>
-
-      ## [Kun privatlivspolitik online](#online)
-
-      Denne fortrolighedspolitik online gælder kun for information indsamlet via vores websted og ikke for information indsamlet offline.
-
-      <a name="consent"></a>
-
-      ## [Dit samtykke](#consent)
-
-      Ved at bruge vores side giver du dit samtykke til vores fortrolighedspolitik for webstedet.
-
-      <a name="changes"> </a>
-
-      ## [Ændringer i vores fortrolighedspolitik](#changes)
-
-      Hvis vi beslutter at ændre vores fortrolighedspolitik, offentliggør vi disse ændringer på denne side.
-
-      Dette dokument er CC-BY-SA. Det blev sidst opdateret 31. maj 2013.
   badges:
     mass_award:
       errors:
@@ -3342,8 +3208,6 @@ da:
       message: "<p>Vi har gensendt aktiverings-e-mailen til <b>%{email}</b>"
   safe_mode:
     title: "Gå ind i fejlsikret tilstand"
-    no_unofficial_plugins: "Deaktiver uofficielle udvidelser"
-    no_plugins: "Deaktiver alle udvidelsesmoduler"
     enter: "Gå ind i fejlsikret tilstand"
     must_select: "Du skal vælge mindst én mulighed for at gå i fejlsikret tilstand."
   wizard:
@@ -3398,7 +3262,6 @@ da:
         title: "Discourse er gjort klar til dig!"
   search_logs:
     graph_title: "Antal søgninger"
-  joined: "Tilmeldt"
   discourse_push_notifications:
     popup:
       mentioned: '%{username} nævnte dig i "%{topic}" - %{site_title}'
@@ -3443,44 +3306,25 @@ da:
       queued_by_staff: "En medarbejder mener, at dette indlæg har brug for gennemgang. Den forbliver skjult indtil da."
     actions:
       agree:
-        title: "Enig..."
-      agree_and_keep:
-        title: "Behold Indlæg"
-      agree_and_keep_hidden:
-        title: "Behold Indlæg Skjult"
-      agree_and_suspend:
-        title: "Suspendér Bruger"
-      agree_and_silence:
-        title: "Mådehold (silence) Bruger"
+        title: "Ja"
       agree_and_restore:
-        title: "Gendan Indlæg"
         description: "Gendan indlægget, så alle brugere kan se det."
-      agree_and_hide:
-        title: "Skjul Indlæg"
-        description: "Skjul dette indlæg og send automatisk brugeren en meddelelse, der opfordrer dem til at redigere det."
       delete_single:
         title: "Slet"
       delete:
         title: "Slet..."
-      delete_and_ignore:
-        title: "Slet Indlæg og Ignorer"
-        description: "Slet indlæg; Hvis det er første indlæg, skal emnet også slettes"
       delete_and_ignore_replies:
-        description: "Slet indlæg og alle dets svar Hvis det er første indlæg, så slet også emnet"
         confirm: "Er du sikker på, at du også vil slette svarene på indlægget?"
-      delete_and_agree:
-        title: "Slet Indlæg og Accepter"
-        description: "Slet indlæg; Hvis det er første indlæg, skal emnet også slettes"
       delete_and_agree_replies:
-        title: "Slet Indlæg + Svar og Accepter"
-        description: "Slet indlæg og alle dets svar Hvis det er første indlæg, så slet også emnet"
         confirm: "Er du sikker på, at du også vil slette svarene på indlægget?"
       disagree_and_restore:
         description: "Gendan indlægget, så alle brugere kan se det."
       disagree:
-        title: "Uenig"
+        title: "Nej"
       ignore:
         title: "Ignorér"
+      ignore_and_do_nothing:
+        title: "Gøre ingenting"
       approve:
         title: "Godkend"
       approve_post:
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index d6baf6e91b2..0bde87568d9 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -52,6 +52,11 @@ de:
   remove_posts_deleted_by_author: "Gelöscht vom Verfasser"
   redirect_warning: "Wir konnten nicht überprüfen, dass der ausgewählte Link tatsächlich im Forum geteilt wurde. Wenn du trotzdem fortfahren möchtest, wähle den Link unten aus."
   on_another_topic: "Zu einem anderen Thema"
+  topic_category_changed: "Von %{from} bis %{to}"
+  topic_tag_changed:
+    added_and_removed: "%{added} hinzugefügt und %{removed} entfernt"
+    added: "%{added} hinzugefügt"
+    removed: "%{removed} entfernt"
   inline_oneboxer:
     topic_page_title_post_number: "#%{post_number}"
     topic_page_title_post_number_by_user: "#%{post_number} von %{username}"
@@ -191,8 +196,8 @@ de:
       invalid_site_setting: "Es ist keine Einstellung mit dem Namen „%{name}“ vorhanden"
       invalid_category_id: "Du hast eine Kategorie angegeben, die nicht existiert"
       invalid_choice:
-        one: "Du hast die ungültige Auswahl %{name} getroffen"
-        other: "Du hast die ungültigen Auswahlen %{name} getroffen"
+        one: "„%{name}“ ist eine ungültige Option."
+        other: "„%{name}“ sind ungültige Optionen."
       default_categories_already_selected: "Du kannst keine Kategorie auswählen, welche bereits in einer anderen Liste benutzt wird."
       default_tags_already_selected: "Du kannst kein Schlagwort wählen, das in einer anderen Liste verwendet wird."
       s3_upload_bucket_is_required: "Uploads auf S3 können nicht aktiviert werden, bevor der „s3_upload_bucket“ eingetragen wurde."
@@ -200,7 +205,8 @@ de:
       page_publishing_requirements: "Die Veröffentlichung von Seiten kann nicht aktiviert werden, wenn sichere Medien aktiviert sind."
       s3_backup_requires_s3_settings: "Du kannst S3 nicht als Backup-Ort verwenden, solange du „%{setting_name}“ nicht festgelegt hast."
       s3_bucket_reused: "Du kannst nicht denselben Bucket für „s3_upload_bucket“ und „s3_backup_bucket“ verwenden. Bitte verwende einen anderen Bucket oder verwende für jeden Bucket einen anderen Pfad."
-      secure_uploads_requirements: "S3-Uploads müssen vor dem Aktivieren sicherer Uploads aktiviert sein."
+      secure_uploads_requirements: "S3-Uploads und S3-ACLs müssen aktiviert sein, bevor du sichere Uploads aktivieren kannst."
+      s3_use_acls_requirements: "Du musst S3-ACLs aktiviert haben, wenn sichere Uploads aktiviert sind."
       share_quote_facebook_requirements: "Du musst eine Facebook-App-ID festlegen, um das Teilen von Zitaten für Facebook zu aktivieren."
       second_factor_cannot_enforce_with_socials: "Du kannst 2FA nicht erzwingen, wenn die Anmeldung über soziale Netzwerke aktiviert ist. Du musst zuerst die Anmeldung über %{auth_provider_names} deaktivieren"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Du kannst 2FA nicht erzwingen, wenn lokale Anmeldungen deaktiviert sind."
@@ -221,6 +227,10 @@ de:
         other: "Leider konnten wir keine Vorschau für diese Webseite erstellen, da die folgenden oEmbed-/OpenGraph-Tags nicht gefunden werden konnten: %{missing_attributes}"
   word_connector:
     comma: ", "
+  custom_fields:
+    validations:
+      max_items: "Die maximale Anzahl der benutzerdefinierten Felder für diese Entität wurde erreicht (%{max_items_number})"
+      max_value_length: "Die maximale Länge für einen benutzerdefinierten Feldwert wurde erreicht (%{max_value_length})"
   invite:
     expired: "Dein Einladungstoken ist abgelaufen. Bitte <a href='%{base_url}/about'>kontaktiere das Team</a>."
     not_found: "Dein Einladungstoken ist ungültig. Bitte <a href='%{base_url}/about'>kontaktiere das Team</a>."
@@ -239,6 +249,7 @@ de:
     user_exists: "Es ist nicht nötig, <b>%{email}</b> einzuladen. Die Person hat bereits ein Konto!"
     invite_exists: "Du hast <b>%{email}</b> bereits eingeladen."
     invalid_email: "%{email} ist keine gültige E-Mail-Adresse."
+    generic_error_response: "Es gab ein Problem mit deiner Anfrage."
     rate_limit:
       one: "Du hast in den letzten 24 Stunden bereits %{count} Einladung verschickt, bitte warte %{time_left}, bevor du es erneut versuchst."
       other: "Du hast in den letzten 24 Stunden bereits %{count} Einladungen verschickt, bitte warte %{time_left}, bevor du es erneut versuchst."
@@ -400,6 +411,7 @@ de:
   too_late_to_edit: "Dieser Beitrag wurde vor zu langer Zeit erstellt. Er kann nicht mehr bearbeitet oder gelöscht werden."
   edit_conflict: "Dieser Beitrag wurde von einem anderen Benutzer bearbeitet und deine Änderungen können nicht länger gespeichert werden."
   revert_version_same: "Die aktuelle Version entspricht der Version, zu der du zurückkehren möchtest."
+  reverted_to_version: "auf Version #%{version} zurückgesetzt"
   cannot_edit_on_slow_mode: "Dieses Thema befindet sich im langsamen Modus. Um durchdachte, überlegte Diskussionen anzuregen, ist das Bearbeiten alter Beiträge in diesem Thema während des langsamen Modus nicht zulässig."
   excerpt_image: "Bild"
   bookmarks:
@@ -502,6 +514,7 @@ de:
       Es ist für alle einfacher, Themen zu lesen, die wenige umfassende Antworten statt viele kleine und einzelne Antworten haben.
     dominating_topic: Du hast in diesem Thema schon eine Menge gepostet! Gib doch auch anderen die Möglichkeit, hier zu antworten und miteinander zu diskutieren.
     get_a_room: Du hast @%{reply_username} %{count} Mal geantwortet. Wusstest du, dass du der Person stattdessen eine persönliche Nachricht schicken kannst?
+    dont_feed_the_trolls: Dieser Beitrag wurde bereits für die Moderation markiert. Bist du sicher, dass du darauf antworten möchtest? Antworten auf negative Inhalte ermutigen eher zu noch mehr negativem Verhalten.
     too_many_replies: |
       ### Du hast das Antwort-Limit für dieses Thema erreicht
 
@@ -591,7 +604,9 @@ de:
         translation_overrides:
           attributes:
             value:
-              invalid_interpolation_keys: 'Die folgenden Variablennamen sind ungültig: „%{keys}“'
+              invalid_interpolation_keys:
+                one: "Der folgende Variablenname ist ungültig: %{keys}"
+                other: "Die folgenden Variablennamen sind ungültig: %{keys}"
         watched_word:
           attributes:
             word:
@@ -612,22 +627,22 @@ de:
   staff_category_name: "Team"
   staff_category_description: "Private Kategorie für Team-Diskussionen. Themen sind nur für Administratoren und Moderatoren sichtbar."
   discourse_welcome_topic:
-    title: "Willkommen in unserer Community!"
-    body: |2
+    title: "Willkommen bei %{site_title}! :wave:"
+    body: |
+      Wir freuen uns sehr, dass du dabei bist.
 
-      Der erste Absatz dieses angehefteten Themas wird allen neuen Besuchern als Begrüßungsnachricht angezeigt. Er ist wichtig!
+      %{site_info_quote}
 
-      **Bearbeite dies** und erstelle eine kurze Beschreibung deiner Community:
+      Hier sind einige Dinge, die du tun kannst, um loszulegen:
 
-      - Für wen ist sie?
-      - Was findet man hier?
-      - Warum sollte man hier vorbeischauen?
-      - Wo kann man mehr erfahren (Links, Dokumente usw.)?
+      :speaking_head: **Stelle dich vor**, indem du dein Bild und Informationen über dich und deine Interessen in [dein Profil](%{base_path}/my/preferences/account) einstellst. Worüber würdest du gerne befragt werden?
 
-      <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+      :open_book: **Lerne die Community** kennen, indem du [in den Diskussionen stöberst](%{base_path}/top), die hier bereits stattfinden. Wenn du einen Beitrag interessant, informativ oder unterhaltsam findest, benutze :heart:, um deine Wertschätzung oder Unterstützung zu zeigen!
 
-      Du solltest dieses Thema eventuell mittels Themen-Administration :wrench: (oben rechts oder unten) schließen, damit sich bei dieser Ankündigung nicht die Antworten anhäufen.
-  admin_quick_start_title: "ZUERST LESEN: Administrator-Kurzanleitung"
+      :handshake: **Trage zur Diskussion bei**, indem du kommentierst, deine eigene Sichtweise teilst, Fragen stellst oder Feedback gibst. Bevor du antwortest oder neue Themen beginnst, lies bitte die [Community-Richtlinien](%{base_path}/faq).
+
+      > Wenn du Hilfe brauchst oder einen Vorschlag hast, kannst du unter [#feedback](%{base_path}/c/site-feedback) fragen oder [die Administratoren kontaktiern](%{base_path}/about).
+  admin_quick_start_title: "Administratorhandbuch: Erste Schritte"
   category:
     topic_prefix: "Über die Kategorie %{category}"
     replace_paragraph: "(Ersetze diesen ersten Absatz mit einer kurzen Beschreibung deiner neuen Kategorie. Diese Orientierung wird in der Kategorienauswahl angezeigt, versuche also, weniger als 200 Zeichen zu benutzen.)"
@@ -646,6 +661,7 @@ de:
       disallowed_tags_generic: "Dieses Thema hat unerlaubte Schlagwörter."
       slug_contains_non_ascii_chars: "enthält Nicht-ASCII-Zeichen"
       is_already_in_use: "wird bereits verwendet"
+      move_topic_to_category_disallowed: "Du kannst dieses Thema nicht in eine Kategorie verschieben, in der du keine Berechtigung hast, neue Themen zu erstellen."
     cannot_delete:
       uncategorized: "Diese Kategorie ist etwas Spezielles. Sie dient als Bereich für Themen, die keine Kategorie haben, und kann nicht gelöscht werden."
       has_subcategories: "Diese Kategorie kann nicht gelöscht werden, weil sie Unterkategorien enthält."
@@ -1109,7 +1125,7 @@ de:
       title: "TAB/MAB"
       xaxis: "Tag"
       yaxis: "TAB/MAB"
-      description: "Anzahl der Mitglieder, die sich innerhalb des letzten Tages angemeldet haben, geteilt durch die Anzahl der Mitglieder, die sich im letzten Monat angemeldet haben – liefert eine Prozentzahl, welche die „Bindung“ der Community angibt. Erstrebenswert sind 30 % oder mehr."
+      description: "Anzahl der Mitglieder, die sich innerhalb des letzten Tages angemeldet haben, geteilt durch die Anzahl der Mitglieder, die sich im letzten Monat angemeldet haben – liefert eine Prozentzahl, welche die „Bindung“ der Community angibt. Erstrebenswert sind 20 % oder mehr."
     daily_engaged_users:
       title: "Täglich engagierte Benutzer"
       xaxis: "Tag"
@@ -1378,6 +1394,7 @@ de:
     image_magick_warning: 'Der Server ist so konfiguriert, dass er Vorschaubilder von großen Bildern erstellt, aber ImageMagick ist nicht installiert. Installiere ImageMagick mit deinem bevorzugten Paketmanager oder <a href="https://www.imagemagick.org/script/download.php" target="_blank">lade die aktuelle Version herunter</a>.'
     failing_emails_warning: '%{num_failed_jobs} E-Mail-Jobs sind fehlgeschlagen. Überprüfe deine app.yml und stelle sicher, dass die Mailservereinstellungen korrekt sind. <a href="%{base_path}/sidekiq/retries" target="_blank">Fehlgeschlagene Jobs in Sidekiq anzeigen</a>.'
     subfolder_ends_in_slash: "Deine Unterordner-Konfiguration ist fehlerhaft; DISCOURSE_RELATIVE_URL_ROOT endet mit einem Schrägstrich."
+    outdated_translations_warning: "Einige deiner Übersetzungsüberschreibungen sind nicht mehr aktuell. Bitte überprüfe deine <a href='%{base_path}/admin/customize/site_texts?outdated=true'>Textanpassungen</a>."
     email_polling_errored_recently:
       one: "Beim Abrufen von E-Mails ist in den letzten 24 Stunden ein Fehler aufgetreten. Weitere Informationen findest du <a href='%{base_path}/logs' target='_blank'>in den Protokollen</a>."
       other: "Beim Abrufen von E-Mails sind in den letzten 24 Stunden %{count} Fehler aufgetreten. Weitere Informationen findest du <a href='%{base_path}/logs' target='_blank'>in den Protokollen</a>."
@@ -1389,6 +1406,8 @@ de:
     out_of_date_themes: "Updates sind für die folgenden Themes verfügbar:"
     unreachable_themes: "Wir konnten die folgenden Themes nicht auf Updates prüfen:"
     watched_word_regexp_error: "Der reguläre Ausdruck für „%{action}“ überwachte Wörter ist ungültig. Bitte überprüfe deine <a href='%{base_path}/admin/customize/watched_words'>Einstellungen für überwachte Wörter</a> oder deaktiviere die Website-Einstellung „watched words regular expressions“."
+    v3_analytics_deprecated: "Dein Discourse verwendet derzeit Google Analytics 3, das ab Juli 2023 nicht mehr unterstützt wird. <a href='https://meta.discourse.org/t/260498'>Aktualisiere jetzt auf Google Analytics 4</a>, um weiterhin wertvolle Einblicke und Analysen zur Leistung deiner Website zu erhalten."
+    legacy_navigation_menu_deprecated: "Dein Discourse verwendet derzeit das „alte“ Navigationsmenü, das <a href='https://meta.discourse.org/t/removing-the-legacy-hamburger-navigation-menu-option/265274'>in der ersten Betaversion von Discourse 3.2</a> entfernt wird. Stelle auf das neue Navigationsmenü um, indem du deine <a href='%{base_path}/admin/site_settings/category/all_results?filter=navigation_menu'>Navigationsmenü-Website-Einstellung</a> auf „Seitenleiste“ oder „Kopfzeilen-Drop-down“ aktualisierst."
   site_settings:
     allow_bulk_invite: "Erlaube Masseneinladungen durch Hochladen einer CSV-Datei"
     disabled: "deaktiviert"
@@ -1454,8 +1473,11 @@ de:
     fixed_category_positions_on_create: "Wenn diese Option aktiviert ist, wird die Reihenfolge der Kategorien im Dialog zur Themenerstellung beibehalten (erfordert fixed_category_positions)."
     add_rel_nofollow_to_user_content: 'Füge mit Ausnahme interner Links (schließt übergeordnete Domains ein) allen benutzergenerierten Inhalten „rel nofollow“ hinzu. Die Änderung dieser Einstellung erfordert, dass du sämtliche Beiträge aktualisierst: „rake posts:rebake“'
     exclude_rel_nofollow_domains: "Eine Liste von Domains, bei denen nofollow bei Links nicht hinzugefügt werden soll. example.com wird automatisch auch Subdomains wie sub.example.com erlauben. Zumindest solltest du die Domain dieser Website hinzufügen, um Webcrawlern zu helfen, alle Inhalte zu finden. Wenn andere Teile der Website auf anderen Domains liegen, füge auch diese hinzu."
+    max_form_template_title_length: "Maximal zulässige Länge für Titel einer Formularvorlage."
+    max_form_template_content_length: "Maximal zulässige Länge für den Inhalt einer Formularvorlage."
     post_excerpt_maxlength: "Maximale Länge eines Beitrags-Auszuges bzw. -Zusammfassung."
     topic_excerpt_maxlength: "Maximale Länge eines Themenauszugs/einer Zusammenfassung, generiert aus dem ersten Beitrag eines Themas."
+    default_subcategory_on_read_only_category: "Aktiviert die Schaltfläche „Neues Thema“ und wählt eine Standard-Unterkategorie aus, um in Kategorien zu posten, in denen der Benutzer kein neues Thema erstellen darf."
     show_pinned_excerpt_mobile: "Zeige einen Auszug angehefteter Themen in der mobilen Ansicht."
     show_pinned_excerpt_desktop: "Zeige einen Auszug angehefteter Themen in der Desktop-Ansicht."
     post_onebox_maxlength: "Maximale Länge eines Onebox-Discourse-Beitrags in Zeichen."
@@ -1477,7 +1499,7 @@ de:
     manifest_icon: "Das Bild, das als Logo/Splash-Bild auf Android benutzt wird. Es wird automatisch auf 512 x 512 gesetzt. Falls leer, wird large_icon genutzt."
     manifest_screenshots: "Screenshots, die die Merkmale und Funktionen deiner Instanz auf der Seite mit der Installationsaufforderung zeigen. Alle Bilder sollten lokal hochgeladen werden und die gleichen Abmessungen haben."
     favicon: "Ein Favicon für die Website, siehe <a href='https://de.wikipedia.org/wiki/Favicon' target='_blank'>https://de.wikipedia.org/wiki/Favicon</a>. Damit es auch über eine CDN richtig funktioniert, muss es ein PNG sein. Wird auf eine Größe von 32 x 32 gesetzt. Falls leer, wird large_icon verwendet."
-    apple_touch_icon: "Icon für Apple-Touch-Geräte. Wird automatisch auf eine Größe von 180 x 180 gesetzt. Falls leer, wird large_icon verwendet."
+    apple_touch_icon: "Symbol für Apple-Touch-Geräte. Ein transparenter Hintergrund ist nicht empfehlenswert. Die Größe wird automatisch auf 180 x 180 angepasst. Wenn du nichts angibst, wird large_icon verwendet."
     opengraph_image: "Standard-Opengraph-Bild. Wird verwendet, wenn die Seite kein anderes passendes Bild hat. Falls leer, wird large_icon verwendet."
     twitter_summary_large_image: "Twitter-Karte „summary large image“ (sollte mindestens 280 Pixel in der Breite und mindestens 150 Pixel in der Höhe sein, keine .svg-Datei). Wenn das Feld leer gelassen wird, werden die regulären Metadaten der Karte aus dem opengraph_image generiert, sofern es sich nicht ebenfalls um eine .svg-Datei handelt"
     notification_email: "Die E-Mail-Adresse, die als „from:“-Absender aller wichtigen System-E-Mails benutzt wird. Die angegebene Domain sollte über korrekte SPF-, DKIM- und Reverse-PTR-Einträge verfügen, damit E-Mails sicher zugestellt werden können."
@@ -1493,6 +1515,8 @@ de:
     summary_percent_filter: "Zeige die Top-% der Beiträge eines Themas in der „Dieses Thema zusammenfassen“-Ansicht."
     summary_max_results: "Maximale Anzahl der Beiträge in der „Dieses Thema zusammenfassen“-Ansicht"
     summary_timeline_button: "Schaltfläche „Zusammenfassen“ in der Zeitleiste anzeigen"
+    summarization_strategy: "Zusätzliche Möglichkeiten, von Plug-ins registrierte Inhalte zusammenzufassen"
+    custom_summarization_allowed_groups: "Gruppen, die Inhalte mit `summarization_strategy` zusammenfassen dürfen."
     enable_personal_messages: "VERALTET, stattdessen die Einstellung „personal message enabled groups“ verwenden. Benutzern mit Vertrauensstufe 1 erlauben (konfigurierbar über die minimale Vertrauensstufe zum Senden von Nachrichten), Nachrichten zu erstellen und auf Nachrichten zu antworten. Team-Mitglieder können immer Nachrichten senden."
     personal_message_enabled_groups: "Benutzern innerhalb dieser Gruppen erlauben, Nachrichten zu erstellen und auf Nachrichten zu antworten. Vertrauensstufengruppen umfassen alle Vertrauensstufen über dieser Nummer, zum Beispiel erlaubt die Wahl von trust_level_1 auch Benutzern mit trust_level_2, 3, 4 private Nachrichten zu senden. Team-Mitglieder können immer Nachrichten senden."
     enable_system_message_replies: "Erlaube Benutzern, auf Systemnachrichten zu antworten, auch wenn persönliche Nachrichten deaktiviert sind"
@@ -1587,6 +1611,7 @@ de:
     enable_badges: "Abzeichen aktivieren"
     max_favorite_badges: "Maximale Anzahl von Abzeichen, die der Benutzer auswählen kann"
     whispers_allowed_groups: "Private Kommunikation innerhalb von Themen für Mitglieder bestimmter Gruppen erlauben."
+    hidden_post_visible_groups: "Erlaube Mitgliedern dieser Gruppen, ausgeblendete Beiträge aufzurufen. Team-Mitglieder können jederzeit ausgeblendete Beiträge aufrufen."
     allow_index_in_robots_txt: "Lege in der robots.txt fest, dass diese Website von Websuchmaschinen indiziert werden darf. In Ausnahmefällen kannst du die <a href='%{base_path}/admin/customize/robots'>robots.txt dauerhaft überschreiben</a>."
     blocked_email_domains: "Eine durch senkrechte Striche getrennte Liste von E-Mail-Domains, mit denen Benutzer keine Konten registrieren dürfen. Subdomains werden automatisch für die angegebenen Domains behandelt. Die Wildcard-Symbole * und ? werden nicht unterstützt. Beispiel: mailinator.com|trashmail.net"
     allowed_email_domains: "Eine durch senkrechte Striche getrennte Liste von E-Mail-Domains, mit denen Benutzer Konten registrieren MÜSSEN. Subdomains werden automatisch für die angegebenen Domains behandelt. Die Wildcard-Symbole * und ? werden nicht unterstützt. WARNUNG: Benutzer mit anderen als den aufgeführten E-Mail-Domains sind nicht zugelassen!"
@@ -1613,7 +1638,7 @@ de:
     enable_discourse_connect: "Aktiviere die Anmeldung über DiscourseConnect (ehemals „Discourse SSO“) (WARNUNG: E-MAIL-ADRESSEN DER BENUTZER *MÜSSEN* VON DER EXTERNEN WEBSITE VALIDIERT WERDEN!)"
     verbose_discourse_connect_logging: "Protokolliere ausführliche DiscourseConnect-bezogene Diagnose in <a href='%{base_path}/logs' target='_blank'>/logs</a>"
     enable_discourse_connect_provider: "Implementiere das DiscourseConnect-Anbieter-Protokoll (früher „Discourse SSO“) am Endpunkt /session/sso_provider; discourse_connect_provider_secrets muss festgelegt sein"
-    discourse_connect_url: "URL des DiscourseConnect-Endpunkts (muss http:// oder https:// enthalten)"
+    discourse_connect_url: "URL des DiscourseConnect-Endpunkts (muss http:// oder https:// enthalten und darf keinen abschließenden Schrägstrich aufweisen)"
     discourse_connect_secret: "Geheime Zeichenfolge zur kryptografischen Authentifizierung von DiscourseConnect-Informationen. Stelle sicher, dass sie 10 Zeichen oder länger ist"
     discourse_connect_provider_secrets: "Eine Liste von Domain-Geheimnis-Paaren, die DiscourseConnect verwenden. Stelle sicher, dass das DiscourseConnect-Geheimnis 10 Zeichen oder länger ist. Das Platzhaltersymbol * kann verwendet werden, um eine Domain oder nur einen Teil davon auszuwählen (z. B. * .example.com)."
     discourse_connect_overrides_bio: "Überschreibt die Benutzerbiografie im Benutzerprofil und verhindert, dass der Benutzer sie ändert"
@@ -1627,7 +1652,7 @@ de:
     discourse_connect_overrides_profile_background: "Überschreibt den Hintergrund des Benutzerprofils mit dem Wert aus dem DiscourseConnect-Payload."
     discourse_connect_overrides_card_background: "Überschreibt den Hintergrund der Benutzerkarte mit dem Wert aus dem DiscourseConnect-Payload."
     discourse_connect_not_approved_url: "Nicht genehmigte DiscourseConnect-Konten zu dieser URL weiterleiten"
-    discourse_connect_allows_all_return_paths: "Beschränke die von DiscourseConnect bereitgestellte Domain für return_paths nicht (standardmäßig muss der Return-Path auf der aktuellen Website liegen)"
+    discourse_connect_allowed_redirect_domains: "Beschränke die von DiscourseConnect zur Verfügung gestellten return_paths auf diese Domains (standardmäßig muss der Rückgabepfad auf der aktuellen Website liegen). Verwende *, um jede beliebige Domain als Rückgabepfad zuzulassen. Wildcards für Subdomains (`*.foobar.com`) sind nicht erlaubt."
     enable_local_logins: "Aktiviert lokale Konten mit Anmeldung über Benutzername und Passwort. WARNUNG: Wenn deaktiviert, kannst du dich möglicherweise nicht mehr anmelden, wenn du nicht vorher mindestens eine alternative Anmeldemethode konfiguriert hast."
     enable_local_logins_via_email: "Erlaube Benutzern, einen Ein-Klick-Anmelde-Link anzufordern, der ihnen per E-Mail zugeschickt wird."
     allow_new_registrations: "Erlaube das Registrieren neuer Benutzerkonten. Wird dies deaktiviert, so kann niemand mehr ein neues Konto erstellen."
@@ -1663,6 +1688,7 @@ de:
     s3_configure_tombstone_policy: "Aktiviere die automatische Löschregel für Uploads im Papierkorb. WICHTIG: Wenn deaktiviert, wird kein Speicherplatz freigegeben, wenn Uploads gelöscht werden."
     s3_disable_cleanup: "Verhindere das Entfernen von alten Backups aus S3, wenn es mehr Backups als das erlaubte Maximum gibt."
     enable_s3_inventory: "Erstelle Berichte und überprüfe Uploads mit Amazon-S3-Bestand. WICHTIG: Benötigt gültige S3-Anmeldedaten (sowohl „access key id“ als auch „secret access key“)."
+    s3_use_acls: "AWS empfiehlt, keine ACLs auf S3-Buckets zu verwenden; wenn du diesem Rat folgst, deaktiviere diese Option. Diese Option muss aktiviert sein, wenn du sichere Uploads verwendest."
     backup_time_of_day: "Uhrzeit in UTC, zu der Backups ausgeführt werden sollen."
     backup_with_uploads: "Hochgeladene Dateien bei geplanten Backups einschließen. Wenn diese Einstellung deaktiviert ist, wird nur die Datenbank gesichert."
     backup_location: "Ort, an dem die Backups abgelegt werden. WICHTIG: S3 erfordert gültige S3-Anmeldedaten in den Datei-Einstellungen."
@@ -1712,6 +1738,7 @@ de:
     s3_secret_access_key: "Der „secret access key“ für Amazon S3, der für den Upload von Bildern, Anhängen und Backups verwendet wird."
     s3_region: "Der Name der Amazon-S3-Region, die für das Hochladen von Bildern und Backups verwendet wird."
     s3_cdn_url: "Die CDN-URL für alle S3-Assets (bspw. https://cdn.somewhere.com). ACHTUNG: Nachdem diese Einstellung geändert wurde, musst du alle alten Beiträge neu generieren."
+    s3_use_cdn_url_for_all_uploads: "Verwende die CDN-URL für alle Dateien, die auf s3 hochgeladen werden, anstatt nur für Bilder."
     avatar_sizes: "Liste der automatisch generierten Avatar-Größen."
     external_system_avatars_enabled: "Nutze einen externen System-Avatar-Dienst."
     external_system_avatars_url: "URL des externen System-Avatar-Dienstes. Erlaubte Platzhalter sind {username} {first_letter} {color} {size}"
@@ -1731,7 +1758,7 @@ de:
     composer_media_optimization_image_bytes_optimization_threshold: "Mindestgröße der Bilddatei, um die clientseitige Optimierung auszulösen"
     composer_media_optimization_image_resize_dimensions_threshold: "Mindestbreite des Bildes, um die clientseitige Skalierung auszulösen"
     composer_media_optimization_image_resize_width_target: "Bilder, die breiter als `composer_media_optimization_image_dimensions_resize_threshold` sind, werden auf diese Breite angepasst. Muss >= `composer_media_optimization_image_dimensions_resize_threshold` sein."
-    composer_media_optimization_image_encode_quality: "JPEG-Encoding-Qualität, die im Re-Encoding-Prozess verwendet wird."
+    composer_media_optimization_image_encode_quality: "Qualität der JPG-Codierung, die bei der Neucodierung verwendet wird."
     min_ratio_to_crop: "Seitenverhältnis zum Ausschneiden hoher Bilder. Angabe als Ergebnis von Breite geteilt durch Höhe."
     simultaneous_uploads: "Maximale Anzahl an Dateien, die per Drag-and-drop in den Editor gezogen werden können."
     default_invitee_trust_level: "Standardwert für die Vertrauensstufe eines eingeladenen Benutzers (0–4)."
@@ -1760,7 +1787,9 @@ de:
     tl3_requires_likes_given: "Die Mindestanzahl an „Gefällt mir“, die in den letzten (tl3 time period) Tagen vergeben werden muss, um sich für die Beförderung auf Vertrauensstufe 3 zu qualifizieren."
     tl3_requires_likes_received: "Die Mindestanzahl an „Gefällt mir“, die in den letzten (tl3 time period) Tagen eingehen muss, um sich für die Beförderung auf Vertrauensstufe 3 zu qualifizieren."
     tl3_links_no_follow: "rel=nofollow nicht von Links entfernen, die von Benutzern mit Vertrauensstufe 3 erstellt wurden."
-    trusted_users_can_edit_others: "Erlaube Benutzern mit hohen Vertrauensstufen, Inhalte von anderen Benutzern zu bearbeiten."
+    tl4_delete_posts_and_topics: "TL4-Benutzern erlauben, Beiträge und Themen zu löschen, die von anderen Benutzern erstellt wurden. TL4-Benutzer können auch gelöschte Themen und Beiträge sehen."
+    edit_all_topic_groups: "Benutzern in dieser Gruppe erlauben, die Thementitel, -schlagwörter und -kategorien anderer Benutzer zu bearbeiten"
+    edit_all_post_groups: "Benutzern in dieser Gruppe erlauben, die Beiträge anderer Nutzer zu bearbeiten"
     min_trust_to_create_topic: "Minimale Vertrauensstufe, um ein neues Thema zu erstellen."
     allow_flagging_staff: "Wenn aktiviert, können Benutzer auch Beiträge von Team-Konten melden."
     min_trust_to_edit_wiki_post: "Minimale Vertrauensstufe, um als Wiki markierte Beiträge bearbeiten zu können."
@@ -1796,7 +1825,7 @@ de:
     title_min_entropy: "Für Titel neuer Themen minimal erforderliche Entropie (einzigartige Zeichen)."
     body_min_entropy: "Für den Text neuer Beiträge minimal erforderliche Entropie (einzigartige Zeichen)."
     allow_uppercase_posts: "Beiträge oder Titel von Themen mit ausschließlich Großschreibweise erlauben."
-    max_consecutive_replies: "Anzahl an aufeinanderfolgenden Beiträgen, die ein Benutzer in einem Thema schreiben kann, bevor eine weitere Antwort verhindert wird."
+    max_consecutive_replies: "Anzahl der Beiträge, die ein Benutzer in einem Thema hintereinander schreiben kann, bevor er keine weitere Antwort mehr hinzufügen darf. Dieses Limit gilt nicht für den Themeneigentümer, Team-Mitglieder oder die Moderatoren der Kategorie."
     enable_filtered_replies_view: 'Die Schaltfläche „(n) Antworten“ klappt alle anderen Beiträge zusammen und zeigt nur den aktuellen Beitrag und seine Antworten.'
     title_fancy_entities: "Konvertiere in Thementiteln gewöhnliche ASCII-Zeichen in schicke HTML-Entities gemäß SmartyPants <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</a>"
     min_title_similar_length: "Minimale Länge eines Titels, bevor nach ähnlichen Titeln gesucht wird."
@@ -1876,6 +1905,11 @@ de:
     block_auto_generated_emails: "Eingehende E-Mails blockieren, die als automatisch generiert erkannt werden."
     ignore_by_title: "Ignoriere eingehende E-Mails basierend auf ihrem Betreff."
     mailgun_api_key: "Geheimer Mailgun-API-Schlüssel, um Webhook-Nachrichten zu überprüfen."
+    sendgrid_verification_key: "Sendgrid-Verifizierungsschlüssel, der zur Verifizierung von Webhook-Nachrichten verwendet wird."
+    mailjet_webhook_token: "Token, das zur Verifizierung der Webhook-Payload verwendet wird. Es muss als „t“-Abfrageparameter des Webhooks übergeben werden, zum Beispiel: https://example.com/webhook/mailjet?t=supersecret"
+    mandrill_authentication_key: "Mandrill-Authentifizierungsschlüssel, der zur Verifizierung von Webhook-Nachrichten verwendet wird."
+    postmark_webhook_token: "Token, das zur Verifizierung der Webhook-Payload verwendet wird. Es muss als „t“-Abfrageparameter des Webhooks übergeben werden, zum Beispiel: https://example.com/webhook/postmark?t=supersecret"
+    sparkpost_webhook_token: "Token, das zur Verifizierung der Webhook-Payload verwendet wird. Es muss als „t“-Abfrageparameter des Webhooks übergeben werden, zum Beispiel: https://example.com/webhook/sparkpost?t=supersecret"
     soft_bounce_score: "Der Bounce-Score des Benutzers wird um diesen Wert erhöht, wenn eine E-Mail vorübergehend nicht zugestellt werden kann."
     hard_bounce_score: "Der Bounce-Score des Benutzers wird um diesen Wert erhöht, wenn eine E-Mail dauerhaft nicht zugestellt werden konnte."
     bounce_score_threshold: "Bounce-Score, ab dem wir einem Benutzer keine E-Mails mehr senden."
@@ -1903,7 +1937,7 @@ de:
     pop3_polling_password: "Passwort für die POP3-Abfrage."
     pop3_polling_delete_from_server: "E-Mails vom Server löschen. HINWEIS: Wenn du dies deaktivierst, solltest du deinen E-Mail-Posteingang manuell aufräumen"
     log_mail_processing_failures: "Protokolliere alle Fehler bei der E-Mail-Verarbeitung unter <a href='%{base_path}/logs' target='_blank'>/logs</a>"
-    email_in: 'Erlaube Benutzern, neue Themen per E-Mail einzutragen (erfordert manuelles oder POP3-Polling). Konfiguriere die Adressen in der „Einstellungen“-Registerkarte in jeder Kategorie.'
+    email_in: "Benutzern erlauben, neue Themen per E-Mail zu posten. Nachdem du diese Einstellung aktiviert hast, kannst du eingehende E-Mail-Adressen für Gruppen und Kategorien konfigurieren."
     email_in_min_trust: "Minimale Vertrauensstufe, um neue Themen per E-Mail erstellen zu können."
     email_in_authserv_id: "Die Kennung des Dienstes, der Authentifizierungsprüfungen für eingehende E-Mails durchführt. Siehe <a href='https://meta.discourse.org/t/134358'>https://meta.discourse.org/t/134358</a> für Hinweise zur Konfiguration."
     email_in_spam_header: "Die E-Mail-Kopfzeile, um Spam zu erkennen."
@@ -1949,6 +1983,7 @@ de:
     enable_category_group_moderation: "Gruppen erlauben, Inhalte in bestimmten Kategorien zu moderieren"
     group_in_subject: "Setze %%{optional_pm} im E-Mail-Betreff auf den Namen der ersten Gruppe in der privaten Nachricht, siehe: <a href='https://meta.discourse.org/t/customize-specific-email-templates/88323' target='_blank'>Betreffformat für Standard-E-Mails anpassen</a>"
     allow_anonymous_posting: "Benutzern erlauben, in den anonymen Modus zu wechseln"
+    allow_anonymous_likes: "Anonymen Benutzern erlauben, Beiträgen ein „Gefällt mir“ zu geben"
     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 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 dem letzten Beitrag dieses Benutzers vergangen sind."
     hide_user_profiles_from_public: "Deaktiviert Benutzerkarten, Benutzerprofile und das Benutzerverzeichnis für anonyme Benutzer."
@@ -1967,6 +2002,7 @@ de:
     allow_profile_backgrounds: "Benutzern erlauben, Profilhintergründe hochzuladen."
     sequential_replies_threshold: "Anzahl an aufeinanderfolgenden Beiträgen, die ein Benutzer in einem Thema schreiben kann, bevor er eine entsprechende Benachrichtigung diesbezüglich erhält."
     get_a_room_threshold: "Anzahl an Beiträgen, die ein Benutzer im selben Thema an dieselbe Person schreiben kann, bevor er gewarnt wird."
+    dont_feed_the_trolls_threshold: "Anzahl der Meldungen von anderen Benutzern, bevor verwarnt wird."
     enable_mobile_theme: "Mobilgeräte verwenden eine mobile Darstellung mit der Möglichkeit, zur vollständigen Website zu wechseln. Deaktiviere diese Option, wenn du ein eigenes Fully-Responsive-Stylesheet verwenden möchtest."
     dominating_topic_minimum_percent: "Anteil der Beiträge eines Themas in Prozent, die ein einzelner Benutzer verfassen darf, bevor dieser Benutzer darauf hingewiesen wird, dass er dieses Thema dominiert."
     disable_avatar_education_message: "Deaktiviert den Hinweis für Benutzer, dass sie ihren Avatar ändern können."
@@ -1976,22 +2012,22 @@ de:
     permalink_normalizations: "Diesen regulären Ausdruck anwenden, bevor Permalinks verarbeitet werden; Beispiel: /(topic.*)\\?.*/\\1 wird Query-Strings von Themen-Routen entfernen. Format: regulärer Ausdruck + String, benutze \\1 usw., um Teilausdrücke zu verwenden"
     global_notice: "Zeigt allen Besuchern eine DRINGENDE NOTFALL-Meldung in Form eines nicht ausblendbaren, global sichtbaren Banners an. Leere den Inhalt, um sie wieder auszublenden (HTML ist erlaubt)."
     disable_system_edit_notifications: "Unterdrückt Bearbeitungsbenachrichtigungen durch den System-Benutzer, wenn die „download_remote_images_to_local“-Einstellung aktiviert ist."
-    disable_category_edit_notifications: "Benachrichtigungen über Kategorie-Änderungen bei Themen deaktivieren."
-    disable_tags_edit_notifications: "Benachrichtigungen über Schlagwort-Änderungen bei Themen deaktivieren."
+    disable_category_edit_notifications: "Benachrichtigungen für die Bearbeitung von Themenkategorien deaktivieren."
+    disable_tags_edit_notifications: "Benachrichtigungen für die Bearbeitung von Themenschlagwörtern deaktivieren."
     notification_consolidation_threshold: "Anzahl von „Gefällt mir“- oder Mitgliedschaftsanfragen-Benachrichtigungen, bevor die Benachrichtigungen zu einer einzelnen zusammengefasst werden. Zum Deaktivieren auf 0 setzen."
     likes_notification_consolidation_window_mins: "Zeitfenster in Minuten, in dem mehrere „Gefällt mir“-Benachrichtigungen zu einer einzelnen Benachrichtigung zusammengefasst werden, sobald der Schwellenwert erreicht wird. Der Schwellenwert kann mittels `SiteSetting.notification_consolidation_threshold` eingestellt werden."
     automatically_unpin_topics: "Themen automatisch loslösen, wenn ein Benutzer das Ende erreicht."
     read_time_word_count: "Wörter pro Minute für die Berechnung der geschätzten Lesezeit."
     topic_page_title_includes_category: "<a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title' target='_blank'>„title“-Tag</a> der Themen-Seite enthält einen Kategorienamen."
-    native_app_install_banner_ios: "Zeigt das DiscourseHub-App-Banner auf iOS-Geräten für Stammgäste (Vertrauensstufe 1 und höher) an."
-    native_app_install_banner_android: "Zeigt das DiscourseHub-App-Banner auf Android-Geräten für Stammgäste (Vertrauensstufe 1 und höher) an."
+    native_app_install_banner_ios: "Zeigt das DiscourseHub-App-Banner auf iOS-Geräten für Anwärter (Vertrauensstufe 1) und höher an."
+    native_app_install_banner_android: "Zeigt das DiscourseHub-App-Banner auf Android-Geräten für Anwärter (Vertrauensstufe 1) und höher an."
     app_association_android: "Inhalte des Endpunkts <a href='%{base_path}/.well-known/assetlinks.json'>.well-known/assetlinks.json</a>, verwendet für die Digital Asset Links API von Google."
     app_association_ios: "Inhalt des Endpunkts <a href='%{base_path}/apple-app-site-association'>apple-app-site-association</a>, der verwendet wird, um Universal Links zwischen dieser Website und iOS-Apps zu erstellen."
     share_anonymized_statistics: "Anonymisierte Nutzungsdaten teilen."
     auto_handle_queued_age: "Bearbeite Einträge automatisch, die so viele Tage auf Überprüfung warten. Meldungen werden ignoriert. Beiträge und Benutzer in der Warteschlange werden zurückgewiesen. Setze den Wert auf 0, um diese Funktion zu deaktivieren."
     penalty_step_hours: "Standardstrafen für das Stummschalten oder Sperren von Benutzern in Stunden. Beim ersten Verstoß wird standardmäßig der erste Wert verwendet, beim zweiten Verstoß standardmäßig der zweite Wert usw."
     svg_icon_subset: "Füge zusätzliche „FontAwesome 5“-Symbole hinzu, die du in deine Assets einbinden möchtest. Verwende das Präfix „fa-“ für einfarbige Symbole, „far-“ für normale Symbole und „fab-“ für Markensymbole."
-    max_prints_per_hour_per_user: "Maximale Anzahl von Aufrufen der /print-Seite (zum Deaktivieren auf 0 setzen)"
+    max_prints_per_hour_per_user: "Maximale Anzahl von /print-Seitenaufrufen (auf 0 setzen, um das Drucken zu deaktivieren)"
     full_name_required: "Vollständiger Name ist ein Pflichtfeld des Benutzerprofils."
     enable_names: "Zeige den vollständigen Namen des Benutzers in seinem Profil, auf der Benutzerkarte und in E-Mails an. Deaktivieren, um den vollständigen Namen überall auszublenden."
     display_name_on_posts: "Zeige zusätzlich zum @Benutzernamen auch den vollständigen Namen des Benutzers bei seinen Beiträgen."
@@ -2012,17 +2048,13 @@ de:
     allowed_href_schemes: "URI-Schemas, die in Links zusätzlich zu http und https erlaubt sind."
     embed_post_limit: "Maximale Anzahl der Beiträge, die eingebettet werden."
     embed_username_required: "Der Benutzername ist für die Themenerstellung notwendig."
-    notify_about_flags_after: "Wenn es Meldungen gibt, die nicht innerhalb der angegebenen Anzahl von Stunden bearbeitet wurden, sende eine persönliche Nachricht an die Moderatoren. Zum Deaktivieren auf 0 setzen."
-    show_create_topics_notice: "Administratoren eine Warnmeldung anzeigen, wenn im Forum weniger als 5 öffentlich sichtbare Themen existieren."
+    notify_about_reviewable_item_after: "Falls es Elemente zur Überprüfung gibt, die nach so vielen Stunden noch nicht bearbeitet wurden, eine persönliche Nachricht an die Moderatoren senden. Zum Deaktivieren auf 0 setzen."
     delete_drafts_older_than_n_days: "Lösche Entwürfe, die älter als (n) Tage sind."
     delete_merged_stub_topics_after_days: "Anzahl der abzuwartenden Tage, bevor vollständig zusammengeführte Stub-Themen automatisch gelöscht werden. Auf 0 setzen, um Stub-Themen nie zu löschen."
-    bootstrap_mode_min_users: "Erforderliche Benutzeranzahl, um den Starthilfe-Modus zu deaktivieren (zum Deaktivieren auf 0 setzen)"
+    bootstrap_mode_min_users: "Mindestanzahl der Benutzer, die erforderlich ist, um den Starthilfe-Modus zu deaktivieren (zum Deaktivieren auf 0 setzen, kann bis zu 24 Stunden dauern)"
     prevent_anons_from_downloading_files: "Verhindern, dass anonyme Benutzer Anhänge herunterladen können."
-    secure_media: "VERALTET: Verwende stattdessen die Einstellung secure_uploads, wird in Discourse 3.0 entfernt."
     secure_uploads: 'Beschränkt den Zugriff auf ALLE Uploads (Bilder, Videos, Audio, Text, PDFs, ZIPs und andere). Wenn „Anmeldung erforderlich“ aktiviert ist, können nur angemeldete Benutzer auf Uploads zugreifen. Andernfalls ist der Zugriff nur für Medienuploads in privaten Nachrichten und privaten Kategorien beschränkt. WARNUNG: Diese Einstellung ist komplex und erfordert ein umfassendes administratives Verständnis. Siehe <a target="_blank" href="https://meta.discourse.org/t/-/140017">das Thema „Sichere Uploads“ auf Meta</a> für Details.'
-    secure_media_allow_embed_images_in_emails: "VERALTET: secure_uploads_allow_embed_images_in_emails verwenden, wird in Discourse 3.0 entfernt."
     secure_uploads_allow_embed_images_in_emails: "Ermöglicht das Einbetten sicherer Bilder, die normalerweise in E-Mails geschwärzt werden würden, wenn ihre Größe kleiner ist als die Einstellung „secure uploads max email embed image size kb“."
-    secure_media_max_email_embed_image_size_kb: "DEPRECATED: secure_uploads_max_email_embed_image_size_kb verwenden, wird in Discourse 3.0 entfernt."
     secure_uploads_max_email_embed_image_size_kb: "Der Größengrenzwert für sichere Bilder, die in E-Mails eingebettet werden, wenn die Einstellung „secure uploads allow embed in emails“ aktiviert ist. Anderweitig hat diese Einstellung keine Auswirkung."
     slug_generation_method: "Gib eine Methode an, wie Kürzel in URLs generiert werden sollen. „encoded“ erzeugt einen Prozent-encodierten String, bei „none“ wird kein Kürzel verwendet."
     enable_emoji: "Emoji aktivieren"
@@ -2030,6 +2062,7 @@ de:
     emoji_set: "Welche Emojis sollen es sein?"
     emoji_autocomplete_min_chars: "Mindestanzahl von Zeichen, um das Pop-up-Fenster zur Emoji-Autovervollständigung zu öffnen."
     enable_inline_emoji_translation: "Aktiviert die Übersetzung von Inline-Emojis (ohne ein Leerzeichen oder Satzzeichen davor)"
+    emoji_deny_list: "Diese Emoji können nicht in Menüs oder Shortcodes verwendet werden."
     approve_post_count: "Anzahl der Beiträge eines neuen Benutzers oder Anwärters, die genehmigt werden müssen"
     approve_unless_trust_level: "Beiträge von Benutzern unterhalb dieser Vertrauensstufe müssen genehmigt werden"
     approve_new_topics_unless_trust_level: "Neue Themen von Benutzern unterhalb dieser Vertrauensstufe müssen genehmigt werden"
@@ -2084,18 +2117,26 @@ de:
     default_tags_watching_first_post: "Liste der Schlagwörter, deren erster Beitrag pro Thema standardmäßig beobachtet wird."
     default_text_size: "Schriftgröße, die standardmäßig ausgewählt ist"
     default_title_count_mode: "Standardmodus für den Seitentitel-Zähler"
+    enable_offline_indicator: "Benutzern eine Nachricht anzeigen, wenn festgestellt wird, dass sie keine Netzwerkverbindung haben"
+    default_sidebar_link_to_filtered_list: "Links im Navigationsmenü standardmäßig mit der gefilterten Liste verknüpfen."
+    default_sidebar_show_count_of_new_items: "Links im Navigationsmenü zeigen standardmäßig die Anzahl der neuen Elemente anstelle von Abzeichen an."
+    default_sidebar_switch_panel_position: "Position der Panel-Umschaltschaltflächen in der Seitenleiste"
     retain_web_hook_events_period_days: "Anzahl an Tagen, die Webhook-Ereigniseinträge aufbewahrt werden."
     retry_web_hook_events: "Fehlgeschlagene Webhook-Ereignisse automatisch 4 Mal erneut versuchen. Die Wartezeiten zwischen den Versuchen betragen eine, 5, 25 und 125 Minuten."
     revoke_api_keys_days: "Anzahl der Tage, bevor ein nicht verwendeter API-Schlüssel automatisch widerrufen wird (0 für niemals)"
     allow_user_api_keys: "Erlaube das Generieren von Benutzer-API-Schlüsseln"
     allow_user_api_key_scopes: "Liste erlaubter Bereiche für Benutzer-API-Schlüssel"
-    min_trust_level_for_user_api_key: "Erforderliche Vertrauensstufe für die Generierung von Benutzer API-Schlüsseln"
+    min_trust_level_for_user_api_key: |
+      Vertrauensstufe, die für die Generierung von Benutzer-API-Schlüsseln erforderlich ist.<br>
+      <b>WARNUNG</b>: Die Änderung der Vertrauensstufe verhindert, dass sich Benutzer mit einer niedrigeren Vertrauensstufe über Discourse Hub anmelden können.
     allowed_user_api_auth_redirects: "Zulässige URL für Authentifizierungs-Umleitung für Benutzer-API-Schlüssel. Das Platzhaltersymbol * kann verwendet werden, um jeden Bestandteil der Adresse zu ersetzen (z. B. www.example.com/*)."
     allowed_user_api_push_urls: "Erlaubte URLs für Server-Push zur Benutzer-API"
     expire_user_api_keys_days: "Anzahl der Tage, bevor ein Benutzer-API-Schlüssel automatisch abläuft (0 für niemals)"
     tagging_enabled: "Schlagwörter für Themen aktivieren?"
     min_trust_to_create_tag: "Minimale Vertrauensstufe, um ein Schlagwort zu erstellen."
     max_tags_per_topic: "Maximale Anzahl an Schlagwörtern, die einem Thema hinzugefügt werden können."
+    enable_max_tags_per_email_subject: "max_tags_per_email_subject beim Erstellen des Betreffs einer E-Mail verwenden"
+    max_tags_per_email_subject: "Die maximale Anzahl von Schlagwörtern, die im Betreff einer E-Mail enthalten sein können"
     max_tag_length: "Die maximale Anzahl von Zeichen, die in einem Schlagwort verwendet werden kann."
     max_tag_search_results: "Maximale Ergebnisanzahl bei der Suche nach Schlagwörtern."
     max_tags_in_filter_list: "Maximale Anzahl von Schlagwörtern, die in der Filter-Drop-down-Liste angezeigt werden. Es werden die am häufigsten verwendeten Schlagwörter angezeigt."
@@ -2107,6 +2148,8 @@ de:
     suppress_overlapping_tags_in_list: "Schlagwort nicht zeigen, wenn es genauso im Thementitel vorkommt"
     remove_muted_tags_from_latest: "Themen, die nur mit stummgeschalteten Tags versehen sind, nicht in der Liste der aktuellen Themen anzeigen"
     force_lowercase_tags: "Kleinschreibung für alle neuen Schlagwörter erzwingen."
+    create_post_for_category_and_tag_changes: "Einen kleinen Aktionsbeitrag erstellen, wenn sich die Kategorie oder die Schlagwörter eines Themas ändern"
+    watched_precedence_over_muted: "Benachrichtige mich über Themen in Kategorien oder Schlagwörtern, die ich beobachte und die auch zu einem Thema gehören, das ich stummgeschaltet habe"
     company_name: "Firmenname"
     governing_law: "Anzuwendendes Recht"
     city_for_disputes: "Stadt für Rechtsstreitigkeiten"
@@ -2121,7 +2164,7 @@ de:
     enable_sitemap: "Generiere eine Sitemap für deine Website und füge sie in die robots.txt-Datei ein."
     sitemap_page_size: "Anzahl der URLs, die auf jeder Sitemap-Seite enthalten sein sollen. Max 50.000"
     enable_user_status: "(Experimentell) Erlaubt es Benutzern, eine eigene Statusnachricht (Emoji + Beschreibung) einzustellen."
-    enable_user_tips: "(Experimentell) Tipps für neue Benutzer aktivieren, die den Benutzern wichtige Funktionen beschreiben"
+    enable_user_tips: "Tipps für neue Benutzer aktivieren, die diesen die wichtigsten Funktionen näherbringen"
     short_title: "Der Kurztitel wird beim Benutzer auf dem Startbildschirm, im Startmenü oder an anderen Stellen mit begrenztem Platz verwendet. Er sollte auf 12 Zeichen begrenzt sein."
     dashboard_hidden_reports: "Erlaube das Ausblenden der angegebenen Berichte im Dashboard."
     dashboard_visible_tabs: "Wähle aus, welche Dashboard-Registerkarten sichtbar sind."
@@ -2138,11 +2181,15 @@ de:
     suggest_weekends_in_date_pickers: "Wochenenden (Samstag und Sonntag) in die Datumsvorschläge einbeziehen (deaktiviere dies, wenn du Discourse nur an Wochentagen von Montag bis Freitag benutzt)."
     splash_screen: "Zeigt einen temporären Ladebildschirm an, während Website-Assets geladen werden"
     navigation_menu: "Legt fest, welches Navigationsmenü verwendet werden soll. Die Seitenleisten- und Kopfzeilennavigation kann von den Benutzern angepasst werden. Die Legacy-Option ist zur Abwärtskompatibilität verfügbar."
-    default_sidebar_categories: "Ausgewählte Kategorien werden standardmäßig im Abschnitt „Kategorien“ der Seitenleiste angezeigt."
-    default_sidebar_tags: "Ausgewählte Schlagwörter werden standardmäßig im Abschnitt „Schlagwörter“ der Seitenleiste angezeigt."
-    enable_new_user_profile_nav_groups: "EXPERIMENTELL: Benutzern der ausgewählten Gruppen wird das neue Benutzerprofil-Navigationsmenü angezeigt"
-    enable_experimental_topic_timeline_groups: "EXPERIMENTELL: Benutzern der ausgewählten Gruppen wird die umgestaltete Themenzeitleiste angezeigt"
+    default_navigation_menu_categories: "Ausgewählte Kategorien werden standardmäßig im Abschnitt „Kategorien“ des Navigationsmenüs angezeigt."
+    default_navigation_menu_tags: "Ausgewählte Schlagwörter werden standardmäßig im Abschnitt „Schlagwörter“ des Navigationsmenüs angezeigt."
     enable_experimental_hashtag_autocomplete: "EXPERIMENTELL: Das neue #hashtag-Autovervollständigungssystem für Kategorien und Schlagwörter, das das ausgewählte Element anders darstellt und eine bessere Suche aufweist, verwenden"
+    experimental_new_new_view_groups: 'EXPERIMENTELL: Eine neue Themenliste aktivieren, die ungelesene und neue Themen kombiniert, und den Link „Alles“ in der Seitenleiste entsprechend verknüpfen.'
+    enable_custom_sidebar_sections: "EXPERIMENTELL: Benutzerdefinierte Seitenleistenabschnitte aktivieren"
+    experimental_topics_filter: "EXPERIMENTELL: Experimentelle Filterroute für Themen unter /filter aktivieren"
+    experimental_search_menu_groups: "EXPERIMENTELL: Das neue Suchmenü aktivieren, das für die Verwendung von Glimmer aktualisiert wurde"
+    enable_experimental_lightbox: "EXPERIMENTELL: Die Standard-Bild-Lightbox durch das überarbeitete Design ersetzen."
+    page_loading_indicator: "Die Ladeanzeige konfigurieren, die bei der Seitennavigation in Discourse erscheint. „Spinner“ ist ein ganzseitiger Indikator. „Slider“ zeigt einen schmalen Balken am oberen Rand des Bildschirms an."
     errors:
       invalid_css_color: "Ungültige Farbe. Gib einen Farbnamen oder einen Hexadezimalwert ein."
       invalid_email: "Ungültige E-Mail-Adresse."
@@ -2168,7 +2215,7 @@ de:
       pop3_polling_password_is_empty: "Du musst „pop3 polling password“ definieren, um POP3-Abfragen zu aktivieren."
       pop3_polling_authentication_failed: "POP3-Authentifizierung ist fehlgeschlagen. Bitte überprüfe die POP3-Anmeldedaten."
       reply_by_email_address_is_empty: "Du musst „reply by email address“ definieren, bevor Antworten per E-Mail aktiviert wird."
-      email_polling_disabled: "Du musst entweder manuelle oder POP3-Abfragen aktivieren, bevor Antworten per E-Mail aktiviert wird."
+      email_polling_disabled: "Du musst entweder die manuelle Abfrage, die POP3-Abfrage oder eine benutzerdefinierte E-Mail-Abfrage aktivieren, bevor du die Antwort per E-Mail aktivieren kannst."
       user_locale_not_enabled: "Du musst erst „allow user locale“ aktivieren, bevor du diese Einstellung aktivierst."
       personal_message_enabled_groups_invalid: "Du musst mindestens eine Gruppe für diese Einstellung angeben. Wenn du nicht möchtest, dass jemand außer den Team-Mitgliedern private Nachrichten verschickt, wähle die Team-Gruppe aus."
       invalid_regex: "Regulärer Ausdruck ist ungültig oder nicht erlaubt."
@@ -2177,7 +2224,6 @@ de:
       staged_users_disabled: "Du musst erst „staged users“ aktivieren, bevor du diese Einstellung aktivierst."
       reply_by_email_disabled: "Du musst erst „reply by email“ aktivieren, bevor du diese Einstellung aktivierst."
       discourse_connect_url_is_empty: "Du musst eine „discourse connect url'“ festlegen, bevor du diese Einstellung aktivierst."
-      discourse_connect_invite_only: "Du kannst DiscourseConnect und „invite only“ nicht gleichzeitig aktivieren."
       enable_local_logins_disabled: "Du musst erst „enable local logins“ aktivieren, bevor du diese Einstellung aktivierst."
       min_username_length_exists: "Du kannst die Mindestlänge von Benutzernamen nicht über den kürzesten Benutzernamen (%{username}) setzen."
       min_username_length_range: "Du kannst das Minimum nicht über das Maximum setzen."
@@ -2199,7 +2245,8 @@ de:
       search_tokenize_japanese_enabled: "Du musst „search_tokenize_japanese“ deaktivieren, bevor du diese Einstellung aktivierst."
       discourse_connect_cannot_be_enabled_if_second_factor_enforced: "Du kannst DiscourseConnect nicht aktivieren, wenn 2FA erzwungen wird."
       delete_rejected_email_after_days: "Diese Einstellung kann nicht niedriger als die Einstellung delete_email_logs_after_days oder höher als %{max} gesetzt werden"
-      invalid_uncategorized_category_setting: "Die Kategorie „Nicht kategorisiert“ kann nicht ausgewählt werden, wenn „Nicht kategorisierte Themen zulassen“ nicht zulässig ist"
+      invalid_uncategorized_category_setting: 'Die Kategorie „Nicht kategorisiert“ kann nicht ausgewählt werden, wenn „Nicht kategorisierte Themen zulassen“ nicht aktiviert ist.'
+      invalid_search_ranking_weights: "Der Wert für die Websiteeinstellung search_ranking_weights ist ungültig. Beispiel: „{0.1,0.2,0.3,1.0}“. Beachte, dass der Maximalwert für jede Gewichtung 1.0 beträgt."
     placeholder:
       discourse_connect_provider_secrets:
         key: "www.example.com"
@@ -2394,7 +2441,6 @@ de:
     activated_by_staff: "Aktiviert vom Team"
     new_user_typed_too_fast: "Neuer Benutzer hat zu schnell getippt"
     content_matches_auto_silence_regex: "Inhalt stimmt mit regulärem Ausdruck für Auto-Stummschaltung überein"
-    content_matches_auto_block_regex: "Inhalt stimmt mit regulärem Ausdruck für Auto-Block überein"
     username:
       short: "muss mindestens %{min} Zeichen lang sein"
       long: "darf nicht länger als %{max} Zeichen sein"
@@ -3138,7 +3184,7 @@ de:
 
         Der neue Benutzer [%{username}](%{user_url}) wurde automatisch stummgeschaltet, weil mehrere Benutzer Beiträge von %{username} gemeldet haben.
 
-        Bitte [überprüfe die Meldungen](%{base_url}/admin/flags). Wenn %{username} fälschlich stummgeschaltet wurde, so klicke die „Stummschaltung aufheben“-Schaltfläche auf der [Administrationsseite dieses Benutzers](%{user_url}).
+        Bitte [überprüfe die Meldungen](%{base_url}/review). Wenn %{username} fälschlich stummgeschaltet wurde, so klicke die „Stummschaltung aufheben“-Schaltfläche auf der [Administrationsseite dieses Benutzers](%{user_url}).
 
         Der Schwellenwert kann über die Einstellung `silence_new_user` geändert werden.
     spam_post_blocked:
@@ -3174,15 +3220,6 @@ de:
       title: "Download von externen Bildern deaktiviert"
       subject_template: "Download von externen Bildern deaktiviert"
       text_body_template: "Die Einstellung `download_remote_images_to_local` wurde deaktiviert, da das Speicherplatzlimit von `download_remote_images_threshold` erreicht wurde."
-    dashboard_problems:
-      title: "Dashboard-Probleme"
-      subject_template: "Neue Ratschläge auf deinem Website-Dashboard"
-      text_body_template: |
-        Basierend auf deinen aktuellen Website-Einstellungen haben wir einige neue Ratschläge und Empfehlungen für dich.
-
-        [Besuche das Dashboard deiner Website](%{base_url}/admin), um sie zu sehen.
-
-        Sollte im Dashboard nichts sichtbar sein, hat bereits ein anderes Team-Mitglied auf die Ratschläge reagiert. Eine Liste der Team-Aktionen findest du in den [Protokollen für Team-Aktionen](%{base_url}/admin/logs/staff_action_logs).
     new_user_of_the_month:
       title: "Du bist ein neuer Benutzer des Monats!"
       subject_template: "Du bist ein neuer Benutzer des Monats!"
@@ -3219,9 +3256,6 @@ de:
       one: "Achtung: Wir senden maximal %{count} E-Mail pro Tag. Überprüfe die Website, um möglicherweise zurückgehaltene E-Mails zu sehen."
       other: "Achtung: Wir senden maximal %{count} E-Mails pro Tag. Überprüfe die Website, um möglicherweise zurückgehaltene E-Mails zu sehen. PS: Danke, dass du so beliebt bist!"
     in_reply_to: "Als Antwort auf"
-    unsubscribe:
-      title: "Abbestellen"
-      description: "Nicht interessiert an diesen E-Mails? Kein Problem! Klicke unten, um sie sofort abzubestellen:"
     reply_by_email: "[Rufe das Thema auf](%{base_url}%{url}) oder antworte auf diese E-Mail, um zu antworten."
     reply_by_email_pm: "[Rufe die Nachricht auf](%{base_url}%{url}) oder antworte auf diese E-Mail, um %{participants} zu antworten."
     only_reply_by_email: "Antworte auf diese E-Mail, um zu antworten."
@@ -3518,7 +3552,6 @@ de:
       liked_received: "Erhaltene „Gefällt mir“"
       new_users: "Neue Benutzer"
       popular_topics: "Beliebte Themen"
-      follow_topic: "Diesem Thema folgen"
       join_the_discussion: "Mehr lesen"
       popular_posts: "Beliebte Beiträge"
       more_new: "Neu für dich"
@@ -3714,14 +3747,7 @@ de:
     title: "App kann nicht geladen werden"
     offline_page_message: "Sieht so aus, als wärst du offline! Bitte überprüfe deine Netzwerkverbindung und probiere es noch einmal."
   login_required:
-    welcome_message: |
-      ## [Willkommen bei %{title}](#welcome)
-      Ein Konto ist erforderlich. Bitte erstelle ein Konto oder melde dich an, um fortzufahren.
-    welcome_message_invite_only: |
-      ## [Willkommen bei %{title}](#welcome)
-      Ein Konto ist erforderlich. Bitte frage ein existierendes Mitglied nach einer Einladung oder melde dich an, um fortzufahren.
-  deleted: "gelöscht"
-  image: "Bild"
+    welcome_message: "# [Willkommen bei %{title}](#welcome)"
   upload:
     edit_reason: "lokale Kopien von Bildern heruntergeladen"
     unauthorized: "Entschuldige, die Datei, die du hochladen möchtest, ist nicht erlaubt (erlaubte Dateiendungen sind: %{authorized_extensions})."
@@ -3923,7 +3949,11 @@ de:
   tos_topic:
     title: "Nutzungsbedingungen"
     body: |
-      Diese Bedingungen regeln die Nutzung des Internetforums unter <%{base_url}>. Um das Forum zu nutzen, musst du diesen Bedingungen gegenüber %{company_name} zustimmen, dem Betreiber des Forums.
+      <h2 id="heading--change-me"><a href="#heading--change-me">Ändere mich</a></h2>
+
+      Unten findest du eine Beispielvorlage für eine Datenschutzerklärung, die du an die Bedürfnisse deiner Website anpassen solltest.
+
+      Diese Bedingungen regeln nicht die Nutzung des Internetforums unter <%{base_url}>, könnten aber eines Tages in Kraft treten. In diesem Fall musst du, um das Forum nutzen zu können, diesen Bedingungen gegenüber %{company_name}, dem Betreiber dieses Forums, zustimmen.
 
       Der Betreiber kann andere Produkte und Dienstleistungen zu unterschiedlichen Bedingungen anbieten. Diese Bedingungen gelten nur für die Nutzung des Forums.
 
@@ -3935,7 +3965,7 @@ de:
       - [Zulässige Nutzung](#heading--acceptable-use)
       - [Zulässige Inhalte](#heading--content-standards)
       - [Rechtsdurchsetzung](#heading--enforcement)
-      - [Deine Konto](#heading--your-account)
+      - [Dein Konto](#heading--your-account)
       - [Deine Inhalte](#heading--your-content)
       - [Deine Pflichten](#heading--responsibility)
       - [Haftungsausschlüsse](#heading--disclaimers)
@@ -3993,7 +4023,7 @@ de:
 
       13. Du darfst dich über das Forum nicht für andere ausgeben.
 
-      14. Du darfst niemanden ermutigen oder ihm helfen, der gegen diese Bedingungen verstößt.
+      14. Du darfst niemanden ermutigen oder dabei helfen, gegen diese Bedingungen zu verstoßen.
 
       <h2 id="heading--content-standards"><a href="#heading--content-standards">Zulässige Inhalte</a></h2>
 
@@ -4003,7 +4033,7 @@ de:
 
       3. Du darfst keine Inhalte an das Forum übermitteln, die bösartigen Computercode wie Computerviren oder Spyware enthalten.
 
-      4. Du darfst keine Inhalte an das Forum als bloßen Platzhalter übermitteln, um eine bestimmte Adresse, einen bestimmten Benutzernamen oder eine andere eindeutige Kennung zu speichern.
+      4. Du darfst keine Inhalte an das Forum als bloßen Platzhalter übermitteln, um eine bestimmte Adresse, einen bestimmten Benutzernamen oder eine andere eindeutige Kennung für dich zu sichern.
 
       5. Du darfst das Forum nicht nutzen, um Informationen offenzulegen, zu denen du nicht das Recht hast, sie offenzulegen, z. B. vertrauliche oder persönliche Informationen anderer.
 
@@ -4037,7 +4067,7 @@ de:
 
       <h2 id="heading--responsibility"><a href="#heading--responsibility">Deine Pflichten</a></h2>
 
-      Du stimmst zu, den Betreiber von Rechtsansprüchen Dritter freizustellen, die mit deinem Verstoß gegen diese Bedingungen oder mit einem Verstoß gegen diese Bedingungen durch andere, die dein Konto im Forum nutzen, zusammenhängen. Sowohl du als auch der Betreiber verpflichten sich, die andere Partei über alle Rechtsansprüche zu informieren, für die du den Betreiber möglicherweise so schnell wie möglich entschädigen musst. Wenn der Betreiber dich nicht unverzüglich über einen Rechtsanspruch informiert, musst du den Betreiber nicht für Schäden entschädigen, die du hättest verteidigen oder mildern können. Du stimmst zu, dass der Betreiber die Untersuchung, Verteidigung und Beilegung von Rechtsansprüchen, für die du den Betreiber entschädigen müsstest, kontrollieren darf und du entsprechend kooperierst. Der Betreiber verpflichtet sich, ohne deine vorherige Zustimmung keinem Vergleich zuzustimmen, der dir ein Verschulden zuschreibt oder dir Verpflichtungen auferlegt.
+      Du stimmst zu, den Betreiber von Rechtsansprüchen Dritter freizustellen, die mit deinem Verstoß gegen diese Bedingungen oder mit einem Verstoß gegen diese Bedingungen durch andere, die dein Konto im Forum nutzen, zusammenhängen. Sowohl du als auch der Betreiber verpflichten sich, die andere Partei über alle Rechtsansprüche zu informieren, für die du den Betreiber möglicherweise so schnell wie möglich entschädigen musst. Wenn der Betreiber dich nicht unverzüglich über einen Rechtsanspruch informiert, musst du den Betreiber nicht für Schäden entschädigen, die du rechtzeitig hättest abwenden oder mildern können. Du stimmst zu, dass der Betreiber die Untersuchung, Verteidigung und Beilegung von Rechtsansprüchen, für die du den Betreiber entschädigen müsstest, kontrollieren darf und du entsprechend kooperierst. Der Betreiber verpflichtet sich, ohne deine vorherige Zustimmung keinem Vergleich zuzustimmen, der dir ein Verschulden zuschreibt oder dir Verpflichtungen auferlegt.
 
       <h2 id="heading--disclaimers"><a href="#heading--disclaimers">Haftungsausschlüsse</a></h2>
 
@@ -4091,12 +4121,14 @@ de:
 
       <h2 id="heading--changes"><a href="#heading--changes">Änderungen</a></h2>
 
-      Der Betreiber hat diese Bedingungen zuletzt am 12. Juli 2018 aktualisiert und kann diese Bedingungen erneut aktualisieren. Der Betreiber wird alle Aktualisierungen im Forum veröffentlichen. Bei Aktualisierungen, die wesentliche Änderungen enthalten, erklärt sich der Betreiber damit einverstanden, dir eine E-Mail zu senden, wenn du ein Konto erstellt und eine gültige E-Mail-Adresse angegeben hast. Der Betreiber kann auch Aktualisierungen mit speziellen Nachrichten oder Warnungen im Forum ankündigen.
+      Der Betreiber hat diese Bedingungen zuletzt am [DATUM DER LETZTEN ÄNDERUNG HIER EINFÜGEN] aktualisiert und kann diese Bedingungen erneut aktualisieren. Der Betreiber wird alle Aktualisierungen im Forum veröffentlichen. Bei Aktualisierungen, die wesentliche Änderungen enthalten, erklärt sich der Betreiber damit einverstanden, dir eine E-Mail zu senden, wenn du ein Konto erstellt und eine gültige E-Mail-Adresse angegeben hast. Der Betreiber kann auch Aktualisierungen mit speziellen Nachrichten oder Warnungen im Forum ankündigen.
 
       Sobald du von einer Aktualisierung dieser Bedingungen Kenntnis erlangst, musst du den neuen Bedingungen zustimmen, um das Forum weiterhin nutzen zu können.
   privacy_topic:
     title: "Datenschutzerklärung"
     body: |
+      ## [Unten findest du eine Beispielvorlage für eine Datenschutzerklärung, die du an die Bedürfnisse deiner Website anpassen solltest.]
+
       <a name="collect"></a>
 
       ## [Welche Informationen sammeln wir?](#collect)
@@ -4130,8 +4162,7 @@ de:
 
       Wir bemühen uns nach bestem Wissen und Gewissen:
 
-      * Serverprotokolle, die IP-Adressen aller Anfragen an unseren Server enthalten, nicht länger als 90 Tage zu speichern.
-      * IP-Adressen, die mit registrierten Benutzern und ihren Beiträgen verknüpft sind, nicht länger als 5 Jahre zu speichern.
+      * Serverprotokolle, die IP-Adressen aller Anfragen an unseren Server enthalten, nicht länger als [ANZAHL TAGE] Tage zu speichern.
 
       <a name="cookies"></a>
 
@@ -4177,7 +4208,7 @@ de:
 
       Wenn wir uns dazu entscheiden, unsere Datenschutzerklärung zu ändern, werden wir diese Änderungen auf dieser Seite veröffentlichen.
 
-      Dieses Dokument ist als CC-BY-SA lizenziert. Es wurde zuletzt aktualisiert am 31. Mai 2013.
+      Dieses Dokument ist als CC-BY-SA lizenziert. Es wurde zuletzt aktualisiert am [DATUM DER LETZTEN ÄNDERUNG HIER EINFÜGEN].
   badges:
     mass_award:
       errors:
@@ -4464,6 +4495,7 @@ de:
     required_tags_from_group:
       one: "Du musst mindestens %{count} „%{tag_group_name}“-Schlagwort hinzufügen. Die Schlagwörter in dieser Gruppe sind: %{tags}."
       other: "Du musst mindestens %{count} „%{tag_group_name}“-Schlagwörter hinzufügen. Die Schlagwörter in dieser Gruppe sind: %{tags}."
+    limited_to_one_tag_from_group: "Die Schlagwörter %{tags} können nicht gleichzeitig verwendet werden. Bitte füge nur eines von ihnen ein."
     invalid_target_tag: "kann kein Synonym für ein Synonym sein"
     synonyms_exist: "ist nicht erlaubt, solange Synonyme existieren"
   rss_by_tag: "Themen mit dem Schlagwort %{tag}"
@@ -4482,10 +4514,10 @@ de:
       message: "<p>Wir haben die Aktivierungs-E-Mail noch einmal an <b>%{email}</b> gesendet"
   safe_mode:
     title: "Abgesicherten Modus betreten"
-    description: "Der abgesicherte Modus ermöglicht es dir, deine Website zu testen, ohne Plug-ins oder Themes zu laden."
+    description: "Im abgesicherten Modus kannst du deine Website testen, ohne Themes oder clientseitige Plug-in-Anpassungen zu laden. Server-seitige Plug-in-Anpassungen bleiben aktiviert."
     no_themes: "Themes und Theme-Komponente deaktivieren"
-    no_unofficial_plugins: "Inoffizielle Plug-ins deaktivieren"
-    no_plugins: "Alle Plug-ins deaktivieren"
+    no_unofficial_plugins: "Inoffizielle clientseitige Plug-in-Anpassungen deaktivieren"
+    no_plugins: "Alle clientseitigen Plug-in-Anpassungen deaktivieren"
     enter: "Abgesicherten Modus betreten"
     must_select: "Du musst mindestens eine Option auswählen, um den abgesicherten Modus zu betreten."
   wizard:
@@ -4600,7 +4632,9 @@ de:
           <p>Viel Spaß und viel Erfolg <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>beim Aufbau deiner neuen Community!</a></p>
   search_logs:
     graph_title: "Anzahl Suchen"
-  joined: "Beigetreten"
+  onebox:
+    discourse:
+      user_joined_community: "Beigetreten %{date}"
   discourse_push_notifications:
     popup:
       mentioned: '%{username} hat dich erwähnt in „%{topic}“ – %{site_title}'
@@ -4663,10 +4697,10 @@ de:
         category: Kategorie-Einstellungen
     actions:
       agree:
-        title: "Zustimmen …"
+        title: "Ja"
       agree_and_keep:
         title: "Beitrag behalten"
-        description: "Meldung zustimmen und den Beitrag unbearbeitet lassen."
+        description: "Meldung zustimmen, aber diesen Beitrag unbearbeitet lassen."
       agree_and_keep_hidden:
         title: "Beitrag ausgeblendet lassen"
         description: "Meldung zustimmen und den Beitrag ausgeblendet lassen."
@@ -4680,33 +4714,36 @@ de:
         title: "Beitrag wiederherstellen"
         description: "Beitrag wiederherstellen, sodass alle Benutzer ihn sehen können."
       agree_and_hide:
-        title: "Beitrag verstecken"
-        description: "Verstecke diesen Beitrag und sende dem Benutzer automatisch eine Nachricht mit der Bitte, ihn zu bearbeiten."
+        title: "Beitrag ausblenden"
+        description: "Der Meldung zustimmen, diesen Beitrag ausblenden und dem Benutzer automatisch eine Nachricht mit der Bitte schicken, ihn zu bearbeiten."
       delete_single:
         title: "Löschen"
       delete:
         title: "Löschen …"
       delete_and_ignore:
-        title: "Beitrag löschen und ignorieren"
-        description: "Lösche Beitrag; falls dies der erste Beitrag im Thema ist, lösche auch das Thema"
+        title: "Meldung ignorieren und Beitrag löschen"
+        description: "Ignoriere die Meldung, indem du sie aus der Warteschlange entfernst und den Beitrag löschst; wenn es der erste Beitrag ist, wird auch das Thema gelöscht. "
       delete_and_ignore_replies:
-        title: "Lösche Beitrag + Antworten und ignoriere"
-        description: "Lösche Beitrag und alle Antworten; falls dies der erste Beitrag im Thema ist, lösche auch das Thema"
+        title: "Meldung ignorieren, Beitrag und Antworten löschen"
+        description: "Ignoriere die Meldung, indem du sie aus der Warteschlange entfernst und den Beitrag sowie alle seine Antworten löscht; wenn es der erste Beitrag ist, wird auch das Thema gelöscht"
         confirm: "Möchtest du wirklich auch die Antworten auf diesen Beitrag löschen?"
       delete_and_agree:
-        title: "Beitrag löschen und zustimmen"
-        description: "Lösche Beitrag; falls dies der erste Beitrag im Thema ist, lösche auch das Thema"
+        title: "Beitrag löschen"
+        description: "Stimme der Meldung zu und lösche diesen Beitrag; wenn es der erste Beitrag ist, wird auch das Thema gelöscht."
       delete_and_agree_replies:
-        title: "Lösche Beitrag + Antworten und akzeptiere"
-        description: "Lösche Beitrag und alle Antworten; falls dies der erste Beitrag im Thema ist, lösche auch das Thema"
+        title: "Beitrag und Antworten löschen"
+        description: "Stimme der Meldung zu und lösche diesen Beitrag sowie alle seine Antworten; wenn es der erste Beitrag ist, wird auch das Thema gelöscht."
         confirm: "Möchtest du wirklich auch die Antworten auf diesen Beitrag löschen?"
       disagree_and_restore:
-        title: "Ablehnen und Beitrag wiederherstellen"
+        title: "Nein, Beitrag wiederherstellen"
         description: "Beitrag wiederherstellen, sodass alle Benutzer ihn sehen können."
       disagree:
-        title: "Ablehnen"
+        title: "Nein"
       ignore:
         title: "Ignorieren"
+      ignore_and_do_nothing:
+        title: "Nichts tun"
+        description: "Ignoriere die Meldung, indem du sie aus der Warteschlange entfernst, ohne etwas zu unternehmen. Ausgeblendete Beiträge bleiben versteckt und werden von den Auto-Tools bearbeitet."
       approve:
         title: "Genehmigen"
       approve_post:
@@ -4772,6 +4809,11 @@ de:
     payload_url:
       blocked_or_internal: "Payload-URL kann nicht verwendet werden, da sie in eine blockierte oder interne IP aufgelöst wird"
       unsafe: "Payload-URL kann nicht verwendet werden, da sie unsicher ist"
+  form_templates:
+    errors:
+      invalid_yaml: "ist keine gültige YAML-Zeichenfolge"
+      invalid_type: "enthält einen ungültigen Vorlagentyp: %{type} (gültige Typen sind: %{valid_types})"
+      missing_type: "fehlt ein Feldtyp"
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.el.yml b/config/locales/server.el.yml
index 802c6179718..606d98589e8 100644
--- a/config/locales/server.el.yml
+++ b/config/locales/server.el.yml
@@ -165,9 +165,6 @@ el:
       load_from_remote: "Παρουσιάστηκε ένα σφάλμα κατά τη φόρτωση της ανάρτησης."
     site_settings:
       invalid_category_id: "Καθορίσατε μια κατηγορία που δεν υπάρχει"
-      invalid_choice:
-        one: "Καθορίσατε τη μη έγκυρη επιλογή %{name}"
-        other: "Καθορίσατε τις μη έγκυρες επιλογές %{name}"
       default_categories_already_selected: "Δεν μπορείς να επιλέξεις μια κατηγορία που χρησιμοποιείται σε άλλη λίστα."
       default_tags_already_selected: "Δε μπορείτε να επιλέξετε μια ετικέτα που χρησιμοποιείται σε άλλη λίστα."
       s3_upload_bucket_is_required: "Δεν μπορείτε να ενεργοποιήσετε μεταφορτώσεις στο S3 εάν δεν παρέχετε το 's3_upload_bucket'."
@@ -418,24 +415,6 @@ el:
   meta_category_description: "Συζήτηση σχετικά με την ιστοσελίδα, την οργάνωσή της, τον τρόπο λειτουργίας της και πώς αυτή μπορεί να βελτιωθεί."
   staff_category_name: "Συνεργάτες"
   staff_category_description: "Ιδιωτική κατηγορία για συζητήσεις των συνεργατών. Τα θέματα είναι ορατά μόνο σε διαχειριστές και συντονιστές."
-  discourse_welcome_topic:
-    body: |2
-
-      Η πρώτη παράγραφος αυτού του καρφιτσωμένου θέματος θα είναι ορατή ως μήνυμα καλωσορίσματος προς τους νέους επισκέπτες της σελίδας. Είναι σημαντικό!
-
-      **Αλλάξτε αυτό** με μία σύντομη περιγραφή της κοινότητάς σας:
-
-      - Σε ποιον απευθύνεται η σελίδα;
-
-      - Τι θα βρει εδώ πέρα;
-
-      - Γιατί αξίζει να επισκευθεί τη σελίδα;
-
-      - Που αλλού θα μπορούσαν να βρουν υλικό σχετικά με το θέμα; (url κτλπ)
-
-      <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
-
-      Θα ήταν καλό να κλείσετε αυτό το θέμα μέσω του διαχειριστή :wrench: (στην πάνω δεξιά και κάτω θέση), έτσι ώστε οι απαντήσεις να μην μαζευτούν στην ανακοίνωση.
   category:
     topic_prefix: "Σχετικά με την κατηγορία %{category} "
     post_template: "%{replace_paragraph}\n\nΧρησιμοποιήστε τις επόμενες παραγράφους για μια μεγαλύτερη περιγραφή ή για να ορίσεις οδηγίες και κανόνες για τις κατηγορίες:\n\n- Γιατί μπορεί να χρησιμοποιηθεί αυτή η κατηγορία; Ποιος είναι ο σκοπός της;\n\n- Αυτή η κατηγορία είναι διαφορετική από αυτές που έχουμε ήδη;\n\n- Τι πρέπει να περιέχουν τα θέματα αυτής της κατηγορίας γενικότερα;\n\n- Χρειαζόμαστε αυτή την κατηγορία; Μπορούμε να την ενώσουμε με άλλη κατηγορία ή υποκατηγορία;\n"
@@ -1152,7 +1131,6 @@ el:
     pop3_polling_host: "Ο διακομιστής ο οποίος ελέγχεται για το email μέσω του POP3."
     pop3_polling_username: "Το όνομα χρήστη του POP3 λογαριασμού για το email."
     pop3_polling_password: "Ο κωδικός πρόσβασης του POP3 λογαριασμού για το email."
-    email_in: 'Επίτρεψε στους χρήστες να ανοίγουν νέα νήματα μέσω email (απαιτεί χειροκίνητο ή pop3 έλεγχο νέων μηνυμάτων). Ρυθμίστες την διεύθυνση στην καρτέλα "Ρυθμίσεις" της κάθε κατηγορίας.'
     email_in_min_trust: "Το ελάχιστο επίπεδο εμπιστοσύνης που χρειάζεται ένας χρήστης, ώστε να του επιτραπεί να αναρτήσει ένα νεό νήμα μέσω email. "
     email_prefix: "Το [label] που χρησιμοποιείται στο θέμα των μηνυμάτων email. Αυτό θα προκαθοριστεί σαν «τίτλος», αν δεν οριστεί."
     email_site_title: "Ο τίτλος της ιστοσελίδας που χρησιμοποιείται ως ο αποστολέας των email από την ιστοσελίδα. Η προκαθορισμένη ρύθμιση είναι 'τίτλος'. Εάν ο 'τίτλος' σας περιέχει χαρακτήρες οι οποίοι δεν επιτρέπονται στα email, χρησιμοποιήστε αυτή τη ρύθμιση. "
@@ -1198,7 +1176,6 @@ el:
     read_time_word_count: "Μέτρηση των λέξεων ανά λεπτό για να υπολογίσεις τον εκτιμώμενο χρόνο διαβάσματος."
     share_anonymized_statistics: "Μοιράσου ανωνυμοποιημένα στατιστικά χρήσης"
     auto_handle_queued_age: "Αυτόματη διαχείριση εγγραφών σε αναμονή για έλεγχο μετά από τόσες ημέρες. Οι σημάνσεις θα αγνοηθούν. Αναρτήσεις σε ουρά και χρήστες θα αγνοηθούν. Θέσε 0 για απενεργοποίηση αυτής της λειτουργίας."
-    max_prints_per_hour_per_user: "Μέγιστος αριθμός προβολών σελίδας /print (0 για απενεργοποίηση)"
     full_name_required: "Το ονοματεπώνυμο είναι απαραίτητο πεδίο για το προφίλ του χρήστη."
     enable_names: "Εμφάνιζε το πλήρες όνομα του χρήστη στο προφίλ τους, στην κάρτα χρήστη και στα email. Απενεργοποίησε για να κρύβεται το πλήρες όνομα παντού. "
     display_name_on_posts: "Να εμφανίζεται το πλήρες όνομα του χρήστη στις δημοσιεύσεις μαζί με το @όνομαχρήστη του."
@@ -1210,9 +1187,7 @@ el:
     allowed_href_schemes: "Τα σχεδιαγράμματα επιτρέπονται σε συνδέσμους επιπλέον απο το http και το https."
     embed_post_limit: "Μέγιστος αριθμός αναρτήσεων για ενσωμάτωση."
     embed_username_required: "Απαιτείται το όνομα χρήστη για τη δημιουργία νήματος."
-    show_create_topics_notice: "Εάν η ιστοσελίδα έχει λιγότερα από 5 δημόσια νήματα, κάνε μια παρατήρηση ζητώντας από τον διαχειριστή να δημιουργήσει μερικά νήματα."
     delete_drafts_older_than_n_days: "Διαγραφή προχείρων παλαιότερα απο (ν) ημερων "
-    bootstrap_mode_min_users: "Μέγιστος αριθμός χρηστών που απαιτούνται για την απενεργοποίηση της κατάστασης bootstrap (0 για απενεργοποίηση)"
     slug_generation_method: "Επιλέξτε μια μέθοδο παραγωγής slug. «Κωδικοποιημένη» θα δημιουργήσει μια συμβολοσειρά για ποσοστιαία κωδικοποίηση. «Κανένα» θα απενεργοποιήσει τα slug."
     enable_emoji: "Ενεργοποίηση emoji"
     emoji_set: "Πως θα ήθελες το emoji σου;"
@@ -1246,7 +1221,6 @@ el:
     retain_web_hook_events_period_days: "Number of days to retain web hook event records."
     allow_user_api_keys: "Επιτρέψτε την δημιουργία των user API keys"
     allow_user_api_key_scopes: "Λίστα των πεδίων που επιτρέπεται για τα user API keys"
-    min_trust_level_for_user_api_key: "Επίπεδο εμπιστοσύνης που απαιτείται για την δημιουργία user API keys. "
     allowed_user_api_push_urls: "Επιτρεπόμενοι συνδέσμοι για την ώθηση του διακομιστή στο user API"
     tagging_enabled: "Ενεργοποίηση ετικετών στα θέματα; "
     min_trust_to_create_tag: "Το ελάχιστο επίπεδο εμπιστοσύνης που απαιτείται για να δημιουργηθεί μία ετικέτα. "
@@ -1278,7 +1252,6 @@ el:
       pop3_polling_password_is_empty: "Πρέπει να θέσετε ένα 'pop3 polling κωδικό πρόσβασης' πριν ενεργοποιήσετε το POP3 polling."
       pop3_polling_authentication_failed: "Ο έλεγχος ταυτότητας του πρωτοκόλλου POP3 απέτυχε. Παρακαλώ επαληθεύστε τα διαπιστευτήρια σας του πρωτοκόλλου POP3."
       reply_by_email_address_is_empty: "Πρέπει να θέσετε μια 'ηλεκτρονική διεύθυνση απάντησης' πριν ενεργοποιήσετε την δυνατότητα απάντησης μέσω email."
-      email_polling_disabled: "Πρέπει να ενεργοποιήσετε το χειροκίνητο ή το POP3 polling πριν ενεργοποιήσετε την απάντηση μέσω email"
       user_locale_not_enabled: "Πρέπει πρώτα να ενεργοποιήσετε τη ρύθμιση 'επίτρεψε την τοποθεσία χρήστη' πριν να ενεργοποιήσετε αυτή τη ρύθμιση. "
       invalid_regex: "Το Regex δεν είναι έγκυρο ή δεν επιτρέπεται"
       email_editable_enabled: "Θα πρέπει να απενεγοποιηθεί το 'email editable' πριν ενεργοποιηθεί αυτή η ρύθμιση."
@@ -1404,7 +1377,6 @@ el:
     deactivated_by_staff: "Απενεργοποιήθηκε από τους συνεργάτες"
     activated_by_staff: "Ενεργοποιήθηκε από τους συνεργάτες"
     new_user_typed_too_fast: "Ο νέος χρήστης πληκτρολογούσε πολύ γρήγορα"
-    content_matches_auto_block_regex: "Content matches auto block regex"
     username:
       short: "πρέπει να είναι τουλάχιστον %{min} χαρακτήρες"
       long: "δεν πρέπει να είναι περισσότερο από %{max} χαρακτήρες"
@@ -1756,15 +1728,6 @@ el:
     user_automatically_silenced:
       title: "Χρήστης Αυτόματα σε Σιγή"
       subject_template: "Νέος χρήστης %{username} σιγήθηκε από σημάνσεις της κοινότητας"
-      text_body_template: |2
-
-        Αυτό είναι αυτοματοποιημένο μήνυμα.
-
-        Ο νέος χρήστης [%{username}](%{user_url}) τέθηκε αυτόματα σε σίγαση διότι ένας αριθμός χρηστών σήμανε τις αναρτήσεις του %{username}.
-
-        Παρακαλούμε [ελέγξτε τις σημάνσεις](%{base_url}/admin/flags). Αν ο/η %{username} τέθηκε λανθασμένα σε σιγή, κάντε κλικ στο κουμπί αναίρεσης σίγασης στην [σελίδα διαχείρισης χρήστη](%{user_url}).
-
-        Αυτό το όριο μπορεί να ρυθμιστεί μέσω του πεδίου `silence_new_user` στις ρυθμίσεις ιστοσελίδας.
     spam_post_blocked:
       title: " Ανεπιθύμητη Ανάρτηση Μπλοκαρίστηκε"
       subject_template: "Οι αναρτήσεις του νέου χρήστη %{username} μπλοκαρίστηκαν εξαιτίας των επαναλαμβανόμενων συνδέσμων"
@@ -1787,8 +1750,6 @@ el:
       title: "Η λήψη απομακρυσμένων εικόνων απενεργοποιήθηκε"
       subject_template: "Η λήψη απομακρυσμένων εικόνων απενεργοποιήθηκε"
       text_body_template: "Η ρύθμιση `download_remote_images_to_local` απενεργοποιήθηκε επειδή το όριο χώρου στο δίσκο του `download_remote_images_threshold` έχει ξεπεραστεί"
-    dashboard_problems:
-      title: "Προβλήματα Πίνακα"
     new_user_of_the_month:
       title: "Έχεις επιλεχθεί ως Χρήστης του Μήνα!"
       subject_template: "Έχεις επιλεχθεί ως Χρήστης του Μήνα!"
@@ -1823,9 +1784,6 @@ el:
       one: "Ενημέρωση: Στέλνουμε το μέγιστο %{count} email καθημερινά. Ελέγξτε την ιστοσελίδα για να δείτε αυτά που πιθανώς έχουν κρατηθεί. "
       other: "Ενημέρωση: Στέλνουμε το μέγιστο %{count} emails καθημερινά. Ελέγξτε την ιστοσελίδα για να δείτε αυτά που πιθανώς έχουν κρατηθεί. ΥΓ ευχαριστούμε που είστε τόσο δημοφιλής!"
     in_reply_to: "Απάντηση Σε"
-    unsubscribe:
-      title: "Απεγγραφή"
-      description: "Δεν ενδιαφέρεσαι να λαμβάνεις αυτά τα email; Κανένα πρόβλημα! Κάνε κλικ στο παρακάτω για να απεγγραφείς στη στιγμή:"
     reply_by_email: "[Επισκέψου το νήμα](%{base_url}%{url}) ή απάντησε σε αυτό το email για να αποκριθείς."
     only_reply_by_email: "Απαντήστε σε αυτό το email για να αποκριθείς."
     visit_link_to_respond: "[Επισκέψου το νήμα](%{base_url}%{url}) για να αποκριθείς."
@@ -2060,7 +2018,6 @@ el:
       liked_received: "Ληφθέντα \"Μου αρέσει\""
       new_users: "Νέοι Χρήστες"
       popular_topics: "Δημοφιλή Θέματα"
-      follow_topic: "Ακολουθήστε αυτό το θέμα"
       join_the_discussion: "Διάβασε Περισσότερα"
       popular_posts: "Δημοφιλείς Αναρτήσεις"
       more_new: "Νέα για σένα"
@@ -2159,16 +2116,6 @@ el:
   offline:
     title: "Cannot load app"
     offline_page_message: "Πιθανώς βρίσκεσαι εκτός σύνδεσης! Έλεγξε την σύνδεσή σου και δοκίμασε ξανά."
-  login_required:
-    welcome_message: |2
-
-      ## [Καλώς ήρθατε στην %{title}](#welcome)
-
-      Είναι απαραίτητο να έχετε λογαριασμό χρήστη.
-
-      Παρακαλούμε δημιουργήστε έναν λογαριασμό ή συνδεθείτε για να συνεχίσετε..
-  deleted: "διεγράφη"
-  image: "εικόνα"
   upload:
     edit_reason: "λήψη τοπικών αντιγράφων των εικόνων"
     unauthorized: "Λυπούμαστε, το αρχείο που προσπαθείτε να ανεβάσετε δεν είναι εγκεκριμένο (authorized extensions: %{authorized_extensions})."
@@ -2228,93 +2175,6 @@ el:
     title: "Όροι Χρήσης"
   privacy_topic:
     title: "Πολιτική Ιδιωτικότητας"
-    body: |2
-
-      <a όνομα=“συλλέγουν"></a>
-
-      ## [Τι πληροφορίεσ συλλέγουμε;](#συλλογή)
-
-      Συλλέγουμε πληροφορίες απο εσένα όταν γραφτείς στη σελίδα και όταν μαζέψεις δεδομένα όταν συμμετέχεις στις συζητήσεις διαβάζοντας, γράφοντας, και σταδιακά το περιεχόμενο που είναι κοινοποίημενο εδώ.
-
-      Όταν εγραφείς στη σελίδα μας, μπόρει να ζυτηθεί το όνομα και η ηλεκτρονίκη διεύθυνση σας. Μπορείται, όμως, να επισκεφτείται τη σελίδα μας χωρίς εγράφη. Η διεύθηνση ηλεκτρονικού ταχυδρομίου σας θα εγκριθεί με ηλεκτονικό μήνυμα που θα περιέχει ενα μοναδικό σύνδεσμο. Αν επισκέφτεσαι αυτό το σύνδεσμο , θα ξέρουμε ότι ελέγχεις τι δεύθυνση ηλεκτονικού ταχύδρομιου.
-
-      Οταν είσαι εγγραμένος και κοινοποίης, καταγράφουμε τη διεύθυνση IP που προέρχεται η δημοσίευση. Μπορεί να διατηρίσουμε αρχεία καταγραφής του διακομιστή που περιέχουν τη διεύθυνση IP για κάθε αίτημα του διακομιστή.
-
-      <α όνομα="χρήση"></a>
-
-      ## [Για ποίο σκοπό χρησιμοποίουμε τις πληροφορίες σας;](#χρήση)
-
-      Οποιαδίποτε από τις πληροφορίες που συλλέγουμε απο εσάς μπορεί να χρησιμοποίηθει με ένα από τους ακόλουθους τρόπους:
-
-      *Για να εξατομικεύσουμε την εμπειρία σας&mdash;— τα στοιχεία σας μας βοηθά να ανταποκριθεί καλύτερα στις ατομικές σας ανάγκες.
-
-      *Για να βελτιώσουμε την ιστοσελίδα μας &mdash;— προσπαθούμε συνεχώς να βελτιώσουν τις προσφορές τις ιστοσελίδα μας βάσει τις πληροφορίες και την ανατροφοδότηση που λαμβάνουμε από εσάς.
-
-      *Για τη βελτίωση της εξυπηρέτησης πελατών &mdash;— τα στοιχεία σας μας βοηθούν για την ανταπόκριση σε αιτήματα εξυπηρέτησής σας πιο αποτελεσματικά και να υποστηρίζουν τις ανάγκες.
-
-      *Για να στείλετε μηνύματα ηλεκτρονικού ταχυδρομείου &mdash;— τη διεύθυνση ηλεκτρονικού ταχυδρομείου που παρέχετε μπορεί να χρησιμοποιηθεί για την αποστολή πληροφοριών, τις ειδοποιήσεις που έχετε ζητήσει για αλλαγές σε θέματα ή απαντώντας στο όνομα χρήστη σας, να απαντήσουμε σε ερωτήσεις, και/ή άλλα αιτήματα ή ερωτήσεις.
-
-      <α όνομα="προστασία"></a>
-
-      ## [Πως προστατεύουμε τις πληροφορίες σας;](#προστασία)
-
-      Εφαρμόζουμε μια ποικιλία μέτρων ασφαλείας για να διατηρήσουμε την ασφάλεια των προσωπικών σας πληροφοριών όταν εισάγεστε, υποβάλλετε ή πρόσβαση στις προσωπικές πληροφορίες σας.
-
-      <a name="data-retention"></a>
-
-      ## [Τι είναι τα δεδομέναdata κράτησης πολιτικής?](#data-retention)
-
-      Θα κάνουμε μια καλήπροσπάθεια πιστής:
-
-      *Διατηρούν αρχεία καταγραφής του διακομιστή που περιέχει τη διεύθυνση IP του όλα τα αιτήματα σε αυτόν το διακομιστή δεν φυλάσονται περισσότερο από 90 ημέρες.
-
-      *Διατηρούν τις διευθύνσεις IP που σχετίζονται με εγγεγραμμένους χρήστες και τις θέσεις τους όχι περισσότερο από 5 χρόνια.
-
-      <a name="cookies"></a>
-
-      ## [Do we use cookies?](#cookies)
-
-      Ναι. Τα cookies είναι μικρά αρχεία ότι ένα site ή ο πάροχος υπηρεσίας μεταφέρει στο σκληρό δίσκο του υπολογιστή σας μέσω του Web browser σας (αν επιτρέπεται). Αυτά τα cookies επιτρέπουν στον ιστότοπο να αναγνωρίσει το πρόγραμμα περιήγησής σας και, εάν έχετε έναν λογαριασμό, συσχετίσετε με καταχωρημένο λογαριασμό σας.
-
-      Χρησιμοποιούμε cookies για να κατανοήσουν και να αποθηκεύσετε τις προτιμήσεις σας για μελλοντικές επισκέψεις και να μεταγλωττίσετε συγκεντρωτικά δεδομένα σχετικά με την επισκεψιμότητα της ιστοσελίδας και την αλληλεπίδραση ιστοσελίδας, έτσι ώστε να μπορούμε να προσφέρουμε καλύτερες εμπειρίες ιστοσελίδας και εργαλεία στο μέλλον. Μπορεί να συνεργαστούμε με τρίτους παρόχους υπηρεσιών για να μας βοηθήσουν να κατανοήσουμε καλύτερα τους επισκέπτες περιοχών μας.Αυτοί οι πάροχοι δεν επιτρέπεται να χρησιμοποιούν τις πληροφορίες που συλλέγονται για λογαριασμό μας, εκτός από το να μας βοηθήσουν να βελτιστοποιήσουμε την επιχείρησή μας.
-
-      <a name="disclose"></a>
-
-      ## [Αποκαλύπτουμε οποιαδίποτε πληροφορία με εξωτερικούς παρόχους;](#disclose)
-
-      Εμείς δεν πωλάμε, το εμπόριο, ή άλλο τρόπο μεταφοράς σε εξωτερικά μέρη σας προσωπικά αναγνωρίσιμες πληροφορίες. Αυτό δεν περιλαμβάνει έμπιστα τρίτα μέρη που μας βοηθούν σε λειτουργία την ιστοσελίδα μας, διεξάγουν τις δραστηριότητές μας ή εξυπηρέτηση σας, εφόσον τα μέρη συμφωνούν να διατηρήσουν τις πληροφορίες εμπιστευτικές. Ενδέχεται επίσης να δώσουμε τα στοιχεία σας όταν πιστεύουμε ότι είναι σκόπιμο να συμμορφώνονται με τη νομοθεσία, την επιβολή πολιτικών σελιδών μας, ή προστασία δικών μας ή αλλότριων δικαιωμάτων, ιδιοκτησίας ή ασφάλειας. Ωστόσο, μη προσωπικά αναγνωρίσιμες πληροφορίες επισκέπτης μπορεί να παρέχεται σε άλλα μέρη για το εμπόριο, τη διαφήμιση, ή άλλες χρήσεις.
-
-      <a name="third-party"></a>
-
-      ## [Third party links](#third-party)
-
-      Περιστασιακά, κατά την κρίση μας, εμείς μπορεί να περιλαμβάνουμε ή να προσφέρουμε προϊόντα τρίτων ή υπηρεσίες στην ιστοσελίδα μας. Αυτές οι ιστοσελίδες τρίτων έχουν χωριστές και ανεξάρτητες πολιτικές απορρήτου. Έχουμε επομένως καμία ευθύνη ή υποχρέωση για το περιεχόμενο και τις δραστηριότητες των συνδεδεμένων ιστοτόπων. Παρόλα αυτά, επιδιώκουμε να προστατεύσουμε την ακεραιότητα τις σελίδας μας και καλωσορίζουμε οποιαδήποτε ανατροφοδότηση σχετικά με αυτές τις τοποθεσίες.
-
-      <a name="coppa"></a>
-
-      ## [Παιδικό ηλεκτρονικό απόρρητο προστασίας πράξης συμμόρφωσης](#coppa)
-
-      Η σελίδα μας, τα προϊόντα και τις υπηρεσίες μας απευθύνονται σε ανθρώπους που είναι τουλάχιστον 13 ετών ή μεγαλύτεροι. Εάν αυτός ο διακομιστής είναι στις ΗΠΑ, και είστε ηλικίας κάτω των 13, ανά τις απαιτήσεις του COPPA ([Children's Online Privacy Protection Act](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)), μη χρησιμοποίησεται αυτή τη σελίδα.
-
-      <a name="online"></a
-
-      ## [Online Privacy Policy Only](#online)
-
-      Αυτή η πολιτική απορρήτου ισχύει μόνο για πληροφορίες που συλλέγονται μέσω της ιστοσελίδας μας και όχι σε πληροφορίες που συλλέγονται όταν είστε απενεργοποιημένοι.
-
-      <a name="consent"></a>
-
-      ## [Your Consent](#consent)
-
-      Χρησιμοποιώντας την ιστοσελίδα μας, συναινείτε στην πολιτική απορρήτου μας.
-
-      <a name="changes"></a>
-
-      ## [Changes to our Privacy Policy](#changes)
-
-      Εάν αποφασίσουμε να αλλάξουμε την πολιτική απορρήτου μας, θα δημοσιεύσουμε αυτές τις αλλαγές σε αυτήν τη σελίδα.
-
-      Αυτό το αρχείο είναι CC-BY-SA. Αναβαθμίστικε ταιλευταίος 31Μαΐου, 2013.
   badges:
     editor:
       name: Συντάκτης
@@ -2515,8 +2375,6 @@ el:
       message: "<p> Στείλαμε email ενεργοποίησης στο <b>%{email}</b>"
   safe_mode:
     title: "Έναρξη ασφαλούς λειτουργίας"
-    no_unofficial_plugins: "Απενεργοποίησε ανεπίσημα πρόσθετα"
-    no_plugins: "Απενεργοποίησε όλα τα πρόσθετα"
     enter: "Έναρξη Ασφαλούς Λειτουργίας"
     must_select: "Θα πρέπει να διαλέξτε τουλάχιστον μία επιλογή για να εισέλθετε σε ασφαλή λειτοθργία."
   wizard:
@@ -2559,7 +2417,6 @@ el:
         description: "Έχεις σχεδόν τελειώσει! Ας προσκαλέσουμε μερικούς χρήστες να <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>συμμετάσχουν στις συζητήσεις</a> με ενδιαφέροντα νήματα και αναρτήσεις ώστε να ξεκινήσει να λειτουργεί η κοινότητα. "
       finished:
         title: "Το Discourse σου είναι έτοιμο!"
-  joined: "Έγινε μέλος"
   discourse_push_notifications:
     popup:
       mentioned: '%{username} σε ανέφερε στο "%{topic}" - %{site_title}'
@@ -2586,24 +2443,20 @@ el:
       medium: "Μεσαία"
       high: "Υψηλή"
     actions:
-      agree_and_keep:
-        description: "Αποδοχή επισήμανσης και διατήρηση της ανάρτησης αμετάβλητης."
-      agree_and_suspend:
-        title: "Αποβολή Χρήστη"
-      agree_and_silence:
-        title: "Σίγαση Χρήστη"
+      agree:
+        title: "Ναι"
       agree_and_restore:
         description: "Επαναφορά της ανάρτησης ώστε όλοι οι χρήστες να μπορούν να το δουν."
-      agree_and_hide:
-        description: "Κρύψε αυτή την ανάρτηση και αυτόματα στείλε στον χρήστη ένα μήνυμα που θα τους προτρέπει να το επεξεργαστούν."
       delete_single:
         title: "Σβήσιμο"
       disagree_and_restore:
         description: "Επαναφορά της ανάρτησης ώστε όλοι οι χρήστες να μπορούν να το δουν."
       disagree:
-        title: "Διαφωνώ"
+        title: "Όχι"
       ignore:
         title: "Αγνόηση"
+      ignore_and_do_nothing:
+        title: "Μην κάνετε τίποτα"
       approve:
         title: "Έγκριση"
       reject_user:
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 9eb6a6498aa..25feb0e627b 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -61,6 +61,12 @@ en:
   redirect_warning: "We were unable to verify that the link you selected was actually posted to the forum. If you wish to proceed anyway, select the link below."
   on_another_topic: "On another topic"
 
+  topic_category_changed: "From %{from} to %{to}"
+  topic_tag_changed:
+    added_and_removed: "Added %{added} and removed %{removed}"
+    added: "Added %{added}"
+    removed: "Removed %{removed}"
+
   inline_oneboxer:
     topic_page_title_post_number: "#%{post_number}"
     topic_page_title_post_number_by_user: "#%{post_number} by %{username}"
@@ -201,8 +207,8 @@ en:
       invalid_site_setting: "No setting named '%{name}' exists"
       invalid_category_id: "You specified a category that does not exist"
       invalid_choice:
-        one: "You specified the invalid choice %{name}"
-        other: "You specified the invalid choices %{name}"
+        one: "'%{name}' is an invalid choice."
+        other: "'%{name}' are invalid choices."
       default_categories_already_selected: "You cannot select a category used in another list."
       default_tags_already_selected: "You cannot select a tag used in another list."
       s3_upload_bucket_is_required: "You cannot enable uploads to S3 unless you've provided the 's3_upload_bucket'."
@@ -210,7 +216,8 @@ en:
       page_publishing_requirements: "Page publishing cannot be enabled if secure media is enabled."
       s3_backup_requires_s3_settings: "You cannot use S3 as backup location unless you've provided the '%{setting_name}'."
       s3_bucket_reused: "You cannot use the same bucket for 's3_upload_bucket' and 's3_backup_bucket'. Choose a different bucket or use a different path for each bucket."
-      secure_uploads_requirements: "S3 uploads must be enabled before enabling secure uploads."
+      secure_uploads_requirements: "S3 uploads and S3 ACLs must be enabled before enabling secure uploads."
+      s3_use_acls_requirements: "You must have S3 ACLs enabled when secure uploads are enabled."
       share_quote_facebook_requirements: "You must set a Facebook app id to enable quote sharing for Facebook."
       second_factor_cannot_enforce_with_socials: "You cannot enforce 2FA with social logins enabled. You must first disable login via: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "You cannot enforce 2FA if local logins are disabled."
@@ -238,6 +245,10 @@ en:
     errors:
       <<: *errors
 
+  custom_fields:
+    validations:
+      max_items: "Maximum number of custom fields for this entity has been reached (%{max_items_number})"
+      max_value_length: "Maximum length for a custom field value has been reached (%{max_value_length})"
   invite:
     expired: "Your invite token has expired. Please <a href='%{base_url}/about'>contact staff</a>."
     not_found: "Your invite token is invalid. Please <a href='%{base_url}/about'>contact staff</a>."
@@ -256,6 +267,7 @@ en:
     user_exists: "There's no need to invite <b>%{email}</b>, they already have an account!"
     invite_exists: "You already invited <b>%{email}</b>."
     invalid_email: "%{email} isn't a valid email address."
+    generic_error_response: "There was a problem with your request."
     rate_limit:
       one: "You have already sent %{count} invite in the last 24 hours, please wait %{time_left} before trying again."
       other: "You have already sent %{count} invites in the last 24 hours, please wait %{time_left} before trying again."
@@ -433,6 +445,7 @@ en:
   too_late_to_edit: "That post was created too long ago. It can no longer be edited or deleted."
   edit_conflict: "That post was edited by another user and your changes can no longer be saved."
   revert_version_same: "The current version is same as the version you are trying to revert to."
+  reverted_to_version: "reverted to version #%{version}"
   cannot_edit_on_slow_mode: "This topic is in slow mode. To encourage thoughtful, considered discussion, editing old posts in this topic is not currently allowed during slow mode."
 
   excerpt_image: "image"
@@ -547,6 +560,8 @@ en:
 
     get_a_room: You’ve replied to @%{reply_username} %{count} times, did you know you could send them a personal message instead?
 
+    dont_feed_the_trolls: This post has already been flagged for moderator attention. Are you sure you wish to reply to it? Replies to negative content tend to encourage more negative behavior.
+
     too_many_replies: |
       ### You have reached the reply limit for this topic
 
@@ -641,7 +656,9 @@ en:
         translation_overrides:
           attributes:
             value:
-              invalid_interpolation_keys: 'The following interpolation key(s) are invalid: "%{keys}"'
+              invalid_interpolation_keys:
+                one: "The following interpolation key is invalid: %{keys}"
+                other: "The following interpolation keys are invalid: %{keys}"
         watched_word:
           attributes:
             word:
@@ -666,23 +683,23 @@ en:
   staff_category_description: "Private category for staff discussions. Topics are only visible to admins and moderators."
 
   discourse_welcome_topic:
-    title: "Welcome to our community!"
+    title: "Welcome to %{site_title}! :wave:"
     body: |
+      We are so glad you joined us.
 
-      The first paragraph of this pinned topic will be visible as a welcome message to all new visitors on your homepage. It's important!
+      %{site_info_quote}
 
-      **Edit this** into a brief description of your community:
+      Here are some things you can do to get started:
 
-      - Who is it for?
-      - What can they find here?
-      - Why should they come here?
-      - Where can they read more (links, resources, etc)?
+      :speaking_head: **Introduce yourself** by adding your picture and information about yourself and your interests to [your profile](%{base_path}/my/preferences/account). What is one thing you’d like to be asked about?
 
-      <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+      :open_book: **Get to know the community** by [browsing discussions](%{base_path}/top) that are already happening here. When you find a post interesting, informative, or entertaining, use the :heart: to show your appreciation or support!
 
-      You may want to close this topic via the admin :wrench: (at the upper right and bottom), so that replies don't pile up on an announcement.
+      :handshake: **Contribute** by commenting, sharing your own perspective, asking questions, or offering feedback in the discussion. Before replying or starting new topics, please review the [Community Guidelines](%{base_path}/faq).
 
-  admin_quick_start_title: "READ ME FIRST: Admin Quick Start Guide"
+      > If you need help or have a suggestion, feel free to ask in [#feedback](%{base_path}/c/site-feedback) or [contact the admins](%{base_path}/about).
+
+  admin_quick_start_title: "Admin Guide: Getting Started"
 
   category:
     topic_prefix: "About the %{category} category"
@@ -702,6 +719,7 @@ en:
       disallowed_tags_generic: "This topic has disallowed tags."
       slug_contains_non_ascii_chars: "contains non-ascii characters"
       is_already_in_use: "is already in use"
+      move_topic_to_category_disallowed: "You cannot move this topic to a category where you do not have permission to create new topics."
     cannot_delete:
       uncategorized: "This category is special. It is intended as a holding area for topics that have no category; it cannot be deleted."
       has_subcategories: "Can't delete this category because it has sub-categories."
@@ -1190,7 +1208,7 @@ en:
       title: "DAU/MAU"
       xaxis: "Day"
       yaxis: "DAU/MAU"
-      description: "Number of members that logged in in the last day divided by number of members that logged in in the last month – returns a % which indicates community 'stickiness'. Aim for >30%."
+      description: "Number of members that logged in in the last day divided by number of members that logged in in the last month – returns a % which indicates community 'stickiness'. Aim for >20%."
     daily_engaged_users:
       title: "Daily Engaged Users"
       xaxis: "Day"
@@ -1460,6 +1478,7 @@ en:
     image_magick_warning: 'The server is configured to create thumbnails of large images, but ImageMagick is not installed. Install ImageMagick using your favorite package manager or <a href="https://www.imagemagick.org/script/download.php" target="_blank">download the latest release</a>.'
     failing_emails_warning: 'There are %{num_failed_jobs} email jobs that failed. Check your app.yml and ensure that the mail server settings are correct. <a href="%{base_path}/sidekiq/retries" target="_blank">See the failed jobs in Sidekiq</a>.'
     subfolder_ends_in_slash: "Your subfolder setup is incorrect; the DISCOURSE_RELATIVE_URL_ROOT ends in a slash."
+    outdated_translations_warning: "Some of your translation overrides are out of date. Please check your <a href='%{base_path}/admin/customize/site_texts?outdated=true'>text customizations</a>."
     email_polling_errored_recently:
       one: "Email polling has generated an error in the past 24 hours. Look at <a href='%{base_path}/logs' target='_blank'>the logs</a> for more details."
       other: "Email polling has generated %{count} errors in the past 24 hours. Look at <a href='%{base_path}/logs' target='_blank'>the logs</a> for more details."
@@ -1471,6 +1490,8 @@ en:
     out_of_date_themes: "Updates are available for the following themes:"
     unreachable_themes: "We were unable to check for updates on the following themes:"
     watched_word_regexp_error: "The regular expression for '%{action}' watched words is invalid. Please check your <a href='%{base_path}/admin/customize/watched_words'>Watched Word settings</a>, or disable the 'watched words regular expressions' site setting."
+    v3_analytics_deprecated: "Your Discourse is currently using Google Analytics 3, which will no longer be supported after July 2023. <a href='https://meta.discourse.org/t/260498'>Upgrade to Google Analytics 4</a> now to continue receiving valuable insights and analytics for your website's performance."
+    legacy_navigation_menu_deprecated: "Your Discourse is currently using the 'legacy' navigation menu which <a href='https://meta.discourse.org/t/removing-the-legacy-hamburger-navigation-menu-option/265274'>will be removed in the first beta release of Discourse 3.2</a>. Migrate to the new navigation menu by updating your <a href='%{base_path}/admin/site_settings/category/all_results?filter=navigation_menu'>navigation menu site setting</a> to 'sidebar' or 'header dropdown'."
 
   site_settings:
     allow_bulk_invite: "Allow bulk invites by uploading a CSV file"
@@ -1537,9 +1558,12 @@ en:
     fixed_category_positions_on_create: "If checked, category ordering will be maintained on topic creation dialog (requires fixed_category_positions)."
     add_rel_nofollow_to_user_content: 'Add rel nofollow to all submitted user content, except for internal links (including parent domains). If you change this, you must rebake all posts with: "rake posts:rebake"'
     exclude_rel_nofollow_domains: "A list of domains where nofollow should not be added to links. example.com will automatically allow sub.example.com as well. As a minimum, you should add the domain of this site to help web crawlers find all content. If other parts of your website are at other domains, add those too."
+    max_form_template_title_length: "Maximum allowed length for form template titles."
+    max_form_template_content_length: "Maximum allowed length for form template content."
 
     post_excerpt_maxlength: "Maximum length of a post excerpt / summary."
     topic_excerpt_maxlength: "Maximum length of a topic excerpt / summary, generated from the first post in a topic."
+    default_subcategory_on_read_only_category: "Enables 'New Topic' button and selects a default subcategory to post on categories where the user is not allowed to create a new topic."
     show_pinned_excerpt_mobile: "Show excerpt on pinned topics in mobile view."
     show_pinned_excerpt_desktop: "Show excerpt on pinned topics in desktop view."
     post_onebox_maxlength: "Maximum length of a oneboxed Discourse post in characters."
@@ -1562,7 +1586,7 @@ en:
     manifest_icon: "Image used as logo/splash image on Android. Will be automatically resized to 512 × 512. If left blank, large_icon will be used."
     manifest_screenshots: "Screenshots that showcase your instance features and functionality on its install prompt page. All images should be local uploads and of the same dimensions."
     favicon: "A favicon for your site, see <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://en.wikipedia.org/wiki/Favicon</a>. To work correctly over a CDN it must be a png. Will be resized to 32x32. If left blank, large_icon will be used."
-    apple_touch_icon: "Icon used for Apple touch devices. Will be automatically resized to 180x180. If left blank, large_icon will be used."
+    apple_touch_icon: "Icon used for Apple touch devices. A transparent background is not reccomended. Will be automatically resized to 180x180. If left blank, large_icon will be used."
     opengraph_image: "Default opengraph image, used when the page has no other suitable image. If left blank, large_icon will be used"
     twitter_summary_large_image: "Twitter card 'summary large image' (should be at least 280 in width, and at least 150 in height, cannot be .svg). If left blank, regular card metadata is generated using the opengraph_image, as long as that is not also a .svg"
 
@@ -1580,6 +1604,8 @@ en:
     summary_percent_filter: "When a user clicks 'Summarize This Topic', show the top % of posts"
     summary_max_results: "Maximum posts returned by 'Summarize This Topic'"
     summary_timeline_button: "Show a 'Summarize' button in the timeline"
+    summarization_strategy: "Additional ways to summarize content registered by plugins"
+    custom_summarization_allowed_groups: "Groups allowed to summarize contents using the `summarization_strategy`."
 
     enable_personal_messages: "DEPRECATED, use the 'personal message enabled groups' setting instead. Allow trust level 1 (configurable via min trust to send messages) users to create messages and reply to messages. Note that staff can always send messages no matter what."
     personal_message_enabled_groups: "Allow users within these groups to create messages and reply to messages. Trust level groups include all trust levels above that number, for example choosing trust_level_1 also allows trust_level_2, 3, 4 users to send PMs. Note that staff can always send messages no matter what."
@@ -1683,6 +1709,7 @@ en:
     enable_badges: "Enable the badge system"
     max_favorite_badges: "Maximum number of badges that user can select"
     whispers_allowed_groups: "Allow private communication within topics for members of specified groups."
+    hidden_post_visible_groups: "Allow members of these groups to view hidden posts. Staff users can always view hidden posts."
 
     allow_index_in_robots_txt: "Specify in robots.txt that this site is allowed to be indexed by web search engines. In exceptional cases you can permanently <a href='%{base_path}/admin/customize/robots'>override robots.txt</a>."
     blocked_email_domains: "A pipe-delimited list of email domains that users are not allowed to register accounts with. Subdomains are automatically handled for the specified domains. Wildcard symbols * and ? are not supported. Example: mailinator.com|trashmail.net"
@@ -1718,7 +1745,7 @@ en:
     enable_discourse_connect: "Enable sign on via DiscourseConnect (formerly 'Discourse SSO') (WARNING: USERS' EMAIL ADDRESSES *MUST* BE VALIDATED BY THE EXTERNAL SITE!)"
     verbose_discourse_connect_logging: "Log verbose DiscourseConnect related diagnostics to <a href='%{base_path}/logs' target='_blank'>/logs</a>"
     enable_discourse_connect_provider: "Implement DiscourseConnect (formerly 'Discourse SSO') provider protocol at the /session/sso_provider endpoint, requires discourse_connect_provider_secrets to be set"
-    discourse_connect_url: "URL of DiscourseConnect endpoint (must include http:// or https://)"
+    discourse_connect_url: "URL of DiscourseConnect endpoint (must include http:// or https://, and must not include a trailing slash)"
     discourse_connect_secret: "Secret string used to cryptographically authenticate DiscourseConnect information, be sure it is 10 characters or longer"
     discourse_connect_provider_secrets: "A list of domain-secret pairs that are using DiscourseConnect. Make sure DiscourseConnect secret is 10 characters or longer. Wildcard symbol * can be used to match any domain or only a part of it (e.g. *.example.com)."
     discourse_connect_overrides_bio: "Overrides user bio in user profile and prevents user from changing it"
@@ -1732,7 +1759,7 @@ en:
     discourse_connect_overrides_profile_background: "Overrides user profile background with value from DiscourseConnect payload."
     discourse_connect_overrides_card_background: "Overrides user card background with value from DiscourseConnect payload."
     discourse_connect_not_approved_url: "Redirect unapproved DiscourseConnect accounts to this URL"
-    discourse_connect_allows_all_return_paths: "Do not restrict the domain for return_paths provided by DiscourseConnect (by default return path must be on current site)"
+    discourse_connect_allowed_redirect_domains: "Restrict to these domains for return_paths provided by DiscourseConnect (by default return path must be on current site). Use * to allow any domain for return path. Subdomain wildcards (`*.foobar.com`) are not allowed."
 
     enable_local_logins: "Enable local username and password login based accounts. WARNING: if disabled, you may be unable to log in if you have not previously configured at least one alternate login method."
     enable_local_logins_via_email: "Allow users to request a one-click login link to be sent to them via email."
@@ -1775,6 +1802,7 @@ en:
     s3_configure_tombstone_policy: "Enable automatic deletion policy for tombstone uploads. IMPORTANT: If disabled, no space will be reclaimed after uploads are deleted."
     s3_disable_cleanup: "Prevent removal of old backups from S3 when there are more backups than the maximum allowed."
     enable_s3_inventory: "Generate reports and verify uploads using Amazon S3 inventory. IMPORTANT: requires valid S3 credentials (both access key id & secret access key)."
+    s3_use_acls: "AWS recommends not using ACLs on S3 buckets; if you are following this advice, uncheck this option. This must be enabled if you are using secure uploads."
     backup_time_of_day: "Time of day UTC when the backup should occur."
     backup_with_uploads: "Include uploads in scheduled backups. Disabling this will only backup the database."
     backup_location: "Location where backups are stored. IMPORTANT: S3 requires valid S3 credentials entered in Files settings."
@@ -1835,6 +1863,7 @@ en:
     s3_secret_access_key: "The Amazon S3 secret access key that will be used to upload images, attachments, and backups."
     s3_region: "The Amazon S3 region name that will be used to upload images and backups."
     s3_cdn_url: "The CDN URL to use for all s3 assets (for example: https://cdn.somewhere.com). WARNING: after changing this setting you must rebake all old posts."
+    s3_use_cdn_url_for_all_uploads: "Use CDN URL for all the files uploaded to s3 instead of only for images."
 
     avatar_sizes: "List of automatically generated avatar sizes."
 
@@ -1861,7 +1890,7 @@ en:
     composer_media_optimization_image_bytes_optimization_threshold: "Minimum image file size to trigger client-side optimization"
     composer_media_optimization_image_resize_dimensions_threshold: "Minimum image width to trigger client-side resize"
     composer_media_optimization_image_resize_width_target: "Images with widths larger than `composer_media_optimization_image_dimensions_resize_threshold` will be resized to this width. Must be >= than `composer_media_optimization_image_dimensions_resize_threshold`."
-    composer_media_optimization_image_encode_quality: "JPEG encode quality used in the re-encode process."
+    composer_media_optimization_image_encode_quality: "JPG encode quality used in the re-encode process."
 
     min_ratio_to_crop: "Ratio used to crop tall images. Enter the result of width / height."
 
@@ -1896,7 +1925,9 @@ en:
     tl3_requires_likes_given: "The minimum number of likes that must be given in the last (tl3 time period) days to qualify for promotion to trust level 3."
     tl3_requires_likes_received: "The minimum number of likes that must be received in the last (tl3 time period) days to qualify for promotion to trust level 3."
     tl3_links_no_follow: "Do not remove rel=nofollow from links posted by trust level 3 users."
-    trusted_users_can_edit_others: "Allow users with high trust levels to edit content from other users"
+    tl4_delete_posts_and_topics: "Allow TL4 users to delete posts and topics created by other users. TL4 users will also be able to see deleted topics and posts."
+    edit_all_topic_groups: "Allow users in this group to edit other users' topic titles, tags, and categories"
+    edit_all_post_groups: "Allow users in this group to edit other users' posts"
 
     min_trust_to_create_topic: "The minimum trust level required to create a new topic."
     allow_flagging_staff: "If enabled, users can flag posts from staff accounts."
@@ -1940,7 +1971,7 @@ en:
     title_min_entropy: "The minimum entropy (unique characters, non-english count for more) required for a topic title."
     body_min_entropy: "The minimum entropy (unique characters, non-english count for more) required for a post body."
     allow_uppercase_posts: "Allow all caps in a topic title or a post body."
-    max_consecutive_replies: "Number of posts a user has to make in a row in a topic before being prevented from adding another reply."
+    max_consecutive_replies: "Number of posts in a row a user can make in a topic before being prevented from adding another reply. This limit does not apply to the topic owner, site staff, or category moderators."
     enable_filtered_replies_view: '"(n) replies" button collapses all other posts and only shows the current post and its replies.'
 
     title_fancy_entities: "Convert common ASCII characters to fancy HTML entities in topic titles, ala SmartyPants <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</a>"
@@ -2043,6 +2074,11 @@ en:
     block_auto_generated_emails: "Block incoming emails identified as being auto generated."
     ignore_by_title: "Ignore incoming emails based on their title."
     mailgun_api_key: "Mailgun Secret API key used to verify webhook messages."
+    sendgrid_verification_key: "Sendgrid verification key used to verify webhook messages."
+    mailjet_webhook_token: "Token used to verify webhook payload. It must be passed as the 't' query parameter of the webhook, for example: https://example.com/webhook/mailjet?t=supersecret"
+    mandrill_authentication_key: "Mandrill authentication key used to verify webhook messages."
+    postmark_webhook_token: "Token used to verify webhook payload. It must be passed as the 't' query parameter of the webhook, for example: https://example.com/webhook/postmark?t=supersecret"
+    sparkpost_webhook_token: "Token used to verify webhook payload. It must be passed as the 't' query parameter of the webhook, for example: https://example.com/webhook/sparkpost?t=supersecret"
 
     soft_bounce_score: "Bounce score added to the user when a temporary bounce happens."
     hard_bounce_score: "Bounce score added to the user when a permanent bounce happens."
@@ -2074,7 +2110,7 @@ en:
     pop3_polling_password: "The password for the POP3 account to poll for email."
     pop3_polling_delete_from_server: "Delete emails from server. NOTE: If you disable this you should manually clean your mail inbox"
     log_mail_processing_failures: "Log all email processing failures to <a href='%{base_path}/logs' target='_blank'>/logs</a>"
-    email_in: 'Allow users to post new topics via email (requires manual or pop3 polling). Configure the addresses in the "Settings" tab of each category.'
+    email_in: "Allow users to post new topics via email. After enabling this setting, you will be able to configure incoming email addresses for groups and categories."
     email_in_min_trust: "The minimum trust level a user needs to have to be allowed to post new topics via email."
     email_in_authserv_id: "The identifier of the service doing authentication checks on incoming emails. See <a href='https://meta.discourse.org/t/134358'>https://meta.discourse.org/t/134358</a> for instructions on how to configure this."
     email_in_spam_header: "The email header to detect spam."
@@ -2128,6 +2164,7 @@ en:
     enable_category_group_moderation: "Allow groups to moderate content in specific categories"
     group_in_subject: "Set %%{optional_pm} in email subject to name of first group in PM, see: <a href='https://meta.discourse.org/t/customize-specific-email-templates/88323' target='_blank'>Customize subject format for standard emails</a>"
     allow_anonymous_posting: "Allow users to switch to anonymous mode"
+    allow_anonymous_likes: "Allow anonymous users to like posts"
     anonymous_posting_min_trust_level: "Minimum trust level required to enable anonymous posting"
     anonymous_account_duration_minutes: "To protect anonymity create a new anonymous account every N minutes for each user. Example: if set to 600, as soon as 600 minutes elapse from last post AND user switches to anon, a new anonymous account is created."
 
@@ -2161,6 +2198,8 @@ en:
 
     get_a_room_threshold: "Number of posts a user has to make to the same person in the same topic before being warned."
 
+    dont_feed_the_trolls_threshold: "Number of flags from other users before being warned."
+
     enable_mobile_theme: "Mobile devices use a mobile-friendly theme, with the ability to switch to the full site. Disable this if you want to use a custom stylesheet that is fully responsive."
 
     dominating_topic_minimum_percent: "What percentage of posts a user has to make in a topic before being reminded about overly dominating a topic."
@@ -2179,9 +2218,9 @@ en:
 
     disable_system_edit_notifications: "Disables edit notifications by the system user when 'download_remote_images_to_local' is active."
 
-    disable_category_edit_notifications: "Disable category edit notifications on topics."
+    disable_category_edit_notifications: "Disable notifications for topic category edits. This includes topics which are 'published' (e.g. shared drafts)."
 
-    disable_tags_edit_notifications: "Disable tags edit notifications on topics."
+    disable_tags_edit_notifications: "Disable notifications for topic tag edits. This includes topics which are 'published' (e.g. shared drafts)."
 
     notification_consolidation_threshold: "Number of liked or membership request notifications received before the notifications are consolidated into a single one. Set to 0 to disable."
 
@@ -2193,9 +2232,9 @@ en:
 
     topic_page_title_includes_category: "Topic page <a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title' target='_blank'>title tag</a> includes the category name."
 
-    native_app_install_banner_ios: "Displays DiscourseHub app banner on iOS devices to regular users (trust level 1 and up)."
+    native_app_install_banner_ios: "Displays DiscourseHub app banner on iOS devices to basic users (trust level 1) and up."
 
-    native_app_install_banner_android: "Displays DiscourseHub app banner on Android devices to regular users (trust level 1 and up)."
+    native_app_install_banner_android: "Displays DiscourseHub app banner on Android devices to basic users (trust level 1) and up."
 
     app_association_android: "Contents of <a href='%{base_path}/.well-known/assetlinks.json'>.well-known/assetlinks.json</a> endpoint, used for Google's Digital Asset Links API."
     app_association_ios: "Contents of <a href='%{base_path}/apple-app-site-association'>apple-app-site-association</a> endpoint, used to create Universal Links between this site and iOS apps."
@@ -2205,7 +2244,7 @@ en:
     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."
     penalty_step_hours: "Default penalties for silencing or suspending users in hours. First offense defaults to the first value, second offense defaults to the second value, etc."
     svg_icon_subset: "Add additional FontAwesome 5 icons that you would like to include in your assets. Use prefix 'fa-' for solid icons, 'far-' for regular icons and 'fab-' for brand icons."
-    max_prints_per_hour_per_user: "Maximum number of /print page impressions (set to 0 to disable)"
+    max_prints_per_hour_per_user: "Maximum number of /print page impressions (set to 0 to disable printing)"
 
     full_name_required: "Full name is a required field of a user's profile."
     enable_names: "Show the user's full name on their profile, user card, and emails. Disable to hide full name everywhere."
@@ -2228,20 +2267,16 @@ en:
     allowed_href_schemes: "Schemes allowed in links in addition to http and https."
     embed_post_limit: "Maximum number of posts to embed."
     embed_username_required: "The username for topic creation is required."
-    notify_about_flags_after: "If there are flags that haven't been handled after this many hours, send a personal message to moderators. Set to 0 to disable."
-    show_create_topics_notice: "If the site has fewer than 5 public topics, show a notice asking admins to create some topics."
+    notify_about_reviewable_item_after: "If there are reviewable items that haven’t been handled after this many hours, send a personal message to moderators. Set to 0 to disable."
 
     delete_drafts_older_than_n_days: "Delete drafts older than (n) days."
     delete_merged_stub_topics_after_days: "Number of days to wait before automatically deleting fully merged stub topics. Set to 0 to never delete stub topics."
 
-    bootstrap_mode_min_users: "Minimum number of users required to disable bootstrap mode (set to 0 to disable)"
+    bootstrap_mode_min_users: "Minimum number of users required to disable bootstrap mode (set to 0 to disable, can take up to 24 hours)"
 
     prevent_anons_from_downloading_files: "Prevent anonymous users from downloading attachments."
-    secure_media: "DEPRECATED: Use the secure_uploads setting instead, will be removed in Discourse 3.0."
     secure_uploads: 'Limits access to ALL uploads (images, video, audio, text, pdfs, zips, and others). If "login required” is enabled, only logged-in users can access uploads. Otherwise, access will be limited only for media uploads in private messages and private categories. WARNING: This setting is complex and requires deep administrative understanding. See <a target="_blank" href="https://meta.discourse.org/t/-/140017">the secure uploads topic on Meta</a> for details.'
-    secure_media_allow_embed_images_in_emails: "DEPRECATED: Use secure_uploads_allow_embed_images_in_emails, will remove in Discourse 3.0."
     secure_uploads_allow_embed_images_in_emails: "Allows embedding secure images that would normally be redacted in emails, if their size is smaller than the 'secure uploads max email embed image size kb' setting."
-    secure_media_max_email_embed_image_size_kb: "DEPRECATED: Use secure_uploads_max_email_embed_image_size_kb, will be removed in Discourse 3.0."
     secure_uploads_max_email_embed_image_size_kb: "The size cutoff for secure images that will be embedded in emails if the 'secure uploads allow embed in emails' setting is enabled. Without that setting enabled, this setting has no effect."
     slug_generation_method: "Choose a slug generation method. 'encoded' will generate percent encoding string. 'none' will disable slug at all."
 
@@ -2250,6 +2285,7 @@ en:
     emoji_set: "How would you like your emoji?"
     emoji_autocomplete_min_chars: "Minimum number of characters required to trigger autocomplete emoji popup"
     enable_inline_emoji_translation: "Enables translation for inline emojis (without any space or punctuation before)"
+    emoji_deny_list: "These emoji will not be available to use in menus or shortcodes."
 
     approve_post_count: "The amount of posts from a new or basic user that must be approved"
     approve_unless_trust_level: "Posts for users below this trust level must be approved"
@@ -2319,6 +2355,10 @@ en:
     default_text_size: "Text size which is selected by default"
 
     default_title_count_mode: "Default mode for the page title counter"
+    enable_offline_indicator: "Display a message to users when it is detected that they have no network connection"
+    default_sidebar_link_to_filtered_list: "Make navigation menu links link to filtered list by default."
+    default_sidebar_show_count_of_new_items: "Make navigation menu links show count of new items instead of badges by default."
+    default_sidebar_switch_panel_position: "Position of sidebar switch panel buttons"
 
     retain_web_hook_events_period_days: "Number of days to retain web hook event records."
     retry_web_hook_events: "Automatically retry failed web hook events for 4 times. Time gaps between the retries are 1, 5, 25 and 125 minutes."
@@ -2326,7 +2366,9 @@ en:
 
     allow_user_api_keys: "Allow generation of user API keys"
     allow_user_api_key_scopes: "List of scopes allowed for user API keys"
-    min_trust_level_for_user_api_key: "Trust level required for generation of user API keys"
+    min_trust_level_for_user_api_key: |
+      Trust level required for generation of user API keys.<br>
+      <b>WARNING</b>: Changing the trust level will prevent users with a lower trust level from logging in via Discourse Hub
     allowed_user_api_auth_redirects: "Allowed URL for authentication redirect for user API keys. Wildcard symbol * can be used to match any part of it (e.g. www.example.com/*)."
     allowed_user_api_push_urls: "Allowed URLs for server push to user API"
     expire_user_api_keys_days: "Number of days before a user API key automatically expires (0 for never)"
@@ -2334,6 +2376,8 @@ en:
     tagging_enabled: "Enable tags on topics?"
     min_trust_to_create_tag: "The minimum trust level required to create a tag."
     max_tags_per_topic: "The maximum tags that can be applied to a topic."
+    enable_max_tags_per_email_subject: "Use max_tags_per_email_subject when generating the subject of an email"
+    max_tags_per_email_subject: "The maximum tags that can be in the subject of an email"
     max_tag_length: "The maximum amount of characters that can be used in a tag."
     max_tag_search_results: "When searching for tags, the maximum number of results to show."
     max_tags_in_filter_list: "Maximum number of tags to show in the filter dropdown. The most used tags will be shown."
@@ -2345,6 +2389,8 @@ en:
     suppress_overlapping_tags_in_list: "If tags match exact words in topic titles, don't show the tag"
     remove_muted_tags_from_latest: "Don't show topics tagged only with muted tags in the latest topic list."
     force_lowercase_tags: "Force all new tags to be entirely lowercase."
+    create_post_for_category_and_tag_changes: "Create a small action post when a topic's category or tags change"
+    watched_precedence_over_muted: "Notify me about topics in categories or tags I’m watching that also belong to one I have muted"
 
     company_name: "Company Name"
     governing_law: "Governing Law"
@@ -2365,7 +2411,7 @@ en:
     sitemap_page_size: "Number of URLs to include in each sitemap page. Max 50.000"
 
     enable_user_status: "(experimental) Allow users to set custom status message (emoji + description)."
-    enable_user_tips: "(experimental) Enable new user tips that describe key features to users"
+    enable_user_tips: "Enable new user tips that describe key features to users"
 
     short_title: "The short title will be used on the user's home screen, launcher, or other places where space may be limited. It should be limited to 12 characters."
 
@@ -2389,11 +2435,16 @@ en:
 
     splash_screen: "Displays a temporary loading screen while site assets load"
     navigation_menu: "Determine which navigation menu to use. Sidebar and header navigation are customizable by users. Legacy option is available for backward compatibility."
-    default_sidebar_categories: "Selected categories will be displayed under Sidebar's Categories section by default."
-    default_sidebar_tags: "Selected tags will be displayed under Sidebar's Tags section by default."
-    enable_new_user_profile_nav_groups: "EXPERIMENTAL: Users of the selected groups will be shown the new user profile navigation menu"
-    enable_experimental_topic_timeline_groups: "EXPERIMENTAL: Users of the selected groups will be shown the refactored topic timeline"
+    default_navigation_menu_categories: "Selected categories will be displayed under Navigation Menu's Categories section by default."
+    default_navigation_menu_tags: "Selected tags will be displayed under Navigation Menu's Tags section by default."
     enable_experimental_hashtag_autocomplete: "EXPERIMENTAL: Use the new #hashtag autocompletion system for categories and tags that renders the selected item differently and has improved search"
+    experimental_new_new_view_groups: 'EXPERIMENTAL: Enable a new topics list that combines unread and new topics and make the "Everything" link in the sidebar link to it.'
+    enable_custom_sidebar_sections: "EXPERIMENTAL: Enable custom sidebar sections"
+    experimental_topics_filter: "EXPERIMENTAL: Enables the experimental topics filter route at /filter"
+    experimental_search_menu_groups: "EXPERIMENTAL: Enables the new search menu that has been upgraded to use glimmer"
+    enable_experimental_lightbox: "EXPERIMENTAL: Replace the default image lightbox with the revamped design."
+
+    page_loading_indicator: "Configure the loading indicator which appears during page navigations within Discourse. 'Spinner' is a full page indicator. 'Slider' shows a narrow bar at the top of the screen."
 
     errors:
       invalid_css_color: "Invalid color. Enter a color name or hex value."
@@ -2420,7 +2471,7 @@ en:
       pop3_polling_password_is_empty: "You must set a 'pop3 polling password' before enabling POP3 polling."
       pop3_polling_authentication_failed: "POP3 authentication failed. Please verify your pop3 credentials."
       reply_by_email_address_is_empty: "You must set a 'reply by email address' before enabling reply by email."
-      email_polling_disabled: "You must enable either manual or POP3 polling before enabling reply by email."
+      email_polling_disabled: "You must enable either manual, POP3 polling or have a custom mail poller enabled before enabling reply by email."
       user_locale_not_enabled: "You must first enable 'allow user locale' before enabling this setting."
       personal_message_enabled_groups_invalid: "You must specify at least one group for this setting. If you do not want anyone except staff to send PMs, choose the staff group."
       invalid_regex: "Regex is invalid or not allowed."
@@ -2429,7 +2480,6 @@ en:
       staged_users_disabled: "You must first enable 'staged users' before enabling this setting."
       reply_by_email_disabled: "You must first enable 'reply by email' before enabling this setting."
       discourse_connect_url_is_empty: "You must set a 'discourse connect url' before enabling this setting."
-      discourse_connect_invite_only: "You cannot enable DiscourseConnect and invite only at the same time."
       enable_local_logins_disabled: "You must first enable 'enable local logins' before enabling this setting."
       min_username_length_exists: "You cannot set the minimum username length above the shortest username (%{username})."
       min_username_length_range: "You cannot set the minimum above the maximum."
@@ -2451,7 +2501,8 @@ en:
       search_tokenize_japanese_enabled: "You must disable 'search_tokenize_japanese' before enabling this setting."
       discourse_connect_cannot_be_enabled_if_second_factor_enforced: "You cannot enable DiscourseConnect if 2FA is enforced."
       delete_rejected_email_after_days: "This setting cannot be set lower than the delete_email_logs_after_days setting or greater than %{max}"
-      invalid_uncategorized_category_setting: "The Uncategorized category cannot be selected if allow uncategorized topics is not allowed"
+      invalid_uncategorized_category_setting: 'The "Uncategorized" category cannot be selected if ''allow uncategorized topics'' is not enabled.'
+      invalid_search_ranking_weights: "Value is invalid for search_ranking_weights site setting. Example: '{0.1,0.2,0.3,1.0}'. Note that maximum value for each weight is 1.0."
 
     placeholder:
       discourse_connect_provider_secrets:
@@ -2661,7 +2712,6 @@ en:
     activated_by_staff: "Activated by staff"
     new_user_typed_too_fast: "New user typed too fast"
     content_matches_auto_silence_regex: "Content matches auto silence regex"
-    content_matches_auto_block_regex: "Content matches auto block regex"
     username:
       short: "must be at least %{min} characters"
       long: "must be no more than %{max} characters"
@@ -3473,7 +3523,7 @@ en:
 
         The new user [%{username}](%{user_url}) was automatically silenced because multiple users flagged %{username}'s post(s).
 
-        Please [review the flags](%{base_url}/admin/flags). If %{username} was incorrectly silenced from posting, click the unsilence button on [the admin page for this user](%{user_url}).
+        Please [review the flags](%{base_url}/review). If %{username} was incorrectly silenced from posting, click the unsilence button on [the admin page for this user](%{user_url}).
 
         This threshold can be changed via the `silence_new_user` site settings.
 
@@ -3514,16 +3564,6 @@ en:
       subject_template: "Downloading remote images disabled"
       text_body_template: "The `download_remote_images_to_local` setting was disabled because the disk space limit at `download_remote_images_threshold` was reached."
 
-    dashboard_problems:
-      title: "Dashboard Problems"
-      subject_template: "New advice on your site dashboard"
-      text_body_template: |
-        We have some new advice and recommendations for you based on your current site settings.
-
-        [Visit your site dashboard](%{base_url}/admin) to see it.
-
-        If nothing is visible on your dashboard, another staff member may have already acted on this advice. A list of staff actions can be found in your [Staff Action Logs](%{base_url}/admin/logs/staff_action_logs).
-
     new_user_of_the_month:
       title: "You're a New User of the Month!"
       subject_template: "You're a New User of the Month!"
@@ -3566,9 +3606,6 @@ en:
       one: "Heads up: We send a maximum of %{count} daily email. Check the site to see the ones that might be held back."
       other: "Heads up: We send a maximum of %{count} daily emails. Check the site to see the ones that might be held back. PS thanks for being popular!"
     in_reply_to: "In Reply To"
-    unsubscribe:
-      title: "Unsubscribe"
-      description: "Not interested in getting these emails? No problem! Click below to unsubscribe instantly:"
 
     header_instructions: ""
     reply_by_email: "[Visit Topic](%{base_url}%{url}) or reply to this email to respond."
@@ -3897,7 +3934,6 @@ en:
       liked_received: "Likes Received"
       new_users: "New Users"
       popular_topics: "Popular Topics"
-      follow_topic: "Follow this topic"
       join_the_discussion: "Read More"
       popular_posts: "Popular Posts"
       more_new: "New for you"
@@ -4144,16 +4180,7 @@ en:
     offline_page_message: "It looks like you are offline! Please check your network connection and try again."
 
   login_required:
-    welcome_message: |
-      ## [Welcome to %{title}](#welcome)
-      An account is required. Please create an account or log in to continue.
-    welcome_message_invite_only: |
-      ## [Welcome to %{title}](#welcome)
-      An account is required. Please ask an existing member for an invite or log in to continue.
-
-  deleted: "deleted"
-
-  image: "image"
+    welcome_message: "# [Welcome to %{title}](#welcome)"
 
   upload:
     edit_reason: "downloaded local copies of images"
@@ -4365,7 +4392,11 @@ en:
   tos_topic:
     title: "Terms of Service"
     body: |
-      These terms govern use of the Internet forum at <%{base_url}>. To use the forum, you must agree to these terms with %{company_name}, the company that runs the forum.
+      <h2 id="heading--change-me"><a href="#heading--change-me">Change Me</a></h2>
+
+      Forum Admin, please find below an example starting template for a privacy policy that you should customise to meet your site's needs.
+
+      These terms do not, but might one day, govern use of the Internet forum at <%{base_url}>. In that event, to use the forum, you must agree to these terms with %{company_name}, the company that runs the forum.
 
       The company may offer other products and services, under different terms. These terms apply only to use of the forum.
 
@@ -4533,13 +4564,15 @@ en:
 
       <h2 id="heading--changes"><a href="#heading--changes">Changes</a></h2>
 
-      The company last updated these terms on July 12, 2018, and may update these terms again. The company will post all updates to the forum. For updates that contain substantial changes, the company agrees to e-mail you, if you've created an account and provided a valid e-mail address. The company may also announce updates with special messages or alerts on the forum.
+      The company last updated these terms on [INSERT LAST UPDATE DATE HERE], and may update these terms again. The company will post all updates to the forum. For updates that contain substantial changes, the company agrees to e-mail you, if you've created an account and provided a valid e-mail address. The company may also announce updates with special messages or alerts on the forum.
 
       Once you get notice of an update to these terms, you must agree to the new terms in order to keep using the forum.
 
   privacy_topic:
     title: "Privacy Policy"
     body: |
+      ## [Forum Admin, please find below an example starting template for a privacy policy that you should customise to your site.]
+
       <a name="collect"></a>
 
       ## [What information do we collect?](#collect)
@@ -4573,8 +4606,7 @@ en:
 
       We will make a good faith effort to:
 
-      * Retain server logs containing the IP address of all requests to this server no more than 90 days.
-      * Retain the IP addresses associated with registered users and their posts no more than 5 years.
+      * Retain server logs containing the IP address of all requests to this server no more than [NUMBER OF DAYS] days.
 
       <a name="cookies"></a>
 
@@ -4620,7 +4652,7 @@ en:
 
       If we decide to change our privacy policy, we will post those changes on this page.
 
-      This document is CC-BY-SA. It was last updated May 31, 2013.
+      This document is CC-BY-SA. It was last updated [INSERT LAST UPDATE DATE HERE].
 
   badges:
     mass_award:
@@ -4911,6 +4943,7 @@ en:
     required_tags_from_group:
       one: "You must include at least %{count} %{tag_group_name} tag. The tags in this group are: %{tags}."
       other: "You must include at least %{count} %{tag_group_name} tags. The tags in this group are: %{tags}."
+    limited_to_one_tag_from_group: "The tags %{tags} cannot be used simultaneously. Please include only one of them."
     invalid_target_tag: "cannot be a synonym of a synonym"
     synonyms_exist: "is not allowed while synonyms exist"
   rss_by_tag: "Topics tagged %{tag}"
@@ -4931,10 +4964,10 @@ en:
 
   safe_mode:
     title: "Enter safe mode"
-    description: "Safe mode allows you to test your site without loading plugins or themes."
+    description: "Safe mode allows you to test your site without loading themes or client-side plugin customizations. Server-side plugin customizations remain enabled."
     no_themes: "Disable themes and theme components"
-    no_unofficial_plugins: "Disable unofficial plugins"
-    no_plugins: "Disable all plugins"
+    no_unofficial_plugins: "Disable unofficial client-side plugin customizations"
+    no_plugins: "Disable all client-side plugin customizations"
     enter: "Enter Safe Mode"
     must_select: "You must select at least one option to enter safe mode."
   wizard:
@@ -5061,7 +5094,9 @@ en:
   search_logs:
     graph_title: "Search Count"
 
-  joined: "Joined"
+  onebox:
+    discourse:
+      user_joined_community: "Joined %{date}"
 
   discourse_push_notifications:
     popup:
@@ -5128,50 +5163,53 @@ en:
 
     actions:
       agree:
-        title: "Agree..."
+        title: "Yes"
       agree_and_keep:
-        title: "Keep Post"
-        description: "Agree with flag and keep the post unchanged."
+        title: "Keep post"
+        description: "Agree with flag but keep this post unchanged."
       agree_and_keep_hidden:
-        title: "Keep Post Hidden"
-        description: "Agree with flag and leave the post hidden."
+        title: "Keep post hidden"
+        description: "Agree with flag and keep the post hidden."
       agree_and_suspend:
-        title: "Suspend User"
+        title: "Suspend user"
         description: "Agree with flag and suspend the user."
       agree_and_silence:
-        title: "Silence User"
+        title: "Silence user"
         description: "Agree with flag and silence the user."
       agree_and_restore:
-        title: "Restore Post"
+        title: "Restore post"
         description: "Restore the post so that all users can see it."
       agree_and_hide:
-        title: "Hide Post"
-        description: "Hide this post and automatically send the user a message urging them to edit it."
+        title: "Hide post"
+        description: "Agree with flag and hide this post + automatically send the user a message urging them to edit it."
       delete_single:
         title: "Delete"
       delete:
         title: "Delete..."
       delete_and_ignore:
-        title: "Delete Post and Ignore"
-        description: "Delete post; if the first post, delete the topic as well"
+        title: "Ignore flag and delete post"
+        description: "Ignore the flag by removing it from the queue and delete the post; if the first post, delete the topic as well. "
       delete_and_ignore_replies:
-        title: "Delete Post + Replies and Ignore"
-        description: "Delete post and all of its replies; if the first post, delete the topic as well"
+        title: "Ignore flag, delete post and replies"
+        description: "Ignore the flag by removing it from the queue, delete the post and all of its replies; if the first post, delete the topic as well"
         confirm: "Are you sure you want to delete the replies to the post as well?"
       delete_and_agree:
-        title: "Delete Post and Agree"
-        description: "Delete post; if the first post, delete the topic as well"
+        title: "Delete post"
+        description: "Agree with flag and delete this post; if the first post, delete the topic as well."
       delete_and_agree_replies:
-        title: "Delete Post + Replies and Agree"
-        description: "Delete post and all of its replies; if the first post, delete the topic as well"
+        title: "Delete post and replies"
+        description: "Agree with flag and delete this post and all of its replies; if the first post, delete the topic as well."
         confirm: "Are you sure you want to delete the replies to the post as well?"
       disagree_and_restore:
-        title: "Disagree and Restore Post"
+        title: "No, restore post"
         description: "Restore the post so that all users can see it."
       disagree:
-        title: "Disagree"
+        title: "No"
       ignore:
         title: "Ignore"
+      ignore_and_do_nothing:
+        title: "Do nothing"
+        description: "Ignore the flag by removing it from the queue without taking any action. Hidden posts will stay hidden and be handled by the auto-tools."
       approve:
         title: "Approve"
       approve_post:
@@ -5244,3 +5282,9 @@ en:
     payload_url:
       blocked_or_internal: "Payload URL cannot be used because it resolves to a blocked or internal IP"
       unsafe: "Payload URL cannot be used because it's unsafe"
+
+  form_templates:
+    errors:
+      invalid_yaml: "is not a valid YAML string"
+      invalid_type: "contains an invalid template type: %{type} (valid types are: %{valid_types})"
+      missing_type: "is missing a field type"
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index 42d333ae593..8e858b6c13b 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -52,6 +52,11 @@ es:
   remove_posts_deleted_by_author: "Eliminado por el autor"
   redirect_warning: "No pudimos verificar que el enlace que seleccionaste realmente se haya publicado en el foro. Si deseas continuar de todos modos, selecciona el siguiente enlace."
   on_another_topic: "En otro tema"
+  topic_category_changed: "De %{from} a %{to}"
+  topic_tag_changed:
+    added_and_removed: "Añadido %{added} y eliminado %{removed}"
+    added: "Añadido %{added}"
+    removed: "Eliminado %{removed}"
   inline_oneboxer:
     topic_page_title_post_number: "nº %{post_number}"
     topic_page_title_post_number_by_user: "nº %{post_number} por %{username}"
@@ -191,8 +196,8 @@ es:
       invalid_site_setting: "No existe ningún ajuste llamado «%{name}»."
       invalid_category_id: "Especificaste una categoría que no existe"
       invalid_choice:
-        one: "Has especificado la opción no válida %{name}"
-        other: "Has especificado las opciones no válidas %{name}"
+        one: "«%{name}» es una opción no válida."
+        other: "«%{name}» son opciones no válidas."
       default_categories_already_selected: "No se puede seleccionar una categoría ya utilizada en otra lista."
       default_tags_already_selected: "No puedes seleccionar una etiqueta utilizada en otra lista."
       s3_upload_bucket_is_required: "No se pueden activar las subidas a S3 a menos que se haya proporcionado un valor a «s3_upload_bucket»."
@@ -200,7 +205,8 @@ es:
       page_publishing_requirements: "No se puede activar la publicación de páginas si secure media está activado."
       s3_backup_requires_s3_settings: "No puedes usar S3 como método de respaldo salvo que hayas rellenado «%{setting_name}»."
       s3_bucket_reused: "No puedes usar el mismo bucket para «s3_upload_bucket» y «s3_backup_bucket». Selecciona otro bucket o usa una ruta diferente para cada bucket."
-      secure_uploads_requirements: "Las subidas en S3 deben estar activadas antes de activar las subidas seguras."
+      secure_uploads_requirements: "Las subidas en S3 y las ACL de S3 deben estar activadas antes de activar las subidas seguras."
+      s3_use_acls_requirements: "Debes tener activadas las ACL de S3 cuando estén activadas las subidas seguras."
       share_quote_facebook_requirements: "Debes establecer la app id de Facebook para activar compartir citas en Facebook."
       second_factor_cannot_enforce_with_socials: "No puedes obligar el uso de 2FA con inicios de sesión usando redes sociales. Desactiva primero los inicios de sesión con %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "No puedes obligar a usar la autenticación de dos factores si los inicios de sesión locales están desactivados."
@@ -221,6 +227,10 @@ es:
         other: "Lo sentimos, no hemos podido generar una vista previa para esta página web porque no se han podido encontrar las siguientes etiquetas Embed / OpenGraph: %{missing_attributes}"
   word_connector:
     comma: ", "
+  custom_fields:
+    validations:
+      max_items: "Se ha alcanzado el número máximo de campos personalizados para esta entidad (%{max_items_number})"
+      max_value_length: "Se ha alcanzado la longitud máxima de un valor de campo personalizado (%{max_value_length})"
   invite:
     expired: "Tu token de invitación ha caducado.  <a href='%{base_url}/about'>Ponte en contacto con el personal</a>."
     not_found: "El código de invitación no es válido. Por favor, <a href='%{base_url}/about'>ponte en contacto con nuestro personal</a>."
@@ -239,6 +249,7 @@ es:
     user_exists: "No hace falta que invites a <b>%{email}</b>, ¡ya tienen una cuenta!"
     invite_exists: "Ya has invitado a <b>%{email}</b>."
     invalid_email: "%{email} no es un correo electrónico válido."
+    generic_error_response: "Hubo un problema con tu solicitud."
     rate_limit:
       one: "Ya has enviado %{count} invitación en el último día, espera %{time_left} antes de volverlo a intentar."
       other: "Ya has enviado %{count} invitaciones en el último día, espera %{time_left} antes de volverlo a intentar."
@@ -400,6 +411,7 @@ es:
   too_late_to_edit: "Esa publicación se publicó hace demasiado tiempo. No se puede editar ni eliminar."
   edit_conflict: "La publicación ha sido editada por otro usuario y tus cambios no se pueden guardar."
   revert_version_same: "La versión actual es la misma que la versión a la que intentas volver."
+  reverted_to_version: "revertido a la versión #%{version}"
   cannot_edit_on_slow_mode: "Este tema está en modo lento. Mientras dure, no se pueden editar mensajes antiguos, para animar a que la conversación sea considerada y apropiada."
   excerpt_image: "imagen"
   bookmarks:
@@ -502,6 +514,7 @@ es:
       Es más fácil leer temas que tengan menos respuestas (aunque más profundas), que tener que leer muchas respuestas individuales.
     dominating_topic: '¡Has publicado mucho en este tema! Considera la posibilidad de dar a los demás la oportunidad de responder aquí y debatir también entre ellos.'
     get_a_room: Has respondido a @%{reply_username} %{count} veces, ¿sabías que también puedes enviarle un mensaje personal directamente?
+    dont_feed_the_trolls: Este mensaje ya ha sido marcado para llamar la atención del moderador. ¿Seguro que deseas responder a él? Las respuestas a contenido negativo tienden a fomentar un comportamiento más negativo.
     too_many_replies: |
       ### Has llegado al límite de respuestas en este tema
 
@@ -591,7 +604,9 @@ es:
         translation_overrides:
           attributes:
             value:
-              invalid_interpolation_keys: 'La(s) siguiente(s) clave(s) de interpolación no es(son) válida(s): «%{keys}»'
+              invalid_interpolation_keys:
+                one: "La siguiente clave de interpolación no es válida: %{keys}"
+                other: "Las siguientes claves de interpolación no son válidas: %{keys}"
         watched_word:
           attributes:
             word:
@@ -612,22 +627,22 @@ es:
   staff_category_name: "Personal"
   staff_category_description: "Categoría privada para debates entre moderadores y administradores. Los temas solo serán visibles para miembros del equipo."
   discourse_welcome_topic:
-    title: "¡Te damos la bienvenida a nuestra comunidad!"
-    body: |2
+    title: "¡Te damos la bienvenida a %{site_title}! :wave:"
+    body: |
+      Nos alegra mucho que te hayas unido a nosotros.
 
-      El primer párrafo de este tema anclado será visible para todos los usuarios como mensaje de bienvenida en tu página principal. ¡Es importante!
+      %{site_info_quote}
 
-      **Edita esto** y describe brevemente a tu comunidad:
+      Aquí tienes algunas cosas que puedes hacer para empezar:
 
-      - ¿Para quién es?
-      - ¿Qué se puede encontrar aquí?
-      - ¿Por qué deben venir aquí?
-      - ¿Dónde pueden leer más sobre la comunidad (enlaces, recursos, etc.)?
+      :speaking_head: **Preséntate** añadiendo tu foto e información sobre ti y tus intereses a [tu perfil](%{base_path}/my/preferences/account). ¿Qué te gustaría que te preguntaran?
 
-      <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+      :open_book: **Conoce a la comunidad** [navegando por los debates](%{base_path}/top) que ya se están produciendo aquí. Cuando encuentres una publicación interesante, informativa o entretenida, utiliza :heart: para mostrar tu agradecimiento o apoyo.
 
-      Quizás quieras cerrar este tema a través del administrador :wrench: (en la parte superior derecha o en la parte de abajo), para que las respuestas nuevas no se acumulen en un anuncio.
-  admin_quick_start_title: "LEER PRIMERO: Guía rápida de inicio para administradores"
+      :handshake: **Contribuye** comentando, compartiendo tu propia perspectiva, haciendo preguntas u ofreciendo tu opinión en el debate. Antes de responder o iniciar nuevos temas, revisa las [Directrices de la Comunidad](%{base_path}/faq).
+
+      > Si necesitas ayuda o tienes alguna sugerencia, no dudes en preguntar en [#feedback](%{base_path}/c/site-feedback) o [contacta con los administradores](%{base_path}/about).
+  admin_quick_start_title: "Guía del administrador: Primeros pasos"
   category:
     topic_prefix: "Acerca de la categoría %{category}"
     replace_paragraph: "(Sustituye este párrafo con una descripción corta de tu nueva categoría. Este texto aparecerá en el área de selección de categoría, así que intenta que no supere los 200 caracteres.)"
@@ -646,6 +661,7 @@ es:
       disallowed_tags_generic: "Este tema tiene etiquetas no permitidas."
       slug_contains_non_ascii_chars: "contiene caracteres no ascii"
       is_already_in_use: "ya está en uso"
+      move_topic_to_category_disallowed: "No puedes mover este tema a una categoría en la que no tengas permiso para crear nuevos temas."
     cannot_delete:
       uncategorized: "Esta categoría es especial Se usa para agrupar los temas que no tienen ninguna categoría asignada. No se puede eliminar."
       has_subcategories: "No se puede eliminar esta categoría porque tiene subcategorías."
@@ -1109,7 +1125,7 @@ es:
       title: "UAD/UAM"
       xaxis: "Día"
       yaxis: "UAD/UAM"
-      description: "Número de miembros que han iniciado sesión durante el último día dividido entre el número de miembros que han iniciado sesión durante el último mes – resulta en un % que indica el grado de «permanencia» de la comunidad. Apuntar a >30%."
+      description: "Número de miembros que han iniciado sesión durante el último día dividido entre el número de miembros que han iniciado sesión durante el último mes – resulta en un % que indica el grado de «permanencia» de la comunidad. Apuntar a >20 %."
     daily_engaged_users:
       title: "Usuarios involucrados a diario"
       xaxis: "Día"
@@ -1378,6 +1394,7 @@ es:
     image_magick_warning: 'El servidor está configurado para permitir miniaturas de imágenes grandes, pero ImageMagick no está instalado. Instala ImageMagick usando tu administrador de paquetes favorito o <a href="https://www.imagemagick.org/script/download.php" target="_blank">descarga la última versión</a>.'
     failing_emails_warning: 'Hay %{num_failed_jobs} tareas de correo electrónico que fallaron. Revisa tu app.yml y asegúrate de que la configuración del servidor de correo es correcta. <a href="%{base_path}/sidekiq/retries" target="_blank">Consulta las tareas que fallaron en Sidekiq</a>.'
     subfolder_ends_in_slash: "La configuación del subdirectorio no es correcta; el campo DISCOURSE_RELATIVE_URL_ROOT termina con una barra."
+    outdated_translations_warning: "Algunas de tus anulaciones de traducción no están actualizadas. Comprueba tus <a href='%{base_path}/admin/customize/site_texts?outdated=true'>personalizaciones de texto</a>."
     email_polling_errored_recently:
       one: "El email polling ha generado un error en las pasadas 24 horas. Mira en <a href='%{base_path}/logs' target='_blank'>los logs</a> para más detalles."
       other: "El polling por correo electrónico ha generado %{count} errores en las últimas 24 horas. Revisa <a href='%{base_path}/logs' target='_blank'>los registros</a> para más detalles."
@@ -1389,6 +1406,8 @@ es:
     out_of_date_themes: "Hay actualizaciones disponibles para los siguientes temas:"
     unreachable_themes: "No pudimos verificar actualizaciones de los siguientes temas:"
     watched_word_regexp_error: "Expresión regular no válida para las palabras vigiladas con acción de «%{action}». Por favor, revisa los <a href='%{base_path}/admin/customize/watched_words'>ajustes sobre palabras vigiladas</a> o desactiva el ajuste «watched words regular expressions»."
+    v3_analytics_deprecated: "Tu Discourse utiliza actualmente Google Analytics 3, que dejará de ser compatible después de julio de 2023. <a href='https://meta.discourse.org/t/260498'>Actualízate a Google Analytics 4</a> ahora para seguir recibiendo información y análisis valiosos sobre el rendimiento de tu sitio web."
+    legacy_navigation_menu_deprecated: "Tu Discourse utiliza actualmente el menú de navegación «heredado» que <a href='https://meta.discourse.org/t/removing-the-legacy-hamburger-navigation-menu-option/265274'>se eliminará en la primera versión beta de Discourse 3.2</a>. Migra al nuevo menú de navegación actualizando tu <a href='%{base_path}/admin/site_settings/category/all_results?filter=navigation_menu'>configuración del menú de navegación del sitio</a> a «barra lateral» o «encabezado desplegable»."
   site_settings:
     allow_bulk_invite: "Permitir invitaciones en masa subiendo un archivo CSV"
     disabled: "desactivado"
@@ -1454,8 +1473,11 @@ es:
     fixed_category_positions_on_create: "Si está marcada, el orden de las categorías se mantendrá en el diálogo de creación de temas (requiere fixed_category_positions)."
     add_rel_nofollow_to_user_content: 'Añadir la etiqueta rel nofollow a todo el contenido introducido por los usuarios, excepto por los enlaces internos (incluidos dominios principales). Si cambias esto, deberás hacer un rebake de todos las publicaciones con: «rake posts:rebake»'
     exclude_rel_nofollow_domains: "Una lista de dominios a cuyos enlaces no se les añadirá la etiqueta nofollow. ejemplo.com permitirá automáticamente sub.ejemplo.com también. Como mínimo, deberías añadir el dominio de este sitio para ayudar a los rastreadores web a encontrar todo el contenido. Si otras partes de este sitio web están en otros dominios, añádelos también."
+    max_form_template_title_length: "Longitud máxima permitida para los títulos de las plantillas de formulario."
+    max_form_template_content_length: "Longitud máxima permitida para el contenido de la plantilla del formulario."
     post_excerpt_maxlength: "Extensión máxima del resumen / extracto de una publicación."
     topic_excerpt_maxlength: "Longitud máxima de un extracto o resumen de tema, generado a partir de la primera publicación de un tema."
+    default_subcategory_on_read_only_category: "Activa el botón «Nuevo tema» y selecciona una subcategoría por defecto para publicar en categorías en las que el usuario no puede crear un nuevo tema."
     show_pinned_excerpt_mobile: "Mostrar extracto de temas anclados en la vista móvil."
     show_pinned_excerpt_desktop: "Mostrar extracto de temas anclados en la vista de escritorio."
     post_onebox_maxlength: "Extensión máxima en caracteres de una publicación de Discourse en formato onebox."
@@ -1477,7 +1499,7 @@ es:
     manifest_icon: "Imagen utilizada como logo/imagen de bienvenida en Android. Se cambiará automáticamente el tamaño a 512 × 512. Si se deja en blanco, se utilizará large_icon."
     manifest_screenshots: "Capturas de pantalla para mostrar las funcionalidades del sitio web en la pantalla de instalación. Todas las imágenes deben ser alojadas localmente y tener las mismas dimensiones."
     favicon: "Un favicon para su sitio, ve <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://es.wikipedia.org/wiki/Favicon</a>. Para que funcione correctamente sobre un CDN debe ser un png. Se cambiará automáticamente el tamaño a 32x32. Si se deja en blanco, se utilizará large_icon."
-    apple_touch_icon: "Icono utilizado para dispositivos táctiles de Apple. Se redimensionará automáticamente a 180x180. Si se deja en blanco, se utilizará el icono grande."
+    apple_touch_icon: "Icono utilizado para los dispositivos táctiles de Apple. No se recomienda un fondo transparente. Se redimensionará automáticamente a 180x180. Si se deja en blanco, se utilizará el icono grande."
     opengraph_image: "Imagen de gráfico abierto predeterminada, utilizada cuando la página no tiene otra imagen adecuada. Si se deja en blanco, se utilizará large_icon"
     twitter_summary_large_image: "\"Imagen grande de resumen\" de la tarjeta de Twitter (debe tener al menos 280 de ancho y al menos 150 de alto, no puede ser .svg). Si se deja en blanco, los metadatos de la tarjeta normal se generan utilizando opengraph_image, siempre que no sea también un .svg, mientras no sea un .svg"
     notification_email: "La dirección de correo electrónico remitente utilizada al enviar todos los correos electrónicos esenciales de sistema. El dominio especificado debe tener correctamente configurados los registros SPF, DKIM y PTR inversos para que los correos electrónicos se reciban correctamente."
@@ -1493,6 +1515,8 @@ es:
     summary_percent_filter: "Cuando un usuario hace clic en «resumen de este tema», mostrar el % de las publicaciones destacadas"
     summary_max_results: "Cantidad máxima de publicaciones devueltas en «resumen de este tema»"
     summary_timeline_button: "Mostrar un botón para «Resumir» en la línea de tiempo"
+    summarization_strategy: "Formas adicionales de resumir el contenido registrado por los plugins"
+    custom_summarization_allowed_groups: "Grupos que pueden resumir contenidos utilizando la `summarization_strategy`."
     enable_personal_messages: "DEPRECIADO, utiliza en su lugar el ajuste «grupos habilitados para mensajes personales». Permitir a los usuarios de nivel de confianza 1 (configurable a través de la confianza mínima para enviar mensajes) crear mensajes y responder a mensajes. Ten en cuenta que el personal siempre puede enviar mensajes, sea cual sea."
     personal_message_enabled_groups: "Permite a los usuarios de estos grupos crear mensajes y responder a los mismos. Los grupos de nivel de confianza incluyen todos los niveles de confianza por encima de ese número, por ejemplo, elegir el nivel de confianza_1 también permite a los usuarios del nivel de confianza_2, 3, 4 enviar MP. Ten en cuenta que el personal siempre puede enviar mensajes, sea cual sea."
     enable_system_message_replies: "Permite a los usuarios responder a los mensajes del sistema, incluso si los mensajes personales están desactivados."
@@ -1587,6 +1611,7 @@ es:
     enable_badges: "Activar el sistema de insignias"
     max_favorite_badges: "Número máximo de insignias que el usuario puede seleccionar"
     whispers_allowed_groups: "Permitir la comunicación privada dentro de los temas para los miembros de los grupos especificados."
+    hidden_post_visible_groups: "Permitir a los miembros de estos grupos ver los mensajes ocultos. Los usuarios del personal siempre pueden ver los mensajes ocultos."
     allow_index_in_robots_txt: "Especificar en robots.txt que se permite que este sitio sea indexado por los motores de búsqueda en Internet. En casos excepcionales, puedes <a href='%{base_path}/admin/customize/robots'>sobrescribir robots.txt</a> permanentemente."
     blocked_email_domains: "Una lista delimitada por barras de dominios de correo electrónico en los que los usuarios no pueden registrar cuentas. Los subdominios se gestionan automáticamente para los dominios especificados. No se admiten los símbolos comodín * y ? Ejemplo: mailinator.com|trashmail.net"
     allowed_email_domains: "Una lista delimitada por barras de dominios de correo electrónico en los que los usuarios DEBEN registrar cuentas. Los subdominios se gestionan automáticamente para los dominios especificados. No se admiten los símbolos comodín * y ? ADVERTENCIA: ¡No se permitirán usuarios con dominios de correo electrónico distintos de los indicados!"
@@ -1613,7 +1638,7 @@ es:
     enable_discourse_connect: "Activar inicio de sesión a través de DiscourseConnect (antiguamente «Discourse SSO») (CUIDADO: ¡LAS DIRECCIONES DE CORREO ELECTRÓNICO *DEBEN* SER VALIDADAS POR EL SITIO EXTERNO!)"
     verbose_discourse_connect_logging: "Guardar registros detallados de diagnóstico de DiscourseConnect en <a href='%{base_path}/logs' target='_blank'>/logs</a>"
     enable_discourse_connect_provider: "Implementar el proveedor de protocolo DiscourseConnect (antiguamente «Discourse SSO») en la ruta /session/sso_provider, discourse_connect_provider_secrets debe estar rellenado."
-    discourse_connect_url: "URL del endpoint de DiscourseConnect (debe incluir http:// o https://)"
+    discourse_connect_url: "URL del punto final de DiscourseConnect (debe incluir http:// o https://, y no debe incluir una barra al final)"
     discourse_connect_secret: "Secreto usado para autenticar criptográficamente la información de DiscourseConnect, asegúrate de que tiene 10 o más caracteres de longitud"
     discourse_connect_provider_secrets: "Una lista de pares de dominio-secreto que utiliza Discourse como proveedor de SSO. Asegúrate de que la clave secreta SSO tenga de 10 caracteres o más. El símbolo de comodín * se puede usar para hacer coincidir cualquier dominio o solo una parte de él (por ejemplo, *.ejemplo.com)."
     discourse_connect_overrides_bio: "Sobrescribir la biografía del usuario y evita que los usuarios la cambien"
@@ -1627,7 +1652,7 @@ es:
     discourse_connect_overrides_profile_background: "Sobrescribe el fondo del perfil del usuario con el valor de la carga útil de DiscourseConnect."
     discourse_connect_overrides_card_background: "Sobrescribe el fondo de la tarjeta de usuario con el valor de la carga útil de DiscourseConnect."
     discourse_connect_not_approved_url: "Redireccionar cuentas no aprobadas a esta URL al iniciar sesión con DiscourseConnect."
-    discourse_connect_allows_all_return_paths: "No restringir el dominio para return_paths (rutas de vuelta) de DiscourseConnect (por defecto, la ruta de vuelta debe estar en el sitio actual)"
+    discourse_connect_allowed_redirect_domains: "Restringe a estos dominios las rutas de retorno proporcionadas por DiscourseConnect (por defecto, la ruta de retorno debe estar en el sitio actual). Utiliza * para permitir cualquier dominio como ruta de retorno. Los comodines de subdominio («*.foobar.com») no están permitidos."
     enable_local_logins: "Activar inicio de sesión local con usuario y contraseña. CUIDADO: si lo desactivas, puede que no puedas iniciar sesión si no has configurado otro medio alternativo primero."
     enable_local_logins_via_email: "Permitir a los usuarios que soliciten un enlace de inicio de sesión en un clic que se les enviará por correo electrónico."
     allow_new_registrations: "Permitir el registro de usuarios nuevos. Desactiva esta opción para que nadie pueda crear una cuenta nueva."
@@ -1663,6 +1688,7 @@ es:
     s3_configure_tombstone_policy: "Activar la política de eliminación automática para cargas tombstone. IMPORTANTE: si está desactivado, no se reclamará ningún espacio después de eliminar las cargas."
     s3_disable_cleanup: "Evite la eliminación de copias de seguridad antiguas de S3 cuando hay más copias de seguridad que el máximo permitido."
     enable_s3_inventory: "Generar informes y verificar las cargas utilizando el inventario de Amazon S3. IMPORTANTE: requiere credenciales S3 válidas (tanto la clave de acceso como la clave de acceso secreta)."
+    s3_use_acls: "AWS recomienda no utilizar ACL en los buckets S3; si sigues este consejo, desmarca esta opción. Debes activarla si utilizas cargas seguras."
     backup_time_of_day: "Hora UTC del día cuando debería ejecutarse el respaldo."
     backup_with_uploads: "Incluir archivos subidos en las copias de seguridad programadas. Si esta opción está desactivada, tan solo se ejecutará una copia de seguridad de la base de datos."
     backup_location: "Ubicación donde se almacenan las copias de respaldo. IMPORTANTE: S3 requiere credenciales S3 válidas introducidas en la configuración de archivos."
@@ -1712,6 +1738,7 @@ es:
     s3_secret_access_key: "La clave secreta de acceso de Amazon S3 que se usará para subir imágenes, adjuntos y copias de seguridad."
     s3_region: "El nombre de región de Amazon S3 que se utilizará para subir imágenes y backups."
     s3_cdn_url: "URL de un CDN que se utilizará para todos los activos s3 (por ejemplo: https://cdn.somewhere.com). AVISO: después de cambiar esta opción debes hacer un rebake de todos las publicaciones antiguas."
+    s3_use_cdn_url_for_all_uploads: "Utiliza la URL CDN para todos los archivos subidos a s3 en lugar de solo para las imágenes."
     avatar_sizes: "Lista de tamaños de los avatares generados automáticamente."
     external_system_avatars_enabled: "Usar un servicio externo para los avatares."
     external_system_avatars_url: "Dirección URL del servicio externo para los avatares. Las sustituciones permitidas son {username} {first_letter} {color} {size}"
@@ -1731,7 +1758,7 @@ es:
     composer_media_optimization_image_bytes_optimization_threshold: "Tamaño mínimo del archivo de imagen para activar la optimización del lado del cliente"
     composer_media_optimization_image_resize_dimensions_threshold: "Ancho mínimo de la imagen para activar el redimensionamiento del lado del cliente"
     composer_media_optimization_image_resize_width_target: "Las imágenes con una anchura mayor que «composer_media_optimization_image_dimensions_resize_threshold» serán redimensionadas a esta anchura. Debe ser >= que «composer_media_optimization_image_dimensions_resize_threshold»."
-    composer_media_optimization_image_encode_quality: "Calidad de codificación JPEG utilizada en el proceso de recodificación."
+    composer_media_optimization_image_encode_quality: "Calidad de codificación JPG utilizada en el proceso de recodificación."
     min_ratio_to_crop: "Proporción utilizada para recortar imágenes altas. Introduce el resultado de anchura / altura."
     simultaneous_uploads: "Número máximo de archivos que se pueden arrastrar y soltar en el editor"
     default_invitee_trust_level: "Nivel de confianza por defecto (0-4) para usuarios invitados."
@@ -1760,7 +1787,9 @@ es:
     tl3_requires_likes_given: "El número mínimo de me gusta que un usuario debe dar en los últimos (período nc3) días para calificar al nivel de confianza 3."
     tl3_requires_likes_received: "El número mínimo de me gusta que un usuario debe recibir en los últimos (período nc3) días para calificar al nivel de confianza 3."
     tl3_links_no_follow: "No quitar rel=nofollow de los enlaces publicados por usuarios con nivel de confianza 3."
-    trusted_users_can_edit_others: "Permitir a los usuarios con alto nivel de confianza editar el contenido de otros usuarios"
+    tl4_delete_posts_and_topics: "Permitir a los usuarios de TL4 eliminar mensajes y temas creados por otros usuarios. Los usuarios de TL4 también podrán ver los temas y mensajes eliminados."
+    edit_all_topic_groups: "Permitir a los usuarios de este grupo editar los títulos, etiquetas y categorías de los temas de otros usuarios"
+    edit_all_post_groups: "Permitir a los usuarios de este grupo editar las publicaciones de otros usuarios"
     min_trust_to_create_topic: "El nivel mínimo de confianza requerido para crear un nuevo tema."
     allow_flagging_staff: "Si está activado, los usuarios pueden denunciar publicaciones hechas desde cuentas del personal."
     min_trust_to_edit_wiki_post: "El nivel mínimo de confianza requerido para editar una publicación marcada como wiki."
@@ -1796,7 +1825,7 @@ es:
     title_min_entropy: "La mínima entropía permitida (caracteres únicos) requerida para el título de un tema."
     body_min_entropy: "La mínima entropía permitida (caracteres únicos) requerida para el cuerpo de un publicación."
     allow_uppercase_posts: "Permitir todas mayúsculas en el título de un tema o en el cuerpo de la publicación."
-    max_consecutive_replies: "Número de publicaciones seguidas que un usuario debe hacer en un tema antes de que se le prohíba añadir otra respuesta."
+    max_consecutive_replies: "Número de mensajes seguidos que un usuario puede hacer en un tema antes de que se le impida añadir otra respuesta. Este límite no se aplica al propietario del tema, al personal del sitio ni a los moderadores de categoría."
     enable_filtered_replies_view: 'Hacer que el botón «(n) respuestas» colapse todas las demás publicaciones y solo muestre la publicación actual y sus respuestas.'
     title_fancy_entities: "Convertir caracteres ASCII comunes en entidades HTML de adorno en el título de los temas, como SmartyPants <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</a>"
     min_title_similar_length: "La extensión mínima que un título debe tener antes de que se revise la existencia de temas similares."
@@ -1876,6 +1905,11 @@ es:
     block_auto_generated_emails: "Bloquear correos electrónicos entrantes identificados como generados automaticamente."
     ignore_by_title: "Ignorar correos electrónicos entrantes por su título."
     mailgun_api_key: "Clave secreta de la API de Mailgun utilizada para verificar mensajes vía webhook."
+    sendgrid_verification_key: "Clave de verificación de Sendgrid utilizada para verificar los mensajes webhook."
+    mailjet_webhook_token: "Token utilizado para verificar la carga útil del webhook. Debe pasarse como parámetro de consulta «t» del webhook, por ejemplo: https://ejemplo.com/webhook/mailjet?t=supersecret"
+    mandrill_authentication_key: "Clave de autenticación Mandrill utilizada para verificar los mensajes webhook."
+    postmark_webhook_token: "Token utilizado para verificar la carga útil del webhook. Debe pasarse como parámetro de consulta «t» del webhook, por ejemplo: https://ejemplo.com/webhook/postmark?t=supersecret"
+    sparkpost_webhook_token: "Token utilizado para verificar la carga útil del webhook. Debe pasarse como parámetro de consulta «t» del webhook, por ejemplo: https://ejemplo.com/webhook/sparkpost?t=supersecret"
     soft_bounce_score: "Puntuación de rebote añadida al usuario cuando se produce un rebote temporal."
     hard_bounce_score: "Puntuación de rebote añadida al usuario cuando se produce un rebote permanente."
     bounce_score_threshold: "Máxima puntuación de rebote a partir de la cual se detiene el envío de correos al usuario."
@@ -1903,7 +1937,7 @@ es:
     pop3_polling_password: "La contraseña de la cuenta POP3 para hacer polling de correos electrónicos."
     pop3_polling_delete_from_server: "Eliminar correos electrónicos del servidor. NOTA: si desactivas esto, debes limpiar manualmente su bandeja de entrada de correo"
     log_mail_processing_failures: "Registra todos los fallos de procesamiento de correo electrónico en <a href='%{base_path}/logs' target='_blank'>/registros</a>"
-    email_in: 'Permitir a los usuarios crear nuevos temas por correo electrónico (requiere el polling manual o pop3). Configura las direcciones en la pestaña «ajustes» de cada categoría.'
+    email_in: "Permitir a los usuarios enviar nuevos temas por correo electrónico. Tras activar esta opción, podrás configurar las direcciones de correo electrónico entrantes para grupos y categorías."
     email_in_min_trust: "El nivel de confianza mínimo requerido para poder publicar temas nuevos por correo electrónico."
     email_in_authserv_id: "El identificador del servicio realizando revisiones de autenticación en correos electrónicos entrantes. Consulta: <a href='https://meta.discourse.org/t/134358'>https://meta.discourse.org/t/134358</a> para obtener instrucciones sobre cómo configurar esto."
     email_in_spam_header: "El encabezado del correo electrónico para detectar spam."
@@ -1949,6 +1983,7 @@ es:
     enable_category_group_moderation: "Permitir que los grupos moderen contenido en categorías específicas"
     group_in_subject: "Configura %%{optional_pm} en el título del correo electrónico para nombrar el primer grupo en MP, consulta: <a href='https://meta.discourse.org/t/customize-specific-email-templates/88323' target='_blank'>Personalizar el formato del asunto para correos electrónicos estándar</a>"
     allow_anonymous_posting: "Permitir a los usuarios cambiar a modo anónimo"
+    allow_anonymous_likes: "Permitir a los usuarios anónimos que les gusten las publicaciones"
     anonymous_posting_min_trust_level: "Nivel de confianza mínimo requerido para permitir la publicación anónima"
     anonymous_account_duration_minutes: "Para proteger el anonimato, crear una nueva cuenta anónima cada N minutos para cada usuario. Ejemplo: si se establece en 600, tan pronto como pasen 600 minutos desde la última publicación Y el usuario cambie a anónimo, se creará una nueva cuenta anónima."
     hide_user_profiles_from_public: "Desactiva las tarjetas de usuario, los perfiles y el directorio de usuarios para usuarios anónimos."
@@ -1967,6 +2002,7 @@ es:
     allow_profile_backgrounds: "Permitir a los usuarios subir fondos de perfil."
     sequential_replies_threshold: "Número de mensajes seguidos que un usuario tiene que publicar antes de que se le recuerde que son demasiadas respuestas consecutivas."
     get_a_room_threshold: "Número de publicaciones que un usuario deber hacer a la misma persona en un mismo tema para recibir una advertencia."
+    dont_feed_the_trolls_threshold: "Número de denuncias de otros usuarios antes de ser advertido."
     enable_mobile_theme: "Los dispositivos móviles utilizan un tema adaptado, con la habilidad de cambiar al estilo de sitio completo. Desactiva esta opción si quieres utilizar una plantilla personalizada que sea completamente adaptable."
     dominating_topic_minimum_percent: "Porcentaje de publicaciones que un usuario debe hacer en un mismo tema antes de que se le muestre un recordatorio acerca de dominar en demasía un tema."
     disable_avatar_education_message: "Desactivar mensaje educacional para que los usuarios cambien su foto de perfil."
@@ -1976,22 +2012,22 @@ es:
     permalink_normalizations: "Aplicar la siguiente expresión regular antes de hacer coincidir los permalinks, por ejemplo: /(topic.*)\\?.*/\\1 despojará las cadenas de consulta de las rutas de los temas. El formato es regex+string usa \\1 etc. para acceder a capturas"
     global_notice: "Mostrar a todos los visitantes un mensaje global para URGENCIAS o EMERGENCIAS que no se pueda ocultar. Deja este campo en blanco para quitarlo (puedes usar HTML)."
     disable_system_edit_notifications: "Desactivar editar notificaciones por el usuario del sistema cuando «download_remote_images_to_local» este activo."
-    disable_category_edit_notifications: "Desactivar que se manden notificaciones al cambiar la categoría de los temas."
-    disable_tags_edit_notifications: "No mandar notificaciones al cambiar las etiquetas de los temas."
+    disable_category_edit_notifications: "Desactiva las notificaciones para las ediciones de categorías de temas."
+    disable_tags_edit_notifications: "Desactiva las notificaciones para las ediciones de etiquetas de temas."
     notification_consolidation_threshold: "Cantidad de me gusta o notificaciones de solicitud de membresía recibidas antes de que las notificaciones se consoliden en una sola. Establece el valor en 0 para desactivar."
     likes_notification_consolidation_window_mins: "Minutos durante los que las notificaciones se consolidan en una sola notificación una vez que se haya alcanzado el limite. El límite se puede configurar en «SiteSetting.notification_consolidation_threshold»."
     automatically_unpin_topics: "Desanclar automáticamente cuando el usuario llega al final del tema."
     read_time_word_count: "Número de palabras por minuto para calcular el tiempo de lectura estimado."
     topic_page_title_includes_category: "La <a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title' target='_blank'>etiqueta del título</a> de la página del tema incluye el nombre de la categoría."
-    native_app_install_banner_ios: "Muestra el banner de la aplicación DiscourseHub en dispositivos iOS a usuarios habituales (nivel de confianza 1 y superior)."
-    native_app_install_banner_android: "Muestra el banner de la aplicación DiscourseHub en dispositivos Android a usuarios habituales (nivel de confianza 1 y superior)."
+    native_app_install_banner_ios: "Muestra el banner de la aplicación DiscourseHub en dispositivos iOS a usuarios básicos (nivel de confianza 1) y superiores."
+    native_app_install_banner_android: "Muestra el banner de la aplicación DiscourseHub en dispositivos Android para usuarios básicos (nivel de confianza 1) y superior."
     app_association_android: "Los contenidos del extremo <a href='%{base_path}/.well-known/assetlinks.json'>.well-known/assetlinks.json</a>, utilizado por la API de «Digital Asset Links» de Google."
     app_association_ios: "Los contenidos del extremo <a href='%{base_path}/apple-app-site-association'>apple-app-site-association</a>, utilizado para crear enlaces universales entre este sitio y las aplicacios iOS."
     share_anonymized_statistics: "Compartir estadísticas de uso anonimizadas."
     auto_handle_queued_age: "Maneja automáticamente los registros que están esperando para ser revisados después de esta cantidad de días. Las denuncias serán ignoradas. Los mensajes y usuarios en cola serán rechazados. Establece el valor en 0 para desactivar esta función."
     penalty_step_hours: "Tiempo de sanción por defecto al silenciar o suspender usuarios (en horas). El primer valor se usará para la primera sanción, el segundo para la segunda, y así sucesivamente."
     svg_icon_subset: "Añade iconos adicionales de FontAwesome 5 que te gustaría incluir en tus activos. Usa el prefijo «fa-» para iconos sólidos, «far-» para los iconos normales y «fab-» para los iconos de marca."
-    max_prints_per_hour_per_user: "Número máximo de vistas de página /print (establece el valor en 0 para desactivar esta opción)"
+    max_prints_per_hour_per_user: "Número máximo de impresiones de páginas /print (establecer en 0 para deshabilitar la impresión)"
     full_name_required: "El nombre completo es un campo obligatorio del perfil de usuario."
     enable_names: "Mostrar el nombre completo del usuario en su perfil, tarjeta de usuario y correos electrónicos. Desactiva esta opción para ocultar el nombre completo en todas partes."
     display_name_on_posts: "Mostrar el nombre completo de un usuario en sus publicaciones, además de su @usuario."
@@ -2012,17 +2048,13 @@ es:
     allowed_href_schemes: "Esquemas permitidos en enlaces además de http y https."
     embed_post_limit: "Número máximo de publicaciones que se pueden insertar."
     embed_username_required: "Se requiere el nombre de usuario para la creación de temas."
-    notify_about_flags_after: "Si hay denuncias que no han sido revisadas después de este número de horas, enviar un mensaje personal a los moderadores. Establece el valor en 0 para desactivar."
-    show_create_topics_notice: "Si el sitio tiene menos de 5 temas abiertos al público, mostrar un aviso pidiendo a los administradores crear más temas."
+    notify_about_reviewable_item_after: "Si hay elementos revisables que no se han tratado después de estas horas, envía un mensaje personal a los moderadores. Ponlo a 0 para desactivarlo."
     delete_drafts_older_than_n_days: "Eliminar borradores de más de (n) días de antigüedad."
     delete_merged_stub_topics_after_days: "Número de días que hay que esperar antes de eliminar automáticamente los temas pendientes totalmente fusionados. Poner a 0 para no eliminar nunca los temas pendientes."
-    bootstrap_mode_min_users: "Número mínimo de usuarios requerido para desactivar el modo de arranque (establece en 0 para desactivar esta opción)"
+    bootstrap_mode_min_users: "Número mínimo de usuarios necesarios para desactivar el modo de arranque (ponlo a 0 para desactivarlo, puede tardar hasta 24 horas)"
     prevent_anons_from_downloading_files: "Impedir que usuarios anónimos descarguen archivos adjuntos."
-    secure_media: "DEPRECIADO: utiliza el ajuste secure_uploads en su lugar, se eliminará en Discourse 3.0."
     secure_uploads: 'Limita el acceso a TODAS las subidas (imágenes, vídeo, audio, texto, pdfs, zips y otros). Si se activa la opción de «inicio de sesión obligatorio», solo los usuarios que hayan iniciado sesión podrán acceder a las subidas. De lo contrario, el acceso se limitará solo a las subidas de medios en los mensajes privados y en las categorías privadas. ADVERTENCIA: Esta configuración es compleja y requiere un profundo conocimiento administrativo. Consulta <a target="_blank" href="https://meta.discourse.org/t/-/140017">el tema de subidas seguras en Meta</a> para más detalles.'
-    secure_media_allow_embed_images_in_emails: "DEPRECIADO: usar secure_uploads_allow_embed_images_in_emails, se eliminará en Discourse 3.0."
     secure_uploads_allow_embed_images_in_emails: "Permite incrustar imágenes seguras que normalmente estarían redactadas en los correos electrónicos, si su tamaño es menor que el ajuste de «tamaño máximo de la imagen incrustada en el correo electrónico»."
-    secure_media_max_email_embed_image_size_kb: "DEPRECIADO: usar secure_uploads_max_email_embed_image_size_kb, se eliminará en Discourse 3.0."
     secure_uploads_max_email_embed_image_size_kb: "El tamaño límite para las imágenes seguras que se incrustarán en los correos electrónicos si está activada la configuración «las subidas seguras permiten incrustarlas en los correos electrónicos». Sin esa configuración activada, esta configuración no tiene efecto."
     slug_generation_method: "Elegir un método de generación de slug. «encoded» generará cadenas con código porcentual. «none» desactivará completamente el slug."
     enable_emoji: "Activar emoji"
@@ -2030,6 +2062,7 @@ es:
     emoji_set: "Configuración de los emoji"
     emoji_autocomplete_min_chars: "Número mínimo de caracteres necesarios para que aparezca el diálogo de selección de emoji"
     enable_inline_emoji_translation: "Activa la traducción de emojis en línea (sin ningún espacio ni puntuación antes)"
+    emoji_deny_list: "Estos emoji no estarán disponibles para su uso en menús o shortcodes."
     approve_post_count: "La cantidad de publicaciones de usuarios nuevos o de nivel básico que deben ser aprobadas"
     approve_unless_trust_level: "Las publicaciones de usuarios con un nivel de confianza inferior a este deberán ser aprobadas"
     approve_new_topics_unless_trust_level: "Los temas nuevos de usuarios por debajo de este nivel de confianza deben ser aprobados"
@@ -2084,18 +2117,26 @@ es:
     default_tags_watching_first_post: "Lista de etiquetas cuya primera publicación de cada tema nuevo estará vigilada por defecto."
     default_text_size: "Tamaño de texto seleccionado por defecto"
     default_title_count_mode: "Modo por defecto para el contador del título de la página"
+    enable_offline_indicator: "Mostrar un mensaje a los usuarios cuando se detecte que no tienen conexión a la red"
+    default_sidebar_link_to_filtered_list: "Hacer que los enlaces del menú de navegación enlacen por defecto a la lista filtrada."
+    default_sidebar_show_count_of_new_items: "Hacer que los enlaces del menú de navegación muestren por defecto el recuento de nuevos elementos en lugar de las insignias."
+    default_sidebar_switch_panel_position: "Posición de los botones del panel conmutador de la barra lateral"
     retain_web_hook_events_period_days: "Número de días para retener registros de eventos de web hook."
     retry_web_hook_events: "Reintentar automáticamente 4 veces los eventos del web hook fallidos. Los intervalos de tiempo entre los reintentos son 1, 5, 25 y 125 minutos."
     revoke_api_keys_days: "Número de días antes de que una clave de API sin usar sea revocada automáticamente (0 para nunca)"
     allow_user_api_keys: "Permitir que se generen claves de API de usuario"
     allow_user_api_key_scopes: "Lista de ámbitos permitidos para las claves API de usuario"
-    min_trust_level_for_user_api_key: "Nivel de confianza necesario para generar claves API de usuario"
+    min_trust_level_for_user_api_key: |
+      Nivel de confianza requerido para la generación de claves API de usuario.<br>
+      <b>ADVERTENCIA</b>: Cambiar el nivel de confianza impedirá a los usuarios con un nivel de confianza inferior iniciar sesión a través de Discourse Hub
     allowed_user_api_auth_redirects: "URL permitida para autenticar redirección para claves API de usuario. Símbolo comodín * puede ser usado para que coincida cualquier parte de la misma (por ejemplo www.ejemplo.com/*)."
     allowed_user_api_push_urls: "URLs permitidas para el push del servidor al API de usuario"
     expire_user_api_keys_days: "Número de días antes de que la clave API del usuario caduque automáticamente (0 para nunca)"
     tagging_enabled: "¿Activar etiquetas para los temas?"
     min_trust_to_create_tag: "El nivel de confianza mínimo requerido para crear una etiqueta."
     max_tags_per_topic: "El número máximo de etiquetas que se pueden añadir a un tema."
+    enable_max_tags_per_email_subject: "Utiliza max_tags_per_email_subject al generar el asunto de un correo electrónico"
+    max_tags_per_email_subject: "El máximo de etiquetas que puede haber en el asunto de un correo electrónico"
     max_tag_length: "Máximo número de caracteres que puede tener una etiqueta."
     max_tag_search_results: "Al buscar etiquetas, el número máximo de resultados que se muestran."
     max_tags_in_filter_list: "Número máximo de etiquetas en el desplegable de filtro. Se mostrarán primero aquellas más utilizadas."
@@ -2107,6 +2148,8 @@ es:
     suppress_overlapping_tags_in_list: "Si alguna etiqueta coincide con palabras en el título de los temas, ocultarla."
     remove_muted_tags_from_latest: "No muestre temas etiquetados unicamente con etiquetas silenciadas en la lista de temas más reciente."
     force_lowercase_tags: "Forzar que todas las etiquetas estén completamente en minúscula"
+    create_post_for_category_and_tag_changes: "Crear una pequeña publicación de acción cuando cambie la categoría o las etiquetas de un tema"
+    watched_precedence_over_muted: "Notificarme sobre temas en categorías o etiquetas que estoy observando y que también pertenezcan a una que haya silenciado"
     company_name: "Nombre de la compañía"
     governing_law: "Ley que rige"
     city_for_disputes: "Ciudad para disputas"
@@ -2121,7 +2164,7 @@ es:
     enable_sitemap: "Generar un sitemap para el sitio e incluirlo en el archivo robots.txt."
     sitemap_page_size: "Número de URLs que incluir en cada página del sitemap. Máximo de 50.000"
     enable_user_status: "(experimental) Permitir a los usuarios establecer un mensaje de estado personalizado (emoji + descripción)."
-    enable_user_tips: "(experimental) Habilitar nuevos consejos de usuario que describan las características clave para los usuarios"
+    enable_user_tips: "Habilitar nuevos consejos de usuario que describan las funciones clave a los usuarios"
     short_title: "El título corto se utilizará en la pantalla de inicio del usuario, el iniciador u otros lugares donde el espacio puede ser limitado. Debe limitarse a 12 caracteres."
     dashboard_hidden_reports: "Permitir ocultar los informes especificados del panel de control."
     dashboard_visible_tabs: "Elige qué pestañas del panel de control se mostrarán."
@@ -2138,11 +2181,15 @@ es:
     suggest_weekends_in_date_pickers: "Incluir fines de semana (sábados y domingos) en las sugerencias de los selectores de fecha (desactiva esto si solo usas Discourse de lunes a viernes)"
     splash_screen: "Muestra una pantalla de carga temporal mientras los archivos de la página se cargan"
     navigation_menu: "Determina qué menú de navegación utilizar. La barra lateral y la navegación del encabezado son personalizables por los usuarios. La opción heredada está disponible para compatibilidad con versiones anteriores."
-    default_sidebar_categories: "Las categorías seleccionadas aparecerán por defecto en la sección de categorías de la barra lateral."
-    default_sidebar_tags: "Las etiquetas seleccionadas se mostrarán por defecto en la sección Etiquetas de la barra lateral."
-    enable_new_user_profile_nav_groups: "EXPERIMENTAL: Los usuarios de los grupos seleccionados verán el nuevo menú de navegación del perfil de usuario"
-    enable_experimental_topic_timeline_groups: "EXPERIMENTAL: a los usuarios de los grupos seleccionados se les mostrará la línea de tiempo del tema refactorizado"
+    default_navigation_menu_categories: "Las categorías seleccionadas se mostrarán por defecto en la sección Categorías del Menú de navegación."
+    default_navigation_menu_tags: "Las etiquetas seleccionadas se mostrarán por defecto en la sección Etiquetas del Menú de navegación."
     enable_experimental_hashtag_autocomplete: "EXPERIMENTAL: Utiliza el nuevo sistema de autocompletado #hashtag para categorías y etiquetas que muestra el elemento seleccionado de forma diferente y ha mejorado la búsqueda"
+    experimental_new_new_view_groups: 'EXPERIMENTAL: Habilita una nueva lista de temas que combine los no leídos y los nuevos y haz que el enlace «Todo» de la barra lateral enlace a ella.'
+    enable_custom_sidebar_sections: "EXPERIMENTAL: Habilita secciones personalizadas de la barra lateral"
+    experimental_topics_filter: "EXPERIMENTAL: Habilita la ruta del filtro de temas experimentales en /filter"
+    experimental_search_menu_groups: "EXPERIMENTAL: Habilita el nuevo menú de búsqueda que se ha actualizado para utilizar glimmer"
+    enable_experimental_lightbox: "EXPERIMENTAL: Sustituye el lightbox de imágenes por defecto por el diseño renovado."
+    page_loading_indicator: "Configura el indicador de carga que aparece durante la navegación por las páginas dentro de Discourse. «Spinner» es un indicador de página completa. «Slider» muestra una barra estrecha en la parte superior de la pantalla."
     errors:
       invalid_css_color: "Color no válido. Introduce el nombre de un color o su valor hexadecimal."
       invalid_email: "Dirección de correo electrónico no válida."
@@ -2168,7 +2215,7 @@ es:
       pop3_polling_password_is_empty: "Debes establecer una contraseña de «pop3 polling» antes de activar el polling POP3."
       pop3_polling_authentication_failed: "La autenticación POP3 falló. Comprueba tus credenciales pop3."
       reply_by_email_address_is_empty: "Debes establecer el campo «dirección para responder por correo electrónico» antes de activar respuesta por correo electrónico."
-      email_polling_disabled: "Debes activar el polling sea manual o POP3 antes de activar la respuesta por correo electrónico."
+      email_polling_disabled: "Debes activar el sondeo manual, POP3 o tener activado un sondeador de correo personalizado antes de activar la respuesta por correo electrónico."
       user_locale_not_enabled: "Debes activar primero «permitir usuario local» antes de activar esta opción."
       personal_message_enabled_groups_invalid: "Debes especificar al menos un grupo para esta configuración. Si no quieres que nadie, excepto el personal, envíe MP, elige el grupo del personal."
       invalid_regex: "La expresión regular no es válida o no está permitida."
@@ -2177,7 +2224,6 @@ es:
       staged_users_disabled: "Primero debes activar «usuarios provisionales» para poder activar esta configuración."
       reply_by_email_disabled: "Primero debes activar «responder por correo electrónico» antes de activar esta configuración."
       discourse_connect_url_is_empty: "Debes rellenar «discourse connect url» antes de activar este ajuste."
-      discourse_connect_invite_only: "No puedes activar SSO y el modo de solo invitaciones al mismo tiempo."
       enable_local_logins_disabled: "Primero debes activar «activar inicio de sesión local» antes de activar esta configuración."
       min_username_length_exists: "No puede establecer la longitud de usuario mínima por encima del nombre de usuario más corto (%{username})"
       min_username_length_range: "No puedes establecer el mínimo por encima del máximo."
@@ -2199,7 +2245,8 @@ es:
       search_tokenize_japanese_enabled: "Debes desactivar el ajuste «search_tokenize_japanese» antes de activar este."
       discourse_connect_cannot_be_enabled_if_second_factor_enforced: "No puedes activar DiscourseConnect si la autenticación de dos factores (2FA) es obligatoria."
       delete_rejected_email_after_days: "Esta configuración no puede ser menor que la configuración delete_email_logs_after_days o mayor que %{max}"
-      invalid_uncategorized_category_setting: "La categoría Sin categoría no se puede seleccionar si no está permitido permitir temas sin categoría"
+      invalid_uncategorized_category_setting: 'No se puede seleccionar la categoría «Sin categoría» si no está activada la opción «Permitir temas sin categorizar».'
+      invalid_search_ranking_weights: "El valor no es válido para la configuración del sitio search_ranking_weights. Por ejemplo: «{0.1,0.2,0.3,1.0}». Ten en cuenta que el valor máximo para cada peso es 1,0."
     placeholder:
       discourse_connect_provider_secrets:
         key: "www.ejemplo.com"
@@ -2394,7 +2441,6 @@ es:
     activated_by_staff: "Activado por el personal"
     new_user_typed_too_fast: "El nuevo usuario escribió demasiado rápido"
     content_matches_auto_silence_regex: "Contenido coincide con regex para autosilenciar"
-    content_matches_auto_block_regex: "El contenido coincide con una expresión regular de bloqueo automático"
     username:
       short: "debe tener al menos %{min} caracteres"
       long: "no puede tener más de %{max} caracteres"
@@ -3135,13 +3181,13 @@ es:
       title: "Usuario silenciado automáticamente"
       subject_template: "Usuario nuevo %{username} silenciado por denuncias de la comunidad"
       text_body_template: |
-        Este es un mensaje automatizado.
+        Este es un mensaje automático.
 
-        El usuario nuevo [%{username}](%{user_url}) se silenció automáticamente porque múltiples usuarios han denunciado mensaje(s) de %{username}.
+        El nuevo usuario [%{username}](%{user_url}) ha sido silenciado automáticamente porque varios usuarios han denunciado las publicaciones de %{username}.
 
-        Por favor, [comprueba las denuncias](%{base_url}/admin/flags). Si %{username} se silenció incorrectamente, haz clic en el botón de quitar silencio en la [página de administración del usuario](%{user_url}).
+        Por favor, [revisa las marcas](%{base_url}/review). Si %{username} ha sido silenciado incorrectamente, haz clic en el botón de cancelar silencio en [la página de administración de este usuario](%{user_url}).
 
-        Esto puede ser cambiado con el ajuste «silence_new_user» en la configuración del sitio.
+        Este umbral puede cambiarse a través de la configuración del sitio `silence_new_user`.
     spam_post_blocked:
       title: "Publicación con spam bloqueada"
       subject_template: "Publicaciones del usuario nuevo %{username} bloqueadas debido a la repetición de enlaces."
@@ -3175,15 +3221,6 @@ es:
       title: "Descarga de imágenes remotas desactivada"
       subject_template: "La descarga de imágenes remotas fue desactivada"
       text_body_template: "La opción «download_remote_images_to_local» ha sido desactivada porque se ha llegado al límite de espacio en disco configurado en «download_remote_images_threshold»."
-    dashboard_problems:
-      title: "Problemas del panel"
-      subject_template: "Nuevos consejos en tu panel del sitio"
-      text_body_template: |
-        Tenemos nuevos consejos y recomendaciones para ti basados en tus ajustes del sitio actuales.
-
-        [Visita el panel de control de tu sitio](%{base_url}/admin) para verlos.
-
-        Si no hay nada visible en tu panel de control, otro miembro del equipo podría haber actuado ya sobre este consejo. Puedes encontrar una lista de acciones del personal en tus [registros de acciones del personal](%{base_url}/admin/logs/staff_action_logs).
     new_user_of_the_month:
       title: "¡Eres el usuario nuevo del mes!"
       subject_template: "¡Eres el usuario nuevo del mes!"
@@ -3220,9 +3257,6 @@ es:
       one: "ADVERTENCIA: has superado el límite de %{count} correo electrónico diario. Revisa el sitio para ver las otras notificaciones que no te han llegado."
       other: "Advertencia: enviamos un máximo de %{count} correos electrónicos por día. PD: ¡Gracias por ser tan popular!"
     in_reply_to: "En respuesta a"
-    unsubscribe:
-      title: "Cancelar suscripción"
-      description: "¿No estás interesado en recibir estos correos? ¡No hay problema! Haz clic abajo para darte de baja de inmediatamente:"
     reply_by_email: "[Visita el tema](%{base_url}%{url}) o responde a este correo electrónico para publicar."
     reply_by_email_pm: "[Visita el mensaje](%{base_url}%{url}) o responde a este correo electrónico para contestar a %{participants}."
     only_reply_by_email: "Responde a este correo electrónico para comentar."
@@ -3519,7 +3553,6 @@ es:
       liked_received: "Me gusta recibidos"
       new_users: "Usuarios nuevos"
       popular_topics: "Temas populares"
-      follow_topic: "Seguir este tema"
       join_the_discussion: "Leer más"
       popular_posts: "Publicaciones populares"
       more_new: "Nuevo para ti"
@@ -3714,14 +3747,7 @@ es:
     title: "Se se puede cargar la app"
     offline_page_message: "¡Parece que no estás conectado! Revisa tu conexión a internet e inténtalo de nuevo."
   login_required:
-    welcome_message: |
-      ## [Te damos la bienvenida a %{title}](#welcome)
-      Se necesita una cuenta para utilizar el sitio. Crea una o inicia sesión para continuar.
-    welcome_message_invite_only: |
-      ## [Te damos la bienvenida a %{title}](#welcome)
-      Se necesita una cuenta para utilizar el sitio. Solicita a uno de los miembros actuales que te invite o inicia sesión para continuar.
-  deleted: "eliminado"
-  image: "imagen"
+    welcome_message: "# [Te damos la bienvenida a %{title}](#welcome)"
   upload:
     edit_reason: "copias locales de imágenes descargadas"
     unauthorized: "Lo sentimos, el archivo que estás intentando subir no está permitido (extensiones autorizadas: %{authorized_extensions})."
@@ -3923,39 +3949,43 @@ es:
   tos_topic:
     title: "Términos del servicio"
     body: |
-      Estas condiciones rigen el uso del foro de Internet en <%{base_url}>. Para utilizar el foro, debes aceptar estas condiciones con %{company_name}, la empresa que gestiona el foro.
+      <h2 id="heading--change-me"><a href="#heading--change-me">Cámbiame</a></h2>
 
-      La empresa puede ofrecer otros productos y servicios, con condiciones diferentes. Estas condiciones se aplican solo al uso del foro.
+      Administrador del foro, a continuación encontrarás una plantilla de inicio de ejemplo para una política de privacidad que deberás personalizar para satisfacer las necesidades de tu sitio.
 
-      Saltar a:
+      Estas condiciones no regulan el uso del foro de Internet en <%{base_url}>, pero podrían hacerlo algún día. En ese caso, para utilizar el foro, deberás aceptar estas condiciones con %{company_name}, la empresa que gestiona el foro.
 
-      - [Condiciones importantes](#heading--important-terms)
-      - [Tu permiso para utilizar el foro](#heading--permission)
-      - [Condiciones de uso del foro](#heading--conditions)
-      - [Uso aceptable](#heading--acceptable-use)
-      - [Normas de contenido](#heading--content-standards)
-      - [Aplicación](#heading--enforcement)
-      - [Tu cuenta](#heading--your-account)
-      - [Tu contenido](#heading--your-content)
-      - [Tu responsabilidad](#heading--responsibility)
-      - [Renuncias](#heading--disclaimers)
-      - [Límites de responsabilidad](#heading--liability)
-      - [Comentarios](#heading--feedback)
-      - [Terminación](#heading--termination)
-      - [Disputas](#heading--disputes)
-      - [Condiciones generales](#heading--general)
-      - [Contacto](#heading--contact)
-      - [Cambios](#heading--changes)
+      La empresa puede ofrecer otros productos y servicios, con condiciones diferentes. Estas condiciones solo se aplican al uso del foro.
 
-      <h2 id="heading--important-terms"><a href="#heading--important-terms">Condiciones importantes</a></h2>
+      Ir directamente a:
 
-      ***Estas condiciones incluyen una serie de disposiciones importantes que afectan a tus derechos y responsabilidades, como las cláusulas de exención de responsabilidad en [Cláusulas de exención de responsabilidad](#heading--disclaimers), los límites de la responsabilidad de la empresa hacia ti en [Límites de responsabilidad](#heading--liability), tu acuerdo de cubrir a la empresa por los daños causados por tu mal uso del foro en [Responsabilidad por tu uso](#heading--responsibility), y un acuerdo para arbitrar disputas en [Disputas](#heading--disputes).
+      - [Condiciones importantes](#encabezado--condiciones-importantes)
+      - [Tu permiso para utilizar el foro](#encabezado--permiso)
+      - [Condiciones de uso del foro](#encabezado--condiciones)
+      - [Uso aceptable](#encabezado--uso-aceptable)
+      - [Normas de contenido](#encabezado--normas-de-contenido)
+      - [Aplicación](#encabezado--aplicación)
+      - [Tu cuenta](#encabezado--tu-cuenta)
+      - [Tu contenido](#encabezado--tu-contenido)
+      - [Tu responsabilidad](#encabezado--responsabilidad)
+      - [Exenciones de responsabilidad](#encabezado--exenciones)
+      - [Límites de responsabilidad](#encabezado--responsabilidades)
+      - [Comentarios](#encabezado--comentarios)
+      - [Terminación](#encabezado--terminación)
+      - [Disputas](#encabezado--disputas)
+      - [Condiciones generales](#encabezado--general)
+      - [Contacto](#encabezado--contacto)
+      - [Cambios](#encabezado--cambios)
 
-      <h2 id="heading--permission"><a href="#heading--permission">Tu permiso para utilizar el Foro</a></h2>
+      <h2 id="heading--important-terms"><a href="#encabezado--condiciones-importantes">Condiciones importantes</a></h2>
+
+      ***Estas condiciones incluyen una serie de disposiciones importantes que afectan a tus derechos y responsabilidades, como las cláusulas de exención de responsabilidad en [Cláusulas de exención de responsabilidad](#encabezado--cláusulas-de-exención-de-responsabilidad), los límites de la responsabilidad de la empresa hacia ti en [Límites de responsabilidad](#encabezado--responsabilidades), tu acuerdo de cubrir a la empresa por los daños causados por tu mal uso del foro en [Responsabilidad por tu uso](#encabezado--responsabilidad), y un acuerdo para arbitrar disputas en [Disputas](#encabezado--disputas).
+
+      <h2 id="heading--permission"><a href="#encabezado--permiso">Tu permiso para utilizar el foro</a></h2>
 
       Sujeto a estos términos, la empresa te da permiso para utilizar el foro. Todo el mundo debe aceptar estas condiciones para utilizar el foro.
 
-      <h2 id="heading--conditions"><a href="#heading--conditions">Condiciones de uso del foro</a></h2>
+      <h2 id="heading--conditions"><a href="#encabezado--condiciones">Condiciones de uso del foro</a></h2>
 
       Tu permiso para utilizar el foro está sujeto a las siguientes condiciones:
 
@@ -3963,25 +3993,25 @@ es:
 
       2. No podrás seguir utilizando el foro si la empresa se pone en contacto contigo directamente para decirte que no puedes hacerlo.
 
-      3. Debes utilizar el foro de acuerdo con las normas de [Uso aceptable](#heading--acceptable-use) y las [Normas de contenido](#heading--content-standards).
+      3. Debes utilizar el foro de acuerdo con [Uso aceptable](#encabezado--uso-aceptable) y [Normas de contenido](#encabezado--normas-de-contenido).
 
-      <h2 id="heading--acceptable-use"><a href="#heading--acceptable-use">Uso Aceptable</a></h2>
+      <h2 id="heading--acceptable-use"><a href="#encabezado--uso-aceptable">Uso aceptable</a></h2>
 
       1. No puedes infringir la ley utilizando el foro.
 
-      2. 2. No puedes utilizar o intentar utilizar la cuenta de otra persona en el foro sin su permiso específico.
+      2. No puedes utilizar o intentar utilizar la cuenta de otra persona en el foro sin su permiso específico.
 
-      3. 3. No puedes comprar, vender o comerciar con nombres de usuario u otros identificadores únicos en el foro.
+      3. No puedes comprar, vender o comerciar con nombres de usuario u otros identificadores únicos en el foro.
 
       4. No puedes enviar publicidad, cartas en cadena u otras solicitudes a través del foro, ni utilizar el foro para recopilar direcciones u otros datos personales para listas de correo o bases de datos comerciales.
 
-      5. 5. No puedes automatizar el acceso al foro ni monitorizarlo, por ejemplo, con un rastreador web, un complemento o add-on del navegador u otro programa informático que no sea un navegador web. Puedes rastrear el foro para indexarlo para un motor de búsqueda disponible públicamente, si gestionas uno.
+      5. No puedes automatizar el acceso al foro ni monitorizarlo, por ejemplo, con un rastreador web, un plug-in o complemento del navegador u otro programa informático que no sea un navegador web. Puedes rastrear el foro para indexarlo para un motor de búsqueda disponible públicamente, si gestionas uno.
 
       6. No puedes utilizar el foro para enviar correo electrónico a listas de distribución, grupos de noticias o alias de correo de grupo.
 
       7. No puedes dar a entender falsamente que estás afiliado o respaldado por la empresa.
 
-      8. No puedes poner hipervínculos a imágenes u otros contenidos no hipertextuales del foro en otras páginas web.
+      8. No puedes establecer hipervínculos a imágenes u otros contenidos no hipertextuales del foro en otras páginas web.
 
       9. No puedes eliminar ninguna marca que muestre la propiedad de los materiales que descargues del foro.
 
@@ -3989,31 +4019,31 @@ es:
 
       11. No puedes desactivar, evitar o eludir ninguna restricción de seguridad o acceso del foro.
 
-      12. No puedes sobrecargar la infraestructura del foro con un volumen irrazonable de peticiones, o peticiones diseñadas para imponer una carga irrazonable en los sistemas de información subyacentes al foro.
+      12. No puedes sobrecargar la infraestructura del foro con un volumen irrazonable de peticiones, o peticiones diseñadas para imponer una carga no razonable en los sistemas de información subyacentes al foro.
 
       13. No puedes hacerte pasar por otros a través del foro.
 
       14. No puedes animar o ayudar a nadie que infrinja estas condiciones.
 
-      <h2 id="heading--content-standards"><a href="#heading--content-standards">Normas de contenido</a></h2>
+      <h2 id="heading--content-standards"><a href="#encabezado--normas-de-contenido">Normas de contenido</a></h2>
 
       1. No puedes enviar contenidos al foro que sean ilegales, ofensivos o perjudiciales para los demás. Esto incluye contenido que sea acosador, inapropiado, abusivo o que incite al odio.
 
-      2. 2. No puedes enviar contenido al foro que viole la ley, infrinja los derechos de propiedad intelectual de nadie, viole la privacidad de nadie o incumpla los acuerdos que tengas con otros.
+      2. No puedes enviar contenido al foro que viole la ley, infrinja los derechos de propiedad intelectual de nadie, viole la privacidad de nadie o incumpla los acuerdos que tengas con otros.
 
       3. No puedes enviar contenidos al foro que contengan código informático malicioso, como virus informáticos o programas espía.
 
       4. No puedes enviar contenido al foro como mero marcador de posición, para mantener una dirección, nombre de usuario u otro identificador único en particular.
 
-      5. No puedes utilizar el foro para revelar información que no tengas derecho a revelar, como información confidencial o personal de otras personas.
+      5. No puedes utilizar el foro para revelar información que no tengas derecho a revelar, como información confidencial o personal de otros.
 
-      <h2 id="heading--enforcement"><a href="#heading--enforcement">Cumplimiento</a></h2>
+      <h2 id="heading--enforcement"><a href="#encabezado--aplicación">Aplicación</a></h2>
 
       La empresa puede investigar y perseguir las violaciones de estos términos con todo el rigor legal. La empresa puede notificar y cooperar con las autoridades policiales en la persecución de las violaciones de la ley y de estos términos.
 
-      La empresa se reserva el derecho a modificar, redactar y eliminar contenidos del foro por cualquier motivo. Si crees que alguien ha enviado contenido al foro infringiendo estas condiciones, [ponte en contacto con nosotros inmediatamente](#encabezado-contacto).
+      La empresa se reserva el derecho a modificar, redactar y eliminar contenidos del foro por cualquier motivo. Si crees que alguien ha enviado contenido al foro infringiendo estas condiciones, [ponte en contacto con nosotros inmediatamente](#encabezado--contacto).
 
-      <h2 id="heading--your-account"><a href="#heading--your-account">Tu cuenta</a></h2>
+      <h2 id="heading--your-account"><a href="#encabezado--tu-cuenta">Tu cuenta</a></h2>
 
       Debes crear una cuenta e iniciar sesión en ella para utilizar algunas funciones del foro.
 
@@ -4023,7 +4053,7 @@ es:
 
       La empresa puede restringir, suspender o cerrar tu cuenta en el foro de acuerdo con su política de gestión de solicitudes de retirada relacionadas con los derechos de autor, o si la empresa cree razonablemente que has infringido alguna norma de estas condiciones.
 
-      <h2 id="heading--your-content"><a href="#heading--your-content">Tu contenido</a></h2>
+      <h2 id="heading--your-content"><a href="#encabezado--tu-contenido">Tu contenido</a></h2>
 
       Nada de lo dispuesto en estas condiciones otorga a la empresa ningún derecho de propiedad sobre la propiedad intelectual que compartas con el foro, como la información de tu cuenta, tus mensajes u otros contenidos que envíes al foro. Tampoco hay nada en estas condiciones que te otorgue ningún derecho de propiedad sobre la propiedad intelectual de la empresa.
 
@@ -4035,45 +4065,45 @@ es:
 
       Otras personas que reciban contenido que envíes al foro pueden violar los términos bajo los cuales concedes la licencia de tu contenido. Aceptas que la empresa no será responsable ante ti de dichas infracciones ni de sus consecuencias.
 
-      <h2 id="heading--responsibility"><a href="#heading--responsibility">Tu responsabilidad</a></h2>
+      <h2 id="heading--responsibility"><a href="#encabezado--responsabilidad">Tu responsabilidad</a></h2>
 
-      Aceptas indemnizar a la empresa por las reclamaciones legales de terceros relacionadas con tu incumplimiento de estas condiciones, o con el incumplimiento de estas condiciones por parte de otras personas que utilicen tu cuenta en el foro. Tanto tú como la empresa aceptáis notificar a la otra parte cualquier reclamación legal por la que pudierais tener que indemnizar a la empresa lo antes posible. Si la empresa no te notifica una reclamación legal con prontitud, no tendrás que indemnizar a la empresa por los daños de los que podrías haberte defendido o mitigado con una pronta notificación. Aceptas permitir que la empresa controle la investigación, defensa y resolución de las reclamaciones legales por las que tendrías que indemnizar a la empresa, y cooperar con esos esfuerzos. La empresa se compromete a no aceptar ningún acuerdo que admita tu culpa o te imponga obligaciones sin tu consentimiento previo.
+      Aceptas indemnizar a la empresa por las reclamaciones legales de terceros relacionadas con tu incumplimiento de estas condiciones, o con el incumplimiento de estas condiciones por parte de otras personas que utilicen tu cuenta en el foro. Tanto tú como la empresa aceptáis notificar a la otra parte cualquier reclamación legal por la que pudierais tener que indemnizar a la empresa lo antes posible. Si la empresa no te notifica una reclamación legal con prontitud, no tendrás que indemnizar a la empresa por daños de los que podrías haberte defendido o mitigado con una pronta notificación. Aceptas permitir que la empresa controle la investigación, defensa y resolución de las reclamaciones legales por las que tendrías que indemnizar a la empresa, y cooperar con esos esfuerzos. La empresa se compromete a no aceptar ningún acuerdo que admita tu culpa o te imponga obligaciones sin tu consentimiento previo.
 
-      <h2 id="heading--disclaimers"><a href="#heading--disclaimers">Renuncias</a></h2>
+      <h2 id="heading--disclaimers"><a href="#encabezdo--exenciones">Exenciones de responsabilidad</a></h2>
 
       ***Aceptas todos los riesgos derivados del uso del foro y de su contenido. En la medida en que la ley lo permita, la empresa y sus proveedores proporcionan el foro tal cual, sin garantía de ningún tipo.***
 
       El foro puede hipervincular e integrar foros y servicios gestionados por terceros. La empresa no ofrece ninguna garantía sobre los servicios gestionados por terceros, ni sobre el contenido que puedan proporcionar. El uso de servicios gestionados por otros puede regirse por otras condiciones entre tú y el que gestiona el servicio.
 
-      <h2 id="heading--liability"><a href="#heading--liability">Límites de responsabilidad</a></h2>
+      <h2 id="heading--liability"><a href="#encabezado--responsabilidad">Límites de la responsabilidad</a></h2>
 
       ***Ni la empresa ni sus proveedores serán responsables ante ti por los daños derivados del incumplimiento del contrato que su personal no pudiera haber previsto razonablemente cuando aceptaste estas condiciones.
 
       ***En la medida en que la ley lo permita, la responsabilidad total ante ti por reclamaciones de cualquier tipo relacionadas con el foro o el contenido del foro se limitará a 50 $.****.
 
-      <h2 id="heading--feedback"><a href="#heading--feedback">Comentarios</a></h2>
+      <h2 id="heading--feedback"><a href="#encabezado--comentarios">Comentarios</a></h2>
 
-      La empresa agradece tus comentarios y sugerencias para el foro. Consulta la sección [Contacto](#heading--contact) más abajo para saber cómo ponerte en contacto con nosotros.
+      La empresa agradece tus comentarios y sugerencias para el foro. Consulta la sección [Contacto](#encabezado--contacto) más abajo para saber cómo ponerte en contacto con nosotros.
 
       Aceptas que la empresa sea libre de actuar en función de las opiniones y sugerencias que proporciones, y que la empresa no tendrá que notificarte que se han utilizado tus opiniones, ni obtener tu permiso para utilizarlas, ni pagarte. Aceptas no enviar opiniones o sugerencias que creas que puedan ser confidenciales o de propiedad, tuya o de otros.
 
-      <h2 id="heading--termination"><a href="#heading--termination">Terminación</a></h2>
+      <h2 id="heading--termination"><a href="#encabezado--terminación">Terminación</a></h2>
 
       Tanto tú como la empresa podéis poner fin al acuerdo establecido en estas condiciones en cualquier momento. Cuando finalice nuestro acuerdo, también finalizará tu permiso para utilizar el foro.
 
-      Las siguientes disposiciones sobreviven a la finalización de nuestro acuerdo: [Tu contenido](#heading--your-content), [Comentarios](#heading--feedback), [Tu responsabilidad](#heading--responsibility), [Renuncias](#heading--disclaimers), [Límites de responsabilidad](#heading--liability) y [Condiciones generales](#heading--general).
+      Las siguientes disposiciones sobreviven a la finalización de nuestro acuerdo: [Tu contenido](#encabezado--tu-contenido), [Comentarios](#encabezado--recomendaciones), [Tu responsabilidad](#encabezado--responsabilidad), [Renuncias](#encabedo--renuncias), [Límites de responsabilidad](#encabezado--responsabilidad) y [Condiciones generales](#encabezado--general).
 
-      <h2 id="heading--disputes"><a href="#heading--disputes">Disputas</a></h2>
+      <h2 id="heading--disputes"><a href="#encabezado--disputas">Disputas</a></h2>
 
-      %{governing_law} regirá cualquier disputa relacionada con estas condiciones o con tu uso del foro.
+      %{governing_law} regirá cualquier disputa relacionada con estos términos o con tu uso del foro.
 
-      Tú y la empresa acordáis solicitar medidas cautelares relacionadas con estos términos solo en los tribunales estatales o federales de %{city_for_disputes}. Ni tú ni la empresa se opondrán a la jurisdicción, el foro o la sede de dichos tribunales.
+      Tú y la empresa acordáis solicitar medidas cautelares relacionadas con estos términos sólo en los tribunales estatales o federales de %{city_for_disputes}. Ni tú ni la empresa se opondrán a la jurisdicción, el foro o la sede de dichos tribunales.
 
       ***Salvo para solicitar una medida cautelar o para reclamaciones en virtud de la Ley de Fraude y Abuso Informático, tú y la empresa resolveréis cualquier disputa mediante arbitraje vinculante de la Asociación Americana de Arbitraje (AAA). El arbitraje seguirá las Normas de Arbitraje Comercial de la AAA y los Procedimientos Suplementarios para Disputas Relacionadas con el Consumidor. El arbitraje tendrá lugar en %{city_for_disputes}. Resolverás cualquier disputa como individuo, y no como parte de una demanda colectiva u otro procedimiento representativo, ya sea como demandante o como miembro de una demanda colectiva. Ningún árbitro consolidará ninguna disputa con otro arbitraje sin el permiso de la empresa.***
 
       Cualquier laudo arbitral incluirá los costes del arbitraje, los honorarios razonables de los abogados y los costes razonables de los testigos. Tú y la empresa podréis presentar los laudos arbitrales ante cualquier tribunal competente.
 
-      <h2 id="heading--general"><a href="#heading--general">Condiciones generales</a></h2>
+      <h2 id="heading--general"><a href="#encabezado--general">Condiciones generales</a></h2>
 
       Si una disposición de estas condiciones no es ejecutable tal y como está redactada, pero podría modificarse para hacerla ejecutable, dicha disposición deberá modificarse en la medida mínima necesaria para hacerla ejecutable. De lo contrario, dicha disposición deberá eliminarse.
 
@@ -4083,103 +4113,102 @@ es:
 
       Estos términos incorporan todos los términos del acuerdo entre tú y la empresa sobre el uso del foro. Estos términos sustituyen por completo a cualquier otro acuerdo sobre tu uso del foro, escrito o no.
 
-      <h2 id="heading--contact"><a href="#heading--contact">Contacto</a></h2>
+      <h2 id="heading--contact"><a href="#encabezado--contacto">Contacto</a></h2>
 
       Puedes notificar a la empresa conforme a estos términos, y enviar preguntas a la empresa, a <%{contact_email}>.
 
       La empresa puede notificarte conforme a estos términos utilizando la dirección de correo electrónico que proporciones para tu cuenta en el foro, o publicando un mensaje en la página principal del foro o en la página de tu cuenta.
 
-      <h2 id="heading--changes"><a href="#heading--changes">Cambios</a></h2>
+      <h2 id="heading--changes"><a href="#encabezado--cambios">Cambios</a></h2>
 
-      La empresa actualizó por última vez estas condiciones el 12 de julio de 2018, y puede actualizarlas de nuevo. La empresa publicará todas las actualizaciones en el foro. Para las actualizaciones que contengan cambios sustanciales, la empresa se compromete a enviarte un correo electrónico, si has creado una cuenta y proporcionado una dirección de correo electrónico válida. La empresa también puede anunciar actualizaciones con mensajes especiales o alertas en el foro.
+      La empresa actualizó por última vez estas condiciones el [INSERTAR AQUÍ LA ÚLTIMA FECHA DE ACTUALIZACIÓN], y puede volver a actualizarlas. La empresa publicará todas las actualizaciones en el foro. Para las actualizaciones que contengan cambios sustanciales, la empresa se compromete a enviarte un correo electrónico, si has creado una cuenta y proporcionado una dirección de correo electrónico válida. La empresa también puede anunciar actualizaciones con mensajes especiales o alertas en el foro.
 
       Una vez que recibas el aviso de una actualización de estas condiciones, deberás aceptar las nuevas condiciones para poder seguir utilizando el foro.
   privacy_topic:
     title: "Política de privacidad"
     body: |
+      ## [Administrador del Foro, a continuación encontrarás una plantilla de inicio de ejemplo para una política de privacidad que deberás adaptar a tu sitio].
+
       <a name="collect"></a>
 
-      ## [¿Qué información recopilamos?](#collect)
+      ## [¿Qué información recopilamos?](#recopilar)
 
-      Recopilamos información tuya cuando te registras en nuestra web y recopilamos información cuando participas en ella leyendo, escribiendo y evaluando el contenido compartido aquí.
+      Recopilamos información sobre ti cuando te registras en nuestro sitio y recopilamos datos cuando participas en el foro leyendo, escribiendo y evaluando el contenido compartido aquí.
 
-      Al registrarte en nuestra web, puede que se te pida que indiques tu nombre y tu correo electrónico. Sin embargo, puedes visitarnos sin registrarte. Tu correo electrónico será verificado a través de un mensaje que contendrá un enlace único. Si visitas ese enlace, sabremos que controlas el correo electrónico.
+      Al registrarte en nuestro sitio, es posible que se te pida que introduzcas tu nombre y dirección de correo electrónico. Sin embargo, puedes visitar nuestro sitio sin registrarte. Tu dirección de correo electrónico se verificará mediante un mensaje que contendrá un enlace único. Si se visita ese enlace, sabremos que controlas la dirección de correo electrónico.
 
-      Cuando estés registrado y publiques, guardamos la dirección IP desde donde el mensaje fue publicado. Puede que guardemos registros que incluyan la dirección IP de cada intercambio de datos con nuestro servidor.
+      Cuando te registras y publicas, registramos la dirección IP desde la que se originó la publicación. También podemos conservar registros del servidor que incluyan la dirección IP de cada solicitud a nuestro servidor.
 
       <a name="use"></a>
 
-      ## [¿Para qué usamos tu información?](#use)
+      ## [¿Para qué utilizamos tu información?](#uso)
 
-      Cualquier información recopilada puede ser usada en una de las siguientes maneras:
+      Toda la información que recopilamos sobre ti puede utilizarse de una de las siguientes maneras:
 
-      * Para personalizar tu experiencia &mdash; tu información nos ayuda a responder a tus necesidades individuales.
-      * Para mejorar nuestra web &mdash; intentamos continuamente mejorar nuestro sitio web ofreciéndote contenido basado en la información que recibimos de ti.
-      * Para mejorar el servicio de soporte &mdash; tu información nos ayuda a responder de una forma más efectiva a tus dudas y problemas.
-      * Para enviar correos periódicamente &mdash; la dirección de correo electrónico que nos proporciones puede ser usada para enviarte información, notificaciones que tú solicites sobre cambios en temas, respuestas a tu usuario, respuestas a consultas y/o cualquier otro tipo de solicitudes o cuestiones.
+      * Para personalizar tu experiencia &mdash; tu información nos ayuda a responder mejor a tus necesidades individuales.
+      * Para mejorar nuestro sitio web &mdash; nos esforzamos continuamente por mejorar las ofertas de nuestro sitio web basándonos en la información y los comentarios que recibimos de ti.
+      * Para mejorar el servicio de atención al cliente: tu información nos ayuda a responder más eficazmente a tus solicitudes de servicio de atención al cliente y a tus necesidades de asistencia.
+      * Para enviar correos electrónicos periódicos &mdash; La dirección de correo electrónico que nos facilitas puede utilizarse para enviarte información, notificaciones que solicites sobre cambios en temas o en respuesta a tu nombre de usuario, responder a consultas y/u otras peticiones o preguntas.
 
       <a name="protect"></a>
 
-      ## [¿Cómo protegemos tu información?](#protect)
+      ## [¿Cómo protegemos tu información?](#proteger)
 
-      Tenemos implementadas varias medidas de seguridad para mantener tu información personal segura cuando la introduzcas o accedas a ella.
+      Aplicamos diversas medidas de seguridad para mantener la seguridad de tu información personal cuando la introduces, envías o accedes a ella.
 
       <a name="data-retention"></a>
 
-      ## [¿Cuál es la política de retención de datos?](#data-retention)
+      ## [¿Cuál es su política de retención de datos?](#retención-de-datos)
 
-      Hacemos un gran esfuerzo de buena fe por:
+      Haremos un esfuerzo de buena fe para:
 
-      * No retener los registros de los servidores que contienen la dirección IP de todas las solicitudes durante más de 90 días.
-      * No retener las direcciones IP asociadas con usuarios registrados y sus mensajes durante más de 5 años.
+      * Conservar los registros del servidor que contengan la dirección IP de todas las solicitudes a este servidor no más de [NÚMERO DE DÍAS] días.
 
       <a name="cookies"></a>
 
-      ## [¿Usamos cookies?](#cookies)
+      ## [¿Utilizamos cookies?](#cookies)
 
-      Sí. Las cookies con pequeños archivos que una web o su proveedor de servicios transfiere a tu disco duro a través de tu navegador (si lo permites). Estas cookies permiten a la web reconocer tu navegador y, si tienes una cuenta registrada, asociarlo con ella.
+      Sí. Las cookies son pequeños archivos que un sitio o su proveedor de servicios transfiere al disco duro de tu ordenador a través de tu navegador web (si lo permites). Estas cookies permiten al sitio reconocer tu navegador y, si tienes una cuenta registrada, asociarlo a tu cuenta registrada.
 
-      Usamos cookies para entender y guardar tus preferencias para futuras visitas y para recolectar información sobre el tráfico y la interacción con este sitio web de modo que podamos ofrecer mejores experiencias y herramientas en un futuro. Puede que nos asociemos con terceros para que nos asistan a entender mejor a nuestros visitantes. Estos proveedores de servicios no tienen permitido usar esta información para otro propósito que no sea ayudarnos a mejorar.
+      Utilizamos cookies para comprender y guardar tus preferencias para futuras visitas y recopilar datos agregados sobre el tráfico y la interacción del sitio, de modo que podamos ofrecer mejores experiencias y herramientas del sitio en el futuro. Podemos contratar a terceros proveedores de servicios para que nos ayuden a comprender mejor a los visitantes de nuestro sitio. Estos proveedores de servicios no están autorizados a utilizar la información recopilada en nuestro nombre, excepto para ayudarnos a dirigir y mejorar nuestro negocio.
 
       <a name="disclose"></a>
 
-      ## [¿Revelamos alguna información a terceros?](#disclose)
+      ## [¿Revelamos información a terceros?](#revelar)
 
-      No vendemos, intercambiamos o transferimos a terceros tu información personal. Esto no incluye a terceros que nos ayuden a operar correctamente este sitio web, a administrar nuestro negocio o a ofrecerte un servicio, siempre y cuando acepten mantener esta información confidencial.
-
-      Puede que revelemos tu información cuando creamos que sea apropiado para cumplir con la ley, hacer cumplir con nuestras políticas, derechos, propiedades o seguridad, nuestra o de terceros. Sin embargo, la información no personal de los visitantes puede que sea entregada debidamente a terceros con propósitos de marketing, publicidad u otros usos.
+      No vendemos, comerciamos ni transferimos a terceros tu información personal identificable. Esto no incluye a terceras partes de confianza que nos ayudan en el funcionamiento de nuestro sitio, en la gestión de nuestro negocio o en la prestación de servicios, siempre que dichas partes se comprometan a mantener la confidencialidad de esta información. También podemos divulgar tu información cuando creamos que es apropiado para cumplir la ley, hacer cumplir las políticas de nuestro sitio o proteger nuestros derechos, propiedad o seguridad o los de otros. Sin embargo, la información no identificable personalmente de los visitantes puede facilitarse a terceros para fines de marketing, publicidad u otros usos.
 
       <a name="third-party"></a>
 
-      ## [Enlaces de terceros](#third-party)
+      ## [Enlaces de terceros](#terceros)
 
-      Ocasionalmente, es posible que incluyamos u ofrezcamos enlaces a productos o servicios de terceros en esta web. Estos sitios webs de terceros tienen otras políticas de privacidad, por lo que no nos hacemos responsables del contenido y actividades de estos sitios. Sin embargo, intentamos proteger la integridad de nuestra web y aceptamos opiniones sobre estos sitios de terceros.
+      Ocasionalmente, a nuestra discreción, podemos incluir u ofrecer productos o servicios de terceros en nuestro sitio. Estos sitios de terceros tienen políticas de privacidad separadas e independientes. Por lo tanto, no tenemos responsabilidad alguna por el contenido y las actividades de estos sitios enlazados. No obstante, tratamos de proteger la integridad de nuestro sitio y agradecemos cualquier comentario sobre estos sitios.
 
       <a name="coppa"></a>
 
-      ## [Cumplimiento del Acta de Protección de la Privacidad Online de los Niños de 1998](#coppa)
+      ## [Cumplimiento de la Ley de Protección de la Privacidad Infantil en Internet](#coppa)
 
-      Nuestra web, sus productos y servicios están dirigidos a personas que tengan 13 o más años de edad. Si este servidor está en EE. UU. y tienes menos de 13 años de edad, a causa del Acta de protección de la privacidad online de los niños de 1998 ([Children's Online Privacy Protection Act](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)) de EEUU, no uses este sitio web.
+      Nuestro sitio, productos y servicios están dirigidos a personas mayores de 13 años. Si este servidor está en EE. UU. y eres menor de 13 años, según los requisitos de la COPPA ([Ley de Protección de la Privacidad Infantil en Internet](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)), no utilices este sitio.
 
       <a name="online"></a>
 
-      ## [Política de privacidad online](#online)
+      ## [Política de privacidad solo en línea](#online)
 
-      Esta política de privacidad solo tiene validez para la información recopilada a través de nuestro sitio web, y no para aquella recopilada sin conexión.
+      Esta política de privacidad en línea solo se aplica a la información recogida a través de nuestro sitio y no a la información recogida fuera de línea.
 
       <a name="consent"></a>
 
-      ## [Consentimiento](#consent)
+      ## [Tu consentimiento](#consentimiento)
 
-      Al usar nuestra web, aceptas esta política.
+      Al utilizar nuestro sitio, das tu consentimiento a la política de privacidad de nuestro sitio web.
 
       <a name="changes"></a>
 
-      ## [Cambios a nuestra política de privacidad](#changes)
+      ## [Cambios en nuestra política de privacidad](#cambios)
 
-      Si decidimos cambiar nuestra política de privacidad, publicaremos los cambios en esta misma página.
+      Si decidimos cambiar nuestra política de privacidad, publicaremos dichos cambios en esta página.
 
-      Este documento tiene una licencia «CC-BY-SA». Última actualización: 31 de mayo del 2013.
+      Este documento es CC-BY-SA. Se actualizó por última vez [INSERTAR AQUÍ LA ÚLTIMA FECHA DE ACTUALIZACIÓN].
   badges:
     mass_award:
       errors:
@@ -4466,6 +4495,7 @@ es:
     required_tags_from_group:
       one: "Debes incluir al menos %{count} etiqueta de %{tag_group_name}. Las etiquetas en este grupo son: %{tags}."
       other: "Debes incluir al menos %{count} etiquetas de %{tag_group_name}. Las etiquetas en este grupo son: %{tags}."
+    limited_to_one_tag_from_group: "Las etiquetas %{tags} no pueden utilizarse simultáneamente. Incluye solo una de ellas."
     invalid_target_tag: "no puede ser el sinónimo de un sinónimo"
     synonyms_exist: "no está permitido mientras existan sinónimos"
   rss_by_tag: "Temas con la etiqueta %{tag}"
@@ -4484,10 +4514,10 @@ es:
       message: "<p>Hemos reenviado el correo electrónico de activación a <b>%{email}</b>"
   safe_mode:
     title: "Activar modo seguro"
-    description: "El modo seguro te permite probar tu sitio sin cargar plugins o temas."
+    description: "El modo seguro te permite probar tu sitio sin cargar temas ni personalizaciones de plugins del lado del cliente. Las personalizaciones de los plugins del lado del servidor permanecen activadas."
     no_themes: "Desactivar temas y componentes de tema"
-    no_unofficial_plugins: "Desactivar plugins no oficiales"
-    no_plugins: "Desactivar todos los plugins"
+    no_unofficial_plugins: "Desactiva las personalizaciones no oficiales de los plugins del lado del cliente"
+    no_plugins: "Desactiva todas las personalizaciones del plugin del lado del cliente"
     enter: "Activar modo seguro"
     must_select: "Debes escoger al menos una opción para entrar en el modo seguro."
   wizard:
@@ -4602,7 +4632,9 @@ es:
           <p>Pásalo bien, y ¡buena suerte <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>construyendo tu nueva comunidad!</a></p>
   search_logs:
     graph_title: "Análisis de búsquedas"
-  joined: "Registrado"
+  onebox:
+    discourse:
+      user_joined_community: "Se unió el %{date}"
   discourse_push_notifications:
     popup:
       mentioned: '%{username} te mencionó en «%{topic}» - %{site_title}'
@@ -4665,15 +4697,15 @@ es:
         category: ajustes de la categoría
     actions:
       agree:
-        title: "Estar de acuerdo..."
+        title: "Sí"
       agree_and_keep:
         title: "Mantener publicación"
-        description: "Estar de acuerdo con la denuncia y mantener la publicación intacta."
+        description: "Aceptar la denuncia, pero mantener esta publicación sin cambios."
       agree_and_keep_hidden:
         title: "Mantener la publicación oculta"
         description: "Aceptar la denuncia y mantener la publicación oculta."
       agree_and_suspend:
-        title: "Suspender usuario"
+        title: "Suspender al usuario"
         description: "Estar de acuerdo con la denuncia y suspender el usuario."
       agree_and_silence:
         title: "Silenciar al usuario"
@@ -4683,32 +4715,35 @@ es:
         description: "Restaurar la publicación para que los usuarios puedan verla."
       agree_and_hide:
         title: "Ocultar publicación"
-        description: "Ocultar la publicación y enviar un mensaje automáticamente al usuario animándole a que la edite."
+        description: "Aceptar la denuncia y ocultar esta entrada + enviar automáticamente al usuario un mensaje instándole a editarla."
       delete_single:
         title: "Eliminar"
       delete:
         title: "Eliminar..."
       delete_and_ignore:
-        title: "Eliminar publicación e ignorar"
-        description: "Eliminar publicación; si es la primera del tema, eliminar el tema también."
+        title: "Ignorar la denuncia y eliminar la publicación"
+        description: "Ignorar la denuncia quitándola de la cola y eliminar la publicación; si es la primera publicación, eliminar también el tema. "
       delete_and_ignore_replies:
-        title: "Eliminar publicación + respuestas e ignorar"
-        description: "Eliminar publicación y todas sus respuestas; si es la primera publicación de un tema, eliminarlo también"
+        title: "Ignorar la denuncia, eliminar la publicación y las respuestas"
+        description: "Ignorar la denuncia quitándola de la cola, eliminar la publicación y todas sus respuestas; si es la primera publicación, eliminar también el tema"
         confirm: "¿Seguro que quieres eliminar las respuestas de la publicación también?"
       delete_and_agree:
-        title: "Eliminar publicación y coincidir"
-        description: "Eliminar publicación; si es la primera del tema, eliminar el tema también."
+        title: "Eliminar publicación"
+        description: "Aceptar la denuncia y eliminar esta publicación; si es la primera publicación, eliminar también el tema."
       delete_and_agree_replies:
-        title: "Eliminar publicación + respuestas y coincidir"
-        description: "Eliminar publicación y todas sus respuestas; si es la primera publicación de un tema, eliminarlo también"
+        title: "Eliminar publicación y respuestas"
+        description: "Aceptar la denuncia y eliminar esta publicación y todas sus respuestas; si es la primera publicación, eliminar también el tema."
         confirm: "¿Seguro que quieres eliminar las respuestas de la publicación también?"
       disagree_and_restore:
-        title: "Discrepar y restaurar publicación"
+        title: "No, restaurar publicación"
         description: "Restaurar la publicación para que los usuarios puedan verla."
       disagree:
-        title: "Discrepar"
+        title: "No"
       ignore:
         title: "Ignorar"
+      ignore_and_do_nothing:
+        title: "No hacer nada"
+        description: "Ignorar la denuncia quitándola de la cola sin realizar ninguna acción. Las publicaciones ocultas permanecerán ocultas y las gestionarán las herramientas automáticas."
       approve:
         title: "Aprobar"
       approve_post:
@@ -4774,6 +4809,11 @@ es:
     payload_url:
       blocked_or_internal: "No se puede usar la URL de carga porque se convierte en una IP interna o bloqueada"
       unsafe: "No se puede usar la URL de carga porque no es segura"
+  form_templates:
+    errors:
+      invalid_yaml: "no es una cadena YAML válida"
+      invalid_type: "contiene un tipo de plantilla no válido: %{type} (los tipos válidos son: %{valid_types})"
+      missing_type: "falta un tipo de campo"
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.et.yml b/config/locales/server.et.yml
index 3e79a6854c5..f060ac836dd 100644
--- a/config/locales/server.et.yml
+++ b/config/locales/server.et.yml
@@ -282,21 +282,6 @@ et:
   meta_category_description: "Arutelu selle saidi, tema korralduse, töömeetodite ja arenguvõimaluste kohta."
   staff_category_name: "Meeskond"
   staff_category_description: "Privaatfoorum meeskonnasisesteks aruteludeks. Teemad on nähtavad vaid adminnidele ja moderaatoritele."
-  discourse_welcome_topic:
-    body: |2
-
-      Selle märgistatud teema esimene lõik saab olema kõikidele uutele külastajatele nähtav kui tervitustekst sinu avalehel. See on oluline!
-
-      **Muuda see** enda kommuuni lühitutvustuseks:
-
-      - Kellele see on?
-      - Mida siit leiab?
-      - Miks peaks keegi siia tulema?
-      - Kust saab rohkem infot (lingid, ressursid jne)?
-
-      <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
-
-      Ilmselt peaksid sa selle teema administreerimise alt sulgema :wrench: (üleval paremal ja allääres), et teadandele vastuseid ei kuhjuks.
   category:
     topic_prefix: "Liigist %{category}"
     post_template: "%{replace_paragraph}\n\nKasuta järgnevaid lõikusid pikema kirjelduse jaoks või foorumi juhendi või reeglite jaoks:\n\n- Miks peaksid inimesed seda foorumit kasutama? Mille jaoks see on?\n\n- Mille poolest erineb see meie teistest foorumitest?\n\n- Mis infot peaksid selle foorumi teemad sisaldama?\n\n- Kas meil on seda foorumit vaja? Kas me saame seda foorumit ühendada teise foorumiga või alamfoorumiga?\n"
@@ -802,8 +787,6 @@ et:
   user_notifications:
     previous_discussion: "Varasemad vastused"
     in_reply_to: "Vastuseks"
-    unsubscribe:
-      title: "Tühista tellimus"
     user_replied:
       subject_template: "[%{email_prefix}] %{topic_title}"
     user_quoted:
@@ -831,7 +814,6 @@ et:
       liked_received: "Meeldimisi saadud"
       new_users: "Uued kasutajad"
       popular_topics: "Populaarsed teemad"
-      follow_topic: "Jälgi seda teemat"
       join_the_discussion: "Loe lisa"
       popular_posts: "Populaarsed postitused"
       more_new: "Uus sinu jaoks"
@@ -853,8 +835,6 @@ et:
     see_more: "Veel"
     search_title: "Otsi sellelt saidilt"
     search_button: "Otsi"
-  deleted: "kustutatud"
-  image: "pilt"
   upload:
     unauthorized: "Vabandust, fail mida püüad üles laadida, ei ole lubatud (lubatud faililaiendid: %{authorized_extensions})."
     pasted_image_filename: "Asetatud pilt"
@@ -1012,8 +992,6 @@ et:
       title: "Saada aktiveerimismeil uuesti"
   safe_mode:
     title: "Sisene turvalisse režiimi"
-    no_unofficial_plugins: "Keela kõik mitteametlikud pluginad"
-    no_plugins: "Keela kõik pluginad"
     enter: "Sisene turvalisse režiimi"
   wizard:
     title: "Discourse sätted"
@@ -1050,7 +1028,6 @@ et:
         title: "Kutsu meeskonda"
       finished:
         title: "Sinu Discourse on valmis!"
-  joined: "Liitus"
   discourse_push_notifications:
     popup:
       mentioned: '%{username} mainis Sind teemas "%{topic}" - %{site_title}'
@@ -1071,18 +1048,16 @@ et:
       medium: "Keskmine"
       high: "Kõrge"
     actions:
-      agree_and_suspend:
-        title: "Peata kasutaja"
-      agree_and_silence:
-        title: "Vaigista kasutaja"
-      agree_and_hide:
-        title: "Peida postitus"
+      agree:
+        title: "Jah"
       delete_single:
         title: "Kustuta"
       disagree:
-        title: "Ei nõustu"
+        title: "Ei"
       ignore:
         title: "Ignoreeri"
+      ignore_and_do_nothing:
+        title: "Ära tee midagi"
       approve:
         title: "Kinnita"
       approve_user:
diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml
index 49c36752782..3acd621796d 100644
--- a/config/locales/server.fa_IR.yml
+++ b/config/locales/server.fa_IR.yml
@@ -51,6 +51,7 @@ fa_IR:
   remove_posts_deleted_by_author: "پاک شده توسط نویسنده"
   redirect_warning: "ما قادر به تایید این پیوند نمی‌باشیم. پیوند انتخابی شما قبلا به انجمن پست شده است. اگر در هر‌صورت مایل به انجام این کار هستید بر روی پیوند زیر کلیک کنید."
   on_another_topic: "در یک مبحث دیگر"
+  topic_category_changed: "از %{from} به %{to}"
   inline_oneboxer:
     topic_page_title_post_number: "#%{post_number}"
     topic_page_title_post_number_by_user: "#%{post_number} توسط %{username}"
@@ -135,7 +136,6 @@ fa_IR:
     site_settings:
       default_categories_already_selected: "شما نمیتوانید دسته‌بندی‌ای را که در یک فهرست دیگر استفاده شده را انتخاب کنید."
       s3_upload_bucket_is_required: "شما نمیتوانید بارگذاری به S3 را فعال کنید مگر اینکه 's3_upload_bucket' را ارائه دهید."
-      secure_uploads_requirements: "قبل از فعال کردن بارگذاری‌های ایمن، بارگذاری‌های S3 باید فعال شوند."
   word_connector:
     comma: "، "
   invite:
@@ -146,6 +146,7 @@ fa_IR:
     existing_user_already_redemeed: "شما قبلا این پیوند دعوتنامه را استفاده‌ کرده‌اید."
     invite_exists: "شما قبلا <b>%{email}</b> را دعوت کرده‌اید."
     invalid_email: "آدرس ایمیل %{email} معتبر نیست."
+    generic_error_response: "مشکلی در درخواست شما وجود داشت."
     disabled_errors:
       invalid_access: "شما اجازه مشاهده منبع درخواست شده را ندارید."
     max_redemptions_allowed_one: "برای دعوت‌نامه‌های ایمیل باید 1 باشد."
@@ -375,21 +376,6 @@ fa_IR:
   meta_category_description: "گفتگو در مورد سایت، این سازمان، چگونه کار می کنه٬ و چطور می‌توانیم آن را بهبود ببخشیم. "
   staff_category_name: "همکاران"
   staff_category_description: "بخش خصوصی برای گفتگوی مدیران. موضوعات فقط برای مدیران ارشد و مدیران قابل رویت است."
-  discourse_welcome_topic:
-    title: "به انجمن ما خوش آمدید!"
-    body: |2
-
-      اولین پاراگراف این موضوع سنجاق شده و به عنوان پیام خوش‌آمد گویی به تمام بازدید‌کنندگان نمایش داده می‌شود. که مهم است!
-
-      این متن را به یک توضیح مختصر درباره انجمن خود **تغییر دهید**:
-
-      - برای چه افرادی است؟
-      - چه چیزی را در اینجا پیدا می‌کنند؟
-      - چرا باید به اینجا بیایند؟
-      - چه زمانی می‌توانند بیشتر بخوانند (پیوند‌ها، منابع و...)؟
-      <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
-
-      شاید بخواهید این موضوع را از طریق مدیریت ببندید :wrench: (در قسمت بالا سمت راست و پایین)، بنابراین پاسخ‌ها در اعلان ها انباشته نمی‌شوند.
   category:
     topic_prefix: "در رابطه با دسته‌بندی %{category}"
     post_template: "%{replace_paragraph}\n\nپاراگراف‌های زیر را برای توضیحات طولانی تر استفاده کنید، یا برای ایجاد راهنمای دسته‌بندی یا قوانین:\n\nچرا مردم باید این دسته‌بندی را استفاده کنند؟ برای چه منظوری است؟\n\nاین دسته‌بندی چقدر با دسته‌بندی‌های موجود تفاوت دارد؟\n\nموضوعات این دسته‌بندی باید شامل چه مواردی باشند؟\n\nآیا به این دسته‌بندی نیاز داریم؟ آیا می‌توانیم این دسته‌بندی را با یک دسته‌بندی یا زیر‌دسته‌بندی دیگر ادغام کنیم؟\n"
@@ -971,6 +957,7 @@ fa_IR:
     prioritize_username_in_ux: "نام کاربری را در ابتدا در صفحه‌ی کاربر، کارت کاربر یا نوشته‌هایش نمایش بده(وقتی غیر‌فعال باشد نام در ابتدا نمایش داده می‌شود)"
     email_token_valid_hours: "رمز عبور فراموش شده/ حساب کاربری فعال تا (n) ساعت اعتبار دارد."
     enable_badges: "فعال سازی سیستم نشان‌دهی"
+    hidden_post_visible_groups: "به کاربرانی که در این گروه‌ها هستند اجازه دهید که نوشته‌های پنهان شده را مشاهد کنند. کاربرانی که به عنوان مدیر هستند همیشه می‌توانند نوشته‌های پنهان را مشاهده کنند."
     log_out_strict: "وقتی از سیستم خارج می شود، کاربر را از تمام session‌ها بر روی تمام دستگاه‌ها خارج کن "
     new_version_emails: "ارسال ایمیل به contact_email address وقتی نسخه جدید Discourse موجود است. "
     invite_expiry_days: "کلید دعوتنامه فراخوان برای چه مدت اعتبار دارد، واحد روز"
@@ -1164,6 +1151,7 @@ fa_IR:
     enable_user_directory: "شاخه کاربری را برای مرور ارائه کن"
     enable_group_directory: "یک فهرست راهنما برای گروه‌ها فراهم کنید"
     allow_anonymous_posting: "به کاربر اجازه بده که به حالت ناشناس بروند"
+    allow_anonymous_likes: "به کاربران ناشناس اجازه دهید نوشته‌ها را بپسندند"
     anonymous_posting_min_trust_level: "حداقل سطح اعتماد برای فعال‌سازی نوشته گذاشتن در حالت ناشناس"
     anonymous_account_duration_minutes: "برای محافظت از ناشناس ماندن هر N دقیقه برای هر کاربر یک حساب‌کاربری ناشناس بساز. برای مثال: اگر به 600 تنظیم شد٬‌ به محض اینکه 600 دقیقه از نوشته گذشت و کاربر سوئیچ شد چند لحظه بعد٬‌ حساب کاربری جدید ناشناس ساخته می شود. "
     hide_user_profiles_from_public: "غیر‌فعال‌سازی کارت کاربری، پروفایل کاربر و فهرست راهنمای کاربر برای کاربران ناشناس."
@@ -1177,11 +1165,9 @@ fa_IR:
     suppress_uncategorized_badge: "نشان برای موضوعات دسته‌بندی نشده را در فهرست موضوعات را نشان نده. "
     permalink_normalizations: "اعمال Regex زیر قبل از تطابق پیوند یکتا، برای مثال /(topic.*)\\?.*/\\1 نوار query string را از پیوند موضوع جدا می‌کند. فرمت regex+string از \\1 استفاده می‌کند. برای دسترسی به تصویر‌برداری."
     disable_system_edit_notifications: "ویرایش اعلان‌ها را از طریق کاربر سیستم کار بینداز وقتی 'download_remote_images_to_local' فعال است "
-    disable_tags_edit_notifications: "ویرایش برچسب‌های آگاه‌سازی مربوط به این موضوعات غیرفعال شود."
     automatically_unpin_topics: "وقتی کاربر به پایین صفحه می‌رسد سنجاق موضوع‌ها به‌صورت خودکار برداشته شود."
     read_time_word_count: "تعداد کلمه در دقیقه برای محاسبه تخمین زمان خواندن."
     share_anonymized_statistics: "اشتراک‌گذاری آمار استفاده ناشناس"
-    max_prints_per_hour_per_user: "حداکثر تعداد برداشت /print صفحه (0 برای غیرفعال)"
     full_name_required: "نام و نام خانوادگی برای کامل کردن نمایه کاربر مورد نیاز است."
     enable_names: "نام و نام‌خانوادگی کاربران را در نمایه، کارت کاربری و ایمیل‌هایشان نمایش بده. قابلیت پنهان کردن نام کامل را در هرجایی غیرفعال کن."
     display_name_on_posts: "نام و نام‌خانوادگی کاربران را در نوشته نشان بده به‌علاوه‌ی @نام‌کاربری."
@@ -1193,9 +1179,7 @@ fa_IR:
     allowed_href_schemes: "طرح‌ها در لینک‌های http و https مجازند"
     embed_post_limit: "حداکثر تعداد نوشته‌هایی که می‌توانید جا‌سازی کنید. "
     embed_username_required: "نام‌کاربری برای ایجاد تاپیک مورد نیاز است."
-    show_create_topics_notice: "اگر سایت کمتر از 5 موضوع عمومی دارد٬ مدیران اطلاع بده تا موضوعات بیشتری بسازند."
     delete_drafts_older_than_n_days: "پیش‌نویس‌های قدیمی‌تر از (n) روز را حذف کن"
-    bootstrap_mode_min_users: "حداقل تعداد کاربرانی که نیاز است تا حالت خود‌راه‌انداز غیر‌فعال شود (0 برای غیر‌فعال)"
     slug_generation_method: "یک روش ایجاد نام یکتا انتخاب کنید. 'encoded' رشته‌ای شامل درصد ایجاد می‌کند. 'none' اسم یکتا را به صورت کلی غیر‌فعال می‌نماید."
     enable_emoji: "فعالسازی شکلک"
     emoji_set: "می‌خواهید شکلک شما چطور باشد؟"
@@ -1225,7 +1209,6 @@ fa_IR:
     default_categories_watching_first_post: "لیست دسته‌بندی‌هایی که نوشته‌هایشان در هر موضوع به صورت پیشفرض تحت نظر هستند."
     allow_user_api_keys: "اجازه‌ی ساخت کلید‌های API"
     allow_user_api_key_scopes: "لیست حوزه‌های مجاز برای کلید‌های API کاربری"
-    min_trust_level_for_user_api_key: "سطح اعتماد مورد نیاز برای ایجاد کلید API کاربر"
     allowed_user_api_push_urls: "لینک‌های مجاز برای سرور و ارسال به API کاربری"
     tagging_enabled: "فعالسازی برچسب در موضوعات؟"
     min_trust_to_create_tag: "حداقل سطح اعتماد مورد نیاز برای ایجاد برچسب."
@@ -1261,7 +1244,6 @@ fa_IR:
       pop3_polling_password_is_empty: "حداقل باید یک 'رمز‌عبور رای‌گیری pop3' قبل از فعالسازی رای‌گیری POP3 تنظیم کرده باشید."
       pop3_polling_authentication_failed: "اعتبار سنجی به POP3 ناموفق بود. لطفا اطلاعا ورود را بررسی نمایید."
       reply_by_email_address_is_empty: "باید یک 'آدرس پاسخ با ایمیل' قبل از فعالسازی پاسخ با ایمیل تنظیم کنید."
-      email_polling_disabled: "باید حالت دستی یا رای‌گیری POP3 را قبل از فعالسازی پاسخ با ایمیل، فعال کنید."
       user_locale_not_enabled: "قبل از فعالسازی این قسمت، ابتدا باید 'اجازه انتخاب زبان' را به کاربر بدهید."
       invalid_regex: "الگوی regex نامعتبر یا غیر‌مجاز است."
       min_username_length_range: "شما نمیتوانید مقدار حداقل را بیشتر از حداکثر قرار دهید."
@@ -1398,7 +1380,6 @@ fa_IR:
     deactivated_by_staff: "غیر‌فعال شده توسط کارمندان"
     activated_by_staff: "فعال شده توسط کارمندان"
     new_user_typed_too_fast: "کاربر جدید خیلی سریع تایپ کرده"
-    content_matches_auto_block_regex: "محتوا با الگوی regex بستن خودکار هماهنگ است"
     username:
       short: "نباید کمتر از %{min} نویسه باشد"
       long: "نباید بیشتر از %{max} نویسه باشد"
@@ -1670,8 +1651,6 @@ fa_IR:
       title: "دانلود تصاویر خارجی غیر‌فعال شد"
       subject_template: "دانلود کردن عکس‌های خارجی از کار افتاده"
       text_body_template: " تنظیمات `download_remote_images_to_local` غیرفعال شده زیرا به محدودیت فضای دیسک در `download_remote_images_threshold` رسیده شده است. "
-    dashboard_problems:
-      title: "مشکلات داشبورد"
     new_user_of_the_month:
       title: "شما کاربر جدید ماه هستید!"
       subject_template: "شما کاربر جدید ماه هستید!"
@@ -1697,9 +1676,6 @@ fa_IR:
       one: "توجه کنید: ما حداکثر %{count} ایمیل در روز ارسال می‌کنیم. برای دیدن موارد ارسال نشده سایت را بررسی کنید. پ.ن: از شما برای محبوب بودنتان تشکر می‌کنیم!"
       other: "توجه کنید: ما حداکثر %{count} ایمیل در روز ارسال می‌کنیم. برای دیدن موارد ارسال نشده سایت را بررسی کنید. پ.ن: از شما برای محبوب بودنتان تشکر می‌کنیم!"
     in_reply_to: "در پاسخ به"
-    unsubscribe:
-      title: "لغو اشتراک"
-      description: "آیا تمایلی به دریافت این ایمیل‌ها ندارید؟ مشکلی نیست! اینجا را کلیک کنید تا اشتراک آن هم‌اکنون حذف شود."
     reply_by_email: "[نمایش موضوع](%{base_url}%{url}) یا پاسخ با ارسال ایمیل."
     only_reply_by_email: "برای پاسخدهی، به این ایمیل پاسخ دهید."
     visit_link_to_respond: "[موضوع را](%{base_url}%{url}) برای ارسال پاسخ ببینید."
@@ -1904,7 +1880,6 @@ fa_IR:
       liked_received: "پسند‌های دریافت شده"
       new_users: "کاربر جدید"
       popular_topics: "موضوعات محبوب"
-      follow_topic: "دنبال کردن موضوع"
       join_the_discussion: "بیشتر بخوانید"
       popular_posts: "نوشته‌های محبوب"
       more_new: "جدید برای شما"
@@ -2000,12 +1975,6 @@ fa_IR:
     see_more: "بیشتر"
     search_title: "جستجو در سایت"
     search_button: "جستجو"
-  login_required:
-    welcome_message: |
-      ## [خوش آمدید به %{title}](#welcome)
-      داشتن حساب کاربری الزامی است. لطفا یک حساب کاربری بسازید یا وارد شوید.
-  deleted: "حذف شد"
-  image: "تصویر"
   upload:
     edit_reason: "کپی عکس‌های محلی دانلود شد"
     unauthorized: "متأسفم، پرونده‌ای که می‌خواهید بارگذاری کنید معتبر نیست ( پسوندهای معتبر عبارتند از: {authorized_extensions}% )."
@@ -2258,10 +2227,7 @@ fa_IR:
       message: "<p>ایمیل فعال‌سازی به <b>%{email}</b> ارسال شد."
   safe_mode:
     title: "ورود به حالت امن"
-    description: "حالت ایمن به شما این امکان را می‌دهد، که سایت خود را بدون بارگیری افزونه‌ها یا پوسته‌ها آزمایش کنید."
     no_themes: "غیرفعال کردن پوسته‌ها و اجزای پوسته"
-    no_unofficial_plugins: "غیر‌فعال‌سازی افزونه‌های غیر رسمی"
-    no_plugins: "غیر‌فعال‌سازی تمام افزونه‌ها"
     enter: "فعال‌سازی حالت امن"
   wizard:
     title: "راه اندازی Discourse"
@@ -2328,7 +2294,9 @@ fa_IR:
         title: "دعوت همکاران"
       finished:
         title: "Discourse شما آماده‌ست!"
-  joined: "ملحق شده"
+  onebox:
+    discourse:
+      user_joined_community: "در %{date} عضو شدن"
   discourse_push_notifications:
     popup:
       mentioned: '%{username} در "%{topic}" - %{site_title} به شما اشاره کرد'
@@ -2354,12 +2322,18 @@ fa_IR:
       medium: "متوسط"
       high: "بالا"
     actions:
+      agree:
+        title: "بله"
       agree_and_suspend:
         title: "کاربر تعلیق شده"
+      agree_and_restore:
+        title: "بازیابی نوشته"
       delete_single:
         title: "حذف"
+      delete_and_agree:
+        title: "حذف نوشته"
       disagree:
-        title: "مخالف"
+        title: "خیر"
       ignore:
         title: "چشم پوشی"
       approve:
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index 492d1aefbbf..cfff70cdbdf 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -52,6 +52,11 @@ fi:
   remove_posts_deleted_by_author: "Kirjoittajan poistama"
   redirect_warning: "Emme pystyneet varmistamaan, että klikkaamasi linkki on oikeasti lähetetty foorumille. Jos haluat silti jatkaa, klikkaa alla olevaa linkkiä."
   on_another_topic: "Toisessa ketjussa"
+  topic_category_changed: "Alueelta %{from} alueelle %{to}"
+  topic_tag_changed:
+    added_and_removed: "Lisättiin %{added} ja poistettiin %{removed}"
+    added: "Lisättiin %{added}"
+    removed: "Poistettu tunniste %{removed}"
   inline_oneboxer:
     topic_page_title_post_number: "%{post_number}"
     topic_page_title_post_number_by_user: "#%{post_number} käyttäjältä %{username}"
@@ -191,8 +196,8 @@ fi:
       invalid_site_setting: "Asetusta nimeltä \"%{name}\" ei ole olemassa"
       invalid_category_id: "Määritit alueen, jota ei ole olemassa"
       invalid_choice:
-        one: "Määrittämäsi valinta ei kelpaa %{name}"
-        other: "Määrittämäsi valinnat eivät kelpaa %{name}"
+        one: "'%{name}' on virheellinen valinta."
+        other: "'%{name}' ovat virheellisiä valintoja."
       default_categories_already_selected: "Et voi valita aluetta, joka on käytössä toisella listalla."
       default_tags_already_selected: "Et voi valita tunnistetta, joka on käytössä toisella listalla."
       s3_upload_bucket_is_required: "Et voi ottaa latauksia S3:een käyttöön, ellet ole määrittänyt 's3_upload_bucket'-määritettä."
@@ -200,7 +205,6 @@ fi:
       page_publishing_requirements: "Sivun julkaisua ei voida ottaa käyttöön, jos suojattu media on käytössä."
       s3_backup_requires_s3_settings: "Et voi käyttää S3:a varmuuskopiosijaintina, ellei %{setting_name} ei ole määritetty."
       s3_bucket_reused: "Sama säiliö ei voi olla sekä 's3_upload_bucket' että 's3_backup_bucket'. Valitse eri säiliö tai määritä eri polku jokaiselle säiliölle."
-      secure_uploads_requirements: "S3-lataukset täytyy ottaa käyttöön ennen suojattujen latausten käyttöönottoa."
       share_quote_facebook_requirements: "Facebook-sovellustunnus on määritettävä, jotta lainausten jakaminen Facebookiin on mahdollista."
       second_factor_cannot_enforce_with_socials: "Et voi pakottaa 2FA-asetusta käyttöön, kun yhteisökirjautuminen on aktiivisena. Poista yhteisökirjautuminen käytöstä täällä: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Et voi pakottaa kaksivaiheista tunnistusta, jos paikallinen kirjautuminen on pois käytöstä."
@@ -502,6 +506,7 @@ fi:
       On helpompaa lukea ketjua, jossa on vähemmän pidempiä vastauksia kuin sellaista, jossa on paljon lyhyitä yksittäisiä vastauksia.
     dominating_topic: Olet kirjoittanut paljon tähän ketjuun! Voisit antaa muille mahdollisuuden vastata täällä ja keskustella asioista myös keskenään.
     get_a_room: Olet vastannut käyttäjälle @%{reply_username} %{count} kertaa, tiesitkö, että voit lähettää hänelle yksityisviestin?
+    dont_feed_the_trolls: Tästä viestistä on jo ilmoitettu ylläpidolle. Haluatko varmasti vastata siihen? Vastaukset negatiiviseen sisältöön rohkaisevat negatiivisempaan käyttäytymiseen.
     too_many_replies: |
       ### Olet kirjoittanut enimmäismäärän vastauksia tähän ketjuun
 
@@ -588,10 +593,6 @@ fi:
             duration_minutes:
               cannot_be_zero: "täytyy olla suurempi kuin 0."
               exceeds_maximum: "voi olla enintään 20 vuotta."
-        translation_overrides:
-          attributes:
-            value:
-              invalid_interpolation_keys: 'Nämä interpolaatioavaimet eivät kelpaa: "%{keys}"'
         watched_word:
           attributes:
             word:
@@ -612,22 +613,7 @@ fi:
   staff_category_name: "Henkilökunta"
   staff_category_description: "Yksityinen alue henkilökunnan keskusteluille. Ketjut näkyvät ainoastaan ylläpitäjille ja valvojille."
   discourse_welcome_topic:
-    title: "Tervetuloa yhteisöömme!"
-    body: |2
-
-      Tämän kiinnitetyn ketjun ensimmäinen kappale on sivustolla vierailevalle näkyvä tervetulotoivotus. Se on tärkeä!
-
-      **Muokkaa tästä** tiivis kuvaus yhteisöstäsi:
-
-      – Kenelle se on suunnattu?
-      – Mistä täällä keskustellaan?
-      – Miksi heidän kannattaa käydä täällä?
-      – Mistä he löytävät lisätietoa (linkkejä, ohjeita jne.)?
-
-      <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
-
-      Saattaa olla hyvä sulkea tämä ketju ylläpitäjän :wrench: -valikon kautta (oikealla ylhäällä sekä sivun alaosassa), jottei vastauksia kasaannu ilmoituksen alle.
-  admin_quick_start_title: "LUE ENSIN: Ylläpitäjän pika-aloitusopas"
+    title: "Tervetuloa sivustolle %{site_title}! :wave:"
   category:
     topic_prefix: "Tietoa alueesta %{category}"
     replace_paragraph: "(Korvaa tämä kappale lyhyellä kuvauksella uudesta alueesta. Tämä kuvaus näytetään alueen valinnan yhteydessä, joten yritä pitää se alle 200 merkin pituisena.)"
@@ -1109,7 +1095,7 @@ fi:
       title: "PAK/KAK"
       xaxis: "Päivä"
       yaxis: "PAK/KAK"
-      description: "Käyttäjät, jotka kirjautuivat sisään viimeisen päivän aikana, jaettuna käyttäjillä, jotka kirjautuivat sisään viimeisen kuukauden aikana – tuottaa prosenttiarvon, joka ilmaisee yhteisön sitoutuneisuutta. Tähtää yli 30 prosenttiin."
+      description: "Käyttäjät, jotka kirjautuivat sisään viimeisen päivän aikana, jaettuna käyttäjillä, jotka kirjautuivat sisään viimeisen kuukauden aikana – tuottaa prosenttiarvon, joka ilmaisee yhteisön sitoutuneisuutta. Tähtää yli 20 prosenttiin."
     daily_engaged_users:
       title: "Sitoutuneet päivittäiskäyttäjät"
       xaxis: "Päivä"
@@ -1378,6 +1364,7 @@ fi:
     image_magick_warning: 'Palvelin on konfiguroitu luomaan esikatselukuvia suurista kuvista, mutta ImageMagickia ei ole asennettu. Asenna ImageMagick paketinhallinnasta tai <a href="https://www.imagemagick.org/script/download.php" target="_blank">lataa uusin versio</a>.'
     failing_emails_warning: '%{num_failed_jobs} sähköpostitehtävää on epäonnistunut. Tarkista app.yml ja varmista, että sähköpostipalvelimen asetukset ovat kunnossa. <a href="%{base_path}/sidekiq/retries" target="_blank">Katsele epäonnistuneita tehtäviä Sidekiqissa</a>.'
     subfolder_ends_in_slash: "Alihakemiston asetuksesi ei kelpaa; DISCOURSE_RELATIVE_URL_ROOT päättyy vinoviivaan."
+    outdated_translations_warning: "Jotkin käännösohituksistasi ovat vanhentuneet. Tarkista <a href='%{base_path}/admin/customize/site_texts?outdated=true'>tekstimukautuksesi</a>."
     email_polling_errored_recently:
       one: "Sähköpostin pollaus on aiheuttanut virheen edellisten 24 tunnin aikana. Tarkastele <a href='%{base_path}/logs' target='_blank'>lokeja</a> saadaksesi lisätietoja."
       other: "Sähköpostin pollaus aiheutti %{count} virhettä edellisten 24 tunnin aikana. Tarkastele <a href='%{base_path}/logs' target='_blank'>lokeja</a> saadaksesi lisätietoja."
@@ -1456,6 +1443,7 @@ fi:
     exclude_rel_nofollow_domains: "Luettelo verkkotunnuksista, joihin osoittaviin linkkeihin nofollow'ta ei lisätä. Esimerkki.fi sallii automaattisesti myös verkkotunnuksen sub.esimerkki.fi. Sinun tulisi vähintäänkin lisätä tämän sivuston verkkotunnus, jotta hakurobotit löytävät kaiken sisällön. Jos sivustosi muita osia on toisen verkkotunnuksen alaisuudessa, lisää nekin."
     post_excerpt_maxlength: "Viestin katkelman tai yhteenvedon merkkien maksimimäärä."
     topic_excerpt_maxlength: "Ketjun katkelman tai yhteenvedon enimmäispituus, luodaan ketjun ensimmäisestä viestistä."
+    default_subcategory_on_read_only_category: "Ottaa käyttöön \"Uusi aihe\" -painikkeen ja valitsee oletusarvoisen alikategorian, jota käytetään julkaisuun kategorioissa, joissa käyttäjä ei saa luoda uutta aihetta."
     show_pinned_excerpt_mobile: "Näytä katkelma kiinnitetyistä ketjuista mobiilinäkymässä."
     show_pinned_excerpt_desktop: "Näytä katkelma kiinnitetyistä ketjuista työpöytänäkymässä."
     post_onebox_maxlength: "Discourse-viestin Onebox-esikatselun merkkien maksimimäärä."
@@ -1477,7 +1465,6 @@ fi:
     manifest_icon: "Kuva, jota käytetään logo-/splash-kuvana Androidissa. Skaalataan automaattisesti kokoon 512×512. Jos jätetty tyhjäksi, large_icon-kuvaa käytetään."
     manifest_screenshots: "Näyttökuvat, jotka esittelevät esiintymäsi ominaisuuksia ja toimintoja sen asennuskehotussivulla. Kaikkien kuvien täytyy olla paikallisia ja samankokoisia."
     favicon: "Sivuston favicon, ks. <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://en.wikipedia.org/wiki/Favicon</a>. Täytyy olla png, jotta toimii CDN:n kanssa. Skaalataan kokoon 32x32. Jos jätetty tyhjäksi, large_icon-kuvaketta käytetään."
-    apple_touch_icon: "Applen kosketuslaitteissa käytettävä kuvake. Skaalataan automaattisesti kokoon 180x180. Jos jätetään tyhjäksi, large_icon-kuvaketta käytetään."
     opengraph_image: "Oletuksena käytettävä opengraph-kuva, käytetään, kun sivulla ei ole muita sopivia kuvia. Jos jätetty tyhjäksi, large_icon-kuvaa käytetään"
     twitter_summary_large_image: "Twitter-kortin \"summary large image\" (leveys vähintään 280 ja korkeus vähintään 150, ei voi olla .svg). Jos jätetty tyhjäksi, tavallisen kortin metatiedot luodaan käyttämällä opengraph_image-kuvaa, kunhan se ei ole myös .svg."
     notification_email: "Sähköpostiosoite, josta kaikki tärkeät järjestelmän lähettämät sähköpostiviestit lähetetään. Tässä määritetyn verkkotunnuksen SPF, DKIM ja käänteiset PTR-tietueet täytyy olla asetettu oikein, jotta sähköpostit menevät perille."
@@ -1585,6 +1572,7 @@ fi:
     enable_badges: "Ota kunniamerkkijärjestelmä käyttöön"
     max_favorite_badges: "Enimmäismäärä kunniamerkkejä, jonka käyttäjä voi valita"
     whispers_allowed_groups: "Salli tiettyjen ryhmien jäsenten yksityinen viestintä ketjuissa."
+    hidden_post_visible_groups: "Salli näiden ryhmien jäsenten tarkastella piilotettuja viestejä. Ylläpidon jäsenet voivat aina tarkastella piilotettuja viestejä."
     allow_index_in_robots_txt: "Määritä robots.txt-tiedostossa, että hakurobotit saavat indeksoida tätä sivustoa. Poikkeuksellisissa tapauksissa voit <a href='%{base_path}/admin/customize/robots'>ohittaa robots.txt:n</a> pysyvästi."
     normalize_emails: "Tarkista, onko normalisoitu sähköpostiosoite yksilöllinen. Normalisoitu sähköpostiosoite poistaa kaikki pisteet käyttäjätunnuksesta ja kaiken +- ja @-symbolien väliltä."
     hide_email_address_taken: "Älä ilmoita käyttäjille rekisteröitymisen tai unohtuneen salasanan palautuksen aikana, että annetulla sähköpostiosoitteella on olemassa tili. Vaadi täydellinen sähköpostiosoite unohtuneen salasanan pyynnöissä."
@@ -1608,7 +1596,6 @@ fi:
     enable_discourse_connect: "Ota käyttöön kirjautuminen DiscourseConnectin (aikaisemmin \"Discourse SSO\") kautta (VAROITUS: KÄYTTÄJIEN SÄHKÖPOSTIEN OSOITTEET *ON TARKISTETTAVA* ULKOISELLA SIVUSTOLLA!)"
     verbose_discourse_connect_logging: "Kirjaa yksityiskohtaiset DiscourseConnect-diagnostiikat lokiin <a href='%{base_path}/logs' target='_blank'>/logs</a>"
     enable_discourse_connect_provider: "Käytä DiscourseConnectin (aikaisemmin '\"Discourse SSO\") palveluntarjoajaprotokollaa /session/sso_provider-päätepisteessä, edellyttää discourse_connect_provider_secretsin asettamista"
-    discourse_connect_url: "DiscourseConnectin päätepisteen URL (täytyy sisältää http:// tai https://)"
     discourse_connect_secret: "Salausavain, jolla todennetaan DiscourseConnectin tiedot, varmista, että se on vähintään 10 merkkiä pitkä"
     discourse_connect_provider_secrets: "Luettelo verkkotunnus-salausavain-pareista, jotka käyttävät DiscourseConnectia. Varmista, että DiscourseConnectin salausavain on vähintään 10 merkin pituinen. Jokerimerkkiä * voi käyttää kelpuuttamaan mikä tahansa verkkotunnus tai verkkotunnuksen osa (esim. *.esimerkki.fi)."
     discourse_connect_overrides_bio: "Syrjäyttää käyttäjän kuvauksen itsestään käyttäjäprofiilissa ja estää sen muokkaamisen"
@@ -1622,7 +1609,6 @@ fi:
     discourse_connect_overrides_profile_background: "Korvaa käyttäjän profiilin taustakuvan arvolla DiscourseConnectin tiedoista."
     discourse_connect_overrides_card_background: "Korvaa käyttäjän kortin taustakuvan arvolla DiscourseConnectin tiedoista."
     discourse_connect_not_approved_url: "Uudelleenohjaa hyväksymättömät DiscourseConnect-tilit tähän URL-osoitteeseen"
-    discourse_connect_allows_all_return_paths: "Älä rajoita DiscourseConnectin antamien palautuspolkujen verkkotunnusta (oletuksena palautuspolun on oltava nykyisellä sivustolla)"
     enable_local_logins: "Salli kirjautuminen paikallisesti käyttäjätunnuksen ja salasanan avulla. VAROITUS: jos tämä ei ole käytössä, voi sinun olla mahdotonta kirjautua sisään, jollet ole aiemmin määritellyt ainakin yhtä muuta kirjautumistapaa."
     enable_local_logins_via_email: "Salli käyttäjän pyytää klikattava kirjautumislinkki, joka lähetetään hänen sähköpostiinsa."
     allow_new_registrations: "Salli uusien käyttäjien rekisteröityminen. Poista tämä asetus käytöstä estääksesi uusien tilien luomisen."
@@ -1707,6 +1693,7 @@ fi:
     s3_secret_access_key: "Amazon S3:n secret access key, jota käytetään ladattaessa kuvia, liitteitä ja varmuuskopioita."
     s3_region: "Amazon S3:n alueen nimi, jota käytetään ladattaessa kuvia ja varmuuskopioita."
     s3_cdn_url: "CDN:n URL, jota käytetään S3:ssa sijaitseville tiedostoille (esimerkiksi https://cdn.jossain.com). VAROITUS: tämän asetuksen muuttamisen jälkeen sinun täytyy rakentaa uudelleen kaikki vanhat viestit."
+    s3_use_cdn_url_for_all_uploads: "Käytä sisällynjakeluverkon URL-osoitetta kaikille s3:een ladatuille tiedostoille, eikä vain kuvatiedostoille."
     avatar_sizes: "Avatareista automaattisesti luotavat koot."
     external_system_avatars_enabled: "Käytä ulkopuolista avatarpalvelua."
     external_system_avatars_url: "Ulkoisen avatarpalvelun URL. Sallitut vaihdokset ovat {username} {first_letter} {color} {size}"
@@ -1726,7 +1713,6 @@ fi:
     composer_media_optimization_image_bytes_optimization_threshold: "Kuvatiedoston vähimmäiskoko, joka laukaisee optimoinnin asiakkaan päässä"
     composer_media_optimization_image_resize_dimensions_threshold: "Kuvan vähimmäisleveys, joka laukaisee koon muuttamisen asiakkaan päässä"
     composer_media_optimization_image_resize_width_target: "Kuvat, joiden leveys on suurempi kuin \"composer_media_optimization_image_dimensions_resize_threshold\", muunnetaan tähän leveyteen. Täytyy olla suurempi tai yhtä suuri kuin \"composer_media_optimization_image_dimensions_resize_threshold\"."
-    composer_media_optimization_image_encode_quality: "Uudelleenkoodausprosessissa käytetty JPEG-koodauslaatu."
     min_ratio_to_crop: "Suhde, jolla korkeat kuvat rajataan. Syötä tulos leveys/korkeus-suhteena."
     simultaneous_uploads: "Kuinka monta tiedostoa voi enintään vetää ja pudottaa viestieditoriin"
     default_invitee_trust_level: "Oletusluottamustaso (0–4) kutsutuille käyttäjille."
@@ -1755,7 +1741,8 @@ fi:
     tl3_requires_likes_given: "Montako tykkäystä käyttäjän täytyy olla vähintään antanut viimeisten (tl3 time period) päivän aikana voidakseen saavuttaa luottamustason 3."
     tl3_requires_likes_received: "Montako tykkäystä käyttäjän täytyy olla vähintään saanut viimeisten (tl3 time period) päivän aikana voidakseen saavuttaa luottamustason 3."
     tl3_links_no_follow: "Älä poista rel=nofollow-määritettä linkeistä luottamustason 3 käyttäjiltä."
-    trusted_users_can_edit_others: "Salli korkean luottamustason käyttäjän muokata toisten käyttäjien viestien sisältöjä"
+    edit_all_topic_groups: "Salli ryhmän käyttäjien muokata muiden käyttäjien aiheotsikoita, tunnisteita ja kategorioita"
+    edit_all_post_groups: "Salli tämän ryhmän käyttäjien muokata muiden käyttäjien julkaisuja"
     min_trust_to_create_topic: "Ketjun aloittamiseen vaadittava luottamustaso."
     allow_flagging_staff: "Jos käytössä, käyttäjät voivat merkitä henkilökunnan viestejä."
     min_trust_to_edit_wiki_post: "Wiki-viestin muokkaamiseen vaadittava luottamustaso."
@@ -1791,7 +1778,7 @@ fi:
     title_min_entropy: "Ketjun otsikossa vaadittava minimientropia (uniikkeja merkkejä, muilla kuin englannin kielen merkeillä on suurempi painotus)."
     body_min_entropy: "Ketjun leipätekstissä vaadittava minimientropia (uniikkeja merkkejä, muilla kuin englannin kielen merkeillä on suurempi painotus)."
     allow_uppercase_posts: "Salli pelkillä isoilla kirjaimilla kirjoittaminen otsikossa tai viestin leipätekstissä."
-    max_consecutive_replies: "Kuinka monta perättäistä viestiä käyttäjä voi kirjoittaa ketjuun ennen kuin häntä estetään lähettämästä uutta vastausta"
+    max_consecutive_replies: "Peräkkäisten viestien määrä, jonka käyttäjä voi julkaista ketjussa ennen kuin vastaaminen estetään. Rajoitus ei koske ketjun omistajaa, sivuston ylläpitoa tai alueen valvojia."
     enable_filtered_replies_view: '"(n) vastausta" -painike kutistaa kaikki muut viestit ja näyttää vain nykyisen viestin ja sen vastaukset.'
     title_fancy_entities: "Muunna tavalliset ASCII-merkit hienommiksi HTML-merkinnöiksi ketjujen otsikoissa SmartyPantsin avulla <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</a>"
     min_title_similar_length: "Ketjun otsikon minimipituus, kunnes sitä verrataan muihin samankaltaisiin ketjuihin."
@@ -1898,7 +1885,7 @@ fi:
     pop3_polling_password: "Sen POP3-tilin salasana, jolta pollataan sähköposteja."
     pop3_polling_delete_from_server: "Poista sähköpostit palvelimelta. HUOM: Jos poistat tämän käytöstä, sinun täytyy siivota saapuvien sähköpostien kansio manuaalisesti"
     log_mail_processing_failures: "Kirjaa kaikki sähköpostin käsittelyvirheet lokiin: <a href='%{base_path}/logs' target='_blank'>/logs</a>"
-    email_in: 'Salli käyttäjien aloittaa uusia ketjuja sähköpostitse (vaatii manuaalisen tai pop3-pollauksen). Määritä osoitteet jokaiselle alueelle erikseen niiden Asetukset-välilehdiltä. '
+    email_in: "Salli käyttäjien julkaista uusia aiheita sähköpostitse. Kun asetustus on käytössä, voidaan ryhmille ja kategorioille määrittää vastaanottoon käytettävät sähköpostiosoitteet."
     email_in_min_trust: "Vähimmäisluottamustaso, jonka käyttäjä tarvitsee uuden ketjun aloittamiseen sähköpostitse."
     email_in_authserv_id: "Saapuvien sähköpostien todennustarkistukset suorittavan palvelun tunniste. Katso ohjeet tämän määrittämiseen osoitteesta <a href='https://meta.discourse.org/t/134358'>https://meta.discourse.org/t/134358</a>."
     email_in_spam_header: "Sähköpostin otsikkotiedot roskapostin tunnistamiseksi."
@@ -1962,6 +1949,7 @@ fi:
     allow_profile_backgrounds: "Salli käyttäjien ladata profiilin taustakuva."
     sequential_replies_threshold: "Kuinka monen peräkkäisen viestin jälkeen yhdessä ketjussa käyttäjää muistutetaan liian monesta peräkkäisestä vastauksesta."
     get_a_room_threshold: "Kuinka monta viestiä tulee kohdistaa samalle käyttäjälle samassa ketjussa, jotta näytetään varoitus."
+    dont_feed_the_trolls_threshold: "Muiden käyttäjien tekemä ilmoitusmäärä, josta seuraa varoitus."
     enable_mobile_theme: "Mobiililaitteet käyttävät mobiiliystävällistä teemaa, jonka voi vaihtaa koko sivustoon. Poista asetus käytöstä, jos haluat käyttää omaa tyylitiedostoa, joka on mukautuva eri laitteille."
     dominating_topic_minimum_percent: "Kuinka monta prosenttia ketjun viesteistä käyttäjän täytyy kirjoittaa, ennen kuin häntä muistutetaan ketjun dominoinnista."
     disable_avatar_education_message: "Poista opastusviesti käytöstä, joka näytetään kun profiilikuvaa vaihdetaan."
@@ -1971,22 +1959,17 @@ fi:
     permalink_normalizations: "Sovella tätä säännöllistä lauseketta ennen pysyvien linkkien sovittamista, esim. /(topic.*)\\?.*/\\1 poistaa hakulausekkeet ketjujen reiteistä. Muoto on regex+string, \\1 jne. avulla pääset käsiksi captureihin."
     global_notice: "Näytä kaikilla sivuilla kaikille käyttäjille KIIREELLISESTÄ HÄTÄTAPAUKSESTA kertova banneri, jota ei voi piilottaa. Vaihda tyhjäksi piilottaaksesi sen (HTML sallittu)."
     disable_system_edit_notifications: "Poistaa järjestelmäkäyttäjän muokkausilmoitukset käytöstä, kun 'download_remote_images_to_local' on asetettu."
-    disable_category_edit_notifications: "Poista käytöstä alueiden muokkausilmoitukset ketjuissa."
-    disable_tags_edit_notifications: "Poista käytöstä tunnisteiden muokkausilmoitukset ketjuissa."
     notification_consolidation_threshold: "Kuinka monta tykkäys- tai jäsenhakemusilmoitusta tulee saada, jotta ne yhdistetään yhdeksi. Arvo 0 poistaa käytöstä."
     likes_notification_consolidation_window_mins: "Kesto minuutteina, jonka aikana tykkäysilmoitukset yhdistetään yhdeksi ilmoitukseksi, kun raja on saavutettu. Rajan voi määrittää asetuksella `SiteSetting.notification_consolidation_threshold`."
     automatically_unpin_topics: "Poista ketjun kiinnitys automaattisesti, kun käyttäjä on sen lopussa."
     read_time_word_count: "Sanamäärä minuutissa, jota käytetään lukuajan arviointiin."
     topic_page_title_includes_category: "Ketjusivun <a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title' target='_blank'>otsikkotunniste</a> sisältää alueen nimen."
-    native_app_install_banner_ios: "Näyttää DiscourseHub-sovelluksen bannerin iOS-laitteilla tavallisille käyttäjille (luottamustasosta 1 ylöspäin)."
-    native_app_install_banner_android: "Näyttää DiscourseHub-sovelluksen bannerin Android-laitteilla tavallisille käyttäjille (luottamustasosta 1 ylöspäin)."
     app_association_android: "<a href='%{base_path}/.well-known/assetlinks.json'>.well-known/assetlinks.json</a>-päätepisteen sisältö, käytetään Googlen Digital Asset Links APIssa."
     app_association_ios: "Contents of <a href='%{base_path}/apple-app-site-association'>apple-app-site-association</a>-päätepisteen sisältö, käytetään universaalien linkkien luomiseen tämän sivuston ja iOS-sovellusten välille."
     share_anonymized_statistics: "Julkaise yksilöimättömät käyttötilastot."
     auto_handle_queued_age: "Käsittele automaattisesti asiat, jotka ovat odottaneet käsittelyä näin monta päivää. Liput ohitetaan. Jonossa olevat viestit ja käyttäjät ohitetaan. Jos asetat 0:ksi, ominaisuus ei ole käytössä."
     penalty_step_hours: "Oletusrangaistukset käyttäjien hiljentämisestä tai hyllyttämisestä tunneissa. Ensimmäisen rikkeen oletusarvo on ensimmäinen arvo, toisen rikkeen toinen jne."
     svg_icon_subset: "Lisää ylimääräisiä FontAwesome 5 -kuvakkeita, jotka haluat sisällyttää käytettäviisi. Käytä etuliitettä \"fa-\", kun haluat täytetyn kuvakkeen, \"far-\", kun haluat tavallisen ja \"fab-\", kun haluat brändikuvakkeen."
-    max_prints_per_hour_per_user: "Tulostuspyyntöjen (/print) enimmäismäärä (aseta 0 poistaaksesi käytöstä)"
     full_name_required: "Koko nimi on käyttäjäprofiilin pakollinen kenttä."
     enable_names: "Näytä käyttäjän koko nimi profiilissa, käyttäjäkortissa ja sähköposteissa. Poista käytöstä piilottaaksesi koko nimen kaikkialla."
     display_name_on_posts: "Näytä käyttäjän koko nimi viesteissä @käyttäjätunnuksen lisäksi."
@@ -2007,17 +1990,13 @@ fi:
     allowed_href_schemes: "Linkeissä sallitut skeemat http:n ja https:n lisäksi."
     embed_post_limit: "Upotettavien viestien maksimimäärä."
     embed_username_required: "Käyttäjätunnus vaaditaan ketjun luomiseksi."
-    notify_about_flags_after: "Jos merkintöjä on ollut käsittelemättä näin monen tunnin ajan, lähetä yksityisviesti valvojille. Poista käytöstä asettamalla 0."
-    show_create_topics_notice: "Jos sivustolla on vähemmän kuin 5 julkista ketjua, kehota ylläpitäjiä aloittamaan ketjuja."
+    notify_about_reviewable_item_after: "Jos tarkastettavia kohteita ei ole käsitelty määritetyn tuntimäärän sisällä, ilmoita valvojille yksityisviesteillä. Poista käytöstä arvolla 0."
     delete_drafts_older_than_n_days: "Poista yli (n) päivää vanhat luonnokset."
     delete_merged_stub_topics_after_days: "Kuinka montaa päivää odotetaan ennen kuin täysin yhdistetyt tynkäketjut poistetaan automaattisesti. Jos asetat arvoksi 0, tynkäketjuja ei poistetan koskaan."
-    bootstrap_mode_min_users: "Vähimmäismäärä käyttäjiä, joka vaaditaan aloitustilan poistamiseen (aseta 0 poistaaksesi käytöstä)"
+    bootstrap_mode_min_users: "Vähimmäismäärä käyttäjiä, joka vaaditaan aloitustilan poistamiseen (poista käytöstä arvolla 0, voi kestää jopa 24 tuntia)"
     prevent_anons_from_downloading_files: "Estä tuntemattomia käyttäjiä lataamasta liitteitä."
-    secure_media: "VANHENTUNUT: Käytä tämän sijaan secure_uploads-asetusta, poistetaan Discourse 3.0:ssa."
     secure_uploads: 'Rajoittaa pääsyä KAIKKIIN latauksiin (kuvat, videot, äänet, tekstit, pdf-tiedostot, zip-tiedostot ja muut). Jos "sisäänkirjautuminen vaaditaan" on käytössä, vain kirjautuneilla käyttäjillä on pääsy latauksiin. Muussa tapauksessa pääsy rajoitetaan vain yksityisviesteihin ja yksityisiin alueisiin ladattuihin mediatiedostoihin. VAROITUS: Tämä asetus on monimutkainen ja vaatii syvällistä hallinnollista ymmärrystä. Katso lisätietoja <a target="_blank" href="https://meta.discourse.org/t/-/140017">turvallisia latauksia palvelimeen käsittelevästä ketjusta Metassa</a>.'
-    secure_media_allow_embed_images_in_emails: "VANHENTUNUT: Käytä \"secure_uploads_allow_embed_images_in_emails\"-asetusta, poistetaan Discourse 3.0:ssa."
     secure_uploads_allow_embed_images_in_emails: "Sallii turvallisten kuvien upottamisen, jotka normaalisti karsittaisiin sähköposteissa, jos niiden koko on pienempi kuin \"secure uploads max email embed image size kb\" -asetus."
-    secure_media_max_email_embed_image_size_kb: "VANHENTUNUT: Käytä \"secure_uploads_max_email_embed_image_size_kb\"-asetusta, poistetaan Discourse 3.0:ssa."
     secure_uploads_max_email_embed_image_size_kb: "Sähköposteihin upotettavien turvallisten kuvien kokoraja, jos \"secure uploads allow embed in emails\" -asetus on käytössä. Ilman kyseistä asetusta tällä asetuksella ei ole vaikutusta."
     slug_generation_method: "Valitse polkutunnuksen luomisen metodi, 'encoded' käyttää prosenttikoodausta, 'none' poistaa polkutunnukset käytöstä."
     enable_emoji: "Ota emoji käyttöön"
@@ -2025,6 +2004,7 @@ fi:
     emoji_set: "Millaiset emojit haluat?"
     emoji_autocomplete_min_chars: "Kuinka monta merkkiä vaaditaan, jotta sanantäydentävä emojivalitsin aukeaa"
     enable_inline_emoji_translation: "Ota käyttöön emojien kääntäminen merkkijonojen keskeltä (ei väliä tai välimerkkejä ennen emojia)"
+    emoji_deny_list: "Nämä emojit eivät ole käytettävissä valikoista tai lyhytkoodeilla."
     approve_post_count: "Viestien lukumäärä, joka uusilta käyttäjiltä ja haastajilta täytyy hyväksyä"
     approve_unless_trust_level: "Tätä luottamustasoa alhaisempien käyttäjien viestit täytyy hyväksyä"
     approve_new_topics_unless_trust_level: "Tätä luottamustasoa alhaisempien käyttäjien aloittamat ketjut täytyy hyväksyä"
@@ -2079,12 +2059,18 @@ fi:
     default_tags_watching_first_post: "Luettelo tunnisteista, jonka sisältävien ketjujen ensimmäisiä viestejä tarkkaillaan oletuksena."
     default_text_size: "Tekstikoon oletusvalinta"
     default_title_count_mode: "Sivun otsikon laskurin oletusasetus"
+    enable_offline_indicator: "Näytä käyttäjille viesti, kun havaitaan, ettei heillä ole verkkoyhteyttä."
+    default_sidebar_link_to_filtered_list: "Kohdista navigointivalikon linkit oletusarvoisesti suodatettuihin listauksiin."
+    default_sidebar_show_count_of_new_items: "Määritä navigointivalikon linkit näyttämään oletusarvoisten korostusmerkkien sijaan uusien kohteiden lukumäärä."
+    default_sidebar_switch_panel_position: "Sivupalkin kytkinpaneelin painikkeiden sijainti"
     retain_web_hook_events_period_days: "Kuinka monta päivää tietoa webhook-tapahtumista säilötään."
     retry_web_hook_events: "Yritä uudelleen epäonnistuneita webhook-tapahtumia neljästi. Aikavälit yritysten välillä ovat 1, 5, 25 ja 125 minuuttia."
     revoke_api_keys_days: "Kuinka monen päivän kuluttua käyttämätön API-avain mitätöidään automaattisesti (0 tarkoittaa ei koskaan)"
     allow_user_api_keys: "Salli käyttäjä-API-avainten muodostaminen"
     allow_user_api_key_scopes: "Luettelo käyttäjä-API-avaimiin liittyvistä oikeuksista"
-    min_trust_level_for_user_api_key: "Vähimmäisluottamustaso, joka vaaditaan käyttäjä-API-avainten muodostamiseen"
+    min_trust_level_for_user_api_key: |
+      Käyttäjän API-avaimien luomiseen vaadittu luottamustaso.<br>
+      <b>VAROITUS:</b> Luottamustason muuttaminen estää matalamman luottamustason käyttäjiä kirjautumasta sisään Discourse Hubin kautta.
     allowed_user_api_auth_redirects: "Sallittu URL-osoite käyttäjän API-avainten todennuksen uudelleenohjaukselle. Jokerimerkkiä * voidaan käyttää vastaamaan mitä tahansa sen osaa (esim. www.esimerkki.fi/*)."
     allowed_user_api_push_urls: "Sallitut URL-osoitteet palvelimen työnnöille käyttäjä-APIin"
     expire_user_api_keys_days: "Kuinka monessa päivässä käyttäjä-API-avain vanhenee automaattisesti (0 tarkoittaa ei koskaan)"
@@ -2102,6 +2088,7 @@ fi:
     suppress_overlapping_tags_in_list: "Jos tunniste esiintyy sanana täsmälleen ketjun otsikossa, älä näytä tunnistetta"
     remove_muted_tags_from_latest: "Jos ketjulla on vain vaimennettuja tunnisteita, älä näytä ketjua Tuoreimmat-ketjuluettelossa."
     force_lowercase_tags: "Salli vain pienet kirjaimet uusissa tunnisteissa."
+    create_post_for_category_and_tag_changes: "Luo pieni tapahtumaviesti ketjun alueiden tai tunnisteiden muuttuessa"
     company_name: "Yrityksen nimi"
     governing_law: "Sovellettava lainsäädäntö"
     city_for_disputes: "Kaupunki, jonka oikeudessa riidat ratkotaan"
@@ -2116,7 +2103,7 @@ fi:
     enable_sitemap: "Luo sivustokartta sivustollesi ja sisällytä se robots.txt-tiedostoon."
     sitemap_page_size: "Kuhunkin sivustokartan sivuun lisättävien URL-osoitteiden määrä. Enintään 50 000."
     enable_user_status: "(kokeellinen) Salli käyttäjien asettaa mukautettu tilaviesti (emoji + kuvaus)."
-    enable_user_tips: "(kokeellinen) Ota käyttöön uuden käyttäjän vinkit, jotka kuvaavat keskeisiä ominaisuuksia käyttäjille"
+    enable_user_tips: "Käytä keskeisiä ominaisuuksia uusille käyttäjille kuvaavat vinkit"
     short_title: "Lyhyttä nimeä käytetään käyttäjän aloitusnäytöllä, käynnistysruudussa ja muissa tilanteissa, joissa tilaa on rajallisesti. Sen tulisi olla enintään 12 merkin pituinen."
     dashboard_hidden_reports: "Salli tiettyjen raporttien piilottaminen hallintapaneelista."
     dashboard_visible_tabs: "Valitse mitkä hallintapaneelin välilehdet ovat näkyvillä."
@@ -2133,11 +2120,9 @@ fi:
     suggest_weekends_in_date_pickers: "Sisällytä viikonloput (lauantai ja sunnuntai) päivämäärävalitsimen ehdotuksiin (poista tämä käytöstä, jos käytät Discoursea vain arkipäivisin maanantaista perjantaihin)."
     splash_screen: "Näyttää väliaikaisen latausnäytön sivuston resurssien latautuessa"
     navigation_menu: "Määritä käytettävä navigointivalikko. Sivupalkin ja yläpalkin navigointi ovat käyttäjien mukautettavissa. Vanha vaihtoehto on käytettävissä yhteensopivuuden varmistamiseksi vanhojen versioiden kanssa."
-    default_sidebar_categories: "Valitut alueet näkyvät sivupalkin Alueet-osiossa oletuksena."
-    default_sidebar_tags: "Valitut tunnisteet näkyvät sivupalkin Tunnisteet-osiossa oletuksena."
-    enable_new_user_profile_nav_groups: "KOKEELLINEN: valittujen ryhmien käyttäjille näytetään uusi käyttäjäprofiilin navigointivalikko"
-    enable_experimental_topic_timeline_groups: "KOKEELLINEN: valittujen ryhmien käyttäjille näytetään uudelleenmuotoiltu ketjun aikajana"
     enable_experimental_hashtag_autocomplete: "KOKEELLINEN: käytä alueille ja tunnisteille uutta automaattista #hashtag-täydennysjärjestelmää, jotka hahmontaa valitun kohteen eri tavalla ja on parantanut hakua"
+    experimental_topics_filter: "KOKEELLINEN: Ottaa käyttöön kokeellisen aiheiden suodatuspolun osoitteella /filter"
+    enable_experimental_lightbox: "KOKEELLINEN: Korvaa kuvien oletusarvoinen lightbox-tehoste uudistetulla tyylillä."
     errors:
       invalid_css_color: "Virheellinen väri. Anna värin nimi tai heksadesimaaliarvo."
       invalid_email: "Sähköpostiosoite ei kelpaa."
@@ -2163,7 +2148,6 @@ fi:
       pop3_polling_password_is_empty: "Sinun täytyy asettaa 'pop3 polling password' ennen POP3-pollauksen käyttöönottoa."
       pop3_polling_authentication_failed: "POP3-todennus epäonnistui. Tarkista pop3-tunnistetiedot."
       reply_by_email_address_is_empty: "'Reply by email address' täytyy olla asetettuna ennen sähköpostivastausten ottamista käyttöön."
-      email_polling_disabled: "Sinun täytyy ottaa käyttöön joko manuaalinen tai POP3-pollaus ennen sähköpostivastausten käyttöönottoa."
       user_locale_not_enabled: "'Allow user locale' täytyy olla asetettuna ennen tämän asetuksen ottamista käyttöön."
       personal_message_enabled_groups_invalid: "Sinun täytyy määrittää vähintään yksi ryhmä tälle asetukselle. Jos et halua muiden kuin henkilökunnan lähettävän yksityisviestejä, valitse henkilökunnan ryhmä."
       invalid_regex: "Säännöllinen lauseke ei kelpaa tai ei ole sallittu."
@@ -2172,7 +2156,6 @@ fi:
       staged_users_disabled: "Esikäyttäjät on otettava käyttöön ennen tämän asetuksen käyttöönottoa."
       reply_by_email_disabled: "Vastaus sähköpostilla täytyy ottaa käyttöön ennen tämän asetuksen käyttöönottoa."
       discourse_connect_url_is_empty: "Sinun täytyy määrittää \"discourse connect url'\" ennen kuin otat tämän asetuksen käyttöön."
-      discourse_connect_invite_only: "DiscourseConnect ja vain kutsulla -tila eivät voi olla käytössä samaan aikaan."
       enable_local_logins_disabled: "Paikalliset kirjautumiset täytyy ottaa käyttöön ennen tämän asetuksen käyttöönottoa."
       min_username_length_exists: "Käyttäjätunnuksen vähimmäispituus ei voi olla suurempi kuin lyhin käyttäjätunnus (%{username})."
       min_username_length_range: "Vähimmäisarvo ei voi olla suurempi kuin enimmäisarvo."
@@ -2194,7 +2177,6 @@ fi:
       search_tokenize_japanese_enabled: "\"search_tokenize_japanese\" on poistettava käytöstä ennen tämän asetuksen käyttöönottoa."
       discourse_connect_cannot_be_enabled_if_second_factor_enforced: "Et voi ottaa DiscourseConnectia käyttöön, jos 2FA on pakotettu."
       delete_rejected_email_after_days: "Tämä asetus ei voi olla pienempi kuin delete_email_logs_after_days-asetus tai suurempi kuin %{max}"
-      invalid_uncategorized_category_setting: "Luokittelemattomat-aluetta ei voi valita, jos luokittelemattomia ketjuja ei ole sallittu"
     placeholder:
       discourse_connect_provider_secrets:
         key: "www.example.com"
@@ -2389,7 +2371,6 @@ fi:
     activated_by_staff: "Henkilökunta aktivoi"
     new_user_typed_too_fast: "Uusi käyttäjä näppäili liian nopeasti"
     content_matches_auto_silence_regex: "Sisältö vastaa automaattisesti hiljennettävää säännöllistä lauseketta"
-    content_matches_auto_block_regex: "Sisältö vastaa automaattisesti estettävää säännöllistä lauseketta"
     username:
       short: "täytyy olla vähintään %{min} merkkiä"
       long: "ei saa olla yli %{max} merkkiä"
@@ -3123,14 +3104,6 @@ fi:
     user_automatically_silenced:
       title: "Käyttäjä hiljennettiin automaattisesti"
       subject_template: "Yhteisön merkinnät hiljensivät uuden käyttäjän %{username}"
-      text_body_template: |
-        Tämä on automaattinen viesti.
-
-        Uusi käyttäjä [%{username}](%{user_url}) hiljennettiin automaattisesti, koska useampi käyttäjä on liputtanut käyttäjän %{username} viestejä.
-
-        [Tarkasta liputukset](%{base_url}/admin/flags). Jos %{username} hiljennettiin ilman syytä, kumoa hiljennys klikkaamalla painiketta [käyttäjän ylläpitosivulla](%{user_url}).
-
-        Rajaa voi muuttaa sivustoasetuksella `silence_new_user.
     spam_post_blocked:
       title: "Roskapostiviesti estettiin"
       subject_template: "Uuden käyttäjän %{username} viestit estettiin toistuvien linkkien vuoksi"
@@ -3164,15 +3137,6 @@ fi:
       title: "Linkattujen kuvien lataaminen on poistettu käytöstä"
       subject_template: "Linkattujen kuvien lataaminen on poistettu käytöstä"
       text_body_template: "Asetus `download_remote_images_to_local` on poistettu käytöstä, koska vapaan tilan rajoitus `download_remote_images_threshold` saavutettiin."
-    dashboard_problems:
-      title: "Hallintapaneelissa ongelmia"
-      subject_template: "Uusia neuvoja sivustosi hallintapaneelissa"
-      text_body_template: |
-        Meillä on joitakin neuvoja ja suosituksiasi nykyisiin sivustoasetuksiisi pohjautuen.
-
-        Katsele niitä [sivustosi hallintapaneelissa](%{base_url}/admin).
-
-        Jos hallintapaneelissa ei näy mitään, toinen henkilökuntalainen on voinut jo ottaa vinkistä vaarin. Luettelo henkilökunnan toimista löytyy [henkilökuntalokista](%{base_url}/admin/logs/staff_action_logs).
     new_user_of_the_month:
       title: "Olet kuukauden tulokas!"
       subject_template: "Olet kuukauden tulokas!"
@@ -3209,9 +3173,6 @@ fi:
       one: "Huom. Olemme lähettäneet jo yhden sähköpostin tänään, mikä on enimmäismäärä. Käy sivustolla, jottet jää mistään paitsi. PS. Kiitos kun olet niin suosittu!"
       other: "Huom. Olemme lähettäneet jo %{count} sähköpostia tänään, mikä on enimmäismäärä. Käy sivustolla, jottet jää mistään paitsi. PS. Kiitos kun olet niin suosittu!"
     in_reply_to: "Vastauksena"
-    unsubscribe:
-      title: "Peru tilaus"
-      description: "Etkö halua vastaanottaa näitä sähköposteja? Ei hätää! Klikkaa alta peruaksesi tilauksen välittömästi:"
     reply_by_email: "Vastaa [vierailemalla ketjussa](%{base_url}%{url}) tai vastaamalla tähän sähköpostiin."
     reply_by_email_pm: "Vastaa käyttäjille %{participants} [vierailemalla keskustelussa](%{base_url}%{url}) tai vastaa vain tähän sähköpostiin."
     only_reply_by_email: "Vastaa vastaamalla tähän sähköpostiin."
@@ -3508,7 +3469,6 @@ fi:
       liked_received: "Saatua tykkäystä"
       new_users: "Uutta käyttäjää"
       popular_topics: "Suosittuja ketjuja"
-      follow_topic: "Seuraa tätä ketjua"
       join_the_discussion: "Lue lisää"
       popular_posts: "Suosittuja viestejä"
       more_new: "Uutta sinulle"
@@ -3704,14 +3664,7 @@ fi:
     title: "Sovellusta ei voida ladata"
     offline_page_message: "Yhteydessäsi vaikuttaa olevan vikaa! Tarkista verkkoyhteytesi ja yritä uudelleen."
   login_required:
-    welcome_message: |
-      ## [Tervetuloa sivustolle %{title}](#welcome)
-      Käyttäjätili tarvitaan. Luo tili tai kirjaudu sisään.
-    welcome_message_invite_only: |
-      ## [Tervetuloa sivustolle %{title}](#welcome)
-      Käyttäjätili vaaditaan. Pyydä yhteisön jäsentä kutsumaan sinut tai kirjaudu sisään.
-  deleted: "poistettu"
-  image: "kuva"
+    welcome_message: "# [Tervetuloa foorumille %{title}](#welcome)"
   upload:
     edit_reason: "lataa kuvista paikalliset kopiot"
     unauthorized: "Tiedosto, jota yrität ladata, ei ole sallittu (sallitut päätteet: %{authorized_extensions})."
@@ -3912,262 +3865,8 @@ fi:
       Kyllä, lakiteksti on tylsää, mutta meidän täytyy suojata itseämme ja sitä kautta sinua sekä tietojasi pahantahtoisilta ihmisiltä. Meillä on [käyttöehdot](%{base_path}/tos), joissa kuvataan sinun (ja meidän) toimintaamme ja oikeuksiamme sisällön, tietosuojan ja lakien osalta. Tämän palvelun käyttämiseksi sinun täytyy hyväksyä [käyttöehtomme](%{base_path}/tos).
   tos_topic:
     title: "Käyttöehdot"
-    body: |
-      Nämä ehdot säätelevät Internet-foorumin käyttöä osoitteessa <%{base_url}>. Käyttääksesi foorumia sinun on hyväksyttävä nämä ehdot yrityksen %{company_name} kanssa, joka on foorumia ylläpitävä yritys.
-
-      Yritys voi tarjota muita tuotteita ja palveluita eri ehdoilla. Näitä ehtoja sovelletaan vain foorumin käyttöön.
-
-      Siirry kohtaan:
-
-      – [Tärkeät ehdot](#heading--important-terms)
-      – [Lupasi käyttää foorumia](#heading--permission)
-      – [Foorumin käytön ehdot](#heading--conditions)
-      – [Hyväksyttävä käyttö](#heading--acceptable-use)
-      – [Sisältöstandardit](#heading--content-standards)
-      – [Täytäntöönpano](#heading--enforcement)
-      – [Tilisi](#heading--your-account)
-      – [Sisältösi](#heading--your-content)
-      – [Vastuusi](#heading--responsibility)
-      – [Vastuuvapausilmoitukset](#heading--disclaimers)
-      – [Vastuurajoitukset](#heading--liability)
-      – [Palaute](#heading--feedback)
-      – [Päättäminen](#heading--termination)
-      – [Riidat](#heading--disputes)
-      – [Yleiset ehdot](#heading--general)
-      – [Yhteydenotto](#heading--contact)
-      – [Muutokset](#heading--changes)
-
-      <h2 id="heading--important-terms"><a href="#heading--important-terms">Tärkeät ehdot</a></h2>
-
-      ***Nämä ehdot sisältävät tärkeitä ehtoja, jotka vaikuttavat oikeuksiisi ja vastuihisi, kuten [vastuuvapausilmoitukset](#heading--disclaimers), yrityksen vastuun rajoitukset sinua kohtaan kohdassa [vastuurajoitukset](#heading--liability), suostumuksesi vastata yritykselle foorumin väärinkäytöstäsi aiheutuneista vahingoista kohdassa [vastuu käytöstäsi](#heading--responsibility) sekä suostumuksesi ratkaista riidat välimiesmenettylyllä kohdassa [riidat](#heading--disputes).***
-
-      <h2 id="heading--permission"><a href="#heading--permission">Lupasi käyttää foorumia</a></h2>
-
-      Yritys antaa sinulle luvan käyttää foorumia näiden ehtojen mukaisesti. Kaikkien on hyväksyttävä nämä ehdot käyttääkseen foorumia.
-
-      <h2 id="heading--conditions"><a href="#heading--conditions">Foorumin käytön ehdot</a></h2>
-
-      Lupasi käyttää foorumia edellyttää seuraavien ehtojen täyttymistä:
-
-      1. Sinun on oltava vähintään 13-vuotias.
-
-      2. Sinun ei tule enää käyttää foorumia, jos yritys ottaa sinuun suoraan yhteyttä ja ilmoittaa sinulle, ettei sinun tule tehdä näin.
-
-      3. Sinun tulee käyttää foorumia [hyväksyttävän käytön](#heading--acceptable-use) ja [sisältöstandardien](#heading--content-standards) mukaisesti.
-
-      <h2 id="heading--acceptable-use"><a href="#heading--acceptable-use">Hyväksyttävä käyttö</a></h2>
-
-      1. Sinun ei tule rikkoa lakia käyttäessäsi foorumia.
-
-      2. Sinun ei tule käyttää tai yrittää käyttää toisen henkilön tiliä foorumilla ilman hänen nimenomaista lupaansa.
-
-      3. Sinun ei tule ostaa, myydä tai muutoin vaihtaa käyttäjätunnuksia tai muita yksilöllisiä tunnisteita foorumilla.
-
-      4. Sinun ei tule lähettää mainoksia, ketjukirjeitä tai muita myyntiyhteydenottoja foorumin kautta tai käyttää foorumia osoitteiden tai muiden henkilötietojen keräämiseen kaupallisia postituslistoja tai tietokantoja varten.
-
-      5. Sinun ei tule automatisoida pääsyä foorumille tai tarkkailla foorumia, kuten hakurobotilla, selaimen lisäosalla tai laajennuksella tai muulla tietokoneohjelmalla, joka ei ole verkkoselain. Voit indeksoida foorumia julkisesti saatavilla olevalle hakukoneelle, jos ylläpidät sellaista.
-
-      6. Sinun ei tule käyttää foorumia lähettääksesi sähköpostia jakeluluetteloille, uutisryhmille tai ryhmäpostialiaksille.
-
-      7. Sinun ei tule virheellisesti antaa ymmärtää, että olet sidoksissa yritykseen tai yrityksen hyväksymä.
-
-      8. Sinun ei tule hyperlinkittää kuviin tai muuhun hyperlinkittämättömään sisältöön foorumilla tai muilla verkkosivuilla.
-
-      9. Sinun ei tule poistaa omistusoikeuden osoittavia merkkejä aineistoista, joita lataat foorumilta.
-
-      10. Sinun ei tule näyttää mitään foorumin osaa muilla verkkosivustoilla <iframe>-kehyksissä.
-
-      11. Sinun ei tule poistaa käytöstä, välttää tai kiertää foorumin turvallisuus- tai pääsyrajoituksia.
-
-      12. Sinun ei tule kuormittaa foorumin infrastruktuuria kohtuuttomalla määrällä pyyntöjä tai pyynnöillä, jotka on suunniteltu asettamaan kohtuuton kuormitus foorumin taustalla oleville tietojärjestelmille.
-
-      13. Sinun ei tule tekeytyä muiksi foorumin kautta.
-
-      14. Sinun ei tule kannustaa tai auttaa ketään näiden ehtojen rikkomisessa.
-
-      <h2 id="heading--content-standards"><a href="#heading--content-standards">Sisältöstandardit</a></h2>
-
-      1. Sinun ei tule lähettää foorumille sisältöä, joka on laitonta, loukkaavaa tai muutoin haitallista muille. Tähän sisältyy sisältö, joka on häiritsevää, sopimatonta, loukkaavaa tai vihamielistä toimintaa.
-
-      2. Sinun ei tule lähettää foorumille sisältöä, joka rikkoo lakia, loukkaa jonkun immateriaalioikeuksia, loukkaa jonkun yksityisyyttä tai rikkoo sopimuksia, joita sinulle on muiden kanssa.
-
-      3. Sinun ei tule lähettää foorumille sisältöä, joka sisältää haitallista tietokonekoodia, kuten tietokoneviruksia tai vakoiluohjelmia.
-
-      4. Sinun ei tule lähettää foorumille sisältöä pelkkänä paikkamerkkinä tietyn osoitteen, käyttäjätunnuksen tai muun yksilöllisen tunnisteen pitämiseksi.
-
-      5. Sinun ei tule käyttää foorumia sellaisten tietojen paljastamiseen, joita sinulla ei ole oikeus paljastaa, kuten muiden luottamuksellisia tai henkilökohtaisia tietoja.
-
-      <h2 id="heading--enforcement"><a href="#heading--enforcement">Täytäntöönpano</a></h2>
-
-      Yritys voi tutkia näiden ehtojen rikkomukset ja panna ne syytteeseen täydessä oikeudellisessa laajuudessa. Yritys voi ilmoittaa lainvalvontaviranomaisille ja tehdä niiden kanssa yhteistyötä lain ja näiden ehtojen rikkomusten syytteeseenpanossa.
-
-      Yritys pidättää oikeuden muuttaa, muokata ja poistaa sisältöä foorumilla mistä tahansa syystä. Jos uskot, että joku on lähettänyt foorumille sisältöä näiden ehtojen vastaisesti, [ota meihin yhteyttä välittömästi](#heading--contact).
-
-      <h2 id="heading--your-account"><a href="#heading--your-account">Tilisi</a></h2>
-
-      Sinun tulee luoda tili ja kirjautua sille käyttääksesi joitakin foorumin ominaisuuksia.
-
-      Luodaksesi tilin sinun on annettava joitakin tietoja itsestäsi. Jos luot tilin, hyväksyt antavasi vähimmillään kelvollisen sähköpostiosoitteen ja pitäväsi tämän osoitteen ajan tasalla. Voit sulkea tilisi milloin tahansa lähettämällä sähköpostiviestin osoitteeseen <%{contact_email}>.
-
-      Hyväksyt olevasi vastuussa kaikista tiliäsi käyttämällä tehdyistä toimista rippumatta siitä, ovatko ne valtuuttamiasi vai ei, kunnes joko suljet tilisi tai ilmoitat yritykselle, että tilisi on vaarantunut. Hyväksyt ilmoittavasi yritykselle välittömästi, jos epäilet, että tilisi on vaarantunut. Hyväksyt valitsevasi turvallisen salasanan tilillesi ja pitäväsi sen salassa.
-
-      Yritys voi rajoittaa tiliäsi, asettaa sen käyttökieltoon tai sulkea sen foorumilla tekijänoikeuksiin liittyvien poistopyyntöjen käsittelyä koskevan käytäntönsä mukaisesti tai jos yritys uskoo kohtuudella, että olet rikkonut näiden ehtojen sääntöä.
-
-      <h2 id="heading--your-content"><a href="#heading--your-content">Sisältösi</a></h2>
-
-      Mikään näissä ehdoissa ei anna yritykselle omistusoikeuksia henkiseen omaisuuteen, jota jaat foorumilla, kuten tilitietoihisi, viesteihisi tai muuhun sisältöön, jota lähetät foorumille. Mikään näissä ehdoissa ei myöskään anna sinulle omistusoikeuksia yrityksen henkiseen omaisuuteen.
-
-      Sinun ja yrityksen välillä sinä pysyt täysin vastuussa sisällöstä, jota lähetät foorumille. Hyväksyt, ettet anna virheellisesti ymmärtää väärin, että foorumille lähettämäsi sisältö on yrityksen sponsoroimaa tai hyväksymää. Nämä ehdot eivät velvoita yritystä tallentamaan, säilyttämään tai tarjoamaan kopioita lähettämästäsi sisällöstä ja muuttamaan sitä näiden ehtojen mukaisesti.
-
-      Foorumille lähettämäsi sisältö kuuluu sinulle, ja sinä päätät, mitä lupia annat muille siihen. Vähimmillään lisensoit yrityksen tarjoamaan foorumille lähettämääsi sisältöä muille foorumin käyttäjille. Tämä erikoislisenssi sallii yrityksen kopioivan, julkaisevan ja analysoivan foorumille lähettämääsi sisältöä.
-
-      Kun lähettämäsi sisältö poistetaan foorumilta joko sinun tai yrityksen toimesta, yrityksen erikoislisenssi päättyy, kun viimeinen kopio katoaa yrityksen varmuuskopioista, välimuisteista ja muista järjestelmistä. Muut lisenssit, joita sovellat lähettämääsi sisältöön, kuten [Creative Commons](https://creativecommons.org) -lisenssit, saattavat jatkua sisältösi poistamisen jälkeen. Nämä lisenssit voivat antaa muille tai yritykselle itselleen oikeuden jakaa sisältöäsi foorumin kautta uudelleen.
-
-      Muut, jotka saavat foorumille lähettämääsi sisältöä, saattavat rikkoa ehtoja, joiden mukaan lisensoit sisältösi. Hyväksyt, että yritys ei ole vastuussa sinulle näistä rikkomuksista tai niiden seurauksista.
-
-      <h2 id="heading--responsibility"><a href="#heading--responsibility">Vastuusi</a></h2>
-
-      Hyväksyt suojaavasi yritystä muiden oikeudellisilta vaateilta, jotka liittyvät näiden ehtojen rikkomiseesi tai näiden ehtojen rikkomiseen muiden toimesta tiliäsi käyttämällä foorumilla. Sekä sinä että yritys hyväksytte ilmoittavanne toiselle osapuolelle oikeudellisista vaateista, joissa saatat joutua suojaamaan yritystä, mahdollisimman pian. Jos yritys ei ilmoita sinulle oikeudellisesta vaateesta viipymättä, sinun ei tarvitse suojata yritystä vahingoilta, joita vastaan olisit voinut puolustautua tai jotka olisit voinut välttää saadessasi ilmoituksen viipymättä. Hyväksyt sallivasi yrityksen hallita niiden oikeudellisten vaateiden tutkintaa, puolustusta ja ratkaisua, joissa sinun täytyisi suojata yritystä, ja tekeväsi yhteistyötä näissä pyrkimyksissä. Yritys hyväksyy, ettei se hyväksy ratkaisua, joka hyväksyy vahinkosi tai asettaa sinulle velvollisuuksia, ilman etukäteistä hyväksyntääsi.
-
-      <h2 id="heading--disclaimers"><a href="#heading--disclaimers">Vastuuvapausilmoitukset</a></h2>
-
-      ***Hyväksyt kaiken foorumin käytön ja foorumin sisällön riskin . Lain sallimassa laajuudessa yritys ja sen toimittajat tarjoavat foorumin sellaisenaan ilman minkäänlaisia takuita.***
-
-      Foorumi voi sisältää hyperlinkkejä muiden ylläpitämille foorumeille ja palveluihin sekä integroida niitä. Yritys ei anna takuita muiden ylläpitämistä palveluista eikä niiden mahdollisesti tarjoamasta sisällöstä. Muiden ylläpitämien palveluiden käyttöön voidaan soveltaa muita sinun ja palvelua ylläpitävän tahon välisiä sopimuksia.
-
-      <h2 id="heading--liability"><a href="#heading--liability">Vastuurajoitukset</a></h2>
-
-      ***Yritys tai sen toimittajat eivät ole vastuussa sinulle sopimusrikkomusvahingoista, joita heidän henkilöstönsä ei olisi voinut kohtuudella ennakoida, kun hyväksyit nämä ehdot.***
-
-      ***Lain sallimassa laajuudessa kokonaisvastuu sinulle kaikista foorumiin tai foorumin sisältöön liittyvistä vaateista on rajoitettu 50 dollariin.***
-
-      <h2 id="heading--feedback"><a href="#heading--feedback">Palaute</a></h2>
-
-      Yritys ottaa mielellään vastaan palautettasi ja ehdotuksia foorumin osalta. Katso tapoja ottaa meihin yhteyttä jäljempänä [Yhteydenotto](#heading--contact)-osasta.
-
-      Hyväksyt, että yritys voi toimia vapaasti antamasi palautteen ja ehdotusten perusteella, ja että yrityksen ei tarvitse ilmoittaa sinulle, että palautettasi käytettiin, saada lupaasi käyttää sitä tai maksaa sinulle. Hyväksyt, ettet lähetä palautetta tai ehdotuksia, joiden uskot olevan luottamuksellisia tai yksinoikeudellisia, sinulle tai muille.
-
-      <h2 id="heading--termination"><a href="#heading--termination">Päättäminen</a></h2>
-
-      Joko sinä tai yritys voitte päättää näissä ehdoissa kuvatun sopimuksen milloin tahansa. Kun sopimuksemme päättyy, lupasi käyttää foorumia päättyy myös.
-
-      Seurravat ehdot jäävät voimaan sopimuksemme päättymisen jälkeen: [Sisältösi](#heading--your-content), [Palaute](#heading--feedback), [Vastuusi](#heading--responsibility), [Vastuuvapausilmoitukset](#heading--disclaimers), [Vastuurajoitukset](#heading--liability) ja [Yleiset ehdot](#heading--general).
-
-      <h2 id="heading--disputes"><a href="#heading--disputes">Riidat</a></h2>
-
-      %{governing_law} on näihin ehtoihin tai foorumin käyttöösi liittyviin riitoihin sovellettava laki.
-
-      Sinä ja yritys hyväksytte tekevänne näihin ehtoihin liittyviä kanteita vain kohteen %{city_for_disputes} osavaltion tai liittovaltion tuomioistuimessa. Sinä tai yritys ette vastusta näiden tuomioistuinten toimivaltaa tai niitä käsittelypaikkana.
-
-      ***Muutoin kuin Computer Fraud and Abuse Act -lain mukaisissa kanteissa sinä ja yritys ratkaisette kaikki riidat sitovalla Yhdysvaltain sovitteluelinten yhdistyksen (American Arbitration Association) välimiesmenettely. Välimiesmenettely noudattaa AAA:n kaupallisia välimiesmenettelysääntöjä ja lisäkäytänteitä kuluttajiin liittyvissä riidoissa. Välimiesmenettely tapahtumapaikka on %{city_for_disputes}. Ratkaiset kaikki riidat yksilönä, et osana ryhmäkannetta tai muuta edustusmenettelyä, joko kantajana tai ryhmän jäsenenä. Välimies ei yhdistä riitaa toiseen riitaan ilman yrityksen lupaa.***
-
-      Välitystuomio sisältää välimiesmenettelyn kustannukset, kohtuulliset asianajajan palkkiot ja kohtuulliset todistajien kustannukset. Sinä ja yritys voitte saada välitystuomion missä tahansa toimivaltaisessa tuomioistuimessa.
-
-      <h2 id="heading--general"><a href="#heading--general">Yleiset ehdot</a></h2>
-
-      Jos näiden ehtojen ehto on täytäntöönpanokelvoton kirjoitusmuodossaan, mutta se voitaisiin muuttaa täytäntöönpanokelpoiseksi, tätä ehtoa tulisi muuttaa vähimmässä määrin, mikä on tarpeellista sen tekemiseksi täytäntöönpanokelpoiseksi. Muutoin tämä ehto tulisi poistaa.
-
-      Et voi siirtää sopimustasi yrityksen kanssa. Yritys voi siirtää sopimuksesi yrityksen sidosryhmälle tai muulle yritykselle, joka saa yrityksen hallinnan, tai muulle yritykselle, joka ostaa yrityksen foorumiin liittyvät omaisuuserät. Näiden ehtojen vastaisilla siirtoyrityksillä ei ole laillista vaikutusta.
-
-      Minkä tahansa tämän sopimuksen mukaisen oikeuden käyttäminen tai tämän sopimuksen rikkomuksesta luopuminen ei mitätöi muita tämän sopimuksen rikkomuksia.
-
-      Nämä ehdot käsittävät kaikki sinun ja yrityksen välisen sopimuksen ehdot foorumin käyttöä koskien. Nämä ehdot korvaavat kokonaan muut sopimukset foorumin käyttöäsi koskien riippumatta siitä, ovatko ne kirjallisia.
-
-      <h2 id="heading--contact"><a href="#heading--contact">Yhteydenotto</a></h2>
-
-      Voit antaa yritykselle näiden ehtojen mukaisen ilmoituksen ja lähettää kysymyksiä yritykselle osoitteeseen <%{contact_email}>.
-
-      Yritys voi antaa sinulle näiden ehtojen mukaisen ilmoituksen käyttämällä sähköpostiosoitetta, jonka annat tilillesi foorumilla, tai lähettämällä viestin foorumin aloitussivulle tai tilisivullesi.
-
-      <h2 id="heading--changes"><a href="#heading--changes">Muutokset</a></h2>
-
-      Yritys päivitti näitä ehtoja viimeksi 12.7.2018 ja voi päivittää näitä ehtoja uudelleen. Yritys julkaisee kaikki päivitykset foorumille. Päivityksistä, jotka sisältävät merkittäviä muutoksia, yritys suostuu lähettävänsä sinulle sähköpostiviestin, jos olet luonut tilin ja antanut kelvollisen sähköpostiosoitteen. Yritys voi myös ilmoittaa päivityksistä erikoisviesteillä tai hälytyksillä foorumilla.
-
-      Kun saat ilmoituksen näiden ehtojen päivityksestä, sinun on hyväksyttävä uudet ehdot, jotta voit jatkaa foorumin käyttöä.
   privacy_topic:
     title: "Tietosuojaseloste"
-    body: |
-      <a name="collect"></a>
-
-      ## [Mitä tietoja keräämme?](#collect)
-
-      Tallennamme tietoa sinusta, kun rekisteröidyt sivustolle, ja keräämme tietoa toimistasi palstalla: lukemisestasi, kirjoittamisestasi ja siitä, miten reagoit täällä jaettuun sisältöön.
-
-      Kun rekisteröidyt sivustolle, sinua voidaan pyytää antamaan nimesi ja sähköpostiosoitteesi. Voit kuitenkin halutessasi vierailla sivustolla rekisteröitymättä. Sähköpostiosoitteesi varmistetaan ainutkertaisen linkin sisältävän sähköpostiviestin avulla. Kun linkkiä klikataan, tiedämme sinun hallinnoivan antamaasi sähköpostiosoitetta.
-
-      Kun olet rekisteröitynyt ja kirjoitat, tallennamme IP-osoitteen, josta viesti lähtee. Voimme myös ylläpitää palvelinlokia, joka sisältää jokaista palvelimellemme lähetettyä pyyntöä vastaavan IP-osoitteen.
-
-      <a name="use"></a>
-
-      ## [Mihin käytämme sinusta kerättyä tietoa?](#use)
-
-      Mitä tahansa sinusta kerättyä tietoa voidaan käyttää jollakin näistä tavoista:
-
-      * Tarjotaksemme yksilöllisen kokemuksen &mdash; tietojen avulla vastaamme sinun henkilökohtaisiin tarpeisiisi.
-      * Parantaaksemme sivustoa &mdash; pyrimme jatkuvasti parantamaan sivuston toimintaa kerätyn tiedon ja käyttäjäpalautteen perusteella.
-      * Parantaaksemme asiakaspalvelua &mdash; tiedot auttavat tarjoamaan tehokkaampaa asiakaspalvelua ja teknistä tukea.
-      * Lähettääksemme ajoittain sähköpostiviestejä &mdash; antamaasi sähköpostiosoitteeseen voidaan lähettää tietoa, valitsemiasi ilmoituksia tapahtumista eri ketjuissa tai käyttäjänimeesi liittyen tai vastineita tiedusteluihisi, pyyntöihisi tai kysymyksiisi.
-
-      <a name="protect"></a>
-
-      ## [Miten suojaamme tietojasi?](#protect)
-
-      Meillä on liuta erilaisia turvallisuuskäytänteitä, joilla pidämme henkilötietosi turvassa kun syötät, tallennat tai tarkastelet tietoa.
-
-      <a name="data-retention"></a>
-
-      ## [Miten tietoja säilötään?](#data-retention)
-
-      Pyrimme parhaamme mukaan:
-
-      * Säilömään kaikkia pyyntöjä vastaavan IP-osoitteen sisältävän palvelinlokin enintään 90 päivän ajan.
-      * Säilömään rekisteröityneeseen käyttäjään ja hänen viesteihinsä liittyvät IP-osoitteet enintään 5 vuoden ajan.
-
-      <a name="cookies"></a>
-
-      ## [Käytämmekö evästeitä?](#cookies)
-
-      Kyllä. Evästeet ovat pieniä tiedostoja, jotka sivusto tai sen palveluntarjoaja siirtää tietokoneesi kiintolevylle verkkoselaimesi kautta (jos sallit sen). Nämä evästeet mahdollistavat selaimesi tunnistamisen, ja jos olet rekisteröitynyt käyttäjä, sen yhdistämisen käyttäjätunnukseesi.
-
-      Evästeiden avulla tunnistamme ja tallennamme asetuksia tulevia vierailuja varten ja keräämme yleisluontoista tietoa sivuston liikennemääristä ja sivustolla liikkumisesta, jotta voimme tarjota tulevaisuudessa paremman käyttökokemuksen ja hyödyllisiä toimintoja. Voimme tehdä yhteistyötä kolmansien osapuolien kanssa ymmärtääksemme paremmin sivustolla vierailevia. Näillä palveluntarjoajilla ei ole lupaa käyttää keräämäämme tietoa muuhun kuin palvelumme kehittämiseen.
-
-      <a name="disclose"></a>
-
-      ## [Paljastammeko tietoa ulkopuolisille tahoille?](#disclose)
-
-      Emme myy, vaihda tai muutoin käy kauppaa ulkopuolisten tahojen kanssa yksilöllisesti tunnistettavilla tiedoilla. Tähän poikkeus on luotetut kolmannet osapuolet, jotka auttavat sivustomme ja toimintamme pyörittämisessä tai sinun palvelemisessa; vaadimme näitä tahoja pitämään tiedot luottamuksellisina. Voimme myös jakaa tietojasi, jos uskomme sen olevan tarpeen lain, sivustomme käytäntöjen, omien tai muiden tahojen oikeuksien tai omaisuuden tai turvallisuuden kannalta. Yksilöimättömiä tietoja voidaan kuitenkin jakaa muiden tahojen kanssa kaupankäynnin tai markkinoinnin avuksi tai muuhun käyttöön.
-
-      <a name="third-party"></a>
-
-      ## [Linkit kolmansien tahojen sivustoille](#third-party)
-
-      Joissain tapauksissa, harkintamme mukaan, voimme sallia tai tarjota kolmannen osapuolen tuotteita tai palveluita sivustollamme. Näillä kolmannen osapuolen sivustoilla on erilliset itsenäiset tietosuojaselosteensa. Emme ole vastuussa sisällöstä tai toiminnasta näillä linkitetyillä sivustoilla. Joka tapauksessa pyrimme vaalimaan sivustomme kunniallisuutta ja otamme ilolla vastaan kaikenlaisen palautteen näitä sivustoja koskien.
-
-      <a name="coppa"></a>
-
-      ## [Lapsen yksilönsuoja internetissä -lain noudattaminen](#coppa)
-
-      Sivustomme, tuotteemme ja palvelumme on suunnattu 13-vuotiaille ja sitä vanhemmille. Jos tämä palvelin on Yhdysvalloissa ja olet alle 13-vuotias, COPPA-lain ([Children's Online Privacy Protection Act](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)) nojalla älä käytä tätä sivustoa.
-
-      <a name="online"></a>
-
-      ## [Tietosuojaseloste koskee vain internetiä](#online)
-
-      Tämä tietosuojaseloste koskee vain sivustomme kautta kerättyä tietoa eikä siten koske verkon ulkopuolelta kerättyä tietoa.
-
-      <a name="consent"></a>
-
-      ## [Suostumuksesi](#consent)
-
-      Käyttämällä sivustoa hyväksyt sivustomme tietosuojaselosteen.
-
-      <a name="changes"></a>
-
-      ## [Muutokset tietosuojaselosteeseen](#changes)
-
-      Jos päätämme muuttaa tietosuojaselostettamme, muutokset ovat nähtävissä tällä sivulla.
-
-      Tämä tiedosto on CC-BY-SA-lisensoitu. Viimeksi päivitetty 31.5.2013.
   badges:
     mass_award:
       errors:
@@ -4454,6 +4153,7 @@ fi:
     required_tags_from_group:
       one: "Sinun täytyy lisätä vähintään %{count} ryhmän %{tag_group_name} tunniste. Tämän ryhmän tunnisteet ovat: %{tags}."
       other: "Sinun täytyy lisätä vähintään %{count} ryhmän %{tag_group_name} tunnistetta. Tämän ryhmän tunnisteet ovat: %{tags}."
+    limited_to_one_tag_from_group: "Tunnisteiden %{tags} samanaikainen käyttö ei ole mahdollista. Sisällytä vain yksi."
     invalid_target_tag: "ei voi olla synonyymin synonyymi"
     synonyms_exist: "ei ole sallittua, kun synonyymejä on olemassa"
   rss_by_tag: "Ketjut tunnisteella %{tag}"
@@ -4472,10 +4172,7 @@ fi:
       message: "<p>Lähetimme uuden aktivointiviestin osoitteeseen <b>%{email}</b>"
   safe_mode:
     title: "Siirry vikasietotilaan"
-    description: "Vikasietotilassa voit testata sivustoasi ilman lisäosia ja teemoja."
     no_themes: "Poista teemat ja teeman komponentit käytöstä"
-    no_unofficial_plugins: "Poista epäviralliset lisäosat käytöstä"
-    no_plugins: "Poista kaikki lisäosat käytöstä"
     enter: "Siirry vikasietotilaan"
     must_select: "Ainakin yksi on valittava, jotta voi siirtyä vikasietotilaan."
   wizard:
@@ -4590,7 +4287,6 @@ fi:
           <p>Onnittelut, ja pidä hauskaa <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>rakentaessasi uutta yhteisöäsi!</a></p>
   search_logs:
     graph_title: "Hakujen määrä"
-  joined: "Liittyi"
   discourse_push_notifications:
     popup:
       mentioned: '%{username} mainitsi sinut ketjussa "%{topic}" – %{site_title}'
@@ -4653,15 +4349,9 @@ fi:
         category: alueen asetukset
     actions:
       agree:
-        title: "Hyväksy..."
-      agree_and_keep:
-        title: "Säilytä viesti"
-        description: "Hyväksy merkintä ja pidä viesti ennallaan."
-      agree_and_keep_hidden:
-        title: "Jätä viesti piiloon"
-        description: "Hyväksy merkintä ja jätä viesti piiloon."
+        title: "Kyllä"
       agree_and_suspend:
-        title: "Hyllytä käyttäjä"
+        title: "Jäädytä käyttäjä"
         description: "Hyväksy merkintä ja hyllytä käyttäjä."
       agree_and_silence:
         title: "Hiljennä käyttäjä"
@@ -4671,32 +4361,26 @@ fi:
         description: "Palauta viesti, niin kaikki käyttäjät näkevät sen."
       agree_and_hide:
         title: "Piilota viesti"
-        description: "Piilota viesti ja lähetä käyttäjälle yksityisviesti, jossa pyydetään käyttäjää muokkaamaan viestiä."
+        description: "Hyväksy liputtamalla ja piilota julkaisu + lähetä käyttäjälle automattisesti yksityisviesti, jossa häntä pyydetään muokkaamaan sitä."
       delete_single:
         title: "Poista"
       delete:
         title: "Poista..."
-      delete_and_ignore:
-        title: "Poista viesti ja ohita"
-        description: "Poista viesti: jos on viesti on ketjun ensimmäinen, poista myös ketju"
       delete_and_ignore_replies:
-        title: "Poista viesti + vastaukset ja sivuuta"
-        description: "Poista viesti ja kaikki sen vastaukset; jos viesti on ensimmäinen, poista koko ketju"
         confirm: "Oletko varma, että haluat poistaa myös viestin vastaukset?"
       delete_and_agree:
-        title: "Poista viesti ja hyväksy merkintä"
-        description: "Poista viesti; jos on viesti on ketjun ensimmäinen, poista myös ketju"
+        title: "Poista viesti"
       delete_and_agree_replies:
-        title: "Poista viesti + vastaukset ja hyväksy merkintä"
-        description: "Poista viesti ja kaikki sen vastaukset; jos viesti on ensimmäinen, poista koko ketju"
+        title: "Poista viesti ja vastaukset"
         confirm: "Oletko varma, että haluat poistaa myös viestin vastaukset?"
       disagree_and_restore:
-        title: "Hylkää merkintä ja palauta viesti"
         description: "Palauta viesti, niin kaikki käyttäjät näkevät sen."
       disagree:
-        title: "Hylkää"
+        title: "Ei"
       ignore:
         title: "Sivuuta"
+      ignore_and_do_nothing:
+        title: "Älä tee mitään"
       approve:
         title: "Hyväksy"
       approve_post:
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index 6a69d9977b1..78f558d1b16 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -52,6 +52,8 @@ fr:
   remove_posts_deleted_by_author: "Supprimé par l'auteur"
   redirect_warning: "Nous n'avons pas été en mesure de vérifier que le lien que vous avez sélectionné a bien été publié sur le forum. Si vous souhaitez quand même continuer, sélectionnez le lien ci-dessous."
   on_another_topic: "Sur un autre sujet"
+  topic_tag_changed:
+    removed: "A retiré %{removed}"
   inline_oneboxer:
     topic_page_title_post_number: "numéro %{post_number}"
     topic_page_title_post_number_by_user: "#%{post_number} par %{username}"
@@ -189,9 +191,6 @@ fr:
       load_from_remote: "Une erreur s'est produite lors du chargement de ce message."
     site_settings:
       invalid_category_id: "Vous avez spécifiez une catégorie qui n'existe pas"
-      invalid_choice:
-        one: "Vous avez spécifié le choix invalide %{name}"
-        other: "Vous avez spécifié les choix invalides %{name}"
       default_categories_already_selected: "Vous ne pouvez pas sélectionner une catégorie qui est utilisée dans une autre liste."
       default_tags_already_selected: "Vous ne pouvez pas sélectionner une étiquette utilisée dans une autre liste."
       s3_upload_bucket_is_required: "Vous ne pouvez pas activer l'envoi de fichiers sur S3 avant d'avoir renseigné le paramètre « s3_upload_bucket »."
@@ -199,7 +198,6 @@ fr:
       page_publishing_requirements: "La publication de pages ne peut pas être activée si la sécurisation des médias est activée."
       s3_backup_requires_s3_settings: "Utiliser S3 comme emplacement de sauvegarde nécessite de renseigner le paramètre « %{setting_name} »."
       s3_bucket_reused: "Il n'est pas possible d'utiliser le même bucket pour « s3_upload_bucket » et « s3_backup_bucket ». Choisissez un autre bucket ou utilisez un chemin d'accès différent pour chaque bucket."
-      secure_uploads_requirements: "Les téléversements S3 doivent être activés avant d'activer les téléversements sécurisés."
       share_quote_facebook_requirements: "Vous devez définir un identifiant d'application Facebook pour activer le partage de citation vers Facebook."
       second_factor_cannot_enforce_with_socials: "Vous ne pouvez pas rendre obligatoire l'authentification à deux facteurs lorsque des connexions aux réseaux sociaux sont activées. Vous devez d'abord désactiver la connexion via : %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Vous ne pouvez pas rendre obligatoire l'authentification à deux facteurs lorsque les connexions locales sont désactivées."
@@ -587,10 +585,6 @@ fr:
             duration_minutes:
               cannot_be_zero: "doit être supérieur à 0."
               exceeds_maximum: "ne peut pas dépasser 20 ans."
-        translation_overrides:
-          attributes:
-            value:
-              invalid_interpolation_keys: 'Les clés d''interpolation suivantes sont invalides : « %{keys} »'
         watched_word:
           attributes:
             word:
@@ -610,23 +604,6 @@ fr:
   meta_category_description: "Discussions à propos du site, son organisation, son fonctionnement et comment nous pouvons l'améliorer."
   staff_category_name: "Responsables"
   staff_category_description: "Catégorie privée pour les discussions entre responsables. Les sujets ne sont visibles que pour les administrateurs et les modérateurs."
-  discourse_welcome_topic:
-    title: "Bienvenue dans notre communauté !"
-    body: |2
-
-      Le premier paragraphe de ce sujet épinglé sera visible comme message de bienvenue à tous les nouveaux visiteurs de votre page d'accueil. Il est important !
-
-      **Modifiez le** en une brève description de votre communauté :
-
-      - À qui est-elle destinée ?
-      - Que peuvent-ils y trouver ?
-      - Pourquoi devraient-ils venir ici ?
-      - Où peuvent-ils en savoir plus (liens, ressources, etc.) ?
-
-      <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
-
-      Vous voulez peut-être fermer ce sujet via l'administration :wrench: (dans le coin supérieur droit et en bas) afin que les réponses ne s'accumulent pas après une annonce.
-  admin_quick_start_title: "À LIRE EN PREMIER : Guide de démarrage pour les administrateurs"
   category:
     topic_prefix: "À propos de la catégorie %{category}"
     replace_paragraph: "(Remplacez ce paragraphe par une courte description de votre nouvelle catégorie. Cette information apparaîtra dans la zone de sélection de la catégorie, veillez donc à saisir moins de 200 caractères.)"
@@ -1108,7 +1085,7 @@ fr:
       title: "DAU/MAU"
       xaxis: "Jour"
       yaxis: "DAU/MAU"
-      description: "Nombre d'utilisateurs qui se sont connectés au cours de la dernière journée, divisé par le nombre d'utilisateurs qui se sont connectés au cours du dernier mois. Valeur exprimée en % qui représente le taux d'adhésion de la communauté. Viser > 30 %."
+      description: "Nombre d'utilisateurs qui se sont connectés au cours de la dernière journée, divisé par le nombre d'utilisateurs qui se sont connectés au cours du dernier mois. Valeur exprimée en % qui représente le taux d'adhésion de la communauté. Viser > 20 %."
     daily_engaged_users:
       title: "Utilisateurs impliqués au quotidien"
       xaxis: "Jour"
@@ -1476,7 +1453,6 @@ fr:
     manifest_icon: "Image utilisée comme logo/image de démarrage sur Android. Elle sera automatiquement redimensionnée au format 512 × 512. Si vous laissez ce champ vide, « large_icon » sera utilisée."
     manifest_screenshots: "Captures d'écran qui mettent en valeur les atouts et les fonctionnalités de votre instance du logiciel. Ces images doivent toutes être enregistrées localement sur le serveur et posséder des dimensions identiques."
     favicon: "Un favicon pour votre site, voir <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://fr.wikipedia.org/wiki/Favicon</a> . Pour fonctionner correctement sur un CDN, il doit être au format PNG. Il sera redimensionné en 32x32. Si vous laissez ce champ vide, « large_icon » sera utilisée."
-    apple_touch_icon: "Icône utilisée pour les appareils Apple touch. Elle sera automatiquement redimensionnée en 180x180. Si vous laissez ce champ vide, « large_icon » sera utilisée."
     opengraph_image: "Image opengraph par défaut, utilisée lorsque la page n'a pas d'autre image appropriée. Si vous laissez ce champ vide, « large_icon » sera utilisée"
     twitter_summary_large_image: "Carte Twitter « Summary Card with Large Image » (sa taille doit être d'au moins 280 en largeur et d'au moins 150 en hauteur et ne peut pas être au format .svg). Si vous laissez ce champ vide, les métadonnées normales de carte sont générées à l'aide d'« opengraph_image » tant que celle-ci n'est pas au format .svg également."
     notification_email: "L'adresse e-mail utilisée pour envoyer les e-mails systèmes essentiels et affichée dans le champ « De ». Le nom de domaine spécifié doit comprendre les informations SPF, DKIM et PTR inversé correctement renseignées pour que l'e-mail arrive à destination."
@@ -1607,7 +1583,6 @@ fr:
     enable_discourse_connect: "Activer le système d''authentification DiscourseConnect (précédemment appelé « Discourse SSO »). (ATTENTION : LES ADRESSES E-MAIL DES UTILISATEURS *DOIVENT* ÊTRE VALIDÉES PAR LE SITE EXTERNE !)"
     verbose_discourse_connect_logging: "Journaliser les diagnostics étendus liés au fonctionnement de DiscourseConnect dans le répertoire <a href='%{base_path}/logs' target='_blank'>/logs</a>"
     enable_discourse_connect_provider: "Implémenter le protocole fournisseur de DiscourseConnect (précédemment appelé « Discourse SSO ») au point de terminaison /session/sso_provider, nécessite que le paramètre discourse_connect_provider soit défini"
-    discourse_connect_url: "URL du point de terminaison DiscourseConnect (comprenant http:// ou https://)"
     discourse_connect_secret: "Secret partagé servant à authentifier par cryptographie les informations liées à DiscourseConnect, assurez-vous qu'il compte au minimum 10 caractères"
     discourse_connect_provider_secrets: "Une liste de couples nom de domaine - clé secrète utilisant DiscourseConnect. Assurez-vous que la clé secrète DiscourseConnect compte au minimum 10 caractères. Le caractère de remplacement « * » peut servir à désigner n'importe quel nom de domaine ou n'importe quelle sous-partie d'un nom de domaine (p. ex. : *.exemple.com)."
     discourse_connect_overrides_bio: "Écrase la biographie du profil utilisateur et empêche l'utilisateur de la modifier"
@@ -1621,7 +1596,6 @@ fr:
     discourse_connect_overrides_profile_background: "Écrase l'arrière-plan du profil en le remplaçant par une valeur définie par un site externe, par le biais de données transmises avec le protocole DiscourseConnect."
     discourse_connect_overrides_card_background: "Écrase l'arrière-plan de la carte utilisateur en le remplaçant par une valeur définie par un site externe, par le biais de données transmises avec le protocole DiscourseConnect."
     discourse_connect_not_approved_url: "Rediriger les comptes DiscourseConnect non validés vers cette URL"
-    discourse_connect_allows_all_return_paths: "Ne pas restreindre le nom de domaine du champ return_paths indiqué par DiscourseConnect (si ce paramètres est désactivé, l'emplacement indiqué par « return path » doit se trouver sur le site actuel)"
     enable_local_logins: "Activer l'authentification locale avec nom d'utilisateur et mot de passe. ATTENTION : si ce paramètre est désactivé, il vous sera peut-être impossible de vous connecter si vous n'avez pas configuré au moins une méthode d'authentification alternative."
     enable_local_logins_via_email: "Permettre aux utilisateurs de demander qu'un lien de connexion en un clic leur soit envoyé par e-mail."
     allow_new_registrations: "Autoriser l'inscription des nouveaux utilisateurs. Décocher pour empêcher la création de nouveau compte."
@@ -1725,7 +1699,6 @@ fr:
     composer_media_optimization_image_bytes_optimization_threshold: "Taille minimale du fichier image pour déclencher l'optimisation côté client"
     composer_media_optimization_image_resize_dimensions_threshold: "Largeur d'image minimale pour déclencher le redimensionnement côté client"
     composer_media_optimization_image_resize_width_target: "Les images dont la largeur est supérieure à « composer_media_optimization_image_dimensions_resize_threshold » seront redimensionnées à cette largeur. Doit être >= à « composer_media_optimization_image_dimensions_resize_threshold »."
-    composer_media_optimization_image_encode_quality: "Qualité d'encodage JPEG utilisée dans le processus de réencodage."
     min_ratio_to_crop: "Ratio utilisé pour recadrer les images en hauteur. Saisissez le résultat de la largeur/hauteur."
     simultaneous_uploads: "Nombre maximal de fichiers qui peuvent être glissés et déposés dans l'éditeur"
     default_invitee_trust_level: "Niveau de confiance par défaut (0-4) pour les invités."
@@ -1754,7 +1727,6 @@ fr:
     tl3_requires_likes_given: "Le nombre minimal de « J'aime » à attribuer au cours des (tl3 time period) derniers jours pour être éligible au niveau de confiance 3."
     tl3_requires_likes_received: "Le nombre minimal de « J'aime » à recevoir au cours des (tl3 time period) derniers jours pour être éligible au niveau de confiance 3."
     tl3_links_no_follow: "Ne pas retirer rel=nofollow sur les liens des messages par les utilisateurs de niveau de confiance 3."
-    trusted_users_can_edit_others: "Permettre aux utilisateurs ayant un niveau de confiance élevé de modifier le contenu d'autres utilisateurs"
     min_trust_to_create_topic: "Le niveau de confiance minimal pour créer un nouveau sujet."
     allow_flagging_staff: "Si cette option est activée, les utilisateurs peuvent signaler les messages des responsables."
     min_trust_to_edit_wiki_post: "Le niveau de confiance minimal requis pour modifier les messages de type wiki."
@@ -1790,7 +1762,6 @@ fr:
     title_min_entropy: "L'entropie minimale (caractères uniques, les caractères en langues étrangères comptent davantage) requise pour le titre d'un sujet."
     body_min_entropy: "L'entropie minimale (caractères uniques, les caractères en langues étrangères comptent davantage) requise pour le corps d'un message."
     allow_uppercase_posts: "Autoriser les messages ou les titres de sujets entièrement en majuscules."
-    max_consecutive_replies: "Nombre de messages consécutifs qu'un utilisateur peut publier dans un sujet avant de ne plus pouvoir ajouter de nouvelle réponse."
     enable_filtered_replies_view: 'Le bouton « (n) réponses » réduit tous les autres messages et n''affiche que le message actuel et ses réponses.'
     title_fancy_entities: "Convertir les caractères ASCII communs en jolies entités HTML dans les titres des sujets, comme SmartyPants <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</a>"
     min_title_similar_length: "La taille minimale d'un titre avant que l'on vérifie l'existence de sujets identiques."
@@ -1870,6 +1841,11 @@ fr:
     block_auto_generated_emails: "Bloquer les e-mails entrants identifiés comme étant générés automatiquement."
     ignore_by_title: "Ignorer les e-mails entrants selon leur titre."
     mailgun_api_key: "Clé API secrète de Mailgun utilisée pour vérifier les messages du Webhook."
+    sendgrid_verification_key: "Clé de vérification Sendgrid utilisée pour vérifier les messages du webhook."
+    mailjet_webhook_token: "Jeton utilisé pour vérifier la charge utile du webhook. Il doit être transmis en tant que paramètre de requête « t » du webhook, par exemple : https://example.com/webhook/mailjet?t=supersecret"
+    mandrill_authentication_key: "Clé d'authentification Mandrill utilisée pour vérifier les messages du webhook."
+    postmark_webhook_token: "Jeton utilisé pour vérifier la charge utile du webhook. Il doit être transmis en tant que paramètre de requête « t » du webhook, par exemple : https://example.com/webhook/postmark?t=supersecret"
+    sparkpost_webhook_token: "Jeton utilisé pour vérifier la charge utile du webhook. Il doit être transmis en tant que paramètre de requête « t » du webhook, par exemple : https://example.com/webhook/sparkpost?t=supersecret"
     soft_bounce_score: "Valeur ajoutée au taux d'e-mails non délivrés de l'utilisateur quand un e-mail ne peut pas être délivré temporairement."
     hard_bounce_score: "Valeur ajoutée au taux d'e-mails non délivrés de l'utilisateur quand plus aucun e-mail ne peut être délivré à son adresse."
     bounce_score_threshold: "Taux maximal d'e-mails non délivrés à partir duquel nous arrêterons d'envoyer des e-mails à un utilisateur."
@@ -1897,7 +1873,6 @@ fr:
     pop3_polling_password: "Le mot de passe du compte POP3 à interroger pour les e-mails."
     pop3_polling_delete_from_server: "Supprimer les e-mails du serveur. NOTE : si vous désactivez ceci vous devrez vider manuellement votre boîte de réception."
     log_mail_processing_failures: "Enregistrer tous les problèmes d'e-mail dans <a href='%{base_path}/logs' target='_blank'>/logs</a>"
-    email_in: 'Autoriser les utilisateurs à créer de nouveaux sujets par e-mail (nécessite une requête manuelle ou via POP3). Configurez les adresses dans l''onglet « Paramètres » de chaque catégorie.'
     email_in_min_trust: "Le niveau de confiance minimal qu'un utilisateur doit avoir pour être autorisé à créer de nouveaux sujets par e-mail."
     email_in_authserv_id: "L'identifiant du service vérifiant l'authentification des e-mails entrants. Voir <a href='https://meta.discourse.org/t/134358'>https://meta.discourse.org/t/134358</a> pour obtenir plus d'informations."
     email_in_spam_header: "En-tête d'e-mail pour détecter du spam."
@@ -1970,22 +1945,17 @@ fr:
     permalink_normalizations: "Appliquer l'expression régulière suivante avant de détecter les permaliens, par exemple /(\\/topic.*)\\?.*/\\1 supprimera les chaînes de requête des chemins de sujet. Le format est regex+string, utilisez \\1 etc. pour capturer des séquences"
     global_notice: "Afficher une bannière de notification d'URGENCE globale qui ne peut pas être ignorée par les visiteurs (HTML autorisé). Laissez le champ vide pour masquer la bannière."
     disable_system_edit_notifications: "Désactiver les notifications de modifications par l'utilisateur système lorsque l'option « download_remote_images_to_local » est activée."
-    disable_category_edit_notifications: "Ne pas déclencher de notifications lorsque la catégorie d'un sujet est modifiée."
-    disable_tags_edit_notifications: "Ne pas déclencher de notifications lorsque les étiquettes d'un sujet sont modifiées."
     notification_consolidation_threshold: "Nombre de notifications de « J'aime » ou de demandes d'adhésion à partir duquel les notifications sont regroupées en une seule. Mettre 0 pour désactiver."
     likes_notification_consolidation_window_mins: "Durée en minutes après laquelle les notifications de « J'aime » sont consolidées en une seule notification une fois que le seuil est atteint. Le seuil peut être configuré via « SiteSetting.Notification_Consolidation_Threshold »."
     automatically_unpin_topics: "Désépingler automatiquement les sujets lorsque l'utilisateur atteint la fin de la liste."
     read_time_word_count: "Nombre de mots par minute servant de base de calcul à l'estimation du temps de lecture."
     topic_page_title_includes_category: "La <a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title' target='_blank'>balise title</a> de la page du sujet comprend le nom de la catégorie."
-    native_app_install_banner_ios: "Affiche la bannière de l'application DiscourseHub sur les appareils iOS aux utilisateurs habitués (niveau de confiance 1 ou supérieur)."
-    native_app_install_banner_android: "Affiche la bannière de l'application DiscourseHub sur les appareils Android aux utilisateurs habitués (niveau de confiance 1 ou supérieur)."
     app_association_android: "Contenu de <a href='%{base_path}/.well-known/assetlinks.json'>.well-known/assetlinks.json</a>, utilisé par l'API Digital Asset Links de Google."
     app_association_ios: "Contenu de <a href='%{base_path}/apple-app-site-association'>apple-app-site-association</a>, utilisé pour créer des Universal Links entre ce site et des applications iOS."
     share_anonymized_statistics: "Partager les statistiques d'utilisation anonymes."
     auto_handle_queued_age: "Après tant de jours écoulés, traiter automatiquement les éléments en attente d'examen. Les signalements seront ignorés, les messages et les utilisateurs en attente d'examen seront rejetés. Réglez cette valeur à 0 pour désactiver cette fonction."
     penalty_step_hours: "Durées par défaut de mise en sourdine ou de suspension des utilisateurs, en heures. La première valeur correspond à la première infraction d'un compte, la deuxième valeur à sa deuxième infraction, etc."
     svg_icon_subset: "Ajouter des icônes supplémentaires FontAwesome 5 que vous souhaitez inclure dans vos médias. Utilisez le préfixe « fa- » pour les icônes solides, « far- » pour les icônes normales et « fab- » pour les icônes de marques."
-    max_prints_per_hour_per_user: "Nombre maximal d'accès à la page /print (mettre à 0 pour désactiver)"
     full_name_required: "Le nom complet est requis dans le profil utilisateur."
     enable_names: "Autoriser l'affichage des noms complets des utilisateurs dans leur profil, sur leur carte d'utilisateur et dans les e-mails. Décocher pour masquer les noms complets partout."
     display_name_on_posts: "Afficher le nom complet de l'utilisateur dans ses messages en plus de son nom d'utilisateur."
@@ -2006,17 +1976,11 @@ fr:
     allowed_href_schemes: "Préfixes autorisés dans les liens en plus de http et https."
     embed_post_limit: "Nombre maximal de messages à intégrer."
     embed_username_required: "Un nom d'utilisateur est nécessaire pour la création du sujet."
-    notify_about_flags_after: "Si des signalements n'ont pas été gérés après ce nombre d'heures, envoyer un message direct aux modérateurs. 0 pour désactiver."
-    show_create_topics_notice: "Si le site contient moins de 5 sujets publics, afficher un message pour demander aux administrateurs de créer d'autres sujets."
     delete_drafts_older_than_n_days: "Supprimer les brouillons remontant à plus de (n) jours."
     delete_merged_stub_topics_after_days: "Délai (en jours) de suppression automatique des sujets fusionnés, c'est-à-dire les sujets sans réponses résultant de la fusion de deux sujets par déplacement de messages. Si la valeur est fixée à 0, les sujets fusionnés ne seront pas supprimés."
-    bootstrap_mode_min_users: "Nombre minimal d'utilisateurs nécessaire pour désactiver le mode d'amorçage (mettre à 0 pour désactiver)"
     prevent_anons_from_downloading_files: "Empêcher les utilisateurs anonymes de télécharger les pièces jointes."
-    secure_media: "OBSOLÈTE : utilisez plutôt le paramètre secure_uploads, qui sera supprimé dans Discourse 3.0."
     secure_uploads: 'Limite l''accès à TOUS les fichiers envoyés (image, vidéo, audio, texte, PDF, ZIP, etc.). Si le paramètre « connexion requise » est activé, seuls les utilisateurs connectés peuvent accéder aux fichiers envoyés. Sinon, l''accès sera limité uniquement aux contenus multimédias des messages et catégories privés. ATTENTION : ce paramètre est complexe et nécessite des connaissances d''administration approfondies. Consultez <a target="_blank" href="https://meta.discourse.org/t/-/140017">ce sujet sur les téléversements sécurisés</a> pour en savoir plus.'
-    secure_media_allow_embed_images_in_emails: "OBSOLÈTE : utilisez secure_uploads_allow_embed_images_in_emails, qui sera supprimé dans Discourse 3.0."
     secure_uploads_allow_embed_images_in_emails: "Autorise l'intégration d'images sécurisées (qui seraient autrement expurgées) dans les e-mails, si leur taille est inférieure à la valeur du paramètre « secure uploads max email embed image size kb »."
-    secure_media_max_email_embed_image_size_kb: "OBSOLÈTE : Utilisez secure_uploads_max_email_embed_image_size_kb, qui sera supprimé dans Discourse 3.0."
     secure_uploads_max_email_embed_image_size_kb: "La taille maximale d'images sécurisées qui seront intégrées dans des e-mails si le paramètre « secure uploads allow embed in emails » est activé. Si celui-ci n'est pas activé, ce paramètre est sans effet."
     slug_generation_method: "Choisissez une méthode de génération d'identifiant. « encoded » générera des chaînes de caractères encodées avec des pourcentages. « none » désactivera complètement les identifiants."
     enable_emoji: "Activer les émojis"
@@ -2083,7 +2047,6 @@ fr:
     revoke_api_keys_days: "Nombre de jours avant qu'une clé API inutilisée soit automatiquement révoquée (0 pour jamais)"
     allow_user_api_keys: "Autoriser la génération des clés de l'API utilisateur"
     allow_user_api_key_scopes: "Liste des champs d'action autorisés pour les clés de l'API utilisateur"
-    min_trust_level_for_user_api_key: "Niveau de confiance requis pour générer des clés pour l'API utilisateur"
     allowed_user_api_auth_redirects: "URL autorisée pour la redirection d'un utilisateur lors de l'authentification via les clés d'API. Le symbole « * » peut être utilisé pour remplacer n'importe quelle partie de cette adresse (p. ex. : www.exemple.fr/*)."
     allowed_user_api_push_urls: "Adresses URL autorisées pour le service push du serveur vers l'API utilisateur"
     expire_user_api_keys_days: "Nombre de jours avant l'expiration automatique d'une clé API utilisateur (0 pour jamais)"
@@ -2115,7 +2078,6 @@ fr:
     enable_sitemap: "Générez un sitemap pour votre site et l'inclure dans le fichier robots.txt."
     sitemap_page_size: "Nombre d'URL à inclure dans chaque page de sitemap. Maximum 50 000"
     enable_user_status: "(expérimental) Autoriser les utilisateurs à définir un message d'état personnalisé (émoji + description)."
-    enable_user_tips: "(expérimental) Activer les nouveaux conseils d'utilisation qui décrivent les fonctionnalités clés aux utilisateurs"
     short_title: "Le titre court sera utilisé sur l'écran d'accueil de l'utilisateur, le lanceur d'applications ou d'autres endroits où la place disponible est limitée. Il devrait être limité à 12 caractères."
     dashboard_hidden_reports: "Permettre de masquer les rapports du tableau de bord."
     dashboard_visible_tabs: "Choisissez les onglets visibles sur le tableau de bord."
@@ -2132,10 +2094,6 @@ fr:
     suggest_weekends_in_date_pickers: "Inclure les week-ends dans les suggestions du sélectionneur de date (désactivez ce paramètre si vous n'utilisez Discourse que les jours de semaine)."
     splash_screen: "Affiche un écran de chargement temporaire pendant le chargement des ressources du site"
     navigation_menu: "Déterminer le menu de navigation à utiliser. La navigation dans la barre latérale et l'en-tête sont personnalisables par les utilisateurs. L'option Legacy est disponible pour des raisons de rétrocompatibilité."
-    default_sidebar_categories: "Les catégories sélectionnées seront affichées par défaut dans la section Catégories de la barre latérale."
-    default_sidebar_tags: "Les étiquettes sélectionnées seront affichées par défaut dans la section Étiquettes de la barre latérale."
-    enable_new_user_profile_nav_groups: "EXPÉRIMENTAL : les utilisateurs des groupes sélectionnés verront apparaître le nouveau menu de navigation du profil utilisateur"
-    enable_experimental_topic_timeline_groups: "EXPÉRIMENTAL : les utilisateurs des groupes sélectionnés verront la chronologie du sujet remaniée"
     enable_experimental_hashtag_autocomplete: "EXPÉRIMENTAL : utilisez le nouveau système de saisie semi-automatique #hashtag pour les catégories et les balises, il affiche différemment l'élément sélectionné et améliore la recherche"
     errors:
       invalid_css_color: "Couleur non valide. Indiquez un nom de couleur ou une valeur hexadécimale."
@@ -2162,7 +2120,6 @@ fr:
       pop3_polling_password_is_empty: "Vous devez définir « pop3 polling password » avant d'activer le relevé via POP3."
       pop3_polling_authentication_failed: "Échec de l'authentification POP3. Veuillez vérifier vos identifiants POP3."
       reply_by_email_address_is_empty: "Vous devez configurer le paramètre « reply by email address » avant d'activer les réponses par e-mail."
-      email_polling_disabled: "Vous devez activer le relevé manuel ou via POP3 avant d'activer les réponses par e-mail."
       user_locale_not_enabled: "Vous devez d'abord activer « allow user locale » avant d'activer ce paramètre."
       personal_message_enabled_groups_invalid: "Vous devez spécifier au moins un groupe pour ce paramètre. Si vous ne souhaitez pas que quelqu'un d'autre que les responsables envoie des messages directs, choisissez le groupe des responsables."
       invalid_regex: "L'expression régulière est invalide ou non autorisée."
@@ -2171,7 +2128,6 @@ fr:
       staged_users_disabled: "Vous devez d'abord activer « staged users » avant d'activer ce paramètre."
       reply_by_email_disabled: "Vous devez d'abord activer « reply by email » avant d'activer ce paramètre."
       discourse_connect_url_is_empty: "Avant d'activer ce paramètre, vous devez d'abord définir le paramètre « discourse connect url »."
-      discourse_connect_invite_only: "Il ne vous est pas possible d'activer simultanément DiscourseConnect et le paramètre « invite only »."
       enable_local_logins_disabled: "Vous devez d'abord activer « enable local logins » avant d'activer ce paramètre."
       min_username_length_exists: "Il n'est pas possible de définir une longueur minimale de nom d'utilisateur qui soit plus longue qu'un nom d'utilisateur qui existe déjà (%{username})."
       min_username_length_range: "Il n'est pas possible de définir un minimum plus grand qu'un maximum."
@@ -2193,7 +2149,6 @@ fr:
       search_tokenize_japanese_enabled: "Pour activer ce paramètre, vous devez d'abord désactiver « search_tokenize_japanese »."
       discourse_connect_cannot_be_enabled_if_second_factor_enforced: "Vous ne pouvez pas activer DiscourseConnect si la 2FA est obligatoire."
       delete_rejected_email_after_days: "Ce paramètre ne peut pas être inférieur au paramètre delete_email_logs_after_days ou supérieur à %{max}"
-      invalid_uncategorized_category_setting: "La catégorie Sans catégorie ne peut pas être sélectionnée si l'autorisation des sujets sans catégorie n'est pas autorisée"
     placeholder:
       discourse_connect_provider_secrets:
         key: "www.example.com"
@@ -2388,7 +2343,6 @@ fr:
     activated_by_staff: "Activé par un responsable"
     new_user_typed_too_fast: "Le nouvel utilisateur écrivait trop rapidement"
     content_matches_auto_silence_regex: "Le contenu correspond à l'expression régulière de mise en sourdine automatique"
-    content_matches_auto_block_regex: "Le contenu correspond à l'expression régulière de blocage automatique"
     username:
       short: "doit contenir au moins %{min} caractères"
       long: "ne doit pas contenir plus de %{max} caractères"
@@ -3128,14 +3082,6 @@ fr:
     user_automatically_silenced:
       title: "Utilisateur automatiquement mis en sourdine"
       subject_template: "Nouvel utilisateur %{username} mis en sourdine suite à des signalements de la communauté"
-      text_body_template: |
-        Ce message vous est envoyé de manière automatisée.
-
-        Le nouvel utilisateur [%{username}](%{user_url}) a été automatiquement mis en sourdine car plusieurs utilisateurs ont signalé des messages publiés par %{username}.
-
-        Nous vous invitons à [examiner ces signalements](%{base_url}/admin/flags). Si %{username} a été mis en sourdine de façon injustifiée, utilisez le bouton d'annulation de la mise en sourdine situé sur la [page d'administration de cet utilisateur](%{user_url}).
-
-        Le seuil de signalements déclenchant l'envoi de ce message peut être modifié avec le paramètre « silence_new_user ».
     spam_post_blocked:
       title: "Message spam bloqué"
       subject_template: "Les messages du nouvel utilisateur %{username} sont bloqués pour des liens répétés"
@@ -3169,15 +3115,6 @@ fr:
       title: "Téléchargement d'images distantes désactivé"
       subject_template: "Téléchargement d'images distantes désactivé"
       text_body_template: "Le paramètre « download_remote_images_to_local » a été désactivé car la limite (« download_remote_images_threshold ») d'espace disque utilisé par les images vient d'être dépassée."
-    dashboard_problems:
-      title: "Problèmes du tableau de bord"
-      subject_template: "Des nouveaux conseils sur votre tableau de bord"
-      text_body_template: |
-        Nous avons de nouveaux conseils et recommandations pour vous d'après vos paramètres actuels.
-
-        [Rendez-vous sur votre tableau de bord](%{base_url}/admin) pour les voir.
-
-        Si rien n'est visible sur votre tableau de bord, il est possible qu'un autre responsable ait déjà appliqué ces conseils. Une liste des actions réalisées par les responsables se trouve sur la page [Actions des responsables](%{base_url}/admin/logs/staff_action_logs).
     new_user_of_the_month:
       title: "Vous êtes un nouvel utilisateur ou une nouvelle utilisatrice du mois !"
       subject_template: "Vous êtes un nouvel utilisateur ou une nouvelle utilisatrice du mois !"
@@ -3214,9 +3151,6 @@ fr:
       one: "Rappel : nous envoyons un maximum de %{count} e-mail quotidien. Accédez au site pour le consulter."
       other: "Rappel : nous envoyons un maximum de %{count} e-mails quotidiens. Accédez au site pour voir lesquels pourraient être retenus. P.S. : merci d'être populaire !"
     in_reply_to: "En réponse à"
-    unsubscribe:
-      title: "Se désabonner"
-      description: "Ces e-mailsne vous intéressent pas ? Aucun problème ! Cliquez ci-dessous pour vous désabonner immédiatement :"
     reply_by_email: "[Voir le sujet](%{base_url}%{url}) ou répondre à cet e-mail pour répondre."
     reply_by_email_pm: "[Voir le message](%{base_url}%{url}) ou répondre à cet e-mail pour répondre à %{participants}."
     only_reply_by_email: "Répondre à cet e-mail pour répondre."
@@ -3513,7 +3447,6 @@ fr:
       liked_received: "« J'aime » reçus"
       new_users: "Nouveaux utilisateurs"
       popular_topics: "Sujets populaires"
-      follow_topic: "Suivre ce sujet"
       join_the_discussion: "Lire la suite"
       popular_posts: "Messages populaires"
       more_new: "Nouveau pour vous"
@@ -3716,15 +3649,6 @@ fr:
   offline:
     title: "Impossible de charger l'application"
     offline_page_message: "Il semble que vous n'êtes pas connecté(e) à Internet ! Veuillez vérifier votre connexion réseau et réessayez."
-  login_required:
-    welcome_message: |
-      ## [Bienvenue sur %{title}](#welcome)
-      Un compte est nécessaire. Veuillez en créer un ou connectez-vous pour continuer.
-    welcome_message_invite_only: |
-      ## [Bienvenue sur %{title}](#welcome)
-      Un compte est nécessaire. Veuillez demander une invitation à un membre ou connectez-vous pour continuer.
-  deleted: "supprimé"
-  image: "image"
   upload:
     edit_reason: "téléchargement de copies locales des images distantes"
     unauthorized: "Nous sommes désolés, le fichier que vous essayez d'envoyer n'est pas autorisé (extensions autorisées : %{authorized_extensions})."
@@ -3924,262 +3848,8 @@ fr:
       Le jargon juridique est ennuyeux, certes, mais nous devons veiller à nous protéger (et par extension, à vous protéger, ainsi que vos données) contre les individus mal intentionnés. Nous avons des [conditions générales d'utilisation](%{base_path}/tos) qui décrivent vos droits et devoirs (ainsi que les nôtres) ayant trait au contenu, à la protection de la vie privée et à la législation. Pour utiliser ce service, vous devez respecter nos [CGU](%{base_path}/tos).
   tos_topic:
     title: "Conditions générales d'utilisation"
-    body: |
-      Ces conditions régissent l'utilisation du forum en ligne à l'adresse <%{base_url}>. Pour utiliser le forum, vous devez accepter ces conditions auprès de %{company_name}, l'entreprise qui gère le forum.
-
-      L'entreprise peut proposer d'autres produits et services, selon des conditions différentes. Ces conditions s'appliquent uniquement à l'utilisation du forum.
-
-      Passer à :
-
-      - [Conditions importantes](#heading--important-terms)
-      - [Votre permission d'utiliser le forum](#heading--permission)
-      - [Conditions d'utilisation du forum](#heading--conditions)
-      - [Utilisation acceptable](#heading--acceptable-use)
-      - [Normes relatives au contenu](#heading--content-standards)
-      - [Application](#heading--enforcement)
-      - [Votre compte](#heading--your-account)
-      - [Votre contenu](#heading--your-content)
-      - [Votre responsabilité](#heading--responsability)
-      - [Clauses de non-responsabilité](#heading--disclaimers)
-      - [Limites de responsabilité](#heading--responsability)
-      - [Commentaires](#heading--feedback)
-      - [Résiliation](#heading--termination)
-      - [Litiges](#heading--disputes)
-      - [Conditions générales](#heading--general)
-      - [Contact](#heading--contact)
-      - [Modifications](#heading--changes)
-
-      <h2 id="heading--important-terms"><a href="#heading--important-terms">Conditions importantes</a></h2>
-
-      ***Ces conditions comprennent un certain nombre de dispositions importantes qui affectent vos droits et responsabilités, telles que les [Clauses de non-responsabilité](#heading--disclaimers), les limites de la responsabilité de l'entreprise envers vous dans [Limites de responsabilité](#heading--liability), votre accord pour couvrir l'entreprise en cas de dommages causés par votre mauvaise utilisation du forum dans [Votre responsabilité](#heading--responsibility), et un accord pour arbitrer les litiges dans [Litiges](#heading--disputes).***
-
-      <h2 id="heading--permission"><a href="#heading--permission">Votre permission d'utiliser le forum</a></h2>
-
-      Sous réserve de ces conditions, l'entreprise vous autorise à utiliser le forum. Chaque utilisateur doit accepter ces conditions pour pouvoir utiliser le forum.
-
-      <h2 id="heading--conditions"><a href="#heading--conditions">Conditions d'utilisation du forum</a></h2>
-
-      Votre permission d'utiliser le forum est soumise aux conditions suivantes :
-
-      1. Vous devez être âgé(e) d'au moins treize ans.
-
-      2. Vous ne pouvez plus utiliser le forum si l'entreprise vous contacte directement afin de vous l'interdire.
-
-      3. Vous devez utiliser le forum conformément à l'[utilisation acceptable](#heading--acceptable-use) et aux [normes relatives au contenu](#heading--content-standards).
-
-      <h2 id="heading--acceptable-use"><a href="#heading--acceptable-use">Utilisation acceptable</a></h2>
-
-      1. Vous ne pouvez pas enfreindre la loi en utilisant le forum.
-
-      2. Vous ne pouvez pas utiliser ou essayer d'utiliser le compte d'une autre personne sur le forum sans son autorisation expresse.
-
-      3. Vous ne pouvez pas acheter, vendre ou échanger des noms d'utilisateur ou d'autres identifiants uniques sur le forum.
-
-      4. Vous ne pouvez pas envoyer de publicités, de chaînes de lettres ou d'autres sollicitations par le biais du forum, ni utiliser le forum pour recueillir des adresses ou d'autres données personnelles pour des listes de diffusion ou des bases de données commerciales.
-
-      5. Vous ne pouvez pas automatiser l'accès au forum, ni surveiller le forum, par exemple à l'aide d'un robot d'exploration du Web, d'une extension ou d'un module complémentaire de navigateur, ou d'un autre programme informatique qui n'est pas un navigateur Web. Vous ne pouvez pas parcourir le forum afin de l'indexer dans un moteur de recherche accessible au public, si vous en gérez un.
-
-      6. Vous ne pouvez pas utiliser le forum pour envoyer des e-mails à des listes de distribution, des groupes de discussion ou des alias de messagerie de groupe.
-
-      7. Vous ne pouvez pas laisser entendre à tort que vous êtes affilié(e) à l'entreprise ou que vous la soutenez.
-
-      8. Vous ne pouvez pas faire de lien hypertexte vers des images ou tout autre contenu non hypertexte du forum sur d'autres pages Web.
-
-      9. Vous ne pouvez pas supprimer les marques indiquant la propriété des matériaux que vous téléchargez sur le forum.
-
-      10. Vous ne pouvez pas montrer une partie du forum sur d'autres sites Web avec `<iframe>`.
-
-      11. Vous ne pouvez pas désactiver, éviter ou contourner les restrictions de sécurité ou d'accès du forum.
-
-      12. Vous ne pouvez pas solliciter l'infrastructure du forum avec un volume déraisonnable de demandes, ou des demandes conçues pour imposer une charge déraisonnable aux systèmes d'information sous-jacents au forum.
-
-      13. Vous ne pouvez pas vous faire passer pour d'autres personnes par le biais du forum.
-
-      14. Vous ne pouvez pas encourager ou aider quiconque à violer ces conditions.
-
-      <h2 id="heading--content-standards"><a href="#heading--content-standards">Normes relatives au contenu</a></h2>
-
-      1. Vous ne pouvez pas soumettre de contenu sur le forum qui soit illégal, offensant ou autrement nuisible pour les autres. Cela inclut le contenu qui constitue un harcèlement, une conduite inappropriée, abusive ou haineuse.
-
-      2. Vous ne pouvez pas soumettre de contenu sur le forum qui viole la loi, enfreint les droits de propriété intellectuelle de quiconque, viole la vie privée de quiconque ou enfreint les accords que vous avez conclus avec d'autres personnes.
-
-      3. Vous ne pouvez pas soumettre sur le forum du contenu contenant des codes informatiques malveillants, tels que des virus informatiques ou des logiciels espions.
-
-      4. Vous ne pouvez pas soumettre sur le forum du contenu en tant que simple espace réservé, pour contenir une adresse particulière, un nom d'utilisateur ou tout autre identifiant unique.
-
-      5. Vous ne pouvez pas utiliser le forum pour divulguer des informations que vous n'avez pas le droit de divulguer, comme les informations confidentielles ou personnelles d'autres personnes.
-
-      <h2 id="heading--enforcement"><a href="#heading--enforcement">Application</a></h2>
-
-      L'entreprise peut enquêter sur les violations de ces conditions et engager des poursuites en justice dans toute la mesure permise par la loi. L'entreprise peut informer les autorités chargées de l'application de la loi et coopérer avec elles pour poursuivre les violations de la loi et des présentes conditions.
-
-      L'entreprise se réserve le droit de modifier, rédiger et supprimer le contenu du forum pour quelque raison que ce soit. Si vous pensez que quelqu'un a soumis du contenu sur le forum en violation des présentes conditions, [contactez-nous immédiatement](#heading--contact).
-
-      <h2 id="heading--your-account"><a href="#heading--your-account">Votre compte</a></h2>
-
-      Vous devez créer et vous connecter à un compte pour utiliser certaines fonctions du forum.
-
-      Pour créer un compte, vous devez fournir certaines informations vous concernant. Si vous créez un compte, vous acceptez de fournir, au minimum, une adresse e-mail valide, et de maintenir cette adresse à jour. Vous pouvez fermer votre compte à tout moment en envoyant un e-mail à <%{contact_email}>.
-
-      Vous acceptez d'être responsable de toutes les actions effectuées à l'aide de votre compte, qu'elles soient autorisées par vous ou non, jusqu'à ce que vous fermiez votre compte ou que vous informiez l'entreprise que votre compte a été compromis. Vous acceptez d'informer immédiatement l'entreprise si vous soupçonnez que votre compte a été compromis. Vous acceptez de choisir un mot de passe sécurisé pour votre compte et de le garder secret.
-
-      L'entreprise peut restreindre, suspendre ou fermer votre compte sur le forum conformément à sa politique de traitement des demandes de retrait liées au droit d'auteur, ou si l'entreprise estime raisonnablement que vous avez enfreint une règle des présentes conditions.
-
-      <h2 id="heading--your-content"><a href="#heading--your-content">Votre contenu</a></h2>
-
-      Rien dans les présentes conditions ne donne à l'entreprise des droits de propriété sur la propriété intellectuelle que vous partagez avec le forum, comme les informations de votre compte, vos messages ou tout autre contenu que vous soumettez sur le forum. Rien dans ces conditions ne vous donne non plus de droits de propriété sur la propriété intellectuelle de l'entreprise.
-
-      Entre vous et l'entreprise, vous restez seul(e) responsable du contenu que vous soumettes sur le forum. Vous acceptez de ne pas laisser entendre à tort que le contenu que vous soumettez sur le forum est parrainé ou approuvé par l'entreprise. Les présentes conditions n'obligent pas l'entreprise à stocker, conserver ou fournir des copies du contenu que vous soumettez, et à le modifier, conformément aux présentes conditions.
-
-      Le contenu que vous soumettez sur le forum vous appartient, et c'est vous qui décidez de l'autorisation à donner aux autres utilisateurs pour ce contenu. Mais au minimum, vous autorisez l'entreprise à fournir le contenu que vous soumettez sur le forum à d'autres utilisateurs du forum. Cette licence spéciale permet à l'entreprise de copier, publier et analyser le contenu que vous soumettez sur le forum.
-
-      Lorsque le contenu que vous soumettez est supprimé du forum, que ce soit par vous ou par l'entreprise, la licence spéciale de l'entreprise prend fin lorsque la dernière copie disparaît des sauvegardes, caches et autres systèmes de l'entreprise. Les autres licences que vous appliquez au contenu que vous envoyez, comme les licences [Creative Commons](https://creativecommons.org), peuvent continuer après la suppression de votre contenu. Ces licences peuvent donner à d'autres personnes, ou à l'entreprise elle-même, le droit de partager à nouveau votre contenu via le forum.
-
-      Les autres personnes qui reçoivent le contenu que vous soumettez sur le forum peuvent violer les conditions de licence de votre contenu. Vous acceptez que l'entreprise ne soit pas responsable envers vous de ces violations ou de leurs conséquences.
-
-      <h2 id="heading--responsibility"><a href="#heading--responsibility">Votre responsabilité</a></h2>
-
-      Vous acceptez d'indemniser l'entreprise en cas de poursuites judiciaires par d'autres personnes liées à votre violation de ces conditions, ou à la violation de ces conditions par d'autres personnes utilisant votre compte sur le forum. Vous et l'entreprise acceptez d'informer l'autre partie de toute réclamation légale pour laquelle vous pourriez devoir indemniser l'entreprise dès que possible. Si l'entreprise ne vous informe pas rapidement d'une réclamation légale, vous n'aurez pas à indemniser l'entreprise pour les dommages que vous auriez pu éviter ou atténuer avec une notification rapide. Vous acceptez de permettre à l'entreprise de contrôler l'enquête, la défense et le règlement des réclamations légales pour lesquelles vous devriez indemniser l'entreprise, et de coopérer à ces efforts. L'entreprise accepte de ne pas accepter de règlement qui admet votre faute ou vous impose des obligations sans votre accord préalable.
-
-      <h2 id="heading--disclaimers"><a href="#heading--disclaimers">Clauses de non-responsabilité</a></h2>
-
-      ***Vous acceptez tous les risques liés à l'utilisation du forum et de son contenu. Dans la mesure où la loi le permet, l'entreprise et ses fournisseurs fournissent le forum en l'état, sans aucune garantie.***
-
-      Le forum peut contenir des liens hypertextes et intégrer des forums et des services gérés par d'autres intervenants. L'entreprise ne donne aucune garantie sur les services gérés par d'autres intervenants ou sur le contenu qu'ils peuvent fournir. L'utilisation de services gérés par d'autres intervenants peut être régie par d'autres conditions applicables entre vous et le gestionnaire du service.
-
-      <h2 id="heading--liability"><a href="#heading--liability">Limites de responsabilité</a></h2>
-
-      ***Ni l'entreprise ni ses fournisseurs ne seront responsables envers vous des dommages liés à la violation du contrat que leur personnel n'aurait pas pu raisonnablement prévoir lorsque vous avez accepté ces conditions.***
-
-      ***Dans la mesure où la loi le permet, la responsabilité totale envers vous pour les réclamations de toute nature liées au forum ou au contenu du forum sera limitée à 50 $.***
-
-      <h2 id="heading--feedback"><a href="#heading--feedback">Commentaires</a></h2>
-
-      L'entreprise est heureuse de recevoir vos commentaires et vos suggestions au sujet du forum. Consultez la section [Contact](#heading--contact) ci-dessous pour connaître les moyens de nous contacter.
-
-      Vous acceptez que l'entreprise est libre d'agir en fonction des commentaires et suggestions que vous fournissez, et qu'elle n'a pas à vous informer si vos commentaires ont été utilisés, à obtenir votre permission de les utiliser ou à vous rémunérer à ce sujet. Vous acceptez de ne pas soumettre de commentaires ou de suggestions qui, selon vous, pourraient être confidentiels ou exclusifs, pour vous ou pour d'autres personnes.
-
-      <h2 id="heading--termination"><a href="#heading--termination">Résiliation</a></h2>
-
-      L'entreprise ou vous pouvez mettre fin à l'accord décrit dans les présentes conditions à tout moment. Lorsque notre accord prend fin, votre autorisation d'utiliser le forum prend également fin.
-
-      Les dispositions suivantes survivent à la fin de notre accord : [Votre contenu](#heading--your-content), [Commentaires](#heading--feedback), [Votre responsabilité](#heading--responsability), [Clauses de non-responsabilité](#heading--disclaimers), [Limites de responsabilité](#heading--liability), et [Conditions générales](#heading--general).
-
-      <h2 id="heading--disputes"><a href="#heading--disputes">Litiges</a></h2>
-
-      %{governing_law} régira tout litige lié aux présentes conditions ou à votre utilisation du forum.
-
-      L'entreprise et vous acceptez de demander des injonctions liées à ces conditions uniquement auprès d'un tribunal d'État ou fédéral à %{city_for_disputes}. Ni vous ni l'entreprise ne s'opposera à la juridiction, au forum ou au lieu de réunion dans ces tribunaux.
-
-      ***Sauf pour demander une injonction ou pour des réclamations en vertu de la loi sur la fraude informatique et les abus, vous et l'entreprise résoudrez tout litige par un arbitrage obligatoire de l'American Arbitration Association. L'arbitrage suivra les règles d'arbitrage commercial et les procédures supplémentaires de l'AAA pour les litiges liés à la consommation. L'arbitrage aura lieu à %{city_for_disputes}. Vous réglerez tout litige à titre individuel, et non dans le cadre d'un recours collectif ou d'une autre procédure représentative, que ce soit en tant que demandeur ou membre du groupe. Aucun arbitre ne consolidera un litige avec un autre arbitrage sans l'autorisation de l'entreprise.***
-
-      Toute sentence arbitrale comprendra les coûts de l'arbitrage, les honoraires raisonnables des avocats et les frais raisonnables des témoins. Vous et l'entreprise pouvez saisir les sentences arbitrales dans tout tribunal compétent.
-
-      <h2 id="heading--general"><a href="#heading--general">Conditions générales</a></h2>
-
-      Si une disposition des présentes conditions est inapplicable telle qu'elle est écrite, mais qu'il est possible de la modifier pour la rendre applicable, cette disposition doit être modifiée dans la mesure minimale nécessaire pour la rendre applicable. Sinon, cette disposition doit être supprimée.
-
-      Vous ne pouvez pas céder votre accord avec l'entreprise. L'entreprise peut céder votre accord à toute société affiliée à l'entreprise, à toute autre entreprise qui obtient le contrôle de l'entreprise ou à toute autre entreprise qui achète des actifs de l'entreprise liés au forum. Toute tentative de cession contraire aux présentes conditions n'aura aucun effet juridique.
-
-      Ni l'exercice d'un droit en vertu du présent accord, ni la renonciation à une violation du présent accord, ne renonce à toute autre violation du présent accord.
-
-      Les présentes conditions incarnent tous les termes de l'accord entre vous et l'entreprise concernant l'utilisation du forum. Ces conditions remplacent entièrement tout autre accord concernant votre utilisation du forum, écrit ou non.
-
-      <h2 id="heading--contact"><a href="#heading--contact">Contact</a></h2>
-
-      Vous pouvez informer l'entreprise en vertu des présentes conditions et lui envoyer des questions à l'adresse <%{contact_email}>.
-
-      L'entreprise peut vous informer en vertu des présentes conditions en utilisant l'adresse e-mail que vous avez fournie pour la création de votre compte sur le forum, ou en publiant un message sur la page d'accueil du forum ou sur la page de votre compte.
-
-      <h2 id="heading--changes"><a href="#heading--changes">Modifications</a></h2>
-
-      L'entreprise a mis à jour ces conditions pour la dernière fois le 12 juillet 2018 et peut les mettre à jour à nouveau. L'entreprise publiera toutes les mises à jour sur le forum. Pour les mises à jour qui contiennent des changements substantiels, l'entreprise accepte de vous envoyer un e-mail, si vous avez créé un compte et fourni une adresse e-mail valide. L'entreprise peut également annoncer les mises à jour par des messages spéciaux ou des alertes sur le forum.
-
-      Une fois que vous avez été informé(e) d'une mise à jour de ces conditions, vous devez accepter les nouvelles conditions pour continuer à utiliser le forum.
   privacy_topic:
     title: "Politique de confidentialité"
-    body: |
-      <a name="collect"></a>
-
-      ## [Quelles sont les informations que nous recueillons ?](#collect)
-
-      Nous recueillons des informations lorsque vous vous inscrivez sur notre site et nous recueillons des données lorsque vous participez au forum en lisant, en écrivant et en évaluant le contenu partagé ici.
-
-      Lorsque vous vous inscrivez sur notre site, vous pouvez être invité(e) à saisir votre nom et votre adresse e-mail. Vous pouvez, toutefois, visiter notre site sans vous inscrire. Votre adresse e-mail sera vérifiée par l'envoi d'un e-mail contenant un lien unique. Si ce lien est utilisé, nous saurons que vous êtes le ou la propriétaire de l'adresse e-mail renseignée.
-
-      Une fois que vous êtes inscrit(e) et que vous publiez un message, nous en enregistrons l'adresse IP de provenance. Nous pouvons également conserver les journaux des serveurs qui comprennent l'adresse IP de chaque demande envoyée à notre serveur.
-
-      <a name="use"></a>
-
-      ## [Comment utilisons-nous vos informations ?](#use)
-
-      Toute les informations que nous recueillons auprès de vous peuvent être utilisées de l'une des façons suivantes : * Pour personnaliser votre expérience : vos informations nous aident à mieux répondre à vos besoins individuels.
-
-      * Pour améliorer notre site : nous nous efforçons continuellement d'améliorer nos fonctionnalités sur la base des informations et des commentaires que nous recevons de votre part.
-
-      * Pour améliorer le service client : vos informations nous aident à répondre plus efficacement à vos demandes de service et d'assistance.
-
-      * Pour envoyer des e-mails périodiques : l'adresse e-mail que vous fournissez peut être utilisée pour vous envoyer des informations, les notifications que vous avez demandées telles que les modifications apportées aux thèmes, les réponses mentionnant votre nom d'utilisateur, les réponses à des demandes de renseignements et/ou d'autres demandes ou questions.
-
-      <a name="protect"></a>
-
-      ## [Comment protégeons-nous vos informations ?](#protect)
-
-      Nous mettons en œuvre diverses mesures de sécurité pour maintenir la sécurité de vos informations personnelles lorsque vous saisissez, soumettez ou accédez à vos renseignements personnels.
-
-      <a name="data-retention"></a>
-
-      ## [Quelle est votre politique de conservation des données ?](#data-retention)
-
-      Nous ferons des efforts de bonne foi pour :
-
-      * Conserver les journaux du serveur contenant les adresses IP de toutes les requêtes vers ce serveur sans dépasser les 90 jours.
-
-      * Conserver les adresses IP associées à des utilisateurs enregistrés et leurs messages pour une période ne dépassant pas les 5 ans.
-
-      <a name="cookies"></a>
-
-      ## [Utilisons-nous des cookies ?](#cookies)
-
-      Oui. Les cookies sont de petits fichiers qu'un site ou ses prestataires de services transfèrent sur le disque dur de votre ordinateur via votre navigateur Web (si vous le permettez). Ces cookies permettent au site de reconnaître votre navigateur et, si vous avez un compte enregistré, de l'associer à votre compte.
-
-      Nous utilisons des cookies pour comprendre et sauvegarder vos préférences pour les futures visites et compiler des données globales sur le trafic du site et les interactions avec le site afin d'offrir de meilleures expériences de navigation et de meilleurs outils à l'avenir. Nous pouvons conclure des contrats avec des fournisseurs de services tiers pour nous aider à mieux comprendre les visiteurs du site. Ces fournisseurs de services ne sont pas autorisés à utiliser les renseignements recueillis en notre nom, sauf pour nous aider à mener et à améliorer notre entreprise.
-
-      <a name="disclose"></a>
-
-      ## [Divulguons-nous des informations à des tiers?](#disclose)
-
-      Nous ne vendons pas, n'échangeons pas et ne transférons pas vos renseignements personnels à des tiers. Ceci n'inclut pas les tiers de confiance qui nous aident à exploiter notre site, la conduite de nos affaires ou vous servir, tant que ces parties s'engagent à garder ces informations confidentielles. Nous pouvons également divulguer vos informations lorsque nous considérons cela nécessaire pour nous conformer à la loi, appliquer nos politiques ou protéger nos droits ou d'autres droits, la propriété ou la sécurité. Toutefois, des informations non personnelles des visiteurs peuvent être fournies à d'autres parties à des fins de marketing, de publicité ou autre.
-
-      <a name="third-party"></a>
-
-      ## [Liens vers des tiers](#third-party)
-
-      Parfois, à notre discrétion, nous pouvons inclure ou offrir des produits ou services de tiers sur notre site. Ces sites tiers ont des politiques de confidentialité distinctes et indépendantes. Nous n'avons donc aucune responsabilité au regard du contenu et des activités de ces sites. Néanmoins, nous cherchons à protéger l'intégrité de notre site et sommes disposés à accueillir tous les commentaires au sujet de ces sites.
-
-      <a name="coppa"></a>
-
-      ## [Protection des mineurs](#coppa)
-
-      Notre site, nos produits et nos services sont destinés aux personnes âgées de 13 ans ou plus. Si ce serveur se trouve aux États-Unis et que vous êtes âgé(e) de moins de 13 ans, conformément aux exigences de la COPPA ([Children's Online Privacy Protection Act](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)), évitez d'utiliser ce site.
-
-      <a name="online"></a>
-
-      ## [Politique de confidentialité en ligne](#online)
-
-      Cette politique de confidentialité en ligne s'applique uniquement aux informations collectées sur notre site et non aux informations recueillies hors connexion.
-
-      <a name="consent"></a>
-
-      ## [Votre consentement](#consent)
-
-      En utilisant notre site, vous acceptez les termes de la Politique de confidentialité de notre site Web.
-
-      <a name="changes"></a>
-
-      ## [Changements apportés à notre politique de confidentialité](#changes)
-
-      Si nous décidons de modifier notre politique de confidentialité, nous afficherons ces modifications sur cette page. Ce document est soumis à la licence creative commons CC-BY-SA. Il a été mis à jour le 31 mai 2013.
   badges:
     mass_award:
       errors:
@@ -4484,10 +4154,7 @@ fr:
       message: "<p>Nous avons renvoyé l'e-mail d'activation à <b>%{email}</b>"
   safe_mode:
     title: "Activer le mode sans échec"
-    description: "Le mode sans échec vous permet de tester votre site sans charger d'extension ni de thème."
     no_themes: "Désactiver les thèmes et leurs composants"
-    no_unofficial_plugins: "Désactiver les extensions non officielles"
-    no_plugins: "Désactiver toutes les extensions"
     enter: "Activer le mode sans échec"
     must_select: "Vous devez sélectionner au moins une option pour activer le mode sans échec."
   wizard:
@@ -4602,7 +4269,6 @@ fr:
           <p>Nous espérons que vous passerez des moments agréables et nous vous souhaitons bonne chance dans le <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>lancement de votre nouvelle communauté !</a></p>
   search_logs:
     graph_title: "Nombre de recherches"
-  joined: "Inscrit(e)"
   discourse_push_notifications:
     popup:
       mentioned: '%{username} vous a mentionné(e) dans « %{topic} » - %{site_title}'
@@ -4665,50 +4331,30 @@ fr:
         category: paramètres de la catégorie
     actions:
       agree:
-        title: "Accepter…"
-      agree_and_keep:
-        title: "Conserver le message"
-        description: "Accepter le signalement et conserver le message tel quel."
-      agree_and_keep_hidden:
-        title: "Garder le message masqué"
-        description: "Accepter le signalement et laisser le message masqué."
+        title: "Oui"
       agree_and_suspend:
-        title: "Suspendre l'utilisateur"
         description: "Accepter le signalement et suspendre l'utilisateur."
       agree_and_silence:
-        title: "Mettre l'utilisateur en sourdine"
+        title: "Désactiver l'utilisateur"
         description: "Accepter le signalement et mettre l'utilisateur en sourdine."
       agree_and_restore:
-        title: "Rétablir le message"
         description: "Rétablir le message afin que tous les utilisateurs puissent le voir."
-      agree_and_hide:
-        title: "Masquer le message"
-        description: "Masquer le message et envoyer automatiquement un message à l'utilisateur l'incitant à le modifier."
       delete_single:
         title: "Supprimer"
       delete:
         title: "Supprimer…"
-      delete_and_ignore:
-        title: "Supprimer le message et ignorer"
-        description: "Supprimer le message ; s'il s'agit du premier message, le sujet sera supprimé"
       delete_and_ignore_replies:
-        title: "Supprimer message + réponses et ignorer"
-        description: "Supprimer le message et toutes les réponses ; s'il s'agit du premier message, le sujet sera supprimé"
         confirm: "Voulez-vous vraiment supprimer les réponses à ce message ?"
-      delete_and_agree:
-        title: "Supprimer le message et accepter"
-        description: "Supprimer le message ; s'il s'agit du premier message, le sujet sera supprimé"
       delete_and_agree_replies:
-        title: "Supprimer message + réponses et accepter"
-        description: "Supprimer le message et toutes les réponses ; s'il s'agit du premier message, le sujet sera supprimé"
         confirm: "Voulez-vous vraiment supprimer les réponses à ce message ?"
       disagree_and_restore:
-        title: "Rejeter le signalement et rétablir le message"
         description: "Rétablir le message afin que tous les utilisateurs puissent le voir."
       disagree:
-        title: "Rejeter"
+        title: "Non"
       ignore:
         title: "Ignorer"
+      ignore_and_do_nothing:
+        title: "Ne rien faire"
       approve:
         title: "Approuver"
       approve_post:
diff --git a/config/locales/server.gl.yml b/config/locales/server.gl.yml
index dcd84ee8dae..2297319c2f8 100644
--- a/config/locales/server.gl.yml
+++ b/config/locales/server.gl.yml
@@ -178,9 +178,6 @@ gl:
       load_from_remote: "Produciuse un erro ao cargar esta publicación."
     site_settings:
       invalid_category_id: "Especificou unha categoría que non existe"
-      invalid_choice:
-        one: "Especificou a opción non válida %{name}"
-        other: "Especificou opcións non válidas %{name}"
       default_categories_already_selected: "Non pode seleccionar unha categoría utilizada noutra listaxe."
       default_tags_already_selected: "Non pode seleccionar unha etiqueta utilizada noutra listaxe."
       s3_upload_bucket_is_required: "Non se poden activar as cargas a S3 a menos que proporcione un valor 's3_upload_bucket'."
@@ -539,10 +536,6 @@ gl:
             duration_minutes:
               cannot_be_zero: "debe ser maior que 0"
               exceeds_maximum: "non pode ser ter máis de 20 anos."
-        translation_overrides:
-          attributes:
-            value:
-              invalid_interpolation_keys: 'A(s) seguinte(s) chave(s) de interpolación non é/son válida(s): "%{keys}"'
         watched_word:
           attributes:
             word:
@@ -554,22 +547,6 @@ gl:
   meta_category_description: "Discusións sobre este sitio, a súa organización, como funciona e como se pode mellorar."
   staff_category_name: "Equipo"
   staff_category_description: "Categoría privada para discusións do equipo. Os temas son visíbeis unicamente para administradores e moderadores."
-  discourse_welcome_topic:
-    body: |2
-
-      O primeiro parágrafo deste tema pegado será visible como mensaxe de benvida para todos os novos visitantes na súa páxina de inicio. É, pois, importante!
-
-      **Edite isto** e describa brevemente a súa comunidade:
-
-      - Para quen é?
-      - Que van poder atopar aquí?
-      - Por que deberían vir aquí?
-      - Onde poden ler máis sobre a comunidade (ligazóns, recursos etc)?
-
-      <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
-
-      Quizais queira pechar este tema a través do administrador :wrench: (na parte superior dereita ou na parte inferior) para que as respostas non se acumulen no anuncio.
-  admin_quick_start_title: "LER PRIMEIRO: Guía de comezo rápido para administradores"
   category:
     topic_prefix: "Acerca da categoría %{category}"
     replace_paragraph: "(Substitúa este parágrafo cunha breve descrición da súa nova categoría. Este texto aparecerá na área de selección de categoría, así que procure que non supere os 200 caracteres.)"
@@ -1003,7 +980,7 @@ gl:
       title: "UAD/UAM"
       xaxis: "Día"
       yaxis: "UAD/UAM"
-      description: "Número de membros que iniciaron sesión no último día entre o número de membros que iniciaron sesión no último mes - devolve a porcentaxe que indica o grao de permanencia da comunidade. Obxectivo: >30%."
+      description: "Número de membros que iniciaron sesión no último día entre o número de membros que iniciaron sesión no último mes - devolve a porcentaxe que indica o grao de permanencia da comunidade. Obxectivo: >20%."
     daily_engaged_users:
       title: "Usuarios comprometidos a diario"
       xaxis: "Día"
@@ -1344,7 +1321,6 @@ gl:
     manifest_icon: "Imaxe utilizada como logo/imaxe de benvida en Android. Cambiarase automaticamente o tamaño a 512 × 512. Se se deixa en branco, utilizarase large_icon."
     manifest_screenshots: "Capturas de pantalla que presentan as funcionalidades da súa instalación e funcionalidade na páxina de arranque da instalación. Todas as imaxes deberían ser cargas en local e das mesmas dimensións."
     favicon: "Unha favicona para o seu sitio, mire <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://en.wikipedia.org/wiki/Favicon</a>. Para funcionar correctamente sobre un CDN debe ser PNG. Redimensionarase automaticamente a 32x32. Se se deixa en branco, utilizarase large_icon."
-    apple_touch_icon: "Icona utilizada para dispositivos Apple. Redimensionarase automaticamente a 180x180. Se se deixa en branco, utilizarase large_icon."
     opengraph_image: "Imaxe de gráfico aberto predeterminada que se utiliza cando a páxina non ten ningunha outra imaxe adecuada"
     notification_email: "O enderezo electrónico remitente utilizado ao enviar todos os correos electrónicos esenciais do sistema. O dominio especificado debe ter correctamente configurados os rexistros SPF, DKIM e PTR inversos para que os correos electrónicos se reciban correctamente."
     email_custom_headers: "Unha listaxe de cabeceiras de correo personalizadas separadas por barras verticais"
@@ -1453,7 +1429,6 @@ gl:
     enable_discourse_connect: "Activar o inicio de sesión a través de DiscourseConnect (anteriormente «Discourse SSO») (AVISO: OS ENDEREZOS DE CORREO DOS USUARIOS *DEBEN DE* SER VALIDADOS POLO SITIO EXTERNO!)"
     verbose_discourse_connect_logging: "Rexistrar diagnósticos detallados relacionados con DiscourseConnect en <a href='%{base_path}/logs' target='_blank'>/logs</a>"
     enable_discourse_connect_provider: "Implementar o protocolo do fornecedor de DiscourseConnect (antes «Discourse SS0») no punto de destino en /session/sso_provider, require que se definan sso_provider_secrets"
-    discourse_connect_url: "URL do destino de DiscourseConnect (debe incluír http:// ou https://)"
     discourse_connect_secret: "Cadea secreta utilizada para autenticar criptograficamente a información de DiscourseConnect, asegúrese de que teña 10 caracteres ou máis"
     discourse_connect_provider_secrets: "Unha listaxe de pares de dominios secretos que utilizan DiscourseConnect. Asegúrese de que a clave secreta de DiscourseConnect teña 10 caracteres ou máis. O símbolo do comodín * pódese utilizar para facer coincidir calquera dominio ou só unha parte del (por exemplo, *.exemplo.com)."
     discourse_connect_overrides_bio: "Sobrescribe info biográfica do usuario no seu perfil e evita a posibilidade de que o usuario a cambie."
@@ -1462,7 +1437,6 @@ gl:
     auth_overrides_username: "Sobrescribe o nome de usuario local co nome de usuario do sitio externo en cada inicio de sesión e evita os cambios locais. Aplícase a todos os fornecedores de autenticación. (AVISO: poden producirse discrepancias debido á normalización dos enderezos de correo locais)"
     auth_overrides_name: "Sobrescribe o nome completo co nome completo do sitio externo en cada inicio de sesión e evita os cambios locais. Aplícase a todos os fornecedores de autenticación."
     discourse_connect_not_approved_url: "Redireccionar contas de DiscourseConnect sen aprobar a este URL"
-    discourse_connect_allows_all_return_paths: "Non restrinxa o dominio para return_paths fornecidos por DiscourseConnect (o camiño de devolución debe estar no sitio actual, de modo predeterminado)"
     enable_local_logins: "Active as contas co nome de usuario local e o contrasinal de inicio de sesión. ATENCIÓN: de estar desactivado, quizais non poida iniciar sesión se non configurou previamente cando menos unha método de inicio alternativo."
     enable_local_logins_via_email: "Permitir que os usuarios soliciten unha ligazón de inicio de sesión que se lles enviará por correo electrónico."
     allow_new_registrations: "Permitir o rexistro de novos usuarios. Desactive esta opción para evitar que alguén cree unha nova conta."
@@ -1582,7 +1556,6 @@ gl:
     tl3_requires_likes_given: "Número mínimo de gústame que un usuario debe dar nos últimos (período nc3) días para poder ser promovido ao nivel de confianza 3."
     tl3_requires_likes_received: "Número mínimo de gústame que un usuario debe recibir nos últimos (período nc3) días para poder ser promovido ao nivel de confianza 3."
     tl3_links_no_follow: "Non retirar rel=nofollow das ligazóns publicadas por usuarios con nivel de confianza 3."
-    trusted_users_can_edit_others: "Permitir aos usuarios con altos niveis de confianza editar contido doutros usuarios"
     min_trust_to_create_topic: "O nivel de confianza mínimo requirido para crear un novo tema."
     allow_flagging_staff: "De estar activado, os usuarios poden denunciar publicacións feitas desde contas do equipo."
     min_trust_to_edit_wiki_post: "O nivel de confianza mínimo requirido para editar unha publicación marcada como wiki."
@@ -1613,7 +1586,6 @@ gl:
     title_min_entropy: "A entropía mínima (caracteres únicos) que se require para o título do tema."
     body_min_entropy: "A entropía mínima (caracteres únicos) que se require para o corpo dunha publicación."
     allow_uppercase_posts: "Permitir todas en maiúsculas no título dun tema ou no corpo dunha publicación."
-    max_consecutive_replies: "Número de publicacións continuadas que un usuario ten que facer antes de que se lle prohiba engadir outra resposta."
     enable_filtered_replies_view: 'O botón «(n) respostas» contrae todas as demais publicacións e só amosa a publicación actual e as súas respostas.'
     title_fancy_entities: "Converter caracteres ASCII en entidades HTML elegantes no título dos temas, como SmartyPants <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</a>"
     min_title_similar_length: "A lonxitude mínima dun título antes de se comprobar para temas similares."
@@ -1711,7 +1683,6 @@ gl:
     pop3_polling_password: "O contrasinal da conta POP3 na que recoller o correo."
     pop3_polling_delete_from_server: "Eliminar correos do servidor. NOTA: se desactiva isto, deberá limpar manualmente a caixa de entrada"
     log_mail_processing_failures: "Rexistrar todos os erros de procesamento do correo en <a href='%{base_path}/logs' target='_blank'>/logs</a>"
-    email_in: 'Permitir aos usuarios publicar temas novos por correo electrónico (require unha recollida manual ou con pop3). Configure os enderezos na lapela «Configuración» de cada categoría.'
     email_in_min_trust: "O nivel de confianza mínimo requirido para poder publicar vía correo electrónico."
     email_in_authserv_id: "O identificador do servizo que realiza revisións de autenticación no correo entrante. Revisa <a href='https://meta.discourse.org/t/134358'>https://meta.discourse.org/t/134358</a> para obter instrucións sobre como configurar isto."
     email_in_spam_header: "A cabeceira de correo para detectar correo lixo."
@@ -1788,14 +1759,11 @@ gl:
     automatically_unpin_topics: "Soltar os temas automaticamente cando o usuario chega ao fondo."
     read_time_word_count: "Número de palabras por minuto para calcular o tempo estimado de lectura."
     topic_page_title_includes_category: "A <a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title' target='_blank'>etiqueta do título</a> da páxina do tema inclúe o nome da categoría."
-    native_app_install_banner_ios: "Amosa o anuncio da aplicación DiscourseHub en dispositivos iOS a usuarios habituais (nivel de confianza 1 e superior)."
-    native_app_install_banner_android: "Amosa o anuncio da aplicación DiscourseHub en dispositivos Android a usuarios habituais (nivel de confianza 1 e superior)."
     app_association_android: "Contido do <a href='%{base_path}/.well-known/assetlinks.json'>punto de chegada .well-known/assetlinks.json</a>, utilizado para a API Google's Digital Asset Links."
     app_association_ios: "Contido de <a href='%{base_path}/apple-app-site-association'>punto de chegada de apple-app-site-association</a> , utilizado para crear ligazóns universais entre este sitio e as aplicacións de iOS."
     share_anonymized_statistics: "Compartir estatísticas de uso anonimizadas."
     auto_handle_queued_age: "Xestione automaticamente rexistros que levan moitos días en espera de seren revisados. As alertas ignoraranse. Rexeitaranse as publicacións e os usuarios en cola. Estabelecer en 0 para desactivar esta funcionalidade."
     svg_icon_subset: "Engada 5 iconas FontAwesome adicionais que lle gustaría incluír nos seus recursos. Use o prefixo «fa-» para iconas sólidas, «far-» para iconas normais e «fab-» para iconas de marca."
-    max_prints_per_hour_per_user: "Número máximo de accesos/impresións de páxina (estabelecer en 0 para desactivar)"
     full_name_required: "O nome completo no perfil do usuario é obrigatorio."
     enable_names: "Mostrar o nome completo do usuario no seu perfil, tarxeta de usuario e correos electrónicos. Desactivar para agochar o nome completo en todas as partes."
     display_name_on_posts: "Mostrar o nome completo de usuario nas súas publicacións, ademais do seu @nomedeusuario."
@@ -1814,10 +1782,7 @@ gl:
     allowed_href_schemes: "Esquemas permitidos en ligazóns ademais de http e https."
     embed_post_limit: "Número máximo de publicacións que incorporar."
     embed_username_required: "O nome de usuario para a creación de temas é obrigatorio."
-    notify_about_flags_after: "Se hai alertas que non se manexaron despois destas horas, envíelles unha mensaxe persoal aos moderadores. Estabelecer en 0 para desactivar."
-    show_create_topics_notice: "Se o sitio ten menos de 5 temas públicos, amosará un aviso pedindo aos administradores que creen algúns temas."
     delete_drafts_older_than_n_days: "Eliminar borradores con máis de (n) días de antigüidade."
-    bootstrap_mode_min_users: "Número mínimo de usuarios necesarios para desactivar o modo de arranque (estabelecer en 0 para desactivar)"
     prevent_anons_from_downloading_files: "Evitar que usuarios anónimos descarguen anexos."
     slug_generation_method: "Escolla un método de xeración de abreviacións. Con «codificado» xerarase unha cadea con codificación porcentual, con «ningún» desactivarase a abreviación amigábel."
     enable_emoji: "Activar emojis"
@@ -1882,7 +1847,6 @@ gl:
     revoke_api_keys_days: "Número de días antes de que unha chave API sen usar sexa revogada automaticamente (0 para nunca)"
     allow_user_api_keys: "Permitir a xeración de chaves API de usuario"
     allow_user_api_key_scopes: "Listaxe de ámbitos permitidos para as chaves API de usuario"
-    min_trust_level_for_user_api_key: "Nivel de confianza necesario para xerar chaves API de usuario"
     allowed_user_api_auth_redirects: "URL permitido para redireccionar a autenticación das chaves API de usuario. O símbolo do comodín pódese utilizar para que coincida calquera parte súa (ex.: www.exemplo.com/*)."
     allowed_user_api_push_urls: "Enderezos URL permitidos para que servidor envíe á API de usuario"
     expire_user_api_keys_days: "Número de días antes de que a chave API de usuario caduque automaticamente (0 para nunca)"
@@ -1940,14 +1904,12 @@ gl:
       pop3_polling_password_is_empty: "Debe estabelecer un «contrasinal de usuario de recollida pop3» antes de activar a recollida POP3."
       pop3_polling_authentication_failed: "Erro na autenticación POP3. Verifique as súas credenciais POP3."
       reply_by_email_address_is_empty: "Debe habilitar «responder vía correo electrónico» antes de activar resposta por correo electrónico."
-      email_polling_disabled: "Debe activar ou a recollida manual ou POP3 antes de activar a resposta por correo electrónico."
       user_locale_not_enabled: "Debe activar primeiro «permitir usuario local» antes de activar esta opción."
       invalid_regex: "A expresión regular non é válida ou non está permitida."
       email_editable_enabled: "Debe desactivar «correo electrónico editable» antes de activar esta opción."
       staged_users_disabled: "Primeiro debe activar «usuarios transitorios» antes de activar esta opción."
       reply_by_email_disabled: "Primeiro debe activar «responder vía correo electrónico» antes de activar esta opción."
       discourse_connect_url_is_empty: "Debe estabelecer un «URL de discourse connect» antes de activar este axuste."
-      discourse_connect_invite_only: "Non pode activar o DiscourseConnect e ter «só por convite» ao mesmo tempo."
       enable_local_logins_disabled: "Debe activar primeiro «activar inicios de sesión locais» antes de activar esta opción."
       min_username_length_exists: "Non pode estabelecer que a largura mínima do nome de usuario sexa maior có nome de usuario máis curto (%{username})."
       min_username_length_range: "O mínimo non pode ser maior que o máximo."
@@ -2145,7 +2107,6 @@ gl:
       other: "Desactivado automaticamente despois de %{count} días de inactividade"
     activated_by_staff: "Activado polo equipo"
     new_user_typed_too_fast: "O novo usuario escribe moi rápido"
-    content_matches_auto_block_regex: "O contido coincide cunha expresión regular de bloqueo"
     username:
       short: "debe ter polo menos %{min} caracteres"
       long: "non debe ter máis de %{max} caracteres"
@@ -2747,14 +2708,6 @@ gl:
     user_automatically_silenced:
       title: "Usuario silenciado automaticamente"
       subject_template: "Usuario novo %{username} silenciado polas denuncias da comunidade"
-      text_body_template: |
-        Esta é unha mensaxe automática.
-
-        O novo usuario [%{username}](%{user_url}) foi silenciado automaticamente porque moitos usuarios denunciaron as publicacións de %{username}.
-
-        [Revise as denuncias](%{base_url}/admin/flags). Se %{username} foi silenciado incorrectamente, prema o botón de retirar o silencio na [páxina de administración para este usuario](%{user_url}).
-
-        Isto pode cambiarse co axuste `silence_new_user` na configuración do sitio.
     spam_post_blocked:
       title: "Publicación lixo bloqueada"
       subject_template: "As publicacións do novo usuario %{username} foron bloqueadas por repetir ligazóns"
@@ -2788,15 +2741,6 @@ gl:
       title: "Descarga de imaxes remotas desactivada"
       subject_template: "A descarga de imaxes remotas foi desactivada"
       text_body_template: "O axuste `download_remote_images_to_local` foi desactivada porque se alcanzou o límite do espazo do disco configurado en `download_remote_images_threshold`."
-    dashboard_problems:
-      title: "Problemas do panel"
-      subject_template: "Novo consello no seu panel de sitio"
-      text_body_template: |
-        Temos algúns novos consellos e recomendacións con base na configuración actual do seu sitio.
-
-        [Visite o seu panel](%{base_url}/admin) e bótelles un ollo.
-
-        Se non ve nada no seu panel, pode ser porque outro membro do equipo xa actuara sobre el. Pode atopar unha listaxe de accións nos seus [rexistros de accións do equipo](%{base_url}/admin/logs/staff_action_logs).
     new_user_of_the_month:
       title: "É o usuario novo do mes!"
       subject_template: "É o usuario novo do mes!"
@@ -2832,9 +2776,6 @@ gl:
       one: "Advertencia: enviamos un máximo de %{count} correo electrónico diario. Comprobe no sitio o número dos que se poden reter."
       other: "Advertencia: enviamos un máximo de %{count} correos electrónicos diarios. Comprobe no sitio o número dos que se poden reter. Grazas por ser tan popular!"
     in_reply_to: "En resposta a"
-    unsubscribe:
-      title: "Cancelar subscrición"
-      description: "Non ten interese en recibir estes correos electrónicos? Sen problema! Prema embaixo para darse de baixa agora mesmo:"
     reply_by_email: "[Visite o tema](%{base_url}%{url}) ou responda a este correo."
     reply_by_email_pm: "[Visite a mensaxe](%{base_url}%{url}) ou responda a este correo para contestar a %{participants}."
     only_reply_by_email: "Responder a este correo para publicar."
@@ -3116,7 +3057,6 @@ gl:
       liked_received: "Gústame recibidos"
       new_users: "Novos usuarios"
       popular_topics: "Temas populares"
-      follow_topic: "Seguir este tema"
       join_the_discussion: "Ler máis"
       popular_posts: "Publicacións máis populares"
       more_new: "Novo para vostede"
@@ -3301,15 +3241,6 @@ gl:
   offline:
     title: "Non se pode cargar a aplicación"
     offline_page_message: "Parece que non está conectado/a! Comprobe a súa conexión á rede e vólvao tentar."
-  login_required:
-    welcome_message: |
-      ## [Dámoslle a benvida a %{title}](#welcome)
-      Requírese unha conta. Cree unha ou inicie sesión para continuar.
-    welcome_message_invite_only: |
-      ## [Dámoslle a benvida a %{title}](#welcome)
-      Requírese unha conta. Pídalle a un membro que o convide ou inicie sesión para continuar.
-  deleted: "eliminado"
-  image: "imaxe"
   upload:
     edit_reason: "copias locais de imaxes descargadas"
     unauthorized: "Sentímolo, o ficheiro que tenta subir non está autorizado (extensións permitidas: %{authorized_extensions})."
@@ -3394,88 +3325,6 @@ gl:
     title: "Termos do servizo"
   privacy_topic:
     title: "Política de privacidade"
-    body: |
-      <a name="collect"></a>
-
-      ## [Que información recollemos?](#collect)
-
-      Recollemos información súa cando se rexistra no noso sitio e compilamos datos cando participa no foro lendo, escribindo e avaliando o contido que se comparte aquí.
-
-      Cando se rexistre no noso sitio, pediráselle que introduza o seu nome e enderezo de correo electrónico. No entanto, pode visitar o sitio sen rexistrarse. O seu enderezo de correo electrónico comprobarase mediante un correo electrónico que contén unha ligazón de único uso. Se esa ligazón se visita, sabemos que vostede controla ese enderezo de correo electrónico.
-
-      Cando se rexistra e publica, rexistramos o enderezo IP desde o que se realizou o envío. Tamén podemos conservar os rexistros do servidor que inclúen o enderezo IP de cada solicitude ao noso servidor.
-
-      <a name="use"></a>
-
-      ##[Que facemos coa súa información?](#use)
-
-      Calquera información que compilemos de vostede pode ser utilizada dunha das seguintes maneiras:
-
-      * Para personalizar a súa experiencia &mdash; a súa información axúdanos a responder mellor ás súas necesidades individuais.
-      * Para mellorar o noso sitio web&mdash; esforzámonos a cotío por mellorar as propostas do noso sitio baseándonos na información e nos comentarios que recibimos de vostede.
-      * Para mellorar o servizo de atención ao cliente &mdash; a súa información axúdanos a responder máis eficazmente ás peticións de servizo ao cliente e ás súas necesidades de asistencia.
-      * Para enviar correos electrónicos periódicos &mdash; O enderezo de correo electrónico que nos proporcione pode utilizarse para enviarlle información, notificacións que solicite sobre cambios en temas ou en resposta ao seu nome de usuario, respostas a consultas e/ou outras peticións e cuestións.
-
-      <a name="protect"></a>
-
-      ## [Como protexemos esta información súa?](#protect)
-
-      Implementamos una variedade de medidas de seguranza para asegurar a súa información persoal cando entra, envía ou accede á súa información persoal.
-
-      <a name="data-retention"></a>
-
-      ## [Cal é súa política de retención de datos?](#data-retention)
-
-      Faremos en boa fe, esforzos para..:
-
-      * Conservar os rexistros do servidor que conteñan o enderezo IP de todas as solicitudes a este servidor non máis de 90 días.
-      * Conservar os enderezos IP asociados aos usuarios rexistrados e ás súas mensaxes non máis de 5 anos.
-
-      <a name="cookies"></a>
-
-      ## [Usamos rastros?](#cookies)
-
-      Si. As rastros son pequenos ficheiros que un sitio ou o seu fornecedor de servizos transfire ao disco duro do seu computador a través do seu navegador web (se o permite). Estas rastros permiten que o sitio recoñeza o seu navegador e, se ten unha conta rexistrada, a asocie coa súa conta rexistrada.
-
-      Utilizamos rastros para comprender e gardar as súas preferencias para futuras visitas e compilar datos agregados sobre o tráfico do sitio e a interacción nel, de modo que poidamos ofrecer mellores experiencias e ferramentas no futuro. Podemos contratar fornecedores de servizos de terceiros para que nos axuden a comprender mellor os visitantes do noso sitio. Estes fornecedores de servizos non están autorizados a utilizar a información compilada no noso nome, agás que sexa para axudarnos a levar a cabo e mellorar o noso obxectivo.
-
-      <a name="disclose"></a>
-
-      ## [Revelamos algunha información a terceiros?](#disclose)
-
-      Non vendemos, comerciamos nin transferimos a terceiros a súa información persoal identificábel. Isto non inclúe os terceiros de confianza que nos axudan a operar o noso sitio, a levar a cabo o noso obxectivo ou a prestarlle servizos, sempre e cando esas partes acorden manter esta información confidencial. Tamén podemos revelar a súa información cando creamos que é apropiado para cumprir coa lei, facer cumprir as políticas do noso sito ou protexer os nosos dereitos e os doutros, propiedade ou seguranza. No entanto, a información que non sexa de identificación persoal dos visitantes pode ser fornecida a outras partes para mercadotecnia, publicidade ou outros usos.
-
-      <a name="third-party"></a>
-
-      ## [Ligazóns de terceiros](#third-party)
-
-      Ocasionalmente, ao noso criterio, podemos incluír ou ofrecer produtos ou servizos de terceiros no noso sitio. Estes sitios de terceiros teñen políticas de privacidade separadas e independentes. Polo tanto, non temos ningunha responsabilidade sobre o contido e as actividades destes sitios ligados. Aínda así, buscamos protexer a integridade do noso sitio e agradecemos calquera comentario sobre estes sitios.
-
-      <a name="coppa"></a>
-
-      ## [Cumprimento da Lei de protección da privacidade dos menores na Internet](#coppa)
-
-      O noso sitio, produtos e servizos están dirixidos a persoas que teñen polo menos 13 anos de idade ou máis. Se este servidor está nos EE.UU., e vostede é menor de 13 anos, segundo os requisitos de COPPA ([Children's Online Privacy Protection Act](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)), non utilice este sitio.
-
-      <a name="online"></a>
-
-      ## [Política de privacidade en liña soamente](#online)
-
-      Esta política de privacidade en liña aplícase só á información recollida a través do noso sitio e non á información recollida sen conexión en liña.
-
-      <a name="consent"></a>
-
-      ## [O seu consentimento](#consent)
-
-      Ao utilizar o sitio, acepta a política de privacidade do noso sitio web.
-
-      <a name="changes"></a>
-
-      ## [Cambios na nosa política de privacidade](#changes)
-
-      De decidirmos cambios na nosa política de privacidade, publicarémolos nesta páxina.
-
-      Este documento ten licenza CC-BY-SA. A súa última actualización é de do 31 de maio de 2013.
   badges:
     mass_award:
       errors:
@@ -3767,8 +3616,6 @@ gl:
       message: "<p>Volvémoslle enviar o correo de activación a <b>%{email}</b>"
   safe_mode:
     title: "Entrar en modo seguro"
-    no_unofficial_plugins: "Desactivar complementos non oficiais"
-    no_plugins: "Desactivar todos os complementos"
     enter: "Entrar en modo seguro"
     must_select: "Debe seleccionar polo menos unha opción para entrar no modo seguro."
   wizard:
@@ -3829,7 +3676,6 @@ gl:
           <p>Páseo ben e moita sorte <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>organizando a súa nova comunidade.</a></p>
   search_logs:
     graph_title: "Análise das buscas"
-  joined: "Uniuse"
   discourse_push_notifications:
     popup:
       mentioned: '%{username} mencionouno en "%{topic}" - %{site_title}'
@@ -3875,50 +3721,29 @@ gl:
       queued_by_staff: "Un membro do equipo pensa que esta publicación necesita revisión. Permanecerá agochada ata entón."
     actions:
       agree:
-        title: "De acordo..."
-      agree_and_keep:
-        title: "Manter publicación"
-        description: "De acordo con esta denuncia e manter a publicación sen modificar."
-      agree_and_keep_hidden:
-        title: "Manter a publicación oculta"
-        description: "De acordo con esta denuncia e manter a publicación oculta."
+        title: "Si"
       agree_and_suspend:
-        title: "Suspender usuario"
         description: "De acordo con esta denuncia e suspender o usuario."
       agree_and_silence:
-        title: "Silenciar usuario"
         description: "De acordo con esta denuncia e silenciar o usuario."
       agree_and_restore:
-        title: "Restaurar publicación"
         description: "Restaurar a publicación para que todos os usuarios a poidan ver."
-      agree_and_hide:
-        title: "Agochar publicación"
-        description: "Agocha esta publicación e automaticamente lle envía ao usuario unha mensaxe que o insta a editala."
       delete_single:
         title: "Eliminar"
       delete:
         title: "Eliminar..."
-      delete_and_ignore:
-        title: "Eliminar publicación e ignorar"
-        description: "Eliminar publicación; se é a primeira, eliminar tamén o tema"
       delete_and_ignore_replies:
-        title: "Eliminar publicación + respostas e ignorar"
-        description: "Eliminar publicación e todas as súas respostas; se é a primeira publicación, eliminar o tema tamén"
         confirm: "Confirma que quere eliminar as respostas desta publicación tamén?"
-      delete_and_agree:
-        title: "Eliminar publicación e aceptar"
-        description: "Eliminar publicación; se é a primeira, eliminar tamén o tema"
       delete_and_agree_replies:
-        title: "Eliminar Publicación + Respostas e aceptar"
-        description: "Eliminar publicación e todas as súas respostas; se é a primeira publicación, eliminar o tema tamén"
         confirm: "Confirma que quere eliminar as respostas desta publicación tamén?"
       disagree_and_restore:
-        title: "Discrepar e restaurar publicación"
         description: "Restaurar a publicación para que todos os usuarios a poidan ver."
       disagree:
-        title: "Discrepar"
+        title: "Non"
       ignore:
         title: "Ignorar"
+      ignore_and_do_nothing:
+        title: "Non facer nada"
       approve:
         title: "Aprobar"
       approve_post:
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index 94bfdd50a41..59375301fd9 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -52,6 +52,11 @@ he:
   remove_posts_deleted_by_author: "נמחק על ידי הכותב"
   redirect_warning: "לא הצלחנו לאמת שהקישור שבחרת אכן פורסם לפורום. כדי להמשיך בכל אופן, נא לבחור בקישור שלהלן."
   on_another_topic: "בנושא אחר"
+  topic_category_changed: "מ־%{from} עד %{to}"
+  topic_tag_changed:
+    added_and_removed: "נוספו %{added} והוסרו %{removed}"
+    added: "נוספו %{added}"
+    removed: "הוסרו %{removed}"
   inline_oneboxer:
     topic_page_title_post_number: "מס׳ %{post_number}"
     topic_page_title_post_number_by_user: "מס׳ %{post_number} מאת %{username}"
@@ -203,10 +208,10 @@ he:
       invalid_site_setting: "לא קיימת הגדרה שנקראת ‚%{name}’"
       invalid_category_id: "ציינת קטגוריה שאינה קיימת"
       invalid_choice:
-        one: "ציינת את הבחירה השגויה %{name}"
-        two: "ציינת את הבחירות השגויות %{name}"
-        many: "ציינת את הבחירות השגויות %{name}"
-        other: "ציינת את הבחירות השגויות %{name}"
+        one: "‚%{name}’ היא בחירה שגויה."
+        two: "‚%{name}’ הן בחירות שגויות."
+        many: "‚%{name}’ הן בחירות שגויות."
+        other: "‚%{name}’ הן בחירות שגויות."
       default_categories_already_selected: "לא ניתן לבחור קטגוריה שנעשה בה שימוש ברשימה אחרת."
       default_tags_already_selected: "לא ניתן לבחור תגית שנעשה בה שימוש ברשימה אחרת"
       s3_upload_bucket_is_required: "לא ניתן להפעיל העלאות ל־S3 ללא ‚s3_upload_bucket’."
@@ -214,7 +219,8 @@ he:
       page_publishing_requirements: "לא ניתן להפעיל פרסום עמודים אם מדיה מאובטחת פעילה."
       s3_backup_requires_s3_settings: "לא ניתן להשתמש ב־S3 כמיקום לגיבוי אלמלא סיפקת את ‚%{setting_name}’."
       s3_bucket_reused: "אין לך אפשרות להשתמש באותו הדלי עבור ‚s3_upload_bucket’ וגם ‚s3_backup_bucket’. נא לבחור בדלי שונה או להשתמש בנתיב שונה לכל דלי."
-      secure_uploads_requirements: "יש להפעיל העלאה ל־S3 בטרם הפעלת העלאות מאובטחות."
+      secure_uploads_requirements: "יש להפעיל העלאה ל־S3 ובקרות גישה (ACLs) של S3 בטרם הפעלת העלאות מאובטחות."
+      s3_use_acls_requirements: "עליך להפעיל את בקרת הגישה (ACLs) של S3 כדי שההעלאות המאובטחות תפעלנה."
       share_quote_facebook_requirements: "עליך להגדיר מזהה יישומון פייסבוק כדי להפעיל שיתוף ציטוטים עבור פייסבוק"
       second_factor_cannot_enforce_with_socials: "לא ניתן לאכוף אימות דו־שלבי כאשר מופעלת כניסה דרך רשתות חברתיות. תחילה עליך להשבית כניסה דרך: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "אי אפשר לאכוף אימות דו־שלבי אם כניסה מקומית מושבתת."
@@ -237,6 +243,10 @@ he:
         other: "מחילה אך לא הצלחנו לייצר תצוגה מקדימה של האתר הזה כיוון שלא ניתן היה למצוא את תגיות ה־oEmbed / OpenGraph הבאות: %{missing_attributes}"
   word_connector:
     comma: ", "
+  custom_fields:
+    validations:
+      max_items: "הגעת למספר המרבי של שדות מותאמים אישית עבור ישות זו (%{max_items_number})"
+      max_value_length: "הגעת לאורך המרבי עבור ערך שדה מותאם אישית (%{max_value_length})"
   invite:
     expired: "תוקף אסימון ההזמנה שלך פג. נא <a href='%{base_url}/about'>ליצור קשר עם הסגל</a>."
     not_found: "אסימון ההזמנה שלך שגוי. נא <a href='%{base_url}/about'>ליצור קשר עם הסגל</a>."
@@ -255,6 +265,7 @@ he:
     user_exists: "אין צורך להזמין את <b>%{email}</b>, יש כבר חשבון עם הכתובת הזאת!"
     invite_exists: "כבר הזמנת את <b>%{email}</b>."
     invalid_email: "%{email} אינה כתובת דוא״ל תקפה."
+    generic_error_response: "אירעה בעיה עם הבקשה שלך."
     rate_limit:
       one: "כבר שלחת הזמנה %{count} ביום האחרון, נא להמתין %{time_left} בטרם ניסיון קודם."
       two: "כבר שלחת %{count} הזמנות ביום האחרון, נא להמתין %{time_left} בטרם ניסיון קודם."
@@ -442,6 +453,7 @@ he:
   too_late_to_edit: "פוסט זה נוצר לפני זמן רב מידי. לא ניתן יותר לערוך או להסיר אותו."
   edit_conflict: "פוסט זה נערך על ידי משתמש אחר ואין אפשרות עוד לשמור את השינויים שלך."
   revert_version_same: "הגרסה הנוכחית זהה לגרסה שמועמדת להחזרה."
+  reverted_to_version: "הוחזר למהדורה מס׳ %{version}"
   cannot_edit_on_slow_mode: "נושא זה נכנס למצב אטי. כדי לעודד דיון מתחשב ואחראי אסור כרגע לערוך פוסטים ישנים בנושא הזה במהלך המצב האטי."
   excerpt_image: "תמונה"
   bookmarks:
@@ -552,6 +564,7 @@ he:
       יותר קל לכולם לקרוא נושאים שיש בהם פחות תגובות עמוקות מאשר הרבה תגובות קטנות.
     dominating_topic: פרסמת המון בנושא הזה! אולי כדאי לתת גם לאחרים הזדמנות להגיב ולהחליף ביניהם דברים.
     get_a_room: הגבת ל־‎@%{reply_username} ‏%{count} פעמים, ידעת שניתן לשלוח הודעה פרטית במקום?
+    dont_feed_the_trolls: הפוסט הזה כבר סומן להסבת תשומת הלב של המפקחים. עדיין להגיב אליו? תגובות לתוכן שלילי מעודדות התנהגות שלילית קיצונית אף יותר.
     too_many_replies: |
       ### הגעת למספר התגובות המרבי לנושא זה
 
@@ -641,7 +654,11 @@ he:
         translation_overrides:
           attributes:
             value:
-              invalid_interpolation_keys: 'מפתח/ות השילוב שלהלן שגוי/ים: „%{keys}”'
+              invalid_interpolation_keys:
+                one: "מפתח השילוב הבא שגוי: %{keys}"
+                two: "מפתחות השילוב הבאים שגויים: %{keys}"
+                many: "מפתחות השילוב הבאים שגויים: %{keys}"
+                other: "מפתחות השילוב הבאים שגויים: %{keys}"
         watched_word:
           attributes:
             word:
@@ -662,22 +679,22 @@ he:
   staff_category_name: "סגל"
   staff_category_description: "קטגוריה פרטית לדיוני הסגל. הנושאים חשופים רק בפני מנהלים ומפקחים."
   discourse_welcome_topic:
-    title: "ברוך בואך לקהילה שלנו!"
-    body: |2
+    title: "ברוך בואך אל %{site_title}! :wave:"
+    body: |
+      אנחנו מאוד שמחים שהצטרפת אלינו.
 
-      הפסקה הראשונה של נושא נעוץ זה תראה כהודעת ״ברוכים הבאים״ לכל המבקרים החדשים באתר הבית שלכם. היא חשובה!
+      %{site_info_quote}
 
-      **עירכו זאת** לתיאור קצר של הקהילה שלכם:
+      הנה מספר דברים שניתן לעשות כדי להתחיל:
 
-      - למי היא נועדה?
-      - מה הם יכולים למצוא כאן?
-      - למה כדאי להם לבוא לפה?
-      - איפה אפשר לקרוא עוד (קישורים, מקורות, וכד׳)?
+      :speaking_head: **לערוך היכרות** על ידי הוספת התמונה שלך ומידע עליך ועל תחומי העניין שלך ל[פרופיל שלך](%{base_path}/my/preferences/account). על מה הכי מעניין אותך שישאלו אותך?
 
-      <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+      :open_book: **היכרות עם הקהילה** על ידי [עיון בדיונים](%{base_path}/top) שכבר מתרחשים להם. אם מצאת פוסט מעניין, מעשיר או מבדר אפשר ללחוץ על :heart: כדי להביע את הערכתך או תמיכתך!
 
-      ייתכן ותרצו לסגור נושא זה באמצעות :wrench: הניהול (בפינות משמאל למעלה ולמטה), כדי שתגובות לא ייערמו על גבי כרזה.
-  admin_quick_start_title: "לקרוא אותי קודם: מדריך זריז למנהלים מתחילים"
+      :handshake: **תרומה** על ידי תגובה, שיתוף נקודת המבט שלך, פרסום שאלות או הצעת משוב בדיון. בטרם פרסום תגובות או נושאים חדשים, נא לעיין ב[כללי הקהילה](%{base_path}/faq).
+
+      > לקבלת עזרה או הגשת הצעה, אפשר לשאול אותנו דרך [‎#feedback](%{base_path}/c/site-feedback) או [ליצור קשר עם המנהלים](%{base_path}/about).
+  admin_quick_start_title: "מדריך למנהלים: איך מתחילים"
   category:
     topic_prefix: "על הקטגוריה %{category}"
     replace_paragraph: "(מוטב להחליף את הפסקה הראשונה הזאת בתיאור קצר של הקטגוריה החדשה שלך. הנחיה זו תופיע באזור בחירת הקטגוריה, לכן עדיף להסתפק במלל שלא יעלה על 200 תווים.)"
@@ -696,6 +713,7 @@ he:
       disallowed_tags_generic: "לנושא זה יש תגיות אסורות."
       slug_contains_non_ascii_chars: "מכיל תווים שאינם בתחום ASCII"
       is_already_in_use: "כבר בשימוש"
+      move_topic_to_category_disallowed: "אין לך אפשרות להעביר את הנושא הזה לקטגוריה שאין לך הרשאה ליצור בה נושאים חדשים."
     cannot_delete:
       uncategorized: "קטגוריה זו נחשבת למיוחדת. היא מיועדת לשימוש כמתחם לנושאים מחוסרי קטגוריה, אין אפשרות למחוק אותה."
       has_subcategories: "לא ניתן להסיר קטגוריה זו משום שיש בה תת־קטגוריות."
@@ -1211,7 +1229,7 @@ he:
       title: "יחס פעילות יומי/חודשי"
       xaxis: "יום"
       yaxis: "יחס פעילות יומי/חודשי"
-      description: "מספר החברים שנכנסו ביממה האחרונה לחלק במספר החברים שנכנסו בחודש האחרון – מחזירה אחוז שמציין את ‚דבקות’ הקהילה. עדיף לכוון לערך שעולה על 30%."
+      description: "מספר החברים שנכנסו ביממה האחרונה לחלק במספר החברים שנכנסו בחודש האחרון – מחזירה אחוז שמציין את ‚דבקות’ הקהילה. עדיף לכוון לערך שעולה על 20%."
     daily_engaged_users:
       title: "משתמשים מעורבים יומית"
       xaxis: "יום"
@@ -1480,6 +1498,7 @@ he:
     image_magick_warning: 'השרת שלך מוגדר ליצור תמונות מוקטנות של תמונות גדולות אך אין התקנה של ImageMagick. יש להתקין את ImageMagick בעזרת מנהל החבילות החביב עליך או <a href="https://www.imagemagick.org/script/download.php" target="_blank">להוריד את הגרסה העדכנית ביותר</a>.'
     failing_emails_warning: 'ישנן %{num_failed_jobs} משימות דוא״ל שנכשלו. נא לבדוק את ה־app.yml שלך ולוודא שהגדרות כתובת שרת הדוא״ל נכונות. <a href="%{base_path}/sidekiq/retries" target="_blank">ניתן לעיין במשימות שנכשלו ב־Sidekiq</a>.'
     subfolder_ends_in_slash: "הגדרת תיקיית המשנה שלך שגויה, הנתיב DISCOURSE_RELATIVE_URL_ROOT צריך להסתיים בלוכסן."
+    outdated_translations_warning: "חלק ממעקפי התרגומים שלך לא בתוקף. נא לבדוק את <a href='%{base_path}/admin/customize/site_texts?outdated=true'>התאמות הטקסט</a> שלך."
     email_polling_errored_recently:
       one: "ניסיונות שליפת הודעות דוא״ל יצרו תקלה ב־24 השעות האחרונות. ניתן לעיין ב<a href='%{base_path}/logs' target='_blank'>יומנים</a> לפרטים נוספים."
       two: "ניסיונות שליפת הודעות דוא״ל יצרו %{count} תקלות ב־24 השעות האחרונות. ניתן לעיין ב<a href='%{base_path}/logs' target='_blank'>יומנים</a> לפרטים נוספים."
@@ -1493,6 +1512,8 @@ he:
     out_of_date_themes: "יש עדכונים זמינים לערכות העיצוב הבאות:"
     unreachable_themes: "לא הצלחתי לבדוק אם יש עדכונים לערכות העיצוב הבאות:"
     watched_word_regexp_error: "הביטוי הרגולרי למילים במעקב ‚%{action}’ שגוי. נא לבדוק את <a href='%{base_path}/admin/customize/watched_words'>הגדרות המילים במעקב</a> או ךהשבית את הגדרת האתר ‚ביטוי רגולרי למילים במעקב’."
+    v3_analytics_deprecated: "ה־Discourse שלך משתמש כרגע ב־Google Analytics 3, שהתמיכה בו תיפסק אחרי יולי 2023. כדאי <a href='https://meta.discourse.org/t/260498'>לשדרג ל־Google Analytics 4</a> כעת כדי להמשיך לקבל תובנות מועילות בנוגע לביצועי האתר שלך."
+    legacy_navigation_menu_deprecated: "ה־Discourse שלך משתמש עדיין בתפריט הניווט ה‚מיושן’ ש<a href='https://meta.discourse.org/t/removing-the-legacy-hamburger-navigation-menu-option/265274'>יוסר במהדורת הבטא הראשונה של Discourse 3.2</a>. כדי לעבור לתפריט הניווט החדש על ידי עדכון <a href='%{base_path}/admin/site_settings/category/all_results?filter=navigation_menu'>הגדרת תפריט הניווט באתר</a> שלך ל־‚sidebar’ (סרגל צד) או ל־‚header dropdown’ (תפריט נגלל משורת הכותרת)."
   site_settings:
     allow_bulk_invite: "לאפשר הזמנות במרוכז על ידי העלאת קובץ CSV"
     disabled: "מושבת"
@@ -1558,8 +1579,11 @@ he:
     fixed_category_positions_on_create: "אם האפשרות תסומן, סדר הקטגוריות יוגדר בתפריט יצירת נושא (דורש fixed_category_positions)."
     add_rel_nofollow_to_user_content: 'הוספת התווית rel nofollow לכל תוכן שפורסם על ידי המשתמש/ת, פרט לקישורים פנימיים (כולל מתחם הורה parent domains). אם תשנו אפשרות זו, עליכם לאפות מחדש את כל הפרסומים עם: "rake posts:rebake"'
     exclude_rel_nofollow_domains: "רשימת שמות התחום שאין להוסיף לקישורים אליהם nofollow. הוספת example.com תאפשר אוטומטית גם את sub.example.com. בתור התחלה, עליך להוסיף את שם התחום של האתר הזה כדי לסייע לסורקי רשת (crawlers) למצוא את כל התוכן. אם חלקים אחרים מהאתר שלך מתארחים בשמות תחום אחרים, אז גם אותם."
+    max_form_template_title_length: "האורך המרבי המותר לכותרות תבניות טפסים."
+    max_form_template_content_length: "האורך המרבי המותר לתוכן תבניות טפסים."
     post_excerpt_maxlength: "אורך מקסימלי של קטע פוסט / סיכום."
     topic_excerpt_maxlength: "האורך המרבי של מקטע מתוך / סיכום של נושא, נוצר מהפוסט הראשון בנושא."
+    default_subcategory_on_read_only_category: "מפעיל את כפתור ‚נושא חדש’ ובוחר את תת־הקטגוריה כברירת מחדל לפרסום בקטגוריות בהן למשתמש אסור ליצור נושא חדש."
     show_pinned_excerpt_mobile: "הצגת קטע בנושאים נעוצים במבט ניידים."
     show_pinned_excerpt_desktop: "הצגת קטע בנושאים נעוצים בתצוגת מחשב-שולחני."
     post_onebox_maxlength: "אורך מרבי של פוסט ב־Discourse בתיבת תחימה בתווים."
@@ -1581,7 +1605,7 @@ he:
     manifest_icon: "תמונה שתשמש בתור לוגו/תמונת פתיח ב־Android. גודלה ישתנה אוטומטית לכדי 512 × 512. במקרה של העדר בחירה, ייעשה שימוש ב־large_icon (סמל גדול)."
     manifest_screenshots: "צילומי מסך שמציגים לראווה את היכולות והתכונות של העותק שלך בעמוד תהליך ההתקנה. כל התמונות חייבות להיות העלאות מקומיות ובאותם הממדים."
     favicon: "סמל האתר שלך, לפרטים <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://he.wikipedia.org/wiki/Favicon</a>. כדי שהסמל יפעל כראוי גם דרך CDN עליו להיות מסוג png. גודל הסמל ישתנה לכדי 32×32. בהעדר בחירה, ייעשה שימוש ב־large_icon."
-    apple_touch_icon: "סמל שמשמש למכשירי מגע של Apple. גודלו ישתנה אוטומטית לכדי 180 × 180. במקרה של העדר בחירה ייעשה שימוש ב־large_icon (סמל גדול)."
+    apple_touch_icon: "סמל שמשמש למכשירי מגע של Apple. רקע שקוף לא מומלץ. הגודל ישתנה ל־180x180. אם יישאר ריק, ייעשה שימוש ב־large_icon (סמל גדול) במקום."
     opengraph_image: "תמונת opengraph כבררת מחדל, נעשה בה שימוש כאשר לעמוד אין תמונות אחרות מתאימות. אם השדה נשאר ריק, ייעשה שימוש ב־large_icon (סמל גדול)."
     twitter_summary_large_image: "‚תמונת סיכום גדולה’ של כרטיס טוויטר (אמורה להיות ברוחב של 280 לפחות ובגובה של 150 לפחות, לא יכולה להיות ‎.svg). אם נשאר ריק, ייווצרו נתוני על של כרטיס רגיל בעזרת ה־opengraph_image (תמונת opengraph) כל עוד זאת גם לא ‎.svg"
     notification_email: "כתובת הדוא״ל מאת: לטובת שליחת כל הודעות המערכת החיוניות. כדי שהודעות הדוא״ל יגיעו, לשם התחום המצויין כאן חייבת להיות הגדרה נכונה של SPF,‏ DKIM ורשומות reverse PTR."
@@ -1597,6 +1621,8 @@ he:
     summary_percent_filter: "כאשר משתמש/ת מקליקים על \"סיכום נושא זה\", הציגו את % הפוסטים הראשונים"
     summary_max_results: "מספר הפוסטים המרבי שיוחזר על ידי ‚סיכום הנושא הזה’"
     summary_timeline_button: "הצגת כפתור ‚סיכום’ בציר הזמן"
+    summarization_strategy: "דרכים נוספות לסכם תוכן שנרשם על ידי תוספים"
+    custom_summarization_allowed_groups: "קבוצות שמורשות לסכם תכנים באמצעות `summarization_strategy` (אסטרטגיית תקצור)."
     enable_personal_messages: "יצא מכלל שימוש, יש להשתמש בהגדרה ‚קבוצות בהן מופעלות הודעות אישיות’. לאפשר למשתמשים בדרגת אמון 1 (ניתן להגדרה דרך אמון מזערי לשליחת הודעות) ליצור הודעות ולענות להודעות. נא לשים לב שהסגל תמיד יכול לשלוח הודעות, ללא קשר."
     personal_message_enabled_groups: "לאפשר למשתמשים בקבוצות האלו ליצור הודעות ולהגיב להודעות. קבוצות דרגות אמון כוללות את כל דרגות האמון מעל המספר הזה, למשל בחירה ב־trust_level_1 (דרגת אמון 1) מאפשרת גם למשתמשים בדרגות 2, 3 ו־4 לשלוח הודעות פרטיות. נא לשים לב שהסגל תמיד יכול לשלוח הודעות ללא תלות בהגדרות כאלו ואחרות."
     enable_system_message_replies: "מאפשר למשתמשים להגיב להודעות מערכת אפילו כשהודעות אישיות מושבתות"
@@ -1691,6 +1717,7 @@ he:
     enable_badges: "הפעלת מערכת העיטורים"
     max_favorite_badges: "מספר העיטורים המרבי שמשתמש יכול לבחור"
     whispers_allowed_groups: "לאפשר תקשורת פרטית בתוך נושאים לחברים מקבוצות מסוימות."
+    hidden_post_visible_groups: "לאפשר לחברי קבוצות אלה להציג פוסטים מוסתרים. משתמשי סגל תמיד יכולים לצפות בהודעות נסתרות."
     allow_index_in_robots_txt: "יש לציין ב־robots.txt שמותר לאתר הזה להצטרף למאגר של מנועי החיפוש. במקרים יוצאי דופן, ניתן <a href='%{base_path}/admin/customize/robots'>לדרוס את robots.txt</a> באופן קבוע."
     blocked_email_domains: "רשימה מופרדת בקווים אנכיים של שמות תחום של כתובות דוא״ל אסורות לרישום. תת־תחומים מטופלים אוטומטית עבור שמות התחום שצוינו. אין תמיכה בתווי הכללה כגון * ו־?. למשל: mailinator.com|trashmail.net"
     allowed_email_domains: "רשימה מופרדת בקווים אנכיים של שמות תחום של כתובות דוא״ל שרק דרכן ניתן להירשם. תת־תחומים מטופלים אוטומטית עבור שמות התחום שצוינו. אין תמיכה בתווי הכללה כגון * ו־?. אזהרה: משתמשים עם דוא״ל משמות תחום שאינם ברשימה לא יורשו!"
@@ -1717,7 +1744,7 @@ he:
     enable_discourse_connect: "הפעלת כניסה דרך DiscourseConnect (לשעבר ‚הכניסה האחודה של Discourse’) (אזהרה: *חובה* לאמת את כתובות הדוא״ל של המשתמשים על ידי האתר החיצוני!)"
     verbose_discourse_connect_logging: "תיעוד ניתוח נרחב בכל מה שקשור ב־DiscourseConnect אל <a href='%{base_path}/logs' target='_blank'>/logs</a>"
     enable_discourse_connect_provider: "הטמעת פרוטוקול ספק DiscourseConnect ‏(‚Discourse SSO’ לשעבר) בנקודת הגישה ‎/session/sso_provider, דורשת את ההגדרה discourse_connect_provider_secrets (סודות ספק השירות)"
-    discourse_connect_url: "כתובת נקודת הגישה אל DiscourseConnect (חייבת לכלול http://‎ או https://‎)"
+    discourse_connect_url: "כתובת נקודת הקצה של DiscourseConnect (חייבת לכלול http://‎ או https://‎, ובלי לוכסן בסוף)"
     discourse_connect_secret: "מחרוזת סודית המשמשת לאמת מידע של DiscourseConnect באופן מוצפן, נא לוודא שאורכה 10 תווים לפחות"
     discourse_connect_provider_secrets: "רשימת צמדי סודות שמות תחום שמשתמשים ב־DiscourseConnect. עליך לוודא שאורך הסוד של DiscourseConnect הוא 10 תווים ומעלה. ניתן להשתמש בתו המכליל * כדי להרחיב את ההתאמה לכל שם תחום שהוא או לחלק מסוים משם תחום (למשל: ‎*.example.com)"
     discourse_connect_overrides_bio: "דריסת הביוגרפיה בפרופיל המשתמש ומניעת השינוי מצד המשתמש"
@@ -1731,7 +1758,7 @@ he:
     discourse_connect_overrides_profile_background: "דריסת רקע פרופיל המשתמש בערך ממטען ה־DiscourseConnect."
     discourse_connect_overrides_card_background: "דריסת רקע כרטיס המשתמש בערך ממטען ה־DiscourseConnect."
     discourse_connect_not_approved_url: "הפניית חשבונות DiscourseConnect ללא אישור לכתובת הזאת"
-    discourse_connect_allows_all_return_paths: "לא להגביל את שמות התחום של נתיבי החזרה (return_paths) שמסופקים על ידי DiscourseConnect (כבררת מחדל, נתיבי החזרה חייבים להיות באתר הנוכחי)"
+    discourse_connect_allowed_redirect_domains: "הגבלת שמות תחום אלו עבור return_paths (נתיבי חזרה) שסופקו על ידי DiscourseConnect (כברירת מחדל נתיב החזרה חייב להיות לאתר הנוכחי). אפשר להשתמש ב־* כדי שיהיה כל שם תחום בתור נתיב חזרה. אסור להשתמש בתווי־כל לתתי תחום (‎`*.foobar.com`)"
     enable_local_logins: "הפעלת חשבונות כניסה עם שם משתמש וססמה. אזהרה: השבתה עשויה למנוע את כניסתך אלמלא הגדרת לפחות שיטת כניסה חלופית אחת נוספת."
     enable_local_logins_via_email: "לאפשר למשתמשים לבקש לשלוח אליהם קישור לכניסה בלחיצה אחת בדוא״ל."
     allow_new_registrations: "לאפשר הרשמות של משתמשים חדשים. יש לבטל סימון זה כדי למנוע יצירת חשבונות חדשים."
@@ -1767,6 +1794,7 @@ he:
     s3_configure_tombstone_policy: "הפעלת מדיניות מחיקה אוטומטית להעלאות מצבה. חשוב: אם אפשרות זו מושבתת, לא יפונה מקום לאחר מחיקת העלאות."
     s3_disable_cleanup: "למנוע הסרה של גיבויים ישנים מ־S3 כשיש יותר גיבויים מהמותר."
     enable_s3_inventory: "יצירת דוחות ואימות העלאות באמצעות מאגר של Amazon S3. חשוב: נדרשים פרטי גישה תקפים ל־S3 (מזהה מפתח הגישה ומפתח הגישה הסודי)."
+    s3_use_acls: "ההמלצה של AWS היא לא להשתמש בבקרת גישה (ACLs) על דליים (Buckets) של S3, אם בחרת להישמע לעצה הזאת, יש לבטל את האפשרות הזאת. אפשר להפעיל מחדש בעת שימוש בהעלאות מאובטחות."
     backup_time_of_day: "הגדרת זמן לגיבוי לפי UTC."
     backup_with_uploads: "כללו העלאות בגיבויים התקופתיים. ביטול של אפשרות זו תגבה רק את בסיס הנתונים."
     backup_location: "מיקום אחסון הגיבויים. חשוב: ל־S3 נדרשים פרטי גישה תקפים שיש להוסיף בהגדרות הקבצים."
@@ -1816,6 +1844,7 @@ he:
     s3_secret_access_key: "מפתח סוד הגישה ל־Amazon S3 שישמש להעלאת תמונות, קבצים מצורפים וגיבויים."
     s3_region: "שם האזור ב־Amazon S3 שישמש להעלאת תמונות וגיבויים."
     s3_cdn_url: "כתובת CDN לכל המשאבים ב־S3 (למשל: https://cdn.somewhere.com). א-ז-ה-ר-ה: לאחר שינוי של הגדרה זו יש לאפות מחדש את כל הפוסטים הישנים."
+    s3_use_cdn_url_for_all_uploads: "להשתמש בכתובת CDN לכל הקבצים שהועלו ל־S3 במקום רק לתמונות."
     avatar_sizes: "רשימה של גדלי דמויות שנוצרת אוטומטית."
     external_system_avatars_enabled: "שימוש בשירות של מערכת אווטארים חיצונית."
     external_system_avatars_url: "כתובת של שירות דמויות חיצוני. החלפות מותרות הן {username} {first_letter} {color} {size}"
@@ -1835,7 +1864,7 @@ he:
     composer_media_optimization_image_bytes_optimization_threshold: "גודל קובץ תמונה מזערי להפעלת מיטוב בצד הלקוח"
     composer_media_optimization_image_resize_dimensions_threshold: "רוחב תמונה מזערי להפעלת שינוי גודל בצד הלקוח"
     composer_media_optimization_image_resize_width_target: "תמונות שרוחבן עולה על `composer_media_optimization_image_dimensions_resize_threshold`, גודלן ישתנה לרוחב זה. הערך חייב להיות >= לעומת `composer_media_optimization_image_dimensions_resize_threshold`."
-    composer_media_optimization_image_encode_quality: "איכות קידוד JPEG המשמשת בתהליך הקידוד מחדש."
+    composer_media_optimization_image_encode_quality: "איכות קידוד JPG המשמשת בתהליך הקידוד מחדש."
     min_ratio_to_crop: "יחס לחיתוך תמונות גבוהות. יש להקליד את התוצאה ברוחב / גובה."
     simultaneous_uploads: "מספר הקבצים המרבי שניתן לגרור ולהשליך אל מחבר ההודעות"
     default_invitee_trust_level: "דרגת האמון כברירת המחדל למשתמשים שהוזמנו (0‏-4)"
@@ -1864,7 +1893,9 @@ he:
     tl3_requires_likes_given: "מספר הלייקים המזערי שיש להעניק במשך (פרק זמן בדרגת אמון 3) הימים האחרונים כדי לעמוד בתנאי הקידום לדרגת אמון 3."
     tl3_requires_likes_received: "מספר הלייקים המזערי שיש לקבל במשך (פרק זמן בדרגת אמון 3) הימים האחרונים כדי לעמוד בתנאי הקידום לדרגת אמון 3."
     tl3_links_no_follow: "מניעת הסרת rel=nofollow מקישורים שמפורסמים על ידי משתמשים בדרגת אמון 3."
-    trusted_users_can_edit_others: "לאפשר למשתמשים בדרגת אמון גבוהה לערוך תוכן של משתמשים אחרים"
+    tl4_delete_posts_and_topics: "לאפשר למשתמשים בדרגת אמון 4 למחוק פוסטים ונושאים שנוצרו על ידי משתמשים אחרים. משתמשים בדרגת אמון 4 יוכלו גם לצפות בנושאים ובפוסטים שנמחקו."
+    edit_all_topic_groups: "לאפשר למשתמשים בקבוצה זו לערוך את כותרות הנושאים, התגיות והקטגוריות של משתמשים אחרים"
+    edit_all_post_groups: "לאפשר למשתמשים בקבוצה זו לערוך פוסטים של משתמשים אחרים"
     min_trust_to_create_topic: "דרגת האמון המזערית הנדרשת ליצירת נושא חדש."
     allow_flagging_staff: "אם אפשרות זו פעילה, משתמשים יכולים לסמן בדגל פוסטים שפורסמו על ידי חשבונות סגל."
     min_trust_to_edit_wiki_post: "דרגת האמון המזערית הנדרשת לעריכת פוסט המסומן כוויקי."
@@ -1900,7 +1931,7 @@ he:
     title_min_entropy: "האנטרופיה (תווים ייחודים שאינם בשפת הכתיבה) המינימלית הנדרשת בכותרת נושא."
     body_min_entropy: "האנטרופיה (תוים ייחודיים, תווים שאינם באנגלית נחשבים יותר) המינימלית הנדרשת בגוף הפוסט."
     allow_uppercase_posts: "אפשרו אותיות אנגליות גדולות (Capitalized) בכותרת נושא או בגוף פוסט."
-    max_consecutive_replies: "מספר הפוסטים שמשתמש עושה ברצף בתוך נושא בטרם החלת איסור על הוספת תגובות."
+    max_consecutive_replies: "מספר הפוסטים שמשתמש יכול לפרסם ברצף בנושא מסוים לפני הגבלת הוספת תגובות נוספות. המגבלה הזאת לא חלה על בעלי הנושא, סגל האתר או מפקחי הקטגוריות."
     enable_filtered_replies_view: 'הכפתור „(n) תגובות” מצמצם את כל הפוסטים האחרים ומציג רק את הפוסט הנוכחי ואת התגובות עליו.'
     title_fancy_entities: "המרת תווי ASCII נפוצים ליישויות HTML מהודרות בכותרות הנושאים, בסגנון SmartyPants <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</a>"
     min_title_similar_length: "האורך המינימלי של כותרת לפני שהיא נבדקת עבור איתור נושאים דומים."
@@ -1980,6 +2011,11 @@ he:
     block_auto_generated_emails: "לחסום הודעות דוא״ל נכנסות שזוהו ככאלו שנוצרו אוטומטית."
     ignore_by_title: "להתעלם מהודעות דוא״ל נכנסות לפי הכותרת שלהן."
     mailgun_api_key: "מפתח API סודי של Mailgun לאימות של הודעות webhook."
+    sendgrid_verification_key: "מפתח התיקוף של Sendgrid משמש לתיקוף הודעות התליה."
+    mailjet_webhook_token: "אסימון המשמש לתיקוף מטען של התליה. חובה להעביר אותו בתור המשתנה ‚t’ בשאילתה של ההתליה, למשל: https://example.com/webhook/mailjet?t=supersecret"
+    mandrill_authentication_key: "מפתח האימות של Mandrill משמש לאימות הודעות התליה."
+    postmark_webhook_token: "אסימון המשמש לתיקוף מטען של התליה. חובה להעביר אותו בתור המשתנה ‚t’ בשאילתה של ההתליה, למשל: https://example.com/webhook/postmark?t=supersecret"
+    sparkpost_webhook_token: "אסימון המשמש לתיקוף מטען של התליה. חובה להעביר אותו בתור המשתנה ‚t’ בשאילתה של ההתליה, למשל: https://example.com/webhook/sparkpost?t=supersecret"
     soft_bounce_score: "ניקוד-החזר מתווסף למשתמש כאשר מתרחשת החזרה זמנית."
     hard_bounce_score: "ניקוד-החזר מתווסף למשתמש כאשר מתרחשת החזרה קבועה."
     bounce_score_threshold: "ניקוד-החזר מקסימלי לפני שנפסיק לשלוח מיילים למשתמש."
@@ -2007,7 +2043,7 @@ he:
     pop3_polling_password: "הסיסמה לחשבון ה-POP3 למשיכת הדוא\"ל."
     pop3_polling_delete_from_server: "למחוק הודעות דוא״ל מהשרת. לתשומת לבך: השבתת אפשרות זו מאלצת אותך לפנות את תיבת הדוא״ל באופן ידני"
     log_mail_processing_failures: "לתעד את כל שגיאות עיבוד הדוא״ל אל <a href='%{base_path}/logs' target='_blank'>‎/logs</a>"
-    email_in: 'לאפשר למשתמשים לפרסם נושאים חדשים באמצעות דוא״ל (נדרש תשאול ידני או דרך pop3). יש להגדיר את הכתובות בלשונית ה„הגדרות” שבכל קטגוריה.'
+    email_in: "לאפשר למשתמשים לפרסם נושאים חדשים דרך דוא״ל. לאחר הפעלת ההגדרה הזאת, יתאפשר לך להגדיר כתובות דוא״ל נכנסות לקבוצות ולקטגוריות."
     email_in_min_trust: "דרגת האמון המזערית הנדרשת למשתמש כדי לפרסם נושאים חדשים דרך הדוא״ל."
     email_in_authserv_id: "מזהה השירות מבצע בדיקות אימות על הודעות דוא״ל נכנסות. יש לעיין ב־<a href='https://meta.discourse.org/t/134358'>https://meta.discourse.org/t/134358</a> לקבלת הנחיות כיצד להגדיר זאת."
     email_in_spam_header: "כותרת הודעת הדוא״ל לאיתור ספאם."
@@ -2053,6 +2089,7 @@ he:
     enable_category_group_moderation: "לאפשר לקבוצות לסקור תוכן בקטגוריות מסוימות"
     group_in_subject: "ניתן להגדיר %%{optional_pm} בנושא הודעת הדוא״ל לשם הקבוצה הראשונה בהודעה הפרטית (PM), למידע נוסף: <a href='https://meta.discourse.org/t/customize-specific-email-templates/88323' target='_blank'>התאמת תבנית הנושא להודעות דוא״ל תקניות</a>"
     allow_anonymous_posting: "לאפשר למשתמשים לעבור למצב אלמוני"
+    allow_anonymous_likes: "לאפשר למשתמשים אלמוניים לסמן פוסטים בלייק"
     anonymous_posting_min_trust_level: "דרגת האמון המזערית הנדרשת כדי לאפשר פרסום אלמוני"
     anonymous_account_duration_minutes: "כדי להגן על האלמוניות יש ליצור חשבון אלמוני חדש כל N דקות עבור כל משתמש. למשל: אם ההגדרה היא 600, בחלוף 600 דקות מהפוסט האחרון וגם אם המשתמש עבר למצב אלמוני, ייווצר חשבון אלמוני חדש."
     hide_user_profiles_from_public: "להשבית כרטיסי משתמשים, פרופילי משתמשים וספריית משתמשים עבור משתמשים אלמוניים."
@@ -2071,6 +2108,7 @@ he:
     allow_profile_backgrounds: "אפשרו למשתמשים להעלות רקעים לפרופיל."
     sequential_replies_threshold: "מספר הפוסטים שעל משתמש לפרסם אחד-לאחר-השני בנושא לפני שמזכירים לו שהוא משאיר יותר מידי תגובות ברצף."
     get_a_room_threshold: "מספר פוסטים שמשתמשים צריכים להכין לאותו אדם באותו הנושא לפני שהם מוזהרים."
+    dont_feed_the_trolls_threshold: "מספר הסימונים ממשתמשים אחרים בטרם אזהרה."
     enable_mobile_theme: "מכשירים ניידים משתמשים בערכת עיצוב מותאמת לניידים לצד האפשרות לעבור לאתר המלא. ניתן להשבית זאת כדי להשתמש בערכת סגנון מסתגלת לחלוטין."
     dominating_topic_minimum_percent: "איזה אחוז מהפוסטים משתמש צריך לייצר בנושא לפני שיקבל תזכורת לגבי שתלטנות יתר על הנושא."
     disable_avatar_education_message: "ניטרול הודעה שמלמדת על שינוי דמות."
@@ -2080,22 +2118,22 @@ he:
     permalink_normalizations: "החילו את הביטויים הרגולריים האלו לפני שמתאימים קישורים-קבועים, למשל: /(topic.*)\\?.*/\\1 יסיר מחרוזות שאילתה מנתיבי נושאים. הפורמט הוא regex+string משתמש ב \\1 וכד׳ כדי לגשת להתאמות"
     global_notice: "הצגת מודעה גלובלית דחופה בגדר חירום לכל המבקרים, יש להחליף בתוכן ריק כדי להסתיר אותה (מותר HTML)."
     disable_system_edit_notifications: "ביטול התראות עריכה על ידי משתמש המערכת כאשר 'download_remote_images_to_local' פעיל."
-    disable_category_edit_notifications: "השבתת התראות על עריכת קטגוריות בנושאים."
-    disable_tags_edit_notifications: "השבתת התראות על עריכת תגיות בנושאים."
+    disable_category_edit_notifications: "השבתת התראות על עריכות של קטגוריות נושא."
+    disable_tags_edit_notifications: "השבתת התראות על עריכות של תגיות נושא."
     notification_consolidation_threshold: "מספר ההתראות שסומנו בלייק או בקשות שהתקבלו לפני שההתראות קובצו להתראה אחת. יש להגדיר ל־0 כדי להשבית."
     likes_notification_consolidation_window_mins: "משך הזמן בשניות בו התראות מקובצות להתראה אחת לאחר שהגיעו לסף הזה. ניתן להגדיר את הסף דרך `SiteSetting.notification_consolidation_threshold` (סף קיבוץ התראות)."
     automatically_unpin_topics: "הסרת נעיצה אוטומטית של נושאים כאשר המשתמשים מגיעים לתחתית."
     read_time_word_count: "מספר המילים לדקה כדי להעריך את זמן הקריאה."
     topic_page_title_includes_category: "<a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title' target='_blank'>תגית הכותרת (title)</a> בעמוד הנושא מכילה את שם הקטגוריה."
-    native_app_install_banner_ios: "הצגת מודעת היישומון DiscourseHub במכשירי iOS למשתמשים רגילים (דרגת אמון 1 ומעלה)."
-    native_app_install_banner_android: "הצגת מודעת היישומון DiscourseHub במכשירי Android למשתמשים רגילים (דרגת אמון 1 ומעלה)."
+    native_app_install_banner_ios: "הצגת מודעת היישומון DiscourseHub במכשירי iOS למשתמשים בסיסיים (דרגת אמון 1) ומעלה."
+    native_app_install_banner_android: "הצגת מודעת היישומון DiscourseHub במכשירי Android למשתמשים בסיסיים (דרגת אמון 1) ומעלה."
     app_association_android: "תכני נקודת הקצה <a href='%{base_path}/.well-known/assetlinks.json'>‎.well-known/assetlinks.json</a> שמשמשת לטובת ה־API של Google's Digital Asset Links."
     app_association_ios: "תכני נקודת הקצה <a href='%{base_path}/apple-app-site-association'>apple-app-site-association</a> שמשמשת ליצירת Universal Links (קישורים אוניברסליים) בין האתר הזה ויישומוני iOS."
     share_anonymized_statistics: "שיתוף סטטיסטיקת שימוש אלמונית."
     auto_handle_queued_age: "לטפל אוטומטית ברשומות שממתינות לסקירה לאחר כמות כזו של ימים. ללא התחשבות בדגלים. פוסטים ומשתמשים שממתינים בתור יידחו. יש להגדיר ל־0 כדי להשבית את התכונה הזו."
     penalty_step_hours: "עונשי ברירת מחדל להשתקה או השעייה של משתמשים בשעות. ברירת המחדל לעבירה הראשונה היא הערך הראשון, ברירת המחדל לעבירה השנייה היא הערך השני וכן הלאה וכן הלאה."
     svg_icon_subset: "הוספת סמלים נוספים מתוך FontAwesome 5 אותם ברצונך לכלול בין המשאבים שלך. יש להשתמש בקידומת ‚fa-‎’ לסמלים אחידים, ‚far-‎’ לסמלים רגילים וב־‚fab-‎’ לסמלים ממותגים."
-    max_prints_per_hour_per_user: "מספר החשיפות המרבי לדף ‎/print (0 להשבתה)"
+    max_prints_per_hour_per_user: "מספר החשיפות המרבי לדף ‎/print (0 להשבתת הדפסה)"
     full_name_required: "שם מלא הוא שדה נדרש לפרופיל משתמש/ת."
     enable_names: "הצגת השם המלא של המשתמש בפרופיל, כרטיס המשתמש והודעות הדוא״ל של המשתמש. ניתן להשבית כדי להסתיר את השם המלא בכל מקום."
     display_name_on_posts: "הצגת שמם המלא של משתמשים בפוסטים שלהם, בנוסף ל@שם_המשתמש שלהם."
@@ -2116,17 +2154,13 @@ he:
     allowed_href_schemes: "פרוטוקולים מותרים בלינקים בנוסף ל http ו https."
     embed_post_limit: "מספר מקסימלי של פוסטים להטמעה."
     embed_username_required: "נדרש שם משתמש ליצירת הנושא."
-    notify_about_flags_after: "אם יש דגלים שלא טופלו לאחר כמות זו של שעות, תישלח הודעה אישית אל המפקחים. 0 להשבתה."
-    show_create_topics_notice: "אם לאתר פחות מ־5 נושאים פומביים, יש להציג מודעה המבקשת מהמנהלים ליצור נושאים נוספים."
+    notify_about_reviewable_item_after: "אם יש פריטים לסקירה שלא טופלו לאחר כמות זו של שעות, תישלח הודעה אישית אל המפקחים. 0 להשבתה."
     delete_drafts_older_than_n_days: "למחוק טיוטות שגילן עולה על (n) ימים."
     delete_merged_stub_topics_after_days: "מספר הימים להמתנה לפני מחיקה אוטומטית של נושאים מקוצרים שמוזגו במלואם. יש להגדיר ל־0 כדי לא למחוק נושאים מקוצרים לעולם."
-    bootstrap_mode_min_users: "מספר משתמשים מזערי שנדרש כדי להשבית מצב ראשוניות (0 להשבתה)"
+    bootstrap_mode_min_users: "מספר משתמשים מזערי שנדרש כדי להשבית מצב ראשוניות (0 להשבתה, יכול לארוך עד 24 שעות)"
     prevent_anons_from_downloading_files: "למנוע ממשתמשים אלמוניים להוריד קבצים מצורפים."
-    secure_media: "יצא מכלל שימוש: נא להשתמש בהגדרה secure_uploads במקום, יוסר ב־Discourse 3.0."
     secure_uploads: 'מגביל גישה לכל ההעלאות (תמונות, סרטונים, שמע, טקסט, קובצי PDF, ארכיוני zip ועוד). אם מופעלת האפשרות „דרישת כניסה”, רק משתמשים שנכנסו למערכת יכולים לגשת להעלאות. אחרת, הגישה תוגבל רק להעלאות מסוגי מדיה בהודעות פרטיות ובקטגוריות פרטיות. אזהרה: מדובר בהגדרה מסובכת שדורשת הבנה עמוקה בניהול המערכת. יש לעיין ב<a target="_blank" href="https://meta.discourse.org/t/-/140017">נושא ההעלאות המאובטחות ב־Meta</a> לקבלת פרטים נוספים.'
-    secure_media_allow_embed_images_in_emails: "יצא מכלל שימוש: יש להשתמש ב־secure_uploads_allow_embed_images_in_emails, יוסר ב־Discourse 3.0."
     secure_uploads_allow_embed_images_in_emails: "מאפשר להטמיע תמונות מאובטחות שבדרך כלל יידחסו אם הגודל שלהן קטן מההגדרה ‚secure uploads max email embed image size kb’ (גודל העלאות מרבי להטמעה כתמונה בקילובתים)."
-    secure_media_max_email_embed_image_size_kb: "יצא מכלל שימוש: יש להשתמש ב־secure_uploads_max_email_embed_image_size_kb, יוסר ב־Discourse 3.0."
     secure_uploads_max_email_embed_image_size_kb: "גודל החיתוך לתמונות מאובטחות שיוטמעו בהודעות דוא״ל אם ההגדרה ‚secure uploads allow embed in emails’ (לאפשר הטמעת העלאות מאובטחת בהודעות דוא״ל) פעילה. אם ההגדרה הזאת אינה פעילה להגדרה זו אין שום משמעות."
     slug_generation_method: "נא לבחור שיטת יצירת כתובת מופשטות. ‚מוצפן’ ייצר מחרוזת עם קידוד באחוזים, ‚ללא’ ישבית את הכתובת המופשטת לחלוטין."
     enable_emoji: "הפעלת אמוג׳י"
@@ -2134,6 +2168,7 @@ he:
     emoji_set: "איך בא לך את האמוג׳י שלך?"
     emoji_autocomplete_min_chars: "מספר התווים המזערי שנדרש להקפצת חלונית השלמה אוטומטית של אמוג׳י"
     enable_inline_emoji_translation: "הפעלת תרגום לאמוג׳י כחלק מהשורה (ללא רווחים או סימני פיסוק לפני)."
+    emoji_deny_list: "סמלי האמוג׳י האלה לא יהיו זמינים לשימוש בתפריטים או בקודים מקוצרים."
     approve_post_count: "מספר הפוסטים ממשתמשים חדשים או בסיסיים שחייבים לאשר אותם"
     approve_unless_trust_level: "פוסטים של משתמשים מתחת לדרגת אמון זו חייבים לעבור אישור"
     approve_new_topics_unless_trust_level: "נושאים חדשים של משתמשים מתחת לדרגת אמון זו חייבים לעבור אישור"
@@ -2188,18 +2223,26 @@ he:
     default_tags_watching_first_post: "רשימת תגיות שעבורן פוסט ראשון בכל נושא חדש יצטרף לצפייה כבררת מחדל."
     default_text_size: "גודל הטקסט שנבחר כברירת מחדל"
     default_title_count_mode: "מצב בררת מחדל למונה כותרות עמודים"
+    enable_offline_indicator: "להציג הודעה למשתמשים כאשר זוהה שהחיבור שלהם לאינטרנט נקטע."
+    default_sidebar_link_to_filtered_list: "להפוך את קישור קישורי תפריט הניווט לרשימה מסוננת כברירת מחדל."
+    default_sidebar_show_count_of_new_items: "להפוך את קישורי תפריט הניווט כך שיציגו מספר פריטים חדשים במקום עיטורים כברירת מחדל."
+    default_sidebar_switch_panel_position: "מיקום כפתורי החלפת לוח בסרגל הצד"
     retain_web_hook_events_period_days: "מספר הימים לשמירת רשומות אירועי התלייה."
     retry_web_hook_events: "לנסות מחדש אירועי התליה שנכשלו במשך 4 פעמים. פרקי הזמן שבין הניסיונות החוזרים הם 1, 5, 25 ו־125 דקות."
     revoke_api_keys_days: "מספר הימים בטרם שלילה אוטומטית של מפתח API שלא היה בשימוש (0 - לעולם לא)."
     allow_user_api_keys: "לאפשר למשתמשים ליצור מפתחות API"
     allow_user_api_key_scopes: "רשימת אזורים מותרים למפתחות API של משתמשים"
-    min_trust_level_for_user_api_key: "דרגת האמון הנדרשת ליצירת מפתחות API למשתמש"
+    min_trust_level_for_user_api_key: |
+      נדרשת דרגת אמון ליצירת מפתחות API למשתמש.<br>
+      <b>אזהרה</b>: שינוי דרגת האמון ימנע ממשתמשים עם דרגת אמון נמוכה יותר להיכנס דרך Discourse Hub
     allowed_user_api_auth_redirects: "כתובת מורשית להפניית אימות למפתחות API של משתמש. בסימן התו־כל * ניתן להשתמש כדי ללכוד חלק ממנה (למשל: www.example.com/*‎)."
     allowed_user_api_push_urls: "URLים מורשים לדחיפת שרת ל API של משתמשים."
     expire_user_api_keys_days: "מספר הימים בטרם פקיעת תוקף מפתח ה־API של המשתמש אוטומטית (0 - לעולם לא)."
     tagging_enabled: "לאפשר תגיות על נושאים?"
     min_trust_to_create_tag: "דרגת האמון המזערית שנדרשת כדי ליצור תגית."
     max_tags_per_topic: "כמות התגיות המרבית שניתן להקצות לנושא."
+    enable_max_tags_per_email_subject: "להשתמש ב־max_tags_per_email_subject (כמות תגיות מרבית לנושא הודעת דוא״ל) בעת יצירת נושא להודעת דוא״ל"
+    max_tags_per_email_subject: "מס׳ התגיות המרבי שיכול להיות בנושא של הודעת דוא״ל"
     max_tag_length: "אורך התג המקסימלי (מספר תווים)."
     max_tag_search_results: "בעת חיפוש אחר תגיות, כמה תוצאות תופענה לכל היותר."
     max_tags_in_filter_list: "מספר התגיות המרבי להצגה בתפריט המסננים הנגלל. התגיות השימושיות ביותר תופענה."
@@ -2211,6 +2254,8 @@ he:
     suppress_overlapping_tags_in_list: "אם תגיות תואמות מילים בכותרות נושאים באופן מדויק, לא להציג את התגית"
     remove_muted_tags_from_latest: "לא להציג נושאים שמתויגים רק בתגיות מושתקות ברשימת הנושאים האחרונים."
     force_lowercase_tags: "לאלץ את כל התגיות החדשות להיות באותיות קטנות בלבד."
+    create_post_for_category_and_tag_changes: "ליצור פוסט פעולה קטן כאשר קטגוריה או תגיות של נושא משתנים"
+    watched_precedence_over_muted: "להודיע לי על נושאים בקטגוריות או תגיות שאני עוקב אחריהם שגם שייכים לזה שהשתקתי"
     company_name: "שם החברה"
     governing_law: "החוק המחייב"
     city_for_disputes: "עיר המחלוקת"
@@ -2225,7 +2270,7 @@ he:
     enable_sitemap: "ליצור מפת אתר עבור האתר שלך ולכלול אותה בקובץ robots.txt."
     sitemap_page_size: "מספר הכתובות שיתווספו בכל עמוד של מפת אתר. 50,000 לכל היותר"
     enable_user_status: "(ניסיוני) לאפשר למשתמשים להגדיר הודעת מצב מותאמת אישית (אמוג׳י + תיאור)."
-    enable_user_tips: "(ניסיוני) לאפשר למשתמשים חדשים שמתארים יכולות מפתח למשתמשים"
+    enable_user_tips: "לאפשר עצות למשתמשים חדשים שמתארים יכולות מפתח למשתמשים"
     short_title: "בכותרת הקצרה ייעשה שימוש במסך הבית של המשתמש, במשגר או במקומות אחרים שבהם המקום מוגבל. אורכה לא יעלה על 12 תווים."
     dashboard_hidden_reports: "לאפשר להסתיר את הדוחות המסוימים בלוח הבקרה."
     dashboard_visible_tabs: "נא לבחור אילו לשוניות תופענה בלוח הבקרה."
@@ -2242,11 +2287,15 @@ he:
     suggest_weekends_in_date_pickers: "לכלול סופי שבוע (שישי ושבת) בהצעות לבוחר התאריכים (כדאי להשבית זאת אם יוצא לך להשתמש ב־Discourse רק בימי חול, ראשון עד חמישי)."
     splash_screen: "מציג מסך טעינה בזמן שהמשאבים נטענים"
     navigation_menu: "קביעת תפריט הניווט לשימוש. המשתמשים יכולים להתאים את הניווט מסרגל הצד והכותרת. האפשרות הישנה זמינה לטובת תאימות לאחור."
-    default_sidebar_categories: "הקטגוריות הנבחרות תוצגנה תחת סעיף הקטגוריות של סרגל הצד כברירת מחדל."
-    default_sidebar_tags: "התגיות הנבחרות תוצגנה תחת סעיף התגיות של סרגל הצד כברירת מחדל."
-    enable_new_user_profile_nav_groups: "ניסיוני: משתמשים בקבוצות שנבחרו יופיעו בתפריט הניווט החדש של פרופיל המשתמש"
-    enable_experimental_topic_timeline_groups: "ניסיוני: בפני המשתמשים בקבוצות שנבחרו יופיע ציר הזמן המחודש של הנושא"
+    default_navigation_menu_categories: "הקטגוריות הנבחרות תוצגנה תחת סעיף הקטגוריות של תפריט הניווט כברירת מחדל."
+    default_navigation_menu_tags: "התגיות הנבחרות תוצגנה תחת סעיף התגיות של תפריט הניווט כברירת מחדל."
     enable_experimental_hashtag_autocomplete: "ניסיוני: ניתן להשתמש במערכת אוטומטית להשלמת #תגיות עבור קטגוריות ותגיות שמעבדת את הפריט הנבחר באופן שונה והחיפוש בה משופר"
+    experimental_new_new_view_groups: 'ניסיוני: לאפשר רשימת נושאים חדשה המשלבת נושאים שלא נקראו וחדשים ולקשר אליה את „הכול” בסרגל הצד.'
+    enable_custom_sidebar_sections: "ניסיוני: הפעלת אגפים משלך בסרגל הצד"
+    experimental_topics_filter: "ניסיוני: מפעיל את נתיב סינון הנושאים הניסיוני תחת ‎/filter"
+    experimental_search_menu_groups: "ניסיוני: מאפשר את תפריט החיפוש החדש ששודרג כך שישתמש ב־glimmer"
+    enable_experimental_lightbox: "ניסיוני: להחליף את התיבה הקלילה לתמונות כברירת מחדל לעיצוב המשופר."
+    page_loading_indicator: "הגדרת מחוון הטעינה שמופיע במהלך ניווט בין עמודים ב־Discourse. ‚שבשבת’ הוא מחוון עמוד מלא. ‚מד התקדמות’ מציג סרגל צר בראש המסך."
     errors:
       invalid_css_color: "צבע שגוי. נא למלא את שם הצבע או ערך הקסדצימלי."
       invalid_email: "כתובת דוא״ל שגויה."
@@ -2272,7 +2321,7 @@ he:
       pop3_polling_password_is_empty: "עליכם לקבוע 'סיסמת תשאול pop3' לפני שתאפשרו תשאול POP3."
       pop3_polling_authentication_failed: "אימות POP3 נכשל. נא לאמת את פרטי הגישה שלך ל־pop3."
       reply_by_email_address_is_empty: "חובה להגדיר ‚מענה לפי כתובת דוא״ל’ בטרם הפעלת תגובה בדוא״ל."
-      email_polling_disabled: "יש לאפשר תשאול ידני או דרך POP3 בטרם הפעלת תגובה דרך דוא״ל."
+      email_polling_disabled: "צריך להפעיל תשאול ידני או POP3 או שיש לך דוגם דוא״ל פעיל משלך בטרם הפעלת תשובה בדוא״ל."
       user_locale_not_enabled: "לפני שתוכלו להפעיל אפשרות זאת, יש לאפשר \"הגדרות מקומיות מותאמות משתמש/ת\""
       personal_message_enabled_groups_invalid: "עליך לציין לפחות קבוצה אחת להגדרה זו. כדי למנוע מכולם לשלוח הודעות פרטיות למעט הסגל יש לבחור בקבוצת הסגל."
       invalid_regex: "ביטוי רגולרי לא תקין או לא מותר."
@@ -2281,7 +2330,6 @@ he:
       staged_users_disabled: "עליך לאפשר ‚משתמשים מבוימים’ בטרם הפעלת הגדרה זו."
       reply_by_email_disabled: "עליך להפעיל את ‚תגובה בדוא״ל’ בטרם הפעלת הגדרה זו."
       discourse_connect_url_is_empty: "עליך להגדיר ‚כתובת discourse connect’ בטרם הפעלת הגדרה זו."
-      discourse_connect_invite_only: "לא ניתן להפעיל את DiscourseConnect ולסגור להזמנות בלבד בעת ובעונה אחת."
       enable_local_logins_disabled: "עליך תחילה להפעיל את ‚הפעלת כניסה מקומית’ בטרם הפעלת הגדרה זו."
       min_username_length_exists: "לא ניתן להגדיר את האורך המזערי לשם המשתמש לפחות תווים מאשר שם המשתמש הקצר ביותר במערכת (%{username})."
       min_username_length_range: "לא ניתן לקבוע את המינימום מעל המקסימום."
@@ -2303,7 +2351,8 @@ he:
       search_tokenize_japanese_enabled: "עליך להשבית את ‚search_tokenize_japanese’ (חיפוש מפרק יפנית) בטרם הפעלת הגדרה זו."
       discourse_connect_cannot_be_enabled_if_second_factor_enforced: "אי אפשר להפעיל את DiscourseConnect אם נאכף אימות דו־שלבי."
       delete_rejected_email_after_days: "הגדרה זו לא יכולה להיות קטנה מ־delete_email_logs_after_days (ימים שלאחריהם למחוק יומני דוא״ל) או גדולה מ־%{max}"
-      invalid_uncategorized_category_setting: "אי אפשר לבחור בקטגוריה שאינה בין הקטגוריות אם הרשאת נושאים שאינם בקטגוריה אסורה"
+      invalid_uncategorized_category_setting: 'אי אפשר לבחור בקטגוריה „ללא קטגוריה” אם ‚הרשאת נושאים ללא קטגוריה’ אסורה.'
+      invalid_search_ranking_weights: "הערך שגוי להגדרת האתר search_ranking_weights (משקלי דירוג חיפוש). למשל: ‚{0.1,0.2,0.3,1.0}’. נא לשים לב שהערך המרבי לכל משקל הוא 1.0."
     placeholder:
       discourse_connect_provider_secrets:
         key: "www.example.com"
@@ -2538,7 +2587,6 @@ he:
     activated_by_staff: "הופעל על ידי הצוות"
     new_user_typed_too_fast: "משתמש חדש הקליד מהר מידי"
     content_matches_auto_silence_regex: "ביטוי רגולרי לחסימת תוכן אוטומטית"
-    content_matches_auto_block_regex: "ביטוי רגולרי לחסימת תוכן אטוטמטית"
     username:
       short: "חייבים להיות לפחות %{min} תווים"
       long: "נדרשים לא יותר מ-%{max} תווים"
@@ -3281,7 +3329,7 @@ he:
 
         המשתמש החדש [%{username}](%{user_url}) הושתק אוטומטית כיוון שמספר משתמשים סימנו את הפוסט/ים של %{username} בדגל.
 
-        נא [לסקור את הסימונים](%{base_url}/admin/flags). אם ההשתקה של %{username} אינה מוצדקת, יש ללחוץ על כפתור ביטול ההשתקה ב[עמוד הניהול עבור המשתמש הזה](%{user_url}).
+        נא [לסקור את הסימונים](%{base_url}/review). אם ההשתקה של %{username} אינה מוצדקת, יש ללחוץ על כפתור ביטול ההשתקה ב[עמוד הניהול עבור המשתמש הזה](%{user_url}).
 
         ניתן לשנות את הסף הזה בעזרת שינוי `silence_new_user` (השתקת משתמשים חדשים) בהגדרות האתר.
     spam_post_blocked:
@@ -3319,15 +3367,6 @@ he:
       title: "הורדת תמונות מרוחקות מושבתת"
       subject_template: "הורדת תמונות מרוחקות מושבתת"
       text_body_template: "האפשרות \"הורדת תמונות מרוחקות\" נוטרלה בגלל שכל שטח האכסון שמוקצה ל\"תמונות שהורדו מרחוק\" נוצל."
-    dashboard_problems:
-      title: "בעיות בלוח המכוונים"
-      subject_template: "עצה חדשה בלוח המחוונים של האתר שלך"
-      text_body_template: |
-        יש לנו עצה והמלצות חדשות עבורך בהתאם להגדרות האתר הנוכחיות שלך.
-
-        עליך [לבקר בלוח המחוונים של האתר שלך](%{base_url}/admin) כדי לצפות בהן.
-
-        אם לא מופיע שום דבר בלוח המחוונים, יכול להיות שחבר סגל אחר כבר טיפל בזה. ניתן לצפות בפעולות הסגל תחת [יומני פעילות סגל](%{base_url}/admin/logs/staff_action_logs).
     new_user_of_the_month:
       title: "אתם המשתמשים החדשים של החודש!"
       subject_template: "אתם המשתמשים החדשים של החודש!"
@@ -3368,9 +3407,6 @@ he:
       many: "לתשומת לבך: אנו שולחים %{count} הודעות דוא״ל בכל יום לכל היותר. מומלץ לבדוק באתר אם יש כאלו שהוחזקו. דרך אגב, תודה על הפופולריות שלך!"
       other: "לתשומת לבך: אנו שולחים %{count} הודעות דוא״ל בכל יום לכל היותר. מומלץ לבדוק באתר אם יש כאלו שהוחזקו. דרך אגב, תודה על הפופולריות שלך!"
     in_reply_to: "בתגובה ל"
-    unsubscribe:
-      title: "ביטול מנוי"
-      description: "לא מעניין אותך לקבל את ההודעות האלו? אין בעיה! לחיצה למטה תסיר את המנוי שלך מיידית:"
     reply_by_email: "[בקרו בנושא](%{base_url}%{url}) או ענו למייל זה כדי להגיב."
     reply_by_email_pm: "יש [לבקר בהודעה](%{base_url}%{url}) או להשיב להודעת דוא״ל זו כדי להגיב אל %{participants}."
     only_reply_by_email: "השיבו למייל זה כדי לענות."
@@ -3656,7 +3692,6 @@ he:
       liked_received: "לייקים שהתקבלו"
       new_users: "משתמשים חדשים"
       popular_topics: "נושאים פופולאריים"
-      follow_topic: "עיקבו אחרי נושא זה"
       join_the_discussion: "קראו עוד"
       popular_posts: "פוסטים פופולאריים"
       more_new: "חדש בשבילך"
@@ -3856,14 +3891,7 @@ he:
     title: "לא ניתן לטעון את היישום"
     offline_page_message: "נראה כאילו אין לך תקשורת לאינטרנט! נא לבדוק את חיבור הרשת שלך ולנסות שוב."
   login_required:
-    welcome_message: |
-      ## [ברוך בואך אל %{title}](#welcome)
-      נדרש חשבון. נא ליצור חשבון או להיכנס כדי להמשיך.
-    welcome_message_invite_only: |
-      ## [ברוך בואך אל %{title}](#welcome)
-      נדרש חשבון. נא לבקש מחבר קיים לשלוח לך הזמנה או להיכנס כדי להמשיך.
-  deleted: "נמחק"
-  image: "תמונה"
+    welcome_message: "# [ברוך בואך אל %{title}](#welcome)"
   upload:
     edit_reason: "עותקים מקומיים של תמונות שהורדו"
     unauthorized: "הקובץ שמועמד להעלאה אינו מורשה (סיומות מורשות: %{authorized_extensions}), עמך הסליחה."
@@ -4063,7 +4091,11 @@ he:
   tos_topic:
     title: "תנאי השימוש"
     body: |
-      תנאים אלו משמשים לאכיפת את אופן השימוש בפורום המקוון שבכתובת <%{base_url}>. כדי להשתמש בפורום, עליך להסכים לתנאים האלה מול %{company_name}, החברה שמפעילה את הפורום.
+      <h2 id="heading--change-me"><a href="#heading--change-me">נא לערוך אותי</a></h2>
+
+      מנהלי הפורום, להלן דוגמה להתחלת תבנית למדיניות פרטיות שיש להתאים כדי לעמוד בדרישות האתר שלך.
+
+      תנאים אלו אינם משמשים, אך עלולים ביום מן הימים, לאכוף את אופן השימוש בפורום המקוון שבכתובת <%{base_url}>. כדי להשתמש בפורום, עליך להסכים לתנאים האלה מול %{company_name}, החברה שמפעילה את הפורום.
 
       חוזה זה מנוסח בחלקו בלשון זכר אך פונה לשני המגדרים באופן שווה, עמכן הסליחה.
 
@@ -4224,12 +4256,14 @@ he:
 
       <h2 id="heading--changes"><a href="#heading--changes">שינויים</a></h2>
 
-      החברה עדכנה את התנאים האלה לאחרונה ב־12 ביולי, 2018 והיא רשאית לעדכן אותם שוב. החברה תפרסם את כל העדכונים בפורום. לעדכונים שעשויים להכיל שינויים משמעותיים, החברה מסכימה לשלוח אליך הודעת דוא״ל בהנחה שיצרת חשבון וסיפקת כתובת דוא״ל תקפה. החברה עשויה גם להכריז על עדכונים עם הודעות מיוחדות או התראות על הנעשה בפורום.
+      החברה עדכנה את התנאים האלה לאחרונה ב־[כאן למלא את מועד העדכון האחרון] והיא רשאית לעדכן אותם שוב. החברה תפרסם את כל העדכונים בפורום. לעדכונים שעשויים להכיל שינויים משמעותיים, החברה מסכימה לשלוח אליך הודעת דוא״ל בהנחה שיצרת חשבון וסיפקת כתובת דוא״ל תקפה. החברה עשויה גם להכריז על עדכונים עם הודעות מיוחדות או התראות על הנעשה בפורום.
 
       לאחר שקיבלת הודעת עדכון לתנאים האלו, עליך להסכים לתנאים החדשים כדי להמשיך להשתמש בפורום.
   privacy_topic:
     title: "מדיניות פרטיות"
     body: |
+      ## [מנהלי אתר, להלן דוגמה לתבנית של מדיניות פרטיות שאפשר להתאים לצורכי האתר שלך.]
+
       <a name="collect"></a>
 
       ## [איזה מידע אנחנו אוספים?](#collect)
@@ -4238,7 +4272,7 @@ he:
 
       במהלך הרשמה לאתר שלנו, יתכן שיהיה עליך למלא את שמך ואת כתובת הדוא״ל שלך. עם זאת, ניתן לבקר באתר שלנו מבלי להירשם. כתובת הדוא״ל שלך תאומת באמצעות הודעה שמכילה קישור ייחודי. אם היה ביקור בקישור הזה, אנו יכולים להיות בטוחים שכתובת הדוא״ל הזו בשליטתך.
 
-      בעת הרשמה ופרסום, אנו שומרים את כתובת ה־IP ממנה פורסם הפוסט. אנחנו יכולים גם לשמור יומני שרת שכוללים את כתובת ה־IP של כל פנייה לשרת שלנו.
+      לאחר הרשמה ופרסום, אנו שומרים את כתובת ה־IP ממנה פורסם הפוסט. אנחנו יכולים גם לשמור יומני שרת שכוללים את כתובת ה־IP של כל פנייה לשרת שלנו.
 
       <a name="use"></a>
 
@@ -4263,8 +4297,7 @@ he:
 
       נעשה את מיטב המאמצים:
 
-      * לשמור יומנים שמכילים כתובות IP של כל הבקשות לשרת זה לא יותר מ־90 יום.
-      * לשמור על כתובות IP שמקושרות עם משתמשים רשומים והפוסטים שלהם למשך לא יותר מ־5 שנים.
+      * לשמור יומנים שמכילים כתובות IP של כל הבקשות לשרת זה לא יותר מ־[מספר ימים] יום.
 
       <a name="cookies"></a>
 
@@ -4310,7 +4343,7 @@ he:
 
       אם נחליט לשנות את מדיניות הפרטיות שלנו, נפרסם שינויים אלו בדף זה.
 
-      מסמך זה כפוף ל־CC-BY-SA. והוא עודכן לאחרונה ב־20 בינואר 2021.
+      מסמך זה כפוף ל־CC-BY-SA. והוא עודכן לאחרונה ב־[כאן להכניס כאן את מועד העדכון האחרון].
   badges:
     mass_award:
       errors:
@@ -4609,6 +4642,7 @@ he:
       two: "עליך לכלול לפחות %{count} תגיות %{tag_group_name}. התגיות בקבוצה הזאת הן: %{tags}."
       many: "עליך לכלול לפחות %{count} תגיות %{tag_group_name}. התגיות בקבוצה הזאת הן: %{tags}."
       other: "עליך לכלול לפחות %{count} תגיות %{tag_group_name}. התגיות בקבוצה הזאת הן: %{tags}."
+    limited_to_one_tag_from_group: "אי אפשר להשתמש בתגיות %{tags} בו־זמנית. נא לכלול רק אחת מהן."
     invalid_target_tag: "לא יכול להיות מילה נרדפת של מילה נרדפת"
     synonyms_exist: "אסור לשימוש כל עוד קיימות מילים נרדפות"
   rss_by_tag: "נושאים מתוייגים %{tag}"
@@ -4627,10 +4661,10 @@ he:
       message: "<p>הודעת ההפעלה נשלחה מחדש בדוא״ל אל <b>%{email}</b>"
   safe_mode:
     title: "כנסו למצב בטוח"
-    description: "מצב בטוח מאפשר לכם לבחון את האתר שלכם מבלי לטעון תוספים או ערכות עיצוב."
+    description: "\"מצב בטוח\" מאפשר לך לבחון את האתר מבלי לעלות ערכות נושא או תוספים בצד לקוח. תוספים בצד שרת נשארים מופעלים."
     no_themes: "השבתת ערכות עיצוב ורכיבי ערכת עיצוב"
-    no_unofficial_plugins: "השבתת תוספים בלתי רשמיים"
-    no_plugins: "השבתת כל התוספים"
+    no_unofficial_plugins: "השבתת התאמות התוספים הבלתי רשמיים מצד הלקוח"
+    no_plugins: "השבתת כל התאמות התוספים מצד הלקוח"
     enter: "כנסו למצב בטוח"
     must_select: "עליך לבחור באפשרות אחת לפחות כדי להיכנס למצב בטוח."
   wizard:
@@ -4745,7 +4779,9 @@ he:
           <p>רצוי להתפרע והמון הצלחה <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>בבניית הקהילה החדשה שלך!</a></p>
   search_logs:
     graph_title: "מניין חיפושים"
-  joined: "הצטרפו"
+  onebox:
+    discourse:
+      user_joined_community: "מועד הצטרפות: %{date}"
   discourse_push_notifications:
     popup:
       mentioned: ' אוזכרת על ידי %{username} בנושא „%{topic}” - %{site_title}'
@@ -4810,10 +4846,10 @@ he:
         category: הגדרות קטגוריה
     actions:
       agree:
-        title: "הסכמה…"
+        title: "כן"
       agree_and_keep:
         title: "להשאיר את הפוסט"
-        description: "הבעת הסכמה עם הדגל והשארת הפוסט ללא שינוי."
+        description: "הבעת הסכמה עם הדגל אך השארת הפוסט ללא שינוי."
       agree_and_keep_hidden:
         title: "להשאיר את הפוסט מוסתר"
         description: "הבעת הסכמה עם הדגל והשארת הפוסט מוסתר."
@@ -4828,32 +4864,35 @@ he:
         description: "יש לשחזר את הפוסט כדי שכל המשתמשים יוכלו לצפות בו."
       agree_and_hide:
         title: "הסתרת פוסט"
-        description: "הסתרת הפוסט הזה ושליחת הודעה אוטומטית למשתמש שמפצירה בו לערוך אותו."
+        description: "הסכמה עם הסימון והסתרת הפוסט הזה + שליחת הודעה אוטומטית למשתמש שמפצירה בו לערוך אותו."
       delete_single:
         title: "מחיקה"
       delete:
         title: "מחיקה…"
       delete_and_ignore:
-        title: "למחוק את הפוסט ולהתעלם"
-        description: "למחוק את הפוסט, אם זה הפוסט הראשון, למחוק גם את הנושא"
+        title: "התעלמות מהדגל ומחיקת הפוסט"
+        description: "התעלמות מהסימון על ידי הסרתו מהתור ומחיקת הפוסט, אם זה הפוסט הראשון, למחוק גם את הנושא. "
       delete_and_ignore_replies:
-        title: "למחוק את הפוסט יחד עם התגובות ולהתעלם"
-        description: "למחוק את הפוסט ואת כל התגובות שלו, אם זה הפוסט הראשון אז למחוק גם את הנושא"
+        title: "התעלמות מהסימון, למחוק את הפוסט והתגובות"
+        description: "התעלמות מהסימון על ידי הסרתו מהתור, מחיקת הפוסט וכל התגובות שלו, אם זה הפוסט הראשון, למחוק גם את הנושא"
         confirm: "למחוק גם את התגובות לפוסט?"
       delete_and_agree:
-        title: "למחוק את הפוסט ולהסכים"
-        description: "למחוק את הפוסט, אם זה הפוסט הראשון, למחוק גם את הנושא"
+        title: "מחיקת פוסט"
+        description: "להסכים עם הסימון ולמחוק את הפוסט, אם זה הפוסט הראשון אז למחוק גם את הנושא."
       delete_and_agree_replies:
-        title: "למחוק את הפוסט + התגובות ולהסכים"
-        description: "למחוק את הפוסט ואת כל התגובות שלו, אם זה הפוסט הראשון אז למחוק גם את הנושא"
+        title: "מחיקת הפוסט והתגובות"
+        description: "להסכים עם הסימון ולמחוק את הפוסט ואת כל התגובות שלו, אם זה הפוסט הראשון אז למחוק גם את הנושא."
         confirm: "למחוק גם את התגובות לפוסט?"
       disagree_and_restore:
-        title: "לסרב ולשחזר פוסט"
+        title: "לא, לשחזר את הפוסט"
         description: "לשחזר את הפוסט כדי שכל המשתמשים יוכלו לצפות בו."
       disagree:
-        title: "אי קבלה"
+        title: "לא"
       ignore:
         title: "התעלמות"
+      ignore_and_do_nothing:
+        title: "לא לעשות דבר"
+        description: "התעלמות מהסימון על ידי הסרתו מהתור מבלי לנקוט בעמדה. פוסטים מוסתרים נשארים מוסתרים ויטופלו על ידי הכלים האוטומטיים."
       approve:
         title: "אשר"
       approve_post:
@@ -4921,6 +4960,11 @@ he:
     payload_url:
       blocked_or_internal: "לא ניתן להשתמש בכתובת המטען כי היא תואמת ל־IP חסום או פנימי"
       unsafe: "לא ניתן להשתמש בכתובת המטען כיוון שהיא לא מאובטחת"
+  form_templates:
+    errors:
+      invalid_yaml: "איזה מחרוזת YAML תקנית"
+      invalid_type: "מכיל סוג תבנית שגוי: %{type} (הסוגים התקפים הם: %{valid_types})"
+      missing_type: "סוג השדה חסר"
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.hr.yml b/config/locales/server.hr.yml
index e815e032fc3..355e56dd295 100644
--- a/config/locales/server.hr.yml
+++ b/config/locales/server.hr.yml
@@ -195,10 +195,6 @@ hr:
       load_from_remote: "Dogodila se greška pri učitavanju objave."
     site_settings:
       invalid_category_id: "Naveli ste kategoriju koja ne postoji"
-      invalid_choice:
-        one: "Naveli ste nevažeći izbor %{name}"
-        few: "Naveli ste nevažeći izbor %{name}"
-        other: "Naveli ste nevažeće izbore %{name}"
       default_categories_already_selected: "Ne možete odabrati kategoriju koja se koristi na drugom popisu."
       default_tags_already_selected: "Ne možete odabrati oznaku koja se koristi na drugom popisu."
       s3_upload_bucket_is_required: "Ne možete omogućiti prijenose na S3 osim ako niste naveli 's3_upload_bucket'."
@@ -453,7 +449,6 @@ hr:
   meta_category_description: "Rasprave o ovoj stranici, njezinoj organizaciji, kako radi i kako je se može poboljšati."
   staff_category_name: "Osoblje"
   staff_category_description: "Privatna kategorija za rasprave osoblja. Teme su vidljive samo administratorima i moderatorima."
-  admin_quick_start_title: "PROČITATI PRVO: brzi vodič za administratore"
   category:
     topic_prefix: "O %{category} kategoriji"
     errors:
@@ -1195,7 +1190,6 @@ hr:
     enable_discourse_connect: "Omogućite prijavu putem DiscourseConnect (ranije 'Discourse SSO') (UPOZORENJE: ADRESE E-POŠTE KORISNIKA *MORAJU* BITI POTVRĐENE NA VANJSKOJ MJESTO!)"
     verbose_discourse_connect_logging: "Zabilježite opširnu dijagnostiku vezanu uz DiscourseConnect na <a href='%{base_path}/logs' target='_blank'>/zapisuje</a>"
     enable_discourse_connect_provider: "Implementacija protokola pružatelja usluga DiscourseConnect (prije 'Discourse SSO') na krajnjoj točki /session/sso_provider, zahtijeva postavljanje discourse_connect_provider_secrets"
-    discourse_connect_url: "URL krajnje točke DiscourseConnect (mora sadržavati http:// ili https://)"
     discourse_connect_secret: "Tajni niz koji se koristi za kriptografsku provjeru autentičnosti informacija DiscourseConnecta, pazite da ima 10 znakova ili više"
     discourse_connect_provider_secrets: "Popis parova domena-tajna koji koriste DiscourseConnect. Provjerite ima li DiscourseConnect tajna 10 znakova ili više. Zamjenski simbol * može se koristiti za podudaranje bilo koje domene ili samo njenog dijela (npr. *.example.com)."
     discourse_connect_overrides_bio: "Nadjačava korisničku biografiju u korisničkom profilu i sprječava korisnika da je promijeni"
@@ -1209,7 +1203,6 @@ hr:
     discourse_connect_overrides_profile_background: "Nadjačava pozadinu korisničkog profila vrijednošću iz nosivosti DiscourseConnecta."
     discourse_connect_overrides_card_background: "Zamjenjuje pozadinu korisničke kartice s vrijednošću iz sadržaja DiscourseConnect."
     discourse_connect_not_approved_url: "Preusmjerite neodobrene DiscourseConnect račune na ovaj URL"
-    discourse_connect_allows_all_return_paths: "Nemojte ograničavati domenu za return_paths koje pruža DiscourseConnect (prema zadanim postavkama povratna staza mora biti na trenutnom mjestu)"
     enable_local_logins: "Omogućite račune temeljene na prijavi s lokalnim korisničkim imenom i lozinkom. UPOZORENJE: ako je onemogućeno, možda se nećete moći prijaviti ako prethodno niste konfigurirali barem jedan alternativni način prijave."
     enable_local_logins_via_email: "Omogućite korisnicima da zatraže vezu za prijavu jednim klikom da im se pošalje putem e-pošte."
     allow_new_registrations: "Dopusti registracije novih korisnika. Poništite ovu opciju kako biste spriječili bilo koga da stvori novi račun."
@@ -1263,7 +1256,6 @@ hr:
     composer_media_optimization_image_bytes_optimization_threshold: "Minimalna veličina slikovne datoteke za pokretanje optimizacije na strani klijenta"
     composer_media_optimization_image_resize_dimensions_threshold: "Minimalna širina slike za pokretanje promjene veličine na strani klijenta"
     composer_media_optimization_image_resize_width_target: "Slikama čija je širina veća od `composer_media_optimization_image_dimensions_resize_threshold` bit će promijenjena veličina na ovu širinu. Mora biti >= od `composer_media_optimization_image_dimensions_resize_threshold`."
-    composer_media_optimization_image_encode_quality: "Kvaliteta JPEG kodiranja koja se koristi u procesu ponovnog kodiranja."
     min_ratio_to_crop: "Omjer koji se koristi za obrezivanje visokih slika. Unesite rezultat širine / visine."
     simultaneous_uploads: "Maksimalni broj datoteka koje se mogu povući i ispustiti u skladatelj"
     default_invitee_trust_level: "Zadana razina povjerenja (0-4) za pozvane korisnike."
@@ -1335,7 +1327,6 @@ hr:
     pop3_polling_password: "Lozinka za POP3 račun za anketu za e-poštu."
     pop3_polling_delete_from_server: "Izbrišite e-poštu s poslužitelja. NAPOMENA: Ako ovo onemogućite, trebali biste ručno očistiti svoj poštanski sandučić"
     log_mail_processing_failures: "Zabilježite sve pogreške obrade e-pošte na <a href='%{base_path}/logs' target='_blank'>/zapisi</a>"
-    email_in: 'Omogućite korisnicima objavljivanje novih tema putem e-pošte (zahtijeva ručno ili pop3 prozivanje). Konfigurirajte adrese u kartici "Postavke" svake kategorije.'
     email_in_min_trust: "Minimalna razina povjerenja koju korisnik mora imati da bi mu se omogućilo objavljivanje novih tema putem e-pošte."
     email_in_authserv_id: "Identifikator usluge koja vrši provjeru autentičnosti dolazne e-pošte. Pogledajte <a href='https://meta.discourse.org/t/134358'>https://meta.discourse.org/t/134358</a> za upute o tome kako to konfigurirati."
     email_in_spam_header: "Zaglavlje e-pošte za otkrivanje neželjene pošte."
@@ -1394,17 +1385,11 @@ hr:
     allowed_href_schemes: "Sheme dopuštene u vezama uz http i https."
     embed_post_limit: "Maksimalan broj postova za ugradnju."
     embed_username_required: "Potrebno je korisničko ime za kreiranje teme."
-    notify_about_flags_after: "Ako postoje zastavice koje nisu obrađene nakon toliko sati, pošaljite osobnu poruku moderatorima. Postavite na 0 za onemogućavanje."
-    show_create_topics_notice: "Ako stranica ima manje od 5 javnih tema, pokažite obavijest u kojoj se od administratora traži da kreiraju neke teme."
     delete_drafts_older_than_n_days: "Izbriši skice starije od (n) dana."
     delete_merged_stub_topics_after_days: "Broj dana čekanja prije automatskog brisanja potpuno spojenih tema. Postavite na 0 da nikada ne brišete nezavršene teme."
-    bootstrap_mode_min_users: "Minimalan broj korisnika potreban za onemogućavanje načina pokretanja (postavite na 0 za onemogućavanje)"
     prevent_anons_from_downloading_files: "Spriječite anonimne korisnike u preuzimanju privitaka."
-    secure_media: "ZASTARJELO: Umjesto toga koristite postavku secure_uploads, bit će uklonjena u Discourse 3.0."
     secure_uploads: 'Ograničava pristup SVIM prijenosima (slike, video, audio, tekst, pdf-ovi, zipovi i ostalo). Ako je "potrebna prijava" omogućena, samo prijavljeni korisnici mogu pristupiti učitavanjima. U suprotnom, pristup će biti ograničen samo na učitavanje medija u privatnim porukama i privatnim kategorijama. UPOZORENJE: Ova je postavka složena i zahtijeva duboko administrativno razumijevanje. Pogledajte <a target="_blank" href="https://meta.discourse.org/t/-/140017">sigurnu učitava temu na Meta</a> za detalje.'
-    secure_media_allow_embed_images_in_emails: "ZASTARJELO: Koristite secure_uploads_allow_embed_images_in_emails, uklonit će se u Discourse 3.0."
     secure_uploads_allow_embed_images_in_emails: "Omogućuje ugrađivanje sigurnih slika koje bi se inače redigirale u e-porukama, ako je njihova veličina manja od postavke 'maksimalna veličina slike za ugrađivanje e-pošte u sigurne prijenose kb'."
-    secure_media_max_email_embed_image_size_kb: "ZASTARJELO: Koristite secure_uploads_max_email_embed_image_size_kb, bit će uklonjeno u Discourse 3.0."
     secure_uploads_max_email_embed_image_size_kb: "Ograničenje veličine za sigurne slike koje će biti ugrađene u e-poštu ako je omogućena postavka \"sigurni prijenosi dopuštaju ugradnju u e-poštu\". Bez uključene te postavke, ova postavka nema učinka."
     slug_generation_method: "Odaberite metodu stvaranja puževa. 'encoded' će generirati niz postotnog kodiranja. 'none' će uopće onemogućiti puž."
     enable_emoji: "Omogući emoji"
@@ -1453,7 +1438,6 @@ hr:
     enable_sitemap: "Generirajte kartu web stranice za svoju web stranicu i uključite je u datoteku robots.txt."
     sitemap_page_size: "Broj URL-ova koje treba uključiti u svaku stranicu karte web-lokacije. Najviše 50.000"
     enable_user_status: "(eksperimentalno) Omogućuje korisnicima postavljanje prilagođene statusne poruke (emoji + opis)."
-    enable_user_tips: "(eksperimentalno) Omogućite nove korisničke savjete koji korisnicima opisuju ključne značajke"
     short_title: "Kratki naslov koristit će se na korisničkom početnom zaslonu, pokretaču ili drugim mjestima gdje je prostor ograničen. Trebao bi biti ograničen na 12 znakova."
     dashboard_hidden_reports: "Omogućuje skrivanje navedenih izvješća s nadzorne ploče."
     dashboard_visible_tabs: "Odaberite koje su kartice nadzorne ploče vidljive."
@@ -1470,10 +1454,6 @@ hr:
     suggest_weekends_in_date_pickers: "Uključite vikende (subota i nedjelja) u prijedloge za odabir datuma (onemogućite ovo ako Discourse koristite samo radnim danima, od ponedjeljka do petka)."
     splash_screen: "Prikazuje privremeni zaslon za učitavanje dok se sredstva web-mjesta učitavaju"
     navigation_menu: "Odredite koji navigacijski izbornik koristiti. Bočnu traku i navigaciju u zaglavlju korisnici mogu prilagoditi. Naslijeđena opcija dostupna je za kompatibilnost s prethodnim verzijama."
-    default_sidebar_categories: "Odabrane kategorije će prema zadanim postavkama biti prikazane u odjeljku Kategorije na bočnoj traci."
-    default_sidebar_tags: "Odabrane oznake će prema zadanim postavkama biti prikazane u odjeljku Oznake bočne trake."
-    enable_new_user_profile_nav_groups: "EKSPERIMENTALNO: Korisnicima odabranih grupa bit će prikazan novi navigacijski izbornik korisničkog profila"
-    enable_experimental_topic_timeline_groups: "EKSPERIMENTALNO: Korisnicima odabranih grupa prikazat će se refaktorirana vremenska traka teme"
     enable_experimental_hashtag_autocomplete: "EKSPERIMENTALNO: Upotrijebite novi #hashtag sustav automatskog dovršavanja za kategorije i oznake koji drugačije prikazuje odabranu stavku i ima poboljšano pretraživanje"
     errors:
       invalid_css_color: "Nevažeća boja. Unesite naziv boje ili hex vrijednost."
@@ -1633,7 +1613,6 @@ hr:
     email:
       sent_test: "poslano!"
   user:
-    content_matches_auto_block_regex: "Sadržaj odgovara regularnom izrazu automatskog blokiranja"
     username:
       short: "mora imati najmanje %{min} znakova"
       long: "ne smije imati više od %{max} znakova"
@@ -1778,12 +1757,7 @@ hr:
       subject_template: "Dobrodošli na %{site_name}"
     welcome_invite:
       subject_template: "Dobrodošli na %{site_name}"
-    dashboard_problems:
-      title: "Problemi nadzorne ploče"
-      subject_template: "Novi savjeti na vašoj nadzornoj ploči"
   user_notifications:
-    unsubscribe:
-      title: "Odjava"
     user_quoted:
       title: "Korisnik je citirao"
     digest:
@@ -1803,15 +1777,6 @@ hr:
     see_more: "Više"
     search_title: "Pretraži ovu stranicu"
     search_button: "Pretraži"
-  login_required:
-    welcome_message: |
-      ## [Dobrodošli na %{title}](#welcome)
-      Nužno je prijaviti se korisničkim računom. Molimo učlanite se ili prijavite za nastavak.
-    welcome_message_invite_only: |
-      ## [Dobrodošli na %{title}] (#welcome)
-      Nužno je prijaviti se korisničkim računom. Molimo upitajte postojećeg korisnika za pozivnicu ili se prijavite za nastavak.
-  deleted: "izbrisao"
-  image: "slika"
   upload:
     unauthorized: "Nažalost, datoteka koju pokušavate prenijeti nije autorizirana (autorizirana proširenja: %{authorized_extensions})."
     size_zero_failure: "Žao nam je, izgleda da je nešto pošlo po zlu, datoteka koju pokušavate prenijeti je 0 bajtova. Molim te pokušaj ponovno."
@@ -1921,7 +1886,6 @@ hr:
         fields:
           contact_url:
             placeholder: "https://www.example.com/contact-us"
-  joined: "Prijavljen"
   discourse_push_notifications:
     popup:
       mentioned: '%{username} vas je spomenuo u "%{topic}" - %{site_title}'
@@ -1948,16 +1912,16 @@ hr:
       medium: "Srednji"
       high: "Visok"
     actions:
-      agree_and_suspend:
-        title: "Suspendiraj korisnika"
-      agree_and_silence:
-        title: "Ušuti korisnika"
+      agree:
+        title: "Da"
       delete_single:
         title: "Pobriši"
       disagree:
-        title: "Odbaci"
+        title: "Ne"
       ignore:
         title: "Zanemari"
+      ignore_and_do_nothing:
+        title: "Ne radi ništa"
       approve:
         title: "Odobri"
       reject_user:
diff --git a/config/locales/server.hu.yml b/config/locales/server.hu.yml
index dcecc368188..a97d3ed17f8 100644
--- a/config/locales/server.hu.yml
+++ b/config/locales/server.hu.yml
@@ -171,7 +171,6 @@ hu:
       default_tags_already_selected: "Más listában használt címke nem választható ki."
       s3_upload_bucket_is_required: "Nem lehet engedélyezni a feltöltést az S3-ba, amíg nincs megadva az „s3_upload_bucket”."
       enable_s3_uploads_is_required: "Az S3 leltár használatát csak akkor engedélyezheti, ha engedélyezte az S3 feltöltéseket."
-      secure_uploads_requirements: "A biztonságos feltöltés engedélyezése előtt engedélyezni kell az S3 feltöltést."
       share_quote_facebook_requirements: "Be kell állítania egy Facebook-alkalmazás azonosítót, hogy engedélyezhesse a megosztást Facebookon."
       second_factor_cannot_enforce_with_socials: "A közösségi bejelentkezések engedélyezése mellett nem lehet 2FA-t érvényesíteni. Először le kell tiltania ezt a bejelentkezést: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "A 2FA nem kényszeríthető, ha a helyi bejelentkezés le van tiltva."
@@ -191,6 +190,7 @@ hu:
     not_found_json: "A meghívási token érvénytelen. Lépjen kapcsolatba a stábbal."
     not_found_template_link: |
       <p>Ez a(z) <a href="%{base_url}">%{site_name}</a> meghívó már nem váltható be. Kérje meg az Ön meghívó személyt, hogy küldjön egy új meghívót.</p>
+    generic_error_response: "Probléma lépett fel a kéréssel kapcsolatban."
     confirm_email: "<p>Mindjárt készen is vagyunk! Elküldtünk egy megerősítő e-mailt a <b>%{email}</b> címre. Kérlek, kövesd a benne található instrukciókat, és aktiváld a fiókodat.</p><p>Ha pár percen belül nem érkezne meg, ne felejtsd el a <b>SPAM</b> és a <b>Promóciók</b> mappában is ellenőrizni!</p>"
     disabled_errors:
       invalid_access: "Nincs engedélye a kért erőforrás megtekintéséhez."
@@ -290,6 +290,7 @@ hu:
   too_late_to_edit: "Ez a bejegyzés túl régen lett létrehozva. Már nem lehet szerkeszteni vagy törölni."
   edit_conflict: "Ezt a bejegyzést egy másik felhasználó szerkesztette, és a változtatásokat már nem lehet menteni."
   revert_version_same: "A jelenlegi verzió megegyezik azzal a verzióval amire vissza szeretne térni."
+  reverted_to_version: "visszaállítva #%{version} verzióra."
   excerpt_image: "kép"
   bookmarks:
     errors:
@@ -344,6 +345,7 @@ hu:
 
       Mindenki számára könnyebb elolvasni azokat a témákat, amelyekben kevesebb mélyreható válasz van, mint a sok apró, egyedi válasz.
     dominating_topic: Sokat írt ebben a témában! Fontolja meg, hogy lehetőséget ad másoknak arra, hogy itt válaszoljanak, és megbeszéljék egymással a dolgokat.
+    dont_feed_the_trolls: Ezt a bejegyzést már megjelölték moderátor figyelmébe. Biztos, hogy válaszolni akarsz rá? A negatív tartalomra adott válaszok inkább negatív viselkedésre ösztönöznek.
     too_many_replies: |
       ### Elérted a válaszkorlátot ebben a témában
 
@@ -410,21 +412,6 @@ hu:
   meta_category_description: "Beszélgetés erről az oldalról, a szervezéséről, a működéséről és arról, hogyan tudnánk jobbá tenni."
   staff_category_name: "Stáb"
   staff_category_description: "Privát kategória a stáb számára. Ezeket a témákat csak az adminisztrátorok és moderátorok látják."
-  discourse_welcome_topic:
-    body: |2
-
-      A rögzített téma első bekezdése üdvözlő üzenetként fog megjelenni a kezdőlap összes új látogatója előtt. Ez fontos!
-
-      ** Szerkeszd át ezt ** a közösség rövid leírására:
-
-      - Kinek szól?
-      - Mit találhatnak itt?
-      - Miért kellene idejönniük?
-      - Hol tudnak többet olvasni (linkek, források stb.)?
-
-      <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
-
-      Érdemes bezárnod ezt a témát az admin :wrench: en keresztül (a jobb felső és az alsó részen), hogy a válaszok ne halmozódjanak fel egy bejelentésre.
   category:
     topic_prefix: "A(z) %{category} kategóriáról"
     replace_paragraph: "(Cseréld le ezt az első bekezdést az új kategória rövid leírására. Ez az útmutató a kategória kiválasztási területén jelenik meg, ezért próbálj 200 karakter alatt maradni.)"
@@ -437,6 +424,7 @@ hu:
       email_already_used_in_category: "A(z) „%{email}” címet már használja a(z) „%{category_name}” kategória."
       slug_contains_non_ascii_chars: "nem ASCII karaktereket tartalmaz"
       is_already_in_use: "már használatban van"
+      move_topic_to_category_disallowed: "Nem helyezheti át ezt a témát olyan kategóriába, ahol nincs engedélye új témák létrehozására."
     cannot_delete:
       has_subcategories: "A kategóriát nem lehet törölni, mert vannak alkategóriái."
       topic_exists_no_oldest: "A kategóriát nem lehet törölni, mert a benne lévő témák száma %{count}."
@@ -952,6 +940,7 @@ hu:
     rails_env_warning: "A kiszolgáló jelenleg %{env} módban fut."
     host_names_warning: "A config/database.yml fájl az alapértelmezett „localhost” domaint használja. Állítsa be az oldala saját domain nevét."
     memory_warning: "A kiszolgáló kevesebb mint 1 GB memóriával rendelkezik. Legalább 1 GB memória ajánlott."
+    v3_analytics_deprecated: "A Discourse jelenleg a Google Analytics 3-at használja, amely 2023 júliusa után már nem kap támogatást. <a href='https://meta.discourse.org/t/260498'>Frissítsen most a Google Analytics 4-re</a> , hogy továbbra is értékes betekintést és elemzést kapjon webhelye teljesítményéről."
   site_settings:
     disabled: "kikapcsolva"
     max_emojis_in_title: "A témacímekben lévő emodzsik legnagyobb száma"
@@ -968,6 +957,7 @@ hu:
     post_excerpt_maxlength: "A bejegyzés kivonatának / összefoglalójának maximális hossza."
     topic_excerpt_maxlength: "A témakör kivonatának / összefoglalójának maximális hossza a téma első bejegyzéséből generálva."
     blocked_onebox_domains: "Azok a domainek, amelyek soha nem kerülnek dobozba, például wikipedia.org\n(A * ? helyettesítő karakterek nem támogatottak)"
+    apple_touch_icon: "Az Apple érintőképernyős készülékekhez használt ikon. Az átlátszó háttér nem ajánlott. Automatikusan átméreteződik 180x180-ra. Ha üresen hagyja, a large_icon lesz használva."
     enforce_second_factor: "Kényszeríti a felhasználókat, hogy engedélyezzék a kétfaktoros hitelesítést. Válassza az 'all' lehetőséget, hogy érvényesítse az összes felhasználó számára. Válassza a „személyzet” lehetőséget, hogy csak a személyzet felhasználói számára érvényesítse."
     review_every_post: "Minden bejegyzést jóvá kell hagyni. FIGYELEM! FORGALMAS OLDALAKON NEM AJÁNLOTT."
     use_admin_ip_allowlist: "Az adminokk csak akkor tudnak bejelentkezni, ha a Screened IPs listában megadott IP-címmel vannak megadva (Admin > Naplók > Screened Ips)."
@@ -982,6 +972,7 @@ hu:
     hide_email_address_taken: "Ne tájékoztassa a felhasználókat arról, hogy létezik fiók egy adott e-mail címmel a regisztráció során vagy az elfelejtett jelszó folyamata során. Teljes e-mail cím megkövetelése az „elfelejtett jelszó” kérésekhez."
     min_password_length: "Minimum jelszóhossz."
     block_common_passwords: "A 10 000 leggyakoribb jelszó tiltása."
+    discourse_connect_url: "A DiscourseConnect végpont URL-je (tartalmaznia kell a http:// vagy https:// karaktereket, és nem tartalmazhat a végén perjelet)"
     discord_secret: "Discord titkos kulcs"
     maximum_backups: "A maximálisan megtartandó biztonsági másolatok száma. A régebbi biztonsági mentések automatikusan törlődnek"
     rate_limit_new_user_create_topic: "Egy téma létrehozása után az új felhasználóknak (n) másodpercet kell várniuk, mielőtt új témát hozhatnak létre."
@@ -1001,15 +992,23 @@ hu:
     log_anonymizer_details: "Anonimizálás után meg kell-e őrizni a felhasználó adatait a naplóban."
     reply_by_email_enabled: "E-mail válaszok engedélyezése."
     block_auto_generated_emails: "Az automatikusan generáltként azonosított bejövő e-mailek letiltása."
+    sendgrid_verification_key: "Sendgrid ellenőrző kulcs, amelyet a webhook üzenetek ellenőrzésére használnak."
+    mailjet_webhook_token: "A webhook hasznos terhelésének ellenőrzésére használt token. Ezt a webhook 't' lekérdezési paramétereként kell átadni, például: https://example.com/webhook/mailjet?t=supersecret"
+    mandrill_authentication_key: "Mandrill hitelesítési kulcs a webhook üzenetek ellenőrzésére."
+    postmark_webhook_token: "A webhook hasznos terhelésének ellenőrzésére használt token. Ezt a webhook „t” lekérdezési paramétereként kell átadni, például: https://example.com/webhook/postmark?t=supersecret"
+    sparkpost_webhook_token: "A webhook hasznos terhelésének ellenőrzésére használt token. Ezt a webhook 't' lekérdezési paramétereként kell átadni, például: https://example.com/webhook/sparkpost?t=supersecret"
     email_editable: "Engedélyezi a felhasználóknak, hogy a regisztráció után megváltoztassák az e-mail címüket."
     suppress_digest_email_after_days: "Letiltja az összefoglaló e-maileket azon felhasználók számára, akik nem láttak a webhelyen (n) napnál hosszabb ideig."
     digest_suppress_categories: "Letiltom ezeket a kategóriákat az összefoglaló e-mailekből."
+    dont_feed_the_trolls_threshold: "A többi felhasználótól kapott jelzések száma a figyelmeztetés előtt."
     embed_truncate: "Beágyazott bejegyzések rövidítése."
     embed_post_limit: "A bejegyzések maximális száma a beágyazásban."
     delete_drafts_older_than_n_days: "Törölje az (n) napnál régebbi piszkozatokat."
+    bootstrap_mode_min_users: "A bootstrap üzemmód kikapcsolásához szükséges felhasználók minimális száma (a kikapcsoláshoz 0-ra kell állítani, ez akár 24 órát is igénybe vehet)."
     enable_emoji: "Emodzsi engedélyezése"
     enable_emoji_shortcuts: "A gyakori mosolyt jelző szövegek, mint a :) :p és :( emodzsikká lesznek alakítva"
     emoji_set: "Hogy szeretné az emodzsiját?"
+    emoji_deny_list: "Ezek a hangulatjelek nem használhatók menükben vagy rövid kódokban."
     auto_close_topics_create_linked_topic: "Új összekapcsolt téma létrehozása, ha a téma a „témák automatikus lezárása bejegyzésszám alapján” beállítás miatt automatikusan lezárásra kerül."
     default_email_digest_frequency: "Alapértelmezés szerint a felhasználók milyen gyakran kapnak összefoglaló e-maileket."
     default_other_skip_new_user_tips: "A tippek és jelvények kihagyása az új felhasználók regisztrációjakor"
@@ -1017,8 +1016,9 @@ hu:
     company_name: "Cégnév"
     use_email_for_username_and_name_suggestions: "Használja az e-mail címek első részét a felhasználónév- és névjavaslatokhoz. Vegye figyelembe, hogy ez megkönnyíti a nyilvánosság számára a teljes felhasználói e-mail címek kitalálását (mivel az emberek nagy része olyan gyakori szolgáltatásokat használ, mint a „gmail.com”)."
     navigation_menu: "Határozza meg, melyik navigációs menüt használja. Az oldalsáv és a fejléc navigációja a felhasználók által testreszabható. A visszamenőleges kompatibilitás érdekében a régebbi opció is elérhető."
-    enable_experimental_topic_timeline_groups: "KÍSÉRLETI: A kiválasztott csoportok felhasználóinak megjelenik az átdolgozott téma idővonala"
     enable_experimental_hashtag_autocomplete: "KÍSÉRLETI: Használja az új #hashtag automatikus kiegészítési rendszert a kategóriákhoz és címkékhez, amelyek másképp jelenítik meg a kiválasztott elemet, és javítják a keresést"
+    experimental_new_new_view_groups: 'Kísérleti: Engedélyezzen egy új témalistát, amely egyesíti az olvasatlan és az új témákat, és az oldalsávban lévő "Minden" linket kapcsolja rá.'
+    enable_custom_sidebar_sections: "Kísérleti: Egyéni oldalsáv szekciók engedélyezése"
     errors:
       invalid_email: "Érvénytelen e-mail cím."
       invalid_username: "Nincs ilyen nevű felhasználó."
@@ -1039,6 +1039,8 @@ hu:
       search_tokenize_chinese_enabled: "A beállítás engedélyezése előtt le kell tiltania a „search_tokenize_chinese” beállítást."
       search_tokenize_japanese_enabled: "A beállítás engedélyezése előtt le kell tiltania a „search_tokenize_japanese” beállítást."
       discourse_connect_cannot_be_enabled_if_second_factor_enforced: "A DiscourseConnect nem engedélyezhető, ha a 2FA kényszerítve van."
+      invalid_uncategorized_category_setting: 'A "Nem kategorizált" kategória nem választható ki, ha a "nem kategorizált témák engedélyezése" nincs engedélyezve.'
+      invalid_search_ranking_weights: "Az érték érvénytelen a search_ranking_weights webhely beállításánál. Példa: „{0.1,0.2,0.3,1.0}”. Vegye figyelembe, hogy az egyes súlyok maximális értéke 1,0."
   search:
     within_post: "#%{post_number}, szerző: %{username}"
     types:
@@ -1410,15 +1412,6 @@ hu:
         Nyugodtan folytathatod a böngészést, de nem leszel képest válaszokat vagy témákat létrehozni, amíg egy [adminisztrátor](%{base_url}/about) nem ellenőrzi a legutóbbi hozzászólásaidat. Elnézésedet kérjük a kellemetlenségért.
 
         További útmutatásért olvasd el a [fórumunk szabályzatát](%{base_url}/guidelines)!
-    user_automatically_silenced:
-      text_body_template: |
-        Ez egy automatikus üzenet.
-
-        Az új felhasználó [%{username}](%{user_url}) automatikusan el lett némítva, mert több felhasználó megjelölte %{username} bejegyzését.
-
-        Kérjük, [nézd át a jelöléseket](%{base_url}/admin/flags). Ha %{username}-t helytelenül hallgatták el, kattints a Némítás feloldása gombra a [felhasználó adminisztrációs oldalán](%{user_url}).
-
-        Ez a küszöb az „új felhasználók némítása” beállításon keresztül változtatható meg.
     spam_post_blocked:
       text_body_template: |
         Ez egy automatikus üzenet.
@@ -1440,14 +1433,6 @@ hu:
     download_remote_images_disabled:
       subject_template: "A távoli képek letöltése le lett tiltva"
       text_body_template: "A `download_remote_images_to_local` beállítás le lett tiltva, mert az erre szánt `download_remote_image_threshold` tárhelykorlát elérésre került."
-    dashboard_problems:
-      subject_template: "Új tanácsok a webhely irányítópultján"
-      text_body_template: |
-        Van néhány új tanácsunk és javaslatunk a jelenlegi webhelybeállításaid alapján.
-
-        [Látogasd meg a webhely irányítópultját] (%{base_url}/ admin) ezek megtekintéséhez.
-
-        Ha semmi nem látható az irányítópulton, lehet, hogy egy másik munkatársunk már eljárt aktivizálta magát. A személyzeti műveletek listája megtalálható a [Staff Action Logs] (%{base_url}/ admin / logs / staff_action_logs) könyvtárban.
     new_user_of_the_month:
       text_body_template: |
         Elnyerted ** A hónap új felhasználója %{month_year}** díjat. :trophy:
@@ -1477,9 +1462,6 @@ hu:
   user_notifications:
     previous_discussion: "Régebbi válaszok"
     in_reply_to: "Válasz"
-    unsubscribe:
-      title: "Leiratkozás"
-      description: "Nem szeretné ezeket az e-maileket megkapni? Nem probléma! Kattintson ide és iratkozzon le azonnal:"
     reply_by_email: "[Látogasson el a témához](%{base_url}%{url}), vagy válaszoljon erre az e-mailre."
     only_reply_by_email: "Válaszolj erre az e-mailre a válaszadáshoz!"
     only_reply_by_email_pm: "Válaszolj erre az e-mailre, hogy válaszolj neki: %{participants}."
@@ -1706,7 +1688,6 @@ hu:
       liked_received: "Kapott kedvelés"
       new_users: "Új felhasználó"
       popular_topics: "Népszerű témák"
-      follow_topic: "Téma követése"
       join_the_discussion: "Tovább"
       popular_posts: "Népszerű bejegyzések"
       subject_template: "[%{email_prefix}] Összefoglaló"
@@ -1855,8 +1836,6 @@ hu:
     search_button: "Keresés"
   offline:
     title: "Nem lehet betölteni az alkalmazást"
-  deleted: "törölt"
-  image: "kép"
   upload:
     unauthorized: "Sajnos a feltölteni kívánt fájl nem engedélyezett (engedélyezett kiterjesztések: %{authorized_extensions})."
     size_zero_failure: "Sajnáljuk, úgy tűnik, hogy valami hiba történt, a feltöltendő fájl 0 bájtos. Próbálja újra."
@@ -2151,6 +2130,10 @@ hu:
       message: "<p>Aktiváló levelet küldtünk az <b>%{email}</b>címre, pár percen belül a postaládádban kell lennie. A fiók aktiválásához kövesd az e-mailben található utasításokat.</p><p>Ha nem érkezik meg, ellenőrizd a spam (és Gmail esetén a Promóciók) mappát is, és <a href='https://meta.discourse.org/t/troubleshooting-email-on-a-new-discourse-install/16326'>ellenőrizd, hogy jó e-mail címet adtál-e meg!</a>.</p>"
     resend_email:
       title: "Aktiváló e-mail újraküldése"
+  safe_mode:
+    description: "A biztonságos mód lehetővé teszi, hogy tesztelje webhelyét témák vagy kliensoldali plugin-beállítások betöltése nélkül. A szerveroldali plugin testreszabások továbbra is engedélyezve maradnak."
+    no_unofficial_plugins: "Nem hivatalos ügyféloldali plugin testreszabások letiltása"
+    no_plugins: "Az összes ügyféloldali plugin testreszabás letiltása"
   wizard:
     step:
       introduction:
@@ -2203,7 +2186,9 @@ hu:
         title: "Stáb meghívása"
       finished:
         title: "A Discourse készen áll!"
-  joined: "Csatlakozott"
+  onebox:
+    discourse:
+      user_joined_community: "Csatlakozott %{date}"
   discourse_push_notifications:
     popup:
       mentioned: '%{username} megemlített téged "%{topic}" - %{site_title} témakörben'
@@ -2234,42 +2219,30 @@ hu:
       medium: "Közepes"
       high: "Magas"
     actions:
-      agree_and_keep:
-        title: "Bejegyzés megtartása"
+      agree:
+        title: "Igen"
       agree_and_suspend:
-        title: "Felhasználó felfüggesztése"
         description: "Egyetértés a megjelöléssel, és a felhasználó felfüggesztése"
       agree_and_silence:
-        title: "Felhasználó némítása"
         description: "Egyetértés a megjelöléssel, és a felhasználó némítása"
       agree_and_restore:
-        title: "Bejegyzés visszaállítása"
         description: "A bejegyzés visszaállítása, hogy minden felhasználó láthassa."
-      agree_and_hide:
-        title: "Bejegyzés elrejtése"
-        description: "Bejegyzés elrejtése, és automatikus üzenet küldése a létrehozójának, hogy módosítson rajta."
       delete_single:
         title: "Törlés"
       delete:
         title: "Törlés…"
-      delete_and_ignore:
-        title: "Bejegyzés törlése és letiltás"
-        description: "Bejegyzés törlése, és ha ez az első bejegyzés, akkor a téma törlése"
       delete_and_ignore_replies:
-        title: "Bejegyzés törlése a válaszokkal együtt, és letiltás"
-        description: "Bejegyzés törlése a válaszokkal együtt, és ha ez az első bejegyzés, akkor a téma törlése"
         confirm: "Biztos vagy benne, hogy törölni szeretnéd a hozzászólásra adott válaszokat is?"
-      delete_and_agree:
-        description: "Bejegyzés törlése, és ha ez az első bejegyzés, akkor a téma törlése"
       delete_and_agree_replies:
-        description: "Bejegyzés törlése a válaszokkal együtt, és ha ez az első bejegyzés, akkor a téma törlése"
         confirm: "Biztos vagy benne, hogy törölni szeretnéd a hozzászólásra adott válaszokat is?"
       disagree_and_restore:
         description: "A bejegyzés visszaállítása, hogy minden felhasználó láthassa."
       disagree:
-        title: "Elutasítás"
+        title: "Nem"
       ignore:
         title: "Letiltás"
+      ignore_and_do_nothing:
+        title: "Ne csinálj semmit"
       approve:
         title: "Jóváhagyás"
       approve_post:
@@ -2299,6 +2272,11 @@ hu:
     post_raw: "Beszélgetés folytatása innen: %{parent_url}.\n\nElőző beszélgetések:\n\n%{previous_topics}"
     small_action_post_raw: "Beszélgetés folytatása itt: %{new_title}."
   fallback_username: "felhasználó"
+  form_templates:
+    errors:
+      invalid_yaml: "nem érvényes YAML karakterlánc"
+      invalid_type: "érvénytelen sablontípust tartalmaz: %{type} (érvényes típusok: %{valid_types})"
+      missing_type: "hiányzik egy mezőtípus"
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.hy.yml b/config/locales/server.hy.yml
index 739eb4ca3ed..469917771ca 100644
--- a/config/locales/server.hy.yml
+++ b/config/locales/server.hy.yml
@@ -161,9 +161,6 @@ hy:
     embed:
       load_from_remote: "Այդ գրառումը բեռնելիս տեղի է ունեցել սխալ:"
     site_settings:
-      invalid_choice:
-        one: "Դուք սահմանել եք %{name}անվավեր ընտրություն: "
-        other: "Դուք սահմանել եք %{name} անվավեր ընտրություն:"
       default_categories_already_selected: "Դուք չեք կարող ընտրել մեկ այլ ցանկում օգտագործված կատեգորիա:"
       s3_upload_bucket_is_required: "Դուք չեք կարող միացնել S3 -ի վերբեռնումները, մինչև չտրամադրեք 's3_upload_bucket':"
       enable_s3_uploads_is_required: "Դուք չեք կարող միացնել S3-ի գույքագրումը, մինչև չմիացնեք S3-ի վերբեռնումները:"
@@ -401,10 +398,6 @@ hy:
           attributes:
             execute_at:
               in_the_past: "պետք է լինի ապագայում:"
-        translation_overrides:
-          attributes:
-            value:
-              invalid_interpolation_keys: 'Հետևյալ interpolation key(եր)-ը անվավեր են՝ "%{keys}"'
         watched_word:
           attributes:
             word:
@@ -416,9 +409,6 @@ hy:
   meta_category_description: "Քննարկում այս կայքի, դրա կազմակերպման մասին, թե ինչպես է այն աշխատում, և ինչպես կարող ենք այն բարելավել:"
   staff_category_name: "Անձնակազմ"
   staff_category_description: "Մասնավոր կատեգորիա անձնակազմի քննարկումների համար: Թեմաները տեսանելի են միայն ադմիններին և մոդերատորներին: "
-  discourse_welcome_topic:
-    body: "\nԱյս ամրակցված թեմայի առաջին պարբերությունը տեսանելի կլինի որպես ողջույնի հաղորդագրություն Ձեր գլխավոր էջի բոլոր նոր այցելուներին: Սա կարևոր է!\n\n**Խմբագրեք սա**՝ դարձնելով Ձեր համայնքի համառոտ նկարագրություն՝\n\n- Ո՞ւմ համար է սա:\n- Ի՞նչ կարող են նրանք գտնել այստեղ:\n- Ինչո՞ւ պետք է նրանք գան այստեղ:\n- Որտե՞ղ կարող ենք նրանք կարդալ ավելին (հղումներ, աղբյուրներ և այլն):\n\n<img src=\"%{base_path}/images/welcome/discourse-edit-post-animated.gif\" width=\"508\" height=\"106\">\n\nՀարավոր է՝ Դուք ցանկանաք փակել այս թեման ադմինի միջոցով :wrench: (վերին աջ կողմում և ներքևում), որպեսզի մի հայտարարության վրա պատասխաններ չհավաքվեն: \n"
-  admin_quick_start_title: "ԱՌԱՋԻՆ ՀԵՐԹԻՆ ԿԱՐԴԱՑԵՔ ՍԱ՝ Ադմինի Արագ Մեկնարկի Ուղեցույց"
   category:
     topic_prefix: "%{category} կատեգորիայի մասին"
     replace_paragraph: "(Փոխարինեք առաջին պարբերությունը Ձեր նոր կատեգորիայի համառոտ նկարագրությամբ: Այս ուղեցույցը կհայտնվի կատեգորիայի ընտրման տարածքում, հետևաբար՝ փորձեք պահել այն 200 սիմվոլից պակաս:)"
@@ -781,7 +771,7 @@ hy:
       title: "DAU/MAU"
       xaxis: "Օր"
       yaxis: "DAU/MAU"
-      description: "Վերջին օրում մուտքագրված անդամների թիվը բաժանած վերջին ամսում մուտքագրված անդամների թվին - վերադարձնում է %, որը մատնանշում է համայնքի 'կպչունությունը': Նպատակն է՝ >30%:"
+      description: "Վերջին օրում մուտքագրված անդամների թիվը բաժանած վերջին ամսում մուտքագրված անդամների թվին - վերադարձնում է %, որը մատնանշում է համայնքի 'կպչունությունը': Նպատակն է՝ >20%:"
     daily_engaged_users:
       title: "Օրեկան Ներառված Օգտատերեր"
       xaxis: "Օր"
@@ -1268,7 +1258,6 @@ hy:
     tl3_requires_likes_given: "Վերջին (վմ3 ժամանակահատվածում) օրերի ընթացքում տրված հավանումների նվազագույն քանակը՝ վստահության 3-րդ մակարդակի բարձրացմանը արժանանալու համար:"
     tl3_requires_likes_received: "Հավանումների նվազագույն քանակը, որ պետք է ստացված լինի վերջին (վմ3 ժամանակահատվածում) օրերի ընթացքում՝ վստահության 3-րդ մակարդակի արժանանալու համար:"
     tl3_links_no_follow: "Չջնջել rel=nofollow-ն՝ վստահության 3-րդ մակարդակ ունեցող օգտատերերի կողմից հրապարակված հղումներից:"
-    trusted_users_can_edit_others: "Թույլատրել բարձր վստահության մակարդակ ունեցող օգտատերերին խմբագրել այլ օգտատերերի կողմից հրապարակված նյութերը"
     min_trust_to_create_topic: "Նոր թեմա ստեղծելու համար պահանջվող նվազագույն վստահության մակարդակը:"
     allow_flagging_staff: "Միացված լինելու դեպքում օգտատերերը կարող են դրոշակավորել անձնակազմի կողմից կատարված գրառումները:"
     min_trust_to_edit_wiki_post: "wiki դարձրած գրառումների խմբագրման համար անհրաժեշտ նվազագույն վստահության մակարդակը:"
@@ -1293,7 +1282,6 @@ hy:
     title_min_entropy: "Թեմայի վերնագրի համար պահանջվող նվազագույն անկանխատեսելիությունը (եզակի սիմվոլներ, ոչ անգլերեն սիմվոլները ավելի են բարձրացնում այն):"
     body_min_entropy: "Գրառման տեքստի համար պահանջվող նվազագույն անկանխատեսելիությունը (եզակի սիմվոլներ, ոչ անգլերեն սիմվոլները ավելի են բարձրացնում այն):"
     allow_uppercase_posts: "Թույլատրել բոլորը մեծատառերով գրելը թեմայի վերնագրում կամ գրառման տեքստում:"
-    max_consecutive_replies: "Գրառումների քանակը, որ օգտատերը պետք է կատարի թեմայում անընդմեջ, մինչ նրան կարգելվի ավելացնել մեկ այլ պատասխան:"
     title_fancy_entities: "Փոխարկել սովորական ASCII սիմվոլները ճոխ HTML նիշերի թեմաների վերնագրերում, օրինակ՝ SmartyPants <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</a>"
     min_title_similar_length: "Վերնագրի նվազագույն երկարությունը, որից հետո կստուգվի նման թեմաների առկայությունը:"
     desktop_category_page_style: "Արտաքին ոճ /կատեգորիաներ էջի համար:"
@@ -1370,7 +1358,6 @@ hy:
     pop3_polling_password: "POP3 հաշվի գաղտնաբառ՝ էլ. փոստի հարցում կատարելու համար:"
     pop3_polling_delete_from_server: "Ջնջել էլ. նամակները սերվերից: ՆՇՈՒՄ՝ եթե Դուք անջատում եք սա, Դուք պետք է ձեռքով մաքրեք Ձեր էլ. փոստի մուտքերը:"
     log_mail_processing_failures: "Գրառել բոլոր էլ. հասցեների գործընթացների ձախողումները <a href='%{base_path}/logs' target='_blank'>/գրառումներ</a> -ում"
-    email_in: 'Թույլատրել օգտատերերին հրապարակել նոր թեմաներ էլ. հասցեի միջոցով (պահանջում է ձեռքով կամ pop3 polling): Կարգավորեք հասցեները յուրաքանչյուր կատեգորիայի "Կարգավորումներ" ներդիրում:'
     email_in_min_trust: "Նվազագույն վստահության մակարդակը, որ օգտատերը պետք է ունենա՝ էլ. հասցեի միջոցով նոր թեմաներ հրապարակելու թույլտվություն ունենալու համար:"
     email_in_spam_header: "Սպամի որոշման համար էլ. հասցեի վերնագիր"
     email_prefix: "Էլ. նամակների թեմայում օգտագործված [պիտակը] : Այն լռելյայն կլինի 'վերնագիր' , եթե սահմանված չէ:"
@@ -1429,7 +1416,6 @@ hy:
     share_anonymized_statistics: "Կիսվել անանուն օգտագործումների վիճակագրությամբ:"
     auto_handle_queued_age: "Ավտոմատ կերպով կարգավորել գրառումները, որոնք սպասում են վերանայման, այսքան օր: Դրոշակները կանտեսվեն: Հերթի մեջ դրված գրառումները և օգտատերերը կմերժվեն: Սահմանեք 0՝ այս հատկանիշը անջատելու համար:"
     svg_icon_subset: "Ավելացնել լրացուցիչ FontAwesome 5 պատկերակ, որ կցանկանայիք ավելացնել Ձեր ակտիվներում: Օգտագործեք 'fa-' նախածանցը անթափանց, 'far-' ՝ սովորական և 'fab-' ՝ բրենդային պատկերակների համար:"
-    max_prints_per_hour_per_user: "/տպել էջի ազդեցությունների առավելագույն քանակը (սահմանեք 0՝ անջատելու համար)"
     full_name_required: "Ամբողջական անունը պարտադիր դաշտ է օգտատիրոջ պրոֆիլում:"
     enable_names: "Ցուցադրել օգտատիրոջ ամբողջական անունը իր պրոֆիլում, քարտում և էլ. նամակներում: Անջատեք՝ ամբողջական անունը ամենուրեք թաքցնելու համար:"
     display_name_on_posts: "Ցուցադրել օգտատիրոջ ամբողջական անունը իր գրառումներում՝ ի հավելումն իր @օգտանվան:"
@@ -1444,10 +1430,7 @@ hy:
     allowed_href_schemes: "Հղումներում http-ից և https -ից բացի թույլատրվող սխեմաները:"
     embed_post_limit: "Զետեղման ենթակա գրառումների առավելագույն քանակը"
     embed_username_required: "Թեմայի ստեղծման համար օգտանունը պարտադիր է:"
-    notify_about_flags_after: "Եթե կան դրոշակներ, որոնք չեն կարգավորվել այսքան ժամ անց, ուղարկել անձնական նամակ մոդերատորներին: Սահմանեք 0՝ անջատելու համար:"
-    show_create_topics_notice: "Եթե կայքն ունի 5-ից քիչ հանրային թեմա, ցուցադրել նշում՝ ադմիններին խնդրելով ստեղծել որոշ թեմաներ:"
     delete_drafts_older_than_n_days: "Ջնջել (n) օրվանից ավելի հին սևագրերը:"
-    bootstrap_mode_min_users: "Օգտատերերի նվազագույն քանակը, որ պահանջվում է սկզբնաբեռնման (bootstrap) ռեժիմը անջատելու համար (սահմանեք 0՝ անջատելու համար)"
     slug_generation_method: "Ընտրեք սլագի գեներացման մեթոդ: 'կոդավորված' -ը կգեներացնի տոկոսային կոդավորման տող: 'ոչ մի' -ն ընդհանրապես կանջատի սլագը:"
     enable_emoji: "Միացնել էմոջի"
     enable_emoji_shortcuts: "Հայտնի սմայլիկների տեքստը, օրինակ՝ :) :p :( , կփոխարկվի էմոջիով"
@@ -1490,7 +1473,6 @@ hy:
     retry_web_hook_events: "Ավտոմատ կերպով կրկին փորձել ձախողված վեբ hook-ի իրադարձությունները 4 անգամ: Փորձերի միջև ժամանակային հատվածներն են՝ 1, 5, 25 և 125 րոպե:"
     allow_user_api_keys: "Թույլատրել օգտատիրոջ API key-երի գեներացիան"
     allow_user_api_key_scopes: "Օգտատիրոջ API key-երի համար թույլատրելի սահմանների ցանկ"
-    min_trust_level_for_user_api_key: "Օգտատիրոջ API key-երի գեներացման համար անհրաժեշտ վստահության մակարդակը"
     allowed_user_api_auth_redirects: "Թույլատրելի URL նույնականացման վերաուղարկման համար օգտատիրոջ API key -երի համար: * նշանը կարող օգտագործվել դրա ցանկացած մասի հետ համընկնման համար (օրինակ՝ www.example.com/*)."
     allowed_user_api_push_urls: "Օգտատիրոջ API -ին սերվերի push անելու համար թույլատրված URL-ները"
     tagging_enabled: "Միացնե՞լ թեմաների թեգերը:"
@@ -1531,7 +1513,6 @@ hy:
       pop3_polling_password_is_empty: "Դուք պետք է սահմանեք 'pop3 polling գաղտնաբառ' ՝ մինչ POP3 polling-ը միացնելը:"
       pop3_polling_authentication_failed: "POP3 նույնականացումը ձախողվեց: Խնդրում ենք հաստատել Ձեր pop3 տվյալները:"
       reply_by_email_address_is_empty: "Դուք պետք է սահմանեք 'պատասխան ըստ էլ. հասցի' ՝ մինչ ըստ էլ. հասցեի պատասխանը միացնելը:"
-      email_polling_disabled: "Դուք պետք է միացնեք ձեռքով կամ POP3 polling -ը՝ մինչ ըստ էլ.նամակի պատասխանը միացնելը:"
       user_locale_not_enabled: "Դուք պետք է սկզբում միացնեք 'allow user locale' ՝ մինչև այս կարգավորումը միացնելը"
       invalid_regex: "Կարգավորումը անվավեր է կամ անթույլատրելի:"
       email_editable_enabled: "Դուք պետք է անջատեք 'email editable'մինչև այս կարգավորումը միացնելը:"
@@ -1681,7 +1662,6 @@ hy:
     deactivated_by_staff: "Ապակտիվացված է անձնակազմի կողմից"
     activated_by_staff: "Ակտիվացված անձնակազմի կողմից"
     new_user_typed_too_fast: "Նոր օգտատերը չափազանց արագ է տպել"
-    content_matches_auto_block_regex: "Բովանդակությունը համընկնում է ավտոմատ արգելափակման կարգավորմանը"
     username:
       short: "պետք է ունենա առնվազն %{min} սիմվոլ"
       long: "պետք է լինի ավելի քան %{max} սիմվոլ"
@@ -2123,14 +2103,6 @@ hy:
     user_automatically_silenced:
       title: "Օգտատերը Ավտոմատ Լռեցված է"
       subject_template: "Նոր %{username} օգտատերը լռեցված է համայնքի դրոշակների կողմից:"
-      text_body_template: |
-        Սա ավտոմատացված նամակ է:
-
-        [%{username}] նոր օգտատերը (%{user_url}) ավտոմատ կերպով լռեվել է, քանի որ բազմաթիվ օգտատերեր դրոշակավորել են %{username}-ի գրառում(ներ)ը:
-
-        Խնդրում ենք [վերանայել դրոշակները](%{base_url}/admin/flags): Եթե %{username} -ը սխալմամբ է լռեցվել, սեղմեք միացնել կոճակը [ադմինի էջում այս օգտատիրոջ համար](%{user_url}):
-
-        Այս քանակի սահմանափակումը կարելի է փոփոխել `silence_new_user` կայքի կարգավորումներով:
     spam_post_blocked:
       title: "Սպամ Գրառումը Արգելափակված է"
       subject_template: " %{username} նոր օգտատիրոջ գիառումները արդելափակվել են կրկնվող հղումների պատճառով:"
@@ -2152,9 +2124,6 @@ hy:
       title: "Հեռակա Նկարների Ներբեռնումը Անջատված է"
       subject_template: "Հեռակա նկարների ներբեռնումը անջատված է"
       text_body_template: " `download_remote_images_to_local` կարգավորումը անջատվել է, քանի որ հասել եք `download_remote_images_threshold` -ում դիսկի տարածքի սահմանին:"
-    dashboard_problems:
-      title: "Կառավարման Հարթակի Խնդիրներ"
-      subject_template: "Նոր խորհուրդ Ձեր կայքի կառավարման հարթակում"
     new_user_of_the_month:
       title: "Դուք Ամսվա Նոր Օգտատերն եք !"
       subject_template: "Դուք Ամսվա Նոր Օգտատերն եք !"
@@ -2186,9 +2155,6 @@ hy:
       one: "Զգուշացեք. Մենք օրեկան ուղարկում ենք առավելագույնը %{count} նամակ: Ստուգեք կայքը՝ տեսնելու համար ետ եկածները: Հ.Գ. շնորհակալ ենք ճանաչված լինելու համար!"
       other: "Զգուշացեք. Մենք օրեկան ուղարկում ենք առավելագույնը %{count} նամակ: Ստուգեք կայքը՝ տեսնելու համար ետ եկածները: Հ.Գ. շնորհակալ ենք ճանաչված լինելու համար!"
     in_reply_to: "Ի պատասխան"
-    unsubscribe:
-      title: "Դուրս գալ բաժանորդագրումից"
-      description: "Հետաքրքրված չե՞ք այս էլ. նամակների ստացմամբ: Խնդիր չկա! Սեղմեք ներքևում՝ բաժանորդագրումից անմիջապես հրաժարվելու համար."
     reply_by_email: "[Այցելեք Թեմա](%{base_url}%{url}) կամ պատասխանեք այս էլ. նամակին՝ արձագանքելու համար:"
     reply_by_email_pm: "[Դիտեք Հաղորդագրությունը](%{base_url}%{url}) կամ պատասխանեք այս նամակին՝ %{participants} -ին արձագանքելու համար:"
     only_reply_by_email: "Պատասխանեք այս նամակին՝ արձագանքելու համար:"
@@ -2403,7 +2369,6 @@ hy:
       liked_received: "Ստացված Հավանումներ"
       new_users: "Նոր Օգտատերեր"
       popular_topics: "Տարածված Թեմաներ"
-      follow_topic: "Հետևել այս թեմային"
       join_the_discussion: "Կարդալ Ավելին"
       popular_posts: "Ճանաչված Գրառումներ"
       more_new: "Նոր Ձեր համար"
@@ -2519,15 +2484,6 @@ hy:
   offline:
     title: "Հնարավոր չէ բեռնել հավելված"
     offline_page_message: "Կարծես թե Դուք օֆլայն եք! Խնդրում ենք ստուգել Ձեր կապը և փորձել կրկին:"
-  login_required:
-    welcome_message: |
-      ## [Բարի գալուստ %{title}](#բարիգալուստ)
-      Հաշիվը պարտադիր է: Խնդրում ենք ստեղծել հաշիվ կամ մուտք գործել՝ շարունակելու համար:
-    welcome_message_invite_only: |
-      ## [Բարի գալուստ %{title}](#ողջույն)
-      Հաշիվը պարտադիր է: Խնդրում ենք գոյություն ունեցող անդամից խնդրել հրավեր կամ մուտք գործել՝ շարունակելու համար:
-  deleted: "ջնջված"
-  image: "նկար"
   upload:
     edit_reason: "ներբեռնել է նկարների տեղական կրկնօրինակները"
     unauthorized: "Ներողություն, ֆայլը, որ Դուք փորձում եք վերբեռնել, նույնականացված չէ (նույնականացված ընդլայնումներ՝ %{authorized_extensions}):"
@@ -2602,88 +2558,6 @@ hy:
     title: "Օգտագործման Պայմաններ"
   privacy_topic:
     title: "Գաղտնիության Քաղաքականություն"
-    body: |
-      <a name="collect"></a>
-
-      ## [Ի՞նչ տեղեկություններ ենք մենք հավաքում](#collect)
-
-      Մենք Ձեզնից տեղեկություններ ենք հավաքում, երբ Դուք գրանցվում եք մեր կայքում, ևտվյալներ ենք հավաում, երբ Դուք մասնակցում եք ֆորումին՝ այստեղ կիսված նյութերը կարդալով, գրելով և գնահատելով:
-
-      Մեր կայքում գրանցվելիս հնարավոր է՝ Ձեզ խնդրենք մուտքագրել Ձեր անունը և էլ. հասցեն: Դուք կարող եք, ամեն դեպքում, մուտք գործել մեր կայք առանց գրանցման: Ձեր էլ. հասցեն կվավերացվի եզակի հղում պարունակող նամակով: Եթե Դուք այցելում եք այդ հղումով, մենք կիմանանք, որ Դուք վերահսկում եք Ձեր էլ. հասցեն:
-
-      Գրանցված լինելու դեպքում գրառում կատարելիս մենք գրանցում ենք IP հասցեն, որտեղից կատարվել է գրառումը: Մենք կարող ենք նաև պահպանել սերվերի գրառումները, որոնք ներառում են մեր սերվերի յուրաքանչյուր հարցման IP հասցեն:
-
-      <a name="use"></a>
-
-      ## [Ինչի՞ համար ենք մենք օգտագործումտեղեկությունները:](#use)
-
-      Ցանկացած տեղեկություն, որ մենք հավաքում ենք Ձեզնից, կարող է օգտագործվել հետևյալ ձևերից մեկով՝
-
-      * Ձեր փորձառնությունը անհատականացնելու համար &mdash; Ձեր տեղեկությունները օգնում են ավելի լավ արձագանքել Ձեր անհատական կարիքներին:
-      * Մեր կայքը բարելավելու համար &mdash; մենք շարունակաբար ձգտում ենք բարելավել մեր կայքի առաջարկները՝ հիմնվելով Ձեզնից ստացած տեղեկությունների և արձագանքների վրա:
-      * Հաճախորդների սպասարկումը բարելավելու համար &mdash; Ձեր տեղեկությունները օգնում են մեզ ավելի արդյունավետ արձագանքել հաճախորդների սպասարկման վերաբերյալ հարցումներին և ապահովել պահանջները:
-      * Ուղարկել պարբերական էլ. նամակներ &mdash; Ձեր տրամադրած էլ. հասցեն կարող է օգտագործվել Ձեզ տեղեկություններ ուղարկելու, թեմաների փոփոխությունների վերաբերյալ Ձեր կողմից պահանջված կամ Ձեր օգտանվանը պատասխանների վերաբերյալ ծանուցումների, հարցումների և/կամ այլ պահանջների ու հարցերի համար:
-
-      <a name="protect"></a>
-
-      ## [Ինչպե՞ս ենք մենք պաշտպանում Ձեր տեղեկությունները:](#protect)
-
-      Մենք կիրառում ենք բազմափի անվտանգության չափանիշներ՝ ապահովելու համար Ձեր անձնական տեղեկությունների անվտահնգությունը, երբ Դուք մուտքագրում, կիրառում կամ մուտք եք գործում Ձեր անձնական տեղեկություններ:
-
-      <a name="data-retention"></a>
-
-      ## [Ինչպիսի՞ն է Ձեր տվյալների պահպանման քաղաքականությունը:](#data-retention)
-
-      Մենք ջանք չենք խնայի, որպեսզի.
-
-      * Պահպանենք այս սերվերի բոլոր հարցումների IP հասցեները պարունակող սերվերային գրառումները 90 օրից ոչ ավելի:
-      * Պահպանենք գրանցված օգտատերերի և նրանց գրառումների հետ կապված IP հասցեները 5 տարուց ոչ ավելի:
-
-      <a name="cookies"></a>
-
-      ## [Մենք օգտագործո՞ւմ ենք քուքիներ:](#cookies)
-
-      Այո: Քուքիները փոքր ֆայլեր են, որոնք կայքը կամ ծառայության մատակարարը փոխադրում է համակարգչի hard drive՝ Ձեր Վեբ Բրաուզերի միջոցով (եթե Դուք թույլ եք տալիս): Այս քուքիների շնորհիվ կայքը ճանաչում է Ձեր բրաուզերը և, եթե Դուք ունեք գրանցված հաշիվ, կապում է այն Ձեր գրանցված հաշվի հետ:
-
-      Մենք օգտագործում ենք քուքիները Ձեր նախընտրությունները հասկանալու և հետագա այցելությունների համար հիշելու համար, ինչպես նաև՝ կայքի այցելությունների ու փոխազդեցությունների մասին համընդհանուր տվյալներ հավաքելու համար, որպեսզի կարողանանք առաջարկել ավելի լավ փորձառնություն և գործիքներ հետագայում: Մենք կարող ենք համագործակցել երրորդ կողմի ծառայությունների մատակարարի հետ՝ մեր կայքի այցելուներին ավելի լավ հասկանալու համար: Այս ծառայությունների մատակարարներին չի թույլատրվում օգտագործել մեր կողմից հավաքված տվյալները, բացառությամբ մեր բիզնեսի վարման և բարելավման գործում մեզ օգնելու համար:
-
-      <a name="disclose"></a>
-
-      ## [Մենք բացահայտո՞ւմ ենք որևէ տեղեկություն արտաքին կողմերին:](#disclose)
-
-      Մենք չենք վաճառում, կատարում գործարքներ կամ որևէ այլ կերպ տրամադրում արտաքին կողմերին Ձեր անձնական տարբերակիչ տեղեկությունները: Սա չի ներառում վստահելի երրորդ կողմերին, որոնք մեզ օգնում են գործարկել մեր կայքը, վարել մեր բիզնեսը կամ ծառայություններ մատուցել Ձեզ, քանի դեռ այդ կողմերը համաձայն են գաղտնի պահել այդ տեղեկությունները: Մենք կարող ենք նաև օգտագործել Ձեր տեղեկությունները, երբ կարծում ենք, որ օգտագործումը համապատասխանում է օրենքի և մեր կայքի քաղաքականության պահպանմանը կամ մեր կամ մյուսների իրավունքների, սեփականության կամ անվտանգության պաշտպանությանը: Ինչևէ, այցելուի ոչ անձնական տարբերակիչ տեղեկությունները կարող են տրամադրվել այլ կողմերի մարքեթինգի, գովազդի կամ այլ նպատակներով:
-
-      <a name="third-party"></a>
-
-      ## [Երրորդ կողմի հղումներ](#third-party)
-
-      Երբեմն ըստ մեր հայեցողության՝ մենք կարող ենք ներառել կամ առաջարկել երրորդ կողմի ապրանքներ կամ ծառայություններ մեր կայքում: Այդ երրորդ կողմի կայքերը ունեն առանձին և անկախ գաղտնիության քաղաքականություններ: Հետևաբար՝ մենք չունենք որևէ պարտականություն կամ պատասխանատվություն այս կապակցված կայքերի պարունակության կամ գործողությունների նկատմամբ: Այնուամենայնիվ, մենք ձգտում ենք պաշտպանել մեր կայքի ամբողջականությունը և ողջունում ենք ցանկացած արձագանք այս կայքերի վերաբերյալ:
-
-      <a name="coppa"></a>
-
-      ## [Children's Online Privacy Protection Act Compliance - Երեխաների Օնլայն Գաղտնիության Պաշտպանության Կանոնի Պահպանում ](#coppa)
-
-      Մեր կայքը, բոլոր ապրանքները և ծառայությունները ուղղված են առնվազն 13 տարեկան և դրանից մեծ տարիքի մարդկանց: Եթե այս սերվերը ԱՄՆ-ում է, և Դուք 13 տարեկանից ցածր եք, համաձայն COPPA ([Children's Online Privacy Protection Act](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)) -ի պահանջի՝ չեք կարող օգտագործել այս կայքը:
-
-      <a name="online"></a>
-
-      ## [Միայն Օնլայն Գաղտնիության Քաղաքականություն](#online)
-
-      Այս օնլայն գաղտնիության քաղաքականությունը վերաբերվում է միայն մեր կայքի միջոցով հավաքված տեղեկություններին, և ոչ օֆլայն տեղեկություններին:
-
-      <a name="consent"></a>
-
-      ## [Ձեր Համաձայնությունը](#consent)
-
-      Մեր կայքը օգտագործելով՝ Դուք համաձայնվում եք մեր վեբ-կայքի գաղտնիության քաղաքականությանը:
-
-      <a name="changes"></a>
-
-      ## [Մեր Գաղտնիության Քաղաքականության Փոփոխությունները](#changes)
-
-      Եթե մենք որոշենք փոփոխել մեր գաղնտիության քաղաքականությունը, մենք կհրապարակենք այդ փոփոխությունները այս էջում:
-
-      Այս փաստաթուղթը CC-BY-SA է: Այսն վերջին անգամ թարմացվել է 2013 թ. մայիսի 31-ին:
   badges:
     editor:
       name: Խմբագիր
@@ -2946,8 +2820,6 @@ hy:
       message: "<p>Մենք կրկին ուղարկել ենք ակտիվացիայի նամակը <b>%{email}</b> հասցեին"
   safe_mode:
     title: "Մուտք գործել անվտանգ ռեժիմ"
-    no_unofficial_plugins: "Անջատել ոչ պաշտոնական պլագինները"
-    no_plugins: "Անջատել բոլոր պլագինները"
     enter: "Մուտք գործել Ապահով Ռեժիմ"
     must_select: "Դուք պետք է ընտրեք առնվազն մեկ տարբերակ՝ անվտանգ ռեժիմ մուտք գործելու համար:"
   wizard:
@@ -2997,7 +2869,6 @@ hy:
         title: "Ձեր Discourse -ը պատրաստ է!"
   search_logs:
     graph_title: "Որոնումների Քանակ"
-  joined: "Միացել է"
   discourse_push_notifications:
     popup:
       mentioned: '%{username} -ը նշել է Ձեզ այստեղ՝ "%{topic}" - %{site_title}'
@@ -3029,28 +2900,24 @@ hy:
       medium: "Միջին"
       high: "Ցածր"
     actions:
-      agree_and_keep:
-        title: "Պահել Գրառումը"
-        description: "Ընդունել դրոշակը և գրառումը պահել անփոփոխ:"
+      agree:
+        title: "Այո"
       agree_and_suspend:
-        title: "Սառեցնել Օգտատիրոջը"
         description: "Ընդունել դրոշակավորումը և սառեցնել օգտատիրոջը:"
       agree_and_silence:
-        title: "Լռեցնել Օգտատիրոջը"
         description: "Ընդունել դրոշակը և սառեցնել օգտատիրոջը:"
       agree_and_restore:
         description: "Վերականգնել գրառումը, որպեսզի բոլոր օգտատերերը կարողանան տեսնել այն:"
-      agree_and_hide:
-        title: "Թաքցնել Գրառումը"
-        description: "Թաքցնել այս գրառումը և ավտոմատ կերպով հաղորդագրություն ուղարկել օգտագտիրոջը՝ հորդորելով խմբագրել այն:"
       delete_single:
         title: "Ջնջել"
       disagree_and_restore:
         description: "Վերականգնել գրառումը, որպեսզի բոլոր օգտատերերը կարողանան տեսնել այն:"
       disagree:
-        title: "Չընդունել"
+        title: "Ոչ"
       ignore:
         title: "Անտեսել"
+      ignore_and_do_nothing:
+        title: "Ոչինչ չանել"
       approve:
         title: "Հաստատել"
       reject_user:
diff --git a/config/locales/server.id.yml b/config/locales/server.id.yml
index 8f736c303a9..74ca6c112ee 100644
--- a/config/locales/server.id.yml
+++ b/config/locales/server.id.yml
@@ -52,6 +52,11 @@ id:
   remove_posts_deleted_by_author: "Dihapus oleh penulis"
   redirect_warning: "Kami tidak dapat memverifikasi bahwa tautan yang Anda pilih benar-benar diposkan ke forum. Jika Anda tetap ingin melanjutkan, pilih tautan di bawah ini."
   on_another_topic: "Di topik lain"
+  topic_category_changed: "Dari %{from} ke %{to}"
+  topic_tag_changed:
+    added_and_removed: "Ditambahkan %{added} dan dihapus %{removed}"
+    added: "Ditambahkan %{added}"
+    removed: "Dihapus %{removed}"
   inline_oneboxer:
     topic_page_title_post_number: "#%{post_number}"
     topic_page_title_post_number_by_user: "#%{post_number} oleh %{username}"
@@ -185,7 +190,7 @@ id:
       invalid_site_setting: "Tidak ada pengaturan bernama '%{name}'"
       invalid_category_id: "Anda menentukan kategori yang tidak ada"
       invalid_choice:
-        other: "Anda menentukan pilihan yang tidak valid %{name}"
+        other: "'%{name}' adalah pilihan yang tidak valid."
       default_categories_already_selected: "Anda tidak boleh memilih kategori yang digunakan di daftar lainnya."
       default_tags_already_selected: "Anda tidak dapat memilih tag yang digunakan di daftar lain."
       s3_upload_bucket_is_required: "Anda tidak dapat mengaktifkan unggahan ke S3 kecuali Anda telah menyediakan 's3_upload_bucket'."
@@ -193,7 +198,8 @@ id:
       page_publishing_requirements: "Penerbitan halaman tidak dapat diaktifkan jika media aman diaktifkan."
       s3_backup_requires_s3_settings: "Anda tidak dapat menggunakan S3 sebagai lokasi cadangan kecuali Anda telah memberikan '%{setting_name}'."
       s3_bucket_reused: "Anda tidak dapat menggunakan keranjang yang sama untuk 's3_upload_bucket' dan 's3_backup_bucket'. Pilih keranjang yang berbeda atau gunakan jalur yang berbeda untuk setiap keranjang."
-      secure_uploads_requirements: "Unggahan S3 harus diaktifkan sebelum mengaktifkan unggahan aman."
+      secure_uploads_requirements: "Unggahan S3 dan ACL S3 harus diaktifkan sebelum mengaktifkan unggahan aman."
+      s3_use_acls_requirements: "Anda harus mengaktifkan ACL S3 saat unggahan aman diaktifkan."
       share_quote_facebook_requirements: "Anda harus mengatur id app Facebook untuk mengaktifkan berbagi kutipan untuk Facebook."
       second_factor_cannot_enforce_with_socials: "Anda tidak dapat menerapkan 2FA dengan login sosial diaktifkan. Anda harus terlebih dahulu menonaktifkan login melalui: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Anda tidak dapat menerapkan 2FA jika login lokal dinonaktifkan."
@@ -213,6 +219,10 @@ id:
         other: "Maaf, kami tidak dapat membuat pratinjau untuk halaman web ini, karena tag oEmbed / OpenGraph berikut tidak dapat ditemukan: %{missing_attributes}"
   word_connector:
     comma: ", "
+  custom_fields:
+    validations:
+      max_items: "Jumlah maksimum bidang khusus untuk entitas ini telah tercapai (%{max_items_number})"
+      max_value_length: "Panjang maksimum untuk nilai bidang khusus telah tercapai (%{max_value_length})"
   invite:
     expired: "Token undangan Anda telah kedaluwarsa. Silahkan <a href='%{base_url}/about'>kontak staf</a>."
     not_found: "Token undangan Anda tidak valid. Silahkan <a href='%{base_url}/about'>kontak staf</a>."
@@ -231,6 +241,7 @@ id:
     user_exists: "Tidak perlu mengundang <b>%{email}</b>, dia sudah punya akun!"
     invite_exists: "Anda sudah mengundang <b>%{email}</b>."
     invalid_email: "%{email} bukan alamat email yang valid."
+    generic_error_response: "Ada masalah dengan permintaan anda."
     rate_limit:
       other: "Anda telah mengirim %{count} undangan dalam 24 jam terakhir, harap tunggu %{time_left} sebelum mencoba lagi."
     confirm_email: "<p>Anda hampir selesai! Kami mengirim email aktivasi ke alamat email Anda. Silakan ikuti petunjuk dalam surel untuk mengaktifkan akun Anda.</p><p>Jika tidak sampai, periksa folder spam Anda.</p>"
@@ -379,6 +390,7 @@ id:
   too_late_to_edit: "Post itu dibuat sudah terlalu lama. Itu tidak dapat lagi diedit atau dihapus."
   edit_conflict: "Post tersebut telah diedit oleh pengguna lain dan perubahan Anda tidak dapat disimpan lagi."
   revert_version_same: "Versi saat ini sama dengan versi yang ingin Anda kembalikan."
+  reverted_to_version: "dikembalikan ke versi #%{version}"
   cannot_edit_on_slow_mode: "Topik ini dalam mode lambat. Untuk mendorong diskusi yang bijaksana dan penuh pertimbangan, mengedit postingan lama dalam topik ini saat ini tidak diperbolehkan selama mode lambat."
   excerpt_image: "gambar"
   bookmarks:
@@ -461,6 +473,7 @@ id:
       Untuk lebih lanjut, [lihat pedoman komunitas kami](%{base_path}/guidelines). Panel ini hanya akan muncul untuk %{education_posts_text} pertama Anda.
     dominating_topic: Anda telah memposting banyak hal dalam topik ini! Pertimbangkan untuk memberikan kesempatan kepada orang lain untuk membalas di sini dan juga mendiskusikan berbagai hal satu sama lain.
     get_a_room: Anda telah membalas ke @%{reply_username} %{count} kali, tahukah Anda bahwa Anda dapat mengirimkan pesan pribadi kepada mereka?
+    dont_feed_the_trolls: Posting ini telah ditandai untuk mendapat perhatian moderator. Apakah Anda yakin ingin membalasnya? Balasan ke konten negatif cenderung mendorong lebih banyak perilaku negatif.
   activerecord:
     attributes:
       category:
@@ -538,7 +551,8 @@ id:
         translation_overrides:
           attributes:
             value:
-              invalid_interpolation_keys: 'Kunci(-kunci) interpolasi berikut tidak valid: "%{keys}"'
+              invalid_interpolation_keys:
+                other: "Kunci interpolasi berikut tidak valid: %{keys}"
         watched_word:
           attributes:
             word:
@@ -559,8 +573,22 @@ id:
   staff_category_name: "Staf"
   staff_category_description: "Kategori pribadi untuk diskusi staf. Topik hanya dapat dilihat oleh admin dan moderator."
   discourse_welcome_topic:
-    title: "Selamat datang di komunitas kami!"
-  admin_quick_start_title: "BACA SAYA TERLEBIH DAHULU: Panduan Mulai Cepat Admin"
+    title: "Selamat datang di %{site_title}! :wave:"
+    body: |
+      Kami sangat senang Anda bergabung dengan kami.
+
+      %{site_info_quote}
+
+      Berikut adalah beberapa hal yang dapat Anda lakukan untuk memulai:
+
+      :speaking_head: **Perkenalkan diri Anda** dengan menambahkan gambar dan informasi tentang diri Anda dan minat Anda ke [profil Anda](%{base_path}/my/preferences/account). Apa satu hal yang ingin Anda tanyakan?
+
+      :open_book: **Kenali komunitas** dengan [menjelajahi diskusi](%{base_path}/top) yang sudah berlangsung di sini. Saat Anda menemukan post yang menarik, informatif, atau menghibur, gunakan :heart: untuk menunjukkan penghargaan atau dukungan Anda!
+
+      :handshake: **Berkontribusi** dengan berkomentar, membagikan perspektif Anda sendiri, mengajukan pertanyaan, atau menawarkan umpan balik dalam diskusi. Sebelum membalas atau memulai topik baru, harap tinjau [Pedoman Komunitas](%{base_path}/faq).
+
+      > Jika Anda memerlukan bantuan atau memiliki saran, silakan bertanya di [#feedback](%{base_path}/c/site-feedback) atau [hubungi admin](%{base_path}/about).
+  admin_quick_start_title: "Panduan Admin: Memulai"
   category:
     topic_prefix: "Tentang kategori %{category}"
     replace_paragraph: "(Ganti paragraf pertama ini dengan deskripsi singkat tentang kategori baru Anda. Panduan ini akan muncul di area pemilihan kategori, jadi cobalah membuatnya di bawah 200 karakter.)"
@@ -578,6 +606,7 @@ id:
       disallowed_tags_generic: "Topik ini memiliki tag yang tidak diizinkan."
       slug_contains_non_ascii_chars: "berisi karakter non-ascii"
       is_already_in_use: "sedang digunakan"
+      move_topic_to_category_disallowed: "Anda tidak dapat memindahkan topik ini ke kategori di mana Anda tidak memiliki izin untuk membuat topik baru."
     cannot_delete:
       has_subcategories: "Tidak bisa menghapus kategori ini karena memiliki sub-kategori."
       topic_exists_no_oldest: "Tidak dapat menghapus kategori ini karena terdapat %{count} topik."
@@ -964,6 +993,7 @@ id:
       title: "DAU/MAU"
       xaxis: "Hari"
       yaxis: "DAU/MAU"
+      description: "Jumlah anggota yang masuk pada hari terakhir dibagi dengan jumlah anggota yang masuk pada bulan lalu – menghasilkan % yang menunjukkan 'stickiness' komunitas. Bertujuan untuk >20%."
     daily_engaged_users:
       title: "Pengguna yang Terlibat Harian"
       xaxis: "Hari"
@@ -1149,27 +1179,83 @@ id:
     sidekiq_warning: 'Sidekiq tidak berjalan. Banyak tugas, seperti mengirim email, dijalankan secara asinkron oleh Sidekiq. Harap pastikan setidaknya satu proses Sidekiq sedang berjalan. <a href="https://github.com/mperham/sidekiq" target="_blank">Pelajari tentang Sidekiq di sini</a>.'
     queue_size_warning: "Jumlah pekerjaan yang antri adalah %{queue_size}, yang mana nilai ini tinggi. Ini bisa menunjukkan masalah dengan proses(-proses) Sidekiq, atau Anda mungkin perlu menambahkan lebih banyak pekerja Sidekiq."
     memory_warning: "Server Anda berjalan dengan total memori kurang dari 1 GB. Total memori minimum yang direkomendasikan adalah 1 GB."
+    outdated_translations_warning: "Beberapa penggantian terjemahan Anda sudah usang. Silakan periksa <a href='%{base_path}/admin/customize/site_texts?outdated=true'>penyesuaian teks</a> Anda."
     email_polling_errored_recently:
       other: "Email polling telah menghasilkan %{count} kesalahan dalam 24 jam terakhir. Lihatlah <a href='%{base_path}/logs' target='_blank'>log</a> untuk lebih jelasnya."
     missing_mailgun_api_key: "Server dikonfigurasi untuk mengirim email melalui Mailgun tetapi Anda belum memberikan kunci API yang digunakan untuk memverifikasi pesan webhook."
+    v3_analytics_deprecated: "Wacana Anda saat ini menggunakan Google Analytics 3, yang tidak akan didukung lagi setelah Juli 2023.0 <a href='https://meta.discourse.org/t/260498'>ke Google Analytics 4</a> sekarang untuk terus menerima wawasan dan analitik berharga untuk kinerja situs web Anda."
+    legacy_navigation_menu_deprecated: "Discourse Anda saat ini menggunakan menu navigasi 'lama' yang <a href='https://meta.discourse.org/t/removing-the-legacy-hamburger-navigation-menu-option/265274'>akan dihapus pada rilis beta pertama Discourse 3.2</a>. Migrasi ke menu navigasi yang baru dengan memperbarui pengaturan situs menu navigasi <a href='%{base_path}/admin/site_settings/category/all_results?filter=navigation_menu'></a> ke 'sidebar' atau 'header dropdown'."
   site_settings:
     disabled: "dinonaktifkan"
     allow_user_locale: "Perbolehkan pengguna untuk memilih bahasa sendiri"
     topic_featured_link_enabled: "Aktifkan post tautan dengan topik."
     allow_duplicate_topic_titles: "Perbolehkan topik dengan judul yang sama."
+    max_form_template_title_length: "Panjang maksimum yang diperbolehkan untuk judul templat formulir."
+    max_form_template_content_length: "Panjang maksimum yang diperbolehkan untuk konten templat formulir."
+    default_subcategory_on_read_only_category: "Mengaktifkan tombol 'Topik Baru' dan memilih subkategori bawaan untuk membuat post pada kategori di mana pengguna tidak diizinkan untuk membuat topik baru."
+    apple_touch_icon: "Ikon yang digunakan untuk perangkat sentuh Apple. Backround transparan tidak disarankan. Akan secara otomatis diubah ukurannya menjadi 180x180. Jika dibiarkan kosong, large_icon akan digunakan."
+    summarization_strategy: "Cara tambahan untuk meringkas konten yang didaftarkan oleh plugin"
+    custom_summarization_allowed_groups: "Grup diizinkan untuk meringkas konten menggunakan `summarization_strategy`."
     include_secure_categories_in_tag_counts: "Saat diaktifkan, jumlah topik untuk sebuah tag akan menyertakan topik yang berada dalam kategori yang dibatasi untuk dibaca bagi semua pengguna. Saat dinonaktifkan, pengguna normal hanya ditampilkan sejumlah topik untuk tag yang semua topiknya berada dalam kategori publik."
     display_personal_messages_tag_counts: "Saat diaktifkan, jumlah pesan pribadi yang diberi tag dengan tag tertentu akan ditampilkan."
     send_welcome_message: "Kirim semua pengguna ucapan selamat datang dengan panduan awal singkat."
+    hidden_post_visible_groups: "Izinkan anggota grup ini untuk melihat post tersembunyi. Pengguna staf selalu dapat melihat post tersembunyi."
     blocked_email_domains: "Daftar domain email yang dipisahkan tanda pipa yang tidak diizinkan untuk didaftarkan akun oleh pengguna. Subdomain secara otomatis ditangani untuk domain yang ditentukan. Simbol wildcard * dan ? tidak didukung. Contoh: mailinator.com|trashmail.net"
     allowed_email_domains: "Daftar domain email yang dibatasi pipa yang HARUS digunakan pengguna untuk mendaftarkan akun. Subdomain secara otomatis ditangani untuk domain yang ditentukan. Simbol wildcard * dan ? tidak didukung. PERINGATAN: Pengguna dengan domain email selain yang terdaftar tidak akan diizinkan!"
     auto_approve_email_domains: "Pengguna dengan alamat email dari daftar domain ini akan disetujui secara otomatis. Subdomain secara otomatis ditangani untuk domain yang ditentukan. Simbol wildcard * dan ? tidak didukung."
+    discourse_connect_url: "URL endpoint DiscourseConnect (harus menyertakan http:// atau https://, dan tidak boleh menyertakan garis miring)"
+    discourse_connect_allowed_redirect_domains: "Batasi ke domain ini untuk return_paths yang disediakan oleh DiscourseConnect (secara bawaan jalur pengembalian harus ada di situs saat ini). Gunakan * untuk mengizinkan domain apa pun untuk jalur pengembalian. Karakter pengganti subdomain (`*.foobar.com`) tidak diizinkan."
+    s3_use_acls: "AWS merekomendasikan untuk tidak menggunakan ACL pada bucket S3; jika Anda mengikuti saran ini, hapus centang opsi ini. Ini harus diaktifkan jika Anda menggunakan unggahan aman."
+    s3_use_cdn_url_for_all_uploads: "Gunakan URL CDN untuk semua file yang diunggah ke s3, bukan hanya untuk gambar."
+    composer_media_optimization_image_encode_quality: "Kualitas penyandian JPG digunakan dalam proses penyandian ulang."
+    tl4_delete_posts_and_topics: "Izinkan pengguna TL4 untuk menghapus posting dan topik yang dibuat oleh pengguna lain. Pengguna TL4 juga akan dapat melihat topik dan postingan yang dihapus."
+    edit_all_topic_groups: "Izinkan pengguna di grup ini untuk mengedit judul topik, tag, dan kategori dari pengguna lain"
+    edit_all_post_groups: "Izinkan pengguna di grup ini untuk mengedit post pengguna lain"
     dark_mode_none: "Tidak ada"
+    sendgrid_verification_key: "Kunci verifikasi Sendgrid digunakan untuk memverifikasi pesan webhook."
+    mailjet_webhook_token: "Token digunakan untuk memverifikasi payload webhook. Itu harus diteruskan sebagai parameter kueri 't' dari webhook, misalnya: https://example.com/webhook/mailjet?t=supersecret"
+    mandrill_authentication_key: "Kunci autentikasi Mandrill digunakan untuk memverifikasi pesan webhook."
+    postmark_webhook_token: "Token digunakan untuk memverifikasi payload webhook. Itu harus diteruskan sebagai parameter kueri 't' dari webhook, misalnya: https://example.com/webhook/postmark?t=supersecret"
+    sparkpost_webhook_token: "Token digunakan untuk memverifikasi payload webhook. Itu harus diteruskan sebagai parameter kueri 't' dari webhook, misalnya: https://example.com/webhook/sparkpost?t=supersecret"
+    email_in: "Izinkan pengguna membuat topik baru melalui surel. Setelah mengaktifkan setelan ini, Anda akan dapat melakukan konfigurasi alamat surel masuk untuk grup dan kategori."
     email_editable: "Perbolehkan pengguna untuk mengganti alamat email setelah registrasi."
+    dont_feed_the_trolls_threshold: "Jumlah penanda dari pengguna lain sebelum diperingatkan."
+    disable_category_edit_notifications: "Nonaktifkan pemberitahuan untuk pengeditan kategori topik."
+    disable_tags_edit_notifications: "Nonaktifkan notifikasi untuk pengubahan tag topik."
+    native_app_install_banner_ios: "Menampilkan spanduk aplikasi DiscourseHub di perangkat iOS ke pengguna dasar (trust level 1) dan lebih tinggi."
+    native_app_install_banner_android: "Menampilkan spanduk aplikasi DiscourseHub di perangkat Android ke pengguna dasar (trust level 1) dan lebih tinggi."
+    max_prints_per_hour_per_user: "Jumlah maksimum tayangan halaman /print (atur ke 0 untuk menonaktifkan pencetakan)"
+    notify_about_reviewable_item_after: "Jika ada item yang dapat ditinjau yang belum ditangani setelah berjam-jam ini, kirim pesan pribadi ke moderator. Setel ke 0 untuk menonaktifkan."
+    bootstrap_mode_min_users: "Jumlah minimum pengguna yang diperlukan untuk menonaktifkan mode bootstrap (diatur ke 0 untuk menonaktifkan, dapat memakan waktu hingga 24 jam)"
     emoji_set: "Bagaimana dengan emoji Anda?"
+    emoji_deny_list: "Emoji ini tidak akan tersedia untuk digunakan dalam menu atau kode singkat."
+    enable_offline_indicator: "Menampilkan pesan kepada pengguna saat terdeteksi bahwa mereka tidak memiliki koneksi jaringan"
+    default_sidebar_link_to_filtered_list: "Jadikan link menu navigasi terhubung ke daftar yang difilter secara bawaan."
+    default_sidebar_show_count_of_new_items: "Jadikan tautan menu navigasi menampilkan jumlah item baru alih-alih lencana secara bawaan."
+    default_sidebar_switch_panel_position: "Posisi tombol panel sakelar bilah samping"
+    min_trust_level_for_user_api_key: |
+      Trust level diperlukan untuk membuat kunci API pengguna.<br>
+      <b>PERINGATAN</b>: Mengubah trust level akan mencegah pengguna dengan tingkat kepercayaan yang lebih rendah untuk masuk melalui Discourse Hub
+    enable_max_tags_per_email_subject: "Gunakan max_tags_per_email_subject saat membuat subjek email"
+    max_tags_per_email_subject: "Tag maksimum yang dapat dimasukkan ke dalam subjek email"
+    create_post_for_category_and_tag_changes: "Buat post tindakan kecil saat kategori atau tag topik berubah"
+    watched_precedence_over_muted: "Beri tahu saya tentang topik dalam kategori atau tag yang saya ikuti yang juga termasuk dalam kategori yang telah saya nonaktifkan"
+    enable_user_tips: "Aktifkan kiat pengguna baru yang menjelaskan fitur utama kepada pengguna"
+    default_navigation_menu_categories: "Kategori yang dipilih akan ditampilkan di bawah bagian Kategori pada Menu Navigasi secara bawaan."
+    default_navigation_menu_tags: "Tag yang dipilih akan ditampilkan di bawah bagian Tag pada Menu Navigasi secara bawaan."
+    experimental_new_new_view_groups: 'EKSPERIMENTAL: Aktifkan daftar topik baru yang menggabungkan topik yang belum dibaca dan topik baru dan buat tautan "Everything" di tautan sidebar ke sana.'
+    enable_custom_sidebar_sections: "EKSPERIMENTAL: Mengaktifkan bagian bilah sisi custom"
+    experimental_topics_filter: "EKSPERIMENTAL: Mengaktifkan rute filter topik eksperimental di /filter"
+    experimental_search_menu_groups: "EKSPERIMENTAL: Mengaktifkan menu pencarian baru yang telah ditingkatkan untuk menggunakan glimmer"
+    enable_experimental_lightbox: "EKSPERIMENTAL: Ganti lightbox gambar bawaan dengan desain yang diubah."
+    page_loading_indicator: "Konfigurasikan indikator pemuatan yang muncul selama navigasi halaman dalam Discourse. 'Spinner' adalah indikator halaman penuh. 'Slider' menampilkan bilah sempit di bagian atas layar."
     errors:
       invalid_email: "Alamat email tidak valid."
+      email_polling_disabled: "Anda harus mengaktifkan polling POP3 manual atau mengaktifkan poller email khusus sebelum mengaktifkan balasan melalui email."
       min_username_length_range: "Anda tidak boleh menentukan minimum lebih dari maksimum."
       max_username_length_range: "Anda tidak bisa menentukan jumlah maksimum dibawah jumlah minimum."
+      invalid_uncategorized_category_setting: 'Kategori "Uncategorized" tidak dapat dipilih jika ''allow uncategorized topics'' tidak diaktifkan.'
+      invalid_search_ranking_weights: "Nilai tidak valid untuk setelan situs search_ranking_weights. Contoh: '{0.1,0.2,0.3,1.0}'. Perhatikan bahwa nilai maksimum untuk setiap bobot adalah 1,0."
   search:
     within_post: "#%{post_number} oleh %{username}"
     types:
@@ -1206,6 +1292,15 @@ id:
       subject_template: "Selamat datang ke %{site_name}!"
     tl2_promotion_message:
       subject_template: "Selamat atas promosi tingkat kepercayaan Anda!"
+    user_automatically_silenced:
+      text_body_template: |
+        Ini adalah pesan otomatis.
+
+        Pengguna baru [%{username}](%{user_url}) secara otomatis disenyapkan karena beberapa pengguna menandai kiriman (post) %{username}.
+
+        Harap [tinjau penanda](%{base_url}/review). Jika %{username} salah disenyapkan dari proses post, klik tombol nonaktifkan di [halaman admin untuk pengguna ini](%{user_url}).
+
+        Ambang batas ini dapat diubah melalui pengaturan situs `silence_new_user`.
     spam_post_blocked:
       subject_template: "Pengguna baru %{username} disuspensi atas penulisan tautan yang berulang-ulang kali"
     pending_users_reminder:
@@ -1227,8 +1322,8 @@ id:
     page_title: "Halaman Tidak Ditemukan"
     see_more: "Selengkapnya"
     search_button: "Cari"
-  deleted: "dihapus"
-  image: "gambar"
+  login_required:
+    welcome_message: "# [Selamat datang di %{title}](#welcome)"
   upload:
     images:
       size_not_found: "Maaf, kami tidak dapat mendeteksi ukuran dari gambar. Apa berkas gambar yang Anda unggah rusak?"
@@ -1246,8 +1341,267 @@ id:
     boolean_no: "Tidak"
   tos_topic:
     title: "Ketentuan Layanan"
+    body: |
+      <h2 id="heading--change-me"><a href="#heading--change-me">Ubah ini</a></h2>
+
+      Admin Forum, berikut ini adalah contoh template awal untuk kebijakan privasi yang dapat Anda sesuaikan dengan kebutuhan situs Anda.
+
+      Ketentuan ini tidak, tetapi mungkin suatu hari nanti, mengatur penggunaan forum Internet di <%{base_url}>. Dalam hal ini, untuk menggunakan forum tersebut, Anda harus menyetujui persyaratan ini dengan %{company_name}, perusahaan yang menjalankan forum tersebut.
+
+      Perusahaan dapat menawarkan produk dan layanan lain, dengan persyaratan yang berbeda. Ketentuan ini hanya berlaku untuk penggunaan forum.
+
+      Loncat ke:
+
+      - [Istilah Penting](#heading--important-terms)
+      - [Izin Anda untuk Menggunakan Forum](#heading--permission)
+      - [Ketentuan Penggunaan Forum](#heading--conditions)
+      - [Penggunaan yang Dapat Diterima](#heading--acceptable-use)
+      - [Standar Konten](#heading--content-standards)
+      - [Enforcement](#heading--enforcement)
+      - [Akun Anda](#heading--your-account)
+      - [Konten Anda](#heading--your-content)
+      - [Tanggung Jawab Anda](#heading--responsibility)
+      - [Disclaimers](#heading--disclaimers)
+      - [Batasan Tanggung Jawab](#heading--liability)
+      - [Feedback](#heading--feedback)
+      - [Termination](#heading--termination)
+      - [Disputes](#heading--disputes)
+      - [Istilah Umum](#heading--general)
+      - [Contact](#heading--contact)
+      - [Changes](#heading--changes)
+
+      <h2 id="heading--important-terms"><a href="#heading--important-terms">Ketentuan Penting</a></h2>
+
+      *** Ketentuan-ketentuan ini mencakup sejumlah ketentuan penting yang memengaruhi hak dan tanggung jawab Anda, seperti penafian di [Disclaimers](#heading--penafian), batasan tanggung jawab perusahaan terhadap Anda di [Batasan Tanggung Jawab] (#heading--tanggung jawab), persetujuan Anda untuk menanggung perusahaan atas kerusakan yang disebabkan oleh penyalahgunaan forum oleh Anda di [Tanggung Jawab Penggunaan Anda] (#heading--tanggung jawab), dan persetujuan untuk mengarbitrasikan sengketa di [Disputes](#heading--sengketa).***
+
+      <h2 id="heading--permission"><a href="#heading--permission">Izin Anda untuk Menggunakan Forum</a></h2>
+
+      Dengan tunduk pada persyaratan ini, perusahaan memberikan izin kepada Anda untuk menggunakan forum. Setiap orang harus menyetujui persyaratan ini untuk menggunakan forum.
+
+      <h2 id="heading--conditions"><a href="#heading--conditions">Ketentuan Penggunaan Forum</a></h2>
+
+      Izin Anda untuk menggunakan forum tunduk pada ketentuan berikut:
+
+      1. Anda harus berusia minimal tiga belas tahun.
+
+      2. Anda tidak boleh lagi menggunakan forum jika perusahaan menghubungi Anda secara langsung untuk mengatakan bahwa Anda tidak boleh menggunakan forum.
+
+      3. Anda harus menggunakan forum sesuai dengan [Penggunaan yang Dapat Diterima] (#judul--penggunaan yang dapat diterima) dan [Standar Konten] (#judul--standar-konten).
+
+      <h2 id="heading--acceptable-use"><a href="#heading--acceptable-use">Penggunaan yang Dapat Diterima</a></h2>
+
+      1. Anda tidak boleh melanggar hukum dengan menggunakan forum.
+
+      2. Anda tidak boleh menggunakan atau mencoba menggunakan akun orang lain di forum tanpa izin khusus dari yang bersangkutan.
+
+      3. Anda tidak boleh membeli, menjual, atau memperdagangkan nama pengguna atau pengidentifikasi unik lainnya di forum.
+
+      4. Anda tidak boleh mengirim iklan, surat berantai, atau permintaan lain melalui forum, atau menggunakan forum untuk mengumpulkan alamat atau data pribadi lainnya untuk milis atau basis data komersial.
+
+      5. Anda tidak boleh mengotomatisasi akses ke forum, atau memantau forum, seperti dengan perayap web, plug-in atau pengaya peramban, atau program komputer lain yang bukan peramban web. Anda dapat merayapi forum untuk mengindeksnya untuk mesin pencari yang tersedia untuk umum, jika Anda menjalankannya.
+
+      6. Anda tidak boleh menggunakan forum untuk mengirim email ke daftar distribusi, newsgroup, atau grup email.
+
+      7. Anda tidak boleh menyiratkan bahwa Anda berafiliasi dengan atau didukung oleh perusahaan.
+
+      8. Anda tidak boleh membuat hyperlink ke gambar atau konten non-hiperteks lainnya di forum pada halaman web lain.
+
+      9. Anda tidak boleh menghapus tanda apa pun yang menunjukkan kepemilikan hak milik dari materi yang Anda unduh dari forum.
+
+      10. Anda tidak boleh menampilkan bagian mana pun dari forum di situs web lain dengan `<iframe>`.
+
+      11. Anda tidak boleh menonaktifkan, menghindari, atau mengelabui pembatasan keamanan atau akses forum.
+
+      12. Anda tidak boleh membebani infrastruktur forum dengan volume permintaan yang tidak masuk akal, atau permintaan yang dirancang untuk memberikan beban yang tidak masuk akal pada sistem informasi yang mendasari forum.
+
+      13. Anda tidak boleh menyamar sebagai orang lain melalui forum.
+
+      14. Anda tidak boleh mendorong atau membantu siapa pun yang melanggar ketentuan ini.
+
+      <h2 id="heading--content-standards"><a href="#heading--content-standards">Standar Konten</a></h2>
+
+      1. Konten Anda tidak boleh mengirimkan konten ke forum yang ilegal, menyinggung, atau membahayakan orang lain. Ini termasuk konten yang melecehkan, tidak pantas, kasar, atau mengandung kebencian.
+
+      2. Anda tidak boleh mengirimkan konten ke forum yang melanggar hukum, melanggar hak kekayaan intelektual siapa pun, melanggar privasi siapa pun, atau melanggar perjanjian yang Anda miliki dengan orang lain.
+
+      3. Anda tidak boleh mengirimkan konten ke forum yang mengandung kode komputer berbahaya, seperti virus komputer atau spyware.
+
+      4. Anda tidak boleh mengirimkan konten ke forum hanya sebagai placeholder, untuk menyimpan alamat, nama pengguna, atau pengenal unik lainnya.
+
+      5. Anda tidak boleh menggunakan forum untuk mengungkapkan informasi yang tidak berhak Anda ungkapkan, seperti informasi rahasia atau pribadi orang lain.
+
+      <h2 id="heading--enforcement"><a href="#heading--enforcement">Penegakan</a></h2>
+
+      Perusahaan dapat menyelidiki dan menuntut pelanggaran terhadap persyaratan ini sampai batas hukum sepenuhnya. Perusahaan dapat memberi tahu dan bekerja sama dengan otoritas penegak hukum dalam menuntut pelanggaran hukum dan ketentuan-ketentuan ini.
+
+      Perusahaan berhak untuk mengubah, menyunting, dan menghapus konten di forum dengan alasan apa pun. Jika Anda yakin seseorang telah mengirimkan konten ke forum yang melanggar ketentuan ini, [segera hubungi kami] (#judul--kontak).
+
+      <h2 id="heading--your-account"><a href="#heading--your-account">Akun Anda</a></h2>
+
+      Anda harus membuat dan masuk ke sebuah akun untuk menggunakan beberapa fitur forum.
+
+      Untuk membuat akun, Anda harus memberikan beberapa informasi tentang diri Anda. Jika Anda membuat akun, Anda setuju untuk memberikan, setidaknya, alamat email yang valid, dan untuk selalu memperbarui alamat tersebut. Anda dapat menutup akun Anda kapan saja dengan mengirim email ke <%{contact_email}>.
+
+      Anda setuju untuk bertanggung jawab atas semua tindakan yang dilakukan menggunakan akun Anda, baik yang diotorisasi oleh Anda maupun tidak, hingga Anda menutup akun Anda atau memberi tahu perusahaan bahwa akun Anda telah dibobol. Anda setuju untuk segera memberi tahu perusahaan jika Anda mencurigai bahwa akun Anda telah disalahgunakan. Anda setuju untuk memilih kata sandi yang aman untuk akun Anda, dan merahasiakannya.
+
+      Perusahaan dapat membatasi, menangguhkan, atau menutup akun Anda di forum sesuai dengan kebijakannya dalam menangani permintaan penghapusan terkait hak cipta, atau jika perusahaan secara wajar meyakini bahwa Anda telah melanggar peraturan apa pun dalam persyaratan ini.
+
+      <h2 id="heading--your-content"><a href="#heading--your-content">Konten Anda</a></h2>
+
+      Tidak ada dalam persyaratan ini yang memberikan hak kepemilikan apa pun kepada perusahaan atas kekayaan intelektual yang Anda bagikan ke forum, seperti informasi akun Anda, posting, atau konten lain yang Anda kirimkan ke forum. Tidak ada dalam persyaratan ini yang memberi Anda hak kepemilikan apa pun atas kekayaan intelektual perusahaan.
+
+      Antara Anda dan perusahaan, Anda tetap bertanggung jawab penuh atas konten yang Anda kirimkan ke forum. Anda setuju untuk tidak menyiratkan secara keliru bahwa konten yang Anda kirimkan ke forum disponsori atau disetujui oleh perusahaan. Ketentuan ini tidak mewajibkan perusahaan untuk menyimpan, memelihara, atau menyediakan salinan konten yang Anda kirimkan, dan mengubahnya, sesuai dengan ketentuan ini.
+
+      Konten yang Anda kirimkan ke forum adalah milik Anda, dan Anda yang menentukan izin apa yang akan diberikan kepada orang lain. Namun setidaknya, Anda memberikan lisensi kepada perusahaan untuk memberikan konten yang Anda kirimkan ke forum kepada pengguna forum lainnya. Lisensi khusus tersebut memungkinkan perusahaan untuk menyalin, mempublikasikan, dan menganalisis konten yang Anda kirimkan ke forum.
+
+      Ketika konten yang Anda kirimkan dihapus dari forum, baik oleh Anda maupun oleh perusahaan, lisensi khusus perusahaan akan berakhir ketika salinan terakhir menghilang dari cadangan, cache, dan sistem lain milik perusahaan. Lisensi lain yang Anda terapkan pada konten yang Anda kirimkan, seperti lisensi [Creative Commons] (https://creativecommons.org), dapat terus berlanjut setelah konten Anda dihapus. Lisensi tersebut dapat memberikan hak kepada orang lain, atau perusahaan itu sendiri, untuk membagikan konten Anda melalui forum lagi.
+
+      Orang lain yang menerima konten yang Anda kirimkan ke forum dapat melanggar persyaratan lisensi konten Anda. Anda setuju bahwa perusahaan tidak akan bertanggung jawab kepada Anda atas pelanggaran tersebut atau konsekuensinya.
+
+      <h2 id="heading--responsibility"><a href="#heading--responsibility">Tanggung Jawab Anda</a></h2>
+
+      Anda setuju untuk mengganti kerugian perusahaan dari tuntutan hukum oleh pihak lain yang terkait dengan pelanggaran Anda terhadap persyaratan ini, atau pelanggaran persyaratan ini oleh orang lain yang menggunakan akun Anda di forum. Baik Anda maupun perusahaan setuju untuk memberi tahu pihak lain tentang klaim hukum apa pun yang mungkin harus Anda ganti rugi kepada perusahaan sesegera mungkin. Jika perusahaan gagal memberi tahu Anda tentang klaim hukum dengan segera, Anda tidak perlu mengganti kerugian perusahaan atas kerusakan yang dapat Anda pertahankan atau dikurangi dengan pemberitahuan yang cepat. Anda setuju untuk mengizinkan perusahaan mengendalikan penyelidikan, pembelaan, dan penyelesaian tuntutan hukum yang mengharuskan Anda mengganti kerugian kepada perusahaan, dan untuk bekerja sama dalam upaya-upaya tersebut. Perusahaan setuju untuk tidak menyetujui penyelesaian apa pun yang mengakui kesalahan Anda atau membebankan kewajiban kepada Anda tanpa persetujuan Anda sebelumnya.
+
+      <h2 id="heading--disclaimers"><a href="#heading--disclaimers">Penafian</a></h2>
+
+      ***Anda menerima semua risiko penggunaan forum dan konten di forum. Sejauh diizinkan oleh hukum, perusahaan dan pemasoknya menyediakan forum apa adanya, tanpa jaminan apa pun.***
+
+      Forum ini dapat membuat hyperlink ke dan mengintegrasikan forum dan layanan yang dijalankan oleh pihak lain. Perusahaan tidak memberikan jaminan apa pun tentang layanan yang dijalankan oleh pihak lain, atau konten yang mereka sediakan. Penggunaan layanan yang dijalankan oleh pihak lain mungkin diatur oleh ketentuan lain antara Anda dan pihak yang menjalankan layanan.
+
+      <h2 id="heading--liability"><a href="#heading--liability">Batasan Tanggung Jawab</a></h2>
+
+      *** Baik perusahaan maupun pemasoknya tidak akan bertanggung jawab kepada Anda atas kerugian akibat pelanggaran kontrak yang tidak dapat diperkirakan secara wajar oleh personelnya saat Anda menyetujui persyaratan ini.***
+
+      *** Sejauh diizinkan oleh hukum, total tanggung jawab kepada Anda atas klaim apa pun yang terkait dengan forum atau konten di forum akan dibatasi hingga $50.***
+
+      <h2 id="heading--feedback"><a href="#heading--feedback">Umpan Balik</a></h2>
+
+      Perusahaan menyambut baik umpan balik dan saran Anda untuk forum ini. Lihat bagian [Contact](#heading--contact) di bawah ini untuk mengetahui cara-cara menghubungi kami.
+
+      Anda setuju bahwa perusahaan akan bebas untuk menindaklanjuti umpan balik dan saran yang Anda berikan, dan bahwa perusahaan tidak perlu memberi tahu Anda bahwa umpan balik Anda telah digunakan, meminta izin Anda untuk menggunakannya, atau membayar Anda. Anda setuju untuk tidak mengirimkan umpan balik atau saran yang Anda yakini bersifat rahasia atau hak milik, baik kepada Anda maupun orang lain.
+
+      <h2 id="heading--termination"><a href="#heading--termination">Pengakhiran</a></h2>
+
+      Anda atau perusahaan dapat mengakhiri perjanjian yang tertulis dalam persyaratan ini kapan saja. Ketika perjanjian kami berakhir, izin Anda untuk menggunakan forum juga berakhir.
+
+      Ketentuan-ketentuan berikut ini tetap berlaku setelah perjanjian kita berakhir: [Konten Anda] (#judul--konten Anda), [Feedback](#judul--umpan balik), [Tanggung Jawab Anda] (#judul--tanggung jawab), [Disclaimers](#judul--penyangkalan), [Batasan Tanggung Jawab] (#judul--tanggung jawab), dan [Ketentuan Umum] (#judul-umum).
+
+      <h2 id="heading--disputes"><a href="#heading--disputes">Sengketa</a></h2>
+
+      %{governing_law} akan mengatur setiap sengketa yang terkait dengan persyaratan ini atau penggunaan forum oleh Anda.
+
+      Anda dan perusahaan setuju untuk meminta perintah yang terkait dengan persyaratan ini hanya di pengadilan negara bagian atau federal di %{city_for_disputes}. Baik Anda maupun perusahaan tidak akan keberatan dengan yurisdiksi, forum, atau tempat di pengadilan tersebut.
+
+      ***Selain untuk mendapatkan putusan pengadilan atau untuk klaim berdasarkan Computer Fraud and Abuse Act, Anda dan perusahaan akan menyelesaikan setiap perselisihan melalui arbitrase American Arbitration Association yang mengikat. Arbitrase akan mengikuti Peraturan Arbitrase Komersial AAA dan Prosedur Tambahan untuk Sengketa Terkait Konsumen. Arbitrase akan dilakukan di %{city_for_disputes}. Anda akan menyelesaikan sengketa apa pun sebagai individu, dan bukan sebagai bagian dari gugatan kelompok atau proses perwakilan lainnya, baik sebagai penggugat atau anggota kelompok. Arbiter tidak akan menggabungkan sengketa apa pun dengan arbitrase lain tanpa izin perusahaan.***
+
+      Setiap putusan arbitrase akan mencakup biaya arbitrase, biaya pengacara yang wajar, dan biaya yang wajar untuk para saksi. Anda dan perusahaan dapat mengajukan putusan arbitrase di pengadilan mana pun yang memiliki yurisdiksi.
+
+      <h2 id="heading--general"><a href="#heading--general">Ketentuan Umum</a></h2>
+
+      Jika suatu ketentuan dalam persyaratan ini tidak dapat diberlakukan secara tertulis, tetapi dapat diubah agar dapat diberlakukan, ketentuan tersebut harus dimodifikasi hingga batas minimum yang diperlukan agar dapat diberlakukan. Jika tidak, ketentuan tersebut harus dihapus.
+
+      Anda tidak dapat mengalihkan perjanjian Anda dengan perusahaan. Perusahaan dapat mengalihkan perjanjian Anda kepada afiliasi perusahaan, perusahaan lain yang mendapatkan kendali atas perusahaan, atau perusahaan lain yang membeli aset perusahaan yang terkait dengan forum. Setiap upaya pengalihan yang bertentangan dengan ketentuan ini tidak memiliki dampak hukum.
+
+      Baik pelaksanaan hak apa pun berdasarkan Perjanjian ini, maupun pengabaian pelanggaran apa pun terhadap Perjanjian ini, tidak mengesampingkan pelanggaran lain terhadap Perjanjian ini.
+
+      Ketentuan ini mencakup semua ketentuan perjanjian antara Anda dan perusahaan tentang penggunaan forum. Ketentuan ini sepenuhnya menggantikan semua perjanjian lain tentang penggunaan forum oleh Anda, baik tertulis maupun tidak.
+
+      <h2 id="heading--contact"><a href="#heading--contact">Hubungi</a></h2>
+
+      Anda dapat memberi tahu perusahaan berdasarkan persyaratan ini, dan mengirimkan pertanyaan kepada perusahaan, di <%{contact_email}>.
+
+      Perusahaan dapat memberi tahu Anda berdasarkan persyaratan ini menggunakan alamat email yang Anda berikan untuk akun Anda di forum, atau dengan mengirim pesan ke beranda forum atau halaman akun Anda.
+
+      <h2 id="heading--changes"><a href="#heading--changes">Perubahan</a></h2>
+
+      Perusahaan terakhir kali memperbarui persyaratan ini pada [MASUKKAN TANGGAL PEMBARUAN TERAKHIR DI SINI], dan dapat memperbarui persyaratan ini lagi. Perusahaan akan memposting semua pembaruan ke forum. Untuk pembaruan yang berisi perubahan substansial, perusahaan setuju untuk mengirim email kepada Anda, jika Anda telah membuat akun dan memberikan alamat email yang valid. Perusahaan juga dapat mengumumkan pembaruan dengan pesan atau peringatan khusus di forum.
+
+      Setelah Anda menerima pemberitahuan tentang pembaruan persyaratan ini, Anda harus menyetujui persyaratan baru untuk tetap menggunakan forum.
   privacy_topic:
     title: "Kebijakan Privasi"
+    body: |
+      ## [Admin Forum, berikut ini adalah contoh template awal untuk kebijakan privasi yang dapat Anda sesuaikan dengan situs Anda].
+
+      <a name="collect"></a>
+
+      ## [Informasi apa yang kami kumpulkan?](#collect)
+
+      Kami mengumpulkan informasi dari Anda ketika Anda mendaftar di situs kami dan mengumpulkan data ketika Anda berpartisipasi dalam forum dengan membaca, menulis, dan mengevaluasi konten yang dibagikan di sini.
+
+      Ketika mendaftar di situs kami, Anda mungkin diminta untuk memasukkan nama dan alamat email Anda. Namun, Anda dapat mengunjungi situs kami tanpa mendaftar. Alamat email Anda akan diverifikasi melalui email yang berisi tautan unik. Jika tautan tersebut dikunjungi, kami tahu bahwa Anda yang mengendalikan alamat email tersebut.
+
+      Saat mendaftar dan memposting, kami mencatat alamat IP dari mana posting tersebut berasal. Kami juga dapat menyimpan log server yang mencakup alamat IP setiap permintaan ke server kami.
+
+      <a name="use"></a>
+
+      ## [Untuk apa kami menggunakan informasi Anda?](#use)
+
+      Setiap informasi yang kami kumpulkan dari Anda dapat digunakan dengan salah satu cara berikut:
+
+      * Untuk mempersonalisasi pengalaman Anda &mdash; informasi Anda membantu kami untuk menanggapi kebutuhan pribadi Anda dengan lebih baik.
+      * Untuk meningkatkan situs kami &mdash; kami terus berusaha untuk meningkatkan penawaran situs kami berdasarkan informasi dan umpan balik yang kami terima dari Anda.
+      * Untuk meningkatkan layanan pelanggan &mdash; informasi Anda membantu kami untuk lebih efektif menanggapi permintaan layanan pelanggan dan kebutuhan dukungan Anda.
+      * Untuk mengirim email berkala &mdash; Alamat email yang Anda berikan dapat digunakan untuk mengirimkan informasi, pemberitahuan yang Anda minta tentang perubahan topik atau sebagai tanggapan atas nama pengguna Anda, menanggapi pertanyaan, dan / atau permintaan atau pertanyaan lainnya.
+
+      <a name="protect"></a>
+
+      ## [Bagaimana kami melindungi informasi Anda?](#protect)
+
+      Kami menerapkan berbagai langkah keamanan untuk menjaga keamanan informasi pribadi Anda saat Anda memasukkan, mengirimkan, atau mengakses informasi pribadi Anda.
+
+      <a name="data-retention"></a>
+
+      ## [Apa kebijakan penyimpanan data Anda?](#data-retention)
+
+      Kami akan melakukan upaya dengan iktikad baik untuk:
+
+      * Menyimpan log server yang berisi alamat IP semua permintaan ke server ini tidak lebih dari [JUMLAH HARI] hari.
+
+      <a name="cookies"></a>
+
+      ## [Apakah kami menggunakan cookie?](#cookies)
+
+      Ya. Cookie adalah file kecil yang ditransfer oleh situs atau penyedia layanannya ke hard drive komputer Anda melalui browser Web Anda (jika Anda mengizinkannya). Cookie ini memungkinkan situs untuk mengenali browser Anda dan, jika Anda memiliki akun terdaftar, mengaitkannya dengan akun terdaftar Anda.
+
+      Kami menggunakan cookie untuk memahami dan menyimpan preferensi Anda untuk kunjungan di masa mendatang dan mengumpulkan data agregat tentang lalu lintas situs dan interaksi situs sehingga kami dapat menawarkan pengalaman dan alat bantu situs yang lebih baik di masa mendatang. Kami dapat membuat kontrak dengan penyedia layanan pihak ketiga untuk membantu kami memahami pengunjung situs kami dengan lebih baik. Penyedia layanan ini tidak diizinkan untuk menggunakan informasi yang dikumpulkan atas nama kami kecuali untuk membantu kami menjalankan dan meningkatkan bisnis kami.
+
+      <a name="disclose"></a>
+
+      ## [Apakah kami mengungkapkan informasi apa pun kepada pihak luar?] (#disclose)
+
+      Kami tidak menjual, memperdagangkan, atau memindahkan informasi pribadi Anda kepada pihak luar. Hal ini tidak termasuk pihak ketiga tepercaya yang membantu kami dalam mengoperasikan situs kami, menjalankan bisnis kami, atau melayani Anda, selama pihak-pihak tersebut setuju untuk merahasiakan informasi ini. Kami juga dapat merilis informasi Anda jika kami yakin bahwa rilis tersebut sesuai untuk mematuhi hukum, menegakkan kebijakan situs kami, atau melindungi hak, properti, atau keselamatan kami atau orang lain. Namun, informasi pengunjung yang tidak dapat diidentifikasi secara pribadi dapat diberikan kepada pihak lain untuk pemasaran, periklanan, atau penggunaan lainnya.
+
+      <a name="third-party"></a>
+
+      ## [Tautan pihak ketiga] (#third-party)
+
+      Terkadang, atas kebijakan kami, kami dapat menyertakan atau menawarkan produk atau layanan pihak ketiga di situs kami. Situs pihak ketiga ini memiliki kebijakan privasi yang terpisah dan independen. Oleh karena itu, kami tidak bertanggung jawab atau berkewajiban atas konten dan aktivitas situs-situs yang tertaut ini. Meskipun demikian, kami berusaha untuk melindungi integritas situs kami dan menerima umpan balik tentang situs-situs ini.
+
+      <a name="coppa"></a>
+
+      ## [Kepatuhan terhadap Undang-Undang Perlindungan Privasi Online Anak](#coppa)
+
+      Situs, produk, dan layanan kami ditujukan untuk orang-orang yang berusia minimal 13 tahun atau lebih. Jika server ini berada di Amerika Serikat, dan Anda berusia di bawah 13 tahun, sesuai dengan persyaratan COPPA ([Children's Online Privacy Protection Act] (https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)), jangan gunakan situs ini.
+
+      <a name="online"></a>
+
+      ## [Kebijakan Privasi Online Saja](#online)
+
+      Kebijakan privasi online ini hanya berlaku untuk informasi yang dikumpulkan melalui situs kami dan tidak berlaku untuk informasi yang dikumpulkan secara offline.
+
+      <a name="consent"></a>
+
+      ## [Persetujuan Anda](#consent)
+
+      Dengan menggunakan situs kami, Anda menyetujui kebijakan privasi situs web kami.
+
+      <a name="changes"></a>
+
+      ## [Perubahan pada Kebijakan Privasi kami](#changes)
+
+      Jika kami memutuskan untuk mengubah kebijakan privasi kami, kami akan memposting perubahan tersebut di halaman ini.
+
+      Dokumen ini adalah CC-BY-SA. Terakhir kali diperbarui [MASUKKAN TANGGAL PEMBARUAN TERAKHIR DI SINI].
   badges:
     member:
       name: Anggota
@@ -1267,9 +1621,14 @@ id:
       name: Tautan terkenal
   tags:
     title: "Label"
+    limited_to_one_tag_from_group: "Tag %{tags} tidak dapat digunakan secara bersamaan. Harap sertakan salah satunya saja."
   finish_installation:
     resend_email:
       title: "Kirim Ulang Email Aktivasi"
+  safe_mode:
+    description: "Mode aman memungkinkan Anda menguji situs Anda tanpa memuat tema atau penyesuaian plugin client-side. Penyesuaian plugin server-side tetap diaktifkan."
+    no_unofficial_plugins: "Nonaktifkan penyesuaian plugin client-side tidak resmi"
+    no_plugins: "Nonaktifkan semua penyesuaian plugin client-side"
   wizard:
     step:
       introduction:
@@ -1292,7 +1651,9 @@ id:
                 label: "Kategori dan Topik Terbaru"
               categories_and_top_topics:
                 label: "Kategori dan Topik Teratas"
-  joined: "Joined"
+  onebox:
+    discourse:
+      user_joined_community: "Bergabung %{date}"
   reviewables:
     priorities:
       low: "Rendah"
@@ -1304,10 +1665,46 @@ id:
       medium: "Sedang"
       high: "Tinggi"
     actions:
+      agree:
+        title: "Ya"
+      agree_and_keep:
+        title: "Pertahankan post"
+        description: "Setuju dengan tandai tetapi pertahankan post ini tidak berubah."
+      agree_and_keep_hidden:
+        title: "Tetap sembunyikan post"
+        description: "Setuju dengan tandai dan tetap sembunyikan post."
+      agree_and_suspend:
+        title: "Tangguhkan pengguna"
+      agree_and_silence:
+        title: "Senyapkan pengguna"
+      agree_and_restore:
+        title: "Pulihkan post"
+      agree_and_hide:
+        title: "Sembunyikan pos"
+        description: "Setuju dengan penanda dan sembunyikan kiriman ini + secara otomatis mengirimkan pesan kepada pengguna yang mendesak mereka untuk mengeditnya."
       delete_single:
         title: "Hapus"
+      delete_and_ignore:
+        title: "Abaikan penanda dan hapus post"
+        description: "Abaikan penanda dengan menghapusnya dari antrean dan hapus post; jika post pertama, hapus topiknya juga. "
+      delete_and_ignore_replies:
+        title: "Abaikan penanda, hapus post dan balasan"
+        description: "Abaikan penanda dengan menghapusnya dari antrian, hapus kiriman dan semua balasannya; jika post pertama, hapus topiknya juga"
+      delete_and_agree:
+        title: "Hapus postingan"
+        description: "Setuju dengan menandai dan menghapus postingan ini; jika postingan pertama, hapus juga topiknya."
+      delete_and_agree_replies:
+        title: "Hapus postingan dan balasan"
+        description: "Setuju dengan penanda dan hapus post ini dan semua balasannya; jika post pertama, hapus topiknya juga."
+      disagree_and_restore:
+        title: "Tidak, pulihkan postingan"
+      disagree:
+        title: "Tidak"
       ignore:
         title: "Abaikan"
+      ignore_and_do_nothing:
+        title: "Tidak melakukan apapun"
+        description: "Abaikan penanda dengan menghapusnya dari antrean tanpa melakukan tindakan apa pun. Post tersembunyi akan tetap tersembunyi dan ditangani oleh alat otomatis."
       approve:
         title: "Terima"
       reject_user:
@@ -1317,6 +1714,11 @@ id:
       reject:
         title: "Tolak"
   fallback_username: "pengguna"
+  form_templates:
+    errors:
+      invalid_yaml: "bukan string YAML yang valid"
+      invalid_type: "berisi tipe templat yang tidak valid: %{type} (tipe yang valid adalah: %{valid_types})"
+      missing_type: "tidak dapat menemukan tipe bidang"
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index 92a415ec551..868933b06f8 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -52,6 +52,11 @@ it:
   remove_posts_deleted_by_author: "Cancellato dall'autore"
   redirect_warning: "Non è stato possibile verificare che il collegamento che hai selezionato sia stato effettivamente pubblicato sul forum. Se desideri procedere comunque, seleziona il collegamento qui sotto."
   on_another_topic: "Su un altro argomento"
+  topic_category_changed: "Da %{from} a %{to}"
+  topic_tag_changed:
+    added_and_removed: "Aggiunto %{added} e rimosso %{removed}"
+    added: "Aggiunto %{added}"
+    removed: "Ha rimosso %{removed}"
   inline_oneboxer:
     topic_page_title_post_number: "#%{post_number}"
     topic_page_title_post_number_by_user: "n°%{post_number} da %{username}"
@@ -191,8 +196,8 @@ it:
       invalid_site_setting: "Non esiste alcuna impostazione di nome '%{name}'"
       invalid_category_id: "Hai specificato una categoria che non esiste"
       invalid_choice:
-        one: "Hai specificato la scelta non valida %{name}"
-        other: "Hai specificato le scelte non valide %{name}"
+        one: "'%{name}' è una scelta non valida."
+        other: "'%{name}' sono scelte non valide."
       default_categories_already_selected: "Non puoi selezionare una categoria usata in un'altra lista."
       default_tags_already_selected: "Non è possibile selezionare un'etichetta utilizzata in un altro elenco."
       s3_upload_bucket_is_required: "Non è possibile attivare i caricamenti su S3 a meno che non imposti l'opzione 's3_upload_bucket'."
@@ -200,7 +205,8 @@ it:
       page_publishing_requirements: "La pubblicazione di pagine non può essere attivata se sono attivati i supporti sicuri."
       s3_backup_requires_s3_settings: "Non è possibile utilizzare S3 per i backup a meno che non sia stato fornito '%{setting_name}'."
       s3_bucket_reused: "Non puoi usare lo stesso bucket per 's3_upload_bucket' e 's3_backup_bucket'. Scegli un bucket differente, o un percorso diverso per ciascun bucket."
-      secure_uploads_requirements: "I caricamenti S3 devono essere abilitati prima di abilitare i caricamenti sicuri."
+      secure_uploads_requirements: "I caricamenti e gli ACL S3 devono essere abilitati prima di abilitare i caricamenti sicuri."
+      s3_use_acls_requirements: "Gli ACL S3 devono essere abilitati quando sono abilitati i caricamenti sicuri."
       share_quote_facebook_requirements: "Devi impostare un ID app Facebook per attivare la condivisione delle citazioni per Facebook."
       second_factor_cannot_enforce_with_socials: "Non si può applicare l'autenticazione a due fattori se l'acceso tramite social è attivo. Devi prima disattivarlo tramite %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Non è possibile applicare l'autenticazione a due fattori se gli accessi locali sono disabilitati."
@@ -221,6 +227,10 @@ it:
         other: "Siamo spiacenti, non è stato possibile generare un'anteprima per questa pagina web, perché i seguenti tag oEmbed / OpenGraph non sono stati trovati: %{missing_attributes}"
   word_connector:
     comma: ", "
+  custom_fields:
+    validations:
+      max_items: "È stato raggiunto il numero massimo di campi personalizzati per questa entità (%{max_items_number})"
+      max_value_length: "È stata raggiunta la lunghezza massima per un valore di campo personalizzato (%{max_value_length})"
   invite:
     expired: "Il tuo token di invito è scaduto. <a href='%{base_url}/about'>Contatta lo staff</a>."
     not_found: "Il tuo token di invito non è valido. <a href='%{base_url}/about'>Contatta lo staff</a>."
@@ -239,6 +249,7 @@ it:
     user_exists: "Non c'è bisogno di invitare <b>%{email}</b>: ha già un account!"
     invite_exists: "Hai già invitato <b>%{email}</b>."
     invalid_email: "%{email} non è un indirizzo email valido."
+    generic_error_response: "C'è stato un problema con la tua richiesta."
     rate_limit:
       one: "Hai già inviato %{count} invito nell'ultimo giorno; aspetta %{time_left} prima di riprovare."
       other: "Hai già inviato %{count} inviti nell'ultimo giorno; aspetta %{time_left} prima di riprovare."
@@ -400,6 +411,7 @@ it:
   too_late_to_edit: "Quel messaggio è stato creato troppo tempo fa. Non può più essere modificato né cancellato."
   edit_conflict: "Il messaggio è stato modificato da un altro utente e le tue modifiche non possono più essere salvate."
   revert_version_same: "La versione attuale è la stessa versione che stai cercando di ripristinare."
+  reverted_to_version: "ripristinata versione n. %{version}"
   cannot_edit_on_slow_mode: "Questo argomento è in modalità lenta. Per incoraggiare discussioni cortesi e ponderate, non è attualmente permesso modificare vecchi messaggi per questo argomento in tale modalità."
   excerpt_image: "immagine"
   bookmarks:
@@ -502,6 +514,7 @@ it:
       E' più facile per chiunque leggere argomenti che hanno poche risposte ma più dettagliate, rispetto a molte brevi risposte singole.
     dominating_topic: Hai pubblicato molte volte in questo argomento! Prendi in considerazione l'idea di dare ad altri l'opportunità di rispondere qui e discutere anche tra loro.
     get_a_room: Abbiamo notato che hai già risposto %{count} volte a @%{reply_username}. Sapevi che puoi anche scambiare messaggi personali con questa persona?
+    dont_feed_the_trolls: Questo messaggio è già stato segnalato all'attenzione del moderatore. Sei sicuro di voler rispondere? Le risposte a contenuti negativi tendono a incoraggiare altri comportamenti negativi.
     too_many_replies: |
       ### Hai raggiungo il limite di risposte per questo argomento
 
@@ -591,7 +604,9 @@ it:
         translation_overrides:
           attributes:
             value:
-              invalid_interpolation_keys: 'Le seguenti chiavi di interpolazione non sono valide: "%{keys}"'
+              invalid_interpolation_keys:
+                one: "La seguente chiave di interpolazione non è valida: \"%{keys}"
+                other: "Le seguenti chiavi di interpolazione non sono valide: \"%{keys}"
         watched_word:
           attributes:
             word:
@@ -612,22 +627,22 @@ it:
   staff_category_name: "Staff"
   staff_category_description: "Categoria privata per discussioni dello staff. Gli argomenti sono visibili solo agli amministratori e ai moderatori."
   discourse_welcome_topic:
-    title: "Ti diamo il benvenuto nella nostra community!"
-    body: |2
+    title: "Benvenuto su %{site_title}! :wave:"
+    body: |
+      Siamo lieti che tu abbia voluto partecipare con noi.
 
-      Il primo paragrafo di questo argomento appuntato sarà visibile come messaggio di benvenuto a tutti i nuovi visitatori sulla tua homepage. È importante!
+      %{site_info_quote}
 
-      **Modificalo** con una breve descrizione della tua comunità:
+      Ecco alcune cose che puoi fare per iniziare:
 
-      - A chi è rivolto?
-      - Cosa possono trovare qui?
-      - Perché dovrebbero venire qui?
-      - Dove possono saperne di più (collegamenti, risorse, ecc)?
+      :speaking_head: **Presentati** aggiungendo la tua foto e informazioni su di te e sui tuoi interessi al [tuo profilo](%{base_path}/my/preferences/account). Qual è una cosa che vorresti che ti chiedessero?
 
-      <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+      :open_book: **Scopri la community** [sfogliando le discussioni](%{base_path}/top) che si stanno già svolgendo qui. Quando trovi un messaggio interessante, informativo o divertente, usa :heart: per mostrare il tuo apprezzamento o supporto!
 
-      Potresti chiudere questo argomento tramite la :wrench: per amministratori (in alto a destra e in basso), in modo che le risposte non si accumulino sull'annuncio.
-  admin_quick_start_title: "DA LEGGERE SUBITO: Guida Rapida per Amministratore"
+      :handshake: **Contribuisci** commentando, condividendo il tuo punto di vista, ponendo domande o offrendo feedback durante la discussione. Prima di rispondere o iniziare nuovi argomenti, consulta le [Linee guida della community](%{base_path}/faq).
+
+      > Se hai bisogno di aiuto o hai un suggerimento, non esitare a chiedere in [#feedback](%{base_path}/c/site-feedback) o [contatta gli amministratori](%{base_path}/about).
+  admin_quick_start_title: "Guida dell'amministratore: come iniziare"
   category:
     topic_prefix: "Definizione della categoria %{category}"
     replace_paragraph: "(Sostituisci questo primo paragrafo con una breve descrizione della tua nuova categoria. Questa guida verrà mostrata nell'area di scelta categoria, quindi rimani sotto i 200 caratteri.)"
@@ -646,6 +661,7 @@ it:
       disallowed_tags_generic: "Su questo argomento non sono consentite etichette."
       slug_contains_non_ascii_chars: "contiene caratteri non-ascii"
       is_already_in_use: "è già in uso"
+      move_topic_to_category_disallowed: "Non puoi spostare questo argomento in una categoria in cui non sei autorizzato a creare nuovi argomenti."
     cannot_delete:
       uncategorized: "Questa è una categoria speciale. È utilizzata come area di attesa per gli argomenti senza categoria. Non può essere eliminata."
       has_subcategories: "Non puoi cancellare questa categoria perché ha sotto-categorie."
@@ -1109,7 +1125,7 @@ it:
       title: "DAU/MAU"
       xaxis: "Giorno"
       yaxis: "DAU/MAU"
-      description: "Numero di utenti che hanno effettuato l'accesso nell'ultimo giorno diviso per il numero di utenti che hanno effettuato l'accesso nell'ultimo mese: restituisce una % che rappresenta 'l'attaccamento' alla comunità. Obiettivo > 30%."
+      description: "Numero di utenti che hanno effettuato l'accesso nell'ultimo giorno diviso per il numero di utenti che hanno effettuato l'accesso nell'ultimo mese: restituisce una % che rappresenta 'l'attaccamento' alla comunità. Obiettivo > 20%."
     daily_engaged_users:
       title: "Utenti Impegnati Giornalmente"
       xaxis: "Giorno"
@@ -1378,6 +1394,7 @@ it:
     image_magick_warning: 'Il server è configurato per creare miniature di immagini di grandi dimensioni, ma ImageMagick non è installato. Installa ImageMagick usando il tuo gestore di pacchetti preferito o <a href="https://www.imagemagick.org/script/download.php" target="_blank">scarica l''ultima versione</a> .'
     failing_emails_warning: 'Ci sono %{num_failed_jobs} processi di posta elettronica non andati a buon fine. Controlla il tuo file app.yml e assicurati che le impostazioni del server di posta siano corrette. <a href="%{base_path}/sidekiq/retries" target="_blank">Vedi i processi non riusciti in Sidekiq</a> .'
     subfolder_ends_in_slash: "L'impostazione della sottocartella è errata; DISCOURSE_RELATIVE_URL_ROOT finisce con uno slash."
+    outdated_translations_warning: "Alcune delle tue modifiche alla traduzione non sono aggiornate. Controlla le personalizzazioni del testo di <a href='%{base_path}/admin/customize/site_texts?outdated=true'></a>."
     email_polling_errored_recently:
       one: "Il polling delle email ha generato un errore nelle ultime 24 ore. Controlla <a href='%{base_path}/logs' target='_blank'>i log</a> per maggiori dettagli."
       other: "Il polling delle email ha generato %{count} errori nelle ultime 24 ore. Controlla <a href='%{base_path}/logs' target='_blank'>i log</a> per maggiori dettagli."
@@ -1389,6 +1406,8 @@ it:
     out_of_date_themes: "Sono disponibili aggiornamenti per i seguenti temi:"
     unreachable_themes: "Non è stato possibile verificare la presenza di aggiornamenti per i seguenti temi:"
     watched_word_regexp_error: "L'espressione regolare per le parole osservate %{action} non è valida. Per favore verifica le tue <a href='%{base_path}/admin/customize/watched_words'>Impostazioni sulle Parole Osservate</a>, o disabilita l'impostazione del sito 'watched words regular expressions'."
+    v3_analytics_deprecated: "Il tuo Discourse utilizza attualmente Google Analytics 3, che non sarà più supportato dopo luglio 2023. <a href='https://meta.discourse.org/t/260498'>Passa a Google Analytics 4</a> ora per continuare a ricevere preziose informazioni e analisi per le prestazioni del tuo sito web."
+    legacy_navigation_menu_deprecated: "Il tuo Discourse sta attualmente utilizzando il menu di navigazione \"legacy\" che <a href='https://meta.discourse.org/t/removing-the-legacy-hamburger-navigation-menu-option/265274'>verrà rimosso nella prima versione beta di Discourse 3.2</a>. Passa al nuovo menu di navigazione aggiornando la tua impostazione <a href='%{base_path}/admin/site_settings/category/all_results?filter=navigation_menu'>del sito del menu di navigazione</a> su \"barra laterale\" o \"elenco a discesa dell'intestazione\"."
   site_settings:
     allow_bulk_invite: "Consenti inviti di massa caricando un file CSV"
     disabled: "disabilitato"
@@ -1454,8 +1473,11 @@ it:
     fixed_category_positions_on_create: "Se attivata, verrà mantenuto l'ordinamento delle categorie nella finestra di creazione argomenti (richiede fixed_category_positions)."
     add_rel_nofollow_to_user_content: 'Aggiungi l''attributo rel nofollow a tutti i contenuti degli utenti, tranne per i link interni (compresi i domini di livello superiore). Se modifichi questa opzione devi aggiornare tutti i messaggi con il comando "rake posts:rebake"'
     exclude_rel_nofollow_domains: "Un elenco di domini dove l'attributo nofollow non dovrebbe essere aggiunto ai collegamenti. \"esempio.com\" consentirà automaticamente anche \"sub.esempio.com\". Come minimo si dovrebbe aggiungere il dominio di questo sito per aiutare i web crawler a trovare tutti i contenuti. Se altre parti del tuo sito web sono in altri domini, aggiungi anche quelle."
+    max_form_template_title_length: "Lunghezza massima consentita per i titoli dei modelli di modulo."
+    max_form_template_content_length: "Lunghezza massima consentita per il contenuto del modello di modulo."
     post_excerpt_maxlength: "Lunghezza massima dell'estratto / riassunto di un messaggio."
     topic_excerpt_maxlength: "Lunghezza massima di un estratto / riepilogo di un argomento, generato dal primo messaggio di un argomento."
+    default_subcategory_on_read_only_category: "Abilita il pulsante 'Nuovo argomento' e seleziona una sottocategoria predefinita da inserire nelle categorie in cui l'utente non è autorizzato a creare un nuovo argomento."
     show_pinned_excerpt_mobile: "Mostra estratti sugli argomenti appuntati nella visualizzazione in mobilità."
     show_pinned_excerpt_desktop: "Mostra estratti sugli argomenti appuntati nella vista desktop."
     post_onebox_maxlength: "Lunghezza massima in caratteri di un messaggio Discourse in Onebox."
@@ -1477,7 +1499,7 @@ it:
     manifest_icon: "Immagine utilizzata come immagine logo / splash su Android. Verrà automaticamente ridimensionato a 512 × 512. Se lasciato vuoto, verrà utilizzato large_icon."
     manifest_screenshots: "Schermate che mostrano le caratteristiche e le funzionalità nella pagina di installazione. Tutte le immagini devono essere caricate in locale e delle stesse dimensioni."
     favicon: "Una favicon per il tuo sito, vedi <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://en.wikipedia.org/wiki/Favicon</a> . Per funzionare correttamente su un CDN deve essere un'immagine PNG. Verrà ridimensionata a 32x32. Se lasciato vuoto, verrà usato large_icon."
-    apple_touch_icon: "Icona utilizzata per i dispositivi touch Apple. Verrà automaticamente ridimensionato a 180x180. Se lasciato vuoto, verrà usato large_icon."
+    apple_touch_icon: "Icona utilizzata per i dispositivi touch Apple. Si sconsiglia l'uso di sfondi trasparenti.Verrà automaticamente ridimensionata a 180x180. Se lasciata vuota, verrà usato il formato large_icon."
     opengraph_image: "Immagine opengraph predefinita, utilizzata quando la pagina non ha altre immagini adatte. Se lasciato vuoto, verrà usato large_icon"
     twitter_summary_large_image: "Opzione 'Summary large image' di una scheda Twitter (deve misurare almeno 280 di larghezza e almeno 150 di altezza e non può essere un'imagine .svg). Se lasciato vuoto, i normali metadati delle schede vengono generati utilizzando l'opzione opengraph_image, a meno che l'immagine non sia un file .svg."
     notification_email: "L'indirizzo presente nel campo from: usato per inviare tutte le email essenziali di sistema. Il dominio indicato deve avere i record SPF, DKIM e reverse PTR impostati correttamente perché l'email arrivi."
@@ -1493,6 +1515,8 @@ it:
     summary_percent_filter: "Quando un utente clicca su 'Riassumi Questo Argomento', mostra i primi % messaggi"
     summary_max_results: "Messaggi massimi restituiti da 'Riassumi questo argomento'."
     summary_timeline_button: "Mostra un pulsante \"Riassumi\" nella timeline"
+    summarization_strategy: "Altri modi per riassumere i contenuti registrati dai plugin"
+    custom_summarization_allowed_groups: "Gruppi autorizzati a riassumere i contenuti utilizzando la `summarization_strategy`."
     enable_personal_messages: "Impostazione DEPRECATA, usare l'impostazione 'personal message enabled groups' al suo posto. Autorizza gli utenti con livello di attendibilità 1 (configurabile attraverso l'opzione \"min livello di attendibilità per l'invio di messaggi\") a creare e rispondere ai messaggi. Nota che lo staff può inviare messaggi in ogni caso."
     personal_message_enabled_groups: "Consenti agli utenti all'interno di questi gruppi di creare messaggi e rispondere ai messaggi. I gruppi dei livelli di attendibilità comprendono tutti i livelli al di sopra di tale numero, ad esempio la scelta di trust_level_1 consente anche agli utenti trust_level_2, 3, 4 di inviare MP. Tieni presente che lo staff può sempre inviare messaggi in ogni caso."
     enable_system_message_replies: "Consente agli utenti di rispondere ai messaggi di sistema, anche se i messaggi personali sono disabilitati"
@@ -1587,6 +1611,7 @@ it:
     enable_badges: "Attiva il sistema a distintivi"
     max_favorite_badges: "Numero massimo di distintivi che l'utente può selezionare"
     whispers_allowed_groups: "Consenti la comunicazione privata all'interno degli argomenti per i membri di gruppi specifici."
+    hidden_post_visible_groups: "Consenti ai membri di questi gruppi di visualizzare i messaggi nascosti. Gli utenti dello staff possono sempre visualizzare i messaggi nascosti."
     allow_index_in_robots_txt: "Specifica in robots.txt che questo sito permette l'indicizzazione da parte dei motori di ricerca. In casi eccezionali puoi permanentemente <a href='%{base_path}/admin/customize/robots'>ignorare robots.txt</a>."
     blocked_email_domains: "Un elenco delimitato da barre verticali di domini email con cui gli utenti non sono autorizzati a registrare account. I sottodomini vengono gestiti automaticamente per i domini specificati. Simboli jolly * e ? non sono supportati. Esempio: mailinator.com|trashmail.net"
     allowed_email_domains: "Un elenco delimitato da barre verticali di domini email con cui gli utenti DEVONO registrare account. I sottodomini vengono gestiti automaticamente per i domini specificati. Simboli jolly * e ? non sono supportati. ATTENZIONE: Non saranno ammessi utenti con domini email diversi da quelli elencati!"
@@ -1613,7 +1638,7 @@ it:
     enable_discourse_connect: "Abilita l'accesso tramite DiscourseConnect (già \"Discourse SSO\") (ATTENZIONE: GLI INDIRIZZI E-MAIL DEGLI UTENTI *DEVONO* ESSERE CONVALIDATI DAL SITO ESTERNO!)"
     verbose_discourse_connect_logging: "Registra informazioni di diagnostica dettagliate relative a DiscourseConnect su <a href='%{base_path}/logs' target='_blank'>/logs</a>"
     enable_discourse_connect_provider: "Implementa il protocollo del fornitore DiscourseConnect (già \"Discourse SSO\") nell'endpoint /session/sso_provider. È necessario che sia impostata l'opzione discourse_connect_provider_secrets"
-    discourse_connect_url: "URL dell'endpoint DiscourseConnect (deve includere http:// o https://)"
+    discourse_connect_url: "URL dell'endpoint DiscourseConnect (deve includere http:// o https:// e non deve includere una barra finale)"
     discourse_connect_secret: "Stringa segreta utilizzata per l'autenticazione tramite crittografia delle informazioni DiscourseConnect, deve essere lunga almeno 10 caratteri"
     discourse_connect_provider_secrets: "Un elenco di coppie dominio-segreto che utilizzano DiscourseConnect. Assicurati che il segreto di DiscourseConnect sia lungo almeno 10 caratteri. Il simbolo jolly * può essere utilizzato per indicare qualsiasi dominio o solo una parte di esso (ad esempio *. Esempio.com)."
     discourse_connect_overrides_bio: "Sovrascrive la biografia utente nel profilo utente ed impedisce agli utenti di cambiarla"
@@ -1627,7 +1652,7 @@ it:
     discourse_connect_overrides_profile_background: "Sostituisce lo sfondo del profilo utente con il valore dal payload DiscourseConnect."
     discourse_connect_overrides_card_background: "Sostituisce lo sfondo della scheda utente con il valore dal payload DiscourseConnect."
     discourse_connect_not_approved_url: "Reindirizza gli account DiscourseConnect non approvati a questo URL"
-    discourse_connect_allows_all_return_paths: "Non restringere il dominio per i return_paths forniti da DiscourseConnect (per impostazione predefinita il percorso di ritorno deve essere sul sito corrente)"
+    discourse_connect_allowed_redirect_domains: "Limita a questi domini per return_paths forniti da DiscourseConnect (per impostazione predefinita, il percorso di ritorno deve essere sul sito corrente). Utilizzare * per consentire qualsiasi dominio per il percorso di ritorno. I caratteri jolly del sottodominio (`*.foobar.com`) non sono consentiti."
     enable_local_logins: "Abilita gli account di accesso basati su nome utente e password locali. ATTENZIONE: se questa impostazione è disabilitata, potrebbe essere impossibile accedere senza aver precedentemente configurato almeno un metodo di accesso alternativo."
     enable_local_logins_via_email: "Consenti agli utenti di richiedere un collegamento di accesso usa e getta, che gli verrà inviato tramite email."
     allow_new_registrations: "Abilita la registrazione di nuovi utenti. Se l'opzione è deselezionata, non sarà possibile creare nuovi account."
@@ -1663,6 +1688,7 @@ it:
     s3_configure_tombstone_policy: "Abilita la cancellazione automatica per i caricamenti cestinati. IMPORTANTE: se disabilitato, nessuno spazio verrà recuperato dopo aver eliminato i caricamenti."
     s3_disable_cleanup: "Impedisci la rimozione dei vecchi backup da S3 quando ci sono più backup del massimo consentito."
     enable_s3_inventory: "Genera rapporti e verifica i caricamenti utilizzando l'inventario Amazon S3. IMPORTANTE: richiede credenziali S3 valide (sia l'access key id che la secret access key)."
+    s3_use_acls: "AWS consiglia di non utilizzare gli ACL sui bucket S3; se stai seguendo questo consiglio, deseleziona questa opzione. L'opzione deve essere abilitata se si utilizzano caricamenti protetti."
     backup_time_of_day: "Ora del giorno in UTC in cui eseguire il backup."
     backup_with_uploads: "Includi i caricamenti nei backup programmati. Se l'opzione è disabilitata verrà eseguito il backup del solo database."
     backup_location: "Posizione in cui sono archiviati i backup. IMPORTANTE: S3 richiede credenziali S3 valide immesse nelle impostazioni File."
@@ -1712,6 +1738,7 @@ it:
     s3_secret_access_key: "L'Amazon S3 secret access key che verrà utilizzata per caricare immagini, allegati e backup."
     s3_region: "Il nome della regione Amazon S3 che verrà utilizzato per caricare immagini e backup."
     s3_cdn_url: "URL della CDN da usare per tutte le risorse s3 (ad esempio: https://cdn.somewhere.com). ATTENZIONE: dopo aver cambiato questa impostazione devi aggiornare tutti i vecchi messaggi."
+    s3_use_cdn_url_for_all_uploads: "Usa l'URL CDN per tutti i file caricati su s3 invece che solo per le immagini."
     avatar_sizes: "Elenco delle dimensioni degli avatar, generate automaticamente."
     external_system_avatars_enabled: "Utilizza un servizio esterno per gli avatar."
     external_system_avatars_url: "URL del servizio esterno di avatar. Le sostituzioni consentite sono {username} {first_letter} {color} {size}"
@@ -1760,7 +1787,9 @@ it:
     tl3_requires_likes_given: "Numero minimo di mi piace che devono essere dati negli ultimi (tl3 time period) giorni per essere idonei alla promozione al livello di attendibilità 3."
     tl3_requires_likes_received: "Numero minimo di mi piace che devono essere ricevuti negli ultimi (tl3 time period) giorni per essere idonei alla promozione al livello di attendibilità 3."
     tl3_links_no_follow: "Non rimuovere rel=nofollow dai collegamenti pubblicati da utenti con livello di attendibilità 3."
-    trusted_users_can_edit_others: "Consenti agli utenti con livelli di attendibilità elevati di modificare il contenuto di altri utenti"
+    tl4_delete_posts_and_topics: "Consenti agli utenti TL4 di eliminare messaggi e argomenti creati da altri utenti. Gli utenti TL4 potranno anche vedere argomenti e messaggi eliminati."
+    edit_all_topic_groups: "Consenti agli utenti di questo gruppo di modificare i titoli, i tag e le categorie degli argomenti di altri utenti"
+    edit_all_post_groups: "Consenti agli utenti di questo gruppo di modificare i post di altri utenti"
     min_trust_to_create_topic: "Livello minimo richiesto per creare un nuovo argomento."
     allow_flagging_staff: "Se abilitato, gli utenti possono segnalare i messaggi dagli account dello staff."
     min_trust_to_edit_wiki_post: "Livello minimo richiesto per modificare un argomento segnato come wiki."
@@ -1796,7 +1825,7 @@ it:
     title_min_entropy: "Minima entropia (caratteri unici) richiesti come titolo di un argomento."
     body_min_entropy: "Minima entropia (caratteri unici) richiesti come corpo di un messaggio."
     allow_uppercase_posts: "Permetti l'uso di tutti caratteri maiuscoli nel titolo di argomento o nel corpo di un messaggio. "
-    max_consecutive_replies: "Numero di messaggi consecutivi che un utente deve scrivere in un Argomento prima di impedirgli di aggiungere un'altra risposta."
+    max_consecutive_replies: "Numero di post consecutivi che un utente può inserire in un argomento prima che gli venga impedito di aggiungere un'altra risposta. Questo limite non si applica al proprietario dell'argomento, allo staff del sito o ai moderatori di categoria."
     enable_filtered_replies_view: 'Il pulsante "(n) risposte" comprime tutti gli altri messaggi e mostra solo quello corrente e le sue risposte.'
     title_fancy_entities: "Converti i comuni caratteri ASCII in fantasiose entità HTML nei titoli degli argomenti, come in SmartyPants <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</a>"
     min_title_similar_length: "Lunghezza minima di un titolo che attiva il controllo su argomenti simili."
@@ -1876,6 +1905,11 @@ it:
     block_auto_generated_emails: "Bloccare le email in arrivo identificate come generate automaticamente."
     ignore_by_title: "Ignora le email in arrivo in base al loro titolo."
     mailgun_api_key: "Chiave API Segreta di Mailgun usata per verificare i messaggi webhook. "
+    sendgrid_verification_key: "Chiave di verifica Sendgrid utilizzata per verificare i messaggi webhook."
+    mailjet_webhook_token: "Token utilizzato per verificare il payload del webhook. Deve essere passato come parametro di query 't' del webhook, ad esempio: https://example.com/webhook/mailjet?t=supersecret"
+    mandrill_authentication_key: "Chiave di autenticazione Mandrill usata per verificare i messaggi webhook."
+    postmark_webhook_token: "Token utilizzato per verificare il payload del webhook. Deve essere passato come parametro di query 't' del webhook, ad esempio: https://example.com/webhook/postmark?t=supersecret"
+    sparkpost_webhook_token: "Token utilizzato per verificare il payload del webhook. Deve essere passato come parametro di query 't' del webhook, ad esempio: https://example.com/webhook/sparkpost?t=supersecret"
     soft_bounce_score: "Messaggio rimbalzato aggiunto all'utente quando si verifica un rimbalzo temporaneo."
     hard_bounce_score: "Messaggio rimbalzato aggiunto all'utente quando si verifica un rimbalzo definitivo."
     bounce_score_threshold: "Numero massimo di messaggi rimbalzati prima di interrompere l'invio di email ad un utente."
@@ -1903,7 +1937,7 @@ it:
     pop3_polling_password: "La password dell'account POP3 per la ricezione di email."
     pop3_polling_delete_from_server: "Elimina email dal server. NOTA: se disabiliti questa opzione, devi pulire manualmente la tua casella di posta"
     log_mail_processing_failures: "Registra tutti gli errori di elaborazione della posta elettronica in <a href='%{base_path}/logs' target='_blank'>/logs</a>"
-    email_in: 'Permetti agli utenti di pubblicare nuovi argomenti via email (richiede il polling manuale o pop3). Configura gli indirizzi nella scheda "Impostazioni" di ciascuna categoria. '
+    email_in: "Consenti agli utenti di pubblicare nuovi argomenti via email. Dopo aver abilitato questa impostazione, sarai in grado di configurare gli indirizzi email in entrata per gruppi e categorie."
     email_in_min_trust: "Livello di attendibilità minimo necessario affinché un utente possa pubblicare nuovi argomenti via email."
     email_in_authserv_id: "L'identificatore del servizio che esegue i controlli di autenticazione sulle e-mail in arrivo. Consulta <a href='https://meta.discourse.org/t/134358'>https://meta.discourse.org/t/134358</a> per istruzioni su come configurare questa opzione."
     email_in_spam_header: "L'intestazione dell'email per segnalare contenuti spam."
@@ -1949,6 +1983,7 @@ it:
     enable_category_group_moderation: "Consenti ai gruppi di moderare i contenuti in categorie specifiche"
     group_in_subject: "Imposta %%{optional_pm} nell'oggetto dell'email con il nome del primo gruppo in Messaggio Privato, vedi: <a href='https://meta.discourse.org/t/customize-specific-email-templates/88323' target='_blank'>Personalizza il formato oggetto per le e-mail standard</a>"
     allow_anonymous_posting: "Permetti agli utenti di passare alla modalità anonima"
+    allow_anonymous_likes: "Consenti agli utenti anonimi di mettere mi piace ai messaggi"
     anonymous_posting_min_trust_level: "Livello di attendibilità minimo richiesto per abilitare la pubblicazione in modalità anonima"
     anonymous_account_duration_minutes: "Per proteggere l'anonimato creare un nuovo account anonimo ogni N minuti per ogni utente. Esempio: se impostato a 600, non appena passano 600 minuti dall'ultimo messaggio E l'utente passa in modalità anonima, viene creato un nuovo account anonimo."
     hide_user_profiles_from_public: "Disabilita schede utenti, profili utenti e directory utenti per gli utenti anonimi."
@@ -1967,6 +2002,7 @@ it:
     allow_profile_backgrounds: "Permetti agli utenti di caricare immagini di sfondo per il profilo."
     sequential_replies_threshold: "Numero di messaggi che un utente deve pubblicare di fila in un argomento prima che gli venga ricordato delle troppe risposte sequenziali."
     get_a_room_threshold: "Numero di messaggi che un utente deve inviare alla stessa persona nello stesso argomento prima di essere avvertito."
+    dont_feed_the_trolls_threshold: "Numero di segnalazioni da parte di altri utenti prima di essere avvisati."
     enable_mobile_theme: "I dispositivi mobili usano un tema apposito, con possibilità di passare alla visualizzazione completa. Disabilita questa opzione se vuoi usare un foglio di stile personalizzato che sia completamente reattivo."
     dominating_topic_minimum_percent: "Quale percentuale di messaggi un utente deve pubblicare in un argomento prima di essere avvertito che sta intervenendo eccessivamente nell'argomento."
     disable_avatar_education_message: "Disabilita il messaggio educativo per cambiare avatar"
@@ -1976,22 +2012,22 @@ it:
     permalink_normalizations: "Applicare il seguente regex prima di accedere ai permalink, ad esempio: /(topic.*)\\?.*/\\1 eliminerà le stringhe query dalla route degli argomenti. Il formato è regex+string use \\1 ecc. per accedere alle acquisizioni"
     global_notice: "Mostra un banner di avviso globale URGENTE, EMERGENZA, non eliminabile a tutti i visitatori, impostare l'opzione vuota per nasconderlo (HTML consentito)."
     disable_system_edit_notifications: "Disabilita le notifiche di modifica dall'utente system quando 'download_remote_images_to_local' è attivo."
-    disable_category_edit_notifications: "Disabilita le notifiche di modifica delle categorie negli argomenti."
-    disable_tags_edit_notifications: "Disabilita le notifiche di modifica delle etichette sugli argomenti."
+    disable_category_edit_notifications: "Disabilita le notifiche per le modifiche alle categorie di argomenti."
+    disable_tags_edit_notifications: "Disabilita le notifiche per le modifiche ai tag dell'argomento."
     notification_consolidation_threshold: "Il numero di notifiche per richieste di adesione o di \"Mi piace\" ricevuti prima che le notifiche vengano raccolte in una sola. Impostare il valore a 0 per disabilitare l'opzione."
     likes_notification_consolidation_window_mins: "Durata in minuti del periodo in cui le notifiche dei \"mi piace\" sono raccolte in un'unica notifica una volta raggiunta la soglia definita. La soglia può essere configurata tramite l'impostazione `SiteSetting.notification_consolidation_threshold`."
     automatically_unpin_topics: "Spunta automaticamente gli argomenti quando l'utente arriva in fondo."
     read_time_word_count: "Conteggio di parole al minuto per calcolare il tempo stimato di lettura."
     topic_page_title_includes_category: "La pagina dell'argomento <a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title' target='_blank'>titolo etichetta</a> include il nome della categoria."
-    native_app_install_banner_ios: "Visualizza il banner delle app DiscourseHub su dispositivi iOS agli utenti regolari (livello di attendibilità 1 e superiori)."
-    native_app_install_banner_android: "Visualizza il banner delle app DiscourseHub sui dispositivi Android agli utenti regolari (livello di attendibilità 1 e successivi)."
+    native_app_install_banner_ios: "Visualizza il banner delle app DiscourseHub su dispositivi iOS agli utenti regolari (livello di attendibilità 1) e superiori."
+    native_app_install_banner_android: "Visualizza il banner delle app DiscourseHub sui dispositivi Android agli utenti regolari (livello di attendibilità 1) e superiori."
     app_association_android: "Contenuti dell'endpoint <a href='%{base_path}/.well-known/assetlinks.json'>.well-known/assetlinks.json</a>, usato dall'API Digital Asset Links di Google."
     app_association_ios: "Contenuti dell'endpoint <a href='%{base_path}/apple-app-site-association'>apple-app-site-association</a> , utilizzato per creare link universali tra questo sito e le app iOS."
     share_anonymized_statistics: "Condividi statistiche anonime di utilizzo."
     auto_handle_queued_age: "Gestisci automaticamente i record che sono in attesa di essere rivisti dopo tale numero di giorni. Le segnalazioni saranno ignorate. I messaggi in attesa e gli utenti saranno rifiutati. Impostare su 0 per disattivare questa funzionalità."
     penalty_step_hours: "Penalità predefinite per silenziare o sospendere gli utenti definite in ore. La prima infrazione porta una penalità pari al primo valore, la seconda infrazione porta una penalità pari al secondo valore, ecc."
     svg_icon_subset: "Aggiungi ulteriori icone FontAwesome 5 che desideri includere nelle tue risorse. Usa il prefisso 'fa-' per le icone solide, 'far-' per le icone regolari e 'fab-' per le icone di marchi."
-    max_prints_per_hour_per_user: "Numero massimo di pagine da stampare (imposta a 0 per disattivare)"
+    max_prints_per_hour_per_user: "Numero massimo di pagine da stampare (imposta a 0 per disattivare stampa)"
     full_name_required: "Il nome completo è un campo obbligatorio del profilo utente."
     enable_names: "Mostra il nome completo dell'utente su profilo, scheda utente e email. Disabilita per nascondere il nome completo ovunque."
     display_name_on_posts: "Mostra il nome completo dell'utente sui messaggi oltre allo @username."
@@ -2012,17 +2048,13 @@ it:
     allowed_href_schemes: "Schemi consentiti nei collegamenti in aggiunta a http e https."
     embed_post_limit: "Numero massimo di messaggi da incorporare."
     embed_username_required: "Il nome utente è obbligatorio per la creazione di argomenti."
-    notify_about_flags_after: "Se ci sono segnalazioni che non sono state gestite dopo tale numero di ore, invia un messaggio personale ai moderatori. Impostare su 0 per disabilitare."
-    show_create_topics_notice: "Se il sito ha meno di 5 argomenti pubblici, mostra un avviso chiedendo agli amministratori di creare qualche argomento."
+    notify_about_reviewable_item_after: "Se ci sono segnalazioni di elementi da rivedere che non sono state gestite dopo tale numero di ore, invia un messaggio personale ai moderatori. Impostare su 0 per disabilitare."
     delete_drafts_older_than_n_days: "Elimina bozze più vecchie di (n) giorni."
     delete_merged_stub_topics_after_days: "Numero di giorni di attesa prima di eliminare automaticamente gli argomenti stub completamente uniti. Impostare a 0 per non eliminare mai gli argomenti stub."
-    bootstrap_mode_min_users: "Numero minimo di utenti richiesto per disabilitare la modalità bootstrap (imposta a 0 per disattivare)"
+    bootstrap_mode_min_users: "Numero minimo di utenti richiesto per disabilitare la modalità bootstrap (imposta a 0 per disattivare, può richiedere fino a 24 ore)"
     prevent_anons_from_downloading_files: "Impedisci agli utenti anonimi di scaricare allegati."
-    secure_media: "Opzione DEPRECATA: utilizzare al suo posto l'impostazione secure_uploads, verrà rimossa in Discourse 3.0."
     secure_uploads: 'Limita l''accesso a TUTTI i caricamenti (immagini, video, audio, testo, pdf, zip, ecc.). Se l''opzione “accesso richiesto” è attivata, solo gli utenti registrati possono accedere ai caricamenti. In caso contrario, l''accesso sarà limitato solo per i media caricati in messaggi privati e categorie private. ATTENZIONE: Questa impostazione è complessa e richiede una profonda competenza amministrativa. Per maggiori dettagli visita <a target="_blank" href="https://meta.discourse.org/t/-/140017">l''argomento sui caricamenti sicuri su Meta</a>.'
-    secure_media_allow_embed_images_in_emails: "Opzione DEPRECATA: utilizzare al suo posto l'impostazione secure_uploads_allow_embed_images_in_emails, sarà rimossa in Discourse 3.0."
     secure_uploads_allow_embed_images_in_emails: "Consente l'integrazione di immagini sicure che normalmente verrebbero oscurate nelle e-mail, se la loro dimensione è inferiore al valore dell'i'impostazione 'dimensione max in kb immagini da integrare nelle email per caricamenti protetti'."
-    secure_media_max_email_embed_image_size_kb: "Opzione DEPRECATA: utilizzare al suo posto l'impostazione secure_uploads_max_email_embed_image_size_kb, sarà rimossa in Discourse 3.0."
     secure_uploads_max_email_embed_image_size_kb: "Limite di dimensione per le immagini protette che verranno incorporate nelle e-mail se l'impostazione \"secure upload allow embed in emails\" è abilitata. Se tale impostazione non è abilitata, anche questa non avrà alcun effetto."
     slug_generation_method: "Scegli un metodo di generazione delle abbreviazioni. 'encoded' genererà la stringa di codifica percentuale. 'none' disattiverà completamente le abbreviazioni."
     enable_emoji: "Attiva gli emoji"
@@ -2030,6 +2062,7 @@ it:
     emoji_set: "Come ti piacerebbero le tue emoji?"
     emoji_autocomplete_min_chars: "Numero minimo di caratteri richiesti per attivare il popup emoji con completamento automatico"
     enable_inline_emoji_translation: "Abilita la traduzione per gli emoji in linea (senza spazio o punteggiatura precedente)"
+    emoji_deny_list: "Queste emoji non saranno disponibili per l'uso nei menu o nei codici brevi."
     approve_post_count: "La quantità di messaggi di un utente nuovo o di base che deve essere approvata"
     approve_unless_trust_level: "I messaggi degli utenti al di sotto di questo livello di attendibilità devono essere approvati"
     approve_new_topics_unless_trust_level: "I nuovi argomenti degli utenti al di sotto di questo livello di attendibilità devono essere approvati"
@@ -2084,18 +2117,26 @@ it:
     default_tags_watching_first_post: "Etichette in cui il primo messaggio di ogni nuovo argomento sarà \"in osservazione\" per impostazione predefinita."
     default_text_size: "Dimensione del testo selezionata per impostazione predefinita"
     default_title_count_mode: "Modalità predefinita per il contatore del titolo della pagina"
+    enable_offline_indicator: "Mostra un messaggio agli utenti quando viene rilevato che non dispongono di connessione di rete"
+    default_sidebar_link_to_filtered_list: "Per impostazione predefinita, collega i link del menu di navigazione all'elenco filtrato."
+    default_sidebar_show_count_of_new_items: "Per impostazione predefinita, i link del menu di navigazione mostrano il numero di nuovi elementi anziché i badge."
+    default_sidebar_switch_panel_position: "Posizione dei pulsanti della barra laterale"
     retain_web_hook_events_period_days: "Numero di giorni per mantenere i record degli eventi di web hook."
     retry_web_hook_events: "Riprova automaticamente gli eventi di hook Web falliti per 4 volte. Gli intervalli di tempo tra i tentativi sono 1, 5, 25 e 125 minuti."
     revoke_api_keys_days: "Numero di giorni prima che una chiave API non utilizzata sia revocata automaticamente (0 per non avere mai revoca)"
     allow_user_api_keys: "Consenti la generazione di chiavi API utente"
     allow_user_api_key_scopes: "Elenco di ambiti consentiti per le chiavi API utente"
-    min_trust_level_for_user_api_key: "Livello di attendibilità richiesto per la generazione di chiavi API utente"
+    min_trust_level_for_user_api_key: |
+      Livello di attendibilità richiesto per la generazione di chiavi API utente.<br>
+      <b>AVVISO</b>: la modifica del livello di attendibilità impedirà agli utenti con un livello di attendibilità inferiore di accedere tramite Discourse Hub
     allowed_user_api_auth_redirects: "URL consentito per il reindirizzamento dell'autenticazione per le chiavi API utente. Il simbolo jolly * può essere utilizzato per abbinare qualsiasi parte di esso (ad esempio www.example.com/*)."
     allowed_user_api_push_urls: "URL consentiti per il push del server alle API utente"
     expire_user_api_keys_days: "Numero di giorni prima che una chiave API utente scada automaticamente (0 per non avere scadenza)"
     tagging_enabled: "Abilitare le etichette per gli argomenti?"
     min_trust_to_create_tag: "Il livello di attendibilità minimo per creare un'etichetta."
     max_tags_per_topic: "Il numero massimo di etichette che si possono applicare ad un argomento."
+    enable_max_tags_per_email_subject: "Usa max_tags_per_email_subject per generare l'oggetto di un'email"
+    max_tags_per_email_subject: "Il numero massimo di tag che possono essere nell'oggetto di un'email"
     max_tag_length: "La quantità massima di caratteri utilizzabili in un'etichetta."
     max_tag_search_results: "Il numero massimo di risultati da mostrare nella ricerca di etichette."
     max_tags_in_filter_list: "Numero massimo di etichette da mostrare nell'elenco a discesa del filtro. Saranno mostrate le etichette più usate."
@@ -2107,6 +2148,8 @@ it:
     suppress_overlapping_tags_in_list: "Se le etichette corrispondono alle esatte parole nei titoli degli argomenti, non mostrare l'etichetta"
     remove_muted_tags_from_latest: "Non mostrare argomenti etichettati solo con etichette silenziate nell'elenco degli argomenti più recenti."
     force_lowercase_tags: "Forza tutte le nuove Etichette interamente in minuscolo."
+    create_post_for_category_and_tag_changes: "Crea un piccolo post di azione quando la categoria o i tag di un argomento cambiano"
+    watched_precedence_over_muted: "Inviami notifiche sugli argomenti nelle categorie o nei tag che sto osservando anche se appartengono a un oggetto silenziato"
     company_name: "Nome azienda"
     governing_law: "Diritto applicabile"
     city_for_disputes: "Sede per eventuali controversie"
@@ -2121,7 +2164,7 @@ it:
     enable_sitemap: "Genera una mappa per il tuo sito e includila nel file robots.txt."
     sitemap_page_size: "Numero di URL da includere in ciascuna pagina della mappa del sito. Massimo 50.000"
     enable_user_status: "(sperimentale) Consenti agli utenti di impostare un messaggio di stato personalizzato (emoji + descrizione)."
-    enable_user_tips: "(sperimentale) Abilita i nuovi suggerimenti che descrivono le funzionalità chiave per gli utenti"
+    enable_user_tips: "Abilita i nuovi suggerimenti per utenti che descrivono le funzionalità chiave per gli utenti"
     short_title: "Il titolo breve verrà utilizzato nella schermata iniziale dell'utente, nel programma di avvio o in altri contesti in cui lo spazio potrebbe essere limitato. Dovrebbe essere limitato a 12 caratteri."
     dashboard_hidden_reports: "Consenti di nascondere i report specificati dal dashboard."
     dashboard_visible_tabs: "Scegli quali schede del dashboard sono visibili."
@@ -2138,11 +2181,15 @@ it:
     suggest_weekends_in_date_pickers: "Includi i fine settimana (sabato e domenica) nei suggerimenti del selettore di date (disabilita questa opzione se usi Discourse solo nei giorni feriali, dal lunedì al venerdì)."
     splash_screen: "Visualizza una schermata di caricamento temporanea durante il caricamento delle risorse del sito"
     navigation_menu: "Determina quale menu di navigazione utilizzare. La barra laterale e la navigazione dell'intestazione sono personalizzabili dagli utenti. L'opzione Compatibile è disponibile per la compatibilità con le versioni precedenti."
-    default_sidebar_categories: "Le categorie selezionate appariranno, per impostazione predefinita, nella sezione Categorie della barra laterale."
-    default_sidebar_tags: "Le etichette selezionate appariranno, per impostazione predefinita, nella sezione Etichette della barra laterale."
-    enable_new_user_profile_nav_groups: "SPERIMENTALE: Gli utenti dei gruppi selezionati vedranno il nuovo menu di navigazione del profilo utente"
-    enable_experimental_topic_timeline_groups: "SPERIMENTALE: Gli utenti dei gruppi selezionati vedranno la timeline degli argomenti sottoposta a refactoring"
+    default_navigation_menu_categories: "Le categorie selezionate appariranno, per impostazione predefinita, nella sezione Categorie del menu di navigazione."
+    default_navigation_menu_tags: "Le etichette selezionate appariranno, per impostazione predefinita, nella sezione Etichette del menu di navigazione."
     enable_experimental_hashtag_autocomplete: "SPERIMENTALE: utilizza il nuovo sistema di completamento automatico degli #hashtag per categorie ed etichette che rende l'elemento selezionato in modo diverso e con ricerca migliorata"
+    experimental_new_new_view_groups: 'SPERIMENTALE: abilita un nuovo elenco di argomenti che combini argomenti non letti e nuovi e crea il link "Tutto" nella barra laterale ad esso.'
+    enable_custom_sidebar_sections: "SPERIMENTALE: abilita le sezioni della barra laterale personalizzate"
+    experimental_topics_filter: "SPERIMENTALE: abilita il percorso del filtro degli argomenti sperimentali in /filter"
+    experimental_search_menu_groups: "SPERIMENTALE: attiva il nuovo menu di ricerca che è stato aggiornato per utilizzare glimmer."
+    enable_experimental_lightbox: "SPERIMENTALE: sostituisci la lightbox dell'immagine predefinita con il design rinnovato."
+    page_loading_indicator: "Configura l'indicatore di caricamento che appare durante la navigazione delle pagine all'interno di Discourse. 'Spinner' come un indicatore a pagina intera. 'Slider' mostra una barra stretta nella parte superiore dello schermo."
     errors:
       invalid_css_color: "Colore non valido. Immettere un nome o un valore esadecimale per il colore."
       invalid_email: "Indirizzo email non valido."
@@ -2168,7 +2215,7 @@ it:
       pop3_polling_password_is_empty: "È necessario impostare 'pop3 polling password' prima di attivare il polling POP3."
       pop3_polling_authentication_failed: "Autenticazione POP3 fallita. Verifica le tue credenziali POP3:"
       reply_by_email_address_is_empty: "Devi impostare 'reply by email address' prima di attivare la risposta via email."
-      email_polling_disabled: "È necessario attivare il polling manuale o POP3 prima di attivare la risposta via email."
+      email_polling_disabled: "È necessario abilitare il polling manuale POP3 o avere abilitato un poller di posta personalizzato prima di abilitare la risposta via email."
       user_locale_not_enabled: "Prima di attivare questa impostazione, devi abilitare 'allow user locale'."
       personal_message_enabled_groups_invalid: "Devi specificare almeno un gruppo per questa impostazione. Se vuoi che nessuno al di fuori dello staff invii MP, scegli il gruppo dello staff."
       invalid_regex: "Regex non è valido o non è consentito."
@@ -2177,7 +2224,6 @@ it:
       staged_users_disabled: "Devi abilitare 'staged users' prima di attivare questa impostazione."
       reply_by_email_disabled: "Devi abilitare 'reply by email' prima di attivare questa impostazione ."
       discourse_connect_url_is_empty: "È necessario definire un 'discourse connect url' prima di abilitare questa impostazione."
-      discourse_connect_invite_only: "Non è possibile abilitare DiscourseConnect e solo inviti allo stesso tempo."
       enable_local_logins_disabled: "Prima di abilitare questa impostazione è necessario abilitare 'enable local logins'."
       min_username_length_exists: "Non è possibile impostare la lunghezza minima del nome utente a un valore maggiore di quella del nome utente più breve (%{username})."
       min_username_length_range: "Non puoi impostare il minimo più grande del massimo."
@@ -2199,7 +2245,8 @@ it:
       search_tokenize_japanese_enabled: "Devi disattivare \"search_tokenize_japanese\" prima di attivare questa impostazione."
       discourse_connect_cannot_be_enabled_if_second_factor_enforced: "Non è possibile abilitare DiscourseConnect se è stata forzata l'autenticazione a due fattori 2FA."
       delete_rejected_email_after_days: "Questa impostazione non può essere inferiore al valore dell'impostazione delete_email_logs_after_days né maggiore di %{max}"
-      invalid_uncategorized_category_setting: "La categoria Senza categoria non può essere selezionata se gli argomenti senza categoria non sono consentiti"
+      invalid_uncategorized_category_setting: 'La categoria "Senza categoria" non può essere selezionata se gli argomenti senza categoria non sono consentiti.'
+      invalid_search_ranking_weights: "Il valore non è valido per l'impostazione del sito search_ranking_weights. Esempio: '{0.1,0.2,0.3,1.0}'. Si noti che il valore massimo per ciascun peso è 1,0."
     placeholder:
       discourse_connect_provider_secrets:
         key: "www.example.com"
@@ -2394,7 +2441,6 @@ it:
     activated_by_staff: "Attivato dallo staff"
     new_user_typed_too_fast: "Il nuovo utente ha scritto troppo velocemente"
     content_matches_auto_silence_regex: "Il contenuto corrisponde all'espressione regolare per silenziare automaticamente"
-    content_matches_auto_block_regex: "Il contenuto corrisponde al regex del blocco automatico"
     username:
       short: "deve essere almeno di %{min} caratteri"
       long: "non deve essere più lungo di %{max} caratteri"
@@ -3033,7 +3079,7 @@ it:
 
         Il nuovo utente [%{username}](%{user_url}) è stato automaticamente silenziato perché più utenti hanno segnalato i messaggi di %{username}.
 
-        Per favore [controlla le segnalazioni](%{base_url}/admin/flags). Se %{username} è stato silenziato per errore, clicca sul tasto di sblocco nella [pagina di amministrazione di questo utente](%{user_url}).
+        Per favore [controlla le segnalazioni](%{base_url}/review). Se %{username} è stato silenziato per errore, clicca sul tasto di sblocco nella [pagina di amministrazione di questo utente](%{user_url}).
 
         Questa soglia può essere modificata tramite l'impostazione del sito `silence_new_user`.
     spam_post_blocked:
@@ -3059,15 +3105,6 @@ it:
       title: "Scaricamento Immagini Remote Disabilitato"
       subject_template: "Lo scaricamento delle immagini remote è disabilitato"
       text_body_template: "L'impostazione `download_remote_images_to_local` è stata disabilitata perché è stato raggiunto il limite di spazio su disco definito in `download_remote_images_threshold`."
-    dashboard_problems:
-      title: "Problemi dashboard"
-      subject_template: "Nuovo avviso sul dashboard del tuo sito"
-      text_body_template: |
-        Abbiamo alcuni nuovi consigli e raccomandazioni per te in base alle attuali impostazioni del sito.
-
-        [Visita il dashboard del tuo sito](%{base_url}/admin) per vederli.
-
-        Se sul dashboard non è visibile nulla, è possibile che un altro membro del personale abbia già agito su questo avviso. Un elenco delle azioni dello staff è disponibile nei [Log delle Azioni Staff](%{base_url}/admin/logs/staff_action_logs).
     new_user_of_the_month:
       title: "Sei il Nuovo Utente del Mese!"
       subject_template: "Sei il Nuovo Utente del Mese!"
@@ -3104,9 +3141,6 @@ it:
       one: "Avvertimento: Inviamo un massimo di %{count} email al giorno. Controlla il sito per vedere quelle che potrebbero essere state trattenute."
       other: "Avvertimento: Inviamo un massimo di %{count} email giornaliere. Controlla il sito per vedere quelle che potrebbero essere state trattenute. PS grazie per essere popolare!"
     in_reply_to: "In Risposta A"
-    unsubscribe:
-      title: "Annulla iscrizione"
-      description: "Non vuoi ricevere queste email? Nessun problema! Clicca qui sotto per annullare l'iscrizione:"
     reply_by_email: "[Visita Argomento](%{base_url}%{url}) o rispondi a questa email per replicare."
     reply_by_email_pm: "[Visita Messaggio](%{base_url}%{url}) o rispondi a questa email per rispondere a %{participants}."
     only_reply_by_email: "Rispondi a questa email per replicare."
@@ -3398,7 +3432,6 @@ it:
       liked_received: "Mi piace ricevuti"
       new_users: "Nuovi utenti"
       popular_topics: "Argomenti popolari"
-      follow_topic: "Segui questo topic"
       join_the_discussion: "Leggi Altro"
       popular_posts: "Messaggi popolari"
       more_new: "Nuovo per te"
@@ -3573,12 +3606,7 @@ it:
     title: "Impossibile caricare l'app"
     offline_page_message: "Sembra che tu sia offline! Controlla la tua connessione di rete e riprova."
   login_required:
-    welcome_message: |
-      ## [Benvenuto su %{title}](#welcome)
-      E' richiesto un account. Per continuare, crea un nuovo account oppure accedi.
-    welcome_message_invite_only: "## [Benvenuto su %{title}](#benvenuto) \nÈ richiesto un account. Per favore, chiedi a un membro esistente un invito o accedi per continuare.\n"
-  deleted: "cancellati"
-  image: "immagine"
+    welcome_message: "# [Benvenuti in %{title}](#welcome)"
   upload:
     edit_reason: "copie locali delle immagini scaricate"
     unauthorized: "Spiacenti, il file che stai cercando di caricare non è autorizzato (estensioni autorizzate: %{authorized_extensions})."
@@ -3682,91 +3710,10 @@ it:
     body: "<a name=\"civilized\"></a>\n\n## [Questo è un posto destinato a discussioni pubbliche con toni civili](#civilized)\n\nTi preghiamo di tenere in questo forum di discussione lo stesso comportamento rispettoso che avresti in un parco pubblico. Anche la nostra è una comunità che condivide risorse &mdash; un posto in cui condividere competenze, conoscenze e interessi tramite un dialogo continuo.\n\nQueste regole non sono ferree. Sono linee guida per orientare il buon senso dei membri della nostra comunità e per mantenere questa sede un posto per conversazioni pubbliche condotte in modo gentile, amichevole e civile.\n\n<a name=\"improve\"></a>\n\n## [Migliora la Discussione](#improve)\n\nAiutaci a rendere questo posto la sede ideale per discussioni, aggiungendo sempre qualcosa di positivo, per quanto semplice o breve. Se hai dei dubbi sui messaggi da aggiungere alla conversazione, ripensa a quello che vuoi dire e ritorna a scriverlo più tardi.\n\nUn buon modo per migliorare le discussioni è quello di dare un'occhiata alle conversazioni già in corso. Passa un po' di tempo a leggere gli argomenti aperti prima di aggiungervi risposte o prima di crearne di nuovi. In questo modo, avrai maggiori possibilità di incontrare altre persone che condividono i tuoi interessi.\n\nGli argomenti qui discussi sono importanti per noi e ci aspettiamo che lo siano anche per te e che ti comporti di conseguenza. Devi sempre essere rispettoso degli argomenti discussi e delle persone che discutono, anche se non condividi le opinioni espresse.\n\n<a name=\"agreeable\"></a>\n\n## [Cerca di essere gradevole, anche quando sei in disaccordo](#agreeable)\n\nPuoi sempre rispondere in disaccordo a quanto detto, ci sta. Ma ricorda di _criticare le idee non le persone_. Quindi evita di:\n\n* Offendere\n* Portare attacchi _ad personam_\n* Rispondere al tono di un messaggio invece che al suo reale contenuto \n* Avviare un contraddittorio per partito preso\n\nPiuttosto, fornisci contro-argomentazioni valide che migliorino la discussione.\n\n<a name=\"participate\"></a>\n\n## [La tua partecipazione è importante](#participate)\n\nLe discussioni qui presenti impostano il tono da usare per tutti i nuovi arrivati. Aiutaci a dirigere ed influenzare il futuro di questa comunità scegliendo di partecipare a quelle discussioni che rendono questo forum un posto interessante dove stare &mdash; e, di contro, evitando quelle altre discussioni che invece non lo fanno.\n\nDiscourse fornisce degli strumenti che permettono alla comunità di identificare i contributi migliori (e i peggiori): i preferiti, i segnalibri, i \"mi piace\", le segnalazioni, le risposte, le modifiche, ecc. Usa tutti questi strumenti per migliorare la tua esperienza e quella degli altri.\n \nFacciamo in modo di rendere questa comunità migliore di come l'abbiamo trovata.\n\n<a name=\"flag-problems\"></a>\n\n## [Se noti un problema, segnalalo](#flag-problems)\n\nI moderatori hanno speciali autorità; sono loro i responsabili di questo forum. Ma anche tu lo sei. Con il tuo aiuto, i moderatori possono diventare dei bravi animatori, non dei custodi o dei poliziotti.\n\nSe ti accorgi di comportamenti impropri, non rispondere. La tua risposta incoraggerebbe l'autore a continuare, inoltre consuma inutilmente le tue energie e fa perdere tempo a tutti. Semplicemente _segnalalo_. Se arrivano abbastanza segnalazioni, verranno presi provvedimenti, sia automatici che con l'intervento di un moderatore.\n\nAl fine di gestire al meglio la nostra comunità, i moderatori si riservano il diritto di cancellare qualsiasi contenuto o qualsiasi utente in qualunque momento. I moderatori non leggono i nuovi messaggi prima che vengano pubblicati, perciò loro non sono responsabili per i contenuti inseriti dai membri di questa comunità.\n\n<a name=\"be-civil\"></a>\n\n## [Sii sempre civile](#be-civil)\n\nNon c'è niente di meglio della maleducazione per sabotare una conversazione salutare:\n\n* Sii civile. Non inviare niente che una persona ragionevole possa considerare offensivo, ingiurioso o che inciti all'odio.\n* Non sporcare. Non inviare niente di osceno o di sessualmente esplicito.\n* Rispetta tutti. Non offendere né attaccare nessuno, non spacciarti per qualcun altro, non pubblicare informazioni private altrui.\n* Rispetta il nostro forum. Non pubblicare spam o contenuti vandalici.\n\nAnche se le precedenti non sono regole formali con definizioni esatte &mdash; evita di pubblicare materiale anche se hai il semplice _sospetto_ che rientri in una di queste categorie. Se non sei sicuro se pubblicare o no, chiediti che cosa succederebbe se il tuo messaggio fosse pubblicato sulla prima pagina di uno dei principali siti di notizie.\n\nEssendo questo un forum pubblico, i motori di ricerca indicizzano tutte le nostre discussioni. Mantieni il linguaggio, i tuoi collegamenti e le tue immagini consoni anche per essere visualizzati dai nostri amici e dalle nostre famiglie.\n\n<a name=\"keep-tidy\"></a>\n\n## [Tieni in ordine](#keep-tidy)\n\nFai il piccolo lo sforzo di mettere tutte le cose al loro posto, in modo tale che possiamo tutti spendere più tempo a discutere e meno tempo a ripulire. Quindi:\n\n* Non iniziare un argomento nella categoria sbagliata, controlla sempre prima la definizione della categoria.\n* Non inviare lo stesso messaggio in discussioni diverse. \n* Non inviare risposte prive di contenuto. \n* Non andare fuori tema cambiando discorso. \n* Non firmare i tuoi messaggi &mdash; ogni messaggio ha già allegate le informazioni del tuo profilo.\n\nPiuttosto che inviare un messaggio \"+1\" oppure \"Sono d'accordo\", usa il tasto \"Mi piace\". Piuttosto che andare fuori tema, usa il tasto \"Rispondi con nuovo argomento\".\n\n<a name=\"stealing\"></a>\n\n## [Usa farina del tuo sacco](#stealing)\n\nPer favore non inviare materiale digitale che appartiene a qualcun altro senza il suo permesso. Non inviare descrizioni, collegamenti o metodi per rubare la proprietà intellettuale altrui (software, video, musica, immagini) o che violi qualche altra legge.\n\n<a name=\"power\"></a>\n\n## [Fatto da te](#power)\n\nQuesto sito è gestito dal tuo [simpatico staff](%{base_path}/about) e da *te*, la comunità. Se hai altre domande su come le cose dovrebbero funzionare qui, apri un nuovo argomento nella [categoria Feedback Sito](%{base_path}/c/site-feedback) e parliamone! Se c'è un problema urgente e importante che non si può affrontare in un argomento o con una segnalazione, contattaci tramite la [pagina dello staff](%{base_path}/about).\n\n<a name=\"tos\"></a>\n\n## [Termini del servizio](#tos)\n\nSì, l'avvocatese è noioso, ma ci dobbiamo proteggere &ndash; e, per estensione, proteggere anche te ed i tuoi dati &ndash; contro persone non amichevoli. Abbiamo dei [Termini di Servizio](%{base_path}/tos) che descrivono il tuo (e il nostro) comportamento ed i diritti che riguardano i contenuti, la privacy e le leggi. Per poter usare questo servizio, devi accettare i nostri [TOS](%{base_path}/tos).\n"
   tos_topic:
     title: "Termini del Servizio"
-    body: "I presenti termini regolano l'uso del forum Internet disponibile alla pagina <%{base_url}>. Per utilizzare il forum devi accettare i presenti termini di %{company_name}, la società che gestisce il forum. \n\nTale società può offrire altri prodotti e servizi regolamentati da altri termini e condizioni di utilizzo. I presenti termini si applicano solo all'uso del forum.\n\nVai a:\n\n- [Termini importanti](#heading--important-terms) \n- [La tua autorizzazione all'uso del Forum](#heading--permission)\n- [Condizioni di utilizzo del Forum](#heading--conditions) \n- [Uso accettabile](#heading--acceptable-use) \n- [Standard dei contenuti](#heading--content-standards) \n- [Adempimenti di legge](#heading--enforcement) \n- [Il tuo account](#heading--your-account) \n- [I tuoi contenuti](#heading--your-content) \n- [Le tue responsabilità](#heading--responsibility) \n- [Scarico di responsabilità](#heading--disclaimers)\n- [Limitazioni di responsabilità](#heading--liability)\n- [Feedback](#heading--feedback) \n- [Conclusione del contratto](#heading--termination)\n- [Controversie](#heading--disputes) \n- [Termini Generali](#heading--general)\n- [Contatti](#heading--contact)\n- [Modifiche](#heading--changes)\n\n<h2 id=\"heading--important-terms\"><a href=\"#heading--important-terms\">Termini importanti</a></h2>\n\n***I presenti termini contengono delle importanti disposizioni che influenzano i tuoi diritti e responsabilità, come le dichiarazioni di non responsabilità in [Scarico di responsabilità](#heading--disclaimer), i limiti delle responsabilità societarie nei tuoi confronti in [Limitazioni di responsabilità](#heading--liability), le condizioni a tutela della società per i danni causati dall'uso improprio del forum in [Responsabilità per l'uso](#heading-responsibility) e un accordo per risolvere le controversie in [Controversie](#heading--disputes).***\n\n<h2 id=\"heading--permission\"><a href=\"#heading--permission\">La tua autorizzazione all'uso del forum</a></h2>\n\nLa società ti autorizza all'uso del forum nel rispetto dei presenti termini. Tutti coloro che intendono usare il forum devono accettare tali termini.\n\n<h2 id=\"heading--conditions\"><a href=\"#heading--conditions\">Condizioni per l'utilizzo del forum</a></h2>\n\nL'autorizzazione a utilizzare il forum è soggetta alle seguenti condizioni:\n\n1. Devi avere almeno tredici anni.\n\n2. Non puoi più utilizzare il forum se la società ti contatta direttamente per proibirti l'uso. \n\n3. È necessario utilizzare il forum in conformità alle norme di [Uso accettabile](#heading--acceptable-use) e agli [Standard dei contenuti](#heading--content-standards).\n\n<h2 id=\"heading--acceptable-use\"><a href=\"#heading--acceptable-use\">Uso Accettabile</a></h2>\n\n1. Non puoi infrangere la legge usando il forum.\n\n2. Non puoi utilizzare o provare a utilizzare l'account di altri sul forum senza la loro specifica autorizzazione.\n\n3. Non è possibile acquistare, vendere o altrimenti scambiare nomi utente o altri identificatori univoci sul forum.\n\n4. Non è possibile inviare annunci pubblicitari, catene postali o altre sollecitazioni attraverso il forum, né utilizzare il forum per raccogliere indirizzi o altri dati personali per mailing list commerciali o database. \n\n5. Non puoi automatizzare l'accesso al forum o monitorare il forum, ad esempio con un web crawler, un plug-in o un componente aggiuntivo del browser o un altro programma per computer diverso da un browser web. Puoi indicizzare il forum per farlo apparire tra i risultati di un motore di ricerca disponibile pubblicamente, se ne gestisci uno.\n\n6. Non puoi utilizzare il forum per inviare posta elettronica a liste di distribuzione, newsgroup o altri gruppi di utenti.\n\n7. Non puoi ritenere in modo falso di essere affiliato o sostenuto dalla società.\n\n8. Non puoi creare hyperlink a immagini o altri contenuti non ipertestuali dal forum verso altre pagine web. \n\n9. Non puoi rimuovere marchi che indicano la titolarità e la proprietà dai materiali scaricati dal forum.\n\n10. Non puoi mostrare alcuna parte del forum su altri siti web con \"<iframe>\".\n\n11. Non puoi disabilitare, evitare o aggirare eventuali restrizioni di sicurezza o di accesso al forum.\n\n12. Non puoi intasare l'infrastruttura del forum con un volume irragionevole di richieste, specie se finalizzate a imporre un carico anomalo sui sistemi informativi alla base del forum. \n\n13. Non puoi impersonare gli altri attraverso il forum. \n\n14. Non puoi incoraggiare o aiutare nessuno a violare questi termini.\n\n<h2 id=\"heading--content-standards\"><a href=\"#heading--content-standards\">Standard di contenuti</a></h2>\n\n1. Non puoi inviare al forum contenuti illegali, offensivi o altrimenti dannosi per altri. Ciò include contenuti molesti, inappropriati o che incitano all'odio\n\n2. Non puoi inviare al forum contenuti che violino la legge, i diritti di proprietà intellettuale altrui, la privacy di chiunque o gli accordi con altre parti.\n\n3. Non puoi inviare al forum contenuti con codici informatici dannosi, ad esempio virus informatici o spyware.\n\n4. Non puoi inviare al forum contenuti che fungano da semplici segnaposto, per contenere un indirizzo particolare, un nome utente o un altro identificatore univoco. \n\n5. Non puoi utilizzare il forum per divulgare informazioni che non hai il diritto di diffondere, come le informazioni riservate o altrui.\n\n<h2 id=\"heading--enforcement\"><a href=\"#heading--enforcement\">Adempimenti di legge</a></h2>\n\nLa società può effettuare indagini e perseguire le violazioni di questi termini nella massima misura consentita dalla legge. La società può notificare e cooperare con le forze dell'ordine nel perseguire le violazioni di legge e dei presenti termini.\n\nLa società si riserva il diritto di modificare, rivedere ed eliminare i contenuti sul forum per qualsiasi motivo. Se ritieni che qualcuno abbia inviato contenuti al forum in violazione di questi termini, [contattaci immediatamente](#heading-contact).\n\n<h2 id=\"heading--your-account\"><a href=\"#heading--your-account\">Il tuo account</a></h2>\n\nPer utilizzare alcune funzioni del forum devi creare e accedere a un account.\n\nPer creare un account, devi fornire alcune informazioni personali. Se crei un account, accetti di fornire almeno un indirizzo e-mail valido e di mantenerlo aggiornato. È possibile chiudere l'account in qualsiasi momento inviando un'e-mail a <%{contact_email}>. \n\nAccetti di essere responsabile di tutte le azioni intraprese utilizzando il tuo account, da te autorizzate o meno, fino a quando non chiudi il tuo account o comunichi alla società che il tuo account è stato violato. Ti impegni ad avvisare immediatamente la società se sospetti che il tuo account sia stato violato. Devi inoltre procedere alla scelta di una password sicura per il tuo account e mantenerla segreta.\n\nLa società può limitare, sospendere o chiudere il tuo account sul forum in base alla sua politica per la gestione delle richieste di rimozione relative al copyright o se la società ha motivi ragionevoli per ritenere che tu abbia violato qualsiasi regola dei presenti termini.\n\n<h2 id=\"heading--your-content\"><a href=\"#heading--your-content\">I tuoi contenuti</a></h2>\n\nNessuna disposizione contenuta nei presenti termini conferisce alla società alcun diritto sulla proprietà intellettuale dei contenuti che condividi nel forum, quali le informazioni del tuo account, i messaggi o altri contenuti che invii al forum. Nessuna disposizione contenuta nei presenti termini ti dà alcun diritto sulle proprietà intellettuali della società. \n\nSei l'unico responsabile dei contenuti che invii al forum. Sei consapevole di non poter ritenere erroneamente che i contenuti che invii al forum siano sponsorizzati o approvati dalla società. Questi termini non obbligano la società a archiviare, mantenere o fornire copie dei contenuti che invii, né a modificarli in base a questi termini.\n\nI contenuti che invii al forum appartengono a te e spetta a te decidere quale autorizzazione dare agli altri su di essi. Ma come minimo, autorizzi la società a fornire i contenuti che invii al forum ad altri utenti del forum. Tale licenza speciale consente alla società di copiare, pubblicare e analizzare i contenuti che invii al forum.\n\nQuando un contenuto inviato è rimosso dal forum, da te o dalla società, la licenza speciale della società termina quando l'ultima copia scompare dai backup, dalle cache e da altri sistemi della società. Altre licenze da te applicate ai contenuti inviati, ad esempio le licenze [Creative Commons](https://creativecommons.org), potrebbero continuare dopo la rimozione del contenuto. Tali licenze possono dare ad altri, o alla società stessa, il diritto di condividere nuovamente i tuoi contenuti attraverso il forum.\n\nAltri soggetti che ricevono contenuti che invii al forum potrebbero violare i termini in base ai quali concedi in licenza i tuoi contenuti. L'utente accetta che la società non sia responsabile nei confronti dell'utente per tali violazioni o le loro conseguenze.\n\n<h2 id=\"heading--responsibility\"><a href=\"#heading--responsibility\">Le tue Responsabilità</a></h2>\n\nAccetti di indennizzare la società da rivendicazioni legali da parte di altri in relazione alla violazione di questi termini da parte tua o di altri che utilizzano il tuo account sul forum. Tu e la società vi impegnate a notificare all'altra parte qualsiasi rivendicazione legale per la quale ci potrebbe essere l'obbligo di indennizzare la società il prima possibile. Se la società non ti notifica tempestivamente un reclamo legale, non dovrai risarcire la società per i danni che avresti potuto evitare o ridurre con un preavviso tempestivo. Accetti che la società possa controllare procedimenti di indagine, difesa e risoluzione dei reclami legali per i quali dovresti risarcire la società e ti impegni a sostenere tali sforzi. La società si impegna a non accettare alcun accordo che attribuisca la colpa agli utenti o imponga loro obblighi senza il loro previo consenso.\n\n<h2 id=\"heading--disclaimers\"><a href=\"#heading--disclaimers\">Scarico di responsabilità</a></h2>\n\n***Accetti tutti i rischi derivanti dall'utilizzo del forum e dei suoi contenuti. Nella misura consentita dalla legge, la società e i suoi fornitori forniscono il forum così com'è, senza alcuna garanzia.***\n\nIl forum può creare collegamenti ipertestuali e integrare forum e servizi gestiti da altri. La società non fornisce alcuna garanzia sui servizi gestiti da altri o sui contenuti che possono fornire. L'utilizzo di servizi gestiti da altri può essere regolato da altri termini vigenti tra l'utente e il responsabile della gestione del servizio in questione\n\n<h2 id=\"heading--liability\"><a href=\"#heading--liability\">Limitazioni di responsabilità</a></h2>\n\n***Né la società né i suoi fornitori saranno responsabili nei tuoi confronti per danni derivanti da violazioni del contratto che il loro personale non avrebbe potuto ragionevolmente prevedere quando hai accettato questi termini.***\n\n***Nella misura consentita dalla legge, la responsabilità totale nei confronti dell'utente per reclami di qualsiasi tipo relativi al forum o ai contenuti sul forum sarà limitata a $50.***\n\n<h2 id=\"heading--feedback\"><a href=\"#heading--feedback\">Feedback</a></h2>\n\nLa società accoglie con favore feedback e suggerimenti per il forum. Consulta la successiva sezione [Contatti](#heading--contact) per trovare il modo di contattarci.\n\nAccetti che la società possa liberamente agire in base al feedback e ai suggerimenti che fornisci senza che la società debba informarti dell'uso del tuo feedback, né ottenere il tuo permesso di usarlo o pagarti. Accetti di non inviare commenti o suggerimenti che possano essere riservati o proprietari per te o per altri.\n\n<h2 id=\"heading--termination\"><a href=\"#heading--termination\">Conclusione del contratto</a></h2>\n\nL'utente o la società possono porre fine all'accordo descritto nei presenti termini in qualsiasi momento. Alla scadenza dell'accordo, termina anche il tuo permesso di utilizzare il forum.\n\nLe disposizioni contenute nelle seguenti sezioni sopravvivono alla fine del nostro accordo: [I tuoi contenuti](#heading--your-contenti), [Feedback](#heading--feedback), [Le tue responsabilità](#heading--responsibility), [Scarico di responsabilità](#heading--disclaimers), [Limitazioni delle responsabilità](#heading--liability) e [Termini generali](#heading-general).\n\n<h2 id=\"heading--disputes\"><a href=\"#heading--disputes\">Controversie</a></h2>\n\n%{governing_law} sarà competente a decidere su qualsiasi controversia relativa ai presenti termini o all'utilizzo del forum da parte tua. \n\nL'utente e la società si impegnano a richiedere pronunce giudiziarie su questioni relative ai presenti termini solo in tribunali statali o federali in %{city_for_disputes}. Né l'utente né la società presenteranno opposizione alla giurisdizione, al forum o alla sede in tali tribunali.\n\n***Prima di richiedere pronunce giudiziarie ai sensi del Computer Fraud and Abuse Act, l'utente e la società tenteranno di risolvere eventuali controversie richiedendo un procedimento arbitrale all'American Arbitration Association. Il procedimento arbitrale seguirà le norme delle Commercial Arbitration Rules and Supplementary Procedures for Consumer Related Disputes dell'AAA. Il procedimento arbitrale si svolgerà in %{city_for_disputes}. Ti impegni a risolvere eventuali controversie individualmente e non nell'ambito di class action o di altri procedimenti legali collettivi, sia in qualità di soggetto ricorrente che come membro di un gruppo collettivo. Nessun membro della commissione giudicante potrà unire il procedimento relativo a una controversia con altri procedimenti arbitrali senza il permesso della società.***\n\nOgni lodo arbitrale comprenderà i costi procedimentali, spese legali e costi per i testimoni ragionevoli. L'utente e la società possono partecipare a lodi arbitrali in qualsiasi tribunale competente.\n\n<h2 id=\"heading--general\"><a href=\"#heading--general\">Termini generali</a></h2>\n\nSe una qualsiasi disposizione dei presenti termini non risulta legalmente applicabile nella forma in cui è scritta, ma potrebbe essere modificata per diventare applicabile, la disposizione in questione dovrà essere modificata nella misura minima necessaria per renderla applicabile. In caso contrario, tale disposizione dovrà essere eliminata.\n\nNon puoi assegnare il tuo contratto con la società a terzi. La società può assegnare il tuo contratto a qualsiasi società affiliata, a qualsiasi altra società che ottenga il controllo della società o che acquisti le risorse della società relative al forum. Qualsiasi tentativo di assegnare il contratto in violazione dei presenti termini non ha alcun valore legale.\n\nL'esercizio di specifici diritti ai sensi del presente Contratto e la rinuncia alla rivalsa in caso di particolari violazioni al presente Contratto non implicano la rinuncia a qualsiasi rivalsa in caso di altre violazioni al presente Contratto.\n\nI presenti termini contengono tutte le condizioni dell'accordo tra l'utente e la società sull'uso del forum. I presenti termini sostituiscono completamente qualsiasi altro accordo sull'utilizzo del forum da parte dell'utente, esistente in forma scritta o meno.\n\n<h2 id=\"heading--contact\"><a href=\"#heading--contact\">Contatti</a></h2>\n\nPuoi inviare notifiche alla società ai sensi dei presenti termini e fare domande all'indirizzo <%{contact_email}>.\n\nLa società può inviarti notifiche ai sensi dei presenti termini utilizzando l'indirizzo e-mail che hai fornito per registrare il tuo account sul forum, oppure pubblicando un messaggio sulla homepage del forum o ancora sulla pagina del tuo account.\n\n<h2 id=\"heading--changes\"><a href=\"#heading--changes\">Modifiche</a></h2>\n\nL'ultimo aggiornamento dei presenti termini da parte della società risale al 12 luglio 2018 e altri aggiornamenti potranno essere applicati in futuro.. La società pubblica tutti gli aggiornamenti sul forum. Per gli aggiornamenti che contengono modifiche sostanziali, la società si impegna a inviare un'e-mail agli utenti che hanno creato un account e hanno fornito un indirizzo e-mail valido. La società può anche annunciare aggiornamenti con messaggi o avvisi speciali sul forum.\n\nQuando ricevi la notifica di un aggiornamento ai presenti termini, dovrai accettare i nuovi termini per continuare a utilizzare il forum.\n"
+    body: "<h2 id=\"heading--change-me\"><a href=\"#heading--change-me\">Modificami</a></h2>\n\n\nForum anmministratori, qui puoi trovare un esempio di modello iniziale per l'informativa sulla privacy che devi personalizzare per adeguarla alle esigenze del tuo sito.\n\nI presenti termini in futuro potrebbero regolare l'uso del forum Internet disponibile alla pagina <%{base_url}>. in tal caso per utilizzare il forum devi accettare i presenti termini di %{company_name}, la società che gestisce il forum.\n\nTale società può offrire altri prodotti e servizi regolamentati da altri termini e condizioni di utilizzo. i presenti si applicano solo all'uso del forum.\n\nVai a:\n - [Termini importanti](#heading--important-terms) \n- [La tua autorizzazione all'uso del Forum](#heading--permission) \n- [Condizioni di utilizzo del Forum](#heading--conditions) \n- [Uso accettabile](#heading--acceptable-use) \n- [Standard dei contenuti](#heading--content-standards) - [Esecuzione del contratto](#heading--enforcement) \n- [Il tuo account](#heading--your-account) \n- [I tuoi contenuti](#heading--your-content) \n- [Le tue responsabilità](#heading--responsibility) \n- [Scarico di responsabilità](#heading--disclaimers) \n- [Limitazioni di responsabilità](#heading--liability) \n- [Feedback](#heading--feedback) \n- [Conclusione del contratto](#heading--termination) \n- [Controversie](#heading--disputes) - [Termini Generali](#heading--general) - \n[Contatti](#heading--contact) \n- [Modifiche](#heading--changes) \n\n<h2 id=\"heading--important-terms\"><a href=\"#heading--important-terms\">Termini importanti</a></h2>\n\n***I presenti termini contengono delle importanti disposizioni che influenzano i tuoi diritti e responsabilità, come le dichiarazioni di non responsabilità in [Scarico delle responsabilità](#heading--disclaimer), i limiti delle responsabilità societarie nei tuoi confronti in [Limitazioni di responsabilità](#heading--liability), le condizioni a tutela della società per i danni causati dall'uso improprio del forum in [Responsabilità per l'uso](#heading-responsibility) e un accordo per risolvere le controversie in [Controversie](#heading--disputes).***\n\n<h2 id=\"heading--permission\"><a href=\"#heading--permission\">La tua autorizzazione all'uso del Forum</a></h2> \n\nLa società ti autorizza all'uso del forum nel rispetto dei presenti termini. Tutti coloro che intendono usare il forum devono accettare tali termini. \n\n<h2 id=\"heading--conditions\"><a href=\"#heading--conditions\">Condizioni di utilizzo del Forum</a></h2> \n\nL'autorizzazione a utilizzare il forum è soggetta alle seguenti condizioni: \n\n1. Devi avere almeno tredici anni. \n\n2. Non puoi più utilizzare il forum se la società ti contatta direttamente per proibirti l'uso. \n\n3. È necessario utilizzare il forum in conformità alle norme di [Uso accettabile](#heading--acceptable-use) e agli [Standard dei contenuti](#heading--content-standards). \n\n<h2 id=\"heading--acceptable-use\"><a href=\"#heading--acceptable-use\">Uso accettabile</a></h2> \n\n1. Non puoi infrangere la legge usando il forum. \n\n2. Non puoi utilizzare o provare a utilizzare l'account di altri sul forum senza la loro specifica autorizzazione.\n\n3. Non è possibile acquistare, vendere o altrimenti scambiare nomi utente o altri identificatori univoci sul forum. \n\n\n4. Non è possibile inviare annunci pubblicitari, catene postali o altre sollecitazioni attraverso il forum, né utilizzare il forum per raccogliere indirizzi o altri dati personali per mailing list commerciali o database. \n\n5. Non puoi automatizzare l'accesso al forum o monitorare il forum, ad esempio con un web crawler, un plug-in o un componente aggiuntivo del browser o un altro programma per computer diverso da un browser web. Puoi indicizzare il forum per farlo apparire tra i risultati di un motore di ricerca disponibile pubblicamente, se ne gestisci uno. \n\n6. Non puoi utilizzare il forum per inviare posta elettronica a liste di distribuzione, newsgroup o altri gruppi di utenti. \n\n7. Non puoi ritenere in modo falso di essere affiliato o sostenuto dalla società. \n\n8. Non puoi creare hyperlink a immagini o altri contenuti non ipertestuali dal forum verso altre pagine web. \n\n\n9. Non puoi rimuovere marchi che indicano la titolarità e la proprietà dai materiali scaricati dal forum. \n\n10. Non puoi mostrare alcuna parte del forum su altri siti web con \"<iframe>\". 11. Non puoi disabilitare, evitare o aggirare eventuali restrizioni di sicurezza o di accesso al forum. \n\n12. Non puoi intasare l'infrastruttura del forum con un volume irragionevole di richieste, specie se finalizzate a imporre un carico anomalo sui sistemi informativi alla base del forum. \n\n13. Non puoi impersonare gli altri attraverso il forum. \n\n\n14. Non puoi incoraggiare o aiutare nessuno a violare questi termini. \n\n<h2 id=\"heading--content-standards\"><a href=\"#heading--content-standards\">Standard dei contenuti</a></h2> \n\n\n1. Non puoi inviare al forum contenuti illegali, offensivi o altrimenti dannosi per altri. Ciò include contenuti molesti, inappropriati o offensivi. \n\n2. Non puoi inviare al forum contenuti che violino la legge, i diritti di proprietà intellettuale altrui, la privacy di chiunque o gli accordi con altre parti. \n\n3. Non puoi inviare al forum contenuti con codici informatici dannosi, ad esempio virus informatici o spyware.\n\n\n 4. Non puoi inviare al forum contenuti che fungano da semplici segnaposto, per contenere un indirizzo particolare, un nome utente o un altro identificatore univoco. \n\n\n5. Non puoi utilizzare il forum per divulgare informazioni che non hai il diritto di diffondere, come le informazioni riservate o altrui. \n\n\n<h2 id=\"heading--enforcement\"><a href=\"#heading--enforcement\">Esecuzione del contratto</a></h2> \n\n\nLa società può effettuare indagini e perseguire le violazioni di questi termini nella massima misura consentita dalla legge. La società può notificare e cooperare con le forze dell'ordine nel perseguire le violazioni di legge e dei presenti termini. \n\n\nLa società si riserva il diritto di modificare, rivedere ed eliminare i contenuti sul forum per qualsiasi motivo. Se ritieni che qualcuno abbia inviato contenuti al forum in violazione di questi termini, [contattaci immediatamente](#heading-contact). \n\n<h2 id=\"heading--your-account\"><a href=\"#heading--your-account\">Il tuo account</a></h2> \n\n\nDevi creare e accedere a un account per utilizzare alcune funzionalità del forum. \n\nPer creare un account, devi fornire alcune informazioni personali. \n\nSe crei un account, accetti di fornire almeno un indirizzo e-mail valido e di mantenerlo aggiornato. È possibile chiudere l'account in qualsiasi momento inviando un'e-mail a <%{contact_email}>. \n\n\nAccetti di essere responsabile di tutte le azioni intraprese utilizzando il tuo account, da te autorizzate o meno, fino a quando non chiudi il tuo account o comunichi alla società che il tuo account è stato violato. Ti impegni ad avvisare immediatamente la società se sospetti che il tuo account sia stato violato. Devi inoltre procedere alla scelta di una password sicura per il tuo account e mantenerla segreta. \n\n\n\nLa società può limitare, sospendere o chiudere il tuo account sul forum in base alla sua politica per la gestione delle richieste di rimozione relative al copyright o se la società ha motivi ragionevoli per ritenere che tu abbia violato qualsiasi regola dei presenti termini. \n\n\n<h2 id=\"heading--your-content\"><a href=\"#heading--your-content\">I tuoi contenuti</a></h2> \n\nNessuna disposizione contenuta nei presenti termini conferisce alla società alcun diritto sulla proprietà intellettuale dei contenuti che condividi nel forum, quali le informazioni del tuo account, i messaggi o altri contenuti che invii al forum. Nessuna disposizione contenuta nei presenti termini ti dà alcun diritto sulle proprietà intellettuali della società. \n\n\nSei l'unico responsabile dei contenuti che invii al forum. Sei consapevole di non poter ritenere erroneamente che i contenuti che invii al forum siano sponsorizzati o approvati dalla società. Questi termini non obbligano la società a archiviare, mantenere o fornire copie dei contenuti che invii, né a modificarli in base a questi termini. \n\n\nI contenuti che invii al forum appartengono a te e spetta a te decidere quale autorizzazione dare agli altri su di essi. Ma come minimo, autorizzi la società a fornire i contenuti che invii al forum ad altri utenti del forum. Tale licenza speciale consente alla società di copiare, pubblicare e analizzare i contenuti che invii al forum. \n\n\nQuando un contenuto inviato è rimosso dal forum, da te o dalla società, la licenza speciale della società termina quando l'ultima copia scompare dai backup, dalle cache e da altri sistemi della società. Altre licenze da te applicate ai contenuti inviati, ad esempio le licenze [Creative Commons](https://creativecommons.org), potrebbero continuare dopo la rimozione del contenuto. Tali licenze possono dare ad altri, o alla società stessa, il diritto di condividere nuovamente i tuoi contenuti attraverso il forum. \n\n\n\nAltri soggetti che ricevono contenuti che invii al forum potrebbero violare i termini in base ai quali concedi in licenza i tuoi contenuti. L'utente accetta che la società non sia responsabile nei confronti dell'utente per tali violazioni o le loro conseguenze. \n\n\n<h2 id=\"heading--responsibility\"><a href=\"#heading--responsibility\">Le tue responsabilità</a></h2> \n\n\nAccetti di indennizzare la società da rivendicazioni legali da parte di altri in relazione alla violazione di questi termini da parte tua o di altri che utilizzano il tuo account sul forum. Tu e la società vi impegnate a notificare all'altra parte qualsiasi rivendicazione legale per la quale ci potrebbe essere l'obbligo di indennizzare la società il prima possibile. Se la società non ti notifica tempestivamente un reclamo legale, non dovrai risarcire la società per i danni che avresti potuto evitare o ridurre con un preavviso tempestivo. Accetti che la società possa controllare procedimenti di indagine, difesa e risoluzione dei reclami legali per i quali dovresti risarcire la società e ti impegni a sostenere tali sforzi. La società si impegna a non accettare alcun accordo che attribuisca la colpa all'utente o gli imponga obblighi senza il suo previo consenso. \n\n\n<h2 id=\"heading--disclaimers\"><a href=\"#heading--disclaimers\">Scarico di responsabilità</a></h2> \n\n\n***Accetti tutti i rischi derivanti dall'utilizzo del forum e dei suoi contenuti. Nella misura consentita dalla legge, la società e i suoi fornitori forniscono il forum così com'è, senza alcuna garanzia.*** \n\n\nIl forum può creare collegamenti ipertestuali e integrare forum e servizi gestiti da altri. La società non fornisce alcuna garanzia sui servizi gestiti da altri o sui contenuti che possono fornire. L'utilizzo di servizi gestiti da altri può essere regolato da altri termini vigenti tra l'utente e il responsabile della gestione del servizio in questione. \n\n\n<h2 id=\"heading--liability\"><a href=\"#heading--liability\">Limitazioni di responsabilità</a></h2>\n\n\n ***Né la società né i suoi fornitori saranno responsabili nei tuoi confronti per danni derivanti da violazioni del contratto che il loro personale non avrebbe potuto ragionevolmente prevedere quando hai accettato questi termini.***\n\n\n\n ***Nella misura consentita dalla legge, la responsabilità totale nei confronti dell'utente per reclami di qualsiasi tipo relativi al forum o ai contenuti sul forum sarà limitata a $50.*** \n\n\n<h2 id=\"heading--feedback\"><a href=\"#heading--feedback\">Feedback</a></h2>\n\n\nLa società accoglie con favore feedback e suggerimenti per il forum. Consulta la successiva sezione [Contatti](#heading--contact) per trovare il modo di contattarci. \n\n\nAccetti che la società possa liberamente agire in base al feedback e ai suggerimenti che fornisci senza che la società debba informarti dell'uso del tuo feedback, né ottenere il tuo permesso di usarlo o pagarti. Accetti di non inviare commenti o suggerimenti che possano essere riservati o proprietari per te o per altri. \n\n\n<h2 id=\"heading--termination\"><a href=\"#heading--termination\">Conclusione del contratto</a></h2> \n\n\n\nL'utente o la società possono porre fine all'accordo descritto nei presenti termini in qualsiasi momento. Alla scadenza dell'accordo, termina anche il tuo permesso di utilizzare il forum. \n\n\nLe disposizioni contenute nelle seguenti sezioni sopravvivono alla fine del nostro accordo: [I tuoi contenuti](#heading--your-contenti), [Feedback](#heading--feedback), [Le tue responsabilità](#heading--responsibility), [Scarico di responsabilità](#heading--disclaimers), [Limitazioni delle responsabilità](#heading--liability) e [Termini generali](#heading-general). \n\n\n<h2 id=\"heading--disputes\"><a href=\"#heading--disputes\">Controversie</a></h2> %{governing_law} sarà competente a decidere su qualsiasi controversia relativa ai presenti termini o all'utilizzo del forum da parte tua. \n\nL'utente e la società si impegnano a richiedere pronunce giudiziarie su questioni relative ai presenti termini solo in tribunali statali o federali in %{city_for_disputes}. Né l'utente né la società presenteranno opposizione alla giurisdizione, al forum o alla sede in tali tribunali. \n\n\n***Prima di richiedere pronunce giudiziarie ai sensi del Computer Fraud and Abuse Act, l'utente e la società tenteranno di risolvere eventuali controversie richiedendo un procedimento arbitrale all'American Arbitration Association. Il procedimento arbitrale seguirà le norme delle Commercial Arbitration Rules and Supplementary Procedures for Consumer Related Disputes dell'AAA. Il procedimento arbitrale si svolgerà in %{city_for_disputes}. Ti impegni a risolvere eventuali controversie individualmente e non nell'ambito di class action o di altri procedimenti legali collettivi, sia in qualità di soggetto ricorrente che come membro di un gruppo collettivo. Nessun membro della commissione giudicante potrà unire il procedimento relativo a una controversia con altri procedimenti arbitrali senza il permesso della società.*** \n\n\nOgni lodo arbitrale comprenderà i costi procedimentali, spese legali e costi per i testimoni ragionevoli. L'utente e la società possono partecipare a lodi arbitrali in qualsiasi tribunale competente. \n\n\n<h2 id=\"heading--general\"><a href=\"#heading--general\">Termini generali</a></h2> \n\n\nSe una qualsiasi disposizione dei presenti termini non risulta legalmente applicabile nella forma in cui è scritta, ma potrebbe essere modificata per diventare applicabile, la disposizione in questione dovrà essere modificata nella misura minima necessaria per renderla applicabile. In caso contrario, tale disposizione dovrà essere eliminata. \n\nNon puoi assegnare il tuo contratto con la società a terzi. La società può assegnare il tuo contratto a qualsiasi società affiliata, a qualsiasi altra società che ottenga il controllo della società o che acquisti le risorse della società relative al forum. Qualsiasi tentativo di assegnare il contratto in violazione dei presenti termini non ha alcun valore legale. \n\nL'esercizio di specifici diritti ai sensi del presente Contratto e la rinuncia alla rivalsa in caso di particolari violazioni al presente Contratto non implicano la rinuncia a qualsiasi rivalsa in caso di altre violazioni al presente Contratto. \n\n\nI presenti termini contengono tutte le condizioni dell'accordo tra l'utente e la società sull'uso del forum. I presenti termini sostituiscono completamente qualsiasi altro accordo sull'utilizzo del forum da parte dell'utente, esistente in forma scritta o meno. \n\n\n<h2 id=\"heading--contact\"><a href=\"#heading--contact\">Contatti</a></h2>\n\nPuoi inviare notifiche alla società ai sensi dei presenti termini e fare domande all'indirizzo <%{contact_email}>. \n\n\nLa società può inviarti notifiche ai sensi dei presenti termini utilizzando l'indirizzo e-mail che hai fornito per registrare il tuo account sul forum, oppure pubblicando un messaggio sulla homepage del forum o ancora sulla pagina del tuo account. \n\n<h2 id=\"heading--changes\"><a href=\"#heading--changes\">Modifiche</a></h2>\n\nL'ultimo aggiornamento dei presenti termini da parte della società risale al [INSERT LAST UPDATE DATE HERE] e altri aggiornamenti potranno essere applicati in futuro.. La società pubblica tutti gli aggiornamenti sul forum. Per gli aggiornamenti che contengono modifiche sostanziali, la società si impegna a inviare un'e-mail agli utenti che hanno creato un account e hanno fornito un indirizzo e-mail valido. La società può anche annunciare aggiornamenti con messaggi o avvisi speciali sul forum. \n\nQuando ricevi la notifica di un aggiornamento ai presenti termini, dovrai accettare i nuovi termini per continuare a utilizzare il forum.\n"
   privacy_topic:
     title: "Informativa sulla privacy"
-    body: |
-      <a name="collect"></a>
-
-      ## [Quali informazioni raccogliamo?](#collect)
-
-      Raccogliamo informazioni su di te quando ti registri sul nostro sito e raccogliamo i dati quando partecipi alle attività del forum con la lettura, la scrittura, e la valutazione del contenuto condiviso qui.
-
-      Quando ti registri al nostro sito, ti potrebbe essere richiesto di inserire il tuo nome e l'indirizzo email. Puoi tuttavia visitare il nostro sito senza effettuare la registrazione. Il tuo indirizzo email sarà confermato, da una email contenente un link univoco. Cliccando tale link, sapremo che controlli l'indirizzo email.
-
-      Quando ti registri e pubblichi un messaggio, registriamo l'indirizzo IP da cui il messaggio ha origine. Possiamo anche conservare i log del server che includono gli indirizzi IP di ogni richiesta al nostro server.
-
-      <a name="use"></a>
-
-      ## [Per cosa usiamo i tuoi dati?](#use)
-
-      Ogni informazione che raccogliamo da te può essere utilizzata in uno dei seguenti modi:
-
-      * Per personalizzare la tua esperienza &mdash; le tue informazioni ci aiutano a rispondere meglio alle tue esigenze individuali.
-      * Per migliorare il nostro sito &mdash; ci sforziamo continuamente di migliorare il nostro sito sulla base delle informazioni e dei feedback che riceviamo da te.
-      * Per migliorare il servizio clienti &mdash; le tue informazioni ci aiutano a rispondere più efficacemente alle richieste di assistenza e alle esigenze di supporto.
-      * Per inviare email periodiche &mdash; l'indirizzo email che ci fornisci può essere usato per inviarti informazioni, notifiche sulle modifiche di argomenti che stai seguendo o in risposta alla citazione del tuo nome utente, per rispondere alle domande, e/o altre richieste.
-
-      <a name="protect"></a>
-
-      ## [Come proteggiamo i tuoi dati?](#protect)
-
-      Attuiamo una serie di misure di sicurezza per garantire la protezione dei tuoi dati personali quando accedi al forum, invii o accedi alle tue informazioni personali.
-
-      <a name="data-retention"></a>
-
-      ## [Qual è a vostra politica di conservazione dei dati?](#data-retention)
-
-      Ci impegneremo a:
-
-      * Conservare i log del server contenenti l'indirizzo IP di tutte le richieste al server per non più di 90 giorni.
-      * Conservare gli indirizzi IP associati a utenti registrati e i loro messaggi per non più di 5 anni.
-
-      <a name="cookies"></a>
-
-      ## [Usiamo i cookie?](#cookies)
-
-      Sì. I cookie sono piccoli file che un sito o il suo fornitore di servizi trasferiscono sul disco rigido del tuo computer tramite il browser Web (se acconsenti). Questi cookie consentono al sito di riconoscere il tuo browser e, se hai un account registrato, di associare il browser al tuo account registrato.
-
-      Utilizziamo i cookie per comprendere e salvare le tue preferenze per visite future e compilare dati aggregati sul traffico del sito e l'interazione del sito in modo da offrire migliori esperienze e strumenti in futuro. Possiamo stipulare contrati con fornitori di servizi di terze parti per aiutarci a comprendere meglio i visitatori del sito. Questi fornitori di servizi non sono autorizzati a utilizzare le informazioni raccolte per nostro conto, tranne che per aiutarci a condurre e migliorare la nostra attività.
-
-      <a name="disclose"></a>
-
-      ## [Divulghiamo informazioni a terze parti?](#disclose)
-
-      Non vendiamo, commerciamo o trasferiamo a terzi i tuoi dati personali. Questi soggetti non comprendono terze parti di nostra fiducia che ci aiutano nella gestione del nostro sito e a mantenere la nostra attività, nella misura in cui tali parti si impegnano a mantenere tali informazioni riservate. Potremmo anche condividere i tuoi dati quando crediamo che ciò sia opportuno per rispettare la legge, far rispettare le nostre politiche del sito, o proteggere i nostri diritti, proprietà e sicurezza, e quelli di altri. Tuttavia, le informazioni dei visitatori che non consentono l'identificazione personale possono essere fornite ad altre parti per marketing, pubblicità o altri usi.
-
-      <a name="third-party"></a>
-
-      ## [Link di terze parti](#third-party)
-
-      Occasionalmente, a nostra discrezione, possiamo includere o offrire prodotti o servizi di terzi sul nostro sito. Questi siti di terze parti hanno politiche sulla privacy separate e indipendenti. Non abbiamo quindi alcuna responsabilità per il contenuto e le attività di questi siti collegati. Tuttavia, cerchiamo di proteggere l'integrità del nostro sito, ed eventuali feedback sulla sicurezza di altri siti ci saranno molto utili.
-
-      <a name="coppa"></a>
-
-      ## [Legge sulla protezione dei dati personali dei bambini](#coppa)
-
-      Il nostro sito, i prodotti e i servizi sono tutti rivolti a persone di almeno 13 anni. Se questo server è negli Stati Uniti e sei al di sotto dei 13 anni, nel rispetto delle norme del COPPA ([Children's Online Privacy Protection Act](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)), non dovrai utilizzare questo sito.
-
-      <a name="online"></a>
-
-      ## [Politica sulla Privacy Online](#online)
-
-      Questa politica sulla privacy online si applica solo alle informazioni raccolte attraverso il nostro sito e non alle informazioni raccolte offline.
-
-      <a name="consent"></a>
-
-      ## [Il tuo consenso](#consent)
-
-      Usando il nostro sito, acconsenti alla nostra politica sulla privacy.
-
-      <a name="changes"></a>
-
-      ## [Cambiamenti sulla nostra Politica della Privacy](#changes)
-
-      Se decideremo di modificare la nostra politica sulla privacy, pubblicheremo i cambiamenti su questa pagina..
-
-      Questo documento è CC-BY-SA. Le ultime modifiche sono state effettuate il 31 Maggio 2013.
+    body: "## [Forum anmministratori, qui puoi trovare un esempio di modello iniziale per l'informativa sulla privacy che devi personalizzare per adeguarla alle esigenze del tuo sito.]\n\n<a name=\"collect\"></a>\n\n## [Quali informazioni raccogliamo?](#collect) \n\nRaccogliamo informazioni su di te quando ti registri sul nostro sito e raccogliamo i dati quando partecipi alle attività del forum con la lettura, la scrittura, e la valutazione del contenuto condiviso qui. \n\n\nQuando ti registri al nostro sito, ti potrebbe essere richiesto di inserire il tuo nome e l'indirizzo email. Puoi tuttavia visitare il nostro sito senza effettuare la registrazione. Il tuo indirizzo email sarà confermato, da una email contenente un link univoco. Cliccando tale link, sapremo che controlli l'indirizzo email. \n\nQuando ti registri e pubblichi un messaggio, registriamo l'indirizzo IP da cui il messaggio ha origine. Possiamo anche conservare i log del server che includono gli indirizzi IP di ogni richiesta al nostro server. \n\n<a name=\"use\"></a> \n\n## [Per cosa usiamo i tuoi dati?](#use) \n\nOgni informazione che raccogliamo da te può essere utilizzata in uno dei seguenti modi:\n\n * Per personalizzare la tua esperienza &mdash; le tue informazioni ci aiutano a rispondere meglio alle tue esigenze individuali. \n* Per migliorare il nostro sito &mdash; ci sforziamo continuamente di migliorare il nostro sito sulla base delle informazioni e dei feedback che riceviamo da te. \n\n* Per migliorare il servizio clienti &mdash; le tue informazioni ci aiutano a rispondere più efficacemente alle richieste di assistenza e alle esigenze di supporto. \n\n* Per inviare email periodiche &mdash; l'indirizzo email che ci fornisci può essere usato per inviarti informazioni, notifiche sulle modifiche di argomenti che stai seguendo o in risposta alla citazione del tuo nome utente, per rispondere alle domande, e/o altre richieste o domande \n\n\n<a name=\"protect\"></a> \n\n## [Come proteggiamo i tuoi dati?](#protect)\n\nAttuiamo una serie di misure di sicurezza per garantire la protezione dei tuoi dati personali quando accedi al forum, invii o accedi alle tue informazioni personali. \n\n\n<a name=\"data-retention\"></a> \n## [Qual è a vostra politica di conservazione dei dati?](#data-retention) \n\n\nCi impegneremo a: \n\n* Conservare i log del server contenenti l'indirizzo IP di tutte le richieste al server per non più di [NUMBER OF DAYS] giorni. * \n\n <a name=\"cookies\"></a> \n## [Usiamo i cookie?](#cookies) \n\nSì. I cookie sono piccoli file che un sito o il suo fornitore di servizi trasferiscono sul disco rigido del tuo computer tramite il browser Web (se acconsenti). Questi cookie consentono al sito di riconoscere il tuo browser e, se hai un account registrato, di associare il browser al tuo account registrato. \n\nUtilizziamo i cookie per comprendere e salvare le tue preferenze per visite future e compilare dati aggregati sul traffico del sito e l'interazione del sito in modo da offrire migliori esperienze e strumenti in futuro. Possiamo stipulare contrati con fornitori di servizi di terze parti per aiutarci a comprendere meglio i visitatori del sito. Questi fornitori di servizi non sono autorizzati a utilizzare le informazioni raccolte per nostro conto, tranne che per aiutarci a condurre e migliorare la nostra attività. \n\n<a name=\"disclose\"></a> \n\n## [Divulghiamo informazioni a terze parti?](#disclose) \n\n\nNon vendiamo, commerciamo o trasferiamo a terzi i tuoi dati personali. Questi soggetti non comprendono terze parti di nostra fiducia che ci aiutano nella gestione del nostro sito e a mantenere la nostra attività, nella misura in cui tali parti si impegnano a mantenere tali informazioni riservate. \n\nPotremmo anche condividere i tuoi dati quando crediamo che ciò sia opportuno per rispettare la legge, far rispettare le nostre politiche del sito, o proteggere i nostri diritti, proprietà e sicurezza, e quelli di altri. Tuttavia, le informazioni dei visitatori che non consentono l'identificazione personale possono essere fornite ad altre parti per marketing, pubblicità o altri usi. \n\n\n<a name=\"third-party\"></a> \n\n## [Link di terze parti](#third-party) Occasionalmente, a nostra discrezione, possiamo includere o offrire prodotti o servizi di terzi sul nostro sito. Questi siti di terze parti hanno politiche sulla privacy separate e indipendenti. Non abbiamo quindi alcuna responsabilità per il contenuto e le attività di questi siti collegati. Tuttavia, cerchiamo di proteggere l'integrità del nostro sito, ed eventuali feedback sulla sicurezza di altri siti ci saranno molto utili. \n\n\n<a name=\"coppa\"></a> \n\n## [Legge sulla protezione dei dati personali dei bambini](#coppa) \n\nIl nostro sito, i prodotti e i servizi sono tutti rivolti a persone di almeno 13 anni. Se questo server è negli Stati Uniti e sei al di sotto dei 13 anni, nel rispetto delle norme del COPPA ([Children's Online Privacy Protection Act](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)), non dovrai utilizzare questo sito. \n\n<a name=\"online\"></a> \n\n## [Politica sulla Privacy Online](#online) \n\nQuesta politica sulla privacy online si applica solo alle informazioni raccolte attraverso il nostro sito e non alle informazioni raccolte offline. \n\n<a name=\"consent\"></a> \n## [Il tuo consenso](#consent) \n\nUsando il nostro sito, accetti la nostra informativa sulla privacy. <a name=\"changes\"></a> \n## [Cambiamenti sulla nostra Infomrativa della Privacy](#changes) \n\nSe decideremo di modificare la nostra politica sulla privacy, pubblicheremo i cambiamenti su questa pagina.. \n\nQuesto documento è CC-BY-SA. Le ultime modifiche sono state effettuate il [INSERT LAST UPDATE DATE HERE].\n"
   badges:
     mass_award:
       errors:
@@ -4053,6 +4000,7 @@ it:
     required_tags_from_group:
       one: "Devi includere almeno %{count} etichetta %{tag_group_name}. Le etichette in questo gruppo sono: %{tags}."
       other: "Devi includere almeno %{count} etichette %{tag_group_name}. Le etichette in questo gruppo sono: %{tags}."
+    limited_to_one_tag_from_group: "I tag %{tags} non possono essere utilizzati contemporaneamente. Si prega di includerne solo uno."
     invalid_target_tag: "non può essere sinonimo di un sinonimo"
     synonyms_exist: "non è consentito finché esistono sinonimi"
   rss_by_tag: "Argomenti etichettati %{tag}"
@@ -4071,10 +4019,10 @@ it:
       message: "<p>Abbiamo rispedito una email di attivazione a <b>%{email}</b>"
   safe_mode:
     title: "Avvia Modalità Sicura"
-    description: "La modalità sicura ti consente di testare il tuo sito senza caricare plugin o temi."
+    description: "La modalità di sicurezza ti consente di testare il tuo sito senza caricare temi o personalizzazioni dei plug-in lato client. Le personalizzazioni dei plug-in lato server rimangono abilitate."
     no_themes: "Disabilita temi e componenti del tema"
-    no_unofficial_plugins: "Disabilita i plugin non ufficiali"
-    no_plugins: "Disabilita tutti i plugin"
+    no_unofficial_plugins: "Disattiva le personalizzazioni dei plug-in lato client non ufficiali"
+    no_plugins: "Disattiva tutte le personalizzazioni dei plug-in lato client"
     enter: "Avvia Modalità Sicura"
     must_select: "È necessario selezionare almeno un'opzione per accedere alla modalità sicura."
   wizard:
@@ -4189,7 +4137,9 @@ it:
           <p>Divertiti e buona fortuna <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>nel costruire la tua nuova comunità!</a></p>
   search_logs:
     graph_title: "Conteggio Ricerche"
-  joined: "Iscritto"
+  onebox:
+    discourse:
+      user_joined_community: "Iscritto il %{date}"
   discourse_push_notifications:
     popup:
       mentioned: '%{username} ti ha menzionato in ''%{topic}'' - %{site_title}'
@@ -4252,7 +4202,7 @@ it:
         category: impostazioni della categoria
     actions:
       agree:
-        title: "Acconsenti..."
+        title: "Sì"
       agree_and_keep:
         title: "Mantieni il messaggio"
         description: "Accetta la segnalazione e mantieni invariato il messaggio."
@@ -4260,42 +4210,45 @@ it:
         title: "Tieni il Messaggio Nascosto"
         description: "Accetta la segnalazione e lascia il messaggio nascosto."
       agree_and_suspend:
-        title: "Sospendi Utente"
+        title: "Sospendi utente"
         description: "Accetta la segnalazione e sospendi l'utente."
       agree_and_silence:
-        title: "Silenzia Utente"
+        title: "Silenzia utente"
         description: "Accetta la segnalazione e silenzia l'utente."
       agree_and_restore:
         title: "Ripristina Messaggio"
         description: "Ripristina il messaggio in modo che tutti gli utenti possano vederlo."
       agree_and_hide:
         title: "Nascondi Messaggio"
-        description: "Nascondi questo messaggio e invia automaticamente all'utente un messaggio privato che lo invita a modificarlo."
+        description: "Accetta la segnalazione, nascondi il messaggio e invia automaticamente all'utente un messaggio privato che lo invita a modificarlo."
       delete_single:
         title: "Elimina"
       delete:
         title: "Elimina..."
       delete_and_ignore:
-        title: "Elimina il messaggio e ignora"
-        description: "Elimina il messaggio. Se fosse il primo messaggio, elimina anche l'Argomento"
+        title: "Ignora segnalazione ed elimina post"
+        description: "Ignora segnalazione rimuovendola dalla coda ed elimina il messaggio; se è li primo messaggio, eliminare anche l'argomento. "
       delete_and_ignore_replies:
-        title: "Elimina il messaggio e le sue risposte, ed ignora la segnalazione"
-        description: "Cancella il messaggio e tutte le relative risposte; se è il primo messaggio, cancella anche l'argomento"
+        title: "Ignora segnalazione, elimina messaggio e risposte"
+        description: "Ignora segnalazione rimuovendola dalla coda ed elimina il messaggio e tutte le sue risposte; se è li primo messaggio, eliminare anche l'argomento"
         confirm: "Sei sicuro di voler eliminare anche le risposte al messaggio?"
       delete_and_agree:
-        title: "Elimina Messaggio e accetta"
-        description: "Elimina il messaggio. Se fosse il primo messaggio, elimina anche l'Argomento"
+        title: "Elimina messaggio"
+        description: "Accetta segnalazione ed elimina questo messaggio; se è il primo messaggio, eliminare anche l'argomento."
       delete_and_agree_replies:
-        title: "Elimina il messaggio e le sue risposte, e accetta la segnalazione"
-        description: "Cancella il messaggio e tutte le relative risposte; se è il primo messaggio, cancella anche l'argomento"
+        title: "Elimina il messaggio e risposte"
+        description: "Accetta segnalazione ed elimina questo messaggio; se è i primo messaggio, eliminare anche l'argomento."
         confirm: "Sei sicuro di voler eliminare anche le risposte al messaggio?"
       disagree_and_restore:
-        title: "Esprimi disaccordo e ripristina il Messaggio"
+        title: "No, ripristina messaggio"
         description: "Ripristina il messaggio in modo che tutti gli utenti possano vederlo."
       disagree:
-        title: "Rifiuta"
+        title: "No"
       ignore:
         title: "Ignora"
+      ignore_and_do_nothing:
+        title: "Non fare nulla"
+        description: "Ignora segnalazione rimuovendola dalla coda senza intraprendere alcuna azione. I messaggi nascosti rimarranno nascosti e saranno gestiti dagli strumenti automatici."
       approve:
         title: "Approva"
       approve_post:
@@ -4354,6 +4307,11 @@ it:
     payload_url:
       blocked_or_internal: "L'URL del payload non può essere utilizzato perché si risolve in un IP interno o bloccato"
       unsafe: "L'URL del payload non può essere utilizzato perché non è sicuro"
+  form_templates:
+    errors:
+      invalid_yaml: "non è una stringa YAML valida"
+      invalid_type: "contiene un tipo di modello non valido: %{type} (i tipi validi sono: %{valid_types})"
+      missing_type: "manca un tipo di campo"
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml
index a025439c5a7..59d7bf9ffb9 100644
--- a/config/locales/server.ja.yml
+++ b/config/locales/server.ja.yml
@@ -183,8 +183,6 @@ ja:
       load_from_remote: "投稿を読み込み中にエラーが発生しました。"
     site_settings:
       invalid_category_id: "存在しないカテゴリを指定しました"
-      invalid_choice:
-        other: "無効な選択肢 %{name} を指定しました"
       default_categories_already_selected: "他のリストで使われているカテゴリは選択できません。"
       default_tags_already_selected: "別のリストに使用されているタグを選択できません。"
       s3_upload_bucket_is_required: "'s3_upload_bucket' を入力しない限り、S3 へのアップロードを有効にすることはできません。"
@@ -192,7 +190,6 @@ ja:
       page_publishing_requirements: "セキュリティで保護されているメディアが有効である場合、ページの公開を有効にできません。"
       s3_backup_requires_s3_settings: "'%{setting_name}' が入力されていない場合、S3 をバックアップとして使用することはできません。"
       s3_bucket_reused: "'s3_upload_bucket' and 's3_backup_bucket' に同じバケットを使用することはできません。別のバケットを選択するか、バケットごとに異なるパスを使用してください。"
-      secure_uploads_requirements: "安全なアップロードを有効にする前に、S3 アップロードを有効にする必要があります。"
       share_quote_facebook_requirements: "Facebook に引用を共有できるようにするには、Facebook アプリの ID を設定する必要があります。"
       second_factor_cannot_enforce_with_socials: "ソーシャルログインが有効になっている状態で 2FA を適用することはできません。先に、%{auth_provider_names} でログインを無効にする必要があります。"
       second_factor_cannot_be_enforced_with_disabled_local_login: "ログインが無効になっている場合、2FA を適用することはできません。"
@@ -562,10 +559,6 @@ ja:
             duration_minutes:
               cannot_be_zero: "は 0 より大きい必要があります。"
               exceeds_maximum: "は 20 年を越えてはいけません。"
-        translation_overrides:
-          attributes:
-            value:
-              invalid_interpolation_keys: '次の補間キーは無効です: "%{keys}"'
         watched_word:
           attributes:
             word:
@@ -585,23 +578,6 @@ ja:
   meta_category_description: "このサイト、組織、仕組み、および改善に関するディスカッションです。"
   staff_category_name: "スタッフ"
   staff_category_description: "スタッフディスカッション用の非公開カテゴリです。トピックは管理者とモデレーターのみが閲覧できます。"
-  discourse_welcome_topic:
-    title: "コミュニティーへようこそ！"
-    body: |2
-
-      この固定トピックの最初の写真は、ようこそメッセージとしてホームページを初めて訪問するすべてのユーザーに表示されるものであるため、重要です！
-
-      コミュニティーの簡単な説明になるように、**これを編集**しましょう。
-
-      - これは誰のためのコミュニティーですか？
-      - どのような情報を得られますか？
-      - 参加するメリットは何ですか？
-      - 詳細 (リンク、リソースなど) はどこに記載されていますか？
-
-      <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
-
-      お知らせに返信が溜まらないように、管理からこのトピックをクローズすることができます :wrench: (右上と下)。
-  admin_quick_start_title: "最初にお読みください: 管理者クイックスタートガイド"
   category:
     topic_prefix: "%{category} カテゴリについて"
     replace_paragraph: "(この最初の段落を、新しいカテゴリの簡単な説明に置き換えてください。このガイダンスはカテゴリ選択エリアに表示されるため、200 文字未満で記述してください。)"
@@ -1057,7 +1033,7 @@ ja:
       title: "DAU/MAU"
       xaxis: "日"
       yaxis: "DAU/MAU"
-      description: "前日にログインしたメンバーの数を先月にログインしたメンバーの数で割った数 - コミュニティーの「粘着性」を示す割合 % を返します。30% 以上を目指してください。"
+      description: "前日にログインしたメンバーの数を先月にログインしたメンバーの数で割った数 - コミュニティーの「粘着性」を示す割合 % を返します。20% 以上を目指してください。"
     daily_engaged_users:
       title: "1 日のエンゲージユーザー"
       xaxis: "日"
@@ -1424,7 +1400,6 @@ ja:
     manifest_icon: "Android でロゴ/スプラッシュ画像として使用される画像。自動的に 512 × 512 にサイズ変更されます。空のままにすると、large_icon が使用されます。"
     manifest_screenshots: "インストールプロンプトページでインスタンスの特徴と機能を紹介するスクリーンショット。すべての画像はローカルアップロードであり、同じサイズである必要があります。"
     favicon: "サイトのファビコン。<a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://en.wikipedia.org/wiki/Favicon</a> をご覧ください。CDN で正しく動作させるには、png である必要があります。32 x 32 にサイズ変更されます。空のままにすると、large_icon が使用されます。"
-    apple_touch_icon: "Apple タッチデバイスに使用されるアイコン。自動的に 180x180 にサイズ変更されます。空のままにすると、large_icon が使用されます。"
     opengraph_image: "デフォルトの opengraph 画像。ページにほかの適切な画像がない場合に使用されます。空のままにすると、large_icon が使用されます"
     twitter_summary_large_image: "Twitter カードの 'summary large image' (幅 280 以上、高さ 150 以上である必要があり、.svg を使用できません)。空のままにすると、.svg でない限り opengraph_image を使って通常のカードメタデータが生成されます。"
     notification_email: "システムからの重要なメール送信に使用する from: メールアドレス。メールが届くように、ここに指定されたドメインは SPF、DKIM、逆引き PTR レコードが正しく設定されている必要があります。"
@@ -1555,7 +1530,6 @@ ja:
     enable_discourse_connect: "DiscourseConnect (旧 'Discourse SSO') を介したサインオンを有効にする (警告: ユーザーのメールアドレスは外部サイトで *検証される必要があります*！)"
     verbose_discourse_connect_logging: "詳細な DiscourseConnect 関連診断を <a href='%{base_path}/logs' target='_blank'>/logs</a> に記録する"
     enable_discourse_connect_provider: "DiscourseConnect (旧 'Discourse SSO') プロバイダープロトコルを /session/sso_provider エンドポイントに実装する。discourse_connect_provider_secrets を設定する必要があります"
-    discourse_connect_url: "DiscourseConnect エンドポイントの URL (http:// または https:// を含める必要があります)"
     discourse_connect_secret: "DiscourseConnect 認証情報の暗号化に利用する秘密の文字列。10文字以上である必要があります"
     discourse_connect_provider_secrets: "DiscourseConnect を使用しているドメインとシークレットのペアのリスト。DiscourseConnect シークレットは 10 文字以上であることを確認してください。ワイルドカード記号 * を使用して、任意のドメインまたはその一部のみに一致させることができます (例: *.example.com)。"
     discourse_connect_overrides_bio: "ユーザープロファイルのユーザー略歴をオーバーライドし、ユーザーが変更できないようにする"
@@ -1569,7 +1543,6 @@ ja:
     discourse_connect_overrides_profile_background: "ユーザープロファイルの背景を DiscourseConnect ペイロードの値でオーバーライドする。"
     discourse_connect_overrides_card_background: "ユーザーカードの背景を DiscourseConnect ペイロードの値でオーバーライドする。"
     discourse_connect_not_approved_url: "未承認の DiscourseConnect アカウントをこの URL にリダイレクトする"
-    discourse_connect_allows_all_return_paths: "DiscourseConnect が指定する return_paths のドメインを制限しない (デフォルトでは、リターンパスは現在のサイトにある必要があります)"
     enable_local_logins: "ローカルのユーザー名とパスワードでログインするアカウントを有効にする。警告: 無効にすると、以前に少なくとも 1 つの代替ログイン方法を構成していない場合にログインできなくなる可能性があります。"
     enable_local_logins_via_email: "メールで送信されるワンクリックログインリンクをユーザーがリクエストすることを許可する。"
     allow_new_registrations: "新しいユーザーの登録を許可。新規アカウントを作成できないようにするには、これをオフにします。"
@@ -1673,7 +1646,6 @@ ja:
     composer_media_optimization_image_bytes_optimization_threshold: "クライアント側の最適化をトリガーする画像ファイルの最小サイズ"
     composer_media_optimization_image_resize_dimensions_threshold: "クライアント側のサイズ変更をトリガーする画像の最小幅"
     composer_media_optimization_image_resize_width_target: "幅が `composer_media_optimization_image_dimensions_resize_threshold` より大きい画像はこの花にサイズ変更されます。`composer_media_optimization_image_dimensions_resize_threshold` 以上 (>=) である必要があります。"
-    composer_media_optimization_image_encode_quality: "再エンコードプロセスで使用される JPEG エンコード品質。"
     min_ratio_to_crop: "高さのある画像のトリミングに使用される比率。幅 ÷ 高さの結果を入力します。"
     simultaneous_uploads: "コンポーザーにドラッグアンドドロップできるファイルの最大数"
     default_invitee_trust_level: "招待したユーザーのデフォルトの信頼レベル (0～4)。"
@@ -1702,7 +1674,6 @@ ja:
     tl3_requires_likes_given: "信頼レベル 3 への昇格資格を満たす上で、ユーザーが過去 (tl3 time period) 日間で与える必要のある「いいね！」の最小数。"
     tl3_requires_likes_received: "信頼レベル 3 への昇格資格を満たす上で、ユーザーが過去 (tl3 time period) 日間で得る必要のある「いいね！」の最小数。"
     tl3_links_no_follow: "信頼レベル 3 のユーザーが投稿したリンクから rel=nofolow を削除しない。"
-    trusted_users_can_edit_others: "信頼レベルの高いユーザーがほかのユーザーのコンテンツを編集することを許可する"
     min_trust_to_create_topic: "新規トピックを作成するために必要な最低信頼レベル。"
     allow_flagging_staff: "有効にすると、ユーザーはスタッフアカウントの投稿を通報できるようになります。"
     min_trust_to_edit_wiki_post: "ウィキとしてマークされた投稿を編集するために必要な最低信頼レベル。"
@@ -1738,7 +1709,6 @@ ja:
     title_min_entropy: "トピックタイトルの最小許容エントロピー (特殊文字や英語以外の単語を含むとより大きな値になります)"
     body_min_entropy: "投稿本文の最小許容エントロピー (特殊文字や英語以外の単語を含むとより大きな値になります)"
     allow_uppercase_posts: "トピックタイトルまたは投稿本文での大文字のみ使用を許可する。"
-    max_consecutive_replies: "返信を追加できなくなるまでに、ユーザーがトピックで連続して作成できる投稿数。"
     enable_filtered_replies_view: '"返信 (n) 件" ボタンはほかのすべての投稿を折りたたみ、現在の投稿とその返信のみを表示します。'
     title_fancy_entities: "トピックのタイトル内の共通の ASCII 文字をファンシーな HTML エンティティ (SmartyPants、<a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</a>) に変換する"
     min_title_similar_length: "類似トピックのチェックに必要な最小タイトル長"
@@ -1845,7 +1815,6 @@ ja:
     pop3_polling_password: "ポーリングを行う POP3 アカウントのパスワードです。"
     pop3_polling_delete_from_server: "サーバーからメールを削除する。注意: これを無効にした場合、メールの受信トレイを手動でクリーンアップする必要があります"
     log_mail_processing_failures: "すべてのメール処理の失敗を <a href='%{base_path}/logs' target='_blank'>/logs</a> に記録する"
-    email_in: 'ユーザーがメールによって新規トピックを投稿することを許可する (手動または pop3 ポーリングが必要です)。各カテゴリの "設定" タブでアドレスを構成します。'
     email_in_min_trust: "メールでのトピック作成を許可する最低信頼レベル"
     email_in_authserv_id: "受信メールに認証チェックを実行するサービスの識別子。この構成方法については、<a href='https://meta.discourse.org/t/134358'>https://meta.discourse.org/t/134358</a> をご覧ください。"
     email_in_spam_header: "迷惑を検出するためのメールヘッダー。"
@@ -1918,22 +1887,17 @@ ja:
     permalink_normalizations: "パーマリンクを照合する前に、次の正規表現を適用する。例: /(topic.*)\\?.*/\\1 はトピックルートからクエリ文字列を削除します。形式は正規表現+文字列です。キャプチャにアクセスするには \\1 などを使用します"
     global_notice: "すべての訪問者に緊急で非常の閉じられないグローバルバナー通知を表示する。空白にすると非表示になります (HTML 可)。"
     disable_system_edit_notifications: "download_remote_images_to_local' が有効である場合、システムユーザーによる編集の通知を無効にします。"
-    disable_category_edit_notifications: "トピックのカテゴリ編集通知を無効にします。"
-    disable_tags_edit_notifications: "トピックのタグ編集通知を無効にします。"
     notification_consolidation_threshold: "複数の通知が 1 つの通知に統合される前に受信した「いいね！」またはメンバーシップリクエストの通知の数。"
     likes_notification_consolidation_window_mins: "しきい値に達すると「いいね！」された複数の通知が 1 つの通知に統合される期間 (分)。しきい値は `SiteSetting.notification_consolidation_threshold` で構成できます。"
     automatically_unpin_topics: "ユーザーが最後に達したら、自動的にトピックの固定表示を解除する。"
     read_time_word_count: "推定読了時間を計算するための 1 分あたりの語数。"
     topic_page_title_includes_category: "トピックページの<a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title' target='_blank'>タイトルタグ</a>にはカテゴリ名が含まれます。"
-    native_app_install_banner_ios: "iOS デバイスの DiscourseHub アプリバナーを通常のユーザー (信頼レベル 1 以上) に表示する。"
-    native_app_install_banner_android: "Android デバイスの DiscourseHub アプリバナーを通常のユーザー (信頼レベル 1 以上) に表示する。"
     app_association_android: "Google の Digital Asset Links API に使用される <a href='%{base_path}/.well-known/assetlinks.json'>.well-known/assetlinks.json</a> エンドポイントのコンテンツ。"
     app_association_ios: "このサイトと iOS アプリの間にユニバーサルリンクを作成するために使用される <a href='%{base_path}/apple-app-site-association'>apple-app-site-association</a> エンドポイントのコンテンツ。"
     share_anonymized_statistics: "匿名化された使用統計を共有する。"
     auto_handle_queued_age: "この日数後に、レビュー待ちのレコードを自動的に処理する。通報は無視されます。キューに入れられた投稿とユーザーは拒否されます。0 に設定するとこの機能は無効になります。"
     penalty_step_hours: "ユーザーの投稿禁止または凍結に使用されるデフォルトのペナルティ (時間)。最初の違反はデフォルトで最初の値になり、2 番目の違反はデフォルトで 2 番目の値になります。"
     svg_icon_subset: "アセットに含める追加の FontAwesome 5 アイコンを追加する。ソリッドアイコンには 'fa-'、通常のアイコンには 'far-'、ブランドアイコンには 'fab-' のプレフィックスを使用します。"
-    max_prints_per_hour_per_user: "/print ページの最大インプレッション数 (0 に設定すると無効になります)"
     full_name_required: "ユーザープロファイルのフルネームを必須にします。"
     enable_names: "ユーザーのプロフィール、ユーザーカード、メールアドレスでのフルネームを表示します。無効にすると、フルネームはすべての場所で非表示になります。"
     display_name_on_posts: "投稿に、@username に加えてユーザーのフルネームを表示します。"
@@ -1954,17 +1918,11 @@ ja:
     allowed_href_schemes: "http と https のほかにリンクに使用できるスキーム。"
     embed_post_limit: "埋め込める投稿の最大数。"
     embed_username_required: "トピック作成用のユーザー名が必要です。"
-    notify_about_flags_after: "この時間の経過後に未処理の通報がある場合、モデレーターに個人メッセージを送信する。無効にするには 0 に設定します。"
-    show_create_topics_notice: "サイトの公開トピック数が 5 件未満である場合、管理者にトピックを作成するかどうかを尋ねる通知を表示します。"
     delete_drafts_older_than_n_days: "(n) 日間経過した下書きを削除します。"
     delete_merged_stub_topics_after_days: "完全にマージされたスタブトピックを自動的に削除するまで待機する日数。0 に設定すると、スタブトピックは削除されません。"
-    bootstrap_mode_min_users: "ブートストラップモードを無効にするために必要な最低ユーザー数 (0 に設定すると無効になります)"
     prevent_anons_from_downloading_files: "匿名ユーザーが添付ファイルをダウンロードできないようにする。"
-    secure_media: "非推奨: 代わりに secure_uploads を使用してください。Discourse 3.0 で削除されます。"
     secure_uploads: 'すべてのアップロード (画像、動画、音声、テキスト、pdf、zip など) へのアクセスを制限する。“login required” が有効である場合、ログイン済みのユーザーのみがアップロードにアクセスできます。そうでない場合は、個人メッセージと非公開カテゴリのメディアアップロードのアクセスのみが制限されます。警告: この設定は複雑であるため、管理を十分に理解している必要があります。詳細については、<a target="_blank" href="https://meta.discourse.org/t/-/140017">メタに関するセキュリティで保護されたアップロードのトピック</a>をご覧ください。'
-    secure_media_allow_embed_images_in_emails: "非推奨: secure_uploads_allow_embed_images_in_emails を使用してください。Discourse 3.0 で削除されます。"
     secure_uploads_allow_embed_images_in_emails: "通常はメールで編集されるセキュリティで保護された画像のサイズが 'secure uploads max email embed image size kb' 設定よりも小さい場合、その埋め込みを許可します。"
-    secure_media_max_email_embed_image_size_kb: "非推奨: secure_uploads_max_email_embed_image_size_kb を使用してください。Discourse 3.0 で削除されます。"
     secure_uploads_max_email_embed_image_size_kb: "'secure uploads allow embed in emails' 設定が有効である場合にメールに埋め込まれるセキュリティで保護された画像のサイズのカットオフ。その設定が有効でない場合、この設定の効果はありません。"
     slug_generation_method: "スラッグ生成方法を選択します。'encode' はパーセントエンコード文字列を生成します。'none'は、スラッグを無効にします。"
     enable_emoji: "絵文字を有効にする"
@@ -2031,7 +1989,6 @@ ja:
     revoke_api_keys_days: "未使用の API キーが自動的に取り消されるまでの日数 (0 に設定すると取り消されません)"
     allow_user_api_keys: "ユーザー API キーの生成を許可する"
     allow_user_api_key_scopes: "ユーザー API キーに許可されるスコープのリスト"
-    min_trust_level_for_user_api_key: "ユーザー API キーの生成に必要な信頼レベル"
     allowed_user_api_auth_redirects: "ユーザー API キーの認証リダイレクトに許可された URL。任意の部分を照合するには、ワイルドカード記号 * を使用できます (例: www.example.com/*)。"
     allowed_user_api_push_urls: "ユーザー API へのサーバープッシュで許可される URL"
     expire_user_api_keys_days: "ユーザー API キーが自動的に期限切れになるまでの日数 (0 に設定すると期限切れになりません)"
@@ -2063,7 +2020,6 @@ ja:
     enable_sitemap: "サイトのサイトマップを生成し、robots.txt ファイルに含めます。"
     sitemap_page_size: "各サイトマップページに含める URL の数。最大 50,000"
     enable_user_status: "(実験的) ユーザーがカスタムステータスメッセージ (絵文字 + 説明) を設定できるようにします。"
-    enable_user_tips: "(実験的) 重要な機能をユーザーに説明する新しいユーザーヒントを有効にする"
     short_title: "短いタイトルはユーザーのホーム画面、ランチャー、またはスペースが限られている場所に使用されます。12 文字に制限する必要があります。"
     dashboard_hidden_reports: "ダッシュボードから指定されたレポートを非表示にすることを許可する。"
     dashboard_visible_tabs: "表示するダッシュボードのタブを選択します。"
@@ -2080,10 +2036,6 @@ ja:
     suggest_weekends_in_date_pickers: "日付ピッカーの候補に週末 (土曜日と日曜日) を含めます (月曜日から金曜日の平日にのみ Discourse を使用する場合は、これを無効にします)。"
     splash_screen: "サイトアセットの読み込み中に一時的なローディング画面を表示します"
     navigation_menu: "使用するナビゲーションメニューを決定します。サイドバーとヘッダーナビゲーションはユーザーがカスタマイズできます。下位互換性を得るには、レガシーオプションを使用できます。"
-    default_sidebar_categories: "選択されたカテゴリは、デフォルトでサイドバーのカテゴリセクションに表示されます。"
-    default_sidebar_tags: "選択されたタグは、デフォルトでサイドバーのタグセクションに表示されます。"
-    enable_new_user_profile_nav_groups: "実験的: 選択されたグループのユーザーは、新しいユーザープロファイルナビゲーションメニューに表示されます。"
-    enable_experimental_topic_timeline_groups: "実験的: 選択されたグループのユーザーに、リファクタリングされたトピックタイムラインを表示します"
     enable_experimental_hashtag_autocomplete: "実験的: 選択した項目を異なる方法で表示し、改善された検索機能を備えた新しい #hashtag 自動補完システムをカテゴリとタグに使用します。"
     errors:
       invalid_css_color: "無効な色です。色名または 16 進数値を入力してください。"
@@ -2110,7 +2062,6 @@ ja:
       pop3_polling_password_is_empty: "POP3 ポーリングを有効にする前に、'pop3 polling password' を設定する必要があります。"
       pop3_polling_authentication_failed: "POP3 認証に失敗しました。pop3 の資格情報を確認してください。"
       reply_by_email_address_is_empty: "メールによる返信を有効にする前に、'reply by email address' を設定する必要があります。"
-      email_polling_disabled: "メールによる返信を有効にする前に、手動または POP3 ポーリングのいずれかを有効にする必要があります。"
       user_locale_not_enabled: "この設定を有効にする前に 'allow user locale' を有効にする必要があります。"
       personal_message_enabled_groups_invalid: "この設定には、少なくとも 1 つのグループを指定する必要があります。スタッフ以外の人が PM を送信できないようにするには、スタッフグループを選択してください。"
       invalid_regex: "正規表現が無効であるか、許可されていません。"
@@ -2119,7 +2070,6 @@ ja:
       staged_users_disabled: "この設定を有効にする前に 'staged users' を有効にする必要があります。"
       reply_by_email_disabled: "この設定を有効にする前に 'reply by email' を有効にする必要があります。"
       discourse_connect_url_is_empty: "この設定を有効にする前に 'discourse connect url' を設定する必要があります。"
-      discourse_connect_invite_only: "DiscourseConnect と invite only を同時に有効にすることはできません。"
       enable_local_logins_disabled: "この設定を有効にする前に 'enable local logins' を有効にする必要があります。"
       min_username_length_exists: "最も短いユーザー名 (%{username}) を超える最小のユーザー名の長さを設定することはできません。"
       min_username_length_range: "最小値を最大値より上にすることはできません。"
@@ -2141,7 +2091,6 @@ ja:
       search_tokenize_japanese_enabled: "この設定を有効にする前に 'search_tokenize_japanese' を無効にする必要があります。"
       discourse_connect_cannot_be_enabled_if_second_factor_enforced: "2FA が適用されている場合、DiscourseConnect を有効にできません。"
       delete_rejected_email_after_days: "この設定は delete_email_logs_after_days 設定より小さいか %{max} より大きく設定することはできません。"
-      invalid_uncategorized_category_setting: "「未分類トピックを許可」が許可されていない場合、未分類カテゴリを選択できません"
     placeholder:
       discourse_connect_provider_secrets:
         key: "www.example.com"
@@ -2316,7 +2265,6 @@ ja:
     activated_by_staff: "スタッフによる有効化"
     new_user_typed_too_fast: "新規ユーザーは入力が速すぎます"
     content_matches_auto_silence_regex: "コンテンツは自動投稿禁止の正規表現に一致します"
-    content_matches_auto_block_regex: "コンテンツは自動ブロックの正規表現に一致します"
     username:
       short: "は少なくとも %{min} 文字である必要があります"
       long: "は %{max} 文字以下である必要があります"
@@ -3045,14 +2993,6 @@ ja:
     user_automatically_silenced:
       title: "ユーザーは自動的に投稿禁止にされました"
       subject_template: "新規ユーザー %{username} はコミュニティー通報により投稿禁止になりました"
-      text_body_template: |
-        これは自動メッセージです。
-
-        新規ユーザー [%{username}](%{user_url}) は、複数のユーザーが %{username} の投稿を通報したため自動的に投稿禁止になりました。
-
-        [通報をレビュー](%{base_url}/admin/flags)してください。%{username} が誤って投稿禁止になっている場合は、[このユーザーの管理者ページ](%{user_url})にある投稿禁止解除ボタンをクリックしてください。
-
-        このしきい値は、`silence_new_user` サイト設定から変更できます。
     spam_post_blocked:
       title: "迷惑投稿はブロックされました"
       subject_template: "同一リンクの連続投稿により、新規ユーザー %{username} の投稿をブロック"
@@ -3085,15 +3025,6 @@ ja:
       title: "リモート画像のダウンロードは無効化されています"
       subject_template: "リモート画像のダウンロードは無効化されました"
       text_body_template: "`download_remote_images_threshold` のディスク空き容量制限に達したため、`download_remote_images_to_local` 設定は無効になりました。"
-    dashboard_problems:
-      title: "ダッシュボードの問題"
-      subject_template: "サイトダッシュボードに関する新しいアドバイス"
-      text_body_template: |
-        あなたの現在のサイト設定に基づき、新しいアドバイスと推奨事項がいくつかあります。
-
-        [サイトダッシュボードにアクセス](%{base_url}/admin)して、それらをご覧ください。
-
-        ダッシュボードに何も表示されない場合は、別のスタッフメンバーがすでにこのアドバイスに対応した可能性があります。スタッフ操作のリストは[スタッフ操作ログ](%{base_url}/admin/logs/staff_action_logs)をご覧ください。
     new_user_of_the_month:
       title: "あなたは今月の新規ユーザーです！"
       subject_template: "あなたは今月の新規ユーザーです！"
@@ -3128,9 +3059,6 @@ ja:
     reached_limit:
       other: "注意: 1 日あたり最大 %{count} 通のメールを送信します。サイトをチェックして、抑制されているメールを確認してください。追伸: 人気者でいてくれてありがとう！"
     in_reply_to: "返信:"
-    unsubscribe:
-      title: "購読解除"
-      description: "メールの購読に興味がありませんか？下のリンクをクリックすると、すぐに購読を解除できます:"
     reply_by_email: "返信するには、[トピックにアクセス](%{base_url}%{url})するか、このメールに返信してください。"
     reply_by_email_pm: "%{participants} に返答するには、[メッセージにアクセス](%{base_url}%{url})するか、このメールに返信してください。"
     only_reply_by_email: "返答するにはこのメールに返信してください。"
@@ -3426,7 +3354,6 @@ ja:
       liked_received: "受け取った「いいね！」"
       new_users: "新規ユーザー"
       popular_topics: "人気のトピック"
-      follow_topic: "このトピックをフォロー"
       join_the_discussion: "もっと読む"
       popular_posts: "人気の投稿"
       more_new: "あなたへの新着情報"
@@ -3611,15 +3538,6 @@ ja:
   offline:
     title: "アプリを読み込めません"
     offline_page_message: "オフラインになっているようです！ネットワーク接続を確認して、もう一度お試しください。"
-  login_required:
-    welcome_message: |
-      ## [%{title} へようこそ](#welcome)
-      アカウントが必要です。続行するには、アカウントを作成するかログインしてください。
-    welcome_message_invite_only: |
-      ## [%{title} へようこそ](#welcome)
-      アカウントが必要です。続行するには、既存のメンバーに招待をリクエストするかログインしてください。
-  deleted: "削除"
-  image: "画像"
   upload:
     edit_reason: "ダウンロードされた画像のコピー"
     unauthorized: "アップロードしようとしているファイルは許可されていません (許可されている拡張子: %{authorized_extensions})。"
@@ -3820,91 +3738,8 @@ ja:
       法関連は退屈な内容ですが、私たち自身、それからあなたとあなたのデータを、悪意のある人たちから守らなければなりません。コンテンツ、プライバシー、そして法に関連するあなたの (および私たちの) 行動と権利を記述した[利用規約](%{base_path}/tos)が存在します。このサービスを使用するには、その[TOS](%{base_path}/tos)を順守することに同意する必要があります。
   tos_topic:
     title: "利用規約"
-    body: "本規約は <%{base_url}> にあるインターネットフォーラムの利用を規定するものです。フォーラムを使用するには、フォーラムを運営する %{company_name} と本規約に合意する必要があります。\n\n当社は、異なる規約の下でほかの製品やサービスを提供する場合があります。本規約はこのフォーラムの使用にのみ適用されます。 \n\n以下の項目にジャンプできます。\n\n- [重要な規約](#heading--important-terms)\n- [フォーラムを使用する権利](#heading--permission)\n- [フォームの使用に際する条件](#heading--conditions)\n- [許容される使用](#heading--acceptable-use)\n- [コンテンツ基準](#heading--content-standards)\n- [適用](#heading--enforcement)\n- [あなたのアカウント](#heading--your-account)\n- [あなたのコンテンツ](#heading--your-content)\n- [あなたの責任](#heading--responsibility)\n- [免責事項](#heading--disclaimers)\n- [責任の制限](#heading--liability)\n- [フィードバック](#heading--feedback)\n- [解約](#heading--termination)\n- [紛争](#heading--disputes)\n- [一般規約](#heading--general)\n- [連絡先](#heading--contact)\n- [変更](#heading--changes)\n\n<h2 id=\"heading--important-terms\"><a href=\"#heading--important-terms\">重要な規約</a></h2>\n\n***本規約には、「[免責事項](#heading--disclaimers)」に記載される免責事項、「[責任の制限](#heading--liability)」に記載される当社のあなたに対する責任の制限、「[あなたの使用に対する責任](#heading--responsibility)」に記載される、あなたの誤使用に起因する損害に対してあなたが当社を補償することへの合意、「[紛争](#heading--disputes)」に記載される紛争を仲裁することの合意など、あなたの権利と責任に影響する重要な規定が多数含まれています。***\n\n<h2 id=\"heading--permission\"><a href=\"#heading--permission\">フォーラムを使用する権利</a></h2>\n\n本規約に従い、当社はあなたにフォーラムを使用する権限を付与します。本フォーラムの使用には、すべての人が本規約に同意する必要があります。\n\n<h2 id=\"heading--conditions\"><a href=\"#heading--conditions\">フォーラムの使用に際する条件</a></h2>\n\nフォーラムを使用するあなたの権利は、以下の条件に基づきます。\n\n1. 13 歳以上であること。\n\n2. 当社があなたに直接連絡し、使用できないと伝えられた場合、それ以降で本フォーラムを使用することはできません。\n\n3. フォーラムの使用は、「[許容される使用](#heading--acceptable-use)」と「[コンテンツ基準](#heading--content-standards)」に従う必要があります。\n\n<h2 id=\"heading--acceptable-use\"><a href=\"#heading--acceptable-use\">許容される使用</a></h2>\n\n1. フォーラムを使用して違法行為を行ってはいけません。\n\n2. 特定の許可がない限り、フォーラムで別のアカウントを使用したり、使用しようとしたりしてはいけません。\n\n3. フォーラムでユーザー名またはその他の一意の ID を購入、販売、または交換してはいけません。\n\n4. 商用のメーリングリストまたはデータベース用にアドレスまたはその他の個人データを収集する目的で、フォーラムを通じて、またはフォーラムを使用して、広告、チェーンレター、またはその他の勧誘を送信してはいけません。\n\n5. フォーラムへのアクセスを自動化したり、ウェブクローラー、ブラウザのプラグインやアドオン、またはウェブブラウザ以外のその他のコンピュータープログラムなどを使ってフォーラムを監視したりしてはいけません。一般的に利用できる検索エンジン向けにインデックスを作成するためにフォーラムをクロールすることは可能です。\n\n6. フォーラムを使用して、メールアドレスを配布リスト、ニュースグループ、またはグループメールのエイリアスに送信してはいけません。\n\n7. 当社と提携している、または当社から承認されているという誤った情報を暗示してはいけません。\n\n8. 他のウェブページで、フォーラムにある画像やその他のハイパーテキスト以外のコンテンツにハイパーリンクすることはできません。\n\n9. フォーラムからダウンロードした資料から、所有権を示すマークを削除することはできません。\n\n10. 他のウェブページに `<iframe>` を使用して、フォーラムのいかなる部分を表示してはいけません。\n\n11. フォーラムのセキュリティまたはアクセス制限を無効化、回避、または迂回してはいけません。\n\n12. 不当な量のリクエスト、または不当な負荷をフォーラムの基盤となる情報システムにかけるように設計されたリクエストで、フォーラムのインフラストラクチャに負担をかけてはいけません。\n\n13. フォーラムを通じて他人になりすましてはいけません。\n\n14. 本規約の違反を促進したり、違反行為を支援したりしてはいけません。\n\n<h2 id=\"heading--content-standards\"><a href=\"#heading--content-standards\">コンテンツ基準</a></h2>\n\n1. 違法、攻撃的、または他の人に有害なコンテンツをフォーラムに送信してはいけません。 これには、嫌がらせ、不適切、虐待的、またはヘイト行為に関わるコンテンツが含まれます。\n\n2. 法に違反したり、他人の知的財産権を侵害したり、他人のプライバシーを侵害したり、他者との契約に違反したりするコンテンツをフォーラムに送信してはいけません。\n\n3. コンピューターウイルスやスパイウェアなどの悪意のあるコンピューターコードを含むコンテンツをフォーラムに送信してはいけません。\n\n4. 特定のアドレス、ユーザー名、またはその他の一意の ID を保持するために、単なるプレースホルダーとしてコンテンツをフォーラムに送信してはいけません。\n\n5. 他人の機密情報や個人情報など、開示する権利がない情報を開示するためにフォーラムを使用してはいけません。\n\n<h2 id=\"heading--enforcement\"><a href=\"#heading--enforcement\">適用</a></h2>\n\n当社は、本規約の違反を法的に最大限に調査し、起訴することができます。当社は、法および本規約の違反を起訴する際に法執行当局に通知し、協力する場合があります。 \n\n当社は、いかなる理由においても、フォーラムのコンテンツを変更、編集、および削除する権利を留保します。誰かが本規約に違反してフォーラムにコンテンツを送信したと思われる場合は、[直ちに連絡してください](#heading--contact)。\n\n<h2 id=\"heading--your-account\"><a href=\"#heading--your-account\">あなたのアカウント</a></h2>\n\nフォーラムの一部の機能を使用するには、アカウントを作成してログインする必要があります。\n\nアカウントを作成するには、あなた自身の情報を提供する必要があります。アカウントを作成する場合、最小限、有効なメールアドレスを提供すること、および当該メールアドレスを最新の状態に維持することに同意する必要があります。アカウントの閉鎖はいつでもメール <%{contact_email}> で行うことができます。\n\nあなたは、あなたがアカウントを閉鎖するかアカウントが侵害されたことを当社に通知するまで、あなたが許可したかどうかにかかわらず、あなたのアカウントを使用して取ったすべての行動に責任を負うことに同意します。アカウントが侵害された疑いがある場合は、すぐに当社に通知することに同意します。アカウントに安全なパスワードを選択し、秘密に保管しておくことに同意します。\n\n当社は、著作権関連の削除リクエストを処理するためのポリシーに従って、または当社が本規約の規則に違反したと合理的に信じる場合、フォーラムでのアカウントを制限、凍結、または閉鎖することができます。\n\n<h2 id=\"heading--your-content\"><a href=\"#heading--your-content\">あなたのコンテンツ</a></h2>\n\n本規約のいずれも、アカウント情報、投稿、またはフォーラムに送信するその他のコンテンツなど、フォーラムと共有する知的財産の所有権を当社に付与するものではありません。本規約のいずれも、当社の知的財産の所有権をあなたに与えるものではありません。\n\nあなたと当社の間で、あなたは、あなた自身がフォーラムに送信するコンテンツに対する責任を一切負います。あなたは、あなたがフォーラムに送信するコンテンツが当社によって後援または承認されていることを誤って暗示しないことに同意します。本規約は、本規約の下に、送信したコンテンツのコピーを保存、維持、または提供し、変更することを当社に義務付けるものではありません。\n\nフォーラムに送信するコンテンツはあなたに帰属し、そのコンテンツに対するどのような権利をほかの人に付与するかをあなたが決定します。ただし、少なくとも、フォーラムに送信するコンテンツをフォーラムの他のユーザーに提供することを当社に許可します。その特別なライセンスにより、当社はあなたがフォーラムに送信したコンテンツをコピー、公開、分析することができます。\n\nあなたが送信したコンテンツがあなたまたは当社によってフォーラムから削除された場合、最後のコピーが当社のバックアップ、キャッシュ、およびその他のシステムから消去された時点で、当社の特別ライセンスは終了します。[クリエイティブコモンズ](https://creativecommons.org)ライセンスなど、送信するコンテンツに適用するその他のライセンスは、コンテンツが削除された後も継続する場合があります。これらのライセンスは、他の人または当社に、フォーラムを通じてコンテンツを再度共有する権利を与える場合があります。\n\nあなたがフォーラムに送信したコンテンツを受け取る他の人は、あなたがあなたのコンテンツにライセンスを与える条件に違反する可能性があります。あなたは、それらの違反またはその結果について当社があなたに対する責任を負わないことに同意します。\n\n<h2 id=\"heading--responsibility\"><a href=\"#heading--responsibility\">あなたの責任</a></h2>\n\nあなたは、本規約の違反に関連する他者による法的請求、またはフォーラムのあなたのアカウントを使用する他者による本規約の違反に対し当社を補償することに同意します。あなたと当社の両者は、あなたが可能な限り速やかに補償する必要がある可能性のある法的請求について、相手に通知することに同意します。当社が法的請求について迅速に通知しなかった場合、迅速な通知によって防御または軽減できた可能性のある損害について、あなたは当社に補償する必要はありません。あなたは、当社に補償しなければならない法的請求の調査、防御、および和解を当社が管理することを許可し、その取り組みに協力することに同意します。当社は、あなたからの事前の同意なしに、あなたの過失を認めたり、あなたに義務を課したりするいかなる和解にも同意しないことに同意します。\n\n<h2 id=\"heading--disclaimers\"><a href=\"#heading--disclaimers\">免責事項</a></h2>\n\n***あなたは、フォーラムおよびフォーラムのコンテンツを使用するすべてのリスクを受け入れます。法で認められる限り、当社とそのサプライヤーは、いかなる保証もなく、フォーラムを現状のまま提供します。***\n\nフォーラムは、他社が運営するフォーラムやサービスにハイパーリンクして統合する場合があります。当社は、他者が運営するサービス、または他者が提供する可能性のあるコンテンツについて、いかなる保証も行いません。他者が実行するサービスの使用は、あなたと当該サービスを実行している人との間に存在する別の規約に準拠する可能性があります。\n\n<h2 id=\"heading--liability\"><a href=\"#heading--liability\">責任の制限</a></h2>\n\n***当社もそのサプライヤーも、あなたが本規約に同意したときに担当者が合理的に予見できなかった契約違反の損害についてあなたに対する責任を負いません。***\n\n***法で認められる限り、フォーラムまたはフォーラムのコンテンツに関連するあらゆる種類の請求に対するあなたへの全責任の上限は、50 ドルとします。***\n\n<h2 id=\"heading--feedback\"><a href=\"#heading--feedback\">フィードバック</a></h2>\n\n当社は、フォーラムのフィードバックと提案を歓迎しています。お問い合わせ方法については、以下の「[連絡先](#heading--contact)」セクションをご覧ください。\n\nあなたは、あなたが提供するフィードバックや提案に当社が自由に対応できること、そしてあなたのフィードバックが使用されたことを当社があなたに通知したり、それを使用する許可を得たり、あなたに支払いをしたりする必要がないことに同意します。あなたは、あなたや他者に、機密または占有であると思われるフィードバックや提案を送信しないことに同意します。\n\n<h2 id=\"heading--termination\"><a href=\"#heading--termination\">解約</a></h2>\n\nあなたまたは当社のいずれかは、本規約に記載された契約をいつでも終了することができます。契約が終了すると、フォーラムの使用許可も終了します。\n\nThe following provisions survive the end of our agreement: [Your Content](#heading--your-content), [Feedback](#heading--feedback), [Your Responsibility](#heading--responsibility), [Disclaimers](#heading--disclaimers), [Limits on Liability](#heading--liability), and [General Terms](#heading--general).次の規定は、当社とあなたの契約の終了後も存続します: 「[あなたのコンテンツ](#heading--your-content)」、「[フィードバック](#heading--feedback)」、「[あなたの責任](#heading--responsibility)」、「[免責事項](#heading--disclaimers)」、「[責任の制限](#heading--liability)」、および「[一般規約](#heading--general)」。\n\n<h2 id=\"heading--disputes\"><a href=\"#heading--disputes\">紛争</a></h2>\n\n%{governing_law}は、本規約またはフォーラムの使用に関連するいかなる紛争をも管理します。\n\nあなたと当社は、%{city_for_disputes}の州裁判所または連邦裁判所でのみ、本規約に関連する差止命令を求めることに同意します。あなたと当社のいずれも、それらの裁判所の管轄権、法廷地、または裁判地に異議を唱えることはありません。\n\n***コンピューター犯罪取締法に基づく差止命令または請求を求める場合を除き、あなたと当社は、米国仲裁協会 (AAA) の仲裁を拘束することにより、紛争を解決します。仲裁は、AAA の商事仲裁規則および消費者関連紛争の補足手順に従います。仲裁は%{city_for_disputes}で行われます。紛争は、原告または集団メンバーのいずれであっても、集団訴訟またはその他の代表訴訟の一部としてではなく、個人として解決するものとします。仲裁人は、当社の許可なしに他の仲裁と紛争を統合することはありません。***\n\n仲裁裁定には、仲裁の費用、合理的な弁護士費用、および証人の合理的な費用が含まれます。あなたと当社は、管轄権を有する任意の裁判所で仲裁裁定を下すことができます。\n\n<h2 id=\"heading--general\"><a href=\"#heading--general\">一般規約</a></h2>\n\n本規約の条項が書面で執行不能であるが、執行可能にするために変更される可能性がある場合、その条項は、執行可能にするために必要な最小限の範囲で変更する必要があります。それ以外の場合は、その規定を削除する必要があります。\n\n当社との契約を譲渡することはできません。当社は、当社の関連会社、当社の支配権を取得する他の会社、またはフォーラムに関連する当社の資産を購入する他社にあなたとの契約を譲渡することができます。本規約に反する譲渡を試みても、法的効力はありません。\n\n本契約に基づく権利の行使も、本契約の違反の放棄も、本契約の他の違反を放棄するものではありません。\n\n本規約は、フォーラムの使用に関するあなたと当社の間のすべての契約条件を具体化したものです。本規約は、書面であるかどうかにかかわらず、フォーラムの使用に関する他の合意に完全に置き換わるものです。\n\n<h2 id=\"heading--contact\"><a href=\"#heading--contact\">連絡先</a></h2>\n\nあなたは本規約の下、<%{contact_email}> に連絡またはお問い合わせいただけます。\n\n当社は本規約の下、フォーラムのアカウントで提供されたあなたのメールアドレスを使用して、またはフォーラムまたはあなたのアカウントページにメッセージを投稿して、あなたに連絡することができます。\n\n<h2 id=\"heading--changes\"><a href=\"#heading--changes\">変更</a></h2>\n\n本規約の最終更新は 2018 年 7 月 12 日です。また、本規約を再度更新する可能性があります。当社はすべての更新をフォーラムに投稿します。大幅な変更を含む更新については、あなたがアカウントを作成して有効なメールアドレスを提供している場合に、当社はあなたにメールを送信することに同意します。当社はまた、フォーラムで特別なメッセージやアラートで更新を発表する場合があります。 \n\nフォーラムを使用し続けるには、本規約への更新の通知を受信したら、その新しい規約に同意する必要があります。\n"
   privacy_topic:
     title: "プライバシーポリシー"
-    body: |
-      <a name="collect"></a>
-
-      ## [どのような情報を収集していますか？](#collect)
-
-      あなたがこのサイトに登録したときと、フォーラムに参加してここで共有されたコンテンツを読んだり、書き込んだり、評価したりしたときに、データを収集しています。
-
-      このサイトに登録する際には、あなたの名前とメールアドレスの入力を求めることがあります。ただし、登録をすることなくこのサイトを利用することも可能です。あなたのメールアドレスは、一意のリンクを含んだメールを介して確認されます。あなたがそのリンクを使用されると、あなたがそのメールアドレスを管理していることがわかります。
-
-      アカウントを登録し、投稿を行った際には、その投稿を発信した IP アドレスが記録されます。また、このサーバーが受信するすべてのリクエストの IP アドレスもサーバーログに保管されます。
-
-      <a name="use"></a>
-
-      ## [収集した情報は何に使いますか？](#use)
-
-      このサイトで収集された情報は、次のいくつかの方法で使用されます。
-
-      * エクスペリエンスのパーソナル化 &mdash; あなたの情報は、あなた個人のニーズへの対応を改善する上で役立てられます。
-      * サイトの改善・最適化 &mdash; あなたから受け取った情報やフィードバックに基づいて、サイトが提供するサービスの改善を行っています。
-      * カスタマーサービスの改善 &mdash; あなたの情報は、あなたのカスタマーサービスリクエストやサポートのニーズに効果的に対応するために役立てられます。
-      * 定期メールの送信 &mdash; 提供されたメールアドレスを使って、情報、トピックへの変更の通知、あなたのユーザー名への返信の通知、お問い合わせ・リクエスト・ご質問に対する応答の通知を送信するために使用されます。
-
-      <a name="protect"></a>
-
-      ## [自分の情報はどのように保護されていますか？](#protect)
-
-      このサービスは、あなたが個人情報を入力、送信、またはそれにアクセスする際に、その個人情報の安全性を維持するための様々なセキュリティ保護手段を講じています。
-
-      <a name="data-retention"></a>
-
-      ## [どのようなデータ保管ポリシーを導入していますか？](#data-retention)
-
-      このサービスは次のことを行います:
-
-      * このサーバーに送信されるすべてのリクエストの IP アドレスが記載されたサーバーログは最長 90 日間保管されます。
-      * 登録ユーザーとその投稿に関連付けられた IP アドレスは最長 5 年間保管されます。
-
-      <a name="cookies"></a>
-
-      ## [Cookie を使用していますか？](#cookies)
-
-      はい。Cookie は、あなたがウェブブラウザ上で許可している場合に、サイトまたはそのサービスプロバイダーからあなたのコンピューターのハードドライブに転送される小さなファイルです。サイトはこれらの Cookie を使ってあなたのブラウザを識別し、登録アカウントがある場合は、それをあなたの登録アカウントに関連付けることができます。
-
-      Cookie を使用して、あなたの設定を認識し、以降でアクセスした際に使用できるように保存しています。また、より優れたサイトエクスペリエンスとツールを提供していけるように、サイトのトラフィックや操作に関する集計データをコンパイルしています。サイト訪問者をさらに理解できるように、第三者のサービスプロバイダーと契約することもあります。これらのサービスプロバイダーは、サイト運営を改善する支援を提供する場合を除き、サイトに代わって収集した情報を使用することはできません。
-
-      <a name="disclose"></a>
-
-      ## [外部に情報を開示していますか？](#disclose)
-
-      私たちは、個人を特定できる情報を外部へ販売、取引、または他の方法で譲渡することはありません。これには、このサイトの運営、業務の遂行、またはサービスの提供を支援する、この情報の機密性を維持することに同意した信頼できる第三者は含まれません。また、法令遵守、サイトポリシーの施行、このサービスや他の人の権利、財産または安全の保護のために適切であると判断した場合には、あなたの情報を公開する場合があります。ただし、マーケティングや広告、その他の目的で匿名での訪問者情報を他者へ提供することができます。
-
-      <a name="third-party"></a>
-
-      ## [サードパーティのリンク](#third-party)
-
-      時折、このサービスの方針に基づいてこのサイトで第三者の製品やサービスを提供することがあります。これらの第三者のサイトには、個別の独立したプライバシーポリシーがあります。従って、これらのリンク先のサイトに関するコンテンツや活動に関しては一切責任を負いません。それにもかかわらず、サイトの完全性を保護するように努め、これらのサイトに関するフィードバックは非常に重要なものであると認識しております。
-
-      <a name="coppa"></a>
-
-      ## [子供のオンラインプライバシー保護法の順守](#coppa)
-
-      このサイト、製品、サービスはすべて 13 歳以上の人を対象としております。このサーバーが米国にあり、ユーザーが 13 歳未満の場合は、COPPA ([Children's Online Privacy Protection Act](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)) の要件に従って、このサイトの使用をご遠慮いただきます。
-
-      <a name="online"></a>
-
-      ## [オンライン限定のプライバシーポリシー](#online)
-
-      このオンラインプライバシーポリシーは、このサイトを通じて収集された情報のみに適用され、オフラインで収集される情報には適用されません。
-
-      <a name="consent"></a>
-
-      ## [あなたの同意](#consent)
-
-      このサービスを使用することにより、このサイトのプライバシーポリシーに同意するものとします。
-
-      <a name="changes"></a>
-
-      ## [プライバシーポリシーの変更](#changes)
-
-      プライバシーポリシーを変更する場合は、このページに変更内容を掲載します。
-
-      この文章のライセンスはCC-BY-SAです。最終更新: 2013 年 5 月 31 日
   badges:
     mass_award:
       errors:
@@ -4203,10 +4038,7 @@ ja:
       message: "<p><b>%{email}</b> にアクティベーションメールを再送信しました"
   safe_mode:
     title: "セーフモードを開始"
-    description: "セーフモードでは、プラグインやテーマを読み込まずにサイトをテストすることができます。"
     no_themes: "テーマとテーマのコンポーネントを無効にする"
-    no_unofficial_plugins: "非公式のプラグインを無効にする"
-    no_plugins: "すべてのプラグインを無効にする"
     enter: "セーフモードを開始"
     must_select: "セーフモードを開始するには、少なくとも 1 つのオプションを選択する必要があります。"
   wizard:
@@ -4321,7 +4153,6 @@ ja:
           <p>それでは、<a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>新しいコミュニティーの構築</a>をお楽しみください！</p>
   search_logs:
     graph_title: "検索数"
-  joined: "参加"
   discourse_push_notifications:
     popup:
       mentioned: '%{username} が「%{topic}」であなたをメンションしました - %{site_title}'
@@ -4383,50 +4214,30 @@ ja:
         category: カテゴリ設定
     actions:
       agree:
-        title: "合意…"
-      agree_and_keep:
-        title: "投稿を維持"
-        description: "通報に合意し、投稿を変更しないままにします。"
-      agree_and_keep_hidden:
-        title: "投稿を非表示のままに維持"
-        description: "通報に合意し、投稿を非表示のままにします。"
+        title: "はい"
       agree_and_suspend:
-        title: "ユーザーの凍結"
         description: "通報に合意し、ユーザーを凍結します。"
       agree_and_silence:
-        title: "ユーザーを投稿禁止"
+        title: "ユーザーを投稿禁止にする"
         description: "通報に同意し、ユーザーを投稿禁止にします。"
       agree_and_restore:
-        title: "投稿の復元"
         description: "すべてのユーザーが閲覧できるように投稿を復元します。"
-      agree_and_hide:
-        title: "投稿を非表示"
-        description: "この投稿を非表示にして、ユーザーに投稿の編集を促すメッセージをユーザーに送信します。"
       delete_single:
         title: "削除"
       delete:
         title: "削除…"
-      delete_and_ignore:
-        title: "投稿の削除と無視"
-        description: "投稿を削除します。最初の投稿である場合、トピックも削除されます"
       delete_and_ignore_replies:
-        title: "投稿と返信を削除して無視する"
-        description: "投稿とそのすべての返信を削除します。最初の投稿である場合、トピックも削除されます"
         confirm: "投稿への返信も削除してよろしいですか？"
-      delete_and_agree:
-        title: "投稿の削除と同意"
-        description: "投稿を削除します。最初の投稿である場合、トピックも削除されます"
       delete_and_agree_replies:
-        title: "投稿と返信を削除して同意する"
-        description: "投稿とそのすべての返信を削除します。最初の投稿である場合、トピックも削除されます"
         confirm: "投稿への返信も削除してよろしいですか？"
       disagree_and_restore:
-        title: "却下して投稿を復元"
         description: "すべてのユーザーが閲覧できるように投稿を復元します。"
       disagree:
-        title: "同意しない"
+        title: "いいえ"
       ignore:
         title: "無視"
+      ignore_and_do_nothing:
+        title: "何もしない"
       approve:
         title: "承認"
       approve_post:
diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml
index a9b7ab40598..0ea3b5049b9 100644
--- a/config/locales/server.ko.yml
+++ b/config/locales/server.ko.yml
@@ -178,8 +178,6 @@ ko:
     site_settings:
       invalid_site_setting: "'%{name}' 라는 설정이 존재하지 않습니다."
       invalid_category_id: "존재하지 않는 카테고리를 지정했습니다"
-      invalid_choice:
-        other: "유효하지 않은 선택 항목을 지정했습니다. %{name}"
       default_categories_already_selected: "다른 목록에서 사용된 카테고리는 선택할 수 없습니다."
       default_tags_already_selected: "다른 목록에서 사용된 태그는 선택할 수 없습니다."
       s3_upload_bucket_is_required: "'s3_upload_bucket'을 제공하지 않으면 S3 업로드를 활성화할 수 없습니다."
@@ -451,6 +449,7 @@ ko:
       이전 댓글을 편집하여 인용을 추가할 수 있습니다. 텍스트를 하이라이트하고 표시되는 '댓글 인용' 버튼을 누르면 됩니다.
 
       작은 개별 댓글을 여러 개 읽는 것 보다는, 깊이 있게 작성된 댓글 몇 개만 읽는 게 더 편리할 것입니다.
+    dont_feed_the_trolls: 이 게시물은 경고 상태(flag)로 지정되어 관리자의 처리를 기다리고 있습니다. 정말 답글을 작성하시겠습니까? 부정적인 콘텐츠에 대한 답글은 더 부정적인 행동을 조장할 수 있습니다.
     too_many_replies: |2
 
       ### 이 주제의 댓글 한도에 도달했습니다
@@ -537,10 +536,6 @@ ko:
             duration_minutes:
               cannot_be_zero: "0보다 커야 합니다."
               exceeds_maximum: "20년을 초과할 수 없습니다."
-        translation_overrides:
-          attributes:
-            value:
-              invalid_interpolation_keys: '다음 보간 키가 유효하지 않습니다. "%{keys}"'
         watched_word:
           attributes:
             word:
@@ -554,23 +549,6 @@ ko:
   meta_category_description: "사이트, 조직, 운영 방식, 개선 방안에 대해 토론하는 곳입니다."
   staff_category_name: "운영진"
   staff_category_description: "운영진 토론을 위한 비공개 카테고리입니다. 관리자 및 운영자에게만 보입니다."
-  discourse_welcome_topic:
-    body: |2
-
-      고정된 주제의 첫 문단은 홈페이지 방문자에게 환영 메시지로 표시되므로 매우 중요합니다!
-
-      커뮤니티를 간단히 소개할 수 있도록 **이 주제를 편집하세요**
-
-      -  누구를 위한 커뮤니티인가요?
-
-      - 여기에 어떤 정보가 있나요?
-
-      - 이곳만의 특징은 무엇인가요?
-
-      - 자세한 내용은 어디에 있나요(링크, 리소스 등)?
-
-      <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
-  admin_quick_start_title: "먼저 읽어보기: 관리 퀵스타트 가이드"
   category:
     topic_prefix: "%{category} 카테고리 정보"
     replace_paragraph: "(첫 문단을 새 카테고리에 대한 간단한 설명으로 대체하세요. 이 안내는 카테고리 선택 영역에 나타나므로 200자 미만으로 유지하세요.)"
@@ -1014,7 +992,7 @@ ko:
       title: "DAU / MAU"
       xaxis: "일"
       yaxis: "DAU / MAU"
-      description: "마지막 날에 로그인한 회원 수를 지난 달에 로그인한 회원 수로 나눈 값 – 커뮤니티 '고착도'를 나타내는 %를 반환합니다. 30% 이상을 목표로 하세요."
+      description: "마지막 날에 로그인 한 회원 수를 지난 달에 로그인 한 회원 수로 나눈 값 – 커뮤니티 &#39;고착성&#39;을 나타내는 %를 반환합니다. 20 % 이상을 목표로하십시오."
     daily_engaged_users:
       title: "일일 참여 사용자"
       xaxis: "일"
@@ -1362,7 +1340,6 @@ ko:
     manifest_icon: "Android에서 로고/스플래시 이미지로 사용되는 이미지입니다. 512 × 512로 크기가 자동 조정됩니다. 비워두면 large_icon이 사용됩니다."
     manifest_screenshots: "설치 프롬프트 페이지에서 인스턴스 기능 및 함수 기능을 보여주는 스크린 샷입니다. 모든 이미지는 로컬 업로드여야 하며 크기가 동일해야 합니다."
     favicon: "사이트의 즐겨찾기 아이콘은 <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://en.wikipedia.org/wiki/Favicon</a>을 참조하세요. CDN에서 올바르게 작동하려면 png여야 합니다. 32x32로 크기가 조정됩니다. 비워두면 large_icon이 사용됩니다."
-    apple_touch_icon: "Apple touch 디바이스에 사용되는 아이콘입니다. 180x180으로 크기가 자동 조정됩니다. 비워두면 large_icon이 사용됩니다."
     opengraph_image: "페이지에 다른 적절한 이미지가 없을 때 사용되는 디폴트 오픈그래프 이미지입니다. 비워두면 large_icon이 사용됩니다"
     notification_email: "from: 이메일 주소는 모든 필수 시스템 이메일을 전송하는 데 사용됩니다. 여기에 지정된 도메인은 SPF, DKIM이 있어야 하며, 리버스 PTR 레코드가 제대로 설정되어 있어야 메일이 도착할 수 있습니다."
     email_custom_headers: "사용자 지정 이메일 헤더의 파이프(|)로 구분된 목록"
@@ -1483,7 +1460,6 @@ ko:
     enable_discourse_connect: "DiscourseConnect(기존 'Discourse SSO')를 통한 로그인을 활성화합니다(경고: 사용자의 이메일 주소는 *반드시* 외부 사이트에서 검증되어야 합니다!)"
     verbose_discourse_connect_logging: "자세한 DiscourseConnect 관련 진단을 <a href='%{base_path}/logs' target='_blank'>/log</a>에 기록합니다."
     enable_discourse_connect_provider: "/session/sso_provider 엔드포인트에서 DiscourseConnect(기존 'Discourse SSO') 공급자 프로토콜을 구현하려면 discourse_connect_provider_secrets를 설정해야 합니다."
-    discourse_connect_url: "DiscourseConnect 엔드포인트의 URL(반드시 http:// 또는 https://를 포함해야 함)"
     discourse_connect_secret: "DiscourseConnect 정보를 암호화 방식으로 인증하는 데 사용되는 암호 문자열이며, 10자 이상이어야 합니다."
     discourse_connect_provider_secrets: "DiscourseConnect를 사용하는 도메인 암호 쌍의 목록입니다. DiscourseConnect 암호가 10자 이상인지 확인하세요. 와일드카드 기호 *는 모든 도메인 또는 그 일부(예: *.example.com)와 일치하는 데 사용할 수 있습니다."
     discourse_connect_overrides_bio: "사용자 프로필의 사용자 소개 기능를 오버라이드하고 사용자가 변경할 수 없도록 합니다"
@@ -1493,7 +1469,7 @@ ko:
     discourse_connect_overrides_profile_background: "DiscourseConnect 페이로드의 값으로 사용자 프로필 배경을 오버라이드합니다."
     discourse_connect_overrides_card_background: "사용자 카드 배경을 DiscourseConnect 페이로드의 값으로 오버라이드합니다."
     discourse_connect_not_approved_url: "승인되지 않은 DiscourseConnect 계정을 이 URL로 리디렉션"
-    discourse_connect_allows_all_return_paths: "DiscourseConnect에서 제공하는 return_paths에 대한 도메인을 제한하지 마세요(기본적으로 반환 경로는 현재 사이트에 있어야 합니다)"
+    discourse_connect_allowed_redirect_domains: "이러한 도메인들만을 DiscourseConnect에서 제공하는 반환 경로(return_paths)로 허용합니다(기본적으로 반환 경로는 현재 사이트의 경로만 허용합니다). 모든 도메인을 허용하려면 * 을 사용합니다. 하위 도메인 와일드카드(`*.foobar.com`)는 허용되지 않습니다."
     enable_local_logins: "로컬 아이디 및 비밀번호 로그인 기반 계정을 활성화합니다. 경고: 비활성화된 경우 이전에 하나 이상의 대체 로그인 방법을 구성하지 않았다면 로그인하지 못할 수 있습니다."
     enable_local_logins_via_email: "사용자가 원클릭 로그인 링크를 이메일로 보내도록 요청할 수 있습니다."
     allow_new_registrations: "신규 사용자 등록을 허용합니다. 모든 사용자의 새 계정 생성을 방지하려면 체크하지 마세요."
@@ -1591,7 +1567,6 @@ ko:
     composer_media_optimization_image_bytes_optimization_threshold: "클라이언트 측 최적화를 트리거하기 위한 최소 이미지 파일 크기"
     composer_media_optimization_image_resize_dimensions_threshold: "클라이언트 측 크기 조정을 트리거하는 최소 이미지 너비"
     composer_media_optimization_image_resize_width_target: "너비가 `composer_media_optimization_image_dimensions_resize_threshold` 보다 큰 이미지는 이 너비로 크기가 조정됩니다. `composer_media_optimization_image_dimensions_resize_threshold` 보다 크거나 같아야 합니다."
-    composer_media_optimization_image_encode_quality: "재인코딩 프로세스에 사용되는 JPEG 인코딩 퀄리티입니다."
     min_ratio_to_crop: "큰 이미지를 자르는 데 사용되는 비율입니다. 너비 / 높이의 결과를 입력하세요."
     simultaneous_uploads: "작성기에서 드래그 앤 드롭할 수 있는 최대 파일 수"
     default_invitee_trust_level: "초대된 사용자의 디폴트 신뢰 레벨(0~4)입니다."
@@ -1620,7 +1595,6 @@ ko:
     tl3_requires_likes_given: "신뢰 레벨 3으로 승급하기 위해 지난 (tl3 기간)일 동안 사용자가 눌러야 하는 최소 좋아요 수입니다."
     tl3_requires_likes_received: "신뢰 레벨 3으로 승급하기 위해 지난 (tl3 기간)일 동안 사용자가 받아야 하는 최소 좋아요 수입니다."
     tl3_links_no_follow: "신뢰 레벨 3 사용자가 게시한 링크에서 rel=nofollow를 제거하지 마세요."
-    trusted_users_can_edit_others: "신뢰 레벨이 높은 사용자가 다른 사용자의 콘텐츠를 편집하도록 허용"
     min_trust_to_create_topic: "새로운 주제를 생성하기 위한 최소 신뢰 레벨입니다."
     allow_flagging_staff: "활성화하면 사용자는 운영진 계정의 게시물을 신고할 수 있습니다."
     min_trust_to_edit_wiki_post: "위키로 표시된 게시물을 편집하기 위한 최소 신뢰 레벨입니다."
@@ -1652,7 +1626,6 @@ ko:
     title_min_entropy: "주제 제목에 필요한 최소 엔트로피(고유 문자, 초과할 경우 영어가 아닌 문자 수)입니다."
     body_min_entropy: "게시물 본문에 필요한 최소 엔트로피(고유 문자, 초과할 경우 영어가 아닌 문자 수)입니다."
     allow_uppercase_posts: "주제 제목 또는 게시물 본문에서 모든 대문자를 허용합니다."
-    max_consecutive_replies: "사용자가 다른 댓글을 추가할 수 없도록 하기 전에 한 주제에서 연속으로 작성해야 하는 게시물 수입니다."
     enable_filtered_replies_view: '''(n)개의 댓글'' 버튼은 다른 모든 게시물을 접고 현재 게시물과 댓글만 표시합니다.'
     title_fancy_entities: "일반적인 ASCII 문자를 주제 제목의 멋진 HTML 엔티티로 변환합니다. 예: SmartyPants <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</a>"
     min_title_similar_length: "유사 주제를 확인하기 전 최소 제목 길이입니다."
@@ -1752,7 +1725,6 @@ ko:
     pop3_polling_password: "이메일을 가져올 POP3 계정의 비밀번호"
     pop3_polling_delete_from_server: "서버에서 이메일을 삭제하세요. 참고: 이 기능을 비활성화하면 받은 편지함을 수동으로 정리해야 합니다."
     log_mail_processing_failures: "모든 이메일 처리 실패를 <a href='%{base_path}/logs' target='_blank'>/logs</a>에 기록"
-    email_in: '사용자가 이메일을 통해 새 주제를 게시할 수 있도록 허용합니다(수동 또는 pop3 폴링 필요). 각 카테고리의 ''설정'' 탭에서 주소를 환경설정합니다.'
     email_in_min_trust: "이메일을 통해 새 주제를 게시하기 위한 사용자의 최소 신뢰 레벨"
     email_in_authserv_id: "수신 이메일에 대한 인증 확인을 수행하는 서비스의 식별자입니다. 이를 환경설정하는 방법에 대한 지침은 <a href='https://meta.discourse.org/t/134358'>https://meta.discourse.org/t/134358</a>을 참조하세요."
     email_in_spam_header: "스팸을 탐지하는 이메일 헤더입니다."
@@ -1816,6 +1788,7 @@ ko:
     allow_profile_backgrounds: "사용자가 프로필 배경을 업로드하도록 허용합니다."
     sequential_replies_threshold: "연속 댓글 과다 알림을 받기 전에 사용자가 한 주제에서 연속으로 작성해야 하는 게시물 수입니다."
     get_a_room_threshold: "사용자가 경고를 받기 전에 동일한 주제에서 동일한 사람에게 작성해야 하는 게시물 수입니다."
+    dont_feed_the_trolls_threshold: "경고를 받기 전, 다른 사용자로부터 받은 경고(flag)의 수"
     enable_mobile_theme: "모바일 디바이스는 모바일 환경에 친화적인 테마를 사용하며 PC용 화면으로 전환할 수 있습니다. 완전 반응형 사용자 지정 스타일시트를 사용하려면 이 기능을 비활성화하세요."
     dominating_topic_minimum_percent: "주제를 과도하게 점유한다는 알림을 받기 전에 사용자가 주제에서 작성해야 하는 게시물의 퍼센트입니다."
     disable_avatar_education_message: "아바타 변경 안내 메시지를 비활성화합니다."
@@ -1824,21 +1797,16 @@ ko:
     permalink_normalizations: "고정 링크를 일치시키기 전에 다음 정규식을 적용합니다. 예를 들어, /(topic.*)\\\\?.*/\\\\1은 주제 경로에서 쿼리 스트링을 제거합니다. 형식은 regex+string입니다. 캡처에 액세스하려면 \\\\1 등을 사용하세요."
     global_notice: "모든 방문자에게 긴급, 비상, 닫을 수 없는 글로벌 배너 알림을 표시합니다. 숨기려면 공백으로 변경하세요(HTML 허용)."
     disable_system_edit_notifications: "'download_remote_images_to_local'가 활성화되어 있으면 시스템 사용자에 의한 편집 알림을 비활성화합니다."
-    disable_category_edit_notifications: "주제의 카테고리 편집 알림을 비활성화합니다."
-    disable_tags_edit_notifications: "주제의 태그 편집 알림을 비활성화합니다."
     notification_consolidation_threshold: "알림이 하나로 통합되기 전에 받은 좋아요 또는 멤버십 요청 알림의 수입니다. 비활성화하려면 0으로 설정하세요."
     likes_notification_consolidation_window_mins: "한계치에 도달하면 좋아요 알림이 단일 알림으로 통합되는 시간(분)입니다. 한계치는 `SiteSetting.notification_consolidation_threshold` 를 통해 환경설정할 수 있습니다."
     automatically_unpin_topics: "주제 하단에 도달하면 주제를 자동으로 고정 해제합니다."
     read_time_word_count: "추정 읽은 시간 계산을 위한 1분당 워드 카운트입니다."
     topic_page_title_includes_category: "주제 페이지 <a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title' target='_blank'>제목 태그</a>에는 카테고리 이름이 포함됩니다."
-    native_app_install_banner_ios: "iOS 디바이스의 DiscourseHub 앱 배너를 일반 사용자(신뢰 레벨 1 이상)에게 표시합니다."
-    native_app_install_banner_android: "일반 사용자(신뢰 레벨 1 이상)에게 Android 디바이스에 DiscourseHub 앱 배너를 표시합니다."
     app_association_android: "Google의 Digital Asset Links API에 사용되는 <a href='%{base_path}/.well-known/assetlinks.json'>.well-known/assetlinks.json</a> 엔드포인트의 콘텐츠입니다."
     app_association_ios: "이 사이트와 iOS 앱 간의 범용 링크를 만드는 데 사용되는 <a href='%{base_path}/apple-app-site-association'>apple-app-site-association</a> 엔드포인트의 콘텐츠입니다."
     share_anonymized_statistics: "익명화된 사용 통계 공유"
     auto_handle_queued_age: "이 정도 기간이 지나면 검토 대기 기록을 자동으로 처리합니다. 신고는 무시됩니다. 대기 중인 게시물 및 사용자는 거부됩니다. 이 기능을 비활성화하려면 0으로 설정하세요."
     svg_icon_subset: "에셋에 포함할 FontAwesome 5 아이콘을 추가합니다. 솔리드 아이콘에는 접두사 'fa-', 일반 아이콘에는 'far-', 브랜드 아이콘에는 'fab-'를 사용하세요."
-    max_prints_per_hour_per_user: "최대 /print 페이지 노출 수(비활성화하려면 0으로 설정)"
     full_name_required: "전체 이름은 사용자 프로필의 필수 필드입니다."
     enable_names: "사용자의 전체 이름을 프로필, 사용자 카드, 이메일에서 표시합니다. 모든 곳에서 전체 이름을 숨기려면 비활성화하세요."
     display_name_on_posts: "게시물에 @아이디뿐만 아니라 사용자의 전체 이름도 표시합니다."
@@ -1858,11 +1826,9 @@ ko:
     allowed_href_schemes: "http 및 https 외에도 링크에 허용되는 스키마입니다."
     embed_post_limit: "임베드할 최대 게시물 수입니다."
     embed_username_required: "주제 생성을 위해 아이디가 필요합니다."
-    notify_about_flags_after: "이 시간이 지나도 처리되지 않은 신고가 있으면 운영자에게 개인 메시지를 보냅니다. 비활성화하려면 0으로 설정하세요."
-    show_create_topics_notice: "사이트에 5개 미만의 공개 주제가 있는 경우 관리자에게 주제를 만들도록 요청하는 공지를 표시합니다."
     delete_drafts_older_than_n_days: "(n)일 지난 초안을 삭제합니다."
     delete_merged_stub_topics_after_days: "완전히 병합된 스텁 주제를 자동으로 삭제하기 전에 대기할 일 수입니다. 스텁 주제를 삭제하지 않으려면 0으로 설정하세요."
-    bootstrap_mode_min_users: "부트스트랩 모드를 비활성화하기 위한 최소 사용자 수(비활성화하려면 0으로 설정)"
+    bootstrap_mode_min_users: "부트스트랩 모드를 비활성화하는 데 필요한 최소 사용자 수(비활성화하려면 0으로 설정, 최대 24시간이 소요될 수 있음)"
     prevent_anons_from_downloading_files: "익명 사용자가 첨부 파일을 다운로드하지 못하도록 합니다."
     slug_generation_method: "슬러그 생성 방법을 선택합니다. 'encoded'는 퍼센트 인코딩 스트링을 생성합니다. 'none'은 슬러그를 완전히 비활성화합니다."
     enable_emoji: "이모티콘 활성화"
@@ -1870,6 +1836,7 @@ ko:
     emoji_set: "이모티콘을 어떻게 사용할까요?"
     emoji_autocomplete_min_chars: "자동 완성 이모티콘 팝업을 실행하는 데 필요한 최소 문자 수"
     enable_inline_emoji_translation: "인라인 이모티콘 번역 활성화(앞에 공백이나 구두점 없이)."
+    emoji_deny_list: "이러한 이모티콘은 메뉴나 단축코드에 사용할 수 없습니다."
     approve_post_count: "승인을 받아야 하는 신규 또는 기본 사용자의 게시물 수"
     approve_unless_trust_level: "이 신뢰 수준 미만의 사용자 게시물은 승인되어야 합니다"
     approve_new_topics_unless_trust_level: "이 신뢰 수준 미만의 사용자 주제는 승인되어야 합니다"
@@ -1927,7 +1894,6 @@ ko:
     revoke_api_keys_days: "사용하지 않는 API 키가 자동으로 취소되기까지의 기간(일)(0은 취소 안 함)"
     allow_user_api_keys: "사용자 API 키 생성 허용"
     allow_user_api_key_scopes: "사용자 API 키에 허용되는 범위 목록"
-    min_trust_level_for_user_api_key: "사용자 API 키 생성을 위한 신뢰 레벨"
     allowed_user_api_auth_redirects: "사용자 API 키의 인증 리디렉션을 위해 허용된 URL입니다. 와일드 카드 기호 *를 사용하면 일부를 일치시킬 수 있습니다(예 : www.example.com/*)."
     allowed_user_api_push_urls: "사용자 API의 서버 푸시를 위한 허용된 URL"
     expire_user_api_keys_days: "사용자 API 키가 자동으로 만료되기까지의 기간(일)(0은 만료 안 함)"
@@ -1988,14 +1954,12 @@ ko:
       pop3_polling_password_is_empty: "POP3 폴링을 활성화하기 전에 'pop3 폴링 비밀번호'를 설정해야 합니다."
       pop3_polling_authentication_failed: "POP3 인증에 실패했습니다. POP3 크리덴셜을 확인하세요."
       reply_by_email_address_is_empty: "이메일로 회신을 활성화하기 전에 '이메일 주소로 회신'을 설정해야 합니다."
-      email_polling_disabled: "이메일로 회신을 활성화하기 전에 수동 또는 POP3 폴링을 활성화해야 합니다."
       user_locale_not_enabled: "이 설정을 활성화하기 전에 먼저 '사용자 로캘 허용'을 활성화해야 합니다."
       invalid_regex: "허용되지 않거나 유효하지 않은 정규식입니다."
       email_editable_enabled: "이 설정을 활성화하기 전에 '이메일 편집 가능'을 비활성화해야 합니다."
       staged_users_disabled: "이 설정을 활성화하기 전에 먼저 '스테이징된 사용자'를 활성화해야 합니다."
       reply_by_email_disabled: "이 설정을 활성화하기 전에 먼저 '이메일로 회신'을 활성화해야 합니다."
       discourse_connect_url_is_empty: "이 설정을 활성화하기 전에 'discourse connect url'을 설정해야 합니다."
-      discourse_connect_invite_only: "DiscourseConnect와 초대를 동시에 활성화할 수는 없습니다."
       enable_local_logins_disabled: "이 설정을 활성화하기 전에 먼저 '로컬 로그인 활성화'를 활성화해야 합니다."
       min_username_length_exists: "최소 아이디 길이를 가장 짧은 아이디(%{username}) 이상으로 설정할 수 없습니다."
       min_username_length_range: "최솟값은 최댓값보다 크게 설정할 수 없습니다."
@@ -2179,7 +2143,6 @@ ko:
     activated_by_staff: "운영진에 의해 활성화됨"
     new_user_typed_too_fast: "입력이 너무 빠른 신규 사용자"
     content_matches_auto_silence_regex: "콘텐츠가 자동 차단 정규식과 일치합니다"
-    content_matches_auto_block_regex: "콘텐츠가 자동 차단 정규식과 일치합니다"
     username:
       short: "최소 %{min}자 이상이어야 합니다"
       long: "%{max}자 이하여야 합니다"
@@ -2833,14 +2796,6 @@ ko:
     user_automatically_silenced:
       title: "사용자가 자동 차단됨"
       subject_template: "커뮤니티 신고로 신규 유저 %{username} 님이 차단됨"
-      text_body_template: |
-        자동 메시지입니다.
-
-        여러 사용자가 %{username} 님의 게시물을 신고하여 신규 사용자 [%{username}](%{user_url})님이 자동 차단되었습니다.
-
-        [신고를 검토](%{base_url}/admin/flags)하고, %{username} 님의 게시 차단이 잘못되었다고 판단되는 경우 [이 사용자의 관리 페이지](%{user_url})에서 차단 해제 버튼을 클릭하세요.
-
-        한계치는 `silence_new_user` 사이트 설정에서 변경할 수 있습니다.
     spam_post_blocked:
       title: "스팸 게시글 차단됨"
       subject_template: "신규 사용자 %{username} 님의 게시물이 연속된 링크로 인해 차단됨"
@@ -2873,15 +2828,6 @@ ko:
       title: "원격 이미지 다운로드 비활성화됨"
       subject_template: "원격 이미지 다운로드 비활성화됨"
       text_body_template: "`download_remote_images_threshold` 디스크 용량 한도에 도달하여 `download_remote_images_to_local` 설정이 비활성화되었습니다."
-    dashboard_problems:
-      title: "대시보드 문제"
-      subject_template: "사이트 대시보드에 대한 새로운 조언"
-      text_body_template: |
-        현재 사이트 설정과 관련하여 새로운 조언과 권장 사항이 있습니다.
-
-        [사이트 대시보드를 방문](%{base_url}/admin)하여 확인하세요.
-
-        대시보드에 아무것도 표시되지 않으면 다른 운영진이 이미 이 조언에 따라 조치를 취했을 수 있습니다. 운영진의 작업 목록은 [운영진 작업 로그](%{base_url}/admin/logs/staff_action_logs)를 확인하세요.
     new_user_of_the_month:
       title: "이달의 신규 사용자로 선정되었습니다!"
       subject_template: "이달의 신규 사용자로 선정되었습니다!"
@@ -2915,9 +2861,6 @@ ko:
     reached_limit:
       other: "주의: 매일 최대 %{count}개의 이메일을 전송합니다. 사이트를 확인하여 보류될 수 있는 사이트가 있는지 확인하세요. 활발한 활동에 감사드립니다!"
     in_reply_to: "답장 대상"
-    unsubscribe:
-      title: "구독 해제"
-      description: "이 이메일에 관심이 없나요? 아래 구독 해제를 눌러서 바로 구독을 해제할 수 있습니다."
     reply_by_email: "[주제를 방문](%{base_url}%{url})하거나 이 이메일에 답장하여 응답하세요."
     reply_by_email_pm: "[주제를 방문](%{base_url}%{url})하거나 이 이메일에 답장하여 %{participants}에 응답하세요."
     only_reply_by_email: "이 이메일에 답장하여 응답하세요."
@@ -3221,7 +3164,6 @@ ko:
       liked_received: "받은 좋아요 수"
       new_users: "신규 사용자"
       popular_topics: "인기 주제"
-      follow_topic: "이 주제 팔로우"
       join_the_discussion: "더 보기"
       popular_posts: "인기 게시물"
       more_new: "맞춤 신규 항목"
@@ -3405,15 +3347,6 @@ ko:
   offline:
     title: "앱을 로드할 수 없음"
     offline_page_message: "오프라인 상태인 것 같습니다. 네트워크 연결을 확인하고 다시 시도하세요."
-  login_required:
-    welcome_message: |
-      ## [%{title}에 오신 것을 환영합니다](#welcome)
-      계정이 필요합니다. 계속하려면 계정을 만들거나 로그인하세요.
-    welcome_message_invite_only: |
-      ## [%{title}에 오신 것을 환영합니다](#welcome)
-      계정이 필요합니다. 계속하려면 기존 회원에게 초대를 요청하거나 로그인하세요.
-  deleted: "삭제되었습니다"
-  image: "이미지"
   upload:
     edit_reason: "이미지 로컬 사본 다운로드됨"
     unauthorized: "업로드하려는 파일 확장자는 허용되지 않습니다(허용 확장자: %{authorized_extensions})."
@@ -3816,9 +3749,6 @@ ko:
       message: "<p>활성화 이메일을 <b>%{email}</b> 주소로 재전송했습니다."
   safe_mode:
     title: "안전 모드 시작"
-    description: "안전 모드를 사용하면 플러그인이나 사이트 사용자 정의를 로드하지 않고도 사이트를 테스트할 수 있습니다."
-    no_unofficial_plugins: "비공식 플러그인 해제하기"
-    no_plugins: "모든 플러그인 비활성화"
     enter: "안전 모드 시작"
     must_select: "안전 모드를 시작하려면 옵션을 하나 이상 선택하세요."
   wizard:
@@ -3893,7 +3823,6 @@ ko:
           <p>즐거운 시간 보내세요! <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>새로운 커뮤니티 구축에 행운을 빕니다!</a></p>
   search_logs:
     graph_title: "검색 횟수"
-  joined: "가입일"
   discourse_push_notifications:
     popup:
       mentioned: '''%{topic}'' - %{site_title}에서 %{username} 님이 나를 멘션했습니다'
@@ -3950,50 +3879,29 @@ ko:
         category: 카테고리 설정
     actions:
       agree:
-        title: "동의..."
-      agree_and_keep:
-        title: "게시물 유지"
-        description: "신고에 동의하고 게시물을 변경하지 않습니다."
-      agree_and_keep_hidden:
-        title: "게시물 숨김 유지"
-        description: "신고에 동의하고 게시물 숨김을 유지합니다."
+        title: "예"
       agree_and_suspend:
-        title: "사용자 정지"
         description: "신고에 동의하고 사용자를 정지합니다."
       agree_and_silence:
-        title: "사용자 차단"
         description: "신고에 동의하고 사용자를 차단합니다."
       agree_and_restore:
-        title: "게시물 복원"
         description: "모든 사용자가 볼 수 있도록 게시물을 복원합니다."
-      agree_and_hide:
-        title: "게시물 숨기기"
-        description: "이 게시물을 숨기고 사용자에게 편집을 요청하는 메시지를 자동으로 전송합니다."
       delete_single:
         title: "삭제"
       delete:
         title: "삭제..."
-      delete_and_ignore:
-        title: "게시물 삭제 및 무시"
-        description: "게시물 삭제, 첫 게시물인 경우 주제도 삭제합니다."
       delete_and_ignore_replies:
-        title: "게시물 + 댓글 삭제 및 무시"
-        description: "게시물과 모든 댓글을 삭제합니다. 첫 게시물인 경우 주제도 삭제합니다."
         confirm: "게시물에 대한 댓글도 삭제할까요?"
-      delete_and_agree:
-        title: "게시물 삭제 및 동의"
-        description: "게시물 삭제, 첫 게시물인 경우 주제도 삭제합니다."
       delete_and_agree_replies:
-        title: "게시물 + 댓글 삭제 및 동의"
-        description: "게시물과 모든 댓글을 삭제합니다. 첫 게시물인 경우 주제도 삭제합니다."
         confirm: "게시물에 대한 댓글도 삭제할까요?"
       disagree_and_restore:
-        title: "동의하지 않고 게시물 복원"
         description: "모든 사용자가 볼 수 있도록 게시물을 복원합니다."
       disagree:
-        title: "동의하지 않음"
+        title: "아니오"
       ignore:
         title: "무시"
+      ignore_and_do_nothing:
+        title: "아무것도하지 않음"
       approve:
         title: "승인"
       approve_post:
diff --git a/config/locales/server.lt.yml b/config/locales/server.lt.yml
index d088b49d201..ede4896b05d 100644
--- a/config/locales/server.lt.yml
+++ b/config/locales/server.lt.yml
@@ -496,22 +496,6 @@ lt:
   meta_category_description: "Diskusijos apie svetainę, jos organizavimą, kaip ji veikia ir kaip galima ja dar patobulinti."
   staff_category_name: "Personalas"
   staff_category_description: "Privati kategorija personalo diskusijoms. Temos matomos tik administratoriams ir moderatoriams."
-  discourse_welcome_topic:
-    body: |2
-
-      Pirmoji šios prisegtos temos pastraipa bus matoma kaip sveikinimo žinutė visiems naujiems pagrindinio puslapio lankytojams. Tai svarbu!
-
-      **Redaguokite tai** į trumpą savo bendruomenės aprašymą:
-
-      – Kam tai skirta?
-      – Ką jie čia gali rasti?
-      – Kodėl jie turėtų čia ateiti?
-      – Kur jie gali skaityti daugiau (nuorodos, šaltiniai ir pan.)?
-
-      <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
-
-      Galbūt norėsite uždaryti šią temą per administratorių :wrench: (viršuje dešinėje ir apačioje), kad atsakymai nesikauptų ant skelbimo.
-  admin_quick_start_title: "PERSKAITYKITE PIRMIAUSIA: administratoriaus greitas pradžios vadovas"
   category:
     topic_prefix: "Viskas apie %{category} kategoriją"
     post_template: "%{replace_paragraph}\n\nNaudokite šias pastraipas ilgesniam aprašymui arba kategorijų gairėms ar taisyklėms nustatyti:\n\n– Kodėl žmonės turėtų naudoti šią kategoriją? Kam tai?\n\n– Kuo tai skiriasi nuo kitų jau turimų kategorijų?\n\n– Kas apskritai turėtų būti šios kategorijos temose?\n\n– Ar mums reikia šios kategorijos? Ar galime sujungti su kita kategorija ar subkategorija?\n"
@@ -991,7 +975,7 @@ lt:
       title: "DAU/MAU"
       xaxis: "Diena"
       yaxis: "DAU/MAU"
-      description: "Paskutinę dieną prisijungusių narių skaičius, padalytas iš narių, prisijungusių per pastarąjį mėnesį, skaičiaus – pateikiamas %, kuris rodo bendruomenės „lipnumą“. Siekite >30 proc."
+      description: "Paskutinę dieną prisijungusių narių skaičius, padalytas iš narių, prisijungusių per pastarąjį mėnesį, skaičiaus – pateikiamas %, kuris rodo bendruomenės „lipnumą“. Siekite >20 proc."
     daily_engaged_users:
       title: "Kasdien dalyvaujantys vartotojai"
       xaxis: "Diena"
@@ -1324,7 +1308,6 @@ lt:
     min_admin_password_length: "Minimalus administratoriaus slaptažodžio ilgis."
     password_unique_characters: "Mažiausias unikalių simbolių skaičius, kurį turi turėti slaptažodis."
     block_common_passwords: "Neleiskite slaptažodžių, kurie yra 10 000 dažniausiai naudojamų slaptažodžių."
-    discourse_connect_url: "„DiscourseConnect“ galutinio taško URL (turi būti http:// arba https://)"
     discourse_connect_secret: "Slapta eilutė, naudojama „DiscourseConnect“ informacijos kriptografiniam autentifikavimui, įsitikinkite, kad ji yra 10 simbolių ar ilgesnė"
     discourse_connect_not_approved_url: "Peradresuoti nepatvirtintas DiscourseConnect paskyras į šį URL"
     allow_new_registrations: "Leisti naujų vartotojų registracijas. Atžymėkite šį žymėjimą, kad niekas negalėtų sukurti naujos paskyros."
@@ -1440,7 +1423,6 @@ lt:
     max_notifications_per_user: "Maksimalus vieno vartotojo pranešimų skaičius, jei šis skaičius viršijamas, senieji pranešimai bus ištrinti. Taikoma kas savaitę. Norėdami išjungti, nustatykite 0"
     disable_avatar_education_message: "Išjungti švietimo pranešimą keičiant avataras."
     header_dropdown_category_count: "Kiek kategorijų gali būti rodoma antraštės išskleidžiamajame meniu."
-    disable_category_edit_notifications: "Išjungti pranešimus apie temų kategorijų redagavimą."
     automatically_unpin_topics: "Automatiškai atsegti temas, kai vartotojas pasiekia apačią."
     read_time_word_count: "Žodžių skaičius per minutę apskaičiuojant numatomą skaitymo laiką."
     full_name_required: "Pilnas vardas yra būtinas vartotojo profilio laukas."
@@ -1479,7 +1461,6 @@ lt:
     default_title_count_mode: "Numatytasis puslapio pavadinimo skaitiklio režimas"
     allow_user_api_keys: "Leisti generuoti vartotojo API raktus"
     allow_user_api_key_scopes: "Leidžiamų naudotojo API raktų apimčių sąrašas"
-    min_trust_level_for_user_api_key: "Patikimumo lygis, reikalingas generuoti vartotojo API raktus"
     allowed_user_api_auth_redirects: "Leidžiamas vartotojo API raktų autentifikavimo peradresavimo URL. Pakaitos simbolis * gali būti naudojamas norint atitikti bet kurią jo dalį (pvz., www.example.com/*)."
     allowed_user_api_push_urls: "Leidžiami serverio siuntimo naudotojui API URL adresai"
     tagging_enabled: "Įgalinti žymas temose?"
@@ -1923,14 +1904,6 @@ lt:
         Tai automatinis pranešimas nuo %{site_name} , informuojantis, kad jūsų paskyra nebėra sulaikyta po darbuotojų peržiūros.
 
         Dabar galite vėl kurti naujus atsakymus ir temas. Ačiū už kantrybę.
-    dashboard_problems:
-      subject_template: "Nauji patarimai jūsų svetainės informacijos suvestinėje"
-      text_body_template: |
-        Atsižvelgdami į dabartinius svetainės nustatymus, turime jums keletą naujų patarimų ir rekomendacijų.
-
-        [Apsilankykite savo svetainės informacijos suvestinėje](%{base_url}/admin), kad ją pamatytumėte.
-
-        Jei suvestinėje nieko nematote, kitas darbuotojas jau galėjo pasinaudoti šiuo patarimu. Personalo veiksmų sąrašą galite rasti [Personalo veiksmų%{base_url}/admin/logs/staff_action_logs).
     new_user_of_the_month:
       title: "Jūs esate naujas mėnesio vartotojas!"
       subject_template: "Jūs esate naujas mėnesio vartotojas!"
@@ -1950,9 +1923,6 @@ lt:
   user_notifications:
     previous_discussion: "Ankstesni atsakymai"
     in_reply_to: "Atsakant į"
-    unsubscribe:
-      title: "Nebeprenumeruoti"
-      description: "Nenorite gauti šių el. laiškų? Jokiu problemu! Spustelėkite žemiau, jei norite iš karto atsisakyti prenumeratos:"
     only_reply_by_email: "Norėdami atsakyti, atsakykite į šį el. laišką."
     visit_link_to_respond_pm: "[Apsilankykite žinutėje] (%{base_url}%{url}), kad atsakytumėte į %{participants}."
     posted_by: "Paskelbė %{username} %{post_date}"
@@ -2159,7 +2129,6 @@ lt:
       liked_received: "Gauta patikimų"
       new_users: "Nauji nariai"
       popular_topics: "Populiarios temos"
-      follow_topic: "Sekti šią temą"
       join_the_discussion: "Skaityti daugiau"
       popular_posts: "Populiarūs įrašai"
       more_new: "Jūs dar neskaitėte"
@@ -2348,12 +2317,6 @@ lt:
   offline:
     title: "Nepavyko įkelti programos"
     offline_page_message: "Atrodo, kad esate neprisijungę! Patikrinkite tinklo ryšį ir bandykite dar kartą."
-  login_required:
-    welcome_message: |
-      ## [Sveiki atvykę į %{title}] (#sveiki atvykę)
-      Būtina paskyra. Jei norite tęsti, sukurkite paskyrą arba prisijunkite.
-  deleted: "ištrintas"
-  image: "paveikslėlis"
   upload:
     edit_reason: "atsiųsti mano pranešimų archyvą"
     unauthorized: "Atsiprašome, failas, kurį bandote įkelti, nėra autorizuotas (įgalioti plėtiniai: %{authorized_extensions})."
@@ -2692,8 +2655,6 @@ lt:
       title: "Persiųsti patvirtinimo laišką"
   safe_mode:
     title: "Įeikite į saugųjį režimą"
-    no_unofficial_plugins: "Išjungti neoficialius įskiepius"
-    no_plugins: "Išjungti visus įskiepius"
     enter: "Įeikite į saugųjį režimą"
     must_select: "Norėdami įjungti saugųjį režimą, turite pasirinkti bent vieną parinktį."
   wizard:
@@ -2747,7 +2708,6 @@ lt:
         title: "Jūsų Discourse paruoštas!"
   search_logs:
     graph_title: "Ieškoti kontakto"
-  joined: "Prisijungė"
   discourse_push_notifications:
     popup:
       mentioned: '%{username} paminėjo tave "%{topic}" - %{site_title}'
@@ -2792,44 +2752,27 @@ lt:
         category: kategorijos nustatymai
     actions:
       agree:
-        title: "Sutinku..."
-      agree_and_keep:
-        title: "Palikti įrašą"
-      agree_and_keep_hidden:
-        title: "Laikyti paslėptą įrašą"
-      agree_and_suspend:
-        title: "Suspenduoti narį"
+        title: "Taip"
       agree_and_silence:
-        title: "Nutildyti narį"
         description: "Sutikti su pranešimu ir nutildyti narį."
       agree_and_restore:
-        title: "Atkurti įrašą"
         description: "Atkurkite įrašą, kad visi vartotojai jį matytų."
-      agree_and_hide:
-        title: "Paslėpti įrašą"
       delete_single:
         title: "Pašalinti"
       delete:
         title: "Ištrinti..."
-      delete_and_ignore:
-        title: "Ištrinti įrašą ir ignoruoti"
-        description: "Ištrinti įrašą; jei pirmasis įrašas, taip pat ištrinkite temą"
       delete_and_ignore_replies:
-        description: "Ištrinti įrašą ir visus jo atsakymus; jei pirmasis įrašas, taip pat ištrinkite temą"
         confirm: "Ar tikrai norite ištrinti ir įrašo atsakymus?"
-      delete_and_agree:
-        title: "Ištrinti įrašą ir sutikti"
-        description: "Ištrinti įrašą; jei pirmasis įrašas, taip pat ištrinkite temą"
       delete_and_agree_replies:
-        description: "Ištrinti įrašą ir visus jo atsakymus; jei pirmasis įrašas, taip pat ištrinkite temą"
         confirm: "Ar tikrai norite ištrinti ir įrašo atsakymus?"
       disagree_and_restore:
-        title: "Nesutikti ir atkurti įrašą"
         description: "Atkurkite įrašą, kad visi vartotojai jį matytų."
       disagree:
-        title: "Nesutinka"
+        title: "Ne"
       ignore:
         title: "Ignoruoti"
+      ignore_and_do_nothing:
+        title: "Nieko nedaryti"
       approve:
         title: "Patvirtinti"
       approve_post:
diff --git a/config/locales/server.lv.yml b/config/locales/server.lv.yml
index 87a7747f5ea..a2b789a5eb9 100644
--- a/config/locales/server.lv.yml
+++ b/config/locales/server.lv.yml
@@ -448,8 +448,6 @@ lv:
     see_more: "Vairāk"
     search_title: "Meklēt šajā vietnē"
     search_button: "Meklēt"
-  deleted: "dzēsts"
-  image: "bilde"
   upload:
     unauthorized: "Atvainojiet, fails, ko mēģināt augšuplādēt, nav atļauts (atļautie paplašinājumi: %{authorized_extensions})."
   color_schemes:
@@ -496,7 +494,6 @@ lv:
                 label: "Sadaļas un jaunākās tēmas"
               categories_and_top_topics:
                 label: "Kategorijas un populārākās tēmas"
-  joined: "Pievienojās"
   discourse_push_notifications:
     popup:
       mentioned: '%{username} pieminēja jūs "%{topic}" - %{site_title}'
@@ -517,12 +514,12 @@ lv:
       medium: "Vidējs"
       high: "Augsta"
     actions:
-      agree_and_suspend:
-        title: "Apturētie lietotāji"
+      agree:
+        title: "Jā"
       delete_single:
         title: "Dzēst"
       disagree:
-        title: "Nepiekrist"
+        title: "Nē"
       ignore:
         title: "Ignorēt"
       approve:
diff --git a/config/locales/server.nb_NO.yml b/config/locales/server.nb_NO.yml
index deeb7bf24d4..89ee90ab7a3 100644
--- a/config/locales/server.nb_NO.yml
+++ b/config/locales/server.nb_NO.yml
@@ -150,9 +150,6 @@ nb_NO:
     embed:
       load_from_remote: "Det oppstod et problem med innlastingen av innlegget."
     site_settings:
-      invalid_choice:
-        one: "Du spesifiserte det ugyldige valget %{name}"
-        other: "Du spesifiserte de ugyldige valgene %{name}"
       default_categories_already_selected: "Du kan ikke velge en annen kategori brukt i en annen liste."
       s3_upload_bucket_is_required: "Du kan ikke aktivere opplasting til S3 hvis ikke du har satt innstillingen 's3_upload_bucket'."
     conflicting_google_user_id: 'Google Account ID for denne kontoen har endret seg; staben må manuelt godkjenne endringen av sikkerhetshensyn. Vennligst kontakt staben og pek dem til <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
@@ -383,10 +380,6 @@ nb_NO:
           attributes:
             execute_at:
               in_the_past: "må være i fremtiden."
-        translation_overrides:
-          attributes:
-            value:
-              invalid_interpolation_keys: 'De følgende interpolasjonsnøklene er ugyldige: "%{keys}"'
         watched_word:
           attributes:
             word:
@@ -398,21 +391,6 @@ nb_NO:
   meta_category_description: "Diskusjon om dette nettstedet, hvordan det er organisert, hvordan det fungerer og hvordan vi kan forbedre det."
   staff_category_name: "Stab"
   staff_category_description: "Privat kategori for diskusjoner blant staben. Emner er kun synlige for administratorer og moderatorer."
-  discourse_welcome_topic:
-    body: |2
-
-      Det første avsnittet av dette festede emnet vil være synlig som en velkomstmelding til alle nye besøkende på hjemmesiden. Det er viktig!
-
-      **Rediger dette** til en kort beskrivelse av samfunnet ditt:
-
-      - Hvem er det ment for?
-      - Hva kan de finner her?
-      - Hvorfor skal de besøke stedet?
-      - Hvor kan de lese mer (lenker, ressurser, etc)?
-
-      <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
-
-      Vi anbefaler at du stenger dette emnet ved hjelp av Admin :wrench: knappen (oppe til høyre og i bunnen), slik at svar ikke hoper seg opp på en kunngjøring som denne.
   category:
     topic_prefix: "Om kategorien %{category} "
     post_template: "%{replace_paragraph}\n\nBruk de følgende avsnittene for en lengre beskrivelse, eller for å formulere retningslinjer eller regler for kategorien:\n\n- Hvorfor skal folk bruke denne kategorien? Hva er den ment for?\n\n- Hvordan skiller den seg fra de andre kategoriene vi allerede har?\n\n- Hva skal emner i denne kategorien generelt sett inneholde?\n\n- Trenger vi denne kategorien? Kan vi slå den sammen med en annen kategori eller underkategori?\n"
@@ -1147,8 +1125,6 @@ nb_NO:
   subject_pm: "[privat samtale]"
   user_notifications:
     previous_discussion: "Tidligere svar"
-    unsubscribe:
-      title: "Avmeld"
     user_invited_to_private_message_pm_group:
       title: "Bruker inviterte gruppe til privat samtale"
     user_invited_to_private_message_pm:
@@ -1183,7 +1159,6 @@ nb_NO:
       liked_received: "Likes mottatt"
       new_users: "Nye brukere"
       popular_topics: "Populære emner"
-      follow_topic: "Følg dette emnet"
       join_the_discussion: "Les mer"
       popular_posts: "Populære innlegg"
       more_new: "Nytt for deg"
@@ -1203,8 +1178,6 @@ nb_NO:
     see_more: "Mer"
     search_title: "Søk i denne siden"
     search_button: "Søk"
-  deleted: "slettet"
-  image: "bilde"
   upload:
     edit_reason: "Last ned lokal kopi av bilder"
     unauthorized: "Beklager, filen du prøver å legge til er ikke autorisert\n(authorized extensions: %{authorized_extensions})."
@@ -1237,88 +1210,6 @@ nb_NO:
     title: "Bruksvilkår"
   privacy_topic:
     title: "Personvernserklæring"
-    body: |
-      <a name="samle"></a>
-
-      ## [Hvilke opplysninger samler vi?](#samle)
-
-      Vi samler opplysninger fra deg når du registrerer deg på nettstedet vårt, og vi samler data når du deltar på forumet ved å lese, skrive og evaluere innholdet som deles her.
-
-      Når du registrerer deg på nettstedet vårt, kan du bli bedt om å oppgi navnet og e-postadressen din. Imidlertid kan du besøke nettstedet vårt uten å registrere deg. E-postadressen din vil bli bekreftet med en e-post som inneholder en unik lenke. Hvis siden den lenker til, blir besøkt, vet vi at du har kontroll over e-postadressen.
-
-      Når du registrerer deg og skriver innlegg, registrerer vi IP-adressen som innlegget stammer fra. Vi kan også oppbevare logger som inkluderer IP-adressen til alle forespørslene sendt til tjeneren vår.
-
-      <a name="bruk"></a>
-
-      ## [Hva bruker vi opplysningene dine til?](#bruk)
-
-      Alle opplysningene vi samler fra deg, kan bli brukt på en av følgende måter:
-
-      * For å gjøre opplevelsen din mer personlig. Opplysningene dine hjelper oss å svare bedre på dine individuelle behov.
-      * For å forbedre nettstedet vårt. Vi jobber konstant for å forbedre nettstedets tilbud basert på opplysningene og tilbakemeldingene vi mottar fra deg.
-      * For å forbedre vår kundeservice. Dine opplysninger hjelper oss å svare mer effektivt på dine forespørsler sendt til kundeservice eller behov om støtte.
-      * For å sende periodiske e-poster. E-postadressen du oppgir, kan bli brukt til å sende deg informasjon, påminnelser som du ber om ved endringer av emner eller ved svar til brukernavnet ditt, til henvendelser, og/eller andre forspørsler eller andre spørsmål.
-
-      <a name="sikre"></a>
-
-      ## [Hvordan sikrer vi opplysningene?](#sikre)
-
-      Vi gjennomfører flere sikkerhetstiltak for å holde personopplysningene dine sikre når du skriver inn, lagrer eller henter dem.
-
-      <a name="datalagring"></a>
-
-      ## [Hva er retningslinjene deres for lagring av data?](#datalagring)
-
-      Vi vil forsøke i god tro å:
-
-      * Ikke oppbevare tjener-logger som inneholder IP-adressen til alle forespørslene til denne tjeneren i lenger enn i 90 dager.
-      * Ikke oppbevare IP-adressene forbundet med registrerte brukere og deres innlegg lenger enn i 5 år.
-
-      <a name="informasjonskapsler"></a>
-
-      ## [Bruker vi informasjonskapsler?](#informasjonskapsler)
-
-      Ja. Informasjonskapsler er små filer som et nettsted eller dets tjenesteleverandør overfører til harddisken på datamaskinen din gjennom nettleseren din (dersom du tillater det). Disse informasjonskapslene gjør det mulig for nettstedet å gjenkjenne nettleseren din og, dersom du har en konto, knytte nettleseren til den.
-
-      Vi bruker informasjonskapsler for å forstå og lagre preferansene dine for fremtidige besøk og for å samle aggregatdata om trafikk på og samhandling med nettstedet slik at vi kan tilby bedre opplevelser og verktøy på nettstedet i fremtiden. Vi kan inngå avtaler med tredjeparts tjenesteleverandører for å bistå oss i å forstå besøkerne våres bedre. Disse tjenesteleverandørene har ikke lov til å bruke opplysningene samlet på våres vegne unntatt til å hjelpe oss å gjennomføre og forbedre anliggendet vårt.
-
-      <a name="gi-videre"></a>
-
-      ## [Gir vi noen opplysninger videre til andre parter?](#gi-videre)
-
-      Vi verken selger, handler med eller overfører på noen annen måte til andre parter dine identifiserbare personopplysninger. Dette inkluderer ikke tredjeparter som har vår tillit og bistår oss i å drive nettstedet, utføre våre anliggender eller yter tjenester til deg, så lenge disse partene samtykker til å behandle disse opplysningene fortrolig. Vi kan også frigi opplysningene dine dersom vi tror at å frigi dem er hensiktsmessig for å overholde loven, håndheve nettstedet retningslinjer eller beskytte våre og andres rettigheter. Imidlertid kan opplysninger som ikke er personlig identifiserbare, bli delt med andre parter for markedsføring, reklame eller annet bruk.
-
-      <a name="tredjepart"></a>
-
-      ## [Tredjeparts lenker](#tredjepart)
-
-      Av og til, etter skjønn, kan vil inkludere eller tilby tredjeparts produkter eller tjenester på nettstedet vårt. Disse tredjeparts nettstedene har separate og selvstendige personvernerklæringer. Vi bærer derfor intet ansvar eller forpliktelser for innholdet eller aktivitetene til disse nettstedene det lenkes til. Ikke mindre prøver vi å bevare vår eget nettsteds integritet og ønsker enhver tilbakemelding om disse nettstedene velkomne.
-
-      <a name="coppa"></a>
-
-      ## [Overensstemmelse med Children's Online Privacy Protection Act](#coppa)
-
-      Nettstedet, produktene og tjenestene våre er rettet mot folk som er minst 13 år gamle. Dersom denne tjeneren er i USA, og du er under 13 år i henhold til kravene i COPPA ([Children's Online Privacy Protection Act](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)), ikke bruk dette nettstedet.
-
-      <a name="nett"></a>
-
-      ## [Personvernerklæring bare for nettet](#nett)
-
-      Denne nett-personvernerklæringen gjelder bare for informasjon samlet gjennom nettstedet vårt og ikke for opplysninger samlet når en er frakoblet.
-
-      <a name="samtykke"></a>
-
-      ## [Ditt samtykke](#samtykke)
-
-      Vet å bruke nettstedet vårt samtykker du til nettstedets personvernerklæring.
-
-      <a name="endringer"></a>
-
-      ## [Changes to our Privacy Policy](#endringer)
-
-      Dersom vi beslutter å endre personvernerklæringen vår, vil vi publisere disse endringene på denne siden.
-
-      Dette dokumentet er lisensiert under CC-BY-SA. De ble sist oppdatert 31. mai 2013.
   badges:
     editor:
       name: Tekstbehandler
@@ -1432,7 +1323,6 @@ nb_NO:
                 label: "Kategorier og siste emner"
               categories_and_top_topics:
                 label: "Kategorier og toppemner"
-  joined: "Medlem fra"
   discourse_push_notifications:
     popup:
       mentioned: '%{username} nevnte deg i "%{topic}" - %{site_title}'
@@ -1456,28 +1346,24 @@ nb_NO:
       medium: "Middels"
       high: "Høy"
     actions:
-      agree_and_keep:
-        title: "Behold innlegg"
-        description: "Samtykk med flagg og behold innlegget uendret."
+      agree:
+        title: "Ja"
       agree_and_suspend:
-        title: "Steng ute bruker"
         description: "Si deg enig med rapportering og steng ute bruker. "
       agree_and_silence:
-        title: "Demp bruker"
         description: "Si deg enig med rapportering og demp bruker. "
       agree_and_restore:
         description: "Gjenopprett innlegget slik at alle brukere kan se det."
-      agree_and_hide:
-        title: "Skjul innlegg"
-        description: "Gjem dette innlegget og send en melding til brukeren automatisk med en forespørsel om gjøre endringer."
       delete_single:
         title: "Slett"
       disagree_and_restore:
         description: "Gjenopprett innlegget slik at alle brukere kan se det."
       disagree:
-        title: "Si deg uenig"
+        title: "Nei"
       ignore:
         title: "Ignorer"
+      ignore_and_do_nothing:
+        title: "ikke gjør noe"
       approve:
         title: "Godkjenn"
       reject_user:
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index a4484cacc91..2de2e28b02e 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -189,9 +189,6 @@ nl:
       load_from_remote: "Er is een fout opgetreden bij het laden van dat bericht."
     site_settings:
       invalid_category_id: "Je hebt een categorie opgegeven die niet bestaat"
-      invalid_choice:
-        one: "Je hebt de ongeldige keuze %{name} opgegeven"
-        other: "Je hebt de ongeldige keuzes %{name} opgegeven"
       default_categories_already_selected: "Je kunt geen categorie selecteren die in een andere lijst wordt gebruikt."
       default_tags_already_selected: "Je kunt geen tag selecteren die in een andere lijst wordt gebruikt."
       s3_upload_bucket_is_required: "Je kunt uploads naar S3 niet inschakelen voordat je de 's3_upload_bucket' hebt opgegeven."
@@ -199,7 +196,6 @@ nl:
       page_publishing_requirements: "Het publiceren van pagina's kan niet worden ingeschakeld als beveiligde media is ingeschakeld."
       s3_backup_requires_s3_settings: "Je kunt S3 niet als back-uplocatie gebruiken voordat je een '%{setting_name}' hebt opgegeven."
       s3_bucket_reused: "Je kunt niet dezelfde bucket voor 's3_upload_bucket' en 's3_backup_bucket' gebruiken. Kies een andere bucket of gebruik een ander pad voor elke bucket."
-      secure_uploads_requirements: "S3-uploads moeten zijn ingeschakeld voordat beveiligde uploads worden ingeschakeld."
       share_quote_facebook_requirements: "Je moet een Facebook-app-ID instellen om het delen van citaten in te schakelen voor Facebook."
       second_factor_cannot_enforce_with_socials: "Je kunt 2FA niet afdwingen terwijl sociaal aanmelden is ingeschakeld. Je moet eerst aanmelden uitschakelen via: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Je kunt geen 2FA afdwingen als lokale aanmeldingen zijn uitgeschakeld."
@@ -587,10 +583,6 @@ nl:
             duration_minutes:
               cannot_be_zero: "moet groter zijn dan 0."
               exceeds_maximum: "kan niet meer dan 20 jaar zijn."
-        translation_overrides:
-          attributes:
-            value:
-              invalid_interpolation_keys: 'De volgende interpolatiesleutel(s) zijn ongeldig: ''%{keys}'''
         watched_word:
           attributes:
             word:
@@ -610,23 +602,6 @@ nl:
   meta_category_description: "Discussies over deze website, de organisatie, hoe deze werkt en hoe we deze kunnen verbeteren."
   staff_category_name: "Medewerkers"
   staff_category_description: "Privécategorie voor medewerkergesprekken. Topics zijn alleen zichtbaar voor beheerders en moderators."
-  discourse_welcome_topic:
-    title: "Welkom bij onze community!"
-    body: |2
-
-      De eerste alinea van dit vastgemaakte topic is zichtbaar op je startpagina als een welkomstbericht voor alle nieuwe bezoekers. Dit is belangrijk!
-
-      **Bewerk dit** tot een korte beschrijving van je community:
-
-      - Voor wie is deze bestemd?
-      - Wat kunnen ze hier vinden?
-      - Waarom zouden ze hier moeten komen?
-      - Waar kunnen ze meer lezen (links, bronnen, enz.)?
-
-      <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
-
-      Mogelijk wilt je dit topic sluiten via de :wrench: voor beheer (rechtsboven en -beneden), zodat er bij een aankondiging geen antwoorden opstapelen.
-  admin_quick_start_title: "LEES MIJ EERST: Snelstartgids voor beheerders"
   category:
     topic_prefix: "Over de categorie %{category}"
     replace_paragraph: "(Vervang deze eerste alinea door een korte beschrijving van de nieuwe categorie. Deze leidraad wordt weergegeven in het categorieselectiegebied, dus probeer deze onder de 200 tekens te houden.)"
@@ -1108,7 +1083,7 @@ nl:
       title: "DAU/MAU"
       xaxis: "Dag"
       yaxis: "DAU/MAU"
-      description: "Aantal leden dat de afgelopen dag was aangemeld, gedeeld door het aantal leden dat de afgelopen maand was aangemeld – geeft een % terug dat 'plakkerigheid' in de community aangeeft. Het streven is >30%."
+      description: "Aantal leden dat de afgelopen dag was aangemeld, gedeeld door het aantal leden dat de afgelopen maand was aangemeld – geeft een % terug dat 'plakkerigheid' in de community aangeeft. Het streven is >20%."
     daily_engaged_users:
       title: "Dagelijkse actieve gebruikers"
       xaxis: "Dag"
@@ -1476,7 +1451,6 @@ nl:
     manifest_icon: "Afbeelding die als logo/splashafbeelding op Android wordt gebruikt. Wordt automatisch verkleind naar 512 x 512. Bij leeg laten wordt large_icon gebruikt."
     manifest_screenshots: "Schermafbeeldingen die de eigenschappen en functies van je instantie tonen op de installatiepromptpagina. Alle afbeeldingen moeten lokale uploads zijn en dezelfde afmetingen hebben."
     favicon: "Een favicon voor je website, zie <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://nl.wikipedia.org/wiki/Favicon</a>.  Om goed via een CDN te werken, moet dit een png zijn. Wordt verkleind naar 32x32. Bij leeg laten wordt large_icon gebruikt."
-    apple_touch_icon: "Pictogram dat voor Apple touch-apparaten wordt gebruikt. Wordt automatisch verkleind naar 180x180. Bij leeg laten wordt large_icon gebruikt."
     opengraph_image: "Standaard opengraph-afbeelding, gebruikt wanneer de pagina geen andere geschikte afbeelding bevat. Bij leeg laten wordt large_icon gebruikt."
     twitter_summary_large_image: "Twitter-kaart 'grote samenvattingsafbeelding' (moet minimaal 280 breed en minimaal 150 hoog zijn, mag geen .svg zijn). Als dit leeg wordt gelaten, worden reguliere kaartmetagegevens gegenereerd met behulp van de opengraph_image, zolang dat niet ook een .svg is"
     notification_email: "Het Van:-e-mailadres adres dat wordt gebruikt voor het verzenden van alle essentiële systeem-e-mails. Het hier opgegeven domein moet goed ingestelde SPF-, DKIM- en reverse-PTR-records hebben om e-mails te doen aankomen."
@@ -1607,7 +1581,6 @@ nl:
     enable_discourse_connect: "Schakel aanmelden via DiscourseConnect (voorheen 'Discourse SSO') in (WAARSCHUWING: E-MAILADRESSEN VAN GEBRUIKERS *MOETEN* WORDEN GEVALIDEERD DOOR DE EXTERNE SITE!)"
     verbose_discourse_connect_logging: "Log uitgebreide DiscourseConnect-gerelateerde diagnostiek naar <a href='%{base_path}/logs' target='_blank'>/logs</a>"
     enable_discourse_connect_provider: "Implementeer providerprotocol DiscourseConnect (voorheen 'Discourse SSO') op het eindpunt /session/sso_provider, vereist dat discourse_connect_provider_secrets is ingesteld"
-    discourse_connect_url: "URL van DiscourseConnect-eindpunt (moet http:// of https:// bevatten)"
     discourse_connect_secret: "Geheime tekenreeks die wordt gebruikt om DiscourseConnect-gegevens cryptografisch te verifiëren, zorg dat deze 10 tekens of langer is"
     discourse_connect_provider_secrets: "Een lijst met domeingeheimparen die DiscourseConnect gebruiken. Zorg dat het DiscourseConnect-geheim 10 tekens of langer is. Het jokerteken * kan worden gebruikt om elk domein of slechts een deel ervan te matchen (bijvoorbeeld *.voorbeeld.com)."
     discourse_connect_overrides_bio: "Overschrijft biografie in gebruikersprofiel en voorkomt dat gebruiker deze kan wijzigen"
@@ -1621,7 +1594,6 @@ nl:
     discourse_connect_overrides_profile_background: "Overschrijft achtergrond gebruikersprofiel door waarde uit DiscourseConnect-payload."
     discourse_connect_overrides_card_background: "Overschrijft achtergrond gebruikerskaart door waarde uit DiscourseConnect-payload."
     discourse_connect_not_approved_url: "Niet-goedgekeurde DiscourseConnect-accounts omleiden naar deze URL"
-    discourse_connect_allows_all_return_paths: "Het domein niet beperken voor return_paths opgegeven door DiscourseConnect (standaard moet het retourpad zich op de huidige website bevinden)"
     enable_local_logins: "Accounts op basis van een lokale gebruikersnaam en wachtwoord toestaan. WAARSCHUWING: als dit is uitgeschakeld, kun je je mogelijk niet aanmelden als je eerder niet ten minste één alternatieve aanmeldmethode hebt geconfigureerd."
     enable_local_logins_via_email: "Sta gebruikers toe te verzoeken een aanmeldlink met één klik te ontvangen via e-mail."
     allow_new_registrations: "Nieuwe gebruikersregistraties toestaan. Vink dit uit om te voorkomen dat iedereen een nieuwe account kan maken."
@@ -1725,7 +1697,6 @@ nl:
     composer_media_optimization_image_bytes_optimization_threshold: "Minimale bestandsgrootte van afbeeldingen om optimalisatie aan de clientzijde te activeren"
     composer_media_optimization_image_resize_dimensions_threshold: "Minimale afbeeldingsbreedte om vergroting/verkleining aan de clientzijde te activeren"
     composer_media_optimization_image_resize_width_target: "Afbeeldingen met een breedte groter dan `composer_media_optimization_image_dimensions_resize_threshold` worden verkleind tot deze breedte. Moet >= `composer_media_optimization_image_dimensions_resize_threshold` zijn."
-    composer_media_optimization_image_encode_quality: "JPEG-coderingskwaliteit gebruikt in het hercoderingsproces."
     min_ratio_to_crop: "Gebruikte verhouding voor het bijsnijden van hoge afbeeldingen. Voer het resultaat van breedte / hoogte in."
     simultaneous_uploads: "Maximale aantal bestanden dat naar de editor kan worden gesleept"
     default_invitee_trust_level: "Standaard vertrouwensniveau (0-4) voor uitgenodigde leden."
@@ -1754,7 +1725,6 @@ nl:
     tl3_requires_likes_given: "Het minimale aantal likes dat in de afgelopen (tl3 time period) dagen moet worden gegeven om voor promotie naar vertrouwensniveau 3 in aanmerking te komen."
     tl3_requires_likes_received: "Het minimale aantal likes dat in de afgelopen (tl3 time period) dagen moet worden ontvangen om voor promotie naar vertrouwensniveau 3 in aanmerking te komen."
     tl3_links_no_follow: "Verwijder rel=nofollow niet uit links die door gebruikers met vertrouwensniveau 3 zijn geplaatst."
-    trusted_users_can_edit_others: "Gebruikers met hoge vertrouwensniveaus mogen inhoud van andere gebruikers bewerken"
     min_trust_to_create_topic: "Het minimale vertrouwensniveau dat nodig is om een topic te maken."
     allow_flagging_staff: "Wanneer ingeschakeld, kunnen gebruikers berichten van medewerkeraccounts markeren."
     min_trust_to_edit_wiki_post: "Het minimale vertrouwensniveau dat nodig is om een bericht te bewerken dat als wiki is gemarkeerd."
@@ -1790,7 +1760,6 @@ nl:
     title_min_entropy: "De minimale entropie (unieke tekens, niet-Engels telt zwaarder) die voor een topictitel is vereist."
     body_min_entropy: "De minimale entropie (unieke tekens, niet-Engels telt zwaarder) die voor een berichttekst is vereist."
     allow_uppercase_posts: "Alles in hoofdletters in een topictitel of berichttekst toestaan."
-    max_consecutive_replies: "Aantal berichten dat een gebruiker achter elkaar in een topic moet plaatsen voordat het toevoegen van een ander antwoord wordt voorkomen."
     enable_filtered_replies_view: 'De knop "(n) antwoorden" vouwt alle andere berichten samen en toont alleen het huidige bericht en de bijbehorende antwoorden.'
     title_fancy_entities: "Algemene ASCII-tekens naar decoratieve HTML-entiteiten converteren in topictitels, zoals SmartyPants <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</a>"
     min_title_similar_length: "De minimale lengte van een titel voordat er op vergelijkbare topics wordt gecontroleerd."
@@ -1897,7 +1866,6 @@ nl:
     pop3_polling_password: "Het wachtwoord voor de te pollen POP3-account voor e-mail."
     pop3_polling_delete_from_server: "Verwijder e-mails van de server. OPMERKING: als je dit uitschakelt, moet je je e-mail handmatig opschonen."
     log_mail_processing_failures: "Alle fouten van e-mailverwerking opslaan in <a href='%{base_path}/logs' target='_blank'>/logs</a>"
-    email_in: 'Gebruikers mogen nieuwe topics maken via e-mail (vereist handmatige of POP3-polling). Configureer de adressen in het tabblad ''Instellingen'' van elke categorie.'
     email_in_min_trust: "Het minimale vertrouwensniveau dat een gebruiker moet hebben om nieuwe topics te kunnen plaatsen via e-mail."
     email_in_authserv_id: "De ID van de service die verificatiecontroles op inkomende e-mails uitvoert. Zie <a href='https://meta.discourse.org/t/134358'>https://meta.discourse.org/t/134358</a> voor instructies over het configureren hiervan."
     email_in_spam_header: "De e-mailheader voor het detecteren van spam."
@@ -1970,22 +1938,17 @@ nl:
     permalink_normalizations: "De volgende reguliere expressie toepassen voordat permalinks worden verwerkt. Voorbeeld: /(topic.*)\\?.*/\\1 verwijdert querystrings uit topicroutes. Notatie is regex+strings, gebruik \\1 etc. voor deeluitdrukkingen."
     global_notice: "Toon een algemene niet te sluiten DRINGENDE NOOD-bannermelding voor alle gebruikers. Laat dit leeg om te verbergen (HTML toegestaan)."
     disable_system_edit_notifications: "Schakelt bewerkingsmeldingen van de systeemgebruiker uit als 'download_remote_images_to_local' actief is."
-    disable_category_edit_notifications: "Schakel meldingen van bewerking van categorieën uit voor topics."
-    disable_tags_edit_notifications: "Schakel meldingen van bewerking van tags uit voor topics."
     notification_consolidation_threshold: "Aantal ontvangen meldingen van likes of lidmaatschapsverzoeken voordat de meldingen in één melding worden samengevoegd. Stel dit in op 0 om uit te schakelen."
     likes_notification_consolidation_window_mins: "Tijdsduur in minuten waarin like-meldingen in één melding worden samengevoegd zodra de drempel is bereikt. De drempel kan worden geconfigureerd via 'SiteSetting.notification_consolidation_threshold'."
     automatically_unpin_topics: "Topics automatisch losmaken wanneer de gebruiker de onderkant bereikt."
     read_time_word_count: "Aantal woorden per minuut voor het berekenen van geschatte leestijd."
     topic_page_title_includes_category: "Topicpagina <a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title' target='_blank'>titeltag</a> bevat de categorienaam."
-    native_app_install_banner_ios: "Geeft DiscourseHub-app-banner weer op iOS-apparaten voor vaste gebruikers (vertrouwensniveau 1 en hoger)."
-    native_app_install_banner_android: "Geeft DiscourseHub-app-banner weer op Android-apparaten voor vaste gebruikers (vertrouwensniveau 1 en hoger)."
     app_association_android: "Inhoud van <a href='%{base_path}/.well-known/assetlinks.json'>.well-known/assetlinks.json</a>-eindpunt, gebruikt voor Google's Digital Asset Links-API."
     app_association_ios: "Inhoud van <a href='%{base_path}/apple-app-site-association'>apple-app-site-association</a>-eindpunt, gebruikt voor het maken van Universal Links tussen deze website en iOS-apps."
     share_anonymized_statistics: "Geanonimiseerde gebruiksstatistieken delen."
     auto_handle_queued_age: "Records die dit aantal dagen op beoordeling wachten automatisch verwijderen. Markeringen worden genegeerd. Berichten en gebruikers in de wachtrij worden geweigerd. Stel dit in op 0 om deze functie uit te schakelen."
     penalty_step_hours: "Standaardstraffen bij demping of schorsing van gebruikers in uren. Bij de eerste overtreding wordt standaard de eerste waarde gebruikt, bij de tweede overtreding de tweede waarde, enz."
     svg_icon_subset: "Extra FontAwesome 5-pictogrammen toevoegen die je in je assets wilt opnemen. Gebruik het voorvoegsel 'fa-' voor effen pictogrammen, 'far-' voor normale pictogrammen en 'fab-' voor merkpictogrammen."
-    max_prints_per_hour_per_user: "Maximale aantal /print-pagina-impressies (stel dit in op 0 om uit te schakelen)"
     full_name_required: "Volledige naam is een verplicht veld van een gebruikersprofiel."
     enable_names: "Volledige naam van gebruiker weergeven op profiel, gebruikerskaart en e-mails. Schakel dit uit om de volledige naam overal te verbergen."
     display_name_on_posts: "Volledige naam van een gebruiker weergeven bij berichten, naast de @gebruikersnaam."
@@ -2006,17 +1969,11 @@ nl:
     allowed_href_schemes: "Toegestane schema's in links, naast http en https."
     embed_post_limit: "Maximale aantal in te bedden berichten."
     embed_username_required: "De gebruikersnaam voor het maken van topics is vereist."
-    notify_about_flags_after: "Als er na dit aantal uren markeringen zijn die nog niet zijn afgehandeld, een privébericht naar moderators sturen. Stel dit in op 0 om uit te schakelen."
-    show_create_topics_notice: "Als de website minder dan 5 publieke topics heeft, een melding weergeven waarin beheerders wordt gevraagd een aantal topics te maken."
     delete_drafts_older_than_n_days: "Concepten ouder dan (n) dagen verwijderen."
     delete_merged_stub_topics_after_days: "Aantal dagen dat moet worden gewacht voordat volledig samengevoegde stubtopics automatisch worden verwijderd. Stel dit in op 0 om stubtopics niet te verwijderen."
-    bootstrap_mode_min_users: "Minimale aantal vereiste gebruikers om bootstrapmodus uit te schakelen (stel dit in op 0 om uit te schakelen)"
     prevent_anons_from_downloading_files: "Voorkom dat anonieme gebruikers bijlagen downloaden."
-    secure_media: "VEROUDERD: wordt verwijderd in Discourse 3.0, gebruik in plaats hiervan de instelling secure_uploads."
     secure_uploads: 'Beperkt de toegang tot ALLE uploads (afbeeldingen, video, audio, tekst, pdf''s, zips en andere). Als ''aanmelding vereist'' is ingeschakeld, hebben alleen aangemelde gebruikers toegang tot uploads. Anders is de toegang alleen beperkt voor media-uploads in privéberichten en privécategorieën. WAARSCHUWING: deze instelling is complex en vereist diepgaande beheerkennis. Zie <a target="_blank" href="https://meta.discourse.org/t/-/140017">het onderwerp Veilige uploads op Meta</a> voor meer informatie.'
-    secure_media_allow_embed_images_in_emails: "VEROUDERD: wordt verwijderd in Discourse 3.0, gebruik secure_uploads_allow_embed_images_in_emails."
     secure_uploads_allow_embed_images_in_emails: "Staat het insluiten van beveiligde afbeeldingen toe die normaal gesproken zouden worden geredigeerd in e-mails, als hun grootte kleiner is dan de instelling 'veilige uploads max. afbeeldingsgrootte insluiten in e-mail kb'."
-    secure_media_max_email_embed_image_size_kb: "VEROUDERD: wordt verwijderd in Discourse 3.0, gebruik secure_uploads_max_email_embed_image_size_kb."
     secure_uploads_max_email_embed_image_size_kb: "De maximale grootte voor beveiligde afbeeldingen die worden ingesloten in e-mails als de instelling 'veilige uploads insluiten toestaan in e-mails' is ingeschakeld. Als die instelling niet is ingeschakeld, heeft deze instelling geen effect."
     slug_generation_method: "Kies een slug-generatiemodus. 'encoded' genereert een percentage-coderingsstring. 'none' schakelt de slug helemaal uit."
     enable_emoji: "Emoji inschakelen"
@@ -2083,7 +2040,6 @@ nl:
     revoke_api_keys_days: "Aantal dagen voordat een niet-gebruikte API-sleutel van een gebruiker automatisch wordt ingetrokken (0 voor nooit)"
     allow_user_api_keys: "Genereren van API-sleutels van gebruiker toestaan"
     allow_user_api_key_scopes: "Lijst van toegestane scopes voor API-sleutels van gebruiker"
-    min_trust_level_for_user_api_key: "Vereiste vertrouwensniveau voor genereren van API-sleutels van gebruiker"
     allowed_user_api_auth_redirects: "Toegestane URL voor verificatie bij omleiden voor API-sleutels van gebruiker. Het jokerteken * kan worden gebruikt om een deel ervan te laten overeenkomen (bv. www.example.com/*)."
     allowed_user_api_push_urls: "Toegestane URL's voor server-push naar gebruikers-API"
     expire_user_api_keys_days: "Aantal dagen voordat een API-sleutel van een gebruiker automatisch verloopt (0 voor nooit)"
@@ -2115,7 +2071,6 @@ nl:
     enable_sitemap: "Genereer een sitemap voor je website en neem deze op in het bestand robots.txt."
     sitemap_page_size: "Aantal URL's om op te nemen in elke sitemappagina. Maximaal 50.000"
     enable_user_status: "(experimenteel) Sta gebruikers toe om een aangepast statusbericht in te stellen (emoji + beschrijving)."
-    enable_user_tips: "(experimenteel) Schakel nieuwe gebruikerstips in die belangrijke functies beschrijven"
     short_title: "De korte titel wordt gebruikt op het startscherm van de gebruiker, de starter, of andere plaatsen waar ruimte beperkt kan zijn. Beperk de naam tot 12 tekens."
     dashboard_hidden_reports: "Toestaan dat de opgegeven rapporten worden verborgen op het dashboard."
     dashboard_visible_tabs: "Kiezen welke dashboardtabbladen zichtbaar zijn."
@@ -2132,10 +2087,6 @@ nl:
     suggest_weekends_in_date_pickers: "Neem weekenden (zaterdag en zondag) op in suggesties voor datumkiezers (schakel dit uit als je Discourse alleen op weekdagen gebruikt, maandag t/m vrijdag)."
     splash_screen: "Geeft een tijdelijk laadscherm weer terwijl website-items worden geladen"
     navigation_menu: "Bepaal welk navigatiemenu u wilt gebruiken. Zijbalk- en kopnavigatie kunnen door gebruikers worden aangepast. Een legacyoptie is beschikbaar voor terugwaartse compatibiliteit."
-    default_sidebar_categories: "Geselecteerde categorieën worden standaard weergegeven onder de sectie Categorieën van de zijbalk."
-    default_sidebar_tags: "Geselecteerde tags worden standaard weergegeven onder de sectie Tags van de zijbalk."
-    enable_new_user_profile_nav_groups: "EXPERIMENTEEL: gebruikers van de geselecteerde groepen krijgen het nieuwe navigatiemenu voor gebruikersprofielen te zien"
-    enable_experimental_topic_timeline_groups: "EXPERIMENTEEL: gebruikers in de geselecteerde groepen krijgen de tijdlijn van het geherformuleerde topic te zien"
     enable_experimental_hashtag_autocomplete: "EXPERIMENTEEL: gebruik het nieuwe automatische #hashtag-aanvulsysteem voor categorieën en tags dat het geselecteerde item anders weergeeft en de zoekfunctie verbetert"
     errors:
       invalid_css_color: "Ongeldige kleur. Voer een kleurnaam of hexadecimale waarde in."
@@ -2162,7 +2113,6 @@ nl:
       pop3_polling_password_is_empty: "Je moet een 'pop3 polling password' instellen voordat je POP3-polling inschakelt."
       pop3_polling_authentication_failed: "POP3-verificatie mislukt. Verifieer je POP3-referenties."
       reply_by_email_address_is_empty: "Je moet een 'reply by email address' instellen voordat je antwoorden via e-mail inschakelt."
-      email_polling_disabled: "Je moet handmatige of POP3-polling inschakelen voordat je antwoorden via e-mail inschakelt."
       user_locale_not_enabled: "Je moet 'allow user locale' inschakelen voordat je deze instelling inschakelt."
       personal_message_enabled_groups_invalid: "Je moet ten minste één groep opgeven voor deze instelling. Als je niet wilt dat iemand behalve medewerkers PB's stuurt, kies dan de medewerkersgroep."
       invalid_regex: "Regex is ongeldig of niet toegestaan."
@@ -2171,7 +2121,6 @@ nl:
       staged_users_disabled: "Je moet eerst 'gefaseerde gebruikers' inschakelen voordat je deze instelling inschakelt."
       reply_by_email_disabled: "Je moet eerst 'reply by email' inschakelen voordat je deze instelling inschakelt."
       discourse_connect_url_is_empty: "Je moet een 'DiscourseConnect-URL' instellen voordat je deze instelling inschakelt."
-      discourse_connect_invite_only: "Je kunt DiscourseConnect en alleen uitnodiging niet tegelijk inschakelen."
       enable_local_logins_disabled: "Je moet eerst 'enable local logins' inschakelen voordat je deze instelling inschakelt."
       min_username_length_exists: "Je kunt de minimale gebruikersnaamlengte niet hoger instellen dan de kortste gebruikersnaam (%{username})."
       min_username_length_range: "Je kunt het minimum niet hoger instellen dan het maximum."
@@ -2193,7 +2142,6 @@ nl:
       search_tokenize_japanese_enabled: "Je moet 'search_tokenize_japanese' uitschakelen voordat je deze instelling inschakelt."
       discourse_connect_cannot_be_enabled_if_second_factor_enforced: "Je kunt DiscourseConnect niet inschakelen als 2FA wordt afgedwongen."
       delete_rejected_email_after_days: "Deze instelling kan niet lager worden ingesteld dan de instelling delete_email_logs_after_days of hoger dan %{max}"
-      invalid_uncategorized_category_setting: "De categorie Ongecategoriseerd kan niet worden geselecteerd als het toestaan van ongecategoriseerde topics niet is toegestaan"
     placeholder:
       discourse_connect_provider_secrets:
         key: "www.example.com"
@@ -2388,7 +2336,6 @@ nl:
     activated_by_staff: "Geactiveerd door medewerker"
     new_user_typed_too_fast: "Nieuwe gebruiker typte te snel"
     content_matches_auto_silence_regex: "Inhoud komt overeen met reguliere expressie voor automatisch dempen"
-    content_matches_auto_block_regex: "Inhoud komt overeen met regex voor auto-blokkeren"
     username:
       short: "moet uit minstens %{min} tekens bestaan"
       long: "mag niet meer dan %{max} tekens zijn"
@@ -3125,14 +3072,6 @@ nl:
     user_automatically_silenced:
       title: "Gebruiker automatisch gedempt"
       subject_template: "Nieuwe gebruiker %{username} gedempt wegens markeringen door community"
-      text_body_template: |
-        Dit is een automatisch bericht.
-
-        De nieuwe gebruiker [%{username}](%{user_url}) is automatisch gedempt, omdat meerdere gebruikers een of meer berichten van %{username} hebben gemarkeerd.
-
-        [Beoordeel de markeringen](%{base_url}/admin/flags). Als %{username} ten onrechte is gedempt, klik dan op de knop voor opheffen van het dempen op [de beheerpagina van deze gebruiker](%{user_url}).
-
-        Deze drempel kan worden gewijzigd via de 'silence_new_user'-website-instellingen.
     spam_post_blocked:
       title: "Spambericht geblokkeerd"
       subject_template: "Berichten van nieuwe gebruiker %{username} geblokkeerd vanwege herhaalde links"
@@ -3166,15 +3105,6 @@ nl:
       title: "Externe afbeeldingen downloaden uitgeschakeld"
       subject_template: "Het downloaden van externe afbeeldingen is uitgeschakeld"
       text_body_template: "De instelling 'download_remote_images_to_local' is uitgeschakeld omdat de schijfruimtelimiet van 'download_remote_images_threshold' is bereikt."
-    dashboard_problems:
-      title: "Dashboardproblemen"
-      subject_template: "Nieuw advies op je websitedashboard"
-      text_body_template: |
-        We hebben nieuw advies en aanbevelingen voor je op basis van je huidige website-instellingen.
-
-        [Ga naar het websitedashboard](%{base_url}/admin) om het te bekijken.
-
-        Als er niets te zien is op je dashboard, kan het zijn dat een ander medewerker al iets heeft gedaan met dit advies. Een lijst met medewerkeracties is te vinden in je [medewerkeractielogs](%{base_url}/admin/logs/medewerkerf_action_logs).
     new_user_of_the_month:
       title: "Je bent een nieuwe gebruiker van de maand!"
       subject_template: "Je bent een nieuwe gebruiker van de maand!"
@@ -3211,9 +3141,6 @@ nl:
       one: "Let op: we sturen maximaal %{count} e-mail per dag. Kijk op de site om te zien welke mogelijk worden tegengehouden."
       other: "Let op: we sturen maximaal %{count} e-mails per dag. Kijk op de site om te zien welke mogelijk worden tegengehouden."
     in_reply_to: "In antwoord op"
-    unsubscribe:
-      title: "Uitschrijven"
-      description: "Niet geïnteresseerd in deze e-mails? Geen probleem! Klik hieronder om direct uitgeschreven te worden:"
     reply_by_email: "[Bezoek het topic](%{base_url}%{url}) of beantwoord deze e-mail om te reageren."
     reply_by_email_pm: "[Bezoek het bericht](%{base_url}%{url}) of beantwoord deze e-mail om op %{participants} te reageren."
     only_reply_by_email: "Beantwoord deze e-mail om te reageren."
@@ -3510,7 +3437,6 @@ nl:
       liked_received: "Ontvangen likes"
       new_users: "Nieuwe gebruikers"
       popular_topics: "Populaire topics"
-      follow_topic: "Dit topic volgen"
       join_the_discussion: "Meer lezen"
       popular_posts: "Populaire berichten"
       more_new: "Nieuw voor u"
@@ -3711,15 +3637,6 @@ nl:
   offline:
     title: "Kan app niet laden"
     offline_page_message: "Het lijkt erop dat je offline bent! Controleer je netwerkverbinding en probeer het opnieuw."
-  login_required:
-    welcome_message: |
-      ## [Welkom bij %{title}](#welkom)
-      Een account is vereist. Maak een account of meld je aan om verder te gaan.
-    welcome_message_invite_only: |
-      ## [Welkom bij %{title}](#welkom)
-      Een account is vereist. Vraag een bestaand lid om een uitnodiging of meld je aan om verder te gaan.
-  deleted: "verwijderd"
-  image: "afbeelding"
   upload:
     edit_reason: "lokale kopieën van afbeeldingen gedownload"
     unauthorized: "Sorry, het bestand dat je probeert te uploaden is niet toegestaan (toegestane extensies: %{authorized_extensions})."
@@ -3920,262 +3837,8 @@ nl:
       Ja, juridisch jargon is saai, maar we moeten onszelf &ndash; en bij uitbreiding jou en je gegevens &ndash; beschermen tegen onvriendelijke mensen. We hebben [Gebruiksvoorwaarden](%{base_path}/tos) die jouw (en ons) gedrag en rechten beschrijft met betrekking tot inhoud, privacy en wetten. Om deze dienst te gebruiken, moet je akkoord gaan met onze [Gebruiksvoorwaarden](%{base_path}/tos).
   tos_topic:
     title: "Gebruiksvoorwaarden"
-    body: |
-      Deze voorwaarden regelen het gebruik van het internetforum op <%{base_url}>. Om het forum te gebruiken, moet u akkoord gaan met deze voorwaarden van %{bedrijfsnaam}, het bedrijf dat het forum beheert.
-
-      Het bedrijf kan andere producten en diensten aanbieden, onder andere voorwaarden. Deze voorwaarden zijn alleen van toepassing op het gebruik van het forum.
-
-      Ga naar:
-
-      - [Belangrijke termen](#heading--important-terms)
-      - [Uw toestemming om het forum te gebruiken](#heading--permission)
-      - [Voorwaarden voor het gebruik van het forum](#heading--conditions)
-      - [Acceptabel gebruik](#heading--acceptable-use)
-      - [Contentnormen](#heading--content-standards)
-      - [Handhaving](#heading--enforcement)
-      - [Uw account](#heading--your-account)
-      - [Uw content](#heading--your-content)
-      - [Uw verantwoordelijkheid](#heading--responsibility)
-      - [Disclaimers](#heading--disclaimers)
-      - [Beperking van de aansprakelijkheid](#heading--liability)
-      - [Feedback](#heading--feedback)
-      - [Beëindiging](#heading--termination)
-      - [Geschillen](#heading--disputes)
-      - [Algemene voorwaarden](#heading--general)
-      - [Contact](#heading--contact)
-      - [Wijzigingen](#heading--changes)
-
-      <h2 id="heading--important-terms"><a href="#heading--important-terms">Belangrijke voorwaarden</a></h2>
-
-      ***Deze voorwaarden bevatten een aantal belangrijke bepalingen die uw rechten en verantwoordelijkheden beïnvloeden, zoals de disclaimers in [Disclaimers](#heading--disclaimers), beperking van de aansprakelijkheid van het bedrijf jegens u in [Beperking van de aansprakelijkheid](#heading--liability), uw akkoord om het bedrijf te vrijwaren van schade veroorzaakt door uw misbruik van het forum in [Uw verantwoordelijkheid](#heading--responsibility) en een overeenkomst om geschillen te arbitreren in [Geschillen](#heading--disputes).***
-
-      <h2 id="heading--permission"><a href="#heading--permission">Uw toestemming om het forum te gebruiken</a></h2>
-
-      Het bedrijf geeft u toestemming om het forum te gebruiken onder deze voorwaarden. Iedereen moet akkoord gaan met deze voorwaarden om het forum te kunnen gebruiken.
-
-      <h2 id="heading--conditions"><a href="#heading--conditions">Voorwaarden voor het gebruik van het forum</a></h2>
-
-      Uw toestemming om het forum te gebruiken is onderworpen aan de volgende voorwaarden:
-
-      1. U moet ten minste dertien jaar oud zijn.
-
-      2. U mag het forum niet langer gebruiken als het bedrijf rechtstreeks contact met u opneemt om te zeggen dat u dat niet mag.
-
-      3. U moet het forum gebruiken in overeenstemming met [Acceptabel gebruik](#heading--acceptable-use) en [Contentnormen](#heading--content-standards).
-
-      <h2 id="heading--acceptable-use"><a href="#heading--acceptable-use">Acceptabel gebruik</a></h2>
-
-      1. U mag de wet niet overtreden via het forum.
-
-      2. U mag het account van een ander op het forum niet gebruiken of proberen te gebruiken zonder diens specifieke toestemming.
-
-      3. U mag geen gebruikersnamen of andere unieke identificaties op het forum kopen, verkopen of anderszins verhandelen.
-
-      4. U mag geen advertenties, kettingbrieven of andere verzoeken via het forum versturen, of het forum gebruiken om adressen of andere persoonsgegevens te verzamelen voor commerciële mailinglijsten of databases.
-
-      5. U mag de toegang tot het forum niet automatiseren of het forum monitoren, zoals met een webcrawler, browserplug-in of -add-on, of een ander computerprogramma dat geen webbrowser is. U kunt het forum crawlen om het te indexeren voor een openbare zoekmachine, als u die beheert.
-
-      6. U mag het forum niet gebruiken om e-mail te versturen naar distributielijsten, nieuwsgroepen of aliassen voor groeps-e-mail.
-
-      7. U mag niet ten onrechte suggereren dat u verbonden bent met of gesteund wordt door het bedrijf.
-
-      8. U mag geen hyperlink naar afbeeldingen of andere niet-hypertext content van het forum op andere webpagina's plaatsen.
-
-      9. U mag geen aanduidingen van eigendomsrecht verwijderen uit materiaal dat u van het forum downloadt.
-
-      10. U mag geen enkel deel van het forum op andere websites tonen met '<iframe>'.
-
-      11. U mag geen beveiligings- of toegangsbeperkingen van het forum uitschakelen, vermijden of omzeilen.
-
-      12. U mag de infrastructuur van het forum niet belasten met een onredelijke hoeveelheid verzoeken of verzoeken die een onredelijke belasting vormen voor de informatiesystemen die aan het forum ten grondslag liggen.
-
-      13. U mag zich via het forum niet voordoen als iemand anders.
-
-      14. U mag niemand aanmoedigen of helpen in strijd met deze voorwaarden.
-
-      <h2 id="heading--content-standards"><a href="#heading--content-standards">Contentnormen</a></h2>
-
-      1. U mag geen content naar het forum sturen die illegaal, aanstootgevend of anderszins schadelijk is voor anderen. Dit omvat content die intimiderend, ongepast, beledigend of haatdragend is.
-
-      2. U mag geen content naar het forum sturen die de wet overtreedt, inbreuk maakt op iemands intellectuele-eigendomsrechten, iemands privacy schendt of inbreuk maakt op overeenkomsten die u met anderen hebt gesloten.
-
-      3. U mag geen content naar het forum sturen die schadelijke computercode bevat, zoals computervirussen of spyware.
-
-      4. U mag geen content naar het forum sturen als louter plaatshouder, om een bepaald adres, gebruikersnaam of andere unieke identificatie vast te houden.
-
-      5. U mag het forum niet gebruiken om informatie bekend te maken waarvoor u niet het recht hebt deze bekend te maken, zoals vertrouwelijke of persoonlijke informatie van anderen.
-
-      <h2 id="heading--enforcement"><a href="#heading--enforcement">Handhaving</a></h2>
-
-      Het bedrijf kan schendingen van deze voorwaarden onderzoeken en vervolgen in de ruimste zin van het recht. Het bedrijf kan wetshandhavingsinstanties inlichten en met hen samenwerken bij de vervolging van schendingen van de wet en deze voorwaarden.
-
-      Het bedrijf behoudt zich het recht voor om de inhoud van het forum om welke reden dan ook te wijzigen, te bewerken en te verwijderen. Als u denkt dat iemand in strijd met deze voorwaarden inhoud op het forum heeft geplaatst, [neem dan onmiddellijk contact met ons op](#heading--contact).
-
-      <h2 id="heading--your-account"><a href="#heading--your-account">Uw account</a></h2>
-
-      U moet een account maken en zich aanmelden om sommige functies van het forum te kunnen gebruiken.
-
-      Om een account te maken, moet u enkele gegevens over uzelf verstrekken. Als u een account maakt, gaat u ermee akkoord om ten minste een geldig e-mailadres op te geven en dat adres up-to-date te houden. U kunt uw account te allen tijde beëindigen door een e-mail te sturen naar <%{contact_email}>.
-
-      U gaat ermee akkoord verantwoordelijk te zijn voor alle acties die met uw account worden ondernomen, ongeacht of u daarvoor toestemming hebt gegeven of niet, totdat u uw account beëindigt of het bedrijf ervan in kennis stelt dat uw account is gecompromitteerd. U gaat ermee akkoord het bedrijf onmiddellijk op de hoogte te stellen als u vermoedt dat uw account is gecompromitteerd. U gaat ermee akkoord een veilig wachtwoord voor uw account te kiezen en dit geheim te houden.
-
-      Het bedrijf kan uw account op het forum beperken, opschorten of beëindigen in overeenstemming met zijn beleid voor het behandelen van auteursrechtengerelateerde verwijderingsverzoeken, of als het bedrijf redelijkerwijs van mening is dat u een regel in deze voorwaarden hebt overtreden.
-
-      <h2 id="heading--your-content"><a href="#heading--your-content">Uw content</a></h2>
-
-      Niets in deze voorwaarden geeft het bedrijf eigendomsrechten op de intellectuele eigendommen die u deelt met het forum, zoals uw accountinformatie, berichten of andere content die indient bij het forum. Niets in deze voorwaarden geeft u enig eigendomsrecht op de intellectuele eigendommen van het bedrijf.
-
-      Tussen u en het bedrijf blijft u als enige verantwoordelijk voor de content die indient bij het forum. U gaat ermee akkoord dat u niet ten onrechte impliceert dat content die u indient bij het forum, wordt gesponsord of goedgekeurd door het bedrijf. Deze voorwaarden verplichten het bedrijf niet tot het opslaan, onderhouden of verstrekken van kopieën van content die u indient en tot het wijzigen ervan, overeenkomstig deze voorwaarden.
-
-      Content die indient bij het forum is van u en u beslist welke toestemming u anderen daarvoor geeft. U geeft het bedrijf echter ten minste een licentie om content die u bij het forum indient te verstrekken aan andere gebruikers van het forum. Die speciale licentie staat het bedrijf toe om content die u indient bij het forum te kopiëren, te publiceren en te analyseren.
-
-      Wanneer content die u indient bij het forum wordt verwijderd, door u of door het bedrijf, eindigt de speciale licentie van het bedrijf wanneer de laatste kopie verdwijnt uit de back-ups, caches en andere systemen van het bedrijf. Andere licenties die u toepast op content die u indient, zoals [Creative Commons](https://creativecommons.org)-licenties, kunnen blijven bestaan nadat uw content is verwijderd. Deze licenties kunnen anderen, of het bedrijf zelf, het recht geven om uw content opnieuw te delen via het forum.
-
-      Anderen die content ontvangen die u indient bij het forum kunnen de voorwaarden schenden waarop u uw content in licentie geeft. U gaat ermee akkoord dat het bedrijf niet aansprakelijk is jegens u voor deze schendingen of de gevolgen ervan.
-
-      <h2 id="heading--responsibility"><a href="#heading--responsibility">Uw verantwoordelijkheid</a></h2>
-
-      U gaat ermee akkoord het bedrijf te vrijwaren van rechtsvorderingen van anderen in verband met schending van deze voorwaarden door u of door anderen die uw account op het forum gebruiken. U en het bedrijf komen overeen om de andere partij zo snel mogelijk in kennis te stellen van alle rechtsvorderingen waarvoor u het bedrijf zou moeten vrijwaren. Als het bedrijf u niet onmiddellijk in kennis stelt van een rechtsvordering, hoeft u het bedrijf niet schadeloos te stellen voor schade die u met een tijdige kennisgeving had kunnen verdedigen of beperken. U gaat ermee akkoord dat u het bedrijf toestaat het onderzoek, de verdediging en de schikking van rechtsvorderingen waarvoor u het bedrijf zou moeten vrijwaren te controleren en dat u meewerkt met deze inspanningen. Het bedrijf gaat ermee akkoord niet in te stemmen met enige schikking die uw schuld toegeeft of u verplichtingen oplegt zonder uw voorafgaande instemming.
-
-      <h2 id="heading--disclaimers"><a href="#heading--disclaimers">Disclaimers</a></h2>
-
-      ***U aanvaardt alle risico's van het gebruik van het forum en de inhoud daarvan. Voor zover toegestaan door de wet leveren het bedrijf en zijn leveranciers het forum zoals het is, zonder enige garantie.***
-
-      Het forum kan hyperlinks naar forums en diensten van anderen plaatsen en deze integreren. Het bedrijf geeft geen enkele garantie over diensten die door anderen worden beheerd of content die zij kunnen leveren. Op het gebruik van diensten die door anderen worden uitgevoerd, kunnen andere voorwaarden van toepassing zijn tussen u en degene die de dienst beheert.
-
-      <h2 id="heading--liability"><a href="#heading--liability">Beperking van de aansprakelijkheid</a></h2>
-
-      ***Noch het bedrijf noch zijn leveranciers zijn jegens u aansprakelijk voor contractbreukschade die hun personeel redelijkerwijs niet kon voorzien toen u akkoord ging met deze voorwaarden.***
-
-      ***Voor zover toegestaan door de wet is de totale aansprakelijkheid jegens u voor vorderingen van welke aard dan ook die verband houden met het forum of de inhoud ervan beperkt tot $ 50.***
-
-      <h2 id="heading--feedback"><a href="#heading--feedback">Feedback</a></h2>
-
-      Het bedrijf verwelkomt uw feedback en suggesties voor het forum. Zie de sectie [Contact](#heading--contact) hieronder voor manieren om met ons in contact te komen.
-
-      U gaat ermee akkoord dat het bedrijf vrij is om te handelen naar de feedback en suggesties die u geeft en dat het bedrijf u niet hoeft te melden dat uw feedback is gebruikt, uw toestemming hoeft te vragen om deze te gebruiken of u hoeft te betalen. U gaat ermee akkoord geen feedback of suggesties in te dienen die volgens u vertrouwelijk of eigendomsrechtelijk zijn voor u of voor anderen.
-
-      <h2 id="heading--termination"><a href="#heading--termination">Beëindiging</a></h2>
-
-      Zowel u als het bedrijf kunnen te allen tijde de in deze voorwaarden beschreven overeenkomst beëindigen. Wanneer onze overeenkomst eindigt, eindigt ook uw toestemming om het forum te gebruiken.
-
-      De volgende bepalingen blijven van kracht na beëindiging van onze overeenkomst: [Uw content](#heading--your-content), [Feedback](#heading--feedback), [Uw verantwoordelijkheid](#heading--responsibility), [Disclaimers](#heading--disclaimers), [Beperking van de aansprakelijkheid](#heading--liability) en [Algemene voorwaarden](#heading--general).
-
-      <h2 id="heading--disputes"><a href="#heading--disputes">Geschillen</a></h2>
-
-      %{governing_law} is van toepassing op elk geschil met betrekking tot deze voorwaarden of uw gebruik van het forum.
-
-      U en het bedrijf komen overeen om alleen bij een staats- of federale rechtbank in %{city_for_disputes} gerechtelijke bevelen te verzoeken met betrekking tot deze voorwaarden. Noch u noch het bedrijf zal bezwaar maken tegen de rechtsbevoegdheid, het forum of de locatie van deze rechtbanken.
-
-      ***U en het bedrijf zullen elk geschil oplossen door middel van bindende arbitrage door de American Arbitration Association. De arbitrage volgt het handelsarbitragereglement en de aanvullende procedures voor consumentengeschillen van de AAA. Arbitrage zal plaatsvinden in %{city_for_disputes}. U zult elk geschil als individu regelen en niet als onderdeel van een collectieve actie of een andere representatieve procedure, hetzij als eiser of als lid van een groep. Geen enkele arbiter zal een geschil consolideren met een andere arbitrage zonder toestemming van het bedrijf.***
-
-      Elke arbitrage-uitspraak omvat de kosten van de arbitrage, redelijke advocatenhonoraria en redelijke kosten voor getuigen. U en het bedrijf kunnen arbitrage starten bij elke bevoegde rechtbank.
-
-      <h2 id="heading--general"><a href="#heading--general">Algemene voorwaarden</a></h2>
-
-      Indien een bepaling van deze voorwaarden niet afdwingbaar is zoals die geschreven is, maar gewijzigd kan worden om die afdwingbaar te maken, moet die bepaling worden gewijzigd in de minimale mate die nodig is om die afdwingbaar te maken. Anders moet die bepaling worden geschrapt.
-
-      U mag uw overeenkomst met het bedrijf niet overdragen. Het bedrijf kan uw overeenkomst overdragen aan een vestiging van het bedrijf, een ander bedrijf dat de controle over het bedrijf verkrijgt, of een ander bedrijf dat activa van het bedrijf koopt die verband houden met het forum. Elke poging tot overdracht in strijd met deze voorwaarden heeft geen rechtsgevolgen.
-
-      Noch de uitoefening van enig recht uit hoofde van deze overeenkomst, noch het afzien van het optreden tegen een schending van deze overeenkomst, ziet af van optreden tegen enige andere schending van deze overeenkomst.
-
-      Deze voorwaarden belichamen alle voorwaarden van overeenkomst tussen u en het bedrijf betreffende het gebruik van het forum. Deze voorwaarden vervangen volledig alle andere overeenkomsten betreffende uw gebruik van het forum, al dan niet schriftelijk.
-
-      <h2 id="heading--contact"><a href="#heading--contact">Contact</a></h2>
-
-      U kunt het bedrijf onder deze voorwaarden informeren en vragen sturen naar het bedrijf op <%{contact_email}>.
-
-      Het bedrijf kan u onder deze voorwaarden informeren via het e-mailadres dat u voor uw account op het forum hebt opgegeven, of door een bericht te plaatsen op de startpagina van het forum of op de pagina van uw account.
-
-      <h2 id="heading--changes"><a href="#heading--changes">Wijzigingen</a></h2>
-
-      Het bedrijf heeft deze voorwaarden voor het laatst bijgewerkt op 12 juli 2018 en kan deze voorwaarden opnieuw bijwerken. Het bedrijf zal alle updates op het forum plaatsen. Voor updates die belangrijke wijzigingen bevatten, gaat het bedrijf ermee akkoord u een e-mail te sturen, indien u een account hebt gemaakt en een geldig e-mailadres hebt opgegeven. Het bedrijf kan ook updates aankondigen met speciale berichten of meldingen op het forum.
-
-      Zodra u bericht krijgt over een update van deze voorwaarden, moet u akkoord gaan met de nieuwe voorwaarden om het forum te kunnen blijven gebruiken.
   privacy_topic:
     title: "Privacybeleid"
-    body: |
-      <a name="collect"></a>
-
-      ## [Welke gegevens verzamelen we?](#collect)
-
-      We verzamelen gegevens van je wanneer je je op onze site registreert en wanneer je deelneemt aan het forum door de hier gedeelde inhoud te lezen, te schrijven en te evalueren.
-
-      Bij registratie op onze site kun je gevraagd worden je naam en e-mailadres op te geven. Je kunt onze site echter bezoeken zonder je te registreren. Je e-mailadres wordt geverifieerd door middel van een e-mail met een unieke link. Als die link wordt bezocht, weten we dat jij het e-mailadres beheert.
-
-      Bij registratie en het plaatsen van berichten registreren we het IP-adres waar de berichten vandaan komen. We kunnen ook serverlogs bewaren met daarin het IP-adres van elk verzoek aan onze server.
-
-      <a name="use"></a>
-
-      ## [Waarvoor gebruiken we je gegevens?](#use)
-
-      Alle gegevens die we van je verzamelen kunnen op een van de volgende manieren worden gebruikt:
-
-      * Om je ervaring te personaliseren. Je gegevens helpen ons om beter in te spelen op je individuele behoeften.
-      * Om onze site te verbeteren. We streven er voortdurend naar ons siteaanbod te verbeteren op basis van de gegevens en feedback die we van je ontvangen.
-      * Om de klantenservice te verbeteren. Je gegevens helpen ons om effectiever te reageren op je klantenserviceverzoeken en ondersteuningsbehoeften.
-      * Om periodieke e-mails te sturen. Het e-mailadres dat je opgeeft kan worden gebruikt om je informatie te sturen, meldingen die je aanvraagt over wijzigingen in topics of in reactie op je gebruikersnaam, om te reageren op vragen en/of andere verzoeken of vragen.
-
-      <a name="protect"></a>
-
-      ## [Hoe beschermen we je gegevens?](#protect)
-
-      We passen diverse beveiligingsmaatregelen toe om de veiligheid van je persoonsgegevens te handhaven wanneer je deze invoert, verzendt of opent.
-
-      <a name="data-retention"></a>
-
-      ## [Wat is jullie beleid voor het bewaren van gegevens?](#data-retention)
-
-      We zullen ons te goeder trouw inspannen en:
-
-      * Serverlogs met het IP-adres van alle verzoeken aan deze server niet langer dan 90 dagen bewaren.
-      * De IP-adressen van geregistreerde gebruikers en hun berichten niet langer dan 5 jaar bewaren.
-
-      <a name="cookies"></a>
-
-      ## [Gebruiken we cookies?](#cookies)
-
-      Ja. Cookies zijn kleine bestanden die een site of zijn dienstverlener op de harde schijf van je computer plaatst via je webbrowser (als je dat toestaat). Met deze cookies kan de site je browser herkennen en, als je een geregistreerde account hebt, deze koppelen aan je geregistreerde account.
-
-      We gebruiken cookies om je voorkeuren te begrijpen en op te slaan voor toekomstige bezoeken en om samengevoegde gegevens over websiteverkeer en -interactie te verzamelen, zodat we in de toekomst betere website-ervaringen en tools kunnen aanbieden. We kunnen een overeenkomst aangaan met externe dienstverleners om ons te helpen de bezoekers van onze site beter te begrijpen. Het is deze dienstverleners niet toegestaan de namens ons verzamelde gegevens te gebruiken, behalve om ons te helpen onze activiteiten uit te voeren en te verbeteren.
-
-      <a name="disclose"></a>
-
-      ## [Verstrekken we gegevens aan derden?](#disclose)
-
-      We verkopen, verhandelen of dragen je persoonlijk identificeerbare informatie niet over aan derden. Dit geldt niet voor vertrouwde derden die ons helpen bij de exploitatie van onze site, het uitvoeren van onze activiteiten of het verlenen van diensten aan jou, zolang deze partijen ermee instemmen deze gegevens vertrouwelijk te houden. We kunnen je gegevens ook vrijgeven wanneer we van mening zijn dat dit nodig is om aan de wet te voldoen, het beleid van onze site te handhaven of onze of andermans rechten, eigendom of veiligheid te beschermen. Niet-persoonlijk identificeerbare bezoekersinformatie kan echter aan andere partijen worden verstrekt voor marketing, reclame of ander gebruik.
-
-      <a name="third-party"></a>
-
-      ## [Links van derden](#third-party)
-
-      Af en toe kunnen we naar eigen goeddunken producten of diensten van derden op onze site opnemen of aanbieden. Deze sites van derden hebben een apart en onafhankelijk privacybeleid. We zijn dan ook niet verantwoordelijk of aansprakelijk voor de inhoud en activiteiten van deze gelinkte sites. Niettemin proberen we de integriteit van onze site te beschermen en verwelkomen we alle feedback over deze sites.
-
-      <a name="coppa"></a>
-
-      ## [Children's Online Privacy Protection Act Compliance](#coppa)
-
-      Onze site, producten en diensten zijn allemaal gericht op mensen die ten minste 13 jaar of ouder zijn. Als deze server zich in de VS bevindt en je jonger dan 13 jaar bent volgens de eisen van COPPA ([Children's Online Privacy Protection Act](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)), gebruik deze site dan niet.
-
-      <a name="online"></a>
-
-      ## [Alleen online privacybeleid](#online)
-
-      Dit online privacybeleid is alleen van toepassing op gegevens die via onze site worden verzameld en niet op gegevens die offline worden verzameld.
-
-      <a name="consent"></a>
-
-      ## [Je toestemming](#consent)
-
-      Door onze site te gebruiken, ga je akkoord met ons privacybeleid.
-
-      <a name="changes"></a>
-
-      ## [Wijzigingen in ons privacybeleid](#changes)
-
-      Als we besluiten ons privacybeleid te wijzigen, zullen we die wijzigingen bekendmaken op deze pagina.
-
-      Dit document is CC-BY-SA. Het is voor het laatst bijgewerkt op 31 mei 2013.
   badges:
     mass_award:
       errors:
@@ -4480,10 +4143,7 @@ nl:
       message: "<p>We hebben de activerings-e-mail opnieuw naar <b>%{email}</b> gestuurd"
   safe_mode:
     title: "Veilige modus starten"
-    description: "In de veilige modus kun je je website testen zonder plug-ins of thema's te laden."
     no_themes: "Thema's en themacomponenten uitschakelen"
-    no_unofficial_plugins: "Niet-officiële plug-ins uitschakelen"
-    no_plugins: "Alle plug-ins uitschakelen"
     enter: "Veilige modus starten"
     must_select: "Je moet ten minste één optie selecteren om naar de veilige modus te gaan."
   wizard:
@@ -4598,7 +4258,6 @@ nl:
           <p>Veel plezier en succes met het <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>bouwen van je nieuwe community!</a></p>
   search_logs:
     graph_title: "Aantal zoekopdrachten"
-  joined: "Lid sinds"
   discourse_push_notifications:
     popup:
       mentioned: '%{username} heeft je genoemd in ''%{topic}'' - %{site_title}'
@@ -4661,50 +4320,30 @@ nl:
         category: categorie-instellingen
     actions:
       agree:
-        title: "Akkoord..."
-      agree_and_keep:
-        title: "Bericht behouden"
-        description: "Akkoord met markering en het bericht ongewijzigd laten."
-      agree_and_keep_hidden:
-        title: "Bericht verborgen houden"
-        description: "Akkoord gaan met markering en het bericht verborgen laten."
+        title: "Ja"
       agree_and_suspend:
-        title: "Gebruiker schorsen"
         description: "Akkoord met markering en de gebruiker schorsen."
       agree_and_silence:
         title: "Gebruiker dempen"
         description: "Akkoord met markering en de gebruiker dempen."
       agree_and_restore:
-        title: "Bericht herstellen"
         description: "Het bericht herstellen, zodat alle gebruikers het kunnen zien."
-      agree_and_hide:
-        title: "Bericht verbergen"
-        description: "Dit bericht verbergen en de gebruiker automatisch een bericht sturen waarin dringend wordt gevraagd het te bewerken."
       delete_single:
         title: "Verwijderen"
       delete:
         title: "Verwijderen..."
-      delete_and_ignore:
-        title: "Bericht verwijderen en negeren"
-        description: "Bericht verwijderen; als dit het eerste bericht is, ook het topic verwijderen"
       delete_and_ignore_replies:
-        title: "Bericht + antwoorden verwijderen en negeren"
-        description: "Bericht en alle antwoorden erop verwijderen; als dit het eerste bericht is, ook het topic verwijderen"
         confirm: "Weet je zeker dat je de antwoorden op het bericht ook wilt verwijderen?"
-      delete_and_agree:
-        title: "Bericht verwijderen en akkoord"
-        description: "Bericht verwijderen; als dit het eerste bericht is, ook het topic verwijderen"
       delete_and_agree_replies:
-        title: "Bericht + antwoorden verwijderen en akkoord"
-        description: "Bericht en alle antwoorden erop verwijderen; als dit het eerste bericht is, ook het topic verwijderen"
         confirm: "Weet je zeker dat je de antwoorden op het bericht ook wilt verwijderen?"
       disagree_and_restore:
-        title: "Niet akkoord en bericht herstellen"
         description: "Het bericht herstellen, zodat alle gebruikers het kunnen zien."
       disagree:
-        title: "Niet akkoord"
+        title: "Nee"
       ignore:
         title: "Negeren"
+      ignore_and_do_nothing:
+        title: "Niets doen"
       approve:
         title: "Goedkeuren"
       approve_post:
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index cccd3163fc6..4cc08cc4a16 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -52,6 +52,11 @@ pl_PL:
   remove_posts_deleted_by_author: "Usunięte przez autora"
   redirect_warning: "Nie byliśmy w stanie zweryfikować, że wybrany przez Ciebie link został rzeczywiście wysłany na forum. Aby kontynować mimo tego, wybierz link poniżej."
   on_another_topic: "Na innym temacie"
+  topic_category_changed: "Od %{from} do %{to}"
+  topic_tag_changed:
+    added_and_removed: "Dodano %{added} i usunięto %{removed}"
+    added: "Dodano %{added}"
+    removed: "Usunięto %{removed}"
   inline_oneboxer:
     topic_page_title_post_number: "#%{post_number}"
     topic_page_title_post_number_by_user: "#%{post_number} przez %{username}"
@@ -203,10 +208,10 @@ pl_PL:
       invalid_site_setting: "Brak ustawienia o nazwie '%{name}'."
       invalid_category_id: "Podana kategoria nie istnieje"
       invalid_choice:
-        one: "Podano nieprawidłowy wybór %{name}"
-        few: "Podano nieprawidłowe opcje %{name}"
-        many: "Podano nieprawidłowe opcje %{name}"
-        other: "Podano nieprawidłowe opcje %{name}"
+        one: "'%{name}' jest nieprawidłowym wyborem."
+        few: "'%{name}' są nieprawidłowym wyborem."
+        many: "'%{name}' są nieprawidłowym wyborem."
+        other: "'%{name}' są nieprawidłowym wyborem."
       default_categories_already_selected: "Nie możesz wybrać kategorii użytej w innej liście."
       default_tags_already_selected: "Nie można wybrać znacznika używanego z innej listy."
       s3_upload_bucket_is_required: "Nie możesz wysyłać na S3 jeżeli nie podasz 's3_upload_bucket'."
@@ -214,7 +219,6 @@ pl_PL:
       page_publishing_requirements: "Nie można włączyć publikowania stron, jeśli włączone są bezpieczne media."
       s3_backup_requires_s3_settings: "Nie możesz używać S3 do tworzenia kopii zapasowych bez podania \"%{setting_name}\"."
       s3_bucket_reused: "Nie możesz używać tego samego bucketu jako \"s3_upload_bucket\" i \"s3_backup_bucket\". Wybierz inny bucket albo podaj różne ścieżki dla każdego z bucketów."
-      secure_uploads_requirements: "Przed włączeniem funkcji bezpiecznego wysyłania należy włączyć wysyłanie w trybie S3."
       share_quote_facebook_requirements: "Aby włączyć udostępnianie na Facebooku, musisz ustawić identyfikator aplikacji Facebook."
       second_factor_cannot_enforce_with_socials: "Nie można wymusić 2FA z włączonym logowaniu społecznościowym. Najpierw musisz wyłączyć logowanie przez: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Nie można wymusić 2FA, jeśli lokalne logowanie jest wyłączone."
@@ -237,6 +241,10 @@ pl_PL:
         other: "Przepraszamy, nie mogliśmy wygenerować podglądu tej strony, ponieważ nie można znaleźć następującego tagu oEmbed/OpenGraph: %{missing_attributes}"
   word_connector:
     comma: ", "
+  custom_fields:
+    validations:
+      max_items: "Osiągnięto maksymalną liczbę pól niestandardowych dla tej encji (%{max_items_number})"
+      max_value_length: "Osiągnięto maksymalną długość wartości pola niestandardowego (%{max_value_length})."
   invite:
     expired: "Twój token z zaproszeniem wygasł. Prosimy <a href='%{base_url}/about'>skontaktować się z personelem</a>."
     not_found: "Token do zaproszeń jest nieprawidłowy. <a href='%{base_url}/about'>Skontaktuj się z administracją strony</a>."
@@ -255,6 +263,7 @@ pl_PL:
     user_exists: "Nie ma potrzeby zapraszania <b>%{email}</b>, ponieważ ma już konto!"
     invite_exists: "Zaprosiłeś już <b>%{email}</b>."
     invalid_email: "%{email} nie jest prawidłowym adresem e-mail."
+    generic_error_response: "Wystąpił problem z twoim żądaniem."
     rate_limit:
       one: "Wysłałeś już %{count} zaproszenie w ostatnim dniu, odczekaj %{time_left} zanim spróbujesz ponownie."
       few: "Wysłałeś już %{count} zaproszenia w ostatnim dniu, odczekaj %{time_left} zanim spróbujesz ponownie."
@@ -442,6 +451,7 @@ pl_PL:
   too_late_to_edit: "Ten wpis został utworzony zbyt dawno. Nie może być edytowany ani usunięty."
   edit_conflict: "Ten wpis został zmieniony przez innego użytkownika i Twoje zmiany nie zostaną zapisane."
   revert_version_same: "Obecna wersja jest taka sama jak w wersja, którą próbujesz przywrócić."
+  reverted_to_version: "powrócono do wersji #%{version}"
   cannot_edit_on_slow_mode: "Ten temat jest w trybie powolnym. Aby zachęcić do przemyślanej, rozważanej dyskusji, edycja starych postów w tym temacie nie jest obecnie dozwolona w trybie powolnym."
   excerpt_image: "zdjęcie"
   bookmarks:
@@ -553,6 +563,7 @@ pl_PL:
       Każdemu łatwiej będzie przeczytać temat, który ma kilka pogłębionych odpowiedzi, zamiast wielu niewielkich, indywidualnych.
     dominating_topic: Dużo pisałeś w tym temacie! Zastanów się, czy nie dać innym możliwości odpowiadania tutaj i dyskutowania ze sobą.
     get_a_room: Odpowiedziałeś na @%{reply_username} %{count} razy. Czy wiesz, że możesz zamiast tego wysłać wiadomość osobistą?
+    dont_feed_the_trolls: Ten post został już oznaczony jako wymagający uwagi moderatora. Czy na pewno chcesz na niego odpowiedzieć? Odpowiedzi na negatywne treści zachęcają do jeszcze bardziej negatywnych zachowań.
     too_many_replies: |
       ### Osiągnąłeś/łaś limit odpowiedzi w tym temacie
 
@@ -642,7 +653,11 @@ pl_PL:
         translation_overrides:
           attributes:
             value:
-              invalid_interpolation_keys: 'Następujące klucze interpolacyjne są nieprawidłowe: „%{keys}”'
+              invalid_interpolation_keys:
+                one: "Następujący klucz interpolacji jest nieprawidłowy: %{keys}"
+                few: "Następujące klucze interpolacji są nieprawidłowe: %{keys}"
+                many: "Następujące klucze interpolacji są nieprawidłowe: %{keys}"
+                other: "Następujące klucze interpolacji są nieprawidłowe: %{keys}"
         watched_word:
           attributes:
             word:
@@ -663,22 +678,22 @@ pl_PL:
   staff_category_name: "Zespół"
   staff_category_description: "Ukryta kategoria dla rozmów zespołu. Tematy są widoczne tylko dla adminów i moderatorów."
   discourse_welcome_topic:
-    title: "Witamy w naszej społeczności!"
-    body: |2
+    title: "Witamy w %{site_title}! :wave:"
+    body: |
+      Bardzo się cieszymy, że do nas dołączyłeś.
 
-      Pierwszy paragraf tego przypiętego tematu będzie widoczny jako wiadomość powitalna dla wszystkich odwiedzających stronę główną. Jest bardzo ważny!
+      %{site_info_quote}
 
-      **Edytuj go** żeby zwięźle opisać swoje społeczeństwo.
+      Oto kilka rzeczy, które możesz zrobić, aby zacząć:
 
-      - Dla kogo jest?
-      - Co mogą tutaj znaleźć?
-      - Dlaczego powinni tutaj przychodzić?
-      - Gdzie mogą przeczytać więcej (link, zasoby, itp.)?
+      :speaking_head: **Przedstaw się**, dodając swoje zdjęcie oraz informacje o sobie i swoich zainteresowaniach do [swojego profilu](%{base_path}/my/preferences/account). Jaka jest jedna rzecz, o którą chciałbyś zostać zapytany?
 
-      <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+      :open_book: **Poznaj społeczność**, [przeglądając dyskusje](%{base_path}/top), które już się tutaj toczą. Gdy uznasz post za interesujący, pouczający lub zabawny, użyj :heart:, aby okazać uznanie lub wsparcie!
 
-      Rozważ zamknięcie tego tematu poprzez administracyjny :wrench: (w prawym górnym i dolnym rogu), aby zapobiec niepotrzebnym odpowiedziom do ogłoszenia.
-  admin_quick_start_title: "README: Skrócony poradnik administratora"
+      :handshake: **Wnieś swój wkład**, komentując, dzieląc się własną perspektywą, zadając pytania lub wyrażając opinie w dyskusji. Przed udzieleniem odpowiedzi lub rozpoczęciem nowych tematów zapoznaj się z [wytycznymi dla społeczności](%{base_path}/faq).
+
+      > Jeśli potrzebujesz pomocy lub masz sugestie, możesz zapytać [#feedback](%{base_path}/c/site-feedback) lub [skontaktuj się z administratorami](%{base_path}/about).
+  admin_quick_start_title: "Przewodnik administratora: Pierwsze kroki"
   category:
     topic_prefix: "O kategorii %{category}"
     replace_paragraph: "(W miejsce tego paragrafu wstaw krótki opis nowej kategorii. Będzie on wyświetlany na karcie wyboru kategorii, więc postaraj się go utrzymać poniżej 200 znaków.)"
@@ -697,6 +712,7 @@ pl_PL:
       disallowed_tags_generic: "W tym temacie niedozwolone są tagi."
       slug_contains_non_ascii_chars: "zawiera znaki inne niż ascii"
       is_already_in_use: "jest już w użyciu"
+      move_topic_to_category_disallowed: "Nie możesz przenieść tego tematu do kategorii, w której nie masz uprawnień do tworzenia nowych tematów."
     cannot_delete:
       uncategorized: "Ta kategoria ma specjalny charakter. Jest przeznaczona jako miejsce do przechowywania tematów nieprzypisanych do żadnej kategorii i jako taka nie może zostać usunięta."
       has_subcategories: "Nie można usunąć tej kategorii ponieważ posiada podkategorie. "
@@ -1212,7 +1228,7 @@ pl_PL:
       title: "DAU / MAU"
       xaxis: "Dzień"
       yaxis: "DAU / MAU"
-      description: "Liczba członków zalogowanych w ostatnim dniu podzielona przez liczbę członków zalogowanych w ostatnim miesiącu - zwraca % wskazujący 'lepkość' społeczności. Celuj na >30%."
+      description: "Liczba członków zalogowanych w ostatnim dniu podzielona przez liczbę członków zalogowanych w ostatnim miesiącu - zwraca % wskazujący 'lepkość' społeczności. Celuj na >20%."
     daily_engaged_users:
       title: "Zaangażowani użytkownicy dziennie"
       xaxis: "Dzień"
@@ -1481,6 +1497,7 @@ pl_PL:
     image_magick_warning: 'Serwer jest skonfigurowany do tworzenia miniatur dużych obrazów, ale ImageMagick nie jest zainstalowany. Zainstaluj ImageMagick za pomocą swojego ulubionego menedżera pakietów lub <a href="https://www.imagemagick.org/script/download.php" target="_blank">pobierz najnowszą wersję</a> .'
     failing_emails_warning: 'Istnieją zadania e-mail %{num_failed_jobs}, które się nie powiodły. Sprawdź plik app.yml i upewnij się, że ustawienia serwera poczty są prawidłowe. <a href="%{base_path}/sidekiq/retries" target="_blank">Zobacz nieudane prace w Sidekiq</a> .'
     subfolder_ends_in_slash: "Twoje ustawienie podfolderu jest niepoprawne; DISCOURSE_RELATIVE_URL_ROOT kończy się slashem."
+    outdated_translations_warning: "Niektóre z Twoich nadpisanych tłumaczeń są nieaktualne. Sprawdź swoje <a href='%{base_path}/admin/customize/site_texts?outdated=true'>dostosowania tekstu</a>."
     email_polling_errored_recently:
       one: "Email polling wygenerował błąd w przeciągu ostatniej doby. Więcej szczegółów w <a href='%{base_path}/logs' target='_blank'>logach</a>."
       few: "Email polling wygenerował %{count} błędy w przeciągu ostatniej doby. Więcej szczegółów w <a href='%{base_path}/logs' target='_blank'>logach</a>."
@@ -1494,6 +1511,7 @@ pl_PL:
     out_of_date_themes: "Aktualizacje są dostępne dla następujących motywów:"
     unreachable_themes: "Nie byliśmy w stanie sprawdzić aktualizacji następujących tematów:"
     watched_word_regexp_error: "Wyrażenie regularne dla '%{action}' jest nieprawidłowe. Sprawdź ustawienia <a href='%{base_path}/admin/customize/watched_words'>obserwowanych słów</a> lub wyłącz ustawienie witryny „obserwowane słowa regularne”."
+    v3_analytics_deprecated: "Twój Discourse używa obecnie Google Analytics 3, które nie będzie już wspierane po lipcu 2023 roku. <a href='https://meta.discourse.org/t/260498'>Uaktualnij do Google Analytics 4</a> teraz, aby nadal otrzymywać cenne informacje i analizy dotyczące wydajności twojej strony."
   site_settings:
     allow_bulk_invite: "Zezwalaj na zaproszenia zbiorcze, przesyłając plik CSV"
     disabled: "wyłączone"
@@ -1559,8 +1577,11 @@ pl_PL:
     fixed_category_positions_on_create: "Jeśli zaznaczone, kolejność kategorii będzie utrzymywana w oknie dialogowym tworzenia tematu (wymaga fixed_category_positions)."
     add_rel_nofollow_to_user_content: 'Dodaj rel nofollow do wszystkich treści użytkownika, poza wewnętrznymi linkami (wliczając domeny nadrzędne). Jeśli to zmienisz, musisz rebake wszystkie wpisy poprzez: "rake post:rebake"'
     exclude_rel_nofollow_domains: "Lista domen, w których nofollow nie powinien być dodawany do linków. example.com automatycznie zezwoli również na sub.example.com. Jako minimum należy dodać domenę tej witryny, aby roboty indeksujące mogły znaleźć całą treść. Jeśli inne części witryny znajdują się w innych domenach, dodaj je również."
+    max_form_template_title_length: "Maksymalna dozwolona długość tytułów szablonów formularzy."
+    max_form_template_content_length: "Maksymalna dozwolona długość zawartości szablonu formularza."
     post_excerpt_maxlength: "Maksymalna długość podsumowania / streszczenia wpisu."
     topic_excerpt_maxlength: "Maksymalna długość fragmentu/podsumowania tematu, wygenerowana z pierwszego posta w temacie."
+    default_subcategory_on_read_only_category: "Włącza przycisk „Nowy temat” i wybiera domyślną podkategorię do publikowania w kategoriach, w których użytkownik nie może tworzyć nowych tematów."
     show_pinned_excerpt_mobile: "Pokaż fragment przypiętych tematów w widoku mobilnym"
     show_pinned_excerpt_desktop: "Pokaż fragment przypiętych tematów w widoku \"wersja komputerowa\""
     post_onebox_maxlength: "Maksymalna długość (ilość znaków) treści wpisu osadzonego via Onebox"
@@ -1582,7 +1603,7 @@ pl_PL:
     manifest_icon: "Obraz używany jako logo / obraz powitalny na Androidzie. Zostanie automatycznie przeskalowany do rozmiaru 512 × 512. Jeśli pozostanie puste, zostanie użyty large_icon."
     manifest_screenshots: "Zrzuty ekranu, które pokazują możliwości i funkcjonalność Twojej instancji na stronie instalacyjnej. Wszystkie obrazy powinny być przesłane lokalnie i o tych samych wymiarach."
     favicon: "Favicona dla Twojej strony, zobacz <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://en.wikipedia.org/wiki/Favicon</a>. Aby działała poprawnie poprzez CDN, musi to być w formacie png. Zostanie przeskalowana do 32x32. Jeśli pozostanie pusta, zostanie użyte large_icon."
-    apple_touch_icon: "Ikona używana dla urządzeń Apple Touch. Zostanie automatycznie przeskalowany do rozmiaru 180x180. Jeśli pozostanie puste, zostanie użyty large_icon."
+    apple_touch_icon: "Ikona używana w urządzeniach dotykowych Apple. Przezroczyste tło nie jest zalecane. Zostanie automatycznie zmniejszona do rozmiaru 180x180. Jeśli pozostanie pusta, użyta zostanie ikona large_icon."
     opengraph_image: "Domyślny obraz opengraph, używany, gdy strona nie ma innego odpowiedniego obrazu. Jeśli pozostanie puste, zostanie użyty large_icon"
     notification_email: "Adres z którego wysyłane będą wszystkie istotne emaile systemowe.\nKonieczna jest poprawna konfiguracja rekordów SPF, DKIM oraz zwrotnego PTR użytej domeny."
     email_custom_headers: "A pipe-delimited list of custom email headers"
@@ -1597,6 +1618,8 @@ pl_PL:
     summary_percent_filter: "Gdy użytkownik kliknie na 'Podsumowaniu tematu', pokaż % najlepszych wpisów"
     summary_max_results: "Maksymalna liczba wpisów zwróconych przez „Podsumuj ten temat”"
     summary_timeline_button: "Pokaż przycisk „Podsumuj” na osi czasu"
+    summarization_strategy: "Dodatkowe sposoby podsumowywania treści zarejestrowanych przez wtyczki"
+    custom_summarization_allowed_groups: "Grupy, które mogą podsumowywać zawartość za pomocą `summarization_strategy`."
     enable_personal_messages: "PRZESTARZAŁE, zamiast tego użyj ustawienia 'personal message enabled groups'. Zezwalaj użytkownikom na poziomie zaufania 1 (konfigurowalnym za pomocą minimalnego zaufania do wysyłania wiadomości) na tworzenie wiadomości i odpowiadanie na wiadomości. Pamiętaj, że personel zawsze może wysyłać wiadomości bez względu na wszystko."
     personal_message_enabled_groups: "Zezwalaj użytkownikom w tych grupach na tworzenie wiadomości i odpowiadanie na nie. Grupy poziomów zaufania zawierają wszystkie poziomy zaufania powyżej tej liczby, na przykład wybranie trust_level_1 umożliwia również użytkownikom z trust_level_2, 3, 4 wysyłać PW. Pamiętaj, że personel zawsze może wysyłać wiadomości bez względu na wszystko."
     enable_system_message_replies: "Pozwala użytkownikom odpowiadać na wiadomości systemowe, nawet jeśli wiadomości osobiste są wyłączone"
@@ -1691,6 +1714,7 @@ pl_PL:
     enable_badges: "Włącz system odznak"
     max_favorite_badges: "Maksymalna liczba odznak, które użytkownik może wybrać"
     whispers_allowed_groups: "Zezwalaj na prywatną komunikację w ramach tematów członkom określonych grup."
+    hidden_post_visible_groups: "Zezwól członkom tych grup na przeglądanie ukrytych postów. Użytkownicy personelu zawsze mogą przeglądać ukryte posty."
     allow_index_in_robots_txt: "W pliku robots.txt określ, że ta witryna może być indeksowana przez wyszukiwarki internetowe. W wyjątkowych przypadkach możesz trwale <a href='%{base_path}/admin/customize/robots'>zastąpić plik robots.txt</a>."
     blocked_email_domains: "Rozdzielona pionową kreską lista domen poczty e-mail, z których użytkownicy nie mogą rejestrować kont. Subdomeny są obsługiwane automatycznie dla określonych domen. Symbole wieloznaczne * i ? nie są obsługiwane. Przykład: mailinator.com|trashmail.net"
     allowed_email_domains: "Rozdzielona pionową kreską lista domen e-mail, z których użytkownicy MUSZĄ zarejestrować konta. Subdomeny są obsługiwane automatycznie dla określonych domen. Symbole wieloznaczne * i ? nie są obsługiwane. OSTRZEŻENIE: Użytkownicy z domenami e-mail innymi niż wymienione nie będą mogli się zarejestrować!"
@@ -1717,7 +1741,7 @@ pl_PL:
     enable_discourse_connect: "Włącz logowanie przez DiscourseConnect (dawniej „Discourse SSO”) (OSTRZEŻENIE: ADRESY E-MAIL UŻYTKOWNIKÓW *MUSZĄ* BYĆ ZATWIERDZONE PRZEZ WITRYNĘ ZEWNĘTRZNĄ!)"
     verbose_discourse_connect_logging: "Rejestruj szczegółowe informacje diagnostyczne związane z DiscourseConnect na <a href='%{base_path}/logs' target='_blank'>/logs</a>"
     enable_discourse_connect_provider: "Wdrożenie protokołu dostawcy DiscourseConnect (dawniej 'Discourse SSO') w punkcie końcowym /session/sso_provider, który wymaga ustawienia discourse_connect_provider_secrets"
-    discourse_connect_url: "Adres URL punktu końcowego DiscourseConnect (musi zawierać http:// lub https://)"
+    discourse_connect_url: "Adres URL punktu końcowego DiscourseConnect (musi zawierać http:// lub https:// i nie może zawierać końcowego ukośnika)"
     discourse_connect_secret: "Sekretny ciąg znaków używany do uwierzytelniania kryptograficznego informacji DiscourseConnect, upewnij się, że ma 10 lub więcej znaków"
     discourse_connect_provider_secrets: "Lista tajnych domen korzystających z DiscourseConnect. Upewnij się, że ma co najmniej 10 znaków. Symbol gwiazdki może być użyty do dopasowania dowolnej domeny lub części domeny (przykład: * .example.com)"
     discourse_connect_overrides_bio: "Zastępuje biografię użytkownika w profilu użytkownika i uniemożliwia jej zmianę"
@@ -1731,7 +1755,7 @@ pl_PL:
     discourse_connect_overrides_profile_background: "Zastępuje tło profilu użytkownika wartością z DiscourseConnect."
     discourse_connect_overrides_card_background: "Zastępuje tło karty użytkownika wartością z DiscourseConnect."
     discourse_connect_not_approved_url: "Przekieruj niezatwierdzone konta DiscourseConnect do tego adresu URL"
-    discourse_connect_allows_all_return_paths: "Nie ograniczaj domeny do return_paths dostarczanych przez DiscourseConnect (domyślnie ścieżka zwrotna musi znajdować się w bieżącej witrynie)"
+    discourse_connect_allowed_redirect_domains: "Ogranicz do tych domen dla return_paths dostarczanych przez DiscourseConnect (domyślna ścieżka zwrotna musi być na bieżącej stronie). Użyj * aby zezwolić na dowolną domenę dla ścieżki zwrotnej. Własne poddomeny (`*.foobar.com`) są niedozwolone."
     enable_local_logins: "Włącz konta oparte na loginach lokalnych i hasłach. OSTRZEŻENIE: jeśli opcja jest wyłączona, zalogowanie się może nie być możliwe, jeśli wcześniej nie skonfigurowano co najmniej jednej alternatywnej metody logowania."
     enable_local_logins_via_email: "Zezwalaj użytkownikom na żądanie linku logowania do jednego kliknięcia, który zostanie im przesłany pocztą e-mail."
     allow_new_registrations: "Zezwól na rejestrację nowych użytkowników. Odznacz opcję żeby uniemożliwić rejestrację nowych kont."
@@ -1766,6 +1790,7 @@ pl_PL:
     s3_configure_tombstone_policy: "Włącz zasady automatycznego usuwania przy przesyłaniu nagrobków. WAŻNE: Jeśli ta opcja jest wyłączona, nie zostanie odzyskane żadne miejsce po usunięciu przesłanych plików."
     s3_disable_cleanup: "Zapobiegaj usuwaniu starych kopii zapasowych z S3, gdy jest ich więcej niż dozwolone maksimum."
     enable_s3_inventory: "Generuj raporty i weryfikuj przesyłane materiały za pomocą zasobów Amazon S3. WAŻNE: wymaga prawidłowych poświadczeń S3 (zarówno identyfikator klucza dostępu, jak i tajny klucz dostępu)."
+    s3_use_acls: "AWS zaleca, aby nie używać list ACL w zasobnikach S3; jeśli postępujesz zgodnie z tą radą, odznacz tę opcję. Ta opcja musi być włączona, jeśli korzystasz z bezpiecznego przesyłania."
     backup_time_of_day: "Godzina (UTC) wykonania kopii zapasowej."
     backup_with_uploads: "Uwzględniaj przesyły w zaplanowanych backupach. Wyłączenie tej opcji spowoduje backup jedynie bazy danych."
     backup_location: "Miejsce przechowywania kopii zapasowych. WAŻNE: S3 wymaga prawidłowych poświadczeń S3 wprowadzonych w ustawieniach plików."
@@ -1815,6 +1840,7 @@ pl_PL:
     s3_secret_access_key: "Tajny klucz dostępu Amazon S3, który będzie używany do przesyłania zdjęć, załączników i kopii zapasowych."
     s3_region: "Nazwa regionu Amazon S3, która będzie używana do przesyłania zdjęć i kopii zapasowych."
     s3_cdn_url: "URL CDN używany dla wszystkich aktywów s3 (na przykład : https://cdn.somewhere.com). Ostrzeżenie: po zmianie tego ustawienia musisz ponownie przywrócić stare wpisy."
+    s3_use_cdn_url_for_all_uploads: "Użyj adresu URL CDN dla wszystkich plików przesłanych do s3, a nie tylko dla obrazów."
     avatar_sizes: "Lista automatycznie wygenerowanych rozmiarów awatarów."
     external_system_avatars_enabled: "Użyj zewnętrzny system awatarów."
     external_system_avatars_url: "Adres URL zewnętrznego dostawcy awatarów. Dozwolone podstawienia: {username} {first_letter} {color} {size}"
@@ -1834,7 +1860,7 @@ pl_PL:
     composer_media_optimization_image_bytes_optimization_threshold: "Minimalny rozmiar pliku obrazu do uruchomienia optymalizacji po stronie klienta"
     composer_media_optimization_image_resize_dimensions_threshold: "Minimalna szerokość obrazu, aby wywołać zmianę rozmiaru po stronie klienta"
     composer_media_optimization_image_resize_width_target: "Obrazy o szerokości większej niż `composer_media_optimization_image_dimensions_resize_threshold` zostaną przeskalowane do tej szerokości. Musi być >= niż `composer_media_optimization_image_dimensions_resize_threshold`."
-    composer_media_optimization_image_encode_quality: "Jakość kodowania JPEG używana w procesie ponownego kodowania."
+    composer_media_optimization_image_encode_quality: "Jakość kodowania JPG używana w procesie ponownego kodowania."
     min_ratio_to_crop: "Współczynnik stosowany do przycinania wysokich zdjęć. Wpisz wynik szerokości / wysokości."
     simultaneous_uploads: "Maksymalna liczba plików, które można przeciągnąć i upuścić w kompozytorze"
     default_invitee_trust_level: "Domyślny poziom zaufania (0-4) dla zaproszonych użytkowników."
@@ -1863,7 +1889,9 @@ pl_PL:
     tl3_requires_likes_given: "Minimalna liczba polubień, które muszą zostać rozdane w ostatnich (tl3 okres) dniach, aby zakwalifikować się do awansu na poziom zaufania 3."
     tl3_requires_likes_received: "Minimalna liczba polubień, które użytkownik musi otrzymać w ostatnich (tl3 okres) dniach, aby zakwalifikować się do awansu na poziom zaufania 3."
     tl3_links_no_follow: "Nie usuwaj rel=nofollow z linków od użytkowników z trzecim poziomem zaufania."
-    trusted_users_can_edit_others: "Zezwalaj użytkownikom o wysokim poziomie zaufania na edycję treści od innych użytkowników"
+    tl4_delete_posts_and_topics: "Zezwól użytkownikom TL4 na usuwanie postów i tematów utworzonych przez innych użytkowników. Użytkownicy TL4 będą również mogli zobaczyć usunięte tematy i posty."
+    edit_all_topic_groups: "Zezwalaj użytkownikom w tej grupie na edytowanie tytułów, tagów i kategorii tematów innych użytkowników"
+    edit_all_post_groups: "Zezwalaj użytkownikom w tej grupie na edytowanie postów innych użytkowników"
     min_trust_to_create_topic: "The minimum trust level required to create a new topic."
     allow_flagging_staff: "Jeżeli włączone, użytkownicy mogą flagować wpisy członków zespołu."
     min_trust_to_edit_wiki_post: "Minimalny poziom zaufania wymagany do edycji wpisu oznaczonego jako wiki."
@@ -1899,7 +1927,6 @@ pl_PL:
     title_min_entropy: "Minimalna entropia tytułu tematu (liczba różnych znaków, zaleca się więcej dla języków innych niż angielski)."
     body_min_entropy: "Minimalna entropia treści wpisu (liczba różnych znaków, zaleca się więcej dla języków innych niż angielski)."
     allow_uppercase_posts: "Zezwól na same wielkie litery w tytule tematu lub treści wpisu."
-    max_consecutive_replies: "Liczba wpisów, które użytkownik musi wykonać w jednym rzędzie w temacie, zanim nie będzie można dodać kolejnej odpowiedzi."
     enable_filtered_replies_view: 'Przycisk "(n) odpowiedzi" zwija wszystkie pozostałe posty i pokazuje tylko bieżący post i jego odpowiedzi.'
     title_fancy_entities: "Konwertuj typowe znaki ASCII na fantazyjne jednostki HTML w tytułach tematów, ala SmartyPants <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</a>"
     min_title_similar_length: "Minimalna długość tytułu zanim zostanie sprawdzony z podobnymi tematami."
@@ -1979,6 +2006,11 @@ pl_PL:
     block_auto_generated_emails: "Odrzucaj przychodzące e-maile zidentyfikowane jako generowane automatycznie."
     ignore_by_title: "Ignoruj przychodzące wiadomości e-mail w oparciu o ich tytuł."
     mailgun_api_key: "Klucz Mailgun Secret API używany do weryfikacji wiadomości webhook."
+    sendgrid_verification_key: "Klucz weryfikacyjny Sendgrid używany do weryfikacji wiadomości webhook."
+    mailjet_webhook_token: "Token używany do weryfikacji zawartości webhooka. Musi być przekazany jako parametr zapytania 't' w webhooku, na przykład: https://example.com/webhook/mailjet?t=supersecret"
+    mandrill_authentication_key: "Klucz uwierzytelniania Mandrill używany do weryfikowania wiadomości webhook."
+    postmark_webhook_token: "Token używany do weryfikacji zawartości webhooka. Musi być przekazany jako parametr zapytania 't' w webhooku, na przykład: https://example.com/webhook/postmark?t=supersecret"
+    sparkpost_webhook_token: "Token używany do weryfikacji zawartości webhooka. Musi być przekazany jako parametr zapytania 't' w webhooku, na przykład: https://example.com/webhook/sparkpost?t=supersecret"
     soft_bounce_score: "Wynik odrzucania dodany do użytkownika, gdy ma miejsce tymczasowe odrzucanie."
     hard_bounce_score: "Wynik odrzucania dodany do użytkownika, gdy ma miejsce stałe odrzucanie."
     bounce_score_threshold: "Maksymalny wynik odrzucania przed końcem wysyłania emaili do użytkownika."
@@ -2006,7 +2038,7 @@ pl_PL:
     pop3_polling_password: "Hasło dla konta POP3 do cyklicznego pobierania e-maili."
     pop3_polling_delete_from_server: "Usuń wiadomości e-mail z serwera. UWAGA: Jeśli to wyłączysz, powinieneś ręcznie wyczyścić swoją skrzynkę pocztową"
     log_mail_processing_failures: "Zapisz wszystkie błędy przetwarzania wiadomości e-mail w <a href='%{base_path}/logs' target='_blank'>/ logs</a>"
-    email_in: 'Zezwalaj użytkownikom na publikowanie nowych tematów za pośrednictwem poczty e-mail (wymaga sondowania ręcznego lub pop3). Skonfiguruj adresy w zakładce „Ustawienia” każdej kategorii.'
+    email_in: "Zezwalaj użytkownikom na publikowanie nowych tematów za pośrednictwem poczty e-mail. Po włączeniu tego ustawienia będziesz mógł skonfigurować przychodzące adresy e-mail dla grup i kategorii."
     email_in_min_trust: "Minimalny poziom zaufania, który musi posiadać użytkownik, aby móc dodawać nowe wpisy w tematach poprzez email."
     email_in_authserv_id: "Identyfikator usługi sprawdzającej autentyczność przychodzących wiadomości e-mail. Instrukcje dotyczące konfigurowania znajdują się na <a href='https://meta.discourse.org/t/134358'>https://meta.discourse.org/t/134358</a> ."
     email_in_spam_header: "Nagłówek e-maila do wykrywania spamu."
@@ -2070,6 +2102,7 @@ pl_PL:
     allow_profile_backgrounds: "Zezwól użytkownikom na przesyłanie obrazu tła dla profilu."
     sequential_replies_threshold: "Liczba wpisów dodanych przez użytkownika jeden pod drugim w jednym temacie, po której zostanie on upomniany."
     get_a_room_threshold: "Liczba wpisów dodanych przez użytkownika w odpowiedzi na wpisy tej samej osoby w jednym temacie, po której zostanie on ostrzeżony."
+    dont_feed_the_trolls_threshold: "Liczba flag od innych użytkowników przed otrzymaniem ostrzeżenia."
     enable_mobile_theme: "Urządzenia mobilne używają dedykowanego mobilnego szablonu. Wyłącz to, jeśli chcesz użyć własnego, pojedynczego i responsywnego szablonu stylów. "
     dominating_topic_minimum_percent: "Odsetek (%) wpisów dodanych przez użytkownika w jednym temacie, po którym otrzyma on upomnienie, że nadmiernie go dominuje."
     disable_avatar_education_message: "Wyłącz wiadomość edukacyjną dla zmiany avataru."
@@ -2079,22 +2112,22 @@ pl_PL:
     permalink_normalizations: "Zastosuj następujący regex przed dopasowaniem permalinków, na przykład /(topic.*)\\?.*/\\1  spowoduje ściągnięcie ciągu zapytań z dróg tematu. Format to regex+strin używaj \\1 itd aby przechwycić dostęp"
     global_notice: "Wyświetlaj PILNE, AWARYJNE lub zawsze widoczny banner informacyjny, który będzie widoczny dla wszystkich odwiedzających. Ustaw to pole jako puste, aby go ukryć. (HTML dozwolony)"
     disable_system_edit_notifications: "Wyłącz edytowanie powiadomień przez system użytkownika gdy 'download_remote_images_to_local' jest aktywne."
-    disable_category_edit_notifications: "Wyłącz powiadomienia o edycji kategorii w tematach."
-    disable_tags_edit_notifications: "Wyłącz powiadomienia o edycji tagów w tematach."
+    disable_category_edit_notifications: "Wyłącz powiadomienia o zmianach kategorii tematu."
+    disable_tags_edit_notifications: "Wyłącz powiadomienia o edycji tagów tematu."
     notification_consolidation_threshold: "Liczba polubień lub powiadomień o członkostwie otrzymanych przed połączeniem powiadomień w jedno. Ustaw 0 aby wyłączyć."
     likes_notification_consolidation_window_mins: "Czas w minutach, po którym powiadomienia o polubieniach są łączone w jedno powiadomienie. Próg można skonfigurować za pomocą `SiteSetting.notification_consolidation_threshold`."
     automatically_unpin_topics: "Automatycznie odpinaj tematy, gdy użytkownik dotknie dna."
     read_time_word_count: "Licznik słów na minutę dla kalkulacji szacowanego czasu czytania."
     topic_page_title_includes_category: "<a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title' target='_blank'>Tytuł strony</a> zawiera nazwę kategorii."
-    native_app_install_banner_ios: "Wyświetla baner aplikacji DiscourseHub na urządzeniach iOS regularnym użytkownikom (poziom zaufania 1 i wyższy)."
-    native_app_install_banner_android: "Wyświetla baner aplikacji DiscourseHub na urządzeniach z Androidem regularnym użytkownikom (poziom zaufania 1 i wyższy)."
+    native_app_install_banner_ios: "Wyświetla baner aplikacji DiscourseHub na urządzeniach z systemem iOS dla zwykłych użytkowników (poziom zaufania 1) i wyższych."
+    native_app_install_banner_android: "Wyświetla baner aplikacji DiscourseHub na urządzeniach z Androidem dla zwykłych użytkowników (poziom zaufania 1) i wyższych."
     app_association_android: "Zawartość punktu końcowego <a href='%{base_path}/.well-known/assetlinks.json'>.well-known/assetlinks.json</a>, używanego przez interfejs Google Digital Asset Links API."
     app_association_ios: "Zawartość punktu końcowego <a href='%{base_path}/apple-app-site-association'>apple-app-site-association</a> używana do tworzenia uniwersalnych linków między tą stroną a aplikacjami iOS."
     share_anonymized_statistics: "Udostępnij anonimowe statystyki użytkowania."
     auto_handle_queued_age: "Automatycznie obsługuj rekordy, które czekają na przejrzenie po tylu dniach. Flagi zostaną zignorowane, a posty oczekujące w kolejce i użytkownicy zostaną odrzuceni. Ustaw na 0, aby wyłączyć tę funkcję."
     penalty_step_hours: "Domyślne kary za wyciszanie lub zawieszanie użytkowników w godzinach. Pierwsze wykroczenie domyślnie jest pierwszą wartością, drugie wykroczenie jest domyślne do drugiej wartości, itd."
     svg_icon_subset: "Dodaj dodatkowe ikony FontAwesome 5, które chcesz umieścić w swoich zasobach. Użyj przedrostka 'fa-' dla wypełnionych ikon, 'far-' dla zwykłych ikon i 'fab-' dla ikon marek."
-    max_prints_per_hour_per_user: "Maksymalna liczba /drukowanych stron (ustaw na 0, aby wyłączyć)"
+    max_prints_per_hour_per_user: "Maksymalna liczba wyświetleń strony /print (ustaw na 0, aby wyłączyć drukowanie)"
     full_name_required: "Pełna nazwa jest wymaganym polem profilu użytkownika."
     enable_names: "Pokaż pełną nazwę użytkownika w jego profilu, karcie użytkownika i w e-mailach. Wyłącz, aby ukryć pełną nazwę użytkownika wszędzie."
     display_name_on_posts: "Pokazuj imię i nazwisko użytkownika przy jego wpisach, a także jego @nazwę użytkownika."
@@ -2115,17 +2148,13 @@ pl_PL:
     allowed_href_schemes: "Projekty dozwolone w linkach jako dodatek do http i https."
     embed_post_limit: "Maksymalna liczba wpisów do osadzenia."
     embed_username_required: "W celu stworzenia tematu potrzebna jest nazwa użytkownika."
-    notify_about_flags_after: "Jeśli istnieją flagi, które nie zostały sprawdzone po tylu godzinach, wyślij osobistą wiadomość do moderatorów. Ustaw na 0, aby wyłączyć."
-    show_create_topics_notice: "Jeśli na stronie jest mniej niż 5 publicznych tematów, pokaż powiadomienie proszące adminów, aby stworzyli nowe tematy."
+    notify_about_reviewable_item_after: "Jeśli po tylu godzinach są elementy do przejrzenia, które jeszcze nie zostały sprawdzone, wyślij wiadomość do moderatorów. Ustaw na 0, aby wyłączyć."
     delete_drafts_older_than_n_days: "Usuń projekty starsze niż (n) dni."
     delete_merged_stub_topics_after_days: "Liczba dni, po których wątki, z których zostały przeniesione wszystkie posty, zostaną automatycznie usunięte. Aby to wyłączyć, ustaw wartość na 0."
-    bootstrap_mode_min_users: "Minimalna liczba użytkowników potrzebnych do wyłączenia trybu rozruchowego (ustaw 0, aby wyłączyć)"
+    bootstrap_mode_min_users: "Minimalna liczba użytkowników wymagana do wyłączenia trybu bootstrap (ustaw 0, aby wyłączyć, może to potrwać do 24 godzin)"
     prevent_anons_from_downloading_files: "Zablokuj możliwość pobierania załączników przez anonimowych użytkowników."
-    secure_media: "PRZESTARZAŁE: Zamiast tego użyj ustawienia secure_uploads, to ustawienie zostanie usunięte w Discourse 3.0."
     secure_uploads: 'Ograniczenie dostępu do WSZYSTKICH przesyłanych plików (obrazów, filmów, audio, tekstów, plików pdf, zipów i innych). Jeśli włączona jest opcja "Wymagane logowanie", tylko zalogowani użytkownicy będą mieli dostęp do przesyłanych materiałów. W przeciwnym razie dostęp będzie ograniczony tylko do przesyłania mediów w prywatnych wiadomościach i prywatnych kategoriach. UWAGA: To ustawienie jest skomplikowane i wymaga głębokiej wiedzy administracyjnej. Szczegóły znajdziesz na stronie <a target="_blank" href="https://meta.discourse.org/t/-/140017">w temacie bezpieczne przesyłanie plików na Meta</a> .'
-    secure_media_allow_embed_images_in_emails: "PRZESTARZAŁE: Użyj secure_uploads_allow_embed_images_in_emails, to ustawienie zostanie usunięte w Discourse 3.0."
     secure_uploads_allow_embed_images_in_emails: "Umożliwia osadzanie w wiadomościach e-mail bezpiecznych obrazów, które normalnie byłyby pominięte, jeśli ich rozmiar jest mniejszy niż ustawienie 'secure uploads max email embed image size kb'."
-    secure_media_max_email_embed_image_size_kb: "PRZESTARZAŁE: Użyj secure_uploads_max_email_embed_image_size_kb, to ustawienie zostanie usunięte w Discourse 3.0."
     secure_uploads_max_email_embed_image_size_kb: "Ograniczenie rozmiaru bezpiecznych obrazów, które będą osadzane w wiadomościach e-mail, jeśli włączone jest ustawienie 'secure uploads allow embed in emails'. Bez włączenia tego ustawienia, to ustawienie nie ma żadnego efektu."
     slug_generation_method: "Wybierz metodę tworzenia ślimaka. 'Zakodowane\" stworzy procentowy ciąg kodujący, \"żadne\" wyłączy tą metodę."
     enable_emoji: "Włącz obsługę emoji"
@@ -2133,6 +2162,7 @@ pl_PL:
     emoji_set: "Jaki jest twój preferowany styl emoji?"
     emoji_autocomplete_min_chars: "Minimalna liczba znaków wymagana do wywołania wyskakującego okienka z autouzupełnianiem"
     enable_inline_emoji_translation: "Włącza tłumaczenie wbudowanych emoji (bez spacji i znaków interpunkcyjnych przed)"
+    emoji_deny_list: "Tych emoji nie będzie można używać w menu ani w shortcodes."
     approve_post_count: "Liczba wpisów od nowego lub podstawowego użytkownika, które muszą zostać zatwierdzone"
     approve_unless_trust_level: "Wpisy użytkowników poniżej tego poziomu zaufania muszą być zatwierdzane"
     approve_new_topics_unless_trust_level: "Nowe tematy dodawane przez użytkowników z poziomem zaufania poniżej muszą zostać zaakceptowane"
@@ -2187,18 +2217,25 @@ pl_PL:
     default_tags_watching_first_post: "Lista tagów, w których domyślnie będzie obserwowany pierwszy post w każdym nowym temacie."
     default_text_size: "Rozmiar tekstu, który jest wybrany domyślnie"
     default_title_count_mode: "Tryb domyślny licznika tytułu strony"
+    enable_offline_indicator: "Wyświetlaj komunikat użytkownikom, gdy zostanie wykryte, że nie mają oni połączenia z siecią"
+    default_sidebar_link_to_filtered_list: "Spraw, aby linki menu nawigacyjnego domyślnie prowadziły do przefiltrowanej listy."
+    default_sidebar_show_count_of_new_items: "Spraw, aby łącza menu nawigacyjnego domyślnie pokazywały liczbę nowych elementów zamiast odznak."
     retain_web_hook_events_period_days: "Liczba dni przechowywania rekordów zdarzeń webhooków."
     retry_web_hook_events: "Automatycznie ponów 4 razy nieudane zdarzenia webhooków. Luki czasowe między ponownymi próbami wynoszą 1, 5, 25 i 125 minut."
     revoke_api_keys_days: "Liczba dni do automatycznego unieważnienia nieużywanego klucza API (0 oznacza brak)"
     allow_user_api_keys: "Pozwól na generację kluczy API użytkownika."
     allow_user_api_key_scopes: "Lista zakresów dozwolona dla kluczy API użytkownika."
-    min_trust_level_for_user_api_key: "Poziom zaufania wymagany dla generacji kluczy API użytkownika."
+    min_trust_level_for_user_api_key: |
+      Poziom zaufania wymagany do generowania kluczy API użytkownika.<br>
+      <b>OSTRZEŻENIE</b>: Zmiana poziomu zaufania uniemożliwi użytkownikom o niższym poziomie zaufania logowanie się przez Discourse Hub
     allowed_user_api_auth_redirects: "Dozwolony adres URL do przekierowania uwierzytelniania dla kluczy interfejsu API użytkownika. Symbol wieloznaczny * może być użyty do dopasowania dowolnej jego części (np. www.example.com/*)."
     allowed_user_api_push_urls: "Dozwolone URLs dla serwera push do API użytkownika"
     expire_user_api_keys_days: "Liczba dni do automatycznego wygaśnięcia klucza API użytkownika (0 oznacza brak)"
     tagging_enabled: "Włączyć tagi w tematach?"
     min_trust_to_create_tag: "Minimalny poziom zaufania potrzebny do stworzenia tagu."
     max_tags_per_topic: "Maksymalna liczba tagów, które mogą zostać połączone z tematem."
+    enable_max_tags_per_email_subject: "Użyj max_tags_per_email_subject podczas generowania tematu wiadomości e-mail"
+    max_tags_per_email_subject: "Maksymalna liczba tagów, które mogą znajdować się w temacie wiadomości e-mail"
     max_tag_length: "Maksymalna liczba znaków, które mogą być użyte w tagu."
     max_tag_search_results: "Podczas wyszukiwania tagów, maksymalna liczba rezultatów do wyświetlenia."
     max_tags_in_filter_list: "Maksymalna liczba tagów do pokazania w rozwijanym filtrze. Pokazane będą najczęściej używane tagi."
@@ -2210,6 +2247,8 @@ pl_PL:
     suppress_overlapping_tags_in_list: "Jeśli tagi dopasowane są dokładnie do słów w tytule tematu, nie pokazuj tagu"
     remove_muted_tags_from_latest: "Nie pokazuj tematów oznaczonych tylko wyciszonymi tagami na najnowszej liście tematów."
     force_lowercase_tags: "Wymuś, aby wszystkie nowe tagi były małymi literami."
+    create_post_for_category_and_tag_changes: "Utwórz mały post akcji, gdy zmieni się kategoria tematu lub tagi"
+    watched_precedence_over_muted: "Powiadamiaj mnie o tematach w obserwowanych przeze mnie kategoriach lub tagach, które również należą do tych, które wyciszyłem."
     company_name: "Nazwa firmy"
     governing_law: "Obowiązujące prawo"
     city_for_disputes: "Miasto sporów"
@@ -2224,7 +2263,7 @@ pl_PL:
     enable_sitemap: "Wygeneruj mapę witryny dla swojej strony i umieść ją w pliku robots.txt."
     sitemap_page_size: "Liczba adresów URL do uwzględnienia na każdej stronie mapy witryny. Maksymalnie 50.000"
     enable_user_status: "(eksperymentalne) Zezwól użytkownikom na ustawienie niestandardowego statusu (emoji + opis)."
-    enable_user_tips: "(eksperymentalne) Włącz nowe wskazówki dla użytkowników, które opisują najważniejsze funkcje witryny"
+    enable_user_tips: "Włącz nowe wskazówki dla użytkowników, które opisują najważniejsze funkcje witryny"
     short_title: "Krótki tytuł będzie używany na ekranie głównym użytkownika, launcherze lub w innych miejscach, gdzie przestrzeń może być ograniczona. Powinien składać się maksymalnie z 12 znaków."
     dashboard_hidden_reports: "Zezwalaj na ukrycie określonych raportów z panelu administracyjnego."
     dashboard_visible_tabs: "Wybierz, które karty panelu administracyjnego są widoczne."
@@ -2241,11 +2280,15 @@ pl_PL:
     suggest_weekends_in_date_pickers: "Uwzględnij weekendy (sobota i niedziela) w sugestiach selektora dat (wyłącz tę opcję, jeśli używasz Discourse tylko w dni powszednie, od poniedziałku do piątku)."
     splash_screen: "Wyświetla tymczasowy ekran ładowania podczas ładowania zasobów witryny"
     navigation_menu: "Określ, którego menu nawigacyjnego użyć. Pasek boczny i nawigacja z nagłówka są konfigurowalne przez użytkowników. Opcja przestarzała jest dostępna dla kompatybilności wstecznej."
-    default_sidebar_categories: "Wybrane kategorie będą domyślnie wyświetlane w sekcji Kategorie paska bocznego."
-    default_sidebar_tags: "Wybrane tagi będą domyślnie wyświetlane w sekcji Tagi paska bocznego."
-    enable_new_user_profile_nav_groups: "EKSPERYMENTALNE: Użytkownikom wybranych grup zostanie wyświetlone nowe menu nawigacyjne profilu użytkownika"
-    enable_experimental_topic_timeline_groups: "EKSPERYMENTALNE: Użytkownikom wybranych grup zostanie pokazana odświeżona oś czasu tematu"
+    default_navigation_menu_categories: "Wybrane kategorie będą domyślnie wyświetlane w sekcji kategorie menu nawigacji."
+    default_navigation_menu_tags: "Wybrane tagi będą domyślnie wyświetlane w sekcji Tagi menu nawigacji."
     enable_experimental_hashtag_autocomplete: "EKSPERYMENTALNIE: Użyj nowego systemu autouzupełniania #hashtagów dla kategorii i tagów, który inaczej renderuje wybrany element i usprawnia wyszukiwanie"
+    experimental_new_new_view_groups: 'EKSPERYMENTALNE: Włącz nową listę tematów, która łączy nieprzeczytane i nowe tematy i utwórz link "Wszystko" na pasku bocznym.'
+    enable_custom_sidebar_sections: "EKSPERYMENTALNIE: Włącz niestandardowe sekcje paska bocznego"
+    experimental_topics_filter: "EKSPERYMENTALNE: Włącza eksperymentalną ścieżkę filtrowania tematów w /filter"
+    experimental_search_menu_groups: "EKSPERYMENTALNE: Włącza nowe menu wyszukiwania, które zostało ulepszone tak, by korzystało z glimmer"
+    enable_experimental_lightbox: "EKSPERYMENTALNIE: Zastąp domyślny lightbox obrazu odświeżonym projektem."
+    page_loading_indicator: "Skonfiguruj wskaźnik ładowania, który pojawia się podczas nawigacji po stronie w Discourse. \"Spinner\" to wskaźnik na pełnym ekranie. \"Slider\" wyświetla wąski pasek u góry ekranu."
     errors:
       invalid_css_color: "Nieprawidłowy kolor. Wpisz nazwę koloru lub wartość szesnastkową."
       invalid_email: "Nieprawidłowy adres e-mail."
@@ -2271,7 +2314,6 @@ pl_PL:
       pop3_polling_password_is_empty: "Musisz ustawić 'pop3 polling password' przed włączeniem przeglądania cyklicznego POP3."
       pop3_polling_authentication_failed: "Błąd autoryzacji POP3. Proszę zweryfikować swoje dane uwierzytelniające POP3."
       reply_by_email_address_is_empty: "Musisz ustawić \"odpowiedz poprzez adres email' przed włączeniem odpowiedzi przez email."
-      email_polling_disabled: "Musisz włączyć manualne lub cykliczne przeglądanie POP3 przed włączeniem odpowiedzi przez email."
       user_locale_not_enabled: "Musisz najpierw włączyć ''pozwól na ustawienia lokalne\" przed włączeniem tych ustawień."
       personal_message_enabled_groups_invalid: "Musisz określić co najmniej jedną grupę dla tego ustawienia. Jeśli nie chcesz, aby ktokolwiek poza personelem wysyłał PW, wybierz grupę personelu."
       invalid_regex: "Wyrażenie regularne jest niepoprawne lub niedozwolone."
@@ -2280,7 +2322,6 @@ pl_PL:
       staged_users_disabled: "Przed włączeniem tego ustawienia musisz najpierw włączyć 'staged users'."
       reply_by_email_disabled: "Przed włączeniem tego ustawienia musisz najpierw włączyć opcję 'reply by email'."
       discourse_connect_url_is_empty: "Musisz ustawić 'discourse connect url' przed włączeniem tego ustawienia."
-      discourse_connect_invite_only: "Nie możesz włączyć DiscourseConnect i wymagać dołączenia przez zaproszenie w tym samym czasie."
       enable_local_logins_disabled: "Przed włączeniem tego ustawienia musisz najpierw włączyć opcję 'enable local logins'."
       min_username_length_exists: "Nie możesz ustawić minimalnej długości nazwy użytkownika powyżej najkrótszej nazwy użytkownika (%{username})."
       min_username_length_range: "Nie możesz ustawić minimum powyżej maksimum."
@@ -2302,7 +2343,8 @@ pl_PL:
       search_tokenize_japanese_enabled: "Musisz wyłączyć 'search_tokenize_japanese' przed włączeniem tego ustawienia."
       discourse_connect_cannot_be_enabled_if_second_factor_enforced: "Nie można włączyć DiscourseConnect, jeśli wymuszono 2FA."
       delete_rejected_email_after_days: "To ustawienie nie może być niższe niż ustawienie delete_email_logs_after_days ani większe niż %{max}"
-      invalid_uncategorized_category_setting: "Kategoria \"Bez kategorii\" nie może zostać wybrana, jeśli ustawienie 'allow uncategorized topics' jest wyłączone"
+      invalid_uncategorized_category_setting: 'Kategorii „Bez kategorii” nie można wybrać, jeśli opcja ''allow uncategorized topics'' nie jest włączona.'
+      invalid_search_ranking_weights: "Wartość jest nieprawidłowa dla ustawienia witryny search_ranking_weights. Przykład: '{0.1,0.2,0.3,1.0}'. Należy pamiętać, że maksymalna wartość dla każdej wagi wynosi 1.0."
     placeholder:
       discourse_connect_provider_secrets:
         key: "www.example.com"
@@ -2537,7 +2579,6 @@ pl_PL:
     activated_by_staff: "Aktywowane przez personel"
     new_user_typed_too_fast: "Nowy użytkownik wpisany zbyt szybko"
     content_matches_auto_silence_regex: "Treść pasuje do wyrażenia regularnego automatycznego wyciszenia"
-    content_matches_auto_block_regex: "Zawartość pasuje do automatycznej blokady regex"
     username:
       short: "musi zawierać co najmniej %{min} znaków"
       long: "nie może zawierać więcej niż %{max} znaków"
@@ -3283,7 +3324,7 @@ pl_PL:
 
         Nowy użytkownik [%{username}](%{user_url}) został automatycznie wyciszony, ponieważ wielu użytkowników oflagowało post(y) %{username}.
 
-        Proszę [przejrzyj zgłoszenia](%{base_url}/admin/flags). Jeśli %{username} został nieprawidłowo wyciszony, kliknij przycisk odciszenia na stronie [administratora tego użytkownika](%{user_url}).
+        Proszę [przejrzyj zgłoszenia](%{base_url}/review). Jeśli %{username} został nieprawidłowo wyciszony, kliknij przycisk odciszenia na stronie [administratora tego użytkownika](%{user_url}).
 
         Ten próg można zmienić w ustawieniach witryny `silence_new_user`.
     spam_post_blocked:
@@ -3321,15 +3362,6 @@ pl_PL:
       title: "Pobieranie Zdalne Obrazów Wyłączone"
       subject_template: "Pobieranie zdalne obrazów wyłączone"
       text_body_template: "Ustawienie `download_remote_images_to_local` zostało dezaktywowane ponieważ został osiągnięty limit miejsca na dysku `download_remote_images_threshold`."
-    dashboard_problems:
-      title: "Problemy tablicy"
-      subject_template: "Nowe porady w panelu administratora"
-      text_body_template: |
-        Mamy dla Ciebie nowe porady i zalecenia oparte na aktualnych ustawieniach Twojej witryny.
-
-        [Odwiedź panel swojej witryny](%{base_url}/admin), aby je zobaczyć.
-
-        Jeśli nic nie jest widoczne w panelu, inny członek personelu mógł/mogła już skorzystać z tej porady. Listę działań personelu można znaleźć w [dziennikach działań personelu](%{base_url}/admin/logs/staff_action_logs).
     new_user_of_the_month:
       title: "Jesteś nowym użytkownikiem miesiąca!"
       subject_template: "Jesteś nowym użytkownikiem miesiąca!"
@@ -3370,9 +3402,6 @@ pl_PL:
       many: "Uwaga: Wysyłamy maksymalnie %{count} dziennych wiadomości e-mail. Sprawdź witrynę, aby zobaczyć te, które mogą być aktualnie wstrzymane."
       other: "Uwaga: Wysyłamy maksymalnie %{count} dziennych wiadomości e-mail. Sprawdź witrynę, aby zobaczyć te, które mogą być aktualnie wstrzymane."
     in_reply_to: "W odpowiedzi do"
-    unsubscribe:
-      title: "Wypisz"
-      description: "Nie chcesz otrzymywać tych emaili? Nie ma problemu! Kliknij poniżej by wypisać się natychmiast:"
     reply_by_email: "[Zobacz Temat](%{base_url}%{url}) lub odpowiedz na ten email aby odpowiedzieć"
     reply_by_email_pm: "[Wyświetl wiadomość](%{base_url}%{url}) lub odpowiedz na tego e-maila, aby odpowiedzieć na %{participants}."
     only_reply_by_email: "Powtórz ten email dla odpowiedzi."
@@ -3671,7 +3700,6 @@ pl_PL:
       liked_received: "Otrzymane Polubienia"
       new_users: "Nowi użytkownicy"
       popular_topics: "Popularne tematy"
-      follow_topic: "Śledź ten temat"
       join_the_discussion: "Czytaj więcej"
       popular_posts: "Popularne wpisy"
       more_new: "Nowe dla ciebie"
@@ -3868,14 +3896,7 @@ pl_PL:
     title: "Nie można załadować aplikacji"
     offline_page_message: "Wygląda na to, że jesteś offline! Sprawdź połączenie sieciowe i spróbuj ponownie."
   login_required:
-    welcome_message: |
-      #[Witamy na %{title}](#welcome)
-      Wymagane konto. Zarejestruj nowe konto lub przejdź do logowania.
-    welcome_message_invite_only: |
-      ## [Witamy w %{title}](#welcome)
-      Wymagane jest konto. Poproś istniejącego użytkownika o zaproszenie lub zaloguj się, aby kontynuować.
-  deleted: "usunięte"
-  image: "obraz"
+    welcome_message: "# [Witamy na %{title}](#welcome)"
   upload:
     edit_reason: "lokalne kopie pobranych obrazów"
     unauthorized: "Sorry, the file you are trying to upload is not authorized (authorized extensions: %{authorized_extensions})."
@@ -4075,90 +4096,184 @@ pl_PL:
       Tak, język prawniczy jest nudny, ale musimy się chronić &ndash; co za tym idzie, Ciebie i Twoje dane &ndash; przeciwko nieprzyjaznym ludziom. Mamy [Warunki korzystania z usługi](%{base_path}/tos) opisujące Twoje (i nasze) zachowanie oraz prawa związane z treścią, prywatnością i przepisami. Aby korzystać z tej usługi, musisz zgodzić się na przestrzeganie naszych[TOS](%{base_path}/tos).
   tos_topic:
     title: "Warunki użytkowania"
+    body: |
+      <h2 id="heading--change-me"><a href="#heading--change-me">Zmień mnie</a></h2>
+
+      Administratorze forum, poniżej znajdziesz przykładowy szablon polityki prywatności, który powinieneś dostosować do potrzeb swojej strony.
+
+      Te warunki nie dotyczą, ale mogą kiedyś dotyczyć korzystania z forum internetowego pod adresem <%{base_url}>. W takim przypadku, aby korzystać z forum, musisz uzgodnić te warunki z firmą %{company_name}, która prowadzi forum.
+
+      Firma ta może oferować inne produkty i usługi, na innych warunkach. Te warunki dotyczą tylko korzystania z forum.
+
+      Przejdź do:
+
+      - Ważne warunki](#heading--important-terms)
+      - [Twoje pozwolenie na korzystanie z forum](#heading--permission)
+      - [Warunki korzystania z forum](#heading--conditions)
+      - [Dopuszczalne użytkowanie](#heading--acceptable-use)
+      - [Standardy treści](#heading--content-standards)
+      - [Egzekwowanie](#heading--enforcement)
+      - [Twoje konto](#heading--your-account)
+      - [Twoja treść](#heading--your-content)
+      - [Twoja odpowiedzialność](#heading--responsibility)
+      - [Zastrzeżenia](#heading--disclaimers)
+      - [Ograniczenia odpowiedzialności](#heading--liability)
+      - [Informacje zwrotne](#heading--feedback)
+      - [Wypowiedzenie](#heading--termination)
+      - [Spory](#heading--disputes)
+      - [Warunki ogólne](#heading--general)
+      - [Kontakt](#heading--contact)
+      - [Zmiany](#heading--changes)
+
+      <h2 id="heading--important-terms"><a href="#heading--important-terms">Ważne warunki</a></h2>
+
+      ***Te warunki zawierają wiele ważnych postanowień, które wpływają na Twoje prawa i obowiązki, takich jak zastrzeżenia w [Zastrzeżenia](#heading--disclaimers), ograniczenia odpowiedzialności firmy wobec Ciebie w [Ograniczenia odpowiedzialności](#heading--liability), Twoja zgoda na pokrycie strat spowodowanych przez niewłaściwe korzystanie z forum w [Ograniczenia odpowiedzialności](#heading--responsibility) oraz umowa o arbitrażu sporów w [Spory](#heading--disputes).***
+
+      <h2 id="heading--permission"><a href="#heading--permission">Twoje pozwolenie na korzystanie z forum</a></h2>
+
+      Zgodnie z tymi warunkami firma udziela ci pozwolenia na korzystanie z forum. Każdy musi wyrazić zgodę na te warunki, aby móc korzystać z forum.
+
+      <h2 id="heading--conditions"><a href="#heading--conditions">Warunki korzystania z forum</a></h2>
+
+      Twoje pozwolenie na korzystanie z forum podlega następującym warunkom:
+
+      1. Musisz mieć co najmniej trzynaście lat.
+
+      2. Nie możesz dłużej korzystać z forum, jeśli firma skontaktuje się z Tobą bezpośrednio i powie, że nie możesz.
+
+      3. Musisz korzystać z forum zgodnie z zasadami [Dopuszczalne użytkowanie](#heading--acceptable-use) i [Standardy zawartości](#heading--content-standards).
+
+      <h2 id="heading--acceptable-use"><a href="#heading--acceptable-use">Dopuszczalne użytkowanie</a></h2>
+
+      1. Nie możesz łamać prawa używając forum.
+
+      2. Nie możesz używać lub próbować używać konta innej osoby na forum bez jej zgody.
+
+      3. Nie możesz kupować, sprzedawać lub w inny sposób handlować nazwami użytkowników lub innymi unikalnymi identyfikatorami na forum.
+
+      4. Nie wolno Ci wysyłać reklam, łańcuszków lub innych ogłoszeń za pośrednictwem forum, ani wykorzystywać forum do zbierania adresów lub innych danych osobowych do komercyjnych list mailingowych lub baz danych.
+
+      5. Nie możesz zautomatyzować dostępu do forum ani monitorować go, np. za pomocą przeglądarki internetowej, wtyczki lub dodatku do przeglądarki lub innego programu komputerowego, który nie jest przeglądarką internetową. Możesz przeszukiwać forum w celu indeksowania go w publicznie dostępnych wyszukiwarkach, jeśli taką prowadzisz.
+
+      6. Nie możesz używać forum do wysyłania wiadomości na listy dystrybucyjne, grupy dyskusyjne lub aliasy grupowe.
+
+      7. Nie możesz fałszywie sugerować, że jesteś związany z firmą lub przez nią wspierany.
+
+      8. Nie możesz umieszczać na innych stronach internetowych hiperłączy do obrazów lub innych niehipertekstowych treści na forum.
+
+      9. Nie możesz usuwać żadnych znaków wskazujących na własność z materiałów pobranych z forum.
+
+      10. Nie możesz pokazywać żadnej części forum na innych stronach internetowych przez tag `<iframe>`.
+
+      11. Nie wolno Ci wyłączać, unikać lub obchodzić jakichkolwiek zabezpieczeń lub ograniczeń dostępu do forum.
+
+      12. Nie możesz obciążać infrastruktury forum nadmierną ilością żądań lub żądań mających na celu nadmierne obciążenie systemów informatycznych, na których opiera się forum.
+
+      13. Nie możesz podszywać się pod inne osoby za pośrednictwem forum.
+
+      14. Nie możesz zachęcać ani pomagać nikomu w naruszeniu tych zasad.
+
+      <h2 id="heading--content-standards"><a href="#heading--content-standards">Standardy dotyczące treści</a></h2>
+
+      1. Nie możesz umieszczać na forum treści nielegalnych, obraźliwych lub w inny sposób szkodliwych dla innych. Dotyczy to również treści nękających, nieodpowiednich, obraźliwych i nienawistnych.
+
+      2. Nie możesz umieszczać na forum treści, które naruszają prawo, naruszają czyjeś prawa własności intelektualnej, naruszają czyjąś prywatność lub łamią umowy zawarte z innymi osobami.
+
+      3. Nie możesz umieszczać na forum treści zawierających złośliwy kod komputerowy, taki jak wirusy komputerowe lub oprogramowanie szpiegujące.
+
+      4. Nie wolno Ci umieszczać na forum treści, które są jedynie miejscem przechowywania określonego adresu, nazwy użytkownika lub innego unikalnego identyfikatora.
+
+      5. Nie możesz używać forum do ujawniania informacji, których nie masz prawa ujawniać, takich jak poufne lub osobiste informacje innych osób.
+
+      <h2 id="heading--enforcement"><a href="#heading--enforcement">Egzekwowanie prawa</a></h2>
+
+      Firma może badać i ścigać naruszenia tych warunków w pełnym zakresie prawnym. Spółka może powiadomić organy ścigania i współpracować z nimi w ściganiu naruszeń prawa i niniejszych warunków.
+
+      Firma zastrzega sobie prawo do zmiany, przeredagowania i usunięcia treści na forum z dowolnego powodu. Jeśli uważasz, że ktoś umieścił na forum treści naruszające te warunki, [skontaktuj się z nami natychmiast](#heading--contact).
+
+      <h2 id="heading--your-account"><a href="#heading--your-account">Twoje konto</a></h2>
+
+      Aby korzystać z niektórych funkcji forum, musisz utworzyć i zalogować się na konto.
+
+      Aby utworzyć konto, musisz podać kilka informacji o sobie. Zakładając konto, zobowiązujesz się do podania co najmniej poprawnego adresu e-mail oraz do aktualizowania tego adresu. Możesz zamknąć swoje konto w dowolnym momencie, wysyłając e-mail na adres <%{contact_email}>.
+
+      Zgadzasz się ponosić odpowiedzialność za wszystkie działania podejmowane przy użyciu twojego konta, niezależnie od tego, czy zostały one przez ciebie autoryzowane, czy też nie, do momentu zamknięcia konta lub powiadomienia firmy o naruszeniu dostępu do konta. Zobowiązujesz się do natychmiastowego powiadomienia firmy, jeśli podejrzewasz, że dostęp do twojego konta został naruszony. Zgadzasz się wybrać bezpieczne hasło do swojego konta i zachować je w tajemnicy.
+
+      Firma może ograniczyć, zawiesić lub zamknąć Twoje konto na forum zgodnie z jej zasadami postępowania z prośbami o usunięcie treści związanych z prawami autorskimi lub jeśli firma ma podstawy sądzić, że złamano którąś z zasad zawartych w tym regulaminie.
+
+      <h2 id="heading--your-content"><a href="#heading--your-content">Twoje treści</a></h2>
+
+      Żaden z zapisów tego regulaminu nie daje firmie prawa własności do własności intelektualnej, którą dzielisz z forum, takiej jak informacje o Twoim koncie, posty lub inne treści, które przesyłasz na forum. Żaden z zapisów tego regulaminu nie daje Ci również żadnych praw własności do własności intelektualnej firmy.
+
+      Ty i firma ponosicie wyłączną odpowiedzialność za treści umieszczane przez Ciebie na forum. Zgadzasz się nie sugerować, że treści zamieszczane na forum są sponsorowane lub zatwierdzone przez firmę. Niniejsze warunki nie zobowiązują firmy do przechowywania, utrzymywania lub dostarczania kopii treści przesłanych przez Ciebie oraz do ich zmiany zgodnie z tymi warunkami.
+
+      Treść, którą przesyłasz na forum, należy do Ciebie i to Ty decydujesz, jakie pozwolenie udzielisz innym na jej wykorzystanie. Jednak w minimalnym zakresie udzielasz firmie licencji na udostępnianie treści przesłanych przez Ciebie na forum innym użytkownikom forum. Ta specjalna licencja pozwala firmie na kopiowanie, publikowanie i analizowanie treści, które zamieszczasz na forum.
+
+      W momencie usunięcia treści z forum, czy to przez Ciebie, czy przez firmę, licencja specjalna firmy wygasa w momencie, gdy ostatnia kopia zniknie z kopii zapasowych, pamięci podręcznej i innych systemów firmy. Inne licencje, które stosujesz do przesyłanych przez siebie treści, takie jak licencje [Creative Commons](https://creativecommons.org), mogą obowiązywać również po ich usunięciu. Licencje te mogą dawać innym osobom lub samej firmie prawo do ponownego udostępniania Twoich treści na forum.
+
+      Inne osoby, które otrzymają treści przesłane przez Ciebie na forum, mogą naruszyć warunki, na jakich udzielasz licencji na swoje treści. Zgadzasz się, że firma nie będzie ponosić odpowiedzialności za takie naruszenia lub ich konsekwencje.
+
+      <h2 id="heading--responsibility"><a href="#heading--responsibility">Twoja odpowiedzialność</a></h2>
+
+      Zgadzasz się zabezpieczyć firmę przed roszczeniami prawnymi innych osób związanymi z naruszeniem przez Ciebie niniejszych warunków lub naruszeniem tych warunków przez inne osoby korzystające z Twojego konta na forum. Zarówno Ty, jak i firma zgadzacie się na jak najszybsze powiadomienie drugiej strony o wszelkich roszczeniach prawnych, w związku z którymi firma może być zmuszona do wypłaty odszkodowania. Jeśli firma nie powiadomi Cię o roszczeniach prawnych bezzwłocznie, nie będziesz musiał wypłacać firmie odszkodowania za szkody, przed którymi mógłbyś się bronić lub które mógłbyś ograniczyć, gdybyś został niezwłocznie powiadomiony. Zgadzasz się zezwolić firmie na kontrolowanie dochodzenia, obrony i rozstrzygania roszczeń prawnych, za które musiałbyś wypłacić odszkodowanie, oraz na współpracę przy tych działaniach. Firma zobowiązuje się nie zgadzać na żadne ugody, które przyznają się do winy lub nakładają na Ciebie zobowiązania bez Twojej wcześniejszej zgody.
+
+      <h2 id="heading--disclaimers"><a href="#heading--disclaimers">Zastrzeżenia</a></h2>
+
+      ***Akceptujesz całe ryzyko związane z korzystaniem z forum i treści na nim zawartych. O ile pozwala na to prawo, firma i jej dostawcy dostarczają forum w takim stanie, w jakim jest, bez jakiejkolwiek gwarancji.***
+
+      Forum może zawierać hiperłącza i integrować fora i usługi prowadzone przez inne podmioty. Firma nie udziela żadnej gwarancji na usługi prowadzone przez inne podmioty ani na treści przez nie dostarczane. Korzystanie z serwisów prowadzonych przez inne podmioty może być regulowane przez inne warunki zawarte pomiędzy Tobą a podmiotem prowadzącym serwis.
+
+      <h2 id="heading--liability"><a href="#heading--liability">Ograniczenia odpowiedzialności</a></h2>
+
+      ***Ani firma, ani jej dostawcy nie będą odpowiedzialni wobec Ciebie za szkody wynikające z naruszenia umowy, których ich personel nie mógł przewidzieć, gdy zgodziłeś się na te warunki.***
+
+      ***W zakresie, w jakim pozwala na to prawo, całkowita odpowiedzialność wobec Ciebie za wszelkiego rodzaju roszczenia związane z forum lub treściami na nim zamieszczonymi będzie ograniczona do 50 dolarów.***
+
+      <h2 id="heading--feedback"><a href="#heading--feedback">Informacje zwrotne</a></h2>
+
+      Firma z radością przyjmuje Twoje opinie i sugestie dotyczące forum. Zobacz sekcję [Kontakt](#heading--contact) poniżej, aby dowiedzieć się, jak się z nami skontaktować.
+
+      Zgadzasz się, że firma będzie miała swobodę działania w oparciu o dostarczone przez Ciebie opinie i sugestie oraz że firma nie będzie musiała Cię informować o tym, że Twoje opinie zostały wykorzystane, uzyskiwać Twojej zgody na ich wykorzystanie ani płacić Ci za to. Zgadzasz się nie przesyłać opinii lub sugestii, które Twoim zdaniem mogą być poufne lub zastrzeżone dla Ciebie lub innych osób.
+
+      <h2 id="heading--termination"><a href="#heading--termination">Wypowiedzenie</a></h2>
+
+      Zarówno Ty, jak i spółka możecie w każdej chwili zakończyć umowę zawartą w niniejszym regulaminie. Kiedy nasza umowa wygasa, wygasa również Twoje pozwolenie na korzystanie z forum.
+
+      Następujące postanowienia pozostają w mocy po zakończeniu naszej umowy: [Twoja treść](#heading--your-content), [Feedback](#heading--feedback), [Twoja odpowiedzialność](#heading--responsibility), [Zastrzeżenia](#heading--disclaimers), [Ograniczenia odpowiedzialności](#heading--liability) oraz [Warunki ogólne](#heading--general).
+
+      <h2 id="heading--disputes"><a href="#heading--disputes">Spory</a></h2>
+
+      %{governing_law} reguluje wszelkie spory związane z tymi warunkami lub korzystaniem z forum przez użytkownika.
+
+      Ty i firma zgadzacie się na dochodzenie nakazów sądowych związanych z tymi warunkami tylko w sądzie okręgowym lub rejonowym w %{city_for_disputes}. Ani Ty, ani firma nie będziecie sprzeciwiać się jurysdykcji, forum lub miejscu w tych sądach.
+
+      ***Z wyjątkiem dochodzenia nakazu sądowego lub roszczeń wynikających z ustawy o oszustwach i nadużyciach komputerowych, użytkownik i spółka będą rozstrzygać wszelkie spory w drodze wiążącego arbitrażu. Arbitraż będzie przebiegał według zasad arbitrażu handlowego AAA oraz procedur uzupełniających dla sporów konsumenckich. Arbitraż odbędzie się w %{city_for_disputes}. Wszelkie spory będziesz rozstrzygać indywidualnie, a nie w ramach pozwu zbiorowego lub innego postępowania reprezentacyjnego, czy to jako powód, czy członek klasy. Żaden arbiter nie będzie łączył sporu z innym arbitrażem bez zgody firmy.***
+
+      Każde orzeczenie arbitrażowe będzie zawierało koszty arbitrażu, uzasadnione honoraria adwokackie oraz uzasadnione koszty świadków. Zarówno Ty, jak i spółka możecie wnieść orzeczenie arbitrażowe do dowolnego właściwego sądu.
+
+      <h2 id="heading--general"><a href="#heading--general">Warunki ogólne</a></h2>
+
+      Jeśli jakieś postanowienie niniejszych warunków jest niewykonalne w formie pisemnej, ale można je zmienić tak, aby było wykonalne, należy je zmodyfikować w minimalnym stopniu, aby było wykonalne. W przeciwnym razie postanowienie to powinno zostać usunięte.
+
+      Nie możesz przenieść swojej umowy z firmą. Firma może przenieść Twoją umowę na dowolny oddział firmy, dowolną inną firmę, która uzyska kontrolę nad firmą lub dowolną inną firmę, która kupi aktywa firmy związane z forum. Wszelkie próby cesji wbrew tym warunkom nie mają mocy prawnej.
+
+      Ani wykonanie jakiegokolwiek prawa wynikającego z niniejszej Umowy, ani zrzeczenie się jakiegokolwiek naruszenia niniejszej Umowy nie uchyla jakiegokolwiek innego naruszenia niniejszej Umowy.
+
+      Niniejszy regulamin zawiera wszystkie warunki umowy pomiędzy Tobą a firmą dotyczące korzystania z forum. Niniejsze warunki całkowicie zastępują wszelkie inne umowy dotyczące korzystania z forum, pisemne lub nie.
+
+      <h2 id="heading--contact"><a href="#heading--contact">Kontakt</a></h2>
+
+      Możesz powiadomić firmę na mocy tych warunków i wysłać pytania do firmy na adres <%{contact_email}>.
+
+      Firma może powiadomić Cię zgodnie z tymi warunkami używając adresu e-mail, który podałeś dla swojego konta na forum, lub umieszczając wiadomość na stronie głównej forum lub stronie Twojego konta.
+
+      <h2 id="heading--changes"><a href="#heading--changes">Zmiany</a></h2>
+
+      Firma ostatnio zaktualizowała te warunki w dniu [WSTAW TUTAJ DATĘ OSTATNIEJ AKTUALIZACJI] i może je ponownie zaktualizować. Firma będzie umieszczać wszystkie aktualizacje na forum. W przypadku aktualizacji zawierających istotne zmiany, firma zgodzi się wysłać do ciebie e-mail, jeśli założysz konto i podasz prawidłowy adres e-mail. Firma może również informować o aktualizacjach za pomocą specjalnych wiadomości lub alertów na forum.
+
+      Po otrzymaniu powiadomienia o aktualizacji warunków, musisz zgodzić się na nowe warunki, aby nadal korzystać z forum.
   privacy_topic:
     title: "Polityka prywatności"
-    body: |
-      <a name="collect"></a>
-
-      ## [Jakie dane o Tobie zbieramy?](#collect)
-
-      Zbieramy takie informacje jak: kiedy zarejestrowałeś/łaś się na naszej stronie; kiedy uczestniczyłeś/łaś w życiu forum poprzez czytanie, pisanie oraz udoskolananie zawartości tu udostępnianej.
-
-      Podczas rejestracji na naszej stronie możesz być zapytany o twoje imię i nazwisko oraz adres email. Możesz też przeglądać naszą stronę bez konieczności rejestracji. Twój adres email będzie weryfikowany poprzez przesłanie na niego unikalnego linku. Jeżeli nacisnąłeś/łaś na ten link, wiemy że ten adres email należy do Ciebie.
-
-      Podczas rejestracji oraz pisania treści zbieramy dane o twoim adresie IP. Możemy też zachowywać logi serwera, które pobierają dane o twoim adresie IP zawsze kiedy logujesz się na nasz serwer.
-
-      <a name="use"></a>
-
-      ## [Do czego używamy tych informacji?](#use)
-
-      Wszystkie informacje jakie od Ciebie zbieramy mogą być wykorzystane w jeden z następujących sposobów:
-
-      * Aby przystosować naszą stronę dla Ciebie &mdash; twoje informacje pomagają nam lepiej odpowiadać na twoje indywidualne potrzeby.
-      * Aby ulepszyć naszą stronę &mdash; cały czas ulepszamy naszą stronę na podstawie informacji otrzymanych od Ciebie.
-      * Aby ulepszyć obsługę klienta &mdash; informacje pomagają nam na efektywniejsze obsługiwanie twoich próśb.
-      * Aby wysyłać Tobie okresowe wiadomości email &mdash; Adres email, który podałeś/łaś może być użyty aby wysyłać Tobie informację o stronie, powiadomienia, odpowiedzi, wiadomości i tematy skierowane do Ciebie.
-
-      <a name="protect"></a>
-
-      ## [Jak chronimy twoje dane?](#protect)
-
-      Wdrażamy różne środki bezpieczeństwa, aby podnosić poziom bezpieczeństwa twoich danych osobowych, kiedy podajesz, potwierdzasz albo udzielasz dostępu do informacji osobistych.
-
-      <a name="data-retention"></a>
-
-      ## [Jaką mamy politykę przechowywania danych?](#data-retention)
-
-      Dokładamy wszelkich starań, aby:
-
-      * Nie przechowywać danych o twoim adresie IP dłużej niż 90 dni.
-      * Nie przechowywać danych o adresie IP przypisanym do twojego konta dłużej niż 5 lat.
-
-      <a name="cookies"></a>
-
-      ## [Czy używamy plików cookies?](#cookies)
-
-      Tak. Cookies to małe pliki, wysyłane przez serwis internetowy, który odwiedzamy i zapisywane na urządzeniu końcowym (komputerze, laptopie, smartfonie), z którego korzystamy podczas przeglądania stron internetowych. Pozwalają naszej stronie na rozpoznanie czy jesteś naszym użytkownikiem.
-
-      Używamy ich, aby zrozumieć i zapisać twoje preferencje. Dzięki nim możemy zapewnić Tobie lepszą jakość dostarczanych usług. Możemy też udostępniać je firmom trzecim, aby mogły rozpoznawać twoje zachowania.
-
-      <a name="disclose"></a>
-
-      ## [Czy udostępniamy jakiekolwiek informacje osobom trzecim?](#disclose)
-
-      Nie sprzedajemy, nie przekazujemy i nie handlujemy twoimi informacjami osobistymi z innymi partnerami. Wyjątek stanowią zaufane firmy, które pomagają nam w utrzymaniu strony, prowadzeniu firmy czy obsłudze klienta, tak długo dopóki firmy te zgadzają się utrzymywać te informacje jako tajne.
-
-      <a name="third-party"></a>
-
-      ## [Linki osób trzecich](#third-party)
-
-      Na naszej stronie możemy promować linki osób trzecich. Strony te mają swoją oddzielną politykę prywatności. Nie bierzemy żadnej odpowiedzialności za te strony lub zawartość na nich udostępnianą. Niemniej jednak, staramy się chronić integralność naszej strony, a wszelkie opinie są mile widziane.
-
-      <a name="coppa"></a>
-
-      ## [Zgodność z przepisami dotyczącymi ochrony prywatności w internecie dla dzieci](#coppa)
-
-      Nasza strona, produkty i funkcję są skierowane do osób powyżej 12 roku życia. Jeśli serwer jest zlokalizowany w Stanach Zjednoczonych i masz mniej niż 13 lat, zgodnie z wymaganiami COPPA ([Children's Online Privacy Protection Act](http://en.wikipedia.org/wiki/Children)), nie używaj tej stron.
-
-      <a name="online"></a>
-
-      ## [Online Privacy Policy Only](#online)
-
-      Ta polityka prywatności odnosi się tylko do danych zbieranych przez przez naszą strone, nie odnosi się ona do informacji zbieranych w trybie offline.
-
-      <a name="consent"></a>
-
-      ## [Twoja Zgoda](#consent)
-
-      Korzystając z tej strony zgadzasz się na jej politykę prywatności.
-
-      <a name="changes"></a>
-
-      ## [Zmiany w polityce prywatności](#changes)
-
-      Jeżeli zostaną zmienione zasady polityki prywatności, zostaną one opublikowane na tej stronie.
-
-      Ten dokument jest CC-BY-SA.Ostatnia aktualizacja May 31, 2013.
   badges:
     mass_award:
       errors:
@@ -4458,6 +4573,7 @@ pl_PL:
       few: "Musisz dołączyć co najmniej %{count} %{tag_group_name} tagi. Tagi w tej grupie to: %{tags}."
       many: "Musisz dołączyć co najmniej %{count} %{tag_group_name} tagów. Tagi w tej grupie to: %{tags}."
       other: "Musisz dołączyć co najmniej %{count} %{tag_group_name} tagów. Tagi w tej grupie to: %{tags}."
+    limited_to_one_tag_from_group: "Tagi %{tags} nie mogą być używane jednocześnie. Prosimy o uwzględnienie tylko jednego z nich."
     invalid_target_tag: "nie może być synonimem synonimu"
     synonyms_exist: "nie jest dozwolone, gdy istnieją synonimy"
   rss_by_tag: "Tematy otagowane %{tag}"
@@ -4476,10 +4592,10 @@ pl_PL:
       message: "<p>Powtórnie przesłaliśmy e-maila aktywacyjnego do <b>%{email}</b>"
   safe_mode:
     title: "Wejście w tryb bezpieczny"
-    description: "Tryb awaryjny umożliwia testowanie witryny bez ładowania wtyczek lub motywów."
+    description: "Tryb bezpieczny umożliwia testowanie witryny bez ładowania motywów i wtyczek po stronie klienta. Wtyczki po stronie serwera pozostają włączone."
     no_themes: "Wyłącz motywy i komponenty motywu"
-    no_unofficial_plugins: "Wyłącz nieoficjalne wtyczki"
-    no_plugins: "Wyłącz wszystkie wtyczki"
+    no_unofficial_plugins: "Wyłącz nieoficjalne dostosowania wtyczek po stronie klienta"
+    no_plugins: "Wyłącz wszystkie dostosowania wtyczek po stronie klienta"
     enter: "Włącz Tryb Bezpieczny"
     must_select: "Musisz wybrać przynajmniej jedną opcję, by wejść do trybu bezpiecznego."
   wizard:
@@ -4594,7 +4710,9 @@ pl_PL:
           <p>Miłej zabawy i powodzenia w <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>budowaniu nowej społeczności!</a></p>
   search_logs:
     graph_title: "Liczba wyszukiwań"
-  joined: "Dołączył"
+  onebox:
+    discourse:
+      user_joined_community: "Dołączył %{date}"
   discourse_push_notifications:
     popup:
       mentioned: '%{username} wspomina o tobie w "%{topic}" - %{site_title}'
@@ -4659,13 +4777,13 @@ pl_PL:
         category: ustawienia kategorii
     actions:
       agree:
-        title: "Zgadzam się..."
+        title: "Tak"
       agree_and_keep:
-        title: "Zachowaj wpis"
-        description: "Zgódź się z flagą i pozostaw post bez zmian."
+        title: "Zachowaj post"
+        description: "Zgódź się z flagą, ale pozostaw ten post bez zmian."
       agree_and_keep_hidden:
         title: "Zachowaj post ukryty"
-        description: "Zgódź się z flagą i pozostaw post ukryty."
+        description: "Zgódź się z flagą i zachowaj post ukryty."
       agree_and_suspend:
         title: "Zawieś użytkownika"
         description: "Zgódź się z flagą i zawieś konto użytkownika."
@@ -4677,32 +4795,35 @@ pl_PL:
         description: "Przywróć post, aby wszyscy użytkownicy mogli go zobaczyć."
       agree_and_hide:
         title: "Ukryj post"
-        description: "Ukryj ten post i automatycznie wyślij użytkownikowi wiadomość z wezwaniem do jego edycji."
+        description: "Zgódź się z flagą i ukryj ten post + automatycznie wyślij użytkownikowi wiadomość z prośbą o jego edycję."
       delete_single:
         title: "Usuń"
       delete:
         title: "Usuń..."
       delete_and_ignore:
-        title: "Usuń post i ignoruj"
-        description: "Usuń post; jeśli to pierwszy post, usuń również temat"
+        title: "Zignoruj flagę i usuń post"
+        description: "Zignoruj flagę, usuwając ją z kolejki i usuń post; jeśli jest to pierwszy post, usuń również temat. "
       delete_and_ignore_replies:
-        title: "Usuń post + Odpowiedzi i Ignoruj"
-        description: "Usuń post i wszystkie odpowiedzi; jeśli to pierwszy post, usuń również temat"
+        title: "Zignoruj flagę, usuń post i odpowiedzi"
+        description: "Zignoruj flagę, usuwając ją z kolejki, usuń post i wszystkie jego odpowiedzi; jeśli jest to pierwszy post, usuń także temat."
         confirm: "Czy na pewno chcesz usunąć również odpowiedzi na ten post?"
       delete_and_agree:
-        title: "Usuń post i akceptuj"
-        description: "Usuń post; jeśli to pierwszy post, usuń również temat"
+        title: "Usuń post"
+        description: "Zgódź się z flagą i usuń ten post; jeśli to pierwszy post, usuń również temat."
       delete_and_agree_replies:
-        title: "Usuń post + odpowiedzi i zgadzam się"
-        description: "Usuń post i wszystkie odpowiedzi; jeśli to pierwszy post, usuń również temat"
+        title: "Usuń post i odpowiedzi"
+        description: "Zgódź się z flagą i usuń ten post oraz wszystkie jego odpowiedzi; jeśli to pierwszy post, usuń również temat."
         confirm: "Czy na pewno chcesz usunąć również odpowiedzi na ten post?"
       disagree_and_restore:
-        title: "Nie zgadzam się i przywracam post"
+        title: "Nie, przywróć post"
         description: "Przywróć post, aby wszyscy użytkownicy mogli go zobaczyć."
       disagree:
-        title: "Wycofaj"
+        title: "Nie"
       ignore:
         title: "Ignoruj"
+      ignore_and_do_nothing:
+        title: "Nic nie rób"
+        description: "Zignoruj flagę, usuwając ją z kolejki bez podejmowania żadnych działań. Ukryte posty pozostaną ukryte i będą obsługiwane przez automatyczne narzędzia."
       approve:
         title: "Zatwierdź"
       approve_post:
@@ -4770,6 +4891,11 @@ pl_PL:
     payload_url:
       blocked_or_internal: "Nie można użyć adresu URL ładunku, ponieważ jest on adresowany do zablokowanego lub wewnętrznego adresu IP"
       unsafe: "Nie można użyć adresu URL ładunku, ponieważ jest niebezpieczny"
+  form_templates:
+    errors:
+      invalid_yaml: "nie jest prawidłowym ciągiem YAML"
+      invalid_type: "zawiera nieprawidłowy typ szablonu: %{type} (prawidłowe typy to: %{valid_types})"
+      missing_type: "brakuje typu pola"
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml
index 46c7553275e..c9692a9d69e 100644
--- a/config/locales/server.pt.yml
+++ b/config/locales/server.pt.yml
@@ -181,9 +181,6 @@ pt:
       load_from_remote: "Ocorreu um erro no carregamento dessa mensagem."
     site_settings:
       invalid_category_id: "Especificou uma categoria que não existe"
-      invalid_choice:
-        one: "Especificou a escolha inválida %{name}"
-        other: "Especificou escolhas inválidas %{name}"
       default_categories_already_selected: "Não pode selecionar uma categoria usada noutra lista."
       default_tags_already_selected: "Não pode selecionar uma etiqueta usada noutra lista."
       s3_upload_bucket_is_required: "Não pode ativar carregamentos para o S3 excepto se tiver fornecido o 's3_upload_bucket'."
@@ -456,10 +453,6 @@ pt:
             duration_minutes:
               cannot_be_zero: "deve ser maior que 0."
               exceeds_maximum: "não pode ter mais de 20 anos."
-        translation_overrides:
-          attributes:
-            value:
-              invalid_interpolation_keys: 'As seguintes chaves de interpolação são inválidas: "%{keys}”'
         watched_word:
           attributes:
             word:
@@ -1231,7 +1224,6 @@ pt:
     automatically_unpin_topics: "Desafixar tópicos automaticamente quando um utilizador chega ao final."
     read_time_word_count: "Contagem de palavras por minuto para calcular tempo estimado de leitura."
     share_anonymized_statistics: "Partilhe estatísticas de utilização anonimizadas."
-    max_prints_per_hour_per_user: "Número máximo de impressões de páginas /print, por hora, por utlizador. (coloque 0 para desactivar)"
     full_name_required: "O nome completo é um campo obrigatório no perfil de utilizador."
     enable_names: "Mostrar o nome completo do utilizador no seu perfil, cartão de utilizador, e emails. Desativar para esconder o nome completo em todos os locais."
     display_name_on_posts: "Mostrar o nome completo de um utilizador nas suas mensagens em adição ao seu @nome-de-utilizador."
@@ -1243,9 +1235,7 @@ pt:
     allowed_href_schemes: "Esquemas permitidos nos links além de http e https."
     embed_post_limit: "Número máximo de mensagens a serem incorporadas."
     embed_username_required: "O nome de utilizador para a criação de tópico é necessário."
-    show_create_topics_notice: "Se o sítio tem menos de 5 tópicos públicos, mostrar um aviso pedindo aos administradores a criação de mais tópicos."
     delete_drafts_older_than_n_days: "Eliminar rascunhos mais antigos que (n) days."
-    bootstrap_mode_min_users: "Número mínimo de utilizadores necessários para desactivar o modo de inicialização (coloque 0 para desactivar)"
     slug_generation_method: "Escolha um método de geração slug. 'encoded' irá gerar sequências de caracteres com código percentual. 'none' irá desativar slug por completo."
     enable_emoji: "Ativar emoji"
     emoji_set: "Como gostaria de ter o seu emoji?"
@@ -1279,7 +1269,6 @@ pt:
     default_categories_watching_first_post: "Lista de categorias em que a primeira publicação em cada novo tópico será vigiada por defeito."
     allow_user_api_keys: "Permitir geração de chaves de API de utilizador"
     allow_user_api_key_scopes: "Lista de esferas permitidas para chaves da API de utlizador"
-    min_trust_level_for_user_api_key: "Nível de confiança requerido para gerar chaves da API de utilizador"
     allowed_user_api_push_urls: "URLs permitidos para o servidor fazer push para a API de utilizador"
     tagging_enabled: "Permitir etiquetas em tópicos?"
     min_trust_to_create_tag: "O nível de confiança mínimo necessário para criar uma etiqueta."
@@ -1312,7 +1301,6 @@ pt:
       pop3_polling_password_is_empty: "Deve configurar uma 'palavra-passe de polling pop3' antes de ativar o polling POP3."
       pop3_polling_authentication_failed: "Autenticação POP3 falhada. Por favor verifique as suas credenciais pop3."
       reply_by_email_address_is_empty: "É necessário definir um email para 'resposta por endereço de email' antes de ligar a resposta por email."
-      email_polling_disabled: "Tem de ligar a consulta manual ou automática de emails via POP3 antes de ligar a resposta por email."
       user_locale_not_enabled: "Tem de ligar 'permitir definições regionais do utilizador' antes de ligar esta configuração."
       invalid_regex: "A expressão regular não é válida ou permitida."
       min_username_length_range: "Não pode definir o mínimo acima do máximo."
@@ -1628,9 +1616,6 @@ pt:
   user_notifications:
     previous_discussion: "Respostas Anteriores"
     in_reply_to: "Em Resposta A"
-    unsubscribe:
-      title: "Cancelar a Subscrição"
-      description: "Não está interessado em receber estes emails? Não há problema! Clique em baixo para cancelar a subscrição instantaneamente:"
     reply_by_email: "[Visitar Tópico](%{base_url}%{url}) ou responda a este email para responder."
     only_reply_by_email: "Responda a este email para responder."
     visit_link_to_respond: "[Visitar Tópico](%{base_url}%{url}) para responder."
@@ -1810,7 +1795,6 @@ pt:
       liked_received: "Gostos Recebidos"
       new_users: "Novos Utilizadores"
       popular_topics: "Tópicos Populares"
-      follow_topic: "Acompanhar este tópico"
       join_the_discussion: "Ler Mais"
       popular_posts: "Publicações Populares"
       click_here: "clique aqui"
@@ -1843,8 +1827,6 @@ pt:
     see_more: "Mais"
     search_title: "Pesquisar neste sítio"
     search_button: "Pesquisar"
-  deleted: "eliminado"
-  image: "imagem"
   upload:
     edit_reason: "cópias das imagens locais transferidas"
     unauthorized: "Pedimos desculpa, o ficheiro que está a tentar carregar não está autorizado (extensões autorizadas: %{authorized_extensions})."
@@ -1896,93 +1878,6 @@ pt:
     title: "Termos de Serviço"
   privacy_topic:
     title: "Política de Privacidade"
-    body: |2
-
-      <a name="collect"></a>
-
-      ## [Que informações reunimos?](#reunião)
-
-      Reunimos informação sobre si assim que se regista no nosso sítio e juntamos dados quando participa no fórum ao ler, escrever e avaliar o conteúdo aqui partilhado.
-
-      Ao inscrever-se no nosso sítio, pode ser-lhe pedido para inserir o seu nome e endereço de email. Pode contudo, visitar o nosso sítio sem se registar. O seu endereço de email será verificado por um email contendo uma hiperligação única. Se essa hiperligação for visitada, sabemos que tem controlo do seu endereço de email.
-
-      Ao inscrever-se e publicar, recordamos o endereço IP de onde a publicação é originária. Podemos também reter logs de servidores que incluem endereços IP de todos os pedidos feitos ao servidor.
-
-      <a name="use"></a>
-
-      ## [Para que usamos as suas informações?](#usar)
-
-      Todas as informações que reunimos sobre si podem ser usadas numa das seguintes maneiras:
-
-      * Para personalizar a sua experiência &mdash; a sua informação ajuda-nos a responder melhor às suas necessidades individuais.
-
-      * Para melhorar o nosso sítio &mdash; continuamos a lutar por melhorar as ofertas do nosso sítio com base na informação e feedback que recebemos de si.
-
-      * Para melhorar o serviço ao cliente &mdash; a sua informação ajuda-nos a responder mais eficazmente aos pedidos de serviço ao cliente e pedidos de suporte.
-
-      * Para enviar emails periodicamente &mdash; O endereço de email que nos fornece pode ser usado para lhe enviar informação, notificações que peça sobre mudanças em tópicos ou em resposta ao seu nome de utilizador, respostas a inquéritos e/ou outros pedidos ou questões.
-
-      <a name="protect"></a>
-
-      ## [Como protegemos a sua informação?](#protect)
-
-      Implementamos uma variedade de medidas de precaução para manter as suas informações pessoais em segurança quando insere, submete ou acede à sua informação pessoal.
-
-      <a name="data-retention"></a>
-
-      ## [Qual é a sua política de retenção de dados?](#retenção-dados)
-
-      Iremos fazer um esforço de boa fé para:
-
-      * Reter logs de servidores contendo o endereço IP de todos os pedidos para este servidor não mais que 90 dias.
-
-      * Reter endereços IP associados a utilizadores registados e às suas publicações por não mais que 5 anos.
-
-      <a name="cookies"></a>
-
-      ## [Usamos cookies?](#cookies)
-
-      Sim. Os cookies são pequenos ficheiros que um sítio ou um fornecedor de serviços transfere para o disco do seu computador através do navegador de Internet (se assim o permitir). Estes cookies permitem que o sítio reconheça o seu navegador e, se tiver uma conta registada, associá-lo a essa.
-
-      Usamos cookies para entender e guardar as suas preferências para visitas futuras e compilar dados agregados sobre o tráfego do sítio e a interação com o mesmo para lhe podermos oferecer as melhores experiências e ferramentas no futuro. Podemos contratar fornecedores de serviços para nos ajudarem a entender melhor os visitantes do nosso sítio. Estes fornecedores de serviços não têm permissão para usar a informação reunida em nosso nome excepto para nos ajudar a conduzir e melhorar o nosso negócio.
-
-      <a name="disclose"></a>
-
-      ## [Divulgamos informação com partes exteriores?](#divulgar)
-
-      Não vendemos, trocamos ou de outra maneira transferimos a sua informação pessoal para partes exteriores. Isto não inclui terceiras partes confiáveis que nos ajudam a operar sítio, conduzir o nosso negócio, ou servi-lo, enquanto estas partes acordarem em manter a informação confidencial. Podemos também partilhar a sua informação quando acreditamos que é apropriado para estar de acordo com a lei, reforçar as políticas do nosso sítio ou proteger os nossos, ou de outros, direitos, propriedades ou segurança. Contudo, informação não-pessoal do visitante pode ser fornecida a outras partes para marketing, publicidade ou outros usos.
-
-      <a name="third-party"></a>
-
-      ## [Hiperligações de Terceiras Partes](#terceira-parte)
-
-      Ocasionalmente, à nossa descrição, podemos incluir ou oferecer serviços ou produtos de terceiros no nosso sítio. Estes sítios de terceiros têm políticas de privacidade separadas e independentes. Por este motivo, não temos responsabilidade no conteúdo ou atividades destes sítios hiperligados. No entanto, procuramos proteger a integridade do nosso sítio e damos as boas-vindas a qualquer feedback sobre estes sítios.
-
-      <a name="coppa"></a>
-
-      ## [Cumprimento da Proteção da Privacidade Online Infantil](#coppa)
-
-      O nosso sítio, produtos e serviços são direcionados a pessoas com pelo menos 13 anos de idade. Se este servidor está nos EUA e tem menos de 13 anos de idade, como parte dos requisitos do COPPA ([Proteção da Privacidade Online Infantil]( https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)), não utilize este sítio.
-
-      <a name="online"></a>
-
-      ## [Política de Privacidade Online](#online)
-
-      Estas políticas de privacidade online aplicam-se apenas à informação reunida através do nosso sítio e não à informação reunida offline.
-
-      <a name="consent"></a>
-
-      ## [O seu consentimento](#consentimento)
-
-      Ao utilizar o nosso sítio, está a consentir a política de privacidade do nosso sítio.
-
-      <a name="changes"></a>
-
-      ## [Mudanças à nossa Política de Privacidade](#mudanças)
-
-      Se decidirmos alterar a nossa política de privacidade, iremos publicar as mudanças nesta página.
-
-      Este documento é CC-BY-SA. Foi atualizado pela última vez em 31 de Maio de 2013.
   badges:
     mass_award:
       errors:
@@ -2172,8 +2067,6 @@ pt:
       message: "<p>Reenviamos o email de ativação para <b>%{email}</b>"
   safe_mode:
     title: "Entrar em modo de segurança"
-    no_unofficial_plugins: "Desativar plugins não-oficiais"
-    no_plugins: "Desativar todos os plugins"
     enter: "Entrar em Modo de Segurança"
   wizard:
     title: "Configuração do Discourse"
@@ -2212,7 +2105,6 @@ pt:
         title: "Convidar Equipa de Apoio"
       finished:
         title: "O seu Discourse está Pronto!"
-  joined: "Juntou-se"
   discourse_push_notifications:
     popup:
       mentioned: '%{username} mencionou-o em "%{topic}" - %{site_title}'
@@ -2241,14 +2133,14 @@ pt:
     reasons:
       queued_by_staff: "Um membro do pessoal considera que esta publicação necessita de ser revista. Ela permanecerá oculta até lá."
     actions:
-      agree_and_suspend:
-        title: "Utilizador Suspenso"
+      agree:
+        title: "Sim"
       agree_and_silence:
-        title: "Silenciar Usuário"
+        title: "Silenciar utilizador"
       delete_single:
         title: "Eliminar"
       disagree:
-        title: "Discordar"
+        title: "Não"
       ignore:
         title: "Ignorar"
       approve:
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index b4d9478ab6e..6241a9cd47f 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -52,6 +52,11 @@ pt_BR:
   remove_posts_deleted_by_author: "Excluído(a) pelo autor(a)"
   redirect_warning: "Não foi possível confirmar se o link selecionado foi postado no fórum. Se deseja continuar mesmo assim, selecione o link abaixo."
   on_another_topic: "Em outro tópico"
+  topic_category_changed: "De %{from} para %{to}"
+  topic_tag_changed:
+    added_and_removed: "Adicionado %{added} e removido %{removed}"
+    added: "Adicionado %{added}"
+    removed: "Removeu %{removed}"
   inline_oneboxer:
     topic_page_title_post_number: "#%{post_number}"
     topic_page_title_post_number_by_user: "#%{post_number} por %{username}"
@@ -189,9 +194,6 @@ pt_BR:
       load_from_remote: "Ocorreu um erro ao carregar esta postagem."
     site_settings:
       invalid_category_id: "Você especificou uma categoria que não existe"
-      invalid_choice:
-        one: "Você especificou a escolha inválida %{name}"
-        other: "Você especificou as escolhas inválidas %{name}"
       default_categories_already_selected: "Você não pode selecionar uma categoria usada em outra lista."
       default_tags_already_selected: "Você não pode selecionar uma etiqueta usada em outra lista."
       s3_upload_bucket_is_required: "Você não pode ativar envios para o S3, a não ser que tenha informado o \"s3_upload_bucket\"."
@@ -199,7 +201,6 @@ pt_BR:
       page_publishing_requirements: "A publicação da página não pode ser ativada se houver mídias seguras ativadas."
       s3_backup_requires_s3_settings: "Você não pode usar o S3 como local de backup, a não ser que você tenha informado o \"%{setting_name}\"."
       s3_bucket_reused: "Você não pode usar o mesmo bucket para \"s3_upload_bucket\" e \"s3_backup_bucke\"'. Escolha um bucket diferente ou use um caminho diferente para cada bucket."
-      secure_uploads_requirements: "Envios S3 devem ser ativados antes dos envios seguros."
       share_quote_facebook_requirements: "É preciso definir uma id do app Facebook para permitir o compartilhamento de citação para Facebook."
       second_factor_cannot_enforce_with_socials: "Você não pode aplicar 2FA com entrada com contas de redes sociais ativada. Primeiro você deve desativar a entrada com conta via: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Você não pode impor a 2FA se a autenticação local estiver desativada."
@@ -238,6 +239,7 @@ pt_BR:
     user_exists: "Não há necessidade de convidar <b>%{email}</b>, visto que já têm uma conta!"
     invite_exists: "Você já convidou <b>%{email}</b>"
     invalid_email: "%{email}' não é um endereço de e-mail válido."
+    generic_error_response: "Houve um problema com sua requisição"
     rate_limit:
       one: "Você já enviou %{count} convite no último dia, aguarde %{time_left} antes de tentar novamente."
       other: "Você já enviou %{count} convites no último dia, aguarde %{time_left} antes de tentar novamente."
@@ -399,6 +401,7 @@ pt_BR:
   too_late_to_edit: "Esta postagem foi criada há muito tempo. Ela não pode mais ser editada ou excluída."
   edit_conflict: "Esta postagem foi editada por outro(a) usuário(a) e suas alterações não podem mais ser salvas."
   revert_version_same: "A versão atual é a mesma versão para a qual você está tentando reverter."
+  reverted_to_version: "revertido para a versão #%{version}"
   cannot_edit_on_slow_mode: "Este tópico está no modo lento. Para incentivar discussões reflexivas e selecionadas. Não é permitido editar postagens antigas deste tópico no modo lento."
   excerpt_image: "imagem"
   bookmarks:
@@ -590,7 +593,9 @@ pt_BR:
         translation_overrides:
           attributes:
             value:
-              invalid_interpolation_keys: 'As seguintes chaves de interpolação são inválidas: "%{keys}"'
+              invalid_interpolation_keys:
+                one: "A seguinte chave de interpolação é inválida: %{keys}"
+                other: "As seguintes chaves de interpolação são inválidas: %{keys}"
         watched_word:
           attributes:
             word:
@@ -610,23 +615,6 @@ pt_BR:
   meta_category_description: "Discussão sobre este site, sua organização, funcionamento e maneiras de melhorá-lo."
   staff_category_name: "Equipe"
   staff_category_description: "Categoria particular para discussões da equipe. Tópicos só são visíveis para administradores(as) e moderadores(as)."
-  discourse_welcome_topic:
-    title: "Boas-vindas à nossa comunidade!"
-    body: |2
-
-      O primeiro parágrafo deste tópico fixado será visto como uma mensagem de boas-vindas a todos(as) os(as) novos(as) visitantes em sua página inicial. É muito importante!
-
-      **Edite isso** em uma breve descrição da sua comunidade:
-
-      - Para quem é?
-      - O que será encontrado aqui?
-      - Por que as pessoas devem participar?
-      - Onde é possível saber mais a respeito dela (links, fontes, etc)?
-
-      <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
-
-      Talvez você queira fechar este tópico pelo(a) administrador(a) :wrench: (na parte superior à direita e na parte inferior), para que as respostas não se acumulem em um anúncio.
-  admin_quick_start_title: "LEIA-ME PRIMEIRO: Guia de início rápido do(a) administrador(a)"
   category:
     topic_prefix: "Sobre a categoria %{category} "
     replace_paragraph: "(Substitua este primeiro parágrafo por uma breve descrição da sua nova categoria. Esta orientação aparecerá na área de seleção da categoria, então tente mantê-la com menos de 200 caracteres.)"
@@ -1108,7 +1096,7 @@ pt_BR:
       title: "DAU/MAU"
       xaxis: "Dia"
       yaxis: "DAU/MAU"
-      description: "Quantidade de membros que entraram com a conta no último dia dividida pela quantidade de membros que entraram com a conta no último mês. Retorna uma % que indica a \"adesão\" à comunidade. Tente alcançar >30%."
+      description: "Quantidade de membros que entraram com a conta no último dia dividida pela quantidade de membros que entraram com a conta no último mês. Retorna uma % que indica a \"adesão\" à comunidade. Tente alcançar >20%."
     daily_engaged_users:
       title: "Usuários(as) envolvidos(as) diariamente"
       xaxis: "Dia"
@@ -1476,7 +1464,6 @@ pt_BR:
     manifest_icon: "Imagem usada como logotipo/splash no Android. Será redimensionada automaticamente para 512×512. Se for deixada em branco, large_icon será usado."
     manifest_screenshots: "Capturas de tela que mostram os recursos e funcionalidades da sua instância na sua página de alerta de instalação. Todas as imagens devem ser envios locais e devem ter as mesmas dimensões."
     favicon: "Um favicon para o seu site, consulte <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://en.wikipedia.org/wiki/Favicon</a>. Para funcionar corretamente em um CDN, precisa ser um png, que será redimensionado para 32x32. Se for deixado em branco, large_icon será usado."
-    apple_touch_icon: "Ícone usado para dispositivos Apple touch, que será automaticamente redimensionado para 180x180. Se for deixado em branco, large_icon será usado."
     opengraph_image: "Imagem opengraph padrão, usada quando a página não tiver outra imagem adequada. Se for deixada em branco, large_icon será usado."
     twitter_summary_large_image: "Cartão do Twitter 'resumo de imagem grande' (deve ter pelo menos 280 de largura e pelo menos 150 de altura, não pode ser .svg). Se for deixado em branco, os metadados comuns do cartão são gerados usando o opengraph_image, desde que também não sejam um .svg."
     notification_email: "O endereço de e-mail utilizado ao enviar e-mails do sistema. O domínio especificado deve ter registros SPF, DKIM e PTR devidamente configurados para que os e-mails funcionem corretamente."
@@ -1607,7 +1594,6 @@ pt_BR:
     enable_discourse_connect: "Ativar a criação de conta via DiscourseConnect (anteriormente \"Discourse SS\") (ALERTA: OS ENDEREÇOS DE E-MAL DOS(AS) USUÁRIOS(AS) *DEVEM* SER VALIDADOS PELO SITE EXTERNO!)"
     verbose_discourse_connect_logging: "Registrar diagnósticos detalhados relacionados ao DiscourseConnec em <a href='%{base_path}/logs' target='_blank'>/logs</a>"
     enable_discourse_connect_provider: "Implementar o protocolo de provedor do DiscourseConnect (anteriormente \"Discourse SSO\") no ponto de extremidade /session/sso_provider, requer que o discourse_connect_provider_secrets seja definido"
-    discourse_connect_url: "URL do ponto de extremidade do DiscourseConnect (deve incluir http:// ou https://)"
     discourse_connect_secret: "Linha secreta usada para autenticar com criptografia as informações do DiscourseConnect, verifique se tem mais de dez caracteres"
     discourse_connect_provider_secrets: "Uma lista de pares de segredos de domínio que usam o Discourse. Verifique se o segredo do DiscourseConnect tem pelo menos dez caracteres. O símbolo de curinga * pode ser usado para fazer correspondência com domínios ou partes deles (por exemplo: *.example.com)."
     discourse_connect_overrides_bio: "Sobrescreve a biografia do(a) usuário(a) e o(a) impede de mudá-la."
@@ -1621,7 +1607,6 @@ pt_BR:
     discourse_connect_overrides_profile_background: "Substitui o plano de fundo do perfil do(a) usuário(a) pelo valor do conteúdo do DiscourseConnect."
     discourse_connect_overrides_card_background: "Substitui o plano de fundo do cartão de usuário(a) pelo valor do conteúdo do DiscourseConnect."
     discourse_connect_not_approved_url: "Redireciona contas não aprovadas do DiscourseConnect para esta URL"
-    discourse_connect_allows_all_return_paths: "Não restrinja o domínio para return_paths fornecidos pelo DiscourseConnect (por padrão, o caminho de retorno deve estar no site atual)"
     enable_local_logins: "Ative contas baseadas em entrada com senha e usuário(a) local. ALERTA: se estiver desativado, talvez não seja possível entrar com a conta caso você não tenha configurado pelo menos um método de entrada alternativo."
     enable_local_logins_via_email: "Permita que os(as) usuários(as) solicitem um link para entrar com um clique para ser enviado por e-mail."
     allow_new_registrations: "Permita cadastro de novos(as) usuários(as). Desmarque isso para evitar que qualquer pessoa crie uma nova conta."
@@ -1725,7 +1710,6 @@ pt_BR:
     composer_media_optimization_image_bytes_optimization_threshold: "Tamanho mínimo de imagem para acionar a otimização do lado do cliente"
     composer_media_optimization_image_resize_dimensions_threshold: "Largura de imagem mínima para acionar o redimensionamento do lado do cliente"
     composer_media_optimization_image_resize_width_target: "Imagens com larguas maiores do que \"composer_media_optimization_image_dimensions_resize_threshold\" serão redimensionadas para esta largura. Deve ser >= do que \"composer_media_optimization_image_dimensions_resize_threshold\"."
-    composer_media_optimization_image_encode_quality: "Qualidade de codificação de JPG usada no processo de recodificação."
     min_ratio_to_crop: "Taxa usada para cortar imagens altas. Digite o resultado da largura/altura."
     simultaneous_uploads: "Quantidade máxima de arquivos que podem ser arrastados e soltos no compositor"
     default_invitee_trust_level: "Nível de confiança (0-4) padrão para usuários(as) convidados(as)."
@@ -1754,7 +1738,6 @@ pt_BR:
     tl3_requires_likes_given: "A quantidade mínima de curtidas que devem ser dadas nos últimos dias (período de tempo do tl3) para se qualificar para a promoção ao nível de confiança 3."
     tl3_requires_likes_received: "A quantidade mínima de curtidas que devem ser recebidas nos últimos dias (período de tempo do tl3) para se qualificar para a promoção ao nível de confiança 3."
     tl3_links_no_follow: "Não remover rel=nofollow de links postados por usuários(as) do nível de confiança 3."
-    trusted_users_can_edit_others: "Permitir que usuários(as) com altos níveis de confiança editem conteúdo de outros(as) usuários(as)"
     min_trust_to_create_topic: "O nível de confiança mínimo necessário para criar um novo tópico."
     allow_flagging_staff: "Se ativado(a), os(as) usuários(as) podem sinalizar postagens de contas de equipe."
     min_trust_to_edit_wiki_post: "O nível de confiança mínimo necessário para editar uma postagem marcada como wiki."
@@ -1790,7 +1773,6 @@ pt_BR:
     title_min_entropy: "A entropia mínima (caracteres únicos e em idioma diferente do inglês contam mais) necessária para o título de um tópico."
     body_min_entropy: "A entropia mínima (caracteres únicos e em idioma diferente do inglês contam mais) necessária para o corpo de uma postagem."
     allow_uppercase_posts: "Permita toda as letras maiúsculas no título de um tópico ou no corpo de uma postagem."
-    max_consecutive_replies: "Quantidade de postagens que um(a) usuário(a) precisa fazer de uma vez em um tópico antes de ser impedido(a) de adicionar outra resposta."
     enable_filtered_replies_view: 'o botão "(n) respostas" recolhe todas as outras postagens e exibe apenas a postagem atual e suas respostas.'
     title_fancy_entities: "Converter caracteres ASCII comuns para criar entidades HTML em títulos de tópicos, consulte SmartyPants <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</a>"
     min_title_similar_length: "O tamanho mínimo de um título antes que seja verificado para tópicos semelhantes."
@@ -1870,6 +1852,11 @@ pt_BR:
     block_auto_generated_emails: "Bloqueie os e-mails recebidos identificados como gerados automaticamente."
     ignore_by_title: "Ignore os e-mails recebidos com base no título."
     mailgun_api_key: "A chave da API secreta do Mailgun é usada para verificar as mensagens do webhook."
+    sendgrid_verification_key: "Chave de verificação Sendgrid usada para verificar mensagens de webhook."
+    mailjet_webhook_token: "Token usado para verificar o payload do webhook. Deve ser passado como parâmetro de consulta 't' do webhook, por exemplo: https://example.com/webhook/mailjet?t=supersecret"
+    mandrill_authentication_key: "Chave de autenticação Mandrill usada para verificar mensagens de webhook."
+    postmark_webhook_token: "Token usado para verificar o payload do webhook. Deve ser passado como parâmetro de consulta 't' do webhook, por exemplo: https://example.com/webhook/postmark?t=supersecret"
+    sparkpost_webhook_token: "Token usado para verificar o payload do webhook. Deve ser passado como parâmetro de consulta 't' do webhook, por exemplo: https://example.com/webhook/sparkpost?t=supersecret"
     soft_bounce_score: "Pontuação de rejeição adicionada ao(à) usuário(a) quando ocorre uma devolução temporária."
     hard_bounce_score: "Pontuação de rejeição adicionada ao(à) usuário(a) quando ocorre uma devolução permanente."
     bounce_score_threshold: "Pontuação máxima de devolução antes de pararmos de enviar um email a um(a) usuário(a)."
@@ -1897,7 +1884,6 @@ pt_BR:
     pop3_polling_password: "A senha da conta POP3 para sondar por e-mail."
     pop3_polling_delete_from_server: "Apagar e-mails do servidor. OBSERVAÇÃO: Se você desativar isso, será preciso limpar manualmente sua caixa de entrada"
     log_mail_processing_failures: "Registrar todas as falhas de processamento de e-mail em <a href='%{base_path}/logs' target='_blank'>/logs</a>"
-    email_in: 'Permita que os(as) usuários(as) postem novos tópicos por e-mail (requer sondagem manual ou POP3). Configure os endereços na aba "Configurações" de cada categoria.'
     email_in_min_trust: "O nível de confiança mínimo que um(a) usuário(a) precisa ter para ter permissão para postar novos tópicos via e-mail."
     email_in_authserv_id: "O identificador do serviço realizando verificações de autenticação em e-mails recebidos. Confira <a href='https://meta.discourse.org/t/134358'>https://meta.discourse.org/t/134358</a> para obter instruções de como configurar isso."
     email_in_spam_header: "O cabeçalho do e-mail para detectar spam."
@@ -1970,22 +1956,17 @@ pt_BR:
     permalink_normalizations: "Aplique o seguinte regex antes de combinar permalinks, por exemplo: /(topic.*)\\?.*/\\1 irá retirar as linhas de consulta das rotas de tópicos. O formato é regex + string use \\ 1 etc. para acessar capturas"
     global_notice: "Exibir um aviso global em banner URGENTE, EMERGENCIAL e que não pode ser fechado para todos os visitantes, deixe em branco para ocultá-lo (permitido por HTML)."
     disable_system_edit_notifications: "Desative a edição de notificações do(a) usuário(a) do sistema quando \"download_remote_images_to_local\" estiver ativado."
-    disable_category_edit_notifications: "Desative notificações de edição de categoria nos tópicos."
-    disable_tags_edit_notifications: "Desative notificações de edição de etiquetas nos tópicos."
     notification_consolidation_threshold: "Quantidade de notificações de pedidos de associação ou curtidas recebidas antes que as notificações sejam agrupadas. Defina como 0 para desativar."
     likes_notification_consolidation_window_mins: "Duração em minutos durante a qual as notificações curtidas são agrupadas em uma notificação única após alcançar o limite. É possível configurar o limite acessando \"SiteSetting.notification_consolidation_threshold\"."
     automatically_unpin_topics: "Desafixe automaticamente os tópicos quando o(a) usuário(a) atinge à parte inferior."
     read_time_word_count: "Contagem de palavras por minuto para calcular o tempo estimado de leitura."
     topic_page_title_includes_category: "Página do tópico <a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title' target='_blank'>etiqueta do título</a> inclui o nome da categoria."
-    native_app_install_banner_ios: "Exibir o banner do aplicativo DiscourseHub em dispositivos iOS para usuários(as) regulares (nível de confiança 1 e superior)."
-    native_app_install_banner_android: "Exibir o banner do aplicativo DiscourseHub em dispositivos Android para usuários(as) regulares (nível de confiança 1 e superior)."
     app_association_android: "Conteúdos do ponto de extremidade <a href='%{base_path}/.well-known/assetlinks.json'>.well-known/assetlinks.json</a>, usado para a API Digital Asset Links, do Google."
     app_association_ios: "Conteúdo do ponto de extremidade <a href='%{base_path}/apple-app-site-association'>apple-app-site-association</a>, usado par criar links universais entre este site e apps para iOS."
     share_anonymized_statistics: "Compartilhe estatísticas de uso anônimas."
     auto_handle_queued_age: "Trate automaticamente os registros que estão aguardando revisão há vários dias. Sinalizadores serão ignorados. Postagens na fila e usuários serão rejeitados. Defina como 0 para desativar esse recurso."
     penalty_step_hours: "Penalidades padrão por silenciar ou suspender usuários(as). A primeira ofensa é padronizada para o primeiro valor, a segunda ofensa para o segundo valor, etc."
     svg_icon_subset: "Adicione mais ícones FontAwesome 5 que você gostaria de incluir em seus ativos. Use o prefixo \"fa-\" para ícones consolidados, \"far-\" para ícones regulares e \"fab-\" para ícones de marca."
-    max_prints_per_hour_per_user: "Quantidade máxima de impressões de páginas (defina como 0 para desativar)"
     full_name_required: "O nome completo é um campo obrigatório do perfil do(a) usuário(a)."
     enable_names: "Mostrar o nome completo do(a) usuário(a) em seu perfil, cartão de usuário(a) e e-mails. Desative para ocultar o nome completo em todos os lugares."
     display_name_on_posts: "Exibir o nome completo do(a) usuário(a) em suas postagens, além de seu(sua) @username."
@@ -2006,17 +1987,11 @@ pt_BR:
     allowed_href_schemes: "Esquemas permitidos em links, além de http e https."
     embed_post_limit: "Quantidade máxima de postagens para incorporar."
     embed_username_required: "O nome do(a) usuário(a) para criação do tópico é obrigatório."
-    notify_about_flags_after: "Se houver sinalizadores que não foram tratados depois de muitas horas, envie uma mensagem pessoal para os(as) moderadores(as). Defina como 0 para desativar."
-    show_create_topics_notice: "Se o site tiver menos de cinco tópicos públicos, mostre um aviso pedindo que os(as) administradores(as) criem alguns tópicos."
     delete_drafts_older_than_n_days: "Exclua rascunhos anteriores a (n) dias."
     delete_merged_stub_topics_after_days: "Quantidade de dias para aguardar antes de excluir automaticamente tópicos de stub totalmente mesclados. Defina para 0 para nunca excluir tópicos de stub."
-    bootstrap_mode_min_users: "Quantidade mínima de usuários(as) necessários(as) para desativar o modo de inicialização (defina como 0 para desativar)"
     prevent_anons_from_downloading_files: "Impeça que usuários(as) anônimos(as) baixem anexos."
-    secure_media: "PRETERIDO: use a configuração secure_uploads, será removido no Discourse 3.0."
     secure_uploads: 'Limita acesso a TODOS os envios (imagens, vídeo, áudio, texto, pdfs, zips e muito mais). Se “É necessário entrar com a conta” estiver ativado, apenas usuários(as) que entraram com a conta podem acessar os envios. Caso contrário, o acesso será limitado apenas a envios de mídias em mensagens e categorias privadas. AVISO: esta configuração é complexa e requer conhecimento de administração. Para mais detalhes, consulte <a target="_blank" href="https://meta.discourse.org/t/-/140017">o tópico de envios seguros em Meta</a>.'
-    secure_media_allow_embed_images_in_emails: "PRETERIDO: use secure_uploads_allow_embed_images_in_emails, será removido no Discourse 3.0."
     secure_uploads_allow_embed_images_in_emails: "Permite incorporação de imagens seguras que geralmente seriam escritas em e-mails, caso o tamanho seja menor do que a configuração 'tamanho máx. de imagem de envio incorporada no e-mail, em KB\"."
-    secure_media_max_email_embed_image_size_kb: "PRETERIDO: Use secure_uploads_max_email_embed_image_size_kb, será removido no Discourse 3.0."
     secure_uploads_max_email_embed_image_size_kb: "A redução de tamanho para imagens seguras que serão incorporadas nos e-mails se a configuração 'Permissão de incorporação de envios seguros no e-mail'. Caso não esteja ativada, esta configuração não terá efeito."
     slug_generation_method: "Escolha um método para geração de slug. \"Codificado\" irá gerar linhas com \"%\". 'Nenhum\" irá desativar a geração de slugs."
     enable_emoji: "Ativar emoji"
@@ -2083,7 +2058,6 @@ pt_BR:
     revoke_api_keys_days: "Quantidade de dias antes de uma chave de API não usada ser revogada automaticamente (0 para nunca)"
     allow_user_api_keys: "Permitir geração de chaves de API do(a) usuário(a)"
     allow_user_api_key_scopes: "Lista de escopos permitidos para chaves de API do(a) usuário(a)"
-    min_trust_level_for_user_api_key: "Nível de confiança necessário para geração de chaves de API do(a) usuário(a)"
     allowed_user_api_auth_redirects: "URL permitida para o redirecionamento de autenticação das chaves de API do(a) usuário(a). O símbolo curinga * pode ser usado para corresponder a qualquer parte dele (por exemplo, www.example.com/*)."
     allowed_user_api_push_urls: "URLs permitidas para push de servidor para API do(a) usuário(a)"
     expire_user_api_keys_days: "Quantidade de dias antes de uma chave de API do(a) usuário(a) expirar automaticamente (0 para nunca)"
@@ -2115,7 +2089,6 @@ pt_BR:
     enable_sitemap: "Gerar um mapa para o seu site e incluí-lo no arquivo robots.txt."
     sitemap_page_size: "Número de URLs a serem incluídas em cada página de mapa do site. Máx: 50.000"
     enable_user_status: "(experimental) Permitir que os usuários definam uma mensagem de status personalizada (emoji + descrição)."
-    enable_user_tips: "(experimental) Ativar novas dicas de usuário(s) que descrevem os principais recursos para os(as) usuários(as)"
     short_title: "O título abreviado será usado na tela inicial do(a) usuário(a), no inicializador ou em outros locais com espaço limitado. Deveria ser limitado a 12 caracteres."
     dashboard_hidden_reports: "Permita que relatórios específicos sejam ocultos no painel de controle."
     dashboard_visible_tabs: "Escolha quais abas do painel de controle estão visíveis."
@@ -2132,10 +2105,6 @@ pt_BR:
     suggest_weekends_in_date_pickers: "Inclua fins de semana (sábado e domingo) nas sugestões do seletor de datas (desative isso se você usar o Discourse apenas durante a semana, de segunda a sexta)."
     splash_screen: "Exibe uma tela de carregamento temporária enquanto os ativos do site são carregados"
     navigation_menu: "Determine qual menu de navegação usar. A barra lateral e a navegação no cabeçalho podem ser personalizadas pelos usuários. A opção legada está disponível para compatibilidade com versões anteriores."
-    default_sidebar_categories: "As categorias selecionadas serão exibidas abaixo da seção de Categorias do Painel Lateral por padrão."
-    default_sidebar_tags: "As etiquetas selecionadas serão exibidas na seção de Etiquetas da barra lateral por padrão."
-    enable_new_user_profile_nav_groups: "EXPERIMENTAL: os usuários dos grupos selecionados verão o novo menu de navegação do perfil de usuário"
-    enable_experimental_topic_timeline_groups: "EXPERIMENTAL: os usuários dos grupos selecionados verão a nova linha do tempo do tópico"
     enable_experimental_hashtag_autocomplete: "EXPERIMENTAL: Use o novo sistema de complementação automática #hashtag para categorias e etiquetas que renderiza o item selecionado de maneira diferente e que tem melhorado a busca"
     errors:
       invalid_css_color: "Cor inválida. Digite o nome da cor ou valor hexadecimal."
@@ -2162,7 +2131,6 @@ pt_BR:
       pop3_polling_password_is_empty: "Você deve definir uma \"senha de sondagem POP3\" antes de ativar a sondagem POP3."
       pop3_polling_authentication_failed: "A autenticação POP3 falhou. Verifique suas credenciais POP3."
       reply_by_email_address_is_empty: "Você deve definir uma \"resposta por endereço de e-mail\" antes de ativar a resposta por e-mail."
-      email_polling_disabled: "Você deve ativar a pesquisa manual ou POP3 antes de ativar a resposta por e-mail."
       user_locale_not_enabled: "Você deve primeiro ativar \"permitir localidade do(a) usuário(a)\" antes de ativar esta configuração."
       personal_message_enabled_groups_invalid: "Você deve especificar pelo menos um grupo para esta configuração. Se você não quiser que ninguém, exceto a equipe, envie PMs, escolha o grupo da equipe."
       invalid_regex: "Regex não é inválida ou permitida."
@@ -2171,7 +2139,6 @@ pt_BR:
       staged_users_disabled: "Primeiro você deve ativar os \"usuários(as) encenados(as)\" antes de ativar esta configuração."
       reply_by_email_disabled: "Você deve ativar \"responder por e-mail\" antes de ativar esta configuração primeiro."
       discourse_connect_url_is_empty: "É preciso definir uma \"url de conexão do Discourse\" antes de ativar esta configuração."
-      discourse_connect_invite_only: "Não é possível ativar o DiscourseConnect e \"apenas convite\" ao mesmo tempo."
       enable_local_logins_disabled: "Você deve ativar \"ativar entradas com e-mail em modo local\" antes de ativar esta configuração."
       min_username_length_exists: "Você não pode definir o tamanho mínimo do nome do(a) usuário(a) acima do nome do(a) usuário(a) mais curto (%{username})."
       min_username_length_range: "Você não pode definir o mínimo acima do máximo."
@@ -2193,7 +2160,6 @@ pt_BR:
       search_tokenize_japanese_enabled: "Você deve desativar o 'search_tokenize_japanese' antes de ativar esta configuração."
       discourse_connect_cannot_be_enabled_if_second_factor_enforced: "Você não pode ativar o DiscourseConnect se o 2FA for aplicado."
       delete_rejected_email_after_days: "Esta configuração não pode ser inferior à configuração delete_email_logs_after_days ou superior a %{max}"
-      invalid_uncategorized_category_setting: "A categoria Não categorizado não pode ser selecionada se permitir tópicos não categorizados não for permitido"
     placeholder:
       discourse_connect_provider_secrets:
         key: "www.exemplo.com.br"
@@ -2388,7 +2354,6 @@ pt_BR:
     activated_by_staff: "Ativado pela equipe"
     new_user_typed_too_fast: "O(a) novo(a) usuário(a) digitou muito rápido"
     content_matches_auto_silence_regex: "O conteúdo corresponde ao regex silenciado automaticamente"
-    content_matches_auto_block_regex: "O conteúdo corresponde ao regex de bloco automático"
     username:
       short: "deve ter no mínimo %{min} caracteres"
       long: "não pode ter mais de %{max} caracteres"
@@ -3123,14 +3088,6 @@ pt_BR:
     user_automatically_silenced:
       title: "Usuário(a) silenciado(a) automaticamente"
       subject_template: "O(a) novo(a) usuário(a) %{username} silenciado(a) devido aos sinalizadores da comunidade"
-      text_body_template: |
-        Esta é uma mensagem automática.
-
-        O(a) novo(a) usuário(a) [%{username}](%{user_url}) foi silenciado(a) automaticamente porque usuários(as) sinalizaram suas postagens de %{username}.
-
-        Por favor, [revise os sinalizadores](%{base_url}/admin/flags). Se o(a) usuário(a) %{username} tiver sido silenciado(a) por engano para não postar, clique no botão de remover silenciamento na [página de administração do(a) usuário(a)](%{user_url}).
-
-        Este limite pode ser alterado pela configuração do site "silence_new_user".
     spam_post_blocked:
       title: "Postagem de spam bloqueada"
       subject_template: "Postagens de novo(a) usuário(a )%{username} bloqueadas devido a links repetidos"
@@ -3164,15 +3121,6 @@ pt_BR:
       title: "Desativar download de imagens remotas"
       subject_template: "Desativar download de imagens remotas em andamento"
       text_body_template: "A configuração \"download_remote_images_to_local\" está desativada porque o limite de espaço no disco configurado em \"download_remote_images_threshold\" foi alcançado."
-    dashboard_problems:
-      title: "Problemas do painel de controle"
-      subject_template: "Nova recomendação no painel de controle do seu site"
-      text_body_template: |
-        Temos dicas e recomendações novas para você baseadas nas configurações atuais do site.
-
-        [Acesse o painel do site](%{base_url}/admin) para conferir.
-
-        Se não houver nada visível no seu painel de controle, talvez outro membro da equipe já tenha agido com base neste conselho. Uma lista de ações da equipe pode ser encontrada em seus [registros de ação da equipe](%{base_url}/admin/logs/staff_action_logs).
     new_user_of_the_month:
       title: "Você é um(a) novo(a) usuário(a) do mês!"
       subject_template: "Você é um(a) novo(a) usuário(a) do mês!"
@@ -3209,9 +3157,6 @@ pt_BR:
       one: "Atenção: enviamos no máximo %{count} e-mail diário. Verifique no site para ver os que podem não ter sido enviados."
       other: "Atenção: enviamos no máximo %{count} e-mails diários. Verifique no site para ver os que podem não ter sido enviados. PS: obrigado pelos acessos!"
     in_reply_to: "Em resposta a"
-    unsubscribe:
-      title: "Cancelar associação"
-      description: "Não tem interesse em receber estes e-mails? Não tem problema! Clique abaixo para se cancelar a associação imediatamente:"
     reply_by_email: "[Acesse o tópico](%{base_url}%{url}) ou responda a este e-mail para responder."
     reply_by_email_pm: "[Acesse a mensagem](%{base_url}%{url}) ou responda a este e-mail para responder a %{participants}."
     only_reply_by_email: "Responda a este email para responder."
@@ -3508,7 +3453,6 @@ pt_BR:
       liked_received: "Curtidas recebidas"
       new_users: "Usuários(as) novos(as)"
       popular_topics: "Tópicos mais acessados"
-      follow_topic: "Seguir este tópico"
       join_the_discussion: "Leia mais"
       popular_posts: "Publicações mais acessadas"
       more_new: "Novo para você"
@@ -3699,14 +3643,7 @@ pt_BR:
     title: "Não é possível carregar o aplicativo"
     offline_page_message: "Parece que você está off-line! Verifique sua conexão de rede e tente novamente."
   login_required:
-    welcome_message: |
-      ## [Boas-vindas ao %{title}](#boas-vindas)
-      É preciso ter uma conta. Crie ou entre com uma para continuar.
-    welcome_message_invite_only: |
-      ## [Boas-vindas ao %{title}](#boas-vindas)
-      É preciso ter uma conta. Peça que a um membro um convite ou entre com uma conta para continuar.
-  deleted: "excluído(a)"
-  image: "imagem"
+    welcome_message: "# [Bem-vindo(a) ao %{title}](#welcome)"
   upload:
     edit_reason: "cópias locais de imagens baixadas"
     unauthorized: "Desculpe, o arquivo que você está tentando enviar não é autorizado (extensões autorizadas: %{authorized_extensions})."
@@ -3907,262 +3844,8 @@ pt_BR:
       Sim, burocracia é chata, mas precisamos nos proteger &ndash; e, consequentemente, proteger a sua pessoa e seus dados&ndash; contra ataques hostis. Os nossos [Termos de Serviço](%{base_path}/tos) descrevem o seu (e o nosso) comportamento e os direitos referentes a conteúdo, privacidade e legislação. Para usar este serviço, você precisa concordar em obedecer aos nossos [TOS](%{base_path}/tos).
   tos_topic:
     title: "Termos de Serviço"
-    body: |
-      Esses termos regem o uso do fórum da Internet em <%{base_url}>. Para usar o fórum, você precisa concordar com estes termos junto com %{company_name}, a empresa que administra o fórum.
-
-      A empresa pode oferecer outros produtos e serviços, sob diferentes condições. Estes termos se aplicam apenas ao uso do fórum.
-
-      Ir para:
-
-      - [Termos importantes](#heading--important-terms)
-      - [Sua permissão para usar o fórum](#heading--permission)
-      - [Condições de uso do fórum](#heading--conditions)
-      - [Uso aceitável](#heading--acceptable-use)
-      - [Padrões de conteúdo](#heading--content-standards)
-      - [Execução](#heading--enforcement)
-      - [Sua conta](#heading--your-account)
-      - [Seu conteúdo](#heading--your-content)
-      - [Sua responsabilidade](#heading--responsibility)
-      - [Isenções de responsabilidade](#heading--disclaimers)
-      - [Limites de responsabilidade](#heading--liability)
-      - [Feedback](#heading--feedback)
-      - [Rescisão](#heading--termination)
-      - [Disputas](#heading--disputes)
-      - [Termos gerais](#heading--general)
-      - [Contato](#heading--contact)
-      - [Alterações](#heading--changes)
-
-      <h2 id="heading--important-terms"><a href="#heading--important-terms">Termos importantes</a></h2>
-
-      ***Esses termos incluem várias disposições importantes que afetam seus direitos e responsabilidades, tais como isenções de responsabilidade em [Isenções de responsabilidade](#heading--disclaimers), os limites da responsabilidade da empresa perante você em [Limites de responsabilidade](#heading--liability), sua concordância em cobrir a empresa por danos causados pelo uso indevido do fórum em [Sua responsabilidade](#heading--responsibility) e um acordo para arbitrar disputas em [Disputas](#heading--disputes).***
-
-      <h2 id="heading--permission"><a href="#heading--permission">Sua permissão para usar o fórum</a></h2>
-
-      Sujeito a estes termos, a empresa lhe dá permissão para usar o fórum. Todos precisam concordar com estes termos para usar o fórum.
-
-      <h2 id="heading--conditions"><a href="#heading--conditions">Condições de uso do fórum</a></h2>
-
-      Sua permissão para usar o fórum está sujeita às seguintes condições:
-
-      1. Você deve ter pelo menos treze anos de idade.
-
-      2. Você não pode mais usar o fórum se a empresa entrar em contato diretamente com você para dizer que não pode.
-
-      3. Você deve usar o fórum de acordo com os [Padrões de conteúdo](#heading--content-standards) e [Uso aceitável](#heading--acceptable-use).
-
-      <h2 id="heading--acceptable-use"><a href="#heading--acceptable-use">Uso aceitável</a></h2>
-
-      1. Você não pode infringir a lei usando o fórum.
-
-      2. Você não pode usar ou tentar usar a conta de outra pessoa no fórum sem sua permissão expressa.
-
-      3. Você não pode comprar, vender ou trocar nomes de usuário ou outros identificadores exclusivos no fórum.
-
-      4. Você não pode enviar anúncios, correntes ou outras solicitações através do fórum, ou usar o fórum para coletar endereços ou outros dados pessoais para listas de mala direta ou bancos de dados comerciais.
-
-      5. Você não pode automatizar o acesso ao fórum ou monitorar o fórum, como usar um web crawler, plug-in ou add-on do navegador ou outro programa de computador que não seja um navegador web. Você pode rastrear o fórum para indexá-lo para um mecanismo de pesquisa disponível publicamente, se você tiver um.
-
-      6. Você não pode usar o fórum para enviar e-mail para listas de distribuição, grupos de notícias ou aliases de e-mail de grupo.
-
-      7. Você não pode insinuar falsamente que é afiliado ou endossado pela empresa.
-
-      8. Você não pode criar hiperlinks para imagens ou outro conteúdo que não seja hipertexto no fórum em outras páginas web.
-
-      9. Você não pode remover nenhuma marca que mostre a propriedade dos materiais baixados do fórum.
-
-      10. Você não pode mostrar nenhuma parte do fórum em outros sites com "<iframe>".
-
-      11. Você não pode desativar, evitar ou contornar quaisquer restrições de segurança ou de acesso do fórum.
-
-      12. Você não pode sobrecarregar a infraestrutura do fórum com um volume excessivo de solicitações ou solicitações projetadas para impor uma carga excessiva aos sistemas de informação subjacentes ao fórum.
-
-      13. Você não pode se passar por outras pessoas através do fórum.
-
-      14. Você não pode incentivar ou ajudar nenhuma pessoa a violar estes termos.
-
-      <h2 id="heading--content-standards"><a href="#heading--content-standards">Padrões de conteúdo</a></h2>
-
-      1. Você não pode enviar conteúdo para o fórum que seja ilegal, ofensivo ou prejudicial a terceiros. Isto inclui conteúdo que seja assédio, conduta imprópria, abusiva ou odiosa.
-
-      2. Você não pode enviar conteúdo para o fórum que viole a lei, infrinja os direitos de propriedade intelectual de qualquer pessoa, viole a privacidade de alguém ou viole acordos que você tenha com terceiros.
-
-      3. Você não pode enviar conteúdo para o fórum contendo código de computador malicioso, como vírus de computador ou spyware.
-
-      4. Você não pode enviar conteúdo para o fórum como um mero espaço reservado, para manter um endereço específico, nome de usuário ou outro identificador exclusivo.
-
-      5. Você não pode usar o fórum para divulgar informações que você não tem o direito de divulgar, como informações confidenciais ou pessoais de outras pessoas.
-
-      <h2 id="heading--enforcement"><a href="#heading--enforcement">Execução</a></h2>
-
-      A empresa pode investigar e processar violações desses termos em toda a sua extensão legal. A empresa pode notificar e cooperar com as autoridades responsáveis pela aplicação da lei no processo de violações da lei e destes termos.
-
-      A empresa se reserva o direito de alterar, redigir e excluir o conteúdo do fórum por qualquer motivo. Se você acredita que alguém enviou conteúdo ao fórum em violação a estes termos, entre em contato conosco imediatamente.
-
-      <h2 id="heading--your-account"><a href="#heading--your-account">Sua conta</a></h2>
-
-      Você deve criar e fazer login em uma conta para usar alguns recursos do fórum.
-
-      Para criar uma conta, você deve fornecer algumas informações sobre você. Se você criar uma conta, você concorda em fornecer, no mínimo, um endereço de e-mail válido e manter esse endereço atualizado. Você pode encerrar sua conta a qualquer momento enviando um e-mail para <%{contact_email}>.
-
-      Você concorda em assumir a responsabilidade por quaisquer ações tomadas usando sua conta, autorizadas por você ou não, até que você encerre sua conta ou notifique a empresa de que sua conta foi comprometida. Você concorda em notificar a empresa imediatamente se suspeitar que sua conta foi comprometida. Você concorda em selecionar uma senha segura para sua conta e mantê-la em segredo.
-
-      A empresa pode restringir, suspender ou fechar sua conta no fórum de acordo com sua política para lidar com solicitações de remoção relacionadas a direitos autorais ou se a empresa acreditar razoavelmente que você violou alguma regra nestes termos.
-
-      <h2 id="heading--your-content"><a href="#heading--your-content">Seu conteúdo</a></h2>
-
-      Nada nestes termos concede à empresa quaisquer direitos de propriedade intelectual que você compartilhe com o fórum, como informações de sua conta, postagens ou outro conteúdo que você enviar ao fórum. Nada nestes termos lhe confere quaisquer direitos de propriedade sobre a propriedade intelectual da empresa.
-
-      Entre você e a empresa, você permanece o único responsável pelo conteúdo que enviar ao fórum. Você concorda em não insinuar erroneamente que o conteúdo que você envia ao fórum é patrocinado ou aprovado pela empresa. Estes termos não obrigam a empresa a armazenar, manter ou fornecer cópias do conteúdo que você enviar e alterá-lo, de acordo com estes termos.
-
-      O conteúdo que você envia para o fórum pertence a você, e você decide que permissão dar a outras pessoas para seu uso. Mas, no mínimo, você autoriza a empresa a fornecer conteúdo que você envia ao fórum para outros usuários do fórum. Essa licença especial permite que a empresa copie, publique e analise o conteúdo que você enviar ao fórum.
-
-      Quando o conteúdo que você envia é removido do fórum, seja por você ou pela empresa, a licença especial da empresa termina quando a última cópia desaparece dos backups, caches e outros sistemas da empresa. Outras licenças que você aplica ao conteúdo enviado, como licenças Creative Commons, podem continuar depois que seu conteúdo for removido. Essas licenças podem conferir a terceiros, ou à própria empresa, o direito de compartilhar seu conteúdo por meio do fórum novamente.
-
-      Outros que receberem o conteúdo que você envia ao fórum podem violar os termos sob os quais você licencia seu conteúdo. Você concorda que a empresa não será responsável perante você por essas violações ou suas consequências.
-
-      <h2 id="heading--responsibility"><a href="#heading--responsibility">Sua responsabilidade</a></h2>
-
-      Você concorda em indenizar a empresa de reivindicações legais de terceiros relacionadas à sua violação destes termos, ou violação destes termos por outros usando sua conta no fórum. Tanto você como a empresa concordam em notificar a outra parte sobre quaisquer reivindicações legais pelas quais você possa ter que indenizar a empresa o mais rápido possível. Se a empresa deixar de notificar você imediatamente sobre uma reclamação legal, você não terá que indenizar a empresa por danos contra os quais poderia ter se defendido ou mitigado com notificação imediata. Você concorda em permitir que a empresa controle a investigação, defesa e liquidação de reclamações legais pelas quais você teria que indenizar a empresa e cooperar com esses esforços. A empresa concorda em não aceitar qualquer acordo que admita a sua culpa ou que lhe imponha obrigações sem a sua concordância prévia.
-
-      <h2 id="heading--disclaimers"><a href="#heading--disclaimers">Isenções de responsabilidade</a></h2>
-
-      ***Você aceita todos os riscos de usar o fórum e o conteúdo do fórum. Na medida em que a lei permite, a empresa e seus fornecedores disponibilizam o fórum tal como está, sem qualquer tipo de garantia.***
-
-      O fórum pode criar hiperlinks e integrar fóruns e serviços administrados por terceiros. A empresa não oferece nenhuma garantia sobre os serviços executados por terceiros ou sobre o conteúdo que eles possam fornecer. O uso de serviços executados por terceiros pode ser regido por outros termos entre você e o serviço em execução.
-
-      <h2 id="heading--liability"><a href="#heading--liability">Limites de responsabilidade</a></h2>
-
-      ***Nem a empresa nem seus fornecedores serão responsáveis perante você por danos de quebra de contrato que seus funcionários não poderiam ter razoavelmente previsto quando você concordou com estes termos.***
-
-      ***Na medida em que a lei permitir, a responsabilidade total perante você por reivindicações de qualquer tipo relacionadas ao fórum ou ao conteúdo do fórum será limitada a US$ 50.***
-
-      <h2 id="heading--feedback"><a href="#heading--feedback">Feedback</a></h2>
-
-      A empresa aprecia seu feedback e sugestões para o fórum. Consulte a seção Contato abaixo para saber como entrar em contato conosco.
-
-      Você concorda que a empresa terá a liberdade para agir com base nos comentários e sugestões que você fornecer e que a empresa não terá que notificá-lo de que seu feedback foi usado, obter sua permissão para usá-lo ou pagar por ele. Você concorda em não enviar feedback ou sugestões que acredite serem confidenciais ou proprietárias, para você ou para outros.
-
-      <h2 id="heading--termination"><a href="#heading--termination">Rescisão</a></h2>
-
-      Você ou a empresa podem rescindir o contrato escrito nestes termos a qualquer momento. Quando nosso contrato terminar, sua permissão para usar o fórum também terminará.
-
-      As seguintes cláusulas sobrevivem ao término de nosso contrato: [Seu conteúdo](#heading--your-content), [Feedback](#heading--feedback), [Sua responsabilidade](#heading--responsibility), [Isenções de responsabilidade](#heading--disclaimers), [Limites de responsabilidade](#heading--liability) e [Termos gerais](#heading--general).
-
-      <h2 id="heading--disputes"><a href="#heading--disputes">Disputas</a></h2>
-
-      %{governing_law} regerá qualquer disputa relacionada a estes termos ou ao seu uso do fórum.
-
-      Você e a empresa concordam em buscar liminares relacionadas a estes termos apenas em tribunal estadual ou federal em %{city_for_disputes}. Nem você nem a empresa deverão se opor à jurisdição, foro ou local nesses tribunais.
-
-      ***Exceto para buscar uma liminar ou para reivindicações sob a Lei de Fraude e Abuso de Computadores (CFAA), você e a empresa resolverão qualquer disputa vinculando a arbitragem da American Arbitration Association (AAA). A arbitragem seguirá as Regras de Arbitragem Comercial e os Procedimentos Complementares da AAA para Disputas Relacionadas com o Consumidor. A arbitragem ocorrerá em %{city_for_disputes}. Você resolverá qualquer disputa como indivíduo, e não como parte de uma ação coletiva ou outro processo representativo, seja como demandante ou membro da classe. Nenhum árbitro consolidará qualquer disputa com qualquer outra arbitragem sem a permissão da empresa.***
-
-      Qualquer sentença arbitral incluirá os custos da arbitragem, honorários advocatícios razoáveis e custos razoáveis para testemunhas. Você e a empresa podem entrar com sentenças arbitrais em qualquer tribunal com jurisdição.
-
-      <h2 id="heading--general"><a href="#heading--general">Termos gerais</a></h2>
-
-      Se uma disposição destes termos for inexequível da forma como escrita, mas puder ser alterada para torná-la exequível, essa disposição deverá ser modificada na medida mínima necessária para torná-la exequível. Caso contrário, essa disposição deverá ser removida.
-
-      Você não pode ceder seu contrato com a empresa. A empresa pode ceder o seu contrato a qualquer afiliada da empresa, qualquer outra empresa que obtenha o controle da empresa ou qualquer outra empresa que compre ativos da empresa relacionados ao fórum. Qualquer tentativa de cessão contra estes termos não terá efeito legal.
-
-      Nem o exercício de qualquer direito sob este Contrato, nem a renúncia de qualquer violação deste Contrato, renunciam a qualquer outra violação deste Contrato.
-
-      Estes termos incorporam todos os termos do acordo entre você e a empresa, sobre o uso do fórum. Estes termos substituem inteiramente quaisquer outros acordos sobre o uso do fórum, por escrito ou não.
-
-      <h2 id="heading--contact"><a href="#heading--contact">Contato</a></h2>
-
-      Você poderá notificar a empresa sob estes termos e enviar perguntas para a empresa, através de <%{contact_email}>.
-
-      A empresa poderá notificá-lo sob estes termos usando o endereço de e-mail que você forneceu para sua conta no fórum ou postando uma mensagem na página inicial do fórum ou na página de sua conta.
-
-      <h2 id="heading--changes"><a href="#heading--changes">Alterações</a></h2>
-
-      A empresa atualizou estes termos pela última vez em 12 de julho de 2018 e poderá atualizá-los novamente. A empresa publicará todas as atualizações no fórum. Para atualizações que contenham mudanças substanciais, a empresa concorda em enviar um e-mail para você, se você tiver criado uma conta e fornecido um endereço de e-mail válido. A empresa também poderá anunciar atualizações com mensagens especiais ou alertas no fórum.
-
-      Depois de receber uma notificação sobre uma atualização desses termos, você precisa concordar com os novos termos para continuar usando o fórum.
   privacy_topic:
     title: "Política de Privacidade"
-    body: |
-      <a name="collect"></a>
-
-      ## [Quais informações coletamos?](# Coletar)
-
-      Coletamos informações quando você se cadastra no nosso site e coletamos dados quando você participa do fórum lendo, escrevendo e avaliando o conteúdo compartilhado aqui.
-
-      Ao se cadastrar no nosso site, pode ser solicitado que você digite seu nome e endereço de e-mail. É possível, no entanto, acessar sem se cadastrar. Seu endereço de e-mail será verificado com um e-mail contendo um link exclusivo. Se esse link for acessado, saberemos que você controla o endereço de e-mail.
-
-      Ao se cadastrar e postar, registramos o endereço IP de onde a postagem se originou. Também podemos manter registros do servidor, que incluem o endereço IP de cada solicitação para o nosso servidor.
-
-      <a name="use"></a>
-
-      ## [Para que usamos suas informações?](# Use)
-
-      Qualquer informação coletada pode ser usada de uma das seguintes formas:
-
-      * Para personalizar sua experiência &mdash; suas informações nos ajudam a atender melhor suas necessidades individuais.
-      * Para melhorar nosso site &mdash; nos esforçamos continuamente para melhorar nossas ofertas de sites com base nas informações e comentários que recebemos de você.
-      * Para melhorar o atendimento ao cliente &mdash; suas informações nos ajudam a responder com mais eficácia às suas solicitações de atendimento ao cliente e a atender necessidades de suporte.
-      * Para enviar e-mails periódicos &mdash; o endereço de e-mail que você informa pode ser usado para enviar informações, notificações solicitadas sobre alterações em tópicos ou respostas vinculadas ao seu nome de usuário(a), responder a perguntas e/ou outras solicitações ou dúvidas.
-
-      <a name="protect"></a>
-
-      ## [Como protegemos suas informações?](#protect)
-
-      Implementamos uma variedade de medidas de segurança para manter a segurança de suas informações pessoais quando você as insere, envia ou acessa.
-
-      <a name="data-retention"></a>
-
-      ## [Qual é a sua política de retenção de dados?](# Retenção de dados)
-
-      Faremos um esforço de boa fé para:
-
-      * Manter os registros do servidor contendo o endereço IP de todas as solicitações para esse servidor por no máximo 90 dias.
-      * Manter os endereços IP associados aos(às) usuários(as) cadastrados(as) e suas postagens por menos de cinco anos.
-
-      <a name="cookies"></a>
-
-      ## [Nós usamos cookies?](#cookies)
-
-      Sim. Cookies são pequenos arquivos que um site ou seu provedor de serviços transfere para o disco rígido do seu computador pelo navegador (se você permitir). Esses cookies permitem que o site reconheça seu navegador e, se você tiver uma conta cadastrada, o associe à sua conta registrada.
-
-      Usamos cookies para entender e salvar suas preferências para as próximas visitas e compilar os dados agregados sobre tráfego e interação no site para que possamos proporcionar melhores experiências e ferramentas ao site no futuro. Podemos contratar prestadores de serviços terceirizados para nos ajudar a entender melhor os visitantes do nosso site. Esses prestadores de serviços não têm permissão para usar as informações coletadas em nosso nome, exceto para nos ajudar a conduzir e melhorar nossos negócios.
-
-      <a name="disclose"></a>
-
-      ## [Nós divulgamos qualquer informação a terceiros?](#divulgue)
-
-      Nós não vendemos, comercializamos ou transferimos de outra forma para terceiros suas informações pessoalmente identificáveis. Isso não inclui terceiros confiáveis ​​que nos auxiliam a operar nosso site, conduzir nossos negócios ou prestar serviços a você, desde que as partes concordem em manter essas informações confidenciais. Também podemos liberar suas informações quando acreditarmos que a divulgação é apropriada para cumprir a lei, aplicar as políticas do nosso site ou proteger os direitos, propriedade ou segurança da nossa empresa ou de terceiros. No entanto, informações de visitantes não pessoalmente identificáveis ​​podem ser fornecidas a terceiros para fins de marketing, publicidade ou outros usos.
-
-      <a name="third-party"></a>
-
-      ## [Links de terceiros](#terceiros)
-
-      Ocasionalmente, a nosso critério, podemos incluir ou oferecer produtos ou serviços de terceiros em nosso site. Esses sites de terceiros têm políticas de privacidade separadas e independentes. Portanto, não temos responsabilidade nem obrigação em relação ao conteúdo e atividades desses sites vinculados. No entanto, procuramos proteger a integridade do nosso site e agradecemos qualquer comentário sobre esses sites.
-
-      <a name="coppa"></a>
-
-      ## [Cumprimento da Lei de Proteção à Privacidade On-line das Crianças](#coppa)
-
-      Nosso site, produtos e serviços são direcionados para pessoas com pelo menos 13 anos de idade. Se este servidor estiver nos EUA e você tiver menos de 13 anos, de acordo com os requisitos da COPPA (https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act), não use este site.
-
-      <a name="online"></a>
-
-      ## [Apenas Política de Privacidade On-line](#online)
-
-      Esta política de privacidade on-line se aplica somente a informações coletadas pelo nosso site e não a informações coletadas off-line.
-
-      <a name="consent"></a>
-
-      ## [Seu consentimento](#consentimento)
-
-      Ao utilizar o nosso site, você concorda com a nossa política de privacidade.
-
-      <a name="changes"></a>
-
-      ## [Alterações à nossa Política de Privacidade](#alterações)
-
-      Se decidirmos alterar nossa política de privacidade, elas serão publicadas nesta página.
-
-      Este documento é CC-BY-SA. Última atualização em 31 de maio de 2013.
   badges:
     mass_award:
       errors:
@@ -4467,10 +4150,7 @@ pt_BR:
       message: "<p>Reenviamos o e-mail de confirmação para <b>%{email}</b>"
   safe_mode:
     title: "Entrar no modo de segurança"
-    description: "O modo de segurança permite que você teste seu site sem carregar plugins ou temas."
     no_themes: "Desabilitar temas e componentes"
-    no_unofficial_plugins: "Desativar plug-ins não oficiais"
-    no_plugins: "Desativar todos os plug-ins"
     enter: "Entrar no modo de segurança"
     must_select: "Você deve selecionar pelo menos uma opção para entrar no modo de segurança."
   wizard:
@@ -4585,7 +4265,9 @@ pt_BR:
           <p>Divirta-se e boa sorte <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>construindo a sua nova comunidade!</a></p>
   search_logs:
     graph_title: "Contagem de pesquisa"
-  joined: "Ingressou"
+  onebox:
+    discourse:
+      user_joined_community: "Juntou-se em %{date}"
   discourse_push_notifications:
     popup:
       mentioned: 'Você foi mencionado(a) por %{username} em "%{topic}" - %{site_title}'
@@ -4648,13 +4330,12 @@ pt_BR:
         category: configurações de categoria
     actions:
       agree:
-        title: "Concordar…"
+        title: "Sim"
       agree_and_keep:
-        title: "Manter postagem"
-        description: "Concorde com o sinalizador e mantenha a postagem inalterada."
+        title: "Manter publicação"
       agree_and_keep_hidden:
-        title: "Manter postagem oculta"
-        description: "Concorde com o sinalizador e mantenha a postagem oculta."
+        title: "Manter publicação oculta"
+        description: "Concordar com o sinalizador e manter a publicação oculta."
       agree_and_suspend:
         title: "Suspender usuário(a)"
         description: "Concorde com o sinalizador e suspenda o(a) usuário(a)."
@@ -4662,36 +4343,31 @@ pt_BR:
         title: "Silenciar usuário(a)"
         description: "Concorde com o sinalizador e silencie o(a) usuário(a)."
       agree_and_restore:
-        title: "Restaurar postagem"
+        title: "Restaurar publicação"
         description: "Restaure a postagem para que todos os(as) usuários(as) possam ver."
       agree_and_hide:
         title: "Ocultar publicação"
-        description: "Oculte esta publicação e envie automaticamente ao(à) usuário(as) uma mensagem pedindo que edite."
       delete_single:
         title: "Excluir"
       delete:
         title: "Excluir…"
       delete_and_ignore:
-        title: "Excluir postagem e ignorar"
-        description: "Excluir postagem. Se for a primeira postagem, excluir o tópico também"
+        title: "Ignorar sinalizador e excluir publicação"
       delete_and_ignore_replies:
-        title: "Excluir postagem + respostas e ignorar"
-        description: "Excluir postagem e todas as suas respostas. Se for a primeira postagem, excluir o tópico também"
         confirm: "Você tem certeza de que deseja excluir as respostas desta postagem também?"
       delete_and_agree:
-        title: "Excluir postagem e concordar"
-        description: "Excluir postagem. Se for a primeira postagem, excluir o tópico também"
+        title: "Excluir publicação"
       delete_and_agree_replies:
-        title: "Excluir postagem + respostas e concordar"
-        description: "Excluir postagem e todas as suas respostas. Se for a primeira postagem, excluir o tópico também"
         confirm: "Você tem certeza de que deseja excluir as respostas desta postagem também?"
       disagree_and_restore:
-        title: "Discordar e restaurar postagem"
+        title: "Não, restaurar publicação"
         description: "Restaure a postagem para que todos os(as) usuários(as) possam ver."
       disagree:
-        title: "Discordar"
+        title: "Não"
       ignore:
         title: "Ignorar"
+      ignore_and_do_nothing:
+        title: "Não fazer nada"
       approve:
         title: "Aprovar"
       approve_post:
@@ -4757,6 +4433,11 @@ pt_BR:
     payload_url:
       blocked_or_internal: "A URL da Carga não poderá ser usada porque se refere a um IP interno ou bloqueado"
       unsafe: "A URL da carga útil não poderá ser usada porque não é segura"
+  form_templates:
+    errors:
+      invalid_yaml: "não é uma string YAML válida"
+      invalid_type: "contém um tipo de modelo inválido: %{type} (os tipos válidos são: %{valid_types})"
+      missing_type: "está faltando o tipo do campo"
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml
index 4fcd50097e6..cd5967fa90e 100644
--- a/config/locales/server.ro.yml
+++ b/config/locales/server.ro.yml
@@ -1073,7 +1073,6 @@ ro:
     disable_system_edit_notifications: "Deactivează editarea notificărilo de către utilizator atunci când setarea 'download_remote_images_to_local' este activată."
     automatically_unpin_topics: "Desprinde automat subiecte când utilizatorul ajunge la sfârșitul paginii."
     read_time_word_count: "Contor de cuvinte pe minut pentru calcularea timpului estimat de citire."
-    max_prints_per_hour_per_user: "Numărul maxim de amprente de vizualizare lăsate pentru /print (0 pentru dezactivare)"
     full_name_required: "Numele întreg este un câmp obligatoriu în profilul utilizator."
     enable_names: "Afișează numele întreg al utilizatorului în profilul său, în cardul utilizator și în emailuri. Dezactivează pentru ascunde numele peste tot."
     display_name_on_posts: "Arată atât numele complet cât și numele de utilizator în postări."
@@ -1085,9 +1084,7 @@ ro:
     allowed_href_schemes: "Alte tipuri de linkuri permise, în afară de http și https."
     embed_post_limit: "Numărul maxim de postări care să fie încorporate."
     embed_username_required: "Numele utilizator pentru acest subiect este obligatoriu."
-    show_create_topics_notice: "Dacă site-ul are mai puțin de 5 subiecte publice, afișează o notificare prin care se cere adminilor să creeze subiecte."
     delete_drafts_older_than_n_days: "șterge schițele mai vechi de (n) zile."
-    bootstrap_mode_min_users: "Numărul minim de utilizatori necesar pentru dezactivarea modului bootstrap (0 pentru dezactivare)"
     slug_generation_method: "Alege o metodă de generare de identificator. 'encodat' va genera șir de caractere encodate cu procentaje. 'nimic' va dezactiva complet identificatorii."
     enable_emoji: "Activează emoji"
     emoji_set: "Cum ți-ar placea să fie emoji tăi?"
@@ -1118,7 +1115,6 @@ ro:
     default_categories_watching_first_post: "Lista categoriilor în care prima postare din fiecare topic va fi urmărită activ în mod implicit."
     allow_user_api_keys: "Permite generarea de chei API pentru utilizator"
     allow_user_api_key_scopes: "Lista domeniilor pentru care se permit chei API pentru utilizatori"
-    min_trust_level_for_user_api_key: "Nivelul de încredere necesar pentru generarea de chei API utilizator"
     allowed_user_api_push_urls: "URL-uri permise pentru serviciul push al serverului la API utilizator"
     tagging_enabled: "Activează etichetele la subiecte?"
     min_trust_to_create_tag: "Nivelul minim de încredere necesar pentru crearea unei etichete."
@@ -1150,7 +1146,6 @@ ro:
       pop3_polling_password_is_empty: "Trebuie să setezi „parola pe serverul POP3” înainte să poți activa retragerea de emailuri prin POP3."
       pop3_polling_authentication_failed: "Autentificarea POP3 a eșuat. Te rugăm să verifici detaliile din setările POP3."
       reply_by_email_address_is_empty: "Trebuie să setezi o adresă pentru „răspunde prin email” înainte să poți activa răspunsul prin email."
-      email_polling_disabled: "Trebuie să setezi fie retragerea manuala fie cea prin POP3 înainte să activezi răspunsul prin email."
       user_locale_not_enabled: "Trebuie să activezi întâi „permite locale utilizator” înainte de activa această setare."
       invalid_regex: "Regex invalid sau nepermis."
       min_username_length_range: "Nu poți seta minimum cu o valoare mai mare decât a maximului."
@@ -1427,9 +1422,6 @@ ro:
   user_notifications:
     previous_discussion: "Răspunsurile precedente"
     in_reply_to: "Ca răspuns la"
-    unsubscribe:
-      title: "Dezabonare"
-      description: "Nu ești interesat în a primi aceste email-uri? Nicio problemă! Fă click dedesubt pentru a te dezabona imediat:"
     reply_by_email: "[Vizitează subiect](%{base_url}%{url}) sau dă reply la acest email pentru a răspunde."
     only_reply_by_email: "Dă reply la acest email pentru a răspunde."
     visit_link_to_respond: "[Vizitează subiect](%{base_url}%{url}) pentru a răspunde."
@@ -1610,7 +1602,6 @@ ro:
       liked_received: "Aprecieri primite"
       new_users: "Utilizatori noi"
       popular_topics: "Subiecte notorii"
-      follow_topic: "Urmărește acest subiect"
       join_the_discussion: "Citește mai mult"
       popular_posts: "Postări notorii"
       unsubscribe: "Acest rezumat este transmis de pe %{site_link} când a trecut ceva vreme de când nu te-am mai văzut. Poți schimba %{email_preferences_link} sau, pentru a te dezabona, %{unsubscribe_link}"
@@ -1679,8 +1670,6 @@ ro:
     see_more: "Mai multe"
     search_title: "Caută în site"
     search_button: "Caută"
-  deleted: "șters"
-  image: "imagine"
   upload:
     edit_reason: "copii locale ale imaginilor descărcate"
     unauthorized: "Ne pare rău, fișierul pe care-l încerci să-l încarci nu este autorizat (extensii autorizate: %{authorized_extensions})."
@@ -1833,87 +1822,6 @@ ro:
     title: "Condiții generale de utilizare"
   privacy_topic:
     title: "Politica de confidențialitate"
-    body: |
-      <a name="collect"></a>
-
-      ## [Ce informații colectăm?](#collect)
-
-      Noi colectăm informații de la tine atunci când te înregistrezi pe site-ul nostru și strângem date atunci când participi la forum citind, scriind sau evaluând conținutul distribuit aici.
-
-      Când te înregistrezi pe site-ul nostru, ți se poate cere să îți introduci numele și adresa. Poți totuși să ne vizitezi site-ul fără să te înregistrezi. Adresa ta de email va fi verificată printr-un email ce conține un link unic. Dacă acel link este vizitat, noi știm că tu deții controlul adresei de email.
-
-      Odată înregistrat și postând, noi înregistrăm adresa de IP de la care a provenit postarea. Putem de asemenea să păstrăm registre de server cu adresele IP ale fiecărei interogări către serverul nostru.
-
-      <a name="use"></a>
-
-      ## [La ce folosim informațiile?](#use)
-
-      Orice informație pe care o colectăm de la tine poate fi folosită într-unul din următoarele moduri:
-
-      * Pentru a-ți personaliza experiența &mdash; informațiile tale ne ajută să răspundem mai bine nevoilor tale specifice.
-      * Să ne îmbunătățim site-ul &mdash; ne zbatem în permanență să ne îmbunătățim funcționalitățile site-ului pe baza informațiilor și al feedback-ului pe care îl primim de la tine.
-      * Să îmbunătățim serviciul clienți &mdash; informațiile tale ne ajută să răspundem mai eficient cererilor tale de serviciu clienți și nevoilor tale de suport.
-      * Să transmitem emailuri periodice &mdash; Adresa de email pe care ne-ai furnizat-o poate fi folosită să îți trimitem informații, notificări pe care le ceri cu privire la schimbări în subiecte sau în legătură cu numele tău utilizator, pentru a răspunde la solicitări și/sau alte cereri sau întrebări.
-
-      <a name="protect"></a>
-
-      ## [Cum îți protejăm informațiile?](#protect)
-
-      Implementăm o gamă variată de măsuri pentru a menține securitatea informațiilor personale pe care le introduci, trimiți sau accesezi.
-
-      <a name="data-retention"></a>
-
-      ## [Care este politica voastră de păstrare a datelor?](#data-retention)
-
-      Vom face eforturi cu bună-credință pentru a:
-
-      * Nu reține mai mult de 90 de zile rapoartele server ce conțin adresele de IP ale tuturor interogărilor către serverul nostru.
-      * Nu reține mai mult de 5 ani adresele de IP asociate cu utilizatorii înregistrați și postările lor.
-
-      <a name="cookies"></a>
-
-      ## [Folosiți cookies](#cookies)
-
-      Da. Cookies sunt fișiere mici pe care un site sau furnizorul său de servicii le transferă pe hard drive-ul computerului tău prin intermediul web browser-ului (dacă permiți) Aceste cookies dau posibilitatea site-ului să îți recunoască browserul și, dacă ai un cont înregistrat, să îl asocieze cu contul tău înregistrat.
-
-      Folosim cookies pentru a-ți înțelege și salva preferințele în vederea vizitelor viitoare și să compilăm și agregăm date despre traficul pe site și interacțiunile site-ului astfel încât să putem oferi experiențe mai și instrumente mai bune pe site, în viitor. Putem contacta terți furnizori de servicii pentru a ne ajuta să ne înțelegem mai bine vizitatorii. Acestor terți furnizori de servicii nu li se va permite să folosească informațiile colectate în numele nostru decât pentru a ne ajuta șă ne desfășurăm și îmbunătățim activitatea..
-
-      <a name="disclose"></a>
-
-      ## [Divulgați aceste informații terților?](#disclose)
-
-      Nu vindem, comercializăm sau transferăm în vreun alt fel către terți informațiile tale personale identificabile. Asta nu include terții de încredere care ne ajută să ne exploatăm site-ul, să ne conducem activitatea, sau să te servim, câtă vreme acești terți sunt de acord să păstreze aceste informații confidențiale. Putem de asemenea să divulgăm informațiile tale atunci când credem că e necesar pentru a ne supune legii, să aplicăm politica site-ului, sau să protejăm drepturile, proprietatea sau siguranța noastră sau a altora. Totuși, informațiile nepersonale ale vizitatorilor pot fi furnizate unor terți în scopuri de marketing, reclamă sau în alte scopuri.
-
-      <a name="third-party"></a>
-
-      ## [Legături cu terți](#third-party)
-
-      Uneori, la discreția noastră, putem include sau oferi produse sau servicii ale terților pe site-ul nostru. Aceste site-uri ale terților au propriile lor politici de confidențialitate separate și independente. De aceea noi nu avem nicio responsabilitate pentru conținutul sau activitățile de pe aceste site-uri către care sunt puse linkuri. Cu toate astea, vom încerca să protejăm integritatea site-ului nostru și suntem dispuși să luam în considerare orice feedback legat de aceste site-uri.
-
-      <a name="coppa"></a>
-
-      ## [Protecția minorilor](#coppa)
-
-      Site-ul nostru, produsele și serviciile sunt destinate direct persoanelor care au vârsta de peste 13 ani. Dacă acest server este în Statele Unite, și dacă ai mai puțin de 13 ani, în conformitate cu COPPA ([Children's Online Privacy Protection Act](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)), nu folosi acest site.
-      <a name="online"></a>
-
-      ## [Politica de confidențialitate online](#online)
-
-      Această politică de confidențialitate se aplică numai informațiilor colectate online prin intermediul site-ului nostru nu și celor colectate offline.
-
-      <a name="consent"></a>
-
-      ## [Acordul tău](#consent)
-
-      Prin utilizarea site-ului nostru, ești de acord cu Politica de confidențialitate a site-ului nostru web.
-
-      <a name="changes"></a>
-
-      ## [Schimbări în politica de confidențialitate](#changes)
-
-      Dacă decidem să ne schimbăm politica de confidențialitate, vom afișa schimbările în această pagină.
-
-      Acest document se supune licenței creative commons CC-BY-SA. A fost actualizat ultima dată pe 31 mai 2013.
   badges:
     editor:
       name: Editor
@@ -2106,8 +2014,6 @@ ro:
       message: "<p>Am trimis un email de activare la <b>%{email}</b>"
   safe_mode:
     title: "Activează modul sigur"
-    no_unofficial_plugins: "Dezactivează plugin-urile neoficiale"
-    no_plugins: "Dezactivează toate plugin-urile"
     enter: "Activează modul sigur"
   wizard:
     title: "Configurare Discourse"
@@ -2147,7 +2053,6 @@ ro:
         description: "Aproape ai încheiat ! Hai să invităm câțiva prieteni să te ajute <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>cu demararea comunității </a> prin discuții și răspunsuri interesante."
       finished:
         title: "Discourse-ul tău e gata!"
-  joined: "Înscris"
   discourse_push_notifications:
     popup:
       mentioned: '%{username} te-a menționat în discuția "%{topic}" - %{site_title}'
@@ -2167,24 +2072,20 @@ ro:
       medium: "Medie"
       high: "Ridicată"
     actions:
-      agree_and_keep:
-        title: "Păstrează postarea"
-      agree_and_suspend:
-        title: "Suspendă utilizator"
-      agree_and_silence:
-        title: "Suspendă utilizatorul"
+      agree:
+        title: "Da"
       agree_and_restore:
         description: "Restabilește postarea pentru astfel încât toți utilizatorii să o poată vedea."
-      agree_and_hide:
-        title: "Ascunde postarea"
       delete_single:
         title: "Șterge"
       disagree_and_restore:
         description: "Restabilește postarea pentru astfel încât toți utilizatorii să o poată vedea."
       disagree:
-        title: "Nu sunt de acord"
+        title: "Nu"
       ignore:
         title: "Ignoră"
+      ignore_and_do_nothing:
+        title: "Nu face nimic"
       approve:
         title: "Aprobare"
       reject_user:
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index c836a4a80f3..8df0bf858aa 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -52,6 +52,8 @@ ru:
   remove_posts_deleted_by_author: "Удалено автором"
   redirect_warning: "Нам не удалось убедиться, что выбранная вами ссылка действительно была размещена на форуме. Если вы хотите продолжить, выберите ссылку ниже."
   on_another_topic: "По другой теме"
+  topic_tag_changed:
+    removed: "Удалил(а) %{removed}"
   inline_oneboxer:
     topic_page_title_post_number: "#%{post_number}"
     topic_page_title_post_number_by_user: "#%{post_number} от пользователя %{username}"
@@ -201,11 +203,6 @@ ru:
       load_from_remote: "Произошла ошибка при загрузке сообщения."
     site_settings:
       invalid_category_id: "Вы указали несуществующую категорию"
-      invalid_choice:
-        one: "Вы указали неверный вариант %{name}"
-        few: "Вы указали неверные варианты %{name}"
-        many: "Вы указали неверные варианты %{name}"
-        other: "Вы указали неверные варианты %{name}"
       default_categories_already_selected: "Нельзя выбрать категорию, используемую в другом списке."
       default_tags_already_selected: "Вы не можете выбрать тег, используемый в другом списке."
       s3_upload_bucket_is_required: "Нельзя включить загрузки на S3, пока не задана настройка «s3_upload_bucket»."
@@ -213,7 +210,6 @@ ru:
       page_publishing_requirements: "Публикация страниц не может быть включена при включённом ограничении доступа к мультимедийному контенту."
       s3_backup_requires_s3_settings: "Нельзя включить резервные копии на S3, пока не задана настройка «%{setting_name}»."
       s3_bucket_reused: "Нельзя использовать одну и ту же корзину для «s3_upload_bucket» и «s3_backup_bucket». Выберите другую корзину или используйте различные пути для каждой корзины."
-      secure_uploads_requirements: "Перед тем как ограничить доступ к загружаемому контенту, необходимо включить загрузку в S3"
       share_quote_facebook_requirements: "Вы должны установить идентификатор приложения, чтобы включить публикацию цитат для Фейсбука."
       second_factor_cannot_enforce_with_socials: "Вы не можете применить двухфакторную аутентификацию при включённом входе через соцсети. Сначала нужно отключить %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Применить двухфакторную аутентификацию нельзя, если локальный вход отключен."
@@ -637,10 +633,6 @@ ru:
             duration_minutes:
               cannot_be_zero: "должно быть больше 0."
               exceeds_maximum: "не может быть более 20 лет."
-        translation_overrides:
-          attributes:
-            value:
-              invalid_interpolation_keys: 'Недопустимые ключи интерполяции: «%{keys}»'
         watched_word:
           attributes:
             word:
@@ -660,23 +652,6 @@ ru:
   meta_category_description: "Обсуждение этого сайта: структура и расположение материалов, принципы работы, идеи возможных улучшений."
   staff_category_name: "Персонал"
   staff_category_description: "Закрытая категория для персонала. Темы видны только администраторам и модераторам."
-  discourse_welcome_topic:
-    title: "Добро пожаловать в наше сообщество!"
-    body: |2
-
-      Первый абзац этой закреплённой темы будет виден всем новым посетителям как приветственное сообщение на главной странице. Это важно!
-
-      **Сделайте из этого перечня вопросов** краткое сообщение для сообщества:
-
-      - Для кого предназначен этот форум?
-      - Что интересного пользователи могут здесь почерпнуть?
-      - Почему они должны воспользоваться именно этим ресурсом?
-      - Где можно получить дополнительную информацию (ссылки, ресурсы и т. п.)?
-
-      <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
-
-      Эту тему можно сделать закрытой (меню администрирования, значок :wrench: справа вверху и в конце темы), чтобы пользователи не оставляли ответы под этим приветствием.
-  admin_quick_start_title: "Сначала ПРОЧИТАЙТЕ «Краткое руководство администратора»"
   category:
     topic_prefix: "Описание категории «%{category}»"
     replace_paragraph: "(Замените этот первый абзац кратким описанием новой категории. Оно будет показано под названием при отображении списка категорий, поэтому старайтесь, чтобы оно не превышало 200 символов.)"
@@ -1210,7 +1185,7 @@ ru:
       title: "DAU/MAU"
       xaxis: "Дата"
       yaxis: "DAU/MAU"
-      description: "Количество участников, которые вошедших за последний день, поделённое на количество участников, вошедших за прошедший месяц. Возвращает %, который указывает «удержание» сообщества. Стремитесь к значению > 30%."
+      description: "Количество участников, которые вошедших за последний день, поделённое на количество участников, вошедших за прошедший месяц. Возвращает %, который указывает «удержание» сообщества. Стремитесь к значению > 20%."
     daily_engaged_users:
       title: "Ежедневно вовлечённые пользователи"
       xaxis: "Дата"
@@ -1580,7 +1555,6 @@ ru:
     manifest_icon: "Изображение, используемое в качестве логотипа на Android-устройствах. Размер будет автоматически изменён до 512 × 512. Если оставить поле пустым, будет использоваться «large_icon»."
     manifest_screenshots: "Скриншоты, демонстрирующие особенности и функциональные возможности приложения, отображаемые на странице с запросом на установку. Все изображения должны быть загружены локально и иметь одинаковые размеры."
     favicon: "Значок сайта, см. <a href='https://ru.wikipedia.org/wiki/Favicon' target='_blank'>https://ru.wikipedia.org/wiki/Favicon</a>. Для корректного отображения должен быть в формате PNG. Размер будет автоматически изменён до 32x32. Если оставить поле пустым, будет использоваться «large_icon»."
-    apple_touch_icon: "Значок, используемый на сенсорных устройствах Apple. Размер будет автоматически изменён до 180x180. Если оставить поле пустым, будет использоваться «large_icon»."
     opengraph_image: "Стандартное изображение opengraph, используемое, если на странице нет другого подходящего изображения. Если оставить поле пустым, будет использоваться «large_icon»."
     twitter_summary_large_image: "Сводная карточка Twitter с большим изображением (должна быть не менее 280 пикселей в ширину, не менее 150 пикселей в высоту и не может быть в формате «svg»). Если оставить поле пустым, обычные метаданные карточки генерируются с использованием «opengraph_image» (если исходное изображение также не в формате «svg»)."
     notification_email: "Отправитель: эл. почта, используемая при отправке всех системных писем. Для успешной отправки писем указанный здесь домен должен иметь правильно настроенные SPF, DKIM и reverse PTR."
@@ -1711,7 +1685,6 @@ ru:
     enable_discourse_connect: "Включить вход через DiscourseConnect (прежнее название — «Discourse SSO») (ВНИМАНИЕ: АДРЕСА ЭЛЕКТРОННОЙ ПОЧТЫ ПОЛЬЗОВАТЕЛЕЙ *ДОЛЖНЫ* ПРОВЕРЯТЬСЯ НА ВНЕШНЕМ САЙТЕ!)"
     verbose_discourse_connect_logging: "Записывать подробную диагностику, связанную с DiscourseConnect, в файл <a href='%{base_path}/logs' target='_blank'>журнала</a>"
     enable_discourse_connect_provider: "Использовать протокол единого входа DiscourseConnect (прежнее название — «Discourse SSO»). Необходимо настроить параметр «discourse_connect_provider_secrets»."
-    discourse_connect_url: "URL-адрес DiscourseConnect (должен содержать http:// или https://)"
     discourse_connect_secret: "Секретный набор символов, используемый для проверки подлинности зашифрованного входа с помощью DiscourseConnect. Минимум 10 символов."
     discourse_connect_provider_secrets: "Список секретных доменов, которые используют DiscourseConnect. Минимум 10 символов. Символ «*» — любой домен или часть домена (пример: *.example.com)."
     discourse_connect_overrides_bio: "Перезаписывать в профиле информацию о пользователе с последующим запретом на её редактирование"
@@ -1725,7 +1698,6 @@ ru:
     discourse_connect_overrides_profile_background: "Перезаписывать фон шапки профиля значением, используемым в DiscourseConnect."
     discourse_connect_overrides_card_background: "Перезаписывать фон карточки пользователя значением, используемым в DiscourseConnect."
     discourse_connect_not_approved_url: "Перенаправлять неподтверждённые аккаунты DiscourseConnect на этот URL"
-    discourse_connect_allows_all_return_paths: "Не вводить ограничения для параметра «return_paths» на доменное имя, предоставляемое DiscourseConnect (по умолчанию возврат должен осуществляться на текущий сайт)"
     enable_local_logins: "Включить локальные аккаунты на основе имени пользователя и пароля. ВНИМАНИЕ: если параметр отключён, вы не сможете войти в систему, если ранее не был настроен хотя бы один альтернативный метод входа."
     enable_local_logins_via_email: "Разрешать пользователям запрашивать получение ссылки для входа в систему по электронной почте."
     allow_new_registrations: "Разрешать регистрацию новых пользователей. Отключите этот параметр, если вы хотите запретить создавать новые аккаунты."
@@ -1829,7 +1801,6 @@ ru:
     composer_media_optimization_image_bytes_optimization_threshold: "Минимальный размер файла изображения для запуска оптимизации на стороне клиента"
     composer_media_optimization_image_resize_dimensions_threshold: "Минимальная ширина изображения для изменения размера изображения на стороне клиента"
     composer_media_optimization_image_resize_width_target: "Для изображений с шириной больше, чем указано в параметре `composer_media_optimization_image_dimensions_resize_threshold`, ширина будет изменена до указанного здесь значения. Значение должно быть больше или равно параметру `composer_media_optimization_image_dimensions_resize_threshold`."
-    composer_media_optimization_image_encode_quality: "Качество JPEG-кодирования, используемое в процессе оптимизации."
     min_ratio_to_crop: "Отношение, используемое для обрезки высоких изображений. Введите необходимое отношение ширины к высоте."
     simultaneous_uploads: "Максимальное количество файлов, которые можно вставить в редактор."
     default_invitee_trust_level: "Уровень доверия для приглашённых пользователей (от 0 до 4)."
@@ -1858,7 +1829,6 @@ ru:
     tl3_requires_likes_given: "Минимальное количество лайков, которое необходимо поставить за указанный непрерывный период времени (tl3_time_period), чтобы претендовать на уровень доверия 3."
     tl3_requires_likes_received: "Минимальное количество лайков, которое необходимо получить за указанный непрерывный период времени (tl3_time_period), чтобы претендовать на уровень доверия 3."
     tl3_links_no_follow: "Не удалять атрибут «rel=nofollow» из ссылок, публикуемых пользователями с уровнем доверия 3."
-    trusted_users_can_edit_others: "Разрешать пользователям с высоким уровнем доверия редактировать контент других пользователей."
     min_trust_to_create_topic: "Минимальный уровень доверия для создания новой темы."
     allow_flagging_staff: "Разрешать пользователям жаловаться на сообщения персонала."
     min_trust_to_edit_wiki_post: "Минимальный уровень доверия, требуемый для редактирования вики-сообщения."
@@ -1894,7 +1864,6 @@ ru:
     title_min_entropy: "Минимальная энтропия, требуемая для названия темы. (Количество уникальных символов, причём некоторые неанглийские буквы могут считаться за 2 символа, а не за 1.)"
     body_min_entropy: "Минимальная энтропия, требуемая для текста нового сообщения. (Количество уникальных символов, причем некоторые неанглийские буквы могут считаться за 2 символа, а не за 1.)"
     allow_uppercase_posts: "Разрешать создавать названия тем и текст сообщений заглавными буквами."
-    max_consecutive_replies: "Максимальное количество сообщений, которые пользователь может создать подряд в теме, после чего у него не будет возможности добавить ещё один ответ."
     enable_filtered_replies_view: 'Кнопка ответов отображает только текущее сообщение и ответы на него — остальные сворачиваются.'
     title_fancy_entities: "В заголовках тем преобразовывать обычные символы ASCII и пунктуацию <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>SmartyPants</a> в объекты HTML"
     min_title_similar_length: "Минимальная длина названия темы, при которой название будет проверено на наличие похожих тем."
@@ -2001,7 +1970,6 @@ ru:
     pop3_polling_password: "Пароль аккаунта POP3 для загрузки эл. писем."
     pop3_polling_delete_from_server: "Удалять электронную почту с сервера. ПРИМЕЧАНИЕ: при отключении этого параметра необходимо вручную очищать почтовый ящик."
     log_mail_processing_failures: "Записывать все ошибки обработки электронной почты в файл <a href='%{base_path}/logs' target='_blank'>журнала</a>"
-    email_in: 'Разрешать пользователям публиковать новые темы по электронной почте (требуется автоматическая или ручная проверка почтового ящика — POP3). Настройте адреса на вкладке «Настройки» каждой категории.'
     email_in_min_trust: "Минимальный уровень доверия, требуемый для создания новых тем через электронные письма."
     email_in_authserv_id: "Идентификатор службы, выполняющей проверку подлинности входящих писем. Подробнее — в теме <a href='https://meta.discourse.org/t/134358'>https://meta.discourse.org/t/134358</a>."
     email_in_spam_header: "Заголовок электронного письма для обнаружения спама."
@@ -2074,22 +2042,17 @@ ru:
     permalink_normalizations: "Применять указанное регулярное выражение перед поиском соответствий в постоянных ссылках, например, выражение: /(topic.*)\\?.*/\\1 удалит подстроку запроса из ссылок. Использование: регулярное выражение + строка. Используйте \\1 и т. д. для доступа к захватам."
     global_notice: "Показывать глобальный постоянно отображаемый баннер со СРОЧНЫМИ (ЧРЕЗВЫЧАЙНЫМИ) сообщениями всем посетителям. Для скрытия баннера удалите его контент (разрешено использование HTML)."
     disable_system_edit_notifications: "Отключить уведомления системы, если включена настройка «download_remote_images_to_local»."
-    disable_category_edit_notifications: "Не уведомлять при перемещении тем в другую категорию."
-    disable_tags_edit_notifications: "Не уведомлять при изменении тегов темы."
     notification_consolidation_threshold: "Максимальное количество уведомлений о полученных лайках или запросах на вступление в группу, после которого уведомления будут объединяться в одно. Для отключения параметра установите это значение в 0."
     likes_notification_consolidation_window_mins: "Количество минут, по прошествии которых уведомления о полученных лайках будут объединяться в одно, если достигнуто пороговое значение (настраивается в параметре `SiteSetting.notification_consolidation_threshold`)."
     automatically_unpin_topics: "Автоматически откреплять полностью прочтённые темы."
     read_time_word_count: "Количество слов, читаемых за минуту, для расчёта предполагаемого времени чтения."
     topic_page_title_includes_category: "<a href='https://developer.mozilla.org/ru/docs/Web/HTML/Element/title' target='_blank'>Элемент заголовка</a> темы включает в себя название категории."
-    native_app_install_banner_ios: "Отображать баннер DiscourseHub на устройствах iOS для обычных пользователей (уровень доверия 1 и выше)."
-    native_app_install_banner_android: "Отображать баннер DiscourseHub на устройствах Android для обычных пользователей (уровень доверия 1 и выше)."
     app_association_android: "Содержимое конечной точки <a href='%{base_path}/.well-known/assetlinks.json'>.well-known/assetlinks.json</a>, используемой для Google Digital Asset Links API."
     app_association_ios: "Содержимое конечной точки <a href='%{base_path}/apple-app-site-association'>apple-app-site-association</a>, используемой для создания универсальных ссылок между этим сайтом и приложениями iOS."
     share_anonymized_statistics: "Передавать анонимную статистику использования."
     auto_handle_queued_age: "По истечении указанного здесь количества дней автоматически обрабатывать сообщения, ожидающие проверки. Жалобы будут игнорироваться. Сообщения в очереди на проверку будут отклоняться. Установите значение в 0, если необходимо отключить этот параметр."
     penalty_step_hours: "Стандартная продолжительность санкций для замороженных и заблокированных пользователей в часах. Первое нарушение по умолчанию принимает первое значение, второе нарушение — второе значение и т. д."
     svg_icon_subset: "Добавить дополнительные значки из коллекции FontAwesome 5, которые вы хотели бы включить в свои ресурсы. Используйте префикс «fa-» для solid-значков, «far-» для regular-значков и «fab-» для brand-значков."
-    max_prints_per_hour_per_user: "Максимальное количество распечаток страницы в час для пользователя. Для отключения параметра установите значение в 0."
     full_name_required: "Обязательно указывать полное имя в профиле пользователя."
     enable_names: "Отображать полное имя пользователя в его профиле, карточке пользователя и в письмах. Отключите этот параметр, если необходимо полностью скрыть полное имя."
     display_name_on_posts: "Отображать полные имена пользователей в их сообщениях в дополнение к @имени_пользователя."
@@ -2110,17 +2073,11 @@ ru:
     allowed_href_schemes: "Схемы, разрешённые в ссылках помимо http и https."
     embed_post_limit: "Максимальное количество встроенных сообщений."
     embed_username_required: "Для создания темы требуется имя пользователя."
-    notify_about_flags_after: "Отправлять личное сообщение модератору, если есть жалобы, не обработанные в течение указанного здесь количества часов. Для отключения параметра установите это значение в 0."
-    show_create_topics_notice: "Если общее количество тем на сайте меньше 5, показывать персоналу сообщение с просьбой создать новые темы."
     delete_drafts_older_than_n_days: "Удалять черновики, которые старше указанного здесь количества дней."
     delete_merged_stub_topics_after_days: "Количество дней, после которого темы, из которых были перемещены все сообщения, будут автоматически удалены. Для отключения параметра установите значение в 0."
-    bootstrap_mode_min_users: "Минимальное количество пользователей, необходимое для отключения специального режима (для отключения этого параметра установите значение в 0)"
     prevent_anons_from_downloading_files: "Запретить анонимным пользователям скачивать вложения."
-    secure_media: "УСТАРЕЛО: параметр будет удалён в Discourse 3.0 — вместо него используйте «secure_uploads»."
     secure_uploads: 'Ограничивать доступ ко ВСЕМ загрузкам (изображения, видео, аудио, текст, PDF, ZIP-файлы и другие). Если включено требования входа, только авторизованные пользователи будут получать доступ к загрузкам. При отключённом параметре загрузки будут недоступны только в личных сообщениях и в закрытых категориях. ВНИМАНИЕ! Этот сложный параметр. Аминистратор, используя его, должен отдавать себе отчёт в своих действиях. См. тему <a target="_blank" href="https://meta.discourse.org/t/-/140017">об ограничении доступа к загружаемому контенту на Meta</a>.'
-    secure_media_allow_embed_images_in_emails: "УСТАРЕЛО: параметр будет удалён в Discourse 3.0 — вместо него используйте «secure_uploads_allow_embed_images_in_emails»."
     secure_uploads_allow_embed_images_in_emails: "Разрешать встраивать изображения с ограниченным доступом в письма, если их размер не превышает значения, указанного в параметре «secure uploads max email embed image size kb»."
-    secure_media_max_email_embed_image_size_kb: "УСТАРЕЛО: параметр будет удалён в Discourse 3.0 — вместо него используйте «secure_uploads_max_email_embed_image_size_kb»."
     secure_uploads_max_email_embed_image_size_kb: "Размер, до которого будут уменьшены встроенные в письма изображения с ограниченным доступом, если включён параметр «secure uploads allow embed in emails». Если этот параметр не включен, это значение не учитывается."
     slug_generation_method: "Метод создания слагов. При выборе «encoded» будет выполняться процентное кодирование строки. При выборе «none» слаги создаваться не будут."
     enable_emoji: "Использовать эмодзи"
@@ -2187,7 +2144,6 @@ ru:
     revoke_api_keys_days: "Количество дней до автоматического отзыва неиспользованного ключа API (0 — никогда)"
     allow_user_api_keys: "Разрешить создание пользовательских API-ключей"
     allow_user_api_key_scopes: "Список областей, разрешённых для пользовательских API-ключей"
-    min_trust_level_for_user_api_key: "Уровень доверия, необходимый для генерации API-ключей пользователя"
     allowed_user_api_auth_redirects: "Разрешённый URL для перенаправления аутентификации для API-ключей пользователя. Подстановочный знак * может использоваться для соответствия любой его части (например, www.example.com/*)."
     allowed_user_api_push_urls: "Разрешённые URL-адреса для отправки на сервер к пользовательскому API"
     expire_user_api_keys_days: "Количество дней до автоматического истечения срока действия API-ключа (0 — никогда)"
@@ -2219,7 +2175,6 @@ ru:
     enable_sitemap: "Создать карту сайта и включить её в файл robots.txt."
     sitemap_page_size: "Количество URL-адресов для включения в каждую страницу карты сайта, максимум 50 000"
     enable_user_status: "(экспериментально) Разрешить пользователям устанавливать собственное сообщение о статусе (эмодзи + описание)."
-    enable_user_tips: "(экспериментально) Отображать советы для новичков, описывающими ключевые функции форума"
     short_title: "Краткое название будет использоваться на домашней странице, в панели запуска и в других местах, где пространство может быть ограничено. Оно должен быть не более 12 символов."
     dashboard_hidden_reports: "Разрешать скрывать отдельные отчёты в панели управления."
     dashboard_visible_tabs: "Закладки, которые будут отображаться в панели управления."
@@ -2236,10 +2191,6 @@ ru:
     suggest_weekends_in_date_pickers: "Отображать выходные (субботу и воскресенье) при выборе даты (отключите этот параметр, если вы используете Discourse только в будние дни, с понедельника по пятницу)."
     splash_screen: "Отображать временный экран загрузки во время загрузки ресурсов сайта"
     navigation_menu: "Какое навигационное меню использовать. Навигация с боковой панелью и заголовком может настраиваться пользователями. Вариант «Старая версия» — для обратной совместимости."
-    default_sidebar_categories: "Выбранные категории по умолчанию будут отображаться в соответствующем разделе боковой панели."
-    default_sidebar_tags: "Выбранные теги по умолчанию будут отображаться в соответствующем разделе боковой панели."
-    enable_new_user_profile_nav_groups: "ЭКСПЕРИМЕНТАЛЬНО: для пользователей выбранных групп будет отображаться новое меню навигации профиля пользователя."
-    enable_experimental_topic_timeline_groups: "ЭКСПЕРИМЕНТАЛЬНО: для пользователей выбранных групп будет отображаться обновленная шкала времени"
     enable_experimental_hashtag_autocomplete: "ЭКСПЕРИМЕНТАЛЬНО: новая система автодополнения #хештегов для категорий и тегов, которая отображает выбранный элемент иначе и улучшает поиск"
     errors:
       invalid_css_color: "Недопустимый цвет. Введите название цвета или шестнадцатеричное значение."
@@ -2266,7 +2217,6 @@ ru:
       pop3_polling_password_is_empty: "Перед включением проверки почты по POP3 нужно установить «pop3 polling password»."
       pop3_polling_authentication_failed: "Ошибка аутентификации POP3. Проверьте учетные данные POP3."
       reply_by_email_address_is_empty: "Перед включением возможности ответа по эл. почте нужно указать значение «ответить по адресу электронной почты»."
-      email_polling_disabled: "Перед включением ответа по эл. почте необходимо включить проверку почты вручную или через POP3."
       user_locale_not_enabled: "Перед включением данной настройки необходимо включить «allow user locale»."
       personal_message_enabled_groups_invalid: "Для этого параметра необходимо указать хотя бы одну группу. Если вы не хотите, чтобы кто-либо, кроме сотрудников, отправлял личные сообщения, выберите группу сотрудников."
       invalid_regex: "Регулярное выражение недействительно или не разрешено."
@@ -2275,7 +2225,6 @@ ru:
       staged_users_disabled: "Перед включением этого параметра необходимо включить параметр «Сымитированные пользователи»."
       reply_by_email_disabled: "Перед включением этого параметра необходимо включить параметр «Ответить по электронной почте»."
       discourse_connect_url_is_empty: "Перед включением этого параметра необходимо настроить параметр «discourse connect url»."
-      discourse_connect_invite_only: "Нельзя одновременно включить DiscourseConnect и регистрировать пользователей на форуме только через приглашения."
       enable_local_logins_disabled: "Перед включением этого параметра необходимо включить параметр «Включить локальные аккаунты»."
       min_username_length_exists: "Вы не можете установить минимальную длину имени пользователя более самого короткого (%{username})."
       min_username_length_range: "Нельзя установить минимум больше максимума."
@@ -2297,7 +2246,6 @@ ru:
       search_tokenize_japanese_enabled: "Перед включением этого параметра нужно отключить «search_tokenize_japanese»."
       discourse_connect_cannot_be_enabled_if_second_factor_enforced: "Нельзя включить DiscourseConnect, если принудительно включена двухфакторная аутентификация."
       delete_rejected_email_after_days: "Значение этого параметра не может быть меньше значения «delete_email_logs_after_days» или больше %{max}."
-      invalid_uncategorized_category_setting: "«Без категории» выбрать нельзя, если не разрешено оставлять темы без указания категории"
     placeholder:
       discourse_connect_provider_secrets:
         key: "www.example.com"
@@ -2532,7 +2480,6 @@ ru:
     activated_by_staff: "Включено персоналом"
     new_user_typed_too_fast: "Новый пользователь набирает текст слишком быстро"
     content_matches_auto_silence_regex: "Контент соответствует регулярному выражению автоматической заморозки первых сообщений"
-    content_matches_auto_block_regex: "Контент соответствует регулярному выражению автоматической блокировки"
     username:
       short: "минимум символов: %{min}"
       long: "максимум символов: %{max}"
@@ -3276,14 +3223,6 @@ ru:
     user_automatically_silenced:
       title: "Автоматическая заморозка пользователя"
       subject_template: "Новый пользователь %{username} заморожен из-за жалоб сообщества"
-      text_body_template: |
-        Это автоматическое извещение.
-
-        Новый пользователь [%{username}](%{user_url}) был автоматически заморожен, поскольку несколько пользователей пожаловались на сообщения %{username}.
-
-        Просмотрите [список жалоб](%{base_url}/admin/flags). Если пользователь %{username} был заморожен по ошибке, нажмите кнопку «Разморозить» на [странице администратора для этого пользователя](%{user_url}).
-
-        Максимальное количество жалоб и пожаловавшихся для автозаморозки пользователя может быть изменено через настройки сайта `silence_new_user`.
     spam_post_blocked:
       title: "Спам заблокирован"
       subject_template: "Сообщения нового пользователя %{username} заблокированы из-за повторяющихся ссылок"
@@ -3319,15 +3258,6 @@ ru:
       title: "Скачивание изображений со сторонних доменов отключено"
       subject_template: "Загрузка копий изображений на сервер была отключена"
       text_body_template: "Настройка `download_remote_images_to_local` была отключена, поскольку диск заполнился до отметки, указанной в настройке `download_remote_images_threshold`."
-    dashboard_problems:
-      title: "Советы в панели администратора"
-      subject_template: "Новые советы в панели администратора"
-      text_body_template: |
-        У нас есть несколько новых советов и рекомендаций, выданных в результате анализа текущих настроек вашего сайта.
-
-        [Посетите панель администратора](%{base_url}/admin) для их просмотра.
-
-        Если на панели не отображается никакой новой информации, возможно, другой сотрудник уже воспользовался нашими советами. Список действий персонала можно просмотреть в [журнале действий](%{base_url}/admin/logs/staff_action_logs).
     new_user_of_the_month:
       title: "Вы новый пользователь месяца!"
       subject_template: "Вы новый пользователь месяца!"
@@ -3368,9 +3298,6 @@ ru:
       many: "Внимание: мы отправляем максимум %{count} писем в день. На сайте можно посмотреть письма, которые, вероятно, не будут отправлены."
       other: "Внимание: мы отправляем максимум %{count} письма в день. На сайте можно посмотреть письма, которые, вероятно, не будут отправлены."
     in_reply_to: "В ответ на"
-    unsubscribe:
-      title: "Отписаться"
-      description: "Не заинтересованы в получении данных писем? Нет проблем! Нажмите на ссылку ниже, чтобы немедленно отписаться от рассылки:"
     reply_by_email: "Для ответа [посетите эту тему](%{base_url}%{url}) или ответьте на это письмо."
     reply_by_email_pm: "[Откройте сообщение](%{base_url}%{url}) или ответьте на это письмо от %{participants}."
     only_reply_by_email: "Ответьте на это письмо по электронной почте."
@@ -3669,7 +3596,6 @@ ru:
       liked_received: "Полученные лайки"
       new_users: "Новые пользователи"
       popular_topics: "Популярные темы"
-      follow_topic: "Следить за этой темой"
       join_the_discussion: "Читать далее"
       popular_posts: "Популярные сообщения"
       more_new: "Новинки"
@@ -3872,15 +3798,6 @@ ru:
   offline:
     title: "Не удаётся загрузить приложение"
     offline_page_message: "Вы не в сети. Проверьте сетевое подключение и попробуйте снова."
-  login_required:
-    welcome_message: |
-      ## [Добро пожаловать на сайт %{title}](#welcome)
-      Требуется авторизация. Создайте новый аккаунт или войдите в существующий.
-    welcome_message_invite_only: |
-      ## [Добро пожаловать на сайт %{title}](#welcome)
-      Требуется авторизация. Попросите участника форума пригласить вас или используйте существующий аккаунт для входа на сайт.
-  deleted: "удалено"
-  image: "изображение"
   upload:
     edit_reason: "изображения скачаны и сохранены локально"
     unauthorized: "Вы не можете загрузить файл данного типа (разрешённые типы файлов: %{authorized_extensions})."
@@ -4081,262 +3998,8 @@ ru:
       Да, юридический язык — это скучно, но мы должны защитить себя, и, соответственно, вас и ваши данные от недружелюбных действий. У нас есть [Условия использования](%{base_path}/tos), в которых описывается ваше (и наше) поведение и права относительно контента, конфиденциальности и законов. Чтобы пользоваться этим сервисом, вы должны согласиться на соблюдение наших [Условий использования](%{base_path}/tos).
   tos_topic:
     title: "Условия использования"
-    body: |
-      Эти условия регулируют использование интернет-форума на сайте <%{base_url}>. Чтобы пользоваться форумом, вы должны согласовать эти условия с компанией %{company_name}, которая управляет форумом.
-
-      Компания может предлагать другие продукты и услуги — на других условиях. Эти условия распространяются только на использование форума.
-
-      Переход:
-
-      - [Важные условия](#heading--important-terms).
-      - [Ваше разрешение на использование форума](#heading--permission).
-      - [Условия использования форума](#heading--conditions).
-      - [Допустимое использование](#heading--acceptable-use).
-      - [Стандарты контента](#heading--content-standards).
-      - [Правоприменение](#heading--enforcement).
-      - [Ваш аккаунт](#heading--your-account).
-      - [Ваш контент](#heading--your-content).
-      - [Ваша ответственность](#heading--responsibility).
-      - [Отказ от ответственности](#heading--disclaimers).
-      - [Пределы ответственности](#heading--liability).
-      - [Обратная связь](#heading--feedback).
-      - [Прекращение действия соглашения](#heading--termination).
-      - [Споры](#heading--disputes).
-      - [Общие положения](#heading--general).
-      - [Контакты](#heading--contact).
-      - [Изменения](#heading--changes).
-
-      <h2 id="heading--important-terms"><a href="#heading--important-terms">Важные условия</a></h2>
-
-      ***Эти условия включают в себя ряд важных положений, которые влияют на ваши права и обязанности, например, отказ от ответственности в разделе [Отказ от ответственности](#heading--disclaimers), ограничения ответственности компании перед вами в разделе [Пределы ответственности](#heading--liability), ваше согласие покрыть компании ущерб, вызванный неправильным использованием форума, — в разделе [Ваша ответственность](#heading--responsibility), а также соглашение об арбитраже споров в разделе [Споры](#heading--disputes).***
-
-      <h2 id="heading--permission"><a href="#heading--permission">Ваше разрешение на использование форума</a></h2>
-
-      При соблюдении этих условий компания даёт вам разрешение на использование форума. Для использования форума необходимо принять эти условия.
-
-      <h2 id="heading--conditions"><a href="#heading--conditions">Условия использования форума</a></h2>
-
-      Ваше разрешение использовать форум зависит от следующих условий:
-
-      1. Вам должно быть не менее тринадцати лет.
-
-      2. Если компания свяжется с вами напрямую и скажет, что вам запрещается использовать форум, вы не сможете использовать его.
-
-      3. Вы должны использовать форум в соответствии с разделами [Допустимое использование](#heading--acceptable-use) и [Стандарты контента](#heading--content-standards).
-
-      <h2 id="heading--acceptable-use"><a href="#heading--acceptable-use">Допустимое использование</a></h2>
-
-      1. Запрещается нарушать закон, используя форум.
-
-      2. Запрещается использовать или пытаться использовать чужой аккаунт на форуме без специального разрешения этого пользователя.
-
-      3. Запрещается покупать, продавать или иным образом торговать именами пользователей и другими уникальными идентификаторами на форуме.
-
-      4. Запрещается рассылать через форум рекламу, письма счастья и другие приглашения, а также использовать форум для сбора адресов и иных персональных данных для коммерческих списков рассылки и баз данных.
-
-      5. Запрещается автоматизировать доступ к форуму или следить за форумом, например, с помощью поисковых роботов, плагинов и дополнений для браузера, а также иных компьютерных программ, не являющихся веб-браузером. Если у вас есть общедоступная поисковая система, вы можете использовать поисковые роботы для индексации форума.
-
-      6. Запрещается использовать форум для отправки электронных писем в списки рассылки, группы новостей или групповые почтовые псевдонимы.
-
-      7. Запрещается ложно подразумевать, что вы связаны с компанией (являетесь её сотрудником) или ваши действия одобрены ею.
-
-      8. Запрещается ставить гиперссылки на изображения и иной негипертекстовый контент форума на других веб-страницах.
-
-      9. Запрещается удалять знаки, указывающие на право собственности, с материалов, которые вы скачиваете с форума.
-
-      10. Запрещается показывать части форума на других сайтах во фрейме `<iframe>`.
-
-      11. Запрещается отключать, избегать или обходить ограничения защиты или доступа к форуму.
-
-      12. Запрещается нагружать инфраструктуру форума необоснованным объёмом запросов или запросами, направленными на создание необоснованной нагрузки на информационные системы, на основе которых работает форум.
-
-      13. Запрещается выдавать себя за других людей посредством форума.
-
-      14. Запрещается поощрять кого-либо и помогать кому-либо нарушать эти условия.
-
-      <h2 id="heading--content-standards"><a href="#heading--content-standards">Стандарты контента</a></h2>
-
-      1. Запрещается размещать на форуме контент, который является незаконным, оскорбительным или иным образом вредным для других. Это включает в себя контент, который содержит в себе домогательства, является неприемлемым, оскорбительным или разжигающим ненависть.
-
-      2. Запрещается размещать на форуме контент, который нарушает закон, ущемляет чьи-либо права на интеллектуальную собственность, нарушает чью-либо конфиденциальность или нарушает соглашения, которые вы заключили с другими людьми.
-
-      3. Запрещается отправлять на форум контент, содержащий вредоносный компьютерный код, такой как компьютерные вирусы и шпионские программы.
-
-      4. Запрещается отправлять контент на форум в качестве простого заполнителя, чтобы сохранить определённый адрес, имя пользователя или другой уникальный идентификатор.
-
-      5. Запрещается использовать форум для раскрытия информации, которую вы не имеете права раскрывать, например, чужой конфиденциальной или личной информации.
-
-      <h2 id="heading--enforcement"><a href="#heading--enforcement">Правоприменение</a></h2>
-
-      Компания может расследовать и в судебном порядке преследовать нарушения этих условий в полном объеме, установленном законом. Компания может уведомлять правоохранительные органы в случае преследования нарушений закона и этих условий и сотрудничать с этими органами.
-
-      Компания оставляет за собой право изменять, редактировать и удалять контент на форуме по любой причине. Если вы считаете, что кто-то отправил контент на форум в нарушение этих условий, [немедленно свяжитесь с нами](#heading--contact).
-
-      <h2 id="heading--your-account"><a href="#heading--your-account">Ваш аккаунт</a></h2>
-
-      Чтобы использовать некоторые возможности форума, необходима создать аккаунт и войти в него.
-
-      Чтобы создать аккаунт, нужно предоставить некоторую информацию о себе. Если вы создаёте аккаунт, вы соглашаетесь предоставить как минимум действующий адрес электронной почты и поддерживать актуальность этих данных. Закрыть аккаунт можно в любой момент, написав по адресу электронной почты <%{contact_email}>.
-
-      Вы соглашаетесь нести ответственность за все действия, совершённые с использованием вашего аккаунта, независимо от того, санкционированы они вами или нет, до тех пор, пока вы либо не закроете его, либо не уведомите компанию о том, что ваш аккаунт был взломан. Вы согласны немедленно уведомить компанию, если вы подозреваете, что аккаунт был взломан. Вы соглашаешься выбрать надёжный пароль для аккаунта и хранить его в тайне.
-
-      Компания может ограничить, заблокировать или закрыть аккаунт на форуме в соответствии со своей политикой обработки запросов на удаление контента в отношении авторских прав, или если компания обоснованно считает, что вы нарушили какое-либо правило из этих условий.
-
-      <h2 id="heading--your-content"><a href="#heading--your-content">Ваш контент</a></h2>
-
-      Ничто в этих условиях не даёт компании прав собственности на интеллектуальную собственность, которую вы размещаете на форуме, такую как информация о вашем аккаунте, сообщения и иной контент, который вы отправляете на форум. Ничто в этих условиях также не даёт вам никаких прав собственности на интеллектуальную собственность компании.
-
-      В рамках отношений между вами и компанией вы единолично несёте ответственность за контент, который вы отправляете на форум. Вы соглашаетесь не подразумевать ложно, что контент, который вы отправляете на форум, спонсируется или одобрен компанией. Эти условия не обязывают компанию сохранять, хранить или предоставлять копии контента, который вы отправляете, и изменять его в соответствии с этим условиям.
-
-      Контент, который вы отправляете на форум, принадлежит вам, и вы решаете, какое разрешение давать на него другим. Вы как минимум даёте компании лицензию на предоставление контента, который вы отправляете на форум, другим пользователям форума. Эта специальная лицензия позволяет компании копировать, публиковать и анализировать контент, отправляемый вами на форум.
-
-      В случае, если предоставленный вами контент удаляется с форума, будь то вами или компанией, действие специальной лицензии компании заканчивается, когда последняя копия исчезает из резервных копий, кешей и иных систем компании. После удаления отправленного контента могут действовать иные лицензии, которые вы применяете к нему, например [Creative Commons](https://creativecommons.org). Эти лицензии могут дать другим людям или самой компании право снова поделиться вашим контентом через форум.
-
-      Другие пользователи, получающие контент, который вы отправляете на форум, могут нарушать условия, на которых вы его лицензируете. Вы соглашаетесь, что компания не будет нести перед вами ответственность за такие нарушения и их последствия.
-
-      <h2 id="heading--responsibility"><a href="#heading--responsibility">Ваша ответственность</a></h2>
-
-      Вы соглашаетесь возместить компании ущерб от судебных исков других лиц, связанных с вашим нарушением этих условий или нарушением этих условий другими лицами, использующими ваш аккаунт на форуме. И вы, и компания соглашаетесь в кратчайшие сроки уведомить другую сторону о юридических претензиях, по которым вам, возможно, придётся возмещать ущерб компании. Если компания не сможет оперативно уведомить вас о юридической претензии, вам не придётся возмещать компании ущерб, от которого вы могли бы защититься или который могли бы снизить при своевременном уведомлении. Вы соглашаетесь разрешить компании контролировать расследование, защиту и урегулирование юридических претензий, по которым вам пришлось бы возмещать ущерб, и помогать в этих действиях. Компания соглашается не соглашаться на урегулирование, которое признает вашу вину или накладывает на вас обязательства, без вашего предварительного согласия.
-
-      <h2 id="heading--disclaimers"><a href="#heading--disclaimers">Отказ от ответственности</a></h2>
-
-      ***Вы принимаете на себя весь риск использования форума и контента на форуме. Компания и её поставщики предоставляют форум как есть, без каких-либо гарантий, в максимально разрешенной законодательством степени.***
-
-      Форум может содержать гиперссылки и интегрировать форумы и сервисы, управляемые другими сторонами. Компания не даёт никаких гарантий в отношении чужих сервисов и контента, который они могут предоставлять. Использование чужих сервисов может регулироваться другими условиями между вами и теми, кто обеспечивает их работу.
-
-      <h2 id="heading--liability"><a href="#heading--liability">Пределы ответственности</a></h2>
-
-      ***Ни компания, ни её поставщики не будут нести ответственность перед вами за ущерб, причинённый в результате нарушения договора, который их персонал не мог в разумных пределах предвидеть, когда вы соглашались на эти условия.***
-
-      ***Насколько позволяет закон, общая ответственность перед вами по искам любого рода, связанным с форумом или контентом на форуме, будет ограничена 50 $.***
-
-      <h2 id="heading--feedback"><a href="#heading--feedback">Обратная связь</a></h2>
-
-      Компания приветствует ваши отзывы и предложения по работе форума. Способы связаться с нами смотри ниже в разделе [Контакты](#heading--contact).
-
-      Вы соглашаетесь с тем, что компания будет свободно действовать в соответствии с отзывами и предложениями, которые вы предоставите, и что компании не придётся уведомлять вас о том, что ваш отзыв был использован, получать ваше разрешение на его использование или платить вам. Вы соглашаетесь не предоставлять отзывы и предложения, которые, по вашему мнению, могут быть конфиденциальными или являться собственностью, принадлежащей вам или иным сторонам.
-
-      <h2 id="heading--termination"><a href="#heading--termination">Прекращение действия соглашения</a></h2>
-
-      И вы, и компания, можете в любой момент прекратить действие соглашения. Когда действие соглашение завершается, отзывается и ваше разрешение на использование форума.
-
-      Следующие положения остаются в силе после окончания действия соглашения: [Ваш контент](#heading--your-content), [Обратная связь](#heading--feedback), [Ваша ответственность](#heading--responsibility), [Отказ от ответственности](#heading--disclaimers), [Пределы ответственности](#heading--liability) и [Общие положения](#heading--general).
-
-      <h2 id="heading--disputes"><a href="#heading--disputes">Споры</a></h2>
-
-      Споры, связанные с этими условиями и использованием форума вами, регулируются следующим законодательством: %{governing_law}.
-
-      Вы и компания согласны добиваться судебных запретов, связанных с этими условиями, только в государственном или федеральном суде в следующем месте: %{city_for_disputes}. Ни вы, ни компания не будут возражать, чтобы эти суды были местом отправления правосудия, ведения процесса или рассмотрения дела.
-
-      ***Вы и компания будете решать споры путем обязательного арбитража Американской арбитражной ассоциации, за исключением исков о судебном запрете или исков по Закону о компьютерном мошенничестве и злоупотреблении. Арбитраж будет следовать Правилам коммерческого арбитража ААА и Дополнительным процедурам для споров, связанных с потребителями. Арбитраж будет происходить здесь: %{city_for_disputes}. Вы будете разрешать спор как частное лицо, не в рамках коллективного иска или другого представительного разбирательства, будь то в качестве истца или члена группы. Арбитры не будут объединять споры с другим арбитражем без разрешения компании.***
-
-      В арбитражное решение будут включены расходы на арбитраж, обоснованные гонорары адвокатов и расходы на свидетелей. Вы и компания можете выносить арбитражные решения в любом суде соответствующей юрисдикции.
-
-      <h2 id="heading--general"><a href="#heading--general">Общие положения</a></h2>
-
-      Если положение этих условий неисполнимо в том виде, в котором оно написано, но его можно изменить таким образом, чтобы оно стало исполнимым, то такое положение должно быть изменено в минимальной степени, необходимой для того, чтобы сделать его исполнимым. В противном случае это положение должно быть удалено.
-
-      Запрещается переуступать своё соглашение с компанией. Компания может переуступить ваше соглашение своему филиалу, иной компании, которая получает контроль над ней, а также любой другой компании, которая покупает ее активы, связанные с форумом. Попытка переуступки вопреки этим условиям не имеет юридической силы.
-
-      Ни осуществление прав по данному соглашению, ни отказ от применения мер в отношении нарушения данного соглашения не отменяют применимость мер в отношении иных нарушений данного соглашения.
-
-      Эти условия представляют собой все условия соглашения между вами и компанией об использовании форума. Эти условия полностью заменяют любые иные соглашения об использовании форума вами, письменные и устные.
-
-      <h2 id="heading--contact"><a href="#heading--contact">Контакты</a></h2>
-
-      Уведомлять компанию по этим условиям и отправлять вопросы можно по адресу <%{contact_email}>.
-
-      Компания может уведомлять вас в соответствии с этими условиями по адресу электронной почты, который вы указали для аккаунта на форуме, или разместив сообщение на главной странице форума или странице аккаунта.
-
-      <h2 id="heading--changes"><a href="#heading--changes">Изменения</a></h2>
-
-      Компания последний раз обновляла эти условия 12 июля 2018 г. и может обновить их снова. Компания будет публиковать все изменения на форуме. В отношении существенных изменений компания соглашается отправлять вам письма по электронной почте, если вы создали аккаунт и указали действующий адрес электронной почты. Компания также может объявлять об изменениях с помощью специальных сообщений или оповещений на форуме.
-
-      Как только вы получите уведомление об изменении этих условий, вы должны согласиться с новыми условиями, чтобы продолжать пользоваться форумом.
   privacy_topic:
     title: "Политика конфиденциальности"
-    body: |
-      <a name="collect"></a>
-
-      ## [Собираемая информация](#collect)
-
-      Мы собираем информацию от вас, когда вы регистрируетесь на нашем сайте, и собираем данные, когда вы участвуете в работе форума, читая, публикуя и оценивая контент, которым здесь делятся.
-
-      При регистрации на сайте вас могут попросить ввести своё имя и адрес электронной почты. Однако вы можете посещать наш сайт без регистрации. Ваш адрес электронной почты будет проверен с помощью письма, содержащего уникальную ссылку. Если эта ссылка будет открыта, мы будем знать, что вы контролируете адрес электронной почты.
-
-      При регистрации и размещении сообщений мы фиксируем IP-адрес, с которого пришло сообщение. Мы также можем сохранять журналы сервера, которые включают в себя IP-адрес каждого запроса к нашему серверу.
-
-      <a name="use"></a>
-
-      ## [Цели сбора информации](#use)
-
-      Информация, которую мы собираем от вас, может быть использована одним из следующих способов:
-
-      * Для персонализации функций: ваша информация помогает нам лучше реагировать на ваши индивидуальные потребности.
-      * Для улучшения нашего сайта: мы постоянно стремимся улучшить предложения нашего сайта на основе информации и отзывов, которые мы получаем от вас.
-      * Для улучшения обслуживания клиентов: ваша информация помогает нам более эффективно отвечать на ваши запросы и потребности в поддержке.
-      * Для периодической отправки электронных писем: указанный вами адрес электронной почты может использоваться для отправки информации, уведомлений по вашему запросу об изменениях в темах или в ответ на ваше имя пользователя, ответов на запросы и (или) другие просьбы и вопросы.
-
-      <a name="protect"></a>
-
-      ## [Защита вашей информации](#protect)
-
-      Мы применяем различные меры безопасности для поддержания безопасности вашей личной информации, когда вы вводите, отправляете или получаете доступ к своей личной информации.
-
-      <a name="data-retention"></a>
-
-      ## [Политика хранения данных](#data-retention)
-
-      Мы будем прилагать разумные усилия, чтобы:
-
-      * Сохранять журналы сервера, содержащие IP-адрес всех запросов к этому серверу, не более 90 дней.
-      * Хранить IP-адреса, связанные с зарегистрированными пользователями и их сообщениями, не более 5 лет.
-
-      <a name="cookies"></a>
-
-      ## [Использованием файлов cookie](#cookies)
-
-      Мы используем файлы cookie — это небольшие файлы, которые сайт или его поставщик услуг передаёт на жесткий диск компьютера через веб-браузер (если вы разрешили). Эти файлы позволяют сайту распознать браузер и связать его с зарегистрированным аккаунтом (если он у вас есть).
-
-      Мы используем файлы cookie, чтобы узнавать и сохранять ваши предпочтения для будущих посещений и собирать совокупные данные о посещаемости сайта и взаимодействии с ним. Это позволит нам в будущем предложить лучшие возможности и инструменты сайта. Мы можем заключать контракты со сторонними поставщиками услуг, чтобы лучше понимать действия посетителей сайта. Этим поставщикам услуг не разрешается использовать информацию, собранную от нашего имени, кроме как для помощи нам в ведении и улучшении нашего бизнеса.
-
-      <a name="disclose"></a>
-
-      ## [Раскрытие информации сторонним лицам](#disclose)
-
-      Мы не продаём, не торгуем и не передаём сторонним лицам вашу персонально идентифицируемую информацию. Это не касается доверенных третьих лиц, которые помогают нам в работе нашего сайта, ведении бизнеса или обслуживании вас, при условии, что эти лица согласны сохранять конфиденциальность этой информации. Мы также можем раскрыть вашу информацию, если считаем, что это необходимо для соблюдения закона, соблюдения политик нашего сайта или защиты наших и чужих прав, собственности или безопасности. Однако неличная информация о посетителях может быть предоставлена другим сторонам для маркетинга, рекламы или других целей.
-
-      <a name="third-party"></a>
-
-      ## [Сторонние ссылки](#third-party)
-
-      Иногда мы по собственному усмотрению можем включать или предлагать сторонние продукты или услуги на нашем сайте. Эти сторонние сайты имеют отдельную политику конфиденциальности, не зависящую от нас. Поэтому мы не несём никакой ответственности за содержание и деятельность сайтов, на которые ведут ссылки. Тем не менее мы стремимся защитить целостность нашего сайта и приветствуем отзывы об этих сайтах.
-
-      <a name="coppa"></a>
-
-      ## [Соблюдение закона о защите конфиденциальности детей в Интернете](#coppa)
-
-      Наш сайт, продукты и услуги предназначены для лиц не моложе 13 лет. Если этот сервер находится в США, а вам меньше 13 лет, то в соответствии с требованиями COPPA ([Children's Online Privacy Protection Act](https://ru.wikipedia.org/wiki/Children’s_Online_Privacy_Protection_Act)) вам запрещено пользоваться этим сайтом.
-
-      <a name="online"></a>
-
-      ## [Политика конфиденциальности информации в Интернете](#online)
-
-      Эта политика конфиденциальности распространяется только на информацию, собранную через наш сайт, и не распространяется на информацию, собранную офлайн.
-
-      <a name="consent"></a>
-
-      ## [Ваше согласие](#consent)
-
-      Используя наш сайт, вы соглашаетесь с политикой конфиденциальности нашего сайта.
-
-      <a name="changes"></a>
-
-      ## [Изменения в политике конфиденциальности](#changes)
-
-      Если мы решим изменить политику конфиденциальности, мы опубликуем эти изменения на этой странице.
-
-      Этот документ имеет лицензию CC-BY-SA. Последний раз он был обновлён 31 мая 2013 года.
   badges:
     mass_award:
       errors:
@@ -4653,10 +4316,7 @@ ru:
       message: "<p>Мы повторно отправили письмо для активации на адрес <b>%{email}</b>"
   safe_mode:
     title: "Войти в безопасный режим"
-    description: "Безопасный режим позволяет протестировать сайт без загрузки плагинов и тем."
     no_themes: "Отключить темы и компоненты тем"
-    no_unofficial_plugins: "Отключить неофициальные плагины"
-    no_plugins: "Отключить все плагины"
     enter: "Войти в безопасный режим"
     must_select: "Для перехода в безопасный режим необходимо выбрать хотя бы один параметр."
   wizard:
@@ -4771,7 +4431,6 @@ ru:
           <p>Хорошего дня и удачи <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>в создании нового сообщества</a>!</p>
   search_logs:
     graph_title: "Количество поисковых запросов"
-  joined: "Регистрация"
   discourse_push_notifications:
     popup:
       mentioned: '%{username} упомянул(а) вас в теме «%{topic}» —%{site_title}'
@@ -4836,50 +4495,30 @@ ru:
         category: настройки категории
     actions:
       agree:
-        title: "Согласиться…"
-      agree_and_keep:
-        title: "Оставить сообщение"
-        description: "Согласиться с жалобой, но оставить сообщение без изменений."
-      agree_and_keep_hidden:
-        title: "Оставить сообщение скрытым"
-        description: "Согласиться с жалобой и оставить сообщение скрытым"
+        title: "Да"
       agree_and_suspend:
-        title: "Заблокировать пользователя"
         description: "Согласиться с жалобой и заблокировать пользователя."
       agree_and_silence:
         title: "Заморозка пользователя"
         description: "Согласиться с жалобой и заморозить пользователя."
       agree_and_restore:
-        title: "Восстановить сообщение"
         description: "Восстановить сообщение, чтобы все пользователи могли его видеть."
-      agree_and_hide:
-        title: "Скрыть сообщение"
-        description: "Скрыть сообщение и автоматически отправить пользователю уведомление с просьбой его отредактировать."
       delete_single:
         title: "Удалить"
       delete:
         title: "Удалить…"
-      delete_and_ignore:
-        title: "Удалить сообщение и игнорировать"
-        description: "Удалить сообщение; если это первое сообщение, удалится вся тема"
       delete_and_ignore_replies:
-        title: "Удалить сообщение + ответы и игнорировать"
-        description: "Удалить сообщение и все ответы на него; если это первое сообщение, удалится вся тема"
         confirm: "Действительно удалить ответы на сообщение?"
-      delete_and_agree:
-        title: "Удалить сообщение и согласиться"
-        description: "Удалить сообщение; если это первое сообщение, удалится вся тема"
       delete_and_agree_replies:
-        title: "Удалить сообщение + ответы и согласиться"
-        description: "Удалить сообщение и все ответы на него; если это первое сообщение, удалится вся тема"
         confirm: "Действительно удалить ответы на сообщение?"
       disagree_and_restore:
-        title: "Отклонить жалобу и восстановить сообщение"
         description: "Восстановить сообщение, чтобы все пользователи могли его видеть."
       disagree:
-        title: "Отклонить"
+        title: "Нет"
       ignore:
         title: "Игнорировать"
+      ignore_and_do_nothing:
+        title: "Ничего не делать"
       approve:
         title: "Одобрить"
       approve_post:
diff --git a/config/locales/server.sk.yml b/config/locales/server.sk.yml
index c64e885d541..b325a43bf94 100644
--- a/config/locales/server.sk.yml
+++ b/config/locales/server.sk.yml
@@ -998,7 +998,6 @@ sk:
     embed_truncate: "Orezať vkladané príspevky."
     embed_post_limit: "Maximálny počet príspevkov na vloženie."
     embed_username_required: "Na vytvorenie téme je vyžadované používateľské meno."
-    show_create_topics_notice: "Zobraz výzvu žiadajúcu administrátorov o vytvorenie nejakých tém, ak majú stránky menej ako 5 verejných tém."
     delete_drafts_older_than_n_days: "Vymazať návrhy staršie ako (n) dní."
     slug_generation_method: "Vybrať metódu generovania koncovej časti adresy. 'encoded' vygeneruje percentami zakódovaní reťazec. 'none' vypne koncovú časť adresy úplne."
     enable_emoji: "Zapnúť emoji"
@@ -1016,7 +1015,6 @@ sk:
     default_categories_watching: "Štandardný zoznam kategórií, ktoré sú pozerané."
     default_categories_tracking: "Štandardný zoznam kategórií, ktoré sú sledované."
     default_categories_muted: "Štandardný zoznam kategórií, ktoré sú vypnuté."
-    min_trust_level_for_user_api_key: "Stupeň dôvery potrebný na generovanie používateľských API kľúčov"
     min_trust_to_create_tag: "Minimálny stupeň dôvery potrebný na vytvorenie štítku"
     min_trust_level_to_tag_topics: "Minimálny stupeň dôvery potrebný na štítkovanie tém"
     errors:
@@ -1226,9 +1224,6 @@ sk:
   subject_pm: "[PM]"
   user_notifications:
     previous_discussion: "Prechádzajúce odpovede"
-    unsubscribe:
-      title: "Odhlásiť"
-      description: "Nezaujímajú Vás už tieto emaily? Žiadny problém! Pre okamžité odhlásenie kliknite nižšie: "
     posted_by: "Príspevok od %{username} dňa %{post_date}"
     user_posted_pm_staged:
       subject_template: "%{optional_re}%{topic_title}"
@@ -1251,8 +1246,6 @@ sk:
     see_more: "Viac"
     search_title: "Prehľadať tieto stránky"
     search_button: "Hľadať"
-  deleted: "vymazané"
-  image: "Obrázok"
   upload:
     edit_reason: "stiahnuté lokálne kópie obrázkov"
     unauthorized: "Ľutujeme, súbor, ktorý sa pokúšate nahrať nemá povolenú príponu (povolené prípony sú: %{authorized_extensions})."
@@ -1298,7 +1291,6 @@ sk:
     title: "Podmienky používania"
   privacy_topic:
     title: "Ochrana súkromia"
-    body: "<a name=\"collect\"></a>\n\n## [Aký druh údajov získavame?](#collect)\n\nPo tom, ako sa zaregistrujete na tejto webovej lokalite, získavame vaše údaje, keď sa zúčastňujete fóra čítaním, prispievaním, písaním a hodnotením zdieľaného obsahu. \nPri registrácií na našej webovej lokalite vás môžeme požiadať o zadanie vášho mena a e-mailovej adresy. Našu webovú lokalitu je možné navštevovať aj bez registrácie. Vaša e-mailová adresa bude overená potvrdzovacím e-mailom, ktorý bude obsahovať jednorazový odkaz. Kliknutím naň potvrdíte, že ste používateľom zadanej e-mailovej adresy. \nPri registrácií a uverejňovaní príspevkov zaznamenávame IP adresu, z ktorej bol príspevok odoslaný. Rovnako môžeme uchovať údaje zo serverov, ktoré obsahujú IP adresu pre každú žiadosť odoslanú na náš server.\n\n<a name=\"use\"></a>\n\n## [Na čo tieto údaje využívame?](#use)\n\nAkékoľvek údaje, ktoré o vás získame, môžu byť využité nasledovne:\n\n* Na personalizáciu obsahu – údaje o vás nám pomáhajú lepšie reagovať na vaše individuálne potreby\n* Na vylepšenie webovej lokality – neustále pracujeme na zlepšovaní ponuky našej webovej lokality na základe vašich údajov a spätnej väzby\n* Na zlepšenie zákazníckych služieb – vaše údaje nám pomáhajú efektívnejšie reagovať na používateľské požiadavky a prípadnú zákaznícku podporu\n* Na odosielanie pravidelných e-mailov – vami uvedená e-mailová adresa môže byť použitá na rozposielanie informácií, vami zvolených upozornení na zmeny v obsahu jednotlivých tém, prípadne na správy smerujúce na vaše používateľské konto, odpovede na vaše otázky alebo požiadavky. \n\n<a name=\"protect\"></a>\n\n## [Ako u nás funguje ochrana údajov?](#protect)\n\nVyužívame rôzne ochranné opatrenia, aby sme zaručili ochranu vašich osobných údajov po tom, ako ich uvediete alebo si k nim vyžiadate prístup.\n\n<a name=\"data-retention\"></a>\n\n## [Ako osobné údaje uchovávame?](#data-retention)\n\nBudeme sa snažiť: \nUchovať údaje zo servera, ktoré obsahujú IP adresu všetkých žiadostí na tento server, maximálne po dobu 90 dní.\nUchovať IP adresy spojené s registrovanými používateľmi a ich príspevkami maximálne po dobu 5 rokov. \n\n<a name=\"cookies\"></a>\n\n## [Používame cookies?](#cookies)\n\nÁno. Cookies sú malé súbory, ktoré webová lokalita alebo jej poskytovateľ služieb uloží na harddisk vášho počítača pomocou internetového prehliadača (pokiaľ to povolíte). Cookies umožňujú webovej lokalite rozpoznať váš prehliadač a pokiaľ máte založený účet, tak ho s ním prepoja. \nPoužívame cookies by sme mohli identifikovať a uložiť vaše preferencie pre budúce návštevy webovej lokality a zhromaždiť súbor údajov o návštevnosti a interakciách webovej lokality, aby sme v budúcnosti mohli zabezpečiť lepšiu používateľskú skúsenosť a nástroje. Môžeme tiež kontaktovať poskytovateľa služieb, ktorý nám ako tretia strana pomôže lepšie porozumieť preferenciám návštevníkom našej webovej lokality. Takýto poskytovateľ služieb má dovolené v našom mene narábať s nami získanými údajmi výhradne za účelom zlepšenia našich služieb. \n\n<a name=\"disclose\"></a>\n\n## [Sprístupňujeme informácie tretím stranám?](#disclose)\n\nNeobchodujeme, nevymieňame a žiadnym iným spôsobom neposúvame tretím stranám informácie, ktoré je možné priradiť k vašej osobe. Výnimkou sú dôverné tretie strany, ktoré nám pomáhajú s prevádzkovaním našej webovej aktivity, našimi aktivitami alebo s poskytovaním služieb používateľom a ktoré sa zaviazali, že s týmito údajmi budú zaobchádzať dôverne. Informácie môžeme uverejniť v prípadoch, keď je to v súlade so zákonom, vymáhaním pravidiel našich stránok, s ochranou našich práv alebo práv iných, ako aj s ochranou majetku a bezpečnosti. Údaje, ktoré nemožno spojiť s konkrétnou osobou môžu byť poskytnuté tretím stranám na marketingové, reklamné alebo iné účely. \n\n<a name=\"third-party\"></a>\n\n## [Prepojenia tretích strán](#third-party)\n\nPríležitostne a podľa nášho uváženia môžeme na našej webovej lokalite uverejňovať produkty a služby tretích strán. Tieto tretie strany majú svoje vlastné, nezávislé podmienky o ochrane údajov a preto nenesieme žiadnu zodpovednosť za obsah a aktivity týchto strán. V každom prípade nám však ide o ochranu integrity našej webovej lokality a preto uvítame akúkoľvek spätnú väzbu týkajúcu sa týchto strán. \n\n<a name=\"coppa\"></a>\n\n## [Rešpektovanie zákona o ochrane súkromia detí v rámci online režimov](#coppa)\n\nVšetky produkty a služby na našej webovej lokalite sú určené osobám vo veku minimálne 13 rokov. Pokiaľ je tento server v USA a vy máte menej ako 13 rokov, vzhľadom na [Zákon o ochrane súkromia detí v rámci online režimov](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act) nesmiete používať túto webovú lokalitu. \n\n<a name=\"online\"></a>\n\n## [Súkromie je chránené len online](#online)\n\nTieto pravidlá ochrany súkromia online platia iba pre informácie, ktoré zozbierala naša webová lokalita a nevzťahuje sa na informácie zozbierané v offline režime.\n\n<a name=\"consent\"></a>\n\n## [Váš súhlas](#consent)\n\nPoužívaním našich stránok súhlasíte s našimi pravidlami o ochrane súkromia. \n\n<a name=\"changes\"></a>\n\n## [Zmeny pravidiel o ochrane súkromia](#changes)\n\nAk sa rozhodneme zaviesť akékoľvek zmeny v oblasti ochrany súkromia, uverejníme túto informáciu na našej webovej lokalite. \nTento dokument je zverejnený s licenciou CC-BY-SA. Posledná úprava bola vykonaná dňa 31. mája 2013.\n"
   badges:
     editor:
       name: Editor
@@ -1403,7 +1395,6 @@ sk:
             placeholder: "https://www.example.com/contact-us"
       invites:
         title: "Pozvite členov"
-  joined: "Vytvorený"
   discourse_push_notifications:
     popup:
       mentioned: '%{username} Vás zmienil v "%{topic}" - %{site_title}'
@@ -1416,16 +1407,12 @@ sk:
     sensitivity:
       disabled: "Vypnuté"
     actions:
-      agree_and_keep:
-        title: "Ponechať príspevok"
-      agree_and_suspend:
-        title: "Suspendovaný užívateľ"
-      agree_and_silence:
-        title: "Tichý užívateľ"
+      agree:
+        title: "Áno"
       delete_single:
         title: "Odstrániť"
       disagree:
-        title: "Nesúhlasiť"
+        title: "Nie"
       approve:
         title: "Schváliť"
       reject_user:
diff --git a/config/locales/server.sl.yml b/config/locales/server.sl.yml
index b1862f6972d..88c85c3e476 100644
--- a/config/locales/server.sl.yml
+++ b/config/locales/server.sl.yml
@@ -282,22 +282,6 @@ sl:
   general_category_name: "Splošno"
   staff_category_name: "Osebje"
   staff_category_description: "Privatna kategorija za diskusije osebja foruma. Teme so vidne samo administratorjem in moderatorjem."
-  discourse_welcome_topic:
-    body: |2
-
-      Prvi odstavek te pripete teme bo viden kot pozdravno sporočilo vsem novim uporabnikom na vaši domači strani. Zato je pomembno!
-
-      **Uredite** to vsebino kot kratek opis vaše skupnosti:
-
-      - Za koga je ta skupnost?
-      - Kaj lahko tukaj najdejo?
-      - Zakaj naj obiskujejo to stran?
-      - Kje lahko preberejo več (povezave, vsebine, ...)?
-
-      <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
-
-      To temo lahko zaprete z administratorsko :wrench: (zgoraj desno ali spodaj), tako da se odgovori ne bodo nabirali pod to objavo.
-  admin_quick_start_title: "PREBERI ME NAJPREJ: Admin vodnik za hitri začetek"
   category:
     replace_paragraph: "(Zamenjajte ta prvi odstavek s kratkim opisom vaše nove kategorije. Ta opis se bo pojavil v izbiri kategorije, tako da poskrbite, da je krajši od 200 znakov.)"
     post_template: "%{replace_paragraph}\n\nUporabite naslednje odstavke za daljši opis and za določitev pravil in vodil te kategorije:\n\n- Zakaj naj uporabniku uporabljajo to kategorijo? Čemu je namenjena?\n\n- Kako se razlikuje od ostalih kategorij, ki jih že imamo?\n\n- Katere teme sodijo v to kategorijo?\n\n- Ali potrebujemo to kategorijo? Ali jo lahko združimo z drugo kategorijo ali podkategorijo?\n"
@@ -1268,14 +1252,6 @@ sl:
     user_automatically_silenced:
       title: "Uporabnik samodejno utišan"
       subject_template: "Nov uporabnik %{username} je utišan zaradi prijav skupnosti"
-      text_body_template: |
-        To je samodejno sporočilo.
-
-        Novi uporabnik [%{username}](%{user_url}) je bil samodejno utišan, ker je več uporabnikov prijavilo prispevke od %{username}.
-
-        [Preverite prijave](%{base_url}/admin/flags). Če je bil uporabnik %{username} po nepotrebnem utišan, kliknite gumb Ukini utišanje uporabnika na [admin strani uporabnika](%{user_url}).
-
-        Ta nastavitev se lahko sprememni preko `silence_new_user` nastavitve.
     spam_post_blocked:
       title: "Neželen prispevek blokiran"
       subject_template: "Prispevek novega uporabnika %{username} je blokiran zaradi ponovljenih povezav"
@@ -1303,9 +1279,6 @@ sl:
       title: "Prenos oddaljenih slik onemogočen"
       subject_template: "Prenos oddaljenih slik onemogočen"
       text_body_template: "Nastavitev `download_remote_images_to_local` je onemogočena, ker je bil dosežena `download_remote_images_threshold` omejitev prostora na disku ."
-    dashboard_problems:
-      title: "Težave nadzorne plošče"
-      subject_template: "Nov nasvet na vaši nadzorni plošči"
     new_user_of_the_month:
       title: "Vi ste nov uporabnik meseca!"
       subject_template: "Vi ste nov uporabnik meseca!"
@@ -1335,9 +1308,6 @@ sl:
       few: "Opozorilo: na dan vam pošljemo največ %{count} e-sporočila. Preverite na forumu tudi preostale, ki vam jih nismo poslali. P.S. Čestitamo za popularnost!"
       other: "Opozorilo: na dan vam pošljemo največ %{count} e-sporočil. Preverite na forumu tudi preostale, ki vam jih nismo poslali. P.S. Čestitamo za popularnost!"
     in_reply_to: "V odgovor na"
-    unsubscribe:
-      title: "Odjavi"
-      description: "Nočete prejemati takšnih e-sporočil? Ni problema! Kliknite spodaj za takojšno odjavo:"
     reply_by_email: "[Pojdi na temo](%{base_url}%{url}) ali odgovori na to e-sporočilo za odgovor."
     reply_by_email_pm: "[Pojdi na sporočilo](%{base_url}%{url}) ali odgovori na to e-sporočilo za odgovor %{participants}."
     only_reply_by_email: "Odgovori na to e-sporočilo za odgovor."
@@ -1559,7 +1529,6 @@ sl:
       liked_received: "Prejeti všečki"
       new_users: "Novi uporabniki"
       popular_topics: "Zanimive teme"
-      follow_topic: "Sledi tej temi"
       join_the_discussion: "Preberi več"
       popular_posts: "Zanimivi prispevki"
       more_new: "Novo za vas"
@@ -1689,15 +1658,6 @@ sl:
     see_more: "Več"
     search_title: "Išči na tem spletnem mestu"
     search_button: "Išči"
-  login_required:
-    welcome_message: |
-      ## [Dobrodošli na %{title}](#welcome)
-      Za dostop morate biti prijavljeni. Registrirajte nov uporabniški račun ali se prijavite za nadaljevanje.
-    welcome_message_invite_only: |
-      ## [Dobrodošli na %{title}](#welcome)
-      Za dostop potrebujete uporabniški račun. Prosite obstoječega uporabnika, da vas povabi ali pa se prijavite za nadaljevanje.
-  deleted: "izbrisano"
-  image: "slika"
   upload:
     edit_reason: "prenos slik v lokalno kopijo"
     unauthorized: "Oprostite, datoteka ki ste jo hoteli naložiti ni podprta (podprte pripone:%{authorized_extensions})."
@@ -2004,7 +1964,6 @@ sl:
                 label: "Kategorije in najboljše teme"
       invites:
         disabled: "Ker so prijave onemogočene, ni možno povabiti nikogar. Nadaljujte na naslednji korak."
-  joined: "Pridružen"
   discourse_push_notifications:
     popup:
       mentioned: '%{username} vas je omenil v "%{topic}" - %{site_title}'
@@ -2039,47 +1998,29 @@ sl:
     conflict: "Prišlo je do konflikta, ki to preprečuje. "
     actions:
       agree:
-        title: "Strinjam se..."
-      agree_and_keep:
-        title: "Ohrani prispevek"
-        description: "Strinjam se z prijavo in pusti prispevek nespremenjen."
+        title: "Ja"
       agree_and_suspend:
-        title: "Suspendiraj uporabnika"
         description: "Strinjam se z prijavo in suspendiraj uporabnika."
       agree_and_silence:
-        title: "Utišaj uporabnika/co"
         description: "Potrdi prijavo in utišaj uporabnika"
       agree_and_restore:
-        title: "Povrni prispevek"
         description: "Povrni prispevek tako da ga lahko vidijo vsi uporabniki"
-      agree_and_hide:
-        title: "Skrij prispevek"
-        description: "Skrij prispevek in samodejno pošlji zasebno sporočilo uporabniku, kjer ga prosiš, da naj spremenijo prispevek."
       delete_single:
         title: "Izbriši"
       delete:
         title: "Izbriši..."
-      delete_and_ignore:
-        title: "Izbriši prispevek in prezri"
-        description: "Izbriši prispevek; če je prvi prispevek, izbriši tudi temo"
       delete_and_ignore_replies:
-        title: "Izbriši prispevek + odgovore in prezri"
-        description: "Izbriši prispevek in vse odgovore; če je prvi prispevek, izbriši tudi temo"
         confirm: "Ali ste prepričani, da hočete izbrisati tudi odgovore na prispevek?"
-      delete_and_agree:
-        title: "Izbriši prispevek in se strinjam"
-        description: "Izbriši prispevek; če je prvi prispevek, izbriši tudi temo"
       delete_and_agree_replies:
-        title: "Izbriši prispevek + odgovore in se strinjam"
-        description: "Izbriši prispevek in vse odgovore; če je prvi prispevek, izbriši tudi temo"
         confirm: "Ali ste prepričani, da hočete izbrisati tudi odgovore na prispevek?"
       disagree_and_restore:
-        title: "Se ne strinjam in povrni prispevek"
         description: "Povrni prispevek tako da ga lahko vidijo vsi uporabniki"
       disagree:
-        title: "Se ne strinjam"
+        title: "Ne"
       ignore:
         title: "Prezri"
+      ignore_and_do_nothing:
+        title: "Ne naredi nič"
       approve:
         title: "Odobri"
       approve_post:
diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml
index 8083670653e..d66aaf77650 100644
--- a/config/locales/server.sq.yml
+++ b/config/locales/server.sq.yml
@@ -795,7 +795,6 @@ sq:
     autohighlight_all_code: "Force apply code highlighting to all preformatted code blocks even when they didn't explicitly specify the language."
     embed_truncate: "Truncate the embedded posts."
     embed_post_limit: "Maximum number of posts to embed."
-    show_create_topics_notice: "If the site has fewer than 5 public topics, show a notice asking admins to create some topics."
     delete_drafts_older_than_n_days: "Delete drafts older than (n) days."
     slug_generation_method: "Choose a slug generation method. 'encoded' will generate percent encoding string. 'none' will disable slug at all."
     enable_emoji: "Enable emoji"
@@ -977,9 +976,6 @@ sq:
   user_notifications:
     previous_discussion: "Përgjigjet e mëparshme"
     in_reply_to: "Në Përgjigje Të"
-    unsubscribe:
-      title: "Çregjistrohuni"
-      description: "Nuk të interesojnë këto emaila? S'ka problem! Kliko më poshtë për të anuluar abonimin:"
     reply_by_email: "[Shiko Temën](%{base_url}%{url}) ose përgjigjju këtij email-i për të postuar."
     only_reply_by_email: "Përgjigjju këtij email-i për të vazhduar."
     visit_link_to_respond: "[Shiko Temën](%{base_url}%{url}) për tu përgjigjur."
@@ -1181,8 +1177,6 @@ sq:
     see_more: "Më shumë"
     search_title: "Kërko në këtë faqe"
     search_button: "Kërko"
-  deleted: "deleted"
-  image: "imazh"
   upload:
     edit_reason: "downloaded local copies of images"
     unauthorized: "Sorry, the file you are trying to upload is not authorized (authorized extensions: %{authorized_extensions})."
@@ -1400,7 +1394,6 @@ sq:
                 label: "Kategoritë dhe temat e zgjedhura"
               categories_and_latest_topics:
                 label: "Kategoritë dhe temat e fundit"
-  joined: "Anëtarësuar"
   discourse_push_notifications:
     popup:
       mentioned: '%{username} ju përmendi në "%{topic}" - %{site_title}'
@@ -1411,12 +1404,12 @@ sq:
       linked: '%{username} vendosi një lidhje për postimin tuaj nga "%{topic}" - %{site_title}'
   reviewables:
     actions:
-      agree_and_suspend:
-        title: "Pezullo anëtarin"
+      agree:
+        title: "Po"
       delete_single:
         title: "Fshij"
       disagree:
-        title: "Jo dakord"
+        title: "Jo"
       approve:
         title: "Aprovo"
       reject_user:
diff --git a/config/locales/server.sr.yml b/config/locales/server.sr.yml
index aeca4235c17..2cc0e855701 100644
--- a/config/locales/server.sr.yml
+++ b/config/locales/server.sr.yml
@@ -381,7 +381,6 @@ sr:
     warn_reviving_old_topic_age: "Kada neko krene da odgovara na temu u kojoj je poslednji odgovor stariji od ovoliko dana, biće prikazano upozorenje. Onemogućite postavljanjem vrednosti 0. "
     autohighlight_all_code: "Forsiraj primenu označavanja koda za sve preformatirane blokove koda i kada nije eksplicitno naveden jezik."
     embed_username_required: "Korisničko ime je obavezno za kreiranje teme."
-    show_create_topics_notice: "Ako sajt ima manje od 5 javnih tema, prikaži poruku koja sugeriše administratorima da kreiraju neke teme."
     delete_drafts_older_than_n_days: "Izbriši radne verzije poruka starije od (n) dana"
     enable_emoji: "Omogući emotikone"
     emoji_set: "Koliko bi ste želeli vas emoji?"
@@ -423,7 +422,6 @@ sr:
   page_not_found:
     see_more: "Više"
     search_button: "Pretraži"
-  image: "slika"
   color_schemes:
     default_theme_name: "zadato"
   csv_export:
@@ -493,7 +491,6 @@ sr:
             placeholder: "Mesto gde Milena i njene prijateljice ćaskaju o kul stvarima"
       finished:
         title: "Vaš Discource je spreman!"
-  joined: "Pridružen"
   reviewables:
     priorities:
       medium: "Srednje"
@@ -502,12 +499,12 @@ sr:
       medium: "Srednje"
       high: "Visoko"
     actions:
-      agree_and_suspend:
-        title: "Suspenduj Korisnika"
+      agree:
+        title: "Da"
       delete_single:
         title: "Obriši"
       disagree:
-        title: "Odbaci"
+        title: "Ne"
       approve:
         title: "Odobri"
       reject_user:
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index fecf0410b7b..874a8d4fc2d 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -52,6 +52,11 @@ sv:
   remove_posts_deleted_by_author: "Borttaget av författaren"
   redirect_warning: "Vi kunde inte verifiera att länken som du valt faktiskt har lagts upp i forumet. Välj länken nedan om du vill fortsätta ändå."
   on_another_topic: "I ett annat ämne"
+  topic_category_changed: "Från %{from} till %{to}"
+  topic_tag_changed:
+    added_and_removed: "Lade till %{added} och tog bort %{removed}"
+    added: "Lade till %{added}"
+    removed: "Tog bort %{removed}"
   inline_oneboxer:
     topic_page_title_post_number: "Nr %{post_number}"
     topic_page_title_post_number_by_user: "Nr %{post_number} av %{username}"
@@ -191,8 +196,8 @@ sv:
       invalid_site_setting: "Det finns ingen inställning med namnet '%{name}'"
       invalid_category_id: "Du angav en kategori som inte finns"
       invalid_choice:
-        one: "Du angav det ogiltiga valet %{name}"
-        other: "Du angav de ogiltiga valen %{name}"
+        one: "'%{name}' är ett ogiltigt val."
+        other: "'%{name}' är ogiltiga val."
       default_categories_already_selected: "Du kan inte välja en kategori som används i en annan lista."
       default_tags_already_selected: "Du kan inte välja en etikett som används i en annan lista."
       s3_upload_bucket_is_required: "Du kan inte aktivera uppladdning till S3 innan du har angivit 's3_upload_bucket'."
@@ -200,7 +205,8 @@ sv:
       page_publishing_requirements: "Sidpublicering kan inte aktiveras om säkra medier är aktiverade."
       s3_backup_requires_s3_settings: "Du kan inte använda S3 som säkerhetskopieringsplats innan du har angivit '%{setting_name}'."
       s3_bucket_reused: "Du kan inte använda samma behållare för 's3_upload_bucket' och 's3_backup_bucket'. Välj en annan behållare eller använd en annan sökväg för varje behållare."
-      secure_uploads_requirements: "S3-uppladdningar måste ha aktiverats innan du aktiverar säkra uppladdningar."
+      secure_uploads_requirements: "S3-uppladdningar och S3 ACL:er måste ha aktiverats innan säkra uppladdningar aktiveras."
+      s3_use_acls_requirements: "Du måste ha S3 ACL:er aktiverade när säkra uppladdningar är aktiverade."
       share_quote_facebook_requirements: "Du måste ange ett Facebook-app-id för att möjliggöra delning av citat på Facebook."
       second_factor_cannot_enforce_with_socials: "Du kan inte tvinga 2FA med sociala inloggningar aktiverade. Du måste först inaktivera inloggning via: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Du kan inte genomdriva 2FA om lokala inloggningar är inaktiverade."
@@ -221,6 +227,10 @@ sv:
         other: "Tyvärr kunde vi inte skapa en förhandsvisning för den här webbsidan eftersom följande oEmbed / OpenGraph-taggar inte kunde hittas: %{missing_attributes}"
   word_connector:
     comma: ", "
+  custom_fields:
+    validations:
+      max_items: "Maximalt antal anpassade fält för denna enhet har uppnåtts (%{max_items_number})"
+      max_value_length: "Maximal längd för ett anpassat fältvärde har uppnåtts (%{max_value_length})"
   invite:
     expired: "Din inbjudningskod har löpt ut. <a href='%{base_url}/about'>Kontakta personalen</a>."
     not_found: "Din inbjudningskod är ogiltig. <a href='%{base_url}/about'>Kontakta personalen</a>."
@@ -239,6 +249,7 @@ sv:
     user_exists: "Det finns ingen anledning att bjuda in <b>%{email}</b>, de har redan ett konto!"
     invite_exists: "Du har redan bjudit in <b>%{email}</b>."
     invalid_email: "%{email} är inte en giltig e-postadress."
+    generic_error_response: "Det uppstod ett problem med din förfrågan."
     rate_limit:
       one: "Du har redan skickat %{count} inbjudan den senaste dagen, vänta %{time_left} innan du försöker igen."
       other: "Du har redan skickat %{count} inbjudningar den senaste dagen, vänta %{time_left} innan du försöker igen."
@@ -400,6 +411,7 @@ sv:
   too_late_to_edit: "Inlägget skapades för långt tillbaka i tiden. Det kan inte längre redigeras eller tas bort."
   edit_conflict: "Det inlägget redigerades av en annan användare och dina ändringar kan inte längre sparas."
   revert_version_same: "Nuvarande version är den samma som du försöker återgå till."
+  reverted_to_version: "återställd till version nr %{version}"
   cannot_edit_on_slow_mode: "Detta ämne är i långsamt läge. För att uppmuntra eftertänksam och övervägd diskussion är det för närvarande inte tillåtet att redigera gamla inlägg i långsamt läge."
   excerpt_image: "bild"
   bookmarks:
@@ -502,6 +514,7 @@ sv:
       Det blir lättare för alla att läsa ämnen som har färre in-på-djupet-svar istället för flera små, individuella svar.
     dominating_topic: Du har skrivit mycket i det här ämnet! Tänk på att ge andra en möjlighet att svara här och diskutera med andra också.
     get_a_room: Du har svarat @%{reply_username} %{count} gånger. Visste du att du istället kunde skicka ett personligt meddelande till henne/honom?
+    dont_feed_the_trolls: Det här inlägget har redan flaggats för moderatorns uppmärksamhet. Är du säker på att du vill svara på det? Svar på negativt innehåll tenderar att uppmuntra till mer negativt beteende.
     too_many_replies: |
       ### Du har nått svarsgränsen för detta ämne
 
@@ -591,7 +604,9 @@ sv:
         translation_overrides:
           attributes:
             value:
-              invalid_interpolation_keys: 'Följande interpolationsnycklar är ogiltiga: "%{keys}"'
+              invalid_interpolation_keys:
+                one: "Följande interpolationsnyckel är ogiltig: %{keys}"
+                other: "Följande interpolationsnycklar är ogiltiga: %{keys}"
         watched_word:
           attributes:
             word:
@@ -612,22 +627,22 @@ sv:
   staff_category_name: "Personal"
   staff_category_description: "Privat kategori för personaldiskussioner. Ämnen är bara synliga för administratörer och moderatorer."
   discourse_welcome_topic:
-    title: "Välkommen till vårt forum!"
-    body: |2
+    title: "Välkommen till %{site_title}! :wave:"
+    body: |
+      Vi är så glada över att du kom till oss.
 
-      Det första stycket i detta fästa ämne kommer att visas som ett välkomstmeddelande för alla nya besökare på din hemsida. Det är viktigt!
+      %{site_info_quote}
 
-      **Ändra detta** till en kort beskrivning av ditt forum:
+      Här är några saker du kan göra för att komma igång:
 
-      -Vem är det till för?
-      -Vad kan de hitta här?
-      -Varför ska de komma hit?
-      -Var kan de läsa mer (länkar, resurser, etc)?
+      :speaking_head: **Presentera dig** genom att lägga till en bild och information om dig själv och dina intressen i [din profil](%{base_path}/my/preferences/account). Vad skulle du vilja få frågor om?
 
-      <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+      :open_book: **Lär känna forumet** genom att [bläddra i diskussioner](%{base_path}/top) som redan pågår här. När du tycker att ett inlägg är intressant, informativt eller underhållande, använd :heart: för att visa din uppskattning eller ditt stöd!
 
-      Det vore kanske bra att stänga det här ämnet via admin :wrench: (längst upp till höger eller i botten), så att inte svar läggs på hög vid ett meddelande.
-  admin_quick_start_title: "LÄS MIG FÖRST: Administratörers Snabbstartsguide"
+      :handshake: **Bidra** genom att kommentera, dela med dig av ditt perspektiv, ställa frågor eller ge feedback i diskussionen. Innan du svarar eller startar nya ämnen bör du läsa igenom [forumets riktlinjer](%{base_path}/faq).
+
+      > Om du behöver hjälp eller har ett förslag, fråga gärna i [#feedback](%{base_path}/c/site-feedback) eller [kontakta administratörerna](%{base_path}/about).
+  admin_quick_start_title: "Administratörsguide: Komma igång"
   category:
     topic_prefix: "Om kategorin %{category}"
     replace_paragraph: "(Byt ut det här första stycket mot en sammanfattad beskrivning av din nya kategori. Den här vägledningen kommer att dyka upp i kategorins urvalsområde, så försök att hålla det kortare än 200 tecken.)"
@@ -646,6 +661,7 @@ sv:
       disallowed_tags_generic: "Detta ämne har otillåtna taggar."
       slug_contains_non_ascii_chars: "innehåller icke-ascii tecken"
       is_already_in_use: "används redan"
+      move_topic_to_category_disallowed: "Du kan inte flytta detta ämne till en kategori där du inte har behörighet att skapa nya ämnen."
     cannot_delete:
       uncategorized: "Denna kategori är speciell. Den är avsedd för att innehålla ämnen som inte har en kategori; den kan inte raderas."
       has_subcategories: "Du kan inte ta bort den här kategorin eftersom den har underkategorier."
@@ -1109,7 +1125,7 @@ sv:
       title: "DAA/MAA"
       xaxis: "Dag"
       yaxis: "DAA/MAA"
-      description: "Antal medlemmar som loggade in den senaste dagen dividerat med antalet medlemmar som loggade in den senaste månaden - returnerar ett procenttal som indikerar forumets 'dragningskraft'. Sikta på > 30 %."
+      description: "Antal medlemmar som loggade in den senaste dagen dividerat med antalet medlemmar som loggade in den senaste månaden - returnerar ett procenttal som indikerar forumets 'dragningskraft'. Sikta på > 20 %."
     daily_engaged_users:
       title: "Dagligen engagerade användare"
       xaxis: "Dag"
@@ -1378,6 +1394,7 @@ sv:
     image_magick_warning: 'Servern är konfigurerad att skapa ikoner av stora bilder, men ImageMagick är inte installerad. Installera ImageMagick med din föredragna pakethanterare eller <a href="https://www.imagemagick.org/script/download.php" target="_blank">hämta den senaste utgåvan</a>.'
     failing_emails_warning: 'Det finns %{num_failed_jobs} e-postutskick som har misslyckats. Kontrollera din app.yml för att säkerställa att serverinställningarna för e-post är korrekta. <a href="%{base_path}/sidekiq/retries" target="_blank">Se alla misslyckade utskick i Sidekiq</a>.'
     subfolder_ends_in_slash: "Inställningarna för dina undermappar är inte korrekt; DISCOURSE_RELATIV_URL_ROOT slutar med ett snedstreck."
+    outdated_translations_warning: "Vissa av dina översättningsåsidosättningar är inaktuella. Kontrollera dina <a href='%{base_path}/admin/customize/site_texts?outdated=true'>textanpassningar</a>."
     email_polling_errored_recently:
       one: "E-postpolling har genererat ett fel de senaste 24 timmarna. Se <a href='%{base_path}/logs' target='_blank'>loggarna</a> för mer detaljer."
       other: "E-postpolling har genererat %{count} fel de senaste 24 timmarna. Se <a href='%{base_path}/logs' target='_blank'>loggarna</a> för mer detaljer."
@@ -1389,6 +1406,8 @@ sv:
     out_of_date_themes: "Uppdateringar finns tillgängliga för följande teman:"
     unreachable_themes: "Vi kunde inte kontrollera uppdateringar för följande teman:"
     watched_word_regexp_error: "Det reguljära uttrycket för '%{action}'-bevakade ord är ogiltigt. Kontrollera dina <a href='%{base_path}/admin/customize/watched_words'>inställningar för bevakade ord</a> eller inaktivera webbplatsinställningen 'Reguljära uttryck för bevakade ord'."
+    v3_analytics_deprecated: "Din Discourse använder för närvarande Google Analytics 3, som inte längre kommer att stödjas efter juli 2023. <a href='https://meta.discourse.org/t/260498'>Uppgradera till Google Analytics 4</a> nu för att fortsätta att få värdefulla insikter i, och analyser av, din webbplats prestanda."
+    legacy_navigation_menu_deprecated: "Din Discourse använder för närvarande den \"äldre\" navigeringsmenyn som <a href='https://meta.discourse.org/t/removing-the-legacy-hamburger-navigation-menu-option/265274'>kommer att tas bort i den första betaversionen av Discourse 3.2</a>. Migrera till den nya navigeringsmenyn genom att uppdatera din <a href='%{base_path}/admin/site_settings/category/all_results?filter=navigation_menu'>webbplatsinställning för navigeringsmenyer</a> till 'sidebar' eller 'header dropdown'."
   site_settings:
     allow_bulk_invite: "Tillåt massinbjudningar genom att ladda upp en CSV-fil"
     disabled: "inaktiverade"
@@ -1454,8 +1473,11 @@ sv:
     fixed_category_positions_on_create: "Kategoriordningen kommer att upprätthållas vid dialogrutan för skapandet av ämnen om den här bockas för (kräver fixed_category_positions)."
     add_rel_nofollow_to_user_content: 'Lägg till rel nofollow på allt användargenererat innehåll, förutom interna länkar (inklusive förälderdomän). Om du ändrar det här så måste du uppdatera alla inlägg med "rake posts:rebake"'
     exclude_rel_nofollow_domains: "En lista av alla domän där nofollow inte bör läggas till länkarna. exempel.se kommer automatiskt tillåta underdomän.exempel.se också. Du bör lägga till top-level-domänen för den här webbplatsen för att hjälpa sökrobotar hitta allt innehåll. Om andra delar av din webbplats finns på andra domäner så bör du lägga till dem också."
+    max_form_template_title_length: "Maximal tillåten längd för formulärmallstitlar."
+    max_form_template_content_length: "Maximal tillåten längd för formulärmallsinnehåll."
     post_excerpt_maxlength: "Maxlängd på ett inläggs utdrag/sammanfattning."
     topic_excerpt_maxlength: "Maxlängd på ett inläggs utdrag/sammanfattning, genererat från det första inlägget i ett ämne."
+    default_subcategory_on_read_only_category: "Aktiverar knappen \"Nytt ämne\" och väljer en standardunderkategori för att göra inlägg i kategorier där användaren inte får skapa ett nytt ämne."
     show_pinned_excerpt_mobile: "Visa utdrag för fästa ämnen i mobilen."
     show_pinned_excerpt_desktop: "Visa utdrag för fästa ämnen på datorn."
     post_onebox_maxlength: "Maximal teckenlängd för ett Discourse-inlägg i onebox."
@@ -1477,7 +1499,7 @@ sv:
     manifest_icon: "Bild som används som logotyp/startbild på Android. Storleken ändras automatiskt till 512 × 512. Om detta lämnas tomt används large_icon."
     manifest_screenshots: "Skärmdumpar som visar dina instansfunktioner och funktionaliteten på dess installationsfrågesida. Alla bilder ska vara lokala uppladdningar, med samma dimensioner."
     favicon: "En favoritikon för din webbplats, se <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>http://en.wikipedia.org/wiki/Favicon</a>. För att fungera korrekt över en CDN måste det vara en png. Storleken ändras automatiskt till 32 x 32. Om detta lämnas tomt används large_icon."
-    apple_touch_icon: "Ikon som används för Apples pekskärmsenheter. Storleken ändras automatiskt till 180 x 180. Om detta lämnas tomt används large_icon."
+    apple_touch_icon: "Ikon som används för Apple-pekskärmsenheter. En transparent bakgrund rekommenderas inte. Storleken ändras automatiskt till 180 x 180. Om detta lämnas tomt används large_icon."
     opengraph_image: "Standard Open Graph bild, används när sidan inte har någon annan lämplig bild. Om detta lämnas tomt används large_icon."
     twitter_summary_large_image: "Twitter-kortets 'summary large image' (bör vara minst 280 i bredd och minst 150 i höjd, kan inte vara .svg). Om den lämnas tom skapas istället vanlig metadata för kort med hjälp av opengraph_image, så länge den inte också är en .svg"
     notification_email: "Avsändaradressen som används vid utskick av system e-post. Domänen som specificeras här måste ha en SPF-, DKIM- och reverse PTR-post korrekt inställd för att e-post ska levereras."
@@ -1493,6 +1515,8 @@ sv:
     summary_percent_filter: "Visa högsta % av inläggen när en användare bockar i 'Sammanfatta det här ämnet'"
     summary_max_results: "Maximalt antal inlägg som returneras av 'Sammanfatta detta ämne'"
     summary_timeline_button: "Visa en \"Sammanfatta\"-knapp på tidslinjen"
+    summarization_strategy: "Ytterligare sätt att sammanfatta innehåll som registrerats av plugins"
+    custom_summarization_allowed_groups: "Grupper som tillåts att sammanfatta innehåll med hjälp av `summarization_strategy`."
     enable_personal_messages: "UTFASAT, använd inställningen \"personal message enabled groups\" istället. Tillåt användare med förtroendenivå 1 (konfigurera genom minsta förtroendenivå för att skicka meddelanden) att skapa meddelanden och svara på meddelanden. Notera att personalen alltid kan skicka meddelanden oavsett."
     personal_message_enabled_groups: "Tillåt användare inom dessa grupper att skapa meddelanden och svara på meddelanden. Förtroendenivågrupper omfattar alla förtroendenivåer över det numret, om till exempel förtroendenivå_1 väljs tillåts också användare på förtroendenivå_2, 3, 4 att skicka PM. Observera att personal alltid kan skicka meddelanden oavsett vad."
     enable_system_message_replies: "Tillåter användare att svara på systemmeddelanden, även om personliga meddelanden har inaktiverats"
@@ -1587,6 +1611,7 @@ sv:
     enable_badges: "Aktivera utmärkelsesystemet"
     max_favorite_badges: "Maximalt antal utmärkelser som användaren kan välja"
     whispers_allowed_groups: "Tillåt privat kommunikation inom ämnen för medlemmar i specificerade grupper."
+    hidden_post_visible_groups: "Tillåt medlemmar i dessa grupper att se dolda inlägg. Personalanvändare kan alltid se dolda inlägg."
     allow_index_in_robots_txt: "Ange i robots.txt att den här webbplatsen får indexeras av webbsökmotorer. I undantagsfall kan du permanent <a href='%{base_path}/admin/customize/robots'>åsidosätta robots.txt</a>."
     blocked_email_domains: "En lista över e-postdomäner, avgränsade med vertikalstreck, som användare inte får registrera konton med. Underdomäner hanteras automatiskt för de angivna domänerna. Jokertecknen * och ? stöds inte. Exempel: mailinator.com|trashmail.net"
     allowed_email_domains: "En lista över e-postdomäner, avgränsade med vertikalstreck, som användare MÅSTE registrera konton med. Underdomäner hanteras automatiskt för de angivna domänerna. Jokertecknen * och ? stöds inte. VARNING: Användare med andra e-postdomäner än de som anges kommer inte att tillåtas!"
@@ -1613,7 +1638,7 @@ sv:
     enable_discourse_connect: "Aktivera inloggning via DiscourseConnect (tidigare 'Discourse SSO') (VARNING: ANVÄNDARES E-POSTADRESSER *MÅSTE* VALIDERAS AV DEN EXTERNA WEBBPLATSEN!)"
     verbose_discourse_connect_logging: "Logga detaljerad DiscourseConnect-relaterad diagnostik i <a href='%{base_path}/logs' target='_blank'>/loggar</a>"
     enable_discourse_connect_provider: "Implementera leverantörsprotokoll för DiscourseConnect (tidigare 'Discourse SSO') vid slutpunkten /session/sso_provider, kräver att discourse_connect_provider_secrets är inställd"
-    discourse_connect_url: "URL till DiscourseConnect-slutpunkt (måste innehålla http:// eller https://)"
+    discourse_connect_url: "DiscourseConnect-slutpunktens URL (måste innehålla http:// eller https:// och får inte innehålla ett avslutande snedstreck)."
     discourse_connect_secret: "Hemlig sträng som används för att kryptografiskt autentisera DiscourseConnect-information, se till att den är 10 tecken eller längre"
     discourse_connect_provider_secrets: "En lista med domänhemliga par som använder DiscourseConnect. Se till att DiscourseConnect-hemligheten är 10 tecken eller längre. Jokertecknet * kan användas för att matcha valfri domän eller bara en del av den (t.ex. * .exempel.com)."
     discourse_connect_overrides_bio: "Åsidosätter användarbiografi i användarprofilen och hindrar användare från att ändra den"
@@ -1627,7 +1652,7 @@ sv:
     discourse_connect_overrides_profile_background: "Åsidosätter användarprofilbakgrund med värde från DiscourseConnect-nyttolast."
     discourse_connect_overrides_card_background: "Åsidosätter användarkortsbakgrund med värde från DiscourseConnect-nyttolast."
     discourse_connect_not_approved_url: "Omdirigera icke-godkända DiscourseConnect-konton till den här URL:en"
-    discourse_connect_allows_all_return_paths: "Begränsa inte domänen för return_paths som tillhandahålls av DiscourseConnect (som standard måste retursökvägen finnas på den aktuella webbplatsen)"
+    discourse_connect_allowed_redirect_domains: "Begränsa till dessa domäner för return_paths som tillhandahålls av DiscourseConnect (som standard måste retursökvägen finnas på den aktuella webbplatsen). Använd * för att tillåta valfri domän för returvägen. Jokertecken för underdomän (`*.foobar.com`) tillåts inte."
     enable_local_logins: "Aktivera konton baserade på lokala användarnamn och lösenordsinloggning. VARNING: om detta har inaktiverats kan du kanske inte logga in om du inte tidigare har konfigurerat minst en alternativ inloggningsmetod."
     enable_local_logins_via_email: "Tillåt användare att begära en engångsinloggningslänk som skickas till dem via e-post."
     allow_new_registrations: "Tillåt nya användarregistreringar. Avbocka detta för att förhindra vem som helst från att skapa ett nytt konto."
@@ -1663,6 +1688,7 @@ sv:
     s3_configure_tombstone_policy: "Aktivera automatisk raderingspolicy för Tombstone uppladdningar. VIKTIGT: Om det är inaktiverat kommer inget utrymme att återtas efter att överföringar har tagits bort."
     s3_disable_cleanup: "Förhindra borttagning av äldre säkerhetskopior från S3 när det finns fler säkerhetskopior än högsta tillåtna."
     enable_s3_inventory: "Generera rapporter och verifiera uppladdningar med Amazon S3 inventering. VIKTIGT: kräver giltiga S3-referenser (både åtkomstnyckel-ID och hemlig åtkomstnyckel)."
+    s3_use_acls: "AWS rekommenderar att inte använda ACL:er på S3-behållare. Om du följer detta råd ska det här alternativet avmarkeras. Det måste vara aktiverat om du använder säkra uppladdningar."
     backup_time_of_day: "UTC-tid på dygnet då säkerhetskopieringen sker."
     backup_with_uploads: "Inkludera uppladdning i schemalagda säkerhetskopieringar. Inaktivering av det här kommer endast att säkerhetskopiera databasen."
     backup_location: "Plats där säkerhetskopior lagras. VIKTIGT: S3 kräver giltiga S3-referenser som anges i Fil-inställningarna."
@@ -1712,6 +1738,7 @@ sv:
     s3_secret_access_key: "Amazons hemliga S3-åtkomstnyckel-ID som kommer att användas för att ladda upp bilder, bilagor och säkerhetskopior."
     s3_region: "Regionsnamn för Amazon S3 som kommer att användas för att ladda upp bilder och säkerhetskopior."
     s3_cdn_url: "CDN URL som används för alla S3-tillgångar (till exempel: https://cdn.somewhere.com). VARNING: efter ändring av den här inställningen så måste du uppdatera alla gamla inlägg med rake posts: rebake."
+    s3_use_cdn_url_for_all_uploads: "Använd CDN-URL för alla filer som laddas upp till s3 istället för endast för bilder."
     avatar_sizes: "Lista över automatiskt genererade avatar-storlekar."
     external_system_avatars_enabled: "Använd externt system för avatar-tjänster."
     external_system_avatars_url: "URL till externt system för avatar-tjänster. Tillåtna ersättningar är {username} {first_letter} {color} {size}"
@@ -1731,7 +1758,7 @@ sv:
     composer_media_optimization_image_bytes_optimization_threshold: "Minsta bildfilstorlek för att utlösa optimering på klientsidan"
     composer_media_optimization_image_resize_dimensions_threshold: "Minsta bildbredd för att utlösa storleksändring på klientsidan"
     composer_media_optimization_image_resize_width_target: "Bilder med större bredd än `composer_media_optimization_image_dimensions_resize_threshold` kommer att ändras till denna bredd. Måste vara >= än `composer_media_optimization_image_dimensions_resize_threshold`."
-    composer_media_optimization_image_encode_quality: "JPEG-kodningskvalitet som används i omkodningsprocessen."
+    composer_media_optimization_image_encode_quality: "JPG-kodningskvalitet som används i omkodningsprocessen."
     min_ratio_to_crop: "Förhållandet används för att beskära höga bilder. Ange resultatet av bredd/höjd."
     simultaneous_uploads: "Maximalt antal filer som kan dras och släppas in i redigeraren"
     default_invitee_trust_level: "Förvald förtroendenivå (0-4) för inbjudna användare."
@@ -1760,7 +1787,9 @@ sv:
     tl3_requires_likes_given: "Minsta antalet gillningar som måste ha delats ut de senaste (tl3 time period) dagarna för att kvalificeras för en befordran till förtroendenivå 3."
     tl3_requires_likes_received: "Minsta antalet gillningar som måste ha mottagits de senaste (tl3 time period) dagarna för att kvalificeras för en befordran till förtroendenivå 3."
     tl3_links_no_follow: "Radera ej rel=nofollow från länkarna som lagts upp av användare med förtroendenivå 3."
-    trusted_users_can_edit_others: "Låt användare med hög förtroendenivå redigera innehåll från andra användare"
+    tl4_delete_posts_and_topics: "Tillåt TL4-användare att ta bort inlägg och ämnen som skapats av andra användare. TL4-användare kommer också att kunna se raderade ämnen och inlägg."
+    edit_all_topic_groups: "Tillåt användare i den här gruppen att redigera andra användares ämnestitlar, taggar och kategorier"
+    edit_all_post_groups: "Tillåt användare i den här gruppen att redigera andra användares inlägg"
     min_trust_to_create_topic: "Lägsta förtroendenivå som krävs för att skapa ett nytt ämne."
     allow_flagging_staff: "Om aktiverat kan användare flagga inlägg från personalkonton."
     min_trust_to_edit_wiki_post: "Lägsta förtroendenivå som krävs för att redigera inlägg markerade som wiki."
@@ -1796,7 +1825,7 @@ sv:
     title_min_entropy: "Minsta tillåtna entropi (unika tecken) som krävs för en ämnesrubrik."
     body_min_entropy: "Minsta tillåtna entropi (unika tecken) som krävs för ett inläggs innehåll."
     allow_uppercase_posts: "Tillåt enbart versaler i ämnets rubrik eller innehåll."
-    max_consecutive_replies: "Antal inlägg som en användare måste göra i rad inom ett ämne innan användaren hindras lägga till ytterligare ett svar."
+    max_consecutive_replies: "Antal inlägg i rad som en användare kan göra i ett ämne innan den hindras från att lägga till ett nytt svar. Denna gräns gäller inte ämnesägaren, webbplatspersonalen eller kategorimoderatorerna."
     enable_filtered_replies_view: '(n)-svarsknappen förminskar alla andra inlägg och visar bara det aktuella inlägget och dess svar.'
     title_fancy_entities: "Konvertera vanliga ASCII-tecken till häftiga HTML-enheter i ämnesrubriker, à la SmartyPants <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>http://daringfireball.net/projects/smartypants/</a>"
     min_title_similar_length: "Minsta längd för en rubrik innan den kommer att kontrolleras för liknande ämnen."
@@ -1876,6 +1905,11 @@ sv:
     block_auto_generated_emails: "Blockera inkommande e-post som identifieras som autogenererat."
     ignore_by_title: "Ignorera inkommande e-post baserat på dess rubrik."
     mailgun_api_key: "Mailgun Secret API-nyckel att använda för att verifiera webhook-meddelanden."
+    sendgrid_verification_key: "Verifieringsnyckel för Sendgrid som används för att verifiera webhook-meddelanden."
+    mailjet_webhook_token: "Token som används för att verifiera webhook-nyttolasten. Den måste skickas som frågeparametern \"t\" för webhook, till exempel: https://example.com/webhook/mailjet?t=supersecret"
+    mandrill_authentication_key: "Mandrill-autentiseringsnyckel som används för att verifiera webhook-meddelanden."
+    postmark_webhook_token: "Token som används för att verifiera webhook-nyttolasten. Den måste skickas som frågeparametern \"t\" för webhook, till exempel: https://example.com/webhook/postmark?t=supersecret"
+    sparkpost_webhook_token: "Token som används för att verifiera webhook-nyttolasten. Den måste skickas som frågeparametern \"t\" för webhook, till exempel: https://example.com/webhook/sparkpost?t=supersecret"
     soft_bounce_score: "Studspoäng har lagt till hos användaren när en tillfällig studs händer."
     hard_bounce_score: "Studspoäng har lagts till på användarens profil när en permanent studs sker."
     bounce_score_threshold: "Max antal studsar innan vi upphör att skicka e-post till en användare"
@@ -1903,7 +1937,7 @@ sv:
     pop3_polling_password: "Lösenord för POP3-kontot där e-post ska sökas."
     pop3_polling_delete_from_server: "Ta bort e-postmeddelanden från servern. NOTERA! Om du inaktiverar detta bör du rensa din inkorg manuellt"
     log_mail_processing_failures: "Logga alla behandlingsfel för e-post till <a href='%{base_path}/logs' target='_blank'>/logs</a>"
-    email_in: 'Tillåt att användare publicerar nya ämnen via e-post (kräver manuell eller pop3-sökning). Konfigurera adresserna på fliken "Inställningar" för varje kategori.'
+    email_in: "Tillåt användare att lägga upp nya ämnen via e-post. När du har aktiverat den här inställningen kan du konfigurera inkommande e-postadresser för grupper och kategorier."
     email_in_min_trust: "Minsta förtroendenivå en användare behöver för att tillåtas skapa nya ämnen via e-post."
     email_in_authserv_id: "Identifieraren för tjänsten som utför autentiseringskontroller av inkommande e-postmeddelanden. Se <a href='https://meta.discourse.org/t/134358'>https://meta.discourse.org/t/134358</a> för instruktioner om hur du konfigurerar detta."
     email_in_spam_header: "E-postrubrik för att upptäcka skräppost."
@@ -1949,6 +1983,7 @@ sv:
     enable_category_group_moderation: "Tillåt att grupper modererar innehåll i specifika kategorier"
     group_in_subject: "Ställ in %%{optional_pm} i e-postämnet till namnet på den första gruppen i PM, se: <a href='https://meta.discourse.org/t/customize-specific-email-templates/88323' target='_blank'>Anpassa ämnesformat för standardmeddelanden</a>"
     allow_anonymous_posting: "Tillåt att användare växlar till anonymt läge"
+    allow_anonymous_likes: "Tillåt anonyma användare att gilla inlägg"
     anonymous_posting_min_trust_level: "Lägsta förtroendenivå som krävs för att aktivera anonyma inlägg"
     anonymous_account_duration_minutes: "Skapa ett nytt anonymt konto var N:e minut för varje användare för att skydda anonymiteten. Exempel: om detta ställs in till 600, så skapas ett nytt anonymt konto så snart som 600 minuter har gått sedan senaste inlägget OCH användaren väljer anon."
     hide_user_profiles_from_public: "Inaktivera användarkort, användarprofiler och användarkataloger för anonyma användare."
@@ -1967,6 +2002,7 @@ sv:
     allow_profile_backgrounds: "Tillåt användare att ladda upp profilbakgrunder."
     sequential_replies_threshold: "Antal inlägg en användare måste ha skrivit i rad i ett ämne innan användaren blir påmind om för många svar i sekvens."
     get_a_room_threshold: "Antalet inlägg en användare kan göra till samma person inom samma ämne innan det ges en varning."
+    dont_feed_the_trolls_threshold: "Antal flaggor från andra användare innan du varnas."
     enable_mobile_theme: "Mobila enheter använder ett mobilvänligt tema, med möjligheten att byta till standardsidan. Inaktivera detta om du vill använda en anpassad stilmall som är helt responsiv."
     dominating_topic_minimum_percent: "Procentandel av antalet inlägg som en användare måste skriva i ett ämne innan de påminns om att de är för dominerande."
     disable_avatar_education_message: "Inaktivera hjälpmeddelande för byte av avatar."
@@ -1976,22 +2012,22 @@ sv:
     permalink_normalizations: "Tillämpa följande regex innan matchning av permalänkar, till exempel: /(topic.*)\\?.*/\\1 kommer att rensa bort söksträngar från ämnesvägen. Formatet är regex+sträng, använd \\1 osv. för att komma åt grupperingar."
     global_notice: "Visa ett BRÅDSKANDE, icke-stängningsbart globalt banderollmeddelande för alla besökare, ändra till blankt för att dölja det (HTML tillåts)."
     disable_system_edit_notifications: "Inaktivera redigering av aviseringar av systemanvändaren när 'download_remote_images_to_local' har aktiverats."
-    disable_category_edit_notifications: "Inaktivera kategoriredigeringsaviseringar för ämnen."
-    disable_tags_edit_notifications: "Inaktivera notifieringar om att taggar har redigerats för ämnen."
+    disable_category_edit_notifications: "Inaktivera aviseringar för redigeringar av ämneskategorier."
+    disable_tags_edit_notifications: "Inaktivera aviseringar för redigeringar av ämnestaggar."
     notification_consolidation_threshold: "Antal meddelanden om gillad eller medlemskapsbegäran innan meddelandena konsolideras till en enda. Ställ in till 0 för att inaktivera."
     likes_notification_consolidation_window_mins: "Varaktighet i minuter efter vilken gillad-aviseringar konsolideras till en enda avisering då tröskeln har uppnåtts. Tröskeln kan konfigureras via `SiteSetting.notification_consolidation_threshold`."
     automatically_unpin_topics: "Ta automatiskt ned ämnen när användaren når botten."
     read_time_word_count: "Ordräknare per minut för att beräkna uppskattad lästid."
     topic_page_title_includes_category: "Ämnessidans <a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title' target='_blank'>rubriktagg</a> inkluderar kategorins namn."
-    native_app_install_banner_ios: "Visar DiscourseHub-appbanderollen på iOS-enheter för regelbundna användare (förtroendenivå 1 och högre)."
-    native_app_install_banner_android: "Visar DiscourseHub-appbannern på Android-enheter för regelbundna användare (förtroendegrad 1 och uppåt)."
+    native_app_install_banner_ios: "Visar DiscourseHub-appbanderollen på iOS-enheter för grundläggande användare (förtroendenivå 1) och högre."
+    native_app_install_banner_android: "Visar DiscourseHub-appbanderollen på Android-enheter för grundläggande användare (förtroendenivå 1) och högre."
     app_association_android: "Innehåll i slutpunkten <a href='%{base_path}/.well-known/assetlinks.json'>.well-known/assetlinks.json</a>, används för Google's Digital Asset Links-API."
     app_association_ios: "Innehållet i slutpunkten <a href='%{base_path}/apple-app-site-association'>apple-app-site-association</a>, används för att skapa universella länkar mellan denna webbplats och iOS-appar."
     share_anonymized_statistics: "Dela anonymiserad användningsstatistik."
     auto_handle_queued_age: "Hantera automatiskt inlägg som väntar på att granskas efter detta antal dagar. Flaggor ignoreras. Inlägg och användare i kö avvisas. Ställ in till 0 för att inaktivera den här funktionen."
     penalty_step_hours: "Standardtid, uttryckt i timmar, under vilken användare bestraffas genom att tystas eller stängas av. Det första värdet är standard för deras första överträdelse, det andra värdet är standard för deras andra överträdelse etc."
     svg_icon_subset: "Lägg till ytterligare FontAwesome 5-ikoner som du vill inkludera i dina tillgångar. Använd prefixet 'fa-' för solida ikoner, 'far-' för vanliga ikoner och 'fab-' för märkesikoner."
-    max_prints_per_hour_per_user: "Maximalt antal /print page-utskrifter (ställ in till 0 för att inaktivera)"
+    max_prints_per_hour_per_user: "Maximalt antal /print page-utskrifter (ställ in till 0 för att inaktivera utskrifter)"
     full_name_required: "Fullständigt namn är ett obligatoriskt fält i en användares profil."
     enable_names: "Visa användarens fullständiga namn på dess profil, användarkort och e-post. Inaktivera för att dölja det fullständiga namnet överallt."
     display_name_on_posts: "Visa en användares fullständiga namn på deras inlägg som tillägg till deras @användarnamn."
@@ -2012,17 +2048,13 @@ sv:
     allowed_href_schemes: "Scheman tillåtna i länkar förutom http och https."
     embed_post_limit: "Högsta antal inlägg att bädda in."
     embed_username_required: "Användarnamn krävs för skapade av ämne."
-    notify_about_flags_after: "Om det finns flaggor som inte har hanterats efter detta antal timmar skickas ett personligt meddelande till moderatorerna. Inaktivera genom att ställa in till 0."
-    show_create_topics_notice: "Visa ett meddelande som ber administratörerna att skapa några ämnen om webbplatsen har färre än 5 offentliga ämnen."
+    notify_about_reviewable_item_after: "Om det finns granskningsbara objekt som inte har hanterats efter så många timmar, skicka ett personligt meddelande till moderatorer. Ställ in på 0 för att inaktivera."
     delete_drafts_older_than_n_days: "Ta bort utkast som är äldre än (n) dagar."
     delete_merged_stub_topics_after_days: "Antal dagar att vänta innan helt sammanslagna stub-ämnen raderas automatiskt. Ställ in till 0 för att aldrig radera stub-ämnen."
-    bootstrap_mode_min_users: "Minsta antal användare som krävs för att inaktivera bootstrap-läget (ange 0 för att inaktivera)"
+    bootstrap_mode_min_users: "Minsta antal användare som krävs för att inaktivera bootstrap-läget (ställ in på 0 för att inaktivera, kan ta upp till 24 timmar)"
     prevent_anons_from_downloading_files: "Förhindra att anonyma användare hämtar bilagor."
-    secure_media: "UTFASAT: Använd inställningen secure_uploads istället, kommer att tas bort i Discourse 3.0."
     secure_uploads: 'Begränsar åtkomst för ALLA uppladdningar (bilder, video, ljud, text, pdf, zip med flera). Om "login required" har aktiverats kan endast inloggade användare komma åt uppladdningar. Annars begränsas åtkomst endast till uppladdning av media i privata meddelanden samt privata kategorier. VARNING: Den här inställningen är komplex och kräver djupa administrativa kunskaper. Se detaljer i <a target="_blank" href="https://meta.discourse.org/t/-/140017">ämnet för säkra uppladdningar i Meta</a>.'
-    secure_media_allow_embed_images_in_emails: "UTFASAT: Använd secure_uploads_allow_embed_images_in_emails, kommer att tas bort i Discourse 3.0."
     secure_uploads_allow_embed_images_in_emails: "Gör det möjligt att bädda in säkra bilder som normalt skulle begränsas i e-postmeddelanden, under förutsättning att deras storlek är mindre än inställningen för säkra medias maxstorlek för inbäddning av bild, 'secure uploads max email embed image size kb'."
-    secure_media_max_email_embed_image_size_kb: "UTFASAT: Använd secure_uploads_max_email_embed_image_size_kb, kommer att tas bort i Discourse 3.0."
     secure_uploads_max_email_embed_image_size_kb: "Storleksbegränsningen för säkra bilder som kommer att bäddas in i e-postmeddelanden om inställningen för att tillåta inbäddningar för säkra uppladdningar i e-post är aktiverad, 'secure uploads allow embed in emails' . Om inställningen inte är aktiverad har den här inställningen ingen effekt."
     slug_generation_method: "Välj en genereringsmetod för etiketter. Ange 'none' för att inaktivera generering av etiketter. "
     enable_emoji: "Aktivera emoji"
@@ -2030,6 +2062,7 @@ sv:
     emoji_set: "Hur skulle du vilja ha din emoji?"
     emoji_autocomplete_min_chars: "Minsta antal tecken som krävs för att utlösa popupfönstret för emoji-autoifyllning"
     enable_inline_emoji_translation: "Aktiverar översättning för infogade emojier (utan mellanslag eller skiljetecken framför)"
+    emoji_deny_list: "Dessa emojier kommer inte att vara tillgängliga för användning i menyer eller kortkoder."
     approve_post_count: "Antalet inlägg från en ny användare eller basanvändare som måste godkännas"
     approve_unless_trust_level: "Inlägg för användare under den här förtroendenivån måste godkännas"
     approve_new_topics_unless_trust_level: "Nya ämnen för användare under denna förtroendenivå måste godkännas"
@@ -2084,18 +2117,26 @@ sv:
     default_tags_watching_first_post: "Förteckning över taggar i vilket första inlägget i varje nytt ämne kommer att bevakas som standard."
     default_text_size: "Textstorlek som är vald som standard"
     default_title_count_mode: "Standardläge för räknaren i sidtiteln"
+    enable_offline_indicator: "Visa ett meddelande för användare när det upptäcks att de inte har någon nätverksanslutning"
+    default_sidebar_link_to_filtered_list: "Låt länkar i navigeringsmenyn länka till filtrerad lista som standard."
+    default_sidebar_show_count_of_new_items: "Låt länkar i navigeringsmenyn visa antalet nya objekt istället för utmärkelser som standard."
+    default_sidebar_switch_panel_position: "Placering av panelknappar för sidofältsomkoppling"
     retain_web_hook_events_period_days: "Antal dagar för att behålla register över webhook-händelsedata."
     retry_web_hook_events: "Försök automatiskt igen för misslyckade händelser för webhooken 4 gånger. Tidsspannet mellan försöken är 1, 5, 25 och 125 minuter."
     revoke_api_keys_days: "Antal dagar innan en oanvänd API-nyckel automatiskt återkallas (0 för aldrig)"
     allow_user_api_keys: "Tillåt generering av API-nycklar för användare"
     allow_user_api_key_scopes: "Lista över samtliga tillåtna användar-API-nycklar"
-    min_trust_level_for_user_api_key: "Förtroendenivå som krävs för att generera användar-API-nycklar"
+    min_trust_level_for_user_api_key: |
+      Förtroendenivå som krävs för generering av användar-API-nycklar.<br>
+      <b>VARNING</b>: Ändring av förtroendenivån kommer att förhindra användare med en lägre förtroendenivå från att logga in via Discourse Hub
     allowed_user_api_auth_redirects: "Tillåten URL för omdirigering efter verifiering av användares API-nycklar. Jokersymbol * kan användas för att matcha vilken del som helst av denna (t.ex. www.exempel.se/*)."
     allowed_user_api_push_urls: "Tillåtna URL:er för serverframstötning till användar-API"
     expire_user_api_keys_days: "Antal dagar innan en användares API-nyckel automatiskt upphör (0 för aldrig)"
     tagging_enabled: "Vill du aktivera taggar på ämnen?"
     min_trust_to_create_tag: "Lägsta förtroendenivå som krävs för att skapa en tagg."
     max_tags_per_topic: "Högsta antal taggar som kan tillskrivas ett ämne."
+    enable_max_tags_per_email_subject: "Använd max_tags_per_email_subject när du skapar ämnet för ett e-postmeddelande"
+    max_tags_per_email_subject: "Det maximala antalet taggar som kan finnas i ett e-postmeddelandes ämne"
     max_tag_length: "Högsta antal tecken som kan användas i en tagg."
     max_tag_search_results: "Maximalt antal resultat som visas vid sökning efter taggar"
     max_tags_in_filter_list: "Högsta antal taggar att visa i filtreringsrullgardinmenyn. De taggar som används mest kommer att visas."
@@ -2107,6 +2148,7 @@ sv:
     suppress_overlapping_tags_in_list: "Om taggen matchar orden i ämnets titel exakt visas inte taggen"
     remove_muted_tags_from_latest: "Visa inte ämnen som taggats med tystade taggar i listan med senaste ämnen."
     force_lowercase_tags: "Tvinga alla nya taggar att vara helt i små bokstäver."
+    create_post_for_category_and_tag_changes: "Skapa ett litet åtgärdsinlägg när ett ämnes kategori eller taggar ändras"
     company_name: "Företagsnamn"
     governing_law: "Gällande lag"
     city_for_disputes: "Domstol vid tvist"
@@ -2121,7 +2163,7 @@ sv:
     enable_sitemap: "Skapa en webbplatskarta för din webbplats och inkludera den i filen robots.txt."
     sitemap_page_size: "Antal webbadresser som ska inkluderas på varje webbplatskartsida. Max 50.000"
     enable_user_status: "(experimentell) Tillåt användare att ställa in anpassat statusmeddelande (emoji + beskrivning)."
-    enable_user_tips: "(experimentell) Aktivera nya användartips som beskriver nyckelfunktioner för användare"
+    enable_user_tips: "Aktivera tips för nya användare som beskriver viktiga funktioner för användare"
     short_title: "Den korta titeln kommer att användas på användarens startskärm, startapparat eller andra platser där utrymmet kan vara begränsat. Den bör begränsas till 12 tecken."
     dashboard_hidden_reports: "Tillåt att de specificerade rapporterna döljs från översiktspanelen."
     dashboard_visible_tabs: "Välj vilka flikar på översiktspanelen som ska vara synliga."
@@ -2138,11 +2180,15 @@ sv:
     suggest_weekends_in_date_pickers: "Inkludera helger (lördag och söndag) i förslagen till datumval (inaktivera detta om du endast använder Discourse på vardagar, måndag till fredag)."
     splash_screen: "Visar en tillfällig laddningsskärm medan webbplatsens tillgångar laddas"
     navigation_menu: "Bestäm vilken navigeringsmeny som ska användas. Sidofälts- och rubriknavigering kan anpassas av användare. Det äldre alternativet är tillgängligt för bakåtkompatibilitet."
-    default_sidebar_categories: "Valda kategorier kommer att visas under sidofältets sektion Kategorier som standard."
-    default_sidebar_tags: "Valda taggar kommer att visas under sidofältets sektion Taggar som standard."
-    enable_new_user_profile_nav_groups: "EXPERIMENTELL: Användare i de valda grupperna visas den nya navigeringsmenyn för användarprofiler."
-    enable_experimental_topic_timeline_groups: "EXPERIMENTELLT: Användare i de valda grupperna visas det omstrukturerade ämnets tidslinje"
+    default_navigation_menu_categories: "Valda kategorier visas som standard under navigeringsmenyns sektion Kategorier."
+    default_navigation_menu_tags: "Valda taggar visas som standard under navigeringsmenyns sektion Taggar."
     enable_experimental_hashtag_autocomplete: "EXPERIMENTELLT: Använd det nya #hashtag-autokompletteringssystemet för kategorier och taggar som renderar det valda objektet annorlunda och har förbättrad sökning"
+    experimental_new_new_view_groups: 'EXPERIMENTELLT: Aktivera en ny ämneslista som kombinerar olästa och nya ämnen och gör att länken "Allt" i sidofältet länkar till den.'
+    enable_custom_sidebar_sections: "EXPERIMENTELLT: Aktivera anpassade sidofältssektioner"
+    experimental_topics_filter: "EXPERIMENTELLT: Aktiverar den experimentella ämnesfiltervägen vid /filter"
+    experimental_search_menu_groups: "EXPERIMENTELLT: Aktiverar den nya sökmenyn som har uppgraderats för att använda glimmer"
+    enable_experimental_lightbox: "EXPERIMENTELLT: Byt ut standardbild-lightboxen mot den nya designen."
+    page_loading_indicator: "Konfigurera laddningsindikatorn som visas under sidnavigeringar i Discourse. 'Spinnare' är en indikator som tar upp hela sidan. 'Skjutreglage' visar ett smalt fält högst upp på skärmen."
     errors:
       invalid_css_color: "Ogiltig färg. Ange ett färgnamn eller ett hexvärde."
       invalid_email: "Felaktig e-postadress."
@@ -2168,7 +2214,7 @@ sv:
       pop3_polling_password_is_empty: "Du måste ställa in ett 'pop3 polling password' innan du aktiverar POP3-polling."
       pop3_polling_authentication_failed: "POP3-autentisering misslyckades. Verifiera dina pop3-certifikat."
       reply_by_email_address_is_empty: "Du måste ställa in en 'reply by email address' innan du aktiverar svar via e-post."
-      email_polling_disabled: "Du måste aktivera antingen manuell polling eller POP3-polling innan du aktiverar svar via e-post."
+      email_polling_disabled: "Du måste aktivera antingen manuell POP3-pollning eller ha en anpassad e-postpollare aktiverad innan du kan aktivera svar via e-post."
       user_locale_not_enabled: "Du måste först aktivera 'allow user locale' innan du aktiverar den här inställningen."
       personal_message_enabled_groups_invalid: "Du måste ange minst en grupp för den här inställningen. Om du inte vill att någon förutom personal ska skicka PM, välj personalgrupp."
       invalid_regex: "Vanligt uttryck är ogiltigt eller inte tillåtet."
@@ -2177,7 +2223,6 @@ sv:
       staged_users_disabled: "Du måste först aktivera \"arrangerade användare\" innan du aktiverar denna inställning."
       reply_by_email_disabled: "Du måste först aktivera 'svara med e-post' innan du aktiverar denna inställning."
       discourse_connect_url_is_empty: "Du måste ange en 'discourse connect url' innan du aktiverar denna inställning."
-      discourse_connect_invite_only: "Du kan inte aktivera DiscourseConnect och bara bjuda in samtidigt."
       enable_local_logins_disabled: "Du måste först 'aktivera lokala inloggningar' innan du aktiverar denna inställning."
       min_username_length_exists: "Du kan inte ställa in kortast tillåtna längd på användarnamn till att vara längre än det kortaste användarnamnet (%{username})."
       min_username_length_range: "Du kan inte ställa in minimum till att vara högre än maximum"
@@ -2199,7 +2244,8 @@ sv:
       search_tokenize_japanese_enabled: "Du måste inaktivera 'search_tokenize_japanese' innan du aktiverar den här inställningen."
       discourse_connect_cannot_be_enabled_if_second_factor_enforced: "Du kan inte aktivera DiscourseConnect om 2FA är obligatoriskt."
       delete_rejected_email_after_days: "Den här inställningen kan inte vara lägre än inställningen delete_email_logs_after_days eller större än %{max}"
-      invalid_uncategorized_category_setting: "Kategorin Okategoriserade kan inte väljas om tillåt okategoriserade ämnen inte är tillåtet"
+      invalid_uncategorized_category_setting: 'Kategorin "Okategoriserade" kan inte väljas om inte "tillåt okategoriserade ämnen" har aktiverats.'
+      invalid_search_ranking_weights: "Värdet är ogiltigt för webbplatsinställningen search_ranking_weights. Exempel: '{0.1,0.2,0.3,1.0}'. Observera att maximalt värde för varje vikt är 1,0."
     placeholder:
       discourse_connect_provider_secrets:
         key: "www.exempel.se"
@@ -2394,7 +2440,6 @@ sv:
     activated_by_staff: "Aktiverades av personalen"
     new_user_typed_too_fast: "Ny användare skrev för fort"
     content_matches_auto_silence_regex: "Innehållet matchar regelbundet uttryck för automatiskt tystande"
-    content_matches_auto_block_regex: "Innehållet matchar regelbundet uttryck för automatisk blockering"
     username:
       short: "måste vara minst %{min} tecken"
       long: "får högst vara %{max} tecken"
@@ -3056,7 +3101,7 @@ sv:
 
         Den nya användaren [%{username}](%{user_url}) tystades automatiskt på grund av att ett flertal medlemmar flaggat användaren %{username}s inlägg.
 
-        [Granska inläggen](%{base_url}/admin/flags). Om %{username} har tystats på felaktig grund, ber vi dig klicka på otysta-knappen [på administrationssidan för den här användaren](%{user_url}).
+        [Granska inläggen](%{base_url}/review). Om %{username} har tystats på felaktig grund, ber vi dig klicka på otysta-knappen [på administrationssidan för den här användaren](%{user_url}).
 
         Detta gränsvärde kan ändras genom webbplatsens inställning av `silence_new_user`.
     spam_post_blocked:
@@ -3077,15 +3122,6 @@ sv:
       title: "Hämtning av externa bilder är inaktiverad"
       subject_template: "Hämtning av externa bilder har inaktiverats"
       text_body_template: "Inställningen `download_remote_images_to_local` har inaktiverats eftersom diskutrymmet har nått sin övre gräns."
-    dashboard_problems:
-      title: "Problem med instrumentpanel"
-      subject_template: "Nytt råd på din webbplats översiktspanel"
-      text_body_template: |
-        Vi har några nya råd och rekommendationer för dig baserat på dina aktuella webbplatsinställningar.
-
-         [Gå till din översiktspanel](%{base_url}/admin) för att se dessa.
-
-        Om inget är synligt från din panel har förmodligen någon annan ur personalen redan agerat på detta råd. En lista över personalåtgärder kan hittas genom [Personalens händelselogg](%{base_url}/admin/logs/staff_action_logs).
     new_user_of_the_month:
       title: "Du är Månadens nya användare!"
       subject_template: "Grattis, du har tilldelats utmärkelsen ** Månadens nya användare för %{month_year}**. : Trofén:\n\nDenna utmärkelse beviljas endast till två nya användare per månad och den kommer att visas permanent på [sidan för utmärkelser] (%{url}).\n\nDu har snabbt blivit en värdefull medlem i vår gemenskap. Tack för att du gick med och fortsätt med det fantastiska arbetet!"
@@ -3119,9 +3155,6 @@ sv:
       one: "Se upp: Vi skickar maximalt %{count} e-postmedd. per dag. Kontrollera webbplatsen för att se vilka andra som eventuellt hålls tillbaka."
       other: "Se upp: Vi skickar maximalt %{count} e-postmedd. per dag. Kontrollera webbplatsen för att se vilka andra som eventuellt hålls tillbaka. PS. Tack för att du är populär!"
     in_reply_to: "Som svar till"
-    unsubscribe:
-      title: "Avprenumerera"
-      description: "Inte intresserad av att få denna e-post? Inga problem! Klicka nedan för att avprenumerera."
     reply_by_email: "[Gå till ämnet](%{base_url}%{url}) eller svara på det här e-postmeddelandet för att ge ditt svar."
     reply_by_email_pm: "[Gå till meddelandet](%{base_url}%{url}) eller svara på det här e-postmeddelandet för att svara %{participants}."
     only_reply_by_email: "Besvara det här e-postmeddelandet för att ge ditt svar."
@@ -3374,7 +3407,6 @@ sv:
       liked_received: "Gillanden mottagna"
       new_users: "Nya användare"
       popular_topics: "Populära ämnen"
-      follow_topic: "Glöm detta ämne"
       join_the_discussion: "Läs mer"
       popular_posts: "Populära inlägg"
       more_new: "Nytt för er"
@@ -3529,14 +3561,7 @@ sv:
     title: "Det går inte att ladda appen"
     offline_page_message: "Det ser ut som om du är offline! Kontrollera din nätverksanslutning och försök igen."
   login_required:
-    welcome_message: |
-      ##[Välkommen till %{title}](#welcome)
-      Ett konto krävs för att logga in. Skapa ett konto eller logga in för att fortsätta.
-    welcome_message_invite_only: |
-      ##[Välkommen till %{title}](#welcome)
-      Det krävs ett konto för att logga in. Be en befintlig användare om en inbjudan eller logga in för att fortsätta.
-  deleted: "raderad"
-  image: "bild"
+    welcome_message: "# [Välkommen till %{title}](#välkommen)"
   upload:
     edit_reason: "hämtade lokala kopior av bilder"
     unauthorized: "Tyvärr är filen som du försöker ladda upp inte tillåten (tillåtna filtyper: %{authorized_extensions})."
@@ -3738,25 +3763,29 @@ sv:
   tos_topic:
     title: "Villkor"
     body: |
-      Dessa villkor reglerar användningen av internetforumet på <%{base_url}>. För att kunna använda forumet måste du komma överens med %{company_name}, företaget som driver forumet, om dessa villkor.
+      <h2 id="heading--change-me"><a href="#heading--change-me">Ändra mig</a></h2>
+
+      Forumadministratör, nedan finns ett exempel på en mall för en integritetspolicy som du bör anpassa till din webbplats.
+
+      Dessa villkor gäller inte än, men kan en dag komma att styra, användningen av Internetforumet på <%{base_url}>. Om du vill använda forumet måste du i så fall komma överens om dessa villkor med %{company_name}, det företag som driver forumet.
 
       Företaget kan erbjuda andra produkter och tjänster på andra villkor. Dessa villkor gäller endast för användning av forumet.
 
       Hoppa till:
 
       - [Viktiga villkor](#heading--important-terms)
-      - [Ditt tillstånd att använda forumet](#heading--permission)
+      - [Din tillåtelse att använda forumet](#heading--permission)
       - [Villkor för användning av forumet](#heading--conditions)
       - [Acceptabel användning](#heading--acceptable-use)
       - [Innehållsstandarder](#heading--content-standards)
-      - [Verkställighet](#heading--enforcement)
+      - [Verkställandet](#heading--enforcement)
       - [Ditt konto](#heading--your-account)
       - [Ditt innehåll](#heading--your-content)
       - [Ditt ansvar](#heading--responsibility)
-      - [Ansvarsfriskrivningar](#heading--disclaimers)
-      - [Ansvarsbegränsningar](#heading--liability)
+      - [Ansvarsfriskrivning](#heading--disclaimers)
+      - [Ansvarsbegränsning](#heading--liability)
       - [Återkoppling](#heading--feedback)
-      - [Uppsägning](#heading--disclaimers)
+      - [Uppsägning](#heading--termination)
       - [Tvister](#heading--disputes)
       - [Allmänna villkor](#heading--general)
       - [Kontakt](#heading--contact)
@@ -3764,7 +3793,7 @@ sv:
 
       <h2 id="heading--important-terms"><a href="#heading--important-terms">Viktiga villkor</a></h2>
 
-      ***Dessa villkor innehåller ett antal viktiga bestämmelser som påverkar dina rättigheter och skyldigheter, såsom ansvarsfriskrivningar i [Ansvarsfriskrivningar](#heading--disclaimers), begränsningar av företagets ansvar gentemot dig i [Ansvarsbegränsningar] (#heading--liability), ditt samtycke till att ersätta företaget för skador som orsakats av ditt missbruk av forumet i [Ansvar för din användning] (#heading--responsibility) och ett samtycke till skiljedom i [Tvister](#heading--disputes).***
+      ***Dessa villkor innehåller ett antal viktiga bestämmelser som påverkar dina rättigheter och skyldigheter, såsom ansvarsfriskrivningar i [Ansvarsfriskrivningar](#heading--disclaimers), begränsningar av företagets ansvar gentemot dig i [Ansvarsbegränsningar] (#heading--liability), ditt samtycke till att hålla företaget skadeslöst för skador som orsakats av ditt missbruk av forumet i [Ditt ansvar] (#heading--responsibility) och ett avtal om skiljedom i [Tvister](#heading--disputes).***
 
       <h2 id="heading--permission"><a href="#heading--permission">Ditt tillstånd att använda forumet</a></h2>
 
@@ -3776,9 +3805,9 @@ sv:
 
       1. Du måste vara minst tretton år gammal.
 
-      2. Du får inte längre använda forumet om företaget kontaktar dig direkt för att säga att du inte får göra det.
+      2. Du får inte längre använda forumet om företaget kontaktar dig direkt för att säga att du inte får det.
 
-      3. Du måste använda forumet i enlighet med [Acceptabel användning](#heading--acceptabel-användning) och [Innehållsstandarder](#heading--content-standards).
+      3. Du måste använda forumet i enlighet med [Acceptabel användning](#heading--acceptable-use) och [Innehållsstandarder](#heading--content-standards).
 
       <h2 id="heading--acceptable-use"><a href="#heading--acceptable-use">Acceptabel användning</a></h2>
 
@@ -3792,7 +3821,7 @@ sv:
 
       5. Du får inte automatisera åtkomsten till forumet eller övervaka forumet, till exempel med en webcrawler, en plug-in eller ett tillägg till webbläsaren eller ett annat datorprogram som inte är en webbläsare. Du får crawla forumet för att indexera det för en offentligt tillgänglig sökmotor, om du driver en sådan.
 
-      6. Du får inte använda forumet för att skicka e-post till distributionslistor, nyhetsgrupper eller gruppostalias.
+      6. Du får inte använda forumet för att skicka e-post till distributionslistor, nyhetsgrupper eller gruppmailalias.
 
       7. Du får inte falskeligen antyda att du är ansluten till eller stöds av företaget.
 
@@ -3804,7 +3833,7 @@ sv:
 
       11. Du får inte inaktivera, undvika eller kringgå några säkerhets- eller åtkomstbegränsningar i forumet.
 
-      12. Du får inte belasta forumets infrastruktur med en orimlig mängd förfrågningar, eller förfrågningar som är utformade för att utsätta informationssystemen som ligger till grund för forumet för en orimlig belastning.
+      12. Du får inte belasta forumets infrastruktur med en orimlig mängd anrop, eller anrop som har utformats för att utsätta informationssystemen som ligger till grund för forumet för orimlig belastning.
 
       13. Du får inte utge dig för att vara någon annan via forumet.
 
@@ -3812,19 +3841,19 @@ sv:
 
       <h2 id="heading--content-standards"><a href="#heading--content-standards">Innehållsstandarder</a></h2>
 
-      1. Du får inte skicka innehåll till forumet som är olagligt, stötande eller på annat sätt skadligt för andra. Detta inkluderar innehåll som är trakasserande, olämpligt, kränkande eller hatiskt uppförande.
+      1. Du får inte skicka innehåll till forumet som är olagligt, stötande eller på annat sätt skadligt för andra. Detta inkluderar innehåll som är trakasserande, olämpligt, kränkande eller hatiskt beteende.
 
       2. Du får inte skicka innehåll till forumet som bryter mot lagen, kränker någons immateriella rättigheter, kränker någons privatliv eller bryter mot avtal som du har med andra.
 
       3. Du får inte skicka in innehåll till forumet som innehåller skadlig datorkod, till exempel datavirus eller spionprogram.
 
-      4. Du får inte skicka innehåll till forumet som en ren platshållare, för att hålla en viss adress, ett användarnamn eller annan unik identifierare.
+      4. Du får inte skicka innehåll till forumet som en ren platshållare, för att innehålla en viss adress, ett användarnamn eller annan unik identifierare.
 
-      5. Du får inte använda forumet för att avslöja information som du inte har rätt att avslöja, som andras konfidentiella eller personliga information.
+      5. Du får inte använda forumet för att avslöja information som du inte har rätt att avslöja, t.ex. andras konfidentiella eller personliga information.
 
-      <h2 id="heading--enforcement"><a href="#heading--enforcement">Verkställighet</a></h2>
+      <h2 id="heading--enforcement"><a href="#heading--enforcement">Verkställande</a></h2>
 
-      Företaget kan utreda och åtala brott mot dessa villkor i hela den lagliga omfattningen. Företaget kan meddela och samarbeta med brottsbekämpande myndigheter för att beivra brott mot lagen och dessa villkor.
+      Företaget kan utreda och åtala överträdelser av dessa villkor i hela den lagliga omfattningen. Företaget kan meddela och samarbeta med brottsbekämpande myndigheter för att beivra brott mot lagen och dessa villkor.
 
       Företaget förbehåller sig rätten att ändra, redigera och radera innehåll på forumet av vilken anledning som helst. Om du tror att någon har skickat in innehåll till forumet i strid med dessa villkor, [kontakta oss omedelbart](#heading--contact).
 
@@ -3834,13 +3863,13 @@ sv:
 
       För att skapa ett konto måste du lämna viss information om dig själv. Om du skapar ett konto samtycker du till att åtminstone ange en giltig e-postadress och att hålla den adressen uppdaterad. Du kan när som helst avsluta ditt konto genom att skicka ett e-postmeddelande till <%{contact_email}>.
 
-      Du samtycker till att ansvara för alla åtgärder som vidtas med hjälp av ditt konto, oavsett om du har godkänt dem eller inte, tills du antingen stänger ditt konto eller meddelar företaget att ditt konto har äventyrats. Du samtycker till att omedelbart meddela företaget om du misstänker att ditt konto har äventyrats. Du samtycker till att välja ett säkert lösenord för ditt konto och hålla det hemligt.
+      Du samtycker till att vara ansvarig för alla åtgärder som vidtas med hjälp av ditt konto, oavsett om de är godkända av dig eller inte, tills du antingen stänger ditt konto eller meddelar företaget att ditt konto har äventyrats. Du samtycker till att omedelbart meddela företaget om du misstänker att ditt konto har äventyrats. Du samtycker till att välja ett säkert lösenord för ditt konto och hålla det hemligt.
 
       Företaget kan begränsa, avbryta eller stänga ditt konto på forumet i enlighet med sin policy för hantering av upphovsrättsrelaterade nedtagningsförfrågningar, eller om företaget rimligen anser att du har brutit mot någon regel i dessa villkor.
 
       <h2 id="heading--your-content"><a href="#heading--your-content">Ditt innehåll</a></h2>
 
-      Ingenting i dessa villkor ger företaget någon äganderätt till immateriella rättigheter som du delar med forumet, t.ex. din kontoinformation, dina inlägg eller annat innehåll som du skickar till forumet. Ingenting i dessa villkor ger dig heller någon äganderätt till företagets immateriella egendom.
+      Ingenting i dessa villkor ger företaget några äganderätter till immateriella rättigheter som du delar med forumet, t.ex. din kontoinformation, dina inlägg eller annat innehåll som du skickar till forumet. Ingenting i dessa villkor ger dig heller någon äganderätt till företagets immateriella egendom.
 
       Mellan dig och företaget förblir du ensam ansvarig för det innehåll du skickar till forumet. Du samtycker till att inte felaktigt antyda att det innehåll du skickar till forumet är sponsrat eller godkänt av företaget. Dessa villkor förpliktar inte företaget att lagra, underhålla eller tillhandahålla kopior av det innehåll du skickar in och att ändra det i enlighet med dessa villkor.
 
@@ -3852,11 +3881,11 @@ sv:
 
       <h2 id="heading--responsibility"><a href="#heading--responsibility">Ditt ansvar</a></h2>
 
-      Du samtycker till att hålla företaget skadeslöst från rättsliga anspråk från andra i samband med att du bryter mot dessa villkor, eller att andra som använder ditt konto på forumet bryter mot dessa villkor. Både du och företaget är överens om att så snart som möjligt meddela den andra sidan om eventuella rättsliga anspråk för vilka ni kan behöva ersätta företaget. Om företaget misslyckas med att snabbt meddela dig om ett rättsligt anspråk behöver du inte ersätta företaget för skador som du hade kunnat försvara dig mot eller mildra med ett snabbt meddelande. Du samtycker till att låta företaget kontrollera utredning, försvar och reglering av rättsliga anspråk för vilka du skulle vara skyldig att ersätta företaget, och att samarbeta med dessa ansträngningar. Företaget samtycker till att inte gå med på någon förlikning som erkänner ditt fel eller ålägger dig skyldigheter utan ditt förhandsgodkännande.
+      Du samtycker till att hålla företaget skadeslöst från rättsliga anspråk från andra i samband med att du bryter mot dessa villkor, eller att andra som använder ditt konto på forumet bryter mot dessa villkor. Både du och företaget är överens om att så snart som möjligt meddela den andra sidan om eventuella rättsliga anspråk för vilka ni kan behöva ersätta företaget. Om företaget misslyckas med att snabbt meddela dig om ett rättsligt anspråk behöver du inte ersätta företaget för skador som du hade kunnat försvara dig mot eller mildra med ett snabbt meddelande. Du samtycker till att låta företaget kontrollera utredning, försvar och reglering av rättsliga anspråk för vilka du skulle behöva ersätta företaget, och att samarbeta med dessa ansträngningar. Företaget samtycker till att inte gå med på någon förlikning som erkänner ditt fel eller ålägger dig skyldigheter utan ditt förhandsgodkännande.
 
-      <h2 id="heading--disclaimers"><a href="#heading--disclaimers">Ansvarsfriskrivningar</a></h2>
+      <h2 id="heading--disclaimers"><a href="#heading--disclaimers">Ansvarsfriskrivning</a></h2>
 
-      ***Du accepterar alla risker med att använda forumet och innehållet på forumet. I den mån lagen tillåter tillhandahåller företaget och dess leverantörer forumet i befintligt skick, utan någon som helst garanti. ***
+      ***Du samtycker till alla risker med att använda forumet och innehållet på forumet. I den mån lagen tillåter tillhandahåller företaget och dess leverantörer forumet i befintligt skick, utan någon som helst garanti.***
 
       Forumet kan hyperlänka till och integrera forum och tjänster som drivs av andra. Företaget lämnar inga garantier för tjänster som drivs av andra eller för innehåll som de kan tillhandahålla. Användning av tjänster som drivs av andra kan regleras av andra villkor mellan dig och den som driver tjänsten.
 
@@ -3864,7 +3893,7 @@ sv:
 
       ***Varken företaget eller dess leverantörer kommer att vara ansvariga gentemot dig för skador på grund av avtalsbrott som deras personal inte rimligen kunde ha förutsett när du godkände dessa villkor.***
 
-      ***Så långt lagen tillåter kommer det totala ansvaret gentemot dig för anspråk av alla slag som har samband med forumet eller innehållet i forumet att begränsas till 50 USD.***
+      ***Så långt lagen tillåter kommer det totala ansvaret gentemot dig för anspråk av alla slag som har samband med forumet eller innehållet i forumet att begränsas till 50 amerikanska dollar.***
 
       <h2 id="heading--feedback"><a href="#heading--feedback">Återkoppling</a></h2>
 
@@ -3876,7 +3905,7 @@ sv:
 
       Antingen du eller företaget kan när som helst avsluta det avtal som beskrivs i dessa villkor. När vårt avtal upphör upphör även ditt tillstånd att använda forumet.
 
-      Följande bestämmelser fortsätter att gälla även när vårt avtal upphör: [Ditt innehåll](#heading--your-content), [Återkoppling](#heading--feedback), [Ditt ansvar](#heading--responsibility), [Ansvarsfriskrivningar](#heading--disclaimers), [Ansvarsbegränsningar](#heading--liability) och [Allmänna villkor](#heading--general).
+      Följande bestämmelser fortsätter att gälla även när vårt avtal upphör: [Ditt innehåll](#header--din-innehåll), [Återkoppling](#rubrik--feedback), [Ditt ansvar](#header--responsibility), [Ansvarsfriskrivning](#rubrik--disclaimers), [Ansvarsbegränsning](#header--liability) och [Allmänna villkor](#header--general).
 
       <h2 id="heading--disputes"><a href="#heading--disputes">Tvister</a></h2>
 
@@ -3884,7 +3913,7 @@ sv:
 
       Du och företaget är överens om att söka förelägganden med anknytning till dessa villkor endast i en statlig eller federal domstol i %{city_for_disputes}. Varken du eller företaget kommer att invända mot jurisdiktion, forum eller plats i dessa domstolar.
 
-      ***Andra än för att söka ett föreläggande eller för krav enligt Computer Fraud and Abuse Act kommer du och företaget att lösa alla tvister genom bindande skiljedom från American Arbitration Association. Skiljedomsförfarandet kommer att följa AAA:s kommersiella skiljedomsregler och kompletterande förfaranden för konsumentrelaterade tvister. Skiljedomsförfarandet kommer att äga rum på %{city_for_disputes}. Du kommer att lösa alla tvister som en enskild person och inte som en del av en grupptalan eller annat representativt förfarande, vare sig som kärande eller som gruppmedlem. Ingen skiljedomare kommer att konsolidera en tvist med något annat skiljeförfarande utan företagets tillstånd.***
+      ***Annat än för att söka ett föreläggande eller för anspråk enligt Computer Fraud and Abuse Act kommer du och företaget att lösa alla tvister genom bindande skiljedom från American Arbitration Association. Skiljedomsförfarandet kommer att följa AAA:s kommersiella skiljedomsregler och kompletterande förfaranden för konsumentrelaterade tvister. Skiljedomsförfarandet kommer att äga rum i %{city_for_disputes}. Du kommer att lösa alla tvister som en enskild person och inte som en del av en grupptalan eller annat representativt förfarande, vare sig som kärande eller som gruppmedlem. Ingen skiljedomare kommer att konsolidera en tvist med något annat skiljeförfarande utan företagets tillstånd.***
 
       Alla skiljedomar kommer att omfatta kostnader för skiljeförfarandet, rimliga advokatarvoden och rimliga kostnader för vittnen. Du och företaget kan föra skiljedomar till varje behörig domstol.
 
@@ -3906,79 +3935,80 @@ sv:
 
       <h2 id="heading--changes"><a href="#heading--changes">Ändringar</a></h2>
 
-      Företaget uppdaterade senast dessa villkor den 12 juli 2018 och kan komma att uppdatera dessa villkor igen. Företaget kommer att publicera alla uppdateringar på forumet. För uppdateringar som innehåller väsentliga ändringar går företaget med på att skicka e-post till dig, om du har skapat ett konto och angett en giltig e-postadress. Företaget kan också tillkännage uppdateringar med särskilda meddelanden eller varningar på forumet.
+      Företaget uppdaterade senast dessa villkor den [INSERT LAST UPDATE DATE HERE] och kan komma att uppdatera dessa villkor igen. Företaget kommer att publicera alla uppdateringar på forumet. För uppdateringar som innehåller väsentliga ändringar går företaget med på att skicka e-post till dig, om du har skapat ett konto och angett en giltig e-postadress. Företaget kan också tillkännage uppdateringar med särskilda meddelanden eller varningar på forumet.
 
       När du får meddelande om en uppdatering av dessa villkor måste du godkänna de nya villkoren för att fortsätta använda forumet.
   privacy_topic:
     title: "Integritetspolicy"
     body: |
+      ## [Forumadministratör, här nedan finns ett exempel på en mall för en integritetspolicy som du bör anpassa till din webbplats.]
+
       <a name="collect"></a>
 
-      ## [Vilken information samlar vi in?](#collect)
+      ## [Vilken information samlar vi in?] (#collect)
 
-      Vi samlar in information från dig när du registrerar dig på vår webbplats och samlar in data när du deltar i forumet genom att läsa, skriva och utvärdera innehållet som delas här.
-       
-      När du registrerar dig på vår webbplats kan du bli ombedd att ange ditt namn och din e-postadress. Du kan dock besöka vår webbplats utan att registrera dig. Din e-postadress kommer att verifieras med ett e-postmeddelande som innehåller en unik länk. Om den länken besöks, vet vi att du kontrollerar e-postadressen.
+      Vi samlar in information från dig när du registrerar dig på vår webbplats och samlar in data när du deltar i forumet genom att läsa, skriva och utvärdera det innehåll som delas här.
 
-      Efter registrering och publicering registrerar vi IP-adressen som data härstammar från. Vi kan också behålla serverloggar som inkluderar IP-adressen för varje begäran till vår server.
+      När du registrerar dig på vår webbplats kan du bli ombedd att ange ditt namn och din e-postadress. Du kan dock besöka vår webbplats utan att registrera dig. Din e-postadress kommer att verifieras genom ett e-postmeddelande som innehåller en unik länk. Om denna länk besöks vet vi att du kontrollerar e-postadressen.
+
+      När du är registrerad och skriver inlägg registrerar vi den IP-adress som inlägget kommer från. Vi kan också behålla serverloggar som innehåller IP-adressen för varje begäran till vår server.
 
       <a name="use"></a>
 
-      ## [Vad använder vi din information till?](#use)
+      ## [Vad använder vi din information till?] (#use)
 
-       All information som vi samlar in från dig kan användas på något av följande sätt:
-       
-      * För att anpassa din upplevelse &mdash; din information hjälper oss att bättre möta dina individuella behov.
-      * För att förbättra vår webbplats &mdash; vi strävar kontinuerligt efter att förbättra våra webbplatserbjudanden baserat på den information och feedback vi får från dig.
-      * För att förbättra kundservice &mdash; din information hjälper oss att mer effektivt svara på dina kundtjänstförfrågningar och supportbehov.
-      * För att skicka periodiska e-postmeddelanden &mdash; e-postadressen som du anger kan användas för att skicka information, aviseringar som du begär om ändringar av ämnen eller som svar på ditt användarnamn, svara på förfrågningar och/eller andra förfrågningar eller frågor.
+      All information som vi samlar in från dig kan användas på något av följande sätt:
+
+      * För att anpassa din upplevelse &mdash; din information hjälper oss att bättre svara på dina individuella behov.
+      * För att förbättra vår webbplats &mdash; vi strävar ständigt efter att förbättra vårt utbud på webbplatsen baserat på den information och feedback vi får från dig.
+      * För att förbättra kundservicen &mdash; Din information hjälper oss att mer effektivt svara på dina förfrågningar om kundservice och supportbehov.
+      * För att skicka periodiska e-postmeddelanden &mdash; Den e-postadress du anger kan användas för att skicka dig information, meddelanden som du begär om ändringar i ämnen eller som svar på ditt användarnamn, svara på förfrågningar och/eller andra förfrågningar eller frågor.
 
       <a name="protect"></a>
 
-      ## [Hur skyddar vi din information?](#protect)
+      ## [Hur skyddar vi din information?] (#protect)
+
+      Vi tillämpar en rad olika säkerhetsåtgärder för att upprätthålla säkerheten för din personliga information när du anger, skickar in eller får tillgång till din personliga information.
 
-      Vi genomför olika säkerhetsåtgärder för att upprätthålla säkerheten för din personliga information när du skriver in, skickar in eller får åtkomst till din personliga information.
-       
       <a name="data-retention"></a>
 
-      ## [Vad är vår datalagringspolicy?](#data-retention)
+      ## [Vad är er policy för datalagring?] (#data-retention)
 
       Vi anstränger oss i god tro för att:
 
-      * Spara serverloggar som innehåller IP-adressen för alla förfrågningar till denna server i högst 90 dagar.
-      * Behålla IP-adresserna som är kopplade till registrerade användare och deras inlägg i högst fem år.
+      * Bevara serverloggar med IP-adressen för alla förfrågningar till denna server i högst [NUMBER OF DAYS] dagar.
 
       <a name="cookies"></a>
 
-       ## [Använder vi cookies?](#cookies)
+      ## [Använder vi kakor?](#cookies)
 
-      Ja. Cookies är små filer som en webbplats eller dess tjänsteleverantör överför till din dators hårddisk genom din webbläsare (om du tillåter det). Dessa cookies gör det möjligt för webbplatsen att känna igen din webbläsare och koppla den till ditt registrerade konto om du har ett registrerat konto.
+      Ja. Cookies är små filer som en webbplats eller dess tjänsteleverantör överför till din dators hårddisk via din webbläsare (om du tillåter det). Dessa cookies gör det möjligt för webbplatsen att känna igen din webbläsare och, om du har ett registrerat konto, koppla den till ditt registrerade konto.
 
-      Vi använder cookies för att förstå och spara dina preferenser för framtida besök och sammanställa aggregerad information om webbplatstrafik och webbplatsinteraktion så att vi kan erbjuda bättre webbplatsupplevelser och verktyg i framtiden. Vi kan ingå avtal med tredjepartsleverantörer för att hjälpa oss att bättre förstå våra besökare på webbplatsen. Dessa tjänsteleverantörer får inte använda den information som samlas in för våra räkning förutom för att hjälpa oss att bedriva och förbättra vår verksamhet.
+      Vi använder cookies för att förstå och spara dina preferenser för framtida besök och för att sammanställa samlade uppgifter om trafiken på webbplatsen och interaktion med webbplatsen så att vi kan erbjuda bättre upplevelser och verktyg på webbplatsen i framtiden. Vi kan avtala med tredjepartsleverantörer för att hjälpa oss att bättre förstå våra webbplatsbesökare. Dessa tjänsteleverantörer får inte använda den information som samlas in för vår räkning annat än för att hjälpa oss att bedriva och förbättra vår verksamhet.
 
       <a name="disclose"></a>
 
-      ## [Visar vi någon information till externa parter?](#disclose)
-       
-      Vi säljer inte, handlar eller överför på annat sätt din personliga identifierbara information till externa parter. Detta inkluderar inte betrodda tredje parter som hjälper oss att driva vår webbplats, driva vår verksamhet eller serva dig så länge dessa parter går med på att hålla denna information konfidentiell. Vi kan också släppa din information när vi anser att utgivningen är lämplig för att följa lagen, verkställa vår webbplatspolicy eller skydda våra eller andra rättigheter, egendom eller säkerhet. Icke-personligt identifierbar besökarinformation kan emellertid tillhandahållas andra parter för marknadsföring, reklam eller annan användning.
+      ## [Lämnar vi ut någon information till utomstående?] (#disclose)
+
+      Vi säljer, byter eller överför inte på annat sätt din personligt identifierbara information till utomstående. Detta omfattar inte betrodda tredje parter som hjälper oss att driva vår webbplats, bedriva vår verksamhet eller ge dig service, så länge dessa parter samtycker till att hålla informationen konfidentiell. Vi kan också komma att lämna ut din information när vi anser att det är lämpligt att lämna ut den för att följa lagen, tillämpa vår webbplatspolicy eller skydda våra eller andras rättigheter, egendom eller säkerhet. Information om besökare som inte är personligt identifierbar kan dock lämnas till andra parter för marknadsföring, reklam eller annan användning.
 
       <a name="third-party"></a>
 
-      ## [Tredjepartslänkar](#third-party)
+      ## [Länkar till tredje part] (#third-party)
 
-      Ibland kan vi, efter eget gottfinnande, inkludera eller erbjuda tredje parts produkter eller tjänster på vår webbplats. Dessa tredje parts webbplatser har separata och oberoende sekretesspolicy. Vi har därför inget ansvar eller ansvar för innehållet och aktiviteterna på dessa länkade webbplatser. Vi försöker ändå skydda vår webbplats integritet och välkomnar all feedback om dessa webbplatser.
+      Ibland kan vi, efter eget gottfinnande, inkludera eller erbjuda produkter eller tjänster från tredje part på vår webbplats. Dessa webbplatser från tredje part har separata och oberoende sekretesspolicyer. Vi har därför inget ansvar för innehållet och verksamheten på dessa länkade webbplatser. Vi försöker ändå skydda integriteten på vår webbplats och välkomnar all återkoppling om dessa webbplatser.
 
       <a name="coppa"></a>
 
-      ## [Barnens integritetsskydd online enligt COPPA](#coppa)
-       
-      Vår webbplats, produkter och tjänster riktas till alla personer som är minst 13 år eller äldre. Om denna server finns i USA och du är under 13 år ska du enligt kraven i COPPA ([Children's Online Privacy Protection Act](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)), inte använda den här webbplatsen.
+      ## [Uppfyllande av Children's Online Privacy Protection Act](#coppa)
+
+      Vår webbplats, våra produkter och tjänster riktar sig till personer som är minst 13 år eller äldre. Om den här servern finns i USA och du är under 13 år enligt kraven i COPPA ([Children's Online Privacy Protection Act](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)), får du inte använda den här webbplatsen.
 
       <a name="online"></a>
 
-      ## [Endast integritetspolicy online](#online)
+      ## [Integritetspolicy endast för online](#online)
 
-      Denna integritetspolicy gäller endast information som samlas in via vår webbplats och inte för information som samlas in offline.
+      Denna integritetspolicy online gäller endast för information som samlas in via vår webbplats och inte för information som samlas in offline.
 
       <a name="consent"></a>
 
@@ -3988,11 +4018,11 @@ sv:
 
       <a name="changes"></a>
 
-      ## [Ändringar av vår integritetspolicy](#changes)
+      ## [Ändringar i vår integritetspolicy](#ändringar)
 
-      Om vi ​​beslutar att ändra vår integritetspolicy kommer vi att publicera dessa ändringar på denna sida.
+      Om vi beslutar att ändra vår integritetspolicy kommer vi att lägga ut dessa ändringar på denna sida.
 
-      Detta dokument är licensierat genom CC-BY-SA ([Creative Commons Attribution-ShareAlike](https://creativecommons.org/licenses/by-sa/4.0/deed.sv)). Det uppdaterades senast den 31 maj 2013.
+      Det här dokumentet är CC-BY-SA. Det uppdaterades senast [INSERT LAST UPDATE DATE HERE].
   badges:
     mass_award:
       errors:
@@ -4279,6 +4309,7 @@ sv:
     required_tags_from_group:
       one: "Du måste omfatta minst %{count} %{tag_group_name}-tagg. Taggarna i den här gruppen är: %{tags}."
       other: "Du måste omfatta minst %{count} %{tag_group_name}-taggar. Taggarna i den här gruppen är: %{tags}."
+    limited_to_one_tag_from_group: "Taggarna %{tags} kan inte användas samtidigt. Ta bara med en av dem."
     invalid_target_tag: "kan inte vara en synonym till en synonym"
     synonyms_exist: "tillåts inte medan synonymer finns"
   rss_by_tag: "Ämnen taggade med %{tag}"
@@ -4297,10 +4328,10 @@ sv:
       message: "<p>Vi har sänt om aktiveringsbrevet till <b>%{email}</b>"
   safe_mode:
     title: "Gå över i felsäkert läge"
-    description: "I felsäkert läge kan du testa din webbplats utan att ladda några tillägg eller teman."
+    description: "I Säkert läge kan du testa din webbplats utan att ladda teman eller anpassningar av plugin-program på klientsidan. Anpassningar av plugin-program på serversidan förblir aktiverade."
     no_themes: "Inaktivera teman och temakomponenter"
-    no_unofficial_plugins: "Inaktivera alla inofficiella plugins"
-    no_plugins: "Inaktivera alla plugins"
+    no_unofficial_plugins: "Inaktivera inofficiella anpassningar av plugin-program på klientsidan"
+    no_plugins: "Inaktivera alla anpassningar av plugin-program på klientsidan"
     enter: "Starta felsäkert läge"
     must_select: "Du måste välja minst ett alternativ för att aktivera felsäkert läge."
   wizard:
@@ -4415,7 +4446,9 @@ sv:
           <p>Ha så kul och lycka till <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>med att bygga din nya gemenskap!</a></p>
   search_logs:
     graph_title: "Sökningar"
-  joined: "Gick med"
+  onebox:
+    discourse:
+      user_joined_community: "Gick med %{date}"
   discourse_push_notifications:
     popup:
       mentioned: '%{username} nämnde dig i "%{topic}" - %{site_title}'
@@ -4478,50 +4511,53 @@ sv:
         category: kategori inställningar
     actions:
       agree:
-        title: "Godkänn..."
+        title: "Ja"
       agree_and_keep:
         title: "Behåll inlägg"
-        description: "Godkänn flaggning men lämna inlägget oförändrat."
+        description: "Godkänn flaggning men lämna det här inlägget oförändrat."
       agree_and_keep_hidden:
         title: "Fortsätt dölja inlägg"
-        description: "Godkänn flaggning och lämna inlägget som dolt."
+        description: "Godkänn flaggning och fortsätt dölja inlägget."
       agree_and_suspend:
         title: "Stäng av användare"
         description: "Godkänn flaggning och stäng av användaren."
       agree_and_silence:
-        title: "Tysta användaren"
+        title: "Tysta användare"
         description: "Godkänn flaggning och tysta användaren."
       agree_and_restore:
         title: "Återställ inlägg"
         description: "Återställ inlägget så att alla användare kan se det."
       agree_and_hide:
         title: "Dölj inlägg"
-        description: "Dölj detta inlägg och sänd automatiskt användaren ett meddelande som uppmanar om att redigera det."
+        description: "Godkänn flaggning och dölj detta inlägg + sänd automatiskt användaren ett meddelande som uppmanar om att redigera det."
       delete_single:
         title: "Radera"
       delete:
         title: "Radera..."
       delete_and_ignore:
-        title: "Radera inlägg, samt ignorera"
-        description: "Radera inlägg; om det är det första inlägget, radera även ämnet"
+        title: "Ignorera flaggning och radera inlägget"
+        description: "Ignorera flaggningen genom att ta bort den från kön och radera inlägget. Om det är det första inlägget, radera ämnet också. "
       delete_and_ignore_replies:
-        title: "Radera inlägg + svar, samt ignorera"
-        description: "Radera inlägg och alla dess svar; om det är det första inlägget, radera även ämnet"
+        title: "Ignorera flaggning, radera inlägg och svar"
+        description: "Ignorera flaggningen genom att ta bort den från kön och radera inlägget och alla dess svar. Om det är det första inlägget, radera ämnet också"
         confirm: "Är du säker på att du vill radera alla svar på inlägget också?"
       delete_and_agree:
-        title: "Radera inlägg, samt samtyck"
-        description: "Radera inlägg; om det är det första inlägget, radera även ämnet"
+        title: "Radera inlägg"
+        description: "Godkänn flaggning och radera detta inlägg. Om det är det första inlägget, radera ämnet också."
       delete_and_agree_replies:
-        title: "Radera inlägg + svar, samt samtyck"
-        description: "Radera inlägg och alla dess svar; om det är det första inlägget, radera även ämnet"
+        title: "Radera inlägg och svar"
+        description: "Godkänn flaggning och radera detta inlägg och alla dess svar. Om det är det första inlägget, radera ämnet också."
         confirm: "Är du säker på att du vill radera alla svar på inlägget också?"
       disagree_and_restore:
-        title: "Håll inte med och återställ inlägg"
+        title: "Nej, återställ inlägget"
         description: "Återställ inlägget så att alla användare kan se det."
       disagree:
-        title: "Håll inte med"
+        title: "Nej"
       ignore:
         title: "Ignorera"
+      ignore_and_do_nothing:
+        title: "Gör ingenting"
+        description: "Ignorera flaggningen genom att ta bort den från kön utan att vidta några åtgärder. Dolda inlägg kommer att förbli dolda och hanteras av de automatiska verktygen."
       approve:
         title: "Godkänn"
       approve_post:
@@ -4580,6 +4616,11 @@ sv:
     payload_url:
       blocked_or_internal: "Försändelse-URL:en kan inte användas eftersom den leder till en blockerad eller intern IP-adress."
       unsafe: "Försändelse-URL:en kan inte användas eftersom den är osäker"
+  form_templates:
+    errors:
+      invalid_yaml: "är inte en giltig YAML-sträng"
+      invalid_type: "innehåller en ogiltig malltyp: %{type} (giltiga typer är: %{valid_types})"
+      missing_type: "saknar en fälttyp"
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.sw.yml b/config/locales/server.sw.yml
index c287413e30e..b25e5414005 100644
--- a/config/locales/server.sw.yml
+++ b/config/locales/server.sw.yml
@@ -855,7 +855,6 @@ sw:
     tl3_promotion_min_duration: "Siku ambazo lazima zipite kwa mtumiaji aliyepanda cheo kufika kiwango cha 3 cha uaminifu kabla hajarudishwa kwenye kiwango cha 2 cha uaminifu."
     tl3_requires_likes_given: "Kiwango cha chini cha upendo unaotakiwa kutolewa ndani ya siku (tl3 time period) ili mtu afuzu kufika kiwango cha 3 cha uaminifu."
     tl3_requires_likes_received: "Kiwango cha chini cha upendo unaotakiwa kupokelewa ndani ya siku (tl3 time period) ili mtu afuzu kufika kiwango cha 3 cha uaminifu."
-    trusted_users_can_edit_others: "Ruhusu watumiaji wenye viwango vya juu vya uaminifu kuhariri maandishi ya watumiaji wengine"
     min_trust_to_create_topic: "kiwango cha chini cha uaminifu kinachohitajika kabla ya kutengeneza mada mpya."
     allow_flagging_staff: "Kama ikiruhusiwa, watumiaji wanaweza kuweka bendera kwenye machapisho kutoka kwenye akaunti za wasaidizi."
     min_trust_to_edit_wiki_post: "Kiwango cha chini cha uaminifu kinachohitajika kuhariri machapisho ambayo ni wiki."
@@ -905,7 +904,6 @@ sw:
     embed_support_markdown: "Ruhusu umbizo wa Markdown kwa ajili ya machapisho yaliyoambatanishwa."
     embed_post_limit: "Kiwango cha juu cha machapisho yakuambatanisha."
     embed_username_required: "Jina la mtumiaji kwa ajili ya kutengeneza mada linahitajika."
-    show_create_topics_notice: "Kama tovuti ina machapisho chini ya 5, onyesha notisi kuwaambia viongozi kutengeneza mada mpya."
     delete_drafts_older_than_n_days: "Futa mswadajaribio zenye umri zaidi ya siku (n)."
     enable_emoji: "Ruhusu ishara"
     emoji_set: "Ungependa ishara yako iwe vipi?"
@@ -926,7 +924,6 @@ sw:
     default_categories_watching: "Orodha ya kategoria zinazoangaliwa kama chaguo-msingi."
     default_categories_tracking: "Orodha ya kategoria zinazofuatiliwa kama chaguo-msingi."
     default_categories_muted: "Orodha ya kategoria zinazonyamazishwa kama chaguo-msingi."
-    min_trust_level_for_user_api_key: "Kiwango cha uaminifu kinachohitajika kutengeneza funguo za API za mtumiaji"
     tagging_enabled: "Ruhusu lebo kwenye mada?"
     min_trust_to_create_tag: "kiwango cha chini cha uaminifu kinachohitajika kutengeneza lebo."
     max_tags_per_topic: "Kiwango cha juu cha lebo ambazo zinaweza kuwekwa kwenye mada."
@@ -1387,14 +1384,6 @@ sw:
     user_automatically_silenced:
       title: "Mtumiaji Amenyamazishwa"
       subject_template: "Mtumiaji mpya %{username} amenyamazishwa na bendera za jumuia"
-      text_body_template: |
-        Ujumbe huu ni otomatiki.
-
-        Mtumiaji mpya [%{username}](%{user_url}) alinyamazishwa kwa sababu watumiaji wengi wameripoti (ma)chapisho ya %{username}.
-
-        Tafadhali [kagua ripoti](%{base_url}/admin/flags), Kama %{username} alinyamazishwa kimakosa, bonyeza kitufe cha kuondoa ukimya kwenye [ukurasa wa kiongozi kwa ajili ya mtumiaji](%{user_url}).
-
-        Kizingiti hiki kinaweza kubadilishwa kwenye mipangilio ya `nyamazisha_mtumiaji_mpya` kwenye tovuti.
     spam_post_blocked:
       title: "Chapisho Taka Limezuiliwa"
       subject_template: "Machapisho ya mtumiaji mpya %{username} yamezuiliwa kwa sababu ya viungo vinavyojirudia"
@@ -1409,8 +1398,6 @@ sw:
         Unaweza kuandika majibu na mada tena. Asante kwa uvumilivu wako.
     pending_users_reminder:
       title: "Ukumbusho wa Watumiaji Waliosubirishwa"
-    dashboard_problems:
-      title: "Matatizo ya Ubao"
     new_user_of_the_month:
       title: "Wewe ni Mtumiaji Mpya wa Mwezi!"
       subject_template: "Wewe ni Mtumiaji Mpya wa Mwezi!"
@@ -1435,9 +1422,6 @@ sw:
   user_notifications:
     previous_discussion: "Majibu Yaliyopita"
     in_reply_to: "Jibu Kuendana Na"
-    unsubscribe:
-      title: "Jitoe"
-      description: "Hautaki kupata hizi barua pepe? Hamna tatizo! Bofya hapa chini kujitoa mara moja:"
     reply_by_email: "[Tembelea Mada](%{base_url}%{url}) au jibu barua pepe hii kutoa maoni."
     only_reply_by_email: "Jibu barua pepe hii kutoa maoni."
     visit_link_to_respond: "[Tembelea Mada](%{base_url}%{url}) kutoa maoni."
@@ -1652,7 +1636,6 @@ sw:
       liked_received: "Upendo Uliopokelewa"
       new_users: "Watumiaji Wapya"
       popular_topics: "Mada Maarufu"
-      follow_topic: "Fuatilia mada"
       join_the_discussion: "Soma Zaidi"
       popular_posts: "Machapisho Maarufu"
       more_new: "Mpya kwako"
@@ -1763,12 +1746,6 @@ sw:
   offline:
     title: "Haiwezi kupakia programu-tumizi"
     offline_page_message: "Inaonekana kuwa hauko hewani! Tafadhali angalia muunganisho wa mtandao na jaribu tena."
-  login_required:
-    welcome_message: |
-      ## [Karibu kwenye %{title}](#karibu)
-      Akaunti inahitajika. Tafadhali tengeneza akaunti au ingia kuendelea.
-  deleted: "imefutwa"
-  image: "picha"
   upload:
     unauthorized: "Samahani, faili unalo jaribu kupakia halina kibali (authorized extensions: %{authorized_extensions})."
     pasted_image_filename: "Picha Iliyobandikwa"
@@ -2008,8 +1985,6 @@ sw:
       title: "Tuma Tena Barua Pepe ya Uanzisho"
       message: "<p>Tumekutumia tena barua ya uanzishaji<b>%{email}</b>"
   safe_mode:
-    no_unofficial_plugins: "Sitisha programu-jalizi zisizo rasmi"
-    no_plugins: "Sitisha programu-jalizi zote"
     enter: "Ingia Hali-tumizi iliyo salama"
   wizard:
     title: "Mpangilio wa Discourse"
@@ -2053,7 +2028,6 @@ sw:
         title: "Discourse yako iko Tayari!"
   search_logs:
     graph_title: "Idadi ya Utafiti"
-  joined: "Alijiunga"
   discourse_push_notifications:
     popup:
       mentioned: '%{jina la mtumiaji} amekutaja kwenye "%{mada}" - %{jina la_tovuti}'
@@ -2068,28 +2042,24 @@ sw:
     sensitivity:
       disabled: "Imezuiwa"
     actions:
-      agree_and_keep:
-        title: "Tunza Chapisho"
-        description: "Kubaliana na bendera na chapisho halitabadilishwa."
+      agree:
+        title: "Ndio"
       agree_and_suspend:
-        title: "Simamisha Mtumiaji"
         description: "Kubaliana na bendera na simamisha mtumiaji."
       agree_and_silence:
-        title: "Nyamazisha Mtumiaji"
         description: "Kubaliana na bendera na nyamazisha mtumiaji."
       agree_and_restore:
         description: "Rudisha chapisho ili watumiaji wote waweze kuliona."
-      agree_and_hide:
-        title: "Ficha Chapisho"
-        description: "Ficha chapisho hili na otomatikali mtumie mtumiaji ujumbe wa kumwambia afanye uhariri."
       delete_single:
         title: "Futa"
       disagree_and_restore:
         description: "Rudisha chapisho ili watumiaji wote waweze kuliona."
       disagree:
-        title: "Kataa"
+        title: "Hapana"
       ignore:
         title: "Puuzia"
+      ignore_and_do_nothing:
+        title: "Usifanye chochote"
       approve:
         title: "Imethibitishwa"
       reject_user:
diff --git a/config/locales/server.te.yml b/config/locales/server.te.yml
index b434d6b3e08..26d4b5a3b87 100644
--- a/config/locales/server.te.yml
+++ b/config/locales/server.te.yml
@@ -643,8 +643,6 @@ te:
     see_more: "ఇంకా"
     search_title: "ఈ సైట్ వెదుకు"
     search_button: "వెతుకు"
-  deleted: "తొలగించారు"
-  image: "బొమ్మ"
   upload:
     images:
       size_not_found: "క్షమించండి, కానీ మేము చిత్రం యొక్క పరిమాణం నిర్ణయించలేదు. బహుశా మీ చిత్రం పాడై ఉండవచ్చు?"
@@ -736,15 +734,14 @@ te:
             choices:
               categories_only:
                 label: "వర్గాలు మాత్రమే"
-  joined: "చేరినారు"
   reviewables:
     actions:
-      agree_and_suspend:
-        title: "సభ్యుడిని సస్పెండు చేయి"
+      agree:
+        title: "అవును"
       delete_single:
         title: "తొలగించు"
       disagree:
-        title: "ఒప్పుకోకు"
+        title: "లేదు"
       approve:
         title: "అంగీకరించు"
       reject_user:
diff --git a/config/locales/server.th.yml b/config/locales/server.th.yml
index 5fbbe64b019..9dab04427ef 100644
--- a/config/locales/server.th.yml
+++ b/config/locales/server.th.yml
@@ -457,8 +457,6 @@ th:
     see_more: "อื่น"
     search_title: "ค้นหาเว็บไซต์นี้"
     search_button: "ค้นหา"
-  deleted: "ลบ"
-  image: "รูปภาพ"
   color_schemes:
     default_theme_name: "ค่าเริ่มต้น"
   csv_export:
@@ -507,7 +505,6 @@ th:
                 label: "หมวดหมู่และกระทู้ล่าสุด"
               categories_and_top_topics:
                 label: "หมวดหมู่และกระทู้ยอดนิยม"
-  joined: "สมัครสมาชิกเมื่อ"
   discourse_push_notifications:
     popup:
       mentioned: '%{username} พูดถึงคุณใน "%{topic}" - %{site_title}'
@@ -531,10 +528,12 @@ th:
       medium: "ปานกลาง"
       high: "สูง"
     actions:
+      agree:
+        title: "ใช่"
       delete_single:
         title: "ลบ"
       disagree:
-        title: "ไม่เห็นด้วย"
+        title: "ไม่ใช่"
       ignore:
         title: "ไม่สนใจ"
       approve:
diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml
index 31ca00cb122..a038ecc94b5 100644
--- a/config/locales/server.tr_TR.yml
+++ b/config/locales/server.tr_TR.yml
@@ -52,6 +52,11 @@ tr_TR:
   remove_posts_deleted_by_author: "Yazar tarafından silindi"
   redirect_warning: "Seçtiğiniz bağlantının gerçekten foruma gönderildiğini doğrulayamadık. Yine de devam etmek istiyorsanız aşağıdaki bağlantıyı seçin."
   on_another_topic: "Başka bir konuda"
+  topic_category_changed: "%{from} iken %{to} oldu"
+  topic_tag_changed:
+    added_and_removed: "%{added} eklendi ve %{removed} kaldırıldı"
+    added: "%{added} eklendi"
+    removed: "%{removed} kaldırıldı"
   inline_oneboxer:
     topic_page_title_post_number: "#%{post_number}"
     topic_page_title_post_number_by_user: "%{username} tarafından #%{post_number}"
@@ -191,8 +196,8 @@ tr_TR:
       invalid_site_setting: "'%{name}' adında bir ayar mevcut değil"
       invalid_category_id: "Mevcut olmayan bir kategori belirttiniz"
       invalid_choice:
-        one: "Geçersiz bir seçim belirttiniz %{name}"
-        other: "Geçersiz seçimler belirttiniz %{name}"
+        one: "'%{name}' geçersiz bir seçimdir."
+        other: "'%{name}' geçersiz bir seçimdir."
       default_categories_already_selected: "Başka bir listede kullanılan bir kategoriyi seçemezsiniz."
       default_tags_already_selected: "Başka bir listede kullanılan bir etiketi seçemezsiniz."
       s3_upload_bucket_is_required: "\"s3_upload_bucket\" değerini sağlamadığınız sürece S3'e yüklemeleri etkinleştiremezsiniz."
@@ -200,7 +205,8 @@ tr_TR:
       page_publishing_requirements: "Güvenli medya etkinleştirilmişse sayfa yayınlama etkinleştirilemez."
       s3_backup_requires_s3_settings: "\"%{setting_name}\" değerini sağlamadığınız sürece S3'ü yedekleme konumu olarak kullanamazsınız."
       s3_bucket_reused: "\"s3_upload_bucket\" ve \"s3_backup_bucket\" için aynı kovayı kullanamazsınız. Farklı bir kova seçin veya her kova için farklı bir yol kullanın."
-      secure_uploads_requirements: "Güvenli yüklemeler etkinleştirilmeden önce S3 yüklemeleri etkinleştirilmeli."
+      secure_uploads_requirements: "Güvenli yüklemeler etkinleştirilmeden önce S3 yüklemeleri ve S3 ACL'leri etkinleştirilmelidir."
+      s3_use_acls_requirements: "Güvenli yüklemeler etkinleştirildiğinde S3 ACL'lerin etkin olması gerekir."
       share_quote_facebook_requirements: "Facebook için alıntı paylaşımını etkinleştirmek üzere bir Facebook uygulama kimliği belirlemeniz gerekiyor."
       second_factor_cannot_enforce_with_socials: "Sosyal girişler etkinken 2 adımlı kimlik doğrulamayı zorlayamazsınız. Önce şu yolla giriş yapmayı devre dışı bırakmalısınız: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Yerel girişler devre dışı bırakılmışsa 2 adımlı kimlik doğrulamayı zorlayamazsınız."
@@ -221,6 +227,10 @@ tr_TR:
         other: "Üzgünüz, şu oEmbed / OpenGraph etiketleri bulunamadığından bu web sayfası için ön izleme oluşturamadık: %{missing_attributes}"
   word_connector:
     comma: ", "
+  custom_fields:
+    validations:
+      max_items: "Bu varlık için maksimum özel alan sayısına ulaşıldı (%{max_items_number})"
+      max_value_length: "Özel alan değeri için maksimum uzunluğa ulaşıldı (%{max_value_length})"
   invite:
     expired: "Davet belirtecinizin süresi doldu. Lütfen <a href='%{base_url}/about'>personelle iletişime geçin</a>."
     not_found: "Davet belirteciniz geçersiz. Lütfen <a href='%{base_url}/about'>personelle iletişime geçin</a>."
@@ -239,6 +249,7 @@ tr_TR:
     user_exists: "<b>%{email}</b> adresini davet etmeye gerek yok, zaten hesabı var!"
     invite_exists: "<b>%{email}</b> adresini zaten davet etmiştiniz."
     invalid_email: "%{email} geçerli bir e-posta adresi değil."
+    generic_error_response: "Talebinizle ilgili bir sorun oluştu."
     rate_limit:
       one: "Son 24 saat içinde zaten %{count} davet gönderdiniz, lütfen tekrar denemeden önce %{time_left} bekleyin."
       other: "Son 24 saat içinde zaten %{count} davet gönderdiniz, lütfen tekrar denemeden önce %{time_left} bekleyin."
@@ -400,6 +411,7 @@ tr_TR:
   too_late_to_edit: "Bu gönderi çok uzun zaman önce oluşturulmuş. Artık düzenlenemez veya silinemez."
   edit_conflict: "Bu gönderi başka bir kullanıcı tarafından düzenlendi ve değişiklikleriniz artık kaydedilemiyor."
   revert_version_same: "Geçerli sürüm, geri dönmeye çalıştığınız sürümle aynı."
+  reverted_to_version: "#%{version} sürümüne geri dönüldü"
   cannot_edit_on_slow_mode: "Bu konu yavaş modda. Üzerinde düşünülmüş bir tartışmayı teşvik etmek için bu konudaki eski gönderileri düzenlemeye şu anda yavaş modda izin verilmiyor."
   excerpt_image: "görüntü"
   bookmarks:
@@ -495,6 +507,7 @@ tr_TR:
     sequential_replies: "### Aynı anda birkaç gönderiye yanıt vermeyi düşünün\n \nBunun yerine lütfen önceki gönderilerden alıntılar veya @name referansları içeren tek bir yanıt vermeyi düşünün.\n\n\nMetni vurgulayıp görünen <b>yanıtı alıntıla</b> düğmesini seçerek alıntı eklemek üzere önceki yanıtınızı düzenleyebilirsiniz.\n\nÇok sayıda küçük ve bireysel yanıt yerine daha az sayıda derinlemesine yanıt içeren konuları okumak herkes için daha kolay olur.\n"
     dominating_topic: Bu konuya çok şey gönderdiniz! Başkalarına da burada yanıt verme ve birbirleriyle tartışma fırsatı vermeyi düşünün.
     get_a_room: '%{reply_username} adlı kullanıcıya %{count} kez yanıt verdiniz, bunun yerine ona kişisel bir mesaj gönderebileceğinizi biliyor muydunuz?'
+    dont_feed_the_trolls: Bu gönderi, moderatörün dikkatine sunulmak üzere zaten işaretlenmiş. Yanıt vermek istediğinize emin misiniz? Olumsuz içeriğe verilen yanıtlar, daha olumsuz davranışları teşvik etme eğilimindedir.
     too_many_replies: |
       ### Bu konu için yanıt limitine ulaştınız
 
@@ -584,7 +597,9 @@ tr_TR:
         translation_overrides:
           attributes:
             value:
-              invalid_interpolation_keys: 'Şu enterpolasyon anahtar(lar)ı geçersiz: "%{keys}"'
+              invalid_interpolation_keys:
+                one: "Aşağıdaki enterpolasyon anahtarı geçersizdir: %{keys}"
+                other: "Aşağıdaki enterpolasyon anahtarları geçersizdir: %{keys}"
         watched_word:
           attributes:
             word:
@@ -605,22 +620,22 @@ tr_TR:
   staff_category_name: "Personel"
   staff_category_description: "Personel tartışmaları için özel kategori. Konular sadece yöneticiler ve moderatörler tarafından görülebilir."
   discourse_welcome_topic:
-    title: "Topluluğumuza hoş geldiniz!"
-    body: |2
+    title: "Burası %{site_title}, hoş geldiniz! :wave:"
+    body: |
+      Bize katıldığınız için çok mutluyuz.
 
-      Bu sabitlenmiş konunun ilk paragrafı, ana sayfanızdaki tüm yeni ziyaretçilere karşılama mesajı olarak görünecek. Bu çok önemli!
+      %{site_info_quote}
 
-      Topluluğunuzun kısa bir açıklaması olarak **bunu düzenleyin**:
+      Başlamak için yapabileceğiniz bazı şeyler:
 
-      - Kimin için?
-      - Burada ne bulabilirler?
-      - Neden buraya gelmeliler?
-      - Daha fazla bilgiyi nerede bulabilirler (bağlantılar, kaynaklar vb.)?
+      :speaking_head: Resminizi, kendiniz ve ilgi alanlarınız hakkındaki bilgileri [profilinize](%{base_path}/my/preferences/account) ekleyerek **kendinizi tanıtın**. Size sorulmasını istediğiniz tek bir soru olsa bu ne olurdu?
 
-      <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+      :open_book: Zaten başlamış olan [tartışmalara göz atarak](%{base_path}/top) **topluluğu tanıyın**. Bir gönderiyi ilginç, bilgilendirici veya eğlenceli bulduğunuzda, takdirinizi veya desteğinizi göstermek için :heart: kullanın!
 
-      Bu konuyu yönetici :wrench: (sağ üstte ve altta) aracılığıyla kapatmak isteyebilirsiniz, böylece yanıtlar bir duyuruda birikmez.
-  admin_quick_start_title: "ÖNCE BURAYI OKUYUN: Yönetici Hızlı Başlangıç Kılavuzu"
+      :handshake: Tartışmalara yorum yaparak, kendi bakış açınızı paylaşarak, sorular sorarak veya geri bildirimde bulunarak **katkıda bulunun**. Yanıt vermeden veya yeni konulara başlamadan önce lütfen [Topluluk Kuralları](%{base_path}/sss)nı inceleyin.
+
+      > Yardıma ihtiyacınız olursa veya bir öneriniz varsa, [#feedback](%{base_path}/c/site-feedback) bölümünde veya [yöneticilerle ile iletişime geçerek](%{base_path}/about) sorabilirsiniz.
+  admin_quick_start_title: "Yönetici Kılavuzu: Başlarken"
   category:
     topic_prefix: "%{category} kategorisi hakkında"
     replace_paragraph: "(Bu ilk paragrafı yeni kategorinizin kısa bir açıklaması ile değiştirin. Bu kılavuz kategori seçim alanında görünecek, bu nedenle 200 karakterin altında tutmaya çalışın)."
@@ -639,6 +654,7 @@ tr_TR:
       disallowed_tags_generic: "Bu konu izin verilmeyen etiketlere sahip."
       slug_contains_non_ascii_chars: "ascii olmayan karakterler içeriyor"
       is_already_in_use: "zaten kullanımda"
+      move_topic_to_category_disallowed: "Bu konuyu, yeni konu oluşturma izninizin olmadığı bir kategoriye taşıyamazsınız."
     cannot_delete:
       uncategorized: "Bu kategori özeldir. Kategorisi olmayan konular için bir tutma alanı olarak tasarlanmıştır; silinemez."
       has_subcategories: "Alt kategorileri olduğu için bu kategori silinemiyor."
@@ -1102,7 +1118,7 @@ tr_TR:
       title: "Günlük Aktif Kullanıcı/Aylık Aktif Kullanıcı"
       xaxis: "Gün"
       yaxis: "Günlük Aktif Kullanıcı/Aylık Aktif Kullanıcı"
-      description: "Son gün giriş yapan üye sayısı, son ay giriş yapan üye sayısına bölündüğünde topluluk \"yapışkanlığını\" gösteren bir % elde edilir. Hedefiniz >%30 olsun."
+      description: "Son gün giriş yapan üye sayısı, son ay giriş yapan üye sayısına bölündüğünde topluluk \"yapışkanlığını\" gösteren bir % elde edilir. Hedefiniz >%20 olsun."
     daily_engaged_users:
       title: "Günlük Etkileşimli Kullanıcılar"
       xaxis: "Gün"
@@ -1371,6 +1387,7 @@ tr_TR:
     image_magick_warning: 'Sunucu büyük resimlerin küçük resimlerini oluşturacak şekilde yapılandırılmış, ancak ImageMagick yüklü değil. ImageMagick''i favori paket yöneticinizi kullanarak yükleyin veya <a href="https://www.imagemagick.org/script/download.php" target="_blank">en son sürümü indirin</a>.'
     failing_emails_warning: 'Başarısız olan %{num_failed_jobs} e-posta işi var. App.yml dosyanızı kontrol edin ve posta sunucusu ayarlarının doğru olduğundan emin olun. <a href="%{base_path}/sidekiq/retries" target="_blank">Sidekiq''teki</a> başarısız işlere bakın.'
     subfolder_ends_in_slash: "Alt klasör kurulumunuz yanlış; DISCOURSE_RELATIVE_URL_ROOT bir eğik çizgi ile bitiyor."
+    outdated_translations_warning: "Kullandığınız bazı standart dışı çeviriler güncel değil. Lütfen <a href='%{base_path}/admin/customize/site_texts?outdated=true'>metin özelleştirmenizi</a> kontrol edin."
     email_polling_errored_recently:
       one: "E-posta yoklaması son 24 saat içinde bir hata oluşturdu. Daha fazla ayrıntı için <a href='%{base_path}/logs' target='_blank'>günlüklere</a> bakın."
       other: "E-posta yoklaması son 24 saat içinde %{count} hata oluşturdu. Daha fazla ayrıntı için <a href='%{base_path}/logs' target='_blank'>günlüklere</a> bakın."
@@ -1382,6 +1399,8 @@ tr_TR:
     out_of_date_themes: "Aşağıdaki temalar için güncellemeler mevcut:"
     unreachable_themes: "Aşağıdaki temalarda güncelleme olup olmadığını kontrol edemedik:"
     watched_word_regexp_error: "\"%{action}\" izlenen sözcükler için normal ifade geçersiz. Lütfen <a href='%{base_path}/admin/customize/watched_words'>İzlenen Kelime ayarlarınızı</a>kontrol edin veya \"izlenen kelimeler sıradan ifadeler\" site ayarını devre dışı bırakın."
+    v3_analytics_deprecated: "Discourse'unuz şu anda Temmuz 2023'ten sonra artık desteklenmeyecek olan Google Analytics 3'ü kullanıyor. Web sitenizin performansı hakkında değerli bilgiler ve analizler almaya devam etmek için hemen <a href='https://meta.discourse.org/t/260498'>Google Analytics 4'e yükseltin</a>."
+    legacy_navigation_menu_deprecated: "Discourse'unuz şu anda <a href='https://meta.discourse.org/t/removing-the-legacy-hamburger-navigation-menu-option/265274'>Discourse 3.2'nin</a>ilk beta sürümünde kaldırılacak olan \"eski\" gezinme menüsünü kullanıyor. <a href='%{base_path}/admin/site_settings/category/all_results?filter=navigation_menu'>Gezinme menüsü site ayarınızı</a> \"yan çubuk\" veya \"başlık açılır menüsü\" olarak güncelleyerek yeni gezinme menüsüne geçiş yapın."
   site_settings:
     allow_bulk_invite: "Bir CSV dosyası yükleyerek toplu davetlere izin verin"
     disabled: "devre dışı"
@@ -1447,8 +1466,11 @@ tr_TR:
     fixed_category_positions_on_create: "İşaretlenirse kategori sıralaması konu oluşturma iletişim kutusunda korunur (fixed_category_positions gerektirir)."
     add_rel_nofollow_to_user_content: 'Dahili bağlantılar hariç (ana alan adları dahil) gönderilen tüm kullanıcı içeriğine rel nofollow ekleyin. Bunu değiştirirseniz tüm gönderileri şu şekilde yeniden oluşturmanız gerekir: "rake posts:rebake"'
     exclude_rel_nofollow_domains: "Bağlantılara nofollow eklenmemesi gereken alan adlarının bir listesi. example.com otomatik olarak sub.example.com'a da izin verir. Web tarayıcılarının tüm içeriği bulmasına yardımcı olmak için minimum olarak bu sitenin alan adını eklemelisiniz. Web sitenizin diğer bölümleri başka alan adlarındaysa bunları da ekleyin."
+    max_form_template_title_length: "Form şablonu başlıkları için izin verilen maksimum uzunluk."
+    max_form_template_content_length: "Form şablonu içeriği için izin verilen maksimum uzunluk."
     post_excerpt_maxlength: "Bir gönderi alıntısının / özetinin maksimum uzunluğu."
     topic_excerpt_maxlength: "Bir konudaki ilk gönderiden oluşturulan bir konu alıntısının / özetinin maksimum uzunluğu."
+    default_subcategory_on_read_only_category: "\"Yeni Konu\" düğmesini etkinleştirir ve kullanıcının yeni bir konu oluşturmasına izin verilmeyen kategorilerde yayınlamak için varsayılan bir alt kategori seçer."
     show_pinned_excerpt_mobile: "Mobil görünümde sabitlenmiş konularda alıntıyı gösterin."
     show_pinned_excerpt_desktop: "Masaüstü görünümünde sabitlenmiş konularda alıntıyı gösterin."
     post_onebox_maxlength: "Tek kutulu bir Discourse gönderisinin karakter cinsinden maksimum uzunluğu."
@@ -1470,7 +1492,7 @@ tr_TR:
     manifest_icon: "Android'de logo/splash görüntüsü olarak kullanılan görüntü. Otomatik olarak 512 × 512 olarak yeniden boyutlandırılır. Boş bırakılırsa large_icon kullanılır."
     manifest_screenshots: "Kurulum istemi sayfasında örneğinizin özelliklerini ve işlevselliğini gösteren ekran görüntüleri. Tüm görüntüler yerel yüklemeler olmalı ve aynı boyutlarda olmalıdır."
     favicon: "Siteniz için bir favicon, bkz. <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://en.wikipedia.org/wiki/Favicon</a>. CDN üzerinden düzgün çalışması için png olmalıdır. 32x32 olarak yeniden boyutlandırılır. Boş bırakılırsa large_icon kullanılır."
-    apple_touch_icon: "Apple dokunmatik cihazlar için kullanılan simge. Otomatik olarak 180x180 olarak yeniden boyutlandırılır. Boş bırakılırsa large_icon kullanılır."
+    apple_touch_icon: "Apple dokunmatik cihazlar için kullanılan simge. Şeffaf bir arka plan önerilmez. Otomatik olarak 180x180 olarak yeniden boyutlandırılacaktır. Boş bırakılırsa, large_icon kullanılacaktır."
     opengraph_image: "Varsayılan opengraph görüntüsü, sayfada başka uygun görüntü olmadığında kullanılır. Boş bırakılırsa large_icon kullanılır"
     twitter_summary_large_image: "Twitter kartı \"özet büyük resmi\" (en az 280 genişliğinde ve en az 150 yüksekliğinde olmalıdır, .svg olamaz). Boş bırakılırsa .svg olmadığı sürece opengraph_image kullanılarak normal kart meta verileri oluşturulur"
     notification_email: "Tüm temel sistem e-postalarını gönderirken kullanılan kimden: e-posta adresi. Burada belirtilen alan adının, e-postanın ulaşması için SPF, DKIM ve ters PTR kayıtlarının doğru şekilde ayarlanmış olması gerekir."
@@ -1486,6 +1508,8 @@ tr_TR:
     summary_percent_filter: "Bir kullanıcı \"Bu Konuyu Özetleyin\" seçeneğine tıkladığında, gönderilerin en popüler %'sini gösterin"
     summary_max_results: "\"Bu Konuyu Özetle\" ile döndürülen maksimum gönderi sayısı"
     summary_timeline_button: "Zaman çizelgesinde bir \"Özetle\" düğmesi gösterin"
+    summarization_strategy: "Eklentiler tarafından kaydedilen içeriği özetlemenin diğer yolları"
+    custom_summarization_allowed_groups: "`summarization_strategy` kullanarak içerikleri özetlemesine izin verilen gruplar."
     enable_personal_messages: "KALDIRILDI, bunun yerine \"kişisel mesaj etkin gruplar\" ayarını kullanın. Güven seviyesi 1 (mesaj göndermek için minimum güven ile yapılandırılabilir) kullanıcıların mesaj oluşturmasına ve mesajlara yanıt vermesine izin verin. Personelin ne olursa olsun her zaman mesaj gönderebileceğini unutmayın."
     personal_message_enabled_groups: "Bu gruplardaki kullanıcıların mesaj oluşturmasına ve mesajlara yanıt vermesine izin verin. Güven seviyesi grupları, bu sayının üzerindeki tüm güven seviyelerini içerir, örneğin trust_level_1'i seçmek, trust_level_2, 3, 4 kullanıcılarının kişisel mesaj göndermesine de izin verir. Personelin ne olursa olsun her zaman mesaj gönderebileceğini unutmayın."
     enable_system_message_replies: "Kişisel mesajlar devre dışı bırakılmış olsa bile kullanıcıların sistem mesajlarını yanıtlayabilmesine izin verir"
@@ -1580,6 +1604,7 @@ tr_TR:
     enable_badges: "Rozet sistemini etkinleştirin"
     max_favorite_badges: "Kullanıcının seçebileceği maksimum rozet sayısı"
     whispers_allowed_groups: "Belirli grupların üyeleri için konular dahilinde özel iletişime izin verin."
+    hidden_post_visible_groups: "Bu grupların üyelerinin gizli gönderileri görmesine izin ver. Personel olan kullanıcılar gizli gönderileri her zaman görüntüleyebilir."
     allow_index_in_robots_txt: "Robots.txt dosyasında bu sitenin web arama motorları tarafından dizine eklenmesine izin verildiğini belirtin. İstisnai durumlarda kalıcı olarak <a href='%{base_path}/admin/customize/robots'>robots.txt'i geçersiz kılabilirsiniz</a>."
     blocked_email_domains: "Kullanıcıların hesap açmasına izin verilmeyen e-posta alan adlarının boruyla ayrılmış bir listesi. Belirtilen alan adları için alt alan adları otomatik olarak işlenir. Joker karakter sembolleri * ve ? desteklenmez. Örnek: mailinator.com|trashmail.net"
     allowed_email_domains: "Kullanıcıların hesap açmaları GEREKEN e-posta alan adlarının boruyla ayrılmış bir listesi. Belirtilen alan adları için alt alan adları otomatik olarak işlenir. Joker karakter sembolleri olan * ve ? desteklenmez. UYARI: Listelenenler dışındaki e-posta alan adlarına sahip kullanıcılara izin verilmez!"
@@ -1606,7 +1631,7 @@ tr_TR:
     enable_discourse_connect: "DiscourseConnect (eski adıyla \"Discourse SSO\") üzerinden oturum açmayı etkinleştirin (UYARI: KULLANICILARIN E-POSTA ADRESLERİ *MUTLAKA* HARİCİ SİTE TARAFINDAN DOĞRULANMALIDIR!)"
     verbose_discourse_connect_logging: "DiscourseConnect ile ilgili tanıları <a href='%{base_path}/logs' target='_blank'>/logs</a> konumuna kaydedin"
     enable_discourse_connect_provider: "DiscourseConnect (eski adıyla \"Discourse SSO\") sağlayıcı protokolünü /session/sso_provider uç noktasında uygulayın, discourse_connect_provider_secrets'ın ayarlanmasını gerektirir"
-    discourse_connect_url: "DiscourseConnect uç noktasının URL'si (http:// veya https:// içermelidir)"
+    discourse_connect_url: "DiscourseConnect uç noktasının URL'si (http:// veya https:// içermeli ve sonunda bir eğik çizgi -slash- içermemelidir)"
     discourse_connect_secret: "DiscourseConnect bilgilerini kriptografik olarak doğrulamak için kullanılan gizli dizi, 10 karakter veya daha uzun olduğundan emin olun"
     discourse_connect_provider_secrets: "DiscourseConnect kullanan alan adı-gizli dizi çiftlerinin bir listesi. DiscourseConnect sırrının 10 karakter veya daha uzun olduğundan emin olun. Joker karakter sembolü *, herhangi bir alan alanını veya yalnızca bir kısmını eşleştirmek için kullanılabilir (ör. *.example.com)."
     discourse_connect_overrides_bio: "Kullanıcı profilindeki kullanıcı biyografisini geçersiz kılar ve kullanıcının bunu değiştirmesini engeller"
@@ -1620,7 +1645,7 @@ tr_TR:
     discourse_connect_overrides_profile_background: "DiscourseConnect yükünden gelen değerle kullanıcı profili arka planını geçersiz kılar."
     discourse_connect_overrides_card_background: "DiscourseConnect yükünden gelen değerle kullanıcı kartı arka planını geçersiz kılar."
     discourse_connect_not_approved_url: "Onaylanmamış DiscourseConnect hesaplarını bu URL'ye yönlendirin"
-    discourse_connect_allows_all_return_paths: "DiscourseConnect tarafından sağlanan return_paths için etki alanını kısıtlamayın (varsayılan olarak dönüş yolu geçerli sitede olmalıdır)"
+    discourse_connect_allowed_redirect_domains: "DiscourseConnect tarafından sağlanan return_paths için bu alan adlarını kısıtlayın (varsayılan olarak dönüş yolu mevcut sitede olmalıdır). Dönüş yolu için herhangi bir etki alanına izin vermek için * kullanın. Alt alan adı joker karakterlerine (`*.foobar.com`) izin verilmez."
     enable_local_logins: "Yerel kullanıcı adı ve şifre girişi tabanlı hesapları etkinleştirin. UYARI: Devre dışı bırakılırsa daha önce en az bir alternatif giriş yöntemi yapılandırmadıysanız oturum açamayabilirsiniz."
     enable_local_logins_via_email: "Kullanıcıların kendilerine e-posta yoluyla gönderilecek tek tıklamayla giriş bağlantısını talep etmelerine izin verin."
     allow_new_registrations: "Yeni kullanıcı kayıtlarına izin verin. Herhangi birinin yeni bir hesap oluşturmasını önlemek için bunun işaretini kaldırın."
@@ -1656,6 +1681,7 @@ tr_TR:
     s3_configure_tombstone_policy: "Silinmiş öge yüklemeleri için otomatik silme ilkesini etkinleştirin. ÖNEMLİ: Devre dışı bırakılırsa yüklemeler silindikten sonra hiçbir alan geri alınmaz."
     s3_disable_cleanup: "İzin verilen maksimum değerden daha fazla yedekleme olduğunda eski yedeklemelerin S3'ten kaldırılmasını önleyin."
     enable_s3_inventory: "Amazon S3 envanterini kullanarak raporlar oluşturun ve yüklemeleri doğrulayın. ÖNEMLİ: Geçerli S3 kimlik bilgileri gerektirir (hem erişim anahtarı kimliği hem de gizli erişim anahtarı)."
+    s3_use_acls: "AWS, S3 klasörlerinde (bucket) ACL kullanılmamasını önerir; bu tavsiyeye uyacaksanız, bu seçeneğin işaretini kaldırın. Güvenli yüklemeler kullanıyorsanız bu etkinleştirilmelidir."
     backup_time_of_day: "Yedeklemenin gerçekleşmesi gereken günün saati UTC."
     backup_with_uploads: "Yüklemeleri zamanlanan yedeklemelere dahil et. Bu devre dışı bırakıldığında yalnızca veritabanı yedeklenir."
     backup_location: "Yedeklerin depolandığı konum. ÖNEMLİ: S3, Dosyalar ayarlarına geçerli S3 giriş bilgilerinin girilmesini gerektirir."
@@ -1705,6 +1731,7 @@ tr_TR:
     s3_secret_access_key: "Görüntüleri, ekleri ve yedeklemeleri yüklemek için kullanılacak Amazon S3 gizli erişim anahtarı."
     s3_region: "Görüntüleri ve yedeklemeleri yüklemek için kullanılacak Amazon S3 bölge adı."
     s3_cdn_url: "Tüm s3 varlıkları için kullanılacak CDN URL'si (örneğin: https://cdn.somewhere.com). UYARI: Bu ayarı değiştirdikten sonra tüm eski gönderileri yeniden oluşturmanız gerekir."
+    s3_use_cdn_url_for_all_uploads: "CDN URL'sini yalnızca resimler için değil, s3'e yüklenen tüm dosyalar için kullanın."
     avatar_sizes: "Otomatik olarak oluşturulan avatar boyutlarının listesi."
     external_system_avatars_enabled: "Harici sistem avatarları hizmetini kullanın."
     external_system_avatars_url: "Harici sistem avatarları hizmetinin URL'si. İzin verilen ikameler şunlardır: {username} {first_letter} {color} {size}"
@@ -1724,7 +1751,7 @@ tr_TR:
     composer_media_optimization_image_bytes_optimization_threshold: "İstemci tarafı optimizasyonunu tetiklemek için minimum görüntü dosyası boyutu"
     composer_media_optimization_image_resize_dimensions_threshold: "İstemci tarafında yeniden boyutlandırmayı tetiklemek için minimum görüntü genişliği"
     composer_media_optimization_image_resize_width_target: "Genişliği \"composer_media_optimization_image_dimensions_resize_threshold\" değerinden büyük olan görüntüler bu genişliğe yeniden boyutlandırılır. \"composer_media_optimization_image_dimensions_resize_threshold\" değerinden >= olmalıdır."
-    composer_media_optimization_image_encode_quality: "Yeniden kodlama işleminde kullanılan JPEG kodlama kalitesi."
+    composer_media_optimization_image_encode_quality: "Yeniden kodlama işleminde kullanılan JPG kodlama kalitesi."
     min_ratio_to_crop: "Uzun görüntüleri kırpmak için kullanılan oran. Genişlik / yükseklik sonucunu girin."
     simultaneous_uploads: "Besteciye sürüklenip bırakılabilecek maksimum dosya sayısı"
     default_invitee_trust_level: "Davet edilen kullanıcılar için varsayılan güven seviyesi (0-4)."
@@ -1753,7 +1780,9 @@ tr_TR:
     tl3_requires_likes_given: "Güven seviyesi 3'e yükselmeye hak kazanmak için son (gs3 zaman periyodu) gün içinde yapılması gereken minimum beğeni sayısı."
     tl3_requires_likes_received: "Güven seviyesi 3'e yükselmeye hak kazanmak için son (gs3 zaman dilimi) gün içinde alınması gereken minimum beğeni sayısı."
     tl3_links_no_follow: "Güven seviyesi 3 kullanıcılar tarafından gönderilen bağlantılardan rel=nofollow'u kaldırmayın."
-    trusted_users_can_edit_others: "Yüksek güven seviyesine sahip kullanıcıların diğer kullanıcıların içeriklerini düzenlemesine izin verin"
+    tl4_delete_posts_and_topics: "TL4 kullanıcılarının diğer kullanıcılar tarafından oluşturulan gönderileri ve konuları silmesine izin verin. TL4 kullanıcıları silinen konuları ve gönderileri de görebilir."
+    edit_all_topic_groups: "Bu gruptaki kullanıcıların diğer kullanıcıların konu başlıklarını, etiketlerini ve kategorilerini düzenlemesine izin ver"
+    edit_all_post_groups: "Bu gruptaki kullanıcıların diğer kullanıcıların gönderilerini düzenlemesine izin ver"
     min_trust_to_create_topic: "Yeni bir konu oluşturmak için gereken minimum güven seviyesi."
     allow_flagging_staff: "Etkinleştirilirse kullanıcılar personel hesaplarından gelen gönderilere bayrak ekleyebilir."
     min_trust_to_edit_wiki_post: "Viki olarak işaretlenmiş gönderiyi düzenlemek için gereken minimum güven seviyesi."
@@ -1789,7 +1818,7 @@ tr_TR:
     title_min_entropy: "Bir konu başlığı için gereken minimum entropi (benzersiz karakterler, daha fazlası için İngilizce olmayan sayısı)."
     body_min_entropy: "Bir gönderi gövdesi için gereken minimum entropi (benzersiz karakterler, daha fazlası için İngilizce olmayan sayısı)."
     allow_uppercase_posts: "Bir konu başlığında veya gönderi gövdesinde tümü büyük harfe izin verin."
-    max_consecutive_replies: "Bir kullanıcının başka bir yanıt eklemesi engellenmeden önce bir konuda arka arkaya yapması gereken gönderi sayısı."
+    max_consecutive_replies: "Bir kullanıcının başka bir yanıt eklemesi engellenmeden önce bir konuda yapabileceği art arda gönderi sayısı. Bu sınır, konu sahibi, site personeli veya kategori moderatörleri için geçerli değildir."
     enable_filtered_replies_view: '"(n) yanıtlar" düğmesi diğer tüm gönderileri daraltır ve yalnızca geçerli gönderiyi ve yanıtlarını gösterir.'
     title_fancy_entities: "SmartyPants gibi yaygın ASCII karakterlerini konu başlıklarında süslü HTML varlıklarına dönüştürün <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</a>"
     min_title_similar_length: "Benzer konular için kontrol edilmeden önce bir başlığın minimum uzunluğu."
@@ -1869,6 +1898,11 @@ tr_TR:
     block_auto_generated_emails: "Otomatik olarak oluşturulduğu tespit edilen gelen e-postaları engelleyin."
     ignore_by_title: "Gelen e-postaları başlıklarına göre yok sayın."
     mailgun_api_key: "Web kancası mesajlarını doğrulamak için kullanılan Mailgun Gizli API anahtarı."
+    sendgrid_verification_key: "Web kancası mesajlarını doğrulamak için kullanılan Sendgrid doğrulama anahtarı."
+    mailjet_webhook_token: "Web kancası yükünü doğrulamak için kullanılan token. Web kancasının \"t\" sorgu parametresi olarak geçirilmelidir, örneğin: https://example.com/webhook/mailjet?t=supersecret"
+    mandrill_authentication_key: "Web kancası mesajlarını doğrulamak için kullanılan Mandrill kimlik doğrulama anahtarı."
+    postmark_webhook_token: "Web kancası yükünü doğrulamak için kullanılan token. Web kancasının \"t\" sorgu parametresi olarak geçirilmelidir, örneğin: https://example.com/webhook/postmark?t=supersecret"
+    sparkpost_webhook_token: "Web kancası yükünü doğrulamak için kullanılan token. Web kancasının \"t\" sorgu parametresi olarak geçirilmelidir, örneğin: https://example.com/webhook/sparkpost?t=supersecret"
     soft_bounce_score: "Geçici bir geri dönme gerçekleştiğinde kullanıcıya eklenen geri dönme puanı."
     hard_bounce_score: "Kalıcı bir geri dönme gerçekleştiğinde kullanıcıya eklenen geri dönme puanı."
     bounce_score_threshold: "Bir kullanıcıya e-posta göndermeyi durdurmadan önce maksimum geri dönme puanı."
@@ -1896,7 +1930,7 @@ tr_TR:
     pop3_polling_password: "E-posta için yoklanacak POP3 hesabının şifresi."
     pop3_polling_delete_from_server: "E-postaları sunucudan silin. NOT: Bunu devre dışı bırakırsanız posta gelen kutunuzu manuel olarak temizlemelisiniz"
     log_mail_processing_failures: "Tüm e-posta işleme hatalarını <a href='%{base_path}/logs' target='_blank'>/logs</a> bölümüne kaydedin"
-    email_in: 'Kullanıcıların yeni konuları e-posta yoluyla göndermesine izin verin (manuel veya pop3 yoklaması gerektirir). Adresleri her kategorinin "Ayarlar" sekmesinde yapılandırın.'
+    email_in: "Kullanıcıların e-posta yoluyla yeni konular oluşturmasına izin verin. Bu ayarı etkinleştirdikten sonra, gruplar ve kategoriler için gelen e-posta adreslerini yapılandırabileceksiniz."
     email_in_min_trust: "Bir kullanıcının e-posta yoluyla yeni konular göndermesine izin verilmesi için gereken minimum güven seviyesi."
     email_in_authserv_id: "Gelen e-postalarda kimlik doğrulaması kontrolleri yapan hizmetin tanımlayıcısı. Bunun nasıl yapılandırılacağına ilişkin talimatlar için <a href='https://meta.discourse.org/t/134358'>https://meta.discourse.org/t/134358</a> adresine bakın."
     email_in_spam_header: "Spam algılamak için e-posta başlığı."
@@ -1942,6 +1976,7 @@ tr_TR:
     enable_category_group_moderation: "Grupların belirli kategorilerdeki içeriği denetlemesine izin verin"
     group_in_subject: "Kişisel mesajdaki ilk grubun adına e-posta konusunda %%{optional_pm} olarak ayarlayın, bkz.: <a href='https://meta.discourse.org/t/customize-specific-email-templates/88323' target='_blank'>Standart e-postalar için konu formatını özelleştirme</a>"
     allow_anonymous_posting: "Kullanıcıların anonim moda geçmesine izin verin"
+    allow_anonymous_likes: "Anonim kullanıcıların gönderileri beğenmesine izin ver"
     anonymous_posting_min_trust_level: "Anonim gönderimi etkinleştirmek için gereken minimum güven seviyesi"
     anonymous_account_duration_minutes: "Anonimliği korumak için her kullanıcı için her N dakikada bir yeni bir anonim hesap oluşturun. Örnek: 600 olarak ayarlanırsa son gönderiden itibaren 600 dakika geçer geçmez VE kullanıcı anonime geçerse yeni bir anonim hesap oluşturulur."
     hide_user_profiles_from_public: "Anonim kullanıcılar için kullanıcı kartlarını, kullanıcı profillerini ve kullanıcı dizinini devre dışı bırakın."
@@ -1960,6 +1995,7 @@ tr_TR:
     allow_profile_backgrounds: "Kullanıcıların profil arka planları yüklemesine izin verin."
     sequential_replies_threshold: "Bir kullanıcının çok fazla ardışık yanıt hakkında hatırlatılmadan önce bir konuda arka arkaya yapması gereken gönderi sayısı."
     get_a_room_threshold: "Bir kullanıcının uyarılmadan önce aynı konuda aynı kişiye yapması gereken gönderi sayısı."
+    dont_feed_the_trolls_threshold: "Uyarılmadan önce diğer kullanıcılardan gelen bayrak sayısı."
     enable_mobile_theme: "Mobil cihazlar, sitenin tamamına geçebilme özelliğine sahip mobil uyumlu bir tema kullanır. Tamamen duyarlı özel bir stil sayfası kullanmak istiyorsanız bunu devre dışı bırakın."
     dominating_topic_minimum_percent: "Bir kullanıcının bir konuda aşırı baskınlık kurduğu hatırlatılmadan önce bir konuda yüzde kaç gönderi yapması gerektiği."
     disable_avatar_education_message: "Avatarı değiştirmek için eğitim mesajını devre dışı bırakın."
@@ -1969,22 +2005,22 @@ tr_TR:
     permalink_normalizations: "Kalıcı bağlantıları eşleştirmeden önce aşağıdaki regex'i uygulayın, örneğin: /(topic.*)\\?.*/\\1 sorgu dizelerini konu rotalarından söker. Format, regex+string ve yakalamalara erişmek için \\1 vb. kullanın"
     global_notice: "Tüm ziyaretçilere ACİL, ACİL DURUM, izin verilmeyen bir global banner bildirimi gösterin, gizlemek için boş olarak değiştirin (HTML'ye izin verilir)."
     disable_system_edit_notifications: "\"download_remote_images_to_local\" etkin olduğunda sistem kullanıcısı tarafından düzenleme bildirimlerini devre dışı bırakır."
-    disable_category_edit_notifications: "Konulardaki kategori düzenleme bildirimlerini devre dışı bırakın."
-    disable_tags_edit_notifications: "Konulardaki etiket düzenleme bildirimlerini devre dışı bırakın."
+    disable_category_edit_notifications: "Konu kategorisi düzenlemeleri için bildirimleri devre dışı bırakın."
+    disable_tags_edit_notifications: "Konu etiketi düzenlemeleri için bildirimleri devre dışı bırakın."
     notification_consolidation_threshold: "Bildirimler tek bir bildirimde birleştirilmeden önce alınan beğenme veya üyelik isteği bildirimlerinin sayısı. Devre dışı bırakmak için 0 olarak ayarlayın."
     likes_notification_consolidation_window_mins: "Eşiğe ulaşıldığında beğenilen bildirimlerin tek bir bildirimde birleştirildiği dakika cinsinden süre. Eşik, \"SiteSetting.notification_consolidation_threshold\" aracılığıyla yapılandırılabilir."
     automatically_unpin_topics: "Kullanıcı en alta ulaştığında konu sabitlemelerini otomatik olarak kaldırın."
     read_time_word_count: "Tahmini okuma süresini hesaplamak için dakika başına kelime sayısı."
     topic_page_title_includes_category: "Konu sayfası <a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title' target='_blank'>başlık etiketi</a> kategori adını içerir."
-    native_app_install_banner_ios: "DiscourseHub uygulama banner'ını iOS cihazlarda normal kullanıcılara (güven seviyesi 1 ve üstü) gösterir."
-    native_app_install_banner_android: "DiscourseHub uygulama banner'ını Android cihazlarda normal kullanıcılara (güven seviyesi 1 ve üstü) gösterir."
+    native_app_install_banner_ios: "DiscourseHub uygulama banner'ını iOS cihazlarda temel kullanıcılar (güven seviyesi 1) ve üstü için gösterir."
+    native_app_install_banner_android: "DiscourseHub uygulama banner'ını Android cihazlarda temel kullanıcılar (güven seviyesi 1) ve üstü için gösterir."
     app_association_android: "Google'ın Dijital Varlık Bağlantıları API'si için kullanılan <a href='%{base_path}/.well-known/assetlinks.json'>.well-known/assetlinks.json</a> uç noktasının içeriği."
     app_association_ios: "Bu site ile iOS uygulamaları arasında Evrensel Bağlantılar oluşturmak için kullanılan <a href='%{base_path}/apple-app-site-association'>apple-app-site-association</a> uç noktasının içeriği."
     share_anonymized_statistics: "Anonimleştirilmiş kullanım istatistiklerini paylaşın."
     auto_handle_queued_age: "Şu kadar gün sonra incelenmeyi bekleyen kayıtları otomatik olarak işleyin. Bayraklar göz ardı edilir. Sıraya alınan gönderiler ve kullanıcılar reddedilir. Bu özelliği devre dışı bırakmak için 0 olarak ayarlayın."
     penalty_step_hours: "Kullanıcıları saat cinsinden susturmak veya askıya almak için varsayılan cezalar. İlk suç varsayılan olarak ilk değere, ikinci suç varsayılan olarak ikinci değere vb."
     svg_icon_subset: "Varlıklarınıza dahil etmek istediğiniz ek FontAwesome 5 simgelerini ekleyin. Katı simgeler için \"fa-\", normal simgeler için \"far-\" ve marka simgeleri için \"fab-\" ön ekini kullanın."
-    max_prints_per_hour_per_user: "Maksimum /print sayfa gösterim sayısı (devre dışı bırakmak için 0 olarak ayarlayın)"
+    max_prints_per_hour_per_user: "Maksimum /print sayfa gösterim sayısı (yazdırmayı devre dışı bırakmak için 0 olarak ayarlayın)"
     full_name_required: "Tam ad, kullanıcı profilinin gerekli bir alanıdır."
     enable_names: "Kullanıcının tam adını profilinde, kullanıcı kartında ve e-postalarında gösterin. Tam adı her yerde gizlemek için devre dışı bırakın."
     display_name_on_posts: "Bir kullanıcının @kullanıcı adına ek olarak gönderilerinde tam adını gösterin."
@@ -2005,17 +2041,13 @@ tr_TR:
     allowed_href_schemes: "Bağlantılarda http ve https'ye ek olarak izin verilen şemalar."
     embed_post_limit: "Yerleştirilecek maksimum gönderi sayısı."
     embed_username_required: "Konu oluşturmak için kullanıcı adı gereklidir."
-    notify_about_flags_after: "Bu kadar saat sonra ele alınmamış bayraklar varsa moderatörlere kişisel bir mesaj gönderin. Devre dışı bırakmak için 0 olarak ayarlayın."
-    show_create_topics_notice: "Sitede 5'ten az genel konu varsa yöneticilerden birkaç konu oluşturmalarını isteyen bir bildirim gösterin."
+    notify_about_reviewable_item_after: "Bu kadar saat geçmesine rağmen hala incelenmemiş öğe varsa moderatörlere mesaj ilet. Devre dışı bırakmak için 0 olarak ayarlayın."
     delete_drafts_older_than_n_days: "(n) günden daha eski taslakları silin."
     delete_merged_stub_topics_after_days: "Tamamen birleştirilmiş saplama konularını otomatik olarak silmeden önce beklenecek gün sayısı. Saplama konularını asla silmemek için 0 olarak ayarlayın."
-    bootstrap_mode_min_users: "Bootstrap modunu devre dışı bırakmak için gereken minimum kullanıcı sayısı (devre dışı bırakmak için 0 olarak ayarlayın)"
+    bootstrap_mode_min_users: "Bootstrap modunu devre dışı bırakmak için gereken minimum kullanıcı sayısı (devre dışı bırakmak için 0'a ayarlayın, devreye girmesi 24 saate kadar sürebilir)"
     prevent_anons_from_downloading_files: "Anonim kullanıcıların ekleri indirmesini önleyin."
-    secure_media: "KALDIRILDI: Bunun yerine secure_uploads ayarını kullanın, Discourse 3.0'da kaldırılacak."
     secure_uploads: 'TÜM yüklemelere (resimler, video, ses, metin, pdf''ler, zip''ler ve diğerleri) erişimi sınırlar. "Giriş gerekli" etkinleştirilmişse yüklemelere yalnızca giriş yapmış kullanıcılar erişebilir. Aksi takdirde, erişim yalnızca özel mesajlardaki ve özel kategorilerdeki medya yüklemeleri için sınırlı olacaktır. UYARI: Bu ayar karmaşıktır ve derin bir yönetim anlayışı gerektirir. Ayrıntılar için <a target="_blank" href="https://meta.discourse.org/t/-/140017">Meta''daki güvenli yüklemeler konusuna</a> bakın.'
-    secure_media_allow_embed_images_in_emails: "KALDIRILDI: secure_uploads_allow_embed_images_in_emails kullanın, Discourse 3.0'da kaldırılacak."
     secure_uploads_allow_embed_images_in_emails: "Boyutları \"güvenli yüklemeler maksimum e-posta yerleştirme görüntü boyutu kb\" ayarından küçükse normalde e-postalara redakte edilecek güvenli görüntülerin yerleştirilmesine izin verir."
-    secure_media_max_email_embed_image_size_kb: "KALDIRILDI: secure_uploads_max_email_embed_image_size_kb kullanın, Discourse 3.0'da kaldırılacak."
     secure_uploads_max_email_embed_image_size_kb: "\"Güvenli yüklemeler e-postalarda yerleştirmeye izin verir\" ayarı etkinleştirilmişse e-postalara yerleştirilecek güvenli görüntüler için boyut sınırı. Bu ayar etkinleştirilmediğinde, bu ayarın etkisi yoktur."
     slug_generation_method: "Kısa ad oluşturma yöntemi seçin. \"encoded\" yüzde kodlama dizesi oluşturur. \"none\" kısa adı tamamen devre dışı bırakır."
     enable_emoji: "Emoji'yi etkinleştirin"
@@ -2023,6 +2055,7 @@ tr_TR:
     emoji_set: "Emoji'nizi nasıl istersiniz?"
     emoji_autocomplete_min_chars: "Otomatik tamamlama emoji açılır penceresini tetiklemek için gereken minimum karakter sayısı"
     enable_inline_emoji_translation: "Satır içi emoji'ler (öncesinde boşluk veya noktalama işareti olmayan) için çeviriyi etkinleştirir"
+    emoji_deny_list: "Bu emoji'ler menülerde veya kısa kodlarda kullanılamaz."
     approve_post_count: "Yeni veya temel bir kullanıcının onaylanması gereken gönderi miktarı"
     approve_unless_trust_level: "Bu güven seviyesinin altındaki kullanıcıların gönderileri onaylanmalıdır"
     approve_new_topics_unless_trust_level: "Bu güven seviyesinin altındaki kullanıcılar için yeni konular onaylanmalıdır"
@@ -2077,18 +2110,26 @@ tr_TR:
     default_tags_watching_first_post: "Her yeni konudaki ilk gönderinin varsayılan olarak izleneceği etiketlerin listesi."
     default_text_size: "Varsayılan olarak seçilen metin boyutu"
     default_title_count_mode: "Sayfa başlığı sayacı için varsayılan mod"
+    enable_offline_indicator: "Ağ bağlantısı olmadığı tespit edildiğinde kullanıcılara bir mesaj göster"
+    default_sidebar_link_to_filtered_list: "Gezinti menüsü bağlantılarının varsayılan olarak filtrelenmiş listeye bağlanmasını sağlayın."
+    default_sidebar_show_count_of_new_items: "Gezinti menüsü bağlantılarının varsayılan olarak rozet yerine yeni öge sayısını göstermesini sağlayın."
+    default_sidebar_switch_panel_position: "Kenar çubuğu geçiş paneli düğmelerinin konumu"
     retain_web_hook_events_period_days: "Web kancası olay kayıtlarının saklanacağı gün sayısı."
     retry_web_hook_events: "Başarısız web kancası olaylarını otomatik olarak 4 kez yeniden deneyin. Yeniden denemeler arasındaki zaman aralıkları 1, 5, 25 ve 125 dakikadır."
     revoke_api_keys_days: "Kullanılmayan bir API anahtarının otomatik olarak iptal edilmesinden önceki gün sayısı (asla için 0)"
     allow_user_api_keys: "Kullanıcı API anahtarlarının oluşturulmasına izin verin"
     allow_user_api_key_scopes: "Kullanıcı API anahtarları için izin verilen kapsamların listesi"
-    min_trust_level_for_user_api_key: "Kullanıcı API anahtarlarının oluşturulması için gereken güven seviyesi"
+    min_trust_level_for_user_api_key: |
+      Kullanıcı API anahtarlarının oluşturulması için gereken güven seviyesi.<br>
+      <b>UYARI</b>: Güven seviyesinin değiştirilmesi, daha düşük güven seviyesine sahip kullanıcıların Discourse Hub üzerinden giriş yapmasını engeller
     allowed_user_api_auth_redirects: "Kullanıcı API anahtarları için kimlik doğrulama yönlendirmesi için izin verilen URL. Joker karakter sembolü * herhangi bir bölümüyle eşleşmek için kullanılabilir (ör. www.example.com/*)."
     allowed_user_api_push_urls: "Kullanıcı API'sine sunucu anlık iletimi için izin verilen URL'ler"
     expire_user_api_keys_days: "Bir kullanıcı API anahtarının otomatik olarak sona ermesinden önceki gün sayısı (asla için 0)"
     tagging_enabled: "Konularda etiketler etkinleştirilsin mi?"
     min_trust_to_create_tag: "Etiket oluşturmak için gereken minimum güven seviyesi."
     max_tags_per_topic: "Bir konuya uygulanabilecek maksimum etiket sayısı."
+    enable_max_tags_per_email_subject: "Bir e-postanın konusunu oluştururken max_tags_per_email_subject kullanın"
+    max_tags_per_email_subject: "Bir e-postanın konusunda yer alabilecek maksimum etiketler"
     max_tag_length: "Bir etikette kullanılabilecek maksimum karakter miktarı."
     max_tag_search_results: "Etiketler için arama yaparken gösterilecek maksimum sonuç sayısı."
     max_tags_in_filter_list: "Filtre açılır menüsünde gösterilecek maksimum etiket sayısı. En çok kullanılan etiketler gösterilir."
@@ -2100,6 +2141,8 @@ tr_TR:
     suppress_overlapping_tags_in_list: "Etiketler konu başlıklarındaki kelimelerle tam olarak eşleşiyorsa etiketi gösterme"
     remove_muted_tags_from_latest: "En son konu listesinde yalnızca sessize alınmış etiketlerle etiketlenmiş konuları göstermeyin."
     force_lowercase_tags: "Tüm yeni etiketleri tamamen küçük harf olmaya zorlayın."
+    create_post_for_category_and_tag_changes: "Bir konunun kategorisi veya etiketleri değiştiğinde küçük bir bilgi gönderisi oluştur"
+    watched_precedence_over_muted: "Sessize aldıklarım dahil, izlediğim kategorilerdeki veya etiketlerdeki konular hakkında beni bilgilendir"
     company_name: "Şirket Adı"
     governing_law: "Geçerli Kanun"
     city_for_disputes: "Anlaşmazlıklar için şehir"
@@ -2114,7 +2157,7 @@ tr_TR:
     enable_sitemap: "Siteniz için bir site haritası oluşturun ve bunu robots.txt dosyasına ekleyin."
     sitemap_page_size: "Her site haritası sayfasına eklenecek URL sayısı. Maksimum 50.000"
     enable_user_status: "(deneysel) Kullanıcıların özel durum mesajı (emoji + açıklama) ayarlamasına izin verin."
-    enable_user_tips: "(deneysel) Kullanıcılara temel özellikleri açıklayan yeni kullanıcı ipuçlarını etkinleştirin"
+    enable_user_tips: "Kullanıcılara temel özellikleri açıklayan yeni kullanıcı ipuçlarını etkinleştirin"
     short_title: "Kısa başlık, kullanıcının ana ekranında, başlatıcısında veya alanın sınırlı olabileceği diğer yerlerde kullanılacak. Bu başlık 12 karakterle sınırlı olmalı."
     dashboard_hidden_reports: "Belirtilen raporların panodan gizlenmesine izin verin."
     dashboard_visible_tabs: "Hangi pano sekmelerinin görünür olacağını seçin."
@@ -2131,11 +2174,15 @@ tr_TR:
     suggest_weekends_in_date_pickers: "Tarih seçici önerilerine hafta sonlarını (cumartesi ve pazar) dahil edin (Discourse'u yalnızca hafta içi, pazartesiden cumaya kadar kullanıyorsanız bunu devre dışı bırakın)."
     splash_screen: "Site varlıkları yüklenirken geçici bir yükleme ekranı gösterir"
     navigation_menu: "Hangi gezinme menüsünün kullanılacağını belirleyin. Kenar çubuğu ve başlık gezinmesi, kullanıcılar tarafından özelleştirilebilir. Geriye dönük uyumluluk için eski seçenek mevcuttur."
-    default_sidebar_categories: "Seçilen kategoriler varsayılan olarak Kenar Çubuğunun Kategoriler bölümünde gösterilir."
-    default_sidebar_tags: "Seçilen etiketler varsayılan olarak Kenar Çubuğunun Etiketler bölümünde gösterilir."
-    enable_new_user_profile_nav_groups: "DENEYSEL: Seçilen grupların kullanıcılarına yeni kullanıcı profili gezinme menüsü gösterilir"
-    enable_experimental_topic_timeline_groups: "DENEYSEL: Seçilen grupların kullanıcılarına yeniden düzenlenmiş konu zaman çizelgesi gösterilir"
+    default_navigation_menu_categories: "Seçilen kategoriler, varsayılan olarak Navigasyon Menüsü'nün Kategoriler bölümünde görüntülenecektir."
+    default_navigation_menu_tags: "Seçilen etiketler, varsayılan olarak Navigasyon Menüsü'nün Etiketler bölümünde görüntülenecektir."
     enable_experimental_hashtag_autocomplete: "DENEYSEL: Seçilen ögeyi farklı şekilde işleyen ve aramayı iyileştiren kategoriler ve etiketler için yeni #hashtag otomatik tamamlama sistemini kullanın"
+    experimental_new_new_view_groups: 'DENEYSEL: Okunmamış ve yeni konuları birleştiren bir yeni konular listesi etkinleştirin ve kenar çubuğundaki "Her şey" bağlantısını buna bağlayın.'
+    enable_custom_sidebar_sections: "DENEYSEL: Özel kenar çubuğu bölümlerini etkinleştir"
+    experimental_topics_filter: "DENEYSEL: /filter konumunda deneysel konu filtrelemeyi etkinleştirir"
+    experimental_search_menu_groups: "DENEYSEL: Glimmer kullanmak üzere yükseltilen yeni arama menüsünü etkinleştirir"
+    enable_experimental_lightbox: "DENEYSEL: Varsayılan görüntü lightboxını yenilenen tasarımla değiştir."
+    page_loading_indicator: "Discourse içinde sayfa geçişleri sırasında görünen yükleme göstergesini yapılandırın. 'Spinner' tam sayfa görünür. 'Slider' ekranın üst kısmında dar bir çubuk şekilde görünür."
     errors:
       invalid_css_color: "Geçersiz renk. Bir renk adı veya hex değeri girin."
       invalid_email: "Geçersiz e-posta adresi."
@@ -2161,7 +2208,7 @@ tr_TR:
       pop3_polling_password_is_empty: "POP3 yoklamasını etkinleştirmeden önce bir \"pop3 yoklama şifresi\" ayarlamanız gerekiyor."
       pop3_polling_authentication_failed: "POP3 kimlik doğrulaması başarısız oldu. Lütfen pop3 giriş bilgilerinizi doğrulayın."
       reply_by_email_address_is_empty: "E-posta ile yanıtlamayı etkinleştirmeden önce bir \"yanıtlama e-postası\" ayarlamanız gerekiyor."
-      email_polling_disabled: "E-posta ile yanıtlamayı etkinleştirmeden önce manuel veya POP3 yoklamasını etkinleştirmeniz gerekiyor."
+      email_polling_disabled: "E-posta ile yanıtlamayı etkinleştirmeden önce manuel, POP3 yoklamasını veya özel bir posta yoklayıcısını etkinleştirmeniz gerekir."
       user_locale_not_enabled: "Bu ayarı etkinleştirmeden önce \"kullanıcı yerel ayarına izin ver\" seçeneğini etkinleştirmeniz gerekiyor."
       personal_message_enabled_groups_invalid: "Bu ayar için en az bir grup belirtmelisiniz. Personel dışında kimsenin kişisel mesaj göndermesini istemiyorsanız personel grubunu seçin."
       invalid_regex: "Regex geçersiz veya izin verilmiyor."
@@ -2170,7 +2217,6 @@ tr_TR:
       staged_users_disabled: "Bu ayarı etkinleştirmeden önce \"aşamalı kullanıcılar\"ı etkinleştirmeniz gerekiyor."
       reply_by_email_disabled: "Bu ayarı etkinleştirmeden önce \"e-posta ile yanıtla\" özelliğini etkinleştirmeniz gerekiyor."
       discourse_connect_url_is_empty: "Bu ayarı etkinleştirmeden önce bir \"discourse bağlantı URL'si\" ayarlamanız gerekiyor."
-      discourse_connect_invite_only: "DiscourseConnect'i ve yalnızca davetle özelliğini aynı anda etkinleştiremezsiniz."
       enable_local_logins_disabled: "Bu ayarı etkinleştirmeden önce \"yerel girişleri etkinleştir\" seçeneğini etkinleştirmeniz gerekiyor."
       min_username_length_exists: "Minimum kullanıcı adı uzunluğunu en kısa kullanıcı adının üzerinde ayarlayamazsınız (%{username})."
       min_username_length_range: "Minimum değeri maksimum değerin üzerinde ayarlayamazsınız."
@@ -2192,7 +2238,8 @@ tr_TR:
       search_tokenize_japanese_enabled: "Bu ayarı etkinleştirmeden önce \"search_tokenize_japanese\" özelliğini devre dışı bırakmalısınız."
       discourse_connect_cannot_be_enabled_if_second_factor_enforced: "2 adımlı kimlik doğrulama zorunlu ise DiscourseConnect'i etkinleştiremezsiniz."
       delete_rejected_email_after_days: "Bu ayar delete_email_logs_after_days ayarından daha düşük veya %{max} üzerinde bir değere ayarlanamaz."
-      invalid_uncategorized_category_setting: "Kategorize edilmemiş konulara izin verilmiyorsa Kategorize edilmemiş kategorisi seçilemez"
+      invalid_uncategorized_category_setting: '"Kategorize edilmemiş konulara izin ver" etkinleştirilmemişse "Kategorize edilmemiş" kategorisi seçilemez.'
+      invalid_search_ranking_weights: "Değer, search_ranking_weights site ayarı için geçersiz. Örnek: \"{0.1,0.2,0.3,1.0}\". Her ağırlık için maksimum değerin 1,0 olduğunu unutmayın."
     placeholder:
       discourse_connect_provider_secrets:
         key: "www.ornek.com"
@@ -2387,7 +2434,6 @@ tr_TR:
     activated_by_staff: "Personel tarafından etkinleştirildi"
     new_user_typed_too_fast: "Yeni kullanıcı çok hızlı yazdı"
     content_matches_auto_silence_regex: "İçerik otomatik sessize al regex'i ile eşleşiyor"
-    content_matches_auto_block_regex: "İçerik otomatik engelle regex'i ile eşleşiyor"
     username:
       short: "en az %{min} karakter olmalı"
       long: "%{max} karakterden fazla olmamalı"
@@ -3115,11 +3161,11 @@ tr_TR:
       text_body_template: |
         Bu otomatik bir mesajdır.
 
-        Yeni kullanıcı [%{username}](%{user_url}) otomatik olarak susturuldu çünkü birden fazla kullanıcı %{username} adlı kullanıcının gönderilerine bayrak ekledi.
+        Birden fazla kullanıcı %{username} adlı kullanıcının gönderilerine bayrak eklediğinden yeni kullanıcı [%{username}](%{user_url}) otomatik olarak sessize alındı.
 
-        Lütfen [bayrakları inceleyin](%{base_url}/admin/flags). %{username} adlı kullanıcının gönderileri yanlışlıkla susturulduysa [bu kullanıcının yönetici sayfasındaki](%{user_url}) susturmayı kaldır düğmesine tıklayın.
+        Lütfen [bayrakları inceleyin](%{base_url}/review). %{username} adlı kullanıcının gönderileri yanlışlıkla susturulduysa [bu kullanıcının yönetici sayfasındaki](%{user_url}) susturmayı kaldır düğmesine tıklayın.
 
-        Bu eşik, "silence_new_user" site ayarları aracılığıyla değiştirilebilir.
+        Bu eşik, `silence_new_user` site ayarları aracılığıyla değiştirilebilir.
     spam_post_blocked:
       title: "Spam Gönderi Engellendi"
       subject_template: "%{username} adlı yeni kullanıcının gönderileri tekrarlanan bağlantılar nedeniyle engellendi"
@@ -3153,15 +3199,6 @@ tr_TR:
       title: "Uzak Görüntüleri İndir Devre Dışı"
       subject_template: "Uzak görüntüleri indirme devre dışı"
       text_body_template: "\"Download_remote_images_to_local\" ayarı, \"download_remote_images_threshold\" adresindeki disk alanı sınırına ulaşıldığı için devre dışı bırakıldı."
-    dashboard_problems:
-      title: "Pano Sorunları"
-      subject_template: "Sitenizin panosunda yeni tavsiye"
-      text_body_template: |
-        Mevcut site ayarlarınıza göre sizin için bazı yeni tavsiye ve önerilerimiz var.
-
-        Bunu görmek için [site panonuzu ziyaret edin](%{base_url}/admin).
-
-        Panonuzda hiçbir şey görünmüyorsa başka bir personel bu tavsiyeye göre zaten hareket etmiş olabilir. Personel eylemlerinin bir listesini [Personel Eylemi Günlükleri](%{base_url}/admin/logs/staff_action_logs) adresinde bulabilirsiniz.
     new_user_of_the_month:
       title: "Ayın Yeni Kullanıcısısınız!"
       subject_template: "Ayın Yeni Kullanıcısısınız!"
@@ -3198,9 +3235,6 @@ tr_TR:
       one: "Dikkat edin: Günlük en fazla %{count} e-posta gönderiyoruz. Bekletilenleri görmek için siteyi kontrol edin."
       other: "Dikkat edin: Günlük en fazla %{count} e-posta gönderiyoruz. Bekletilebilecek olanları görmek için siteyi kontrol edin. Not: Popüler olduğunuz için teşekkürler!"
     in_reply_to: "Yanıt Olarak"
-    unsubscribe:
-      title: "Abonelikten çık"
-      description: "Bu e-postaları almak istemiyor musunuz? Sorun değil! Anında abonelikten çıkmak için aşağıya tıklayın:"
     reply_by_email: "Yanıt vermek için [konuyu ziyaret edin](%{base_url}%{url}) veya bu e-postaya yanıt verin."
     reply_by_email_pm: "%{participants} adlı katılımcıya yanıt vermek için [mesajı ziyaret edin](%{base_url}%{url}) veya bu e-postaya yanıt verin."
     only_reply_by_email: "Yanıt vermek için bu e-postayı yanıtlayın."
@@ -3497,7 +3531,6 @@ tr_TR:
       liked_received: "Alınan Beğeniler"
       new_users: "Yeni Kullanıcılar"
       popular_topics: "Popüler Konular"
-      follow_topic: "Bu konuyu takip et"
       join_the_discussion: "Devamını Okuyun"
       popular_posts: "Popüler Gönderiler"
       more_new: "Sizin için yeni"
@@ -3669,14 +3702,7 @@ tr_TR:
     title: "Uygulama yüklenemiyor"
     offline_page_message: "Görünüşe göre çevrimdışısınız! Lütfen ağ bağlantınızı kontrol edip tekrar deneyin."
   login_required:
-    welcome_message: |
-      ##[%{title} başlığına hoş geldiniz](#hoşgeldiniz)
-      Bir hesap gerekli. Lütfen devam etmek için bir hesap oluşturun veya giriş yapın.
-    welcome_message_invite_only: |
-      ##[%{title} başlığına hoş geldiniz](#hoşgeldiniz)
-      Bir hesap gerekli. Lütfen devam etmek mevcut bir üyeden davet isteyin veya giriş yapın.
-  deleted: "silindi"
-  image: "görüntü"
+    welcome_message: "# [%{title} forumuna hoş geldiniz](#welcome)"
   upload:
     edit_reason: "görüntülerin yerel kopyaları indirildi"
     unauthorized: "Üzgünüz, yüklemeye çalıştığınız dosyaya izin verilmiyor (izin verilen uzantılar: %{authorized_extensions})."
@@ -3878,37 +3904,41 @@ tr_TR:
   tos_topic:
     title: "Hizmet Şartları"
     body: |
-      Bu koşullar <%{base_url}> adresindeki internet forumunun kullanımını düzenler. Forumu kullanmak için forumu işleten şirket olan %{company_name} ile bu şartları kabul etmelisiniz.
+      <h2 id="heading--change-me"><a href="#heading--change-me">Beni Değiştir</a></h2>
 
-      Şirket, farklı şartlar altında başka ürün ve hizmetler sunabilir. Bu şartlar sadece forumun kullanımı için geçerlidir.
+      Forum Yöneticisi, lütfen aşağıda sitenizin ihtiyaçlarını karşılayacak şekilde özelleştirmeniz gereken bir gizlilik politikası için örnek bir başlangıç şablonu bulabilirsiniz.
+
+      Bu koşullar, <%{base_url}> adresindeki internet forumunun kullanımını yönetmez, ancak bir gün yönetebilir. Bu durumda, forumu kullanmak için forumu işleten şirket olan %{company_name} ile bu koşulları kabul etmeniz gerekir.
+
+      Şirket, farklı koşullar altında başka ürün ve hizmetler sunabilir. Bu koşullar sadece forumun kullanımı için geçerlidir.
 
       Şuraya atlayın:
 
-      - Önemli Şartlar](#başlık--önemli-şartlar)
-      - [Forumu Kullanma İzniniz](#başlık--izin)
-      - [Forumu Kullanma Koşulları](#başlık--koşullar)
-      - [Kabul Edilebilir Kullanım](#başlık-kabul-edilebilir-kullanım)
-      - [İçerik Standartları](#başlık-içerik-standartları)
-      - [Uygulama](#başlık--uygulama)
-      - [Hesabınız](#başlık--hesabınız)
-      - [İçeriğiniz](#başlık--içeriğiniz)
-      - [Sorumluluğunuz] (#başlık--sorumluluk)
-      - [Feragatnameler](#başlık--feragatnameler)
-      - [Sorumluluk Sınırları](#başlık--sorumluluk)
-      - [Geri Bildirim](#başlık--geri-bildirim)
-      - [Fesih](#başlık--fesih)
-      - [Anlaşmazlıklar](#başlık--anlaşmazlıklar)
-      - [Genel Şartlar](#başlık--genel)
-      - [İletişim](#başlık-iletişim)
-      - [Değişiklikler](#başlık--değişiklikler)
+      - Önemli Koşullar](#heading--important-terms)
+      - [Forumu Kullanma İzniniz](#heading--permission)
+      - [Forumu Kullanma Koşulları](#heading--conditions)
+      - [Kabul Edilebilir Kullanım](#heading--acceptable-use)
+      - [İçerik Standartları](#heading--content-standards)
+      - [Enforcement](#heading--enforcement)
+      - [Hesabınız](#heading--your-account)
+      - [İçeriğiniz](#heading--your-content)
+      - [Sorumluluğunuz] (#heading--responsibility)
+      - [Disclaimers](#heading--disclaimers)
+      - [Sorumluluk Sınırları] (#heading--liability)
+      - [Feedback](#heading--feedback)
+      - [Termination](#heading--termination)
+      - [Disputes](#heading--disputes)
+      - [Genel Şartlar] (#heading--general)
+      - [Contact](#heading--contact)
+      - [Changes](#heading--changes)
 
-      <h2 id="heading--important-terms"><a href="#heading--important-terms">Önemli Şartlar</a></h2>
+      <h2 id="heading--important-terms"><a href="#heading--important-terms">Önemli Koşullar</a></h2>
 
-      ***Bu şartlar, haklarınızı ve sorumluluklarınızı etkileyen bir dizi önemli hüküm içermektedir, [Feragatnameler](#başlık--feragatnameler) bölümündeki feragatnameler, [Sorumluluk Sınırları](#başlık--sorumluluk) bölümündeki şirketin size karşı sorumluluğuna ilişkin sınırlamalar, [Kullanımınıza İlişkin Sorumluluk](#başlık--sorumluluk) bölümündeki forumu kötüye kullanmanızdan kaynaklanan zararların şirket tarafından karşılanmasına ilişkin anlaşmanız ve [Anlaşmazlıklar](#başlık--anlaşmazlıklar) bölümündeki anlaşmazlıkların tahkime götürülmesine ilişkin anlaşma gibi.***
+      ***Bu koşullar, haklarınızı ve sorumluluklarınızı etkileyen bir dizi önemli hüküm içermektedir, [Disclaimers](#heading--disclaimers) bölümündeki feragatnameler, [Sorumluluk Sınırları] (#heading--liability) bölümündeki şirketin size karşı sorumluluğuna ilişkin sınırlamalar, [Kullanımınıza İlişkin Sorumluluk] (#heading--responsibility) bölümündeki forumu kötüye kullanmanızdan kaynaklanan zararların şirket tarafından karşılanmasına ilişkin anlaşmanız ve [Disputes](#heading--disputes) bölümündeki anlaşmazlıkların tahkime götürülmesine ilişkin anlaşma gibi.***
 
       <h2 id="heading--permission"><a href="#heading--permission">Forumu Kullanma İzniniz</a></h2>
 
-      Bu şartlara tabi olarak, şirket size forumu kullanma izni verir. Forumu kullanmak için herkesin bu şartları kabul etmesi gerekir.
+      Bu koşullara tabi olarak, şirket size forumu kullanma izni verir. Forumu kullanmak için herkesin bu koşulları kabul etmesi gerekir.
 
       <h2 id="heading--conditions"><a href="#heading--conditions">Forumu Kullanma Koşulları</a></h2>
 
@@ -3918,7 +3948,7 @@ tr_TR:
 
       2. Şirketin sizinle doğrudan iletişime geçerek kullanamayacağınızı söylemesi halinde forumu artık kullanamazsınız.
 
-      3. Forumu [Kabul Edilebilir Kullanım](#başlık--kabul-edilebilir-kullanım) ve [İçerik Standartları](#başlık--içerik-standartları) uyarınca kullanmalısınız.
+      3. Forumu [Kabul Edilebilir Kullanım] (#heading--acceptable-use) ve [İçerik Standartları] (#heading--content-standards) uyarınca kullanmalısınız.
 
       <h2 id="heading--acceptable-use"><a href="#heading--acceptable-use">Kabul Edilebilir Kullanım</a></h2>
 
@@ -3930,29 +3960,29 @@ tr_TR:
 
       4. Forum aracılığıyla reklam, zincirleme mektup veya başka talepler gönderemez ya da forumu ticari posta listeleri veya veritabanları için adres veya diğer kişisel verileri toplamak amacıyla kullanamazsınız.
 
-      5. Foruma erişimi otomatik hale getiremez veya bir web tarayıcısı, tarayıcı eklentisi veya eklentisi veya web tarayıcısı olmayan başka bir bilgisayar programı gibi forumu izleyemezsiniz. Eğer bir arama motoru işletiyorsanız forumu herkese açık bir arama motoru için dizinlemek üzere tarayabilirsiniz.
+      5. Foruma erişimi otomatik hale getiremez veya bir web tarayıcısı, tarayıcı eklentisi ya da eklentisi veya web tarayıcısı olmayan başka bir bilgisayar programı gibi forumu izleyemezsiniz. Arama motoru işletiyorsanız forumu herkese açık bir arama motoru için indekslemek üzere tarayabilirsiniz.
 
       6. Forumu dağıtım listelerine, haber gruplarına veya grup posta takma adlarına e-posta göndermek için kullanamazsınız.
 
       7. Şirkete bağlı olduğunuzu veya şirket tarafından desteklendiğinizi yanlış bir şekilde ima edemezsiniz.
 
-      8. Forumdaki resimlere veya diğer hiper metin olmayan içeriklere başka web sayfalarında köprü oluşturamazsınız.
+      8. Forumdaki resimlere veya diğer hipermetin olmayan içeriklere başka web sayfalarında köprü oluşturamazsınız.
 
       9. Forumdan indirdiğiniz materyallerden mülkiyet sahipliğini gösteren herhangi bir işareti kaldıramazsınız.
 
-      10. Forumun herhangi bir bölümünü başka web sitelerinde “<iframe>” ile gösteremezsiniz.
+      10. Forumun herhangi bir bölümünü başka web sitelerinde `<iframe>` ile gösteremezsiniz.
 
-      11. Forumun herhangi bir güvenlik veya erişim kısıtlamasını devre dışı bırakamaz, engelleyemez veya atlatamazsınız.
+      11. Forumun herhangi bir güvenlik veya erişim kısıtlamasını devre dışı bırakamaz, önleyemez veya atlatamazsınız.
 
       12. Forumun altyapısını makul olmayan hacimde taleplerle veya forumun altında yatan bilgi sistemlerine makul olmayan bir yük getirecek şekilde tasarlanmış taleplerle zorlayamazsınız.
 
       13. Forum aracılığıyla başkalarının kimliğine bürünemezsiniz.
 
-      14. Bu şartları ihlal eden hiç kimseyi teşvik edemez veya onlara yardım edemezsiniz.
+      14. Bu şartları ihlal eden hiç kimseyi teşvik edemez veya yardım edemezsiniz.
 
       <h2 id="heading--content-standards"><a href="#heading--content-standards">İçerik Standartları</a></h2>
 
-      1. Foruma yasa dışı, saldırganca veya başkaları için zararlı içerik gönderemezsiniz. Buna taciz edici, uygunsuz, küfürlü veya nefret içerikli davranışlar da dahildir.
+      1. Foruma yasa dışı, saldırgan veya başkaları için başka şekilde zararlı içerik gönderemezsiniz. Buna taciz edici, uygunsuz, küfürlü veya nefret dolu davranışlar da dahildir.
 
       2. Foruma yasaları ihlal eden, herhangi birinin fikri mülkiyet haklarını çiğneyen, herhangi birinin gizliliğini ihlal eden veya başkalarıyla yaptığınız anlaşmaları ihlal eden içerik gönderemezsiniz.
 
@@ -3966,27 +3996,27 @@ tr_TR:
 
       Şirket, bu şartların ihlallerini yasal olarak en geniş kapsamda soruşturabilir ve kovuşturabilir. Şirket, yasaların ve bu şartların ihlallerinin kovuşturulmasında kolluk kuvvetlerine bildirimde bulunabilir ve onlarla iş birliği yapabilir.
 
-      Şirket, herhangi bir nedenle forumdaki içeriği değiştirme, düzeltme ve silme hakkını saklı tutar. Birinin bu şartları ihlal ederek foruma içerik gönderdiğini düşünüyorsanız [derhal bizimle iletişime geçin](#başlık-iletişim).
+      Şirket, herhangi bir nedenle forumdaki içeriği değiştirme, düzeltme ve silme hakkını saklı tutar. Birinin bu şartları ihlal ederek foruma içerik gönderdiğini düşünüyorsanız, [derhal bizimle iletişime geçin](#heading--contact).
 
       <h2 id="heading--your-account"><a href="#heading--your-account">Hesabınız</a></h2>
 
       Forumun bazı özelliklerini kullanmak için bir hesap oluşturmalı ve bu hesapta oturum açmalısınız.
 
-      Bir hesap oluşturmak için kendiniz hakkında bazı bilgiler vermelisiniz. Bir hesap oluşturursanız en azından geçerli bir e-posta adresi vermeyi ve bu adresi güncel tutmayı kabul edersiniz. Hesabınızı istediğiniz zaman <%{contact_email}> adresine e-posta göndererek kapatabilirsiniz.
+      Hesap oluşturmak için kendiniz hakkında bazı bilgiler vermelisiniz. Hesap oluşturursanız en azından geçerli bir e-posta adresi vermeyi ve bu adresi güncel tutmayı kabul edersiniz. Hesabınızı istediğiniz zaman <%{contact_email}> adresine e-posta göndererek kapatabilirsiniz.
 
-      Hesabınızı kapatana veya hesabınızın ele geçirildiğini şirkete bildirene kadar, sizin tarafınızdan yetkilendirilmiş olsun ya da olmasın hesabınız kullanılarak gerçekleştirilen tüm işlemlerden sorumlu olmayı kabul edersiniz. Hesabınızın ele geçirildiğinden şüpheleniyorsanız şirketi derhal bilgilendirmeyi kabul edersiniz. Hesabınız için güvenli bir şifre seçmeyi ve bunu gizli tutmayı kabul edersiniz.
+      Hesabınızı kapatana veya hesabınızın ele geçirildiğini şirkete bildirene kadar, sizin tarafınızdan yetkilendirilmiş olsun ya da olmasın, hesabınız kullanılarak gerçekleştirilen tüm işlemlerden sorumlu olmayı kabul edersiniz. Hesabınızın ele geçirildiğinden şüpheleniyorsanız şirketi derhal bilgilendirmeyi kabul edersiniz. Hesabınız için güvenli bir şifre seçmeyi ve bunu gizli tutmayı kabul edersiniz.
 
-      Şirket, telif hakkı ile ilgili yayından kaldırma taleplerini ele alma politikasına göre veya bu şartlardaki herhangi bir kuralı ihlal ettiğinize makul olarak inanırsa forumdaki hesabınızı kısıtlayabilir, askıya alabilir veya kapatabilir.
+      Şirket, telif hakkı ile ilgili yayından kaldırma taleplerini ele alma politikasına göre veya bu koşullardaki herhangi bir kuralı ihlal ettiğinize makul olarak inanırsa, forumdaki hesabınızı kısıtlayabilir, askıya alabilir veya kapatabilir.
 
       <h2 id="heading--your-content"><a href="#heading--your-content">İçeriğiniz</a></h2>
 
-      Bu şartların hiçbiri şirkete, hesap bilgileriniz, gönderileriniz veya foruma gönderdiğiniz diğer içerikler gibi forumla paylaştığınız fikri mülkiyet üzerinde herhangi bir mülkiyet hakkı vermez. Bu şartların hiçbiri size şirketin fikri mülkiyeti üzerinde de herhangi bir mülkiyet hakkı vermez.
+      Bu şartların hiçbiri şirkete hesap bilgileriniz, gönderileriniz veya foruma gönderdiğiniz diğer içerikler gibi forumla paylaştığınız fikri mülkiyet üzerinde herhangi bir mülkiyet hakkı vermez. Bu şartların hiçbiri size şirketin fikri mülkiyeti üzerinde de herhangi bir mülkiyet hakkı vermez.
 
       Siz ve şirket arasında, foruma gönderdiğiniz içerikten yalnızca siz sorumlu olursunuz. Foruma gönderdiğiniz içeriğin şirket tarafından desteklendiğini veya onaylandığını yanlış bir şekilde ima etmemeyi kabul edersiniz. Bu koşullar, şirketi gönderdiğiniz içeriği saklamak, korumak veya kopyalarını sağlamak ve bu koşullara göre değiştirmek zorunda bırakmaz.
 
       Foruma gönderdiğiniz içerik size aittir ve bunun için başkalarına hangi izni vereceğinize siz karar verirsiniz. Ancak en azından, şirkete foruma gönderdiğiniz içeriği forumun diğer kullanıcılarına sağlaması için lisans verirsiniz. Bu özel lisans, şirketin foruma gönderdiğiniz içeriği kopyalamasına, yayınlamasına ve analiz etmesine izin verir.
 
-      Gönderdiğiniz içerik, sizin tarafınızdan veya şirket tarafından forumdan kaldırıldığında, son kopya şirketin yedeklerinden, önbelleklerinden ve diğer sistemlerinden kaybolduğunda şirketin özel lisansı sona erer. Creative Commons](https://creativecommons.org) lisansları gibi gönderdiğiniz içeriğe uyguladığınız diğer lisanslar, içeriğiniz kaldırıldıktan sonra da devam edebilir. Bu lisanslar başkalarına veya şirketin kendisine içeriğinizi forum aracılığıyla tekrar paylaşma hakkı verebilir.
+      Gönderdiğiniz içerik, sizin tarafınızdan veya şirket tarafından forumdan kaldırıldığında, şirketin özel lisansı, son kopya şirketin yedeklerinden, önbelleklerinden ve diğer sistemlerinden kaybolduğunda sona erer. Creative Commons](https://creativecommons.org) lisansları gibi gönderdiğiniz içeriğe uyguladığınız diğer lisanslar, içeriğiniz kaldırıldıktan sonra da devam edebilir. Bu lisanslar başkalarına veya şirketin kendisine içeriğinizi forum aracılığıyla tekrar paylaşma hakkı verebilir.
 
       Foruma gönderdiğiniz içeriği alan diğer kişiler, içeriğinizi lisansladığınız koşulları ihlal edebilir. Şirketin bu ihlaller veya bunların sonuçları için size karşı sorumlu olmayacağını kabul edersiniz.
 
@@ -3996,7 +4026,7 @@ tr_TR:
 
       <h2 id="heading--disclaimers"><a href="#heading--disclaimers">Feragatnameler</a></h2>
 
-      ***Forumu ve forumdaki içeriği kullanmanın tüm riskini kabul edersiniz. Yasaların izin verdiği ölçüde, şirket ve tedarikçileri forumu olduğu gibi, herhangi bir garanti vermeden sağlamaktadır.***
+      ***Forumu ve forumdaki içeriği kullanmanın tüm riskini kabul ediyorsunuz. Yasaların izin verdiği ölçüde, şirket ve tedarikçileri forumu olduğu gibi, herhangi bir garanti vermeden sağlamaktadır.***
 
       Forum, başkaları tarafından işletilen forumlara ve hizmetlere köprü oluşturabilir ve bunları entegre edebilir. Şirket, başkaları tarafından yürütülen hizmetler veya sağlayabilecekleri içerik hakkında herhangi bir garanti vermez. Başkaları tarafından yürütülen hizmetlerin kullanımı, siz ve hizmeti yürüten kişi arasındaki diğer şartlara tabi olabilir.
 
@@ -4006,37 +4036,37 @@ tr_TR:
 
       ***Yasaların izin verdiği ölçüde, forum veya forumdaki içerikle ilgili her türlü talep için size karşı toplam sorumluluk 50 $ ile sınırlı olacaktır.***
 
-      <h2 id="heading--feedback"><a href="#heading--feedback">Geri Bildirim</a></h2>
+      <h2 id="heading--feedback"><a href="#heading--feedback">Geri bildirim</a></h2>
 
-      Şirket, forum için geri bildirim ve önerilerinizi memnuniyetle karşılamaktadır. Bizimle iletişime geçmenin yolları için aşağıdaki [İletişim](#başlık-iletişim) bölümüne bakın.
+      Şirket, forum için geri bildirim ve önerilerinizi memnuniyetle karşılamaktadır. Bizimle iletişime geçmenin yolları için aşağıdaki [Contact](#heading--contact) bölümüne bakın.
 
       Şirketin sağladığınız geri bildirim ve önerilere göre hareket etmekte özgür olacağını ve şirketin geri bildiriminizin kullanıldığını size bildirmek, kullanmak için izninizi almak veya size ödeme yapmak zorunda olmayacağını kabul edersiniz. Size veya başkalarına gizli veya tescilli olabileceğini düşündüğünüz geri bildirim veya önerileri göndermemeyi kabul edersiniz.
 
-      <h2 id="heading--termination"><a href="#heading--termination">Sorumluluk Sınırlamaları</a></h2>
+      <h2 id="heading--termination"><a href="#heading--termination">Fesih</a></h2>
 
-      Siz ya da şirket, bu şartlarda yazılı anlaşmayı herhangi bir zamanda sona erdirebilirsiniz. Anlaşmamız sona erdiğinde, forumu kullanma izniniz de sona erer.
+      Siz ya da şirket, bu şartlarda yazılı anlaşmayı istediğiniz zaman sona erdirebilirsiniz. Anlaşmamız sona erdiğinde, forumu kullanma izniniz de sona erer.
 
-      Aşağıdaki hükümler anlaşmamızın sona ermesinden sonra da geçerliliğini korur: [İçeriğiniz](#başlık--içeriğiniz), [Geri Bildirim](#başlık—geri-bildirim), [Sorumluluğunuz](#başlık--sorumluluk), [Feragatnameler](#başlık--feragatnameler), [Sorumluluk Sınırları](#başlık--sorumluluk) ve [Genel Şartlar](#başlık--genel).
+      Aşağıdaki hükümler anlaşmamızın sona ermesinden sonra da geçerliliğini korur: [İçeriğiniz] (#heading--your-content), [Feedback](#heading--feedback), [Sorumluluğunuz] (#heading--responsibility), [Disclaimers](#heading--disclaimers), [Sorumluluk Sınırları] (#heading--liability) ve [Genel Şartlar] (#heading--general).
 
       <h2 id="heading--disputes"><a href="#heading--disputes">Anlaşmazlıklar</a></h2>
 
-      Bu şartlar veya forumu kullanımınızla ilgili her türlü anlaşmazlığı %{governing_law} yönetecektir.
+      %{governing_law}, bu koşullar veya forumu kullanımınızla ilgili her türlü anlaşmazlığı yönetecektir.
 
-      Siz ve şirket, bu şartlarla ilgili olarak yalnızca %{city_for_disputes} konumundaki eyalet veya federal mahkemede ihtiyati tedbir talep etmeyi kabul edersiniz. Ne siz ne de şirket bu mahkemelerdeki yargı yetkisine, forumuna veya yerine itiraz etmeyecektir.
+      Siz ve şirket, bu şartlarla ilgili ihtiyati tedbir kararlarını yalnızca %{city_for_disputes} konumundaki eyalet mahkemeleri veya federal mahkemede talep etmeyi kabul edersiniz. Ne siz ne de şirket bu mahkemelerdeki yargı yetkisine, forumuna veya yerine itiraz etmeyecektir.
 
-      ***Bilgisayar Dolandırıcılığı ve Suistimali Yasası kapsamında bir ihtiyati tedbir veya hak talebi dışında, siz ve şirket her türlü anlaşmazlığı bağlayıcı Amerikan Tahkim Derneği tahkimi ile çözeceksiniz. Tahkim, AAA'nın Ticari Tahkim Kurallarını ve Tüketiciyle İlgili Anlaşmazlıklar için Ek Prosedürleri izleyecektir. Tahkim %{city_for_disputes} konumunda gerçekleşecektir. Herhangi bir anlaşmazlığı, davacı veya sınıf üyesi olarak bir toplu davanın veya diğer temsili işlemlerin bir parçası olarak değil, bireysel olarak çözeceksiniz. Hiçbir hakem, şirketin izni olmadan herhangi bir anlaşmazlığı başka bir tahkimle birleştirmeyecektir.***
+      ***Bilgisayar Dolandırıcılığı ve Suistimali Yasası kapsamındaki ihtiyati tedbir veya talepler dışında, siz ve şirket her türlü anlaşmazlığı bağlayıcı Amerikan Tahkim Birliği tahkimi ile çözeceksiniz. Tahkim, AAA'nın Ticari Tahkim Kurallarını ve Tüketiciyle İlgili Anlaşmazlıklar için Ek Prosedürleri izleyecektir. Tahkim %{city_for_disputes} konumunda gerçekleşecektir. Herhangi bir anlaşmazlığı, davacı veya sınıf üyesi olarak bir toplu davanın veya diğer temsili işlemlerin bir parçası olarak değil, bireysel olarak çözeceksiniz. Hiçbir hakem, şirketin izni olmadan herhangi bir anlaşmazlığı başka bir tahkimle birleştirmeyecektir.***
 
       Herhangi bir tahkim kararı, tahkim masraflarını, makul avukatlık ücretlerini ve tanıklar için makul masrafları içerecektir. Siz ve şirket, tahkim kararlarını yargı yetkisine sahip herhangi bir mahkemeye sunabilirsiniz.
 
-      <h2 id="heading--general"><a href="#heading--general">Genel Şartlar</a></h2>
+      <h2 id="heading--general"><a href="#heading--general">Genel Koşullar</a></h2>
 
-      Bu şartların bir hükmü yazılı olarak uygulanamazsa, ancak uygulanabilir hale getirmek için değiştirilebilirse bu hüküm uygulanabilir hale getirmek için gereken minimum ölçüde değiştirilmelidir. Aksi takdirde, söz konusu hüküm kaldırılmalıdır.
+      Bu koşulların bir hükmü yazılı olarak uygulanamazsa, ancak uygulanabilir hale getirmek için değiştirilebilirse bu hüküm uygulanabilir hale getirmek için gereken minimum ölçüde değiştirilmelidir. Aksi takdirde, söz konusu hüküm kaldırılmalıdır.
 
       Şirket ile yaptığınız sözleşmeyi devredemezsiniz. Şirket, sözleşmenizi şirketin herhangi bir iştirakine, şirketin kontrolünü ele geçiren başka bir şirkete veya şirketin forumla ilgili varlıklarını satın alan başka bir şirkete devredebilir. Bu koşullara aykırı herhangi bir devir girişiminin yasal bir etkisi yoktur.
 
       Ne bu Sözleşme kapsamındaki herhangi bir hakkın kullanılması ne de bu Sözleşmenin herhangi bir ihlalinden feragat edilmesi, bu Sözleşmenin başka bir ihlalinden feragat edilmesini sağlamaz.
 
-      Bu şartlar, siz ve şirket arasında forumun kullanımına ilişkin tüm anlaşma şartlarını içermektedir. Bu şartlar, yazılı olsun ya da olmasın, forumu kullanımınızla ilgili diğer tüm anlaşmaların yerine geçer.
+      Bu koşullar, siz ve şirket arasında forumun kullanımına ilişkin tüm anlaşma koşullarını içermektedir. Bu şartlar, yazılı olsun ya da olmasın, forumu kullanımınızla ilgili diğer tüm anlaşmaların yerine geçer.
 
       <h2 id="heading--contact"><a href="#heading--contact">İletişim</a></h2>
 
@@ -4046,51 +4076,52 @@ tr_TR:
 
       <h2 id="heading--changes"><a href="#heading--changes">Değişiklikler</a></h2>
 
-      Şirket bu şartları en son 12 Temmuz 2018 tarihinde güncellemiştir ve bu şartları tekrar güncelleyebilir. Şirket tüm güncellemeleri forumda yayınlayacaktır. Önemli değişiklikler içeren güncellemeler için şirket, bir hesap oluşturduysanız ve geçerli bir e-posta adresi verdiyseniz size e-posta göndermeyi kabul eder. Şirket ayrıca güncellemeleri forumda özel mesajlar veya uyarılarla duyurabilir.
+      Şirket bu şartları en son [BURAYA SON GÜNCELLEME TARİHİNİ GİRİN] tarihinde güncellemiştir ve bu şartları tekrar güncelleyebilir. Şirket tüm güncellemeleri forumda yayınlayacaktır. Önemli değişiklikler içeren güncellemeler için şirket, bir hesap oluşturduysanız ve geçerli bir e-posta adresi verdiyseniz size e-posta göndermeyi kabul eder. Şirket ayrıca güncellemeleri forumda özel mesajlar veya uyarılarla duyurabilir.
 
-      Bu şartlarda yapılan bir güncellemeden haberdar olduğunuzda, forumu kullanmaya devam etmek için yeni şartları kabul etmeniz gerekir.
+      Bu koşullarda yapılan bir güncellemeden haberdar olduğunuzda, forumu kullanmaya devam etmek için yeni koşulları kabul etmeniz gerekir.
   privacy_topic:
     title: "Gizlilik Politikası"
     body: |
+      ## [Forum Yöneticisi, sitenize göre özelleştirmeniz gereken bir gizlilik politikası için örnek bir başlangıç şablonunu aşağıda bulabilirsiniz].
+
       <a name="collect"></a>
 
-      ## [Hangi bilgileri topluyoruz?](#toplama)
+      ## [Hangi bilgileri topluyoruz?](#collect)
 
       Sitemize kayıt olduğunuzda sizden bilgi toplarız ve burada paylaşılan içeriği okuyarak, yazarak ve değerlendirerek foruma katıldığınızda veri toplarız.
 
       Sitemize kayıt olurken adınızı ve e-posta adresinizi girmeniz istenebilir. Ancak sitemizi kayıt olmadan da ziyaret edebilirsiniz. E-posta adresiniz, benzersiz bir bağlantı içeren bir e-posta ile doğrulanacaktır. Bu bağlantı ziyaret edilirse e-posta adresini kontrol ettiğinizi biliriz.
 
-      Kayıt olurken ve gönderi yaparken, gönderinin geldiği IP adresini kaydederiz. Ayrıca sunucumuza yapılan her talebin IP adresini içeren sunucu günlüklerini de tutabiliriz.
+      Kayıt olurken ve gönderi yaparken, gönderinin kaynaklandığı IP adresini kaydederiz. Ayrıca sunucumuza yapılan her talebin IP adresini içeren sunucu günlüklerini de tutabiliriz.
 
       <a name="use"></a>
 
-      ## [Bilgilerinizi ne için kullanıyoruz?](#kullanım)
+      ## [Bilgilerinizi ne için kullanıyoruz?](#use)
 
-      Sizden topladığımız bilgilerden herhangi biri aşağıdaki yollardan birinde kullanılabilir:
+      Sizden topladığımız bilgilerden herhangi biri aşağıdaki yollardan biriyle kullanılabilir:
 
-      * Deneyiminizi kişiselleştirmek için &mdash; Bilgileriniz, bireysel ihtiyaçlarınıza daha iyi yanıt vermemize yardımcı olur.
-      * Sitemizi geliştirmek için &mdash; Sizden aldığımız bilgi ve geri bildirimlere dayanarak site tekliflerimizi sürekli olarak iyileştirmeye çalışıyoruz.
-      * Müşteri hizmetlerini iyileştirmek için &mdash; Bilgileriniz, müşteri hizmetleri taleplerinize ve destek ihtiyaçlarınıza daha etkili bir şekilde yanıt vermemize yardımcı olur.
-      * Periyodik e-postalar göndermek için &mdash; Sağladığınız e-posta adresi size bilgi göndermek, konulardaki değişiklikler hakkında veya kullanıcı adınıza yanıt olarak talep ettiğiniz bildirimleri göndermek, sorulara ve/veya diğer taleplere veya sorulara yanıt vermek için kullanılabilir.
+      * Deneyiminizi kişiselleştirmek için &mdash; bilgileriniz, bireysel ihtiyaçlarınıza daha iyi yanıt vermemize yardımcı olur.
+      * Sitemizi geliştirmek için &mdash; sizden aldığımız bilgi ve geri bildirimlere dayanarak site tekliflerimizi sürekli olarak iyileştirmeye çalışırız.
+      * Müşteri hizmetlerini iyileştirmek için &mdash; bilgileriniz, müşteri hizmetleri taleplerinize ve destek ihtiyaçlarınıza daha etkili bir şekilde yanıt vermemize yardımcı olur.
+      * Periyodik e-postalar göndermek için &mdash; Verdiğiniz e-posta adresi size bilgi göndermek, konulardaki değişiklikler hakkında veya kullanıcı adınıza yanıt olarak talep ettiğiniz bildirimleri göndermek, sorulara ve/veya diğer taleplere veya sorulara yanıt vermek için kullanılabilir.
 
       <a name="protect"></a>
 
-      ## [Bilgilerinizi nasıl koruyoruz?](#koruma)
+      ## [Bilgilerinizi nasıl koruyoruz?](#protect)
 
       Kişisel bilgilerinizi girdiğinizde, gönderdiğinizde veya kişisel bilgilerinize eriştiğinizde kişisel bilgilerinizin güvenliğini sağlamak için çeşitli güvenlik önlemleri uyguluyoruz.
 
       <a name="data-retention"></a>
 
-      ## [Veri saklama politikanız nedir?](#veri-saklama)
+      ## [Veri saklama politikanız nedir?](#data-retention)
 
-      Şunları yapmak için iyi niyetli bir çaba göstereceğiz:
+      Aşağıdakiler için iyi niyetli bir çaba göstereceğiz:
 
-      * Bu sunucuya gelen tüm taleplerin IP adresini içeren sunucu günlüklerini 90 günden fazla olmamak üzere saklamak.
-      * Kayıtlı kullanıcılar ve gönderileriyle ilişkili IP adreslerini en fazla 5 yıl saklamak.
+      * Bu sunucuya yapılan tüm isteklerin IP adresini içeren sunucu günlüklerini en fazla [GÜN SAYISI] gün saklayın.
 
       <a name="cookies"></a>
 
-      ## [Çerez kullanıyor muyuz?](#çerezler)
+      ## [Çerez kullanıyor muyuz?](#cookies)
 
       Evet. Çerezler, bir sitenin veya hizmet sağlayıcısının Web tarayıcınız (izin veriyorsanız) aracılığıyla bilgisayarınızın sabit diskine aktardığı küçük dosyalardır. Bu çerezler sitenin tarayıcınızı tanımasını ve kayıtlı bir hesabınız varsa bunu kayıtlı hesabınızla ilişkilendirmesini sağlar.
 
@@ -4098,13 +4129,13 @@ tr_TR:
 
       <a name="disclose"></a>
 
-      ## [Herhangi bir bilgiyi dış taraflara ifşa ediyor muyuz?](#ifşa)
+      ## [Herhangi bir bilgiyi dış taraflara ifşa ediyor muyuz?](#disclose)
 
-      Kişisel olarak tanımlanabilir bilgilerinizi dış taraflara satmıyor, takas etmiyor veya başka bir şekilde aktarmıyoruz. Bu, sitemizi işletmemize, işimizi yürütmemize veya size hizmet etmemize yardımcı olan güvenilir üçüncü tarafları içermez, tabii bu taraflar bu bilgileri gizli tutmayı kabul ettikleri sürece. Ayrıca, yasalara uymak, site politikalarımızı uygulamak veya kendimizin veya başkalarının haklarını, mülkiyetini veya güvenliğini korumak için yayınlamanın uygun olduğuna inandığımızda bilgilerinizi yayınlayabiliriz. Ancak, kişisel olarak tanımlanamayan ziyaretçi bilgileri pazarlama, reklam veya diğer kullanımlar için diğer taraflara sağlanabilir.
+      Kişisel olarak tanımlanabilir bilgilerinizi dış taraflara satmıyor, takas etmiyor veya başka bir şekilde aktarmıyoruz. Bu, bu taraflar bu bilgileri gizli tutmayı kabul ettikleri sürece sitemizi işletmemize, işimizi yürütmemize veya size hizmet etmemize yardımcı olan güvenilir üçüncü tarafları içermez. Ayrıca, yasalara uymak, site politikalarımızı uygulamak veya kendimizin veya başkalarının haklarını, mülkiyetini veya güvenliğini korumak için yayınlamanın uygun olduğuna inandığımızda bilgilerinizi yayınlayabiliriz. Ancak, kişisel olarak tanımlanamayan ziyaretçi bilgileri pazarlama, reklam veya diğer kullanımlar için diğer taraflara sağlanabilir.
 
       <a name="third-party"></a>
 
-      ## [Üçüncü taraf bağlantıları] (#üçüncü-taraf)
+      ## [Üçüncü taraf bağlantıları] (#third-party)
 
       Zaman zaman, kendi takdirimize bağlı olarak, sitemize üçüncü taraf ürünleri veya hizmetleri dahil edebilir veya sunabiliriz. Bu üçüncü taraf sitelerinin ayrı ve bağımsız gizlilik politikaları vardır. Bu nedenle, bu bağlantılı sitelerin içeriği ve faaliyetleri için hiçbir sorumluluğumuz veya yükümlülüğümüz yoktur. Bununla birlikte, sitemizin bütünlüğünü korumaya çalışıyor ve bu sitelerle ilgili her türlü geri bildirimi memnuniyetle karşılıyoruz.
 
@@ -4112,27 +4143,27 @@ tr_TR:
 
       ## [Çocukların Çevrimiçi Gizliliğini Koruma Yasası Uyumluluğu] (#coppa)
 
-      Sitemiz, ürünlerimiz ve hizmetlerimizin tümü en az 13 yaşında veya daha büyük kişilere yöneliktir. Bu sunucu ABD'de ise ve 13 yaşın altındaysanız COPPA([Çocukların Çevrimiçi Gizliliğini Koruma Yasası](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)) gereklilikleri uyarınca bu siteyi kullanmayın.
+      Sitemiz, ürünlerimiz ve hizmetlerimizin tümü en az 13 yaşında veya daha büyük kişilere yöneliktir. Bu sunucu ABD'de ise ve COPPA ([Çocukların Çevrimiçi Gizliliğini Koruma Yasası](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)) gereklilikleri uyarınca 13 yaşın altındaysanız bu siteyi kullanmayın.
 
       <a name="online"></a>
 
-      ## [Yalnızca Çevrimiçi Gizlilik Politikası](#çevrimiçi)
+      ## [Yalnızca Çevrimiçi Gizlilik Politikası](#online)
 
       Bu çevrimiçi gizlilik politikası yalnızca sitemiz aracılığıyla toplanan bilgiler için geçerlidir ve çevrimdışı toplanan bilgiler için geçerli değildir.
 
       <a name="consent"></a>
 
-      ## [Onayınız](#onay)
+      ## [Onayınız](#consent)
 
       Sitemizi kullanarak, web sitesi gizlilik politikamıza onay vermiş olursunuz.
 
       <a name="changes"></a>
 
-      ## [Gizlilik Politikamızdaki Değişiklikler](#değişiklikler)
+      ## [Gizlilik Politikamızdaki Değişiklikler](#changes)
 
-      Gizlilik politikamızı değiştirmeye karar verirsek bu değişiklikleri bu sayfada yayınlayacağız.
+      Gizlilik politikamızı değiştirmeye karar verirsek bu değişiklikleri bu sayfada yayınlarız.
 
-      Bu belge CC-BY-SA'dır. En son 31 Mayıs 2013 tarihinde güncellenmiştir.
+      Bu belge CC-BY-SA'dır. En son [BURAYA SON GÜNCELLEME TARİHİNİ GİRİN] güncellenmiştir.
   badges:
     mass_award:
       errors:
@@ -4419,6 +4450,7 @@ tr_TR:
     required_tags_from_group:
       one: "En az %{count} %{tag_group_name} etiketi eklemelisiniz. Bu gruptaki etiketler şunlardır: %{tags}."
       other: "En az %{count} %{tag_group_name} etiketi eklemelisiniz. Bu gruptaki etiketler şunlardır: %{tags}."
+    limited_to_one_tag_from_group: "%{tags} etiketleri aynı anda kullanılamaz. Lütfen bunlardan yalnızca birini ekleyin."
     invalid_target_tag: "bir eş anlamlının eş anlamlısı olamaz"
     synonyms_exist: "eş anlamlılar mevcutken izin verilmez"
   rss_by_tag: "%{tag} etiketli konular"
@@ -4437,10 +4469,10 @@ tr_TR:
       message: "<p> <b>%{email}</b> adresine etkinleştirme e-postasını yeniden gönderdik"
   safe_mode:
     title: "Güvenli moda gir"
-    description: "Güvenli mod, sitenizi eklenti veya temaları yüklemeden test edebilmenizi sağlar."
+    description: "Güvenli mod, temaları veya istemci tarafı eklenti özelleştirmelerini yüklemeden sitenizi test etmenize olanak tanır. Sunucu tarafı eklenti özelleştirmeleri etkin durumda kalır."
     no_themes: "Temaları ve tema bileşenlerini devre dışı bırak"
-    no_unofficial_plugins: "Resmi olmayan eklentileri devre dışı bırak"
-    no_plugins: "Tüm eklentileri devre dışı bırak"
+    no_unofficial_plugins: "Resmi olmayan istemci tarafı eklenti özelleştirmelerini devre dışı bırak"
+    no_plugins: "Tüm istemci tarafı eklenti özelleştirmelerini devre dışı bırak"
     enter: "Güvenli Moda Gir"
     must_select: "Güvenli moda girmek için en az bir seçenek belirlemelisiniz."
   wizard:
@@ -4555,7 +4587,9 @@ tr_TR:
           <p>İyi eğlenceler ve <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'> yeni topluluğunuzu oluştururken</a></p> iyi şanslar!
   search_logs:
     graph_title: "Arama Sayısı"
-  joined: "Katıldı"
+  onebox:
+    discourse:
+      user_joined_community: "%{date} tarihinde katıldı"
   discourse_push_notifications:
     popup:
       mentioned: '%{username}, "%{topic}" konusunda sizden bahsetti - %{site_title}'
@@ -4618,50 +4652,53 @@ tr_TR:
         category: kategori ayarları
     actions:
       agree:
-        title: "Kabul et..."
+        title: "Evet"
       agree_and_keep:
         title: "Gönderiyi Tut"
-        description: "Bayrağı kabul edin ve gönderiyi değiştirmeyin."
+        description: "Bayrağı kabul edin ama bu gönderiyi değiştirmeyin."
       agree_and_keep_hidden:
-        title: "Gönderiyi Gizli Tut"
-        description: "Bayrağı kabul edin ve gönderiyi gizli bırakın."
+        title: "Gönderiyi gizli tutun"
+        description: "Bayrağı kabul edin ve gönderiyi gizli tutun."
       agree_and_suspend:
-        title: "Kullanıcıyı Askıya Al"
+        title: "Kullanıcıyı askıya al"
         description: "Bayrağı kabul edin ve kullanıcıyı askıya alın."
       agree_and_silence:
-        title: "Kullanıcıyı Sustur"
+        title: "Kullanıcıyı sustur"
         description: "Bayrağı kabul edin ve kullanıcıyı susturun."
       agree_and_restore:
-        title: "Gönderiyi Geri Yükle"
+        title: "Gönderiyi geri yükle"
         description: "Gönderiyi tüm kullanıcıların görebilmesi için geri yükleyin."
       agree_and_hide:
-        title: "Gönderiyi Gizle"
-        description: "Bu gönderiyi gizleyin ve kullanıcıya otomatik olarak gönderiyi düzenlemesini isteyen bir mesaj gönderin."
+        title: "Gönderiyi gizle"
+        description: "Bayrağı kabul edin ve bu gönderiyi gizleyin + otomatik olarak kullanıcıya bu gönderiyi düzenlemesini isteyen bir mesaj gönderin"
       delete_single:
         title: "Sil"
       delete:
         title: "Sil..."
       delete_and_ignore:
-        title: "Gönderiyi Sil ve Yok Say"
-        description: "Gönderiyi silin; ilk gönderiyse konuyu da silin"
+        title: "İşareti yoksay ve gönderiyi sil"
+        description: "Kuyruktan kaldırarak bayrağı yok sayın ve gönderiyi silin; ilk gönderiyse konuyu da silin. "
       delete_and_ignore_replies:
-        title: "Gönderiyi + Yanıtları Silin ve Yok Sayın"
-        description: "Gönderiyi ve tüm yanıtlarını silin; ilk gönderiyse konuyu da silin"
+        title: "Bayrağı yoksay, gönderiyi ve yanıtları sil"
+        description: "Kuyruktan kaldırarak bayrağı yok sayın, gönderiyi ve tüm yanıtlarını silin; ilk gönderiyse konuyu da silin"
         confirm: "Gönderiye verilen yanıtları da silmek istediğinizden emin misiniz?"
       delete_and_agree:
-        title: "Gönderiyi Silin ve Kabul Edin"
-        description: "Gönderiyi silin; ilk gönderiyse konuyu da silin"
+        title: "Gönderiyi sil"
+        description: "Bayrağı kabul edin ve bu gönderiyi silin; ilk gönderiyse konuyu da silin."
       delete_and_agree_replies:
-        title: "Gönderiyi + Yanıtları Silin ve Kabul Edin"
-        description: "Gönderiyi ve tüm yanıtlarını silin; ilk gönderiyse konuyu da silin"
+        title: "Gönderiyi ve yanıtları sil"
+        description: "Bayrağı kabul edin ve bu gönderiyi ve tüm yanıtlarını silin; ilk gönderiyse konuyu da silin."
         confirm: "Gönderiye verilen yanıtları da silmek istediğinizden emin misiniz?"
       disagree_and_restore:
-        title: "Katılma ve Gönderiyi Geri Yükle"
+        title: "Hayır, gönderiyi geri yükle"
         description: "Gönderiyi tüm kullanıcıların görebilmesi için geri yükleyin."
       disagree:
-        title: "Katılma"
+        title: "Hayır"
       ignore:
         title: "Yok say"
+      ignore_and_do_nothing:
+        title: "Hiçbir şey yapma"
+        description: "Herhangi bir işlem yapmadan kuyruktan kaldırarak bayrağı yok sayın. Gizli gönderiler gizli kalır ve otomatik araçlar tarafından işlenir."
       approve:
         title: "Onayla"
       approve_post:
@@ -4727,6 +4764,11 @@ tr_TR:
     payload_url:
       blocked_or_internal: "Yük URL'si engellenmiş veya dahili bir IP'ye çözümlendiği için kullanılamıyor"
       unsafe: "Yük URL'si güvenli olmadığı için kullanılamıyor"
+  form_templates:
+    errors:
+      invalid_yaml: "geçerli bir YAML dizesi değil"
+      invalid_type: "geçersiz bir şablon türü içeriyor: %{type} (geçerli türler şunlardır: %{valid_types})"
+      missing_type: "bir alan türü eksik"
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.uk.yml b/config/locales/server.uk.yml
index 6184ef67383..4b301f4531e 100644
--- a/config/locales/server.uk.yml
+++ b/config/locales/server.uk.yml
@@ -52,6 +52,11 @@ uk:
   remove_posts_deleted_by_author: "Видалено автором"
   redirect_warning: "Нам не вдалося підтвердити, що вибране вами посилання справді було розміщено на форумі. Якщо ви все одно хочете продовжити, виберіть посилання нижче."
   on_another_topic: "На іншу тему"
+  topic_category_changed: "Від %{from} до %{to}"
+  topic_tag_changed:
+    added_and_removed: "Додано %{added} і видалено %{removed}"
+    added: "Додано %{added}"
+    removed: "Видалено %{removed}"
   inline_oneboxer:
     topic_page_title_post_number: "#%{post_number}"
     topic_page_title_post_number_by_user: "#%{post_number} від %{username}"
@@ -203,10 +208,10 @@ uk:
       invalid_site_setting: "Не існує параметра з назвою «%{name}»"
       invalid_category_id: "Ви вказали розділ, якого не існує"
       invalid_choice:
-        one: "Ви вказали недійсний вибір %{name}"
-        few: "Ви вказали недійсні варіанти %{name}"
-        many: "Ви вказали недійсні варіанти %{name}"
-        other: "Ви вказали недійсні варіанти %{name}"
+        one: "'%{name}' є недійсним вибором."
+        few: "'%{name}' є недійсним вибором."
+        many: "'%{name}' є неправильними варіантами."
+        other: "'%{name}' є неправильними варіантами."
       default_categories_already_selected: "Ви не можете вибрати розділ, що використовується в іншому списку."
       default_tags_already_selected: "Ви не можете вибрати теґ, який використовується в іншому списку."
       s3_upload_bucket_is_required: "Ви не можете ввімкнути завантаження на S3, якщо ви не вказали 's3_upload_bucket'."
@@ -214,7 +219,8 @@ uk:
       page_publishing_requirements: "Публікація сторінки не може бути ввімкнена якщо обмежено доступ до медіа контенту."
       s3_backup_requires_s3_settings: "Ви не можете використовувати S3 як резервне розташування, якщо ви не вказали '%{setting_name}'."
       s3_bucket_reused: "Ви не можете використовувати той самий bucket для «s3_upload_bucket» і «s3_backup_bucket». Виберіть інший backet або використовуйте інший шлях для кожного з них."
-      secure_uploads_requirements: "Перед увімкненням захищених надсилань потрібно ввімкнути надсилання до S3."
+      secure_uploads_requirements: "Необхідно ввімкнути завантаження S3 і S3 ACL перед увімкненням безпечних завантажень."
+      s3_use_acls_requirements: "У вас повинні бути ввімкнені ACL S3, коли ввімкнено безпечні завантаження."
       share_quote_facebook_requirements: "Ви повинні встановити ідентифікатор застосунку Facebook, щоб увімкнути обмін цитатами для Facebook."
       second_factor_cannot_enforce_with_socials: "Ви не можете примусово активувати двофакторну автентифікацію разом зі входом за допомогою облікових записів соціальних мереж. Спочатку потрібно вимкнути вхід через: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Ви не можете застосувати двофакторну автентифікацію, якщо вимкнено систему локального входу."
@@ -255,6 +261,7 @@ uk:
     user_exists: "Немає потреби запрошувати користувача з <b>%{email}</b>, у нього вже є обліковий запис!"
     invite_exists: "Ви вже запросили <b>%{email}</b>."
     invalid_email: "%{email} не є дійсною адресою електронної пошти."
+    generic_error_response: "З вашим запитом виникла проблема."
     rate_limit:
       one: "Ви вже надіслали %{count} запрошення за останні 24 години, будь ласка, зачекайте %{time_left}, перш ніж повторити спробу."
       few: "Ви вже надіслали %{count} запрошення за останні 24 години, будь ласка, зачекайте %{time_left}, перш ніж повторити спробу."
@@ -442,6 +449,7 @@ uk:
   too_late_to_edit: "Цей допис було створено надто давно. Його вже не можна редагувати або видалити."
   edit_conflict: "Цей допис був відредагований іншим користувачем і ваші зміни не можуть бути збережені."
   revert_version_same: "Поточна версія збігається з версією, до якої ви намагаєтеся повернутися."
+  reverted_to_version: "повернуто до версії #%{version}"
   cannot_edit_on_slow_mode: "Ця тема знаходиться у сповільненому режимі. Для заохочення вдумливого, зваженого обговорення, редагування старих повідомлень в цій темі не дозволяється під час дії сповільненого режиму."
   excerpt_image: "зображення"
   bookmarks:
@@ -552,6 +560,7 @@ uk:
       Усім легше читати теми, у яких є детальні докладні відповіді, ніж багато маленьких окремих відповідей.
     dominating_topic: Ви багато писали в цій темі! Подумайте про те, щоб дати іншим можливість відповідати тут і обговорювати речі один з одним.
     get_a_room: Ви відповіли @%{reply_username} %{count} разів, чи знаєте ви, що замість цього можете надіслати особисте повідомлення?
+    dont_feed_the_trolls: Це повідомлення вже було позначено як таке, що потребує уваги модератора. Ви впевнені, що хочете відповісти на нього? Відповіді на негативний контент, як правило, заохочують до ще більш негативної поведінки.
     too_many_replies: |
       ### Ви досягли ліміту відповідей для цієї теми
 
@@ -641,7 +650,11 @@ uk:
         translation_overrides:
           attributes:
             value:
-              invalid_interpolation_keys: 'Наступні ключі інтерполяції недійсні: "%{keys}"'
+              invalid_interpolation_keys:
+                one: "Наступний ключ інтерполяції недійсний: %{keys}"
+                few: "Наступні ключі інтерполяції недійсні: %{keys}"
+                many: "Наступні ключі інтерполяції недійсні: %{keys}"
+                other: "Наступні ключі інтерполяції недійсні: %{keys}"
         watched_word:
           attributes:
             word:
@@ -662,22 +675,21 @@ uk:
   staff_category_name: "Команда обслуговування"
   staff_category_description: "Приватний розділ для спілкування команди обслуговування. Теми доступні тільки адміністраторам та модераторам."
   discourse_welcome_topic:
-    title: "Ласкаво просимо до нашої спільноти!"
-    body: |2
+    title: "Ласкаво просимо на сайт %{site_title}! :wave:"
+    body: |
+      Ми дуже раді, що ви приєдналися до нас.
 
-      Перший абзац цієї закріпленої теми буде показуватись як вітальне повідомлення для всіх нових відвідувачів на домашній сторінці. Це важливо!
+      %{site_info_quote}
 
-      **Перетворіть це** в короткий опис вашої спільноти:
+      Ось кілька речей, які ви можете зробити, щоб почати:
 
-      - Для кого це?
-      - Що вони можуть знайти тут?
-      - Чому вони повинні прийти сюди?
-      - Де вони можуть прочитати більше (посилання, ресурси і т.д.)?
+      :speaking_head: **Представтеся**, додавши своє зображення та інформацію про себе та свої інтереси до [ваш профіль](%{base_path}/my/preferences/account). Про що б ви хотіли, щоб вас запитали?
 
-      <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+      :open_book: **Познайомтеся зі спільнотою**, [переглядаючи обговорення](%{base_path}/вверх), які вже відбуваються тут. Якщо ви вважаєте публікацію цікавою, інформативною чи розважальною, використовуйте :heart: , щоб висловити свою вдячність або підтримку!
 
-      Ви можете закрити цю тему через дії адміністратора :wrench: (праворуч вгорі та внизу), щоб відповіді не накопичувалися в оголошенні.
-  admin_quick_start_title: "ПРОЧИТАЙТЕ МЕНЕ ПЕРШИМ: короткий посібник Адміністратора"
+      :handshake: **Зробіть свій внесок**, коментуючи, ділячись власною точкою зору, ставлячи запитання або пропонуючи відгук під час обговорення. Перш ніж відповідати, або відкривати нові теми, ознайомтеся з [Правилами спільноти](%{base_path}/faq).
+
+      > Якщо вам потрібна допомога чи є пропозиція, не соромтеся запитати в [#feedback](%{base_path}/c/site-feedback) або [зв’язатися з адміністраторами](%{base_path}/about).
   category:
     topic_prefix: "Про розділ %{category}"
     replace_paragraph: "(Замініть цей перший абзац коротким описом вашого нового розділу. Даний опис буде показано в області вибору розділів, тому намагайтеся, щоб він не перевищував 200 символів.)"
@@ -696,6 +708,7 @@ uk:
       disallowed_tags_generic: "Ця тема має заборонені теґи."
       slug_contains_non_ascii_chars: "містить символи, відмінні від ASCII"
       is_already_in_use: "вже використовується"
+      move_topic_to_category_disallowed: "Ви не можете перемістити цю тему в категорію, де у вас немає дозволу на створення нових тем."
     cannot_delete:
       uncategorized: "Цей розділ є особливим. Він призначений для зберігання тем, які не мають розділів; його не можливо видалити."
       has_subcategories: "Неможливо видалити цей розділ, тому що в ньому є підрозділи."
@@ -1211,7 +1224,7 @@ uk:
       title: "DAU/MAU"
       xaxis: "День"
       yaxis: "DAU/MAU"
-      description: "Кількість учасників, які увійшли в систему в останній день, поділене на кількість учасників, які увійшли в систему минулого місяця, повертає %, який вказує на 'привабливість' спільноти. Мета >30%."
+      description: "Кількість учасників, які увійшли в систему в останній день, поділене на кількість учасників, які увійшли в систему минулого місяця, повертає %, який вказує на 'привабливість' спільноти. Мета >20%."
     daily_engaged_users:
       title: "Щоденно Залучені Користувачі"
       xaxis: "День"
@@ -1493,6 +1506,7 @@ uk:
     out_of_date_themes: "Оновлення доступні для наступних тем:"
     unreachable_themes: "Ми не змогли перевірити наявність оновлень для наступних тем:"
     watched_word_regexp_error: "Неприпустимий регулярний вираз для '%{action}' контрольованих слів. Будь ласка, перевірте ваші <a href='%{base_path}/admin/customize/watched_words'>Налаштування контрольованих слів</a>, або вимкніть параметр 'контрольовані слова представлені регулярними виразами'."
+    v3_analytics_deprecated: "Ваш Discourse наразі використовує Google Analytics 3, яка більше не підтримуватиметься після липня 2023 року. <a href='https://meta.discourse.org/t/260498'>Оновіть Google Analytics 4</a> зараз, щоб і надалі отримувати цінну статистику та аналітику щодо ефективності вашого веб-сайту."
   site_settings:
     allow_bulk_invite: "Дозволити масові запрошення, шляхом завантаження файлу CSV"
     disabled: "вимкнуто"
@@ -1560,6 +1574,7 @@ uk:
     exclude_rel_nofollow_domains: "Список доменів, де nofollow не слід додавати до посилань. example.com автоматично дозволить sub.example.com також. Як мінімум, вам слід додати домен цього сайту, щоб допомогти пошуковим системам знайти весь вміст. Якщо інші частини вашого вебсайту знаходяться в інших доменах, додайте їх також."
     post_excerpt_maxlength: "Максимальна довжина уривка/резюме допису."
     topic_excerpt_maxlength: "Максимальна довжина уривку / резюме теми, створеного з першого допису в темі."
+    default_subcategory_on_read_only_category: "Вмикає кнопку «Нова тема» та вибирає підкатегорію за замовчуванням для публікації в категоріях, де користувачеві заборонено створювати нову тему."
     show_pinned_excerpt_mobile: "Показати уривок із закріплених тем у мобільному режимі."
     show_pinned_excerpt_desktop: "Показати уривок з закріплені теми в режимі перегляду стільниці."
     post_onebox_maxlength: "Максимальна довжина повідомлення з форуму Discourse в режимі розумної вставки."
@@ -1581,7 +1596,7 @@ uk:
     manifest_icon: "Зображення використовується як логотип/заставка на Android. Буде автоматично змінено до 512 × 512. Якщо залишити порожнім, буде використовуватися large_icon."
     manifest_screenshots: "Знімки екрана, що демонструють особливості та функціональні можливості вашого застосунку на сторінці вимоги його встановлення. Усі зображення мають завантажуватися локально та бути однакового розміру."
     favicon: "Значок для вашого сайту, див. <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://en.wikipedia.org/wiki/Favicon</a>. Для правильної роботи з CDN він повинен бути png. Буде змінений до 32x32. Якщо залишити порожнім, буде використовуватися large_icon."
-    apple_touch_icon: "Значок, який використовується для сенсорних пристроїв Apple. Буде автоматично змінено на розмір до 180x180. Якщо залишити порожнім, буде використовуватися large_icon."
+    apple_touch_icon: "Іконка, що використовується для сенсорних пристроїв Apple. Прозорий фон не рекомендується. Буде автоматично змінено розмір до 180х180. Якщо залишити порожнім, буде використано large_icon."
     opengraph_image: "Типове зображення opengraph, використовується, коли на сторінці немає іншого відповідного зображення. Якщо залишити порожнім, буде використовуватися large_icon"
     twitter_summary_large_image: "Картка Twitter «зведене велике зображення» (має бути не менше 280 в ширину, і принаймні 150 у висоту, і не може бути у форматі .svg). Якщо залишити порожнім, звичайні метадані картки генеруються за допомогою opengraph_image, якщо це також не є .svg"
     notification_email: "Відправник: E-mail використовується для надсилання всіх системних листів. Домен, вказаний тут повинен мати правильно сконфігуровані SPF, DKIM і reverse PTR записи, для успішного надсилання листів."
@@ -1691,6 +1706,7 @@ uk:
     enable_badges: "Увімкнути систему нагород"
     max_favorite_badges: "Максимальна кількість нагород, яку може вибрати користувач"
     whispers_allowed_groups: "Дозволити приватне спілкування в межах тем для членів указаних груп."
+    hidden_post_visible_groups: "Дозволити членам цих груп перегляд прихованих повідомлень. Персонал завжди може переглядати приховані повідомлення."
     allow_index_in_robots_txt: "Вкажіть в robots.txt, що цей сайт дозволено індексувати пошуковими системами. У виняткових випадках ви можете назавжди <a href='%{base_path}/admin/customize/robots'>перевизначити robots.txt</a>."
     blocked_email_domains: "Розділений вертикальною рискою список доменів електронної пошти, у яких користувачам заборонено реєструвати облікові записи. Піддомени автоматично обробляються для вказаних доменів. Символи підстановки * і ? не підтримуються. Приклад: mailinator.com|trashmail.net"
     allowed_email_domains: "Розділений вертикальною рискою список доменів електронної пошти, у яких користувачі ПОВИННІ зареєструвати облікові записи. Піддомени автоматично обробляються для вказаних доменів. Символи підстановки * і ? не підтримуються. ПОПЕРЕДЖЕННЯ: Користувачі з доменами електронної пошти, відмінними від зазначених у списку, не будуть допущені!"
@@ -1717,7 +1733,7 @@ uk:
     enable_discourse_connect: "Увімкнути вхід через Discoursconnect (раніше «Дискурс SSO») (ПОПЕРЕДЖЕННЯ: АДРЕСИ ЕЛЕКТРОННОЇ ПОШТИ КОРИСТУВАЧІВ *ПОВИННІ* БУТИ ПІДТВЕРДЖЕНІ ЗОВНІШНІМ САЙТОМ!)"
     verbose_discourse_connect_logging: "Записувати всі дані діагностики, повʼязані з DiscourseConnect у файл <a href='%{base_path}/logs' target='_blank'>/logs</a>"
     enable_discourse_connect_provider: "Використовувати протокол провайдера DiscourseConnect (раніше «Discourse SSO») у кінцевій точці /session/sso_provider, потрібно налаштувати discourse_connect_provider_secrets"
-    discourse_connect_url: "Адреса кінцевої точки DiscourseConnect (має містити http:// або https://)"
+    discourse_connect_url: "URL-адреса кінцевої точки DiscourseConnect (має містити http:// або https:// і не повинна містити кінцевого слешу)"
     discourse_connect_secret: "Секретний рядок, який використовується для криптографічної автентифікації інформації DiscourseConnect, переконайтеся, що він містить 10 символів або більше"
     discourse_connect_provider_secrets: "Список пар домен-секрет, які використовують DiscourseConnect. Переконайтеся, що секрет DiscourseConnect містить 10 символів або більше. Символ підстановки * можна використовувати для відповідності будь-якому домену або лише його частині (наприклад, *.example.com)."
     discourse_connect_overrides_bio: "Перезаписує інформацію в профіль користувача і не дозволяє користувачеві його змінювати"
@@ -1731,7 +1747,7 @@ uk:
     discourse_connect_overrides_profile_background: "Перевизначає фон профілю користувача значенням з корисного навантаження DiscoursConnect."
     discourse_connect_overrides_card_background: "Перевизначає фон картки користувача значенням корисного навантаження DiscoursConnect."
     discourse_connect_not_approved_url: "Перенаправляйте несхвалені облікові записи DiscourseConnect на цю URL-адресу"
-    discourse_connect_allows_all_return_paths: "Не обмежувати параметр return_paths для домену, надані DiscourseConnect (типово шлях повернення має бути на поточному сайті)"
+    discourse_connect_allowed_redirect_domains: "Обмежтеся цими доменами для шляху повернення, наданого DiscourseConnect (за замовчуванням шлях повернення має бути на поточному сайті). Використовуйте *, щоб дозволити будь-який домен для шляху повернення. Підстановочні знаки піддоменів (`*.foobar.com`) не дозволено."
     enable_local_logins: "Увімкнути локальні облікові записи на основі імені користувача та пароля. ПОПЕРЕДЖЕННЯ: якщо вимкнено, можливо, ви не зможете ввійти, якщо раніше не налаштували хоча б один альтернативний метод входу."
     enable_local_logins_via_email: "Дозвольте користувачам запитувати посилання для входу в один клік, яке буде надіслано їм електронною поштою."
     allow_new_registrations: "Дозволити реєстрацію нових користувачів. Зніміть цей прапорець, щоб ніхто не міг створити новий обліковий запис."
@@ -1767,6 +1783,7 @@ uk:
     s3_configure_tombstone_policy: "Увімкнути політику автоматичного видалення завантажень, відмічених як \"видалені\". ВАЖЛИВО. Якщо цей параметр вимкнено, місце не буде звільнятися після видалення завантажень."
     s3_disable_cleanup: "Запобігати видаленню старих резервних копій із S3, якщо резервних копій більше, ніж максимально дозволено."
     enable_s3_inventory: "Генерувати звіти та перевіряти завантаження за допомогою Amazon S3. ВАЖЛИВО: потрібні дійсні облікові дані S3 (ідентифікатор ключа доступу, так і секретний ключ доступу)."
+    s3_use_acls: "AWS рекомендує не використовувати ACL у сегментах S3; якщо ви дотримуєтеся цієї поради, зніміть позначку з цього параметра. Це має бути ввімкнено, якщо ви використовуєте безпечне завантаження."
     backup_time_of_day: "Час доби за UTC, коли має відбуватися резервне копіювання."
     backup_with_uploads: "Додавати завантаження в заплановані резервні копії. Вимкнувши це, створюватиметься лише резервна копія бази даних."
     backup_location: "Місце, де зберігаються резервні копії. ВАЖЛИВО: S3 вимагає дійсних облікових даних S3, введених у налаштуваннях Файлів."
@@ -1835,7 +1852,7 @@ uk:
     composer_media_optimization_image_bytes_optimization_threshold: "Мінімальний розмір файлу зображення для запуску оптимізації на стороні клієнта"
     composer_media_optimization_image_resize_dimensions_threshold: "Мінімальна ширина зображення для зміни розміру на стороні клієнта"
     composer_media_optimization_image_resize_width_target: "Зображення з шириною більше, ніж `composer_media_optimization_image_dimensions_resize_pigold` буде змінено до цієї ширини. Значення має бути >= ніж `composer_media_оптимізація_image_dimensions_resize_pigold`."
-    composer_media_optimization_image_encode_quality: "Якість кодування JPEG, що використовується в процесі перекодування."
+    composer_media_optimization_image_encode_quality: "Якість кодування JPG, що використовується в процесі перекодування."
     min_ratio_to_crop: "Коефіцієнт, що використовується для обрізання високих зображень. Введіть відношення ширини / висоти."
     simultaneous_uploads: "Максимальна кількість файлів, які можна перетягнути в редактор"
     default_invitee_trust_level: "Стандартний рівень довіри запрошених користувачів (від 0 до 4)."
@@ -1864,7 +1881,7 @@ uk:
     tl3_requires_likes_given: "Мінімальна кількість вподобань, яке необхідно поставити за останні (tl3 time period) дні, щоб отримати право на підвищення до Рівня довіри 3."
     tl3_requires_likes_received: "Мінімальна кількість вподобань, яку потрібно отримати за останні (tl3 time period) дні, щоб отримати право на підвищення рівня довіри до 3."
     tl3_links_no_follow: "Не видаляти rel=nofollow з посилань від користувачів з рівнем довіри 3."
-    trusted_users_can_edit_others: "Дозволити користувачам з високим рівнем довіри редагувати контент інших користувачів."
+    tl4_delete_posts_and_topics: "Дозволити користувачам TL4 видаляти повідомлення і теми, створені іншими користувачами. Користувачі TL4 також зможуть бачити видалені теми і повідомлення."
     min_trust_to_create_topic: "Мінімальний рівень довіри, необхідний для створення нової теми."
     allow_flagging_staff: "Якщо увімкнено, користувачі можуть позначати (скаржитися на) дописи членів команди обслуговування."
     min_trust_to_edit_wiki_post: "Мінімальний рівень довіри, необхідний для редагування вікі-повідомлення."
@@ -1900,7 +1917,6 @@ uk:
     title_min_entropy: "Мінімальна ентропія, необхідна для назви теми. (Ентропія – кількість унікальних символів, причому деякі літери кирилиці можуть вважатися за 2 символи, а не за 1, як англійські)."
     body_min_entropy: "Мінімальна ентропія, необхідна для вмісту допису. (Ентропія - кількість унікальних символів, причому деякі літери кирилиці можуть вважатися за 2 символи, а не за 1, як англійські)."
     allow_uppercase_posts: "Дозволити всі великі літери в заголовку теми або в темі допису."
-    max_consecutive_replies: "Кількість дописів, які користувач повинен зробити підряд у темі, перш ніж він вже не зможе додати ще одну відповідь."
     enable_filtered_replies_view: 'Кнопка "(n) відповідей" згортає всі інші дописи та показує лише поточний допис та відповіді на нього.'
     title_fancy_entities: "Перетворювати символи ASCII в заголовках тем у HTML-об’єкти, такі як <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>SmartyPants</a>"
     min_title_similar_length: "Мінімальна довжина назви теми, при якій вона буде перевірена на наявність схожих."
@@ -1980,6 +1996,11 @@ uk:
     block_auto_generated_emails: "Блокувати вхідні електронні листи, ідентифіковані як автоматично створені."
     ignore_by_title: "Ігнорувати вхідні електронні листи на основі їх заголовку."
     mailgun_api_key: "Ключ API Mailgun Secret, який використовується для перевірки повідомлень webhook."
+    sendgrid_verification_key: "Ключ перевірки Sendgrid, який використовується для перевірки повідомлень webhook."
+    mailjet_webhook_token: "Маркер, який використовується для перевірки корисного навантаження вебхуку. Його потрібно передати як параметр запиту «t» вебхука, наприклад: https://example.com/webhook/mailjet?t=supersecret"
+    mandrill_authentication_key: "Ключ автентифікації Mandrill, який використовується для перевірки повідомлень webhook."
+    postmark_webhook_token: "Маркер, який використовується для перевірки корисного навантаження вебхуку. Його потрібно передати як параметр запиту «t» вебхуку, наприклад: https://example.com/webhook/postmark?t=supersecret"
+    sparkpost_webhook_token: "Маркер, який використовується для перевірки корисного навантаження вебхуку. Його потрібно передати як параметр запиту «t» вебхуку, наприклад: https://example.com/webhook/sparkpost?t=supersecret"
     soft_bounce_score: "Показник відмов додається користувачеві, коли відбувається тимчасова відмова."
     hard_bounce_score: "Показник відмов додається користувачеві, коли відбувається постійна відмова."
     bounce_score_threshold: "Максимальний показник відмов, перш ніж ми припинимо надсилати користувачеві електронні листи."
@@ -2007,7 +2028,7 @@ uk:
     pop3_polling_password: "Пароль для облікового запису POP3 для отримання електронної пошти."
     pop3_polling_delete_from_server: "Видаляти електронні листи з сервера. ПРИМІТКА. Якщо ви вимкнете це, слід вручну очищати поштову скриньку"
     log_mail_processing_failures: "Записувати усі помилки обробки електронної пошти в <a href='%{base_path}/logs' target='_blank'>/logs</a>"
-    email_in: 'Дозволити користувачам публікувати нові теми електронною поштою (потрібне отримання листів вручну або через Pop3). Налаштуйте адреси у вкладці «Налаштування» кожного розділу.'
+    email_in: "Дозволити користувачам публікувати нові теми електронною поштою. Після ввімкнення цього параметра ви зможете налаштувати вхідні адреси електронної пошти для груп і категорій."
     email_in_min_trust: "Мінімальний рівень довіри, який повинен мати користувач, щоб мати можливість створювати нові теми електронною поштою."
     email_in_authserv_id: "Ідентифікатор служби, яка перевіряє автентифікацію вхідних електронних листів. Див. <a href='https://meta.discourse.org/t/134358'>https://meta.discourse.org/t/134358</a>, щоб дізнатися, як налаштувати."
     email_in_spam_header: "Заголовок електронної пошти для виявлення спаму."
@@ -2071,6 +2092,7 @@ uk:
     allow_profile_backgrounds: "Дозволити користувачам завантажувати фони профілю."
     sequential_replies_threshold: "Кількість дописів, які користувач має зробити підряд в темі, перш ніж нагадувати про занадто багато послідовних відповідей."
     get_a_room_threshold: "Кількість дописів, які користувач має зробити до тієї самої особи в тій самій темі, перш ніж буде попереджений."
+    dont_feed_the_trolls_threshold: "Кількість прапорів від інших користувачів до попередження."
     enable_mobile_theme: "Мобільні пристрої використовують тему, зручну для мобільних пристроїв, з можливістю переходу на повний сайт. Вимкніть це, якщо ви хочете використовувати спеціальну таблицю стилів."
     dominating_topic_minimum_percent: "Який відсоток дописів користувач повинен зробити в темі, перш ніж він буде попереджений про надмірне домінування в темі."
     disable_avatar_education_message: "Вимкнути навчальне повідомлення про зміну аватара."
@@ -2080,22 +2102,20 @@ uk:
     permalink_normalizations: "Застосуйте такий регулярний вираз перед пошуком відповідних постійних посилань, наприклад: /(topic.*)\\?.*/\\1 видалить рядки запиту з маршрутів тем. Формат — регулярний вираз+рядок, використовуйте \\1 тощо для доступу до записів"
     global_notice: "Показувати всім відвідувачам глобальний банер про ТЕРМІНОВУ, ЕКСТРЕНУ СИТУАЦІЮ, який не можна відхилити, змініть його на пусте, щоб приховати його (допускається використання HTML)."
     disable_system_edit_notifications: "Вимикає сповіщення користувача системи про редагування, коли активовано 'download_remote_images_to_local'."
-    disable_category_edit_notifications: "Не повідомляти під час переміщення тем до іншого розділу."
-    disable_tags_edit_notifications: "Не повідомляти про редагування теґів у темах."
     notification_consolidation_threshold: "Кількість вподобань або запитів на членство, отриманих до консолідації сповіщень, в одне. Установіть значення 0 для відключення."
     likes_notification_consolidation_window_mins: "Тривалість у хвилинах, коли вподобання консолідуються в одне сповіщення після досягнення межі. Поріг можна налаштувати за допомогою `SiteSetting.notification_consolidation_threshold`."
     automatically_unpin_topics: "Автоматично відкріплювати теми, коли користувач досягає кінця."
     read_time_word_count: "Кількість слів за хвилину для обчислення орієнтовного часу читання."
     topic_page_title_includes_category: "На сторінці теми <a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title' target='_blank'>теґ title</a> сторінки містить назву розділу."
-    native_app_install_banner_ios: "Показує банер програми DiscourseHub на пристроях iOS звичайним користувачам (рівень довіри 1 і вище)."
-    native_app_install_banner_android: "Показує банер програми DiscourseHub на пристроях Android звичайним користувачам (рівень довіри 1 і вище)."
+    native_app_install_banner_ios: "Відображає банер додатку DiscourseHub на пристроях iOS для базових користувачів (рівень довіри 1) і вище."
+    native_app_install_banner_android: "Відображає банер програми DiscourseHub на пристроях Android для базових користувачів (рівень довіри 1) і вище."
     app_association_android: "Вміст кінцевої точки <a href='%{base_path}/.well-known/assetlinks.json'>.well-known/assetlinks.json</a>, що використовується для Google Digital Asset Links API."
     app_association_ios: "Вміст кінцевої точки <a href='%{base_path}/apple-app-site-association'>apple-app-site-association</a>, що використовується для створення універсальних посилань між цим сайтом і програмами iOS."
     share_anonymized_statistics: "Діліться анонімною статистикою використання."
     auto_handle_queued_age: "Автоматично обробляти записи, які очікують на перегляд через стільки днів. Прапори ігноруватимуться. Дописи в черзі та користувачі будуть відхилені. Встановіть 0, щоб вимкнути цю функцію."
     penalty_step_hours: "Стандартні штрафи для вимикання або призупинення користувачів у годинах. Перше порушення  – перше значення, друге порушення – друге значення тощо."
     svg_icon_subset: "Додайте додаткові значки FontAwesome 5, які ви хочете додати до своїх ресурсів. Використовуйте префікс 'fa-' для непрозорих значків, 'far-' для звичайних піктограм і 'fab-' для піктограм бренду."
-    max_prints_per_hour_per_user: "Максимальна кількість показів сторінок /print (встановити 0 для відключення)"
+    max_prints_per_hour_per_user: "Максимальна кількість показів сторінок /print (0 - вимкнути друк)"
     full_name_required: "Повне ім’я – обов’язкове поле профілю користувача."
     enable_names: "Показувати повне імʼя користувача в його профілі, картці користувача та електронних листах. Вимкніть, щоб скрізь приховати повне імʼя."
     display_name_on_posts: "Показувати повні імена користувачів у їх дописах на додачу до їх @username."
@@ -2116,17 +2136,13 @@ uk:
     allowed_href_schemes: "Схеми, дозволені у посиланнях, крім http та https."
     embed_post_limit: "Максимальна кількість дописів для вставки."
     embed_username_required: "Для створення теми потрібне ім’я користувача."
-    notify_about_flags_after: "Якщо є звернення, які не оброблялися впродовж вказаної кількості годин, надішліть особисте повідомлення модераторам. Встановіть значення 0, щоб вимкнути."
-    show_create_topics_notice: "Якщо на сайті менше ніж 5 загальнодоступних тем, покажіть повідомлення про те, щоб адміністратори створили деякі теми."
+    notify_about_reviewable_item_after: "Якщо є питання, які не були розглянуті через стільки годин, буде надіслано особисте повідомлення модераторам. Встановіть 0, щоб вимкнути."
     delete_drafts_older_than_n_days: "Видалити чернетки, старші ніж (n) днів."
     delete_merged_stub_topics_after_days: "Кількість днів очікування до автоматичного видалення тем, з яких переміщено всі повідомлення. Встановіть 0, щоб ніколи не видаляти теми-заглушки."
-    bootstrap_mode_min_users: "Мінімальна кількість користувачів, необхідна для вимкнення режиму початкового завантаження (встановіть 0, щоб вимкнути)"
+    bootstrap_mode_min_users: "Мінімальна кількість користувачів, необхідна для вимкнення режиму завантаження (встановіть 0, щоб вимкнути, може зайняти до 24 годин)"
     prevent_anons_from_downloading_files: "Заборонити анонімним користувачам завантажувати вкладення."
-    secure_media: "ЗАСТАРІЛО: замість цього використовуйте налаштування secure_uploads, яке буде видалено в Discourse 3.0."
     secure_uploads: 'Обмежити доступ до УСІХ завантажень (зображень, відео, аудіо, тексту, PDF-файлів, архівів та інших). Якщо ввімкнено параметр «Потрібний вхід», доступ до завантажень мають лише користувачі, які ввійшли в систему. В іншому випадку доступ буде обмежено лише для медіа-завантажень у приватних повідомленнях та приватних категоріях. ПОПЕРЕДЖЕННЯ. Цей параметр є складним і вимагає глибокого адміністративного розуміння. Дивіться тему <a target="_blank" href="https://meta.discourse.org/t/-/140017">the secure uploads topic on Meta</a> для отримання детальної інформації.'
-    secure_media_allow_embed_images_in_emails: "ЗАСТАРІЛО: використовуйте secure_uploads_allow_embed_images_in_emails, буде видалено в Discourse 3.0."
     secure_uploads_allow_embed_images_in_emails: "Дозволяти вбудовувати зображення з обмеженим доступом до листів, якщо їх розмір не перевищує значення, вказаного у параметрі 'secure uploads max email embed image size kb'."
-    secure_media_max_email_embed_image_size_kb: "ЗАСТАРІЛО: використовувати secure_uploads_max_email_embed_image_size_kb, буде видалено в Discourse 3.0."
     secure_uploads_max_email_embed_image_size_kb: "Обмеження розміру захищених зображень, які вставлятимуться в електронні листи, якщо ввімкнено параметр «захищені завантаження дозволяють вбудовувати в електронні листи». Якщо це налаштування не ввімкнено, це налаштування не матиме ефекту."
     slug_generation_method: "Виберіть метод генерації slug (рядок ідентифікатор). 'encoded' створить рядок кодування у відсотках. 'none' взагалі вимкне slug."
     enable_emoji: "Увімкнути емодзі"
@@ -2134,6 +2150,7 @@ uk:
     emoji_set: "Які смайлики подобаються вам?"
     emoji_autocomplete_min_chars: "Мінімальна кількість символів, необхідна для показу спливаючого вікна автозавершення емодзі"
     enable_inline_emoji_translation: "Вмикає переклад вбудованих емодзі (без пробілів і пунктуації перед ними)"
+    emoji_deny_list: "Ці емодзі не будуть доступні для використання в меню або коротких кодах."
     approve_post_count: "Кількість дописів нового або базового користувача, які повинні бути затверджені"
     approve_unless_trust_level: "Дописи користувачів нижче цього рівня довіри вимагають затвердження"
     approve_new_topics_unless_trust_level: "Нові теми для користувачів нижче цього рівня довіри повинні бути затверджені"
@@ -2188,12 +2205,15 @@ uk:
     default_tags_watching_first_post: "Список теґів, у яких типово відстежуватиметься перший допис у кожній новій темі."
     default_text_size: "Типовий розмір тексту"
     default_title_count_mode: "Типовий режим лічильника заголовків сторінки"
+    enable_offline_indicator: "Відображати повідомлення користувачам, коли виявлено, що у них немає підключення до мережі"
     retain_web_hook_events_period_days: "Кількість днів для збереження записів про події web hook."
     retry_web_hook_events: "Автоматично повторювати невдалі події web hook протягом 4 разів. Проміжки часу між повторними спробами становлять 1, 5, 25 і 125 хвилин."
     revoke_api_keys_days: "Кількість днів до автоматичного відкликання невикористаного ключа API (0 для ніколи)"
     allow_user_api_keys: "Дозволити генерацію ключів API користувача"
     allow_user_api_key_scopes: "Список даних, дозволених для API ключів користувача"
-    min_trust_level_for_user_api_key: "Рівень довіри, необхідний для генерації ключів API користувача"
+    min_trust_level_for_user_api_key: |
+      Рівень довіри, необхідний для генерації ключів API користувача.<br>
+      <b>ПОПЕРЕДЖЕННЯ</b>: Зміна рівня довіри не дозволить користувачам з нижчим рівнем довіри увійти в систему через Discourse Hub
     allowed_user_api_auth_redirects: "Дозволена URL-адреса для переадресації автентифікації для ключів API користувача. Символ підстановки * може використовуватися для узгодження будь-якої його частини (наприклад, www.example.com/*)."
     allowed_user_api_push_urls: "Дозволені URL-адреси для надсилання на сервер push до API"
     expire_user_api_keys_days: "Кількість днів до того, як автоматично закінчиться термін дії ключа API користувача (0 ніколи)"
@@ -2211,6 +2231,7 @@ uk:
     suppress_overlapping_tags_in_list: "Якщо теґи відповідають точним словам у заголовках тем, не показувати теґ"
     remove_muted_tags_from_latest: "Не показуйте теми, позначені лише відключеними теґами, в списку останніх тем."
     force_lowercase_tags: "Примусово використовувати всі нові теґи лише в нижньому регістрі."
+    create_post_for_category_and_tag_changes: "Створюйте невеличке повідомлення під час зміни категорії або тегів"
     company_name: "Назва компанії"
     governing_law: "Законодавство"
     city_for_disputes: "Місто для розгляду суперечок"
@@ -2225,7 +2246,7 @@ uk:
     enable_sitemap: "Створіть карту сайту для вашого сайту та включіть її у файл robots.txt."
     sitemap_page_size: "Кількість URL-адрес для включення до кожної сторінки карти сайту. Максимум 50 000"
     enable_user_status: "(експериментально) Дозволити користувачам установлювати власне повідомлення про статус (емодзі + опис)."
-    enable_user_tips: "(експериментально) Увімкніть нові підказки користувачам, які описують ключові функції для користувачів"
+    enable_user_tips: "Увімкнути нові підказки, які описують ключові функції для користувачів"
     short_title: "Короткий заголовок буде використовуватися на домашньому екрані користувача, стартовому вікні чи інших місцях, де можливо обмежене місце. Він повинен бути обмежений 12 символами."
     dashboard_hidden_reports: "Дозволити приховати вказані звіти з панелі інструментів."
     dashboard_visible_tabs: "Виберіть, які вкладки інформаційної панелі будуть видимі."
@@ -2242,11 +2263,10 @@ uk:
     suggest_weekends_in_date_pickers: "Включіть вихідні (субота та неділя) у пропозиції вибору дати (вимкніть це, якщо ви використовуєте Discourse лише в будні, з понеділка по п’ятницю)."
     splash_screen: "Показувати екран тимчасового завантаження під час завантаження ресурсів сайту"
     navigation_menu: "Визначте, яке меню навігації використовувати. Навігація бічної панелі та заголовка налаштовується користувачами. Для зворотної сумісності доступна застаріла опція."
-    default_sidebar_categories: "Вибрані розділи показуватимуться в секції «Розділи» бічної панелі."
-    default_sidebar_tags: "Вибрані теґи показуватимуться в секції Теґи бічної панелі."
-    enable_new_user_profile_nav_groups: "ЕКСПЕРИМЕНТАЛЬНИЙ: користувачам вибраних груп буде показано навігаційне меню нового профілю користувача"
-    enable_experimental_topic_timeline_groups: "ЕКСПЕРИМЕНТАЛЬНО: Користувачам вибраних груп буде показано перероблену хронологію тем"
     enable_experimental_hashtag_autocomplete: "ЕКСПЕРИМЕНТАЛЬНО: Використовуйте нову систему автозаповнення #hashtag для категорій і тегів, яка по-іншому показувати вибраний елемент і покращує пошук"
+    experimental_new_new_view_groups: 'ЕКСПЕРИМЕНТАЛЬНО: Увімкніть список нових тем, який об''єднує непрочитані та нові теми, і зробіть так, щоб посилання "Все" на бічній панелі посилалося на нього.'
+    enable_custom_sidebar_sections: "ЕКСПЕРИМЕНТАЛЬНО: Увімкнути користувацькі розділи бічної панелі"
+    experimental_topics_filter: "ЕКСПЕРИМЕНТАЛЬНО: Вмикає експериментальний маршрут фільтрування тем за адресою /filter"
     errors:
       invalid_css_color: "Недійсний колір. Введіть назву кольору або шістнадцяткове значення."
       invalid_email: "Невірна адреса електронної пошти."
@@ -2272,7 +2292,6 @@ uk:
       pop3_polling_password_is_empty: "Ви повинні встановити 'pop3 polling password' перед включенням POP3 polling."
       pop3_polling_authentication_failed: "Помилка автентифікації POP3. Перевірте свої облікові дані pop3."
       reply_by_email_address_is_empty: "Ви повинні дозволити 'відповідь електронною поштою', перш ніж вмикати відповіді електронною поштою."
-      email_polling_disabled: "Перш ніж увімкнути відповідь електронною поштою, потрібно увімкнути опитування поштового сервера вручну або через POP3."
       user_locale_not_enabled: "Перш ніж увімкнути цей параметр, потрібно спочатку ввімкнути 'дозволити локальну інформацію користувача'"
       personal_message_enabled_groups_invalid: "Ви повинні вказати принаймні одну групу для цього параметра. Якщо ви хочете, щоб ніхто, крім членів команди обслуговування, не міг надсилати приватні повідомлення, виберіть групу команди обслуговування."
       invalid_regex: "Regex недійсний або заборонений."
@@ -2281,7 +2300,6 @@ uk:
       staged_users_disabled: "Перш ніж активувати цей параметр, потрібно спочатку ввімкнути 'staged users'."
       reply_by_email_disabled: "Перш ніж активувати це налаштування, потрібно спочатку увімкнути 'відповідь електронною поштою'."
       discourse_connect_url_is_empty: "Ви повинні встановити 'discourse connect url' перед увімкненням цього параметра."
-      discourse_connect_invite_only: "Ви не можете увімкнути DiscourseConnect та реєстрацію лише через запрошення одночасно."
       enable_local_logins_disabled: "Перш ніж активувати цей параметр, спочатку потрібно ввімкнути функцію 'enable local logins'."
       min_username_length_exists: "Ви не можете встановити мінімальну довжину імені користувача менше найкоротшого імені користувача (%{username})."
       min_username_length_range: "Ви не можете встановити мінімум вище максимуму."
@@ -2303,7 +2321,8 @@ uk:
       search_tokenize_japanese_enabled: "Ви повинні вимкнути 'search_tokenize_japanese' перед увімкненням цього параметра."
       discourse_connect_cannot_be_enabled_if_second_factor_enforced: "Ви не можете ввімкнути DiscourseConnect, якщо застосовано 2FA."
       delete_rejected_email_after_days: "Цей параметр не може бути нижчим за параметр delete_email_logs_after_days або більшим за %{max}"
-      invalid_uncategorized_category_setting: "Розділ \"Без розділів\" не можна вибрати, якщо не дозволити теми без розділів"
+      invalid_uncategorized_category_setting: 'Категорію «Без категорії» неможливо вибрати, якщо не ввімкнено «дозволити теми без категорії».'
+      invalid_search_ranking_weights: "Значення є недійсним для параметра search_ranking_weights сайту. Приклад: '{0.1,0.2,0.3,1.0}'. Зверніть увагу, що максимальне значення для кожної ваги дорівнює 1.0."
     placeholder:
       discourse_connect_provider_secrets:
         key: "www.example.com"
@@ -2538,7 +2557,6 @@ uk:
     activated_by_staff: "Активовано командою обслуговування"
     new_user_typed_too_fast: "Новий користувач набирає текст занадто швидко"
     content_matches_auto_silence_regex: "Вміст відповідає автоматичному блокуванню за regex (регулярним виразом)"
-    content_matches_auto_block_regex: "Вміст відповідає автоматичному блоку regex (регулярний вираз)"
     username:
       short: "має бути найменше %{min} символів"
       long: "має містити не більше %{max} символів"
@@ -3250,9 +3268,9 @@ uk:
       text_body_template: |
         Це автоматичне повідомлення.
 
-        Новий користувач [%{username}](%{user_url}) був автоматично заблокований, оскільки кілька користувачів позначили дописи %{username}.
+        Новий користувач [%{username}](%{user_url}) був автоматично вимкнений, оскільки кілька користувачів позначили допис(и) %{username}.
 
-        Будь ласка, [перегляньте позначки](%{base_url}/admin/flags). Якщо %{username} було помилково заблоковано, натисніть кнопку зняття блокування на [сторінці керування цього користувача](%{user_url}).
+        Будь ласка, [перегляньте позначки](%{base_url}/review). Якщо %{username} було помилково вимкнуто від публікації, натисніть кнопку відключення на [сторінці адміністратора для цього користувача](%{user_url}).
 
         Цей поріг можна змінити в налаштуваннях сайту `silence_new_user`.
     spam_post_blocked:
@@ -3290,15 +3308,6 @@ uk:
       title: "Завантаження віддалених зображень відключено"
       subject_template: "Завантаження віддалених зображені відключено"
       text_body_template: "Налаштування `download_remote_images_to_local` було вимкнено, оскільки досягнуто обмеження дискового простору на `download_remote_images_threshold`."
-    dashboard_problems:
-      title: "Проблеми на інформаційній панелі"
-      subject_template: "Нова порада на інформаційній панелі вашого сайту"
-      text_body_template: |
-        Ми маємо для вас кілька нових порад та рекомендацій на основі ваших поточних налаштувань.
-
-        [Відвідайте панель адміністратора](%{base_url}/admin), щоб побачити їх.
-
-        Якщо на вашій інформаційній панелі нічого не видно, можливо, інший член команди обслуговування вже скористався цією порадою. Список дій команди обслуговування можна знайти в [журналі дій команди](%{base_url}/admin/logs/staff_action_logs).
     new_user_of_the_month:
       title: "Ви новий користувач місяця!"
       subject_template: "Ви новий користувач місяця!"
@@ -3337,9 +3346,6 @@ uk:
       many: "Попередження: щодня ми надсилаємо максимум %{count} листів. Перевірте сайт, щоб побачити ті, які можуть бути затримані."
       other: "Попередження: щодня ми надсилаємо максимум %{count} листів. Перевірте сайт, щоб побачити ті, які можуть бути затримані."
     in_reply_to: "У відповідь на"
-    unsubscribe:
-      title: "Відписатися"
-      description: "Не зацікавлені в отриманні цих листів? Немає проблем! Натисніть нижче, щоб відписатися назавжди:"
     reply_by_email: "[Відвідайте тему](%{base_url}%{url}) або надішліть відповідь на цей електронний лист, щоб відповісти."
     reply_by_email_pm: "[Відвідайте повідомлення](%{base_url}%{url}) або дайте відповідь на це повідомлення електронною поштою, щоб відповісти на %{participants}."
     only_reply_by_email: "Надіслати відповідь на це повідомлення електронною поштою."
@@ -3625,7 +3631,6 @@ uk:
       liked_received: "Отримані вподобання"
       new_users: "Нові користувачі"
       popular_topics: "Популярні теми"
-      follow_topic: "Слідкуйте за цією темою"
       join_the_discussion: "Читати більше"
       popular_posts: "Популярні дописи"
       more_new: "Нове для вас"
@@ -3829,12 +3834,7 @@ uk:
     title: "Неможливо завантажити застосунок"
     offline_page_message: "Схоже, ви офлайн! Перевірте підключення до мережі та повторіть спробу."
   login_required:
-    welcome_message: |
-      ## [Ласкаво просимо до %{title}](#welcome)
-      Потрібно зареєструватися. Створіть обліковий запис або увійдіть, щоб продовжити.
-    welcome_message_invite_only: "## [Ласкаво просимо до %{title}](#welcome) \nПотрібен обліковий запис. Будь ласка, попросіть когось з учасників запросити вас, або увійдіть, щоб продовжити.\n"
-  deleted: "видалено"
-  image: "зображення"
+    welcome_message: "# [Ласкаво просимо до %{title}] (#welcome)"
   upload:
     edit_reason: "завантажені локальні копії зображень"
     unauthorized: "На жаль, ви не можете завантажити файл даного типу (список дозволених типів файлів: %{authorized_extensions})."
@@ -3937,8 +3937,267 @@ uk:
     title: "ЧаПи/Настанови"
   tos_topic:
     title: "Умови Використання"
+    body: |
+      <h2 id="heading--change-me"><a href="#heading--change-me">Змінити мене</a></h2>
+
+      Адміністратор форуму, будь ласка, знайдіть нижче приклад початкового шаблону політики конфіденційності, який ви повинні налаштувати відповідно до потреб вашого сайту.
+
+      Ці умови не регулюють, але можуть одного дня регулювати використання інтернет-форуму за адресою <%{base_url}>. У такому випадку, щоб користуватися форумом, ви повинні погодитися з цими умовами з %{company_name}, компанією, яка управляє форумом.
+
+      Компанія може пропонувати інші продукти та послуги на інших умовах. Ці умови застосовуються лише до використання форуму.
+
+      Перейти до:
+
+      - [Важливі умови] (#heading--important-terms)
+      - [Ваш дозвіл на використання форуму] (#heading--permission)
+      - [Умови використання форуму] (#heading--conditions)
+      - [Прийнятне використання] (#heading-acceptable-use)
+      - [Стандарти контенту](#heading--content-standards)
+      - [Enforcement](#heading--enforcement)
+      - [Ваш обліковий запис](#heading--your-account)
+      - [Ваш контент](#heading--your-content)
+      - [Ваша відповідальність](#heading--responsibility)
+      - [Disclaimers](#heading--disclaimers)
+      - [Обмеження відповідальності](#heading--liability)
+      - [Feedback](#heading--feedback)
+      - [Termination](#heading--termination)
+      - [Disputes](#heading--disputes)
+      - [Загальні положення] (#heading--general)
+      - [Contact](#heading--contact)
+      - [Changes](#heading--changes)
+
+      <h2 id="heading--important-terms"><a href="#heading--important-terms">Важливі положення</a></h2>
+
+      ***Ці положення містять ряд важливих положень, які впливають на ваші права та обов'язки, наприклад, відмова від відповідальності [Disclaimers](#heading--disclaimers), обмеження відповідальності компанії перед вами в [Обмеження відповідальності] (#heading--liability), ваша згода відшкодувати компанії збитки, спричинені вашим неправильним використанням форуму в [Відповідальність за ваше використання] (#heading--responsibility), а також угода про арбітражний розгляд спорів [Disputes](#heading--disputes).***
+
+      <h2 id="heading--permission"><a href="#heading--permission">Ваш дозвіл на використання форуму</a></h2>
+
+      Відповідно до цих умов, компанія надає вам дозвіл на використання форуму. Кожен повинен погодитися з цими умовами, щоб користуватися форумом.
+
+      <h2 id="heading--conditions"><a href="#heading--conditions">Умови використання форуму</a></h2>
+
+      Ваш дозвіл на використання форуму підлягає наступним умовам:
+
+      1. Вам повинно бути не менше тринадцяти років.
+
+      2. Ви не можете більше користуватися форумом, якщо компанія зв'яжеться з вами безпосередньо, щоб повідомити, що ви не можете більше користуватися форумом.
+
+      3. Ви повинні використовувати форум відповідно до [Припустимого використання] (#heading--acceptable-use) і [Стандартів контенту] (#heading--content-standards).
+
+      <h2 id="heading--acceptable-use"><a href="#heading--acceptable-use">Припустиме використання</a></h2>
+
+      1. Ви не можете порушувати закон, використовуючи форум.
+
+      2. Ви не можете використовувати або намагатися використовувати чужий обліковий запис на форумі без його спеціального дозволу.
+
+      3. Ви не можете купувати, продавати або іншим чином торгувати іменами користувачів або іншими унікальними ідентифікаторами на форумі.
+
+      4. Ви не можете надсилати рекламу, листи або інші пропозиції через форум, а також використовувати форум для збору адрес або інших персональних даних для комерційних списків розсилки або баз даних.
+
+      5. Ви не маєте права автоматизувати доступ до форуму або здійснювати моніторинг форуму, наприклад, за допомогою веб-сканера, плагіна або доповнення до браузера або іншої комп'ютерної програми, яка не є веб-браузером. Ви можете сканувати форум, щоб індексувати його для загальнодоступної пошукової системи, якщо у вас є така.
+
+      6. Ви не можете використовувати форум для надсилання електронної пошти до списків розсилки, груп новин або групових поштових псевдонімів.
+
+      7. Ви не можете неправдиво стверджувати, що ви пов'язані з компанією або схвалені нею.
+
+      8. Ви не можете розміщувати гіперпосилання на зображення або інший негіпертекстовий вміст форуму на інших веб-сторінках.
+
+      9. Ви не можете видаляти будь-які позначки, що вказують на право власності, з матеріалів, які ви завантажуєте з форуму.
+
+      10. Ви не можете показувати будь-яку частину форуму на інших веб-сайтах за допомогою `<iframe>`.
+
+      11. Ви не можете відключати, уникати або обходити будь-які обмеження безпеки або доступу на форумі.
+
+      12. Ви не маєте права перевантажувати інфраструктуру форуму необґрунтованим обсягом запитів, або запитів, спрямованих на створення необґрунтованого навантаження на інформаційні системи, що лежать в основі форуму.
+
+      13. Забороняється видавати себе за інших осіб на форумі.
+
+      14. Ви не можете заохочувати або допомагати будь-кому в порушенні цих умов.
+
+      <h2 id="heading--content-standards"><a href="#heading--content-standards">Стандарти контенту</a></h2>
+
+      1. Ви не можете розміщувати на форумі контент, який є незаконним, образливим або іншим чином шкідливим для інших. Сюди входить вміст, який є переслідуванням, недоречною, образливою або ненависницькою поведінкою.
+
+      2. Ви не можете розміщувати на форумі контент, який порушує закон, чиїсь права інтелектуальної власності, порушує чиєсь приватне життя або порушує угоди, які ви уклали з іншими особами.
+
+      3. Ви не можете відправляти на форум контент, що містить шкідливий комп'ютерний код, наприклад, комп'ютерні віруси або шпигунські програми.
+
+      4. Ви не можете надсилати вміст на форум як просто заповнювач, для зберігання певної адреси, імені користувача або іншого унікального ідентифікатора.
+
+      5. Ви не можете використовувати форум для розкриття інформації, яку ви не маєте права розголошувати, наприклад, конфіденційної або особистої інформації інших осіб.
+
+      <h2 id="heading--enforcement"><a href="#heading--enforcement">Правозастосування</a></h2>
+
+      Компанія може розслідувати та переслідувати порушення цих умов у повному обсязі відповідно до закону. Компанія може повідомляти правоохоронні органи і співпрацювати з ними в переслідуванні порушень закону і цих умов.
+
+      Компанія залишає за собою право змінювати, редагувати і видаляти контент на форумі з будь-якої причини. Якщо ви вважаєте, що хтось розмістив на форумі контент з порушенням цих умов, [негайно зв'яжіться з нами] (#заголовок--контакт).
+
+      <h2 id="heading--your-account"><a href="#heading--your-account">Ваш обліковий запис</a></h2>
+
+      Ви повинні створити обліковий запис і увійти в нього, щоб користуватися деякими функціями форуму.
+
+      Щоб створити обліковий запис, ви повинні надати деяку інформацію про себе. Якщо ви створюєте обліковий запис, ви погоджуєтеся надати, як мінімум, дійсну адресу електронної пошти і підтримувати цю адресу в актуальному стані. Ви можете закрити свій обліковий запис у будь-який час, надіславши електронного листа на адресу <%{contact_email}>.
+
+      Ви погоджуєтеся нести відповідальність за всі дії, здійснені з використанням вашого облікового запису, незалежно від того, санкціоновані вони вами чи ні, доти, доки ви не закриєте свій обліковий запис або не повідомите компанію про те, що ваш обліковий запис було скомпрометовано. Ви погоджуєтеся негайно повідомити компанію, якщо ви підозрюєте, що ваш обліковий запис було скомпрометовано. Ви погоджуєтеся вибрати надійний пароль для свого облікового запису і тримати його в таємниці.
+
+      Компанія може обмежити, призупинити або закрити ваш обліковий запис на форумі відповідно до своєї політики обробки запитів на видалення, пов'язаних з порушенням авторських прав, або якщо компанія обґрунтовано вважає, що ви порушили будь-яке правило в цих умовах.
+
+      <h2 id="heading--your-content"><a href="#heading--your-content">Ваш вміст</a></h2>
+
+      Ніщо в цих умовах не надає компанії жодних прав власності на інтелектуальну власність, якою ви ділитеся на форумі, наприклад, інформацію про ваш обліковий запис, повідомлення або інший вміст, який ви відправляєте на форум. Ніщо в цих умовах також не надає вам жодних прав власності на інтелектуальну власність компанії.
+
+      У відносинах між вами і компанією ви несете повну відповідальність за вміст, який ви розміщуєте на форумі. Ви погоджуєтесь не робити помилкових висновків про те, що контент, який ви розміщуєте на форумі, спонсорується або схвалюється компанією. Ці умови не зобов'язують компанію зберігати, підтримувати або надавати копії наданого вами контенту, а також змінювати його відповідно до цих умов.
+
+      Контент, який ви розміщуєте на форумі, належить вам, і ви вирішуєте, який дозвіл надавати на нього іншим. Але, як мінімум, ви надаєте компанії ліцензію на надання контенту, який ви розміщуєте на форумі, іншим користувачам форуму. Ця спеціальна ліцензія дозволяє компанії копіювати, публікувати та аналізувати вміст, який ви надсилаєте на форум.
+
+      Коли наданий вами контент видаляється з форуму (вами або компанією), дія спеціальної ліцензії компанії закінчується, коли остання копія зникає з резервних копій, кешу та інших систем компанії. Інші ліцензії, які ви застосовуєте до наданого вами контенту, наприклад, ліцензії [Creative Commons] (https://creativecommons.org), можуть продовжувати діяти після видалення вашого контенту. Ці ліцензії можуть надавати іншим особам або самій компанії право знову ділитися вашим контентом на форумі.
+
+      Інші особи, які отримують вміст, розміщений вами на форумі, можуть порушити умови, на яких ви надали ліцензію на ваш вміст. Ви погоджуєтеся, що компанія не несе відповідальності перед вами за ці порушення або їх наслідки.
+
+      <h2 id="heading--responsibility"><a href="#heading--responsibility">Ваша відповідальність</a></h2>
+
+      Ви погоджуєтеся звільнити компанію від юридичних претензій з боку інших осіб, пов'язаних з порушенням вами цих умов або порушенням цих умов іншими особами, які використовують ваш обліковий запис на форумі. Як ви, так і компанія погоджуєтеся якомога швидше повідомляти іншу сторону про будь-які юридичні претензії, за якими вам, можливо, доведеться відшкодовувати збитки компанії. Якщо компанія не повідомить вас про юридичні претензії вчасно, ви не будете зобов'язані відшкодовувати компанії збитки, від яких ви могли б захиститися або зменшити їх розмір за умови своєчасного повідомлення. Ви погоджуєтеся дозволити компанії контролювати розслідування, захист і врегулювання судових позовів, за якими вам доведеться відшкодовувати збитки компанії, і співпрацювати з нею в цих зусиллях. Компанія погоджується не погоджуватися на будь-яке врегулювання, яке визнає вашу провину або накладає на вас зобов'язання без вашої попередньої згоди.
+
+      <h2 id="heading--disclaimers"><a href="#heading--disclaimers">Відмова від відповідальності</a></h2>
+
+      ***Ви приймаєте на себе всі ризики, пов'язані з використанням форуму та контенту на форумі. Наскільки дозволяє закон, компанія та її постачальники надають форум "як є", без будь-яких гарантій.***
+
+      Форум може містити гіперпосилання та інтегрувати форуми і сервіси, що належать іншим особам. Компанія не надає жодних гарантій щодо послуг, які надаються іншими особами, або вмісту, який вони можуть надавати. Використання послуг, що надаються іншими особами, може регулюватися іншими умовами, укладеними між вами та особою, що надає послуги.
+
+      <h2 id="heading--liability"><a href="#heading--liability">Обмеження відповідальності</a></h2>
+
+      ***Ані компанія, ані її постачальники не несуть відповідальності перед вами за збитки, пов'язані з порушенням договору, які їхній персонал не міг розумно передбачити, коли ви погоджувалися з цими умовами.***
+
+      ***Наскільки дозволяє закон, загальна відповідальність перед вами за претензіями будь-якого виду, пов'язаними з форумом або контентом на форумі, буде обмежена 50 доларами США.***
+
+      <h2 id="heading--feedback"><a href="#heading--feedback">Зворотній зв'язок</a></h2>
+
+      Компанія вітає ваші відгуки та пропозиції щодо роботи форуму. Дивіться розділ [Contact](#заголовок--контакт) нижче, щоб дізнатися, як з нами зв'язатися.
+
+      Ви погоджуєтеся з тим, що компанія може вільно діяти на основі наданих вами відгуків та пропозицій, і що компанія не зобов'язана повідомляти вас про те, що ваш відгук був використаний, отримувати ваш дозвіл на його використання або платити вам за це. Ви погоджуєтесь не надавати відгуки або пропозиції, які, на вашу думку, можуть бути конфіденційними або такими, що є власністю компанії, вам або іншим особам.
+
+      <h2 id="heading--termination"><a href="#heading--termination">Розірвання</a></h2>
+
+      Ви або компанія можете розірвати угоду, викладену в цих умовах, у будь-який час. Коли наша угода закінчується, ваш дозвіл на використання форуму також закінчується.
+
+      Наступні положення залишаються чинними після закінчення терміну дії нашої угоди: [Ваш контент] (#заголовок - ваш контент), [Feedback](#заголовок - відгуки), [Ваша відповідальність] (#заголовок - відповідальність), [Disclaimers](#заголовок - застереження), [Обмеження відповідальності] (#заголовок - відповідальність) і [Загальні умови] (#заголовок - загальні).
+
+      <h2 id="heading--disputes"><a href="#heading--disputes">Суперечки</a></h2>
+
+      %{governing_law} буде регулювати будь-які суперечки, пов'язані з цими умовами або вашим використанням форуму.
+
+      Ви і компанія погоджуєтеся звертатися за судовими заборонами, пов'язаними з цими умовами, тільки в державний або федеральний суд %{city_for_disputes}. Ні ви, ні компанія не заперечуватимете проти юрисдикції, форуму або місця розгляду справи в цих судах.
+
+      ***За винятком випадків, коли йдеться про судову заборону або претензії відповідно до Закону про комп'ютерне шахрайство та зловживання, ви та компанія вирішуватимете будь-які суперечки шляхом обов'язкового арбітражного розгляду в Американській арбітражній асоціації (American Arbitration Association). Арбітраж буде проводитися відповідно до Правил комерційного арбітражу ААА та Додаткових процедур для вирішення спорів, пов'язаних зі споживачами. Арбітраж відбуватиметься на сайті %{city_for_disputes}. Ви вирішуватимете будь-який спір як фізична особа, а не як частина колективного позову чи іншого представницького провадження, незалежно від того, чи є ви позивачем або членом групи. Жоден арбітр не буде об'єднувати будь-який спір з будь-яким іншим арбітражем без дозволу компанії.***
+
+      Будь-яке арбітражне рішення включатиме витрати на арбітраж, розумні гонорари адвокатів та розумні витрати на свідків. Ви та компанія можете подавати арбітражні рішення до будь-якого суду, що має відповідну юрисдикцію.
+
+      <h2 id="heading--general"><a href="#heading--general">Загальні положення</a></h2>
+
+      Якщо положення цих умов не має юридичної сили в тому вигляді, в якому воно викладене, але може бути змінено, щоб зробити його юридично чинним, це положення має бути змінено в мінімальному обсязі, необхідному для того, щоб зробити його юридично чинним. В іншому випадку таке положення має бути вилучене.
+
+      Ви не маєте права переуступати свою угоду з компанією. Компанія може переуступити вашу угоду будь-якій афілійованій особі компанії, будь-якій іншій компанії, яка отримує контроль над компанією, або будь-якій іншій компанії, яка купує активи компанії, пов'язані з форумом. Будь-яка спроба переуступки всупереч цим умовам не має юридичної сили.
+
+      Ні здійснення будь-якого права за цією Угодою, ні відмова від будь-якого порушення цієї Угоди не звільняє від відповідальності за будь-яке інше порушення цієї Угоди.
+
+      Ці умови включають в себе всі умови угоди між вами і компанією про використання форуму. Ці умови повністю замінюють будь-які інші угоди про використання вами форуму, письмові чи ні.
+
+      <h2 id="heading--contact"><a href="#heading--contact">Зверніться за адресою</a></h2>
+
+      Ви можете повідомити компанію про порушення цих умов і надіслати їй запитання за адресою <%{contact_email}>.
+
+      Компанія може повідомити вас про порушення цих умов, використовуючи адресу електронної пошти, яку ви вказали для свого облікового запису на форумі, або розмістивши повідомлення на головній сторінці форуму або на сторінці вашого облікового запису.
+
+      <h2 id="heading--changes"><a href="#heading--changes">Зміни</a></h2>
+
+      Компанія востаннє оновлювала ці умови [ВСТАВИТИ ДАТУ ОСТАННЬОГО ОНОВЛЕННЯ ТУТ] і може оновлювати їх знову. Компанія буде публікувати всі оновлення на форумі. Якщо ви створили обліковий запис і надали дійсну адресу електронної пошти, компанія зобов'язується надсилати вам повідомлення про оновлення, які містять суттєві зміни. Компанія також може повідомляти про оновлення за допомогою спеціальних повідомлень або сповіщень на форумі.
+
+      Як тільки ви отримаєте повідомлення про оновлення цих умов, ви повинні погодитися з новими умовами, щоб продовжувати користуватися форумом.
   privacy_topic:
     title: "Політика конфіденційності"
+    body: |
+      ## [Адміністратор форуму, будь ласка, знайдіть нижче приклад початкового шаблону політики конфіденційності, який ви можете адаптувати до вашого сайту].
+
+      <a name="collect"></a>
+
+      ## [Яку інформацію ми збираємо?] (#collect)
+
+      Ми збираємо інформацію від вас, коли ви реєструєтесь на нашому сайті, і збираємо дані, коли ви берете участь у форумі, читаючи, пишучи та оцінюючи вміст, яким ділитеся тут.
+
+      При реєстрації на нашому сайті вас можуть попросити ввести ваше ім'я та адресу електронної пошти. Однак ви можете відвідати наш сайт без реєстрації. Ваша адреса електронної пошти буде перевірена за допомогою електронного листа, що містить унікальне посилання. Якщо ви перейдете за цим посиланням, ми знатимемо, що ви контролюєте адресу електронної пошти.
+
+      При реєстрації та публікації ми записуємо IP-адресу, з якої було відправлено повідомлення. Ми також можемо зберігати журнали сервера, які включають IP-адресу кожного запиту до нашого сервера.
+
+      <a name="use"></a>
+
+      ## [Для чого ми використовуємо вашу інформацію?] (#use)
+
+      Будь-яка інформація, яку ми отримуємо від вас, може бути використана одним із наступних способів:
+
+      * Для персоналізації вашого досвіду &mdash; ваша інформація допомагає нам краще відповідати вашим індивідуальним потребам.
+      * Для покращення нашого сайту &mdash; ми постійно прагнемо вдосконалювати пропозиції нашого сайту на основі інформації та відгуків, які ми отримуємо від вас.
+      * Для покращення обслуговування клієнтів &mdash; ваша інформація допомагає нам більш ефективно реагувати на ваші запити щодо обслуговування та підтримки.
+      * Для надсилання періодичних електронних листів &mdash; Надана вами адреса електронної пошти може бути використана для надсилання вам інформації, сповіщень, які ви запитуєте, про зміни в темах або у відповідь на ваше ім'я користувача, відповідей на запити та/або інші запити чи запитання.
+
+      <a name="protect"></a>
+
+      ## [Як ми захищаємо вашу інформацію?] (#protect)
+
+      Ми впроваджуємо різноманітні заходи безпеки, щоб підтримувати безпеку вашої особистої інформації, коли ви вводите, надсилаєте або отримуєте доступ до вашої особистої інформації.
+
+      <a name="data-retention"></a>
+
+      ## [Яка ваша політика зберігання даних?](#data-retention)
+
+      Ми докладемо всіх зусиль для того, щоб
+
+      * Зберігати журнали сервера, що містять IP-адреси всіх запитів до цього сервера, не більше [КІЛЬКІСТЬ ДНІВ] днів.
+
+      <a name="cookies"></a>
+
+      ## [Чи використовуємо ми файли cookie?] (#cookies)
+
+      Так. Файли cookie - це невеликі файли, які сайт або його постачальник послуг пересилає на жорсткий диск вашого комп'ютера через ваш веб-браузер (якщо ви дозволили). Ці файли cookie дозволяють сайту розпізнати ваш браузер і, якщо у вас є зареєстрований обліковий запис, пов'язати його з вашим зареєстрованим обліковим записом.
+
+      Ми використовуємо файли cookie, щоб зрозуміти і зберегти ваші уподобання для майбутніх відвідувань і зібрати сукупні дані про трафік сайту і взаємодію з сайтом, щоб в майбутньому запропонувати кращий досвід роботи з сайтом і кращі інструменти. Ми можемо укладати контракти зі сторонніми постачальниками послуг, щоб допомогти нам краще зрозуміти відвідувачів нашого сайту. Ці постачальники послуг не мають права використовувати інформацію, зібрану від нашого імені, окрім як для того, щоб допомогти нам вести та вдосконалювати наш бізнес.
+
+      <a name="disclose"></a>
+
+      ## [Чи розкриваємо ми будь-яку інформацію стороннім особам?](#disclose)
+
+      Ми не продаємо, не обмінюємо та не передаємо стороннім особам вашу особисту інформацію. Це не стосується довірених третіх осіб, які допомагають нам у роботі нашого сайту, веденні бізнесу або обслуговуванні вас, за умови, що ці особи погоджуються зберігати цю інформацію конфіденційною. Ми також можемо розкрити вашу інформацію, якщо вважатимемо, що це необхідно для дотримання закону, дотримання політики нашого сайту або для захисту наших або інших прав, власності або безпеки. Однак неперсоніфікована інформація про відвідувачів може бути надана іншим сторонам для маркетингових, рекламних або інших цілей.
+
+      <a name="third-party"></a>
+
+      ##
+
+      Іноді, на власний розсуд, ми можемо включати або пропонувати продукти чи послуги третіх осіб на нашому сайті. Ці сторонні сайти мають окремі та незалежні політики конфіденційності. Тому ми не несемо жодної відповідальності за зміст і діяльність цих сайтів, на які є посилання. Тим не менш, ми прагнемо захистити цілісність нашого сайту і вітаємо будь-які відгуки про ці сайти.
+
+      <a name="coppa"></a>
+
+      ##
+
+      Наш сайт, продукти та послуги призначені для осіб, які досягли 13-річного віку або старше. Якщо цей сервер знаходиться в США, і вам менше 13 років, відповідно до вимог COPPA ([Закон про захист конфіденційності дітей в Інтернеті] (https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)), не використовуйте цей сайт.
+
+      <a name="online"></a>
+
+      ## [Тільки політика конфіденційності в Інтернеті](#online)
+
+      Ця політика конфіденційності в Інтернеті застосовується тільки до інформації, зібраної через наш сайт, і не поширюється на інформацію, зібрану за його межами.
+
+      <a name="consent"></a>
+
+      ## [Ваша згода] (#consent)
+
+      Використовуючи наш сайт, ви погоджуєтеся з політикою конфіденційності нашого веб-сайту.
+
+      <a name="changes"></a>
+
+      ## [Зміни до нашої політики конфіденційності](#changes)
+
+      Якщо ми вирішимо змінити нашу політику конфіденційності, ми опублікуємо ці зміни на цій сторінці.
+
+      Цей документ є CC-BY-SA. Востаннє його було оновлено [ВСТАВИТИ ДАТУ ОСТАННЬОГО ОНОВЛЕННЯ ТУТ].
   badges:
     mass_award:
       errors:
@@ -4237,6 +4496,7 @@ uk:
       few: "Ви повинні додати принаймні %{count} теґи у %{tag_group_name}. Теґи в цій групі: %{tags}."
       many: "Ви повинні додати принаймні %{count} теґів у %{tag_group_name}. Теґи в цій групі: %{tags}."
       other: "Ви повинні додати принаймні %{count} теґ у %{tag_group_name}. Теґи в цій групі: %{tags}."
+    limited_to_one_tag_from_group: "Теги %{tags} не можна використовувати одночасно. Будь ласка, використовуйте тільки один з них."
     invalid_target_tag: "не може бути синонімом синоніма"
     synonyms_exist: "заборонено, поки існують синоніми"
   rss_by_tag: "Теми з теґом %{tag}"
@@ -4255,10 +4515,10 @@ uk:
       message: "<p> Ми повторно надіслали електронний лист для активації на <b>%{email}</b>"
   safe_mode:
     title: "Увійти в безпечний режим"
-    description: "Безпечний режим дозволяє тестувати ваш сайт без завантаження втулків або тем."
+    description: "Безпечний режим дозволяє протестувати свій сайт без завантаження тем або налаштувань плагінів на стороні клієнта. Налаштування плагінів на стороні сервера залишаються ввімкненими."
     no_themes: "Вимкнути компоненти тем і теми"
-    no_unofficial_plugins: "Вимкнути неофіційні втулки"
-    no_plugins: "Вимкнути всі втулки"
+    no_unofficial_plugins: "Вимкнути неофіційні налаштування плагінів на стороні клієнта"
+    no_plugins: "Вимкніть усі налаштування плагінів на стороні клієнта"
     enter: "Увійти в безпечний режим"
     must_select: "Ви повинні вибрати принаймні одну опцію для входу в безпечний режим."
   wizard:
@@ -4373,7 +4633,9 @@ uk:
           <p>Насолоджуйтесь, бажаємо успіхів <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>у створенні вашої нової спільноти!</a></p>
   search_logs:
     graph_title: "Кількість пошуків"
-  joined: "Приєднався(лась)"
+  onebox:
+    discourse:
+      user_joined_community: "Приєднався %{date}"
   discourse_push_notifications:
     popup:
       mentioned: '%{username} згадав вас у "%{topic}" - %{site_title}'
@@ -4438,50 +4700,53 @@ uk:
         category: налаштування розділу
     actions:
       agree:
-        title: "Погоджуюся…"
+        title: "Так"
       agree_and_keep:
         title: "Залишити допис"
-        description: "Погодитися з прапором і залишити допис без змін"
+        description: "Погодитися з прапорцем, але зберегти цей пост без змін."
       agree_and_keep_hidden:
         title: "Залишити допис прихованим"
-        description: "Погодитись з прапором і залишити допис прихованим."
+        description: "Погодитись з прапорами і приховати публікацію."
       agree_and_suspend:
         title: "Призупинити користувача"
         description: "Погодитися з прапором та призупинити користувача."
       agree_and_silence:
-        title: "Заблокувати користувача"
+        title: "Вимкнути користувача"
         description: "Погодитися з прапором та заблокувати користувача."
       agree_and_restore:
         title: "Відновити допис"
         description: "Відновити допис, щоб усі користувачі могли його бачити."
       agree_and_hide:
         title: "Сховати допис"
-        description: "Приховати цей допис і автоматично надіслати користувачеві повідомлення з проханням відредагувати його."
+        description: "Погодитися з прапором і приховати цей допис + автоматично надіслати користувачеві повідомлення із закликом відредагувати його."
       delete_single:
         title: "Видалити"
       delete:
         title: "Видалити…"
       delete_and_ignore:
-        title: "Видалити допис та Ігнорувати"
-        description: "Видалити допис; якщо це перший допис, видалиться також тема"
+        title: "Ігнорувати прапорець і видалити повідомлення"
+        description: "Ігнорувати прапор, видаливши його з черги, і видалити публікацію; а якщо це перший допис, то видалити й тему. "
       delete_and_ignore_replies:
-        title: "Видалити допис + Відповіді та ігнорувати"
-        description: "Видалити допис і всі відповіді до нього; якщо це перший допис, то видалити також тему"
+        title: "Ігнорувати прапорець, видалити повідомлення та відповіді"
+        description: "Ігнорувати прапорець, видалити його з черги, видалити повідомлення та всі відповіді на нього; а якщо це перше повідомлення, видалити й тему"
         confirm: "Ви впевнені, що хочете також видалити відповіді до посту?"
       delete_and_agree:
-        title: "Видалити допис і погодитися"
-        description: "Видалити допис; якщо це перший допис, то видалиться також тема"
+        title: "Видалити повідомлення"
+        description: "Погодитися з прапорцем і видалити це повідомлення; а якщо це перше повідомлення, видалити й тему."
       delete_and_agree_replies:
-        title: "Видалити допис + Відповіді та Погодитися"
-        description: "Видалити допис і всі відповіді до нього; якщо це перший допис, то видалити також тему"
+        title: "Видалити повідомлення та відповіді"
+        description: "Погодитися з прапорцем і видалити це повідомлення і всі відповіді на нього; а якщо це перше повідомлення, видалити й тему."
         confirm: "Ви впевнені, що хочете також видалити відповіді до допису?"
       disagree_and_restore:
-        title: "Відхилити та відновити допис"
+        title: "Ні, відновити пост"
         description: "Відновити допис, щоб усі користувачі могли його бачити."
       disagree:
-        title: "Відмовити"
+        title: "Ні"
       ignore:
         title: "Ігнорувати"
+      ignore_and_do_nothing:
+        title: "Нічого не робити"
+        description: "Ігнорувати прапорець, видалити його з черги, без будь-якої дії. Приховані повідомлення залишатимуться прихованими і оброблятимуться автоматичними інструментами."
       approve:
         title: "Схвалити"
       approve_post:
@@ -4549,6 +4814,11 @@ uk:
     payload_url:
       blocked_or_internal: "URL-адресу корисного навантаження не можна використовувати, оскільки вона дозволяє використання заблокованої або внутрішньої IP-адреси"
       unsafe: "URL-адресу корисного навантаження не можна використовувати, оскільки вона небезпечна"
+  form_templates:
+    errors:
+      invalid_yaml: "не є дійсним рядком YAML"
+      invalid_type: "містить недійсний тип шаблону: %{type} (дійсні типи: %{valid_types})"
+      missing_type: "відсутній тип поля"
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.ur.yml b/config/locales/server.ur.yml
index aa361118477..2f8ccc975d6 100644
--- a/config/locales/server.ur.yml
+++ b/config/locales/server.ur.yml
@@ -185,9 +185,6 @@ ur:
       load_from_remote: "اُس پوسٹ کو لوڈ کرنے میں ایک خرابی کا سامنا کرنا پڑا۔"
     site_settings:
       invalid_category_id: "آپ نے ایک ایسے زُمرہ کی وضاحت کی ہے جو موجود نہیں"
-      invalid_choice:
-        one: "آپ نے غلط انتخاب %{name} کی وضاحت کی ہے"
-        other: "آپ نے غلط انتخابات %{name} کی وضاحت کی ہے"
       default_categories_already_selected: "آپ کسی دوسری فہرست میں استعمال کردہ زُمرَہ کا انتخاب نہیں کرسکتے۔"
       default_tags_already_selected: "آپ کسی دوسری فہرست میں استعمال ہونے والا ٹیگ منتخب نہیں کر سکتے۔"
       s3_upload_bucket_is_required: "آپ S3 پر اَپ لوڈز فعال نہیں کرسکتے جب تک کہ آپ نے 's3_upload_bucket' فراہم نہیں کیا۔"
@@ -566,10 +563,6 @@ ur:
             duration_minutes:
               cannot_be_zero: "0 سے زیادہ ہونا چاہیے۔"
               exceeds_maximum: "20 سال سے زیادہ نہیں ہو سکتا۔"
-        translation_overrides:
-          attributes:
-            value:
-              invalid_interpolation_keys: 'مندرجہ ذیل اِنٹَرپَولَیشَن کی (ز) غلط ہیں: "%{keys}"'
         watched_word:
           attributes:
             word:
@@ -583,22 +576,6 @@ ur:
   meta_category_description: "اِس سائٹ کے بارے میں بحث، اِس کی تنظیم، یہ کیسے کام کرتی ہے، اور ہم کس طرح اِسے بہتر بنا سکتے ہیں۔"
   staff_category_name: "سٹاف"
   staff_category_description: "اسٹاف کی گفتگو کیلئے ذاتی زُمرہ۔ ٹاپک صرف ایڈمن اور ماڈریٹرز کو نظر آتے ہیں۔"
-  discourse_welcome_topic:
-    body: |2
-
-      اس پِن کیے گئے ٹاپک کا پہلا پیراگراف آپ کے ہَوم پیج پر تمام نئے زائرین کو ایک خوش آمدید پیغام کے طور پر نظر آئے گا۔ یہ اہم ہے!
-
-      **اس میں ترمیم کریں** آپنی کمیونٹی کی ایک مختصر وضاحت میں:
-
-      یہ کس کیلئے ہے؟
-      وہ یہاں کیا تلاش کرسکتے ہیں؟
-      وہ یہاں کیوں آئیں؟
-      - وہ مزید کہاں پڑھ سکتے ہیں (لنکس، وسائل، وغیرہ)؟
-
-      <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
-
-      آپ اَیڈمن :wrench: (اوپری دائیں اور سب سے نیچے) کے ذریعہ اِس ٹاپک کو بند کرنا چاہیں گے، تاکہ ایک اعلان پر جوابات کا ڈھیر نہ لگ جائے۔
-  admin_quick_start_title: "مجھے سب سے پہلے پڑھیے: ایڈمن فوری آغاز گائیڈ"
   category:
     topic_prefix: "%{category} زُمرہ کے بارے میں"
     replace_paragraph: "(اس پہلے پیراگراف کو اپنے نئے زُمرہ کے بارے میں ایک مختصر وضاحت کے ساتھ تبدیل کریں۔ یہ ہدایات زُمرہ کے انتخاب کے والی جگہ پر نظر آئے گا، لہٰذا اِسے 200 حروف سے نیچے رکھنے کی کوشش کریں۔)"
@@ -1063,7 +1040,7 @@ ur:
       title: "DAU/MAU"
       xaxis: "دن"
       yaxis: "DAU/MAU"
-      description: "گزشتہ دن لاگ اِن ہونے والے ممبران کی تعداد گزشتہ مہینے میں لاگ اِن ہونے والے ممبران کی تعداد سے تقسیم کرنا – ایک ٪ کا حساب لگاتا ہے جس سے کمیونٹی سے 'چپکنے' کا اندازہ لگتا ہے۔ کوشش کریں >30٪ کیلئے۔"
+      description: "گزشتہ دن لاگ اِن ہونے والے ممبران کی تعداد گزشتہ مہینے میں لاگ اِن ہونے والے ممبران کی تعداد سے تقسیم کرنا – ایک ٪ کا حساب لگاتا ہے جس سے کمیونٹی سے 'چپکنے' کا اندازہ لگتا ہے۔ کوشش کریں >20٪ کیلئے۔"
     daily_engaged_users:
       title: "روزانہ کے مشغول صارفین"
       xaxis: "دن"
@@ -1419,7 +1396,6 @@ ur:
     manifest_icon: "تصویر جو اینڈرائڈ پر لوگو/سپلیش تصویر کے طور پر استعمال ہو۔ خود کار طریقے سے 512 × 512 کے سائیز پر دوبارہ تبدیل کر دی جائے گی۔ اگر خالی چھوڑ دیا گیا ہو، تو large_icon کا استعمال کیا جائے گا۔"
     manifest_screenshots: "اسکرین شاٹس جو اس کے انسٹال پرامپٹ صفحہ پر آپ کی مثال کی خصوصیات اور فعالیت کو ظاہر کرتے ہیں۔ تمام تصاویر مقامی اپ لوڈز اور ایک جیسی ہونی چاہئیں۔"
     favicon: "آپ کی ویب سائٹ کیلئے ایک فَیوِکان، <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>http://en.wikipedia.org/wiki/Favicon</a> دیکھیے۔ ایک CDN پر صحیح کام کرنے کیلئے اِس کا png ہونا ضروری ہے۔ 32x32 کے سائیز پر دوبارہ تبدیل کر دی جائے گی۔ اگر خالی چھوڑ دیا گیا ہو، تو large_icon کا استعمال کیا جائے گا۔"
-    apple_touch_icon: "ایپل ٹچ ڈیوائسوں کیلئے استعمال کیا جانے والا آئکن۔ خود بخود 180x180 کے سائیز پر دوبارہ تبدیل کر دیا جائے گا۔ اگر خالی چھوڑ دیا گیا ہو، تو large_icon کا استعمال کیا جائے گا۔"
     opengraph_image: "ڈِیفالٹ اَوپَن٘گراف تصویر، استعمال کی جاتی ہے جب صفحہ میں کوئی اور مناسب تصویر نہ ہو۔ اگر خالی چھوڑ دیا گیا ہو، تو large_icon کا استعمال کیا جائے گا۔"
     notification_email: "تمام ضروری سِسٹم ای میلز بھیجنے کیلئے استعمال ہونے والا from: ای میل ایڈریس۔ یہاں درج کردہ ڈومین کا SPF ،DKIM اور ریورس PTR ریکارڈ، ای میل کے پہنچنے کیلئے، صحیح طریقے سے مقرر ہونا لازمی ہے۔"
     email_custom_headers: "اپنی مرضی کے ای میل ہیڈرز کی پائپ سے علیحدہ کردہ فہرست"
@@ -1517,7 +1493,6 @@ ur:
     enable_discourse_connect: "DiscourseConnect (سابقہ 'Discourse SSO') کے ذریعے سائن آن کو فعال کریں (انتباہ: صارفین کے ای میل ایڈریس *ضروری ہے* کی توثیق بیرونی سائٹ سے کی جائے!)"
     verbose_discourse_connect_logging: "لاگ وربوز DiscourseConnect متعلقہ تشخیص کو <a href='%{base_path}/logs' target='_blank'>/لاگز</a>سے منسلک کریں۔"
     enable_discourse_connect_provider: "/session/sso_provider اینڈ پوائنٹ پر DiscourseConnect (پہلے 'Discourse SSO') فراہم کنندہ پروٹوکول کو نافذ کریں، discourse_connect_provider_secrets کو سیٹ کرنے کی ضرورت ہے۔"
-    discourse_connect_url: "DiscourseConnect اینڈ پوائنٹ کا URL (اس میں http:// یا https:// شامل ہونا چاہیے)"
     discourse_connect_secret: "خفیہ سٹرنگ کو خفیہ طور پر DiscourseConnect کی معلومات کی توثیق کرنے کے لیے استعمال کیا جاتا ہے، یقینی بنائیں کہ یہ 10 حروف یا اس سے زیادہ ہے۔"
     discourse_connect_provider_secrets: "ڈومین خفیہ جوڑوں کی فہرست جو DiscourseConnect استعمال کر رہی ہے۔ یقینی بنائیں کہ DiscourseConnect سیکرٹ ۱۰ حروف یا اس سے زیادہ ہے۔ وائلڈ کارڈ کی علامت * کسی بھی ڈومین یا اس کے صرف ایک حصے سے ملنے کے لیے استعمال کیا جا سکتا ہے (جیسے *.example.com)۔"
     discourse_connect_overrides_bio: "صارف پروفائل میں صارف کی بائیو کی جگہ لے لیتا ہے اور اِس کو تبدیل کرنے سے صارف کو روک دیتا ہے"
@@ -1531,7 +1506,6 @@ ur:
     discourse_connect_overrides_profile_background: "DiscourseConnect پے لوڈ سے قدر کے ساتھ صارف کے پروفائل کے پس منظر کو اوور رائیڈ کرتا ہے۔"
     discourse_connect_overrides_card_background: "DiscourseConnect پے لوڈ سے قدر کے ساتھ صارف کارڈ کے پس منظر کو اوور رائیڈ کرتا ہے۔"
     discourse_connect_not_approved_url: "غیر منظور شدہ DiscourseConnect اکاؤنٹس کو اس URL پر ری ڈائریکٹ کریں۔"
-    discourse_connect_allows_all_return_paths: "DiscourseConnect کی طرف سے فراہم کردہ return_paths کے لیے ڈومین کو محدود نہ کریں (بطور ڈیفالٹ واپسی کا راستہ موجودہ سائٹ پر ہونا چاہیے)"
     enable_local_logins: "مقامی صارف نام اور پاس ورڈ لاگ ان پر مبنی اکاؤنٹس کو فعال کریں۔ انتباہ: اگر غیر فعال ہو تو، آپ لاگ ان کرنے سے قاصر ہو سکتے ہیں اگر آپ نے پہلے سے کم از کم ایک متبادل لاگ ان طریقہ ترتیب نہیں دیا ہے۔"
     enable_local_logins_via_email: "صارفین کو بذریعہ ای میل بھیجے جانے والے ایک کلِک لاگ اِن لِنک کی درخواست کرنے کی اجازت دیں۔"
     allow_new_registrations: "نئے صارف رجسٹریشنوں کی اجازت دیں۔ کسی کو نیا اکاؤنٹ بنانے سے روکنے کیلئے اس کو غیر چیک شدہ کریں۔"
@@ -1657,7 +1631,6 @@ ur:
     tl3_requires_likes_given: "ٹرسٹ لَیول 3 پر ترقی کیلئے کوالیفائی کرنے کیلئے آخری (ٹ.ل.3 وقت کی مدت) دنوں میں دیے گئے لائیکس کی کم از کم تعداد۔"
     tl3_requires_likes_received: "ٹرسٹ لَیول 3 پر ترقی کیلئے کوالیفائی کرنے کیلئے آخری (ٹ.ل.3 وقت کی مدت) دنوں میں موصول ہوئے لائیکس کی کم از کم تعداد۔"
     tl3_links_no_follow: "ٹرسٹ سطح 3 صارفین کی طرف سے پوسٹ کردہ لنکس سے rel=nofollow نہ ہٹائیں۔"
-    trusted_users_can_edit_others: "اعلیٰ ٹرسٹ لَیول والے صارفین کو دیگر صارفین کے مواد میں ترمیم کرنے کی اجازت دیں"
     min_trust_to_create_topic: "نئے ٹاپک بنانے کیلئے کم از کم مطلوبہ ٹرسٹ لَیول۔"
     allow_flagging_staff: "اگر فعال ہو، تو صارف سٹاف اکاؤنٹس کی طرف سے پوسٹس کو فلَیگ کرسکتے ہیں۔"
     min_trust_to_edit_wiki_post: "وِیکی کے طور پر نشان زدہ پوسٹ میں ترمیم کرنے کیلئے کم از کم مطلوبہ ٹرسٹ لَیول۔"
@@ -1682,7 +1655,6 @@ ur:
     title_min_entropy: "ایک ٹاپک کے عنوان میں کم از کم مطلوبہ اَینٹراپی (منفرد حروف، مزید کیلئے غیر انگریزی حروف)۔"
     body_min_entropy: "ایک پوسٹ کے متن میں کم از کم مطلوبہ اَینٹراپی (منفرد حروف، مزید کیلئے غیر انگریزی حروف)۔"
     allow_uppercase_posts: "ایک ٹاپک عنوان یا پوسٹ متن میں تمام کَیپس کی اجازت دیں۔"
-    max_consecutive_replies: "ایک ہی ٹاپک میں لگاتار کتنی پوسٹس ایک صارف شائع کرے اِس سے پہلے کہ اُسے ایک اور جواب شامل کرنے سے روک دیا جائے۔"
     title_fancy_entities: "ٹاپک عنوانات میں عام ASCII حروف کو شوخ HTML اشیاء میں تبدیل کریں، بذریعہ سمارٹی پینٹس <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</a>"
     min_title_similar_length: "عنوان کی کم از کم لمبائی، اِس سے پہلے کہاُس کو اُسی طرح کے دوسرے ٹاپکس کیلئے چیک کیا جائے گا۔"
     desktop_category_page_style: "/ زمرہ جات صفحہ کے لیے بصری انداز۔"
@@ -1770,7 +1742,6 @@ ur:
     pop3_polling_password: "ای میل کیلئے پَول کرنے کیلئے POP3 اکاؤنٹ کا پاسورڈ۔"
     pop3_polling_delete_from_server: "سرور سے ایمیلز حذف کریں۔ نوٹ: اگر آپ اس کو غیر فعال کرتے ہیں تو آپ کو دستی طور پر اپنے میل اِنباکس کو صاف کرنا چاہئے"
     log_mail_processing_failures: "تمام ایمیل سے نمٹتے پر پیش آنے والی خرابیوں کو <a href='%{base_path}/logs' target='_blank'>/logs</a> پر لاگ کریں"
-    email_in: 'صارفین کو بذریعہ ای میل نئے ٹاپکس شائع کرنے کی اجازت دیں (دستی یا pop3 پَولنگ کی ضرورت ہے)۔ ہر قِسم کیلئے "ترتیبات" ٹَیب میں پتوں کو ترتیب دیں۔'
     email_in_min_trust: "نئے ٹاپک بذریعہ ای میل شائع کرنے کیلئے کم از کم ٹرسٹ لَیول جس کی صارف کو ضرورت ہے۔"
     email_in_spam_header: "سپیم کا پتہ لگانے کیلئے ایمیل ہیڈر۔"
     email_prefix: "ای میلز کے موضوع میں استعمال ہونے والا [label] ۔ اگر سیٹ نہیں کیا گیا تو یہ 'عنوان' ہوگا۔"
@@ -1829,14 +1800,11 @@ ur:
     automatically_unpin_topics: "صارفین جب ٹاپک کے آخر تک پہنچ جائیں تو خود بخود ٹاپکس پر سے پِن ہٹا دیں۔"
     read_time_word_count: "متوقع پڑھنے کے وقت کا حساب لگانے کیلئے فی منٹ الفاظ کی تعداد۔"
     topic_page_title_includes_category: "ٹاپک صفحہ کے <a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title' target='_blank'>عنوان ٹَیگ</a> میں زُمرہ کا نام شامل ہے۔"
-    native_app_install_banner_ios: "iOS ڈیوائسوں پر عام صارفین (ٹرسٹ لَیول 1 اور اوپر) کو ڈِسکورس ہب اَیپ بینر دکھاتا ہے۔"
-    native_app_install_banner_android: "اینڈرائیڈ ڈیوائسوں پر عام صارفین (ٹرسٹ لَیول 1 اور اوپر) کو ڈِسکورس ہب اَیپ بینر دکھاتا ہے۔"
     app_association_android: "<a href='%{base_path}/.well-known/assetlinks.json'>.well-known/assetlinks.json</a> اَینڈ پائنٹ کے مشمولات، جو گُوگل کے ڈیجیٹل اَیسٹ لنکس API کیلئے استعمال ہوتے ہیں۔"
     app_association_ios: "<a href='%{base_path}/apple-app-site-association'>اَیپل-اَیپ سائٹ-ایسوسی-ایشن</a> اَینڈ پائنٹ کے مشمولات، جو اِس سائٹ اور iOS ایپس کے مابین یونیورسل لنکس بنانے کیلئے استعمال ہوتے ہیں۔"
     share_anonymized_statistics: "گمنام استعمال کے اعداد و شمار کا اشتراک کریں۔"
     auto_handle_queued_age: "اُن ریکارڈز کو خود کار طریقہ سے ہَینڈل کریں جو اتنے دنوں کے بعد نظر ثانی کے منتظر ہیں۔ فلَیگز کو نظر انداز کیا جائے گا۔ قطار شدہ پوسٹس اور صارفین کو مسترد کردیا جائے گا۔ اِس خصوصیت کو غیر فعال کرنے کیلئے 0 پر سَیٹ کریں۔"
     svg_icon_subset: "اضافی فونٹ اَوسم 5 آئیکن شامل کریں جو آپ اپنے اثاثوں میں شامل کرنا چاہتے ہیں۔ ٹھوس آئیکنز کیلئے 'fa-' سابقہ، عام آئیکنز کیلئے 'far-' سابقہ اور برانڈ آئیکنز کیلئے 'fab-' سابقہ استعمال کریں۔"
-    max_prints_per_hour_per_user: "/print صفحہ نقوش کی زیادہ سے زیادہ تعداد (غیر فعال کرنے کیلئے 0 پر سَیٹ کریں)"
     full_name_required: "مکمل نام ایک صارف کے پروفائل کا لازمی فیلڈ ہے۔"
     enable_names: "صارف کا مکمل نام اُن کے پروفائل، صارف کارڈ، اور ای میل پر دکھائیں۔ ہر جگہ مکمل نام چھپانے کیلئے غیر فعال کریں۔"
     display_name_on_posts: "اپنے @username کے علاوہ صارف کی پوسٹس پر اُن کا مکمل نام بھی دکھائیں۔"
@@ -1853,10 +1821,7 @@ ur:
     allowed_href_schemes: "http اور https کے علاوہ لِنکس میں اجازت دی گئی اسکیمز۔"
     embed_post_limit: "اَیمبَیڈ کیے جانے والی پوسٹس کی زیادہ سے زیادہ تعداد۔"
     embed_username_required: "ٹاپک کی تخلیق کیلئے صارف نام ضروری ہے۔"
-    notify_about_flags_after: "اگر ایسے فلَیگ موجود ہیں جن پر اتنے گھنٹوں کے بعد بھی کام نہیں کیا جا سکا، تو ماڈریٹرز کو ذاتی پیغام بھیجیں۔ غیر فعال کرنے کیلئے 0 پر سَیٹ کریں۔"
-    show_create_topics_notice: "اگر سائٹ میں 5 سے کم عوامی ٹاپک موجود ہیں، تو کچھ ٹاپک تخلیق کرنے کیلئے منتظمین کو ایک نوٹس دکھائیں۔"
     delete_drafts_older_than_n_days: "(ن) دنوں سے پرانے ڈرافٹ حذف کریں۔"
-    bootstrap_mode_min_users: "بُوٹسٹرَیپ مَوڈ غیر فعال کرنے کیلئے درکار صارفین کی کم از کم تعداد (غیر فعال کرنے کیلئے 0 پر سَیٹ کریں)"
     slug_generation_method: "سلَگ تخلیق کا طریقہ منتخب کریں۔ 'انکوڈ کردہ' فیصد انکوڈِنگ سٹرِنگ تخلیق کرے گ۔. 'کوئی بھی نہیں' سلَگ کو غیر فعال کر دے گا۔"
     enable_emoji: "اِیمَوجی فعال کریں"
     enable_emoji_shortcuts: "عام سمائلی ٹیکسٹ جیسا کہ :) :p :( اِیمَوجیوں میں تبدیل کر دیا جائے گا"
@@ -1904,7 +1869,6 @@ ur:
     retry_web_hook_events: "خود کار طریقے سے 4 مرتبہ ناکام ویب ہک اِیونٹوں کی دوبارہ کوشش کریں۔ دوبارہ کوششوں کے درمیان ٹائم فرق 1، 5، 25 اور 125 منٹ ہے۔"
     allow_user_api_keys: "صارف API کلیدیں تخلیق کرنے کی اجازت دیں"
     allow_user_api_key_scopes: "صارف API کلیدوں کیلئے اجازت دی جانے والی سکَوپس کی فہرست"
-    min_trust_level_for_user_api_key: "API کلیدوں کی تخلیق کیلئے مطلوبہ ٹرسٹ لَیول"
     allowed_user_api_auth_redirects: "صارف API کیز کیلئے توثیقی ریڈائرَیکٹ کیلئے اجازت یافتہ URL۔ وائلڈ کارڈ علامت * اُس کے کسی بھی حصے کو میچ کرنے کیلئے استعمال کیا جا سکتا ہے (مثلاً www.example.com/*)۔"
     allowed_user_api_push_urls: "صارف API پر سرور پُش کیلئے اجازت یافتہ URL"
     expire_user_api_keys_days: "دنوں کی تعداد جس سے پہلے ایک صارف API کِی کی میعاد ختم ہو جائے (کبھی نہیں کیلئے 0)"
@@ -1949,7 +1913,6 @@ ur:
       pop3_polling_password_is_empty: "POP3 پولِنگ فعال کرنے سے پہلے آپ کو 'pop3 پولِنگ پاسورڈ' سَیٹ کرنا ہوگا۔"
       pop3_polling_authentication_failed: "POP3 کی توثیق ناکام ہوگئی۔ براہ مہربانی اپنے pop3 اسناد کی تصدیق کریں۔"
       reply_by_email_address_is_empty: "بذریعہ ای میل جواب فعال کرنے سے پہلے آپ کی طرف سے ایک 'جواب بذریعہ ای میل ایڈریس' سَیٹ کرنا ضروری ہے۔"
-      email_polling_disabled: "بذریعہ ای میل جواب فعال کرنے سے پہلے آپ کا دستی یا POP3 پولِنگ فعال کرنا ضروری ہے۔"
       user_locale_not_enabled: "اِس ترتیب کو فعال کرنے سے پہلے آپ کا 'صارف مقامیت کی اجازت' فعال کرنا ضروری ہے۔"
       invalid_regex: "رَیج اَیکس غلط یا اجازت یافتہ نہیں ہے۔"
       email_editable_enabled: "اِس ترتیب کو فعال کرنے سے پہلے آپ کا 'قابل ترمیم بذریعہ ای میل' غیر فعال کرنا ضروری ہے۔"
@@ -2113,7 +2076,6 @@ ur:
     deactivated_by_staff: "سٹاف نے غیر فعال کیا"
     activated_by_staff: "سٹاف نے فعال کیا"
     new_user_typed_too_fast: "نئے صارف نے بہت تیزی سے ٹائپ کیا"
-    content_matches_auto_block_regex: "مواد خود کار طریقہ سے بلاک کردہ رَیج اَیکس سے مَیچ کرتا ہے"
     username:
       short: "کم از کم %{min} حروف کا ہونا لازمی ہے"
       long: "%{max} حروف سے زیادہ نہ ہونا لازمی ہے"
@@ -2634,14 +2596,6 @@ ur:
     user_automatically_silenced:
       title: "صارف خود بخود خاموش کردہ"
       subject_template: "نیا صارف %{username} کمیونٹی فلَیگز کے ذریعہ خاموش کر دیا گیا"
-      text_body_template: |
-        یہ ایک خودکار پیغام ہے۔
-
-        نیا صارف [%{username}](%{user_url}) خود کار طریقہ سے خاموش کر دیا گیا تھا کیونکہ کئی صارفین نے %{username} کی پوسٹ(س) کو فلَیگ کیا تھا۔
-
-        براہ مہربانی [فلَیگز کا جائزہ لیں](%{base_url}/admin/flags)۔ اگر %{username} کو اشاعت سے غلط خاموش کیا گیا تھا، تو اِس صارف کیلئے [ایڈمن صفحہ](%{user_url}) پر خاموشی ختم کر دینے والے بٹن پر کلِک کریں۔
-
-        اس حد کو بذریعہ `silence_new_user` سائٹ ترتیب کے تبدیل کیا جاسکتا ہے۔
     spam_post_blocked:
       title: "سپَیم پوسٹ بلاک کر دی گئی"
       subject_template: "بار بار لِنکس کی وجہ سے نئے صارف %{username} کی پوسٹس کو بلاک کردیا گیا"
@@ -2667,15 +2621,6 @@ ur:
       title: "ریمَوٹ تصاویر کے ڈاؤن لوڈ غیر فعال"
       subject_template: "ریمَوٹ تصاویر کے ڈاؤن لوڈ کو غیر فعال کر دیا گیا ہے"
       text_body_template: "`download_remote_images_to_local` ترتیب غیر فعال کر دی گئی تھی کیونکہ` download_remote_images_threshold` پر ڈِسک میں جگہ کی حد تک پہنچ گئے تھے۔"
-    dashboard_problems:
-      title: "ڈَیش بورڈ مسائل"
-      subject_template: "آپ کی سائٹ ڈَیش بورڈ پر نیا مشورہ"
-      text_body_template: |
-        ہمارے پاس آپ کی موجودہ سائٹ ترتیبات پر مبنی آپ کیلئے کچھ نئے مشورے اور سفارشات ہیں۔
-
-        اسے دیکھنے کیلئے [اپنے سائٹ ڈَیش بورڈ پر جائیں](%{base_url}/admin)۔
-
-        اگر آپ کے ڈَیش بورڈ پر کچھ بھی نظر نہیں آرہا، تو سٹاف کے کسی اور ممبر نے پہلے ہی اِس مشورے پر عمل کر لیا ہوسکتا ہے۔ سٹاف کے اعمال کی ایک فہرست آپ کے [سٹاف عوامل لاگز](%{base_url}/admin/logs/staff_action_logs) میں پایئی جاسکتی ہے۔
     new_user_of_the_month:
       title: "مہینہ کے سب سے زیادہ قابل قدر نئے صارف!"
       subject_template: "آپ مہینہ کے سب سے زیادہ قابل قدر نئے صارف ہیں!"
@@ -2711,9 +2656,6 @@ ur:
       one: "جان لیں کہ: ہم روزانہ کی %{count} ای میل بھیجتے ہیں۔ جو ممکنی روک دی گئی ہوں، اُن کو دیکھنے کیلئے سائٹ کو چیک کریں۔ اور ہاں، مقبول ہونے کیلئے شکریہ!"
       other: "جان لیں کہ: ہم روزانہ کی %{count} ای میل بھیجتے ہیں۔ جو ممکنی روک دی گئی ہوں، اُن کو دیکھنے کیلئے سائٹ کو چیک کریں۔ اور ہاں، مقبول ہونے کیلئے شکریہ!"
     in_reply_to: "کے جواب میں"
-    unsubscribe:
-      title: "غیر سَبسکرائب"
-      description: "اِن ای میلز کو موصول کرنے میں دلچسپی نہیں ہے؟ کوئی مسئلہ نہیں! فوری طور پر غیر سَبسکرائب کرنے کیلئے ذیل میں کلِک کریں:"
     reply_by_email: "[ٹاپک وِزِٹ کریں](%{base_url}%{url}) یا جواب دینے کیلئے اس ای میل کا جواب دیں۔"
     reply_by_email_pm: "[پیغام وِزِٹ کریں](%{base_url}%{url}) یا %{participants} کا جواب دینے کیلئے اِس ایمیل کا جواب دیں۔"
     only_reply_by_email: "جواب دینے کیلئے اس ای میل کا جواب دیں۔"
@@ -2935,7 +2877,6 @@ ur:
       liked_received: "لائیکس موصول ہوے"
       new_users: "نئے صارفین"
       popular_topics: "مقبول ٹاپک"
-      follow_topic: "اِس ٹاپک کی پیروی کریں"
       join_the_discussion: "مزید پڑھیں"
       popular_posts: "مقبول پوسٹس"
       more_new: "آپ کیلئے نیا"
@@ -3063,15 +3004,6 @@ ur:
   offline:
     title: "اَیپ کو لوڈ نہیں کیا جا سکا"
     offline_page_message: "لگتا ہے کہ آپ آف لائن ہیں! براہ مہربانی اپنا نیٹ وَرک کنکشن چیک کریں اور دوبارہ کوشش کیجیے۔"
-  login_required:
-    welcome_message: |
-      ## [%{title} پر خوش آمدید](#welcome)
-      ایک اکاؤنٹ کی ضرورت ہے۔ برائے مہربانی جاری رکھنے کیلئے ایک اکاؤنٹ بنائیں یا لاگ اِن کریں۔
-    welcome_message_invite_only: |
-      ## [%{title} پر خوش آمدید](#welcome)
-      ایک اکاؤنٹ کی ضرورت ہے۔ برائے مہربانی جاری رکھنے کیلئے موجودہ رکن سے ایک دعوت نامہ کیلئے درخواست کریں یا لاگ اِن کریں۔
-  deleted: "حذف کردہ"
-  image: "تصویر"
   upload:
     edit_reason: "تصاویر کی مقامی کاپیاں ڈاؤن لوڈ کریں"
     unauthorized: "معذرت، جو فائل آپ اَپ لوڈ کرنے کے کوشش کر رہے ہیں اُس کی اجازت نہیں ہے (اجازت یافتہ ایکسٹینشنز: %{authorized_extensions})۔"
@@ -3148,88 +3080,6 @@ ur:
     title: "سروس کی شرائط"
   privacy_topic:
     title: "پرائیوِیسی پالیسی"
-    body: |
-      <a name="collect"></a>
-
-      ## [ہم کیا معلومات جمع کرتے ہیں؟](#collect)
-
-      ہم آپ سے معلومات اکھٹی کرتے ہیں جب آپ ہماری ویب سائٹ پر رجسٹر کرتے ہیں اور ڈیٹا جمع کرتے ہیں جب آپ یہاں پر شئیر کردہ مواد کو پڑھ، لکھ، اور اس کا جائزہ لے کر اِس فورَم میں حصہ لیتے ہیں۔
-
-      ہماری سائٹ پر رجسٹر کرتے وقت، آپ سے اپنا نام اور ای میل پتہ درج کرنے کیلئے کہا جا سکتا ہے۔ تاہم، آپ رجسٹریشن کے بغیر ہماری سائٹ وِزِٹ کر سکتے ہیں۔ آپ کا ای میل ایڈریس کی تصدیق بذریعہ ایک منفرد لنک پر مشتمل ای میل سے ہوگی۔ اگر وہ لنک وِزِٹ کیا جاتا ہے، تو ہم جان جائیں گے کہ آپ اس ای میل ایڈریس کو کنٹرول کرتے ہیں۔
-
-      رجسٹر کرنے کے بعد کچھ شائع کرنے پر، ہم اشاعت کا تخلیق کنندہ IP ایڈریس ریکارڈ کر لیتے ہیں۔ ہم سرور لاگز کو بھی برقرار رکھ سکتے ہیں جس میں ہمارے سرور پر کیے جانے والی ہر درخواست کا IP ایڈریس شامل ہوتا ہے۔
-
-      <a name="use"></a>
-
-      ## [ہم آپ کی معلومات کس لیے استعمال کرتے ہیں؟](#use)
-
-      ہم آپ سے جمع کردہ کوئی بھی معلومات مندرجہ ذیل طریقوں میں سے ایک میں استعمال کر سکتے ہیں:
-
-      * آپ کے اِس سائٹ پر تجربے کو ذاتی بنانے کیلئے &mdash; آپ کی معلومات ہمیں آپ کی ذاتی ضروریات کو بہتر سمجھنے میں مدد دیتی ہے۔
-      * اِس سائٹ کو بہتر بنانے کیلئے &mdash; ہم مسلسل آپ کی طرف سے موصول ہونے والی معلومات اور آراء کی بنیاد پر سائٹ خصوصیات کو بہتر بنانے کی کوشش کرتے رہتے ہیں۔
-      * کسٹمر سروس کو بہتر بنانے کیلئے &mdash; آپ کی معلومات ہمیں کسٹمر سروس کی درخواستوں اور معاونت کی ضروریات کا زیادہ موثر طریقے سے جواب دینے میں ہماری مدد کرتی ہے۔
-      * ہر مخصوص مدت کے بعد ای میلز بھیجنے کیلئے &mdash; آپ کی طرف سے فراہم کردہ ای میل ایڈریس استعمال کیا جا سکتا ہے، آپ کو بھیجنے کیلئے: معلومات، اطلاعات جن کی آپ ٹاپکس میں تبدیلیاں ہونے پر، یا اپنے صارف نام کے جواب میں درخواست کرتے ہیں، انکوائریوں کے جواب کیلئے، اور/یا دیگر درخواستوں یا سوالات کا جواب دینے کیلئے۔
-
-      <a name="protect"></a>
-
-      ## [ہم آپ کی معلومات کی حفاظت کیسے کرتے ہیں؟](#protect)
-
-      جب آپ اپنی ذاتی معلومات درج، جمع، یا ایکسَیس کرتے ہیں تو ہم آپ کی ذاتی معلومات کو محفوظ رکھنے کیلئے مختلف قِسم کے سیکورٹی اقدامات کو لاگو کرتے ہیں۔
-
-      <a name="data-retention"></a>
-
-      ## [آپ کی ڈَیٹا برقرار رکھنے کی پالیسی کیا ہے؟](#data-retention)
-
-      ہم نیک نیتی کے ساتھ ممکنہ کوشش کریں گے کہ:
-
-      * اِس سرور پر کیے جانے والی تمام درخواستوں کے IP ایڈریسوں پر مشتمل سرور لاگز کو 90 دنوں سے زائد برقرار نہیں رکھیں گے۔
-      * رجسٹر جردہ صارفین اور اُن کی اشاعتوں کے ساتھ منسلک IP ایڈریسوں کو 5 سال سے زائد برقرار نہیں رکھیں گے۔
-
-      <a name="cookies"></a>
-
-      ## [کیا ہم کوکیز کا استعمال کرتے ہیں؟](#cookies)
-
-      جی ہاں۔ کُوکِیز ایسی چھوٹی فائلیں ہوتی ہیں جو ایک سائٹ یا اُس کی سروس فراہم کرنے والے، بذریعہ ویب براؤزر آپ کے کمپیوٹر کی ہارڈ ڈرائیو میں منتقل کر دیتے ہیں (اگر آپ کی اجازت ہو)۔ یہ کُوکِیز سائٹ کو آپ کے براؤزر کو پہچاننے کے قابل بناتے ہیں اور، اگر آپ کے پاس ایک رجسٹر کردہ اکاؤنٹ ہو، تو براؤزر کو آپ کے رجسٹرڈ اکاؤنٹ سے منسلک کر دیتے ہیں۔
-
-      ہم مستقبل کے وِزِٹس کیلئے آپ کی ترجیحات کو سمجھنے اور محفوظ کرنے کیلئے کُوکِیز کا استعمال کرتے ہیں اور سائٹ پر ٹریفک اور سائٹ اِنٹرَیکشن کے بارے میں مجموعی ڈَیٹا مرتب کرتے ہیں تاکہ ہم مستقبل میں بہتر سائٹ پر تجربات اور ٹولز پیش کرسکیں۔ ہم تیسرے فریق سروس فراہم کرنے والوں کے ساتھ معاہدے کرسکتے ہیں تاکہ ہماری ویب سائٹس پر آنے والوں کو بہتر سمجھا جا سکے۔ یہ سروس فراہم کرنے والوں کو اجازت نہیں ہے کہ ہماری جانب سے جمع کردہ معلومات کو ہمارے کام کو چلنے اور بہتر بنانے میں ہماری مدد کرنے کے علاوہ کسی اور مقصد کیلئے استعمال کریں۔
-
-      <a name="disclose"></a>
-
-      ## [کیا ہم بیرونی تنظیموں کو کوئی بھی معلومات ظاہر کرتے ہیں؟](#disclose)
-
-      ہم آپ کی ذاتی طور پر قابلِ شناخت معلومات کی فروخت، تجارت یا بیرونی تنظیموں کو منتقل نہیں کرتے ہیں۔ ِاس میں بھروسہ والی تیسری پارٹیاں شامل نہیں ہیں جو ہماری سائٹ کو چلانے میں مدد کرتی ہیں، ہمارے کام کو چلانے یا آپ کی خدمت کرنے میں مدد کرتی ہیں، جب تک کہ یہ تنظیمیں آپ کی معلومات کو رازداری سے رکھنے پر متفق رہیں۔ ہم آپ کی معلومات اِس صورت میں بھی جاری کرسکتے ہیں جب ہم یقین رکھتے ہوں کہ ایسا کرنا قانون پر عمل کرنے کیلئے مناسب ہے، ہماری ویب سائٹ کی پالیسیوں کو نافذ کرنے کیلئے، یا ہمارے یا دوسروں کے حقوق، ملکیت، یا حفاظت کو محفوظ رکھنے کیلئے بھی۔ تاہم، مارکیٹنگ، اشتہارات، یا دیگر استعمال کیلئے غیر ذاتی طور پر قابلِ شناخت وِزِیٹر معلومات دیگر تنظیموں کو فراہم کی جا سکتی ہے۔
-
-      <a name="third-party"></a>
-
-      ## [تیسری پارٹی والے لِنکس](#third-party)
-
-      کبھی کبھار، ہماری صوابدید پر، ہم اپنی ویب سائٹ پر تیسری پارٹی کی مصنوعات یا خدمات شامل یا پیش کرسکتے ہیں۔ اِن تیسری پارٹی سائٹس کی الگ اور آزادانہ پرائیوِیسی پالیسیاں ہیں۔ لہٰذا ہم اِن منسلک سائٹس کے مواد اور سرگرمیوں کیلئے کسی قِسم کی بھی کوئی ذمہ داری نہیں رکھتے۔ اس کے باوجود، ہم اپنی سائٹ کی سالمیت کی حفاظت کرنے کی کوشش کرتے ہیں اور اِن سائٹس کے بارے میں کسی بھی رائے کا خیر مقدم کرتے ہیں۔
-
-      <a name="coppa"></a>
-
-      ## [بچوں کی آن لائن پرائیوِیسی کے تحفظ کے ایکٹ کے تعمیل](#coppa)
-
-      ہماری سائٹ، مصنوعات اور خدمات سبھی اُن لوگوں کیلئے پیش کی جاتی ہیں جو کم از کم 13 سال یا اُس سے زائد عمر کے ہیں۔ اگر یہ سرور امریکہ میں ہے، اور آپ 13 سال سے کم عمر ہیں، تو COPPA ([بچوں کی آن لائن پرائیوِیسی کے تحفظ کا ایکٹ](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)) کی ضروریات کے مطابق، آپ یہ سائٹ استعمال نہ کیجیے۔
-
-      <a name="online"></a>
-
-      ## [آن لائن پرائیویسی پالیسی صرف](#online)
-
-      یہ آن لائن پرائیویسی پالیسی صرف ہماری ویب سائٹ کے ذریعہ جمع کردہ معلومات پر لاگو ہوتی ہے اور اُس معلومات پر نہیں جو آف لائن جمع کی جائے۔
-
-      <a name="consent"></a>
-
-      ## [آپ کی رضامندی](#consent)
-
-      ہماری ویب سائٹ کا استعمال کرتے ہوئے، آپ ہماری سائٹ کی پرائیویسی پالیسی پر رضامندی کا اظہار کرتے ہیں۔
-
-      <a name="changes"></a>
-
-      ## [ہماری پرائیویسی پالیسی میں تبدیلیاں](#changes)
-
-      اگر ہم اپنی پرائیویسی پالیسی کو تبدیل کرنے کا فیصلہ کریں، تو ہم اِس صفحہ پر اُن تبدیلیوں کو شائع کریں گے۔
-
-      یہ دستاویز CC-BY-SA ہے۔ یہ آخری دفعہ مئی 31، 2013 کو اَپ ڈیٹ کی گئی تھی۔
   badges:
     editor:
       name: ترمیم کنندہ
@@ -3502,8 +3352,6 @@ ur:
       message: "<p>ہم نے <b>%{email}</b> پر ایکٹیویشن اِیمیل دوبارہ بھیج دی ہے"
   safe_mode:
     title: "سَیف مَوڈ میں داخل ہوں"
-    no_unofficial_plugins: "غیر آفیشل پلگ اِن غیر فعال کریں"
-    no_plugins: "تمام پلگ اِن غیر فعال کریں"
     enter: "سَیف مَوڈ میں داخل ہوں"
     must_select: "سَیف مَوڈ میں داخل ہونے کیلئے آپ کا کم از کم ایک آپشن منتخب کرنا ضروری ہے۔"
   wizard:
@@ -3558,7 +3406,6 @@ ur:
         title: "آپ کا ڈِسکورس تیار ہے!"
   search_logs:
     graph_title: "سرچ شمار"
-  joined: "شمولیت اختیار کی"
   discourse_push_notifications:
     popup:
       mentioned: '%{username} نے آپ کا تذکرہ "%{topic}" میں کیا - %{site_title}'
@@ -3596,50 +3443,29 @@ ur:
     conflict: "ایک اَپ ڈیٹ کا تنازع آپ کو ایسا کرنے سے روک رہا تھا۔"
     actions:
       agree:
-        title: "اتفاق کریں..."
-      agree_and_keep:
-        title: "پوسٹ برقرار رکھیں"
-        description: "فلَیگ کے ساتھ اتفاق کریں اور پوسٹ کو ویسا ہی رہنے دیں۔"
-      agree_and_keep_hidden:
-        title: "پوسٹ پوشیدہ رکھیں"
-        description: "فلَیگ کے ساتھ اتفاق کریں اور پوسٹ پوشیدہ رکھیں۔"
+        title: "جی ہاں"
       agree_and_suspend:
-        title: "صارف معطل کریں"
         description: "فلَیگ کے ساتھ اتفاق کریں اور صارف معطل کریں۔"
       agree_and_silence:
-        title: "صارف خاموش کریں"
         description: "فلَیگ کے ساتھ اتفاق کریں اور صارف خاموش کریں۔"
       agree_and_restore:
-        title: "پوسٹ بحال کریں"
         description: "پوسٹ کو بحال کریں تاکہ تمام صارفین اِسے دیکھ سکیں۔"
-      agree_and_hide:
-        title: "پوسٹ چھپائیں"
-        description: "اِس پوسٹ کو چھپائیں اور خود کار طریقے سے صارف کو اِس میں ترمیم کرنے کیلئے زور ڈالنے کیلئے پیغام بھیجیں۔"
       delete_single:
         title: "حذف کریں"
       delete:
         title: "حذف کریں..."
-      delete_and_ignore:
-        title: "پوسٹ حذف اور نظر انداز کریں"
-        description: "پوسٹ حذف کریں؛ اگر پہلی پوسٹ ہو، تو ٹاپک بھی ساتھ حذف کریں"
       delete_and_ignore_replies:
-        title: "پوسٹ + جوابات حذف اور نظر انداز کریں"
-        description: "پوسٹ اور اِس کے تمام جوابات کو حذف کریں؛ اگر پہلی پوسٹ ہو، تو ٹاپک بھی ساتھ حذف کریں"
         confirm: "کیا آپ واقعی اِس پوسٹ پر جوابات بھی حذف کرنا چاہتے ہیں؟"
-      delete_and_agree:
-        title: "پوسٹ حذف اور اتفاق کریں"
-        description: "پوسٹ حذف کریں؛ اگر پہلی پوسٹ ہو، تو ٹاپک بھی ساتھ حذف کریں"
       delete_and_agree_replies:
-        title: "پوسٹ + جوابات حذف اور اتفاق کریں"
-        description: "پوسٹ اور اِس کے تمام جوابات کو حذف کریں؛ اگر پہلی پوسٹ ہو، تو ٹاپک بھی ساتھ حذف کریں"
         confirm: "کیا آپ واقعی اِس پوسٹ پر جوابات بھی حذف کرنا چاہتے ہیں؟"
       disagree_and_restore:
-        title: "اختلاف کریں اور پوسٹ بحال کریں"
         description: "پوسٹ کو بحال کریں تاکہ تمام صارفین اِسے دیکھ سکیں۔"
       disagree:
-        title: "اختلاف کریں"
+        title: "نہیں"
       ignore:
         title: "نظر انداز کریں"
+      ignore_and_do_nothing:
+        title: "کچھ نہ کریں"
       approve:
         title: "منظور"
       approve_post:
diff --git a/config/locales/server.vi.yml b/config/locales/server.vi.yml
index 71447072144..854dbefc621 100644
--- a/config/locales/server.vi.yml
+++ b/config/locales/server.vi.yml
@@ -175,8 +175,6 @@ vi:
       load_from_remote: "Đã xảy ra lỗi khi tải bài viết."
     site_settings:
       invalid_category_id: "Bạn đã chỉ định một danh mục không tồn tại"
-      invalid_choice:
-        other: "Bạn đã chỉ định các lựa chọn không hợp lệ %{name}"
       default_categories_already_selected: "Bạn không thể chọn một danh mục được sử dụng trong danh sách khác."
       default_tags_already_selected: "Bạn không thể chọn một thẻ được sử dụng trong danh sách khác."
       s3_upload_bucket_is_required: "Bạn không thể tải lên S3 mà chưa thiết lập 's3_upload_bucket'."
@@ -485,10 +483,6 @@ vi:
           attributes:
             execute_at:
               in_the_past: "phải ở trong tương lai."
-        translation_overrides:
-          attributes:
-            value:
-              invalid_interpolation_keys: '(Các) khóa nội suy sau không hợp lệ: "%{keys}"'
       <<: *errors
   uncategorized_category_name: "Chưa phân loại"
   general_category_name: "Chung"
@@ -496,22 +490,6 @@ vi:
   meta_category_description: "Thảo luận về site này, tổ chức của nó, làm sao nó hoạt động, và làm sao chúng tôi có thể cải tiến nó tốt hơn."
   staff_category_name: "Nhân viên"
   staff_category_description: "Chuyên mục riêng dành cho nhân viên. Các chủ đề chỉ hiển thị với quản trị viên và điều hành viên."
-  discourse_welcome_topic:
-    body: |2
-
-      Đoạn đầu tiên của chủ đề được ghim này sẽ hiển thị như một thông điệp chào mừng cho tất cả những khách truy cập mới trên trang chủ của bạn. Nó quan trọng!
-
-      ** Chỉnh sửa ** này thành mô tả ngắn gọn về cộng đồng của bạn:
-
-      - Nó dành cho ai?
-      - Họ có thể tìm thấy gì ở đây?
-      - Tại sao họ phải đến đây?
-      - Họ có thể đọc thêm ở đâu (liên kết, tài nguyên, v.v.)?
-
-      <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
-
-      Bạn có thể muốn đóng chủ đề này thông qua quản trị viên :wrench: (ở phía trên bên phải và phía dưới), để các câu trả lời không bị dồn vào một thông báo.
-  admin_quick_start_title: "ĐỌC TÔI ĐẦU TIÊN: Hướng dẫn Bắt đầu Nhanh dành cho Quản trị viên"
   category:
     topic_prefix: "Giới thiệu chuyên mục %{category}"
     replace_paragraph: "(Thay thế đoạn đầu tiên này bằng một mô tả ngắn gọn về danh mục mới của bạn. Hướng dẫn này sẽ xuất hiện trong vùng chọn danh mục, vì vậy hãy cố gắng giữ cho nó dưới 200 ký tự.)"
@@ -1219,7 +1197,6 @@ vi:
     title_min_entropy: "Entropy tối thiểu (ký tự độc đáo, số từ phi tiếng Anh) cần thiết cho tên chủ đề."
     body_min_entropy: "Entropy tối thiểu (ký tự độc đáo, số từ phi tiếng Anh) cần thiết cho nội dung bài viết."
     allow_uppercase_posts: "Cho phép viết hoa tất cả các chữ trong tên chủ đề hoặc nội dung bài viết."
-    max_consecutive_replies: "Số lượng bài đăng mà người dùng phải thực hiện liên tiếp trong một chủ đề trước khi bị ngăn không cho thêm câu trả lời khác."
     enable_filtered_replies_view: 'Nút "(n) trả lời" thu gọn tất cả các bài đăng khác và chỉ hiển thị bài đăng hiện tại và các câu trả lời của nó.'
     title_fancy_entities: "Chuyển đổi các ký tự ASCII phổ biến thành các thực thể HTML ưa thích trong tiêu đề chủ đề, xem SmartyPants <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</a>"
     min_title_similar_length: "Chiều dài tối thiểu của tiêu đề trước khi kiểm tra trùng chủ đề."
@@ -1331,10 +1308,7 @@ vi:
     embed_truncate: "Cắt ngắn các bài viết được nhúng."
     embed_post_limit: "Số lượng tối đa bài viết được nhúng."
     embed_username_required: "Tên tài khoản để tạo chủ đề là bắt buộc."
-    notify_about_flags_after: "Nếu có cờ chưa được xử lý sau nhiều giờ này, hãy gửi tin nhắn cá nhân cho người điều hành. Đặt thành 0 để tắt."
-    show_create_topics_notice: "Nếu trang có ít hơn 5 chủ đề công khai, hiển thị một thông báo yêu cầu quản trị tạo thêm các chủ đề mới"
     delete_drafts_older_than_n_days: "Xóa các bản nháp cũ hơn (n) ngày."
-    bootstrap_mode_min_users: "Số thành viên tối thiểu được yêu cầu để tắt chế độ bootstrap (đặt thành 0 để tắt)"
     slug_generation_method: "Chọn phương thức tạo slug. 'encoded' sẽ tạo ra phần trăm chuỗi mã hóa. 'none' sẽ tắt slug."
     enable_emoji: "Kích hoạt emoji"
     emoji_set: "Bạn thích dùng gói emoji nào?"
@@ -1370,13 +1344,11 @@ vi:
     enable_sitemap: "Tạo sơ đồ trang web cho trang web của bạn và đưa nó vào tệp robots.txt."
     sitemap_page_size: "Số lượng URL để bao gồm trong mỗi trang sơ đồ trang web. Tối đa 50.000"
     enable_user_status: "(thử nghiệm) Cho phép người dùng đặt thông báo trạng thái tùy chỉnh (biểu tượng cảm xúc + mô tả)."
-    enable_user_tips: "(thử nghiệm) Bật mẹo người dùng mới mô tả các tính năng chính cho người dùng"
     short_title: "Tiêu đề ngắn sẽ được sử dụng trên màn hình chính, trình khởi chạy của người dùng hoặc những nơi khác mà không gian có thể bị hạn chế. Nó nên được giới hạn trong 12 ký tự."
     dashboard_hidden_reports: "Cho phép ẩn các báo cáo đã chỉ định khỏi bảng điều khiển."
     dashboard_visible_tabs: "Chọn tab bảng điều khiển nào được hiển thị."
     dashboard_general_tab_activity_metrics: "Chọn các báo cáo sẽ được hiển thị dưới dạng chỉ số hoạt động trên tab chung."
     suggest_weekends_in_date_pickers: "Bao gồm các ngày cuối tuần (Thứ Bảy và Chủ Nhật) trong đề xuất chọn ngày (tắt tính năng này nếu bạn chỉ sử dụng Discourse vào các ngày trong tuần, thứ Hai đến thứ Sáu)."
-    enable_new_user_profile_nav_groups: "THỬ NGHIỆM: Người dùng của các nhóm đã chọn sẽ được hiển thị menu điều hướng hồ sơ người dùng mới"
     errors:
       invalid_email: "Địa chỉ email sai"
       invalid_username: "Không có thành viên với tên đăng nhập này"
@@ -1396,7 +1368,6 @@ vi:
       pop3_polling_password_is_empty: "Bạn phải thiết lập 'pop3 polling password' trước khi kích hoạt POP3 polling."
       pop3_polling_authentication_failed: "Chứng thực POP3 thất bại, xin hãy kiểm tra lại thông tin."
       reply_by_email_address_is_empty: "Bạn phải thiết lập 'reply by email address' trước khi kích hoạt trả lời bằng email."
-      email_polling_disabled: "Bạn phải kích hoạt bằng tay hoặc POP3 polling trước khi kích hoạt trả lời bằng email."
       user_locale_not_enabled: "Bạn phải bật 'allow user locale' trước khi kích hoạt thiết lập này."
       personal_message_enabled_groups_invalid: "Bạn phải chỉ định ít nhất một nhóm cho cài đặt này. Nếu bạn không muốn bất kỳ ai ngoại trừ nhân viên gửi PM, hãy chọn nhóm nhân viên."
       min_username_length_range: "Bạn không thiết lập giá trị nhỏ nhất lớn hơn giá trị lớn nhất"
@@ -1514,7 +1485,6 @@ vi:
       other: "Tự động vô hiệu hóa sau %{count} ngày không hoạt động"
     activated_by_staff: "Kích hoạt bởi nhân viên"
     new_user_typed_too_fast: "Người dùng mới nhập quá nhanh"
-    content_matches_auto_block_regex: "Nội dung khớp với regex khối tự động"
     username:
       short: "phải dài ít nhất %{min} ký tự"
       long: "không được dài hơn %{max} ký tự"
@@ -1769,14 +1739,6 @@ vi:
     download_remote_images_disabled:
       subject_template: "Download ảnh từ xa đã bị vô hiệu"
       text_body_template: "Thiết lập `download_remote_images_to_local` đã bị vô hiệu do khoảng trống ổ cứng `download_remote_images_threshold` đã đạt mức giới hạn."
-    dashboard_problems:
-      subject_template: "Lời khuyên mới trên bảng điều khiển trang web của bạn"
-      text_body_template: |
-        Chúng tôi có một số lời khuyên & đề xuất mới cho bạn dựa trên cài đặt trang web hiện tại của bạn.
-
-        [Truy cập bảng điều khiển trang web của bạn](%{base_url}/admin) để xem nó.
-
-        Nếu không có gì hiển thị trên bảng điều khiển của bạn, một nhân viên khác có thể đã thực hiện theo lời khuyên này. Bạn có thể tìm thấy danh sách các hành động của nhân viên trong [Nhật ký hành động của nhân viên](%{base_url}/admin/logs/staff_action_logs) của bạn.
     new_user_of_the_month:
       title: "Bạn là thành viên mới của tháng!"
       subject_template: "Bạn là một thành viên mới của tháng!"
@@ -1802,9 +1764,6 @@ vi:
     reached_limit:
       other: "Lưu ý: Chúng tôi gửi tối đa %{count} email hàng ngày. Kiểm tra trang web để xem những trang có thể bị giữ lại. PS cảm ơn!"
     in_reply_to: "Trong Trả Lời Tới"
-    unsubscribe:
-      title: "Bỏ theo dõi"
-      description: "Bạn không thích nhận mail giống mail này? Nhấn vào bỏ theo dõi để bỏ đăng ký ngay lập tức:"
     reply_by_email: "[Truy cập Chủ đề] (%{base_url}%{url}) hoặc trả lời email này để phản hồi."
     reply_by_email_pm: "[Ghé thăm Tin nhắn] (%{base_url}%{url}) hoặc trả lời email này để trả lời %{participants}."
     only_reply_by_email: "Trả lời email này để phản hồi."
@@ -1954,12 +1913,6 @@ vi:
     see_more: "Thêm"
     search_title: "Tìm trang này"
     search_button: "Tìm kiếm"
-  login_required:
-    welcome_message: |
-      ## [Chào mừng tới %{title}] (#welcome)
-      Một tài khoản là bắt buộc. Vui lòng tạo một tài khoản hoặc đăng nhập để tiếp tục.
-  deleted: "đã bị xóa "
-  image: "hình ảnh"
   upload:
     edit_reason: "tải về một bản sao của hình ảnh."
     unauthorized: "Xin lỗi, tập tin của bạn tải lên không được cho phép (định dạng cho phép: %{authorized_extensions})."
@@ -2214,7 +2167,6 @@ vi:
         fields:
           contact_url:
             placeholder: "https://www.example.com/contact-us"
-  joined: "Đã tham gia"
   discourse_push_notifications:
     popup:
       mentioned: '%{username} nhắc đến bạn trong "%{topic}" - %{site_title}'
@@ -2247,16 +2199,8 @@ vi:
       post_count: "Một vài bài viết đầu tiên của mọi người dùng phải được nhân viên phê duyệt. Xem %{link}."
       fast_typer: "Người dùng mới nhập bài đăng đầu tiên của họ nhanh một cách đáng ngờ, bị nghi ngờ là bot hoặc hành vi gửi thư rác. Xem %{link}."
     actions:
-      agree_and_keep:
-        title: "Giữ bài viết"
-        description: "Đồng ý với cờ và giữ nguyên bài viết."
-      agree_and_keep_hidden:
-        title: "Giữ bài đăng ẩn"
-        description: "Đồng ý với cờ và để bài viết ẩn."
-      agree_and_suspend:
-        title: "Tạm khóa Thành viên"
-      agree_and_silence:
-        title: "Người dùng im lặng"
+      agree:
+        title: "Đồng ý"
       delete_single:
         title: "Xóa"
       delete_and_ignore_replies:
@@ -2264,9 +2208,11 @@ vi:
       delete_and_agree_replies:
         confirm: "Bạn có chắc chắn muốn xóa các câu trả lời cho bài đăng không?"
       disagree:
-        title: "Không đồng ý"
+        title: "Không"
       ignore:
         title: "Bỏ qua"
+      ignore_and_do_nothing:
+        title: "Không làm gì cả"
       approve:
         title: "Duyệt"
       approve_post:
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index 21d51c5fe44..b65f2e56385 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -52,6 +52,11 @@ zh_CN:
   remove_posts_deleted_by_author: "被作者删除"
   redirect_warning: "我们无法验证您选择的链接是否确实发布到了论坛。如果您仍想继续，请选择下面的链接。"
   on_another_topic: "在另一个话题中"
+  topic_category_changed: "从 %{from} 到 %{to}"
+  topic_tag_changed:
+    added_and_removed: "添加 %{added} 并删除 %{removed}"
+    added: "已添加 %{added}"
+    removed: "删除了 %{removed}"
   inline_oneboxer:
     topic_page_title_post_number: "#%{post_number}"
     topic_page_title_post_number_by_user: "#%{post_number}，来自 %{username}"
@@ -185,7 +190,7 @@ zh_CN:
       invalid_site_setting: "不存在名为'%{name}' 的设置"
       invalid_category_id: "您指定了一个不存在的类别"
       invalid_choice:
-        other: "您指定了无效的选择 %{name}"
+        other: "“%{name}” 是无效的选择。"
       default_categories_already_selected: "您不能选择其他列表中使用的类别。"
       default_tags_already_selected: "您不能选择在另一个列表中使用的标签。"
       s3_upload_bucket_is_required: "除非提供 's3_upload_bucket'，否则您无法启用上传到 S3。"
@@ -193,7 +198,8 @@ zh_CN:
       page_publishing_requirements: "如果启用了安全媒体，则无法启用页面发布。"
       s3_backup_requires_s3_settings: "除非提供 '%{setting_name}'，否则无法将 S3 用作备份位置。"
       s3_bucket_reused: "您无法将同一个存储桶同时用作 's3_upload_bucket' 和 's3_backup_bucket'。请选择一个不同的存储桶或为每个存储桶使用不同的路径。"
-      secure_uploads_requirements: "必须先启用 S3 上传，然后才能启用安全上传。"
+      secure_uploads_requirements: "在启用安全上传之前，必须先启用S3上传和S3 ACL。"
+      s3_use_acls_requirements: "启用安全上传时，你必须启用S3 ACL。"
       share_quote_facebook_requirements: "您必须设置 Facebook 应用 ID 才能为 Facebook 启用引用共享。"
       second_factor_cannot_enforce_with_socials: "您无法在启用社交登录的情况下强制执行双重身份验证。您必须首先通过以下方式禁用登录：%{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "如果禁用本地登录，则无法强制执行双重身份验证。"
@@ -213,6 +219,10 @@ zh_CN:
         other: "抱歉，我们无法为此网页生成预览，因为找不到以下 oEmbed / OpenGraph 标签：%{missing_attributes}"
   word_connector:
     comma: "，"
+  custom_fields:
+    validations:
+      max_items: "该实体的自定义字段已达到最大数量 (%{max_items_number})"
+      max_value_length: "已达到自定义字段值的最大长度 (%{max_value_length})"
   invite:
     expired: "您的邀请令牌已过期。请<a href='%{base_url}/about'>联系管理人员</a>。"
     not_found: "您的邀请令牌无效。请<a href='%{base_url}/about'>联系管理人员</a>。"
@@ -231,6 +241,7 @@ zh_CN:
     user_exists: "不需要邀请 <b>%{email}</b>，他们已经拥有帐户！"
     invite_exists: "您已经邀请 <b>%{email}</b>。"
     invalid_email: "%{email} 不是有效的电子邮件地址。"
+    generic_error_response: "你的请求有问题。"
     rate_limit:
       other: "您在过去 24 小时内发出了 %{count} 个邀请，请等待 %{time_left}，然后重试。"
     confirm_email: "<p>快完成了！我们向您的电子邮件地址发送了一封激活邮件。请按照邮件中的说明操作来激活您的帐户。</p><p>如果您没有收到邮件，请检查您的垃圾邮件文件夹。</p>"
@@ -379,6 +390,7 @@ zh_CN:
   too_late_to_edit: "该话题在很早之前创建。无法再编辑或者删除。"
   edit_conflict: "该帖子已由其他用户编辑，您的变更无法再保存。"
   revert_version_same: "当前版本与您尝试还原到的版本相同。"
+  reverted_to_version: "恢复到版本 #%{version}"
   cannot_edit_on_slow_mode: "此话题处于慢速模式。为了鼓励深思熟虑的讨论，目前不允许编辑此话题中的旧帖子。"
   excerpt_image: "图片"
   bookmarks:
@@ -477,6 +489,7 @@ zh_CN:
       这样，每个人都可以更轻松地阅读具有少量嵌套回复的话题，而不是查看大量的个别回复。
     dominating_topic: 您在此话题中发布了很多内容！考虑一下让其他人有机会在这里进行回复并互相讨论。
     get_a_room: 您已回复 @%{reply_username} %{count} 次，您知道您可以向他们发送个人消息吗？
+    dont_feed_the_trolls: 此帖子已被标记为版主关注。你确定要回复它吗？对负面内容的回复往往会鼓励更多的负面行为。
     too_many_replies: |
       ### 您已达到此话题的回复上限
 
@@ -566,7 +579,8 @@ zh_CN:
         translation_overrides:
           attributes:
             value:
-              invalid_interpolation_keys: '以下插值键无效："%{keys}"'
+              invalid_interpolation_keys:
+                other: "以下插值键无效： %{keys}"
         watched_word:
           attributes:
             word:
@@ -587,22 +601,9 @@ zh_CN:
   staff_category_name: "管理人员"
   staff_category_description: "适用于管理人员讨论的不公开类别。话题仅对管理员和版主可见。"
   discourse_welcome_topic:
-    title: "欢迎来到我们的社区！"
-    body: |2
-
-      此置顶话题的第一段是所有新访客在首页看到的欢迎消息。这很重要！
-
-      **编辑**它，作为您的社区的简要介绍：
-
-      - 您的社区面向哪些人？
-      - 他们能在这里找到什么？
-      - 为什么他们要来这？
-      - 他们能在哪里阅读更多内容（链接、资源等）？
-
-      <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
-
-      您可能需要通过管理员设置 :wrench: （右上角和底部）关闭此话题，这样回复就不会积压在此公告下。
-  admin_quick_start_title: "首先阅读：管理员快速入门指南"
+    title: "欢迎来到 %{site_title}! :wave:"
+    body: "我们很高兴你加入。 \n\n%{site_info_quote}\n\n以下是你可以做的一些事情，以便开始：\n\n:speaking_head: **介绍你自己** 在[你的档案](%{base_path}/my/account)上添加你的照片和关于你自己和你的兴趣的信息。你希望被别人了解的一件事是什么？\n\n:open_book: **通过[浏览这些已经发生的讨论](%{base_path}/top)来了解这个社区**。当你发现一个帖子很有趣，信息量很大，或者很有娱乐性，请使用 :heart: ，以表达的欣赏或支持!\n\n:handshake: **通过评论、分享你自己的观点、提出问题或在讨论中提供反馈来贡献**。在回复或开始新话题之前，请查看[社区指南](%{base_path}/faq)。\n\n> 如果你需要帮助或有建议，请随时在[#反馈](%{base_path}/c/site-feedback)或[联系管理员](%{base_path}/about)中询问。\n"
+  admin_quick_start_title: "管理员指南：入门"
   category:
     topic_prefix: "关于“%{category}”类别"
     replace_paragraph: "（将第一段替换为新类别的简要说明。此指导将显示在类别选择区域中，因此请尽量将其保持在 200 个字符以内。）"
@@ -621,6 +622,7 @@ zh_CN:
       disallowed_tags_generic: "此话题包含禁止的标签。"
       slug_contains_non_ascii_chars: "包含非 ASCII 字符"
       is_already_in_use: "已在使用中"
+      move_topic_to_category_disallowed: "你不能把这个话题移动到一个你没有权限创建新主题的类别。"
     cannot_delete:
       uncategorized: "此类别比较特殊。它旨在作为没有类别的话题的存放区域；不能删除。"
       has_subcategories: "无法删除此类别，因为它有子类别。"
@@ -1058,7 +1060,7 @@ zh_CN:
       title: "DAU/MAU"
       xaxis: "天"
       yaxis: "DAU/MAU"
-      description: "在过去一天内登录的成员数除以过去一个月内登录的成员数 - 返回表示社区“粘性”的 %。目标是 >30％。"
+      description: "在过去一天内登录的成员数除以过去一个月内登录的成员数 - 返回表示社区“粘性”的 %。目标是 >20％。"
     daily_engaged_users:
       title: "每日参与用户"
       xaxis: "天"
@@ -1327,6 +1329,7 @@ zh_CN:
     image_magick_warning: '服务器被配置为创建大图片缩略图，但是未安装 ImageMagick。使用您喜爱的软件包管理器安装 ImageMagick 或<a href="https://www.imagemagick.org/script/download.php" target="_blank">下载最新版</a>。'
     failing_emails_warning: '%{num_failed_jobs} 个电子邮件作业失败。请检查您的 app.yml 并确保邮件服务器设置正确。<a href="%{base_path}/sidekiq/retries" target="_blank">在 Sidekiq 中查看失败的作业</a>。'
     subfolder_ends_in_slash: "您的子目录设置不正确；DISCOURSE_RELATIVE_URL_ROOT 以斜杠结尾。"
+    outdated_translations_warning: "您的某些自定义文本已过时。请检查您的 <a href='%{base_path}/admin/customize/site_texts?outdated=true'>自定义文本</a>。"
     email_polling_errored_recently:
       other: "电子邮件轮询在过去的 24 小时内产生了 %{count} 个错误。查看<a href='%{base_path}/logs' target='_blank'>日志</a>，了解更多详细信息。"
     missing_mailgun_api_key: "服务器被配置为通过 Mailgun 发送电子邮件，但是您尚未提供用于验证网络钩子消息的 API 密钥。"
@@ -1337,6 +1340,8 @@ zh_CN:
     out_of_date_themes: "以下主题有更新："
     unreachable_themes: "我们无法检查以下主题的更新："
     watched_word_regexp_error: "'%{action}' 关注词的正则表达式无效。请检查您的<a href='%{base_path}/admin/customize/watched_words'>关注词设置</a>，或禁用“关注词正则表达式”站点设置。"
+    v3_analytics_deprecated: "你的Discourse目前使用的是Google Analytics 3，2023年7月后将不再支持。 <a href='https://meta.discourse.org/t/260498'>现在就升级到Google Analytics 4</a> ，以继续接收有价值的见解和分析，了解你的网站性能。"
+    legacy_navigation_menu_deprecated: "你的 Discourse 目前使用的是 \"传统 \"导航菜单， <a href='https://meta.discourse.org/t/removing-the-legacy-hamburger-navigation-menu-option/265274'>该菜单将在 Discourse 3.2</a>的第一个测试版中移除。更新你的 <a href='%{base_path}/admin/site_settings/category/all_results?filter=navigation_menu'>导航菜单网站设置</a> 为 \"边栏 \"或 \"标题下拉菜单\"，以迁移到新的导航菜单。"
   site_settings:
     allow_bulk_invite: "允许通过上传 CSV 文件批量邀请"
     disabled: "已禁用"
@@ -1402,8 +1407,11 @@ zh_CN:
     fixed_category_positions_on_create: "如果选中，将在话题创建对话框中维护类别排序（需要 fixed_category_positions）。"
     add_rel_nofollow_to_user_content: '将 rel nofollow 属性添加到提交的所有用户内容，除了内部链接（包括父网域）。如果您更改此设置，则必须使用“rake posts:rebake”重新发布所有帖子。'
     exclude_rel_nofollow_domains: "不应将 nofollow 添加到链接的网域列表。example.com 也会自动允许 sub.example.com。至少，您应该添加此站点的网域以帮助网络抓取工具查找所有内容。如果您的网站的其他部分位于其他网域，也可以添加这些部分。"
+    max_form_template_title_length: "表单模板标题允许的最大长度。"
+    max_form_template_content_length: "表单模板内容允许的最大长度。"
     post_excerpt_maxlength: "帖子摘录/摘要的最大长度。"
     topic_excerpt_maxlength: "从话题中的第一个帖子生成的话题摘录/摘要的最大长度。"
+    default_subcategory_on_read_only_category: "在只读类别里启用 \"新主题 \"按钮，并选择一个允许用户发布的默认的子类别。"
     show_pinned_excerpt_mobile: "在移动视图中显示置顶话题的摘录。"
     show_pinned_excerpt_desktop: "在桌面视图中显示置顶话题的摘录。"
     post_onebox_maxlength: "Onebox Discourse 帖子的最大长度（以字符为单位）。"
@@ -1425,7 +1433,7 @@ zh_CN:
     manifest_icon: "在 Android 上用作徽标/初始屏幕图片的图片。将自动调整为 512 × 512。如果留空，将使用 large_icon。"
     manifest_screenshots: "在安装提示页面上展示您的实例特色和功能的屏幕截图。所有图片均应为本地上传且尺寸相同。"
     favicon: "您的站点的网站图标，请参阅 <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://zh.wikipedia.org/wiki/Favicon</a>。如果要正确地通过 CDN 分发，它必须是 png 图片。将调整为 32x32。如果留空，将使用 large_icon。"
-    apple_touch_icon: "用于 Apple 触控设备的图标。将自动调整为 180x180。如果留空，将使用 large_icon。"
+    apple_touch_icon: "用于 Apple 触摸设备的图标。不推荐透明背景。将自动调整为 180x180。如果留空，将使用 large_icon。"
     opengraph_image: "默认 OpenGraph 图片，当页面没有其他合适的图片时使用。如果留空，将使用 large_icon。"
     twitter_summary_large_image: "Twitter 卡片 'summary large image'（宽度至少应为 280，高度至少为 150，不能为 .svg）。如果留空，则使用 opengraph_image（前提是也不能为 .svg）生成常规卡片元数据。"
     notification_email: "发送所有重要系统电子邮件时使用的 from: 电子邮件地址。此处指定的网域必须正确设置 SPF、DKIM 和反向 PTR 记录才能收到电子邮件。"
@@ -1441,6 +1449,8 @@ zh_CN:
     summary_percent_filter: "当用户点击“总结此话题”时，显示前百分之几的帖子"
     summary_max_results: "“总结此话题”返回的最大帖子数量"
     summary_timeline_button: "在时间线中显示“摘要”按钮"
+    summarization_strategy: "总结插件注册内容的其他方法"
+    custom_summarization_allowed_groups: "允许使用“summarization_strategy”总结内容的群组。"
     enable_personal_messages: "已弃用，请改用 'personal message enabled groups' 设置。允许信任级别 1（可通过最小信任级别配置来发送消息）用户创建消息和回复消息。请注意，管理人员不受限制。"
     personal_message_enabled_groups: "允许这些组中的用户创建消息和回复消息。信任级别组包括高于该数字的所有信任级别，例如选择 trust_level_1 还允许 trust_level_2、3、4 用户发送 PM。请注意，管理人员不受限制。"
     enable_system_message_replies: "即使禁用了个人消息，也允许用户回复系统消息"
@@ -1535,6 +1545,7 @@ zh_CN:
     enable_badges: "启用徽章系统"
     max_favorite_badges: "用户可以选择的最大徽章数"
     whispers_allowed_groups: "允许指定群组的成员在话题内进行不公开交流。"
+    hidden_post_visible_groups: "允许这些群组的成员查看被隐藏的帖子。管理人员始终可以查看被隐藏的帖子。"
     allow_index_in_robots_txt: "在 robots.txt 中指定此站点允许被网络搜索引擎索引。在特殊情况下，您可以永久<a href='%{base_path}/admin/customize/robots'>替换 robots.txt</a>。"
     blocked_email_domains: "以竖线分隔的不允许用户注册帐户的电子邮件域的列表。自域名会被自动处理。不支持通配符 * 和 ?。示例：mailinator.com|trashmail.net"
     allowed_email_domains: "以竖线分隔的电子邮件域名列表，用户必须使用该列中的域名注册帐户。系统会自动处理指定域的子域名。不支持通配符* 和？。警告：使用列表以外的遇见云贵注册的用户将不被允许。"
@@ -1561,7 +1572,7 @@ zh_CN:
     enable_discourse_connect: "通过 DiscourseConnect（以前称为“Discourse SSO”）启用登录（警告：用户的电子邮件地址*必须*由外部站点验证！）"
     verbose_discourse_connect_logging: "将详细的 DiscourseConnect 相关诊断记录到 <a href='%{base_path}/logs' target='_blank'>/logs</a>"
     enable_discourse_connect_provider: "在 /session/sso_provider 端点上实现 DiscourseConnect（以前称为“Discourse SSO”）提供商协议，要求设置 discourse_connect_provider_secrets"
-    discourse_connect_url: "DiscourseConnect 端点的 URL（必须包括 http://或 https://）"
+    discourse_connect_url: "DiscourseConnect 的端点 URL (必须包含 http:// 或 https://，并且不得包含尾部斜杠)"
     discourse_connect_secret: "用于加密验证 DiscourseConnect 信息的密钥字符串，确保长度至少为 10 个字符"
     discourse_connect_provider_secrets: "使用 DiscourseConnect 的网域-密钥对列表。确保 DiscourseConnect 密钥长度至少为 10 个字符。通配符 * 可用于匹配任何网域或仅匹配其中的一部分（例如 *.example.com）。"
     discourse_connect_overrides_bio: "替换用户个人资料中的用户个人简介，并阻止用户对其进行更改"
@@ -1575,7 +1586,7 @@ zh_CN:
     discourse_connect_overrides_profile_background: "使用来自 DiscourseConnect 有效负载的值替换用户个人资料背景。"
     discourse_connect_overrides_card_background: "使用来自 DiscourseConnect 有效负载的值替换用户卡片背景。"
     discourse_connect_not_approved_url: "将未经批准的 DiscourseConnect 帐户重定向到此 URL"
-    discourse_connect_allows_all_return_paths: "不限制 DiscourseConnect 提供的 return_paths 的网域（默认情况下，返回路径必须在当前站点上）"
+    discourse_connect_allowed_redirect_domains: "对于 DiscourseConnect 提供的返回路径，限制在这些网域内 (默认返回路径必须在当前站点)。使用 * 来允许任何网域作为返回路径。不允许使用子域通配符 (`*.foobar.com`)。"
     enable_local_logins: "启用基于本地用户名和密码登录的帐户。警告：如果禁用，并且您之前没有配置至少一种备用登录方法，您可能无法登录。"
     enable_local_logins_via_email: "允许用户请求通过电子邮件向他们发送一键登录链接。"
     allow_new_registrations: "允许新用户注册。取消选中此项以防止任何人创建新帐户。"
@@ -1611,6 +1622,7 @@ zh_CN:
     s3_configure_tombstone_policy: "为逻辑删除上传启用自动删除策略。重要提示：如果禁用，在删除上传后不会回收空间。"
     s3_disable_cleanup: "当备份的数量超出允许的最大值时，不移除 S3 中的旧备份。"
     enable_s3_inventory: "使用 Amazon S3 清单生成报告并验证上传。重要提示：需要有效的 S3 凭据（访问密钥 ID 和秘密访问密钥）。"
+    s3_use_acls: "AWS 建议不要在 S3 存储桶上使用 ACL；如果您遵循此建议，请取消选中此选项。如果您使用安全上传，则必须启用此选项。"
     backup_time_of_day: "备份的 UTC 时间。"
     backup_with_uploads: "在计划备份中包括上传。禁用此项只会备份数据库。"
     backup_location: "存储备份的位置。重要提示：S3 要求在“文件”设置中输入有效的 S3 凭据。"
@@ -1660,6 +1672,7 @@ zh_CN:
     s3_secret_access_key: "将用于上传图片、附件和备份的 Amazon S3 秘密访问密钥。"
     s3_region: "将用于上传图片和备份的 Amazon S3 区域名称。"
     s3_cdn_url: "用于所有 S3 资源的 CDN URL（例如：https://cdn.somewhere.com）。警告：更改此设置后，您必须重新发布所有旧帖子。"
+    s3_use_cdn_url_for_all_uploads: "对上传到 s3 的所有文件使用 CDN URL，而不仅仅对图像使用。"
     avatar_sizes: "自动生成的头像大小列表。"
     external_system_avatars_enabled: "使用外部系统头像服务。"
     external_system_avatars_url: "外部系统头像服务的 URL。允许的替换为 {username} {first_letter} {color} {size}"
@@ -1679,7 +1692,7 @@ zh_CN:
     composer_media_optimization_image_bytes_optimization_threshold: "触发客户端优化的最小图片文件大小"
     composer_media_optimization_image_resize_dimensions_threshold: "触发客户端大小调整的最小图片宽度"
     composer_media_optimization_image_resize_width_target: "宽度大于 `composer_media_optimization_image_dimensions_resize_threshold` 的图片将调整为此宽度。必须 >= `composer_media_optimization_image_dimensions_resize_threshold`。"
-    composer_media_optimization_image_encode_quality: "重新编码过程中使用的 JPEG 编码质量。"
+    composer_media_optimization_image_encode_quality: "重新编码过程中使用的 JPG 编码质量。"
     min_ratio_to_crop: "用于裁剪高图片的比率。输入宽度/高度的结果。"
     simultaneous_uploads: "可以在编辑器中拖放的最大文件数"
     default_invitee_trust_level: "受邀用户的默认信任级别 (0-4)。"
@@ -1708,7 +1721,9 @@ zh_CN:
     tl3_requires_likes_given: "为了有资格升级到信任级别 3，在过去 (tl3 time period) 天内必须送出的最少赞数。"
     tl3_requires_likes_received: "为了有资格升级到信任级别 3，在过去 (tl3 time period) 天内必须收到的最少赞数。"
     tl3_links_no_follow: "不从信任级别 3 用户发布的链接中移除 rel=nofollow。"
-    trusted_users_can_edit_others: "允许具有高信任级别的用户编辑其他用户的内容"
+    tl4_delete_posts_and_topics: "允许 TL4 用户删除其他用户创建的帖子和话题。 TL4 用户还可以查看已删除的话题和帖子。"
+    edit_all_topic_groups: "允许该组的用户编辑其他用户的主题标题、标签和类别"
+    edit_all_post_groups: "允许该组的用户编辑其他用户的帖子"
     min_trust_to_create_topic: "创建新话题所需的最低信任级别。"
     allow_flagging_staff: "如果启用，用户可以举报来自管理人员帐户的帖子。"
     min_trust_to_edit_wiki_post: "编辑标记为 Wiki 的帖子所需的最低信任级别。"
@@ -1744,7 +1759,7 @@ zh_CN:
     title_min_entropy: "话题标题所需的最小熵（唯一字符，非英语计数更多）。"
     body_min_entropy: "帖子正文所需的最小熵（唯一字符，非英语计数更多）。"
     allow_uppercase_posts: "允许在话题标题或帖子正文中全部使用大写字母。"
-    max_consecutive_replies: "用户在被阻止添加另一个回复之前必须在话题中连续发布的帖子数。"
+    max_consecutive_replies: "用户在被阻止添加另一个回复之前可以在主题中连续发布的帖子数。此限制不适用于主题所有者、站点工作人员或类别管理员。"
     enable_filtered_replies_view: '“(n) 回复”按钮会收起所有其他帖子，仅显示当前帖子及其回复。'
     title_fancy_entities: "将常见的 ASCII 字符转换为话题标题中的花哨 HTML 实体，又称为 SmartyPants <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</a>"
     min_title_similar_length: "检查有无类似话题之前的标题的最小长度。"
@@ -1824,6 +1839,11 @@ zh_CN:
     block_auto_generated_emails: "阻止识别为自动生成的传入电子邮件。"
     ignore_by_title: "根据标题忽略传入电子邮件。"
     mailgun_api_key: "用于验证网络钩子消息的 Mailgun Secret API 密钥。"
+    sendgrid_verification_key: "用于验证webhook消息的Sendgrid验证密钥。"
+    mailjet_webhook_token: "用于验证 webhook 负载的令牌。它必须作为 webhook 的“t”查询参数传递，例如：https://example.com/webhook/mailjet?t=supersecret"
+    mandrill_authentication_key: "用于验证 webhook 消息的 Mandrill 身份验证密钥。"
+    postmark_webhook_token: "用于验证 webhook 负载的令牌。它必须作为 webhook 的“t”查询参数传递，例如：https://example.com/webhook/postmark?t=supersecret"
+    sparkpost_webhook_token: "用来验证 webhook 有效载荷的 Token。它必须作为 webhook 的't' 查询参数传递，例如：https://example.com/webhook/sparkpost?t=supersecret"
     soft_bounce_score: "发生临时退回时，向用户添加的退回分数。"
     hard_bounce_score: "发生永久退回时，向用户添加的退回分数。"
     bounce_score_threshold: "在我们停止向用户发送电子邮件之前的最大退回分数。"
@@ -1851,7 +1871,7 @@ zh_CN:
     pop3_polling_password: "用于轮询电子邮件的 POP3 帐户的密码。"
     pop3_polling_delete_from_server: "从服务器删除电子邮件。注意：如果您禁用此功能，您应该手动清理您的邮件收件箱"
     log_mail_processing_failures: "将所有电子邮件处理失败记录到 <a href='%{base_path}/logs' target='_blank'>/logs</a>"
-    email_in: '允许用户通过电子邮件发布新话题（需要手动或 pop3 轮询）。在每个类别的“设置”标签页中配置地址。'
+    email_in: "允许用户通过电子邮件发布新主题。启用此设置后，你将能为组和类别配置传入电子邮件地址。"
     email_in_min_trust: "用户要被允许通过电子邮件发布新话题所需的最低信任级别。"
     email_in_authserv_id: "对传入电子邮件进行身份验证检查的服务的标识符。请参阅 <a href='https://meta.discourse.org/t/134358'>https://meta.discourse.org/t/134358</a> 了解配置说明"
     email_in_spam_header: "用于检测垃圾信息的电子邮件标头。"
@@ -1897,6 +1917,7 @@ zh_CN:
     enable_category_group_moderation: "允许群组审核特定类别的内容"
     group_in_subject: "在电子邮件主题中将 %%{optional_pm} 设置为 PM 中第一个群组的名称，请参阅：<a href='https://meta.discourse.org/t/customize-specific-email-templates/88323' target='_blank'>自定义标准电子邮件的主题格式</a>"
     allow_anonymous_posting: "允许用户切换至匿名模式"
+    allow_anonymous_likes: "允许匿名用户对帖子点赞"
     anonymous_posting_min_trust_level: "启用匿名发帖所需的最低信任级别"
     anonymous_account_duration_minutes: "为了保护匿名性，每 N 分钟为每个用户创建一个新的匿名帐户。示例：如果设置为 600，则在距离上次发帖 600 分钟且用户切换到匿名时，将创建一个新的匿名帐户。"
     hide_user_profiles_from_public: "禁用匿名用户的用户卡片、用户个人资料和用户目录。"
@@ -1915,6 +1936,7 @@ zh_CN:
     allow_profile_backgrounds: "允许用户上传个人资料背景。"
     sequential_replies_threshold: "在被提醒太多连续回复之前，用户必须在话题中连续发布的帖子数。"
     get_a_room_threshold: "在被警告之前，用户必须在同一话题中向同一个人发布的帖子数。"
+    dont_feed_the_trolls_threshold: "被警告前来自其他用户的举报数量。"
     enable_mobile_theme: "移动设备使用适合移动设备的主题，并且可以切换到完整站点。如果您想使用完全自适应的自定义样式表，请禁用此选项。"
     dominating_topic_minimum_percent: "在被提醒过度主导某个话题之前，用户必须在某个话题中发布的帖子所占的百分比。"
     disable_avatar_education_message: "禁用更改头像的教育消息。"
@@ -1924,22 +1946,22 @@ zh_CN:
     permalink_normalizations: "在匹配永久链接之前应用以下正则表达式，例如：/(topic.*)\\?.*/\\1 将从话题路由中去除查询字符串。格式为正则表达式+字符串。使用 \\1 等访问捕获"
     global_notice: "向所有访客显示紧急、突发、不可忽略的全局横幅通知，更改为空将隐藏（允许使用 HTML）。"
     disable_system_edit_notifications: "当 'download_remote_images_to_local' 启用时禁用系统用户的编辑通知。"
-    disable_category_edit_notifications: "禁用话题类别编辑通知。"
-    disable_tags_edit_notifications: "禁用话题标签编辑通知。"
+    disable_category_edit_notifications: "禁用主题类别编辑的通知。"
+    disable_tags_edit_notifications: "禁用主题标签编辑的通知。"
     notification_consolidation_threshold: "合并通知前，收到的赞或成员资格请求通知的数量。设置为 0 将禁用。"
     likes_notification_consolidation_window_mins: "以分钟计的持续时间，被赞的通知在达到此阈值后会被合并到单个通知中。可以通过 `SiteSetting.notification_consolidation_threshold` 配置阈值。"
     automatically_unpin_topics: "当用户到达底部时自动取消置顶话题。"
     read_time_word_count: "每分钟可阅读的字数，用于估算阅读时间。"
     topic_page_title_includes_category: "话题页面<a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title' target='_blank'>标题标签</a>包含类别名称。"
-    native_app_install_banner_ios: "在 iOS 设备上向普通用户（信任级别为 1 及以上）显示 DiscourseHub 应用横幅。"
-    native_app_install_banner_android: "在 Android 设备上向普通用户（信任级别为 1 及以上）显示 DisroseHUB 应用横幅。"
+    native_app_install_banner_ios: "在 iOS 设备上向基本用户 (信任级别1) 及以上的用户显示 DiscourseHub 应用程序横幅。"
+    native_app_install_banner_android: "在 Android 设备上向基本用户 (信任级别1) 及以上的用户显示 DiscourseHub 应用程序横幅。"
     app_association_android: "端点 <a href='%{base_path}/.well-known/assetlinks.json'>.well-known/assetlinks.json</a> 的内容，用于 Google 的 Digital Asset Links API。"
     app_association_ios: "端点 <a href='%{base_path}/apple-app-site-association'>apple-app-site-association </a> 的内容，用于在创建此站点与 iOS 应用之间通用链接。"
     share_anonymized_statistics: "共享匿名使用统计信息。"
     auto_handle_queued_age: "在此设定天数后自动处理待审核的记录。举报将被忽略。队列中的帖子和用户将被拒绝。设为 0 将禁用此功能。"
     penalty_step_hours: "以小时为单位对用户进行禁言或封禁的默认处罚。第一次违反默认为第一个值，第二次违反默认为第二个值，依此类推。"
     svg_icon_subset: "添加您希望包含在资源中的其他 FontAwesome 5 图标。使用前缀 'fa-' 表示实心图标，使用 far-' 表示常规图标，使用 'fab-' 表示品牌图标。"
-    max_prints_per_hour_per_user: "/print 页面的最大展示次数（设置为 0 将禁用）"
+    max_prints_per_hour_per_user: "/print 页面的最大展示次数（设置为 0 将禁用打印）"
     full_name_required: "全名是用户个人资料的必填字段。"
     enable_names: "在用户的个人资料、用户卡片和电子邮件中显示用户的全名。禁用将在所有地方隐藏全名。"
     display_name_on_posts: "在帖子中显示用户的全名以及他们的用户名。"
@@ -1960,17 +1982,13 @@ zh_CN:
     allowed_href_schemes: "除了 http 和 https 之外，链接中允许的协议名称。"
     embed_post_limit: "要嵌入的最大帖子数。"
     embed_username_required: "创建话题需要用户名。"
-    notify_about_flags_after: "如果经过此小时数后仍有未处理的举报，向版主发送个人信息。设置为 0 将禁用。"
-    show_create_topics_notice: "如果站点的公共话题少于 5 个，请显示通知，要求管理员创建一些话题。"
+    notify_about_reviewable_item_after: "如果经过这么多小时数后仍有未处理的标记，请向版主发送个人信息。设置为 0 将禁用。"
     delete_drafts_older_than_n_days: "删除超过 (n) 天的草稿。"
     delete_merged_stub_topics_after_days: "在自动删除完全合并的存根话题之前等待的天数。设置为 0 将从不删除存根话题。"
-    bootstrap_mode_min_users: "禁用引导模式所需的最小用户数（设置为 0 将禁用）"
+    bootstrap_mode_min_users: "禁用引导程序模式所需的最小用户数(设置为 0 以禁用，最多可能需要 24 小时)"
     prevent_anons_from_downloading_files: "阻止匿名用户下载附件。"
-    secure_media: "已弃用：改用 secure_uploads 设置，将在 Discourse 3.0 中移除。"
     secure_uploads: '限制对所有上传（图片、视频、音频、文本、pdf、zip 等）的访问。如果启用“需要登录”，则只有登录用户才能访问上传。否则，访问将仅限于私信和不公开类别中的媒体上传。警告：此设置比较复杂，需要深入理解管理操作。请参阅 <a target="_blank" href="https://meta.discourse.org/t/-/140017">Meta 安全上传话题</a>以了解详情。'
-    secure_media_allow_embed_images_in_emails: "已弃用：使用 secure_uploads_allow_embed_images_in_emails，将在 Discourse 3.0 中移除。"
     secure_uploads_allow_embed_images_in_emails: "如果小于 'secure uploads max email embed image size kb' 设置，则允许嵌入通常会在电子邮件中编辑的安全图片。"
-    secure_media_max_email_embed_image_size_kb: "已弃用：使用 secure_uploads_max_email_embed_image_size_kb，将在 Discourse 3.0 中移除。"
     secure_uploads_max_email_embed_image_size_kb: "如果启用了 'secure uploads allow embed in emails' 设置，将被嵌入到电子邮件的安全图片的大小限制；如果不启用，则此设置无效。"
     slug_generation_method: "选择一种缩略名生成方法。'encoded' 将生成百分比编码字符串。'none' 将完全禁用缩略名。"
     enable_emoji: "启用表情符号"
@@ -1978,6 +1996,7 @@ zh_CN:
     emoji_set: "您喜欢表情符号吗？"
     emoji_autocomplete_min_chars: "触发自动填充表情符号弹出窗口所需的最少字符数"
     enable_inline_emoji_translation: "启用内联表情符号的翻译（之前没有任何空格或标点符号）"
+    emoji_deny_list: "这些 emoji 无法在菜单或简码中使用。"
     approve_post_count: "新用户或基本用户必须接受审批的帖子数量"
     approve_unless_trust_level: "低于此信任级别的用户的帖子必须接受审批"
     approve_new_topics_unless_trust_level: "低于此信任级别的用户的新话题必须接受审批"
@@ -2032,18 +2051,26 @@ zh_CN:
     default_tags_watching_first_post: "默认将关注每个新话题中的第一个帖子的标签列表。"
     default_text_size: "默认选择的文本大小"
     default_title_count_mode: "页面标题计数器的默认模式"
+    enable_offline_indicator: "当检测到用户没有网络连接时，向他们显示一条消息"
+    default_sidebar_link_to_filtered_list: "默认情况下，将导航菜单链接设为链接到筛选后的列表。"
+    default_sidebar_show_count_of_new_items: "默认情况下，将导航菜单链接设为显示新条目的数量而非徽章的数量。"
+    default_sidebar_switch_panel_position: "边栏开关面板按钮的位置"
     retain_web_hook_events_period_days: "保留网络钩子事件记录的天数。"
     retry_web_hook_events: "自动重试失败的网络钩子事件 4 次。重试之间的时间间隔为 1、5、25 和 125 分钟。"
     revoke_api_keys_days: "未使用的 API 密钥被自动撤消前的天数（0 表示从不撤消）"
     allow_user_api_keys: "允许生成用户 API 密钥"
     allow_user_api_key_scopes: "用户 API 密钥允许的范围列表"
-    min_trust_level_for_user_api_key: "生成用户 API 密钥所需的信任级别"
+    min_trust_level_for_user_api_key: |
+      生成用户 API 密钥所需的信任级别。<br>
+      <b>警告</b>：改变信任等级将阻止信任等级较低的用户通过 Discourse Hub 登录。
     allowed_user_api_auth_redirects: "用户 API 密钥身份验证重定向的允许 URL。通配符 * 可用于匹配它的任何部分（例如 www.example.com/*）。"
     allowed_user_api_push_urls: "服务器推送到用户 API 的允许 URL"
     expire_user_api_keys_days: "用户 API 密钥自动过期前的天数（0 表示从不过期）"
     tagging_enabled: "在话题上启用标签？"
     min_trust_to_create_tag: "创建标签所需的最低信任级别。"
     max_tags_per_topic: "可应用于话题的最大标签数。"
+    enable_max_tags_per_email_subject: "生成电子邮件主题时使用 max_tags_per_email_subject"
+    max_tags_per_email_subject: "电子邮件主题中可以包含的最大标签数"
     max_tag_length: "可以在标签中使用的最大字符数。"
     max_tag_search_results: "搜索标签时，要显示的最大结果数。"
     max_tags_in_filter_list: "要在筛选器下拉列表中显示的最大标签数。将显示最常用的标签。"
@@ -2055,6 +2082,8 @@ zh_CN:
     suppress_overlapping_tags_in_list: "如果标签与话题标题中的字词完全匹配，则不显示标签"
     remove_muted_tags_from_latest: "不在最新话题列表中显示仅使用已被设为免打扰的标签标记的话题。"
     force_lowercase_tags: "强制所有新标签完全小写。"
+    create_post_for_category_and_tag_changes: "当话题的类别或标签发生变化时创建一个小的行动帖子"
+    watched_precedence_over_muted: "如果我正在关注的类别或标签中有我已静音的主题，请通知我。"
     company_name: "公司名称"
     governing_law: "适用法律"
     city_for_disputes: "争议之城"
@@ -2069,7 +2098,7 @@ zh_CN:
     enable_sitemap: "为您的站点生成站点地图并将其包含在 robots.txt 文件中。"
     sitemap_page_size: "每个站点地图页面中包含的 URL 数量。最大 50.000"
     enable_user_status: "（实验性）允许用户设置自定义状态消息（表情符号 + 描述）。"
-    enable_user_tips: "（实验性）启用向用户描述关键功能的新用户提示"
+    enable_user_tips: "启用向用户描述关键功能的新用户提示"
     short_title: "短标题将用于用户的主屏幕、启动器或其他空间可能有限的地方。应被限制为 12 个字符。"
     dashboard_hidden_reports: "允许从信息中心隐藏指定报告。"
     dashboard_visible_tabs: "选择可见的信息中心标签页。"
@@ -2086,11 +2115,15 @@ zh_CN:
     suggest_weekends_in_date_pickers: "在日期选择器建议中包括周末（周六和周日）（如果您仅在工作日（周一至周五）使用 Discourse，请禁用此选项）。"
     splash_screen: "在加载站点资源时显示临时加载屏幕"
     navigation_menu: "确定要使用的导航菜单。边栏和标题导航可由用户自定义。旧版选项用于向后兼容。"
-    default_sidebar_categories: "所选类别将默认显示在边栏的“类别”版块下。"
-    default_sidebar_tags: "所选标签将默认显示在边栏的“标签”版块下。"
-    enable_new_user_profile_nav_groups: "实验性：将向所选群组的用户显示新的用户个人资料导航菜单"
-    enable_experimental_topic_timeline_groups: "实验性：所选群组的用户将看到重构的话题时间线"
+    default_navigation_menu_categories: "所选类别将默认显示在导航菜单的“类别”版块下。"
+    default_navigation_menu_tags: "所选标签将默认显示在导航菜单的“标签”版块下。"
     enable_experimental_hashtag_autocomplete: "实验性：对类别和标签使用新的 #hashtag 自动补全系统，以不同方式呈现所选条目，并改进了搜索"
+    experimental_new_new_view_groups: '试验性的：启用一个新的主题列表，将未读和新的主题合并，并使侧边栏中的 "一切 "链接指向它。'
+    enable_custom_sidebar_sections: "实验：启用自定义侧边栏部分"
+    experimental_topics_filter: "实验性：在 /filter 启用实验性主题过滤器"
+    experimental_search_menu_groups: "实验性：启用升级为使用 glimmer 的新搜索菜单"
+    enable_experimental_lightbox: "实验性：将默认的图片灯箱替换为修订后的设计。"
+    page_loading_indicator: "配置在 Discourse 中进行页面导航时出现的加载指示器。“微调控件”是整页指示器。“滑块”会在屏幕顶部显示一个窄条。"
     errors:
       invalid_css_color: "颜色无效。输入颜色名称或十六进制值。"
       invalid_email: "无效的电子邮件地址。"
@@ -2116,7 +2149,7 @@ zh_CN:
       pop3_polling_password_is_empty: "在启用 POP3 轮询前，您必须先设置 'pop3 polling password'。"
       pop3_polling_authentication_failed: "POP3 身份验证失败。请验证您的 pop3 凭据。"
       reply_by_email_address_is_empty: "在启用通过电子邮件回复之前，您必须先设置 'reply by email address'。"
-      email_polling_disabled: "在启用通过电子邮件回复之前，您必须先启用手动或者 POP3 轮询。"
+      email_polling_disabled: "你必须先启用手动、POP3 轮询或启用自定义邮件轮询器，然后才能通过电子邮件进行回复。"
       user_locale_not_enabled: "在启用此设置之前，您必须先启用 'allow user locale'。"
       personal_message_enabled_groups_invalid: "您必须为此设置指定至少一个群组。如果您不希望管理人员以外的任何人发送 PM，请选择管理人员群组。"
       invalid_regex: "正则表达式无效或不被允许。"
@@ -2125,7 +2158,6 @@ zh_CN:
       staged_users_disabled: "在启用此设置之前，您必须先启用 'staged users'。"
       reply_by_email_disabled: "在启用此设置之前，您必须先启用 'reply by email'。"
       discourse_connect_url_is_empty: "在启用此设置之前，您必须先设置 'discourse connect url'。"
-      discourse_connect_invite_only: "您不能同时启用 DiscourseConnect 和仅邀请模式。"
       enable_local_logins_disabled: "在启用此设置之前，您必须先启用 'enable local logins'。"
       min_username_length_exists: "您不能将最小用户名长度设置为高于最短用户名 (%{username})。"
       min_username_length_range: "您不能将最小值设置为高于最大值。"
@@ -2147,7 +2179,8 @@ zh_CN:
       search_tokenize_japanese_enabled: "在启用此设置之前，您必须禁用 'search_tokenize_japanese'。"
       discourse_connect_cannot_be_enabled_if_second_factor_enforced: "如果强制执行双重身份验证，则无法启用 DiscourseConnect。"
       delete_rejected_email_after_days: "此设置不能设置为低于 delete_email_logs_after_days 设置或大于 %{max}"
-      invalid_uncategorized_category_setting: "如果不允许未分类话题，则无法选择“未分类”类别"
+      invalid_uncategorized_category_setting: '如果“allow uncategorized topics”设置未启用，则无法选择“未分类”类别。'
+      invalid_search_ranking_weights: "对于 search_ranking_weights 站点设置来说，该值是无效的。示例：'{0.1,0.2,0.3,1.0}'。注意，每个权重的最大值是1.0。"
     placeholder:
       discourse_connect_provider_secrets:
         key: "www.example.com"
@@ -2322,7 +2355,6 @@ zh_CN:
     activated_by_staff: "被管理人员激活"
     new_user_typed_too_fast: "新用户输入过快"
     content_matches_auto_silence_regex: "内容符合自动禁言的正则表达式"
-    content_matches_auto_block_regex: "内容符合自动禁止的正则表达式"
     username:
       short: "必须至少为 %{min} 个字符"
       long: "不得超过 %{max} 个字符"
@@ -3060,7 +3092,7 @@ zh_CN:
 
         由于多个用户举报了 %{username} 的帖子，新用户 [%{username}](%{user_url}) 已被自动禁言。
 
-        请[审核举报](%{base_url}/admin/flags)。如果 %{username} 被意外禁言，请点击[此用户管理页面](%{user_url})上的取消禁言按钮。
+        请[审核举报](%{base_url}/review)。如果 %{username} 被意外禁言，请点击[此用户管理页面](%{user_url})上的取消禁言按钮。
 
         此阈值可以通过 `silence_new_user` 站点设置更改。
     spam_post_blocked:
@@ -3095,15 +3127,6 @@ zh_CN:
       title: "下载远程图片已被禁用"
       subject_template: "下载远程图片已被禁用"
       text_body_template: "由于达到了 `download_remote_images_threshold` 的磁盘空间限制，`download_remote_images_to_local` 设置被禁用。"
-    dashboard_problems:
-      title: "信息中心问题"
-      subject_template: "站点信息中心的新建议"
-      text_body_template: |
-        基于您目前的站点设置，我们有一些新的建议和推荐。
-
-        [访问您的站点信息中心](%{base_url}/admin)以查看。
-
-        如果您的信息中心没有任何可见的内容，则可能是另一个管理人员已经根据这些建议采取了行动。可以在[管理人员操作日志](%{base_url}/admin/logs/staff_action_logs)中找到管理人员操作列表。
     new_user_of_the_month:
       title: "您是当月最佳新用户！"
       subject_template: "您是当月最佳新用户！"
@@ -3138,9 +3161,6 @@ zh_CN:
     reached_limit:
       other: "注意：我们每天最多发送 %{count} 封电子邮件。检查站点以查看可能被阻止的电子邮件。PS：您很受欢迎！"
     in_reply_to: "回复给"
-    unsubscribe:
-      title: "退订"
-      description: "不再对这些电子邮件感兴趣？没问题！点击下面的按钮可以立即退订："
     reply_by_email: "[访问话题](%{base_url}%{url})或者回复此电子邮件以进行回复。"
     reply_by_email_pm: "[访问消息](%{base_url}%{url})或者回复此电子邮件以回复 %{participants}。"
     only_reply_by_email: "回复此电子邮件以进行回复。"
@@ -3436,7 +3456,6 @@ zh_CN:
       liked_received: "获赞"
       new_users: "新用户"
       popular_topics: "热门话题"
-      follow_topic: "关注此话题"
       join_the_discussion: "阅读更多"
       popular_posts: "热门帖子"
       more_new: "新摘要"
@@ -3632,14 +3651,7 @@ zh_CN:
     title: "无法加载应用"
     offline_page_message: "您好像离线了！请检查您的网络连接，然后重试。"
   login_required:
-    welcome_message: |
-      ## [欢迎来到%{title}](#welcome)
-      需要一个帐户。请创建帐户或登录以继续。
-    welcome_message_invite_only: |
-      ## [欢迎来到%{title}](#welcome)
-      需要一个帐户。请向现有成员请求邀请或登录以继续。
-  deleted: "已删除"
-  image: "图片"
+    welcome_message: "# [欢迎来到 %{title}](#welcome)"
   upload:
     edit_reason: "下载图片的本地副本"
     unauthorized: "抱歉，您尝试上传的文件不被允许（允许的扩展名：%{authorized_extensions}）。"
@@ -3840,91 +3852,8 @@ zh_CN:
       是的，法律术语很无聊，但是我们必须保护自己，进而保护您和您的数据免受不友好的人带来的伤害。我们提供了[服务条款](%{base_path}/tos)来描述您（和我们）关于内容、隐私和法律的行为和权利。要使用此服务，您必须同意遵守我们的[服务条款](%{base_path}/tos)。
   tos_topic:
     title: "服务条款"
-    body: "这些条款用于管理 <%{base_url}> 上互联网论坛的使用。要使用该论坛，您必须同意运营该论坛的公司 %{company_name} 设定的这些条款。\n\n该公司提供的其他产品和服务可能适用不同的条款。这些条款仅适用于论坛的使用。\n\n跳转到：\n\n- [重要条款](#heading--important-terms)\n- [您使用论坛的权限](#heading--permission)\n- [使用论坛的条件](#heading--conditions)\n- [可接受的使用](#heading--acceptable-use)\n- [内容标准](#heading--content-standards)\n- [执行](#heading--enforcement)\n- [您的帐户](#heading--your-account)\n- [您的内容](#heading--your-content)\n- [您的责任](#heading--responsibility)\n- [免责声明](#heading--disclaimers)\n- [责任限制](#heading--liability)\n- [反馈](#heading--feedback)\n- [终止](#heading--termination)\n- [争议](#heading--disputes)\n- [一般条款](#heading--general)\n- [联系](#heading--contact)\n- [变更](#heading--changes)\n\n<h2 id=\"heading--important-terms\"><a href=\"#heading--important-terms\">重要条款</a></h2>\n\n***这些条款包括一些影响您的权利和责任的重要条款，例如[免责声明](#heading-disclaimers)中的免责声明，[责任限制](#heading--liability)中公司对您的责任的限制，[使用责任](#heading-responsibility)中您同意对因滥用论坛而造成的损害赔偿公司，以及[争议](#heading--disputes)中仲裁争议的协议***。\n\n<h2 id=\"heading--permission\"><a href=\"#heading--permission\">您使用论坛的权限</a></h2>\n\n在遵守这些条款的前提下，公司授予您使用论坛的权限。每个人都需要同意这些条款才能使用论坛。\n\n<h2 id=\"heading--conditions\"><a href=\"#heading--conditions\">使用论坛的条件</a></h2>\n\n您使用论坛的权限受以下条件限制：\n\n1. 您必须至少达到十三岁。\n\n2. 如果公司直接与您联系，告知您不能再使用该论坛，则您将无法再使用该论坛。\n\n3. 您必须按照[可接受的使用](#heading--accepted-use)和[内容标准](#heading--content-standards)使用论坛。\n\n<h2 id=\"heading--acceptable-use\"><a href=\"#heading--acceptable-use\">可接受的使用</a></h2>\n\n1. 使用论坛时，您不能违法。\n\n2. 未经特别许可，您不能在论坛上使用或尝试使用他人的帐户。\n\n3. 您不得在论坛上购买、出售或以其他方式交易用户名或其他唯一标识符。\n\n4. 您不得通过论坛发送广告、连锁信或其他请求，或使用论坛为商业邮寄名单或数据库收集地址或其他个人数据。\n\n5. 您不得使用网络爬虫、浏览器插件或附加组件或者网络浏览器以外的其他计算机程序自动访问论坛或监控论坛。如果您运行搜索引擎，您可以抓取论坛，为公开的搜索引擎编制索引。\n\n6. 您不得使用论坛将电子邮件发送到分发名单、新闻组或群组邮件别名。\n\n7. 您不得虚假暗示您与本公司有关联或得到认可。\n\n8. 您不得在其他网页上超链接到论坛上的图片或其他非超文本内容。\n\n9. 您不得在从论坛下载的材料中移除任何显示专有所有权的标记。\n\n10. 您不得使用 `<iframe>` 在其他站点上显示论坛的任何部分。\n\n11. 您不得禁用、避免或绕过论坛的任何安全或访问限制。\n\n12. 您不得对论坛的基础架构施加不合理的请求量，或者发起旨在对论坛底层信息系统施加不合理负担的请求。\n\n13. 您不得通过论坛冒充他人。\n\n14. 您不得鼓励或帮助违反这些条款的任何人。\n\n<h2 id=\"heading--content-standards\"><a href=\"#heading--content-standards\">内容标准</a></h2>\n\n1. 您不得向论坛提交非法、冒犯或以其他方式伤害他人的内容。这包括具有骚扰性、侮辱性、不恰当或属于仇恨行为的内容。\n\n2. 您不得向论坛提交违反法律、侵犯任何人的知识产权、侵犯任何人的隐私或违反与他人协议的内容。\n\n3. 您不得向论坛提交包含恶意计算机代码的内容，例如计算机病毒或间谍软件。\n\n4. 您不得将内容仅作为占位符提交至论坛，以占用特定地址、用户名或其他唯一标识符。\n\n5. 您不得使用论坛披露您无权披露的信息，例如他人的机密或个人信息。\n\n<h2 id=\"heading--enforcement\"><a href=\"#heading--enforcement\">执行</a></h2>\n\n公司可以在最大程度上调查和起诉违反这些条款的行为。公司可能通知执法机关并与其合作起诉违反法律和这些条款的行为。 \n\n公司保留以任何原因更改、编辑和删除论坛内容的权利。如果您认为有人向论坛提交了违反这些条款的内容，请[立即与我们联系](#heading--contact)。\n\n<h2 id=\"heading--your-account\"><a href=\"#heading--your-account\">您的帐户</a></h2>\n\n您必须创建并登录帐户才能使用论坛的某些功能。\n\n要创建帐户，您必须提供有关您自己的一些信息。如果您创建帐户，则表示您同意至少提供有效的电子邮件地址，并使该地址保持最新状态。您可以随时通过发送电子邮件至 <%{contact_email}> 关闭您的帐户。 \n\n您同意，无论您是否授权，您对使用您的帐户执行的所有操作负责，直到您关闭帐户或通知公司您的帐户已被入侵。如果您怀疑自己的帐户已被入侵，您同意立即通知公司。您同意为您的帐户选择安全的密码，并保密。\n\n公司可能会根据处理与版权相关的删除请求政策，限制、暂停或关闭您在论坛上的帐户，或者如果公司合理地认为您违反了这些条款中的任何规则，公司也会相应地执行上述处理。\n\n<h2 id=\"heading--your-content\"><a href=\"#heading--your-content\">您的内容</a></h2>\n\n这些条款中的任何内容均未向公司授予您与论坛共享的知识产权（例如您的帐户信息、帖子或提交至论坛的其他内容）的任何所有权。这些条款中的任何内容也未授予您对公司知识产权的任何所有权。\n\n在您和公司之间，您仍然对您提交至论坛的内容负全部责任。您同意不会错误地暗示您提交至论坛的内容是由公司赞助或批准的。这些条款并不要求公司根据这些条款存储、维护或提供您提交的内容的副本，以及对其进行更改。 \n\n您提交至论坛的内容属于您，由您决定授予其他人的权限。但至少，您授权公司向论坛的其他用户提供您提交至论坛的内容。该特殊许可允许公司复制、发布和分析您提交至论坛的内容。 \n\n当您提交的内容从论坛中移除时（无论是由您还是由公司移除），当最后一个副本从公司的备份、缓存和其他系统中消失时，公司的特殊许可将终止。您提交的内容的其他许可，例如 [Creative Commons](https://creativecommons.org) 许可，可能会在您的内容被移除后继续有效。这些许可可能会授予其他人或本公司再次通过论坛分享您的内容的权利。\n\n收到您提交至论坛的内容的其他人可能会违反您对内容进行许可的条款。您同意公司不对这些违规行为或其后果承担责任。\n\n<h2 id=\"heading--responsibility\"><a href=\"#heading--responsibility\">您的责任</a></h2>\n\n您同意就其他人因您违反这些条款或他们因使用您在论坛上的帐户而违反这些条款而提出的法律索赔赔偿公司。您和公司都同意将您可能需要向公司赔偿的任何法律索赔尽快通知对方。如果公司未能及时将法律索赔通知您，则对于您本可以在获得及时通知后进行抗辩或减轻的损害部分，您无需向公司赔偿。对于您必须向公司赔偿的法律索赔，您同意允许公司控制对该法律索赔的调查、辩护和和解，并配合这些努力。本公司同意，在未经您事先同意的情况下，不会同意任何为您承认过错或向您强加义务的和解。\n\n<h2 id=\"heading--disclaimers\"><a href=\"#heading--disclaimers\">免责声明</a></h2>\n\n***您接受使用论坛和论坛内容的所有风险。在法律允许的范围内，公司及其供应商按原样提供论坛，不作任何保证。***\n\n论坛可以超链接并集成其他人运行的论坛和服务。公司不对其他人提供的服务或他们可能提供的内容作出任何保证。使用其他人运行的服务可能受您与运行服务的相关方之间的其他条款约束。\n\n<h2 id=\"heading--liability\"><a href=\"#heading--liability\">责任限制</a></h2>\n\n***公司及其供应商均不对他们的人员在您同意这些条款时无法合理预见的违约损害承担责任。*** \n\n***在法律允许的范围内，对于与论坛或论坛内容相关的任何类型的索赔，您的总责任将被限制在 50 美元以内。***\n\n<h2 id=\"heading--feedback\"><a href=\"#heading--feedback\">反馈</a></h2>\n\n公司欢迎您对论坛提出意见和建议。 请参阅下面的[联系](#heading--contact)部分，了解与我们取得联系的方式。\n\n您同意公司可以根据您提供的反馈和建议自由行事，并且公司不必向您通知您的反馈已被使用、获得您的使用许可或付款给您。您同意不会提交您认为可能是您或他人的机密或专有的反馈或建议。\n\n<h2 id=\"heading--termination\"><a href=\"#heading--termination\">终止</a></h2>\n\n您或公司可以随时终止这些条款中的协议。当我们的协议终止时，您使用论坛的许可也将终止。\n\n以下条款在我们的协议结束后将仍然有效：[您的内容](#heading--your-content)、[反馈](#heading--feedback)、[您的责任](#heading--responsibility)、[免责声明](#heading--disclaimers)、[责任限制](#heading--liability)和[一般条款](#heading--general)。\n\n<h2 id=\"heading--disputes\"><a href=\"#heading--disputes\">争议</a></h2>\n\n%{governing_law} 将管辖与这些条款或您对论坛的使用相关的任何争议。\n\n您和公司同意仅在%{city_for_disputes}的州或联邦法院寻求与这些条款相关的禁令。您和公司都不会反对这些法院的管辖权、法庭或审判地。\n\n***除了根据《计算机欺诈和滥用法案》寻求禁令或提出索赔外，您和公司将通过具有约束力的美国仲裁协会仲裁来解决任何争议。仲裁将遵循 AAA 的商业仲裁规则和消费者相关争议的补充程序。仲裁将在%{city_for_disputes}举行。您将作为个人解决任何争议，而不是作为集体诉讼或其他代表诉讼的一部分，无论是作为原告还是集体成员。未经公司许可，任何仲裁员均不得将任何争议与任何其他仲裁合并。***\n\n任何仲裁裁决将包括仲裁费用、合理的律师费和证人的合理费用。您和公司可以在任何有管辖权的法院进行仲裁裁决。 \n\n<h2 id=\"heading--general\"><a href=\"#heading--general\">一般条款</a></h2>\n\n如果这些条款中的某条规定按书面形式不可执行，但可以更改以使其可执行，则应对该规定进行必要的最小程度的修改以使其具有可执行性。否则，应删除该条款。\n\n您不得转让您与公司的协议。公司可将您的协议转让给公司的任何关联公司、获得公司控制权的任何其他公司，或购买与论坛相关的公司资产的任何其他公司。任何违反这些条款的尝试转让均不具有法律效力。\n\n行使本协议项下的任何权利或放弃任何违反本协议的行为，均不构成放弃任何其他违反本协议的行为。\n\n这些条款体现了您和公司之间关于论坛使用的所有协议条款。这些条款完全取代有关您使用论坛的任何其他书面或非书面协议。\n\n<h2 id=\"heading--contact\"><a href=\"#heading--contact\">联系</a></h2>\n\n您可以根据这些条款通知公司，并发送电子邮件至 <%{contact_email}> 向公司发送问题。\n\n公司可能会根据这些条款，使用您在论坛上为您的帐户提供的电子邮件地址，或通过向论坛首页或您的帐户页面发布消息来通知您。 \n\n<h2 id=\"heading--changes\"><a href=\"#heading--changes\">变更</a></h2>\n\n公司最后更新这些条款的日期为 2018 年 7 月 12 日，并可能再次更新这些条款。公司会将所有更新发布到论坛。对于包含重大变更的更新，如果您已创建帐户并提供了有效的电子邮件地址，公司同意向您发送电子邮件。公司还可能在论坛上通过特殊消息或提醒宣布更新。\n\n收到这些条款的更新通知后，您必须同意新条款才能继续使用论坛。\n"
   privacy_topic:
     title: "隐私政策"
-    body: |
-      <a name="collect"></a>
-
-      ## [我们收集什么信息？](#collect)
-
-      当您在我们的站点注册时，我们会从您那里收集信息，并在您通过阅读、编辑和评估分享的内容参与论坛时收集数据。
-
-      在我们的站点上注册时，您可能会被要求输入您的姓名和电子邮件地址 但是，您可以在不注册的情况下访问我们的网站。您的电子邮件地址将通过包含唯一链接的电子邮件进行验证。如果该链接被访问，我们就知道您控制着该电子邮件地址。
-
-      注册和发帖时，我们会记录发布帖子时的 IP 地址。我们也可能保留服务器日志，其中包括向我们的服务器发送的每一个请求。
-
-      <a name="use"></a>
-
-      ## [我们如何使用您的信息？](#use)
-
-      我们从您那里收集的任何信息可能通过以下方式之一使用：
-
-      * 个性化您的个人体验 - 您的信息将帮助我们更好地满足您的个人需求。
-      * 改进我们的站点 - 我们基于从您那里收到的信息和反馈不断改进我们的站点。
-      * 改善我们的客户服务 - 您的信息将帮助我们更有效地响应客户服务请求和支持需求。
-      * 发送定期电子邮件 - 您提供的电子邮件地址可用于向您发送信息、您请求的有关话题更改的通知，响应您的用户名，回复查询和/或其他请求或问题。
-
-      <a name="protect"></a>
-
-      ## [我们如何保护您的信息？](#protect)
-
-      我们实现了一系列安全措施，在您输入、提交或者访问您个人信息时保障您的个人信息的安全。
-
-      <a name="data-retention"></a>
-
-      ## [数据保留政策是什么？](#data-retention)
-
-      我们会善意地：
-
-      * 将包含对此服务器的所有请求的 IP 地址的服务器日志保留不超过 90 天。
-      * 将与注册用户及其帖子相关联的 IP 地址保留不超过 5 年。
-
-      <a name="cookies"></a>
-
-      ## [我们使用 Cookie 吗？](#cookies)
-
-      是的。Cookie 是站点或其服务提供商通过网络浏览器存储在您计算机硬盘上的小文件（如果您同意）。这些 Cookie 使站点可以识别您的浏览器，并且如果您注册了帐户，将其与您的注册帐户关联。
-
-      我们使用 Cookie 来了解和保存您对未来访问的偏好，并编译有关站点流量和站点互动的汇总数据，以便我们在未来提供更好的站点体验和工具。我们可能使用服务提供商来帮助我们更好地理解我们的站点访客。这些服务提供商不会被允许代表我们使用收集的信息，除非可以帮助我们开展和改进我们的业务。
-
-      <a name="disclose"></a>
-
-      ## [我们是否将任何信息透露给外界？](#disclose)
-
-      我们不会出售、交易或以其他方式将您的个人身份信息转让给外界。这不包括协助我们运营我们的站点、开展我们的业务或为您提供服务的受信任第三方，前提是这些第三方同意对这些信息保密。当我们认为发布您的信息是为了遵守法律、执行我们的网站政策或保护我们或其他人的权利、财产或安全时，我们也可能会发布您的信息。但是，我们可能会将非个人身份访问者信息提供给其他方用于营销、广告或其他用途。
-
-      <a name="third-party"></a>
-
-      ## [第三方链接](#third-party)
-
-      有时，根据我们的判断，我们可能会在我们的网站上包含或提供第三方产品或服务。这些第三方网站有单独和独立的隐私政策。因此，我们对这些链接网站的内容和活动不承担任何责任或义务。尽管如此，我们仍力求保护我们网站的完整性，并欢迎对这些网站的任何反馈。
-
-      <a name="coppa"></a>
-
-      ## [儿童在线隐私保护法案合规](#coppa)
-
-      我们的网站、产品和服务均面向年满 13 岁或以上的人。如果此服务器在美国，并且您未满 13 岁，则根据 COPPA（[儿童在线隐私保护法案](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)）要求，请勿使用本网站。
-
-      <a name="online"></a>
-
-      ## [仅在线隐私政策](#online)
-
-      本在线隐私政策仅适用于通过我们网站收集的信息，不适用于离线收集的信息。
-
-      <a name="consent"></a>
-
-      ## [您的同意](#consent)
-
-      使用我们的网站，即表示您同意我们网站的隐私政策。
-
-      <a name="changes"></a>
-
-      ## [隐私政策的变更](#changes)
-
-      如果我们决定更改我们的隐私政策，我们将在此页面上发布这些变更。
-
-      本文档根据 CC-BY-SA 发布。最后更新时间为 2013 年 5 月 31 日。
   badges:
     mass_award:
       errors:
@@ -4205,6 +4134,7 @@ zh_CN:
         other: '“%{category}”类别不允许使用“%{tags}”标签。请将其移除。'
     required_tags_from_group:
       other: "您必须至少包含 %{count} 个%{tag_group_name}标签。此组中的标签包括：%{tags}。"
+    limited_to_one_tag_from_group: "标签 %{tags} 不能同时使用。请仅包含其中一个标签。"
     invalid_target_tag: "不能是同义词的同义词"
     synonyms_exist: "存在同义词时不允许"
   rss_by_tag: "使用%{tag}标记的话题"
@@ -4223,10 +4153,10 @@ zh_CN:
       message: "<p>我们已将激活电子邮件重新发送至 <b>%{email}</b>"
   safe_mode:
     title: "进入安全模式"
-    description: "安全模式允许您在不加载插件或主题的情况下测试您的站点。"
+    description: "安全模式允许你在不加载主题或客户端的自定义插件的情况下测试你的站点。服务器端的自定义插件保持启用状态。"
     no_themes: "禁用主题和主题组件"
-    no_unofficial_plugins: "禁用非官方插件"
-    no_plugins: "禁用所有插件"
+    no_unofficial_plugins: "禁用非官方的客户端自定义插件"
+    no_plugins: "禁用所有客户端自定义插件"
     enter: "进入安全模式"
     must_select: "您必须至少选择一个选项才能进入安全模式。"
   wizard:
@@ -4341,7 +4271,9 @@ zh_CN:
           <p>玩得开心，并顺利<a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>建立您的新社区</a>！</p>
   search_logs:
     graph_title: "搜索计数"
-  joined: "加入日期："
+  onebox:
+    discourse:
+      user_joined_community: "加入于%{date}"
   discourse_push_notifications:
     popup:
       mentioned: '%{username} 在“%{topic}”中提及了您 - %{site_title}'
@@ -4403,10 +4335,10 @@ zh_CN:
         category: 类别设置
     actions:
       agree:
-        title: "同意…"
+        title: "是"
       agree_and_keep:
         title: "保留帖子"
-        description: "同意举报并保持帖子不变。"
+        description: "同意举报，但是保留帖子不变。"
       agree_and_keep_hidden:
         title: "保持帖子隐藏"
         description: "同意举报并保持帖子隐藏。"
@@ -4421,32 +4353,35 @@ zh_CN:
         description: "恢复帖子，以便所有用户都可以看到它。"
       agree_and_hide:
         title: "隐藏帖子"
-        description: "隐藏此帖子并自动向用户发送一条消息，敦促他们进行编辑。"
+        description: "同意举报并隐藏这个帖子 + 自动向用户发送信息敦促他们进行修改。"
       delete_single:
         title: "删除"
       delete:
         title: "删除…"
       delete_and_ignore:
-        title: "删除帖子并忽视"
-        description: "删除帖子；如果是第一个帖子，同时删除话题"
+        title: "忽略举报并删除帖子"
+        description: "将举报从队列中移除，并删除该帖子；如果是第一个帖子，同时删除该主题。 "
       delete_and_ignore_replies:
-        title: "删除帖子 + 回复并忽略"
-        description: "删除帖子及其所有回复；如果是第一个帖子，同时删除话题"
+        title: "忽略举报，删除帖子和回复"
+        description: "将举报从队列中移除，并删除该帖子及所有回复；如果是第一个帖子，同时删除该主题"
         confirm: "确定要同时删除对帖子的回复吗？"
       delete_and_agree:
-        title: "删除帖子并同意"
-        description: "删除帖子；如果是第一个帖子，同时删除话题"
+        title: "删除帖子"
+        description: "同意举报并删除帖子；如果是第一个帖子，同时删除主题。"
       delete_and_agree_replies:
-        title: "删除帖子 + 回复并同意"
-        description: "删除帖子及其所有回复；如果是第一个帖子，同时删除话题"
+        title: "删除帖子和回复"
+        description: "同意举报并删除此帖子及其所有回复；如果是第一个帖子，同时删除主题。"
         confirm: "确定要同时删除对帖子的回复吗？"
       disagree_and_restore:
-        title: "不同意并恢复帖子"
+        title: "不，恢复帖子"
         description: "恢复帖子，以便所有用户都可以看到它。"
       disagree:
-        title: "不同意"
+        title: "否"
       ignore:
         title: "忽略"
+      ignore_and_do_nothing:
+        title: "不进行操作"
+        description: "忽略举报，从队列中移除并且不采取任何操作。已隐藏的帖子会保持隐藏并且由自动工具处理。"
       approve:
         title: "批准"
       approve_post:
@@ -4511,6 +4446,11 @@ zh_CN:
     payload_url:
       blocked_or_internal: "无法使用有效负载 URL，因为它解析为被屏蔽的 IP 或内部 IP"
       unsafe: "无法使用有效负载 URL，因为它不安全"
+  form_templates:
+    errors:
+      invalid_yaml: "不是有效的 YAML 字符串"
+      invalid_type: "包含一个无效的模板类型： %{type} （有效类型： %{valid_types}）"
+      missing_type: "缺少一个字段类型"
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml
index 840d5016127..1555d8e2a56 100644
--- a/config/locales/server.zh_TW.yml
+++ b/config/locales/server.zh_TW.yml
@@ -51,6 +51,9 @@ zh_TW:
   remove_posts_deleted_by_author: "已由作者刪除"
   redirect_warning: "我們無法確認您選擇的連結是否已被發送到論壇上，若您想繼續此動作，選擇以下的連結。"
   on_another_topic: "在另一個話題中"
+  topic_tag_changed:
+    added: "已新增 %{added}"
+    removed: "已移除 %{removed}"
   inline_oneboxer:
     topic_page_title_post_number_by_user: "#%{post_number} %{username}"
   themes:
@@ -157,8 +160,6 @@ zh_TW:
     embed:
       load_from_remote: "載入貼文時發生了錯誤"
     site_settings:
-      invalid_choice:
-        other: "您定義了無效的選擇%{name}"
       default_categories_already_selected: "不能選擇一個已經用於另一個列表的分類。"
       s3_upload_bucket_is_required: "你沒有填寫“s3_upload_bucket”，不能開啟上傳至 S3。"
       enable_s3_uploads_is_required: "您無法啟用資料庫到 S3，除非您已啟用了 S3 的上傳檔案。"
@@ -413,10 +414,6 @@ zh_TW:
           attributes:
             execute_at:
               in_the_past: "在未來必須是"
-        translation_overrides:
-          attributes:
-            value:
-              invalid_interpolation_keys: '以下的插入操作無效："%{keys}"'
         watched_word:
           attributes:
             word:
@@ -433,23 +430,6 @@ zh_TW:
   meta_category_description: "討論這個網站、整體的組織規劃、社群的運作方式、以及我們該如何改善這些事務。"
   staff_category_name: "管理員"
   staff_category_description: "讓工作人員進行討論的私人分類。此分類下的討論話題只有管理員與板主才看得到。"
-  discourse_welcome_topic:
-    title: "歡迎來到我們的社群！"
-    body: |2
-
-      置頂主題的第一段是訪客在主頁看到的歡迎消息。這很重要！
-
-      **編輯**它作為社群的簡要介紹：
-
-      - 什麼人想參與？
-      - 他們能在這找到什麼？
-      - 為什麼他們要來這？
-      - 他們能在哪裡閲讀更多的內容（連結、資源等）？
-
-      <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
-
-      你可能想要在管理 :wrench: （右上角）中關閉這個主題，這樣回覆就不會積壓在這個通告下。
-  admin_quick_start_title: "請先閱讀這個：管理員快速啟用導覽"
   category:
     topic_prefix: "對於分類：%{category} 的定義"
     replace_paragraph: "（以新分類的簡短說明文字取代此段落。這段說明會出現在選擇分類的區塊，因此請將內容限於 200 字以內。）"
@@ -800,7 +780,7 @@ zh_TW:
       title: "DAU/MAU"
       xaxis: "天"
       yaxis: "\\bDAU/MAU"
-      description: "在最後一天登入的會員數除以上個月登入會員數，返回的%數表示社群黏著度。目標為＞30%。"
+      description: "在最後一天登入的會員數除以上個月登入會員數，返回的%數表示社群黏著度。目標為＞20%。"
     daily_engaged_users:
       title: "每日活躍的使用者"
       xaxis: "天"
@@ -1119,7 +1099,6 @@ zh_TW:
     large_icon: "用作其他Metadata Icon的基礎圖示。 理想情況下應大於512 x 512。如果留空，將使用logo_small來顯示。"
     manifest_icon: "在Android上用作Logo或啟動顯示畫面的圖片。 將自動調整為512×512。如果留空，將使用large_icon。"
     favicon: "您網頁的圖示（favicon），請參閱<a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://en.wikipedia.org/wiki/Favicon</a>。 要在CDN上正常工作，favicon 副檔名必須為 .png，圖示將調整為32x32。如果留空，將使用large_icon。"
-    apple_touch_icon: "Icon 用於Apple觸控裝置的圖示，將自動調整為180x180。 如果留空，將使用large_icon。"
     opengraph_image: "預設opengraph image，在頁面沒有其他合適圖像時使用。 如果留空，將使用large_icon。"
     notification_email: "這個表格：被用於發送所有重要系統郵件的郵箱地址。指定的域名必須正確設置 SPF、DKIM 和反向 PTR 記錄以發送郵件。"
     email_custom_headers: "自定義的電子郵件標題的管道分隔列表"
@@ -1301,7 +1280,6 @@ zh_TW:
     tl3_requires_likes_given: "要升到信任等級3所需要的，在最近考察時間段內使用者必須要給出的贊（設置為 0 或更高）"
     tl3_requires_likes_received: "要升到信任等級3所需要的，在最近考察時間段內使用者必須要收到的贊（設置為 0 或更高）"
     tl3_links_no_follow: "禁止從信任等級 3 之使用者所發表的連結中刪除 rel=nofollow 標籤"
-    trusted_users_can_edit_others: "允許具有高信任等級的使用者編輯其他使用者的內容"
     min_trust_to_create_topic: "建立話題最低所需的信任等級"
     allow_flagging_staff: "如果設定為已啟用，使用者可以標記具有管理權限的帳戶中的話題。"
     min_trust_to_edit_wiki_post: "編輯被標示為維基的貼文所需之最低信任等級。"
@@ -1326,7 +1304,6 @@ zh_TW:
     title_min_entropy: "在主題的標題中，允許的最低熵值（單字）。"
     body_min_entropy: "在一個貼文內文中，允許的最低熵值（單字）。"
     allow_uppercase_posts: "允許標題和內容全大寫"
-    max_consecutive_replies: "在被提醒回覆了太多連續的回覆前，使用者在話題中可以連續回覆的數量。"
     title_fancy_entities: "將常見的ASCII字符轉換為酷炫HTML作為討論話題的標題，更多資訊請參考：<a href='https://daringfireball.net/projects/smartypants/' target='_blank'>SmartyPants https://daringfireball.net/projects/smartypants/</a>"
     min_title_similar_length: "開始檢查相似主題的貼文標題的最少長度。"
     desktop_category_page_style: "/categories 頁面的視覺樣式。"
@@ -1408,7 +1385,6 @@ zh_TW:
     pop3_polling_password: "POP3 帳戶用來輪詢電子郵件的密碼。"
     pop3_polling_delete_from_server: "從Server端刪除電子郵件。注意：如果禁用此功能，則需要手動清理收件匣。"
     log_mail_processing_failures: "將所有電子郵件處理失敗記錄到<a href='%{base_path}/logs' target='_blank'>/logs</a>"
-    email_in: '允許使用者通過電子郵件建立討論話題（需要手動設定或定期從pop3向伺服器擷取訊息）。在每個類別的“設定”選項中設定地址。'
     email_in_min_trust: "能使用 EMail 發表新話題的最低的使用者信任等級"
     email_in_spam_header: "電子郵件標頭以偵測垃圾郵件"
     email_prefix: "EMail主題中使用的 [ 標籤 ]，留空將預設使用 'title'"
@@ -1465,12 +1441,9 @@ zh_TW:
     disable_system_edit_notifications: "當 'download_remote_images_to_local' 啟用時禁用系統編輯提醒。"
     automatically_unpin_topics: "當使用者到達底部時自動解除主題置頂。"
     read_time_word_count: "一分鐘閲讀的詞的數量，用於估計閲讀時間。"
-    native_app_install_banner_ios: "將iOS裝置上的DiscourseHub 橫幅主題顯示給一般使用者（信任等級1以上）。"
-    native_app_install_banner_android: "將Android裝置上的 DiscourseHub 橫幅主題顯示給一般使用者（信任等級1以上）。"
     share_anonymized_statistics: "分享匿名使用統計"
     auto_handle_queued_age: "等待多天後系統將自動處理等待審核的記錄，投訴將被忽略。尚未審核的討論話題及使用者將被拒絕。設定為0，可禁用此功能。"
     svg_icon_subset: "用前綴詞'fa-'、'far-'、'fab-'加入你喜歡的 FontAwesome 5 icons\\b 圖案。'fa-'表示實心圖案，'far-'表示一般圖案，'fab-'表示品牌圖案。"
-    max_prints_per_hour_per_user: "/print 頁面的每小時最大展示量（設置為 0 禁用）"
     full_name_required: "全名是使用者個人信息的必填項。"
     enable_names: "在使用者的個人信息、使用者卡片和郵件中顯示全名。禁用將在所有地方隱藏全名。"
     display_name_on_posts: "在使用者的貼文中顯示他們的全名以及他們的 @username。"
@@ -1485,10 +1458,7 @@ zh_TW:
     allowed_href_schemes: "除了 http 和 https 外允許的連結協議。"
     embed_post_limit: "貼文內 embed 的最大數量"
     embed_username_required: "創建主題需要使用者名。"
-    notify_about_flags_after: "如果有投訴沒有在設定的時數內處理，將私訊給版主。設為 0 將禁用。"
-    show_create_topics_notice: "如果網站的公開討論話題少於 5 個，顯示通知要求管理員建立一些討論話題。"
     delete_drafts_older_than_n_days: "刪除超過 n 天得草稿。"
-    bootstrap_mode_min_users: "禁用摘要模式的使用者數下限（0 為禁用）。"
     slug_generation_method: "選擇一個連結生成方式。“encoded”將生成以百分號編碼的連結。“none”將禁用自定義連結，只生成預設連結。"
     enable_emoji: "啟用表情符號"
     enable_emoji_shortcuts: "常見的顏文字，例如：「 :)、:p、:( 」，將轉換為表情符號"
@@ -1536,7 +1506,6 @@ zh_TW:
     retry_web_hook_events: "自動重試失敗的Web hook事件，最大重試為4次。 重試之間的時間間隔為1、5、25及125分鐘"
     allow_user_api_keys: "允許生成使用者API密鑰"
     allow_user_api_key_scopes: "使用者API授權範圍列表"
-    min_trust_level_for_user_api_key: "生成使用者 API 密鑰所需的信任等級"
     allowed_user_api_auth_redirects: "允許身份驗證URL用於導向使用者API 密鑰（Keys），使用星號「*」將代入所有字詞，並找到最適合的配對（例如：www.example.com/*）。"
     allowed_user_api_push_urls: "允許使用伺服器推送至使用者 API 的 URL"
     tagging_enabled: "啟用話題標籤功能？"
@@ -1558,8 +1527,6 @@ zh_TW:
     push_notifications_prompt: "顯示使用者同意提示"
     short_title: "短標題將用於使用者的主螢幕、啟動器或其他可能空白鍵有限的地方，它應限制為12個字。"
     dashboard_general_tab_activity_metrics: "選擇在一般頁面中要顯示為活躍指標的報告"
-    default_sidebar_categories: "選定的分類將預設顯示在側選單的分類段落中。"
-    default_sidebar_tags: "選定的標籤將預設顯示在側選單的標籤段落中。"
     errors:
       invalid_email: "無效的電子郵件地址"
       invalid_username: "沒有使用者使用該使用者名稱。"
@@ -1581,7 +1548,6 @@ zh_TW:
       pop3_polling_password_is_empty: "在啟用 POP3 輪詢前，你必須設置 'pop3 polling password'。"
       pop3_polling_authentication_failed: "POP3 驗證失敗。請驗證你的 pop3 帳號信息。"
       reply_by_email_address_is_empty: "在啟用郵件回覆之前，你必須設置“reply by email address”。"
-      email_polling_disabled: "在啟用郵件回覆功能前，你必須啟用手動或者 POP3 輪詢。"
       user_locale_not_enabled: "你必須先設置 'allow user locale' 再啟用該設置。"
       invalid_regex: "正則表達式非法或者不允許。"
       email_editable_enabled: "在啟用此設定之前，您必須禁用「電子郵件可編輯」選項"
@@ -1712,7 +1678,6 @@ zh_TW:
     deactivated_by_staff: "已由管理員撤銷"
     activated_by_staff: "已由管理員啟動"
     new_user_typed_too_fast: "新的使用者輸入太快"
-    content_matches_auto_block_regex: "內容符合正規表達式"
     username:
       short: "必須至少 %{min} 個字"
       long: "不能超過 %{max} 個字"
@@ -2165,14 +2130,6 @@ zh_TW:
     user_automatically_silenced:
       title: "使用者自動被禁言"
       subject_template: "新使用者%{username}由於社群投訴而被禁言"
-      text_body_template: |
-        這是自動發出的訊息。
-
-        因多位使用者投訴 %{username} 的文章，新使用者 [%{username}](%{base_url}) 已被禁言。
-
-        請[查看這些投訴](%{base_url}/admin/flags)。如果 %{username} 被不合理地阻止貼文，點擊[該用戶管理頁面](%{base_url}%{user_url})內的解除封鎖按鈕。
-
-        您可以調整網站設定中的 `block_new_user` 以變更封鎖門檻值。
     spam_post_blocked:
       title: "因垃圾貼文而被封鎖"
       subject_template: "新用戶 %{username} 由於重複貼連結，文章已被封鎖"
@@ -2197,9 +2154,6 @@ zh_TW:
       title: "停用遠端圖片下載"
       subject_template: "停用下載遠端圖片"
       text_body_template: "`download_remote_images_to_local` 設定已被禁用，因為已經達到 ``download_remote_images_threshold` 設定中的磁碟空間限制。"
-    dashboard_problems:
-      title: "控制台問題"
-      subject_template: "有新的建議出現在後台儀表板"
     new_user_of_the_month:
       title: "你是本月最佳新人！"
       subject_template: "你是本月最佳新人！"
@@ -2234,9 +2188,6 @@ zh_TW:
     reached_limit:
       other: "注意：你達到了每日郵件限額（%{count}），到網站看看哪些訊息可能被延遲了。BTW，感謝你經營的這麼熱絡！"
     in_reply_to: "回覆給"
-    unsubscribe:
-      title: "取消訂閱"
-      description: "不再對這些郵件感興趣？沒問題！點擊以立即取消訂閱："
     reply_by_email: "[訪問主題](%{base_url}%{url})或者發郵件回覆。"
     reply_by_email_pm: "[查看訊息](%{base_url}%{url}) 或回覆此電子郵件以回應%{participants}。"
     only_reply_by_email: "發郵件回覆。"
@@ -2458,7 +2409,6 @@ zh_TW:
       liked_received: "獲得贊"
       new_users: "新使用者"
       popular_topics: "熱門主題"
-      follow_topic: "關注主題"
       join_the_discussion: "閲讀更多"
       popular_posts: "熱門貼文"
       more_new: "新內容與你分享"
@@ -2568,15 +2518,6 @@ zh_TW:
   offline:
     title: "無法載入App"
     offline_page_message: "你似乎離線了！請檢查您的網路連接狀態，並重試。"
-  login_required:
-    welcome_message: |
-      ## [歡迎來到 %{title}](#welcome)
-      你需要一個帳號。請創設一個帳號，或者登入以繼續。
-    welcome_message_invite_only: |
-      ## [歡迎來到 %{title}](#welcome)
-      必須要有一個帳戶，請向現有會員請求邀請或登入以繼續。
-  deleted: "已刪除"
-  image: "圖片"
   upload:
     edit_reason: "下載外部圖片留做存檔"
     unauthorized: "抱歉，你沒有上傳檔案的權限（驗證擴展：%{authorized_extensions}）。"
@@ -2652,88 +2593,6 @@ zh_TW:
     title: "服務條款"
   privacy_topic:
     title: "隱私政策"
-    body: |
-      <a name="collect"></a>
-
-      ## [我們收集什麼信息？](#collect)
-
-      我們從你在我們站點註冊開始從你那開始收集信息，並收集關於你在論壇的閲讀和寫作的數據，並評估分享的內容。
-
-      當在我們站點註冊時，你可能被要求輸入你的名字和郵件地址。然而你可以在不用註冊的情況下訪問站點。你的郵件地將通過一個獨一無二的連結驗證。如果連結被訪問了，我們就知道你控制了該郵件地址。
-
-      當已註冊和發帖時，我們記錄發佈貼文時的 IP 地址。我們也可能保留伺服器日誌，其中包括了每一個向我們伺服器的請求。
-
-      <a name="use"></a>
-
-      ## [我們如何使用你的信息？](#use)
-
-      從你那收集的任何數據將以以下方式使用：
-
-      * 改進你的個人體驗 &mdash; 你的信息幫助我們更好地滿足你的個人需求。
-      * 改進我們的站點 &mdash; 我們基于信息和我們從你那收到的反饋不斷地試圖改進我們的站點。
-      * 改善我們的客戶服務 &mdash; 你的信息幫助我們更有效地回應使用者服務請求和支持。
-      * 用於發送階段性的郵件 &mdash; 你提供的郵件地址可能用於接受信息、你想看到的通知或與你使用者名有關的回覆和詢問，或是其他的請求和問題。
-
-      <a name="protect"></a>
-
-      ## [我們如何保護你的信息?](#protect)
-
-      我們實現了一系列的安全措施保證你輸入、提交或者訪問你個人信息的數據安全。
-
-      <a name="data-retention"></a>
-
-      ## [數據保存政策是什麼？](#data-retention)
-
-      我們將善意地：
-
-      * 保存 90 天內的所有向伺服器的包含 IP 地址的請求。
-      * 保存 5 年內已註冊使用者和與他們的貼文有關的 IP 地址。
-
-      <a name="cookies"></a>
-
-      ## [我們使用 Cookie 嗎？](#cookies)
-
-      是的。Cookie 是網站或它的服務商通過網頁瀏覽器存儲在你電腦硬碟上的小檔案（如果你同意）。這些 Cookie 使站點能分辨你的瀏覽器，並且，如果你註冊了一個賬戶，與你的註冊賬戶關聯。
-
-      我們使用 Cookie 為之後的訪問和編譯一小段關於站點流量和交互的數據來判斷並保存你的個人設置，這樣我們可以在之後提供更好的站點體驗和工具。我們可能使用第三方服務商來幫助我們更好地理解我們的站點訪客。這些服務商是不允許代表我們使用收集的信息，除非是在幫助我們執行和改進我們的站點。
-
-      <a name="disclose"></a>
-
-      ## [我們會在站外提供任何信息嗎？](#disclose)
-
-      我們絶不銷售、教育或任何向外轉移你個人信息的行為。這不包括幫助我們管理站點、改進站定或給你提供服務的第三方團體，這些團體需要保證對這些信息保密。當我們認為提交你的信息符合法律、我們的站點政策或保護我們或其他人的權利、知識產權或安全時，我們也可能提交你的信息。然而，非個人訪問信息可能供其他團體使用，用於市場、廣告或其他用途。
-
-      <a name="third-party"></a>
-
-      ## [第三方連結](#third-party)
-
-      偶爾地，根據我們的判斷，我們可能在我們的站點上包括或提供第三方團體的產品或服務。這些第三方站點用於獨立和不同的隱私政策。因此我們對連結到的站點或活動沒有責任和權利。儘管如此，我們尋求保護我們的整個站點冰鞋歡迎你給這些站點反饋。
-
-      <a name="coppa"></a>
-
-      ## [兒童在綫隱私保護法案合規](#coppa)
-
-      我們的站點、產品和服務提供給 13 歲以上的人們。如果伺服器位於美國，並且你小於 13 歲，根據[兒童在綫隱私保護法案合規](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)，不要使用這個站點。
-
-      <a name="online"></a>
-
-      ## [僅用於在綫隱私政策](#online)
-
-      這個線上隱私政策只適用於通過我們站點收集到的信息，並不包括線下收集的信息。
-
-      <a name="consent"></a>
-
-      ## [你的同意](#consent)
-
-      你使用站點的同時，代表你同意了我們網站的隱私政策。
-
-      <a name="changes"></a>
-
-      ## [隱私政策的更改](#changes)
-
-      如果我們決定更改我們的隱私政策，我們將在此頁更新這些改變。
-
-      文檔以 CC-BY-SA 發佈。最後更新時間為2013年5月31日。
   badges:
     editor:
       name: 編輯
@@ -3001,8 +2860,6 @@ zh_TW:
       message: "<p>我們已重發啟用信件至 <b>%{email}</b>"
   safe_mode:
     title: "進入安全模式"
-    no_unofficial_plugins: "停用非官方套件"
-    no_plugins: "停用所有套件"
     enter: "進入安全模式"
     must_select: "您必須至少選擇一個選項才能進入安全模式。"
   wizard:
@@ -3057,7 +2914,6 @@ zh_TW:
         title: "你的 Discourse 已經準備就緒！"
   search_logs:
     graph_title: "搜尋計數"
-  joined: "建立日期"
   discourse_push_notifications:
     popup:
       mentioned: '%{username}在"%{topic}"提及您 - %{site_title}'
@@ -3093,47 +2949,30 @@ zh_TW:
     conflict: "有一個更新衝突阻止您這樣做"
     actions:
       agree:
-        title: "同意..."
-      agree_and_keep:
-        title: "保留貼文"
-        description: "同意檢舉但不改變貼文"
+        title: "是"
       agree_and_suspend:
-        title: "將使用者停權"
         description: "同意檢舉並停權使用者"
       agree_and_silence:
-        title: "將使用者禁言"
+        title: "使用者靜音"
         description: "同意檢舉並禁止使用者發文"
       agree_and_restore:
-        title: "復原貼文"
         description: "將話題變更為對所有人顯示。"
-      agree_and_hide:
-        title: "隱藏貼文"
-        description: "隱藏此貼文並自動傳送訊息通知使用者重新編輯貼文內容。"
       delete_single:
         title: "刪除"
       delete:
         title: "刪除..."
-      delete_and_ignore:
-        title: "刪除貼文並忽略"
-        description: "刪除貼文，如果刪除的是話題的第一則貼文，討論話題也將一併刪除"
       delete_and_ignore_replies:
-        title: "刪除貼文及留言，並忽略"
-        description: "刪除貼文和其所有的留言；如果是第一個貼文，則刪除整個討論話題。"
         confirm: "您確定要刪除對該貼文的留言嗎？"
-      delete_and_agree:
-        title: "刪除貼文並同意"
-        description: "刪除貼文，如果刪除的是話題的第一則貼文，討論話題也將一併刪除"
       delete_and_agree_replies:
-        title: "刪除貼文及留言，並同意"
-        description: "刪除貼文和其所有的留言；如果刪除的是話題的第一則貼文，討論話題也將一併刪除"
         confirm: "您確定要刪除對該貼文的留言嗎？"
       disagree_and_restore:
-        title: "不同意及還原貼文"
         description: "將話題變更為對所有人顯示。"
       disagree:
-        title: "不同意"
+        title: "否"
       ignore:
         title: "忽略"
+      ignore_and_do_nothing:
+        title: "不做任何動作"
       approve:
         title: "批准"
       approve_post:
diff --git a/config/nginx.sample.conf b/config/nginx.sample.conf
index c1a327fb76d..98a4b2dbbcc 100644
--- a/config/nginx.sample.conf
+++ b/config/nginx.sample.conf
@@ -203,7 +203,7 @@ server {
           try_files $uri =404;
       }
       # this allows us to bypass rails
-      location ~* \.(gif|png|jpg|jpeg|bmp|tif|tiff|ico|webp)$ {
+      location ~* \.(gif|png|jpg|jpeg|bmp|tif|tiff|ico||avif)$ {
           add_header Access-Control-Allow-Origin *;
           try_files $uri =404;
       }
diff --git a/config/routes.rb b/config/routes.rb
index abdf514ef8d..68b641f10b6 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -28,13 +28,19 @@ Discourse::Application.routes.draw do
     get "/404-body" => "exceptions#not_found_body"
 
     get "/bootstrap" => "bootstrap#index"
+
     if Rails.env.test? || Rails.env.development?
       get "/bootstrap/plugin-css-for-tests.css" => "bootstrap#plugin_css_for_tests"
     end
 
+    # This is not a valid production route and is causing routing errors to be raised in
+    # the test env adding noise to the logs. Just handle it here so we eliminate the noise.
+    get "/favicon.ico", to: proc { [200, {}, [""]] } if Rails.env.test?
+
     post "webhooks/aws" => "webhooks#aws"
     post "webhooks/mailgun" => "webhooks#mailgun"
     post "webhooks/mailjet" => "webhooks#mailjet"
+    post "webhooks/mailpace" => "webhooks#mailpace"
     post "webhooks/mandrill" => "webhooks#mandrill"
     get "webhooks/mandrill" => "webhooks#mandrill_head"
     post "webhooks/postmark" => "webhooks#postmark"
@@ -59,7 +65,7 @@ Discourse::Application.routes.draw do
       end
     end
 
-    resources :about do
+    resources :about, only: [:index] do
       collection { get "live_post_counts" }
     end
 
@@ -75,7 +81,7 @@ Discourse::Application.routes.draw do
     delete "pub/by-topic/:topic_id" => "published_pages#destroy"
     get "pub/:slug" => "published_pages#show"
 
-    resources :directory_items
+    resources :directory_items, only: [:index]
 
     get "site" => "site#site"
     namespace :site do
@@ -91,7 +97,6 @@ Discourse::Application.routes.draw do
     get "srv/status" => "forums#status"
 
     get "wizard" => "wizard#index"
-    get "wizard/steps" => "steps#index"
     get "wizard/steps/:id" => "wizard#index"
     put "wizard/steps/:id" => "steps#update"
 
@@ -100,7 +105,7 @@ Discourse::Application.routes.draw do
 
       get "plugins" => "plugins#index"
 
-      resources :site_settings, constraints: AdminConstraint.new do
+      resources :site_settings, only: %i[index update], constraints: AdminConstraint.new do
         collection { get "category/:id" => "site_settings#index" }
 
         put "user_count" => "site_settings#user_count"
@@ -112,19 +117,15 @@ Discourse::Application.routes.draw do
 
       resources :groups, only: [:create] do
         member do
-          put "owners" => "groups#add_owners"
           delete "owners" => "groups#remove_owner"
           put "primary" => "groups#set_primary"
         end
       end
-      resources :groups, except: [:create], constraints: AdminConstraint.new do
+      resources :groups, only: [:destroy], constraints: AdminConstraint.new do
         collection { put "automatic_membership_count" => "groups#automatic_membership_count" }
       end
 
-      get "groups/:type" => "groups#show", :constraints => AdminConstraint.new
-      get "groups/:type/:id" => "groups#show", :constraints => AdminConstraint.new
-
-      resources :users, id: RouteFormat.username, except: [:show] do
+      resources :users, id: RouteFormat.username, only: %i[index destroy] do
         collection do
           get "list" => "users#index"
           get "list/:query" => "users#index"
@@ -157,7 +158,7 @@ Discourse::Application.routes.draw do
         get "tl3_requirements"
         put "anonymize"
         post "merge"
-        post "reset_bounce_score"
+        post "reset-bounce-score"
         put "disable_second_factor"
         delete "sso_record"
       end
@@ -172,9 +173,9 @@ Discourse::Application.routes.draw do
 
       post "users/sync_sso" => "users#sync_sso", :constraints => AdminConstraint.new
 
-      resources :impersonate, constraints: AdminConstraint.new
+      resources :impersonate, only: %i[index create], constraints: AdminConstraint.new
 
-      resources :email, constraints: AdminConstraint.new do
+      resources :email, only: [:index], constraints: AdminConstraint.new do
         collection do
           post "test"
           get "sent"
@@ -182,7 +183,6 @@ Discourse::Application.routes.draw do
           get "bounced"
           get "received"
           get "rejected"
-          get "/incoming/:id/raw" => "email#raw_email"
           get "/incoming/:id" => "email#incoming"
           get "/incoming_from_bounced/:id" => "email#incoming_from_bounced"
           get "preview-digest" => "email#preview_digest"
@@ -219,7 +219,9 @@ Discourse::Application.routes.draw do
       get "customize/embedding" => "embedding#show", :constraints => AdminConstraint.new
       put "customize/embedding" => "embedding#update", :constraints => AdminConstraint.new
 
-      resources :themes, constraints: AdminConstraint.new do
+      resources :themes,
+                only: %i[index create show update destroy],
+                constraints: AdminConstraint.new do
         member do
           get "preview" => "themes#preview"
           put "setting" => "themes#update_single_setting"
@@ -232,8 +234,13 @@ Discourse::Application.routes.draw do
       end
 
       scope "/customize", constraints: AdminConstraint.new do
-        resources :user_fields, constraints: AdminConstraint.new
-        resources :emojis, constraints: AdminConstraint.new
+        resources :user_fields,
+                  only: %i[index create update destroy],
+                  constraints: AdminConstraint.new
+        resources :emojis, only: %i[index create destroy], constraints: AdminConstraint.new
+        resources :form_templates, constraints: AdminConstraint.new, path: "/form-templates" do
+          collection { get "preview" => "form_templates#preview" }
+        end
 
         get "themes/:id/:target/:field_name/edit" => "themes#index"
         get "themes/:id" => "themes#index"
@@ -250,6 +257,14 @@ Discourse::Application.routes.draw do
                  id: /[\w.\-\+\%\&]+/i,
                }
         delete "site_texts/:id" => "site_texts#revert", :constraints => { id: /[\w.\-\+\%\&]+/i }
+        put "site_texts/:id/dismiss_outdated" => "site_texts#dismiss_outdated",
+            :constraints => {
+              id: /[\w.\-\+\%\&]+/i,
+            }
+        put "site_texts/:id/dismiss_outdated.json" => "site_texts#dismiss_outdated",
+            :constraints => {
+              id: /[\w.\-\+\%\&]+/i,
+            }
 
         get "reseed" => "site_texts#get_reseed_options"
         post "reseed" => "site_texts#reseed"
@@ -273,12 +288,14 @@ Discourse::Application.routes.draw do
         get "email_style/:field" => "email_styles#show", :constraints => { field: /html|css/ }
       end
 
-      resources :embeddable_hosts, constraints: AdminConstraint.new
-      resources :color_schemes, constraints: AdminConstraint.new
-      resources :permalinks, constraints: AdminConstraint.new
+      resources :embeddable_hosts, only: %i[create update destroy], constraints: AdminConstraint.new
+      resources :color_schemes,
+                only: %i[index create update destroy],
+                constraints: AdminConstraint.new
+      resources :permalinks, only: %i[index create destroy], constraints: AdminConstraint.new
 
       scope "/customize" do
-        resources :watched_words, only: %i[index create update destroy] do
+        resources :watched_words, only: %i[index create destroy] do
           collection do
             get "action/:id" => "watched_words#index"
             get "action/:id/download" => "watched_words#download"
@@ -313,7 +330,7 @@ Discourse::Application.routes.draw do
             end
           end
 
-          resources :web_hooks
+          resources :web_hooks, only: %i[index create show edit update destroy]
           get "web_hook_events/:id" => "web_hooks#list_events", :as => :web_hook_events
           get "web_hooks/:id/events/bulk" => "web_hooks#bulk_events"
           post "web_hooks/:web_hook_id/events/:event_id/redeliver" => "web_hooks#redeliver_event"
@@ -347,7 +364,9 @@ Discourse::Application.routes.draw do
         end
       end
 
-      resources :badges, constraints: AdminConstraint.new do
+      resources :badges,
+                only: %i[index new show create update destroy],
+                constraints: AdminConstraint.new do
         collection do
           get "/award/:badge_id" => "badges#award"
           post "/award/:badge_id" => "badges#mass_award"
@@ -392,7 +411,7 @@ Discourse::Application.routes.draw do
              reviewable_id: /\d+/,
            }
 
-    resources :reviewable_claimed_topics
+    resources :reviewable_claimed_topics, only: %i[create destroy]
 
     get "session/sso" => "session#sso"
     get "session/sso_login" => "session#sso_login"
@@ -414,18 +433,17 @@ Discourse::Application.routes.draw do
     get "composer_messages" => "composer_messages#index"
     get "composer_messages/user_not_seen_in_a_while" => "composer_messages#user_not_seen_in_a_while"
 
-    resources :static
     post "login" => "static#enter"
-    get "login" => "static#show", :id => "login"
-    get "password-reset" => "static#show", :id => "password_reset"
-    get "faq" => "static#show", :id => "faq"
-    get "tos" => "static#show", :id => "tos", :as => "tos"
-    get "privacy" => "static#show", :id => "privacy", :as => "privacy"
-    get "signup" => "static#show", :id => "signup"
-    get "login-preferences" => "static#show", :id => "login"
 
-    %w[guidelines rules conduct].each do |faq_alias|
-      get faq_alias => "static#show", :id => "guidelines", :as => faq_alias
+    get "login" => "static#show", :id => "login"
+    get "login-preferences" => "static#show", :id => "login"
+    get "signup" => "static#show", :id => "signup"
+    get "password-reset" => "static#show", :id => "password_reset"
+    get "privacy" => "static#show", :id => "privacy", :as => "privacy"
+    get "tos" => "static#show", :id => "tos", :as => "tos"
+    get "faq" => "static#show", :id => "faq"
+    %w[guidelines rules conduct].each do |guidelines_alias|
+      get guidelines_alias => "static#show", :id => "guidelines", :as => guidelines_alias
     end
 
     get "my/*path", to: "users#my_redirect"
@@ -440,7 +458,7 @@ Discourse::Application.routes.draw do
     %w[users u].each_with_index do |root_path, index|
       get "#{root_path}" => "users#index", :constraints => { format: "html" }
 
-      resources :users, except: %i[index new show update destroy], path: root_path do
+      resources :users, only: %i[create], path: root_path do
         collection do
           get "check_username"
           get "check_email"
@@ -520,29 +538,28 @@ Discourse::Application.routes.draw do
            :constraints => {
              token: /[0-9a-f]+/,
            }
-      get "#{root_path}/:username/private-messages" => "user_actions#private_messages",
+      get "#{root_path}/:username/private-messages" => "users#show",
           :constraints => {
             username: RouteFormat.username,
           }
-      get "#{root_path}/:username/private-messages/:filter" => "user_actions#private_messages",
+      get "#{root_path}/:username/private-messages/:filter" => "users#show",
           :constraints => {
             username: RouteFormat.username,
           }
-      get "#{root_path}/:username/messages" => "user_actions#private_messages",
+      get "#{root_path}/:username/messages" => "users#show",
           :constraints => {
             username: RouteFormat.username,
           }
-      get "#{root_path}/:username/messages/:filter" => "user_actions#private_messages",
+      get "#{root_path}/:username/messages/:filter" => "users#show",
           :constraints => {
             username: RouteFormat.username,
           }
-      get "#{root_path}/:username/messages/group/:group_name" => "user_actions#private_messages",
+      get "#{root_path}/:username/messages/group/:group_name" => "users#show",
           :constraints => {
             username: RouteFormat.username,
             group_name: RouteFormat.username,
           }
-      get "#{root_path}/:username/messages/group/:group_name/:filter" =>
-            "user_actions#private_messages",
+      get "#{root_path}/:username/messages/group/:group_name/:filter" => "users#show",
           :constraints => {
             username: RouteFormat.username,
             group_name: RouteFormat.username,
@@ -642,7 +659,7 @@ Discourse::Application.routes.draw do
           :constraints => {
             username: RouteFormat.username,
           }
-      get "#{root_path}/:username/preferences/sidebar" => "users#preferences",
+      get "#{root_path}/:username/preferences/navigation-menu" => "users#preferences",
           :constraints => {
             username: RouteFormat.username,
           }
@@ -678,10 +695,6 @@ Discourse::Application.routes.draw do
           :constraints => {
             username: RouteFormat.username,
           }
-      get "#{root_path}/:username/preferences/second-factor-backup" => "users#preferences",
-          :constraints => {
-            username: RouteFormat.username,
-          }
       delete "#{root_path}/:username/preferences/user_image" => "users#destroy_user_image",
              :constraints => {
                username: RouteFormat.username,
@@ -789,10 +802,6 @@ Discourse::Application.routes.draw do
           :constraints => {
             external_id: %r{[^/]+},
           }
-      get "#{root_path}/:username/flagged-posts" => "users#show",
-          :constraints => {
-            username: RouteFormat.username,
-          }
       get "#{root_path}/:username/deleted-posts" => "users#show",
           :constraints => {
             username: RouteFormat.username,
@@ -1002,24 +1011,22 @@ Discourse::Application.routes.draw do
         :constraints => {
           username: RouteFormat.username,
         }
-    get "posts/:username/flagged" => "posts#flagged_posts",
-        :constraints => {
-          username: RouteFormat.username,
-        }
     get "posts/:username/pending" => "posts#pending",
         :constraints => {
           username: RouteFormat.username,
         }
 
     %w[groups g].each do |root_path|
-      resources :groups, id: RouteFormat.username, path: root_path do
+      resources :groups,
+                only: %i[index show new edit update],
+                id: RouteFormat.username,
+                path: root_path do
         get "posts.rss" => "groups#posts_feed", :format => :rss
         get "mentions.rss" => "groups#mentions_feed", :format => :rss
 
         get "members"
         get "posts"
         get "mentions"
-        get "counts"
         get "mentionable"
         get "messageable"
         get "logs" => "groups#histories"
@@ -1052,6 +1059,7 @@ Discourse::Application.routes.draw do
 
           get "permissions" => "groups#permissions"
           put "members" => "groups#add_members"
+          put "owners" => "groups#add_owners"
           put "join" => "groups#join"
           delete "members" => "groups#remove_member"
           delete "leave" => "groups#leave"
@@ -1064,11 +1072,13 @@ Discourse::Application.routes.draw do
 
     resources :associated_groups, only: %i[index], constraints: AdminConstraint.new
 
+    post "slugs", to: "slugs#generate"
+
     # aliases so old API code works
     delete "admin/groups/:id/members" => "groups#remove_member", :constraints => AdminConstraint.new
     put "admin/groups/:id/members" => "groups#add_members", :constraints => AdminConstraint.new
 
-    resources :posts do
+    resources :posts, only: %i[show update create destroy] do
       delete "bookmark", to: "posts#destroy_bookmark"
       put "wiki"
       put "post_type"
@@ -1082,6 +1092,7 @@ Discourse::Application.routes.draw do
       put "revisions/:revision/hide" => "posts#hide_revision", :constraints => { revision: /\d+/ }
       put "revisions/:revision/show" => "posts#show_revision", :constraints => { revision: /\d+/ }
       put "revisions/:revision/revert" => "posts#revert", :constraints => { revision: /\d+/ }
+      delete "revisions/permanently_delete" => "posts#permanently_delete_revisions"
       put "recover"
       collection do
         delete "destroy_many"
@@ -1093,7 +1104,7 @@ Discourse::Application.routes.draw do
       put "toggle_pin"
     end
 
-    resources :notifications, except: :show do
+    resources :notifications, only: %i[index create update destroy] do
       collection do
         put "mark-read" => "notifications#mark_read"
         # creating an alias cause the api was extended to mark a single notification
@@ -1116,21 +1127,12 @@ Discourse::Application.routes.draw do
            token: /\h{32}/,
          }
 
-    resources :clicks do
-      collection { post "track" }
-    end
+    post "/clicks/track" => "clicks#track", :as => "track_clicks"
 
-    get "excerpt" => "excerpt#show"
-
-    resources :post_action_users
+    resources :post_action_users, only: %i[index]
     resources :post_readers, only: %i[index]
-    resources :post_actions do
-      collection do
-        get "users"
-        post "defer_flags"
-      end
-    end
-    resources :user_actions
+    resources :post_actions, only: %i[create destroy]
+    resources :user_actions, only: %i[index show]
 
     resources :badges, only: [:index]
     get "/badges/:id(/:slug)" => "badges#show", :constraints => { format: /(json|html|rss)/ }
@@ -1195,12 +1197,13 @@ Discourse::Application.routes.draw do
       get "top/#{period}", to: redirect("top?period=#{period}", status: 301)
     end
 
-    Discourse.anonymous_filters.each do |filter|
-      get "#{filter}.rss" => "list##{filter}_feed", :format => :rss
-    end
+    get "latest.rss" => "list#latest_feed", :format => :rss
+    get "top.rss" => "list#top_feed", :format => :rss
 
     Discourse.filters.each { |filter| get "#{filter}" => "list##{filter}" }
 
+    get "filter" => "list#filter"
+
     get "search/query" => "search#query"
     get "search" => "search#show"
     post "search/click" => "search#click"
@@ -1221,7 +1224,7 @@ Discourse::Application.routes.draw do
     post "topics/timings"
 
     get "topics/similar_to" => "similar_topics#index"
-    resources :similar_topics
+    resources :similar_topics, only: [:index]
 
     get "topics/feature_stats"
 
@@ -1305,10 +1308,7 @@ Discourse::Application.routes.draw do
         }
     get "t/:slug/:topic_id/wordpress" => "topics#wordpress", :constraints => { topic_id: /\d+/ }
     get "t/:topic_id/wordpress" => "topics#wordpress", :constraints => { topic_id: /\d+/ }
-    get "t/:slug/:topic_id/moderator-liked" => "topics#moderator_liked",
-        :constraints => {
-          topic_id: /\d+/,
-        }
+
     get "t/:slug/:topic_id/summary" => "topics#show",
         :defaults => {
           summary: true,
@@ -1317,9 +1317,12 @@ Discourse::Application.routes.draw do
           topic_id: /\d+/,
         }
     get "t/:topic_id/summary" => "topics#show", :constraints => { topic_id: /\d+/ }
+    get "t/:topic_id/strategy-summary" => "topics#summary",
+        :constraints => {
+          topic_id: /\d+/,
+        },
+        :format => :json
     put "t/:slug/:topic_id" => "topics#update", :constraints => { topic_id: /\d+/ }
-    put "t/:slug/:topic_id/star" => "topics#star", :constraints => { topic_id: /\d+/ }
-    put "t/:topic_id/star" => "topics#star", :constraints => { topic_id: /\d+/ }
     put "t/:slug/:topic_id/status" => "topics#status", :constraints => { topic_id: /\d+/ }
     put "t/:topic_id/status" => "topics#status", :constraints => { topic_id: /\d+/ }
     put "t/:topic_id/clear-pin" => "topics#clear_pin", :constraints => { topic_id: /\d+/ }
@@ -1409,9 +1412,8 @@ Discourse::Application.routes.draw do
     get "/posts/:id/raw-email" => "posts#raw_email"
     get "raw/:topic_id(/:post_number)" => "posts#markdown_num"
 
-    resources :invites, except: [:show]
+    resources :invites, only: %i[create update destroy]
     get "/invites/:id" => "invites#show", :constraints => { format: :html }
-    put "/invites/:id" => "invites#update"
 
     post "invites/upload_csv" => "invites#upload_csv"
     post "invites/destroy-all-expired" => "invites#destroy_all_expired"
@@ -1421,9 +1423,8 @@ Discourse::Application.routes.draw do
     put "invites/show/:id" => "invites#perform_accept_invitation", :as => "perform_accept_invite"
     get "invites/retrieve" => "invites#retrieve"
 
-    resources :export_csv do
-      collection { post "export_entity" => "export_csv#export_entity" }
-    end
+    post "/export_csv/export_entity" => "export_csv#export_entity",
+         :as => "export_entity_export_csv_index"
 
     get "onebox" => "onebox#show"
     get "inline-onebox" => "inline_onebox#show"
@@ -1491,6 +1492,7 @@ Discourse::Application.routes.draw do
       get "/" => "tags#index"
       get "/filter/list" => "tags#index"
       get "/filter/search" => "tags#search"
+      get "/list" => "tags#list"
       get "/personal_messages/:username" => "tags#personal_messages",
           :constraints => {
             username: RouteFormat.username,
@@ -1585,6 +1587,13 @@ Discourse::Application.routes.draw do
     put "user-status" => "user_status#set"
     delete "user-status" => "user_status#clear"
 
+    resources :sidebar_sections, only: %i[index create update destroy]
+    post "/sidebar_sections/reorder" => "sidebar_sections#reorder"
+    put "/sidebar_sections/reset/:id" => "sidebar_sections#reset"
+
     get "*url", to: "permalinks#show", constraints: PermalinkConstraint.new
+
+    get "/form-templates/:id" => "form_templates#show"
+    get "/form-templates" => "form_templates#index"
   end
 end
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 8268a3537bc..3196e8a10bd 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -150,7 +150,7 @@ basic:
     max: 36500
   ga_version:
     type: enum
-    default: v3_analytics
+    default: v4_gtag
     choices:
       - v3_analytics
       - v4_gtag
@@ -301,6 +301,7 @@ basic:
     default: 50
     min: 1
   top_page_default_timeframe:
+    client: true
     default: "yearly"
     type: enum
     choices:
@@ -335,6 +336,12 @@ basic:
     default: ""
     allow_any: false
     refresh: true
+  hidden_post_visible_groups:
+    type: group_list
+    list_type: compact
+    default: "14"
+    allow_any: false
+    refresh: true
   enable_bookmarks_with_reminders:
     client: true
     default: true
@@ -384,14 +391,21 @@ basic:
     default: false
   enable_user_tips:
     client: true
-    default: false
+    default: true
+    refresh: true
+  page_loading_indicator:
+    client: true
+    type: enum
+    default: "slider"
+    choices:
+      - spinner
+      - slider
 
 login:
   invite_only:
     refresh: true
     client: true
     default: false
-    validator: "EnableInviteOnlyValidator"
   login_required:
     refresh: true
     client: true
@@ -491,7 +505,10 @@ login:
     client: true
     default: false
     validator: "EnableSsoValidator"
-  discourse_connect_allows_all_return_paths: false
+  discourse_connect_allowed_redirect_domains:
+    default: ""
+    type: list
+    list_type: simple
   verbose_discourse_connect_logging: false
   verbose_upload_logging:
     hidden: true
@@ -654,6 +671,9 @@ users:
   allow_anonymous_posting:
     default: false
     client: true
+  allow_anonymous_likes:
+    default: false
+    client: true
   anonymous_posting_min_trust_level:
     default: 1
     enum: "TrustLevelSetting"
@@ -828,10 +848,6 @@ posting:
       ja: 4
       zh_CN: 4
       zh_TW: 4
-  enable_personal_messages:
-    default: true
-    client: true
-    hidden: true
   enable_system_message_replies:
     default: true
   personal_message_enabled_groups:
@@ -955,6 +971,9 @@ posting:
       ja: 120
       zh_CN: 120
       zh_TW: 120
+  default_subcategory_on_read_only_category:
+    client: true
+    default: false
   show_pinned_excerpt_mobile:
     client: true
     default: true
@@ -1012,6 +1031,11 @@ posting:
       zh_TW: true
       ja: true
       ko: true
+  emoji_deny_list:
+    type: emoji_list
+    default: ""
+    client: true
+    refresh: true
   approve_post_count:
     default: 0
   approve_unless_trust_level:
@@ -1027,6 +1051,7 @@ posting:
   notify_about_queued_posts_after:
     type: float
     default: 24
+    min: 0
   auto_close_messages_post_count:
     default: 500
   auto_close_topics_post_count:
@@ -1093,6 +1118,13 @@ posting:
   max_draft_length:
     default: 400_000
     hidden: true
+  max_form_template_title_length:
+    default: 100
+    min: 5
+    max: 255
+  max_form_template_content_length:
+    default: 2000
+    max: 150000
 
 email:
   email_time_window_mins:
@@ -1249,6 +1281,21 @@ email:
     default: ""
     regex: '^((key-)?\h{32}|\h{32}-\h{8}-\h{8})$'
     secret: true
+  sendgrid_verification_key:
+    default: ""
+    secret: true
+  mailjet_webhook_token:
+    default: ""
+    secret: true
+  mandrill_authentication_key:
+    default: ""
+    secret: true
+  postmark_webhook_token:
+    default: ""
+    secret: true
+  sparkpost_webhook_token:
+    default: ""
+    secret: true
   bounce_score_threshold:
     client: true
     default: 4
@@ -1328,12 +1375,12 @@ files:
     default: 50000
     max: 1024000
   theme_authorized_extensions:
-    default: "wasm|jpg|jpeg|png|woff|woff2|svg|eot|ttf|otf|gif|webp|js"
+    default: "wasm|jpg|jpeg|png|woff|woff2|svg|eot|ttf|otf|gif|webp|avif|js"
     type: list
     list_type: compact
   authorized_extensions:
     client: true
-    default: "jpg|jpeg|png|gif|heic|heif|webp"
+    default: "jpg|jpeg|png|gif|heic|heif|webp|avif"
     refresh: true
     type: list
     list_type: compact
@@ -1380,18 +1427,6 @@ files:
   prevent_anons_from_downloading_files:
     default: false
     client: true
-  secure_media:
-    default: false
-    client: true
-    hidden: true
-  secure_media_allow_embed_images_in_emails:
-    default: true
-    hidden: true
-  secure_media_max_email_embed_image_size_kb:
-    default: 1024
-    min: 1
-    max: 10240
-    hidden: true
   secure_uploads:
     default: false
     client: true
@@ -1430,8 +1465,12 @@ files:
   s3_cdn_url:
     default: ""
     regex: '^https?:\/\/.+[^\/]$'
+  s3_use_cdn_url_for_all_uploads:
+    default: false
   s3_configure_tombstone_policy:
     default: true
+  s3_use_acls:
+    default: true
   enable_s3_inventory:
     default: false
   s3_configure_inventory_policy:
@@ -1455,9 +1494,10 @@ files:
     type: url_list
     client: true
   avatar_sizes:
-    default: "20|25|32|45|60|120"
+    default: "24|48|72|96|144|288"
     type: list
     list_type: compact
+    client: true
   external_system_avatars_enabled:
     default: true
     client: true
@@ -1556,6 +1596,10 @@ files:
     default: false
     client: true
     hidden: true
+  video_thumbnails_enabled:
+    default: true
+    client: true
+    hidden: true
 
 trust:
   default_trust_level:
@@ -1576,10 +1620,6 @@ trust:
   min_trust_to_allow_self_wiki:
     default: 3
     enum: "TrustLevelSetting"
-  min_trust_to_send_messages:
-    default: 1
-    enum: "TrustLevelSetting"
-    hidden: true
   min_trust_to_send_email_messages:
     default: "4"
     enum: "TrustLevelAndStaffSetting"
@@ -1660,8 +1700,15 @@ trust:
   tl3_links_no_follow:
     default: false
     client: true
-  trusted_users_can_edit_others:
-    default: true
+  tl4_delete_posts_and_topics:
+    default: false
+    client: true
+  edit_all_topic_groups:
+    default: "13"
+    type: group_list
+  edit_all_post_groups:
+    default: "14"
+    type: group_list
 
 security:
   detailed_404: false
@@ -1689,7 +1736,9 @@ security:
   allow_indexing_non_canonical_urls:
     default: true
     hidden: true
-  moderators_manage_categories_and_groups: false
+  moderators_manage_categories_and_groups:
+    default: false
+    client: true
   moderators_change_post_ownership:
     client: true
     default: false
@@ -1949,6 +1998,7 @@ rate_limits:
   max_prints_per_hour_per_user:
     default: 5
     client: true
+    min: 0
   max_logins_per_ip_per_hour:
     min: 1
     default: 30
@@ -1974,9 +2024,19 @@ rate_limits:
   max_allowed_secondary_emails:
     default: 10
     hidden: true
+    client: true
   max_batch_presign_multipart_per_minute:
     default: 20
     hidden: true
+  max_presigned_put_per_minute:
+    default: 10
+    hidden: true
+  max_create_multipart_per_minute:
+    default: 10
+    hidden: true
+  max_complete_multipart_per_minute:
+    default: 10
+    hidden: true
 
 developer:
   force_hostname:
@@ -2054,27 +2114,40 @@ developer:
   enable_experimental_hashtag_autocomplete:
     default: true
     client: true
+    hidden: true
   experimental_hashtag_search_result_limit:
     default: 20
     client: true
     hidden: true
-  enable_new_user_profile_nav_groups:
-    client: true
-    type: group_list
-    list_type: compact
-    default: ""
-    allow_any: false
-    refresh: true
   include_associated_account_ids:
     default: false
     hidden: true
-  enable_experimental_topic_timeline_groups:
+  experimental_form_templates:
+    client: true
+    default: false
+    hidden: true
+  experimental_new_new_view_groups:
     client: true
     type: group_list
     list_type: compact
     default: ""
     allow_any: false
     refresh: true
+  enable_experimental_lightbox:
+    default: false
+    client: true
+  experimental_topics_filter:
+    client: true
+    default: false
+  experimental_search_menu_groups:
+    type: group_list
+    list_type: compact
+    default: ""
+    allow_any: false
+    refresh: true
+  max_sidebar_section_links:
+    default: 50
+    hidden: true
 
 navigation:
   navigation_menu:
@@ -2082,21 +2155,21 @@ navigation:
     default: "sidebar"
     type: enum
     enum: "NavigationMenuSiteSetting"
-  default_sidebar_categories:
+  default_navigation_menu_categories:
     type: category_list
     default: ""
     client: true
-  default_sidebar_tags:
+  default_navigation_menu_tags:
     type: tag_list
     default: ""
     client: true
-  default_sidebar_list_destination:
-    hidden: true
-    default: "default"
-    type: "list"
+  default_sidebar_switch_panel_position:
+    default: "bottom"
+    type: enum
+    client: true
     choices:
-      - "default"
-      - "unread_new"
+      - "top"
+      - "bottom"
 
 embedding:
   embed_by_username:
@@ -2173,6 +2246,15 @@ backups:
     client: true
 
 search:
+  user_search_similar_results:
+    default: false
+    hidden: true
+  prioritize_exact_search_title_match:
+    default: true
+    hidden: true
+  max_duplicate_search_index_terms:
+    default: 6
+    hidden: true
   use_pg_headlines_for_excerpt:
     default: false
     hidden: true
@@ -2183,6 +2265,10 @@ search:
   search_ranking_normalization:
     default: "0"
     hidden: true
+  search_ranking_weights:
+    default: ""
+    hidden: true
+    validator: "SearchRankingWeightsValidator"
   min_search_term_length:
     client: true
     default: 3
@@ -2240,6 +2326,9 @@ search:
     default: 1.2
     hidden: true
     validator: "CategorySearchPriorityWeightsValidator"
+  search_page_size:
+    default: 50
+    hidden: true
 
 uncategorized:
   version_checks:
@@ -2289,6 +2378,17 @@ uncategorized:
     client: true
     default: false
 
+  summarization_strategy:
+    client: true
+    default: ""
+    enum: "SummarizationStrategy"
+    validator: "SummarizationValidator"
+  custom_summarization_allowed_groups:
+    client: true
+    type: group_list
+    list_type: compact
+    default: "3|13" # 3: @staff, 13: @trust_level_3
+
   automatic_topic_heat_values: true
 
   # View heat thresholds
@@ -2342,6 +2442,7 @@ uncategorized:
   educate_until_posts: 2
   sequential_replies_threshold: 2
   get_a_room_threshold: 3
+  dont_feed_the_trolls_threshold: 2
   dominating_topic_minimum_percent: 40
   disable_avatar_education_message: false
   pm_warn_user_last_seen_months_ago: 24
@@ -2379,14 +2480,10 @@ uncategorized:
     default: ""
     validator: "DefaultComposerCategoryValidator"
 
-  notify_about_flags_after:
+  notify_about_reviewable_item_after:
     type: float
     default: 48
 
-  show_create_topics_notice:
-    client: true
-    default: true
-
   enable_system_avatars:
     hidden: true
     default: true
@@ -2425,6 +2522,11 @@ uncategorized:
     default: 0
     hidden: true
 
+  view_user_route:
+    default: "summary"
+    hidden: true
+    client: true
+
   tos_topic_id:
     default: -1
     hidden: true
@@ -2437,10 +2539,10 @@ uncategorized:
   welcome_topic_id:
     default: -1
     hidden: true
-    client: true
   admin_quick_start_topic_id:
     default: -1
     hidden: true
+    client: true
 
   bootstrap_mode_min_users:
     default: 50
@@ -2531,6 +2633,7 @@ uncategorized:
   show_category_definitions_in_topic_lists:
     default: false
     hidden: true
+    client: true
 
   create_revision_on_bulk_topic_moves:
     default: true
@@ -2644,6 +2747,12 @@ user_preferences:
     choices:
       - notifications
       - contextual
+  enable_offline_indicator:
+    default: false
+    client: true
+  default_sidebar_link_to_filtered_list: false
+  default_sidebar_show_count_of_new_items: false
+
 api:
   retain_web_hook_events_period_days:
     default: 30
@@ -2672,6 +2781,7 @@ user_api:
   allowed_user_api_push_urls:
     default: ""
     type: list
+    hidden: true
   allowed_user_api_auth_redirects:
     default: "https://api.discourse.org/api/auth_redirect|discourse://auth_redirect"
     type: list
@@ -2696,6 +2806,13 @@ tags:
   max_tags_per_topic:
     default: 5
     client: true
+  enable_max_tags_per_email_subject:
+    default: false
+    client: true
+  max_tags_per_email_subject:
+    default: 5
+    client: true
+    min: 0
   max_tag_length:
     default: 20
     client: true
@@ -2737,9 +2854,15 @@ tags:
     type: enum
     default: always
     enum: RemoveMutedTagsFromLatestSiteSetting
+  watched_precedence_over_muted:
+    client: true
+    default: false
+
   force_lowercase_tags:
     default: true
     client: true
+  create_post_for_category_and_tag_changes:
+    default: false
 
 dashboard:
   dashboard_hidden_reports:
diff --git a/config/unicorn.conf.rb b/config/unicorn.conf.rb
index 2e0b22f48f4..68bb4e2efa5 100644
--- a/config/unicorn.conf.rb
+++ b/config/unicorn.conf.rb
@@ -16,8 +16,9 @@ worker_processes (ENV["UNICORN_WORKERS"] || 3).to_i
 working_directory discourse_path
 
 # listen "#{discourse_path}/tmp/sockets/unicorn.sock"
-listen ENV["UNICORN_LISTENER"] ||
-         "#{(ENV["UNICORN_BIND_ALL"] ? "" : "127.0.0.1:")}#{(ENV["UNICORN_PORT"] || 3000).to_i}"
+
+# stree-ignore
+listen ENV["UNICORN_LISTENER"] || "#{(ENV["UNICORN_BIND_ALL"] ? "" : "127.0.0.1:")}#{(ENV["UNICORN_PORT"] || 3000).to_i}"
 
 FileUtils.mkdir_p("#{discourse_path}/tmp/pids") if !File.exist?("#{discourse_path}/tmp/pids")
 
diff --git a/db/fixtures/006_badges.rb b/db/fixtures/006_badges.rb
index 1642abe64a4..a9647d9492b 100644
--- a/db/fixtures/006_badges.rb
+++ b/db/fixtures/006_badges.rb
@@ -66,6 +66,7 @@ end
 Badge.seed do |b|
   b.id = Badge::Reader
   b.name = "Reader"
+  b.default_icon = "book-reader"
   b.badge_type_id = BadgeType::Bronze
   b.multiple_grant = false
   b.target_posts = false
@@ -79,6 +80,7 @@ end
 Badge.seed do |b|
   b.id = Badge::ReadGuidelines
   b.name = "Read Guidelines"
+  b.default_icon = "file-alt"
   b.badge_type_id = BadgeType::Bronze
   b.multiple_grant = false
   b.target_posts = false
@@ -92,6 +94,7 @@ end
 Badge.seed do |b|
   b.id = Badge::FirstLink
   b.name = "First Link"
+  b.default_icon = "link"
   b.badge_type_id = BadgeType::Bronze
   b.multiple_grant = false
   b.target_posts = true
@@ -105,6 +108,7 @@ end
 Badge.seed do |b|
   b.id = Badge::FirstQuote
   b.name = "First Quote"
+  b.default_icon = "quote-right"
   b.badge_type_id = BadgeType::Bronze
   b.multiple_grant = false
   b.target_posts = true
@@ -118,6 +122,7 @@ end
 Badge.seed do |b|
   b.id = Badge::FirstLike
   b.name = "First Like"
+  b.default_icon = "heart"
   b.badge_type_id = BadgeType::Bronze
   b.multiple_grant = false
   b.target_posts = true
@@ -131,6 +136,7 @@ end
 Badge.seed do |b|
   b.id = Badge::FirstFlag
   b.name = "First Flag"
+  b.default_icon = "flag"
   b.badge_type_id = BadgeType::Bronze
   b.multiple_grant = false
   b.target_posts = true
@@ -167,6 +173,7 @@ end
 Badge.seed do |b|
   b.id = Badge::FirstShare
   b.name = "First Share"
+  b.default_icon = "share-alt"
   b.badge_type_id = BadgeType::Bronze
   b.multiple_grant = false
   b.target_posts = true
@@ -186,6 +193,7 @@ end
   Badge.seed do |b|
     b.id = id
     b.name = name
+    b.default_icon = "share-alt"
     b.badge_type_id = level
     b.multiple_grant = true
     b.target_posts = true
@@ -201,6 +209,7 @@ end
 Badge.seed do |b|
   b.id = Badge::Welcome
   b.name = "Welcome"
+  b.default_icon = "heart"
   b.badge_type_id = BadgeType::Bronze
   b.multiple_grant = false
   b.target_posts = true
@@ -214,6 +223,7 @@ end
 Badge.seed do |b|
   b.id = Badge::Autobiographer
   b.name = "Autobiographer"
+  b.default_icon = "user-edit"
   b.badge_type_id = BadgeType::Bronze
   b.multiple_grant = false
   b.query = BadgeQueries::Autobiographer
@@ -225,6 +235,7 @@ end
 Badge.seed do |b|
   b.id = Badge::Editor
   b.name = "Editor"
+  b.default_icon = "pen"
   b.badge_type_id = BadgeType::Bronze
   b.multiple_grant = false
   b.query = BadgeQueries::Editor
@@ -236,6 +247,7 @@ end
 Badge.seed do |b|
   b.id = Badge::WikiEditor
   b.name = "Wiki Editor"
+  b.default_icon = "far-edit"
   b.badge_type_id = BadgeType::Bronze
   b.multiple_grant = false
   b.target_posts = true
@@ -249,6 +261,23 @@ end
   [Badge::NicePost, "Nice Post", BadgeType::Bronze, false],
   [Badge::GoodPost, "Good Post", BadgeType::Silver, false],
   [Badge::GreatPost, "Great Post", BadgeType::Gold, false],
+].each do |id, name, type, topic|
+  Badge.seed do |b|
+    b.id = id
+    b.name = name
+    b.default_icon = "reply"
+    b.badge_type_id = type
+    b.multiple_grant = true
+    b.target_posts = true
+    b.show_posts = true
+    b.query = BadgeQueries.like_badge(Badge.like_badge_counts[id], topic)
+    b.default_badge_grouping_id = BadgeGrouping::Posting
+    b.trigger = Badge::Trigger::PostAction
+    b.system = true
+  end
+end
+
+[
   [Badge::NiceTopic, "Nice Topic", BadgeType::Bronze, true],
   [Badge::GoodTopic, "Good Topic", BadgeType::Silver, true],
   [Badge::GreatTopic, "Great Topic", BadgeType::Gold, true],
@@ -256,6 +285,7 @@ end
   Badge.seed do |b|
     b.id = id
     b.name = name
+    b.default_icon = "file-signature"
     b.badge_type_id = type
     b.multiple_grant = true
     b.target_posts = true
@@ -270,7 +300,7 @@ end
 Badge.seed do |b|
   b.id = Badge::Anniversary
   b.name = "Anniversary"
-  b.default_icon = "far-clock"
+  b.default_icon = "birthday-cake"
   b.badge_type_id = BadgeType::Silver
   b.default_badge_grouping_id = BadgeGrouping::Community
   b.query = nil
@@ -288,6 +318,7 @@ end
   Badge.seed do |b|
     b.id = id
     b.name = name
+    b.default_icon = "link"
     b.badge_type_id = level
     b.multiple_grant = true
     b.target_posts = true
@@ -357,6 +388,7 @@ end
 Badge.seed do |b|
   b.id = Badge::FirstMention
   b.name = "First Mention"
+  b.default_icon = "at"
   b.badge_type_id = BadgeType::Bronze
   b.multiple_grant = false
   b.target_posts = true
@@ -370,6 +402,7 @@ end
 Badge.seed do |b|
   b.id = Badge::FirstEmoji
   b.name = "First Emoji"
+  b.default_icon = "smile"
   b.badge_type_id = BadgeType::Bronze
   b.multiple_grant = false
   b.target_posts = true
@@ -383,6 +416,7 @@ end
 Badge.seed do |b|
   b.id = Badge::FirstOnebox
   b.name = "First Onebox"
+  b.default_icon = "cube"
   b.badge_type_id = BadgeType::Bronze
   b.multiple_grant = false
   b.target_posts = true
@@ -396,6 +430,7 @@ end
 Badge.seed do |b|
   b.id = Badge::FirstReplyByEmail
   b.name = "First Reply By Email"
+  b.default_icon = "envelope"
   b.badge_type_id = BadgeType::Bronze
   b.multiple_grant = false
   b.target_posts = true
@@ -409,6 +444,7 @@ end
 Badge.seed do |b|
   b.id = Badge::NewUserOfTheMonth
   b.name = "New User of the Month"
+  b.default_icon = "medal"
   b.badge_type_id = BadgeType::Bronze
   b.multiple_grant = false
   b.target_posts = false
diff --git a/db/fixtures/600_themes.rb b/db/fixtures/600_themes.rb
index ce01f8eb1ce..f58ddd69cbf 100644
--- a/db/fixtures/600_themes.rb
+++ b/db/fixtures/600_themes.rb
@@ -30,7 +30,7 @@ if !Theme.exists?
 
   if SiteSetting.default_dark_mode_color_scheme_id ==
        SiteSetting.defaults[:default_dark_mode_color_scheme_id]
-    dark_scheme_id = ColorScheme.where(base_scheme_id: "Dark").pluck_first(:id)
+    dark_scheme_id = ColorScheme.where(base_scheme_id: "Dark").pick(:id)
 
     SiteSetting.default_dark_mode_color_scheme_id = dark_scheme_id if dark_scheme_id.present?
   end
diff --git a/db/migrate/20180327062911_add_post_custom_fields_akismet_index.rb b/db/migrate/20180327062911_add_post_custom_fields_akismet_index.rb
deleted file mode 100644
index 68b1483bcef..00000000000
--- a/db/migrate/20180327062911_add_post_custom_fields_akismet_index.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-# This is our current pattern for data migrations needed by plugins, we prefer to keep them in core
-# so schema is tightly controlled, especially if we are amending tables owned by core
-#
-# this index makes looking up posts requiring review much faster (20ms on meta)
-
-class AddPostCustomFieldsAkismetIndex < ActiveRecord::Migration[5.1]
-  def change
-    add_index :post_custom_fields,
-              [:post_id],
-              name: "idx_post_custom_fields_akismet",
-              where: "name = 'AKISMET_STATE' AND value = 'needs_review'"
-  end
-end
diff --git a/db/migrate/20200709032247_allowlist_and_blocklist_site_settings.rb b/db/migrate/20200709032247_allowlist_and_blocklist_site_settings.rb
index c69e58f0e1d..db10fe0677a 100644
--- a/db/migrate/20200709032247_allowlist_and_blocklist_site_settings.rb
+++ b/db/migrate/20200709032247_allowlist_and_blocklist_site_settings.rb
@@ -1,8 +1,30 @@
 # frozen_string_literal: true
 
 class AllowlistAndBlocklistSiteSettings < ActiveRecord::Migration[6.0]
+  ALLOWLIST_DEPRECATED_SITE_SETTINGS = {
+    email_domains_blacklist: "blocked_email_domains",
+    email_domains_whitelist: "allowed_email_domains",
+    unicode_username_character_whitelist: "allowed_unicode_username_characters",
+    user_website_domains_whitelist: "allowed_user_website_domains",
+    whitelisted_link_domains: "allowed_link_domains",
+    embed_whitelist_selector: "allowed_embed_selectors",
+    auto_generated_whitelist: "auto_generated_allowlist",
+    attachment_content_type_blacklist: "blocked_attachment_content_types",
+    attachment_filename_blacklist: "blocked_attachment_filenames",
+    use_admin_ip_whitelist: "use_admin_ip_allowlist",
+    blacklist_ip_blocks: "blocked_ip_blocks",
+    whitelist_internal_hosts: "allowed_internal_hosts",
+    whitelisted_crawler_user_agents: "allowed_crawler_user_agents",
+    blacklisted_crawler_user_agents: "blocked_crawler_user_agents",
+    onebox_domains_blacklist: "blocked_onebox_domains",
+    inline_onebox_domains_whitelist: "allowed_inline_onebox_domains",
+    white_listed_spam_host_domains: "allowed_spam_host_domains",
+    embed_blacklist_selector: "blocked_embed_selectors",
+    embed_classname_whitelist: "allowed_embed_classnames",
+  }
+
   def up
-    SiteSetting::ALLOWLIST_DEPRECATED_SITE_SETTINGS.each_pair { |old_key, new_key| DB.exec <<~SQL }
+    ALLOWLIST_DEPRECATED_SITE_SETTINGS.each_pair { |old_key, new_key| DB.exec <<~SQL }
         INSERT INTO site_settings(name, data_type, value, created_at, updated_at)
         SELECT '#{new_key}', data_type, value, created_at, updated_At
         FROM site_settings
@@ -11,7 +33,7 @@ class AllowlistAndBlocklistSiteSettings < ActiveRecord::Migration[6.0]
   end
 
   def down
-    SiteSetting::ALLOWLIST_DEPRECATED_SITE_SETTINGS.each_pair { |_old_key, new_key| DB.exec <<~SQL }
+    ALLOWLIST_DEPRECATED_SITE_SETTINGS.each_pair { |_old_key, new_key| DB.exec <<~SQL }
         DELETE FROM site_settings
         WHERE name = '#{new_key}'
       SQL
diff --git a/db/migrate/20200724060632_remove_deprecated_allowlist_settings.rb b/db/migrate/20200724060632_remove_deprecated_allowlist_settings.rb
index 038c43d723b..45a829383d0 100644
--- a/db/migrate/20200724060632_remove_deprecated_allowlist_settings.rb
+++ b/db/migrate/20200724060632_remove_deprecated_allowlist_settings.rb
@@ -1,15 +1,37 @@
 # frozen_string_literal: true
 
 class RemoveDeprecatedAllowlistSettings < ActiveRecord::Migration[6.0]
+  ALLOWLIST_DEPRECATED_SITE_SETTINGS = {
+    email_domains_blacklist: "blocked_email_domains",
+    email_domains_whitelist: "allowed_email_domains",
+    unicode_username_character_whitelist: "allowed_unicode_username_characters",
+    user_website_domains_whitelist: "allowed_user_website_domains",
+    whitelisted_link_domains: "allowed_link_domains",
+    embed_whitelist_selector: "allowed_embed_selectors",
+    auto_generated_whitelist: "auto_generated_allowlist",
+    attachment_content_type_blacklist: "blocked_attachment_content_types",
+    attachment_filename_blacklist: "blocked_attachment_filenames",
+    use_admin_ip_whitelist: "use_admin_ip_allowlist",
+    blacklist_ip_blocks: "blocked_ip_blocks",
+    whitelist_internal_hosts: "allowed_internal_hosts",
+    whitelisted_crawler_user_agents: "allowed_crawler_user_agents",
+    blacklisted_crawler_user_agents: "blocked_crawler_user_agents",
+    onebox_domains_blacklist: "blocked_onebox_domains",
+    inline_onebox_domains_whitelist: "allowed_inline_onebox_domains",
+    white_listed_spam_host_domains: "allowed_spam_host_domains",
+    embed_blacklist_selector: "blocked_embed_selectors",
+    embed_classname_whitelist: "allowed_embed_classnames",
+  }
+
   def up
-    SiteSetting::ALLOWLIST_DEPRECATED_SITE_SETTINGS.each_pair { |old_key, _new_key| DB.exec <<~SQL }
+    ALLOWLIST_DEPRECATED_SITE_SETTINGS.each_pair { |old_key, _new_key| DB.exec <<~SQL }
         DELETE FROM site_settings
         WHERE name = '#{old_key}'
       SQL
   end
 
   def down
-    SiteSetting::ALLOWLIST_DEPRECATED_SITE_SETTINGS.each_pair { |old_key, new_key| DB.exec <<~SQL }
+    ALLOWLIST_DEPRECATED_SITE_SETTINGS.each_pair { |old_key, new_key| DB.exec <<~SQL }
         INSERT INTO site_settings(name, data_type, value, created_at, updated_at)
         SELECT '#{old_key}', data_type, value, created_at, updated_At
         FROM site_settings
diff --git a/db/migrate/20210224162050_remove_emoji_one_from_emoji_set_site_setting.rb b/db/migrate/20210224162050_remove_emoji_one_from_emoji_set_site_setting.rb
index 1ffbaac72de..4e205e14bc9 100644
--- a/db/migrate/20210224162050_remove_emoji_one_from_emoji_set_site_setting.rb
+++ b/db/migrate/20210224162050_remove_emoji_one_from_emoji_set_site_setting.rb
@@ -3,7 +3,7 @@
 class RemoveEmojiOneFromEmojiSetSiteSetting < ActiveRecord::Migration[6.0]
   def up
     result = execute("SELECT value FROM site_settings WHERE name='emoji_set' and value='emoji_one'")
-    return unless result.count > 0
+    return if result.count.zero?
 
     execute "DELETE FROM site_settings where name='emoji_set' and value='emoji_one'"
     execute "UPDATE posts SET baked_version = 0 WHERE cooked LIKE '%/images/emoji/emoji_one%'"
diff --git a/db/migrate/20210527114834_set_tagging_enabled.rb b/db/migrate/20210527114834_set_tagging_enabled.rb
index 8e2dd92db46..2f988ed184f 100644
--- a/db/migrate/20210527114834_set_tagging_enabled.rb
+++ b/db/migrate/20210527114834_set_tagging_enabled.rb
@@ -2,15 +2,8 @@
 
 class SetTaggingEnabled < ActiveRecord::Migration[6.1]
   def up
-    result = execute <<~SQL
-      SELECT created_at
-      FROM schema_migration_details
-      ORDER BY created_at
-      LIMIT 1
-    SQL
-
     # keep tagging disabled for existing sites
-    execute <<~SQL if result.first["created_at"].to_datetime < 1.hour.ago
+    execute <<~SQL if Migration::Helpers.existing_site?
         INSERT INTO site_settings(name, data_type, value, created_at, updated_at)
         VALUES('tagging_enabled', 5, 'f', NOW(), NOW())
         ON CONFLICT (name) DO NOTHING
diff --git a/db/migrate/20220130192155_set_use_email_for_username_and_name_suggestions_on_existing_sites.rb b/db/migrate/20220130192155_set_use_email_for_username_and_name_suggestions_on_existing_sites.rb
index 29f9a078124..121f31f4382 100644
--- a/db/migrate/20220130192155_set_use_email_for_username_and_name_suggestions_on_existing_sites.rb
+++ b/db/migrate/20220130192155_set_use_email_for_username_and_name_suggestions_on_existing_sites.rb
@@ -2,15 +2,8 @@
 
 class SetUseEmailForUsernameAndNameSuggestionsOnExistingSites < ActiveRecord::Migration[6.1]
   def up
-    result = execute <<~SQL
-      SELECT created_at
-      FROM schema_migration_details
-      ORDER BY created_at
-      LIMIT 1
-    SQL
-
     # make setting enabled for existing sites
-    execute <<~SQL if result.first["created_at"].to_datetime < 1.hour.ago
+    execute <<~SQL if Migration::Helpers.existing_site?
         INSERT INTO site_settings(name, data_type, value, created_at, updated_at)
         VALUES('use_email_for_username_and_name_suggestions', 5, 't', NOW(), NOW())
         ON CONFLICT (name) DO NOTHING
diff --git a/db/post_migrate/20220202223955_migrate_selectable_avatars_enabled.rb b/db/migrate/20220202223955_migrate_selectable_avatars_enabled.rb
similarity index 100%
rename from db/post_migrate/20220202223955_migrate_selectable_avatars_enabled.rb
rename to db/migrate/20220202223955_migrate_selectable_avatars_enabled.rb
diff --git a/db/post_migrate/20220214224506_reset_custom_emoji_post_bakes_version_secure_fix.rb b/db/migrate/20220214224506_reset_custom_emoji_post_bakes_version_secure_fix.rb
similarity index 100%
rename from db/post_migrate/20220214224506_reset_custom_emoji_post_bakes_version_secure_fix.rb
rename to db/migrate/20220214224506_reset_custom_emoji_post_bakes_version_secure_fix.rb
diff --git a/db/post_migrate/20220215015538_drop_user_stat_count_constraints.rb b/db/migrate/20220215015538_drop_user_stat_count_constraints.rb
similarity index 100%
rename from db/post_migrate/20220215015538_drop_user_stat_count_constraints.rb
rename to db/migrate/20220215015538_drop_user_stat_count_constraints.rb
diff --git a/db/post_migrate/20220220234155_conform_bounce_error_code.rb b/db/migrate/20220220234155_conform_bounce_error_code.rb
similarity index 100%
rename from db/post_migrate/20220220234155_conform_bounce_error_code.rb
rename to db/migrate/20220220234155_conform_bounce_error_code.rb
diff --git a/db/post_migrate/20220302171443_rebake_old_avatar_service_urls.rb b/db/migrate/20220302171443_rebake_old_avatar_service_urls.rb
similarity index 100%
rename from db/post_migrate/20220302171443_rebake_old_avatar_service_urls.rb
rename to db/migrate/20220302171443_rebake_old_avatar_service_urls.rb
diff --git a/db/post_migrate/20220309132720_copy_post_uploads_to_upload_references_for_sync.rb b/db/migrate/20220309132720_copy_post_uploads_to_upload_references_for_sync.rb
similarity index 100%
rename from db/post_migrate/20220309132720_copy_post_uploads_to_upload_references_for_sync.rb
rename to db/migrate/20220309132720_copy_post_uploads_to_upload_references_for_sync.rb
diff --git a/db/post_migrate/20220325064954_make_some_bookmark_columns_nullable.rb b/db/migrate/20220325064954_make_some_bookmark_columns_nullable.rb
similarity index 100%
rename from db/post_migrate/20220325064954_make_some_bookmark_columns_nullable.rb
rename to db/migrate/20220325064954_make_some_bookmark_columns_nullable.rb
diff --git a/db/post_migrate/20220401140745_drop_category_required_tag_group_columns.rb b/db/migrate/20220401140745_drop_category_required_tag_group_columns.rb
similarity index 100%
rename from db/post_migrate/20220401140745_drop_category_required_tag_group_columns.rb
rename to db/migrate/20220401140745_drop_category_required_tag_group_columns.rb
diff --git a/db/post_migrate/20220429164301_delete_hotlinked_image_custom_fields.rb b/db/migrate/20220429164301_delete_hotlinked_image_custom_fields.rb
similarity index 100%
rename from db/post_migrate/20220429164301_delete_hotlinked_image_custom_fields.rb
rename to db/migrate/20220429164301_delete_hotlinked_image_custom_fields.rb
diff --git a/db/post_migrate/20220512011531_backfill_polymorphic_bookmarks.rb b/db/migrate/20220512011531_backfill_polymorphic_bookmarks.rb
similarity index 100%
rename from db/post_migrate/20220512011531_backfill_polymorphic_bookmarks.rb
rename to db/migrate/20220512011531_backfill_polymorphic_bookmarks.rb
diff --git a/db/migrate/db/migrate/20220606061813_add_smtp_transaction_response_to_email_logs.rb b/db/migrate/20220606061813_add_smtp_transaction_response_to_email_logs.rb
similarity index 100%
rename from db/migrate/db/migrate/20220606061813_add_smtp_transaction_response_to_email_logs.rb
rename to db/migrate/20220606061813_add_smtp_transaction_response_to_email_logs.rb
diff --git a/db/post_migrate/20220617151846_rename_default_categories_regular_setting.rb b/db/migrate/20220617151846_rename_default_categories_regular_setting.rb
similarity index 100%
rename from db/post_migrate/20220617151846_rename_default_categories_regular_setting.rb
rename to db/migrate/20220617151846_rename_default_categories_regular_setting.rb
diff --git a/db/post_migrate/20220621164914_drop_flair_url_from_groups.rb b/db/migrate/20220621164914_drop_flair_url_from_groups.rb
similarity index 100%
rename from db/post_migrate/20220621164914_drop_flair_url_from_groups.rb
rename to db/migrate/20220621164914_drop_flair_url_from_groups.rb
diff --git a/db/post_migrate/20220825005115_backfill_outbound_message_id.rb b/db/migrate/20220825005115_backfill_outbound_message_id.rb
similarity index 100%
rename from db/post_migrate/20220825005115_backfill_outbound_message_id.rb
rename to db/migrate/20220825005115_backfill_outbound_message_id.rb
diff --git a/db/migrate/20220927171707_disable_allow_uncategorized_new_sites.rb b/db/migrate/20220927171707_disable_allow_uncategorized_new_sites.rb
index 82827c5537c..7aee21a77a2 100644
--- a/db/migrate/20220927171707_disable_allow_uncategorized_new_sites.rb
+++ b/db/migrate/20220927171707_disable_allow_uncategorized_new_sites.rb
@@ -2,15 +2,8 @@
 
 class DisableAllowUncategorizedNewSites < ActiveRecord::Migration[7.0]
   def up
-    result = execute <<~SQL
-      SELECT created_at
-      FROM schema_migration_details
-      ORDER BY created_at
-      LIMIT 1
-    SQL
-
     # keep allow uncategorized for existing sites
-    execute <<~SQL if result.first["created_at"].to_datetime < 1.hour.ago
+    execute <<~SQL if Migration::Helpers.existing_site?
         INSERT INTO site_settings(name, data_type, value, created_at, updated_at)
         VALUES('allow_uncategorized_topics', 5, 't', NOW(), NOW())
         ON CONFLICT (name) DO NOTHING
diff --git a/db/post_migrate/20221026035440_security_log_out_invite_redemption_invited_users.rb b/db/migrate/20221026035440_security_log_out_invite_redemption_invited_users.rb
similarity index 100%
rename from db/post_migrate/20221026035440_security_log_out_invite_redemption_invited_users.rb
rename to db/migrate/20221026035440_security_log_out_invite_redemption_invited_users.rb
diff --git a/db/post_migrate/20221108032233_drop_old_bookmark_columns_v2.rb b/db/migrate/20221108032233_drop_old_bookmark_columns_v2.rb
similarity index 100%
rename from db/post_migrate/20221108032233_drop_old_bookmark_columns_v2.rb
rename to db/migrate/20221108032233_drop_old_bookmark_columns_v2.rb
diff --git a/db/migrate/20221212225921_enable_sidebar_and_chat.rb b/db/migrate/20221212225921_enable_sidebar_and_chat.rb
index 83b365dd49d..32c8b5f3497 100644
--- a/db/migrate/20221212225921_enable_sidebar_and_chat.rb
+++ b/db/migrate/20221212225921_enable_sidebar_and_chat.rb
@@ -2,15 +2,8 @@
 
 class EnableSidebarAndChat < ActiveRecord::Migration[7.0]
   def up
-    result = execute <<~SQL
-      SELECT created_at
-      FROM schema_migration_details
-      ORDER BY created_at
-      LIMIT 1
-    SQL
-
-    # keep sidebar legacy and chat disabled for for existing sites
-    if result.first["created_at"].to_datetime < 1.hour.ago
+    # keep sidebar legacy and chat disabled for existing sites
+    if Migration::Helpers.existing_site?
       execute <<~SQL
         INSERT INTO site_settings(name, data_type, value, created_at, updated_at)
         VALUES('chat_enabled', 5, 'f', NOW(), NOW())
diff --git a/db/post_migrate/20221212234948_drop_topic_allowed_users_backup_nov_2022.rb b/db/migrate/20221212234948_drop_topic_allowed_users_backup_nov_2022.rb
similarity index 100%
rename from db/post_migrate/20221212234948_drop_topic_allowed_users_backup_nov_2022.rb
rename to db/migrate/20221212234948_drop_topic_allowed_users_backup_nov_2022.rb
diff --git a/db/migrate/20230103004613_make_experimental_hashtag_feature_default_for_new_sites.rb b/db/migrate/20230103004613_make_experimental_hashtag_feature_default_for_new_sites.rb
index 55f6d340367..8965d47904a 100644
--- a/db/migrate/20230103004613_make_experimental_hashtag_feature_default_for_new_sites.rb
+++ b/db/migrate/20230103004613_make_experimental_hashtag_feature_default_for_new_sites.rb
@@ -2,13 +2,6 @@
 
 class MakeExperimentalHashtagFeatureDefaultForNewSites < ActiveRecord::Migration[7.0]
   def up
-    result = execute <<~SQL
-      SELECT created_at
-      FROM schema_migration_details
-      ORDER BY created_at
-      LIMIT 1
-    SQL
-
     settings_insert_query = <<~SQL
       INSERT INTO site_settings (name, data_type, value, created_at, updated_at)
       VALUES ('enable_experimental_hashtag_autocomplete', 5, 'f', now(), now())
@@ -16,7 +9,7 @@ class MakeExperimentalHashtagFeatureDefaultForNewSites < ActiveRecord::Migration
     SQL
 
     # keep enable_experimental_hashtag_autocomplete disabled for for existing sites
-    execute settings_insert_query if result.first["created_at"].to_datetime < 1.hour.ago
+    execute settings_insert_query if Migration::Helpers.existing_site?
   end
 
   def down
diff --git a/db/migrate/20230115233416_create_sidebar_sections.rb b/db/migrate/20230115233416_create_sidebar_sections.rb
new file mode 100644
index 00000000000..43c2be1554e
--- /dev/null
+++ b/db/migrate/20230115233416_create_sidebar_sections.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class CreateSidebarSections < ActiveRecord::Migration[7.0]
+  def change
+    create_table :sidebar_sections do |t|
+      t.integer :user_id, null: false
+      t.string :title, null: false
+      t.timestamps
+    end
+
+    add_index :sidebar_sections, %i[user_id title], unique: true
+  end
+end
diff --git a/db/migrate/20230117002110_create_sidebar_url.rb b/db/migrate/20230117002110_create_sidebar_url.rb
new file mode 100644
index 00000000000..6cc4c1ed335
--- /dev/null
+++ b/db/migrate/20230117002110_create_sidebar_url.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class CreateSidebarUrl < ActiveRecord::Migration[7.0]
+  def change
+    create_table :sidebar_urls do |t|
+      t.string :name, null: false
+      t.string :value, null: false
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20230118042740_add_sidebar_section_id_to_sidebar_section_links.rb b/db/migrate/20230118042740_add_sidebar_section_id_to_sidebar_section_links.rb
new file mode 100644
index 00000000000..7905eb89ed2
--- /dev/null
+++ b/db/migrate/20230118042740_add_sidebar_section_id_to_sidebar_section_links.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddSidebarSectionIdToSidebarSectionLinks < ActiveRecord::Migration[7.0]
+  def change
+    add_column :sidebar_section_links, :sidebar_section_id, :integer, index: true
+  end
+end
diff --git a/db/migrate/20230127173249_truncate_user_status_to_100_characters.rb b/db/migrate/20230127173249_truncate_user_status_to_100_characters.rb
new file mode 100644
index 00000000000..36ac3eca0b8
--- /dev/null
+++ b/db/migrate/20230127173249_truncate_user_status_to_100_characters.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class TruncateUserStatusTo100Characters < ActiveRecord::Migration[7.0]
+  def up
+    execute "UPDATE user_statuses SET description = left(description, 100)"
+    execute "UPDATE user_statuses SET emoji = left(emoji, 100)"
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20230201192925_add_trigram_indexes_to_users.rb b/db/migrate/20230201192925_add_trigram_indexes_to_users.rb
new file mode 100644
index 00000000000..0b2c78dfa08
--- /dev/null
+++ b/db/migrate/20230201192925_add_trigram_indexes_to_users.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+class AddTrigramIndexesToUsers < ActiveRecord::Migration[7.0]
+  disable_ddl_transaction!
+
+  def change
+    add_index(
+      :users,
+      :username_lower,
+      using: "gist",
+      opclass: :gist_trgm_ops,
+      algorithm: :concurrently,
+      name: "index_users_on_username_lower_trgm",
+    )
+    add_index(
+      :users,
+      :name,
+      using: "gist",
+      opclass: :gist_trgm_ops,
+      algorithm: :concurrently,
+      name: "index_users_on_name_trgm",
+    )
+  end
+end
diff --git a/db/migrate/20230202021414_remove_enable_new_user_profile_nav_groups_site_settings.rb b/db/migrate/20230202021414_remove_enable_new_user_profile_nav_groups_site_settings.rb
new file mode 100644
index 00000000000..5bc2589f741
--- /dev/null
+++ b/db/migrate/20230202021414_remove_enable_new_user_profile_nav_groups_site_settings.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class RemoveEnableNewUserProfileNavGroupsSiteSettings < ActiveRecord::Migration[7.0]
+  def up
+    execute "DELETE FROM site_settings WHERE name = 'enable_new_user_profile_nav_groups'"
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20230202173641_create_form_templates.rb b/db/migrate/20230202173641_create_form_templates.rb
new file mode 100644
index 00000000000..7cdace0e443
--- /dev/null
+++ b/db/migrate/20230202173641_create_form_templates.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class CreateFormTemplates < ActiveRecord::Migration[7.0]
+  def change
+    create_table :form_templates do |t|
+      t.string :name, null: false, limit: 100
+      t.text :template, null: false, limit: 2000
+
+      t.timestamps null: false
+    end
+
+    add_index :form_templates, :name, unique: true
+  end
+end
diff --git a/db/migrate/20230202204937_add_index_to_posts_where_not_deleted_or_empty.rb b/db/migrate/20230202204937_add_index_to_posts_where_not_deleted_or_empty.rb
new file mode 100644
index 00000000000..b377a24e02d
--- /dev/null
+++ b/db/migrate/20230202204937_add_index_to_posts_where_not_deleted_or_empty.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class AddIndexToPostsWhereNotDeletedOrEmpty < ActiveRecord::Migration[7.0]
+  disable_ddl_transaction!
+
+  def up
+    execute <<~SQL
+      DROP INDEX CONCURRENTLY IF EXISTS index_posts_on_id_topic_id_where_not_deleted_or_empty
+    SQL
+
+    execute <<~SQL
+      CREATE INDEX CONCURRENTLY index_posts_on_id_topic_id_where_not_deleted_or_empty ON posts (id, topic_id) where deleted_at IS NULL AND raw <> ''
+    SQL
+  end
+
+  def down
+    execute <<~SQL
+      DROP INDEX IF EXISTS index_posts_on_id_topic_id_where_not_deleted_or_empty
+    SQL
+  end
+end
diff --git a/db/migrate/20230206033907_add_icon_to_sidebar_urls.rb b/db/migrate/20230206033907_add_icon_to_sidebar_urls.rb
new file mode 100644
index 00000000000..84fa80cd685
--- /dev/null
+++ b/db/migrate/20230206033907_add_icon_to_sidebar_urls.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddIconToSidebarUrls < ActiveRecord::Migration[7.0]
+  def change
+    add_column :sidebar_urls, :icon, :string
+  end
+end
diff --git a/db/migrate/20230207042719_add_limits_to_sidebar_sections_and_sidebar_urls.rb b/db/migrate/20230207042719_add_limits_to_sidebar_sections_and_sidebar_urls.rb
new file mode 100644
index 00000000000..b269c39c0ba
--- /dev/null
+++ b/db/migrate/20230207042719_add_limits_to_sidebar_sections_and_sidebar_urls.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class AddLimitsToSidebarSectionsAndSidebarUrls < ActiveRecord::Migration[7.0]
+  def change
+    execute "UPDATE sidebar_urls SET icon = 'link' WHERE icon IS NULL"
+    change_column :sidebar_sections, :title, :string, limit: 30, null: false
+    change_column :sidebar_urls, :icon, :string, limit: 40, null: false
+    change_column :sidebar_urls, :name, :string, limit: 80, null: false
+    change_column :sidebar_urls, :value, :string, limit: 200, null: false
+  end
+end
diff --git a/db/migrate/20230207093514_create_category_settings.rb b/db/migrate/20230207093514_create_category_settings.rb
new file mode 100644
index 00000000000..2a256a37049
--- /dev/null
+++ b/db/migrate/20230207093514_create_category_settings.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class CreateCategorySettings < ActiveRecord::Migration[7.0]
+  def change
+    # Moving the custom fields in core into a dedicated table for
+    # better type casting, validations, etc.
+    create_table :category_settings do |t|
+      t.references :category, null: false, index: { unique: true }
+
+      t.boolean :require_topic_approval, null: true
+      t.boolean :require_reply_approval, null: true
+      t.integer :num_auto_bump_daily, null: true
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20230208020404_populate_category_settings.rb b/db/migrate/20230208020404_populate_category_settings.rb
new file mode 100644
index 00000000000..9df846797e7
--- /dev/null
+++ b/db/migrate/20230208020404_populate_category_settings.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+class PopulateCategorySettings < ActiveRecord::Migration[7.0]
+  def up
+    execute(<<~SQL)
+      INSERT INTO
+        category_settings(
+          category_id,
+          require_topic_approval,
+          require_reply_approval,
+          num_auto_bump_daily,
+          created_at,
+          updated_at
+        )
+      SELECT
+        category_id,
+        MAX(
+          CASE WHEN (name = 'require_topic_approval')
+          THEN NULLIF(value, '') ELSE NULL END
+        )::boolean AS require_topic_approval,
+        MAX(
+          CASE WHEN (name = 'require_reply_approval')
+          THEN NULLIF(value, '') ELSE NULL END
+        )::boolean AS require_reply_approval,
+        MAX(
+          CASE WHEN (name = 'num_auto_bump_daily')
+          THEN NULLIF(value, '') ELSE NULL END
+        )::integer AS num_auto_bump_daily,
+        NOW() AS created_at,
+        NOW() AS updated_at
+      FROM category_custom_fields
+      WHERE name IN (
+        'require_topic_approval',
+        'require_reply_approval',
+        'num_auto_bump_daily'
+      )
+      GROUP BY category_id;
+    SQL
+  end
+
+  def down
+    execute(<<~SQL)
+      TRUNCATE category_settings;
+    SQL
+  end
+end
diff --git a/db/migrate/20230209222225_add_linkable_index_to_sidebar_section_links.rb b/db/migrate/20230209222225_add_linkable_index_to_sidebar_section_links.rb
new file mode 100644
index 00000000000..3cdcf23466d
--- /dev/null
+++ b/db/migrate/20230209222225_add_linkable_index_to_sidebar_section_links.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class AddLinkableIndexToSidebarSectionLinks < ActiveRecord::Migration[7.0]
+  disable_ddl_transaction!
+
+  def up
+    execute <<~SQL
+    DROP INDEX CONCURRENTLY IF EXISTS index_sidebar_section_links_on_linkable_type_and_linkable_id
+    SQL
+
+    execute <<~SQL
+    CREATE INDEX CONCURRENTLY index_sidebar_section_links_on_linkable_type_and_linkable_id
+    ON sidebar_section_links (linkable_type,linkable_id)
+    SQL
+  end
+
+  def down
+    execute <<~SQL
+    DROP INDEX CONCURRENTLY IF EXISTS index_sidebar_section_links_on_linkable_type_and_linkable_id
+    SQL
+  end
+end
diff --git a/db/migrate/20230213234415_create_category_form_templates.rb b/db/migrate/20230213234415_create_category_form_templates.rb
new file mode 100644
index 00000000000..97e544c692d
--- /dev/null
+++ b/db/migrate/20230213234415_create_category_form_templates.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class CreateCategoryFormTemplates < ActiveRecord::Migration[7.0]
+  def change
+    create_table :category_form_templates do |t|
+      t.references :category, null: false
+      t.references :form_template, null: false
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20230214044350_add_public_to_sidebar_sections.rb b/db/migrate/20230214044350_add_public_to_sidebar_sections.rb
new file mode 100644
index 00000000000..db7c5387fd3
--- /dev/null
+++ b/db/migrate/20230214044350_add_public_to_sidebar_sections.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddPublicToSidebarSections < ActiveRecord::Migration[7.0]
+  def change
+    add_column :sidebar_sections, :public, :boolean, null: false, default: false
+  end
+end
diff --git a/db/migrate/20230224193734_create_theme_svg_sprite.rb b/db/migrate/20230224193734_create_theme_svg_sprite.rb
new file mode 100644
index 00000000000..12439e44fa5
--- /dev/null
+++ b/db/migrate/20230224193734_create_theme_svg_sprite.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class CreateThemeSvgSprite < ActiveRecord::Migration[7.0]
+  def change
+    create_table :theme_svg_sprites do |t|
+      t.integer :theme_id, null: false
+      t.integer :upload_id, null: false
+      t.binary :sprite, null: false
+
+      t.timestamps
+    end
+
+    add_index :theme_svg_sprites, :theme_id, unique: true
+  end
+end
diff --git a/db/migrate/20230227050147_update_badge_icons.rb b/db/migrate/20230227050147_update_badge_icons.rb
new file mode 100644
index 00000000000..06a289dd78a
--- /dev/null
+++ b/db/migrate/20230227050147_update_badge_icons.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+class UpdateBadgeIcons < ActiveRecord::Migration[7.0]
+  def change
+    icon_id_replacement = [
+      ["book-reader", [Badge::Reader], "fa-certificate"],
+      ["file-alt", [Badge::ReadGuidelines], "fa-certificate"],
+      [
+        "link",
+        [Badge::FirstLink, Badge::PopularLink, Badge::HotLink, Badge::FamousLink],
+        "fa-certificate",
+      ],
+      ["quote-right", [Badge::FirstQuote], "fa-certificate"],
+      ["heart", [Badge::FirstLike, Badge::Welcome], "fa-certificate"],
+      ["flag", [Badge::FirstFlag], "fa-certificate"],
+      [
+        "share-alt",
+        [Badge::FirstShare, Badge::NiceShare, Badge::GoodShare, Badge::GreatShare],
+        "fa-certificate",
+      ],
+      ["user-edit", [Badge::Autobiographer], "fa-certificate"],
+      ["pen", [Badge::Editor], "fa-certificate"],
+      ["far-edit", [Badge::WikiEditor], "fa-certificate"],
+      ["reply", [Badge::NicePost, Badge::GoodPost, Badge::GreatPost], "fa-certificate"],
+      ["file-signature", [Badge::NiceTopic, Badge::GoodTopic, Badge::GreatTopic], "fa-certificate"],
+      ["at", [Badge::FirstMention], "fa-certificate"],
+      ["smile", [Badge::FirstEmoji], "fa-certificate"],
+      ["cube", [Badge::FirstOnebox], "fa-certificate"],
+      ["envelope", [Badge::FirstReplyByEmail], "fa-certificate"],
+      ["medal", [Badge::NewUserOfTheMonth], "fa-certificate"],
+      ["birthday-cake", [Badge::Anniversary], "far-clock"],
+    ]
+
+    icon_id_replacement.each do |new_icon, badge_ids, old_icon|
+      execute "UPDATE badges SET icon = '#{new_icon}' WHERE id IN (#{badge_ids.join(",")}) AND icon = '#{old_icon}'"
+    end
+  end
+end
diff --git a/db/migrate/20230301071240_add_auto_bump_cooldown_days_to_category_settings.rb b/db/migrate/20230301071240_add_auto_bump_cooldown_days_to_category_settings.rb
new file mode 100644
index 00000000000..0119f4dd8c4
--- /dev/null
+++ b/db/migrate/20230301071240_add_auto_bump_cooldown_days_to_category_settings.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddAutoBumpCooldownDaysToCategorySettings < ActiveRecord::Migration[7.0]
+  def change
+    add_column :category_settings, :auto_bump_cooldown_days, :integer, default: 1
+  end
+end
diff --git a/db/migrate/20230303015952_add_external_to_sidebar_urls.rb b/db/migrate/20230303015952_add_external_to_sidebar_urls.rb
new file mode 100644
index 00000000000..fbf1bf5bd51
--- /dev/null
+++ b/db/migrate/20230303015952_add_external_to_sidebar_urls.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddExternalToSidebarUrls < ActiveRecord::Migration[7.0]
+  def change
+    add_column :sidebar_urls, :external, :boolean, default: false, null: false
+  end
+end
diff --git a/db/migrate/20230307051200_add_position_to_sidebar_section_links.rb b/db/migrate/20230307051200_add_position_to_sidebar_section_links.rb
new file mode 100644
index 00000000000..a76c0f8d4fb
--- /dev/null
+++ b/db/migrate/20230307051200_add_position_to_sidebar_section_links.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class AddPositionToSidebarSectionLinks < ActiveRecord::Migration[7.0]
+  def change
+    add_column :sidebar_section_links, :position, :integer, default: 0, null: false
+    execute "UPDATE sidebar_section_links SET position = id"
+    add_index :sidebar_section_links,
+              %i[user_id sidebar_section_id position],
+              unique: true,
+              name: "links_user_id_section_id_position"
+  end
+end
diff --git a/db/migrate/20230308042434_backfill_auto_bump_cooldown_days_category_setting.rb b/db/migrate/20230308042434_backfill_auto_bump_cooldown_days_category_setting.rb
new file mode 100644
index 00000000000..f37c9117e24
--- /dev/null
+++ b/db/migrate/20230308042434_backfill_auto_bump_cooldown_days_category_setting.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class BackfillAutoBumpCooldownDaysCategorySetting < ActiveRecord::Migration[7.0]
+  def up
+    execute(<<~SQL)
+      INSERT INTO
+        category_settings(
+          category_id,
+          auto_bump_cooldown_days,
+          created_at,
+          updated_at
+        )
+      SELECT
+        id,
+        1,
+        NOW(),
+        NOW()
+      FROM categories
+      ON CONFLICT (category_id)
+      DO
+        UPDATE SET
+          auto_bump_cooldown_days = 1,
+          updated_at = NOW();
+    SQL
+  end
+end
diff --git a/db/migrate/20230328034956_add_sidebar_section_id_index_to_sidebar_section_link.rb b/db/migrate/20230328034956_add_sidebar_section_id_index_to_sidebar_section_link.rb
new file mode 100644
index 00000000000..c391d198af4
--- /dev/null
+++ b/db/migrate/20230328034956_add_sidebar_section_id_index_to_sidebar_section_link.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+class AddSidebarSectionIdIndexToSidebarSectionLink < ActiveRecord::Migration[7.0]
+  disable_ddl_transaction!
+
+  def up
+    execute <<~SQL
+    DROP INDEX CONCURRENTLY IF EXISTS idx_sidebar_section_links_on_sidebar_section_id
+    SQL
+
+    execute <<~SQL
+    CREATE UNIQUE INDEX CONCURRENTLY idx_sidebar_section_links_on_sidebar_section_id
+    ON sidebar_section_links (sidebar_section_id, user_id, position)
+    SQL
+
+    execute <<~SQL
+    DROP INDEX CONCURRENTLY IF EXISTS links_user_id_section_id_position
+    SQL
+  end
+
+  def down
+    execute <<~SQL
+    DROP INDEX CONCURRENTLY IF EXISTS idx_sidebar_section_links_on_sidebar_section_id
+    SQL
+
+    add_index :sidebar_section_links,
+              %i[user_id sidebar_section_id position],
+              unique: true,
+              name: "links_user_id_section_id_position"
+  end
+end
diff --git a/db/migrate/20230403063113_drop_idx_post_custom_fields_akismet.rb b/db/migrate/20230403063113_drop_idx_post_custom_fields_akismet.rb
new file mode 100644
index 00000000000..8d9de3a5355
--- /dev/null
+++ b/db/migrate/20230403063113_drop_idx_post_custom_fields_akismet.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# This plugin related index was added to core way back in 2018 but it should not have been added to core in the first place.
+# The index has since been moved into the plugin itself.
+class DropIdxPostCustomFieldsAkismet < ActiveRecord::Migration[7.0]
+  def up
+    execute "DROP INDEX IF EXISTS idx_post_custom_fields_akismet"
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20230403094936_change_google_analytics_default.rb b/db/migrate/20230403094936_change_google_analytics_default.rb
new file mode 100644
index 00000000000..230c6580c84
--- /dev/null
+++ b/db/migrate/20230403094936_change_google_analytics_default.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class ChangeGoogleAnalyticsDefault < ActiveRecord::Migration[7.0]
+  def up
+    should_persist_old_default =
+      Migration::Helpers.existing_site? && tracking_code && current_db_version != "v4_gtag"
+
+    return if !should_persist_old_default
+
+    execute <<~SQL
+      INSERT INTO site_settings(name, data_type, value, created_at, updated_at)
+      VALUES ('ga_version', 7, 'v3_analytics', now(), now())
+      ON CONFLICT DO NOTHING
+    SQL
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+
+  def tracking_code
+    DB.query_single("SELECT value FROM site_settings WHERE name='ga_universal_tracking_code'")[
+      0
+    ].presence
+  end
+
+  def current_db_version
+    DB.query_single("SELECT value FROM site_settings WHERE name='ga_version'")[0].presence
+  end
+end
diff --git a/db/migrate/20230404064728_system_user_for_public_sections.rb b/db/migrate/20230404064728_system_user_for_public_sections.rb
new file mode 100644
index 00000000000..6b81b91351a
--- /dev/null
+++ b/db/migrate/20230404064728_system_user_for_public_sections.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class SystemUserForPublicSections < ActiveRecord::Migration[7.0]
+  def up
+    execute(<<-SQL)
+      UPDATE sidebar_sections
+      SET user_id = -1
+      WHERE public IS TRUE
+    SQL
+    execute(<<-SQL)
+      UPDATE sidebar_section_links
+      SET user_id = -1
+      FROM sidebar_sections
+      WHERE sidebar_sections.public IS TRUE
+        AND sidebar_section_links.sidebar_section_id = sidebar_sections.id
+    SQL
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20230405121453_add_password_algorithm_to_users.rb b/db/migrate/20230405121453_add_password_algorithm_to_users.rb
new file mode 100644
index 00000000000..3a3ae02ba86
--- /dev/null
+++ b/db/migrate/20230405121453_add_password_algorithm_to_users.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+class AddPasswordAlgorithmToUsers < ActiveRecord::Migration[7.0]
+  disable_ddl_transaction!
+  BATCH_SIZE = 5000
+
+  def up
+    if !column_exists?(:users, :password_algorithm)
+      add_column :users, :password_algorithm, :string, limit: 64
+    end
+
+    sql = <<~SQL
+      UPDATE users SET password_algorithm = '$pbkdf2-sha256$i=64000,l=32$'
+      WHERE id IN (
+        SELECT id FROM users
+        WHERE users.password_hash IS NOT NULL
+        AND users.password_algorithm IS NULL
+        LIMIT #{BATCH_SIZE}
+      )
+    SQL
+
+    loop do
+      changed_count = execute(sql).cmd_tuples
+      break if changed_count < BATCH_SIZE
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20230411031428_add_segment_to_sidebar_urls.rb b/db/migrate/20230411031428_add_segment_to_sidebar_urls.rb
new file mode 100644
index 00000000000..851a4fb6e36
--- /dev/null
+++ b/db/migrate/20230411031428_add_segment_to_sidebar_urls.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddSegmentToSidebarUrls < ActiveRecord::Migration[7.0]
+  def change
+    add_column :sidebar_urls, :segment, :integer, default: 0, null: false
+  end
+end
diff --git a/db/migrate/20230411031520_add_section_type_to_sidebar_sections.rb b/db/migrate/20230411031520_add_section_type_to_sidebar_sections.rb
new file mode 100644
index 00000000000..6bfe9b52890
--- /dev/null
+++ b/db/migrate/20230411031520_add_section_type_to_sidebar_sections.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddSectionTypeToSidebarSections < ActiveRecord::Migration[7.0]
+  def change
+    add_column :sidebar_sections, :section_type, :integer
+    add_index :sidebar_sections, :section_type, unique: true
+  end
+end
diff --git a/db/migrate/20230411032053_insert_community_to_sidebar_sections.rb b/db/migrate/20230411032053_insert_community_to_sidebar_sections.rb
new file mode 100644
index 00000000000..f0b192213ef
--- /dev/null
+++ b/db/migrate/20230411032053_insert_community_to_sidebar_sections.rb
@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+class InsertCommunityToSidebarSections < ActiveRecord::Migration[7.0]
+  COMMUNITY_SECTION_LINKS = [
+    { name: "Everything", path: "/latest", icon: "layer-group", segment: 0 },
+    { name: "My Posts", path: "/my/activity", icon: "user", segment: 0 },
+    { name: "Review", path: "/review", icon: "flag", segment: 0 },
+    { name: "Admin", path: "/admin", icon: "wrench", segment: 0 },
+    { name: "Users", path: "/u", icon: "users", segment: 1 },
+    { name: "About", path: "/about", icon: "info-circle", segment: 1 },
+    { name: "FAQ", path: "/faq", icon: "question-circle", segment: 1 },
+    { name: "Groups", path: "/g", icon: "user-friends", segment: 1 },
+    { name: "Badges", path: "/badges", icon: "certificate", segment: 1 },
+  ]
+  def up
+    result = DB.query <<~SQL
+      INSERT INTO sidebar_sections(user_id, title, public, section_type, created_at, updated_at)
+      VALUES (-1, 'Community', true, 0, now(), now())
+      RETURNING sidebar_sections.id
+    SQL
+
+    community_section_id = result.last&.id
+
+    sidebar_urls =
+      COMMUNITY_SECTION_LINKS.map do |url_data|
+        "('#{url_data[:name]}', '#{url_data[:path]}', '#{url_data[:icon]}', '#{url_data[:segment]}', false, now(), now())"
+      end
+
+    result = DB.query <<~SQL
+      INSERT INTO sidebar_urls(name, value, icon, segment, external, created_at, updated_at)
+      VALUES #{sidebar_urls.join(",")}
+      RETURNING sidebar_urls.id
+    SQL
+
+    sidebar_section_links =
+      result.map.with_index do |url, index|
+        "(-1, #{url.id}, 'SidebarUrl', #{community_section_id}, #{index},  now(), now())"
+      end
+
+    result = DB.query <<~SQL
+      INSERT INTO sidebar_section_links(user_id, linkable_id, linkable_type, sidebar_section_id, position, created_at, updated_at)
+      VALUES #{sidebar_section_links.join(",")}
+    SQL
+  end
+
+  def down
+    result = DB.query <<~SQL
+      DELETE FROM sidebar_sections
+      WHERE section_type = 0
+      RETURNING sidebar_sections.id
+    SQL
+    community_section_id = result.last&.id
+
+    return true if !community_section_id
+
+    result = DB.query <<~SQL
+      DELETE FROM sidebar_section_links
+      WHERE sidebar_section_id = #{community_section_id}
+        RETURNING sidebar_section_links.linkable_id
+    SQL
+    sidebar_url_ids = result.map(&:linkable_id)
+
+    DB.query <<~SQL
+      DELETE FROM sidebar_urls
+      WHERE id IN (#{sidebar_url_ids.join(",")})
+    SQL
+  end
+end
diff --git a/db/migrate/20230413121500_add_discourse_connect_allowed_redirect_domains_to_site_settings.rb b/db/migrate/20230413121500_add_discourse_connect_allowed_redirect_domains_to_site_settings.rb
new file mode 100644
index 00000000000..dc8c339da9f
--- /dev/null
+++ b/db/migrate/20230413121500_add_discourse_connect_allowed_redirect_domains_to_site_settings.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddDiscourseConnectAllowedRedirectDomainsToSiteSettings < ActiveRecord::Migration[7.0]
+  def change
+    execute <<~SQL
+      INSERT INTO site_settings(name, data_type, value, created_at, updated_at)
+      SELECT 'discourse_connect_allowed_redirect_domains', 8, '*', created_at, NOW()
+      FROM site_settings
+      WHERE name = 'discourse_connect_allows_all_return_paths' AND value = 't'
+    SQL
+
+    execute <<~SQL
+      DELETE FROM site_settings
+      WHERE name = 'discourse_connect_allows_all_return_paths'
+    SQL
+  end
+end
diff --git a/db/migrate/20230419001801_remove_enable_custom_sidebar_sections_setting.rb b/db/migrate/20230419001801_remove_enable_custom_sidebar_sections_setting.rb
new file mode 100644
index 00000000000..75f03a7a34e
--- /dev/null
+++ b/db/migrate/20230419001801_remove_enable_custom_sidebar_sections_setting.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class RemoveEnableCustomSidebarSectionsSetting < ActiveRecord::Migration[7.0]
+  def up
+    execute "DELETE FROM site_settings WHERE name = 'enable_custom_sidebar_sections'"
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20230501022508_rename_notify_about_flags_after_site_setting.rb b/db/migrate/20230501022508_rename_notify_about_flags_after_site_setting.rb
new file mode 100644
index 00000000000..4aa6aaacae8
--- /dev/null
+++ b/db/migrate/20230501022508_rename_notify_about_flags_after_site_setting.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class RenameNotifyAboutFlagsAfterSiteSetting < ActiveRecord::Migration[7.0]
+  def up
+    execute "UPDATE site_settings SET name = 'notify_about_reviewable_item_after' WHERE name = 'notify_about_flags_after'"
+  end
+
+  def down
+    execute "UPDATE site_settings SET name = 'notify_about_flags_after' WHERE name = 'notify_about_reviewable_item_after'"
+  end
+end
diff --git a/db/migrate/20230505113906_hide_user_tips_for_existing_users.rb b/db/migrate/20230505113906_hide_user_tips_for_existing_users.rb
new file mode 100644
index 00000000000..a904c8f4da0
--- /dev/null
+++ b/db/migrate/20230505113906_hide_user_tips_for_existing_users.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class HideUserTipsForExistingUsers < ActiveRecord::Migration[7.0]
+  def up
+    execute "UPDATE user_options SET seen_popups = '{1, 2, 3, 4, 5}'"
+  end
+
+  def down
+    execute "UPDATE user_options SET seen_popups = '{}'"
+  end
+end
diff --git a/db/migrate/20230509214723_separate_trusted_users_can_edit_others_site_setting.rb b/db/migrate/20230509214723_separate_trusted_users_can_edit_others_site_setting.rb
new file mode 100644
index 00000000000..91d2bd7d985
--- /dev/null
+++ b/db/migrate/20230509214723_separate_trusted_users_can_edit_others_site_setting.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class SeparateTrustedUsersCanEditOthersSiteSetting < ActiveRecord::Migration[7.0]
+  def up
+    if select_value(
+         "SELECT 1 FROM site_settings WHERE name = 'trusted_users_can_edit_others' AND value = 'f'",
+       )
+      execute <<~SQL
+        INSERT INTO site_settings (name, data_type, value, created_at, updated_at) VALUES ('edit_all_topic_groups', 20, '', now(), now());
+        INSERT INTO site_settings (name, data_type, value, created_at, updated_at) VALUES ('edit_all_post_groups', 20, '', now(), now());
+      SQL
+    end
+  end
+
+  def down
+    execute <<~SQL
+      DELETE FROM site_settings WHERE name = 'edit_all_topic_groups';
+      DELETE FROM site_settings WHERE name = 'edit_all_post_groups';
+    SQL
+  end
+end
diff --git a/db/migrate/20230523073109_delete_old_personal_message_settings.rb b/db/migrate/20230523073109_delete_old_personal_message_settings.rb
new file mode 100644
index 00000000000..e1772a84b25
--- /dev/null
+++ b/db/migrate/20230523073109_delete_old_personal_message_settings.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class DeleteOldPersonalMessageSettings < ActiveRecord::Migration[7.0]
+  def up
+    execute <<~SQL
+      DELETE FROM site_settings WHERE name = 'enable_personal_messages'
+    SQL
+
+    execute <<~SQL
+      DELETE FROM site_settings WHERE name = 'min_trust_to_send_messages'
+    SQL
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20230528134326_enable_experimental_hashtag_autocomplete_true_for_all_sites.rb b/db/migrate/20230528134326_enable_experimental_hashtag_autocomplete_true_for_all_sites.rb
new file mode 100644
index 00000000000..7e40e260a4f
--- /dev/null
+++ b/db/migrate/20230528134326_enable_experimental_hashtag_autocomplete_true_for_all_sites.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class EnableExperimentalHashtagAutocompleteTrueForAllSites < ActiveRecord::Migration[7.0]
+  def up
+    DB.exec(<<~SQL)
+      UPDATE site_settings
+      SET value = 't'
+      WHERE name = 'enable_experimental_hashtag_autocomplete'
+    SQL
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20230602034711_rename_everything_to_topics_link.rb b/db/migrate/20230602034711_rename_everything_to_topics_link.rb
new file mode 100644
index 00000000000..040bd5df478
--- /dev/null
+++ b/db/migrate/20230602034711_rename_everything_to_topics_link.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+class RenameEverythingToTopicsLink < ActiveRecord::Migration[7.0]
+  def up
+    DB.exec <<~SQL
+      UPDATE sidebar_urls su1
+      SET name = 'Topics'
+      FROM sidebar_urls su2
+      INNER JOIN sidebar_section_links ON sidebar_section_links.linkable_id = su2.id
+      INNER JOIN sidebar_sections ON sidebar_sections.id = sidebar_section_links.sidebar_section_id AND sidebar_sections.section_type = 0
+      WHERE su1.id = su2.id AND su2.value = '/latest' AND su2.name = 'Everything'
+    SQL
+  end
+
+  def down
+    DB.exec <<~SQL
+      UPDATE sidebar_urls su1
+      SET name = 'Everything'
+      FROM sidebar_urls su2
+      INNER JOIN sidebar_section_links ON sidebar_section_links.linkable_id = su2.id
+      INNER JOIN sidebar_sections ON sidebar_sections.id = sidebar_section_links.sidebar_section_id AND sidebar_sections.section_type = 0
+      WHERE su1.id = su2.id AND su2.value = '/topics' AND su2.name = 'Topics'
+    SQL
+  end
+end
diff --git a/db/migrate/20230608163854_create_summary_sections_table.rb b/db/migrate/20230608163854_create_summary_sections_table.rb
new file mode 100644
index 00000000000..b325f5f14a1
--- /dev/null
+++ b/db/migrate/20230608163854_create_summary_sections_table.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class CreateSummarySectionsTable < ActiveRecord::Migration[7.0]
+  def change
+    create_table :summary_sections do |t|
+      t.integer :target_id, null: false
+      t.string :target_type, null: false
+      t.int4range :content_range
+      t.string :summarized_text, null: false
+      t.integer :meta_section_id
+      t.string :original_content_sha, null: false
+      t.string :algorithm, null: false
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20230614011312_rename_default_sidebar_categories_setting.rb b/db/migrate/20230614011312_rename_default_sidebar_categories_setting.rb
new file mode 100644
index 00000000000..17587163a8e
--- /dev/null
+++ b/db/migrate/20230614011312_rename_default_sidebar_categories_setting.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RenameDefaultSidebarCategoriesSetting < ActiveRecord::Migration[7.0]
+  def change
+    execute "UPDATE site_settings SET name = 'default_navigation_menu_categories' WHERE name = 'default_sidebar_categories'"
+  end
+end
diff --git a/db/migrate/20230614011419_rename_default_sidebar_tags_setting.rb b/db/migrate/20230614011419_rename_default_sidebar_tags_setting.rb
new file mode 100644
index 00000000000..38c347bfde3
--- /dev/null
+++ b/db/migrate/20230614011419_rename_default_sidebar_tags_setting.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RenameDefaultSidebarTagsSetting < ActiveRecord::Migration[7.0]
+  def change
+    execute "UPDATE site_settings SET name = 'default_navigation_menu_tags' WHERE name = 'default_sidebar_tags'"
+  end
+end
diff --git a/db/migrate/20230618041001_add_sidebar_link_to_filtered_list_to_user_option.rb b/db/migrate/20230618041001_add_sidebar_link_to_filtered_list_to_user_option.rb
new file mode 100644
index 00000000000..25bae7a2ebb
--- /dev/null
+++ b/db/migrate/20230618041001_add_sidebar_link_to_filtered_list_to_user_option.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class AddSidebarLinkToFilteredListToUserOption < ActiveRecord::Migration[7.0]
+  def change
+    add_column :user_options, :sidebar_link_to_filtered_list, :boolean, default: false, null: false
+
+    execute <<~SQL
+      UPDATE user_options
+      SET sidebar_link_to_filtered_list = true
+      WHERE sidebar_list_destination = 1
+    SQL
+  end
+end
diff --git a/db/migrate/20230618041123_add_sidebar_show_count_of_new_items_to_user_option.rb b/db/migrate/20230618041123_add_sidebar_show_count_of_new_items_to_user_option.rb
new file mode 100644
index 00000000000..4ec3f496a61
--- /dev/null
+++ b/db/migrate/20230618041123_add_sidebar_show_count_of_new_items_to_user_option.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddSidebarShowCountOfNewItemsToUserOption < ActiveRecord::Migration[7.0]
+  def change
+    add_column :user_options,
+               :sidebar_show_count_of_new_items,
+               :boolean,
+               default: false,
+               null: false
+
+    execute <<~SQL
+      UPDATE user_options
+      SET sidebar_show_count_of_new_items = true
+      WHERE sidebar_list_destination = 1
+    SQL
+  end
+end
diff --git a/db/migrate/20230620050614_remove_default_sidebar_list_destination_setting.rb b/db/migrate/20230620050614_remove_default_sidebar_list_destination_setting.rb
new file mode 100644
index 00000000000..ea42a186124
--- /dev/null
+++ b/db/migrate/20230620050614_remove_default_sidebar_list_destination_setting.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class RemoveDefaultSidebarListDestinationSetting < ActiveRecord::Migration[7.0]
+  def up
+    execute("DELETE FROM site_settings WHERE name = 'default_sidebar_list_destination'")
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20230627060104_remove_new_edit_sidebar_categories_tags_interface_groups_site_setting.rb b/db/migrate/20230627060104_remove_new_edit_sidebar_categories_tags_interface_groups_site_setting.rb
new file mode 100644
index 00000000000..c933c3e6fc9
--- /dev/null
+++ b/db/migrate/20230627060104_remove_new_edit_sidebar_categories_tags_interface_groups_site_setting.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class RemoveNewEditSidebarCategoriesTagsInterfaceGroupsSiteSetting < ActiveRecord::Migration[7.0]
+  def up
+    execute(
+      "DELETE FROM site_settings WHERE name = 'new_edit_sidebar_categories_tags_interface_groups'",
+    )
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20230628062236_add_watched_precedence_over_muted_to_user_options.rb b/db/migrate/20230628062236_add_watched_precedence_over_muted_to_user_options.rb
new file mode 100644
index 00000000000..ed12eab9b98
--- /dev/null
+++ b/db/migrate/20230628062236_add_watched_precedence_over_muted_to_user_options.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+class AddWatchedPrecedenceOverMutedToUserOptions < ActiveRecord::Migration[7.0]
+  def change
+    add_column :user_options, :watched_precedence_over_muted, :boolean
+  end
+end
diff --git a/db/migrate/20230703035052_add_status_to_translation_overrides.rb b/db/migrate/20230703035052_add_status_to_translation_overrides.rb
new file mode 100644
index 00000000000..d210514d968
--- /dev/null
+++ b/db/migrate/20230703035052_add_status_to_translation_overrides.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddStatusToTranslationOverrides < ActiveRecord::Migration[7.0]
+  def change
+    add_column :translation_overrides, :original_translation, :text
+    add_column :translation_overrides, :status, :integer, null: false, default: 0
+  end
+end
diff --git a/db/migrate/20230707031122_add_watched_precedence_over_muted_index_to_user_options.rb b/db/migrate/20230707031122_add_watched_precedence_over_muted_index_to_user_options.rb
new file mode 100644
index 00000000000..91d32ac03cb
--- /dev/null
+++ b/db/migrate/20230707031122_add_watched_precedence_over_muted_index_to_user_options.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddWatchedPrecedenceOverMutedIndexToUserOptions < ActiveRecord::Migration[7.0]
+  def change
+    add_index :user_options, :watched_precedence_over_muted
+  end
+end
diff --git a/db/migrate/20230708011310_fix_reviewable_queued_posts_target_created_by_id.rb b/db/migrate/20230708011310_fix_reviewable_queued_posts_target_created_by_id.rb
new file mode 100644
index 00000000000..dcafdb23900
--- /dev/null
+++ b/db/migrate/20230708011310_fix_reviewable_queued_posts_target_created_by_id.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class FixReviewableQueuedPostsTargetCreatedById < ActiveRecord::Migration[7.0]
+  def up
+    execute <<~SQL
+      UPDATE reviewables
+      SET target_created_by_id = created_by_id,
+          created_by_id = #{Discourse::SYSTEM_USER_ID}
+      WHERE type = 'ReviewableQueuedPost' AND target_created_by_id IS NULL
+    SQL
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20230712011946_add_topic_id_notification_level_index_to_topic_users.rb b/db/migrate/20230712011946_add_topic_id_notification_level_index_to_topic_users.rb
new file mode 100644
index 00000000000..4b7aa7a1e58
--- /dev/null
+++ b/db/migrate/20230712011946_add_topic_id_notification_level_index_to_topic_users.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+#
+class AddTopicIdNotificationLevelIndexToTopicUsers < ActiveRecord::Migration[7.0]
+  def change
+    add_index :topic_users, %i[topic_id notification_level]
+  end
+end
diff --git a/db/migrate/20230712013248_add_category_id_notification_level_index_to_category_users.rb b/db/migrate/20230712013248_add_category_id_notification_level_index_to_category_users.rb
new file mode 100644
index 00000000000..164ab11743f
--- /dev/null
+++ b/db/migrate/20230712013248_add_category_id_notification_level_index_to_category_users.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddCategoryIdNotificationLevelIndexToCategoryUsers < ActiveRecord::Migration[7.0]
+  def change
+    add_index :category_users, %i[category_id notification_level]
+  end
+end
diff --git a/db/migrate/20230727015030_add_index_topic_id_created_at_on_posts.rb b/db/migrate/20230727015030_add_index_topic_id_created_at_on_posts.rb
new file mode 100644
index 00000000000..8a983138ae7
--- /dev/null
+++ b/db/migrate/20230727015030_add_index_topic_id_created_at_on_posts.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class AddIndexTopicIdCreatedAtOnPosts < ActiveRecord::Migration[7.0]
+  disable_ddl_transaction!
+
+  def up
+    remove_index :posts, %i[topic_id created_at], algorithm: :concurrently, if_exists: true
+    add_index :posts, %i[topic_id created_at], algorithm: :concurrently
+  end
+
+  def down
+    remove_index :posts, %i[topic_id created_at], algorithm: :concurrently, if_exists: true
+  end
+end
diff --git a/db/migrate/20230728055813_delete_orphaned_draft_upload_references.rb b/db/migrate/20230728055813_delete_orphaned_draft_upload_references.rb
new file mode 100644
index 00000000000..c6d49083d3e
--- /dev/null
+++ b/db/migrate/20230728055813_delete_orphaned_draft_upload_references.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class DeleteOrphanedDraftUploadReferences < ActiveRecord::Migration[7.0]
+  def up
+    execute <<~SQL
+      DELETE
+      FROM
+        "upload_references"
+      WHERE
+        "upload_references"."target_type" = 'Draft' AND
+        "upload_references"."target_id" NOT IN (
+          SELECT "drafts"."id" FROM "drafts"
+        )
+    SQL
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/post_migrate/20230119091939_drop_orphaned_reviewable_flagged_posts.rb b/db/post_migrate/20230119091939_drop_orphaned_reviewable_flagged_posts.rb
new file mode 100644
index 00000000000..3efe3c06882
--- /dev/null
+++ b/db/post_migrate/20230119091939_drop_orphaned_reviewable_flagged_posts.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class DropOrphanedReviewableFlaggedPosts < ActiveRecord::Migration[7.0]
+  def up
+    DB.exec(<<~SQL)
+      DELETE FROM reviewables
+      WHERE reviewables.type = 'ReviewableFlaggedPost'
+        AND reviewables.status = 0
+        AND reviewables.target_type = 'Post'
+        AND NOT EXISTS(SELECT 1 FROM posts WHERE posts.id = reviewables.target_id)
+    SQL
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/post_migrate/20230224225129_backfill_svg_sprites.rb b/db/post_migrate/20230224225129_backfill_svg_sprites.rb
new file mode 100644
index 00000000000..b7b8b04d69e
--- /dev/null
+++ b/db/post_migrate/20230224225129_backfill_svg_sprites.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class BackfillSvgSprites < ActiveRecord::Migration[7.0]
+  disable_ddl_transaction!
+
+  def up
+    ThemeSvgSprite.refetch!
+  end
+end
diff --git a/db/post_migrate/20230228105851_drop_badge_granted_title_column.rb b/db/post_migrate/20230228105851_drop_badge_granted_title_column.rb
new file mode 100644
index 00000000000..2a646d850ee
--- /dev/null
+++ b/db/post_migrate/20230228105851_drop_badge_granted_title_column.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class DropBadgeGrantedTitleColumn < ActiveRecord::Migration[7.0]
+  DROPPED_COLUMNS ||= { user_profiles: %i[badge_granted_title] }
+
+  def up
+    DROPPED_COLUMNS.each { |table, columns| Migration::ColumnDropper.execute_drop(table, columns) }
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/post_migrate/20230405121454_update_password_algorithm_post_deploy.rb b/db/post_migrate/20230405121454_update_password_algorithm_post_deploy.rb
new file mode 100644
index 00000000000..c07333afe6c
--- /dev/null
+++ b/db/post_migrate/20230405121454_update_password_algorithm_post_deploy.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class UpdatePasswordAlgorithmPostDeploy < ActiveRecord::Migration[7.0]
+  def up
+    # Handles any users that were created by old-version app code since
+    # the 20230405121453 pre-deploy migration was run
+    execute <<~SQL
+      UPDATE users SET password_algorithm = '$pbkdf2-sha256$i=64000,l=32$'
+      WHERE users.password_algorithm IS NULL
+      AND users.password_hash IS NOT NULL
+    SQL
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/docs/ADMIN-QUICK-START-GUIDE.md b/docs/ADMIN-QUICK-START-GUIDE.md
index 4a157b94288..6f4a4b69104 100644
--- a/docs/ADMIN-QUICK-START-GUIDE.md
+++ b/docs/ADMIN-QUICK-START-GUIDE.md
@@ -1,40 +1,118 @@
 Congratulations, you are now the proud owner of your very own [Civilized Discourse Construction Kit](https://www.discourse.org). :hatching_chick:
 
-### Getting Started
+![](https://www.discourse.org/images/welcome/welcome-to-discourse-hosting-690x314.jpg)
 
-If you haven't already, launch the [setup wizard](/wizard) and go through the steps to configure your site. You can run the wizard as many times as you want, it's completely safe!
+# 1. Initial setup 
+Discourse is a powerful, versatile platform with many options.  To help you make sure you're covering all the bases as you get started with your new community, we provided some checklists and guidance below. If you haven't already, [complete the Setup Wizard](/wizard) which covers the essentials. 
 
-### Admin Dashboard
+You now also need to [test your email](#h-4-maintaining-your-discourse-server-14) to make sure it is configured correctly, otherwise new signups and notifications will not work. 
 
-Exercise your admin superpowers any time via the admin dashboard at
+For more assistance on configuring and running your Discourse forum, see [meta.discourse.org](https://meta.discourse.org/).
+ 
+### Recommended before inviting most of your members
+It is essential that you provide a meaningful name and description for your site, so your members immediately know what your community is about. Also edit the welcome topic. In a few sentences, let everyone know who this community is for, what they can expect to find here, and what you'd like them to do as soon as they arrive. 
 
-[**/admin**](/admin)
+[] Add your site name and description
+[] Edit your welcome topic
 
-You can also access it via the "hamburger" <kbd>☰</kbd> menu in the upper right: Admin functions are generally marked with the wrench :wrench:  icon, so look for that.
+### Legal
+You are responsible for providing your organization's details and legal notices. Discourse will place boilerplate templates in your #staff category when you add your company name in the setup wizard. 
+
+[] Add your company name and details
+[] Edit the boilerplate TOS or provide a link to the TOS on your main site
+[] Edit the boilerplate Privacy Notice or provide a link to the Privacy Notice on your main site
+
+### Customization options 
+
+Out of the box, Discourse provides a clean, friendly design. Via the setup wizard and admin dashboard, you can make changes easily to make your site look and feel unique. No special skills are required, but advanced options are available if you have access to the tech skills. 
+
+[] Upload logo images
+[] Change the color scheme
+[] Change the font used for text and headers
+[] Install a different site theme 
+[] Choose a different homepage style
+[] Customize the default categories and tags shown on the sidebar
+[] Add a custom section to the sidebar
+[] Add custom user fields to let members provide more info about themselves
+
+[details="Advanced options"]
+
+Discourse is very configurable and there is a great deal programmers and web designers can do to customize it, integrate it into other platforms, or address any use case. Users going down this route are highly encouraged to join meta.discourse.org, our support community, to learn from what others have and to give and get advice. 
+
+[] Add one or more social login options: [Google](https://meta.discourse.org/t/configuring-google-oauth2-login-for-discourse/15858), [Twitter](https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395), [Facebook](https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394), [GitHub](https://meta.discourse.org/t/configuring-github-login-for-discourse/13745), [Discord](https://meta.discourse.org/t/configure-discord-login-for-discourse/127129?u=tobiaseigen), [Apple](https://www.discourse.org/plugins/apple-login), [Amazon, LinkedIn, and Microsoft](https://www.discourse.org/plugins/amazon-linkedin-microsoft-login)
+[] [Embed Discourse in your WordPress website](https://github.com/discourse/wp-discourse), or [on your static HTML site](https://meta.discourse.org/t/embedding-discourse-comments-via-javascript/31963)
+[] Set up [single-sign on](https://meta.discourse.org/t/official-single-sign-on-for-discourse/13045) with your main site 
+[] [Build your own login method](https://meta.discourse.org/t/login-to-discourse-with-custom-oauth2-provider/14717)
+[] [Create your own theme](https://meta.discourse.org/docs?topic=93648) 
+[] [Interact with Discourse from other applications using the API](https://meta.discourse.org/t/create-and-configure-an-api-key/230124?u=tobiaseigen)
+[/details]
+
+# 2. Invite your members
+Once you've done the initial setup, you're ready to invite your founding members who can help you finish setup and get some conversations started. Go to [your invites page](/my/invited) and look for the <kbd>+ Invite</kbd> button to create invite links you can share or directly email everyone you want to have in your community. **Be sure to follow up to make sure they join and start participating!**
+
+### To complete together with your founding members
+[] Founding members sign up and commit to visiting and participating regularly (at least 3 recommended)
+[] Members provide their name, bio and picture
+[] Create interesting topics (at least 5 topics and 30 replies recommended)
+[] Start talking in chat
+[] Talk in #feedback about how to use the site and how it is organized
+[] Review and edit the provided Community Guidelines (FAQ) 
+
+### When you're ready, launch your community!
+[] For public sites, link your community everywhere and promote it so people can find it!
+[] Send out invitations by email and by sharing invite links in channels used by your community (you can also create [bulk invites](https://meta.discourse.org/t/sending-bulk-user-invites/16468) and [invite users into groups](https://meta.discourse.org/t/invite-individual-users-to-a-group/15544))
+[] Keep following up to make sure as many people as possible are joining and communicating with each other on your Discourse site
+
+> **Note:** To make launching your new site easier, all new members will have daily email summary emails enabled (instead of the usual weekly) and be given a higher level of trust. See below to learn more about the trust system and bootstrap mode.
+
+# 3. Managing your forum
+
+### Admin and Moderator tools 
+Exercise your admin superpowers anytime via the [admin dashboard](/admin). You can access it via the :wrench: admin link on the menu. Admin and moderator functions are generally marked with the wrench :wrench: icon, so look for that.
 
 ### Staff
-
-Staff members are official representatives of this community. There are two kinds of Staff:
+Staff members are official representatives of this community. There are two kinds of Staff in Discourse:
 
 1. **Admins**, who can do anything and configure anything on this site.
-2. **Moderators**, who can edit all posts and users, but cannot add categories or change any site settings.
+2. **Moderators**, who can edit all posts and users but cannot add categories or change any site settings.
 
-To add additional staff members:
+Promoting members of your community is easy:
 
-- have them sign up on the site (or [send out an invitation to join via your user page](/my/invited))
-- click the admin button :wrench: on their user page
+- select :wrench: admin wrench on their user page
 - look for the <kbd>Grant Admin</kbd> and <kbd>Grant Moderator</kbd> buttons there
 
-### Social Logins
+### Categories
+You have three default categories:
 
-Users can log in with traditional local username and password accounts. You may want to add:
+1. [General](/category/general) – create topics here that don't fit into any other existing category.
+2. [Site Feedback](/category/site-feedback) – Discussion about this site, its organization, how it works, and how you and your community can improve it. [It's important!](https://meta.discourse.org/t/5249)
+3. [Staff](/category/staff) – Visible only to staff (admins and moderators)
+**Only create a few initial categories**, as you can overwhelm your community. You can always add more categories later and easily bulk recategorize topics. You and your members will have a better experience if you figure out the organization as you go rather than assuming you'll get it all right from the beginning.
 
-- [Google logins](https://meta.discourse.org/t/configuring-google-oauth2-login-for-discourse/15858)
-- [Twitter logins](https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395)
-- [Facebook logins](https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394)
-- [GitHub logins](https://meta.discourse.org/t/configuring-github-login-for-discourse/13745)
+Select the :wrench: admin wrench on the [categories page](https://dev.discourse.org/categories) to add a category. You can set security per-category so only certain groups of users can see topics in that category.
 
-You can also [set up single-sign on](https://meta.discourse.org/t/official-single-sign-on-for-discourse/13045), or even [build your own login method](https://meta.discourse.org/t/login-to-discourse-with-custom-oauth2-provider/14717).
+Every category has an initial "About this category" topic which you will want to edit to suit your needs. This topic will be pinned to the top of the category, and the description you enter in the first paragraph will appear throughout. Be sure to give your new category a good, clear description, so people understand what belongs there!
+
+In addition to categories, Discourse allows you to organize topics with tags. Tags offer a flexible alternative to categories. Create tags when editing topics.
+
+### Pinned topics and banners
+Note how pinning topics works in Discourse:
+
+- Once someone reads to the bottom of a pinned topic, it is automatically unpinned for them specifically. They can change this via the personal pin controls at the bottom of the topic.
+- When staff pins a topic, they can pin it globally to all topic lists, or just within its category.
+
+If a pin isn't visible enough, you can also turn one single topic into a **banner**. The banner topic floats on top of all topics and all primary pages. Users can permanently dismiss this floating banner by clicking the × in the upper right corner.
+
+To make (or remove) a pin or banner, use the topic :wrench: admin wrench.
+
+### Forum moderation and community building
+Discourse has a trust level system where users earn trust over time and gain abilities to assist in governing their community. The trust level system is designed to offer safe defaults, even for public communities with no active moderation. You should not have to change them. For more details, see [Understanding Trust Levels](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/).
+
+> **0 (new) → 1 (basic) → 2 (member) → 3 (regular) → 4 (leader)**
+
+To make launching your new site easier, all new users will have daily email summary emails enabled (instead of the usual weekly) and be given a higher level of trust that allows them to bypass new user restrictions. Once you've reached a certain number of users (adjustable via the [Bootstrap mode admin setting](/admin/site_settings/category/all_results?filter=bootstrap)) new users will have to spend 15 minutes reading to remove new user restrictions, or be invited by another trusted user.
+
+# 4. Maintaining your Discourse server
 
 ### Test Your Email
 
@@ -46,73 +124,6 @@ Email is required for new account signups and notifications. **Test your email t
 
 If you'd like to enable *replying* to topics via email, [see this howto](https://meta.discourse.org/t/set-up-reply-via-email-support/14003).
 
-### Categories
-
-You have three default categories:
-
-1. [Site Feedback](/category/site-feedback) – general discussion about the site itself. [It's important!](https://meta.discourse.org/t/5249)
-2. [Lounge](/category/lounge) – a perk for users at trust level 3 and higher
-3. [Staff](/category/staff) – visible only to staff (admins and moderators)
-
-**Don't create too many initial categories**, as you can overwhelm your audience. You can always add more categories, and easily bulk recategorize topics later. It's better to figure out the organization as you go rather than assuming you'll get it all right from the beginning (hint: you won't).
-
-To add a category, visit the [categories page](/categories), then click Create Category at the upper right. You can set security per-category so only certain groups of users can see topics in that category.
-
-Every category has an initial "About this category" topic. This topic will be pinned to the top of the category, and the description you enter will be used in a bunch of places. Be sure to give your new category a good, clear description, so people understand what belongs there!
-
-### Pinned Topics and Banners
-
-Note that pinning topics does work a little differently in Discourse:
-
-- Once someone reads to the bottom of a pinned topic, it is automatically unpinned for them specifically. They can change this via the personal pin controls at the bottom of the topic.
-- When staff pins a topic, they can pin it globally to all topic lists, or just within its category.
-
-If a pin isn't visible enough, you can also turn one single topic into a **banner**. The banner topic floats on top of all topics and all primary pages. Users can permanently dismiss this floating banner by clicking the &times; in the upper right corner.
-
-To make (or remove) a pin or a banner, use the admin wrench at the top right or bottom of the topic.
-
-### New User Sandbox and the Trust System
-
-If your discussion area is open to the public, new visitors will arrive that are initially strangers to the community. Discourse has a [trust system](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) where users can, over time, earn the trust of the community and gain abilities to assist in governing their community.
-
-Discourse is designed to offer safe defaults for public communities, even with no active moderation.
-
-> **0 (new) &rarr; 1 (basic) &rarr; 2 (member) &rarr; 3 (regular) &rarr; 4 (leader)**
-
-All new users start out in a sandbox with restrictions for everyone's safety. **Trust level 0 (new) users _cannot_** &hellip;
-
-- post more than 2 hyperlinks
-- post more than 1 image
-- post file attachments
-- send personal messages
-- flag posts or topics
-- have actual links in the "about me" field of their profile
-- @name mention more than 2 users in a post
-
-Every action a user can take is rate limited for safety, and especially so for new users. But don't worry, new users can [transition to trust level 1](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) in about 10 minutes of reading.
-
-These defaults are safe, but note that while in "bootstrap mode" after you set up your site, all new users will be granted trust level 1 until you reach 50 users.
-
-### Building Your Community
-
-Be patient; building communities is hard. Before launching, be sure to:
-
-1. Clearly define your community's purpose in a pinned or banner topic.
-2. Seed the discussion with interesting topics.
-3. Commit to visiting and participating regularly.
-4. Link your community everywhere and promote it so people can find it.
-
-There's more advice at [Building a Discourse Community](https://blog.discourse.org/2014/08/building-a-discourse-community/).
-
-### Sending Invitations
-
-One way to get people to visit your site is to invite them via email. You can do this via:
-
-- The Invite button at the bottom of the topic.
-- The Invite area on your profile page.
-
-The invite area on your profile page also includes advanced Staff methods of [sending bulk invites](https://meta.discourse.org/t/sending-bulk-user-invites/16468), and [inviting users into groups](https://meta.discourse.org/t/invite-individual-users-to-a-group/15544).
-
 ### Maintenance
 
 - One CPU and 1GB of memory, with swap, is the minimum for a basic Discourse community. As your community grows you may need more memory or CPU resources.
@@ -121,22 +132,22 @@ The invite area on your profile page also includes advanced Staff methods of [se
 
 - You should get an email notification when new versions of Discourse are released. To update your instance via our easy one click upgrade process, visit [/admin/upgrade](/admin/upgrade).
 
-- Some other things you might eventually want to set up:
-   - [Automatic daily backups](https://meta.discourse.org/t/configure-automatic-backups-for-discourse/14855)
-   - [HTTPS support](https://meta.discourse.org/t/allowing-ssl-for-your-discourse-docker-setup/13847)
-   - [Content Delivery Network support](https://meta.discourse.org/t/enable-a-cdn-for-your-discourse/14857)
-   - [Reply via Email](https://meta.discourse.org/t/set-up-reply-via-email-support/14003)
-   - [Import and Export your data](https://meta.discourse.org/t/move-your-discourse-instance-to-a-different-server/15721)
-   - [Change the domain name](https://meta.discourse.org/t/how-do-i-change-the-domain-name/16098)
-   - [Multiple Discourse instances on the same server](https://meta.discourse.org/t/multisite-configuration-with-docker/14084)
-   - [Import old content from vBulletin, PHPbb, Vanilla, Drupal, BBPress, etc](https://github.com/discourse/discourse/tree/main/script/import_scripts)
-   - A firewall on your server? [Configure firewall](https://meta.discourse.org/t/configure-a-firewall-for-discourse/20584).
-   - A user friendly [offline page when rebuilding or upgrading?](https://meta.discourse.org/t/adding-an-offline-page-when-rebuilding/45238)
-   - Embed Discourse [in your WordPress install](https://github.com/discourse/wp-discourse), or [on your static HTML site](https://meta.discourse.org/t/embedding-discourse-comments-via-javascript/31963)
+### Optional things you might eventually want to set up
+[] [Automatic daily backups](https://meta.discourse.org/t/configure-automatic-backups-for-discourse/14855)
+[] [HTTPS support](https://meta.discourse.org/t/allowing-ssl-for-your-discourse-docker-setup/13847)
+[] [Content Delivery Network support](https://meta.discourse.org/t/enable-a-cdn-for-your-discourse/14857)
+[] [Reply via Email](https://meta.discourse.org/t/set-up-reply-via-email-support/14003)
+[] [Import and Export your data](https://meta.discourse.org/t/move-your-discourse-instance-to-a-different-server/15721)
+[] [Change the domain name](https://meta.discourse.org/t/how-do-i-change-the-domain-name/16098)
+[] [Multiple Discourse instances on the same server](https://meta.discourse.org/t/multisite-configuration-with-docker/14084)
+[] [Import old content from vBulletin, PHPbb, Vanilla, Drupal, BBPress, etc](https://github.com/discourse/discourse/tree/main/script/import_scripts)
+[] [Configure a firewall on your server](https://meta.discourse.org/t/configure-a-firewall-for-discourse/20584).
+[] [A user friendly offline page when rebuilding or upgrading](https://meta.discourse.org/t/adding-an-offline-page-when-rebuilding/45238)
 
-### Need more Help?
-
-For more assistance on configuring and running your Discourse forum, see [meta.discourse.org](https://meta.discourse.org).
+#  Resources and help are a click away
+* Read our blog post [Building a Discourse Community](http://blog.discourse.org/2014/08/building-a-discourse-community/) 
+* Join meta.discourse.org, our official community, to discuss features, bugs, hosting, development and general support with other Discourse users 
+* Search <https://meta.discourse.org/docs> for detailed documentation about using discourse, moderation, the admin dashboard, theming and customization, and much much more. 
 
 ----
 
diff --git a/docs/CHANGELOG-JAVASCRIPT-PLUGIN-API.md b/docs/CHANGELOG-JAVASCRIPT-PLUGIN-API.md
index 3ded3ddf1ac..700cf004bb6 100644
--- a/docs/CHANGELOG-JAVASCRIPT-PLUGIN-API.md
+++ b/docs/CHANGELOG-JAVASCRIPT-PLUGIN-API.md
@@ -7,6 +7,47 @@ in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.7.1] - 2023-07-18
+
+### Added
+
+- Adds `addBulkActionButton` which adds actions to the Bulk Topic modal
+
+## [1.7.0] - 2023-07-17
+
+### Added
+
+- Adds `addCommunitySectionLink` which allows plugins to add a navigation link to the Sidebar community section under
+  the "More..." links drawer.
+
+- Adds `registerUserCategorySectionLinkCountable` which allows plugins to register a new countable for section links
+  under Sidebar Categories section on top of the default countables of unread topics count and new topics count.
+
+- Adds `registerCustomCategorySectionLinkLockIcon` which allows plugins to change the lock icon used for a sidebar
+  category section link to indicate that a category is read restricted.
+
+- Adds `registerCustomCategorySectionLinkPrefix` which allows plugins to register a custom prefix for a sidebar category
+  section link.
+
+- Adds `registerCustomTagSectionLinkPrefixValue` which allows plugins to register a custom prefix for a sidebar tag
+  section link.
+
+- Adds `refreshUserSidebarCategoriesSectionCounts` which allows plugins to trigger a refresh of the counts for all
+  category section links under the categories section for a logged in user.
+
+- Adds `addSidebarSection` which allows plugins to add a Sidebar section.
+
+- Adds `registerNotificationTypeRenderer` which allows plugins to register a custom renderer for a notification type
+  or override the renderer of an existing type. See lib/notification-types/base.js for documentation and the default
+  renderer.
+
+- Adds `registerModelTransformer` which allows plugins to apply transformation using a callback on a list of model
+  instances of a specific type. Currently, this API only works on lists rendered in the user menu such as notifications,
+  bookmarks and topics (i.e. messages), but it may be extended to other lists in other parts of the app.
+
+- Adds `addUserMessagesNavigationDropdownRow` which allows plugins to add a row to the dropdown used on the
+  `userPrivateMessages` route used to navigate between the different user messages pages.
+
 ## [1.6.0] - 2022-12-13
 
 ### Added
diff --git a/docs/INSTALL-cloud.md b/docs/INSTALL-cloud.md
index 2a65cf813f2..9409da5cfbc 100644
--- a/docs/INSTALL-cloud.md
+++ b/docs/INSTALL-cloud.md
@@ -42,7 +42,7 @@ walkthrough will go through these in detail:
 
 - Already have a mail server? Great. Use your existing mail server credentials. (Free email services like Gmail/Outlook/Yahoo do not support transactional emails.)
 
-- To ensure mail deliverability, you must add valid [SPF and DKIM records](https://www.google.com/search?q=what+is+spf+dkim) in your DNS. See your mail provider instructions for specifics.
+- To ensure mail deliverability, you must add valid [SPF and DKIM records](https://www.google.com/search?q=what+is+spf+dkim) in your DNS. You'll need SMTP credentials from your email provider, which include an SMTP username and password. Log in to your email provider's account, go to SMTP settings or Email API section, and locate/generate your unique SMTP credentials. Keep them secure, as you'll use them during the Discourse configuration. See your mail provider instructions for specifics.
 
 - If you're having trouble getting emails to work, follow our [Email Troubleshooting Guide](https://meta.discourse.org/t/troubleshooting-email-on-a-new-discourse-install/16326)
 
@@ -183,7 +183,9 @@ Do you want...
 
 - Automatic daily backups? [Configure backups](https://meta.discourse.org/t/configure-automatic-backups-for-discourse/14855).
  
-- Free HTTPS / SSL support? [Configure Let's Encrypt](https://meta.discourse.org/t/setting-up-lets-encrypt-cert-with-discourse-docker/40709). Paid HTTPS / SSL support? [Configure SSL](https://meta.discourse.org/t/allowing-ssl-for-your-discourse-docker-setup/13847).
+- HTTPS / SSL support?
+  - Free HTTPS / SSL support with Let's Encrypt is enabled [during standard installation](https://github.com/discourse/discourse/blob/main/docs/INSTALL-cloud.md#6-edit-discourse-configuration).  If you skipped this step, [Configure Let's Encrypt](https://meta.discourse.org/t/setting-up-lets-encrypt-cert-with-discourse-docker/40709).
+  - Paid HTTPS / SSL support? [Configure SSL](https://meta.discourse.org/t/allowing-ssl-for-your-discourse-docker-setup/13847). 
 
 - Use a plugin [from Discourse](https://github.com/discourse) or a third party? [Configure plugins](https://meta.discourse.org/t/install-a-plugin/19157) 
 
diff --git a/docs/INSTALL-email.md b/docs/INSTALL-email.md
index be2d478147a..67902906163 100644
--- a/docs/INSTALL-email.md
+++ b/docs/INSTALL-email.md
@@ -26,7 +26,11 @@ We recommend creating an [API Key][sg2] instead of using your SendGrid username
 
 #### [Mailjet][jet] &mdash; 6k emails/month (200 max/day)
 
-Go to [My Account page](https://app.mailjet.com/account) and click on the ["SMTP and SEND API Settings"](https://app.mailjet.com/account/setup) link.
+Go to [My Account page](https://app.mailjet.com/account) and click on the ["SMTP and SEND API Settings"](https://app.mailjet.com/account/relay) link to generate a secret key and get the SMTP server address.
+
+    SMTP server address? [Mailjet SMTP server address]
+    SMTP username?       [Mailjet API key]
+    SMTP password?       [Mailjet secret key]
 
 #### [Elastic Email][ee]
 
diff --git a/docs/INSTALL.md b/docs/INSTALL.md
index 052ea90b31b..8d7fa4e9a53 100644
--- a/docs/INSTALL.md
+++ b/docs/INSTALL.md
@@ -2,10 +2,10 @@
 
 > :bell: The only officially supported installs of Discourse are [Docker](https://www.docker.io/) based. You must have SSH access to a 64-bit Linux server **with Docker support**. We regret that we cannot support any other methods of installation including cpanel, plesk, webmin, etc.
 
-Simple 30 minute basic install:  
+Simple 30 minute basic install:
 [**Beginner Docker install guide**][basic]
 
-Powerful, flexible, large / multiple server install:  
+Powerful, flexible, large / multiple server install:
 [**Advanced Docker install guide**][advanced]
 
 ### Why do you only officially support Docker?
@@ -21,10 +21,9 @@ Hosting Rails applications is complicated. Even if you already have Postgres, Re
 
 ### Software Requirements
 
-- [Postgres 13+](https://www.postgresql.org/download/)
-- [Redis 6+](https://redis.io/download)
-- [Ruby 2.7](https://www.ruby-lang.org/en/downloads/) (we recommend 2.7.2)
-
+- [Postgres 13](https://www.postgresql.org/download/)
+- [Redis 7](https://redis.io/download)
+- [Ruby 3.2+](https://www.ruby-lang.org/en/downloads/)
 ## Security
 
 We take security very seriously at Discourse, and all our code is 100% open source and peer reviewed. Please read [our security guide](https://github.com/discourse/discourse/blob/main/docs/SECURITY.md) for an overview of security measures in Discourse.
diff --git a/docs/SECURITY.md b/docs/SECURITY.md
index d1d6bdc6e7b..aec119eab8c 100644
--- a/docs/SECURITY.md
+++ b/docs/SECURITY.md
@@ -14,10 +14,7 @@ For a list of recent security commits, check [our GitHub commits prefixed with S
 
 Discourse uses the PBKDF2 algorithm to encrypt salted passwords. This algorithm is blessed by NIST. Security experts on the web [tend to agree that PBKDF2 is a secure choice](https://security.stackexchange.com/questions/4781/do-any-security-experts-recommend-bcrypt-for-password-storage).
 
-**options you can customize in your production.rb file**
-
-- `pbkdf2_algorithm`: the hashing algorithm used (default "sha256")
-- `pbkdf2_iterations`: the number of iterations to run (default 64000)
+Discourse currently uses PBKDF2 with the sha256 hashing algorithm and 600,000 iterations.
 
 ### XSS
 
diff --git a/documentation/assets/blob-wide-yellow3.svg b/documentation/assets/blob-wide-yellow3.svg
new file mode 100644
index 00000000000..b3aa7ca2591
--- /dev/null
+++ b/documentation/assets/blob-wide-yellow3.svg
@@ -0,0 +1,3 @@
+<svg width="960" height="375" viewBox="0 0 960 375" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M960 163.361C960 76.4166 861.5 2.37168e-05 574 0C286.5 -2.37168e-05 0 76.4166 0 163.361C0 250.306 124 385 415.5 373.5C707 362 960 250.306 960 163.361Z" fill="#FBF5AF"/>
+</svg>
diff --git a/documentation/assets/blobs.svg b/documentation/assets/blobs.svg
new file mode 100644
index 00000000000..893715168fd
--- /dev/null
+++ b/documentation/assets/blobs.svg
@@ -0,0 +1,6 @@
+<svg width="1867" height="475" viewBox="0 0 1867 475" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1865.6 220.428C1856.87 332.048 1771.2 390.61 1665.99 404.379C1563.03 417.858 1471.85 319.945 1480.58 208.325C1489.3 96.7051 1591.56 4.34115 1697.59 0.168844C1828.53 -4.98699 1874.33 108.807 1865.6 220.428Z" fill="#FBF5AF"/>
+<path d="M1464.63 416.562C1464.23 416.562 1463.83 416.594 1463.42 416.659C1458.84 417.393 1454.7 421.929 1455.71 428.253C1456.72 434.575 1462.62 438.145 1467.25 437.407C1469.45 437.053 1471.1 435.907 1472.15 433.993C1473.3 431.918 1473.65 429.03 1473.14 425.867C1472.64 422.761 1471.34 420.134 1469.46 418.463C1468.05 417.209 1466.4 416.562 1464.63 416.562ZM1465.91 444.071C1457.94 444.071 1450.59 437.774 1449.23 429.29C1447.75 419.993 1453.52 411.598 1462.38 410.179C1466.57 409.514 1470.62 410.714 1473.82 413.561C1476.83 416.233 1478.89 420.237 1479.62 424.827C1480.37 429.495 1479.77 433.758 1477.9 437.154C1475.88 440.829 1472.47 443.217 1468.29 443.883C1467.49 444.011 1466.7 444.071 1465.91 444.071" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M344 323.966C344 353.644 324.906 366.211 293.64 366.211C262.374 366.211 223 321.874 223 292.194C223 262.514 272.175 254 303.441 254C334.707 254 344 294.286 344 323.966Z" fill="#0CA64E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M396.325 444.694C396.653 458.473 386.913 467.649 370.18 473.648C356.257 478.638 342.267 465.392 336.512 453.65C330.052 440.465 344.903 425.749 369.376 421.378C383.936 418.778 395.973 429.909 396.325 444.694Z" fill="#E84A51"/>
+</svg>
diff --git a/documentation/assets/favicon.ico b/documentation/assets/favicon.ico
new file mode 100644
index 00000000000..ae73567c642
Binary files /dev/null and b/documentation/assets/favicon.ico differ
diff --git a/documentation/assets/favicon.png b/documentation/assets/favicon.png
new file mode 100644
index 00000000000..90b9b30dc4b
Binary files /dev/null and b/documentation/assets/favicon.png differ
diff --git a/documentation/assets/highlight.png b/documentation/assets/highlight.png
new file mode 100644
index 00000000000..87a36491d0f
Binary files /dev/null and b/documentation/assets/highlight.png differ
diff --git a/documentation/assets/logo.svg b/documentation/assets/logo.svg
new file mode 100644
index 00000000000..78fd5db6d43
--- /dev/null
+++ b/documentation/assets/logo.svg
@@ -0,0 +1,12 @@
+<svg width="148" height="40" viewBox="0 0 148 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="logo-large">
+<g id="Group">
+<path id="Vector" d="M45.1304 8.54615C45.7644 8.53758 46.3733 8.79409 46.8103 9.25385C47.2687 9.70709 47.5215 10.3284 47.5099 10.9731C47.5214 11.6106 47.2713 12.225 46.818 12.6731C46.3877 13.1282 45.7873 13.3833 45.1611 13.3769C44.5221 13.3858 43.9086 13.1263 43.4697 12.6615C43.0103 12.2011 42.7577 11.5736 42.7701 10.9231C42.7701 9.61546 43.8273 8.55424 45.1342 8.55L45.1304 8.54615V8.54615ZM43.2698 16.6423H46.991V32.1654H43.2698V16.6423V16.6423ZM59.4537 19.1L57.1472 21.4077C56.2092 20.4692 55.3558 20 54.587 20C54.2401 19.9798 53.8961 20.073 53.6067 20.2654C53.3864 20.4135 53.2539 20.6613 53.2531 20.9269C53.2544 21.1332 53.3341 21.3312 53.476 21.4808C53.8073 21.7711 54.1822 22.0073 54.587 22.1808L55.9517 22.8615C57.3868 23.5718 58.3735 24.2949 58.9117 25.0308C60.1954 26.8811 59.9199 29.3951 58.2659 30.9231C57.2971 31.8051 55.9991 32.2462 54.3717 32.2462C52.3378 32.3023 50.4063 31.3547 49.2052 29.7115L51.5117 27.2154C51.9426 27.7195 52.4641 28.1383 53.0493 28.45C53.5167 28.7286 54.044 28.8908 54.587 28.9231C55.0117 28.9444 55.431 28.8195 55.7749 28.5692C56.0475 28.3842 56.2148 28.0795 56.2246 27.75C56.2246 27.1756 55.6839 26.6167 54.6024 26.0731L53.3492 25.4462C50.9504 24.2359 49.7511 22.7218 49.7511 20.9038C49.7421 19.751 50.2379 18.652 51.108 17.8962C52.0566 17.048 53.2965 16.6 54.5678 16.6462C56.4938 16.6356 58.3085 17.5478 59.4499 19.1H59.4537V19.1ZM76.7909 20.0269L73.6925 21.7308C73.2102 21.1938 72.6227 20.7618 71.9664 20.4615C71.3299 20.2132 70.6506 20.0929 69.9675 20.1077C68.7197 20.0532 67.5023 20.5021 66.5885 21.3538C65.7249 22.1865 65.2554 23.3469 65.2968 24.5462C65.2593 25.7009 65.7101 26.818 66.5385 27.6231C67.4181 28.4527 68.5943 28.8934 69.8022 28.8462C71.468 28.8462 72.7647 28.2782 73.6925 27.1423L76.6294 29.1538C75.0379 31.2231 72.7929 32.2577 69.8944 32.2577C67.2855 32.2577 65.243 31.4885 63.7669 29.95C62.0433 28.2166 61.2434 25.7682 61.6111 23.351C61.9788 20.9338 63.4704 18.8342 65.6313 17.6923C66.9642 16.9834 68.4542 16.6223 69.9636 16.6423C71.3368 16.6202 72.6959 16.9219 73.9308 17.5231C75.0824 18.0993 76.0671 18.9614 76.7909 20.0269V20.0269ZM85.9592 16.6423C87.3446 16.6383 88.7065 17.0005 89.9071 17.6923C92.3394 19.0602 93.8401 21.6392 93.8282 24.4308C93.8343 25.8089 93.4748 27.164 92.7864 28.3577C92.1192 29.5512 91.1398 30.5404 89.9532 31.2192C88.7454 31.9081 87.3763 32.2638 85.9861 32.25C83.9339 32.2809 81.961 31.4576 80.5389 29.9769C79.0605 28.5257 78.2444 26.5295 78.2824 24.4577C78.2631 20.1813 81.6968 16.6909 85.9707 16.6423H85.9592ZM86.0207 20.15C84.9307 20.1248 83.8813 20.5637 83.1337 21.3577C82.3562 22.1894 81.9413 23.2965 81.9805 24.4346C81.9329 25.5925 82.3478 26.7218 83.1337 27.5731C83.8801 28.3679 84.9311 28.8047 86.0207 28.7731C87.1198 28.803 88.179 28.3606 88.9307 27.5577C89.7153 26.7118 90.1304 25.5877 90.0839 24.4346C90.1286 23.2875 89.7135 22.1701 88.9307 21.3308C88.1729 20.5407 87.1145 20.1112 86.0207 20.15V20.15ZM96.1039 17.0269H99.8673V24.1731C99.8192 25.1485 99.915 26.1257 100.152 27.0731C100.319 27.5805 100.642 28.022 101.074 28.3346C101.535 28.6459 102.083 28.8035 102.639 28.7846C103.199 28.803 103.75 28.6486 104.219 28.3423C104.671 28.0218 105.009 27.5649 105.184 27.0385C105.338 26.6103 105.414 25.6962 105.414 24.2962V17.0269H109.136V23.3154C109.136 25.9077 108.931 27.6808 108.521 28.6346C108.076 29.7372 107.305 30.677 106.31 31.3269C105.189 31.989 103.901 32.3135 102.601 32.2615C100.973 32.2615 99.6572 31.8974 98.6526 31.1692C97.6312 30.4159 96.8867 29.3466 96.5344 28.1269C96.2474 27.2192 96.1039 25.5782 96.1039 23.2038V17.0269V17.0269ZM111.6 17.0269H114.79V18.8962C115.085 18.2207 115.562 17.6402 116.167 17.2192C116.721 16.8431 117.376 16.6433 118.046 16.6462C118.574 16.6571 119.092 16.7887 119.561 17.0308L118.408 20.2385C118.078 20.051 117.71 19.9393 117.331 19.9115C116.757 19.9115 116.273 20.2667 115.878 20.9769C115.484 21.6872 115.286 23.0782 115.286 25.15V31.8692H111.592L111.6 17.0269V17.0269ZM130.098 19.1L127.791 21.4077C126.856 20.4692 126.006 20 125.243 20C124.896 19.9798 124.552 20.073 124.262 20.2654C124.042 20.4135 123.909 20.6613 123.909 20.9269C123.91 21.1332 123.99 21.3312 124.132 21.4808C124.464 21.7668 124.839 21.9991 125.243 22.1692L126.607 22.85C128.042 23.5603 129.029 24.2833 129.567 25.0192C130.849 26.87 130.574 29.3827 128.921 30.9115C127.953 31.7936 126.655 32.2346 125.027 32.2346C122.987 32.295 121.049 31.3454 119.845 29.6962L122.152 27.2C122.583 27.7043 123.104 28.1231 123.69 28.4346C124.164 28.7152 124.7 28.8763 125.25 28.9038C125.675 28.9252 126.094 28.8003 126.438 28.55C126.694 28.3624 126.848 28.0671 126.857 27.75C126.857 27.1756 126.316 26.6167 125.235 26.0731L123.982 25.4462C121.583 24.2359 120.384 22.7218 120.384 20.9038C120.375 19.751 120.87 18.652 121.741 17.8962C122.689 17.0483 123.929 16.6005 125.2 16.6462C127.126 16.6356 128.941 17.5478 130.082 19.1H130.098V19.1ZM147.777 25.5231H135.822C135.954 26.5046 136.448 27.4014 137.206 28.0385C138.02 28.6836 139.039 29.0152 140.077 28.9731C141.421 28.9934 142.715 28.4674 143.664 27.5154L146.801 28.9885C146.09 30.0358 145.122 30.8832 143.991 31.45C142.773 32.0083 141.443 32.2806 140.104 32.2462C137.777 32.2462 135.882 31.5115 134.419 30.0423C132.966 28.5827 132.178 26.5895 132.239 24.5308C132.174 22.4311 132.963 20.3949 134.426 18.8885C135.86 17.403 137.852 16.5892 139.916 16.6462C142.25 16.6462 144.151 17.3936 145.617 18.8885C147.083 20.3833 147.814 22.359 147.812 24.8154L147.777 25.5231V25.5231ZM144.056 22.5885C143.82 21.7726 143.313 21.0618 142.618 20.5731C141.882 20.0551 141 19.7857 140.1 19.8038C139.118 19.7854 138.157 20.0923 137.367 20.6769C136.761 21.1963 136.293 21.8567 136.002 22.6L144.056 22.5885V22.5885ZM19.9396 0C9.11449 0 0 8.78077 0 19.6154V39.9269L19.9358 39.9077C30.7609 39.9077 39.541 30.7885 39.541 19.9577C39.541 9.12692 30.7532 0 19.9396 0Z" fill="black"/>
+<path id="Vector_2" d="M20.1318 7.59232C15.8502 7.59484 11.8857 9.851 9.69513 13.5317C7.50455 17.2125 7.41103 21.7748 9.44893 25.5423L7.25008 32.6192L15.146 30.8346C19.6675 32.8728 24.9732 31.9574 28.5513 28.5218C32.1293 25.0861 33.2617 19.8198 31.4122 15.216C29.5627 10.6121 25.1026 7.59474 20.1434 7.59232H20.1318Z" fill="#FFF9AE"/>
+<path id="Vector_3" d="M29.6336 27.2746C26.1821 31.631 20.2162 33.089 15.146 30.8154L7.25008 32.6231L15.2882 31.6731C20.6169 34.7962 27.4397 33.4221 31.1455 28.4793C34.8514 23.5366 34.2609 16.5985 29.773 12.3539C33.1425 16.774 33.0852 22.9182 29.6336 27.2746Z" fill="#00AEEF"/>
+<path id="Vector_4" d="M28.9538 24.9649C25.9759 29.6579 20.195 31.7313 14.9153 30L7.25008 32.6231L15.146 30.8346C20.7694 33.3761 27.4038 31.2957 30.5714 25.9975C33.7391 20.6993 32.4334 13.8669 27.5357 10.1115C31.3478 14.1556 31.9318 20.2719 28.9538 24.9649Z" fill="#00A94F"/>
+<path id="Vector_5" d="M10.1755 25.8115C7.97481 20.5042 9.78838 14.38 14.5236 11.1286C19.2587 7.87732 25.6224 8.38675 29.7807 12.35C25.9295 7.29344 18.8349 6.05917 13.5038 9.51827C8.17273 12.9774 6.40532 19.9618 9.44893 25.5423L7.25008 32.6192L10.1755 25.8115Z" fill="#F15D22"/>
+<path id="Vector_6" d="M9.44893 25.5423C6.71832 20.496 7.88621 14.2264 12.2504 10.5031C16.6147 6.77973 22.9867 6.61651 27.5357 10.1115C23.1721 5.51444 16.0102 5.04399 11.0833 9.03082C6.15639 13.0176 5.11863 20.1232 8.69932 25.3539L7.25392 32.6231L9.44893 25.5423Z" fill="#D0232B"/>
+</g>
+</g>
+</svg>
diff --git a/documentation/chat/backend/Chat.html b/documentation/chat/backend/Chat.html
new file mode 100644
index 00000000000..56d435b47a7
--- /dev/null
+++ b/documentation/chat/backend/Chat.html
@@ -0,0 +1,118 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>
+  Module: Chat
+  
+    &mdash; Documentation by YARD 0.9.28
+  
+</title>
+
+  <link rel="stylesheet" href="css/style.css" type="text/css" />
+
+  <link rel="stylesheet" href="css/common.css" type="text/css" />
+
+<script type="text/javascript">
+  pathId = "Chat";
+  relpath = '';
+</script>
+
+
+  <script type="text/javascript" charset="utf-8" src="js/jquery.js"></script>
+
+  <script type="text/javascript" charset="utf-8" src="js/app.js"></script>
+
+
+  </head>
+  <body>
+    <div class="nav_wrap">
+      <iframe id="nav" src="class_list.html?1"></iframe>
+      <div id="resizer"></div>
+    </div>
+
+    <div id="main" tabindex="-1">
+      <div id="header">
+        <div id="menu">
+  
+    <a href="_index.html">Index (C)</a> &raquo;
+    
+    
+    <span class="title">Chat</span>
+  
+</div>
+
+        <div id="search">
+  
+    <a class="full_list_link" id="class_list_link"
+        href="class_list.html">
+
+        <svg width="24" height="24">
+          <rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
+        </svg>
+    </a>
+  
+</div>
+        <div class="clear"></div>
+      </div>
+
+      <div id="content"><h1>Module: Chat
+  
+  
+  
+</h1>
+<div class="box_info">
+  
+
+  
+  
+  
+  
+  
+
+  
+
+  
+  <dl>
+    <dt>Defined in:</dt>
+    <dd>plugins/chat/app/services/base.rb<span class="defines">,<br />
+  plugins/chat/app/services/update_user_last_read.rb,<br /> plugins/chat/app/services/trash_channel.rb,<br /> plugins/chat/app/services/update_channel.rb,<br /> plugins/chat/app/services/update_channel_status.rb</span>
+</dd>
+  </dl>
+  
+</div>
+
+<h2>Defined Under Namespace</h2>
+<p class="children">
+  
+    
+      <strong class="modules">Modules:</strong> <span class='object_link'><a href="Chat/Service.html" title="Chat::Service (module)">Service</a></span>
+    
+  
+    
+  
+</p>
+
+
+
+
+
+
+
+
+
+</div>
+
+      
+<div id="footer">
+  Generated by
+  <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
+  0.9.28.
+</div>
+
+    </div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/documentation/chat/backend/Chat/Service.html b/documentation/chat/backend/Chat/Service.html
new file mode 100644
index 00000000000..fb8447dab22
--- /dev/null
+++ b/documentation/chat/backend/Chat/Service.html
@@ -0,0 +1,120 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>
+  Module: Chat::Service
+  
+    &mdash; Documentation by YARD 0.9.28
+  
+</title>
+
+  <link rel="stylesheet" href="../css/style.css" type="text/css" />
+
+  <link rel="stylesheet" href="../css/common.css" type="text/css" />
+
+<script type="text/javascript">
+  pathId = "Chat::Service";
+  relpath = '../';
+</script>
+
+
+  <script type="text/javascript" charset="utf-8" src="../js/jquery.js"></script>
+
+  <script type="text/javascript" charset="utf-8" src="../js/app.js"></script>
+
+
+  </head>
+  <body>
+    <div class="nav_wrap">
+      <iframe id="nav" src="../class_list.html?1"></iframe>
+      <div id="resizer"></div>
+    </div>
+
+    <div id="main" tabindex="-1">
+      <div id="header">
+        <div id="menu">
+  
+    <a href="../_index.html">Index (S)</a> &raquo;
+    <span class='title'><span class='object_link'><a href="../Chat.html" title="Chat (module)">Chat</a></span></span>
+     &raquo; 
+    <span class="title">Service</span>
+  
+</div>
+
+        <div id="search">
+  
+    <a class="full_list_link" id="class_list_link"
+        href="../class_list.html">
+
+        <svg width="24" height="24">
+          <rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
+        </svg>
+    </a>
+  
+</div>
+        <div class="clear"></div>
+      </div>
+
+      <div id="content"><h1>Module: Chat::Service
+  
+  
+  
+</h1>
+<div class="box_info">
+  
+
+  
+  
+  
+  
+  
+
+  
+
+  
+  <dl>
+    <dt>Defined in:</dt>
+    <dd>plugins/chat/app/services/base.rb<span class="defines">,<br />
+  plugins/chat/app/services/update_user_last_read.rb,<br /> plugins/chat/app/services/trash_channel.rb,<br /> plugins/chat/app/services/update_channel.rb,<br /> plugins/chat/app/services/update_channel_status.rb</span>
+</dd>
+  </dl>
+  
+</div>
+
+<h2>Defined Under Namespace</h2>
+<p class="children">
+  
+    
+      <strong class="modules">Modules:</strong> <span class='object_link'><a href="Service/Base.html" title="Chat::Service::Base (module)">Base</a></span>
+    
+  
+    
+      <strong class="classes">Classes:</strong> <span class='object_link'><a href="Service/TrashChannel.html" title="Chat::Service::TrashChannel (class)">TrashChannel</a></span>, <span class='object_link'><a href="Service/UpdateChannel.html" title="Chat::Service::UpdateChannel (class)">UpdateChannel</a></span>, <span class='object_link'><a href="Service/UpdateChannelStatus.html" title="Chat::Service::UpdateChannelStatus (class)">UpdateChannelStatus</a></span>, <span class='object_link'><a href="Service/UpdateUserLastRead.html" title="Chat::Service::UpdateUserLastRead (class)">UpdateUserLastRead</a></span>
+    
+  
+</p>
+
+
+
+
+
+
+
+
+
+</div>
+
+      
+<div id="footer">
+  Generated by
+  <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
+  0.9.28.
+</div>
+
+    </div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/documentation/chat/backend/Chat/Service/Base.html b/documentation/chat/backend/Chat/Service/Base.html
new file mode 100644
index 00000000000..2d2f2254179
--- /dev/null
+++ b/documentation/chat/backend/Chat/Service/Base.html
@@ -0,0 +1,723 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>
+  Module: Chat::Service::Base
+  
+    &mdash; Documentation by YARD 0.9.28
+  
+</title>
+
+  <link rel="stylesheet" href="../../css/style.css" type="text/css" />
+
+  <link rel="stylesheet" href="../../css/common.css" type="text/css" />
+
+<script type="text/javascript">
+  pathId = "Chat::Service::Base";
+  relpath = '../../';
+</script>
+
+
+  <script type="text/javascript" charset="utf-8" src="../../js/jquery.js"></script>
+
+  <script type="text/javascript" charset="utf-8" src="../../js/app.js"></script>
+
+
+  </head>
+  <body>
+    <div class="nav_wrap">
+      <iframe id="nav" src="../../class_list.html?1"></iframe>
+      <div id="resizer"></div>
+    </div>
+
+    <div id="main" tabindex="-1">
+      <div id="header">
+        <div id="menu">
+  
+    <a href="../../_index.html">Index (B)</a> &raquo;
+    <span class='title'><span class='object_link'><a href="../../Chat.html" title="Chat (module)">Chat</a></span></span> &raquo; <span class='title'><span class='object_link'><a href="../Service.html" title="Chat::Service (module)">Service</a></span></span>
+     &raquo; 
+    <span class="title">Base</span>
+  
+</div>
+
+        <div id="search">
+  
+    <a class="full_list_link" id="class_list_link"
+        href="../../class_list.html">
+
+        <svg width="24" height="24">
+          <rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
+        </svg>
+    </a>
+  
+</div>
+        <div class="clear"></div>
+      </div>
+
+      <div id="content"><h1>Module: Chat::Service::Base
+  
+  
+  
+</h1>
+<div class="box_info">
+  
+
+  
+  
+  <dl>
+      <dt>Extended by:</dt>
+      <dd>ActiveSupport::Concern</dd>
+  </dl>
+  
+  
+  
+  
+
+  
+  <dl>
+    <dt>Included in:</dt>
+    <dd><span class='object_link'><a href="TrashChannel.html" title="Chat::Service::TrashChannel (class)">TrashChannel</a></span>, <span class='object_link'><a href="UpdateChannel.html" title="Chat::Service::UpdateChannel (class)">UpdateChannel</a></span>, <span class='object_link'><a href="UpdateChannelStatus.html" title="Chat::Service::UpdateChannelStatus (class)">UpdateChannelStatus</a></span>, <span class='object_link'><a href="UpdateUserLastRead.html" title="Chat::Service::UpdateUserLastRead (class)">UpdateUserLastRead</a></span></dd>
+  </dl>
+  
+
+  
+  <dl>
+    <dt>Defined in:</dt>
+    <dd>plugins/chat/app/services/base.rb</dd>
+  </dl>
+  
+</div>
+
+<h2>Overview</h2><div class="docstring">
+  <div class="discussion">
+    
+<p>Module to be included to provide steps DSL to any class. This allows to create easy to understand services as the whole service cycle is visible simply by reading the beginning of its class.</p>
+
+<p>Steps are executed in the order they’re defined. They will use their name to execute the corresponding method defined in the service class.</p>
+
+<p>Currently, there are 5 types of steps:</p>
+<ul><li>
+<p><tt>model(name = :model)</tt>: used to instantiate a model (either by building it or fetching it from the DB). If a falsy value is returned, then the step will fail. Otherwise the resulting object will be assigned in <code>context[name]</code> (<code>context[:model]</code> by default).</p>
+</li><li>
+<p><tt>policy(name = :default)</tt>: used to perform a check on the state of the system. Typically used to run guardians. If a falsy value is returned, the step will fail.</p>
+</li><li>
+<p><tt>contract(name = :default)</tt>: used to validate the input parameters, typically provided by a user calling an endpoint. A special embedded <code>Contract</code> class has to be defined to holds the validations. If the validations fail, the step will fail. Otherwise, the resulting contract will be available in <tt><a href=":"contract.default"">context</a></tt>.</p>
+</li><li>
+<p><tt>step(name)</tt>: used to run small snippets of arbitrary code. The step doesn’t care about its return value, so to mark the service as failed, #fail! has to be called explicitly.</p>
+</li><li>
+<p><code>transaction</code>: used to wrap other steps inside a DB transaction.</p>
+</li></ul>
+
+<p>The methods defined on the service are automatically provided with the whole context passed as keyword arguments. This allows to define in a very explicit way what dependencies are used by the method. If for whatever reason a key isn’t found in the current context, then Ruby will raise an exception when the method is called.</p>
+
+<p>Regarding contract classes, they have automatically ActiveModel modules included so all the ActiveModel API is available.</p>
+
+
+  </div>
+</div>
+<div class="tags">
+  
+  <div class="examples">
+    <p class="tag_title">Examples:</p>
+    
+      
+        <p class="example_title"><div class='inline'>
+<p>An example from the <span class='object_link'><a href="TrashChannel.html" title="Chat::Service::TrashChannel (class)">TrashChannel</a></span> service</p>
+</div></p>
+      
+      <pre class="example code"><code><span class='kw'>class</span> <span class='const'><span class='object_link'><a href="TrashChannel.html" title="Chat::Service::TrashChannel (class)">TrashChannel</a></span></span>
+  <span class='id identifier rubyid_include'>include</span> <span class='const'>Base</span>
+
+  <span class='id identifier rubyid_model'>model</span> <span class='symbol'>:channel</span><span class='comma'>,</span> <span class='symbol'>:fetch_channel</span>
+  <span class='id identifier rubyid_policy'>policy</span> <span class='symbol'>:invalid_access</span>
+  <span class='id identifier rubyid_transaction'>transaction</span> <span class='kw'>do</span>
+    <span class='id identifier rubyid_step'>step</span> <span class='symbol'>:prevents_slug_collision</span>
+    <span class='id identifier rubyid_step'>step</span> <span class='symbol'>:soft_delete_channel</span>
+    <span class='id identifier rubyid_step'>step</span> <span class='symbol'>:log_channel_deletion</span>
+  <span class='kw'>end</span>
+  <span class='id identifier rubyid_step'>step</span> <span class='symbol'>:enqueue_delete_channel_relations_job</span>
+
+  <span class='id identifier rubyid_private'>private</span>
+
+  <span class='kw'>def</span> <span class='id identifier rubyid_fetch_channel'>fetch_channel</span><span class='lparen'>(</span><span class='label'>channel_id:</span><span class='comma'>,</span> <span class='op'>**</span><span class='rparen'>)</span>
+    <span class='const'>ChatChannel</span><span class='period'>.</span><span class='id identifier rubyid_find_by'>find_by</span><span class='lparen'>(</span><span class='label'>id:</span> <span class='id identifier rubyid_channel_id'>channel_id</span><span class='rparen'>)</span>
+  <span class='kw'>end</span>
+
+  <span class='kw'>def</span> <span class='id identifier rubyid_invalid_access'>invalid_access</span><span class='lparen'>(</span><span class='label'>guardian:</span><span class='comma'>,</span> <span class='label'>channel:</span><span class='comma'>,</span> <span class='op'>**</span><span class='rparen'>)</span>
+    <span class='id identifier rubyid_guardian'>guardian</span><span class='period'>.</span><span class='id identifier rubyid_can_preview_chat_channel?'>can_preview_chat_channel?</span><span class='lparen'>(</span><span class='id identifier rubyid_channel'>channel</span><span class='rparen'>)</span> <span class='op'>&amp;&amp;</span> <span class='id identifier rubyid_guardian'>guardian</span><span class='period'>.</span><span class='id identifier rubyid_can_delete_chat_channel?'>can_delete_chat_channel?</span>
+  <span class='kw'>end</span>
+
+  <span class='kw'>def</span> <span class='id identifier rubyid_prevents_slug_collision'>prevents_slug_collision</span><span class='lparen'>(</span><span class='label'>channel:</span><span class='comma'>,</span> <span class='op'>**</span><span class='rparen'>)</span>
+    <span class='id identifier rubyid_…'>…</span>
+  <span class='kw'>end</span>
+
+  <span class='kw'>def</span> <span class='id identifier rubyid_soft_delete_channel'>soft_delete_channel</span><span class='lparen'>(</span><span class='label'>guardian:</span><span class='comma'>,</span> <span class='label'>channel:</span><span class='comma'>,</span> <span class='op'>**</span><span class='rparen'>)</span>
+    <span class='id identifier rubyid_…'>…</span>
+  <span class='kw'>end</span>
+
+  <span class='kw'>def</span> <span class='id identifier rubyid_log_channel_deletion'>log_channel_deletion</span><span class='lparen'>(</span><span class='label'>guardian:</span><span class='comma'>,</span> <span class='label'>channel:</span><span class='comma'>,</span> <span class='op'>**</span><span class='rparen'>)</span>
+    <span class='id identifier rubyid_…'>…</span>
+  <span class='kw'>end</span>
+
+  <span class='kw'>def</span> <span class='id identifier rubyid_enqueue_delete_channel_relations_job'>enqueue_delete_channel_relations_job</span><span class='lparen'>(</span><span class='label'>channel:</span><span class='comma'>,</span> <span class='op'>**</span><span class='rparen'>)</span>
+    <span class='id identifier rubyid_…'>…</span>
+  <span class='kw'>end</span>
+<span class='kw'>end</span></code></pre>
+    
+      
+        <p class="example_title"><div class='inline'>
+<p>An example from the <span class='object_link'><a href="UpdateChannelStatus.html" title="Chat::Service::UpdateChannelStatus (class)">UpdateChannelStatus</a></span> service which uses a contract</p>
+</div></p>
+      
+      <pre class="example code"><code><span class='kw'>class</span> <span class='const'><span class='object_link'><a href="UpdateChannelStatus.html" title="Chat::Service::UpdateChannelStatus (class)">UpdateChannelStatus</a></span></span>
+  <span class='id identifier rubyid_include'>include</span> <span class='const'>Base</span>
+
+  <span class='id identifier rubyid_model'>model</span> <span class='symbol'>:channel</span><span class='comma'>,</span> <span class='symbol'>:fetch_channel</span>
+  <span class='id identifier rubyid_contract'>contract</span>
+  <span class='id identifier rubyid_policy'>policy</span> <span class='symbol'>:check_channel_permission</span>
+  <span class='id identifier rubyid_step'>step</span> <span class='symbol'>:change_status</span>
+
+  <span class='kw'>class</span> <span class='const'>Contract</span>
+    <span class='id identifier rubyid_attribute'>attribute</span> <span class='symbol'>:status</span>
+    <span class='id identifier rubyid_validates'>validates</span> <span class='symbol'>:status</span><span class='comma'>,</span> <span class='label'>inclusion:</span> <span class='lbrace'>{</span> <span class='label'>in:</span> <span class='const'>ChatChannel</span><span class='period'>.</span><span class='id identifier rubyid_editable_statuses'>editable_statuses</span><span class='period'>.</span><span class='id identifier rubyid_keys'>keys</span> <span class='rbrace'>}</span>
+  <span class='kw'>end</span>
+
+  <span class='id identifier rubyid_…'>…</span>
+<span class='kw'>end</span></code></pre>
+    
+  </div>
+
+
+</div><h2>Defined Under Namespace</h2>
+<p class="children">
+  
+    
+  
+    
+      <strong class="classes">Classes:</strong> <span class='object_link'><a href="Base/Context.html" title="Chat::Service::Base::Context (class)">Context</a></span>, <span class='object_link'><a href="Base/Failure.html" title="Chat::Service::Base::Failure (class)">Failure</a></span>
+    
+  
+</p>
+
+
+
+
+
+
+
+  
+    <h2>
+      Class Method Summary
+      <small><a href="#" class="summary_toggle">collapse</a></small>
+    </h2>
+
+    <ul class="summary">
+      
+        <li class="public ">
+  <span class="summary_signature">
+    
+      <a href="#contract-class_method" title="contract (class method)">.<strong>contract</strong>(name = :default, class_name: self::Contract, use_default_values_from: nil)  &#x21d2; Object </a>
+    
+
+    
+  </span>
+  
+  
+  
+  
+  
+  
+  
+
+  
+    <span class="summary_desc"><div class='inline'>
+<p>Checks the validity of the input parameters.</p>
+</div></span>
+  
+</li>
+
+      
+        <li class="public ">
+  <span class="summary_signature">
+    
+      <a href="#model-class_method" title="model (class method)">.<strong>model</strong>(name = :model, step_name = :&quot;fetch_#{name}&quot;)  &#x21d2; Object </a>
+    
+
+    
+  </span>
+  
+  
+  
+  
+  
+  
+  
+
+  
+    <span class="summary_desc"><div class='inline'>
+<p>Evaluates arbitrary code to build or fetch a model (typically from the DB).</p>
+</div></span>
+  
+</li>
+
+      
+        <li class="public ">
+  <span class="summary_signature">
+    
+      <a href="#policy-class_method" title="policy (class method)">.<strong>policy</strong>(name = :default)  &#x21d2; Object </a>
+    
+
+    
+  </span>
+  
+  
+  
+  
+  
+  
+  
+
+  
+    <span class="summary_desc"><div class='inline'>
+<p>Performs checks related to the state of the system.</p>
+</div></span>
+  
+</li>
+
+      
+        <li class="public ">
+  <span class="summary_signature">
+    
+      <a href="#step-class_method" title="step (class method)">.<strong>step</strong>(name)  &#x21d2; Object </a>
+    
+
+    
+  </span>
+  
+  
+  
+  
+  
+  
+  
+
+  
+    <span class="summary_desc"><div class='inline'>
+<p>Runs arbitrary code.</p>
+</div></span>
+  
+</li>
+
+      
+        <li class="public ">
+  <span class="summary_signature">
+    
+      <a href="#transaction-class_method" title="transaction (class method)">.<strong>transaction</strong>(&amp;block)  &#x21d2; Object </a>
+    
+
+    
+  </span>
+  
+  
+  
+  
+  
+  
+  
+
+  
+    <span class="summary_desc"><div class='inline'>
+<p>Runs steps inside a DB transaction.</p>
+</div></span>
+  
+</li>
+
+      
+    </ul>
+  
+
+
+  
+
+  <div id="class_method_details" class="method_details_list">
+    <h2>Class Method Details</h2>
+
+    
+      <div class="method_details first">
+  <h3 class="signature first" id="contract-class_method">
+  
+    .<strong>contract</strong>(name = :default, class_name: self::Contract, use_default_values_from: nil)  &#x21d2; <tt>Object</tt> 
+  
+
+  
+
+  
+</h3><div class="docstring">
+  <div class="discussion">
+    
+<p>Checks the validity of the input parameters. Implements ActiveModel::Validations and ActiveModel::Attributes.</p>
+
+<p>It stores the resulting contract in <tt>context [“contract.default”]</tt> by default (can be customized by providing the <code>name</code> argument).</p>
+
+
+  </div>
+</div>
+<div class="tags">
+  
+  <div class="examples">
+    <p class="tag_title">Examples:</p>
+    
+      
+      <pre class="example code"><code><span class='id identifier rubyid_contract'>contract</span>
+
+<span class='kw'>class</span> <span class='const'>Contract</span>
+  <span class='id identifier rubyid_attribute'>attribute</span> <span class='symbol'>:name</span>
+  <span class='id identifier rubyid_validates'>validates</span> <span class='symbol'>:name</span><span class='comma'>,</span> <span class='label'>presence:</span> <span class='kw'>true</span>
+<span class='kw'>end</span></code></pre>
+    
+  </div>
+<p class="tag_title">Parameters:</p>
+<ul class="param">
+  
+    <li>
+      
+        <span class='name'>name</span>
+      
+      
+        <span class='type'>(<tt>Symbol</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>:default</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>name for this contract</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>class_name</span>
+      
+      
+        <span class='type'>(<tt>Class</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>self::Contract</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>a class defining the contract</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>use_default_values_from</span>
+      
+      
+        <span class='type'>(<tt>Symbol</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>nil</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>name of the model to get default values from</p>
+</div>
+      
+    </li>
+  
+</ul>
+
+
+</div>
+</div>
+    
+      <div class="method_details ">
+  <h3 class="signature " id="model-class_method">
+  
+    .<strong>model</strong>(name = :model, step_name = :&quot;fetch_#{name}&quot;)  &#x21d2; <tt>Object</tt> 
+  
+
+  
+
+  
+</h3><div class="docstring">
+  <div class="discussion">
+    
+<p>Evaluates arbitrary code to build or fetch a model (typically from the DB). If the step returns a falsy value, then the step will fail.</p>
+
+<p>It stores the resulting model in <code>context[:model]</code> by default (can be customized by providing the <code>name</code> argument).</p>
+
+
+  </div>
+</div>
+<div class="tags">
+  
+  <div class="examples">
+    <p class="tag_title">Examples:</p>
+    
+      
+      <pre class="example code"><code><span class='id identifier rubyid_model'>model</span> <span class='symbol'>:channel</span><span class='comma'>,</span> <span class='symbol'>:fetch_channel</span>
+
+<span class='id identifier rubyid_private'>private</span>
+
+<span class='kw'>def</span> <span class='id identifier rubyid_fetch_channel'>fetch_channel</span><span class='lparen'>(</span><span class='label'>channel_id:</span><span class='comma'>,</span> <span class='op'>**</span><span class='rparen'>)</span>
+  <span class='const'>ChatChannel</span><span class='period'>.</span><span class='id identifier rubyid_find_by'>find_by</span><span class='lparen'>(</span><span class='label'>id:</span> <span class='id identifier rubyid_channel_id'>channel_id</span><span class='rparen'>)</span>
+<span class='kw'>end</span></code></pre>
+    
+  </div>
+<p class="tag_title">Parameters:</p>
+<ul class="param">
+  
+    <li>
+      
+        <span class='name'>name</span>
+      
+      
+        <span class='type'>(<tt>Symbol</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>:model</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>name of the model</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>step_name</span>
+      
+      
+        <span class='type'>(<tt>Symbol</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>:&quot;fetch_#{name}&quot;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>name of the method to call for this step</p>
+</div>
+      
+    </li>
+  
+</ul>
+
+
+</div>
+</div>
+    
+      <div class="method_details ">
+  <h3 class="signature " id="policy-class_method">
+  
+    .<strong>policy</strong>(name = :default)  &#x21d2; <tt>Object</tt> 
+  
+
+  
+
+  
+</h3><div class="docstring">
+  <div class="discussion">
+    
+<p>Performs checks related to the state of the system. If the step doesn’t return a truthy value, then the policy will fail.</p>
+
+
+  </div>
+</div>
+<div class="tags">
+  
+  <div class="examples">
+    <p class="tag_title">Examples:</p>
+    
+      
+      <pre class="example code"><code><span class='id identifier rubyid_policy'>policy</span> <span class='symbol'>:no_direct_message_channel</span>
+
+<span class='id identifier rubyid_private'>private</span>
+
+<span class='kw'>def</span> <span class='id identifier rubyid_no_direct_message_channel'>no_direct_message_channel</span><span class='lparen'>(</span><span class='label'>channel:</span><span class='comma'>,</span> <span class='op'>**</span><span class='rparen'>)</span>
+  <span class='op'>!</span><span class='id identifier rubyid_channel'>channel</span><span class='period'>.</span><span class='id identifier rubyid_direct_message_channel?'>direct_message_channel?</span>
+<span class='kw'>end</span></code></pre>
+    
+  </div>
+<p class="tag_title">Parameters:</p>
+<ul class="param">
+  
+    <li>
+      
+        <span class='name'>name</span>
+      
+      
+        <span class='type'>(<tt>Symbol</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>:default</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>name for this policy</p>
+</div>
+      
+    </li>
+  
+</ul>
+
+
+</div>
+</div>
+    
+      <div class="method_details ">
+  <h3 class="signature " id="step-class_method">
+  
+    .<strong>step</strong>(name)  &#x21d2; <tt>Object</tt> 
+  
+
+  
+
+  
+</h3><div class="docstring">
+  <div class="discussion">
+    
+<p>Runs arbitrary code. To mark a step as failed, a call to #fail! needs to be made explicitly.</p>
+
+
+  </div>
+</div>
+<div class="tags">
+  
+  <div class="examples">
+    <p class="tag_title">Examples:</p>
+    
+      
+      <pre class="example code"><code><span class='id identifier rubyid_step'>step</span> <span class='symbol'>:update_channel</span>
+
+<span class='id identifier rubyid_private'>private</span>
+
+<span class='kw'>def</span> <span class='id identifier rubyid_update_channel'>update_channel</span><span class='lparen'>(</span><span class='label'>channel:</span><span class='comma'>,</span> <span class='label'>params_to_edit:</span><span class='comma'>,</span> <span class='op'>**</span><span class='rparen'>)</span>
+  <span class='id identifier rubyid_channel'>channel</span><span class='period'>.</span><span class='id identifier rubyid_update!'>update!</span><span class='lparen'>(</span><span class='id identifier rubyid_params_to_edit'>params_to_edit</span><span class='rparen'>)</span>
+<span class='kw'>end</span></code></pre>
+    
+      
+        <p class="example_title"><div class='inline'>
+<p>using #fail! in a step</p>
+</div></p>
+      
+      <pre class="example code"><code><span class='id identifier rubyid_step'>step</span> <span class='symbol'>:save_channel</span>
+
+<span class='id identifier rubyid_private'>private</span>
+
+<span class='kw'>def</span> <span class='id identifier rubyid_save_channel'>save_channel</span><span class='lparen'>(</span><span class='label'>channel:</span><span class='comma'>,</span> <span class='op'>**</span><span class='rparen'>)</span>
+  <span class='id identifier rubyid_fail!'>fail!</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>something went wrong</span><span class='tstring_end'>&quot;</span></span><span class='rparen'>)</span> <span class='kw'>unless</span> <span class='id identifier rubyid_channel'>channel</span><span class='period'>.</span><span class='id identifier rubyid_save'>save</span>
+<span class='kw'>end</span></code></pre>
+    
+  </div>
+<p class="tag_title">Parameters:</p>
+<ul class="param">
+  
+    <li>
+      
+        <span class='name'>name</span>
+      
+      
+        <span class='type'>(<tt>Symbol</tt>)</span>
+      
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>the name of this step</p>
+</div>
+      
+    </li>
+  
+</ul>
+
+
+</div>
+</div>
+    
+      <div class="method_details ">
+  <h3 class="signature " id="transaction-class_method">
+  
+    .<strong>transaction</strong>(&amp;block)  &#x21d2; <tt>Object</tt> 
+  
+
+  
+
+  
+</h3><div class="docstring">
+  <div class="discussion">
+    
+<p>Runs steps inside a DB transaction.</p>
+
+
+  </div>
+</div>
+<div class="tags">
+  
+  <div class="examples">
+    <p class="tag_title">Examples:</p>
+    
+      
+      <pre class="example code"><code><span class='id identifier rubyid_transaction'>transaction</span> <span class='kw'>do</span>
+  <span class='id identifier rubyid_step'>step</span> <span class='symbol'>:prevents_slug_collision</span>
+  <span class='id identifier rubyid_step'>step</span> <span class='symbol'>:soft_delete_channel</span>
+  <span class='id identifier rubyid_step'>step</span> <span class='symbol'>:log_channel_deletion</span>
+<span class='kw'>end</span></code></pre>
+    
+  </div>
+<p class="tag_title">Parameters:</p>
+<ul class="param">
+  
+    <li>
+      
+        <span class='name'>block</span>
+      
+      
+        <span class='type'>(<tt>Proc</tt>)</span>
+      
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>a block containing steps to be run inside a transaction</p>
+</div>
+      
+    </li>
+  
+</ul>
+
+
+</div>
+</div>
+    
+  </div>
+
+</div>
+
+      
+<div id="footer">
+  Generated by
+  <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
+  0.9.28.
+</div>
+
+    </div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/documentation/chat/backend/Chat/Service/Base/Context.html b/documentation/chat/backend/Chat/Service/Base/Context.html
new file mode 100644
index 00000000000..138ce872301
--- /dev/null
+++ b/documentation/chat/backend/Chat/Service/Base/Context.html
@@ -0,0 +1,485 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>
+  Class: Chat::Service::Base::Context
+  
+    &mdash; Documentation by YARD 0.9.28
+  
+</title>
+
+  <link rel="stylesheet" href="../../../css/style.css" type="text/css" />
+
+  <link rel="stylesheet" href="../../../css/common.css" type="text/css" />
+
+<script type="text/javascript">
+  pathId = "Chat::Service::Base::Context";
+  relpath = '../../../';
+</script>
+
+
+  <script type="text/javascript" charset="utf-8" src="../../../js/jquery.js"></script>
+
+  <script type="text/javascript" charset="utf-8" src="../../../js/app.js"></script>
+
+
+  </head>
+  <body>
+    <div class="nav_wrap">
+      <iframe id="nav" src="../../../class_list.html?1"></iframe>
+      <div id="resizer"></div>
+    </div>
+
+    <div id="main" tabindex="-1">
+      <div id="header">
+        <div id="menu">
+  
+    <a href="../../../_index.html">Index (C)</a> &raquo;
+    <span class='title'><span class='object_link'><a href="../../../Chat.html" title="Chat (module)">Chat</a></span></span> &raquo; <span class='title'><span class='object_link'><a href="../../Service.html" title="Chat::Service (module)">Service</a></span></span> &raquo; <span class='title'><span class='object_link'><a href="../Base.html" title="Chat::Service::Base (module)">Base</a></span></span>
+     &raquo; 
+    <span class="title">Context</span>
+  
+</div>
+
+        <div id="search">
+  
+    <a class="full_list_link" id="class_list_link"
+        href="../../../class_list.html">
+
+        <svg width="24" height="24">
+          <rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
+        </svg>
+    </a>
+  
+</div>
+        <div class="clear"></div>
+      </div>
+
+      <div id="content"><h1>Class: Chat::Service::Base::Context
+  
+  
+  
+</h1>
+<div class="box_info">
+  
+  <dl>
+    <dt>Inherits:</dt>
+    <dd>
+      <span class="inheritName">OpenStruct</span>
+      
+        <ul class="fullTree">
+          <li>Object</li>
+          
+            <li class="next">OpenStruct</li>
+          
+            <li class="next">Chat::Service::Base::Context</li>
+          
+        </ul>
+        <a href="#" class="inheritanceTree">show all</a>
+      
+    </dd>
+  </dl>
+  
+
+  
+  
+  
+  
+  
+
+  
+
+  
+  <dl>
+    <dt>Defined in:</dt>
+    <dd>plugins/chat/app/services/base.rb</dd>
+  </dl>
+  
+</div>
+
+<h2>Overview</h2><div class="docstring">
+  <div class="discussion">
+    
+<p>Simple structure to hold the context of the service during its whole lifecycle.</p>
+
+
+  </div>
+</div>
+<div class="tags">
+  
+
+</div>
+
+
+
+
+
+
+  
+    <h2>
+      Instance Method Summary
+      <small><a href="#" class="summary_toggle">collapse</a></small>
+    </h2>
+
+    <ul class="summary">
+      
+        <li class="public ">
+  <span class="summary_signature">
+    
+      <a href="#fail-instance_method" title="#fail (instance method)">#<strong>fail</strong>(context = {})  &#x21d2; Context </a>
+    
+
+    
+  </span>
+  
+  
+  
+  
+  
+  
+  
+
+  
+    <span class="summary_desc"><div class='inline'>
+<p>Marks the context as failed without raising an exception.</p>
+</div></span>
+  
+</li>
+
+      
+        <li class="public ">
+  <span class="summary_signature">
+    
+      <a href="#fail!-instance_method" title="#fail! (instance method)">#<strong>fail!</strong>(context = {})  &#x21d2; Context </a>
+    
+
+    
+  </span>
+  
+  
+  
+  
+  
+  
+  
+
+  
+    <span class="summary_desc"><div class='inline'>
+<p>Marks the context as failed.</p>
+</div></span>
+  
+</li>
+
+      
+        <li class="public ">
+  <span class="summary_signature">
+    
+      <a href="#failure%3F-instance_method" title="#failure? (instance method)">#<strong>failure?</strong>  &#x21d2; Boolean </a>
+    
+
+    
+  </span>
+  
+  
+  
+  
+  
+  
+  
+
+  
+    <span class="summary_desc"><div class='inline'>
+<p>Returns <code>true</code> if the context is set as failed.</p>
+</div></span>
+  
+</li>
+
+      
+        <li class="public ">
+  <span class="summary_signature">
+    
+      <a href="#success%3F-instance_method" title="#success? (instance method)">#<strong>success?</strong>  &#x21d2; Boolean </a>
+    
+
+    
+  </span>
+  
+  
+  
+  
+  
+  
+  
+
+  
+    <span class="summary_desc"><div class='inline'>
+<p>Returns <code>true</code> if the context is set as successful (default).</p>
+</div></span>
+  
+</li>
+
+      
+    </ul>
+  
+
+
+  
+
+  <div id="instance_method_details" class="method_details_list">
+    <h2>Instance Method Details</h2>
+
+    
+      <div class="method_details first">
+  <h3 class="signature first" id="fail-instance_method">
+  
+    #<strong>fail</strong>(context = {})  &#x21d2; <tt><span class='object_link'><a href="" title="Chat::Service::Base::Context (class)">Context</a></span></tt> 
+  
+
+  
+
+  
+</h3><div class="docstring">
+  <div class="discussion">
+    
+<p>Marks the context as failed without raising an exception.</p>
+
+
+  </div>
+</div>
+<div class="tags">
+  
+  <div class="examples">
+    <p class="tag_title">Examples:</p>
+    
+      
+      <pre class="example code"><code><span class='id identifier rubyid_context'>context</span><span class='period'>.</span><span class='id identifier rubyid_fail'>fail</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>failure</span><span class='label_end'>&quot;:</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>something went wrong</span><span class='tstring_end'>&quot;</span></span><span class='rparen'>)</span></code></pre>
+    
+  </div>
+<p class="tag_title">Parameters:</p>
+<ul class="param">
+  
+    <li>
+      
+        <span class='name'>context</span>
+      
+      
+        <span class='type'>(<tt>Hash</tt>, <tt><span class='object_link'><a href="" title="Chat::Service::Base::Context (class)">Context</a></span></tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>{}</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>the context to merge into the current one</p>
+</div>
+      
+    </li>
+  
+</ul>
+
+<p class="tag_title">Returns:</p>
+<ul class="return">
+  
+    <li>
+      
+      
+        <span class='type'>(<tt><span class='object_link'><a href="" title="Chat::Service::Base::Context (class)">Context</a></span></tt>)</span>
+      
+      
+      
+    </li>
+  
+</ul>
+
+</div>
+</div>
+    
+      <div class="method_details ">
+  <h3 class="signature " id="fail!-instance_method">
+  
+    #<strong>fail!</strong>(context = {})  &#x21d2; <tt><span class='object_link'><a href="" title="Chat::Service::Base::Context (class)">Context</a></span></tt> 
+  
+
+  
+
+  
+</h3><div class="docstring">
+  <div class="discussion">
+    
+<p>Marks the context as failed.</p>
+
+
+  </div>
+</div>
+<div class="tags">
+  
+  <div class="examples">
+    <p class="tag_title">Examples:</p>
+    
+      
+      <pre class="example code"><code><span class='id identifier rubyid_context'>context</span><span class='period'>.</span><span class='id identifier rubyid_fail!'>fail!</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>failure</span><span class='label_end'>&quot;:</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>something went wrong</span><span class='tstring_end'>&quot;</span></span><span class='rparen'>)</span></code></pre>
+    
+  </div>
+<p class="tag_title">Parameters:</p>
+<ul class="param">
+  
+    <li>
+      
+        <span class='name'>context</span>
+      
+      
+        <span class='type'>(<tt>Hash</tt>, <tt><span class='object_link'><a href="" title="Chat::Service::Base::Context (class)">Context</a></span></tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>{}</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>the context to merge into the current one</p>
+</div>
+      
+    </li>
+  
+</ul>
+
+<p class="tag_title">Returns:</p>
+<ul class="return">
+  
+    <li>
+      
+      
+        <span class='type'>(<tt><span class='object_link'><a href="" title="Chat::Service::Base::Context (class)">Context</a></span></tt>)</span>
+      
+      
+      
+    </li>
+  
+</ul>
+<p class="tag_title">Raises:</p>
+<ul class="raise">
+  
+    <li>
+      
+      
+        <span class='type'>(<tt><span class='object_link'><a href="Failure.html" title="Chat::Service::Base::Failure (class)">Failure</a></span></tt>)</span>
+      
+      
+      
+    </li>
+  
+</ul>
+
+</div>
+</div>
+    
+      <div class="method_details ">
+  <h3 class="signature " id="failure?-instance_method">
+  
+    #<strong>failure?</strong>  &#x21d2; <tt>Boolean</tt> 
+  
+
+  
+
+  
+</h3><div class="docstring">
+  <div class="discussion">
+    
+<p>Returns <code>true</code> if the context is set as failed</p>
+
+
+  </div>
+</div>
+<div class="tags">
+  
+<p class="tag_title">Returns:</p>
+<ul class="return">
+  
+    <li>
+      
+      
+        <span class='type'>(<tt>Boolean</tt>)</span>
+      
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>returns <code>true</code> if the context is set as failed</p>
+</div>
+      
+    </li>
+  
+</ul>
+
+  <p class="tag_title">See Also:</p>
+  <ul class="see">
+    
+      <li><span class='object_link'><a href="#fail!-instance_method" title="Chat::Service::Base::Context#fail! (method)">#fail!</a></span></li>
+    
+      <li><span class='object_link'><a href="#fail-instance_method" title="Chat::Service::Base::Context#fail (method)">#fail</a></span></li>
+    
+  </ul>
+
+</div>
+</div>
+    
+      <div class="method_details ">
+  <h3 class="signature " id="success?-instance_method">
+  
+    #<strong>success?</strong>  &#x21d2; <tt>Boolean</tt> 
+  
+
+  
+
+  
+</h3><div class="docstring">
+  <div class="discussion">
+    
+<p>Returns <code>true</code> if the context is set as successful (default)</p>
+
+
+  </div>
+</div>
+<div class="tags">
+  
+<p class="tag_title">Returns:</p>
+<ul class="return">
+  
+    <li>
+      
+      
+        <span class='type'>(<tt>Boolean</tt>)</span>
+      
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>returns <code>true</code> if the context is set as successful (default)</p>
+</div>
+      
+    </li>
+  
+</ul>
+
+</div>
+</div>
+    
+  </div>
+
+</div>
+
+      
+<div id="footer">
+  Generated by
+  <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
+  0.9.28.
+</div>
+
+    </div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/documentation/chat/backend/Chat/Service/Base/Failure.html b/documentation/chat/backend/Chat/Service/Base/Failure.html
new file mode 100644
index 00000000000..5f9e93733bf
--- /dev/null
+++ b/documentation/chat/backend/Chat/Service/Base/Failure.html
@@ -0,0 +1,209 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>
+  Exception: Chat::Service::Base::Failure
+  
+    &mdash; Documentation by YARD 0.9.28
+  
+</title>
+
+  <link rel="stylesheet" href="../../../css/style.css" type="text/css" />
+
+  <link rel="stylesheet" href="../../../css/common.css" type="text/css" />
+
+<script type="text/javascript">
+  pathId = "Chat::Service::Base::Failure";
+  relpath = '../../../';
+</script>
+
+
+  <script type="text/javascript" charset="utf-8" src="../../../js/jquery.js"></script>
+
+  <script type="text/javascript" charset="utf-8" src="../../../js/app.js"></script>
+
+
+  </head>
+  <body>
+    <div class="nav_wrap">
+      <iframe id="nav" src="../../../class_list.html?1"></iframe>
+      <div id="resizer"></div>
+    </div>
+
+    <div id="main" tabindex="-1">
+      <div id="header">
+        <div id="menu">
+  
+    <a href="../../../_index.html">Index (F)</a> &raquo;
+    <span class='title'><span class='object_link'><a href="../../../Chat.html" title="Chat (module)">Chat</a></span></span> &raquo; <span class='title'><span class='object_link'><a href="../../Service.html" title="Chat::Service (module)">Service</a></span></span> &raquo; <span class='title'><span class='object_link'><a href="../Base.html" title="Chat::Service::Base (module)">Base</a></span></span>
+     &raquo; 
+    <span class="title">Failure</span>
+  
+</div>
+
+        <div id="search">
+  
+    <a class="full_list_link" id="class_list_link"
+        href="../../../class_list.html">
+
+        <svg width="24" height="24">
+          <rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
+        </svg>
+    </a>
+  
+</div>
+        <div class="clear"></div>
+      </div>
+
+      <div id="content"><h1>Exception: Chat::Service::Base::Failure
+  
+  
+  
+</h1>
+<div class="box_info">
+  
+  <dl>
+    <dt>Inherits:</dt>
+    <dd>
+      <span class="inheritName">StandardError</span>
+      
+        <ul class="fullTree">
+          <li>Object</li>
+          
+            <li class="next">StandardError</li>
+          
+            <li class="next">Chat::Service::Base::Failure</li>
+          
+        </ul>
+        <a href="#" class="inheritanceTree">show all</a>
+      
+    </dd>
+  </dl>
+  
+
+  
+  
+  
+  
+  
+
+  
+
+  
+  <dl>
+    <dt>Defined in:</dt>
+    <dd>plugins/chat/app/services/base.rb</dd>
+  </dl>
+  
+</div>
+
+<h2>Overview</h2><div class="docstring">
+  <div class="discussion">
+    
+<p>The only exception that can be raised by a service.</p>
+
+
+  </div>
+</div>
+<div class="tags">
+  
+
+</div>
+
+
+
+  <h2>Instance Attribute Summary <small><a href="#" class="summary_toggle">collapse</a></small></h2>
+  <ul class="summary">
+    
+      <li class="public ">
+  <span class="summary_signature">
+    
+      <a href="#context-instance_method" title="#context (instance method)">#<strong>context</strong>  &#x21d2; Context </a>
+    
+
+    
+  </span>
+  
+  
+  
+    
+      <span class="note title readonly">readonly</span>
+    
+    
+  
+  
+  
+  
+  
+
+  
+    <span class="summary_desc"><div class='inline'></div></span>
+  
+</li>
+
+    
+  </ul>
+
+
+
+
+
+  
+  <div id="instance_attr_details" class="attr_details">
+    <h2>Instance Attribute Details</h2>
+    
+      
+      <span id=""></span>
+      <div class="method_details first">
+  <h3 class="signature first" id="context-instance_method">
+  
+    #<strong>context</strong>  &#x21d2; <tt><span class='object_link'><a href="Context.html" title="Chat::Service::Base::Context (class)">Context</a></span></tt>  <span class="extras">(readonly)</span>
+  
+
+  
+
+  
+</h3><div class="docstring">
+  <div class="discussion">
+    
+
+  </div>
+</div>
+<div class="tags">
+  
+<p class="tag_title">Returns:</p>
+<ul class="return">
+  
+    <li>
+      
+      
+        <span class='type'>(<tt><span class='object_link'><a href="Context.html" title="Chat::Service::Base::Context (class)">Context</a></span></tt>)</span>
+      
+      
+      
+    </li>
+  
+</ul>
+
+</div>
+</div>
+    
+  </div>
+
+
+</div>
+
+      
+<div id="footer">
+  Generated by
+  <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
+  0.9.28.
+</div>
+
+    </div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/documentation/chat/backend/Chat/Service/TrashChannel.html b/documentation/chat/backend/Chat/Service/TrashChannel.html
new file mode 100644
index 00000000000..ff9eb948d03
--- /dev/null
+++ b/documentation/chat/backend/Chat/Service/TrashChannel.html
@@ -0,0 +1,277 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>
+  Class: Chat::Service::TrashChannel
+  
+    &mdash; Documentation by YARD 0.9.28
+  
+</title>
+
+  <link rel="stylesheet" href="../../css/style.css" type="text/css" />
+
+  <link rel="stylesheet" href="../../css/common.css" type="text/css" />
+
+<script type="text/javascript">
+  pathId = "Chat::Service::TrashChannel";
+  relpath = '../../';
+</script>
+
+
+  <script type="text/javascript" charset="utf-8" src="../../js/jquery.js"></script>
+
+  <script type="text/javascript" charset="utf-8" src="../../js/app.js"></script>
+
+
+  </head>
+  <body>
+    <div class="nav_wrap">
+      <iframe id="nav" src="../../class_list.html?1"></iframe>
+      <div id="resizer"></div>
+    </div>
+
+    <div id="main" tabindex="-1">
+      <div id="header">
+        <div id="menu">
+  
+    <a href="../../_index.html">Index (T)</a> &raquo;
+    <span class='title'><span class='object_link'><a href="../../Chat.html" title="Chat (module)">Chat</a></span></span> &raquo; <span class='title'><span class='object_link'><a href="../Service.html" title="Chat::Service (module)">Service</a></span></span>
+     &raquo; 
+    <span class="title">TrashChannel</span>
+  
+</div>
+
+        <div id="search">
+  
+    <a class="full_list_link" id="class_list_link"
+        href="../../class_list.html">
+
+        <svg width="24" height="24">
+          <rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
+        </svg>
+    </a>
+  
+</div>
+        <div class="clear"></div>
+      </div>
+
+      <div id="content"><h1>Class: Chat::Service::TrashChannel
+  
+  
+  
+</h1>
+<div class="box_info">
+  
+  <dl>
+    <dt>Inherits:</dt>
+    <dd>
+      <span class="inheritName">Object</span>
+      
+        <ul class="fullTree">
+          <li>Object</li>
+          
+            <li class="next">Chat::Service::TrashChannel</li>
+          
+        </ul>
+        <a href="#" class="inheritanceTree">show all</a>
+      
+    </dd>
+  </dl>
+  
+
+  
+  
+  
+  
+  <dl>
+      <dt>Includes:</dt>
+      <dd><span class='object_link'><a href="Base.html" title="Chat::Service::Base (module)">Base</a></span></dd>
+  </dl>
+  
+  
+
+  
+
+  
+  <dl>
+    <dt>Defined in:</dt>
+    <dd>plugins/chat/app/services/trash_channel.rb</dd>
+  </dl>
+  
+</div>
+
+<h2>Overview</h2><div class="docstring">
+  <div class="discussion">
+    
+<p>Service responsible for trashing a chat channel. Note the slug is modified to prevent collisions.</p>
+
+
+  </div>
+</div>
+<div class="tags">
+  
+  <div class="examples">
+    <p class="tag_title">Examples:</p>
+    
+      
+      <pre class="example code"><code><span class='const'><span class='object_link'><a href="../../Chat.html" title="Chat (module)">Chat</a></span></span><span class='op'>::</span><span class='const'><span class='object_link'><a href="../Service.html" title="Chat::Service (module)">Service</a></span></span><span class='op'>::</span><span class='const'>TrashChannel</span><span class='period'>.</span><span class='id identifier rubyid_call'><span class='object_link'><a href="#call-instance_method" title="Chat::Service::TrashChannel#call (method)">call</a></span></span><span class='lparen'>(</span><span class='label'>channel_id:</span> <span class='int'>2</span><span class='comma'>,</span> <span class='label'>guardian:</span> <span class='id identifier rubyid_guardian'>guardian</span><span class='rparen'>)</span></code></pre>
+    
+  </div>
+
+
+</div>
+  
+    <h2>
+      Constant Summary
+      <small><a href="#" class="constants_summary_toggle">collapse</a></small>
+    </h2>
+
+    <dl class="constants">
+      
+        <dt id="DELETE_CHANNEL_LOG_KEY-constant" class="">DELETE_CHANNEL_LOG_KEY =
+          
+        </dt>
+        <dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>chat_channel_delete</span><span class='tstring_end'>&quot;</span></span></pre></dd>
+      
+    </dl>
+  
+
+
+
+
+
+
+
+  
+    <h2>
+      Instance Method Summary
+      <small><a href="#" class="summary_toggle">collapse</a></small>
+    </h2>
+
+    <ul class="summary">
+      
+        <li class="public ">
+  <span class="summary_signature">
+    
+      <a href="#call-instance_method" title="#call (instance method)">#<strong>call</strong>(channel_id: , guardian: )  &#x21d2; Chat::Service::Base::Context </a>
+    
+
+    
+  </span>
+  
+  
+  
+  
+  
+  
+  
+
+  
+    <span class="summary_desc"><div class='inline'></div></span>
+  
+</li>
+
+      
+    </ul>
+  
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+  <h3 class="inherited">Methods included from <span class='object_link'><a href="Base.html" title="Chat::Service::Base (module)">Base</a></span></h3>
+  <p class="inherited"><span class='object_link'><a href="Base.html#contract-class_method" title="Chat::Service::Base.contract (method)">contract</a></span>, <span class='object_link'><a href="Base.html#model-class_method" title="Chat::Service::Base.model (method)">model</a></span>, <span class='object_link'><a href="Base.html#policy-class_method" title="Chat::Service::Base.policy (method)">policy</a></span>, <span class='object_link'><a href="Base.html#step-class_method" title="Chat::Service::Base.step (method)">step</a></span>, <span class='object_link'><a href="Base.html#transaction-class_method" title="Chat::Service::Base.transaction (method)">transaction</a></span></p>
+
+  
+
+  <div id="instance_method_details" class="method_details_list">
+    <h2>Instance Method Details</h2>
+
+    
+      <div class="method_details first">
+  <h3 class="signature first" id="call-instance_method">
+  
+    #<strong>call</strong>(channel_id: , guardian: )  &#x21d2; <tt><span class='object_link'><a href="Base/Context.html" title="Chat::Service::Base::Context (class)">Chat::Service::Base::Context</a></span></tt> 
+  
+
+  
+
+  
+</h3><div class="docstring">
+  <div class="discussion">
+    
+
+  </div>
+</div>
+<div class="tags">
+  <p class="tag_title">Parameters:</p>
+<ul class="param">
+  
+    <li>
+      
+        <span class='name'>channel_id</span>
+      
+      
+        <span class='type'>(<tt>Integer</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt></tt>)</em>
+      
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>guardian</span>
+      
+      
+        <span class='type'>(<tt>Guardian</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt></tt>)</em>
+      
+      
+    </li>
+  
+</ul>
+
+<p class="tag_title">Returns:</p>
+<ul class="return">
+  
+    <li>
+      
+      
+        <span class='type'>(<tt><span class='object_link'><a href="Base/Context.html" title="Chat::Service::Base::Context (class)">Chat::Service::Base::Context</a></span></tt>)</span>
+      
+      
+      
+    </li>
+  
+</ul>
+
+</div>
+</div>
+    
+  </div>
+
+</div>
+
+      
+<div id="footer">
+  Generated by
+  <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
+  0.9.28.
+</div>
+
+    </div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/documentation/chat/backend/Chat/Service/UpdateChannel.html b/documentation/chat/backend/Chat/Service/UpdateChannel.html
new file mode 100644
index 00000000000..166888264f1
--- /dev/null
+++ b/documentation/chat/backend/Chat/Service/UpdateChannel.html
@@ -0,0 +1,346 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>
+  Class: Chat::Service::UpdateChannel
+  
+    &mdash; Documentation by YARD 0.9.28
+  
+</title>
+
+  <link rel="stylesheet" href="../../css/style.css" type="text/css" />
+
+  <link rel="stylesheet" href="../../css/common.css" type="text/css" />
+
+<script type="text/javascript">
+  pathId = "Chat::Service::UpdateChannel";
+  relpath = '../../';
+</script>
+
+
+  <script type="text/javascript" charset="utf-8" src="../../js/jquery.js"></script>
+
+  <script type="text/javascript" charset="utf-8" src="../../js/app.js"></script>
+
+
+  </head>
+  <body>
+    <div class="nav_wrap">
+      <iframe id="nav" src="../../class_list.html?1"></iframe>
+      <div id="resizer"></div>
+    </div>
+
+    <div id="main" tabindex="-1">
+      <div id="header">
+        <div id="menu">
+  
+    <a href="../../_index.html">Index (U)</a> &raquo;
+    <span class='title'><span class='object_link'><a href="../../Chat.html" title="Chat (module)">Chat</a></span></span> &raquo; <span class='title'><span class='object_link'><a href="../Service.html" title="Chat::Service (module)">Service</a></span></span>
+     &raquo; 
+    <span class="title">UpdateChannel</span>
+  
+</div>
+
+        <div id="search">
+  
+    <a class="full_list_link" id="class_list_link"
+        href="../../class_list.html">
+
+        <svg width="24" height="24">
+          <rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
+        </svg>
+    </a>
+  
+</div>
+        <div class="clear"></div>
+      </div>
+
+      <div id="content"><h1>Class: Chat::Service::UpdateChannel
+  
+  
+  
+</h1>
+<div class="box_info">
+  
+  <dl>
+    <dt>Inherits:</dt>
+    <dd>
+      <span class="inheritName">Object</span>
+      
+        <ul class="fullTree">
+          <li>Object</li>
+          
+            <li class="next">Chat::Service::UpdateChannel</li>
+          
+        </ul>
+        <a href="#" class="inheritanceTree">show all</a>
+      
+    </dd>
+  </dl>
+  
+
+  
+  
+  
+  
+  <dl>
+      <dt>Includes:</dt>
+      <dd><span class='object_link'><a href="Base.html" title="Chat::Service::Base (module)">Base</a></span></dd>
+  </dl>
+  
+  
+
+  
+
+  
+  <dl>
+    <dt>Defined in:</dt>
+    <dd>plugins/chat/app/services/update_channel.rb</dd>
+  </dl>
+  
+</div>
+
+<h2>Overview</h2><div class="docstring">
+  <div class="discussion">
+    
+<p>Service responsible for updating a chat channel’s name, slug, and description.</p>
+
+<p>For a CategoryChannel, the settings for auto_join_users and allow_channel_wide_mentions are also editable.</p>
+
+
+  </div>
+</div>
+<div class="tags">
+  
+  <div class="examples">
+    <p class="tag_title">Examples:</p>
+    
+      
+      <pre class="example code"><code><span class='const'><span class='object_link'><a href="../../Chat.html" title="Chat (module)">Chat</a></span></span><span class='op'>::</span><span class='const'><span class='object_link'><a href="../Service.html" title="Chat::Service (module)">Service</a></span></span><span class='op'>::</span><span class='const'>UpdateChannel</span><span class='period'>.</span><span class='id identifier rubyid_call'><span class='object_link'><a href="#call-instance_method" title="Chat::Service::UpdateChannel#call (method)">call</a></span></span><span class='lparen'>(</span>
+ <span class='label'>channel_id:</span> <span class='int'>2</span><span class='comma'>,</span>
+ <span class='label'>guardian:</span> <span class='id identifier rubyid_guardian'>guardian</span><span class='comma'>,</span>
+ <span class='label'>name:</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>SuperChannel</span><span class='tstring_end'>&quot;</span></span><span class='comma'>,</span>
+ <span class='label'>description:</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>This is the best channel</span><span class='tstring_end'>&quot;</span></span><span class='comma'>,</span>
+ <span class='label'>slug:</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>super-channel</span><span class='tstring_end'>&quot;</span></span><span class='comma'>,</span>
+<span class='rparen'>)</span></code></pre>
+    
+  </div>
+
+
+</div>
+
+
+
+
+
+
+  
+    <h2>
+      Instance Method Summary
+      <small><a href="#" class="summary_toggle">collapse</a></small>
+    </h2>
+
+    <ul class="summary">
+      
+        <li class="public ">
+  <span class="summary_signature">
+    
+      <a href="#call-instance_method" title="#call (instance method)">#<strong>call</strong>(channel_id: , guardian: , **params_to_edit)  &#x21d2; Chat::Service::Base::Context </a>
+    
+
+    
+  </span>
+  
+  
+  
+  
+  
+  
+  
+
+  
+    <span class="summary_desc"><div class='inline'></div></span>
+  
+</li>
+
+      
+    </ul>
+  
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+  <h3 class="inherited">Methods included from <span class='object_link'><a href="Base.html" title="Chat::Service::Base (module)">Base</a></span></h3>
+  <p class="inherited"><span class='object_link'><a href="Base.html#contract-class_method" title="Chat::Service::Base.contract (method)">contract</a></span>, <span class='object_link'><a href="Base.html#model-class_method" title="Chat::Service::Base.model (method)">model</a></span>, <span class='object_link'><a href="Base.html#policy-class_method" title="Chat::Service::Base.policy (method)">policy</a></span>, <span class='object_link'><a href="Base.html#step-class_method" title="Chat::Service::Base.step (method)">step</a></span>, <span class='object_link'><a href="Base.html#transaction-class_method" title="Chat::Service::Base.transaction (method)">transaction</a></span></p>
+
+  
+
+  <div id="instance_method_details" class="method_details_list">
+    <h2>Instance Method Details</h2>
+
+    
+      <div class="method_details first">
+  <h3 class="signature first" id="call-instance_method">
+  
+    #<strong>call</strong>(channel_id: , guardian: , **params_to_edit)  &#x21d2; <tt><span class='object_link'><a href="Base/Context.html" title="Chat::Service::Base::Context (class)">Chat::Service::Base::Context</a></span></tt> 
+  
+
+  
+
+  
+</h3><div class="docstring">
+  <div class="discussion">
+    
+
+  </div>
+</div>
+<div class="tags">
+  <p class="tag_title">Parameters:</p>
+<ul class="param">
+  
+    <li>
+      
+        <span class='name'>channel_id</span>
+      
+      
+        <span class='type'>(<tt>Integer</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt></tt>)</em>
+      
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>guardian</span>
+      
+      
+        <span class='type'>(<tt>Guardian</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt></tt>)</em>
+      
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>params_to_edit</span>
+      
+      
+        <span class='type'>(<tt>Hash</tt>)</span>
+      
+      
+      
+    </li>
+  
+</ul>
+
+  
+    
+    
+    
+    
+    
+    
+    <p class="tag_title">Options Hash (<tt>**params_to_edit</tt>):</p>
+    <ul class="option">
+      
+        <li>
+          <span class="name">name</span>
+          <span class="type">(<tt>String</tt>, <tt>nil</tt>)</span>
+          <span class="default">
+            
+          </span>
+          
+        </li>
+      
+        <li>
+          <span class="name">description</span>
+          <span class="type">(<tt>String</tt>, <tt>nil</tt>)</span>
+          <span class="default">
+            
+          </span>
+          
+        </li>
+      
+        <li>
+          <span class="name">slug</span>
+          <span class="type">(<tt>String</tt>, <tt>nil</tt>)</span>
+          <span class="default">
+            
+          </span>
+          
+        </li>
+      
+        <li>
+          <span class="name">auto_join_users</span>
+          <span class="type">(<tt>Boolean</tt>)</span>
+          <span class="default">
+            
+          </span>
+          
+            &mdash; <div class='inline'>
+<p>Only valid for CategoryChannel. Whether active users with permission to see the category should automatically join the channel.</p>
+</div>
+          
+        </li>
+      
+        <li>
+          <span class="name">allow_channel_wide_mentions</span>
+          <span class="type">(<tt>Boolean</tt>)</span>
+          <span class="default">
+            
+          </span>
+          
+            &mdash; <div class='inline'>
+<p>Allow the use of @here and @all in the channel.</p>
+</div>
+          
+        </li>
+      
+    </ul>
+  
+
+<p class="tag_title">Returns:</p>
+<ul class="return">
+  
+    <li>
+      
+      
+        <span class='type'>(<tt><span class='object_link'><a href="Base/Context.html" title="Chat::Service::Base::Context (class)">Chat::Service::Base::Context</a></span></tt>)</span>
+      
+      
+      
+    </li>
+  
+</ul>
+
+</div>
+</div>
+    
+  </div>
+
+</div>
+
+      
+<div id="footer">
+  Generated by
+  <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
+  0.9.28.
+</div>
+
+    </div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/documentation/chat/backend/Chat/Service/UpdateChannelStatus.html b/documentation/chat/backend/Chat/Service/UpdateChannelStatus.html
new file mode 100644
index 00000000000..85d2adffcf6
--- /dev/null
+++ b/documentation/chat/backend/Chat/Service/UpdateChannelStatus.html
@@ -0,0 +1,274 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>
+  Class: Chat::Service::UpdateChannelStatus
+  
+    &mdash; Documentation by YARD 0.9.28
+  
+</title>
+
+  <link rel="stylesheet" href="../../css/style.css" type="text/css" />
+
+  <link rel="stylesheet" href="../../css/common.css" type="text/css" />
+
+<script type="text/javascript">
+  pathId = "Chat::Service::UpdateChannelStatus";
+  relpath = '../../';
+</script>
+
+
+  <script type="text/javascript" charset="utf-8" src="../../js/jquery.js"></script>
+
+  <script type="text/javascript" charset="utf-8" src="../../js/app.js"></script>
+
+
+  </head>
+  <body>
+    <div class="nav_wrap">
+      <iframe id="nav" src="../../class_list.html?1"></iframe>
+      <div id="resizer"></div>
+    </div>
+
+    <div id="main" tabindex="-1">
+      <div id="header">
+        <div id="menu">
+  
+    <a href="../../_index.html">Index (U)</a> &raquo;
+    <span class='title'><span class='object_link'><a href="../../Chat.html" title="Chat (module)">Chat</a></span></span> &raquo; <span class='title'><span class='object_link'><a href="../Service.html" title="Chat::Service (module)">Service</a></span></span>
+     &raquo; 
+    <span class="title">UpdateChannelStatus</span>
+  
+</div>
+
+        <div id="search">
+  
+    <a class="full_list_link" id="class_list_link"
+        href="../../class_list.html">
+
+        <svg width="24" height="24">
+          <rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
+        </svg>
+    </a>
+  
+</div>
+        <div class="clear"></div>
+      </div>
+
+      <div id="content"><h1>Class: Chat::Service::UpdateChannelStatus
+  
+  
+  
+</h1>
+<div class="box_info">
+  
+  <dl>
+    <dt>Inherits:</dt>
+    <dd>
+      <span class="inheritName">Object</span>
+      
+        <ul class="fullTree">
+          <li>Object</li>
+          
+            <li class="next">Chat::Service::UpdateChannelStatus</li>
+          
+        </ul>
+        <a href="#" class="inheritanceTree">show all</a>
+      
+    </dd>
+  </dl>
+  
+
+  
+  
+  
+  
+  <dl>
+      <dt>Includes:</dt>
+      <dd><span class='object_link'><a href="Base.html" title="Chat::Service::Base (module)">Base</a></span></dd>
+  </dl>
+  
+  
+
+  
+
+  
+  <dl>
+    <dt>Defined in:</dt>
+    <dd>plugins/chat/app/services/update_channel_status.rb</dd>
+  </dl>
+  
+</div>
+
+<h2>Overview</h2><div class="docstring">
+  <div class="discussion">
+    
+<p>Service responsible for updating a chat channel status.</p>
+
+
+  </div>
+</div>
+<div class="tags">
+  
+  <div class="examples">
+    <p class="tag_title">Examples:</p>
+    
+      
+      <pre class="example code"><code><span class='const'><span class='object_link'><a href="../../Chat.html" title="Chat (module)">Chat</a></span></span><span class='op'>::</span><span class='const'><span class='object_link'><a href="../Service.html" title="Chat::Service (module)">Service</a></span></span><span class='op'>::</span><span class='const'>UpdateChannelStatus</span><span class='period'>.</span><span class='id identifier rubyid_call'><span class='object_link'><a href="#call-instance_method" title="Chat::Service::UpdateChannelStatus#call (method)">call</a></span></span><span class='lparen'>(</span><span class='label'>channel_id:</span> <span class='int'>2</span><span class='comma'>,</span> <span class='label'>guardian:</span> <span class='id identifier rubyid_guardian'>guardian</span><span class='comma'>,</span> <span class='label'>status:</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>open</span><span class='tstring_end'>&quot;</span></span><span class='rparen'>)</span></code></pre>
+    
+  </div>
+
+
+</div>
+
+
+
+
+
+
+  
+    <h2>
+      Instance Method Summary
+      <small><a href="#" class="summary_toggle">collapse</a></small>
+    </h2>
+
+    <ul class="summary">
+      
+        <li class="public ">
+  <span class="summary_signature">
+    
+      <a href="#call-instance_method" title="#call (instance method)">#<strong>call</strong>(channel_id: , guardian: , status: )  &#x21d2; Chat::Service::Base::Context </a>
+    
+
+    
+  </span>
+  
+  
+  
+  
+  
+  
+  
+
+  
+    <span class="summary_desc"><div class='inline'></div></span>
+  
+</li>
+
+      
+    </ul>
+  
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+  <h3 class="inherited">Methods included from <span class='object_link'><a href="Base.html" title="Chat::Service::Base (module)">Base</a></span></h3>
+  <p class="inherited"><span class='object_link'><a href="Base.html#contract-class_method" title="Chat::Service::Base.contract (method)">contract</a></span>, <span class='object_link'><a href="Base.html#model-class_method" title="Chat::Service::Base.model (method)">model</a></span>, <span class='object_link'><a href="Base.html#policy-class_method" title="Chat::Service::Base.policy (method)">policy</a></span>, <span class='object_link'><a href="Base.html#step-class_method" title="Chat::Service::Base.step (method)">step</a></span>, <span class='object_link'><a href="Base.html#transaction-class_method" title="Chat::Service::Base.transaction (method)">transaction</a></span></p>
+
+  
+
+  <div id="instance_method_details" class="method_details_list">
+    <h2>Instance Method Details</h2>
+
+    
+      <div class="method_details first">
+  <h3 class="signature first" id="call-instance_method">
+  
+    #<strong>call</strong>(channel_id: , guardian: , status: )  &#x21d2; <tt><span class='object_link'><a href="Base/Context.html" title="Chat::Service::Base::Context (class)">Chat::Service::Base::Context</a></span></tt> 
+  
+
+  
+
+  
+</h3><div class="docstring">
+  <div class="discussion">
+    
+
+  </div>
+</div>
+<div class="tags">
+  <p class="tag_title">Parameters:</p>
+<ul class="param">
+  
+    <li>
+      
+        <span class='name'>channel_id</span>
+      
+      
+        <span class='type'>(<tt>Integer</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt></tt>)</em>
+      
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>guardian</span>
+      
+      
+        <span class='type'>(<tt>Guardian</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt></tt>)</em>
+      
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>status</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt></tt>)</em>
+      
+      
+    </li>
+  
+</ul>
+
+<p class="tag_title">Returns:</p>
+<ul class="return">
+  
+    <li>
+      
+      
+        <span class='type'>(<tt><span class='object_link'><a href="Base/Context.html" title="Chat::Service::Base::Context (class)">Chat::Service::Base::Context</a></span></tt>)</span>
+      
+      
+      
+    </li>
+  
+</ul>
+
+</div>
+</div>
+    
+  </div>
+
+</div>
+
+      
+<div id="footer">
+  Generated by
+  <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
+  0.9.28.
+</div>
+
+    </div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/documentation/chat/backend/Chat/Service/UpdateUserLastRead.html b/documentation/chat/backend/Chat/Service/UpdateUserLastRead.html
new file mode 100644
index 00000000000..42533b9c1d5
--- /dev/null
+++ b/documentation/chat/backend/Chat/Service/UpdateUserLastRead.html
@@ -0,0 +1,274 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>
+  Class: Chat::Service::UpdateUserLastRead
+  
+    &mdash; Documentation by YARD 0.9.28
+  
+</title>
+
+  <link rel="stylesheet" href="../../css/style.css" type="text/css" />
+
+  <link rel="stylesheet" href="../../css/common.css" type="text/css" />
+
+<script type="text/javascript">
+  pathId = "Chat::Service::UpdateUserLastRead";
+  relpath = '../../';
+</script>
+
+
+  <script type="text/javascript" charset="utf-8" src="../../js/jquery.js"></script>
+
+  <script type="text/javascript" charset="utf-8" src="../../js/app.js"></script>
+
+
+  </head>
+  <body>
+    <div class="nav_wrap">
+      <iframe id="nav" src="../../class_list.html?1"></iframe>
+      <div id="resizer"></div>
+    </div>
+
+    <div id="main" tabindex="-1">
+      <div id="header">
+        <div id="menu">
+  
+    <a href="../../_index.html">Index (U)</a> &raquo;
+    <span class='title'><span class='object_link'><a href="../../Chat.html" title="Chat (module)">Chat</a></span></span> &raquo; <span class='title'><span class='object_link'><a href="../Service.html" title="Chat::Service (module)">Service</a></span></span>
+     &raquo; 
+    <span class="title">UpdateUserLastRead</span>
+  
+</div>
+
+        <div id="search">
+  
+    <a class="full_list_link" id="class_list_link"
+        href="../../class_list.html">
+
+        <svg width="24" height="24">
+          <rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
+        </svg>
+    </a>
+  
+</div>
+        <div class="clear"></div>
+      </div>
+
+      <div id="content"><h1>Class: Chat::Service::UpdateUserLastRead
+  
+  
+  
+</h1>
+<div class="box_info">
+  
+  <dl>
+    <dt>Inherits:</dt>
+    <dd>
+      <span class="inheritName">Object</span>
+      
+        <ul class="fullTree">
+          <li>Object</li>
+          
+            <li class="next">Chat::Service::UpdateUserLastRead</li>
+          
+        </ul>
+        <a href="#" class="inheritanceTree">show all</a>
+      
+    </dd>
+  </dl>
+  
+
+  
+  
+  
+  
+  <dl>
+      <dt>Includes:</dt>
+      <dd><span class='object_link'><a href="Base.html" title="Chat::Service::Base (module)">Base</a></span></dd>
+  </dl>
+  
+  
+
+  
+
+  
+  <dl>
+    <dt>Defined in:</dt>
+    <dd>plugins/chat/app/services/update_user_last_read.rb</dd>
+  </dl>
+  
+</div>
+
+<h2>Overview</h2><div class="docstring">
+  <div class="discussion">
+    
+<p>Service responsible for updating the last read message id of a membership.</p>
+
+
+  </div>
+</div>
+<div class="tags">
+  
+  <div class="examples">
+    <p class="tag_title">Examples:</p>
+    
+      
+      <pre class="example code"><code><span class='const'><span class='object_link'><a href="../../Chat.html" title="Chat (module)">Chat</a></span></span><span class='op'>::</span><span class='const'><span class='object_link'><a href="../Service.html" title="Chat::Service (module)">Service</a></span></span><span class='op'>::</span><span class='const'>UpdateUserLastRead</span><span class='period'>.</span><span class='id identifier rubyid_call'><span class='object_link'><a href="#call-instance_method" title="Chat::Service::UpdateUserLastRead#call (method)">call</a></span></span><span class='lparen'>(</span><span class='label'>user_id:</span> <span class='int'>1</span><span class='comma'>,</span> <span class='label'>channel_id:</span> <span class='int'>2</span><span class='comma'>,</span> <span class='label'>guardian:</span> <span class='id identifier rubyid_guardian'>guardian</span><span class='rparen'>)</span></code></pre>
+    
+  </div>
+
+
+</div>
+
+
+
+
+
+
+  
+    <h2>
+      Instance Method Summary
+      <small><a href="#" class="summary_toggle">collapse</a></small>
+    </h2>
+
+    <ul class="summary">
+      
+        <li class="public ">
+  <span class="summary_signature">
+    
+      <a href="#call-instance_method" title="#call (instance method)">#<strong>call</strong>(user_id: , channel_id: , guardian: )  &#x21d2; Chat::Service::Base::Context </a>
+    
+
+    
+  </span>
+  
+  
+  
+  
+  
+  
+  
+
+  
+    <span class="summary_desc"><div class='inline'></div></span>
+  
+</li>
+
+      
+    </ul>
+  
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+  <h3 class="inherited">Methods included from <span class='object_link'><a href="Base.html" title="Chat::Service::Base (module)">Base</a></span></h3>
+  <p class="inherited"><span class='object_link'><a href="Base.html#contract-class_method" title="Chat::Service::Base.contract (method)">contract</a></span>, <span class='object_link'><a href="Base.html#model-class_method" title="Chat::Service::Base.model (method)">model</a></span>, <span class='object_link'><a href="Base.html#policy-class_method" title="Chat::Service::Base.policy (method)">policy</a></span>, <span class='object_link'><a href="Base.html#step-class_method" title="Chat::Service::Base.step (method)">step</a></span>, <span class='object_link'><a href="Base.html#transaction-class_method" title="Chat::Service::Base.transaction (method)">transaction</a></span></p>
+
+  
+
+  <div id="instance_method_details" class="method_details_list">
+    <h2>Instance Method Details</h2>
+
+    
+      <div class="method_details first">
+  <h3 class="signature first" id="call-instance_method">
+  
+    #<strong>call</strong>(user_id: , channel_id: , guardian: )  &#x21d2; <tt><span class='object_link'><a href="Base/Context.html" title="Chat::Service::Base::Context (class)">Chat::Service::Base::Context</a></span></tt> 
+  
+
+  
+
+  
+</h3><div class="docstring">
+  <div class="discussion">
+    
+
+  </div>
+</div>
+<div class="tags">
+  <p class="tag_title">Parameters:</p>
+<ul class="param">
+  
+    <li>
+      
+        <span class='name'>user_id</span>
+      
+      
+        <span class='type'>(<tt>Integer</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt></tt>)</em>
+      
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>channel_id</span>
+      
+      
+        <span class='type'>(<tt>Integer</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt></tt>)</em>
+      
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>guardian</span>
+      
+      
+        <span class='type'>(<tt>Guardian</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt></tt>)</em>
+      
+      
+    </li>
+  
+</ul>
+
+<p class="tag_title">Returns:</p>
+<ul class="return">
+  
+    <li>
+      
+      
+        <span class='type'>(<tt><span class='object_link'><a href="Base/Context.html" title="Chat::Service::Base::Context (class)">Chat::Service::Base::Context</a></span></tt>)</span>
+      
+      
+      
+    </li>
+  
+</ul>
+
+</div>
+</div>
+    
+  </div>
+
+</div>
+
+      
+<div id="footer">
+  Generated by
+  <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
+  0.9.28.
+</div>
+
+    </div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/documentation/chat/backend/_index.html b/documentation/chat/backend/_index.html
new file mode 100644
index 00000000000..10e4c845e0b
--- /dev/null
+++ b/documentation/chat/backend/_index.html
@@ -0,0 +1,204 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>
+  Documentation by YARD 0.9.28
+  
+</title>
+
+  <link rel="stylesheet" href="css/style.css" type="text/css" />
+
+  <link rel="stylesheet" href="css/common.css" type="text/css" />
+
+<script type="text/javascript">
+  pathId = null;
+  relpath = '';
+</script>
+
+
+  <script type="text/javascript" charset="utf-8" src="js/jquery.js"></script>
+
+  <script type="text/javascript" charset="utf-8" src="js/app.js"></script>
+
+
+  </head>
+  <body>
+    <div class="nav_wrap">
+      <iframe id="nav" src="class_list.html?1"></iframe>
+      <div id="resizer"></div>
+    </div>
+
+    <div id="main" tabindex="-1">
+      <div id="header">
+        <div id="menu">
+  
+</div>
+
+        <div id="search">
+  
+    <a class="full_list_link" id="class_list_link"
+        href="class_list.html">
+
+        <svg width="24" height="24">
+          <rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
+        </svg>
+    </a>
+  
+</div>
+        <div class="clear"></div>
+      </div>
+
+      <div id="content"><h1 class="noborder title">Documentation by YARD 0.9.28</h1>
+<div id="listing">
+  <h1 class="alphaindex">Alphabetic Index</h1>
+  
+  <h2>File Listing</h2>
+  <ul id="files" class="index_inline_list">
+  
+  
+    <li class="r1"><a href="index.html" title="README">README</a></li>
+    
+  
+  </ul>
+
+<div class="clear"></div>
+<h2>Namespace Listing A-Z</h2>
+
+
+
+
+<table>
+  <tr>
+    <td valign='top' width="33%">
+      
+        
+        <ul id="alpha_B" class="alpha">
+          <li class="letter">B</li>
+          <ul>
+            
+              <li>
+                <span class='object_link'><a href="Chat/Service/Base.html" title="Chat::Service::Base (module)">Base</a></span>
+                
+                  <small>(Chat::Service)</small>
+                
+              </li>
+            
+          </ul>
+        </ul>
+      
+        
+        <ul id="alpha_C" class="alpha">
+          <li class="letter">C</li>
+          <ul>
+            
+              <li>
+                <span class='object_link'><a href="Chat.html" title="Chat (module)">Chat</a></span>
+                
+              </li>
+            
+              <li>
+                <span class='object_link'><a href="Chat/Service/Base/Context.html" title="Chat::Service::Base::Context (class)">Context</a></span>
+                
+                  <small>(Chat::Service::Base)</small>
+                
+              </li>
+            
+          </ul>
+        </ul>
+      
+        
+        <ul id="alpha_F" class="alpha">
+          <li class="letter">F</li>
+          <ul>
+            
+              <li>
+                <span class='object_link'><a href="Chat/Service/Base/Failure.html" title="Chat::Service::Base::Failure (class)">Failure</a></span>
+                
+                  <small>(Chat::Service::Base)</small>
+                
+              </li>
+            
+          </ul>
+        </ul>
+      
+        
+        <ul id="alpha_S" class="alpha">
+          <li class="letter">S</li>
+          <ul>
+            
+              <li>
+                <span class='object_link'><a href="Chat/Service.html" title="Chat::Service (module)">Service</a></span>
+                
+                  <small>(Chat)</small>
+                
+              </li>
+            
+          </ul>
+        </ul>
+      
+        
+        <ul id="alpha_T" class="alpha">
+          <li class="letter">T</li>
+          <ul>
+            
+              <li>
+                <span class='object_link'><a href="Chat/Service/TrashChannel.html" title="Chat::Service::TrashChannel (class)">TrashChannel</a></span>
+                
+                  <small>(Chat::Service)</small>
+                
+              </li>
+            
+          </ul>
+        </ul>
+      
+        
+        <ul id="alpha_U" class="alpha">
+          <li class="letter">U</li>
+          <ul>
+            
+              <li>
+                <span class='object_link'><a href="Chat/Service/UpdateChannel.html" title="Chat::Service::UpdateChannel (class)">UpdateChannel</a></span>
+                
+                  <small>(Chat::Service)</small>
+                
+              </li>
+            
+              <li>
+                <span class='object_link'><a href="Chat/Service/UpdateChannelStatus.html" title="Chat::Service::UpdateChannelStatus (class)">UpdateChannelStatus</a></span>
+                
+                  <small>(Chat::Service)</small>
+                
+              </li>
+            
+              <li>
+                <span class='object_link'><a href="Chat/Service/UpdateUserLastRead.html" title="Chat::Service::UpdateUserLastRead (class)">UpdateUserLastRead</a></span>
+                
+                  <small>(Chat::Service)</small>
+                
+              </li>
+            
+          </ul>
+        </ul>
+      
+    </td>
+  </tr>
+</table>
+
+</div>
+
+</div>
+
+      
+<div id="footer">
+  Generated by
+  <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
+  0.9.28.
+</div>
+
+    </div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/documentation/chat/backend/class_list.html b/documentation/chat/backend/class_list.html
new file mode 100644
index 00000000000..da9220ff702
--- /dev/null
+++ b/documentation/chat/backend/class_list.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta charset="utf-8" />
+    
+      <link rel="stylesheet" href="css/full_list.css" type="text/css" media="screen" />
+    
+      <link rel="stylesheet" href="css/common.css" type="text/css" media="screen" />
+    
+
+    
+      <script type="text/javascript" charset="utf-8" src="js/jquery.js"></script>
+    
+      <script type="text/javascript" charset="utf-8" src="js/full_list.js"></script>
+    
+
+    <title>Class List</title>
+    <base id="base_target" target="_parent" />
+  </head>
+  <body>
+    <div id="content">
+      <div class="fixed_header">
+        <h1 id="full_list_header">Class List</h1>
+        <div id="full_list_nav">
+          
+            <span><a target="_self" href="class_list.html">
+              Classes
+            </a></span>
+          
+            <span><a target="_self" href="method_list.html">
+              Methods
+            </a></span>
+          
+            <span><a target="_self" href="file_list.html">
+              Files
+            </a></span>
+          
+        </div>
+
+        <div id="search">Search: <input type="text" /></div>
+      </div>
+
+      <ul id="full_list" class="class">
+        <li id="object_" class="odd"><div class="item" style="padding-left:30px"><span class='object_link'><a href="top-level-namespace.html" title="Top Level Namespace (root)">Top Level Namespace</a></span></div></li>
+<li id='object_Chat' class='even'><div class='item' style='padding-left:30px'><a class='toggle'></a> <span class='object_link'><a href="Chat.html" title="Chat (module)">Chat</a></span><small class='search_info'>Top Level Namespace</small></div><ul><li id='object_Chat::Service' class='collapsed odd'><div class='item' style='padding-left:45px'><a class='toggle'></a> <span class='object_link'><a href="Chat/Service.html" title="Chat::Service (module)">Service</a></span><small class='search_info'>Chat</small></div><ul><li id='object_Chat::Service::Base' class='collapsed'><div class='item' style='padding-left:60px'><a class='toggle'></a> <span class='object_link'><a href="Chat/Service/Base.html" title="Chat::Service::Base (module)">Base</a></span><small class='search_info'>Chat::Service</small></div><ul><li id='object_Chat::Service::Base::Context' class='collapsed'><div class='item' style='padding-left:75px'><span class='object_link'><a href="Chat/Service/Base/Context.html" title="Chat::Service::Base::Context (class)">Context</a></span> &lt; OpenStruct<small class='search_info'>Chat::Service::Base</small></div></li><li id='object_Chat::Service::Base::Failure' class='collapsed'><div class='item' style='padding-left:75px'><span class='object_link'><a href="Chat/Service/Base/Failure.html" title="Chat::Service::Base::Failure (class)">Failure</a></span> &lt; StandardError<small class='search_info'>Chat::Service::Base</small></div></li></ul></li><li id='object_Chat::Service::TrashChannel' class='collapsed'><div class='item' style='padding-left:60px'><span class='object_link'><a href="Chat/Service/TrashChannel.html" title="Chat::Service::TrashChannel (class)">TrashChannel</a></span> &lt; Object<small class='search_info'>Chat::Service</small></div></li><li id='object_Chat::Service::UpdateChannel' class='collapsed'><div class='item' style='padding-left:60px'><span class='object_link'><a href="Chat/Service/UpdateChannel.html" title="Chat::Service::UpdateChannel (class)">UpdateChannel</a></span> &lt; Object<small class='search_info'>Chat::Service</small></div></li><li id='object_Chat::Service::UpdateChannelStatus' class='collapsed'><div class='item' style='padding-left:60px'><span class='object_link'><a href="Chat/Service/UpdateChannelStatus.html" title="Chat::Service::UpdateChannelStatus (class)">UpdateChannelStatus</a></span> &lt; Object<small class='search_info'>Chat::Service</small></div></li><li id='object_Chat::Service::UpdateUserLastRead' class='collapsed'><div class='item' style='padding-left:60px'><span class='object_link'><a href="Chat/Service/UpdateUserLastRead.html" title="Chat::Service::UpdateUserLastRead (class)">UpdateUserLastRead</a></span> &lt; Object<small class='search_info'>Chat::Service</small></div></li></ul></li></ul></li>
+
+      </ul>
+    </div>
+  </body>
+</html>
diff --git a/documentation/chat/backend/css/common.css b/documentation/chat/backend/css/common.css
new file mode 100644
index 00000000000..cf25c45233d
--- /dev/null
+++ b/documentation/chat/backend/css/common.css
@@ -0,0 +1 @@
+/* Override this file with custom rules */
\ No newline at end of file
diff --git a/documentation/chat/backend/css/full_list.css b/documentation/chat/backend/css/full_list.css
new file mode 100644
index 00000000000..fa359824291
--- /dev/null
+++ b/documentation/chat/backend/css/full_list.css
@@ -0,0 +1,58 @@
+body {
+  margin: 0;
+  font-family: "Lucida Sans", "Lucida Grande", Verdana, Arial, sans-serif;
+  font-size: 13px;
+  height: 101%;
+  overflow-x: hidden;
+  background: #fafafa;
+}
+
+h1 { padding: 12px 10px; padding-bottom: 0; margin: 0; font-size: 1.4em; }
+.clear { clear: both; }
+.fixed_header { position: fixed; background: #fff; width: 100%; padding-bottom: 10px; margin-top: 0; top: 0; z-index: 9999; height: 70px; }
+#search { position: absolute; right: 5px; top: 9px; padding-left: 24px; }
+#content.insearch #search, #content.insearch #noresults { background: url(data:image/gif;base64,R0lGODlhEAAQAPYAAP///wAAAPr6+pKSkoiIiO7u7sjIyNjY2J6engAAAI6OjsbGxjIyMlJSUuzs7KamppSUlPLy8oKCghwcHLKysqSkpJqamvT09Pj4+KioqM7OzkRERAwMDGBgYN7e3ujo6Ly8vCoqKjY2NkZGRtTU1MTExDw8PE5OTj4+PkhISNDQ0MrKylpaWrS0tOrq6nBwcKysrLi4uLq6ul5eXlxcXGJiYoaGhuDg4H5+fvz8/KKiohgYGCwsLFZWVgQEBFBQUMzMzDg4OFhYWBoaGvDw8NbW1pycnOLi4ubm5kBAQKqqqiQkJCAgIK6urnJyckpKSjQ0NGpqatLS0sDAwCYmJnx8fEJCQlRUVAoKCggICLCwsOTk5ExMTPb29ra2tmZmZmhoaNzc3KCgoBISEiIiIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCAAAACwAAAAAEAAQAAAHaIAAgoMgIiYlg4kACxIaACEJCSiKggYMCRselwkpghGJBJEcFgsjJyoAGBmfggcNEx0flBiKDhQFlIoCCA+5lAORFb4AJIihCRbDxQAFChAXw9HSqb60iREZ1omqrIPdJCTe0SWI09GBACH5BAkIAAAALAAAAAAQABAAAAdrgACCgwc0NTeDiYozCQkvOTo9GTmDKy8aFy+NOBA7CTswgywJDTIuEjYFIY0JNYMtKTEFiRU8Pjwygy4ws4owPyCKwsMAJSTEgiQlgsbIAMrO0dKDGMTViREZ14kYGRGK38nHguHEJcvTyIEAIfkECQgAAAAsAAAAABAAEAAAB2iAAIKDAggPg4iJAAMJCRUAJRIqiRGCBI0WQEEJJkWDERkYAAUKEBc4Po1GiKKJHkJDNEeKig4URLS0ICImJZAkuQAhjSi/wQyNKcGDCyMnk8u5rYrTgqDVghgZlYjcACTA1sslvtHRgQAh+QQJCAAAACwAAAAAEAAQAAAHZ4AAgoOEhYaCJSWHgxGDJCQARAtOUoQRGRiFD0kJUYWZhUhKT1OLhR8wBaaFBzQ1NwAlkIszCQkvsbOHL7Y4q4IuEjaqq0ZQD5+GEEsJTDCMmIUhtgk1lo6QFUwJVDKLiYJNUd6/hoEAIfkECQgAAAAsAAAAABAAEAAAB2iAAIKDhIWGgiUlh4MRgyQkjIURGRiGGBmNhJWHm4uen4ICCA+IkIsDCQkVACWmhwSpFqAABQoQF6ALTkWFnYMrVlhWvIKTlSAiJiVVPqlGhJkhqShHV1lCW4cMqSkAR1ofiwsjJyqGgQAh+QQJCAAAACwAAAAAEAAQAAAHZ4AAgoOEhYaCJSWHgxGDJCSMhREZGIYYGY2ElYebi56fhyWQniSKAKKfpaCLFlAPhl0gXYNGEwkhGYREUywag1wJwSkHNDU3D0kJYIMZQwk8MjPBLx9eXwuETVEyAC/BOKsuEjYFhoEAIfkECQgAAAAsAAAAABAAEAAAB2eAAIKDhIWGgiUlh4MRgyQkjIURGRiGGBmNhJWHm4ueICImip6CIQkJKJ4kigynKaqKCyMnKqSEK05StgAGQRxPYZaENqccFgIID4KXmQBhXFkzDgOnFYLNgltaSAAEpxa7BQoQF4aBACH5BAkIAAAALAAAAAAQABAAAAdogACCg4SFggJiPUqCJSWGgkZjCUwZACQkgxGEXAmdT4UYGZqCGWQ+IjKGGIUwPzGPhAc0NTewhDOdL7Ykji+dOLuOLhI2BbaFETICx4MlQitdqoUsCQ2vhKGjglNfU0SWmILaj43M5oEAOwAAAAAAAAAAAA==) no-repeat center left; }
+#full_list { padding: 0; list-style: none; margin-left: 0; margin-top: 80px; font-size: 1.1em; }
+#full_list ul { padding: 0; }
+#full_list li { padding: 0; margin: 0; list-style: none; }
+#full_list li .item { padding: 5px 5px 5px 12px; }
+#noresults { padding: 7px 12px; background: #fff; }
+#content.insearch #noresults { margin-left: 7px; }
+li.collapsed ul { display: none; }
+li a.toggle { cursor: default; position: relative; left: -5px; top: 4px; text-indent: -999px; width: 10px; height: 9px; margin-left: -10px; display: block; float: left; background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAASCAYAAABb0P4QAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAK8AAACvABQqw0mAAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTM5jWRgMAAAAVdEVYdENyZWF0aW9uIFRpbWUAMy8xNC8wOeNZPpQAAAE2SURBVDiNrZTBccIwEEXfelIAHUA6CZ24BGaWO+FuzZAK4k6gg5QAdGAq+Bxs2Yqx7BzyL7Llp/VfzZeQhCTc/ezuGzKKnKSzpCxXJM8fwNXda3df5RZETlIt6YUzSQDs93sl8w3wBZxCCE10GM1OcWbWjB2mWgEH4Mfdyxm3PSepBHibgQE2wLe7r4HjEidpnXMYdQPKEMJcsZ4zs2POYQOcaPfwMVOo58zsAdMt18BuoVDPxUJRacELbXv3hUIX2vYmOUvi8C8ydz/ThjXrqKqqLbDIAdsCKBd+Wo7GWa7o9qzOQHVVVXeAbs+yHHCH4aTsaCOQqunmUy1yBUAXkdMIfMlgF5EXLo2OpV/c/Up7jG4hhHcYLgWzAZXUc2b2ixsfvc/RmNNfOXD3Q/oeL9axJE1yT9IOoUu6MGUkAAAAAElFTkSuQmCC) no-repeat bottom left; }
+li.collapsed a.toggle { opacity: 0.5; cursor: default; background-position: top left; }
+li { color: #888; cursor: pointer; }
+li.deprecated { text-decoration: line-through; font-style: italic; }
+li.odd { background: #f0f0f0; }
+li.even { background: #fafafa; }
+.item:hover { background: #ddd; }
+li small:before { content: "("; }
+li small:after { content: ")"; }
+li small.search_info { display: none; }
+a, a:visited { text-decoration: none; color: #05a; }
+li.clicked > .item { background: #05a; color: #ccc; }
+li.clicked > .item a, li.clicked > .item a:visited { color: #eee; }
+li.clicked > .item a.toggle { opacity: 0.5; background-position: bottom right; }
+li.collapsed.clicked a.toggle { background-position: top right; }
+#search input { border: 1px solid #bbb; border-radius: 3px; }
+#full_list_nav { margin-left: 10px; font-size: 0.9em; display: block; color: #aaa; }
+#full_list_nav a, #nav a:visited { color: #358; }
+#full_list_nav a:hover { background: transparent; color: #5af; }
+#full_list_nav span:after { content: ' | '; }
+#full_list_nav span:last-child:after { content: ''; }
+
+#content h1 { margin-top: 0; }
+li { white-space: nowrap; cursor: normal; }
+li small { display: block; font-size: 0.8em; }
+li small:before { content: ""; }
+li small:after { content: ""; }
+li small.search_info { display: none; }
+#search { width: 170px; position: static; margin: 3px; margin-left: 10px; font-size: 0.9em; color: #888; padding-left: 0; padding-right: 24px; }
+#content.insearch #search { background-position: center right; }
+#search input { width: 110px; }
+
+#full_list.insearch ul { display: block; }
+#full_list.insearch .item { display: none; }
+#full_list.insearch .found { display: block; padding-left: 11px !important; }
+#full_list.insearch li a.toggle { display: none; }
+#full_list.insearch li small.search_info { display: block; }
diff --git a/documentation/chat/backend/css/style.css b/documentation/chat/backend/css/style.css
new file mode 100644
index 00000000000..eb0dbc86f68
--- /dev/null
+++ b/documentation/chat/backend/css/style.css
@@ -0,0 +1,497 @@
+html {
+  width: 100%;
+  height: 100%;
+}
+body {
+  font-family: "Lucida Sans", "Lucida Grande", Verdana, Arial, sans-serif;
+  font-size: 13px;
+  width: 100%;
+  margin: 0;
+  padding: 0;
+  display: flex;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+}
+
+#nav {
+  position: relative;
+  width: 100%;
+  height: 100%;
+  border: 0;
+  border-right: 1px dotted #eee;
+  overflow: auto;
+}
+.nav_wrap {
+  margin: 0;
+  padding: 0;
+  width: 20%;
+  height: 100%;
+  position: relative;
+  display: flex;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  flex-shrink: 0;
+  -webkit-flex-shrink: 0;
+  -ms-flex: 1 0;
+}
+#resizer {
+  position: absolute;
+  right: -5px;
+  top: 0;
+  width: 10px;
+  height: 100%;
+  cursor: col-resize;
+  z-index: 9999;
+}
+#main {
+  flex: 5 1;
+  -webkit-flex: 5 1;
+  -ms-flex: 5 1;
+  outline: none;
+  position: relative;
+  background: #fff;
+  padding: 1.2em;
+  padding-top: 0.2em;
+  box-sizing: border-box;
+}
+
+@media (max-width: 920px) {
+  .nav_wrap { width: 100%; top: 0; right: 0; overflow: visible; position: absolute; }
+  #resizer { display: none; }
+  #nav {
+    z-index: 9999;
+    background: #fff;
+    display: none;
+    position: absolute;
+    top: 40px;
+    right: 12px;
+    width: 500px;
+    max-width: 80%;
+    height: 80%;
+    overflow-y: scroll;
+    border: 1px solid #999;
+    border-collapse: collapse;
+    box-shadow: -7px 5px 25px #aaa;
+    border-radius: 2px;
+  }
+}
+
+@media (min-width: 920px) {
+  body { height: 100%; overflow: hidden; }
+  #main { height: 100%; overflow: auto; }
+  #search { display: none; }
+}
+
+#main img { max-width: 100%; }
+h1 { font-size: 25px; margin: 1em 0 0.5em; padding-top: 4px; border-top: 1px dotted #d5d5d5; }
+h1.noborder { border-top: 0px; margin-top: 0; padding-top: 4px; }
+h1.title { margin-bottom: 10px; }
+h1.alphaindex { margin-top: 0; font-size: 22px; }
+h2 {
+  padding: 0;
+  padding-bottom: 3px;
+  border-bottom: 1px #aaa solid;
+  font-size: 1.4em;
+  margin: 1.8em 0 0.5em;
+  position: relative;
+}
+h2 small { font-weight: normal; font-size: 0.7em; display: inline; position: absolute; right: 0; }
+h2 small a {
+  display: block;
+  height: 20px;
+  border: 1px solid #aaa;
+  border-bottom: 0;
+  border-top-left-radius: 5px;
+  background: #f8f8f8;
+  position: relative;
+  padding: 2px 7px;
+}
+.clear { clear: both; }
+.inline { display: inline; }
+.inline p:first-child { display: inline; }
+.docstring, .tags, #filecontents { font-size: 15px; line-height: 1.5145em; }
+.docstring p > code, .docstring p > tt, .tags p > code, .tags p > tt {
+  color: #c7254e; background: #f9f2f4; padding: 2px 4px; font-size: 1em;
+  border-radius: 4px;
+}
+.docstring h1, .docstring h2, .docstring h3, .docstring h4 { padding: 0; border: 0; border-bottom: 1px dotted #bbb; }
+.docstring h1 { font-size: 1.2em; }
+.docstring h2 { font-size: 1.1em; }
+.docstring h3, .docstring h4 { font-size: 1em; border-bottom: 0; padding-top: 10px; }
+.summary_desc .object_link a, .docstring .object_link a {
+  font-family: monospace; font-size: 1.05em;
+  color: #05a; background: #EDF4FA; padding: 2px 4px; font-size: 1em;
+  border-radius: 4px;
+}
+.rdoc-term { padding-right: 25px; font-weight: bold; }
+.rdoc-list p { margin: 0; padding: 0; margin-bottom: 4px; }
+.summary_desc pre.code .object_link a, .docstring pre.code .object_link a {
+  padding: 0px; background: inherit; color: inherit; border-radius: inherit;
+}
+
+/* style for <table> */
+#filecontents table, .docstring table { border-collapse: collapse; }
+#filecontents table th, #filecontents table td,
+.docstring table th, .docstring table td { border: 1px solid #ccc; padding: 8px; padding-right: 17px; }
+#filecontents table tr:nth-child(odd),
+.docstring table tr:nth-child(odd) { background: #eee; }
+#filecontents table tr:nth-child(even),
+.docstring table tr:nth-child(even) { background: #fff; }
+#filecontents table th, .docstring table th { background: #fff; }
+
+/* style for <ul> */
+#filecontents li > p, .docstring li > p { margin: 0px; }
+#filecontents ul, .docstring ul { padding-left: 20px; }
+/* style for <dl> */
+#filecontents dl, .docstring dl { border: 1px solid #ccc; }
+#filecontents dt, .docstring dt { background: #ddd; font-weight: bold; padding: 3px 5px; }
+#filecontents dd, .docstring dd { padding: 5px 0px; margin-left: 18px; }
+#filecontents dd > p, .docstring dd > p { margin: 0px; }
+
+.note {
+  color: #222;
+  margin: 20px 0;
+  padding: 10px;
+  border: 1px solid #eee;
+  border-radius: 3px;
+  display: block;
+}
+.docstring .note {
+  border-left-color: #ccc;
+  border-left-width: 5px;
+}
+.note.todo { background: #ffffc5; border-color: #ececaa; }
+.note.returns_void { background: #efefef; }
+.note.deprecated { background: #ffe5e5; border-color: #e9dada; }
+.note.title.deprecated { background: #ffe5e5; border-color: #e9dada; }
+.note.private { background: #ffffc5; border-color: #ececaa; }
+.note.title { padding: 3px 6px; font-size: 0.9em; font-family: "Lucida Sans", "Lucida Grande", Verdana, Arial, sans-serif; display: inline; }
+.summary_signature + .note.title { margin-left: 7px; }
+h1 .note.title { font-size: 0.5em; font-weight: normal; padding: 3px 5px; position: relative; top: -3px; text-transform: capitalize; }
+.note.title { background: #efefef; }
+.note.title.constructor { color: #fff; background: #6a98d6; border-color: #6689d6; }
+.note.title.writeonly { color: #fff; background: #45a638; border-color: #2da31d; }
+.note.title.readonly { color: #fff; background: #6a98d6; border-color: #6689d6; }
+.note.title.private { background: #d5d5d5; border-color: #c5c5c5; }
+.note.title.not_defined_here { background: transparent; border: none; font-style: italic; }
+.discussion .note { margin-top: 6px; }
+.discussion .note:first-child { margin-top: 0; }
+
+h3.inherited {
+  font-style: italic;
+  font-family: "Lucida Sans", "Lucida Grande", Verdana, Arial, sans-serif;
+  font-weight: normal;
+  padding: 0;
+  margin: 0;
+  margin-top: 12px;
+  margin-bottom: 3px;
+  font-size: 13px;
+}
+p.inherited {
+  padding: 0;
+  margin: 0;
+  margin-left: 25px;
+}
+
+.box_info dl {
+  margin: 0;
+  border: 0;
+  width: 100%;
+  font-size: 1em;
+  display: flex;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+}
+.box_info dl dt {
+  flex-shrink: 0;
+  -webkit-flex-shrink: 1;
+  -ms-flex-shrink: 1;
+  width: 100px;
+  text-align: right;
+  font-weight: bold;
+  border: 1px solid #aaa;
+  border-width: 1px 0px 0px 1px;
+  padding: 6px 0;
+  padding-right: 10px;
+}
+.box_info dl dd {
+  flex-grow: 1;
+  -webkit-flex-grow: 1;
+  -ms-flex: 1;
+  max-width: 420px;
+  padding: 6px 0;
+  padding-right: 20px;
+  border: 1px solid #aaa;
+  border-width: 1px 1px 0 0;
+  overflow: hidden;
+  position: relative;
+}
+.box_info dl:last-child > * {
+  border-bottom: 1px solid #aaa;
+}
+.box_info dl:nth-child(odd) > * { background: #eee; }
+.box_info dl:nth-child(even) > * { background: #fff; }
+.box_info dl > * { margin: 0; }
+
+ul.toplevel { list-style: none; padding-left: 0; font-size: 1.1em; }
+.index_inline_list { padding-left: 0; font-size: 1.1em; }
+
+.index_inline_list li {
+  list-style: none;
+  display: inline-block;
+  padding: 0 12px;
+  line-height: 30px;
+  margin-bottom: 5px;
+}
+
+dl.constants { margin-left: 10px; }
+dl.constants dt { font-weight: bold; font-size: 1.1em; margin-bottom: 5px; }
+dl.constants.compact dt { display: inline-block; font-weight: normal }
+dl.constants dd { width: 75%; white-space: pre; font-family: monospace; margin-bottom: 18px; }
+dl.constants .docstring .note:first-child { margin-top: 5px; }
+
+.summary_desc {
+  margin-left: 32px;
+  display: block;
+  font-family: sans-serif;
+  font-size: 1.1em;
+  margin-top: 8px;
+  line-height: 1.5145em;
+  margin-bottom: 0.8em;
+}
+.summary_desc tt { font-size: 0.9em; }
+dl.constants .note { padding: 2px 6px; padding-right: 12px; margin-top: 6px; }
+dl.constants .docstring { margin-left: 32px; font-size: 0.9em; font-weight: normal; }
+dl.constants .tags { padding-left: 32px; font-size: 0.9em; line-height: 0.8em; }
+dl.constants .discussion *:first-child { margin-top: 0; }
+dl.constants .discussion *:last-child { margin-bottom: 0; }
+
+.method_details { border-top: 1px dotted #ccc; margin-top: 25px; padding-top: 0; }
+.method_details.first { border: 0; margin-top: 5px; }
+.method_details.first h3.signature { margin-top: 1em; }
+p.signature, h3.signature {
+  font-size: 1.1em; font-weight: normal; font-family: Monaco, Consolas, Courier, monospace;
+  padding: 6px 10px; margin-top: 1em;
+  background: #E8F4FF; border: 1px solid #d8d8e5; border-radius: 5px;
+}
+p.signature tt,
+h3.signature tt { font-family: Monaco, Consolas, Courier, monospace; }
+p.signature .overload,
+h3.signature .overload { display: block; }
+p.signature .extras,
+h3.signature .extras { font-weight: normal; font-family: sans-serif; color: #444; font-size: 1em; }
+p.signature .not_defined_here,
+h3.signature .not_defined_here,
+p.signature .aliases,
+h3.signature .aliases { display: block; font-weight: normal; font-size: 0.9em; font-family: sans-serif; margin-top: 0px; color: #555; }
+p.signature .aliases .names,
+h3.signature .aliases .names { font-family: Monaco, Consolas, Courier, monospace; font-weight: bold; color: #000; font-size: 1.2em; }
+
+.tags .tag_title { font-size: 1.05em; margin-bottom: 0; font-weight: bold; }
+.tags .tag_title tt { color: initial; padding: initial; background: initial; }
+.tags ul { margin-top: 5px; padding-left: 30px; list-style: square; }
+.tags ul li { margin-bottom: 3px; }
+.tags ul .name { font-family: monospace; font-weight: bold; }
+.tags ul .note { padding: 3px 6px; }
+.tags { margin-bottom: 12px; }
+
+.tags .examples .tag_title { margin-bottom: 10px; font-weight: bold; }
+.tags .examples .inline p { padding: 0; margin: 0; font-weight: bold; font-size: 1em; }
+.tags .examples .inline p:before { content: "▸"; font-size: 1em; margin-right: 5px; }
+
+.tags .overload .overload_item { list-style: none; margin-bottom: 25px; }
+.tags .overload .overload_item .signature {
+  padding: 2px 8px;
+  background: #F1F8FF; border: 1px solid #d8d8e5; border-radius: 3px;
+}
+.tags .overload .signature { margin-left: -15px; font-family: monospace; display: block; font-size: 1.1em; }
+.tags .overload .docstring { margin-top: 15px; }
+
+.defines { display: none; }
+
+#method_missing_details .notice.this { position: relative; top: -8px; color: #888; padding: 0; margin: 0; }
+
+.showSource { font-size: 0.9em; }
+.showSource a, .showSource a:visited { text-decoration: none; color: #666; }
+
+#content a, #content a:visited { text-decoration: none; color: #05a; }
+#content a:hover { background: #ffffa5; }
+
+ul.summary {
+  list-style: none;
+  font-family: monospace;
+  font-size: 1em;
+  line-height: 1.5em;
+  padding-left: 0px;
+}
+ul.summary a, ul.summary a:visited {
+  text-decoration: none; font-size: 1.1em;
+}
+ul.summary li { margin-bottom: 5px; }
+.summary_signature { padding: 4px 8px; background: #f8f8f8; border: 1px solid #f0f0f0; border-radius: 5px; }
+.summary_signature:hover { background: #CFEBFF; border-color: #A4CCDA; cursor: pointer; }
+.summary_signature.deprecated { background: #ffe5e5; border-color: #e9dada; }
+ul.summary.compact li { display: inline-block; margin: 0px 5px 0px 0px; line-height: 2.6em;}
+ul.summary.compact .summary_signature { padding: 5px 7px; padding-right: 4px; }
+#content .summary_signature:hover a,
+#content .summary_signature:hover a:visited {
+  background: transparent;
+  color: #049;
+}
+
+p.inherited a { font-family: monospace; font-size: 0.9em; }
+p.inherited { word-spacing: 5px; font-size: 1.2em; }
+
+p.children { font-size: 1.2em; }
+p.children a { font-size: 0.9em; }
+p.children strong { font-size: 0.8em; }
+p.children strong.modules { padding-left: 5px; }
+
+ul.fullTree { display: none; padding-left: 0; list-style: none; margin-left: 0; margin-bottom: 10px; }
+ul.fullTree ul { margin-left: 0; padding-left: 0; list-style: none; }
+ul.fullTree li { text-align: center; padding-top: 18px; padding-bottom: 12px; background: url(data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAACXBIWXMAAAsTAAALEwEAmpwYAAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAgY0hSTQAAeiUAAICDAAD5/wAAgOkAAHUwAADqYAAAOpgAABdvkl/FRgAAAHtJREFUeNqMzrEJAkEURdGzuhgZbSoYWcAWoBVsB4JgZAGmphsZCZYzTQgWNCYrDN9RvMmHx+X916SUBFbo8CzD1idXrLErw1mQttgXtyrOcQ/Ny5p4Qh+2XqLYYazsPWNTiuMkRxa4vcV+evuNAUOLIx5+c2hyzv7hNQC67Q+/HHmlEwAAAABJRU5ErkJggg==) no-repeat top center; }
+ul.fullTree li:first-child { padding-top: 0; background: transparent; }
+ul.fullTree li:last-child { padding-bottom: 0; }
+.showAll ul.fullTree { display: block; }
+.showAll .inheritName { display: none; }
+
+#search { position: absolute; right: 12px; top: 0px; z-index: 9000; }
+#search a {
+  display: block; float: left;
+  padding: 4px 8px; text-decoration: none; color: #05a; fill: #05a;
+  border: 1px solid #d8d8e5;
+  border-bottom-left-radius: 3px; border-bottom-right-radius: 3px;
+  background: #F1F8FF;
+  box-shadow: -1px 1px 3px #ddd;
+}
+#search a:hover { background: #f5faff; color: #06b; fill: #06b; }
+#search a.active {
+  background: #568; padding-bottom: 20px; color: #fff; fill: #fff;
+  border: 1px solid #457;
+  border-top-left-radius: 5px; border-top-right-radius: 5px;
+}
+#search a.inactive { color: #999; fill: #999; }
+.inheritanceTree, .toggleDefines {
+  float: right;
+  border-left: 1px solid #aaa;
+  position: absolute; top: 0; right: 0;
+  height: 100%;
+  background: #f6f6f6;
+  padding: 5px;
+  min-width: 55px;
+  text-align: center;
+}
+
+#menu { font-size: 1.3em; color: #bbb; }
+#menu .title, #menu a { font-size: 0.7em; }
+#menu .title a { font-size: 1em; }
+#menu .title { color: #555; }
+#menu a, #menu a:visited { color: #333; text-decoration: none; border-bottom: 1px dotted #bbd; }
+#menu a:hover { color: #05a; }
+
+#footer { margin-top: 15px; border-top: 1px solid #ccc; text-align: center; padding: 7px 0; color: #999; }
+#footer a, #footer a:visited { color: #444; text-decoration: none; border-bottom: 1px dotted #bbd; }
+#footer a:hover { color: #05a; }
+
+#listing ul.alpha { font-size: 1.1em; }
+#listing ul.alpha { margin: 0; padding: 0; padding-bottom: 10px; list-style: none; }
+#listing ul.alpha li.letter { font-size: 1.4em; padding-bottom: 10px; }
+#listing ul.alpha ul { margin: 0; padding-left: 15px; }
+#listing ul small { color: #666; font-size: 0.7em; }
+
+li.r1 { background: #f0f0f0; }
+li.r2 { background: #fafafa; }
+
+#content ul.summary li.deprecated .summary_signature a,
+#content ul.summary li.deprecated .summary_signature a:visited { text-decoration: line-through; font-style: italic; }
+
+#toc {
+  position: relative;
+  float: right;
+  overflow-x: auto;
+  right: -3px;
+  margin-left: 20px;
+  margin-bottom: 20px;
+  padding: 20px; padding-right: 30px;
+  max-width: 300px;
+  z-index: 5000;
+  background: #fefefe;
+  border: 1px solid #ddd;
+  box-shadow: -2px 2px 6px #bbb;
+}
+#toc .title { margin: 0; }
+#toc ol { padding-left: 1.8em; }
+#toc li { font-size: 1.1em; line-height: 1.7em; }
+#toc > ol > li { font-size: 1.1em; font-weight: bold; }
+#toc ol > li > ol { font-size: 0.9em; }
+#toc ol ol > li > ol { padding-left: 2.3em; }
+#toc ol + li { margin-top: 0.3em; }
+#toc.hidden { padding: 10px; background: #fefefe; box-shadow: none; }
+#toc.hidden:hover { background: #fafafa; }
+#filecontents h1 + #toc.nofloat { margin-top: 0; }
+@media (max-width: 560px) {
+  #toc {
+    margin-left: 0;
+    margin-top: 16px;
+    float: none;
+    max-width: none;
+  }
+}
+
+/* syntax highlighting */
+.source_code { display: none; padding: 3px 8px; border-left: 8px solid #ddd; margin-top: 5px; }
+#filecontents pre.code, .docstring pre.code, .source_code pre { font-family: monospace; }
+#filecontents pre.code, .docstring pre.code { display: block; }
+.source_code .lines { padding-right: 12px; color: #555; text-align: right; }
+#filecontents pre.code, .docstring pre.code,
+.tags pre.example {
+  padding: 9px 14px;
+  margin-top: 4px;
+  border: 1px solid #e1e1e8;
+  background: #f7f7f9;
+  border-radius: 4px;
+  font-size: 1em;
+  overflow-x: auto;
+  line-height: 1.2em;
+}
+pre.code { color: #000; tab-size: 2; }
+pre.code .info.file { color: #555; }
+pre.code .val { color: #036A07; }
+pre.code .tstring_content,
+pre.code .heredoc_beg, pre.code .heredoc_end,
+pre.code .qwords_beg, pre.code .qwords_end, pre.code .qwords_sep,
+pre.code .words_beg, pre.code .words_end, pre.code .words_sep,
+pre.code .qsymbols_beg, pre.code .qsymbols_end, pre.code .qsymbols_sep,
+pre.code .symbols_beg, pre.code .symbols_end, pre.code .symbols_sep,
+pre.code .tstring, pre.code .dstring { color: #036A07; }
+pre.code .fid, pre.code .rubyid_new, pre.code .rubyid_to_s,
+pre.code .rubyid_to_sym, pre.code .rubyid_to_f,
+pre.code .dot + pre.code .id,
+pre.code .rubyid_to_i pre.code .rubyid_each { color: #0085FF; }
+pre.code .comment { color: #0066FF; }
+pre.code .const, pre.code .constant { color: #585CF6; }
+pre.code .label,
+pre.code .symbol { color: #C5060B; }
+pre.code .kw,
+pre.code .rubyid_require,
+pre.code .rubyid_extend,
+pre.code .rubyid_include { color: #0000FF; }
+pre.code .ivar { color: #318495; }
+pre.code .gvar,
+pre.code .rubyid_backref,
+pre.code .rubyid_nth_ref { color: #6D79DE; }
+pre.code .regexp, .dregexp { color: #036A07; }
+pre.code a { border-bottom: 1px dotted #bbf; }
+/* inline code */
+*:not(pre) > code {
+	padding: 1px 3px 1px 3px;
+	border: 1px solid #E1E1E8;
+	background: #F7F7F9;
+	border-radius: 4px;
+}
+
+/* Color fix for links */
+#content .summary_desc pre.code .id > .object_link a, /* identifier */
+#content .docstring pre.code .id > .object_link a { color: #0085FF; }
+#content .summary_desc pre.code .const > .object_link a, /* constant */
+#content .docstring pre.code .const > .object_link a { color: #585CF6; }
diff --git a/documentation/chat/backend/file.README.html b/documentation/chat/backend/file.README.html
new file mode 100644
index 00000000000..0c494a8e710
--- /dev/null
+++ b/documentation/chat/backend/file.README.html
@@ -0,0 +1,81 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>
+  File: README
+  
+    &mdash; Documentation by YARD 0.9.28
+  
+</title>
+
+  <link rel="stylesheet" href="css/style.css" type="text/css" />
+
+  <link rel="stylesheet" href="css/common.css" type="text/css" />
+
+<script type="text/javascript">
+  pathId = "README";
+  relpath = '';
+</script>
+
+
+  <script type="text/javascript" charset="utf-8" src="js/jquery.js"></script>
+
+  <script type="text/javascript" charset="utf-8" src="js/app.js"></script>
+
+
+  </head>
+  <body>
+    <div class="nav_wrap">
+      <iframe id="nav" src="file_list.html?1"></iframe>
+      <div id="resizer"></div>
+    </div>
+
+    <div id="main" tabindex="-1">
+      <div id="header">
+        <div id="menu">
+  
+    <a href="_index.html">Index</a> &raquo; 
+    <span class="title">File: README</span>
+  
+</div>
+
+        <div id="search">
+  
+    <a class="full_list_link" id="class_list_link"
+        href="class_list.html">
+
+        <svg width="24" height="24">
+          <rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
+        </svg>
+    </a>
+  
+</div>
+        <div class="clear"></div>
+      </div>
+
+      <div id="content"><div id='filecontents'>
+<p>This plugin is still in active development and may change frequently</p>
+
+<h2 id="label-Documentation">Documentation</h2>
+
+<p>The Discourse Chat plugin adds chat functionality to your Discourse so it can natively support both long-form and short-form communication needs of your online community.</p>
+
+<p>For user documentation, see <a href="https://meta.discourse.org/t/discourse-chat/230881">Discourse Chat</a>.</p>
+
+<p>For developer documentation, see <a href="https://discourse.github.io/discourse/">Discourse Documentation</a>.</p>
+</div></div>
+
+      
+<div id="footer">
+  Generated by
+  <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
+  0.9.28.
+</div>
+
+    </div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/documentation/chat/backend/file_list.html b/documentation/chat/backend/file_list.html
new file mode 100644
index 00000000000..2b6df40424f
--- /dev/null
+++ b/documentation/chat/backend/file_list.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta charset="utf-8" />
+    
+      <link rel="stylesheet" href="css/full_list.css" type="text/css" media="screen" />
+    
+      <link rel="stylesheet" href="css/common.css" type="text/css" media="screen" />
+    
+
+    
+      <script type="text/javascript" charset="utf-8" src="js/jquery.js"></script>
+    
+      <script type="text/javascript" charset="utf-8" src="js/full_list.js"></script>
+    
+
+    <title>File List</title>
+    <base id="base_target" target="_parent" />
+  </head>
+  <body>
+    <div id="content">
+      <div class="fixed_header">
+        <h1 id="full_list_header">File List</h1>
+        <div id="full_list_nav">
+          
+            <span><a target="_self" href="class_list.html">
+              Classes
+            </a></span>
+          
+            <span><a target="_self" href="method_list.html">
+              Methods
+            </a></span>
+          
+            <span><a target="_self" href="file_list.html">
+              Files
+            </a></span>
+          
+        </div>
+
+        <div id="search">Search: <input type="text" /></div>
+      </div>
+
+      <ul id="full_list" class="file">
+        
+
+  <li id="object_README" class="odd">
+    <div class="item"><span class="object_link"><a href="index.html" title="README">README</a></span></div>
+  </li>
+  
+
+
+      </ul>
+    </div>
+  </body>
+</html>
diff --git a/documentation/chat/backend/frames.html b/documentation/chat/backend/frames.html
new file mode 100644
index 00000000000..a65e93650a9
--- /dev/null
+++ b/documentation/chat/backend/frames.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+	<title>Documentation by YARD 0.9.28</title>
+</head>
+<script type="text/javascript">
+  var match = unescape(window.location.hash).match(/^#!(.+)/);
+  var name = match ? match[1] : 'index.html';
+  name = name.replace(/^(\w+):\/\//, '').replace(/^\/\//, '');
+  window.top.location = name;
+</script>
+<noscript>
+  <h1>Oops!</h1>
+  <h2>YARD requires JavaScript!</h2>
+</noscript>
+</html>
diff --git a/documentation/chat/backend/index.html b/documentation/chat/backend/index.html
new file mode 100644
index 00000000000..df5d7faf40e
--- /dev/null
+++ b/documentation/chat/backend/index.html
@@ -0,0 +1,81 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>
+  File: README
+  
+    &mdash; Documentation by YARD 0.9.28
+  
+</title>
+
+  <link rel="stylesheet" href="css/style.css" type="text/css" />
+
+  <link rel="stylesheet" href="css/common.css" type="text/css" />
+
+<script type="text/javascript">
+  pathId = "README";
+  relpath = '';
+</script>
+
+
+  <script type="text/javascript" charset="utf-8" src="js/jquery.js"></script>
+
+  <script type="text/javascript" charset="utf-8" src="js/app.js"></script>
+
+
+  </head>
+  <body>
+    <div class="nav_wrap">
+      <iframe id="nav" src="class_list.html?1"></iframe>
+      <div id="resizer"></div>
+    </div>
+
+    <div id="main" tabindex="-1">
+      <div id="header">
+        <div id="menu">
+  
+    <a href="_index.html">Index</a> &raquo; 
+    <span class="title">File: README</span>
+  
+</div>
+
+        <div id="search">
+  
+    <a class="full_list_link" id="class_list_link"
+        href="class_list.html">
+
+        <svg width="24" height="24">
+          <rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
+        </svg>
+    </a>
+  
+</div>
+        <div class="clear"></div>
+      </div>
+
+      <div id="content"><div id='filecontents'>
+<p>This plugin is still in active development and may change frequently</p>
+
+<h2 id="label-Documentation">Documentation</h2>
+
+<p>The Discourse Chat plugin adds chat functionality to your Discourse so it can natively support both long-form and short-form communication needs of your online community.</p>
+
+<p>For user documentation, see <a href="https://meta.discourse.org/t/discourse-chat/230881">Discourse Chat</a>.</p>
+
+<p>For developer documentation, see <a href="https://discourse.github.io/discourse/">Discourse Documentation</a>.</p>
+</div></div>
+
+      
+<div id="footer">
+  Generated by
+  <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
+  0.9.28.
+</div>
+
+    </div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/documentation/chat/backend/js/app.js b/documentation/chat/backend/js/app.js
new file mode 100644
index 00000000000..8d067fe30ce
--- /dev/null
+++ b/documentation/chat/backend/js/app.js
@@ -0,0 +1,314 @@
+(function() {
+
+var localStorage = {}, sessionStorage = {};
+try { localStorage = window.localStorage; } catch (e) { }
+try { sessionStorage = window.sessionStorage; } catch (e) { }
+
+function createSourceLinks() {
+    $('.method_details_list .source_code').
+        before("<span class='showSource'>[<a href='#' class='toggleSource'>View source</a>]</span>");
+    $('.toggleSource').toggle(function() {
+       $(this).parent().nextAll('.source_code').slideDown(100);
+       $(this).text("Hide source");
+    },
+    function() {
+        $(this).parent().nextAll('.source_code').slideUp(100);
+        $(this).text("View source");
+    });
+}
+
+function createDefineLinks() {
+    var tHeight = 0;
+    $('.defines').after(" <a href='#' class='toggleDefines'>more...</a>");
+    $('.toggleDefines').toggle(function() {
+        tHeight = $(this).parent().prev().height();
+        $(this).prev().css('display', 'inline');
+        $(this).parent().prev().height($(this).parent().height());
+        $(this).text("(less)");
+    },
+    function() {
+        $(this).prev().hide();
+        $(this).parent().prev().height(tHeight);
+        $(this).text("more...");
+    });
+}
+
+function createFullTreeLinks() {
+    var tHeight = 0;
+    $('.inheritanceTree').toggle(function() {
+        tHeight = $(this).parent().prev().height();
+        $(this).parent().toggleClass('showAll');
+        $(this).text("(hide)");
+        $(this).parent().prev().height($(this).parent().height());
+    },
+    function() {
+        $(this).parent().toggleClass('showAll');
+        $(this).parent().prev().height(tHeight);
+        $(this).text("show all");
+    });
+}
+
+function searchFrameButtons() {
+  $('.full_list_link').click(function() {
+    toggleSearchFrame(this, $(this).attr('href'));
+    return false;
+  });
+  window.addEventListener('message', function(e) {
+    if (e.data === 'navEscape') {
+      $('#nav').slideUp(100);
+      $('#search a').removeClass('active inactive');
+      $(window).focus();
+    }
+  });
+
+  $(window).resize(function() {
+    if ($('#search:visible').length === 0) {
+      $('#nav').removeAttr('style');
+      $('#search a').removeClass('active inactive');
+      $(window).focus();
+    }
+  });
+}
+
+function toggleSearchFrame(id, link) {
+  var frame = $('#nav');
+  $('#search a').removeClass('active').addClass('inactive');
+  if (frame.attr('src') === link && frame.css('display') !== "none") {
+    frame.slideUp(100);
+    $('#search a').removeClass('active inactive');
+  }
+  else {
+    $(id).addClass('active').removeClass('inactive');
+    if (frame.attr('src') !== link) frame.attr('src', link);
+    frame.slideDown(100);
+  }
+}
+
+function linkSummaries() {
+  $('.summary_signature').click(function() {
+    document.location = $(this).find('a').attr('href');
+  });
+}
+
+function summaryToggle() {
+  $('.summary_toggle').click(function(e) {
+    e.preventDefault();
+    localStorage.summaryCollapsed = $(this).text();
+    $('.summary_toggle').each(function() {
+      $(this).text($(this).text() == "collapse" ? "expand" : "collapse");
+      var next = $(this).parent().parent().nextAll('ul.summary').first();
+      if (next.hasClass('compact')) {
+        next.toggle();
+        next.nextAll('ul.summary').first().toggle();
+      }
+      else if (next.hasClass('summary')) {
+        var list = $('<ul class="summary compact" />');
+        list.html(next.html());
+        list.find('.summary_desc, .note').remove();
+        list.find('a').each(function() {
+          $(this).html($(this).find('strong').html());
+          $(this).parent().html($(this)[0].outerHTML);
+        });
+        next.before(list);
+        next.toggle();
+      }
+    });
+    return false;
+  });
+  if (localStorage.summaryCollapsed == "collapse") {
+    $('.summary_toggle').first().click();
+  } else { localStorage.summaryCollapsed = "expand"; }
+}
+
+function constantSummaryToggle() {
+  $('.constants_summary_toggle').click(function(e) {
+    e.preventDefault();
+    localStorage.summaryCollapsed = $(this).text();
+    $('.constants_summary_toggle').each(function() {
+      $(this).text($(this).text() == "collapse" ? "expand" : "collapse");
+      var next = $(this).parent().parent().nextAll('dl.constants').first();
+      if (next.hasClass('compact')) {
+        next.toggle();
+        next.nextAll('dl.constants').first().toggle();
+      }
+      else if (next.hasClass('constants')) {
+        var list = $('<dl class="constants compact" />');
+        list.html(next.html());
+        list.find('dt').each(function() {
+           $(this).addClass('summary_signature');
+           $(this).text( $(this).text().split('=')[0]);
+          if ($(this).has(".deprecated").length) {
+             $(this).addClass('deprecated');
+          };
+        });
+        // Add the value of the constant as "Tooltip" to the summary object
+        list.find('pre.code').each(function() {
+          console.log($(this).parent());
+          var dt_element = $(this).parent().prev();
+          var tooltip = $(this).text();
+          if (dt_element.hasClass("deprecated")) {
+             tooltip = 'Deprecated. ' + tooltip;
+          };
+          dt_element.attr('title', tooltip);
+        });
+        list.find('.docstring, .tags, dd').remove();
+        next.before(list);
+        next.toggle();
+      }
+    });
+    return false;
+  });
+  if (localStorage.summaryCollapsed == "collapse") {
+    $('.constants_summary_toggle').first().click();
+  } else { localStorage.summaryCollapsed = "expand"; }
+}
+
+function generateTOC() {
+  if ($('#filecontents').length === 0) return;
+  var _toc = $('<ol class="top"></ol>');
+  var show = false;
+  var toc = _toc;
+  var counter = 0;
+  var tags = ['h2', 'h3', 'h4', 'h5', 'h6'];
+  var i;
+  var curli;
+  if ($('#filecontents h1').length > 1) tags.unshift('h1');
+  for (i = 0; i < tags.length; i++) { tags[i] = '#filecontents ' + tags[i]; }
+  var lastTag = parseInt(tags[0][1], 10);
+  $(tags.join(', ')).each(function() {
+    if ($(this).parents('.method_details .docstring').length != 0) return;
+    if (this.id == "filecontents") return;
+    show = true;
+    var thisTag = parseInt(this.tagName[1], 10);
+    if (this.id.length === 0) {
+      var proposedId = $(this).attr('toc-id');
+      if (typeof(proposedId) != "undefined") this.id = proposedId;
+      else {
+        var proposedId = $(this).text().replace(/[^a-z0-9-]/ig, '_');
+        if ($('#' + proposedId).length > 0) { proposedId += counter; counter++; }
+        this.id = proposedId;
+      }
+    }
+    if (thisTag > lastTag) {
+      for (i = 0; i < thisTag - lastTag; i++) {
+        if ( typeof(curli) == "undefined" ) {
+          curli = $('<li/>');
+          toc.append(curli);
+        }
+        toc = $('<ol/>');
+        curli.append(toc);
+        curli = undefined;
+      }
+    }
+    if (thisTag < lastTag) {
+      for (i = 0; i < lastTag - thisTag; i++) {
+        toc = toc.parent();
+        toc = toc.parent();
+      }
+    }
+    var title = $(this).attr('toc-title');
+    if (typeof(title) == "undefined") title = $(this).text();
+    curli =$('<li><a href="#' + this.id + '">' + title + '</a></li>'); 
+    toc.append(curli);
+    lastTag = thisTag;
+  });
+  if (!show) return;
+  html = '<div id="toc"><p class="title hide_toc"><a href="#"><strong>Table of Contents</strong></a></p></div>';
+  $('#content').prepend(html);
+  $('#toc').append(_toc);
+  $('#toc .hide_toc').toggle(function() {
+    $('#toc .top').slideUp('fast');
+    $('#toc').toggleClass('hidden');
+    $('#toc .title small').toggle();
+  }, function() {
+    $('#toc .top').slideDown('fast');
+    $('#toc').toggleClass('hidden');
+    $('#toc .title small').toggle();
+  });
+}
+
+function navResizeFn(e) {
+  if (e.which !== 1) {
+    navResizeFnStop();
+    return;
+  }
+
+  sessionStorage.navWidth = e.pageX.toString();
+  $('.nav_wrap').css('width', e.pageX);
+  $('.nav_wrap').css('-ms-flex', 'inherit');
+}
+
+function navResizeFnStop() {
+  $(window).unbind('mousemove', navResizeFn);
+  window.removeEventListener('message', navMessageFn, false);
+}
+
+function navMessageFn(e) {
+  if (e.data.action === 'mousemove') navResizeFn(e.data.event);
+  if (e.data.action === 'mouseup') navResizeFnStop();
+}
+
+function navResizer() {
+  $('#resizer').mousedown(function(e) {
+    e.preventDefault();
+    $(window).mousemove(navResizeFn);
+    window.addEventListener('message', navMessageFn, false);
+  });
+  $(window).mouseup(navResizeFnStop);
+
+  if (sessionStorage.navWidth) {
+    navResizeFn({which: 1, pageX: parseInt(sessionStorage.navWidth, 10)});
+  }
+}
+
+function navExpander() {
+  var done = false, timer = setTimeout(postMessage, 500);
+  function postMessage() {
+    if (done) return;
+    clearTimeout(timer);
+    var opts = { action: 'expand', path: pathId };
+    document.getElementById('nav').contentWindow.postMessage(opts, '*');
+    done = true;
+  }
+
+  window.addEventListener('message', function(event) {
+    if (event.data === 'navReady') postMessage();
+    return false;
+  }, false);
+}
+
+function mainFocus() {
+  var hash = window.location.hash;
+  if (hash !== '' && $(hash)[0]) {
+    $(hash)[0].scrollIntoView();
+  }
+
+  setTimeout(function() { $('#main').focus(); }, 10);
+}
+
+function navigationChange() {
+  // This works around the broken anchor navigation with the YARD template.
+  window.onpopstate = function() {
+    var hash = window.location.hash;
+    if (hash !== '' && $(hash)[0]) {
+      $(hash)[0].scrollIntoView();
+    }
+  };
+}
+
+$(document).ready(function() {
+  navResizer();
+  navExpander();
+  createSourceLinks();
+  createDefineLinks();
+  createFullTreeLinks();
+  searchFrameButtons();
+  linkSummaries();
+  summaryToggle();
+  constantSummaryToggle();
+  generateTOC();
+  mainFocus();
+  navigationChange();
+});
+
+})();
diff --git a/documentation/chat/backend/js/full_list.js b/documentation/chat/backend/js/full_list.js
new file mode 100644
index 00000000000..59069c5e210
--- /dev/null
+++ b/documentation/chat/backend/js/full_list.js
@@ -0,0 +1,216 @@
+(function() {
+
+var $clicked = $(null);
+var searchTimeout = null;
+var searchCache = [];
+var caseSensitiveMatch = false;
+var ignoreKeyCodeMin = 8;
+var ignoreKeyCodeMax = 46;
+var commandKey = 91;
+
+RegExp.escape = function(text) {
+    return text.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
+}
+
+function escapeShortcut() {
+  $(document).keydown(function(evt) {
+    if (evt.which == 27) {
+      window.parent.postMessage('navEscape', '*');
+    }
+  });
+}
+
+function navResizer() {
+  $(window).mousemove(function(e) {
+    window.parent.postMessage({
+      action: 'mousemove', event: {pageX: e.pageX, which: e.which}
+    }, '*');
+  }).mouseup(function(e) {
+    window.parent.postMessage({action: 'mouseup'}, '*');
+  });
+  window.parent.postMessage("navReady", "*");
+}
+
+function clearSearchTimeout() {
+  clearTimeout(searchTimeout);
+  searchTimeout = null;
+}
+
+function enableLinks() {
+  // load the target page in the parent window
+  $('#full_list li').on('click', function(evt) {
+    $('#full_list li').removeClass('clicked');
+    $clicked = $(this);
+    $clicked.addClass('clicked');
+    evt.stopPropagation();
+
+    if (evt.target.tagName === 'A') return true;
+
+    var elem = $clicked.find('> .item .object_link a')[0];
+    var e = evt.originalEvent;
+    var newEvent = new MouseEvent(evt.originalEvent.type);
+    newEvent.initMouseEvent(e.type, e.canBubble, e.cancelable, e.view, e.detail, e.screenX, e.screenY, e.clientX, e.clientY, e.ctrlKey, e.altKey, e.shiftKey, e.metaKey, e.button, e.relatedTarget);
+    elem.dispatchEvent(newEvent);
+    evt.preventDefault();
+    return false;
+  });
+}
+
+function enableToggles() {
+  // show/hide nested classes on toggle click
+  $('#full_list a.toggle').on('click', function(evt) {
+    evt.stopPropagation();
+    evt.preventDefault();
+    $(this).parent().parent().toggleClass('collapsed');
+    highlight();
+  });
+}
+
+function populateSearchCache() {
+  $('#full_list li .item').each(function() {
+    var $node = $(this);
+    var $link = $node.find('.object_link a');
+    if ($link.length > 0) {
+      searchCache.push({
+        node: $node,
+        link: $link,
+        name: $link.text(),
+        fullName: $link.attr('title').split(' ')[0]
+      });
+    }
+  });
+}
+
+function enableSearch() {
+  $('#search input').keyup(function(event) {
+    if (ignoredKeyPress(event)) return;
+    if (this.value === "") {
+      clearSearch();
+    } else {
+      performSearch(this.value);
+    }
+  });
+
+  $('#full_list').after("<div id='noresults' style='display:none'></div>");
+}
+
+function ignoredKeyPress(event) {
+  if (
+    (event.keyCode > ignoreKeyCodeMin && event.keyCode < ignoreKeyCodeMax) ||
+    (event.keyCode == commandKey)
+  ) {
+    return true;
+  } else {
+    return false;
+  }
+}
+
+function clearSearch() {
+  clearSearchTimeout();
+  $('#full_list .found').removeClass('found').each(function() {
+    var $link = $(this).find('.object_link a');
+    $link.text($link.text());
+  });
+  $('#full_list, #content').removeClass('insearch');
+  $clicked.parents().removeClass('collapsed');
+  highlight();
+}
+
+function performSearch(searchString) {
+  clearSearchTimeout();
+  $('#full_list, #content').addClass('insearch');
+  $('#noresults').text('').hide();
+  partialSearch(searchString, 0);
+}
+
+function partialSearch(searchString, offset) {
+  var lastRowClass = '';
+  var i = null;
+  for (i = offset; i < Math.min(offset + 50, searchCache.length); i++) {
+    var item = searchCache[i];
+    var searchName = (searchString.indexOf('::') != -1 ? item.fullName : item.name);
+    var matchString = buildMatchString(searchString);
+    var matchRegexp = new RegExp(matchString, caseSensitiveMatch ? "" : "i");
+    if (searchName.match(matchRegexp) == null) {
+      item.node.removeClass('found');
+      item.link.text(item.link.text());
+    }
+    else {
+      item.node.addClass('found');
+      item.node.removeClass(lastRowClass).addClass(lastRowClass == 'r1' ? 'r2' : 'r1');
+      lastRowClass = item.node.hasClass('r1') ? 'r1' : 'r2';
+      item.link.html(item.name.replace(matchRegexp, "<strong>$&</strong>"));
+    }
+  }
+  if(i == searchCache.length) {
+    searchDone();
+  } else {
+    searchTimeout = setTimeout(function() {
+      partialSearch(searchString, i);
+    }, 0);
+  }
+}
+
+function searchDone() {
+  searchTimeout = null;
+  highlight();
+  if ($('#full_list li:visible').size() === 0) {
+    $('#noresults').text('No results were found.').hide().fadeIn();
+  } else {
+    $('#noresults').text('').hide();
+  }
+  $('#content').removeClass('insearch');
+}
+
+function buildMatchString(searchString, event) {
+  caseSensitiveMatch = searchString.match(/[A-Z]/) != null;
+  var regexSearchString = RegExp.escape(searchString);
+  if (caseSensitiveMatch) {
+    regexSearchString += "|" +
+      $.map(searchString.split(''), function(e) { return RegExp.escape(e); }).
+      join('.+?');
+  }
+  return regexSearchString;
+}
+
+function highlight() {
+  $('#full_list li:visible').each(function(n) {
+    $(this).removeClass('even odd').addClass(n % 2 == 0 ? 'odd' : 'even');
+  });
+}
+
+/**
+ * Expands the tree to the target element and its immediate
+ * children.
+ */
+function expandTo(path) {
+  var $target = $(document.getElementById('object_' + path));
+  $target.addClass('clicked');
+  $target.removeClass('collapsed');
+  $target.parentsUntil('#full_list', 'li').removeClass('collapsed');
+  if($target[0]) {
+    window.scrollTo(window.scrollX, $target.offset().top - 250);
+    highlight();
+  }
+}
+
+function windowEvents(event) {
+  var msg = event.data;
+  if (msg.action === "expand") {
+    expandTo(msg.path);
+  }
+  return false;
+}
+
+window.addEventListener("message", windowEvents, false);
+
+$(document).ready(function() {
+  escapeShortcut();
+  navResizer();
+  enableLinks();
+  enableToggles();
+  populateSearchCache();
+  enableSearch();
+});
+
+})();
diff --git a/documentation/chat/backend/js/jquery.js b/documentation/chat/backend/js/jquery.js
new file mode 100644
index 00000000000..198b3ff07d8
--- /dev/null
+++ b/documentation/chat/backend/js/jquery.js
@@ -0,0 +1,4 @@
+/*! jQuery v1.7.1 jquery.com | jquery.org/license */
+(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!ck[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){cl||(cl=c.createElement("iframe"),cl.frameBorder=cl.width=cl.height=0),b.appendChild(cl);if(!cm||!cl.createElement)cm=(cl.contentWindow||cl.contentDocument).document,cm.write((c.compatMode==="CSS1Compat"?"<!doctype html>":"")+"<html><body>"),cm.close();d=cm.createElement(a),cm.body.appendChild(d),e=f.css(d,"display"),b.removeChild(cl)}ck[a]=e}return ck[a]}function cu(a,b){var c={};f.each(cq.concat.apply([],cq.slice(0,b)),function(){c[this]=a});return c}function ct(){cr=b}function cs(){setTimeout(ct,0);return cr=f.now()}function cj(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ci(){try{return new a.XMLHttpRequest}catch(b){}}function cc(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function cb(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function ca(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bE.test(a)?d(a,e):ca(a+"["+(typeof e=="object"||f.isArray(e)?b:"")+"]",e,c,d)});else if(!c&&b!=null&&typeof b=="object")for(var e in b)ca(a+"["+e+"]",b[e],c,d);else d(a,b)}function b_(a,c){var d,e,g=f.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((g[d]?a:e||(e={}))[d]=c[d]);e&&f.extend(!0,a,e)}function b$(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bT,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=b$(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=b$(a,c,d,e,"*",g));return l}function bZ(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bP),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bC(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?bx:by,g=0,h=e.length;if(d>0){if(c!=="border")for(;g<h;g++)c||(d-=parseFloat(f.css(a,"padding"+e[g]))||0),c==="margin"?d+=parseFloat(f.css(a,c+e[g]))||0:d-=parseFloat(f.css(a,"border"+e[g]+"Width"))||0;return d+"px"}d=bz(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0;if(c)for(;g<h;g++)d+=parseFloat(f.css(a,"padding"+e[g]))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+e[g]+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+e[g]))||0);return d+"px"}function bp(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bf,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bo(a){var b=c.createElement("div");bh.appendChild(b),b.innerHTML=a.outerHTML;return b.firstChild}function bn(a){var b=(a.nodeName||"").toLowerCase();b==="input"?bm(a):b!=="script"&&typeof a.getElementsByTagName!="undefined"&&f.grep(a.getElementsByTagName("input"),bm)}function bm(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bl(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bk(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bj(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c,d,e,g=f._data(a),h=f._data(b,g),i=g.events;if(i){delete h.handle,h.events={};for(c in i)for(d=0,e=i[c].length;d<e;d++)f.event.add(b,c+(i[c][d].namespace?".":"")+i[c][d].namespace,i[c][d],i[c][d].data)}h.data&&(h.data=f.extend({},h.data))}}function bi(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function U(a){var b=V.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function T(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(O.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?parseFloat(d):j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c<d;c++)b[a[c]]=!0;return b}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.1",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:G?function(a){return a==null?"":G.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?E.call(c,a):e.merge(c,a)}return c},inArray:function(a,b,c){var d;if(b){if(H)return H.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=F.call(arguments,2),g=function(){return a.apply(c,f.concat(F.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h){var i=a.length;if(typeof c=="object"){for(var j in c)e.access(a,j,c[j],f,g,d);return a}if(d!==b){f=!h&&f&&e.isFunction(d);for(var k=0;k<i;k++)g(a[k],c,f?d.call(a[k],k,g(a[k],c)):d,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){I["[object "+b+"]"]=b.toLowerCase()}),z=e.uaMatch(y),z.browser&&(e.browser[z.browser]=!0,e.browser.version=z.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?B=function(){c.removeEventListener("DOMContentLoaded",B,!1),e.ready()}:c.attachEvent&&(B=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",B),e.ready())});return e}(),g={};f.Callbacks=function(a){a=a?g[a]||h(a):{};var c=[],d=[],e,i,j,k,l,m=function(b){var d,e,g,h,i;for(d=0,e=b.length;d<e;d++)g=b[d],h=f.type(g),h==="array"?m(g):h==="function"&&(!a.unique||!o.has(g))&&c.push(g)},n=function(b,f){f=f||[],e=!a.memory||[b,f],i=!0,l=j||0,j=0,k=c.length;for(;c&&l<k;l++)if(c[l].apply(b,f)===!1&&a.stopOnFalse){e=!0;break}i=!1,c&&(a.once?e===!0?o.disable():c=[]:d&&d.length&&(e=d.shift(),o.fireWith(e[0],e[1])))},o={add:function(){if(c){var a=c.length;m(arguments),i?k=c.length:e&&e!==!0&&(j=a,n(e[0],e[1]))}return this},remove:function(){if(c){var b=arguments,d=0,e=b.length;for(;d<e;d++)for(var f=0;f<c.length;f++)if(b[d]===c[f]){i&&f<=k&&(k--,f<=l&&l--),c.splice(f--,1);if(a.unique)break}}return this},has:function(a){if(c){var b=0,d=c.length;for(;b<d;b++)if(a===c[b])return!0}return!1},empty:function(){c=[];return this},disable:function(){c=d=e=b;return this},disabled:function(){return!c},lock:function(){d=b,(!e||e===!0)&&o.disable();return this},locked:function(){return!d},fireWith:function(b,c){d&&(i?a.once||d.push([b,c]):(!a.once||!e)&&n(b,c));return this},fire:function(){o.fireWith(this,arguments);return this},fired:function(){return!!e}};return o};var i=[].slice;f.extend({Deferred:function(a){var b=f.Callbacks("once memory"),c=f.Callbacks("once memory"),d=f.Callbacks("memory"),e="pending",g={resolve:b,reject:c,notify:d},h={done:b.add,fail:c.add,progress:d.add,state:function(){return e},isResolved:b.fired,isRejected:c.fired,then:function(a,b,c){i.done(a).fail(b).progress(c);return this},always:function(){i.done.apply(i,arguments).fail.apply(i,arguments);return this},pipe:function(a,b,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[b,"reject"],progress:[c,"notify"]},function(a,b){var c=b[0],e=b[1],g;f.isFunction(c)?i[a](function(){g=c.apply(this,arguments),g&&f.isFunction(g.promise)?g.promise().then(d.resolve,d.reject,d.notify):d[e+"With"](this===i?d:this,[g])}):i[a](d[e])})}).promise()},promise:function(a){if(a==null)a=h;else for(var b in h)a[b]=h[b];return a}},i=h.promise({}),j;for(j in g)i[j]=g[j].fire,i[j+"With"]=g[j].fireWith;i.done(function(){e="resolved"},c.disable,d.lock).fail(function(){e="rejected"},b.disable,d.lock),a&&a.call(i,i);return i},when:function(a){function m(a){return function(b){e[a]=arguments.length>1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c<d;c++)b[c]&&b[c].promise&&f.isFunction(b[c].promise)?b[c].promise().then(l(c),j.reject,m(c)):--g;g||j.resolveWith(j,b)}else j!==a&&j.resolveWith(j,d?[a]:[]);return k}}),f.support=function(){var b,d,e,g,h,i,j,k,l,m,n,o,p,q=c.createElement("div"),r=c.documentElement;q.setAttribute("className","t"),q.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=q.getElementsByTagName("*"),e=q.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=q.getElementsByTagName("input")[0],b={leadingWhitespace:q.firstChild.nodeType===3,tbody:!q.getElementsByTagName("tbody").length,htmlSerialize:!!q.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:q.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete q.test}catch(s){b.deleteExpando=!1}!q.addEventListener&&q.attachEvent&&q.fireEvent&&(q.attachEvent("onclick",function(){b.noCloneEvent=!1}),q.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),q.appendChild(i),k=c.createDocumentFragment(),k.appendChild(q.lastChild),b.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,k.removeChild(i),k.appendChild(q),q.innerHTML="",a.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",q.style.width="2px",q.appendChild(j),b.reliableMarginRight=(parseInt((a.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0);if(q.attachEvent)for(o in{submit:1,change:1,focusin:1})n="on"+o,p=n in q,p||(q.setAttribute(n,"return;"),p=typeof q[n]=="function"),b[o+"Bubbles"]=p;k.removeChild(q),k=g=h=j=q=i=null,f(function(){var a,d,e,g,h,i,j,k,m,n,o,r=c.getElementsByTagName("body")[0];!r||(j=1,k="position:absolute;top:0;left:0;width:1px;height:1px;margin:0;",m="visibility:hidden;border:0;",n="style='"+k+"border:5px solid #000;padding:0;'",o="<div "+n+"><div></div></div>"+"<table "+n+" cellpadding='0' cellspacing='0'>"+"<tr><td></td></tr></table>",a=c.createElement("div"),a.style.cssText=m+"width:0;height:0;position:static;top:0;margin-top:"+j+"px",r.insertBefore(a,r.firstChild),q=c.createElement("div"),a.appendChild(q),q.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>",l=q.getElementsByTagName("td"),p=l[0].offsetHeight===0,l[0].style.display="",l[1].style.display="none",b.reliableHiddenOffsets=p&&l[0].offsetHeight===0,q.innerHTML="",q.style.width=q.style.paddingLeft="1px",f.boxModel=b.boxModel=q.offsetWidth===2,typeof q.style.zoom!="undefined"&&(q.style.display="inline",q.style.zoom=1,b.inlineBlockNeedsLayout=q.offsetWidth===2,q.style.display="",q.innerHTML="<div style='width:4px;'></div>",b.shrinkWrapBlocks=q.offsetWidth!==2),q.style.cssText=k+m,q.innerHTML=o,d=q.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,i={doesNotAddBorder:e.offsetTop!==5,doesAddBorderForTableAndCells:h.offsetTop===5},e.style.position="fixed",e.style.top="20px",i.fixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",i.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,i.doesNotIncludeMarginInBodyOffset=r.offsetTop!==j,r.removeChild(a),q=a=null,f.extend(b,i))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e<g;e++)delete d[b[e]];if(!(c?m:f.isEmptyObject)(d))return}}if(!c){delete j[k].data;if(!m(j[k]))return}f.support.deleteExpando||!j.setInterval?delete j[k]:j[k]=null,i&&(f.support.deleteExpando?delete a[h]:a.removeAttribute?a.removeAttribute(h):a[h]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d,e,g,h=null;if(typeof a=="undefined"){if(this.length){h=f.data(this[0]);if(this[0].nodeType===1&&!f._data(this[0],"parsedAttrs")){e=this[0].attributes;for(var i=0,j=e.length;i<j;i++)g=e[i].name,g.indexOf("data-")===0&&(g=f.camelCase(g.substring(5)),l(this[0],g,h[g]));f._data(this[0],"parsedAttrs",!0)}}return h}if(typeof a=="object")return this.each(function(){f.data(this,a)});d=a.split("."),d[1]=d[1]?"."+d[1]:"";if(c===b){h=this.triggerHandler("getData"+d[1]+"!",[d[0]]),h===b&&this.length&&(h=f.data(this[0],a),h=l(this[0],a,h));return h===b&&d[1]?this.data(d[0]):h}return this.each(function(){var b=f(this),e=[d[0],c];b.triggerHandler("setData"+d[1]+"!",e),f.data(this,a,c),b.triggerHandler("changeData"+d[1]+"!",e)})},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,b){a&&(b=(b||"fx")+"mark",f._data(a,b,(f._data(a,b)||0)+1))},_unmark:function(a,b,c){a!==!0&&(c=b,b=a,a=!1);if(b){c=c||"fx";var d=c+"mark",e=a?0:(f._data(b,d)||1)-1;e?f._data(b,d,e):(f.removeData(b,d,!0),n(b,c,"mark"))}},queue:function(a,b,c){var d;if(a){b=(b||"fx")+"queue",d=f._data(a,b),c&&(!d||f.isArray(c)?d=f._data(a,b,f.makeArray(c)):d.push(c));return d||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e={};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),f._data(a,b+".run",e),d.call(a,function(){f.dequeue(a,b)},e)),c.length||(f.removeData(a,b+"queue "+b+".run",!0),n(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){typeof a!="string"&&(c=a,a="fx");if(c===b)return f.queue(this[0],a);return this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f.Callbacks("once memory"),!0))h++,l.add(m);m();return d.promise()}});var o=/[\n\t\r]/g,p=/\s+/,q=/\r/g,r=/^(?:button|input)$/i,s=/^(?:button|input|object|select|textarea)$/i,t=/^a(?:rea)?$/i,u=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,v=f.support.getSetAttribute,w,x,y;f.fn.extend({attr:function(a,b){return f.access(this,a,b,!0,f.attr)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,a,b,!0,f.prop)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(p);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(p);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(o," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(p);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(o," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.nodeName.toLowerCase()]||f.valHooks[g.type];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c<d;c++){e=i[c];if(e.selected&&(f.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!f.nodeName(e.parentNode,"optgroup"))){b=f(e).val();if(j)return b;h.push(b)}}if(j&&!h.length&&i.length)return f(i[g]).val();return h},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;h<g;h++)e=d[h],e&&(c=f.propFix[e]||e,f.attr(a,e,""),a.removeAttribute(v?e:c),u.test(e)&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(r.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},value:{get:function(a,b){if(w&&f.nodeName(a,"button"))return w.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(w&&f.nodeName(a,"button"))return w.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,g,h,i=a.nodeType;if(!!a&&i!==3&&i!==8&&i!==2){h=i!==1||!f.isXMLDoc(a),h&&(c=f.propFix[c]||c,g=f.propHooks[c]);return d!==b?g&&"set"in g&&(e=g.set(a,d,c))!==b?e:a[c]=d:g&&"get"in g&&(e=g.get(a,c))!==null?e:a[c]}},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):s.test(a.nodeName)||t.test(a.nodeName)&&a.href?0:b}}}}),f.attrHooks.tabindex=f.propHooks.tabIndex,x={get:function(a,c){var d,e=f.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},v||(y={name:!0,id:!0},w=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&(y[c]?d.nodeValue!=="":d.specified)?d.nodeValue:b},set:function(a,b,d){var e=a.getAttributeNode(d);e||(e=c.createAttribute(d),a.setAttributeNode(e));return e.nodeValue=b+""}},f.attrHooks.tabindex.set=w.set,f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})}),f.attrHooks.contenteditable={get:w.get,set:function(a,b,c){b===""&&(b="false"),w.set(a,b,c)}}),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex);return null}})),f.support.enctype||(f.propFix.enctype="encoding"),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/\bhover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")};
+f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k<c.length;k++){l=A.exec(c[k])||[],m=l[1],n=(l[2]||"").split(".").sort(),s=f.event.special[m]||{},m=(g?s.delegateType:s.bindType)||m,s=f.event.special[m]||{},o=f.extend({type:m,origType:l[1],data:e,handler:d,guid:d.guid,selector:g,quick:G(g),namespace:n.join(".")},p),r=j[m];if(!r){r=j[m]=[],r.delegateCount=0;if(!s.setup||s.setup.call(a,e,n,i)===!1)a.addEventListener?a.addEventListener(m,i,!1):a.attachEvent&&a.attachEvent("on"+m,i)}s.add&&(s.add.call(a,o),o.handler.guid||(o.handler.guid=d.guid)),g?r.splice(r.delegateCount++,0,o):r.push(o),f.event.global[m]=!0}a=null}},global:{},remove:function(a,b,c,d,e){var g=f.hasData(a)&&f._data(a),h,i,j,k,l,m,n,o,p,q,r,s;if(!!g&&!!(o=g.events)){b=f.trim(I(b||"")).split(" ");for(h=0;h<b.length;h++){i=A.exec(b[h])||[],j=k=i[1],l=i[2];if(!j){for(j in o)f.event.remove(a,j+b[h],c,d,!0);continue}p=f.event.special[j]||{},j=(d?p.delegateType:p.bindType)||j,r=o[j]||[],m=r.length,l=l?new RegExp("(^|\\.)"+l.split(".").sort().join("\\.(?:.*\\.)?")+"(\\.|$)"):null;for(n=0;n<r.length;n++)s=r[n],(e||k===s.origType)&&(!c||c.guid===s.guid)&&(!l||l.test(s.namespace))&&(!d||d===s.selector||d==="**"&&s.selector)&&(r.splice(n--,1),s.selector&&r.delegateCount--,p.remove&&p.remove.call(a,s));r.length===0&&m!==r.length&&((!p.teardown||p.teardown.call(a,l)===!1)&&f.removeEvent(a,j,g.handle),delete o[j])}f.isEmptyObject(o)&&(q=g.handle,q&&(q.elem=null),f.removeData(a,["events","handle"],!0))}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){if(!e||e.nodeType!==3&&e.nodeType!==8){var h=c.type||c,i=[],j,k,l,m,n,o,p,q,r,s;if(E.test(h+f.event.triggered))return;h.indexOf("!")>=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;l<r.length&&!c.isPropagationStopped();l++)m=r[l][0],c.type=r[l][1],q=(f._data(m,"events")||{})[c.type]&&f._data(m,"handle"),q&&q.apply(m,d),q=o&&m[o],q&&f.acceptData(m)&&q.apply(m,d)===!1&&c.preventDefault();c.type=h,!g&&!c.isDefaultPrevented()&&(!p._default||p._default.apply(e.ownerDocument,d)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)&&o&&e[h]&&(h!=="focus"&&h!=="blur"||c.target.offsetWidth!==0)&&!f.isWindow(e)&&(n=e[o],n&&(e[o]=null),f.event.triggered=h,e[h](),f.event.triggered=b,n&&(e[o]=n));return c.result}},dispatch:function(c){c=f.event.fix(c||a.event);var d=(f._data(this,"events")||{})[c.type]||[],e=d.delegateCount,g=[].slice.call(arguments,0),h=!c.exclusive&&!c.namespace,i=[],j,k,l,m,n,o,p,q,r,s,t;g[0]=c,c.delegateTarget=this;if(e&&!c.target.disabled&&(!c.button||c.type!=="click")){m=f(this),m.context=this.ownerDocument||this;for(l=c.target;l!=this;l=l.parentNode||this){o={},q=[],m[0]=l;for(j=0;j<e;j++)r=d[j],s=r.selector,o[s]===b&&(o[s]=r.quick?H(l,r.quick):m.is(s)),o[s]&&q.push(r);q.length&&i.push({elem:l,matches:q})}}d.length>e&&i.push({elem:this,matches:d.slice(e)});for(j=0;j<i.length&&!c.isPropagationStopped();j++){p=i[j],c.currentTarget=p.elem;for(k=0;k<p.matches.length&&!c.isImmediatePropagationStopped();k++){r=p.matches[k];if(h||!c.namespace&&!r.namespace||c.namespace_re&&c.namespace_re.test(r.namespace))c.data=r.data,c.handleObj=r,n=((f.event.special[r.origType]||{}).handle||r.handler).apply(p.elem,g),n!==b&&(c.result=n,n===!1&&(c.preventDefault(),c.stopPropagation()))}}return c.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode);return a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,d){var e,f,g,h=d.button,i=d.fromElement;a.pageX==null&&d.clientX!=null&&(e=a.target.ownerDocument||c,f=e.documentElement,g=e.body,a.pageX=d.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=d.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?d.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0);return a}},fix:function(a){if(a[f.expando])return a;var d,e,g=a,h=f.event.fixHooks[a.type]||{},i=h.props?this.props.concat(h.props):this.props;a=f.Event(g);for(d=i.length;d;)e=i[--d],a[e]=g[e];a.target||(a.target=g.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey===b&&(a.metaKey=a.ctrlKey);return h.filter?h.filter(a,g):a},special:{ready:{setup:f.bindReady},load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=f.extend(new f.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?f.event.trigger(e,null,b):f.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},f.event.handle=f.event.dispatch,f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!(this instanceof f.Event))return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?K:J):this.type=a,b&&f.extend(this,b),this.timeStamp=a&&a.timeStamp||f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=K;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=K;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=K,this.stopPropagation()},isDefaultPrevented:J,isPropagationStopped:J,isImmediatePropagationStopped:J},f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c=this,d=a.relatedTarget,e=a.handleObj,g=e.selector,h;if(!d||d!==c&&!f.contains(c,d))a.type=e.origType,h=e.handler.apply(this,arguments),a.type=b;return h}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(){if(f.nodeName(this,"form"))return!1;f.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=f.nodeName(c,"input")||f.nodeName(c,"button")?c.form:b;d&&!d._submit_attached&&(f.event.add(d,"submit._submit",function(a){this.parentNode&&!a.isTrigger&&f.event.simulate("submit",this.parentNode,a,!0)}),d._submit_attached=!0)})},teardown:function(){if(f.nodeName(this,"form"))return!1;f.event.remove(this,"._submit")}}),f.support.changeBubbles||(f.event.special.change={setup:function(){if(z.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")f.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),f.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1,f.event.simulate("change",this,a,!0))});return!1}f.event.add(this,"beforeactivate._change",function(a){var b=a.target;z.test(b.nodeName)&&!b._change_attached&&(f.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&f.event.simulate("change",this.parentNode,a,!0)}),b._change_attached=!0)})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){f.event.remove(this,"._change");return z.test(this.nodeName)}}),f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){var d=0,e=function(a){f.event.simulate(b,a.target,f.event.fix(a),!0)};f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.fn.extend({on:function(a,c,d,e,g){var h,i;if(typeof a=="object"){typeof c!="string"&&(d=c,c=b);for(i in a)this.on(i,c,d,a[i],g);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=J;else if(!e)return this;g===1&&(h=e,e=function(a){f().off(a);return h.apply(this,arguments)},e.guid=h.guid||(h.guid=f.guid++));return this.each(function(){f.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on.call(this,a,b,c,d,1)},off:function(a,c,d){if(a&&a.preventDefault&&a.handleObj){var e=a.handleObj;f(a.delegateTarget).off(e.namespace?e.type+"."+e.namespace:e.type,e.selector,e.handler);return this}if(typeof a=="object"){for(var g in a)this.off(g,c,a[g]);return this}if(c===!1||typeof c=="function")d=c,c=b;d===!1&&(d=J);return this.each(function(){f.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){f(this.context).on(a,this.selector,b,c);return this},die:function(a,b){f(this.context).off(a,this.selector||"**",b);return this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length==1?this.off(a,"**"):this.off(b,a,c)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f._data(this,"lastToggle"+a.guid)||0)%d;f._data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}if(j.nodeType===1){g||(j[d]=c,j.sizset=h);if(typeof b!="string"){if(j===b){k=!0;break}}else if(m.filter(b,[j]).length>0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}j.nodeType===1&&!g&&(j[d]=c,j.sizset=h);if(j.nodeName.toLowerCase()===b){k=j;break}j=j[a]}e[h]=k}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},m.matches=function(a,b){return m(a,null,null,b)},m.matchesSelector=function(a,b){return m(b,null,null,[a]).length>0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e<f;e++){h=o.order[e];if(g=o.leftMatch[h].exec(a)){i=g[1],g.splice(1,1);if(i.substr(i.length-1)!=="\\"){g[1]=(g[1]||"").replace(j,""),d=o.find[h](g,b,c);if(d!=null){a=a.replace(o.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},m.filter=function(a,c,d,e){var f,g,h,i,j,k,l,n,p,q=a,r=[],s=c,t=c&&c[0]&&m.isXML(c[0]);while(a&&c.length){for(h in o.filter)if((f=o.leftMatch[h].exec(a))!=null&&f[2]){k=o.filter[h],l=f[1],g=!1,f.splice(1,1);if(l.substr(l.length-1)==="\\")continue;s===r&&(r=[]);if(o.preFilter[h]){f=o.preFilter[h](f,s,d,r,e,t);if(!f)g=i=!0;else if(f===!0)continue}if(f)for(n=0;(j=s[n])!=null;n++)j&&(i=k(j,f,n,s),p=e^i,d&&i!=null?p?g=!0:s[n]=!1:p&&(r.push(j),g=!0));if(i!==b){d||(s=r),a=a.replace(o.match[h],"");if(!g)return[];break}}if(a===q)if(g==null)m.error(a);else break;q=a}return s},m.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)};var n=m.getText=function(a){var b,c,d=a.nodeType,e="";if(d){if(d===1||d===9){if(typeof a.textContent=="string")return a.textContent;if(typeof a.innerText=="string")return a.innerText.replace(k,"");for(a=a.firstChild;a;a=a.nextSibling)e+=n(a)}else if(d===3||d===4)return a.nodeValue}else for(b=0;c=a[b];b++)c.nodeType!==8&&(e+=n(c));return e},o=m.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!l.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&m.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&m.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(j,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}m.error(e)},CHILD:function(a,b){var c,e,f,g,h,i,j,k=b[1],l=a;switch(k){case"only":case"first":while(l=l.previousSibling)if(l.nodeType===1)return!1;if(k==="first")return!0;l=a;case"last":while(l=l.nextSibling)if(l.nodeType===1)return!1;return!0;case"nth":c=b[2],e=b[3];if(c===1&&e===0)return!0;f=b[0],g=a.parentNode;if(g&&(g[d]!==f||!a.nodeIndex)){i=0;for(l=g.firstChild;l;l=l.nextSibling)l.nodeType===1&&(l.nodeIndex=++i);g[d]=f}j=a.nodeIndex-e;return c===0?j===0:j%c===0&&j/c>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var u,v;c.documentElement.compareDocumentPosition?u=function(a,b){if(a===b){h=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(u=function(a,b){if(a===b){h=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],g=a.parentNode,i=b.parentNode,j=g;if(g===i)return v(a,b);if(!g)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return v(e[k],f[k]);return k===c?v(a,f[k],-1):v(e[k],b,1)},v=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h<i;h++)m(a,g[h],e,c);return m.filter(f,e)};m.attr=f.attr,m.selectors.attrMap={},f.find=m,f.expr=m.selectors,f.expr[":"]=f.expr.filters,f.unique=m.uniqueSort,f.text=m.getText,f.isXMLDoc=m.isXML,f.contains=m.contains}();var L=/Until$/,M=/^(?:parents|prevUntil|prevAll)/,N=/,/,O=/^.[^:#\[\.,]*$/,P=Array.prototype.slice,Q=f.expr.match.POS,R={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(T(this,a,!1),"not",a)},filter:function(a){return this.pushStack(T(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?Q.test(a)?f(a,this.context).index(this[0])>=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d<a.length;d++)f(g).is(a[d])&&c.push({selector:a[d],elem:g,level:h});g=g.parentNode,h++}return c}var i=Q.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(i?i.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/<tbody/i,_=/<|&#?\w+;/,ba=/<(?:script|style)/i,bb=/<(?:script|object|embed|option|style)/i,bc=new RegExp("<(?:"+V+")","i"),bd=/checked\s*(?:[^=]|=\s*.checked.)/i,be=/\/(java|ecma)script/i,bf=/^\s*<!(?:\[CDATA\[|\-\-)/,bg={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function()
+{for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1></$2>");try{for(var c=0,d=this.length;c<d;c++)this[c].nodeType===1&&(f.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(e){this.empty().append(a)}}else f.isFunction(a)?this.each(function(b){var c=f(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bd.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bi(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,bp)}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i,j=a[0];b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof j=="string"&&j.length<512&&i===c&&j.charAt(0)==="<"&&!bb.test(j)&&(f.support.checkClone||!bd.test(j))&&(f.support.html5Clone||!bc.test(j))&&(g=!0,h=f.fragments[j],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[j]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||!bc.test("<"+a.nodeName)?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1></$2>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");b===c?bh.appendChild(o):U(b).appendChild(o),o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]==="<table>"&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i<r;i++)bn(k[i]);else bn(k);k.nodeType?h.push(k):h=f.merge(h,k)}if(d){g=function(a){return!a.type||be.test(a.type)};for(j=0;h[j];j++)if(e&&f.nodeName(h[j],"script")&&(!h[j].type||h[j].type.toLowerCase()==="text/javascript"))e.push(h[j].parentNode?h[j].parentNode.removeChild(h[j]):h[j]);else{if(h[j].nodeType===1){var s=f.grep(h[j].getElementsByTagName("script"),g);h.splice.apply(h,[j+1,0].concat(s))}d.appendChild(h[j])}}return h},cleanData:function(a){var b,c,d=f.cache,e=f.event.special,g=f.support.deleteExpando;for(var h=0,i;(i=a[h])!=null;h++){if(i.nodeName&&f.noData[i.nodeName.toLowerCase()])continue;c=i[f.expando];if(c){b=d[c];if(b&&b.events){for(var j in b.events)e[j]?f.event.remove(i,j):f.removeEvent(i,j,b.handle);b.handle&&(b.handle.elem=null)}g?delete i[f.expando]:i.removeAttribute&&i.removeAttribute(f.expando),delete d[c]}}}});var bq=/alpha\([^)]*\)/i,br=/opacity=([^)]*)/,bs=/([A-Z]|^ms)/g,bt=/^-?\d+(?:px)?$/i,bu=/^-?\d/,bv=/^([\-+])=([\-+.\de]+)/,bw={position:"absolute",visibility:"hidden",display:"block"},bx=["Left","Right"],by=["Top","Bottom"],bz,bA,bB;f.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return f.access(this,a,c,!0,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)})},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bz(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d,h==="string"&&(g=bv.exec(d))&&(d=+(g[1]+1)*+g[2]+parseFloat(f.css(a,c)),h="number");if(d==null||h==="number"&&isNaN(d))return;h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(bz)return bz(a,c)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]}}),f.curCSS=f.css,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){var e;if(c){if(a.offsetWidth!==0)return bC(a,b,d);f.swap(a,bw,function(){e=bC(a,b,d)});return e}},set:function(a,b){if(!bt.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return br.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bq,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bq.test(g)?g.replace(bq,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,b){var c,d,e;b=b.replace(bs,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b)));return c}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f===null&&g&&(e=g[b])&&(f=e),!bt.test(f)&&bu.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f||0,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bD=/%20/g,bE=/\[\]$/,bF=/\r?\n/g,bG=/#.*$/,bH=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bI=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bJ=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bK=/^(?:GET|HEAD)$/,bL=/^\/\//,bM=/\?/,bN=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bO=/^(?:select|textarea)/i,bP=/\s+/,bQ=/([?&])_=[^&]*/,bR=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bS=f.fn.load,bT={},bU={},bV,bW,bX=["*/"]+["*"];try{bV=e.href}catch(bY){bV=c.createElement("a"),bV.href="",bV=bV.href}bW=bR.exec(bV.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bS)return bS.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bN,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bO.test(this.nodeName)||bI.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bF,"\r\n")}}):{name:b.name,value:c.replace(bF,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b_(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b_(a,b);return a},ajaxSettings:{url:bV,isLocal:bJ.test(bW[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bX},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bZ(bT),ajaxTransport:bZ(bU),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?cb(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cc(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bH.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bG,"").replace(bL,bW[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bP),d.crossDomain==null&&(r=bR.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bW[1]&&r[2]==bW[2]&&(r[3]||(r[1]==="http:"?80:443))==(bW[3]||(bW[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bT,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bK.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bM.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bQ,"$1_="+x);d.url=y+(y===d.url?(bM.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bX+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bU,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)ca(g,a[g],c,e);return d.join("&").replace(bD,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cd=f.now(),ce=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cd++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ce.test(b.url)||e&&ce.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ce,l),b.url===j&&(e&&(k=k.replace(ce,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cf=a.ActiveXObject?function(){for(var a in ch)ch[a](0,1)}:!1,cg=0,ch;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ci()||cj()}:ci,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cf&&delete ch[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cg,cf&&(ch||(ch={},f(a).unload(cf)),ch[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var ck={},cl,cm,cn=/^(?:toggle|show|hide)$/,co=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cp,cq=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cr;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),e===""&&f.css(d,"display")==="none"&&f._data(d,"olddisplay",cv(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cu("hide",3),a,b,c);var d,e,g=0,h=this.length;for(;g<h;g++)d=this[g],d.style&&(e=f.css(d,"display"),e!=="none"&&!f._data(d,"olddisplay")&&f._data(d,"olddisplay",e));for(g=0;g<h;g++)this[g].style&&(this[g].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(cu("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){function g(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]),h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(!f.support.inlineBlockNeedsLayout||cv(this.nodeName)==="inline"?this.style.display="inline-block":this.style.zoom=1))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)j=new f.fx(this,b,i),h=a[i],cn.test(h)?(o=f._data(this,"toggle"+i)||(h==="toggle"?d?"show":"hide":0),o?(f._data(this,"toggle"+i,o==="show"?"hide":"show"),j[o]()):j[h]()):(k=co.exec(h),l=j.cur(),k?(m=parseFloat(k[2]),n=k[3]||(f.cssNumber[i]?"":"px"),n!=="px"&&(f.style(this,i,(m||1)+n),l=(m||1)/j.cur()*l,f.style(this,i,l+n)),k[1]&&(m=(k[1]==="-="?-1:1)*m+l),j.custom(l,m,n)):j.custom(l,h,""));return!0}var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return e.queue===!1?this.each(g):this.queue(e.queue,g)},stop:function(a,c,d){typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]);return this.each(function(){function h(a,b,c){var e=b[c];f.removeData(a,c,!0),e.stop(d)}var b,c=!1,e=f.timers,g=f._data(this);d||f._unmark(!0,this);if(a==null)for(b in g)g[b]&&g[b].stop&&b.indexOf(".run")===b.length-4&&h(this,g,b);else g[b=a+".run"]&&g[b].stop&&h(this,g,b);for(b=e.length;b--;)e[b].elem===this&&(a==null||e[b].queue===a)&&(d?e[b](!0):e[b].saveState(),c=!0,e.splice(b,1));(!d||!c)&&f.dequeue(this,a)})}}),f.each({slideDown:cu("show",1),slideUp:cu("hide",1),slideToggle:cu("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue?f.dequeue(this,d.queue):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,c,d){function h(a){return e.step(a)}var e=this,g=f.fx;this.startTime=cr||cs(),this.end=c,this.now=this.start=a,this.pos=this.state=0,this.unit=d||this.unit||(f.cssNumber[this.prop]?"":"px"),h.queue=this.options.queue,h.elem=this.elem,h.saveState=function(){e.options.hide&&f._data(e.elem,"fxshow"+e.prop)===b&&f._data(e.elem,"fxshow"+e.prop,e.start)},h()&&f.timers.push(h)&&!cp&&(cp=setInterval(g.tick,g.interval))},show:function(){var a=f._data(this.elem,"fxshow"+this.prop);this.options.orig[this.prop]=a||f.style(this.elem,this.prop),this.options.show=!0,a!==b?this.custom(this.cur(),a):this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f._data(this.elem,"fxshow"+this.prop)||f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b,c,d,e=cr||cs(),g=!0,h=this.elem,i=this.options;if(a||e>=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||f.fx.stop()},interval:13,stop:function(){clearInterval(cp),cp=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=a.now+a.unit:a.elem[a.prop]=a.now}}}),f.each(["width","height"],function(a,b){f.fx.step[b]=function(a){f.style(a.elem,b,Math.max(0,a.now)+a.unit)}}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var cw=/^t(?:able|d|h)$/i,cx=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?f.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(d){}var e=b.ownerDocument,g=e.documentElement;if(!c||!f.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=e.body,i=cy(e),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||f.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||f.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:f.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);var c,d=b.offsetParent,e=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(f.support.fixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===d&&(l+=b.offsetTop,m+=b.offsetLeft,f.support.doesNotAddBorder&&(!f.support.doesAddBorderForTableAndCells||!cw.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),e=d,d=b.offsetParent),f.support.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;f.support.fixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},f.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,d,"padding")):this[d]():null},f.fn["outer"+c]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,d,a?"margin":"border")):this[d]():null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNumeric(j)?j:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window);
\ No newline at end of file
diff --git a/documentation/chat/backend/method_list.html b/documentation/chat/backend/method_list.html
new file mode 100644
index 00000000000..16b5d99b647
--- /dev/null
+++ b/documentation/chat/backend/method_list.html
@@ -0,0 +1,163 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta charset="utf-8" />
+    
+      <link rel="stylesheet" href="css/full_list.css" type="text/css" media="screen" />
+    
+      <link rel="stylesheet" href="css/common.css" type="text/css" media="screen" />
+    
+
+    
+      <script type="text/javascript" charset="utf-8" src="js/jquery.js"></script>
+    
+      <script type="text/javascript" charset="utf-8" src="js/full_list.js"></script>
+    
+
+    <title>Method List</title>
+    <base id="base_target" target="_parent" />
+  </head>
+  <body>
+    <div id="content">
+      <div class="fixed_header">
+        <h1 id="full_list_header">Method List</h1>
+        <div id="full_list_nav">
+          
+            <span><a target="_self" href="class_list.html">
+              Classes
+            </a></span>
+          
+            <span><a target="_self" href="method_list.html">
+              Methods
+            </a></span>
+          
+            <span><a target="_self" href="file_list.html">
+              Files
+            </a></span>
+          
+        </div>
+
+        <div id="search">Search: <input type="text" /></div>
+      </div>
+
+      <ul id="full_list" class="method">
+        
+
+  <li class="odd ">
+    <div class="item">
+      <span class='object_link'><a href="Chat/Service/Base.html#contract-class_method" title="Chat::Service::Base.contract (method)">contract</a></span>
+      <small>Chat::Service::Base</small>
+    </div>
+  </li>
+  
+
+  <li class="even ">
+    <div class="item">
+      <span class='object_link'><a href="Chat/Service/Base.html#model-class_method" title="Chat::Service::Base.model (method)">model</a></span>
+      <small>Chat::Service::Base</small>
+    </div>
+  </li>
+  
+
+  <li class="odd ">
+    <div class="item">
+      <span class='object_link'><a href="Chat/Service/Base.html#policy-class_method" title="Chat::Service::Base.policy (method)">policy</a></span>
+      <small>Chat::Service::Base</small>
+    </div>
+  </li>
+  
+
+  <li class="even ">
+    <div class="item">
+      <span class='object_link'><a href="Chat/Service/Base.html#step-class_method" title="Chat::Service::Base.step (method)">step</a></span>
+      <small>Chat::Service::Base</small>
+    </div>
+  </li>
+  
+
+  <li class="odd ">
+    <div class="item">
+      <span class='object_link'><a href="Chat/Service/Base.html#transaction-class_method" title="Chat::Service::Base.transaction (method)">transaction</a></span>
+      <small>Chat::Service::Base</small>
+    </div>
+  </li>
+  
+
+  <li class="even ">
+    <div class="item">
+      <span class='object_link'><a href="Chat/Service/Base/Context.html#fail-instance_method" title="Chat::Service::Base::Context#fail (method)">#fail</a></span>
+      <small>Chat::Service::Base::Context</small>
+    </div>
+  </li>
+  
+
+  <li class="odd ">
+    <div class="item">
+      <span class='object_link'><a href="Chat/Service/Base/Context.html#fail!-instance_method" title="Chat::Service::Base::Context#fail! (method)">#fail!</a></span>
+      <small>Chat::Service::Base::Context</small>
+    </div>
+  </li>
+  
+
+  <li class="even ">
+    <div class="item">
+      <span class='object_link'><a href="Chat/Service/Base/Context.html#failure%3F-instance_method" title="Chat::Service::Base::Context#failure? (method)">#failure?</a></span>
+      <small>Chat::Service::Base::Context</small>
+    </div>
+  </li>
+  
+
+  <li class="odd ">
+    <div class="item">
+      <span class='object_link'><a href="Chat/Service/Base/Context.html#success%3F-instance_method" title="Chat::Service::Base::Context#success? (method)">#success?</a></span>
+      <small>Chat::Service::Base::Context</small>
+    </div>
+  </li>
+  
+
+  <li class="even ">
+    <div class="item">
+      <span class='object_link'><a href="Chat/Service/Base/Failure.html#context-instance_method" title="Chat::Service::Base::Failure#context (method)">#context</a></span>
+      <small>Chat::Service::Base::Failure</small>
+    </div>
+  </li>
+  
+
+  <li class="odd ">
+    <div class="item">
+      <span class='object_link'><a href="Chat/Service/TrashChannel.html#call-instance_method" title="Chat::Service::TrashChannel#call (method)">#call</a></span>
+      <small>Chat::Service::TrashChannel</small>
+    </div>
+  </li>
+  
+
+  <li class="even ">
+    <div class="item">
+      <span class='object_link'><a href="Chat/Service/UpdateChannel.html#call-instance_method" title="Chat::Service::UpdateChannel#call (method)">#call</a></span>
+      <small>Chat::Service::UpdateChannel</small>
+    </div>
+  </li>
+  
+
+  <li class="odd ">
+    <div class="item">
+      <span class='object_link'><a href="Chat/Service/UpdateChannelStatus.html#call-instance_method" title="Chat::Service::UpdateChannelStatus#call (method)">#call</a></span>
+      <small>Chat::Service::UpdateChannelStatus</small>
+    </div>
+  </li>
+  
+
+  <li class="even ">
+    <div class="item">
+      <span class='object_link'><a href="Chat/Service/UpdateUserLastRead.html#call-instance_method" title="Chat::Service::UpdateUserLastRead#call (method)">#call</a></span>
+      <small>Chat::Service::UpdateUserLastRead</small>
+    </div>
+  </li>
+  
+
+
+      </ul>
+    </div>
+  </body>
+</html>
diff --git a/documentation/chat/backend/top-level-namespace.html b/documentation/chat/backend/top-level-namespace.html
new file mode 100644
index 00000000000..5ac499bd4e8
--- /dev/null
+++ b/documentation/chat/backend/top-level-namespace.html
@@ -0,0 +1,111 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>
+  Top Level Namespace
+  
+    &mdash; Documentation by YARD 0.9.28
+  
+</title>
+
+  <link rel="stylesheet" href="css/style.css" type="text/css" />
+
+  <link rel="stylesheet" href="css/common.css" type="text/css" />
+
+<script type="text/javascript">
+  pathId = "";
+  relpath = '';
+</script>
+
+
+  <script type="text/javascript" charset="utf-8" src="js/jquery.js"></script>
+
+  <script type="text/javascript" charset="utf-8" src="js/app.js"></script>
+
+
+  </head>
+  <body>
+    <div class="nav_wrap">
+      <iframe id="nav" src="class_list.html?1"></iframe>
+      <div id="resizer"></div>
+    </div>
+
+    <div id="main" tabindex="-1">
+      <div id="header">
+        <div id="menu">
+  
+    <a href="_index.html">Index</a> &raquo;
+    
+    
+    <span class="title">Top Level Namespace</span>
+  
+</div>
+
+        <div id="search">
+  
+    <a class="full_list_link" id="class_list_link"
+        href="class_list.html">
+
+        <svg width="24" height="24">
+          <rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
+        </svg>
+    </a>
+  
+</div>
+        <div class="clear"></div>
+      </div>
+
+      <div id="content"><h1>Top Level Namespace
+  
+  
+  
+</h1>
+<div class="box_info">
+  
+
+  
+  
+  
+  
+  
+
+  
+
+  
+</div>
+
+<h2>Defined Under Namespace</h2>
+<p class="children">
+  
+    
+      <strong class="modules">Modules:</strong> <span class='object_link'><a href="Chat.html" title="Chat (module)">Chat</a></span>
+    
+  
+    
+  
+</p>
+
+
+
+
+
+
+
+
+
+</div>
+
+      
+<div id="footer">
+  Generated by
+  <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
+  0.9.28.
+</div>
+
+    </div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/documentation/chat/frontend/PluginApi.html b/documentation/chat/frontend/PluginApi.html
new file mode 100644
index 00000000000..90810a73205
--- /dev/null
+++ b/documentation/chat/frontend/PluginApi.html
@@ -0,0 +1,1217 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Discourse: PluginApi</title>
+    
+      <link type="text/css" rel="stylesheet" href="styles/vendor/prism-custom.css">
+    
+    <link type="text/css" rel="stylesheet" href="styles/styles.css">
+    
+</head>
+<body>
+
+<header class="layout-header">
+  
+  <h1>
+    <a href="./index.html">
+      Discourse
+    </a>
+  </h1>
+  <nav class="layout-nav">
+    <ul><li class="nav-heading">Classes</li><li class="nav-heading"><span class="nav-item-type type-class" title="class">C</span><span class="nav-item-name is-class"><a href="PluginApi.html">PluginApi</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="PluginApi.html#decorateChatMessage">decorateChatMessage</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="PluginApi.html#registerChatComposerButton">registerChatComposerButton</a></span></li><li class="nav-heading"><span class="nav-item-type type-class" title="class">C</span><span class="nav-item-name is-class"><a href="module.exports.html">exports</a></span></li></ul><ul><li class="nav-heading">Modules</li><li class="nav-heading"><span class="nav-item-type type-module" title="module">M</span><span class="nav-item-name is-module"><a href="module-ChatApi.html">ChatApi</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#categoryPermissions">categoryPermissions</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#channel">channel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#channels">channels</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#createChannel">createChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#createChannelArchive">createChannelArchive</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#destroyChannel">destroyChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#followChannel">followChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#listChannelMemberships">listChannelMemberships</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#listCurrentUserChannels">listCurrentUserChannels</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#moveChannelMessages">moveChannelMessages</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#sendMessage">sendMessage</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#unfollowChannel">unfollowChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#updateChannel">updateChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#updateChannelStatus">updateChannelStatus</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#updateCurrentUserChannelNotificationsSettings">updateCurrentUserChannelNotificationsSettings</a></span></li></ul><li class="nav-heading"><a href="global.html">Globals</a></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="global.html#load">load</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="global.html#loadMore">loadMore</a></span></li>
+  </nav>
+</header>
+
+
+<main class="layout-main ">
+  <div class="container">
+    <p class="page-kind">Class</p>
+    <h1 class="page-title">PluginApi</h1>
+    
+
+
+
+
+<section>
+
+
+<header class="class">
+
+
+    
+        
+        <!-- <h2>PluginApi</h2> -->
+
+        
+
+        
+
+        
+    
+</header>
+
+<article>
+    <div class="container-overview">
+
+
+
+    
+        
+
+
+
+
+
+    
+
+
+    
+
+    <div class="method-type">
+    
+    </div>
+
+    <h4 class="method-name" id="PluginApi">new PluginApi<span class="signature">()</span><span class="return-type-signature"></span>
+    </h4>
+
+
+
+
+
+<div class="method-description">
+    
+    Class exposing the javascript API available to plugins and themes.
+</div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+<div class="details">
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+</div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Source</h4>
+    <ul>
+        <li class="method-source">
+            <a href="pre-initializers_chat-plugin-api.js.html">pre-initializers/chat-plugin-api.js</a><a href="pre-initializers_chat-plugin-api.js.html#source.8">, line 8</a>
+        </li>
+    </ul>
+
+
+
+    
+    </div>
+
+    
+
+    
+
+     
+
+    
+
+    
+
+
+    
+
+    
+        <h3 class="subtitle">Methods</h3>
+
+        
+            
+
+
+    <article class="method">
+
+
+
+
+    
+
+
+    
+
+    <div class="method-type">
+    
+    </div>
+
+    <h4 class="method-name" id="decorateChatMessage">decorateChatMessage<span class="signature">(decorator)</span><span class="return-type-signature"></span>
+    </h4>
+
+
+
+
+
+<div class="method-description">
+    
+    Decorate a chat message
+</div>
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Parameters</h4>
+    
+
+<ul class="method-params">
+    
+
+        <li>
+            
+                <span class="param-name">decorator</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code><a href="PluginApi.html#~decorateChatMessageCallback">PluginApi~decorateChatMessageCallback</a></code>
+    </span>
+    
+
+            
+
+            
+
+            
+
+            <div class="param-description"></div>
+            
+        </li>
+
+    
+</ul>
+
+
+
+
+
+<div class="details">
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+</div>
+
+
+
+
+
+
+    <h4 class="method-heading">Example</h4>
+    
+    <pre><code class="language-js">api.decorateChatMessage((chatMessage, messageContainer) => {
+  messageContainer.dataset.foo = chatMessage.id;
+});</code></pre>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Source</h4>
+    <ul>
+        <li class="method-source">
+            <a href="pre-initializers_chat-plugin-api.js.html">pre-initializers/chat-plugin-api.js</a><a href="pre-initializers_chat-plugin-api.js.html#source.22">, line 22</a>
+        </li>
+    </ul>
+
+
+
+    </article>
+
+        
+            
+
+
+    <article class="method">
+
+
+
+
+    
+
+
+    
+
+    <div class="method-type">
+    
+    </div>
+
+    <h4 class="method-name" id="registerChatComposerButton">registerChatComposerButton<span class="signature">(options)</span><span class="return-type-signature"></span>
+    </h4>
+
+
+
+
+
+<div class="method-description">
+    
+    Register a button in the chat composer
+</div>
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Parameters</h4>
+    
+
+<ul class="method-params">
+    
+
+        <li>
+            
+                <span class="param-name">options</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>Object</code>
+    </span>
+    
+
+            
+
+            
+
+            
+
+            <div class="param-description"></div>
+            
+                <p class="param-properties">Properties</p>
+                
+
+<ul class="method-params">
+    
+
+        <li>
+            
+                <span class="param-name">id</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>number</code>
+    </span>
+    
+
+            
+
+            
+                <span class="param-attributes">
+                
+
+                
+
+                
+                </span>
+            
+
+            
+
+            <div class="param-description">The id of the button</div>
+            
+        </li>
+
+    
+
+        <li>
+            
+                <span class="param-name">action</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>function</code>
+    </span>
+    
+
+            
+
+            
+                <span class="param-attributes">
+                
+
+                
+
+                
+                </span>
+            
+
+            
+
+            <div class="param-description">An action name or an anonymous function called when the button is pressed, eg: "onFooClicked" or `() => { console.log("clicked") }`</div>
+            
+        </li>
+
+    
+
+        <li>
+            
+                <span class="param-name">icon</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>string</code>
+    </span>
+    
+
+            
+
+            
+                <span class="param-attributes">
+                
+
+                
+
+                
+                </span>
+            
+
+            
+
+            <div class="param-description">A valid font awesome icon name, eg: "far fa-image"</div>
+            
+        </li>
+
+    
+
+        <li>
+            
+                <span class="param-name">label</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>string</code>
+    </span>
+    
+
+            
+
+            
+                <span class="param-attributes">
+                
+
+                
+
+                
+                </span>
+            
+
+            
+
+            <div class="param-description">Text displayed on the button, a translatable key, eg: "foo.bar"</div>
+            
+        </li>
+
+    
+
+        <li>
+            
+                <span class="param-name">translatedLabel</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>string</code>
+    </span>
+    
+
+            
+
+            
+                <span class="param-attributes">
+                
+
+                
+
+                
+                </span>
+            
+
+            
+
+            <div class="param-description">Text displayed on the button, a string, eg: "Add gifs"</div>
+            
+        </li>
+
+    
+
+        <li>
+            
+                <span class="param-name">position</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>string</code>
+    </span>
+    
+
+            
+
+            
+                <span class="param-attributes">
+                
+                    &lt;optional&gt;<br>
+                
+
+                
+
+                
+                </span>
+            
+
+            
+
+            <div class="param-description">Can be "inline" or "dropdown", defaults to "inline"</div>
+            
+        </li>
+
+    
+
+        <li>
+            
+                <span class="param-name">title</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>string</code>
+    </span>
+    
+
+            
+
+            
+                <span class="param-attributes">
+                
+                    &lt;optional&gt;<br>
+                
+
+                
+
+                
+                </span>
+            
+
+            
+
+            <div class="param-description">Title attribute of the button, a translatable key, eg: "foo.bar"</div>
+            
+        </li>
+
+    
+
+        <li>
+            
+                <span class="param-name">translatedTitle</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>string</code>
+    </span>
+    
+
+            
+
+            
+                <span class="param-attributes">
+                
+                    &lt;optional&gt;<br>
+                
+
+                
+
+                
+                </span>
+            
+
+            
+
+            <div class="param-description">Title attribute of the button, a string, eg: "Add gifs"</div>
+            
+        </li>
+
+    
+
+        <li>
+            
+                <span class="param-name">ariaLabel</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>string</code>
+    </span>
+    
+
+            
+
+            
+                <span class="param-attributes">
+                
+                    &lt;optional&gt;<br>
+                
+
+                
+
+                
+                </span>
+            
+
+            
+
+            <div class="param-description">aria-label attribute of the button, a translatable key, eg: "foo.bar"</div>
+            
+        </li>
+
+    
+
+        <li>
+            
+                <span class="param-name">translatedAriaLabel</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>string</code>
+    </span>
+    
+
+            
+
+            
+                <span class="param-attributes">
+                
+                    &lt;optional&gt;<br>
+                
+
+                
+
+                
+                </span>
+            
+
+            
+
+            <div class="param-description">aria-label attribute of the button, a string, eg: "Add gifs"</div>
+            
+        </li>
+
+    
+
+        <li>
+            
+                <span class="param-name">classNames</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>string</code>
+    </span>
+    
+
+            
+
+            
+                <span class="param-attributes">
+                
+                    &lt;optional&gt;<br>
+                
+
+                
+
+                
+                </span>
+            
+
+            
+
+            <div class="param-description">Additional names to add to the button’s class attribute, eg: ["foo", "bar"]</div>
+            
+        </li>
+
+    
+
+        <li>
+            
+                <span class="param-name">displayed</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>boolean</code>
+    </span>
+    
+
+            
+
+            
+                <span class="param-attributes">
+                
+                    &lt;optional&gt;<br>
+                
+
+                
+
+                
+                </span>
+            
+
+            
+
+            <div class="param-description">Hide or show the button</div>
+            
+        </li>
+
+    
+
+        <li>
+            
+                <span class="param-name">disabled</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>boolean</code>
+    </span>
+    
+
+            
+
+            
+                <span class="param-attributes">
+                
+                    &lt;optional&gt;<br>
+                
+
+                
+
+                
+                </span>
+            
+
+            
+
+            <div class="param-description">Sets the disabled attribute on the button</div>
+            
+        </li>
+
+    
+
+        <li>
+            
+                <span class="param-name">priority</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>number</code>
+    </span>
+    
+
+            
+
+            
+                <span class="param-attributes">
+                
+                    &lt;optional&gt;<br>
+                
+
+                
+
+                
+                </span>
+            
+
+            
+
+            <div class="param-description">An integer defining the order of the buttons, higher comes first, eg: `700`</div>
+            
+        </li>
+
+    
+
+        <li>
+            
+                <span class="param-name">dependentKeys</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>Array.&lt;string></code>
+    </span>
+    
+
+            
+
+            
+                <span class="param-attributes">
+                
+                    &lt;optional&gt;<br>
+                
+
+                
+
+                
+                </span>
+            
+
+            
+
+            <div class="param-description">List of property names which should trigger a refresh of the buttons when changed, eg: `["foo.bar", "bar.baz"]`</div>
+            
+        </li>
+
+    
+</ul>
+            
+        </li>
+
+    
+</ul>
+
+
+
+
+
+<div class="details">
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+</div>
+
+
+
+
+
+
+    <h4 class="method-heading">Example</h4>
+    
+    <pre><code class="language-js">api.registerChatComposerButton({
+  id: "foo",
+  displayed() {
+    return this.site.mobileView &amp;&amp; this.canAttachUploads;
+  }
+});</code></pre>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Source</h4>
+    <ul>
+        <li class="method-source">
+            <a href="pre-initializers_chat-plugin-api.js.html">pre-initializers/chat-plugin-api.js</a><a href="pre-initializers_chat-plugin-api.js.html#source.36">, line 36</a>
+        </li>
+    </ul>
+
+
+
+    </article>
+
+        
+    
+
+    
+        <h3 class="subsection-title">Type Definitions</h3>
+
+        
+                
+
+
+    <article class="method">
+
+
+
+
+    
+
+
+    
+
+    <div class="method-type">
+    
+    </div>
+
+    <h4 class="method-name" id="~decorateChatMessageCallback">decorateChatMessageCallback<span class="signature">(chatMessage, messageContainer, chatChannel)</span><span class="return-type-signature"></span>
+    </h4>
+
+
+
+
+
+<div class="method-description">
+    
+    Callback used to decorate a chat message
+</div>
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Parameters</h4>
+    
+
+<ul class="method-params">
+    
+
+        <li>
+            
+                <span class="param-name">chatMessage</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>ChatMessage</code>
+    </span>
+    
+
+            
+
+            
+
+            
+
+            <div class="param-description">model</div>
+            
+        </li>
+
+    
+
+        <li>
+            
+                <span class="param-name">messageContainer</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>HTMLElement</code>
+    </span>
+    
+
+            
+
+            
+
+            
+
+            <div class="param-description">DOM node</div>
+            
+        </li>
+
+    
+
+        <li>
+            
+                <span class="param-name">chatChannel</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>ChatChannel</code>
+    </span>
+    
+
+            
+
+            
+
+            
+
+            <div class="param-description">model</div>
+            
+        </li>
+
+    
+</ul>
+
+
+
+
+
+<div class="details">
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+</div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Source</h4>
+    <ul>
+        <li class="method-source">
+            <a href="pre-initializers_chat-plugin-api.js.html">pre-initializers/chat-plugin-api.js</a><a href="pre-initializers_chat-plugin-api.js.html#source.13">, line 13</a>
+        </li>
+    </ul>
+
+
+
+    </article>
+
+            
+    
+
+    
+</article>
+
+</section>
+
+
+
+
+  </div>
+</main>
+
+<footer class="layout-footer">
+  <div class="container">
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.0</a>
+  </div>
+</footer>
+
+
+
+<script src="scripts/prism.dev.js"></script>
+</body>
+</html>
\ No newline at end of file
diff --git a/documentation/chat/frontend/global.html b/documentation/chat/frontend/global.html
new file mode 100644
index 00000000000..3ac821fd57f
--- /dev/null
+++ b/documentation/chat/frontend/global.html
@@ -0,0 +1,372 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Discourse: Global</title>
+    
+      <link type="text/css" rel="stylesheet" href="styles/vendor/prism-custom.css">
+    
+    <link type="text/css" rel="stylesheet" href="styles/styles.css">
+    
+</head>
+<body>
+
+<header class="layout-header">
+  
+  <h1>
+    <a href="./index.html">
+      Discourse
+    </a>
+  </h1>
+  <nav class="layout-nav">
+    <ul><li class="nav-heading">Classes</li><li class="nav-heading"><span class="nav-item-type type-class" title="class">C</span><span class="nav-item-name is-class"><a href="PluginApi.html">PluginApi</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="PluginApi.html#decorateChatMessage">decorateChatMessage</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="PluginApi.html#registerChatComposerButton">registerChatComposerButton</a></span></li><li class="nav-heading"><span class="nav-item-type type-class" title="class">C</span><span class="nav-item-name is-class"><a href="module.exports.html">exports</a></span></li></ul><ul><li class="nav-heading">Modules</li><li class="nav-heading"><span class="nav-item-type type-module" title="module">M</span><span class="nav-item-name is-module"><a href="module-ChatApi.html">ChatApi</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#categoryPermissions">categoryPermissions</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#channel">channel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#channels">channels</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#createChannel">createChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#createChannelArchive">createChannelArchive</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#destroyChannel">destroyChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#followChannel">followChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#listChannelMemberships">listChannelMemberships</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#listCurrentUserChannels">listCurrentUserChannels</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#moveChannelMessages">moveChannelMessages</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#sendMessage">sendMessage</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#unfollowChannel">unfollowChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#updateChannel">updateChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#updateChannelStatus">updateChannelStatus</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#updateCurrentUserChannelNotificationsSettings">updateCurrentUserChannelNotificationsSettings</a></span></li></ul><li class="nav-heading"><a href="global.html">Globals</a></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="global.html#load">load</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="global.html#loadMore">loadMore</a></span></li>
+  </nav>
+</header>
+
+
+<main class="layout-main ">
+  <div class="container">
+    <p class="page-kind"></p>
+    <h1 class="page-title">Global</h1>
+    
+
+
+
+
+<section>
+
+
+<header class="not-class">
+
+
+    
+        
+        <!-- <h2></h2> -->
+
+        
+
+        
+
+        
+    
+</header>
+
+<article>
+    <div class="container-overview">
+
+
+
+    
+        
+
+        
+
+
+<div class="details">
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+</div>
+
+
+        
+    
+    </div>
+
+    
+
+    
+
+     
+
+    
+
+    
+
+
+    
+
+    
+        <h3 class="subtitle">Methods</h3>
+
+        
+            
+
+
+    <article class="method">
+
+
+
+
+    
+
+
+    
+
+    <div class="method-type">
+    
+    </div>
+
+    <h4 class="method-name" id="load">load<span class="signature">()</span><span class="return-type-signature"> &rarr; {Promise}</span>
+    </h4>
+
+
+
+
+
+<div class="method-description">
+    
+    Loads first batch of results
+</div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+<div class="details">
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+</div>
+
+
+
+    <h4 class="method-heading">Returns</h4>
+    <ul>
+    
+        <li class="method-returns">
+            
+                <code>Promise</code>
+            
+            
+        </li>
+    
+    </ul>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Source</h4>
+    <ul>
+        <li class="method-source">
+            <a href="lib_collection.js.html">lib/collection.js</a><a href="lib_collection.js.html#source.51">, line 51</a>
+        </li>
+    </ul>
+
+
+
+    </article>
+
+        
+            
+
+
+    <article class="method">
+
+
+
+
+    
+
+
+    
+
+    <div class="method-type">
+    
+    </div>
+
+    <h4 class="method-name" id="loadMore">loadMore<span class="signature">()</span><span class="return-type-signature"> &rarr; {Promise}</span>
+    </h4>
+
+
+
+
+
+<div class="method-description">
+    
+    Attempts to load more results
+</div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+<div class="details">
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+</div>
+
+
+
+    <h4 class="method-heading">Returns</h4>
+    <ul>
+    
+        <li class="method-returns">
+            
+                <code>Promise</code>
+            
+            
+        </li>
+    
+    </ul>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Source</h4>
+    <ul>
+        <li class="method-source">
+            <a href="lib_collection.js.html">lib/collection.js</a><a href="lib_collection.js.html#source.81">, line 81</a>
+        </li>
+    </ul>
+
+
+
+    </article>
+
+        
+    
+
+    
+
+    
+</article>
+
+</section>
+
+
+
+
+  </div>
+</main>
+
+<footer class="layout-footer">
+  <div class="container">
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.0</a>
+  </div>
+</footer>
+
+
+
+<script src="scripts/prism.dev.js"></script>
+</body>
+</html>
\ No newline at end of file
diff --git a/documentation/chat/frontend/index.html b/documentation/chat/frontend/index.html
new file mode 100644
index 00000000000..1aa37512e0f
--- /dev/null
+++ b/documentation/chat/frontend/index.html
@@ -0,0 +1,80 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Discourse: </title>
+    
+      <link type="text/css" rel="stylesheet" href="styles/vendor/prism-custom.css">
+    
+    <link type="text/css" rel="stylesheet" href="styles/styles.css">
+    
+</head>
+<body>
+
+<header class="layout-header">
+  
+  <h1>
+    <a href="./index.html">
+      Discourse
+    </a>
+  </h1>
+  <nav class="layout-nav">
+    <ul><li class="nav-heading">Classes</li><li class="nav-heading"><span class="nav-item-type type-class" title="class">C</span><span class="nav-item-name is-class"><a href="PluginApi.html">PluginApi</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="PluginApi.html#decorateChatMessage">decorateChatMessage</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="PluginApi.html#registerChatComposerButton">registerChatComposerButton</a></span></li><li class="nav-heading"><span class="nav-item-type type-class" title="class">C</span><span class="nav-item-name is-class"><a href="module.exports.html">exports</a></span></li></ul><ul><li class="nav-heading">Modules</li><li class="nav-heading"><span class="nav-item-type type-module" title="module">M</span><span class="nav-item-name is-module"><a href="module-ChatApi.html">ChatApi</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#categoryPermissions">categoryPermissions</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#channel">channel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#channels">channels</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#createChannel">createChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#createChannelArchive">createChannelArchive</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#destroyChannel">destroyChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#followChannel">followChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#listChannelMemberships">listChannelMemberships</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#listCurrentUserChannels">listCurrentUserChannels</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#moveChannelMessages">moveChannelMessages</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#sendMessage">sendMessage</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#unfollowChannel">unfollowChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#updateChannel">updateChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#updateChannelStatus">updateChannelStatus</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#updateCurrentUserChannelNotificationsSettings">updateCurrentUserChannelNotificationsSettings</a></span></li></ul><li class="nav-heading"><a href="global.html">Globals</a></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="global.html#load">load</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="global.html#loadMore">loadMore</a></span></li>
+  </nav>
+</header>
+
+
+<main class="layout-main ">
+  <div class="container">
+    <p class="page-kind"></p>
+    <h1 class="page-title"></h1>
+    
+
+
+
+    
+
+
+    <h3> </h3>
+
+
+
+
+
+
+
+
+
+
+    
+
+
+
+
+    <section class="readme">
+        <article><p>This plugin is still in active development and may change frequently</p>
+<h2>Documentation</h2>
+<p>The Discourse Chat plugin adds chat functionality to your Discourse so it can natively support both long-form and short-form communication needs of your online community.</p>
+<p>For user documentation, see <a href="https://meta.discourse.org/t/discourse-chat/230881">Discourse Chat</a>.</p>
+<p>For developer documentation, see <a href="https://discourse.github.io/discourse/">Discourse Documentation</a>.</p></article>
+    </section>
+
+
+
+
+
+
+  </div>
+</main>
+
+<footer class="layout-footer">
+  <div class="container">
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.0</a>
+  </div>
+</footer>
+
+
+
+<script src="scripts/prism.dev.js"></script>
+</body>
+</html>
\ No newline at end of file
diff --git a/documentation/chat/frontend/lib_collection.js.html b/documentation/chat/frontend/lib_collection.js.html
new file mode 100644
index 00000000000..53d771795cd
--- /dev/null
+++ b/documentation/chat/frontend/lib_collection.js.html
@@ -0,0 +1,178 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Discourse: lib/collection.js</title>
+    
+      <link type="text/css" rel="stylesheet" href="styles/vendor/prism-custom.css">
+    
+    <link type="text/css" rel="stylesheet" href="styles/styles.css">
+    
+</head>
+<body>
+
+<header class="layout-header">
+  
+  <h1>
+    <a href="./index.html">
+      Discourse
+    </a>
+  </h1>
+  <nav class="layout-nav">
+    <ul><li class="nav-heading">Classes</li><li class="nav-heading"><span class="nav-item-type type-class" title="class">C</span><span class="nav-item-name is-class"><a href="PluginApi.html">PluginApi</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="PluginApi.html#decorateChatMessage">decorateChatMessage</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="PluginApi.html#registerChatComposerButton">registerChatComposerButton</a></span></li><li class="nav-heading"><span class="nav-item-type type-class" title="class">C</span><span class="nav-item-name is-class"><a href="module.exports.html">exports</a></span></li></ul><ul><li class="nav-heading">Modules</li><li class="nav-heading"><span class="nav-item-type type-module" title="module">M</span><span class="nav-item-name is-module"><a href="module-ChatApi.html">ChatApi</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#categoryPermissions">categoryPermissions</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#channel">channel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#channels">channels</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#createChannel">createChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#createChannelArchive">createChannelArchive</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#destroyChannel">destroyChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#followChannel">followChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#listChannelMemberships">listChannelMemberships</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#listCurrentUserChannels">listCurrentUserChannels</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#moveChannelMessages">moveChannelMessages</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#sendMessage">sendMessage</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#unfollowChannel">unfollowChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#updateChannel">updateChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#updateChannelStatus">updateChannelStatus</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#updateCurrentUserChannelNotificationsSettings">updateCurrentUserChannelNotificationsSettings</a></span></li></ul><li class="nav-heading"><a href="global.html">Globals</a></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="global.html#load">load</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="global.html#loadMore">loadMore</a></span></li>
+  </nav>
+</header>
+
+
+<main class="layout-main  layout-content--source">
+  <div class="container">
+    <p class="page-kind">source</p>
+    <h1 class="page-title">lib/collection.js</h1>
+    
+
+
+
+    
+
+<section>
+    <article>
+        <pre id="source" class="source-page line-numbers"><code class="language-js">import { ajax } from "discourse/lib/ajax";
+import { tracked } from "@glimmer/tracking";
+import { bind } from "discourse-common/utils/decorators";
+import { Promise } from "rsvp";
+
+/**
+ * Handles a paginated API response.
+ */
+export default class Collection {
+  @tracked items = [];
+  @tracked meta = {};
+  @tracked loading = false;
+
+  constructor(resourceURL, handler) {
+    this._resourceURL = resourceURL;
+    this._handler = handler;
+    this._fetchedAll = false;
+  }
+
+  get loadMoreURL() {
+    return this.meta.load_more_url;
+  }
+
+  get totalRows() {
+    return this.meta.total_rows;
+  }
+
+  get length() {
+    return this.items.length;
+  }
+
+  // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols
+  [Symbol.iterator]() {
+    let index = 0;
+
+    return {
+      next: () => {
+        if (index &lt; this.items.length) {
+          return { value: this.items[index++], done: false };
+        } else {
+          return { done: true };
+        }
+      },
+    };
+  }
+
+  /**
+   * Loads first batch of results
+   * @returns {Promise}
+   */
+  @bind
+  load(params = {}) {
+    this._fetchedAll = false;
+
+    if (this.loading) {
+      return Promise.resolve();
+    }
+
+    this.loading = true;
+
+    const filteredQueryParams = Object.entries(params).filter(
+      ([, v]) => v !== undefined
+    );
+    const queryString = new URLSearchParams(filteredQueryParams).toString();
+
+    const endpoint = this._resourceURL + (queryString ? `?${queryString}` : "");
+    return this.#fetch(endpoint)
+      .then((result) => {
+        this.items = this._handler(result);
+        this.meta = result.meta;
+      })
+      .finally(() => {
+        this.loading = false;
+      });
+  }
+
+  /**
+   * Attempts to load more results
+   * @returns {Promise}
+   */
+  @bind
+  loadMore() {
+    let promise = Promise.resolve();
+
+    if (this.loading) {
+      return promise;
+    }
+
+    if (
+      this._fetchedAll ||
+      (this.totalRows &amp;&amp; this.items.length >= this.totalRows)
+    ) {
+      return promise;
+    }
+
+    this.loading = true;
+
+    if (this.loadMoreURL) {
+      promise = this.#fetch(this.loadMoreURL).then((result) => {
+        const newItems = this._handler(result);
+
+        if (newItems.length) {
+          this.items = this.items.concat(newItems);
+        } else {
+          this._fetchedAll = true;
+        }
+        this.meta = result.meta;
+      });
+    }
+
+    return promise.finally(() => {
+      this.loading = false;
+    });
+  }
+
+  #fetch(url) {
+    return ajax(url, { type: "GET" });
+  }
+}
+</code></pre>
+    </article>
+</section>
+
+
+
+
+  </div>
+</main>
+
+<footer class="layout-footer">
+  <div class="container">
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.0</a>
+  </div>
+</footer>
+
+
+
+<script src="scripts/prism.dev.js"></script>
+</body>
+</html>
diff --git a/documentation/chat/frontend/module-ChatApi.html b/documentation/chat/frontend/module-ChatApi.html
new file mode 100644
index 00000000000..fc73b931c23
--- /dev/null
+++ b/documentation/chat/frontend/module-ChatApi.html
@@ -0,0 +1,3236 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Discourse: ChatApi</title>
+    
+      <link type="text/css" rel="stylesheet" href="styles/vendor/prism-custom.css">
+    
+    <link type="text/css" rel="stylesheet" href="styles/styles.css">
+    
+</head>
+<body>
+
+<header class="layout-header">
+  
+  <h1>
+    <a href="./index.html">
+      Discourse
+    </a>
+  </h1>
+  <nav class="layout-nav">
+    <ul><li class="nav-heading">Classes</li><li class="nav-heading"><span class="nav-item-type type-class" title="class">C</span><span class="nav-item-name is-class"><a href="PluginApi.html">PluginApi</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="PluginApi.html#decorateChatMessage">decorateChatMessage</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="PluginApi.html#registerChatComposerButton">registerChatComposerButton</a></span></li><li class="nav-heading"><span class="nav-item-type type-class" title="class">C</span><span class="nav-item-name is-class"><a href="module.exports.html">exports</a></span></li></ul><ul><li class="nav-heading">Modules</li><li class="nav-heading"><span class="nav-item-type type-module" title="module">M</span><span class="nav-item-name is-module"><a href="module-ChatApi.html">ChatApi</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#categoryPermissions">categoryPermissions</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#channel">channel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#channels">channels</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#createChannel">createChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#createChannelArchive">createChannelArchive</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#destroyChannel">destroyChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#followChannel">followChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#listChannelMemberships">listChannelMemberships</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#listCurrentUserChannels">listCurrentUserChannels</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#moveChannelMessages">moveChannelMessages</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#sendMessage">sendMessage</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#unfollowChannel">unfollowChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#updateChannel">updateChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#updateChannelStatus">updateChannelStatus</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#updateCurrentUserChannelNotificationsSettings">updateCurrentUserChannelNotificationsSettings</a></span></li></ul><li class="nav-heading"><a href="global.html">Globals</a></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="global.html#load">load</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="global.html#loadMore">loadMore</a></span></li>
+  </nav>
+</header>
+
+
+<main class="layout-main ">
+  <div class="container">
+    <p class="page-kind">Module</p>
+    <h1 class="page-title">ChatApi</h1>
+    
+
+
+
+
+<section>
+
+
+<header class="not-class">
+
+
+    
+</header>
+
+<article>
+    <div class="container-overview">
+
+
+
+    
+        
+            <div class="description">Chat API service. Provides methods to interact with the chat API.</div>
+        
+
+        
+
+
+<div class="details">
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+        <h4 class="method-heading">Implements</h4>
+        <ul>
+            
+                <li>{@ember/service}</li>
+            
+        </ul>
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+</div>
+
+
+        
+    
+    </div>
+
+    
+
+    
+
+     
+
+    
+
+    
+
+
+    
+
+    
+        <h3 class="subtitle">Methods</h3>
+
+        
+            
+
+
+    <article class="method">
+
+
+
+
+    
+
+
+    
+
+    <div class="method-type">
+    
+    </div>
+
+    <h4 class="method-name" id="categoryPermissions">categoryPermissions<span class="signature">(categoryId)</span><span class="return-type-signature"> &rarr; {Promise}</span>
+    </h4>
+
+
+
+
+
+<div class="method-description">
+    
+    Lists chat permissions for a category.
+</div>
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Parameters</h4>
+    
+
+<ul class="method-params">
+    
+
+        <li>
+            
+                <span class="param-name">categoryId</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>number</code>
+    </span>
+    
+
+            
+
+            
+
+            
+
+            <div class="param-description">ID of the category.</div>
+            
+        </li>
+
+    
+</ul>
+
+
+
+
+
+<div class="details">
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+</div>
+
+
+
+    <h4 class="method-heading">Returns</h4>
+    <ul>
+    
+        <li class="method-returns">
+            
+                <code>Promise</code>
+            
+            
+        </li>
+    
+    </ul>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Source</h4>
+    <ul>
+        <li class="method-source">
+            <a href="services_chat-api.js.html">services/chat-api.js</a><a href="services_chat-api.js.html#source.107">, line 107</a>
+        </li>
+    </ul>
+
+
+
+    </article>
+
+        
+            
+
+
+    <article class="method">
+
+
+
+
+    
+
+
+    
+
+    <div class="method-type">
+    
+    </div>
+
+    <h4 class="method-name" id="channel">channel<span class="signature">(channelId)</span><span class="return-type-signature"> &rarr; {Promise}</span>
+    </h4>
+
+
+
+
+
+<div class="method-description">
+    
+    Get a channel by its ID.
+</div>
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Parameters</h4>
+    
+
+<ul class="method-params">
+    
+
+        <li>
+            
+                <span class="param-name">channelId</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>number</code>
+    </span>
+    
+
+            
+
+            
+
+            
+
+            <div class="param-description">The ID of the channel.</div>
+            
+        </li>
+
+    
+</ul>
+
+
+
+
+
+<div class="details">
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+</div>
+
+
+
+    <h4 class="method-heading">Returns</h4>
+    <ul>
+    
+        <li class="method-returns">
+            
+                <code>Promise</code>
+            
+            
+        </li>
+    
+    </ul>
+
+
+
+
+    <h4 class="method-heading">Example</h4>
+    
+    <pre><code class="language-js">this.chatApi.channel(1).then(channel => { ... })</code></pre>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Source</h4>
+    <ul>
+        <li class="method-source">
+            <a href="services_chat-api.js.html">services/chat-api.js</a><a href="services_chat-api.js.html#source.24">, line 24</a>
+        </li>
+    </ul>
+
+
+
+    </article>
+
+        
+            
+
+
+    <article class="method">
+
+
+
+
+    
+
+
+    
+
+    <div class="method-type">
+    
+    </div>
+
+    <h4 class="method-name" id="channels">channels<span class="signature">()</span><span class="return-type-signature"> &rarr; {Collection}</span>
+    </h4>
+
+
+
+
+
+<div class="method-description">
+    
+    List all accessible category channels of the current user.
+</div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+<div class="details">
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+</div>
+
+
+
+    <h4 class="method-heading">Returns</h4>
+    <ul>
+    
+        <li class="method-returns">
+            
+                <code>Collection</code>
+            
+            
+        </li>
+    
+    </ul>
+
+
+
+
+    <h4 class="method-heading">Example</h4>
+    
+    <pre><code class="language-js">this.chatApi.channels.then(channels => { ... })</code></pre>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Source</h4>
+    <ul>
+        <li class="method-source">
+            <a href="services_chat-api.js.html">services/chat-api.js</a><a href="services_chat-api.js.html#source.38">, line 38</a>
+        </li>
+    </ul>
+
+
+
+    </article>
+
+        
+            
+
+
+    <article class="method">
+
+
+
+
+    
+
+
+    
+
+    <div class="method-type">
+    
+    </div>
+
+    <h4 class="method-name" id="createChannel">createChannel<span class="signature">(data)</span><span class="return-type-signature"> &rarr; {Promise}</span>
+    </h4>
+
+
+
+
+
+<div class="method-description">
+    
+    Creates a channel.
+</div>
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Parameters</h4>
+    
+
+<ul class="method-params">
+    
+
+        <li>
+            
+                <span class="param-name">data</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>object</code>
+    </span>
+    
+
+            
+
+            
+
+            
+
+            <div class="param-description">Params of the channel.</div>
+            
+                <p class="param-properties">Properties</p>
+                
+
+<ul class="method-params">
+    
+
+        <li>
+            
+                <span class="param-name">name</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>string</code>
+    </span>
+    
+
+            
+
+            
+                <span class="param-attributes">
+                
+
+                
+
+                
+                </span>
+            
+
+            
+
+            <div class="param-description">The name of the channel.</div>
+            
+        </li>
+
+    
+
+        <li>
+            
+                <span class="param-name">chatable_id</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>string</code>
+    </span>
+    
+
+            
+
+            
+                <span class="param-attributes">
+                
+
+                
+
+                
+                </span>
+            
+
+            
+
+            <div class="param-description">The category of the channel.</div>
+            
+        </li>
+
+    
+
+        <li>
+            
+                <span class="param-name">description</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>string</code>
+    </span>
+    
+
+            
+
+            
+                <span class="param-attributes">
+                
+
+                
+
+                
+                </span>
+            
+
+            
+
+            <div class="param-description">The description of the channel.</div>
+            
+        </li>
+
+    
+
+        <li>
+            
+                <span class="param-name">auto_join_users</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>boolean</code>
+    </span>
+    
+
+            
+
+            
+                <span class="param-attributes">
+                
+                    &lt;optional&gt;<br>
+                
+
+                
+
+                
+                </span>
+            
+
+            
+
+            <div class="param-description">Should users join this channel automatically.</div>
+            
+        </li>
+
+    
+</ul>
+            
+        </li>
+
+    
+</ul>
+
+
+
+
+
+<div class="details">
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+</div>
+
+
+
+    <h4 class="method-heading">Returns</h4>
+    <ul>
+    
+        <li class="method-returns">
+            
+                <code>Promise</code>
+            
+            
+        </li>
+    
+    </ul>
+
+
+
+
+    <h4 class="method-heading">Example</h4>
+    
+    <pre><code class="language-js">this.chatApi
+     .createChannel({ name: "foo", chatable_id: 1, description "bar" })
+     .then((channel) => { ... })</code></pre>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Source</h4>
+    <ul>
+        <li class="method-source">
+            <a href="services_chat-api.js.html">services/chat-api.js</a><a href="services_chat-api.js.html#source.96">, line 96</a>
+        </li>
+    </ul>
+
+
+
+    </article>
+
+        
+            
+
+
+    <article class="method">
+
+
+
+
+    
+
+
+    
+
+    <div class="method-type">
+    
+    </div>
+
+    <h4 class="method-name" id="createChannelArchive">createChannelArchive<span class="signature">(channelId, data)</span><span class="return-type-signature"> &rarr; {Promise}</span>
+    </h4>
+
+
+
+
+
+<div class="method-description">
+    
+    Creates a channel archive.
+</div>
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Parameters</h4>
+    
+
+<ul class="method-params">
+    
+
+        <li>
+            
+                <span class="param-name">channelId</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>number</code>
+    </span>
+    
+
+            
+
+            
+
+            
+
+            <div class="param-description">The ID of the channel.</div>
+            
+        </li>
+
+    
+
+        <li>
+            
+                <span class="param-name">data</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>object</code>
+    </span>
+    
+
+            
+
+            
+
+            
+
+            <div class="param-description">Params of the archive.</div>
+            
+                <p class="param-properties">Properties</p>
+                
+
+<ul class="method-params">
+    
+
+        <li>
+            
+                <span class="param-name">selection</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>string</code>
+    </span>
+    
+
+            
+
+            
+                <span class="param-attributes">
+                
+
+                
+
+                
+                </span>
+            
+
+            
+
+            <div class="param-description">"new_topic" or "existing_topic".</div>
+            
+        </li>
+
+    
+
+        <li>
+            
+                <span class="param-name">title</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>string</code>
+    </span>
+    
+
+            
+
+            
+                <span class="param-attributes">
+                
+                    &lt;optional&gt;<br>
+                
+
+                
+
+                
+                </span>
+            
+
+            
+
+            <div class="param-description">Title of the topic when creating a new topic.</div>
+            
+        </li>
+
+    
+
+        <li>
+            
+                <span class="param-name">category_id</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>string</code>
+    </span>
+    
+
+            
+
+            
+                <span class="param-attributes">
+                
+                    &lt;optional&gt;<br>
+                
+
+                
+
+                
+                </span>
+            
+
+            
+
+            <div class="param-description">ID of the category used when creating a new topic.</div>
+            
+        </li>
+
+    
+
+        <li>
+            
+                <span class="param-name">tags</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>Array.&lt;string></code>
+    </span>
+    
+
+            
+
+            
+                <span class="param-attributes">
+                
+                    &lt;optional&gt;<br>
+                
+
+                
+
+                
+                </span>
+            
+
+            
+
+            <div class="param-description">tags used when creating a new topic.</div>
+            
+        </li>
+
+    
+
+        <li>
+            
+                <span class="param-name">topic_id</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>string</code>
+    </span>
+    
+
+            
+
+            
+                <span class="param-attributes">
+                
+                    &lt;optional&gt;<br>
+                
+
+                
+
+                
+                </span>
+            
+
+            
+
+            <div class="param-description">ID of the topic when using an existing topic.</div>
+            
+        </li>
+
+    
+</ul>
+            
+        </li>
+
+    
+</ul>
+
+
+
+
+
+<div class="details">
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+</div>
+
+
+
+    <h4 class="method-heading">Returns</h4>
+    <ul>
+    
+        <li class="method-returns">
+            
+                <code>Promise</code>
+            
+            
+        </li>
+    
+    </ul>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Source</h4>
+    <ul>
+        <li class="method-source">
+            <a href="services_chat-api.js.html">services/chat-api.js</a><a href="services_chat-api.js.html#source.141">, line 141</a>
+        </li>
+    </ul>
+
+
+
+    </article>
+
+        
+            
+
+
+    <article class="method">
+
+
+
+
+    
+
+
+    
+
+    <div class="method-type">
+    
+    </div>
+
+    <h4 class="method-name" id="destroyChannel">destroyChannel<span class="signature">(channelId)</span><span class="return-type-signature"> &rarr; {Promise}</span>
+    </h4>
+
+
+
+
+
+<div class="method-description">
+    
+    Destroys a channel.
+</div>
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Parameters</h4>
+    
+
+<ul class="method-params">
+    
+
+        <li>
+            
+                <span class="param-name">channelId</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>number</code>
+    </span>
+    
+
+            
+
+            
+
+            
+
+            <div class="param-description">The ID of the channel.</div>
+            
+        </li>
+
+    
+</ul>
+
+
+
+
+
+<div class="details">
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+</div>
+
+
+
+    <h4 class="method-heading">Returns</h4>
+    <ul>
+    
+        <li class="method-returns">
+            
+                <code>Promise</code>
+            
+            
+        </li>
+    
+    </ul>
+
+
+
+
+    <h4 class="method-heading">Example</h4>
+    
+    <pre><code class="language-js">this.chatApi.destroyChannel(1).then(() => { ... })</code></pre>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Source</h4>
+    <ul>
+        <li class="method-source">
+            <a href="services_chat-api.js.html">services/chat-api.js</a><a href="services_chat-api.js.html#source.77">, line 77</a>
+        </li>
+    </ul>
+
+
+
+    </article>
+
+        
+            
+
+
+    <article class="method">
+
+
+
+
+    
+
+
+    
+
+    <div class="method-type">
+    
+    </div>
+
+    <h4 class="method-name" id="followChannel">followChannel<span class="signature">(channelId)</span><span class="return-type-signature"> &rarr; {Promise}</span>
+    </h4>
+
+
+
+
+
+<div class="method-description">
+    
+    Makes current user follow a channel.
+</div>
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Parameters</h4>
+    
+
+<ul class="method-params">
+    
+
+        <li>
+            
+                <span class="param-name">channelId</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>number</code>
+    </span>
+    
+
+            
+
+            
+
+            
+
+            <div class="param-description">The ID of the channel.</div>
+            
+        </li>
+
+    
+</ul>
+
+
+
+
+
+<div class="details">
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+</div>
+
+
+
+    <h4 class="method-heading">Returns</h4>
+    <ul>
+    
+        <li class="method-returns">
+            
+                <code>Promise</code>
+            
+            
+        </li>
+    
+    </ul>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Source</h4>
+    <ul>
+        <li class="method-source">
+            <a href="services_chat-api.js.html">services/chat-api.js</a><a href="services_chat-api.js.html#source.202">, line 202</a>
+        </li>
+    </ul>
+
+
+
+    </article>
+
+        
+            
+
+
+    <article class="method">
+
+
+
+
+    
+
+
+    
+
+    <div class="method-type">
+    
+    </div>
+
+    <h4 class="method-name" id="listChannelMemberships">listChannelMemberships<span class="signature">(channelId)</span><span class="return-type-signature"> &rarr; {Collection}</span>
+    </h4>
+
+
+
+
+
+<div class="method-description">
+    
+    Lists members of a channel.
+</div>
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Parameters</h4>
+    
+
+<ul class="method-params">
+    
+
+        <li>
+            
+                <span class="param-name">channelId</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>number</code>
+    </span>
+    
+
+            
+
+            
+
+            
+
+            <div class="param-description">The ID of the channel.</div>
+            
+        </li>
+
+    
+</ul>
+
+
+
+
+
+<div class="details">
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+</div>
+
+
+
+    <h4 class="method-heading">Returns</h4>
+    <ul>
+    
+        <li class="method-returns">
+            
+                <code>Collection</code>
+            
+            
+        </li>
+    
+    </ul>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Source</h4>
+    <ul>
+        <li class="method-source">
+            <a href="services_chat-api.js.html">services/chat-api.js</a><a href="services_chat-api.js.html#source.174">, line 174</a>
+        </li>
+    </ul>
+
+
+
+    </article>
+
+        
+            
+
+
+    <article class="method">
+
+
+
+
+    
+
+
+    
+
+    <div class="method-type">
+    
+    </div>
+
+    <h4 class="method-name" id="listCurrentUserChannels">listCurrentUserChannels<span class="signature">()</span><span class="return-type-signature"> &rarr; {Promise}</span>
+    </h4>
+
+
+
+
+
+<div class="method-description">
+    
+    Lists public and direct message channels of the current user.
+</div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+<div class="details">
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+</div>
+
+
+
+    <h4 class="method-heading">Returns</h4>
+    <ul>
+    
+        <li class="method-returns">
+            
+                <code>Promise</code>
+            
+            
+        </li>
+    
+    </ul>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Source</h4>
+    <ul>
+        <li class="method-source">
+            <a href="services_chat-api.js.html">services/chat-api.js</a><a href="services_chat-api.js.html#source.189">, line 189</a>
+        </li>
+    </ul>
+
+
+
+    </article>
+
+        
+            
+
+
+    <article class="method">
+
+
+
+
+    
+
+
+    
+
+    <div class="method-type">
+    
+    </div>
+
+    <h4 class="method-name" id="moveChannelMessages">moveChannelMessages<span class="signature">(channelId, data)</span><span class="return-type-signature"> &rarr; {Promise}</span>
+    </h4>
+
+
+
+
+
+<div class="method-description">
+    
+    Moves messages from one channel to another.
+</div>
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Parameters</h4>
+    
+
+<ul class="method-params">
+    
+
+        <li>
+            
+                <span class="param-name">channelId</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>number</code>
+    </span>
+    
+
+            
+
+            
+
+            
+
+            <div class="param-description">The ID of the original channel.</div>
+            
+        </li>
+
+    
+
+        <li>
+            
+                <span class="param-name">data</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>object</code>
+    </span>
+    
+
+            
+
+            
+
+            
+
+            <div class="param-description">Params of the move.</div>
+            
+                <p class="param-properties">Properties</p>
+                
+
+<ul class="method-params">
+    
+
+        <li>
+            
+                <span class="param-name">message_ids</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>Array.&lt;number></code>
+    </span>
+    
+
+            
+
+            
+
+            
+
+            <div class="param-description">IDs of the moved messages.</div>
+            
+        </li>
+
+    
+
+        <li>
+            
+                <span class="param-name">destination_channel_id</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>number</code>
+    </span>
+    
+
+            
+
+            
+
+            
+
+            <div class="param-description">ID of the channel where the messages are moved to.</div>
+            
+        </li>
+
+    
+</ul>
+            
+        </li>
+
+    
+</ul>
+
+
+
+
+
+<div class="details">
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+</div>
+
+
+
+    <h4 class="method-heading">Returns</h4>
+    <ul>
+    
+        <li class="method-returns">
+            
+                <code>Promise</code>
+            
+            
+        </li>
+    
+    </ul>
+
+
+
+
+    <h4 class="method-heading">Example</h4>
+    
+    <pre><code class="language-js">this.chatApi
+    .moveChannelMessages(1, {
+      message_ids: [2, 3],
+      destination_channel_id: 4,
+    }).then(() => { ... })</code></pre>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Source</h4>
+    <ul>
+        <li class="method-source">
+            <a href="services_chat-api.js.html">services/chat-api.js</a><a href="services_chat-api.js.html#source.62">, line 62</a>
+        </li>
+    </ul>
+
+
+
+    </article>
+
+        
+            
+
+
+    <article class="method">
+
+
+
+
+    
+
+
+    
+
+    <div class="method-type">
+    
+    </div>
+
+    <h4 class="method-name" id="sendMessage">sendMessage<span class="signature">(channelId, data)</span><span class="return-type-signature"> &rarr; {Promise}</span>
+    </h4>
+
+
+
+
+
+<div class="method-description">
+    
+    Sends a message.
+</div>
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Parameters</h4>
+    
+
+<ul class="method-params">
+    
+
+        <li>
+            
+                <span class="param-name">channelId</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>number</code>
+    </span>
+    
+
+            
+
+            
+
+            
+
+            <div class="param-description">ID of the channel.</div>
+            
+        </li>
+
+    
+
+        <li>
+            
+                <span class="param-name">data</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>object</code>
+    </span>
+    
+
+            
+
+            
+
+            
+
+            <div class="param-description">Params of the message.</div>
+            
+                <p class="param-properties">Properties</p>
+                
+
+<ul class="method-params">
+    
+
+        <li>
+            
+                <span class="param-name">message</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>string</code>
+    </span>
+    
+
+            
+
+            
+                <span class="param-attributes">
+                
+
+                
+
+                
+                </span>
+            
+
+            
+
+            <div class="param-description">The raw content of the message in markdown.</div>
+            
+        </li>
+
+    
+
+        <li>
+            
+                <span class="param-name">cooked</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>string</code>
+    </span>
+    
+
+            
+
+            
+                <span class="param-attributes">
+                
+
+                
+
+                
+                </span>
+            
+
+            
+
+            <div class="param-description">The cooked content of the message.</div>
+            
+        </li>
+
+    
+
+        <li>
+            
+                <span class="param-name">in_reply_to_id</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>number</code>
+    </span>
+    
+
+            
+
+            
+                <span class="param-attributes">
+                
+                    &lt;optional&gt;<br>
+                
+
+                
+
+                
+                </span>
+            
+
+            
+
+            <div class="param-description">The ID of the replied-to message.</div>
+            
+        </li>
+
+    
+
+        <li>
+            
+                <span class="param-name">staged_id</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>number</code>
+    </span>
+    
+
+            
+
+            
+                <span class="param-attributes">
+                
+                    &lt;optional&gt;<br>
+                
+
+                
+
+                
+                </span>
+            
+
+            
+
+            <div class="param-description">The staged ID of the message before it was persisted.</div>
+            
+        </li>
+
+    
+
+        <li>
+            
+                <span class="param-name">upload_ids</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>Array.&lt;number></code>
+    </span>
+    
+
+            
+
+            
+                <span class="param-attributes">
+                
+                    &lt;optional&gt;<br>
+                
+
+                
+
+                
+                </span>
+            
+
+            
+
+            <div class="param-description">Array of upload ids linked to the message.</div>
+            
+        </li>
+
+    
+</ul>
+            
+        </li>
+
+    
+</ul>
+
+
+
+
+
+<div class="details">
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+</div>
+
+
+
+    <h4 class="method-heading">Returns</h4>
+    <ul>
+    
+        <li class="method-returns">
+            
+                <code>Promise</code>
+            
+            
+        </li>
+    
+    </ul>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Source</h4>
+    <ul>
+        <li class="method-source">
+            <a href="services_chat-api.js.html">services/chat-api.js</a><a href="services_chat-api.js.html#source.122">, line 122</a>
+        </li>
+    </ul>
+
+
+
+    </article>
+
+        
+            
+
+
+    <article class="method">
+
+
+
+
+    
+
+
+    
+
+    <div class="method-type">
+    
+    </div>
+
+    <h4 class="method-name" id="unfollowChannel">unfollowChannel<span class="signature">(channelId)</span><span class="return-type-signature"> &rarr; {Promise}</span>
+    </h4>
+
+
+
+
+
+<div class="method-description">
+    
+    Makes current user unfollow a channel.
+</div>
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Parameters</h4>
+    
+
+<ul class="method-params">
+    
+
+        <li>
+            
+                <span class="param-name">channelId</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>number</code>
+    </span>
+    
+
+            
+
+            
+
+            
+
+            <div class="param-description">The ID of the channel.</div>
+            
+        </li>
+
+    
+</ul>
+
+
+
+
+
+<div class="details">
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+</div>
+
+
+
+    <h4 class="method-heading">Returns</h4>
+    <ul>
+    
+        <li class="method-returns">
+            
+                <code>Promise</code>
+            
+            
+        </li>
+    
+    </ul>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Source</h4>
+    <ul>
+        <li class="method-source">
+            <a href="services_chat-api.js.html">services/chat-api.js</a><a href="services_chat-api.js.html#source.213">, line 213</a>
+        </li>
+    </ul>
+
+
+
+    </article>
+
+        
+            
+
+
+    <article class="method">
+
+
+
+
+    
+
+
+    
+
+    <div class="method-type">
+    
+    </div>
+
+    <h4 class="method-name" id="updateChannel">updateChannel<span class="signature">(channelId, data)</span><span class="return-type-signature"> &rarr; {Promise}</span>
+    </h4>
+
+
+
+
+
+<div class="method-description">
+    
+    Updates a channel.
+</div>
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Parameters</h4>
+    
+
+<ul class="method-params">
+    
+
+        <li>
+            
+                <span class="param-name">channelId</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>number</code>
+    </span>
+    
+
+            
+
+            
+
+            
+
+            <div class="param-description">The ID of the channel.</div>
+            
+        </li>
+
+    
+
+        <li>
+            
+                <span class="param-name">data</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>object</code>
+    </span>
+    
+
+            
+
+            
+
+            
+
+            <div class="param-description">Params of the archive.</div>
+            
+                <p class="param-properties">Properties</p>
+                
+
+<ul class="method-params">
+    
+
+        <li>
+            
+                <span class="param-name">description</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>string</code>
+    </span>
+    
+
+            
+
+            
+                <span class="param-attributes">
+                
+                    &lt;optional&gt;<br>
+                
+
+                
+
+                
+                </span>
+            
+
+            
+
+            <div class="param-description">Description of the channel.</div>
+            
+        </li>
+
+    
+
+        <li>
+            
+                <span class="param-name">name</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>string</code>
+    </span>
+    
+
+            
+
+            
+                <span class="param-attributes">
+                
+                    &lt;optional&gt;<br>
+                
+
+                
+
+                
+                </span>
+            
+
+            
+
+            <div class="param-description">Name of the channel.</div>
+            
+        </li>
+
+    
+</ul>
+            
+        </li>
+
+    
+</ul>
+
+
+
+
+
+<div class="details">
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+</div>
+
+
+
+    <h4 class="method-heading">Returns</h4>
+    <ul>
+    
+        <li class="method-returns">
+            
+                <code>Promise</code>
+            
+            
+        </li>
+    
+    </ul>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Source</h4>
+    <ul>
+        <li class="method-source">
+            <a href="services_chat-api.js.html">services/chat-api.js</a><a href="services_chat-api.js.html#source.155">, line 155</a>
+        </li>
+    </ul>
+
+
+
+    </article>
+
+        
+            
+
+
+    <article class="method">
+
+
+
+
+    
+
+
+    
+
+    <div class="method-type">
+    
+    </div>
+
+    <h4 class="method-name" id="updateChannelStatus">updateChannelStatus<span class="signature">(channelId, status)</span><span class="return-type-signature"> &rarr; {Promise}</span>
+    </h4>
+
+
+
+
+
+<div class="method-description">
+    
+    Updates the status of a channel.
+</div>
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Parameters</h4>
+    
+
+<ul class="method-params">
+    
+
+        <li>
+            
+                <span class="param-name">channelId</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>number</code>
+    </span>
+    
+
+            
+
+            
+
+            
+
+            <div class="param-description">The ID of the channel.</div>
+            
+        </li>
+
+    
+
+        <li>
+            
+                <span class="param-name">status</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>string</code>
+    </span>
+    
+
+            
+
+            
+
+            
+
+            <div class="param-description">The new status, can be "open" or "closed".</div>
+            
+        </li>
+
+    
+</ul>
+
+
+
+
+
+<div class="details">
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+</div>
+
+
+
+    <h4 class="method-heading">Returns</h4>
+    <ul>
+    
+        <li class="method-returns">
+            
+                <code>Promise</code>
+            
+            
+        </li>
+    
+    </ul>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Source</h4>
+    <ul>
+        <li class="method-source">
+            <a href="services_chat-api.js.html">services/chat-api.js</a><a href="services_chat-api.js.html#source.165">, line 165</a>
+        </li>
+    </ul>
+
+
+
+    </article>
+
+        
+            
+
+
+    <article class="method">
+
+
+
+
+    
+
+
+    
+
+    <div class="method-type">
+    
+    </div>
+
+    <h4 class="method-name" id="updateCurrentUserChannelNotificationsSettings">updateCurrentUserChannelNotificationsSettings<span class="signature">(channelId, data)</span><span class="return-type-signature"> &rarr; {Promise}</span>
+    </h4>
+
+
+
+
+
+<div class="method-description">
+    
+    Update notifications settings of current user for a channel.
+</div>
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Parameters</h4>
+    
+
+<ul class="method-params">
+    
+
+        <li>
+            
+                <span class="param-name">channelId</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>number</code>
+    </span>
+    
+
+            
+
+            
+
+            
+
+            <div class="param-description">The ID of the channel.</div>
+            
+        </li>
+
+    
+
+        <li>
+            
+                <span class="param-name">data</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>object</code>
+    </span>
+    
+
+            
+
+            
+
+            
+
+            <div class="param-description">The settings to modify.</div>
+            
+                <p class="param-properties">Properties</p>
+                
+
+<ul class="method-params">
+    
+
+        <li>
+            
+                <span class="param-name">muted</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>boolean</code>
+    </span>
+    
+
+            
+
+            
+                <span class="param-attributes">
+                
+                    &lt;optional&gt;<br>
+                
+
+                
+
+                
+                </span>
+            
+
+            
+
+            <div class="param-description">Mutes the channel.</div>
+            
+        </li>
+
+    
+
+        <li>
+            
+                <span class="param-name">desktop_notification_level</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>string</code>
+    </span>
+    
+
+            
+
+            
+                <span class="param-attributes">
+                
+                    &lt;optional&gt;<br>
+                
+
+                
+
+                
+                </span>
+            
+
+            
+
+            <div class="param-description">Notifications level on desktop: never, mention or always.</div>
+            
+        </li>
+
+    
+
+        <li>
+            
+                <span class="param-name">mobile_notification_level</span>
+            
+
+            
+                
+
+
+    <span class="param-type">
+        <code>string</code>
+    </span>
+    
+
+            
+
+            
+                <span class="param-attributes">
+                
+                    &lt;optional&gt;<br>
+                
+
+                
+
+                
+                </span>
+            
+
+            
+
+            <div class="param-description">Notifications level on mobile: never, mention or always.</div>
+            
+        </li>
+
+    
+</ul>
+            
+        </li>
+
+    
+</ul>
+
+
+
+
+
+<div class="details">
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+</div>
+
+
+
+    <h4 class="method-heading">Returns</h4>
+    <ul>
+    
+        <li class="method-returns">
+            
+                <code>Promise</code>
+            
+            
+        </li>
+    
+    </ul>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Source</h4>
+    <ul>
+        <li class="method-source">
+            <a href="services_chat-api.js.html">services/chat-api.js</a><a href="services_chat-api.js.html#source.228">, line 228</a>
+        </li>
+    </ul>
+
+
+
+    </article>
+
+        
+    
+
+    
+
+    
+</article>
+
+</section>
+
+
+
+
+  </div>
+</main>
+
+<footer class="layout-footer">
+  <div class="container">
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.0</a>
+  </div>
+</footer>
+
+
+
+<script src="scripts/prism.dev.js"></script>
+</body>
+</html>
\ No newline at end of file
diff --git a/documentation/chat/frontend/module.exports.html b/documentation/chat/frontend/module.exports.html
new file mode 100644
index 00000000000..fb56f529cb8
--- /dev/null
+++ b/documentation/chat/frontend/module.exports.html
@@ -0,0 +1,198 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Discourse: exports</title>
+    
+      <link type="text/css" rel="stylesheet" href="styles/vendor/prism-custom.css">
+    
+    <link type="text/css" rel="stylesheet" href="styles/styles.css">
+    
+</head>
+<body>
+
+<header class="layout-header">
+  
+  <h1>
+    <a href="./index.html">
+      Discourse
+    </a>
+  </h1>
+  <nav class="layout-nav">
+    <ul><li class="nav-heading">Classes</li><li class="nav-heading"><span class="nav-item-type type-class" title="class">C</span><span class="nav-item-name is-class"><a href="PluginApi.html">PluginApi</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="PluginApi.html#decorateChatMessage">decorateChatMessage</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="PluginApi.html#registerChatComposerButton">registerChatComposerButton</a></span></li><li class="nav-heading"><span class="nav-item-type type-class" title="class">C</span><span class="nav-item-name is-class"><a href="module.exports.html">exports</a></span></li></ul><ul><li class="nav-heading">Modules</li><li class="nav-heading"><span class="nav-item-type type-module" title="module">M</span><span class="nav-item-name is-module"><a href="module-ChatApi.html">ChatApi</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#categoryPermissions">categoryPermissions</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#channel">channel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#channels">channels</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#createChannel">createChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#createChannelArchive">createChannelArchive</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#destroyChannel">destroyChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#followChannel">followChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#listChannelMemberships">listChannelMemberships</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#listCurrentUserChannels">listCurrentUserChannels</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#moveChannelMessages">moveChannelMessages</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#sendMessage">sendMessage</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#unfollowChannel">unfollowChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#updateChannel">updateChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#updateChannelStatus">updateChannelStatus</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#updateCurrentUserChannelNotificationsSettings">updateCurrentUserChannelNotificationsSettings</a></span></li></ul><li class="nav-heading"><a href="global.html">Globals</a></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="global.html#load">load</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="global.html#loadMore">loadMore</a></span></li>
+  </nav>
+</header>
+
+
+<main class="layout-main ">
+  <div class="container">
+    <p class="page-kind">Class</p>
+    <h1 class="page-title">exports</h1>
+    
+
+
+
+
+<section>
+
+
+<header class="class">
+
+
+    
+        
+        <!-- <h2>exports</h2> -->
+
+        
+
+        
+
+        
+            
+            <div class="class-description">Handles a paginated API response.</div>
+        
+    
+</header>
+
+<article>
+    <div class="container-overview">
+
+
+
+    
+        
+
+
+
+
+
+    
+
+
+    
+    <h3 class="subtitle">Constructor</h3>
+    
+
+    <div class="method-type">
+    
+    </div>
+
+    <h4 class="method-name" id="exports">new exports<span class="signature">()</span><span class="return-type-signature"></span>
+    </h4>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<div class="details">
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+</div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <h4 class="method-heading">Source</h4>
+    <ul>
+        <li class="method-source">
+            <a href="lib_collection.js.html">lib/collection.js</a><a href="lib_collection.js.html#source.9">, line 9</a>
+        </li>
+    </ul>
+
+
+
+    
+    </div>
+
+    
+
+    
+
+     
+
+    
+
+    
+
+
+    
+
+    
+
+    
+
+    
+</article>
+
+</section>
+
+
+
+
+  </div>
+</main>
+
+<footer class="layout-footer">
+  <div class="container">
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.0</a>
+  </div>
+</footer>
+
+
+
+<script src="scripts/prism.dev.js"></script>
+</body>
+</html>
\ No newline at end of file
diff --git a/documentation/chat/frontend/pre-initializers_chat-plugin-api.js.html b/documentation/chat/frontend/pre-initializers_chat-plugin-api.js.html
new file mode 100644
index 00000000000..d78c363d0a4
--- /dev/null
+++ b/documentation/chat/frontend/pre-initializers_chat-plugin-api.js.html
@@ -0,0 +1,156 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Discourse: pre-initializers/chat-plugin-api.js</title>
+    
+      <link type="text/css" rel="stylesheet" href="styles/vendor/prism-custom.css">
+    
+    <link type="text/css" rel="stylesheet" href="styles/styles.css">
+    
+</head>
+<body>
+
+<header class="layout-header">
+  
+  <h1>
+    <a href="./index.html">
+      Discourse
+    </a>
+  </h1>
+  <nav class="layout-nav">
+    <ul><li class="nav-heading">Classes</li><li class="nav-heading"><span class="nav-item-type type-class" title="class">C</span><span class="nav-item-name is-class"><a href="PluginApi.html">PluginApi</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="PluginApi.html#decorateChatMessage">decorateChatMessage</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="PluginApi.html#registerChatComposerButton">registerChatComposerButton</a></span></li><li class="nav-heading"><span class="nav-item-type type-class" title="class">C</span><span class="nav-item-name is-class"><a href="module.exports.html">exports</a></span></li></ul><ul><li class="nav-heading">Modules</li><li class="nav-heading"><span class="nav-item-type type-module" title="module">M</span><span class="nav-item-name is-module"><a href="module-ChatApi.html">ChatApi</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#categoryPermissions">categoryPermissions</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#channel">channel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#channels">channels</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#createChannel">createChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#createChannelArchive">createChannelArchive</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#destroyChannel">destroyChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#followChannel">followChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#listChannelMemberships">listChannelMemberships</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#listCurrentUserChannels">listCurrentUserChannels</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#moveChannelMessages">moveChannelMessages</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#sendMessage">sendMessage</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#unfollowChannel">unfollowChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#updateChannel">updateChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#updateChannelStatus">updateChannelStatus</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#updateCurrentUserChannelNotificationsSettings">updateCurrentUserChannelNotificationsSettings</a></span></li></ul><li class="nav-heading"><a href="global.html">Globals</a></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="global.html#load">load</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="global.html#loadMore">loadMore</a></span></li>
+  </nav>
+</header>
+
+
+<main class="layout-main  layout-content--source">
+  <div class="container">
+    <p class="page-kind">source</p>
+    <h1 class="page-title">pre-initializers/chat-plugin-api.js</h1>
+    
+
+
+
+    
+
+<section>
+    <article>
+        <pre id="source" class="source-page line-numbers"><code class="language-js">import { withPluginApi } from "discourse/lib/plugin-api";
+import {
+  addChatMessageDecorator,
+  resetChatMessageDecorators,
+} from "discourse/plugins/chat/discourse/components/chat-message";
+import { registerChatComposerButton } from "discourse/plugins/chat/discourse/lib/chat-composer-buttons";
+
+/**
+ * Class exposing the javascript API available to plugins and themes.
+ * @class PluginApi
+ */
+
+/**
+ * Callback used to decorate a chat message
+ *
+ * @callback PluginApi~decorateChatMessageCallback
+ * @param {ChatMessage} chatMessage - model
+ * @param {HTMLElement} messageContainer - DOM node
+ * @param {ChatChannel} chatChannel - model
+ */
+
+/**
+ * Decorate a chat message
+ *
+ * @memberof PluginApi
+ * @instance
+ * @function decorateChatMessage
+ * @param {PluginApi~decorateChatMessageCallback} decorator
+ * @example
+ *
+ * api.decorateChatMessage((chatMessage, messageContainer) => {
+ *   messageContainer.dataset.foo = chatMessage.id;
+ * });
+ */
+
+/**
+ * Register a button in the chat composer
+ *
+ * @memberof PluginApi
+ * @instance
+ * @function registerChatComposerButton
+ * @param {Object} options
+ * @param {number} options.id - The id of the button
+ * @param {function} options.action - An action name or an anonymous function called when the button is pressed, eg: "onFooClicked" or `() => { console.log("clicked") }`
+ * @param {string} options.icon - A valid font awesome icon name, eg: "far fa-image"
+ * @param {string} options.label - Text displayed on the button, a translatable key, eg: "foo.bar"
+ * @param {string} options.translatedLabel - Text displayed on the button, a string, eg: "Add gifs"
+ * @param {string} [options.position] - Can be "inline" or "dropdown", defaults to "inline"
+ * @param {string} [options.title] - Title attribute of the button, a translatable key, eg: "foo.bar"
+ * @param {string} [options.translatedTitle] - Title attribute of the button, a string, eg: "Add gifs"
+ * @param {string} [options.ariaLabel] - aria-label attribute of the button, a translatable key, eg: "foo.bar"
+ * @param {string} [options.translatedAriaLabel] - aria-label attribute of the button, a string, eg: "Add gifs"
+ * @param {string} [options.classNames] - Additional names to add to the button’s class attribute, eg: ["foo", "bar"]
+ * @param {boolean} [options.displayed] - Hide or show the button
+ * @param {boolean} [options.disabled] - Sets the disabled attribute on the button
+ * @param {number} [options.priority] - An integer defining the order of the buttons, higher comes first, eg: `700`
+ * @param {Array.&lt;string>} [options.dependentKeys] - List of property names which should trigger a refresh of the buttons when changed, eg: `["foo.bar", "bar.baz"]`
+ * @example
+ *
+ * api.registerChatComposerButton({
+ *   id: "foo",
+ *   displayed() {
+ *     return this.site.mobileView &amp;&amp; this.canAttachUploads;
+ *   }
+ * });
+ */
+
+export default {
+  name: "chat-plugin-api",
+  after: "inject-discourse-objects",
+
+  initialize() {
+    withPluginApi("1.2.0", (api) => {
+      const apiPrototype = Object.getPrototypeOf(api);
+
+      if (!apiPrototype.hasOwnProperty("decorateChatMessage")) {
+        Object.defineProperty(apiPrototype, "decorateChatMessage", {
+          value(decorator) {
+            addChatMessageDecorator(decorator);
+          },
+        });
+      }
+
+      if (!apiPrototype.hasOwnProperty("registerChatComposerButton")) {
+        Object.defineProperty(apiPrototype, "registerChatComposerButton", {
+          value(button) {
+            registerChatComposerButton(button);
+          },
+        });
+      }
+    });
+  },
+
+  teardown() {
+    resetChatMessageDecorators();
+  },
+};
+</code></pre>
+    </article>
+</section>
+
+
+
+
+  </div>
+</main>
+
+<footer class="layout-footer">
+  <div class="container">
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.0</a>
+  </div>
+</footer>
+
+
+
+<script src="scripts/prism.dev.js"></script>
+</body>
+</html>
diff --git a/documentation/chat/frontend/scripts/prism-linenumbers.js b/documentation/chat/frontend/scripts/prism-linenumbers.js
new file mode 100644
index 00000000000..67ede74adfc
--- /dev/null
+++ b/documentation/chat/frontend/scripts/prism-linenumbers.js
@@ -0,0 +1,57 @@
+(function() {
+
+if (typeof self === 'undefined' || !self.Prism || !self.document) {
+  return;
+}
+
+Prism.hooks.add('complete', function (env) {
+  if (!env.code) {
+    return;
+  }
+
+  // works only for <code> wrapped inside <pre> (not inline)
+  var pre = env.element.parentNode;
+  var clsReg = /\s*\bline-numbers\b\s*/;
+  if (
+    !pre || !/pre/i.test(pre.nodeName) ||
+      // Abort only if nor the <pre> nor the <code> have the class
+    (!clsReg.test(pre.className) && !clsReg.test(env.element.className))
+  ) {
+    return;
+  }
+
+  if (env.element.querySelector(".line-numbers-rows")) {
+    // Abort if line numbers already exists
+    return;
+  }
+
+  if (clsReg.test(env.element.className)) {
+    // Remove the class "line-numbers" from the <code>
+    env.element.className = env.element.className.replace(clsReg, '');
+  }
+  if (!clsReg.test(pre.className)) {
+    // Add the class "line-numbers" to the <pre>
+    pre.className += ' line-numbers';
+  }
+
+  var match = env.code.match(/\n(?!$)/g);
+  var linesNum = match ? match.length + 1 : 1;
+  var lineNumbersWrapper;
+
+  var lines = new Array(linesNum + 1);
+  lines = lines.join('<span></span>');
+
+  lineNumbersWrapper = document.createElement('span');
+  lineNumbersWrapper.setAttribute('aria-hidden', 'true');
+  lineNumbersWrapper.className = 'line-numbers-rows';
+  lineNumbersWrapper.innerHTML = lines;
+
+  if (pre.hasAttribute('data-start')) {
+    pre.style.counterReset = 'linenumber ' + (parseInt(pre.getAttribute('data-start'), 10) - 1);
+  }
+
+  env.element.appendChild(lineNumbersWrapper);
+
+});
+
+}());
\ No newline at end of file
diff --git a/documentation/chat/frontend/scripts/prism.dev.js b/documentation/chat/frontend/scripts/prism.dev.js
new file mode 100644
index 00000000000..beb5e5827f7
--- /dev/null
+++ b/documentation/chat/frontend/scripts/prism.dev.js
@@ -0,0 +1,1115 @@
+/* PrismJS 1.13.0
+http://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript+json&plugins=line-highlight+line-numbers */
+var _self = (typeof window !== 'undefined')
+	? window   // if in browser
+	: (
+		(typeof WorkerGlobalScope !== 'undefined' && self instanceof WorkerGlobalScope)
+		? self // if in worker
+		: {}   // if in node js
+	);
+
+/**
+ * Prism: Lightweight, robust, elegant syntax highlighting
+ * MIT license http://www.opensource.org/licenses/mit-license.php/
+ * @author Lea Verou http://lea.verou.me
+ */
+
+var Prism = (function(){
+
+// Private helper vars
+var lang = /\blang(?:uage)?-(\w+)\b/i;
+var uniqueId = 0;
+
+var _ = _self.Prism = {
+	manual: _self.Prism && _self.Prism.manual,
+	disableWorkerMessageHandler: _self.Prism && _self.Prism.disableWorkerMessageHandler,
+	util: {
+		encode: function (tokens) {
+			if (tokens instanceof Token) {
+				return new Token(tokens.type, _.util.encode(tokens.content), tokens.alias);
+			} else if (_.util.type(tokens) === 'Array') {
+				return tokens.map(_.util.encode);
+			} else {
+				return tokens.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/\u00a0/g, ' ');
+			}
+		},
+
+		type: function (o) {
+			return Object.prototype.toString.call(o).match(/\[object (\w+)\]/)[1];
+		},
+
+		objId: function (obj) {
+			if (!obj['__id']) {
+				Object.defineProperty(obj, '__id', { value: ++uniqueId });
+			}
+			return obj['__id'];
+		},
+
+		// Deep clone a language definition (e.g. to extend it)
+		clone: function (o, visited) {
+			var type = _.util.type(o);
+			visited = visited || {};
+
+			switch (type) {
+				case 'Object':
+					if (visited[_.util.objId(o)]) {
+						return visited[_.util.objId(o)];
+					}
+					var clone = {};
+					visited[_.util.objId(o)] = clone;
+
+					for (var key in o) {
+						if (o.hasOwnProperty(key)) {
+							clone[key] = _.util.clone(o[key], visited);
+						}
+					}
+
+					return clone;
+
+				case 'Array':
+					if (visited[_.util.objId(o)]) {
+						return visited[_.util.objId(o)];
+					}
+					var clone = [];
+					visited[_.util.objId(o)] = clone;
+
+					o.forEach(function (v, i) {
+						clone[i] = _.util.clone(v, visited);
+					});
+
+					return clone;
+			}
+
+			return o;
+		}
+	},
+
+	languages: {
+		extend: function (id, redef) {
+			var lang = _.util.clone(_.languages[id]);
+
+			for (var key in redef) {
+				lang[key] = redef[key];
+			}
+
+			return lang;
+		},
+
+		/**
+		 * Insert a token before another token in a language literal
+		 * As this needs to recreate the object (we cannot actually insert before keys in object literals),
+		 * we cannot just provide an object, we need anobject and a key.
+		 * @param inside The key (or language id) of the parent
+		 * @param before The key to insert before. If not provided, the function appends instead.
+		 * @param insert Object with the key/value pairs to insert
+		 * @param root The object that contains `inside`. If equal to Prism.languages, it can be omitted.
+		 */
+		insertBefore: function (inside, before, insert, root) {
+			root = root || _.languages;
+			var grammar = root[inside];
+
+			if (arguments.length == 2) {
+				insert = arguments[1];
+
+				for (var newToken in insert) {
+					if (insert.hasOwnProperty(newToken)) {
+						grammar[newToken] = insert[newToken];
+					}
+				}
+
+				return grammar;
+			}
+
+			var ret = {};
+
+			for (var token in grammar) {
+
+				if (grammar.hasOwnProperty(token)) {
+
+					if (token == before) {
+
+						for (var newToken in insert) {
+
+							if (insert.hasOwnProperty(newToken)) {
+								ret[newToken] = insert[newToken];
+							}
+						}
+					}
+
+					ret[token] = grammar[token];
+				}
+			}
+
+			// Update references in other language definitions
+			_.languages.DFS(_.languages, function(key, value) {
+				if (value === root[inside] && key != inside) {
+					this[key] = ret;
+				}
+			});
+
+			return root[inside] = ret;
+		},
+
+		// Traverse a language definition with Depth First Search
+		DFS: function(o, callback, type, visited) {
+			visited = visited || {};
+			for (var i in o) {
+				if (o.hasOwnProperty(i)) {
+					callback.call(o, i, o[i], type || i);
+
+					if (_.util.type(o[i]) === 'Object' && !visited[_.util.objId(o[i])]) {
+						visited[_.util.objId(o[i])] = true;
+						_.languages.DFS(o[i], callback, null, visited);
+					}
+					else if (_.util.type(o[i]) === 'Array' && !visited[_.util.objId(o[i])]) {
+						visited[_.util.objId(o[i])] = true;
+						_.languages.DFS(o[i], callback, i, visited);
+					}
+				}
+			}
+		}
+	},
+	plugins: {},
+
+	highlightAll: function(async, callback) {
+		_.highlightAllUnder(document, async, callback);
+	},
+
+	highlightAllUnder: function(container, async, callback) {
+		var env = {
+			callback: callback,
+			selector: 'code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code'
+		};
+
+		_.hooks.run("before-highlightall", env);
+
+		var elements = env.elements || container.querySelectorAll(env.selector);
+
+		for (var i=0, element; element = elements[i++];) {
+			_.highlightElement(element, async === true, env.callback);
+		}
+	},
+
+	highlightElement: function(element, async, callback) {
+		// Find language
+		var language, grammar, parent = element;
+
+		while (parent && !lang.test(parent.className)) {
+			parent = parent.parentNode;
+		}
+
+		if (parent) {
+			language = (parent.className.match(lang) || [,''])[1].toLowerCase();
+			grammar = _.languages[language];
+		}
+
+		// Set language on the element, if not present
+		element.className = element.className.replace(lang, '').replace(/\s+/g, ' ') + ' language-' + language;
+
+		if (element.parentNode) {
+			// Set language on the parent, for styling
+			parent = element.parentNode;
+
+			if (/pre/i.test(parent.nodeName)) {
+				parent.className = parent.className.replace(lang, '').replace(/\s+/g, ' ') + ' language-' + language;
+			}
+		}
+
+		var code = element.textContent;
+
+		var env = {
+			element: element,
+			language: language,
+			grammar: grammar,
+			code: code
+		};
+
+		_.hooks.run('before-sanity-check', env);
+
+		if (!env.code || !env.grammar) {
+			if (env.code) {
+				_.hooks.run('before-highlight', env);
+				env.element.textContent = env.code;
+				_.hooks.run('after-highlight', env);
+			}
+			_.hooks.run('complete', env);
+			return;
+		}
+
+		_.hooks.run('before-highlight', env);
+
+		if (async && _self.Worker) {
+			var worker = new Worker(_.filename);
+
+			worker.onmessage = function(evt) {
+				env.highlightedCode = evt.data;
+
+				_.hooks.run('before-insert', env);
+
+				env.element.innerHTML = env.highlightedCode;
+
+				callback && callback.call(env.element);
+				_.hooks.run('after-highlight', env);
+				_.hooks.run('complete', env);
+			};
+
+			worker.postMessage(JSON.stringify({
+				language: env.language,
+				code: env.code,
+				immediateClose: true
+			}));
+		}
+		else {
+			env.highlightedCode = _.highlight(env.code, env.grammar, env.language);
+
+			_.hooks.run('before-insert', env);
+
+			env.element.innerHTML = env.highlightedCode;
+
+			callback && callback.call(element);
+
+			_.hooks.run('after-highlight', env);
+			_.hooks.run('complete', env);
+		}
+	},
+
+	highlight: function (text, grammar, language) {
+		var env = {
+			code: text,
+			grammar: grammar,
+			language: language
+		};
+		_.hooks.run('before-tokenize', env);
+		env.tokens = _.tokenize(env.code, env.grammar);
+		_.hooks.run('after-tokenize', env);
+		return Token.stringify(_.util.encode(env.tokens), env.language);
+	},
+
+	matchGrammar: function (text, strarr, grammar, index, startPos, oneshot, target) {
+		var Token = _.Token;
+
+		for (var token in grammar) {
+			if(!grammar.hasOwnProperty(token) || !grammar[token]) {
+				continue;
+			}
+
+			if (token == target) {
+				return;
+			}
+
+			var patterns = grammar[token];
+			patterns = (_.util.type(patterns) === "Array") ? patterns : [patterns];
+
+			for (var j = 0; j < patterns.length; ++j) {
+				var pattern = patterns[j],
+					inside = pattern.inside,
+					lookbehind = !!pattern.lookbehind,
+					greedy = !!pattern.greedy,
+					lookbehindLength = 0,
+					alias = pattern.alias;
+
+				if (greedy && !pattern.pattern.global) {
+					// Without the global flag, lastIndex won't work
+					var flags = pattern.pattern.toString().match(/[imuy]*$/)[0];
+					pattern.pattern = RegExp(pattern.pattern.source, flags + "g");
+				}
+
+				pattern = pattern.pattern || pattern;
+
+				// Don’t cache length as it changes during the loop
+				for (var i = index, pos = startPos; i < strarr.length; pos += strarr[i].length, ++i) {
+
+					var str = strarr[i];
+
+					if (strarr.length > text.length) {
+						// Something went terribly wrong, ABORT, ABORT!
+						return;
+					}
+
+					if (str instanceof Token) {
+						continue;
+					}
+
+					if (greedy && i != strarr.length - 1) {
+						pattern.lastIndex = pos;
+						var match = pattern.exec(text);
+						if (!match) {
+							break;
+						}
+
+						var from = match.index + (lookbehind ? match[1].length : 0),
+						    to = match.index + match[0].length,
+						    k = i,
+						    p = pos;
+
+						for (var len = strarr.length; k < len && (p < to || (!strarr[k].type && !strarr[k - 1].greedy)); ++k) {
+							p += strarr[k].length;
+							// Move the index i to the element in strarr that is closest to from
+							if (from >= p) {
+								++i;
+								pos = p;
+							}
+						}
+
+						// If strarr[i] is a Token, then the match starts inside another Token, which is invalid
+						if (strarr[i] instanceof Token) {
+							continue;
+						}
+
+						// Number of tokens to delete and replace with the new match
+						delNum = k - i;
+						str = text.slice(pos, p);
+						match.index -= pos;
+					} else {
+						pattern.lastIndex = 0;
+
+						var match = pattern.exec(str),
+							delNum = 1;
+					}
+
+					if (!match) {
+						if (oneshot) {
+							break;
+						}
+
+						continue;
+					}
+
+					if(lookbehind) {
+						lookbehindLength = match[1] ? match[1].length : 0;
+					}
+
+					var from = match.index + lookbehindLength,
+					    match = match[0].slice(lookbehindLength),
+					    to = from + match.length,
+					    before = str.slice(0, from),
+					    after = str.slice(to);
+
+					var args = [i, delNum];
+
+					if (before) {
+						++i;
+						pos += before.length;
+						args.push(before);
+					}
+
+					var wrapped = new Token(token, inside? _.tokenize(match, inside) : match, alias, match, greedy);
+
+					args.push(wrapped);
+
+					if (after) {
+						args.push(after);
+					}
+
+					Array.prototype.splice.apply(strarr, args);
+
+					if (delNum != 1)
+						_.matchGrammar(text, strarr, grammar, i, pos, true, token);
+
+					if (oneshot)
+						break;
+				}
+			}
+		}
+	},
+
+	tokenize: function(text, grammar, language) {
+		var strarr = [text];
+
+		var rest = grammar.rest;
+
+		if (rest) {
+			for (var token in rest) {
+				grammar[token] = rest[token];
+			}
+
+			delete grammar.rest;
+		}
+
+		_.matchGrammar(text, strarr, grammar, 0, 0, false);
+
+		return strarr;
+	},
+
+	hooks: {
+		all: {},
+
+		add: function (name, callback) {
+			var hooks = _.hooks.all;
+
+			hooks[name] = hooks[name] || [];
+
+			hooks[name].push(callback);
+		},
+
+		run: function (name, env) {
+			var callbacks = _.hooks.all[name];
+
+			if (!callbacks || !callbacks.length) {
+				return;
+			}
+
+			for (var i=0, callback; callback = callbacks[i++];) {
+				callback(env);
+			}
+		}
+	}
+};
+
+var Token = _.Token = function(type, content, alias, matchedStr, greedy) {
+	this.type = type;
+	this.content = content;
+	this.alias = alias;
+	// Copy of the full string this token was created from
+	this.length = (matchedStr || "").length|0;
+	this.greedy = !!greedy;
+};
+
+Token.stringify = function(o, language, parent) {
+	if (typeof o == 'string') {
+		return o;
+	}
+
+	if (_.util.type(o) === 'Array') {
+		return o.map(function(element) {
+			return Token.stringify(element, language, o);
+		}).join('');
+	}
+
+	var env = {
+		type: o.type,
+		content: Token.stringify(o.content, language, parent),
+		tag: 'span',
+		classes: ['token', o.type],
+		attributes: {},
+		language: language,
+		parent: parent
+	};
+
+	if (o.alias) {
+		var aliases = _.util.type(o.alias) === 'Array' ? o.alias : [o.alias];
+		Array.prototype.push.apply(env.classes, aliases);
+	}
+
+	_.hooks.run('wrap', env);
+
+	var attributes = Object.keys(env.attributes).map(function(name) {
+		return name + '="' + (env.attributes[name] || '').replace(/"/g, '&quot;') + '"';
+	}).join(' ');
+
+	return '<' + env.tag + ' class="' + env.classes.join(' ') + '"' + (attributes ? ' ' + attributes : '') + '>' + env.content + '</' + env.tag + '>';
+
+};
+
+if (!_self.document) {
+	if (!_self.addEventListener) {
+		// in Node.js
+		return _self.Prism;
+	}
+
+	if (!_.disableWorkerMessageHandler) {
+		// In worker
+		_self.addEventListener('message', function (evt) {
+			var message = JSON.parse(evt.data),
+				lang = message.language,
+				code = message.code,
+				immediateClose = message.immediateClose;
+
+			_self.postMessage(_.highlight(code, _.languages[lang], lang));
+			if (immediateClose) {
+				_self.close();
+			}
+		}, false);
+	}
+
+	return _self.Prism;
+}
+
+//Get current script and highlight
+var script = document.currentScript || [].slice.call(document.getElementsByTagName("script")).pop();
+
+if (script) {
+	_.filename = script.src;
+
+	if (!_.manual && !script.hasAttribute('data-manual')) {
+		if(document.readyState !== "loading") {
+			if (window.requestAnimationFrame) {
+				window.requestAnimationFrame(_.highlightAll);
+			} else {
+				window.setTimeout(_.highlightAll, 16);
+			}
+		}
+		else {
+			document.addEventListener('DOMContentLoaded', _.highlightAll);
+		}
+	}
+}
+
+return _self.Prism;
+
+})();
+
+if (typeof module !== 'undefined' && module.exports) {
+	module.exports = Prism;
+}
+
+// hack for components to work correctly in node.js
+if (typeof global !== 'undefined') {
+	global.Prism = Prism;
+}
+;
+Prism.languages.markup = {
+	'comment': /<!--[\s\S]*?-->/,
+	'prolog': /<\?[\s\S]+?\?>/,
+	'doctype': /<!DOCTYPE[\s\S]+?>/i,
+	'cdata': /<!\[CDATA\[[\s\S]*?]]>/i,
+	'tag': {
+		pattern: /<\/?(?!\d)[^\s>\/=$<%]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\[\s\S]|(?!\1)[^\\])*\1|[^\s'">=]+))?)*\s*\/?>/i,
+		greedy: true,
+		inside: {
+			'tag': {
+				pattern: /^<\/?[^\s>\/]+/i,
+				inside: {
+					'punctuation': /^<\/?/,
+					'namespace': /^[^\s>\/:]+:/
+				}
+			},
+			'attr-value': {
+				pattern: /=(?:("|')(?:\\[\s\S]|(?!\1)[^\\])*\1|[^\s'">=]+)/i,
+				inside: {
+					'punctuation': [
+						/^=/,
+						{
+							pattern: /(^|[^\\])["']/,
+							lookbehind: true
+						}
+					]
+				}
+			},
+			'punctuation': /\/?>/,
+			'attr-name': {
+				pattern: /[^\s>\/]+/,
+				inside: {
+					'namespace': /^[^\s>\/:]+:/
+				}
+			}
+
+		}
+	},
+	'entity': /&#?[\da-z]{1,8};/i
+};
+
+Prism.languages.markup['tag'].inside['attr-value'].inside['entity'] =
+	Prism.languages.markup['entity'];
+
+// Plugin to make entity title show the real entity, idea by Roman Komarov
+Prism.hooks.add('wrap', function(env) {
+
+	if (env.type === 'entity') {
+		env.attributes['title'] = env.content.replace(/&amp;/, '&');
+	}
+});
+
+Prism.languages.xml = Prism.languages.markup;
+Prism.languages.html = Prism.languages.markup;
+Prism.languages.mathml = Prism.languages.markup;
+Prism.languages.svg = Prism.languages.markup;
+
+Prism.languages.css = {
+	'comment': /\/\*[\s\S]*?\*\//,
+	'atrule': {
+		pattern: /@[\w-]+?.*?(?:;|(?=\s*\{))/i,
+		inside: {
+			'rule': /@[\w-]+/
+			// See rest below
+		}
+	},
+	'url': /url\((?:(["'])(?:\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1|.*?)\)/i,
+	'selector': /[^{}\s][^{};]*?(?=\s*\{)/,
+	'string': {
+		pattern: /("|')(?:\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,
+		greedy: true
+	},
+	'property': /[-_a-z\xA0-\uFFFF][-\w\xA0-\uFFFF]*(?=\s*:)/i,
+	'important': /\B!important\b/i,
+	'function': /[-a-z0-9]+(?=\()/i,
+	'punctuation': /[(){};:]/
+};
+
+Prism.languages.css['atrule'].inside.rest = Prism.languages.css;
+
+if (Prism.languages.markup) {
+	Prism.languages.insertBefore('markup', 'tag', {
+		'style': {
+			pattern: /(<style[\s\S]*?>)[\s\S]*?(?=<\/style>)/i,
+			lookbehind: true,
+			inside: Prism.languages.css,
+			alias: 'language-css',
+			greedy: true
+		}
+	});
+
+	Prism.languages.insertBefore('inside', 'attr-value', {
+		'style-attr': {
+			pattern: /\s*style=("|')(?:\\[\s\S]|(?!\1)[^\\])*\1/i,
+			inside: {
+				'attr-name': {
+					pattern: /^\s*style/i,
+					inside: Prism.languages.markup.tag.inside
+				},
+				'punctuation': /^\s*=\s*['"]|['"]\s*$/,
+				'attr-value': {
+					pattern: /.+/i,
+					inside: Prism.languages.css
+				}
+			},
+			alias: 'language-css'
+		}
+	}, Prism.languages.markup.tag);
+};
+Prism.languages.clike = {
+	'comment': [
+		{
+			pattern: /(^|[^\\])\/\*[\s\S]*?(?:\*\/|$)/,
+			lookbehind: true
+		},
+		{
+			pattern: /(^|[^\\:])\/\/.*/,
+			lookbehind: true,
+			greedy: true
+		}
+	],
+	'string': {
+		pattern: /(["'])(?:\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,
+		greedy: true
+	},
+	'class-name': {
+		pattern: /((?:\b(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[\w.\\]+/i,
+		lookbehind: true,
+		inside: {
+			punctuation: /[.\\]/
+		}
+	},
+	'keyword': /\b(?:if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/,
+	'boolean': /\b(?:true|false)\b/,
+	'function': /[a-z0-9_]+(?=\()/i,
+	'number': /\b0x[\da-f]+\b|(?:\b\d+\.?\d*|\B\.\d+)(?:e[+-]?\d+)?/i,
+	'operator': /--?|\+\+?|!=?=?|<=?|>=?|==?=?|&&?|\|\|?|\?|\*|\/|~|\^|%/,
+	'punctuation': /[{}[\];(),.:]/
+};
+
+Prism.languages.javascript = Prism.languages.extend('clike', {
+	'keyword': /\b(?:as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|try|typeof|var|void|while|with|yield)\b/,
+	'number': /\b(?:0[xX][\dA-Fa-f]+|0[bB][01]+|0[oO][0-7]+|NaN|Infinity)\b|(?:\b\d+\.?\d*|\B\.\d+)(?:[Ee][+-]?\d+)?/,
+	// Allow for all non-ASCII characters (See http://stackoverflow.com/a/2008444)
+	'function': /[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*(?=\s*\()/i,
+	'operator': /-[-=]?|\+[+=]?|!=?=?|<<?=?|>>?>?=?|=(?:==?|>)?|&[&=]?|\|[|=]?|\*\*?=?|\/=?|~|\^=?|%=?|\?|\.{3}/
+});
+
+Prism.languages.insertBefore('javascript', 'keyword', {
+	'regex': {
+		pattern: /((?:^|[^$\w\xA0-\uFFFF."'\])\s])\s*)\/(\[[^\]\r\n]+]|\\.|[^/\\\[\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})]))/,
+		lookbehind: true,
+		greedy: true
+	},
+	// This must be declared before keyword because we use "function" inside the look-forward
+	'function-variable': {
+		pattern: /[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*(?=\s*=\s*(?:function\b|(?:\([^()]*\)|[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*)\s*=>))/i,
+		alias: 'function'
+	},
+	'constant': /\b[A-Z][A-Z\d_]*\b/
+});
+
+Prism.languages.insertBefore('javascript', 'string', {
+	'template-string': {
+		pattern: /`(?:\\[\s\S]|[^\\`])*`/,
+		greedy: true,
+		inside: {
+			'interpolation': {
+				pattern: /\$\{[^}]+\}/,
+				inside: {
+					'interpolation-punctuation': {
+						pattern: /^\$\{|\}$/,
+						alias: 'punctuation'
+					},
+					rest: Prism.languages.javascript
+				}
+			},
+			'string': /[\s\S]+/
+		}
+	}
+});
+
+if (Prism.languages.markup) {
+	Prism.languages.insertBefore('markup', 'tag', {
+		'script': {
+			pattern: /(<script[\s\S]*?>)[\s\S]*?(?=<\/script>)/i,
+			lookbehind: true,
+			inside: Prism.languages.javascript,
+			alias: 'language-javascript',
+			greedy: true
+		}
+	});
+}
+
+Prism.languages.js = Prism.languages.javascript;
+
+Prism.languages.json = {
+	'property': /"(?:\\.|[^\\"\r\n])*"(?=\s*:)/i,
+	'string': {
+		pattern: /"(?:\\.|[^\\"\r\n])*"(?!\s*:)/,
+		greedy: true
+	},
+	'number': /\b0x[\dA-Fa-f]+\b|(?:\b\d+\.?\d*|\B\.\d+)(?:[Ee][+-]?\d+)?/,
+	'punctuation': /[{}[\]);,]/,
+	'operator': /:/g,
+	'boolean': /\b(?:true|false)\b/i,
+	'null': /\bnull\b/i
+};
+
+Prism.languages.jsonp = Prism.languages.json;
+
+(function(){
+
+if (typeof self === 'undefined' || !self.Prism || !self.document || !document.querySelector) {
+	return;
+}
+
+function $$(expr, con) {
+	return Array.prototype.slice.call((con || document).querySelectorAll(expr));
+}
+
+function hasClass(element, className) {
+  className = " " + className + " ";
+  return (" " + element.className + " ").replace(/[\n\t]/g, " ").indexOf(className) > -1
+}
+
+// Some browsers round the line-height, others don't.
+// We need to test for it to position the elements properly.
+var isLineHeightRounded = (function() {
+	var res;
+	return function() {
+		if(typeof res === 'undefined') {
+			var d = document.createElement('div');
+			d.style.fontSize = '13px';
+			d.style.lineHeight = '1.5';
+			d.style.padding = 0;
+			d.style.border = 0;
+			d.innerHTML = '&nbsp;<br />&nbsp;';
+			document.body.appendChild(d);
+			// Browsers that round the line-height should have offsetHeight === 38
+			// The others should have 39.
+			res = d.offsetHeight === 38;
+			document.body.removeChild(d);
+		}
+		return res;
+	}
+}());
+
+function highlightLines(pre, lines, classes) {
+	lines = typeof lines === 'string' ? lines : pre.getAttribute('data-line');
+
+	var ranges = lines.replace(/\s+/g, '').split(','),
+	    offset = +pre.getAttribute('data-line-offset') || 0;
+
+	var parseMethod = isLineHeightRounded() ? parseInt : parseFloat;
+	var lineHeight = parseMethod(getComputedStyle(pre).lineHeight);
+	var hasLineNumbers = hasClass(pre, 'line-numbers');
+
+	for (var i=0, currentRange; currentRange = ranges[i++];) {
+		var range = currentRange.split('-');
+
+		var start = +range[0],
+		    end = +range[1] || start;
+
+		var line = pre.querySelector('.line-highlight[data-range="' + currentRange + '"]') || document.createElement('div');
+
+		line.setAttribute('aria-hidden', 'true');
+		line.setAttribute('data-range', currentRange);
+		line.className = (classes || '') + ' line-highlight';
+
+		//if the line-numbers plugin is enabled, then there is no reason for this plugin to display the line numbers
+		if(hasLineNumbers && Prism.plugins.lineNumbers) {
+			var startNode = Prism.plugins.lineNumbers.getLine(pre, start);
+			var endNode = Prism.plugins.lineNumbers.getLine(pre, end);
+
+			if (startNode) {
+				line.style.top = startNode.offsetTop + 'px';
+			}
+
+			if (endNode) {
+				line.style.height = (endNode.offsetTop - startNode.offsetTop) + endNode.offsetHeight + 'px';
+			}
+		} else {
+			line.setAttribute('data-start', start);
+
+			if(end > start) {
+				line.setAttribute('data-end', end);
+			}
+
+			line.style.top = (start - offset - 1) * lineHeight + 'px';
+
+			line.textContent = new Array(end - start + 2).join(' \n');
+		}
+
+		//allow this to play nicely with the line-numbers plugin
+		if(hasLineNumbers) {
+			//need to attack to pre as when line-numbers is enabled, the code tag is relatively which screws up the positioning
+			pre.appendChild(line);
+		} else {
+			(pre.querySelector('code') || pre).appendChild(line);
+		}
+	}
+}
+
+function applyHash() {
+	var hash = location.hash.slice(1);
+
+	// Remove pre-existing temporary lines
+	$$('.temporary.line-highlight').forEach(function (line) {
+		line.parentNode.removeChild(line);
+	});
+
+	var range = (hash.match(/\.([\d,-]+)$/) || [,''])[1];
+
+	if (!range || document.getElementById(hash)) {
+		return;
+	}
+
+	var id = hash.slice(0, hash.lastIndexOf('.')),
+	    pre = document.getElementById(id);
+
+	if (!pre) {
+		return;
+	}
+
+	if (!pre.hasAttribute('data-line')) {
+		pre.setAttribute('data-line', '');
+	}
+
+	highlightLines(pre, range, 'temporary ');
+
+	document.querySelector('.temporary.line-highlight').scrollIntoView();
+
+	// offset fixed header with buffer
+	window.scrollBy(0, -100);
+}
+
+var fakeTimer = 0; // Hack to limit the number of times applyHash() runs
+
+Prism.hooks.add('before-sanity-check', function(env) {
+	var pre = env.element.parentNode;
+	var lines = pre && pre.getAttribute('data-line');
+
+	if (!pre || !lines || !/pre/i.test(pre.nodeName)) {
+		return;
+	}
+
+	/*
+	* Cleanup for other plugins (e.g. autoloader).
+	 *
+	 * Sometimes <code> blocks are highlighted multiple times. It is necessary
+	 * to cleanup any left-over tags, because the whitespace inside of the <div>
+	 * tags change the content of the <code> tag.
+	 */
+	var num = 0;
+	$$('.line-highlight', pre).forEach(function (line) {
+		num += line.textContent.length;
+		line.parentNode.removeChild(line);
+	});
+	// Remove extra whitespace
+	if (num && /^( \n)+$/.test(env.code.slice(-num))) {
+		env.code = env.code.slice(0, -num);
+	}
+});
+
+Prism.hooks.add('complete', function completeHook(env) {
+	var pre = env.element.parentNode;
+	var lines = pre && pre.getAttribute('data-line');
+
+	if (!pre || !lines || !/pre/i.test(pre.nodeName)) {
+		return;
+	}
+
+	clearTimeout(fakeTimer);
+
+	var hasLineNumbers = Prism.plugins.lineNumbers;
+	var isLineNumbersLoaded = env.plugins && env.plugins.lineNumbers;
+
+	if (hasClass(pre, 'line-numbers') && hasLineNumbers && !isLineNumbersLoaded) {
+		Prism.hooks.add('line-numbers', completeHook);
+	} else {
+		highlightLines(pre, lines);
+		fakeTimer = setTimeout(applyHash, 1);
+	}
+});
+
+	window.addEventListener('load', applyHash);
+	window.addEventListener('hashchange', applyHash);
+	window.addEventListener('resize', function () {
+		var preElements = document.querySelectorAll('pre[data-line]');
+		Array.prototype.forEach.call(preElements, function (pre) {
+			highlightLines(pre);
+		});
+	});
+
+})();
+(function () {
+
+	if (typeof self === 'undefined' || !self.Prism || !self.document) {
+		return;
+	}
+
+	/**
+	 * Plugin name which is used as a class name for <pre> which is activating the plugin
+	 * @type {String}
+	 */
+	var PLUGIN_NAME = 'line-numbers';
+
+	/**
+	 * Regular expression used for determining line breaks
+	 * @type {RegExp}
+	 */
+	var NEW_LINE_EXP = /\n(?!$)/g;
+
+	/**
+	 * Resizes line numbers spans according to height of line of code
+	 * @param {Element} element <pre> element
+	 */
+	var _resizeElement = function (element) {
+		var codeStyles = getStyles(element);
+		var whiteSpace = codeStyles['white-space'];
+
+		if (whiteSpace === 'pre-wrap' || whiteSpace === 'pre-line') {
+			var codeElement = element.querySelector('code');
+			var lineNumbersWrapper = element.querySelector('.line-numbers-rows');
+			var lineNumberSizer = element.querySelector('.line-numbers-sizer');
+			var codeLines = codeElement.textContent.split(NEW_LINE_EXP);
+
+			if (!lineNumberSizer) {
+				lineNumberSizer = document.createElement('span');
+				lineNumberSizer.className = 'line-numbers-sizer';
+
+				codeElement.appendChild(lineNumberSizer);
+			}
+
+			lineNumberSizer.style.display = 'block';
+
+			codeLines.forEach(function (line, lineNumber) {
+				lineNumberSizer.textContent = line || '\n';
+				var lineSize = lineNumberSizer.getBoundingClientRect().height;
+				lineNumbersWrapper.children[lineNumber].style.height = lineSize + 'px';
+			});
+
+			lineNumberSizer.textContent = '';
+			lineNumberSizer.style.display = 'none';
+		}
+	};
+
+	/**
+	 * Returns style declarations for the element
+	 * @param {Element} element
+	 */
+	var getStyles = function (element) {
+		if (!element) {
+			return null;
+		}
+
+		return window.getComputedStyle ? getComputedStyle(element) : (element.currentStyle || null);
+	};
+
+	window.addEventListener('resize', function () {
+		Array.prototype.forEach.call(document.querySelectorAll('pre.' + PLUGIN_NAME), _resizeElement);
+	});
+
+	Prism.hooks.add('complete', function (env) {
+		if (!env.code) {
+			return;
+		}
+
+		// works only for <code> wrapped inside <pre> (not inline)
+		var pre = env.element.parentNode;
+		var clsReg = /\s*\bline-numbers\b\s*/;
+		if (
+			!pre || !/pre/i.test(pre.nodeName) ||
+			// Abort only if nor the <pre> nor the <code> have the class
+			(!clsReg.test(pre.className) && !clsReg.test(env.element.className))
+		) {
+			return;
+		}
+
+		if (env.element.querySelector('.line-numbers-rows')) {
+			// Abort if line numbers already exists
+			return;
+		}
+
+		if (clsReg.test(env.element.className)) {
+			// Remove the class 'line-numbers' from the <code>
+			env.element.className = env.element.className.replace(clsReg, ' ');
+		}
+		if (!clsReg.test(pre.className)) {
+			// Add the class 'line-numbers' to the <pre>
+			pre.className += ' line-numbers';
+		}
+
+		var match = env.code.match(NEW_LINE_EXP);
+		var linesNum = match ? match.length + 1 : 1;
+		var lineNumbersWrapper;
+
+		var lines = new Array(linesNum + 1);
+		lines = lines.join('<span></span>');
+
+		lineNumbersWrapper = document.createElement('span');
+		lineNumbersWrapper.setAttribute('aria-hidden', 'true');
+		lineNumbersWrapper.className = 'line-numbers-rows';
+		lineNumbersWrapper.innerHTML = lines;
+
+		if (pre.hasAttribute('data-start')) {
+			pre.style.counterReset = 'linenumber ' + (parseInt(pre.getAttribute('data-start'), 10) - 1);
+		}
+
+		env.element.appendChild(lineNumbersWrapper);
+
+		_resizeElement(pre);
+
+		Prism.hooks.run('line-numbers', env);
+	});
+
+	Prism.hooks.add('line-numbers', function (env) {
+		env.plugins = env.plugins || {};
+		env.plugins.lineNumbers = true;
+	});
+
+	/**
+	 * Global exports
+	 */
+	Prism.plugins.lineNumbers = {
+		/**
+		 * Get node for provided line number
+		 * @param {Element} element pre element
+		 * @param {Number} number line number
+		 * @return {Element|undefined}
+		 */
+		getLine: function (element, number) {
+			if (element.tagName !== 'PRE' || !element.classList.contains(PLUGIN_NAME)) {
+				return;
+			}
+
+			var lineNumberRows = element.querySelector('.line-numbers-rows');
+			var lineNumberStart = parseInt(element.getAttribute('data-start'), 10) || 1;
+			var lineNumberEnd = lineNumberStart + (lineNumberRows.children.length - 1);
+
+			if (number < lineNumberStart) {
+				number = lineNumberStart;
+			}
+			if (number > lineNumberEnd) {
+				number = lineNumberEnd;
+			}
+
+			var lineIndex = number - lineNumberStart;
+
+			return lineNumberRows.children[lineIndex];
+		}
+	};
+
+}());
diff --git a/documentation/chat/frontend/services_chat-api.js.html b/documentation/chat/frontend/services_chat-api.js.html
new file mode 100644
index 00000000000..67456b35620
--- /dev/null
+++ b/documentation/chat/frontend/services_chat-api.js.html
@@ -0,0 +1,325 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Discourse: services/chat-api.js</title>
+    
+      <link type="text/css" rel="stylesheet" href="styles/vendor/prism-custom.css">
+    
+    <link type="text/css" rel="stylesheet" href="styles/styles.css">
+    
+</head>
+<body>
+
+<header class="layout-header">
+  
+  <h1>
+    <a href="./index.html">
+      Discourse
+    </a>
+  </h1>
+  <nav class="layout-nav">
+    <ul><li class="nav-heading">Classes</li><li class="nav-heading"><span class="nav-item-type type-class" title="class">C</span><span class="nav-item-name is-class"><a href="PluginApi.html">PluginApi</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="PluginApi.html#decorateChatMessage">decorateChatMessage</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="PluginApi.html#registerChatComposerButton">registerChatComposerButton</a></span></li><li class="nav-heading"><span class="nav-item-type type-class" title="class">C</span><span class="nav-item-name is-class"><a href="module.exports.html">exports</a></span></li></ul><ul><li class="nav-heading">Modules</li><li class="nav-heading"><span class="nav-item-type type-module" title="module">M</span><span class="nav-item-name is-module"><a href="module-ChatApi.html">ChatApi</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#categoryPermissions">categoryPermissions</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#channel">channel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#channels">channels</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#createChannel">createChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#createChannelArchive">createChannelArchive</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#destroyChannel">destroyChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#followChannel">followChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#listChannelMemberships">listChannelMemberships</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#listCurrentUserChannels">listCurrentUserChannels</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#moveChannelMessages">moveChannelMessages</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#sendMessage">sendMessage</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#unfollowChannel">unfollowChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#updateChannel">updateChannel</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#updateChannelStatus">updateChannelStatus</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="module-ChatApi.html#updateCurrentUserChannelNotificationsSettings">updateCurrentUserChannelNotificationsSettings</a></span></li></ul><li class="nav-heading"><a href="global.html">Globals</a></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="global.html#load">load</a></span></li><li class="nav-item"><span class="nav-item-type type-function" title="function">F</span><span class="nav-item-name is-function"><a href="global.html#loadMore">loadMore</a></span></li>
+  </nav>
+</header>
+
+
+<main class="layout-main  layout-content--source">
+  <div class="container">
+    <p class="page-kind">source</p>
+    <h1 class="page-title">services/chat-api.js</h1>
+    
+
+
+
+    
+
+<section>
+    <article>
+        <pre id="source" class="source-page line-numbers"><code class="language-js">import Service, { inject as service } from "@ember/service";
+import { ajax } from "discourse/lib/ajax";
+import UserChatChannelMembership from "discourse/plugins/chat/discourse/models/user-chat-channel-membership";
+import Collection from "../lib/collection";
+
+/**
+ * Chat API service. Provides methods to interact with the chat API.
+ *
+ * @module ChatApi
+ * @implements {@ember/service}
+ */
+export default class ChatApi extends Service {
+  @service chatChannelsManager;
+
+  /**
+   * Get a channel by its ID.
+   * @param {number} channelId - The ID of the channel.
+   * @returns {Promise}
+   *
+   * @example
+   *
+   *    this.chatApi.channel(1).then(channel => { ... })
+   */
+  channel(channelId) {
+    return this.#getRequest(`/channels/${channelId}`).then((result) =>
+      this.chatChannelsManager.store(result.channel)
+    );
+  }
+
+  /**
+   * List all accessible category channels of the current user.
+   * @returns {Collection}
+   *
+   * @example
+   *
+   *    this.chatApi.channels.then(channels => { ... })
+   */
+  channels() {
+    return new Collection(`${this.#basePath}/channels`, (response) => {
+      return response.channels.map((channel) =>
+        this.chatChannelsManager.store(channel)
+      );
+    });
+  }
+
+  /**
+   * Moves messages from one channel to another.
+   * @param {number} channelId - The ID of the original channel.
+   * @param {object} data - Params of the move.
+   * @param {Array.&lt;number>} data.message_ids - IDs of the moved messages.
+   * @param {number} data.destination_channel_id - ID of the channel where the messages are moved to.
+   * @returns {Promise}
+   *
+   * @example
+   *
+   *   this.chatApi
+   *     .moveChannelMessages(1, {
+   *       message_ids: [2, 3],
+   *       destination_channel_id: 4,
+   *     }).then(() => { ... })
+   */
+  moveChannelMessages(channelId, data = {}) {
+    return this.#postRequest(`/channels/${channelId}/messages/moves`, {
+      move: data,
+    });
+  }
+
+  /**
+   * Destroys a channel.
+   * @param {number} channelId - The ID of the channel.
+   * @returns {Promise}
+   *
+   * @example
+   *
+   *    this.chatApi.destroyChannel(1).then(() => { ... })
+   */
+  destroyChannel(channelId) {
+    return this.#deleteRequest(`/channels/${channelId}`);
+  }
+
+  /**
+   * Creates a channel.
+   * @param {object} data - Params of the channel.
+   * @param {string} data.name - The name of the channel.
+   * @param {string} data.chatable_id - The category of the channel.
+   * @param {string} data.description - The description of the channel.
+   * @param {boolean} [data.auto_join_users] - Should users join this channel automatically.
+   * @returns {Promise}
+   *
+   * @example
+   *
+   *    this.chatApi
+   *      .createChannel({ name: "foo", chatable_id: 1, description "bar" })
+   *      .then((channel) => { ... })
+   */
+  createChannel(data = {}) {
+    return this.#postRequest("/channels", { channel: data }).then((response) =>
+      this.chatChannelsManager.store(response.channel)
+    );
+  }
+
+  /**
+   * Lists chat permissions for a category.
+   * @param {number} categoryId - ID of the category.
+   * @returns {Promise}
+   */
+  categoryPermissions(categoryId) {
+    return this.#getRequest(`/category-chatables/${categoryId}/permissions`);
+  }
+
+  /**
+   * Sends a message.
+   * @param {number} channelId - ID of the channel.
+   * @param {object} data - Params of the message.
+   * @param {string} data.message - The raw content of the message in markdown.
+   * @param {string} data.cooked - The cooked content of the message.
+   * @param {number} [data.in_reply_to_id] - The ID of the replied-to message.
+   * @param {number} [data.staged_id] - The staged ID of the message before it was persisted.
+   * @param {Array.&lt;number>} [data.upload_ids] - Array of upload ids linked to the message.
+   * @returns {Promise}
+   */
+  sendMessage(channelId, data = {}) {
+    return ajax(`/chat/${channelId}`, {
+      ignoreUnsent: false,
+      type: "POST",
+      data,
+    });
+  }
+
+  /**
+   * Creates a channel archive.
+   * @param {number} channelId - The ID of the channel.
+   * @param {object} data - Params of the archive.
+   * @param {string} data.selection - "new_topic" or "existing_topic".
+   * @param {string} [data.title] - Title of the topic when creating a new topic.
+   * @param {string} [data.category_id] - ID of the category used when creating a new topic.
+   * @param {Array.&lt;string>} [data.tags] - tags used when creating a new topic.
+   * @param {string} [data.topic_id] - ID of the topic when using an existing topic.
+   * @returns {Promise}
+   */
+  createChannelArchive(channelId, data = {}) {
+    return this.#postRequest(`/channels/${channelId}/archives`, {
+      archive: data,
+    });
+  }
+
+  /**
+   * Updates a channel.
+   * @param {number} channelId - The ID of the channel.
+   * @param {object} data - Params of the archive.
+   * @param {string} [data.description] - Description of the channel.
+   * @param {string} [data.name] - Name of the channel.
+   * @returns {Promise}
+   */
+  updateChannel(channelId, data = {}) {
+    return this.#putRequest(`/channels/${channelId}`, { channel: data });
+  }
+
+  /**
+   * Updates the status of a channel.
+   * @param {number} channelId - The ID of the channel.
+   * @param {string} status - The new status, can be "open" or "closed".
+   * @returns {Promise}
+   */
+  updateChannelStatus(channelId, status) {
+    return this.#putRequest(`/channels/${channelId}/status`, { status });
+  }
+
+  /**
+   * Lists members of a channel.
+   * @param {number} channelId - The ID of the channel.
+   * @returns {Collection}
+   */
+  listChannelMemberships(channelId) {
+    return new Collection(
+      `${this.#basePath}/channels/${channelId}/memberships`,
+      (response) => {
+        return response.memberships.map((membership) =>
+          UserChatChannelMembership.create(membership)
+        );
+      }
+    );
+  }
+
+  /**
+   * Lists public and direct message channels of the current user.
+   * @returns {Promise}
+   */
+  listCurrentUserChannels() {
+    return this.#getRequest("/channels/me").then((result) => {
+      return (result?.channels || []).map((channel) =>
+        this.chatChannelsManager.store(channel)
+      );
+    });
+  }
+
+  /**
+   * Makes current user follow a channel.
+   * @param {number} channelId - The ID of the channel.
+   * @returns {Promise}
+   */
+  followChannel(channelId) {
+    return this.#postRequest(`/channels/${channelId}/memberships/me`).then(
+      (result) => UserChatChannelMembership.create(result.membership)
+    );
+  }
+
+  /**
+   * Makes current user unfollow a channel.
+   * @param {number} channelId - The ID of the channel.
+   * @returns {Promise}
+   */
+  unfollowChannel(channelId) {
+    return this.#deleteRequest(`/channels/${channelId}/memberships/me`).then(
+      (result) => UserChatChannelMembership.create(result.membership)
+    );
+  }
+
+  /**
+   * Update notifications settings of current user for a channel.
+   * @param {number} channelId - The ID of the channel.
+   * @param {object} data - The settings to modify.
+   * @param {boolean} [data.muted] - Mutes the channel.
+   * @param {string} [data.desktop_notification_level] - Notifications level on desktop: never, mention or always.
+   * @param {string} [data.mobile_notification_level] - Notifications level on mobile: never, mention or always.
+   * @returns {Promise}
+   */
+  updateCurrentUserChannelNotificationsSettings(channelId, data = {}) {
+    return this.#putRequest(
+      `/channels/${channelId}/notifications-settings/me`,
+      { notifications_settings: data }
+    );
+  }
+
+  get #basePath() {
+    return "/chat/api";
+  }
+
+  #getRequest(endpoint, data = {}) {
+    return ajax(`${this.#basePath}${endpoint}`, {
+      type: "GET",
+      data,
+    });
+  }
+
+  #putRequest(endpoint, data = {}) {
+    return ajax(`${this.#basePath}${endpoint}`, {
+      type: "PUT",
+      data,
+    });
+  }
+
+  #postRequest(endpoint, data = {}) {
+    return ajax(`${this.#basePath}${endpoint}`, {
+      type: "POST",
+      data,
+    });
+  }
+
+  #deleteRequest(endpoint, data = {}) {
+    return ajax(`${this.#basePath}${endpoint}`, {
+      type: "DELETE",
+      data,
+    });
+  }
+}
+</code></pre>
+    </article>
+</section>
+
+
+
+
+  </div>
+</main>
+
+<footer class="layout-footer">
+  <div class="container">
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.0</a>
+  </div>
+</footer>
+
+
+
+<script src="scripts/prism.dev.js"></script>
+</body>
+</html>
diff --git a/documentation/chat/frontend/styles/styles.css b/documentation/chat/frontend/styles/styles.css
new file mode 100644
index 00000000000..159439a937d
--- /dev/null
+++ b/documentation/chat/frontend/styles/styles.css
@@ -0,0 +1,498 @@
+:root {
+  --primary-color: #0664a8;
+  --secondary-color: #107e7d;
+  --link-color: var(--primary-color);
+  --link-hover-color: var(--primary-color);
+  --border-color: #eee;
+  --code-color: #666;
+  --code-attention-color: #ca2d00;
+  --text-color: #4a4a4a;
+  --light-font-color: #999;
+  --supporting-color: #7097b5;
+  --heading-color: var(--text-color);
+  --subheading-color: var(--secondary-color);
+  --heading-background: #f7f7f7;
+  --code-bg-color: #f8f8f8;
+  --nav-title-color: var(--primary-color);
+  --nav-title-align: center;
+  --nav-title-size: 1rem;
+  --nav-title-margin-bottom: 1.5em;
+  --nav-title-font-weight: 600;
+  --nav-list-margin-left: 2em;
+  --nav-bg-color: #fff;
+  --nav-heading-display: block;
+  --nav-heading-color: #aaa;
+  --nav-link-color: #666;
+  --nav-text-color: #aaa;
+  --nav-type-class-color: #fff;
+  --nav-type-class-bg: #FF8C00;
+  --nav-type-member-color: #39b739;
+  --nav-type-member-bg: #d5efd5;
+  --nav-type-function-color: #549ab9;
+  --nav-type-function-bg: #e1f6ff;
+  --nav-type-namespace-color: #eb6420;
+  --nav-type-namespace-bg: #fad8c7;
+  --nav-type-typedef-color: #964cb1;
+  --nav-type-typedef-bg: #f2e4f7;
+  --nav-type-module-color: #964cb1;
+  --nav-type-module-bg: #f2e4f7;
+  --nav-type-event-color: #948b34;
+  --nav-type-event-bg: #fff6a6;
+  --max-content-width: 900px;
+  --nav-width: 320px;
+  --padding-unit: 30px;
+  --layout-footer-color: #aaa;
+  --member-name-signature-display: none;
+  --base-font-size: 16px;
+  --base-line-height: 1.7;
+  --body-font: -apple-system, system-ui, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+  --code-font: Consolas, Monaco, "Andale Mono", monospace;
+}
+
+body {
+  font-family: var(--body-font);
+  font-size: var(--base-font-size);
+  line-height: var(--base-line-height);
+  color: var(--text-color);
+  -webkit-font-smoothing: antialiased;
+  text-size-adjust: 100%;
+}
+
+* {
+  box-sizing: border-box;
+}
+
+a {
+  text-decoration: none;
+  color: var(--link-color);
+}
+a:hover, a:active {
+  text-decoration: underline;
+  color: var(--link-hover-color);
+}
+
+img {
+  max-width: 100%;
+}
+img + p {
+  margin-top: 1em;
+}
+
+ul {
+  margin: 1em 0;
+}
+
+tt, code, kbd, samp {
+  font-family: var(--code-font);
+}
+
+code {
+  display: inline-block;
+  background-color: var(--code-bg-color);
+  padding: 2px 6px 0px;
+  border-radius: 3px;
+  color: var(--code-attention-color);
+}
+
+.prettyprint.source code:not([class*=language-]) {
+  display: block;
+  padding: 20px;
+  overflow: scroll;
+  color: var(--code-color);
+}
+
+.layout-main,
+.layout-footer {
+  margin-left: var(--nav-width);
+}
+
+.container {
+  max-width: var(--max-content-width);
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.layout-main {
+  margin-top: var(--padding-unit);
+  margin-bottom: var(--padding-unit);
+  padding: 0 var(--padding-unit);
+}
+
+.layout-header {
+  background: var(--nav-bg-color);
+  border-right: 1px solid var(--border-color);
+  position: fixed;
+  padding: 0 var(--padding-unit);
+  top: 0;
+  left: 0;
+  right: 0;
+  width: var(--nav-width);
+  height: 100%;
+  overflow: scroll;
+}
+.layout-header h1 {
+  display: block;
+  margin-bottom: var(--nav-title-margin-bottom);
+  font-size: var(--nav-title-size);
+  font-weight: var(--nav-title-font-weight);
+  text-align: var(--nav-title-align);
+}
+.layout-header h1 a:link, .layout-header h1 a:visited {
+  color: var(--nav-title-color);
+}
+.layout-header img {
+  max-width: 120px;
+  display: block;
+  margin: 1em auto;
+}
+
+.layout-nav {
+  margin-bottom: 2rem;
+}
+.layout-nav ul {
+  margin: 0 0 var(--nav-list-margin-left);
+  padding: 0;
+}
+.layout-nav li {
+  list-style-type: none;
+  font-size: 0.95em;
+}
+.layout-nav li.nav-heading:first-child {
+  display: var(--nav-heading-display);
+  margin-left: 0;
+  margin-bottom: 1em;
+  text-transform: uppercase;
+  color: var(--nav-heading-color);
+  font-size: 0.85em;
+}
+.layout-nav a {
+  color: var(--nav-link-color);
+}
+.layout-nav a:link, .layout-nav a a:visited {
+  color: var(--nav-link-color);
+}
+
+.layout-content--source {
+  max-width: none;
+}
+
+.nav-heading {
+  margin-top: 1em;
+  font-weight: 500;
+}
+.nav-heading a {
+  color: var(--nav-link-color);
+}
+.nav-heading a:link, .nav-heading a:visited {
+  color: var(--nav-link-color);
+}
+.nav-heading .nav-item-type {
+  font-size: 0.9em;
+}
+
+.nav-item-type {
+  display: inline-block;
+  font-size: 0.9em;
+  width: 1.2em;
+  height: 1.2em;
+  line-height: 1.2em;
+  display: inline-block;
+  text-align: center;
+  border-radius: 0.2em;
+  margin-right: 0.5em;
+}
+.nav-item-type.type-class {
+  color: var(--nav-type-class-color);
+  background: var(--nav-type-class-bg);
+}
+.nav-item-type.type-typedef {
+  color: var(--nav-type-typedef-color);
+  background: var(--nav-type-typedef-bg);
+}
+.nav-item-type.type-function {
+  color: var(--nav-type-function-color);
+  background: var(--nav-type-function-bg);
+}
+.nav-item-type.type-namespace {
+  color: var(--nav-type-namespace-color);
+  background: var(--nav-type-namespace-bg);
+}
+.nav-item-type.type-member {
+  color: var(--nav-type-member-color);
+  background: var(--nav-type-member-bg);
+}
+.nav-item-type.type-module {
+  color: var(--nav-type-module-color);
+  background: var(--nav-type-module-bg);
+}
+.nav-item-type.type-event {
+  color: var(--nav-type-event-color);
+  background: var(--nav-type-event-bg);
+}
+
+.nav-item-name.is-function:after {
+  display: inline;
+  content: "()";
+  color: var(--nav-link-color);
+  opacity: 0.75;
+}
+.nav-item-name.is-class {
+  font-size: 1.1em;
+}
+
+.layout-footer {
+  padding-top: 2rem;
+  padding-bottom: 2rem;
+  font-size: 0.8em;
+  text-align: center;
+  color: var(--layout-footer-color);
+}
+.layout-footer a {
+  color: var(--light-font-color);
+  text-decoration: underline;
+}
+
+h1 {
+  font-size: 2rem;
+  color: var(--heading-color);
+}
+
+h5 {
+  margin: 0;
+  font-weight: 500;
+  font-size: 1em;
+}
+h5 + .code-caption {
+  margin-top: 1em;
+}
+
+.page-kind {
+  margin: 0 0 -0.5em;
+  font-weight: 400;
+  color: var(--light-font-color);
+  text-transform: uppercase;
+}
+
+.page-title {
+  margin-top: 0;
+}
+
+.subtitle {
+  font-weight: 600;
+  font-size: 1.5em;
+  color: var(--subheading-color);
+  margin: 1em 0;
+  padding: 0.4em 0;
+  border-bottom: 1px solid var(--border-color);
+}
+.subtitle + .event, .subtitle + .member, .subtitle + .method {
+  border-top: none;
+  padding-top: 0;
+}
+
+.method-type + .method-name {
+  margin-top: 0.5em;
+}
+
+.event-name,
+.member-name,
+.method-name,
+.type-definition-name {
+  margin: 1em 0;
+  font-size: 1.4rem;
+  font-family: var(--code-font);
+  font-weight: 600;
+  color: var(--primary-color);
+}
+.event-name .signature-attributes,
+.member-name .signature-attributes,
+.method-name .signature-attributes,
+.type-definition-name .signature-attributes {
+  display: inline-block;
+  margin-left: 0.25em;
+  font-size: 60%;
+  color: #999;
+  font-style: italic;
+  font-weight: lighter;
+}
+
+.type-signature {
+  display: inline-block;
+  margin-left: 0.5em;
+}
+
+.member-name .type-signature {
+  display: var(--member-name-signature-display);
+}
+
+.type-signature,
+.return-type-signature {
+  color: #aaa;
+  font-weight: 400;
+}
+.type-signature a:link, .type-signature a:visited,
+.return-type-signature a:link,
+.return-type-signature a:visited {
+  color: #aaa;
+}
+
+table {
+  margin-top: 1rem;
+  width: auto;
+  min-width: 400px;
+  max-width: 100%;
+  border-top: 1px solid var(--border-color);
+  border-right: 1px solid var(--border-color);
+}
+table th, table h4 {
+  font-weight: 500;
+}
+table th,
+table td {
+  padding: 0.5rem 0.75rem;
+}
+table th,
+table td {
+  border-left: 1px solid var(--border-color);
+  border-bottom: 1px solid var(--border-color);
+}
+table p:last-child {
+  margin-bottom: 0;
+}
+
+.readme h2 {
+  border-bottom: 1px solid var(--border-color);
+  margin: 1em 0;
+  padding-bottom: 0.5rem;
+  color: var(--subheading-color);
+}
+.readme h2 + h3 {
+  margin-top: 0;
+}
+.readme h3 {
+  margin: 2rem 0 1rem 0;
+}
+
+article.event, article.member, article.method {
+  padding: 1em 0 1em;
+  margin: 1em 0;
+  border-top: 1px solid var(--border-color);
+}
+
+.method-type-signature:not(:empty) {
+  display: inline-block;
+  background: #ecf0f1;
+  color: #627475;
+  padding: 0.25em 0.5em 0.35em;
+  font-weight: 300;
+  font-size: 0.8rem;
+  margin: 0 0.75em 0 0;
+}
+
+.method-heading {
+  margin: 1em 0;
+}
+
+li.method-returns,
+.method-params li {
+  margin-bottom: 1em;
+}
+
+.method-source a:link, .method-source a:visited {
+  color: var(--light-font-color);
+}
+
+.method-returns p {
+  margin: 0;
+}
+
+.event-description,
+.method-description {
+  margin: 0 0 2em;
+}
+
+.param-type code,
+.method-returns code {
+  color: #111;
+}
+
+.param-name {
+  font-weight: 600;
+  display: inline-block;
+  margin-right: 0.5em;
+}
+
+.param-type,
+.param-default,
+.param-attributes {
+  font-family: var(--code-font);
+}
+
+.param-default::before {
+  display: inline-block;
+  content: "Default:";
+  font-family: var(--body-font);
+}
+
+.param-attributes {
+  color: var(--light-font-color);
+}
+
+.param-description p:first-child {
+  margin-top: 0;
+}
+
+.param-properties {
+  font-weight: 500;
+  margin: 1em 0 0;
+}
+
+.param-types,
+.property-types {
+  display: inline-block;
+  margin: 0 0.5em 0 0.25em;
+  color: #999;
+}
+
+.param-attr,
+.property-attr {
+  display: inline-block;
+  padding: 0.2em 0.5em;
+  border: 1px solid #eee;
+  color: #aaa;
+  font-weight: 300;
+  font-size: 0.8em;
+  vertical-align: baseline;
+}
+
+.properties-table p:last-child {
+  margin-bottom: 0;
+}
+
+pre[class*=language-] {
+  border-radius: 0;
+}
+
+code[class*=language-],
+pre[class*=language-] {
+  text-shadow: none;
+  border: none;
+}
+code[class*=language-].source-page,
+pre[class*=language-].source-page {
+  font-size: 0.9em;
+}
+
+.line-numbers .line-numbers-rows {
+  border-right: none;
+}
+
+.source-page {
+  font-size: 14px;
+}
+.source-page code {
+  z-index: 1;
+}
+.source-page .line-height.temporary {
+  z-index: 0;
+}
\ No newline at end of file
diff --git a/documentation/chat/frontend/styles/vendor/prism-custom.css b/documentation/chat/frontend/styles/vendor/prism-custom.css
new file mode 100644
index 00000000000..09d20634024
--- /dev/null
+++ b/documentation/chat/frontend/styles/vendor/prism-custom.css
@@ -0,0 +1,142 @@
+/* PrismJS 1.17.1
+https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript+http */
+/**
+ * prism.js default theme for JavaScript, CSS and HTML
+ * Based on dabblet (http://dabblet.com)
+ * @author Lea Verou
+ */
+
+code[class*="language-"],
+pre[class*="language-"] {
+	color: black;
+	background: none;
+	text-shadow: 0 1px white;
+	font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
+	font-size: 1em;
+	text-align: left;
+	white-space: pre;
+	word-spacing: normal;
+	word-break: normal;
+	word-wrap: normal;
+	line-height: 1.5;
+
+	-moz-tab-size: 4;
+	-o-tab-size: 4;
+	tab-size: 4;
+
+	-webkit-hyphens: none;
+	-moz-hyphens: none;
+	-ms-hyphens: none;
+	hyphens: none;
+}
+
+pre[class*="language-"]::-moz-selection, pre[class*="language-"] ::-moz-selection,
+code[class*="language-"]::-moz-selection, code[class*="language-"] ::-moz-selection {
+	text-shadow: none;
+	background: #b3d4fc;
+}
+
+pre[class*="language-"]::selection, pre[class*="language-"] ::selection,
+code[class*="language-"]::selection, code[class*="language-"] ::selection {
+	text-shadow: none;
+	background: #b3d4fc;
+}
+
+@media print {
+	code[class*="language-"],
+	pre[class*="language-"] {
+		text-shadow: none;
+	}
+}
+
+/* Code blocks */
+pre[class*="language-"] {
+	padding: 1em;
+	margin: .5em 0;
+	overflow: auto;
+}
+
+:not(pre) > code[class*="language-"],
+pre[class*="language-"] {
+	background: #f6f8fa;
+}
+
+/* Inline code */
+:not(pre) > code[class*="language-"] {
+	padding: .1em;
+	border-radius: .3em;
+	white-space: normal;
+}
+
+.token.comment,
+.token.prolog,
+.token.doctype,
+.token.cdata {
+	color: slategray;
+}
+
+.token.punctuation {
+	color: #999;
+}
+
+.namespace {
+	opacity: .7;
+}
+
+.token.property,
+.token.tag,
+.token.boolean,
+.token.number,
+.token.constant,
+.token.symbol,
+.token.deleted {
+	color: #905;
+}
+
+.token.selector,
+.token.attr-name,
+.token.string,
+.token.char,
+.token.builtin,
+.token.inserted {
+	color: #690;
+}
+
+.token.operator,
+.token.entity,
+.token.url,
+.language-css .token.string,
+.style .token.string {
+	color: #9a6e3a;
+	background: hsla(0, 0%, 100%, .5);
+}
+
+.token.atrule,
+.token.attr-value,
+.token.keyword {
+	color: #07a;
+}
+
+.token.function,
+.token.class-name {
+	color: #DD4A68;
+}
+
+.token.regex,
+.token.important,
+.token.variable {
+	color: #e90;
+}
+
+.token.important,
+.token.bold {
+	font-weight: bold;
+}
+.token.italic {
+	font-style: italic;
+}
+
+.token.entity {
+	cursor: help;
+}
+
diff --git a/documentation/index.html b/documentation/index.html
new file mode 100644
index 00000000000..83efddc8df2
--- /dev/null
+++ b/documentation/index.html
@@ -0,0 +1,125 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <link rel="shortcut icon" href="assets/favicon.ico">
+    <link rel="icon" href="assets/favicon.png">
+    <link rel="apple-touch-icon" href="assets/favicon.png">
+    <meta content="en" name="language">
+    <meta content="width=device-width, initial-scale=1" name="viewport">
+    <meta name="robots" content="noindex,nofollow,noarchive">
+    <title>Discourse documentation | Discourse - Civilized Discussion</title>
+    <style>
+      body { background: white; }
+
+      * , *:before, *:after {
+        box-sizing: border-box;
+        margin: 0;
+        padding: 0;
+        font-family: "Rubik", Helvetica, Arial, sans-serif;
+      }
+
+      h1 {
+        color: #111;
+        font-weight: 700;
+      }
+
+      h1 a, h1 a:visited {
+        background-image: url(assets/highlight.png);
+        background-size: contain;
+        background-position: bottom;
+        background-repeat: no-repeat;
+        color: black;
+        text-decoration: none;
+      }
+
+      a, a:visited {
+        color: rgb(14, 118, 178);
+        text-decoration: none;
+      }
+
+
+      .site-header-navigation__container {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin: 0 auto;
+        padding: 0 2em;
+      }
+
+      .content-header {
+        text-align: center;
+        margin-bottom: 5em;
+      }
+
+      .content {
+        background-image: url(assets/blobs.svg);
+        background-position: top center;
+        background-repeat: no-repeat;
+        background-size: 100% auto;
+        overflow: hidden;
+        text-align: center;
+        position: relative;
+        width: 100%;
+        min-height: 600px;
+        display: flex;
+        justify-content: center;
+      }
+
+      .content__wrapper {
+        padding: 0 2em;
+      }
+
+      .projects-list {
+        padding: 2em;
+        border-radius: 15px;
+        position: relative;
+        background-image: url(assets/blob-wide-yellow3.svg);
+        background-position: top center;
+        background-repeat: no-repeat;
+        background-size: 100% auto;
+        min-height: 400px;
+        width: 400px;
+      }
+
+      .projects-list__item {
+        list-style: none;
+      }
+    </style>
+  </head>
+
+  <body>
+    <header role="banner" class="site-header-navigation">
+      <div class="site-header-navigation__container">
+        <div class="site-header-navigation__logo">
+          <a href="https://discourse.github.io/discourse">
+            <svg width="385" height="104" viewBox="0 0 300 40">
+              <use xlink:href="assets/logo.svg#logo-large"></use>
+            </svg>
+          </a>
+        </div>
+      </div>
+    </header>
+
+    <header class="content-header">
+      <div class="content__wrapper">
+        <h1><a href="https://www.discourse.org">Discourse</a> projects documentation</h1>
+      </div>
+    </header>
+
+    <main class="content">
+      <div class="content__wrapper">
+        <ul class="projects-list">
+          <li class="projects-list__item">
+            <h4>Chat</h4>
+            <p>
+              <a href="chat/backend/index.html">Backend</a>
+              <span> - </span>
+              <a href="chat/frontend/index.html">Frontend</a>
+            </p>
+          </li>
+        </ul>
+      </div>
+    </main>
+  </body>
+</html>
diff --git a/documentation/yard-custom-template/default/fulldoc/html/setup.rb b/documentation/yard-custom-template/default/fulldoc/html/setup.rb
new file mode 100644
index 00000000000..e536537a490
--- /dev/null
+++ b/documentation/yard-custom-template/default/fulldoc/html/setup.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# Order was not deterministic for identic method names defined with @!method
+# so we sort the list on path instead
+def generate_method_list
+  @items =
+    prune_method_listing(Registry.all(:method), false)
+      .reject { |m| m.name.to_s =~ /=$/ && m.is_attribute? }
+      .sort_by { |m| m.path }
+  @list_title = "Method List"
+  @list_type = "method"
+  generate_list_contents
+end
diff --git a/documentation/yard-custom-template/default/layout/html/footer.erb b/documentation/yard-custom-template/default/layout/html/footer.erb
new file mode 100644
index 00000000000..a38e33bcfdb
--- /dev/null
+++ b/documentation/yard-custom-template/default/layout/html/footer.erb
@@ -0,0 +1,6 @@
+<%# Removes date and ruby version to avoid differences in CI check %>
+<div id="footer">
+  Generated by
+  <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
+  <%= YARD::VERSION %>.
+</div>
diff --git a/documentation/yard-custom-template/default/method_details/setup.rb b/documentation/yard-custom-template/default/method_details/setup.rb
new file mode 100644
index 00000000000..551e7fcbf33
--- /dev/null
+++ b/documentation/yard-custom-template/default/method_details/setup.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+def source
+end
diff --git a/jsconfig.base.json b/jsconfig.base.json
index d85d3dfec34..7b50cf30ba6 100644
--- a/jsconfig.base.json
+++ b/jsconfig.base.json
@@ -9,4 +9,10 @@
     "**/node_modules",
     "**/dist",
   ],
+  "glint": {
+    "environment": [
+      "ember-loose",
+      "ember-template-imports"
+    ]
+  }
 }
diff --git a/lefthook.yml b/lefthook.yml
index be90ea676c1..d7ba1648551 100644
--- a/lefthook.yml
+++ b/lefthook.yml
@@ -11,6 +11,9 @@ pre-commit:
     rubocop:
       glob: "*.rb"
       run: bundle exec rubocop --parallel --force-exclusion {staged_files}
+    syntax_tree:
+      glob: "*.{rb,rake}"
+      run: bundle exec stree check Gemfile {staged_files}
     prettier:
       glob: "*.js"
       include: "app/assets/javascripts|plugins/.+?/assets/javascripts"
diff --git a/lib/admin_user_index_query.rb b/lib/admin_user_index_query.rb
index 49564110bfc..d8569ed0342 100644
--- a/lib/admin_user_index_query.rb
+++ b/lib/admin_user_index_query.rb
@@ -33,24 +33,13 @@ class AdminUserIndexQuery
     find_users_query.count
   end
 
-  def custom_direction
-    if params[:ascending]
-      Discourse.deprecate(
-        ":ascending is deprecated please use :asc instead",
-        output_in_test: true,
-        drop_from: "2.9.0",
-      )
-    end
-    asc = params[:asc] || params[:ascending]
-    asc.present? && asc ? "ASC" : "DESC"
-  end
-
   def initialize_query_with_order(klass)
     order = []
 
     custom_order = params[:order]
+    custom_direction = params[:asc].present? ? "ASC" : "DESC"
     if custom_order.present? &&
-         without_dir = SORTABLE_MAPPING[custom_order.downcase.sub(/ (asc|desc)$/, "")]
+         without_dir = SORTABLE_MAPPING[custom_order.downcase.sub(/ (asc|desc)\z/, "")]
       order << "#{without_dir} #{custom_direction}"
     end
 
diff --git a/lib/age_words.rb b/lib/age_words.rb
index c9bfbfec281..0f6504bcc12 100644
--- a/lib/age_words.rb
+++ b/lib/age_words.rb
@@ -6,7 +6,91 @@ module AgeWords
       "&mdash;"
     else
       now = Time.now
-      FreedomPatches::Rails4.distance_of_time_in_words(now, now + secs)
+      distance_of_time_in_words(now, now + secs)
     end
   end
+
+  # Sam: This has now forked of rails. Trouble is we would never like to use "about 1 month" ever, we only want months for 2 or more months.
+  # Backporting a fix to rails itself may get too complex
+  def self.distance_of_time_in_words(from_time, to_time = 0, include_seconds = false, options = {})
+    options = { scope: :"datetime.distance_in_words" }.merge!(options)
+
+    from_time = from_time.to_time if from_time.respond_to?(:to_time)
+    to_time = to_time.to_time if to_time.respond_to?(:to_time)
+    distance = (to_time.to_f - from_time.to_f).abs
+    distance_in_minutes = (distance / 60.0).round
+    distance_in_seconds = distance.round
+
+    I18n.with_options locale: options[:locale], scope: options[:scope] do |locale|
+      case distance_in_minutes
+      when 0..1
+        unless include_seconds
+          return(
+            (
+              if distance_in_minutes == 0
+                locale.t(:less_than_x_minutes, count: 1)
+              else
+                locale.t(:x_minutes, count: distance_in_minutes)
+              end
+            )
+          )
+        end
+
+        case distance_in_seconds
+        when 0..4
+          locale.t :less_than_x_seconds, count: 5
+        when 5..9
+          locale.t :less_than_x_seconds, count: 10
+        when 10..19
+          locale.t :less_than_x_seconds, count: 20
+        when 20..39
+          locale.t :half_a_minute
+        when 40..59
+          locale.t :less_than_x_minutes, count: 1
+        else
+          locale.t :x_minutes, count: 1
+        end
+      when 2..44
+        locale.t :x_minutes, count: distance_in_minutes
+      when 45..89
+        locale.t :about_x_hours, count: 1
+      when 90..1439
+        locale.t :about_x_hours, count: (distance_in_minutes.to_f / 60.0).round
+      when 1440..2519
+        locale.t :x_days, count: 1
+
+        # this is were we diverge from Rails
+      when 2520..129_599
+        locale.t :x_days, count: (distance_in_minutes.to_f / 1440.0).round
+      when 129_600..525_599
+        locale.t :x_months, count: (distance_in_minutes.to_f / 43200.0).round
+      else
+        fyear = from_time.year
+        fyear += 1 if from_time.month >= 3
+        tyear = to_time.year
+        tyear -= 1 if to_time.month < 3
+        leap_years = (fyear > tyear) ? 0 : (fyear..tyear).count { |x| Date.leap?(x) }
+        minute_offset_for_leap_year = leap_years * 1440
+        # Discount the leap year days when calculating year distance.
+        # e.g. if there are 20 leap year days between 2 dates having the same day
+        # and month then the based on 365 days calculation
+        # the distance in years will come out to over 80 years when in written
+        # english it would read better as about 80 years.
+        minutes_with_offset = distance_in_minutes - minute_offset_for_leap_year
+        remainder = (minutes_with_offset % 525_600)
+        distance_in_years = (minutes_with_offset / 525_600)
+        if remainder < 131_400
+          locale.t(:about_x_years, count: distance_in_years)
+        elsif remainder < 394_200
+          locale.t(:over_x_years, count: distance_in_years)
+        else
+          locale.t(:almost_x_years, count: distance_in_years + 1)
+        end
+      end
+    end
+  end
+
+  def self.time_ago_in_words(from_time, include_seconds = false, options = {})
+    distance_of_time_in_words(from_time, Time.now, include_seconds, options)
+  end
 end
diff --git a/lib/autospec/manager.rb b/lib/autospec/manager.rb
index 87dded1963c..fba758be265 100644
--- a/lib/autospec/manager.rb
+++ b/lib/autospec/manager.rb
@@ -153,7 +153,7 @@ class Autospec::Manager
       filename, _ = failed_specs[0].split(":")
       if filename && File.exist?(filename) && !File.directory?(filename)
         spec = File.read(filename)
-        start, _ = spec.split(/\S*#focus\S*$/)
+        start, _ = spec.split(/\S*#focus\S*\z/)
         if start.length < spec.length
           line = start.scan(/\n/).length + 1
           puts "Found #focus tag on line #{line}!"
@@ -194,7 +194,7 @@ class Autospec::Manager
   def listen_for_changes
     puts "@@@@@@@@@@@@ listen_for_changes" if @debug
 
-    options = { ignore: %r{^lib/autospec} }
+    options = { ignore: %r{\Alib/autospec} }
 
     if @opts[:force_polling]
       options[:force_polling] = true
@@ -216,7 +216,7 @@ class Autospec::Manager
         # process_change can acquire a mutex and block
         # the acceptor
         Thread.new do
-          if file =~ /(es6|js)$/
+          if file =~ /(es6|js)\z/
             process_change([[file]])
           else
             process_change([[file, line]])
diff --git a/lib/autospec/reload_css.rb b/lib/autospec/reload_css.rb
index 78258bed17f..f8fb530aa8e 100644
--- a/lib/autospec/reload_css.rb
+++ b/lib/autospec/reload_css.rb
@@ -10,11 +10,11 @@ class Autospec::ReloadCss
   end
 
   # css, scss, sass or handlebars
-  watch(/\.css$/)
-  watch(/\.ca?ss\.erb$/)
-  watch(/\.s[ac]ss$/)
-  watch(/\.hbs$/)
-  watch(/\.hbr$/)
+  watch(/\.css\z/)
+  watch(/\.ca?ss\.erb\z/)
+  watch(/\.s[ac]ss\z/)
+  watch(/\.hbs\z/)
+  watch(/\.hbr\z/)
 
   def self.message_bus
     MessageBus::Instance.new.tap do |bus|
@@ -44,7 +44,7 @@ class Autospec::ReloadCss
       p = p.sub(/\.sass\.erb/, "")
       p = p.sub(/\.sass/, "")
       p = p.sub(/\.scss/, "")
-      p = p.sub(%r{^app/assets/stylesheets}, "assets")
+      p = p.sub(%r{\Aapp/assets/stylesheets}, "assets")
       { name: p, hash: hash || SecureRandom.hex }
     end
     message_bus.publish "/file-change", paths
diff --git a/lib/autospec/rspec_runner.rb b/lib/autospec/rspec_runner.rb
index 408b6fe79e0..e5efa38e2ea 100644
--- a/lib/autospec/rspec_runner.rb
+++ b/lib/autospec/rspec_runner.rb
@@ -11,29 +11,31 @@ module Autospec
     end
 
     # Discourse specific
-    watch(%r{^lib/(.+)\.rb$}) { |m| "spec/components/#{m[1]}_spec.rb" }
+    watch(%r{\Alib/(.+)\.rb\z}) { |m| "spec/components/#{m[1]}_spec.rb" }
 
-    watch(%r{^app/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
-    watch(%r{^app/(.+)(\.erb|\.haml)$}) { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
-    watch(%r{^spec/.+_spec\.rb$})
-    watch(%r{^spec/support/.+\.rb$}) { "spec" }
+    watch(%r{\Aapp/(.+)\.rb\z}) { |m| "spec/#{m[1]}_spec.rb" }
+    watch(%r{\Aapp/(.+)(\.erb|\.haml)\z}) { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+    watch(%r{\Aspec/.+_spec\.rb\z})
+    watch(%r{\Aspec/support/.+\.rb\z}) { "spec" }
     watch("app/controllers/application_controller.rb") { "spec/requests" }
 
     watch(%r{app/controllers/(.+).rb}) { |m| "spec/requests/#{m[1]}_spec.rb" }
 
-    watch(%r{^app/views/(.+)/.+\.(erb|haml)$}) { |m| "spec/requests/#{m[1]}_spec.rb" }
+    watch(%r{\Aapp/views/(.+)/.+\.(erb|haml)\z}) { |m| "spec/requests/#{m[1]}_spec.rb" }
 
-    watch(%r{^spec/fabricators/.+_fabricator\.rb$}) { "spec" }
+    watch(%r{\Aspec/fabricators/.+_fabricator\.rb\z}) { "spec" }
 
-    watch(%r{^app/assets/javascripts/pretty-text/.*\.js\.es6$}) do
+    watch(%r{\Aapp/assets/javascripts/pretty-text/.*\.js\.es6\z}) do
+      "spec/components/pretty_text_spec.rb"
+    end
+    watch(%r{\Aplugins/.*/discourse-markdown/.*\.js\.es6\z}) do
       "spec/components/pretty_text_spec.rb"
     end
-    watch(%r{^plugins/.*/discourse-markdown/.*\.js\.es6$}) { "spec/components/pretty_text_spec.rb" }
 
-    watch(%r{^plugins/.*/spec/.*\.rb})
-    watch(%r{^(plugins/.*/)plugin\.rb}) { |m| "#{m[1]}spec" }
-    watch(%r{^(plugins/.*)/(lib|app)}) { |m| "#{m[1]}/spec/integration" }
-    watch(%r{^(plugins/.*)/lib/(.*)\.rb}) { |m| "#{m[1]}/spec/lib/#{m[2]}_spec.rb" }
+    watch(%r{\Aplugins/.*/spec/.*\.rb})
+    watch(%r{\A(plugins/.*/)plugin\.rb}) { |m| "#{m[1]}spec" }
+    watch(%r{\A(plugins/.*)/(lib|app)}) { |m| "#{m[1]}/spec/integration" }
+    watch(%r{\A(plugins/.*)/lib/(.*)\.rb}) { |m| "#{m[1]}/spec/lib/#{m[2]}_spec.rb" }
 
     RELOADERS = Set.new
     def self.reload(pattern)
diff --git a/lib/autospec/simple_runner.rb b/lib/autospec/simple_runner.rb
index dcf88e44434..09f813f877c 100644
--- a/lib/autospec/simple_runner.rb
+++ b/lib/autospec/simple_runner.rb
@@ -29,7 +29,7 @@ module Autospec
       # launch rspec
       Dir.chdir(Rails.root) do # rubocop:disable Discourse/NoChdir because this is not part of the app
         env = { "RAILS_ENV" => "test" }
-        if specs.split(" ").any? { |s| s =~ %r{^(./)?plugins} }
+        if specs.split(" ").any? { |s| s =~ %r{\A(./)?plugins} }
           env["LOAD_PLUGINS"] = "1"
           puts "Loading plugins while running specs"
         end
diff --git a/lib/backup_restore/backup_file_handler.rb b/lib/backup_restore/backup_file_handler.rb
index 645fad9f64d..19d79f20e99 100644
--- a/lib/backup_restore/backup_file_handler.rb
+++ b/lib/backup_restore/backup_file_handler.rb
@@ -11,7 +11,7 @@ module BackupRestore
       @filename = filename
       @current_db = current_db
       @root_tmp_directory = root_tmp_directory
-      @is_archive = !(@filename =~ /\.sql\.gz$/)
+      @is_archive = !(@filename =~ /\.sql\.gz\z/)
       @store_location = location
     end
 
diff --git a/lib/backup_restore/backuper.rb b/lib/backup_restore/backuper.rb
index 45780ce9bac..a0b6c923afa 100644
--- a/lib/backup_restore/backuper.rb
+++ b/lib/backup_restore/backuper.rb
@@ -11,7 +11,7 @@ module BackupRestore
       @user_id = user_id
       @client_id = opts[:client_id]
       @publish_to_message_bus = opts[:publish_to_message_bus] || false
-      @with_uploads = opts[:with_uploads].nil? ? include_uploads? : opts[:with_uploads]
+      @with_uploads = opts[:with_uploads] == false ? false : include_uploads?
       @filename_override = opts[:filename]
       @ticket = opts[:ticket]
 
diff --git a/lib/backup_restore/database_restorer.rb b/lib/backup_restore/database_restorer.rb
index 2a3bc6985c7..e913ba99324 100644
--- a/lib/backup_restore/database_restorer.rb
+++ b/lib/backup_restore/database_restorer.rb
@@ -164,7 +164,7 @@ module BackupRestore
 
       DatabaseRestorer.core_migration_files.each do |path|
         require path
-        class_name = File.basename(path, ".rb").sub(/^\d+_/, "").camelize
+        class_name = File.basename(path, ".rb").sub(/\A\d+_/, "").camelize
         migration_class = class_name.constantize
 
         if migration_class.const_defined?(:DROPPED_TABLES)
diff --git a/lib/backup_restore/s3_backup_store.rb b/lib/backup_restore/s3_backup_store.rb
index 10e2798642a..4949ebf7179 100644
--- a/lib/backup_restore/s3_backup_store.rb
+++ b/lib/backup_restore/s3_backup_store.rb
@@ -80,7 +80,7 @@ module BackupRestore
         expires_in: expires_in,
         opts: {
           metadata: metadata,
-          acl: "private",
+          acl: SiteSetting.s3_use_acls ? "private" : nil,
         },
       )
     end
@@ -115,7 +115,7 @@ module BackupRestore
         existing_external_upload_key,
         File.join(s3_helper.s3_bucket_folder_path, original_filename),
         options: {
-          acl: "private",
+          acl: SiteSetting.s3_use_acls ? "private" : nil,
           apply_metadata_to_destination: true,
         },
       )
@@ -173,7 +173,7 @@ module BackupRestore
             path = Regexp.quote(path)
           end
 
-          %r{^#{path}[^/]*\.t?gz$}i
+          %r{\A#{path}[^/]*\.t?gz\z}i
         end
     end
 
diff --git a/lib/badge_queries.rb b/lib/badge_queries.rb
index 4eda8098739..1be3b1a8085 100644
--- a/lib/badge_queries.rb
+++ b/lib/badge_queries.rb
@@ -160,11 +160,15 @@ module BadgeQueries
         FROM invites i
         JOIN invited_users iu ON iu.invite_id = i.id
         JOIN users u2 ON u2.id = iu.user_id
-        WHERE i.deleted_at IS NULL AND u2.active AND u2.trust_level >= #{trust_level.to_i} AND u2.silenced_till IS NULL
+        WHERE i.deleted_at IS NULL
+        AND i.invited_by_id <> u2.id
+        AND u2.active
+        AND u2.trust_level >= #{trust_level.to_i}
+        AND u2.silenced_till IS NULL
         GROUP BY invited_by_id
         HAVING COUNT(*) >= #{count.to_i}
       ) AND u.active AND u.silenced_till IS NULL AND u.id > 0 AND
-        (:backfill OR u.id IN (:user_ids) )
+      (:backfill OR u.id IN (:user_ids) )
     SQL
   end
 
@@ -271,4 +275,32 @@ module BadgeQueries
        WHERE "rank" = 1
     SQL
   end
+
+  def self.anniversaries(start_date, end_date)
+    start_date = start_date.iso8601(6)
+    end_date = end_date.iso8601(6)
+
+    <<~SQL
+      SELECT u.id
+        FROM users AS u
+        JOIN posts AS p ON p.user_id = u.id
+        JOIN topics AS t ON p.topic_id = t.id
+       WHERE u.id > 0
+         AND u.active
+         AND NOT u.staged
+         AND (u.silenced_till IS NULL OR u.silenced_till < '#{start_date}')
+         AND (u.suspended_till IS NULL OR u.suspended_till < '#{start_date}')
+         AND u.created_at <= '#{start_date}'
+         AND NOT p.hidden
+         AND p.deleted_at IS NULL
+         AND p.created_at BETWEEN '#{start_date}' AND '#{end_date}'
+         AND t.visible
+         AND t.archetype <> 'private_message'
+         AND t.deleted_at IS NULL
+         AND NOT EXISTS (SELECT 1 FROM user_badges AS ub WHERE ub.user_id = u.id AND ub.badge_id = #{Badge::Anniversary} AND ub.granted_at BETWEEN '#{start_date}' AND '#{end_date}')
+         AND NOT EXISTS (SELECT 1 FROM anonymous_users AS au WHERE au.user_id = u.id)
+       GROUP BY u.id
+      HAVING COUNT(p.id) > 0
+    SQL
+  end
 end
diff --git a/lib/color_math.rb b/lib/color_math.rb
new file mode 100644
index 00000000000..074b9cc4da9
--- /dev/null
+++ b/lib/color_math.rb
@@ -0,0 +1,132 @@
+# frozen_string_literal: true
+
+module ColorMath
+  # Equivalent to dc-color-brightness() in variables.scss
+  def self.brightness(color)
+    rgb = Converters.hex_to_rgb(color)
+    (rgb[0].to_i * 299 + rgb[1].to_i * 587 + rgb[2].to_i * 114) / 1000.0
+  end
+
+  # Equivalent to dark-light-diff() in variables.scss
+  def self.dark_light_diff(adjusted_color, comparison_color, lightness, darkness)
+    if brightness(adjusted_color) < brightness(comparison_color)
+      scale_color_lightness(adjusted_color, lightness)
+    else
+      scale_color_lightness(adjusted_color, darkness)
+    end
+  end
+
+  # Equivalent to scale_color(color, lightness: ) in sass
+  def self.scale_color_lightness(color, adjustment)
+    rgb = Converters.hex_to_rgb(color)
+    h, s, l = Converters.rgb_to_hsl(*rgb)
+
+    l =
+      if adjustment > 0
+        l + (100 - l) * adjustment
+      else
+        l + l * adjustment
+      end
+
+    rgb = Converters.hsl_to_rgb(h, s, l)
+    Converters.rgb_to_hex(rgb)
+  end
+
+  module Converters
+    # Adapted from https://github.com/anilyanduri/color_math
+    #
+    # The MIT License (MIT)
+    #
+    # Copyright (c) 2016 Anil Yanduri
+    #
+    # Permission is hereby granted, free of charge, to any person obtaining a copy
+    # of this software and associated documentation files (the "Software"), to deal
+    # in the Software without restriction, including without limitation the rights
+    # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    # copies of the Software, and to permit persons to whom the Software is
+    # furnished to do so, subject to the following conditions:
+    #
+    # The above copyright notice and this permission notice shall be included in all
+    # copies or substantial portions of the Software.
+    #
+    # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    # SOFTWARE.
+
+    def self.hex_to_rgb(color)
+      color = color.gsub(/(.)/, '\1\1') if color.length == 3
+      raise new RuntimeError("Hex color must be 6 characters") if color.length != 6
+      color.scan(/../).map { |c| c.to_i(16) }
+    end
+
+    def self.rgb_to_hex(rgb)
+      rgb.map { |c| c.to_s(16).rjust(2, "0") }.join("")
+    end
+
+    def self.rgb_to_hsl(r, g, b)
+      r /= 255.0
+      g /= 255.0
+      b /= 255.0
+      max = [r, g, b].max
+      min = [r, g, b].min
+      h = (max + min) / 2.0
+      s = (max + min) / 2.0
+      l = (max + min) / 2.0
+
+      if (max == min)
+        h = 0
+        s = 0 # achromatic
+      else
+        d = max - min
+        s = l >= 0.5 ? d / (2.0 - max - min) : d / (max + min)
+        case max
+        when r
+          h = (g - b) / d + (g < b ? 6.0 : 0)
+        when g
+          h = (b - r) / d + 2.0
+        when b
+          h = (r - g) / d + 4.0
+        end
+        h /= 6.0
+      end
+      [(h * 360).round, (s * 100).round, (l * 100).round]
+    end
+
+    def self.hsl_to_rgb(h, s, l)
+      h = h / 360.0
+      s = s / 100.0
+      l = l / 100.0
+
+      r = 0.0
+      g = 0.0
+      b = 0.0
+
+      if (s == 0.0)
+        r = l.to_f
+        g = l.to_f
+        b = l.to_f #achromatic
+      else
+        q = l < 0.5 ? l * (1 + s) : l + s - l * s
+        p = 2 * l - q
+        r = hue_to_rgb(p, q, h + 1 / 3.0)
+        g = hue_to_rgb(p, q, h)
+        b = hue_to_rgb(p, q, h - 1 / 3.0)
+      end
+
+      [(r * 255).round, (g * 255).round, (b * 255).round]
+    end
+
+    def self.hue_to_rgb(p, q, t)
+      t += 1 if (t < 0)
+      t -= 1 if (t > 1)
+      return(p + (q - p) * 6 * t) if (t < 1 / 6.0)
+      return q if (t < 1 / 2.0)
+      return(p + (q - p) * (2 / 3.0 - t) * 6) if (t < 2 / 3.0)
+      p
+    end
+  end
+end
diff --git a/lib/common_passwords.rb b/lib/common_passwords.rb
index 5b4aec28e85..cd676ab78e9 100644
--- a/lib/common_passwords.rb
+++ b/lib/common_passwords.rb
@@ -31,7 +31,7 @@ class CommonPasswords
   end
 
   def self.password_list
-    @mutex.synchronize { load_passwords unless redis.scard(LIST_KEY) > 0 }
+    @mutex.synchronize { load_passwords if redis.scard(LIST_KEY) <= 0 }
     RedisPasswordList.new
   end
 
diff --git a/lib/composer_messages_finder.rb b/lib/composer_messages_finder.rb
index 878727f20c9..a74820cc078 100644
--- a/lib/composer_messages_finder.rb
+++ b/lib/composer_messages_finder.rb
@@ -8,7 +8,7 @@ class ComposerMessagesFinder
   end
 
   def self.check_methods
-    @check_methods ||= instance_methods.find_all { |m| m =~ /^check\_/ }
+    @check_methods ||= instance_methods.find_all { |m| m =~ /\Acheck\_/ }
   end
 
   def find
@@ -197,8 +197,8 @@ class ComposerMessagesFinder
         .pluck(:reply_to_user_id)
         .find_all { |uid| uid != @user.id && uid == reply_to_user_id }
 
-    return unless last_x_replies.size == SiteSetting.get_a_room_threshold
-    return unless @topic.posts.count("distinct user_id") >= min_users_posted
+    return if last_x_replies.size != SiteSetting.get_a_room_threshold
+    return if @topic.posts.count("distinct user_id") < min_users_posted
 
     UserHistory.create!(
       action: UserHistory.actions[:notified_about_get_a_room],
@@ -206,7 +206,7 @@ class ComposerMessagesFinder
       topic_id: @details[:topic_id],
     )
 
-    reply_username = User.where(id: last_x_replies[0]).pluck_first(:username)
+    reply_username = User.where(id: last_x_replies[0]).pick(:username)
 
     {
       id: "get_a_room",
@@ -226,6 +226,33 @@ class ComposerMessagesFinder
     }
   end
 
+  def check_dont_feed_the_trolls
+    return if !replying?
+
+    post =
+      if @details[:post_id]
+        Post.find_by(id: @details[:post_id])
+      else
+        @topic&.first_post
+      end
+
+    return if post.blank?
+
+    flags = post.flags.active.group(:user_id).count
+    flagged_by_replier = flags[@user.id].to_i > 0
+    flagged_by_others = flags.values.sum >= SiteSetting.dont_feed_the_trolls_threshold
+
+    return if !flagged_by_replier && !flagged_by_others
+
+    {
+      id: "dont_feed_the_trolls",
+      templateName: "education",
+      wait_for_typing: false,
+      extraClass: "urgent",
+      body: PrettyText.cook(I18n.t("education.dont_feed_the_trolls")),
+    }
+  end
+
   def check_reviving_old_topic
     return unless replying?
     if @topic.nil? || SiteSetting.warn_reviving_old_topic_age < 1 || @topic.last_posted_at.nil? ||
@@ -243,7 +270,7 @@ class ComposerMessagesFinder
           I18n.t(
             "education.reviving_old_topic",
             time_ago:
-              FreedomPatches::Rails4.time_ago_in_words(
+              AgeWords.time_ago_in_words(
                 @topic.last_posted_at,
                 false,
                 scope: :"datetime.distance_in_words_verbose",
diff --git a/lib/compression/gzip.rb b/lib/compression/gzip.rb
index c668b088f72..f32836f957e 100644
--- a/lib/compression/gzip.rb
+++ b/lib/compression/gzip.rb
@@ -38,7 +38,7 @@ module Compression
 
     def build_entry_path(dest_path, _, compressed_file_path)
       basename = File.basename(compressed_file_path)
-      basename.gsub!(/#{Regexp.escape(extension)}$/, "")
+      basename.gsub!(/#{Regexp.escape(extension)}\z/, "")
       File.join(dest_path, basename)
     end
 
diff --git a/lib/configurable_urls.rb b/lib/configurable_urls.rb
index c196b74b12f..feb256ab162 100644
--- a/lib/configurable_urls.rb
+++ b/lib/configurable_urls.rb
@@ -5,15 +5,11 @@ module ConfigurableUrls
     SiteSetting.faq_url.blank? ? "#{Discourse.base_path}/faq" : SiteSetting.faq_url
   end
 
-  def tos_path
-    SiteSetting.tos_url.blank? ? "#{Discourse.base_path}/tos" : SiteSetting.tos_url
+  def tos_url
+    Discourse.tos_url
   end
 
-  def privacy_path
-    if SiteSetting.privacy_policy_url.blank?
-      "#{Discourse.base_path}/privacy"
-    else
-      SiteSetting.privacy_policy_url
-    end
+  def privacy_policy_url
+    Discourse.privacy_policy_url
   end
 end
diff --git a/lib/content_buffer.rb b/lib/content_buffer.rb
index 6d6895811f0..a1582cb55b5 100644
--- a/lib/content_buffer.rb
+++ b/lib/content_buffer.rb
@@ -48,7 +48,7 @@ class ContentBuffer
           @lines.insert(start_row + i, line)
           i += 1
         end
-        @lines.insert(i, "") unless @lines.length > i
+        @lines.insert(i, "") if @lines.length <= i
         @lines[i] = split[-1] + @lines[i]
       end
     end
diff --git a/lib/content_security_policy/extension.rb b/lib/content_security_policy/extension.rb
index 150e0048622..6996e6747de 100644
--- a/lib/content_security_policy/extension.rb
+++ b/lib/content_security_policy/extension.rb
@@ -27,7 +27,7 @@ class ContentSecurityPolicy
 
     def theme_extensions(theme_id)
       key = "theme_extensions_#{theme_id}"
-      cache[key] ||= find_theme_extensions(theme_id)
+      cache.defer_get_set(key) { find_theme_extensions(theme_id) }
     end
 
     def clear_theme_extensions_cache!
@@ -80,7 +80,7 @@ class ContentSecurityPolicy
 
           uri.query = nil # CSP should not include query part of url
 
-          uri_string = uri.to_s.sub(%r{^//}, "") # Protocol-less CSP should not have // at beginning of URL
+          uri_string = uri.to_s.sub(%r{\A//}, "") # Protocol-less CSP should not have // at beginning of URL
 
           auto_script_src_extension[:script_src] << uri_string
         rescue URI::Error
diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb
index 01463bb7761..910d5068d1e 100644
--- a/lib/cooked_post_processor.rb
+++ b/lib/cooked_post_processor.rb
@@ -26,7 +26,7 @@ class CookedPostProcessor
     @category_id = @post&.topic&.category_id
 
     cooked = post.cook(post.raw, @cooking_options)
-    @doc = Loofah.fragment(cooked)
+    @doc = Loofah.html5_fragment(cooked)
     @has_oneboxes = post.post_analyzer.found_oneboxes?
     @size_cache = {}
 
@@ -209,7 +209,7 @@ class CookedPostProcessor
 
       return if upload.animated?
 
-      if img.ancestors(".onebox, .onebox-body, .quote").blank? && !img.classes.include?("onebox")
+      if img.ancestors(".onebox, .onebox-body").blank? && !img.classes.include?("onebox")
         add_lightbox!(img, original_width, original_height, upload, cropped: crop)
       end
 
@@ -228,6 +228,7 @@ class CookedPostProcessor
 
   def optimize_image!(img, upload, cropped: false)
     w, h = img["width"].to_i, img["height"].to_i
+    onebox = img.ancestors(".onebox, .onebox-body").first
 
     # note: optimize_urls cooks the src further after this
     thumbnail = upload.thumbnail(w, h)
@@ -236,21 +237,27 @@ class CookedPostProcessor
 
       srcset = +""
 
-      each_responsive_ratio do |ratio|
-        resized_w = (w * ratio).to_i
-        resized_h = (h * ratio).to_i
+      # Skip srcset for onebox images. Because onebox thumbnails by default
+      # are fairly small the width/height of the smallest thumbnail is likely larger
+      # than what the onebox thumbnail size will be displayed at, so we shouldn't
+      # need to upscale for retina devices
+      if !onebox
+        each_responsive_ratio do |ratio|
+          resized_w = (w * ratio).to_i
+          resized_h = (h * ratio).to_i
 
-        if !cropped && upload.width && resized_w > upload.width
-          cooked_url = UrlHelper.cook_url(upload.url, secure: @post.with_secure_uploads?)
-          srcset << ", #{cooked_url} #{ratio.to_s.sub(/\.0$/, "")}x"
-        elsif t = upload.thumbnail(resized_w, resized_h)
-          cooked_url = UrlHelper.cook_url(t.url, secure: @post.with_secure_uploads?)
-          srcset << ", #{cooked_url} #{ratio.to_s.sub(/\.0$/, "")}x"
+          if !cropped && upload.width && resized_w > upload.width
+            cooked_url = UrlHelper.cook_url(upload.url, secure: @post.with_secure_uploads?)
+            srcset << ", #{cooked_url} #{ratio.to_s.sub(/\.0\z/, "")}x"
+          elsif t = upload.thumbnail(resized_w, resized_h)
+            cooked_url = UrlHelper.cook_url(t.url, secure: @post.with_secure_uploads?)
+            srcset << ", #{cooked_url} #{ratio.to_s.sub(/\.0\z/, "")}x"
+          end
+
+          img[
+            "srcset"
+          ] = "#{UrlHelper.cook_url(img["src"], secure: @post.with_secure_uploads?)}#{srcset}" if srcset.present?
         end
-
-        img[
-          "srcset"
-        ] = "#{UrlHelper.cook_url(img["src"], secure: @post.with_secure_uploads?)}#{srcset}" if srcset.present?
       end
     else
       img["src"] = upload.url
@@ -295,7 +302,7 @@ class CookedPostProcessor
 
   def get_filename(upload, src)
     return File.basename(src) unless upload
-    return upload.original_filename unless upload.original_filename =~ /^blob(\.png)?$/i
+    return upload.original_filename unless upload.original_filename =~ /\Ablob(\.png)?\z/i
     I18n.t("upload.pasted_image_filename")
   end
 
@@ -385,6 +392,8 @@ class CookedPostProcessor
   end
 
   def process_hotlinked_image(img)
+    onebox = img.ancestors(".onebox, .onebox-body").first
+
     @hotlinked_map ||= @post.post_hotlinked_media.preload(:upload).map { |r| [r.url, r] }.to_h
     normalized_src =
       PostHotlinkedMedia.normalize_src(img["src"] || img[PrettyText::BLOCKED_HOTLINKED_SRC_ATTR])
@@ -393,7 +402,7 @@ class CookedPostProcessor
     still_an_image = true
 
     if info&.too_large?
-      if img.ancestors(".onebox, .onebox-body").blank?
+      if !onebox || onebox.element_children.size == 1
         add_large_image_placeholder!(img)
       else
         img.remove
@@ -401,7 +410,7 @@ class CookedPostProcessor
 
       still_an_image = false
     elsif info&.download_failed?
-      if img.ancestors(".onebox, .onebox-body").blank?
+      if !onebox || onebox.element_children.size == 1
         add_broken_image_placeholder!(img)
       else
         img.remove
@@ -410,6 +419,7 @@ class CookedPostProcessor
       still_an_image = false
     elsif info&.downloaded? && upload = info&.upload
       img["src"] = UrlHelper.cook_url(upload.url, secure: @with_secure_uploads)
+      img["data-dominant-color"] = upload.dominant_color(calculate_if_missing: true).presence
       img.delete(PrettyText::BLOCKED_HOTLINKED_SRC_ATTR)
     end
 
diff --git a/lib/cooked_processor_mixin.rb b/lib/cooked_processor_mixin.rb
index a3c2f466918..1ad4d74853a 100644
--- a/lib/cooked_processor_mixin.rb
+++ b/lib/cooked_processor_mixin.rb
@@ -70,7 +70,7 @@ module CookedProcessorMixin
           found = false
           parent = img
           while parent = parent.parent
-            if parent["class"] && parent["class"].include?("allowlistedgeneric")
+            if parent["class"] && parent["class"].match?(/\b(allowlistedgeneric|discoursetopic)\b/)
               found = true
               break
             end
@@ -135,7 +135,7 @@ module CookedProcessorMixin
 
   def get_size_from_attributes(img)
     w, h = img["width"].to_i, img["height"].to_i
-    return w, h unless w <= 0 || h <= 0
+    return w, h if w > 0 && h > 0
     # if only width or height are specified attempt to scale image
     if w > 0 || h > 0
       w = w.to_f
@@ -174,7 +174,7 @@ module CookedProcessorMixin
     return @size_cache[url] if @size_cache.has_key?(url)
 
     absolute_url = url
-    absolute_url = Discourse.base_url_no_prefix + absolute_url if absolute_url =~ %r{^/[^/]}
+    absolute_url = Discourse.base_url_no_prefix + absolute_url if absolute_url =~ %r{\A/[^/]}
 
     return unless absolute_url
 
diff --git a/lib/discourse.rb b/lib/discourse.rb
index 577ae781008..521b3ec2186 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -191,6 +191,18 @@ module Discourse
 
   reset_job_exception_stats!
 
+  if Rails.env.test?
+    def self.catch_job_exceptions!
+      raise "tests only" if !Rails.env.test?
+      @catch_job_exceptions = true
+    end
+
+    def self.reset_catch_job_exceptions!
+      raise "tests only" if !Rails.env.test?
+      remove_instance_variable(:@catch_job_exceptions)
+    end
+  end
+
   # Log an exception.
   #
   # If your code is in a scheduled job, it is recommended to use the
@@ -220,7 +232,7 @@ module Discourse
       { current_db: cm.current_db, current_hostname: cm.current_hostname }.merge(context),
     )
 
-    raise ex if Rails.env.test?
+    raise ex if Rails.env.test? && !@catch_job_exceptions
   end
 
   # Expected less matches than what we got in a find
@@ -315,23 +327,17 @@ module Discourse
     @anonymous_top_menu_items ||= Discourse.anonymous_filters + %i[categories top]
   end
 
+  # list of pixel ratios Discourse tries to optimize for
   PIXEL_RATIOS ||= [1, 1.5, 2, 3]
 
   def self.avatar_sizes
     # TODO: should cache these when we get a notification system for site settings
-    set = Set.new
-
-    SiteSetting
-      .avatar_sizes
-      .split("|")
-      .map(&:to_i)
-      .each { |size| PIXEL_RATIOS.each { |pixel_ratio| set << (size * pixel_ratio).to_i } }
-
-    set
+    Set.new(SiteSetting.avatar_sizes.split("|").map(&:to_i))
   end
 
   def self.activate_plugins!
     @plugins = []
+    @plugins_by_name = {}
     Plugin::Instance
       .find_all("#{Rails.root}/plugins")
       .each do |p|
@@ -339,6 +345,18 @@ module Discourse
         if Discourse.has_needed_version?(Discourse::VERSION::STRING, v)
           p.activate!
           @plugins << p
+          @plugins_by_name[p.name] = p
+
+          # The plugin directory name and metadata name should match, but that
+          # is not always the case
+          dir_name = p.path.split("/")[-2]
+          if p.name != dir_name
+            STDERR.puts "Plugin name is '#{p.name}', but plugin directory is named '#{dir_name}'"
+            # Plugins are looked up by directory name in SiteSettingExtension
+            # because SiteSetting.load_settings uses directory name as plugin
+            # name. We alias the two names just to make sure the look up works
+            @plugins_by_name[dir_name] = p
+          end
         else
           STDERR.puts "Could not activate #{p.metadata.name}, discourse does not meet required version (#{v})"
         end
@@ -346,20 +364,16 @@ module Discourse
     DiscourseEvent.trigger(:after_plugin_activation)
   end
 
-  def self.disabled_plugin_names
-    plugins.select { |p| !p.enabled? }.map(&:name)
-  end
-
   def self.plugins
     @plugins ||= []
   end
 
-  def self.hidden_plugins
-    @hidden_plugins ||= []
+  def self.plugins_by_name
+    @plugins_by_name ||= {}
   end
 
   def self.visible_plugins
-    self.plugins - self.hidden_plugins
+    plugins.filter(&:visible?)
   end
 
   def self.plugin_themes
@@ -417,6 +431,7 @@ module Discourse
           end
     end
 
+    assets.map! { |asset| "#{asset}_rtl" } if args[:rtl]
     assets
   end
 
@@ -582,6 +597,48 @@ module Discourse
     alias_method :base_url_no_path, :base_url_no_prefix
   end
 
+  def self.urls_cache
+    @urls_cache ||= DistributedCache.new("urls_cache")
+  end
+
+  def self.tos_url
+    if SiteSetting.tos_url.present?
+      SiteSetting.tos_url
+    else
+      urls_cache["tos"] ||= (
+        if SiteSetting.tos_topic_id > 0 && Topic.exists?(id: SiteSetting.tos_topic_id)
+          "#{Discourse.base_path}/tos"
+        else
+          :nil
+        end
+      )
+
+      urls_cache["tos"] != :nil ? urls_cache["tos"] : nil
+    end
+  end
+
+  def self.privacy_policy_url
+    if SiteSetting.privacy_policy_url.present?
+      SiteSetting.privacy_policy_url
+    else
+      urls_cache["privacy_policy"] ||= (
+        if SiteSetting.privacy_topic_id > 0 && Topic.exists?(id: SiteSetting.privacy_topic_id)
+          "#{Discourse.base_path}/privacy"
+        else
+          :nil
+        end
+      )
+
+      urls_cache["privacy_policy"] != :nil ? urls_cache["privacy_policy"] : nil
+    end
+  end
+
+  def self.clear_urls!
+    urls_cache.clear
+  end
+
+  LAST_POSTGRES_READONLY_KEY = "postgres:last_readonly"
+
   READONLY_MODE_KEY_TTL ||= 60
   READONLY_MODE_KEY ||= "readonly_mode"
   PG_READONLY_MODE_KEY ||= "readonly_mode:postgres"
@@ -589,7 +646,7 @@ module Discourse
   USER_READONLY_MODE_KEY ||= "readonly_mode:user"
   PG_FORCE_READONLY_MODE_KEY ||= "readonly_mode:postgres_force"
 
-  # Psuedo readonly mode, where staff can still write
+  # Pseudo readonly mode, where staff can still write
   STAFF_WRITES_ONLY_MODE_KEY ||= "readonly_mode:staff_writes_only"
 
   READONLY_KEYS ||= [
@@ -679,7 +736,7 @@ module Discourse
   end
 
   def self.readonly_mode?(keys = READONLY_KEYS)
-    recently_readonly? || Discourse.redis.exists?(*keys)
+    recently_readonly? || GlobalSetting.pg_force_readonly_mode || Discourse.redis.exists?(*keys)
   end
 
   def self.staff_writes_only_mode?
@@ -692,7 +749,7 @@ module Discourse
 
   # Shared between processes
   def self.postgres_last_read_only
-    @postgres_last_read_only ||= DistributedCache.new("postgres_last_read_only", namespace: false)
+    @postgres_last_read_only ||= DistributedCache.new("postgres_last_read_only")
   end
 
   # Per-process
@@ -700,20 +757,30 @@ module Discourse
     @redis_last_read_only ||= {}
   end
 
+  def self.postgres_recently_readonly?
+    seconds =
+      postgres_last_read_only.defer_get_set("timestamp") { redis.get(LAST_POSTGRES_READONLY_KEY) }
+
+    seconds ? Time.zone.at(seconds.to_i) > 15.seconds.ago : false
+  end
+
   def self.recently_readonly?
-    postgres_read_only = postgres_last_read_only[Discourse.redis.namespace]
     redis_read_only = redis_last_read_only[Discourse.redis.namespace]
 
-    (redis_read_only.present? && redis_read_only > 15.seconds.ago) ||
-      (postgres_read_only.present? && postgres_read_only > 15.seconds.ago)
+    (redis_read_only.present? && redis_read_only > 15.seconds.ago) || postgres_recently_readonly?
   end
 
   def self.received_postgres_readonly!
-    postgres_last_read_only[Discourse.redis.namespace] = Time.zone.now
+    time = Time.zone.now
+    redis.set(LAST_POSTGRES_READONLY_KEY, time.to_i.to_s)
+    postgres_last_read_only.clear(after_commit: false)
+
+    time
   end
 
   def self.clear_postgres_readonly!
-    postgres_last_read_only[Discourse.redis.namespace] = nil
+    redis.del(LAST_POSTGRES_READONLY_KEY)
+    postgres_last_read_only.clear(after_commit: false)
   end
 
   def self.received_redis_readonly!
@@ -753,10 +820,8 @@ module Discourse
 
   def self.git_branch
     @git_branch ||=
-      begin
-        git_cmd = "git rev-parse --abbrev-ref HEAD"
-        self.try_git(git_cmd, "unknown")
-      end
+      self.try_git("git branch --show-current", nil) ||
+        self.try_git("git config user.discourse-version", "unknown")
   end
 
   def self.full_version
@@ -777,17 +842,11 @@ module Discourse
   end
 
   def self.try_git(git_cmd, default_value)
-    version_value = false
-
     begin
-      version_value = `#{git_cmd}`.strip
+      `#{git_cmd}`.strip
     rescue StandardError
-      version_value = default_value
-    end
-
-    version_value = default_value if version_value.empty?
-
-    version_value
+      default_value
+    end.presence || default_value
   end
 
   # Either returns the site_contact_username user or the first admin.
@@ -952,14 +1011,15 @@ module Discourse
 
     raise Deprecation.new(warning) if raise_error
 
-    STDERR.puts(warning) if Rails.env == "development"
+    STDERR.puts(warning) if Rails.env.development?
 
-    STDERR.puts(warning) if output_in_test && Rails.env == "test"
+    STDERR.puts(warning) if output_in_test && Rails.env.test?
 
     digest = Digest::MD5.hexdigest(warning)
     redis_key = "deprecate-notice-#{digest}"
 
-    if Rails.logger && !Discourse.redis.without_namespace.get(redis_key)
+    if !Rails.env.development? && Rails.logger && !GlobalSetting.skip_redis? &&
+         !Discourse.redis.without_namespace.get(redis_key)
       Rails.logger.warn(warning)
       begin
         Discourse.redis.without_namespace.setex(redis_key, 3600, "x")
@@ -1081,6 +1141,7 @@ module Discourse
         Discourse.git_version
         Discourse.git_branch
         Discourse.full_version
+        Discourse.plugins.each { |p| p.commit_url }
       end,
       Thread.new do
         require "actionview_precompiler"
diff --git a/lib/discourse_connect_base.rb b/lib/discourse_connect_base.rb
index b5e04d8f212..f39c2556fb6 100644
--- a/lib/discourse_connect_base.rb
+++ b/lib/discourse_connect_base.rb
@@ -99,7 +99,7 @@ class DiscourseConnectBase
     end
 
     decoded_hash.each do |k, v|
-      if field = k[/^custom\.(.+)$/, 1]
+      if field = k[/\Acustom\.(.+)\z/, 1]
         sso.custom_fields[field] = v
       end
     end
diff --git a/lib/discourse_dev/email_log.rb b/lib/discourse_dev/email_log.rb
new file mode 100644
index 00000000000..b7d94c27090
--- /dev/null
+++ b/lib/discourse_dev/email_log.rb
@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require "discourse_dev/record"
+require "faker"
+
+module DiscourseDev
+  class EmailLog < Record
+    def initialize
+      super(::EmailLog, DiscourseDev.config.email_logs[:count])
+    end
+
+    def create_sent!
+      ::EmailLog.create!(email_log_data)
+    end
+
+    def create_bounced!
+      bounce_key = SecureRandom.hex
+      email_local_part, email_domain = SiteSetting.notification_email.split("@")
+      bounced_to_address = "#{email_local_part}+verp-#{bounce_key}@#{email_domain}"
+      bounce_data =
+        email_log_data.merge(
+          to_address: bounced_to_address,
+          bounced: true,
+          bounce_key: bounce_key,
+          bounce_error_code: "5.0.0",
+        )
+
+      # Bounced email logs require a matching incoming email record
+      ::IncomingEmail.create!(
+        incoming_email_data.merge(to_addresses: bounced_to_address, is_bounce: true),
+      )
+      ::EmailLog.create!(bounce_data)
+    end
+
+    def create_rejected!
+      ::IncomingEmail.create!(incoming_email_data)
+    end
+
+    def email_log_data
+      {
+        to_address: User.random.email,
+        email_type: :digest,
+        user_id: User.random.id,
+        raw: Faker::Lorem.paragraph,
+      }
+    end
+
+    def incoming_email_data
+      user = User.random
+      subject = Faker::Lorem.sentence
+      email_content = <<-EMAIL
+        Return-Path: #{user.email}
+        From: #{user.email}
+        Date: #{Date.today}
+        Mime-Version: "1.0"
+        Content-Type: "text/plain"
+        Content-Transfer-Encoding: "7bit"
+
+        #{Faker::Lorem.paragraph}
+      EMAIL
+
+      {
+        user_id: user.id,
+        from_address: user.email,
+        raw: email_content,
+        error: Faker::Lorem.sentence,
+        rejection_message: I18n.t("emails.incoming.errors.bounced_email_error"),
+      }
+    end
+
+    def populate!
+      @count.times { create_sent! }
+      @count.times { create_bounced! }
+      @count.times { create_rejected! }
+    end
+  end
+end
diff --git a/lib/discourse_dev/record.rb b/lib/discourse_dev/record.rb
index b1b84097df2..d01baa5fa3e 100644
--- a/lib/discourse_dev/record.rb
+++ b/lib/discourse_dev/record.rb
@@ -37,7 +37,7 @@ module DiscourseDev
         raise 'To run this rake task in a production site, set the value of `ALLOW_DEV_POPULATE` environment variable to "1"'
       end
 
-      unless ignore_current_count
+      unless ignore_current_count || @ignore_current_count
         if current_count >= @count
           puts "Already have #{current_count} #{type} records"
 
@@ -68,8 +68,8 @@ module DiscourseDev
       model.count
     end
 
-    def self.populate!(*args)
-      self.new(*args).populate!
+    def self.populate!(**args)
+      self.new(**args).populate!
     end
 
     def self.random(model, use_existing_records: true)
diff --git a/lib/discourse_diff.rb b/lib/discourse_diff.rb
index e31a699f85a..16a27b67472 100644
--- a/lib/discourse_diff.rb
+++ b/lib/discourse_diff.rb
@@ -160,7 +160,7 @@ class DiscourseDiff
     while i < text.size
       if text[i] =~ /\w/
         t << text[i]
-      elsif text[i] =~ /[ \t]/ && t.join =~ /^\w+$/
+      elsif text[i] =~ /[ \t]/ && t.join =~ /\A\w+\z/
         begin
           t << text[i]
           i += 1
diff --git a/lib/discourse_event.rb b/lib/discourse_event.rb
index 43c85487651..64a467bd77c 100644
--- a/lib/discourse_event.rb
+++ b/lib/discourse_event.rb
@@ -13,14 +13,15 @@ class DiscourseEvent
   end
 
   def self.on(event_name, &block)
-    if event_name == :site_setting_saved
+    if event_name == :user_badge_removed
       Discourse.deprecate(
-        "The :site_setting_saved event is deprecated. Please use :site_setting_changed instead",
-        since: "2.3.0beta8",
-        drop_from: "2.4",
-        raise_error: true,
+        "The :user_badge_removed event is deprecated. Please use :user_badge_revoked instead",
+        since: "3.1.0.beta5",
+        drop_from: "3.2.0.beta1",
+        output_in_test: true,
       )
     end
+
     events[event_name] << block
   end
 
diff --git a/lib/discourse_hub.rb b/lib/discourse_hub.rb
index 4b5b36d4811..74f18dbcf42 100644
--- a/lib/discourse_hub.rb
+++ b/lib/discourse_hub.rb
@@ -5,7 +5,7 @@ module DiscourseHub
 
   def self.version_check_payload
     default_payload = { installed_version: Discourse::VERSION::STRING }.merge!(
-      Discourse.git_branch == "unknown" ? {} : { branch: Discourse.git_branch },
+      Discourse.git_branch == "unknown" && !Rails.env.test? ? {} : { branch: Discourse.git_branch },
     )
     default_payload.merge!(get_payload)
   end
diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index ae167ffe57f..d9c16de74f9 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -6,22 +6,14 @@ class DiscourseJsProcessor
   class TranspileError < StandardError
   end
 
+  # To generate a list of babel plugins used by ember-cli, set
+  # babel: { debug: true } in ember-cli-build.js, then run `yarn ember build -prod`
   DISCOURSE_COMMON_BABEL_PLUGINS = [
-    "proposal-optional-chaining",
     ["proposal-decorators", { legacy: true }],
-    "transform-template-literals",
     "proposal-class-properties",
-    "proposal-class-static-block",
-    "proposal-private-property-in-object",
     "proposal-private-methods",
-    "proposal-numeric-separator",
-    "proposal-logical-assignment-operators",
-    "proposal-nullish-coalescing-operator",
-    "proposal-json-strings",
-    "proposal-optional-catch-binding",
+    "proposal-class-static-block",
     "transform-parameters",
-    "proposal-async-generator-functions",
-    "proposal-object-rest-spread",
     "proposal-export-namespace-from",
   ]
 
@@ -168,6 +160,16 @@ class DiscourseJsProcessor
         "node_modules/babel-plugin-ember-template-compilation/src/expression-parser.js",
         wrap_in_module: "babel-plugin-ember-template-compilation/expression-parser",
       )
+      load_file_in_context(
+        ctx,
+        "node_modules/babel-plugin-ember-template-compilation/src/js-utils.js",
+        wrap_in_module: "babel-plugin-ember-template-compilation/js-utils",
+      )
+      load_file_in_context(
+        ctx,
+        "node_modules/babel-plugin-ember-template-compilation/src/public-types.js",
+        wrap_in_module: "babel-plugin-ember-template-compilation/public-types",
+      )
       load_file_in_context(
         ctx,
         "node_modules/babel-import-util/src/index.js",
@@ -180,7 +182,10 @@ class DiscourseJsProcessor
       )
 
       # Widget HBS compiler
-      widget_hbs_compiler_source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js")
+      widget_hbs_compiler_source =
+        File.read(
+          "#{Rails.root}/app/assets/javascripts/discourse-widget-hbs/lib/widget-hbs-compiler.js",
+        )
       widget_hbs_compiler_source = <<~JS
         define("widget-hbs-compiler", ["exports"], function(exports){
           #{widget_hbs_compiler_source}
@@ -288,7 +293,7 @@ class DiscourseJsProcessor
         "transpile",
         source,
         {
-          skip_module: @skip_module,
+          skipModule: @skip_module,
           moduleId: module_name(root_path, logical_path),
           filename: logical_path || "unknown",
           themeId: theme_id,
diff --git a/lib/discourse_plugin_registry.rb b/lib/discourse_plugin_registry.rb
index 9f0fd9e6082..697d93474f4 100644
--- a/lib/discourse_plugin_registry.rb
+++ b/lib/discourse_plugin_registry.rb
@@ -72,6 +72,7 @@ class DiscoursePluginRegistry
   define_register :seedfu_filter, Set
   define_register :demon_processes, Set
   define_register :groups_callback_for_users_search_controller_action, Hash
+  define_register :mail_pollers, Set
 
   define_filtered_register :staff_user_custom_fields
   define_filtered_register :public_user_custom_fields
@@ -106,10 +107,23 @@ class DiscoursePluginRegistry
   define_filtered_register :hashtag_autocomplete_data_sources
   define_filtered_register :hashtag_autocomplete_contextual_type_priorities
 
+  define_filtered_register :search_groups_set_query_callbacks
+
+  define_filtered_register :about_stat_groups
+  define_filtered_register :bookmarkables
+
+  define_filtered_register :list_suggested_for_providers
+
+  define_filtered_register :summarization_strategies
+
   def self.register_auth_provider(auth_provider)
     self.auth_providers << auth_provider
   end
 
+  def self.register_mail_poller(mail_poller)
+    self.mail_pollers << mail_poller
+  end
+
   def register_js(filename, options = {})
     # If we have a server side option, add that too.
     self.class.javascripts << filename
@@ -156,8 +170,8 @@ class DiscoursePluginRegistry
     end
   end
 
-  JS_REGEX = /\.js$|\.js\.erb$|\.js\.es6$/
-  HANDLEBARS_REGEX = /\.(hb[rs]|js\.handlebars)$/
+  JS_REGEX = /\.js$|\.js\.erb$|\.js\.es6\z/
+  HANDLEBARS_REGEX = /\.(hb[rs]|js\.handlebars)\z/
 
   def self.register_asset(asset, opts = nil, plugin_directory_name = nil)
     if asset =~ JS_REGEX
@@ -170,7 +184,7 @@ class DiscoursePluginRegistry
       else
         self.javascripts << asset
       end
-    elsif asset =~ /\.css$|\.scss$/
+    elsif asset =~ /\.css$|\.scss\z/
       if opts == :mobile
         self.mobile_stylesheets[plugin_directory_name] ||= Set.new
         self.mobile_stylesheets[plugin_directory_name] << asset
@@ -239,8 +253,54 @@ class DiscoursePluginRegistry
     asset
   end
 
+  def self.clear_modifiers!
+    if Rails.env.test? && GlobalSetting.load_plugins?
+      raise "Clearing modifiers during a plugin spec run will affect all future specs. Use unregister_modifier instead."
+    end
+    @modifiers = nil
+  end
+
+  def self.register_modifier(plugin_instance, name, &blk)
+    @modifiers ||= {}
+    modifiers = @modifiers[name] ||= []
+    modifiers << [plugin_instance, blk]
+  end
+
+  def self.unregister_modifier(plugin_instance, name, &blk)
+    raise "unregister_modifier can only be used in tests" if !Rails.env.test?
+
+    modifiers_for_name = @modifiers&.[](name)
+    raise "no #{name} modifiers found" if !modifiers_for_name
+
+    i = modifiers_for_name.find_index { |info| info == [plugin_instance, blk] }
+    raise "no modifier found for that plugin/block combination" if !i
+
+    modifiers_for_name.delete_at(i)
+  end
+
+  def self.apply_modifier(name, arg, *more_args)
+    return arg if !@modifiers
+
+    registered_modifiers = @modifiers[name]
+    return arg if !registered_modifiers
+
+    # iterate as fast as possible to minimize cost (avoiding each)
+    # also erases one stack frame
+    length = registered_modifiers.length
+    index = 0
+    while index < length
+      plugin_instance, block = registered_modifiers[index]
+      arg = block.call(arg, *more_args) if plugin_instance.enabled?
+
+      index += 1
+    end
+
+    arg
+  end
+
   def self.reset!
     @@register_names.each { |name| instance_variable_set(:"@#{name}", nil) }
+    clear_modifiers!
   end
 
   def self.reset_register!(register_name)
diff --git a/lib/discourse_redis.rb b/lib/discourse_redis.rb
index e47e9734c56..b719082336f 100644
--- a/lib/discourse_redis.rb
+++ b/lib/discourse_redis.rb
@@ -213,10 +213,6 @@ class DiscourseRedis
     end
   end
 
-  def delete_prefixed(prefix)
-    DiscourseRedis.ignore_readonly { keys("#{prefix}*").each { |k| Discourse.redis.del(k) } }
-  end
-
   def reconnect
     @redis._client.reconnect
   end
@@ -276,7 +272,7 @@ class DiscourseRedis
     def eval(redis, *args, **kwargs)
       redis.evalsha @sha1, *args, **kwargs
     rescue ::Redis::CommandError => e
-      if e.to_s =~ /^NOSCRIPT/
+      if e.to_s =~ /\ANOSCRIPT/
         redis.eval @script, *args, **kwargs
       else
         raise
diff --git a/lib/discourse_tagging.rb b/lib/discourse_tagging.rb
index 0fd1583be1a..6aac1518881 100644
--- a/lib/discourse_tagging.rb
+++ b/lib/discourse_tagging.rb
@@ -102,6 +102,12 @@ module DiscourseTagging
           end
         end
 
+        # tests if there are conflicts between tags on tag groups that only allow one tag from the group before adding
+        # mandatory parent tags because later we want to test if the mandatory parent tags introduce any conflicts
+        # and be able to pinpoint the tag that is introducing it
+        # guardian like above is nil to prevent stripping tags that already passed validation
+        return false unless validate_one_tag_from_group_per_topic(nil, topic, category, tags)
+
         # add missing mandatory parent tags
         tag_ids = tags.map(&:id)
 
@@ -132,7 +138,57 @@ module DiscourseTagging
             .compact
             .uniq
 
-        tags = tags + Tag.where(id: missing_parent_tag_ids).all unless missing_parent_tag_ids.empty?
+        missing_parent_tags = Tag.where(id: missing_parent_tag_ids).all
+
+        tags = tags + missing_parent_tags unless missing_parent_tags.empty?
+
+        parent_tag_conflicts =
+          filter_tags_violating_one_tag_from_group_per_topic(
+            nil, # guardian like above is nil to prevent stripping tags that already passed validation
+            topic.category,
+            tags,
+          )
+
+        if parent_tag_conflicts.present?
+          # we need to get the original tag names that introduced conflicting missing parent tags to return an useful
+          # error message
+          parent_child_names_map = {}
+          parent_tags_map.each do |tag_id, parent_tag_ids|
+            next if (tag_ids & parent_tag_ids).size > 0 # tag already has a parent tag
+
+            parent_tag = tags.select { |t| t.id == parent_tag_ids.first }.first
+            original_child_tag = tags.select { |t| t.id == tag_id }.first
+
+            next unless parent_tag.present? && original_child_tag.present?
+            parent_child_names_map[parent_tag.name] = original_child_tag.name
+          end
+
+          # replaces the added missing parent tags with the original tag
+          parent_tag_conflicts.map do |_, conflicting_tags|
+            topic.errors.add(
+              :base,
+              I18n.t(
+                "tags.limited_to_one_tag_from_group",
+                tags:
+                  conflicting_tags
+                    .map do |tag|
+                      tag_name = tag.name
+
+                      if parent_child_names_map[tag_name].present?
+                        parent_child_names_map[tag_name]
+                      else
+                        tag_name
+                      end
+                    end
+                    .uniq
+                    .sort
+                    .join(", "),
+              ),
+            )
+          end
+
+          return false
+        end
 
         return false unless validate_min_required_tags_for_category(guardian, topic, category, tags)
         return false unless validate_required_tags_from_group(guardian, topic, category, tags)
@@ -163,6 +219,19 @@ module DiscourseTagging
     false
   end
 
+  def self.validate_category_tags(guardian, model, category, tags = [])
+    existing_tags = tags.present? ? Tag.where(name: tags) : []
+    valid_tags = guardian.can_create_tag? ? tags : existing_tags
+
+    # all add to model (topic) errors
+    valid = validate_min_required_tags_for_category(guardian, model, category, valid_tags)
+    valid &&= validate_required_tags_from_group(guardian, model, category, existing_tags)
+    valid &&= validate_category_restricted_tags(guardian, model, category, valid_tags)
+    valid &&= validate_one_tag_from_group_per_topic(guardian, model, category, valid_tags)
+
+    valid
+  end
+
   def self.validate_min_required_tags_for_category(guardian, model, category, tags = [])
     if !guardian.is_staff? && category && category.minimum_required_tags > 0 &&
          tags.length < category.minimum_required_tags
@@ -250,6 +319,54 @@ module DiscourseTagging
     true
   end
 
+  def self.validate_one_tag_from_group_per_topic(guardian, model, category, tags = [])
+    tags_cant_be_used = filter_tags_violating_one_tag_from_group_per_topic(guardian, category, tags)
+
+    return true if tags_cant_be_used.blank?
+
+    tags_cant_be_used.each do |_, incompatible_tags|
+      model.errors.add(
+        :base,
+        I18n.t(
+          "tags.limited_to_one_tag_from_group",
+          tags: incompatible_tags.map(&:name).sort.join(", "),
+        ),
+      )
+    end
+
+    false
+  end
+
+  def self.filter_tags_violating_one_tag_from_group_per_topic(guardian, category, tags = [])
+    return [] if tags.size < 2
+
+    # ensures that tags are a list of tag names
+    tags = tags.map(&:name) if Tag === tags[0]
+
+    allowed_tags =
+      filter_allowed_tags(
+        guardian,
+        category: category,
+        only_tag_names: tags,
+        for_topic: true,
+        order_search_results: true,
+      )
+
+    return {} if allowed_tags.size < 2
+
+    tags_by_group_map =
+      allowed_tags
+        .sort_by { |tag| [tag.tag_group_id || -1, tag.name] }
+        .inject({}) do |hash, tag|
+          next hash unless tag.one_per_topic
+
+          hash[tag.tag_group_id] = (hash[tag.tag_group_id] || []) << tag
+          hash
+        end
+
+    tags_by_group_map.select { |_, group_tags| group_tags.size > 1 }
+  end
+
   TAG_GROUP_RESTRICTIONS_SQL ||= <<~SQL
     tag_group_restrictions AS (
       SELECT t.id as tag_id, tgm.id as tgm_id, tg.id as tag_group_id, tg.parent_tag_id as parent_tag_id,
@@ -457,7 +574,7 @@ module DiscourseTagging
 
       if !one_tag_per_group_ids.empty?
         builder.where(
-          "tag_group_id IS NULL OR tag_group_id NOT IN (?) OR id IN (:selected_tag_ids)",
+          "t.id NOT IN (SELECT DISTINCT tag_id FROM tag_group_restrictions WHERE tag_group_id IN (?)) OR id IN (:selected_tag_ids)",
           one_tag_per_group_ids,
         )
       end
@@ -634,7 +751,10 @@ module DiscourseTagging
       taggable.tags = Tag.where_name(tag_names).all
       new_tag_names =
         taggable.tags.size < tag_names.size ? tag_names - taggable.tags.map(&:name) : []
-      taggable.tags << Tag.where(target_tag_id: taggable.tags.map(&:id)).all
+      taggable.tags << Tag
+        .where(target_tag_id: taggable.tags.map(&:id))
+        .where.not(id: taggable.tags.map(&:id))
+        .all
       new_tag_names.each { |name| taggable.tags << Tag.create(name: name) }
     end
   end
@@ -653,6 +773,16 @@ module DiscourseTagging
     successful = existing.select { |t| !t.errors.present? }
     synonyms_ids = successful.map(&:id)
     TopicTag.where(topic_id: target_tag.topics.with_deleted, tag_id: synonyms_ids).delete_all
+    TopicTag.joins(DB.sql_fragment(<<~SQL, synonyms_ids: synonyms_ids)).delete_all
+      INNER JOIN (
+        SELECT MIN(id) AS id, topic_id
+          FROM topic_tags
+          WHERE tag_id IN (:synonyms_ids)
+          GROUP BY topic_id
+      ) AS tt ON tt.id < topic_tags.id
+                  AND tt.topic_id = topic_tags.topic_id
+                  AND topic_tags.tag_id IN (:synonyms_ids)
+    SQL
     TopicTag.where(tag_id: synonyms_ids).update_all(tag_id: target_tag.id)
     Scheduler::Defer.later "Update tag topic counts" do
       Tag.ensure_consistency!
diff --git a/lib/distributed_cache.rb b/lib/distributed_cache.rb
index 80fa7bf1f82..b041b39d1d4 100644
--- a/lib/distributed_cache.rb
+++ b/lib/distributed_cache.rb
@@ -19,4 +19,12 @@ class DistributedCache < MessageBus::DistributedCache
     self.defer_set(k, value)
     value
   end
+
+  def clear(after_commit: true)
+    if after_commit && !GlobalSetting.skip_db?
+      DB.after_commit { super() }
+    else
+      super()
+    end
+  end
 end
diff --git a/lib/email/message_id_service.rb b/lib/email/message_id_service.rb
index 4ba6b0d7375..e1a9fea0e88 100644
--- a/lib/email/message_id_service.rb
+++ b/lib/email/message_id_service.rb
@@ -5,14 +5,21 @@ module Email
   # Email Message-IDs are used in both our outbound and inbound email
   # flow. For the outbound flow via Email::Sender, we assign a unique
   # Message-ID for any emails sent out from the application.
-  # If we are sending an email related to a topic, such as through the
+  # If we are sending an email related to a post, such as through the
   # PostAlerter class, then the Message-ID will contain references to
-  # the topic ID, and if it is for a specific post, the post ID,
-  # along with a random suffix to make the Message-ID truly unique.
-  # The host must also be included on the Message-IDs.
+  # the post ID. The host must also be included on the Message-IDs.
+  # The format looks like this:
+  #
+  # discourse/post/POST_ID@HOST
+  #
+  # We previously had the following formats, but support for these
+  # will be removed in 2023:
+  #
+  # topic/TOPIC_ID/POST_ID@HOST
+  # topic/TOPIC_ID@HOST
   #
   # For the inbound email flow via Email::Receiver, we use Message-IDs
-  # to discern which topic or post the inbound email reply should be
+  # to discern which topic and post the inbound email reply should be
   # in response to. In this case, the Message-ID is extracted from the
   # References and/or In-Reply-To headers, and compared with either
   # the IncomingEmail table, the Post table, or the IncomingEmail to
@@ -29,38 +36,6 @@ module Email
         "<#{SecureRandom.uuid}@#{host}>"
       end
 
-      # TODO (martin) 2023-01-01 Deprecated, remove this once the new threading
-      # systems have been in place for a while.
-      def generate_for_post(post, use_incoming_email_if_present: false)
-        if use_incoming_email_if_present && post.incoming_email&.message_id.present?
-          return "<#{post.incoming_email.message_id}>"
-        end
-
-        "<topic/#{post.topic_id}/#{post.id}.#{random_suffix}@#{host}>"
-      end
-
-      # TODO (martin) 2023-01-01 Deprecated, remove this once the new threading
-      # systems have been in place for a while.
-      def generate_for_topic(topic, use_incoming_email_if_present: false, canonical: false)
-        first_post = topic.ordered_posts.first
-        incoming_email = first_post.incoming_email
-
-        # If the incoming email was created by handle_mail, then it was an
-        # inbound email sent to Discourse and handled by Email::Receiver,
-        # this is the only case where we want to use the original Message-ID
-        # because we want to maintain threading in the original mail client.
-        if use_incoming_email_if_present && incoming_email&.message_id.present? &&
-             incoming_email&.created_via == IncomingEmail.created_via_types[:handle_mail]
-          return "<#{first_post.incoming_email.message_id}>"
-        end
-
-        if canonical
-          "<topic/#{topic.id}@#{host}>"
-        else
-          "<topic/#{topic.id}.#{random_suffix}@#{host}>"
-        end
-      end
-
       ##
       # The outbound_message_id may be present because either:
       #
@@ -96,7 +71,7 @@ module Email
       def find_post_from_message_ids(message_ids)
         message_ids = message_ids.map { |message_id| message_id_clean(message_id) }
 
-        # TODO (martin) 2023-01-01 We should remove these backwards-compatible
+        # TODO (martin) 2023-04-01 We should remove these backwards-compatible
         # formats for the Message-ID and solely use the discourse/post/999@host
         # format.
         topic_ids =
@@ -131,11 +106,7 @@ module Email
         Post.where(id: post_ids).order(:created_at).last
       end
 
-      def random_suffix
-        SecureRandom.hex(12)
-      end
-
-      # TODO (martin) 2023-01-01 We should remove these backwards-compatible
+      # TODO (martin) 2023-04-01 We should remove these backwards-compatible
       # formats for the Message-ID and solely use the discourse/post/999@host
       # format.
       def discourse_generated_message_id?(message_id)
@@ -144,7 +115,7 @@ module Email
           !!(message_id =~ message_id_discourse_regexp)
       end
 
-      # TODO (martin) 2023-01-01 We should remove these backwards-compatible
+      # TODO (martin) 2023-04-01 We should remove these backwards-compatible
       # formats for the Message-ID and solely use the discourse/post/999@host
       # format.
       def message_id_post_id_regexp
@@ -165,7 +136,7 @@ module Email
 
       def message_id_clean(message_id)
         if message_id.present? && is_message_id_rfc?(message_id)
-          message_id.gsub(/^<|>$/, "")
+          message_id.gsub(/\A<|>\z/, "")
         else
           message_id
         end
diff --git a/lib/email/poller.rb b/lib/email/poller.rb
new file mode 100644
index 00000000000..a364d28c936
--- /dev/null
+++ b/lib/email/poller.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Email
+  class Poller
+    # To be implemented by concrete classes.
+    # This function takes as input a function that processes the incoming email.
+    # The function passed as argument should take as an argument the MIME string of the email.
+    # An example of function to pass is `process_popmail` in `app/jobs/scheduled/poll_mailbox.rb`
+    def poll_mailbox(process_cb)
+      raise NotImplementedError
+    end
+
+    # Child class can override this
+    def enabled?
+      true
+    end
+  end
+end
diff --git a/lib/email/processor.rb b/lib/email/processor.rb
index 9c807fc2b8e..30c50c2baef 100644
--- a/lib/email/processor.rb
+++ b/lib/email/processor.rb
@@ -24,7 +24,7 @@ module Email
           raise
         end
       rescue => e
-        return handle_bounce(e) if @receiver.is_bounce?
+        return handle_bounce(e) if @receiver&.is_bounce?
 
         log_email_process_failure(@mail, e)
         incoming_email = @receiver.try(:incoming_email)
@@ -156,7 +156,7 @@ module Email
     end
 
     def can_send_rejection_email?(email, type)
-      return false if @receiver.sent_to_mailinglist_mirror?
+      return false if @receiver&.sent_to_mailinglist_mirror?
       return true if type == :email_reject_unrecognized_error
 
       key = "rejection_email:#{email}:#{type}:#{Date.today}"
diff --git a/lib/email/receiver.rb b/lib/email/receiver.rb
index 05b51c7eb00..93ecc91aa57 100644
--- a/lib/email/receiver.rb
+++ b/lib/email/receiver.rb
@@ -107,7 +107,7 @@ module Email
 
           Email::Validator.ensure_valid!(@mail)
 
-          @from_email, @from_display_name = parse_from_field
+          @from_email, @from_display_name = parse_from_field(@mail)
           @from_user = User.find_by_email(@from_email)
           @incoming_email = create_incoming_email
 
@@ -381,9 +381,9 @@ module Email
       @mail[:precedence].to_s[/list|junk|bulk|auto_reply/i] ||
         @mail[:from].to_s[/(mailer[\-_]?daemon|post[\-_]?master|no[\-_]?reply)@/i] ||
         @mail[:subject].to_s[
-          /^\s*(Auto:|Automatic reply|Autosvar|Automatisk svar|Automatisch antwoord|Abwesenheitsnotiz|Risposta Non al computer|Automatisch antwoord|Auto Response|Respuesta automática|Fuori sede|Out of Office|Frånvaro|Réponse automatique)/i
+          /\A\s*(Auto:|Automatic reply|Autosvar|Automatisk svar|Automatisch antwoord|Abwesenheitsnotiz|Risposta Non al computer|Automatisch antwoord|Auto Response|Respuesta automática|Fuori sede|Out of Office|Frånvaro|Réponse automatique)/i
         ] ||
-        @mail.header.to_s[
+        @mail.header.reject { |h| h.name.downcase == "x-auto-response-suppress" }.to_s[
           /auto[\-_]?(response|submitted|replied|reply|generated|respond)|holidayreply|machinegenerated/i
         ]
     end
@@ -393,7 +393,7 @@ module Email
       when "X-Spam-Flag"
         @mail[:x_spam_flag].to_s[/YES/i]
       when "X-Spam-Status"
-        @mail[:x_spam_status].to_s[/^Yes, /i]
+        @mail[:x_spam_status].to_s[/\AYes, /i]
       when "X-SES-Spam-Verdict"
         @mail[:x_ses_spam_verdict].to_s[/FAIL/i]
       else
@@ -639,7 +639,7 @@ module Email
           .uniq
 
       @previous_replies_regex ||=
-        /^--[- ]\n\*(?:#{strings.map { |x| Regexp.escape(x) }.join("|")})\*\n/im
+        /\A--[- ]\n\*(?:#{strings.map { |x| Regexp.escape(x) }.join("|")})\*\n/im
     end
 
     def reply_above_line_regex
@@ -660,14 +660,15 @@ module Email
       reply.split(reply_above_line_regex)[0]
     end
 
-    def parse_from_field(mail = nil)
-      mail ||= @mail
-
+    def parse_from_field(mail, process_forwarded_emails: true)
       if email_log.present?
         email = email_log.to_address || email_log.user&.email
         return email, email_log.user&.username
       elsif mail.bounced?
-        Array.wrap(mail.final_recipient).each { |from| return extract_from_address_and_name(from) }
+        # "Final-Recipient" has a specific format (<name> ; <address>)
+        # cf. https://www.ietf.org/rfc/rfc2298.html#section-3.2.4
+        address_type, generic_address = mail.final_recipient.to_s.split(";").map { _1.to_s.strip }
+        return generic_address, nil if generic_address.include?("@") && address_type == "rfc822"
       end
 
       return unless mail[:from]
@@ -675,87 +676,81 @@ module Email
       # For forwarded emails, where the from address matches a group incoming
       # email, we want to use the from address of the original email sender,
       # which we can extract from embedded_email_raw.
-      if has_been_forwarded?
-        if mail[:from].to_s =~ group_incoming_emails_regex && embedded_email[:from].errors.blank?
-          from_address, from_display_name = extract_from_fields_from_header(embedded_email, :from)
-          return from_address, from_display_name if from_address
+      if process_forwarded_emails && has_been_forwarded?
+        if mail[:from].to_s =~ group_incoming_emails_regex
+          if embedded_email && embedded_email[:from].errors.blank?
+            from_address, from_display_name =
+              Email::Receiver.extract_email_address_and_name(embedded_email[:from])
+            return from_address, from_display_name if from_address
+          end
         end
       end
 
+      # extract proper sender when using mailman mailing list
+      if mail[:x_mailman_version].present?
+        address, name = Email::Receiver.extract_email_address_and_name_from_mailman(mail)
+        return address, name if address
+      end
+
       # For now we are only using the Reply-To header if the email has
       # been forwarded via Google Groups, which is why we are checking the
       # X-Original-From header too. In future we may want to use the Reply-To
       # header in more cases.
-      if mail["X-Original-From"].present?
-        if mail[:reply_to] && mail[:reply_to].errors.blank?
-          from_address, from_display_name =
-            extract_from_fields_from_header(
-              mail,
-              :reply_to,
-              comparison_headers: ["X-Original-From"],
-            )
-          return from_address, from_display_name if from_address
-        end
+      if mail[:x_original_from].present? && mail[:reply_to].present?
+        original_from_address, _ =
+          Email::Receiver.extract_email_address_and_name(mail[:x_original_from])
+        reply_to_address, reply_to_name =
+          Email::Receiver.extract_email_address_and_name(mail[:reply_to])
+        return reply_to_address, reply_to_name if original_from_address == reply_to_address
       end
 
-      if mail[:from].errors.blank?
-        from_address, from_display_name = extract_from_fields_from_header(mail, :from)
-        return from_address, from_display_name if from_address
-      end
-
-      return extract_from_address_and_name(mail.from) if mail.from.is_a? String
-
-      if mail.from.is_a? Mail::AddressContainer
-        mail.from.each do |from|
-          from_address, from_display_name = extract_from_address_and_name(from)
-          return from_address, from_display_name if from_address
-        end
-      end
-
-      nil
+      Email::Receiver.extract_email_address_and_name(mail[:from])
     rescue StandardError
       nil
     end
 
-    def extract_from_fields_from_header(mail_object, header, comparison_headers: [])
-      mail_object[header].each do |address_field|
-        from_address = address_field.address
-        from_display_name = address_field.display_name&.to_s
+    def self.extract_email_address_and_name_from_mailman(mail)
+      list_address, _ = Email::Receiver.extract_email_address_and_name(mail[:list_post])
+      list_address, _ =
+        Email::Receiver.extract_email_address_and_name(mail[:x_beenthere]) if list_address.blank?
 
-        comparison_failed = false
-        comparison_headers.each do |comparison_header|
-          comparison_header_address = mail_object[comparison_header].to_s[/<([^>]+)>/, 1]
-          if comparison_header_address != from_address
-            comparison_failed = true
-            break
-          end
+      return if list_address.blank?
+
+      # the CC header often includes the name of the sender
+      address_to_name = mail[:cc]&.element&.addresses&.to_h { [_1.address, _1.name] } || {}
+
+      %i[from reply_to x_mailfrom x_original_from].each do |header|
+        next if mail[header].blank?
+        email, name = Email::Receiver.extract_email_address_and_name(mail[header])
+        if email.present? && email != list_address
+          return email, name.presence || address_to_name[email]
         end
-
-        next if comparison_failed
-        next if !from_address&.include?("@")
-        return from_address&.downcase, from_display_name&.strip
       end
-
-      [nil, nil]
     end
 
-    def extract_from_address_and_name(value)
-      if value[";"]
-        from_display_name, from_address = value.split(";")
-        return from_address&.strip&.downcase, from_display_name&.strip
+    def self.extract_email_address_and_name(value)
+      begin
+        # ensure the email header value is a string
+        value = value.to_s
+        # in embedded emails, converts [mailto:foo@bar.com] to <foo@bar.com>
+        value = value.gsub(/\[mailto:([^\[\]]+?)\]/, "<\\1>")
+        # 'mailto:' suffix isn't supported by Mail::Address parsing
+        value = value.gsub("mailto:", "")
+        # parse the email header value
+        parsed = Mail::Address.new(value)
+        # extract the email address and name
+        mail = parsed.address.to_s.downcase.strip
+        name = parsed.name.to_s.strip
+        # ensure the email address is "valid"
+        if mail.include?("@")
+          # remove surrounding quotes from the name
+          name = name[1...-1] if name.size > 2 && name[/\A(['"]).+(\1)\z/]
+          # return the email address and name
+          [mail, name]
+        end
+      rescue Mail::Field::ParseError, Mail::Field::IncompleteParseError => e
+        # something went wrong parsing the email header value, return nil
       end
-
-      if value[/<[^>]+>/]
-        from_address = value[/<([^>]+)>/, 1]
-        from_display_name = value[/^([^<]+)/, 1]
-      end
-
-      if (from_address.blank? || !from_address["@"]) && value[/\[mailto:[^\]]+\]/]
-        from_address = value[/\[mailto:([^\]]+)\]/, 1]
-        from_display_name = value[/^([^\[]+)/, 1]
-      end
-
-      [from_address&.downcase, from_display_name&.strip]
     end
 
     def subject
@@ -1016,7 +1011,7 @@ module Email
     end
 
     def has_been_forwarded?
-      subject[/^[[:blank:]]*(fwd?|tr)[[:blank:]]?:/i] && embedded_email_raw.present?
+      subject[/\A[[:blank:]]*(fwd?|tr)[[:blank:]]?:/i] && embedded_email_raw.present?
     end
 
     def embedded_email_raw
@@ -1089,24 +1084,28 @@ module Email
     end
 
     def forwarded_email_create_replies(destination, user)
-      embedded = Mail.new(embedded_email_raw)
-      email, display_name = parse_from_field(embedded)
+      forwarded_by_address, forwarded_by_name =
+        Email::Receiver.extract_email_address_and_name(@mail[:from])
 
       if forwarded_by_address && forwarded_by_name
         @forwarded_by_user = stage_sender_user(forwarded_by_address, forwarded_by_name)
       end
 
-      return false if email.blank? || !email["@"]
+      email_address, display_name =
+        parse_from_field(embedded_email, process_forwarded_emails: false)
+
+      return false if email_address.blank? || !email_address.include?("@")
 
       post =
         forwarded_email_create_topic(
           destination: destination,
           user: user,
-          raw: try_to_encode(embedded.decoded, "UTF-8").presence || embedded.to_s,
-          title: embedded.subject.presence || subject,
-          date: embedded.date,
-          embedded_user: lambda { find_or_create_user(email, display_name) },
+          raw: try_to_encode(embedded_email.decoded, "UTF-8").presence || embedded_email.to_s,
+          title: embedded_email.subject.presence || subject,
+          date: embedded_email.date,
+          embedded_user: lambda { find_or_create_user(email_address, display_name) },
         )
+
       return false unless post
 
       if post.topic
@@ -1143,25 +1142,12 @@ module Email
       true
     end
 
-    def forwarded_by_sender
-      @forwarded_by_sender ||= extract_from_fields_from_header(@mail, :from)
-    end
-
-    def forwarded_by_address
-      @forwarded_by_address ||= forwarded_by_sender&.first
-    end
-
-    def forwarded_by_name
-      @forwarded_by_name ||= forwarded_by_sender&.first
-    end
-
     def forwarded_email_quote_forwarded(destination, user)
-      embedded = embedded_email_raw
       raw = <<~MD
         #{@before_embedded}
 
         [quote]
-        #{PlainTextToMarkdown.new(embedded).to_markdown}
+        #{PlainTextToMarkdown.new(@embedded_email_raw).to_markdown}
         [/quote]
       MD
 
@@ -1510,7 +1496,8 @@ module Email
 
     def self.elided_html(elided)
       html = +"\n\n" << "<details class='elided'>" << "\n"
-      html << "<summary title='#{I18n.t("emails.incoming.show_trimmed_content")}'>&#183;&#183;&#183;</summary>" << "\n\n"
+      html << "<summary title='#{I18n.t("emails.incoming.show_trimmed_content")}'>&#183;&#183;&#183;</summary>" <<
+        "\n\n"
       html << elided << "\n\n"
       html << "</details>" << "\n"
       html
@@ -1527,7 +1514,7 @@ module Email
             address_field.decoded
             email = address_field.address.downcase
             display_name = address_field.display_name.try(:to_s)
-            next unless email["@"]
+            next if !email.include?("@")
 
             if should_invite?(email)
               user = User.find_by_email(email)
diff --git a/lib/email/sender.rb b/lib/email/sender.rb
index 1f3c59efd04..fceb484322b 100644
--- a/lib/email/sender.rb
+++ b/lib/email/sender.rb
@@ -122,7 +122,7 @@ module Email
           if from_address.blank?
             nil
           else
-            Group.where(email_username: from_address, smtp_enabled: true).pluck_first(:id)
+            Group.where(email_username: from_address, smtp_enabled: true).pick(:id)
           end
         )
 
@@ -294,6 +294,8 @@ module Email
         return skip(SkippedEmailLog.reason_types[:custom], custom_reason: e.message)
       end
 
+      DiscourseEvent.trigger(:after_email_send, @message, @email_type)
+
       email_log.save!
       email_log
     end
@@ -361,7 +363,7 @@ module Email
             if attached_upload.local?
               Discourse.store.path_for(attached_upload)
             else
-              Discourse.store.download(attached_upload).path
+              Discourse.store.download!(attached_upload).path
             end
 
           @message_attachments_index[original_upload.sha1] = @message.attachments.size
diff --git a/lib/email/styles.rb b/lib/email/styles.rb
index 25b8a66ed8f..d1976f3c517 100644
--- a/lib/email/styles.rb
+++ b/lib/email/styles.rb
@@ -84,9 +84,9 @@ module Email
 
           if img["src"]
             # ensure all urls are absolute
-            img["src"] = "#{Discourse.base_url}#{img["src"]}" if img["src"][%r{^/[^/]}]
+            img["src"] = "#{Discourse.base_url}#{img["src"]}" if img["src"][%r{\A/[^/]}]
             # ensure no schemaless urls
-            img["src"] = "#{uri.scheme}:#{img["src"]}" if img["src"][%r{^//}]
+            img["src"] = "#{uri.scheme}:#{img["src"]}" if img["src"][%r{\A//}]
           end
         end
 
@@ -110,7 +110,7 @@ module Email
         .css("a.attachment")
         .each do |a|
           # ensure all urls are absolute
-          a["href"] = "#{Discourse.base_url}#{a["href"]}" if a["href"] =~ %r{^/[^/]}
+          a["href"] = "#{Discourse.base_url}#{a["href"]}" if a["href"] =~ %r{\A/[^/]}
 
           # ensure no schemaless urls
           a["href"] = "#{uri.scheme}:#{a["href"]}" if a["href"] && a["href"].starts_with?("//")
diff --git a/lib/email_controller_helper/topic_email_unsubscriber.rb b/lib/email_controller_helper/topic_email_unsubscriber.rb
index eda37b7d667..e31ef94e1b0 100644
--- a/lib/email_controller_helper/topic_email_unsubscriber.rb
+++ b/lib/email_controller_helper/topic_email_unsubscriber.rb
@@ -8,6 +8,8 @@ module EmailControllerHelper
 
       topic = unsubscribe_key.associated_topic
 
+      return if topic.blank?
+
       controller.instance_variable_set(:@topic, topic)
       controller.instance_variable_set(
         :@watching_topic,
diff --git a/lib/email_cook.rb b/lib/email_cook.rb
index 2c76e1f2ff2..8af5b3c5fe6 100644
--- a/lib/email_cook.rb
+++ b/lib/email_cook.rb
@@ -4,7 +4,7 @@
 class EmailCook
   def self.raw_regexp
     @raw_regexp ||=
-      %r{^\[plaintext\]$\n(.*)\n^\[/plaintext\]$(?:\s^\[attachments\]$\n(.*)\n^\[/attachments\]$)?(?:\s^\[elided\]$\n(.*)\n^\[/elided\]$)?}m
+      %r{\A\[plaintext\]$\n(.*)\n^\[/plaintext\]$(?:\s^\[attachments\]$\n(.*)\n^\[/attachments\]$)?(?:\s^\[elided\]$\n(.*)\n^\[/elided\]$)?}m
   end
 
   def initialize(raw)
@@ -14,7 +14,7 @@ class EmailCook
 
   def add_quote(result, buffer)
     if buffer.present?
-      return if buffer =~ /\A(<br>)+\z$/
+      return if buffer =~ /\A(<br>)+\z\z/
       result << "<blockquote>#{buffer}</blockquote>"
     end
   end
@@ -22,7 +22,7 @@ class EmailCook
   def link_string!(line, unescaped_line)
     unescaped_line = unescaped_line.strip
     line.gsub!(/\S+/) do |str|
-      if str.match?(%r{^(https?://)[\S]+$}i)
+      if str.match?(%r{\A(https?://)[\S]+\z}i)
         begin
           url = URI.parse(str).to_s
           if unescaped_line == url
@@ -48,11 +48,11 @@ class EmailCook
 
     text.each_line do |line|
       # replace indentation with non-breaking spaces
-      line.sub!(/^\s{2,}/) { |s| "\u00A0" * s.length }
+      line.sub!(/\A\s{2,}/) { |s| "\u00A0" * s.length }
 
-      if line =~ /^\s*>/
+      if line =~ /\A\s*>/
         in_quote = true
-        line.sub!(/^[\s>]*/, "")
+        line.sub!(/\A[\s>]*/, "")
 
         unescaped_line = line
         line = CGI.escapeHTML(line)
diff --git a/lib/ember_cli.rb b/lib/ember_cli.rb
index 00c65610bad..291d4429d99 100644
--- a/lib/ember_cli.rb
+++ b/lib/ember_cli.rb
@@ -16,6 +16,13 @@ module EmberCli
         assets +=
           Dir.glob("app/assets/javascripts/discourse/scripts/*.js").map { |f| File.basename(f) }
 
+        if workbox_dir_name
+          assets +=
+            Dir
+              .glob("app/assets/javascripts/discourse/dist/assets/#{workbox_dir_name}/*")
+              .map { |f| "#{workbox_dir_name}/#{File.basename(f)}" }
+        end
+
         Discourse
           .find_plugin_js_assets(include_disabled: true)
           .each do |file|
@@ -62,4 +69,13 @@ module EmberCli
         JSON.parse(ember_source_package_raw)["version"]
       end
   end
+
+  def self.workbox_dir_name
+    return @workbox_base_dir if defined?(@workbox_base_dir)
+
+    @workbox_base_dir =
+      if (full_path = Dir.glob("app/assets/javascripts/discourse/dist/assets/workbox-*")[0])
+        File.basename(full_path)
+      end
+  end
 end
diff --git a/lib/emoji/db.json b/lib/emoji/db.json
index 8b3f530c5d9..0cbab5704b8 100644
--- a/lib/emoji/db.json
+++ b/lib/emoji/db.json
@@ -58,7 +58,7 @@
     },
     {
       "code": "263a",
-      "name": "relaxed"
+      "name": "smiling_face"
     },
     {
       "code": "1f60b",
@@ -8310,6 +8310,9 @@
     ],
     "frowning_with_open_mouth": [
       "frowning_face_with_open_mouth"
+    ],
+    "smiling_face": [
+      "relaxed"
     ]
   },
   "searchAliases": {
@@ -17285,4 +17288,4 @@
     ":$": "blush",
     ":-$": "blush"
   }
-}
\ No newline at end of file
+}
diff --git a/lib/emoji/groups.json b/lib/emoji/groups.json
index 04395ce4d32..fdb56fd6285 100644
--- a/lib/emoji/groups.json
+++ b/lib/emoji/groups.json
@@ -7449,4 +7449,4 @@
       }
     ]
   }
-]
\ No newline at end of file
+]
diff --git a/lib/excerpt_parser.rb b/lib/excerpt_parser.rb
index 95d9f398d53..0811cb3129a 100644
--- a/lib/excerpt_parser.rb
+++ b/lib/excerpt_parser.rb
@@ -22,6 +22,7 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
     @keep_svg = options[:keep_svg] == true
     @remap_emoji = options[:remap_emoji] == true
     @start_excerpt = false
+    @start_hashtag_icon = false
     @in_details_depth = 0
     @summary_contents = +""
     @detail_contents = +""
@@ -98,7 +99,7 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
       end
     when "aside"
       attributes = Hash[*attributes.flatten]
-      unless (@keep_onebox_source || @keep_onebox_body) && attributes["class"]&.include?("onebox")
+      if !(@keep_onebox_source || @keep_onebox_body) || !attributes["class"]&.include?("onebox")
         @in_quote = true
       end
 
@@ -112,10 +113,18 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
     when "header"
       @in_quote = !@keep_onebox_source if attributes.include?(%w[class source])
     when "div", "span"
-      if attributes.include?(%w[class excerpt])
+      attributes = Hash[*attributes.flatten]
+
+      # Only match "excerpt" class if it does not specifically equal "excerpt
+      # hidden" in order to prevent internal links with GitHub oneboxes from
+      # being empty https://meta.discourse.org/t/269436
+      if attributes["class"]&.include?("excerpt") && !attributes["class"]&.match?("excerpt hidden")
         @excerpt = +""
         @current_length = 0
         @start_excerpt = true
+      elsif attributes["class"]&.include?("hashtag-icon-placeholder")
+        @start_hashtag_icon = true
+        include_tag(name, attributes)
       end
     when "details"
       @detail_contents = +"" if @in_details_depth == 0
@@ -180,6 +189,7 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
       @in_summary = false if @in_details_depth == 1
     when "div", "span"
       throw :done if @start_excerpt
+      characters("</span>", truncate: false, count_it: false, encode: false) if @start_hashtag_icon
     when "svg"
       characters("</svg>", truncate: false, count_it: false, encode: false) if @keep_svg
       @in_svg = false
diff --git a/lib/external_upload_helpers.rb b/lib/external_upload_helpers.rb
index 3ac4cea5bcc..81cdfa5d91d 100644
--- a/lib/external_upload_helpers.rb
+++ b/lib/external_upload_helpers.rb
@@ -8,10 +8,6 @@ module ExternalUploadHelpers
   class ExternalUploadValidationError < StandardError
   end
 
-  PRESIGNED_PUT_RATE_LIMIT_PER_MINUTE = 10
-  CREATE_MULTIPART_RATE_LIMIT_PER_MINUTE = 10
-  COMPLETE_MULTIPART_RATE_LIMIT_PER_MINUTE = 10
-
   included do
     before_action :external_store_check,
                   only: %i[
@@ -38,7 +34,7 @@ module ExternalUploadHelpers
     RateLimiter.new(
       current_user,
       "generate-presigned-put-upload-stub",
-      ExternalUploadHelpers::PRESIGNED_PUT_RATE_LIMIT_PER_MINUTE,
+      SiteSetting.max_presigned_put_per_minute,
       1.minute,
     ).performed!
 
@@ -81,7 +77,7 @@ module ExternalUploadHelpers
     RateLimiter.new(
       current_user,
       "create-multipart-upload",
-      ExternalUploadHelpers::CREATE_MULTIPART_RATE_LIMIT_PER_MINUTE,
+      SiteSetting.max_create_multipart_per_minute,
       1.minute,
     ).performed!
 
@@ -127,9 +123,6 @@ module ExternalUploadHelpers
     # a 1.5GB upload with 5mb parts this could mean 60 requests to the server to get all
     # the part URLs. If the user's upload speed is super fast they may request all 60
     # batches in a minute, if it is slow they may request 5 batches in a minute.
-    #
-    # The other external upload endpoints are not hit as often, so they can stay as constant
-    # values for now.
     RateLimiter.new(
       current_user,
       "batch-presign",
@@ -225,7 +218,7 @@ module ExternalUploadHelpers
     RateLimiter.new(
       current_user,
       "complete-multipart-upload",
-      ExternalUploadHelpers::COMPLETE_MULTIPART_RATE_LIMIT_PER_MINUTE,
+      SiteSetting.max_complete_multipart_per_minute,
       1.minute,
     ).performed!
 
@@ -256,12 +249,11 @@ module ExternalUploadHelpers
         .sort_by { |part| part[:part_number] }
 
     begin
-      complete_response =
-        store.complete_multipart(
-          upload_id: external_upload_stub.external_upload_identifier,
-          key: external_upload_stub.key,
-          parts: parts,
-        )
+      store.complete_multipart(
+        upload_id: external_upload_stub.external_upload_identifier,
+        key: external_upload_stub.key,
+        parts: parts,
+      )
     rescue Aws::S3::Errors::ServiceError => err
       return(
         render_json_error(
diff --git a/lib/file_helper.rb b/lib/file_helper.rb
index 9b57251f83c..229705fdd70 100644
--- a/lib/file_helper.rb
+++ b/lib/file_helper.rb
@@ -52,7 +52,7 @@ class FileHelper
     retain_on_max_file_size_exceeded: false
   )
     url = "https:" + url if url.start_with?("//")
-    raise Discourse::InvalidParameters.new(:url) unless url =~ %r{^https?://}
+    raise Discourse::InvalidParameters.new(:url) unless url =~ %r{\Ahttps?://}
 
     tmp = nil
 
@@ -158,7 +158,7 @@ class FileHelper
   end
 
   def self.supported_images
-    @@supported_images ||= Set.new %w[jpg jpeg png gif svg ico webp]
+    @@supported_images ||= Set.new %w[jpg jpeg png gif svg ico webp avif]
   end
 
   def self.inline_images
@@ -175,26 +175,26 @@ class FileHelper
   end
 
   def self.supported_video_regexp
-    @@supported_video_regexp ||= /\.(#{supported_video.to_a.join("|")})$/i
+    @@supported_video_regexp ||= /\.(#{supported_video.to_a.join("|")})\z/i
   end
 
   def self.supported_audio_regexp
-    @@supported_audio_regexp ||= /\.(#{supported_audio.to_a.join("|")})$/i
+    @@supported_audio_regexp ||= /\.(#{supported_audio.to_a.join("|")})\z/i
   end
 
   def self.supported_images_regexp
-    @@supported_images_regexp ||= /\.(#{supported_images.to_a.join("|")})$/i
+    @@supported_images_regexp ||= /\.(#{supported_images.to_a.join("|")})\z/i
   end
 
   def self.inline_images_regexp
-    @@inline_images_regexp ||= /\.(#{inline_images.to_a.join("|")})$/i
+    @@inline_images_regexp ||= /\.(#{inline_images.to_a.join("|")})\z/i
   end
 
   def self.supported_media_regexp
     @@supported_media_regexp ||=
       begin
         media = supported_images | supported_audio | supported_video
-        /\.(#{media.to_a.join("|")})$/i
+        /\.(#{media.to_a.join("|")})\z/i
       end
   end
 
@@ -202,7 +202,7 @@ class FileHelper
     @@supported_playable_media_regexp ||=
       begin
         media = supported_audio | supported_video
-        /\.(#{media.to_a.join("|")})$/i
+        /\.(#{media.to_a.join("|")})\z/i
       end
   end
 end
diff --git a/lib/file_store/base_store.rb b/lib/file_store/base_store.rb
index 9645513ab1f..ff98b06231a 100644
--- a/lib/file_store/base_store.rb
+++ b/lib/file_store/base_store.rb
@@ -105,7 +105,7 @@ module FileStore
     end
 
     def download(object, max_file_size_kb: nil, print_deprecation: true)
-      Discourse.deprecate(<<~MESSAGE, output_in_test: true) if print_deprecation
+      Discourse.deprecate(<<~MESSAGE) if print_deprecation
           In a future version `FileStore#download` will no longer raise an error when the
           download fails, and will instead return `nil`. If you need a method that raises
           an error, use `FileStore#download!`, which raises a `FileStore::DownloadError`.
@@ -135,7 +135,7 @@ module FileStore
               end
             )
 
-          url = SiteSetting.scheme + ":" + url if url =~ %r{^//}
+          url = SiteSetting.scheme + ":" + url if url =~ %r{\A//}
           file =
             FileHelper.download(
               url,
diff --git a/lib/file_store/local_store.rb b/lib/file_store/local_store.rb
index c0461aa50a7..3a6f1137557 100644
--- a/lib/file_store/local_store.rb
+++ b/lib/file_store/local_store.rb
@@ -128,7 +128,7 @@ module FileStore
       count = 0
       model.find_each do |upload|
         # could be a remote image
-        next unless upload.url =~ %r{^/[^/]}
+        next unless upload.url =~ %r{\A/[^/]}
 
         path = "#{public_dir}#{upload.url}"
         bad = true
diff --git a/lib/file_store/s3_store.rb b/lib/file_store/s3_store.rb
index 8fdbd2d9fab..a36a452dbbb 100644
--- a/lib/file_store/s3_store.rb
+++ b/lib/file_store/s3_store.rb
@@ -87,7 +87,7 @@ module FileStore
       # cache file locally when needed
       cache_file(file, File.basename(path)) if opts[:cache_locally]
       options = {
-        acl: opts[:private_acl] ? "private" : "public-read",
+        acl: SiteSetting.s3_use_acls ? (opts[:private_acl] ? "private" : "public-read") : nil,
         cache_control: "max-age=31556952, public, immutable",
         content_type:
           opts[:content_type].presence || MiniMime.lookup_by_filename(filename)&.content_type,
@@ -216,7 +216,7 @@ module FileStore
 
     def path_for(upload)
       url = upload&.url
-      FileStore::LocalStore.new.path_for(upload) if url && url[%r{^/[^/]}]
+      FileStore::LocalStore.new.path_for(upload) if url && url[%r{\A/[^/]}]
     end
 
     def url_for(upload, force_download: false)
@@ -226,6 +226,8 @@ module FileStore
           force_download: force_download,
           filename: upload.original_filename,
         )
+      elsif SiteSetting.s3_use_cdn_url_for_all_uploads
+        cdn_url(upload.url)
       else
         upload.url
       end
@@ -233,7 +235,7 @@ module FileStore
 
     def cdn_url(url)
       return url if SiteSetting.Upload.s3_cdn_url.blank?
-      schema = url[%r{^(https?:)?//}, 1]
+      schema = url[%r{\A(https?:)?//}, 1]
       folder = s3_bucket_folder_path.nil? ? "" : "#{s3_bucket_folder_path}/"
       url.sub(
         File.join("#{schema}#{absolute_base_url}", folder),
@@ -262,7 +264,7 @@ module FileStore
         expires_in: expires_in,
         opts: {
           metadata: metadata,
-          acl: "private",
+          acl: SiteSetting.s3_use_acls ? "private" : nil,
         },
       )
     end
@@ -309,25 +311,29 @@ module FileStore
       key = get_upload_key(upload)
       update_ACL(key, upload.secure?)
 
-      # if we do find_each when the images have already been preloaded with
+      # If we do find_each when the images have already been preloaded with
       # includes(:optimized_images), then the optimized_images are fetched
       # from the database again, negating the preloading if this operation
       # is done on a large amount of uploads at once (see Jobs::SyncAclsForUploads)
       if optimized_images_preloaded
         upload.optimized_images.each do |optimized_image|
-          optimized_image_key = get_path_for_optimized_image(optimized_image)
-          update_ACL(optimized_image_key, upload.secure?)
+          update_optimized_image_acl(optimized_image, secure: upload.secure)
         end
       else
         upload.optimized_images.find_each do |optimized_image|
-          optimized_image_key = get_path_for_optimized_image(optimized_image)
-          update_ACL(optimized_image_key, upload.secure?)
+          update_optimized_image_acl(optimized_image, secure: upload.secure)
         end
       end
 
       true
     end
 
+    def update_optimized_image_acl(optimized_image, secure: false)
+      optimized_image_key = get_path_for_optimized_image(optimized_image)
+      optimized_image_key.prepend(File.join(upload_path, "/")) if Rails.configuration.multisite
+      update_ACL(optimized_image_key, secure)
+    end
+
     def download_file(upload, destination_path)
       s3_helper.download_file(get_upload_key(upload), destination_path)
     end
@@ -393,7 +399,9 @@ module FileStore
 
     def update_ACL(key, secure)
       begin
-        object_from_path(key).acl.put(acl: secure ? "private" : "public-read")
+        object_from_path(key).acl.put(
+          acl: SiteSetting.s3_use_acls ? (secure ? "private" : "public-read") : nil,
+        )
       rescue Aws::S3::Errors::NoSuchKey
         Rails.logger.warn("Could not update ACL on upload with key: '#{key}'. Upload is missing.")
       end
@@ -409,7 +417,7 @@ module FileStore
         verified_ids = []
 
         files.each do |f|
-          id = model.where("url LIKE '%#{f.key}' AND etag = '#{f.etag}'").pluck_first(:id)
+          id = model.where("url LIKE '%#{f.key}' AND etag = '#{f.etag}'").pick(:id)
           verified_ids << id if id.present?
           marker = f.key
         end
diff --git a/lib/file_store/to_s3_migration.rb b/lib/file_store/to_s3_migration.rb
index b99c911a6b9..ba8b79ee518 100644
--- a/lib/file_store/to_s3_migration.rb
+++ b/lib/file_store/to_s3_migration.rb
@@ -9,17 +9,11 @@ module FileStore
     MISSING_UPLOADS_RAKE_TASK_NAME ||= "posts:missing_uploads"
     UPLOAD_CONCURRENCY ||= 20
 
-    def initialize(
-      s3_options:,
-      dry_run: false,
-      migrate_to_multisite: false,
-      skip_etag_verify: false
-    )
+    def initialize(s3_options:, dry_run: false, migrate_to_multisite: false)
       @s3_bucket = s3_options[:bucket]
       @s3_client_options = s3_options[:client_options]
       @dry_run = dry_run
       @migrate_to_multisite = migrate_to_multisite
-      @skip_etag_verify = skip_etag_verify
       @current_db = RailsMultisite::ConnectionManagement.current_db
     end
 
@@ -31,13 +25,13 @@ module FileStore
     end
 
     def self.s3_options_from_env
-      unless ENV["DISCOURSE_S3_BUCKET"].present? && ENV["DISCOURSE_S3_REGION"].present? &&
-               (
-                 (
-                   ENV["DISCOURSE_S3_ACCESS_KEY_ID"].present? &&
-                     ENV["DISCOURSE_S3_SECRET_ACCESS_KEY"].present?
-                 ) || ENV["DISCOURSE_S3_USE_IAM_PROFILE"].present?
-               )
+      if ENV["DISCOURSE_S3_BUCKET"].blank? || ENV["DISCOURSE_S3_REGION"].blank? ||
+           !(
+             (
+               ENV["DISCOURSE_S3_ACCESS_KEY_ID"].present? &&
+                 ENV["DISCOURSE_S3_SECRET_ACCESS_KEY"].present?
+             ) || ENV["DISCOURSE_S3_USE_IAM_PROFILE"].present?
+           )
         raise ToS3MigrationError.new(<<~TEXT)
           Please provide the following environment variables:
             - DISCOURSE_S3_BUCKET
@@ -217,7 +211,7 @@ module FileStore
         UPLOAD_CONCURRENCY.times.map do
           Thread.new do
             while obj = queue.pop
-              if s3.put_object(obj[:options]).etag[obj[:etag]]
+              if s3.put_object(obj[:options])
                 putc "."
                 lock.synchronize { synced += 1 }
               else
@@ -231,20 +225,22 @@ module FileStore
       local_files.each do |file|
         path = File.join(public_directory, file)
         name = File.basename(path)
-        etag = Digest::MD5.file(path).hexdigest unless @skip_etag_verify
+        content_md5 = Digest::MD5.file(path).base64digest
         key = file[file.index(prefix)..-1]
         key.prepend(folder) if bucket_has_folder_path
         original_path = file.sub("uploads/#{@current_db}", "")
 
-        if s3_object = s3_objects.find { |obj| obj.key.ends_with?(original_path) }
-          next if File.size(path) == s3_object.size && (@skip_etag_verify || s3_object.etag[etag])
+        if (s3_object = s3_objects.find { |obj| obj.key.ends_with?(original_path) }) &&
+             File.size(path) == s3_object.size
+          next
         end
 
         options = {
-          acl: "public-read",
+          acl: SiteSetting.s3_use_acls ? "public-read" : nil,
           body: File.open(path, "rb"),
           bucket: bucket,
           content_type: MiniMime.lookup_by_filename(name)&.content_type,
+          content_md5: content_md5,
           key: key,
         }
 
@@ -267,13 +263,11 @@ module FileStore
           )
         end
 
-        etag ||= Digest::MD5.file(path).hexdigest
-
         if @dry_run
           log "#{file} => #{options[:key]}"
           synced += 1
         else
-          queue << { path: path, options: options, etag: etag }
+          queue << { path: path, options: options, content_md5: content_md5 }
         end
       end
 
diff --git a/lib/final_destination.rb b/lib/final_destination.rb
index 893b38e9c58..c722fdc2410 100644
--- a/lib/final_destination.rb
+++ b/lib/final_destination.rb
@@ -8,6 +8,9 @@ require "url_helper"
 
 # Determine the final endpoint for a Web URI, following redirects
 class FinalDestination
+  class SSRFError < SocketError
+  end
+
   MAX_REQUEST_TIME_SECONDS = 10
   MAX_REQUEST_SIZE_BYTES = 5_242_880 # 1024 * 1024 * 5
 
diff --git a/lib/final_destination/http.rb b/lib/final_destination/http.rb
index ffceff99deb..4973b149a33 100644
--- a/lib/final_destination/http.rb
+++ b/lib/final_destination/http.rb
@@ -23,7 +23,7 @@ class FinalDestination::HTTP < Net::HTTP
 
       @open_timeout = remaining_time
       return super
-    rescue SystemCallError, Net::OpenTimeout => e
+    rescue OpenSSL::SSL::SSLError, SystemCallError, Net::OpenTimeout => e
       debug "[FinalDestination] Error connecting to #{ip}... #{e.message}"
       was_last_attempt = index == ips.length - 1
       raise if was_last_attempt
diff --git a/lib/final_destination/resolver.rb b/lib/final_destination/resolver.rb
index 843a6a313bc..5d97ca99df3 100644
--- a/lib/final_destination/resolver.rb
+++ b/lib/final_destination/resolver.rb
@@ -3,7 +3,8 @@
 class FinalDestination::Resolver
   @mutex = Mutex.new
   def self.lookup(addr, timeout: nil)
-    timeout ||= 2
+    timeout ||= default_dns_query_timeout
+
     @mutex.synchronize do
       @result = nil
 
@@ -36,6 +37,14 @@ class FinalDestination::Resolver
 
   private
 
+  def self.default_dns_query_timeout
+    if gs = GlobalSetting.dns_query_timeout_secs.presence
+      Integer(gs)
+    else
+      2
+    end
+  end
+
   def self.ensure_lookup_thread
     return if @thread&.alive?
 
diff --git a/lib/final_destination/ssrf_detector.rb b/lib/final_destination/ssrf_detector.rb
index 7a3bf1f0369..dcb20644f73 100644
--- a/lib/final_destination/ssrf_detector.rb
+++ b/lib/final_destination/ssrf_detector.rb
@@ -2,9 +2,9 @@
 
 class FinalDestination
   module SSRFDetector
-    class DisallowedIpError < SocketError
+    class DisallowedIpError < SSRFError
     end
-    class LookupFailedError < SocketError
+    class LookupFailedError < SSRFError
     end
 
     # This is a list of private IPv4 IP ranges that are not allowed to be globally reachable as given by
diff --git a/lib/freedom_patches/pluck_first.rb b/lib/freedom_patches/pluck_first.rb
index 6f3d520187f..616cbad93d5 100644
--- a/lib/freedom_patches/pluck_first.rb
+++ b/lib/freedom_patches/pluck_first.rb
@@ -2,15 +2,17 @@
 
 class ActiveRecord::Relation
   def pluck_first(*attributes)
-    limit(1).pluck(*attributes).first
+    Discourse.deprecate("`#pluck_first` is deprecated, use `#pick` instead.")
+    pick(*attributes)
   end
 
   def pluck_first!(*attributes)
-    items = limit(1).pluck(*attributes)
+    Discourse.deprecate("`#pluck_first!` is deprecated without replacement.")
+    items = pick(*attributes)
 
-    raise_record_not_found_exception! if items.empty?
+    raise_record_not_found_exception! if items.nil?
 
-    items.first
+    items
   end
 end
 
diff --git a/lib/freedom_patches/rails4.rb b/lib/freedom_patches/rails4.rb
index 806813b7c87..e5751d63130 100644
--- a/lib/freedom_patches/rails4.rb
+++ b/lib/freedom_patches/rails4.rb
@@ -1,95 +1,27 @@
 # frozen_string_literal: true
 
-# Sam: This has now forked of rails. Trouble is we would never like to use "about 1 month" ever, we only want months for 2 or more months.
-#
-# Backporting a fix to rails itself may get too complex
 module FreedomPatches
   module Rails4
-    def self.distance_of_time_in_words(
-      from_time,
-      to_time = 0,
-      include_seconds = false,
-      options = {}
-    )
-      options = { scope: :"datetime.distance_in_words" }.merge!(options)
+    def self.distance_of_time_in_words(*args)
+      Discourse.deprecate(
+        "FreedomPatches::Rails4.distance_of_time_in_words has moved to AgeWords.distance_of_time_in_words",
+        output_in_test: true,
+        since: "3.1.0.beta5",
+        drop_from: "3.2.0.beta1",
+      )
 
-      from_time = from_time.to_time if from_time.respond_to?(:to_time)
-      to_time = to_time.to_time if to_time.respond_to?(:to_time)
-      distance = (to_time.to_f - from_time.to_f).abs
-      distance_in_minutes = (distance / 60.0).round
-      distance_in_seconds = distance.round
-
-      I18n.with_options locale: options[:locale], scope: options[:scope] do |locale|
-        case distance_in_minutes
-        when 0..1
-          unless include_seconds
-            return(
-              (
-                if distance_in_minutes == 0
-                  locale.t(:less_than_x_minutes, count: 1)
-                else
-                  locale.t(:x_minutes, count: distance_in_minutes)
-                end
-              )
-            )
-          end
-
-          case distance_in_seconds
-          when 0..4
-            locale.t :less_than_x_seconds, count: 5
-          when 5..9
-            locale.t :less_than_x_seconds, count: 10
-          when 10..19
-            locale.t :less_than_x_seconds, count: 20
-          when 20..39
-            locale.t :half_a_minute
-          when 40..59
-            locale.t :less_than_x_minutes, count: 1
-          else
-            locale.t :x_minutes, count: 1
-          end
-        when 2..44
-          locale.t :x_minutes, count: distance_in_minutes
-        when 45..89
-          locale.t :about_x_hours, count: 1
-        when 90..1439
-          locale.t :about_x_hours, count: (distance_in_minutes.to_f / 60.0).round
-        when 1440..2519
-          locale.t :x_days, count: 1
-
-          # this is were we diverge from Rails
-        when 2520..129_599
-          locale.t :x_days, count: (distance_in_minutes.to_f / 1440.0).round
-        when 129_600..525_599
-          locale.t :x_months, count: (distance_in_minutes.to_f / 43200.0).round
-        else
-          fyear = from_time.year
-          fyear += 1 if from_time.month >= 3
-          tyear = to_time.year
-          tyear -= 1 if to_time.month < 3
-          leap_years = (fyear > tyear) ? 0 : (fyear..tyear).count { |x| Date.leap?(x) }
-          minute_offset_for_leap_year = leap_years * 1440
-          # Discount the leap year days when calculating year distance.
-          # e.g. if there are 20 leap year days between 2 dates having the same day
-          # and month then the based on 365 days calculation
-          # the distance in years will come out to over 80 years when in written
-          # english it would read better as about 80 years.
-          minutes_with_offset = distance_in_minutes - minute_offset_for_leap_year
-          remainder = (minutes_with_offset % 525_600)
-          distance_in_years = (minutes_with_offset / 525_600)
-          if remainder < 131_400
-            locale.t(:about_x_years, count: distance_in_years)
-          elsif remainder < 394_200
-            locale.t(:over_x_years, count: distance_in_years)
-          else
-            locale.t(:almost_x_years, count: distance_in_years + 1)
-          end
-        end
-      end
+      AgeWords.distance_of_time_in_words(*args)
     end
 
-    def self.time_ago_in_words(from_time, include_seconds = false, options = {})
-      distance_of_time_in_words(from_time, Time.now, include_seconds, options)
+    def self.time_ago_in_words(*args)
+      Discourse.deprecate(
+        "FreedomPatches::Rails4.time_ago_in_words has moved to AgeWords.time_ago_in_words",
+        output_in_test: true,
+        since: "3.1.0.beta5",
+        drop_from: "3.2.0.beta1",
+      )
+
+      AgeWords.time_ago_in_words(*args)
     end
   end
 end
diff --git a/lib/freedom_patches/rails_multisite.rb b/lib/freedom_patches/rails_multisite.rb
index 0a78baaf320..608bf580b03 100644
--- a/lib/freedom_patches/rails_multisite.rb
+++ b/lib/freedom_patches/rails_multisite.rb
@@ -12,18 +12,17 @@ module RailsMultisite
 
           reading_role = :"#{db}_#{ActiveRecord.reading_role}"
           spec = RailsMultisite::ConnectionManagement.connection_spec(db: db)
+          handler = ActiveRecord::Base.connection_handler
 
-          ActiveRecord::Base.connection_handlers[reading_role] ||= begin
-            handler = ActiveRecord::ConnectionAdapters::ConnectionHandler.new
-            RailsFailover::ActiveRecord.establish_reading_connection(handler, spec)
-            handler
-          end
-
+          RailsFailover::ActiveRecord.establish_reading_connection(
+            handler,
+            spec.to_hash,
+            role: reading_role,
+          )
           ActiveRecord::Base.connected_to(role: reading_role) { yield(db) if block_given? }
         rescue => e
           STDERR.puts "URGENT: Failed to initialize site #{db}: " \
                         "#{e.class} #{e.message}\n#{e.backtrace.join("\n")}"
-
           # the show must go on, don't stop startup if multisite fails
         end
       end
diff --git a/lib/freedom_patches/sprockets_patches.rb b/lib/freedom_patches/sprockets_patches.rb
index b9fb4974143..449e94de35c 100644
--- a/lib/freedom_patches/sprockets_patches.rb
+++ b/lib/freedom_patches/sprockets_patches.rb
@@ -36,3 +36,26 @@ if Rails.env.development? || Rails.env.test?
     alias_method :public_compute_asset_path, :compute_asset_path
   end
 end
+
+# By default, the Sprockets DirectiveProcessor introduces a newline between possible 'header' comments
+# and the rest of the JS file. (https://github.com/rails/sprockets/blob/f4d3dae71e/lib/sprockets/directive_processor.rb#L121)
+# This causes sourcemaps to be offset by 1 line, and therefore breaks browser tooling.
+# We know that Ember-Cli assets do not use Sprockets directives, so we can totally bypass the DirectiveProcessor for those files.
+Sprockets::DirectiveProcessor.prepend(
+  Module.new do
+    def process_source(source)
+      return source, [] if EmberCli.is_ember_cli_asset?(File.basename(@filename))
+      super
+    end
+  end,
+)
+
+# Skip digest path for workbox assets. They are already in a folder with a digest in the name.
+Sprockets::Asset.prepend(
+  Module.new do
+    def digest_path
+      return logical_path if logical_path.match?(%r{^workbox-.*/})
+      super
+    end
+  end,
+)
diff --git a/lib/freedom_patches/translate_accelerator.rb b/lib/freedom_patches/translate_accelerator.rb
index b13464012b5..047a4754506 100644
--- a/lib/freedom_patches/translate_accelerator.rb
+++ b/lib/freedom_patches/translate_accelerator.rb
@@ -39,7 +39,7 @@ module I18n
 
         if @loaded_locales.empty?
           # load all rb files
-          I18n.backend.load_translations(I18n.load_path.grep(/\.rb$/))
+          I18n.backend.load_translations(I18n.load_path.grep(/\.rb\z/))
 
           # load plural rules from plugins
           DiscoursePluginRegistry.locales.each do |plugin_locale, options|
@@ -50,14 +50,14 @@ module I18n
         end
 
         # load it
-        I18n.backend.load_translations(I18n.load_path.grep(/\.#{Regexp.escape locale}\.yml$/))
+        I18n.backend.load_translations(I18n.load_path.grep(/\.#{Regexp.escape locale}\.yml\z/))
 
         if Discourse.allow_dev_populate?
           I18n.backend.load_translations(
-            I18n.load_path.grep(%r{.*faker.*/#{Regexp.escape locale}\.yml$}),
+            I18n.load_path.grep(%r{.*faker.*/#{Regexp.escape locale}\.yml\z}),
           )
           I18n.backend.load_translations(
-            I18n.load_path.grep(%r{.*faker.*/#{Regexp.escape locale}/.*\.yml$}),
+            I18n.load_path.grep(%r{.*faker.*/#{Regexp.escape locale}/.*\.yml\z}),
           )
         end
 
@@ -148,7 +148,7 @@ module I18n
       elsif should_raise
         raise I18n::MissingTranslationData.new(locale, key)
       else
-        -"translation missing: #{locale}.#{key}"
+        -"Translation missing: #{locale}.#{key}"
       end
     end
 
diff --git a/lib/git_repo.rb b/lib/git_repo.rb
new file mode 100644
index 00000000000..4d8dcb952ac
--- /dev/null
+++ b/lib/git_repo.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+class GitRepo
+  attr_reader :path, :name
+
+  def initialize(path, name = nil)
+    @path = path
+    @name = name
+    @memoize = {}
+  end
+
+  def url
+    url = run("config --get remote.origin.url")
+    return if url.blank?
+
+    url.sub!(/\Agit@github\.com:/, "https://github.com/")
+    url.sub!(/\.git\z/, "")
+    url
+  end
+
+  def latest_local_commit
+    run "rev-parse HEAD"
+  end
+
+  protected
+
+  def run(cmd)
+    @memoize[cmd] ||= begin
+      cmd = "git #{cmd}".split(" ")
+      Discourse::Utils.execute_command(*cmd, chdir: path).strip
+    rescue => e
+      Discourse.warn_exception(e, message: "Error running git command: #{cmd} in #{path}")
+      nil
+    end
+  end
+end
diff --git a/lib/git_url.rb b/lib/git_url.rb
index 90eefc0eb95..f991d585c2c 100644
--- a/lib/git_url.rb
+++ b/lib/git_url.rb
@@ -10,7 +10,7 @@ module GitUrl
       end
 
       if url.start_with?("https://github.com/") && !url.end_with?(".git")
-        url = url.gsub(%r{/$}, "")
+        url = url.gsub(%r{/\z}, "")
         url += ".git"
       end
 
diff --git a/lib/global_path.rb b/lib/global_path.rb
index 318aa346f30..fb0ad36239e 100644
--- a/lib/global_path.rb
+++ b/lib/global_path.rb
@@ -12,7 +12,7 @@ module GlobalPath
   def upload_cdn_path(p)
     p = Discourse.store.cdn_url(p) if SiteSetting.Upload.s3_cdn_url.present?
 
-    (p =~ /^http/ || p =~ %r{^//}) ? p : cdn_path(p)
+    (p =~ /\Ahttp/ || p =~ %r{\A//}) ? p : cdn_path(p)
   end
 
   def cdn_relative_path(path)
diff --git a/lib/group_lookup.rb b/lib/group_lookup.rb
new file mode 100644
index 00000000000..cd942a80c0a
--- /dev/null
+++ b/lib/group_lookup.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class GroupLookup
+  def initialize(group_ids = [])
+    @group_ids = group_ids.flatten.compact.uniq
+  end
+
+  # Lookup a group by id
+  def [](group_id)
+    group_names[group_id]
+  end
+
+  private
+
+  def group_names
+    @group_names ||= Group.where(id: @group_ids).pluck(:id, :name).to_h
+  end
+end
diff --git a/lib/guardian.rb b/lib/guardian.rb
index 1a9b2dd52f3..cfc9e345490 100644
--- a/lib/guardian.rb
+++ b/lib/guardian.rb
@@ -1,26 +1,28 @@
 # frozen_string_literal: true
 
+require "guardian/bookmark_guardian"
 require "guardian/category_guardian"
 require "guardian/ensure_magic"
+require "guardian/group_guardian"
 require "guardian/post_guardian"
-require "guardian/bookmark_guardian"
+require "guardian/post_revision_guardian"
+require "guardian/sidebar_guardian"
+require "guardian/tag_guardian"
 require "guardian/topic_guardian"
 require "guardian/user_guardian"
-require "guardian/post_revision_guardian"
-require "guardian/group_guardian"
-require "guardian/tag_guardian"
 
 # The guardian is responsible for confirming access to various site resources and operations
 class Guardian
-  include EnsureMagic
-  include CategoryGuardian
-  include PostGuardian
   include BookmarkGuardian
+  include CategoryGuardian
+  include EnsureMagic
+  include GroupGuardian
+  include PostGuardian
+  include PostRevisionGuardian
+  include SidebarGuardian
+  include TagGuardian
   include TopicGuardian
   include UserGuardian
-  include PostRevisionGuardian
-  include GroupGuardian
-  include TagGuardian
 
   class AnonymousUser
     def blank?
@@ -160,7 +162,7 @@ class Guardian
   def can_see?(obj)
     if obj
       see_method = method_name_for :see, obj
-      (see_method ? public_send(see_method, obj) : true)
+      see_method && public_send(see_method, obj)
     end
   end
 
@@ -230,7 +232,11 @@ class Guardian
   end
 
   def can_delete_reviewable_queued_post?(reviewable)
-    reviewable.present? && authenticated? && reviewable.created_by_id == @user.id
+    return false if reviewable.blank?
+    return false if !authenticated?
+    return true if is_api? && is_admin?
+
+    reviewable.created_by_id == @user.id
   end
 
   def can_see_group?(group)
@@ -295,7 +301,7 @@ class Guardian
 
   # Can we impersonate this user?
   def can_impersonate?(target)
-    target &&
+    GlobalSetting.allow_impersonation && target &&
       # You must be an admin to impersonate
       is_admin? &&
       # You may not impersonate other admins unless you are a dev
@@ -366,8 +372,7 @@ class Guardian
 
   def can_use_flair_group?(user, group_id = nil)
     return false if !user || !group_id || !user.group_ids.include?(group_id.to_i)
-    flair_icon, flair_upload_id =
-      Group.where(id: group_id.to_i).pluck_first(:flair_icon, :flair_upload_id)
+    flair_icon, flair_upload_id = Group.where(id: group_id.to_i).pick(:flair_icon, :flair_upload_id)
     flair_icon.present? || flair_upload_id.present?
   end
 
@@ -615,10 +620,14 @@ class Guardian
   private
 
   def is_my_own?(obj)
-    unless anonymous?
-      return obj.user_id == @user.id if obj.respond_to?(:user_id) && obj.user_id && @user.id
-      return obj.user == @user if obj.respond_to?(:user)
+    if anonymous?
+      return(
+        SiteSetting.allow_anonymous_likes? && obj.class == PostAction && obj.is_like? &&
+          obj.user_id == @user.id
+      )
     end
+    return obj.user_id == @user.id if obj.respond_to?(:user_id) && obj.user_id && @user.id
+    return obj.user == @user if obj.respond_to?(:user)
 
     false
   end
@@ -649,6 +658,10 @@ class Guardian
     end
   end
 
+  def is_api?
+    @user && request&.env&.dig(Auth::DefaultCurrentUserProvider::API_KEY_ENV)
+  end
+
   protected
 
   def category_group_moderation_allowed?
diff --git a/lib/guardian/category_guardian.rb b/lib/guardian/category_guardian.rb
index e437455dfc5..62243d7ba2f 100644
--- a/lib/guardian/category_guardian.rb
+++ b/lib/guardian/category_guardian.rb
@@ -49,7 +49,6 @@ module CategoryGuardian
     return false unless category
     return false if is_anonymous?
     return true if is_admin?
-    return true if !category.read_restricted
     Category.post_create_allowed(self).exists?(id: category.id)
   end
 
diff --git a/lib/guardian/ensure_magic.rb b/lib/guardian/ensure_magic.rb
index 62cece83b61..3a2dbdea657 100644
--- a/lib/guardian/ensure_magic.rb
+++ b/lib/guardian/ensure_magic.rb
@@ -3,7 +3,7 @@
 # Support for ensure_{blah}! methods.
 module EnsureMagic
   def method_missing(method, *args, &block)
-    if method.to_s =~ /^ensure_(.*)\!$/
+    if method.to_s =~ /\Aensure_(.*)\!\z/
       can_method = :"#{Regexp.last_match[1]}?"
 
       if respond_to?(can_method)
diff --git a/lib/guardian/post_guardian.rb b/lib/guardian/post_guardian.rb
index 6ca1256896d..7c775b5453a 100644
--- a/lib/guardian/post_guardian.rb
+++ b/lib/guardian/post_guardian.rb
@@ -25,7 +25,7 @@ module PostGuardian
   # Can the user act on the post in a particular way.
   #  taken_actions = the list of actions the user has already taken
   def post_can_act?(post, action_key, opts: {}, can_see_post: nil)
-    return false unless (can_see_post.nil? && can_see_post?(post)) || can_see_post
+    return false if !(can_see_post.nil? && can_see_post?(post)) && !can_see_post
 
     # no warnings except for staff
     if action_key == :notify_user &&
@@ -43,7 +43,10 @@ module PostGuardian
     already_did_flagging = taken.any? && (taken & PostActionType.notify_flag_types.values).any?
 
     result =
-      if authenticated? && post && !@user.anonymous?
+      if authenticated? && post
+        # Allow anonymous users to like if feature is enabled and short-circuit otherwise
+        return SiteSetting.allow_anonymous_likes? && (action_key == :like) if @user.anonymous?
+
         # Silenced users can't flag
         return false if is_flag && @user.silenced?
 
@@ -129,11 +132,7 @@ module PostGuardian
     # Must be staff to edit a locked post
     return false if post.locked? && !is_staff?
 
-    if (
-         is_staff? ||
-           (SiteSetting.trusted_users_can_edit_others? && @user.has_trust_level?(TrustLevel[4])) ||
-           is_category_group_moderator?(post.topic&.category)
-       )
+    if (is_staff? || is_in_edit_post_groups? || is_category_group_moderator?(post.topic&.category))
       return can_create_post?(post.topic)
     end
 
@@ -173,6 +172,11 @@ module PostGuardian
     false
   end
 
+  def is_in_edit_post_groups?
+    SiteSetting.edit_all_post_groups.present? &&
+      user.in_any_groups?(SiteSetting.edit_all_post_groups.to_s.split("|").map(&:to_i))
+  end
+
   def can_edit_hidden_post?(post)
     return false if post.nil?
     post.hidden_at.nil? ||
@@ -191,6 +195,8 @@ module PostGuardian
 
     return true if is_staff? || is_category_group_moderator?(post.topic&.category)
 
+    return true if SiteSetting.tl4_delete_posts_and_topics && user.has_trust_level?(TrustLevel[4])
+
     # Can't delete posts in archived topics unless you are staff
     return false if post.topic&.archived?
 
@@ -247,6 +253,18 @@ module PostGuardian
       !post_action.post&.topic&.archived?
   end
 
+  def can_receive_post_notifications?(post)
+    return false if !authenticated?
+
+    if is_admin? && SiteSetting.suppress_secured_categories_from_admin
+      topic = post.topic
+      if !topic.private_message? && topic.category.read_restricted
+        return secure_category_ids.include?(topic.category_id)
+      end
+    end
+    can_see_post?(post)
+  end
+
   def can_see_post?(post)
     return false if post.blank?
     return true if is_admin?
@@ -255,7 +273,10 @@ module PostGuardian
       return false
     end
     return true if is_moderator? || is_category_group_moderator?(post.topic.category)
-    return true if !post.trashed? || can_see_deleted_post?(post)
+    if (!post.trashed? || can_see_deleted_post?(post)) &&
+         (!post.hidden? || can_see_hidden_post?(post))
+      return true
+    end
     false
   end
 
@@ -266,6 +287,15 @@ module PostGuardian
     post.deleted_by_id == @user.id && @user.has_trust_level?(TrustLevel[4])
   end
 
+  def can_see_hidden_post?(post)
+    if SiteSetting.hidden_post_visible_groups_map.include?(Group::AUTO_GROUPS[:everyone])
+      return true
+    end
+    return false if anonymous?
+    return true if is_staff?
+    post.user_id == @user.id || @user.in_any_groups?(SiteSetting.hidden_post_visible_groups_map)
+  end
+
   def can_view_edit_history?(post)
     return false unless post
 
@@ -311,7 +341,8 @@ module PostGuardian
   end
 
   def can_see_deleted_posts?(category = nil)
-    is_staff? || is_category_group_moderator?(category)
+    is_staff? || is_category_group_moderator?(category) ||
+      (SiteSetting.tl4_delete_posts_and_topics && @user.has_trust_level?(TrustLevel[4]))
   end
 
   def can_view_raw_email?(post)
diff --git a/lib/guardian/post_revision_guardian.rb b/lib/guardian/post_revision_guardian.rb
index 1e61b19e746..9d2108ba2eb 100644
--- a/lib/guardian/post_revision_guardian.rb
+++ b/lib/guardian/post_revision_guardian.rb
@@ -13,6 +13,10 @@ module PostRevisionGuardian
     is_staff?
   end
 
+  def can_permanently_delete_post_revisions?
+    is_staff? && SiteSetting.can_permanently_delete
+  end
+
   def can_show_post_revision?(post_revision)
     is_staff?
   end
diff --git a/lib/guardian/sidebar_guardian.rb b/lib/guardian/sidebar_guardian.rb
new file mode 100644
index 00000000000..855733b1862
--- /dev/null
+++ b/lib/guardian/sidebar_guardian.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module SidebarGuardian
+  def can_create_public_sidebar_section?
+    @user.admin?
+  end
+
+  def can_edit_sidebar_section?(sidebar_section)
+    return @user.admin? if sidebar_section.public?
+    return @user.admin? if sidebar_section.section_type
+    is_my_own?(sidebar_section)
+  end
+
+  def can_delete_sidebar_section?(sidebar_section)
+    return false if sidebar_section.section_type.present?
+    return @user.admin? if sidebar_section.public?
+    is_my_own?(sidebar_section)
+  end
+end
diff --git a/lib/guardian/tag_guardian.rb b/lib/guardian/tag_guardian.rb
index db1ec7688ce..f6fd968e984 100644
--- a/lib/guardian/tag_guardian.rb
+++ b/lib/guardian/tag_guardian.rb
@@ -2,6 +2,10 @@
 
 #mixin for all guardian methods dealing with tagging permissions
 module TagGuardian
+  def can_see_tag?(_tag)
+    true
+  end
+
   def can_create_tag?
     SiteSetting.tagging_enabled &&
       @user.has_trust_level_or_staff?(SiteSetting.min_trust_to_create_tag)
diff --git a/lib/guardian/topic_guardian.rb b/lib/guardian/topic_guardian.rb
index 05fb6ad041d..0f8782f3bbf 100644
--- a/lib/guardian/topic_guardian.rb
+++ b/lib/guardian/topic_guardian.rb
@@ -119,18 +119,16 @@ module TopicGuardian
       return true
     end
 
-    # TL4 users can edit archived topics, but can not edit private messages
     if (
-         SiteSetting.trusted_users_can_edit_others? && topic.archived && !topic.private_message? &&
-           user.has_trust_level?(TrustLevel[4]) && can_create_post?(topic)
+         is_in_edit_post_groups? && topic.archived && !topic.private_message? &&
+           can_create_post?(topic)
        )
       return true
     end
 
-    # TL3 users can not edit archived topics and private messages
     if (
-         SiteSetting.trusted_users_can_edit_others? && !topic.archived && !topic.private_message? &&
-           user.has_trust_level?(TrustLevel[3]) && can_create_post?(topic)
+         is_in_edit_topic_groups? && !topic.archived && !topic.private_message? &&
+           can_create_post?(topic)
        )
       return true
     end
@@ -141,8 +139,14 @@ module TopicGuardian
       (!first_post&.hidden? || can_edit_hidden_post?(first_post))
   end
 
+  def is_in_edit_topic_groups?
+    SiteSetting.edit_all_topic_groups.present? &&
+      user.in_any_groups?(SiteSetting.edit_all_topic_groups.to_s.split("|").map(&:to_i))
+  end
+
   def can_recover_topic?(topic)
-    if is_staff? || (topic&.category && is_category_group_moderator?(topic.category))
+    if is_staff? || (topic&.category && is_category_group_moderator?(topic.category)) ||
+         (SiteSetting.tl4_delete_posts_and_topics && user&.has_trust_level?(TrustLevel[4]))
       !!(topic && topic.deleted_at)
     else
       topic && can_recover_post?(topic.ordered_posts.first)
@@ -156,7 +160,8 @@ module TopicGuardian
           (
             is_my_own?(topic) && topic.posts_count <= 1 && topic.created_at &&
               topic.created_at > 24.hours.ago
-          ) || is_category_group_moderator?(topic.category)
+          ) || is_category_group_moderator?(topic.category) ||
+          (SiteSetting.tl4_delete_posts_and_topics && user.has_trust_level?(TrustLevel[4]))
       ) && !topic.is_category_topic? && !Discourse.static_doc_topic_ids.include?(topic.id)
   end
 
@@ -209,7 +214,8 @@ module TopicGuardian
   end
 
   def can_see_deleted_topics?(category)
-    is_staff? || is_category_group_moderator?(category)
+    is_staff? || is_category_group_moderator?(category) ||
+      (SiteSetting.tl4_delete_posts_and_topics && user&.has_trust_level?(TrustLevel[4]))
   end
 
   # Accepts an array of `Topic#id` and returns an array of `Topic#id` which the user can see.
@@ -277,31 +283,33 @@ module TopicGuardian
       )
   end
 
+  def can_see_unlisted_topics?
+    is_staff? || @user.has_trust_level?(TrustLevel[4])
+  end
+
   def can_get_access_to_topic?(topic)
     topic&.access_topic_via_group.present? && authenticated?
   end
 
-  def filter_allowed_categories(records)
+  def filter_allowed_categories(records, category_id_column: "topics.category_id")
     return records if is_admin? && !SiteSetting.suppress_secured_categories_from_admin
 
     records =
-      (
-        if allowed_category_ids.size == 0
-          records.where("topics.category_id IS NULL")
-        else
-          records.where(
-            "topics.category_id IS NULL or topics.category_id IN (?)",
-            allowed_category_ids,
-          )
-        end
-      )
+      if allowed_category_ids.size == 0
+        records.where("#{category_id_column} IS NULL")
+      else
+        records.where(
+          "#{category_id_column} IS NULL or #{category_id_column} IN (?)",
+          allowed_category_ids,
+        )
+      end
 
     records.references(:categories)
   end
 
   def can_edit_featured_link?(category_id)
     return false unless SiteSetting.topic_featured_link_enabled
-    return false unless @user.trust_level >= TrustLevel.levels[:basic]
+    return false if @user.trust_level == TrustLevel.levels[:newuser]
     Category.where(
       id: category_id || SiteSetting.uncategorized_category_id,
       topic_featured_link_allowed: true,
diff --git a/lib/guardian/user_guardian.rb b/lib/guardian/user_guardian.rb
index 2879ad036f9..5f605adab5e 100644
--- a/lib/guardian/user_guardian.rb
+++ b/lib/guardian/user_guardian.rb
@@ -74,7 +74,7 @@ module UserGuardian
   end
 
   def can_anonymize_user?(user)
-    is_staff? && !user.nil? && !user.staff?
+    is_staff? && !user.nil? && !user.staff? && !user.email&.ends_with?(UserAnonymizer::EMAIL_SUFFIX)
   end
 
   def can_merge_user?(user)
@@ -118,6 +118,10 @@ module UserGuardian
     user && can_administer_user?(user)
   end
 
+  def can_see_user?(_user)
+    true
+  end
+
   def can_see_profile?(user)
     return false if user.blank?
     return true if !SiteSetting.allow_users_to_hide_profile?
diff --git a/lib/html_prettify.rb b/lib/html_prettify.rb
index 074a3c8a2a5..f56665a96a8 100644
--- a/lib/html_prettify.rb
+++ b/lib/html_prettify.rb
@@ -249,8 +249,8 @@ class HtmlPrettify < String
     # Special case if the very first character is a quote followed by
     # punctuation at a non-word-break. Close the quotes by brute
     # force:
-    str.gsub!(/^'(?=#{punct_class}\B)/, entity(:single_right_quote))
-    str.gsub!(/^"(?=#{punct_class}\B)/, entity(:double_right_quote))
+    str.gsub!(/\A'(?=#{punct_class}\B)/, entity(:single_right_quote))
+    str.gsub!(/\A"(?=#{punct_class}\B)/, entity(:double_right_quote))
 
     # Special case for double sets of quotes, e.g.:
     #   <p>He said, "'Quoted' words in a larger quote."</p>
diff --git a/lib/i18n/locale_file_checker.rb b/lib/i18n/locale_file_checker.rb
index de9eae3056c..e0aa83028fa 100644
--- a/lib/i18n/locale_file_checker.rb
+++ b/lib/i18n/locale_file_checker.rb
@@ -19,8 +19,8 @@ class LocaleFileChecker
 
       @relative_locale_path =
         Pathname.new(locale_path).relative_path_from(Pathname.new(Rails.root)).to_s
-      @locale_yaml = YAML.load_file(locale_path)
-      @reference_yaml = YAML.load_file(reference_path)
+      @locale_yaml = YAML.load_file(locale_path, aliases: true)
+      @reference_yaml = YAML.load_file(reference_path, aliases: true)
 
       next if @locale_yaml.blank? || @locale_yaml.first[1].blank?
 
@@ -49,7 +49,7 @@ class LocaleFileChecker
   end
 
   def reference_file(path)
-    path = path.gsub(/\.\w{2,}\.yml$/, ".#{REFERENCE_LOCALE}.yml")
+    path = path.gsub(/\.\w{2,}\.yml\z/, ".#{REFERENCE_LOCALE}.yml")
     path if File.exist?(path)
   end
 
diff --git a/lib/javascripts/messageformat.js b/lib/javascripts/messageformat.js
deleted file mode 100644
index 6626d51a168..00000000000
--- a/lib/javascripts/messageformat.js
+++ /dev/null
@@ -1,1593 +0,0 @@
-/**
- * messageformat.js
- *
- * ICU PluralFormat + SelectFormat for JavaScript
- *
- * @author Alex Sexton - @SlexAxton
- * @version 0.1.5
- * @license WTFPL
- * @contributor_license Dojo CLA
-*/
-(function ( root ) {
-
-  // Create the constructor function
-  function MessageFormat ( locale, pluralFunc ) {
-    var fallbackLocale;
-
-    if ( locale && pluralFunc ) {
-      MessageFormat.locale[ locale ] = pluralFunc;
-    }
-
-    // Defaults
-    fallbackLocale = locale = locale || "en";
-    pluralFunc = pluralFunc || MessageFormat.locale[ fallbackLocale = MessageFormat.Utils.getFallbackLocale( locale ) ];
-
-    if ( ! pluralFunc ) {
-      throw new Error( "Plural Function not found for locale: " + locale );
-    }
-
-    // Own Properties
-    this.pluralFunc = pluralFunc;
-    this.locale = locale;
-    this.fallbackLocale = fallbackLocale;
-  }
-
-  // Set up the locales object. Add in english by default
-  MessageFormat.locale = {
-    "en" : function ( n ) {
-      if ( n === 1 ) {
-        return "one";
-      }
-      return "other";
-    }
-  };
-
-  // Build out our basic SafeString type
-  // more or less stolen from Handlebars by @wycats
-  MessageFormat.SafeString = function( string ) {
-    this.string = string;
-  };
-
-  MessageFormat.SafeString.prototype.toString = function () {
-    return this.string.toString();
-  };
-
-  MessageFormat.Utils = {
-    numSub : function ( string, key, depth ) {
-      // make sure that it's not an escaped octothorpe
-      return string.replace( /^#|[^\\]#/g, function (m) {
-        var prefix = m && m.length === 2 ? m.charAt(0) : '';
-        return prefix + '" + (function(){ var x = ' +
-        key+';\nif( isNaN(x) ){\nthrow new Error("MessageFormat: `"+lastkey_'+depth+'+"` isnt a number.");\n}\nreturn x;\n})() + "';
-      });
-    },
-    escapeExpression : function (string) {
-      var escape = {
-            "\n": "\\n",
-            "\"": '\\"'
-          },
-          badChars = /[\n"]/g,
-          possible = /[\n"]/,
-          escapeChar = function(chr) {
-            return escape[chr] || "&amp;";
-          };
-
-      // Don't escape SafeStrings, since they're already safe
-      if ( string instanceof MessageFormat.SafeString ) {
-        return string.toString();
-      }
-      else if ( string === null || string === false ) {
-        return "";
-      }
-
-      if ( ! possible.test( string ) ) {
-        return string;
-      }
-      return string.replace( badChars, escapeChar );
-    },
-    getFallbackLocale: function( locale ) {
-      var tagSeparator = locale.indexOf("-") >= 0 ? "-" : "_";
-
-      // Lets just be friends, fallback through the language tags
-      while ( ! MessageFormat.locale.hasOwnProperty( locale ) ) {
-        locale = locale.substring(0, locale.lastIndexOf( tagSeparator ));
-        if (locale.length === 0) {
-          return null;
-        }
-      }
-
-      return locale;
-    }
-  };
-
-  // This is generated and pulled in for browsers.
-  var mparser = (function(){
-    /*
-     * Generated by PEG.js 0.7.0.
-     *
-     * http://pegjs.majda.cz/
-     */
-    
-    function quote(s) {
-      /*
-       * ECMA-262, 5th ed., 7.8.4: All characters may appear literally in a
-       * string literal except for the closing quote character, backslash,
-       * carriage return, line separator, paragraph separator, and line feed.
-       * Any character may appear in the form of an escape sequence.
-       *
-       * For portability, we also escape escape all control and non-ASCII
-       * characters. Note that "\0" and "\v" escape sequences are not used
-       * because JSHint does not like the first and IE the second.
-       */
-       return '"' + s
-        .replace(/\\/g, '\\\\')  // backslash
-        .replace(/"/g, '\\"')    // closing quote character
-        .replace(/\x08/g, '\\b') // backspace
-        .replace(/\t/g, '\\t')   // horizontal tab
-        .replace(/\n/g, '\\n')   // line feed
-        .replace(/\f/g, '\\f')   // form feed
-        .replace(/\r/g, '\\r')   // carriage return
-        .replace(/[\x00-\x07\x0B\x0E-\x1F\x80-\uFFFF]/g, escape)
-        + '"';
-    }
-    
-    var result = {
-      /*
-       * Parses the input with a generated parser. If the parsing is successful,
-       * returns a value explicitly or implicitly specified by the grammar from
-       * which the parser was generated (see |PEG.buildParser|). If the parsing is
-       * unsuccessful, throws |PEG.parser.SyntaxError| describing the error.
-       */
-      parse: function(input, startRule) {
-        var parseFunctions = {
-          "start": parse_start,
-          "messageFormatPattern": parse_messageFormatPattern,
-          "messageFormatPatternRight": parse_messageFormatPatternRight,
-          "messageFormatElement": parse_messageFormatElement,
-          "elementFormat": parse_elementFormat,
-          "pluralStyle": parse_pluralStyle,
-          "selectStyle": parse_selectStyle,
-          "pluralFormatPattern": parse_pluralFormatPattern,
-          "offsetPattern": parse_offsetPattern,
-          "selectFormatPattern": parse_selectFormatPattern,
-          "pluralForms": parse_pluralForms,
-          "stringKey": parse_stringKey,
-          "string": parse_string,
-          "id": parse_id,
-          "chars": parse_chars,
-          "char": parse_char,
-          "digits": parse_digits,
-          "hexDigit": parse_hexDigit,
-          "_": parse__,
-          "whitespace": parse_whitespace
-        };
-        
-        if (startRule !== undefined) {
-          if (parseFunctions[startRule] === undefined) {
-            throw new Error("Invalid rule name: " + quote(startRule) + ".");
-          }
-        } else {
-          startRule = "start";
-        }
-        
-        var pos = 0;
-        var reportFailures = 0;
-        var rightmostFailuresPos = 0;
-        var rightmostFailuresExpected = [];
-        
-        function padLeft(input, padding, length) {
-          var result = input;
-          
-          var padLength = length - input.length;
-          for (var i = 0; i < padLength; i++) {
-            result = padding + result;
-          }
-          
-          return result;
-        }
-        
-        function escape(ch) {
-          var charCode = ch.charCodeAt(0);
-          var escapeChar;
-          var length;
-          
-          if (charCode <= 0xFF) {
-            escapeChar = 'x';
-            length = 2;
-          } else {
-            escapeChar = 'u';
-            length = 4;
-          }
-          
-          return '\\' + escapeChar + padLeft(charCode.toString(16).toUpperCase(), '0', length);
-        }
-        
-        function matchFailed(failure) {
-          if (pos < rightmostFailuresPos) {
-            return;
-          }
-          
-          if (pos > rightmostFailuresPos) {
-            rightmostFailuresPos = pos;
-            rightmostFailuresExpected = [];
-          }
-          
-          rightmostFailuresExpected.push(failure);
-        }
-        
-        function parse_start() {
-          var result0;
-          var pos0;
-          
-          pos0 = pos;
-          result0 = parse_messageFormatPattern();
-          if (result0 !== null) {
-            result0 = (function(offset, messageFormatPattern) { return { type: "program", program: messageFormatPattern }; })(pos0, result0);
-          }
-          if (result0 === null) {
-            pos = pos0;
-          }
-          return result0;
-        }
-        
-        function parse_messageFormatPattern() {
-          var result0, result1, result2;
-          var pos0, pos1;
-          
-          pos0 = pos;
-          pos1 = pos;
-          result0 = parse_string();
-          if (result0 !== null) {
-            result1 = [];
-            result2 = parse_messageFormatPatternRight();
-            while (result2 !== null) {
-              result1.push(result2);
-              result2 = parse_messageFormatPatternRight();
-            }
-            if (result1 !== null) {
-              result0 = [result0, result1];
-            } else {
-              result0 = null;
-              pos = pos1;
-            }
-          } else {
-            result0 = null;
-            pos = pos1;
-          }
-          if (result0 !== null) {
-            result0 = (function(offset, s1, inner) {
-              var st = [];
-              if ( s1 && s1.val ) {
-                st.push( s1 );
-              }
-              for( var i in inner ){
-                if ( inner.hasOwnProperty( i ) ) {
-                  st.push( inner[ i ] );
-                }
-              }
-              return { type: 'messageFormatPattern', statements: st };
-            })(pos0, result0[0], result0[1]);
-          }
-          if (result0 === null) {
-            pos = pos0;
-          }
-          return result0;
-        }
-        
-        function parse_messageFormatPatternRight() {
-          var result0, result1, result2, result3, result4, result5;
-          var pos0, pos1;
-          
-          pos0 = pos;
-          pos1 = pos;
-          if (input.charCodeAt(pos) === 123) {
-            result0 = "{";
-            pos++;
-          } else {
-            result0 = null;
-            if (reportFailures === 0) {
-              matchFailed("\"{\"");
-            }
-          }
-          if (result0 !== null) {
-            result1 = parse__();
-            if (result1 !== null) {
-              result2 = parse_messageFormatElement();
-              if (result2 !== null) {
-                result3 = parse__();
-                if (result3 !== null) {
-                  if (input.charCodeAt(pos) === 125) {
-                    result4 = "}";
-                    pos++;
-                  } else {
-                    result4 = null;
-                    if (reportFailures === 0) {
-                      matchFailed("\"}\"");
-                    }
-                  }
-                  if (result4 !== null) {
-                    result5 = parse_string();
-                    if (result5 !== null) {
-                      result0 = [result0, result1, result2, result3, result4, result5];
-                    } else {
-                      result0 = null;
-                      pos = pos1;
-                    }
-                  } else {
-                    result0 = null;
-                    pos = pos1;
-                  }
-                } else {
-                  result0 = null;
-                  pos = pos1;
-                }
-              } else {
-                result0 = null;
-                pos = pos1;
-              }
-            } else {
-              result0 = null;
-              pos = pos1;
-            }
-          } else {
-            result0 = null;
-            pos = pos1;
-          }
-          if (result0 !== null) {
-            result0 = (function(offset, mfe, s1) {
-              var res = [];
-              if ( mfe ) {
-                res.push(mfe);
-              }
-              if ( s1 && s1.val ) {
-                res.push( s1 );
-              }
-              return { type: "messageFormatPatternRight", statements : res };
-            })(pos0, result0[2], result0[5]);
-          }
-          if (result0 === null) {
-            pos = pos0;
-          }
-          return result0;
-        }
-        
-        function parse_messageFormatElement() {
-          var result0, result1, result2;
-          var pos0, pos1, pos2;
-          
-          pos0 = pos;
-          pos1 = pos;
-          result0 = parse_id();
-          if (result0 !== null) {
-            pos2 = pos;
-            if (input.charCodeAt(pos) === 44) {
-              result1 = ",";
-              pos++;
-            } else {
-              result1 = null;
-              if (reportFailures === 0) {
-                matchFailed("\",\"");
-              }
-            }
-            if (result1 !== null) {
-              result2 = parse_elementFormat();
-              if (result2 !== null) {
-                result1 = [result1, result2];
-              } else {
-                result1 = null;
-                pos = pos2;
-              }
-            } else {
-              result1 = null;
-              pos = pos2;
-            }
-            result1 = result1 !== null ? result1 : "";
-            if (result1 !== null) {
-              result0 = [result0, result1];
-            } else {
-              result0 = null;
-              pos = pos1;
-            }
-          } else {
-            result0 = null;
-            pos = pos1;
-          }
-          if (result0 !== null) {
-            result0 = (function(offset, argIdx, efmt) {
-              var res = { 
-                type: "messageFormatElement",
-                argumentIndex: argIdx
-              };
-              if ( efmt && efmt.length ) {
-                res.elementFormat = efmt[1];
-              }
-              else {
-                res.output = true;
-              }
-              return res;
-            })(pos0, result0[0], result0[1]);
-          }
-          if (result0 === null) {
-            pos = pos0;
-          }
-          return result0;
-        }
-        
-        function parse_elementFormat() {
-          var result0, result1, result2, result3, result4, result5, result6;
-          var pos0, pos1;
-          
-          pos0 = pos;
-          pos1 = pos;
-          result0 = parse__();
-          if (result0 !== null) {
-            if (input.substr(pos, 6) === "plural") {
-              result1 = "plural";
-              pos += 6;
-            } else {
-              result1 = null;
-              if (reportFailures === 0) {
-                matchFailed("\"plural\"");
-              }
-            }
-            if (result1 !== null) {
-              result2 = parse__();
-              if (result2 !== null) {
-                if (input.charCodeAt(pos) === 44) {
-                  result3 = ",";
-                  pos++;
-                } else {
-                  result3 = null;
-                  if (reportFailures === 0) {
-                    matchFailed("\",\"");
-                  }
-                }
-                if (result3 !== null) {
-                  result4 = parse__();
-                  if (result4 !== null) {
-                    result5 = parse_pluralStyle();
-                    if (result5 !== null) {
-                      result6 = parse__();
-                      if (result6 !== null) {
-                        result0 = [result0, result1, result2, result3, result4, result5, result6];
-                      } else {
-                        result0 = null;
-                        pos = pos1;
-                      }
-                    } else {
-                      result0 = null;
-                      pos = pos1;
-                    }
-                  } else {
-                    result0 = null;
-                    pos = pos1;
-                  }
-                } else {
-                  result0 = null;
-                  pos = pos1;
-                }
-              } else {
-                result0 = null;
-                pos = pos1;
-              }
-            } else {
-              result0 = null;
-              pos = pos1;
-            }
-          } else {
-            result0 = null;
-            pos = pos1;
-          }
-          if (result0 !== null) {
-            result0 = (function(offset, t, s) {
-              return {
-                type : "elementFormat",
-                key  : t,
-                val  : s.val
-              };
-            })(pos0, result0[1], result0[5]);
-          }
-          if (result0 === null) {
-            pos = pos0;
-          }
-          if (result0 === null) {
-            pos0 = pos;
-            pos1 = pos;
-            result0 = parse__();
-            if (result0 !== null) {
-              if (input.substr(pos, 6) === "select") {
-                result1 = "select";
-                pos += 6;
-              } else {
-                result1 = null;
-                if (reportFailures === 0) {
-                  matchFailed("\"select\"");
-                }
-              }
-              if (result1 !== null) {
-                result2 = parse__();
-                if (result2 !== null) {
-                  if (input.charCodeAt(pos) === 44) {
-                    result3 = ",";
-                    pos++;
-                  } else {
-                    result3 = null;
-                    if (reportFailures === 0) {
-                      matchFailed("\",\"");
-                    }
-                  }
-                  if (result3 !== null) {
-                    result4 = parse__();
-                    if (result4 !== null) {
-                      result5 = parse_selectStyle();
-                      if (result5 !== null) {
-                        result6 = parse__();
-                        if (result6 !== null) {
-                          result0 = [result0, result1, result2, result3, result4, result5, result6];
-                        } else {
-                          result0 = null;
-                          pos = pos1;
-                        }
-                      } else {
-                        result0 = null;
-                        pos = pos1;
-                      }
-                    } else {
-                      result0 = null;
-                      pos = pos1;
-                    }
-                  } else {
-                    result0 = null;
-                    pos = pos1;
-                  }
-                } else {
-                  result0 = null;
-                  pos = pos1;
-                }
-              } else {
-                result0 = null;
-                pos = pos1;
-              }
-            } else {
-              result0 = null;
-              pos = pos1;
-            }
-            if (result0 !== null) {
-              result0 = (function(offset, t, s) {
-                return {
-                  type : "elementFormat",
-                  key  : t,
-                  val  : s.val
-                };
-              })(pos0, result0[1], result0[5]);
-            }
-            if (result0 === null) {
-              pos = pos0;
-            }
-          }
-          return result0;
-        }
-        
-        function parse_pluralStyle() {
-          var result0;
-          var pos0;
-          
-          pos0 = pos;
-          result0 = parse_pluralFormatPattern();
-          if (result0 !== null) {
-            result0 = (function(offset, pfp) {
-              return { type: "pluralStyle", val: pfp };
-            })(pos0, result0);
-          }
-          if (result0 === null) {
-            pos = pos0;
-          }
-          return result0;
-        }
-        
-        function parse_selectStyle() {
-          var result0;
-          var pos0;
-          
-          pos0 = pos;
-          result0 = parse_selectFormatPattern();
-          if (result0 !== null) {
-            result0 = (function(offset, sfp) {
-              return { type: "selectStyle", val: sfp };
-            })(pos0, result0);
-          }
-          if (result0 === null) {
-            pos = pos0;
-          }
-          return result0;
-        }
-        
-        function parse_pluralFormatPattern() {
-          var result0, result1, result2;
-          var pos0, pos1;
-          
-          pos0 = pos;
-          pos1 = pos;
-          result0 = parse_offsetPattern();
-          result0 = result0 !== null ? result0 : "";
-          if (result0 !== null) {
-            result1 = [];
-            result2 = parse_pluralForms();
-            while (result2 !== null) {
-              result1.push(result2);
-              result2 = parse_pluralForms();
-            }
-            if (result1 !== null) {
-              result0 = [result0, result1];
-            } else {
-              result0 = null;
-              pos = pos1;
-            }
-          } else {
-            result0 = null;
-            pos = pos1;
-          }
-          if (result0 !== null) {
-            result0 = (function(offset, op, pf) {
-              var res = {
-                type: "pluralFormatPattern",
-                pluralForms: pf
-              };
-              if ( op ) {
-                res.offset = op;
-              }
-              else {
-                res.offset = 0;
-              }
-              return res;
-            })(pos0, result0[0], result0[1]);
-          }
-          if (result0 === null) {
-            pos = pos0;
-          }
-          return result0;
-        }
-        
-        function parse_offsetPattern() {
-          var result0, result1, result2, result3, result4, result5, result6;
-          var pos0, pos1;
-          
-          pos0 = pos;
-          pos1 = pos;
-          result0 = parse__();
-          if (result0 !== null) {
-            if (input.substr(pos, 6) === "offset") {
-              result1 = "offset";
-              pos += 6;
-            } else {
-              result1 = null;
-              if (reportFailures === 0) {
-                matchFailed("\"offset\"");
-              }
-            }
-            if (result1 !== null) {
-              result2 = parse__();
-              if (result2 !== null) {
-                if (input.charCodeAt(pos) === 58) {
-                  result3 = ":";
-                  pos++;
-                } else {
-                  result3 = null;
-                  if (reportFailures === 0) {
-                    matchFailed("\":\"");
-                  }
-                }
-                if (result3 !== null) {
-                  result4 = parse__();
-                  if (result4 !== null) {
-                    result5 = parse_digits();
-                    if (result5 !== null) {
-                      result6 = parse__();
-                      if (result6 !== null) {
-                        result0 = [result0, result1, result2, result3, result4, result5, result6];
-                      } else {
-                        result0 = null;
-                        pos = pos1;
-                      }
-                    } else {
-                      result0 = null;
-                      pos = pos1;
-                    }
-                  } else {
-                    result0 = null;
-                    pos = pos1;
-                  }
-                } else {
-                  result0 = null;
-                  pos = pos1;
-                }
-              } else {
-                result0 = null;
-                pos = pos1;
-              }
-            } else {
-              result0 = null;
-              pos = pos1;
-            }
-          } else {
-            result0 = null;
-            pos = pos1;
-          }
-          if (result0 !== null) {
-            result0 = (function(offset, d) {
-              return d;
-            })(pos0, result0[5]);
-          }
-          if (result0 === null) {
-            pos = pos0;
-          }
-          return result0;
-        }
-        
-        function parse_selectFormatPattern() {
-          var result0, result1;
-          var pos0;
-          
-          pos0 = pos;
-          result0 = [];
-          result1 = parse_pluralForms();
-          while (result1 !== null) {
-            result0.push(result1);
-            result1 = parse_pluralForms();
-          }
-          if (result0 !== null) {
-            result0 = (function(offset, pf) {
-              return {
-                type: "selectFormatPattern",
-                pluralForms: pf
-              };
-            })(pos0, result0);
-          }
-          if (result0 === null) {
-            pos = pos0;
-          }
-          return result0;
-        }
-        
-        function parse_pluralForms() {
-          var result0, result1, result2, result3, result4, result5, result6, result7;
-          var pos0, pos1;
-          
-          pos0 = pos;
-          pos1 = pos;
-          result0 = parse__();
-          if (result0 !== null) {
-            result1 = parse_stringKey();
-            if (result1 !== null) {
-              result2 = parse__();
-              if (result2 !== null) {
-                if (input.charCodeAt(pos) === 123) {
-                  result3 = "{";
-                  pos++;
-                } else {
-                  result3 = null;
-                  if (reportFailures === 0) {
-                    matchFailed("\"{\"");
-                  }
-                }
-                if (result3 !== null) {
-                  result4 = parse__();
-                  if (result4 !== null) {
-                    result5 = parse_messageFormatPattern();
-                    if (result5 !== null) {
-                      result6 = parse__();
-                      if (result6 !== null) {
-                        if (input.charCodeAt(pos) === 125) {
-                          result7 = "}";
-                          pos++;
-                        } else {
-                          result7 = null;
-                          if (reportFailures === 0) {
-                            matchFailed("\"}\"");
-                          }
-                        }
-                        if (result7 !== null) {
-                          result0 = [result0, result1, result2, result3, result4, result5, result6, result7];
-                        } else {
-                          result0 = null;
-                          pos = pos1;
-                        }
-                      } else {
-                        result0 = null;
-                        pos = pos1;
-                      }
-                    } else {
-                      result0 = null;
-                      pos = pos1;
-                    }
-                  } else {
-                    result0 = null;
-                    pos = pos1;
-                  }
-                } else {
-                  result0 = null;
-                  pos = pos1;
-                }
-              } else {
-                result0 = null;
-                pos = pos1;
-              }
-            } else {
-              result0 = null;
-              pos = pos1;
-            }
-          } else {
-            result0 = null;
-            pos = pos1;
-          }
-          if (result0 !== null) {
-            result0 = (function(offset, k, mfp) {
-              return {
-                type: "pluralForms",
-                key: k,
-                val: mfp
-              };
-            })(pos0, result0[1], result0[5]);
-          }
-          if (result0 === null) {
-            pos = pos0;
-          }
-          return result0;
-        }
-        
-        function parse_stringKey() {
-          var result0, result1;
-          var pos0, pos1;
-          
-          pos0 = pos;
-          result0 = parse_id();
-          if (result0 !== null) {
-            result0 = (function(offset, i) {
-              return i;
-            })(pos0, result0);
-          }
-          if (result0 === null) {
-            pos = pos0;
-          }
-          if (result0 === null) {
-            pos0 = pos;
-            pos1 = pos;
-            if (input.charCodeAt(pos) === 61) {
-              result0 = "=";
-              pos++;
-            } else {
-              result0 = null;
-              if (reportFailures === 0) {
-                matchFailed("\"=\"");
-              }
-            }
-            if (result0 !== null) {
-              result1 = parse_digits();
-              if (result1 !== null) {
-                result0 = [result0, result1];
-              } else {
-                result0 = null;
-                pos = pos1;
-              }
-            } else {
-              result0 = null;
-              pos = pos1;
-            }
-            if (result0 !== null) {
-              result0 = (function(offset, d) {
-                return d;
-              })(pos0, result0[1]);
-            }
-            if (result0 === null) {
-              pos = pos0;
-            }
-          }
-          return result0;
-        }
-        
-        function parse_string() {
-          var result0, result1, result2, result3, result4;
-          var pos0, pos1, pos2;
-          
-          pos0 = pos;
-          pos1 = pos;
-          result0 = parse__();
-          if (result0 !== null) {
-            result1 = [];
-            pos2 = pos;
-            result2 = parse__();
-            if (result2 !== null) {
-              result3 = parse_chars();
-              if (result3 !== null) {
-                result4 = parse__();
-                if (result4 !== null) {
-                  result2 = [result2, result3, result4];
-                } else {
-                  result2 = null;
-                  pos = pos2;
-                }
-              } else {
-                result2 = null;
-                pos = pos2;
-              }
-            } else {
-              result2 = null;
-              pos = pos2;
-            }
-            while (result2 !== null) {
-              result1.push(result2);
-              pos2 = pos;
-              result2 = parse__();
-              if (result2 !== null) {
-                result3 = parse_chars();
-                if (result3 !== null) {
-                  result4 = parse__();
-                  if (result4 !== null) {
-                    result2 = [result2, result3, result4];
-                  } else {
-                    result2 = null;
-                    pos = pos2;
-                  }
-                } else {
-                  result2 = null;
-                  pos = pos2;
-                }
-              } else {
-                result2 = null;
-                pos = pos2;
-              }
-            }
-            if (result1 !== null) {
-              result0 = [result0, result1];
-            } else {
-              result0 = null;
-              pos = pos1;
-            }
-          } else {
-            result0 = null;
-            pos = pos1;
-          }
-          if (result0 !== null) {
-            result0 = (function(offset, ws, s) {
-              var tmp = [];
-              for( var i = 0; i < s.length; ++i ) {
-                for( var j = 0; j < s[ i ].length; ++j ) {
-                  tmp.push(s[i][j]);
-                }
-              }
-              return {
-                type: "string",
-                val: ws + tmp.join('')
-              };
-            })(pos0, result0[0], result0[1]);
-          }
-          if (result0 === null) {
-            pos = pos0;
-          }
-          return result0;
-        }
-        
-        function parse_id() {
-          var result0, result1, result2, result3;
-          var pos0, pos1;
-          
-          pos0 = pos;
-          pos1 = pos;
-          result0 = parse__();
-          if (result0 !== null) {
-            if (/^[a-zA-Z$_]/.test(input.charAt(pos))) {
-              result1 = input.charAt(pos);
-              pos++;
-            } else {
-              result1 = null;
-              if (reportFailures === 0) {
-                matchFailed("[a-zA-Z$_]");
-              }
-            }
-            if (result1 !== null) {
-              result2 = [];
-              if (/^[^ \t\n\r,.+={}]/.test(input.charAt(pos))) {
-                result3 = input.charAt(pos);
-                pos++;
-              } else {
-                result3 = null;
-                if (reportFailures === 0) {
-                  matchFailed("[^ \\t\\n\\r,.+={}]");
-                }
-              }
-              while (result3 !== null) {
-                result2.push(result3);
-                if (/^[^ \t\n\r,.+={}]/.test(input.charAt(pos))) {
-                  result3 = input.charAt(pos);
-                  pos++;
-                } else {
-                  result3 = null;
-                  if (reportFailures === 0) {
-                    matchFailed("[^ \\t\\n\\r,.+={}]");
-                  }
-                }
-              }
-              if (result2 !== null) {
-                result3 = parse__();
-                if (result3 !== null) {
-                  result0 = [result0, result1, result2, result3];
-                } else {
-                  result0 = null;
-                  pos = pos1;
-                }
-              } else {
-                result0 = null;
-                pos = pos1;
-              }
-            } else {
-              result0 = null;
-              pos = pos1;
-            }
-          } else {
-            result0 = null;
-            pos = pos1;
-          }
-          if (result0 !== null) {
-            result0 = (function(offset, s1, s2) {
-              return s1 + (s2 ? s2.join('') : '');
-            })(pos0, result0[1], result0[2]);
-          }
-          if (result0 === null) {
-            pos = pos0;
-          }
-          return result0;
-        }
-        
-        function parse_chars() {
-          var result0, result1;
-          var pos0;
-          
-          pos0 = pos;
-          result1 = parse_char();
-          if (result1 !== null) {
-            result0 = [];
-            while (result1 !== null) {
-              result0.push(result1);
-              result1 = parse_char();
-            }
-          } else {
-            result0 = null;
-          }
-          if (result0 !== null) {
-            result0 = (function(offset, chars) { return chars.join(''); })(pos0, result0);
-          }
-          if (result0 === null) {
-            pos = pos0;
-          }
-          return result0;
-        }
-        
-        function parse_char() {
-          var result0, result1, result2, result3, result4;
-          var pos0, pos1;
-          
-          pos0 = pos;
-          if (/^[^{}\\\0-\x1F \t\n\r]/.test(input.charAt(pos))) {
-            result0 = input.charAt(pos);
-            pos++;
-          } else {
-            result0 = null;
-            if (reportFailures === 0) {
-              matchFailed("[^{}\\\\\\0-\\x1F \\t\\n\\r]");
-            }
-          }
-          if (result0 !== null) {
-            result0 = (function(offset, x) {
-              return x;
-            })(pos0, result0);
-          }
-          if (result0 === null) {
-            pos = pos0;
-          }
-          if (result0 === null) {
-            pos0 = pos;
-            if (input.substr(pos, 2) === "\\#") {
-              result0 = "\\#";
-              pos += 2;
-            } else {
-              result0 = null;
-              if (reportFailures === 0) {
-                matchFailed("\"\\\\#\"");
-              }
-            }
-            if (result0 !== null) {
-              result0 = (function(offset) {
-                return "\\#";
-              })(pos0);
-            }
-            if (result0 === null) {
-              pos = pos0;
-            }
-            if (result0 === null) {
-              pos0 = pos;
-              if (input.substr(pos, 2) === "\\{") {
-                result0 = "\\{";
-                pos += 2;
-              } else {
-                result0 = null;
-                if (reportFailures === 0) {
-                  matchFailed("\"\\\\{\"");
-                }
-              }
-              if (result0 !== null) {
-                result0 = (function(offset) {
-                  return "\u007B";
-                })(pos0);
-              }
-              if (result0 === null) {
-                pos = pos0;
-              }
-              if (result0 === null) {
-                pos0 = pos;
-                if (input.substr(pos, 2) === "\\}") {
-                  result0 = "\\}";
-                  pos += 2;
-                } else {
-                  result0 = null;
-                  if (reportFailures === 0) {
-                    matchFailed("\"\\\\}\"");
-                  }
-                }
-                if (result0 !== null) {
-                  result0 = (function(offset) {
-                    return "\u007D";
-                  })(pos0);
-                }
-                if (result0 === null) {
-                  pos = pos0;
-                }
-                if (result0 === null) {
-                  pos0 = pos;
-                  pos1 = pos;
-                  if (input.substr(pos, 2) === "\\u") {
-                    result0 = "\\u";
-                    pos += 2;
-                  } else {
-                    result0 = null;
-                    if (reportFailures === 0) {
-                      matchFailed("\"\\\\u\"");
-                    }
-                  }
-                  if (result0 !== null) {
-                    result1 = parse_hexDigit();
-                    if (result1 !== null) {
-                      result2 = parse_hexDigit();
-                      if (result2 !== null) {
-                        result3 = parse_hexDigit();
-                        if (result3 !== null) {
-                          result4 = parse_hexDigit();
-                          if (result4 !== null) {
-                            result0 = [result0, result1, result2, result3, result4];
-                          } else {
-                            result0 = null;
-                            pos = pos1;
-                          }
-                        } else {
-                          result0 = null;
-                          pos = pos1;
-                        }
-                      } else {
-                        result0 = null;
-                        pos = pos1;
-                      }
-                    } else {
-                      result0 = null;
-                      pos = pos1;
-                    }
-                  } else {
-                    result0 = null;
-                    pos = pos1;
-                  }
-                  if (result0 !== null) {
-                    result0 = (function(offset, h1, h2, h3, h4) {
-                        return String.fromCharCode(parseInt("0x" + h1 + h2 + h3 + h4));
-                    })(pos0, result0[1], result0[2], result0[3], result0[4]);
-                  }
-                  if (result0 === null) {
-                    pos = pos0;
-                  }
-                }
-              }
-            }
-          }
-          return result0;
-        }
-        
-        function parse_digits() {
-          var result0, result1;
-          var pos0;
-          
-          pos0 = pos;
-          if (/^[0-9]/.test(input.charAt(pos))) {
-            result1 = input.charAt(pos);
-            pos++;
-          } else {
-            result1 = null;
-            if (reportFailures === 0) {
-              matchFailed("[0-9]");
-            }
-          }
-          if (result1 !== null) {
-            result0 = [];
-            while (result1 !== null) {
-              result0.push(result1);
-              if (/^[0-9]/.test(input.charAt(pos))) {
-                result1 = input.charAt(pos);
-                pos++;
-              } else {
-                result1 = null;
-                if (reportFailures === 0) {
-                  matchFailed("[0-9]");
-                }
-              }
-            }
-          } else {
-            result0 = null;
-          }
-          if (result0 !== null) {
-            result0 = (function(offset, ds) {
-              return parseInt((ds.join('')), 10);
-            })(pos0, result0);
-          }
-          if (result0 === null) {
-            pos = pos0;
-          }
-          return result0;
-        }
-        
-        function parse_hexDigit() {
-          var result0;
-          
-          if (/^[0-9a-fA-F]/.test(input.charAt(pos))) {
-            result0 = input.charAt(pos);
-            pos++;
-          } else {
-            result0 = null;
-            if (reportFailures === 0) {
-              matchFailed("[0-9a-fA-F]");
-            }
-          }
-          return result0;
-        }
-        
-        function parse__() {
-          var result0, result1;
-          var pos0;
-          
-          reportFailures++;
-          pos0 = pos;
-          result0 = [];
-          result1 = parse_whitespace();
-          while (result1 !== null) {
-            result0.push(result1);
-            result1 = parse_whitespace();
-          }
-          if (result0 !== null) {
-            result0 = (function(offset, w) { return w.join(''); })(pos0, result0);
-          }
-          if (result0 === null) {
-            pos = pos0;
-          }
-          reportFailures--;
-          if (reportFailures === 0 && result0 === null) {
-            matchFailed("whitespace");
-          }
-          return result0;
-        }
-        
-        function parse_whitespace() {
-          var result0;
-          
-          if (/^[ \t\n\r]/.test(input.charAt(pos))) {
-            result0 = input.charAt(pos);
-            pos++;
-          } else {
-            result0 = null;
-            if (reportFailures === 0) {
-              matchFailed("[ \\t\\n\\r]");
-            }
-          }
-          return result0;
-        }
-        
-        
-        function cleanupExpected(expected) {
-          expected.sort();
-          
-          var lastExpected = null;
-          var cleanExpected = [];
-          for (var i = 0; i < expected.length; i++) {
-            if (expected[i] !== lastExpected) {
-              cleanExpected.push(expected[i]);
-              lastExpected = expected[i];
-            }
-          }
-          return cleanExpected;
-        }
-        
-        function computeErrorPosition() {
-          /*
-           * The first idea was to use |String.split| to break the input up to the
-           * error position along newlines and derive the line and column from
-           * there. However IE's |split| implementation is so broken that it was
-           * enough to prevent it.
-           */
-          
-          var line = 1;
-          var column = 1;
-          var seenCR = false;
-          
-          for (var i = 0; i < Math.max(pos, rightmostFailuresPos); i++) {
-            var ch = input.charAt(i);
-            if (ch === "\n") {
-              if (!seenCR) { line++; }
-              column = 1;
-              seenCR = false;
-            } else if (ch === "\r" || ch === "\u2028" || ch === "\u2029") {
-              line++;
-              column = 1;
-              seenCR = true;
-            } else {
-              column++;
-              seenCR = false;
-            }
-          }
-          
-          return { line: line, column: column };
-        }
-        
-        
-        var result = parseFunctions[startRule]();
-        
-        /*
-         * The parser is now in one of the following three states:
-         *
-         * 1. The parser successfully parsed the whole input.
-         *
-         *    - |result !== null|
-         *    - |pos === input.length|
-         *    - |rightmostFailuresExpected| may or may not contain something
-         *
-         * 2. The parser successfully parsed only a part of the input.
-         *
-         *    - |result !== null|
-         *    - |pos < input.length|
-         *    - |rightmostFailuresExpected| may or may not contain something
-         *
-         * 3. The parser did not successfully parse any part of the input.
-         *
-         *   - |result === null|
-         *   - |pos === 0|
-         *   - |rightmostFailuresExpected| contains at least one failure
-         *
-         * All code following this comment (including called functions) must
-         * handle these states.
-         */
-        if (result === null || pos !== input.length) {
-          var offset = Math.max(pos, rightmostFailuresPos);
-          var found = offset < input.length ? input.charAt(offset) : null;
-          var errorPosition = computeErrorPosition();
-          
-          throw new this.SyntaxError(
-            cleanupExpected(rightmostFailuresExpected),
-            found,
-            offset,
-            errorPosition.line,
-            errorPosition.column
-          );
-        }
-        
-        return result;
-      },
-      
-      /* Returns the parser source code. */
-      toSource: function() { return this._source; }
-    };
-    
-    /* Thrown when a parser encounters a syntax error. */
-    
-    result.SyntaxError = function(expected, found, offset, line, column) {
-      function buildMessage(expected, found) {
-        var expectedHumanized, foundHumanized;
-        
-        switch (expected.length) {
-          case 0:
-            expectedHumanized = "end of input";
-            break;
-          case 1:
-            expectedHumanized = expected[0];
-            break;
-          default:
-            expectedHumanized = expected.slice(0, expected.length - 1).join(", ")
-              + " or "
-              + expected[expected.length - 1];
-        }
-        
-        foundHumanized = found ? quote(found) : "end of input";
-        
-        return "Expected " + expectedHumanized + " but " + foundHumanized + " found.";
-      }
-      
-      this.name = "SyntaxError";
-      this.expected = expected;
-      this.found = found;
-      this.message = buildMessage(expected, found);
-      this.offset = offset;
-      this.line = line;
-      this.column = column;
-    };
-    
-    result.SyntaxError.prototype = Error.prototype;
-    
-    return result;
-  })();
-
-  MessageFormat.prototype.parse = function () {
-    // Bind to itself so error handling works
-    return mparser.parse.apply( mparser, arguments );
-  };
-
-  MessageFormat.prototype.precompile = function ( ast ) {
-    var self = this,
-        needOther = false,
-        fp = {
-      begin: 'function(d){\nvar r = "";\n',
-      end  : "return r;\n}"
-    };
-
-    function interpMFP ( ast, data ) {
-      // Set some default data
-      data = data || {};
-      var s = '', i, tmp, lastkeyname;
-
-      switch ( ast.type ) {
-        case 'program':
-          return interpMFP( ast.program );
-        case 'messageFormatPattern':
-          for ( i = 0; i < ast.statements.length; ++i ) {
-            s += interpMFP( ast.statements[i], data );
-          }
-          return fp.begin + s + fp.end;
-        case 'messageFormatPatternRight':
-          for ( i = 0; i < ast.statements.length; ++i ) {
-            s += interpMFP( ast.statements[i], data );
-          }
-          return s;
-        case 'messageFormatElement':
-          data.pf_count = data.pf_count || 0;
-          s += 'if(!d){\nthrow new Error("MessageFormat: No data passed to function.");\n}\n';
-          if ( ast.output ) {
-            s += 'r += d["' + ast.argumentIndex + '"];\n';
-          }
-          else {
-            lastkeyname = 'lastkey_'+(data.pf_count+1);
-            s += 'var '+lastkeyname+' = "'+ast.argumentIndex+'";\n';
-            s += 'var k_'+(data.pf_count+1)+'=d['+lastkeyname+'];\n';
-            s += interpMFP( ast.elementFormat, data );
-          }
-          return s;
-        case 'elementFormat':
-          if ( ast.key === 'select' ) {
-            s += interpMFP( ast.val, data );
-            s += 'r += (pf_' +
-                 data.pf_count +
-                 '[ k_' + (data.pf_count+1) + ' ] || pf_'+data.pf_count+'[ "other" ])( d );\n';
-          }
-          else if ( ast.key === 'plural' ) {
-            s += interpMFP( ast.val, data );
-            s += 'if ( pf_'+(data.pf_count)+'[ k_'+(data.pf_count+1)+' + "" ] ) {\n';
-            s += 'r += pf_'+data.pf_count+'[ k_'+(data.pf_count+1)+' + "" ]( d ); \n';
-            s += '}\nelse {\n';
-            s += 'r += (pf_' +
-                 data.pf_count +
-                 '[ MessageFormat.locale["' +
-                 self.fallbackLocale +
-                 '"]( k_'+(data.pf_count+1)+' - off_'+(data.pf_count)+' ) ] || pf_'+data.pf_count+'[ "other" ] )( d );\n';
-            s += '}\n';
-          }
-          return s;
-        /* // Unreachable cases.
-        case 'pluralStyle':
-        case 'selectStyle':*/
-        case 'pluralFormatPattern':
-          data.pf_count = data.pf_count || 0;
-          s += 'var off_'+data.pf_count+' = '+ast.offset+';\n';
-          s += 'var pf_' + data.pf_count + ' = { \n';
-          needOther = true;
-          // We're going to simultaneously check to make sure we hit the required 'other' option.
-
-          for ( i = 0; i < ast.pluralForms.length; ++i ) {
-            if ( ast.pluralForms[ i ].key === 'other' ) {
-              needOther = false;
-            }
-            if ( tmp ) {
-              s += ',\n';
-            }
-            else{
-              tmp = 1;
-            }
-            s += '"' + ast.pluralForms[ i ].key + '" : ' + interpMFP( ast.pluralForms[ i ].val,
-          (function(){ var res = JSON.parse(JSON.stringify(data)); res.pf_count++; return res; })() );
-          }
-          s += '\n};\n';
-          if ( needOther ) {
-            throw new Error("No 'other' form found in pluralFormatPattern " + data.pf_count);
-          }
-          return s;
-        case 'selectFormatPattern':
-
-          data.pf_count = data.pf_count || 0;
-          s += 'var off_'+data.pf_count+' = 0;\n';
-          s += 'var pf_' + data.pf_count + ' = { \n';
-          needOther = true;
-
-          for ( i = 0; i < ast.pluralForms.length; ++i ) {
-            if ( ast.pluralForms[ i ].key === 'other' ) {
-              needOther = false;
-            }
-            if ( tmp ) {
-              s += ',\n';
-            }
-            else{
-              tmp = 1;
-            }
-            s += '"' + ast.pluralForms[ i ].key + '" : ' + interpMFP( ast.pluralForms[ i ].val,
-              (function(){
-                var res = JSON.parse( JSON.stringify( data ) );
-                res.pf_count++;
-                return res;
-              })()
-            );
-          }
-          s += '\n};\n';
-          if ( needOther ) {
-            throw new Error("No 'other' form found in selectFormatPattern " + data.pf_count);
-          }
-          return s;
-        /* // Unreachable
-        case 'pluralForms':
-        */
-        case 'string':
-          return 'r += "' + MessageFormat.Utils.numSub(
-            MessageFormat.Utils.escapeExpression( ast.val ),
-            'k_' + data.pf_count + ' - off_' + ( data.pf_count - 1 ),
-            data.pf_count
-          ) + '";\n';
-        default:
-          throw new Error( 'Bad AST type: ' + ast.type );
-      }
-    }
-    return interpMFP( ast );
-  };
-
-  MessageFormat.prototype.compile = function ( message ) {
-    return (new Function( 'MessageFormat',
-      'return ' +
-        this.precompile(
-          this.parse( message )
-        )
-    ))(MessageFormat);
-  };
-
-
-  if (typeof exports !== 'undefined') {
-    if (typeof module !== 'undefined' && module.exports) {
-      exports = module.exports = MessageFormat;
-    }
-    exports.MessageFormat = MessageFormat;
-  }
-  else if (typeof define === 'function' && define.amd) {
-    define(function() {
-      return MessageFormat;
-    });
-  }
-  else {
-    root['MessageFormat'] = MessageFormat;
-  }
-
-})( this );
diff --git a/lib/job_time_spacer.rb b/lib/job_time_spacer.rb
new file mode 100644
index 00000000000..18a7913ddd4
--- /dev/null
+++ b/lib/job_time_spacer.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+##
+# In some cases we may want to enqueue_at several of the same job with
+# batches, spacing them out or incrementing by some amount of seconds,
+# in case the jobs do heavy work or send many MessageBus messages and the like.
+# This class handles figuring out the seconds increments.
+#
+# @example
+#   spacer = JobTimeSpacer.new
+#   user_ids.in_groups_of(200, false) do |user_id_batch|
+#     spacer.enqueue(:kick_users_from_topic, { topic_id: topic_id, user_ids: user_id_batch })
+#   end
+class JobTimeSpacer
+  def initialize(seconds_space_increment: 1, seconds_delay: 5)
+    @seconds_space_increment = seconds_space_increment
+    @seconds_space_modifier = seconds_space_increment
+    @seconds_step = seconds_delay
+  end
+
+  def enqueue(job_name, job_args = {})
+    Jobs.enqueue_at((@seconds_step * @seconds_space_modifier).seconds.from_now, job_name, job_args)
+    @seconds_space_modifier += @seconds_space_increment
+  end
+end
diff --git a/lib/js_locale_helper.rb b/lib/js_locale_helper.rb
index 2b8db855754..6ded40afd38 100644
--- a/lib/js_locale_helper.rb
+++ b/lib/js_locale_helper.rb
@@ -329,7 +329,9 @@ module JsLocaleHelper
         @ctx ||=
           begin
             ctx = MiniRacer::Context.new(timeout: 15_000, ensure_gc_after_idle: 2000)
-            ctx.load("#{Rails.root}/lib/javascripts/messageformat.js")
+            ctx.load(
+              "#{Rails.root}/app/assets/javascripts/node_modules/messageformat/messageformat.js",
+            )
             ctx
           end
       )
diff --git a/lib/middleware/anonymous_cache.rb b/lib/middleware/anonymous_cache.rb
index 70f776ec8a8..d41069c92e0 100644
--- a/lib/middleware/anonymous_cache.rb
+++ b/lib/middleware/anonymous_cache.rb
@@ -25,8 +25,8 @@ module Middleware
     def self.compile_key_builder
       method = +"def self.__compiled_key_builder(h)\n  \""
       cache_key_segments.each do |k, v|
-        raise "Invalid key name" unless k =~ /^[a-z]+$/
-        raise "Invalid method name" unless v =~ /^key_[a-z_\?]+$/
+        raise "Invalid key name" unless k =~ /\A[a-z]+\z/
+        raise "Invalid method name" unless v =~ /\Akey_[a-z_\?]+\z/
         method << "|#{k}=#\{h.#{v}}"
       end
       method << "\"\nend"
diff --git a/lib/middleware/discourse_public_exceptions.rb b/lib/middleware/discourse_public_exceptions.rb
index b507bc867a3..54e070c433a 100644
--- a/lib/middleware/discourse_public_exceptions.rb
+++ b/lib/middleware/discourse_public_exceptions.rb
@@ -10,6 +10,7 @@ module Middleware
           Rack::QueryParser::InvalidParameterError,
           ActionController::BadRequest,
           ActionDispatch::Http::Parameters::ParseError,
+          ActionController::RoutingError,
         ],
       )
 
@@ -48,12 +49,16 @@ module Middleware
           # Or badly formatted multipart requests
           begin
             request.POST
-          rescue EOFError
-            return [
-              400,
-              { "Cache-Control" => "private, max-age=0, must-revalidate" },
-              ["Invalid request"]
-            ]
+          rescue ActionController::BadRequest => error
+            if error.cause.is_a?(EOFError)
+              return [
+                400,
+                { "Cache-Control" => "private, max-age=0, must-revalidate" },
+                ["Invalid request"]
+              ]
+            else
+              raise
+            end
           end
 
           if ApplicationController.rescue_with_handler(exception, object: fake_controller)
diff --git a/lib/middleware/missing_avatars.rb b/lib/middleware/missing_avatars.rb
index 958aecaa3ee..b0f6d18a14d 100644
--- a/lib/middleware/missing_avatars.rb
+++ b/lib/middleware/missing_avatars.rb
@@ -11,7 +11,7 @@ module Middleware
     end
 
     def call(env)
-      if (env["REQUEST_PATH"] =~ %r{^/uploads/default/avatars})
+      if (env["REQUEST_PATH"] =~ %r{\A/uploads/default/avatars})
         path = "#{Rails.root}/public#{env["REQUEST_PATH"]}"
         unless File.exist?(path)
           default_image = "#{Rails.root}/public/images/d-logo-sketch-small.png"
diff --git a/lib/migration/helpers.rb b/lib/migration/helpers.rb
new file mode 100644
index 00000000000..3cf60dc05fc
--- /dev/null
+++ b/lib/migration/helpers.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Migration
+  module Helpers
+    def self.site_created_at
+      result = DB.query_single <<~SQL
+        SELECT created_at
+        FROM schema_migration_details
+        ORDER BY created_at
+        LIMIT 1
+      SQL
+      result.first
+    end
+
+    def self.existing_site?
+      site_created_at < 1.hour.ago
+    end
+
+    def self.new_site?
+      !old_site?
+    end
+  end
+end
diff --git a/lib/migration/safe_migrate.rb b/lib/migration/safe_migrate.rb
index ce3013300e0..b43bc38b029 100644
--- a/lib/migration/safe_migrate.rb
+++ b/lib/migration/safe_migrate.rb
@@ -116,7 +116,7 @@ class Migration::SafeMigrate
   end
 
   def self.protect!(sql)
-    if sql =~ /^\s*(?:drop\s+table|alter\s+table.*rename\s+to)\s+/i
+    if sql =~ /\A\s*(?:drop\s+table|alter\s+table.*rename\s+to)\s+/i
       $stdout.puts("", <<~TEXT)
         WARNING
         -------------------------------------------------------------------------------------
@@ -129,7 +129,7 @@ class Migration::SafeMigrate
         in use by live applications.
       TEXT
       raise Discourse::InvalidMigration, "Attempt was made to drop a table"
-    elsif sql =~ /^\s*alter\s+table.*(?:rename|drop)\s+/i
+    elsif sql =~ /\A\s*alter\s+table.*(?:rename|drop(?!\s+not\s+null))\s+/i
       $stdout.puts("", <<~TEXT)
         WARNING
         -------------------------------------------------------------------------------------
diff --git a/lib/migration/table_dropper.rb b/lib/migration/table_dropper.rb
index f2f9849cb9b..0a122a877f0 100644
--- a/lib/migration/table_dropper.rb
+++ b/lib/migration/table_dropper.rb
@@ -3,7 +3,7 @@
 require "migration/base_dropper"
 
 module Migration
-  class Migration::TableDropper
+  class TableDropper
     def self.read_only_table(table_name)
       BaseDropper.create_readonly_function(table_name)
 
diff --git a/lib/mobile_detection.rb b/lib/mobile_detection.rb
index 93bd12bae4a..aa4a8056eb1 100644
--- a/lib/mobile_detection.rb
+++ b/lib/mobile_detection.rb
@@ -26,8 +26,8 @@ module MobileDetection
 
   MODERN_MOBILE_REGEX =
     %r{
-    \(.*iPhone\ OS\ 1[3-9].*\)|
-    \(.*iPad.*OS\ 1[3-9].*\)|
+    \(.*iPhone\ OS\ 1[5-9].*\)|
+    \(.*iPad.*OS\ 1[5-9].*\)|
     Chrome\/8[89]|
     Chrome\/9[0-9]|
     Chrome\/1[0-9][0-9]|
diff --git a/lib/new_post_manager.rb b/lib/new_post_manager.rb
index 3903c5dd53d..80338633480 100644
--- a/lib/new_post_manager.rb
+++ b/lib/new_post_manager.rb
@@ -259,10 +259,11 @@ class NewPostManager
 
     reviewable =
       ReviewableQueuedPost.new(
-        created_by: @user,
+        created_by: Discourse.system_user,
         payload: payload,
         topic_id: @args[:topic_id],
         reviewable_by_moderator: true,
+        target_created_by: @user,
       )
     reviewable.payload["title"] = @args[:title] if @args[:title].present?
     reviewable.category_id = args[:category] if args[:category].present?
@@ -299,7 +300,7 @@ class NewPostManager
     result.reviewable = reviewable
     result.reason = reason if reason
     result.check_errors(errors)
-    result.pending_count = ReviewableQueuedPost.where(created_by: @user).pending.count
+    result.pending_count = ReviewableQueuedPost.where(target_created_by: @user).pending.count
     result
   end
 
diff --git a/lib/onebox/engine.rb b/lib/onebox/engine.rb
index 838986e685b..d4958068bea 100644
--- a/lib/onebox/engine.rb
+++ b/lib/onebox/engine.rb
@@ -7,7 +7,7 @@ module Onebox
     end
 
     def self.engines
-      constants.select { |constant| constant.to_s =~ /Onebox$/ }.sort.map(&method(:const_get))
+      constants.select { |constant| constant.to_s =~ /Onebox\z/ }.sort.map(&method(:const_get))
     end
 
     def self.all_iframe_origins
@@ -165,6 +165,7 @@ require_relative "engine/google_play_app_onebox"
 require_relative "engine/image_onebox"
 require_relative "engine/video_onebox"
 require_relative "engine/audio_onebox"
+require_relative "engine/threads_status_onebox"
 require_relative "engine/stack_exchange_onebox"
 require_relative "engine/twitter_status_onebox"
 require_relative "engine/wikimedia_onebox"
@@ -210,3 +211,4 @@ require_relative "engine/google_drive_onebox"
 require_relative "engine/facebook_media_onebox"
 require_relative "engine/hackernews_onebox"
 require_relative "engine/motoko_onebox"
+require_relative "engine/tiktok_onebox"
diff --git a/lib/onebox/engine/allowlisted_generic_onebox.rb b/lib/onebox/engine/allowlisted_generic_onebox.rb
index 3c8a2359eba..3618c6028cc 100644
--- a/lib/onebox/engine/allowlisted_generic_onebox.rb
+++ b/lib/onebox/engine/allowlisted_generic_onebox.rb
@@ -145,12 +145,12 @@ module Onebox
                  !!AllowlistedGenericOnebox.allowed_twitter_labels.find { |l|
                    d[:label2] =~ /#{l}/i
                  }
-              unless Onebox::Helpers.blank?(d[:label_1])
-                d[:label_2] = Onebox::Helpers.truncate(d[:label2])
-                d[:data_2] = Onebox::Helpers.truncate(d[:data2])
-              else
+              if Onebox::Helpers.blank?(d[:label_1])
                 d[:label_1] = Onebox::Helpers.truncate(d[:label2])
                 d[:data_1] = Onebox::Helpers.truncate(d[:data2])
+              else
+                d[:label_2] = Onebox::Helpers.truncate(d[:label2])
+                d[:data_2] = Onebox::Helpers.truncate(d[:data2])
               end
             end
 
diff --git a/lib/onebox/engine/discourse_topic_onebox.rb b/lib/onebox/engine/discourse_topic_onebox.rb
new file mode 100644
index 00000000000..0247299d13e
--- /dev/null
+++ b/lib/onebox/engine/discourse_topic_onebox.rb
@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module Onebox
+  module Engine
+    class DiscourseTopicOnebox
+      include Engine
+      include StandardEmbed
+      include LayoutSupport
+
+      matches_regexp(%r{/t/.*(/\d+)?})
+
+      def data
+        @data ||= {
+          categories: categories,
+          link: link,
+          article_published_time: published_time.strftime("%-d %b %y"),
+          article_published_time_title: published_time.strftime("%I:%M%p - %d %B %Y"),
+          domain: html_entities.decode(raw[:site_name].truncate(80, separator: " ")),
+          description: html_entities.decode(raw[:description].truncate(250, separator: " ")),
+          title: html_entities.decode(raw[:title].truncate(80, separator: " ")),
+          image: image,
+          render_tags?: render_tags?,
+          render_category_block?: render_category_block?,
+        }.reverse_merge(raw)
+      end
+      alias verified_data data
+
+      private
+
+      def categories
+        Array
+          .wrap(raw[:article_sections])
+          .map
+          .with_index { |name, index| { name: name, color: raw[:article_section_colors][index] } }
+      end
+
+      def published_time
+        @published_time ||= Time.parse(raw[:published_time])
+      end
+
+      def html_entities
+        @html_entities ||= HTMLEntities.new
+      end
+
+      def image
+        image = Onebox::Helpers.get_absolute_image_url(raw[:image], @url)
+        Onebox::Helpers.normalize_url_for_output(html_entities.decode(image))
+      end
+
+      def render_tags?
+        raw[:article_tags].present?
+      end
+
+      def render_category_block?
+        render_tags? || categories.present?
+      end
+    end
+  end
+end
diff --git a/lib/onebox/engine/google_maps_onebox.rb b/lib/onebox/engine/google_maps_onebox.rb
index 828c7fd5dcb..cd3072a93ae 100644
--- a/lib/onebox/engine/google_maps_onebox.rb
+++ b/lib/onebox/engine/google_maps_onebox.rb
@@ -96,7 +96,7 @@ module Onebox
           # Fallback for map URLs that don't resolve into an easily embeddable old-style URI
           # Roadmaps use a "z" zoomlevel, satellite maps use "m" the horizontal width in meters
           # TODO: tilted satellite maps using "a,y,t"
-          match = @url.match(/@(?<lon>[\d.-]+),(?<lat>[\d.-]+),(?<zoom>\d+)(?<mz>[mz])/)
+          match = @url.match(/@(?<lon>[\d.-]+),(?<lat>[\d.-]+),(?<zoom>\d+)(\.\d+)?(?<mz>[mz])/)
           raise "unexpected standard url #{@url}" unless match
           zoom = match[:mz] == "z" ? match[:zoom] : Math.log2(57280048.0 / match[:zoom].to_f).round
           location = "#{match[:lon]},#{match[:lat]}"
diff --git a/lib/onebox/engine/motoko_onebox.rb b/lib/onebox/engine/motoko_onebox.rb
index 1656150fbfd..9a0243bf83f 100644
--- a/lib/onebox/engine/motoko_onebox.rb
+++ b/lib/onebox/engine/motoko_onebox.rb
@@ -6,8 +6,8 @@ module Onebox
       include Engine
       include StandardEmbed
 
-      matches_regexp(%r{^https?://embed\.smartcontracts\.org/?.*})
-      requires_iframe_origins "https://embed.smartcontracts.org"
+      matches_regexp(%r{^https?://embed\.(motoko|smartcontracts)\.org/?.*})
+      requires_iframe_origins("https://embed.motoko.org", "https://embed.smartcontracts.org")
       always_https
 
       def to_html
@@ -21,7 +21,7 @@ module Onebox
       protected
 
       def get_oembed_url
-        "https://embed.smartcontracts.org/api/onebox?url=#{url}"
+        "https://embed.smartcontracts.org/services/onebox?url=#{url}"
       end
     end
   end
diff --git a/lib/onebox/engine/threads_status_onebox.rb b/lib/onebox/engine/threads_status_onebox.rb
new file mode 100644
index 00000000000..1b835ce83f2
--- /dev/null
+++ b/lib/onebox/engine/threads_status_onebox.rb
@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+module Onebox
+  module Engine
+    class ThreadsStatusOnebox
+      include Engine
+      include LayoutSupport
+      include HTML
+
+      matches_regexp(%r{^https?://www\.threads\.net/t/(?<id>[\d\w_-]+)/?.*?$})
+      always_https
+
+      def self.priority
+        1
+      end
+
+      private
+
+      def link
+        raw.css("link[rel='canonical']").first["href"]
+      end
+
+      def likes
+        @og[:description].split(" ").first
+      end
+
+      def replies
+        @og[:description].split(", ").drop(1).join(", ").split(" repl").first
+      end
+
+      def description
+        text = @og[:description].split(". ").drop(1).join(". ")
+        linkify_mentions(text)
+      end
+
+      def title
+        @og[:title].split(" (@").first
+      end
+
+      def screen_name
+        @og[:title].split(" (@").drop(1).join(" (@").split(") on Threads")[0]
+      end
+
+      def avatar
+        poster_response =
+          begin
+            Onebox::Helpers.fetch_response("https://www.threads.net/@#{screen_name}")
+          rescue StandardError
+            return nil
+          end
+        poster_html = Nokogiri.HTML(poster_response)
+        poster_data = ::Onebox::OpenGraph.new(poster_html).data
+        poster_data[:image]
+      end
+
+      def image
+        @og[:image]
+      end
+
+      def favicon
+        raw.css("link[rel='icon']").first["href"]
+      end
+
+      def linkify_mentions(text)
+        text.gsub(/@([\w\d]+)/, "<a href='https://www.threads.net/@\\1'>@\\1</a>")
+      end
+
+      def data
+        @og = ::Onebox::OpenGraph.new(raw).data
+
+        @data ||= {
+          favicon: favicon,
+          link: link,
+          description: description,
+          image: image,
+          title: title,
+          screen_name: screen_name,
+          avatar: avatar,
+          likes: likes,
+          replies: replies,
+        }
+
+        # if the image is the same as the avatar, don't show it
+        # means it's a thread with no image
+        @data[:image] = nil if @data[:image].split("?").first == @data[:avatar].split("?").first
+
+        @data
+      end
+    end
+  end
+end
diff --git a/lib/onebox/engine/tiktok_onebox.rb b/lib/onebox/engine/tiktok_onebox.rb
new file mode 100644
index 00000000000..d015479c924
--- /dev/null
+++ b/lib/onebox/engine/tiktok_onebox.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Onebox
+  module Engine
+    class TiktokOnebox
+      include Engine
+      include StandardEmbed
+
+      matches_regexp(%r{^https?://((?:m|www)\.)?tiktok\.com(?:/@(.+)\/video/|/v/)\d+(/\w+)?/?})
+      requires_iframe_origins "https://www.tiktok.com"
+      always_https
+
+      def placeholder_html
+        <<-HTML
+          <img
+            src="#{oembed_data.thumbnail_url}"
+            title="#{oembed_data.title}"
+            style="
+              max-width: #{oembed_data.thumbnail_width / 2}px;
+              max-height: #{oembed_data.thumbnail_height / 2}px;"
+          >
+        HTML
+      end
+
+      def to_html
+        video_height = oembed_data.thumbnail_height < 1024 ? 998 : oembed_data.thumbnail_height
+        height = (323.0 / 576) * video_height
+
+        <<-HTML
+          <iframe
+            class="tiktok-onebox"
+            src="https://www.tiktok.com/embed/v2/#{oembed_data.embed_product_id}"
+            sandbox="allow-popups allow-popups-to-escape-sandbox allow-scripts allow-top-navigation allow-same-origin"
+            frameborder="0"
+            seamless="seamless"
+            scrolling="no"
+            style="
+              min-width: 323px;
+              height: #{height}px;
+              border: 4px solid #fff;
+              border-top: 3px solid #fff;
+              background-color: #fff;
+              border-radius: 9px;
+              "
+          ></iframe>
+        HTML
+      end
+
+      private
+
+      def oembed_data
+        @oembed_data = get_oembed
+      end
+
+      def get_oembed_url
+        "https://www.tiktok.com/oembed?url=#{url}"
+      end
+    end
+  end
+end
diff --git a/lib/onebox/engine/twitter_status_onebox.rb b/lib/onebox/engine/twitter_status_onebox.rb
index c409e20071e..706751b4b98 100644
--- a/lib/onebox/engine/twitter_status_onebox.rb
+++ b/lib/onebox/engine/twitter_status_onebox.rb
@@ -6,17 +6,13 @@ module Onebox
       include Engine
       include LayoutSupport
       include HTML
+      include ActionView::Helpers::NumberHelper
 
       matches_regexp(
         %r{^https?://(mobile\.|www\.)?twitter\.com/.+?/status(es)?/\d+(/(video|photo)/\d?+)?+(/?\?.*)?/?$},
       )
       always_https
 
-      def self.===(other)
-        client = Onebox.options.twitter_client
-        client && !client.twitter_credentials_missing? && super
-      end
-
       def http_params
         { "User-Agent" => "DiscourseBot/1.0" }
       end
@@ -27,10 +23,46 @@ module Onebox
 
       private
 
+      def get_twitter_data
+        response =
+          begin
+            Onebox::Helpers.fetch_response(url, headers: http_params)
+          rescue StandardError
+            return nil
+          end
+        html = Nokogiri.HTML(response)
+        twitter_data = {}
+        html
+          .css("meta")
+          .each do |m|
+            if m.attribute("property") && m.attribute("property").to_s.match(/^og:/i)
+              m_content = m.attribute("content").to_s.strip
+              m_property = m.attribute("property").to_s.gsub("og:", "").gsub(":", "_")
+              twitter_data[m_property.to_sym] = m_content
+            end
+          end
+        twitter_data
+      end
+
       def match
         @match ||= @url.match(%r{twitter\.com/.+?/status(es)?/(?<id>\d+)})
       end
 
+      def twitter_data
+        @twitter_data ||= get_twitter_data
+      end
+
+      def guess_tweet_index
+        usernames = meta_tags_data("additionalName").compact
+        usernames.each_with_index do |username, index|
+          return index if twitter_data[:url].to_s.include?(username)
+        end
+      end
+
+      def tweet_index
+        @tweet_index ||= guess_tweet_index
+      end
+
       def client
         Onebox.options.twitter_client
       end
@@ -39,66 +71,145 @@ module Onebox
         client && !client.twitter_credentials_missing?
       end
 
-      def raw
-        @raw ||= client.status(match[:id]).to_hash if twitter_api_credentials_present?
+      def symbolize_keys(obj)
+        case obj
+        when Array
+          obj.map { |item| symbolize_keys(item) }
+        when Hash
+          obj.each_with_object({}) do |(key, value), result|
+            result[key.to_sym] = symbolize_keys(value)
+          end
+        else
+          obj
+        end
       end
 
-      def access(*keys)
-        keys.reduce(raw) do |memo, key|
-          next unless memo
-          memo[key] || memo[key.to_s]
+      def raw
+        if twitter_api_credentials_present?
+          @raw ||= symbolize_keys(client.status(match[:id]))
+        else
+          super
         end
       end
 
       def tweet
-        client.prettify_tweet(raw)&.strip
+        if twitter_api_credentials_present?
+          client.prettify_tweet(raw)&.strip
+        else
+          twitter_data[:description].gsub(/“(.+?)”/im) { $1 } if twitter_data[:description]
+        end
       end
 
       def timestamp
-        date = DateTime.strptime(access(:created_at), "%a %b %d %H:%M:%S %z %Y")
-        user_offset = access(:user, :utc_offset).to_i
-        offset = (user_offset >= 0 ? "+" : "-") + Time.at(user_offset.abs).gmtime.strftime("%H%M")
-        date.new_offset(offset).strftime("%-l:%M %p - %-d %b %Y")
+        if twitter_api_credentials_present? && (created_at = raw.dig(:data, :created_at))
+          date = DateTime.strptime(created_at, "%Y-%m-%dT%H:%M:%S.%L%z")
+          date.strftime("%-l:%M %p - %-d %b %Y")
+        end
       end
 
       def title
-        access(:user, :name)
+        if twitter_api_credentials_present?
+          raw.dig(:includes, :users)&.first&.dig(:name)
+        else
+          meta_tags_data("givenName")[tweet_index]
+        end
       end
 
       def screen_name
-        access(:user, :screen_name)
+        if twitter_api_credentials_present?
+          raw.dig(:includes, :users)&.first&.dig(:username)
+        else
+          meta_tags_data("additionalName")[tweet_index]
+        end
       end
 
       def avatar
-        access(:user, :profile_image_url_https).sub("normal", "400x400")
+        if twitter_api_credentials_present?
+          raw.dig(:includes, :users)&.first&.dig(:profile_image_url)
+        end
       end
 
       def likes
-        prettify_number(access(:favorite_count).to_i)
+        if twitter_api_credentials_present?
+          prettify_number(raw.dig(:data, :public_metrics, :like_count).to_i)
+        end
       end
 
       def retweets
-        prettify_number(access(:retweet_count).to_i)
+        if twitter_api_credentials_present?
+          prettify_number(raw.dig(:data, :public_metrics, :retweet_count).to_i)
+        end
+      end
+
+      def is_reply
+        if twitter_api_credentials_present?
+          raw.dig(:data, :referenced_tweets)&.any? { |tweet| tweet.dig(:type) == "replied_to" }
+        end
       end
 
       def quoted_full_name
-        access(:quoted_status, :user, :name)
+        if twitter_api_credentials_present? && quoted_tweet_author.present?
+          quoted_tweet_author[:name]
+        end
       end
 
       def quoted_screen_name
-        access(:quoted_status, :user, :screen_name)
+        if twitter_api_credentials_present? && quoted_tweet_author.present?
+          quoted_tweet_author[:username]
+        end
       end
 
-      def quoted_tweet
-        access(:quoted_status, :full_text)
+      def quoted_text
+        quoted_tweet[:text] if twitter_api_credentials_present? && quoted_tweet.present?
       end
 
       def quoted_link
-        "https://twitter.com/#{quoted_screen_name}/status/#{access(:quoted_status, :id)}"
+        if twitter_api_credentials_present?
+          "https://twitter.com/#{quoted_screen_name}/status/#{quoted_status_id}"
+        end
+      end
+
+      def quoted_status_id
+        raw.dig(:data, :referenced_tweets)&.find { |ref| ref[:type] == "quoted" }&.dig(:id)
+      end
+
+      def quoted_tweet
+        raw.dig(:includes, :tweets)&.find { |tweet| tweet[:id] == quoted_status_id }
+      end
+
+      def quoted_tweet_author
+        raw.dig(:includes, :users)&.find { |user| user[:id] == quoted_tweet&.dig(:author_id) }
       end
 
       def prettify_number(count)
-        count > 0 ? client.prettify_number(count) : nil
+        if count > 0
+          number_to_human(
+            count,
+            format: "%n%u",
+            precision: 2,
+            units: {
+              thousand: "K",
+              million: "M",
+              billion: "B",
+            },
+          )
+        end
+      end
+
+      def attr_at_css(css_property, attribute_name)
+        raw.at_css(css_property)&.attr(attribute_name)
+      end
+
+      def meta_tags_data(attribute_name)
+        data = []
+        raw
+          .css("meta")
+          .each do |m|
+            if m.attribute("itemprop") && m.attribute("itemprop").to_s.strip == attribute_name
+              data.push(m.attribute("content").to_s.strip)
+            end
+          end
+        data
       end
 
       def data
@@ -111,7 +222,8 @@ module Onebox
           avatar: avatar,
           likes: likes,
           retweets: retweets,
-          quoted_tweet: quoted_tweet,
+          is_reply: is_reply,
+          quoted_text: quoted_text,
           quoted_full_name: quoted_full_name,
           quoted_screen_name: quoted_screen_name,
           quoted_link: quoted_link,
diff --git a/lib/onebox/engine/wikipedia_onebox.rb b/lib/onebox/engine/wikipedia_onebox.rb
index 725436f3bbe..1ccb4839640 100644
--- a/lib/onebox/engine/wikipedia_onebox.rb
+++ b/lib/onebox/engine/wikipedia_onebox.rb
@@ -23,7 +23,9 @@ module Onebox
           m_url_hash_name = m_url_hash[1]
         end
 
-        unless m_url_hash.nil?
+        if m_url_hash.nil? # no hash found in url
+          paras = raw.search("p") # default get all the paras
+        else
           section_header_title = raw.xpath("//span[@id='#{CGI.unescape(m_url_hash_name)}']")
 
           if section_header_title.empty?
@@ -49,8 +51,6 @@ module Onebox
               end
             end
           end
-        else # no hash found in url
-          paras = raw.search("p") # default get all the paras
         end
 
         unless paras.empty?
diff --git a/lib/onebox/helpers.rb b/lib/onebox/helpers.rb
index 57ea939680a..1e4da8016ab 100644
--- a/lib/onebox/helpers.rb
+++ b/lib/onebox/helpers.rb
@@ -40,8 +40,8 @@ module Onebox
       should_ignore_canonical =
         IGNORE_CANONICAL_DOMAINS.map { |hostname| uri.hostname.match?(hostname) }.any?
 
-      unless (ignore_canonical_tag && ignore_canonical_tag["content"].to_s == "true") ||
-               should_ignore_canonical
+      if !(ignore_canonical_tag && ignore_canonical_tag["content"].to_s == "true") &&
+           !should_ignore_canonical
         # prefer canonical link
         canonical_link = doc.at('//link[@rel="canonical"]/@href')
         canonical_uri = Addressable::URI.parse(canonical_link)
diff --git a/lib/onebox/layout.rb b/lib/onebox/layout.rb
index e6e31daa6f9..53c63bb834f 100644
--- a/lib/onebox/layout.rb
+++ b/lib/onebox/layout.rb
@@ -15,7 +15,7 @@ module Onebox
       @record = Onebox::Helpers.symbolize_keys(record)
 
       # Fix any relative paths
-      if @record[:image] && @record[:image] =~ %r{^/[^/]}
+      if @record[:image] && @record[:image] =~ %r{\A/[^/]}
         @record[:image] = "#{uri.scheme}://#{uri.host}/#{@record[:image]}"
       end
 
@@ -40,7 +40,7 @@ module Onebox
         link: record[:link],
         title: record[:title],
         favicon: record[:favicon],
-        domain: record[:domain] || uri.host.to_s.sub(/^www\./, ""),
+        domain: record[:domain] || uri.host.to_s.sub(/\Awww\./, ""),
         article_published_time: record[:article_published_time],
         article_published_time_title: record[:article_published_time_title],
         metadata_1_label: record[:metadata_1_label],
diff --git a/lib/onebox/mixins/git_blob_onebox.rb b/lib/onebox/mixins/git_blob_onebox.rb
index 511a6b60849..b307cf5681b 100644
--- a/lib/onebox/mixins/git_blob_onebox.rb
+++ b/lib/onebox/mixins/git_blob_onebox.rb
@@ -119,16 +119,16 @@ module Onebox
           a_lines = str.lines
           a_lines.each do |l|
             l = l.chomp("\n") # remove new line
-            m = l.match(/^[ ]*/) # find leading spaces 0 or more
-            unless m.nil? || l.size == m[0].size || l.size == 0 # no match | only spaces in line | empty line
+            m = l.match(/\A[ ]*/) # find leading spaces 0 or more
+            if m.nil? || l.size == m[0].size || l.size == 0
+              next # SKIP no match or line is only spaces
+            else # no match | only spaces in line | empty line
               m_str_length = m[0].size
               if m_str_length <= 1 # minimum space is 1 or nothing we can break we found our minimum
                 min_space = m_str_length
                 break #stop iteration
               end
               min_space = m_str_length if m_str_length < min_space
-            else
-              next # SKIP no match or line is only spaces
             end
           end
           a_lines.each do |l|
@@ -166,7 +166,7 @@ module Onebox
             @file = m[:file]
             @lang = Onebox::FileTypeFinder.from_file_name(m[:file])
 
-            if @lang == "stl" && link.match?(%r{^https?://(www\.)?github\.com.*/blob/})
+            if @lang == "stl" && link.match?(%r{\Ahttps?://(www\.)?github\.com.*/blob/})
               @model_file = @lang.dup
               @raw = "https://render.githubusercontent.com/view/solid?url=" + self.raw_template(m)
             else
diff --git a/lib/onebox/mixins/twitch_onebox.rb b/lib/onebox/mixins/twitch_onebox.rb
index ec3bc4a6742..8251bcb17c2 100644
--- a/lib/onebox/mixins/twitch_onebox.rb
+++ b/lib/onebox/mixins/twitch_onebox.rb
@@ -25,7 +25,7 @@ module Onebox
 
         def to_html
           <<~HTML
-          <iframe src="https://#{base_url}#{query_params}&parent=#{options[:hostname]}&autoplay=false" width="620" height="378" frameborder="0" style="overflow: hidden;" scrolling="no" allowfullscreen="allowfullscreen"></iframe>
+          <iframe src="https://#{base_url}#{query_params}&parent=#{Discourse.current_hostname}&autoplay=false" width="620" height="378" frameborder="0" style="overflow: hidden;" scrolling="no" allowfullscreen="allowfullscreen"></iframe>
           HTML
         end
       end
diff --git a/lib/onebox/normalizer.rb b/lib/onebox/normalizer.rb
index ac4c26b541a..ecd0b509f15 100644
--- a/lib/onebox/normalizer.rb
+++ b/lib/onebox/normalizer.rb
@@ -4,19 +4,11 @@ module Onebox
   class Normalizer
     attr_reader :data
 
-    def get(attr, length = nil, sanitize = true)
-      return nil if Onebox::Helpers.blank?(data)
-
+    def get(attr, *args)
       value = data[attr]
-
-      return nil if Onebox::Helpers.blank?(value)
-
-      value = html_entities.decode(value)
-      value = Sanitize.fragment(value) if sanitize
-      value.strip!
-      value = Onebox::Helpers.truncate(value, length) unless length.nil?
-
-      value
+      return if value.blank?
+      return value.map { |v| sanitize_value(v, *args) } if value.is_a?(Array)
+      sanitize_value(value, *args)
     end
 
     def method_missing(attr, *args, &block)
@@ -48,5 +40,13 @@ module Onebox
     def html_entities
       @html_entities ||= HTMLEntities.new
     end
+
+    def sanitize_value(value, length = nil, sanitize = true)
+      value = html_entities.decode(value)
+      value = Sanitize.fragment(value) if sanitize
+      value.strip!
+      value = Onebox::Helpers.truncate(value, length) if length
+      value
+    end
   end
 end
diff --git a/lib/onebox/open_graph.rb b/lib/onebox/open_graph.rb
index 4fb25793472..10c1f165d9c 100644
--- a/lib/onebox/open_graph.rb
+++ b/lib/onebox/open_graph.rb
@@ -22,6 +22,8 @@ module Onebox
 
     private
 
+    COLLECTIONS = %i[article_section article_section_color article_tag]
+
     def extract(doc)
       return {} if Onebox::Helpers.blank?(doc)
 
@@ -30,10 +32,17 @@ module Onebox
       doc
         .css("meta")
         .each do |m|
-          if (m["property"] && m["property"][/^(?:og|article|product):(.+)$/i]) ||
-               (m["name"] && m["name"][/^(?:og|article|product):(.+)$/i])
+          if (m["property"] && m["property"][/\A(?:og|article|product):(.+)\z/i]) ||
+               (m["name"] && m["name"][/\A(?:og|article|product):(.+)\z/i])
             value = (m["content"] || m["value"]).to_s
-            data[$1.tr("-:", "_").to_sym] ||= value unless Onebox::Helpers.blank?(value)
+            next if Onebox::Helpers.blank?(value)
+            key = $1.tr("-:", "_").to_sym
+            data[key] ||= value
+            if key.in?(COLLECTIONS)
+              collection_name = "#{key}s".to_sym
+              data[collection_name] ||= []
+              data[collection_name] << value
+            end
           end
         end
 
diff --git a/lib/onebox/sanitize_config.rb b/lib/onebox/sanitize_config.rb
index 49c552f05be..77f97ee9257 100644
--- a/lib/onebox/sanitize_config.rb
+++ b/lib/onebox/sanitize_config.rb
@@ -10,7 +10,7 @@ module Onebox
           Sanitize::Config::RELAXED,
           elements:
             Sanitize::Config::RELAXED[:elements] +
-              %w[audio details embed iframe source video svg path],
+              %w[audio details embed iframe source video svg path use],
           attributes: {
             "a" => Sanitize::Config::RELAXED[:attributes]["a"] + %w[target],
             "audio" => %w[controls controlslist],
@@ -40,7 +40,8 @@ module Onebox
             "path" => %w[d fill-rule],
             "svg" => %w[aria-hidden width height viewbox],
             "div" => [:data], # any data-* attributes,
-            "span" => [:data], # any data-* attributes
+            "span" => [:data], # any data-* attributes,
+            "use" => %w[href],
           },
           add_attributes: {
             "iframe" => {
@@ -57,7 +58,7 @@ module Onebox
                   next unless env[:node_name] == "a"
                   a_tag = env[:node]
                   a_tag["href"] ||= "#"
-                  if a_tag["href"] =~ %r{^(?:[a-z]+:)?//}
+                  if a_tag["href"] =~ %r{\A(?:[a-z]+:)?//}
                     a_tag["rel"] = "nofollow ugc noopener"
                   else
                     a_tag.remove_attribute("target")
@@ -89,6 +90,9 @@ module Onebox
             "source" => {
               "src" => HTTP_PROTOCOLS,
             },
+            "use" => {
+              "href" => [:relative],
+            },
           },
           css: {
             properties: Sanitize::Config::RELAXED[:css][:properties] + %w[--aspect-ratio],
diff --git a/lib/onebox/templates/discourse_user_onebox.mustache b/lib/onebox/templates/discourse_user_onebox.mustache
index 9adb3bcaf92..e7b7cdd2fec 100644
--- a/lib/onebox/templates/discourse_user_onebox.mustache
+++ b/lib/onebox/templates/discourse_user_onebox.mustache
@@ -1,7 +1,7 @@
 <aside class="onebox">
   <article class="onebox-body user-onebox">
     {{{avatar}}}
-    <h3><a href="{{original_url}}">{{{username}}}</a></h3>
+    <h3><a href="{{original_url}}">@{{{username}}}</a></h3>
     <div>
       {{#name}}
         <span class="full-name">{{name}}</span>
@@ -26,7 +26,7 @@
     {{#bio}}
       <p>{{{bio}}}</p>
     {{/bio}}
-    <span>{{joined}} {{created_at}}</span>
+    <div class="user-onebox--joined">{{joined}}</div>
   </article>
   <div class="clearfix"></div>
 </aside>
diff --git a/lib/onebox/templates/discoursetopic.mustache b/lib/onebox/templates/discoursetopic.mustache
new file mode 100644
index 00000000000..706b91b9fb2
--- /dev/null
+++ b/lib/onebox/templates/discoursetopic.mustache
@@ -0,0 +1,42 @@
+{{#image}}<img src="{{image}}" class="thumbnail"/>{{/image}}
+
+<div class="title-wrapper">
+  <h3><a href="{{link}}" target="_blank" rel="noopener">{{title}}</a></h3>
+  {{#render_category_block?}}
+  <div class="topic-category">
+    {{#categories}}
+      <span class="badge-wrapper bullet">
+        <span class="badge-category-bg" style="background-color: #{{color}};"></span>
+        <span class="badge-category clear-badge">
+          <span class="category-name">{{name}}</span>
+        </span>
+      </span>
+    {{/categories}}
+    {{#render_tags?}}
+    <div class="topic-header-extra">
+      <div class="list-tags">
+        <div class="discourse-tags">
+          <svg class="fa d-icon d-icon-tag svg-icon svg-string" xmlns="http://www.w3.org/2000/svg"><use href="#tag" /></svg>
+          {{#article_tags}}
+            <span class="discourse-tag simple">{{.}}</span>
+          {{/article_tags}}
+        </div>
+      </div>
+    </div>
+    {{/render_tags?}}
+  </div>
+  {{/render_category_block?}}
+</div>
+
+{{#description}}
+  <p>{{description}}</p>
+{{/description}}
+
+{{#data1}}
+  <p>
+    <span class="label1">{{label1}}: {{data1}}</span>
+    {{#data2}}
+      <span class="label2">{{label2}}: {{data2}}</span>
+    {{/data2}}
+  </p>
+{{/data1}}
diff --git a/lib/onebox/templates/threadsstatus.mustache b/lib/onebox/templates/threadsstatus.mustache
new file mode 100644
index 00000000000..b39da295cd6
--- /dev/null
+++ b/lib/onebox/templates/threadsstatus.mustache
@@ -0,0 +1,30 @@
+{{#avatar}}<img src="{{avatar}}" class="thumbnail onebox-avatar">{{/avatar}}
+<h4><a href="{{link}}" target="_blank" rel="noopener">{{title}}</a></h4>
+<div class="threads-screen-name"><a href="{{link}}" target="_blank" rel="noopener">@{{screen_name}}</a></div>
+
+<div class="thread-contents">
+  <span class="thread-description">{{{description}}}</span>
+  {{#image}}
+    <div class="scale-images"><img src="{{image}}"></div>
+  {{/image}}
+</div>
+
+<div class="date">
+  {{#likes}}
+    <span class="like">
+      <svg viewBox="0 0 512 512" width="14px" height="16px" aria-hidden="true">
+        <path d="M462.3 62.6C407.5 15.9 326 24.3 275.7 76.2L256 96.5l-19.7-20.3C186.1 24.3 104.5 15.9 49.7 62.6c-62.8 53.6-66.1 149.8-9.9 207.9l193.5 199.8c12.5 12.9 32.8 12.9 45.3 0l193.5-199.8c56.3-58.1 53-154.3-9.8-207.9z"></path>
+      </svg>
+      {{likes}}
+    </span>
+  {{/likes}}
+
+  {{#replies}}
+    <span class="replies">
+      <svg viewBox="0 0 640 512" width="14px" height="16px" aria-hidden="true">
+        <path d="M629.657 343.598L528.971 444.284c-9.373 9.372-24.568 9.372-33.941 0L394.343 343.598c-9.373-9.373-9.373-24.569 0-33.941l10.823-10.823c9.562-9.562 25.133-9.34 34.419.492L480 342.118V160H292.451a24.005 24.005 0 0 1-16.971-7.029l-16-16C244.361 121.851 255.069 96 276.451 96H520c13.255 0 24 10.745 24 24v222.118l40.416-42.792c9.285-9.831 24.856-10.054 34.419-.492l10.823 10.823c9.372 9.372 9.372 24.569-.001 33.941zm-265.138 15.431A23.999 23.999 0 0 0 347.548 352H160V169.881l40.416 42.792c9.286 9.831 24.856 10.054 34.419.491l10.822-10.822c9.373-9.373 9.373-24.569 0-33.941L144.971 67.716c-9.373-9.373-24.569-9.373-33.941 0L10.343 168.402c-9.373 9.373-9.373 24.569 0 33.941l10.822 10.822c9.562 9.562 25.133 9.34 34.419-.491L96 169.881V392c0 13.255 10.745 24 24 24h243.549c21.382 0 32.09-25.851 16.971-40.971l-16.001-16z"></path>
+      </svg>
+      {{replies}}
+    </span>
+  {{/replies}}
+</div>
diff --git a/lib/onebox/templates/twitterstatus.mustache b/lib/onebox/templates/twitterstatus.mustache
index 13fe2cfafd9..3c3d8497aab 100644
--- a/lib/onebox/templates/twitterstatus.mustache
+++ b/lib/onebox/templates/twitterstatus.mustache
@@ -3,16 +3,21 @@
 <div class="twitter-screen-name"><a href="{{link}}" target="_blank" rel="noopener">@{{screen_name}}</a></div>
 
 <div class="tweet">
+  {{#is_reply}}
+    <span class="is-reply">
+      <svg class="fa d-icon d-icon-reply svg-icon svg-string" xmlns="http://www.w3.org/2000/svg"><use href="#reply"></use></svg>
+    </span>
+  {{/is_reply}}
   <span class="tweet-description">{{{tweet}}}</span>
-  {{#quoted_tweet}}
+  {{#quoted_text}}
     <div class="quoted">
       <a class="quoted-link" href="{{quoted_link}}">
         <p class="quoted-title">{{quoted_full_name}} <span>@{{quoted_screen_name}}</span></p>
       </a>
 
-      <div>{{quoted_tweet}}</div>
+      <div>{{quoted_text}}</div>
     </div>
-  {{/quoted_tweet}}
+  {{/quoted_text}}
 </div>
 
 <div class="date">
diff --git a/lib/onebox/templates/wikimedia.mustache b/lib/onebox/templates/wikimedia.mustache
index 4b1ab487c0e..dbcd4bb40d3 100644
--- a/lib/onebox/templates/wikimedia.mustache
+++ b/lib/onebox/templates/wikimedia.mustache
@@ -1,3 +1,3 @@
-{{#image}}<img src="{{image}}" class="thumbnail">{{/image}}
+{{#image}}<img src="{{thumbnail}}" class="thumbnail">{{/image}}
 
 <h3><a href="{{link}}" target="_blank" rel="noopener">{{title}}</a></h3>
diff --git a/lib/oneboxer.rb b/lib/oneboxer.rb
index 801e6f75536..5349b8a1d05 100644
--- a/lib/oneboxer.rb
+++ b/lib/oneboxer.rb
@@ -6,8 +6,8 @@ Dir["#{Rails.root}/lib/onebox/engine/*_onebox.rb"].sort.each { |f| require f }
 
 module Oneboxer
   ONEBOX_CSS_CLASS = "onebox"
-  AUDIO_REGEX = /^\.(mp3|og[ga]|opus|wav|m4[abpr]|aac|flac)$/i
-  VIDEO_REGEX = /^\.(mov|mp4|webm|m4v|3gp|ogv|avi|mpeg|ogv)$/i
+  AUDIO_REGEX = /\A\.(mp3|og[ga]|opus|wav|m4[abpr]|aac|flac)\z/i
+  VIDEO_REGEX = /\A\.(mov|mp4|webm|m4v|3gp|ogv|avi|mpeg|ogv)\z/i
 
   # keep reloaders happy
   unless defined?(Oneboxer::Result)
@@ -29,6 +29,7 @@ module Oneboxer
       "http://store.steampowered.com",
       "http://vimeo.com",
       "https://www.youtube.com",
+      "https://twitter.com",
       Discourse.base_url,
     ]
   end
@@ -206,14 +207,14 @@ module Oneboxer
 
   def self.apply(string_or_doc, extra_paths: nil)
     doc = string_or_doc
-    doc = Loofah.fragment(doc) if doc.is_a?(String)
+    doc = Loofah.html5_fragment(doc) if doc.is_a?(String)
     changed = false
 
     each_onebox_link(doc, extra_paths: extra_paths) do |url, element|
       onebox, _ = yield(url, element)
       next if onebox.blank?
 
-      parsed_onebox = Loofah.fragment(onebox)
+      parsed_onebox = Loofah.html5_fragment(onebox)
       next if parsed_onebox.children.blank?
 
       changed = true
@@ -455,12 +456,15 @@ module Oneboxer
       args = {
         user_id: user.id,
         username: user.username,
-        avatar: PrettyText.avatar_img(user.avatar_template, "extra_large"),
+        avatar: PrettyText.avatar_img(user.avatar_template, "huge"),
         name: name,
         bio: user.user_profile.bio_excerpt(230),
         location: Onebox::Helpers.sanitize(user.user_profile.location),
-        joined: I18n.t("joined"),
-        created_at: user.created_at.strftime(I18n.t("datetime_formats.formats.date_only")),
+        joined:
+          I18n.t(
+            "onebox.discourse.user_joined_community",
+            date: user.created_at.strftime(I18n.t("datetime_formats.formats.date_only")),
+          ),
         website: user.user_profile.website,
         website_name: UserSerializer.new(user).website_name,
         original_url: url,
diff --git a/lib/password_hasher.rb b/lib/password_hasher.rb
new file mode 100644
index 00000000000..755c9280144
--- /dev/null
+++ b/lib/password_hasher.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+class PasswordHasher
+  class InvalidAlgorithmError < StandardError
+  end
+
+  class UnsupportedAlgorithmError < StandardError
+  end
+
+  HANDLERS = {}
+
+  def self.register_handler(id, &blk)
+    HANDLERS[id] = blk
+  end
+
+  # Algorithm should be specified according to the id/params parts of the
+  # PHC string format.
+  # https://github.com/P-H-C/phc-string-format/blob/master/phc-sf-spec.md
+  def self.hash_password(password:, salt:, algorithm:)
+    algorithm = algorithm.delete_prefix("$").delete_suffix("$")
+
+    parts = algorithm.split("$")
+    raise InvalidAlgorithmError if parts.length != 2
+
+    algorithm_id, algorithm_params = parts
+
+    algorithm_params = algorithm_params.split(",").map { |pair| pair.split("=") }.to_h
+
+    handler = HANDLERS[algorithm_id]
+    if handler.nil?
+      raise UnsupportedAlgorithmError.new "#{algorithm_id} is not a supported password algorithm"
+    end
+
+    handler.call(password: password, salt: salt, params: algorithm_params)
+  end
+
+  register_handler("pbkdf2-sha256") do |password:, salt:, params:|
+    raise ArgumentError.new("Salt and password must be supplied") if password.blank? || salt.blank?
+
+    if params["l"].to_i != 32
+      raise UnsupportedAlgorithmError.new("pbkdf2 implementation only supports l=32")
+    end
+
+    if params["i"].to_i < 1
+      raise UnsupportedAlgorithmError.new("pbkdf2 iterations must be 1 or more")
+    end
+
+    Pbkdf2.hash_password(password, salt, params["i"].to_i, "sha256")
+  end
+end
diff --git a/lib/pbkdf2.rb b/lib/pbkdf2.rb
index 5546e64d671..385ca5963eb 100644
--- a/lib/pbkdf2.rb
+++ b/lib/pbkdf2.rb
@@ -1,28 +1,13 @@
 # frozen_string_literal: true
 
-# Note: This logic was originally extracted from the Pbkdf2 gem to fix Ruby 2.0
-# issues, but that gem has gone stale so we won't be returning to it.
-
-require "openssl"
-require "xorcist"
-
 class Pbkdf2
-  def self.hash_password(password, salt, iterations, algorithm = "sha256")
-    h = OpenSSL::Digest.new(algorithm)
-
-    u = ret = prf(h, password, salt + [1].pack("N"))
-
-    2.upto(iterations) do
-      u = prf(h, password, u)
-      Xorcist.xor!(ret, u)
-    end
-
-    ret.bytes.map { |b| ("0" + b.to_s(16))[-2..-1] }.join("")
-  end
-
-  protected
-
-  def self.prf(hash_function, password, data)
-    OpenSSL::HMAC.digest(hash_function, password, data)
+  def self.hash_password(password, salt, iterations, algorithm = "sha256", length: 32)
+    OpenSSL::KDF.pbkdf2_hmac(
+      password,
+      salt: salt,
+      iterations: iterations,
+      length: length,
+      hash: algorithm,
+    ).unpack1("H*")
   end
 end
diff --git a/lib/plain_text_to_markdown.rb b/lib/plain_text_to_markdown.rb
index 8e582e6f365..d914cd867e5 100644
--- a/lib/plain_text_to_markdown.rb
+++ b/lib/plain_text_to_markdown.rb
@@ -100,7 +100,7 @@ class PlainTextToMarkdown
 
   # @param line [Line]
   def remove_quote_level_indicators!(line)
-    match_data = line.text.match(/^(?<indicators>>+)\s?(?<text>.*)/)
+    match_data = line.text.match(/\A(?<indicators>>+)\s?(?<text>.*)/)
 
     if match_data
       line.text = match_data[:text]
@@ -128,7 +128,7 @@ class PlainTextToMarkdown
   def classify_line_as_code!(line, previous_line)
     line.code_block = previous_line.code_block unless previous_line.nil? ||
       previous_line.valid_code_block?
-    return unless line.text =~ /^\s{0,3}```/
+    return unless line.text =~ /\A\s{0,3}```/
 
     if line.code_block.present?
       line.code_block.end_line = line
@@ -173,7 +173,7 @@ class PlainTextToMarkdown
   end
 
   def indent_with_non_breaking_spaces(text)
-    text.sub(/^\s+/) do |s|
+    text.sub(/\A\s+/) do |s|
       # replace tabs with 2 spaces
       s.gsub!("\t", "  ")
 
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index fc69c104760..a3f3887b3ab 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -103,13 +103,42 @@ class Plugin::Instance
     @admin_route = { label: label, location: location }
   end
 
+  def configurable?
+    true
+  end
+
+  def visible?
+    configurable? && !@hidden
+  end
+
   def enabled?
+    return false if !configurable?
     @enabled_site_setting ? SiteSetting.get(@enabled_site_setting) : true
   end
 
   delegate :name, to: :metadata
 
-  def add_to_serializer(serializer, attr, define_include_method = true, &block)
+  def add_to_serializer(
+    serializer,
+    attr,
+    deprecated_respect_plugin_enabled = nil,
+    respect_plugin_enabled: true,
+    include_condition: nil,
+    &block
+  )
+    if !deprecated_respect_plugin_enabled.nil?
+      Discourse.deprecate(
+        "add_to_serializer's respect_plugin_enabled argument should be passed as a keyword argument",
+      )
+      respect_plugin_enabled = deprecated_respect_plugin_enabled
+    end
+
+    if attr.to_s.starts_with?("include_")
+      Discourse.deprecate(
+        "add_to_serializer should not be used to directly override include_*? methods. Use the include_condition keyword argument instead",
+      )
+    end
+
     reloadable_patch do |plugin|
       base =
         begin
@@ -123,9 +152,13 @@ class Plugin::Instance
         unless attr.to_s.start_with?("include_")
           klass.attributes(attr)
 
-          if define_include_method
+          if respect_plugin_enabled || include_condition
             # Don't include serialized methods if the plugin is disabled
-            klass.public_send(:define_method, "include_#{attr}?") { plugin.enabled? }
+            klass.public_send(:define_method, "include_#{attr}?") do
+              next false if respect_plugin_enabled && !plugin.enabled?
+              next instance_exec(&include_condition) if include_condition
+              true
+            end
           end
         end
 
@@ -134,6 +167,10 @@ class Plugin::Instance
     end
   end
 
+  def register_modifier(modifier_name, &blk)
+    DiscoursePluginRegistry.register_modifier(self, modifier_name, &blk)
+  end
+
   # Applies to all sites in a multisite environment. Ignores plugin.enabled?
   def add_report(name, &block)
     reloadable_patch { |plugin| Report.add_report(name, &block) }
@@ -152,28 +189,10 @@ class Plugin::Instance
     end
   end
 
-  def whitelist_staff_user_custom_field(field)
-    Discourse.deprecate(
-      "whitelist_staff_user_custom_field is deprecated, use the allow_staff_user_custom_field.",
-      drop_from: "2.6",
-      raise_error: true,
-    )
-    allow_staff_user_custom_field(field)
-  end
-
   def allow_staff_user_custom_field(field)
     DiscoursePluginRegistry.register_staff_user_custom_field(field, self)
   end
 
-  def whitelist_public_user_custom_field(field)
-    Discourse.deprecate(
-      "whitelist_public_user_custom_field is deprecated, use the allow_public_user_custom_field.",
-      drop_from: "2.6",
-      raise_error: true,
-    )
-    allow_public_user_custom_field(field)
-  end
-
   def allow_public_user_custom_field(field)
     DiscoursePluginRegistry.register_public_user_custom_field(field, self)
   end
@@ -341,15 +360,6 @@ class Plugin::Instance
     end
   end
 
-  def topic_view_post_custom_fields_whitelister(&block)
-    Discourse.deprecate(
-      "topic_view_post_custom_fields_whitelister is deprecated, use the topic_view_post_custom_fields_allowlister.",
-      drop_from: "2.6",
-      raise_error: true,
-    )
-    topic_view_post_custom_fields_allowlister(&block)
-  end
-
   # Add a post_custom_fields_allowlister block to the TopicView, respecting if the plugin is enabled
   def topic_view_post_custom_fields_allowlister(&block)
     reloadable_patch do |plugin|
@@ -479,6 +489,19 @@ class Plugin::Instance
     initializers << block
   end
 
+  def commit_hash
+    git_repo.latest_local_commit
+  end
+
+  def commit_url
+    return if commit_hash.blank?
+    "#{git_repo.url}/commit/#{commit_hash}"
+  end
+
+  def git_repo
+    @git_repo ||= GitRepo.new(directory, name)
+  end
+
   def before_auth(&block)
     if @before_auth_complete
       raise "Auth providers must be registered before omniauth middleware. after_initialize is too late!"
@@ -597,6 +620,11 @@ class Plugin::Instance
     end
   end
 
+  def register_email_poller(poller)
+    plugin = self
+    DiscoursePluginRegistry.register_mail_poller(poller) if plugin.enabled?
+  end
+
   def register_asset(file, opts = nil)
     raise <<~ERROR if file.end_with?(".hbs", ".handlebars")
         [#{name}] Handlebars templates can no longer be included via `register_asset`.
@@ -629,6 +657,7 @@ class Plugin::Instance
   end
 
   def register_emoji(name, url, group = Emoji::DEFAULT_GROUP)
+    name = name.gsub(/[^a-z0-9]+/i, "_").gsub(/_{2,}/, "_").downcase
     Plugin::CustomEmoji.register(name, url, group)
     Emoji.clear_cache
   end
@@ -675,17 +704,17 @@ class Plugin::Instance
       DiscoursePluginRegistry.register_glob(admin_path, "hbr", admin: true)
 
       DiscourseJsProcessor.plugin_transpile_paths << root_path.sub(Rails.root.to_s, "").sub(
-        %r{^/*},
+        %r{\A/*},
         "",
       )
       DiscourseJsProcessor.plugin_transpile_paths << admin_path.sub(Rails.root.to_s, "").sub(
-        %r{^/*},
+        %r{\A/*},
         "",
       )
 
       test_path = "#{root_dir_name}/test/javascripts"
       DiscourseJsProcessor.plugin_transpile_paths << test_path.sub(Rails.root.to_s, "").sub(
-        %r{^/*},
+        %r{\A/*},
         "",
       )
     end
@@ -797,11 +826,7 @@ class Plugin::Instance
   end
 
   def hide_plugin
-    Discourse.hidden_plugins << self
-  end
-
-  def enabled_site_setting_filter(filter = nil)
-    STDERR.puts("`enabled_site_setting_filter` is deprecated")
+    @hidden = true
   end
 
   def enabled_site_setting(setting = nil)
@@ -946,36 +971,7 @@ class Plugin::Instance
   #
   # See Auth::DefaultCurrentUserProvider::PARAMETER_API_PATTERNS for more examples
   # and Auth::DefaultCurrentUserProvider#api_parameter_allowed? for implementation
-  def add_api_parameter_route(
-    method: nil,
-    methods: nil,
-    route: nil,
-    actions: nil,
-    format: nil,
-    formats: nil
-  )
-    if Array(format).include?("*")
-      Discourse.deprecate(
-        "* is no longer a valid api_parameter_route format matcher. Use `nil` instead",
-        drop_from: "2.7",
-        raise_error: true,
-      )
-      # Old API used * as wildcard. New api uses `nil`
-      format = nil
-    end
-
-    # Backwards compatibility with old parameter names:
-    if method || route || format
-      Discourse.deprecate(
-        "method, route and format parameters for api_parameter_routes are deprecated. Use methods, actions and formats instead.",
-        drop_from: "2.7",
-        raise_error: true,
-      )
-      methods ||= method
-      actions ||= route
-      formats ||= format
-    end
-
+  def add_api_parameter_route(methods: nil, actions: nil, formats: nil)
     DiscoursePluginRegistry.register_api_parameter_route(
       RouteMatcher.new(methods: methods, actions: actions, formats: formats),
       self,
@@ -1129,7 +1125,17 @@ class Plugin::Instance
   # table. Some stats may be needed purely for reporting purposes and thus
   # do not need to be shown in the UI to admins/users.
   def register_about_stat_group(plugin_stat_group_name, show_in_ui: false, &block)
-    About.add_plugin_stat_group(plugin_stat_group_name, show_in_ui: show_in_ui, &block)
+    # We do not want to register and display the same group multiple times.
+    if DiscoursePluginRegistry.about_stat_groups.any? { |stat_group|
+         stat_group[:name] == plugin_stat_group_name
+       }
+      return
+    end
+
+    DiscoursePluginRegistry.register_about_stat_group(
+      { name: plugin_stat_group_name, show_in_ui: show_in_ui, block: block },
+      self,
+    )
   end
 
   ##
@@ -1211,6 +1217,27 @@ class Plugin::Instance
     DiscoursePluginRegistry.register_user_destroyer_on_content_deletion_callback(callback, self)
   end
 
+  ##
+  # Register a class that implements [BaseBookmarkable], which represents another
+  # [ActiveRecord::Model] that may be bookmarked via the [Bookmark] model's
+  # polymorphic association. The class handles create and destroy hooks, querying,
+  # and reminders among other things.
+  def register_bookmarkable(klass)
+    return if Bookmark.registered_bookmarkable_from_type(klass.model.name).present?
+    DiscoursePluginRegistry.register_bookmarkable(RegisteredBookmarkable.new(klass), self)
+  end
+
+  ##
+  # Register an object that inherits from [Summarization::Base], which provides a way
+  # to summarize content. Staff can select which strategy to use
+  # through the `summarization_strategy` setting.
+  def register_summarization_strategy(strategy)
+    if !strategy.class.ancestors.include?(Summarization::Base)
+      raise ArgumentError.new("Not a valid summarization strategy")
+    end
+    DiscoursePluginRegistry.register_summarization_strategy(strategy, self)
+  end
+
   protected
 
   def self.js_path
@@ -1292,10 +1319,14 @@ class Plugin::Instance
     DiscoursePluginRegistry.register_topic_preloader_association(fields, self)
   end
 
+  def register_search_group_query_callback(callback)
+    DiscoursePluginRegistry.register_search_groups_set_query_callback(callback, self)
+  end
+
   private
 
   def validate_directory_column_name(column_name)
-    match = /^[_a-z]+$/.match(column_name)
+    match = /\A[_a-z]+\z/.match(column_name)
     unless match
       raise "Invalid directory column name '#{column_name}'. Can only contain a-z and underscores"
     end
diff --git a/lib/plugin/metadata.rb b/lib/plugin/metadata.rb
index ab59144079c..6197f8e990b 100644
--- a/lib/plugin/metadata.rb
+++ b/lib/plugin/metadata.rb
@@ -13,6 +13,7 @@ class Plugin::Metadata
         "Canned Replies",
         "discourse-adplugin",
         "discourse-affiliate",
+        "discourse-ai",
         "discourse-akismet",
         "discourse-algolia",
         "discourse-apple-auth",
@@ -45,6 +46,7 @@ class Plugin::Metadata
         "discourse-graphviz",
         "discourse-group-tracker",
         "discourse-invite-tokens",
+        "discourse-lazy-videos",
         "discourse-local-dates",
         "discourse-login-with-amazon",
         "discourse-logster-rate-limit-checker",
@@ -53,6 +55,7 @@ class Plugin::Metadata
         "discourse-math",
         "discourse-moderator-attention",
         "discourse-narrative-bot",
+        "discourse-newsletter-integration",
         "discourse-no-bump",
         "discourse-oauth2-basic",
         "discourse-openid-connect",
@@ -91,9 +94,9 @@ class Plugin::Metadata
         "discourse-whos-online",
         "discourse-yearly-review",
         "discourse-zendesk-plugin",
+        "discourse-zoom",
         "docker_manager",
         "chat",
-        "lazy-yt",
         "poll",
         "styleguide",
       ],
diff --git a/lib/plugin_gem.rb b/lib/plugin_gem.rb
index bba295f43e1..8bbbd726737 100644
--- a/lib/plugin_gem.rb
+++ b/lib/plugin_gem.rb
@@ -9,10 +9,8 @@ module PluginGem
     spec_path = gems_path + "/specifications"
 
     spec_file = spec_path + "/#{name}-#{version}"
-    spec_file += "-#{opts[:platform]}" if opts[:platform]
-    spec_file += ".gemspec"
 
-    unless File.exist? spec_file
+    unless platform_variants(spec_file).find(&File.method(:exist?)).present?
       command =
         "gem install #{name} -v #{version} -i #{gems_path} --no-document --ignore-dependencies --no-user-install"
       command += " --source #{opts[:source]}" if opts[:source]
@@ -21,15 +19,27 @@ module PluginGem
       Bundler.with_unbundled_env { puts `#{command}` }
     end
 
-    if File.exist? spec_file
+    spec_file_variant = platform_variants(spec_file).find(&File.method(:exist?))
+    if spec_file_variant.present?
       Gem.path << gems_path
-      Gem::Specification.load(spec_file).activate
+      Gem::Specification.load(spec_file_variant).activate
 
       require opts[:require_name] ? opts[:require_name] : name unless opts[:require] == false
     else
       puts "You are specifying the gem #{name} in #{path}, however it does not exist!"
-      puts "Looked for: #{spec_file}"
+      puts "Looked for: \n- #{platform_variants(spec_file).join("\n- ")}"
       exit(-1)
     end
   end
+
+  def self.platform_variants(spec_file)
+    platform_less = "#{spec_file}.gemspec"
+
+    platform_full = "#{spec_file}-#{RUBY_PLATFORM}.gemspec"
+
+    platform_version_less =
+      "#{spec_file}-#{Gem::Platform.local.cpu}-#{Gem::Platform.local.os}.gemspec"
+
+    [platform_less, platform_full, platform_version_less]
+  end
 end
diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index b233de35403..f1afa7aac72 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -148,7 +148,7 @@ class PostCreator
         end
       end
 
-      unless @topic.present? && (@opts[:skip_guardian] || guardian.can_create?(Post, @topic))
+      if @topic.blank? || !(@opts[:skip_guardian] || guardian.can_create?(Post, @topic))
         errors.add(:base, I18n.t(:topic_not_found))
         return false
       end
@@ -190,7 +190,7 @@ class PostCreator
         update_user_counts
         create_embedded_topic
         @post.link_post_uploads
-        update_uploads_secure_status
+        @post.update_uploads_secure_status(source: "post creator")
         delete_owned_bookmarks
         ensure_in_allowed_users if guardian.is_staff?
         unarchive_message if !@opts[:import_mode]
@@ -328,9 +328,8 @@ class PostCreator
     if PostCreator.track_post_stats
       sequence = DraftSequence.current(@user, draft_key)
       revisions =
-        Draft.where(sequence: sequence, user_id: @user.id, draft_key: draft_key).pluck_first(
-          :revisions,
-        ) || 0
+        Draft.where(sequence: sequence, user_id: @user.id, draft_key: draft_key).pick(:revisions) ||
+          0
 
       @post.build_post_stat(
         drafts_saved: revisions,
@@ -403,10 +402,6 @@ class PostCreator
     rollback_from_errors!(embed) unless embed.save
   end
 
-  def update_uploads_secure_status
-    @post.update_uploads_secure_status(source: "post creator") if SiteSetting.secure_uploads?
-  end
-
   def delete_owned_bookmarks
     return if !@post.topic_id
     BookmarkManager.new(@user).destroy_for_topic(
diff --git a/lib/post_destroyer.rb b/lib/post_destroyer.rb
index a7cd9a11b91..d8f67083e40 100644
--- a/lib/post_destroyer.rb
+++ b/lib/post_destroyer.rb
@@ -55,18 +55,17 @@ class PostDestroyer
   def initialize(user, post, opts = {})
     @user = user
     @post = post
-    @topic = post.topic if post
+    @topic = post.topic || Topic.with_deleted.find_by(id: @post.topic_id)
     @opts = opts
   end
 
   def destroy
     payload = WebHook.generate_payload(:post, @post) if WebHook.active_web_hooks(:post).exists?
-    topic = Topic.with_deleted.find_by(id: @post.topic_id)
-    is_first_post = @post.is_first_post? && topic
+    is_first_post = @post.is_first_post? && @topic
     has_topic_web_hooks = is_first_post && WebHook.active_web_hooks(:topic).exists?
 
     if has_topic_web_hooks
-      topic_view = TopicView.new(topic.id, Discourse.system_user, skip_staff_action: true)
+      topic_view = TopicView.new(@topic.id, Discourse.system_user, skip_staff_action: true)
       topic_payload = WebHook.generate_payload(:topic, topic_view, WebHookTopicViewSerializer)
     end
 
@@ -74,7 +73,7 @@ class PostDestroyer
       @opts[:delete_removed_posts_after] || SiteSetting.delete_removed_posts_after
 
     if delete_removed_posts_after < 1 || post_is_reviewable? ||
-         Guardian.new(@user).can_moderate_topic?(topic) || permanent?
+         Guardian.new(@user).can_moderate_topic?(@topic) || permanent?
       perform_delete
     elsif @user.id == @post.user_id
       mark_for_deletion(delete_removed_posts_after)
@@ -84,13 +83,16 @@ class PostDestroyer
 
     DiscourseEvent.trigger(:post_destroyed, @post, @opts, @user)
     WebHook.enqueue_post_hooks(:post_destroyed, @post, payload)
-    Jobs.enqueue(:sync_topic_user_bookmarked, topic_id: topic.id) if topic
+    Jobs.enqueue(:sync_topic_user_bookmarked, topic_id: @topic.id) if @topic
 
     if is_first_post
-      UserProfile.remove_featured_topic_from_all_profiles(topic)
-      UserActionManager.topic_destroyed(topic)
-      DiscourseEvent.trigger(:topic_destroyed, topic, @user)
-      WebHook.enqueue_topic_hooks(:topic_destroyed, topic, topic_payload) if has_topic_web_hooks
+      UserProfile.remove_featured_topic_from_all_profiles(@topic)
+      UserActionManager.topic_destroyed(@topic)
+      DiscourseEvent.trigger(:topic_destroyed, @topic, @user)
+      WebHook.enqueue_topic_hooks(:topic_destroyed, @topic, topic_payload) if has_topic_web_hooks
+      if SiteSetting.tos_topic_id == @topic.id || SiteSetting.privacy_topic_id == @topic.id
+        Discourse.clear_urls!
+      end
     end
   end
 
@@ -101,28 +103,31 @@ class PostDestroyer
     elsif @user.staff? || @user.id == @post.user_id
       user_recovered
     end
-    topic = Topic.with_deleted.find @post.topic_id
-    topic.update_column(:user_id, Discourse::SYSTEM_USER_ID) if !topic.user_id
-    topic.recover!(@user) if @post.is_first_post?
-    topic.update_statistics
-    Topic.publish_stats_to_clients!(topic.id, :recovered)
+
+    @topic.update_column(:user_id, Discourse::SYSTEM_USER_ID) if !@topic.user_id
+    @topic.recover!(@user) if @post.is_first_post?
+    @topic.update_statistics
+    Topic.publish_stats_to_clients!(@topic.id, :recovered)
 
     UserActionManager.post_created(@post)
     DiscourseEvent.trigger(:post_recovered, @post, @opts, @user)
-    Jobs.enqueue(:sync_topic_user_bookmarked, topic_id: topic.id) if topic
+    Jobs.enqueue(:sync_topic_user_bookmarked, topic_id: @topic.id) if @topic
     Jobs.enqueue(:notify_mailing_list_subscribers, post_id: @post.id)
 
     if @post.is_first_post?
-      UserActionManager.topic_created(topic)
-      DiscourseEvent.trigger(:topic_recovered, topic, @user)
+      UserActionManager.topic_created(@topic)
+      DiscourseEvent.trigger(:topic_recovered, @topic, @user)
       if @user.id != @post.user_id
         StaffActionLogger.new(@user).log_topic_delete_recover(
-          topic,
+          @topic,
           "recover_topic",
           @opts.slice(:context),
         )
       end
       update_imap_sync(@post, false)
+      if SiteSetting.tos_topic_id == @topic.id || SiteSetting.privacy_topic_id == @topic.id
+        Discourse.clear_urls!
+      end
     end
   end
 
@@ -194,10 +199,11 @@ class PostDestroyer
         end
       end
 
-      if @post.topic && @post.is_first_post?
-        permanent? ? @post.topic.destroy! : @post.topic.trash!(@user)
-        PublishedPage.unpublish!(@user, @post.topic) if @post.topic.published_page
+      if @topic && @post.is_first_post?
+        permanent? ? @topic.destroy! : @topic.trash!(@user)
+        PublishedPage.unpublish!(@user, @topic) if @topic.published_page
       end
+
       TopicLink.where(link_post_id: @post.id).destroy_all
       update_associated_category_latest_topic
       update_user_counts if !permanent?
@@ -281,8 +287,7 @@ class PostDestroyer
   def post_is_reviewable?
     return true if @user.staff?
 
-    topic = @post.topic || Topic.with_deleted.find(@post.topic_id)
-    Guardian.new(@user).can_review_topic?(topic) && Reviewable.exists?(target: @post)
+    Guardian.new(@user).can_review_topic?(@topic) && Reviewable.exists?(target: @post)
   end
 
   # we need topics to change if ever a post in them is deleted or created
@@ -300,13 +305,11 @@ class PostDestroyer
   def make_previous_post_the_last_one
     last_post =
       Post
-        .where("topic_id = ? and id <> ?", @post.topic_id, @post.id)
         .select(:created_at, :user_id, :post_number)
         .where("topic_id = ? and id <> ?", @post.topic_id, @post.id)
         .where.not(user_id: nil)
         .where.not(post_type: Post.types[:whisper])
         .order("created_at desc")
-        .limit(1)
         .first
 
     if last_post.present?
@@ -358,7 +361,7 @@ class PostDestroyer
   end
 
   def ignore(reviewable)
-    reviewable.perform_ignore(@user, post_was_deleted: true)
+    reviewable.perform_ignore_and_do_nothing(@user, post_was_deleted: true)
     reviewable.transition_to(:ignored, @user)
   end
 
@@ -431,8 +434,8 @@ class PostDestroyer
 
   def update_associated_category_latest_topic
     return unless @post.topic && @post.topic.category
-    unless @post.id == @post.topic.category.latest_post_id ||
-             (@post.is_first_post? && @post.topic_id == @post.topic.category.latest_topic_id)
+    if @post.id != @post.topic.category.latest_post_id &&
+         !(@post.is_first_post? && @post.topic_id == @post.topic.category.latest_topic_id)
       return
     end
 
diff --git a/lib/post_jobs_enqueuer.rb b/lib/post_jobs_enqueuer.rb
index a1c0573f084..1fae8781fcf 100644
--- a/lib/post_jobs_enqueuer.rb
+++ b/lib/post_jobs_enqueuer.rb
@@ -44,7 +44,7 @@ class PostJobsEnqueuer
   def make_visible
     return if @topic.private_message?
     return unless SiteSetting.embed_unlisted?
-    return unless @post.post_number > 1
+    return if @post.post_number == 1
     return if @topic.visible?
     return if @post.post_type != Post.types[:regular]
 
diff --git a/lib/post_revisor.rb b/lib/post_revisor.rb
index 1ce1ef284be..6ab8c9afaec 100644
--- a/lib/post_revisor.rb
+++ b/lib/post_revisor.rb
@@ -79,25 +79,30 @@ class PostRevisor
     track_and_revise topic_changes, :archetype, attribute
   end
 
-  track_topic_field(:category_id) do |tc, category_id, fields|
-    if category_id == 0 && tc.topic.private_message?
-      tc.record_change("category_id", tc.topic.category_id, nil)
+  track_topic_field(:category_id) do |tc, new_category_id, fields|
+    current_category = tc.topic.category
+    new_category =
+      (new_category_id.nil? || new_category_id.zero?) ? nil : Category.find(new_category_id)
+
+    if new_category.nil? && tc.topic.private_message?
+      tc.record_change("category_id", current_category.id, nil)
       tc.topic.category_id = nil
-    elsif category_id == 0 || tc.guardian.can_move_topic_to_category?(category_id)
+    elsif new_category.nil? || tc.guardian.can_move_topic_to_category?(new_category_id)
       tags = fields[:tags] || tc.topic.tags.map(&:name)
-      if category_id != 0 &&
-           !DiscourseTagging.validate_min_required_tags_for_category(
-             tc.guardian,
-             tc.topic,
-             Category.find(category_id),
-             tags,
-           )
+      if new_category &&
+           !DiscourseTagging.validate_category_tags(tc.guardian, tc.topic, new_category, tags)
         tc.check_result(false)
         next
       end
 
-      tc.record_change("category_id", tc.topic.category_id, category_id)
-      tc.check_result(tc.topic.change_category_to_id(category_id))
+      tc.record_change("category_id", current_category&.id, new_category&.id)
+      tc.check_result(tc.topic.change_category_to_id(new_category_id))
+      create_small_action_for_category_change(
+        topic: tc.topic,
+        user: tc.user,
+        old_category: current_category,
+        new_category: new_category,
+      )
     end
   end
 
@@ -114,14 +119,25 @@ class PostRevisor
         DB.after_commit do
           post = tc.topic.ordered_posts.first
           notified_user_ids = [post.user_id, post.last_editor_id].uniq
+
+          added_tags = tags - prev_tags
+          removed_tags = prev_tags - tags
+
           if !SiteSetting.disable_tags_edit_notifications
             Jobs.enqueue(
               :notify_tag_change,
               post_id: post.id,
               notified_user_ids: notified_user_ids,
-              diff_tags: ((tags - prev_tags) | (prev_tags - tags)),
+              diff_tags: (added_tags | removed_tags),
             )
           end
+
+          create_small_action_for_tag_changes(
+            topic: tc.topic,
+            user: tc.user,
+            added_tags: added_tags,
+            removed_tags: removed_tags,
+          )
         end
       end
     end
@@ -137,6 +153,58 @@ class PostRevisor
     end
   end
 
+  def self.create_small_action_for_category_change(topic:, user:, old_category:, new_category:)
+    return if !SiteSetting.create_post_for_category_and_tag_changes
+
+    topic.add_moderator_post(
+      user,
+      I18n.t(
+        "topic_category_changed",
+        from: category_name_raw(old_category),
+        to: category_name_raw(new_category),
+      ),
+      post_type: Post.types[:small_action],
+      action_code: "category_changed",
+    )
+  end
+
+  def self.category_name_raw(category)
+    "##{CategoryHashtagDataSource.category_to_hashtag_item(category).ref}"
+  end
+
+  def self.create_small_action_for_tag_changes(topic:, user:, added_tags:, removed_tags:)
+    return if !SiteSetting.create_post_for_category_and_tag_changes
+
+    topic.add_moderator_post(
+      user,
+      tags_changed_raw(added: added_tags, removed: removed_tags),
+      post_type: Post.types[:small_action],
+      action_code: "tags_changed",
+      custom_fields: {
+        tags_added: added_tags,
+        tags_removed: removed_tags,
+      },
+    )
+  end
+
+  def self.tags_changed_raw(added:, removed:)
+    if removed.present? && added.present?
+      I18n.t(
+        "topic_tag_changed.added_and_removed",
+        added: tag_list_to_raw(added),
+        removed: tag_list_to_raw(removed),
+      )
+    elsif added.present?
+      I18n.t("topic_tag_changed.added", added: tag_list_to_raw(added))
+    elsif removed.present?
+      I18n.t("topic_tag_changed.removed", removed: tag_list_to_raw(removed))
+    end
+  end
+
+  def self.tag_list_to_raw(tag_list)
+    tag_list.sort.map { |tag_name| "##{tag_name}" }.join(", ")
+  end
+
   # AVAILABLE OPTIONS:
   # - revised_at: changes the date of the revision
   # - force_new_version: bypass grace period edit window
@@ -298,14 +366,18 @@ class PostRevisor
 
   def should_create_new_version?
     return false if @skip_revision
-    edited_by_another_user? || !grace_period_edit? || owner_changed? || force_new_version? ||
-      edit_reason_specified?
+    edited_by_another_user? || flagged? || !grace_period_edit? || owner_changed? ||
+      force_new_version? || edit_reason_specified?
   end
 
   def edit_reason_specified?
     @fields[:edit_reason].present? && @fields[:edit_reason] != @post.edit_reason
   end
 
+  def flagged?
+    @post.is_flagged?
+  end
+
   def edited_by_another_user?
     @post.last_editor_id != @editor.id
   end
@@ -349,7 +421,6 @@ class PostRevisor
 
   def grace_period_edit?
     return false if (@revised_at - @last_version_at) > SiteSetting.editing_grace_period.to_i
-    return false if @post.reviewable_flag.present?
 
     if new_raw = @fields[:raw]
       max_diff = SiteSetting.editing_grace_period_max_diff.to_i
@@ -552,8 +623,7 @@ class PostRevisor
     if revision.modifications.empty?
       revision.destroy
       @post.last_editor_id =
-        PostRevision.where(post_id: @post.id).order(number: :desc).pluck_first(:user_id) ||
-          @post.user_id
+        PostRevision.where(post_id: @post.id).order(number: :desc).pick(:user_id) || @post.user_id
       @post.version -= 1
       @post.public_version -= 1
       @post.save(validate: @validate_post)
@@ -619,7 +689,6 @@ class PostRevisor
 
     update_topic_excerpt
     update_category_description
-    hide_welcome_topic_banner
   end
 
   def update_topic_excerpt
@@ -641,15 +710,6 @@ class PostRevisor
     end
   end
 
-  def hide_welcome_topic_banner
-    return unless guardian.is_admin?
-    return unless @topic.id == SiteSetting.welcome_topic_id
-    return unless Discourse.cache.read(Site.welcome_topic_banner_cache_key(@editor.id))
-
-    Discourse.cache.write(Site.welcome_topic_banner_cache_key(@editor.id), false)
-    MessageBus.publish("/site/welcome-topic-banner", false)
-  end
-
   def advance_draft_sequence
     @post.advance_draft_sequence
   end
@@ -702,4 +762,17 @@ class PostRevisor
   def guardian
     @guardian ||= Guardian.new(@editor)
   end
+
+  def raw_changed?
+    @fields.has_key?(:raw) && @fields[:raw] != cached_original_raw && @post_successfully_saved
+  end
+
+  def topic_title_changed?
+    topic_changed? && @fields.has_key?(:title) && topic_diff.has_key?(:title) &&
+      !@topic_changes.errored?
+  end
+
+  def reviewable_content_changed?
+    raw_changed? || topic_title_changed?
+  end
 end
diff --git a/lib/presence_channel.rb b/lib/presence_channel.rb
index ff6fa3d0f07..21da97d5b4d 100644
--- a/lib/presence_channel.rb
+++ b/lib/presence_channel.rb
@@ -104,6 +104,7 @@ class PresenceChannel
     return true if user_id && config.allowed_user_ids&.include?(user_id)
 
     if user_id && config.allowed_group_ids.present?
+      return true if config.allowed_group_ids.include?(Group::AUTO_GROUPS[:everyone])
       group_ids ||= GroupUser.where(user_id: user_id).pluck("group_id")
       return true if (group_ids & config.allowed_group_ids).present?
     end
@@ -313,7 +314,10 @@ class PresenceChannel
         else
           raise InvalidConfig.new "Expected PresenceChannel::Config or nil. Got a #{result.class.name}"
         end
-      PresenceChannel.redis.set(redis_key_config, to_cache, ex: CONFIG_CACHE_SECONDS)
+
+      DiscourseRedis.ignore_readonly do
+        PresenceChannel.redis.set(redis_key_config, to_cache, ex: CONFIG_CACHE_SECONDS)
+      end
 
       raise PresenceChannel::NotFound if result.nil?
       result
diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb
index 3ce99f7115c..f33268f2127 100644
--- a/lib/pretty_text.rb
+++ b/lib/pretty_text.rb
@@ -48,7 +48,7 @@ module PrettyText
     filename = find_file(root_path, part_name)
     if filename
       source = File.read("#{root_path}#{filename}")
-      source = ERB.new(source).result(binding) if filename =~ /\.erb$/
+      source = ERB.new(source).result(binding) if filename =~ /\.erb\z/
 
       transpiler = DiscourseJsProcessor::Transpiler.new
       transpiled = transpiler.perform(source, "#{Rails.root}/app/assets/javascripts/", part_name)
@@ -64,7 +64,7 @@ module PrettyText
   def self.ctx_load_directory(ctx, path)
     root_path = "#{Rails.root}/app/assets/javascripts/"
     Dir["#{root_path}#{path}/**/*"].sort.each do |f|
-      apply_es6_file(ctx, root_path, f.sub(root_path, "").sub(/\.js(.es6)?$/, ""))
+      apply_es6_file(ctx, root_path, f.sub(root_path, "").sub(/\.js(.es6)?\z/, ""))
     end
   end
 
@@ -104,9 +104,9 @@ module PrettyText
     apply_es6_file(ctx, root_path, "discourse-common/addon/lib/object")
     apply_es6_file(ctx, root_path, "discourse-common/addon/lib/deprecated")
     apply_es6_file(ctx, root_path, "discourse-common/addon/lib/escape")
+    apply_es6_file(ctx, root_path, "discourse-common/addon/lib/avatar-utils")
     apply_es6_file(ctx, root_path, "discourse-common/addon/utils/watched-words")
     apply_es6_file(ctx, root_path, "discourse/app/lib/to-markdown")
-    apply_es6_file(ctx, root_path, "discourse/app/lib/utilities")
 
     ctx.load("#{Rails.root}/lib/pretty_text/shims.js")
     ctx.eval("__setUnicode(#{Emoji.unicode_replacements_json})")
@@ -116,9 +116,9 @@ module PrettyText
       to_load << a if File.file?(a) && a =~ /discourse-markdown/
     end
     to_load.uniq.each do |f|
-      if f =~ %r{^.+assets/javascripts/}
+      if f =~ %r{\A.+assets/javascripts/}
         root = Regexp.last_match[0]
-        apply_es6_file(ctx, root, f.sub(root, "").sub(/\.js(\.es6)?$/, ""))
+        apply_es6_file(ctx, root, f.sub(root, "").sub(/\.js(\.es6)?\z/, ""))
       end
     end
 
@@ -202,11 +202,13 @@ module PrettyText
         __optInput.customEmoji = #{custom_emoji.to_json};
         __optInput.customEmojiTranslation = #{Plugin::CustomEmoji.translations.to_json};
         __optInput.emojiUnicodeReplacer = __emojiUnicodeReplacer;
+        __optInput.emojiDenyList = #{Emoji.denied.to_json};
         __optInput.lookupUploadUrls = __lookupUploadUrls;
-        __optInput.censoredRegexp = #{WordWatcher.serializable_word_matcher_regexp(:censor).to_json};
-        __optInput.watchedWordsReplace = #{WordWatcher.word_matcher_regexps(:replace).to_json};
-        __optInput.watchedWordsLink = #{WordWatcher.word_matcher_regexps(:link).to_json};
+        __optInput.censoredRegexp = #{WordWatcher.serializable_word_matcher_regexp(:censor, engine: :js).to_json};
+        __optInput.watchedWordsReplace = #{WordWatcher.word_matcher_regexps(:replace, engine: :js).to_json};
+        __optInput.watchedWordsLink = #{WordWatcher.word_matcher_regexps(:link, engine: :js).to_json};
         __optInput.additionalOptions = #{Site.markdown_additional_options.to_json};
+        __optInput.avatar_sizes = #{SiteSetting.avatar_sizes.to_json};
       JS
 
       buffer << "__optInput.topicId = #{opts[:topic_id].to_i};\n" if opts[:topic_id]
@@ -215,16 +217,7 @@ module PrettyText
         buffer << "__optInput.forceQuoteLink = #{opts[:force_quote_link]};\n"
       end
 
-      if opts[:user_id]
-        buffer << "__optInput.userId = #{opts[:user_id].to_i};\n"
-
-        # NOTE: If using this for server-side cooking you will end up
-        # with a Hash once it is passed to a PrettyText::Helper. If
-        # you use that hash to instanciate a User model, you will want to do
-        # user.reload before accessing data on this parsed User, otherwise
-        # AR relations will not be loaded.
-        buffer << "__optInput.currentUser = #{User.find(opts[:user_id]).to_json}\n"
-      end
+      buffer << "__optInput.userId = #{opts[:user_id].to_i};\n" if opts[:user_id]
 
       opts[:hashtag_context] = opts[:hashtag_context] || "topic-composer"
       hashtag_types_as_js =
@@ -232,10 +225,8 @@ module PrettyText
           .ordered_types_for_context(opts[:hashtag_context])
           .map { |t| "'#{t}'" }
           .join(",")
-      hashtag_icons_as_js =
-        HashtagAutocompleteService.data_source_icons.map { |i| "'#{i}'" }.join(",")
       buffer << "__optInput.hashtagTypesInPriorityOrder = [#{hashtag_types_as_js}];\n"
-      buffer << "__optInput.hashtagIcons = [#{hashtag_icons_as_js}];\n"
+      buffer << "__optInput.hashtagIcons = #{HashtagAutocompleteService.data_source_icon_map.to_json};\n"
 
       buffer << "__textOptions = __buildOptions(__optInput);\n"
       buffer << ("__pt = new __PrettyText(__textOptions);")
@@ -266,8 +257,10 @@ module PrettyText
   # leaving this here, cause it invokes v8, don't want to implement twice
   def self.avatar_img(avatar_template, size)
     protect { v8.eval(<<~JS) }
+        __optInput = {};
+        __optInput.avatar_sizes = #{SiteSetting.avatar_sizes.to_json};
         __paths = #{paths_json};
-        __utils.avatarImg({size: #{size.inspect}, avatarTemplate: #{avatar_template.inspect}}, __getURL);
+        require("discourse-common/lib/avatar-utils").avatarImg({size: #{size.inspect}, avatarTemplate: #{avatar_template.inspect}}, __getURL);
       JS
   end
 
@@ -319,7 +312,7 @@ module PrettyText
     add_mentions(doc, user_id: opts[:user_id]) if SiteSetting.enable_mentions
 
     scrubber = Loofah::Scrubber.new { |node| node.remove if node.name == "script" }
-    loofah_fragment = Loofah.fragment(doc.to_html)
+    loofah_fragment = Loofah.html5_fragment(doc.to_html)
     loofah_fragment.scrub!(scrubber).to_html
   end
 
@@ -433,13 +426,19 @@ module PrettyText
 
     # extract Youtube links
     doc
-      .css("div[data-youtube-id]")
+      .css("div[data-video-id]")
       .each do |div|
-        if div["data-youtube-id"].present?
-          links << DetectedLink.new(
-            "https://www.youtube.com/watch?v=#{div["data-youtube-id"]}",
-            false,
-          )
+        if div["data-video-id"].present? && div["data-provider-name"].present?
+          base_url =
+            case div["data-provider-name"]
+            when "youtube"
+              "https://www.youtube.com/watch?v="
+            when "vimeo"
+              "https://vimeo.com/"
+            when "tiktok"
+              "https://m.tiktok.com/v/"
+            end
+          links << DetectedLink.new(base_url + div["data-video-id"], false)
         end
       end
 
@@ -458,6 +457,9 @@ module PrettyText
           end
         end
 
+    mentions =
+      DiscoursePluginRegistry.apply_modifier(:pretty_text_extract_mentions, mentions, cooked)
+
     mentions.compact!
     mentions.uniq!
     mentions
@@ -527,7 +529,7 @@ module PrettyText
         if iframe["data-original-href"].present?
           vimeo_url = UrlHelper.normalized_encode(iframe["data-original-href"])
         else
-          vimeo_id = iframe["src"].split("/").last
+          vimeo_id = iframe["src"].split("/").last.sub("?h=", "/")
           vimeo_url = "https://vimeo.com/#{vimeo_id}"
         end
         iframe.replace Nokogiri::HTML5.fragment("<p><a href='#{vimeo_url}'>#{vimeo_url}</a></p>")
diff --git a/lib/pretty_text/helpers.rb b/lib/pretty_text/helpers.rb
index 621f59d7f8e..5f48b28bbdc 100644
--- a/lib/pretty_text/helpers.rb
+++ b/lib/pretty_text/helpers.rb
@@ -9,13 +9,10 @@ module PrettyText
     # functions here are available to v8
     def t(key, opts)
       key = "js." + key
-      unless opts
-        I18n.t(key)
-      else
-        str = I18n.t(key, Hash[opts.entries].symbolize_keys).dup
-        opts.each { |k, v| str.gsub!("{{#{k.to_s}}}", v.to_s) }
-        str
-      end
+      return I18n.t(key) if opts.blank?
+      str = I18n.t(key, Hash[opts.entries].symbolize_keys).dup
+      opts.each { |k, v| str.gsub!("{{#{k.to_s}}}", v.to_s) }
+      str
     end
 
     def avatar_template(username)
@@ -102,7 +99,7 @@ module PrettyText
     # TODO (martin) Remove this when everything is using hashtag_lookup
     # after enable_experimental_hashtag_autocomplete is default.
     def category_tag_hashtag_lookup(text)
-      is_tag = text =~ /#{TAG_HASHTAG_POSTFIX}$/
+      is_tag = text =~ /#{TAG_HASHTAG_POSTFIX}\z/
 
       if !is_tag && category = Category.query_from_hashtag_slug(text)
         [category.url, text]
@@ -128,6 +125,11 @@ module PrettyText
         cooking_user = User.find(cooking_user_id)
       end
 
+      types_in_priority_order =
+        types_in_priority_order.select do |type|
+          HashtagAutocompleteService.data_source_types.include?(type)
+        end
+
       result =
         HashtagAutocompleteService.new(Guardian.new(cooking_user)).lookup(
           [slug],
diff --git a/lib/pretty_text/shims.js b/lib/pretty_text/shims.js
index 1c54183c922..f0d7b0849f1 100644
--- a/lib/pretty_text/shims.js
+++ b/lib/pretty_text/shims.js
@@ -16,15 +16,14 @@ define("I18n", ["exports"], function (exports) {
   exports.default = I18n;
 });
 
-// Formatting doesn't currently need any helper context
 define("discourse-common/lib/helpers", ["exports"], function (exports) {
   exports.helperContext = function () {
-    return {};
+    return {
+      siteSettings: { avatar_sizes: __optInput.avatar_sizes },
+    };
   };
 });
 
-__utils = require("discourse/lib/utilities");
-
 __emojiUnicodeReplacer = null;
 
 __setUnicode = function (replacements) {
@@ -78,7 +77,7 @@ function __getURLNoCDN(url) {
     return url;
   }
 
-  if (url.includes(__paths.baseUri)) {
+  if (url.startsWith(`${__paths.baseUri}/`) || url === __paths.baseUri) {
     return url;
   }
   if (url[0] !== "/") {
@@ -118,7 +117,7 @@ function __hashtagLookup(slug, cookingUserId, typesInPriorityOrder) {
 }
 
 function __lookupAvatar(p) {
-  return __utils.avatarImg(
+  return require("discourse-common/lib/avatar-utils").avatarImg(
     { size: "tiny", avatarTemplate: __helpers.avatar_template(p) },
     __getURL
   );
diff --git a/lib/promotion.rb b/lib/promotion.rb
index b817ae64414..f18b4924c5d 100644
--- a/lib/promotion.rb
+++ b/lib/promotion.rb
@@ -82,6 +82,7 @@ class Promotion
           new_value: new_level,
         )
       end
+      @user.skip_email_validation = true
       @user.save!
       @user.user_profile.recook_bio
       @user.user_profile.save!
@@ -133,17 +134,23 @@ class Promotion
   # Figure out what a user's trust level should be from scratch
   def self.recalculate(user, performed_by = nil, use_previous_trust_level: false)
     granted_trust_level =
-      TrustLevel.calculate(user, use_previous_trust_level: use_previous_trust_level)
-    return user.update(trust_level: granted_trust_level) if granted_trust_level.present?
+      TrustLevel.calculate(user, use_previous_trust_level: use_previous_trust_level) ||
+        TrustLevel[0]
 
-    user.update_column(:trust_level, TrustLevel[0])
+    # TrustLevel.calculate always returns a value, however we added extra protection just
+    # in case this changes
+    user.update_column(:trust_level, TrustLevel[granted_trust_level])
 
-    p = Promotion.new(user)
-    p.review_tl0
-    p.review_tl1
-    p.review_tl2
-    if user.trust_level == 3 && Promotion.tl3_lost?(user)
-      user.change_trust_level!(2, log_action_for: performed_by || Discourse.system_user)
+    return if user.manual_locked_trust_level.present?
+
+    promotion = Promotion.new(user)
+
+    promotion.review_tl0 if granted_trust_level < TrustLevel[1]
+    promotion.review_tl1 if granted_trust_level < TrustLevel[2]
+    promotion.review_tl2 if granted_trust_level < TrustLevel[3]
+
+    if user.trust_level == TrustLevel[3] && Promotion.tl3_lost?(user)
+      user.change_trust_level!(TrustLevel[2], log_action_for: performed_by || Discourse.system_user)
     end
   end
 end
diff --git a/lib/quote_rewriter.rb b/lib/quote_rewriter.rb
new file mode 100644
index 00000000000..a316b81ca2d
--- /dev/null
+++ b/lib/quote_rewriter.rb
@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+class QuoteRewriter
+  def initialize(user_id)
+    @user_id = user_id
+  end
+
+  def rewrite_raw_username(raw, old_username, new_username)
+    pattern =
+      Regexp.union(
+        /(?<pre>\[quote\s*=\s*["'']?.*username:)#{old_username}(?<post>\,?[^\]]*\])/i,
+        /(?<pre>\[quote\s*=\s*["'']?)#{old_username}(?<post>\,?[^\]]*\])/i,
+      )
+
+    raw.gsub(pattern, "\\k<pre>#{new_username}\\k<post>")
+  end
+
+  def rewrite_cooked_username(cooked, old_username, new_username, avatar_img)
+    pattern = /(?<=\s)#{PrettyText::Helpers.format_username(old_username)}(?=:)/i
+
+    cooked
+      .css("aside.quote")
+      .each do |aside|
+        next unless div = aside.at_css("div.title")
+
+        username_replaced = false
+
+        aside["data-username"] = new_username if aside["data-username"] == old_username
+
+        div.children.each do |child|
+          if child.text?
+            content = child.content
+            username_replaced = content.gsub!(pattern, new_username).present?
+            child.content = content if username_replaced
+          end
+        end
+
+        if username_replaced || quotes_correct_user?(aside)
+          div.at_css("img.avatar")&.replace(avatar_img)
+        end
+      end
+  end
+
+  def rewrite_raw_display_name(raw, old_display_name, new_display_name)
+    pattern = /(?<pre>\[quote\s*=\s*["'']?)#{old_display_name}(?<post>\,[^\]]*username[^\]]*\])/i
+
+    raw.gsub(pattern, "\\k<pre>#{new_display_name}\\k<post>")
+  end
+
+  def rewrite_cooked_display_name(cooked, old_display_name, new_display_name)
+    pattern = /(?<=\s)#{PrettyText::Helpers.format_username(old_display_name)}(?=:)/i
+
+    cooked
+      .css("aside.quote")
+      .each do |aside|
+        next unless div = aside.at_css("div.title")
+
+        div.children.each do |child|
+          if child.text?
+            content = child.content
+            display_name_replaced = content.gsub!(pattern, new_display_name).present?
+            child.content = content if display_name_replaced
+          end
+        end
+      end
+  end
+
+  private
+
+  attr_reader :user_id
+
+  def quotes_correct_user?(aside)
+    Post.exists?(topic_id: aside["data-topic"], post_number: aside["data-post"], user_id: user_id)
+  end
+end
diff --git a/lib/rate_limiter.rb b/lib/rate_limiter.rb
index 2604d6dcff8..29479977225 100644
--- a/lib/rate_limiter.rb
+++ b/lib/rate_limiter.rb
@@ -23,11 +23,6 @@ class RateLimiter
     @disabled
   end
 
-  # Only used in test, only clears current namespace, does not clear globals
-  def self.clear_all!
-    Discourse.redis.delete_prefixed(RateLimiter.key_prefix)
-  end
-
   def self.clear_all_global!
     Discourse
       .redis
diff --git a/lib/require_dependency_backward_compatibility.rb b/lib/require_dependency_backward_compatibility.rb
index 5b550e45d37..b5e3e0248d7 100644
--- a/lib/require_dependency_backward_compatibility.rb
+++ b/lib/require_dependency_backward_compatibility.rb
@@ -14,7 +14,7 @@ module RequireDependencyBackwardCompatibility
   def require_dependency(filename)
     name = filename.to_s
     return if name == "jobs/base"
-    return super(name.sub(%r{^lib/}, "")) if name.start_with?("lib/")
+    return super(name.sub(%r{\Alib/}, "")) if name.start_with?("lib/")
     super
   end
 
diff --git a/lib/retrieve_title.rb b/lib/retrieve_title.rb
index 826792650f4..8ea76ecec29 100644
--- a/lib/retrieve_title.rb
+++ b/lib/retrieve_title.rb
@@ -9,7 +9,7 @@ module RetrieveTitle
       max_redirects: max_redirects,
       initial_https_redirect_ignore_limit: initial_https_redirect_ignore_limit,
     )
-  rescue Net::ReadTimeout, FinalDestination::SSRFDetector::LookupFailedError
+  rescue Net::ReadTimeout, FinalDestination::SSRFError
     # do nothing for Net::ReadTimeout errors
   end
 
@@ -32,7 +32,7 @@ module RetrieveTitle
       # A horrible hack - YouTube uses `document.title` to populate the title
       # for some reason. For any other site than YouTube this wouldn't be worth it.
       if title == "YouTube" && html =~ /document\.title *= *"(.*)";/
-        title = Regexp.last_match[1].sub(/ - YouTube$/, "")
+        title = Regexp.last_match[1].sub(/ - YouTube\z/, "")
       end
 
       if !title && node = doc.at('meta[property="og:title"]')
@@ -53,11 +53,12 @@ module RetrieveTitle
 
   def self.max_chunk_size(uri)
     # Exception for sites that leave the title until very late.
-    if uri.host =~ /(^|\.)amazon\.(com|ca|co\.uk|es|fr|de|it|com\.au|com\.br|cn|in|co\.jp|com\.mx)$/
+    if uri.host =~
+         /(^|\.)amazon\.(com|ca|co\.uk|es|fr|de|it|com\.au|com\.br|cn|in|co\.jp|com\.mx)\z/
       return 500
     end
-    return 300 if uri.host =~ /(^|\.)youtube\.com$/ || uri.host =~ /(^|\.)youtu\.be$/
-    return 50 if uri.host =~ /(^|\.)github\.com$/
+    return 300 if uri.host =~ /(^|\.)youtube\.com\z/ || uri.host =~ /(^|\.)youtu\.be\z/
+    return 50 if uri.host =~ /(^|\.)github\.com\z/
 
     # default is 20k
     20
diff --git a/lib/route_matcher.rb b/lib/route_matcher.rb
index 6512f7942f1..2c466055556 100644
--- a/lib/route_matcher.rb
+++ b/lib/route_matcher.rb
@@ -46,7 +46,7 @@ class RouteMatcher
     return true if actions.nil? # actions are unrestricted
 
     # message_bus is not a rails route, special handling
-    return true if actions.include?("message_bus") && request.fullpath =~ %r{^/message-bus/.*/poll}
+    return true if actions.include?("message_bus") && request.fullpath =~ %r{\A/message-bus/.*/poll}
 
     path_params = path_params_from_request(request)
     actions.include? "#{path_params[:controller]}##{path_params[:action]}"
@@ -59,7 +59,7 @@ class RouteMatcher
 
     params.all? do |param|
       param_alias = aliases&.[](param)
-      allowed_values = [allowed_param_values[param.to_s]].flatten
+      allowed_values = [allowed_param_values.fetch(param.to_s, [])].flatten
 
       value = requested_params[param.to_s]
       alias_value = requested_params[param_alias.to_s]
diff --git a/lib/s3_helper.rb b/lib/s3_helper.rb
index f8082f04caf..b3d98c40a68 100644
--- a/lib/s3_helper.rb
+++ b/lib/s3_helper.rb
@@ -175,12 +175,9 @@ class S3Helper
           cors_rules: final_rules,
         },
       )
-    rescue Aws::S3::Errors::AccessDenied => err
-      # TODO (martin) Remove this warning log level once we are sure this new
-      # ensure_cors! rule is functioning correctly.
-      Discourse.warn_exception(
-        err,
-        message: "Could not PutBucketCors rules for #{@s3_bucket_name}, rules: #{final_rules}",
+    rescue Aws::S3::Errors::AccessDenied
+      Rails.logger.info(
+        "Could not PutBucketCors rules for #{@s3_bucket_name}, rules: #{final_rules}",
       )
       return false
     end
@@ -296,7 +293,7 @@ class S3Helper
   def create_multipart(key, content_type, metadata: {})
     response =
       s3_client.create_multipart_upload(
-        acl: "private",
+        acl: SiteSetting.s3_use_acls ? "private" : nil,
         bucket: s3_bucket_name,
         key: key,
         content_type: content_type,
diff --git a/lib/s3_inventory.rb b/lib/s3_inventory.rb
index 91da944b927..3b9f4391e77 100644
--- a/lib/s3_inventory.rb
+++ b/lib/s3_inventory.rb
@@ -334,7 +334,7 @@ class S3Inventory
     objects = []
 
     hive_path = File.join(inventory_path, bucket_name, inventory_id, "hive")
-    @s3_helper.list(hive_path).each { |obj| objects << obj if obj.key.match?(/symlink\.txt$/i) }
+    @s3_helper.list(hive_path).each { |obj| objects << obj if obj.key.match?(/symlink\.txt\z/i) }
 
     objects
   rescue Aws::Errors::ServiceError => e
diff --git a/lib/scheduler/defer.rb b/lib/scheduler/defer.rb
index a44197216c4..0389fa2571a 100644
--- a/lib/scheduler/defer.rb
+++ b/lib/scheduler/defer.rb
@@ -4,6 +4,7 @@ require "weakref"
 module Scheduler
   module Deferrable
     DEFAULT_TIMEOUT ||= 90
+    STATS_CACHE_SIZE ||= 100
 
     def initialize
       @async = !Rails.env.test?
@@ -13,10 +14,12 @@ module Scheduler
         )
 
       @mutex = Mutex.new
+      @stats_mutex = Mutex.new
       @paused = false
       @thread = nil
       @reactor = nil
       @timeout = DEFAULT_TIMEOUT
+      @stats = LruRedux::ThreadSafeCache.new(STATS_CACHE_SIZE)
     end
 
     def timeout=(t)
@@ -27,6 +30,10 @@ module Scheduler
       @queue.size
     end
 
+    def stats
+      @stats_mutex.synchronize { @stats.to_a }
+    end
+
     def pause
       stop!
       @paused = true
@@ -42,6 +49,11 @@ module Scheduler
     end
 
     def later(desc = nil, db = RailsMultisite::ConnectionManagement.current_db, force: true, &blk)
+      @stats_mutex.synchronize do
+        stats = (@stats[desc] ||= { queued: 0, finished: 0, duration: 0, errors: 0 })
+        stats[:queued] += 1
+      end
+
       if @async
         start_thread if !@thread&.alive? && !@paused
         @queue.push({ key: db, task: [db, blk, desc] }, force: force)
@@ -71,13 +83,19 @@ module Scheduler
     def start_thread
       @mutex.synchronize do
         @reactor = MessageBus::TimerThread.new if !@reactor
-        @thread = Thread.new { do_work while true } if !@thread&.alive?
+        @thread =
+          Thread.new do
+            @thread.abort_on_exception = true if Rails.env.test?
+            do_work while true
+          end if !@thread&.alive?
       end
     end
 
     # using non_block to match Ruby #deq
     def do_work(non_block = false)
       db, job, desc = @queue.shift(block: !non_block)[:task]
+
+      start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
       db ||= RailsMultisite::ConnectionManagement::DEFAULT
 
       RailsMultisite::ConnectionManagement.with_connection(db) do
@@ -88,6 +106,10 @@ module Scheduler
             end if !non_block
           job.call
         rescue => ex
+          @stats_mutex.synchronize do
+            stats = @stats[desc]
+            stats[:errors] += 1 if stats
+          end
           Discourse.handle_job_exception(ex, message: "Running deferred code '#{desc}'")
         ensure
           warning_job&.cancel
@@ -97,6 +119,15 @@ module Scheduler
       Discourse.handle_job_exception(ex, message: "Processing deferred code queue")
     ensure
       ActiveRecord::Base.connection_handler.clear_active_connections!
+      if start
+        @stats_mutex.synchronize do
+          stats = @stats[desc]
+          if stats
+            stats[:finished] += 1
+            stats[:duration] += Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
+          end
+        end
+      end
     end
   end
 
diff --git a/lib/search.rb b/lib/search.rb
index e81b7ab0d93..05f09dbff00 100644
--- a/lib/search.rb
+++ b/lib/search.rb
@@ -20,7 +20,7 @@ class Search
   end
 
   def self.per_filter
-    50
+    SiteSetting.search_page_size
   end
 
   def self.facets
@@ -89,9 +89,25 @@ class Search
       Regexp.compile("[-–—―.。・（）()［］｛｝{}【】⟨⟩、､,，،…‥〽「」『』〜~！!：:？?\"'|_＿“”‘’;/⁄／«»]")
   end
 
+  def self.clean_term(term)
+    term = term.to_s.dup
+
+    # Removes any zero-width characters from search terms
+    term.gsub!(/[\u200B-\u200D\uFEFF]/, "")
+
+    # Replace curly quotes to regular quotes
+    term.gsub!(/[\u201c\u201d]/, '"')
+
+    # Replace fancy apostophes to regular apostophes
+    term.gsub!(/[\u02b9\u02bb\u02bc\u02bd\u02c8\u2018\u2019\u201b\u2032\uff07]/, "'")
+
+    term
+  end
+
   def self.prepare_data(search_data, purpose = nil)
     data = search_data.dup
     data.force_encoding("UTF-8")
+    data = clean_term(data)
 
     if purpose != :topic
       if segment_chinese?
@@ -128,7 +144,7 @@ class Search
     end
 
     data.gsub!(/\S+/) do |str|
-      if str =~ %r{^["]?((https?://)[\S]+)["]?$}
+      if str =~ %r{\A["]?((https?://)[\S]+)["]?\z}
         begin
           uri = URI.parse(Regexp.last_match[1])
           uri.query = nil
@@ -145,9 +161,9 @@ class Search
   end
 
   def self.word_to_date(str)
-    return Time.zone.now.beginning_of_day.days_ago(str.to_i) if str =~ /^[0-9]{1,3}$/
+    return Time.zone.now.beginning_of_day.days_ago(str.to_i) if str =~ /\A[0-9]{1,3}\z/
 
-    if str =~ /^([12][0-9]{3})(-([0-1]?[0-9]))?(-([0-3]?[0-9]))?$/
+    if str =~ /\A([12][0-9]{3})(-([0-1]?[0-9]))?(-([0-3]?[0-9]))?\z/
       year = $1.to_i
       month = $2 ? $3.to_i : 1
       day = $4 ? $5.to_i : 1
@@ -214,12 +230,7 @@ class Search
     @page = @opts[:page]
     @search_all_pms = false
 
-    term = term.to_s.dup
-
-    # Removes any zero-width characters from search terms
-    term.gsub!(/[\u200B-\u200D\uFEFF]/, "")
-    # Replace curly quotes to regular quotes
-    term.gsub!(/[\u201c\u201d]/, '"')
+    term = Search.clean_term(term)
 
     @clean_term = term
     @in_title = false
@@ -307,7 +318,7 @@ class Search
 
     # If the term is a number or url to a topic, just include that topic
     if @opts[:search_for_id] && %w[topic private_messages all_topics].include?(@results.type_filter)
-      if @term =~ /^\d+$/
+      if @term =~ /\A\d+\z/
         single_topic(@term.to_i)
       else
         if route = Discourse.route_for(@term)
@@ -355,7 +366,7 @@ class Search
     Array.wrap(@custom_topic_eager_loads)
   end
 
-  advanced_filter(/^in:personal-direct$/i) do |posts|
+  advanced_filter(/\Ain:personal-direct\z/i) do |posts|
     if @guardian.user
       posts.joins("LEFT JOIN topic_allowed_groups tg ON posts.topic_id = tg.topic_id").where(
         <<~SQL,
@@ -376,61 +387,61 @@ class Search
     end
   end
 
-  advanced_filter(/^in:all-pms$/i) { |posts| posts.private_posts if @guardian.is_admin? }
+  advanced_filter(/\Ain:all-pms\z/i) { |posts| posts.private_posts if @guardian.is_admin? }
 
-  advanced_filter(/^in:tagged$/i) do |posts|
+  advanced_filter(/\Ain:tagged\z/i) do |posts|
     posts.where("EXISTS (SELECT 1 FROM topic_tags WHERE topic_tags.topic_id = posts.topic_id)")
   end
 
-  advanced_filter(/^in:untagged$/i) do |posts|
+  advanced_filter(/\Ain:untagged\z/i) do |posts|
     posts.joins(
       "LEFT JOIN topic_tags ON
         topic_tags.topic_id = posts.topic_id",
     ).where("topic_tags.id IS NULL")
   end
 
-  advanced_filter(/^status:open$/i) do |posts|
+  advanced_filter(/\Astatus:open\z/i) do |posts|
     posts.where("NOT topics.closed AND NOT topics.archived")
   end
 
-  advanced_filter(/^status:closed$/i) { |posts| posts.where("topics.closed") }
+  advanced_filter(/\Astatus:closed\z/i) { |posts| posts.where("topics.closed") }
 
-  advanced_filter(/^status:public$/i) do |posts|
+  advanced_filter(/\Astatus:public\z/i) do |posts|
     category_ids = Category.where(read_restricted: false).pluck(:id)
 
     posts.where("topics.category_id in (?)", category_ids)
   end
 
-  advanced_filter(/^status:archived$/i) { |posts| posts.where("topics.archived") }
+  advanced_filter(/\Astatus:archived\z/i) { |posts| posts.where("topics.archived") }
 
-  advanced_filter(/^status:noreplies$/i) { |posts| posts.where("topics.posts_count = 1") }
+  advanced_filter(/\Astatus:noreplies\z/i) { |posts| posts.where("topics.posts_count = 1") }
 
-  advanced_filter(/^status:single_user$/i) { |posts| posts.where("topics.participant_count = 1") }
+  advanced_filter(/\Astatus:single_user\z/i) { |posts| posts.where("topics.participant_count = 1") }
 
-  advanced_filter(/^posts_count:(\d+)$/i) do |posts, match|
+  advanced_filter(/\Aposts_count:(\d+)\z/i) do |posts, match|
     posts.where("topics.posts_count = ?", match.to_i)
   end
 
-  advanced_filter(/^min_post_count:(\d+)$/i) do |posts, match|
+  advanced_filter(/\Amin_post_count:(\d+)\z/i) do |posts, match|
     posts.where("topics.posts_count >= ?", match.to_i)
   end
 
-  advanced_filter(/^min_posts:(\d+)$/i) do |posts, match|
+  advanced_filter(/\Amin_posts:(\d+)\z/i) do |posts, match|
     posts.where("topics.posts_count >= ?", match.to_i)
   end
 
-  advanced_filter(/^max_posts:(\d+)$/i) do |posts, match|
+  advanced_filter(/\Amax_posts:(\d+)\z/i) do |posts, match|
     posts.where("topics.posts_count <= ?", match.to_i)
   end
 
-  advanced_filter(/^in:first|^f$/i) { |posts| posts.where("posts.post_number = 1") }
+  advanced_filter(/\Ain:first|^f\z/i) { |posts| posts.where("posts.post_number = 1") }
 
-  advanced_filter(/^in:pinned$/i) { |posts| posts.where("topics.pinned_at IS NOT NULL") }
+  advanced_filter(/\Ain:pinned\z/i) { |posts| posts.where("topics.pinned_at IS NOT NULL") }
 
-  advanced_filter(/^in:wiki$/i) { |posts, match| posts.where(wiki: true) }
+  advanced_filter(/\Ain:wiki\z/i) { |posts, match| posts.where(wiki: true) }
 
-  advanced_filter(/^badge:(.*)$/i) do |posts, match|
-    badge_id = Badge.where("name ilike ? OR id = ?", match, match.to_i).pluck_first(:id)
+  advanced_filter(/\Abadge:(.*)\z/i) do |posts, match|
+    badge_id = Badge.where("name ilike ? OR id = ?", match, match.to_i).pick(:id)
     if badge_id
       posts.where(
         "posts.user_id IN (SELECT ub.user_id FROM user_badges ub WHERE ub.badge_id = ?)",
@@ -454,7 +465,7 @@ class Search
     )
   end
 
-  advanced_filter(/^in:(likes)$/i) do |posts, match|
+  advanced_filter(/\Ain:(likes)\z/i) do |posts, match|
     post_action_type_filter(posts, PostActionType.types[:like]) if @guardian.user
   end
 
@@ -462,7 +473,7 @@ class Search
   # this at some point, as it only acts on posts at the moment. On the other
   # hand, this may not be necessary, as the user bookmark list has advanced
   # search based on a RegisteredBookmarkable's #search_query method.
-  advanced_filter(/^in:(bookmarks)$/i) do |posts, match|
+  advanced_filter(/\Ain:(bookmarks)\z/i) do |posts, match|
     posts.where(<<~SQL, @guardian.user.id) if @guardian.user
         posts.id IN (
           SELECT bookmarkable_id FROM bookmarks
@@ -471,20 +482,20 @@ class Search
       SQL
   end
 
-  advanced_filter(/^in:posted$/i) do |posts|
+  advanced_filter(/\Ain:posted\z/i) do |posts|
     posts.where("posts.user_id = ?", @guardian.user.id) if @guardian.user
   end
 
-  advanced_filter(/^in:(created|mine)$/i) do |posts|
+  advanced_filter(/\Ain:(created|mine)\z/i) do |posts|
     posts.where(user_id: @guardian.user.id, post_number: 1) if @guardian.user
   end
 
-  advanced_filter(/^created:@(.*)$/i) do |posts, match|
-    user_id = User.where(username: match.downcase).pluck_first(:id)
+  advanced_filter(/\Acreated:@(.*)\z/i) do |posts, match|
+    user_id = User.where(username: match.downcase).pick(:id)
     posts.where(user_id: user_id, post_number: 1)
   end
 
-  advanced_filter(/^in:(watching|tracking)$/i) do |posts, match|
+  advanced_filter(/\Ain:(watching|tracking)\z/i) do |posts, match|
     if @guardian.user
       level = TopicUser.notification_levels[match.downcase.to_sym]
       posts.where(
@@ -499,7 +510,7 @@ class Search
     end
   end
 
-  advanced_filter(/^in:seen$/i) do |posts|
+  advanced_filter(/\Ain:seen\z/i) do |posts|
     if @guardian.user
       posts.joins(
         "INNER JOIN post_timings ON
@@ -511,7 +522,7 @@ class Search
     end
   end
 
-  advanced_filter(/^in:unseen$/i) do |posts|
+  advanced_filter(/\Ain:unseen\z/i) do |posts|
     if @guardian.user
       posts.joins(
         "LEFT JOIN post_timings ON
@@ -523,9 +534,9 @@ class Search
     end
   end
 
-  advanced_filter(/^with:images$/i) { |posts| posts.where("posts.image_upload_id IS NOT NULL") }
+  advanced_filter(/\Awith:images\z/i) { |posts| posts.where("posts.image_upload_id IS NOT NULL") }
 
-  advanced_filter(/^category:(.+)$/i) do |posts, match|
+  advanced_filter(/\Acategory:(.+)\z/i) do |posts, match|
     exact = false
 
     if match[0] == "="
@@ -544,7 +555,7 @@ class Search
     end
   end
 
-  advanced_filter(/^\#([\p{L}\p{M}0-9\-:=]+)$/i) do |posts, match|
+  advanced_filter(/\A\#([\p{L}\p{M}0-9\-:=]+)\z/i) do |posts, match|
     category_slug, subcategory_slug = match.to_s.split(":")
     next unless category_slug
 
@@ -563,12 +574,12 @@ class Search
             parent_category_id:
               Category.where("lower(slug) = ?", category_slug.downcase).select(:id),
           )
-          .pluck_first(:id)
+          .pick(:id)
       else
         Category
           .where("lower(slug) = ?", category_slug.downcase)
           .order("case when parent_category_id is null then 0 else 1 end")
-          .pluck_first(:id)
+          .pick(:id)
       end
 
     if category_id
@@ -579,7 +590,7 @@ class Search
       posts.where("topics.category_id IN (?)", category_ids)
     else
       # try a possible tag match
-      tag_id = Tag.where_name(category_slug).pluck_first(:id)
+      tag_id = Tag.where_name(category_slug).pick(:id)
       if (tag_id)
         posts.where(<<~SQL, tag_id)
           topics.id IN (
@@ -614,13 +625,18 @@ class Search
     end
   end
 
-  advanced_filter(/^group:(.+)$/i) do |posts, match|
-    group_id =
+  advanced_filter(/\Agroup:(.+)\z/i) do |posts, match|
+    group_query =
       Group
         .visible_groups(@guardian.user)
         .members_visible_groups(@guardian.user)
-        .where("name ilike ? OR (id = ? AND id > 0)", match, match.to_i)
-        .pluck_first(:id)
+        .where("groups.name ILIKE ? OR (groups.id = ? AND groups.id > 0)", match, match.to_i)
+
+    DiscoursePluginRegistry.search_groups_set_query_callbacks.each do |cb|
+      group_query = cb.call(group_query, @term, @guardian)
+    end
+
+    group_id = group_query.pick(:id)
 
     if group_id
       posts.where(
@@ -632,14 +648,14 @@ class Search
     end
   end
 
-  advanced_filter(/^group_messages:(.+)$/i) do |posts, match|
+  advanced_filter(/\Agroup_messages:(.+)\z/i) do |posts, match|
     group_id =
       Group
         .visible_groups(@guardian.user)
         .members_visible_groups(@guardian.user)
         .where(has_messages: true)
         .where("name ilike ? OR (id = ? AND id > 0)", match, match.to_i)
-        .pluck_first(:id)
+        .pick(:id)
 
     if group_id
       posts.where(
@@ -651,12 +667,12 @@ class Search
     end
   end
 
-  advanced_filter(/^user:(.+)$/i) do |posts, match|
+  advanced_filter(/\Auser:(.+)\z/i) do |posts, match|
     user_id =
       User
         .where(staged: false)
         .where("username_lower = ? OR id = ?", match.downcase, match.to_i)
-        .pluck_first(:id)
+        .pick(:id)
     if user_id
       posts.where("posts.user_id = ?", user_id)
     else
@@ -664,10 +680,10 @@ class Search
     end
   end
 
-  advanced_filter(/^\@(\S+)$/i) do |posts, match|
+  advanced_filter(/\A\@(\S+)\z/i) do |posts, match|
     username = User.normalize_username(match)
 
-    user_id = User.not_staged.where(username_lower: username).pluck_first(:id)
+    user_id = User.not_staged.where(username_lower: username).pick(:id)
 
     user_id = @guardian.user&.id if !user_id && username == "me"
 
@@ -678,7 +694,7 @@ class Search
     end
   end
 
-  advanced_filter(/^before:(.*)$/i) do |posts, match|
+  advanced_filter(/\Abefore:(.*)\z/i) do |posts, match|
     if date = Search.word_to_date(match)
       posts.where("posts.created_at < ?", date)
     else
@@ -686,7 +702,7 @@ class Search
     end
   end
 
-  advanced_filter(/^after:(.*)$/i) do |posts, match|
+  advanced_filter(/\Aafter:(.*)\z/i) do |posts, match|
     if date = Search.word_to_date(match)
       posts.where("posts.created_at > ?", date)
     else
@@ -694,15 +710,15 @@ class Search
     end
   end
 
-  advanced_filter(/^tags?:([\p{L}\p{M}0-9,\-_+]+)$/i) do |posts, match|
+  advanced_filter(/\Atags?:([\p{L}\p{M}0-9,\-_+]+)\z/i) do |posts, match|
     search_tags(posts, match, positive: true)
   end
 
-  advanced_filter(/^\-tags?:([\p{L}\p{M}0-9,\-_+]+)$/i) do |posts, match|
+  advanced_filter(/\A\-tags?:([\p{L}\p{M}0-9,\-_+]+)\z/i) do |posts, match|
     search_tags(posts, match, positive: false)
   end
 
-  advanced_filter(/^filetypes?:([a-zA-Z0-9,\-_]+)$/i) do |posts, match|
+  advanced_filter(/\Afiletypes?:([a-zA-Z0-9,\-_]+)\z/i) do |posts, match|
     file_extensions = match.split(",").map(&:downcase)
     posts.where(
       "posts.id IN (
@@ -721,11 +737,11 @@ class Search
     )
   end
 
-  advanced_filter(/^min_views:(\d+)$/i) do |posts, match|
+  advanced_filter(/\Amin_views:(\d+)\z/i) do |posts, match|
     posts.where("topics.views >= ?", match.to_i)
   end
 
-  advanced_filter(/^max_views:(\d+)$/i) do |posts, match|
+  advanced_filter(/\Amax_views:(\d+)\z/i) do |posts, match|
     posts.where("topics.views <= ?", match.to_i)
   end
 
@@ -784,38 +800,38 @@ class Search
         if word == "l"
           @order = :latest
           nil
-        elsif word =~ /^order:\w+$/i
+        elsif word =~ /\Aorder:\w+\z/i
           @order = word.downcase.gsub("order:", "").to_sym
           nil
-        elsif word =~ /^in:title$/i || word == "t"
+        elsif word =~ /\Ain:title\z/i || word == "t"
           @in_title = true
           nil
-        elsif word =~ /^topic:(\d+)$/i
+        elsif word =~ /\Atopic:(\d+)\z/i
           topic_id = $1.to_i
           if topic_id > 1
             topic = Topic.find_by(id: topic_id)
             @search_context = topic if @guardian.can_see?(topic)
           end
           nil
-        elsif word =~ /^in:all$/i
+        elsif word =~ /\Ain:all\z/i
           @search_all_topics = true
           nil
-        elsif word =~ /^in:personal$/i
+        elsif word =~ /\Ain:personal\z/i
           @search_pms = true
           nil
-        elsif word =~ /^in:messages$/i
+        elsif word =~ /\Ain:messages\z/i
           @search_pms = true
           nil
-        elsif word =~ /^in:personal-direct$/i
+        elsif word =~ /\Ain:personal-direct\z/i
           @search_pms = true
           nil
-        elsif word =~ /^in:all-pms$/i
+        elsif word =~ /\Ain:all-pms\z/i
           @search_all_pms = true
           nil
-        elsif word =~ /^group_messages:(.+)$/i
+        elsif word =~ /\Agroup_messages:(.+)\z/i
           @search_pms = true
           nil
-        elsif word =~ /^personal_messages:(.+)$/i
+        elsif word =~ /\Apersonal_messages:(.+)\z/i
           if user = User.find_by_username($1)
             @search_pms = true
             @search_context = user
@@ -944,11 +960,17 @@ class Search
   end
 
   def groups_search
-    groups =
-      Group
-        .visible_groups(@guardian.user, "name ASC", include_everyone: false)
-        .where("name ILIKE :term OR full_name ILIKE :term", term: "%#{@term}%")
-        .limit(limit)
+    group_query =
+      Group.visible_groups(@guardian.user, "groups.name ASC", include_everyone: false).where(
+        "groups.name ILIKE :term OR groups.full_name ILIKE :term",
+        term: "%#{@term}%",
+      )
+
+    DiscoursePluginRegistry.search_groups_set_query_callbacks.each do |cb|
+      group_query = cb.call(group_query, @term, @guardian)
+    end
+
+    groups = group_query.limit(limit)
 
     groups.each { |group| @results.add(group) }
   end
@@ -1102,12 +1124,24 @@ class Search
       else
         posts = posts.reorder("posts.created_at DESC")
       end
+    elsif @order == :oldest
+      if aggregate_search
+        posts = posts.order("MAX(posts.created_at) ASC")
+      else
+        posts = posts.reorder("posts.created_at ASC")
+      end
     elsif @order == :latest_topic
       if aggregate_search
         posts = posts.order("MAX(topics.created_at) DESC")
       else
         posts = posts.order("topics.created_at DESC")
       end
+    elsif @order == :oldest_topic
+      if aggregate_search
+        posts = posts.order("MAX(topics.created_at) ASC")
+      else
+        posts = posts.order("topics.created_at ASC")
+      end
     elsif @order == :views
       if aggregate_search
         posts = posts.order("MAX(topics.views) DESC")
@@ -1121,13 +1155,13 @@ class Search
         posts = posts.order("posts.like_count DESC")
       end
     elsif !is_topic_search
-      rank = <<~SQL
-      TS_RANK_CD(
-        post_search_data.search_data,
-        #{@term.blank? ? "" : ts_query(weight_filter: weights)},
-        #{SiteSetting.search_ranking_normalization}|32
-      )
-      SQL
+      exact_rank = nil
+
+      if SiteSetting.prioritize_exact_search_title_match
+        exact_rank = ts_rank_cd(weight_filter: "A", prefix_match: false)
+      end
+
+      rank = ts_rank_cd(weight_filter: weights)
 
       if type_filter != "private_messages"
         category_search_priority = <<~SQL
@@ -1142,22 +1176,48 @@ class Search
         )
         SQL
 
+        rank_sort_priorities = [["topics.archived", 0.85], ["topics.closed", 0.9]]
+
+        rank_sort_priorities =
+          DiscoursePluginRegistry.apply_modifier(
+            :search_rank_sort_priorities,
+            rank_sort_priorities,
+            self,
+          )
+
         category_priority_weights = <<~SQL
-        (
-          CASE categories.search_priority
-          WHEN #{Searchable::PRIORITIES[:low]}
-          THEN #{SiteSetting.category_search_priority_low_weight}
-          WHEN #{Searchable::PRIORITIES[:high]}
-          THEN #{SiteSetting.category_search_priority_high_weight}
-          ELSE
-            CASE WHEN topics.closed
-            THEN 0.9
-            ELSE 1
+          (
+            CASE categories.search_priority
+              WHEN #{Searchable::PRIORITIES[:low]}
+              THEN #{SiteSetting.category_search_priority_low_weight.to_f}
+              WHEN #{Searchable::PRIORITIES[:high]}
+              THEN #{SiteSetting.category_search_priority_high_weight.to_f}
+              ELSE 1.0
             END
-          END
-        )
+            *
+            CASE
+              #{rank_sort_priorities.sort_by { |_, pri| -pri }.map { |k, v| "WHEN #{k} THEN #{v}" }.join("\n")}
+              ELSE 1.0
+            END
+          )
         SQL
 
+        posts =
+          if aggregate_search
+            posts.order("MAX(#{category_search_priority}) DESC")
+          else
+            posts.order("#{category_search_priority} DESC")
+          end
+
+        if @term.present? && exact_rank
+          posts =
+            if aggregate_search
+              posts.order("MAX(#{exact_rank} * #{category_priority_weights}) DESC")
+            else
+              posts.order("#{exact_rank} * #{category_priority_weights} DESC")
+            end
+        end
+
         data_ranking =
           if @term.blank?
             "(#{category_priority_weights})"
@@ -1167,9 +1227,9 @@ class Search
 
         posts =
           if aggregate_search
-            posts.order("MAX(#{category_search_priority}) DESC", "MAX(#{data_ranking}) DESC")
+            posts.order("MAX(#{data_ranking}) DESC")
           else
-            posts.order("#{category_search_priority} DESC", "#{data_ranking} DESC")
+            posts.order("#{data_ranking} DESC")
           end
       end
 
@@ -1199,6 +1259,17 @@ class Search
     posts.limit(limit)
   end
 
+  def ts_rank_cd(weight_filter:, prefix_match: true)
+    <<~SQL
+      TS_RANK_CD(
+        #{SiteSetting.search_ranking_weights.present? ? "'#{SiteSetting.search_ranking_weights}'," : ""}
+        post_search_data.search_data,
+        #{@term.blank? ? "" : ts_query(weight_filter: weight_filter, prefix_match: prefix_match)},
+        #{SiteSetting.search_ranking_normalization}|32
+      )
+      SQL
+  end
+
   def categories_ignored(posts)
     posts.where(<<~SQL, Searchable::PRIORITIES[:ignore])
     (categories.search_priority IS NULL OR categories.search_priority IS NOT NULL AND categories.search_priority <> ?)
@@ -1213,37 +1284,42 @@ class Search
     self.class.default_ts_config
   end
 
-  def self.ts_query(term:, ts_config: nil, joiner: nil, weight_filter: nil)
-    to_tsquery(ts_config: ts_config, term: set_tsquery_weight_filter(term, weight_filter))
+  def self.ts_query(term:, ts_config: nil, joiner: nil, weight_filter: nil, prefix_match: true)
+    to_tsquery(
+      ts_config: ts_config,
+      term: set_tsquery_weight_filter(term, weight_filter, prefix_match: prefix_match),
+    )
   end
 
   def self.to_tsquery(ts_config: nil, term:, joiner: nil)
     ts_config = ActiveRecord::Base.connection.quote(ts_config) if ts_config
     escaped_term = wrap_unaccent("'#{escape_string(term)}'")
     tsquery = "TO_TSQUERY(#{ts_config || default_ts_config}, #{escaped_term})"
+    # PG 14 and up default to using the followed by operator
+    # this restores the old behavior
+    tsquery = "REPLACE(#{tsquery}::text, '<->', '&')::tsquery"
     tsquery = "REPLACE(#{tsquery}::text, '&', '#{escape_string(joiner)}')::tsquery" if joiner
     tsquery
   end
 
-  def self.set_tsquery_weight_filter(term, weight_filter)
-    "'#{self.escape_string(term)}':*#{weight_filter}"
+  def self.set_tsquery_weight_filter(term, weight_filter, prefix_match: true)
+    "'#{self.escape_string(term)}':#{prefix_match ? "*" : ""}#{weight_filter}"
   end
 
   def self.escape_string(term)
-    # HACK: The ’ and other similar characters have to be "unaccented" before
-    # it is escaped or the resulting tsqueries will be invalid
-    if SiteSetting.search_ignore_accents
-      term = term.gsub(/[\u02b9\u02bb\u02bc\u02bd\u02c8\u2018\u2019\u201b\u2032\uff07]/, "'")
-    end
-
     PG::Connection.escape_string(term).gsub('\\', '\\\\\\')
   end
 
-  def ts_query(ts_config = nil, weight_filter: nil)
+  def ts_query(ts_config = nil, weight_filter: nil, prefix_match: true)
     @ts_query_cache ||= {}
     @ts_query_cache[
-      "#{ts_config || default_ts_config} #{@term} #{weight_filter}"
-    ] ||= Search.ts_query(term: @term, ts_config: ts_config, weight_filter: weight_filter)
+      "#{ts_config || default_ts_config} #{@term} #{weight_filter} #{prefix_match}"
+    ] ||= Search.ts_query(
+      term: @term,
+      ts_config: ts_config,
+      weight_filter: weight_filter,
+      prefix_match: prefix_match,
+    )
   end
 
   def wrap_rows(query)
@@ -1251,8 +1327,6 @@ class Search
   end
 
   def aggregate_post_sql(opts)
-    default_opts = { type_filter: opts[:type_filter] }
-
     min_id =
       if SiteSetting.search_recent_regular_posts_offset_post_id > 0
         if %w[all_topics private_message].include?(opts[:type_filter])
diff --git a/lib/search/grouped_search_results.rb b/lib/search/grouped_search_results.rb
index f3470963eb5..0fbe7fbb636 100644
--- a/lib/search/grouped_search_results.rb
+++ b/lib/search/grouped_search_results.rb
@@ -24,6 +24,7 @@ class Search
       :search_context,
       :more_full_page_results,
       :error,
+      :use_pg_headlines_for_excerpt,
     )
 
     attr_accessor :search_log_id
@@ -36,7 +37,8 @@ class Search
       search_context:,
       blurb_length: nil,
       blurb_term: nil,
-      is_header_search: false
+      is_header_search: false,
+      use_pg_headlines_for_excerpt: SiteSetting.use_pg_headlines_for_excerpt
     )
       @type_filter = type_filter
       @term = term
@@ -50,6 +52,7 @@ class Search
       @groups = []
       @error = nil
       @is_header_search = is_header_search
+      @use_pg_headlines_for_excerpt = use_pg_headlines_for_excerpt
     end
 
     def error=(error)
@@ -71,9 +74,9 @@ class Search
     def blurb(post)
       opts = { term: @blurb_term, blurb_length: @blurb_length }
 
-      if post.post_search_data.version > SearchIndexer::MIN_POST_REINDEX_VERSION &&
+      if post.post_search_data.version >= SearchIndexer::MIN_POST_BLURB_INDEX_VERSION &&
            !Search.segment_chinese? && !Search.segment_japanese?
-        if SiteSetting.use_pg_headlines_for_excerpt
+        if use_pg_headlines_for_excerpt
           scrubbed_headline = post.headline.gsub(SCRUB_HEADLINE_REGEXP, '\1')
           prefix_omission = scrubbed_headline.start_with?(post.leading_raw_data) ? "" : OMISSION
           postfix_omission = scrubbed_headline.end_with?(post.trailing_raw_data) ? "" : OMISSION
diff --git a/lib/seed_data/categories.rb b/lib/seed_data/categories.rb
index dd050d86983..e2ca27a13e4 100644
--- a/lib/seed_data/categories.rb
+++ b/lib/seed_data/categories.rb
@@ -138,9 +138,9 @@ module SeedData
         SiteSetting.set(site_setting_name, category.id)
 
         if sidebar
-          sidebar_categories = SiteSetting.default_sidebar_categories.split("|")
+          sidebar_categories = SiteSetting.default_navigation_menu_categories.split("|")
           sidebar_categories << category.id
-          SiteSetting.set("default_sidebar_categories", sidebar_categories.join("|"))
+          SiteSetting.set("default_navigation_menu_categories", sidebar_categories.join("|"))
         end
 
         SiteSetting.set("default_composer_category", category.id) if default_composer_category
diff --git a/lib/seed_data/topics.rb b/lib/seed_data/topics.rb
index d98106579d9..d800b117baf 100644
--- a/lib/seed_data/topics.rb
+++ b/lib/seed_data/topics.rb
@@ -10,18 +10,28 @@ module SeedData
       @locale = locale
     end
 
-    def create(site_setting_names: nil, include_welcome_topics: true)
+    def create(site_setting_names: nil, include_welcome_topics: true, include_legal_topics: false)
       I18n.with_locale(@locale) do
-        topics(site_setting_names, include_welcome_topics).each { |params| create_topic(**params) }
+        topics(
+          site_setting_names: site_setting_names,
+          include_welcome_topics: include_welcome_topics,
+          include_legal_topics: include_legal_topics || SiteSetting.company_name.present?,
+        ).each { |params| create_topic(**params) }
       end
     end
 
     def update(site_setting_names: nil, skip_changed: false)
       I18n.with_locale(@locale) do
-        topics(site_setting_names).each do |params|
-          params.except!(:category, :after_create)
-          params[:skip_changed] = skip_changed
-          update_topic(**params)
+        topics(site_setting_names: site_setting_names).each do |params|
+          update_topic(**params.except(:category, :after_create), skip_changed: skip_changed)
+        end
+      end
+    end
+
+    def delete(site_setting_names: nil, skip_changed: false)
+      I18n.with_locale(@locale) do
+        topics(site_setting_names: site_setting_names).each do |params|
+          delete_topic(**params.slice(:site_setting_name), skip_changed: skip_changed)
         end
       end
     end
@@ -41,12 +51,14 @@ module SeedData
 
     private
 
-    def topics(site_setting_names = nil, include_welcome_topics = true)
+    def topics(site_setting_names: nil, include_welcome_topics: true, include_legal_topics: true)
       staff_category = Category.find_by(id: SiteSetting.staff_category_id)
 
-      topics = [
-        # Terms of Service
-        {
+      topics = []
+
+      # Terms of Service
+      if include_legal_topics
+        topics << {
           site_setting_name: "tos_topic_id",
           title: I18n.t("tos_topic.title"),
           raw:
@@ -60,32 +72,54 @@ module SeedData
             ),
           category: staff_category,
           static_first_reply: true,
-        },
-        # FAQ/Guidelines
-        {
-          site_setting_name: "guidelines_topic_id",
-          title: I18n.t("guidelines_topic.title"),
-          raw: I18n.t("guidelines_topic.body", base_path: Discourse.base_path),
-          category: staff_category,
-          static_first_reply: true,
-        },
-        # Privacy Policy
-        {
+        }
+      end
+
+      # FAQ/Guidelines
+      topics << {
+        site_setting_name: "guidelines_topic_id",
+        title: I18n.t("guidelines_topic.title"),
+        raw: I18n.t("guidelines_topic.body", base_path: Discourse.base_path),
+        category: staff_category,
+        static_first_reply: true,
+      }
+
+      # Privacy Policy
+      if include_legal_topics
+        topics << {
           site_setting_name: "privacy_topic_id",
           title: I18n.t("privacy_topic.title"),
           raw: I18n.t("privacy_topic.body"),
           category: staff_category,
           static_first_reply: true,
-        },
-      ]
+        }
+      end
 
       if include_welcome_topics
         # Welcome Topic
         if general_category = Category.find_by(id: SiteSetting.general_category_id)
+          site_info_quote =
+            if SiteSetting.title.present? && SiteSetting.site_description.present?
+              <<~RAW
+              > ## #{SiteSetting.title}
+              >
+              > #{SiteSetting.site_description}
+              RAW
+            else
+              ""
+            end
+
           topics << {
             site_setting_name: "welcome_topic_id",
-            title: I18n.t("discourse_welcome_topic.title"),
-            raw: I18n.t("discourse_welcome_topic.body", base_path: Discourse.base_path),
+            title: I18n.t("discourse_welcome_topic.title", site_title: SiteSetting.title),
+            raw:
+              I18n.t(
+                "discourse_welcome_topic.body",
+                base_path: Discourse.base_path,
+                site_title: SiteSetting.title,
+                site_description: SiteSetting.site_description,
+                site_info_quote: site_info_quote,
+              ),
             category: general_category,
             after_create: proc { |post| post.topic.update_pinned(true, true) },
           }
@@ -146,27 +180,42 @@ module SeedData
     end
 
     def update_topic(site_setting_name:, title:, raw:, static_first_reply: false, skip_changed:)
-      post = find_post(site_setting_name)
+      post = find_post(site_setting_name, deleted: true)
       return if !post
 
       if !skip_changed || unchanged?(post)
-        changes = { title: title, raw: raw }
-        post.revise(Discourse.system_user, changes, skip_validations: true)
+        if post.trashed?
+          PostDestroyer.new(Discourse.system_user, post).recover
+          post.reload
+        end
+
+        post.revise(Discourse.system_user, { title: title, raw: raw }, skip_validations: true)
       end
 
       if static_first_reply && (reply = first_reply(post)) && (!skip_changed || unchanged?(reply))
-        changes = { raw: first_reply_raw(title) }
-        reply.revise(Discourse.system_user, changes, skip_validations: true)
+        reply.revise(Discourse.system_user, { raw: first_reply_raw(title) }, skip_validations: true)
       end
     end
 
-    def find_post(site_setting_name)
+    def delete_topic(site_setting_name:, skip_changed:)
+      post = find_post(site_setting_name)
+      return if !post
+
+      PostDestroyer.new(Discourse.system_user, post).destroy if !skip_changed || unchanged?(post)
+    end
+
+    def find_post(site_setting_name, deleted: false)
       topic_id = SiteSetting.get(site_setting_name)
-      Post.find_by(topic_id: topic_id, post_number: 1) if topic_id > 0
+      return if topic_id < 1
+
+      posts = Post.where(topic_id: topic_id, post_number: 1)
+      posts = posts.with_deleted if deleted
+      posts.first
     end
 
     def unchanged?(post)
-      post.last_editor_id == Discourse::SYSTEM_USER_ID
+      post.last_editor_id == Discourse::SYSTEM_USER_ID &&
+        (!post.deleted_by_id || post.deleted_by_id == Discourse::SYSTEM_USER_ID)
     end
 
     def setting_value(site_setting_key)
diff --git a/lib/shrink_uploaded_image.rb b/lib/shrink_uploaded_image.rb
index d1a7f14f012..f46a3b72073 100644
--- a/lib/shrink_uploaded_image.rb
+++ b/lib/shrink_uploaded_image.rb
@@ -98,7 +98,7 @@ class ShrinkUploadedImage
       elsif !post.topic || post.topic.trashed?
         log "A deleted topic"
       elsif post.cooked.include?(original_upload.sha1)
-        if post.raw.include?("#{Discourse.base_url.sub(%r{^https?://}i, "")}/t/")
+        if post.raw.include?("#{Discourse.base_url.sub(%r{\Ahttps?://}i, "")}/t/")
           log "Updating a topic onebox"
         else
           log "Updating an external onebox"
diff --git a/lib/site_icon_manager.rb b/lib/site_icon_manager.rb
index 198d1c7faaa..2ecfec40521 100644
--- a/lib/site_icon_manager.rb
+++ b/lib/site_icon_manager.rb
@@ -61,6 +61,10 @@ module SiteIconManager
 
   WATCHED_SETTINGS = ICONS.keys + %i[logo logo_small]
 
+  def self.clear_cache!
+    @cache.clear
+  end
+
   def self.ensure_optimized!
     unless @disabled
       ICONS.each do |name, info|
diff --git a/lib/site_setting_extension.rb b/lib/site_setting_extension.rb
index c42230f30e1..929902f11ac 100644
--- a/lib/site_setting_extension.rb
+++ b/lib/site_setting_extension.rb
@@ -115,55 +115,12 @@ module SiteSettingExtension
     @plugins ||= {}
   end
 
-  def setting(name_arg, default = nil, opts = {})
-    name = name_arg.to_sym
-
-    if name == :default_locale
-      raise Discourse::InvalidParameters.new(
-              "Other settings depend on default locale, you can not configure it like this",
-            )
-    end
-
-    shadowed_val = nil
-
-    mutex.synchronize do
-      defaults.load_setting(name, default, opts.delete(:locale_default))
-
-      categories[name] = opts[:category] || :uncategorized
-
-      hidden_settings << name if opts[:hidden]
-
-      if GlobalSetting.respond_to?(name)
-        val = GlobalSetting.public_send(name)
-
-        unless val.nil? || (val == "")
-          shadowed_val = val
-          hidden_settings << name
-          shadowed_settings << name
-        end
+  def load_settings(file, plugin: nil)
+    SiteSettings::YamlLoader
+      .new(file)
+      .load do |category, name, default, opts|
+        setting(name, default, opts.merge(category: category, plugin: plugin))
       end
-
-      refresh_settings << name if opts[:refresh]
-
-      client_settings << name.to_sym if opts[:client]
-
-      previews[name] = opts[:preview] if opts[:preview]
-
-      secret_settings << name if opts[:secret]
-
-      plugins[name] = opts[:plugin] if opts[:plugin]
-
-      type_supervisor.load_setting(
-        name,
-        opts.extract!(*SiteSettings::TypeSupervisor::CONSUMED_OPTS),
-      )
-
-      if !shadowed_val.nil?
-        setup_shadowed_methods(name, shadowed_val)
-      else
-        setup_methods(name)
-      end
-    end
   end
 
   def settings_hash
@@ -224,6 +181,9 @@ module SiteSettingExtension
 
     defaults
       .all(default_locale)
+      .reject do |setting_name, _|
+        plugins[name] && !Discourse.plugins_by_name[plugins[name]].configurable?
+      end
       .reject { |setting_name, _| !include_hidden && hidden_settings.include?(setting_name) }
       .map do |s, v|
         type_hash = type_supervisor.type_hash(s)
@@ -323,7 +283,6 @@ module SiteSettingExtension
 
   def process_message(message)
     begin
-      @last_message_processed = message.global_id
       MessageBus.on_connect.call(message.site_id)
       refresh!
     ensure
@@ -331,10 +290,6 @@ module SiteSettingExtension
     end
   end
 
-  def diags
-    { last_message_processed: @last_message_processed }
-  end
-
   def process_id
     @process_id ||= SecureRandom.uuid
   end
@@ -549,6 +504,11 @@ module SiteSettingExtension
       end
     else
       define_singleton_method clean_name do
+        if plugins[name]
+          plugin = Discourse.plugins_by_name[plugins[name]]
+          return false if !plugin.configurable? && plugin.enabled_site_setting == name
+        end
+
         if (c = current[name]).nil?
           refresh!
           current[name]
@@ -567,6 +527,13 @@ module SiteSettingExtension
       end
     end
 
+    # Same logic as above for group_list settings, with the caveat that normal
+    # list settings are not necessarily integers, so we just want to handle the splitting.
+    if type_supervisor.get_type(name) == :list &&
+         %w[simple compact].include?(type_supervisor.get_list_type(name))
+      define_singleton_method("#{clean_name}_map") { self.public_send(clean_name).to_s.split("|") }
+    end
+
     define_singleton_method "#{clean_name}?" do
       self.public_send clean_name
     end
@@ -596,6 +563,57 @@ module SiteSettingExtension
 
   private
 
+  def setting(name_arg, default = nil, opts = {})
+    name = name_arg.to_sym
+
+    if name == :default_locale
+      raise Discourse::InvalidParameters.new(
+              "Other settings depend on default locale, you can not configure it like this",
+            )
+    end
+
+    shadowed_val = nil
+
+    mutex.synchronize do
+      defaults.load_setting(name, default, opts.delete(:locale_default))
+
+      categories[name] = opts[:category] || :uncategorized
+
+      hidden_settings << name if opts[:hidden]
+
+      if GlobalSetting.respond_to?(name)
+        val = GlobalSetting.public_send(name)
+
+        unless val.nil? || (val == "")
+          shadowed_val = val
+          hidden_settings << name
+          shadowed_settings << name
+        end
+      end
+
+      refresh_settings << name if opts[:refresh]
+
+      client_settings << name.to_sym if opts[:client]
+
+      previews[name] = opts[:preview] if opts[:preview]
+
+      secret_settings << name if opts[:secret]
+
+      plugins[name] = opts[:plugin] if opts[:plugin]
+
+      type_supervisor.load_setting(
+        name,
+        opts.extract!(*SiteSettings::TypeSupervisor::CONSUMED_OPTS),
+      )
+
+      if !shadowed_val.nil?
+        setup_shadowed_methods(name, shadowed_val)
+      else
+        setup_methods(name)
+      end
+    end
+  end
+
   def default_uploads
     @default_uploads ||= {}
 
diff --git a/lib/site_settings/defaults_provider.rb b/lib/site_settings/defaults_provider.rb
index 1c75093aa81..6c8354110ac 100644
--- a/lib/site_settings/defaults_provider.rb
+++ b/lib/site_settings/defaults_provider.rb
@@ -31,18 +31,18 @@ class SiteSettings::DefaultsProvider
   end
 
   def all(locale = nil)
-    if locale
-      @defaults[DEFAULT_LOCALE.to_sym].merge(@defaults[locale.to_sym] || {})
-    else
-      @defaults[DEFAULT_LOCALE.to_sym].dup
-    end
+    result =
+      if locale
+        @defaults[DEFAULT_LOCALE.to_sym].merge(@defaults[locale.to_sym] || {})
+      else
+        @defaults[DEFAULT_LOCALE.to_sym].dup
+      end
+
+    DiscoursePluginRegistry.apply_modifier(:site_setting_defaults, result)
   end
 
   def get(name, locale = DEFAULT_LOCALE)
-    value = @defaults.dig(locale.to_sym, name.to_sym)
-    return value unless value.nil?
-
-    @defaults.dig(DEFAULT_LOCALE.to_sym, name.to_sym)
+    all(locale)[name.to_sym]
   end
   alias [] get
 
diff --git a/lib/site_settings/type_supervisor.rb b/lib/site_settings/type_supervisor.rb
index acff911c84d..db4bfa054a1 100644
--- a/lib/site_settings/type_supervisor.rb
+++ b/lib/site_settings/type_supervisor.rb
@@ -54,6 +54,7 @@ class SiteSettings::TypeSupervisor
         simple_list: 23,
         emoji_list: 24,
         html_deprecated: 25,
+        tag_group_list: 26,
       )
   end
 
@@ -195,6 +196,10 @@ class SiteSettings::TypeSupervisor
     self.class.types[@types[name.to_sym]]
   end
 
+  def get_list_type(name)
+    @list_type[name.to_sym]
+  end
+
   private
 
   def normalize_input(name, val)
diff --git a/lib/site_settings/validations.rb b/lib/site_settings/validations.rb
index fdc36ff57e4..4a25bc9eda4 100644
--- a/lib/site_settings/validations.rb
+++ b/lib/site_settings/validations.rb
@@ -96,7 +96,7 @@ module SiteSettings::Validations
     validate_default_categories(category_ids, default_categories_selected)
   end
 
-  def validate_default_categories_regular(new_val)
+  def validate_default_categories_normal(new_val)
     category_ids = validate_category_ids(new_val)
 
     default_categories_selected = [
@@ -168,11 +168,15 @@ module SiteSettings::Validations
   end
 
   def validate_secure_uploads(new_val)
-    if new_val == "t" && !SiteSetting.Upload.enable_s3_uploads
+    if new_val == "t" && (!SiteSetting.Upload.enable_s3_uploads || !SiteSetting.s3_use_acls)
       validate_error :secure_uploads_requirements
     end
   end
 
+  def validate_s3_use_acls(new_val)
+    validate_error :s3_use_acls_requirements if new_val == "f" && SiteSetting.secure_uploads
+  end
+
   def validate_enable_page_publishing(new_val)
     validate_error :page_publishing_requirements if new_val == "t" && SiteSetting.secure_uploads?
   end
@@ -243,7 +247,7 @@ module SiteSettings::Validations
 
   def validate_cors_origins(new_val)
     return if new_val.blank?
-    return unless new_val.split("|").any?(%r{/$})
+    return if new_val.split("|").none?(%r{/\z})
     validate_error :cors_origins_should_not_have_trailing_slash
   end
 
diff --git a/lib/site_settings/yaml_loader.rb b/lib/site_settings/yaml_loader.rb
index cfd44db56a1..6d303d726c1 100644
--- a/lib/site_settings/yaml_loader.rb
+++ b/lib/site_settings/yaml_loader.rb
@@ -38,10 +38,6 @@ class SiteSettings::YamlLoader
   private
 
   def load_yaml(path)
-    if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.1.0")
-      YAML.load_file(path, aliases: true)
-    else
-      YAML.load_file(path)
-    end
+    YAML.load_file(path, aliases: true)
   end
 end
diff --git a/lib/stylesheet/compiler.rb b/lib/stylesheet/compiler.rb
index 356a518d172..d395c388d00 100644
--- a/lib/stylesheet/compiler.rb
+++ b/lib/stylesheet/compiler.rb
@@ -55,18 +55,15 @@ module Stylesheet
           style: :compressed,
           source_map_file: source_map_file,
           source_map_contents: true,
-          theme_id: options[:theme_id],
-          theme: options[:theme],
-          theme_field: options[:theme_field],
-          color_scheme_id: options[:color_scheme_id],
           load_paths: load_paths,
+          validate_source_map_path: false,
         )
 
       result = engine.render
 
       if options[:rtl]
-        require "r2"
-        [R2.r2(result), nil]
+        require "rtlcss"
+        [Rtlcss.flip_css(result), nil]
       else
         source_map = engine.source_map
         source_map.force_encoding("UTF-8")
diff --git a/lib/stylesheet/manager.rb b/lib/stylesheet/manager.rb
index 217bed7737e..7f71831ba87 100644
--- a/lib/stylesheet/manager.rb
+++ b/lib/stylesheet/manager.rb
@@ -11,7 +11,7 @@ class Stylesheet::Manager
 
   CACHE_PATH ||= "tmp/stylesheet-cache"
   MANIFEST_DIR ||= "#{Rails.root}/tmp/cache/assets/#{Rails.env}"
-  THEME_REGEX ||= /_theme$/
+  THEME_REGEX ||= /_theme\z/
   COLOR_SCHEME_STYLESHEET ||= "color_definitions"
 
   @@lock = Mutex.new
@@ -43,13 +43,21 @@ class Stylesheet::Manager
   end
 
   def self.precompile_css
-    targets = %i[desktop mobile desktop_rtl mobile_rtl admin wizard]
+    targets = %i[desktop mobile admin wizard desktop_rtl mobile_rtl admin_rtl wizard_rtl]
+
     targets +=
       Discourse.find_plugin_css_assets(
         include_disabled: true,
         mobile_view: true,
         desktop_view: true,
       )
+    targets +=
+      Discourse.find_plugin_css_assets(
+        include_disabled: true,
+        mobile_view: true,
+        desktop_view: true,
+        rtl: true,
+      )
 
     targets.each do |target|
       $stderr.puts "precompile target: #{target}"
diff --git a/lib/stylesheet/manager/builder.rb b/lib/stylesheet/manager/builder.rb
index 47dbae0650c..5f4fbabbaa0 100644
--- a/lib/stylesheet/manager/builder.rb
+++ b/lib/stylesheet/manager/builder.rb
@@ -35,11 +35,11 @@ class Stylesheet::Manager::Builder
       end
     end
 
-    rtl = @target.to_s =~ /_rtl$/
+    rtl = @target.to_s.end_with?("_rtl")
     css, source_map =
       with_load_paths do |load_paths|
         Stylesheet::Compiler.compile_asset(
-          @target,
+          @target.to_s.gsub(/_rtl\z/, "").to_sym,
           rtl: rtl,
           theme_id: theme&.id,
           theme_variables: theme&.scss_variables.to_s,
@@ -47,7 +47,7 @@ class Stylesheet::Manager::Builder
           color_scheme_id: @color_scheme&.id,
           load_paths: load_paths,
         )
-      rescue SassC::SyntaxError => e
+      rescue SassC::SyntaxError, SassC::NotRenderedError => e
         if Stylesheet::Importer::THEME_TARGETS.include?(@target.to_s)
           # no special errors for theme, handled in theme editor
           ["", nil]
diff --git a/lib/stylesheet/watcher.rb b/lib/stylesheet/watcher.rb
index a2c8189e83b..9740758d076 100644
--- a/lib/stylesheet/watcher.rb
+++ b/lib/stylesheet/watcher.rb
@@ -21,7 +21,9 @@ module Stylesheet
       @default_paths = ["app/assets/stylesheets"]
       Discourse.plugins.each do |plugin|
         if plugin.path.to_s.include?(Rails.root.to_s)
-          @default_paths << File.dirname(plugin.path).sub(Rails.root.to_s, "").sub(%r{^/}, "")
+          path = File.dirname(plugin.path).sub(Rails.root.to_s, "").sub(%r{\A/}, "")
+          path << "/assets/stylesheets"
+          @default_paths << path if File.exist?(path)
         else
           # if plugin doesn’t seem to be in our app, consider it as outside of the app
           # and ignore it
@@ -41,7 +43,7 @@ module Stylesheet
         end
       end
 
-      listener_opts = { ignore: /xxxx/, only: /\.(css|scss)$/ }
+      listener_opts = { ignore: [/node_modules/], only: /\.s?css\z/ }
       listener_opts[:force_polling] = true if ENV["FORCE_POLLING"]
 
       Thread.new do
diff --git a/lib/summarization/base.rb b/lib/summarization/base.rb
new file mode 100644
index 00000000000..53fbba5ec1e
--- /dev/null
+++ b/lib/summarization/base.rb
@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+# Base class that defines the interface that every summarization
+# strategy must implement.
+# Above each method, you'll find an explanation of what
+# it does and what it should return.
+
+module Summarization
+  class Base
+    class << self
+      def available_strategies
+        DiscoursePluginRegistry.summarization_strategies
+      end
+
+      def find_strategy(strategy_model)
+        available_strategies.detect { |s| s.model == strategy_model }
+      end
+
+      def selected_strategy
+        return if SiteSetting.summarization_strategy.blank?
+
+        find_strategy(SiteSetting.summarization_strategy)
+      end
+
+      def can_see_summary?(target, user)
+        return false if SiteSetting.summarization_strategy.blank?
+
+        has_cached_summary = SummarySection.exists?(target: target, meta_section_id: nil)
+        return has_cached_summary if user.nil?
+
+        has_cached_summary || can_request_summary_for?(user)
+      end
+
+      def can_request_summary_for?(user)
+        return false unless user
+
+        user_group_ids = user.group_ids
+
+        SiteSetting.custom_summarization_allowed_groups_map.any? do |group_id|
+          user_group_ids.include?(group_id)
+        end
+      end
+    end
+
+    # Some strategies could require other conditions to work correctly,
+    # like site settings.
+    # This method gets called when admins attempt to select it,
+    # checking if we met those conditions.
+    def correctly_configured?
+      raise NotImplemented
+    end
+
+    # Strategy name to display to admins in the available strategies dropdown.
+    def display_name
+      raise NotImplemented
+    end
+
+    # If we don't meet the conditions to enable this strategy,
+    # we'll display this hint as an error to admins.
+    def configuration_hint
+      raise NotImplemented
+    end
+
+    # The idea behind this method is "give me a collection of texts,
+    # and I'll handle the summarization to the best of my capabilities.".
+    # It's important to emphasize the "collection of texts" part, which implies
+    # it's not tied to any model and expects the "content" to be a hash instead.
+    #
+    # @param content { Hash } - Includes the content to summarize, plus additional
+    # context to help the strategy produce a better result. Keys present in the content hash:
+    #  - resource_path (optional): Helps the strategy build links to the content in the summary (e.g. "/t/-/:topic_id/POST_NUMBER")
+    #  - content_title (optional): Provides guidance about what the content is about.
+    #  - contents (required): Array of hashes with content to summarize (e.g. [{ poster: "asd", id: 1, text: "This is a text" }])
+    #    All keys are required.
+    #
+    # @returns { Hash } - The summarized content, plus chunks if the content couldn't be summarized in one pass. Example:
+    #   {
+    #     summary: "This is the final summary",
+    #     chunks: [
+    #       { ids: [topic.first_post.post_number], summary: "this is the first chunk" },
+    #       { ids: [post_1.post_number, post_2.post_number], summary: "this is the second chunk" },
+    #     ],
+    #   }
+    def summarize(content)
+      raise NotImplemented
+    end
+
+    # Returns the string we'll store in the selected strategy site setting.
+    def model
+      raise NotImplemented
+    end
+  end
+end
diff --git a/lib/svg_sprite.rb b/lib/svg_sprite.rb
index afb62d54574..0fae05743d4 100644
--- a/lib/svg_sprite.rb
+++ b/lib/svg_sprite.rb
@@ -6,6 +6,7 @@ module SvgSprite
       %w[
         adjust
         address-book
+        align-left
         ambulance
         anchor
         angle-double-down
@@ -34,6 +35,7 @@ module SvgSprite
         book-reader
         bookmark
         briefcase
+        bullseye
         calendar-alt
         caret-down
         caret-left
@@ -45,11 +47,13 @@ module SvgSprite
         check
         check-circle
         check-square
+        chevron-circle-down
         chevron-down
         chevron-left
         chevron-right
         chevron-up
         circle
+        cloud-upload-alt
         code
         cog
         columns
@@ -68,6 +72,7 @@ module SvgSprite
         discourse-emojis
         discourse-expand
         discourse-other-tab
+        discourse-threads
         download
         ellipsis-h
         ellipsis-v
@@ -77,6 +82,7 @@ module SvgSprite
         exclamation-circle
         exclamation-triangle
         external-link-alt
+        eye
         fab-android
         fab-apple
         fab-chrome
@@ -134,6 +140,7 @@ module SvgSprite
         gift
         globe
         globe-americas
+        grip-lines
         hand-point-right
         hands-helping
         heart
@@ -142,6 +149,7 @@ module SvgSprite
         hourglass-start
         id-card
         image
+        images
         inbox
         info-circle
         italic
@@ -180,6 +188,8 @@ module SvgSprite
         reply
         rocket
         search
+        search-plus
+        search-minus
         share
         shield-alt
         sign-in-alt
@@ -197,6 +207,7 @@ module SvgSprite
         tag
         tags
         tasks
+        th
         thermometer-three-quarters
         thumbs-down
         thumbs-up
@@ -238,53 +249,94 @@ module SvgSprite
     badge_icons
   end
 
-  def self.custom_svg_sprites(theme_id)
-    get_set_cache("custom_svg_sprites_#{Theme.transform_ids(theme_id).join(",")}") do
-      plugin_paths = []
-      Discourse
-        .plugins
-        .map { |plugin| File.dirname(plugin.path) }
-        .each { |path| plugin_paths << "#{path}/svg-icons/*.svg" }
-
-      custom_sprite_paths = Dir.glob(plugin_paths)
-
-      custom_sprites =
-        custom_sprite_paths.map do |path|
-          if File.exist?(path)
-            { filename: "#{File.basename(path, ".svg")}", sprite: File.read(path) }
-          end
+  def self.symbols_for(svg_filename, sprite, strict:)
+    if strict
+      Nokogiri.XML(sprite) { |config| config.options = Nokogiri::XML::ParseOptions::NOBLANKS }
+    else
+      Nokogiri.XML(sprite)
+    end.css("symbol")
+      .filter_map do |sym|
+        icon_id = prepare_symbol(sym, svg_filename)
+        if icon_id.present?
+          sym.attributes["id"].value = icon_id
+          sym.css("title").each(&:remove)
+          [icon_id, sym.to_xml]
         end
+      end
+      .to_h
+  end
 
-      if theme_id.present?
-        ThemeField
-          .where(
+  def self.core_svgs
+    @core_svgs ||=
+      CORE_SVG_SPRITES.reduce({}) do |symbols, path|
+        symbols.merge!(symbols_for(File.basename(path, ".svg"), File.read(path), strict: true))
+      end
+  end
+
+  # Just used in tests
+  def self.clear_plugin_svg_sprite_cache!
+    @plugin_svgs = nil
+  end
+
+  def self.plugin_svgs
+    @plugin_svgs ||=
+      begin
+        plugin_paths = []
+        Discourse
+          .plugins
+          .map { |plugin| File.dirname(plugin.path) }
+          .each { |path| plugin_paths << "#{path}/svg-icons/*.svg" }
+
+        custom_sprite_paths = Dir.glob(plugin_paths)
+
+        custom_sprite_paths.reduce({}) do |symbols, path|
+          symbols.merge!(symbols_for(File.basename(path, ".svg"), File.read(path), strict: true))
+        end
+      end
+  end
+
+  def self.theme_svgs(theme_id)
+    if theme_id.present?
+      theme_ids = Theme.transform_ids(theme_id)
+
+      get_set_cache("theme_svg_sprites_#{theme_ids.join(",")}") do
+        theme_field_uploads =
+          ThemeField.where(
             type_id: ThemeField.types[:theme_upload_var],
             name: THEME_SPRITE_VAR_NAME,
-            theme_id: Theme.transform_ids(theme_id),
+            theme_id: theme_ids,
+          ).pluck(:upload_id)
+
+        theme_sprites = ThemeSvgSprite.where(theme_id: theme_ids).pluck(:upload_id, :sprite)
+        missing_sprites = (theme_field_uploads - theme_sprites.map(&:first))
+
+        if missing_sprites.present?
+          Rails.logger.warn(
+            "Missing ThemeSvgSprites for theme #{theme_id}, uploads #{missing_sprites.join(", ")}",
           )
-          .pluck(:upload_id, :theme_id)
-          .each do |upload_id, child_theme_id|
-            begin
-              upload = Upload.find(upload_id)
-              custom_sprites << {
-                filename: "theme_#{theme_id}_#{upload_id}.svg",
-                sprite: upload.content,
-              }
-            rescue => e
-              name =
-                begin
-                  Theme.find(child_theme_id).name
-                rescue StandardError
-                  nil
-                end
-              Discourse.warn_exception(e, message: "#{name} theme contains a corrupt svg upload")
-            end
+        end
+
+        theme_sprites.reduce({}) do |symbols, (upload_id, sprite)|
+          begin
+            symbols.merge!(symbols_for("theme_#{theme_id}_#{upload_id}.svg", sprite, strict: false))
+          rescue => e
+            Rails.logger.warn(
+              "Bad XML in custom sprite in theme with ID=#{theme_id}. Error info: #{e.inspect}",
+            )
           end
+
+          symbols
+        end
       end
-      custom_sprites
+    else
+      {}
     end
   end
 
+  def self.custom_svgs(theme_id)
+    plugin_svgs.merge(theme_svgs(theme_id))
+  end
+
   def self.all_icons(theme_id = nil)
     get_set_cache("icons_#{Theme.transform_ids(theme_id).join(",")}") do
       Set
@@ -316,42 +368,10 @@ module SvgSprite
     cache&.clear
   end
 
-  def self.sprite_sources(theme_id)
-    sprites = []
-
-    CORE_SVG_SPRITES.each do |path|
-      if File.exist?(path)
-        sprites << { filename: "#{File.basename(path, ".svg")}", sprite: File.read(path) }
-      end
-    end
-
-    sprites = sprites + custom_svg_sprites(theme_id) if theme_id.present?
-
-    sprites
-  end
-
-  def self.core_svgs
-    @core_svgs ||=
-      begin
-        symbols = {}
-
-        CORE_SVG_SPRITES.each do |filename|
-          svg_filename = "#{File.basename(filename, ".svg")}"
-
-          Nokogiri
-            .XML(File.open(filename)) do |config|
-              config.options = Nokogiri::XML::ParseOptions::NOBLANKS
-            end
-            .css("symbol")
-            .each do |sym|
-              icon_id = prepare_symbol(sym, svg_filename)
-              sym.attributes["id"].value = icon_id
-              symbols[icon_id] = sym.to_xml
-            end
-        end
-
-        symbols
-      end
+  def self.svgs_for(theme_id)
+    svgs = core_svgs
+    svgs = svgs.merge(custom_svgs(theme_id)) if theme_id.present?
+    svgs
   end
 
   def self.bundle(theme_id = nil)
@@ -367,34 +387,8 @@ License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL
 " \
         "".dup
 
-    core_svgs.each { |icon_id, sym| svg_subset << sym if icons.include?(icon_id) }
-
-    custom_svg_sprites(theme_id).each do |item|
-      begin
-        svg_file =
-          Nokogiri.XML(item[:sprite]) do |config|
-            config.options = Nokogiri::XML::ParseOptions::NOBLANKS
-          end
-      rescue => e
-        Rails.logger.warn(
-          "Bad XML in custom sprite in theme with ID=#{theme_id}. Error info: #{e.inspect}",
-        )
-      end
-
-      next if !svg_file
-
-      svg_file
-        .css("symbol")
-        .each do |sym|
-          icon_id = prepare_symbol(sym, item[:filename])
-
-          if icons.include? icon_id
-            sym.attributes["id"].value = icon_id
-            sym.css("title").each(&:remove)
-            svg_subset << sym.to_xml
-          end
-        end
-    end
+    svg_subset << core_svgs.slice(*icons).values.join
+    svg_subset << custom_svgs(theme_id).values.join
 
     svg_subset << "</svg>"
   end
@@ -402,44 +396,16 @@ License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL
   def self.search(searched_icon)
     searched_icon = process(searched_icon.dup)
 
-    sprite_sources(SiteSetting.default_theme_id).each do |item|
-      svg_file = Nokogiri.XML(item[:sprite])
-
-      svg_file
-        .css("symbol")
-        .each do |sym|
-          icon_id = prepare_symbol(sym, item[:filename])
-
-          if searched_icon == icon_id
-            sym.attributes["id"].value = icon_id
-            sym.css("title").each(&:remove)
-            return sym.to_xml
-          end
-        end
-    end
-
-    false
+    svgs_for(SiteSetting.default_theme_id)[searched_icon] || false
   end
 
-  def self.icon_picker_search(keyword)
-    results = Set.new
+  def self.icon_picker_search(keyword, only_available = false)
+    icons = all_icons(SiteSetting.default_theme_id) if only_available
 
-    sprite_sources(SiteSetting.default_theme_id).each do |item|
-      svg_file = Nokogiri.XML(item[:sprite])
-
-      svg_file
-        .css("symbol")
-        .each do |sym|
-          icon_id = prepare_symbol(sym, item[:filename])
-          if keyword.empty? || icon_id.include?(keyword)
-            sym.attributes["id"].value = icon_id
-            sym.css("title").each(&:remove)
-            results.add(id: icon_id, symbol: sym.to_xml)
-          end
-        end
-    end
-
-    results.sort_by { |icon| icon[:id] }
+    symbols = svgs_for(SiteSetting.default_theme_id)
+    symbols.slice!(*icons) if only_available
+    symbols.reject! { |icon_id, sym| !icon_id.include?(keyword) } unless keyword.empty?
+    symbols.sort_by(&:first).map { |icon_id, symbol| { id: icon_id, symbol: symbol } }
   end
 
   # For use in no_ember .html.erb layouts
@@ -522,14 +488,7 @@ License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL
 
   def self.custom_icons(theme_id)
     # Automatically register icons in sprites added via themes or plugins
-    icons = []
-    custom_svg_sprites(theme_id).each do |item|
-      svg_file = Nokogiri.XML(item[:sprite])
-      svg_file
-        .css("symbol")
-        .each { |sym| icons << sym.attributes["id"].value if sym.attributes["id"].present? }
-    end
-    icons
+    custom_svgs(theme_id).keys
   end
 
   def self.process(icon_name)
diff --git a/lib/system_message.rb b/lib/system_message.rb
index 53ce825c800..14abbe4e0a3 100644
--- a/lib/system_message.rb
+++ b/lib/system_message.rb
@@ -73,7 +73,12 @@ class SystemMessage
 
     post = I18n.with_locale(@recipient.effective_locale) { creator.create }
 
-    DiscourseEvent.trigger(:system_message_sent, post: post, message_type: type)
+    DiscourseEvent.trigger(
+      :system_message_sent,
+      post: post,
+      message_type: type,
+      recipient: @recipient,
+    )
 
     raise StandardError, creator.errors.full_messages.join(" ") if creator.errors.present?
 
@@ -88,6 +93,8 @@ class SystemMessage
     {
       site_name: SiteSetting.title,
       username: @recipient.username,
+      name: @recipient.name,
+      name_or_username: @recipient.name.presence || @recipient.username,
       user_preferences_url: "#{@recipient.full_url}/preferences",
       new_user_tips:
         I18n.with_locale(@recipient.effective_locale) do
diff --git a/lib/tasks/annotate.rake b/lib/tasks/annotate.rake
index 677c7d6d1f4..57bc0129ac3 100644
--- a/lib/tasks/annotate.rake
+++ b/lib/tasks/annotate.rake
@@ -17,7 +17,7 @@ desc "ensure the asynchronously-created post_search_data index is present"
 task "annotate:ensure_all_indexes" => :environment do |task, args|
   # One of the indexes on post_search_data is created by a sidekiq job
   # We need to do some acrobatics to create it on-demand
-  SeedData::Topics.with_default_locale.create(include_welcome_topics: true)
+  SeedData::Topics.with_default_locale.create
   SiteSetting.search_enable_recent_regular_posts_offset_size = 1
   Jobs::CreateRecentPostSearchIndexes.new.execute([])
 end
diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rake
index f00ab3068e9..3078ee427ea 100644
--- a/lib/tasks/assets.rake
+++ b/lib/tasks/assets.rake
@@ -277,8 +277,12 @@ task "assets:precompile" => "assets:precompile:before" do
       puts "Downloading MaxMindDB..."
       mmdb_thread =
         Thread.new do
+          name = "unknown"
           begin
-            geolite_dbs.each { |db| DiscourseIpInfo.mmdb_download(db) }
+            geolite_dbs.each do |db|
+              name = db
+              DiscourseIpInfo.mmdb_download(db)
+            end
 
             if GlobalSetting.maxmind_backup_path.present?
               copy_maxmind(DiscourseIpInfo.path, GlobalSetting.maxmind_backup_path)
@@ -307,7 +311,8 @@ task "assets:precompile" => "assets:precompile:before" do
       concurrent? do |proc|
         manifest
           .files
-          .select { |k, v| k =~ /\.js$/ }
+          .select { |k, v| k =~ /\.js\z/ }
+          .reject { |k, v| k =~ %r{/workbox-.*'/} }
           .each do |file, info|
             path = "#{assets_path}/#{file}"
             _file = (d = File.dirname(file)) == "." ? "_#{file}" : "#{d}/_#{File.basename(file)}"
diff --git a/lib/tasks/categories.rake b/lib/tasks/categories.rake
index 1e33a62166b..703af6834ed 100644
--- a/lib/tasks/categories.rake
+++ b/lib/tasks/categories.rake
@@ -24,6 +24,7 @@ task "categories:move_topics", %i[from_category to_category] => [:environment] d
 
     puts "Updating category stats..."
     Category.update_stats
+    CategoryTagStat.update_topic_counts
   end
 
   puts "", "Done!", ""
diff --git a/lib/tasks/cdn.rake b/lib/tasks/cdn.rake
index ee2b0c14ee0..559144bf9d2 100644
--- a/lib/tasks/cdn.rake
+++ b/lib/tasks/cdn.rake
@@ -10,7 +10,7 @@ task "assets:prestage" => :environment do |t|
   def get_assets(path)
     Dir
       .glob("#{Rails.root}/public/assets/#{path}*")
-      .map { |f| "/assets/#{path}#{f.split("/")[-1]}" if f =~ /[a-f0-9]{16}\.(css|js)$/ }
+      .map { |f| "/assets/#{path}#{f.split("/")[-1]}" if f =~ /[a-f0-9]{16}\.(css|js)\z/ }
       .compact
   end
 
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index 403fd6749cb..3170506fd1a 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -109,7 +109,7 @@ class SeedHelper
   def self.filter
     # Allows a plugin to exclude any specified seed data files from running
     if DiscoursePluginRegistry.seedfu_filter.any?
-      /^(?!.*(#{DiscoursePluginRegistry.seedfu_filter.to_a.join("|")})).*$/
+      /\A(?!.*(#{DiscoursePluginRegistry.seedfu_filter.to_a.join("|")})).*\z/
     else
       nil
     end
@@ -575,3 +575,18 @@ task "db:status:json" do
     puts({ status: "ok" }.to_json)
   end
 end
+
+desc "Grow notification id column to a big int in case of overflow"
+task "db:resize:notification_id" => :environment do
+  sql = <<~SQL
+    SELECT table_name, column_name FROM INFORMATION_SCHEMA.columns
+    WHERE (column_name like '%notification_id' OR column_name = 'id' and table_name = 'notifications') AND data_type = 'integer'
+  SQL
+
+  DB
+    .query(sql)
+    .each do |row|
+      puts "Changing #{row.table_name}(#{row.column_name}) to a bigint"
+      DB.exec("ALTER table #{row.table_name} ALTER COLUMN #{row.column_name} TYPE BIGINT")
+    end
+end
diff --git a/lib/tasks/docker.rake b/lib/tasks/docker.rake
index 0e3c40e0de8..1dd110f1309 100644
--- a/lib/tasks/docker.rake
+++ b/lib/tasks/docker.rake
@@ -11,6 +11,7 @@
 # => SKIP_PLUGINS              set to 1 to skip plugin tests (rspec and qunit)
 # => SKIP_INSTALL_PLUGINS      comma separated list of plugins you want to skip installing
 # => INSTALL_OFFICIAL_PLUGINS  set to 1 to install all core plugins before running tests
+# => RUN_SYSTEM_TESTS          set to 1 to run the system tests as well
 # => RUBY_ONLY                 set to 1 to skip all qunit tests
 # => JS_ONLY                   set to 1 to skip all rspec tests
 # => SINGLE_PLUGIN             set to plugin name to only run plugin-specific rspec tests (you'll probably want to SKIP_CORE as well)
@@ -211,6 +212,11 @@ task "docker:test" do
           else
             @good &&= run_or_fail("bundle exec rspec #{params.join(" ")}".strip)
           end
+
+          if ENV["RUN_SYSTEM_TESTS"]
+            @good &&= run_or_fail("bin/ember-cli --build")
+            @good &&= run_or_fail("timeout --verbose 1800 bundle exec rspec spec/system")
+          end
         end
 
         unless ENV["SKIP_PLUGINS"]
@@ -220,6 +226,13 @@ task "docker:test" do
             fail_fast = "RSPEC_FAILFAST=1" unless ENV["SKIP_FAILFAST"]
             @good &&= run_or_fail("#{fail_fast} bundle exec rake plugin:spec")
           end
+
+          if ENV["RUN_SYSTEM_TESTS"]
+            @good &&=
+              run_or_fail(
+                "LOAD_PLUGINS=1 timeout --verbose 1600 bundle exec rspec plugins/*/spec/system".strip,
+              )
+          end
         end
       end
 
diff --git a/lib/tasks/documentation.rake b/lib/tasks/documentation.rake
new file mode 100644
index 00000000000..d1e4c767db1
--- /dev/null
+++ b/lib/tasks/documentation.rake
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require "fileutils"
+
+task "documentation" do
+  generate_chat_documentation
+end
+
+def generate_chat_documentation
+  destination = File.join(Rails.root, "documentation/chat/frontend/")
+  config = File.join(Rails.root, ".jsdoc")
+  files = %w[
+    plugins/chat/assets/javascripts/discourse/lib/collection.js
+    plugins/chat/assets/javascripts/discourse/pre-initializers/chat-plugin-api.js
+    plugins/chat/assets/javascripts/discourse/services/chat-api.js
+  ]
+  `yarn --silent jsdoc --readme plugins/chat/README.md -c #{config} #{files.join(" ")} -d #{destination}`
+
+  # unnecessary files
+  %w[
+    documentation/chat/frontend/scripts/prism.min.js
+    documentation/chat/frontend/scripts/prism.js
+    documentation/chat/frontend/styles/vendor/prism-default.css
+    documentation/chat/frontend/styles/vendor/prism-okaidia.css
+    documentation/chat/frontend/styles/vendor/prism-tomorrow-night.css
+  ].each { |file| FileUtils.rm(file) }
+
+  require "open3"
+  require "yard"
+  YARD::Templates::Engine.register_template_path(
+    File.join(Rails.root, "documentation", "yard-custom-template"),
+  )
+  files = %w[
+    plugins/chat/app/services/base.rb
+    plugins/chat/app/services/update_user_last_read.rb
+    plugins/chat/app/services/trash_channel.rb
+    plugins/chat/app/services/update_channel.rb
+    plugins/chat/app/services/update_channel_status.rb
+  ]
+  cmd =
+    "bundle exec yardoc -p documentation/yard-custom-template -t default -r plugins/chat/README.md --output-dir documentation/chat/backend #{files.join(" ")}"
+  Open3.popen3(cmd) { |_, stderr| puts stderr.read }
+end
diff --git a/lib/tasks/emails.rake b/lib/tasks/emails.rake
index c9042d8dd38..bfa4313071e 100644
--- a/lib/tasks/emails.rake
+++ b/lib/tasks/emails.rake
@@ -207,3 +207,56 @@ task "emails:test", [:email] => [:environment] do |_, args|
       Consider changing it to 'no' before performing any further troubleshooting.
     TEXT
 end
+
+desc "run this to fix users associated to emails mirrored from a mailman mailing list"
+task "emails:fix_mailman_users" => :environment do
+  if !SiteSetting.enable_staged_users
+    puts "Please enable staged users first"
+    exit 1
+  end
+
+  def find_or_create_user(email, name)
+    user = nil
+
+    User.transaction do
+      unless user = User.find_by_email(email)
+        username = UserNameSuggester.sanitize_username(name) if name.present?
+        username = UserNameSuggester.suggest(username.presence || email)
+        name = name.presence || User.suggest_name(email)
+
+        begin
+          user = User.create!(email: email, username: username, name: name, staged: true)
+        rescue PG::UniqueViolation, ActiveRecord::RecordNotUnique, ActiveRecord::RecordInvalid
+        end
+      end
+    end
+
+    user
+  end
+
+  IncomingEmail
+    .includes(:user, :post)
+    .where("raw LIKE '%X-Mailman-Version: %'")
+    .find_each do |ie|
+      next unless ie.post.present?
+
+      mail = Mail.new(ie.raw)
+      email, name = Email::Receiver.extract_email_address_and_name_from_mailman(mail)
+
+      if email.blank? || email == ie.user.email
+        putc "."
+      elsif new_owner = find_or_create_user(email, name)
+        PostOwnerChanger.new(
+          post_ids: [ie.post_id],
+          topic_id: ie.post.topic_id,
+          new_owner: new_owner,
+          acting_user: Discourse.system_user,
+          skip_revision: true,
+        ).change_owner!
+        putc "#"
+      else
+        putc "X"
+      end
+    end
+  nil
+end
diff --git a/lib/tasks/emoji.rake b/lib/tasks/emoji.rake
index fe049fc550d..4a123d18464 100644
--- a/lib/tasks/emoji.rake
+++ b/lib/tasks/emoji.rake
@@ -277,6 +277,8 @@ end
 
 desc "update emoji images"
 task "emoji:update" do
+  abort("This task can't be run on production.") if Rails.env.production?
+
   copy_emoji_db
 
   json_db = File.read(File.join(GENERATED_PATH, "db.json"))
@@ -459,7 +461,7 @@ end
 def codepoints_to_code(codepoints, fitzpatrick_scale)
   codepoints = codepoints.map { |c| c.to_s(16).rjust(4, "0") }.join("_").downcase
 
-  codepoints.gsub!(/_fe0f$/, "") if !fitzpatrick_scale
+  codepoints.gsub!(/_fe0f\z/, "") if !fitzpatrick_scale
 
   codepoints
 end
@@ -473,7 +475,7 @@ def confirm_overwrite(path)
   STDIN.gets.chomp
 end
 
-class TestEmojiUpdate < MiniTest::Test
+class TestEmojiUpdate < Minitest::Test
   def self.run_and_summarize
     puts "Runnings tests..."
     reporter = Minitest::SummaryReporter.new
diff --git a/lib/tasks/hashtags.rake b/lib/tasks/hashtags.rake
new file mode 100644
index 00000000000..f2c8a2ddd7b
--- /dev/null
+++ b/lib/tasks/hashtags.rake
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+desc "Mark posts with the old hashtag cooked format (pre enable_experimental_hashtag_autocomplete) for rebake"
+task "hashtags:mark_old_format_for_rebake" => :environment do
+  # See Post#rebake_old, which is called via the PeriodicalUpdates job
+  # on a schedule.
+  puts "Finding posts matching old format, this could take some time..."
+  posts_to_rebake = Post.where("cooked like '%class=\"hashtag\"%'")
+  puts(
+    "[!] You are about to mark #{posts_to_rebake.count} posts containing hashtags in the old format to rebake. [CTRL+c] to cancel, [ENTER] to continue",
+  )
+  STDIN.gets.chomp if !Rails.env.test?
+  posts_to_rebake.update_all(baked_version: 0)
+  puts "Done, rebakes will happen when periodical updates job runs."
+end
diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake
index ed6bdc25ce6..84f4d011529 100644
--- a/lib/tasks/import.rake
+++ b/lib/tasks/import.rake
@@ -22,6 +22,7 @@ task "import:ensure_consistency" => :environment do
   update_users
   update_groups
   update_tag_stats
+  update_topic_users
   create_category_definitions
 
   log "Done!"
@@ -29,6 +30,10 @@ end
 
 MS_SPEND_CREATING_POST ||= 5000
 
+# -- TODO: We need to check the queries are actually adding/updating the necessary
+# data, post migration. The ON CONFLICT DO NOTHING may cause the clauses to be ignored
+# when we actually need them to run.
+
 def insert_post_timings
   log "Inserting post timings..."
 
@@ -161,7 +166,9 @@ def insert_user_options
                   notification_level_when_replying,
                   like_notification_frequency,
                   skip_new_user_tips,
-                  hide_profile_and_presence
+                  hide_profile_and_presence,
+                  sidebar_link_to_filtered_list,
+                  sidebar_show_count_of_new_items
                 )
              SELECT u.id
                   , #{SiteSetting.default_email_mailing_list_mode}
@@ -183,6 +190,8 @@ def insert_user_options
                   , #{SiteSetting.default_other_like_notification_frequency}
                   , #{SiteSetting.default_other_skip_new_user_tips}
                   , #{SiteSetting.default_hide_profile_and_presence}
+                  , #{SiteSetting.default_sidebar_link_to_filtered_list}
+                  , #{SiteSetting.default_sidebar_show_count_of_new_items}
                FROM users u
           LEFT JOIN user_options uo ON uo.user_id = u.id
               WHERE uo.user_id IS NULL
@@ -415,6 +424,29 @@ def update_tag_stats
   Tag.ensure_consistency!
 end
 
+def update_topic_users
+  log "Updating topic users..."
+
+  DB.exec <<-SQL
+    WITH X AS (
+        SELECT p.topic_id
+             , p.user_id
+          FROM posts p
+          JOIN topics t ON t.id = p.topic_id
+         WHERE p.deleted_at IS NULL
+           AND t.deleted_at IS NULL
+           AND NOT p.hidden
+           AND t.visible
+    )
+    UPDATE topic_users tu
+       SET posted = 't'
+      FROM X
+     WHERE tu.topic_id = X.topic_id
+       AND tu.user_id = X.user_id
+       AND posted = 'f'
+  SQL
+end
+
 def create_category_definitions
   log "Creating category definitions"
   Category.ensure_consistency!
diff --git a/lib/tasks/javascript.rake b/lib/tasks/javascript.rake
index 2f701589f73..46fbe2d7e92 100644
--- a/lib/tasks/javascript.rake
+++ b/lib/tasks/javascript.rake
@@ -87,32 +87,6 @@ def dependencies
       source: "@discourse/moment-timezone-names-translations/locales/.",
       destination: "moment-timezone-names-locale",
     },
-    { source: "workbox-sw/build/.", destination: "workbox", public: true, skip_versioning: true },
-    {
-      source: "workbox-routing/build/.",
-      destination: "workbox",
-      public: true,
-      skip_versioning: true,
-    },
-    { source: "workbox-core/build/.", destination: "workbox", public: true, skip_versioning: true },
-    {
-      source: "workbox-strategies/build/.",
-      destination: "workbox",
-      public: true,
-      skip_versioning: true,
-    },
-    {
-      source: "workbox-expiration/build/.",
-      destination: "workbox",
-      public: true,
-      skip_versioning: true,
-    },
-    {
-      source: "workbox-cacheable-response/build/.",
-      destination: "workbox",
-      skip_versioning: true,
-      public: true,
-    },
     {
       source: "squoosh/codecs/mozjpeg/enc/mozjpeg_enc.js",
       destination: "squoosh",
@@ -163,6 +137,16 @@ task "javascript:update_constants" => :environment do
     export const SEARCH_PRIORITIES = #{Searchable::PRIORITIES.to_json};
 
     export const SEARCH_PHRASE_REGEXP = '#{Search::PHRASE_MATCH_REGEXP_PATTERN}';
+
+    export const SIDEBAR_URL = {
+      max_icon_length: #{SidebarUrl::MAX_ICON_LENGTH},
+      max_name_length: #{SidebarUrl::MAX_NAME_LENGTH},
+      max_value_length: #{SidebarUrl::MAX_VALUE_LENGTH}
+    }
+
+    export const SIDEBAR_SECTION = {
+      max_title_length: #{SidebarSection::MAX_TITLE_LENGTH},
+    }
   JS
 
   pretty_notifications = Notification.types.map { |n| "  #{n[0]}: #{n[1]}," }.join("\n")
@@ -182,6 +166,32 @@ task "javascript:update_constants" => :environment do
     export const replacements = #{Emoji.unicode_replacements_json};
   JS
 
+  langs = []
+  Dir
+    .glob("vendor/assets/javascripts/highlightjs/languages/*.min.js")
+    .each { |f| langs << File.basename(f, ".min.js") }
+  bundle = HighlightJs.bundle(langs)
+
+  ctx = MiniRacer::Context.new
+  hljs_aliases = ctx.eval(<<~JS)
+    #{bundle}
+
+    let aliases = {};
+    hljs.listLanguages().forEach((lang) => {
+      if (hljs.getLanguage(lang).aliases) {
+        aliases[lang] = hljs.getLanguage(lang).aliases;
+      }
+    });
+
+    aliases;
+  JS
+
+  write_template("pretty-text/addon/highlightjs-aliases.js", task_name, <<~JS)
+    export const HLJS_ALIASES = #{hljs_aliases.to_json};
+  JS
+
+  ctx.dispose
+
   write_template("pretty-text/addon/emoji/version.js", task_name, <<~JS)
     export const IMAGE_VERSION = "#{Emoji::EMOJI_VERSION}";
   JS
@@ -196,7 +206,7 @@ task "javascript:update_constants" => :environment do
 
   emoji_sections = groups_json.map { |group| html_for_section(group) }
 
-  components_dir = "discourse/app/templates/components"
+  components_dir = "discourse/app/components"
   write_hbs_template("#{components_dir}/emoji-group-buttons.hbs", task_name, emoji_buttons.join)
   write_hbs_template("#{components_dir}/emoji-group-sections.hbs", task_name, emoji_sections.join)
 end
@@ -213,10 +223,10 @@ task "javascript:update" => "clean_up" do
   dependencies.each do |f|
     src = "#{library_src}/#{f[:source]}"
 
-    unless f[:destination]
-      filename = f[:source].split("/").last
-    else
+    if f[:destination]
       filename = f[:destination]
+    else
+      filename = f[:source].split("/").last
     end
 
     if src.include? "highlightjs"
@@ -257,6 +267,7 @@ task "javascript:update" => "clean_up" do
         mode-html
         mode-scss
         mode-sql
+        mode-yaml
         theme-chrome
         theme-chaos
         worker-html
@@ -267,11 +278,7 @@ task "javascript:update" => "clean_up" do
 
     STDERR.puts "New dependency added: #{dest}" unless File.exist?(dest)
 
-    if f[:uglify]
-      File.write(dest, Uglifier.new.compile(File.read(src)))
-    else
-      FileUtils.cp_r(src, dest)
-    end
+    FileUtils.cp_r(src, dest)
   end
 
   write_template("discourse/app/lib/public-js-versions.js", "update", <<~JS)
diff --git a/lib/tasks/maxminddb.rake b/lib/tasks/maxminddb.rake
index ffb6a06514d..eb66f64a495 100644
--- a/lib/tasks/maxminddb.rake
+++ b/lib/tasks/maxminddb.rake
@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
 desc "downloads MaxMind's GeoLite2-City database"
-task "maxminddb:get" do
-  require "discourse_ip_info"
-
+task "maxminddb:get" => "environment" do
   puts "Downloading MaxMindDb's GeoLite2-City..."
   DiscourseIpInfo.mmdb_download("GeoLite2-City")
 
diff --git a/lib/tasks/plugin.rake b/lib/tasks/plugin.rake
index 32255f2f301..9711141902a 100644
--- a/lib/tasks/plugin.rake
+++ b/lib/tasks/plugin.rake
@@ -4,7 +4,7 @@ directory "plugins"
 
 desc "install all official plugins (use GIT_WRITE=1 to pull with write access)"
 task "plugin:install_all_official" do
-  skip = Set.new(%w[customer-flair lazy-yt poll])
+  skip = Set.new(%w[customer-flair poll])
 
   map = { "Canned Replies" => "https://github.com/discourse/discourse-canned-replies" }
 
@@ -86,7 +86,7 @@ task "plugin:update", :plugin do |t, args|
 
   upstream_branch =
     `git -C '#{plugin_path}' for-each-ref --format='%(upstream:short)' $(git -C '#{plugin_path}' symbolic-ref -q HEAD)`.strip
-  has_origin_main = `git -C '#{plugin_path}' branch -a`.match?(%r{remotes/origin/main$})
+  has_origin_main = `git -C '#{plugin_path}' branch -a`.match?(%r{remotes/origin/main\z})
   has_local_main = `git -C '#{plugin_path}' show-ref refs/heads/main`.present?
 
   if upstream_branch == "origin/master" && has_origin_main
@@ -168,34 +168,38 @@ task "plugin:install_gems", :plugin do |t, args|
   puts "Done"
 end
 
-def spec(plugin, parallel: false)
+def spec(plugin, parallel: false, argv: nil)
   params = []
   params << "--profile" if !parallel
   params << "--fail-fast" if ENV["RSPEC_FAILFAST"]
   params << "--seed #{ENV["RSPEC_SEED"]}" if Integer(ENV["RSPEC_SEED"], exception: false)
+  params << argv if argv
 
-  ruby = `which ruby`.strip
   # reject system specs as they are slow and need dedicated setup
   files =
     Dir.glob("./plugins/#{plugin}/spec/**/*_spec.rb").reject { |f| f.include?("spec/system/") }.sort
+
   if files.length > 0
     cmd = parallel ? "bin/turbo_rspec" : "bin/rspec"
-    sh "LOAD_PLUGINS=1 #{cmd} #{files.join(" ")} #{params.join(" ")}"
+
+    Rake::FileUtilsExt.verbose(!parallel) do
+      sh("LOAD_PLUGINS=1 #{cmd} #{files.join(" ")} #{params.join(" ")}")
+    end
   else
     abort "No specs found."
   end
 end
 
 desc "run plugin specs"
-task "plugin:spec", :plugin do |t, args|
+task "plugin:spec", %i[plugin argv] do |_, args|
   args.with_defaults(plugin: "*")
-  spec(args[:plugin])
+  spec(args[:plugin], argv: args[:argv])
 end
 
 desc "run plugin specs in parallel"
-task "plugin:turbo_spec", :plugin do |t, args|
+task "plugin:turbo_spec", %i[plugin argv] do |_, args|
   args.with_defaults(plugin: "*")
-  spec(args[:plugin], parallel: true)
+  spec(args[:plugin], parallel: true, argv: args[:argv])
 end
 
 desc "run plugin qunit tests"
@@ -205,14 +209,17 @@ task "plugin:qunit", %i[plugin timeout] do |t, args|
   rake = "#{Rails.root}/bin/rake"
 
   cmd = "LOAD_PLUGINS=1 "
-  cmd += "QUNIT_SKIP_CORE=1 "
 
-  if args[:plugin] == "*"
-    puts "Running qunit tests for all plugins"
-  else
-    puts "Running qunit tests for #{args[:plugin]}"
-    cmd += "QUNIT_SINGLE_PLUGIN='#{args[:plugin]}' "
-  end
+  target =
+    if args[:plugin] == "*"
+      puts "Running qunit tests for all plugins"
+      "plugins"
+    else
+      puts "Running qunit tests for #{args[:plugin]}"
+      args[:plugin]
+    end
+
+  cmd += "TARGET='#{target}' "
 
   cmd += "#{rake} qunit:test"
   cmd += "[#{args[:timeout]}]" if args[:timeout]
diff --git a/lib/tasks/populate.rake b/lib/tasks/populate.rake
index 15a018db3f5..a1191c427c6 100644
--- a/lib/tasks/populate.rake
+++ b/lib/tasks/populate.rake
@@ -54,3 +54,8 @@ desc "Add replies to a topic"
 task "replies:populate", %i[topic_id count] => ["db:load_config"] do |_, args|
   DiscourseDev::Post.add_replies!(args)
 end
+
+desc "Creates sample email logs"
+task "email_logs:populate" => ["db:load_config"] do |_, args|
+  DiscourseDev::EmailLog.populate!
+end
diff --git a/lib/tasks/posts.rake b/lib/tasks/posts.rake
index 9fd1f480f3c..16f2e84f16a 100644
--- a/lib/tasks/posts.rake
+++ b/lib/tasks/posts.rake
@@ -543,7 +543,7 @@ def recover_uploads_from_index(path)
     .pluck(:post_id, :value)
     .each do |post_id, uploads|
       uploads = JSON.parse(uploads)
-      raw = Post.where(id: post_id).pluck_first(:raw)
+      raw = Post.where(id: post_id).pick(:raw)
       uploads.map! do |upload|
         orig = upload
         if raw.scan(upload).length == 0
diff --git a/lib/tasks/qunit.rake b/lib/tasks/qunit.rake
index 16cc88ad44c..e03f103e057 100644
--- a/lib/tasks/qunit.rake
+++ b/lib/tasks/qunit.rake
@@ -69,6 +69,7 @@ task "qunit:test", %i[timeout qunit_path filter] do |_, args|
       theme_name
       theme_url
       theme_id
+      target
     ].each { |arg| options[arg] = ENV[arg.upcase] if ENV[arg.upcase].present? }
 
     options["report_requests"] = "1" if report_requests
@@ -90,7 +91,7 @@ task "qunit:test", %i[timeout qunit_path filter] do |_, args|
       Net::HTTP.get(uri)
     rescue Errno::ECONNREFUSED, Errno::EADDRNOTAVAIL, Net::ReadTimeout, EOFError
       sleep 1
-      retry unless elapsed() > 60
+      retry if elapsed() <= 60
       puts "Timed out. Can not connect to forked server!"
       exit 1
     end
diff --git a/lib/tasks/release_note.rake b/lib/tasks/release_note.rake
index 8f665d6eba8..9f96eb4c4b3 100644
--- a/lib/tasks/release_note.rake
+++ b/lib/tasks/release_note.rake
@@ -3,12 +3,12 @@
 DATE_REGEX ||= /\A\d{4}-\d{2}-\d{2}/
 
 CHANGE_TYPES ||= [
-  { pattern: /^FEATURE:/, heading: "New Features" },
-  { pattern: /^FIX:/, heading: "Bug Fixes" },
-  { pattern: /^UX:/, heading: "UX Changes" },
-  { pattern: /^SECURITY:/, heading: "Security Changes" },
-  { pattern: /^PERF:/, heading: "Performance" },
-  { pattern: /^A11Y:/, heading: "Accessibility" },
+  { pattern: /\AFEATURE:/, heading: "New Features" },
+  { pattern: /\AFIX:/, heading: "Bug Fixes" },
+  { pattern: /\AUX:/, heading: "UX Changes" },
+  { pattern: /\ASECURITY:/, heading: "Security Changes" },
+  { pattern: /\APERF:/, heading: "Performance" },
+  { pattern: /\AA11Y:/, heading: "Accessibility" },
 ]
 
 desc "generate a release note from the important commits"
@@ -54,7 +54,7 @@ task "release_note:plugins:generate", :from, :to, :plugin_glob, :org do |t, args
     end
 
     puts "### #{name}\n\n"
-    CHANGE_TYPES.each { |ct| print_changes_plugin(ct[:heading], changes[ct]) }
+    CHANGE_TYPES.each { |ct| print_changes(ct[:heading], changes[ct], "####") }
   end
 
   puts "(No changes found in #{no_changes_repos.join(", ")})"
@@ -83,7 +83,7 @@ def find_changes(repo, from, to)
   CHANGE_TYPES.each { |ct| changes[ct] = Set.new }
 
   out.each_line do |comment|
-    next if comment =~ /^\s*Revert/
+    next if comment =~ /\A\s*Revert/
     split_comments(comment).each do |line|
       ct = CHANGE_TYPES.find { |t| line =~ t[:pattern] }
       changes[ct] << better(line) if ct
@@ -100,14 +100,6 @@ def print_changes(heading, changes, importance)
   puts changes.to_a, ""
 end
 
-def print_changes_plugin(heading, changes)
-  return if changes.length == 0
-
-  puts "[details=\"#{heading}\"]\n", ""
-  puts changes.to_a, ""
-  puts "[/details]\n", ""
-end
-
 def better(line)
   line = remove_prefix(line)
   line = escape_brackets(line)
@@ -122,7 +114,7 @@ def better(line)
 end
 
 def remove_prefix(line)
-  line.gsub(/^(FIX|FEATURE|UX|SECURITY|PERF|A11Y):/, "").strip
+  line.gsub(/\A(FIX|FEATURE|UX|SECURITY|PERF|A11Y):/, "").strip
 end
 
 def escape_brackets(line)
@@ -130,7 +122,7 @@ def escape_brackets(line)
 end
 
 def remove_pull_request(line)
-  line.gsub(/ \(\#\d+\)$/, "")
+  line.gsub(/ \(\#\d+\)\z/, "")
 end
 
 def split_comments(text)
diff --git a/lib/tasks/s3.rake b/lib/tasks/s3.rake
index 56e5859dafe..7f5a7a4cad2 100644
--- a/lib/tasks/s3.rake
+++ b/lib/tasks/s3.rake
@@ -28,7 +28,7 @@ def upload(path, remote_path, content_type, content_encoding = nil)
   options = {
     cache_control: "max-age=31556952, public, immutable",
     content_type: content_type,
-    acl: "public-read",
+    acl: SiteSetting.s3_use_acls ? "public-read" : nil,
   }
 
   options[:content_encoding] = content_encoding if content_encoding
@@ -104,6 +104,11 @@ end
 task "s3:correct_acl" => :environment do
   ensure_s3_configured!
 
+  if !SiteSetting.s3_use_acls
+    $stderr.puts "Not correcting ACLs as the site is configured to not use ACLs"
+    return
+  end
+
   puts "ensuring public-read is set on every upload and optimized image"
 
   i = 0
@@ -158,7 +163,7 @@ task "s3:correct_cachecontrol" => :environment do
         object = Discourse.store.s3_helper.object(key)
         object.copy_from(
           copy_source: "#{object.bucket_name}/#{object.key}",
-          acl: "public-read",
+          acl: SiteSetting.s3_use_acls ? "public-read" : nil,
           cache_control: cache_control,
           content_type: object.content_type,
           content_disposition: object.content_disposition,
diff --git a/lib/tasks/svg_icons.rake b/lib/tasks/svg_icons.rake
index 5549b4379e2..7f443447091 100644
--- a/lib/tasks/svg_icons.rake
+++ b/lib/tasks/svg_icons.rake
@@ -19,10 +19,10 @@ task "svgicons:update" do
   dependencies.each do |f|
     src = "#{library_src}/#{f[:source]}/."
 
-    unless f[:destination]
-      filename = f[:source].split("/").last
-    else
+    if f[:destination]
       filename = f[:destination]
+    else
+      filename = f[:source].split("/").last
     end
 
     dest = "#{vendor_svgs}/#{filename}"
diff --git a/lib/tasks/svg_sprites.rake b/lib/tasks/svg_sprites.rake
new file mode 100644
index 00000000000..09f3d7364ed
--- /dev/null
+++ b/lib/tasks/svg_sprites.rake
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+task "svg_sprites:refetch" => [:environment] do |_, args|
+  ThemeSvgSprite.refetch!
+end
diff --git a/lib/tasks/themes.rake b/lib/tasks/themes.rake
index 3e27bd3387b..351ba4b5550 100644
--- a/lib/tasks/themes.rake
+++ b/lib/tasks/themes.rake
@@ -62,7 +62,7 @@ def update_themes
     .includes(:remote_theme)
     .where(enabled: true, auto_update: true)
     .find_each do |theme|
-      begin
+      theme.transaction do
         remote_theme = theme.remote_theme
         next if remote_theme.blank? || remote_theme.remote_url.blank?
 
diff --git a/lib/tasks/turbo.rake b/lib/tasks/turbo.rake
index 06d6e14b704..8440252d864 100644
--- a/lib/tasks/turbo.rake
+++ b/lib/tasks/turbo.rake
@@ -3,5 +3,9 @@
 task "turbo:spec" => :test do |t|
   require "./lib/turbo_tests"
 
-  TurboTests::Runner.run(formatters: [{ name: "progress", outputs: ["-"] }], files: ["spec"])
+  TurboTests::Runner.run(
+    formatters: [{ name: "progress", outputs: ["-"] }],
+    files: TurboTests::Runner.default_spec_folders,
+    use_runtime_info: true,
+  )
 end
diff --git a/lib/tasks/typepad.thor b/lib/tasks/typepad.thor
index 649f12db523..bbef98037e6 100644
--- a/lib/tasks/typepad.thor
+++ b/lib/tasks/typepad.thor
@@ -34,7 +34,7 @@ class Typepad < Thor
     File.open(options[:file]).each_line do |l|
       l = l.scrub
 
-      if l =~ /^--------$/
+      if l =~ /\A--------\z/
         parsed_entry = process_entry(input)
         if parsed_entry
           puts "Parsed #{parsed_entry[:title]}"
@@ -119,7 +119,7 @@ class Typepad < Thor
   def parse_meta_data(section)
     result = {}
     section.split(/\n/).each do |l|
-      if l =~ /^([A-Z\ ]+)\: (.*)$/
+      if l =~ /\A([A-Z\ ]+)\: (.*)\z/
         key, value = Regexp.last_match[1], Regexp.last_match[2]
         clean_type!(key)
         value.strip!
@@ -134,7 +134,7 @@ class Typepad < Thor
 
   def parse_section(section)
     section.strip!
-    if section =~ /^([^:]+):/
+    if section =~ /\A([^:]+):/
       type = clean_type!(Regexp.last_match[1])
       value = section.split("\n")[1..-1].join("\n")
       value.strip!
@@ -195,8 +195,8 @@ class Typepad < Thor
 
         comment[:name] = comment[:author]
         if comment[:author]
-          comment[:author].gsub!(/^[_\.]+/, '')
-          comment[:author].gsub!(/[_\.]+$/, '')
+          comment[:author].gsub!(/\A[_\.]+/, '')
+          comment[:author].gsub!(/[_\.]+\z/, '')
 
           if comment[:author].size < 12
             comment[:author].gsub!(/ /, '_')
diff --git a/lib/tasks/uploads.rake b/lib/tasks/uploads.rake
index 4c0dc03de3b..3b2328b8281 100644
--- a/lib/tasks/uploads.rake
+++ b/lib/tasks/uploads.rake
@@ -35,7 +35,7 @@ def gather_uploads
     .where("url !~ ?", "^\/uploads\/#{current_db}")
     .find_each do |upload|
       begin
-        old_db = upload.url[%r{^/uploads/([^/]+)/}, 1]
+        old_db = upload.url[%r{\A/uploads/([^/]+)/}, 1]
         from = upload.url.dup
         to = upload.url.sub("/uploads/#{old_db}/", "/uploads/#{current_db}/")
         source = "#{public_directory}#{from}"
@@ -119,7 +119,6 @@ def create_migration
     s3_options: FileStore::ToS3Migration.s3_options_from_env,
     dry_run: !!ENV["DRY_RUN"],
     migrate_to_multisite: !!ENV["MIGRATE_TO_MULTISITE"],
-    skip_etag_verify: !!ENV["SKIP_ETAG_VERIFY"],
   )
 end
 
@@ -321,8 +320,8 @@ def regenerate_missing_optimized
     scope.find_each do |optimized_image|
       upload = optimized_image.upload
 
-      next unless optimized_image.url =~ %r{^/[^/]}
-      next unless upload.url =~ %r{^/[^/]}
+      next unless optimized_image.url =~ %r{\A/[^/]}
+      next unless upload.url =~ %r{\A/[^/]}
 
       thumbnail = "#{public_directory}#{optimized_image.url}"
       original = "#{public_directory}#{upload.url}"
@@ -385,7 +384,7 @@ end
 
 task "uploads:stop_migration" => :environment do
   SiteSetting.migrate_to_new_scheme = false
-  puts "Migration stoped!"
+  puts "Migration stopped!"
 end
 
 task "uploads:analyze", %i[cache_path limit] => :environment do |_, args|
diff --git a/lib/tasks/users.rake b/lib/tasks/users.rake
index a5c9c8103c4..dbbcad0d245 100644
--- a/lib/tasks/users.rake
+++ b/lib/tasks/users.rake
@@ -155,6 +155,7 @@ task "users:disable_2fa", [:username] => [:environment] do |_, args|
   username = args[:username]
   user = find_user(username)
   UserSecondFactor.where(user_id: user.id, method: UserSecondFactor.methods[:totp]).each(&:destroy!)
+  UserSecurityKey.where(user_id: user.id).destroy_all
   puts "2FA disabled for #{username}"
 end
 
diff --git a/lib/tasks/version_bump.rake b/lib/tasks/version_bump.rake
new file mode 100644
index 00000000000..76cc7d1db8c
--- /dev/null
+++ b/lib/tasks/version_bump.rake
@@ -0,0 +1,425 @@
+# frozen_string_literal: true
+
+def dry_run?
+  !!ENV["DRY_RUN"]
+end
+
+def test_mode?
+  ENV["RUNNING_VERSION_BUMP_IN_RSPEC_TESTS"] == "1"
+end
+
+class PlannedTag
+  attr_reader :name, :message
+
+  def initialize(name:, message:)
+    @name = name
+    @message = message
+  end
+end
+
+class PlannedCommit
+  attr_reader :version, :tags, :ref
+
+  def initialize(version:, tags: [])
+    @version = version
+    @tags = tags
+  end
+
+  def perform!
+    write_version(@version)
+    git "add", "lib/version.rb"
+    git "commit", "-m", "Bump version to v#{@version}"
+    @ref = git("rev-parse", "HEAD").strip
+  end
+end
+
+def read_version_rb
+  File.read("lib/version.rb")
+end
+
+def parse_current_version
+  version = read_version_rb[/STRING = "(.*)"/, 1]
+  raise "Unable to parse current version" if version.nil?
+  puts "Parsed current version: #{version.inspect}"
+  version
+end
+
+def write_version(version)
+  File.write("lib/version.rb", read_version_rb.sub(/STRING = ".*"/, "STRING = \"#{version}\""))
+end
+
+def git(*args, allow_failure: false, silent: false)
+  puts "> git #{args.inspect}" unless silent
+  stdout, stderr, status = Open3.capture3({ "LEFTHOOK" => "0" }, "git", *args)
+  if !status.success? && !allow_failure
+    raise "Command failed: git #{args.inspect}\n#{stdout.indent(2)}\n#{stderr.indent(2)}"
+  end
+  stdout
+end
+
+def ref_exists?(ref)
+  git "rev-parse", "--verify", ref
+  true
+rescue StandardError
+  false
+end
+
+def confirm(msg)
+  loop do
+    print "#{msg} (yes/no)..."
+    break if test_mode?
+
+    response = $stdin.gets.strip
+
+    case response.downcase
+    when "no"
+      raise "Aborted"
+    when "yes"
+      break
+    else
+      puts "unknown response: #{response}"
+    end
+  end
+end
+
+def make_commits(commits:, branch:, base:)
+  raise "You have other staged changes. Aborting." if !git("diff", "--cached").empty?
+
+  git "branch", "-D", branch if ref_exists?(branch)
+  git "checkout", "-b", branch
+
+  commits.each(&:perform!)
+
+  git("push", "-f", "--set-upstream", "origin", branch)
+
+  make_pr(
+    base: base,
+    branch: branch,
+    title:
+      "Version bump#{"s" if commits.length > 1} for #{base}: #{commits.map { |c| "v#{c.version}" }.join(", ")}",
+  )
+end
+
+def make_pr(base:, branch:, title:)
+  params = { expand: 1, title: title, body: <<~MD }
+      > :warning: This PR should not be merged via the GitHub web interface
+      > 
+      > It should only be merged (via fast-forward) using the associated `bin/rake version_bump:*` task.
+    MD
+
+  if !test_mode?
+    system(
+      "open",
+      "https://github.com/discourse/discourse/compare/#{base}...#{branch}?#{params.to_query}",
+      exception: true,
+    )
+  end
+
+  puts "Do not merge the PR via the GitHub web interface. Get it approved, then come back here to continue."
+end
+
+def fastforward(base:, branch:)
+  if dry_run?
+    puts "[DRY RUN] Skipping fastforward of #{base}"
+    return
+  end
+
+  confirm "Ready to merge? This will fast-forward #{base} to #{branch}"
+  begin
+    git "push", "origin", "#{branch}:#{base}"
+  rescue => e
+    raise <<~MSG
+      #{e.message}
+      Error occured during fastforward. Maybe another commit was added to `#{base}` since the PR was created, or maybe the PR wasn't approved.
+      Don't worry, this is not unusual. To update the branch and try again, rerun this script again. The existing PR and approval will be reused.
+    MSG
+  end
+  puts "Merge successful"
+end
+
+def stage_tags(commits)
+  puts "Staging tags locally..."
+  commits.each do |commit|
+    commit.tags.each { |tag| git "tag", "-f", "-a", tag.name, "-m", tag.message, commit.ref }
+  end
+end
+
+def push_tags(commits)
+  tag_names = commits.flat_map { |commit| commit.tags.map(&:name) }
+
+  if dry_run?
+    puts "[DRY RUN] Skipping pushing tags to origin (#{tag_names.join(", ")})"
+    return
+  end
+
+  confirm "Ready to push tags #{tag_names.join(", ")} to origin?"
+  tag_names.each { |tag_name| git "push", "-f", "origin", "refs/tags/#{tag_name}" }
+end
+
+def with_clean_worktree(origin_branch)
+  origin_url = git("remote", "get-url", "origin").strip
+
+  if !test_mode? && !origin_url.include?("discourse/discourse")
+    raise "Expected 'origin' remote to point to discourse/discourse (got #{origin_url})"
+  end
+
+  git "fetch", "origin", origin_branch
+  path = "#{Rails.root}/tmp/version-bump-worktree-#{SecureRandom.hex}"
+  begin
+    FileUtils.mkdir_p(path)
+    git "worktree", "add", path, "origin/#{origin_branch}"
+    Dir.chdir(path) { yield } # rubocop:disable Discourse/NoChdir
+  ensure
+    puts "Cleaning up temporary worktree..."
+    git "worktree", "remove", "--force", path, silent: true, allow_failure: true
+    FileUtils.rm_rf(path)
+  end
+end
+
+desc "Stage commits for a beta version bump (e.g. beta1.dev -> beta1 -> beta2.dev). A PR will be created for approval, then the script will prompt to perform the release"
+task "version_bump:beta" do
+  branch = "version_bump/beta"
+  base = "main"
+
+  with_clean_worktree(base) do
+    current_version = parse_current_version
+
+    commits =
+      if current_version.start_with?("3.1")
+        # Legacy strategy - no `-dev` suffix
+        next_version = current_version.sub(/beta(\d+)/) { "beta#{$1.to_i + 1}" }
+
+        [
+          PlannedCommit.new(
+            version: next_version,
+            tags: [
+              PlannedTag.new(name: "beta", message: "latest beta release"),
+              PlannedTag.new(name: "latest-release", message: "latest release"),
+              PlannedTag.new(name: "v#{next_version}", message: "version #{next_version}"),
+            ],
+          ),
+        ]
+      else
+        raise "Expected current version to end in -dev" if !current_version.end_with?("-dev")
+
+        beta_release_version = current_version.sub("-dev", "")
+        next_dev_version = current_version.sub(/beta(\d+)/) { "beta#{$1.to_i + 1}" }
+
+        [
+          PlannedCommit.new(
+            version: beta_release_version,
+            tags: [
+              PlannedTag.new(name: "beta", message: "latest beta release"),
+              PlannedTag.new(name: "latest-release", message: "latest release"),
+              PlannedTag.new(
+                name: "v#{beta_release_version}",
+                message: "version #{beta_release_version}",
+              ),
+            ],
+          ),
+          PlannedCommit.new(version: next_dev_version),
+        ]
+      end
+
+    make_commits(commits: commits, branch: branch, base: base)
+    fastforward(base: base, branch: branch)
+    stage_tags(commits)
+    push_tags(commits)
+  end
+
+  puts "Done!"
+end
+
+desc "Stage commits for minor stable version bump (e.g. 3.1.1 -> 3.1.2). A PR will be created for approval, then the script will prompt to perform the release"
+task "version_bump:minor_stable" do
+  base = "stable"
+  branch = "version_bump/stable"
+
+  with_clean_worktree(base) do
+    current_version = parse_current_version
+    if current_version !~ /^(\d+)\.(\d+)\.(\d+)$/
+      raise "Expected current stable version to be in the form X.Y.Z. It was #{current_version}"
+    end
+
+    new_version = current_version.sub(/\.(\d+)\z/) { ".#{$1.to_i + 1}" }
+
+    commits = [
+      PlannedCommit.new(
+        version: new_version,
+        tags: [PlannedTag.new(name: "v#{new_version}", message: "version #{new_version}")],
+      ),
+    ]
+
+    make_commits(commits: commits, branch: branch, base: base)
+    fastforward(base: base, branch: branch)
+    stage_tags(commits)
+    push_tags(commits)
+  end
+
+  puts "Done!"
+end
+
+desc "Stage commits for a major version bump (e.g. 3.1.0.beta6-dev -> 3.1.0.beta6 -> 3.1.0 -> 3.2.0.beta1-dev). A PR will be created for approval, then the script will merge to `main`. Should be passed a version number for the next stable version (e.g. 3.2.0)"
+task "version_bump:major_stable_prepare", [:next_major_version_number] do |t, args|
+  unless args[:next_major_version_number] =~ /\A\d+\.\d+\.\d+\z/
+    raise "Expected next_major_version number to be in the form X.Y.Z"
+  end
+
+  base = "main"
+  branch = "version_bump/beta"
+
+  with_clean_worktree(base) do
+    current_version = parse_current_version
+
+    # special case for moving away from the 'legacy' release system where we don't use the `-dev` suffix
+    is_31_release = args[:next_major_version_number] == "3.2.0"
+
+    if !current_version.end_with?("-dev") && !is_31_release
+      raise "Expected current version to end in -dev"
+    end
+
+    beta_release_version =
+      if is_31_release
+        # The 3.1.0 beta series didn't use the -dev suffix
+        current_version.sub(/beta(\d+)/) { "beta#{$1.to_i + 1}" }
+      else
+        current_version.sub("-dev", "")
+      end
+
+    next_dev_version = args[:next_major_version_number] + ".beta1-dev"
+
+    final_beta_release =
+      PlannedCommit.new(
+        version: beta_release_version,
+        tags: [
+          PlannedTag.new(name: "beta", message: "latest beta release"),
+          PlannedTag.new(name: "latest-release", message: "latest release"),
+          PlannedTag.new(
+            name: "v#{beta_release_version}",
+            message: "version #{beta_release_version}",
+          ),
+        ],
+      )
+
+    commits = [final_beta_release, PlannedCommit.new(version: next_dev_version)]
+
+    make_commits(commits: commits, branch: branch, base: base)
+    fastforward(base: base, branch: branch)
+    stage_tags(commits)
+    push_tags(commits)
+
+    puts <<~MSG
+      The #{base} branch is now ready for a stable release.
+      Now run this command to merge the release into the stable branch:
+        bin/rake "version_bump:major_stable_merge[v#{beta_release_version}]"
+    MSG
+  end
+end
+
+desc <<~DESC
+  Stage the merge of a stable version bump into the stable branch.
+  A PR will be created for approval, then the script will merge to `stable`.
+  Should be passed the ref of the beta release which should be promoted to stable
+  (output from the version_bump:major_stable_prepare rake task)
+  e.g.:
+    bin/rake "version_bump:major_stable_merge[v3.1.0.beta12]"
+DESC
+task "version_bump:major_stable_merge", [:version_bump_ref] do |t, args|
+  merge_ref = args[:version_bump_ref]
+  raise "Must pass version_bump_ref" unless merge_ref.present?
+
+  git "fetch", "origin", merge_ref
+  raise "Unknown version_bump_ref: #{merge_ref.inspect}" unless ref_exists?(merge_ref)
+
+  base = "stable"
+  branch = "version_bump/stable"
+
+  with_clean_worktree(base) do
+    git "branch", "-D", branch if ref_exists?(branch)
+    git "checkout", "-b", branch
+
+    git "merge", "--no-commit", merge_ref, allow_failure: true
+
+    out, status = Open3.capture2e "git diff --binary #{merge_ref} | patch -p1 -R"
+    raise "Error applying diff\n#{out}}" unless status.success?
+
+    git "add", "."
+
+    merged_version = parse_current_version
+    git "commit", "-m", "Merge v#{merged_version} into #{base}"
+
+    diff_to_base = git("diff", merge_ref).strip
+    raise "There are diffs remaining to #{merge_ref}" unless diff_to_base.empty?
+
+    stable_release_version = merged_version.sub(/\.beta\d+\z/, "")
+    stable_release_commit =
+      PlannedCommit.new(
+        version: stable_release_version,
+        tags: [
+          PlannedTag.new(
+            name: "v#{stable_release_version}",
+            message: "version #{stable_release_version}",
+          ),
+        ],
+      )
+    stable_release_commit.perform!
+
+    git("push", "-f", "--set-upstream", "origin", branch)
+
+    make_pr(base: base, branch: branch, title: "Merge v#{merged_version} into #{base}")
+    fastforward(base: base, branch: branch)
+    stage_tags([stable_release_commit])
+    push_tags([stable_release_commit])
+  end
+end
+
+desc <<~DESC
+  squash-merge many security fixes into a single branch for review/merge.
+  Pass a list of comma-separated branches in the SECURITY_FIX_REFS env var, including the remote name.
+  Pass the name of the destination branch as the argument of the rake task.
+  e.g.
+    SECURITY_FIX_REFS='privatemirror/mybranch1,privatemirror/mybranch2' bin/rake "version_bump:stage_security_fixes[main]"
+DESC
+task "version_bump:stage_security_fixes", [:base] do |t, args|
+  base = args[:base]
+  raise "Unknown base: #{base.inspect}" unless %w[stable main].include?(base)
+
+  fix_refs = ENV["SECURITY_FIX_REFS"]&.split(",").map(&:strip)
+  raise "No branches specified in SECURITY_FIX_REFS env" if fix_refs.nil? || fix_refs.empty?
+
+  fix_refs.each do |ref|
+    if !ref.include?("/")
+      raise "Ref #{ref} did not specify an origin. Please specify the origin, e.g. privatemirror/mybranch"
+    end
+  end
+
+  puts "Staging security fixes for #{base} branch: #{fix_refs.inspect}"
+
+  branch = "security/#{base}-security-fixes"
+
+  with_clean_worktree(base) do
+    git "branch", "-D", branch if ref_exists?(branch)
+    git "checkout", "-b", branch
+
+    fix_refs.each do |ref|
+      origin, origin_branch = ref.split("/", 2)
+      git "fetch", origin, origin_branch
+
+      first_commit_on_branch = git("log", "--format=%H", "origin/#{base}..#{ref}").lines.last.strip
+      author = git("log", "-n", "1", "--format=%an <%ae>", first_commit_on_branch).strip
+      message = git("log", "-n", "1", "--format=%B", first_commit_on_branch).strip
+
+      git "merge", "--squash", ref
+      git "commit", "--author", author, "-m", message
+    end
+
+    puts "Finished merging commits into a locally-staged #{branch} branch. Git log is:"
+    puts git("log", "origin/#{base}..#{branch}")
+
+    confirm "Check the log above. Ready to push this branch to the origin and create a PR?"
+    git("push", "-f", "--set-upstream", "origin", branch)
+
+    make_pr(base: base, branch: branch, title: "Security fixes for #{base}")
+    fastforward(base: base, branch: branch)
+  end
+end
diff --git a/lib/theme_javascript_compiler.rb b/lib/theme_javascript_compiler.rb
index 65d10d96fe6..c4d15e67558 100644
--- a/lib/theme_javascript_compiler.rb
+++ b/lib/theme_javascript_compiler.rb
@@ -97,8 +97,14 @@ class ThemeJavascriptCompiler
     tree.transform_keys! do |filename|
       if filename.ends_with? ".js.es6"
         filename.sub(/\.js\.es6\z/, ".js")
-      elsif filename.ends_with? ".raw.hbs"
-        filename.sub(/\.raw\.hbs\z/, ".hbr")
+      elsif filename.include? "/templates/"
+        filename = filename.sub(/\.raw\.hbs\z/, ".hbr") if filename.ends_with? ".raw.hbs"
+
+        if filename.ends_with? ".hbr"
+          filename.sub(%r{/templates/}, "/raw-templates/")
+        else
+          filename
+        end
       else
         filename
       end
@@ -168,7 +174,7 @@ class ThemeJavascriptCompiler
       elsif extension == "hbs"
         append_ember_template(module_name, content)
       elsif extension == "hbr"
-        append_raw_template(module_name.sub("discourse/templates/", ""), content)
+        append_raw_template(module_name.sub("discourse/raw-templates/", ""), content)
       else
         append_js_error(filename, "unknown file extension '#{extension}' (#{filename})")
       end
@@ -200,7 +206,7 @@ class ThemeJavascriptCompiler
   end
 
   def raw_template_name(name)
-    name = name.sub(/\.(raw|hbr)$/, "")
+    name = name.sub(/\.(raw|hbr)\z/, "")
     name.inspect
   end
 
@@ -228,7 +234,7 @@ class ThemeJavascriptCompiler
 
   def append_module(script, name, include_variables: true)
     original_filename = name
-    name = "discourse/theme-#{@theme_id}/#{name.gsub(%r{^discourse/}, "")}"
+    name = "discourse/theme-#{@theme_id}/#{name.gsub(%r{\Adiscourse/}, "")}"
 
     script = "#{theme_settings}#{script}" if include_variables
     transpiler = DiscourseJsProcessor::Transpiler.new
diff --git a/lib/theme_settings_manager.rb b/lib/theme_settings_manager.rb
index 1c353059f64..7a5f987ab8e 100644
--- a/lib/theme_settings_manager.rb
+++ b/lib/theme_settings_manager.rb
@@ -184,7 +184,7 @@ class ThemeSettingsManager
 
   class Upload < self
     def value
-      cdn_url(super)
+      has_record? ? cdn_url(db_record.value) : default
     end
 
     def default
diff --git a/lib/topic_creator.rb b/lib/topic_creator.rb
index 084c71584a3..24245291c54 100644
--- a/lib/topic_creator.rb
+++ b/lib/topic_creator.rb
@@ -28,18 +28,9 @@ class TopicCreator
     category = find_category
     if category.present? && guardian.can_tag?(topic)
       tags = @opts[:tags].presence || []
-      existing_tags = tags.present? ? Tag.where(name: tags) : []
-      valid_tags = guardian.can_create_tag? ? tags : existing_tags
 
-      # all add to topic.errors
-      DiscourseTagging.validate_min_required_tags_for_category(
-        guardian,
-        topic,
-        category,
-        valid_tags,
-      )
-      DiscourseTagging.validate_required_tags_from_group(guardian, topic, category, existing_tags)
-      DiscourseTagging.validate_category_restricted_tags(guardian, topic, category, valid_tags)
+      # adds topic.errors
+      DiscourseTagging.validate_category_tags(guardian, topic, category, tags)
     end
 
     DiscourseEvent.trigger(:after_validate_topic, topic, self)
@@ -181,7 +172,7 @@ class TopicCreator
 
         return Category.find(SiteSetting.shared_drafts_category) if @opts[:shared_draft]
 
-        if (@opts[:category].is_a? Integer) || (@opts[:category] =~ /^\d+$/)
+        if (@opts[:category].is_a? Integer) || (@opts[:category] =~ /\A\d+\z/)
           Category.find_by(id: @opts[:category])
         end
       end
diff --git a/lib/topic_query.rb b/lib/topic_query.rb
index a2d1d1a8ae7..3409f754586 100644
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@@ -14,7 +14,7 @@ class TopicQuery
   def self.validators
     @validators ||=
       begin
-        int = lambda { |x| Integer === x || (String === x && x.match?(/^-?[0-9]+$/)) }
+        int = lambda { |x| Integer === x || (String === x && x.match?(/\A-?[0-9]+\z/)) }
         zero_up_to_max_int = lambda { |x| int.call(x) && x.to_i.between?(0, PG_MAX_INT) }
         array_or_string = lambda { |x| Array === x || String === x }
 
@@ -204,7 +204,8 @@ class TopicQuery
   end
 
   # Return a list of suggested topics for a topic
-  def list_suggested_for(topic, pm_params: nil)
+  # The include_random param was added so plugins can generate a suggested topics list without the random topics
+  def list_suggested_for(topic, pm_params: nil, include_random: true)
     # Don't suggest messages unless we have a user, and private messages are
     # enabled.
     if topic.private_message? &&
@@ -216,6 +217,13 @@ class TopicQuery
 
     pm_params = pm_params || get_pm_params(topic)
 
+    if DiscoursePluginRegistry.list_suggested_for_providers.any?
+      DiscoursePluginRegistry.list_suggested_for_providers.each do |provider|
+        suggested = provider.call(topic, pm_params, self)
+        builder.add_results(suggested[:result]) if suggested && !suggested[:result].blank?
+      end
+    end
+
     # When logged in we start with different results
     if @user
       if topic.private_message?
@@ -227,23 +235,33 @@ class TopicQuery
           builder.add_results(unread_messages(pm_params.merge(count: builder.results_left)))
         end
       else
-        builder.add_results(
-          unread_results(
-            topic: topic,
-            per_page: builder.results_left,
-            max_age: SiteSetting.suggested_topics_unread_max_days_old,
-          ),
-          :high,
-        )
+        if @user.new_new_view_enabled?
+          builder.add_results(
+            new_and_unread_results(
+              topic:,
+              per_page: builder.results_left,
+              max_age: SiteSetting.suggested_topics_unread_max_days_old,
+            ),
+          )
+        else
+          builder.add_results(
+            unread_results(
+              topic: topic,
+              per_page: builder.results_left,
+              max_age: SiteSetting.suggested_topics_unread_max_days_old,
+            ),
+            :high,
+          )
 
-        unless builder.full?
-          builder.add_results(new_results(topic: topic, per_page: builder.category_results_left))
+          unless builder.full?
+            builder.add_results(new_results(topic: topic, per_page: builder.category_results_left))
+          end
         end
       end
     end
 
     if !topic.private_message?
-      unless builder.full?
+      if include_random && !builder.full?
         builder.add_results(
           random_suggested(topic, builder.results_left, builder.excluded_topic_ids),
         )
@@ -260,6 +278,24 @@ class TopicQuery
     create_list(:latest, {}, latest_results)
   end
 
+  def list_filter
+    topics_filter =
+      TopicsFilter.new(
+        guardian: @guardian,
+        scope: latest_results(include_muted: false, skip_ordering: true),
+      )
+
+    results = topics_filter.filter_from_query_string(@options[:q])
+
+    if !topics_filter.topic_notification_levels.include?(NotificationLevels.all[:muted])
+      results = remove_muted_topics(results, @user)
+    end
+
+    results = apply_ordering(results) if results.order_values.empty?
+
+    create_list(:filter, {}, results)
+  end
+
   def list_read
     create_list(:read, unordered: true) do |topics|
       topics.where("tu.last_visited_at IS NOT NULL").order("tu.last_visited_at DESC")
@@ -267,7 +303,11 @@ class TopicQuery
   end
 
   def list_new
-    create_list(:new, { unordered: true }, new_results)
+    if @user&.new_new_view_enabled?
+      create_list(:new, { unordered: true }, new_and_unread_results)
+    else
+      create_list(:new, { unordered: true }, new_results)
+    end
   end
 
   def list_unread
@@ -430,7 +470,7 @@ class TopicQuery
       (pinned_topics + unpinned_topics)[0...limit] if limit
     else
       offset = (page * per_page) - pinned_topics.length
-      offset = 0 unless offset > 0
+      offset = 0 if offset <= 0
       unpinned_topics.offset(offset).to_a
     end
   end
@@ -439,6 +479,8 @@ class TopicQuery
     options[:filter] ||= filter
     topics ||= default_results(options)
     topics = yield(topics) if block_given?
+    topics =
+      DiscoursePluginRegistry.apply_modifier(:topic_query_create_list_topics, topics, options, self)
 
     options = options.merge(@options)
     if %w[activity default].include?(options[:order] || "activity") && !options[:unordered] &&
@@ -451,7 +493,8 @@ class TopicQuery
     if options[:preload_posters]
       user_ids = []
       topics.each do |ft|
-        user_ids << ft.user_id << ft.last_post_user_id << ft.featured_user_ids << ft.allowed_user_ids
+        user_ids << ft.user_id << ft.last_post_user_id << ft.featured_user_ids <<
+          ft.allowed_user_ids
       end
 
       user_lookup = UserLookup.new(user_ids)
@@ -465,7 +508,13 @@ class TopicQuery
     end
 
     topics.each do |t|
-      t.allowed_user_ids = filter == :private_messages ? t.allowed_users.map { |u| u.id } : []
+      if filter == :private_messages
+        t.allowed_user_ids = t.allowed_users.map { |u| u.id }
+        t.allowed_group_ids = t.allowed_groups.map { |g| g.id }
+      else
+        t.allowed_user_ids = []
+        t.allowed_group_ids = []
+      end
     end
 
     list = TopicList.new(filter, @user, topics, options.merge(@options))
@@ -507,21 +556,7 @@ class TopicQuery
         whisperer: @user&.whisperer?,
       ).order("CASE WHEN topics.user_id = tu.user_id THEN 1 ELSE 2 END")
 
-    if @user
-      # micro optimisation so we don't load up all of user stats which we do not need
-      unread_at =
-        DB.query_single("select first_unread_at from user_stats where user_id = ?", @user.id).first
-
-      if max_age = options[:max_age]
-        max_age_date = max_age.days.ago
-        unread_at ||= max_age_date
-        unread_at = unread_at > max_age_date ? unread_at : max_age_date
-      end
-
-      # perf note, in the past we tried doing this in a subquery but performance was
-      # terrible, also tried with a join and it was bad
-      result = result.where("topics.updated_at >= ?", unread_at)
-    end
+    result = apply_max_age_limit(result, options)
 
     self.class.results_filter_callbacks.each do |filter_callback|
       result = filter_callback.call(:unread, result, @user, options)
@@ -548,6 +583,29 @@ class TopicQuery
     suggested_ordering(result, options)
   end
 
+  def new_and_unread_results(options = {})
+    base = default_results(options.reverse_merge(unordered: true))
+
+    new_results =
+      TopicQuery.new_filter(
+        base,
+        treat_as_new_topic_start_date: @user.user_option.treat_as_new_topic_start_date,
+      )
+
+    new_results = remove_muted(new_results, @user, options)
+    new_results = remove_dismissed(new_results, @user)
+
+    unread_results =
+      apply_max_age_limit(TopicQuery.unread_filter(base, whisperer: @user&.whisperer?), options)
+
+    base.joins_values.concat(new_results.joins_values, unread_results.joins_values)
+    base.joins_values.uniq!
+    results = base.merge(new_results.or(unread_results))
+
+    results = results.order("CASE WHEN topics.user_id = tu.user_id THEN 1 ELSE 2 END")
+    suggested_ordering(results, options)
+  end
+
   protected
 
   def per_page_setting
@@ -582,7 +640,7 @@ class TopicQuery
     result.where("topics.category_id != ?", drafts_category_id)
   end
 
-  def apply_ordering(result, options)
+  def apply_ordering(result, options = {})
     sort_column = SORTABLE_MAPPING[options[:order]] || "default"
     sort_dir = (options[:ascending] == "true") ? "ASC" : "DESC"
 
@@ -630,8 +688,7 @@ class TopicQuery
     category_id = category_id_or_slug.to_i
 
     if category_id == 0
-      category_id =
-        Category.where(slug: category_id_or_slug, parent_category_id: nil).pluck_first(:id)
+      category_id = Category.where(slug: category_id_or_slug, parent_category_id: nil).pick(:id)
     end
 
     category_id
@@ -642,12 +699,16 @@ class TopicQuery
     options.reverse_merge!(@options)
     options.reverse_merge!(per_page: per_page_setting) unless options[:limit] == false
 
-    # Whether to return visible topics
-    options[:visible] = true if @user.nil? || @user.regular?
-    options[:visible] = false if @user && @user.id == options[:filtered_to_user]
+    # Whether to include unlisted (visible = false) topics
+    viewing_own_topics = @user && @user.id == options[:filtered_to_user]
+
+    if options[:visible].nil?
+      options[:visible] = true if @user.nil? || @user.regular?
+      options[:visible] = false if @guardian.can_see_unlisted_topics? || viewing_own_topics
+    end
 
     # Start with a list of all topics
-    result = Topic.unscoped.includes(:category)
+    result = Topic.includes(:category)
 
     if @user
       result =
@@ -665,7 +726,10 @@ class TopicQuery
         result = result.where("topics.category_id IN (?)", Category.subcategory_ids(category_id))
         if !SiteSetting.show_category_definitions_in_topic_lists
           result =
-            result.where("categories.topic_id <> topics.id OR topics.category_id = ?", category_id)
+            result.where(
+              "categories.topic_id IS DISTINCT FROM topics.id OR topics.category_id = ?",
+              category_id,
+            )
         end
       end
       result = result.references(:categories)
@@ -674,7 +738,7 @@ class TopicQuery
         filter = (options[:filter] || options[:f])
         # category default sort order
         sort_order, sort_ascending =
-          Category.where(id: category_id).pluck_first(:sort_order, :sort_ascending)
+          Category.where(id: category_id).pick(:sort_order, :sort_ascending)
         if sort_order && (filter.blank? || %i[latest unseen].include?(filter))
           options[:order] = sort_order
           options[:ascending] = !!sort_ascending ? "true" : "false"
@@ -686,67 +750,17 @@ class TopicQuery
     end
 
     if SiteSetting.tagging_enabled
-      result = result.preload(:tags)
-
-      tags_arg = @options[:tags]
-
-      if tags_arg && tags_arg.size > 0
-        tags_arg = tags_arg.split if String === tags_arg
-
-        tags_arg =
-          tags_arg.map do |t|
-            if String === t
-              t.downcase
-            else
-              t
-            end
-          end
-
-        tags_query = tags_arg[0].is_a?(String) ? Tag.where_name(tags_arg) : Tag.where(id: tags_arg)
-        tags = tags_query.select(:id, :target_tag_id).map { |t| t.target_tag_id || t.id }.uniq
-
-        if ActiveModel::Type::Boolean.new.cast(@options[:match_all_tags])
-          # ALL of the given tags:
-          if tags_arg.length == tags.length
-            tags.each_with_index do |tag, index|
-              sql_alias = ["t", index].join
-              result =
-                result.joins(
-                  "INNER JOIN topic_tags #{sql_alias} ON #{sql_alias}.topic_id = topics.id AND #{sql_alias}.tag_id = #{tag}",
-                )
-            end
-          else
-            result = result.none # don't return any results unless all tags exist in the database
-          end
-        else
-          # ANY of the given tags:
-          result = result.joins(:tags).where("tags.id in (?)", tags)
-        end
-
-        # TODO: this is very side-effecty and should be changed
-        # It is done cause further up we expect normalized tags
-        @options[:tags] = tags
-      elsif @options[:no_tags]
-        # the following will do: ("topics"."id" NOT IN (SELECT DISTINCT "topic_tags"."topic_id" FROM "topic_tags"))
-        result = result.where.not(id: TopicTag.distinct.pluck(:topic_id))
-      end
-
-      if @options[:exclude_tag].present? &&
-           !DiscourseTagging.hidden_tag_names(@guardian).include?(@options[:exclude_tag])
-        result = result.where(<<~SQL, name: @options[:exclude_tag])
-          topics.id NOT IN (
-            SELECT topic_tags.topic_id
-            FROM topic_tags
-            INNER JOIN tags ON tags.id = topic_tags.tag_id
-            WHERE tags.name = :name
-          )
-          SQL
-      end
+      result = result.includes(:tags)
+      result = filter_by_tags(result)
     end
 
-    result = apply_ordering(result, options)
+    result = apply_ordering(result, options) if !options[:skip_ordering]
 
-    all_listable_topics = @guardian.filter_allowed_categories(Topic.unscoped.listable_topics)
+    all_listable_topics =
+      @guardian.filter_allowed_categories(
+        Topic.unscoped.listable_topics,
+        category_id_column: "categories.id",
+      )
 
     if options[:include_pms] || options[:include_all_pms]
       all_pm_topics =
@@ -805,8 +819,6 @@ class TopicQuery
         )
     end
 
-    require_deleted_clause = true
-
     if before = options[:before]
       if (before = before.to_i) > 0
         result = result.where("topics.created_at < ?", before.to_i.days.ago)
@@ -820,24 +832,11 @@ class TopicQuery
     end
 
     if status = options[:status]
-      case status
-      when "open"
-        result = result.where("NOT topics.closed AND NOT topics.archived")
-      when "closed"
-        result = result.where("topics.closed")
-      when "archived"
-        result = result.where("topics.archived")
-      when "listed"
-        result = result.where("topics.visible")
-      when "unlisted"
-        result = result.where("NOT topics.visible")
-      when "deleted"
-        category = Category.find_by(id: options[:category])
-        if @guardian.can_see_deleted_topics?(category)
-          result = result.where("topics.deleted_at IS NOT NULL")
-          require_deleted_clause = false
-        end
-      end
+      result =
+        TopicsFilter.new(scope: result, guardian: @guardian).filter_status(
+          status: options[:status],
+          category_id: options[:category],
+        )
     end
 
     if (filter = (options[:filter] || options[:f])) && @user
@@ -860,7 +859,6 @@ class TopicQuery
       result = TopicQuery.tracked_filter(result, @user.id) if filter == "tracked"
     end
 
-    result = result.where("topics.deleted_at IS NULL") if require_deleted_clause
     result = result.where("topics.posts_count <= ?", options[:max_posts]) if options[
       :max_posts
     ].present?
@@ -874,7 +872,11 @@ class TopicQuery
   end
 
   def remove_muted(list, user, options)
-    list = remove_muted_topics(list, user) unless options && options[:state] == "muted"
+    if options && (options[:include_muted].nil? || options[:include_muted]) &&
+         options[:state] != "muted"
+      list = remove_muted_topics(list, user)
+    end
+
     list = remove_muted_categories(list, user, exclude: options[:category])
     TopicQuery.remove_muted_tags(list, user, options)
   end
@@ -895,24 +897,42 @@ class TopicQuery
     category_id = get_category_id(opts[:exclude]) if opts
 
     if user
+      watched_tag_ids =
+        if user.watched_precedence_over_muted
+          TagUser
+            .where(user: user)
+            .where("notification_level >= ?", TopicUser.notification_levels[:watching])
+            .pluck(:tag_id)
+        else
+          []
+        end
+
+      # OR watched_topic_tags.id IS NOT NULL",
       list =
-        list
-          .references("cu")
-          .joins(
-            "LEFT JOIN category_users ON category_users.category_id = topics.category_id AND category_users.user_id = #{user.id}",
+        list.references("cu").joins(
+          "LEFT JOIN category_users ON category_users.category_id = topics.category_id AND category_users.user_id = #{user.id}",
+        )
+      if watched_tag_ids.present?
+        list =
+          list.joins(
+            "LEFT JOIN topic_tags watched_topic_tags ON watched_topic_tags.topic_id = topics.id AND #{DB.sql_fragment("watched_topic_tags.tag_id IN (?)", watched_tag_ids)}",
           )
-          .where(
-            "topics.category_id = :category_id
+      end
+
+      list =
+        list.where(
+          "topics.category_id = :category_id
                 OR
                 (COALESCE(category_users.notification_level, :default) <> :muted AND (topics.category_id IS NULL OR topics.category_id NOT IN(:indirectly_muted_category_ids)))
+                #{watched_tag_ids.present? ? "OR watched_topic_tags.id IS NOT NULL" : ""}
                 OR tu.notification_level > :regular",
-            category_id: category_id || -1,
-            default: CategoryUser.default_notification_level,
-            indirectly_muted_category_ids:
-              CategoryUser.indirectly_muted_category_ids(user).presence || [-1],
-            muted: CategoryUser.notification_levels[:muted],
-            regular: TopicUser.notification_levels[:regular],
-          )
+          category_id: category_id || -1,
+          default: CategoryUser.default_notification_level,
+          indirectly_muted_category_ids:
+            CategoryUser.indirectly_muted_category_ids(user).presence || [-1],
+          muted: CategoryUser.notification_levels[:muted],
+          regular: TopicUser.notification_levels[:regular],
+        )
     elsif SiteSetting.mute_all_categories_by_default
       category_ids = [
         SiteSetting.default_categories_watching.split("|"),
@@ -922,12 +942,12 @@ class TopicQuery
       ].flatten.map(&:to_i)
       category_ids << category_id if category_id.present? && category_ids.exclude?(category_id)
 
-      list = list.where("topics.category_id IN (?)", category_ids) if category_ids.present?
+      list = list.where("categories.id IN (?)", category_ids) if category_ids.present?
     else
       category_ids = SiteSetting.default_categories_muted.split("|").map(&:to_i)
       category_ids -= [category_id] if category_id.present? && category_ids.include?(category_id)
 
-      list = list.where("topics.category_id NOT IN (?)", category_ids) if category_ids.present?
+      list = list.where("categories.id NOT IN (?)", category_ids) if category_ids.present?
     end
 
     list
@@ -961,6 +981,19 @@ class TopicQuery
       end
     end
 
+    query_params = { tag_ids: muted_tag_ids }
+
+    if user && !opts[:skip_categories]
+      query_params[:regular] = CategoryUser.notification_levels[:regular]
+
+      query_params[:watching_or_infinite] = if user.watched_precedence_over_muted ||
+           SiteSetting.watched_precedence_over_muted
+        CategoryUser.notification_levels[:watching]
+      else
+        99
+      end
+    end
+
     if SiteSetting.remove_muted_tags_from_latest == "always"
       list =
         list.where(
@@ -969,8 +1002,9 @@ class TopicQuery
           SELECT 1
             FROM topic_tags tt
            WHERE tt.tag_id IN (:tag_ids)
-             AND tt.topic_id = topics.id)",
-          tag_ids: muted_tag_ids,
+             AND tt.topic_id = topics.id
+             #{user && !opts[:skip_categories] ? "AND COALESCE(category_users.notification_level, :regular) < :watching_or_infinite" : ""})",
+          query_params,
         )
     else
       list =
@@ -979,10 +1013,11 @@ class TopicQuery
         EXISTS (
           SELECT 1
             FROM topic_tags tt
-           WHERE tt.tag_id NOT IN (:tag_ids)
-             AND tt.topic_id = topics.id
+           WHERE (tt.tag_id NOT IN (:tag_ids)
+             AND tt.topic_id = topics.id)
+             #{user && !opts[:skip_categories] ? "OR COALESCE(category_users.notification_level, :regular) >= :watching_or_infinite" : ""}
         ) OR NOT EXISTS (SELECT 1 FROM topic_tags tt WHERE tt.topic_id = topics.id)",
-          tag_ids: muted_tag_ids,
+          query_params,
         )
     end
   end
@@ -1019,7 +1054,7 @@ class TopicQuery
           :first_unread_pm_at,
         )
       else
-        UserStat.where(user_id: @user.id).pluck_first(:first_unread_pm_at)
+        UserStat.where(user_id: @user.id).pick(:first_unread_pm_at)
       end
 
     query = query.where("topics.updated_at >= ?", first_unread_pm_at) if first_unread_pm_at
@@ -1164,4 +1199,73 @@ class TopicQuery
     col_name = whisperer ? "highest_staff_post_number" : "highest_post_number"
     list.where("tu.last_read_post_number IS NULL OR tu.last_read_post_number < topics.#{col_name}")
   end
+
+  def apply_max_age_limit(results, options)
+    if @user
+      # micro optimisation so we don't load up all of user stats which we do not need
+      unread_at =
+        DB.query_single("select first_unread_at from user_stats where user_id = ?", @user.id).first
+
+      if max_age = options[:max_age]
+        max_age_date = max_age.days.ago
+        unread_at ||= max_age_date
+        unread_at = unread_at > max_age_date ? unread_at : max_age_date
+      end
+
+      # perf note, in the past we tried doing this in a subquery but performance was
+      # terrible, also tried with a join and it was bad
+      results = results.where("topics.updated_at >= ?", unread_at)
+    end
+    results
+  end
+
+  def filter_by_tags(result)
+    tags_arg = @options[:tags]
+
+    if tags_arg && tags_arg.size > 0
+      tags_arg = tags_arg.split if String === tags_arg
+      tags_query = tags_arg[0].is_a?(String) ? Tag.where_name(tags_arg) : Tag.where(id: tags_arg)
+      tags = tags_query.select(:id, :target_tag_id).map { |t| t.target_tag_id || t.id }.uniq
+
+      if ActiveModel::Type::Boolean.new.cast(@options[:match_all_tags])
+        # ALL of the given tags:
+        if tags_arg.length == tags.length
+          tags.each_with_index do |tag, index|
+            sql_alias = ["t", index].join
+
+            result =
+              result.joins(
+                "INNER JOIN topic_tags #{sql_alias} ON #{sql_alias}.topic_id = topics.id AND #{sql_alias}.tag_id = #{tag}",
+              )
+          end
+        else
+          result = result.none # don't return any results unless all tags exist in the database
+        end
+      else
+        # ANY of the given tags:
+        result = result.joins(:tags).where("tags.id in (?)", tags)
+      end
+
+      # TODO: this is very side-effecty and should be changed
+      # It is done cause further up we expect normalized tags
+      @options[:tags] = tags
+    elsif @options[:no_tags]
+      # the following will do: ("topics"."id" NOT IN (SELECT DISTINCT "topic_tags"."topic_id" FROM "topic_tags"))
+      result = result.where.not(id: TopicTag.distinct.select(:topic_id))
+    end
+
+    if @options[:exclude_tag].present? &&
+         !DiscourseTagging.hidden_tag_names(@guardian).include?(@options[:exclude_tag])
+      result = result.where(<<~SQL, name: @options[:exclude_tag])
+        topics.id NOT IN (
+          SELECT topic_tags.topic_id
+          FROM topic_tags
+          INNER JOIN tags ON tags.id = topic_tags.tag_id
+          WHERE tags.name = :name
+        )
+        SQL
+    end
+
+    result
+  end
 end
diff --git a/lib/topic_query/private_message_lists.rb b/lib/topic_query/private_message_lists.rb
index 0c4874ba2a8..53bd63c64c3 100644
--- a/lib/topic_query/private_message_lists.rb
+++ b/lib/topic_query/private_message_lists.rb
@@ -3,15 +3,20 @@
 class TopicQuery
   module PrivateMessageLists
     def list_private_messages(user, &blk)
-      list = private_messages_for(user, :user)
+      list = user_personal_private_messages(user)
       list = not_archived(list, user)
       list = have_posts_from_others(list, user)
 
       create_list(:private_messages, {}, list, &blk)
     end
 
-    def list_private_messages_direct_and_groups(user, &blk)
-      list = private_messages_for(user, :all)
+    def list_private_messages_direct_and_groups(user, groups_messages_notification_level: nil, &blk)
+      list =
+        user_personal_and_groups_private_messages(
+          user,
+          groups_messages_notification_level: groups_messages_notification_level,
+        )
+
       list = not_archived(list, user)
       list = not_archived_in_groups(list)
       list = have_posts_from_others(list, user)
@@ -20,14 +25,16 @@ class TopicQuery
     end
 
     def list_private_messages_archive(user)
-      list = private_messages_for(user, :user)
+      list = user_personal_private_messages(user)
+
       list =
         list.joins(:user_archived_messages).where("user_archived_messages.user_id = ?", user.id)
+
       create_list(:private_messages, {}, list)
     end
 
     def list_private_messages_sent(user)
-      list = private_messages_for(user, :user)
+      list = user_personal_private_messages(user)
 
       list = list.where(<<~SQL, user.id)
       EXISTS (
@@ -42,7 +49,7 @@ class TopicQuery
 
     def list_private_messages_new(user, type = :user)
       list = filter_private_message_new(user, type)
-      list = TopicQuery.remove_muted_tags(list, user)
+      list = TopicQuery.remove_muted_tags(list, user, skip_categories: true)
       list = remove_dismissed(list, user)
 
       create_list(:private_messages, {}, list)
@@ -54,7 +61,7 @@ class TopicQuery
     end
 
     def list_private_messages_group(user)
-      list = private_messages_for(user, :group)
+      list = user_groups_private_messages(user)
 
       list = list.joins(<<~SQL)
       LEFT JOIN group_archived_messages gm
@@ -64,11 +71,11 @@ class TopicQuery
       list = list.where("gm.id IS NULL")
       publish_read_state = !!group.publish_read_state
       list = append_read_state(list, group) if publish_read_state
-      create_list(:private_messages, { publish_read_state: publish_read_state }, list)
+      create_list(:private_messages, { publish_read_state: publish_read_state, group: group }, list)
     end
 
     def list_private_messages_group_archive(user)
-      list = private_messages_for(user, :group)
+      list = user_groups_private_messages(user)
 
       list = list.joins(<<~SQL)
       INNER JOIN group_archived_messages gm
@@ -77,7 +84,7 @@ class TopicQuery
 
       publish_read_state = !!group.publish_read_state
       list = append_read_state(list, group) if publish_read_state
-      create_list(:private_messages, { publish_read_state: publish_read_state }, list)
+      create_list(:private_messages, { publish_read_state: publish_read_state, group: group }, list)
     end
 
     def list_private_messages_group_new(user)
@@ -85,18 +92,18 @@ class TopicQuery
       list = remove_dismissed(list, user)
       publish_read_state = !!group.publish_read_state
       list = append_read_state(list, group) if publish_read_state
-      create_list(:private_messages, { publish_read_state: publish_read_state }, list)
+      create_list(:private_messages, { publish_read_state: publish_read_state, group: group }, list)
     end
 
     def list_private_messages_group_unread(user)
       list = filter_private_messages_unread(user, :group)
       publish_read_state = !!group.publish_read_state
       list = append_read_state(list, group) if publish_read_state
-      create_list(:private_messages, { publish_read_state: publish_read_state }, list)
+      create_list(:private_messages, { publish_read_state: publish_read_state, group: group }, list)
     end
 
     def list_private_messages_warnings(user)
-      list = private_messages_for(user, :user)
+      list = user_personal_private_messages(user)
       list = list.where("topics.subtype = ?", TopicSubtype.moderator_warning)
       # Exclude official warnings that the user created, instead of received
       list = list.where("topics.user_id <> ?", user.id)
@@ -104,79 +111,24 @@ class TopicQuery
     end
 
     def private_messages_for(user, type)
-      options = @options
-      options.reverse_merge!(per_page: per_page_setting)
-
-      result = Topic.includes(:allowed_users)
-      result = result.includes(:tags) if SiteSetting.tagging_enabled
-
       if type == :group
-        result =
-          result.joins(
-            "INNER JOIN topic_allowed_groups tag ON tag.topic_id = topics.id AND tag.group_id IN (SELECT id FROM groups WHERE LOWER(name) = '#{PG::Connection.escape_string(@options[:group_name].downcase)}')",
-          )
-
-        unless user.admin?
-          result =
-            result.joins(
-              "INNER JOIN group_users gu ON gu.group_id = tag.group_id AND gu.user_id = #{user.id.to_i}",
-            )
-        end
+        user_groups_private_messages(user)
       elsif type == :user
-        result =
-          result.where(
-            "topics.id IN (SELECT topic_id FROM topic_allowed_users WHERE user_id = ?)",
-            user.id.to_i,
-          )
+        user_personal_private_messages(user)
       elsif type == :all
-        group_ids = group_with_messages_ids(user)
-
-        result =
-          if group_ids.present?
-            result.where(<<~SQL, user.id.to_i, group_ids)
-            topics.id IN (
-              SELECT topic_id
-              FROM topic_allowed_users
-              WHERE user_id = ?
-              UNION ALL
-              SELECT topic_id FROM topic_allowed_groups
-              WHERE group_id IN (?)
-            )
-          SQL
-          else
-            result.joins(<<~SQL)
-          INNER JOIN topic_allowed_users tau
-            ON tau.topic_id = topics.id
-            AND tau.user_id = #{user.id.to_i}
-          SQL
-          end
+        user_personal_and_groups_private_messages(user)
       end
-
-      result =
-        result
-          .joins(
-            "LEFT OUTER JOIN topic_users AS tu ON (topics.id = tu.topic_id AND tu.user_id = #{user.id.to_i})",
-          )
-          .order("topics.bumped_at DESC")
-          .private_messages
-
-      result = result.limit(options[:per_page]) unless options[:limit] == false
-      result = result.visible if options[:visible] || @user.nil? || @user.regular?
-
-      if options[:page]
-        offset = options[:page].to_i * options[:per_page]
-        result = result.offset(offset) if offset > 0
-      end
-      result
     end
 
     def list_private_messages_tag(user)
-      list = private_messages_for(user, :all)
+      list = user_personal_and_groups_private_messages(user)
+
       list =
         list.joins(
           "JOIN topic_tags tt ON tt.topic_id = topics.id
                         JOIN tags t ON t.id = tt.tag_id AND t.name = '#{@options[:tags][0]}'",
         )
+
       create_list(:private_messages, {}, list)
     end
 
@@ -188,7 +140,7 @@ class TopicQuery
         when :user
           user_first_unread_pm_at(user)
         when :group
-          GroupUser.where(user: user, group: group).pluck_first(:first_unread_pm_at)
+          GroupUser.where(user: user, group: group).pick(:first_unread_pm_at)
         else
           user_first_unread_pm_at = user_first_unread_pm_at(user)
 
@@ -284,7 +236,7 @@ class TopicQuery
     end
 
     def user_first_unread_pm_at(user)
-      UserStat.where(user: user).pluck_first(:first_unread_pm_at)
+      UserStat.where(user: user).pick(:first_unread_pm_at)
     end
 
     def group_with_messages_ids(user)
@@ -296,5 +248,99 @@ class TopicQuery
 
       @group_with_messages_ids[user.id] = user.groups.where(has_messages: true).pluck(:id)
     end
+
+    private
+
+    def private_messages_default_scope(user)
+      options = @options
+      options.reverse_merge!(per_page: per_page_setting)
+
+      result =
+        Topic
+          .private_messages
+          .includes(:allowed_users)
+          .includes(:allowed_groups)
+          .joins(
+            "LEFT OUTER JOIN topic_users AS tu ON (topics.id = tu.topic_id AND tu.user_id = #{user.id.to_i})",
+          )
+          .order("topics.bumped_at DESC")
+
+      result = result.includes(:tags) if SiteSetting.tagging_enabled
+      result = result.limit(options[:per_page]) unless options[:limit] == false
+      result = result.visible if options[:visible] || @user.nil? || @user.regular?
+
+      if options[:page]
+        offset = options[:page].to_i * options[:per_page]
+        result = result.offset(offset) if offset > 0
+      end
+
+      result
+    end
+
+    def user_groups_private_messages(user)
+      result = private_messages_default_scope(user)
+
+      result =
+        result.joins(
+          "INNER JOIN topic_allowed_groups tag ON tag.topic_id = topics.id AND tag.group_id IN (SELECT id FROM groups WHERE LOWER(name) = '#{PG::Connection.escape_string(@options[:group_name].downcase)}')",
+        )
+
+      unless user.admin?
+        result =
+          result.joins(
+            "INNER JOIN group_users gu ON gu.group_id = tag.group_id AND gu.user_id = #{user.id.to_i}",
+          )
+      end
+
+      result
+    end
+
+    def user_personal_private_messages(user)
+      result = private_messages_default_scope(user)
+
+      result.where(
+        "topics.id IN (SELECT topic_id FROM topic_allowed_users WHERE user_id = ?)",
+        user.id.to_i,
+      )
+    end
+
+    def user_personal_and_groups_private_messages(user, groups_messages_notification_level: nil)
+      result = private_messages_default_scope(user)
+      group_ids = group_with_messages_ids(user)
+
+      topic_allowed_groups_scope =
+        if groups_messages_notification_level.present? &&
+             notification_level =
+               NotificationLevels.topic_levels[groups_messages_notification_level]
+          <<~SQL
+          SELECT topic_allowed_groups.topic_id
+          FROM topic_allowed_groups
+          INNER JOIN topic_users ON topic_users.topic_id = topic_allowed_groups.topic_id AND topic_users.user_id = :user_id
+          WHERE group_id IN (:group_ids)
+          AND topic_users.notification_level >= #{notification_level.to_i}
+          SQL
+        else
+          "SELECT topic_id FROM topic_allowed_groups WHERE group_id IN (:group_ids)"
+        end
+
+      result =
+        if group_ids.present?
+          result.where(<<~SQL, user_id: user.id.to_i, group_ids: group_ids)
+          topics.id IN (
+            SELECT topic_id
+            FROM topic_allowed_users
+            WHERE user_id = :user_id
+            UNION ALL
+            #{topic_allowed_groups_scope}
+          )
+          SQL
+        else
+          result.joins(<<~SQL)
+          INNER JOIN topic_allowed_users tau
+          ON tau.topic_id = topics.id
+          AND tau.user_id = #{user.id.to_i}
+          SQL
+        end
+    end
   end
 end
diff --git a/lib/topic_query_params.rb b/lib/topic_query_params.rb
index 291886604d6..4195c3709aa 100644
--- a/lib/topic_query_params.rb
+++ b/lib/topic_query_params.rb
@@ -3,7 +3,7 @@
 module TopicQueryParams
   def build_topic_list_options
     options = {}
-    params[:tags] = [params[:tag_id]] if params[:tag_id].present? && guardian.can_tag_pms?
+    params[:tags] = [params[:tag_id], *Array(params[:tags])].uniq if params[:tag_id].present?
 
     TopicQuery.public_valid_options.each do |key|
       if params.key?(key)
@@ -18,18 +18,6 @@ module TopicQueryParams
       :no_subcategories
     ].present?
 
-    if hide_welcome_topic?
-      options[:except_topic_ids] ||= []
-      options[:except_topic_ids] << SiteSetting.welcome_topic_id
-    end
-
     options
   end
-
-  private
-
-  def hide_welcome_topic?
-    return false if !SiteSetting.bootstrap_mode_enabled
-    Site.welcome_topic_exists_and_is_not_edited?
-  end
 end
diff --git a/lib/topic_retriever.rb b/lib/topic_retriever.rb
index 6186ce58680..94da883250d 100644
--- a/lib/topic_retriever.rb
+++ b/lib/topic_retriever.rb
@@ -4,7 +4,6 @@ class TopicRetriever
   def initialize(embed_url, opts = nil)
     @embed_url = embed_url
     @opts = opts || {}
-    @author_username = @opts[:author_username]
   end
 
   def retrieve
@@ -35,21 +34,18 @@ class TopicRetriever
     # It's possible another process or job found the embed already. So if that happened bail out.
     return if TopicEmbed.where(embed_url: @embed_url).exists?
 
-    fetch_http
-  end
-
-  def fetch_http
-    if @author_username.nil?
-      username =
-        SiteSetting.embed_by_username.presence || SiteSetting.site_contact_username.presence ||
-          Discourse.system_user.username
-    else
-      username = @author_username
+    if @opts[:author_username].present?
+      Discourse.deprecate(
+        "discourse_username parameter has been deprecated. Prefer passing author name using a <meta> tag.",
+        since: "3.1.0.beta1",
+        drop_from: "3.2",
+      )
     end
 
-    user = User.where(username_lower: username.downcase).first
-    return if user.blank?
+    username =
+      @opts[:author_username].presence || SiteSetting.embed_by_username.presence ||
+        SiteSetting.site_contact_username.presence || Discourse.system_user.username
 
-    TopicEmbed.import_remote(@embed_url, user: user)
+    TopicEmbed.import_remote(@embed_url, user: User.find_by(username_lower: username.downcase))
   end
 end
diff --git a/lib/topic_view.rb b/lib/topic_view.rb
index f0811049513..f00b64a4771 100644
--- a/lib/topic_view.rb
+++ b/lib/topic_view.rb
@@ -31,8 +31,6 @@ class TopicView
     :personal_message,
     :can_review_topic,
     :page,
-    :mentioned_users,
-    :mentions,
   )
   alias queued_posts_enabled? queued_posts_enabled
 
@@ -144,9 +142,6 @@ class TopicView
       end
     end
 
-    parse_mentions
-    load_mentioned_users
-
     TopicView.preload(self)
 
     @draft_key = @topic.draft_key
@@ -249,9 +244,9 @@ class TopicView
       if @topic.category_id != SiteSetting.uncategorized_category_id && @topic.category_id &&
            @topic.category
         title += " - #{@topic.category.name}"
-      elsif SiteSetting.tagging_enabled && @topic.tags.exists?
+      elsif SiteSetting.tagging_enabled && visible_tags.exists?
         title +=
-          " - #{@topic.tags.order("tags.#{Tag.topic_count_column(@guardian)} DESC").first.name}"
+          " - #{visible_tags.order("tags.#{Tag.topic_count_column(@guardian)} DESC").first.name}"
       end
     end
     title
@@ -580,7 +575,7 @@ class TopicView
 
   def pending_posts
     @pending_posts ||=
-      ReviewableQueuedPost.pending.where(created_by: @user, topic: @topic).order(:created_at)
+      ReviewableQueuedPost.pending.where(target_created_by: @user, topic: @topic).order(:created_at)
   end
 
   def actions_summary
@@ -610,7 +605,16 @@ class TopicView
 
   def suggested_topics
     if @include_suggested
-      @suggested_topics ||= TopicQuery.new(@user).list_suggested_for(topic, pm_params: pm_params)
+      @suggested_topics ||=
+        begin
+          kwargs =
+            DiscoursePluginRegistry.apply_modifier(
+              :topic_view_suggested_topics_options,
+              { include_random: true, pm_params: pm_params },
+              self,
+            )
+          TopicQuery.new(@user).list_suggested_for(topic, **kwargs)
+        end
     else
       nil
     end
@@ -676,7 +680,7 @@ class TopicView
   end
 
   def filtered_post_id(post_number)
-    @filtered_posts.where(post_number: post_number).pluck_first(:id)
+    @filtered_posts.where(post_number: post_number).pick(:id)
   end
 
   def is_mega_topic?
@@ -684,7 +688,7 @@ class TopicView
   end
 
   def last_post_id
-    @filtered_posts.reverse_order.pluck_first(:id)
+    @filtered_posts.reverse_order.pick(:id)
   end
 
   def current_post_number
@@ -701,17 +705,25 @@ class TopicView
     @topic.published_page
   end
 
-  def parse_mentions
-    @mentions = @posts.to_h { |p| [p.id, p.mentions] }.reject { |_, v| v.empty? }
+  def mentioned_users
+    @mentioned_users ||=
+      begin
+        mentions = @posts.to_h { |p| [p.id, p.mentions] }.reject { |_, v| v.empty? }
+        usernames = mentions.values
+        usernames.flatten!
+        usernames.uniq!
+
+        users = User.where(username: usernames).includes(:user_status).index_by(&:username)
+
+        mentions.reduce({}) do |hash, (post_id, post_mentioned_usernames)|
+          hash[post_id] = post_mentioned_usernames.map { |username| users[username] }.compact
+          hash
+        end
+      end
   end
 
-  def load_mentioned_users
-    usernames = @mentions.values.flatten.uniq
-    mentioned_users = User.where(username: usernames)
-
-    mentioned_users = mentioned_users.includes(:user_status) if SiteSetting.enable_user_status
-
-    @mentioned_users = mentioned_users.to_h { |u| [u.username, u] }
+  def summarizable?
+    Summarization::Base.can_see_summary?(@topic, @user)
   end
 
   protected
@@ -815,13 +827,9 @@ class TopicView
   end
 
   def find_topic(topic_or_topic_id)
-    if topic_or_topic_id.is_a?(Topic)
-      topic_or_topic_id
-    else
-      # with_deleted covered in #check_and_raise_exceptions
-      finder = Topic.with_deleted.where(id: topic_or_topic_id).includes(:category)
-      finder.first
-    end
+    return topic_or_topic_id if topic_or_topic_id.is_a?(Topic)
+    # with_deleted covered in #check_and_raise_exceptions
+    Topic.with_deleted.includes(:category).find_by(id: topic_or_topic_id)
   end
 
   def unfiltered_posts
@@ -991,4 +999,8 @@ class TopicView
       end
     end
   end
+
+  def visible_tags
+    @visible_tags ||= topic.tags.visible(guardian)
+  end
 end
diff --git a/lib/topics_bulk_action.rb b/lib/topics_bulk_action.rb
index 4ea47b6eb03..bc62ad10e34 100644
--- a/lib/topics_bulk_action.rb
+++ b/lib/topics_bulk_action.rb
@@ -86,6 +86,7 @@ class TopicsBulkAction
   def dismiss_posts
     highest_number_source_column =
       @user.whisperer? ? "highest_staff_post_number" : "highest_post_number"
+
     sql = <<~SQL
       UPDATE topic_users tu
       SET last_read_post_number = t.#{highest_number_source_column}
@@ -94,6 +95,8 @@ class TopicsBulkAction
     SQL
 
     DB.exec(sql, user_id: @user.id, topic_ids: @topic_ids)
+    TopicTrackingState.publish_dismiss_new_posts(@user.id, topic_ids: @topic_ids.sort)
+
     @changed_ids.concat @topic_ids
   end
 
@@ -115,7 +118,9 @@ class TopicsBulkAction
       now = Time.zone.now
       rows = ids.map { |id| { topic_id: id, user_id: @user.id, created_at: now } }
       DismissedTopicUser.insert_all(rows)
+      TopicTrackingState.publish_dismiss_new(@user.id, topic_ids: ids.sort)
     end
+
     @changed_ids = ids
   end
 
diff --git a/lib/topics_filter.rb b/lib/topics_filter.rb
new file mode 100644
index 00000000000..5ffa80319f1
--- /dev/null
+++ b/lib/topics_filter.rb
@@ -0,0 +1,524 @@
+# frozen_string_literal: true
+
+class TopicsFilter
+  attr_reader :topic_notification_levels
+
+  def initialize(guardian:, scope: Topic.all)
+    @guardian = guardian
+    @scope = scope
+    @topic_notification_levels = Set.new
+  end
+
+  FILTER_ALIASES = { "categories" => "category", "tags" => "tag" }
+  private_constant :FILTER_ALIASES
+
+  def filter_from_query_string(query_string)
+    return @scope if query_string.blank?
+
+    filters = {}
+
+    query_string.scan(
+      /(?<key_prefix>(?:-|=|-=|=-))?(?<key>[\w-]+):(?<value>[^\s]+)/,
+    ) do |key_prefix, key, value|
+      key = FILTER_ALIASES[key] || key
+
+      filters[key] ||= {}
+      filters[key]["key_prefixes"] ||= []
+      filters[key]["key_prefixes"] << key_prefix
+      filters[key]["values"] ||= []
+      filters[key]["values"] << value
+    end
+
+    filters.each do |filter, hash|
+      key_prefixes = hash["key_prefixes"]
+      values = hash["values"]
+
+      filter_values = extract_and_validate_value_for(filter, values)
+
+      case filter
+      when "activity-before"
+        filter_by_activity(before: filter_values)
+      when "activity-after"
+        filter_by_activity(after: filter_values)
+      when "category"
+        filter_categories(values: key_prefixes.zip(filter_values))
+      when "created-after"
+        filter_by_created(after: filter_values)
+      when "created-before"
+        filter_by_created(before: filter_values)
+      when "created-by"
+        filter_created_by_user(usernames: filter_values.flat_map { |value| value.split(",") })
+      when "in"
+        filter_in(values: filter_values)
+      when "latest-post-after"
+        filter_by_latest_post(after: filter_values)
+      when "latest-post-before"
+        filter_by_latest_post(before: filter_values)
+      when "likes-min"
+        filter_by_number_of_likes(min: filter_values)
+      when "likes-max"
+        filter_by_number_of_likes(max: filter_values)
+      when "likes-op-min"
+        filter_by_number_of_likes_in_first_post(min: filter_values)
+      when "likes-op-max"
+        filter_by_number_of_likes_in_first_post(max: filter_values)
+      when "order"
+        order_by(values: filter_values)
+      when "posts-min"
+        filter_by_number_of_posts(min: filter_values)
+      when "posts-max"
+        filter_by_number_of_posts(max: filter_values)
+      when "posters-min"
+        filter_by_number_of_posters(min: filter_values)
+      when "posters-max"
+        filter_by_number_of_posters(max: filter_values)
+      when "status"
+        filter_values.each { |status| @scope = filter_status(status: status) }
+      when "tag"
+        filter_tags(values: key_prefixes.zip(filter_values))
+      when "views-min"
+        filter_by_number_of_views(min: filter_values)
+      when "views-max"
+        filter_by_number_of_views(max: filter_values)
+      end
+    end
+
+    @scope
+  end
+
+  def filter_status(status:, category_id: nil)
+    case status
+    when "open"
+      @scope = @scope.where("NOT topics.closed AND NOT topics.archived")
+    when "closed"
+      @scope = @scope.where("topics.closed")
+    when "archived"
+      @scope = @scope.where("topics.archived")
+    when "listed"
+      @scope = @scope.where("topics.visible")
+    when "unlisted"
+      @scope = @scope.where("NOT topics.visible")
+    when "deleted"
+      category = category_id.present? ? Category.find_by(id: category_id) : nil
+
+      if @guardian.can_see_deleted_topics?(category)
+        @scope = @scope.unscope(where: :deleted_at).where("topics.deleted_at IS NOT NULL")
+      end
+    when "public"
+      @scope = @scope.joins(:category).where("NOT categories.read_restricted")
+    end
+
+    @scope
+  end
+
+  private
+
+  YYYY_MM_DD_REGEXP =
+    /\A(?<year>[12][0-9]{3})-(?<month>0?[1-9]|1[0-2])-(?<day>0?[1-9]|[12]\d|3[01])\z/
+  private_constant :YYYY_MM_DD_REGEXP
+
+  def extract_and_validate_value_for(filter, values)
+    case filter
+    when "activity-before", "activity-after", "created-before", "created-after",
+         "latest-post-before", "latest-post-after"
+      value = values.last
+
+      if match_data = value.match(YYYY_MM_DD_REGEXP)
+        Time.zone.parse(
+          "#{match_data[:year].to_i}-#{match_data[:month].to_i}-#{match_data[:day].to_i}",
+        )
+      end
+    when "likes-min", "likes-max", "likes-op-min", "likes-op-max", "posts-min", "posts-max",
+         "posters-min", "posters-max", "views-min", "views-max"
+      value = values.last
+      value if value =~ /\A\d+\z/
+    when "order"
+      values.flat_map { |value| value.split(",") }
+    when "created-by"
+      values.flat_map { |value| value.split(",").map { |username| username.delete_prefix("@") } }
+    else
+      values
+    end
+  end
+
+  def filter_by_topic_range(column_name:, min: nil, max: nil, scope: nil)
+    { min => ">=", max => "<=" }.each do |value, operator|
+      next if !value
+      @scope = (scope || @scope).where("#{column_name} #{operator} ?", value)
+    end
+  end
+
+  def filter_by_activity(before: nil, after: nil)
+    filter_by_topic_range(column_name: "topics.bumped_at", min: after, max: before)
+  end
+
+  def filter_by_created(before: nil, after: nil)
+    filter_by_topic_range(column_name: "topics.created_at", min: after, max: before)
+  end
+
+  def filter_by_latest_post(before: nil, after: nil)
+    filter_by_topic_range(column_name: "topics.last_posted_at", min: after, max: before)
+  end
+
+  def filter_by_number_of_posts(min: nil, max: nil)
+    filter_by_topic_range(column_name: "topics.posts_count", min:, max:)
+  end
+
+  def filter_by_number_of_posters(min: nil, max: nil)
+    filter_by_topic_range(column_name: "topics.participant_count", min:, max:)
+  end
+
+  def filter_by_number_of_likes(min: nil, max: nil)
+    filter_by_topic_range(column_name: "topics.like_count", min:, max:)
+  end
+
+  def filter_by_number_of_likes_in_first_post(min: nil, max: nil)
+    filter_by_topic_range(
+      column_name: "first_posts.like_count",
+      min:,
+      max:,
+      scope: self.joins_first_posts(@scope),
+    )
+  end
+
+  def filter_by_number_of_views(min: nil, max: nil)
+    filter_by_topic_range(column_name: "views", min:, max:)
+  end
+
+  def filter_categories(values:)
+    category_slugs = {
+      include: {
+        with_subcategories: [],
+        without_subcategories: [],
+      },
+      exclude: {
+        with_subcategories: [],
+        without_subcategories: [],
+      },
+    }
+
+    values.each do |key_prefix, value|
+      exclude_categories = key_prefix&.include?("-")
+      exclude_subcategories = key_prefix&.include?("=")
+
+      value
+        .scan(
+          /\A(?<category_slugs>([\p{L}\p{N}\-:]+)(?<delimiter>[,])?([\p{L}\p{N}\-:]+)?(\k<delimiter>[\p{L}\p{N}\-:]+)*)\z/,
+        )
+        .each do |category_slugs_match, delimiter|
+          slugs = category_slugs_match.split(delimiter)
+          type = exclude_categories ? :exclude : :include
+          subcategory_type = exclude_subcategories ? :without_subcategories : :with_subcategories
+          category_slugs[type][subcategory_type].concat(slugs)
+        end
+    end
+
+    include_category_ids = []
+
+    if category_slugs[:include][:without_subcategories].present?
+      include_category_ids =
+        get_category_ids_from_slugs(
+          category_slugs[:include][:without_subcategories],
+          exclude_subcategories: true,
+        )
+    end
+
+    if category_slugs[:include][:with_subcategories].present?
+      include_category_ids.concat(
+        get_category_ids_from_slugs(
+          category_slugs[:include][:with_subcategories],
+          exclude_subcategories: false,
+        ),
+      )
+    end
+
+    if include_category_ids.present?
+      @scope = @scope.where("topics.category_id IN (?)", include_category_ids)
+    elsif category_slugs[:include].values.flatten.present?
+      @scope = @scope.none
+      return
+    end
+
+    exclude_category_ids = []
+
+    if category_slugs[:exclude][:without_subcategories].present?
+      exclude_category_ids =
+        get_category_ids_from_slugs(
+          category_slugs[:exclude][:without_subcategories],
+          exclude_subcategories: true,
+        )
+    end
+
+    if category_slugs[:exclude][:with_subcategories].present?
+      exclude_category_ids.concat(
+        get_category_ids_from_slugs(
+          category_slugs[:exclude][:with_subcategories],
+          exclude_subcategories: false,
+        ),
+      )
+    end
+
+    if exclude_category_ids.present?
+      @scope = @scope.where("topics.category_id NOT IN (?)", exclude_category_ids)
+    end
+  end
+
+  def filter_created_by_user(usernames:)
+    @scope =
+      @scope.joins(:user).where(
+        "users.username_lower IN (:usernames)",
+        usernames: usernames.map(&:downcase),
+      )
+  end
+
+  def filter_in(values:)
+    values.uniq!
+
+    if values.delete("pinned")
+      @scope =
+        @scope.where(
+          "topics.pinned_at IS NOT NULL AND topics.pinned_until > topics.pinned_at AND ? < topics.pinned_until",
+          Time.zone.now,
+        )
+    end
+
+    if @guardian.user
+      if values.delete("bookmarked")
+        @scope =
+          @scope.joins(:topic_users).where(
+            "topic_users.bookmarked AND topic_users.user_id = ?",
+            @guardian.user.id,
+          )
+      end
+
+      if values.present?
+        values.each do |value|
+          value
+            .split(",")
+            .each do |topic_notification_level|
+              if level = TopicUser.notification_levels[topic_notification_level.to_sym]
+                @topic_notification_levels << level
+              end
+            end
+        end
+
+        @scope =
+          @scope.joins(:topic_users).where(
+            "topic_users.notification_level IN (:topic_notification_levels) AND topic_users.user_id = :user_id",
+            topic_notification_levels: @topic_notification_levels.to_a,
+            user_id: @guardian.user.id,
+          )
+      end
+    elsif values.present?
+      @scope = @scope.none
+    end
+  end
+
+  def get_category_ids_from_slugs(slugs, exclude_subcategories: false)
+    category_ids = Category.ids_from_slugs(slugs)
+
+    category_ids =
+      Category
+        .where(id: category_ids)
+        .filter { |category| @guardian.can_see_category?(category) }
+        .map(&:id)
+
+    if !exclude_subcategories
+      category_ids = category_ids.flat_map { |category_id| Category.subcategory_ids(category_id) }
+    end
+
+    category_ids
+  end
+
+  # Accepts an array of tag names and returns an array of tag ids and the tag ids of aliases for the tag names which the user can see.
+  # If a block is given, it will be called with the tag ids and alias tag ids as arguments.
+  def tag_ids_from_tag_names(tag_names)
+    tag_ids, alias_tag_ids =
+      DiscourseTagging
+        .filter_visible(Tag, @guardian)
+        .where_name(tag_names)
+        .pluck(:id, :target_tag_id)
+        .transpose
+
+    tag_ids ||= []
+    alias_tag_ids ||= []
+
+    yield(tag_ids, alias_tag_ids) if block_given?
+
+    all_tag_ids = tag_ids.concat(alias_tag_ids)
+    all_tag_ids.compact!
+    all_tag_ids.uniq!
+    all_tag_ids
+  end
+
+  def filter_tags(values:)
+    return if !SiteSetting.tagging_enabled?
+
+    exclude_all_tags = []
+    exclude_any_tags = []
+    include_any_tags = []
+    include_all_tags = []
+
+    values.each do |key_prefix, value|
+      break if key_prefix && key_prefix != "-"
+
+      value.scan(
+        /\A(?<tag_names>([\p{N}\p{L}\-]+)(?<delimiter>[,+])?([\p{N}\p{L}\-]+)?(\k<delimiter>[\p{N}\p{L}\-]+)*)\z/,
+      ) do |tag_names, delimiter|
+        match_all =
+          if delimiter == ","
+            false
+          else
+            true
+          end
+
+        (
+          case [key_prefix, match_all]
+          in ["-", true]
+            exclude_all_tags
+          in ["-", false]
+            exclude_any_tags
+          in [nil, true]
+            include_all_tags
+          in [nil, false]
+            include_any_tags
+          end
+        ).concat(tag_names.split(delimiter))
+      end
+    end
+
+    if exclude_all_tags.present?
+      exclude_topics_with_all_tags(tag_ids_from_tag_names(exclude_all_tags))
+    end
+
+    if exclude_any_tags.present?
+      exclude_topics_with_any_tags(tag_ids_from_tag_names(exclude_any_tags))
+    end
+
+    if include_any_tags.present?
+      include_topics_with_any_tags(tag_ids_from_tag_names(include_any_tags))
+    end
+
+    if include_all_tags.present?
+      has_invalid_tags = false
+
+      all_tag_ids =
+        tag_ids_from_tag_names(include_all_tags) do |tag_ids, _|
+          has_invalid_tags = tag_ids.length < include_all_tags.length
+        end
+
+      if has_invalid_tags
+        @scope = @scope.none
+      else
+        include_topics_with_all_tags(all_tag_ids)
+      end
+    end
+  end
+
+  def topic_tags_alias
+    @topic_tags_alias ||= 0
+    "tt#{@topic_tags_alias += 1}"
+  end
+
+  def exclude_topics_with_all_tags(tag_ids)
+    where_clause = []
+
+    tag_ids.each do |tag_id|
+      sql_alias = "tt#{topic_tags_alias}"
+
+      @scope =
+        @scope.joins(
+          "LEFT JOIN topic_tags #{sql_alias} ON #{sql_alias}.topic_id = topics.id AND #{sql_alias}.tag_id = #{tag_id}",
+        )
+
+      where_clause << "#{sql_alias}.topic_id IS NULL"
+    end
+
+    @scope = @scope.where(where_clause.join(" OR "))
+  end
+
+  def exclude_topics_with_any_tags(tag_ids)
+    @scope =
+      @scope.where(
+        "topics.id NOT IN (SELECT DISTINCT topic_id FROM topic_tags WHERE topic_tags.tag_id IN (?))",
+        tag_ids,
+      )
+  end
+
+  def include_topics_with_all_tags(tag_ids)
+    tag_ids.each do |tag_id|
+      sql_alias = topic_tags_alias
+
+      @scope =
+        @scope.joins(
+          "INNER JOIN topic_tags #{sql_alias} ON #{sql_alias}.topic_id = topics.id AND #{sql_alias}.tag_id = #{tag_id}",
+        )
+    end
+  end
+
+  def include_topics_with_any_tags(tag_ids)
+    sql_alias = topic_tags_alias
+
+    @scope =
+      @scope
+        .joins("INNER JOIN topic_tags #{sql_alias} ON #{sql_alias}.topic_id = topics.id")
+        .where("#{sql_alias}.tag_id IN (?)", tag_ids)
+        .distinct(:id)
+  end
+
+  ORDER_BY_MAPPINGS = {
+    "activity" => {
+      column: "topics.bumped_at",
+    },
+    "category" => {
+      column: "categories.name",
+      scope: -> { @scope.joins(:category) },
+    },
+    "created" => {
+      column: "topics.created_at",
+    },
+    "latest-post" => {
+      column: "topics.last_posted_at",
+    },
+    "likes" => {
+      column: "topics.like_count",
+    },
+    "likes-op" => {
+      column: "first_posts.like_count",
+      scope: -> { joins_first_posts(@scope) },
+    },
+    "posters" => {
+      column: "topics.participant_count",
+    },
+    "title" => {
+      column: "LOWER(topics.title)",
+    },
+    "views" => {
+      column: "topics.views",
+    },
+  }
+  private_constant :ORDER_BY_MAPPINGS
+
+  ORDER_BY_REGEXP = /\A(?<order_by>#{ORDER_BY_MAPPINGS.keys.join("|")})(?<asc>-asc)?\z/
+  private_constant :ORDER_BY_REGEXP
+
+  def order_by(values:)
+    values.each do |value|
+      match_data = value.match(ORDER_BY_REGEXP)
+
+      if match_data && column_name = ORDER_BY_MAPPINGS.dig(match_data[:order_by], :column)
+        if scope = ORDER_BY_MAPPINGS.dig(match_data[:order_by], :scope)
+          @scope = instance_exec(&scope)
+        end
+
+        @scope = @scope.order("#{column_name} #{match_data[:asc] ? "ASC" : "DESC"}")
+      end
+    end
+  end
+
+  def joins_first_posts(scope)
+    scope.joins(
+      "INNER JOIN posts AS first_posts ON first_posts.topic_id = topics.id AND first_posts.post_number = 1",
+    )
+  end
+end
diff --git a/lib/trust_level.rb b/lib/trust_level.rb
index 184b44ced6e..8db2e634baf 100644
--- a/lib/trust_level.rb
+++ b/lib/trust_level.rb
@@ -38,7 +38,7 @@ class TrustLevel
     granted_trust_level = user.group_granted_trust_level || 0
     previous_trust_level = use_previous_trust_level ? find_previous_trust_level(user) : 0
 
-    [granted_trust_level, previous_trust_level].max
+    [granted_trust_level, previous_trust_level, SiteSetting.default_trust_level].max
   end
 
   private
@@ -48,7 +48,7 @@ class TrustLevel
       .where(action: UserHistory.actions[:change_trust_level])
       .where(target_user_id: user.id)
       .order(created_at: :desc)
-      .pluck_first(:new_value)
+      .pick(:new_value)
       .to_i
   end
 end
diff --git a/lib/turbo_tests.rb b/lib/turbo_tests.rb
index dd3e9c0b619..c8ecc41c6a0 100644
--- a/lib/turbo_tests.rb
+++ b/lib/turbo_tests.rb
@@ -15,6 +15,7 @@ require "parallel_tests/rspec/runner"
 require "./lib/turbo_tests/reporter"
 require "./lib/turbo_tests/runner"
 require "./lib/turbo_tests/json_rows_formatter"
+require "./lib/turbo_tests/documentation_formatter"
 
 module TurboTests
   FakeException = Struct.new(:backtrace, :message, :cause)
@@ -54,9 +55,18 @@ module TurboTests
   end
 
   FakeExample =
-    Struct.new(:execution_result, :location, :full_description, :metadata, :location_rerun_argument)
+    Struct.new(
+      :execution_result,
+      :location,
+      :description,
+      :full_description,
+      :metadata,
+      :location_rerun_argument,
+      :process_id,
+    )
+
   class FakeExample
-    def self.from_obj(obj)
+    def self.from_obj(obj, process_id)
       obj = obj.symbolize_keys
       metadata = obj[:metadata].symbolize_keys
 
@@ -71,9 +81,11 @@ module TurboTests
       new(
         FakeExecutionResult.from_obj(obj[:execution_result]),
         obj[:location],
+        obj[:description],
         obj[:full_description],
         metadata,
         obj[:location_rerun_argument],
+        process_id,
       )
     end
 
diff --git a/lib/turbo_tests/base_formatter.rb b/lib/turbo_tests/base_formatter.rb
new file mode 100644
index 00000000000..ab715a11def
--- /dev/null
+++ b/lib/turbo_tests/base_formatter.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+RSpec::Support.require_rspec_core "formatters/base_text_formatter"
+RSpec::Support.require_rspec_core "formatters/console_codes"
+
+module TurboTests
+  class BaseFormatter < RSpec::Core::Formatters::BaseTextFormatter
+    RSpec::Core::Formatters.register(self, :dump_summary)
+
+    def dump_summary(notification, timings)
+      if timings.present?
+        output.puts "\nTop #{timings.size} Slowest examples:"
+
+        timings.each do |(full_description, source_location, duration)|
+          output.puts "  #{full_description}"
+          output.puts "    #{RSpec::Core::Formatters::ConsoleCodes.wrap(duration.to_s + "ms", :bold)} #{source_location}"
+        end
+      end
+
+      super(notification)
+    end
+  end
+end
diff --git a/lib/turbo_tests/documentation_formatter.rb b/lib/turbo_tests/documentation_formatter.rb
new file mode 100644
index 00000000000..0fab466ab2b
--- /dev/null
+++ b/lib/turbo_tests/documentation_formatter.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module TurboTests
+  # An RSpec formatter that prepends the process id to all messages
+  class DocumentationFormatter < ::TurboTests::BaseFormatter
+    RSpec::Core::Formatters.register(self, :example_failed, :example_passed, :example_pending)
+
+    def example_passed(notification)
+      output.puts RSpec::Core::Formatters::ConsoleCodes.wrap(
+                    output_example(notification.example),
+                    :success,
+                  )
+
+      output.flush
+    end
+
+    def example_pending(notification)
+      message = notification.example.execution_result.pending_message
+
+      output.puts RSpec::Core::Formatters::ConsoleCodes.wrap(
+                    "#{output_example(notification.example)} (PENDING: #{message})",
+                    :pending,
+                  )
+
+      output.flush
+    end
+
+    def example_failed(notification)
+      output.puts RSpec::Core::Formatters::ConsoleCodes.wrap(
+                    "#{output_example(notification.example)} (FAILED - #{next_failure_index})",
+                    :failure,
+                  )
+
+      output.flush
+    end
+
+    private
+
+    def output_example(example)
+      output =
+        +"[#{example.process_id}] (##{example.metadata[:process_pid]}) #{example.full_description}"
+
+      if run_duration_ms = example.metadata[:run_duration_ms]
+        output << " (#{run_duration_ms}ms)"
+      end
+
+      output
+    end
+
+    def next_failure_index
+      @next_failure_index ||= 0
+      @next_failure_index += 1
+    end
+  end
+end
diff --git a/lib/turbo_tests/json_rows_formatter.rb b/lib/turbo_tests/json_rows_formatter.rb
index 35118c35027..e1ab129e382 100644
--- a/lib/turbo_tests/json_rows_formatter.rb
+++ b/lib/turbo_tests/json_rows_formatter.rb
@@ -54,6 +54,8 @@ module TurboTests
           shared_group_inclusion_backtrace:
             example.metadata[:shared_group_inclusion_backtrace].map(&method(:stack_frame_to_json)),
           extra_failure_lines: example.metadata[:extra_failure_lines],
+          run_duration_ms: example.metadata[:run_duration_ms],
+          process_pid: Process.pid,
         },
         location_rerun_argument: example.location_rerun_argument,
       }
diff --git a/lib/turbo_tests/progress_formatter.rb b/lib/turbo_tests/progress_formatter.rb
new file mode 100644
index 00000000000..210a8bd08d1
--- /dev/null
+++ b/lib/turbo_tests/progress_formatter.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module TurboTests
+  class ProgressFormatter < ::TurboTests::BaseFormatter
+    LINE_LENGTH = 80
+
+    RSpec::Core::Formatters.register(
+      self,
+      :example_passed,
+      :example_pending,
+      :example_failed,
+      :start_dump,
+    )
+
+    def initialize(*args)
+      super
+      @examples = 0
+    end
+
+    def example_passed(_notification)
+      output.print RSpec::Core::Formatters::ConsoleCodes.wrap(".", :success)
+      wrap
+    end
+
+    def example_pending(_notification)
+      output.print RSpec::Core::Formatters::ConsoleCodes.wrap("*", :pending)
+      wrap
+    end
+
+    def example_failed(_notification)
+      output.print RSpec::Core::Formatters::ConsoleCodes.wrap("F", :failure)
+      wrap
+    end
+
+    def start_dump(_notification)
+      output.puts
+    end
+
+    private
+
+    def wrap
+      @examples += 1
+
+      if ENV["GITHUB_ACTIONS"] && @examples == LINE_LENGTH
+        output.print "\n"
+        @examples = 0
+      end
+    end
+  end
+end
diff --git a/lib/turbo_tests/reporter.rb b/lib/turbo_tests/reporter.rb
index 67c2a71bc30..068735020c6 100644
--- a/lib/turbo_tests/reporter.rb
+++ b/lib/turbo_tests/reporter.rb
@@ -2,8 +2,8 @@
 
 module TurboTests
   class Reporter
-    def self.from_config(formatter_config, start_time)
-      reporter = new(start_time)
+    def self.from_config(formatter_config, start_time, max_timings_count: nil)
+      reporter = new(start_time:, max_timings_count:)
 
       formatter_config.each do |config|
         name, outputs = config.values_at(:name, :outputs)
@@ -18,8 +18,9 @@ module TurboTests
 
     attr_reader :pending_examples
     attr_reader :failed_examples
+    attr_reader :formatters
 
-    def initialize(start_time)
+    def initialize(start_time:, max_timings_count:)
       @formatters = []
       @pending_examples = []
       @failed_examples = []
@@ -27,6 +28,8 @@ module TurboTests
       @start_time = start_time
       @messages = []
       @errors_outside_of_examples_count = 0
+      @timings = []
+      @max_timings_count = max_timings_count
     end
 
     def add(name, outputs)
@@ -34,7 +37,9 @@ module TurboTests
         formatter_class =
           case name
           when "p", "progress"
-            RSpec::Core::Formatters::ProgressFormatter
+            TurboTests::ProgressFormatter
+          when "d", "documentation"
+            TurboTests::DocumentationFormatter
           else
             Kernel.const_get(name)
           end
@@ -47,6 +52,7 @@ module TurboTests
       delegate_to_formatters(:example_passed, example.notification)
 
       @all_examples << example
+      log_timing(example)
     end
 
     def example_pending(example)
@@ -54,6 +60,7 @@ module TurboTests
 
       @all_examples << example
       @pending_examples << example
+      log_timing(example)
     end
 
     def example_failed(example)
@@ -61,6 +68,7 @@ module TurboTests
 
       @all_examples << example
       @failed_examples << example
+      log_timing(example)
     end
 
     def message(message)
@@ -76,14 +84,17 @@ module TurboTests
       end_time = Time.now
 
       delegate_to_formatters(:start_dump, RSpec::Core::Notifications::NullNotification)
+
       delegate_to_formatters(
         :dump_pending,
         RSpec::Core::Notifications::ExamplesNotification.new(self),
       )
+
       delegate_to_formatters(
         :dump_failures,
         RSpec::Core::Notifications::ExamplesNotification.new(self),
       )
+
       delegate_to_formatters(
         :dump_summary,
         RSpec::Core::Notifications::SummaryNotification.new(
@@ -94,7 +105,9 @@ module TurboTests
           0,
           @errors_outside_of_examples_count,
         ),
+        @timings,
       )
+
       delegate_to_formatters(:close, RSpec::Core::Notifications::NullNotification)
     end
 
@@ -105,5 +118,15 @@ module TurboTests
         formatter.send(method, *args) if formatter.respond_to?(method)
       end
     end
+
+    private
+
+    def log_timing(example)
+      if run_duration_ms = example.metadata[:run_duration_ms]
+        @timings << [example.full_description, example.location, run_duration_ms]
+        @timings.sort_by! { |timing| -timing.last }
+        @timings.pop if @timings.size > @max_timings_count
+      end
+    end
   end
 end
diff --git a/lib/turbo_tests/runner.rb b/lib/turbo_tests/runner.rb
index b81be543ed9..c404a87f377 100644
--- a/lib/turbo_tests/runner.rb
+++ b/lib/turbo_tests/runner.rb
@@ -5,15 +5,47 @@ module TurboTests
     def self.run(opts = {})
       files = opts[:files]
       formatters = opts[:formatters]
+      seed = opts[:seed]
       start_time = opts.fetch(:start_time) { Time.now }
       verbose = opts.fetch(:verbose, false)
       fail_fast = opts.fetch(:fail_fast, nil)
+      use_runtime_info = opts.fetch(:use_runtime_info, false)
 
-      STDERR.puts "VERBOSE" if verbose
+      STDOUT.puts "VERBOSE" if verbose
 
-      reporter = Reporter.from_config(formatters, start_time)
+      reporter =
+        Reporter.from_config(
+          formatters,
+          start_time,
+          max_timings_count: opts[:profile_print_slowest_examples_count],
+        )
 
-      new(reporter: reporter, files: files, verbose: verbose, fail_fast: fail_fast).run
+      if ENV["GITHUB_ACTIONS"]
+        RSpec.configure do |config|
+          # Enable color output in GitHub Actions
+          # This eventually will be `config.color_mode = :on` in RSpec 4?
+          config.tty = true
+          config.color = true
+        end
+      end
+
+      new(
+        reporter: reporter,
+        files: files,
+        verbose: verbose,
+        fail_fast: fail_fast,
+        use_runtime_info: use_runtime_info,
+        seed: seed,
+        profile: opts[:profile],
+      ).run
+    end
+
+    def self.default_spec_folders
+      # We do not want to include system specs by default, they are quite slow.
+      Dir
+        .entries("#{Rails.root}/spec")
+        .reject { |entry| !File.directory?("spec/#{entry}") || %w[.. . system].include?(entry) }
+        .map { |entry| "spec/#{entry}" }
     end
 
     def initialize(opts)
@@ -21,6 +53,9 @@ module TurboTests
       @files = opts[:files]
       @verbose = opts[:verbose]
       @fail_fast = opts[:fail_fast]
+      @use_runtime_info = opts[:use_runtime_info]
+      @seed = opts[:seed]
+      @profile = opts[:profile]
       @failure_count = 0
 
       @messages = Queue.new
@@ -32,22 +67,16 @@ module TurboTests
       check_for_migrations
 
       @num_processes = ParallelTests.determine_number_of_processes(nil)
-      use_runtime_info = @files == ["spec"]
 
       group_opts = {}
-
-      if use_runtime_info
-        group_opts[:runtime_log] = "tmp/turbo_rspec_runtime.log"
-      else
-        group_opts[:group_by] = :filesize
-      end
+      group_opts[:runtime_log] = "tmp/turbo_rspec_runtime.log" if @use_runtime_info
 
       tests_in_groups =
         ParallelTests::RSpec::Runner.tests_in_groups(@files, @num_processes, **group_opts)
 
       setup_tmp_dir
 
-      subprocess_opts = { record_runtime: use_runtime_info }
+      subprocess_opts = { record_runtime: @use_runtime_info }
 
       start_multisite_subprocess(@files, **subprocess_opts)
 
@@ -136,8 +165,8 @@ module TurboTests
           "exec",
           "rspec",
           *extra_args,
-          "--seed",
-          rand(2**16).to_s,
+          "--order",
+          "random:#{@seed}",
           "--format",
           "TurboTests::JsonRowsFormatter",
           "--out",
@@ -146,12 +175,14 @@ module TurboTests
           *tests,
         ]
 
-        if @verbose
-          command_str =
-            [env.map { |k, v| "#{k}=#{v}" }.join(" "), command.join(" ")].select { |x| x.size > 0 }
-              .join(" ")
+        env["DISCOURSE_RSPEC_PROFILE_EACH_EXAMPLE"] = "1" if @profile
 
-          STDERR.puts "Process #{process_id}: #{command_str}"
+        if @verbose
+          command_str = [env.map { |k, v| "#{k}=#{v}" }.join(" "), command.join(" ")].join(" ")
+
+          STDOUT.puts "::group::[#{process_id}] Run RSpec" if ENV["GITHUB_ACTIONS"]
+          STDOUT.puts "Process #{process_id}: #{command_str}"
+          STDOUT.puts "::endgroup::" if ENV["GITHUB_ACTIONS"]
         end
 
         stdin, stdout, stderr, wait_thr = Open3.popen3(env, *command)
@@ -200,13 +231,13 @@ module TurboTests
           message = @messages.pop
           case message[:type]
           when "example_passed"
-            example = FakeExample.from_obj(message[:example])
+            example = FakeExample.from_obj(message[:example], message[:process_id])
             @reporter.example_passed(example)
           when "example_pending"
-            example = FakeExample.from_obj(message[:example])
+            example = FakeExample.from_obj(message[:example], message[:process_id])
             @reporter.example_pending(example)
           when "example_failed"
-            example = FakeExample.from_obj(message[:example])
+            example = FakeExample.from_obj(message[:example], message[:process_id])
             @reporter.example_failed(example)
             @failure_count += 1
             if fail_fast_met
@@ -222,6 +253,11 @@ module TurboTests
             @error = true
           when "exit"
             exited += 1
+
+            if @reporter.formatters.any? { |f| f.is_a?(DocumentationFormatter) }
+              @reporter.message("[#{message[:process_id]}] DONE (#{exited}/#{@num_processes + 1})")
+            end
+
             break if exited == @num_processes + 1
           else
             STDERR.puts("Unhandled message in main process: #{message}")
diff --git a/lib/twitter_api.rb b/lib/twitter_api.rb
index c7f5126e1e9..533c9ec2d9a 100644
--- a/lib/twitter_api.rb
+++ b/lib/twitter_api.rb
@@ -3,44 +3,48 @@
 # lightweight Twitter api calls
 class TwitterApi
   class << self
-    include ActionView::Helpers::NumberHelper
-
     BASE_URL = "https://api.twitter.com"
+    URL_PARAMS = %w[
+      tweet.fields=id,author_id,text,created_at,entities,referenced_tweets,public_metrics
+      user.fields=id,name,username,profile_image_url
+      media.fields=type,height,width,variants,preview_image_url,url
+      expansions=attachments.media_keys,referenced_tweets.id.author_id
+    ]
 
     def prettify_tweet(tweet)
-      text = tweet["full_text"].dup
-      if (entities = tweet["entities"]) && (urls = entities["urls"])
+      text = tweet[:data][:text].dup.to_s
+      if (entities = tweet[:data][:entities]) && (urls = entities[:urls])
         urls.each do |url|
-          text.gsub!(
-            url["url"],
-            "<a target='_blank' href='#{url["expanded_url"]}'>#{url["display_url"]}</a>",
-          )
+          if !url[:display_url].start_with?("pic.twitter.com")
+            text.gsub!(
+              url[:url],
+              "<a target='_blank' href='#{url[:expanded_url]}'>#{url[:display_url]}</a>",
+            )
+          else
+            text.gsub!(url[:url], "")
+          end
         end
       end
-
       text = link_hashtags_in link_handles_in text
-
       result = Rinku.auto_link(text, :all, 'target="_blank"').to_s
 
-      if tweet["extended_entities"] && media = tweet["extended_entities"]["media"]
+      if tweet[:includes] && media = tweet[:includes][:media]
         media.each do |m|
-          if m["type"] == "photo"
-            if large = m["sizes"]["large"]
-              result << "<div class='tweet-images'><img class='tweet-image' src='#{m["media_url_https"]}' width='#{large["w"]}' height='#{large["h"]}'></div>"
-            end
-          elsif m["type"] == "video" || m["type"] == "animated_gif"
+          if m[:type] == "photo"
+            result << "<div class='tweet-images'><img class='tweet-image' src='#{m[:url]}' width='#{m[:width]}' height='#{m[:height]}'></div>"
+          elsif m[:type] == "video" || m[:type] == "animated_gif"
             video_to_display =
-              m["video_info"]["variants"]
-                .select { |v| v["content_type"] == "video/mp4" }
-                .sort { |v| v["bitrate"] }
+              m[:variants]
+                .select { |v| v[:content_type] == "video/mp4" }
+                .sort { |v| v[:bit_rate] }
                 .last # choose highest bitrate
 
-            if video_to_display && url = video_to_display["url"]
-              width = m["sizes"]["large"]["w"]
-              height = m["sizes"]["large"]["h"]
+            if video_to_display && url = video_to_display[:url]
+              width = m[:width]
+              height = m[:height]
 
               attributes =
-                if m["type"] == "animated_gif"
+                if m[:type] == "animated_gif"
                   %w[playsinline loop muted autoplay disableRemotePlayback disablePictureInPicture]
                 else
                   %w[controls playsinline]
@@ -52,7 +56,7 @@ class TwitterApi
                     <video class='tweet-video' #{attributes}
                       width='#{width}'
                       height='#{height}'
-                      poster='#{m["media_url_https"]}'>
+                      poster='#{m[:preview_image_url]}'>
                       <source src='#{url}' type="video/mp4">
                     </video>
                   </div>
@@ -66,19 +70,6 @@ class TwitterApi
       result
     end
 
-    def prettify_number(count)
-      number_to_human(
-        count,
-        format: "%n%u",
-        precision: 2,
-        units: {
-          thousand: "K",
-          million: "M",
-          billion: "B",
-        },
-      )
-    end
-
     def tweet_for(id)
       JSON.parse(twitter_get(tweet_uri_for(id)))
     end
@@ -111,7 +102,7 @@ class TwitterApi
     end
 
     def tweet_uri_for(id)
-      URI.parse "#{BASE_URL}/1.1/statuses/show.json?id=#{id}&tweet_mode=extended"
+      URI.parse "#{BASE_URL}/2/tweets/#{id}?#{URL_PARAMS.join("&")}"
     end
 
     def twitter_get(uri)
diff --git a/lib/upload_creator.rb b/lib/upload_creator.rb
index f37e6750309..54615a1101f 100644
--- a/lib/upload_creator.rb
+++ b/lib/upload_creator.rb
@@ -31,9 +31,6 @@ class UploadCreator
     use
   ].each(&:freeze)
 
-  include ActiveSupport::Deprecation::DeprecatedConstantAccessor
-  deprecate_constant "WHITELISTED_SVG_ELEMENTS", "UploadCreator::ALLOWED_SVG_ELEMENTS"
-
   # Available options
   #  - type (string)
   #  - origin (string)
@@ -57,9 +54,6 @@ class UploadCreator
         true
       end
     )
-
-    # TODO (martin) Validate @opts[:type] to make sure only blessed types are passed
-    # in, since the clientside can pass any type it wants.
   end
 
   def create_for(user_id)
@@ -77,15 +71,16 @@ class UploadCreator
     is_image = FileHelper.is_supported_image?(@filename)
     is_image ||= @image_info && FileHelper.is_supported_image?("test.#{@image_info.type}")
     is_image = false if @opts[:for_theme]
+    is_thumbnail = SiteSetting.video_thumbnails_enabled && @opts[:type] == "thumbnail"
 
-    # if this is present then it means we are creating an upload record from
+    # If this is present then it means we are creating an upload record from
     # an external_upload_stub and the file is > ExternalUploadManager::DOWNLOAD_LIMIT,
     # so we have not downloaded it to a tempfile. no modifications can be made to the
     # file in this case because it does not exist; we simply move it to its new location
     # in S3
     #
-    # TODO (martin) I've added a bunch of external_upload_too_big checks littered
-    # throughout the UploadCreator code. It would be better to have two seperate
+    # FIXME: I've added a bunch of external_upload_too_big checks littered
+    # throughout the UploadCreator code. It would be better to have two separate
     # classes with shared methods, rather than doing all these checks all over the
     # place. Needs a refactor.
     external_upload_too_big = @opts[:external_upload_too_big]
@@ -122,13 +117,17 @@ class UploadCreator
       # compute the sha of the file and generate a unique hash
       # which is only used for secure uploads
       sha1 = Upload.generate_digest(@file) if !external_upload_too_big
-      unique_hash = generate_fake_sha1_hash if SiteSetting.secure_uploads || external_upload_too_big
+      unique_hash = generate_fake_sha1_hash if SiteSetting.secure_uploads ||
+        external_upload_too_big || is_thumbnail
 
       # we do not check for duplicate uploads if secure uploads is
       # enabled because we use a unique access hash to differentiate
       # between uploads instead of the sha1, and to get around various
       # access/permission issues for uploads
-      if !SiteSetting.secure_uploads && !external_upload_too_big
+      # We do not check for duplicate uploads for video thumbnails because
+      # their filename needs to match with their corresponding video. This also
+      # enables rebuilding the html on a topic to regenerate a thumbnail.
+      if !SiteSetting.secure_uploads && !external_upload_too_big && !is_thumbnail
         # do we already have that upload?
         @upload = Upload.find_by(sha1: sha1)
 
@@ -166,7 +165,14 @@ class UploadCreator
       @upload.user_id = user_id
       @upload.original_filename = fixed_original_filename || @filename
       @upload.filesize = filesize
-      @upload.sha1 = (SiteSetting.secure_uploads? || external_upload_too_big) ? unique_hash : sha1
+      @upload.sha1 =
+        (
+          if (SiteSetting.secure_uploads? || external_upload_too_big || is_thumbnail)
+            unique_hash
+          else
+            sha1
+          end
+        )
       @upload.original_sha1 = SiteSetting.secure_uploads? ? sha1 : nil
       @upload.url = ""
       @upload.origin = @opts[:origin][0...1000] if @opts[:origin]
@@ -389,7 +395,7 @@ class UploadCreator
   end
 
   def convert_heif_to_jpeg?
-    File.extname(@filename).downcase.match?(/\.hei(f|c)$/)
+    File.extname(@filename).downcase.match?(/\.hei(f|c)\z/)
   end
 
   def convert_heif!
@@ -597,7 +603,7 @@ class UploadCreator
   def should_optimize?
     # GIF is too slow (plus, we'll soon be converting them to MP4)
     # Optimizing SVG is useless
-    return false if @file.path =~ /\.(gif|svg)$/i
+    return false if @file.path =~ /\.(gif|svg)\z/i
     # Safeguard for large PNGs
     return pixels < 2_000_000 if @file.path =~ /\.png/i
     # Everything else is fine!
@@ -653,7 +659,7 @@ class UploadCreator
         if is_animated != nil
           # FastImage will return nil if it cannot determine if animated
           is_animated
-        elsif type == "gif" || type == "webp"
+        elsif %w[gif webp avif].include?(type)
           # Only GIFs, WEBPs and a few other unsupported image types can be animated
           OptimizedImage.ensure_safe_paths!(@file.path)
 
diff --git a/lib/upload_recovery.rb b/lib/upload_recovery.rb
index c2e340d9693..5ac0e556a2b 100644
--- a/lib/upload_recovery.rb
+++ b/lib/upload_recovery.rb
@@ -150,7 +150,13 @@ class UploadRecovery
           old_key = key
           key = key.sub(tombstone_prefix, "")
 
-          Discourse.store.s3_helper.copy(old_key, key, options: { acl: "public-read" })
+          Discourse.store.s3_helper.copy(
+            old_key,
+            key,
+            options: {
+              acl: SiteSetting.s3_use_acls ? "public-read" : nil,
+            },
+          )
         end
 
         next if upload_exists
diff --git a/lib/upload_security.rb b/lib/upload_security.rb
index c00c1376ecf..ecdc3c43b40 100644
--- a/lib/upload_security.rb
+++ b/lib/upload_security.rb
@@ -143,7 +143,7 @@ class UploadSecurity
           LEFT JOIN posts ON upload_references.target_type = 'Post' AND upload_references.target_id = posts.id
         SQL
         .where("posts.deleted_at IS NULL")
-        .order(created_at: :asc)
+        .order("upload_references.created_at ASC, upload_references.id ASC")
         .first
     return false if first_reference.blank?
     PUBLIC_UPLOAD_REFERENCE_TYPES.include?(first_reference.target_type)
diff --git a/lib/url_helper.rb b/lib/url_helper.rb
index 12fc5cbb3fb..432464798b2 100644
--- a/lib/url_helper.rb
+++ b/lib/url_helper.rb
@@ -50,8 +50,8 @@ class UrlHelper
   end
 
   def self.absolute(url, cdn = Discourse.asset_host)
-    cdn = "https:#{cdn}" if cdn && cdn =~ %r{^//}
-    url =~ %r{^/[^/]} ? (cdn || Discourse.base_url_no_prefix) + url : url
+    cdn = "https:#{cdn}" if cdn && cdn =~ %r{\A//}
+    url =~ %r{\A/[^/]} ? (cdn || Discourse.base_url_no_prefix) + url : url
   end
 
   def self.absolute_without_cdn(url)
@@ -59,7 +59,7 @@ class UrlHelper
   end
 
   def self.schemaless(url)
-    url.sub(/^http:/i, "")
+    url.sub(/\Ahttp:/i, "")
   end
 
   def self.secure_proxy_without_cdn(url)
diff --git a/lib/user_comm_screener.rb b/lib/user_comm_screener.rb
index 6593606dc8a..c1a451bf27a 100644
--- a/lib/user_comm_screener.rb
+++ b/lib/user_comm_screener.rb
@@ -180,6 +180,10 @@ class UserCommScreener
     actor_preferences[:disallowed_pms_from].include?(user_id)
   end
 
+  def actor_disallowing_any_pms?(user_ids)
+    user_ids.any? { |user_id| actor_disallowing_pms?(user_id) }
+  end
+
   def actor_disallowing_all_pms?
     !acting_user.user_option.allow_private_messages
   end
diff --git a/lib/validators/css_color_validator.rb b/lib/validators/css_color_validator.rb
index fdc1fe8f28a..6085ab49aa3 100644
--- a/lib/validators/css_color_validator.rb
+++ b/lib/validators/css_color_validator.rb
@@ -156,7 +156,7 @@ class CssColorValidator
   end
 
   def valid_value?(val)
-    !!(val =~ /^#([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$/ || COLORS.include?(val&.downcase))
+    !!(val =~ /\A#([0-9a-fA-F]{3}|[0-9a-fA-F]{6})\z/ || COLORS.include?(val&.downcase))
   end
 
   def error_message
diff --git a/lib/validators/enable_invite_only_validator.rb b/lib/validators/enable_invite_only_validator.rb
deleted file mode 100644
index 89e062ff162..00000000000
--- a/lib/validators/enable_invite_only_validator.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-class EnableInviteOnlyValidator
-  def initialize(opts = {})
-    @opts = opts
-  end
-
-  def valid_value?(val)
-    return true if val == "f"
-    !SiteSetting.enable_discourse_connect?
-  end
-
-  def error_message
-    I18n.t("site_settings.errors.discourse_connect_invite_only")
-  end
-end
diff --git a/lib/validators/enable_sso_validator.rb b/lib/validators/enable_sso_validator.rb
index 3d75391f53b..84281afd799 100644
--- a/lib/validators/enable_sso_validator.rb
+++ b/lib/validators/enable_sso_validator.rb
@@ -7,9 +7,7 @@ class EnableSsoValidator
 
   def valid_value?(val)
     return true if val == "f"
-    if SiteSetting.discourse_connect_url.blank? || SiteSetting.invite_only? || is_2fa_enforced?
-      return false
-    end
+    return false if SiteSetting.discourse_connect_url.blank? || is_2fa_enforced?
     true
   end
 
@@ -17,7 +15,7 @@ class EnableSsoValidator
     if SiteSetting.discourse_connect_url.blank?
       return I18n.t("site_settings.errors.discourse_connect_url_is_empty")
     end
-    return I18n.t("site_settings.errors.discourse_connect_invite_only") if SiteSetting.invite_only?
+
     if is_2fa_enforced?
       I18n.t("site_settings.errors.discourse_connect_cannot_be_enabled_if_second_factor_enforced")
     end
diff --git a/lib/validators/form_template_yaml_validator.rb b/lib/validators/form_template_yaml_validator.rb
new file mode 100644
index 00000000000..9a0fdfd7d4d
--- /dev/null
+++ b/lib/validators/form_template_yaml_validator.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+class FormTemplateYamlValidator < ActiveModel::Validator
+  def validate(record)
+    begin
+      yaml = Psych.safe_load(record.template)
+      check_missing_type(record, yaml)
+      check_allowed_types(record, yaml)
+    rescue Psych::SyntaxError
+      record.errors.add(:template, I18n.t("form_templates.errors.invalid_yaml"))
+    end
+  end
+
+  def check_allowed_types(record, yaml)
+    allowed_types = %w[checkbox dropdown input multi-select textarea upload]
+    yaml.each do |field|
+      if !allowed_types.include?(field["type"])
+        return(
+          record.errors.add(
+            :template,
+            I18n.t(
+              "form_templates.errors.invalid_type",
+              type: field["type"],
+              valid_types: allowed_types.join(", "),
+            ),
+          )
+        )
+      end
+    end
+  end
+
+  def check_missing_type(record, yaml)
+    yaml.each do |field|
+      if field["type"].blank?
+        return record.errors.add(:template, I18n.t("form_templates.errors.missing_type"))
+      end
+    end
+  end
+end
diff --git a/lib/validators/max_username_length_validator.rb b/lib/validators/max_username_length_validator.rb
index fe29824f834..49bcc1b400c 100644
--- a/lib/validators/max_username_length_validator.rb
+++ b/lib/validators/max_username_length_validator.rb
@@ -13,7 +13,7 @@ class MaxUsernameLengthValidator
       return false
     end
     return false if value < SiteSetting.min_username_length
-    @username = User.where("length(username) > ?", value).pluck_first(:username)
+    @username = User.where("length(username) > ?", value).pick(:username)
     @username.blank?
   end
 
diff --git a/lib/validators/min_username_length_validator.rb b/lib/validators/min_username_length_validator.rb
index 1ae9342fef1..ee0af94b698 100644
--- a/lib/validators/min_username_length_validator.rb
+++ b/lib/validators/min_username_length_validator.rb
@@ -13,7 +13,7 @@ class MinUsernameLengthValidator
       return false
     end
     return false if value > SiteSetting.max_username_length
-    @username = User.where("length(username) < ?", value).pluck_first(:username)
+    @username = User.where("length(username) < ?", value).pick(:username)
     @username.blank?
   end
 
diff --git a/lib/validators/search_ranking_weights_validator.rb b/lib/validators/search_ranking_weights_validator.rb
new file mode 100644
index 00000000000..58e7c25c221
--- /dev/null
+++ b/lib/validators/search_ranking_weights_validator.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class SearchRankingWeightsValidator
+  def initialize(opts = {})
+    @opts = opts
+  end
+
+  WEIGHT_REGEXP = "1\.0|0\.[0-9]+"
+  WEIGHTS_REGEXP =
+    /{(?<d_weight>#{WEIGHT_REGEXP}),(?<c_weight>#{WEIGHT_REGEXP}),(?<b_weight>#{WEIGHT_REGEXP}),(?<a_weight>#{WEIGHT_REGEXP})}/
+
+  def valid_value?(value)
+    return true if value.blank?
+    value.match(WEIGHTS_REGEXP)
+  end
+
+  def error_message
+    I18n.t("site_settings.errors.invalid_search_ranking_weights")
+  end
+end
diff --git a/lib/validators/summarization_validator.rb b/lib/validators/summarization_validator.rb
new file mode 100644
index 00000000000..8cb35fbb39f
--- /dev/null
+++ b/lib/validators/summarization_validator.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class SummarizationValidator
+  def initialize(opts = {})
+    @opts = opts
+  end
+
+  def valid_value?(val)
+    strategy = Summarization::Base.find_strategy(val)
+
+    return true unless strategy
+
+    strategy.correctly_configured?.tap { |is_valid| @strategy = strategy unless is_valid }
+  end
+
+  def error_message
+    @strategy.configuration_hint
+  end
+end
diff --git a/lib/validators/unicode_username_allowlist_validator.rb b/lib/validators/unicode_username_allowlist_validator.rb
index 824e5e43442..f60c161707c 100644
--- a/lib/validators/unicode_username_allowlist_validator.rb
+++ b/lib/validators/unicode_username_allowlist_validator.rb
@@ -9,7 +9,7 @@ class UnicodeUsernameAllowlistValidator
     @error_message = nil
     return true if value.blank?
 
-    if value.match?(%r{^/.*/[imxo]*$})
+    if value.match?(%r{\A/.*/[imxo]*\z})
       @error_message =
         I18n.t("site_settings.errors.allowed_unicode_usernames.leading_trailing_slash")
     else
diff --git a/lib/version.rb b/lib/version.rb
index 06dc63c2e39..c32cadfccff 100644
--- a/lib/version.rb
+++ b/lib/version.rb
@@ -7,12 +7,16 @@ module Discourse
   # work around reloader
   unless defined?(::Discourse::VERSION)
     module VERSION #:nodoc:
-      MAJOR = 3
-      MINOR = 0
-      TINY = 6
-      PRE = nil
+      STRING = "3.1.0.beta8"
 
-      STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
+      PARTS = STRING.split(".")
+      private_constant :PARTS
+
+      MAJOR = PARTS[0].to_i
+      MINOR = PARTS[1].to_i
+      TINY = PARTS[2].to_i
+      PRE = PARTS[3]&.split("-", 2)&.first
+      DEV = PARTS[3]&.split("-", 2)&.second
     end
   end
 
diff --git a/lib/wizard/builder.rb b/lib/wizard/builder.rb
index ebfef200260..340c750f388 100644
--- a/lib/wizard/builder.rb
+++ b/lib/wizard/builder.rb
@@ -86,7 +86,7 @@ class Wizard
           step.add_field(
             id: "chat_enabled",
             type: "checkbox",
-            icon: "comment",
+            icon: "d-chat",
             value: SiteSetting.chat_enabled,
           )
         end
diff --git a/package.json b/package.json
index d39655d49c4..6a83a93e430 100644
--- a/package.json
+++ b/package.json
@@ -1,41 +1,61 @@
 {
   "name": "discourse",
   "version": "1.0.0",
-  "main": "index.js",
-  "repository": "git@github.com:discourse/discourse.git",
+  "repository": "https://github.com/discourse/discourse",
   "author": "Discourse",
   "license": "GPL-2.0-only",
-  "dependencies": {
+  "devDependencies": {
+    "@glint/core": "^1.0.2",
+    "@glint/environment-ember-loose": "^1.0.2",
+    "@glint/environment-ember-template-imports": "^1.0.2",
+    "@glint/template": "^1.0.2",
     "@discourse/moment-timezone-names-translations": "^1.0.0",
     "@fortawesome/fontawesome-free": "5.15.4",
-    "@highlightjs/cdn-assets": "^11.6.0",
-    "@json-editor/json-editor": "^2.6.1",
+    "@highlightjs/cdn-assets": "11.8.0",
+    "@json-editor/json-editor": "2.10.0",
+    "@mixer/parallel-prettier": "^2.0.3",
     "ace-builds": "1.4.13",
     "chart.js": "3.5.1",
-    "chartjs-plugin-datalabels": "^2.0.0",
-    "diffhtml": "^1.0.0-beta.20",
-    "magnific-popup": "1.1.0",
-    "moment": "2.29.4",
-    "moment-timezone": "0.5.39",
-    "pikaday": "1.8.2",
-    "squoosh": "discourse/squoosh#dc9649d",
-    "workbox-cacheable-response": "^4.3.1",
-    "workbox-core": "^4.3.1",
-    "workbox-expiration": "^4.3.1",
-    "workbox-routing": "^4.3.1",
-    "workbox-strategies": "^4.3.1",
-    "workbox-sw": "^4.3.1"
-  },
-  "devDependencies": {
-    "@mixer/parallel-prettier": "^2.0.3",
+    "chartjs-plugin-datalabels": "2.2.0",
     "chrome-launcher": "^0.15.1",
     "chrome-remote-interface": "^0.31.3",
-    "eslint-config-discourse": "^3.3.0",
+    "concurrently": "^8.0.1",
+    "diffhtml": "1.0.0-beta.20",
+    "ember-template-lint": "5.10.3",
+    "eslint": "^8.37.0",
+    "eslint-config-discourse": "^3.5.0",
+    "eslint-plugin-ember": "11.8.0",
+    "eslint-plugin-sort-class-members": "1.18.0",
+    "jsdoc": "^4.0.0",
     "lefthook": "^1.2.0",
-    "puppeteer-core": "^13.7.0"
+    "lint-to-the-future": "^2.0.0",
+    "lint-to-the-future-ember-template": "^1.1.1",
+    "lint-to-the-future-eslint": "^2.0.1",
+    "magnific-popup": "1.1.0",
+    "moment": "2.29.4",
+    "moment-timezone": "0.5.43",
+    "prettier-plugin-ember-template-tag": "^0.3.2",
+    "pikaday": "1.8.2",
+    "puppeteer-core": "^13.7.0",
+    "squoosh": "discourse/squoosh#dc9649d",
+    "tidy-jsdoc": "^1.4.1",
+    "typescript": "^5.1.3"
   },
   "scripts": {
-    "postinstall": "yarn --cwd app/assets/javascripts/discourse $(node -e 'if(JSON.parse(process.env.npm_config_argv).original.includes(`--frozen-lockfile`)){console.log(`--frozen-lockfile`)}')"
+    "lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
+    "lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
+    "lint:js": "eslint ./app/assets/javascripts --cache",
+    "lint:js-plugins": "eslint ./plugins --cache",
+    "lint:js:fix": "eslint ./app/assets/javascripts",
+    "lint:js-plugins:fix": "eslint ./plugins",
+    "lint:hbs": "ember-template-lint 'app/assets/javascripts/**/*.{gjs,hbs}' 'plugins/**/assets/javascripts/**/*.{gjs,hbs}' --no-error-on-unmatched-pattern",
+    "lint:hbs:fix": "ember-template-lint 'app/assets/javascripts/**/*.{gjs,hbs}' 'plugins/**/assets/javascripts/**/*.{gjs,hbs}' --no-error-on-unmatched-pattern --fix",
+    "lint:prettier": "yarn pprettier  --list-different 'app/assets/stylesheets/**/*.scss' 'app/assets/javascripts/**/*.{js,gjs,hbs}' 'plugins/**/assets/stylesheets/**/*.scss' 'plugins/**/assets/javascripts/**/*.{js,gjs,hbs}'",
+    "lint:prettier:fix": "yarn prettier -w 'app/assets/stylesheets/**/*.scss' 'app/assets/javascripts/**/*.{js,gjs,hbs}' 'plugins/**/assets/stylesheets/**/*.scss' 'plugins/**/assets/javascripts/**/*.{js,gjs,hbs}'",
+    "lttf:ignore": "lint-to-the-future ignore",
+    "lttf:output": "lint-to-the-future output -o ./lint-progress/",
+    "lint-progress": "yarn lttf:output && npx html-pages ./lint-progress --no-cache",
+    "postinstall": "yarn --cwd app/assets/javascripts $(node -e 'if(JSON.parse(process.env.npm_config_argv).original.includes(`--frozen-lockfile`)){console.log(`--frozen-lockfile`)}')"
   },
   "engines": {
     "node": "16.* || >= 18",
diff --git a/plugins/chat/README.md b/plugins/chat/README.md
index fc0b204240b..a3d205fb72f 100644
--- a/plugins/chat/README.md
+++ b/plugins/chat/README.md
@@ -1,54 +1,9 @@
-:warning: This plugin is still in active development and may change frequently
+This plugin is still in active development and may change frequently
 
 ## Documentation
 
 The Discourse Chat plugin adds chat functionality to your Discourse so it can natively support both long-form and short-form communication needs of your online community.
 
-For documentation, see [Discourse Chat](https://meta.discourse.org/t/discourse-chat/230881)
+For user documentation, see [Discourse Chat](https://meta.discourse.org/t/discourse-chat/230881).
 
-## Plugin API
-
-### registerChatComposerButton
-
-#### Usage
-
-```javascript
-api.registerChatComposerButton({ id: "foo", ... });
-```
-
-#### Options
-
-Every option accepts a `value` or a `function`, when passing a function `this` will be the `chat-composer` component instance. Example of an option using a function:
-
-```javascript
-api.registerChatComposerButton({
-  id: "foo",
-  displayed() {
-    return this.site.mobileView && this.canAttachUploads;
-  },
-});
-```
-
-##### Required
-
-- `id` unique, used to identify your button, eg: "gifs"
-- `action` callback when the button is pressed, can be an action name or an anonymous function, eg: "onFooClicked" or `() => { console.log("clicked") }`
-
-A button requires at least an icon or a label:
-
-- `icon`, eg: "times"
-- `label`, text displayed on the button, a translatable key, eg: "foo.bar"
-- `translatedLabel`, text displayed on the button, a string, eg: "Add gifs"
-
-##### Optional
-
-- `position`, can be "inline" or "dropdown", defaults to "inline"
-- `title`, title attribute of the button, a translatable key, eg: "foo.bar"
-- `translatedTitle`, title attribute of the button, a string, eg: "Add gifs"
-- `ariaLabel`, aria-label attribute of the button, a translatable key, eg: "foo.bar"
-- `translatedAriaLabel`, aria-label attribute of the button, a string, eg: "Add gifs"
-- `classNames`, additional names to add to the button’s class attribute, eg: ["foo", "bar"]
-- `displayed`, hide/or show the button, expects a boolean
-- `disabled`, sets the disabled attribute on the button, expects a boolean
-- `priority`, an integer defining the order of the buttons, higher comes first, eg: `700`
-- `dependentKeys`, list of property names which should trigger a refresh of the buttons when changed, eg: `["foo.bar", "bar.baz"]`
+For developer documentation, see [Discourse Documentation](https://discourse.github.io/discourse/).
diff --git a/plugins/chat/app/controllers/admin/admin_incoming_chat_webhooks_controller.rb b/plugins/chat/app/controllers/admin/admin_incoming_chat_webhooks_controller.rb
deleted file mode 100644
index 24bcd25abda..00000000000
--- a/plugins/chat/app/controllers/admin/admin_incoming_chat_webhooks_controller.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-# frozen_string_literal: true
-
-class Chat::AdminIncomingChatWebhooksController < Admin::AdminController
-  requires_plugin Chat::PLUGIN_NAME
-
-  def index
-    render_serialized(
-      {
-        chat_channels: ChatChannel.public_channels,
-        incoming_chat_webhooks: IncomingChatWebhook.includes(:chat_channel).all,
-      },
-      AdminChatIndexSerializer,
-      root: false,
-    )
-  end
-
-  def create
-    params.require(%i[name chat_channel_id])
-
-    chat_channel = ChatChannel.find_by(id: params[:chat_channel_id])
-    raise Discourse::NotFound if chat_channel.nil? || chat_channel.direct_message_channel?
-
-    webhook = IncomingChatWebhook.new(name: params[:name], chat_channel: chat_channel)
-    if webhook.save
-      render_serialized(webhook, IncomingChatWebhookSerializer, root: false)
-    else
-      render_json_error(webhook)
-    end
-  end
-
-  def update
-    params.require(%i[incoming_chat_webhook_id name chat_channel_id])
-
-    webhook = IncomingChatWebhook.find_by(id: params[:incoming_chat_webhook_id])
-    raise Discourse::NotFound unless webhook
-
-    chat_channel = ChatChannel.find_by(id: params[:chat_channel_id])
-    raise Discourse::NotFound if chat_channel.nil? || chat_channel.direct_message_channel?
-
-    if webhook.update(
-         name: params[:name],
-         description: params[:description],
-         emoji: params[:emoji],
-         username: params[:username],
-         chat_channel: chat_channel,
-       )
-      render json: success_json
-    else
-      render_json_error(webhook)
-    end
-  end
-
-  def destroy
-    params.require(:incoming_chat_webhook_id)
-
-    webhook = IncomingChatWebhook.find_by(id: params[:incoming_chat_webhook_id])
-    webhook.destroy if webhook
-    render json: success_json
-  end
-end
diff --git a/plugins/chat/app/controllers/api/chat_channels_controller.rb b/plugins/chat/app/controllers/api/chat_channels_controller.rb
deleted file mode 100644
index 69aaaadbb02..00000000000
--- a/plugins/chat/app/controllers/api/chat_channels_controller.rb
+++ /dev/null
@@ -1,189 +0,0 @@
-# frozen_string_literal: true
-
-CHANNEL_EDITABLE_PARAMS = %i[name description]
-CATEGORY_CHANNEL_EDITABLE_PARAMS = %i[auto_join_users allow_channel_wide_mentions]
-
-class Chat::Api::ChatChannelsController < Chat::Api
-  def index
-    permitted = params.permit(:filter, :limit, :offset, :status)
-
-    options = { filter: permitted[:filter], limit: (permitted[:limit] || 25).to_i }
-    options[:offset] = permitted[:offset].to_i
-    options[:status] = ChatChannel.statuses[permitted[:status]] ? permitted[:status] : nil
-
-    memberships = Chat::ChatChannelMembershipManager.all_for_user(current_user)
-    channels = Chat::ChatChannelFetcher.secured_public_channels(guardian, memberships, options)
-    serialized_channels =
-      channels.map do |channel|
-        ChatChannelSerializer.new(
-          channel,
-          scope: Guardian.new(current_user),
-          membership: memberships.find { |membership| membership.chat_channel_id == channel.id },
-        )
-      end
-
-    load_more_params = options.merge(offset: options[:offset] + options[:limit]).to_query
-    load_more_url = URI::HTTP.build(path: "/chat/api/channels", query: load_more_params).request_uri
-
-    render json: serialized_channels, root: "channels", meta: { load_more_url: load_more_url }
-  end
-
-  def destroy
-    confirmation = params.require(:channel).require(:name_confirmation)&.downcase
-    guardian.ensure_can_delete_chat_channel!
-
-    if channel_from_params.title(current_user).downcase != confirmation
-      raise Discourse::InvalidParameters.new(:name_confirmation)
-    end
-
-    begin
-      ChatChannel.transaction do
-        channel_from_params.update!(
-          slug:
-            "#{Time.now.strftime("%Y%m%d-%H%M")}-#{channel_from_params.slug}-deleted".truncate(
-              SiteSetting.max_topic_title_length,
-              omission: "",
-            ),
-        )
-        channel_from_params.trash!(current_user)
-        StaffActionLogger.new(current_user).log_custom(
-          "chat_channel_delete",
-          {
-            chat_channel_id: channel_from_params.id,
-            chat_channel_name: channel_from_params.title(current_user),
-          },
-        )
-      end
-    rescue ActiveRecord::Rollback
-      return render_json_error(I18n.t("chat.errors.delete_channel_failed"))
-    end
-
-    Jobs.enqueue(:chat_channel_delete, { chat_channel_id: channel_from_params.id })
-    render json: success_json
-  end
-
-  def create
-    channel_params =
-      params.require(:channel).permit(:chatable_id, :name, :description, :auto_join_users)
-
-    guardian.ensure_can_create_chat_channel!
-    if channel_params[:name].length > SiteSetting.max_topic_title_length
-      raise Discourse::InvalidParameters.new(:name)
-    end
-
-    if ChatChannel.exists?(
-         chatable_type: "Category",
-         chatable_id: channel_params[:chatable_id],
-         name: channel_params[:name],
-       )
-      raise Discourse::InvalidParameters.new(I18n.t("chat.errors.channel_exists_for_category"))
-    end
-
-    chatable = Category.find_by(id: channel_params[:chatable_id])
-    raise Discourse::NotFound unless chatable
-
-    auto_join_users =
-      ActiveRecord::Type::Boolean.new.deserialize(channel_params[:auto_join_users]) || false
-
-    channel =
-      chatable.create_chat_channel!(
-        name: channel_params[:name],
-        description: channel_params[:description],
-        user_count: 1,
-        auto_join_users: auto_join_users,
-      )
-
-    channel.user_chat_channel_memberships.create!(user: current_user, following: true)
-
-    if channel.auto_join_users
-      Chat::ChatChannelMembershipManager.new(channel).enforce_automatic_channel_memberships
-    end
-
-    render_serialized(
-      channel,
-      ChatChannelSerializer,
-      membership: channel.membership_for(current_user),
-      root: "channel",
-    )
-  end
-
-  def show
-    render_serialized(
-      channel_from_params,
-      ChatChannelSerializer,
-      membership: channel_from_params.membership_for(current_user),
-      root: "channel",
-    )
-  end
-
-  def update
-    guardian.ensure_can_edit_chat_channel!
-
-    if channel_from_params.direct_message_channel?
-      raise Discourse::InvalidParameters.new(
-              I18n.t("chat.errors.cant_update_direct_message_channel"),
-            )
-    end
-
-    params_to_edit = editable_params(params, channel_from_params)
-    params_to_edit.each { |k, v| params_to_edit[k] = nil if params_to_edit[k].blank? }
-
-    if ActiveRecord::Type::Boolean.new.deserialize(params_to_edit[:auto_join_users])
-      auto_join_limiter(channel_from_params).performed!
-    end
-
-    channel_from_params.update!(params_to_edit)
-
-    ChatPublisher.publish_chat_channel_edit(channel_from_params, current_user)
-
-    if channel_from_params.category_channel? && channel_from_params.auto_join_users
-      Chat::ChatChannelMembershipManager.new(
-        channel_from_params,
-      ).enforce_automatic_channel_memberships
-    end
-
-    render_serialized(
-      channel_from_params,
-      ChatChannelSerializer,
-      root: "channel",
-      membership: channel_from_params.membership_for(current_user),
-    )
-  end
-
-  private
-
-  def channel_from_params
-    @channel ||=
-      begin
-        channel = ChatChannel.find(params.require(:channel_id))
-        guardian.ensure_can_preview_chat_channel!(channel)
-        channel
-      end
-  end
-
-  def membership_from_params
-    @membership ||=
-      begin
-        membership =
-          Chat::ChatChannelMembershipManager.new(channel_from_params).find_for_user(current_user)
-        raise Discourse::NotFound if membership.blank?
-        membership
-      end
-  end
-
-  def auto_join_limiter(channel)
-    RateLimiter.new(
-      current_user,
-      "auto_join_users_channel_#{channel.id}",
-      1,
-      3.minutes,
-      apply_limit_to_staff: true,
-    )
-  end
-
-  def editable_params(params, channel)
-    permitted_params = CHANNEL_EDITABLE_PARAMS
-    permitted_params += CATEGORY_CHANNEL_EDITABLE_PARAMS if channel.category_channel?
-    params.require(:channel).permit(*permitted_params)
-  end
-end
diff --git a/plugins/chat/app/controllers/api/chat_channels_status_controller.rb b/plugins/chat/app/controllers/api/chat_channels_status_controller.rb
deleted file mode 100644
index 78b1ac3f2cb..00000000000
--- a/plugins/chat/app/controllers/api/chat_channels_status_controller.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-class Chat::Api::ChatChannelsStatusController < Chat::Api::ChatChannelsController
-  def update
-    status = params.require(:status)
-
-    # we only want to use this endpoint for open/closed status changes,
-    # the others are more "special" and are handled by the archive endpoint
-    if !ChatChannel.statuses.keys.include?(status) || status == "read_only" || status == "archive"
-      raise Discourse::InvalidParameters
-    end
-
-    guardian.ensure_can_change_channel_status!(channel_from_params, status.to_sym)
-    channel_from_params.public_send("#{status}!", current_user)
-
-    render_serialized(channel_from_params, ChatChannelSerializer, root: "channel")
-  end
-end
diff --git a/plugins/chat/app/controllers/api/chat_chatables_controller.rb b/plugins/chat/app/controllers/api/chat_chatables_controller.rb
deleted file mode 100644
index 9eaec32b89b..00000000000
--- a/plugins/chat/app/controllers/api/chat_chatables_controller.rb
+++ /dev/null
@@ -1,82 +0,0 @@
-# frozen_string_literal: true
-
-class Chat::Api::ChatChatablesController < Chat::Api
-  def index
-    params.require(:filter)
-    filter = params[:filter].downcase
-
-    memberships = Chat::ChatChannelMembershipManager.all_for_user(current_user)
-    public_channels =
-      Chat::ChatChannelFetcher.secured_public_channels(
-        guardian,
-        memberships,
-        filter: filter,
-        status: :open,
-      )
-
-    users = User.joins(:user_option).where.not(id: current_user.id)
-    if !Chat.allowed_group_ids.include?(Group::AUTO_GROUPS[:everyone])
-      users =
-        users
-          .joins(:groups)
-          .where(groups: { id: Chat.allowed_group_ids })
-          .or(users.joins(:groups).staff)
-    end
-
-    users = users.where(user_option: { chat_enabled: true })
-    like_filter = "%#{filter}%"
-    if SiteSetting.prioritize_username_in_ux || !SiteSetting.enable_names
-      users = users.where("users.username_lower ILIKE ?", like_filter)
-    else
-      users =
-        users.where(
-          "LOWER(users.name) ILIKE ? OR users.username_lower ILIKE ?",
-          like_filter,
-          like_filter,
-        )
-    end
-
-    users = users.limit(25).uniq
-
-    direct_message_channels =
-      if users.count > 0
-        # FIXME: investigate the cost of this query
-        ChatChannel
-          .includes(chatable: :users)
-          .joins(direct_message: :direct_message_users)
-          .group(1)
-          .having(
-            "ARRAY[?] <@ ARRAY_AGG(user_id) AND ARRAY[?] && ARRAY_AGG(user_id)",
-            [current_user.id],
-            users.map(&:id),
-          )
-      else
-        []
-      end
-
-    user_ids_with_channel = []
-    direct_message_channels.each do |dm_channel|
-      user_ids = dm_channel.chatable.users.map(&:id)
-      user_ids_with_channel.concat(user_ids) if user_ids.count < 3
-    end
-
-    users_without_channel = users.filter { |u| !user_ids_with_channel.include?(u.id) }
-
-    if current_user.username.downcase.start_with?(filter)
-      # We filtered out the current user for the query earlier, but check to see
-      # if they should be included, and add.
-      users_without_channel << current_user
-    end
-
-    render_serialized(
-      {
-        public_channels: public_channels,
-        direct_message_channels: direct_message_channels,
-        users: users_without_channel,
-        memberships: memberships,
-      },
-      ChatChannelSearchSerializer,
-      root: false,
-    )
-  end
-end
diff --git a/plugins/chat/app/controllers/api/chat_current_user_channels_controller.rb b/plugins/chat/app/controllers/api/chat_current_user_channels_controller.rb
deleted file mode 100644
index ecc01163606..00000000000
--- a/plugins/chat/app/controllers/api/chat_current_user_channels_controller.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-class Chat::Api::ChatCurrentUserChannelsController < Chat::Api
-  def index
-    structured = Chat::ChatChannelFetcher.structured(guardian)
-    render_serialized(structured, ChatChannelIndexSerializer, root: false)
-  end
-end
diff --git a/plugins/chat/app/controllers/api_controller.rb b/plugins/chat/app/controllers/api_controller.rb
deleted file mode 100644
index fa27b825d83..00000000000
--- a/plugins/chat/app/controllers/api_controller.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-class Chat::Api < Chat::ChatBaseController
-  before_action :ensure_logged_in
-  before_action :ensure_can_chat
-
-  private
-
-  def ensure_can_chat
-    raise Discourse::NotFound unless SiteSetting.chat_enabled
-    guardian.ensure_can_chat!
-  end
-end
diff --git a/plugins/chat/app/controllers/chat/admin/export_controller.rb b/plugins/chat/app/controllers/chat/admin/export_controller.rb
new file mode 100644
index 00000000000..7872e46f61b
--- /dev/null
+++ b/plugins/chat/app/controllers/chat/admin/export_controller.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Chat
+  module Admin
+    class ExportController < ::Admin::AdminController
+      requires_plugin Chat::PLUGIN_NAME
+
+      def export_messages
+        entity = "chat_message"
+        Jobs.enqueue(:export_csv_file, entity: entity, user_id: current_user.id)
+        StaffActionLogger.new(current_user).log_entity_export(entity)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/controllers/chat/admin/incoming_webhooks_controller.rb b/plugins/chat/app/controllers/chat/admin/incoming_webhooks_controller.rb
new file mode 100644
index 00000000000..14932e9212f
--- /dev/null
+++ b/plugins/chat/app/controllers/chat/admin/incoming_webhooks_controller.rb
@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Chat
+  module Admin
+    class IncomingWebhooksController < ::Admin::AdminController
+      requires_plugin Chat::PLUGIN_NAME
+
+      def index
+        render_serialized(
+          {
+            chat_channels: Chat::Channel.public_channels,
+            incoming_chat_webhooks: Chat::IncomingWebhook.includes(:chat_channel).all,
+          },
+          Chat::AdminChatIndexSerializer,
+          root: false,
+        )
+      end
+
+      def create
+        params.require(%i[name chat_channel_id])
+
+        chat_channel = Chat::Channel.find_by(id: params[:chat_channel_id])
+        raise Discourse::NotFound if chat_channel.nil? || chat_channel.direct_message_channel?
+
+        webhook = Chat::IncomingWebhook.new(name: params[:name], chat_channel: chat_channel)
+        if webhook.save
+          render_serialized(webhook, Chat::IncomingWebhookSerializer, root: false)
+        else
+          render_json_error(webhook)
+        end
+      end
+
+      def update
+        params.require(%i[incoming_chat_webhook_id name chat_channel_id])
+
+        webhook = Chat::IncomingWebhook.find_by(id: params[:incoming_chat_webhook_id])
+        raise Discourse::NotFound unless webhook
+
+        chat_channel = Chat::Channel.find_by(id: params[:chat_channel_id])
+        raise Discourse::NotFound if chat_channel.nil? || chat_channel.direct_message_channel?
+
+        if webhook.update(
+             name: params[:name],
+             description: params[:description],
+             emoji: params[:emoji],
+             username: params[:username],
+             chat_channel: chat_channel,
+           )
+          render json: success_json
+        else
+          render_json_error(webhook)
+        end
+      end
+
+      def destroy
+        params.require(:incoming_chat_webhook_id)
+
+        webhook = Chat::IncomingWebhook.find_by(id: params[:incoming_chat_webhook_id])
+        webhook.destroy if webhook
+        render json: success_json
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/controllers/api/category_chatables_controller.rb b/plugins/chat/app/controllers/chat/api/category_chatables_controller.rb
similarity index 100%
rename from plugins/chat/app/controllers/api/category_chatables_controller.rb
rename to plugins/chat/app/controllers/chat/api/category_chatables_controller.rb
diff --git a/plugins/chat/app/controllers/chat/api/channel_messages_controller.rb b/plugins/chat/app/controllers/chat/api/channel_messages_controller.rb
new file mode 100644
index 00000000000..a68aa2d3967
--- /dev/null
+++ b/plugins/chat/app/controllers/chat/api/channel_messages_controller.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class Chat::Api::ChannelMessagesController < Chat::ApiController
+  def index
+    with_service(::Chat::ListChannelMessages) do
+      on_success { render_serialized(result, ::Chat::MessagesSerializer, root: false) }
+      on_failed_policy(:can_view_channel) { raise Discourse::InvalidAccess }
+      on_failed_policy(:target_message_exists) { raise Discourse::NotFound }
+      on_model_not_found(:channel) { raise Discourse::NotFound }
+    end
+  end
+
+  def destroy
+    with_service(Chat::TrashMessage) { on_model_not_found(:message) { raise Discourse::NotFound } }
+  end
+
+  def restore
+    with_service(Chat::RestoreMessage) do
+      on_model_not_found(:message) { raise Discourse::NotFound }
+    end
+  end
+end
diff --git a/plugins/chat/app/controllers/chat/api/channel_thread_messages_controller.rb b/plugins/chat/app/controllers/chat/api/channel_thread_messages_controller.rb
new file mode 100644
index 00000000000..324069d9f8c
--- /dev/null
+++ b/plugins/chat/app/controllers/chat/api/channel_thread_messages_controller.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class Chat::Api::ChannelThreadMessagesController < Chat::ApiController
+  def index
+    with_service(::Chat::ListChannelThreadMessages) do
+      on_success do
+        render_serialized(
+          result,
+          ::Chat::MessagesSerializer,
+          root: false,
+          include_thread_preview: false,
+          include_thread_original_message: false,
+        )
+      end
+
+      on_failed_policy(:ensure_thread_enabled) { raise Discourse::NotFound }
+      on_failed_policy(:target_message_exists) { raise Discourse::NotFound }
+      on_failed_policy(:can_view_thread) { raise Discourse::InvalidAccess }
+      on_model_not_found(:thread) { raise Discourse::NotFound }
+    end
+  end
+end
diff --git a/plugins/chat/app/controllers/chat/api/channel_threads_controller.rb b/plugins/chat/app/controllers/chat/api/channel_threads_controller.rb
new file mode 100644
index 00000000000..fd16e5f0cd0
--- /dev/null
+++ b/plugins/chat/app/controllers/chat/api/channel_threads_controller.rb
@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+class Chat::Api::ChannelThreadsController < Chat::ApiController
+  def index
+    with_service(::Chat::LookupChannelThreads) do
+      on_success do
+        render_serialized(
+          ::Chat::ThreadsView.new(
+            user: guardian.user,
+            threads: result.threads,
+            channel: result.channel,
+            tracking: result.tracking,
+            memberships: result.memberships,
+            load_more_url: result.load_more_url,
+          ),
+          ::Chat::ThreadListSerializer,
+          root: false,
+        )
+      end
+      on_failed_policy(:threaded_discussions_enabled) { raise Discourse::NotFound }
+      on_failed_policy(:threading_enabled_for_channel) { raise Discourse::NotFound }
+      on_failed_policy(:can_view_channel) { raise Discourse::InvalidAccess }
+      on_model_not_found(:channel) { raise Discourse::NotFound }
+      on_model_not_found(:threads) { render json: success_json.merge(threads: []) }
+    end
+  end
+
+  def show
+    with_service(::Chat::LookupThread) do
+      on_success do
+        render_serialized(
+          result.thread,
+          ::Chat::ThreadSerializer,
+          root: "thread",
+          membership: result.membership,
+          include_thread_preview: true,
+          include_thread_original_message: true,
+          participants: result.participants,
+        )
+      end
+      on_failed_policy(:threaded_discussions_enabled) { raise Discourse::NotFound }
+      on_failed_policy(:threading_enabled_for_channel) { raise Discourse::NotFound }
+      on_model_not_found(:thread) { raise Discourse::NotFound }
+    end
+  end
+
+  def update
+    with_service(::Chat::UpdateThread) do
+      on_failed_policy(:threaded_discussions_enabled) { raise Discourse::NotFound }
+      on_failed_policy(:threading_enabled_for_channel) { raise Discourse::NotFound }
+      on_failed_policy(:can_view_channel) { raise Discourse::InvalidAccess }
+      on_failed_policy(:can_edit_thread) { raise Discourse::InvalidAccess }
+      on_model_not_found(:thread) { raise Discourse::NotFound }
+      on_failed_step(:update) do
+        render json: failed_json.merge(errors: [result["result.step.update"].error]), status: 422
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/controllers/chat/api/channel_threads_current_user_notifications_settings_controller.rb b/plugins/chat/app/controllers/chat/api/channel_threads_current_user_notifications_settings_controller.rb
new file mode 100644
index 00000000000..e54d5665450
--- /dev/null
+++ b/plugins/chat/app/controllers/chat/api/channel_threads_current_user_notifications_settings_controller.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class Chat::Api::ChannelThreadsCurrentUserNotificationsSettingsController < Chat::ApiController
+  def update
+    with_service(Chat::UpdateThreadNotificationSettings) do
+      on_failed_policy(:threading_enabled_for_channel) { raise Discourse::NotFound }
+      on_failed_policy(:can_view_channel) { raise Discourse::InvalidAccess }
+      on_model_not_found(:thread) { raise Discourse::NotFound }
+      on_success do
+        render_serialized(
+          result.membership,
+          Chat::BaseThreadMembershipSerializer,
+          root: "membership",
+        )
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/controllers/api/chat_channels_archives_controller.rb b/plugins/chat/app/controllers/chat/api/channels_archives_controller.rb
similarity index 82%
rename from plugins/chat/app/controllers/api/chat_channels_archives_controller.rb
rename to plugins/chat/app/controllers/chat/api/channels_archives_controller.rb
index ca5640e9925..51ac0be0fdb 100644
--- a/plugins/chat/app/controllers/api/chat_channels_archives_controller.rb
+++ b/plugins/chat/app/controllers/chat/api/channels_archives_controller.rb
@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-class Chat::Api::ChatChannelsArchivesController < Chat::Api::ChatChannelsController
+class Chat::Api::ChannelsArchivesController < Chat::Api::ChannelsController
   def create
     existing_archive = channel_from_params.chat_channel_archive
 
     if existing_archive.present?
       guardian.ensure_can_change_channel_status!(channel_from_params, :archived)
       raise Discourse::InvalidAccess if !existing_archive.failed?
-      Chat::ChatChannelArchiveService.retry_archive_process(chat_channel: channel_from_params)
+      Chat::ChannelArchiveService.retry_archive_process(chat_channel: channel_from_params)
       return render json: success_json
     end
 
@@ -20,12 +20,12 @@ class Chat::Api::ChatChannelsArchivesController < Chat::Api::ChatChannelsControl
     end
 
     begin
-      Chat::ChatChannelArchiveService.create_archive_process(
+      Chat::ChannelArchiveService.create_archive_process(
         chat_channel: channel_from_params,
         acting_user: current_user,
         topic_params: topic_params,
       )
-    rescue Chat::ChatChannelArchiveService::ArchiveValidationError => err
+    rescue Chat::ChannelArchiveService::ArchiveValidationError => err
       return render json: failed_json.merge(errors: err.errors), status: 400
     end
 
diff --git a/plugins/chat/app/controllers/chat/api/channels_controller.rb b/plugins/chat/app/controllers/chat/api/channels_controller.rb
new file mode 100644
index 00000000000..b69b33ff33c
--- /dev/null
+++ b/plugins/chat/app/controllers/chat/api/channels_controller.rb
@@ -0,0 +1,149 @@
+# frozen_string_literal: true
+
+CHANNEL_EDITABLE_PARAMS ||= %i[name description slug]
+CATEGORY_CHANNEL_EDITABLE_PARAMS ||= %i[
+  auto_join_users
+  allow_channel_wide_mentions
+  threading_enabled
+]
+
+class Chat::Api::ChannelsController < Chat::ApiController
+  def index
+    permitted = params.permit(:filter, :limit, :offset, :status)
+
+    options = { filter: permitted[:filter], limit: (permitted[:limit] || 25).to_i }
+    options[:offset] = permitted[:offset].to_i
+    options[:status] = Chat::Channel.statuses[permitted[:status]] ? permitted[:status] : nil
+
+    memberships = Chat::ChannelMembershipManager.all_for_user(current_user)
+    channels = Chat::ChannelFetcher.secured_public_channels(guardian, options)
+    serialized_channels =
+      channels.map do |channel|
+        Chat::ChannelSerializer.new(
+          channel,
+          scope: Guardian.new(current_user),
+          membership: memberships.find { |membership| membership.chat_channel_id == channel.id },
+        )
+      end
+
+    load_more_params = options.merge(offset: options[:offset] + options[:limit]).to_query
+    load_more_url = URI::HTTP.build(path: "/chat/api/channels", query: load_more_params).request_uri
+
+    render json: serialized_channels, root: "channels", meta: { load_more_url: load_more_url }
+  end
+
+  def destroy
+    with_service Chat::TrashChannel do
+      on_model_not_found(:channel) { raise ActiveRecord::RecordNotFound }
+    end
+  end
+
+  def create
+    channel_params =
+      params.require(:channel).permit(
+        :chatable_id,
+        :name,
+        :slug,
+        :description,
+        :auto_join_users,
+        :threading_enabled,
+      )
+
+    # NOTE: We don't allow creating channels for anything but category chatable types
+    # at the moment. This may change in future, at which point we will need to pass in
+    # a chatable_type param as well and switch to the correct service here.
+    with_service(
+      Chat::CreateCategoryChannel,
+      **channel_params.merge(category_id: channel_params[:chatable_id]),
+    ) do
+      on_success do
+        render_serialized(
+          result.channel,
+          Chat::ChannelSerializer,
+          root: "channel",
+          membership: result.membership,
+        )
+      end
+      on_model_not_found(:category) { raise ActiveRecord::RecordNotFound }
+      on_failed_policy(:can_create_channel) { raise Discourse::InvalidAccess }
+      on_failed_policy(:category_channel_does_not_exist) do
+        raise Discourse::InvalidParameters.new(I18n.t("chat.errors.channel_exists_for_category"))
+      end
+      on_model_errors(:channel) do
+        render_json_error(result.channel, type: :record_invalid, status: 422)
+      end
+      on_model_errors(:membership) do
+        render_json_error(result.membership, type: :record_invalid, status: 422)
+      end
+    end
+  end
+
+  def show
+    render_serialized(
+      channel_from_params,
+      Chat::ChannelSerializer,
+      membership: channel_from_params.membership_for(current_user),
+      root: "channel",
+      include_extra_info: true,
+    )
+  end
+
+  def update
+    params_to_edit = editable_params(params, channel_from_params)
+    params_to_edit.each { |k, v| params_to_edit[k] = nil if params_to_edit[k].blank? }
+    if ActiveRecord::Type::Boolean.new.deserialize(params_to_edit[:auto_join_users])
+      auto_join_limiter(channel_from_params).performed!
+    end
+
+    with_service(Chat::UpdateChannel, **params_to_edit) do
+      on_success do
+        render_serialized(
+          result.channel,
+          Chat::ChannelSerializer,
+          root: "channel",
+          membership: result.channel.membership_for(current_user),
+        )
+      end
+      on_model_not_found(:channel) { raise ActiveRecord::RecordNotFound }
+      on_failed_policy(:check_channel_permission) { raise Discourse::InvalidAccess }
+      on_failed_policy(:no_direct_message_channel) { raise Discourse::InvalidAccess }
+    end
+  end
+
+  private
+
+  def channel_from_params
+    @channel ||=
+      begin
+        channel = Chat::Channel.find(params.require(:channel_id))
+        guardian.ensure_can_join_chat_channel!(channel)
+        channel
+      end
+  end
+
+  def membership_from_params
+    @membership ||=
+      begin
+        membership =
+          Chat::ChannelMembershipManager.new(channel_from_params).find_for_user(current_user)
+        raise Discourse::NotFound if membership.blank?
+        membership
+      end
+  end
+
+  def auto_join_limiter(channel)
+    RateLimiter.new(
+      current_user,
+      "auto_join_users_channel_#{channel.id}",
+      1,
+      3.minutes,
+      apply_limit_to_staff: true,
+    )
+  end
+
+  def editable_params(params, channel)
+    permitted_params = CHANNEL_EDITABLE_PARAMS
+    permitted_params += CATEGORY_CHANNEL_EDITABLE_PARAMS if channel.category_channel?
+    params.require(:channel).permit(*permitted_params)
+  end
+end
diff --git a/plugins/chat/app/controllers/api/chat_channels_current_user_membership_controller.rb b/plugins/chat/app/controllers/chat/api/channels_current_user_membership_controller.rb
similarity index 65%
rename from plugins/chat/app/controllers/api/chat_channels_current_user_membership_controller.rb
rename to plugins/chat/app/controllers/chat/api/channels_current_user_membership_controller.rb
index 91422f9d673..5f1e4b2af14 100644
--- a/plugins/chat/app/controllers/api/chat_channels_current_user_membership_controller.rb
+++ b/plugins/chat/app/controllers/chat/api/channels_current_user_membership_controller.rb
@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-class Chat::Api::ChatChannelsCurrentUserMembershipController < Chat::Api::ChatChannelsController
+class Chat::Api::ChannelsCurrentUserMembershipController < Chat::Api::ChannelsController
   def create
     guardian.ensure_can_join_chat_channel!(channel_from_params)
 
     render_serialized(
       channel_from_params.add(current_user),
-      UserChatChannelMembershipSerializer,
+      Chat::UserChannelMembershipSerializer,
       root: "membership",
     )
   end
@@ -14,7 +14,7 @@ class Chat::Api::ChatChannelsCurrentUserMembershipController < Chat::Api::ChatCh
   def destroy
     render_serialized(
       channel_from_params.remove(current_user),
-      UserChatChannelMembershipSerializer,
+      Chat::UserChannelMembershipSerializer,
       root: "membership",
     )
   end
diff --git a/plugins/chat/app/controllers/api/chat_channels_current_user_notifications_settings_controller.rb b/plugins/chat/app/controllers/chat/api/channels_current_user_notifications_settings_controller.rb
similarity index 71%
rename from plugins/chat/app/controllers/api/chat_channels_current_user_notifications_settings_controller.rb
rename to plugins/chat/app/controllers/chat/api/channels_current_user_notifications_settings_controller.rb
index d9a8f4ac57e..6c39585d3ec 100644
--- a/plugins/chat/app/controllers/api/chat_channels_current_user_notifications_settings_controller.rb
+++ b/plugins/chat/app/controllers/chat/api/channels_current_user_notifications_settings_controller.rb
@@ -2,13 +2,13 @@
 
 MEMBERSHIP_EDITABLE_PARAMS = %i[muted desktop_notification_level mobile_notification_level]
 
-class Chat::Api::ChatChannelsCurrentUserNotificationsSettingsController < Chat::Api::ChatChannelsController
+class Chat::Api::ChannelsCurrentUserNotificationsSettingsController < Chat::Api::ChannelsController
   def update
     settings_params = params.require(:notifications_settings).permit(MEMBERSHIP_EDITABLE_PARAMS)
     membership_from_params.update!(settings_params.to_h)
     render_serialized(
       membership_from_params,
-      UserChatChannelMembershipSerializer,
+      Chat::UserChannelMembershipSerializer,
       root: "membership",
     )
   end
diff --git a/plugins/chat/app/controllers/api/chat_channels_memberships_controller.rb b/plugins/chat/app/controllers/chat/api/channels_memberships_controller.rb
similarity index 76%
rename from plugins/chat/app/controllers/api/chat_channels_memberships_controller.rb
rename to plugins/chat/app/controllers/chat/api/channels_memberships_controller.rb
index 75251a930fb..d35d63df59c 100644
--- a/plugins/chat/app/controllers/api/chat_channels_memberships_controller.rb
+++ b/plugins/chat/app/controllers/chat/api/channels_memberships_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Chat::Api::ChatChannelsMembershipsController < Chat::Api::ChatChannelsController
+class Chat::Api::ChannelsMembershipsController < Chat::Api::ChannelsController
   INDEX_LIMIT = 50
 
   def index
@@ -10,8 +10,8 @@ class Chat::Api::ChatChannelsMembershipsController < Chat::Api::ChatChannelsCont
     limit = fetch_limit_from_params(default: INDEX_LIMIT, max: INDEX_LIMIT)
 
     memberships =
-      ChatChannelMembershipsQuery.call(
-        channel_from_params,
+      Chat::ChannelMembershipsQuery.call(
+        channel: channel_from_params,
         offset: offset,
         limit: limit,
         username: params[:username],
@@ -19,7 +19,7 @@ class Chat::Api::ChatChannelsMembershipsController < Chat::Api::ChatChannelsCont
 
     render_serialized(
       memberships,
-      UserChatChannelMembershipSerializer,
+      Chat::UserChannelMembershipSerializer,
       root: "memberships",
       meta: {
         total_rows: channel_from_params.user_count,
diff --git a/plugins/chat/app/controllers/api/chat_channels_messages_moves_controller.rb b/plugins/chat/app/controllers/chat/api/channels_messages_moves_controller.rb
similarity index 82%
rename from plugins/chat/app/controllers/api/chat_channels_messages_moves_controller.rb
rename to plugins/chat/app/controllers/chat/api/channels_messages_moves_controller.rb
index d0d3ff1777f..100b9330492 100644
--- a/plugins/chat/app/controllers/api/chat_channels_messages_moves_controller.rb
+++ b/plugins/chat/app/controllers/chat/api/channels_messages_moves_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Chat::Api::ChatChannelsMessagesMovesController < Chat::Api::ChatChannelsController
+class Chat::Api::ChannelsMessagesMovesController < Chat::Api::ChannelsController
   def create
     move_params = params.require(:move)
     move_params.require(:message_ids)
@@ -8,10 +8,7 @@ class Chat::Api::ChatChannelsMessagesMovesController < Chat::Api::ChatChannelsCo
 
     raise Discourse::InvalidAccess if !guardian.can_move_chat_messages?(channel_from_params)
     destination_channel =
-      Chat::ChatChannelFetcher.find_with_access_check(
-        move_params[:destination_channel_id],
-        guardian,
-      )
+      Chat::ChannelFetcher.find_with_access_check(move_params[:destination_channel_id], guardian)
 
     begin
       message_ids = move_params[:message_ids].map(&:to_i)
diff --git a/plugins/chat/app/controllers/chat/api/channels_status_controller.rb b/plugins/chat/app/controllers/chat/api/channels_status_controller.rb
new file mode 100644
index 00000000000..38e83f23104
--- /dev/null
+++ b/plugins/chat/app/controllers/chat/api/channels_status_controller.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class Chat::Api::ChannelsStatusController < Chat::Api::ChannelsController
+  def update
+    with_service(Chat::UpdateChannelStatus) do
+      on_success { render_serialized(result.channel, Chat::ChannelSerializer, root: "channel") }
+      on_model_not_found(:channel) { raise ActiveRecord::RecordNotFound }
+      on_failed_policy(:check_channel_permission) { raise Discourse::InvalidAccess }
+    end
+  end
+end
diff --git a/plugins/chat/app/controllers/chat/api/chatables_controller.rb b/plugins/chat/app/controllers/chat/api/chatables_controller.rb
new file mode 100644
index 00000000000..7940a7221e5
--- /dev/null
+++ b/plugins/chat/app/controllers/chat/api/chatables_controller.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class Chat::Api::ChatablesController < Chat::ApiController
+  before_action :ensure_logged_in
+
+  def index
+    with_service(::Chat::SearchChatable) do
+      on_success { render_serialized(result, ::Chat::ChatablesSerializer, root: false) }
+    end
+  end
+end
diff --git a/plugins/chat/app/controllers/chat/api/current_user_channels_controller.rb b/plugins/chat/app/controllers/chat/api/current_user_channels_controller.rb
new file mode 100644
index 00000000000..613af229090
--- /dev/null
+++ b/plugins/chat/app/controllers/chat/api/current_user_channels_controller.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class Chat::Api::CurrentUserChannelsController < Chat::ApiController
+  def index
+    structured = Chat::ChannelFetcher.structured(guardian)
+    render_serialized(structured, Chat::ChannelIndexSerializer, root: false)
+  end
+end
diff --git a/plugins/chat/app/controllers/chat/api/direct_messages_controller.rb b/plugins/chat/app/controllers/chat/api/direct_messages_controller.rb
new file mode 100644
index 00000000000..c4fa7766286
--- /dev/null
+++ b/plugins/chat/app/controllers/chat/api/direct_messages_controller.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+# TODO (martin) Remove this endpoint when we move to do the channel creation
+# when a message is first sent to avoid double-request round trips for DMs.
+class Chat::Api::DirectMessagesController < Chat::ApiController
+  def create
+    with_service(Chat::CreateDirectMessageChannel) do
+      on_success do
+        render_serialized(
+          result.channel,
+          Chat::ChannelSerializer,
+          root: "channel",
+          membership: result.membership,
+        )
+      end
+      on_model_not_found(:target_users) { raise ActiveRecord::RecordNotFound }
+      on_failed_policy(:satisfies_dms_max_users_limit) do |policy|
+        raise Discourse::InvalidParameters.new(:target_usernames, policy.reason)
+      end
+      on_failed_policy(:actor_allows_dms) do
+        render_json_error(I18n.t("chat.errors.actor_disallowed_dms"))
+      end
+      on_failed_policy(:targets_allow_dms_from_user) { |policy| render_json_error(policy.reason) }
+      on_model_errors(:direct_message) do |model|
+        render_json_error(model, type: :record_invalid, status: 422)
+      end
+      on_model_errors(:channel) do |model|
+        render_json_error(model, type: :record_invalid, status: 422)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/controllers/api/hints_controller.rb b/plugins/chat/app/controllers/chat/api/hints_controller.rb
similarity index 100%
rename from plugins/chat/app/controllers/api/hints_controller.rb
rename to plugins/chat/app/controllers/chat/api/hints_controller.rb
diff --git a/plugins/chat/app/controllers/chat/api/reads_controller.rb b/plugins/chat/app/controllers/chat/api/reads_controller.rb
new file mode 100644
index 00000000000..99a8dff412b
--- /dev/null
+++ b/plugins/chat/app/controllers/chat/api/reads_controller.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+class Chat::Api::ReadsController < Chat::ApiController
+  def update
+    params.require(%i[channel_id message_id])
+
+    with_service(Chat::UpdateUserLastRead) do
+      on_failed_policy(:ensure_message_id_recency) do
+        raise Discourse::InvalidParameters.new(:message_id)
+      end
+      on_model_not_found(:message) { raise Discourse::NotFound }
+      on_model_not_found(:active_membership) { raise Discourse::NotFound }
+      on_model_not_found(:channel) { raise Discourse::NotFound }
+    end
+  end
+
+  def update_all
+    with_service(Chat::MarkAllUserChannelsRead) do
+      on_success do
+        render(json: success_json.merge(updated_memberships: result.updated_memberships))
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/controllers/chat/api/summaries_controller.rb b/plugins/chat/app/controllers/chat/api/summaries_controller.rb
new file mode 100644
index 00000000000..208cf98c11b
--- /dev/null
+++ b/plugins/chat/app/controllers/chat/api/summaries_controller.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+class Chat::Api::SummariesController < Chat::ApiController
+  VALID_SINCE_VALUES = [1, 3, 6, 12, 24, 72, 168]
+
+  def get_summary
+    since = params[:since].to_i
+    raise Discourse::InvalidParameters.new(:since) if !VALID_SINCE_VALUES.include?(since)
+
+    channel = Chat::Channel.find(params[:channel_id])
+    guardian.ensure_can_join_chat_channel!(channel)
+
+    strategy = Summarization::Base.selected_strategy
+    raise Discourse::NotFound.new unless strategy
+    raise Discourse::InvalidAccess unless Summarization::Base.can_request_summary_for?(current_user)
+
+    RateLimiter.new(current_user, "channel_summary", 6, 5.minutes).performed!
+
+    hijack do
+      content = { content_title: channel.name }
+
+      content[:contents] = channel
+        .chat_messages
+        .where("chat_messages.created_at > ?", since.hours.ago)
+        .includes(:user)
+        .order(created_at: :asc)
+        .pluck(:id, :username_lower, :message)
+        .map { { id: _1, poster: _2, text: _3 } }
+
+      summarized_text =
+        if content[:contents].empty?
+          I18n.t("chat.summaries.no_targets")
+        else
+          strategy.summarize(content).dig(:summary)
+        end
+
+      render json: { summary: summarized_text }
+    end
+  end
+end
diff --git a/plugins/chat/app/controllers/chat/api/thread_reads_controller.rb b/plugins/chat/app/controllers/chat/api/thread_reads_controller.rb
new file mode 100644
index 00000000000..dfb72d9b70f
--- /dev/null
+++ b/plugins/chat/app/controllers/chat/api/thread_reads_controller.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class Chat::Api::ThreadReadsController < Chat::ApiController
+  def update
+    params.require(%i[channel_id thread_id])
+
+    with_service(Chat::UpdateUserThreadLastRead) do
+      on_model_not_found(:thread) { raise Discourse::NotFound }
+    end
+  end
+end
diff --git a/plugins/chat/app/controllers/chat/api_controller.rb b/plugins/chat/app/controllers/chat/api_controller.rb
new file mode 100644
index 00000000000..57ec914e2cd
--- /dev/null
+++ b/plugins/chat/app/controllers/chat/api_controller.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Chat
+  class ApiController < ::Chat::BaseController
+    before_action :ensure_logged_in
+    before_action :ensure_can_chat
+
+    include Chat::WithServiceHelper
+
+    private
+
+    def ensure_can_chat
+      raise Discourse::NotFound unless SiteSetting.chat_enabled
+      guardian.ensure_can_chat!
+    end
+
+    def default_actions_for_service
+      proc do
+        on_success { render(json: success_json) }
+        on_failure { render(json: failed_json, status: 422) }
+        on_failed_policy(:invalid_access) { raise Discourse::InvalidAccess }
+        on_failed_contract do |contract|
+          render(json: failed_json.merge(errors: contract.errors.full_messages), status: 400)
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/controllers/chat/base_controller.rb b/plugins/chat/app/controllers/chat/base_controller.rb
new file mode 100644
index 00000000000..3f7e2691c29
--- /dev/null
+++ b/plugins/chat/app/controllers/chat/base_controller.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Chat
+  class BaseController < ::ApplicationController
+    before_action :ensure_logged_in
+    before_action :ensure_can_chat
+
+    private
+
+    def ensure_can_chat
+      raise Discourse::NotFound unless SiteSetting.chat_enabled
+      guardian.ensure_can_chat!
+    end
+
+    def set_channel_and_chatable_with_access_check(chat_channel_id: nil)
+      params.require(:chat_channel_id) if chat_channel_id.blank?
+      id_or_name = chat_channel_id || params[:chat_channel_id]
+      @chat_channel = Chat::ChannelFetcher.find_with_access_check(id_or_name, guardian)
+      @chatable = @chat_channel.chatable
+    end
+  end
+end
diff --git a/plugins/chat/app/controllers/chat/chat_controller.rb b/plugins/chat/app/controllers/chat/chat_controller.rb
new file mode 100644
index 00000000000..943d2786be7
--- /dev/null
+++ b/plugins/chat/app/controllers/chat/chat_controller.rb
@@ -0,0 +1,346 @@
+# frozen_string_literal: true
+
+module Chat
+  class ChatController < ::Chat::BaseController
+    PAST_MESSAGE_LIMIT = 40
+    FUTURE_MESSAGE_LIMIT = 40
+    PAST = "past"
+    FUTURE = "future"
+    CHAT_DIRECTIONS = [PAST, FUTURE]
+
+    # Other endpoints use set_channel_and_chatable_with_access_check, but
+    # these endpoints require a standalone find because they need to be
+    # able to get deleted channels and recover them.
+    before_action :find_chatable, only: %i[enable_chat disable_chat]
+    before_action :find_chat_message, only: %i[edit_message rebake message_link]
+    before_action :set_channel_and_chatable_with_access_check,
+                  except: %i[
+                    respond
+                    enable_chat
+                    disable_chat
+                    message_link
+                    set_user_chat_status
+                    dismiss_retention_reminder
+                    flag
+                  ]
+
+    def respond
+      render
+    end
+
+    def enable_chat
+      chat_channel = Chat::Channel.with_deleted.find_by(chatable_id: @chatable)
+
+      guardian.ensure_can_join_chat_channel!(chat_channel) if chat_channel
+
+      if chat_channel && chat_channel.trashed?
+        chat_channel.recover!
+      elsif chat_channel
+        return render_json_error I18n.t("chat.already_enabled")
+      else
+        chat_channel = @chatable.chat_channel
+        guardian.ensure_can_join_chat_channel!(chat_channel)
+      end
+
+      success = chat_channel.save
+      if success && chat_channel.chatable_has_custom_fields?
+        @chatable.custom_fields[Chat::HAS_CHAT_ENABLED] = true
+        @chatable.save!
+      end
+
+      if success
+        membership = Chat::ChannelMembershipManager.new(channel).follow(user)
+        render_serialized(chat_channel, Chat::ChannelSerializer, membership: membership)
+      else
+        render_json_error(chat_channel)
+      end
+
+      Chat::ChannelMembershipManager.new(channel).follow(user)
+    end
+
+    def disable_chat
+      chat_channel = Chat::Channel.with_deleted.find_by(chatable_id: @chatable)
+      guardian.ensure_can_join_chat_channel!(chat_channel)
+      return render json: success_json if chat_channel.trashed?
+      chat_channel.trash!(current_user)
+
+      success = chat_channel.save
+      if success
+        if chat_channel.chatable_has_custom_fields?
+          @chatable.custom_fields.delete(Chat::HAS_CHAT_ENABLED)
+          @chatable.save!
+        end
+
+        render json: success_json
+      else
+        render_json_error(chat_channel)
+      end
+    end
+
+    def create_message
+      raise Discourse::InvalidAccess if current_user.silenced?
+
+      Chat::MessageRateLimiter.run!(current_user)
+
+      @user_chat_channel_membership =
+        Chat::ChannelMembershipManager.new(@chat_channel).find_for_user(current_user)
+      raise Discourse::InvalidAccess unless @user_chat_channel_membership
+
+      reply_to_msg_id = params[:in_reply_to_id]
+      if reply_to_msg_id.present?
+        rm = Chat::Message.find(reply_to_msg_id)
+        raise Discourse::NotFound if rm.chat_channel_id != @chat_channel.id
+      end
+
+      content = params[:message]
+
+      chat_message_creator =
+        Chat::MessageCreator.create(
+          chat_channel: @chat_channel,
+          user: current_user,
+          in_reply_to_id: reply_to_msg_id,
+          content: content,
+          staged_id: params[:staged_id],
+          upload_ids: params[:upload_ids],
+          thread_id: params[:thread_id],
+          staged_thread_id: params[:staged_thread_id],
+        )
+
+      return render_json_error(chat_message_creator.error) if chat_message_creator.failed?
+
+      if !chat_message_creator.chat_message.thread_id.present?
+        @user_chat_channel_membership.update!(
+          last_read_message_id: chat_message_creator.chat_message.id,
+        )
+      end
+
+      if @chat_channel.direct_message_channel?
+        # If any of the channel users is ignoring, muting, or preventing DMs from
+        # the current user then we should not auto-follow the channel once again or
+        # publish the new channel.
+        allowed_user_ids =
+          UserCommScreener.new(
+            acting_user: current_user,
+            target_user_ids:
+              @chat_channel.user_chat_channel_memberships.where(following: false).pluck(:user_id),
+          ).allowing_actor_communication
+
+        allowed_user_ids << current_user.id if !@user_chat_channel_membership.following
+
+        if allowed_user_ids.any?
+          Chat::Publisher.publish_new_channel(@chat_channel, User.where(id: allowed_user_ids))
+
+          @chat_channel
+            .user_chat_channel_memberships
+            .where(user_id: allowed_user_ids)
+            .update_all(following: true)
+        end
+      end
+
+      message =
+        (
+          if @user_chat_channel_membership.last_read_message_id &&
+               chat_message_creator.chat_message.in_thread?
+            Chat::Message.find(@user_chat_channel_membership.last_read_message_id)
+          else
+            chat_message_creator.chat_message
+          end
+        )
+
+      Chat::Publisher.publish_user_tracking_state!(current_user, @chat_channel, message)
+
+      render json: success_json.merge(message_id: chat_message_creator.chat_message.id)
+    end
+
+    def edit_message
+      chat_message_updater =
+        Chat::MessageUpdater.update(
+          guardian: guardian,
+          chat_message: @message,
+          new_content: params[:new_message],
+          upload_ids: params[:upload_ids] || [],
+        )
+
+      return render_json_error(chat_message_updater.error) if chat_message_updater.failed?
+
+      render json: success_json
+    end
+
+    def react
+      params.require(%i[message_id emoji react_action])
+      guardian.ensure_can_react!
+
+      Chat::MessageReactor.new(current_user, @chat_channel).react!(
+        message_id: params[:message_id],
+        react_action: params[:react_action].to_sym,
+        emoji: params[:emoji],
+      )
+
+      render json: success_json
+    end
+
+    def rebake
+      guardian.ensure_can_rebake_chat_message!(@message)
+      @message.rebake!(invalidate_oneboxes: true)
+      render json: success_json
+    end
+
+    def message_link
+      raise Discourse::NotFound if @message.blank? || @message.deleted_at.present?
+      raise Discourse::NotFound if @message.chat_channel.blank?
+      set_channel_and_chatable_with_access_check(chat_channel_id: @message.chat_channel_id)
+      render json:
+               success_json.merge(
+                 chat_channel_id: @chat_channel.id,
+                 chat_channel_title: @chat_channel.title(current_user),
+               )
+    end
+
+    def set_user_chat_status
+      params.require(:chat_enabled)
+
+      current_user.user_option.update(chat_enabled: params[:chat_enabled])
+      render json: { chat_enabled: current_user.user_option.chat_enabled }
+    end
+
+    def invite_users
+      params.require(:user_ids)
+
+      users =
+        User
+          .includes(:groups)
+          .joins(:user_option)
+          .where(user_options: { chat_enabled: true })
+          .not_suspended
+          .where(id: params[:user_ids])
+      users.each do |user|
+        if user.guardian.can_join_chat_channel?(@chat_channel)
+          data = {
+            message: "chat.invitation_notification",
+            chat_channel_id: @chat_channel.id,
+            chat_channel_title: @chat_channel.title(user),
+            chat_channel_slug: @chat_channel.slug,
+            invited_by_username: current_user.username,
+          }
+          data[:chat_message_id] = params[:chat_message_id] if params[:chat_message_id]
+          user.notifications.create(
+            notification_type: Notification.types[:chat_invitation],
+            high_priority: true,
+            data: data.to_json,
+          )
+        end
+      end
+
+      render json: success_json
+    end
+
+    def dismiss_retention_reminder
+      params.require(:chatable_type)
+      guardian.ensure_can_chat!
+      unless Chat::Channel.chatable_types.include?(params[:chatable_type])
+        raise Discourse::InvalidParameters
+      end
+
+      field =
+        (
+          if Chat::Channel.public_channel_chatable_types.include?(params[:chatable_type])
+            :dismissed_channel_retention_reminder
+          else
+            :dismissed_dm_retention_reminder
+          end
+        )
+      current_user.user_option.update(field => true)
+      render json: success_json
+    end
+
+    def quote_messages
+      params.require(:message_ids)
+
+      message_ids = params[:message_ids].map(&:to_i)
+      markdown =
+        Chat::TranscriptService.new(
+          @chat_channel,
+          current_user,
+          messages_or_ids: message_ids,
+        ).generate_markdown
+      render json: success_json.merge(markdown: markdown)
+    end
+
+    def flag
+      RateLimiter.new(current_user, "flag_chat_message", 4, 1.minutes).performed!
+
+      permitted_params =
+        params.permit(
+          %i[chat_message_id flag_type_id message is_warning take_action queue_for_review],
+        )
+
+      chat_message =
+        Chat::Message.includes(:chat_channel, :revisions).find(permitted_params[:chat_message_id])
+
+      flag_type_id = permitted_params[:flag_type_id].to_i
+
+      if !ReviewableScore.types.values.include?(flag_type_id)
+        raise Discourse::InvalidParameters.new(:flag_type_id)
+      end
+
+      set_channel_and_chatable_with_access_check(chat_channel_id: chat_message.chat_channel_id)
+
+      result =
+        Chat::ReviewQueue.new.flag_message(chat_message, guardian, flag_type_id, permitted_params)
+
+      if result[:success]
+        render json: success_json
+      else
+        render_json_error(result[:errors])
+      end
+    end
+
+    def set_draft
+      if params[:data].present?
+        Chat::Draft.find_or_initialize_by(
+          user: current_user,
+          chat_channel_id: @chat_channel.id,
+        ).update!(data: params[:data])
+      else
+        Chat::Draft.where(user: current_user, chat_channel_id: @chat_channel.id).destroy_all
+      end
+
+      render json: success_json
+    end
+
+    private
+
+    def preloaded_chat_message_query
+      query =
+        Chat::Message
+          .includes(in_reply_to: [:user, chat_webhook_event: [:incoming_chat_webhook]])
+          .includes(:revisions)
+          .includes(user: :primary_group)
+          .includes(chat_webhook_event: :incoming_chat_webhook)
+          .includes(reactions: :user)
+          .includes(:bookmarks)
+          .includes(:uploads)
+          .includes(chat_channel: :chatable)
+          .includes(:thread)
+          .includes(:chat_mentions)
+
+      query = query.includes(user: :user_status) if SiteSetting.enable_user_status
+
+      query
+    end
+
+    def find_chatable
+      @chatable = Category.find_by(id: params[:chatable_id])
+      guardian.ensure_can_moderate_chat!(@chatable)
+    end
+
+    def find_chat_message
+      @message = preloaded_chat_message_query.with_deleted
+      @message = @message.where(chat_channel_id: params[:chat_channel_id]) if params[
+        :chat_channel_id
+      ]
+      @message = @message.find_by(id: params[:message_id])
+      raise Discourse::NotFound unless @message
+    end
+  end
+end
diff --git a/plugins/chat/app/controllers/chat/direct_messages_controller.rb b/plugins/chat/app/controllers/chat/direct_messages_controller.rb
new file mode 100644
index 00000000000..f20c647cfc5
--- /dev/null
+++ b/plugins/chat/app/controllers/chat/direct_messages_controller.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Chat
+  class DirectMessagesController < ::Chat::BaseController
+    def index
+      guardian.ensure_can_chat!
+      users = users_from_usernames(current_user, params)
+
+      direct_message = Chat::DirectMessage.for_user_ids(users.map(&:id).uniq)
+      if direct_message
+        chat_channel = Chat::Channel.find_by(chatable_id: direct_message)
+        render_serialized(
+          chat_channel,
+          Chat::ChannelSerializer,
+          root: "channel",
+          membership: chat_channel.membership_for(current_user),
+        )
+      else
+        render body: nil, status: 404
+      end
+    end
+
+    private
+
+    def users_from_usernames(current_user, params)
+      params.require(:usernames)
+
+      usernames =
+        (params[:usernames].is_a?(String) ? params[:usernames].split(",") : params[:usernames])
+
+      users = [current_user]
+      other_usernames = usernames - [current_user.username]
+      users.concat(User.where(username: other_usernames).to_a) if other_usernames.any?
+      users
+    end
+  end
+end
diff --git a/plugins/chat/app/controllers/chat/emojis_controller.rb b/plugins/chat/app/controllers/chat/emojis_controller.rb
new file mode 100644
index 00000000000..e27f8ae537e
--- /dev/null
+++ b/plugins/chat/app/controllers/chat/emojis_controller.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Chat
+  class EmojisController < ::Chat::BaseController
+    def index
+      emojis = Emoji.allowed.group_by(&:group)
+      render json: MultiJson.dump(emojis)
+    end
+  end
+end
diff --git a/plugins/chat/app/controllers/chat/incoming_webhooks_controller.rb b/plugins/chat/app/controllers/chat/incoming_webhooks_controller.rb
new file mode 100644
index 00000000000..3e3485aa588
--- /dev/null
+++ b/plugins/chat/app/controllers/chat/incoming_webhooks_controller.rb
@@ -0,0 +1,115 @@
+# frozen_string_literal: true
+
+module Chat
+  class IncomingWebhooksController < ::ApplicationController
+    requires_plugin Chat::PLUGIN_NAME
+
+    WEBHOOK_MESSAGES_PER_MINUTE_LIMIT = 10
+
+    skip_before_action :verify_authenticity_token, :redirect_to_login_if_required
+
+    before_action :validate_payload
+
+    def create_message
+      debug_payload
+
+      process_webhook_payload(text: params[:text], key: params[:key])
+    end
+
+    # See https://api.slack.com/reference/messaging/payload for the
+    # slack message payload format. For now we only support the
+    # text param, which we preprocess lightly to remove the slack-isms
+    # in the formatting.
+    def create_message_slack_compatible
+      debug_payload
+
+      # See note in validate_payload on why this is needed
+      attachments =
+        if params[:payload].present?
+          payload = params[:payload]
+          if String === payload
+            payload = JSON.parse(payload)
+            payload.deep_symbolize_keys!
+          end
+          payload[:attachments]
+        else
+          params[:attachments]
+        end
+
+      if params[:text].present?
+        text = Chat::SlackCompatibility.process_text(params[:text])
+      else
+        text = Chat::SlackCompatibility.process_legacy_attachments(attachments)
+      end
+
+      process_webhook_payload(text: text, key: params[:key])
+    rescue JSON::ParserError
+      raise Discourse::InvalidParameters
+    end
+
+    private
+
+    def process_webhook_payload(text:, key:)
+      validate_message_length(text)
+      webhook = find_and_rate_limit_webhook(key)
+
+      chat_message_creator =
+        Chat::MessageCreator.create(
+          chat_channel: webhook.chat_channel,
+          user: Discourse.system_user,
+          content: text,
+          incoming_chat_webhook: webhook,
+        )
+      if chat_message_creator.failed?
+        render_json_error(chat_message_creator.error)
+      else
+        render json: success_json
+      end
+    end
+
+    def find_and_rate_limit_webhook(key)
+      webhook = Chat::IncomingWebhook.includes(:chat_channel).find_by(key: key)
+      raise Discourse::NotFound unless webhook
+
+      # Rate limit to 10 messages per-minute. We can move to a site setting in the future if needed.
+      RateLimiter.new(
+        nil,
+        "incoming_chat_webhook_#{webhook.id}",
+        WEBHOOK_MESSAGES_PER_MINUTE_LIMIT,
+        1.minute,
+      ).performed!
+      webhook
+    end
+
+    def validate_message_length(message)
+      return if message.length <= SiteSetting.chat_maximum_message_length
+      raise Discourse::InvalidParameters.new(
+              "Body cannot be over #{SiteSetting.chat_maximum_message_length} characters",
+            )
+    end
+
+    # The webhook POST body can be in 3 different formats:
+    #
+    # * { text: "message text" }, which is the most basic method, and also mirrors Slack payloads
+    # * { attachments: [ text: "message text" ] }, which is a variant of Slack payloads using legacy attachments
+    # * { payload: "<JSON STRING>", attachments: null, text: null }, where JSON STRING can look
+    #   like the `attachments` example above (along with other attributes), which is fired by OpsGenie
+    def validate_payload
+      params.require(:key)
+
+      if !params[:text] && !params[:payload] && !params[:attachments]
+        raise Discourse::InvalidParameters
+      end
+    end
+
+    def debug_payload
+      return if !SiteSetting.chat_debug_webhook_payloads
+      Rails.logger.warn(
+        "Debugging chat webhook payload for endpoint #{params[:key]}: " +
+          JSON.dump(
+            { payload: params[:payload], attachments: params[:attachments], text: params[:text] },
+          ),
+      )
+    end
+  end
+end
diff --git a/plugins/chat/app/controllers/chat_base_controller.rb b/plugins/chat/app/controllers/chat_base_controller.rb
deleted file mode 100644
index 6e014502ddb..00000000000
--- a/plugins/chat/app/controllers/chat_base_controller.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-class Chat::ChatBaseController < ::ApplicationController
-  before_action :ensure_logged_in
-  before_action :ensure_can_chat
-
-  private
-
-  def ensure_can_chat
-    raise Discourse::NotFound unless SiteSetting.chat_enabled
-    guardian.ensure_can_chat!
-  end
-
-  def set_channel_and_chatable_with_access_check(chat_channel_id: nil)
-    params.require(:chat_channel_id) if chat_channel_id.blank?
-    id_or_name = chat_channel_id || params[:chat_channel_id]
-    @chat_channel = Chat::ChatChannelFetcher.find_with_access_check(id_or_name, guardian)
-    @chatable = @chat_channel.chatable
-  end
-end
diff --git a/plugins/chat/app/controllers/chat_controller.rb b/plugins/chat/app/controllers/chat_controller.rb
deleted file mode 100644
index 31ad38e02a6..00000000000
--- a/plugins/chat/app/controllers/chat_controller.rb
+++ /dev/null
@@ -1,476 +0,0 @@
-# frozen_string_literal: true
-
-class Chat::ChatController < Chat::ChatBaseController
-  PAST_MESSAGE_LIMIT = 20
-  FUTURE_MESSAGE_LIMIT = 40
-  PAST = "past"
-  FUTURE = "future"
-  CHAT_DIRECTIONS = [PAST, FUTURE]
-
-  # Other endpoints use set_channel_and_chatable_with_access_check, but
-  # these endpoints require a standalone find because they need to be
-  # able to get deleted channels and recover them.
-  before_action :find_chatable, only: %i[enable_chat disable_chat]
-  before_action :find_chat_message,
-                only: %i[delete restore lookup_message edit_message rebake message_link]
-  before_action :set_channel_and_chatable_with_access_check,
-                except: %i[
-                  respond
-                  enable_chat
-                  disable_chat
-                  message_link
-                  lookup_message
-                  set_user_chat_status
-                  dismiss_retention_reminder
-                  flag
-                ]
-
-  def respond
-    render
-  end
-
-  def enable_chat
-    chat_channel = ChatChannel.with_deleted.find_by(chatable: @chatable)
-
-    guardian.ensure_can_join_chat_channel!(chat_channel) if chat_channel
-
-    if chat_channel && chat_channel.trashed?
-      chat_channel.recover!
-    elsif chat_channel
-      return render_json_error I18n.t("chat.already_enabled")
-    else
-      chat_channel = @chatable.chat_channel
-      guardian.ensure_can_join_chat_channel!(chat_channel)
-    end
-
-    success = chat_channel.save
-    if success && chat_channel.chatable_has_custom_fields?
-      @chatable.custom_fields[Chat::HAS_CHAT_ENABLED] = true
-      @chatable.save!
-    end
-
-    if success
-      membership = Chat::ChatChannelMembershipManager.new(channel).follow(user)
-      render_serialized(chat_channel, ChatChannelSerializer, membership: membership)
-    else
-      render_json_error(chat_channel)
-    end
-
-    Chat::ChatChannelMembershipManager.new(channel).follow(user)
-  end
-
-  def disable_chat
-    chat_channel = ChatChannel.with_deleted.find_by(chatable: @chatable)
-    guardian.ensure_can_join_chat_channel!(chat_channel)
-    return render json: success_json if chat_channel.trashed?
-    chat_channel.trash!(current_user)
-
-    success = chat_channel.save
-    if success
-      if chat_channel.chatable_has_custom_fields?
-        @chatable.custom_fields.delete(Chat::HAS_CHAT_ENABLED)
-        @chatable.save!
-      end
-
-      render json: success_json
-    else
-      render_json_error(chat_channel)
-    end
-  end
-
-  def create_message
-    raise Discourse::InvalidAccess if current_user.silenced?
-
-    Chat::ChatMessageRateLimiter.run!(current_user)
-
-    @user_chat_channel_membership =
-      Chat::ChatChannelMembershipManager.new(@chat_channel).find_for_user(
-        current_user,
-        following: true,
-      )
-    raise Discourse::InvalidAccess unless @user_chat_channel_membership
-
-    reply_to_msg_id = params[:in_reply_to_id]
-    if reply_to_msg_id
-      rm = ChatMessage.find(reply_to_msg_id)
-      raise Discourse::NotFound if rm.chat_channel_id != @chat_channel.id
-    end
-
-    content = params[:message]
-
-    chat_message_creator =
-      Chat::ChatMessageCreator.create(
-        chat_channel: @chat_channel,
-        user: current_user,
-        in_reply_to_id: reply_to_msg_id,
-        content: content,
-        staged_id: params[:staged_id],
-        upload_ids: params[:upload_ids],
-      )
-
-    return render_json_error(chat_message_creator.error) if chat_message_creator.failed?
-
-    @user_chat_channel_membership.update!(
-      last_read_message_id: chat_message_creator.chat_message.id,
-    )
-
-    if @chat_channel.direct_message_channel?
-      # If any of the channel users is ignoring, muting, or preventing DMs from
-      # the current user then we shold not auto-follow the channel once again or
-      # publish the new channel.
-      user_ids_allowing_communication =
-        UserCommScreener.new(
-          acting_user: current_user,
-          target_user_ids: @chat_channel.user_chat_channel_memberships.pluck(:user_id),
-        ).allowing_actor_communication
-
-      if user_ids_allowing_communication.any?
-        ChatPublisher.publish_new_channel(
-          @chat_channel,
-          @chat_channel.chatable.users.where(id: user_ids_allowing_communication),
-        )
-
-        @chat_channel
-          .user_chat_channel_memberships
-          .where(user_id: user_ids_allowing_communication)
-          .update_all(following: true)
-      end
-    end
-
-    ChatPublisher.publish_user_tracking_state(
-      current_user,
-      @chat_channel.id,
-      chat_message_creator.chat_message.id,
-    )
-    render json: success_json
-  end
-
-  def edit_message
-    chat_message_updater =
-      Chat::ChatMessageUpdater.update(
-        guardian: guardian,
-        chat_message: @message,
-        new_content: params[:new_message],
-        upload_ids: params[:upload_ids] || [],
-      )
-
-    return render_json_error(chat_message_updater.error) if chat_message_updater.failed?
-
-    render json: success_json
-  end
-
-  def update_user_last_read
-    membership =
-      Chat::ChatChannelMembershipManager.new(@chat_channel).find_for_user(
-        current_user,
-        following: true,
-      )
-    raise Discourse::NotFound if membership.nil?
-
-    if membership.last_read_message_id && params[:message_id].to_i < membership.last_read_message_id
-      raise Discourse::InvalidParameters.new(:message_id)
-    end
-
-    unless ChatMessage.with_deleted.exists?(
-             chat_channel_id: @chat_channel.id,
-             id: params[:message_id],
-           )
-      raise Discourse::NotFound
-    end
-
-    membership.update!(last_read_message_id: params[:message_id])
-
-    Notification
-      .where(notification_type: Notification.types[:chat_mention])
-      .where(user: current_user)
-      .where(read: false)
-      .joins("INNER JOIN chat_mentions ON chat_mentions.notification_id = notifications.id")
-      .joins("INNER JOIN chat_messages ON chat_mentions.chat_message_id = chat_messages.id")
-      .where("chat_messages.id <= ?", params[:message_id].to_i)
-      .where("chat_messages.chat_channel_id = ?", @chat_channel.id)
-      .update_all(read: true)
-
-    ChatPublisher.publish_user_tracking_state(current_user, @chat_channel.id, params[:message_id])
-
-    render json: success_json
-  end
-
-  def messages
-    page_size = params[:page_size]&.to_i || 1000
-    direction = params[:direction].to_s
-    message_id = params[:message_id]
-    if page_size > 50 ||
-         (
-           message_id.blank? ^ direction.blank? &&
-             (direction.present? && !CHAT_DIRECTIONS.include?(direction))
-         )
-      raise Discourse::InvalidParameters
-    end
-
-    messages = preloaded_chat_message_query.where(chat_channel: @chat_channel)
-    messages = messages.with_deleted if guardian.can_moderate_chat?(@chatable)
-
-    if message_id.present?
-      condition = direction == PAST ? "<" : ">"
-      messages = messages.where("id #{condition} ?", message_id.to_i)
-    end
-
-    # NOTE: This order is reversed when we return the ChatView below if the direction
-    # is not FUTURE.
-    order = direction == FUTURE ? "ASC" : "DESC"
-    messages = messages.order("created_at #{order}, id #{order}").limit(page_size).to_a
-
-    can_load_more_past = nil
-    can_load_more_future = nil
-
-    if direction == FUTURE
-      can_load_more_future = messages.size == page_size
-    elsif direction == PAST
-      can_load_more_past = messages.size == page_size
-    else
-      # When direction is blank, we'll return the latest messages.
-      can_load_more_future = false
-      can_load_more_past = messages.size == page_size
-    end
-
-    chat_view =
-      ChatView.new(
-        chat_channel: @chat_channel,
-        chat_messages: direction == FUTURE ? messages : messages.reverse,
-        user: current_user,
-        can_load_more_past: can_load_more_past,
-        can_load_more_future: can_load_more_future,
-      )
-    render_serialized(chat_view, ChatViewSerializer, root: false)
-  end
-
-  def react
-    params.require(%i[message_id emoji react_action])
-    guardian.ensure_can_react!
-
-    Chat::ChatMessageReactor.new(current_user, @chat_channel).react!(
-      message_id: params[:message_id],
-      react_action: params[:react_action].to_sym,
-      emoji: params[:emoji],
-    )
-
-    render json: success_json
-  end
-
-  def delete
-    guardian.ensure_can_delete_chat!(@message, @chatable)
-
-    updated = @message.trash!(current_user)
-    if updated
-      ChatPublisher.publish_delete!(@chat_channel, @message)
-      render json: success_json
-    else
-      render_json_error(@message)
-    end
-  end
-
-  def restore
-    chat_channel = @message.chat_channel
-    guardian.ensure_can_restore_chat!(@message, chat_channel.chatable)
-    updated = @message.recover!
-    if updated
-      ChatPublisher.publish_restore!(chat_channel, @message)
-      render json: success_json
-    else
-      render_json_error(@message)
-    end
-  end
-
-  def rebake
-    guardian.ensure_can_rebake_chat_message!(@message)
-    @message.rebake!(invalidate_oneboxes: true)
-    render json: success_json
-  end
-
-  def message_link
-    raise Discourse::NotFound if @message.blank? || @message.deleted_at.present?
-    raise Discourse::NotFound if @message.chat_channel.blank?
-    set_channel_and_chatable_with_access_check(chat_channel_id: @message.chat_channel_id)
-    render json:
-             success_json.merge(
-               chat_channel_id: @chat_channel.id,
-               chat_channel_title: @chat_channel.title(current_user),
-             )
-  end
-
-  def lookup_message
-    set_channel_and_chatable_with_access_check(chat_channel_id: @message.chat_channel_id)
-
-    messages = preloaded_chat_message_query.where(chat_channel: @chat_channel)
-    messages = messages.with_deleted if guardian.can_moderate_chat?(@chatable)
-
-    past_messages =
-      messages
-        .where("created_at < ?", @message.created_at)
-        .order(created_at: :desc)
-        .limit(PAST_MESSAGE_LIMIT)
-
-    future_messages =
-      messages
-        .where("created_at > ?", @message.created_at)
-        .order(created_at: :asc)
-        .limit(FUTURE_MESSAGE_LIMIT)
-
-    can_load_more_past = past_messages.count == PAST_MESSAGE_LIMIT
-    can_load_more_future = future_messages.count == FUTURE_MESSAGE_LIMIT
-    messages = [past_messages.reverse, [@message], future_messages].reduce([], :concat)
-    chat_view =
-      ChatView.new(
-        chat_channel: @chat_channel,
-        chat_messages: messages,
-        user: current_user,
-        can_load_more_past: can_load_more_past,
-        can_load_more_future: can_load_more_future,
-      )
-    render_serialized(chat_view, ChatViewSerializer, root: false)
-  end
-
-  def set_user_chat_status
-    params.require(:chat_enabled)
-
-    current_user.user_option.update(chat_enabled: params[:chat_enabled])
-    render json: { chat_enabled: current_user.user_option.chat_enabled }
-  end
-
-  def invite_users
-    params.require(:user_ids)
-
-    users =
-      User
-        .includes(:groups)
-        .joins(:user_option)
-        .where(user_options: { chat_enabled: true })
-        .not_suspended
-        .where(id: params[:user_ids])
-    users.each do |user|
-      guardian = Guardian.new(user)
-      if guardian.can_chat? && guardian.can_join_chat_channel?(@chat_channel)
-        data = {
-          message: "chat.invitation_notification",
-          chat_channel_id: @chat_channel.id,
-          chat_channel_title: @chat_channel.title(user),
-          chat_channel_slug: @chat_channel.slug,
-          invited_by_username: current_user.username,
-        }
-        data[:chat_message_id] = params[:chat_message_id] if params[:chat_message_id]
-        user.notifications.create(
-          notification_type: Notification.types[:chat_invitation],
-          high_priority: true,
-          data: data.to_json,
-        )
-      end
-    end
-
-    render json: success_json
-  end
-
-  def dismiss_retention_reminder
-    params.require(:chatable_type)
-    guardian.ensure_can_chat!
-    unless ChatChannel.chatable_types.include?(params[:chatable_type])
-      raise Discourse::InvalidParameters
-    end
-
-    field =
-      (
-        if ChatChannel.public_channel_chatable_types.include?(params[:chatable_type])
-          :dismissed_channel_retention_reminder
-        else
-          :dismissed_dm_retention_reminder
-        end
-      )
-    current_user.user_option.update(field => true)
-    render json: success_json
-  end
-
-  def quote_messages
-    params.require(:message_ids)
-
-    message_ids = params[:message_ids].map(&:to_i)
-    markdown =
-      ChatTranscriptService.new(
-        @chat_channel,
-        current_user,
-        messages_or_ids: message_ids,
-      ).generate_markdown
-    render json: success_json.merge(markdown: markdown)
-  end
-
-  def flag
-    RateLimiter.new(current_user, "flag_chat_message", 4, 1.minutes).performed!
-
-    permitted_params =
-      params.permit(
-        %i[chat_message_id flag_type_id message is_warning take_action queue_for_review],
-      )
-
-    chat_message =
-      ChatMessage.includes(:chat_channel, :revisions).find(permitted_params[:chat_message_id])
-
-    flag_type_id = permitted_params[:flag_type_id].to_i
-
-    if !ReviewableScore.types.values.include?(flag_type_id)
-      raise Discourse::InvalidParameters.new(:flag_type_id)
-    end
-
-    set_channel_and_chatable_with_access_check(chat_channel_id: chat_message.chat_channel_id)
-
-    result =
-      Chat::ChatReviewQueue.new.flag_message(chat_message, guardian, flag_type_id, permitted_params)
-
-    if result[:success]
-      render json: success_json
-    else
-      render_json_error(result[:errors])
-    end
-  end
-
-  def set_draft
-    if params[:data].present?
-      ChatDraft.find_or_initialize_by(
-        user: current_user,
-        chat_channel_id: @chat_channel.id,
-      ).update!(data: params[:data])
-    else
-      ChatDraft.where(user: current_user, chat_channel_id: @chat_channel.id).destroy_all
-    end
-
-    render json: success_json
-  end
-
-  private
-
-  def preloaded_chat_message_query
-    query =
-      ChatMessage
-        .includes(in_reply_to: [:user, chat_webhook_event: [:incoming_chat_webhook]])
-        .includes(:revisions)
-        .includes(:user)
-        .includes(chat_webhook_event: :incoming_chat_webhook)
-        .includes(reactions: :user)
-        .includes(:bookmarks)
-        .includes(:uploads)
-        .includes(chat_channel: :chatable)
-
-    query = query.includes(user: :user_status) if SiteSetting.enable_user_status
-
-    query
-  end
-
-  def find_chatable
-    @chatable = Category.find_by(id: params[:chatable_id])
-    guardian.ensure_can_moderate_chat!(@chatable)
-  end
-
-  def find_chat_message
-    @message = preloaded_chat_message_query.with_deleted
-    @message = @message.where(chat_channel_id: params[:chat_channel_id]) if params[:chat_channel_id]
-    @message = @message.find_by(id: params[:message_id])
-    raise Discourse::NotFound unless @message
-  end
-end
diff --git a/plugins/chat/app/controllers/direct_messages_controller.rb b/plugins/chat/app/controllers/direct_messages_controller.rb
deleted file mode 100644
index b0100a95a89..00000000000
--- a/plugins/chat/app/controllers/direct_messages_controller.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-class Chat::DirectMessagesController < Chat::ChatBaseController
-  # NOTE: For V1 of chat channel archiving and deleting we are not doing
-  # anything for DM channels, their behaviour will stay as is.
-  def create
-    guardian.ensure_can_chat!
-    users = users_from_usernames(current_user, params)
-
-    begin
-      chat_channel =
-        Chat::DirectMessageChannelCreator.create!(acting_user: current_user, target_users: users)
-      render_serialized(
-        chat_channel,
-        ChatChannelSerializer,
-        root: "channel",
-        membership: chat_channel.membership_for(current_user),
-      )
-    rescue Chat::DirectMessageChannelCreator::NotAllowed => err
-      render_json_error(err.message)
-    end
-  end
-
-  def index
-    guardian.ensure_can_chat!
-    users = users_from_usernames(current_user, params)
-
-    direct_message = DirectMessage.for_user_ids(users.map(&:id).uniq)
-    if direct_message
-      chat_channel = ChatChannel.find_by(chatable: direct_message)
-      render_serialized(
-        chat_channel,
-        ChatChannelSerializer,
-        root: "channel",
-        membership: chat_channel.membership_for(current_user),
-      )
-    else
-      render body: nil, status: 404
-    end
-  end
-
-  private
-
-  def users_from_usernames(current_user, params)
-    params.require(:usernames)
-
-    usernames =
-      (params[:usernames].is_a?(String) ? params[:usernames].split(",") : params[:usernames])
-
-    users = [current_user]
-    other_usernames = usernames - [current_user.username]
-    users.concat(User.where(username: other_usernames).to_a) if other_usernames.any?
-    users
-  end
-end
diff --git a/plugins/chat/app/controllers/emojis_controller.rb b/plugins/chat/app/controllers/emojis_controller.rb
deleted file mode 100644
index 8d895e2bd70..00000000000
--- a/plugins/chat/app/controllers/emojis_controller.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-class Chat::EmojisController < Chat::ChatBaseController
-  def index
-    emojis = Emoji.all.group_by(&:group)
-    render json: MultiJson.dump(emojis)
-  end
-end
diff --git a/plugins/chat/app/controllers/incoming_chat_webhooks_controller.rb b/plugins/chat/app/controllers/incoming_chat_webhooks_controller.rb
deleted file mode 100644
index f528e59513a..00000000000
--- a/plugins/chat/app/controllers/incoming_chat_webhooks_controller.rb
+++ /dev/null
@@ -1,108 +0,0 @@
-# frozen_string_literal: true
-
-class Chat::IncomingChatWebhooksController < ApplicationController
-  WEBHOOK_MESSAGES_PER_MINUTE_LIMIT = 10
-
-  skip_before_action :verify_authenticity_token, :redirect_to_login_if_required
-
-  before_action :validate_payload
-
-  def create_message
-    debug_payload
-
-    process_webhook_payload(text: params[:text], key: params[:key])
-  end
-
-  # See https://api.slack.com/reference/messaging/payload for the
-  # slack message payload format. For now we only support the
-  # text param, which we preprocess lightly to remove the slack-isms
-  # in the formatting.
-  def create_message_slack_compatible
-    debug_payload
-
-    # See note in validate_payload on why this is needed
-    attachments =
-      if params[:payload].present?
-        payload = params[:payload]
-        if String === payload
-          payload = JSON.parse(payload)
-          payload.deep_symbolize_keys!
-        end
-        payload[:attachments]
-      else
-        params[:attachments]
-      end
-
-    if params[:text].present?
-      text = Chat::SlackCompatibility.process_text(params[:text])
-    else
-      text = Chat::SlackCompatibility.process_legacy_attachments(attachments)
-    end
-
-    process_webhook_payload(text: text, key: params[:key])
-  rescue JSON::ParserError
-    raise Discourse::InvalidParameters
-  end
-
-  private
-
-  def process_webhook_payload(text:, key:)
-    validate_message_length(text)
-    webhook = find_and_rate_limit_webhook(key)
-
-    chat_message_creator =
-      Chat::ChatMessageCreator.create(
-        chat_channel: webhook.chat_channel,
-        user: Discourse.system_user,
-        content: text,
-        incoming_chat_webhook: webhook,
-      )
-    if chat_message_creator.failed?
-      render_json_error(chat_message_creator.error)
-    else
-      render json: success_json
-    end
-  end
-
-  def find_and_rate_limit_webhook(key)
-    webhook = IncomingChatWebhook.includes(:chat_channel).find_by(key: key)
-    raise Discourse::NotFound unless webhook
-
-    # Rate limit to 10 messages per-minute. We can move to a site setting in the future if needed.
-    RateLimiter.new(
-      nil,
-      "incoming_chat_webhook_#{webhook.id}",
-      WEBHOOK_MESSAGES_PER_MINUTE_LIMIT,
-      1.minute,
-    ).performed!
-    webhook
-  end
-
-  def validate_message_length(message)
-    return if message.length <= SiteSetting.chat_maximum_message_length
-    raise Discourse::InvalidParameters.new(
-            "Body cannot be over #{SiteSetting.chat_maximum_message_length} characters",
-          )
-  end
-
-  def validate_payload
-    params.require([:key])
-
-    # TODO (martin) It is not clear whether the :payload key is actually
-    # present in the webhooks sent from OpsGenie, so once it is confirmed
-    # in production what we are actually getting then we can remove this.
-    if !params[:text] && !params[:payload] && !params[:attachments]
-      raise Discourse::InvalidParameters
-    end
-  end
-
-  def debug_payload
-    return if !SiteSetting.chat_debug_webhook_payloads
-    Rails.logger.warn(
-      "Debugging chat webhook payload: " +
-        JSON.dump(
-          { payload: params[:payload], attachments: params[:attachments], text: params[:text] },
-        ),
-    )
-  end
-end
diff --git a/plugins/chat/app/core_ext/plugin_instance.rb b/plugins/chat/app/core_ext/plugin_instance.rb
deleted file mode 100644
index 9e38199f2ed..00000000000
--- a/plugins/chat/app/core_ext/plugin_instance.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-DiscoursePluginRegistry.define_register(:chat_markdown_features, Set)
-
-class Plugin::Instance
-  def chat
-    ChatPluginApiExtensions
-  end
-
-  module ChatPluginApiExtensions
-    def self.enable_markdown_feature(name)
-      DiscoursePluginRegistry.chat_markdown_features << name
-    end
-  end
-end
diff --git a/plugins/chat/app/helpers/chat/with_service_helper.rb b/plugins/chat/app/helpers/chat/with_service_helper.rb
new file mode 100644
index 00000000000..7faf0aeff07
--- /dev/null
+++ b/plugins/chat/app/helpers/chat/with_service_helper.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+module Chat
+  module WithServiceHelper
+    def result
+      @_result
+    end
+
+    # @param service [Class] A class including {Chat::Service::Base}
+    # @param dependencies [kwargs] Any additional params to load into the service context,
+    #   in addition to controller @params.
+    def with_service(service, default_actions: true, **dependencies, &block)
+      object = self
+      merged_block =
+        proc do
+          instance_exec(&object.method(:default_actions_for_service).call) if default_actions
+          instance_exec(&(block || proc {}))
+        end
+      ServiceRunner.call(service, object, **dependencies, &merged_block)
+    end
+
+    def run_service(service, dependencies)
+      @_result = service.call(params.to_unsafe_h.merge(guardian: guardian, **dependencies))
+    end
+
+    def default_actions_for_service
+      proc {}
+    end
+  end
+end
diff --git a/plugins/chat/app/jobs/regular/auto_join_channel_batch.rb b/plugins/chat/app/jobs/regular/auto_join_channel_batch.rb
deleted file mode 100644
index 16d01e96a94..00000000000
--- a/plugins/chat/app/jobs/regular/auto_join_channel_batch.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-# NOTE: When changing auto-join logic, make sure to update the `settings.auto_join_users_info` translation as well.
-# frozen_string_literal: true
-
-module Jobs
-  class AutoJoinChannelBatch < ::Jobs::Base
-    def execute(args)
-      return "starts_at or ends_at missing" if args[:starts_at].blank? || args[:ends_at].blank?
-      start_user_id = args[:starts_at].to_i
-      end_user_id = args[:ends_at].to_i
-
-      return "End is higher than start" if end_user_id < start_user_id
-
-      channel =
-        ChatChannel.find_by(
-          id: args[:chat_channel_id],
-          auto_join_users: true,
-          chatable_type: "Category",
-        )
-
-      return if !channel
-
-      category = channel.chatable
-      return if !category
-
-      query_args = {
-        chat_channel_id: channel.id,
-        start: start_user_id,
-        end: end_user_id,
-        suspended_until: Time.zone.now,
-        last_seen_at: 3.months.ago,
-        channel_category: channel.chatable_id,
-        mode: UserChatChannelMembership.join_modes[:automatic],
-      }
-
-      new_member_ids = DB.query_single(create_memberships_query(category), query_args)
-
-      # Only do this if we are running auto-join for a single user, if we
-      # are doing it for many then we should do it after all batches are
-      # complete for the channel in Jobs::AutoManageChannelMemberships
-      if start_user_id == end_user_id
-        Chat::ChatChannelMembershipManager.new(channel).recalculate_user_count
-      end
-
-      ChatPublisher.publish_new_channel(channel.reload, User.where(id: new_member_ids))
-    end
-
-    private
-
-    def create_memberships_query(category)
-      query = <<~SQL
-        INSERT INTO user_chat_channel_memberships (user_id, chat_channel_id, following, created_at, updated_at, join_mode)
-        SELECT DISTINCT(users.id), :chat_channel_id, TRUE, NOW(), NOW(), :mode
-        FROM users
-        INNER JOIN user_options uo ON uo.user_id = users.id
-        LEFT OUTER JOIN user_chat_channel_memberships uccm ON
-          uccm.chat_channel_id = :chat_channel_id AND uccm.user_id = users.id
-      SQL
-
-      query += <<~SQL if category.read_restricted?
-          INNER JOIN group_users gu ON gu.user_id = users.id
-          LEFT OUTER JOIN category_groups cg ON cg.group_id = gu.group_id
-        SQL
-
-      query += <<~SQL
-        WHERE (users.id >= :start AND users.id <= :end) AND
-          users.staged IS FALSE AND users.active AND
-          NOT EXISTS(SELECT 1 FROM anonymous_users a WHERE a.user_id = users.id) AND
-          (suspended_till IS NULL OR suspended_till <= :suspended_until) AND
-          (last_seen_at > :last_seen_at) AND
-          uo.chat_enabled AND
-          uccm.id IS NULL
-      SQL
-
-      query += <<~SQL if category.read_restricted?
-          AND cg.category_id = :channel_category
-        SQL
-
-      query += "RETURNING user_chat_channel_memberships.user_id"
-    end
-  end
-end
diff --git a/plugins/chat/app/jobs/regular/auto_manage_channel_memberships.rb b/plugins/chat/app/jobs/regular/auto_manage_channel_memberships.rb
deleted file mode 100644
index 9785db5c920..00000000000
--- a/plugins/chat/app/jobs/regular/auto_manage_channel_memberships.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-# NOTE: When changing auto-join logic, make sure to update the `settings.auto_join_users_info` translation as well.
-# frozen_string_literal: true
-
-module Jobs
-  class AutoManageChannelMemberships < ::Jobs::Base
-    def execute(args)
-      channel =
-        ChatChannel.includes(:chatable).find_by(
-          id: args[:chat_channel_id],
-          auto_join_users: true,
-          chatable_type: "Category",
-        )
-
-      return if !channel&.chatable
-
-      processed =
-        UserChatChannelMembership.where(
-          chat_channel: channel,
-          following: true,
-          join_mode: UserChatChannelMembership.join_modes[:automatic],
-        ).count
-
-      auto_join_query(channel).find_in_batches do |batch|
-        break if processed >= SiteSetting.max_chat_auto_joined_users
-
-        starts_at = batch.first.query_user_id
-        ends_at = batch.last.query_user_id
-
-        Jobs.enqueue(
-          :auto_join_channel_batch,
-          chat_channel_id: channel.id,
-          starts_at: starts_at,
-          ends_at: ends_at,
-        )
-
-        processed += batch.size
-      end
-
-      # The Jobs::AutoJoinChannelBatch job will only do this recalculation
-      # if it's operating on one user, so we need to make sure we do it for
-      # the channel here once this job is complete.
-      Chat::ChatChannelMembershipManager.new(channel).recalculate_user_count
-    end
-
-    private
-
-    def auto_join_query(channel)
-      category = channel.chatable
-
-      users =
-        User
-          .real
-          .activated
-          .not_suspended
-          .not_staged
-          .distinct
-          .select(:id, "users.id AS query_user_id")
-          .where("last_seen_at > ?", 3.months.ago)
-          .joins(:user_option)
-          .where(user_options: { chat_enabled: true })
-          .joins(<<~SQL)
-            LEFT OUTER JOIN user_chat_channel_memberships uccm
-            ON uccm.chat_channel_id = #{channel.id} AND
-            uccm.user_id = users.id
-          SQL
-          .where("uccm.id IS NULL")
-
-      if category.read_restricted?
-        users =
-          users
-            .joins(:group_users)
-            .joins("INNER JOIN category_groups cg ON cg.group_id = group_users.group_id")
-            .where("cg.category_id = ?", channel.chatable_id)
-      end
-
-      users
-    end
-  end
-end
diff --git a/plugins/chat/app/jobs/regular/chat/auto_join_channel_batch.rb b/plugins/chat/app/jobs/regular/chat/auto_join_channel_batch.rb
new file mode 100644
index 00000000000..a11211a57dd
--- /dev/null
+++ b/plugins/chat/app/jobs/regular/chat/auto_join_channel_batch.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Jobs
+  module Chat
+    class AutoJoinChannelBatch < ServiceJob
+      def execute(args)
+        with_service(::Chat::AutoJoinChannelBatch, **args) do
+          on_failed_contract do |contract|
+            Rails.logger.error(contract.errors.full_messages.join(", "))
+          end
+          on_model_not_found(:channel) do
+            Rails.logger.error("Channel not found (id=#{result.contract.channel_id})")
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/jobs/regular/chat/auto_join_channel_memberships.rb b/plugins/chat/app/jobs/regular/chat/auto_join_channel_memberships.rb
new file mode 100644
index 00000000000..fbb57ded563
--- /dev/null
+++ b/plugins/chat/app/jobs/regular/chat/auto_join_channel_memberships.rb
@@ -0,0 +1,81 @@
+# NOTE: When changing auto-join logic, make sure to update the `settings.auto_join_users_info` translation as well.
+# frozen_string_literal: true
+
+module Jobs
+  module Chat
+    class AutoJoinChannelMemberships < ::Jobs::Base
+      def execute(args)
+        channel =
+          ::Chat::Channel.includes(:chatable).find_by(
+            id: args[:chat_channel_id],
+            auto_join_users: true,
+            chatable_type: "Category",
+          )
+
+        return if !channel&.chatable
+
+        processed =
+          ::Chat::UserChatChannelMembership.where(
+            chat_channel: channel,
+            following: true,
+            join_mode: ::Chat::UserChatChannelMembership.join_modes[:automatic],
+          ).count
+
+        auto_join_query(channel).find_in_batches do |batch|
+          break if processed >= ::SiteSetting.max_chat_auto_joined_users
+
+          starts_at = batch.first.query_user_id
+          ends_at = batch.last.query_user_id
+
+          ::Jobs.enqueue(
+            ::Jobs::Chat::AutoJoinChannelBatch,
+            chat_channel_id: channel.id,
+            starts_at: starts_at,
+            ends_at: ends_at,
+          )
+
+          processed += batch.size
+        end
+
+        # The Jobs::Chat::AutoJoinChannelBatch job will only do this recalculation
+        # if it's operating on one user, so we need to make sure we do it for
+        # the channel here once this job is complete.
+        ::Chat::ChannelMembershipManager.new(channel).recalculate_user_count
+      end
+
+      private
+
+      def auto_join_query(channel)
+        category = channel.chatable
+
+        users =
+          ::User
+            .real
+            .activated
+            .not_suspended
+            .not_staged
+            .distinct
+            .select(:id, "users.id AS query_user_id")
+            .where("last_seen_at > ?", 3.months.ago)
+            .joins(:user_option)
+            .where(user_options: { chat_enabled: true })
+            .joins(<<~SQL)
+            LEFT OUTER JOIN user_chat_channel_memberships uccm
+            ON uccm.chat_channel_id = #{channel.id} AND
+            uccm.user_id = users.id
+          SQL
+            .where("uccm.id IS NULL")
+
+        if category.read_restricted?
+          users =
+            users
+              .joins(:group_users)
+              .joins("INNER JOIN category_groups cg ON cg.group_id = group_users.group_id")
+              .where("cg.category_id = ?", channel.chatable_id)
+        end
+
+        users
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/jobs/regular/chat/auto_remove_membership_handle_category_updated.rb b/plugins/chat/app/jobs/regular/chat/auto_remove_membership_handle_category_updated.rb
new file mode 100644
index 00000000000..fa1e6504fbf
--- /dev/null
+++ b/plugins/chat/app/jobs/regular/chat/auto_remove_membership_handle_category_updated.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Jobs
+  module Chat
+    class AutoRemoveMembershipHandleCategoryUpdated < ::Jobs::Base
+      def execute(args)
+        ::Chat::AutoRemove::HandleCategoryUpdated.call(**args)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/jobs/regular/chat/auto_remove_membership_handle_chat_allowed_groups_change.rb b/plugins/chat/app/jobs/regular/chat/auto_remove_membership_handle_chat_allowed_groups_change.rb
new file mode 100644
index 00000000000..94ac518b35d
--- /dev/null
+++ b/plugins/chat/app/jobs/regular/chat/auto_remove_membership_handle_chat_allowed_groups_change.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Jobs
+  module Chat
+    class AutoRemoveMembershipHandleChatAllowedGroupsChange < ::Jobs::Base
+      def execute(args)
+        ::Chat::AutoRemove::HandleChatAllowedGroupsChange.call(**args)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/jobs/regular/chat/auto_remove_membership_handle_destroyed_group.rb b/plugins/chat/app/jobs/regular/chat/auto_remove_membership_handle_destroyed_group.rb
new file mode 100644
index 00000000000..e24f87247ee
--- /dev/null
+++ b/plugins/chat/app/jobs/regular/chat/auto_remove_membership_handle_destroyed_group.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Jobs
+  module Chat
+    class AutoRemoveMembershipHandleDestroyedGroup < ::Jobs::Base
+      def execute(args)
+        ::Chat::AutoRemove::HandleDestroyedGroup.call(**args)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/jobs/regular/chat/auto_remove_membership_handle_user_removed_from_group.rb b/plugins/chat/app/jobs/regular/chat/auto_remove_membership_handle_user_removed_from_group.rb
new file mode 100644
index 00000000000..bd599a840d2
--- /dev/null
+++ b/plugins/chat/app/jobs/regular/chat/auto_remove_membership_handle_user_removed_from_group.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Jobs
+  module Chat
+    class AutoRemoveMembershipHandleUserRemovedFromGroup < ::Jobs::Base
+      def execute(args)
+        ::Chat::AutoRemove::HandleUserRemovedFromGroup.call(**args)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/jobs/regular/chat/channel_archive.rb b/plugins/chat/app/jobs/regular/chat/channel_archive.rb
new file mode 100644
index 00000000000..49594fb87dc
--- /dev/null
+++ b/plugins/chat/app/jobs/regular/chat/channel_archive.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Jobs
+  module Chat
+    class ChannelArchive < ::Jobs::Base
+      sidekiq_options retry: false
+
+      def execute(args = {})
+        channel_archive = ::Chat::ChannelArchive.find_by(id: args[:chat_channel_archive_id])
+
+        # this should not really happen, but better to do this than throw an error
+        if channel_archive.blank?
+          ::Rails.logger.warn(
+            "Chat channel archive #{args[:chat_channel_archive_id]} could not be found, aborting archive job.",
+          )
+          return
+        end
+
+        if channel_archive.complete?
+          channel_archive.chat_channel.update!(status: :archived)
+
+          ::Chat::Publisher.publish_archive_status(
+            channel_archive.chat_channel,
+            archive_status: :success,
+            archived_messages: channel_archive.archived_messages,
+            archive_topic_id: channel_archive.destination_topic_id,
+            total_messages: channel_archive.total_messages,
+          )
+
+          return
+        end
+
+        ::DistributedMutex.synchronize(
+          "archive_chat_channel_#{channel_archive.chat_channel_id}",
+          validity: 20.minutes,
+        ) { ::Chat::ChannelArchiveService.new(channel_archive).execute }
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/jobs/regular/chat/channel_delete.rb b/plugins/chat/app/jobs/regular/chat/channel_delete.rb
new file mode 100644
index 00000000000..1c47cb99078
--- /dev/null
+++ b/plugins/chat/app/jobs/regular/chat/channel_delete.rb
@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module Jobs
+  module Chat
+    class ChannelDelete < ::Jobs::Base
+      def execute(args = {})
+        chat_channel = ::Chat::Channel.with_deleted.find_by(id: args[:chat_channel_id])
+
+        # this should not really happen, but better to do this than throw an error
+        if chat_channel.blank?
+          ::Rails.logger.warn(
+            "Chat channel #{args[:chat_channel_id]} could not be found, aborting delete job.",
+          )
+          return
+        end
+
+        ::DistributedMutex.synchronize("delete_chat_channel_#{chat_channel.id}") do
+          ::Rails.logger.debug("Deleting webhooks and events for channel #{chat_channel.id}")
+          ::Chat::Message.transaction do
+            webhooks = ::Chat::IncomingWebhook.where(chat_channel: chat_channel)
+            ::Chat::WebhookEvent.where(incoming_chat_webhook_id: webhooks.select(:id)).delete_all
+            webhooks.delete_all
+          end
+
+          ::Rails.logger.debug("Deleting drafts and memberships for channel #{chat_channel.id}")
+          ::Chat::Draft.where(chat_channel: chat_channel).delete_all
+          ::Chat::UserChatChannelMembership.where(chat_channel: chat_channel).delete_all
+
+          ::Rails.logger.debug(
+            "Deleting chat messages, mentions, revisions, and uploads for channel #{chat_channel.id}",
+          )
+          chat_messages = ::Chat::Message.where(chat_channel: chat_channel)
+          delete_messages_and_related_records(chat_channel, chat_messages) if chat_messages.any?
+        end
+      end
+
+      def delete_messages_and_related_records(chat_channel, chat_messages)
+        message_ids = chat_messages.pluck(:id)
+
+        ::Chat::Message.transaction do
+          ::Chat::Mention.where(chat_message_id: message_ids).delete_all
+          ::Chat::MessageRevision.where(chat_message_id: message_ids).delete_all
+          ::Chat::MessageReaction.where(chat_message_id: message_ids).delete_all
+
+          # if the uploads are not used anywhere else they will be deleted
+          # by the CleanUpUploads job in core
+          ::UploadReference.where(
+            target_id: message_ids,
+            target_type: ::Chat::Message.polymorphic_name,
+          ).delete_all
+
+          # only the messages and the channel are Trashable, everything else gets
+          # permanently destroyed
+          chat_messages.update_all(
+            deleted_by_id: chat_channel.deleted_by_id,
+            deleted_at: Time.zone.now,
+          )
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/jobs/regular/chat/delete_user_messages.rb b/plugins/chat/app/jobs/regular/chat/delete_user_messages.rb
new file mode 100644
index 00000000000..a97d1d55c38
--- /dev/null
+++ b/plugins/chat/app/jobs/regular/chat/delete_user_messages.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Jobs
+  module Chat
+    class DeleteUserMessages < ::Jobs::Base
+      def execute(args)
+        return if args[:user_id].nil?
+
+        ::Chat::MessageDestroyer.new.destroy_in_batches(
+          ::Chat::Message.with_deleted.where(user_id: args[:user_id]),
+        )
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/jobs/regular/chat/kick_users_from_channel.rb b/plugins/chat/app/jobs/regular/chat/kick_users_from_channel.rb
new file mode 100644
index 00000000000..aa67049c4c3
--- /dev/null
+++ b/plugins/chat/app/jobs/regular/chat/kick_users_from_channel.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Jobs
+  module Chat
+    class KickUsersFromChannel < Jobs::Base
+      def execute(args)
+        return if !::Chat::Channel.exists?(id: args[:channel_id])
+        return if args[:user_ids].blank?
+        ::Chat::Publisher.publish_kick_users(args[:channel_id], args[:user_ids])
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/jobs/regular/chat/mark_all_channel_threads_read.rb b/plugins/chat/app/jobs/regular/chat/mark_all_channel_threads_read.rb
new file mode 100644
index 00000000000..bc190b25c89
--- /dev/null
+++ b/plugins/chat/app/jobs/regular/chat/mark_all_channel_threads_read.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Jobs
+  module Chat
+    class MarkAllChannelThreadsRead < Jobs::Base
+      sidekiq_options queue: "critical"
+
+      def execute(args = {})
+        channel = ::Chat::Channel.find_by(id: args[:channel_id])
+        return if channel.blank?
+        channel.mark_all_threads_as_read
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/jobs/regular/chat/notify_mentioned.rb b/plugins/chat/app/jobs/regular/chat/notify_mentioned.rb
new file mode 100644
index 00000000000..3388d17973a
--- /dev/null
+++ b/plugins/chat/app/jobs/regular/chat/notify_mentioned.rb
@@ -0,0 +1,157 @@
+# frozen_string_literal: true
+
+module Jobs
+  module Chat
+    class NotifyMentioned < ::Jobs::Base
+      def execute(args = {})
+        @chat_message =
+          ::Chat::Message.includes(:user, :revisions, chat_channel: :chatable).find_by(
+            id: args[:chat_message_id],
+          )
+        if @chat_message.nil? ||
+             @chat_message.revisions.where("created_at > ?", args[:timestamp]).any?
+          return
+        end
+
+        @creator = @chat_message.user
+        @chat_channel = @chat_message.chat_channel
+        @already_notified_user_ids = args[:already_notified_user_ids] || []
+        user_ids_to_notify = args[:to_notify_ids_map] || {}
+        user_ids_to_notify.each { |mention_type, ids| process_mentions(ids, mention_type.to_sym) }
+      end
+
+      private
+
+      def get_memberships(user_ids)
+        query =
+          ::Chat::UserChatChannelMembership.includes(:user).where(
+            user_id: (user_ids - @already_notified_user_ids),
+            chat_channel_id: @chat_message.chat_channel_id,
+          )
+        query = query.where(following: true) if @chat_channel.public_channel?
+        query
+      end
+
+      def build_data_for(membership, identifier_type:)
+        data = {
+          chat_message_id: @chat_message.id,
+          chat_channel_id: @chat_channel.id,
+          mentioned_by_username: @creator.username,
+          is_direct_message_channel: @chat_channel.direct_message_channel?,
+        }
+
+        data[:chat_thread_id] = @chat_message.thread_id if @chat_message.in_thread?
+
+        if !@is_direct_message_channel
+          data[:chat_channel_title] = @chat_channel.title(membership.user)
+          data[:chat_channel_slug] = @chat_channel.slug
+        end
+
+        return data if identifier_type == :direct_mentions
+
+        case identifier_type
+        when :here_mentions
+          data[:identifier] = "here"
+        when :global_mentions
+          data[:identifier] = "all"
+        else
+          data[:identifier] = identifier_type if identifier_type
+          data[:is_group_mention] = true
+        end
+
+        data
+      end
+
+      def build_payload_for(membership, identifier_type:)
+        post_url =
+          if @chat_message.in_thread?
+            @chat_message.thread.relative_url
+          else
+            "#{@chat_channel.relative_url}/#{@chat_message.id}"
+          end
+
+        payload = {
+          notification_type: ::Notification.types[:chat_mention],
+          username: @creator.username,
+          tag: ::Chat::Notifier.push_notification_tag(:mention, @chat_channel.id),
+          excerpt: @chat_message.push_notification_excerpt,
+          post_url: post_url,
+        }
+
+        translation_prefix =
+          (
+            if @chat_channel.direct_message_channel?
+              "discourse_push_notifications.popup.direct_message_chat_mention"
+            else
+              "discourse_push_notifications.popup.chat_mention"
+            end
+          )
+
+        translation_suffix = identifier_type == :direct_mentions ? "direct" : "other_type"
+        identifier_text =
+          case identifier_type
+          when :here_mentions
+            "@here"
+          when :global_mentions
+            "@all"
+          when :direct_mentions
+            ""
+          else
+            "@#{identifier_type}"
+          end
+
+        payload[:translated_title] = ::I18n.t(
+          "#{translation_prefix}.#{translation_suffix}",
+          username: @creator.username,
+          identifier: identifier_text,
+          channel: @chat_channel.title(membership.user),
+        )
+
+        payload
+      end
+
+      def create_notification!(membership, mention, mention_type)
+        notification_data = build_data_for(membership, identifier_type: mention_type)
+        is_read = ::Chat::Notifier.user_has_seen_message?(membership, @chat_message.id)
+        notification =
+          ::Notification.create!(
+            notification_type: ::Notification.types[:chat_mention],
+            user_id: membership.user_id,
+            high_priority: true,
+            data: notification_data.to_json,
+            read: is_read,
+          )
+
+        mention.update!(notification: notification)
+      end
+
+      def send_notifications(membership, mention_type)
+        payload = build_payload_for(membership, identifier_type: mention_type)
+
+        if !membership.desktop_notifications_never? && !membership.muted?
+          ::MessageBus.publish(
+            "/chat/notification-alert/#{membership.user_id}",
+            payload,
+            user_ids: [membership.user_id],
+          )
+        end
+
+        if !membership.mobile_notifications_never? && !membership.muted?
+          ::PostAlerter.push_notification(membership.user, payload)
+        end
+      end
+
+      def process_mentions(user_ids, mention_type)
+        memberships = get_memberships(user_ids)
+
+        memberships.each do |membership|
+          mention = ::Chat::Mention.find_by(user: membership.user, chat_message: @chat_message)
+          if mention.present?
+            create_notification!(membership, mention, mention_type)
+            send_notifications(membership, mention_type)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/jobs/regular/chat/notify_watching.rb b/plugins/chat/app/jobs/regular/chat/notify_watching.rb
new file mode 100644
index 00000000000..4b62af0afce
--- /dev/null
+++ b/plugins/chat/app/jobs/regular/chat/notify_watching.rb
@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+module Jobs
+  module Chat
+    class NotifyWatching < ::Jobs::Base
+      def execute(args = {})
+        @chat_message =
+          ::Chat::Message.includes(:user, chat_channel: :chatable).find_by(
+            id: args[:chat_message_id],
+          )
+        return if @chat_message.nil?
+
+        @creator = @chat_message.user
+        @chat_channel = @chat_message.chat_channel
+        @is_direct_message_channel = @chat_channel.direct_message_channel?
+
+        always_notification_level = ::Chat::UserChatChannelMembership::NOTIFICATION_LEVELS[:always]
+
+        members =
+          ::Chat::UserChatChannelMembership
+            .includes(user: :groups)
+            .joins(user: :user_option)
+            .where(user_option: { chat_enabled: true })
+            .where.not(user_id: args[:except_user_ids])
+            .where(chat_channel_id: @chat_channel.id)
+            .where(following: true)
+            .where(
+              "desktop_notification_level = ? OR mobile_notification_level = ?",
+              always_notification_level,
+              always_notification_level,
+            )
+            .merge(User.not_suspended)
+
+        if @is_direct_message_channel
+          ::UserCommScreener
+            .new(acting_user: @creator, target_user_ids: members.map(&:user_id))
+            .allowing_actor_communication
+            .each do |user_id|
+              send_notifications(members.find { |member| member.user_id == user_id })
+            end
+        else
+          members.each { |member| send_notifications(member) }
+        end
+      end
+
+      def send_notifications(membership)
+        user = membership.user
+        return unless user.guardian.can_join_chat_channel?(@chat_channel)
+        return if ::Chat::Notifier.user_has_seen_message?(membership, @chat_message.id)
+        return if online_user_ids.include?(user.id)
+
+        translation_key =
+          (
+            if @is_direct_message_channel
+              "discourse_push_notifications.popup.new_direct_chat_message"
+            else
+              "discourse_push_notifications.popup.new_chat_message"
+            end
+          )
+
+        translation_args = { username: @creator.username }
+        translation_args[:channel] = @chat_channel.title(user) unless @is_direct_message_channel
+
+        payload = {
+          username: @creator.username,
+          notification_type: ::Notification.types[:chat_message],
+          post_url: @chat_channel.relative_url,
+          translated_title: ::I18n.t(translation_key, translation_args),
+          tag: ::Chat::Notifier.push_notification_tag(:message, @chat_channel.id),
+          excerpt: @chat_message.push_notification_excerpt,
+        }
+
+        if membership.desktop_notifications_always? && !membership.muted?
+          ::MessageBus.publish("/chat/notification-alert/#{user.id}", payload, user_ids: [user.id])
+        end
+
+        if membership.mobile_notifications_always? && !membership.muted?
+          ::PostAlerter.push_notification(user, payload)
+        end
+      end
+
+      def online_user_ids
+        @online_user_ids ||= ::PresenceChannel.new("/chat/online").user_ids
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/jobs/regular/chat/process_message.rb b/plugins/chat/app/jobs/regular/chat/process_message.rb
new file mode 100644
index 00000000000..33fcc43b565
--- /dev/null
+++ b/plugins/chat/app/jobs/regular/chat/process_message.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Jobs
+  module Chat
+    class ProcessMessage < ::Jobs::Base
+      def execute(args = {})
+        ::DistributedMutex.synchronize(
+          "jobs_chat_process_message_#{args[:chat_message_id]}",
+          validity: 10.minutes,
+        ) do
+          chat_message = ::Chat::Message.find_by(id: args[:chat_message_id])
+          return if !chat_message
+          processor = ::Chat::MessageProcessor.new(chat_message)
+          processor.run!
+
+          if args[:is_dirty] || processor.dirty?
+            chat_message.update(
+              cooked: processor.html,
+              cooked_version: ::Chat::Message::BAKED_VERSION,
+            )
+            ::Chat::Publisher.publish_processed!(chat_message)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/jobs/regular/chat/send_message_notifications.rb b/plugins/chat/app/jobs/regular/chat/send_message_notifications.rb
new file mode 100644
index 00000000000..4724f5a6f94
--- /dev/null
+++ b/plugins/chat/app/jobs/regular/chat/send_message_notifications.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Jobs
+  module Chat
+    class SendMessageNotifications < ::Jobs::Base
+      def execute(args)
+        reason = args[:reason]
+        valid_reasons = %w[new edit]
+        return unless valid_reasons.include?(reason)
+
+        return if (timestamp = args[:timestamp]).blank?
+
+        return if (message = ::Chat::Message.find_by(id: args[:chat_message_id])).nil?
+
+        if reason == "new"
+          ::Chat::Notifier.new(message, timestamp).notify_new
+        elsif reason == "edit"
+          ::Chat::Notifier.new(message, timestamp).notify_edit
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/jobs/regular/chat/update_channel_user_count.rb b/plugins/chat/app/jobs/regular/chat/update_channel_user_count.rb
new file mode 100644
index 00000000000..8608fd305fb
--- /dev/null
+++ b/plugins/chat/app/jobs/regular/chat/update_channel_user_count.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Jobs
+  module Chat
+    class UpdateChannelUserCount < Jobs::Base
+      def execute(args = {})
+        channel = ::Chat::Channel.find_by(id: args[:chat_channel_id])
+        return if channel.blank?
+        return if !channel.user_count_stale
+
+        channel.update!(
+          user_count: ::Chat::ChannelMembershipsQuery.count(channel),
+          user_count_stale: false,
+        )
+
+        ::Chat::Publisher.publish_chat_channel_metadata(channel)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/jobs/regular/chat/update_thread_reply_count.rb b/plugins/chat/app/jobs/regular/chat/update_thread_reply_count.rb
new file mode 100644
index 00000000000..5e15cb35808
--- /dev/null
+++ b/plugins/chat/app/jobs/regular/chat/update_thread_reply_count.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Jobs
+  module Chat
+    class UpdateThreadReplyCount < Jobs::Base
+      def execute(args = {})
+        thread = ::Chat::Thread.find_by(id: args[:thread_id])
+        return if thread.blank?
+        return if thread.replies_count_cache_recently_updated?
+
+        Discourse.redis.setex(
+          ::Chat::Thread.replies_count_cache_updated_at_redis_key(thread.id),
+          5.minutes.from_now.to_i,
+          Time.zone.now.to_i,
+        )
+        thread.set_replies_count_cache(thread.replies.count, update_db: true)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/jobs/regular/chat_channel_archive.rb b/plugins/chat/app/jobs/regular/chat_channel_archive.rb
deleted file mode 100644
index 33e270dd220..00000000000
--- a/plugins/chat/app/jobs/regular/chat_channel_archive.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-module Jobs
-  class ChatChannelArchive < ::Jobs::Base
-    sidekiq_options retry: false
-
-    def execute(args = {})
-      channel_archive = ::ChatChannelArchive.find_by(id: args[:chat_channel_archive_id])
-
-      # this should not really happen, but better to do this than throw an error
-      if channel_archive.blank?
-        Rails.logger.warn(
-          "Chat channel archive #{args[:chat_channel_archive_id]} could not be found, aborting archive job.",
-        )
-        return
-      end
-
-      if channel_archive.complete?
-        channel_archive.chat_channel.update!(status: :archived)
-
-        ChatPublisher.publish_archive_status(
-          channel_archive.chat_channel,
-          archive_status: :success,
-          archived_messages: channel_archive.archived_messages,
-          archive_topic_id: channel_archive.destination_topic_id,
-          total_messages: channel_archive.total_messages,
-        )
-
-        return
-      end
-
-      DistributedMutex.synchronize(
-        "archive_chat_channel_#{channel_archive.chat_channel_id}",
-        validity: 20.minutes,
-      ) { Chat::ChatChannelArchiveService.new(channel_archive).execute }
-    end
-  end
-end
diff --git a/plugins/chat/app/jobs/regular/chat_channel_delete.rb b/plugins/chat/app/jobs/regular/chat_channel_delete.rb
deleted file mode 100644
index ac89be4db99..00000000000
--- a/plugins/chat/app/jobs/regular/chat_channel_delete.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-# frozen_string_literal: true
-
-module Jobs
-  class ChatChannelDelete < ::Jobs::Base
-    def execute(args = {})
-      chat_channel = ::ChatChannel.with_deleted.find_by(id: args[:chat_channel_id])
-
-      # this should not really happen, but better to do this than throw an error
-      if chat_channel.blank?
-        Rails.logger.warn(
-          "Chat channel #{args[:chat_channel_id]} could not be found, aborting delete job.",
-        )
-        return
-      end
-
-      DistributedMutex.synchronize("delete_chat_channel_#{chat_channel.id}") do
-        Rails.logger.debug("Deleting webhooks and events for channel #{chat_channel.id}")
-        ChatMessage.transaction do
-          webhooks = IncomingChatWebhook.where(chat_channel: chat_channel)
-          ChatWebhookEvent.where(incoming_chat_webhook_id: webhooks.select(:id)).delete_all
-          webhooks.delete_all
-        end
-
-        Rails.logger.debug("Deleting drafts and memberships for channel #{chat_channel.id}")
-        ChatDraft.where(chat_channel: chat_channel).delete_all
-        UserChatChannelMembership.where(chat_channel: chat_channel).delete_all
-
-        Rails.logger.debug(
-          "Deleting chat messages, mentions, revisions, and uploads for channel #{chat_channel.id}",
-        )
-        ChatMessage.transaction do
-          chat_messages = ChatMessage.where(chat_channel: chat_channel)
-          message_ids = chat_messages.select(:id)
-          ChatMention.where(chat_message_id: message_ids).delete_all
-          ChatMessageRevision.where(chat_message_id: message_ids).delete_all
-          ChatMessageReaction.where(chat_message_id: message_ids).delete_all
-
-          # if the uploads are not used anywhere else they will be deleted
-          # by the CleanUpUploads job in core
-          ChatUpload.where(chat_message_id: message_ids).delete_all
-
-          # only the messages and the channel are Trashable, everything else gets
-          # permanently destroyed
-          chat_messages.update_all(
-            deleted_by_id: chat_channel.deleted_by_id,
-            deleted_at: Time.zone.now,
-          )
-        end
-      end
-    end
-  end
-end
diff --git a/plugins/chat/app/jobs/regular/chat_notify_mentioned.rb b/plugins/chat/app/jobs/regular/chat_notify_mentioned.rb
deleted file mode 100644
index d6fa48e3320..00000000000
--- a/plugins/chat/app/jobs/regular/chat_notify_mentioned.rb
+++ /dev/null
@@ -1,148 +0,0 @@
-# frozen_string_literal: true
-
-module Jobs
-  class ChatNotifyMentioned < ::Jobs::Base
-    def execute(args = {})
-      @chat_message =
-        ChatMessage.includes(:user, :revisions, chat_channel: :chatable).find_by(
-          id: args[:chat_message_id],
-        )
-      if @chat_message.nil? ||
-           @chat_message.revisions.where("created_at > ?", args[:timestamp]).any?
-        return
-      end
-
-      @creator = @chat_message.user
-      @chat_channel = @chat_message.chat_channel
-      @already_notified_user_ids = args[:already_notified_user_ids] || []
-      user_ids_to_notify = args[:to_notify_ids_map] || {}
-      user_ids_to_notify.each { |mention_type, ids| process_mentions(ids, mention_type.to_sym) }
-    end
-
-    private
-
-    def get_memberships(user_ids)
-      query =
-        UserChatChannelMembership.includes(:user).where(
-          user_id: (user_ids - @already_notified_user_ids),
-          chat_channel_id: @chat_message.chat_channel_id,
-        )
-      query = query.where(following: true) if @chat_channel.public_channel?
-      query
-    end
-
-    def build_data_for(membership, identifier_type:)
-      data = {
-        chat_message_id: @chat_message.id,
-        chat_channel_id: @chat_channel.id,
-        mentioned_by_username: @creator.username,
-        is_direct_message_channel: @chat_channel.direct_message_channel?,
-      }
-
-      if !@is_direct_message_channel
-        data[:chat_channel_title] = @chat_channel.title(membership.user)
-        data[:chat_channel_slug] = @chat_channel.slug
-      end
-
-      return data if identifier_type == :direct_mentions
-
-      case identifier_type
-      when :here_mentions
-        data[:identifier] = "here"
-      when :global_mentions
-        data[:identifier] = "all"
-      else
-        data[:identifier] = identifier_type if identifier_type
-        data[:is_group_mention] = true
-      end
-
-      data
-    end
-
-    def build_payload_for(membership, identifier_type:)
-      payload = {
-        notification_type: Notification.types[:chat_mention],
-        username: @creator.username,
-        tag: Chat::ChatNotifier.push_notification_tag(:mention, @chat_channel.id),
-        excerpt: @chat_message.push_notification_excerpt,
-        post_url: "#{@chat_channel.relative_url}?messageId=#{@chat_message.id}",
-      }
-
-      translation_prefix =
-        (
-          if @chat_channel.direct_message_channel?
-            "discourse_push_notifications.popup.direct_message_chat_mention"
-          else
-            "discourse_push_notifications.popup.chat_mention"
-          end
-        )
-
-      translation_suffix = identifier_type == :direct_mentions ? "direct" : "other_type"
-      identifier_text =
-        case identifier_type
-        when :here_mentions
-          "@here"
-        when :global_mentions
-          "@all"
-        when :direct_mentions
-          ""
-        else
-          "@#{identifier_type}"
-        end
-
-      payload[:translated_title] = I18n.t(
-        "#{translation_prefix}.#{translation_suffix}",
-        username: @creator.username,
-        identifier: identifier_text,
-        channel: @chat_channel.title(membership.user),
-      )
-
-      payload
-    end
-
-    def create_notification!(membership, notification_data)
-      is_read = Chat::ChatNotifier.user_has_seen_message?(membership, @chat_message.id)
-
-      notification =
-        Notification.create!(
-          notification_type: Notification.types[:chat_mention],
-          user_id: membership.user_id,
-          high_priority: true,
-          data: notification_data.to_json,
-          read: is_read,
-        )
-      ChatMention.create!(
-        notification: notification,
-        user: membership.user,
-        chat_message: @chat_message,
-      )
-    end
-
-    def send_notifications(membership, notification_data, os_payload)
-      create_notification!(membership, notification_data)
-
-      if !membership.desktop_notifications_never? && !membership.muted?
-        MessageBus.publish(
-          "/chat/notification-alert/#{membership.user_id}",
-          os_payload,
-          user_ids: [membership.user_id],
-        )
-      end
-
-      if !membership.mobile_notifications_never? && !membership.muted?
-        PostAlerter.push_notification(membership.user, os_payload)
-      end
-    end
-
-    def process_mentions(user_ids, mention_type)
-      memberships = get_memberships(user_ids)
-
-      memberships.each do |membership|
-        notification_data = build_data_for(membership, identifier_type: mention_type)
-        payload = build_payload_for(membership, identifier_type: mention_type)
-
-        send_notifications(membership, notification_data, payload)
-      end
-    end
-  end
-end
diff --git a/plugins/chat/app/jobs/regular/chat_notify_watching.rb b/plugins/chat/app/jobs/regular/chat_notify_watching.rb
deleted file mode 100644
index 4ac3fca4fcf..00000000000
--- a/plugins/chat/app/jobs/regular/chat_notify_watching.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-# frozen_string_literal: true
-
-module Jobs
-  class ChatNotifyWatching < ::Jobs::Base
-    def execute(args = {})
-      @chat_message =
-        ChatMessage.includes(:user, chat_channel: :chatable).find_by(id: args[:chat_message_id])
-      return if @chat_message.nil?
-
-      @creator = @chat_message.user
-      @chat_channel = @chat_message.chat_channel
-      @is_direct_message_channel = @chat_channel.direct_message_channel?
-
-      always_notification_level = UserChatChannelMembership::NOTIFICATION_LEVELS[:always]
-
-      members =
-        UserChatChannelMembership
-          .includes(user: :groups)
-          .joins(user: :user_option)
-          .where(user_option: { chat_enabled: true })
-          .where.not(user_id: args[:except_user_ids])
-          .where(chat_channel_id: @chat_channel.id)
-          .where(following: true)
-          .where(
-            "desktop_notification_level = ? OR mobile_notification_level = ?",
-            always_notification_level,
-            always_notification_level,
-          )
-          .merge(User.not_suspended)
-
-      if @is_direct_message_channel
-        UserCommScreener
-          .new(acting_user: @creator, target_user_ids: members.map(&:user_id))
-          .allowing_actor_communication
-          .each do |user_id|
-            send_notifications(members.find { |member| member.user_id == user_id })
-          end
-      else
-        members.each { |member| send_notifications(member) }
-      end
-    end
-
-    def send_notifications(membership)
-      user = membership.user
-      guardian = Guardian.new(user)
-      return unless guardian.can_chat? && guardian.can_join_chat_channel?(@chat_channel)
-      return if Chat::ChatNotifier.user_has_seen_message?(membership, @chat_message.id)
-      return if online_user_ids.include?(user.id)
-
-      translation_key =
-        (
-          if @is_direct_message_channel
-            "discourse_push_notifications.popup.new_direct_chat_message"
-          else
-            "discourse_push_notifications.popup.new_chat_message"
-          end
-        )
-
-      translation_args = { username: @creator.username }
-      translation_args[:channel] = @chat_channel.title(user) unless @is_direct_message_channel
-
-      payload = {
-        username: @creator.username,
-        notification_type: Notification.types[:chat_message],
-        post_url: @chat_channel.relative_url,
-        translated_title: I18n.t(translation_key, translation_args),
-        tag: Chat::ChatNotifier.push_notification_tag(:message, @chat_channel.id),
-        excerpt: @chat_message.push_notification_excerpt,
-      }
-
-      if membership.desktop_notifications_always? && !membership.muted?
-        MessageBus.publish("/chat/notification-alert/#{user.id}", payload, user_ids: [user.id])
-      end
-
-      if membership.mobile_notifications_always? && !membership.muted?
-        PostAlerter.push_notification(user, payload)
-      end
-    end
-
-    def online_user_ids
-      @online_user_ids ||= PresenceChannel.new("/chat/online").user_ids
-    end
-  end
-end
diff --git a/plugins/chat/app/jobs/regular/delete_user_messages.rb b/plugins/chat/app/jobs/regular/delete_user_messages.rb
deleted file mode 100644
index 22c35624ef9..00000000000
--- a/plugins/chat/app/jobs/regular/delete_user_messages.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Jobs
-  class DeleteUserMessages < ::Jobs::Base
-    def execute(args)
-      return if args[:user_id].nil?
-
-      ChatMessageDestroyer.new.destroy_in_batches(
-        ChatMessage.with_deleted.where(user_id: args[:user_id]),
-      )
-    end
-  end
-end
diff --git a/plugins/chat/app/jobs/regular/process_chat_message.rb b/plugins/chat/app/jobs/regular/process_chat_message.rb
deleted file mode 100644
index 612978bb23f..00000000000
--- a/plugins/chat/app/jobs/regular/process_chat_message.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module Jobs
-  class ProcessChatMessage < ::Jobs::Base
-    def execute(args = {})
-      DistributedMutex.synchronize(
-        "process_chat_message_#{args[:chat_message_id]}",
-        validity: 10.minutes,
-      ) do
-        chat_message = ChatMessage.find_by(id: args[:chat_message_id])
-        return if !chat_message
-        processor = Chat::ChatMessageProcessor.new(chat_message)
-        processor.run!
-
-        if args[:is_dirty] || processor.dirty?
-          chat_message.update(cooked: processor.html, cooked_version: ChatMessage::BAKED_VERSION)
-          ChatPublisher.publish_processed!(chat_message)
-        end
-      end
-    end
-  end
-end
diff --git a/plugins/chat/app/jobs/regular/send_message_notifications.rb b/plugins/chat/app/jobs/regular/send_message_notifications.rb
deleted file mode 100644
index 5fa778467e4..00000000000
--- a/plugins/chat/app/jobs/regular/send_message_notifications.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module Jobs
-  class SendMessageNotifications < ::Jobs::Base
-    def execute(args)
-      reason = args[:reason]
-      valid_reasons = %w[new edit]
-      return unless valid_reasons.include?(reason)
-
-      return if (timestamp = args[:timestamp]).blank?
-
-      return if (message = ChatMessage.find_by(id: args[:chat_message_id])).nil?
-
-      if reason == "new"
-        Chat::ChatNotifier.new(message, timestamp).notify_new
-      elsif reason == "edit"
-        Chat::ChatNotifier.new(message, timestamp).notify_edit
-      end
-    end
-  end
-end
diff --git a/plugins/chat/app/jobs/regular/update_channel_user_count.rb b/plugins/chat/app/jobs/regular/update_channel_user_count.rb
deleted file mode 100644
index 0790a52e167..00000000000
--- a/plugins/chat/app/jobs/regular/update_channel_user_count.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module Jobs
-  class UpdateChannelUserCount < Jobs::Base
-    def execute(args = {})
-      channel = ChatChannel.find_by(id: args[:chat_channel_id])
-      return if channel.blank?
-      return if !channel.user_count_stale
-
-      channel.update!(
-        user_count: ChatChannelMembershipsQuery.count(channel),
-        user_count_stale: false,
-      )
-
-      ChatPublisher.publish_chat_channel_metadata(channel)
-    end
-  end
-end
diff --git a/plugins/chat/app/jobs/scheduled/auto_join_users.rb b/plugins/chat/app/jobs/scheduled/auto_join_users.rb
deleted file mode 100644
index 061a3dce8db..00000000000
--- a/plugins/chat/app/jobs/scheduled/auto_join_users.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Jobs
-  class AutoJoinUsers < ::Jobs::Scheduled
-    every 1.hour
-
-    def execute(_args)
-      ChatChannel
-        .where(auto_join_users: true)
-        .each do |channel|
-          Chat::ChatChannelMembershipManager.new(channel).enforce_automatic_channel_memberships
-        end
-    end
-  end
-end
diff --git a/plugins/chat/app/jobs/scheduled/chat/auto_join_users.rb b/plugins/chat/app/jobs/scheduled/chat/auto_join_users.rb
new file mode 100644
index 00000000000..5d2c50938bf
--- /dev/null
+++ b/plugins/chat/app/jobs/scheduled/chat/auto_join_users.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Jobs
+  module Chat
+    class AutoJoinUsers < ::Jobs::Scheduled
+      every 1.hour
+
+      def execute(_args)
+        return if !SiteSetting.chat_enabled
+
+        ::Chat::Channel
+          .where(auto_join_users: true)
+          .each do |channel|
+            ::Chat::ChannelMembershipManager.new(channel).enforce_automatic_channel_memberships
+          end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/jobs/scheduled/chat/delete_old_messages.rb b/plugins/chat/app/jobs/scheduled/chat/delete_old_messages.rb
new file mode 100644
index 00000000000..0a706b3875b
--- /dev/null
+++ b/plugins/chat/app/jobs/scheduled/chat/delete_old_messages.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Jobs
+  module Chat
+    class DeleteOldMessages < ::Jobs::Scheduled
+      daily at: 0.hours
+
+      def execute(args = {})
+        return if !SiteSetting.chat_enabled
+
+        delete_public_channel_messages
+        delete_dm_channel_messages
+      end
+
+      private
+
+      def delete_public_channel_messages
+        return unless valid_day_value?(:chat_channel_retention_days)
+
+        ::Chat::MessageDestroyer.new.destroy_in_batches(
+          ::Chat::Message.in_public_channel.with_deleted.created_before(
+            ::SiteSetting.chat_channel_retention_days.days.ago,
+          ),
+        )
+      end
+
+      def delete_dm_channel_messages
+        return unless valid_day_value?(:chat_dm_retention_days)
+
+        ::Chat::MessageDestroyer.new.destroy_in_batches(
+          ::Chat::Message.in_dm_channel.with_deleted.created_before(
+            ::SiteSetting.chat_dm_retention_days.days.ago,
+          ),
+        )
+      end
+
+      def valid_day_value?(setting_name)
+        (::SiteSetting.public_send(setting_name) || 0).positive?
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/jobs/scheduled/chat/email_notifications.rb b/plugins/chat/app/jobs/scheduled/chat/email_notifications.rb
new file mode 100644
index 00000000000..4b88c7122d3
--- /dev/null
+++ b/plugins/chat/app/jobs/scheduled/chat/email_notifications.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Jobs
+  module Chat
+    class EmailNotifications < ::Jobs::Scheduled
+      every 5.minutes
+
+      def execute(args = {})
+        return if !SiteSetting.chat_enabled
+
+        ::Chat::Mailer.send_unread_mentions_summary
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/jobs/scheduled/chat/periodical_updates.rb b/plugins/chat/app/jobs/scheduled/chat/periodical_updates.rb
new file mode 100644
index 00000000000..5879ebec095
--- /dev/null
+++ b/plugins/chat/app/jobs/scheduled/chat/periodical_updates.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Jobs
+  module Chat
+    class PeriodicalUpdates < ::Jobs::Scheduled
+      every 15.minutes
+
+      def execute(args = nil)
+        return if !SiteSetting.chat_enabled
+
+        # TODO: Add rebaking of old messages (baked_version <
+        # Chat::Message::BAKED_VERSION or baked_version IS NULL)
+        ::Chat::Channel.ensure_consistency!
+        ::Chat::Thread.ensure_consistency!
+        nil
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/jobs/scheduled/chat_periodical_updates.rb b/plugins/chat/app/jobs/scheduled/chat_periodical_updates.rb
deleted file mode 100644
index c7ca56fcb15..00000000000
--- a/plugins/chat/app/jobs/scheduled/chat_periodical_updates.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module Jobs
-  class ChatPeriodicalUpdates < ::Jobs::Scheduled
-    every 15.minutes
-
-    def execute(args = nil)
-      # TODO: Add rebaking of old messages (baked_version <
-      # ChatMessage::BAKED_VERSION or baked_version IS NULL)
-      ChatChannel.ensure_consistency!
-      nil
-    end
-  end
-end
diff --git a/plugins/chat/app/jobs/scheduled/delete_old_chat_messages.rb b/plugins/chat/app/jobs/scheduled/delete_old_chat_messages.rb
deleted file mode 100644
index 0fbc06141be..00000000000
--- a/plugins/chat/app/jobs/scheduled/delete_old_chat_messages.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-module Jobs
-  class DeleteOldChatMessages < ::Jobs::Scheduled
-    daily at: 0.hours
-
-    def execute(args = {})
-      delete_public_channel_messages
-      delete_dm_channel_messages
-    end
-
-    private
-
-    def delete_public_channel_messages
-      return unless valid_day_value?(:chat_channel_retention_days)
-
-      ChatMessageDestroyer.new.destroy_in_batches(
-        ChatMessage.in_public_channel.with_deleted.created_before(
-          SiteSetting.chat_channel_retention_days.days.ago,
-        ),
-      )
-    end
-
-    def delete_dm_channel_messages
-      return unless valid_day_value?(:chat_dm_retention_days)
-
-      ChatMessageDestroyer.new.destroy_in_batches(
-        ChatMessage.in_dm_channel.with_deleted.created_before(
-          SiteSetting.chat_dm_retention_days.days.ago,
-        ),
-      )
-    end
-
-    def valid_day_value?(setting_name)
-      (SiteSetting.public_send(setting_name) || 0).positive?
-    end
-  end
-end
diff --git a/plugins/chat/app/jobs/scheduled/email_chat_notifications.rb b/plugins/chat/app/jobs/scheduled/email_chat_notifications.rb
deleted file mode 100644
index 470c6aa2152..00000000000
--- a/plugins/chat/app/jobs/scheduled/email_chat_notifications.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Jobs
-  class EmailChatNotifications < ::Jobs::Scheduled
-    every 5.minutes
-
-    def execute(args = {})
-      return unless SiteSetting.chat_enabled
-
-      Chat::ChatMailer.send_unread_mentions_summary
-    end
-  end
-end
diff --git a/plugins/chat/app/jobs/scheduled/update_user_counts_for_chat_channels.rb b/plugins/chat/app/jobs/scheduled/update_user_counts_for_chat_channels.rb
deleted file mode 100644
index 8880732b8e5..00000000000
--- a/plugins/chat/app/jobs/scheduled/update_user_counts_for_chat_channels.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module Jobs
-  # TODO (martin) Move into ChatChannel.ensure_consistency! so it
-  # is run with ChatPeriodicalUpdates
-  class UpdateUserCountsForChatChannels < ::Jobs::Scheduled
-    every 1.hour
-
-    # FIXME: This could become huge as the amount of channels grows, we
-    # need a different approach here. Perhaps we should only bother for
-    # channels updated or with new messages in the past N days? Perhaps
-    # we could update all the counts in a single query as well?
-    def execute(args = {})
-      ChatChannel
-        .where(status: %i[open closed])
-        .find_each { |chat_channel| set_user_count(chat_channel) }
-    end
-
-    def set_user_count(chat_channel)
-      current_count = chat_channel.user_count || 0
-      new_count = ChatChannelMembershipsQuery.count(chat_channel)
-      return if current_count == new_count
-
-      chat_channel.update(user_count: new_count, user_count_stale: false)
-      ChatPublisher.publish_chat_channel_metadata(chat_channel)
-    end
-  end
-end
diff --git a/plugins/chat/app/jobs/service_job.rb b/plugins/chat/app/jobs/service_job.rb
new file mode 100644
index 00000000000..e2af50f8641
--- /dev/null
+++ b/plugins/chat/app/jobs/service_job.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class ServiceJob < ::Jobs::Base
+  include Chat::WithServiceHelper
+
+  def run_service(service, dependencies)
+    @_result = service.call(dependencies)
+  end
+end
diff --git a/plugins/chat/app/models/category_channel.rb b/plugins/chat/app/models/category_channel.rb
deleted file mode 100644
index b205e82b4ac..00000000000
--- a/plugins/chat/app/models/category_channel.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-class CategoryChannel < ChatChannel
-  alias_attribute :category, :chatable
-
-  delegate :read_restricted?, to: :category
-  delegate :url, to: :chatable, prefix: true
-
-  %i[category_channel? public_channel? chatable_has_custom_fields?].each do |name|
-    define_method(name) { true }
-  end
-
-  def allowed_group_ids
-    return if !read_restricted?
-
-    staff_groups = Group::AUTO_GROUPS.slice(:staff, :moderators, :admins).values
-    category.secure_group_ids.to_a.concat(staff_groups)
-  end
-
-  def title(_ = nil)
-    name.presence || category.name
-  end
-
-  def generate_auto_slug
-    return if self.slug.present?
-    self.slug = Slug.for(self.title.strip, "")
-    self.slug = "" if duplicate_slug?
-  end
-
-  def ensure_slug_ok
-    if self.slug.present?
-      # if we don't unescape it first we strip the % from the encoded version
-      slug = SiteSetting.slug_generation_method == "encoded" ? CGI.unescape(self.slug) : self.slug
-      self.slug = Slug.for(slug, "", method: :encoded)
-
-      if self.slug.blank?
-        errors.add(:slug, :invalid)
-      elsif SiteSetting.slug_generation_method == "ascii" && !CGI.unescape(self.slug).ascii_only?
-        errors.add(:slug, I18n.t("chat.category_channel.errors.slug_contains_non_ascii_chars"))
-      elsif duplicate_slug?
-        errors.add(:slug, I18n.t("chat.category_channel.errors.is_already_in_use"))
-      end
-    end
-  end
-end
diff --git a/plugins/chat/app/models/chat/category_channel.rb b/plugins/chat/app/models/chat/category_channel.rb
new file mode 100644
index 00000000000..bf23f561cde
--- /dev/null
+++ b/plugins/chat/app/models/chat/category_channel.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Chat
+  class CategoryChannel < Channel
+    alias_attribute :category, :chatable
+
+    delegate :read_restricted?, to: :category
+    delegate :url, to: :chatable, prefix: true
+
+    %i[category_channel? public_channel? chatable_has_custom_fields?].each do |name|
+      define_method(name) { true }
+    end
+
+    def allowed_group_ids
+      return if !read_restricted?
+
+      staff_groups = Group::AUTO_GROUPS.slice(:staff, :moderators, :admins).values
+      category.secure_group_ids.to_a.concat(staff_groups)
+    end
+
+    def title(_ = nil)
+      name.presence || category.name
+    end
+
+    def generate_auto_slug
+      return if self.slug.present?
+      self.slug = Slug.for(self.title.strip, "")
+      self.slug = "" if duplicate_slug?
+    end
+
+    def ensure_slug_ok
+      if self.slug.present?
+        # if we don't unescape it first we strip the % from the encoded version
+        slug = SiteSetting.slug_generation_method == "encoded" ? CGI.unescape(self.slug) : self.slug
+        self.slug = Slug.for(slug, "", method: :encoded)
+
+        if self.slug.blank?
+          errors.add(:slug, :invalid)
+        elsif SiteSetting.slug_generation_method == "ascii" && !CGI.unescape(self.slug).ascii_only?
+          errors.add(:slug, I18n.t("chat.category_channel.errors.slug_contains_non_ascii_chars"))
+        elsif duplicate_slug?
+          errors.add(:slug, I18n.t("chat.category_channel.errors.is_already_in_use"))
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/models/chat/channel.rb b/plugins/chat/app/models/chat/channel.rb
new file mode 100644
index 00000000000..077a7d7f79e
--- /dev/null
+++ b/plugins/chat/app/models/chat/channel.rb
@@ -0,0 +1,288 @@
+# frozen_string_literal: true
+
+module Chat
+  class Channel < ActiveRecord::Base
+    include Trashable
+    include TypeMappable
+
+    # TODO (martin) Remove once we are using last_message instead,
+    # should be around August 2023.
+    self.ignored_columns = %w[last_message_sent_at]
+    self.table_name = "chat_channels"
+
+    belongs_to :chatable, polymorphic: true
+    belongs_to :direct_message,
+               class_name: "Chat::DirectMessage",
+               foreign_key: :chatable_id,
+               inverse_of: :direct_message_channel,
+               optional: true
+
+    has_many :chat_messages, class_name: "Chat::Message", foreign_key: :chat_channel_id
+    has_many :user_chat_channel_memberships,
+             class_name: "Chat::UserChatChannelMembership",
+             foreign_key: :chat_channel_id
+    has_many :threads, class_name: "Chat::Thread", foreign_key: :channel_id
+    has_one :chat_channel_archive, class_name: "Chat::ChannelArchive", foreign_key: :chat_channel_id
+    belongs_to :last_message,
+               class_name: "Chat::Message",
+               foreign_key: :last_message_id,
+               optional: true
+
+    enum :status, { open: 0, read_only: 1, closed: 2, archived: 3 }, scopes: false
+
+    validates :name,
+              length: {
+                maximum: Proc.new { SiteSetting.max_topic_title_length },
+              },
+              presence: true,
+              allow_nil: true
+    validate :ensure_slug_ok, if: :slug_changed?
+    before_validation :generate_auto_slug
+
+    scope :with_categories,
+          -> {
+            joins(
+              "LEFT JOIN categories ON categories.id = chat_channels.chatable_id AND chat_channels.chatable_type = 'Category'",
+            )
+          }
+    scope :public_channels,
+          -> {
+            with_categories.where(chatable_type: public_channel_chatable_types).where(
+              "categories.id IS NOT NULL",
+            )
+          }
+
+    delegate :empty?, to: :chat_messages, prefix: true
+
+    class << self
+      def sti_class_mapping =
+        {
+          "CategoryChannel" => Chat::CategoryChannel,
+          "DirectMessageChannel" => Chat::DirectMessageChannel,
+        }
+
+      def polymorphic_class_mapping = { "DirectMessage" => Chat::DirectMessage }
+
+      def editable_statuses
+        statuses.filter { |k, _| !%w[read_only archived].include?(k) }
+      end
+
+      def public_channel_chatable_types
+        %w[Category]
+      end
+
+      def direct_channel_chatable_types
+        %w[DirectMessage]
+      end
+
+      def chatable_types
+        public_channel_chatable_types + direct_channel_chatable_types
+      end
+
+      def find_by_id_or_slug(id)
+        with_categories.find_by(
+          "chat_channels.id = :id OR categories.slug = :slug OR chat_channels.slug = :slug",
+          id: Integer(id, exception: false),
+          slug: id.to_s.downcase,
+        )
+      end
+    end
+
+    statuses.keys.each do |status|
+      define_method("#{status}!") { |acting_user| change_status(acting_user, status.to_sym) }
+    end
+
+    %i[
+      category_channel?
+      direct_message_channel?
+      public_channel?
+      chatable_has_custom_fields?
+      read_restricted?
+    ].each { |name| define_method(name) { false } }
+
+    %i[allowed_user_ids allowed_group_ids chatable_url].each { |name| define_method(name) { nil } }
+
+    def membership_for(user)
+      user_chat_channel_memberships.find_by(user: user)
+    end
+
+    def add(user)
+      Chat::ChannelMembershipManager.new(self).follow(user)
+    end
+
+    def remove(user)
+      Chat::ChannelMembershipManager.new(self).unfollow(user)
+    end
+
+    def url
+      "#{Discourse.base_url}/chat/c/#{self.slug || "-"}/#{self.id}"
+    end
+
+    def relative_url
+      "#{Discourse.base_path}/chat/c/#{self.slug || "-"}/#{self.id}"
+    end
+
+    def update_last_message_id!
+      self.update!(last_message_id: self.latest_not_deleted_message_id)
+    end
+
+    def self.ensure_consistency!
+      update_message_counts
+      update_user_counts
+    end
+
+    def joined_by?(user)
+      user.user_chat_channel_memberships.strict_loading.any? do |membership|
+        predicate = membership.chat_channel_id == id
+        predicate = predicate && membership.following if public_channel?
+        predicate
+      end
+    end
+
+    def self.update_message_counts
+      # NOTE: Chat::Channel#messages_count is not updated every time
+      # a message is created or deleted in a channel, so it should not
+      # be displayed in the UI. It is updated eventually via Jobs::Chat::PeriodicalUpdates
+      DB.exec <<~SQL
+        UPDATE chat_channels channels
+        SET messages_count = subquery.messages_count
+        FROM (
+          SELECT COUNT(*) AS messages_count, chat_channel_id
+          FROM chat_messages
+          WHERE chat_messages.deleted_at IS NULL
+          GROUP BY chat_channel_id
+        ) subquery
+        WHERE channels.id = subquery.chat_channel_id
+        AND channels.deleted_at IS NULL
+        AND subquery.messages_count != channels.messages_count
+      SQL
+    end
+
+    def self.update_user_counts
+      updated_channel_ids = DB.query_single(<<~SQL, statuses: [statuses[:open], statuses[:closed]])
+        UPDATE chat_channels channels
+        SET user_count = subquery.user_count, user_count_stale = false
+        FROM (
+          SELECT COUNT(DISTINCT user_chat_channel_memberships.id) AS user_count, user_chat_channel_memberships.chat_channel_id
+          FROM user_chat_channel_memberships
+          INNER JOIN users ON users.id = user_chat_channel_memberships.user_id
+          WHERE users.active
+            AND (users.suspended_till IS NULL OR users.suspended_till <= CURRENT_TIMESTAMP)
+            AND NOT users.staged
+            AND user_chat_channel_memberships.following
+          GROUP BY user_chat_channel_memberships.chat_channel_id
+        ) subquery
+        WHERE channels.id = subquery.chat_channel_id
+        AND channels.deleted_at IS NULL
+        AND subquery.user_count != channels.user_count
+        AND channels.status IN (:statuses)
+        RETURNING channels.id;
+      SQL
+
+      Chat::Channel
+        .where(id: updated_channel_ids)
+        .find_each { |channel| ::Chat::Publisher.publish_chat_channel_metadata(channel) }
+    end
+
+    def latest_not_deleted_message_id(anchor_message_id: nil)
+      DB.query_single(<<~SQL, channel_id: self.id, anchor_message_id: anchor_message_id).first
+        SELECT chat_messages.id
+        FROM chat_messages
+        LEFT JOIN chat_threads original_message_threads ON original_message_threads.original_message_id = chat_messages.id
+        WHERE chat_channel_id = :channel_id
+        AND deleted_at IS NULL
+        -- this is so only the original message of a thread is counted not all thread replies
+        AND (chat_messages.thread_id IS NULL OR original_message_threads.id IS NOT NULL)
+        #{anchor_message_id ? "AND chat_messages.id < :anchor_message_id" : ""}
+        ORDER BY chat_messages.created_at DESC, chat_messages.id DESC
+        LIMIT 1
+      SQL
+    end
+
+    def mark_all_threads_as_read(user: nil)
+      return if !self.threading_enabled
+
+      DB.exec(<<~SQL, channel_id: self.id)
+        UPDATE user_chat_thread_memberships
+        SET last_read_message_id = chat_threads.last_message_id
+        FROM chat_threads
+        WHERE user_chat_thread_memberships.thread_id = chat_threads.id
+        #{user ? "AND user_chat_thread_memberships.user_id = #{user.id}" : ""}
+        AND (
+          user_chat_thread_memberships.last_read_message_id < chat_threads.last_message_id OR
+          user_chat_thread_memberships.last_read_message_id IS NULL
+        )
+      SQL
+    end
+
+    private
+
+    def change_status(acting_user, target_status)
+      return if !Guardian.new(acting_user).can_change_channel_status?(self, target_status)
+      self.update!(status: target_status)
+      log_channel_status_change(acting_user: acting_user)
+    end
+
+    def log_channel_status_change(acting_user:)
+      DiscourseEvent.trigger(
+        :chat_channel_status_change,
+        channel: self,
+        old_status: status_previously_was,
+        new_status: status,
+      )
+
+      StaffActionLogger.new(acting_user).log_custom(
+        "chat_channel_status_change",
+        {
+          chat_channel_id: self.id,
+          chat_channel_name: self.name,
+          previous_value: status_previously_was,
+          new_value: status,
+        },
+      )
+
+      Chat::Publisher.publish_channel_status(self)
+    end
+
+    def duplicate_slug?
+      Chat::Channel.where(slug: self.slug).where.not(id: self.id).any?
+    end
+  end
+end
+
+# == Schema Information
+#
+# Table name: chat_channels
+#
+#  id                          :bigint           not null, primary key
+#  chatable_id                 :integer          not null
+#  deleted_at                  :datetime
+#  deleted_by_id               :integer
+#  featured_in_category_id     :integer
+#  delete_after_seconds        :integer
+#  chatable_type               :string           not null
+#  created_at                  :datetime         not null
+#  updated_at                  :datetime         not null
+#  name                        :string
+#  description                 :text
+#  status                      :integer          default("open"), not null
+#  user_count                  :integer          default(0), not null
+#  last_message_sent_at        :datetime         not null
+#  auto_join_users             :boolean          default(FALSE), not null
+#  user_count_stale            :boolean          default(FALSE), not null
+#  slug                        :string
+#  type                        :string
+#  allow_channel_wide_mentions :boolean          default(TRUE), not null
+#  messages_count              :integer          default(0), not null
+#  threading_enabled           :boolean          default(FALSE), not null
+#  last_message_id             :bigint
+#
+# Indexes
+#
+#  index_chat_channels_on_chatable_id                    (chatable_id)
+#  index_chat_channels_on_chatable_id_and_chatable_type  (chatable_id,chatable_type)
+#  index_chat_channels_on_last_message_id                (last_message_id)
+#  index_chat_channels_on_messages_count                 (messages_count)
+#  index_chat_channels_on_slug                           (slug) UNIQUE
+#  index_chat_channels_on_status                         (status)
+#
diff --git a/plugins/chat/app/models/chat_channel_archive.rb b/plugins/chat/app/models/chat/channel_archive.rb
similarity index 60%
rename from plugins/chat/app/models/chat_channel_archive.rb
rename to plugins/chat/app/models/chat/channel_archive.rb
index 057af4e5bf9..e8c88b4b932 100644
--- a/plugins/chat/app/models/chat_channel_archive.rb
+++ b/plugins/chat/app/models/chat/channel_archive.rb
@@ -1,21 +1,24 @@
 # frozen_string_literal: true
 
-class ChatChannelArchive < ActiveRecord::Base
-  belongs_to :chat_channel
-  belongs_to :archived_by, class_name: "User"
+module Chat
+  class ChannelArchive < ActiveRecord::Base
+    belongs_to :chat_channel, class_name: "Chat::Channel"
+    belongs_to :archived_by, class_name: "User"
+    belongs_to :destination_topic, class_name: "Topic"
 
-  belongs_to :destination_topic, class_name: "Topic"
+    self.table_name = "chat_channel_archives"
 
-  def complete?
-    self.archived_messages >= self.total_messages && self.chat_channel.chat_messages.count.zero?
-  end
+    def complete?
+      self.archived_messages >= self.total_messages && self.chat_channel.chat_messages.count.zero?
+    end
 
-  def failed?
-    !complete? && self.archive_error.present?
-  end
+    def failed?
+      !complete? && self.archive_error.present?
+    end
 
-  def new_topic?
-    self.destination_topic_title.present?
+    def new_topic?
+      self.destination_topic_title.present?
+    end
   end
 end
 
diff --git a/plugins/chat/app/models/chat/deleted_user.rb b/plugins/chat/app/models/chat/deleted_user.rb
new file mode 100644
index 00000000000..b97d775500d
--- /dev/null
+++ b/plugins/chat/app/models/chat/deleted_user.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Chat
+  class DeletedUser < User
+    def username
+      I18n.t("chat.deleted_chat_username")
+    end
+
+    def avatar_template
+      "/plugins/chat/images/deleted-chat-user-avatar.png"
+    end
+
+    def bot?
+      false
+    end
+  end
+end
diff --git a/plugins/chat/app/models/chat/direct_message.rb b/plugins/chat/app/models/chat/direct_message.rb
new file mode 100644
index 00000000000..c5c6864a018
--- /dev/null
+++ b/plugins/chat/app/models/chat/direct_message.rb
@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+module Chat
+  class DirectMessage < ActiveRecord::Base
+    self.table_name = "direct_message_channels"
+
+    include Chatable
+    include TypeMappable
+
+    has_many :direct_message_users,
+             class_name: "Chat::DirectMessageUser",
+             foreign_key: :direct_message_channel_id
+    has_many :users, through: :direct_message_users
+
+    has_one :direct_message_channel, as: :chatable, class_name: "Chat::DirectMessageChannel"
+
+    class << self
+      def polymorphic_class_mapping = { "DirectMessage" => Chat::DirectMessage }
+
+      def for_user_ids(user_ids)
+        joins(:users)
+          .group("direct_message_channels.id")
+          .having("ARRAY[?] = ARRAY_AGG(users.id ORDER BY users.id)", user_ids.sort)
+          .first
+      end
+    end
+
+    def user_can_access?(user)
+      users.include?(user)
+    end
+
+    def chat_channel_title_for_user(chat_channel, acting_user)
+      users =
+        (direct_message_users.map(&:user) - [acting_user]).map do |user|
+          user || Chat::DeletedUser.new
+        end
+
+      # direct message to self
+      if users.empty?
+        return I18n.t("chat.channel.dm_title.single_user", username: "@#{acting_user.username}")
+      end
+
+      # all users deleted
+      return chat_channel.id if !users.first
+
+      usernames_formatted = users.sort_by(&:username).map { |u| "@#{u.username}" }
+      if usernames_formatted.size > 5
+        return(
+          I18n.t(
+            "chat.channel.dm_title.multi_user_truncated",
+            comma_separated_usernames:
+              usernames_formatted[0..4].join(I18n.t("word_connector.comma")),
+            count: usernames_formatted.length - 5,
+          )
+        )
+      end
+
+      I18n.t(
+        "chat.channel.dm_title.multi_user",
+        comma_separated_usernames: usernames_formatted.join(I18n.t("word_connector.comma")),
+      )
+    end
+  end
+end
+
+# == Schema Information
+#
+# Table name: direct_message_channels
+#
+#  id         :bigint           not null, primary key
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
diff --git a/plugins/chat/app/models/chat/direct_message_channel.rb b/plugins/chat/app/models/chat/direct_message_channel.rb
new file mode 100644
index 00000000000..44dd3bf3bc4
--- /dev/null
+++ b/plugins/chat/app/models/chat/direct_message_channel.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Chat
+  class DirectMessageChannel < Channel
+    alias_attribute :direct_message, :chatable
+
+    def direct_message_channel?
+      true
+    end
+
+    def allowed_user_ids
+      direct_message.user_ids
+    end
+
+    def read_restricted?
+      true
+    end
+
+    def title(user)
+      direct_message.chat_channel_title_for_user(self, user)
+    end
+
+    def ensure_slug_ok
+      true
+    end
+
+    def generate_auto_slug
+      self.slug = nil
+    end
+  end
+end
diff --git a/plugins/chat/app/models/direct_message_user.rb b/plugins/chat/app/models/chat/direct_message_user.rb
similarity index 64%
rename from plugins/chat/app/models/direct_message_user.rb
rename to plugins/chat/app/models/chat/direct_message_user.rb
index f8cfc6664ff..aae155f6210 100644
--- a/plugins/chat/app/models/direct_message_user.rb
+++ b/plugins/chat/app/models/chat/direct_message_user.rb
@@ -1,8 +1,14 @@
 # frozen_string_literal: true
 
-class DirectMessageUser < ActiveRecord::Base
-  belongs_to :direct_message, foreign_key: :direct_message_channel_id
-  belongs_to :user
+module Chat
+  class DirectMessageUser < ActiveRecord::Base
+    self.table_name = "direct_message_users"
+
+    belongs_to :direct_message,
+               class_name: "Chat::DirectMessage",
+               foreign_key: :direct_message_channel_id
+    belongs_to :user
+  end
 end
 
 # == Schema Information
diff --git a/plugins/chat/app/models/chat_draft.rb b/plugins/chat/app/models/chat/draft.rb
similarity index 52%
rename from plugins/chat/app/models/chat_draft.rb
rename to plugins/chat/app/models/chat/draft.rb
index 7dc1b7feeb0..6b1dc2d59e7 100644
--- a/plugins/chat/app/models/chat_draft.rb
+++ b/plugins/chat/app/models/chat/draft.rb
@@ -1,13 +1,17 @@
 # frozen_string_literal: true
 
-class ChatDraft < ActiveRecord::Base
-  belongs_to :user
-  belongs_to :chat_channel
+module Chat
+  class Draft < ActiveRecord::Base
+    belongs_to :user
+    belongs_to :chat_channel, class_name: "Chat::Channel"
 
-  validate :data_length
-  def data_length
-    if self.data && self.data.length > SiteSetting.max_chat_draft_length
-      self.errors.add(:base, I18n.t("chat.errors.draft_too_long"))
+    self.table_name = "chat_drafts"
+
+    validate :data_length
+    def data_length
+      if self.data && self.data.length > SiteSetting.max_chat_draft_length
+        self.errors.add(:base, I18n.t("chat.errors.draft_too_long"))
+      end
     end
   end
 end
diff --git a/plugins/chat/app/models/incoming_chat_webhook.rb b/plugins/chat/app/models/chat/incoming_webhook.rb
similarity index 61%
rename from plugins/chat/app/models/incoming_chat_webhook.rb
rename to plugins/chat/app/models/chat/incoming_webhook.rb
index e71b539a037..cb76ffebc66 100644
--- a/plugins/chat/app/models/incoming_chat_webhook.rb
+++ b/plugins/chat/app/models/chat/incoming_webhook.rb
@@ -1,13 +1,17 @@
 # frozen_string_literal: true
 
-class IncomingChatWebhook < ActiveRecord::Base
-  belongs_to :chat_channel
-  has_many :chat_webhook_events
+module Chat
+  class IncomingWebhook < ActiveRecord::Base
+    self.table_name = "incoming_chat_webhooks"
 
-  before_create { self.key = SecureRandom.hex(12) }
+    belongs_to :chat_channel, class_name: "Chat::Channel"
+    has_many :chat_webhook_events, class_name: "Chat::WebhookEvent"
 
-  def url
-    "#{Discourse.base_url}/chat/hooks/#{key}.json"
+    before_create { self.key = SecureRandom.hex(12) }
+
+    def url
+      "#{Discourse.base_url}/chat/hooks/#{key}.json"
+    end
   end
 end
 
diff --git a/plugins/chat/app/models/chat_mention.rb b/plugins/chat/app/models/chat/mention.rb
similarity index 67%
rename from plugins/chat/app/models/chat_mention.rb
rename to plugins/chat/app/models/chat/mention.rb
index e334acae473..ab3bbee9925 100644
--- a/plugins/chat/app/models/chat_mention.rb
+++ b/plugins/chat/app/models/chat/mention.rb
@@ -1,9 +1,13 @@
 # frozen_string_literal: true
 
-class ChatMention < ActiveRecord::Base
-  belongs_to :user
-  belongs_to :chat_message
-  belongs_to :notification
+module Chat
+  class Mention < ActiveRecord::Base
+    self.table_name = "chat_mentions"
+
+    belongs_to :user
+    belongs_to :chat_message, class_name: "Chat::Message"
+    belongs_to :notification, dependent: :destroy
+  end
 end
 
 # == Schema Information
diff --git a/plugins/chat/app/models/chat/message.rb b/plugins/chat/app/models/chat/message.rb
new file mode 100644
index 00000000000..7e7aabc6958
--- /dev/null
+++ b/plugins/chat/app/models/chat/message.rb
@@ -0,0 +1,356 @@
+# frozen_string_literal: true
+
+module Chat
+  class Message < ActiveRecord::Base
+    include Trashable
+    include TypeMappable
+
+    self.table_name = "chat_messages"
+
+    BAKED_VERSION = 2
+
+    attribute :has_oneboxes, default: false
+
+    belongs_to :chat_channel, class_name: "Chat::Channel"
+    belongs_to :user
+    belongs_to :in_reply_to, class_name: "Chat::Message"
+    belongs_to :last_editor, class_name: "User"
+    belongs_to :thread, class_name: "Chat::Thread", optional: true
+
+    has_many :replies,
+             class_name: "Chat::Message",
+             foreign_key: "in_reply_to_id",
+             dependent: :nullify
+    has_many :revisions,
+             class_name: "Chat::MessageRevision",
+             dependent: :destroy,
+             foreign_key: :chat_message_id
+    has_many :reactions,
+             class_name: "Chat::MessageReaction",
+             dependent: :destroy,
+             foreign_key: :chat_message_id
+    has_many :bookmarks,
+             -> {
+               unscope(where: :bookmarkable_type).where(
+                 bookmarkable_type: Chat::Message.polymorphic_name,
+               )
+             },
+             as: :bookmarkable,
+             dependent: :destroy
+    has_many :upload_references,
+             -> { unscope(where: :target_type).where(target_type: Chat::Message.polymorphic_name) },
+             dependent: :destroy,
+             foreign_key: :target_id
+    has_many :uploads, through: :upload_references, class_name: "::Upload"
+
+    has_one :chat_webhook_event,
+            dependent: :destroy,
+            class_name: "Chat::WebhookEvent",
+            foreign_key: :chat_message_id
+    has_many :chat_mentions,
+             dependent: :destroy,
+             class_name: "Chat::Mention",
+             foreign_key: :chat_message_id
+
+    scope :in_public_channel,
+          -> {
+            joins(:chat_channel).where(
+              chat_channel: {
+                chatable_type: Chat::Channel.public_channel_chatable_types,
+              },
+            )
+          }
+    scope :in_dm_channel,
+          -> {
+            joins(:chat_channel).where(
+              chat_channel: {
+                chatable_type: Chat::Channel.direct_channel_chatable_types,
+              },
+            )
+          }
+    scope :created_before, ->(date) { where("chat_messages.created_at < ?", date) }
+    scope :uncooked, -> { where("cooked_version <> ? or cooked_version IS NULL", BAKED_VERSION) }
+
+    before_save { ensure_last_editor_id }
+
+    validate :validate_message
+
+    def self.polymorphic_class_mapping = { "ChatMessage" => Chat::Message }
+
+    def validate_message
+      self.message =
+        TextCleaner.clean(self.message, strip_whitespaces: true, strip_zero_width_spaces: true)
+
+      WatchedWordsValidator.new(attributes: [:message]).validate(self)
+
+      if self.new_record? || self.changed.include?("message")
+        Chat::DuplicateMessageValidator.new(self).validate
+      end
+
+      if uploads.empty? && message_too_short?
+        self.errors.add(
+          :base,
+          I18n.t(
+            "chat.errors.minimum_length_not_met",
+            count: SiteSetting.chat_minimum_message_length,
+          ),
+        )
+      end
+
+      if message_too_long?
+        self.errors.add(
+          :base,
+          I18n.t("chat.errors.message_too_long", count: SiteSetting.chat_maximum_message_length),
+        )
+      end
+    end
+
+    def excerpt(max_length: 50)
+      # just show the URL if the whole message is a URL, because we cannot excerpt oneboxes
+      return message if UrlHelper.relaxed_parse(message).is_a?(URI)
+
+      # upload-only messages are better represented as the filename
+      return uploads.first.original_filename if cooked.blank? && uploads.present?
+
+      # this may return blank for some complex things like quotes, that is acceptable
+      PrettyText.excerpt(cooked, max_length)
+    end
+
+    def censored_excerpt(max_length: 50)
+      WordWatcher.censor(excerpt(max_length: max_length))
+    end
+
+    def cooked_for_excerpt
+      (cooked.blank? && uploads.present?) ? "<p>#{uploads.first.original_filename}</p>" : cooked
+    end
+
+    def push_notification_excerpt
+      Emoji.gsub_emoji_to_unicode(message).truncate(400)
+    end
+
+    def to_markdown
+      upload_markdown =
+        self
+          .upload_references
+          .includes(:upload)
+          .order(:created_at)
+          .map(&:to_markdown)
+          .reject(&:empty?)
+
+      return self.message if upload_markdown.empty?
+
+      return ["#{self.message}\n"].concat(upload_markdown).join("\n") if self.message.present?
+
+      upload_markdown.join("\n")
+    end
+
+    def cook
+      ensure_last_editor_id
+
+      self.cooked = self.class.cook(self.message, user_id: self.last_editor_id)
+      self.cooked_version = BAKED_VERSION
+
+      invalidate_parsed_mentions
+    end
+
+    def rebake!(invalidate_oneboxes: false, priority: nil)
+      ensure_last_editor_id
+
+      previous_cooked = self.cooked
+      new_cooked =
+        self.class.cook(
+          message,
+          invalidate_oneboxes: invalidate_oneboxes,
+          user_id: self.last_editor_id,
+        )
+      update_columns(cooked: new_cooked, cooked_version: BAKED_VERSION)
+      args = { chat_message_id: self.id }
+      args[:queue] = priority.to_s if priority && priority != :normal
+      args[:is_dirty] = true if previous_cooked != new_cooked
+
+      Jobs.enqueue(Jobs::Chat::ProcessMessage, args)
+    end
+
+    MARKDOWN_FEATURES = %w[
+      anchor
+      bbcode-block
+      bbcode-inline
+      code
+      category-hashtag
+      censored
+      chat-transcript
+      discourse-local-dates
+      emoji
+      emojiShortcuts
+      inlineEmoji
+      html-img
+      hashtag-autocomplete
+      mentions
+      unicodeUsernames
+      onebox
+      quotes
+      spoiler-alert
+      table
+      text-post-process
+      upload-protocol
+      watched-words
+    ]
+
+    MARKDOWN_IT_RULES = %w[
+      autolink
+      list
+      backticks
+      newline
+      code
+      fence
+      image
+      table
+      linkify
+      link
+      strikethrough
+      blockquote
+      emphasis
+    ]
+
+    def self.cook(message, opts = {})
+      # A rule in our Markdown pipeline may have Guardian checks that require a
+      # user to be present. The last editing user of the message will be more
+      # generally up to date than the creating user. For example, we use
+      # this when cooking #hashtags to determine whether we should render
+      # the found hashtag based on whether the user can access the channel it
+      # is referencing.
+      cooked =
+        PrettyText.cook(
+          message,
+          features_override:
+            MARKDOWN_FEATURES + DiscoursePluginRegistry.chat_markdown_features.to_a,
+          markdown_it_rules: MARKDOWN_IT_RULES,
+          force_quote_link: true,
+          user_id: opts[:user_id],
+          hashtag_context: "chat-composer",
+        )
+
+      result =
+        Oneboxer.apply(cooked) do |url|
+          if opts[:invalidate_oneboxes]
+            Oneboxer.invalidate(url)
+            InlineOneboxer.invalidate(url)
+          end
+          onebox = Oneboxer.cached_onebox(url)
+          onebox
+        end
+
+      cooked = result.to_html if result.changed?
+      cooked
+    end
+
+    def full_url
+      "#{Discourse.base_url}#{url}"
+    end
+
+    def url
+      "/chat/c/-/#{self.chat_channel_id}/#{self.id}"
+    end
+
+    def create_mentions
+      insert_mentions(parsed_mentions.all_mentioned_users_ids)
+    end
+
+    def update_mentions
+      mentioned_user_ids = parsed_mentions.all_mentioned_users_ids
+
+      old_mentions = chat_mentions.pluck(:user_id)
+      updated_mentions = mentioned_user_ids
+      mentioned_user_ids_to_drop = old_mentions - updated_mentions
+      mentioned_user_ids_to_add = updated_mentions - old_mentions
+
+      delete_mentions(mentioned_user_ids_to_drop)
+      insert_mentions(mentioned_user_ids_to_add)
+    end
+
+    def in_thread?
+      self.thread_id.present?
+    end
+
+    def thread_reply?
+      in_thread? && !thread_om?
+    end
+
+    def thread_om?
+      in_thread? && self.thread.original_message_id == self.id
+    end
+
+    def parsed_mentions
+      @parsed_mentions ||= Chat::ParsedMentions.new(self)
+    end
+
+    def invalidate_parsed_mentions
+      @parsed_mentions = nil
+    end
+
+    private
+
+    def delete_mentions(user_ids)
+      chat_mentions.where(user_id: user_ids).destroy_all
+    end
+
+    def insert_mentions(user_ids)
+      return if user_ids.empty?
+
+      now = Time.zone.now
+      mentions = []
+      User
+        .where(id: user_ids)
+        .find_each do |user|
+          mentions << {
+            chat_message_id: self.id,
+            user_id: user.id,
+            created_at: now,
+            updated_at: now,
+          }
+        end
+
+      Chat::Mention.insert_all(mentions)
+    end
+
+    def message_too_short?
+      message.length < SiteSetting.chat_minimum_message_length
+    end
+
+    def message_too_long?
+      message.length > SiteSetting.chat_maximum_message_length
+    end
+
+    def ensure_last_editor_id
+      self.last_editor_id ||= self.user_id
+    end
+  end
+end
+
+# == Schema Information
+#
+# Table name: chat_messages
+#
+#  id              :bigint           not null, primary key
+#  chat_channel_id :integer          not null
+#  user_id         :integer
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
+#  deleted_at      :datetime
+#  deleted_by_id   :integer
+#  in_reply_to_id  :integer
+#  message         :text
+#  cooked          :text
+#  cooked_version  :integer
+#  last_editor_id  :integer          not null
+#  thread_id       :integer
+#
+# Indexes
+#
+#  idx_chat_messages_by_created_at_not_deleted            (created_at) WHERE (deleted_at IS NULL)
+#  idx_chat_messages_by_thread_id_not_deleted             (thread_id) WHERE (deleted_at IS NULL)
+#  index_chat_messages_on_chat_channel_id_and_created_at  (chat_channel_id,created_at)
+#  index_chat_messages_on_chat_channel_id_and_id          (chat_channel_id,id) WHERE (deleted_at IS NULL)
+#  index_chat_messages_on_last_editor_id                  (last_editor_id)
+#  index_chat_messages_on_thread_id                       (thread_id)
+#
diff --git a/plugins/chat/app/models/chat_message_reaction.rb b/plugins/chat/app/models/chat/message_reaction.rb
similarity index 69%
rename from plugins/chat/app/models/chat_message_reaction.rb
rename to plugins/chat/app/models/chat/message_reaction.rb
index f101b2ec353..3b378dd0481 100644
--- a/plugins/chat/app/models/chat_message_reaction.rb
+++ b/plugins/chat/app/models/chat/message_reaction.rb
@@ -1,8 +1,12 @@
 # frozen_string_literal: true
 
-class ChatMessageReaction < ActiveRecord::Base
-  belongs_to :chat_message
-  belongs_to :user
+module Chat
+  class MessageReaction < ActiveRecord::Base
+    self.table_name = "chat_message_reactions"
+
+    belongs_to :chat_message, class_name: "Chat::Message"
+    belongs_to :user
+  end
 end
 
 # == Schema Information
diff --git a/plugins/chat/app/models/chat_message_revision.rb b/plugins/chat/app/models/chat/message_revision.rb
similarity index 74%
rename from plugins/chat/app/models/chat_message_revision.rb
rename to plugins/chat/app/models/chat/message_revision.rb
index e13cf507e17..3b01ee03339 100644
--- a/plugins/chat/app/models/chat_message_revision.rb
+++ b/plugins/chat/app/models/chat/message_revision.rb
@@ -1,8 +1,12 @@
 # frozen_string_literal: true
 
-class ChatMessageRevision < ActiveRecord::Base
-  belongs_to :chat_message
-  belongs_to :user
+module Chat
+  class MessageRevision < ActiveRecord::Base
+    self.table_name = "chat_message_revisions"
+
+    belongs_to :chat_message, class_name: "Chat::Message"
+    belongs_to :user
+  end
 end
 
 # == Schema Information
diff --git a/plugins/chat/app/models/chat/reviewable_message.rb b/plugins/chat/app/models/chat/reviewable_message.rb
new file mode 100644
index 00000000000..a7a0b4713e1
--- /dev/null
+++ b/plugins/chat/app/models/chat/reviewable_message.rb
@@ -0,0 +1,159 @@
+# frozen_string_literal: true
+
+module Chat
+  class ReviewableMessage < Reviewable
+    def serializer
+      Chat::ReviewableMessageSerializer
+    end
+
+    def self.action_aliases
+      {
+        agree_and_keep_hidden: :agree_and_delete,
+        agree_and_silence: :agree_and_delete,
+        agree_and_suspend: :agree_and_delete,
+        delete_and_agree: :agree_and_delete,
+      }
+    end
+
+    def self.score_to_silence_user
+      sensitivity_score(SiteSetting.chat_silence_user_sensitivity, scale: 0.6)
+    end
+
+    def chat_message
+      @chat_message ||= (target || Chat::Message.with_deleted.find_by(id: target_id))
+    end
+
+    def chat_message_creator
+      @chat_message_creator ||= chat_message.user
+    end
+
+    def flagged_by_user_ids
+      @flagged_by_user_ids ||= reviewable_scores.map(&:user_id)
+    end
+
+    def post
+      nil
+    end
+
+    def build_actions(actions, guardian, args)
+      return unless pending?
+      return if chat_message.blank?
+
+      agree =
+        actions.add_bundle(
+          "#{id}-agree",
+          icon: "thumbs-up",
+          label: "reviewables.actions.agree.title",
+        )
+
+      if chat_message.deleted_at?
+        build_action(actions, :agree_and_restore, icon: "far-eye", bundle: agree)
+        build_action(actions, :agree_and_keep_deleted, icon: "thumbs-up", bundle: agree)
+        build_action(actions, :disagree_and_restore, icon: "thumbs-down")
+      else
+        build_action(actions, :agree_and_delete, icon: "far-eye-slash", bundle: agree)
+        build_action(actions, :agree_and_keep_message, icon: "thumbs-up", bundle: agree)
+        build_action(actions, :disagree, icon: "thumbs-down")
+      end
+
+      if guardian.can_suspend?(chat_message_creator)
+        build_action(
+          actions,
+          :agree_and_suspend,
+          icon: "ban",
+          bundle: agree,
+          client_action: "suspend",
+        )
+        build_action(
+          actions,
+          :agree_and_silence,
+          icon: "microphone-slash",
+          bundle: agree,
+          client_action: "silence",
+        )
+      end
+
+      build_action(actions, :ignore, icon: "external-link-alt")
+
+      unless chat_message.deleted_at?
+        build_action(actions, :delete_and_agree, icon: "far-trash-alt")
+      end
+    end
+
+    def perform_agree_and_keep_message(performed_by, args)
+      agree
+    end
+
+    def perform_agree_and_restore(performed_by, args)
+      agree { chat_message.recover! }
+    end
+
+    def perform_agree_and_delete(performed_by, args)
+      agree { chat_message.trash!(performed_by) }
+    end
+
+    def perform_disagree_and_restore(performed_by, args)
+      disagree { chat_message.recover! }
+    end
+
+    def perform_disagree(performed_by, args)
+      disagree
+    end
+
+    def perform_ignore(performed_by, args)
+      ignore
+    end
+
+    def perform_delete_and_ignore(performed_by, args)
+      ignore { chat_message.trash!(performed_by) }
+    end
+
+    private
+
+    def agree
+      yield if block_given?
+      create_result(:success, :approved) do |result|
+        result.update_flag_stats = { status: :agreed, user_ids: flagged_by_user_ids }
+        result.recalculate_score = true
+      end
+    end
+
+    def disagree
+      yield if block_given?
+
+      UserSilencer.unsilence(chat_message_creator)
+
+      create_result(:success, :rejected) do |result|
+        result.update_flag_stats = { status: :disagreed, user_ids: flagged_by_user_ids }
+        result.recalculate_score = true
+      end
+    end
+
+    def ignore
+      yield if block_given?
+      create_result(:success, :ignored) do |result|
+        result.update_flag_stats = { status: :ignored, user_ids: flagged_by_user_ids }
+      end
+    end
+
+    def build_action(
+      actions,
+      id,
+      icon:,
+      button_class: nil,
+      bundle: nil,
+      client_action: nil,
+      confirm: false
+    )
+      actions.add(id, bundle: bundle) do |action|
+        prefix = "reviewables.actions.#{id}"
+        action.icon = icon
+        action.button_class = button_class
+        action.label = "chat.#{prefix}.title"
+        action.description = "chat.#{prefix}.description"
+        action.client_action = client_action
+        action.confirm_message = "#{prefix}.confirm" if confirm
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/models/chat/thread.rb b/plugins/chat/app/models/chat/thread.rb
new file mode 100644
index 00000000000..2dc62e7df10
--- /dev/null
+++ b/plugins/chat/app/models/chat/thread.rb
@@ -0,0 +1,168 @@
+# frozen_string_literal: true
+
+module Chat
+  class Thread < ActiveRecord::Base
+    EXCERPT_LENGTH = 150
+    MAX_TITLE_LENGTH = 100
+
+    include Chat::ThreadCache
+
+    self.table_name = "chat_threads"
+
+    belongs_to :channel, foreign_key: "channel_id", class_name: "Chat::Channel"
+    belongs_to :original_message_user, foreign_key: "original_message_user_id", class_name: "User"
+    belongs_to :original_message,
+               -> { with_deleted },
+               foreign_key: "original_message_id",
+               class_name: "Chat::Message"
+
+    has_many :chat_messages,
+             -> {
+               where("deleted_at IS NULL").order(
+                 "chat_messages.created_at ASC, chat_messages.id ASC",
+               )
+             },
+             foreign_key: :thread_id,
+             primary_key: :id,
+             class_name: "Chat::Message"
+    has_many :user_chat_thread_memberships
+    belongs_to :last_message,
+               class_name: "Chat::Message",
+               foreign_key: :last_message_id,
+               optional: true
+
+    enum :status, { open: 0, read_only: 1, closed: 2, archived: 3 }, scopes: false
+
+    validates :title, length: { maximum: Chat::Thread::MAX_TITLE_LENGTH }
+
+    # Since the `replies` for the thread can all be deleted, to avoid errors
+    # in lists and previews of the thread, we can consider the original message
+    # as the last message in this case as a fallback.
+    before_create { self.last_message_id = self.original_message_id }
+
+    def add(user)
+      Chat::UserChatThreadMembership.find_or_create_by!(user: user, thread: self)
+    end
+
+    def remove(user)
+      Chat::UserChatThreadMembership.find_by(user: user, thread: self)&.destroy
+    end
+
+    def membership_for(user)
+      user_chat_thread_memberships.find_by(user: user)
+    end
+
+    def mark_read_for_user!(user, last_read_message_id: nil)
+      membership_for(user)&.update!(
+        last_read_message_id: last_read_message_id || self.last_message_id,
+      )
+    end
+
+    def replies
+      self.chat_messages.where.not(id: self.original_message_id).order("created_at ASC, id ASC")
+    end
+
+    def url
+      "#{channel.url}/t/#{self.id}"
+    end
+
+    def relative_url
+      "#{channel.relative_url}/t/#{self.id}"
+    end
+
+    def excerpt
+      original_message.excerpt(max_length: EXCERPT_LENGTH)
+    end
+
+    def update_last_message_id!
+      self.update!(last_message_id: self.latest_not_deleted_message_id)
+    end
+
+    def latest_not_deleted_message_id(anchor_message_id: nil)
+      DB.query_single(
+        <<~SQL,
+        SELECT id FROM chat_messages
+        WHERE chat_channel_id = :channel_id
+        AND thread_id = :thread_id
+        AND deleted_at IS NULL
+        #{anchor_message_id ? "AND id < :anchor_message_id" : ""}
+        ORDER BY created_at DESC, id DESC
+        LIMIT 1
+      SQL
+        channel_id: self.channel_id,
+        thread_id: self.id,
+        anchor_message_id: anchor_message_id,
+      ).first
+    end
+
+    def self.grouped_messages(thread_ids: nil, message_ids: nil, include_original_message: true)
+      DB.query(<<~SQL, message_ids: message_ids, thread_ids: thread_ids)
+        SELECT thread_id,
+          array_agg(chat_messages.id ORDER BY chat_messages.created_at, chat_messages.id) AS thread_message_ids,
+          chat_threads.original_message_id
+        FROM chat_messages
+        INNER JOIN chat_threads ON chat_threads.id = chat_messages.thread_id
+        WHERE thread_id IS NOT NULL
+        #{thread_ids ? "AND thread_id IN (:thread_ids)" : ""}
+        #{message_ids ? "AND chat_messages.id IN (:message_ids)" : ""}
+        #{include_original_message ? "" : "AND chat_messages.id != chat_threads.original_message_id"}
+        GROUP BY thread_id, chat_threads.original_message_id;
+      SQL
+    end
+
+    def self.ensure_consistency!
+      update_counts
+    end
+
+    def self.update_counts
+      # NOTE: Chat::Thread#replies_count is not updated every time
+      # a message is created or deleted in a channel, the UI will lag
+      # behind unless it is kept in sync with MessageBus. The count
+      # has 1 subtracted from it to account for the original message.
+      #
+      # It is updated eventually via Jobs::Chat::PeriodicalUpdates. In
+      # future we may want to update this more frequently.
+      updated_thread_ids = DB.query_single <<~SQL
+        UPDATE chat_threads threads
+        SET replies_count = subquery.replies_count
+        FROM (
+          SELECT COUNT(*) - 1 AS replies_count, thread_id
+          FROM chat_messages
+          WHERE chat_messages.deleted_at IS NULL AND thread_id IS NOT NULL
+          GROUP BY thread_id
+        ) subquery
+        WHERE threads.id = subquery.thread_id
+        AND subquery.replies_count != threads.replies_count
+        RETURNING threads.id AS thread_id;
+      SQL
+      return if updated_thread_ids.empty?
+      self.clear_caches!(updated_thread_ids)
+    end
+  end
+end
+
+# == Schema Information
+#
+# Table name: chat_threads
+#
+#  id                       :bigint           not null, primary key
+#  channel_id               :integer          not null
+#  original_message_id      :integer          not null
+#  original_message_user_id :integer          not null
+#  status                   :integer          default("open"), not null
+#  title                    :string
+#  created_at               :datetime         not null
+#  updated_at               :datetime         not null
+#  replies_count            :integer          default(0), not null
+#  last_message_id          :bigint
+#
+# Indexes
+#
+#  index_chat_threads_on_channel_id                (channel_id)
+#  index_chat_threads_on_channel_id_and_status     (channel_id,status)
+#  index_chat_threads_on_last_message_id           (last_message_id)
+#  index_chat_threads_on_original_message_id       (original_message_id)
+#  index_chat_threads_on_original_message_user_id  (original_message_user_id)
+#  index_chat_threads_on_replies_count             (replies_count)
+#  index_chat_threads_on_status                    (status)
+#
diff --git a/plugins/chat/app/models/chat/threads_view.rb b/plugins/chat/app/models/chat/threads_view.rb
new file mode 100644
index 00000000000..fc98ea8ace9
--- /dev/null
+++ b/plugins/chat/app/models/chat/threads_view.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Chat
+  class ThreadsView
+    attr_reader :user, :channel, :threads, :tracking, :memberships, :load_more_url
+
+    def initialize(channel:, threads:, user:, tracking:, memberships:, load_more_url:)
+      @channel = channel
+      @threads = threads
+      @user = user
+      @tracking = tracking
+      @memberships = memberships
+      @load_more_url = load_more_url
+    end
+  end
+end
diff --git a/plugins/chat/app/models/chat/tracking_state_report.rb b/plugins/chat/app/models/chat/tracking_state_report.rb
new file mode 100644
index 00000000000..b15f273f9c3
--- /dev/null
+++ b/plugins/chat/app/models/chat/tracking_state_report.rb
@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+module Chat
+  # Represents a report of the tracking state for a user
+  # across threads and channels. This is returned by
+  # Chat::TrackingStateReportQuery.
+  class TrackingStateReport
+    attr_accessor :channel_tracking, :thread_tracking
+
+    class TrackingStateInfo
+      attr_accessor :unread_count, :mention_count, :last_reply_created_at
+
+      def initialize(info)
+        @unread_count = info.present? ? info[:unread_count] : 0
+        @mention_count = info.present? ? info[:mention_count] : 0
+        @last_reply_created_at = info.present? ? info[:last_reply_created_at] : nil
+      end
+
+      def to_hash
+        to_h
+      end
+
+      def to_h
+        {
+          unread_count: unread_count,
+          mention_count: mention_count,
+          last_reply_created_at: last_reply_created_at,
+        }
+      end
+    end
+
+    def initialize
+      @channel_tracking = {}
+      @thread_tracking = {}
+    end
+
+    def find_channel(channel_id)
+      TrackingStateInfo.new(channel_tracking[channel_id])
+    end
+
+    def find_thread(thread_id)
+      TrackingStateInfo.new(thread_tracking[thread_id])
+    end
+
+    def find_channel_threads(channel_id)
+      thread_tracking.inject({}) do |result, (thread_id, thread)|
+        if thread[:channel_id] == channel_id
+          result.merge(thread_id => TrackingStateInfo.new(thread))
+        else
+          result
+        end
+      end
+    end
+
+    def find_channel_thread_overviews(channel_id)
+      thread_tracking.inject({}) do |result, (thread_id, thread)|
+        if thread[:channel_id] == channel_id
+          result.merge(thread_id => thread[:last_reply_created_at])
+        else
+          result
+        end
+      end
+    end
+
+    def thread_unread_overview_by_channel
+      thread_tracking.inject({}) do |acc, tt|
+        thread_id = tt.first
+        data = tt.second
+
+        acc[data[:channel_id]] = {} if !acc[data[:channel_id]]
+        acc[data[:channel_id]][thread_id] = data[:last_reply_created_at]
+        acc
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/models/user_chat_channel_membership.rb b/plugins/chat/app/models/chat/user_chat_channel_membership.rb
similarity index 63%
rename from plugins/chat/app/models/user_chat_channel_membership.rb
rename to plugins/chat/app/models/chat/user_chat_channel_membership.rb
index 643dcdb1a6e..c2e59caa7b2 100644
--- a/plugins/chat/app/models/user_chat_channel_membership.rb
+++ b/plugins/chat/app/models/chat/user_chat_channel_membership.rb
@@ -1,18 +1,19 @@
 # frozen_string_literal: true
 
-class UserChatChannelMembership < ActiveRecord::Base
-  NOTIFICATION_LEVELS = { never: 0, mention: 1, always: 2 }
+module Chat
+  class UserChatChannelMembership < ActiveRecord::Base
+    self.table_name = "user_chat_channel_memberships"
 
-  belongs_to :user
-  belongs_to :chat_channel
-  belongs_to :last_read_message, class_name: "ChatMessage", optional: true
+    NOTIFICATION_LEVELS = { never: 0, mention: 1, always: 2 }
 
-  enum :desktop_notification_level, NOTIFICATION_LEVELS, prefix: :desktop_notifications
-  enum :mobile_notification_level, NOTIFICATION_LEVELS, prefix: :mobile_notifications
-  enum :join_mode, { manual: 0, automatic: 1 }
+    belongs_to :user
+    belongs_to :last_read_message, class_name: "Chat::Message", optional: true
+    belongs_to :chat_channel, class_name: "Chat::Channel", foreign_key: :chat_channel_id
 
-  attribute :unread_count, default: 0
-  attribute :unread_mentions, default: 0
+    enum :desktop_notification_level, NOTIFICATION_LEVELS, prefix: :desktop_notifications
+    enum :mobile_notification_level, NOTIFICATION_LEVELS, prefix: :mobile_notifications
+    enum :join_mode, { manual: 0, automatic: 1 }
+  end
 end
 
 # == Schema Information
@@ -31,6 +32,7 @@ end
 #  updated_at                          :datetime         not null
 #  last_unread_mention_when_emailed_id :integer
 #  join_mode                           :integer          default("manual"), not null
+#  last_viewed_at                      :datetime         not null
 #
 # Indexes
 #
diff --git a/plugins/chat/app/models/chat/user_chat_thread_membership.rb b/plugins/chat/app/models/chat/user_chat_thread_membership.rb
new file mode 100644
index 00000000000..49d2bdfd181
--- /dev/null
+++ b/plugins/chat/app/models/chat/user_chat_thread_membership.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Chat
+  class UserChatThreadMembership < ActiveRecord::Base
+    self.table_name = "user_chat_thread_memberships"
+
+    belongs_to :user
+    belongs_to :last_read_message, class_name: "Chat::Message", optional: true
+    belongs_to :thread, class_name: "Chat::Thread", foreign_key: :thread_id
+
+    enum :notification_level, Chat::NotificationLevels.all
+  end
+end
+
+# == Schema Information
+#
+# Table name: user_chat_thread_memberships
+#
+#  id                   :bigint           not null, primary key
+#  user_id              :bigint           not null
+#  thread_id            :bigint           not null
+#  last_read_message_id :bigint
+#  notification_level   :integer          default("tracking"), not null
+#  created_at           :datetime         not null
+#  updated_at           :datetime         not null
+#
+# Indexes
+#
+#  user_chat_thread_unique_memberships  (user_id,thread_id) UNIQUE
+#
diff --git a/plugins/chat/app/models/chat_webhook_event.rb b/plugins/chat/app/models/chat/webhook_event.rb
similarity index 58%
rename from plugins/chat/app/models/chat_webhook_event.rb
rename to plugins/chat/app/models/chat/webhook_event.rb
index acda4ffd9b0..fe2aecb2bcf 100644
--- a/plugins/chat/app/models/chat_webhook_event.rb
+++ b/plugins/chat/app/models/chat/webhook_event.rb
@@ -1,11 +1,15 @@
 # frozen_string_literal: true
 
-class ChatWebhookEvent < ActiveRecord::Base
-  belongs_to :chat_message
-  belongs_to :incoming_chat_webhook
+module Chat
+  class WebhookEvent < ActiveRecord::Base
+    self.table_name = "chat_webhook_events"
 
-  delegate :username, to: :incoming_chat_webhook
-  delegate :emoji, to: :incoming_chat_webhook
+    belongs_to :chat_message, class_name: "Chat::Message"
+    belongs_to :incoming_chat_webhook, class_name: "Chat::IncomingWebhook"
+
+    delegate :username, to: :incoming_chat_webhook
+    delegate :emoji, to: :incoming_chat_webhook
+  end
 end
 
 # == Schema Information
diff --git a/plugins/chat/app/models/chat_channel.rb b/plugins/chat/app/models/chat_channel.rb
deleted file mode 100644
index 389a16a4c12..00000000000
--- a/plugins/chat/app/models/chat_channel.rb
+++ /dev/null
@@ -1,175 +0,0 @@
-# frozen_string_literal: true
-
-class ChatChannel < ActiveRecord::Base
-  include Trashable
-
-  belongs_to :chatable, polymorphic: true
-  belongs_to :direct_message,
-             -> { where(chat_channels: { chatable_type: "DirectMessage" }) },
-             foreign_key: "chatable_id"
-
-  has_many :chat_messages
-  has_many :user_chat_channel_memberships
-
-  has_one :chat_channel_archive
-
-  enum :status, { open: 0, read_only: 1, closed: 2, archived: 3 }, scopes: false
-
-  validates :name,
-            length: {
-              maximum: Proc.new { SiteSetting.max_topic_title_length },
-            },
-            presence: true,
-            allow_nil: true
-  validate :ensure_slug_ok, if: :slug_changed?
-  before_validation :generate_auto_slug
-
-  scope :public_channels,
-        -> {
-          where(chatable_type: public_channel_chatable_types).where(
-            "categories.id IS NOT NULL",
-          ).joins(
-            "LEFT JOIN categories ON categories.id = chat_channels.chatable_id AND chat_channels.chatable_type = 'Category'",
-          )
-        }
-
-  delegate :empty?, to: :chat_messages, prefix: true
-
-  class << self
-    def public_channel_chatable_types
-      ["Category"]
-    end
-
-    def chatable_types
-      public_channel_chatable_types << "DirectMessage"
-    end
-  end
-
-  statuses.keys.each do |status|
-    define_method("#{status}!") { |acting_user| change_status(acting_user, status.to_sym) }
-  end
-
-  %i[
-    category_channel?
-    direct_message_channel?
-    public_channel?
-    chatable_has_custom_fields?
-    read_restricted?
-  ].each { |name| define_method(name) { false } }
-
-  %i[allowed_user_ids allowed_group_ids chatable_url].each { |name| define_method(name) { nil } }
-
-  def membership_for(user)
-    user_chat_channel_memberships.find_by(user: user)
-  end
-
-  def add(user)
-    Chat::ChatChannelMembershipManager.new(self).follow(user)
-  end
-
-  def remove(user)
-    Chat::ChatChannelMembershipManager.new(self).unfollow(user)
-  end
-
-  def status_name
-    I18n.t("chat.channel.statuses.#{self.status}")
-  end
-
-  def url
-    "#{Discourse.base_url}/chat/channel/#{self.id}/#{self.slug || "-"}"
-  end
-
-  def relative_url
-    "#{Discourse.base_path}/chat/channel/#{self.id}/#{self.slug || "-"}"
-  end
-
-  def self.ensure_consistency!
-    update_counts
-  end
-
-  # TODO (martin) Move UpdateUserCountsForChatChannels into here
-  def self.update_counts
-    # NOTE: ChatChannel#messages_count is not updated every time
-    # a message is created or deleted in a channel, so it should not
-    # be displayed in the UI. It is updated eventually via Jobs::ChatPeriodicalUpdates
-    DB.exec <<~SQL
-      UPDATE chat_channels channels
-      SET messages_count = subquery.messages_count
-      FROM (
-        SELECT COUNT(*) AS messages_count, chat_channel_id
-        FROM chat_messages
-        WHERE chat_messages.deleted_at IS NULL
-        GROUP BY chat_channel_id
-      ) subquery
-      WHERE channels.id = subquery.chat_channel_id
-      AND channels.deleted_at IS NULL
-      AND subquery.messages_count != channels.messages_count
-    SQL
-  end
-
-  private
-
-  def change_status(acting_user, target_status)
-    return if !Guardian.new(acting_user).can_change_channel_status?(self, target_status)
-    self.update!(status: target_status)
-    log_channel_status_change(acting_user: acting_user)
-  end
-
-  def log_channel_status_change(acting_user:)
-    DiscourseEvent.trigger(
-      :chat_channel_status_change,
-      channel: self,
-      old_status: status_previously_was,
-      new_status: status,
-    )
-
-    StaffActionLogger.new(acting_user).log_custom(
-      "chat_channel_status_change",
-      {
-        chat_channel_id: self.id,
-        chat_channel_name: self.name,
-        previous_value: status_previously_was,
-        new_value: status,
-      },
-    )
-
-    ChatPublisher.publish_channel_status(self)
-  end
-
-  def duplicate_slug?
-    ChatChannel.where(slug: self.slug).where.not(id: self.id).any?
-  end
-end
-
-# == Schema Information
-#
-# Table name: chat_channels
-#
-#  id                           :bigint           not null, primary key
-#  chatable_id                  :integer          not null
-#  deleted_at                   :datetime
-#  deleted_by_id                :integer
-#  featured_in_category_id      :integer
-#  delete_after_seconds         :integer
-#  chatable_type                :string           not null
-#  created_at                   :datetime         not null
-#  updated_at                   :datetime         not null
-#  name                         :string
-#  description                  :text
-#  status                       :integer          default("open"), not null
-#  user_count                   :integer          default(0), not null
-#  last_message_sent_at         :datetime         not null
-#  auto_join_users              :boolean          default(FALSE), not null
-#  allow_channel_wide_mentions  :boolean          default(TRUE), not null
-#  user_count_stale             :boolean          default(FALSE), not null
-#  slug                         :string
-#  type                         :string
-#
-# Indexes
-#
-#  index_chat_channels_on_messages_count             (messages_count)
-#  index_chat_channels_on_chatable_id                    (chatable_id)
-#  index_chat_channels_on_chatable_id_and_chatable_type  (chatable_id,chatable_type)
-#  index_chat_channels_on_slug                           (slug) UNIQUE
-#  index_chat_channels_on_status                         (status)
-#
diff --git a/plugins/chat/app/models/chat_message.rb b/plugins/chat/app/models/chat_message.rb
deleted file mode 100644
index f7688a8a13d..00000000000
--- a/plugins/chat/app/models/chat_message.rb
+++ /dev/null
@@ -1,257 +0,0 @@
-# frozen_string_literal: true
-
-class ChatMessage < ActiveRecord::Base
-  include Trashable
-  attribute :has_oneboxes, default: false
-
-  BAKED_VERSION = 2
-
-  belongs_to :chat_channel
-  belongs_to :user
-  belongs_to :in_reply_to, class_name: "ChatMessage"
-  belongs_to :last_editor, class_name: "User"
-  has_many :replies, class_name: "ChatMessage", foreign_key: "in_reply_to_id", dependent: :nullify
-  has_many :revisions, class_name: "ChatMessageRevision", dependent: :destroy
-  has_many :reactions, class_name: "ChatMessageReaction", dependent: :destroy
-  has_many :bookmarks, as: :bookmarkable, dependent: :destroy
-  has_many :chat_uploads, dependent: :destroy
-  has_many :uploads, through: :chat_uploads
-  has_one :chat_webhook_event, dependent: :destroy
-  has_one :chat_mention, dependent: :destroy
-
-  scope :in_public_channel,
-        -> {
-          joins(:chat_channel).where(
-            chat_channel: {
-              chatable_type: ChatChannel.public_channel_chatable_types,
-            },
-          )
-        }
-
-  scope :in_dm_channel,
-        -> { joins(:chat_channel).where(chat_channel: { chatable_type: "DirectMessage" }) }
-
-  scope :created_before, ->(date) { where("chat_messages.created_at < ?", date) }
-
-  before_save { ensure_last_editor_id }
-
-  def validate_message(has_uploads:)
-    WatchedWordsValidator.new(attributes: [:message]).validate(self)
-
-    if self.new_record? || self.changed.include?("message")
-      Chat::DuplicateMessageValidator.new(self).validate
-    end
-
-    if !has_uploads && message_too_short?
-      self.errors.add(
-        :base,
-        I18n.t(
-          "chat.errors.minimum_length_not_met",
-          minimum: SiteSetting.chat_minimum_message_length,
-        ),
-      )
-    end
-
-    if message_too_long?
-      self.errors.add(
-        :base,
-        I18n.t("chat.errors.message_too_long", maximum: SiteSetting.chat_maximum_message_length),
-      )
-    end
-  end
-
-  def attach_uploads(uploads)
-    return if uploads.blank?
-
-    now = Time.now
-    record_attrs =
-      uploads.map do |upload|
-        { upload_id: upload.id, chat_message_id: self.id, created_at: now, updated_at: now }
-      end
-    ChatUpload.insert_all!(record_attrs)
-  end
-
-  def excerpt
-    # just show the URL if the whole message is a URL, because we cannot excerpt oneboxes
-    return message if UrlHelper.relaxed_parse(message).is_a?(URI)
-
-    # upload-only messages are better represented as the filename
-    return uploads.first.original_filename if cooked.blank? && uploads.present?
-
-    # this may return blank for some complex things like quotes, that is acceptable
-    PrettyText.excerpt(cooked, 50, {})
-  end
-
-  def cooked_for_excerpt
-    (cooked.blank? && uploads.present?) ? "<p>#{uploads.first.original_filename}</p>" : cooked
-  end
-
-  def push_notification_excerpt
-    Emoji.gsub_emoji_to_unicode(message).truncate(400)
-  end
-
-  def to_markdown
-    markdown = []
-
-    if self.message.present?
-      msg = self.message
-
-      self.chat_uploads.any? ? markdown << msg + "\n" : markdown << msg
-    end
-
-    self
-      .chat_uploads
-      .order(:created_at)
-      .each { |chat_upload| markdown << UploadMarkdown.new(chat_upload.upload).to_markdown }
-
-    markdown.reject(&:empty?).join("\n")
-  end
-
-  def cook
-    ensure_last_editor_id
-
-    self.cooked = self.class.cook(self.message, user_id: self.last_editor_id)
-    self.cooked_version = BAKED_VERSION
-  end
-
-  def rebake!(invalidate_oneboxes: false, priority: nil)
-    ensure_last_editor_id
-
-    previous_cooked = self.cooked
-    new_cooked =
-      self.class.cook(
-        message,
-        invalidate_oneboxes: invalidate_oneboxes,
-        user_id: self.last_editor_id,
-      )
-    update_columns(cooked: new_cooked, cooked_version: BAKED_VERSION)
-    args = { chat_message_id: self.id }
-    args[:queue] = priority.to_s if priority && priority != :normal
-    args[:is_dirty] = true if previous_cooked != new_cooked
-
-    Jobs.enqueue(:process_chat_message, args)
-  end
-
-  def self.uncooked
-    where("cooked_version <> ? or cooked_version IS NULL", BAKED_VERSION)
-  end
-
-  MARKDOWN_FEATURES = %w[
-    anchor
-    bbcode-block
-    bbcode-inline
-    code
-    category-hashtag
-    censored
-    chat-transcript
-    discourse-local-dates
-    emoji
-    emojiShortcuts
-    inlineEmoji
-    html-img
-    hashtag-autocomplete
-    mentions
-    unicodeUsernames
-    onebox
-    quotes
-    spoiler-alert
-    table
-    text-post-process
-    upload-protocol
-    watched-words
-  ]
-
-  MARKDOWN_IT_RULES = %w[
-    autolink
-    list
-    backticks
-    newline
-    code
-    fence
-    image
-    table
-    linkify
-    link
-    strikethrough
-    blockquote
-    emphasis
-  ]
-
-  def self.cook(message, opts = {})
-    # A rule in our Markdown pipeline may have Guardian checks that require a
-    # user to be present. The last editing user of the message will be more
-    # generally up to date than the creating user. For example, we use
-    # this when cooking #hashtags to determine whether we should render
-    # the found hashtag based on whether the user can access the channel it
-    # is referencing.
-    cooked =
-      PrettyText.cook(
-        message,
-        features_override: MARKDOWN_FEATURES + DiscoursePluginRegistry.chat_markdown_features.to_a,
-        markdown_it_rules: MARKDOWN_IT_RULES,
-        force_quote_link: true,
-        user_id: opts[:user_id],
-        hashtag_context: "chat-composer",
-      )
-
-    result =
-      Oneboxer.apply(cooked) do |url|
-        if opts[:invalidate_oneboxes]
-          Oneboxer.invalidate(url)
-          InlineOneboxer.invalidate(url)
-        end
-        onebox = Oneboxer.cached_onebox(url)
-        onebox
-      end
-
-    cooked = result.to_html if result.changed?
-    cooked
-  end
-
-  def full_url
-    "#{Discourse.base_url}#{url}"
-  end
-
-  def url
-    "/chat/message/#{self.id}"
-  end
-
-  private
-
-  def message_too_short?
-    message.length < SiteSetting.chat_minimum_message_length
-  end
-
-  def message_too_long?
-    message.length > SiteSetting.chat_maximum_message_length
-  end
-
-  def ensure_last_editor_id
-    self.last_editor_id ||= self.user_id
-  end
-end
-
-# == Schema Information
-#
-# Table name: chat_messages
-#
-#  id              :bigint           not null, primary key
-#  chat_channel_id :integer          not null
-#  user_id         :integer
-#  created_at      :datetime         not null
-#  updated_at      :datetime         not null
-#  deleted_at      :datetime
-#  deleted_by_id   :integer
-#  in_reply_to_id  :integer
-#  message         :text
-#  cooked          :text
-#  cooked_version  :integer
-#  last_editor_id  :integer          not null
-#
-# Indexes
-#
-#  idx_chat_messages_by_created_at_not_deleted            (created_at) WHERE (deleted_at IS NULL)
-#  index_chat_messages_on_chat_channel_id_and_created_at  (chat_channel_id,created_at)
-#  index_chat_messages_on_chat_channel_id_and_id          (chat_channel_id,id) WHERE (deleted_at IS NULL)
-#  index_chat_messages_on_last_editor_id                  (last_editor_id)
-#
diff --git a/plugins/chat/app/models/chat_upload.rb b/plugins/chat/app/models/chat_upload.rb
deleted file mode 100644
index 3382328bfd7..00000000000
--- a/plugins/chat/app/models/chat_upload.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-class ChatUpload < ActiveRecord::Base
-  belongs_to :chat_message
-  belongs_to :upload
-end
-
-# == Schema Information
-#
-# Table name: chat_uploads
-#
-#  id              :bigint           not null, primary key
-#  chat_message_id :integer          not null
-#  upload_id       :integer          not null
-#  created_at      :datetime         not null
-#  updated_at      :datetime         not null
-#
-# Indexes
-#
-#  index_chat_uploads_on_chat_message_id_and_upload_id  (chat_message_id,upload_id) UNIQUE
-#
diff --git a/plugins/chat/app/models/chat_view.rb b/plugins/chat/app/models/chat_view.rb
deleted file mode 100644
index 9df0df18ddf..00000000000
--- a/plugins/chat/app/models/chat_view.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-# frozen_string_literal: true
-
-class ChatView
-  attr_reader :user, :chat_channel, :chat_messages, :can_load_more_past, :can_load_more_future
-
-  def initialize(
-    chat_channel:,
-    chat_messages:,
-    user:,
-    can_load_more_past: nil,
-    can_load_more_future: nil
-  )
-    @chat_channel = chat_channel
-    @chat_messages = chat_messages
-    @user = user
-    @can_load_more_past = can_load_more_past
-    @can_load_more_future = can_load_more_future
-  end
-
-  def reviewable_ids
-    return @reviewable_ids if defined?(@reviewable_ids)
-
-    @reviewable_ids = @user.staff? ? get_reviewable_ids : nil
-  end
-
-  def user_flag_statuses
-    return @user_flag_statuses if defined?(@user_flag_statuses)
-
-    @user_flag_statuses = get_user_flag_statuses
-  end
-
-  private
-
-  def get_reviewable_ids
-    sql = <<~SQL
-        SELECT
-          target_id,
-          MAX(r.id) reviewable_id
-        FROM
-          reviewables r
-        JOIN
-          reviewable_scores s ON reviewable_id = r.id
-        WHERE
-          r.target_id IN (:message_ids) AND
-          r.target_type = 'ChatMessage' AND
-          s.status = :pending
-        GROUP BY
-          target_id
-    SQL
-
-    ids = {}
-
-    DB
-      .query(
-        sql,
-        pending: ReviewableScore.statuses[:pending],
-        message_ids: @chat_messages.map(&:id),
-      )
-      .each { |row| ids[row.target_id] = row.reviewable_id }
-
-    ids
-  end
-
-  def get_user_flag_statuses
-    sql = <<~SQL
-        SELECT
-          target_id,
-          s.status
-        FROM
-          reviewables r
-        JOIN
-          reviewable_scores s ON reviewable_id = r.id
-        WHERE
-          s.user_id = :user_id AND
-          r.target_id IN (:message_ids) AND
-          r.target_type = 'ChatMessage'
-    SQL
-
-    statuses = {}
-
-    DB
-      .query(sql, message_ids: @chat_messages.map(&:id), user_id: @user.id)
-      .each { |row| statuses[row.target_id] = row.status }
-
-    statuses
-  end
-end
diff --git a/plugins/chat/app/models/concerns/chat/chatable.rb b/plugins/chat/app/models/concerns/chat/chatable.rb
new file mode 100644
index 00000000000..02614235428
--- /dev/null
+++ b/plugins/chat/app/models/concerns/chat/chatable.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Chat
+  module Chatable
+    extend ActiveSupport::Concern
+
+    def chat_channel
+      channel_class.new(chatable: self)
+    end
+
+    def create_chat_channel!(**args)
+      channel_class.create!(args.merge(chatable: self))
+    end
+
+    def create_chat_channel(**args)
+      channel_class.create(args.merge(chatable: self))
+    end
+
+    private
+
+    def channel_class
+      case self
+      when Chat::DirectMessage
+        Chat::DirectMessageChannel
+      when Category
+        Chat::CategoryChannel
+      else
+        raise("Unknown chatable #{self}")
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/models/concerns/chat/thread_cache.rb b/plugins/chat/app/models/concerns/chat/thread_cache.rb
new file mode 100644
index 00000000000..97fbad5a4da
--- /dev/null
+++ b/plugins/chat/app/models/concerns/chat/thread_cache.rb
@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+module Chat
+  module ThreadCache
+    extend ActiveSupport::Concern
+
+    class_methods do
+      def replies_count_cache_updated_at_redis_key(id)
+        "chat_thread:replies_count_cache_updated_at:#{id}"
+      end
+
+      def replies_count_cache_redis_key(id)
+        "chat_thread:replies_count_cache:#{id}"
+      end
+
+      def clear_caches!(ids)
+        ids = Array.wrap(ids)
+        keys_to_delete =
+          ids
+            .map do |id|
+              [replies_count_cache_redis_key(id), replies_count_cache_updated_at_redis_key(id)]
+            end
+            .flatten
+        Discourse.redis.del(keys_to_delete)
+      end
+    end
+
+    def replies_count_cache_recently_updated?
+      replies_count_cache_updated_at.after?(5.minutes.ago)
+    end
+
+    def replies_count_cache_updated_at
+      Time.at(
+        Discourse.redis.get(Chat::Thread.replies_count_cache_updated_at_redis_key(self.id)).to_i,
+        in: Time.zone,
+      )
+    end
+
+    def replies_count_cache
+      redis_cache = Discourse.redis.get(Chat::Thread.replies_count_cache_redis_key(self.id))&.to_i
+
+      # If the cache is not present for whatever reason, set it to the current value,
+      # otherwise INCR/DECR will be way off. No need to enqueue the job or publish,
+      # since this is likely fetched by a serializer.
+      if !redis_cache.present?
+        set_replies_count_redis_cache(self.replies_count)
+        self.replies_count
+      else
+        redis_cache != self.replies_count ? redis_cache : self.replies_count
+      end
+    end
+
+    def set_replies_count_cache(value, update_db: false)
+      self.update!(replies_count: value) if update_db
+      set_replies_count_redis_cache(value)
+      thread_reply_count_cache_changed
+    end
+
+    def set_replies_count_redis_cache(value)
+      Discourse.redis.setex(
+        Chat::Thread.replies_count_cache_redis_key(self.id),
+        5.minutes.from_now.to_i,
+        value,
+      )
+    end
+
+    def increment_replies_count_cache
+      Discourse.redis.incr(Chat::Thread.replies_count_cache_redis_key(self.id))
+      thread_reply_count_cache_changed
+    end
+
+    def decrement_replies_count_cache
+      Discourse.redis.decr(Chat::Thread.replies_count_cache_redis_key(self.id))
+      thread_reply_count_cache_changed
+    end
+
+    def thread_reply_count_cache_changed
+      Jobs.enqueue_in(5.seconds, Jobs::Chat::UpdateThreadReplyCount, thread_id: self.id)
+    end
+  end
+end
diff --git a/plugins/chat/app/models/concerns/chat/type_mappable.rb b/plugins/chat/app/models/concerns/chat/type_mappable.rb
new file mode 100644
index 00000000000..ab8dff1a799
--- /dev/null
+++ b/plugins/chat/app/models/concerns/chat/type_mappable.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Chat
+  module TypeMappable
+    extend ActiveSupport::Concern
+
+    class_methods do
+      def sti_class_mapping = {}
+      def polymorphic_class_mapping = {}
+
+      # the model used when loading type column
+      def sti_class_for(name)
+        sti_class_mapping[name] || super
+      end
+
+      # the type column value
+      def sti_name
+        sti_class_mapping.invert[self] || super
+      end
+
+      # the model used when loading *_type column (e.g. 'chatable_type')
+      def polymorphic_class_for(name)
+        polymorphic_class_mapping[name] || super
+      end
+
+      # the *_type column value (e.g. 'chatable_type')
+      def polymorphic_name
+        polymorphic_class_mapping.invert[self] || super
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/models/concerns/chatable.rb b/plugins/chat/app/models/concerns/chatable.rb
deleted file mode 100644
index 2128a7cf4e4..00000000000
--- a/plugins/chat/app/models/concerns/chatable.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Chatable
-  extend ActiveSupport::Concern
-
-  def chat_channel
-    channel_class.new(chatable: self)
-  end
-
-  def create_chat_channel!(**args)
-    channel_class.create!(args.merge(chatable: self))
-  end
-
-  private
-
-  def channel_class
-    "#{self.class}Channel".safe_constantize || raise("Unknown chatable #{self}")
-  end
-end
diff --git a/plugins/chat/app/models/deleted_chat_user.rb b/plugins/chat/app/models/deleted_chat_user.rb
deleted file mode 100644
index 3d6222a4a9b..00000000000
--- a/plugins/chat/app/models/deleted_chat_user.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-class DeletedChatUser < User
-  def username
-    I18n.t("chat.deleted_chat_username")
-  end
-
-  def avatar_template
-    "/plugins/chat/images/deleted-chat-user-avatar.png"
-  end
-
-  def bot?
-    false
-  end
-end
diff --git a/plugins/chat/app/models/direct_message.rb b/plugins/chat/app/models/direct_message.rb
deleted file mode 100644
index 40ad99c4723..00000000000
--- a/plugins/chat/app/models/direct_message.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-# frozen_string_literal: true
-
-class DirectMessage < ActiveRecord::Base
-  self.table_name = "direct_message_channels"
-
-  include Chatable
-
-  has_many :direct_message_users, foreign_key: :direct_message_channel_id
-  has_many :users, through: :direct_message_users
-
-  def self.for_user_ids(user_ids)
-    joins(:users)
-      .group("direct_message_channels.id")
-      .having("ARRAY[?] = ARRAY_AGG(users.id ORDER BY users.id)", user_ids.sort)
-      &.first
-  end
-
-  def user_can_access?(user)
-    users.include?(user)
-  end
-
-  def chat_channel_title_for_user(chat_channel, acting_user)
-    users =
-      (direct_message_users.map(&:user) - [acting_user]).map { |user| user || DeletedChatUser.new }
-
-    # direct message to self
-    if users.empty?
-      return I18n.t("chat.channel.dm_title.single_user", user: "@#{acting_user.username}")
-    end
-
-    # all users deleted
-    return chat_channel.id if !users.first
-
-    usernames_formatted = users.sort_by(&:username).map { |u| "@#{u.username}" }
-    if usernames_formatted.size > 5
-      return(
-        I18n.t(
-          "chat.channel.dm_title.multi_user_truncated",
-          users: usernames_formatted[0..4].join(", "),
-          leftover: usernames_formatted.length - 5,
-        )
-      )
-    end
-
-    I18n.t("chat.channel.dm_title.multi_user", users: usernames_formatted.join(", "))
-  end
-end
-
-# == Schema Information
-#
-# Table name: direct_message_channels
-#
-#  id         :bigint           not null, primary key
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
-#
diff --git a/plugins/chat/app/models/direct_message_channel.rb b/plugins/chat/app/models/direct_message_channel.rb
deleted file mode 100644
index 9d116643d7e..00000000000
--- a/plugins/chat/app/models/direct_message_channel.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-class DirectMessageChannel < ChatChannel
-  alias_attribute :direct_message, :chatable
-
-  def direct_message_channel?
-    true
-  end
-
-  def allowed_user_ids
-    direct_message.user_ids
-  end
-
-  def read_restricted?
-    true
-  end
-
-  def title(user)
-    direct_message.chat_channel_title_for_user(self, user)
-  end
-
-  def ensure_slug_ok
-    true
-  end
-
-  def generate_auto_slug
-    self.slug = nil
-  end
-end
diff --git a/plugins/chat/app/models/reviewable_chat_message.rb b/plugins/chat/app/models/reviewable_chat_message.rb
deleted file mode 100644
index 75f03f305c7..00000000000
--- a/plugins/chat/app/models/reviewable_chat_message.rb
+++ /dev/null
@@ -1,149 +0,0 @@
-# frozen_string_literal: true
-
-require_dependency "reviewable"
-
-class ReviewableChatMessage < Reviewable
-  def self.action_aliases
-    {
-      agree_and_keep_hidden: :agree_and_delete,
-      agree_and_silence: :agree_and_delete,
-      agree_and_suspend: :agree_and_delete,
-      delete_and_agree: :agree_and_delete,
-    }
-  end
-
-  def self.score_to_silence_user
-    sensitivity_score(SiteSetting.chat_silence_user_sensitivity, scale: 0.6)
-  end
-
-  def chat_message
-    @chat_message ||= (target || ChatMessage.with_deleted.find_by(id: target_id))
-  end
-
-  def chat_message_creator
-    @chat_message_creator ||= chat_message.user
-  end
-
-  def flagged_by_user_ids
-    @flagged_by_user_ids ||= reviewable_scores.map(&:user_id)
-  end
-
-  def post
-    nil
-  end
-
-  def build_actions(actions, guardian, args)
-    return unless pending?
-    return if chat_message.blank?
-
-    agree =
-      actions.add_bundle("#{id}-agree", icon: "thumbs-up", label: "reviewables.actions.agree.title")
-
-    if chat_message.deleted_at?
-      build_action(actions, :agree_and_restore, icon: "far-eye", bundle: agree)
-      build_action(actions, :agree_and_keep_deleted, icon: "thumbs-up", bundle: agree)
-      build_action(actions, :disagree_and_restore, icon: "thumbs-down")
-    else
-      build_action(actions, :agree_and_delete, icon: "far-eye-slash", bundle: agree)
-      build_action(actions, :agree_and_keep_message, icon: "thumbs-up", bundle: agree)
-      build_action(actions, :disagree, icon: "thumbs-down")
-    end
-
-    if guardian.can_suspend?(chat_message_creator)
-      build_action(
-        actions,
-        :agree_and_suspend,
-        icon: "ban",
-        bundle: agree,
-        client_action: "suspend",
-      )
-      build_action(
-        actions,
-        :agree_and_silence,
-        icon: "microphone-slash",
-        bundle: agree,
-        client_action: "silence",
-      )
-    end
-
-    build_action(actions, :ignore, icon: "external-link-alt")
-
-    build_action(actions, :delete_and_agree, icon: "far-trash-alt") unless chat_message.deleted_at?
-  end
-
-  def perform_agree_and_keep_message(performed_by, args)
-    agree
-  end
-
-  def perform_agree_and_restore(performed_by, args)
-    agree { chat_message.recover! }
-  end
-
-  def perform_agree_and_delete(performed_by, args)
-    agree { chat_message.trash!(performed_by) }
-  end
-
-  def perform_disagree_and_restore(performed_by, args)
-    disagree { chat_message.recover! }
-  end
-
-  def perform_disagree(performed_by, args)
-    disagree
-  end
-
-  def perform_ignore(performed_by, args)
-    ignore
-  end
-
-  def perform_delete_and_ignore(performed_by, args)
-    ignore { chat_message.trash!(performed_by) }
-  end
-
-  private
-
-  def agree
-    yield if block_given?
-    create_result(:success, :approved) do |result|
-      result.update_flag_stats = { status: :agreed, user_ids: flagged_by_user_ids }
-      result.recalculate_score = true
-    end
-  end
-
-  def disagree
-    yield if block_given?
-
-    UserSilencer.unsilence(chat_message_creator)
-
-    create_result(:success, :rejected) do |result|
-      result.update_flag_stats = { status: :disagreed, user_ids: flagged_by_user_ids }
-      result.recalculate_score = true
-    end
-  end
-
-  def ignore
-    yield if block_given?
-    create_result(:success, :ignored) do |result|
-      result.update_flag_stats = { status: :ignored, user_ids: flagged_by_user_ids }
-    end
-  end
-
-  def build_action(
-    actions,
-    id,
-    icon:,
-    button_class: nil,
-    bundle: nil,
-    client_action: nil,
-    confirm: false
-  )
-    actions.add(id, bundle: bundle) do |action|
-      prefix = "reviewables.actions.#{id}"
-      action.icon = icon
-      action.button_class = button_class
-      action.label = "chat.#{prefix}.title"
-      action.description = "chat.#{prefix}.description"
-      action.client_action = client_action
-      action.confirm_message = "#{prefix}.confirm" if confirm
-    end
-  end
-end
diff --git a/plugins/chat/app/policies/chat/direct_message_channel/can_communicate_all_parties_policy.rb b/plugins/chat/app/policies/chat/direct_message_channel/can_communicate_all_parties_policy.rb
new file mode 100644
index 00000000000..76b7ef5a83f
--- /dev/null
+++ b/plugins/chat/app/policies/chat/direct_message_channel/can_communicate_all_parties_policy.rb
@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+class Chat::DirectMessageChannel::CanCommunicateAllPartiesPolicy < PolicyBase
+  delegate :target_users, :user_comm_screener, to: :context
+
+  def call
+    acting_user_can_message_all_target_users? &&
+      acting_user_not_preventing_messages_from_any_target_users? &&
+      acting_user_not_ignoring_any_target_users? && acting_user_not_muting_any_target_users?
+  end
+
+  def reason
+    if !acting_user_can_message_all_target_users?
+      I18n.t("chat.errors.not_accepting_dms", username: actor_cannot_message_user.username)
+    elsif !acting_user_not_preventing_messages_from_any_target_users?
+      I18n.t(
+        "chat.errors.actor_preventing_target_user_from_dm",
+        username: actor_disallowing_pm_user.username,
+      )
+    elsif !acting_user_not_ignoring_any_target_users?
+      I18n.t("chat.errors.actor_ignoring_target_user", username: actor_ignoring_user.username)
+    elsif !acting_user_not_muting_any_target_users?
+      I18n.t("chat.errors.actor_muting_target_user", username: actor_muting_user.username)
+    end
+  end
+
+  private
+
+  def acting_user_can_message_all_target_users?
+    @acting_user_can_message_all_target_users ||=
+      user_comm_screener.preventing_actor_communication.none?
+  end
+
+  def acting_user_not_preventing_messages_from_any_target_users?
+    @acting_user_not_preventing_messages_from_any_target_users ||=
+      !user_comm_screener.actor_disallowing_any_pms?(target_users_without_self.map(&:id))
+  end
+
+  def acting_user_not_ignoring_any_target_users?
+    @acting_user_not_ignoring_any_target_users ||= actor_ignoring_user.blank?
+  end
+
+  def acting_user_not_muting_any_target_users?
+    @acting_user_not_muting_any_target_users ||= actor_muting_user.blank?
+  end
+
+  def actor_cannot_message_user
+    target_users_without_self.find do |user|
+      user.id == user_comm_screener.preventing_actor_communication.first
+    end
+  end
+
+  def actor_disallowing_pm_user
+    target_users_without_self.find do |target_user|
+      user_comm_screener.actor_disallowing_pms?(target_user.id)
+    end
+  end
+
+  def actor_ignoring_user
+    target_users_without_self.find do |target_user|
+      user_comm_screener.actor_ignoring?(target_user.id)
+    end
+  end
+
+  def actor_muting_user
+    target_users_without_self.find do |target_user|
+      user_comm_screener.actor_muting?(target_user.id)
+    end
+  end
+
+  def target_users_without_self
+    @target_users_without_self ||= target_users.reject { |user| user.id == guardian.user.id }
+  end
+end
diff --git a/plugins/chat/app/policies/chat/direct_message_channel/max_users_excess_policy.rb b/plugins/chat/app/policies/chat/direct_message_channel/max_users_excess_policy.rb
new file mode 100644
index 00000000000..86124ff2435
--- /dev/null
+++ b/plugins/chat/app/policies/chat/direct_message_channel/max_users_excess_policy.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class Chat::DirectMessageChannel::MaxUsersExcessPolicy < PolicyBase
+  delegate :target_users, to: :context
+
+  def call
+    guardian.is_staff? ||
+      target_users_without_self.size <= SiteSetting.chat_max_direct_message_users
+  end
+
+  def reason
+    return I18n.t("chat.errors.over_chat_max_direct_message_users_allow_self") if no_dm?
+    I18n.t(
+      "chat.errors.over_chat_max_direct_message_users",
+      count: SiteSetting.chat_max_direct_message_users + 1, # +1 for the acting user
+    )
+  end
+
+  private
+
+  def no_dm?
+    SiteSetting.chat_max_direct_message_users.zero?
+  end
+
+  def target_users_without_self
+    target_users.reject { |user| user.id == guardian.user.id }
+  end
+end
diff --git a/plugins/chat/app/policies/policy_base.rb b/plugins/chat/app/policies/policy_base.rb
new file mode 100644
index 00000000000..90f79aa106a
--- /dev/null
+++ b/plugins/chat/app/policies/policy_base.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class PolicyBase
+  attr_reader :context
+
+  delegate :guardian, to: :context
+
+  def initialize(context)
+    @context = context
+  end
+
+  def call
+    raise "Not implemented"
+  end
+
+  def reason
+    raise "Not implemented"
+  end
+end
diff --git a/plugins/chat/app/queries/chat/channel_memberships_query.rb b/plugins/chat/app/queries/chat/channel_memberships_query.rb
new file mode 100644
index 00000000000..294ca724c89
--- /dev/null
+++ b/plugins/chat/app/queries/chat/channel_memberships_query.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Chat
+  class ChannelMembershipsQuery
+    def self.call(channel:, limit: 50, offset: 0, username: nil, count_only: false)
+      query =
+        Chat::UserChatChannelMembership
+          .joins(:user)
+          .includes(:user)
+          .where(user: User.activated.not_suspended.not_staged)
+          .where(chat_channel: channel, following: true)
+
+      return query.count if count_only
+
+      if channel.category_channel? && channel.read_restricted? && channel.allowed_group_ids
+        query =
+          query.where(
+            "user_id IN (SELECT user_id FROM group_users WHERE group_id IN (?))",
+            channel.allowed_group_ids,
+          )
+      end
+
+      if username.present?
+        if SiteSetting.prioritize_username_in_ux || !SiteSetting.enable_names
+          query = query.where("users.username_lower ILIKE ?", "%#{username}%")
+        else
+          query =
+            query.where(
+              "LOWER(users.name) ILIKE ? OR users.username_lower ILIKE ?",
+              "%#{username}%",
+              "%#{username}%",
+            )
+        end
+      end
+
+      if SiteSetting.prioritize_username_in_ux || !SiteSetting.enable_names
+        query = query.order("users.username_lower ASC")
+      else
+        query = query.order("users.name ASC, users.username_lower ASC")
+      end
+
+      query.offset(offset).limit(limit)
+    end
+
+    def self.count(channel)
+      call(channel: channel, count_only: true)
+    end
+  end
+end
diff --git a/plugins/chat/app/queries/chat/channel_unreads_query.rb b/plugins/chat/app/queries/chat/channel_unreads_query.rb
new file mode 100644
index 00000000000..972ce7942fd
--- /dev/null
+++ b/plugins/chat/app/queries/chat/channel_unreads_query.rb
@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+module Chat
+  ##
+  # Handles counting unread messages and mentions for a list of channels.
+  # This is used for unread indicators in the chat UI. By default only the
+  # channels that the user is a member of will be counted and returned in
+  # the result.
+  class ChannelUnreadsQuery
+    # NOTE: This is arbitrary at this point in time, we may want to increase
+    # or decrease this as we find performance issues.
+    MAX_CHANNELS = 1000
+
+    ##
+    # @param channel_ids [Array<Integer>] The IDs of the channels to count.
+    # @param user_id [Integer] The ID of the user to count for.
+    # @param include_missing_memberships [Boolean] Whether to include channels
+    #   that the user is not a member of. These counts will always be 0.
+    # @param include_read [Boolean] Whether to include channels that the user
+    #   is a member of where they have read all the messages. This overrides
+    #   include_missing_memberships.
+    def self.call(channel_ids:, user_id:, include_missing_memberships: false, include_read: true)
+      sql = <<~SQL
+        SELECT (
+          SELECT COUNT(*) AS unread_count
+          FROM chat_messages
+          INNER JOIN chat_channels ON chat_channels.id = chat_messages.chat_channel_id
+          INNER JOIN user_chat_channel_memberships ON user_chat_channel_memberships.chat_channel_id = chat_channels.id
+          LEFT JOIN chat_threads ON chat_threads.id = chat_messages.thread_id
+          WHERE chat_channels.id = memberships.chat_channel_id
+          AND user_chat_channel_memberships.user_id = :user_id
+          AND chat_messages.id > COALESCE(user_chat_channel_memberships.last_read_message_id, 0)
+          AND chat_messages.deleted_at IS NULL
+          AND (chat_messages.thread_id IS NULL OR chat_messages.id = chat_threads.original_message_id)
+          AND NOT user_chat_channel_memberships.muted
+        ) AS unread_count,
+        (
+          SELECT COUNT(*) AS mention_count
+          FROM notifications
+          INNER JOIN user_chat_channel_memberships ON user_chat_channel_memberships.user_id = :user_id
+          INNER JOIN chat_messages ON (data::json->>'chat_message_id')::bigint = chat_messages.id
+          LEFT JOIN chat_threads ON chat_threads.id = chat_messages.thread_id
+          WHERE NOT read
+          AND user_chat_channel_memberships.chat_channel_id = memberships.chat_channel_id
+          AND notifications.user_id = :user_id
+          AND notifications.notification_type = :notification_type
+          AND (data::json->>'chat_message_id')::bigint > COALESCE(user_chat_channel_memberships.last_read_message_id, 0)
+          AND (data::json->>'chat_channel_id')::bigint = memberships.chat_channel_id
+          AND (chat_messages.thread_id IS NULL OR chat_messages.id = chat_threads.original_message_id)
+        ) AS mention_count,
+        memberships.chat_channel_id AS channel_id
+        FROM user_chat_channel_memberships AS memberships
+        WHERE memberships.user_id = :user_id AND memberships.chat_channel_id IN (:channel_ids)
+        GROUP BY memberships.chat_channel_id
+        #{include_missing_memberships ? "" : "LIMIT :limit"}
+      SQL
+
+      sql = <<~SQL if !include_read
+        SELECT * FROM (
+          #{sql}
+        ) AS channel_tracking
+        WHERE (unread_count > 0 OR mention_count > 0)
+      SQL
+
+      sql += <<~SQL if include_missing_memberships && include_read
+        UNION ALL
+        SELECT 0 AS unread_count, 0 AS mention_count, chat_channels.id AS channel_id
+        FROM chat_channels
+        LEFT JOIN user_chat_channel_memberships ON user_chat_channel_memberships.chat_channel_id = chat_channels.id
+          AND user_chat_channel_memberships.user_id = :user_id
+        WHERE chat_channels.id IN (:channel_ids) AND user_chat_channel_memberships.id IS NULL
+        GROUP BY chat_channels.id
+        LIMIT :limit
+      SQL
+
+      DB.query(
+        sql,
+        channel_ids: channel_ids,
+        user_id: user_id,
+        notification_type: Notification.types[:chat_mention],
+        limit: MAX_CHANNELS,
+      )
+    end
+  end
+end
diff --git a/plugins/chat/app/queries/chat/messages_query.rb b/plugins/chat/app/queries/chat/messages_query.rb
new file mode 100644
index 00000000000..8a888ec6a22
--- /dev/null
+++ b/plugins/chat/app/queries/chat/messages_query.rb
@@ -0,0 +1,189 @@
+# frozen_string_literal: true
+
+module Chat
+  # Queries messages for a specific channel. This can be used in two modes:
+  #
+  # 1. Query messages around a target_message_id or target_date. This is used
+  #    when a user needs to jump to the middle of a messages stream or load
+  #    around a target. There is no pagination or direction
+  #    here, just a limit on past and future messages.
+  # 2. Query messages with paginations and direction. This is used for normal
+  #    scrolling of the messages stream of a channel.
+  #
+  # In both scenarios a thread_id can be provided to only get messages related
+  # to that thread within the channel.
+  #
+  # It is assumed that the user's permission to view the channel has already been
+  # established by the caller.
+  class MessagesQuery
+    PAST_MESSAGE_LIMIT = 25
+    FUTURE_MESSAGE_LIMIT = 25
+    PAST = "past"
+    FUTURE = "future"
+    VALID_DIRECTIONS = [PAST, FUTURE]
+    MAX_PAGE_SIZE = 50
+
+    # @param channel [Chat::Channel] The channel to query messages within.
+    # @param guardian [Guardian] The guardian to use for permission checks.
+    # @param thread_id [Integer] (optional) The thread ID to filter messages by.
+    # @param target_message_id [Integer] (optional) The message ID to query around.
+    #   It is assumed that the caller already checked if this exists.
+    # @param target_date [String] (optional) The date to query around.
+    # @param include_thread_messages [Boolean] (optional) Whether to include messages
+    #   that are linked to a thread.
+    # @param page_size [Integer] (optional) The number of messages to fetch when not
+    #   using the target_message_id param.
+    # @param direction [String] (optional) The direction to fetch messages in when not
+    #   using the target_message_id param. Must be valid. If not provided, only the
+    #   latest messages for the channel are loaded.
+    def self.call(
+      channel:,
+      guardian:,
+      thread_id: nil,
+      target_message_id: nil,
+      include_thread_messages: false,
+      page_size: PAST_MESSAGE_LIMIT + FUTURE_MESSAGE_LIMIT,
+      direction: nil,
+      target_date: nil
+    )
+      messages = base_query(channel: channel)
+      messages = messages.with_deleted if guardian.can_moderate_chat?(channel.chatable)
+      if thread_id.present?
+        include_thread_messages = true
+        messages = messages.where(thread_id: thread_id)
+      end
+      messages = messages.where(<<~SQL, channel_id: channel.id) if !include_thread_messages
+        chat_messages.thread_id IS NULL OR chat_messages.id IN (
+          SELECT original_message_id
+          FROM chat_threads
+          WHERE chat_threads.channel_id = :channel_id
+        )
+      SQL
+
+      if target_message_id.present? && direction.blank?
+        query_around_target(target_message_id, channel, messages)
+      else
+        if target_date.present?
+          query_by_date(target_date, channel, messages)
+        else
+          query_paginated_messages(direction, page_size, channel, messages, target_message_id)
+        end
+      end
+    end
+
+    def self.base_query(channel:)
+      query =
+        Chat::Message
+          .includes(in_reply_to: [:user, chat_webhook_event: [:incoming_chat_webhook]])
+          .includes(:revisions)
+          .includes(user: :primary_group)
+          .includes(chat_webhook_event: :incoming_chat_webhook)
+          .includes(reactions: :user)
+          .includes(:bookmarks)
+          .includes(:uploads)
+          .includes(chat_channel: :chatable)
+          .includes(thread: %i[original_message last_message])
+          .where(chat_channel_id: channel.id)
+
+      if SiteSetting.enable_user_status
+        query = query.includes(user: :user_status)
+        query = query.includes(chat_mentions: { user: :user_status })
+      else
+        query = query.includes(chat_mentions: :user)
+      end
+
+      query
+    end
+
+    def self.query_around_target(target_message_id, channel, messages)
+      target_message = base_query(channel: channel).with_deleted.find_by(id: target_message_id)
+
+      past_messages =
+        messages
+          .where("created_at < ?", target_message.created_at)
+          .order(created_at: :desc)
+          .limit(PAST_MESSAGE_LIMIT)
+          .to_a
+
+      future_messages =
+        messages
+          .where("created_at > ?", target_message.created_at)
+          .order(created_at: :asc)
+          .limit(FUTURE_MESSAGE_LIMIT)
+          .to_a
+
+      can_load_more_past = past_messages.size == PAST_MESSAGE_LIMIT
+      can_load_more_future = future_messages.size == FUTURE_MESSAGE_LIMIT
+
+      {
+        past_messages: past_messages,
+        future_messages: future_messages,
+        target_message: target_message,
+        can_load_more_past: can_load_more_past,
+        can_load_more_future: can_load_more_future,
+      }
+    end
+
+    def self.query_paginated_messages(
+      direction,
+      page_size,
+      channel,
+      messages,
+      target_message_id = nil
+    )
+      page_size = [page_size || MAX_PAGE_SIZE, MAX_PAGE_SIZE].min
+
+      if target_message_id.present?
+        condition = direction == PAST ? "<" : ">"
+        messages = messages.where("id #{condition} ?", target_message_id.to_i)
+      end
+
+      order = direction == FUTURE ? "ASC" : "DESC"
+      messages = messages.order("created_at #{order}, id #{order}").limit(page_size).to_a
+
+      if direction == FUTURE
+        can_load_more_future = messages.size == page_size
+      elsif direction == PAST
+        can_load_more_past = messages.size == page_size
+      else
+        # When direction is blank, we'll return the latest messages.
+        can_load_more_future = false
+        can_load_more_past = messages.size == page_size
+      end
+
+      {
+        messages: direction == FUTURE ? messages : messages.reverse,
+        can_load_more_past: can_load_more_past,
+        can_load_more_future: can_load_more_future,
+      }
+    end
+
+    def self.query_by_date(target_date, channel, messages)
+      past_messages =
+        messages
+          .where("created_at <= ?", target_date)
+          .order(created_at: :desc)
+          .limit(PAST_MESSAGE_LIMIT)
+          .to_a
+
+      future_messages =
+        messages
+          .where("created_at > ?", target_date)
+          .order(created_at: :asc)
+          .limit(FUTURE_MESSAGE_LIMIT)
+          .to_a
+
+      can_load_more_past = past_messages.size == PAST_MESSAGE_LIMIT
+      can_load_more_future = future_messages.size == FUTURE_MESSAGE_LIMIT
+
+      {
+        target_message_id: future_messages.first&.id,
+        past_messages: past_messages,
+        future_messages: future_messages,
+        target_date: target_date,
+        can_load_more_past: can_load_more_past,
+        can_load_more_future: can_load_more_future,
+      }
+    end
+  end
+end
diff --git a/plugins/chat/app/queries/chat/thread_participant_query.rb b/plugins/chat/app/queries/chat/thread_participant_query.rb
new file mode 100644
index 00000000000..7c1d7d0488a
--- /dev/null
+++ b/plugins/chat/app/queries/chat/thread_participant_query.rb
@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+
+module Chat
+  # Builds a query to find the total count of participants for one
+  # or more threads (on a per-thread basis), as well as up to 3
+  # participants in the thread. The participants will be made up
+  # of:
+  #
+  # - Participant 1 & 2 - The most frequent participants in the thread.
+  # - Participant 3 - The most recent participant in the thread.
+  #
+  # This result should be cached to avoid unnecessary queries,
+  # since the participants will not often change for a thread,
+  # and if there is a delay in updating them based on message
+  # count it is not a big deal.
+  class ThreadParticipantQuery
+    # @param thread_ids [Array<Integer>] The IDs of the threads to query.
+    # @return [Hash<Integer, Hash>] A hash of thread IDs to participant data.
+    def self.call(thread_ids:)
+      return {} if thread_ids.blank?
+
+      # We only want enough data for BasicUserSerializer, since the participants
+      # are just showing username & avatar.
+      thread_participant_stats = DB.query(<<~SQL, thread_ids: thread_ids)
+        SELECT thread_participant_stats.*, users.username, users.name, users.uploaded_avatar_id FROM (
+          SELECT chat_messages.thread_id, chat_messages.user_id, COUNT(*) AS message_count,
+            ROW_NUMBER() OVER (PARTITION BY chat_messages.thread_id ORDER BY COUNT(*) DESC) AS row_number
+          FROM chat_messages
+          INNER JOIN chat_threads ON chat_threads.id = chat_messages.thread_id
+          INNER JOIN user_chat_thread_memberships ON user_chat_thread_memberships.thread_id = chat_threads.id
+            AND user_chat_thread_memberships.user_id = chat_messages.user_id
+          WHERE chat_messages.thread_id IN (:thread_ids)
+          AND chat_messages.deleted_at IS NULL
+          GROUP BY chat_messages.thread_id, chat_messages.user_id
+        ) AS thread_participant_stats
+        INNER JOIN users ON users.id = thread_participant_stats.user_id
+        ORDER BY thread_participant_stats.thread_id ASC, thread_participant_stats.message_count DESC, thread_participant_stats.user_id ASC
+      SQL
+
+      most_recent_participants = DB.query(<<~SQL, thread_ids: thread_ids)
+        SELECT DISTINCT ON (thread_id) chat_messages.thread_id, chat_messages.user_id,
+          users.username, users.name, users.uploaded_avatar_id
+        FROM chat_messages
+        INNER JOIN chat_threads ON chat_threads.id = chat_messages.thread_id
+        INNER JOIN user_chat_thread_memberships ON user_chat_thread_memberships.thread_id = chat_threads.id
+          AND user_chat_thread_memberships.user_id = chat_messages.user_id
+        INNER JOIN users ON users.id = chat_messages.user_id
+        WHERE chat_messages.thread_id IN (:thread_ids)
+        AND chat_messages.deleted_at IS NULL
+        ORDER BY chat_messages.thread_id ASC, chat_messages.created_at DESC
+      SQL
+      most_recent_participants =
+        most_recent_participants.reduce({}) do |hash, mrm|
+          hash[mrm.thread_id] = {
+            id: mrm.user_id,
+            username: mrm.username,
+            name: mrm.name,
+            uploaded_avatar_id: mrm.uploaded_avatar_id,
+          }
+          hash
+        end
+
+      thread_participants = {}
+      thread_participant_stats.each do |thread_participant_stat|
+        thread_id = thread_participant_stat.thread_id
+        thread_participants[thread_id] ||= {}
+        thread_participants[thread_id][:users] ||= []
+        thread_participants[thread_id][:total_count] ||= 0
+
+        # If we want to return more of the top N users in the thread we
+        # can just increase the number here.
+        if thread_participants[thread_id][:users].length < 2 &&
+             thread_participant_stat.user_id != most_recent_participants[thread_id][:id]
+          thread_participants[thread_id][:users].push(
+            {
+              id: thread_participant_stat.user_id,
+              username: thread_participant_stat.username,
+              name: thread_participant_stat.name,
+              uploaded_avatar_id: thread_participant_stat.uploaded_avatar_id,
+            },
+          )
+        end
+
+        thread_participants[thread_id][:total_count] += 1
+      end
+
+      # Always put the most recent participant at the end of the array.
+      most_recent_participants.each do |thread_id, user|
+        thread_participants[thread_id][:users].push(user)
+      end
+
+      thread_participants
+    end
+  end
+end
diff --git a/plugins/chat/app/queries/chat/thread_unreads_query.rb b/plugins/chat/app/queries/chat/thread_unreads_query.rb
new file mode 100644
index 00000000000..fc724ff440e
--- /dev/null
+++ b/plugins/chat/app/queries/chat/thread_unreads_query.rb
@@ -0,0 +1,106 @@
+# frozen_string_literal: true
+
+module Chat
+  ##
+  # Handles counting unread messages scoped to threads for a list
+  # of channels. A list of thread IDs can be provided to further focus the query.
+  # Alternatively, a list of thread IDs can be provided by itself to only get
+  # specific threads regardless of channel.
+  #
+  # This is used for unread indicators in the chat UI. By default only the
+  # threads that the user is a member of will be counted and returned in
+  # the result. Only threads inside a channel that has threading_enabled
+  # will be counted.
+  class ThreadUnreadsQuery
+    # NOTE: This is arbitrary at this point in time, we may want to increase
+    # or decrease this as we find performance issues.
+    MAX_THREADS = 3000
+
+    ##
+    # @param channel_ids [Array<Integer>] (Optional) The IDs of the channels to count threads for.
+    #  If only this is provided, all threads across the channels provided will be counted.
+    # @param thread_ids [Array<Integer>] (Optional) The IDs of the threads to count. If this
+    #  is used in tandem with channel_ids, it will just further filter the results of
+    #  the thread counts from those channels.
+    # @param user_id [Integer] The ID of the user to count for.
+    # @param include_missing_memberships [Boolean] Whether to include threads
+    #   that the user is not a member of. These counts will always be 0.
+    # @param include_read [Boolean] Whether to include threads that the user
+    #   is a member of where they have read all the messages. This overrides
+    #   include_missing_memberships.
+    def self.call(
+      channel_ids: nil,
+      thread_ids: nil,
+      user_id:,
+      include_missing_memberships: false,
+      include_read: true
+    )
+      return [] if channel_ids.blank? && thread_ids.blank?
+
+      sql = <<~SQL
+        SELECT (
+          SELECT COUNT(*) AS unread_count
+          FROM chat_messages
+          INNER JOIN chat_channels ON chat_channels.id = chat_messages.chat_channel_id
+          INNER JOIN chat_threads ON chat_threads.id = chat_messages.thread_id AND chat_threads.channel_id = chat_messages.chat_channel_id
+          INNER JOIN user_chat_thread_memberships ON user_chat_thread_memberships.thread_id = chat_threads.id
+          INNER JOIN chat_messages AS original_message ON original_message.id = chat_threads.original_message_id
+          AND chat_messages.thread_id = memberships.thread_id
+          AND chat_messages.user_id != :user_id
+          AND user_chat_thread_memberships.user_id = :user_id
+          AND chat_messages.id > COALESCE(user_chat_thread_memberships.last_read_message_id, 0)
+          AND chat_messages.deleted_at IS NULL
+          AND chat_messages.thread_id IS NOT NULL
+          AND chat_messages.id != chat_threads.original_message_id
+          AND chat_channels.threading_enabled
+          AND user_chat_thread_memberships.notification_level NOT IN (:quiet_notification_levels)
+          AND original_message.deleted_at IS NULL
+        ) AS unread_count,
+        0 AS mention_count,
+        chat_threads.channel_id,
+        memberships.thread_id
+        FROM user_chat_thread_memberships AS memberships
+        INNER JOIN chat_threads ON chat_threads.id = memberships.thread_id
+        WHERE memberships.user_id = :user_id
+        #{channel_ids.present? ? "AND chat_threads.channel_id IN (:channel_ids)" : ""}
+        #{thread_ids.present? ? "AND chat_threads.id IN (:thread_ids)" : ""}
+        GROUP BY memberships.thread_id, chat_threads.channel_id
+        #{include_missing_memberships ? "" : "LIMIT :limit"}
+      SQL
+
+      sql = <<~SQL if !include_read
+          SELECT * FROM (
+            #{sql}
+          ) AS thread_tracking
+          WHERE (unread_count > 0 OR mention_count > 0)
+        SQL
+
+      sql += <<~SQL if include_missing_memberships && include_read
+        UNION ALL
+        SELECT 0 AS unread_count, 0 AS mention_count, chat_threads.channel_id, chat_threads.id AS thread_id
+        FROM chat_channels
+        INNER JOIN chat_threads ON chat_threads.channel_id = chat_channels.id
+        LEFT JOIN user_chat_thread_memberships ON user_chat_thread_memberships.thread_id = chat_threads.id
+          AND user_chat_thread_memberships.user_id = :user_id
+        WHERE user_chat_thread_memberships.id IS NULL
+        #{channel_ids.present? ? "AND chat_threads.channel_id IN (:channel_ids)" : ""}
+        #{thread_ids.present? ? "AND chat_threads.id IN (:thread_ids)" : ""}
+        GROUP BY chat_threads.id
+        LIMIT :limit
+      SQL
+
+      DB.query(
+        sql,
+        channel_ids: channel_ids,
+        thread_ids: thread_ids,
+        user_id: user_id,
+        notification_type: ::Notification.types[:chat_mention],
+        limit: MAX_THREADS,
+        quiet_notification_levels: [
+          ::Chat::UserChatThreadMembership.notification_levels[:muted],
+          ::Chat::UserChatThreadMembership.notification_levels[:normal],
+        ],
+      )
+    end
+  end
+end
diff --git a/plugins/chat/app/queries/chat/tracking_state_report_query.rb b/plugins/chat/app/queries/chat/tracking_state_report_query.rb
new file mode 100644
index 00000000000..21e1d21fa38
--- /dev/null
+++ b/plugins/chat/app/queries/chat/tracking_state_report_query.rb
@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+module Chat
+  # This class is responsible for querying the user's current tracking
+  # (read/unread) state based on membership for one or more channels
+  # and/or one or more threads.
+  #
+  # Only channels with threading_enabled set to true will have thread
+  # tracking queried.
+  #
+  # The unread counts are based on the user's last_read_message_id for
+  # each membership, as well as the notification_level (in the case of
+  # thread memberships) and the following/muted settings (in the case of
+  # channel memberships).
+  #
+  # @param guardian [Guardian] The current user's guardian
+  # @param channel_ids [Array<Integer>] The channel IDs to query. Must be provided
+  #   if thread_ids are not.
+  # @param thread_ids [Array<Integer>] The thread IDs to query. Must be provided
+  #   if channel_ids are not. If channel_ids are also provided then these just further
+  #   filter results.
+  # @param include_missing_memberships [Boolean] If true, will include channels
+  #   and threads where the user does not have a UserChatXMembership record,
+  #   with zeroed out unread counts.
+  # @param include_threads [Boolean] If true, will include thread tracking
+  #   state in the query, otherwise only channel tracking will be queried.
+  # @param include_read [Boolean] If true, will include tracking state where
+  #   the user has 0 unread messages. If false, will only include tracking state
+  #   where the user has > 0 unread messages. If include_missing_memberships is
+  #   also true, this overrides that option.
+  class TrackingStateReportQuery
+    def self.call(
+      guardian:,
+      channel_ids: nil,
+      thread_ids: nil,
+      include_missing_memberships: false,
+      include_threads: false,
+      include_read: true,
+      include_last_reply_details: false
+    )
+      report = ::Chat::TrackingStateReport.new
+
+      if channel_ids.blank?
+        report.channel_tracking = {}
+      else
+        report.channel_tracking =
+          ::Chat::ChannelUnreadsQuery
+            .call(
+              channel_ids: channel_ids,
+              user_id: guardian.user.id,
+              include_missing_memberships: include_missing_memberships,
+              include_read: include_read,
+            )
+            .map do |ct|
+              [ct.channel_id, { mention_count: ct.mention_count, unread_count: ct.unread_count }]
+            end
+            .to_h
+      end
+
+      if !include_threads || (thread_ids.blank? && channel_ids.blank?)
+        report.thread_tracking = {}
+      else
+        tracking =
+          ::Chat::ThreadUnreadsQuery.call(
+            channel_ids: channel_ids,
+            thread_ids: thread_ids,
+            user_id: guardian.user.id,
+            include_missing_memberships: include_missing_memberships,
+            include_read: include_read,
+          )
+
+        last_reply_details =
+          DB.query(<<~SQL, tracking.map(&:thread_id)) if include_last_reply_details
+            SELECT chat_threads.id AS thread_id, last_message.created_at
+            FROM chat_threads
+            INNER JOIN chat_messages AS last_message ON last_message.id = chat_threads.last_message_id
+            WHERE chat_threads.id IN (?)
+              AND last_message.deleted_at IS NULL
+          SQL
+
+        report.thread_tracking =
+          tracking
+            .map do |tt|
+              data = {
+                channel_id: tt.channel_id,
+                mention_count: tt.mention_count,
+                unread_count: tt.unread_count,
+              }
+
+              if include_last_reply_details
+                data[:last_reply_created_at] = last_reply_details
+                  .find { |details| details.thread_id == tt.thread_id }
+                  &.created_at
+              end
+
+              [tt.thread_id, data]
+            end
+            .to_h
+      end
+
+      report
+    end
+  end
+end
diff --git a/plugins/chat/app/queries/chat_channel_memberships_query.rb b/plugins/chat/app/queries/chat_channel_memberships_query.rb
deleted file mode 100644
index a257e0c0697..00000000000
--- a/plugins/chat/app/queries/chat_channel_memberships_query.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-class ChatChannelMembershipsQuery
-  def self.call(channel, limit: 50, offset: 0, username: nil, count_only: false)
-    query =
-      UserChatChannelMembership
-        .joins(:user)
-        .includes(:user)
-        .where(user: User.activated.not_suspended.not_staged)
-        .where(chat_channel: channel, following: true)
-
-    return query.count if count_only
-
-    if channel.category_channel? && channel.read_restricted? && channel.allowed_group_ids
-      query =
-        query.where(
-          "user_id IN (SELECT user_id FROM group_users WHERE group_id IN (?))",
-          channel.allowed_group_ids,
-        )
-    end
-
-    if username.present?
-      if SiteSetting.prioritize_username_in_ux || !SiteSetting.enable_names
-        query = query.where("users.username_lower ILIKE ?", "%#{username}%")
-      else
-        query =
-          query.where(
-            "LOWER(users.name) ILIKE ? OR users.username_lower ILIKE ?",
-            "%#{username}%",
-            "%#{username}%",
-          )
-      end
-    end
-
-    if SiteSetting.prioritize_username_in_ux || !SiteSetting.enable_names
-      query = query.order("users.username_lower ASC")
-    else
-      query = query.order("users.name ASC, users.username_lower ASC")
-    end
-
-    query.offset(offset).limit(limit)
-  end
-
-  def self.count(channel)
-    call(channel, count_only: true)
-  end
-end
diff --git a/plugins/chat/app/serializers/admin_chat_index_serializer.rb b/plugins/chat/app/serializers/admin_chat_index_serializer.rb
deleted file mode 100644
index c8af0dc2f19..00000000000
--- a/plugins/chat/app/serializers/admin_chat_index_serializer.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-class AdminChatIndexSerializer < ApplicationSerializer
-  has_many :chat_channels, serializer: ChatChannelSerializer, embed: :objects
-  has_many :incoming_chat_webhooks, serializer: IncomingChatWebhookSerializer, embed: :objects
-
-  def chat_channels
-    object[:chat_channels]
-  end
-
-  def incoming_chat_webhooks
-    object[:incoming_chat_webhooks]
-  end
-end
diff --git a/plugins/chat/app/serializers/base_chat_channel_membership_serializer.rb b/plugins/chat/app/serializers/base_chat_channel_membership_serializer.rb
deleted file mode 100644
index 90cb7827eed..00000000000
--- a/plugins/chat/app/serializers/base_chat_channel_membership_serializer.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-class BaseChatChannelMembershipSerializer < ApplicationSerializer
-  attributes :following,
-             :muted,
-             :desktop_notification_level,
-             :mobile_notification_level,
-             :chat_channel_id,
-             :last_read_message_id,
-             :unread_count,
-             :unread_mentions
-end
diff --git a/plugins/chat/app/serializers/chat/admin_chat_index_serializer.rb b/plugins/chat/app/serializers/chat/admin_chat_index_serializer.rb
new file mode 100644
index 00000000000..1a36d6cc584
--- /dev/null
+++ b/plugins/chat/app/serializers/chat/admin_chat_index_serializer.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Chat
+  class AdminChatIndexSerializer < ApplicationSerializer
+    has_many :chat_channels, serializer: Chat::ChannelSerializer, embed: :objects
+    has_many :incoming_chat_webhooks, serializer: Chat::IncomingWebhookSerializer, embed: :objects
+
+    def chat_channels
+      object[:chat_channels]
+    end
+
+    def incoming_chat_webhooks
+      object[:incoming_chat_webhooks]
+    end
+  end
+end
diff --git a/plugins/chat/app/serializers/chat/base_channel_membership_serializer.rb b/plugins/chat/app/serializers/chat/base_channel_membership_serializer.rb
new file mode 100644
index 00000000000..3b3b910ceeb
--- /dev/null
+++ b/plugins/chat/app/serializers/chat/base_channel_membership_serializer.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Chat
+  class BaseChannelMembershipSerializer < ApplicationSerializer
+    attributes :following,
+               :muted,
+               :desktop_notification_level,
+               :mobile_notification_level,
+               :chat_channel_id,
+               :last_read_message_id,
+               :last_viewed_at
+  end
+end
diff --git a/plugins/chat/app/serializers/chat/base_thread_membership_serializer.rb b/plugins/chat/app/serializers/chat/base_thread_membership_serializer.rb
new file mode 100644
index 00000000000..1f85493126e
--- /dev/null
+++ b/plugins/chat/app/serializers/chat/base_thread_membership_serializer.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Chat
+  class BaseThreadMembershipSerializer < ApplicationSerializer
+    attributes :notification_level, :thread_id, :last_read_message_id
+
+    def notification_level
+      Chat::UserChatThreadMembership.notification_levels[object.notification_level] ||
+        Chat::UserChatThreadMembership.notification_levels["normal"]
+    end
+  end
+end
diff --git a/plugins/chat/app/serializers/chat/channel_index_serializer.rb b/plugins/chat/app/serializers/chat/channel_index_serializer.rb
new file mode 100644
index 00000000000..31c3eebe286
--- /dev/null
+++ b/plugins/chat/app/serializers/chat/channel_index_serializer.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Chat
+  class ChannelIndexSerializer < ::Chat::StructuredChannelSerializer
+    attributes :global_presence_channel_state
+
+    def global_presence_channel_state
+      PresenceChannelStateSerializer.new(PresenceChannel.new("/chat/online").state, root: nil)
+    end
+  end
+end
diff --git a/plugins/chat/app/serializers/chat/channel_search_serializer.rb b/plugins/chat/app/serializers/chat/channel_search_serializer.rb
new file mode 100644
index 00000000000..196f9f78e29
--- /dev/null
+++ b/plugins/chat/app/serializers/chat/channel_search_serializer.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Chat
+  class ChannelSearchSerializer < ::Chat::StructuredChannelSerializer
+    has_many :users, serializer: BasicUserSerializer, embed: :objects
+
+    def users
+      object[:users]
+    end
+  end
+end
diff --git a/plugins/chat/app/serializers/chat/channel_serializer.rb b/plugins/chat/app/serializers/chat/channel_serializer.rb
new file mode 100644
index 00000000000..9ed2dcde225
--- /dev/null
+++ b/plugins/chat/app/serializers/chat/channel_serializer.rb
@@ -0,0 +1,164 @@
+# frozen_string_literal: true
+
+module Chat
+  class ChannelSerializer < ApplicationSerializer
+    attributes :id,
+               :auto_join_users,
+               :allow_channel_wide_mentions,
+               :chatable,
+               :chatable_id,
+               :chatable_type,
+               :chatable_url,
+               :description,
+               :title,
+               :slug,
+               :status,
+               :archive_failed,
+               :archive_completed,
+               :archived_messages,
+               :total_messages,
+               :archive_topic_id,
+               :memberships_count,
+               :current_user_membership,
+               :meta,
+               :threading_enabled
+
+    has_one :last_message, serializer: Chat::LastMessageSerializer, embed: :objects
+
+    def initialize(object, opts)
+      super(object, opts)
+
+      @opts = opts
+      @current_user_membership = opts[:membership]
+    end
+
+    def include_description?
+      object.description.present?
+    end
+
+    def memberships_count
+      object.user_count
+    end
+
+    def chatable_url
+      object.chatable_url
+    end
+
+    def title
+      object.name || object.title(scope.user)
+    end
+
+    def chatable
+      case object.chatable_type
+      when "Category"
+        BasicCategorySerializer.new(object.chatable, root: false).as_json
+      when "DirectMessage"
+        Chat::DirectMessageSerializer.new(object.chatable, scope: scope, root: false).as_json
+      when "Site"
+        nil
+      end
+    end
+
+    def archive
+      object.chat_channel_archive
+    end
+
+    def include_archive_status?
+      !object.direct_message_channel? && scope.is_staff? && archive.present?
+    end
+
+    def archive_completed
+      archive.complete?
+    end
+
+    def archive_failed
+      archive.failed?
+    end
+
+    def archived_messages
+      archive.archived_messages
+    end
+
+    def total_messages
+      archive.total_messages
+    end
+
+    def archive_topic_id
+      archive.destination_topic_id
+    end
+
+    def include_auto_join_users?
+      scope.can_edit_chat_channel?
+    end
+
+    def include_current_user_membership?
+      @current_user_membership.present?
+    end
+
+    def current_user_membership
+      @current_user_membership.chat_channel = object
+
+      Chat::BaseChannelMembershipSerializer.new(
+        @current_user_membership,
+        scope: scope,
+        root: false,
+      ).as_json
+    end
+
+    def meta
+      ids = {
+        channel_message_bus_last_id: channel_message_bus_last_id,
+        new_messages: new_messages_message_bus_id,
+        new_mentions: new_mentions_message_bus_id,
+      }
+
+      ids[:kick] = kick_message_bus_id if !object.direct_message_channel?
+      data = { message_bus_last_ids: ids }
+
+      if @opts.key?(:can_join_chat_channel)
+        data[:can_join_chat_channel] = @opts[:can_join_chat_channel]
+      else
+        data[:can_join_chat_channel] = scope.can_join_chat_channel?(object)
+      end
+
+      data[:can_flag] = scope.can_flag_in_chat_channel?(
+        object,
+        post_allowed_category_ids: @opts[:post_allowed_category_ids],
+      )
+      data[:user_silenced] = !scope.can_create_chat_message?
+      data[:can_moderate] = scope.can_moderate_chat?(object.chatable)
+      data[:can_delete_self] = scope.can_delete_own_chats?(object.chatable)
+      data[:can_delete_others] = scope.can_delete_other_chats?(object.chatable)
+
+      data
+    end
+
+    alias_method :include_archive_topic_id?, :include_archive_status?
+    alias_method :include_total_messages?, :include_archive_status?
+    alias_method :include_archived_messages?, :include_archive_status?
+    alias_method :include_archive_failed?, :include_archive_status?
+    alias_method :include_archive_completed?, :include_archive_status?
+
+    private
+
+    def channel_message_bus_last_id
+      @opts[:channel_message_bus_last_id] ||
+        MessageBus.last_id(Chat::Publisher.root_message_bus_channel(object.id))
+    end
+
+    def new_messages_message_bus_id
+      @opts[:new_messages_message_bus_last_id] ||
+        MessageBus.last_id(Chat::Publisher.new_messages_message_bus_channel(object.id))
+    end
+
+    def new_mentions_message_bus_id
+      @opts[:new_mentions_message_bus_last_id] ||
+        MessageBus.last_id(Chat::Publisher.new_mentions_message_bus_channel(object.id))
+    end
+
+    def kick_message_bus_id
+      @opts[:kick_message_bus_last_id] ||
+        MessageBus.last_id(Chat::Publisher.kick_users_message_bus_channel(object.id))
+    end
+  end
+end
diff --git a/plugins/chat/app/serializers/chat/chatable_user_serializer.rb b/plugins/chat/app/serializers/chat/chatable_user_serializer.rb
new file mode 100644
index 00000000000..1509174439e
--- /dev/null
+++ b/plugins/chat/app/serializers/chat/chatable_user_serializer.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Chat
+  class ChatableUserSerializer < ::Chat::UserWithCustomFieldsAndStatusSerializer
+    attributes :can_chat, :has_chat_enabled
+
+    def can_chat
+      SiteSetting.chat_enabled && scope.can_chat?
+    end
+
+    def has_chat_enabled
+      can_chat && object.user_option&.chat_enabled
+    end
+  end
+end
diff --git a/plugins/chat/app/serializers/chat/chatables_serializer.rb b/plugins/chat/app/serializers/chat/chatables_serializer.rb
new file mode 100644
index 00000000000..eada1f105cf
--- /dev/null
+++ b/plugins/chat/app/serializers/chat/chatables_serializer.rb
@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+module Chat
+  class ChatablesSerializer < ::ApplicationSerializer
+    attributes :users
+    attributes :direct_message_channels
+    attributes :category_channels
+
+    def users
+      (object.users || [])
+        .map do |user|
+          {
+            identifier: "u-#{user.id}",
+            model: ::Chat::ChatableUserSerializer.new(user, scope: scope, root: false),
+            type: "user",
+          }
+        end
+        .as_json
+    end
+
+    def direct_message_channels
+      (object.direct_message_channels || [])
+        .map do |channel|
+          {
+            identifier: "c-#{channel.id}",
+            type: "channel",
+            model:
+              ::Chat::ChannelSerializer.new(
+                channel,
+                scope: scope,
+                root: false,
+                membership: channel_membership(channel.id),
+              ),
+          }
+        end
+        .as_json
+    end
+
+    def category_channels
+      (object.category_channels || [])
+        .map do |channel|
+          {
+            identifier: "c-#{channel.id}",
+            type: "channel",
+            model:
+              ::Chat::ChannelSerializer.new(
+                channel,
+                scope: scope,
+                root: false,
+                membership: channel_membership(channel.id),
+              ),
+          }
+        end
+        .as_json
+    end
+
+    private
+
+    def channel_membership(channel_id)
+      object.memberships.find { |membership| membership.chat_channel_id == channel_id }
+    end
+  end
+end
diff --git a/plugins/chat/app/serializers/chat/direct_message_serializer.rb b/plugins/chat/app/serializers/chat/direct_message_serializer.rb
new file mode 100644
index 00000000000..2362dec1313
--- /dev/null
+++ b/plugins/chat/app/serializers/chat/direct_message_serializer.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Chat
+  class DirectMessageSerializer < ApplicationSerializer
+    attributes :id
+
+    has_many :users, serializer: Chat::ChatableUserSerializer, embed: :objects
+
+    def users
+      users = object.direct_message_users.map(&:user).map { |u| u || Chat::DeletedUser.new }
+
+      return users - [scope.user] if users.count > 1
+      users
+    end
+  end
+end
diff --git a/plugins/chat/app/serializers/chat/in_reply_to_serializer.rb b/plugins/chat/app/serializers/chat/in_reply_to_serializer.rb
new file mode 100644
index 00000000000..b5163bd248f
--- /dev/null
+++ b/plugins/chat/app/serializers/chat/in_reply_to_serializer.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Chat
+  class InReplyToSerializer < ApplicationSerializer
+    has_one :user, serializer: BasicUserSerializer, embed: :objects
+    has_one :chat_webhook_event, serializer: Chat::WebhookEventSerializer, embed: :objects
+
+    attributes :id, :cooked, :excerpt
+
+    def excerpt
+      object.censored_excerpt
+    end
+
+    def user
+      object.user || Chat::DeletedUser.new
+    end
+  end
+end
diff --git a/plugins/chat/app/serializers/chat/incoming_webhook_serializer.rb b/plugins/chat/app/serializers/chat/incoming_webhook_serializer.rb
new file mode 100644
index 00000000000..65518d077a8
--- /dev/null
+++ b/plugins/chat/app/serializers/chat/incoming_webhook_serializer.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Chat
+  class IncomingWebhookSerializer < ApplicationSerializer
+    has_one :chat_channel, serializer: Chat::ChannelSerializer, embed: :objects
+
+    attributes :id, :name, :description, :emoji, :url, :username, :updated_at
+  end
+end
diff --git a/plugins/chat/app/serializers/chat/last_message_serializer.rb b/plugins/chat/app/serializers/chat/last_message_serializer.rb
new file mode 100644
index 00000000000..625d365054f
--- /dev/null
+++ b/plugins/chat/app/serializers/chat/last_message_serializer.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Chat
+  class LastMessageSerializer < ::ApplicationSerializer
+    # NOTE: The channel last message does not need to serialize relations
+    # etc. at this point in time, since the only thing we are using is
+    # created_at. In future we may want to serialize more for this, at which
+    # point we need to check existing code so we don't introduce N1s.
+    attributes *Chat::MessageSerializer::BASIC_ATTRIBUTES
+
+    def created_at
+      object.created_at.iso8601
+    end
+  end
+end
diff --git a/plugins/chat/app/serializers/chat/message_serializer.rb b/plugins/chat/app/serializers/chat/message_serializer.rb
new file mode 100644
index 00000000000..891fd5aea87
--- /dev/null
+++ b/plugins/chat/app/serializers/chat/message_serializer.rb
@@ -0,0 +1,200 @@
+# frozen_string_literal: true
+
+module Chat
+  class MessageSerializer < ::ApplicationSerializer
+    BASIC_ATTRIBUTES = %i[
+      id
+      message
+      cooked
+      created_at
+      excerpt
+      deleted_at
+      deleted_by_id
+      thread_id
+      chat_channel_id
+    ]
+    attributes(
+      *(
+        BASIC_ATTRIBUTES +
+          %i[
+            mentioned_users
+            reactions
+            bookmark
+            available_flags
+            user_flag_status
+            reviewable_id
+            edited
+            thread
+          ]
+      ),
+    )
+
+    has_one :user, serializer: Chat::MessageUserSerializer, embed: :objects
+    has_one :chat_webhook_event, serializer: Chat::WebhookEventSerializer, embed: :objects
+    has_one :in_reply_to, serializer: Chat::InReplyToSerializer, embed: :objects
+    has_many :uploads, serializer: ::UploadSerializer, embed: :objects
+
+    def mentioned_users
+      object
+        .chat_mentions
+        .map(&:user)
+        .compact
+        .sort_by(&:id)
+        .map { |user| BasicUserWithStatusSerializer.new(user, root: false) }
+        .as_json
+    end
+
+    def channel
+      @channel ||= @options.dig(:chat_channel) || object.chat_channel
+    end
+
+    def user
+      object.user || Chat::DeletedUser.new
+    end
+
+    def excerpt
+      object.censored_excerpt
+    end
+
+    def reactions
+      object
+        .reactions
+        .group_by(&:emoji)
+        .map do |emoji, reactions|
+          next unless Emoji.exists?(emoji)
+
+          users = reactions.take(5).map(&:user)
+
+          {
+            emoji: emoji,
+            count: reactions.count,
+            users:
+              ActiveModel::ArraySerializer.new(users, each_serializer: BasicUserSerializer).as_json,
+            reacted: users_reactions.include?(emoji),
+          }
+        end
+        .compact
+    end
+
+    def include_reactions?
+      object.reactions.any?
+    end
+
+    def users_reactions
+      @users_reactions ||=
+        object.reactions.select { |reaction| reaction.user_id == scope&.user&.id }.map(&:emoji)
+    end
+
+    def users_bookmark
+      @user_bookmark ||= object.bookmarks.find { |bookmark| bookmark.user_id == scope&.user&.id }
+    end
+
+    def include_bookmark?
+      users_bookmark.present?
+    end
+
+    def bookmark
+      {
+        id: users_bookmark.id,
+        reminder_at: users_bookmark.reminder_at,
+        name: users_bookmark.name,
+        auto_delete_preference: users_bookmark.auto_delete_preference,
+        bookmarkable_id: users_bookmark.bookmarkable_id,
+        bookmarkable_type: users_bookmark.bookmarkable_type,
+      }
+    end
+
+    def edited
+      true
+    end
+
+    def include_edited?
+      object.revisions.any?
+    end
+
+    def created_at
+      object.created_at.iso8601
+    end
+
+    def deleted_at
+      object.user ? object.deleted_at.iso8601 : Time.zone.now
+    end
+
+    def deleted_by_id
+      object.user ? object.deleted_by_id : Discourse.system_user.id
+    end
+
+    def include_deleted_at?
+      object.user ? !object.deleted_at.nil? : true
+    end
+
+    def include_deleted_by_id?
+      object.user ? !object.deleted_at.nil? : true
+    end
+
+    def include_in_reply_to?
+      object.in_reply_to_id.presence
+    end
+
+    def reviewable_id
+      return @reviewable_id if defined?(@reviewable_id)
+      return @reviewable_id = nil unless @options && @options[:reviewable_ids]
+
+      @reviewable_id = @options[:reviewable_ids][object.id]
+    end
+
+    def include_reviewable_id?
+      reviewable_id.present?
+    end
+
+    def user_flag_status
+      return @user_flag_status if defined?(@user_flag_status)
+      return @user_flag_status = nil unless @options&.dig(:user_flag_statuses)
+
+      @user_flag_status = @options[:user_flag_statuses][object.id]
+    end
+
+    def include_user_flag_status?
+      user_flag_status.present?
+    end
+
+    def available_flags
+      return [] if !scope.can_flag_chat_message?(object)
+      return [] if reviewable_id.present? && user_flag_status == ReviewableScore.statuses[:pending]
+
+      PostActionType.flag_types.map do |sym, id|
+        next if channel.direct_message_channel? && %i[notify_moderators notify_user].include?(sym)
+
+        if sym == :notify_user &&
+             (
+               scope.current_user == user || user.bot? ||
+                 !scope.current_user.in_any_groups?(SiteSetting.personal_message_enabled_groups_map)
+             )
+          next
+        end
+
+        sym
+      end
+    end
+
+    def include_thread?
+      include_thread_id? && object.thread_om? && object.thread.present?
+    end
+
+    def include_thread_id?
+      channel.threading_enabled
+    end
+
+    def thread
+      Chat::ThreadSerializer.new(
+        object.thread,
+        scope: scope,
+        membership: @options[:thread_memberships]&.find { |m| m.thread_id == object.thread.id },
+        participants: @options[:thread_participants]&.dig(object.thread.id),
+        include_thread_preview: true,
+        include_thread_original_message: @options[:include_thread_original_message],
+        root: false,
+      )
+    end
+  end
+end
diff --git a/plugins/chat/app/serializers/chat/message_user_serializer.rb b/plugins/chat/app/serializers/chat/message_user_serializer.rb
new file mode 100644
index 00000000000..92d222a6782
--- /dev/null
+++ b/plugins/chat/app/serializers/chat/message_user_serializer.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Chat
+  class MessageUserSerializer < BasicUserWithStatusSerializer
+    attributes :moderator?, :admin?, :staff?, :moderator?, :new_user?, :primary_group_name
+
+    def moderator?
+      !!(object&.moderator?)
+    end
+
+    def admin?
+      !!(object&.admin?)
+    end
+
+    def staff?
+      !!(object&.staff?)
+    end
+
+    def new_user?
+      object.trust_level == TrustLevel[0]
+    end
+
+    def primary_group_name
+      return nil unless object && object.primary_group_id
+      object.primary_group.name if object.primary_group
+    end
+  end
+end
diff --git a/plugins/chat/app/serializers/chat/messages_serializer.rb b/plugins/chat/app/serializers/chat/messages_serializer.rb
new file mode 100644
index 00000000000..0646328bdfe
--- /dev/null
+++ b/plugins/chat/app/serializers/chat/messages_serializer.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Chat
+  class MessagesSerializer < ::ApplicationSerializer
+    attributes :messages, :tracking, :meta
+
+    def initialize(object, opts)
+      super(object, opts)
+      @opts = opts
+    end
+
+    def messages
+      object.messages.map do |message|
+        ::Chat::MessageSerializer.new(
+          message,
+          scope: scope,
+          root: false,
+          include_thread_preview: true,
+          include_thread_original_message: true,
+          thread_participants: object.thread_participants,
+          thread_memberships: object.thread_memberships,
+          **@opts,
+        )
+      end
+    end
+
+    def tracking
+      object.tracking || {}
+    end
+
+    def meta
+      {
+        target_message_id: object.target_message_id,
+        can_load_more_future: object.can_load_more_future,
+        can_load_more_past: object.can_load_more_past,
+      }
+    end
+  end
+end
diff --git a/plugins/chat/app/serializers/chat/reviewable_message_serializer.rb b/plugins/chat/app/serializers/chat/reviewable_message_serializer.rb
new file mode 100644
index 00000000000..41f74e31c81
--- /dev/null
+++ b/plugins/chat/app/serializers/chat/reviewable_message_serializer.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require_dependency "reviewable_serializer"
+
+module Chat
+  class ReviewableMessageSerializer < ReviewableSerializer
+    target_attributes :cooked
+    payload_attributes :transcript_topic_id, :message_cooked
+    attributes :target_id
+
+    has_one :chat_channel, serializer: Chat::ChannelSerializer, root: false, embed: :objects
+
+    def chat_channel
+      object.chat_message.chat_channel
+    end
+
+    def target_id
+      object.target&.id
+    end
+  end
+end
diff --git a/plugins/chat/app/serializers/chat/structured_channel_serializer.rb b/plugins/chat/app/serializers/chat/structured_channel_serializer.rb
new file mode 100644
index 00000000000..03993c942a0
--- /dev/null
+++ b/plugins/chat/app/serializers/chat/structured_channel_serializer.rb
@@ -0,0 +1,122 @@
+# frozen_string_literal: true
+
+module Chat
+  class StructuredChannelSerializer < ApplicationSerializer
+    attributes :public_channels, :direct_message_channels, :tracking, :meta, :unread_thread_overview
+
+    def tracking
+      object[:tracking]
+    end
+
+    def unread_thread_overview
+      object[:unread_thread_overview]
+    end
+
+    def public_channels
+      object[:public_channels].map do |channel|
+        Chat::ChannelSerializer.new(
+          channel,
+          root: nil,
+          scope: scope,
+          membership: channel_membership(channel.id),
+          new_messages_message_bus_last_id:
+            chat_message_bus_last_ids[Chat::Publisher.new_messages_message_bus_channel(channel.id)],
+          new_mentions_message_bus_last_id:
+            chat_message_bus_last_ids[Chat::Publisher.new_mentions_message_bus_channel(channel.id)],
+          kick_message_bus_last_id:
+            chat_message_bus_last_ids[Chat::Publisher.kick_users_message_bus_channel(channel.id)],
+          channel_message_bus_last_id:
+            chat_message_bus_last_ids[Chat::Publisher.root_message_bus_channel(channel.id)],
+          # NOTE: This is always true because the public channels passed into this serializer
+          # have been fetched with [Chat::ChannelFetcher], which only returns channels that
+          # the user has access to based on category permissions.
+          can_join_chat_channel: true,
+          post_allowed_category_ids: @options[:post_allowed_category_ids],
+        )
+      end
+    end
+
+    def direct_message_channels
+      object[:direct_message_channels].map do |channel|
+        Chat::ChannelSerializer.new(
+          channel,
+          root: nil,
+          scope: scope,
+          membership: channel_membership(channel.id),
+          new_messages_message_bus_last_id:
+            chat_message_bus_last_ids[Chat::Publisher.new_messages_message_bus_channel(channel.id)],
+          new_mentions_message_bus_last_id:
+            chat_message_bus_last_ids[Chat::Publisher.new_mentions_message_bus_channel(channel.id)],
+          channel_message_bus_last_id:
+            chat_message_bus_last_ids[Chat::Publisher.root_message_bus_channel(channel.id)],
+        )
+      end
+    end
+
+    def channel_membership(channel_id)
+      return if scope.anonymous?
+      object[:memberships].find { |membership| membership.chat_channel_id == channel_id }
+    end
+
+    def meta
+      last_ids = {
+        channel_metadata:
+          chat_message_bus_last_ids[Chat::Publisher::CHANNEL_METADATA_MESSAGE_BUS_CHANNEL],
+        channel_edits:
+          chat_message_bus_last_ids[Chat::Publisher::CHANNEL_EDITS_MESSAGE_BUS_CHANNEL],
+        channel_status:
+          chat_message_bus_last_ids[Chat::Publisher::CHANNEL_STATUS_MESSAGE_BUS_CHANNEL],
+        new_channel: chat_message_bus_last_ids[Chat::Publisher::NEW_CHANNEL_MESSAGE_BUS_CHANNEL],
+        archive_status:
+          chat_message_bus_last_ids[Chat::Publisher::CHANNEL_ARCHIVE_STATUS_MESSAGE_BUS_CHANNEL],
+      }
+
+      if !scope.anonymous?
+        user_tracking_state_last_id =
+          chat_message_bus_last_ids[
+            Chat::Publisher.user_tracking_state_message_bus_channel(scope.user.id)
+          ]
+
+        last_ids[:user_tracking_state] = user_tracking_state_last_id if user_tracking_state_last_id
+      end
+
+      { message_bus_last_ids: last_ids }
+    end
+
+    private
+
+    def chat_message_bus_last_ids
+      @chat_message_bus_last_ids ||=
+        begin
+          message_bus_channels = [
+            Chat::Publisher::CHANNEL_METADATA_MESSAGE_BUS_CHANNEL,
+            Chat::Publisher::CHANNEL_EDITS_MESSAGE_BUS_CHANNEL,
+            Chat::Publisher::CHANNEL_STATUS_MESSAGE_BUS_CHANNEL,
+            Chat::Publisher::NEW_CHANNEL_MESSAGE_BUS_CHANNEL,
+            Chat::Publisher::CHANNEL_ARCHIVE_STATUS_MESSAGE_BUS_CHANNEL,
+          ]
+
+          if !scope.anonymous?
+            message_bus_channels.push(
+              Chat::Publisher.user_tracking_state_message_bus_channel(scope.user.id),
+            )
+          end
+
+          object[:public_channels].each do |channel|
+            message_bus_channels.push(Chat::Publisher.new_messages_message_bus_channel(channel.id))
+            message_bus_channels.push(Chat::Publisher.new_mentions_message_bus_channel(channel.id))
+            message_bus_channels.push(Chat::Publisher.kick_users_message_bus_channel(channel.id))
+            message_bus_channels.push(Chat::Publisher.root_message_bus_channel(channel.id))
+          end
+
+          object[:direct_message_channels].each do |channel|
+            message_bus_channels.push(Chat::Publisher.new_messages_message_bus_channel(channel.id))
+            message_bus_channels.push(Chat::Publisher.new_mentions_message_bus_channel(channel.id))
+            message_bus_channels.push(Chat::Publisher.root_message_bus_channel(channel.id))
+          end
+
+          MessageBus.last_ids(*message_bus_channels)
+        end
+    end
+  end
+end
diff --git a/plugins/chat/app/serializers/chat/thread_list_serializer.rb b/plugins/chat/app/serializers/chat/thread_list_serializer.rb
new file mode 100644
index 00000000000..fd5be6d0a8f
--- /dev/null
+++ b/plugins/chat/app/serializers/chat/thread_list_serializer.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Chat
+  class ThreadListSerializer < ApplicationSerializer
+    attributes :meta, :threads, :tracking
+
+    def threads
+      object.threads.map do |thread|
+        ::Chat::ThreadSerializer.new(
+          thread,
+          scope: scope,
+          membership: object.memberships.find { |m| m.thread_id == thread.id },
+          include_thread_preview: true,
+          include_thread_original_message: true,
+          root: nil,
+        )
+      end
+    end
+
+    def tracking
+      object.tracking
+    end
+
+    def meta
+      { channel_id: object.channel.id, load_more_url: object.load_more_url }
+    end
+  end
+end
diff --git a/plugins/chat/app/serializers/chat/thread_original_message_serializer.rb b/plugins/chat/app/serializers/chat/thread_original_message_serializer.rb
new file mode 100644
index 00000000000..67f5f067c06
--- /dev/null
+++ b/plugins/chat/app/serializers/chat/thread_original_message_serializer.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Chat
+  class ThreadOriginalMessageSerializer < ::ApplicationSerializer
+    attributes :id,
+               :message,
+               :cooked,
+               :created_at,
+               :excerpt,
+               :chat_channel_id,
+               :deleted_at,
+               :mentioned_users
+
+    def excerpt
+      object.censored_excerpt
+    end
+
+    def mentioned_users
+      object
+        .chat_mentions
+        .map(&:user)
+        .compact
+        .sort_by(&:id)
+        .map { |user| BasicUserWithStatusSerializer.new(user, root: false) }
+        .as_json
+    end
+
+    has_one :user, serializer: BasicUserWithStatusSerializer, embed: :objects
+  end
+end
diff --git a/plugins/chat/app/serializers/chat/thread_preview_serializer.rb b/plugins/chat/app/serializers/chat/thread_preview_serializer.rb
new file mode 100644
index 00000000000..72f97282678
--- /dev/null
+++ b/plugins/chat/app/serializers/chat/thread_preview_serializer.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Chat
+  class ThreadPreviewSerializer < ApplicationSerializer
+    attributes :last_reply_created_at,
+               :last_reply_excerpt,
+               :last_reply_id,
+               :participant_count,
+               :reply_count
+    has_many :participant_users, serializer: BasicUserSerializer, embed: :objects
+    has_one :last_reply_user, serializer: BasicUserSerializer, embed: :objects
+
+    def initialize(object, opts)
+      super(object, opts)
+      @participants = opts[:participants]
+    end
+
+    def reply_count
+      object.replies_count_cache || 0
+    end
+
+    def last_reply_created_at
+      object.last_message.created_at.iso8601
+    end
+
+    def last_reply_id
+      object.last_message.id
+    end
+
+    def last_reply_excerpt
+      object.last_message.excerpt(max_length: Chat::Thread::EXCERPT_LENGTH)
+    end
+
+    def last_reply_user
+      object.last_message.user
+    end
+
+    def include_participant_data?
+      @participants.present?
+    end
+
+    def include_participant_users?
+      include_participant_data?
+    end
+
+    def include_participant_count?
+      include_participant_data?
+    end
+
+    def participant_users
+      @participant_users ||= @participants[:users].map { |user| User.new(user) }
+    end
+
+    def participant_count
+      @participants[:total_count]
+    end
+  end
+end
diff --git a/plugins/chat/app/serializers/chat/thread_serializer.rb b/plugins/chat/app/serializers/chat/thread_serializer.rb
new file mode 100644
index 00000000000..8ba6372a2da
--- /dev/null
+++ b/plugins/chat/app/serializers/chat/thread_serializer.rb
@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+module Chat
+  class ThreadSerializer < ApplicationSerializer
+    has_one :original_message, serializer: Chat::ThreadOriginalMessageSerializer, embed: :objects
+
+    attributes :id,
+               :title,
+               :status,
+               :channel_id,
+               :meta,
+               :reply_count,
+               :current_user_membership,
+               :preview
+
+    def initialize(object, opts)
+      super(object, opts)
+      @opts = opts
+
+      # Avoids an N1 to re-load the thread in the serializer for original_message.
+      object.original_message&.thread = object
+      @current_user_membership = opts[:membership]
+    end
+
+    def include_original_message?
+      @opts[:include_thread_original_message].presence || true
+    end
+
+    def meta
+      { message_bus_last_ids: { thread_message_bus_last_id: thread_message_bus_last_id } }
+    end
+
+    def reply_count
+      object.replies_count_cache || 0
+    end
+
+    def include_preview?
+      @opts[:include_thread_preview]
+    end
+
+    def preview
+      Chat::ThreadPreviewSerializer.new(
+        object,
+        scope: scope,
+        root: false,
+        participants: @opts[:participants],
+      ).as_json
+    end
+
+    def include_current_user_membership?
+      @current_user_membership.present?
+    end
+
+    def current_user_membership
+      @current_user_membership.thread = object
+
+      Chat::BaseThreadMembershipSerializer.new(
+        @current_user_membership,
+        scope: scope,
+        root: false,
+      ).as_json
+    end
+
+    private
+
+    def thread_message_bus_last_id
+      @opts[:thread_message_bus_last_id] ||
+        MessageBus.last_id(Chat::Publisher.thread_message_bus_channel(object.channel_id, object.id))
+    end
+  end
+end
diff --git a/plugins/chat/app/serializers/chat/user_channel_membership_serializer.rb b/plugins/chat/app/serializers/chat/user_channel_membership_serializer.rb
new file mode 100644
index 00000000000..8dd02a7ffa1
--- /dev/null
+++ b/plugins/chat/app/serializers/chat/user_channel_membership_serializer.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Chat
+  class UserChannelMembershipSerializer < BaseChannelMembershipSerializer
+    has_one :user, serializer: BasicUserSerializer, embed: :objects
+
+    def user
+      object.user
+    end
+  end
+end
diff --git a/plugins/chat/app/serializers/chat/user_message_bookmark_serializer.rb b/plugins/chat/app/serializers/chat/user_message_bookmark_serializer.rb
new file mode 100644
index 00000000000..f1ba24bdc16
--- /dev/null
+++ b/plugins/chat/app/serializers/chat/user_message_bookmark_serializer.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Chat
+  class UserMessageBookmarkSerializer < UserBookmarkBaseSerializer
+    attr_reader :chat_message
+
+    def title
+      fancy_title
+    end
+
+    def fancy_title
+      @fancy_title ||= chat_message.chat_channel.title(scope.user)
+    end
+
+    def cooked
+      chat_message.cooked
+    end
+
+    def bookmarkable_user
+      @bookmarkable_user ||= chat_message.user
+    end
+
+    def bookmarkable_url
+      chat_message.url
+    end
+
+    def excerpt
+      return nil unless cooked
+      @excerpt ||= PrettyText.excerpt(cooked, 300, keep_emoji_images: true)
+    end
+
+    private
+
+    def chat_message
+      object.bookmarkable
+    end
+  end
+end
diff --git a/plugins/chat/app/serializers/chat/user_with_custom_fields_and_status_serializer.rb b/plugins/chat/app/serializers/chat/user_with_custom_fields_and_status_serializer.rb
new file mode 100644
index 00000000000..d9589d730b8
--- /dev/null
+++ b/plugins/chat/app/serializers/chat/user_with_custom_fields_and_status_serializer.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Chat
+  class UserWithCustomFieldsAndStatusSerializer < ::UserWithCustomFieldsSerializer
+    attributes :status
+
+    def include_status?
+      SiteSetting.enable_user_status && user.has_status?
+    end
+
+    def status
+      ::UserStatusSerializer.new(user.user_status, root: false)
+    end
+  end
+end
diff --git a/plugins/chat/app/serializers/chat/webhook_event_serializer.rb b/plugins/chat/app/serializers/chat/webhook_event_serializer.rb
new file mode 100644
index 00000000000..309cd06bf16
--- /dev/null
+++ b/plugins/chat/app/serializers/chat/webhook_event_serializer.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Chat
+  class WebhookEventSerializer < ApplicationSerializer
+    attributes :username, :emoji
+  end
+end
diff --git a/plugins/chat/app/serializers/chat_channel_index_serializer.rb b/plugins/chat/app/serializers/chat_channel_index_serializer.rb
deleted file mode 100644
index 59c555a90f7..00000000000
--- a/plugins/chat/app/serializers/chat_channel_index_serializer.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class ChatChannelIndexSerializer < StructuredChannelSerializer
-  attributes :global_presence_channel_state
-
-  def global_presence_channel_state
-    PresenceChannelStateSerializer.new(PresenceChannel.new("/chat/online").state, root: nil)
-  end
-end
diff --git a/plugins/chat/app/serializers/chat_channel_search_serializer.rb b/plugins/chat/app/serializers/chat_channel_search_serializer.rb
deleted file mode 100644
index cf5bc083cc9..00000000000
--- a/plugins/chat/app/serializers/chat_channel_search_serializer.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class ChatChannelSearchSerializer < StructuredChannelSerializer
-  has_many :users, serializer: BasicUserSerializer, embed: :objects
-
-  def users
-    object[:users]
-  end
-end
diff --git a/plugins/chat/app/serializers/chat_channel_serializer.rb b/plugins/chat/app/serializers/chat_channel_serializer.rb
deleted file mode 100644
index e6707acfd6b..00000000000
--- a/plugins/chat/app/serializers/chat_channel_serializer.rb
+++ /dev/null
@@ -1,123 +0,0 @@
-# frozen_string_literal: true
-
-class ChatChannelSerializer < ApplicationSerializer
-  attributes :id,
-             :auto_join_users,
-             :allow_channel_wide_mentions,
-             :chatable,
-             :chatable_id,
-             :chatable_type,
-             :chatable_url,
-             :description,
-             :title,
-             :slug,
-             :last_message_sent_at,
-             :status,
-             :archive_failed,
-             :archive_completed,
-             :archived_messages,
-             :total_messages,
-             :archive_topic_id,
-             :memberships_count,
-             :current_user_membership,
-             :meta
-
-  def initialize(object, opts)
-    super(object, opts)
-
-    @opts = opts
-    @current_user_membership = opts[:membership]
-  end
-
-  def include_description?
-    object.description.present?
-  end
-
-  def memberships_count
-    object.user_count
-  end
-
-  def chatable_url
-    object.chatable_url
-  end
-
-  def title
-    object.name || object.title(scope.user)
-  end
-
-  def chatable
-    case object.chatable_type
-    when "Category"
-      BasicCategorySerializer.new(object.chatable, root: false).as_json
-    when "DirectMessage"
-      DirectMessageSerializer.new(object.chatable, scope: scope, root: false).as_json
-    when "Site"
-      nil
-    end
-  end
-
-  def archive
-    object.chat_channel_archive
-  end
-
-  def include_archive_status?
-    !object.direct_message_channel? && scope.is_staff? && archive.present?
-  end
-
-  def archive_completed
-    archive.complete?
-  end
-
-  def archive_failed
-    archive.failed?
-  end
-
-  def archived_messages
-    archive.archived_messages
-  end
-
-  def total_messages
-    archive.total_messages
-  end
-
-  def archive_topic_id
-    archive.destination_topic_id
-  end
-
-  def include_auto_join_users?
-    scope.can_edit_chat_channel?
-  end
-
-  def include_current_user_membership?
-    @current_user_membership.present?
-  end
-
-  def current_user_membership
-    @current_user_membership.chat_channel = object
-
-    BaseChatChannelMembershipSerializer.new(
-      @current_user_membership,
-      scope: scope,
-      root: false,
-    ).as_json
-  end
-
-  def meta
-    {
-      message_bus_last_ids: {
-        new_messages:
-          @opts[:new_messages_message_bus_last_id] ||
-            MessageBus.last_id(ChatPublisher.new_messages_message_bus_channel(object.id)),
-        new_mentions:
-          @opts[:new_mentions_message_bus_last_id] ||
-            MessageBus.last_id(ChatPublisher.new_mentions_message_bus_channel(object.id)),
-      },
-    }
-  end
-
-  alias_method :include_archive_topic_id?, :include_archive_status?
-  alias_method :include_total_messages?, :include_archive_status?
-  alias_method :include_archived_messages?, :include_archive_status?
-  alias_method :include_archive_failed?, :include_archive_status?
-  alias_method :include_archive_completed?, :include_archive_status?
-end
diff --git a/plugins/chat/app/serializers/chat_in_reply_to_serializer.rb b/plugins/chat/app/serializers/chat_in_reply_to_serializer.rb
deleted file mode 100644
index 25cb08c8fde..00000000000
--- a/plugins/chat/app/serializers/chat_in_reply_to_serializer.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-class ChatInReplyToSerializer < ApplicationSerializer
-  has_one :user, serializer: BasicUserSerializer, embed: :objects
-  has_one :chat_webhook_event, serializer: ChatWebhookEventSerializer, embed: :objects
-
-  attributes :id, :cooked, :excerpt
-
-  def excerpt
-    WordWatcher.censor(object.excerpt)
-  end
-
-  def user
-    object.user || DeletedChatUser.new
-  end
-end
diff --git a/plugins/chat/app/serializers/chat_message_serializer.rb b/plugins/chat/app/serializers/chat_message_serializer.rb
deleted file mode 100644
index 0bcbd64c3d0..00000000000
--- a/plugins/chat/app/serializers/chat_message_serializer.rb
+++ /dev/null
@@ -1,149 +0,0 @@
-# frozen_string_literal: true
-
-class ChatMessageSerializer < ApplicationSerializer
-  attributes :id,
-             :message,
-             :cooked,
-             :created_at,
-             :excerpt,
-             :deleted_at,
-             :deleted_by_id,
-             :reviewable_id,
-             :user_flag_status,
-             :edited,
-             :reactions,
-             :bookmark,
-             :available_flags
-
-  has_one :user, serializer: BasicUserWithStatusSerializer, embed: :objects
-  has_one :chat_webhook_event, serializer: ChatWebhookEventSerializer, embed: :objects
-  has_one :in_reply_to, serializer: ChatInReplyToSerializer, embed: :objects
-  has_many :uploads, serializer: UploadSerializer, embed: :objects
-
-  def user
-    object.user || DeletedChatUser.new
-  end
-
-  def excerpt
-    WordWatcher.censor(object.excerpt)
-  end
-
-  def reactions
-    reactions_hash = {}
-    object
-      .reactions
-      .group_by(&:emoji)
-      .each do |emoji, reactions|
-        users = reactions[0..6].map(&:user).filter { |user| user.id != scope&.user&.id }[0..5]
-
-        next unless Emoji.exists?(emoji)
-
-        reactions_hash[emoji] = {
-          count: reactions.count,
-          users:
-            ActiveModel::ArraySerializer.new(users, each_serializer: BasicUserSerializer).as_json,
-          reacted: users_reactions.include?(emoji),
-        }
-      end
-    reactions_hash
-  end
-
-  def include_reactions?
-    object.reactions.any?
-  end
-
-  def users_reactions
-    @users_reactions ||=
-      object.reactions.select { |reaction| reaction.user_id == scope&.user&.id }.map(&:emoji)
-  end
-
-  def users_bookmark
-    @user_bookmark ||= object.bookmarks.find { |bookmark| bookmark.user_id == scope&.user&.id }
-  end
-
-  def include_bookmark?
-    users_bookmark.present?
-  end
-
-  def bookmark
-    {
-      id: users_bookmark.id,
-      reminder_at: users_bookmark.reminder_at,
-      name: users_bookmark.name,
-      auto_delete_preference: users_bookmark.auto_delete_preference,
-      bookmarkable_id: users_bookmark.bookmarkable_id,
-      bookmarkable_type: users_bookmark.bookmarkable_type,
-    }
-  end
-
-  def edited
-    true
-  end
-
-  def include_edited?
-    object.revisions.any?
-  end
-
-  def deleted_at
-    object.user ? object.deleted_at : Time.zone.now
-  end
-
-  def deleted_by_id
-    object.user ? object.deleted_by_id : Discourse.system_user.id
-  end
-
-  def include_deleted_at?
-    object.user ? !object.deleted_at.nil? : true
-  end
-
-  def include_deleted_by_id?
-    object.user ? !object.deleted_at.nil? : true
-  end
-
-  def include_in_reply_to?
-    object.in_reply_to_id.presence
-  end
-
-  def reviewable_id
-    return @reviewable_id if defined?(@reviewable_id)
-    return @reviewable_id = nil unless @options && @options[:reviewable_ids]
-
-    @reviewable_id = @options[:reviewable_ids][object.id]
-  end
-
-  def include_reviewable_id?
-    reviewable_id.present?
-  end
-
-  def user_flag_status
-    return @user_flag_status if defined?(@user_flag_status)
-    return @user_flag_status = nil unless @options&.dig(:user_flag_statuses)
-
-    @user_flag_status = @options[:user_flag_statuses][object.id]
-  end
-
-  def include_user_flag_status?
-    user_flag_status.present?
-  end
-
-  def available_flags
-    return [] if !scope.can_flag_chat_message?(object)
-    return [] if reviewable_id.present? && user_flag_status == ReviewableScore.statuses[:pending]
-
-    channel = @options.dig(:chat_channel) || object.chat_channel
-
-    PostActionType.flag_types.map do |sym, id|
-      next if channel.direct_message_channel? && %i[notify_moderators notify_user].include?(sym)
-
-      if sym == :notify_user &&
-           (
-             scope.current_user == user || user.bot? ||
-               !scope.current_user.in_any_groups?(SiteSetting.personal_message_enabled_groups_map)
-           )
-        next
-      end
-
-      sym
-    end
-  end
-end
diff --git a/plugins/chat/app/serializers/chat_view_serializer.rb b/plugins/chat/app/serializers/chat_view_serializer.rb
deleted file mode 100644
index 566474ec408..00000000000
--- a/plugins/chat/app/serializers/chat_view_serializer.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-class ChatViewSerializer < ApplicationSerializer
-  attributes :meta, :chat_messages
-
-  def chat_messages
-    ActiveModel::ArraySerializer.new(
-      object.chat_messages,
-      each_serializer: ChatMessageSerializer,
-      reviewable_ids: object.reviewable_ids,
-      user_flag_statuses: object.user_flag_statuses,
-      chat_channel: object.chat_channel,
-      scope: scope,
-    )
-  end
-
-  def meta
-    meta_hash = {
-      can_flag: scope.can_flag_in_chat_channel?(object.chat_channel),
-      channel_status: object.chat_channel.status,
-      user_silenced: !scope.can_create_chat_message?,
-      can_moderate: scope.can_moderate_chat?(object.chat_channel.chatable),
-      can_delete_self: scope.can_delete_own_chats?(object.chat_channel.chatable),
-      can_delete_others: scope.can_delete_other_chats?(object.chat_channel.chatable),
-      channel_message_bus_last_id: MessageBus.last_id("/chat/#{object.chat_channel.id}"),
-    }
-    meta_hash[:can_load_more_past] = object.can_load_more_past unless object.can_load_more_past.nil?
-    meta_hash[
-      :can_load_more_future
-    ] = object.can_load_more_future unless object.can_load_more_future.nil?
-    meta_hash
-  end
-end
diff --git a/plugins/chat/app/serializers/chat_webhook_event_serializer.rb b/plugins/chat/app/serializers/chat_webhook_event_serializer.rb
deleted file mode 100644
index 3fb674c653f..00000000000
--- a/plugins/chat/app/serializers/chat_webhook_event_serializer.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-class ChatWebhookEventSerializer < ApplicationSerializer
-  attributes :username, :emoji
-end
diff --git a/plugins/chat/app/serializers/direct_message_serializer.rb b/plugins/chat/app/serializers/direct_message_serializer.rb
deleted file mode 100644
index 817902467dd..00000000000
--- a/plugins/chat/app/serializers/direct_message_serializer.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-class DirectMessageSerializer < ApplicationSerializer
-  has_many :users, serializer: UserWithCustomFieldsAndStatusSerializer, embed: :objects
-
-  def users
-    users = object.direct_message_users.map(&:user).map { |u| u || DeletedChatUser.new }
-
-    return users - [scope.user] if users.count > 1
-    users
-  end
-end
diff --git a/plugins/chat/app/serializers/incoming_chat_webhook_serializer.rb b/plugins/chat/app/serializers/incoming_chat_webhook_serializer.rb
deleted file mode 100644
index 7f097e62bfd..00000000000
--- a/plugins/chat/app/serializers/incoming_chat_webhook_serializer.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-class IncomingChatWebhookSerializer < ApplicationSerializer
-  has_one :chat_channel, serializer: ChatChannelSerializer, embed: :objects
-
-  attributes :id, :name, :description, :emoji, :url, :username, :updated_at
-end
diff --git a/plugins/chat/app/serializers/reviewable_chat_message_serializer.rb b/plugins/chat/app/serializers/reviewable_chat_message_serializer.rb
deleted file mode 100644
index 5c56d39fb70..00000000000
--- a/plugins/chat/app/serializers/reviewable_chat_message_serializer.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-require_dependency "reviewable_serializer"
-
-class ReviewableChatMessageSerializer < ReviewableSerializer
-  target_attributes :cooked
-  payload_attributes :transcript_topic_id, :message_cooked
-  attributes :target_id
-
-  has_one :chat_channel, serializer: ChatChannelSerializer, root: false, embed: :objects
-
-  def chat_channel
-    object.chat_message.chat_channel
-  end
-
-  def target_id
-    object.target&.id
-  end
-end
diff --git a/plugins/chat/app/serializers/structured_channel_serializer.rb b/plugins/chat/app/serializers/structured_channel_serializer.rb
deleted file mode 100644
index e88b9a00b5d..00000000000
--- a/plugins/chat/app/serializers/structured_channel_serializer.rb
+++ /dev/null
@@ -1,94 +0,0 @@
-# frozen_string_literal: true
-
-class StructuredChannelSerializer < ApplicationSerializer
-  attributes :public_channels, :direct_message_channels, :meta
-
-  def public_channels
-    object[:public_channels].map do |channel|
-      ChatChannelSerializer.new(
-        channel,
-        root: nil,
-        scope: scope,
-        membership: channel_membership(channel.id),
-        new_messages_message_bus_last_id:
-          chat_message_bus_last_ids[ChatPublisher.new_messages_message_bus_channel(channel.id)],
-        new_mentions_message_bus_last_id:
-          chat_message_bus_last_ids[ChatPublisher.new_mentions_message_bus_channel(channel.id)],
-      )
-    end
-  end
-
-  def direct_message_channels
-    object[:direct_message_channels].map do |channel|
-      ChatChannelSerializer.new(
-        channel,
-        root: nil,
-        scope: scope,
-        membership: channel_membership(channel.id),
-        new_messages_message_bus_last_id:
-          chat_message_bus_last_ids[ChatPublisher.new_messages_message_bus_channel(channel.id)],
-        new_mentions_message_bus_last_id:
-          chat_message_bus_last_ids[ChatPublisher.new_mentions_message_bus_channel(channel.id)],
-      )
-    end
-  end
-
-  def channel_membership(channel_id)
-    return if scope.anonymous?
-    object[:memberships].find { |membership| membership.chat_channel_id == channel_id }
-  end
-
-  def meta
-    last_ids = {
-      channel_metadata:
-        chat_message_bus_last_ids[ChatPublisher::CHANNEL_METADATA_MESSAGE_BUS_CHANNEL],
-      channel_edits: chat_message_bus_last_ids[ChatPublisher::CHANNEL_EDITS_MESSAGE_BUS_CHANNEL],
-      channel_status: chat_message_bus_last_ids[ChatPublisher::CHANNEL_STATUS_MESSAGE_BUS_CHANNEL],
-      new_channel: chat_message_bus_last_ids[ChatPublisher::NEW_CHANNEL_MESSAGE_BUS_CHANNEL],
-      archive_status:
-        chat_message_bus_last_ids[ChatPublisher::CHANNEL_ARCHIVE_STATUS_MESSAGE_BUS_CHANNEL],
-    }
-
-    if id =
-         chat_message_bus_last_ids[
-           ChatPublisher.user_tracking_state_message_bus_channel(scope.user.id)
-         ]
-      last_ids[:user_tracking_state] = id
-    end
-
-    { message_bus_last_ids: last_ids }
-  end
-
-  private
-
-  def chat_message_bus_last_ids
-    @chat_message_bus_last_ids ||=
-      begin
-        message_bus_channels = [
-          ChatPublisher::CHANNEL_METADATA_MESSAGE_BUS_CHANNEL,
-          ChatPublisher::CHANNEL_EDITS_MESSAGE_BUS_CHANNEL,
-          ChatPublisher::CHANNEL_STATUS_MESSAGE_BUS_CHANNEL,
-          ChatPublisher::NEW_CHANNEL_MESSAGE_BUS_CHANNEL,
-          ChatPublisher::CHANNEL_ARCHIVE_STATUS_MESSAGE_BUS_CHANNEL,
-        ]
-
-        if !scope.anonymous?
-          message_bus_channels.push(
-            ChatPublisher.user_tracking_state_message_bus_channel(scope.user.id),
-          )
-        end
-
-        object[:public_channels].each do |channel|
-          message_bus_channels.push(ChatPublisher.new_messages_message_bus_channel(channel.id))
-          message_bus_channels.push(ChatPublisher.new_mentions_message_bus_channel(channel.id))
-        end
-
-        object[:direct_message_channels].each do |channel|
-          message_bus_channels.push(ChatPublisher.new_messages_message_bus_channel(channel.id))
-          message_bus_channels.push(ChatPublisher.new_mentions_message_bus_channel(channel.id))
-        end
-
-        MessageBus.last_ids(*message_bus_channels)
-      end
-  end
-end
diff --git a/plugins/chat/app/serializers/user_chat_channel_membership_serializer.rb b/plugins/chat/app/serializers/user_chat_channel_membership_serializer.rb
deleted file mode 100644
index 18c26222e34..00000000000
--- a/plugins/chat/app/serializers/user_chat_channel_membership_serializer.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class UserChatChannelMembershipSerializer < BaseChatChannelMembershipSerializer
-  has_one :user, serializer: BasicUserSerializer, embed: :objects
-
-  def user
-    object.user
-  end
-end
diff --git a/plugins/chat/app/serializers/user_chat_message_bookmark_serializer.rb b/plugins/chat/app/serializers/user_chat_message_bookmark_serializer.rb
deleted file mode 100644
index 49f4c7af6f6..00000000000
--- a/plugins/chat/app/serializers/user_chat_message_bookmark_serializer.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-class UserChatMessageBookmarkSerializer < UserBookmarkBaseSerializer
-  attr_reader :chat_message
-
-  def title
-    fancy_title
-  end
-
-  def fancy_title
-    @fancy_title ||= chat_message.chat_channel.title(scope.user)
-  end
-
-  def cooked
-    chat_message.cooked
-  end
-
-  def bookmarkable_user
-    @bookmarkable_user ||= chat_message.user
-  end
-
-  def bookmarkable_url
-    chat_message.url
-  end
-
-  def excerpt
-    return nil unless cooked
-    @excerpt ||= PrettyText.excerpt(cooked, 300, keep_emoji_images: true)
-  end
-
-  private
-
-  def chat_message
-    object.bookmarkable
-  end
-end
diff --git a/plugins/chat/app/serializers/user_with_custom_fields_and_status_serializer.rb b/plugins/chat/app/serializers/user_with_custom_fields_and_status_serializer.rb
deleted file mode 100644
index e0897abfd54..00000000000
--- a/plugins/chat/app/serializers/user_with_custom_fields_and_status_serializer.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-class UserWithCustomFieldsAndStatusSerializer < UserWithCustomFieldsSerializer
-  attributes :status
-
-  def include_status?
-    SiteSetting.enable_user_status && user.has_status?
-  end
-
-  def status
-    UserStatusSerializer.new(user.user_status, root: false)
-  end
-end
diff --git a/plugins/chat/app/services/chat/action/calculate_memberships_for_removal.rb b/plugins/chat/app/services/chat/action/calculate_memberships_for_removal.rb
new file mode 100644
index 00000000000..fa4f74615e5
--- /dev/null
+++ b/plugins/chat/app/services/chat/action/calculate_memberships_for_removal.rb
@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+module Chat
+  module Action
+    # There is significant complexity around category channel permissions,
+    # since they are inferred from [CategoryGroup] records and their corresponding
+    # permission types.
+    #
+    # To be able to join and chat in a channel, a user must either be staff,
+    # or be in a group that has either `full` or `create_post` permissions
+    # via [CategoryGroup].
+    #
+    # However, there is an edge case. If there are no [CategoryGroup] records
+    # for a given category, this means that the [Group::AUTO_GROUPS[:everyone]]
+    # group has `full` access to the channel, therefore everyone can post in
+    # the chat channel (so long as they are in one of the `SiteSetting.chat_allowed_groups`)
+    #
+    # Here, we can efficiently query the channel category permissions and figure
+    # out which of the users provided should have their [Chat::UserChatChannelMembership]
+    # records removed based on those security cases.
+    class CalculateMembershipsForRemoval
+      def self.call(scoped_users:, channel_ids: nil)
+        channel_permissions_map =
+          DB.query(<<~SQL, readonly: CategoryGroup.permission_types[:readonly])
+          WITH category_group_channel_map AS (
+            SELECT category_groups.group_id,
+              category_groups.permission_type,
+              chat_channels.id AS channel_id
+            FROM category_groups
+            INNER JOIN categories ON categories.id = category_groups.category_id
+            INNER JOIN chat_channels ON categories.id = chat_channels.chatable_id
+              AND chat_channels.chatable_type = 'Category'
+          )
+
+          SELECT chat_channels.id AS channel_id,
+            chat_channels.chatable_id AS category_id,
+            (
+              SELECT string_agg(category_group_channel_map.group_id::varchar, ',')
+              FROM category_group_channel_map
+              WHERE category_group_channel_map.permission_type < :readonly AND
+                category_group_channel_map.channel_id = chat_channels.id
+            ) AS groups_with_write_permissions,
+              (
+              SELECT string_agg(category_group_channel_map.group_id::varchar, ',')
+              FROM category_group_channel_map
+              WHERE category_group_channel_map.permission_type = :readonly AND
+                category_group_channel_map.channel_id = chat_channels.id
+            ) AS groups_with_readonly_permissions,
+            categories.read_restricted
+            FROM category_group_channel_map
+            INNER JOIN chat_channels ON chat_channels.id = category_group_channel_map.channel_id
+            INNER JOIN categories ON categories.id = chat_channels.chatable_id
+            WHERE chat_channels.chatable_type = 'Category'
+            #{channel_ids.present? ? "AND chat_channels.id IN (#{channel_ids.join(",")})" : ""}
+            GROUP BY chat_channels.id, chat_channels.chatable_id, categories.read_restricted
+            ORDER BY channel_id
+          SQL
+
+        scoped_memberships =
+          Chat::UserChatChannelMembership
+            .joins(:chat_channel)
+            .where(user: scoped_users)
+            .where(chat_channel_id: channel_permissions_map.map(&:channel_id))
+
+        memberships_to_remove = []
+        scoped_memberships.find_each do |membership|
+          scoped_user = scoped_users.find { |su| su.id == membership.user_id }
+          channel_permission =
+            channel_permissions_map.find { |cpm| cpm.channel_id == membership.chat_channel_id }
+
+          # If there is no channel in the map, this means there are no
+          # category_groups for the channel.
+          #
+          # This in turn means the Everyone group with full permission
+          # is the only group that can access the channel (no category_group
+          # record is created in this case), we do not need to remove any users.
+          next if channel_permission.blank?
+
+          group_ids_with_write_permission =
+            channel_permission.groups_with_write_permissions.to_s.split(",").map(&:to_i)
+          group_ids_with_read_permission =
+            channel_permission.groups_with_readonly_permissions.to_s.split(",").map(&:to_i)
+
+          # None of the groups on the channel have permission to do anything
+          # more than read only, remove the membership.
+          if group_ids_with_write_permission.empty? && group_ids_with_read_permission.any?
+            memberships_to_remove << membership.id
+            next
+          end
+
+          # At least one of the groups on the channel can create_post or
+          # has full permission, remove the membership if the user is in none
+          # of these groups.
+          if group_ids_with_write_permission.any? &&
+               !scoped_user.in_any_groups?(group_ids_with_write_permission)
+            memberships_to_remove << membership.id
+          end
+        end
+
+        memberships_to_remove
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/services/chat/action/create_memberships_for_auto_join.rb b/plugins/chat/app/services/chat/action/create_memberships_for_auto_join.rb
new file mode 100644
index 00000000000..eddeacf531d
--- /dev/null
+++ b/plugins/chat/app/services/chat/action/create_memberships_for_auto_join.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Chat
+  module Action
+    class CreateMembershipsForAutoJoin
+      def self.call(channel:, contract:)
+        query_args = {
+          chat_channel_id: channel.id,
+          start: contract.start_user_id,
+          end: contract.end_user_id,
+          suspended_until: Time.zone.now,
+          last_seen_at: 3.months.ago,
+          channel_category: channel.category.id,
+          permission_type: CategoryGroup.permission_types[:create_post],
+          everyone: Group::AUTO_GROUPS[:everyone],
+          mode: ::Chat::UserChatChannelMembership.join_modes[:automatic],
+        }
+        ::DB.query_single(<<~SQL, query_args)
+          INSERT INTO user_chat_channel_memberships (user_id, chat_channel_id, following, created_at, updated_at, join_mode)
+          SELECT DISTINCT(users.id), :chat_channel_id, TRUE, NOW(), NOW(), :mode
+          FROM users
+          INNER JOIN user_options uo ON uo.user_id = users.id
+          LEFT OUTER JOIN user_chat_channel_memberships uccm ON
+            uccm.chat_channel_id = :chat_channel_id AND uccm.user_id = users.id
+
+          LEFT OUTER JOIN group_users gu ON gu.user_id = users.id
+          LEFT OUTER JOIN category_groups cg ON cg.group_id = gu.group_id AND
+          cg.permission_type <= :permission_type
+
+          WHERE (users.id >= :start AND users.id <= :end) AND
+            users.staged IS FALSE AND
+            users.active AND
+            NOT EXISTS(SELECT 1 FROM anonymous_users a WHERE a.user_id = users.id) AND
+            (suspended_till IS NULL OR suspended_till <= :suspended_until) AND
+            (last_seen_at IS NULL OR last_seen_at > :last_seen_at) AND
+            uo.chat_enabled AND
+
+            (NOT EXISTS(SELECT 1 FROM category_groups WHERE category_id = :channel_category)
+              OR EXISTS (SELECT 1 FROM category_groups WHERE category_id = :channel_category AND group_id = :everyone AND permission_type <= :permission_type)
+              OR cg.category_id = :channel_category)
+
+          ON CONFLICT DO NOTHING
+
+          RETURNING user_chat_channel_memberships.user_id
+        SQL
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/services/chat/action/mark_mentions_read.rb b/plugins/chat/app/services/chat/action/mark_mentions_read.rb
new file mode 100644
index 00000000000..8d0207d63bb
--- /dev/null
+++ b/plugins/chat/app/services/chat/action/mark_mentions_read.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Chat
+  module Action
+    # When updating the read state of chat channel memberships, we also need
+    # to be sure to mark any mention-based notifications read at the same time.
+    class MarkMentionsRead
+      # @param [User] user The user that we are marking notifications read for.
+      # @param [Array] channel_ids The chat channels that are having their notifications
+      #   marked as read.
+      # @param [Integer] message_id Optional, used to limit the max message ID to mark
+      #   mentions read for in the channel.
+      # @param [Integer] thread_id Optional, if provided then all notifications related
+      #   to messages in the thread will be marked as read.
+      def self.call(user, channel_ids:, message_id: nil, thread_id: nil)
+        ::Notification
+          .where(notification_type: Notification.types[:chat_mention])
+          .where(user: user)
+          .where(read: false)
+          .joins("INNER JOIN chat_mentions ON chat_mentions.notification_id = notifications.id")
+          .joins("INNER JOIN chat_messages ON chat_mentions.chat_message_id = chat_messages.id")
+          .where("chat_messages.chat_channel_id IN (?)", channel_ids)
+          .then do |notifications|
+            break notifications if message_id.blank? && thread_id.blank?
+            break notifications.where("chat_messages.id <= ?", message_id) if message_id.present?
+            if thread_id.present?
+              notifications.where(
+                "chat_messages.id IN (SELECT id FROM chat_messages WHERE thread_id = ?)",
+                thread_id,
+              )
+            end
+          end
+          .update_all(read: true)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/services/chat/action/publish_auto_removed_user.rb b/plugins/chat/app/services/chat/action/publish_auto_removed_user.rb
new file mode 100644
index 00000000000..8d3912ecba3
--- /dev/null
+++ b/plugins/chat/app/services/chat/action/publish_auto_removed_user.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Chat
+  module Action
+    # All of the handlers that auto-remove users from chat
+    # (under services/auto_remove) need to publish which users
+    # were removed and from which channel, as well as logging
+    # this in staff actions so it's obvious why these users were
+    # removed.
+    class PublishAutoRemovedUser
+      # @param [Symbol] event_type What caused the users to be removed,
+      #   each handler will define this, e.g. category_updated, user_removed_from_group
+      # @param [Hash] users_removed_map A hash with channel_id as its keys and an
+      #   array of user_ids who were removed from the channel.
+      def self.call(event_type:, users_removed_map:)
+        return if users_removed_map.empty?
+
+        users_removed_map.each do |channel_id, user_ids|
+          job_spacer = JobTimeSpacer.new
+          user_ids.in_groups_of(1000, false) do |user_id_batch|
+            job_spacer.enqueue(
+              Jobs::Chat::KickUsersFromChannel,
+              { channel_id: channel_id, user_ids: user_id_batch },
+            )
+          end
+
+          if user_ids.any?
+            StaffActionLogger.new(Discourse.system_user).log_custom(
+              "chat_auto_remove_membership",
+              { users_removed: user_ids.length, channel_id: channel_id, event: event_type },
+            )
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/services/chat/action/remove_memberships.rb b/plugins/chat/app/services/chat/action/remove_memberships.rb
new file mode 100644
index 00000000000..6a2330ffe74
--- /dev/null
+++ b/plugins/chat/app/services/chat/action/remove_memberships.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Chat
+  module Action
+    class RemoveMemberships
+      def self.call(memberships:)
+        memberships
+          .destroy_all
+          .each_with_object(Hash.new { |h, k| h[k] = [] }) do |obj, hash|
+            hash[obj.chat_channel_id] << obj.user_id
+          end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/services/chat/action/reset_channels_last_message_ids.rb b/plugins/chat/app/services/chat/action/reset_channels_last_message_ids.rb
new file mode 100644
index 00000000000..ff3ea6d843b
--- /dev/null
+++ b/plugins/chat/app/services/chat/action/reset_channels_last_message_ids.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Chat
+  module Action
+    class ResetChannelsLastMessageIds
+      # @param [Array] last_message_ids The message IDs to match with the
+      #   last_message_id in Chat::Channel which will be reset
+      #   to NULL or the most recent non-deleted message in the channel to
+      #   update read state.
+      # @param [Integer] channel_ids The channel IDs to update. This is used
+      #   to scope the queries better.
+      def self.call(last_message_ids, channel_ids)
+        Chat::Channel
+          .where(id: channel_ids)
+          .where("last_message_id IN (?)", last_message_ids)
+          .find_in_batches { |channels| channels.each(&:update_last_message_id!) }
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/services/chat/action/reset_user_last_read_channel_message.rb b/plugins/chat/app/services/chat/action/reset_user_last_read_channel_message.rb
new file mode 100644
index 00000000000..f15a390d0c7
--- /dev/null
+++ b/plugins/chat/app/services/chat/action/reset_user_last_read_channel_message.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Chat
+  module Action
+    class ResetUserLastReadChannelMessage
+      # @param [Array] last_read_message_ids The message IDs to match with the
+      #   last_read_message_ids in UserChatChannelMembership which will be reset
+      #   to NULL or the most recent non-deleted message in the channel to
+      #   update read state.
+      # @param [Integer] channel_ids The channel IDs of the memberships to update,
+      #   this is used to find the latest non-deleted message in the channel.
+      def self.call(last_read_message_ids, channel_ids)
+        sql = <<~SQL
+         -- update the last_read_message_id to the most recent
+         -- non-deleted message in the channel so unread counts are correct.
+         -- the cte row_number is necessary to only return a single row
+         -- for each channel to prevent additional data being returned
+         WITH cte AS (
+           SELECT chat_channels.id AS chat_channel_id, last_message_id
+           FROM chat_channels
+           WHERE chat_channels.id IN (:channel_ids)
+         )
+         UPDATE user_chat_channel_memberships
+         SET last_read_message_id = cte.last_message_id
+         FROM cte
+         WHERE user_chat_channel_memberships.last_read_message_id IN (:last_read_message_ids)
+         AND cte.chat_channel_id = user_chat_channel_memberships.chat_channel_id;
+
+          -- then reset all last_read_message_ids to null
+          -- for the cases where all messages in the channel were
+          -- already deleted
+          UPDATE user_chat_channel_memberships
+          SET last_read_message_id = NULL
+          WHERE last_read_message_id IN (:last_read_message_ids);
+        SQL
+
+        DB.exec(sql, last_read_message_ids: last_read_message_ids, channel_ids: channel_ids)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/services/chat/action/reset_user_last_read_thread_message.rb b/plugins/chat/app/services/chat/action/reset_user_last_read_thread_message.rb
new file mode 100644
index 00000000000..a4692e778aa
--- /dev/null
+++ b/plugins/chat/app/services/chat/action/reset_user_last_read_thread_message.rb
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Chat
+  module Action
+    class ResetUserLastReadThreadMessage
+      # @param [Array] last_read_message_ids The message IDs to match with the
+      #   last_read_message_ids in UserChatThreadMembership which will be reset
+      #   to NULL or the most recent non-deleted message in the thread to
+      #   update read state.
+      # @param [Integer] thread_ids The thread IDs of the memberships to update,
+      #   this is used to find the latest non-deleted message in the thread.
+      def self.call(last_read_message_ids, thread_ids)
+        sql = <<~SQL
+         -- update the last_read_message_id to the most recent
+         -- non-deleted message in the thread so unread counts are correct.
+         -- the cte row_number is necessary to only return a single row
+         -- for each thread to prevent additional data being returned
+         WITH cte AS (
+           SELECT * FROM (
+             SELECT id, thread_id, row_number() OVER (
+                 PARTITION BY thread_id ORDER BY created_at DESC, id DESC
+               ) AS row_number
+             FROM chat_messages
+             WHERE deleted_at IS NULL AND thread_id IN (:thread_ids) AND chat_messages.id NOT IN (
+               SELECT original_message_id FROM chat_threads WHERE thread_id IN (:thread_ids)
+             )
+           ) AS recent_messages
+           WHERE recent_messages.row_number = 1
+         )
+         UPDATE user_chat_thread_memberships
+         SET last_read_message_id = cte.id
+         FROM cte
+         WHERE user_chat_thread_memberships.last_read_message_id IN (:last_read_message_ids)
+         AND cte.thread_id = user_chat_thread_memberships.thread_id;
+
+          -- then reset all last_read_message_ids to null
+          -- for the cases where all messages in the thread were
+          -- already deleted
+          UPDATE user_chat_thread_memberships
+          SET last_read_message_id = NULL
+          WHERE last_read_message_id IN (:last_read_message_ids);
+        SQL
+
+        DB.exec(sql, last_read_message_ids: last_read_message_ids, thread_ids: thread_ids)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/services/chat/auto_join_channel_batch.rb b/plugins/chat/app/services/chat/auto_join_channel_batch.rb
new file mode 100644
index 00000000000..7337835f48a
--- /dev/null
+++ b/plugins/chat/app/services/chat/auto_join_channel_batch.rb
@@ -0,0 +1,68 @@
+# NOTE: When changing auto-join logic, make sure to update the `settings.auto_join_users_info` translation as well.
+# frozen_string_literal: true
+
+module Chat
+  # Service responsible to create memberships for a channel and a section of user ids
+  #
+  # @example
+  #  Chat::AutoJoinChannelBatch.call(
+  #   channel_id: 1,
+  #   start_user_id: 27,
+  #   end_user_id: 58,
+  #  )
+  #
+  class AutoJoinChannelBatch
+    include Service::Base
+
+    contract
+    model :channel
+    step :create_memberships
+    step :recalculate_user_count
+    step :publish_new_channel
+
+    class Contract
+      # Backward-compatible attributes
+      attribute :chat_channel_id, :integer
+      attribute :starts_at, :integer
+      attribute :ends_at, :integer
+
+      # New attributes
+      attribute :channel_id, :integer
+      attribute :start_user_id, :integer
+      attribute :end_user_id, :integer
+
+      validates :channel_id, :start_user_id, :end_user_id, presence: true
+      validates :end_user_id, comparison: { greater_than_or_equal_to: :start_user_id }
+
+      # TODO (joffrey): remove after migration is done
+      before_validation do
+        self.channel_id ||= chat_channel_id
+        self.start_user_id ||= starts_at
+        self.end_user_id ||= ends_at
+      end
+    end
+
+    private
+
+    def fetch_channel(contract:, **)
+      ::Chat::CategoryChannel.find_by(id: contract.channel_id, auto_join_users: true)
+    end
+
+    def create_memberships(channel:, contract:, **)
+      context.added_user_ids =
+        ::Chat::Action::CreateMembershipsForAutoJoin.call(channel: channel, contract: contract)
+    end
+
+    def recalculate_user_count(channel:, added_user_ids:, **)
+      # Only do this if we are running auto-join for a single user, if we
+      # are doing it for many then we should do it after all batches are
+      # complete for the channel in Jobs::AutoJoinChannelMemberships
+      return unless added_user_ids.one?
+      ::Chat::ChannelMembershipManager.new(channel).recalculate_user_count
+    end
+
+    def publish_new_channel(channel:, added_user_ids:, **)
+      ::Chat::Publisher.publish_new_channel(channel.reload, User.where(id: added_user_ids))
+    end
+  end
+end
diff --git a/plugins/chat/app/services/chat/auto_remove/handle_category_updated.rb b/plugins/chat/app/services/chat/auto_remove/handle_category_updated.rb
new file mode 100644
index 00000000000..f09bebb46a1
--- /dev/null
+++ b/plugins/chat/app/services/chat/auto_remove/handle_category_updated.rb
@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+module Chat
+  module AutoRemove
+    # Fired from [Jobs::AutoRemoveMembershipHandleCategoryUpdated], which
+    # in turn is enqueued whenever the [DiscourseEvent] for :category_updated
+    # is triggered. Any users who can no longer access category-based channels
+    # based on category_groups and in turn group_users will be removed from
+    # those chat channels.
+    #
+    # If a user is in any groups that have the `full` or `create_post`
+    # [CategoryGroup#permission_types] or if the category has no groups remaining,
+    # then the user will remain in the channel.
+    class HandleCategoryUpdated
+      include Service::Base
+
+      contract
+      step :assign_defaults
+      policy :chat_enabled
+      model :category
+      model :category_channel_ids
+      model :users
+      step :remove_users_without_channel_permission
+      step :publish
+
+      class Contract
+        attribute :category_id, :integer
+
+        validates :category_id, presence: true
+      end
+
+      private
+
+      def assign_defaults
+        context[:users_removed_map] = {}
+      end
+
+      def chat_enabled
+        SiteSetting.chat_enabled
+      end
+
+      def fetch_category(contract:, **)
+        Category.find_by(id: contract.category_id)
+      end
+
+      def fetch_category_channel_ids(category:, **)
+        Chat::Channel.where(chatable: category).pluck(:id)
+      end
+
+      def fetch_users(category_channel_ids:, **)
+        User
+          .real
+          .activated
+          .not_suspended
+          .not_staged
+          .joins(:user_chat_channel_memberships)
+          .where("user_chat_channel_memberships.chat_channel_id IN (?)", category_channel_ids)
+          .where("NOT admin AND NOT moderator")
+      end
+
+      def remove_users_without_channel_permission(users:, category_channel_ids:, **)
+        memberships_to_remove =
+          Chat::Action::CalculateMembershipsForRemoval.call(
+            scoped_users: users,
+            channel_ids: category_channel_ids,
+          )
+
+        return if memberships_to_remove.blank?
+
+        context[:users_removed_map] = Chat::Action::RemoveMemberships.call(
+          memberships: Chat::UserChatChannelMembership.where(id: memberships_to_remove),
+        )
+      end
+
+      def publish(users_removed_map:, **)
+        Chat::Action::PublishAutoRemovedUser.call(
+          event_type: :category_updated,
+          users_removed_map: users_removed_map,
+        )
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/services/chat/auto_remove/handle_chat_allowed_groups_change.rb b/plugins/chat/app/services/chat/auto_remove/handle_chat_allowed_groups_change.rb
new file mode 100644
index 00000000000..3da46ab23ed
--- /dev/null
+++ b/plugins/chat/app/services/chat/auto_remove/handle_chat_allowed_groups_change.rb
@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+module Chat
+  module AutoRemove
+    # Fired from [Jobs::AutoRemoveMembershipHandleChatAllowedGroupsChange], which
+    # in turn is enqueued whenever the [DiscourseEvent] for :site_setting_changed
+    # is triggered for the chat_allowed_groups setting.
+    #
+    # If any of the chat_allowed_groups is the everyone auto group then nothing
+    # needs to be done.
+    #
+    # Otherwise, if there are no longer any chat_allowed_groups, we have to
+    # remove all non-admin users from category channels. Otherwise we just
+    # remove the ones who are not in any of the chat_allowed_groups.
+    #
+    # Direct message channel memberships are intentionally left alone,
+    # these are private communications between two people.
+    class HandleChatAllowedGroupsChange
+      include Service::Base
+
+      policy :chat_enabled
+      step :cast_new_allowed_groups_to_array
+      policy :not_everyone_allowed
+      model :users
+      model :memberships_to_remove
+      step :remove_users_outside_allowed_groups
+      step :publish
+
+      private
+
+      def chat_enabled
+        SiteSetting.chat_enabled
+      end
+
+      def cast_new_allowed_groups_to_array(new_allowed_groups:, **)
+        context[:new_allowed_groups] = new_allowed_groups.to_s.split("|").map(&:to_i)
+      end
+
+      def not_everyone_allowed(new_allowed_groups:, **)
+        !new_allowed_groups.include?(Group::AUTO_GROUPS[:everyone])
+      end
+
+      def fetch_users(new_allowed_groups:, **)
+        User
+          .real
+          .activated
+          .not_suspended
+          .not_staged
+          .where("NOT admin AND NOT moderator")
+          .joins(:user_chat_channel_memberships)
+          .distinct
+          .then do |users|
+            break users if new_allowed_groups.blank?
+            users.where(<<~SQL, new_allowed_groups)
+                users.id NOT IN (
+                  SELECT DISTINCT group_users.user_id
+                  FROM group_users
+                  WHERE group_users.group_id IN (?)
+                )
+              SQL
+          end
+      end
+
+      def fetch_memberships_to_remove(users:, **)
+        Chat::UserChatChannelMembership
+          .joins(:chat_channel)
+          .where(user_id: users.pluck(:id))
+          .where.not(chat_channel: { type: "DirectMessageChannel" })
+      end
+
+      def remove_users_outside_allowed_groups(memberships_to_remove:, **)
+        context[:users_removed_map] = Chat::Action::RemoveMemberships.call(
+          memberships: memberships_to_remove,
+        )
+      end
+
+      def publish(users_removed_map:, **)
+        Chat::Action::PublishAutoRemovedUser.call(
+          event_type: :chat_allowed_groups_changed,
+          users_removed_map: users_removed_map,
+        )
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/services/chat/auto_remove/handle_destroyed_group.rb b/plugins/chat/app/services/chat/auto_remove/handle_destroyed_group.rb
new file mode 100644
index 00000000000..b8aa9a9e153
--- /dev/null
+++ b/plugins/chat/app/services/chat/auto_remove/handle_destroyed_group.rb
@@ -0,0 +1,121 @@
+# frozen_string_literal: true
+
+module Chat
+  module AutoRemove
+    # Fired from [Jobs::AutoRemoveMembershipHandleUserRemovedFromGroup], which
+    # is in turn enqueued whenever the [DiscourseEvent] for :group_destroyed
+    # is triggered.
+    #
+    # The :group_destroyed event provides us with the user_ids of the former
+    # GroupUser records so we can scope this better.
+    #
+    # Since this could have potential wide-ranging impact, we have to check:
+    #   * The chat_allowed_groups [SiteSetting], and if any of the scoped users
+    #     are still allowed to use public chat channels based on this setting.
+    #   * The channel permissions of all the category chat channels the users
+    #     are a part of, based on [CategoryGroup] records
+    #
+    # If a user is in a groups that has the `full` or `create_post`
+    # [CategoryGroup#permission_types] or if the category has no groups remaining,
+    # then the user will remain in the channel.
+    class HandleDestroyedGroup
+      include Service::Base
+
+      contract
+      step :assign_defaults
+      policy :chat_enabled
+      policy :not_everyone_allowed
+      model :scoped_users
+      step :remove_users_outside_allowed_groups
+      step :remove_users_without_channel_permission
+      step :publish
+
+      class Contract
+        attribute :destroyed_group_user_ids
+
+        validates :destroyed_group_user_ids, presence: true
+      end
+
+      private
+
+      def assign_defaults
+        context[:users_removed_map] = {}
+      end
+
+      def chat_enabled
+        SiteSetting.chat_enabled
+      end
+
+      def not_everyone_allowed
+        !SiteSetting.chat_allowed_groups_map.include?(Group::AUTO_GROUPS[:everyone])
+      end
+
+      def fetch_scoped_users(destroyed_group_user_ids:, **)
+        User
+          .real
+          .activated
+          .not_suspended
+          .not_staged
+          .includes(:group_users)
+          .where("NOT admin AND NOT moderator")
+          .where(id: destroyed_group_user_ids)
+          .joins(:user_chat_channel_memberships)
+          .distinct
+      end
+
+      def remove_users_outside_allowed_groups(scoped_users:, **)
+        users = scoped_users
+
+        # Remove any of these users from all category channels if they
+        # are not in any of the chat_allowed_groups or if there are no
+        # chat allowed groups.
+        if SiteSetting.chat_allowed_groups_map.any?
+          group_user_sql = <<~SQL
+              users.id NOT IN (
+                SELECT DISTINCT group_users.user_id
+                FROM group_users
+                WHERE group_users.group_id IN (#{SiteSetting.chat_allowed_groups_map.join(",")})
+              )
+            SQL
+          users = users.where(group_user_sql)
+        end
+
+        user_ids_to_remove = users.pluck(:id)
+        return if user_ids_to_remove.empty?
+
+        memberships_to_remove =
+          Chat::UserChatChannelMembership
+            .joins(:chat_channel)
+            .where(user_id: user_ids_to_remove)
+            .where.not(chat_channel: { type: "DirectMessageChannel" })
+
+        return if memberships_to_remove.empty?
+
+        context[:users_removed_map] = Chat::Action::RemoveMemberships.call(
+          memberships: memberships_to_remove,
+        )
+      end
+
+      def remove_users_without_channel_permission(scoped_users:, **)
+        memberships_to_remove =
+          Chat::Action::CalculateMembershipsForRemoval.call(scoped_users: scoped_users)
+
+        return if memberships_to_remove.empty?
+
+        context.merge(
+          users_removed_map:
+            Chat::Action::RemoveMemberships.call(
+              memberships: Chat::UserChatChannelMembership.where(id: memberships_to_remove),
+            ),
+        )
+      end
+
+      def publish(users_removed_map:, **)
+        Chat::Action::PublishAutoRemovedUser.call(
+          event_type: :destroyed_group,
+          users_removed_map: users_removed_map,
+        )
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/services/chat/auto_remove/handle_user_removed_from_group.rb b/plugins/chat/app/services/chat/auto_remove/handle_user_removed_from_group.rb
new file mode 100644
index 00000000000..dea3af483d5
--- /dev/null
+++ b/plugins/chat/app/services/chat/auto_remove/handle_user_removed_from_group.rb
@@ -0,0 +1,100 @@
+# frozen_string_literal: true
+
+module Chat
+  module AutoRemove
+    # Fired from [Jobs::AutoRemoveMembershipHandleUserRemovedFromGroup], which
+    # in turn is enqueued whenever the [DiscourseEvent] for :user_removed_from_group
+    # is triggered.
+    #
+    # Staff users will never be affected by this, they can always chat regardless
+    # of group permissions.
+    #
+    # Since this could have potential wide-ranging impact, we have to check:
+    #   * The chat_allowed_groups [SiteSetting], and if the scoped user
+    #     is still allowed to use public chat channels based on this setting.
+    #   * The channel permissions of all the category chat channels the user
+    #     is a part of, based on [CategoryGroup] records
+    #
+    # Direct message channel memberships are intentionally left alone,
+    # these are private communications between two people.
+    class HandleUserRemovedFromGroup
+      include Service::Base
+
+      contract
+      step :assign_defaults
+      policy :chat_enabled
+      policy :not_everyone_allowed
+      model :user
+      policy :user_not_staff
+      step :remove_if_outside_chat_allowed_groups
+      step :remove_from_private_channels
+      step :publish
+
+      class Contract
+        attribute :user_id, :integer
+
+        validates :user_id, presence: true
+      end
+
+      private
+
+      def assign_defaults
+        context[:users_removed_map] = {}
+      end
+
+      def chat_enabled
+        SiteSetting.chat_enabled
+      end
+
+      def not_everyone_allowed
+        !SiteSetting.chat_allowed_groups_map.include?(Group::AUTO_GROUPS[:everyone])
+      end
+
+      def fetch_user(contract:, **)
+        User.find_by(id: contract.user_id)
+      end
+
+      def user_not_staff(user:, **)
+        !user.staff?
+      end
+
+      def remove_if_outside_chat_allowed_groups(user:, **)
+        if SiteSetting.chat_allowed_groups_map.empty? ||
+             !GroupUser.exists?(group_id: SiteSetting.chat_allowed_groups_map, user: user)
+          memberships_to_remove =
+            Chat::UserChatChannelMembership
+              .joins(:chat_channel)
+              .where(user_id: user.id)
+              .where.not(chat_channel: { type: "DirectMessageChannel" })
+
+          return if memberships_to_remove.empty?
+
+          context[:users_removed_map] = Chat::Action::RemoveMemberships.call(
+            memberships: memberships_to_remove,
+          )
+        end
+      end
+
+      def remove_from_private_channels(user:, **)
+        memberships_to_remove =
+          Chat::Action::CalculateMembershipsForRemoval.call(scoped_users: [user])
+
+        return if memberships_to_remove.empty?
+
+        context.merge(
+          users_removed_map:
+            Chat::Action::RemoveMemberships.call(
+              memberships: Chat::UserChatChannelMembership.where(id: memberships_to_remove),
+            ),
+        )
+      end
+
+      def publish(users_removed_map:, **)
+        Chat::Action::PublishAutoRemovedUser.call(
+          event_type: :user_removed_from_group,
+          users_removed_map: users_removed_map,
+        )
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/services/chat/create_category_channel.rb b/plugins/chat/app/services/chat/create_category_channel.rb
new file mode 100644
index 00000000000..a9cf36d5c8b
--- /dev/null
+++ b/plugins/chat/app/services/chat/create_category_channel.rb
@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+module Chat
+  # Service responsible for creating a new category chat channel.
+  #
+  # @example
+  #  Service::Chat::CreateCategoryChannel.call(
+  #   guardian: guardian,
+  #   name: "SuperChannel",
+  #   description: "This is the best channel",
+  #   slug: "super-channel",
+  #   category_id: category.id,
+  #   threading_enabled: true,
+  #  )
+  #
+  class CreateCategoryChannel
+    include Service::Base
+
+    # @!method call(guardian:, **params_to_create)
+    #   @param [Guardian] guardian
+    #   @param [Hash] params_to_create
+    #   @option params_to_create [String] name
+    #   @option params_to_create [String] description
+    #   @option params_to_create [String] slug
+    #   @option params_to_create [Boolean] auto_join_users
+    #   @option params_to_create [Integer] category_id
+    #   @option params_to_create [Boolean] threading_enabled
+    #   @return [Service::Base::Context]
+
+    policy :public_channels_enabled
+    policy :can_create_channel
+    contract
+    model :category, :fetch_category
+    policy :category_channel_does_not_exist
+    transaction do
+      model :channel, :create_channel
+      model :membership, :create_membership
+    end
+    step :enforce_automatic_channel_memberships
+
+    # @!visibility private
+    class Contract
+      attribute :name, :string
+      attribute :description, :string
+      attribute :slug, :string
+      attribute :category_id, :integer
+      attribute :auto_join_users, :boolean, default: false
+      attribute :threading_enabled, :boolean, default: false
+
+      before_validation do
+        self.auto_join_users = auto_join_users.presence || false
+        self.threading_enabled = threading_enabled.presence || false
+      end
+
+      validates :category_id, presence: true
+      validates :name, length: { maximum: SiteSetting.max_topic_title_length }
+    end
+
+    private
+
+    def public_channels_enabled
+      SiteSetting.enable_public_channels
+    end
+
+    def can_create_channel(guardian:, **)
+      guardian.can_create_chat_channel?
+    end
+
+    def fetch_category(contract:, **)
+      Category.find_by(id: contract.category_id)
+    end
+
+    def category_channel_does_not_exist(category:, contract:, **)
+      !Chat::Channel.exists?(chatable: category, name: contract.name)
+    end
+
+    def create_channel(category:, contract:, **)
+      category.create_chat_channel(
+        name: contract.name,
+        slug: contract.slug,
+        description: contract.description,
+        user_count: 1,
+        auto_join_users: contract.auto_join_users,
+        threading_enabled: contract.threading_enabled,
+      )
+    end
+
+    def create_membership(channel:, guardian:, **)
+      channel.user_chat_channel_memberships.create(user: guardian.user, following: true)
+    end
+
+    def enforce_automatic_channel_memberships(channel:, **)
+      return if !channel.auto_join_users?
+      Chat::ChannelMembershipManager.new(channel).enforce_automatic_channel_memberships
+    end
+  end
+end
diff --git a/plugins/chat/app/services/chat/create_direct_message_channel.rb b/plugins/chat/app/services/chat/create_direct_message_channel.rb
new file mode 100644
index 00000000000..1b5600bcf53
--- /dev/null
+++ b/plugins/chat/app/services/chat/create_direct_message_channel.rb
@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+module Chat
+  # Service responsible for creating a new direct message chat channel.
+  # The guardian passed in is the "acting user" when creating the channel
+  # and deciding whether the actor can communicate with the users that
+  # are passed in.
+  #
+  # @example
+  #  Service::Chat::CreateDirectMessageChannel.call(
+  #    guardian: guardian,
+  #    target_usernames: ["bob", "alice"]
+  #  )
+  #
+  class CreateDirectMessageChannel
+    include Service::Base
+
+    # @!method call(guardian:, **params_to_create)
+    #   @param [Guardian] guardian
+    #   @param [Hash] params_to_create
+    #   @option params_to_create [Array<String>] target_usernames
+    #   @return [Service::Base::Context]
+
+    policy :can_create_direct_message
+    contract
+    model :target_users
+    policy :satisfies_dms_max_users_limit,
+           class_name: Chat::DirectMessageChannel::MaxUsersExcessPolicy
+    model :user_comm_screener
+    policy :actor_allows_dms
+    policy :targets_allow_dms_from_user,
+           class_name: Chat::DirectMessageChannel::CanCommunicateAllPartiesPolicy
+    model :direct_message, :fetch_or_create_direct_message
+    model :channel, :fetch_or_create_channel
+    step :update_memberships
+
+    # @!visibility private
+    class Contract
+      attribute :target_usernames, :array
+      validates :target_usernames, presence: true
+    end
+
+    private
+
+    def can_create_direct_message(guardian:, **)
+      guardian.can_create_direct_message?
+    end
+
+    def fetch_target_users(guardian:, contract:, **)
+      User.where(username: [guardian.user.username, *contract.target_usernames]).to_a
+    end
+
+    def fetch_user_comm_screener(target_users:, guardian:, **)
+      UserCommScreener.new(acting_user: guardian.user, target_user_ids: target_users.map(&:id))
+    end
+
+    def actor_allows_dms(user_comm_screener:, **)
+      !user_comm_screener.actor_disallowing_all_pms?
+    end
+
+    def fetch_or_create_direct_message(target_users:, **)
+      Chat::DirectMessage.for_user_ids(target_users.map(&:id)) ||
+        Chat::DirectMessage.create(user_ids: target_users.map(&:id))
+    end
+
+    def fetch_or_create_channel(direct_message:, **)
+      Chat::DirectMessageChannel.find_or_create_by(chatable: direct_message)
+    end
+
+    def update_memberships(channel:, target_users:, **)
+      always_level = Chat::UserChatChannelMembership::NOTIFICATION_LEVELS[:always]
+
+      memberships =
+        target_users.map do |user|
+          {
+            user_id: user.id,
+            chat_channel_id: channel.id,
+            muted: false,
+            following: false,
+            desktop_notification_level: always_level,
+            mobile_notification_level: always_level,
+            created_at: Time.zone.now,
+            updated_at: Time.zone.now,
+          }
+        end
+
+      Chat::UserChatChannelMembership.upsert_all(
+        memberships,
+        unique_by: %i[user_id chat_channel_id],
+      )
+    end
+  end
+end
diff --git a/plugins/chat/app/services/chat/list_channel_messages.rb b/plugins/chat/app/services/chat/list_channel_messages.rb
new file mode 100644
index 00000000000..6c1f5155a49
--- /dev/null
+++ b/plugins/chat/app/services/chat/list_channel_messages.rb
@@ -0,0 +1,164 @@
+# frozen_string_literal: true
+
+module Chat
+  # List messages of a channel before and after a specific target (id, date),
+  # or fetching paginated messages from last read.
+  #
+  # @example
+  #  Chat::ListChannelMessages.call(channel_id: 2, guardian: guardian, **optional_params)
+  #
+  class ListChannelMessages
+    include Service::Base
+
+    # @!method call(guardian:)
+    #   @param [Integer] channel_id
+    #   @param [Guardian] guardian
+    #   @return [Service::Base::Context]
+
+    contract
+
+    model :channel
+    policy :can_view_channel
+    step :fetch_optional_membership
+    step :enabled_threads?
+    step :determine_target_message_id
+    policy :target_message_exists
+    step :fetch_messages
+    step :fetch_thread_ids
+    step :fetch_tracking
+    step :fetch_thread_participants
+    step :fetch_thread_memberships
+    step :update_membership_last_viewed_at
+
+    class Contract
+      attribute :channel_id, :integer
+      validates :channel_id, presence: true
+
+      attribute :page_size, :integer
+      validates :page_size,
+                numericality: {
+                  less_than_or_equal_to: ::Chat::MessagesQuery::MAX_PAGE_SIZE,
+                  only_integer: true,
+                },
+                allow_nil: true
+
+      # If this is not present, then we just fetch messages with page_size
+      # and direction.
+      attribute :target_message_id, :integer # (optional)
+      attribute :direction, :string # (optional)
+      attribute :fetch_from_last_read, :boolean # (optional)
+      attribute :target_date, :string # (optional)
+
+      validates :direction,
+                inclusion: {
+                  in: Chat::MessagesQuery::VALID_DIRECTIONS,
+                },
+                allow_nil: true
+    end
+
+    private
+
+    def fetch_channel(contract:, **)
+      ::Chat::Channel.strict_loading.includes(:chatable).find_by(id: contract.channel_id)
+    end
+
+    def fetch_optional_membership(channel:, guardian:, **)
+      context.membership = channel.membership_for(guardian.user)
+    end
+
+    def enabled_threads?(channel:, **)
+      context.enabled_threads = channel.threading_enabled
+    end
+
+    def can_view_channel(guardian:, channel:, **)
+      guardian.can_preview_chat_channel?(channel)
+    end
+
+    def determine_target_message_id(contract:, **)
+      if contract.fetch_from_last_read
+        context.target_message_id = context.membership&.last_read_message_id
+      else
+        context.target_message_id = contract.target_message_id
+      end
+    end
+
+    def target_message_exists(channel:, guardian:, **)
+      return true if context.target_message_id.blank?
+      target_message =
+        Chat::Message.with_deleted.find_by(id: context.target_message_id, chat_channel: channel)
+      return false if target_message.blank?
+      return true if !target_message.trashed?
+      target_message.user_id == guardian.user.id || guardian.is_staff?
+    end
+
+    def fetch_messages(channel:, contract:, guardian:, enabled_threads:, **)
+      messages_data =
+        ::Chat::MessagesQuery.call(
+          channel: channel,
+          guardian: guardian,
+          target_message_id: context.target_message_id,
+          include_thread_messages: !enabled_threads,
+          page_size: contract.page_size || Chat::MessagesQuery::MAX_PAGE_SIZE,
+          direction: contract.direction,
+          target_date: contract.target_date,
+        )
+
+      context.can_load_more_past = messages_data[:can_load_more_past]
+      context.can_load_more_future = messages_data[:can_load_more_future]
+      context.target_message_id = messages_data[:target_message_id]
+
+      messages_data[:target_message] = (
+        if enabled_threads && messages_data[:target_message]&.thread_reply?
+          []
+        else
+          [messages_data[:target_message]]
+        end
+      )
+
+      context.messages = [
+        messages_data[:messages],
+        messages_data[:past_messages]&.reverse,
+        messages_data[:target_message],
+        messages_data[:future_messages],
+      ].flatten.compact
+    end
+
+    def fetch_tracking(guardian:, enabled_threads:, **)
+      context.tracking = {}
+
+      return if !enabled_threads || !context.thread_ids.present?
+
+      context.tracking =
+        ::Chat::TrackingStateReportQuery.call(
+          guardian: guardian,
+          thread_ids: context.thread_ids,
+          include_threads: true,
+        )
+    end
+
+    def fetch_thread_ids(messages:, **)
+      context.thread_ids = messages.map(&:thread_id).compact.uniq
+    end
+
+    def fetch_thread_participants(messages:, **)
+      return if context.thread_ids.empty?
+
+      context.thread_participants =
+        ::Chat::ThreadParticipantQuery.call(thread_ids: context.thread_ids)
+    end
+
+    def fetch_thread_memberships(guardian:, **)
+      return if context.thread_ids.empty?
+
+      context.thread_memberships =
+        ::Chat::UserChatThreadMembership.where(
+          thread_id: context.thread_ids,
+          user_id: guardian.user.id,
+        )
+    end
+
+    def update_membership_last_viewed_at(guardian:, **)
+      context.membership&.update!(last_viewed_at: Time.zone.now)
+    end
+  end
+end
diff --git a/plugins/chat/app/services/chat/list_channel_thread_messages.rb b/plugins/chat/app/services/chat/list_channel_thread_messages.rb
new file mode 100644
index 00000000000..b592787e09f
--- /dev/null
+++ b/plugins/chat/app/services/chat/list_channel_thread_messages.rb
@@ -0,0 +1,116 @@
+# frozen_string_literal: true
+
+module Chat
+  # List messages of a thread before and after a specific target (id, date),
+  # or fetching paginated messages from last read.
+  #
+  # @example
+  #  Chat::ListThreadMessages.call(thread_id: 2, guardian: guardian, **optional_params)
+  #
+  class ListChannelThreadMessages
+    include Service::Base
+
+    # @!method call(guardian:)
+    #   @param [Integer] channel_id
+    #   @param [Guardian] guardian
+    #   @option optional_params [Integer] thread_id
+    #   @option optional_params [Integer] channel_id
+    #   @return [Service::Base::Context]
+
+    contract
+
+    model :thread
+    policy :ensure_thread_enabled
+    policy :can_view_thread
+    step :fetch_optional_membership
+    step :determine_target_message_id
+    policy :target_message_exists
+    step :fetch_messages
+
+    class Contract
+      attribute :thread_id, :integer
+      validates :thread_id, presence: true
+
+      # If this is not present, then we just fetch messages with page_size
+      # and direction.
+      attribute :target_message_id, :integer # (optional)
+      attribute :direction, :string # (optional)
+      attribute :page_size, :integer # (optional)
+      attribute :fetch_from_last_read, :boolean # (optional)
+      attribute :target_date, :string # (optional)
+
+      validates :direction,
+                inclusion: {
+                  in: Chat::MessagesQuery::VALID_DIRECTIONS,
+                },
+                allow_nil: true
+      validates :page_size,
+                numericality: {
+                  less_than_or_equal_to: Chat::MessagesQuery::MAX_PAGE_SIZE,
+                  only_integer: true,
+                },
+                allow_nil: true
+    end
+
+    private
+
+    def fetch_optional_membership(thread:, guardian:, **)
+      context.membership = thread.membership_for(guardian.user)
+    end
+
+    def fetch_thread(contract:, **)
+      ::Chat::Thread.strict_loading.includes(channel: :chatable).find_by(id: contract.thread_id)
+    end
+
+    def ensure_thread_enabled(thread:, **)
+      thread.channel.threading_enabled
+    end
+
+    def can_view_thread(guardian:, thread:, **)
+      guardian.can_preview_chat_channel?(thread.channel)
+    end
+
+    def determine_target_message_id(contract:, membership:, guardian:, **)
+      if contract.fetch_from_last_read
+        context.target_message_id = membership&.last_read_message_id
+      else
+        context.target_message_id = contract.target_message_id
+      end
+    end
+
+    def target_message_exists(contract:, guardian:, **)
+      return true if context.target_message_id.blank?
+      target_message =
+        ::Chat::Message.with_deleted.find_by(
+          id: context.target_message_id,
+          thread_id: contract.thread_id,
+        )
+      return false if target_message.blank?
+      return true if !target_message.trashed?
+      target_message.user_id == guardian.user.id || guardian.is_staff?
+    end
+
+    def fetch_messages(thread:, guardian:, contract:, **)
+      messages_data =
+        ::Chat::MessagesQuery.call(
+          channel: thread.channel,
+          guardian: guardian,
+          target_message_id: context.target_message_id,
+          thread_id: thread.id,
+          page_size: contract.page_size || Chat::MessagesQuery::MAX_PAGE_SIZE,
+          direction: contract.direction,
+          target_date: contract.target_date,
+        )
+
+      context.can_load_more_past = messages_data[:can_load_more_past]
+      context.can_load_more_future = messages_data[:can_load_more_future]
+
+      context.messages = [
+        messages_data[:messages],
+        messages_data[:past_messages]&.reverse,
+        messages_data[:target_message],
+        messages_data[:future_messages],
+      ].flatten.compact
+    end
+  end
+end
diff --git a/plugins/chat/app/services/chat/lookup_channel_threads.rb b/plugins/chat/app/services/chat/lookup_channel_threads.rb
new file mode 100644
index 00000000000..60255561906
--- /dev/null
+++ b/plugins/chat/app/services/chat/lookup_channel_threads.rb
@@ -0,0 +1,145 @@
+# frozen_string_literal: true
+
+module Chat
+  # Gets a list of threads for a channel to be shown in an index.
+  # In future pagination and filtering will be added -- for now
+  # we just want to return N threads ordered by the latest
+  # message that a user has sent in a thread.
+  #
+  # Only threads that the user is a member of with a notification level
+  # of normal or tracking will be returned.
+  #
+  # @example
+  #  Chat::LookupChannelThreads.call(channel_id: 2, guardian: guardian, limit: 5, offset: 2)
+  #
+  class LookupChannelThreads
+    include Service::Base
+
+    THREADS_LIMIT = 10
+
+    # @!method call(channel_id:, guardian:, limit: nil, offset: nil)
+    #   @param [Integer] channel_id
+    #   @param [Guardian] guardian
+    #   @param [Integer] limit
+    #   @param [Integer] offset
+    #   @return [Service::Base::Context]
+
+    contract
+    step :set_limit
+    step :set_offset
+    model :channel
+    policy :threading_enabled_for_channel
+    policy :can_view_channel
+    model :threads
+    step :fetch_tracking
+    step :fetch_memberships
+    step :build_load_more_url
+
+    # @!visibility private
+    class Contract
+      attribute :channel_id, :integer
+      validates :channel_id, presence: true
+
+      attribute :limit, :integer
+      attribute :offset, :integer
+    end
+
+    private
+
+    def set_limit(contract:, **)
+      context.limit = (contract.limit || THREADS_LIMIT).to_i.clamp(1, THREADS_LIMIT)
+    end
+
+    def set_offset(contract:, **)
+      context.offset = [contract.offset || 0, 0].max
+    end
+
+    def fetch_channel(contract:, **)
+      ::Chat::Channel.strict_loading.includes(:chatable).find_by(id: contract.channel_id)
+    end
+
+    def threading_enabled_for_channel(channel:, **)
+      channel.threading_enabled
+    end
+
+    def can_view_channel(guardian:, channel:, **)
+      guardian.can_preview_chat_channel?(channel)
+    end
+
+    def fetch_threads(guardian:, channel:, **)
+      ::Chat::Thread
+        .strict_loading
+        .includes(
+          :channel,
+          :user_chat_thread_memberships,
+          original_message_user: :user_status,
+          last_message: [
+            :uploads,
+            :chat_webhook_event,
+            :chat_channel,
+            chat_mentions: {
+              user: :user_status,
+            },
+            user: :user_status,
+          ],
+          original_message: [
+            :uploads,
+            :chat_webhook_event,
+            :chat_channel,
+            chat_mentions: {
+              user: :user_status,
+            },
+            user: :user_status,
+          ],
+        )
+        .joins(:user_chat_thread_memberships, :original_message)
+        .joins(
+          "LEFT JOIN chat_messages AS last_message ON last_message.id = chat_threads.last_message_id",
+        )
+        .where("user_chat_thread_memberships.user_id = ?", guardian.user.id)
+        .where(
+          "user_chat_thread_memberships.notification_level IN (?)",
+          [
+            ::Chat::UserChatThreadMembership.notification_levels[:normal],
+            ::Chat::UserChatThreadMembership.notification_levels[:tracking],
+          ],
+        )
+        .where("chat_threads.channel_id = ?", channel.id)
+        .where("last_message.deleted_at IS NULL")
+        .limit(context.limit)
+        .offset(context.offset)
+        .order(
+          "CASE WHEN (
+            chat_threads.last_message_id > user_chat_thread_memberships.last_read_message_id OR
+              user_chat_thread_memberships.last_read_message_id IS NULL
+          ) THEN 0 ELSE 1 END, last_message.created_at DESC",
+        )
+    end
+
+    def fetch_tracking(guardian:, threads:, **)
+      context.tracking =
+        ::Chat::TrackingStateReportQuery.call(
+          guardian: guardian,
+          thread_ids: threads.map(&:id),
+          include_threads: true,
+        ).thread_tracking
+    end
+
+    def fetch_memberships(guardian:, threads:, **)
+      context.memberships =
+        ::Chat::UserChatThreadMembership.where(
+          thread_id: threads.map(&:id),
+          user_id: guardian.user.id,
+        )
+    end
+
+    def build_load_more_url(contract:, **)
+      load_more_params = { offset: context.offset + context.limit }.to_query
+      context.load_more_url =
+        ::URI::HTTP.build(
+          path: "/chat/api/channels/#{contract.channel_id}/threads",
+          query: load_more_params,
+        ).request_uri
+    end
+  end
+end
diff --git a/plugins/chat/app/services/chat/lookup_thread.rb b/plugins/chat/app/services/chat/lookup_thread.rb
new file mode 100644
index 00000000000..789665ae588
--- /dev/null
+++ b/plugins/chat/app/services/chat/lookup_thread.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Chat
+  # Finds a thread within a channel. The thread_id and channel_id must
+  # match, and the channel must specifically have threading enabled.
+  #
+  # @example
+  #  Chat::LookupThread.call(thread_id: 88, channel_id: 2, guardian: guardian)
+  #
+  class LookupThread
+    include Service::Base
+
+    # @!method call(thread_id:, channel_id:, guardian:)
+    #   @param [Integer] thread_id
+    #   @param [Integer] channel_id
+    #   @param [Guardian] guardian
+    #   @return [Service::Base::Context]
+
+    contract
+    model :thread, :fetch_thread
+    policy :invalid_access
+    policy :threading_enabled_for_channel
+    step :fetch_membership
+    step :fetch_participants
+
+    # @!visibility private
+    class Contract
+      attribute :thread_id, :integer
+      attribute :channel_id, :integer
+
+      validates :thread_id, :channel_id, presence: true
+    end
+
+    private
+
+    def fetch_thread(contract:, **)
+      Chat::Thread.includes(
+        :channel,
+        original_message_user: :user_status,
+        original_message: :chat_webhook_event,
+      ).find_by(id: contract.thread_id, channel_id: contract.channel_id)
+    end
+
+    def invalid_access(guardian:, thread:, **)
+      guardian.can_preview_chat_channel?(thread.channel)
+    end
+
+    def threading_enabled_for_channel(thread:, **)
+      thread.channel.threading_enabled
+    end
+
+    def fetch_membership(thread:, guardian:, **)
+      context.membership = thread.membership_for(guardian.user)
+    end
+
+    def fetch_participants(thread:, **)
+      context.participants = ::Chat::ThreadParticipantQuery.call(thread_ids: [thread.id])[thread.id]
+    end
+  end
+end
diff --git a/plugins/chat/app/services/chat/mark_all_user_channels_read.rb b/plugins/chat/app/services/chat/mark_all_user_channels_read.rb
new file mode 100644
index 00000000000..0f88cdc1101
--- /dev/null
+++ b/plugins/chat/app/services/chat/mark_all_user_channels_read.rb
@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module Chat
+  # Service responsible for marking all the channels that a user is a
+  # member of _and following_ as read, including mentions.
+  #
+  # @example
+  #  Chat::MarkAllUserChannelsRead.call(guardian: guardian)
+  #
+  class MarkAllUserChannelsRead
+    include ::Service::Base
+
+    # @!method call(guardian:)
+    #   @param [Guardian] guardian
+    #   @return [Service::Base::Context]
+
+    transaction do
+      step :update_last_read_message_ids
+      step :mark_associated_mentions_as_read
+      step :publish_user_tracking_state
+    end
+
+    private
+
+    def update_last_read_message_ids(guardian:, **)
+      updated_memberships = DB.query(<<~SQL, user_id: guardian.user.id)
+        UPDATE user_chat_channel_memberships
+        SET last_read_message_id = chat_channels.last_message_id
+        FROM chat_channels
+        WHERE user_chat_channel_memberships.chat_channel_id = chat_channels.id AND
+          chat_channels.last_message_id > COALESCE(user_chat_channel_memberships.last_read_message_id, 0) AND
+          user_chat_channel_memberships.user_id = :user_id AND
+          user_chat_channel_memberships.following
+        RETURNING user_chat_channel_memberships.id AS membership_id,
+                  user_chat_channel_memberships.chat_channel_id AS channel_id,
+                  user_chat_channel_memberships.last_read_message_id;
+      SQL
+      context[:updated_memberships] = updated_memberships
+    end
+
+    def mark_associated_mentions_as_read(guardian:, updated_memberships:, **)
+      return if updated_memberships.empty?
+
+      ::Chat::Action::MarkMentionsRead.call(
+        guardian.user,
+        channel_ids: updated_memberships.map(&:channel_id),
+      )
+    end
+
+    def publish_user_tracking_state(guardian:, updated_memberships:, **)
+      data =
+        updated_memberships.each_with_object({}) do |membership, data_hash|
+          data_hash[membership.channel_id] = {
+            last_read_message_id: membership.last_read_message_id,
+            membership_id: membership.membership_id,
+          }
+        end
+      Chat::Publisher.publish_bulk_user_tracking_state!(guardian.user, data)
+    end
+  end
+end
diff --git a/plugins/chat/app/services/chat/message_destroyer.rb b/plugins/chat/app/services/chat/message_destroyer.rb
new file mode 100644
index 00000000000..6262a0df9bb
--- /dev/null
+++ b/plugins/chat/app/services/chat/message_destroyer.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Chat
+  class MessageDestroyer
+    def destroy_in_batches(chat_messages_query, batch_size: 200)
+      chat_messages_query
+        .in_batches(of: batch_size)
+        .each do |relation|
+          destroyed_ids = relation.destroy_all.pluck(:id, :chat_channel_id)
+          destroyed_message_ids = destroyed_ids.map(&:first).uniq
+          destroyed_message_channel_ids = destroyed_ids.map(&:second).uniq
+
+          # This needs to be done before reset_last_read so we can lean on the last_message_id
+          # there.
+          reset_last_message_ids(destroyed_message_ids, destroyed_message_channel_ids)
+
+          reset_last_read(destroyed_message_ids, destroyed_message_channel_ids)
+          delete_flags(destroyed_message_ids)
+        end
+    end
+
+    private
+
+    def reset_last_message_ids(destroyed_message_ids, destroyed_message_channel_ids)
+      ::Chat::Action::ResetChannelsLastMessageIds.call(
+        destroyed_message_ids,
+        destroyed_message_channel_ids,
+      )
+    end
+
+    def reset_last_read(destroyed_message_ids, destroyed_message_channel_ids)
+      ::Chat::Action::ResetUserLastReadChannelMessage.call(
+        destroyed_message_ids,
+        destroyed_message_channel_ids,
+      )
+    end
+
+    def delete_flags(message_ids)
+      Chat::ReviewableMessage.where(target_id: message_ids).destroy_all
+    end
+  end
+end
diff --git a/plugins/chat/app/services/chat/publisher.rb b/plugins/chat/app/services/chat/publisher.rb
new file mode 100644
index 00000000000..5d5a39bdadd
--- /dev/null
+++ b/plugins/chat/app/services/chat/publisher.rb
@@ -0,0 +1,495 @@
+# frozen_string_literal: true
+
+module Chat
+  module Publisher
+    def self.new_messages_message_bus_channel(chat_channel_id)
+      "#{root_message_bus_channel(chat_channel_id)}/new-messages"
+    end
+
+    def self.root_message_bus_channel(chat_channel_id)
+      "/chat/#{chat_channel_id}"
+    end
+
+    def self.thread_message_bus_channel(chat_channel_id, thread_id)
+      "#{root_message_bus_channel(chat_channel_id)}/thread/#{thread_id}"
+    end
+
+    def self.calculate_publish_targets(channel, message, staged_thread_id: nil)
+      return [root_message_bus_channel(channel.id)] if !allow_publish_to_thread?(channel)
+
+      if message.thread_om?
+        [
+          root_message_bus_channel(channel.id),
+          thread_message_bus_channel(channel.id, message.thread_id),
+        ]
+      elsif staged_thread_id || message.thread_reply?
+        targets = [thread_message_bus_channel(channel.id, message.thread_id)]
+        targets << thread_message_bus_channel(channel.id, staged_thread_id) if staged_thread_id
+        targets
+      else
+        [root_message_bus_channel(channel.id)]
+      end
+    end
+
+    def self.allow_publish_to_thread?(channel)
+      channel.threading_enabled
+    end
+
+    def self.publish_new!(chat_channel, chat_message, staged_id, staged_thread_id: nil)
+      message_bus_targets =
+        calculate_publish_targets(chat_channel, chat_message, staged_thread_id: staged_thread_id)
+      publish_to_targets!(
+        message_bus_targets,
+        chat_channel,
+        serialize_message_with_type(chat_message, :sent).merge(
+          staged_id: staged_id,
+          staged_thread_id: staged_thread_id,
+        ),
+      )
+
+      if !chat_message.thread_reply? || !allow_publish_to_thread?(chat_channel)
+        MessageBus.publish(
+          self.new_messages_message_bus_channel(chat_channel.id),
+          {
+            type: "channel",
+            channel_id: chat_channel.id,
+            thread_id: chat_message.thread_id,
+            message:
+              Chat::MessageSerializer.new(
+                chat_message,
+                { scope: anonymous_guardian, root: false },
+              ).as_json,
+          },
+        )
+      end
+
+      if chat_message.thread_reply? && allow_publish_to_thread?(chat_channel)
+        MessageBus.publish(
+          self.new_messages_message_bus_channel(chat_channel.id),
+          {
+            type: "thread",
+            channel_id: chat_channel.id,
+            thread_id: chat_message.thread_id,
+            message:
+              Chat::MessageSerializer.new(
+                chat_message,
+                { scope: anonymous_guardian, root: false },
+              ).as_json,
+          },
+          permissions(chat_channel),
+        )
+
+        publish_thread_original_message_metadata!(chat_message.thread)
+      end
+    end
+
+    def self.publish_thread_original_message_metadata!(thread)
+      preview =
+        ::Chat::ThreadPreviewSerializer.new(
+          thread,
+          participants: ::Chat::ThreadParticipantQuery.call(thread_ids: [thread.id])[thread.id],
+          root: false,
+        ).as_json
+      publish_to_channel!(
+        thread.channel,
+        {
+          type: :update_thread_original_message,
+          original_message_id: thread.original_message_id,
+          preview: preview.as_json,
+        },
+      )
+    end
+
+    def self.publish_thread_created!(chat_channel, chat_message, thread_id, staged_thread_id)
+      publish_to_channel!(
+        chat_channel,
+        serialize_message_with_type(
+          chat_message,
+          :thread_created,
+          { thread_id: thread_id, staged_thread_id: staged_thread_id },
+        ),
+      )
+    end
+
+    def self.publish_processed!(chat_message)
+      chat_channel = chat_message.chat_channel
+      message_bus_targets = calculate_publish_targets(chat_channel, chat_message)
+      publish_to_targets!(
+        message_bus_targets,
+        chat_channel,
+        { type: :processed, chat_message: { id: chat_message.id, cooked: chat_message.cooked } },
+      )
+    end
+
+    def self.publish_edit!(chat_channel, chat_message)
+      message_bus_targets = calculate_publish_targets(chat_channel, chat_message)
+      publish_to_targets!(
+        message_bus_targets,
+        chat_channel,
+        serialize_message_with_type(chat_message, :edit),
+      )
+    end
+
+    def self.publish_refresh!(chat_channel, chat_message)
+      message_bus_targets = calculate_publish_targets(chat_channel, chat_message)
+      publish_to_targets!(
+        message_bus_targets,
+        chat_channel,
+        serialize_message_with_type(chat_message, :refresh),
+      )
+    end
+
+    def self.publish_reaction!(chat_channel, chat_message, action, user, emoji)
+      message_bus_targets = calculate_publish_targets(chat_channel, chat_message)
+      publish_to_targets!(
+        message_bus_targets,
+        chat_channel,
+        {
+          action: action,
+          user: BasicUserSerializer.new(user, root: false).as_json,
+          emoji: emoji,
+          type: :reaction,
+          chat_message_id: chat_message.id,
+        },
+      )
+    end
+
+    def self.publish_presence!(chat_channel, user, typ)
+      raise NotImplementedError
+    end
+
+    def self.publish_delete!(chat_channel, chat_message)
+      message_bus_targets = calculate_publish_targets(chat_channel, chat_message)
+      latest_not_deleted_message_id =
+        if chat_message.thread_reply? && chat_channel.threading_enabled
+          chat_message.thread.latest_not_deleted_message_id(anchor_message_id: chat_message.id)
+        else
+          chat_channel.latest_not_deleted_message_id(anchor_message_id: chat_message.id)
+        end
+      publish_to_targets!(
+        message_bus_targets,
+        chat_channel,
+        {
+          type: "delete",
+          deleted_id: chat_message.id,
+          deleted_at: chat_message.deleted_at,
+          deleted_by_id: chat_message.deleted_by_id,
+          latest_not_deleted_message_id: latest_not_deleted_message_id,
+        },
+      )
+    end
+
+    def self.publish_bulk_delete!(chat_channel, deleted_message_ids)
+      channel_permissions = permissions(chat_channel)
+      Chat::Thread
+        .grouped_messages(message_ids: deleted_message_ids)
+        .each do |group|
+          MessageBus.publish(
+            thread_message_bus_channel(chat_channel.id, group.thread_id),
+            {
+              type: :bulk_delete,
+              deleted_ids: group.thread_message_ids,
+              deleted_at: Time.zone.now,
+            },
+            channel_permissions,
+          )
+
+          # Don't need to publish to the main channel if the messages deleted
+          # were a part of the thread (except the original message ID, since
+          # that shows in the main channel).
+          deleted_message_ids =
+            deleted_message_ids - (group.thread_message_ids - [group.original_message_id])
+        end
+
+      return if deleted_message_ids.empty?
+
+      publish_to_channel!(
+        chat_channel,
+        { type: :bulk_delete, deleted_ids: deleted_message_ids, deleted_at: Time.zone.now },
+      )
+    end
+
+    def self.publish_restore!(chat_channel, chat_message)
+      message_bus_targets = calculate_publish_targets(chat_channel, chat_message)
+      publish_to_targets!(
+        message_bus_targets,
+        chat_channel,
+        serialize_message_with_type(chat_message, :restore),
+      )
+    end
+
+    def self.publish_flag!(chat_message, user, reviewable, score)
+      message_bus_targets = calculate_publish_targets(chat_message.chat_channel, chat_message)
+
+      # Publish to user who created flag
+      publish_to_targets!(
+        message_bus_targets,
+        chat_message.chat_channel,
+        {
+          type: :self_flagged,
+          user_flag_status: score.status_for_database,
+          chat_message_id: chat_message.id,
+        },
+        permissions: {
+          user_ids: [user.id],
+        },
+      )
+
+      # Publish flag with link to reviewable to staff
+      publish_to_targets!(
+        message_bus_targets,
+        chat_message.chat_channel,
+        { type: :flag, chat_message_id: chat_message.id, reviewable_id: reviewable.id },
+        permissions: {
+          group_ids: [Group::AUTO_GROUPS[:staff]],
+        },
+      )
+    end
+
+    def self.publish_to_channel!(channel, payload)
+      MessageBus.publish(
+        root_message_bus_channel(channel.id),
+        payload.as_json,
+        permissions(channel),
+      )
+    end
+
+    def self.publish_to_targets!(targets, channel, payload, permissions: nil)
+      targets.each do |message_bus_channel|
+        MessageBus.publish(
+          message_bus_channel,
+          payload.as_json,
+          permissions || permissions(channel),
+        )
+      end
+    end
+
+    def self.serialize_message_with_type(chat_message, type, options = {})
+      Chat::MessageSerializer
+        .new(chat_message, { scope: anonymous_guardian, root: :chat_message })
+        .as_json
+        .merge(type: type)
+        .merge(options)
+    end
+
+    def self.user_tracking_state_message_bus_channel(user_id)
+      "/chat/user-tracking-state/#{user_id}"
+    end
+
+    def self.publish_user_tracking_state!(user, channel, message)
+      data = {
+        channel_id: channel.id,
+        last_read_message_id: message.id,
+        thread_id: message.thread_id,
+      }
+
+      channel_tracking_data =
+        Chat::TrackingStateReportQuery.call(
+          guardian: user.guardian,
+          channel_ids: [channel.id],
+          include_missing_memberships: true,
+        ).find_channel(channel.id)
+
+      data.merge!(channel_tracking_data)
+
+      # Need the thread unread overview if channel has threading enabled
+      # and a message is sent in the thread. We also need to pass the actual
+      # thread tracking state.
+      if channel.threading_enabled && message.thread_reply?
+        data[:unread_thread_overview] = ::Chat::TrackingStateReportQuery.call(
+          guardian: user.guardian,
+          channel_ids: [channel.id],
+          include_threads: true,
+          include_read: false,
+          include_last_reply_details: true,
+        ).find_channel_thread_overviews(channel.id)
+
+        data[:thread_tracking] = ::Chat::TrackingStateReportQuery.call(
+          guardian: user.guardian,
+          thread_ids: [message.thread_id],
+          include_threads: true,
+          include_missing_memberships: true,
+        ).find_thread(message.thread_id)
+      end
+
+      MessageBus.publish(
+        self.user_tracking_state_message_bus_channel(user.id),
+        data.as_json,
+        user_ids: [user.id],
+      )
+    end
+
+    def self.bulk_user_tracking_state_message_bus_channel(user_id)
+      "/chat/bulk-user-tracking-state/#{user_id}"
+    end
+
+    def self.publish_bulk_user_tracking_state!(user, channel_last_read_map)
+      tracking_data =
+        Chat::TrackingState.call(
+          guardian: Guardian.new(user),
+          channel_ids: channel_last_read_map.keys,
+          include_missing_memberships: true,
+        )
+      if tracking_data.failure?
+        raise StandardError,
+              "Tracking service failed when trying to publish bulk tracking state:\n\n#{tracking_data.inspect_steps}"
+      end
+
+      channel_last_read_map.each do |key, value|
+        channel_last_read_map[key] = value.merge(tracking_data.report.find_channel(key))
+      end
+
+      MessageBus.publish(
+        self.bulk_user_tracking_state_message_bus_channel(user.id),
+        channel_last_read_map.as_json,
+        user_ids: [user.id],
+      )
+    end
+
+    def self.new_mentions_message_bus_channel(chat_channel_id)
+      "/chat/#{chat_channel_id}/new-mentions"
+    end
+
+    def self.kick_users_message_bus_channel(chat_channel_id)
+      "/chat/#{chat_channel_id}/kick"
+    end
+
+    def self.publish_new_mention(user_id, chat_channel_id, chat_message_id)
+      MessageBus.publish(
+        self.new_mentions_message_bus_channel(chat_channel_id),
+        { message_id: chat_message_id, channel_id: chat_channel_id }.as_json,
+        user_ids: [user_id],
+      )
+    end
+
+    NEW_CHANNEL_MESSAGE_BUS_CHANNEL = "/chat/new-channel"
+
+    def self.publish_new_channel(chat_channel, users)
+      Chat::UserChatChannelMembership
+        .includes(:user)
+        .where(chat_channel: chat_channel, user: users)
+        .find_in_batches do |memberships|
+          memberships.each do |membership|
+            serialized_channel =
+              Chat::ChannelSerializer.new(
+                chat_channel,
+                scope: membership.user.guardian, # We need a guardian here for direct messages
+                root: :channel,
+                membership: membership,
+              ).as_json
+
+            MessageBus.publish(
+              NEW_CHANNEL_MESSAGE_BUS_CHANNEL,
+              serialized_channel,
+              user_ids: [membership.user.id],
+            )
+          end
+        end
+    end
+
+    def self.publish_inaccessible_mentions(
+      user_id,
+      chat_message,
+      cannot_chat_users,
+      without_membership,
+      too_many_members,
+      mentions_disabled
+    )
+      MessageBus.publish(
+        "/chat/#{chat_message.chat_channel_id}",
+        {
+          type: :mention_warning,
+          chat_message_id: chat_message.id,
+          cannot_see: cannot_chat_users.map { |u| { username: u.username, id: u.id } }.as_json,
+          without_membership:
+            without_membership.map { |u| { username: u.username, id: u.id } }.as_json,
+          groups_with_too_many_members: too_many_members.map(&:name).as_json,
+          group_mentions_disabled: mentions_disabled.map(&:name).as_json,
+        },
+        user_ids: [user_id],
+      )
+    end
+
+    def self.publish_kick_users(channel_id, user_ids)
+      MessageBus.publish(
+        kick_users_message_bus_channel(channel_id),
+        { channel_id: channel_id },
+        user_ids: user_ids,
+      )
+    end
+
+    CHANNEL_EDITS_MESSAGE_BUS_CHANNEL = "/chat/channel-edits"
+
+    def self.publish_chat_channel_edit(chat_channel, acting_user)
+      MessageBus.publish(
+        CHANNEL_EDITS_MESSAGE_BUS_CHANNEL,
+        {
+          chat_channel_id: chat_channel.id,
+          name: chat_channel.title(acting_user),
+          description: chat_channel.description,
+          slug: chat_channel.slug,
+        },
+        permissions(chat_channel),
+      )
+    end
+
+    CHANNEL_STATUS_MESSAGE_BUS_CHANNEL = "/chat/channel-status"
+
+    def self.publish_channel_status(chat_channel)
+      MessageBus.publish(
+        CHANNEL_STATUS_MESSAGE_BUS_CHANNEL,
+        { chat_channel_id: chat_channel.id, status: chat_channel.status },
+        permissions(chat_channel),
+      )
+    end
+
+    CHANNEL_METADATA_MESSAGE_BUS_CHANNEL = "/chat/channel-metadata"
+
+    def self.publish_chat_channel_metadata(chat_channel)
+      MessageBus.publish(
+        CHANNEL_METADATA_MESSAGE_BUS_CHANNEL,
+        { chat_channel_id: chat_channel.id, memberships_count: chat_channel.user_count },
+        permissions(chat_channel),
+      )
+    end
+
+    CHANNEL_ARCHIVE_STATUS_MESSAGE_BUS_CHANNEL = "/chat/channel-archive-status"
+
+    def self.publish_archive_status(
+      chat_channel,
+      archive_status:,
+      archived_messages:,
+      archive_topic_id:,
+      total_messages:
+    )
+      MessageBus.publish(
+        CHANNEL_ARCHIVE_STATUS_MESSAGE_BUS_CHANNEL,
+        {
+          chat_channel_id: chat_channel.id,
+          archive_failed: archive_status == :failed,
+          archive_completed: archive_status == :success,
+          archived_messages: archived_messages,
+          total_messages: total_messages,
+          archive_topic_id: archive_topic_id,
+        },
+        permissions(chat_channel),
+      )
+    end
+
+    def self.publish_notice(user_id:, channel_id:, text_content:)
+      payload = { type: "notice", text_content: text_content, channel_id: channel_id }
+
+      MessageBus.publish("/chat/#{channel_id}", payload, user_ids: [user_id])
+    end
+
+    private
+
+    def self.permissions(chat_channel)
+      { user_ids: chat_channel.allowed_user_ids, group_ids: chat_channel.allowed_group_ids }
+    end
+
+    def self.anonymous_guardian
+      Guardian.new(nil)
+    end
+  end
+end
diff --git a/plugins/chat/app/services/chat/restore_message.rb b/plugins/chat/app/services/chat/restore_message.rb
new file mode 100644
index 00000000000..e388b687fa8
--- /dev/null
+++ b/plugins/chat/app/services/chat/restore_message.rb
@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+module Chat
+  # Service responsible for restoring a trashed chat message
+  # for a channel and ensuring that the client and read state is
+  # updated.
+  #
+  # @example
+  #  Chat::RestoreMessage.call(message_id: 2, channel_id: 1, guardian: guardian)
+  #
+  class RestoreMessage
+    include Service::Base
+
+    # @!method call(message_id:, channel_id:, guardian:)
+    #   @param [Integer] message_id
+    #   @param [Integer] channel_id
+    #   @param [Guardian] guardian
+    #   @return [Service::Base::Context]
+
+    contract
+    model :message
+    policy :invalid_access
+    transaction do
+      step :restore_message
+      step :update_last_message_ids
+      step :update_thread_reply_cache
+    end
+    step :publish_events
+
+    # @!visibility private
+    class Contract
+      attribute :message_id, :integer
+      attribute :channel_id, :integer
+      validates :message_id, presence: true
+      validates :channel_id, presence: true
+    end
+
+    private
+
+    def fetch_message(contract:, **)
+      Chat::Message
+        .with_deleted
+        .includes(chat_channel: :chatable)
+        .find_by(id: contract.message_id, chat_channel_id: contract.channel_id)
+    end
+
+    def invalid_access(guardian:, message:, **)
+      guardian.can_restore_chat?(message, message.chat_channel.chatable)
+    end
+
+    def restore_message(message:, **)
+      message.recover!
+    end
+
+    def update_thread_reply_cache(message:, **)
+      message.thread&.increment_replies_count_cache
+    end
+
+    def update_last_message_ids(message:, **)
+      message.thread&.update_last_message_id!
+      message.chat_channel.update_last_message_id!
+    end
+
+    def publish_events(guardian:, message:, **)
+      DiscourseEvent.trigger(:chat_message_restored, message, message.chat_channel, guardian.user)
+      Chat::Publisher.publish_restore!(message.chat_channel, message)
+
+      if message.thread.present?
+        Chat::Publisher.publish_thread_original_message_metadata!(message.thread)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/services/chat/search_chatable.rb b/plugins/chat/app/services/chat/search_chatable.rb
new file mode 100644
index 00000000000..d0edb6435dd
--- /dev/null
+++ b/plugins/chat/app/services/chat/search_chatable.rb
@@ -0,0 +1,112 @@
+# frozen_string_literal: true
+
+module Chat
+  # Returns a list of chatables (users, category channels, direct message channels) that can be chatted with.
+  #
+  # @example
+  #  Chat::SearchChatable.call(term: "@bob", guardian: guardian)
+  #
+  class SearchChatable
+    include Service::Base
+
+    # @!method call(term:, guardian:)
+    #   @param [String] term
+    #   @param [Guardian] guardian
+    #   @return [Service::Base::Context]
+
+    contract
+    step :set_mode
+    step :clean_term
+    step :fetch_memberships
+    step :fetch_users
+    step :fetch_category_channels
+    step :fetch_direct_message_channels
+
+    # @!visibility private
+    class Contract
+      attribute :term, default: ""
+    end
+
+    private
+
+    def set_mode
+      context.mode =
+        if context.contract.term&.start_with?("#")
+          :channel
+        elsif context.contract.term&.start_with?("@")
+          :user
+        else
+          :all
+        end
+    end
+
+    def clean_term(contract:, **)
+      context.term = contract.term.downcase&.gsub(/^#+/, "")&.gsub(/^@+/, "")&.strip
+    end
+
+    def fetch_memberships(guardian:, **)
+      context.memberships = ::Chat::ChannelMembershipManager.all_for_user(guardian.user)
+    end
+
+    def fetch_users(guardian:, **)
+      return unless guardian.can_create_direct_message?
+      return if context.mode == :channel
+      context.users = search_users(context.term, guardian)
+    end
+
+    def fetch_category_channels(guardian:, **)
+      return if context.mode == :user
+      return if !SiteSetting.enable_public_channels
+
+      context.category_channels =
+        ::Chat::ChannelFetcher.secured_public_channel_search(
+          guardian,
+          filter_on_category_name: false,
+          match_filter_on_starts_with: false,
+          filter: context.term,
+          status: :open,
+          limit: 10,
+        )
+    end
+
+    def fetch_direct_message_channels(guardian:, **args)
+      return if context.mode == :user
+
+      user_ids = nil
+      if context.term.length > 0
+        user_ids =
+          (context.users.nil? ? search_users(context.term, guardian) : context.users).map(&:id)
+      end
+
+      channels =
+        ::Chat::ChannelFetcher.secured_direct_message_channels_search(
+          guardian.user.id,
+          guardian,
+          limit: 10,
+          user_ids: user_ids,
+        ) || []
+
+      if user_ids.present? && context.mode == :all
+        channels =
+          channels.reject do |channel|
+            channel_user_ids = channel.allowed_user_ids - [guardian.user.id]
+            channel.allowed_user_ids.length == 1 &&
+              user_ids.include?(channel.allowed_user_ids.first) ||
+              channel_user_ids.length == 1 && user_ids.include?(channel_user_ids.first)
+          end
+      end
+
+      context.direct_message_channels = channels
+    end
+
+    def search_users(term, guardian)
+      user_search = ::UserSearch.new(term, limit: 10)
+
+      if term.blank?
+        user_search.scoped_users.includes(:user_option)
+      else
+        user_search.search.includes(:user_option)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/services/chat/tracking_state.rb b/plugins/chat/app/services/chat/tracking_state.rb
new file mode 100644
index 00000000000..17cec53be51
--- /dev/null
+++ b/plugins/chat/app/services/chat/tracking_state.rb
@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module Chat
+  # Produces the current tracking state for a user for one or more
+  # chat channels. This can be further filtered by providing one or
+  # more thread IDs for the channel.
+  #
+  # The goal of this class is to provide an easy way to get
+  # tracking state for:
+  #
+  # * A single channel
+  # * A single thread
+  # * Multiple channels and threads
+  #
+  # This is limited to 500 channels and 2000 threads by default,
+  # over time we can re-examine this if we find the need to.
+  #
+  # The user must be a member of these channels -- any channels
+  # they are not a member of will always return 0 for unread/mention
+  # counts at all times.
+  #
+  # Only channels with threads enabled will return thread tracking state.
+  #
+  # @example
+  #  Chat::TrackingState.call(channel_ids: [2, 3], thread_ids: [6, 7], guardian: guardian)
+  #
+  class TrackingState
+    include Service::Base
+
+    # @!method call(thread_ids:, channel_ids:, guardian:)
+    #   @param [Integer] thread_ids
+    #   @param [Integer] channel_ids
+    #   @param [Guardian] guardian
+    #   @return [Service::Base::Context]
+
+    contract
+    step :cast_thread_and_channel_ids_to_integer
+    model :report
+
+    # @!visibility private
+    class Contract
+      attribute :channel_ids, default: []
+      attribute :thread_ids, default: []
+      attribute :include_missing_memberships, default: false
+      attribute :include_threads, default: false
+      attribute :include_read, default: true
+    end
+
+    private
+
+    def cast_thread_and_channel_ids_to_integer(contract:, **)
+      contract.thread_ids = contract.thread_ids.map(&:to_i)
+      contract.channel_ids = contract.channel_ids.map(&:to_i)
+    end
+
+    def fetch_report(contract:, guardian:, **)
+      ::Chat::TrackingStateReportQuery.call(
+        guardian: guardian,
+        channel_ids: contract.channel_ids,
+        thread_ids: contract.thread_ids,
+        include_missing_memberships: contract.include_missing_memberships,
+        include_threads: contract.include_threads,
+        include_read: contract.include_read,
+      )
+    end
+  end
+end
diff --git a/plugins/chat/app/services/chat/trash_channel.rb b/plugins/chat/app/services/chat/trash_channel.rb
new file mode 100644
index 00000000000..33a80b2c018
--- /dev/null
+++ b/plugins/chat/app/services/chat/trash_channel.rb
@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Chat
+  # Service responsible for trashing a chat channel.
+  # Note the slug is modified to prevent collisions.
+  #
+  # @example
+  #  Chat::TrashChannel.call(channel_id: 2, guardian: guardian)
+  #
+  class TrashChannel
+    include Service::Base
+
+    # @!method call(channel_id:, guardian:)
+    #   @param [Integer] channel_id
+    #   @param [Guardian] guardian
+    #   @return [Service::Base::Context]
+
+    DELETE_CHANNEL_LOG_KEY = "chat_channel_delete"
+
+    model :channel, :fetch_channel
+    policy :invalid_access
+    transaction do
+      step :prevents_slug_collision
+      step :soft_delete_channel
+      step :log_channel_deletion
+    end
+    step :enqueue_delete_channel_relations_job
+
+    private
+
+    def fetch_channel(channel_id:, **)
+      Chat::Channel.find_by(id: channel_id)
+    end
+
+    def invalid_access(guardian:, channel:, **)
+      guardian.can_preview_chat_channel?(channel) && guardian.can_delete_chat_channel?
+    end
+
+    def prevents_slug_collision(channel:, **)
+      channel.update!(
+        slug:
+          "#{Time.current.strftime("%Y%m%d-%H%M")}-#{channel.slug}-deleted".truncate(
+            SiteSetting.max_topic_title_length,
+            omission: "",
+          ),
+      )
+    end
+
+    def soft_delete_channel(guardian:, channel:, **)
+      channel.trash!(guardian.user)
+    end
+
+    def log_channel_deletion(guardian:, channel:, **)
+      StaffActionLogger.new(guardian.user).log_custom(
+        DELETE_CHANNEL_LOG_KEY,
+        { chat_channel_id: channel.id, chat_channel_name: channel.title(guardian.user) },
+      )
+    end
+
+    def enqueue_delete_channel_relations_job(channel:, **)
+      Jobs.enqueue(Jobs::Chat::ChannelDelete, chat_channel_id: channel.id)
+    end
+  end
+end
diff --git a/plugins/chat/app/services/chat/trash_message.rb b/plugins/chat/app/services/chat/trash_message.rb
new file mode 100644
index 00000000000..2d3b6d7a6c5
--- /dev/null
+++ b/plugins/chat/app/services/chat/trash_message.rb
@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+module Chat
+  # Service responsible for trashing a chat message
+  # for a channel and ensuring that the client and read state is
+  # updated.
+  #
+  # @example
+  #  Chat::TrashMessage.call(message_id: 2, channel_id: 1, guardian: guardian)
+  #
+  class TrashMessage
+    include Service::Base
+
+    # @!method call(message_id:, channel_id:, guardian:)
+    #   @param [Integer] message_id
+    #   @param [Integer] channel_id
+    #   @param [Guardian] guardian
+    #   @return [Service::Base::Context]
+
+    contract
+    model :message
+    policy :invalid_access
+    transaction do
+      step :trash_message
+      step :destroy_notifications
+      step :update_last_message_ids
+      step :update_tracking_state
+      step :update_thread_reply_cache
+    end
+    step :publish_events
+
+    # @!visibility private
+    class Contract
+      attribute :message_id, :integer
+      attribute :channel_id, :integer
+      validates :message_id, presence: true
+      validates :channel_id, presence: true
+    end
+
+    private
+
+    def fetch_message(contract:, **)
+      Chat::Message.includes(chat_channel: :chatable).find_by(
+        id: contract.message_id,
+        chat_channel_id: contract.channel_id,
+      )
+    end
+
+    def invalid_access(guardian:, message:, **)
+      guardian.can_delete_chat?(message, message.chat_channel.chatable)
+    end
+
+    def trash_message(message:, guardian:, **)
+      message.trash!(guardian.user)
+    end
+
+    def destroy_notifications(message:, **)
+      ids = Chat::Mention.where(chat_message: message).pluck(:notification_id)
+      Notification.where(id: ids).destroy_all
+      Chat::Mention.where(chat_message: message).update_all(notification_id: nil)
+    end
+
+    def update_tracking_state(message:, **)
+      ::Chat::Action::ResetUserLastReadChannelMessage.call([message.id], [message.chat_channel_id])
+      if message.thread_id.present?
+        ::Chat::Action::ResetUserLastReadThreadMessage.call([message.id], [message.thread_id])
+      end
+    end
+
+    def update_thread_reply_cache(message:, **)
+      message.thread&.decrement_replies_count_cache
+    end
+
+    def update_last_message_ids(message:, **)
+      message.thread&.update_last_message_id!
+      message.chat_channel.update_last_message_id!
+    end
+
+    def publish_events(guardian:, message:, **)
+      DiscourseEvent.trigger(:chat_message_trashed, message, message.chat_channel, guardian.user)
+      Chat::Publisher.publish_delete!(message.chat_channel, message)
+
+      if message.thread.present?
+        Chat::Publisher.publish_thread_original_message_metadata!(message.thread)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/services/chat/update_channel.rb b/plugins/chat/app/services/chat/update_channel.rb
new file mode 100644
index 00000000000..fdd7cd5f85e
--- /dev/null
+++ b/plugins/chat/app/services/chat/update_channel.rb
@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+module Chat
+  # Service responsible for updating a chat channel's name, slug, and description.
+  #
+  # For a CategoryChannel, the settings for auto_join_users, allow_channel_wide_mentions
+  # and threading_enabled are also editable.
+  #
+  # @example
+  #  Service::Chat::UpdateChannel.call(
+  #   channel_id: 2,
+  #   guardian: guardian,
+  #   name: "SuperChannel",
+  #   description: "This is the best channel",
+  #   slug: "super-channel",
+  #   threading_enabled: true,
+  #  )
+  #
+  class UpdateChannel
+    include Service::Base
+
+    # @!method call(channel_id:, guardian:, **params_to_edit)
+    #   @param [Integer] channel_id
+    #   @param [Guardian] guardian
+    #   @param [Hash] params_to_edit
+    #   @option params_to_edit [String,nil] name
+    #   @option params_to_edit [String,nil] description
+    #   @option params_to_edit [String,nil] slug
+    #   @option params_to_edit [Boolean] auto_join_users Only valid for {CategoryChannel}. Whether active users
+    #    with permission to see the category should automatically join the channel.
+    #   @option params_to_edit [Boolean] allow_channel_wide_mentions Allow the use of @here and @all in the channel.
+    #   @return [Service::Base::Context]
+
+    model :channel, :fetch_channel
+    policy :no_direct_message_channel
+    policy :check_channel_permission
+    contract default_values_from: :channel
+    step :update_channel
+    step :mark_all_threads_as_read_if_needed
+    step :publish_channel_update
+    step :auto_join_users_if_needed
+
+    # @!visibility private
+    class Contract
+      attribute :name, :string
+      attribute :description, :string
+      attribute :slug, :string
+      attribute :threading_enabled, :boolean, default: false
+      attribute :auto_join_users, :boolean, default: false
+      attribute :allow_channel_wide_mentions, :boolean, default: true
+
+      before_validation do
+        assign_attributes(
+          attributes.symbolize_keys.slice(:name, :description, :slug).transform_values(&:presence),
+        )
+      end
+    end
+
+    private
+
+    def fetch_channel(channel_id:, **)
+      Chat::Channel.find_by(id: channel_id)
+    end
+
+    def no_direct_message_channel(channel:, **)
+      !channel.direct_message_channel?
+    end
+
+    def check_channel_permission(guardian:, channel:, **)
+      guardian.can_preview_chat_channel?(channel) && guardian.can_edit_chat_channel?
+    end
+
+    def update_channel(channel:, contract:, **)
+      channel.assign_attributes(contract.attributes)
+      context.threading_enabled_changed = channel.threading_enabled_changed?
+      channel.save!
+    end
+
+    def mark_all_threads_as_read_if_needed(channel:, **)
+      return if !(context.threading_enabled_changed && channel.threading_enabled)
+      Jobs.enqueue(Jobs::Chat::MarkAllChannelThreadsRead, channel_id: channel.id)
+    end
+
+    def publish_channel_update(channel:, guardian:, **)
+      Chat::Publisher.publish_chat_channel_edit(channel, guardian.user)
+    end
+
+    def auto_join_users_if_needed(channel:, **)
+      return unless channel.auto_join_users?
+      Chat::ChannelMembershipManager.new(channel).enforce_automatic_channel_memberships
+    end
+  end
+end
diff --git a/plugins/chat/app/services/chat/update_channel_status.rb b/plugins/chat/app/services/chat/update_channel_status.rb
new file mode 100644
index 00000000000..f3e84185942
--- /dev/null
+++ b/plugins/chat/app/services/chat/update_channel_status.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Chat
+  # Service responsible for updating a chat channel status.
+  #
+  # @example
+  #  Chat::UpdateChannelStatus.call(channel_id: 2, guardian: guardian, status: "open")
+  #
+  class UpdateChannelStatus
+    include Service::Base
+
+    # @!method call(channel_id:, guardian:, status:)
+    #   @param [Integer] channel_id
+    #   @param [Guardian] guardian
+    #   @param [String] status
+    #   @return [Service::Base::Context]
+
+    model :channel, :fetch_channel
+    contract
+    policy :check_channel_permission
+    step :change_status
+
+    # @!visibility private
+    class Contract
+      attribute :status
+      validates :status, inclusion: { in: Chat::Channel.editable_statuses.keys }
+    end
+
+    private
+
+    def fetch_channel(channel_id:, **)
+      Chat::Channel.find_by(id: channel_id)
+    end
+
+    def check_channel_permission(guardian:, channel:, status:, **)
+      guardian.can_preview_chat_channel?(channel) &&
+        guardian.can_change_channel_status?(channel, status.to_sym)
+    end
+
+    def change_status(channel:, status:, guardian:, **)
+      channel.public_send("#{status}!", guardian.user)
+    end
+  end
+end
diff --git a/plugins/chat/app/services/chat/update_thread.rb b/plugins/chat/app/services/chat/update_thread.rb
new file mode 100644
index 00000000000..b4ccad8673e
--- /dev/null
+++ b/plugins/chat/app/services/chat/update_thread.rb
@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module Chat
+  # Updates a thread. The thread_id and channel_id must
+  # match, and the channel must specifically have threading enabled.
+  #
+  # Only the thread title can be updated.
+  #
+  # @example
+  #  Chat::UpdateThread.call(thread_id: 88, channel_id: 2, guardian: guardian, title: "Restaurant for Saturday")
+  #
+  class UpdateThread
+    include Service::Base
+
+    # @!method call(thread_id:, channel_id:, guardian:, **params_to_edit)
+    #   @param [Integer] thread_id
+    #   @param [Integer] channel_id
+    #   @param [Guardian] guardian
+    #   @option params_to_edit [String,nil] title
+    #   @return [Service::Base::Context]
+
+    contract
+    model :thread, :fetch_thread
+    policy :can_view_channel
+    policy :can_edit_thread
+    policy :threading_enabled_for_channel
+    step :update
+    step :publish_metadata
+
+    # @!visibility private
+    class Contract
+      attribute :thread_id, :integer
+      attribute :channel_id, :integer
+      attribute :title, :string
+
+      validates :thread_id, :channel_id, presence: true
+      validates :title, length: { maximum: Chat::Thread::MAX_TITLE_LENGTH }
+    end
+
+    private
+
+    def fetch_thread(contract:, **)
+      Chat::Thread.find_by(id: contract.thread_id, channel_id: contract.channel_id)
+    end
+
+    def can_view_channel(guardian:, thread:, **)
+      guardian.can_preview_chat_channel?(thread.channel)
+    end
+
+    def can_edit_thread(guardian:, thread:, **)
+      guardian.can_edit_thread?(thread)
+    end
+
+    def threading_enabled_for_channel(thread:, **)
+      thread.channel.threading_enabled
+    end
+
+    def update(thread:, contract:, **)
+      thread.update(title: contract.title)
+      fail!(thread.errors.full_messages.join(", ")) if thread.invalid?
+    end
+
+    def publish_metadata(thread:, **)
+      Chat::Publisher.publish_thread_original_message_metadata!(thread)
+    end
+  end
+end
diff --git a/plugins/chat/app/services/chat/update_thread_notification_settings.rb b/plugins/chat/app/services/chat/update_thread_notification_settings.rb
new file mode 100644
index 00000000000..2f1c30e3d6d
--- /dev/null
+++ b/plugins/chat/app/services/chat/update_thread_notification_settings.rb
@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+module Chat
+  # Updates the thread notification level for a user, or if the thread
+  # does not exist, adds the user as a member of the thread before setting
+  # the notification level.
+  #
+  # @example
+  # Chat::UpdateThreadNotificationSettings.call(
+  #   thread_id: 88,
+  #   channel_id: 2,
+  #   guardian: guardian,
+  #   notification_level: notification_level,
+  # )
+  #
+  class UpdateThreadNotificationSettings
+    include Service::Base
+
+    # @!method call(thread_id:, channel_id:, guardian:, notification_level:)
+    #   @param [Integer] thread_id
+    #   @param [Integer] channel_id
+    #   @param [Integer] notification_level
+    #   @param [Guardian] guardian
+    #   @return [Service::Base::Context]
+
+    contract
+    model :thread, :fetch_thread
+    policy :can_view_channel
+    policy :threading_enabled_for_channel
+    transaction { step :create_or_update_membership }
+
+    # @!visibility private
+    class Contract
+      attribute :thread_id, :integer
+      attribute :channel_id, :integer
+      attribute :notification_level, :integer
+
+      validates :thread_id, :channel_id, :notification_level, presence: true
+
+      validates :notification_level,
+                inclusion: {
+                  in: Chat::UserChatThreadMembership.notification_levels.values,
+                }
+    end
+
+    private
+
+    def fetch_thread(contract:, **)
+      Chat::Thread.find_by(id: contract.thread_id, channel_id: contract.channel_id)
+    end
+
+    def can_view_channel(guardian:, thread:, **)
+      guardian.can_preview_chat_channel?(thread.channel)
+    end
+
+    def threading_enabled_for_channel(thread:, **)
+      thread.channel.threading_enabled
+    end
+
+    def create_or_update_membership(thread:, guardian:, contract:, **)
+      membership = thread.membership_for(guardian.user)
+      if !membership
+        membership = thread.add(guardian.user)
+        membership.update!(last_read_message_id: thread.last_message_id)
+      end
+      membership.update!(notification_level: contract.notification_level)
+      context.membership = membership
+    end
+  end
+end
diff --git a/plugins/chat/app/services/chat/update_user_last_read.rb b/plugins/chat/app/services/chat/update_user_last_read.rb
new file mode 100644
index 00000000000..6d9c06caffc
--- /dev/null
+++ b/plugins/chat/app/services/chat/update_user_last_read.rb
@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+module Chat
+  # Service responsible for updating the last read message id of a membership.
+  #
+  # @example
+  #  Chat::UpdateUserLastRead.call(channel_id: 2, message_id: 3, guardian: guardian)
+  #
+  class UpdateUserLastRead
+    include ::Service::Base
+
+    # @!method call(channel_id:, message_id:, guardian:)
+    #   @param [Integer] channel_id
+    #   @param [Integer] message_id
+    #   @param [Guardian] guardian
+    #   @return [Service::Base::Context]
+
+    contract
+    model :channel
+    model :active_membership
+    policy :invalid_access
+    model :message
+    policy :ensure_message_id_recency
+    transaction do
+      step :update_membership_state
+      step :mark_associated_mentions_as_read
+    end
+    step :publish_new_last_read_to_clients
+
+    # @!visibility private
+    class Contract
+      attribute :message_id, :integer
+      attribute :channel_id, :integer
+
+      validates :message_id, :channel_id, presence: true
+    end
+
+    private
+
+    def fetch_channel(contract:, **)
+      ::Chat::Channel.find_by(id: contract.channel_id)
+    end
+
+    def fetch_active_membership(guardian:, channel:, **)
+      ::Chat::ChannelMembershipManager.new(channel).find_for_user(guardian.user, following: true)
+    end
+
+    def invalid_access(guardian:, active_membership:, **)
+      guardian.can_join_chat_channel?(active_membership.chat_channel)
+    end
+
+    def fetch_message(channel:, contract:, **)
+      ::Chat::Message.with_deleted.find_by(chat_channel_id: channel.id, id: contract.message_id)
+    end
+
+    def ensure_message_id_recency(message:, active_membership:, **)
+      !active_membership.last_read_message_id ||
+        message.id >= active_membership.last_read_message_id
+    end
+
+    def update_membership_state(message:, active_membership:, **)
+      active_membership.update!(last_read_message_id: message.id, last_viewed_at: Time.zone.now)
+    end
+
+    def mark_associated_mentions_as_read(active_membership:, message:, **)
+      ::Chat::Action::MarkMentionsRead.call(
+        active_membership.user,
+        channel_ids: [active_membership.chat_channel.id],
+        message_id: message.id,
+      )
+    end
+
+    def publish_new_last_read_to_clients(guardian:, channel:, message:, **)
+      ::Chat::Publisher.publish_user_tracking_state!(guardian.user, channel, message)
+    end
+  end
+end
diff --git a/plugins/chat/app/services/chat/update_user_thread_last_read.rb b/plugins/chat/app/services/chat/update_user_thread_last_read.rb
new file mode 100644
index 00000000000..8785b41b92c
--- /dev/null
+++ b/plugins/chat/app/services/chat/update_user_thread_last_read.rb
@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+module Chat
+  # Service responsible for marking messages in a thread
+  # as read. For now this just marks any mentions in the thread
+  # as read and marks the entire thread as read.
+  # As we add finer-grained user tracking state to threads it
+  # will work in a similar way to Chat::UpdateUserLastRead.
+  #
+  # @example
+  #  Chat::UpdateUserThreadLastRead.call(channel_id: 2, thread_id: 3, guardian: guardian)
+  #
+  class UpdateUserThreadLastRead
+    include ::Service::Base
+
+    # @!method call(channel_id:, thread_id:, guardian:)
+    #   @param [Integer] channel_id
+    #   @param [Integer] thread_id
+    #   @param [Guardian] guardian
+    #   @return [Service::Base::Context]
+
+    contract
+    model :thread
+    policy :invalid_access
+    step :mark_associated_mentions_as_read
+    step :mark_thread_read
+    step :publish_new_last_read_to_clients
+
+    # @!visibility private
+    class Contract
+      attribute :thread_id, :integer
+      attribute :channel_id, :integer
+
+      validates :thread_id, :channel_id, presence: true
+    end
+
+    private
+
+    def fetch_thread(contract:, **)
+      ::Chat::Thread.find_by(id: contract.thread_id, channel_id: contract.channel_id)
+    end
+
+    def invalid_access(guardian:, thread:, **)
+      guardian.can_join_chat_channel?(thread.channel)
+    end
+
+    # NOTE: In future we will pass in a specific last_read_message_id
+    # to the service, so this will need to change because currently it's
+    # just using the thread's last_message_id.
+    def mark_thread_read(thread:, guardian:, **)
+      thread.mark_read_for_user!(guardian.user)
+    end
+
+    def mark_associated_mentions_as_read(thread:, guardian:, **)
+      ::Chat::Action::MarkMentionsRead.call(
+        guardian.user,
+        channel_ids: [thread.channel_id],
+        thread_id: thread.id,
+      )
+    end
+
+    def publish_new_last_read_to_clients(guardian:, thread:, **)
+      ::Chat::Publisher.publish_user_tracking_state!(
+        guardian.user,
+        thread.channel,
+        thread.last_message,
+      )
+    end
+  end
+end
diff --git a/plugins/chat/app/services/chat_message_destroyer.rb b/plugins/chat/app/services/chat_message_destroyer.rb
deleted file mode 100644
index f5f159b8169..00000000000
--- a/plugins/chat/app/services/chat_message_destroyer.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-class ChatMessageDestroyer
-  def destroy_in_batches(chat_messages_query, batch_size: 200)
-    chat_messages_query
-      .in_batches(of: batch_size)
-      .each do |relation|
-        destroyed_ids = relation.destroy_all.pluck(:id)
-        reset_last_read(destroyed_ids)
-        delete_flags(destroyed_ids)
-      end
-  end
-
-  private
-
-  def reset_last_read(message_ids)
-    UserChatChannelMembership.where(last_read_message_id: message_ids).update_all(
-      last_read_message_id: nil,
-    )
-  end
-
-  def delete_flags(message_ids)
-    ReviewableChatMessage.where(target_id: message_ids).destroy_all
-  end
-end
diff --git a/plugins/chat/app/services/chat_publisher.rb b/plugins/chat/app/services/chat_publisher.rb
deleted file mode 100644
index f628cf5b674..00000000000
--- a/plugins/chat/app/services/chat_publisher.rb
+++ /dev/null
@@ -1,265 +0,0 @@
-# frozen_string_literal: true
-
-module ChatPublisher
-  def self.new_messages_message_bus_channel(chat_channel_id)
-    "/chat/#{chat_channel_id}/new-messages"
-  end
-
-  def self.publish_new!(chat_channel, chat_message, staged_id)
-    content =
-      ChatMessageSerializer.new(
-        chat_message,
-        { scope: anonymous_guardian, root: :chat_message },
-      ).as_json
-    content[:type] = :sent
-    content[:stagedId] = staged_id
-    permissions = permissions(chat_channel)
-
-    MessageBus.publish("/chat/#{chat_channel.id}", content.as_json, permissions)
-
-    MessageBus.publish(
-      self.new_messages_message_bus_channel(chat_channel.id),
-      {
-        channel_id: chat_channel.id,
-        message_id: chat_message.id,
-        user_id: chat_message.user.id,
-        username: chat_message.user.username,
-      },
-      permissions,
-    )
-  end
-
-  def self.publish_processed!(chat_message)
-    chat_channel = chat_message.chat_channel
-    content = {
-      type: :processed,
-      chat_message: {
-        id: chat_message.id,
-        cooked: chat_message.cooked,
-      },
-    }
-    MessageBus.publish("/chat/#{chat_channel.id}", content.as_json, permissions(chat_channel))
-  end
-
-  def self.publish_edit!(chat_channel, chat_message)
-    content =
-      ChatMessageSerializer.new(
-        chat_message,
-        { scope: anonymous_guardian, root: :chat_message },
-      ).as_json
-    content[:type] = :edit
-    MessageBus.publish("/chat/#{chat_channel.id}", content.as_json, permissions(chat_channel))
-  end
-
-  def self.publish_refresh!(chat_channel, chat_message)
-    content =
-      ChatMessageSerializer.new(
-        chat_message,
-        { scope: anonymous_guardian, root: :chat_message },
-      ).as_json
-    content[:type] = :refresh
-    MessageBus.publish("/chat/#{chat_channel.id}", content.as_json, permissions(chat_channel))
-  end
-
-  def self.publish_reaction!(chat_channel, chat_message, action, user, emoji)
-    content = {
-      action: action,
-      user: BasicUserSerializer.new(user, root: false).as_json,
-      emoji: emoji,
-      type: :reaction,
-      chat_message_id: chat_message.id,
-    }
-    MessageBus.publish(
-      "/chat/message-reactions/#{chat_message.id}",
-      content.as_json,
-      permissions(chat_channel),
-    )
-    MessageBus.publish("/chat/#{chat_channel.id}", content.as_json, permissions(chat_channel))
-  end
-
-  def self.publish_presence!(chat_channel, user, typ)
-    raise NotImplementedError
-  end
-
-  def self.publish_delete!(chat_channel, chat_message)
-    MessageBus.publish(
-      "/chat/#{chat_channel.id}",
-      { type: "delete", deleted_id: chat_message.id, deleted_at: chat_message.deleted_at },
-      permissions(chat_channel),
-    )
-  end
-
-  def self.publish_bulk_delete!(chat_channel, deleted_message_ids)
-    MessageBus.publish(
-      "/chat/#{chat_channel.id}",
-      { typ: "bulk_delete", deleted_ids: deleted_message_ids, deleted_at: Time.zone.now },
-      permissions(chat_channel),
-    )
-  end
-
-  def self.publish_restore!(chat_channel, chat_message)
-    content =
-      ChatMessageSerializer.new(
-        chat_message,
-        { scope: anonymous_guardian, root: :chat_message },
-      ).as_json
-    content[:type] = :restore
-    MessageBus.publish("/chat/#{chat_channel.id}", content.as_json, permissions(chat_channel))
-  end
-
-  def self.publish_flag!(chat_message, user, reviewable, score)
-    # Publish to user who created flag
-    MessageBus.publish(
-      "/chat/#{chat_message.chat_channel_id}",
-      {
-        type: "self_flagged",
-        user_flag_status: score.status_for_database,
-        chat_message_id: chat_message.id,
-      }.as_json,
-      user_ids: [user.id],
-    )
-
-    # Publish flag with link to reviewable to staff
-    MessageBus.publish(
-      "/chat/#{chat_message.chat_channel_id}",
-      { type: "flag", chat_message_id: chat_message.id, reviewable_id: reviewable.id }.as_json,
-      group_ids: [Group::AUTO_GROUPS[:staff]],
-    )
-  end
-
-  def self.user_tracking_state_message_bus_channel(user_id)
-    "/chat/user-tracking-state/#{user_id}"
-  end
-
-  def self.publish_user_tracking_state(user, chat_channel_id, chat_message_id)
-    MessageBus.publish(
-      self.user_tracking_state_message_bus_channel(user.id),
-      { chat_channel_id: chat_channel_id, chat_message_id: chat_message_id.to_i }.as_json,
-      user_ids: [user.id],
-    )
-  end
-
-  def self.new_mentions_message_bus_channel(chat_channel_id)
-    "/chat/#{chat_channel_id}/new-mentions"
-  end
-
-  def self.publish_new_mention(user_id, chat_channel_id, chat_message_id)
-    MessageBus.publish(
-      self.new_mentions_message_bus_channel(chat_channel_id),
-      { message_id: chat_message_id, channel_id: chat_channel_id }.as_json,
-      user_ids: [user_id],
-    )
-  end
-
-  NEW_CHANNEL_MESSAGE_BUS_CHANNEL = "/chat/new-channel"
-
-  def self.publish_new_channel(chat_channel, users)
-    users.each do |user|
-      # FIXME: This could generate a lot of queries depending on the amount of users
-      membership = chat_channel.membership_for(user)
-
-      # TODO: this event is problematic as some code will update the membership before calling it
-      # and other code will update it after calling it
-      # it means frontend must handle logic for both cases
-      serialized_channel =
-        ChatChannelSerializer.new(
-          chat_channel,
-          scope: Guardian.new(user), # We need a guardian here for direct messages
-          root: :channel,
-          membership: membership,
-        ).as_json
-
-      MessageBus.publish(NEW_CHANNEL_MESSAGE_BUS_CHANNEL, serialized_channel, user_ids: [user.id])
-    end
-  end
-
-  def self.publish_inaccessible_mentions(
-    user_id,
-    chat_message,
-    cannot_chat_users,
-    without_membership,
-    too_many_members,
-    mentions_disabled
-  )
-    MessageBus.publish(
-      "/chat/#{chat_message.chat_channel_id}",
-      {
-        type: :mention_warning,
-        chat_message_id: chat_message.id,
-        cannot_see: cannot_chat_users.map { |u| { username: u.username, id: u.id } }.as_json,
-        without_membership:
-          without_membership.map { |u| { username: u.username, id: u.id } }.as_json,
-        groups_with_too_many_members: too_many_members.map(&:name).as_json,
-        group_mentions_disabled: mentions_disabled.map(&:name).as_json,
-      },
-      user_ids: [user_id],
-    )
-  end
-
-  CHANNEL_EDITS_MESSAGE_BUS_CHANNEL = "/chat/channel-edits"
-
-  def self.publish_chat_channel_edit(chat_channel, acting_user)
-    MessageBus.publish(
-      CHANNEL_EDITS_MESSAGE_BUS_CHANNEL,
-      {
-        chat_channel_id: chat_channel.id,
-        name: chat_channel.title(acting_user),
-        description: chat_channel.description,
-      },
-      permissions(chat_channel),
-    )
-  end
-
-  CHANNEL_STATUS_MESSAGE_BUS_CHANNEL = "/chat/channel-status"
-
-  def self.publish_channel_status(chat_channel)
-    MessageBus.publish(
-      CHANNEL_STATUS_MESSAGE_BUS_CHANNEL,
-      { chat_channel_id: chat_channel.id, status: chat_channel.status },
-      permissions(chat_channel),
-    )
-  end
-
-  CHANNEL_METADATA_MESSAGE_BUS_CHANNEL = "/chat/channel-metadata"
-
-  def self.publish_chat_channel_metadata(chat_channel)
-    MessageBus.publish(
-      CHANNEL_METADATA_MESSAGE_BUS_CHANNEL,
-      { chat_channel_id: chat_channel.id, memberships_count: chat_channel.user_count },
-      permissions(chat_channel),
-    )
-  end
-
-  CHANNEL_ARCHIVE_STATUS_MESSAGE_BUS_CHANNEL = "/chat/channel-archive-status"
-
-  def self.publish_archive_status(
-    chat_channel,
-    archive_status:,
-    archived_messages:,
-    archive_topic_id:,
-    total_messages:
-  )
-    MessageBus.publish(
-      CHANNEL_ARCHIVE_STATUS_MESSAGE_BUS_CHANNEL,
-      {
-        chat_channel_id: chat_channel.id,
-        archive_failed: archive_status == :failed,
-        archive_completed: archive_status == :success,
-        archived_messages: archived_messages,
-        total_messages: total_messages,
-        archive_topic_id: archive_topic_id,
-      },
-      permissions(chat_channel),
-    )
-  end
-
-  private
-
-  def self.permissions(chat_channel)
-    { user_ids: chat_channel.allowed_user_ids, group_ids: chat_channel.allowed_group_ids }
-  end
-
-  def self.anonymous_guardian
-    Guardian.new(nil)
-  end
-end
diff --git a/plugins/chat/app/services/service.rb b/plugins/chat/app/services/service.rb
new file mode 100644
index 00000000000..c45e25eb0da
--- /dev/null
+++ b/plugins/chat/app/services/service.rb
@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+
+module Service
+  # Module to be included to provide steps DSL to any class. This allows to
+  # create easy to understand services as the whole service cycle is visible
+  # simply by reading the beginning of its class.
+  #
+  # Steps are executed in the order they’re defined. They will use their name
+  # to execute the corresponding method defined in the service class.
+  #
+  # Currently, there are 5 types of steps:
+  #
+  # * +contract(name = :default)+: used to validate the input parameters,
+  #   typically provided by a user calling an endpoint. A special embedded
+  #   +Contract+ class has to be defined to holds the validations. If the
+  #   validations fail, the step will fail. Otherwise, the resulting contract
+  #   will be available in +context[:contract]+. When calling +step(name)+ or
+  #   +model(name = :model)+ methods after validating a contract, the contract
+  #   should be used as an argument instead of context attributes.
+  # * +model(name = :model)+: used to instantiate a model (either by building
+  #   it or fetching it from the DB). If a falsy value is returned, then the
+  #   step will fail. Otherwise the resulting object will be assigned in
+  #   +context[name]+ (+context[:model]+ by default).
+  # * +policy(name = :default)+: used to perform a check on the state of the
+  #   system. Typically used to run guardians. If a falsy value is returned,
+  #   the step will fail.
+  # * +step(name)+: used to run small snippets of arbitrary code. The step
+  #   doesn’t care about its return value, so to mark the service as failed,
+  #   {#fail!} has to be called explicitly.
+  # * +transaction+: used to wrap other steps inside a DB transaction.
+  #
+  # The methods defined on the service are automatically provided with
+  # the whole context passed as keyword arguments. This allows to define in a
+  # very explicit way what dependencies are used by the method. If for
+  # whatever reason a key isn’t found in the current context, then Ruby will
+  # raise an exception when the method is called.
+  #
+  # Regarding contract classes, they automatically have {ActiveModel} modules
+  # included so all the {ActiveModel} API is available.
+  #
+  # @example An example from the {TrashChannel} service
+  #   class TrashChannel
+  #     include Base
+  #
+  #     model :channel, :fetch_channel
+  #     policy :invalid_access
+  #     transaction do
+  #       step :prevents_slug_collision
+  #       step :soft_delete_channel
+  #       step :log_channel_deletion
+  #     end
+  #     step :enqueue_delete_channel_relations_job
+  #
+  #     private
+  #
+  #     def fetch_channel(channel_id:, **)
+  #       Chat::Channel.find_by(id: channel_id)
+  #     end
+  #
+  #     def invalid_access(guardian:, channel:, **)
+  #       guardian.can_preview_chat_channel?(channel) && guardian.can_delete_chat_channel?
+  #     end
+  #
+  #     def prevents_slug_collision(channel:, **)
+  #       …
+  #     end
+  #
+  #     def soft_delete_channel(guardian:, channel:, **)
+  #       …
+  #     end
+  #
+  #     def log_channel_deletion(guardian:, channel:, **)
+  #       …
+  #     end
+  #
+  #     def enqueue_delete_channel_relations_job(channel:, **)
+  #       …
+  #     end
+  #   end
+  # @example An example from the {UpdateChannelStatus} service which uses a contract
+  #   class UpdateChannelStatus
+  #     include Base
+  #
+  #     model :channel, :fetch_channel
+  #     contract
+  #     policy :check_channel_permission
+  #     step :change_status
+  #
+  #     class Contract
+  #       attribute :status
+  #       validates :status, inclusion: { in: Chat::Channel.editable_statuses.keys }
+  #     end
+  #
+  #     …
+  #   end
+end
diff --git a/plugins/chat/app/services/service/base.rb b/plugins/chat/app/services/service/base.rb
new file mode 100644
index 00000000000..b21d03e055d
--- /dev/null
+++ b/plugins/chat/app/services/service/base.rb
@@ -0,0 +1,378 @@
+# frozen_string_literal: true
+
+module Service
+  module Base
+    extend ActiveSupport::Concern
+
+    # The only exception that can be raised by a service.
+    class Failure < StandardError
+      # @return [Context]
+      attr_reader :context
+
+      # @!visibility private
+      def initialize(context = nil)
+        @context = context
+        super
+      end
+    end
+
+    # Simple structure to hold the context of the service during its whole lifecycle.
+    class Context < OpenStruct
+      include ActiveModel::Serialization
+
+      # @return [Boolean] returns +true+ if the context is set as successful (default)
+      def success?
+        !failure?
+      end
+
+      # @return [Boolean] returns +true+ if the context is set as failed
+      # @see #fail!
+      # @see #fail
+      def failure?
+        @failure || false
+      end
+
+      # Marks the context as failed.
+      # @param context [Hash, Context] the context to merge into the current one
+      # @example
+      #   context.fail!("failure": "something went wrong")
+      # @return [Context]
+      def fail!(context = {})
+        fail(context)
+        raise Failure, self
+      end
+
+      # Marks the context as failed without raising an exception.
+      # @param context [Hash, Context] the context to merge into the current one
+      # @example
+      #   context.fail("failure": "something went wrong")
+      # @return [Context]
+      def fail(context = {})
+        merge(context)
+        @failure = true
+        self
+      end
+
+      # Merges the given context into the current one.
+      # @!visibility private
+      def merge(other_context = {})
+        other_context.each { |key, value| self[key.to_sym] = value }
+        self
+      end
+
+      def inspect_steps
+        Chat::StepsInspector.new(self)
+      end
+
+      private
+
+      def self.build(context = {})
+        self === context ? context : new(context)
+      end
+    end
+
+    # Internal module to define available steps as DSL
+    # @!visibility private
+    module StepsHelpers
+      def model(name = :model, step_name = :"fetch_#{name}", optional: false)
+        steps << ModelStep.new(name, step_name, optional: optional)
+      end
+
+      def contract(name = :default, class_name: self::Contract, default_values_from: nil)
+        steps << ContractStep.new(
+          name,
+          class_name: class_name,
+          default_values_from: default_values_from,
+        )
+      end
+
+      def policy(name = :default, class_name: nil)
+        steps << PolicyStep.new(name, class_name: class_name)
+      end
+
+      def step(name)
+        steps << Step.new(name)
+      end
+
+      def transaction(&block)
+        steps << TransactionStep.new(&block)
+      end
+    end
+
+    # @!visibility private
+    class Step
+      attr_reader :name, :method_name, :class_name
+
+      def initialize(name, method_name = name, class_name: nil)
+        @name = name
+        @method_name = method_name
+        @class_name = class_name
+      end
+
+      def call(instance, context)
+        object = class_name&.new(context)
+        method = object&.method(:call) || instance.method(method_name)
+        args = {}
+        args = context.to_h if method.arity.nonzero?
+        context[result_key] = Context.build(object: object)
+        instance.instance_exec(**args, &method)
+      end
+
+      private
+
+      def type
+        self.class.name.split("::").last.downcase.sub(/^(\w+)step$/, "\\1")
+      end
+
+      def result_key
+        "result.#{type}.#{name}"
+      end
+    end
+
+    # @!visibility private
+    class ModelStep < Step
+      attr_reader :optional
+
+      def initialize(name, method_name = name, class_name: nil, optional: nil)
+        super(name, method_name, class_name: class_name)
+        @optional = optional.present?
+      end
+
+      def call(instance, context)
+        context[name] = super
+        raise ArgumentError, "Model not found" if !optional && context[name].blank?
+        if context[name].try(:invalid?)
+          context[result_key].fail(invalid: true)
+          context.fail!
+        end
+      rescue ArgumentError => exception
+        context[result_key].fail(exception: exception)
+        context.fail!
+      end
+    end
+
+    # @!visibility private
+    class PolicyStep < Step
+      def call(instance, context)
+        if !super
+          context[result_key].fail(reason: context[result_key].object&.reason)
+          context.fail!
+        end
+      end
+    end
+
+    # @!visibility private
+    class ContractStep < Step
+      attr_reader :default_values_from
+
+      def initialize(name, method_name = name, class_name: nil, default_values_from: nil)
+        super(name, method_name, class_name: class_name)
+        @default_values_from = default_values_from
+      end
+
+      def call(instance, context)
+        attributes = class_name.attribute_names.map(&:to_sym)
+        default_values = {}
+        default_values = context[default_values_from].slice(*attributes) if default_values_from
+        contract = class_name.new(default_values.merge(context.to_h.slice(*attributes)))
+        context[contract_name] = contract
+        context[result_key] = Context.build
+        if contract.invalid?
+          context[result_key].fail(errors: contract.errors)
+          context.fail!
+        end
+      end
+
+      private
+
+      def contract_name
+        return :contract if name.to_sym == :default
+        :"#{name}_contract"
+      end
+    end
+
+    # @!visibility private
+    class TransactionStep < Step
+      include StepsHelpers
+
+      attr_reader :steps
+
+      def initialize(&block)
+        @steps = []
+        instance_exec(&block)
+      end
+
+      def call(instance, context)
+        ActiveRecord::Base.transaction { steps.each { |step| step.call(instance, context) } }
+      end
+    end
+
+    included do
+      # The global context which is available from any step.
+      attr_reader :context
+
+      # @!visibility private
+      # Internal class used to setup the base contract of the service.
+      self::Contract =
+        Class.new do
+          include ActiveModel::API
+          include ActiveModel::Attributes
+          include ActiveModel::AttributeMethods
+          include ActiveModel::Validations::Callbacks
+        end
+    end
+
+    class_methods do
+      include StepsHelpers
+
+      def call(context = {})
+        new(context).tap(&:run).context
+      end
+
+      def call!(context = {})
+        new(context).tap(&:run!).context
+      end
+
+      def steps
+        @steps ||= []
+      end
+    end
+
+    # @!scope class
+    # @!method model(name = :model, step_name = :"fetch_#{name}", optional: false)
+    # @param name [Symbol] name of the model
+    # @param step_name [Symbol] name of the method to call for this step
+    # @param optional [Boolean] if +true+, then the step won’t fail if its return value is falsy.
+    # Evaluates arbitrary code to build or fetch a model (typically from the
+    # DB). If the step returns a falsy value, then the step will fail.
+    #
+    # It stores the resulting model in +context[:model]+ by default (can be
+    # customized by providing the +name+ argument).
+    #
+    # @example
+    #   model :channel, :fetch_channel
+    #
+    #   private
+    #
+    #   def fetch_channel(channel_id:, **)
+    #     Chat::Channel.find_by(id: channel_id)
+    #   end
+
+    # @!scope class
+    # @!method policy(name = :default, class_name: nil)
+    # @param name [Symbol] name for this policy
+    # @param class_name [Class] a policy object (should inherit from +PolicyBase+)
+    # Performs checks related to the state of the system. If the
+    # step doesn’t return a truthy value, then the policy will fail.
+    #
+    # When using a policy object, there is no need to define a method on the
+    # service for the policy step. The policy object `#call` method will be
+    # called and if the result isn’t truthy, a `#reason` method is expected to
+    # be implemented to explain the failure.
+    #
+    # Policy objects are usually useful for more complex logic.
+    #
+    # @example Without a policy object
+    #   policy :no_direct_message_channel
+    #
+    #   private
+    #
+    #   def no_direct_message_channel(channel:, **)
+    #     !channel.direct_message_channel?
+    #   end
+    #
+    # @example With a policy object
+    #   # in the service object
+    #   policy :no_direct_message_channel, class_name: NoDirectMessageChannelPolicy
+    #
+    #   # in the policy object File
+    #   class NoDirectMessageChannelPolicy < PolicyBase
+    #     def call
+    #       !context.channel.direct_message_channel?
+    #     end
+    #
+    #     def reason
+    #       "Direct message channels aren’t supported"
+    #     end
+    #   end
+
+    # @!scope class
+    # @!method contract(name = :default, class_name: self::Contract, default_values_from: nil)
+    # @param name [Symbol] name for this contract
+    # @param class_name [Class] a class defining the contract
+    # @param default_values_from [Symbol] name of the model to get default values from
+    # Checks the validity of the input parameters.
+    # Implements ActiveModel::Validations and ActiveModel::Attributes.
+    #
+    # It stores the resulting contract in +context[:contract]+ by default
+    # (can be customized by providing the +name+ argument).
+    #
+    # @example
+    #   contract
+    #
+    #   class Contract
+    #     attribute :name
+    #     validates :name, presence: true
+    #   end
+
+    # @!scope class
+    # @!method step(name)
+    # @param name [Symbol] the name of this step
+    # Runs arbitrary code. To mark a step as failed, a call to {#fail!} needs
+    # to be made explicitly.
+    #
+    # @example
+    #   step :update_channel
+    #
+    #   private
+    #
+    #   def update_channel(channel:, params_to_edit:, **)
+    #     channel.update!(params_to_edit)
+    #   end
+    # @example using {#fail!} in a step
+    #   step :save_channel
+    #
+    #   private
+    #
+    #   def save_channel(channel:, **)
+    #     fail!("something went wrong") if !channel.save
+    #   end
+
+    # @!scope class
+    # @!method transaction(&block)
+    # @param block [Proc] a block containing steps to be run inside a transaction
+    # Runs steps inside a DB transaction.
+    #
+    # @example
+    #   transaction do
+    #     step :prevents_slug_collision
+    #     step :soft_delete_channel
+    #     step :log_channel_deletion
+    #   end
+
+    # @!visibility private
+    def initialize(initial_context = {})
+      @initial_context = initial_context.with_indifferent_access
+      @context = Context.build(initial_context.merge(__steps__: self.class.steps))
+    end
+
+    # @!visibility private
+    def run
+      run!
+    rescue Failure => exception
+      raise if context.object_id != exception.context.object_id
+    end
+
+    # @!visibility private
+    def run!
+      self.class.steps.each { |step| step.call(self, context) }
+    end
+
+    # @!visibility private
+    def fail!(message)
+      step_name = caller_locations(1, 1)[0].label
+      context["result.step.#{step_name}"].fail(error: message)
+      context.fail!
+    end
+  end
+end
diff --git a/plugins/chat/app/validators/chat/allow_uploads_validator.rb b/plugins/chat/app/validators/chat/allow_uploads_validator.rb
new file mode 100644
index 00000000000..df859b53f62
--- /dev/null
+++ b/plugins/chat/app/validators/chat/allow_uploads_validator.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Chat
+  class AllowUploadsValidator
+    def initialize(opts = {})
+      @opts = opts
+    end
+
+    def valid_value?(value)
+      return false if value == "t" && prevent_enabling_chat_uploads?
+      true
+    end
+
+    def error_message
+      if prevent_enabling_chat_uploads?
+        I18n.t("site_settings.errors.chat_upload_not_allowed_secure_uploads")
+      end
+    end
+
+    def prevent_enabling_chat_uploads?
+      SiteSetting.secure_uploads && !GlobalSetting.allow_unsecure_chat_uploads
+    end
+  end
+end
diff --git a/plugins/chat/app/validators/chat/default_channel_validator.rb b/plugins/chat/app/validators/chat/default_channel_validator.rb
new file mode 100644
index 00000000000..c8f23893851
--- /dev/null
+++ b/plugins/chat/app/validators/chat/default_channel_validator.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Chat
+  class DefaultChannelValidator
+    def initialize(opts = {})
+      @opts = opts
+    end
+
+    def valid_value?(value)
+      !!(value == "" || Chat::Channel.find_by(id: value.to_i)&.public_channel?)
+    end
+
+    def error_message
+      I18n.t("site_settings.errors.chat_default_channel")
+    end
+  end
+end
diff --git a/plugins/chat/app/validators/chat/direct_message_enabled_groups_validator.rb b/plugins/chat/app/validators/chat/direct_message_enabled_groups_validator.rb
new file mode 100644
index 00000000000..f56fadf5dde
--- /dev/null
+++ b/plugins/chat/app/validators/chat/direct_message_enabled_groups_validator.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Chat
+  class DirectMessageEnabledGroupsValidator
+    def initialize(opts = {})
+      @opts = opts
+    end
+
+    def valid_value?(val)
+      val.present? && val != ""
+    end
+
+    def error_message
+      I18n.t("site_settings.errors.direct_message_enabled_groups_invalid")
+    end
+  end
+end
diff --git a/plugins/chat/assets/javascripts/discourse/chat-route-map.js b/plugins/chat/assets/javascripts/discourse/chat-route-map.js
index 582253f65b5..c762056236e 100644
--- a/plugins/chat/assets/javascripts/discourse/chat-route-map.js
+++ b/plugins/chat/assets/javascripts/discourse/chat-route-map.js
@@ -1,18 +1,28 @@
 export default function () {
   this.route("chat", { path: "/chat" }, function () {
+    // TODO(roman): Remove after the 3.1 release
+    this.route("channel-legacy", {
+      path: "/channel/:channelId/:channelTitle",
+    });
+
+    this.route("channel", { path: "/c/:channelTitle/:channelId" }, function () {
+      this.route("near-message", { path: "/:messageId" });
+      this.route("threads", { path: "/t" });
+      this.route("thread", { path: "/t/:threadId" }, function () {
+        this.route("near-message", { path: "/:messageId" });
+      });
+    });
+
     this.route(
-      "channel",
-      { path: "/channel/:channelId/:channelTitle" },
+      "channel.info",
+      { path: "/c/:channelTitle/:channelId/info" },
       function () {
-        this.route("info", { path: "/info" }, function () {
-          this.route("about", { path: "/about" });
-          this.route("members", { path: "/members" });
-          this.route("settings", { path: "/settings" });
-        });
+        this.route("about", { path: "/about" });
+        this.route("members", { path: "/members" });
+        this.route("settings", { path: "/settings" });
       }
     );
 
-    this.route("draft-channel", { path: "/draft-channel" });
     this.route("browse", { path: "/browse" }, function () {
       this.route("all", { path: "/all" });
       this.route("closed", { path: "/closed" });
diff --git a/plugins/chat/assets/javascripts/discourse/components/channels-list.hbs b/plugins/chat/assets/javascripts/discourse/components/channels-list.hbs
index 7df6051daa6..70660effd69 100644
--- a/plugins/chat/assets/javascripts/discourse/components/channels-list.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/channels-list.hbs
@@ -1,23 +1,22 @@
-{{#if
-  (and this.showMobileDirectMessageButton this.canCreateDirectMessageChannel)
-}}
-  <LinkTo
-    @route="chat.draft-channel"
-    class="btn-flat open-draft-channel-page-btn keep-mobile-sidebar-open btn-floating"
+{{#if this.showMobileDirectMessageButton}}
+  <DButton
+    @icon="plus"
+    class="no-text btn-flat open-new-message-btn keep-mobile-sidebar-open btn-floating"
+    @action={{this.openNewMessageModal}}
     title={{i18n this.createDirectMessageChannelLabel}}
-  >
-    {{d-icon "plus"}}
-  </LinkTo>
+  />
 {{/if}}
 
 <div
   role="region"
   aria-label={{i18n "chat.aria_roles.channels_list"}}
-  class="channels-list"
+  class={{concat-class "channels-list" (if this.hasScrollbar "has-scrollbar")}}
   {{on
     "scroll"
     (if this.chatStateManager.isFullPageActive this.storeScrollPosition (noop))
   }}
+  {{did-insert this.computeHasScrollbar}}
+  {{chat/on-resize this.computeResizedEntries}}
 >
   {{#if this.displayPublicChannels}}
     <div class="chat-channel-divider public-channels-section">
@@ -60,13 +59,14 @@
           />
         {{/each}}
       {{/if}}
+
     </div>
   {{/if}}
 
   <PluginOutlet
     @name="below-public-chat-channels"
     @tagName=""
-    @args={{hash inSidebar=this.inSidebar}}
+    @outletArgs={{hash inSidebar=this.inSidebar}}
   />
 
   {{#if this.showDirectMessageChannels}}
@@ -94,13 +94,12 @@
           (not this.showMobileDirectMessageButton)
         )
       }}
-        <LinkTo
-          @route="chat.draft-channel"
-          class="btn no-text btn-flat open-draft-channel-page-btn"
+        <DButton
+          @icon="plus"
+          class="no-text btn-flat open-new-message-btn"
+          @action={{this.openNewMessageModal}}
           title={{i18n this.createDirectMessageChannelLabel}}
-        >
-          {{d-icon "plus"}}
-        </LinkTo>
+        />
       {{/if}}
     </div>
   {{/if}}
diff --git a/plugins/chat/assets/javascripts/discourse/components/channels-list.js b/plugins/chat/assets/javascripts/discourse/components/channels-list.js
index 9cac0ff735e..b7011cfbae8 100644
--- a/plugins/chat/assets/javascripts/discourse/components/channels-list.js
+++ b/plugins/chat/assets/javascripts/discourse/components/channels-list.js
@@ -1,24 +1,51 @@
 import { bind } from "discourse-common/utils/decorators";
-import Component from "@ember/component";
-import { action, computed } from "@ember/object";
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
 import { schedule } from "@ember/runloop";
 import { inject as service } from "@ember/service";
-import { and, empty } from "@ember/object/computed";
+import { tracked } from "@glimmer/tracking";
+import ChatModalNewMessage from "discourse/plugins/chat/discourse/components/chat/modal/new-message";
 
 export default class ChannelsList extends Component {
   @service chat;
   @service router;
   @service chatStateManager;
   @service chatChannelsManager;
-  tagName = "";
-  inSidebar = false;
-  toggleSection = null;
-  @empty("chatChannelsManager.publicMessageChannels")
-  publicMessageChannelsEmpty;
-  @and("site.mobileView", "showDirectMessageChannels")
-  showMobileDirectMessageButton;
+  @service site;
+  @service siteSettings;
+  @service session;
+  @service currentUser;
+  @service modal;
+
+  @tracked hasScrollbar = false;
+
+  @action
+  computeHasScrollbar(element) {
+    this.hasScrollbar = element.scrollHeight > element.clientHeight;
+  }
+
+  @action
+  computeResizedEntries(entries) {
+    this.computeHasScrollbar(entries[0].target);
+  }
+
+  @action
+  openNewMessageModal() {
+    this.modal.show(ChatModalNewMessage);
+  }
+
+  get showMobileDirectMessageButton() {
+    return this.site.mobileView && this.canCreateDirectMessageChannel;
+  }
+
+  get inSidebar() {
+    return this.args.inSidebar ?? false;
+  }
+
+  get publicMessageChannelsEmpty() {
+    return this.chatChannelsManager.publicMessageChannels?.length === 0;
+  }
 
-  @computed("canCreateDirectMessageChannel")
   get createDirectMessageChannelLabel() {
     if (!this.canCreateDirectMessageChannel) {
       return "chat.direct_messages.cannot_create";
@@ -27,10 +54,6 @@ export default class ChannelsList extends Component {
     return "chat.direct_messages.new";
   }
 
-  @computed(
-    "canCreateDirectMessageChannel",
-    "chatChannelsManager.directMessageChannels"
-  )
   get showDirectMessageChannels() {
     return (
       this.canCreateDirectMessageChannel ||
@@ -42,18 +65,17 @@ export default class ChannelsList extends Component {
     return this.chat.userCanDirectMessage;
   }
 
-  @computed("inSidebar")
   get publicChannelClasses() {
     return `channels-list-container public-channels ${
       this.inSidebar ? "collapsible-sidebar-section" : ""
     }`;
   }
 
-  @computed(
-    "publicMessageChannelsEmpty",
-    "currentUser.{staff,has_joinable_public_channels}"
-  )
   get displayPublicChannels() {
+    if (!this.siteSettings.enable_public_channels) {
+      return false;
+    }
+
     if (this.publicMessageChannelsEmpty) {
       return (
         this.currentUser?.staff ||
@@ -64,7 +86,6 @@ export default class ChannelsList extends Component {
     return true;
   }
 
-  @computed("inSidebar")
   get directMessageChannelClasses() {
     return `channels-list-container direct-message-channels ${
       this.inSidebar ? "collapsible-sidebar-section" : ""
@@ -73,7 +94,7 @@ export default class ChannelsList extends Component {
 
   @action
   toggleChannelSection(section) {
-    this.toggleSection(section);
+    this.args.toggleSection(section);
   }
 
   didRender() {
@@ -84,12 +105,20 @@ export default class ChannelsList extends Component {
 
   @action
   storeScrollPosition() {
+    if (this.chatStateManager.isDrawerActive) {
+      return;
+    }
+
     const scrollTop = document.querySelector(".channels-list")?.scrollTop || 0;
     this.session.channelsListPosition = scrollTop;
   }
 
   @bind
   _applyScrollPosition() {
+    if (this.chatStateManager.isDrawerActive) {
+      return;
+    }
+
     const position = this.chatStateManager.isFullPageActive
       ? this.session.channelsListPosition || 0
       : 0;
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-browse-view.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-browse-view.hbs
index 229f6b600dc..6776a23a109 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-browse-view.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-browse-view.hbs
@@ -1,12 +1,3 @@
-{{#if this.chatProgressBarContainer}}
-  {{#in-element this.chatProgressBarContainer}}
-    <DProgressBar
-      @key="browse-list"
-      @isLoading={{this.channelsCollection.loading}}
-    />
-  {{/in-element}}
-{{/if}}
-
 <div class="chat-browse-view__header chat-full-page-header">
   {{#if this.site.mobileView}}
     <LinkTo
@@ -61,32 +52,37 @@
 
   {{#if
     (and
-      (not this.channelsCollection.length) (not this.channelsCollection.loading)
+      this.channelsCollection.fetchedOnce (not this.channelsCollection.length)
     )
   }}
     <div class="empty-state">
       <span class="empty-state-title">{{i18n "chat.empty_state.title"}}</span>
       <div class="empty-state-body">
         <p>{{i18n "chat.empty_state.direct_message"}}</p>
-
-        <LinkTo @route={{concat "chat.draft-channel"}}>
-          {{i18n "chat.empty_state.direct_message_cta"}}
-        </LinkTo>
+        <DButton
+          @action={{this.showChatNewMessageModal}}
+          @label="chat.empty_state.direct_message_cta"
+        />
       </div>
     </div>
   {{else if this.channelsCollection.length}}
-    <div class="chat-browse-view__content_wrapper">
-      <div class="chat-browse-view__content">
-        <div class="chat-browse-view__cards">
-          {{#each this.channelsCollection as |channel|}}
-            <ChatChannelCard @channel={{channel}} />
-          {{/each}}
+    <LoadMore
+      @selector=".chat-channel-card"
+      @action={{this.channelsCollection.load}}
+    >
+      <div class="chat-browse-view__content_wrapper">
+        <div class="chat-browse-view__content">
+          <div class="chat-browse-view__cards">
+            {{#each this.channelsCollection as |channel|}}
+              <ChatChannelCard @channel={{channel}} />
+            {{/each}}
+          </div>
         </div>
-
-        {{#unless this.channelsCollection.loading}}
-          <OnVisibilityAction @action={{action "onScroll"}} />
-        {{/unless}}
       </div>
-    </div>
+
+      <ConditionalLoadingSpinner
+        @condition={{this.channelsCollection.loading}}
+      />
+    </LoadMore>
   {{/if}}
 </div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-browse-view.js b/plugins/chat/assets/javascripts/discourse/components/chat-browse-view.js
index 39ea226ef68..bf45efe8be7 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-browse-view.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-browse-view.js
@@ -4,12 +4,15 @@ import { action, computed } from "@ember/object";
 import { schedule } from "@ember/runloop";
 import { inject as service } from "@ember/service";
 import discourseDebounce from "discourse-common/lib/debounce";
-import showModal from "discourse/lib/show-modal";
+import ChatModalNewMessage from "discourse/plugins/chat/discourse/components/chat/modal/new-message";
+import ChatModalCreateChannel from "discourse/plugins/chat/discourse/components/chat/modal/create-channel";
 
 const TABS = ["all", "open", "closed", "archived"];
 
 export default class ChatBrowseView extends Component {
   @service chatApi;
+  @service modal;
+
   tagName = "";
 
   didReceiveAttrs() {
@@ -34,15 +37,16 @@ export default class ChatBrowseView extends Component {
     }
   }
 
-  get chatProgressBarContainer() {
-    return document.querySelector("#chat-progress-bar-container");
+  @action
+  showChatNewMessageModal() {
+    this.modal.show(ChatModalNewMessage);
   }
 
   @action
   onScroll() {
     discourseDebounce(
       this,
-      this.channelsCollection.loadMore,
+      this.channelsCollection.load,
       { filter: this.filter, status: this.status },
       INPUT_DELAY
     );
@@ -50,6 +54,8 @@ export default class ChatBrowseView extends Component {
 
   @action
   debouncedFiltering(event) {
+    this.set("channelsCollection", this.chatApi.channels());
+
     discourseDebounce(
       this,
       this.channelsCollection.load,
@@ -60,7 +66,7 @@ export default class ChatBrowseView extends Component {
 
   @action
   createChannel() {
-    showModal("create-channel");
+    this.modal.show(ChatModalCreateChannel);
   }
 
   @action
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-about-view.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-about-view.hbs
index 05ebec3b06e..29b3fa73c0a 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-about-view.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-about-view.hbs
@@ -22,19 +22,19 @@
       {{#if (chat-guardian "can-edit-chat-channel")}}
         <div class="chat-form__label-actions">
           <DButton
-            @class="edit-name-btn btn-flat"
+            @class="edit-name-slug-btn btn-flat"
             @label="chat.channel_settings.edit"
-            @action={{if
-              this.onEditChatChannelName
-              this.onEditChatChannelName
-            }}
+            @action={{if this.onEditChatChannelName this.onEditChatChannelName}}
           />
         </div>
       {{/if}}
     </label>
     <div class="chat-form__control">
       <div class="channel-info-about-view__name">
-        {{replace-emoji this.channel.escapedTitle}}
+        {{replace-emoji this.channel.title}}
+      </div>
+      <div class="channel-info-about-view__slug">
+        {{this.channel.slug}}
       </div>
     </div>
   </div>
@@ -90,4 +90,4 @@
       leaveIcon="sign-out-alt"
     }}
   />
-</div>
+</div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-archive-modal-inner.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-archive-modal-inner.hbs
deleted file mode 100644
index d4da56380ae..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-archive-modal-inner.hbs
+++ /dev/null
@@ -1,30 +0,0 @@
-<DModalBody @title="chat.channel_archive.title">
-  <div
-    id="chat-channel-archive-modal-inner"
-    class="chat-channel-archive-modal-inner"
-  >
-    <p
-      class="chat-channel-archive-modal-instructions"
-    >{{this.instructionsText}}</p>
-
-    <ChatToTopicSelector
-      @selection={{this.selection}}
-      @topicTitle={{this.topicTitle}}
-      @categoryId={{this.categoryId}}
-      @tags={{this.tags}}
-      @selectedTopicId={{this.selectedTopicId}}
-      @instructionLabels={{this.instructionLabels}}
-      @allowNewMessage={{false}}
-    />
-  </div>
-</DModalBody>
-
-<div class="modal-footer">
-  <DButton
-    @class="btn-primary"
-    @disabled={{this.buttonDisabled}}
-    @action={{action "archiveChannel"}}
-    @label="chat.channel_archive.title"
-    @id="chat-confirm-archive-channel"
-  />
-</div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-archive-modal-inner.js b/plugins/chat/assets/javascripts/discourse/components/chat-channel-archive-modal-inner.js
deleted file mode 100644
index 5519e771f2e..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-archive-modal-inner.js
+++ /dev/null
@@ -1,108 +0,0 @@
-import Component from "@ember/component";
-import I18n from "I18n";
-import discourseLater from "discourse-common/lib/later";
-import { isEmpty } from "@ember/utils";
-import discourseComputed from "discourse-common/utils/decorators";
-import { action } from "@ember/object";
-import { equal } from "@ember/object/computed";
-import { inject as service } from "@ember/service";
-import { popupAjaxError } from "discourse/lib/ajax-error";
-import {
-  EXISTING_TOPIC_SELECTION,
-  NEW_TOPIC_SELECTION,
-} from "discourse/plugins/chat/discourse/components/chat-to-topic-selector";
-import { CHANNEL_STATUSES } from "discourse/plugins/chat/discourse/models/chat-channel";
-import { htmlSafe } from "@ember/template";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-
-export default Component.extend(ModalFunctionality, {
-  chat: service(),
-  chatApi: service(),
-  tagName: "",
-  chatChannel: null,
-
-  selection: NEW_TOPIC_SELECTION,
-  newTopic: equal("selection", NEW_TOPIC_SELECTION),
-  existingTopic: equal("selection", EXISTING_TOPIC_SELECTION),
-
-  saving: false,
-
-  topicTitle: null,
-  categoryId: null,
-  tags: null,
-  selectedTopicId: null,
-
-  @action
-  archiveChannel() {
-    this.set("saving", true);
-
-    return this.chatApi
-      .createChannelArchive(this.chatChannel.id, this._data())
-      .then(() => {
-        this.flash(I18n.t("chat.channel_archive.process_started"), "success");
-        this.chatChannel.set("status", CHANNEL_STATUSES.archived);
-
-        discourseLater(() => {
-          this.closeModal();
-        }, 3000);
-      })
-      .catch(popupAjaxError)
-      .finally(() => this.set("saving", false));
-  },
-
-  _data() {
-    const data = {
-      type: this.selection,
-    };
-    if (this.newTopic) {
-      data.title = this.topicTitle;
-      data.category_id = this.categoryId;
-      data.tags = this.tags;
-    }
-    if (this.existingTopic) {
-      data.topic_id = this.selectedTopicId;
-    }
-    return data;
-  },
-
-  @discourseComputed("saving", "selectedTopicId", "topicTitle", "selection")
-  buttonDisabled(saving, selectedTopicId, topicTitle) {
-    if (saving) {
-      return true;
-    }
-    if (
-      this.newTopic &&
-      (!topicTitle ||
-        topicTitle.length < this.siteSettings.min_topic_title_length ||
-        topicTitle.length > this.siteSettings.max_topic_title_length)
-    ) {
-      return true;
-    }
-
-    if (this.existingTopic && isEmpty(selectedTopicId)) {
-      return true;
-    }
-    return false;
-  },
-
-  @discourseComputed()
-  instructionLabels() {
-    const labels = {};
-    labels[NEW_TOPIC_SELECTION] = I18n.t(
-      "chat.selection.new_topic.instructions_channel_archive"
-    );
-    labels[EXISTING_TOPIC_SELECTION] = I18n.t(
-      "chat.selection.existing_topic.instructions_channel_archive"
-    );
-    return labels;
-  },
-
-  @discourseComputed()
-  instructionsText() {
-    return htmlSafe(
-      I18n.t("chat.channel_archive.instructions", {
-        channelTitle: this.chatChannel.escapedTitle,
-      })
-    );
-  },
-});
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-archive-status.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-archive-status.hbs
index e09696ee388..745fb8907b6 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-archive-status.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-archive-status.hbs
@@ -1,18 +1,25 @@
-{{#if (and this.channel.archive_failed this.currentUser.admin)}}
-  <div class="alert alert-warn chat-channel-retry-archive">
-    <div class="chat-channel-archive-failed-message">
-      {{this.channelArchiveFailedMessage}}
-    </div>
+{{#if this.shouldRender}}
+  {{#if @channel.archive.failed}}
+    <div
+      class={{concat-class
+        "alert alert-warn chat-channel-retry-archive"
+        @channel.status
+      }}
+    >
+      <div class="chat-channel-archive-failed-message">
+        {{this.channelArchiveFailedMessage}}
+      </div>
 
-    <div class="chat-channel-archive-failed-retry">
-      <DButton
-        @action={{action "retryArchive"}}
-        @label="chat.channel_archive.retry"
-      />
+      <div class="chat-channel-archive-failed-retry">
+        <DButton
+          @action={{this.retryArchive}}
+          @label="chat.channel_archive.retry"
+        />
+      </div>
     </div>
-  </div>
-{{else if (and this.channel.archive_completed this.currentUser.admin)}}
-  <div class="chat-channel-archive-status">
-    {{this.channelArchiveCompletedMessage}}
-  </div>
+  {{else if @channel.archive.completed}}
+    <div class={{concat-class "chat-channel-archive-status" @channel.status}}>
+      {{this.channelArchiveCompletedMessage}}
+    </div>
+  {{/if}}
 {{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-archive-status.js b/plugins/chat/assets/javascripts/discourse/components/chat-channel-archive-status.js
index 0f23a725e3d..8998272a79a 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-archive-status.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-archive-status.js
@@ -1,61 +1,53 @@
-import Component from "@ember/component";
+import Component from "@glimmer/component";
 import { htmlSafe } from "@ember/template";
 import I18n from "I18n";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import getURL from "discourse-common/lib/get-url";
 import { action } from "@ember/object";
-import discourseComputed from "discourse-common/utils/decorators";
 import { inject as service } from "@ember/service";
+import { isPresent } from "@ember/utils";
 
-export default Component.extend({
-  channel: null,
-  tagName: "",
-  chatApi: service(),
+export default class ChatChannelArchiveStatus extends Component {
+  @service chatApi;
+  @service currentUser;
 
-  @discourseComputed(
-    "channel.status",
-    "channel.archived_messages",
-    "channel.total_messages",
-    "channel.archive_failed"
-  )
-  channelArchiveFailedMessage() {
-    const translationKey = !this.channel.archive_topic_id
+  get shouldRender() {
+    return this.currentUser.admin && isPresent(this.args.channel.archive);
+  }
+
+  get channelArchiveFailedMessage() {
+    const archive = this.args.channel.archive;
+    const translationKey = !archive.topicId
       ? "chat.channel_status.archive_failed_no_topic"
       : "chat.channel_status.archive_failed";
     return htmlSafe(
       I18n.t(translationKey, {
-        completed: this.channel.archived_messages,
-        total: this.channel.total_messages,
-        topic_url: this._getTopicUrl(),
+        completed: archive.messages,
+        total: archive.totalMessages,
+        topic_url: this.topicUrl,
       })
     );
-  },
+  }
 
-  @discourseComputed(
-    "channel.status",
-    "channel.archived_messages",
-    "channel.total_messages",
-    "channel.archive_completed"
-  )
-  channelArchiveCompletedMessage() {
+  get channelArchiveCompletedMessage() {
     return htmlSafe(
       I18n.t("chat.channel_status.archive_completed", {
-        topic_url: this._getTopicUrl(),
+        topic_url: this.topicUrl,
       })
     );
-  },
+  }
 
   @action
   retryArchive() {
     return this.chatApi
-      .createChannelArchive(this.channel.id)
+      .createChannelArchive(this.args.channel.id)
       .catch(popupAjaxError);
-  },
+  }
 
-  _getTopicUrl() {
-    if (!this.channel.archive_topic_id) {
+  get topicUrl() {
+    if (!this.args.channel.archive.topicId) {
       return "";
     }
-    return getURL(`/t/-/${this.channel.archive_topic_id}`);
-  },
-});
+    return getURL(`/t/-/${this.args.channel.archive.topicId}`);
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-card.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-card.hbs
index d36800259ee..9b4d077b090 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-card.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-card.hbs
@@ -11,11 +11,11 @@
     <div class="chat-channel-card__header">
       <LinkTo
         @route="chat.channel"
-        @models={{array @channel.id (slugify-channel @channel)}}
+        @models={{@channel.routeModels}}
         class="chat-channel-card__name-container"
       >
         <span class="chat-channel-card__name">
-          {{replace-emoji @channel.escapedTitle}}
+          {{replace-emoji @channel.title}}
         </span>
         {{#if @channel.chatable.read_restricted}}
           {{d-icon "lock" class="chat-channel-card__read-restricted"}}
@@ -26,7 +26,7 @@
         {{#if @channel.currentUserMembership.muted}}
           <LinkTo
             @route="chat.channel.info.settings"
-            @models={{array @channel.id (slugify-channel @channel)}}
+            @models={{@channel.routeModels}}
             class="chat-channel-card__tag -muted"
             tabindex="-1"
           >
@@ -36,7 +36,7 @@
 
         <LinkTo
           @route="chat.channel.info.settings"
-          @models={{array @channel.id (slugify-channel @channel)}}
+          @models={{@channel.routeModels}}
           class="chat-channel-card__setting"
           tabindex="-1"
         >
@@ -47,7 +47,7 @@
 
     {{#if @channel.description}}
       <div class="chat-channel-card__description">
-        {{replace-emoji @channel.escapedDescription}}
+        {{replace-emoji @channel.description}}
       </div>
     {{/if}}
 
@@ -79,7 +79,7 @@
       {{#if (gt @channel.membershipsCount 0)}}
         <LinkTo
           @route="chat.channel.info.members"
-          @models={{array @channel.id (slugify-channel @channel)}}
+          @models={{@channel.routeModels}}
           class="chat-channel-card__members"
           tabindex="-1"
         >
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-delete-modal-inner.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-delete-modal-inner.hbs
deleted file mode 100644
index faf2829c557..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-delete-modal-inner.hbs
+++ /dev/null
@@ -1,30 +0,0 @@
-<DModalBody @title="chat.channel_delete.title">
-  <div
-    id="chat-channel-delete-modal-inner"
-    class="chat-channel-delete-modal-inner"
-  >
-    <p class="chat-channel-delete-modal-instructions">
-      {{this.instructionsText}}
-    </p>
-  </div>
-
-  <TextField
-    @value={{this.channelNameConfirmation}}
-    @id="channel-delete-confirm-name"
-    @placeholderKey="chat.channel_delete.confirm_channel_name"
-    @autocorrect="off"
-    @autocapitalize="off"
-  />
-</DModalBody>
-
-<div class="modal-footer">
-  <DButton
-    @disabled={{this.buttonDisabled}}
-    @class="btn-danger"
-    @action={{action "deleteChannel"}}
-    @label="chat.channel_delete.confirm"
-    @id="chat-confirm-delete-channel"
-  />
-
-  <DButton @label="cancel" @class="btn-flat" @action={{this.closeModal}} />
-</div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-delete-modal-inner.js b/plugins/chat/assets/javascripts/discourse/components/chat-channel-delete-modal-inner.js
deleted file mode 100644
index 4943ae1e34b..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-delete-modal-inner.js
+++ /dev/null
@@ -1,67 +0,0 @@
-import Component from "@ember/component";
-import { isEmpty } from "@ember/utils";
-import I18n from "I18n";
-import discourseComputed from "discourse-common/utils/decorators";
-import { action } from "@ember/object";
-import { inject as service } from "@ember/service";
-import { popupAjaxError } from "discourse/lib/ajax-error";
-import discourseLater from "discourse-common/lib/later";
-import { htmlSafe } from "@ember/template";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-
-export default Component.extend(ModalFunctionality, {
-  chat: service(),
-  chatApi: service(),
-  router: service(),
-  tagName: "",
-  chatChannel: null,
-  channelNameConfirmation: null,
-  deleting: false,
-  confirmed: false,
-
-  @discourseComputed("deleting", "channelNameConfirmation", "confirmed")
-  buttonDisabled(deleting, channelNameConfirmation, confirmed) {
-    if (deleting || confirmed) {
-      return true;
-    }
-
-    if (
-      isEmpty(channelNameConfirmation) ||
-      channelNameConfirmation.toLowerCase() !==
-        this.chatChannel.title.toLowerCase()
-    ) {
-      return true;
-    }
-    return false;
-  },
-
-  @action
-  deleteChannel() {
-    this.set("deleting", true);
-
-    return this.chatApi
-      .destroyChannel(this.chatChannel.id, {
-        name_confirmation: this.channelNameConfirmation,
-      })
-      .then(() => {
-        this.set("confirmed", true);
-        this.flash(I18n.t("chat.channel_delete.process_started"), "success");
-
-        discourseLater(() => {
-          this.closeModal();
-          this.router.transitionTo("chat");
-        }, 3000);
-      })
-      .catch(popupAjaxError)
-      .finally(() => this.set("deleting", false));
-  },
-
-  @discourseComputed()
-  instructionsText() {
-    return htmlSafe(
-      I18n.t("chat.channel_delete.instructions", {
-        name: this.chatChannel.escapedTitle,
-      })
-    );
-  },
-});
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-leave-btn.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-leave-btn.hbs
index 90e409770e9..19fa80d7a42 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-leave-btn.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-leave-btn.hbs
@@ -1,8 +1,8 @@
-{{#unless this.site.mobileView}}
+{{#if this.shouldRender}}
   <DButton
     @icon="times"
-    @action={{this.onLeaveChannel}}
+    @action={{@onLeaveChannel}}
     @class="btn-flat chat-channel-leave-btn"
     @title={{this.leaveChatTitleKey}}
   />
-{{/unless}}
\ No newline at end of file
+{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-leave-btn.js b/plugins/chat/assets/javascripts/discourse/components/chat-channel-leave-btn.js
index 3347b5e2369..b585b366355 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-leave-btn.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-leave-btn.js
@@ -1,25 +1,19 @@
-import discourseComputed from "discourse-common/utils/decorators";
-import Component from "@ember/component";
-import { equal } from "@ember/object/computed";
+import Component from "@glimmer/component";
 import { inject as service } from "@ember/service";
-import { CHATABLE_TYPES } from "discourse/plugins/chat/discourse/models/chat-channel";
+import { isPresent } from "@ember/utils";
+export default class ChatChannelLeaveBtn extends Component {
+  @service chat;
+  @service site;
 
-export default Component.extend({
-  tagName: "",
-  channel: null,
-  chat: service(),
+  get shouldRender() {
+    return !this.site.mobileView && isPresent(this.args.channel);
+  }
 
-  isDirectMessageRow: equal(
-    "channel.chatable_type",
-    CHATABLE_TYPES.directMessageChannel
-  ),
-
-  @discourseComputed("isDirectMessageRow")
-  leaveChatTitleKey(isDirectMessageRow) {
-    if (isDirectMessageRow) {
+  get leaveChatTitleKey() {
+    if (this.args.channel.isDirectMessageChannel) {
       return "chat.direct_messages.leave";
     } else {
       return "chat.leave";
     }
-  },
-});
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-members-view.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-members-view.hbs
index 9ac1e3779cf..54f52fe97b1 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-members-view.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-members-view.hbs
@@ -1,51 +1,40 @@
-{{#if this.chatProgressBarContainer}}
-  {{#in-element this.chatProgressBarContainer}}
-    <DProgressBar @key="members-view" @isLoading={{this.members.loading}} />
-  {{/in-element}}
-{{/if}}
-
 {{#if (gt this.channel.membershipsCount 0)}}
-  <div class="channel-members-view-wrapper">
-    <div
-      class={{concat
-        "channel-members-view__search-input-container"
-        (if this.isSearchFocused " is-focused")
-      }}
-    >
-      <Input
-        class={{this.inputSelector}}
-        placeholder={{i18n "chat.members_view.filter_placeholder"}}
-        {{on "input" (action "onFilterMembers" value="target.value")}}
-        {{on "focusin" (action (mut this.isSearchFocused) true)}}
-        {{on "focusout" (action (mut this.isSearchFocused) false)}}
-      />
-      {{d-icon "search"}}
-    </div>
+  <LoadMore @selector=".channel-members-view__list-item" @action={{this.load}}>
+    <div class="channel-members-view-wrapper">
+      <div
+        class={{concat
+          "channel-members-view__search-input-container"
+          (if this.isSearchFocused " is-focused")
+        }}
+      >
+        <Input
+          class={{this.inputSelector}}
+          placeholder={{i18n "chat.members_view.filter_placeholder"}}
+          {{on "input" (action "onFilterMembers" value="target.value")}}
+          {{on "focusin" (action (mut this.isSearchFocused) true)}}
+          {{on "focusout" (action (mut this.isSearchFocused) false)}}
+        />
+        {{d-icon "search"}}
+      </div>
 
-    <div
-      class="channel-members-view__list-container"
-      {{on "scroll" (action "loadMore")}}
-    >
-
-      <div role="list" class="channel-members-view__list">
-        {{#each this.members as |membership|}}
-          <a
-            class="channel-members-view__list-item"
-            href={{membership.user.userPath}}
-            data-user-card={{membership.user.username}}
-            tabindex="0"
-          >
-            <ChatUserAvatar @user={{membership.user}} @avatarSize="medium" />
-            <ChatUserDisplayName @user={{membership.user}} />
-          </a>
-        {{else}}
-          {{#unless this.isFetchingMembers}}
-            {{i18n "chat.channel.no_memberships_found"}}
-          {{/unless}}
-        {{/each}}
+      <div class="channel-members-view__list-container">
+        <div role="list" class="channel-members-view__list">
+          {{#each this.members as |membership|}}
+            <div class="channel-members-view__list-item">
+              <ChatUserInfo @user={{membership.user}} />
+            </div>
+          {{else}}
+            {{#if this.members.fetchedOnce}}
+              <div class="chat-thread-list__no-threads">
+                {{i18n "chat.channel.no_memberships_found"}}
+              </div>
+            {{/if}}
+          {{/each}}
+        </div>
       </div>
     </div>
-  </div>
+    <ConditionalLoadingSpinner @condition={{this.members.loading}} />
+  </LoadMore>
 {{else}}
   <div class="channel-members-view-wrapper">
     {{i18n "chat.channel.no_memberships"}}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-members-view.js b/plugins/chat/assets/javascripts/discourse/components/chat-channel-members-view.js
index dea4cad847d..0912bd77b07 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-members-view.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-members-view.js
@@ -19,7 +19,7 @@ export default class ChatChannelMembersView extends Component {
   didInsertElement() {
     this._super(...arguments);
 
-    if (!this.channel || this.channel.isDraft) {
+    if (!this.channel) {
       return;
     }
 
@@ -36,13 +36,10 @@ export default class ChatChannelMembersView extends Component {
     this.appEvents.off("chat:refresh-channel-members", this, "onFilterMembers");
   }
 
-  get chatProgressBarContainer() {
-    return document.querySelector("#chat-progress-bar-container");
-  }
-
   @action
   onFilterMembers(username) {
     this.set("filter", username);
+    this.set("members", this.chatApi.listChannelMemberships(this.channel.id));
 
     discourseDebounce(
       this,
@@ -53,8 +50,8 @@ export default class ChatChannelMembersView extends Component {
   }
 
   @action
-  loadMore() {
-    discourseDebounce(this, this.members.loadMore, INPUT_DELAY);
+  load() {
+    discourseDebounce(this, this.members.load, INPUT_DELAY);
   }
 
   _focusSearch() {
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-message-emoji-picker.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-message-emoji-picker.hbs
new file mode 100644
index 00000000000..50899f81535
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-message-emoji-picker.hbs
@@ -0,0 +1,7 @@
+<ChatEmojiPicker
+  @context="chat-channel-message"
+  @didInsert={{this.didInsert}}
+  @willDestroy={{this.willDestroy}}
+  @didSelectEmoji={{this.didSelectEmoji}}
+  @class="hidden"
+/>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-message-emoji-picker.js b/plugins/chat/assets/javascripts/discourse/components/chat-channel-message-emoji-picker.js
new file mode 100644
index 00000000000..f8c6d4a25d8
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-message-emoji-picker.js
@@ -0,0 +1,51 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+import { headerOffset } from "discourse/lib/offset-calculator";
+import { createPopper } from "@popperjs/core";
+
+export default class ChatChannelMessageEmojiPicker extends Component {
+  @service site;
+  @service chatEmojiPickerManager;
+
+  context = "chat-channel-message";
+
+  @action
+  didSelectEmoji(emoji) {
+    this.chatEmojiPickerManager.picker?.didSelectEmoji(emoji);
+    this.chatEmojiPickerManager.close();
+  }
+
+  @action
+  didInsert(element) {
+    if (this.site.mobileView) {
+      element.classList.remove("hidden");
+      return;
+    }
+
+    this._popper = createPopper(
+      this.chatEmojiPickerManager.picker?.trigger,
+      element,
+      {
+        placement: "top",
+        modifiers: [
+          {
+            name: "eventListeners",
+            options: { scroll: false, resize: false },
+          },
+          {
+            name: "flip",
+            options: { padding: { top: headerOffset() } },
+          },
+        ],
+      }
+    );
+
+    element.classList.remove("hidden");
+  }
+
+  @action
+  willDestroy() {
+    this._popper?.destroy();
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-metadata.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-metadata.hbs
index 05c16b4e5d2..eaaa128bd70 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-metadata.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-metadata.hbs
@@ -1,9 +1,11 @@
 <div class="chat-channel-metadata">
-  <div class="chat-channel-metadata__date">
-    {{this.lastMessageFormatedDate}}
-  </div>
+  {{#if @channel.lastMessage}}
+    <div class="chat-channel-metadata__date">
+      {{this.lastMessageFormattedDate}}
+    </div>
+  {{/if}}
 
-  {{#if @unreadIndicator}}
+  {{#if this.unreadIndicator}}
     <ChatChannelUnreadIndicator @channel={{@channel}} />
   {{/if}}
 </div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-metadata.js b/plugins/chat/assets/javascripts/discourse/components/chat-channel-metadata.js
index 404cd7ebd4e..1ddaa3c5688 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-metadata.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-metadata.js
@@ -1,18 +1,18 @@
 import Component from "@glimmer/component";
-export default class ChatChannelMetadata extends Component {
-  unreadIndicator = false;
 
-  get lastMessageFormatedDate() {
-    return moment(this.args.channel.get("last_message_sent_at")).calendar(
-      null,
-      {
-        sameDay: "LT",
-        nextDay: "[Tomorrow]",
-        nextWeek: "dddd",
-        lastDay: "[Yesterday]",
-        lastWeek: "dddd",
-        sameElse: "l",
-      }
-    );
+export default class ChatChannelMetadata extends Component {
+  get unreadIndicator() {
+    return this.args.unreadIndicator ?? false;
+  }
+
+  get lastMessageFormattedDate() {
+    return moment(this.args.channel.lastMessage.createdAt).calendar(null, {
+      sameDay: "LT",
+      nextDay: "[Tomorrow]",
+      nextWeek: "dddd",
+      lastDay: "[Yesterday]",
+      lastWeek: "dddd",
+      sameElse: "l",
+    });
   }
 }
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-preview-card.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-preview-card.hbs
index 9002d3f774c..8832bd3befd 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-preview-card.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-preview-card.hbs
@@ -2,17 +2,18 @@
   class={{concat-class
     "chat-channel-preview-card"
     (unless this.hasDescription "-no-description")
+    (unless this.showJoinButton "-no-button")
   }}
 >
-  <ChatChannelTitle @channel={{this.channel}} />
+  <ChatChannelTitle @channel={{@channel}} />
   {{#if this.hasDescription}}
     <p class="chat-channel-preview-card__description">
-      {{this.channel.description}}
+      {{@channel.description}}
     </p>
   {{/if}}
   {{#if this.showJoinButton}}
     <ToggleChannelMembershipButton
-      @channel={{this.channel}}
+      @channel={{@channel}}
       @options={{hash joinClass="btn-primary"}}
     />
   {{/if}}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-preview-card.js b/plugins/chat/assets/javascripts/discourse/components/chat-channel-preview-card.js
index 954313febe9..151828045b2 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-preview-card.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-preview-card.js
@@ -1,19 +1,15 @@
-import Component from "@ember/component";
+import Component from "@glimmer/component";
 import { isEmpty } from "@ember/utils";
-import { computed } from "@ember/object";
-import { readOnly } from "@ember/object/computed";
 import { inject as service } from "@ember/service";
 
 export default class ChatChannelPreviewCard extends Component {
   @service chat;
-  tagName = "";
 
-  channel = null;
+  get showJoinButton() {
+    return this.args.channel?.isOpen && this.args.channel?.canJoin;
+  }
 
-  @readOnly("channel.isOpen") showJoinButton;
-
-  @computed("channel.description")
   get hasDescription() {
-    return !isEmpty(this.channel.description);
+    return !isEmpty(this.args.channel?.description);
   }
 }
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-row.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-row.hbs
index a6562b1b5b7..3d1e442ae8d 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-row.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-row.hbs
@@ -1,6 +1,6 @@
 <LinkTo
   @route="chat.channel"
-  @models={{array @channel.id (or @channel.slug "-")}}
+  @models={{@channel.routeModels}}
   class={{concat-class
     "chat-channel-row"
     (if @channel.focused "focused")
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-row.js b/plugins/chat/assets/javascripts/discourse/components/chat-channel-row.js
index 3fe267f6f63..efd003a89ab 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-row.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-row.js
@@ -19,7 +19,7 @@ export default class ChatChannelRow extends Component {
   }
 
   get channelHasUnread() {
-    return this.args.channel.currentUserMembership.unread_count > 0;
+    return this.args.channel.tracking.unreadCount > 0;
   }
 
   get #firstDirectMessageUser() {
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-selection-row.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-selection-row.hbs
deleted file mode 100644
index a344bb8056a..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-selection-row.hbs
+++ /dev/null
@@ -1,16 +0,0 @@
-<div
-  class={{this.rowClassNames}}
-  role="button"
-  tabindex="0"
-  {{on "click" this.handleClick}}
-  data-id={{this.model.id}}
->
-  {{#if this.model.user}}
-    {{avatar this.model imageSize="tiny"}}
-    <span class="username">
-      {{this.model.username}}
-    </span>
-  {{else}}
-    <ChatChannelTitle @channel={{this.model}} />
-  {{/if}}
-</div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-selection-row.js b/plugins/chat/assets/javascripts/discourse/components/chat-channel-selection-row.js
deleted file mode 100644
index 07d4e9b6c53..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-selection-row.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import Component from "@ember/component";
-import discourseComputed from "discourse-common/utils/decorators";
-import { action } from "@ember/object";
-
-export default Component.extend({
-  tagName: "",
-
-  @discourseComputed("model", "model.focused")
-  rowClassNames(model, focused) {
-    return `chat-channel-selection-row ${focused ? "focused" : ""} ${
-      this.model.user ? "user-row" : "channel-row"
-    }`;
-  },
-
-  @action
-  handleClick(event) {
-    if (this.onClick) {
-      this.onClick(this.model);
-      event.preventDefault();
-    }
-  },
-});
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-selector-modal-inner.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-selector-modal-inner.hbs
deleted file mode 100644
index 0eb18b0b4b2..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-selector-modal-inner.hbs
+++ /dev/null
@@ -1,32 +0,0 @@
-<DModalBody @title="chat.channel_selector.title">
-  <div id="chat-channel-selector-modal-inner">
-    <div class="chat-channel-selector-input-container">
-      <span class="search-icon">
-        {{d-icon "search"}}
-      </span>
-
-      <Input
-        id="chat-channel-selector-input"
-        @type="text"
-        @value={{this.filter}}
-        autocomplete="off"
-        {{on "input" (action "search" value="target.value")}}
-      />
-    </div>
-
-    <div class="channels">
-      <ConditionalLoadingSpinner @condition={{this.loading}}>
-        {{#each this.channels as |channel|}}
-          <ChatChannelSelectionRow
-            @model={{channel}}
-            @onClick={{this.switchChannel}}
-          />
-        {{else}}
-          <div class="no-channels-notice">
-            {{i18n "chat.channel_selector.no_channels"}}
-          </div>
-        {{/each}}
-      </ConditionalLoadingSpinner>
-    </div>
-  </div>
-</DModalBody>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-selector-modal-inner.js b/plugins/chat/assets/javascripts/discourse/components/chat-channel-selector-modal-inner.js
deleted file mode 100644
index 81ff741afe5..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-selector-modal-inner.js
+++ /dev/null
@@ -1,231 +0,0 @@
-import Component from "@ember/component";
-import { action } from "@ember/object";
-import ChatChannel from "discourse/plugins/chat/discourse/models/chat-channel";
-import { ajax } from "discourse/lib/ajax";
-import { bind } from "discourse-common/utils/decorators";
-import { schedule } from "@ember/runloop";
-import { inject as service } from "@ember/service";
-import { popupAjaxError } from "discourse/lib/ajax-error";
-import discourseDebounce from "discourse-common/lib/debounce";
-import { INPUT_DELAY } from "discourse-common/config/environment";
-import { isPresent } from "@ember/utils";
-
-export default Component.extend({
-  chat: service(),
-  tagName: "",
-  filter: "",
-  channels: null,
-  searchIndex: 0,
-  loading: false,
-  chatChannelsManager: service(),
-
-  didInsertElement() {
-    this._super(...arguments);
-
-    this.appEvents.on("chat-channel-selector-modal:close", this.close);
-    document.addEventListener("keyup", this.onKeyUp);
-    document
-      .getElementById("chat-channel-selector-modal-inner")
-      ?.addEventListener("mouseover", this.mouseover);
-    document.getElementById("chat-channel-selector-input")?.focus();
-
-    this.getInitialChannels();
-  },
-
-  willDestroyElement() {
-    this._super(...arguments);
-
-    this.appEvents.off("chat-channel-selector-modal:close", this.close);
-    document.removeEventListener("keyup", this.onKeyUp);
-    document
-      .getElementById("chat-channel-selector-modal-inner")
-      ?.removeEventListener("mouseover", this.mouseover);
-  },
-
-  @bind
-  mouseover(e) {
-    if (e.target.classList.contains("chat-channel-selection-row")) {
-      let channel;
-      const id = parseInt(e.target.dataset.id, 10);
-      if (e.target.classList.contains("channel-row")) {
-        channel = this.channels.findBy("id", id);
-      } else {
-        channel = this.channels.find((c) => c.user && c.id === id);
-      }
-      channel?.set("focused", true);
-      this.channels.forEach((c) => {
-        if (c !== channel) {
-          c.set("focused", false);
-        }
-      });
-    }
-  },
-
-  @bind
-  onKeyUp(e) {
-    if (e.key === "Enter") {
-      let focusedChannel = this.channels.find((c) => c.focused);
-      this.switchChannel(focusedChannel);
-      e.preventDefault();
-    } else if (e.key === "ArrowDown") {
-      this.arrowNavigateChannels("down");
-      e.preventDefault();
-    } else if (e.key === "ArrowUp") {
-      this.arrowNavigateChannels("up");
-      e.preventDefault();
-    }
-  },
-
-  arrowNavigateChannels(direction) {
-    const indexOfFocused = this.channels.findIndex((c) => c.focused);
-    if (indexOfFocused > -1) {
-      const nextIndex = direction === "down" ? 1 : -1;
-      const nextChannel = this.channels[indexOfFocused + nextIndex];
-      if (nextChannel) {
-        this.channels[indexOfFocused].set("focused", false);
-        nextChannel.set("focused", true);
-      }
-    } else {
-      this.channels[0].set("focused", true);
-    }
-
-    schedule("afterRender", () => {
-      let focusedChannel = document.querySelector(
-        "#chat-channel-selector-modal-inner .chat-channel-selection-row.focused"
-      );
-      focusedChannel?.scrollIntoView({ block: "nearest", inline: "start" });
-    });
-  },
-
-  @action
-  switchChannel(channel) {
-    if (channel.user) {
-      return this.fetchOrCreateChannelForUser(channel).then((response) => {
-        const newChannel = this.chatChannelsManager.store(response.channel);
-        return this.chatChannelsManager.follow(newChannel).then((c) => {
-          this.chat.openChannel(c);
-          this.close();
-        });
-      });
-    } else {
-      return this.chatChannelsManager.follow(channel).then((c) => {
-        this.chat.openChannel(c);
-        this.close();
-      });
-    }
-  },
-
-  @action
-  search(value) {
-    if (isPresent(value?.trim())) {
-      discourseDebounce(
-        this,
-        this.fetchChannelsFromServer,
-        value?.trim(),
-        INPUT_DELAY
-      );
-    } else {
-      discourseDebounce(this, this.getInitialChannels, INPUT_DELAY);
-    }
-  },
-
-  @action
-  fetchChannelsFromServer(filter) {
-    if (this.isDestroyed || this.isDestroying) {
-      return;
-    }
-
-    this.setProperties({
-      loading: true,
-      searchIndex: this.searchIndex + 1,
-    });
-    const thisSearchIndex = this.searchIndex;
-    ajax("/chat/api/chatables", { data: { filter } })
-      .then((searchModel) => {
-        if (this.searchIndex === thisSearchIndex) {
-          this.set("searchModel", searchModel);
-          const channels = searchModel.public_channels.concat(
-            searchModel.direct_message_channels,
-            searchModel.users
-          );
-          channels.forEach((c) => {
-            if (c.username) {
-              c.user = true; // This is used by the `chat-channel-selection-row` component
-            }
-          });
-          this.setProperties({
-            channels: channels.map((channel) => {
-              return channel.user
-                ? ChatChannel.create(channel)
-                : this.chatChannelsManager.store(channel);
-            }),
-            loading: false,
-          });
-          this.focusFirstChannel(this.channels);
-        }
-      })
-      .catch(popupAjaxError);
-  },
-
-  @action
-  getInitialChannels() {
-    if (this.isDestroyed || this.isDestroying) {
-      return;
-    }
-
-    const channels = this.getChannelsWithFilter(this.filter);
-    this.set("channels", channels);
-    this.focusFirstChannel(channels);
-  },
-
-  @action
-  fetchOrCreateChannelForUser(user) {
-    return ajax("/chat/direct_messages/create.json", {
-      method: "POST",
-      data: { usernames: [user.username] },
-    }).catch(popupAjaxError);
-  },
-
-  focusFirstChannel(channels) {
-    channels.forEach((c) => c.set("focused", false));
-    channels[0]?.set("focused", true);
-  },
-
-  getChannelsWithFilter(filter, opts = { excludeActiveChannel: true }) {
-    let sortedChannels = this.chatChannelsManager.channels.sort((a, b) => {
-      return new Date(a.last_message_sent_at) > new Date(b.last_message_sent_at)
-        ? -1
-        : 1;
-    });
-
-    const trimmedFilter = filter.trim();
-    const lowerCasedFilter = filter.toLowerCase();
-
-    return sortedChannels.filter((channel) => {
-      if (
-        opts.excludeActiveChannel &&
-        this.chat.activeChannel?.id === channel.id
-      ) {
-        return false;
-      }
-      if (!trimmedFilter.length) {
-        return true;
-      }
-
-      if (channel.isDirectMessageChannel) {
-        let userFound = false;
-        channel.chatable.users.forEach((user) => {
-          if (
-            user.username.toLowerCase().includes(lowerCasedFilter) ||
-            user.name?.toLowerCase().includes(lowerCasedFilter)
-          ) {
-            return (userFound = true);
-          }
-        });
-        return userFound;
-      } else {
-        return channel.title.toLowerCase().includes(lowerCasedFilter);
-      }
-    });
-  },
-});
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-settings-view.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-settings-view.hbs
index a632114f2dd..e295144af33 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-settings-view.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-settings-view.hbs
@@ -1,58 +1,62 @@
 <div class="chat-form__section">
-  <div class="chat-form__field">
+  <div class="chat-form__field -mute">
     <label class="chat-form__label">
       <span>{{i18n "chat.settings.mute"}}</span>
       <ChatChannelSettingsSavedIndicator
-        @property={{this.channel.currentUserMembership.muted}}
+        @property={{@channel.currentUserMembership.muted}}
       />
     </label>
     <div class="chat-form__control">
       <ComboBox
         @content={{this.mutedOptions}}
-        @value={{this.channel.currentUserMembership.muted}}
+        @value={{@channel.currentUserMembership.muted}}
         @valueProperty="value"
-        @class="channel-settings-view__muted-selector"
-        @onChange={{action (fn this.saveNotificationSettings "muted")}}
+        @class="channel-settings-view__selector"
+        @onChange={{fn this.saveNotificationSettings "muted" "muted"}}
       />
     </div>
   </div>
 
-  {{#unless this.channel.currentUserMembership.muted}}
-    <div class="chat-form__field">
+  {{#unless @channel.currentUserMembership.muted}}
+    <div class="chat-form__field -desktop-notification-level">
       <label class="chat-form__label">
         <span>{{i18n "chat.settings.desktop_notification_level"}}</span>
         <ChatChannelSettingsSavedIndicator
-          @property={{this.channel.currentUserMembership.desktop_notification_level}}
+          @property={{@channel.currentUserMembership.desktopNotificationLevel}}
         />
       </label>
       <div class="chat-form__control">
         <ComboBox
           @content={{this.notificationLevels}}
-          @value={{this.channel.currentUserMembership.desktop_notification_level}}
+          @value={{@channel.currentUserMembership.desktopNotificationLevel}}
           @valueProperty="value"
-          @class="channel-settings-view__desktop-notification-level-selector"
-          @onChange={{action
-            (fn this.saveNotificationSettings "desktop_notification_level")
+          @class="channel-settings-view__selector"
+          @onChange={{fn
+            this.saveNotificationSettings
+            "desktopNotificationLevel"
+            "desktop_notification_level"
           }}
         />
       </div>
     </div>
 
-    <div class="chat-form__field">
+    <div class="chat-form__field -mobile-notification-level">
       <label class="chat-form__label">
         <span>{{i18n "chat.settings.mobile_notification_level"}}</span>
         <ChatChannelSettingsSavedIndicator
-          @property={{this.channel.currentUserMembership.mobile_notification_level}}
+          @property={{@channel.currentUserMembership.mobileNotificationLevel}}
         />
       </label>
       <div class="chat-form__control">
         <ComboBox
           @content={{this.notificationLevels}}
-          @value={{this.channel.currentUserMembership.mobile_notification_level}}
+          @value={{@channel.currentUserMembership.mobileNotificationLevel}}
           @valueProperty="value"
-          @class="channel-settings-view__mobile-notification-level-selector"
-          @onChange={{action
-            (fn this.saveNotificationSettings "mobile_notification_level")
+          @class="channel-settings-view__selector"
+          @onChange={{fn
+            this.saveNotificationSettings
+            "mobileNotificationLevel"
+            "mobile_notification_level"
           }}
         />
       </div>
@@ -60,10 +64,7 @@
   {{/unless}}
   <div class="chat-retention-info">
     {{d-icon "info-circle"}}
-    {{i18n
-      "chat.settings.retention_info"
-      days=this.siteSettings.chat_channel_retention_days
-    }}
+    <ChatRetentionReminderText @channel={{@channel}} />
   </div>
 </div>
 
@@ -71,28 +72,29 @@
   <h3 class="chat-form__section-admin-title">
     {{i18n "chat.settings.admin_title"}}
   </h3>
+
   {{#if this.autoJoinAvailable}}
-    <div class="chat-form__section">
+    <div class="chat-form__section -autojoin">
       <div class="chat-form__field">
         <label class="chat-form__label">
           <span>{{i18n "chat.settings.auto_join_users_label"}}</span>
           <ChatChannelSettingsSavedIndicator
-            @property={{this.channel.auto_join_users}}
+            @property={{@channel.autoJoinUsers}}
           />
         </label>
         <ComboBox
           @content={{this.autoAddUsersOptions}}
-          @value={{this.channel.auto_join_users}}
+          @value={{@channel.autoJoinUsers}}
           @valueProperty="value"
-          @class="channel-settings-view__auto-join-selector"
+          @class="channel-settings-view__selector"
           @onChange={{action
-            (fn this.onToggleAutoJoinUsers this.channel.auto_join_users)
+            (fn this.onToggleAutoJoinUsers @channel.autoJoinUsers)
           }}
         />
-        <p class="chat-form__description -autojoin">
+        <p class="chat-form__description">
           {{i18n
             "chat.settings.auto_join_users_info"
-            category=this.channel.chatable.name
+            category=@channel.chatable.name
           }}
         </p>
       </div>
@@ -100,36 +102,60 @@
   {{/if}}
 
   {{#if this.togglingChannelWideMentionsAvailable}}
-    <div class="chat-form__section">
+    <div class="chat-form__section -channel-wide-mentions">
       <div class="chat-form__field">
         <label class="chat-form__label">
           <span>{{i18n "chat.settings.channel_wide_mentions_label"}}</span>
           <ChatChannelSettingsSavedIndicator
-            @property={{this.channel.allow_channel_wide_mentions}}
+            @property={{@channel.allowChannelWideMentions}}
           />
         </label>
         <ComboBox
           @content={{this.channelWideMentionsOptions}}
-          @value={{this.channel.allow_channel_wide_mentions}}
+          @value={{@channel.allowChannelWideMentions}}
           @valueProperty="value"
-          @class="channel-settings-view__channel-wide-mentions-selector"
+          @class="channel-settings-view__selector"
           @onChange={{this.onToggleChannelWideMentions}}
         />
-        <p class="chat-form__description -channel-wide-mentions">
+        <p class="chat-form__description">
           {{i18n
             "chat.settings.channel_wide_mentions_description"
-            channel=this.channel.title
+            channel=@channel.title
           }}
         </p>
       </div>
     </div>
   {{/if}}
+
+  <div class="chat-form__section -threading">
+    <div class="chat-form__field">
+      <label class="chat-form__label">
+        <span>{{i18n "chat.settings.channel_threading_label"}}</span>
+        <span class="channel-settings-view__channel-threading-tooltip">
+          {{d-icon "info-circle"}}
+          <DTooltip>
+            {{i18n "chat.settings.channel_threading_description"}}
+          </DTooltip>
+        </span>
+        <ChatChannelSettingsSavedIndicator
+          @property={{@channel.threadingEnabled}}
+        />
+      </label>
+      <ComboBox
+        @content={{this.threadingEnabledOptions}}
+        @value={{@channel.threadingEnabled}}
+        @valueProperty="value"
+        @class="channel-settings-view__selector"
+        @onChange={{this.onToggleThreadingEnabled}}
+      />
+    </div>
+  </div>
 {{/if}}
 
-{{#unless this.channel.isDirectMessageChannel}}
+{{#unless @channel.isDirectMessageChannel}}
   <div class="chat-form__section">
     {{#if (chat-guardian "can-edit-chat-channel")}}
-      {{#if (chat-guardian "can-archive-channel" this.channel)}}
+      {{#if (chat-guardian "can-archive-channel" @channel)}}
         <div class="chat-form__field">
           <DButton
             @action={{action "onArchiveChannel"}}
@@ -140,7 +166,7 @@
         </div>
       {{/if}}
 
-      {{#if this.channel.isClosed}}
+      {{#if @channel.isClosed}}
         <div class="chat-form__field">
           <DButton
             @action={{action "onToggleChannelState"}}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-settings-view.js b/plugins/chat/assets/javascripts/discourse/components/chat-channel-settings-view.js
index 5367f4af96e..a5c980d5ed1 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-settings-view.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-settings-view.js
@@ -1,10 +1,10 @@
-import Component from "@ember/component";
-import { action, computed } from "@ember/object";
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
 import { inject as service } from "@ember/service";
-import showModal from "discourse/lib/show-modal";
 import I18n from "I18n";
-import { Promise } from "rsvp";
-import { reads } from "@ember/object/computed";
+import ChatModalArchiveChannel from "discourse/plugins/chat/discourse/components/chat/modal/archive-channel";
+import ChatModalDeleteChannel from "discourse/plugins/chat/discourse/components/chat/modal/delete-channel";
+import ChatModalToggleChannelStatus from "discourse/plugins/chat/discourse/components/chat/modal/toggle-channel-status";
 
 const NOTIFICATION_LEVELS = [
   { name: I18n.t("chat.notification_levels.never"), value: "never" },
@@ -22,6 +22,11 @@ const AUTO_ADD_USERS_OPTIONS = [
   { name: I18n.t("no_value"), value: false },
 ];
 
+const THREADING_ENABLED_OPTIONS = [
+  { name: I18n.t("chat.settings.threading_enabled"), value: true },
+  { name: I18n.t("chat.settings.threading_disabled"), value: false },
+];
+
 const CHANNEL_WIDE_MENTIONS_OPTIONS = [
   { name: I18n.t("yes_value"), value: true },
   {
@@ -34,13 +39,15 @@ export default class ChatChannelSettingsView extends Component {
   @service chat;
   @service chatApi;
   @service chatGuardian;
+  @service currentUser;
+  @service siteSettings;
   @service router;
   @service dialog;
-  tagName = "";
-  channel = null;
+  @service modal;
 
   notificationLevels = NOTIFICATION_LEVELS;
   mutedOptions = MUTED_OPTIONS;
+  threadingEnabledOptions = THREADING_ENABLED_OPTIONS;
   autoAddUsersOptions = AUTO_ADD_USERS_OPTIONS;
   channelWideMentionsOptions = CHANNEL_WIDE_MENTIONS_OPTIONS;
   isSavingNotificationSetting = false;
@@ -48,17 +55,17 @@ export default class ChatChannelSettingsView extends Component {
   savedMobileNotificationLevel = false;
   savedMuted = false;
 
-  @reads("channel.isCategoryChannel") togglingChannelWideMentionsAvailable;
+  get togglingChannelWideMentionsAvailable() {
+    return this.args.channel.isCategoryChannel;
+  }
 
-  @computed("channel.isCategoryChannel")
   get autoJoinAvailable() {
     return (
       this.siteSettings.max_chat_auto_joined_users > 0 &&
-      this.channel.isCategoryChannel
+      this.args.channel.isCategoryChannel
     );
   }
 
-  @computed("autoJoinAvailable", "togglingChannelWideMentionsAvailable")
   get adminSectionAvailable() {
     return (
       this.chatGuardian.canEditChatChannel() &&
@@ -66,69 +73,55 @@ export default class ChatChannelSettingsView extends Component {
     );
   }
 
-  @computed(
-    "siteSettings.chat_allow_archiving_channels",
-    "channel.{isArchived,isReadOnly}"
-  )
   get canArchiveChannel() {
     return (
       this.siteSettings.chat_allow_archiving_channels &&
-      !this.channel.isArchived &&
-      !this.channel.isReadOnly
+      !this.args.channel.isArchived &&
+      !this.args.channel.isReadOnly
     );
   }
 
   @action
-  saveNotificationSettings(key, value) {
-    if (this.channel[key] === value) {
+  saveNotificationSettings(frontendKey, backendKey, newValue) {
+    if (this.args.channel.currentUserMembership[frontendKey] === newValue) {
       return;
     }
 
     const settings = {};
-    settings[key] = value;
+    settings[backendKey] = newValue;
     return this.chatApi
-      .updateCurrentUserChatChannelNotificationsSettings(
-        this.channel.id,
+      .updateCurrentUserChannelNotificationsSettings(
+        this.args.channel.id,
         settings
       )
       .then((result) => {
-        [
-          "muted",
-          "desktop_notification_level",
-          "mobile_notification_level",
-        ].forEach((property) => {
-          if (
-            result.membership[property] !==
-            this.channel.currentUserMembership[property]
-          ) {
-            this.channel.currentUserMembership[property] =
-              result.membership[property];
-          }
-        });
+        this.args.channel.currentUserMembership[frontendKey] =
+          result.membership[backendKey];
       });
   }
 
   @action
   onArchiveChannel() {
-    const controller = showModal("chat-channel-archive-modal");
-    controller.set("chatChannel", this.channel);
+    return this.modal.show(ChatModalArchiveChannel, {
+      model: { channel: this.args.channel },
+    });
   }
 
   @action
   onDeleteChannel() {
-    const controller = showModal("chat-channel-delete-modal");
-    controller.set("chatChannel", this.channel);
+    return this.modal.show(ChatModalDeleteChannel, {
+      model: { channel: this.args.channel },
+    });
   }
 
   @action
   onToggleChannelState() {
-    const controller = showModal("chat-channel-toggle");
-    controller.set("chatChannel", this.channel);
+    this.modal.show(ChatModalToggleChannelStatus, { model: this.args.channel });
   }
 
   @action
   onToggleAutoJoinUsers() {
-    if (!this.channel.auto_join_users) {
+    if (!this.args.channel.autoJoinUsers) {
       this.onEnableAutoJoinUsers();
     } else {
       this.onDisableAutoJoinUsers();
@@ -136,44 +129,75 @@ export default class ChatChannelSettingsView extends Component {
   }
 
   @action
-  onToggleChannelWideMentions() {
+  onToggleThreadingEnabled(value) {
     return this._updateChannelProperty(
-      this.channel,
+      this.args.channel,
+      "threading_enabled",
+      value
+    ).then((result) => {
+      this.args.channel.threadingEnabled = result.channel.threading_enabled;
+    });
+  }
+
+  @action
+  onToggleChannelWideMentions() {
+    const newValue = !this.args.channel.allowChannelWideMentions;
+    if (this.args.channel.allowChannelWideMentions === newValue) {
+      return;
+    }
+
+    return this._updateChannelProperty(
+      this.args.channel,
       "allow_channel_wide_mentions",
-      !this.channel.allow_channel_wide_mentions
-    );
+      newValue
+    ).then((result) => {
+      this.args.channel.allowChannelWideMentions =
+        result.channel.allow_channel_wide_mentions;
+    });
   }
 
   onDisableAutoJoinUsers() {
-    return this._updateChannelProperty(this.channel, "auto_join_users", false);
+    if (this.args.channel.autoJoinUsers === false) {
+      return;
+    }
+
+    return this._updateChannelProperty(
+      this.args.channel,
+      "auto_join_users",
+      false
+    ).then((result) => {
+      this.args.channel.autoJoinUsers = result.channel.auto_join_users;
+    });
   }
 
   onEnableAutoJoinUsers() {
+    if (this.args.channel.autoJoinUsers === true) {
+      return;
+    }
+
     this.dialog.confirm({
       message: I18n.t("chat.settings.auto_join_users_warning", {
-        category: this.channel.chatable.name,
+        category: this.args.channel.chatable.name,
       }),
       didConfirm: () =>
-        this._updateChannelProperty(this.channel, "auto_join_users", true),
+        this._updateChannelProperty(
+          this.args.channel,
+          "auto_join_users",
+          true
+        ).then((result) => {
+          this.args.channel.autoJoinUsers = result.channel.auto_join_users;
+        }),
     });
   }
 
   _updateChannelProperty(channel, property, value) {
-    if (channel[property] === value) {
-      return Promise.resolve();
-    }
-
     const payload = {};
     payload[property] = value;
-    return this.chatApi
-      .updateChannel(channel.id, payload)
-      .then((result) => {
-        channel.set(property, result.channel[property]);
-      })
-      .catch((event) => {
-        if (event.jqXHR?.responseJSON?.errors) {
-          this.flash(event.jqXHR.responseJSON.errors.join("\n"), "error");
-        }
-      });
+
+    return this.chatApi.updateChannel(channel.id, payload).catch((event) => {
+      if (event.jqXHR?.responseJSON?.errors) {
+        this.flash(event.jqXHR.responseJSON.errors.join("\n"), "error");
+      }
+    });
   }
 }
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-status.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-status.hbs
index 5bfb42db968..fd17ea850fd 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-status.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-status.hbs
@@ -1,8 +1,7 @@
-{{#if this.channelStatusMessage}}
+{{#if this.shouldRender}}
   <div class="chat-channel-status">
     {{d-icon this.channelStatusIcon}}
     <span>{{this.channelStatusMessage}}</span>
-
-    <ChatChannelArchiveStatus @channel={{this.channel}} />
+    <ChatChannelArchiveStatus @channel={{@channel}} />
   </div>
-{{/if}}
+{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-status.js b/plugins/chat/assets/javascripts/discourse/components/chat-channel-status.js
index f6048b21b9d..83f2b957961 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-status.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-status.js
@@ -1,57 +1,63 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import I18n from "I18n";
-import Component from "@ember/component";
+import Component from "@glimmer/component";
 import {
   CHANNEL_STATUSES,
   channelStatusIcon,
-  channelStatusName,
 } from "discourse/plugins/chat/discourse/models/chat-channel";
 
-export default Component.extend({
-  tagName: "",
-  channel: null,
-  format: null,
+export default class ChatChannelStatus extends Component {
+  LONG_FORMAT = "long";
+  SHORT_FORMAT = "short";
+  VALID_FORMATS = [this.SHORT_FORMAT, this.LONG_FORMAT];
 
-  init() {
-    this._super(...arguments);
-    if (!["short", "long"].includes(this.format)) {
-      this.set("format", "long");
-    }
-  },
+  get format() {
+    return this.VALID_FORMATS.includes(this.args.format)
+      ? this.args.format
+      : this.LONG_FORMAT;
+  }
 
-  @discourseComputed("channel.status")
-  channelStatusMessage(channelStatus) {
-    if (channelStatus === CHANNEL_STATUSES.open) {
-      return null;
-    }
+  get shouldRender() {
+    return (
+      this.channelStatusIcon &&
+      this.args.channel.status !== CHANNEL_STATUSES.open
+    );
+  }
 
-    if (this.format === "long") {
-      return this._longStatusMessage(channelStatus);
+  get channelStatusMessage() {
+    if (this.format === this.LONG_FORMAT) {
+      return this.#longStatusMessage(this.args.channel.status);
     } else {
-      return this._shortStatusMessage(channelStatus);
+      return this.#shortStatusMessage(this.args.channel.status);
     }
-  },
+  }
 
-  @discourseComputed("channel.status")
-  channelStatusIcon(channelStatus) {
-    return channelStatusIcon(channelStatus);
-  },
+  get channelStatusIcon() {
+    return channelStatusIcon(this.args.channel.status);
+  }
 
-  _shortStatusMessage(channelStatus) {
-    return channelStatusName(channelStatus);
-  },
-
-  _longStatusMessage(channelStatus) {
-    switch (channelStatus) {
+  #shortStatusMessage(status) {
+    switch (status) {
+      case CHANNEL_STATUSES.archived:
+        return I18n.t("chat.channel_status.archived");
       case CHANNEL_STATUSES.closed:
-        return I18n.t("chat.channel_status.closed_header");
-        break;
+        return I18n.t("chat.channel_status.closed");
+      case CHANNEL_STATUSES.open:
+        return I18n.t("chat.channel_status.open");
       case CHANNEL_STATUSES.readOnly:
-        return I18n.t("chat.channel_status.read_only_header");
-        break;
+        return I18n.t("chat.channel_status.read_only");
+    }
+  }
+
+  #longStatusMessage(status) {
+    switch (status) {
       case CHANNEL_STATUSES.archived:
         return I18n.t("chat.channel_status.archived_header");
-        break;
+      case CHANNEL_STATUSES.closed:
+        return I18n.t("chat.channel_status.closed_header");
+      case CHANNEL_STATUSES.open:
+        return I18n.t("chat.channel_status.open_header");
+      case CHANNEL_STATUSES.readOnly:
+        return I18n.t("chat.channel_status.read_only_header");
     }
-  },
-});
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-title.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-title.hbs
index e5178c47cef..0c097c46af8 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-title.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-title.hbs
@@ -1,70 +1,67 @@
-{{#if this.channel.isDraft}}
-  <div class="chat-channel-title is-draft">
-    <span class="chat-channel-title__name">{{this.channel.title}}</span>
-    {{#if (has-block)}}
-      {{yield}}
-    {{/if}}
-  </div>
-{{else}}
-  {{#if this.channel.isDirectMessageChannel}}
-    <div class="chat-channel-title is-dm">
-
+{{#if @channel.isDirectMessageChannel}}
+  <div class="chat-channel-title is-dm">
+    {{#if @channel.chatable.users.length}}
       <div class="chat-channel-title__avatar">
         {{#if this.multiDm}}
           <span class="chat-channel-title__users-count">
-            {{this.channel.chatable.users.length}}
+            {{@channel.chatable.users.length}}
           </span>
         {{else}}
-          <ChatUserAvatar @user={{this.channel.chatable.users.firstObject}} />
+          <Chat::UserAvatar @user={{@channel.chatable.users.firstObject}} />
         {{/if}}
       </div>
+    {{/if}}
 
-      <div class="chat-channel-title__user-info">
-        <div class="chat-channel-title__usernames">
+    <div class="chat-channel-title__user-info">
+      <div class="chat-channel-title__usernames">
+        {{#if @channel.chatable.users.length}}
           {{#if this.multiDm}}
             <span class="chat-channel-title__name">{{this.usernames}}</span>
           {{else}}
-            {{#let this.channel.chatable.users.firstObject as |user|}}
+            {{#let @channel.chatable.users.firstObject as |user|}}
               <span class="chat-channel-title__name">{{user.username}}</span>
               {{#if this.showUserStatus}}
                 <UserStatusMessage
-                  @status={{this.channel.chatable.users.firstObject.status}}
+                  @class="chat-channel-title__user-status-message"
+                  @status={{@channel.chatable.users.firstObject.status}}
                   @showDescription={{if this.site.mobileView "true"}}
                 />
               {{/if}}
               <PluginOutlet
                 @name="after-chat-channel-username"
-                @args={{hash user=user}}
+                @outletArgs={{hash user=user}}
                 @tagName=""
                 @connectorTagName=""
               />
             {{/let}}
           {{/if}}
-        </div>
-      </div>
-
-      {{#if (has-block)}}
-        {{yield}}
-      {{/if}}
-    </div>
-  {{else if this.channel.isCategoryChannel}}
-    <div class="chat-channel-title is-category">
-      <span
-        class="chat-channel-title__category-badge"
-        style={{this.channelColorStyle}}
-      >
-        {{d-icon "hashtag"}}
-        {{#if this.channel.chatable.read_restricted}}
-          {{d-icon "lock" class="chat-channel-title__restricted-category-icon"}}
+        {{else}}
+          <span class="chat-channel-title__name">Add users</span>
         {{/if}}
-      </span>
-      <span class="chat-channel-title__name">
-        {{replace-emoji this.channel.escapedTitle}}
-      </span>
-
-      {{#if (has-block)}}
-        {{yield}}
-      {{/if}}
+      </div>
     </div>
-  {{/if}}
+
+    {{#if (has-block)}}
+      {{yield}}
+    {{/if}}
+  </div>
+{{else if @channel.isCategoryChannel}}
+  <div class="chat-channel-title is-category">
+    <span
+      class="chat-channel-title__category-badge"
+      style={{this.channelColorStyle}}
+    >
+      {{d-icon "d-chat"}}
+      {{#if @channel.chatable.read_restricted}}
+        {{d-icon "lock" class="chat-channel-title__restricted-category-icon"}}
+      {{/if}}
+    </span>
+    <span class="chat-channel-title__name">
+      {{replace-emoji @channel.title}}
+    </span>
+
+    {{#if (has-block)}}
+      {{yield}}
+    {{/if}}
+  </div>
 {{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-title.js b/plugins/chat/assets/javascripts/discourse/components/chat-channel-title.js
index 6bb9dba438a..3fd41b2b9ac 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-title.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-title.js
@@ -1,33 +1,24 @@
-import Component from "@ember/component";
+import Component from "@glimmer/component";
 import { htmlSafe } from "@ember/template";
-import { computed } from "@ember/object";
-import { gt, reads } from "@ember/object/computed";
 
 export default class ChatChannelTitle extends Component {
-  tagName = "";
-  channel = null;
+  get users() {
+    return this.args.channel.chatable.users;
+  }
 
-  @reads("channel.chatable.users.[]") users;
-  @gt("users.length", 1) multiDm;
+  get multiDm() {
+    return this.users.length > 1;
+  }
 
-  @computed("users")
   get usernames() {
     return this.users.mapBy("username").join(", ");
   }
 
-  @computed("channel.chatable.color")
   get channelColorStyle() {
-    return htmlSafe(`color: #${this.channel.chatable.color}`);
+    return htmlSafe(`color: #${this.args.channel.chatable.color}`);
   }
 
-  @computed(
-    "channel.chatable.users.length",
-    "channel.chatable.users.@each.status"
-  )
   get showUserStatus() {
-    return !!(
-      this.channel.chatable.users.length === 1 &&
-      this.channel.chatable.users[0].status
-    );
+    return !!(this.users.length === 1 && this.users[0].status);
   }
 }
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-toggle-view.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-toggle-view.hbs
deleted file mode 100644
index 237017a1864..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-toggle-view.hbs
+++ /dev/null
@@ -1,14 +0,0 @@
-<DModalBody @title={{this.modalTitle}}>
-  <div id="chat-channel-toggle" class="chat-channel-toggle">
-    <p>{{this.instructions}}</p>
-  </div>
-</DModalBody>
-
-<div class="modal-footer">
-  <DButton
-    @class="btn-primary"
-    @action={{action "changeChannelStatus"}}
-    @label={{this.buttonLabel}}
-    @id="chat-channel-toggle-btn"
-  />
-</div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-unread-indicator.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-unread-indicator.hbs
index e459ff02215..b9a7506b474 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-unread-indicator.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-unread-indicator.hbs
@@ -1,16 +1,12 @@
-{{#if (gt @channel.currentUserMembership.unread_count 0)}}
+{{#if this.showUnreadIndicator}}
   <div
     class={{concat-class
       "chat-channel-unread-indicator"
-      (if
-        (or
-          @channel.isDirectMessageChannel
-          (gt @channel.currentUserMembership.unread_mentions 0)
-        )
-        "urgent"
-      )
+      (if this.isUrgent "-urgent")
     }}
   >
-    <div class="number">{{@channel.currentUserMembership.unread_count}}</div>
+    <div class="chat-channel-unread-indicator__number">{{#if
+        this.showUnreadCount
+      }}{{this.unreadCount}}{{else}}&nbsp;{{/if}}</div>
   </div>
 {{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-unread-indicator.js b/plugins/chat/assets/javascripts/discourse/components/chat-channel-unread-indicator.js
new file mode 100644
index 00000000000..ef8f0d9c31b
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-unread-indicator.js
@@ -0,0 +1,32 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+
+export default class ChatChannelUnreadIndicator extends Component {
+  @service chat;
+  @service site;
+
+  get showUnreadIndicator() {
+    return (
+      this.args.channel.tracking.unreadCount > 0 ||
+      // We want to do this so we don't show a blue dot if the user is inside
+      // the channel and a new unread thread comes in.
+      (this.chat.activeChannel?.id !== this.args.channel.id &&
+        this.args.channel.unreadThreadsCountSinceLastViewed > 0)
+    );
+  }
+
+  get unreadCount() {
+    return this.args.channel.tracking.unreadCount;
+  }
+
+  get isUrgent() {
+    return (
+      this.args.channel.isDirectMessageChannel ||
+      this.args.channel.tracking.mentionCount > 0
+    );
+  }
+
+  get showUnreadCount() {
+    return this.args.channel.isDirectMessageChannel || this.isUrgent;
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-channel.hbs
new file mode 100644
index 00000000000..26a9dba1225
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel.hbs
@@ -0,0 +1,88 @@
+<div
+  class={{concat-class
+    "chat-channel"
+    (if this.messagesLoader.loading "loading")
+    (if this.pane.sending "chat-channel--sending")
+    (unless this.messagesLoader.fetchedOnce "chat-channel--not-loaded-once")
+  }}
+  {{did-insert this.setUploadDropZone}}
+  {{did-insert this.setupListeners}}
+  {{will-destroy this.teardownListeners}}
+  {{did-update this.loadMessages @targetMessageId}}
+  {{did-insert this.didUpdateChannel}}
+  {{did-update this.didUpdateChannel @channel.id}}
+  {{did-insert this.addAutoFocusEventListener}}
+  {{will-destroy this.removeAutoFocusEventListener}}
+  data-id={{@channel.id}}
+>
+  <ChatFullPageHeader
+    @channel={{@channel}}
+    @onCloseFullScreen={{this.onCloseFullScreen}}
+    @displayed={{this.includeHeader}}
+  />
+
+  <Chat::Notices @channel={{@channel}} />
+
+  <ChatMentionWarnings />
+
+  <div
+    class="chat-messages-scroll chat-messages-container popper-viewport"
+    {{did-insert this.setScrollable}}
+    {{chat/scrollable-list
+      (hash onScroll=this.onScroll onScrollEnd=this.onScrollEnd reverse=true)
+    }}
+  >
+    <div
+      class="chat-messages-container"
+      {{chat/on-resize this.didResizePane (hash delay=100 immediate=true)}}
+    >
+      {{#each this.messagesManager.messages key="id" as |message|}}
+        <ChatMessage
+          @message={{message}}
+          @disableMouseEvents={{this.isScrolling}}
+          @resendStagedMessage={{this.resendStagedMessage}}
+          @fetchMessagesByDate={{this.fetchMessagesByDate}}
+          @context="channel"
+        />
+      {{else}}
+        {{#unless this.messagesLoader.fetchedOnce}}
+          <ChatSkeleton />
+        {{/unless}}
+      {{/each}}
+    </div>
+
+    {{! at bottom even if shown at top due to column-reverse  }}
+    {{#if this.messagesLoader.loadedPast}}
+      <div class="all-loaded-message">
+        {{i18n "chat.all_loaded"}}
+      </div>
+    {{/if}}
+  </div>
+
+  <Chat::ScrollToBottomArrow
+    @onScrollToBottom={{this.scrollToLatestMessage}}
+    @isVisible={{this.needsArrow}}
+  />
+
+  {{#if this.pane.selectingMessages}}
+    <Chat::SelectionManager
+      @enableMove={{and
+        (not @channel.isDirectMessageChannel)
+        @channel.canModerate
+      }}
+      @pane={{this.pane}}
+    />
+  {{else}}
+    {{#if (and (not @channel.isFollowing) @channel.isCategoryChannel)}}
+      <ChatChannelPreviewCard @channel={{@channel}} />
+    {{else}}
+      <Chat::Composer::Channel
+        @channel={{@channel}}
+        @uploadDropZone={{this.uploadDropZone}}
+        @onSendMessage={{this.onSendMessage}}
+      />
+    {{/if}}
+  {{/if}}
+
+  <ChatUploadDropZone @model={{@channel}} />
+</div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel.js b/plugins/chat/assets/javascripts/discourse/components/chat-channel.js
new file mode 100644
index 00000000000..8aeb71f6f87
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel.js
@@ -0,0 +1,764 @@
+import ChatMessage from "discourse/plugins/chat/discourse/models/chat-message";
+import Component from "@glimmer/component";
+import { bind } from "discourse-common/utils/decorators";
+import { action } from "@ember/object";
+// TODO (martin) Remove this when the handleSentMessage logic inside chatChannelPaneSubscriptionsManager
+// is moved over from this file completely.
+import { handleStagedMessage } from "discourse/plugins/chat/discourse/services/chat-pane-base-subscriptions-manager";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { cancel, next, schedule } from "@ember/runloop";
+import { inject as service } from "@ember/service";
+import { resetIdle } from "discourse/lib/desktop-notifications";
+import {
+  onPresenceChange,
+  removeOnPresenceChange,
+} from "discourse/lib/user-presence";
+import { bodyScrollFix } from "discourse/plugins/chat/discourse/lib/chat-ios-hacks";
+import {
+  scrollListToBottom,
+  scrollListToMessage,
+} from "discourse/plugins/chat/discourse/lib/scroll-helpers";
+import {
+  checkMessageBottomVisibility,
+  checkMessageTopVisibility,
+} from "discourse/plugins/chat/discourse/lib/check-message-visibility";
+import ChatMessagesLoader from "discourse/plugins/chat/discourse/lib/chat-messages-loader";
+import { cached, tracked } from "@glimmer/tracking";
+import discourseDebounce from "discourse-common/lib/debounce";
+import DiscourseURL from "discourse/lib/url";
+import { getOwner } from "discourse-common/lib/get-owner";
+import {
+  FUTURE,
+  PAST,
+  READ_INTERVAL_MS,
+} from "discourse/plugins/chat/discourse/lib/chat-constants";
+import { stackingContextFix } from "../lib/chat-ios-hacks";
+
+export default class ChatChannel extends Component {
+  @service appEvents;
+  @service capabilities;
+  @service chat;
+  @service chatApi;
+  @service chatChannelsManager;
+  @service chatChannelPaneSubscriptionsManager;
+  @service chatComposerPresenceManager;
+  @service chatDraftsManager;
+  @service chatEmojiPickerManager;
+  @service chatStateManager;
+  @service("chat-channel-composer") composer;
+  @service("chat-channel-pane") pane;
+  @service currentUser;
+  @service messageBus;
+  @service router;
+  @service site;
+
+  @tracked sending = false;
+  @tracked showChatQuoteSuccess = false;
+  @tracked includeHeader = true;
+  @tracked needsArrow = false;
+  @tracked atBottom = false;
+  @tracked uploadDropZone;
+  @tracked isScrolling = false;
+
+  scrollable = null;
+  _loadedChannelId = null;
+  _mentionWarningsSeen = {};
+  _unreachableGroupMentions = [];
+  _overMembersLimitGroupMentions = [];
+
+  @cached
+  get messagesLoader() {
+    return new ChatMessagesLoader(getOwner(this), this.args.channel);
+  }
+
+  get messagesManager() {
+    return this.args.channel.messagesManager;
+  }
+
+  get currentUserMembership() {
+    return this.args.channel.currentUserMembership;
+  }
+
+  @action
+  setUploadDropZone(element) {
+    this.uploadDropZone = element;
+  }
+
+  @action
+  setScrollable(element) {
+    this.scrollable = element;
+  }
+
+  @action
+  setupListeners() {
+    onPresenceChange({ callback: this.onPresenceChangeCallback });
+  }
+
+  @action
+  teardownListeners() {
+    this.#cancelHandlers();
+    removeOnPresenceChange(this.onPresenceChangeCallback);
+    this.unsubscribeToUpdates(this._loadedChannelId);
+  }
+
+  @action
+  didResizePane() {
+    this.debounceFillPaneAttempt();
+    this.computeDatesSeparators();
+  }
+
+  @action
+  didUpdateChannel() {
+    this.#cancelHandlers();
+
+    if (!this.args.channel) {
+      return;
+    }
+
+    this.messagesManager.clear();
+
+    if (
+      this.args.channel.isDirectMessageChannel &&
+      !this.args.channel.isFollowing
+    ) {
+      this.chatChannelsManager.follow(this.args.channel);
+    }
+
+    if (this._loadedChannelId !== this.args.channel.id) {
+      this.unsubscribeToUpdates(this._loadedChannelId);
+      this.pane.selectingMessages = false;
+      this._loadedChannelId = this.args.channel.id;
+    }
+
+    const existingDraft = this.chatDraftsManager.get({
+      channelId: this.args.channel.id,
+    });
+    if (existingDraft) {
+      this.composer.message = existingDraft;
+    } else {
+      this.resetComposerMessage();
+    }
+
+    this.composer.focus();
+    this.loadMessages();
+
+    // We update this value server-side when we load the Channel
+    // here, so this reflects reality for sidebar unread logic.
+    this.args.channel.updateLastViewedAt();
+  }
+
+  @action
+  loadMessages() {
+    if (!this.args.channel?.id) {
+      return;
+    }
+
+    this.subscribeToUpdates(this.args.channel);
+
+    if (this.args.targetMessageId) {
+      this.debounceHighlightOrFetchMessage(this.args.targetMessageId);
+    } else {
+      this.fetchMessages({ fetch_from_last_read: true });
+    }
+  }
+
+  @bind
+  onPresenceChangeCallback(present) {
+    if (present) {
+      this.debouncedUpdateLastReadMessage();
+    }
+  }
+
+  async fetchMessages(findArgs = {}) {
+    if (this.messagesLoader.loading) {
+      return;
+    }
+
+    this.messagesManager.clear();
+
+    const result = await this.messagesLoader.load(findArgs);
+    this.messagesManager.messages = this.processMessages(
+      this.args.channel,
+      result
+    );
+
+    if (findArgs.target_message_id) {
+      this.scrollToMessageId(findArgs.target_message_id, { highlight: true });
+    } else if (findArgs.fetch_from_last_read) {
+      const lastReadMessageId = this.currentUserMembership?.lastReadMessageId;
+      this.scrollToMessageId(lastReadMessageId);
+    } else if (findArgs.target_date) {
+      this.scrollToMessageId(result.meta.target_message_id, {
+        highlight: true,
+        position: "center",
+      });
+    } else {
+      this._ignoreNextScroll = true;
+      this.scrollToBottom();
+    }
+
+    this.debounceFillPaneAttempt();
+    this.debouncedUpdateLastReadMessage();
+  }
+
+  async fetchMoreMessages({ direction }, opts = {}) {
+    if (this.messagesLoader.loading) {
+      return;
+    }
+
+    const result = await this.messagesLoader.loadMore({ direction });
+    if (!result) {
+      return;
+    }
+
+    const messages = this.processMessages(this.args.channel, result);
+    if (!messages.length) {
+      return;
+    }
+
+    const targetMessageId = this.messagesManager.messages.lastObject.id;
+    stackingContextFix(this.scrollable, () => {
+      this.messagesManager.addMessages(messages);
+    });
+
+    if (direction === FUTURE && !opts.noScroll) {
+      this.scrollToMessageId(targetMessageId, {
+        position: "end",
+        forceAuto: true,
+      });
+    }
+
+    this.debounceFillPaneAttempt();
+  }
+
+  @action
+  scrollToBottom() {
+    this._ignoreNextScroll = true;
+    scrollListToBottom(this.scrollable);
+  }
+
+  scrollToMessageId(messageId, options = {}) {
+    this._ignoreNextScroll = true;
+    const message = this.messagesManager.findMessage(messageId);
+    scrollListToMessage(this.scrollable, message, options);
+  }
+
+  debounceFillPaneAttempt() {
+    this._debouncedFillPaneAttemptHandler = discourseDebounce(
+      this,
+      this.fillPaneAttempt,
+      500
+    );
+  }
+
+  @bind
+  fetchMessagesByDate(date) {
+    if (this.messagesLoader.loading) {
+      return;
+    }
+
+    const message = this.messagesManager.findFirstMessageOfDay(new Date(date));
+    if (message.firstOfResults && this.messagesLoader.canLoadMorePast) {
+      this.fetchMessages({ target_date: date, direction: FUTURE });
+    } else {
+      this.highlightOrFetchMessage(message.id, { position: "center" });
+    }
+  }
+
+  async fillPaneAttempt() {
+    if (!this.messagesLoader.fetchedOnce) {
+      return;
+    }
+
+    // safeguard
+    if (this.messagesManager.messages.length > 200) {
+      return;
+    }
+
+    if (!this.messagesLoader.canLoadMorePast) {
+      return;
+    }
+
+    schedule("afterRender", () => {
+      const firstMessageId = this.messagesManager.messages.firstObject?.id;
+      const messageContainer = this.scrollable.querySelector(
+        `.chat-message-container[data-id="${firstMessageId}"]`
+      );
+      if (
+        messageContainer &&
+        checkMessageTopVisibility(this.scrollable, messageContainer)
+      ) {
+        this.fetchMoreMessages({ direction: PAST });
+      }
+    });
+  }
+
+  @bind
+  processMessages(channel, result) {
+    const messages = [];
+    let foundFirstNew = false;
+    const hasNewest = this.messagesManager.messages.some((m) => m.newest);
+
+    result.messages.forEach((messageData, index) => {
+      messageData.firstOfResults = index === 0;
+
+      if (this.currentUser.ignored_users) {
+        // If a message has been hidden it is because the current user is ignoring
+        // the user who sent it, so we want to unconditionally hide it, even if
+        // we are going directly to the target
+        messageData.hidden = this.currentUser.ignored_users.includes(
+          messageData.user.username
+        );
+      }
+
+      if (this.requestedTargetMessageId === messageData.id) {
+        messageData.expanded = !messageData.hidden;
+      } else {
+        messageData.expanded = !(messageData.hidden || messageData.deleted_at);
+      }
+
+      // newest has to be in after fetch callback as we don't want to make it
+      // dynamic or it will make the pane jump around, it will disappear on reload
+      if (
+        !hasNewest &&
+        !foundFirstNew &&
+        messageData.id > this.currentUserMembership?.lastReadMessageId
+      ) {
+        foundFirstNew = true;
+        messageData.newest = true;
+      }
+
+      const message = ChatMessage.create(channel, messageData);
+      message.manager = channel.messagesManager;
+
+      if (message.thread) {
+        this.#preloadThreadTrackingState(
+          message.thread,
+          result.tracking.thread_tracking
+        );
+      }
+
+      messages.push(message);
+    });
+
+    return messages;
+  }
+
+  debounceHighlightOrFetchMessage(messageId, options = {}) {
+    this._debouncedHighlightOrFetchMessageHandler = discourseDebounce(
+      this,
+      this.highlightOrFetchMessage,
+      messageId,
+      options,
+      100
+    );
+  }
+
+  highlightOrFetchMessage(messageId, options = {}) {
+    const message = this.messagesManager.findMessage(messageId);
+    if (message) {
+      this.scrollToMessageId(
+        message.id,
+        Object.assign(
+          {
+            highlight: true,
+            position: "start",
+            autoExpand: true,
+            behavior: this.capabilities.isIOS ? "smooth" : null,
+          },
+          options
+        )
+      );
+    } else {
+      this.fetchMessages({ target_message_id: messageId });
+    }
+  }
+
+  debouncedUpdateLastReadMessage() {
+    this._debouncedUpdateLastReadMessageHandler = discourseDebounce(
+      this,
+      this.updateLastReadMessage,
+      READ_INTERVAL_MS
+    );
+  }
+
+  updateLastReadMessage() {
+    if (!this.args.channel.isFollowing) {
+      return;
+    }
+
+    schedule("afterRender", () => {
+      let lastFullyVisibleMessageNode = null;
+
+      this.scrollable
+        .querySelectorAll(".chat-message-container")
+        .forEach((item) => {
+          if (checkMessageBottomVisibility(this.scrollable, item)) {
+            lastFullyVisibleMessageNode = item;
+          }
+        });
+
+      if (!lastFullyVisibleMessageNode) {
+        return;
+      }
+
+      let lastUnreadVisibleMessage = this.messagesManager.findMessage(
+        lastFullyVisibleMessageNode.dataset.id
+      );
+
+      if (!lastUnreadVisibleMessage) {
+        return;
+      }
+
+      const lastReadId =
+        this.args.channel.currentUserMembership?.lastReadMessageId;
+      // we don't return early if === as we want to ensure different tabs will do the check
+      if (lastReadId > lastUnreadVisibleMessage.id) {
+        return;
+      }
+
+      return this.chatApi.markChannelAsRead(
+        this.args.channel.id,
+        lastUnreadVisibleMessage.id
+      );
+    });
+  }
+
+  @action
+  scrollToLatestMessage() {
+    if (this.messagesLoader.canLoadMoreFuture) {
+      this.fetchMessages();
+    } else if (this.messagesManager.messages.length > 0) {
+      this.scrollToBottom(this.scrollable);
+    }
+  }
+
+  @action
+  onScroll(state) {
+    bodyScrollFix();
+
+    next(() => {
+      if (this.#flushIgnoreNextScroll()) {
+        return;
+      }
+
+      this.needsArrow =
+        (this.messagesLoader.fetchedOnce &&
+          this.messagesLoader.canLoadMoreFuture) ||
+        (state.distanceToBottom.pixels > 250 && !state.atBottom);
+      this.isScrolling = true;
+      this.debouncedUpdateLastReadMessage();
+
+      if (
+        state.atTop ||
+        (!this.capabilities.isIOS &&
+          state.up &&
+          state.distanceToTop.percentage < 40)
+      ) {
+        this.fetchMoreMessages({ direction: PAST });
+      } else if (state.atBottom) {
+        this.fetchMoreMessages({ direction: FUTURE });
+      }
+    });
+  }
+
+  @action
+  onScrollEnd(state) {
+    resetIdle();
+    this.needsArrow =
+      (this.messagesLoader.fetchedOnce &&
+        this.messagesLoader.canLoadMoreFuture) ||
+      (state.distanceToBottom.pixels > 250 && !state.atBottom);
+    this.isScrolling = false;
+    this.atBottom = state.atBottom;
+
+    if (state.atBottom) {
+      this.fetchMoreMessages({ direction: FUTURE });
+    }
+  }
+
+  @bind
+  onMessage(data) {
+    switch (data.type) {
+      case "sent":
+        this.handleSentMessage(data);
+        break;
+    }
+  }
+
+  handleSentMessage(data) {
+    if (data.chat_message.user.id === this.currentUser.id && data.staged_id) {
+      const stagedMessage = handleStagedMessage(
+        this.args.channel,
+        this.messagesManager,
+        data
+      );
+      if (stagedMessage) {
+        return;
+      }
+    }
+
+    const message = ChatMessage.create(this.args.channel, data.chat_message);
+    message.manager = this.args.channel.messagesManager;
+    stackingContextFix(this.scrollable, () => {
+      this.messagesManager.addMessages([message]);
+    });
+    this.debouncedUpdateLastReadMessage();
+    this.args.channel.lastMessage = message;
+  }
+
+  @action
+  async onSendMessage(message) {
+    await message.cook();
+    if (message.editing) {
+      await this.#sendEditMessage(message);
+    } else {
+      await this.#sendNewMessage(message);
+    }
+  }
+
+  @action
+  resetComposerMessage() {
+    this.composer.reset(this.args.channel);
+  }
+
+  async #sendEditMessage(message) {
+    this.pane.sending = true;
+
+    const data = {
+      new_message: message.message,
+      upload_ids: message.uploads.map((upload) => upload.id),
+    };
+
+    this.resetComposerMessage();
+
+    try {
+      stackingContextFix(this.scrollable, async () => {
+        await this.chatApi.editMessage(this.args.channel.id, message.id, data);
+      });
+    } catch (e) {
+      popupAjaxError(e);
+    } finally {
+      this.chatDraftsManager.remove({ channelId: this.args.channel.id });
+      this.pane.sending = false;
+    }
+  }
+
+  async #sendNewMessage(message) {
+    this.pane.sending = true;
+
+    resetIdle();
+
+    stackingContextFix(this.scrollable, async () => {
+      await this.args.channel.stageMessage(message);
+    });
+
+    message.manager = this.args.channel.messagesManager;
+    this.resetComposerMessage();
+
+    if (!this.capabilities.isIOS && !this.messagesLoader.canLoadMoreFuture) {
+      this.scrollToLatestMessage();
+    }
+
+    try {
+      await this.chatApi.sendMessage(this.args.channel.id, {
+        message: message.message,
+        in_reply_to_id: message.inReplyTo?.id,
+        staged_id: message.id,
+        upload_ids: message.uploads.map((upload) => upload.id),
+      });
+
+      if (!this.capabilities.isIOS) {
+        this.scrollToLatestMessage();
+      }
+    } catch (error) {
+      this._onSendError(message.id, error);
+    } finally {
+      this.chatDraftsManager.remove({ channelId: this.args.channel.id });
+      this.pane.sending = false;
+    }
+  }
+
+  _onSendError(id, error) {
+    const stagedMessage =
+      this.args.channel.messagesManager.findStagedMessage(id);
+    if (stagedMessage) {
+      if (error.jqXHR?.responseJSON?.errors?.length) {
+        // only network errors are retryable
+        stagedMessage.message = "";
+        stagedMessage.cooked = "";
+        stagedMessage.error = error.jqXHR.responseJSON.errors[0];
+      } else {
+        this.chat.markNetworkAsUnreliable();
+        stagedMessage.error = "network_error";
+      }
+    }
+
+    this.resetComposerMessage();
+  }
+
+  @action
+  resendStagedMessage(stagedMessage) {
+    this.pane.sending = true;
+
+    stagedMessage.error = null;
+
+    const data = {
+      cooked: stagedMessage.cooked,
+      message: stagedMessage.message,
+      upload_ids: stagedMessage.uploads.map((upload) => upload.id),
+      staged_id: stagedMessage.id,
+    };
+
+    this.chatApi
+      .sendMessage(this.args.channel.id, data)
+      .catch((error) => {
+        this._onSendError(data.staged_id, error);
+      })
+      .then(() => {
+        this.chat.markNetworkAsReliable();
+      })
+      .finally(() => {
+        this.pane.sending = false;
+      });
+  }
+
+  @action
+  onCloseFullScreen() {
+    this.chatStateManager.prefersDrawer();
+
+    DiscourseURL.routeTo(this.chatStateManager.lastKnownAppURL).then(() => {
+      DiscourseURL.routeTo(this.chatStateManager.lastKnownChatURL);
+    });
+  }
+
+  unsubscribeToUpdates(channelId) {
+    if (!channelId) {
+      return;
+    }
+
+    this.chatChannelPaneSubscriptionsManager.unsubscribe();
+    this.messageBus.unsubscribe(`/chat/${channelId}`, this.onMessage);
+  }
+
+  subscribeToUpdates(channel) {
+    if (!channel) {
+      return;
+    }
+
+    this.unsubscribeToUpdates(channel.id);
+    this.messageBus.subscribe(
+      `/chat/${channel.id}`,
+      this.onMessage,
+      channel.channelMessageBusLastId
+    );
+    this.chatChannelPaneSubscriptionsManager.subscribe(channel);
+  }
+
+  @action
+  addAutoFocusEventListener() {
+    document.addEventListener("keydown", this._autoFocus);
+  }
+
+  @action
+  removeAutoFocusEventListener() {
+    document.removeEventListener("keydown", this._autoFocus);
+  }
+
+  @bind
+  _autoFocus(event) {
+    if (this.chatStateManager.isDrawerActive) {
+      return;
+    }
+
+    const { key, metaKey, ctrlKey, code, target } = event;
+
+    if (
+      !key ||
+      // Handles things like Enter, Tab, Shift
+      key.length > 1 ||
+      // Don't need to focus if the user is beginning a shortcut.
+      metaKey ||
+      ctrlKey ||
+      // Space's key comes through as ' ' so it's not covered by key
+      code === "Space" ||
+      // ? is used for the keyboard shortcut modal
+      key === "?"
+    ) {
+      return;
+    }
+
+    if (!target || /^(INPUT|TEXTAREA|SELECT)$/.test(target.tagName)) {
+      return;
+    }
+
+    event.preventDefault();
+    this.composer.focus({ addText: event.key });
+    return;
+  }
+
+  @bind
+  computeDatesSeparators() {
+    schedule("afterRender", () => {
+      const dates = [
+        ...this.scrollable.querySelectorAll(".chat-message-separator-date"),
+      ].reverse();
+      const height = this.scrollable.querySelector(
+        ".chat-messages-container"
+      ).clientHeight;
+
+      dates
+        .map((date, index) => {
+          const item = { bottom: 0, date };
+          const line = date.nextElementSibling;
+
+          if (index > 0) {
+            const prevDate = dates[index - 1];
+            const prevLine = prevDate.nextElementSibling;
+            item.bottom = height - prevLine.offsetTop;
+          }
+
+          if (dates.length === 1) {
+            item.height = height;
+          } else {
+            if (index === 0) {
+              item.height = height - line.offsetTop;
+            } else {
+              const prevDate = dates[index - 1];
+              const prevLine = prevDate.nextElementSibling;
+              item.height =
+                height - line.offsetTop - (height - prevLine.offsetTop);
+            }
+          }
+
+          return item;
+        })
+        // group all writes at the end
+        .forEach((item) => {
+          item.date.style.bottom = item.bottom + "px";
+          item.date.style.height = item.height + "px";
+        });
+    });
+  }
+
+  #cancelHandlers() {
+    cancel(this._debouncedHighlightOrFetchMessageHandler);
+    cancel(this._debouncedUpdateLastReadMessageHandler);
+    cancel(this._debouncedFillPaneAttemptHandler);
+  }
+
+  #preloadThreadTrackingState(thread, threadTracking) {
+    if (!threadTracking[thread.id]) {
+      return;
+    }
+
+    thread.tracking.unreadCount = threadTracking[thread.id].unread_count;
+    thread.tracking.mentionCount = threadTracking[thread.id].mention_count;
+  }
+
+  #flushIgnoreNextScroll() {
+    const prev = this._ignoreNextScroll;
+    this._ignoreNextScroll = false;
+    return prev;
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-composer-dropdown.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-composer-dropdown.hbs
index 2112b9e8b2e..9a9aabd7c71 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-composer-dropdown.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-composer-dropdown.hbs
@@ -1,26 +1,36 @@
-{{#if this.buttons.length}}
-  <DPopover
-    @class="chat-composer-dropdown"
-    @options={{hash arrow=null}}
-    as |state|
-  >
-    <FlatButton
-      @disabled={{this.isDisabled}}
-      @class="chat-composer-dropdown__trigger-btn d-popover-trigger"
-      @title="chat.composer.toggle_toolbar"
-      @icon={{if state.isExpanded "times" "plus"}}
-    />
-    <ul class="chat-composer-dropdown__list">
-      {{#each this.buttons as |button|}}
-        <li class="chat-composer-dropdown__item {{button.id}}">
+{{#if @buttons.length}}
+  <Chat::Composer::Button
+    {{on "click" this.toggleExpand}}
+    @icon="plus"
+    title={{i18n "chat.composer.toggle_toolbar"}}
+    disabled={{@isDisabled}}
+    {{did-insert this.setupTrigger}}
+    class={{concat-class
+      "chat-composer-dropdown__trigger-btn"
+      (if @hasActivePanel "has-active-panel")
+    }}
+    ...attributes
+  />
+
+  {{#if this.isExpanded}}
+    <ul
+      class="chat-composer-dropdown__list"
+      {{did-insert this.setupPanel}}
+      {{will-destroy this.teardownPanel}}
+    >
+      {{#each @buttons as |button|}}
+        <li class={{concat-class "chat-composer-dropdown__item" button.id}}>
           <DButton
-            @class={{concat "chat-composer-dropdown__action-btn " button.id}}
+            @class={{concat-class
+              "chat-composer-dropdown__action-btn"
+              button.id
+            }}
             @icon={{button.icon}}
-            @action={{button.action}}
+            @action={{fn this.onButtonClick button}}
             @label={{button.label}}
           />
         </li>
       {{/each}}
     </ul>
-  </DPopover>
+  {{/if}}
 {{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-composer-dropdown.js b/plugins/chat/assets/javascripts/discourse/components/chat-composer-dropdown.js
index 36dad78ae34..df826cb2ece 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-composer-dropdown.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-composer-dropdown.js
@@ -1,7 +1,63 @@
-import Component from "@ember/component";
+import Component from "@glimmer/component";
+import { iconHTML } from "discourse-common/lib/icon-library";
+import tippy from "tippy.js";
+import { action } from "@ember/object";
+import { hideOnEscapePlugin } from "discourse/lib/d-popover";
+import { tracked } from "@glimmer/tracking";
 
 export default class ChatComposerDropdown extends Component {
-  tagName = "";
-  buttons = null;
-  isDisabled = false;
+  @tracked isExpanded = false;
+
+  trigger = null;
+
+  @action
+  setupTrigger(element) {
+    this.trigger = element;
+  }
+
+  @action
+  toggleExpand() {
+    if (this.args.hasActivePanel) {
+      this.args.onCloseActivePanel?.();
+    } else {
+      this.isExpanded = !this.isExpanded;
+    }
+  }
+
+  @action
+  onButtonClick(button) {
+    this._tippyInstance.hide();
+    button.action();
+  }
+
+  @action
+  setupPanel(element) {
+    this._tippyInstance = tippy(this.trigger, {
+      theme: "chat-composer-dropdown",
+      trigger: "click",
+      zIndex: 1400,
+      arrow: iconHTML("tippy-rounded-arrow"),
+      interactive: true,
+      allowHTML: false,
+      appendTo: "parent",
+      hideOnClick: true,
+      plugins: [hideOnEscapePlugin],
+      content: element,
+      onShow: () => {
+        this.isExpanded = true;
+        return true;
+      },
+      onHide: () => {
+        this.isExpanded = false;
+        return true;
+      },
+    });
+
+    this._tippyInstance.show();
+  }
+
+  @action
+  teardownPanel() {
+    this._tippyInstance?.destroy();
+  }
 }
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-composer-inline-buttons.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-composer-inline-buttons.hbs
deleted file mode 100644
index 380d5eef66e..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/chat-composer-inline-buttons.hbs
+++ /dev/null
@@ -1,7 +0,0 @@
-{{#each this.buttons as |button|}}
-  <DButton
-    @icon={{button.icon}}
-    @class={{concat "chat-composer-inline-button " button.id}}
-    @action={{action button.action}}
-  />
-{{/each}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-composer-inline-buttons.js b/plugins/chat/assets/javascripts/discourse/components/chat-composer-inline-buttons.js
deleted file mode 100644
index 88361c29398..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/chat-composer-inline-buttons.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import Component from "@ember/component";
-
-export default class ChatComposerInlineButtons extends Component {
-  tagName = "";
-}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-composer-message-details.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-composer-message-details.hbs
index fcc65c8c996..5b5a10eedc7 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-composer-message-details.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-composer-message-details.hbs
@@ -1,16 +1,20 @@
-<div class="chat-composer-message-details">
+<div
+  class="chat-composer-message-details"
+  data-id={{@message.id}}
+  data-action={{if @message.editing "edit" "reply"}}
+>
   <div class="chat-reply">
-    {{d-icon this.icon}}
-    <ChatUserAvatar @user={{this.message.user}} />
-    <span class="chat-reply__username">{{this.message.user.username}}</span>
-    <span class="chat-reply__excerpt">{{replace-emoji
-        this.message.excerpt
-      }}</span>
+    {{d-icon (if @message.editing "pencil-alt" "reply")}}
+    <Chat::UserAvatar @user={{@message.user}} />
+    <span class="chat-reply__username">{{@message.user.username}}</span>
+    <span class="chat-reply__excerpt">
+      {{replace-emoji (html-safe @message.excerpt)}}
+    </span>
   </div>
 
-  <FlatButton
-    @action={{this.action}}
-    @class="cancel-message-action"
+  <DButton
+    @action={{@cancelAction}}
+    @class="btn-flat cancel-message-action"
     @icon="times-circle"
     @title="cancel"
   />
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-composer-message-details.js b/plugins/chat/assets/javascripts/discourse/components/chat-composer-message-details.js
index 44494409ab5..dc169dc4936 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-composer-message-details.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-composer-message-details.js
@@ -1,5 +1,3 @@
-import Component from "@ember/component";
+import Component from "@glimmer/component";
 
-export default Component.extend({
-  tagName: "",
-});
+export default class ChatComposerMessageDetails extends Component {}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-composer-upload.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-composer-upload.hbs
index bf1f84e5c6e..b5bbfb7130b 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-composer-upload.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-composer-upload.hbs
@@ -1,44 +1,57 @@
-<span class="chat-composer-upload">
-  <span class="preview">
-    {{#if (eq this.type this.IMAGE_TYPE)}}
-      {{#if this.isDone}}
-        <img class="preview-img" src={{this.upload.short_path}} />
-      {{else}}
-        {{d-icon "far-image"}}
-      {{/if}}
-    {{else}}
-      {{d-icon "file-alt"}}
-    {{/if}}
-  </span>
-
-  <span class="data">
-    <div class="top-data">
-      <span class="file-name">{{this.fileName}}</span>
-      <DButton
-        @class="btn-flat remove-upload"
-        @action={{this.onCancel}}
-        @icon="times"
-        @title="chat.remove_upload"
-      />
-    </div>
-
-    <div class="bottom-data">
-      {{#if this.isDone}}
-        <span class="extension-pill">{{this.upload.extension}}</span>
-      {{else}}
-        {{#if this.upload.processing}}
-          <span class="processing">{{i18n "processing"}}</span>
+{{#if @upload}}
+  <div
+    class={{concat-class
+      "chat-composer-upload"
+      (if this.isImage "chat-composer-upload--image")
+      (unless @isDone "chat-composer-upload--in-progress")
+    }}
+  >
+    <div class="preview">
+      {{#if this.isImage}}
+        {{#if @isDone}}
+          <img class="preview-img" src={{@upload.short_path}} />
         {{else}}
-          <span class="uploading">{{i18n "uploading"}}</span>
+          {{d-icon "far-image"}}
         {{/if}}
-
-        <progress
-          class="upload-progress"
-          id="file"
-          max="100"
-          value={{this.upload.progress}}
-        ></progress>
+      {{else}}
+        {{d-icon "file-alt"}}
       {{/if}}
     </div>
-  </span>
-</span>
\ No newline at end of file
+
+    <span class="data">
+      {{#unless this.isImage}}
+        <div class="top-data">
+          <span class="file-name">{{this.fileName}}</span>
+        </div>
+      {{/unless}}
+
+      <div class="bottom-data">
+        {{#if @isDone}}
+          {{#unless this.isImage}}
+            <span class="extension-pill">{{@upload.extension}}</span>
+          {{/unless}}
+        {{else}}
+          {{#if @upload.processing}}
+            <span class="processing">{{i18n "processing"}}</span>
+          {{else}}
+            <span class="uploading">{{i18n "uploading"}}</span>
+          {{/if}}
+
+          <progress
+            class="upload-progress"
+            id="file"
+            max="100"
+            value={{@upload.progress}}
+          ></progress>
+        {{/if}}
+      </div>
+    </span>
+
+    <DButton
+      @class="btn-flat chat-composer-upload__remove-btn"
+      @action={{@onCancel}}
+      @icon="times"
+      @title="chat.remove_upload"
+    />
+  </div>
+{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-composer-upload.js b/plugins/chat/assets/javascripts/discourse/components/chat-composer-upload.js
index a2a89a2119c..ca2280cf67a 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-composer-upload.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-composer-upload.js
@@ -1,25 +1,16 @@
-import Component from "@ember/component";
-import discourseComputed from "discourse-common/utils/decorators";
+import Component from "@glimmer/component";
 import { isImage } from "discourse/lib/uploads";
 
-export default Component.extend({
-  IMAGE_TYPE: "image",
+export default class ChatComposerUpload extends Component {
+  get isImage() {
+    return isImage(
+      this.args.upload.original_filename || this.args.upload.fileName
+    );
+  }
 
-  tagName: "",
-  classNames: "chat-upload",
-  isDone: false,
-  upload: null,
-  onCancel: null,
-
-  @discourseComputed("upload.{original_filename,fileName}")
-  type(upload) {
-    if (isImage(upload.original_filename || upload.fileName)) {
-      return this.IMAGE_TYPE;
-    }
-  },
-
-  @discourseComputed("isDone", "upload.{original_filename,fileName}")
-  fileName(isDone, upload) {
-    return isDone ? upload.original_filename : upload.fileName;
-  },
-});
+  get fileName() {
+    return this.args.isDone
+      ? this.args.upload.original_filename
+      : this.args.upload.fileName;
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-composer-uploads.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-composer-uploads.hbs
index 8bb20bf6d23..2f07ecc996f 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-composer-uploads.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-composer-uploads.hbs
@@ -21,19 +21,4 @@
   @allowMultiple={{true}}
   @fileInputId={{this.fileUploadElementId}}
   @fileInputClass="hidden-upload-field"
-/>
-
-<div class="drop-a-file">
-  <div class="drop-a-file-content">
-    <div class="drop-a-file-content-images">
-      {{d-icon "file-audio"}}
-      {{d-icon "file-video"}}
-      {{d-icon "file-image"}}
-    </div>
-
-    <p class="drop-a-file-content-text">
-      {{d-icon "upload"}}
-      Drop a file to upload it.
-    </p>
-  </div>
-</div>
\ No newline at end of file
+/>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-composer-uploads.js b/plugins/chat/assets/javascripts/discourse/components/chat-composer-uploads.js
index 570619322dc..b762ef2aa76 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-composer-uploads.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-composer-uploads.js
@@ -5,6 +5,7 @@ import { inject as service } from "@ember/service";
 import UppyMediaOptimization from "discourse/lib/uppy-media-optimization-plugin";
 import discourseComputed, { bind } from "discourse-common/utils/decorators";
 import UppyUploadMixin from "discourse/mixins/uppy-upload";
+import { cloneJSON } from "discourse-common/lib/object";
 
 export default Component.extend(UppyUploadMixin, {
   classNames: ["chat-composer-uploads"],
@@ -12,27 +13,39 @@ export default Component.extend(UppyUploadMixin, {
   chatStateManager: service(),
   id: "chat-composer-uploader",
   type: "chat-composer",
+  existingUploads: null,
   uploads: null,
   useMultipartUploadsIfAvailable: true,
+  uploadDropZone: null,
 
   init() {
     this._super(...arguments);
     this.setProperties({
-      uploads: [],
       fileInputSelector: `#${this.fileUploadElementId}`,
     });
-    this.appEvents.on("chat-composer:load-uploads", this, "_loadUploads");
+  },
+
+  didReceiveAttrs() {
+    this._super(...arguments);
+    if (this.inProgressUploads?.length > 0) {
+      this._uppyInstance?.cancelAll();
+    }
+
+    this.set(
+      "uploads",
+      this.existingUploads ? cloneJSON(this.existingUploads) : []
+    );
   },
 
   didInsertElement() {
     this._super(...arguments);
-    this.composerInputEl = document.querySelector(".chat-composer-input");
+
     this.composerInputEl?.addEventListener("paste", this._pasteEventListener);
   },
 
   willDestroyElement() {
     this._super(...arguments);
-    this.appEvents.off("chat-composer:load-uploads", this, "_loadUploads");
+
     this.composerInputEl?.removeEventListener(
       "paste",
       this._pasteEventListener
@@ -41,7 +54,7 @@ export default Component.extend(UppyUploadMixin, {
 
   uploadDone(upload) {
     this.uploads.pushObject(upload);
-    this.onUploadChanged(this.uploads);
+    this._triggerUploadsChanged();
   },
 
   @discourseComputed("uploads.length", "inProgressUploads.length")
@@ -54,38 +67,21 @@ export default Component.extend(UppyUploadMixin, {
     this.appEvents.trigger(`upload-mixin:${this.id}:cancel-upload`, {
       fileId: upload.id,
     });
-    this.uploads.removeObject(upload);
-    this.onUploadChanged(this.uploads);
+    this.removeUpload(upload);
   },
 
   @action
   removeUpload(upload) {
     this.uploads.removeObject(upload);
-    this.onUploadChanged(this.uploads);
+    this._triggerUploadsChanged();
   },
 
   _uploadDropTargetOptions() {
-    let targetEl;
-    if (this.chatStateManager.isFullPageActive) {
-      targetEl = document.querySelector(".full-page-chat");
-    } else {
-      targetEl = document.querySelector(".chat-drawer.is-expanded");
-    }
-
-    if (!targetEl) {
-      return this._super();
-    }
-
     return {
-      target: targetEl,
+      target: this.uploadDropZone || document.body,
     };
   },
 
-  _loadUploads(uploads) {
-    this._uppyInstance?.cancelAll();
-    this.set("uploads", uploads);
-  },
-
   _uppyReady() {
     if (this.siteSettings.composer_media_optimization_image_enabled) {
       this._useUploadPlugin(UppyMediaOptimization, {
@@ -127,4 +123,16 @@ export default Component.extend(UppyUploadMixin, {
       this._addFiles([...event.clipboardData.files], { pasted: true });
     }
   },
+
+  onProgressUploadsChanged() {
+    this._triggerUploadsChanged(this.uploads, {
+      inProgressUploadsCount: this.inProgressUploads?.length,
+    });
+  },
+
+  _triggerUploadsChanged() {
+    this.onUploadChanged?.(this.uploads, {
+      inProgressUploadsCount: this.inProgressUploads?.length,
+    });
+  },
 });
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-composer.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-composer.hbs
index 52f67e2d124..9d12ae0bc5d 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-composer.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-composer.hbs
@@ -1,90 +1,129 @@
-{{#if this.replyToMsg}}
-  <ChatComposerMessageDetails
-    @message={{this.replyToMsg}}
-    @icon="reply"
-    @action={{action "cancelReplyTo"}}
-  />
-{{/if}}
+{{! template-lint-disable no-pointer-down-event-binding }}
+{{! template-lint-disable no-invalid-interactive }}
 
-{{#if this.editingMessage}}
-  <ChatComposerMessageDetails
-    @message={{this.editingMessage}}
-    @icon="pencil-alt"
-    @action={{action "cancelEditing"}}
-  />
-{{/if}}
-
-<div class="chat-composer-emoji-picker-anchor"></div>
-
-<div
-  role="region"
-  aria-label={{i18n "chat.aria_roles.composer"}}
-  class="chat-composer {{if this.disableComposer 'is-disabled'}}"
->
-  {{#if
-    (and
-      this.chatEmojiPickerManager.opened
-      (eq this.chatEmojiPickerManager.context "chat-composer")
-    )
-  }}
-    <DButton
-      @icon="times"
-      @action={{this.chatEmojiPickerManager.close}}
-      @class="chat-composer__close-emoji-picker-btn btn-flat"
+<div class="chat-composer__wrapper">
+  {{#if this.shouldRenderMessageDetails}}
+    <ChatComposerMessageDetails
+      @message={{if
+        this.currentMessage.editing
+        this.currentMessage
+        this.currentMessage.inReplyTo
+      }}
+      @cancelAction={{this.composer.cancel}}
     />
-  {{else}}
-    {{#unless this.disableComposer}}
-      <ChatComposerDropdown
-        @buttons={{this.dropdownButtons}}
-        @isDisabled={{this.disableComposer}}
-      />
-    {{/unless}}
   {{/if}}
 
-  <DTextarea
-    @value={{readonly this.value}}
-    @input={{action "onTextareaInput" value="target.value"}}
-    @type="text"
-    @class="chat-composer-input"
-    @disabled={{this.disableComposer}}
-    @autocorrect="on"
-    @autocapitalize="sentences"
-    @placeholder={{this.placeholder}}
-    @focus-in={{action "onTextareaFocusIn" value="target"}}
-    @rows={{1}}
-  />
+  <div
+    role="region"
+    aria-label={{i18n "chat.aria_roles.composer"}}
+    class={{concat-class
+      "chat-composer"
+      (if this.isFocused "is-focused")
+      (if this.pane.sending "is-sending")
+      (if this.sendEnabled "is-send-enabled" "is-send-disabled")
+      (if this.disabled "is-disabled" "is-enabled")
+      (if this.currentMessage.draftSaved "is-draft-saved" "is-draft-unsaved")
+    }}
+    {{did-update this.didUpdateMessage this.currentMessage}}
+    {{did-update this.didUpdateInReplyTo this.currentMessage.inReplyTo}}
+    {{did-insert this.setup}}
+    {{will-destroy this.teardown}}
+    {{will-destroy this.cancelPersistDraft}}
+  >
+    <div class="chat-composer__outer-container">
+      <div class="chat-composer__inner-container">
+        <ChatComposerDropdown
+          @buttons={{this.dropdownButtons}}
+          @isDisabled={{this.disabled}}
+          @hasActivePanel={{eq
+            this.chatEmojiPickerManager.picker.context
+            this.context
+          }}
+          @onCloseActivePanel={{this.chatEmojiPickerManager.close}}
+          {{on "focus" (fn this.computeIsFocused true)}}
+          {{on "blur" (fn this.computeIsFocused false)}}
+        />
 
-  {{#if this.isNetworkUnreliable}}
-    <span
-      class="chat-composer__unreliable-network"
-      title={{i18n "chat.unreliable_network"}}
-    >
-      {{d-icon "exclamation-circle"}}
-    </span>
-  {{/if}}
+        <div
+          class="chat-composer__input-container"
+          {{on "click" this.composer.focus}}
+        >
+          <DTextarea
+            id={{this.composerId}}
+            value={{readonly this.currentMessage.message}}
+            type="text"
+            class="chat-composer__input"
+            disabled={{this.disabled}}
+            autocorrect="on"
+            autocapitalize="sentences"
+            placeholder={{this.placeholder}}
+            rows={{1}}
+            {{did-insert this.setupTextareaInteractor}}
+            {{on "input" this.onInput}}
+            {{on "keydown" this.onKeyDown}}
+            {{on "focusin" this.onTextareaFocusIn}}
+            {{on "focusin" (fn this.computeIsFocused true)}}
+            {{on "focusout" (fn this.computeIsFocused false)}}
+            {{did-insert this.setupAutocomplete}}
+            data-chat-composer-context={{this.context}}
+          />
+        </div>
 
-  <FlatButton
-    @action={{action "sendClicked"}}
-    @icon="paper-plane"
-    @class="icon-only send-btn chat-composer-inline-button"
-    @title={{this.sendTitle}}
-    @disabled={{this.sendDisabled}}
-  />
+        {{#if this.inlineButtons.length}}
+          {{#each this.inlineButtons as |button|}}
+            <Chat::Composer::Button
+              @icon={{button.icon}}
+              class="-{{button.id}}"
+              disabled={{or this.disabled button.disabled}}
+              tabindex={{if button.disabled -1 0}}
+              {{on
+                "click"
+                (fn this.handleInlineButonAction button.action)
+                bubbles=false
+              }}
+              {{on "focus" (fn this.computeIsFocused true)}}
+              {{on "blur" (fn this.computeIsFocused false)}}
+            />
+          {{/each}}
 
-  {{#unless this.disableComposer}}
-    <ChatComposerInlineButtons @buttons={{this.inlineButtons}} />
-  {{/unless}}
-</div>
+          <Chat::Composer::Separator />
+        {{/if}}
 
-{{#if this.canAttachUploads}}
-  <ChatComposerUploads
-    @fileUploadElementId={{this.fileUploadElementId}}
-    @onUploadChanged={{action "uploadsChanged"}}
-  />
-{{/if}}
-
-{{#unless this.chatChannel.isDraft}}
-  <div class="chat-replying-indicator-container">
-    <ChatReplyingIndicator @chatChannel={{this.chatChannel}} />
+        <Chat::Composer::Button
+          @icon="paper-plane"
+          class="-send"
+          title={{i18n "chat.composer.send"}}
+          disabled={{or this.disabled (not this.sendEnabled)}}
+          tabindex={{if this.sendEnabled 0 -1}}
+          {{on "click" this.onSend}}
+          {{on "mousedown" this.trapMouseDown}}
+          {{on "focus" (fn this.computeIsFocused true)}}
+          {{on "blur" (fn this.computeIsFocused false)}}
+        />
+      </div>
+    </div>
   </div>
-{{/unless}}
\ No newline at end of file
+
+  {{#if this.canAttachUploads}}
+    <ChatComposerUploads
+      @fileUploadElementId={{this.fileUploadElementId}}
+      @onUploadChanged={{this.onUploadChanged}}
+      @existingUploads={{this.currentMessage.uploads}}
+      @uploadDropZone={{@uploadDropZone}}
+      @composerInputEl={{this.composer.textarea.element}}
+    />
+  {{/if}}
+
+  {{#if this.shouldRenderReplyingIndicator}}
+    <div class="chat-replying-indicator-container">
+      <ChatReplyingIndicator
+        @presenceChannelName={{this.presenceChannelName}}
+      />
+    </div>
+  {{/if}}
+
+  <ChatEmojiPicker
+    @context={{this.context}}
+    @didSelectEmoji={{this.onSelectEmoji}}
+  />
+</div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-composer.js b/plugins/chat/assets/javascripts/discourse/components/chat-composer.js
index 932ca8f84f3..2a22d869978 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-composer.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-composer.js
@@ -1,181 +1,309 @@
-import { isEmpty } from "@ember/utils";
-import Component from "@ember/component";
-import showModal from "discourse/lib/show-modal";
-import discourseComputed, {
-  afterRender,
-  bind,
-} from "discourse-common/utils/decorators";
-import I18n from "I18n";
-import TextareaTextManipulation from "discourse/mixins/textarea-text-manipulation";
-import userSearch from "discourse/lib/user-search";
+import Component from "@glimmer/component";
 import { action } from "@ember/object";
-import { cancel, next, schedule, throttle } from "@ember/runloop";
+import { inject as service } from "@ember/service";
+import { tracked } from "@glimmer/tracking";
+import { cancel, next } from "@ember/runloop";
 import { cloneJSON } from "discourse-common/lib/object";
+import { chatComposerButtons } from "discourse/plugins/chat/discourse/lib/chat-composer-buttons";
+import showModal from "discourse/lib/show-modal";
+import TextareaInteractor from "discourse/plugins/chat/discourse/lib/textarea-interactor";
+import { getOwner } from "discourse-common/lib/get-owner";
+import userSearch from "discourse/lib/user-search";
 import { findRawTemplate } from "discourse-common/lib/raw-templates";
 import { emojiSearch, isSkinTonableEmoji } from "pretty-text/emoji";
 import { emojiUrlFor } from "discourse/lib/text";
-import { inject as service } from "@ember/service";
-import { readOnly, reads } from "@ember/object/computed";
 import { SKIP } from "discourse/lib/autocomplete";
-import { Promise } from "rsvp";
+import I18n from "I18n";
 import { translations } from "pretty-text/emoji/data";
-import { channelStatusName } from "discourse/plugins/chat/discourse/models/chat-channel";
 import { setupHashtagAutocomplete } from "discourse/lib/hashtag-autocomplete";
-import discourseDebounce from "discourse-common/lib/debounce";
+import { isPresent } from "@ember/utils";
+import { Promise } from "rsvp";
+import User from "discourse/models/user";
+import ChatMessageInteractor from "discourse/plugins/chat/discourse/lib/chat-message-interactor";
 import {
-  chatComposerButtons,
-  chatComposerButtonsDependentKeys,
-} from "discourse/plugins/chat/discourse/lib/chat-composer-buttons";
-import { mentionRegex } from "pretty-text/mentions";
+  destroyTippyInstances,
+  initUserStatusHtml,
+  renderUserStatusHtml,
+} from "discourse/lib/user-status-on-autocomplete";
+import ChatModalChannelSummary from "discourse/plugins/chat/discourse/components/chat/modal/channel-summary";
 
-const THROTTLE_MS = 150;
-const MENTION_DEBOUNCE_MS = 1000;
+export default class ChatComposer extends Component {
+  @service capabilities;
+  @service site;
+  @service siteSettings;
+  @service chat;
+  @service chatComposerPresenceManager;
+  @service chatComposerWarningsTracker;
+  @service appEvents;
+  @service chatEmojiReactionStore;
+  @service chatEmojiPickerManager;
+  @service currentUser;
+  @service chatApi;
+  @service chatDraftsManager;
+  @service modal;
 
-export default Component.extend(TextareaTextManipulation, {
-  chatChannel: null,
-  lastChatChannelId: null,
-  chat: service(),
-  classNames: ["chat-composer-container"],
-  classNameBindings: ["emojiPickerVisible:with-emoji-picker"],
-  userSilenced: readOnly("details.user_silenced"),
-  chatEmojiReactionStore: service("chat-emoji-reaction-store"),
-  chatEmojiPickerManager: service("chat-emoji-picker-manager"),
-  chatStateManager: service("chat-state-manager"),
-  editingMessage: null,
-  onValueChange: null,
-  timer: null,
-  mentionsTimer: null,
-  value: "",
-  inProgressUploads: null,
-  composerEventPrefix: "chat",
-  composerFocusSelector: ".chat-composer-input",
-  canAttachUploads: reads("siteSettings.chat_allow_uploads"),
-  isNetworkUnreliable: reads("chat.isNetworkUnreliable"),
-  typingMention: false,
+  @tracked isFocused = false;
+  @tracked inProgressUploadsCount = 0;
+  @tracked presenceChannelName;
 
-  @discourseComputed(...chatComposerButtonsDependentKeys())
-  inlineButtons() {
-    return chatComposerButtons(this, "inline");
-  },
-
-  @discourseComputed(...chatComposerButtonsDependentKeys())
-  dropdownButtons() {
-    return chatComposerButtons(this, "dropdown");
-  },
-
-  @discourseComputed("chatEmojiPickerManager.{opened,context}")
-  emojiPickerVisible(picker) {
-    return picker.opened && picker.context === "chat-composer";
-  },
-
-  @discourseComputed("chatStateManager.isFullPageActive")
-  fileUploadElementId(fullPage) {
-    return fullPage ? "chat-full-page-uploader" : "chat-widget-uploader";
-  },
-
-  init() {
-    this._super(...arguments);
-
-    this.appEvents.on("chat-composer:reply-to-set", this, "_replyToMsgChanged");
-    this.appEvents.on(
-      "upload-mixin:chat-composer-uploader:in-progress-uploads",
-      this,
-      "_inProgressUploadsChanged"
+  get shouldRenderMessageDetails() {
+    return (
+      this.currentMessage?.editing ||
+      (this.context === "channel" && this.currentMessage?.inReplyTo)
     );
+  }
 
-    this.setProperties({
-      inProgressUploads: [],
-      _uploads: [],
-    });
-  },
+  get inlineButtons() {
+    return chatComposerButtons(this, "inline", this.context);
+  }
 
-  didInsertElement() {
-    this._super(...arguments);
+  get dropdownButtons() {
+    return chatComposerButtons(this, "dropdown", this.context);
+  }
 
-    this._textarea = this.element.querySelector(".chat-composer-input");
-    this._$textarea = $(this._textarea);
-    this._applyCategoryHashtagAutocomplete(this._$textarea);
-    this._applyEmojiAutocomplete(this._$textarea);
-    this.appEvents.on("chat:focus-composer", this, "_focusTextArea");
-    this.appEvents.on("chat:insert-text", this, "insertText");
-    this._focusTextArea();
+  get fileUploadElementId() {
+    return this.context + "-file-uploader";
+  }
 
-    this.appEvents.on("chat:modify-selection", this, "_modifySelection");
+  get canAttachUploads() {
+    return (
+      this.siteSettings.chat_allow_uploads &&
+      isPresent(this.args.uploadDropZone)
+    );
+  }
+
+  @action
+  persistDraft() {}
+
+  @action
+  setupAutocomplete(textarea) {
+    const $textarea = $(textarea);
+    this.#applyUserAutocomplete($textarea);
+    this.#applyEmojiAutocomplete($textarea);
+    this.#applyCategoryHashtagAutocomplete($textarea);
+  }
+
+  @action
+  setupTextareaInteractor(textarea) {
+    this.composer.textarea = new TextareaInteractor(getOwner(this), textarea);
+
+    if (this.site.desktopView && this.args.autofocus) {
+      this.composer.focus({ ensureAtEnd: true, refreshHeight: true });
+    }
+  }
+
+  @action
+  didUpdateMessage() {
+    this.cancelPersistDraft();
+    this.composer.textarea.value = this.currentMessage.message;
+    this.persistDraft();
+  }
+
+  @action
+  didUpdateInReplyTo() {
+    this.cancelPersistDraft();
+    this.persistDraft();
+  }
+
+  @action
+  cancelPersistDraft() {
+    cancel(this._persistHandler);
+  }
+
+  @action
+  handleInlineButonAction(buttonAction, event) {
+    event.stopPropagation();
+
+    buttonAction();
+  }
+
+  get currentMessage() {
+    return this.composer.message;
+  }
+
+  get hasContent() {
+    const minLength = this.siteSettings.chat_minimum_message_length || 1;
+    return (
+      this.currentMessage?.message?.length >= minLength ||
+      (this.canAttachUploads && this.currentMessage?.uploads?.length > 0)
+    );
+  }
+
+  get sendEnabled() {
+    return (
+      (this.hasContent || this.currentMessage?.editing) &&
+      !this.pane.sending &&
+      !this.inProgressUploadsCount > 0
+    );
+  }
+
+  @action
+  setup() {
+    this.appEvents.on("chat:modify-selection", this, "modifySelection");
     this.appEvents.on(
       "chat:open-insert-link-modal",
       this,
-      "_openInsertLinkModal"
+      "openInsertLinkModal"
     );
-    document.addEventListener("visibilitychange", this._blurInput);
-    document.addEventListener("resume", this._blurInput);
-    document.addEventListener("freeze", this._blurInput);
+  }
 
-    this.set("ready", true);
-  },
+  @action
+  teardown() {
+    this.appEvents.off("chat:modify-selection", this, "modifySelection");
+    this.appEvents.off(
+      "chat:open-insert-link-modal",
+      this,
+      "openInsertLinkModal"
+    );
+    this.pane.sending = false;
+  }
 
-  _modifySelection(opts = { type: null }) {
-    const sel = this.getSelected("", { lineVal: true });
-    if (opts.type === "bold") {
-      this.applySurround(sel, "**", "**", "bold_text");
-    } else if (opts.type === "italic") {
-      this.applySurround(sel, "_", "_", "italic_text");
-    } else if (opts.type === "code") {
-      this.applySurround(sel, "`", "`", "code_text");
-    }
-  },
-
-  _openInsertLinkModal() {
-    const selected = this.getSelected("", { lineVal: true });
-    const linkText = selected?.value;
-    showModal("insert-hyperlink").setProperties({
-      linkText,
-      toolbarEvent: {
-        addText: (text) => this.addText(selected, text),
+  @action
+  insertDiscourseLocalDate() {
+    showModal("discourse-local-dates-create-modal").setProperties({
+      insertDate: (markup) => {
+        this.composer.textarea.addText(
+          this.composer.textarea.getSelected(),
+          markup
+        );
+        this.composer.focus();
       },
     });
-  },
+  }
 
-  willDestroyElement() {
-    this._super(...arguments);
+  @action
+  uploadClicked() {
+    document.querySelector(`#${this.fileUploadElementId}`).click();
+  }
 
-    this.appEvents.off(
-      "chat-composer:reply-to-set",
-      this,
-      "_replyToMsgChanged"
-    );
-    this.appEvents.off(
-      "upload-mixin:chat-composer-uploader:in-progress-uploads",
-      this,
-      "_inProgressUploadsChanged"
-    );
+  @action
+  computeIsFocused(isFocused) {
+    next(() => {
+      this.isFocused = isFocused;
+    });
+  }
 
-    cancel(this.timer);
-    cancel(this.mentionsTimer);
+  @action
+  onInput(event) {
+    this.currentMessage.draftSaved = false;
+    this.currentMessage.message = event.target.value;
+    this.composer.textarea.refreshHeight();
+    this.reportReplyingPresence();
+    this.persistDraft();
+    this.captureMentions();
+  }
 
-    this.appEvents.off("chat:focus-composer", this, "_focusTextArea");
-    this.appEvents.off("chat:insert-text", this, "insertText");
-    this.appEvents.off("chat:modify-selection", this, "_modifySelection");
-    this.appEvents.off(
-      "chat:open-insert-link-modal",
-      this,
-      "_openInsertLinkModal"
-    );
-    document.removeEventListener("visibilitychange", this._blurInput);
-    document.removeEventListener("resume", this._blurInput);
-    document.removeEventListener("freeze", this._blurInput);
-  },
+  @action
+  onUploadChanged(uploads, { inProgressUploadsCount }) {
+    this.currentMessage.draftSaved = false;
 
-  // It is important that this is keyDown and not keyUp, otherwise
-  // we add new lines to chat message on send and on edit, because
-  // you cannot prevent default with a keyUp event -- it is like trying
-  // to shut the gate after the horse has already bolted!
-  keyDown(event) {
-    if (this.site.mobileView || event.altKey || event.metaKey) {
+    this.inProgressUploadsCount = inProgressUploadsCount || 0;
+
+    if (
+      typeof uploads !== "undefined" &&
+      inProgressUploadsCount !== "undefined" &&
+      inProgressUploadsCount === 0 &&
+      this.currentMessage
+    ) {
+      this.currentMessage.uploads = cloneJSON(uploads);
+    }
+
+    this.composer.textarea?.focus();
+    this.reportReplyingPresence();
+    this.persistDraft();
+  }
+
+  @action
+  trapMouseDown(event) {
+    event?.preventDefault();
+  }
+
+  @action
+  async onSend(event) {
+    if (!this.sendEnabled) {
       return;
     }
 
-    // keyCode for 'Enter'
-    if (event.keyCode === 13) {
+    event?.preventDefault();
+
+    if (
+      this.currentMessage.editing &&
+      this.currentMessage.message.length === 0
+    ) {
+      new ChatMessageInteractor(
+        getOwner(this),
+        this.currentMessage,
+        this.context
+      ).delete();
+      this.reset(this.args.channel, this.args.thread);
+      return;
+    }
+
+    await this.args.onSendMessage(this.currentMessage);
+    this.composer.textarea.refreshHeight();
+  }
+
+  reportReplyingPresence() {
+    if (!this.args.channel || !this.currentMessage) {
+      return;
+    }
+
+    this.chatComposerPresenceManager.notifyState(
+      this.presenceChannelName,
+      !this.currentMessage.editing && this.hasContent
+    );
+  }
+
+  @action
+  modifySelection(event, options = { type: null, context: null }) {
+    if (options.context !== this.context) {
+      return;
+    }
+
+    const sel = this.composer.textarea.getSelected("", { lineVal: true });
+    if (options.type === "bold") {
+      this.composer.textarea.applySurround(sel, "**", "**", "bold_text");
+    } else if (options.type === "italic") {
+      this.composer.textarea.applySurround(sel, "_", "_", "italic_text");
+    } else if (options.type === "code") {
+      this.composer.textarea.applySurround(sel, "`", "`", "code_text");
+    }
+  }
+
+  @action
+  onTextareaFocusIn(textarea) {
+    if (!this.capabilities.isIOS) {
+      return;
+    }
+
+    // hack to prevent the whole viewport to move on focus input
+    // we need access to native node
+    textarea = this.composer.textarea.textarea;
+    textarea.style.transform = "translateY(-99999px)";
+    textarea.focus();
+    window.requestAnimationFrame(() => {
+      window.requestAnimationFrame(() => {
+        textarea.style.transform = "";
+      });
+    });
+  }
+
+  @action
+  onKeyDown(event) {
+    if (
+      this.site.mobileView ||
+      event.altKey ||
+      event.metaKey ||
+      this.#isAutocompleteDisplayed()
+    ) {
+      return;
+    }
+
+    if (event.key === "Escape" && !event.shiftKey) {
+      return this.handleEscape(event);
+    }
+
+    if (event.key === "Enter") {
       if (event.shiftKey) {
         // Shift+Enter: insert newline
         return;
@@ -184,256 +312,147 @@ export default Component.extend(TextareaTextManipulation, {
       // Ctrl+Enter, plain Enter: send
       if (!event.ctrlKey) {
         // if we are inside a code block just insert newline
-        const { pre } = this.getSelected(null, { lineVal: true });
-        if (this.isInside(pre, /(^|\n)```/g)) {
+        const { pre } = this.composer.textarea.getSelected({ lineVal: true });
+        if (this.composer.textarea.isInside(pre, /(^|\n)```/g)) {
           return;
         }
       }
 
-      this.sendClicked();
+      this.onSend();
+      event.preventDefault();
       return false;
     }
 
     if (
       event.key === "ArrowUp" &&
-      this._messageIsEmpty() &&
-      !this.editingMessage
+      !this.hasContent &&
+      !this.currentMessage.editing
     ) {
-      event.preventDefault();
-      this.onEditLastMessageRequested();
-    }
-
-    if (event.keyCode === 27) {
-      // keyCode for 'Escape'
-      if (this.replyToMsg) {
-        this.set("value", "");
-        this._replyToMsgChanged(null);
-        return false;
-      } else if (this.editingMessage) {
-        this.set("value", "");
-        this.cancelEditing();
-        return false;
+      if (event.shiftKey && this.lastMessage?.replyable) {
+        this.composer.replyTo(this.lastMessage);
       } else {
-        this._textarea.blur();
+        const editableMessage = this.lastUserMessage(this.currentUser);
+        if (editableMessage?.editable) {
+          this.composer.edit(editableMessage);
+        }
       }
     }
-  },
+  }
 
-  didReceiveAttrs() {
-    this._super(...arguments);
-
-    if (
-      !this.editingMessage &&
-      this.draft &&
-      this.chatChannel?.canModifyMessages(this.currentUser)
-    ) {
-      // uses uploads from draft here...
-      this.setProperties({
-        value: this.draft.value,
-        replyToMsg: this.draft.replyToMsg,
-      });
-
-      this._debouncedCaptureMentions();
-      this._syncUploads(this.draft.uploads);
-      this.setInReplyToMsg(this.draft.replyToMsg);
-    }
-
-    if (this.editingMessage && !this.loading) {
-      this.setProperties({
-        replyToMsg: null,
-        value: this.editingMessage.message,
-      });
-
-      this._syncUploads(this.editingMessage.uploads);
-      this._focusTextArea({ ensureAtEnd: true, resizeTextarea: false });
-    }
-
-    this.set("lastChatChannelId", this.chatChannel.id);
-    this.resizeTextarea();
-  },
-
-  // the chat-composer needs to be able to set the internal list of uploads
-  // for chat-composer-uploads to preload in existing uploads for drafts
-  // and for when messages are being edited.
-  //
-  // the opposite is true as well -- when an upload is completed the chat-composer
-  // needs its internal state updated so drafts can be saved, which is handled
-  // by the uploadsChanged action
-  _syncUploads(newUploads = []) {
-    const currentUploadIds = this._uploads.mapBy("id");
-    const newUploadIds = newUploads.mapBy("id");
-
-    // don't need to load the uploads into chat-composer-uploads if
-    // nothing has changed otherwise we would rerender for no reason
-    if (
-      currentUploadIds.length === newUploadIds.length &&
-      newUploadIds.every((newUploadId) =>
-        currentUploadIds.includes(newUploadId)
-      )
-    ) {
+  @action
+  openInsertLinkModal(event, options = { context: null }) {
+    if (options.context !== this.context) {
       return;
     }
 
-    this.set("_uploads", cloneJSON(newUploads));
-    this.appEvents.trigger("chat-composer:load-uploads", this._uploads);
-  },
-
-  _inProgressUploadsChanged(inProgressUploads) {
-    next(() => {
-      if (this.isDestroying || this.isDestroyed) {
-        return;
-      }
-
-      this.set("inProgressUploads", inProgressUploads);
-    });
-  },
-
-  _replyToMsgChanged(replyToMsg) {
-    this.set("replyToMsg", replyToMsg);
-    this.onValueChange?.(this.value, this._uploads, replyToMsg);
-  },
-
-  @action
-  onTextareaInput(value) {
-    this.set("value", value);
-    this.resizeTextarea();
-
-    this.typingMention = value.slice(-1) === "@";
-
-    if (this.typingMention && value.slice(-1) === " ") {
-      this.typingMention = false;
-      this._debouncedCaptureMentions();
-    }
-
-    // throttle, not debounce, because we do eventually want to react during the typing
-    this.timer = throttle(this, this._handleTextareaInput, THROTTLE_MS);
-  },
-
-  @bind
-  _handleTextareaInput() {
-    this._applyUserAutocomplete();
-    this.onValueChange?.(this.value, this._uploads, this.replyToMsg);
-  },
-
-  @bind
-  _debouncedCaptureMentions() {
-    this.mentionsTimer = discourseDebounce(
-      this,
-      this._captureMentions,
-      MENTION_DEBOUNCE_MS
-    );
-  },
-
-  @bind
-  _captureMentions() {
-    if (this.siteSettings.enable_mentions) {
-      const mentions = this._extractMentions();
-      this.onMentionUpdates(mentions);
-    }
-  },
-
-  _extractMentions() {
-    let message = this.value;
-    const regex = mentionRegex(this.siteSettings.unicode_usernames);
-    const mentions = [];
-    let mentionsLeft = true;
-
-    while (mentionsLeft) {
-      const matches = message.match(regex);
-
-      if (matches) {
-        const mention = matches[1] || matches[2];
-        mentions.push(mention);
-        message = message.replaceAll(`${mention}`, "");
-      } else {
-        mentionsLeft = false;
-      }
-    }
-
-    return mentions;
-  },
-
-  @bind
-  _blurInput() {
-    document.activeElement?.blur();
-  },
-
-  @action
-  uploadClicked() {
-    this.element.querySelector(`#${this.fileUploadElementId}`).click();
-  },
-
-  @bind
-  didSelectEmoji(emoji) {
-    const code = `:${emoji}:`;
-    this.chatEmojiReactionStore.track(code);
-    this.addText(this.getSelected(), code);
-  },
-
-  @action
-  insertDiscourseLocalDate() {
-    showModal("discourse-local-dates-create-modal").setProperties({
-      insertDate: (markup) => {
-        this.addText(this.getSelected(), markup);
+    const selected = this.composer.textarea.getSelected("", { lineVal: true });
+    const linkText = selected?.value;
+    showModal("insert-hyperlink").setProperties({
+      linkText,
+      toolbarEvent: {
+        addText: (text) => this.composer.textarea.addText(selected, text),
       },
     });
-  },
+  }
 
-  // text-area-manipulation mixin override
-  addText() {
-    this._super(...arguments);
+  @action
+  onSelectEmoji(emoji) {
+    const code = `:${emoji}:`;
+    this.chatEmojiReactionStore.track(code);
+    this.composer.textarea.addText(this.composer.textarea.getSelected(), code);
 
-    this.resizeTextarea();
-  },
-
-  _applyUserAutocomplete() {
-    if (this.siteSettings.enable_mentions) {
-      $(this._textarea).autocomplete({
-        template: findRawTemplate("user-selector-autocomplete"),
-        key: "@",
-        width: "100%",
-        treatAsTextarea: true,
-        autoSelectFirstSuggestion: true,
-        transformComplete: (v) => v.username || v.name,
-        dataSource: (term) => {
-          return userSearch({ term, includeGroups: true }).then((result) => {
-            if (result?.users?.length > 0) {
-              const presentUserNames =
-                this.chat.presenceChannel.users?.mapBy("username");
-              result.users.forEach((user) => {
-                if (presentUserNames.includes(user.username)) {
-                  user.cssClasses = "mention-user-is-online";
-                }
-              });
-            }
-            return result;
-          });
-        },
-        afterComplete: (text) => {
-          this.set("value", text);
-          this._focusTextArea();
-          this._debouncedCaptureMentions();
-        },
-      });
+    if (this.site.desktopView) {
+      this.composer.focus();
+    } else {
+      this.chatEmojiPickerManager.close();
     }
-  },
+  }
 
-  _applyCategoryHashtagAutocomplete($textarea) {
+  @action
+  captureMentions() {
+    if (this.hasContent) {
+      this.chatComposerWarningsTracker.trackMentions(
+        this.currentMessage.message
+      );
+    }
+  }
+
+  @action
+  showChannelSummaryModal() {
+    this.modal.show(ChatModalChannelSummary, {
+      model: { channelId: this.args.channel.id },
+    });
+  }
+
+  #addMentionedUser(userData) {
+    const user = User.create(userData);
+    this.currentMessage.mentionedUsers.set(user.id, user);
+  }
+
+  #applyUserAutocomplete($textarea) {
+    if (!this.siteSettings.enable_mentions) {
+      return;
+    }
+
+    $textarea.autocomplete({
+      template: findRawTemplate("user-selector-autocomplete"),
+      key: "@",
+      width: "100%",
+      treatAsTextarea: true,
+      autoSelectFirstSuggestion: true,
+      transformComplete: (obj) => {
+        if (obj.isUser) {
+          this.#addMentionedUser(obj);
+        }
+
+        return obj.username || obj.name;
+      },
+      dataSource: (term) => {
+        destroyTippyInstances();
+        return userSearch({ term, includeGroups: true }).then((result) => {
+          if (result?.users?.length > 0) {
+            const presentUserNames =
+              this.chat.presenceChannel.users?.mapBy("username");
+            result.users.forEach((user) => {
+              if (presentUserNames.includes(user.username)) {
+                user.cssClasses = "is-online";
+              }
+            });
+            initUserStatusHtml(result.users);
+          }
+          return result;
+        });
+      },
+      onRender: (options) => {
+        renderUserStatusHtml(options);
+      },
+      afterComplete: (text, event) => {
+        event.preventDefault();
+        this.composer.textarea.value = text;
+        this.composer.focus();
+        this.captureMentions();
+      },
+      onClose: destroyTippyInstances,
+    });
+  }
+
+  #applyCategoryHashtagAutocomplete($textarea) {
     setupHashtagAutocomplete(
       this.site.hashtag_configurations["chat-composer"],
       $textarea,
       this.siteSettings,
       {
         treatAsTextarea: true,
-        afterComplete: (value) => {
-          this.set("value", value);
-          return this._focusTextArea();
+        afterComplete: (text, event) => {
+          event.preventDefault();
+          this.composer.textarea.value = text;
+          this.composer.focus();
         },
       }
     );
-  },
+  }
 
-  _applyEmojiAutocomplete($textarea) {
+  #applyEmojiAutocomplete($textarea) {
     if (!this.siteSettings.enable_emoji) {
       return;
     }
@@ -441,12 +460,12 @@ export default Component.extend(TextareaTextManipulation, {
     $textarea.autocomplete({
       template: findRawTemplate("emoji-selector-autocomplete"),
       key: ":",
-      afterComplete: (text) => {
-        this.set("value", text);
-        this._focusTextArea();
+      afterComplete: (text, event) => {
+        event.preventDefault();
+        this.composer.textarea.value = text;
+        this.composer.focus();
       },
       treatAsTextarea: true,
-
       onKeyUp: (text, cp) => {
         const matches =
           /(?:^|[\s.\?,@\/#!%&*;:\[\]{}=\-_()])(:(?!:).?[\w-]*:?(?!:)(?:t\d?)?:?) ?$/gi.exec(
@@ -457,18 +476,19 @@ export default Component.extend(TextareaTextManipulation, {
           return [matches[1]];
         }
       },
-
       transformComplete: (v) => {
         if (v.code) {
           this.chatEmojiReactionStore.track(v.code);
           return `${v.code}:`;
         } else {
           $textarea.autocomplete({ cancel: true });
-          this.set("emojiPickerIsActive", true);
+          this.chatEmojiPickerManager.open({
+            context: this.context,
+            initialFilter: v.term,
+          });
           return "";
         }
       },
-
       dataSource: (term) => {
         return new Promise((resolve) => {
           const full = `:${term}`;
@@ -510,8 +530,7 @@ export default Component.extend(TextareaTextManipulation, {
 
           // note this will only work for emojis starting with :
           // eg: :-)
-          const emojiTranslation =
-            this.get("site.custom_emoji_translation") || {};
+          const emojiTranslation = this.site.custom_emoji_translation || {};
           const allTranslations = Object.assign(
             {},
             translations,
@@ -521,12 +540,13 @@ export default Component.extend(TextareaTextManipulation, {
             return resolve([allTranslations[full]]);
           }
 
+          const emojiDenied = this.site.denied_emojis || [];
           const match = term.match(/^:?(.*?):t([2-6])?$/);
           if (match) {
             const name = match[1];
             const scale = match[2];
 
-            if (isSkinTonableEmoji(name)) {
+            if (isSkinTonableEmoji(name) && !emojiDenied.includes(name)) {
               if (scale) {
                 return resolve([`${name}:t${scale}`]);
               } else {
@@ -538,6 +558,7 @@ export default Component.extend(TextareaTextManipulation, {
           const options = emojiSearch(term, {
             maxResults: 5,
             diversity: this.chatEmojiReactionStore.diversity,
+            exclude: emojiDenied,
           });
 
           return resolve(options);
@@ -556,244 +577,9 @@ export default Component.extend(TextareaTextManipulation, {
           });
       },
     });
-  },
+  }
 
-  @afterRender
-  _focusTextArea(opts = { ensureAtEnd: false, resizeTextarea: true }) {
-    if (this.chatChannel.isDraft) {
-      return;
-    }
-
-    if (!this._textarea) {
-      return;
-    }
-
-    if (opts.resizeTextarea) {
-      this.resizeTextarea();
-    }
-
-    if (opts.ensureAtEnd) {
-      this._textarea.setSelectionRange(this.value.length, this.value.length);
-    }
-
-    if (this.capabilities.isIpadOS || this.site.mobileView) {
-      return;
-    }
-
-    schedule("afterRender", () => {
-      this._textarea?.focus();
-    });
-  },
-
-  @action
-  onEmojiSelected(code) {
-    this.emojiSelected(code);
-    this.set("emojiPickerIsActive", false);
-  },
-
-  @discourseComputed(
-    "chatChannel.{id,chatable.users.[]}",
-    "canInteractWithChat"
-  )
-  disableComposer(channel, canInteractWithChat) {
-    return (
-      (channel.isDraft && isEmpty(channel?.chatable?.users)) ||
-      !canInteractWithChat ||
-      !channel.canModifyMessages(this.currentUser)
-    );
-  },
-
-  @discourseComputed("userSilenced", "chatChannel.{chatable.users.[],id}")
-  placeholder(userSilenced, chatChannel) {
-    if (!chatChannel.canModifyMessages(this.currentUser)) {
-      return I18n.t("chat.placeholder_new_message_disallowed", {
-        status: channelStatusName(chatChannel.status).toLowerCase(),
-      });
-    }
-
-    if (chatChannel.isDraft) {
-      return I18n.t("chat.placeholder_start_conversation", {
-        usernames: chatChannel?.chatable?.users?.length
-          ? chatChannel.chatable.users.mapBy("username").join(", ")
-          : "...",
-      });
-    }
-
-    if (userSilenced) {
-      return I18n.t("chat.placeholder_silenced");
-    } else {
-      return this.messageRecipient(chatChannel);
-    }
-  },
-
-  messageRecipient(chatChannel) {
-    if (chatChannel.isDirectMessageChannel) {
-      const directMessageRecipients = chatChannel.chatable.users;
-      if (
-        directMessageRecipients.length === 1 &&
-        directMessageRecipients[0].id === this.currentUser.id
-      ) {
-        return I18n.t("chat.placeholder_self");
-      }
-
-      return I18n.t("chat.placeholder_others", {
-        messageRecipient: directMessageRecipients
-          .map((u) => u.name || `@${u.username}`)
-          .join(", "),
-      });
-    } else {
-      return I18n.t("chat.placeholder_others", {
-        messageRecipient: `#${chatChannel.title}`,
-      });
-    }
-  },
-
-  @discourseComputed(
-    "value",
-    "loading",
-    "disableComposer",
-    "inProgressUploads.[]"
-  )
-  sendDisabled(value, loading, disableComposer, inProgressUploads) {
-    if (loading || disableComposer || inProgressUploads.length > 0) {
-      return true;
-    }
-
-    return !this._messageIsValid();
-  },
-
-  @action
-  sendClicked() {
-    if (this.site.mobileView) {
-      // prevents android to hide the keyboard after sending a message
-      // we do a focusTextarea later but it's too late for android
-      document.querySelector(this.composerFocusSelector).focus();
-    }
-
-    if (this.sendDisabled) {
-      return;
-    }
-
-    this.editingMessage
-      ? this.internalEditMessage()
-      : this.internalSendMessage();
-  },
-
-  @action
-  internalSendMessage() {
-    return this.sendMessage(this.value, this._uploads).then(this.reset);
-  },
-
-  @action
-  internalEditMessage() {
-    return this.editMessage(
-      this.editingMessage,
-      this.value,
-      this._uploads
-    ).then(this.reset);
-  },
-
-  _messageIsValid() {
-    const validLength =
-      (this.value || "").trim().length >=
-      (this.siteSettings.chat_minimum_message_length || 0);
-
-    if (this.canAttachUploads) {
-      if (this._messageIsEmpty()) {
-        // If message is empty, an an upload must present for sending to be enabled
-        return this._uploads.length;
-      } else {
-        // Message is non-empty. Make sure it's long enough to be valid.
-        return validLength;
-      }
-    }
-
-    // Attachments are disabled so for a message to be valid it must be long enough.
-    return validLength;
-  },
-
-  _messageIsEmpty() {
-    return (this.value || "").trim() === "";
-  },
-
-  @action
-  reset() {
-    if (this.isDestroyed || this.isDestroying) {
-      return;
-    }
-
-    this.setProperties({
-      value: "",
-      inReplyMsg: null,
-    });
-    this.onMentionUpdates([]);
-    this._syncUploads([]);
-    this._focusTextArea({ ensureAtEnd: true, resizeTextarea: true });
-    this.onValueChange?.(this.value, this._uploads, this.replyToMsg);
-  },
-
-  @action
-  cancelReplyTo() {
-    this.set("replyToMsg", null);
-    this.setInReplyToMsg(null);
-    this.onValueChange?.(this.value, this._uploads, this.replyToMsg);
-  },
-
-  @action
-  cancelEditing() {
-    this.onCancelEditing();
-    this._focusTextArea({ ensureAtEnd: true, resizeTextarea: true });
-  },
-
-  _cursorIsOnEmptyLine() {
-    const selectionStart = this._textarea.selectionStart;
-    if (selectionStart === 0) {
-      return true;
-    } else if (this._textarea.value.charAt(selectionStart - 1) === "\n") {
-      return true;
-    } else {
-      return false;
-    }
-  },
-
-  @action
-  uploadsChanged(uploads) {
-    this.set("_uploads", cloneJSON(uploads));
-    this.onValueChange?.(this.value, this._uploads, this.replyToMsg);
-  },
-
-  @action
-  onTextareaFocusIn(target) {
-    if (!this.capabilities.isIOS) {
-      return;
-    }
-
-    // hack to prevent the whole viewport
-    // to move on focus input
-    target = document.querySelector(".chat-composer-input");
-    target.style.transform = "translateY(-99999px)";
-    target.focus();
-    window.requestAnimationFrame(() => {
-      window.requestAnimationFrame(() => {
-        target.style.transform = "";
-      });
-    });
-  },
-
-  @action
-  resizeTextarea() {
-    schedule("afterRender", () => {
-      if (!this._textarea) {
-        return;
-      }
-
-      // this is a quirk which forces us to `auto` first or textarea
-      // won't resize
-      this._textarea.style.height = "auto";
-
-      // +1 is to workaround a rounding error visible on electron
-      // causing scrollbars to show when they shouldn’t
-      this._textarea.style.height = this._textarea.scrollHeight + 1 + "px";
-    });
-  },
-});
+  #isAutocompleteDisplayed() {
+    return document.querySelector(".autocomplete");
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-draft-channel-screen.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-draft-channel-screen.hbs
deleted file mode 100644
index 3e8aa906ec1..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/chat-draft-channel-screen.hbs
+++ /dev/null
@@ -1,28 +0,0 @@
-<div class="chat-draft">
-  {{#if this.site.mobileView}}
-    <header class="chat-draft-header">
-      <FlatButton
-        @class="chat-draft-header__btn btn"
-        @icon="chevron-left"
-        @title="chat.draft_channel_screen.cancel"
-        @action={{action "onCancelChatDraft"}}
-      />
-      <h2 class="chat-draft-header__title">
-        {{d-icon "comment"}}
-        {{i18n "chat.draft_channel_screen.header"}}
-      </h2>
-    </header>
-  {{/if}}
-
-  <DirectMessageCreator
-    @onChangeSelectedUsers={{action "onChangeSelectedUsers"}}
-  />
-
-  {{#if this.previewedChannel}}
-    <ChatLivePane
-      @chatChannel={{this.previewedChannel}}
-      @includeHeader={{false}}
-      @onSwitchChannel={{action "onSwitchFromDraftChannel"}}
-    />
-  {{/if}}
-</div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-draft-channel-screen.js b/plugins/chat/assets/javascripts/discourse/components/chat-draft-channel-screen.js
deleted file mode 100644
index f8f00d3e920..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/chat-draft-channel-screen.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import ChatChannel from "discourse/plugins/chat/discourse/models/chat-channel";
-import { inject as service } from "@ember/service";
-import Component from "@ember/component";
-import { action } from "@ember/object";
-import { cloneJSON } from "discourse-common/lib/object";
-export default class ChatDraftChannelScreen extends Component {
-  @service chat;
-  @service router;
-  tagName = "";
-  onSwitchChannel = null;
-
-  @action
-  onCancelChatDraft() {
-    return this.router.transitionTo("chat.index");
-  }
-
-  @action
-  onChangeSelectedUsers(users) {
-    this._fetchPreviewedChannel(users);
-  }
-
-  @action
-  onSwitchFromDraftChannel(channel) {
-    channel.set("isDraft", false);
-    this.onSwitchChannel?.(channel);
-  }
-
-  _fetchPreviewedChannel(users) {
-    this.set("previewedChannel", null);
-
-    return this.chat
-      .getDmChannelForUsernames(users.mapBy("username"))
-      .then((response) => {
-        this.set(
-          "previewedChannel",
-          ChatChannel.create(
-            Object.assign({}, response.channel, { isDraft: true })
-          )
-        );
-      })
-      .catch((error) => {
-        if (error?.jqXHR?.status === 404) {
-          this.set(
-            "previewedChannel",
-            ChatChannel.create({
-              chatable: { users: cloneJSON(users) },
-              isDraft: true,
-            })
-          );
-        }
-      });
-  }
-}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-drawer.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-drawer.hbs
index 7d5b8411b59..e5529087c97 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-drawer.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-drawer.hbs
@@ -1,137 +1,24 @@
 {{#if this.chatStateManager.isDrawerActive}}
   <div
     data-chat-channel-id={{this.chat.activeChannel.id}}
+    data-chat-thread-id={{this.chat.activeChannel.activeThread.id}}
     class={{concat-class
       "chat-drawer"
       (if this.chatStateManager.isDrawerExpanded "is-expanded")
     }}
+    {{chat/resizable-node ".chat-drawer-resizer" this.didResize}}
+    style={{this.drawerStyle}}
   >
     <div class="chat-drawer-container">
-      <div
-        role="region"
-        aria-label={{i18n "chat.aria_roles.header"}}
-        class="chat-drawer-header"
-      >
-        {{#if
-          (and this.draftChannelView this.chatStateManager.isDrawerExpanded)
-        }}
-          <div class="chat-drawer-header__left-actions">
-            <div class="chat-drawer-header__top-line">
-              <LinkTo
-                title={{i18n "chat.return_to_list"}}
-                class="chat-drawer-header__return-to-channels-btn"
-                @route="chat"
-              >
-                {{d-icon "chevron-left"}}
-              </LinkTo>
-            </div>
-          </div>
-
-          <span class="chat-drawer-header__title">
-            <div class="chat-drawer-header__top-line">
-              {{i18n "chat.direct_message_creator.title"}}
-            </div>
-          </span>
-        {{else if this.chatView}}
-          {{#if this.chatStateManager.isDrawerExpanded}}
-            <LinkTo
-              title={{i18n "chat.return_to_list"}}
-              class="chat-drawer-header__return-to-channels-btn"
-              @route="chat"
-            >
-              {{d-icon "chevron-left"}}
-            </LinkTo>
-          {{/if}}
-
-          {{#if this.chat.activeChannel}}
-            {{#if this.chatStateManager.isDrawerExpanded}}
-              <LinkTo
-                @route={{this.infoTabRoute}}
-                @models={{array
-                  this.chat.activeChannel.id
-                  (slugify-channel this.chat.activeChannel)
-                }}
-                class="chat-drawer-header__title"
-              >
-                <div class="chat-drawer-header__top-line">
-                  <ChatChannelTitle @channel={{this.chat.activeChannel}} />
-                </div>
-              </LinkTo>
-            {{else}}
-              <div
-                role="button"
-                {{on "click" (action "toggleExpand")}}
-                class="chat-drawer-header__title"
-              >
-                <div class="chat-drawer-header__top-line">
-                  <ChatChannelTitle @channel={{this.chat.activeChannel}}>
-                    {{#if this.unreadCount}}
-                      <span
-                        class="chat-unread-count"
-                      >{{this.unreadCount}}</span>
-                    {{/if}}
-                  </ChatChannelTitle>
-                </div>
-              </div>
-            {{/if}}
-          {{/if}}
-        {{else}}
-          <span class="chat-drawer-header__title">
-            <div class="chat-drawer-header__top-line">
-              {{i18n "chat.heading"}}
-            </div>
-          </span>
-        {{/if}}
-
-        <div class="chat-drawer-header__right-actions">
-          <div class="chat-drawer-header__top-line {{this.topLineClass}}">
-            {{#if this.chatStateManager.isDrawerExpanded}}
-              <DButton
-                @icon="discourse-expand"
-                class="btn-flat btn-link chat-drawer-header__full-screen-btn"
-                @title={{"chat.open_full_page"}}
-                @action={{this.openInFullPage}}
-              />
-            {{/if}}
-
-            <FlatButton
-              @icon={{this.expandIcon}}
-              @class="chat-drawer-header__expand-btn"
-              @action={{action "toggleExpand"}}
-              @title="chat.collapse"
-            />
-
-            {{#if this.showClose}}
-              <FlatButton
-                @icon="times"
-                @action={{action "close"}}
-                @title="chat.close"
-                @class="chat-drawer-header__close-btn"
-              />
-            {{/if}}
-          </div>
-        </div>
-      </div>
-
-      {{#if this.chatStateManager.isDrawerExpanded}}
-        <div class="chat-drawer-content">
-          {{#if (and this.chatView this.chat.activeChannel)}}
-            <ChatLivePane
-              @chatChannel={{this.chat.activeChannel}}
-              @onSwitchChannel={{action "switchChannel"}}
-            />
-          {{else if this.draftChannelView}}
-            <ChatDraftChannelScreen
-              @onSwitchChannel={{action "switchChannel"}}
-            />
-          {{else}}
-            <ChannelsList
-              @onOpenView={{action "openURL"}}
-              @onSelect={{action "switchChannel"}}
-            />
-          {{/if}}
-        </div>
-      {{/if}}
+      <div class="chat-drawer-resizer"></div>
+      <this.chatDrawerRouter.component
+        @params={{this.chatDrawerRouter.params}}
+        @openURL={{this.openURL}}
+        @openInFullPage={{this.openInFullPage}}
+        @toggleExpand={{this.toggleExpand}}
+        @close={{this.close}}
+        @drawerActions={{this.drawerActions}}
+      />
     </div>
   </div>
 {{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-drawer.js b/plugins/chat/assets/javascripts/discourse/components/chat-drawer.js
index df5fb52819e..7732db38cff 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-drawer.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-drawer.js
@@ -1,33 +1,29 @@
 import Component from "@ember/component";
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import { bind, observes } from "discourse-common/utils/decorators";
 import { action } from "@ember/object";
-import {
-  CHAT_VIEW,
-  DRAFT_CHANNEL_VIEW,
-  LIST_VIEW,
-} from "discourse/plugins/chat/discourse/services/chat";
-import { equal } from "@ember/object/computed";
-import { cancel, next, schedule, throttle } from "@ember/runloop";
+import { cancel, throttle } from "@ember/runloop";
 import { inject as service } from "@ember/service";
+import { htmlSafe } from "@ember/template";
+import { escapeExpression } from "discourse/lib/utilities";
+import DiscourseURL from "discourse/lib/url";
 
 export default Component.extend({
   tagName: "",
-  listView: equal("view", LIST_VIEW),
-  chatView: equal("view", CHAT_VIEW),
-  draftChannelView: equal("view", DRAFT_CHANNEL_VIEW),
   chat: service(),
   router: service(),
+  chatDrawerSize: service(),
   chatChannelsManager: service(),
   chatStateManager: service(),
+  chatDrawerRouter: service(),
   loading: false,
-  showClose: true, // TODO - false when on same topic
   sizeTimer: null,
   rafTimer: null,
-  view: null,
   hasUnreadMessages: false,
+  drawerStyle: null,
 
   didInsertElement() {
     this._super(...arguments);
+
     if (!this.chat.userCanChat) {
       return;
     }
@@ -35,39 +31,33 @@ export default Component.extend({
     this._checkSize();
     this.appEvents.on("chat:open-url", this, "openURL");
     this.appEvents.on("chat:toggle-close", this, "close");
-    this.appEvents.on("chat:open-channel", this, "switchChannel");
-    this.appEvents.on(
-      "chat:open-channel-at-message",
-      this,
-      "openChannelAtMessage"
-    );
     this.appEvents.on("composer:closed", this, "_checkSize");
     this.appEvents.on("composer:opened", this, "_checkSize");
     this.appEvents.on("composer:resized", this, "_checkSize");
     this.appEvents.on("composer:div-resizing", this, "_dynamicCheckSize");
+    window.addEventListener("resize", this._checkSize);
     this.appEvents.on(
       "composer:resize-started",
       this,
       "_startDynamicCheckSize"
     );
     this.appEvents.on("composer:resize-ended", this, "_clearDynamicCheckSize");
+
+    this.computeDrawerStyle();
   },
 
   willDestroyElement() {
     this._super(...arguments);
+
     if (!this.chat.userCanChat) {
       return;
     }
 
+    window.removeEventListener("resize", this._checkSize);
+
     if (this.appEvents) {
       this.appEvents.off("chat:open-url", this, "openURL");
       this.appEvents.off("chat:toggle-close", this, "close");
-      this.appEvents.off("chat:open-channel", this, "switchChannel");
-      this.appEvents.off(
-        "chat:open-channel-at-message",
-        this,
-        "openChannelAtMessage"
-      );
       this.appEvents.off("composer:closed", this, "_checkSize");
       this.appEvents.off("composer:opened", this, "_checkSize");
       this.appEvents.off("composer:resized", this, "_checkSize");
@@ -97,30 +87,22 @@ export default Component.extend({
     this.appEvents.trigger("chat:rerender-header");
   },
 
-  @discourseComputed("chatStateManager.isDrawerExpanded")
-  topLineClass(expanded) {
-    const baseClass = "chat-drawer-header__top-line";
-    return expanded ? `${baseClass}--expanded` : `${baseClass}--collapsed`;
+  computeDrawerStyle() {
+    const { width, height } = this.chatDrawerSize.size;
+    let style = `width: ${escapeExpression((width || "0").toString())}px;`;
+    style += `height: ${escapeExpression((height || "0").toString())}px;`;
+    this.set("drawerStyle", htmlSafe(style));
   },
 
-  @discourseComputed("chatStateManager.isDrawerExpanded", "chat.activeChannel")
-  displayMembers(expanded, channel) {
-    return expanded && !channel?.isDirectMessageChannel;
-  },
-
-  @discourseComputed("displayMembers")
-  infoTabRoute(displayMembers) {
-    if (displayMembers) {
-      return "chat.channel.info.members";
-    }
-
-    return "chat.channel.info.settings";
-  },
-
-  openChannelAtMessage(channel, messageId) {
-    this.chat.openChannel(channel, messageId);
+  get drawerActions() {
+    return {
+      openInFullPage: this.openInFullPage,
+      close: this.close,
+      toggleExpand: this.toggleExpand,
+    };
   },
 
+  @bind
   _dynamicCheckSize() {
     if (!this.chatStateManager.isDrawerActive) {
       return;
@@ -141,7 +123,9 @@ export default Component.extend({
       return;
     }
 
-    document.querySelector(".chat-drawer").classList.add("clear-transitions");
+    document
+      .querySelector(".chat-drawer-outlet-container")
+      .classList.add("clear-transitions");
   },
 
   _clearDynamicCheckSize() {
@@ -150,37 +134,33 @@ export default Component.extend({
     }
 
     document
-      .querySelector(".chat-drawer")
+      .querySelector(".chat-drawer-outlet-container")
       .classList.remove("clear-transitions");
     this._checkSize();
   },
 
+  @bind
   _checkSize() {
-    if (!this.chatStateManager.isDrawerActive) {
-      return;
-    }
-
     this.sizeTimer = throttle(this, this._performCheckSize, 150);
   },
 
   _performCheckSize() {
-    if (!this.isDestroying || this.isDestroyed) {
+    if (this.isDestroying || this.isDestroyed) {
       return;
     }
 
-    if (!this.chatStateManager.isDrawerActive) {
-      return;
-    }
-
-    const drawer = document.querySelector(".chat-drawer");
-    if (!drawer) {
+    const drawerContainer = document.querySelector(
+      ".chat-drawer-outlet-container"
+    );
+    if (!drawerContainer) {
       return;
     }
 
     const composer = document.getElementById("reply-control");
     const composerIsClosed = composer.classList.contains("closed");
     const minRightMargin = 15;
-    drawer.style.setProperty(
+
+    drawerContainer.style.setProperty(
       "--composer-right",
       (composerIsClosed
         ? minRightMargin
@@ -188,107 +168,15 @@ export default Component.extend({
     );
   },
 
-  @discourseComputed("chatStateManager.isDrawerExpanded")
-  expandIcon(expanded) {
-    if (expanded) {
-      return "angle-double-down";
-    } else {
-      return "angle-double-up";
-    }
-  },
-
-  @discourseComputed("chat.activeChannel.currentUserMembership.unread_count")
-  unreadCount(count) {
-    return count || 0;
-  },
-
   @action
-  openURL(URL = null) {
-    this.chat.setActiveChannel(null);
-    this.chatStateManager.didOpenDrawer(URL);
-
-    const route = this._buildRouteFromURL(
-      URL || this.chatStateManager.lastKnownChatURL
-    );
-
-    switch (route.name) {
-      case "chat":
-        this.set("view", LIST_VIEW);
-        this.appEvents.trigger("chat:float-toggled", false);
-        return;
-      case "chat.draft-channel":
-        this.set("view", DRAFT_CHANNEL_VIEW);
-        this.appEvents.trigger("chat:float-toggled", false);
-        return;
-      case "chat.channel":
-        return this.chatChannelsManager
-          .find(route.params.channelId)
-          .then((channel) => {
-            this.chat.setActiveChannel(channel);
-            this.set("view", CHAT_VIEW);
-            this.appEvents.trigger("chat:float-toggled", false);
-
-            if (route.queryParams.messageId) {
-              schedule("afterRender", () => {
-                this.appEvents.trigger(
-                  "chat-live-pane:highlight-message",
-                  route.queryParams.messageId
-                );
-              });
-            }
-          });
-    }
+  openURL(url = null) {
+    this.chat.activeChannel = null;
+    this.chatStateManager.didOpenDrawer(url);
+    this.chatDrawerRouter.stateFor(this._routeFromURL(url));
   },
 
-  @action
-  openInFullPage() {
-    this.chatStateManager.storeAppURL();
-    this.chatStateManager.prefersFullPage();
-    this.chat.setActiveChannel(null);
-
-    return this.router.transitionTo(this.chatStateManager.lastKnownChatURL);
-  },
-
-  @action
-  toggleExpand() {
-    this.chatStateManager.didToggleDrawer();
-    this.appEvents.trigger(
-      "chat:toggle-expand",
-      this.chatStateManager.isDrawerExpanded
-    );
-  },
-
-  @action
-  close() {
-    this.chatStateManager.didCloseDrawer();
-    this.chat.setActiveChannel(null);
-    this.appEvents.trigger("chat:float-toggled", true);
-  },
-
-  @action
-  switchChannel(channel) {
-    // we need next here to ensure we correctly let the time for routes transitions
-    // eg: deactivate hook of full page chat routes will set activeChannel to null
-    next(() => {
-      if (this.isDestroying || this.isDestroyed) {
-        return;
-      }
-
-      this.chat.setActiveChannel(channel);
-
-      if (!channel) {
-        const URL = this._buildURLFromState(LIST_VIEW);
-        this.openURL(URL);
-        return;
-      }
-
-      const URL = this._buildURLFromState(CHAT_VIEW, channel);
-      this.openURL(URL);
-    });
-  },
-
-  _buildRouteFromURL(URL) {
-    let route = this.router.recognize(URL || "/");
+  _routeFromURL(url) {
+    let route = this.router.recognize(url || "/");
 
     // ember might recognize the index subroute
     if (route.localName === "index") {
@@ -298,20 +186,34 @@ export default Component.extend({
     return route;
   },
 
-  _buildURLFromState(view, channel = null) {
-    switch (view) {
-      case LIST_VIEW:
-        return "/chat";
-      case DRAFT_CHANNEL_VIEW:
-        return "/chat/draft-channel";
-      case CHAT_VIEW:
-        if (channel) {
-          return `/chat/channel/${channel.id}/${channel.slug || "-"}`;
-        } else {
-          return "/chat";
-        }
-      default:
-        return "/chat";
-    }
+  @action
+  openInFullPage() {
+    this.chatStateManager.storeAppURL();
+    this.chatStateManager.prefersFullPage();
+    this.chat.activeChannel = null;
+
+    return DiscourseURL.routeTo(this.chatStateManager.lastKnownChatURL);
+  },
+
+  @action
+  toggleExpand() {
+    this.computeDrawerStyle();
+    this.chatStateManager.didToggleDrawer();
+    this.appEvents.trigger(
+      "chat:toggle-expand",
+      this.chatStateManager.isDrawerExpanded
+    );
+  },
+
+  @action
+  close() {
+    this.computeDrawerStyle();
+    this.chatStateManager.didCloseDrawer();
+    this.chat.activeChannel = null;
+  },
+
+  @action
+  didResize(element, { width, height }) {
+    this.chatDrawerSize.size = { width, height };
   },
 });
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-drawer/channel.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/channel.hbs
new file mode 100644
index 00000000000..f78588d7632
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/channel.hbs
@@ -0,0 +1,25 @@
+<ChatDrawer::Header @toggleExpand={{@drawerActions.toggleExpand}}>
+  <ChatDrawer::Header::LeftActions />
+
+  <ChatDrawer::Header::ChannelTitle
+    @channel={{this.chat.activeChannel}}
+    @drawerActions={{@drawerActions}}
+  />
+
+  <ChatDrawer::Header::RightActions @drawerActions={{@drawerActions}} />
+</ChatDrawer::Header>
+
+{{#if this.chatStateManager.isDrawerExpanded}}
+  <div
+    class="chat-drawer-content"
+    {{did-insert this.fetchChannel}}
+    {{did-update this.fetchChannel @params.channelId}}
+  >
+    {{#if this.chat.activeChannel}}
+      <ChatChannel
+        @targetMessageId={{readonly @params.messageId}}
+        @channel={{this.chat.activeChannel}}
+      />
+    {{/if}}
+  </div>
+{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-drawer/channel.js b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/channel.js
new file mode 100644
index 00000000000..22a8017f9d2
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/channel.js
@@ -0,0 +1,23 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+
+export default class ChatDrawerChannel extends Component {
+  @service appEvents;
+  @service chat;
+  @service chatStateManager;
+  @service chatChannelsManager;
+
+  @action
+  fetchChannel() {
+    if (!this.args.params?.channelId) {
+      return;
+    }
+
+    return this.chatChannelsManager
+      .find(this.args.params.channelId)
+      .then((channel) => {
+        this.chat.activeChannel = channel;
+      });
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header.hbs
new file mode 100644
index 00000000000..416b6e5616c
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header.hbs
@@ -0,0 +1,14 @@
+{{! template-lint-disable no-invalid-interactive }}
+<div
+  role="region"
+  aria-label={{i18n "chat.aria_roles.header"}}
+  class="chat-drawer-header"
+  {{on "click" @toggleExpand}}
+  title={{if
+    this.chatStateManager.isDrawerExpanded
+    (i18n "chat.collapse")
+    (i18n "chat.expand")
+  }}
+>
+  {{yield}}
+</div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header.js b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header.js
new file mode 100644
index 00000000000..f38df7fe6e0
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header.js
@@ -0,0 +1,6 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+
+export default class ChatDrawerHeader extends Component {
+  @service chatStateManager;
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/back-link.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/back-link.hbs
new file mode 100644
index 00000000000..2d2c0243581
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/back-link.hbs
@@ -0,0 +1,8 @@
+<LinkTo
+  title={{@title}}
+  class="chat-drawer-header__back-btn"
+  @route={{@route}}
+  @models={{or @routeModels (array)}}
+>
+  {{d-icon "chevron-left"}}
+</LinkTo>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/back-link.js b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/back-link.js
new file mode 100644
index 00000000000..d8fe6a60067
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/back-link.js
@@ -0,0 +1,6 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+
+export default class ChatDrawerHeaderBackLink extends Component {
+  @service chatStateManager;
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/channel-title.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/channel-title.hbs
new file mode 100644
index 00000000000..876e4f87358
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/channel-title.hbs
@@ -0,0 +1,33 @@
+{{#if @channel}}
+  {{#if this.chatStateManager.isDrawerExpanded}}
+    <LinkTo
+      @route={{if
+        @channel.isDirectMessageChannel
+        "chat.channel.info.settings"
+        "chat.channel.info.members"
+      }}
+      @models={{@channel.routeModels}}
+      class="chat-drawer-header__title"
+    >
+      <div class="chat-drawer-header__top-line">
+        <ChatChannelTitle @channel={{@channel}} />
+      </div>
+    </LinkTo>
+  {{else}}
+    <div
+      role="button"
+      {{on "click" @drawerActions.toggleExpand}}
+      class="chat-drawer-header__title"
+    >
+      <div class="chat-drawer-header__top-line">
+        <ChatChannelTitle @channel={{@channel}}>
+          {{#if @channel.tracking.unreadCount}}
+            <span class="chat-unread-count">
+              {{@channel.tracking.unreadCount}}
+            </span>
+          {{/if}}
+        </ChatChannelTitle>
+      </div>
+    </div>
+  {{/if}}
+{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/channel-title.js b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/channel-title.js
new file mode 100644
index 00000000000..f7c3c5152d6
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/channel-title.js
@@ -0,0 +1,6 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+
+export default class ChatDrawerChannelHeaderTitle extends Component {
+  @service chatStateManager;
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/close-button.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/close-button.hbs
new file mode 100644
index 00000000000..2c8d97aa0ca
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/close-button.hbs
@@ -0,0 +1,6 @@
+<DButton
+  @icon="times"
+  @action={{@close}}
+  @title="chat.close"
+  @class="btn-flat btn-link chat-drawer-header__close-btn"
+/>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/full-page-button.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/full-page-button.hbs
new file mode 100644
index 00000000000..9c607d7982b
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/full-page-button.hbs
@@ -0,0 +1,8 @@
+{{#if this.chatStateManager.isDrawerExpanded}}
+  <DButton
+    @icon="discourse-expand"
+    class="btn-flat btn-link chat-drawer-header__full-screen-btn"
+    @title={{"chat.open_full_page"}}
+    @action={{@openInFullPage}}
+  />
+{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/full-page-button.js b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/full-page-button.js
new file mode 100644
index 00000000000..99ad4c2927d
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/full-page-button.js
@@ -0,0 +1,6 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+
+export default class ChatDrawerHeaderFullPageButton extends Component {
+  @service chatStateManager;
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/left-actions.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/left-actions.hbs
new file mode 100644
index 00000000000..93917adec23
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/left-actions.hbs
@@ -0,0 +1,10 @@
+{{#if this.chatStateManager.isDrawerExpanded}}
+  <div class="chat-drawer-header__left-actions">
+    <div class="chat-drawer-header__top-line">
+      <ChatDrawer::Header::BackLink
+        @route="chat"
+        @title={{i18n "chat.return_to_list"}}
+      />
+    </div>
+  </div>
+{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/left-actions.js b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/left-actions.js
new file mode 100644
index 00000000000..13f45c7507f
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/left-actions.js
@@ -0,0 +1,6 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+
+export default class ChatDrawerHeaderLeftActions extends Component {
+  @service chatStateManager;
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/right-actions.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/right-actions.hbs
new file mode 100644
index 00000000000..dd13664d459
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/right-actions.hbs
@@ -0,0 +1,17 @@
+<div class="chat-drawer-header__right-actions">
+  <div class="chat-drawer-header__top-line">
+    {{#if this.showThreadsListButton}}
+      <Chat::Thread::ThreadsListButton @channel={{this.chat.activeChannel}} />
+    {{/if}}
+
+    <ChatDrawer::Header::ToggleExpandButton
+      @toggleExpand={{@drawerActions.toggleExpand}}
+    />
+
+    <ChatDrawer::Header::FullPageButton
+      @openInFullPage={{@drawerActions.openInFullPage}}
+    />
+
+    <ChatDrawer::Header::CloseButton @close={{@drawerActions.close}} />
+  </div>
+</div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/right-actions.js b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/right-actions.js
new file mode 100644
index 00000000000..48e034e6d94
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/right-actions.js
@@ -0,0 +1,10 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+
+export default class ChatDrawerHeaderRightActions extends Component {
+  @service chat;
+
+  get showThreadsListButton() {
+    return this.chat.activeChannel?.threadingEnabled;
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/title.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/title.hbs
new file mode 100644
index 00000000000..544448310b3
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/title.hbs
@@ -0,0 +1,5 @@
+<span class="chat-drawer-header__title">
+  <div class="chat-drawer-header__top-line">
+    {{i18n @title}}
+  </div>
+</span>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/toggle-expand-button.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/toggle-expand-button.hbs
new file mode 100644
index 00000000000..28d93d22fd0
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/toggle-expand-button.hbs
@@ -0,0 +1,14 @@
+<DButton
+  @icon={{if
+    this.chatStateManager.isDrawerExpanded
+    "angle-double-down"
+    "angle-double-up"
+  }}
+  @class="btn-flat btn-link chat-drawer-header__expand-btn"
+  @action={{@toggleExpand}}
+  @title={{if
+    this.chatStateManager.isDrawerExpanded
+    "chat.collapse"
+    "chat.expand"
+  }}
+/>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/toggle-expand-button.js b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/toggle-expand-button.js
new file mode 100644
index 00000000000..39a19c11777
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/toggle-expand-button.js
@@ -0,0 +1,6 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+
+export default class ChatDrawerHeaderToggleExpandButton extends Component {
+  @service chatStateManager;
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-drawer/index.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/index.hbs
new file mode 100644
index 00000000000..080e5ab4ea5
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/index.hbs
@@ -0,0 +1,15 @@
+<ChatDrawer::Header @toggleExpand={{@drawerActions.toggleExpand}}>
+  <div class="chat-drawer-header__title">
+    <div class="chat-drawer-header__top-line">
+      {{i18n "chat.heading"}}
+    </div>
+  </div>
+
+  <ChatDrawer::Header::RightActions @drawerActions={{@drawerActions}} />
+</ChatDrawer::Header>
+
+{{#if this.chatStateManager.isDrawerExpanded}}
+  <div class="chat-drawer-content">
+    <ChannelsList />
+  </div>
+{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-drawer/index.js b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/index.js
new file mode 100644
index 00000000000..c6cab84947a
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/index.js
@@ -0,0 +1,6 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+
+export default class ChatDrawerIndex extends Component {
+  @service chatStateManager;
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-drawer/thread.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/thread.hbs
new file mode 100644
index 00000000000..9b6c3930539
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/thread.hbs
@@ -0,0 +1,33 @@
+<ChatDrawer::Header @toggleExpand={{@drawerActions.toggleExpand}}>
+  {{#if (and this.chatStateManager.isDrawerExpanded this.chat.activeChannel)}}
+    <div class="chat-drawer-header__left-actions">
+      <div class="chat-drawer-header__top-line">
+        <ChatDrawer::Header::BackLink
+          @route={{this.backLink.route}}
+          @title={{i18n this.backLink.title}}
+          @routeModels={{this.backLink.models}}
+        />
+      </div>
+    </div>
+  {{/if}}
+
+  <ChatDrawer::Header::Title @title="chat.thread.label" />
+
+  <ChatDrawer::Header::RightActions @drawerActions={{@drawerActions}} />
+</ChatDrawer::Header>
+
+{{#if this.chatStateManager.isDrawerExpanded}}
+  <div
+    class="chat-drawer-content"
+    {{did-insert this.fetchChannelAndThread}}
+    {{did-update this.fetchChannelAndThread @params.channelId}}
+    {{did-update this.fetchChannelAndThread @params.threadId}}
+  >
+    {{#if this.chat.activeChannel.activeThread}}
+      <ChatThread
+        @thread={{this.chat.activeChannel.activeThread}}
+        @targetMessageId={{@params.messageId}}
+      />
+    {{/if}}
+  </div>
+{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-drawer/thread.js b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/thread.js
new file mode 100644
index 00000000000..8dd9f43f785
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/thread.js
@@ -0,0 +1,46 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+
+export default class ChatDrawerThread extends Component {
+  @service appEvents;
+  @service chat;
+  @service chatStateManager;
+  @service chatChannelsManager;
+  @service chatHistory;
+
+  get backLink() {
+    const link = {
+      models: this.chat.activeChannel.routeModels,
+    };
+
+    if (this.chatHistory.previousRoute?.name === "chat.channel.threads") {
+      link.title = "chat.return_to_threads_list";
+      link.route = "chat.channel.threads";
+    } else {
+      link.title = "chat.return_to_list";
+      link.route = "chat.channel";
+    }
+
+    return link;
+  }
+
+  @action
+  fetchChannelAndThread() {
+    if (!this.args.params?.channelId || !this.args.params?.threadId) {
+      return;
+    }
+
+    return this.chatChannelsManager
+      .find(this.args.params.channelId)
+      .then((channel) => {
+        this.chat.activeChannel = channel;
+
+        channel.threadsManager
+          .find(channel.id, this.args.params.threadId)
+          .then((thread) => {
+            this.chat.activeChannel.activeThread = thread;
+          });
+      });
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-drawer/threads.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/threads.hbs
new file mode 100644
index 00000000000..a2f592047f3
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/threads.hbs
@@ -0,0 +1,28 @@
+<ChatDrawer::Header @toggleExpand={{@drawerActions.toggleExpand}}>
+  {{#if (and this.chatStateManager.isDrawerExpanded this.chat.activeChannel)}}
+    <div class="chat-drawer-header__left-actions">
+      <div class="chat-drawer-header__top-line">
+        <ChatDrawer::Header::BackLink
+          @route="chat.channel"
+          @title={{i18n "chat.return_to_list"}}
+          @routeModels={{this.chat.activeChannel.routeModels}}
+        />
+      </div>
+    </div>
+  {{/if}}
+
+  <ChatDrawer::Header::Title @title="chat.threads.list" />
+
+  <ChatDrawer::Header::RightActions @drawerActions={{@drawerActions}} />
+</ChatDrawer::Header>
+
+{{#if this.chatStateManager.isDrawerExpanded}}
+  <div class="chat-drawer-content" {{did-insert this.fetchChannel}}>
+    {{#if this.chat.activeChannel}}
+      <Chat::ThreadList
+        @channel={{this.chat.activeChannel}}
+        @includeHeader={{false}}
+      />
+    {{/if}}
+  </div>
+{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-drawer/threads.js b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/threads.js
new file mode 100644
index 00000000000..ad13a3922a1
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/threads.js
@@ -0,0 +1,23 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+
+export default class ChatDrawerThreads extends Component {
+  @service appEvents;
+  @service chat;
+  @service chatStateManager;
+  @service chatChannelsManager;
+
+  @action
+  fetchChannel() {
+    if (!this.args.params?.channelId) {
+      return;
+    }
+
+    return this.chatChannelsManager
+      .find(this.args.params.channelId)
+      .then((channel) => {
+        this.chat.activeChannel = channel;
+      });
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-emoji-picker.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-emoji-picker.hbs
index 4b6273b5aa3..f8589e43640 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-emoji-picker.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-emoji-picker.hbs
@@ -1,170 +1,135 @@
 {{! template-lint-disable no-invalid-interactive }}
 {{! template-lint-disable no-nested-interactive }}
-{{! template-lint-disable no-down-event-binding }}
-<div
-  class={{concat-class
-    "chat-emoji-picker"
-    (if this.chatEmojiPickerManager.closing "closing")
-  }}
-  {{did-insert this.addClickOutsideEventListener}}
-  {{will-destroy this.removeClickOutsideEventListener}}
-  {{on "keydown" this.trapKeyDownEvents}}
->
-  <div class="chat-emoji-picker__filter-container">
-    <DcFilterInput
-      @class="chat-emoji-picker__filter"
-      @filterAction={{this.didInputFilter}}
-      @icons={{hash left="search"}}
-      placeholder={{i18n "chat.emoji_picker.search_placeholder"}}
-      autofocus={{true}}
-      {{did-insert this.focusFilter}}
-    >
-      <div
-        class="chat-emoji-picker__fitzpatrick-scale"
-        role="toolbar"
-        {{on "keyup" this.didNavigateFitzpatrickScale}}
+{{! template-lint-disable no-pointer-down-event-binding }}
+
+{{#if (eq this.chatEmojiPickerManager.picker.context @context)}}
+  <div
+    class={{concat-class
+      "chat-emoji-picker"
+      @class
+      (if this.chatEmojiPickerManager.closing "closing")
+    }}
+    {{did-insert this.addClickOutsideEventListener}}
+    {{did-insert this.chatEmojiPickerManager.loadEmojis}}
+    {{did-insert (if @didInsert @didInsert (noop))}}
+    {{will-destroy (if @willDestroy @willDestroy (noop))}}
+    {{will-destroy this.removeClickOutsideEventListener}}
+    {{on "keydown" this.trapKeyDownEvents}}
+  >
+    <div class="chat-emoji-picker__filter-container">
+      <DcFilterInput
+        @class="chat-emoji-picker__filter"
+        @value={{this.chatEmojiPickerManager.picker.initialFilter}}
+        @filterAction={{action this.didInputFilter value="target.value"}}
+        @icons={{hash left="search"}}
+        placeholder={{i18n "chat.emoji_picker.search_placeholder"}}
+        autofocus={{true}}
+        {{did-insert (if this.site.desktopView this.focusFilter (noop))}}
+        {{did-insert
+          (fn
+            this.didInputFilter this.chatEmojiPickerManager.picker.initialFilter
+          )
+        }}
       >
-        {{#if this.isExpandedFitzpatrickScale}}
-          {{#each this.fitzpatrickModifiers as |fitzpatrick|}}
-
-            {{#if
-              (not (eq fitzpatrick.scale this.chatEmojiReactionStore.diversity))
-            }}
-              <button
-                type="button"
-                title={{concat "t" fitzpatrick.scale}}
-                tabindex="-1"
-                class={{concat-class
-                  "chat-emoji-picker__fitzpatrick-modifier-btn"
-                  (concat "t" fitzpatrick.scale)
-                }}
-                {{on
-                  "keyup"
-                  (fn this.didRequestFitzpatrickScale fitzpatrick.scale)
-                }}
-                {{on
-                  "click"
-                  (fn this.didRequestFitzpatrickScale fitzpatrick.scale)
-                }}
-              >
-                {{d-icon "check"}}
-              </button>
-            {{/if}}
-          {{/each}}
-        {{/if}}
-
-        <button
-          type="button"
-          title={{concat "t" this.fitzpatrick.scale}}
-          class={{concat-class
-            "chat-emoji-picker__fitzpatrick-modifier-btn current"
-            (concat "t" this.chatEmojiReactionStore.diversity)
-          }}
-          {{on "keyup" this.didToggleFitzpatrickScale}}
-          {{on "click" this.didToggleFitzpatrickScale}}
-        ></button>
-      </div>
-    </DcFilterInput>
-  </div>
-
-  {{#if this.chatEmojiPickerManager.sections.length}}
-    {{#if (not (gte this.filteredEmojis.length 0))}}
-      <div class="chat-emoji-picker__sections-nav">
         <div
-          class="chat-emoji-picker__sections-nav__indicator"
-          style={{this.navIndicatorStyle}}
-        ></div>
+          class="chat-emoji-picker__fitzpatrick-scale"
+          role="toolbar"
+          {{on "keyup" this.didNavigateFitzpatrickScale}}
+        >
+          {{#if this.isExpandedFitzpatrickScale}}
+            {{#each this.fitzpatrickModifiers as |fitzpatrick|}}
 
-        {{#each-in this.groups as |section emojis|}}
-          <DButton
+              {{#if
+                (not-eq fitzpatrick.scale this.chatEmojiReactionStore.diversity)
+              }}
+                <button
+                  type="button"
+                  title={{concat "t" fitzpatrick.scale}}
+                  tabindex="-1"
+                  class={{concat-class
+                    "chat-emoji-picker__fitzpatrick-modifier-btn"
+                    (concat "t" fitzpatrick.scale)
+                  }}
+                  {{on
+                    "keyup"
+                    (fn this.didRequestFitzpatrickScale fitzpatrick.scale)
+                  }}
+                  {{on
+                    "click"
+                    (fn this.didRequestFitzpatrickScale fitzpatrick.scale)
+                  }}
+                >
+                  {{d-icon "check"}}
+                </button>
+              {{/if}}
+            {{/each}}
+          {{/if}}
+
+          <button
+            type="button"
+            title={{concat "t" this.fitzpatrick.scale}}
             class={{concat-class
-              "btn-flat"
-              "chat-emoji-picker__section-btn"
-              (if
-                (eq this.chatEmojiPickerManager.lastVisibleSection section)
-                "active"
-              )
+              "chat-emoji-picker__fitzpatrick-modifier-btn current"
+              (concat "t" this.chatEmojiReactionStore.diversity)
             }}
-            tabindex="-1"
-            style={{this.navBtnStyle}}
-            @action={{fn this.didRequestSection section}}
-            data-section={{section}}
-          >
-            {{#if (eq section "favorites")}}
-              {{replace-emoji ":star:"}}
-            {{else}}
-              <img
-                width="18"
-                height="18"
-                class="emoji"
-                src={{emojis.firstObject.url}}
-              />
-            {{/if}}
-          </DButton>
-        {{/each-in}}
-      </div>
-    {{/if}}
+            {{on "keyup" this.didToggleFitzpatrickScale}}
+            {{on "click" this.didToggleFitzpatrickScale}}
+          ></button>
+        </div>
+      </DcFilterInput>
+    </div>
 
-    <div
-      class="chat-emoji-picker__scrollable-content"
-      {{chat/emoji-picker-scroll-listener}}
-    >
-      <div
-        class="chat-emoji-picker__sections"
-        {{on "click" this.didSelectEmoji}}
-        {{on "keydown" this.didSelectEmoji}}
-        role="button"
-      >
-        {{#if (gte this.filteredEmojis.length 0)}}
-          {{#each this.filteredEmojis as |emoji|}}
-            <img
-              width="32"
-              height="32"
-              class="emoji"
-              src={{tonable-emoji-url
-                emoji
-                this.chatEmojiReactionStore.diversity
-              }}
-              tabindex="0"
-              data-emoji={{emoji.name}}
-              data-tonable={{if emoji.tonable "true"}}
-              alt={{emoji.name}}
-              title={{tonable-emoji-title
-                emoji
-                this.chatEmojiReactionStore.diversity
-              }}
-              loading="lazy"
-            />
-          {{else}}
-            <p class="chat-emoji-picker__no-reults">
-              {{i18n "chat.emoji_picker.no_results"}}
-            </p>
-          {{/each}}
-        {{/if}}
-
-        {{#each-in this.groups as |section emojis|}}
+    {{#if this.chatEmojiPickerManager.sections.length}}
+      {{#if (eq this.filteredEmojis null)}}
+        <div class="chat-emoji-picker__sections-nav">
           <div
-            class={{concat-class
-              "chat-emoji-picker__section"
-              (if (gte this.filteredEmojis.length 0) "hidden")
-            }}
-            data-section={{section}}
-            role="region"
-            aria-label={{i18n
-              (concat "chat.emoji_picker." section)
-              translatedFallback=section
-            }}
-            {{on "keydown" this.didNavigateSection}}
-          >
-            <h2 class="chat-emoji-picker__section-title">
-              {{i18n
-                (concat "chat.emoji_picker." section)
-                translatedFallback=section
+            class="chat-emoji-picker__sections-nav__indicator"
+            style={{this.navIndicatorStyle}}
+          ></div>
+
+          {{#each-in this.groups as |section emojis|}}
+            <DButton
+              class={{concat-class
+                "btn-flat"
+                "chat-emoji-picker__section-btn"
+                (if
+                  (eq this.chatEmojiPickerManager.lastVisibleSection section)
+                  "active"
+                )
               }}
-            </h2>
-            <div class="chat-emoji-picker__section-emojis">
-              {{! we always want the first emoji for tabbing}}
-              {{#let emojis.firstObject as |emoji|}}
+              tabindex="-1"
+              style={{this.navBtnStyle}}
+              @action={{fn this.didRequestSection section}}
+              data-section={{section}}
+            >
+              {{#if (eq section "favorites")}}
+                {{replace-emoji ":star:"}}
+              {{else}}
+                <img
+                  width="18"
+                  height="18"
+                  class="emoji"
+                  src={{emojis.firstObject.url}}
+                />
+              {{/if}}
+            </DButton>
+          {{/each-in}}
+        </div>
+      {{/if}}
+
+      <div
+        class="chat-emoji-picker__scrollable-content"
+        {{chat/emoji-picker-scroll-listener}}
+      >
+        <div
+          class="chat-emoji-picker__sections"
+          {{on "click" this.didSelectEmoji}}
+          {{on "keydown" this.onSectionsKeyDown}}
+          role="button"
+        >
+          {{#if (not-eq this.filteredEmojis null)}}
+            <div class="chat-emoji-picker__section filtered">
+              {{#each this.filteredEmojis as |emoji|}}
                 <img
                   width="32"
                   height="32"
@@ -182,53 +147,100 @@
                     this.chatEmojiReactionStore.diversity
                   }}
                   loading="lazy"
-                  {{on "focus" this.didFocusFirstEmoji}}
                 />
-              {{/let}}
-
-              {{#if
-                (includes this.chatEmojiPickerManager.visibleSections section)
-              }}
-                {{#each emojis as |emoji index|}}
-                  {{! first emoji has already been rendered, we don't want to re render or would lose focus}}
-                  {{#if (gt index 0)}}
-                    <img
-                      width="32"
-                      height="32"
-                      class="emoji"
-                      src={{tonable-emoji-url
-                        emoji
-                        this.chatEmojiReactionStore.diversity
-                      }}
-                      tabindex="-1"
-                      data-emoji={{emoji.name}}
-                      data-tonable={{if emoji.tonable "true"}}
-                      alt={{emoji.name}}
-                      title={{tonable-emoji-title
-                        emoji
-                        this.chatEmojiReactionStore.diversity
-                      }}
-                      loading="lazy"
-                    />
-                  {{/if}}
-                {{/each}}
-              {{/if}}
+              {{else}}
+                <p class="chat-emoji-picker__no-results">
+                  {{i18n "chat.emoji_picker.no_results"}}
+                </p>
+              {{/each}}
             </div>
-          </div>
-        {{/each-in}}
-      </div>
-    </div>
-  {{else}}
-    <div class="spinner medium"></div>
-  {{/if}}
-</div>
+          {{/if}}
 
-{{#if
-  (and
-    this.chatEmojiPickerManager.opened
-    this.site.mobileView
-    (eq this.chatEmojiPickerManager.context "chat-message")
-  )
-}}
-  <div class="chat-emoji-picker__backdrop"></div>
+          {{#each-in this.groups as |section emojis|}}
+            <div
+              class={{concat-class
+                "chat-emoji-picker__section"
+                (if (not-eq this.filteredEmojis null) "hidden")
+              }}
+              data-section={{section}}
+              role="region"
+              aria-label={{i18n
+                (concat "chat.emoji_picker." section)
+                translatedFallback=section
+              }}
+            >
+              <h2 class="chat-emoji-picker__section-title">
+                {{i18n
+                  (concat "chat.emoji_picker." section)
+                  translatedFallback=section
+                }}
+              </h2>
+              <div class="chat-emoji-picker__section-emojis">
+                {{! we always want the first emoji for tabbing}}
+                {{#let emojis.firstObject as |emoji|}}
+                  <img
+                    width="32"
+                    height="32"
+                    class="emoji"
+                    src={{tonable-emoji-url
+                      emoji
+                      this.chatEmojiReactionStore.diversity
+                    }}
+                    tabindex="0"
+                    data-emoji={{emoji.name}}
+                    data-tonable={{if emoji.tonable "true"}}
+                    alt={{emoji.name}}
+                    title={{tonable-emoji-title
+                      emoji
+                      this.chatEmojiReactionStore.diversity
+                    }}
+                    loading="lazy"
+                  />
+                {{/let}}
+
+                {{#if
+                  (includes this.chatEmojiPickerManager.visibleSections section)
+                }}
+                  {{#each emojis as |emoji index|}}
+                    {{! first emoji has already been rendered, we don't want to re render or would lose focus}}
+                    {{#if (gt index 0)}}
+                      <img
+                        width="32"
+                        height="32"
+                        class="emoji"
+                        src={{tonable-emoji-url
+                          emoji
+                          this.chatEmojiReactionStore.diversity
+                        }}
+                        tabindex="-1"
+                        data-emoji={{emoji.name}}
+                        data-tonable={{if emoji.tonable "true"}}
+                        alt={{emoji.name}}
+                        title={{tonable-emoji-title
+                          emoji
+                          this.chatEmojiReactionStore.diversity
+                        }}
+                        loading="lazy"
+                      />
+                    {{/if}}
+                  {{/each}}
+                {{/if}}
+              </div>
+            </div>
+          {{/each-in}}
+        </div>
+      </div>
+    {{else}}
+      <div class="spinner medium"></div>
+    {{/if}}
+  </div>
+
+  {{#if
+    (and
+      this.site.mobileView
+      (eq this.chatEmojiPickerManager.picker.context "chat-channel-message")
+    )
+  }}
+    <div class="chat-emoji-picker__backdrop"></div>
+  {{/if}}
 {{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-emoji-picker.js b/plugins/chat/assets/javascripts/discourse/components/chat-emoji-picker.js
index 8cf3ef88eed..482472b21da 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-emoji-picker.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-emoji-picker.js
@@ -1,4 +1,4 @@
-import Component from "@ember/component";
+import Component from "@glimmer/component";
 import { htmlSafe } from "@ember/template";
 import { action } from "@ember/object";
 import { inject as service } from "@ember/service";
@@ -40,22 +40,26 @@ export default class ChatEmojiPicker extends Component {
   @service chatEmojiPickerManager;
   @service emojiPickerScrollObserver;
   @service chatEmojiReactionStore;
+  @service capabilities;
+  @service site;
+
   @tracked filteredEmojis = null;
   @tracked isExpandedFitzpatrickScale = false;
-  tagName = "";
 
   fitzpatrickModifiers = FITZPATRICK_MODIFIERS;
 
   get groups() {
     const emojis = this.chatEmojiPickerManager.emojis;
     const favorites = {
-      favorites: this.chatEmojiReactionStore.favorites.map((name) => {
-        return {
-          name,
-          group: "favorites",
-          url: emojiUrlFor(name),
-        };
-      }),
+      favorites: this.chatEmojiReactionStore.favorites
+        .filter((f) => !this.site.denied_emojis?.includes(f))
+        .map((name) => {
+          return {
+            name,
+            group: "favorites",
+            url: emojiUrlFor(name),
+          };
+        }),
     };
 
     return {
@@ -65,6 +69,10 @@ export default class ChatEmojiPicker extends Component {
   }
 
   get flatEmojis() {
+    if (!this.chatEmojiPickerManager.emojis) {
+      return [];
+    }
+
     // eslint-disable-next-line no-unused-vars
     let { favorites, ...rest } = this.chatEmojiPickerManager.emojis;
     return Object.values(rest).flat();
@@ -159,7 +167,7 @@ export default class ChatEmojiPicker extends Component {
       }
     }
 
-    this.toggleProperty("isExpandedFitzpatrickScale");
+    this.isExpandedFitzpatrickScale = !this.isExpandedFitzpatrickScale;
   }
 
   @action
@@ -195,23 +203,20 @@ export default class ChatEmojiPicker extends Component {
   }
 
   @action
-  didInputFilter(event) {
-    if (!event.target.value.length) {
+  didInputFilter(value) {
+    if (!value?.length) {
       this.filteredEmojis = null;
       return;
     }
 
-    discourseDebounce(
-      this,
-      this.debouncedDidInputFilter,
-      event.target.value,
-      INPUT_DELAY
-    );
+    discourseDebounce(this, this.debouncedDidInputFilter, value, INPUT_DELAY);
   }
 
   @action
   focusFilter(target) {
-    target.focus();
+    schedule("afterRender", () => {
+      target?.focus();
+    });
   }
 
   debouncedDidInputFilter(filter = "") {
@@ -236,6 +241,15 @@ export default class ChatEmojiPicker extends Component {
     });
   }
 
+  @action
+  onSectionsKeyDown(event) {
+    if (event.key === "Enter") {
+      this.didSelectEmoji(event);
+    } else {
+      this.didNavigateSection(event);
+    }
+  }
+
   @action
   didNavigateSection(event) {
     const sectionsEmojis = (section) => [...section.querySelectorAll(".emoji")];
@@ -252,7 +266,7 @@ export default class ChatEmojiPicker extends Component {
     };
     const allEmojis = () => [
       ...document.querySelectorAll(
-        ".chat-emoji-picker__scrollable-content .emoji"
+        ".chat-emoji-picker__section:not(.hidden) .emoji"
       ),
     ];
 
@@ -339,19 +353,10 @@ export default class ChatEmojiPicker extends Component {
         emoji = `${emoji}:t${diversity}`;
       }
 
-      this.chatEmojiPickerManager.didSelectEmoji(emoji);
-      this.appEvents.trigger("chat:focus-composer");
+      this.args.didSelectEmoji?.(emoji);
     }
   }
 
-  @action
-  didFocusFirstEmoji(event) {
-    event.preventDefault();
-    const section = event.target.closest(".chat-emoji-picker__section").dataset
-      .section;
-    this.didRequestSection(section);
-  }
-
   @action
   didRequestSection(section) {
     const scrollableContent = document.querySelector(
@@ -374,13 +379,18 @@ export default class ChatEmojiPicker extends Component {
     }
 
     schedule("afterRender", () => {
-      document
-        .querySelector(`.chat-emoji-picker__section[data-section="${section}"]`)
-        .scrollIntoView({
-          behavior: "auto",
-          block: "start",
-          inline: "nearest",
-        });
+      const firstEmoji = document.querySelector(
+        `.chat-emoji-picker__section[data-section="${section}"] .emoji:nth-child(1)`
+      );
+
+      const targetEmoji =
+        [
+          ...document.querySelectorAll(
+            `.chat-emoji-picker__section[data-section="${section}"] .emoji`
+          ),
+        ].find((emoji) => emoji.offsetTop > firstEmoji.offsetTop) || firstEmoji;
+
+      targetEmoji.focus();
 
       later(() => {
         // iOS hack to avoid blank div when requesting section during momentum
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-full-page-header.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-full-page-header.hbs
new file mode 100644
index 00000000000..304b9bc5549
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-full-page-header.hbs
@@ -0,0 +1,48 @@
+{{#if (and this.chatStateManager.isFullPageActive this.displayed)}}
+  <div
+    class={{concat-class
+      "chat-full-page-header"
+      (unless @channel.isFollowing "-not-following")
+    }}
+  >
+    <div class="chat-channel-header-details">
+      {{#if this.site.mobileView}}
+        <div class="chat-full-page-header__left-actions">
+          <LinkTo
+            @route="chat"
+            class="chat-full-page-header__back-btn no-text btn-flat"
+          >
+            {{d-icon "chevron-left"}}
+          </LinkTo>
+        </div>
+      {{/if}}
+
+      <LinkTo
+        @route="chat.channel.info"
+        @models={{@channel.routeModels}}
+        class="chat-channel-title-wrapper"
+      >
+        <ChatChannelTitle @channel={{@channel}} />
+      </LinkTo>
+
+      {{#if (or @channel.threadingEnabled this.site.desktopView)}}
+        <div class="chat-full-page-header__right-actions">
+          {{#if this.site.desktopView}}
+            <DButton
+              @icon="discourse-compress"
+              @title="chat.close_full_page"
+              class="open-drawer-btn btn-flat"
+              @action={{@onCloseFullScreen}}
+            />
+          {{/if}}
+
+          {{#if this.showThreadsListButton}}
+            <Chat::Thread::ThreadsListButton @channel={{@channel}} />
+          {{/if}}
+        </div>
+      {{/if}}
+    </div>
+  </div>
+
+  <ChatChannelStatus @channel={{@channel}} />
+{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-full-page-header.js b/plugins/chat/assets/javascripts/discourse/components/chat-full-page-header.js
new file mode 100644
index 00000000000..055ed2d0368
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-full-page-header.js
@@ -0,0 +1,20 @@
+import { inject as service } from "@ember/service";
+import Component from "@glimmer/component";
+
+export default class ChatFullPageHeader extends Component {
+  @service site;
+  @service chatStateManager;
+  @service router;
+
+  get displayed() {
+    return this.args.displayed ?? true;
+  }
+
+  get showThreadsListButton() {
+    return (
+      this.args.channel.threadingEnabled &&
+      this.router.currentRoute.name !== "chat.channel.threads" &&
+      this.router.currentRoute.name !== "chat.channel.thread"
+    );
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-header-icon-unread-indicator.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-header-icon-unread-indicator.hbs
deleted file mode 100644
index 06da5981c31..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/chat-header-icon-unread-indicator.hbs
+++ /dev/null
@@ -1,9 +0,0 @@
-{{#if (gt this.chatChannelsManager.unreadUrgentCount 0)}}
-  <div class="chat-channel-unread-indicator urgent">
-    <div class="number-wrap">
-      <div class="number">{{this.chatChannelsManager.unreadUrgentCount}}</div>
-    </div>
-  </div>
-{{else if (gt this.chatChannelsManager.unreadCount 0)}}
-  <div class="chat-channel-unread-indicator"></div>
-{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-header-icon-unread-indicator.js b/plugins/chat/assets/javascripts/discourse/components/chat-header-icon-unread-indicator.js
deleted file mode 100644
index df39429e489..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/chat-header-icon-unread-indicator.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import { inject as service } from "@ember/service";
-import Component from "@glimmer/component";
-
-export default class ChatHeaderIconUnreadIndicator extends Component {
-  @service chatChannelsManager;
-}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-header-icon.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-header-icon.hbs
deleted file mode 100644
index c363c95fe96..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/chat-header-icon.hbs
+++ /dev/null
@@ -1,21 +0,0 @@
-{{#if (and this.chatStateManager.isFullPageActive this.site.desktopView)}}
-  <span class={{concat-class "icon" (if this.isActive "active")}}>
-    {{d-icon "comment"}}
-
-    {{#unless this.currentUserInDnD}}
-      <ChatHeaderIconUnreadIndicator />
-    {{/unless}}
-  </span>
-{{else}}
-  <a
-    href={{this.href}}
-    tabindex="0"
-    class={{concat-class "icon" (if this.isActive "active")}}
-  >
-    {{d-icon "comment"}}
-
-    {{#unless this.currentUserInDnD}}
-      <ChatHeaderIconUnreadIndicator />
-    {{/unless}}
-  </a>
-{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-live-pane.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-live-pane.hbs
deleted file mode 100644
index bf9154bc6b6..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/chat-live-pane.hbs
+++ /dev/null
@@ -1,155 +0,0 @@
-{{#if (and this.chatStateManager.isFullPageActive this.includeHeader)}}
-  <div
-    class="chat-full-page-header
-      {{unless this.chatChannel.isFollowing '-not-following'}}"
-  >
-    <div class="chat-channel-header-details">
-      {{#if this.site.mobileView}}
-        <div class="chat-full-page-header__left-actions">
-          <DButton
-            @class="chat-full-page-header__back-btn no-text btn-flat"
-            @icon="chevron-left"
-            @action={{this.onBackClick}}
-          />
-        </div>
-      {{/if}}
-
-      <LinkTo
-        @route={{this.infoTabRoute}}
-        @models={{array this.chatChannel.id (slugify-channel this.chatChannel)}}
-        class="chat-channel-title-wrapper"
-      >
-        <ChatChannelTitle @channel={{this.chatChannel}} />
-      </LinkTo>
-
-      {{#if this.showCloseFullScreenBtn}}
-        <div class="chat-full-page-header__right-actions">
-          <DButton
-            @icon="discourse-compress"
-            @title="chat.close_full_page"
-            class="open-drawer-btn btn-flat no-text"
-            @action={{action this.onCloseFullScreen}}
-          />
-        </div>
-      {{/if}}
-    </div>
-  </div>
-
-  <ChatChannelStatus @channel={{this.chatChannel}} />
-{{/if}}
-
-<ChatRetentionReminder @chatChannel={{this.chatChannel}} />
-
-<ChatMentionWarnings
-  @unreachableGroupMentions={{this.unreachableGroupMentions}}
-  @overMembersLimitGroupMentions={{this.overMembersLimitGroupMentions}}
-  @tooManyMentions={{this.tooManyMentions}}
-  @mentionsCount={{this.mentionsCount}}
-/>
-
-<div class="chat-message-actions-mobile-anchor"></div>
-<div
-  class={{concat-class
-    "chat-message-emoji-picker-anchor"
-    (if
-      (and
-        this.chatEmojiPickerManager.opened
-        (eq this.chatEmojiPickerManager.context "chat-message")
-      )
-      "-opened"
-    )
-  }}
->
-</div>
-
-<div class="chat-messages-scroll chat-messages-container">
-  <div class="chat-message-actions-desktop-anchor"></div>
-  <div class="chat-messages-container">
-    {{#if (or this.loading this.loadingMorePast)}}
-      <ChatSkeleton @tagName="" />
-    {{/if}}
-
-    {{#each this.messages as |message|}}
-      <ChatMessage
-        @message={{message}}
-        @canInteractWithChat={{this.canInteractWithChat}}
-        @details={{this.details}}
-        @chatChannel={{this.chatChannel}}
-        @setReplyTo={{action "setReplyTo"}}
-        @replyMessageClicked={{action "replyMessageClicked"}}
-        @editButtonClicked={{action "editButtonClicked"}}
-        @selectingMessages={{this.selectingMessages}}
-        @onStartSelectingMessages={{this.onStartSelectingMessages}}
-        @onSelectMessage={{this.onSelectMessage}}
-        @bulkSelectMessages={{this.bulkSelectMessages}}
-        @fullPage={{this.fullPage}}
-        @afterReactionAdded={{action "reStickScrollIfNeeded"}}
-        @isHovered={{eq message.id this.hoveredMessageId}}
-        @onHoverMessage={{action "onHoverMessage"}}
-        @onSwitchChannel={{this.onSwitchChannel}}
-        @resendStagedMessage={{this.resendStagedMessage}}
-      />
-    {{/each}}
-
-    {{#if this.loadingMoreFuture}}
-      <ChatSkeleton @tagName="" />
-    {{/if}}
-  </div>
-
-  {{#if this.allPastMessagesLoaded}}
-    <div class="all-loaded-message">
-      {{i18n "chat.all_loaded"}}
-    </div>
-  {{/if}}
-</div>
-
-{{#if this.showScrollToBottomBtn}}
-  <div class="scroll-stick-wrap">
-    <a
-      href
-      title={{i18n "chat.scroll_to_bottom"}}
-      class={{concat-class
-        "btn"
-        "btn-flat"
-        "chat-scroll-to-bottom"
-        (if this.hasNewMessages "unread-messages")
-      }}
-      {{on "click" (action "restickScrolling")}}
-    >
-      {{#if this.hasNewMessages}}
-        {{i18n "chat.scroll_to_new_messages"}}
-      {{/if}}
-      {{d-icon "arrow-down"}}
-    </a>
-  </div>
-{{/if}}
-
-{{#if this.selectingMessages}}
-  <ChatSelectionManager
-    @selectedMessageIds={{this.selectedMessageIds}}
-    @chatChannel={{this.chatChannel}}
-    @canModerate={{this.details.can_moderate}}
-    @cancelSelecting={{action "cancelSelecting"}}
-  />
-{{else}}
-  {{#if (or this.chatChannel.isDraft this.chatChannel.isFollowing)}}
-    <ChatComposer
-      @draft={{this.draft}}
-      @details={{this.details}}
-      @canInteractWithChat={{this.canInteractWithChat}}
-      @sendMessage={{action "sendMessage"}}
-      @editMessage={{action "editMessage"}}
-      @setReplyTo={{action "setReplyTo"}}
-      @loading={{this.sendingLoading}}
-      @editingMessage={{readonly this.editingMessage}}
-      @onCancelEditing={{this.cancelEditing}}
-      @setInReplyToMsg={{this.setInReplyToMsg}}
-      @onEditLastMessageRequested={{this.editLastMessageRequested}}
-      @onValueChange={{action "composerValueChanged"}}
-      @chatChannel={{this.chatChannel}}
-      @onMentionUpdates={{this.updateMentions}}
-    />
-  {{else}}
-    <ChatChannelPreviewCard @channel={{this.chatChannel}} />
-  {{/if}}
-{{/if}}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-live-pane.js b/plugins/chat/assets/javascripts/discourse/components/chat-live-pane.js
deleted file mode 100644
index 42fdf413451..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/chat-live-pane.js
+++ /dev/null
@@ -1,1570 +0,0 @@
-import isElementInViewport from "discourse/lib/is-element-in-viewport";
-import { cloneJSON } from "discourse-common/lib/object";
-import ChatMessage from "discourse/plugins/chat/discourse/models/chat-message";
-import Component from "@ember/component";
-import discourseComputed, {
-  afterRender,
-  bind,
-  debounce,
-  observes,
-} from "discourse-common/utils/decorators";
-import discourseDebounce from "discourse-common/lib/debounce";
-import EmberObject, { action } from "@ember/object";
-import I18n from "I18n";
-import { A } from "@ember/array";
-import { ajax } from "discourse/lib/ajax";
-import { popupAjaxError } from "discourse/lib/ajax-error";
-import { cancel, next, schedule, throttle } from "@ember/runloop";
-import discourseLater from "discourse-common/lib/later";
-import { inject as service } from "@ember/service";
-import { Promise } from "rsvp";
-import { resetIdle } from "discourse/lib/desktop-notifications";
-import { capitalize } from "@ember/string";
-import {
-  onPresenceChange,
-  removeOnPresenceChange,
-} from "discourse/lib/user-presence";
-import isZoomed from "discourse/plugins/chat/discourse/lib/zoom-check";
-import { isTesting } from "discourse-common/config/environment";
-
-const MAX_RECENT_MSGS = 100;
-const STICKY_SCROLL_LENIENCE = 50;
-const PAGE_SIZE = 50;
-
-const SCROLL_HANDLER_THROTTLE_MS = isTesting() ? 0 : 100;
-const FETCH_MORE_MESSAGES_THROTTLE_MS = isTesting() ? 0 : 500;
-
-const PAST = "past";
-const FUTURE = "future";
-
-const MENTION_RESULT = {
-  invalid: -1,
-  unreachable: 0,
-  over_members_limit: 1,
-};
-
-export default Component.extend({
-  classNameBindings: [":chat-live-pane", "sendingLoading", "loading"],
-  chatChannel: null,
-  registeredChatChannelId: null, // ?Number
-  loading: false,
-  loadingMorePast: false,
-  loadingMoreFuture: false,
-  hoveredMessageId: null,
-  onSwitchChannel: null,
-
-  allPastMessagesLoaded: false,
-  sendingLoading: false,
-  selectingMessages: false,
-  stickyScroll: true,
-  stickyScrollTimer: null,
-  showChatQuoteSuccess: false,
-  showCloseFullScreenBtn: false,
-  includeHeader: true,
-
-  editingMessage: null, // ?Message
-  replyToMsg: null, // ?Message
-  details: null, // Object { chat_channel_id,  ... }
-  messages: null, // Array
-  messageLookup: null, // Object<Number, Message>
-  _unloadedReplyIds: null, // Array
-  _nextStagedMessageId: 0, // Iterate on every new message
-  _lastSelectedMessage: null,
-  targetMessageId: null,
-  hasNewMessages: null,
-
-  // Track mention hints to display warnings
-  unreachableGroupMentions: null, // Array
-  overMembersLimitGroupMentions: null, // Array
-  tooManyMentions: false,
-  mentionsCount: null,
-  // Complimentary structure to avoid repeating mention checks.
-  _mentionWarningsSeen: null, // Hash
-
-  chat: service(),
-  chatChannelsManager: service(),
-  router: service(),
-  chatEmojiPickerManager: service(),
-  chatComposerPresenceManager: service(),
-  chatStateManager: service(),
-  chatApi: service(),
-
-  getCachedChannelDetails: null,
-  clearCachedChannelDetails: null,
-  _scrollerEl: null,
-
-  init() {
-    this._super(...arguments);
-
-    this.set("messages", []);
-    this.set("_mentionWarningsSeen", {});
-    this.set("unreachableGroupMentions", []);
-    this.set("overMembersLimitGroupMentions", []);
-  },
-
-  didInsertElement() {
-    this._super(...arguments);
-
-    this._unloadedReplyIds = [];
-    this.appEvents.on(
-      "chat-live-pane:highlight-message",
-      this,
-      "highlightOrFetchMessage"
-    );
-
-    this._scrollerEl = this.element.querySelector(".chat-messages-scroll");
-    this._scrollerEl.addEventListener("scroll", this.onScrollHandler, {
-      passive: true,
-    });
-    window.addEventListener("resize", this.onResizeHandler);
-    window.addEventListener("wheel", this.onScrollHandler, {
-      passive: true,
-    });
-
-    this.appEvents.on("chat:cancel-message-selection", this, "cancelSelecting");
-
-    this.set("showCloseFullScreenBtn", !this.site.mobileView);
-
-    document.addEventListener("scroll", this._forceBodyScroll, {
-      passive: true,
-    });
-
-    onPresenceChange({
-      callback: this.onPresenceChangeCallback,
-    });
-  },
-
-  willDestroyElement() {
-    this._super(...arguments);
-
-    this.element
-      .querySelector(".chat-messages-scroll")
-      ?.removeEventListener("scroll", this.onScrollHandler);
-
-    window.removeEventListener("resize", this.onResizeHandler);
-    window.removeEventListener("wheel", this.onScrollHandler);
-
-    this.appEvents.off(
-      "chat-live-pane:highlight-message",
-      this,
-      "highlightOrFetchMessage"
-    );
-
-    // don't need to removeEventListener from scroller as the DOM element goes away
-    cancel(this.stickyScrollTimer);
-
-    cancel(this.resizeHandler);
-
-    this._resetChannelState();
-    this._unloadedReplyIds = null;
-    this.appEvents.off(
-      "chat:cancel-message-selection",
-      this,
-      "cancelSelecting"
-    );
-
-    document.removeEventListener("scroll", this._forceBodyScroll);
-
-    removeOnPresenceChange(this.onPresenceChangeCallback);
-  },
-
-  didReceiveAttrs() {
-    this._super(...arguments);
-
-    this.currentUserTimezone = this.currentUser?.user_option.timezone;
-
-    if (
-      this.chatChannel?.id &&
-      this.registeredChatChannelId !== this.chatChannel.id
-    ) {
-      this._resetChannelState();
-      this.cancelEditing();
-
-      if (!this.chatChannel.isDraft) {
-        this.loadDraftForChannel(this.chatChannel.id);
-      }
-    }
-
-    if (this.chatChannel?.id) {
-      this.fetchMessages(this.chatChannel);
-    }
-  },
-
-  @discourseComputed("chatChannel.isDirectMessageChannel")
-  displayMembers(isDirectMessageChannel) {
-    return !isDirectMessageChannel;
-  },
-
-  @discourseComputed("displayMembers")
-  infoTabRoute(displayMembers) {
-    if (displayMembers) {
-      return "chat.channel.info.members";
-    }
-
-    return "chat.channel.info.settings";
-  },
-
-  @bind
-  onScrollHandler(event) {
-    throttle(this, this.onScroll, event, SCROLL_HANDLER_THROTTLE_MS, true);
-  },
-
-  @bind
-  onResizeHandler() {
-    cancel(this.resizeHandler);
-    this.resizeHandler = discourseDebounce(
-      this,
-      this.fillPaneAttempt,
-      this.details,
-      250
-    );
-  },
-
-  @bind
-  onPresenceChangeCallback(present) {
-    if (present) {
-      this.chat.updateLastReadMessage();
-    }
-  },
-
-  @debounce(100)
-  fetchMessages(channel, options = {}) {
-    if (this._selfDeleted) {
-      return;
-    }
-
-    this.set("loading", true);
-
-    return this.chat.loadCookFunction(this.site.categories).then((cook) => {
-      if (this._selfDeleted) {
-        return;
-      }
-
-      this.set("cook", cook);
-
-      const findArgs = {
-        channelId: channel.id,
-        pageSize: PAGE_SIZE,
-      };
-      const fetchingFromLastRead = !options.fetchFromLastMessage;
-
-      if (fetchingFromLastRead) {
-        findArgs["targetMessageId"] =
-          this.targetMessageId || this._getLastReadId();
-      }
-
-      return this.store
-        .findAll("chat-message", findArgs)
-        .then((messages) => {
-          if (this._selfDeleted || this.chatChannel.id !== channel.id) {
-            return;
-          }
-          this.setMessageProps(messages, fetchingFromLastRead);
-
-          if (options.fetchFromLastMessage) {
-            this.set("stickyScroll", true);
-            this._stickScrollToBottom();
-          }
-
-          this._focusComposer();
-        })
-        .catch(this._handleErrors)
-        .finally(() => {
-          if (this._selfDeleted || this.chatChannel.id !== channel.id) {
-            return;
-          }
-
-          this.set("loading", false);
-        });
-    });
-  },
-
-  loadDraftForChannel(channelId) {
-    this.set("draft", this.chat.getDraftForChannel(channelId));
-  },
-
-  @bind
-  _fetchMoreMessages(direction) {
-    const loadingPast = direction === PAST;
-    const canLoadMore = loadingPast
-      ? this.details?.can_load_more_past
-      : this.details?.can_load_more_future;
-    const loadingMoreKey = `loadingMore${capitalize(direction)}`;
-    const loadingMore = this.get(loadingMoreKey);
-
-    if (
-      (this.details && !canLoadMore) ||
-      loadingMore ||
-      this.loading ||
-      !this.messages.length
-    ) {
-      return Promise.resolve();
-    }
-
-    this.set(loadingMoreKey, true);
-    this.ignoreStickyScrolling = true;
-
-    const messageIndex = loadingPast ? 0 : this.messages.length - 1;
-    const messageId = this.messages[messageIndex].id;
-    const findArgs = {
-      channelId: this.chatChannel.id,
-      pageSize: PAGE_SIZE,
-      direction,
-      messageId,
-    };
-    const channelId = this.chatChannel.id;
-
-    return this.store
-      .findAll("chat-message", findArgs)
-      .then((messages) => {
-        if (this._selfDeleted || channelId !== this.chatChannel.id) {
-          return;
-        }
-
-        const newMessages = this._prepareMessages(messages || []);
-        if (newMessages.length) {
-          this.set(
-            "messages",
-            loadingPast
-              ? newMessages.concat(this.messages)
-              : this.messages.concat(newMessages)
-          );
-        }
-        this.setCanLoadMoreDetails(messages.resultSetMeta);
-
-        if (!loadingPast && newMessages.length) {
-          // Adding newer messages also causes a scroll-down,
-          // firing another event, fetching messages again, and so on.
-          // Scroll to the first new one to prevent this.
-          this.scrollToMessage(newMessages.firstObject.messageLookupId);
-        }
-
-        return messages;
-      })
-      .catch(this._handleErrors)
-      .finally(() => {
-        if (this._selfDeleted) {
-          return;
-        }
-        this.set(loadingMoreKey, false);
-        this.ignoreStickyScrolling = false;
-      });
-  },
-
-  fillPaneAttempt(meta) {
-    if (this._selfDeleted) {
-      return;
-    }
-
-    // safeguard
-    if (this.messages.length > 200) {
-      return;
-    }
-
-    if (!meta?.can_load_more_past) {
-      return;
-    }
-
-    schedule("afterRender", () => {
-      const firstMessageId = this.messages.firstObject?.id;
-      if (!firstMessageId) {
-        return;
-      }
-
-      const scroller = document.querySelector(".chat-messages-container");
-      const messageContainer = document.querySelector(
-        `.chat-message-container[data-id="${firstMessageId}"]`
-      );
-      if (
-        !scroller ||
-        !messageContainer ||
-        !isElementInViewport(messageContainer)
-      ) {
-        return;
-      }
-
-      this._fetchMoreMessagesThrottled(PAST);
-    });
-  },
-
-  _fetchMoreMessagesThrottled(direction) {
-    throttle(
-      this,
-      "_fetchMoreMessages",
-      direction,
-      FETCH_MORE_MESSAGES_THROTTLE_MS
-    );
-  },
-
-  setCanLoadMoreDetails(meta) {
-    const metaKeys = Object.keys(meta);
-    if (metaKeys.includes("can_load_more_past")) {
-      this.set("details.can_load_more_past", meta.can_load_more_past);
-      this.set(
-        "allPastMessagesLoaded",
-        this.details.can_load_more_past === false
-      );
-    }
-    if (metaKeys.includes("can_load_more_future")) {
-      this.set("details.can_load_more_future", meta.can_load_more_future);
-    }
-  },
-
-  setMessageProps(messages, fetchingFromLastRead) {
-    this._unloadedReplyIds = [];
-    this.messageLookup = {};
-    const meta = messages.resultSetMeta;
-    this.setProperties({
-      messages: this._prepareMessages(messages),
-      details: {
-        chat_channel_id: this.chatChannel.id,
-        chatable_type: this.chatChannel.chatable_type,
-        can_delete_self: meta.can_delete_self,
-        can_delete_others: meta.can_delete_others,
-        can_flag: meta.can_flag,
-        user_silenced: meta.user_silenced,
-        can_moderate: meta.can_moderate,
-        channel_message_bus_last_id: meta.channel_message_bus_last_id,
-      },
-      registeredChatChannelId: this.chatChannel.id,
-    });
-
-    schedule("afterRender", () => {
-      if (this._selfDeleted) {
-        return;
-      }
-
-      if (this.targetMessageId) {
-        this.scrollToMessage(this.targetMessageId, {
-          highlight: true,
-          position: "top",
-          autoExpand: true,
-        });
-
-        this.set("targetMessageId", null);
-      } else if (fetchingFromLastRead) {
-        this._markLastReadMessage();
-      }
-
-      this.fillPaneAttempt(messages.resultSetMeta);
-    });
-
-    this.setCanLoadMoreDetails(messages.resultSetMeta);
-    this._subscribeToUpdates(this.chatChannel.id);
-  },
-
-  _prepareMessages(messages) {
-    const preparedMessages = A();
-    let previousMessage;
-    messages.forEach((currentMessage) => {
-      let prepared = this._prepareSingleMessage(
-        currentMessage,
-        previousMessage
-      );
-      preparedMessages.push(prepared);
-      previousMessage = prepared;
-    });
-    return preparedMessages;
-  },
-
-  _areDatesOnSameDay(a, b) {
-    return (
-      a.getFullYear() === b.getFullYear() &&
-      a.getMonth() === b.getMonth() &&
-      a.getDate() === b.getDate()
-    );
-  },
-
-  _prepareSingleMessage(messageData, previousMessageData) {
-    if (previousMessageData) {
-      if (
-        !this._areDatesOnSameDay(
-          new Date(previousMessageData.created_at),
-          new Date(messageData.created_at)
-        )
-      ) {
-        messageData.firstMessageOfTheDayAt = moment(
-          messageData.created_at
-        ).calendar(moment(), {
-          sameDay: `[${I18n.t("chat.chat_message_separator.today")}]`,
-          lastDay: `[${I18n.t("chat.chat_message_separator.yesterday")}]`,
-          lastWeek: "LL",
-          sameElse: "LL",
-        });
-      }
-    }
-    if (messageData.in_reply_to?.id === previousMessageData?.id) {
-      // Reply-to message is directly above. Remove `in_reply_to` from message.
-      messageData.in_reply_to = null;
-    }
-
-    if (messageData.in_reply_to) {
-      let inReplyToMessage = this.messageLookup[messageData.in_reply_to.id];
-      if (inReplyToMessage) {
-        // Reply to message has already been added
-        messageData.in_reply_to = inReplyToMessage;
-      } else {
-        inReplyToMessage = EmberObject.create(messageData.in_reply_to);
-        this._unloadedReplyIds.push(inReplyToMessage.id);
-        this.messageLookup[inReplyToMessage.id] = inReplyToMessage;
-      }
-    } else {
-      // In reply-to is false. Check if previous message was created by same
-      // user and if so, no need to repeat avatar and username
-
-      if (
-        previousMessageData &&
-        !previousMessageData.deleted_at &&
-        Math.abs(
-          new Date(messageData.created_at) -
-            new Date(previousMessageData.created_at)
-        ) < 300000 && // If the time between messages is over 5 minutes, break.
-        messageData.user.id === previousMessageData.user.id
-      ) {
-        messageData.hideUserInfo = true;
-      }
-    }
-    this._handleMessageHidingAndExpansion(messageData);
-    messageData.messageLookupId = this._generateMessageLookupId(messageData);
-    const prepared = ChatMessage.create(messageData);
-    this.messageLookup[messageData.messageLookupId] = prepared;
-    return prepared;
-  },
-
-  _handleMessageHidingAndExpansion(messageData) {
-    if (this.currentUser.ignored_users) {
-      messageData.hidden = this.currentUser.ignored_users.includes(
-        messageData.user.username
-      );
-    }
-
-    // If a message has been hidden it is because the current user is ignoring
-    // the user who sent it, so we want to unconditionally hide it, even if
-    // we are going directly to the target
-    if (this.targetMessageId && this.targetMessageId === messageData.id) {
-      messageData.expanded = !messageData.hidden;
-    } else {
-      messageData.expanded = !(messageData.hidden || messageData.deleted_at);
-    }
-  },
-
-  _generateMessageLookupId(message) {
-    return message.id || `staged-${message.stagedId}`;
-  },
-
-  _getLastReadId() {
-    return this.chatChannel.currentUserMembership.last_read_message_id;
-  },
-
-  _markLastReadMessage(opts = { reRender: false }) {
-    if (opts.reRender) {
-      this.messages.forEach((m) => {
-        if (m.newestMessage) {
-          m.set("newestMessage", false);
-        }
-      });
-    }
-    const lastReadId = this._getLastReadId();
-    if (!lastReadId) {
-      return;
-    }
-
-    const indexOfLastReadMessage =
-      this.messages.findIndex((m) => m.id === lastReadId) || 0;
-    let newestUnreadMessage = this.messages[indexOfLastReadMessage + 1];
-
-    if (newestUnreadMessage && !this.targetMessageId) {
-      newestUnreadMessage.set("newestMessage", true);
-
-      next(() => this.scrollToMessage(newestUnreadMessage.id));
-
-      return;
-    }
-    this._stickScrollToBottom();
-  },
-
-  highlightOrFetchMessage(messageId) {
-    if (this._selfDeleted) {
-      return;
-    }
-
-    if (this.messageLookup[messageId]) {
-      // We have the message rendered. highlight and scrollTo
-      this.scrollToMessage(messageId, {
-        highlight: true,
-        position: "top",
-        autoExpand: true,
-      });
-    } else {
-      this.set("targetMessageId", messageId);
-      this.fetchMessages(this.chatChannel);
-    }
-  },
-
-  scrollToMessage(
-    messageId,
-    opts = { highlight: false, position: "top", autoExpand: false }
-  ) {
-    if (this._selfDeleted) {
-      return;
-    }
-    const message = this.messageLookup[messageId];
-    if (message?.deleted_at && opts.autoExpand) {
-      message.set("expanded", true);
-    }
-
-    schedule("afterRender", () => {
-      const messageEl = this._scrollerEl.querySelector(
-        `.chat-message-container[data-id='${messageId}']`
-      );
-
-      if (!messageEl || this._selfDeleted) {
-        return;
-      }
-
-      this._wrapIOSFix(() => {
-        messageEl.scrollIntoView({
-          block: opts.position === "top" ? "start" : "end",
-        });
-      });
-
-      if (opts.highlight) {
-        messageEl.classList.add("highlighted");
-
-        // Remove highlighted class, but keep `transition-slow` on for another 2 seconds
-        // to ensure the background color fades smoothly out
-        if (opts.highlight) {
-          discourseLater(() => {
-            messageEl.classList.add("transition-slow");
-          }, 2000);
-
-          discourseLater(() => {
-            messageEl.classList.remove("highlighted");
-
-            discourseLater(() => {
-              messageEl.classList.remove("transition-slow");
-            }, 2000);
-          }, 3000);
-        }
-      }
-    });
-  },
-
-  @afterRender
-  _stickScrollToBottom() {
-    if (this.ignoreStickyScrolling) {
-      return;
-    }
-
-    this.set("stickyScroll", true);
-
-    if (this._scrollerEl) {
-      // Trigger a tiny scrollTop change so Safari scrollbar is placed at bottom.
-      // Setting to just 0 doesn't work (it's at 0 by default, so there is no change)
-      // Very hacky, but no way to get around this Safari bug
-      this._scrollerEl.scrollTop = -1;
-
-      this._wrapIOSFix(() => {
-        this._scrollerEl.scrollTop = 0;
-        this.set("showScrollToBottomBtn", false);
-      });
-    }
-  },
-
-  onScroll(event) {
-    if (this._selfDeleted) {
-      return;
-    }
-
-    resetIdle();
-
-    const atTop =
-      Math.abs(
-        this._scrollerEl.scrollHeight -
-          this._scrollerEl.clientHeight +
-          this._scrollerEl.scrollTop
-      ) <= STICKY_SCROLL_LENIENCE;
-
-    if (atTop) {
-      this._fetchMoreMessagesThrottled(PAST);
-    } else if (Math.abs(this._scrollerEl.scrollTop) <= STICKY_SCROLL_LENIENCE) {
-      this._fetchMoreMessagesThrottled(FUTURE);
-    }
-
-    this._calculateStickScroll(event.forceShowScrollToBottom);
-  },
-
-  _calculateStickScroll(forceShowScrollToBottom) {
-    const absoluteScrollTop = Math.abs(this._scrollerEl.scrollTop);
-    const shouldStick = absoluteScrollTop < STICKY_SCROLL_LENIENCE;
-
-    if (forceShowScrollToBottom) {
-      this.set("showScrollToBottomBtn", forceShowScrollToBottom);
-    } else {
-      this.set(
-        "showScrollToBottomBtn",
-        shouldStick
-          ? false
-          : absoluteScrollTop / this._scrollerEl.offsetHeight > 0.67
-      );
-    }
-
-    if (!this.showScrollToBottomBtn) {
-      this.set("hasNewMessages", false);
-    }
-
-    if (shouldStick !== this.stickyScroll) {
-      if (shouldStick) {
-        this._stickScrollToBottom();
-      } else {
-        this.set("stickyScroll", false);
-      }
-    }
-  },
-
-  @observes("chatStateManager.isDrawerActive")
-  onFloatHiddenChange() {
-    if (this.chatStateManager.isDrawerActive) {
-      this.set("expanded", true);
-      this._markLastReadMessage({ reRender: true });
-      this._stickScrollToBottom();
-    }
-  },
-
-  removeMessage(msgData) {
-    delete this.messageLookup[msgData.id];
-  },
-
-  handleMessage(data) {
-    switch (data.type) {
-      case "sent":
-        this.handleSentMessage(data);
-        break;
-      case "processed":
-        this.handleProcessedMessage(data);
-        break;
-      case "edit":
-        this.handleEditMessage(data);
-        break;
-      case "refresh":
-        this.handleRefreshMessage(data);
-        break;
-      case "delete":
-        this.handleDeleteMessage(data);
-        break;
-      case "bulk_delete":
-        this.handleBulkDeleteMessage(data);
-        break;
-      case "reaction":
-        this.handleReactionMessage(data);
-        break;
-      case "restore":
-        this.handleRestoreMessage(data);
-        break;
-      case "mention_warning":
-        this.handleMentionWarning(data);
-        break;
-      case "self_flagged":
-        this.handleSelfFlaggedMessage(data);
-        break;
-      case "flag":
-        this.handleFlaggedMessage(data);
-        break;
-    }
-  },
-
-  handleSentMessage(data) {
-    if (this.chatChannel.isFollowing) {
-      this.chatChannel.set("last_message_sent_at", new Date());
-    }
-
-    if (data.chat_message.user.id === this.currentUser.id) {
-      // User sent this message. Check staged messages to see if this client sent the message.
-      // If so, need to update the staged message with and id.
-      const stagedMessage = this.messageLookup[`staged-${data.stagedId}`];
-      if (stagedMessage) {
-        stagedMessage.setProperties({
-          error: null,
-          staged: false,
-          id: data.chat_message.id,
-          staged_id: null,
-          excerpt: data.chat_message.excerpt,
-        });
-
-        // some markdown is cooked differently on the server-side, e.g.
-        // quotes, avatar images etc.
-        if (
-          data.chat_message.cooked &&
-          data.chat_message.cooked !== stagedMessage.cooked
-        ) {
-          stagedMessage.set("cooked", data.chat_message.cooked);
-        }
-        this.appEvents.trigger(
-          `chat-message-staged-${data.stagedId}:id-populated`
-        );
-
-        this.messageLookup[data.chat_message.id] = stagedMessage;
-        delete this.messageLookup[`staged-${data.stagedId}`];
-        return;
-      }
-    }
-
-    const preparedMessage = this._prepareSingleMessage(
-      data.chat_message,
-      this.messages[this.messages.length - 1]
-    );
-
-    this.messages.pushObject(preparedMessage);
-
-    if (this.messages.length >= MAX_RECENT_MSGS) {
-      this.removeMessage(this.messages.shiftObject());
-    }
-    this.reStickScrollIfNeeded();
-  },
-
-  handleProcessedMessage(data) {
-    const message = this.messageLookup[data.chat_message.id];
-    if (message) {
-      message.set("cooked", data.chat_message.cooked);
-      this.reStickScrollIfNeeded();
-    }
-  },
-
-  handleRefreshMessage(data) {
-    const message = this.messageLookup[data.chat_message.id];
-    if (message) {
-      this.appEvents.trigger("chat:refresh-message", message);
-    }
-  },
-
-  handleEditMessage(data) {
-    const message = this.messageLookup[data.chat_message.id];
-    if (message) {
-      message.setProperties({
-        message: data.chat_message.message,
-        cooked: data.chat_message.cooked,
-        excerpt: data.chat_message.excerpt,
-        uploads: cloneJSON(data.chat_message.uploads || []),
-        edited: true,
-      });
-    }
-  },
-
-  handleBulkDeleteMessage(data) {
-    data.deleted_ids.forEach((deletedId) => {
-      this.handleDeleteMessage({
-        deleted_id: deletedId,
-        deleted_at: data.deleted_at,
-      });
-    });
-  },
-
-  handleDeleteMessage(data) {
-    const deletedId = data.deleted_id;
-    const targetMsg = this.messageLookup[deletedId];
-    if (this.currentUser.staff || this.currentUser.id === targetMsg.user.id) {
-      targetMsg.setProperties({
-        deleted_at: data.deleted_at,
-        expanded: false,
-      });
-    } else {
-      this.messages.removeObject(targetMsg);
-      this.messageLookup[deletedId] = null;
-    }
-  },
-
-  handleReactionMessage(data) {
-    this.appEvents.trigger(
-      `chat-message-${data.chat_message_id}:reaction`,
-      data
-    );
-  },
-
-  handleRestoreMessage(data) {
-    let message = this.messageLookup[data.chat_message.id];
-    if (message) {
-      message.set("deleted_at", null);
-    } else {
-      // The message isn't present in the list for this user. Find the index
-      // where we should push the message to. Binary search is O(log(n))
-      let newMessageIndex = this.binarySearchForMessagePosition(
-        this.messages,
-        message
-      );
-      const previousMessage =
-        newMessageIndex > 0 ? this.messages[newMessageIndex - 1] : null;
-      message = this._prepareSingleMessage(data.chat_message, previousMessage);
-      if (newMessageIndex === 0) {
-        return;
-      } // Restored post is too old to show
-
-      this.messages.splice(newMessageIndex, 0, message);
-      this.notifyPropertyChange("messages");
-    }
-  },
-
-  binarySearchForMessagePosition(messages, newMessage) {
-    const newMessageCreatedAt = Date.parse(newMessage.created_at);
-    if (newMessageCreatedAt < Date.parse(messages[0].created_at)) {
-      return 0;
-    }
-    if (
-      newMessageCreatedAt > Date.parse(messages[messages.length - 1].created_at)
-    ) {
-      return messages.length;
-    }
-    let m = 0;
-    let n = messages.length - 1;
-    while (m <= n) {
-      let k = Math.floor((n + m) / 2);
-      let comparison = this.compareCreatedAt(newMessageCreatedAt, messages[k]);
-      if (comparison > 0) {
-        m = k + 1;
-      } else if (comparison < 0) {
-        n = k - 1;
-      } else {
-        return k;
-      }
-    }
-    return m;
-  },
-
-  compareCreatedAt(newMessageCreatedAt, comparatorMessage) {
-    const compareDate = Date.parse(comparatorMessage.created_at);
-    if (newMessageCreatedAt > compareDate) {
-      return 1;
-    } else if (newMessageCreatedAt < compareDate) {
-      return -1;
-    }
-    return 0;
-  },
-
-  handleMentionWarning(data) {
-    this.messageLookup[data.chat_message_id]?.set("mentionWarning", data);
-  },
-
-  handleSelfFlaggedMessage(data) {
-    this.messageLookup[data.chat_message_id]?.set(
-      "user_flag_status",
-      data.user_flag_status
-    );
-  },
-
-  handleFlaggedMessage(data) {
-    this.messageLookup[data.chat_message_id]?.set(
-      "reviewable_id",
-      data.reviewable_id
-    );
-  },
-
-  get _selfDeleted() {
-    return !this.element || this.isDestroying || this.isDestroyed;
-  },
-
-  @action
-  sendMessage(message, uploads = []) {
-    resetIdle();
-
-    if (this.sendingLoading) {
-      return;
-    }
-
-    this.set("sendingLoading", true);
-    this._setDraftForChannel(null);
-
-    // TODO: all send message logic is due for massive refactoring
-    // This is all the possible case Im currently aware of
-    // - messaging to a public channel where you are not a member yet (preview = true)
-    // - messaging to an existing direct channel you were not tracking yet through dm creator (channel draft)
-    // - messaging to a new direct channel through DM creator (channel draft)
-    // - message to a direct channel you were tracking (preview = false, not draft)
-    // - message to a public channel you were tracking (preview = false, not draft)
-    // - message to a channel when we haven't loaded all future messages yet.
-    if (!this.chatChannel.isFollowing || this.chatChannel.isDraft) {
-      this.set("loading", true);
-
-      return this._upsertChannelWithMessage(
-        this.chatChannel,
-        message,
-        uploads
-      ).finally(() => {
-        if (this._selfDeleted) {
-          return;
-        }
-        this.set("loading", false);
-        this.set("sendingLoading", false);
-        this._resetAfterSend();
-        this._stickScrollToBottom();
-      });
-    }
-
-    this.set("_nextStagedMessageId", this._nextStagedMessageId + 1);
-    const cooked = this.cook(message);
-    const stagedId = this._nextStagedMessageId;
-    let data = {
-      message,
-      cooked,
-      staged_id: stagedId,
-      upload_ids: uploads.map((upload) => upload.id),
-    };
-    if (this.replyToMsg) {
-      data.in_reply_to_id = this.replyToMsg.id;
-    }
-
-    // Start ajax request but don't return here, we want to stage the message instantly when all messages are loaded.
-    // Otherwise, we'll fetch latest and scroll to the one we just created.
-    // Return a resolved promise below.
-    const msgCreationPromise = this.chatApi
-      .sendMessage(this.chatChannel.id, data)
-      .catch((error) => {
-        this._onSendError(data.staged_id, error);
-      })
-      .finally(() => {
-        if (this._selfDeleted) {
-          return;
-        }
-        this.set("sendingLoading", false);
-      });
-
-    if (this.details?.can_load_more_future) {
-      msgCreationPromise.then(() => this._fetchAndScrollToLatest());
-    } else {
-      const stagedMessage = this._prepareSingleMessage(
-        // We need to add the user and created at for presentation of staged message
-        {
-          message,
-          cooked,
-          stagedId,
-          uploads: cloneJSON(uploads),
-          staged: true,
-          user: this.currentUser,
-          in_reply_to: this.replyToMsg,
-          created_at: new Date(),
-        },
-        this.messages[this.messages.length - 1]
-      );
-      this.messages.pushObject(stagedMessage);
-      this._stickScrollToBottom();
-    }
-
-    this._resetAfterSend();
-    this.appEvents.trigger("chat-composer:reply-to-set", null);
-    return Promise.resolve();
-  },
-
-  async _upsertChannelWithMessage(channel, message, uploads) {
-    let promise = Promise.resolve(channel);
-
-    if (channel.isDirectMessageChannel || channel.isDraft) {
-      promise = this.chat.upsertDmChannelForUsernames(
-        channel.chatable.users.mapBy("username")
-      );
-    }
-
-    return promise.then((c) =>
-      ajax(`/chat/${c.id}.json`, {
-        type: "POST",
-        data: {
-          message,
-          upload_ids: (uploads || []).mapBy("id"),
-        },
-      }).then(() => {
-        this.onSwitchChannel(c);
-      })
-    );
-  },
-
-  _onSendError(stagedId, error) {
-    const stagedMessage = this.messageLookup[`staged-${stagedId}`];
-    if (stagedMessage) {
-      if (error.jqXHR?.responseJSON?.errors?.length) {
-        stagedMessage.set("error", error.jqXHR.responseJSON.errors[0]);
-      } else {
-        this.chat.markNetworkAsUnreliable();
-        stagedMessage.set("error", "network_error");
-      }
-    }
-
-    this._resetAfterSend();
-  },
-
-  @action
-  resendStagedMessage(stagedMessage) {
-    this.set("sendingLoading", true);
-
-    stagedMessage.set("error", null);
-
-    const data = {
-      cooked: stagedMessage.cooked,
-      message: stagedMessage.message,
-      upload_ids: stagedMessage.upload_ids,
-      staged_id: stagedMessage.stagedId,
-    };
-
-    this.chatApi
-      .sendMessage(this.chatChannel.id, data)
-      .catch((error) => {
-        this._onSendError(data.staged_id, error);
-      })
-      .then(() => {
-        this.chat.markNetworkAsReliable();
-      })
-      .finally(() => {
-        if (this._selfDeleted) {
-          return;
-        }
-        this.set("sendingLoading", false);
-      });
-  },
-
-  @action
-  editMessage(chatMessage, newContent, uploads) {
-    this.set("sendingLoading", true);
-    let data = {
-      new_message: newContent,
-      upload_ids: (uploads || []).map((upload) => upload.id),
-    };
-    return ajax(`/chat/${this.chatChannel.id}/edit/${chatMessage.id}`, {
-      type: "PUT",
-      data,
-    })
-      .then(() => {
-        this._resetAfterSend();
-      })
-      .catch(popupAjaxError)
-      .finally(() => {
-        if (this._selfDeleted) {
-          return;
-        }
-        this.set("sendingLoading", false);
-      });
-  },
-
-  _resetChannelState() {
-    this._unsubscribeToUpdates(this.registeredChatChannelId);
-    this.messages.clear();
-    this.messageLookup = {};
-    this.set("allPastMessagesLoaded", false);
-    this.set("registeredChatChannelId", null);
-    this.set("selectingMessages", false);
-  },
-
-  _resetAfterSend() {
-    if (this._selfDeleted) {
-      return;
-    }
-    this.setProperties({
-      replyToMsg: null,
-      editingMessage: null,
-    });
-    this.chatComposerPresenceManager.notifyState(this.chatChannel.id, false);
-  },
-
-  @action
-  editLastMessageRequested() {
-    let lastUserMessage = null;
-    for (
-      let messageIndex = this.messages.length - 1;
-      messageIndex >= 0;
-      messageIndex--
-    ) {
-      let message = this.messages[messageIndex];
-      if (
-        !message.staged &&
-        message.user.id === this.currentUser.id &&
-        !message.error
-      ) {
-        lastUserMessage = message;
-        break;
-      }
-    }
-    if (lastUserMessage) {
-      this.set("editingMessage", lastUserMessage);
-      this._focusComposer();
-    }
-  },
-
-  @action
-  setReplyTo(messageId) {
-    if (messageId) {
-      this.cancelEditing();
-      this.set("replyToMsg", this.messageLookup[messageId]);
-      this.appEvents.trigger("chat-composer:reply-to-set", this.replyToMsg);
-      this._focusComposer();
-    } else {
-      this.set("replyToMsg", null);
-      this.appEvents.trigger("chat-composer:reply-to-set", null);
-    }
-  },
-
-  @action
-  replyMessageClicked(message) {
-    const replyMessageFromLookup = this.messageLookup[message.id];
-    if (this._unloadedReplyIds.includes(message.id)) {
-      // Message is not present in the loaded messages. Fetch it!
-      this.set("targetMessageId", message.id);
-      this.fetchMessages(this.chatChannel);
-    } else {
-      this.scrollToMessage(replyMessageFromLookup.id, {
-        highlight: true,
-        position: "top",
-        autoExpand: true,
-      });
-    }
-  },
-
-  @action
-  editButtonClicked(messageId) {
-    const message = this.messageLookup[messageId];
-    this.set("editingMessage", message);
-    next(this.reStickScrollIfNeeded.bind(this));
-    this._focusComposer();
-  },
-
-  @discourseComputed("details.user_silenced")
-  canInteractWithChat(userSilenced) {
-    return !userSilenced;
-  },
-
-  @discourseComputed
-  chatProgressBarContainer() {
-    return document.querySelector("#chat-progress-bar-container");
-  },
-
-  @discourseComputed("messages.@each.selected")
-  selectedMessageIds(messages) {
-    return messages.filter((m) => m.selected).map((m) => m.id);
-  },
-
-  @action
-  onStartSelectingMessages(message) {
-    this._lastSelectedMessage = message;
-    this.set("selectingMessages", true);
-  },
-
-  @action
-  cancelSelecting() {
-    this.set("selectingMessages", false);
-    this.messages.setEach("selected", false);
-  },
-
-  @action
-  onSelectMessage(message) {
-    this._lastSelectedMessage = message;
-  },
-
-  @action
-  navigateToIndex() {
-    this.router.transitionTo("chat.index");
-  },
-
-  @action
-  bulkSelectMessages(message, checked) {
-    const lastSelectedIndex = this._findIndexOfMessage(
-      this._lastSelectedMessage
-    );
-    const newlySelectedIndex = this._findIndexOfMessage(message);
-    const sortedIndices = [lastSelectedIndex, newlySelectedIndex].sort(
-      (a, b) => a - b
-    );
-
-    for (let i = sortedIndices[0]; i <= sortedIndices[1]; i++) {
-      this.messages[i].set("selected", checked);
-    }
-  },
-
-  _findIndexOfMessage(message) {
-    return this.messages.findIndex((m) => m.id === message.id);
-  },
-
-  @action
-  onCloseFullScreen() {
-    this.chatStateManager.prefersDrawer();
-    this.router.transitionTo(this.chatStateManager.lastKnownAppURL).then(() => {
-      this.appEvents.trigger(
-        "chat:open-url",
-        this.chatStateManager.lastKnownChatURL
-      );
-    });
-  },
-
-  @action
-  cancelEditing() {
-    this.set("editingMessage", null);
-  },
-
-  @action
-  _setDraftForChannel(draft) {
-    if (this.chatChannel.isDraft) {
-      return;
-    }
-
-    if (draft?.replyToMsg) {
-      draft.replyToMsg = {
-        id: draft.replyToMsg.id,
-        excerpt: draft.replyToMsg.excerpt,
-        user: draft.replyToMsg.user,
-      };
-    }
-    this.chat.setDraftForChannel(this.chatChannel, draft);
-    this.set("draft", draft);
-  },
-
-  @action
-  setInReplyToMsg(inReplyMsg) {
-    this.set("replyToMsg", inReplyMsg);
-  },
-
-  @action
-  composerValueChanged(value, uploads, replyToMsg) {
-    if (!this.editingMessage && !this.chatChannel.directMessageChannelDraft) {
-      this._setDraftForChannel({ value, uploads, replyToMsg });
-    }
-
-    if (!this.chatChannel.directMessageChannelDraft) {
-      this._reportReplyingPresence(value);
-    }
-  },
-
-  @action
-  updateMentions(mentions) {
-    const mentionsCount = mentions?.length;
-    this.set("mentionsCount", mentionsCount);
-
-    if (mentionsCount > 0) {
-      if (mentionsCount > this.siteSettings.max_mentions_per_chat_message) {
-        this.set("tooManyMentions", true);
-      } else {
-        this.set("tooManyMentions", false);
-        const newMentions = mentions.filter(
-          (mention) => !(mention in this._mentionWarningsSeen)
-        );
-
-        if (newMentions?.length > 0) {
-          this._recordNewWarnings(newMentions, mentions);
-        } else {
-          this._rebuildWarnings(mentions);
-        }
-      }
-    } else {
-      this.set("tooManyMentions", false);
-      this.set("unreachableGroupMentions", []);
-      this.set("overMembersLimitGroupMentions", []);
-    }
-  },
-
-  _recordNewWarnings(newMentions, mentions) {
-    ajax("/chat/api/mentions/groups.json", {
-      data: { mentions: newMentions },
-    })
-      .then((newWarnings) => {
-        newWarnings.unreachable.forEach((warning) => {
-          this._mentionWarningsSeen[warning] = MENTION_RESULT["unreachable"];
-        });
-
-        newWarnings.over_members_limit.forEach((warning) => {
-          this._mentionWarningsSeen[warning] =
-            MENTION_RESULT["over_members_limit"];
-        });
-
-        newWarnings.invalid.forEach((warning) => {
-          this._mentionWarningsSeen[warning] = MENTION_RESULT["invalid"];
-        });
-
-        this._rebuildWarnings(mentions);
-      })
-      .catch(this._rebuildWarnings(mentions));
-  },
-
-  _rebuildWarnings(mentions) {
-    const newWarnings = mentions.reduce(
-      (memo, mention) => {
-        if (
-          mention in this._mentionWarningsSeen &&
-          !(this._mentionWarningsSeen[mention] === MENTION_RESULT["invalid"])
-        ) {
-          if (
-            this._mentionWarningsSeen[mention] === MENTION_RESULT["unreachable"]
-          ) {
-            memo[0].push(mention);
-          } else {
-            memo[1].push(mention);
-          }
-        }
-
-        return memo;
-      },
-      [[], []]
-    );
-
-    this.set("unreachableGroupMentions", newWarnings[0]);
-    this.set("overMembersLimitGroupMentions", newWarnings[1]);
-  },
-
-  @action
-  reStickScrollIfNeeded() {
-    if (this.stickyScroll) {
-      this._stickScrollToBottom();
-    }
-  },
-
-  @action
-  onHoverMessage(message, options = {}, event) {
-    if (this.site.mobileView && options.desktopOnly) {
-      return;
-    }
-
-    if (message?.staged) {
-      return;
-    }
-
-    if (
-      this.hoveredMessageId &&
-      message?.id &&
-      this.hoveredMessageId === message?.id
-    ) {
-      return;
-    }
-
-    if (event) {
-      if (
-        event.type === "mouseleave" &&
-        (event.toElement || event.relatedTarget)?.closest(
-          ".chat-message-actions-desktop-anchor"
-        )
-      ) {
-        return;
-      }
-
-      if (
-        event.type === "mouseenter" &&
-        (event.fromElement || event.relatedTarget)?.closest(
-          ".chat-message-actions-desktop-anchor"
-        )
-      ) {
-        this.set("hoveredMessageId", message?.id);
-        return;
-      }
-    }
-
-    this._onHoverMessageDebouncedHandler = discourseDebounce(
-      this,
-      this.debouncedOnHoverMessage,
-      message,
-      250
-    );
-  },
-
-  @bind
-  debouncedOnHoverMessage(message) {
-    if (this._selfDeleted) {
-      return;
-    }
-
-    this.set(
-      "hoveredMessageId",
-      message?.id && message.id !== this.hoveredMessageId ? message.id : null
-    );
-  },
-
-  _reportReplyingPresence(composerValue) {
-    if (this._selfDeleted) {
-      return;
-    }
-
-    if (this.chatChannel.isDraft) {
-      return;
-    }
-
-    const replying = !this.editingMessage && !!composerValue;
-    this.chatComposerPresenceManager.notifyState(this.chatChannel.id, replying);
-  },
-
-  @action
-  restickScrolling(event) {
-    event.preventDefault();
-
-    return this._fetchAndScrollToLatest();
-  },
-
-  _focusComposer() {
-    this.appEvents.trigger("chat:focus-composer");
-  },
-
-  _unsubscribeToUpdates(channelId) {
-    this.messageBus.unsubscribe(`/chat/${channelId}`, this.onMessage);
-  },
-
-  _subscribeToUpdates(channelId) {
-    this._unsubscribeToUpdates(channelId);
-    this.messageBus.subscribe(
-      `/chat/${channelId}`,
-      this.onMessage,
-      this.details.channel_message_bus_last_id
-    );
-  },
-
-  @bind
-  onMessage(busData) {
-    if (!this.details.can_load_more_future || busData.type !== "sent") {
-      this.handleMessage(busData);
-    } else {
-      this.set("hasNewMessages", true);
-    }
-  },
-
-  @bind
-  _forceBodyScroll() {
-    // when keyboard is visible this will ensure body
-    // doesn’t scroll out of viewport
-    if (
-      this.capabilities.isIOS &&
-      document.documentElement.classList.contains("keyboard-visible") &&
-      !isZoomed()
-    ) {
-      document.documentElement.scrollTo(0, 0);
-    }
-  },
-
-  _fetchAndScrollToLatest() {
-    return this.fetchMessages(this.chatChannel, {
-      fetchFromLastMessage: true,
-    });
-  },
-
-  _handleErrors(error) {
-    switch (error?.jqXHR?.status) {
-      case 429:
-      case 404:
-        popupAjaxError(error);
-        break;
-      default:
-        throw error;
-    }
-  },
-
-  // since -webkit-overflow-scrolling: touch can't be used anymore to disable momentum scrolling
-  // we now use this hack to disable it
-  @bind
-  _wrapIOSFix(callback) {
-    if (!this._scrollerEl) {
-      return;
-    }
-
-    if (this.capabilities.isIOS) {
-      this._scrollerEl.style.overflow = "hidden";
-    }
-
-    callback();
-
-    if (this.capabilities.isIOS) {
-      discourseLater(() => {
-        if (!this._scrollerEl) {
-          return;
-        }
-
-        this._scrollerEl.style.overflow = "auto";
-      }, 25);
-    }
-  },
-});
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-mention-warnings.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-mention-warnings.hbs
index 104a4bb92dc..c02e048596d 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-mention-warnings.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-mention-warnings.hbs
@@ -8,13 +8,13 @@
         {{this.warningHeaderText}}
       </div>
       <ul class={{this.listStyleClass}}>
-        {{#if @tooManyMentions}}
+        {{#if this.hasTooManyMentions}}
           <li>{{this.tooManyMentionsBody}}</li>
         {{else}}
-          {{#if @unreachableGroupMentions}}
+          {{#if this.hasUnreachableGroupMentions}}
             <li>{{this.unreachableBody}}</li>
           {{/if}}
-          {{#if @overMembersLimitGroupMentions}}
+          {{#if this.hasOverMembersLimitGroupMentions}}
             <li>{{this.overMembersLimitBody}}</li>
           {{/if}}
         {{/if}}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-mention-warnings.js b/plugins/chat/assets/javascripts/discourse/components/chat-mention-warnings.js
index e97bfefbda3..24592fec121 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-mention-warnings.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-mention-warnings.js
@@ -2,21 +2,35 @@ import Component from "@glimmer/component";
 import I18n from "I18n";
 import { htmlSafe } from "@ember/template";
 import { inject as service } from "@ember/service";
+import getURL from "discourse-common/lib/get-url";
 
 export default class ChatMentionWarnings extends Component {
   @service siteSettings;
   @service currentUser;
+  @service chatComposerWarningsTracker;
 
-  get unreachableGroupMentionsCount() {
-    return this.args?.unreachableGroupMentions.length;
+  get unreachableGroupMentions() {
+    return this.chatComposerWarningsTracker.unreachableGroupMentions;
   }
 
-  get overMembersLimitMentionsCount() {
-    return this.args?.overMembersLimitGroupMentions.length;
+  get overMembersLimitGroupMentions() {
+    return this.chatComposerWarningsTracker.overMembersLimitGroupMentions;
   }
 
   get hasTooManyMentions() {
-    return this.args?.tooManyMentions;
+    return this.chatComposerWarningsTracker.tooManyMentions;
+  }
+
+  get mentionsCount() {
+    return this.chatComposerWarningsTracker.mentionsCount;
+  }
+
+  get unreachableGroupMentionsCount() {
+    return this.unreachableGroupMentions.length;
+  }
+
+  get overMembersLimitMentionsCount() {
+    return this.overMembersLimitGroupMentions.length;
   }
 
   get hasUnreachableGroupMentions() {
@@ -54,10 +68,7 @@ export default class ChatMentionWarnings extends Component {
   }
 
   get warningHeaderText() {
-    if (
-      this.args?.mentionsCount <= this.warningsCount ||
-      this.hasTooManyMentions
-    ) {
+    if (this.mentionsCount <= this.warningsCount || this.hasTooManyMentions) {
       return I18n.t("chat.mention_warning.groups.header.all");
     } else {
       return I18n.t("chat.mention_warning.groups.header.some");
@@ -69,31 +80,22 @@ export default class ChatMentionWarnings extends Component {
       return;
     }
 
-    let notificationLimit = I18n.t(
-      "chat.mention_warning.groups.notification_limit"
-    );
-
-    if (this.currentUser.staff) {
-      notificationLimit = htmlSafe(
-        `<a 
-          target="_blank" 
-          href="/admin/site_settings/category/plugins?filter=max_mentions_per_chat_message"
-        >
-          ${notificationLimit}
-        </a>`
+    if (this.currentUser.admin) {
+      return htmlSafe(
+        I18n.t("chat.mention_warning.too_many_mentions_admin", {
+          count: this.siteSettings.max_mentions_per_chat_message,
+          siteSettingUrl: getURL(
+            "/admin/site_settings/category/plugins?filter=max_mentions_per_chat_message"
+          ),
+        })
+      );
+    } else {
+      return htmlSafe(
+        I18n.t("chat.mention_warning.too_many_mentions", {
+          count: this.siteSettings.max_mentions_per_chat_message,
+        })
       );
     }
-
-    const settingLimit = I18n.t("chat.mention_warning.mentions_limit", {
-      count: this.siteSettings.max_mentions_per_chat_message,
-    });
-
-    return htmlSafe(
-      I18n.t("chat.mention_warning.too_many_mentions", {
-        notification_limit: notificationLimit,
-        limit: settingLimit,
-      })
-    );
   }
 
   get unreachableBody() {
@@ -101,17 +103,21 @@ export default class ChatMentionWarnings extends Component {
       return;
     }
 
-    if (this.unreachableGroupMentionsCount <= 2) {
-      return I18n.t("chat.mention_warning.groups.unreachable", {
-        group: this.args.unreachableGroupMentions[0],
-        group_2: this.args.unreachableGroupMentions[1],
-        count: this.unreachableGroupMentionsCount,
-      });
-    } else {
-      return I18n.t("chat.mention_warning.groups.unreachable_multiple", {
-        group: this.args.unreachableGroupMentions[0],
-        count: this.unreachableGroupMentionsCount - 1, //N others
-      });
+    switch (this.unreachableGroupMentionsCount) {
+      case 1:
+        return I18n.t("chat.mention_warning.groups.unreachable_1", {
+          group: this.unreachableGroupMentions[0],
+        });
+      case 2:
+        return I18n.t("chat.mention_warning.groups.unreachable_2", {
+          group1: this.unreachableGroupMentions[0],
+          group2: this.unreachableGroupMentions[1],
+        });
+      default:
+        return I18n.t("chat.mention_warning.groups.unreachable_multiple", {
+          group: this.unreachableGroupMentions[0],
+          count: this.unreachableGroupMentionsCount - 1,
+        });
     }
   }
 
@@ -120,44 +126,18 @@ export default class ChatMentionWarnings extends Component {
       return;
     }
 
-    let notificationLimit = I18n.t(
-      "chat.mention_warning.groups.notification_limit"
+    return htmlSafe(
+      I18n.messageFormat("chat.mention_warning.groups.too_many_members_MF", {
+        groupCount: this.overMembersLimitMentionsCount,
+        isAdmin: this.currentUser.admin,
+        siteSettingUrl: getURL(
+          "/admin/site_settings/category/plugins?filter=max_users_notified_per_group_mention"
+        ),
+        notificationLimit:
+          this.siteSettings.max_users_notified_per_group_mention,
+        group1: this.overMembersLimitGroupMentions[0],
+        group2: this.overMembersLimitGroupMentions[1],
+      })
     );
-
-    if (this.currentUser.staff) {
-      notificationLimit = htmlSafe(
-        `<a 
-          target="_blank" 
-          href="/admin/site_settings/category/plugins?filter=max_users_notified_per_group_mention"
-        >
-          ${notificationLimit}
-        </a>`
-      );
-    }
-
-    const settingLimit = I18n.t("chat.mention_warning.groups.users_limit", {
-      count: this.siteSettings.max_users_notified_per_group_mention,
-    });
-
-    if (this.hasOverMembersLimitGroupMentions <= 2) {
-      return htmlSafe(
-        I18n.t("chat.mention_warning.groups.too_many_members", {
-          group: this.args.overMembersLimitGroupMentions[0],
-          group_2: this.args.overMembersLimitGroupMentions[1],
-          count: this.overMembersLimitMentionsCount,
-          notification_limit: notificationLimit,
-          limit: settingLimit,
-        })
-      );
-    } else {
-      return htmlSafe(
-        I18n.t("chat.mention_warning.groups.too_many_members_multiple", {
-          group: this.args.overMembersLimitGroupMentions[0],
-          count: this.overMembersLimitMentionsCount - 1, //N others
-          notification_limit: notificationLimit,
-          limit: settingLimit,
-        })
-      );
-    }
   }
 }
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-desktop.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-desktop.hbs
index 651e0419b5e..054f8df7498 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-desktop.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-desktop.hbs
@@ -1,49 +1,80 @@
-<div class="chat-message-actions-container" data-id={{this.message.id}}>
-  <div class="chat-message-actions">
-    {{#if this.chatStateManager.isFullPageActive}}
-      {{#each this.emojiReactions as |reaction|}}
-        <ChatMessageReaction
-          @reaction={{reaction}}
-          @react={{this.messageActions.react}}
-          @class="show"
+{{#if (and this.site.desktopView this.chat.activeMessage.model.id)}}
+  <div
+    {{did-insert this.setup}}
+    {{did-update this.setup this.chat.activeMessage.model.id}}
+    {{on "mouseleave" this.onMouseleave}}
+    {{on "wheel" this.onWheel passive=true}}
+    {{will-destroy this.teardown}}
+    class={{concat-class
+      "chat-message-actions-container"
+      (concat "is-size-" this.size)
+    }}
+    data-id={{this.message.id}}
+  >
+    <div
+      class={{concat-class
+        "chat-message-actions"
+        (unless
+          this.messageInteractor.secondaryActions.length
+          "has-no-secondary-actions"
+        )
+      }}
+    >
+      {{#if this.shouldRenderFavoriteReactions}}
+        {{#each
+          this.messageInteractor.emojiReactions key="emoji"
+          as |reaction|
+        }}
+          <ChatMessageReaction
+            @reaction={{reaction}}
+            @onReaction={{this.messageInteractor.react}}
+            @message={{this.message}}
+            @showCount={{false}}
+          />
+        {{/each}}
+      {{/if}}
+
+      {{#if this.messageInteractor.canInteractWithMessage}}
+        <DButton
+          @class="btn-flat react-btn"
+          @action={{this.messageInteractor.openEmojiPicker}}
+          @icon="discourse-emojis"
+          @title="chat.react"
+          @forwardEvent={{true}}
         />
-      {{/each}}
-    {{/if}}
+      {{/if}}
 
-    {{#if this.messageCapabilities.canReact}}
-      <DButton
-        @class="btn-flat react-btn"
-        @action={{this.messageActions.startReactionForMessageActions}}
-        @icon="discourse-emojis"
-        @title="chat.react"
-      />
-    {{/if}}
+      {{#if this.messageInteractor.canBookmark}}
+        <DButton
+          @class="btn-flat bookmark-btn"
+          @action={{this.messageInteractor.toggleBookmark}}
+        >
+          <BookmarkIcon @bookmark={{this.message.bookmark}} />
+        </DButton>
+      {{/if}}
 
-    {{#if this.messageCapabilities.canBookmark}}
-      <DButton
-        @class="btn-flat bookmark-btn"
-        @action={{this.messageActions.toggleBookmark}}
-      >
-        <BookmarkIcon @bookmark={{this.message.bookmark}} />
-      </DButton>
-    {{/if}}
+      {{#if this.messageInteractor.canReply}}
+        <DButton
+          @class="btn-flat reply-btn"
+          @action={{this.messageInteractor.reply}}
+          @icon="reply"
+          @title="chat.reply"
+        />
+      {{/if}}
 
-    {{#if this.messageCapabilities.canReply}}
-      <DButton
-        @class="btn-flat reply-btn"
-        @action={{this.messageActions.reply}}
-        @icon="reply"
-        @title="chat.reply"
-      />
-    {{/if}}
-
-    {{#if this.secondaryButtons.length}}
-      <DropdownSelectBox
-        @class="more-buttons"
-        @options={{hash icon="ellipsis-v" placement="left"}}
-        @content={{this.secondaryButtons}}
-        @onChange={{action "handleSecondaryButtons"}}
-      />
-    {{/if}}
+      {{#if
+        (and
+          this.messageInteractor.message
+          this.messageInteractor.secondaryActions.length
+        )
+      }}
+        <DropdownSelectBox
+          @class="more-buttons secondary-actions"
+          @options={{hash icon="ellipsis-v" placement="left"}}
+          @content={{this.messageInteractor.secondaryActions}}
+          @onChange={{action this.messageInteractor.handleSecondaryActions}}
+        />
+      {{/if}}
+    </div>
   </div>
-</div>
\ No newline at end of file
+{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-desktop.js b/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-desktop.js
index d88a31d8148..997ceb1321d 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-desktop.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-desktop.js
@@ -1,48 +1,116 @@
-import Component from "@ember/component";
-import { action } from "@ember/object";
-import { createPopper } from "@popperjs/core";
-import { schedule } from "@ember/runloop";
+import Component from "@glimmer/component";
 import { inject as service } from "@ember/service";
+import ChatMessageInteractor from "discourse/plugins/chat/discourse/lib/chat-message-interactor";
+import { getOwner } from "@ember/application";
+import { schedule } from "@ember/runloop";
+import { createPopper } from "@popperjs/core";
+import chatMessageContainer from "discourse/plugins/chat/discourse/lib/chat-message-container";
+import { action } from "@ember/object";
+import { tracked } from "@glimmer/tracking";
 
 const MSG_ACTIONS_VERTICAL_PADDING = -10;
+const FULL = "full";
+const REDUCED = "reduced";
+const REDUCED_WIDTH_THRESHOLD = 500;
 
-export default Component.extend({
-  tagName: "",
+export default class ChatMessageActionsDesktop extends Component {
+  @service chat;
+  @service chatEmojiPickerManager;
+  @service site;
 
-  chatStateManager: service(),
+  @tracked size = FULL;
 
-  messageActions: null,
+  popper = null;
 
-  didReceiveAttrs() {
-    this._super(...arguments);
+  get message() {
+    return this.chat.activeMessage.model;
+  }
 
+  get context() {
+    return this.chat.activeMessage.context;
+  }
+
+  get messageInteractor() {
+    return new ChatMessageInteractor(
+      getOwner(this),
+      this.message,
+      this.context
+    );
+  }
+
+  get shouldRenderFavoriteReactions() {
+    return this.size === FULL;
+  }
+
+  @action
+  onWheel() {
+    // prevents menu to stop scroll on the list of messages
+    this.chat.activeMessage = null;
+  }
+
+  @action
+  onMouseleave(event) {
+    // if the mouse is leaving the actions menu for the actual menu, don't close it
+    // this will avoid the menu rerendering
+    if (
+      (event.toElement || event.relatedTarget)?.closest(
+        ".chat-message-container"
+      )
+    ) {
+      return;
+    }
+
+    this.chat.activeMessage = null;
+  }
+
+  @action
+  setup(element) {
     this.popper?.destroy();
 
     schedule("afterRender", () => {
-      this.popper = createPopper(
-        document.querySelector(
-          `.chat-message-container[data-id="${this.message.id}"]`
-        ),
-        document.querySelector(
-          `.chat-message-actions-container[data-id="${this.message.id}"] .chat-message-actions`
-        ),
-        {
-          placement: "top-end",
-          modifiers: [
-            { name: "hide", enabled: true },
-            { name: "eventListeners", options: { scroll: false } },
-            {
-              name: "offset",
-              options: { offset: [-2, MSG_ACTIONS_VERTICAL_PADDING] },
-            },
-          ],
-        }
+      const messageContainer = chatMessageContainer(
+        this.message.id,
+        this.context
       );
+
+      if (!messageContainer) {
+        return;
+      }
+
+      const viewport = messageContainer.closest(".popper-viewport");
+      this.size =
+        viewport.clientWidth < REDUCED_WIDTH_THRESHOLD ? REDUCED : FULL;
+
+      if (!messageContainer) {
+        return;
+      }
+
+      this.popper = createPopper(messageContainer, element, {
+        placement: "top-end",
+        strategy: "fixed",
+        modifiers: [
+          {
+            name: "flip",
+            enabled: true,
+            options: {
+              boundary: viewport,
+              fallbackPlacements: ["bottom-end"],
+            },
+          },
+          { name: "hide", enabled: true },
+          { name: "eventListeners", options: { scroll: false } },
+          {
+            name: "offset",
+            options: { offset: [-2, MSG_ACTIONS_VERTICAL_PADDING] },
+          },
+        ],
+      });
     });
-  },
+  }
 
   @action
-  handleSecondaryButtons(id) {
-    this.messageActions?.[id]?.();
-  },
-});
+  teardown() {
+    this.popper?.destroy();
+    this.popper = null;
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-mobile.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-mobile.hbs
index 02adea78cdc..08c59926d84 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-mobile.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-mobile.hbs
@@ -1,87 +1,94 @@
-<div class="chat-message-actions-backdrop">
+{{#if (and this.site.mobileView this.chat.activeMessage)}}
   <div
-    role="button"
-    class="collapse-area"
-    {{on "touchstart" this.collapseMenu passive=true}}
+    class={{concat-class
+      "chat-message-actions-backdrop"
+      (if this.showFadeIn "fade-in")
+    }}
+    {{did-insert this.fadeAndVibrate}}
   >
-  </div>
-
-  <div class="chat-message-actions">
-    <div class="selected-message-container">
-      <div class="selected-message">
-        <ChatUserAvatar @user={{this.message.user}} />
-        <span
-          {{on "touchstart" this.expandReply passive=true}}
-          role="button"
-          class={{concat-class
-            "selected-message-reply"
-            (if this.hasExpandedReply "is-expanded")
-          }}
-        >
-          {{this.message.message}}
-        </span>
-      </div>
+    <div
+      role="button"
+      class="collapse-area"
+      {{on "touchstart" this.collapseMenu passive=false bubbles=false}}
+    >
     </div>
 
-    <ul class="secondary-actions">
-      {{#each this.secondaryButtons as |button|}}
-        <li class="chat-message-action-item" data-id={{button.id}}>
-          <DButton
-            @class="chat-message-action"
-            @translatedLabel={{button.name}}
-            @icon={{button.icon}}
-            @actionParam={{button.id}}
-            @action={{action
-              "actAndCloseMenu"
-              (get this.messageActions button.id)
+    <div class="chat-message-actions">
+      <div class="selected-message-container">
+        <div class="selected-message">
+          <Chat::UserAvatar @user={{this.message.user}} />
+          <span
+            {{on "touchstart" this.expandReply passive=true}}
+            role="button"
+            class={{concat-class
+              "selected-message-reply"
+              (if this.hasExpandedReply "is-expanded")
             }}
-          />
-        </li>
-      {{/each}}
-    </ul>
-
-    {{#if
-      (or this.messageCapabilities.canReact this.messageCapabilities.canReply)
-    }}
-      <div class="main-actions">
-        {{#if this.messageCapabilities.canReact}}
-          {{#each this.emojiReactions as |reaction|}}
-            <ChatMessageReaction
-              @reaction={{reaction}}
-              @react={{this.messageActions.react}}
-              @class="show"
-            />
-          {{/each}}
-
-          <DButton
-            @class="btn-flat react-btn"
-            @action={{action
-              "actAndCloseMenu"
-              this.messageActions.startReactionForMessageActions
-            }}
-            @icon="discourse-emojis"
-            @title="chat.react"
-          />
-        {{/if}}
-
-        {{#if this.messageCapabilities.canBookmark}}
-          <DButton
-            @class="btn-flat bookmark-btn"
-            @action={{this.messageActions.toggleBookmark}}
           >
-            <BookmarkIcon @bookmark={{this.message.bookmark}} />
-          </DButton>
-        {{/if}}
-
-        {{#if this.messageCapabilities.canReply}}
-          <DButton
-            @class="chat-message-action reply-btn btn-flat"
-            @action={{action "actAndCloseMenu" this.messageActions.reply}}
-            @icon="reply"
-            @title="chat.reply"
-          />
-        {{/if}}
+            {{this.message.message}}
+          </span>
+        </div>
       </div>
-    {{/if}}
+
+      <ul class="secondary-actions">
+        {{#each this.messageInteractor.secondaryActions as |button|}}
+          <li class="chat-message-action-item" data-id={{button.id}}>
+            <DButton
+              @class="chat-message-action"
+              @translatedLabel={{button.name}}
+              @icon={{button.icon}}
+              @actionParam={{button.id}}
+              @action={{action this.actAndCloseMenu button.id}}
+            />
+          </li>
+        {{/each}}
+      </ul>
+
+      {{#if
+        (or this.messageInteractor.canReact this.messageInteractor.canReply)
+      }}
+        <div class="main-actions">
+          {{#if this.messageInteractor.canReact}}
+            {{#each this.messageInteractor.emojiReactions as |reaction|}}
+              <ChatMessageReaction
+                @reaction={{reaction}}
+                @onReaction={{this.messageInteractor.react}}
+                @message={{this.message}}
+                @showCount={{false}}
+              />
+            {{/each}}
+
+            <DButton
+              @class="btn-flat react-btn"
+              @action={{this.openEmojiPicker}}
+              @icon="discourse-emojis"
+              @title="chat.react"
+              @forwardEvent={{true}}
+              data-id="react"
+            />
+          {{/if}}
+
+          {{#if this.messageInteractor.canBookmark}}
+            <DButton
+              @class="btn-flat bookmark-btn"
+              @action={{action this.actAndCloseMenu "toggleBookmark"}}
+              data-id="bookmark"
+            >
+              <BookmarkIcon @bookmark={{this.message.bookmark}} />
+            </DButton>
+          {{/if}}
+
+          {{#if this.messageInteractor.canReply}}
+            <DButton
+              @class="chat-message-action reply-btn btn-flat"
+              @action={{action this.actAndCloseMenu "reply"}}
+              @icon="reply"
+              @title="chat.reply"
+              data-id="reply"
+            />
+          {{/if}}
+        </div>
+      {{/if}}
+    </div>
   </div>
-</div>
\ No newline at end of file
+{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-mobile.js b/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-mobile.js
index 1457f56e55e..43c2373c121 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-mobile.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-mobile.js
@@ -1,43 +1,71 @@
-import Component from "@ember/component";
+import Component from "@glimmer/component";
+import ChatMessageInteractor from "discourse/plugins/chat/discourse/lib/chat-message-interactor";
+import { getOwner } from "discourse-common/lib/get-owner";
+import { tracked } from "@glimmer/tracking";
 import discourseLater from "discourse-common/lib/later";
 import { action } from "@ember/object";
 import { isTesting } from "discourse-common/config/environment";
+import { inject as service } from "@ember/service";
 
-export default Component.extend({
-  tagName: "",
-  hasExpandedReply: false,
-  messageActions: null,
+export default class ChatMessageActionsMobile extends Component {
+  @service chat;
+  @service site;
+  @service capabilities;
 
-  didInsertElement() {
-    this._super(...arguments);
+  @tracked hasExpandedReply = false;
+  @tracked showFadeIn = false;
 
-    discourseLater(this._addFadeIn);
+  get message() {
+    return this.chat.activeMessage.model;
+  }
+
+  get context() {
+    return this.chat.activeMessage.context;
+  }
+
+  get messageInteractor() {
+    return new ChatMessageInteractor(
+      getOwner(this),
+      this.message,
+      this.context
+    );
+  }
+
+  @action
+  fadeAndVibrate() {
+    discourseLater(this.#addFadeIn.bind(this));
 
     if (this.capabilities.canVibrate && !isTesting()) {
       navigator.vibrate(5);
     }
-  },
+  }
 
   @action
   expandReply(event) {
     event.stopPropagation();
-    this.set("hasExpandedReply", true);
-  },
+    this.hasExpandedReply = true;
+  }
 
   @action
   collapseMenu(event) {
-    event.stopPropagation();
-    this.onCloseMenu();
-  },
+    event.preventDefault();
+    this.#onCloseMenu();
+  }
 
   @action
-  actAndCloseMenu(fn) {
-    fn?.();
-    this.onCloseMenu();
-  },
+  actAndCloseMenu(fnId) {
+    this.messageInteractor[fnId]();
+    this.#onCloseMenu();
+  }
 
-  onCloseMenu() {
-    this._removeFadeIn();
+  @action
+  openEmojiPicker(_, event) {
+    this.messageInteractor.openEmojiPicker(_, event);
+    this.#onCloseMenu();
+  }
+
+  #onCloseMenu() {
+    this.#removeFadeIn();
 
     // we don't want to remove the component right away as it's animating
     // 200 is equal to the duration of the css animation
@@ -48,19 +76,15 @@ export default Component.extend({
 
       // by ensuring we are not hovering any message anymore
       // we also ensure the menu is fully removed
-      this.onHoverMessage?.(null);
+      this.chat.activeMessage = null;
     }, 200);
-  },
+  }
 
-  _addFadeIn() {
-    document
-      .querySelector(".chat-message-actions-backdrop")
-      ?.classList.add("fade-in");
-  },
+  #addFadeIn() {
+    this.showFadeIn = true;
+  }
 
-  _removeFadeIn() {
-    document
-      .querySelector(".chat-message-actions-backdrop")
-      ?.classList?.remove("fade-in");
-  },
-});
+  #removeFadeIn() {
+    this.showFadeIn = false;
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-avatar.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-message-avatar.hbs
deleted file mode 100644
index 8b12b5d09d6..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-avatar.hbs
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="chat-message-avatar">
-  {{#if @message.chat_webhook_event.emoji}}
-    <ChatEmojiAvatar @emoji={{@message.chat_webhook_event.emoji}} />
-  {{else}}
-    <ChatUserAvatar @user={{@message.user}} @avatarSize="medium" />
-  {{/if}}
-</div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-avatar.js b/plugins/chat/assets/javascripts/discourse/components/chat-message-avatar.js
deleted file mode 100644
index 5b7b32a549a..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-avatar.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import Component from "@ember/component";
-
-export default class ChatMessageAvatar extends Component {
-  tagName = "";
-}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-collapser.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-message-collapser.hbs
index 97635d8b5e6..0ac4035be2f 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-collapser.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-collapser.hbs
@@ -1,10 +1,10 @@
 <div class="chat-message-collapser">
   {{#if this.hasUploads}}
-    {{html-safe this.cooked}}
+    {{html-safe @cooked}}
 
-    <Collapser @header={{this.uploadsHeader}}>
+    <Collapser @header={{this.uploadsHeader}} @onToggle={{@onToggleCollapse}}>
       <div class="chat-uploads">
-        {{#each this.uploads as |upload|}}
+        {{#each @uploads as |upload|}}
           <ChatUpload @upload={{upload}} />
         {{/each}}
       </div>
@@ -12,8 +12,14 @@
   {{else}}
     {{#each this.cookedBodies as |cooked|}}
       {{#if cooked.needsCollapser}}
-        <Collapser @header={{cooked.header}}>
-          {{cooked.body}}
+        <Collapser @header={{cooked.header}} @onToggle={{@onToggleCollapse}}>
+          {{#if cooked.videoAttributes}}
+            <div class="chat-message-collapser-lazy-video">
+              <LazyVideo @videoAttributes={{cooked.videoAttributes}} />
+            </div>
+          {{else}}
+            {{cooked.body}}
+          {{/if}}
         </Collapser>
       {{else}}
         {{cooked.body}}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-collapser.js b/plugins/chat/assets/javascripts/discourse/components/chat-message-collapser.js
index ab91763bd8d..3a6100e6887 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-collapser.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-collapser.js
@@ -1,28 +1,23 @@
-import Component from "@ember/component";
-import { computed } from "@ember/object";
+import Component from "@glimmer/component";
 import { htmlSafe } from "@ember/template";
+import { inject as service } from "@ember/service";
 import { escapeExpression } from "discourse/lib/utilities";
 import domFromString from "discourse-common/lib/dom-from-string";
 import I18n from "I18n";
 
 export default class ChatMessageCollapser extends Component {
-  tagName = "";
-  collapsed = false;
-  uploads = null;
-  cooked = null;
+  @service siteSettings;
 
-  @computed("uploads")
   get hasUploads() {
-    return hasUploads(this.uploads);
+    return hasUploads(this.args.uploads);
   }
 
-  @computed("uploads")
   get uploadsHeader() {
     let name = "";
-    if (this.uploads.length === 1) {
-      name = this.uploads[0].original_filename;
+    if (this.args.uploads.length === 1) {
+      name = this.args.uploads[0].original_filename;
     } else {
-      name = I18n.t("chat.uploaded_files", { count: this.uploads.length });
+      name = I18n.t("chat.uploaded_files", { count: this.args.uploads.length });
     }
     return htmlSafe(
       `<span class="chat-message-collapser-link-small">${escapeExpression(
@@ -31,12 +26,13 @@ export default class ChatMessageCollapser extends Component {
     );
   }
 
-  @computed("cooked")
   get cookedBodies() {
-    const elements = Array.prototype.slice.call(domFromString(this.cooked));
+    const elements = Array.prototype.slice.call(
+      domFromString(this.args.cooked)
+    );
 
-    if (hasYoutube(elements)) {
-      return this.youtubeCooked(elements);
+    if (hasLazyVideo(elements)) {
+      return this.lazyVideoCooked(elements);
     }
 
     if (hasImageOnebox(elements)) {
@@ -54,20 +50,26 @@ export default class ChatMessageCollapser extends Component {
     return [];
   }
 
-  youtubeCooked(elements) {
+  lazyVideoCooked(elements) {
     return elements.reduce((acc, e) => {
-      if (youtubePredicate(e)) {
-        const id = e.dataset.youtubeId;
-        const link = `https://www.youtube.com/watch?v=${escapeExpression(id)}`;
-        const title = escapeExpression(e.dataset.youtubeTitle);
-        const header = htmlSafe(
-          `<a target="_blank" class="chat-message-collapser-link" rel="noopener noreferrer" href="${link}">${title}</a>`
-        );
-        const body = document.createElement("div");
-        body.className = "chat-message-collapser-youtube";
-        body.appendChild(e);
+      if (this.siteSettings.lazy_videos_enabled && lazyVideoPredicate(e)) {
+        const getVideoAttributes = requirejs(
+          "discourse/plugins/discourse-lazy-videos/lib/lazy-video-attributes"
+        ).default;
 
-        acc.push({ header, body, needsCollapser: true });
+        const videoAttributes = getVideoAttributes(e);
+
+        if (this.siteSettings[`lazy_${videoAttributes.providerName}_enabled`]) {
+          const link = escapeExpression(videoAttributes.url);
+          const title = videoAttributes.title;
+          const header = htmlSafe(
+            `<a target="_blank" class="chat-message-collapser-link" rel="noopener noreferrer" href="${link}">${title}</a>`
+          );
+
+          acc.push({ header, body: e, videoAttributes, needsCollapser: true });
+        } else {
+          acc.push({ body: e, needsCollapser: false });
+        }
       } else {
         acc.push({ body: e, needsCollapser: false });
       }
@@ -132,16 +134,12 @@ export default class ChatMessageCollapser extends Component {
   }
 }
 
-function youtubePredicate(e) {
-  return (
-    e.classList.length &&
-    e.classList.contains("onebox") &&
-    e.classList.contains("lazyYT-container")
-  );
+function lazyVideoPredicate(e) {
+  return e.classList.contains("lazy-video-container");
 }
 
-function hasYoutube(elements) {
-  return elements.some((e) => youtubePredicate(e));
+function hasLazyVideo(elements) {
+  return elements.some((e) => lazyVideoPredicate(e));
 }
 
 function animatedImagePredicate(e) {
@@ -205,7 +203,7 @@ export function isCollapsible(cooked, uploads) {
   const elements = Array.prototype.slice.call(domFromString(cooked));
 
   return (
-    hasYoutube(elements) ||
+    hasLazyVideo(elements) ||
     hasImageOnebox(elements) ||
     hasUploads(uploads) ||
     hasImage(elements) ||
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-in-reply-to-indicator.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-message-in-reply-to-indicator.hbs
new file mode 100644
index 00000000000..716525f3fd1
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-in-reply-to-indicator.hbs
@@ -0,0 +1,19 @@
+{{#if @message.inReplyTo}}
+  <LinkTo
+    @route={{this.route}}
+    @models={{this.model}}
+    class="chat-reply is-direct-reply"
+  >
+    {{d-icon "share" title="chat.in_reply_to"}}
+
+    {{#if @message.inReplyTo.chatWebhookEvent.emoji}}
+      <ChatEmojiAvatar @emoji={{@message.inReplyTo.chatWebhookEvent.emoji}} />
+    {{else}}
+      <Chat::UserAvatar @user={{@message.inReplyTo.user}} />
+    {{/if}}
+
+    <span class="chat-reply__excerpt">
+      {{replace-emoji (html-safe @message.inReplyTo.excerpt)}}
+    </span>
+  </LinkTo>
+{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-in-reply-to-indicator.js b/plugins/chat/assets/javascripts/discourse/components/chat-message-in-reply-to-indicator.js
new file mode 100644
index 00000000000..75f2a714c41
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-in-reply-to-indicator.js
@@ -0,0 +1,35 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+
+export default class ChatMessageInReplyToIndicator extends Component {
+  @service router;
+
+  get route() {
+    if (this.hasThread) {
+      return "chat.channel.thread";
+    } else {
+      return "chat.channel.near-message";
+    }
+  }
+
+  get model() {
+    if (this.hasThread) {
+      return [
+        ...this.args.message.channel.routeModels,
+        this.args.message.thread.id,
+      ];
+    } else {
+      return [
+        ...this.args.message.channel.routeModels,
+        this.args.message.inReplyTo.id,
+      ];
+    }
+  }
+
+  get hasThread() {
+    return (
+      this.args.message?.channel?.threadingEnabled &&
+      this.args.message?.thread?.id
+    );
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-info.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-message-info.hbs
deleted file mode 100644
index a6e06bb6e71..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-info.hbs
+++ /dev/null
@@ -1,48 +0,0 @@
-<div class="chat-message-info">
-  {{#if @message.chat_webhook_event}}
-    {{#if @message.chat_webhook_event.username}}
-      <span class="chat-message-info__username {{this.usernameClasses}}">
-        {{@message.chat_webhook_event.username}}
-      </span>
-    {{/if}}
-
-    <span class="chat-message-info__bot-indicator">
-      {{i18n "chat.bot"}}
-    </span>
-  {{else}}
-    <span
-      role="button"
-      class="chat-message-info__username {{this.usernameClasses}} clickable"
-      data-user-card={{@message.user.username}}
-    >
-      <span class="chat-message-info__username__name">{{this.name}}</span>
-      {{#if this.showStatus}}
-        <div class="chat-message-info__status">
-          <UserStatusMessage @status={{@message.user.status}} />
-        </div>
-      {{/if}}
-    </span>
-  {{/if}}
-
-  <span class="chat-message-info__date">
-    {{format-chat-date @message @details}}
-  </span>
-
-  {{#if @message.bookmark}}
-    <span class="chat-message-info__bookmark">
-      <BookmarkIcon @bookmark={{@message.bookmark}} />
-    </span>
-  {{/if}}
-
-  {{#if this.isFlagged}}
-    <span class="chat-message-info__flag">
-      {{#if @message.reviewable_id}}
-        <LinkTo @route="review.show" @model={{@message.reviewable_id}}>
-          {{d-icon "flag" title="chat.flagged"}}
-        </LinkTo>
-      {{else}}
-        {{d-icon "flag" title="chat.you_flagged"}}
-      {{/if}}
-    </span>
-  {{/if}}
-</div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-info.js b/plugins/chat/assets/javascripts/discourse/components/chat-message-info.js
deleted file mode 100644
index 9bb31d6f4ce..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-info.js
+++ /dev/null
@@ -1,70 +0,0 @@
-import { computed } from "@ember/object";
-import Component from "@ember/component";
-import { prioritizeNameInUx } from "discourse/lib/settings";
-
-export default class ChatMessageInfo extends Component {
-  tagName = "";
-  message = null;
-  details = null;
-
-  didInsertElement() {
-    this._super(...arguments);
-    this.message.user?.trackStatus?.();
-  }
-
-  willDestroyElement() {
-    this._super(...arguments);
-    this.message.user?.stopTrackingStatus?.();
-  }
-
-  @computed("message.user")
-  get name() {
-    return this.prioritizeName
-      ? this.message.user.name
-      : this.message.user.username;
-  }
-
-  @computed("message.reviewable_id", "message.user_flag_status")
-  get isFlagged() {
-    return this.message?.reviewable_id || this.message?.user_flag_status === 0;
-  }
-
-  @computed("message.user.name")
-  get prioritizeName() {
-    return (
-      this.siteSettings.display_name_on_posts &&
-      prioritizeNameInUx(this.message?.user?.name)
-    );
-  }
-
-  @computed("message.user.status")
-  get showStatus() {
-    return !!this.message.user?.status;
-  }
-
-  @computed("message.user")
-  get usernameClasses() {
-    const user = this.message?.user;
-
-    const classes = this.prioritizeName ? ["is-full-name"] : ["is-username"];
-
-    if (!user) {
-      return classes;
-    }
-
-    if (user.staff) {
-      classes.push("is-staff");
-    }
-    if (user.admin) {
-      classes.push("is-admin");
-    }
-    if (user.moderator) {
-      classes.push("is-moderator");
-    }
-    if (user.groupModerator) {
-      classes.push("is-category-moderator");
-    }
-
-    return classes.join(" ");
-  }
-}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-move-to-channel-modal-inner.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-message-move-to-channel-modal-inner.hbs
deleted file mode 100644
index 35c8b3c7d39..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-move-to-channel-modal-inner.hbs
+++ /dev/null
@@ -1,28 +0,0 @@
-<DModalBody @title="chat.move_to_channel.title">
-  <div
-    id="chat-message-move-to-channel-modal-inner"
-    class="chat-message-move-to-channel-modal-inner"
-  >
-    <p>{{this.instructionsText}}</p>
-  </div>
-
-  <ChatChannelChooser
-    @class="chat-move-message-channel-chooser"
-    @content={{this.availableChannels}}
-    @value={{this.destinationChannelId}}
-    @nameProperty="title"
-  />
-</DModalBody>
-
-<div class="modal-footer">
-  <DButton
-    @class="btn-primary"
-    @icon="sign-out-alt"
-    @disabled={{this.disableMoveButton}}
-    @action={{action "moveMessages"}}
-    @label="chat.move_to_channel.confirm_move"
-    @id="chat-confirm-move-messages-to-channel"
-  />
-
-  <DButton @label="cancel" @class="btn-flat" @action={{this.closeModal}} />
-</div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-reaction.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-message-reaction.hbs
index 576c1a935b2..44aa89c5dda 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-reaction.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-reaction.hbs
@@ -1,17 +1,18 @@
-{{#if (and this.reaction this.emojiUrl)}}
+{{#if (and @reaction this.emojiUrl)}}
   <button
-    id={{this.componentId}}
     type="button"
-    {{on "click" (action "handleClick")}}
     tabindex="0"
     class={{concat-class
-      this.class
       "chat-message-reaction"
-      (if this.reaction.reacted "reacted")
-      (if this.reaction.count "show")
+      (if @reaction.reacted "reacted")
+      (if this.isActive "-active")
     }}
-    data-emoji-name={{this.reaction.emoji}}
+    data-emoji-name={{@reaction.emoji}}
+    data-tippy-content={{this.popoverContent}}
     title={{this.emojiString}}
+    {{did-insert this.setup}}
+    {{will-destroy this.teardown}}
+    {{did-update this.refreshTooltip this.popoverContent}}
   >
     <img
       loading="lazy"
@@ -22,8 +23,8 @@
       src={{this.emojiUrl}}
     />
 
-    {{#if this.reaction.count}}
-      <span class="count">{{this.reaction.count}}</span>
+    {{#if (and this.showCount @reaction.count)}}
+      <span class="count">{{@reaction.count}}</span>
     {{/if}}
   </button>
 {{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-reaction.js b/plugins/chat/assets/javascripts/discourse/components/chat-message-reaction.js
index a15cdc06b73..ef5b1bac146 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-reaction.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-reaction.js
@@ -1,119 +1,243 @@
-import { guidFor } from "@ember/object/internals";
-import Component from "@ember/component";
-import { action, computed } from "@ember/object";
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
 import { emojiUnescape, emojiUrlFor } from "discourse/lib/text";
-import setupPopover from "discourse/lib/d-popover";
 import I18n from "I18n";
-import { schedule } from "@ember/runloop";
+import { cancel } from "@ember/runloop";
+import { inject as service } from "@ember/service";
+import setupPopover from "discourse/lib/d-popover";
+import discourseLater from "discourse-common/lib/later";
+import { tracked } from "@glimmer/tracking";
 
 export default class ChatMessageReaction extends Component {
-  reaction = null;
-  showUsersList = false;
-  tagName = "";
-  react = null;
-  class = null;
+  @service capabilities;
+  @service currentUser;
 
-  didReceiveAttrs() {
-    this._super(...arguments);
+  @tracked isActive = false;
 
-    if (this.showUsersList) {
-      schedule("afterRender", () => {
-        this._popover?.destroy();
-        this._popover = this._setupPopover();
-      });
-    }
-  }
-
-  willDestroyElement() {
-    this._super(...arguments);
-
-    this._popover?.destroy();
-  }
-
-  @computed
-  get componentId() {
-    return guidFor(this);
-  }
-
-  @computed("reaction.emoji")
-  get emojiString() {
-    return `:${this.reaction.emoji}:`;
-  }
-
-  @computed("reaction.emoji")
-  get emojiUrl() {
-    return emojiUrlFor(this.reaction.emoji);
+  get showCount() {
+    return this.args.showCount ?? true;
   }
 
   @action
-  handleClick() {
-    this?.react(this.reaction.emoji, this.reaction.reacted ? "remove" : "add");
-    return false;
+  setup(element) {
+    this.setupListeners(element);
+    this.setupTooltip(element);
   }
 
-  _setupPopover() {
-    const target = document.getElementById(this.componentId);
+  @action
+  teardown() {
+    cancel(this.longPressHandler);
+    this.teardownTooltip();
+  }
 
-    if (!target) {
+  @action
+  setupListeners(element) {
+    this.element = element;
+
+    if (this.capabilities.touch) {
+      this.element.addEventListener("touchstart", this.onTouchStart, {
+        passive: true,
+      });
+      this.element.addEventListener("touchmove", this.cancelTouch, {
+        passive: true,
+      });
+      this.element.addEventListener("touchend", this.onTouchEnd);
+      this.element.addEventListener("touchCancel", this.cancelTouch);
+    }
+
+    this.element.addEventListener("click", this.handleClick, {
+      passive: true,
+    });
+  }
+
+  @action
+  teardownListeners() {
+    if (this.capabilities.touch) {
+      this.element.removeEventListener("touchstart", this.onTouchStart, {
+        passive: true,
+      });
+      this.element.removeEventListener("touchmove", this.cancelTouch, {
+        passive: true,
+      });
+      this.element.removeEventListener("touchend", this.onTouchEnd);
+      this.element.removeEventListener("touchCancel", this.cancelTouch);
+    }
+
+    this.element.removeEventListener("click", this.handleClick, {
+      passive: true,
+    });
+  }
+
+  @action
+  onTouchStart(event) {
+    event.stopPropagation();
+    this.isActive = true;
+
+    this.longPressHandler = discourseLater(() => {
+      this.touching = false;
+    }, 400);
+
+    this.touching = true;
+  }
+
+  @action
+  cancelTouch() {
+    cancel(this.longPressHandler);
+    this._tippyInstance?.hide();
+    this.touching = false;
+    this.isActive = false;
+  }
+
+  @action
+  onTouchEnd(event) {
+    event.preventDefault();
+
+    if (this.touching) {
+      this.handleClick(event);
+    }
+
+    cancel(this.longPressHandler);
+    this._tippyInstance?.hide();
+    this.isActive = false;
+  }
+
+  @action
+  setupTooltip(element) {
+    this._tippyInstance = setupPopover(element, {
+      trigger: "mouseenter",
+      interactive: false,
+      allowHTML: true,
+      offset: [0, 10],
+      onShow(instance) {
+        if (instance.props.content === "") {
+          return false;
+        }
+      },
+    });
+  }
+
+  @action
+  teardownTooltip() {
+    this._tippyInstance?.destroy();
+  }
+
+  @action
+  refreshTooltip() {
+    this._tippyInstance?.setContent(this.popoverContent || "");
+  }
+
+  get emojiString() {
+    return `:${this.args.reaction.emoji}:`;
+  }
+
+  get emojiUrl() {
+    return emojiUrlFor(this.args.reaction.emoji);
+  }
+
+  @action
+  handleClick(event) {
+    event.stopPropagation();
+
+    this.args.onReaction?.(
+      this.args.reaction.emoji,
+      this.args.reaction.reacted ? "remove" : "add"
+    );
+
+    this._tippyInstance?.clearDelayTimeouts();
+  }
+
+  get popoverContent() {
+    if (!this.args.reaction.count || !this.args.reaction.users?.length) {
       return;
     }
 
-    const popover = setupPopover(target, {
-      interactive: false,
-      allowHTML: true,
-      delay: 250,
-      content: emojiUnescape(this.popoverContent),
-      onClickOutside(instance) {
-        instance.hide();
-      },
-      onTrigger(instance, event) {
-        // ensures we close other reactions popovers when triggering one
-        document
-          .querySelectorAll(".chat-message-reaction")
-          .forEach((chatMessageReaction) => {
-            chatMessageReaction?._tippy?.hide();
-          });
-
-        event.stopPropagation();
-      },
-    });
-
-    return popover?.id ? popover : null;
+    return emojiUnescape(
+      this.args.reaction.reacted
+        ? this.#reactionTextWithSelf
+        : this.#reactionText
+    );
   }
 
-  @computed("reaction")
-  get popoverContent() {
-    let usernames = this.reaction.users.mapBy("username").join(", ");
-    if (this.reaction.reacted) {
-      if (this.reaction.count === 1) {
-        return I18n.t("chat.reactions.only_you", {
-          emoji: this.reaction.emoji,
-        });
-      } else if (this.reaction.count > 1 && this.reaction.count < 6) {
-        return I18n.t("chat.reactions.and_others", {
-          usernames,
-          emoji: this.reaction.emoji,
-        });
-      } else if (this.reaction.count >= 6) {
-        return I18n.t("chat.reactions.you_others_and_more", {
-          usernames,
-          emoji: this.reaction.emoji,
-          more: this.reaction.count - 5,
-        });
-      }
-    } else {
-      if (this.reaction.count > 0 && this.reaction.count < 6) {
-        return I18n.t("chat.reactions.only_others", {
-          usernames,
-          emoji: this.reaction.emoji,
-        });
-      } else if (this.reaction.count >= 6) {
-        return I18n.t("chat.reactions.others_and_more", {
-          usernames,
-          emoji: this.reaction.emoji,
-          more: this.reaction.count - 5,
-        });
-      }
+  get #reactionTextWithSelf() {
+    const reactionCount = this.args.reaction.count;
+
+    if (reactionCount === 0) {
+      return;
     }
+
+    if (reactionCount === 1) {
+      return I18n.t("chat.reactions.only_you", {
+        emoji: this.args.reaction.emoji,
+      });
+    }
+
+    const maxUsernames = 5;
+    const usernames = this.args.reaction.users
+      .filter((user) => user.id !== this.currentUser?.id)
+      .slice(0, maxUsernames)
+      .mapBy("username");
+
+    if (reactionCount === 2) {
+      return I18n.t("chat.reactions.you_and_single_user", {
+        emoji: this.args.reaction.emoji,
+        username: usernames.pop(),
+      });
+    }
+
+    const unnamedUserCount = reactionCount - usernames.length;
+    if (unnamedUserCount > 0) {
+      return I18n.t("chat.reactions.you_multiple_users_and_more", {
+        emoji: this.args.reaction.emoji,
+        commaSeparatedUsernames: this.#joinUsernames(usernames),
+        count: unnamedUserCount,
+      });
+    }
+
+    return I18n.t("chat.reactions.you_and_multiple_users", {
+      emoji: this.args.reaction.emoji,
+      username: usernames.pop(),
+      commaSeparatedUsernames: this.#joinUsernames(usernames),
+    });
+  }
+
+  get #reactionText() {
+    const reactionCount = this.args.reaction.count;
+
+    if (reactionCount === 0) {
+      return;
+    }
+
+    const maxUsernames = 5;
+    const usernames = this.args.reaction.users
+      .filter((user) => user.id !== this.currentUser?.id)
+      .slice(0, maxUsernames)
+      .mapBy("username");
+
+    if (reactionCount === 1) {
+      return I18n.t("chat.reactions.single_user", {
+        emoji: this.args.reaction.emoji,
+        username: usernames.pop(),
+      });
+    }
+
+    const unnamedUserCount = reactionCount - usernames.length;
+
+    if (unnamedUserCount > 0) {
+      return I18n.t("chat.reactions.multiple_users_and_more", {
+        emoji: this.args.reaction.emoji,
+        commaSeparatedUsernames: this.#joinUsernames(usernames),
+        count: unnamedUserCount,
+      });
+    }
+
+    return I18n.t("chat.reactions.multiple_users", {
+      emoji: this.args.reaction.emoji,
+      username: usernames.pop(),
+      commaSeparatedUsernames: this.#joinUsernames(usernames),
+    });
+  }
+
+  #joinUsernames(usernames) {
+    return usernames.join(I18n.t("word_connector.comma"));
   }
 }
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-separator-date.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-message-separator-date.hbs
new file mode 100644
index 00000000000..9b5361dcd2c
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-separator-date.hbs
@@ -0,0 +1,30 @@
+{{#if @message.formattedFirstMessageDate}}
+  <div
+    class={{concat-class
+      "chat-message-separator-date"
+      (if @message.newest "with-last-visit")
+    }}
+    role="button"
+    {{on "click" this.onDateClick passive=true}}
+  >
+    <div
+      class="chat-message-separator__text-container"
+      {{chat/track-message-separator-date}}
+    >
+      <span class="chat-message-separator__text">
+        {{@message.formattedFirstMessageDate}}
+
+        {{#if @message.newest}}
+          <span class="chat-message-separator__last-visit">
+            <span class="chat-message-separator__last-visit-separator">-</span>
+            {{i18n "chat.last_visit"}}
+          </span>
+        {{/if}}
+      </span>
+    </div>
+  </div>
+
+  <div class="chat-message-separator__line-container">
+    <div class="chat-message-separator__line"></div>
+  </div>
+{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-separator-date.js b/plugins/chat/assets/javascripts/discourse/components/chat-message-separator-date.js
new file mode 100644
index 00000000000..411dfcdaecb
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-separator-date.js
@@ -0,0 +1,11 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+
+export default class ChatMessageSeparatorDate extends Component {
+  @action
+  onDateClick() {
+    return this.args.fetchMessagesByDate?.(
+      this.args.message.firstMessageOfTheDayAt
+    );
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-separator-new.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-message-separator-new.hbs
new file mode 100644
index 00000000000..7aaba0ccb65
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-separator-new.hbs
@@ -0,0 +1,13 @@
+{{#if (and @message.newest (not @message.formattedFirstMessageDate))}}
+  <div class="chat-message-separator-new">
+    <div class="chat-message-separator__text-container">
+      <span class="chat-message-separator__text">
+        {{i18n "chat.last_visit"}}
+      </span>
+    </div>
+
+    <div class="chat-message-separator__line-container">
+      <div class="chat-message-separator__line"></div>
+    </div>
+  </div>
+{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-separator.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-message-separator.hbs
deleted file mode 100644
index 7cb5a5e8898..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-separator.hbs
+++ /dev/null
@@ -1,15 +0,0 @@
-{{#if this.message.newestMessage}}
-  <div class="chat-message-separator new-message">
-    <div class="divider"></div>
-    <span class="text">
-      {{i18n "chat.new_messages"}}
-    </span>
-  </div>
-{{else if this.message.firstMessageOfTheDayAt}}
-  <div class="chat-message-separator first-daily-message">
-    <div class="divider"></div>
-    <span class="text">
-      {{this.message.firstMessageOfTheDayAt}}
-    </span>
-  </div>
-{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-separator.js b/plugins/chat/assets/javascripts/discourse/components/chat-message-separator.js
deleted file mode 100644
index 44494409ab5..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-separator.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import Component from "@ember/component";
-
-export default Component.extend({
-  tagName: "",
-});
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-text.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-message-text.hbs
index a11a76454b6..e6f8059e3fb 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-text.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-text.hbs
@@ -1,11 +1,15 @@
 <div class="chat-message-text">
   {{#if this.isCollapsible}}
-    <ChatMessageCollapser @cooked={{this.cooked}} @uploads={{this.uploads}} />
+    <ChatMessageCollapser
+      @cooked={{@cooked}}
+      @uploads={{@uploads}}
+      @onToggleCollapse={{@onToggleCollapse}}
+    />
   {{else}}
-    {{html-safe this.cooked}}
+    {{html-safe @cooked}}
   {{/if}}
 
-  {{#if this.edited}}
+  {{#if this.isEdited}}
     <span class="chat-message-edited">({{i18n "chat.edited"}})</span>
   {{/if}}
 
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-text.js b/plugins/chat/assets/javascripts/discourse/components/chat-message-text.js
index d02c47ba1cc..042d774ba61 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-text.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-text.js
@@ -1,15 +1,12 @@
-import Component from "@ember/component";
-import { computed } from "@ember/object";
+import Component from "@glimmer/component";
 import { isCollapsible } from "discourse/plugins/chat/discourse/components/chat-message-collapser";
 
 export default class ChatMessageText extends Component {
-  tagName = "";
-  cooked = null;
-  uploads = null;
-  edited = false;
+  get isEdited() {
+    return this.args.edited ?? false;
+  }
 
-  @computed("cooked", "uploads.[]")
   get isCollapsible() {
-    return isCollapsible(this.cooked, this.uploads);
+    return isCollapsible(this.args.cooked, this.args.uploads);
   }
 }
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-thread-indicator.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-message-thread-indicator.hbs
new file mode 100644
index 00000000000..2e16cc3d229
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-thread-indicator.hbs
@@ -0,0 +1,34 @@
+<div
+  class={{concat-class
+    "chat-message-thread-indicator"
+    (if this.isActive "-active")
+  }}
+  {{did-insert this.setup}}
+  {{will-destroy this.teardown}}
+  role="button"
+  title={{i18n "chat.threads.open"}}
+>
+
+  <div class="chat-message-thread-indicator__last-reply-avatar">
+    <Chat::UserAvatar
+      @user={{@message.thread.preview.lastReplyUser}}
+      @avatarSize="small"
+    />
+  </div>
+
+  <div class="chat-message-thread-indicator__last-reply-info">
+    <span class="chat-message-thread-indicator__last-reply-username">
+      {{@message.thread.preview.lastReplyUser.username}}
+    </span>
+    <span class="chat-message-thread-indicator__last-reply-timestamp">
+      {{format-date @message.thread.preview.lastReplyCreatedAt leaveAgo="true"}}
+    </span>
+  </div>
+  <div class="chat-message-thread-indicator__replies-count">
+    {{i18n "chat.thread.replies" count=@message.thread.preview.replyCount}}
+  </div>
+  <Chat::Thread::Participants @thread={{@message.thread}} />
+  <div class="chat-message-thread-indicator__last-reply-excerpt">
+    {{replace-emoji (html-safe @message.thread.preview.lastReplyExcerpt)}}
+  </div>
+</div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-thread-indicator.js b/plugins/chat/assets/javascripts/discourse/components/chat-message-thread-indicator.js
new file mode 100644
index 00000000000..d77121cebe6
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-thread-indicator.js
@@ -0,0 +1,86 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+import { bind } from "discourse-common/utils/decorators";
+import { tracked } from "@glimmer/tracking";
+
+export default class ChatMessageThreadIndicator extends Component {
+  @service capabilities;
+  @service chat;
+  @service chatStateManager;
+  @service router;
+  @service site;
+
+  @tracked isActive = false;
+
+  @action
+  setup(element) {
+    this.element = element;
+
+    if (this.capabilities.touch) {
+      this.element.addEventListener("touchstart", this.onTouchStart, {
+        passive: true,
+      });
+      this.element.addEventListener("touchmove", this.cancelTouch, {
+        passive: true,
+      });
+      this.element.addEventListener("touchend", this.onTouchEnd);
+      this.element.addEventListener("touchCancel", this.cancelTouch);
+    }
+
+    this.element.addEventListener("click", this.openThread, {
+      passive: true,
+    });
+  }
+
+  @action
+  teardown() {
+    if (this.capabilities.touch) {
+      this.element.removeEventListener("touchstart", this.onTouchStart, {
+        passive: true,
+      });
+      this.element.removeEventListener("touchmove", this.cancelTouch, {
+        passive: true,
+      });
+      this.element.removeEventListener("touchend", this.onTouchEnd);
+      this.element.removeEventListener("touchCancel", this.cancelTouch);
+    }
+
+    this.element.removeEventListener("click", this.openThread, {
+      passive: true,
+    });
+  }
+
+  @bind
+  onTouchStart(event) {
+    this.isActive = true;
+    event.stopPropagation();
+
+    this.touching = true;
+  }
+
+  @bind
+  onTouchEnd() {
+    this.isActive = false;
+
+    if (this.touching) {
+      this.openThread();
+    }
+  }
+
+  @bind
+  cancelTouch() {
+    this.isActive = false;
+    this.touching = false;
+  }
+
+  @bind
+  openThread() {
+    this.chat.activeMessage = null;
+
+    this.router.transitionTo(
+      "chat.channel.thread",
+      ...this.args.message.thread.routeModels
+    );
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-message.hbs
index c6739296837..73421462cf2 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message.hbs
@@ -1,230 +1,131 @@
 {{! template-lint-disable no-invalid-interactive }}
 
-<ChatMessageSeparator @message={{this.message}} />
-
-{{#if
-  (and
-    this.showActions this.site.mobileView this.chatMessageActionsMobileAnchor
-  )
-}}
-  {{#in-element this.chatMessageActionsMobileAnchor}}
-    <ChatMessageActionsMobile
-      @message={{this.message}}
-      @emojiReactions={{this.emojiReactions}}
-      @secondaryButtons={{this.secondaryButtons}}
-      @messageActions={{this.messageActions}}
-      @messageCapabilities={{this.messageCapabilities}}
-      @onHoverMessage={{this.onHoverMessage}}
+{{#if this.shouldRender}}
+  {{#if (eq @context "channel")}}
+    <ChatMessageSeparatorDate
+      @fetchMessagesByDate={{@fetchMessagesByDate}}
+      @message={{@message}}
     />
-  {{/in-element}}
-{{/if}}
+    <ChatMessageSeparatorNew @message={{@message}} />
+  {{/if}}
 
-{{#if
-  (and
-    this.showActions this.site.desktopView this.chatMessageActionsDesktopAnchor
-  )
-}}
-  {{#in-element this.chatMessageActionsDesktopAnchor}}
-    <ChatMessageActionsDesktop
-      @message={{this.message}}
-      @emojiReactions={{this.emojiReactions}}
-      @secondaryButtons={{this.secondaryButtons}}
-      @messageActions={{this.messageActions}}
-      @messageCapabilities={{this.messageCapabilities}}
-    />
-  {{/in-element}}
-{{/if}}
-
-<div
-  {{on "touchmove" this.handleTouchMove passive=true}}
-  {{on "touchstart" this.handleTouchStart passive=true}}
-  {{on "touchend" this.handleTouchEnd passive=true}}
-  {{on
-    "mouseenter"
-    (fn this.onHoverMessage this.message (hash desktopOnly=true))
-  }}
-  {{on "mouseleave" (fn this.onHoverMessage null (hash desktopOnly=true))}}
-  {{chat/track-message-visibility}}
-  class={{concat-class
-    "chat-message-container"
-    (if this.isHovered "is-hovered")
-    (if this.selectingMessages "selecting-messages")
-  }}
-  data-id={{or this.message.id this.message.stagedId}}
-  data-staged-id={{if this.message.staged this.message.stagedId}}
->
-  {{#if this.show}}
-    {{#if this.selectingMessages}}
-      <Input
-        @type="checkbox"
-        class="chat-message-selector"
-        @checked={{this.message.selected}}
-        {{on "click" (action "toggleChecked")}}
-      />
-    {{/if}}
-
-    {{#if this.deletedAndCollapsed}}
-      <div class="chat-message-deleted">
-        <DButton
-          @class="btn-flat chat-message-expand"
-          @action={{action "expand"}}
-          @label="chat.deleted"
+  <div
+    class={{concat-class
+      "chat-message-container"
+      (if this.pane.selectingMessages "-selectable")
+      (if @message.highlighted "-highlighted")
+      (if (eq @message.user.id this.currentUser.id) "is-by-current-user")
+      (if @message.staged "-staged" "-persisted")
+      (if this.hasActiveState "-active")
+      (if @message.bookmark "-bookmarked")
+      (if @message.deletedAt "-deleted")
+      (if @message.selected "-selected")
+      (if @message.error "-errored")
+      (if this.showThreadIndicator "has-thread-indicator")
+      (if this.hideUserInfo "-user-info-hidden")
+      (if this.hasReply "has-reply")
+    }}
+    data-id={{@message.id}}
+    data-thread-id={{@message.thread.id}}
+    {{did-insert this.didInsertMessage}}
+    {{did-update this.didUpdateMessageId @message.id}}
+    {{did-update this.didUpdateMessageVersion @message.version}}
+    {{will-destroy this.willDestroyMessage}}
+    {{on "mouseenter" this.onMouseEnter passive=true}}
+    {{on "mouseleave" this.onMouseLeave passive=true}}
+    {{on "mousemove" this.onMouseMove passive=true}}
+    {{chat/on-long-press
+      this.onLongPressStart
+      this.onLongPressEnd
+      this.onLongPressCancel
+    }}
+    ...attributes
+  >
+    {{#if this.show}}
+      {{#if this.pane.selectingMessages}}
+        <Input
+          @type="checkbox"
+          class="chat-message-selector"
+          @checked={{@message.selected}}
+          {{on "click" this.toggleChecked}}
         />
-      </div>
-    {{else if this.hiddenAndCollapsed}}
-      <div class="chat-message-hidden">
-        <DButton
-          @class="btn-flat chat-message-expand"
-          @action={{action "expand"}}
-          @label="chat.hidden"
-        />
-      </div>
-    {{else}}
-      <div class={{this.chatMessageClasses}}>
-        {{#if this.message.in_reply_to}}
-          <div
-            role="button"
-            onclick={{action "viewReply"}}
-            class="chat-reply is-direct-reply"
-          >
-            {{d-icon "share" title="chat.in_reply_to"}}
+      {{/if}}
 
-            {{#if this.message.in_reply_to.chat_webhook_event.emoji}}
-              <ChatEmojiAvatar
-                @emoji={{this.message.in_reply_to.chat_webhook_event.emoji}}
-              />
-            {{else}}
-              <ChatUserAvatar @user={{this.message.in_reply_to.user}} />
-            {{/if}}
-
-            <span class="chat-reply__excerpt">
-              {{replace-emoji this.message.in_reply_to.excerpt}}
-            </span>
-          </div>
-        {{/if}}
-
-        {{#if this.hideUserInfo}}
-          <ChatMessageLeftGutter @message={{@message}} @details={{@details}} />
-        {{else}}
-          <ChatMessageAvatar @message={{@message}} />
-        {{/if}}
-
-        <div class="chat-message-content">
-          {{#unless this.hideUserInfo}}
-            <ChatMessageInfo @message={{@message}} @details={{@details}} />
+      {{#if this.deletedAndCollapsed}}
+        <div class="chat-message-text -deleted">
+          <DButton
+            @class="btn-flat chat-message-expand"
+            @action={{this.expand}}
+            @translatedLabel={{this.deletedMessageLabel}}
+          />
+        </div>
+      {{else if this.hiddenAndCollapsed}}
+        <div class="chat-message-text -hidden">
+          <DButton
+            @class="btn-flat chat-message-expand"
+            @action={{this.expand}}
+            @label="chat.hidden"
+          />
+        </div>
+      {{else}}
+        <div class="chat-message">
+          {{#unless this.hideReplyToInfo}}
+            <ChatMessageInReplyToIndicator @message={{@message}} />
           {{/unless}}
 
-          <ChatMessageText
-            @cooked={{this.message.cooked}}
-            @uploads={{this.message.uploads}}
-            @edited={{this.message.edited}}
-          >
-            {{#if this.hasReactions}}
-              <div class="chat-message-reaction-list">
-                {{#if this.reactionLabel}}
-                  <div class="reaction-users-list">
-                    {{replace-emoji this.reactionLabel}}
-                  </div>
-                {{/if}}
+          {{#if this.hideUserInfo}}
+            <Chat::Message::LeftGutter @message={{@message}} />
+          {{else}}
+            <Chat::Message::Avatar @message={{@message}} />
+          {{/if}}
 
-                {{#each-in this.message.reactions as |emoji reactionAttrs|}}
-                  <ChatMessageReaction
-                    @reaction={{hash
-                      emoji=emoji
-                      users=reactionAttrs.users
-                      count=reactionAttrs.count
-                      reacted=reactionAttrs.reacted
-                    }}
-                    @react={{action "react"}}
-                    @showUsersList={{true}}
-                  />
-                {{/each-in}}
+          <div class="chat-message-content">
+            <Chat::Message::Info
+              @message={{@message}}
+              @show={{not this.hideUserInfo}}
+            />
 
-                {{#if this.canInteractWithChat}}
-                  {{#unless this.site.mobileView}}
+            <ChatMessageText
+              @cooked={{@message.cooked}}
+              @uploads={{@message.uploads}}
+              @edited={{@message.edited}}
+            >
+              {{#if @message.reactions.length}}
+                <div class="chat-message-reaction-list">
+                  {{#each @message.reactions as |reaction|}}
+                    <ChatMessageReaction
+                      @reaction={{reaction}}
+                      @onReaction={{this.messageInteractor.react}}
+                      @message={{@message}}
+                      @showTooltip={{true}}
+                    />
+                  {{/each}}
+
+                  {{#if this.shouldRenderOpenEmojiPickerButton}}
                     <DButton
                       @class="chat-message-react-btn"
-                      @action={{action "startReactionForReactionList"}}
+                      @action={{this.messageInteractor.openEmojiPicker}}
                       @icon="discourse-emojis"
                       @title="chat.react"
+                      @forwardEvent={{true}}
                     />
-                  {{/unless}}
-                {{/if}}
-              </div>
-            {{/if}}
-          </ChatMessageText>
-
-          {{#if this.message.error}}
-            <div class="chat-send-error">
-              {{#if (eq this.message.error "network_error")}}
-                <DButton
-                  class="retry-staged-message-btn"
-                  @action={{fn this.resendStagedMessage this.message}}
-                >
-                  {{d-icon "exclamation-circle"}}
-                  <span class="retry-staged-message-btn__title">
-                    {{i18n "chat.retry_staged_message.title"}}
-                  </span>
-                  <span class="retry-staged-message-btn__action">
-                    {{i18n "chat.retry_staged_message.action"}}
-                  </span>
-                </DButton>
-              {{else}}
-                {{this.message.error}}
+                  {{/if}}
+                </div>
               {{/if}}
-            </div>
-          {{/if}}
+            </ChatMessageText>
 
-          {{#if this.mentionWarning}}
-            <div class="alert alert-info chat-message-mention-warning">
-              {{#if this.mentionWarning.invitationSent}}
-                {{d-icon "check"}}
-                <span>
-                  {{i18n
-                    "chat.mention_warning.invitations_sent"
-                    count=this.mentionWarning.without_membership.length
-                  }}
-                </span>
-              {{else}}
-                <FlatButton
-                  @class="dismiss-mention-warning"
-                  @title="chat.mention_warning.dismiss"
-                  @action={{action "dismissMentionWarning"}}
-                  @icon="times"
-                />
+            <Chat::Message::Error
+              @message={{@message}}
+              @onRetry={{@resendStagedMessage}}
+            />
+            <Chat::Message::MentionWarning @message={{@message}} />
+          </div>
 
-                {{#if this.mentionWarning.cannot_see}}
-                  <p
-                    class="warning-item cannot-see"
-                  >{{this.mentionedCannotSeeText}}</p>
-                {{/if}}
-
-                {{#if this.mentionWarning.without_membership}}
-                  <p class="warning-item without-membership">
-                    <span>{{this.mentionedWithoutMembershipText}}</span>
-                    <a
-                      class="invite-link"
-                      href
-                      onclick={{action "inviteMentioned"}}
-                    >
-                      {{i18n "chat.mention_warning.invite"}}
-                    </a>
-                  </p>
-                {{/if}}
-                {{#if this.mentionWarning.group_mentions_disabled}}
-                  <p
-                    class="warning-item"
-                  >{{this.groupsWithDisabledMentions}}</p>
-                {{/if}}
-
-                {{#if this.mentionWarning.groups_with_too_many_members}}
-                  <p class="warning-item">{{this.groupsWithTooManyMembers}}</p>
-                {{/if}}
-              {{/if}}
-            </div>
+          {{#if this.showThreadIndicator}}
+            <ChatMessageThreadIndicator @message={{@message}} />
           {{/if}}
         </div>
-      </div>
+      {{/if}}
     {{/if}}
-  {{/if}}
-</div>
\ No newline at end of file
+  </div>
+{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message.js b/plugins/chat/assets/javascripts/discourse/components/chat-message.js
index 13e46c27f82..57f796172c9 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message.js
@@ -1,27 +1,20 @@
-import Bookmark from "discourse/models/bookmark";
-import { openBookmarkModal } from "discourse/controllers/bookmark";
-import { isTesting } from "discourse-common/config/environment";
-import Component from "@ember/component";
+import { action } from "@ember/object";
+import Component from "@glimmer/component";
 import I18n from "I18n";
-import getURL from "discourse-common/lib/get-url";
 import optionalService from "discourse/lib/optional-service";
-import discourseComputed, {
-  afterRender,
-  bind,
-} from "discourse-common/utils/decorators";
-import EmberObject, { action, computed } from "@ember/object";
-import { and, not } from "@ember/object/computed";
-import { ajax } from "discourse/lib/ajax";
-import { cancel, once } from "@ember/runloop";
-import { clipboardCopy } from "discourse/lib/utilities";
+import { cancel, schedule } from "@ember/runloop";
 import { inject as service } from "@ember/service";
-import { popupAjaxError } from "discourse/lib/ajax-error";
 import discourseLater from "discourse-common/lib/later";
 import isZoomed from "discourse/plugins/chat/discourse/lib/zoom-check";
-import showModal from "discourse/lib/show-modal";
-import ChatMessageFlag from "discourse/plugins/chat/discourse/lib/chat-message-flag";
+import { getOwner } from "discourse-common/lib/get-owner";
+import ChatMessageInteractor from "discourse/plugins/chat/discourse/lib/chat-message-interactor";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { bind } from "discourse-common/utils/decorators";
+import { updateUserStatusOnMention } from "discourse/lib/update-user-status-on-mention";
+import { tracked } from "@glimmer/tracking";
 
 let _chatMessageDecorators = [];
+let _tippyInstances = [];
 
 export function addChatMessageDecorator(decorator) {
   _chatMessageDecorators.push(decorator);
@@ -32,791 +25,413 @@ export function resetChatMessageDecorators() {
 }
 
 export const MENTION_KEYWORDS = ["here", "all"];
+export const MESSAGE_CONTEXT_THREAD = "thread";
 
-export default Component.extend({
-  ADD_REACTION: "add",
-  REMOVE_REACTION: "remove",
-  SHOW_LEFT: "showLeft",
-  SHOW_RIGHT: "showRight",
-  canInteractWithChat: false,
-  isHovered: false,
-  onHoverMessage: null,
-  chatEmojiReactionStore: service("chat-emoji-reaction-store"),
-  chatEmojiPickerManager: service("chat-emoji-picker-manager"),
-  chatChannelsManager: service("chat-channels-manager"),
-  adminTools: optionalService(),
-  _hasSubscribedToAppEvents: false,
-  tagName: "",
-  chat: service(),
-  dialog: service(),
-  chatMessageActionsMobileAnchor: null,
-  chatMessageActionsDesktopAnchor: null,
-  chatMessageEmojiPickerAnchor: null,
-  cachedFavoritesReactions: null,
+export default class ChatMessage extends Component {
+  @service site;
+  @service dialog;
+  @service currentUser;
+  @service appEvents;
+  @service capabilities;
+  @service chat;
+  @service chatApi;
+  @service chatEmojiReactionStore;
+  @service chatEmojiPickerManager;
+  @service chatChannelPane;
+  @service chatThreadPane;
+  @service chatChannelsManager;
+  @service router;
 
-  init() {
-    this._super(...arguments);
+  @tracked isActive = false;
 
-    this.set("_loadingReactions", []);
-    this.message.set("reactions", EmberObject.create(this.message.reactions));
-    this.message.id
-      ? this._subscribeToAppEvents()
-      : this._waitForIdToBePopulated();
-    if (this.message.bookmark) {
-      this.set("message.bookmark", Bookmark.create(this.message.bookmark));
-    }
-  },
+  @optionalService adminTools;
 
-  didInsertElement() {
-    this._super(...arguments);
+  constructor() {
+    super(...arguments);
+    this.initMentionedUsers();
+  }
 
-    this.set(
-      "chatMessageActionsMobileAnchor",
-      document.querySelector(".chat-message-actions-mobile-anchor")
-    );
-    this.set(
-      "chatMessageActionsDesktopAnchor",
-      document.querySelector(".chat-message-actions-desktop-anchor")
+  get pane() {
+    return this.args.context === MESSAGE_CONTEXT_THREAD
+      ? this.chatThreadPane
+      : this.chatChannelPane;
+  }
+
+  get messageInteractor() {
+    return new ChatMessageInteractor(
+      getOwner(this),
+      this.args.message,
+      this.args.context
     );
+  }
 
-    this.set("cachedFavoritesReactions", this.chatEmojiReactionStore.favorites);
-  },
+  get deletedAndCollapsed() {
+    return this.args.message?.deletedAt && this.collapsed;
+  }
 
-  willDestroyElement() {
-    this._super(...arguments);
-    if (this.message.stagedId) {
-      this.appEvents.off(
-        `chat-message-staged-${this.message.stagedId}:id-populated`,
-        this,
-        "_subscribeToAppEvents"
-      );
-    }
+  get hiddenAndCollapsed() {
+    return this.args.message?.hidden && this.collapsed;
+  }
 
-    this.appEvents.off("chat:refresh-message", this, "_refreshedMessage");
+  get collapsed() {
+    return !this.args.message?.expanded;
+  }
 
-    this.appEvents.off(
-      `chat-message-${this.message.id}:reaction`,
-      this,
-      "_handleReactionMessage"
-    );
+  get deletedMessageLabel() {
+    let count = 1;
 
-    cancel(this._invitationSentTimer);
-  },
-
-  didReceiveAttrs() {
-    this._super(...arguments);
-
-    if (!this.show || this.deletedAndCollapsed) {
-      this._decoratedMessageCooked = null;
-    } else if (this.message.cooked !== this._decoratedMessageCooked) {
-      once("afterRender", this.decorateMessageCooked);
-      this._decoratedMessageCooked = this.message.cooked;
-    }
-  },
-
-  @bind
-  _refreshedMessage(message) {
-    if (message.id === this.message.id) {
-      this.decorateMessageCooked();
-    }
-  },
-
-  @bind
-  decorateMessageCooked() {
-    if (!this.messageContainer) {
-      return;
-    }
-
-    _chatMessageDecorators.forEach((decorator) => {
-      decorator.call(this, this.messageContainer, this.chatChannel);
-    });
-  },
-
-  @computed("message.{id,stagedId}")
-  get messageContainer() {
-    const id = this.message?.id || this.message?.stagedId;
-    return (
-      id && document.querySelector(`.chat-message-container[data-id='${id}']`)
-    );
-  },
-
-  _subscribeToAppEvents() {
-    if (!this.message.id || this._hasSubscribedToAppEvents) {
-      return;
-    }
-
-    this.appEvents.on("chat:refresh-message", this, "_refreshedMessage");
-
-    this.appEvents.on(
-      `chat-message-${this.message.id}:reaction`,
-      this,
-      "_handleReactionMessage"
-    );
-    this._hasSubscribedToAppEvents = true;
-  },
-
-  _waitForIdToBePopulated() {
-    this.appEvents.on(
-      `chat-message-staged-${this.message.stagedId}:id-populated`,
-      this,
-      "_subscribeToAppEvents"
-    );
-  },
-
-  @discourseComputed("canInteractWithChat", "message.staged", "isHovered")
-  showActions(canInteractWithChat, messageStaged, isHovered) {
-    return canInteractWithChat && !messageStaged && isHovered;
-  },
-
-  deletedAndCollapsed: and("message.deleted_at", "collapsed"),
-  hiddenAndCollapsed: and("message.hidden", "collapsed"),
-  collapsed: not("message.expanded"),
-
-  @discourseComputed(
-    "selectingMessages",
-    "canFlagMessage",
-    "showDeleteButton",
-    "showRestoreButton",
-    "showEditButton",
-    "showRebakeButton"
-  )
-  secondaryButtons() {
-    const buttons = [];
-
-    buttons.push({
-      id: "copyLinkToMessage",
-      name: I18n.t("chat.copy_link"),
-      icon: "link",
-    });
-
-    if (this.showEditButton) {
-      buttons.push({
-        id: "edit",
-        name: I18n.t("chat.edit"),
-        icon: "pencil-alt",
-      });
-    }
-
-    if (!this.selectingMessages) {
-      buttons.push({
-        id: "selectMessage",
-        name: I18n.t("chat.select"),
-        icon: "tasks",
-      });
-    }
-
-    if (this.canFlagMessage) {
-      buttons.push({
-        id: "flag",
-        name: I18n.t("chat.flag"),
-        icon: "flag",
-      });
-    }
-
-    if (this.showDeleteButton) {
-      buttons.push({
-        id: "deleteMessage",
-        name: I18n.t("chat.delete"),
-        icon: "trash-alt",
-      });
-    }
-
-    if (this.showRestoreButton) {
-      buttons.push({
-        id: "restore",
-        name: I18n.t("chat.restore"),
-        icon: "undo",
-      });
-    }
-
-    if (this.showRebakeButton) {
-      buttons.push({
-        id: "rebakeMessage",
-        name: I18n.t("chat.rebake_message"),
-        icon: "sync-alt",
-      });
-    }
-
-    return buttons;
-  },
-
-  get messageActions() {
-    return {
-      reply: this.reply,
-      react: this.react,
-      copyLinkToMessage: this.copyLinkToMessage,
-      edit: this.edit,
-      selectMessage: this.selectMessage,
-      flag: this.flag,
-      deleteMessage: this.deleteMessage,
-      restore: this.restore,
-      rebakeMessage: this.rebakeMessage,
-      toggleBookmark: this.toggleBookmark,
-      startReactionForMessageActions: this.startReactionForMessageActions,
+    const recursiveCount = (message) => {
+      const previousMessage = message.previousMessage;
+      if (previousMessage?.deletedAt) {
+        count++;
+        recursiveCount(previousMessage);
+      }
     };
-  },
 
-  get messageCapabilities() {
-    return {
-      canReact: this.canReact,
-      canReply: this.canReply,
-      canBookmark: this.showBookmarkButton,
-    };
-  },
+    recursiveCount(this.args.message);
 
-  @discourseComputed("message", "details.can_moderate")
-  show(message, canModerate) {
+    return I18n.t("chat.deleted", { count });
+  }
+
+  get shouldRender() {
     return (
-      !message.deleted_at ||
-      this.currentUser.id === this.message.user.id ||
-      this.currentUser.staff ||
-      canModerate
+      this.args.message.expanded ||
+      !this.args.message.deletedAt ||
+      (this.args.message.deletedAt && !this.args.message.nextMessage?.deletedAt)
     );
-  },
+  }
+
+  get shouldRenderOpenEmojiPickerButton() {
+    return this.chat.userCanInteractWithChat && this.site.desktopView;
+  }
 
   @action
-  handleTouchStart() {
-    // if zoomed don't track long press
-    if (isZoomed()) {
-      return;
+  expand() {
+    const recursiveExpand = (message) => {
+      const previousMessage = message.previousMessage;
+      if (previousMessage?.deletedAt) {
+        previousMessage.expanded = true;
+        recursiveExpand(previousMessage);
+      }
+    };
+
+    this.args.message.expanded = true;
+    this.refreshStatusOnMentions();
+    recursiveExpand(this.args.message);
+  }
+
+  @action
+  toggleChecked(event) {
+    if (event.shiftKey) {
+      this.messageInteractor.bulkSelect(event.target.checked);
     }
 
-    if (!this.isHovered) {
-      // when testing this must be triggered immediately because there
-      // is no concept of "long press" there, the Ember `tap` test helper
-      // does send the touchstart/touchend events but immediately, see
-      // https://github.com/emberjs/ember-test-helpers/blob/master/API.md#tap
-      if (isTesting()) {
-        this._handleLongPress();
+    this.messageInteractor.select(event.target.checked);
+  }
+
+  @action
+  willDestroyMessage() {
+    cancel(this._invitationSentTimer);
+    cancel(this._disableMessageActionsHandler);
+    cancel(this._makeMessageActiveHandler);
+    cancel(this._debounceDecorateCookedMessageHandler);
+    this.#teardownMentionedUsers();
+  }
+
+  #destroyTippyInstances() {
+    _tippyInstances.forEach((instance) => {
+      instance.destroy();
+    });
+    _tippyInstances = [];
+  }
+
+  @action
+  refreshStatusOnMentions() {
+    schedule("afterRender", () => {
+      this.args.message.mentionedUsers.forEach((user) => {
+        const href = `/u/${user.username.toLowerCase()}`;
+        const mentions = this.messageContainer.querySelectorAll(
+          `a.mention[href="${href}"]`
+        );
+
+        mentions.forEach((mention) => {
+          updateUserStatusOnMention(mention, user.status, _tippyInstances);
+        });
+      });
+    });
+  }
+
+  @action
+  didInsertMessage(element) {
+    this.messageContainer = element;
+    this.debounceDecorateCookedMessage();
+    this.refreshStatusOnMentions();
+  }
+
+  @action
+  didUpdateMessageId() {
+    this.debounceDecorateCookedMessage();
+  }
+
+  @action
+  didUpdateMessageVersion() {
+    this.debounceDecorateCookedMessage();
+    this.refreshStatusOnMentions();
+    this.initMentionedUsers();
+  }
+
+  debounceDecorateCookedMessage() {
+    this._debounceDecorateCookedMessageHandler = discourseDebounce(
+      this,
+      this.decorateCookedMessage,
+      this.args.message,
+      100
+    );
+  }
+
+  @action
+  decorateCookedMessage(message) {
+    schedule("afterRender", () => {
+      _chatMessageDecorators.forEach((decorator) => {
+        decorator.call(this, this.messageContainer, message.channel);
+      });
+    });
+  }
+
+  @action
+  initMentionedUsers() {
+    this.args.message.mentionedUsers.forEach((user) => {
+      if (user.isTrackingStatus()) {
+        return;
       }
 
-      this._isPressingHandler = discourseLater(this._handleLongPress, 500);
+      user.trackStatus();
+      user.on("status-changed", this, "refreshStatusOnMentions");
+    });
+  }
+
+  get show() {
+    return (
+      !this.args.message?.deletedAt ||
+      this.currentUser.id === this.args.message?.user?.id ||
+      this.currentUser.staff ||
+      this.args.message?.channel?.canModerate
+    );
+  }
+
+  @action
+  onMouseEnter() {
+    if (this.site.mobileView) {
+      return;
     }
-  },
 
-  @action
-  handleTouchMove() {
-    if (!this.isHovered) {
-      cancel(this._isPressingHandler);
+    if (this.chat.activeMessage?.model?.id === this.args.message.id) {
+      return;
     }
-  },
+
+    this._onMouseEnterMessageDebouncedHandler = discourseDebounce(
+      this,
+      this._debouncedOnHoverMessage,
+      250
+    );
+  }
 
   @action
-  handleTouchEnd() {
-    cancel(this._isPressingHandler);
-  },
+  onMouseMove() {
+    if (this.site.mobileView) {
+      return;
+    }
+
+    if (this.chat.activeMessage?.model?.id === this.args.message.id) {
+      return;
+    }
+
+    this._setActiveMessage();
+  }
 
   @action
-  _handleLongPress() {
+  onMouseLeave(event) {
+    cancel(this._onMouseEnterMessageDebouncedHandler);
+
+    if (this.site.mobileView) {
+      return;
+    }
+
+    if (
+      (event.toElement || event.relatedTarget)?.closest(
+        ".chat-message-actions-container"
+      )
+    ) {
+      return;
+    }
+
+    this.chat.activeMessage = null;
+  }
+
+  @bind
+  _debouncedOnHoverMessage() {
+    this._setActiveMessage();
+  }
+
+  _setActiveMessage() {
+    if (this.args.disableMouseEvents) {
+      return;
+    }
+
+    cancel(this._onMouseEnterMessageDebouncedHandler);
+
+    if (!this.chat.userCanInteractWithChat) {
+      return;
+    }
+
+    if (!this.args.message.expanded) {
+      return;
+    }
+
+    this.chat.activeMessage = {
+      model: this.args.message,
+      context: this.args.context,
+    };
+  }
+
+  @action
+  onLongPressStart(element, event) {
+    if (!this.args.message.expanded) {
+      return;
+    }
+
+    if (event.target.tagName === "IMG") {
+      return;
+    }
+
+    // prevents message to show as active when starting scroll
+    // at this moment scroll has no momentum and the row can
+    // capture the touch event instead of a scroll
+    this._makeMessageActiveHandler = discourseLater(() => {
+      this.isActive = true;
+    }, 125);
+  }
+
+  @action
+  onLongPressCancel() {
+    cancel(this._makeMessageActiveHandler);
+    this.isActive = false;
+
+    // this a tricky bit of code which is needed to prevent the long press
+    // from triggering a click on the message actions panel when releasing finger press
+    // we can't prevent default as we need to keep the event passive for performance reasons
+    // this class will prevent any click from being triggered until removed
+    // this number has been chosen from testing but might need to be increased
+    this._disableMessageActionsHandler = discourseLater(() => {
+      document.documentElement.classList.remove(
+        "disable-message-actions-touch"
+      );
+    }, 200);
+  }
+
+  @action
+  onLongPressEnd(element, event) {
+    if (event.target.tagName === "IMG") {
+      return;
+    }
+
+    cancel(this._makeMessageActiveHandler);
+    this.isActive = false;
+
     if (isZoomed()) {
       // if zoomed don't handle long press
       return;
     }
 
+    document.documentElement.classList.add("disable-message-actions-touch");
     document.activeElement.blur();
-    document.querySelector(".chat-composer-input")?.blur();
+    document.querySelector(".chat-composer__input")?.blur();
 
-    this.onHoverMessage(this.message);
-  },
+    this._setActiveMessage();
+  }
 
-  @discourseComputed("message.hideUserInfo", "message.chat_webhook_event")
-  hideUserInfo(hide, webhookEvent) {
-    return hide && !webhookEvent;
-  },
-
-  @discourseComputed(
-    "message.staged",
-    "message.deleted_at",
-    "message.in_reply_to",
-    "message.error",
-    "message.bookmark",
-    "isHovered"
-  )
-  chatMessageClasses(staged, deletedAt, inReplyTo, error, bookmark, isHovered) {
-    let classNames = ["chat-message"];
-
-    if (staged) {
-      classNames.push("chat-message-staged");
-    }
-    if (deletedAt) {
-      classNames.push("deleted");
-    }
-    if (inReplyTo) {
-      classNames.push("is-reply");
-    }
-    if (this.hideUserInfo) {
-      classNames.push("user-info-hidden");
-    }
-    if (error) {
-      classNames.push("errored");
-    }
-    if (isHovered) {
-      classNames.push("chat-message-selected");
-    }
-    if (bookmark) {
-      classNames.push("chat-message-bookmarked");
-    }
-    return classNames.join(" ");
-  },
-
-  @discourseComputed("message", "message.deleted_at", "chatChannel.status")
-  showEditButton(message, deletedAt) {
+  get hasActiveState() {
     return (
-      !deletedAt &&
-      this.currentUser.id === message.user?.id &&
-      this.chatChannel.canModifyMessages(this.currentUser)
+      this.isActive ||
+      this.chat.activeMessage?.model?.id === this.args.message.id
     );
-  },
+  }
 
-  @discourseComputed(
-    "message",
-    "message.user_flag_status",
-    "details.can_flag",
-    "message.deleted_at"
-  )
-  canFlagMessage(message, userFlagStatus, canFlag, deletedAt) {
-    return (
-      this.currentUser?.id !== message.user?.id &&
-      userFlagStatus === undefined &&
-      canFlag &&
-      !message.chat_webhook_event &&
-      !deletedAt
-    );
-  },
+  get hasReply() {
+    return this.args.message.inReplyTo && !this.hideReplyToInfo;
+  }
 
-  @discourseComputed("message")
-  canManageDeletion(message) {
-    return this.currentUser?.id === message.user?.id
-      ? this.details.can_delete_self
-      : this.details.can_delete_others;
-  },
+  get hideUserInfo() {
+    const message = this.args.message;
 
-  @discourseComputed("message.deleted_at", "chatChannel.status")
-  canReply(deletedAt) {
-    return !deletedAt && this.chatChannel.canModifyMessages(this.currentUser);
-  },
+    const previousMessage = message.previousMessage;
 
-  @discourseComputed("message.deleted_at", "chatChannel.status")
-  canReact(deletedAt) {
-    return !deletedAt && this.chatChannel.canModifyMessages(this.currentUser);
-  },
-
-  @discourseComputed(
-    "canManageDeletion",
-    "message.deleted_at",
-    "chatChannel.status"
-  )
-  showDeleteButton(canManageDeletion, deletedAt) {
-    return (
-      canManageDeletion &&
-      !deletedAt &&
-      this.chatChannel.canModifyMessages(this.currentUser)
-    );
-  },
-
-  @discourseComputed(
-    "canManageDeletion",
-    "message.deleted_at",
-    "chatChannel.status"
-  )
-  showRestoreButton(canManageDeletion, deletedAt) {
-    return (
-      canManageDeletion &&
-      deletedAt &&
-      this.chatChannel.canModifyMessages(this.currentUser)
-    );
-  },
-
-  @discourseComputed("chatChannel.status")
-  showBookmarkButton() {
-    return this.chatChannel.canModifyMessages(this.currentUser);
-  },
-
-  @discourseComputed("chatChannel.status")
-  showRebakeButton() {
-    return (
-      this.currentUser?.staff &&
-      this.chatChannel.canModifyMessages(this.currentUser)
-    );
-  },
-
-  @discourseComputed("message.reactions.@each")
-  hasReactions(reactions) {
-    return Object.values(reactions).some((r) => r.count > 0);
-  },
-
-  @discourseComputed("message.mentionWarning")
-  mentionWarning() {
-    return this.message.mentionWarning;
-  },
-
-  @discourseComputed("mentionWarning.cannot_see")
-  mentionedCannotSeeText(users) {
-    return I18n.t("chat.mention_warning.cannot_see", {
-      username: users[0].username,
-      count: users.length,
-      others: this._othersTranslation(users.length - 1),
-    });
-  },
-
-  @discourseComputed("mentionWarning.without_membership")
-  mentionedWithoutMembershipText(users) {
-    return I18n.t("chat.mention_warning.without_membership", {
-      username: users[0].username,
-      count: users.length,
-      others: this._othersTranslation(users.length - 1),
-    });
-  },
-
-  @discourseComputed("mentionWarning.group_mentions_disabled")
-  groupsWithDisabledMentions(groups) {
-    return I18n.t("chat.mention_warning.group_mentions_disabled", {
-      group_name: groups[0],
-      count: groups.length,
-      others: this._othersTranslation(groups.length - 1),
-    });
-  },
-
-  @discourseComputed("mentionWarning.groups_with_too_many_members")
-  groupsWithTooManyMembers(groups) {
-    return I18n.t("chat.mention_warning.too_many_members", {
-      group_name: groups[0],
-      count: groups.length,
-      others: this._othersTranslation(groups.length - 1),
-    });
-  },
-
-  _othersTranslation(othersCount) {
-    return I18n.t("chat.mention_warning.warning_multiple", {
-      count: othersCount,
-    });
-  },
-
-  @action
-  inviteMentioned() {
-    const user_ids = this.mentionWarning.without_membership.mapBy("id");
-
-    ajax(`/chat/${this.details.chat_channel_id}/invite`, {
-      method: "PUT",
-      data: { user_ids, chat_message_id: this.message.id },
-    }).then(() => {
-      this.message.set("mentionWarning.invitationSent", true);
-      this._invitationSentTimer = discourseLater(() => {
-        this.message.set("mentionWarning", null);
-      }, 3000);
-    });
-
-    return false;
-  },
-
-  @action
-  dismissMentionWarning() {
-    this.message.set("mentionWarning", null);
-  },
-
-  @action
-  startReactionForMessageActions() {
-    this.chatEmojiPickerManager.startFromMessageActions(
-      this.message,
-      this.site.desktopView,
-      this.selectReaction
-    );
-  },
-
-  @action
-  startReactionForReactionList() {
-    this.chatEmojiPickerManager.startFromMessageReactionList(
-      this.message,
-      this.site.desktopView,
-      this.selectReaction
-    );
-  },
-
-  deselectReaction(emoji) {
-    if (!this.canInteractWithChat) {
-      return;
+    if (!previousMessage) {
+      return false;
     }
 
-    this.react(emoji, this.REMOVE_REACTION);
-    this.notifyPropertyChange("emojiReactions");
-  },
-
-  @action
-  selectReaction(emoji) {
-    if (!this.canInteractWithChat) {
-      return;
+    // this is a micro optimization to avoid layout changes when we load more messages
+    if (message.firstOfResults) {
+      return false;
     }
 
-    this.react(emoji, this.ADD_REACTION);
-    this.notifyPropertyChange("emojiReactions");
-  },
-
-  @bind
-  _handleReactionMessage(busData) {
-    const loadingReactionIndex = this._loadingReactions.indexOf(busData.emoji);
-    if (loadingReactionIndex > -1) {
-      return this._loadingReactions.splice(loadingReactionIndex, 1);
+    if (message.chatWebhookEvent) {
+      return false;
     }
 
-    this._updateReactionsList(busData.emoji, busData.action, busData.user);
-    this.afterReactionAdded();
-  },
-
-  @action
-  react(emoji, reactAction) {
-    if (!this.canInteractWithChat || this._loadingReactions.includes(emoji)) {
-      return;
+    if (previousMessage.deletedAt) {
+      return false;
     }
 
-    if (this.capabilities.canVibrate && !isTesting()) {
-      navigator.vibrate(5);
+    if (
+      Math.abs(
+        new Date(message.createdAt) - new Date(previousMessage.createdAt)
+      ) > 300000
+    ) {
+      return false;
     }
 
-    if (this.site.mobileView) {
-      this.set("isHovered", false);
-    }
-
-    this._loadingReactions.push(emoji);
-    this._updateReactionsList(emoji, reactAction, this.currentUser);
-
-    if (reactAction === this.ADD_REACTION) {
-      this.chatEmojiReactionStore.track(`:${emoji}:`);
-    }
-
-    return this._publishReaction(emoji, reactAction).then(() => {
-      this.notifyPropertyChange("emojiReactions");
-
-      // creating reaction will create a membership if not present
-      // so we will fully refresh if we were not members of the channel
-      // already
-      if (!this.chatChannel.isFollowing || this.chatChannel.isDraft) {
-        return this.chatChannelsManager
-          .getChannel(this.chatChannel.id)
-          .then((reactedChannel) => {
-            this.onSwitchChannel(reactedChannel);
-          });
-      }
-    });
-  },
-
-  _updateReactionsList(emoji, reactAction, user) {
-    const selfReacted = this.currentUser.id === user.id;
-    if (this.message.reactions[emoji]) {
-      if (
-        selfReacted &&
-        reactAction === this.ADD_REACTION &&
-        this.message.reactions[emoji].reacted
-      ) {
-        // User is already has reaction added; do nothing
+    if (message.inReplyTo) {
+      if (message.inReplyTo?.id === previousMessage.id) {
+        return message.user?.id === previousMessage.user?.id;
+      } else {
         return false;
       }
-
-      let newCount =
-        reactAction === this.ADD_REACTION
-          ? this.message.reactions[emoji].count + 1
-          : this.message.reactions[emoji].count - 1;
-
-      this.message.reactions.set(`${emoji}.count`, newCount);
-      if (selfReacted) {
-        this.message.reactions.set(
-          `${emoji}.reacted`,
-          reactAction === this.ADD_REACTION
-        );
-      } else {
-        this.message.reactions[emoji].users.pushObject(user);
-      }
-    } else {
-      if (reactAction === this.ADD_REACTION) {
-        this.message.reactions.set(emoji, {
-          count: 1,
-          reacted: selfReacted,
-          users: selfReacted ? [] : [user],
-        });
-      }
     }
-    this.message.notifyPropertyChange("reactions");
-  },
 
-  _publishReaction(emoji, reactAction) {
-    return ajax(
-      `/chat/${this.details.chat_channel_id}/react/${this.message.id}`,
-      {
-        type: "PUT",
-        data: {
-          react_action: reactAction,
-          emoji,
-        },
-      }
-    ).catch((errResult) => {
-      popupAjaxError(errResult);
-      this._updateReactionsList(emoji, this.REMOVE_REACTION, this.currentUser);
-    });
-  },
+    return message.user?.id === previousMessage.user?.id;
+  }
 
-  // TODO(roman): For backwards-compatibility.
-  //   Remove after the 3.0 release.
-  _legacyFlag() {
-    this.dialog.yesNoConfirm({
-      message: I18n.t("chat.confirm_flag", {
-        username: this.message.user?.username,
-      }),
-      didConfirm: () => {
-        return ajax("/chat/flag", {
-          method: "PUT",
-          data: {
-            chat_message_id: this.message.id,
-            flag_type_id: 7, // notify_moderators
-          },
-        }).catch(popupAjaxError);
-      },
-    });
-  },
-
-  @action
-  reply() {
-    this.setReplyTo(this.message.id);
-  },
-
-  @action
-  viewReply() {
-    this.replyMessageClicked(this.message.in_reply_to);
-  },
-
-  @action
-  edit() {
-    this.editButtonClicked(this.message.id);
-  },
-
-  @action
-  flag() {
-    const targetFlagSupported =
-      requirejs.entries["discourse/lib/flag-targets/flag"];
-
-    if (targetFlagSupported) {
-      const model = EmberObject.create(this.message);
-      model.set("username", model.get("user.username"));
-      model.set("user_id", model.get("user.id"));
-      let controller = showModal("flag", { model });
-
-      controller.setProperties({ flagTarget: new ChatMessageFlag() });
-    } else {
-      this._legacyFlag();
-    }
-  },
-
-  @action
-  expand() {
-    this.message.set("expanded", true);
-  },
-
-  @action
-  restore() {
-    return ajax(
-      `/chat/${this.details.chat_channel_id}/restore/${this.message.id}`,
-      {
-        type: "PUT",
-      }
-    ).catch(popupAjaxError);
-  },
-
-  @action
-  toggleBookmark() {
-    return openBookmarkModal(
-      this.message.bookmark ||
-        Bookmark.createFor(this.currentUser, "ChatMessage", this.message.id),
-      {
-        onAfterSave: (savedData) => {
-          const bookmark = Bookmark.create(savedData);
-          this.set("message.bookmark", bookmark);
-          this.appEvents.trigger(
-            "bookmarks:changed",
-            savedData,
-            bookmark.attachedTo()
-          );
-        },
-        onAfterDelete: () => {
-          this.set("message.bookmark", null);
-        },
-      }
+  get hideReplyToInfo() {
+    return (
+      this.args.context === MESSAGE_CONTEXT_THREAD ||
+      this.args.message?.inReplyTo?.id ===
+        this.args.message?.previousMessage?.id ||
+      this.threadingEnabled
     );
-  },
+  }
 
-  @action
-  rebakeMessage() {
-    return ajax(
-      `/chat/${this.details.chat_channel_id}/${this.message.id}/rebake`,
-      {
-        type: "PUT",
-      }
-    ).catch(popupAjaxError);
-  },
-
-  @action
-  deleteMessage() {
-    return ajax(`/chat/${this.details.chat_channel_id}/${this.message.id}`, {
-      type: "DELETE",
-    }).catch(popupAjaxError);
-  },
-
-  @action
-  selectMessage() {
-    this.message.set("selected", true);
-    this.onStartSelectingMessages(this.message);
-  },
-
-  @action
-  @afterRender
-  toggleChecked(e) {
-    if (e.shiftKey) {
-      this.bulkSelectMessages(this.message, e.target.checked);
-    }
-
-    this.onSelectMessage(this.message);
-  },
-
-  @action
-  copyLinkToMessage() {
-    if (!this.messageContainer) {
-      return;
-    }
-
-    this.messageContainer
-      .querySelector(".link-to-message-btn")
-      ?.classList?.add("copied");
-
-    const { protocol, host } = window.location;
-    let url = getURL(
-      `/chat/channel/${this.details.chat_channel_id}/-?messageId=${this.message.id}`
+  get threadingEnabled() {
+    return (
+      this.args.message?.channel?.threadingEnabled &&
+      !!this.args.message?.thread
     );
-    url = url.indexOf("/") === 0 ? protocol + "//" + host + url : url;
-    clipboardCopy(url);
+  }
 
-    discourseLater(() => {
-      this.messageContainer
-        ?.querySelector(".link-to-message-btn")
-        ?.classList?.remove("copied");
-    }, 250);
-  },
+  get showThreadIndicator() {
+    return (
+      this.args.context !== MESSAGE_CONTEXT_THREAD &&
+      this.threadingEnabled &&
+      this.args.message?.thread &&
+      this.args.message?.thread.preview.replyCount > 0
+    );
+  }
 
-  @computed
-  get emojiReactions() {
-    const favorites = this.cachedFavoritesReactions;
-
-    // may be a {} if no defaults defined in some production builds
-    if (!favorites || !favorites.slice) {
-      return [];
-    }
-
-    const userReactions = Object.keys(this.message.reactions).filter((key) => {
-      return this.message.reactions[key].reacted;
+  #teardownMentionedUsers() {
+    this.args.message.mentionedUsers.forEach((user) => {
+      user.stopTrackingStatus();
+      user.off("status-changed", this, "refreshStatusOnMentions");
     });
-
-    return favorites.slice(0, 3).map((emoji) => {
-      if (userReactions.includes(emoji)) {
-        return { emoji, reacted: true };
-      } else {
-        return { emoji, reacted: false };
-      }
-    });
-  },
-});
+    this.#destroyTippyInstances();
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-notices.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-notices.hbs
new file mode 100644
index 00000000000..0587c135ccc
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-notices.hbs
@@ -0,0 +1,17 @@
+<div class="chat-notices">
+  <ChatRetentionReminder @channel={{@channel}} />
+
+  {{#each this.noticesForChannel as |notice|}}
+    <div class="chat-notices__notice">
+      <p class="chat-notices__notice__content">
+        {{notice.textContent}}
+      </p>
+
+      <DButton
+        @icon="times"
+        @class="btn-flat chat-notices__notice__clear"
+        @action={{fn this.clearNotice notice}}
+      />
+    </div>
+  {{/each}}
+</div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-notices.js b/plugins/chat/assets/javascripts/discourse/components/chat-notices.js
new file mode 100644
index 00000000000..80b535a3cca
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-notices.js
@@ -0,0 +1,18 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+
+export default class ChatNotices extends Component {
+  @service("chat-channel-pane-subscriptions-manager") subscriptionsManager;
+
+  get noticesForChannel() {
+    return this.subscriptionsManager.notices.filter(
+      (notice) => notice.channelId === this.args.channel.id
+    );
+  }
+
+  @action
+  clearNotice(notice) {
+    this.subscriptionsManager.clearNotice(notice);
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-replying-indicator.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-replying-indicator.hbs
index 5805cca0cdf..e145bb0630e 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-replying-indicator.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-replying-indicator.hbs
@@ -1,10 +1,20 @@
-<div class="chat-replying-indicator">
-  {{#if this.shouldDisplay}}
-    <span class="chat-replying-indicator__text">{{this.text}}</span>
-    <span class="chat-replying-indicator__wave">
-      <span class="chat-replying-indicator__dot">.</span>
-      <span class="chat-replying-indicator__dot">.</span>
-      <span class="chat-replying-indicator__dot">.</span>
-    </span>
-  {{/if}}
-</div>
\ No newline at end of file
+{{#if @presenceChannelName}}
+  <div
+    class={{concat-class
+      "chat-replying-indicator"
+      (if this.presenceChannel.subscribed "is-subscribed")
+    }}
+    {{did-insert this.subscribe}}
+    {{did-update this.updateSubscription @presenceChannelName}}
+    {{will-destroy this.unsubscribe}}
+  >
+    {{#if this.shouldRender}}
+      <span class="chat-replying-indicator__text">{{this.text}}</span>
+      <span class="chat-replying-indicator__wave">
+        <span class="chat-replying-indicator__dot">.</span>
+        <span class="chat-replying-indicator__dot">.</span>
+        <span class="chat-replying-indicator__dot">.</span>
+      </span>
+    {{/if}}
+  </div>
+{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-replying-indicator.js b/plugins/chat/assets/javascripts/discourse/components/chat-replying-indicator.js
index 0e0f797e938..9aad844a5d4 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-replying-indicator.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-replying-indicator.js
@@ -1,85 +1,77 @@
-import { isBlank, isPresent } from "@ember/utils";
-import Component from "@ember/component";
+import { isPresent } from "@ember/utils";
+import Component from "@glimmer/component";
 import { inject as service } from "@ember/service";
-import discourseComputed from "discourse-common/utils/decorators";
 import I18n from "I18n";
-import { fmt } from "discourse/lib/computed";
-import { next } from "@ember/runloop";
+import { action } from "@ember/object";
+import { tracked } from "@glimmer/tracking";
 
-export default Component.extend({
-  tagName: "",
-  presence: service(),
-  presenceChannel: null,
-  chatChannel: null,
+export default class ChatReplyingIndicator extends Component {
+  @service currentUser;
+  @service presence;
 
-  @discourseComputed("presenceChannel.users.[]")
-  usernames(users) {
-    return users
-      ?.filter((u) => u.id !== this.currentUser.id)
-      ?.mapBy("username");
-  },
+  @tracked presenceChannel = null;
 
-  @discourseComputed("usernames.[]")
-  text(usernames) {
-    if (isBlank(usernames)) {
-      return;
+  @action
+  async updateSubscription() {
+    await this.unsubscribe();
+    await this.subscribe();
+  }
+
+  @action
+  async subscribe() {
+    this.presenceChannel = this.presence.getChannel(
+      this.args.presenceChannelName
+    );
+    await this.presenceChannel.subscribe();
+  }
+
+  @action
+  async unsubscribe() {
+    if (this.presenceChannel?.subscribed) {
+      await this.presenceChannel.unsubscribe();
     }
+  }
 
-    if (usernames.length === 1) {
+  get users() {
+    return (
+      this.presenceChannel
+        ?.get("users")
+        ?.filter((u) => u.id !== this.currentUser.id) || []
+    );
+  }
+
+  get usernames() {
+    return this.users.mapBy("username");
+  }
+
+  get text() {
+    if (this.usernames.length === 1) {
       return I18n.t("chat.replying_indicator.single_user", {
-        username: usernames[0],
+        username: this.usernames[0],
       });
     }
 
-    if (usernames.length < 4) {
-      const lastUsername = usernames.pop();
-      const commaSeparatedUsernames = usernames.join(", ");
+    if (this.usernames.length < 4) {
+      const lastUsername = this.usernames[this.usernames.length - 1];
+      const commaSeparatedUsernames = this.usernames
+        .slice(0, this.usernames.length - 1)
+        .join(I18n.t("word_connector.comma"));
       return I18n.t("chat.replying_indicator.multiple_users", {
         commaSeparatedUsernames,
         lastUsername,
       });
     }
 
-    const commaSeparatedUsernames = usernames.slice(0, 2).join(", ");
+    const commaSeparatedUsernames = this.usernames
+      .slice(0, 2)
+      .join(I18n.t("word_connector.comma"));
     return I18n.t("chat.replying_indicator.many_users", {
       commaSeparatedUsernames,
-      count: usernames.length - 2,
+      count: this.usernames.length - 2,
     });
-  },
+  }
 
-  @discourseComputed("usernames.[]")
-  shouldDisplay(usernames) {
-    return isPresent(usernames);
-  },
-
-  channelName: fmt("chatChannel.id", "/chat-reply/%@"),
-
-  didReceiveAttrs() {
-    this._super(...arguments);
-
-    if (!this.chatChannel || this.chatChannel.isDraft) {
-      this.presenceChannel?.unsubscribe();
-      return;
-    }
-
-    if (this.presenceChannel?.name !== this.channelName) {
-      this.presenceChannel?.unsubscribe();
-
-      next(() => {
-        if (this.isDestroyed || this.isDestroying) {
-          return;
-        }
-
-        const presenceChannel = this.presence.getChannel(this.channelName);
-        this.set("presenceChannel", presenceChannel);
-        presenceChannel.subscribe();
-      });
-    }
-  },
-
-  willDestroyElement() {
-    this._super(...arguments);
-
-    this.presenceChannel?.unsubscribe();
-  },
-});
+  get shouldRender() {
+    return isPresent(this.usernames);
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-retention-reminder-text.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-retention-reminder-text.hbs
new file mode 100644
index 00000000000..309d7f6c5fe
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-retention-reminder-text.hbs
@@ -0,0 +1,3 @@
+<span class="chat-retention-reminder-text">
+  {{this.text}}
+</span>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-retention-reminder-text.js b/plugins/chat/assets/javascripts/discourse/components/chat-retention-reminder-text.js
new file mode 100644
index 00000000000..5ad70302b9f
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-retention-reminder-text.js
@@ -0,0 +1,33 @@
+import Component from "@glimmer/component";
+import I18n from "I18n";
+import { inject as service } from "@ember/service";
+
+export default class ChatRetentionReminderText extends Component {
+  @service siteSettings;
+
+  get text() {
+    if (this.args.channel.isDirectMessageChannel) {
+      if (this.#countForChannelType > 0) {
+        return I18n.t("chat.retention_reminders.dm", {
+          count: this.siteSettings.chat_dm_retention_days,
+        });
+      } else {
+        return I18n.t("chat.retention_reminders.dm_none");
+      }
+    } else {
+      if (this.#countForChannelType > 0) {
+        return I18n.t("chat.retention_reminders.public", {
+          count: this.siteSettings.chat_channel_retention_days,
+        });
+      } else {
+        return I18n.t("chat.retention_reminders.public_none");
+      }
+    }
+  }
+
+  get #countForChannelType() {
+    return this.args.channel.isDirectMessageChannel
+      ? this.siteSettings.chat_dm_retention_days
+      : this.siteSettings.chat_channel_retention_days;
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-retention-reminder.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-retention-reminder.hbs
index 7eff93b9558..6033b130443 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-retention-reminder.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-retention-reminder.hbs
@@ -1,9 +1,9 @@
 {{#if this.show}}
   <div class="chat-retention-reminder">
-    <span class="chat-retention-reminder-text">{{this.text}}</span>
+    <ChatRetentionReminderText @channel={{@channel}} />
     <DButton
       @class="btn-flat dismiss-btn"
-      @action={{action "dismiss"}}
+      @action={{this.dismiss}}
       @icon="times"
     />
   </div>
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-retention-reminder.js b/plugins/chat/assets/javascripts/discourse/components/chat-retention-reminder.js
index ec667667603..c55694d9296 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-retention-reminder.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-retention-reminder.js
@@ -1,59 +1,33 @@
-import Component from "@ember/component";
-import discourseComputed from "discourse-common/utils/decorators";
-import I18n from "I18n";
+import Component from "@glimmer/component";
 import { action } from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
+import { inject as service } from "@ember/service";
 
-export default Component.extend({
-  tagName: "",
-  loading: false,
+export default class ChatRetentionReminder extends Component {
+  @service currentUser;
 
-  @discourseComputed(
-    "chatChannel.chatable_type",
-    "currentUser.{needs_dm_retention_reminder,needs_channel_retention_reminder}"
-  )
-  show() {
+  get show() {
     return (
-      !this.chatChannel.isDraft &&
-      ((this.chatChannel.isDirectMessageChannel &&
-        this.currentUser.needs_dm_retention_reminder) ||
-        (!this.chatChannel.isDirectMessageChannel &&
-          this.currentUser.needs_channel_retention_reminder))
+      (this.args.channel?.isDirectMessageChannel &&
+        this.currentUser?.get("needs_dm_retention_reminder")) ||
+      (this.args.channel?.isCategoryChannel &&
+        this.currentUser?.get("needs_channel_retention_reminder"))
     );
-  },
-
-  @discourseComputed("chatChannel.chatable_type")
-  text() {
-    let days = this.siteSettings.chat_channel_retention_days;
-    let translationKey = "chat.retention_reminders.public";
-
-    if (this.chatChannel.isDirectMessageChannel) {
-      days = this.siteSettings.chat_dm_retention_days;
-      translationKey = "chat.retention_reminders.dm";
-    }
-    return I18n.t(translationKey, { days });
-  },
-
-  @discourseComputed("chatChannel.chatable_type")
-  daysCount() {
-    return this.chatChannel.isDirectMessageChannel
-      ? this.siteSettings.chat_dm_retention_days
-      : this.siteSettings.chat_channel_retention_days;
-  },
+  }
 
   @action
   dismiss() {
     return ajax("/chat/dismiss-retention-reminder", {
       method: "POST",
-      data: { chatable_type: this.chatChannel.chatable_type },
+      data: { chatable_type: this.args.channel.chatableType },
     })
       .then(() => {
-        const field = this.chatChannel.isDirectMessageChannel
+        const field = this.args.channel.isDirectMessageChannel
           ? "needs_dm_retention_reminder"
           : "needs_channel_retention_reminder";
         this.currentUser.set(field, false);
       })
       .catch(popupAjaxError);
-  },
-});
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-selection-manager.js b/plugins/chat/assets/javascripts/discourse/components/chat-selection-manager.js
deleted file mode 100644
index a9c8887318d..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/chat-selection-manager.js
+++ /dev/null
@@ -1,124 +0,0 @@
-import Component from "@ember/component";
-import { action, computed } from "@ember/object";
-import showModal from "discourse/lib/show-modal";
-import { clipboardCopyAsync } from "discourse/lib/utilities";
-import { getOwner } from "discourse-common/lib/get-owner";
-import { ajax } from "discourse/lib/ajax";
-import { isTesting } from "discourse-common/config/environment";
-import { popupAjaxError } from "discourse/lib/ajax-error";
-import { schedule } from "@ember/runloop";
-import { inject as service } from "@ember/service";
-import getURL from "discourse-common/lib/get-url";
-import { bind } from "discourse-common/utils/decorators";
-
-export default class AdminCustomizeColorsShowController extends Component {
-  @service router;
-  tagName = "";
-  chatChannel = null;
-  selectedMessageIds = null;
-  showChatQuoteSuccess = false;
-  cancelSelecting = null;
-  canModerate = false;
-
-  @computed("selectedMessageIds.length")
-  get anyMessagesSelected() {
-    return this.selectedMessageIds.length > 0;
-  }
-
-  @computed("chatChannel.isDirectMessageChannel", "canModerate")
-  get showMoveMessageButton() {
-    return !this.chatChannel.isDirectMessageChannel && this.canModerate;
-  }
-
-  @bind
-  async generateQuote() {
-    const response = await ajax(
-      getURL(`/chat/${this.chatChannel.id}/quote.json`),
-      {
-        data: { message_ids: this.selectedMessageIds },
-        type: "POST",
-      }
-    );
-
-    return new Blob([response.markdown], {
-      type: "text/plain",
-    });
-  }
-
-  @action
-  openMoveMessageModal() {
-    showModal("chat-message-move-to-channel-modal").setProperties({
-      sourceChannel: this.chatChannel,
-      selectedMessageIds: this.selectedMessageIds,
-    });
-  }
-
-  @action
-  async quoteMessages() {
-    let quoteMarkdown;
-
-    try {
-      const quoteMarkdownBlob = await this.generateQuote();
-      quoteMarkdown = await quoteMarkdownBlob.text();
-    } catch (error) {
-      popupAjaxError(error);
-    }
-
-    const container = getOwner(this);
-    const composer = container.lookup("controller:composer");
-    const openOpts = {};
-
-    if (this.chatChannel.isCategoryChannel) {
-      openOpts.categoryId = this.chatChannel.chatable_id;
-    }
-
-    if (this.site.mobileView) {
-      // go to the relevant chatable (e.g. category) and open the
-      // composer to insert text
-      if (this.chatChannel.chatable_url) {
-        this.router.transitionTo(this.chatChannel.chatable_url);
-      }
-
-      await composer.focusComposer({
-        fallbackToNewTopic: true,
-        insertText: quoteMarkdown,
-        openOpts,
-      });
-    } else {
-      // open the composer and insert text, reply to the current
-      // topic if there is one, use the active draft if there is one
-      const topic = container.lookup("controller:topic");
-      await composer.focusComposer({
-        fallbackToNewTopic: true,
-        topic: topic?.model,
-        insertText: quoteMarkdown,
-        openOpts,
-      });
-    }
-  }
-
-  @action
-  async copyMessages() {
-    try {
-      if (!isTesting()) {
-        // clipboard API throws errors in tests
-        await clipboardCopyAsync(this.generateQuote);
-      }
-
-      this.set("showChatQuoteSuccess", true);
-
-      schedule("afterRender", () => {
-        const element = document.querySelector(".chat-selection-message");
-        element?.addEventListener("animationend", () => {
-          if (this.isDestroying || this.isDestroyed) {
-            return;
-          }
-
-          this.set("showChatQuoteSuccess", false);
-        });
-      });
-    } catch (error) {
-      popupAjaxError(error);
-    }
-  }
-}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-side-panel-resizer.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-side-panel-resizer.hbs
new file mode 100644
index 00000000000..a717e52b509
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-side-panel-resizer.hbs
@@ -0,0 +1 @@
+<div class="chat-side-panel-resizer"></div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-side-panel.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-side-panel.hbs
new file mode 100644
index 00000000000..1582dfa8c49
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-side-panel.hbs
@@ -0,0 +1,21 @@
+{{#if this.chatStateManager.isSidePanelExpanded}}
+  <div
+    class="chat-side-panel"
+    {{did-insert this.setupSize}}
+    {{chat/resizable-node
+      ".chat-side-panel-resizer"
+      this.didResize
+      (hash position=false vertical=false mutate=false)
+    }}
+    style={{if
+      (and this.site.desktopView this.chatStateManager.isFullPageActive)
+      this.widthStyle
+    }}
+  >
+    {{yield}}
+
+    {{#if this.site.desktopView}}
+      <ChatSidePanelResizer />
+    {{/if}}
+  </div>
+{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-side-panel.js b/plugins/chat/assets/javascripts/discourse/components/chat-side-panel.js
new file mode 100644
index 00000000000..aa1e0f712c5
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-side-panel.js
@@ -0,0 +1,41 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+import { htmlSafe } from "@ember/template";
+import { tracked } from "@glimmer/tracking";
+
+const MIN_CHAT_CHANNEL_WIDTH = 250;
+
+export default class ChatSidePanel extends Component {
+  @service chatStateManager;
+  @service chatSidePanelSize;
+  @service site;
+
+  @tracked widthStyle;
+
+  @action
+  setupSize() {
+    this.widthStyle = htmlSafe(`width:${this.chatSidePanelSize.width}px`);
+  }
+
+  @action
+  didResize(element, size) {
+    if (this.isDestroying || this.isDestroyed) {
+      return;
+    }
+
+    const parentWidth = element.parentElement.getBoundingClientRect().width;
+    const mainPanelWidth = parentWidth - size.width;
+
+    if (mainPanelWidth >= MIN_CHAT_CHANNEL_WIDTH) {
+      this.chatSidePanelSize.width = size.width;
+      element.style.width = size.width + "px";
+      this.widthStyle = htmlSafe(`width:${size.width}px`);
+    }
+  }
+
+  #maxWidth(element) {
+    const parentWidth = element.parentElement.getBoundingClientRect().width;
+    return parentWidth - MIN_CHAT_CHANNEL_WIDTH;
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-skeleton.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-skeleton.hbs
index f46109445ed..719aa260777 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-skeleton.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-skeleton.hbs
@@ -1,119 +1,29 @@
 <div class="chat-skeleton -animation">
-  <div class="chat-skeleton__header">
-    <div class="chat-skeleton__header-img"></div>
-    <div class="chat-skeleton__header-name"></div>
-  </div>
+  {{#each this.placeholders as |placeholder|}}
+    <div class="chat-skeleton__body">
+      <div class="chat-skeleton__message">
+        <div class="chat-skeleton__message-avatar"></div>
+        <div class="chat-skeleton__message-poster"></div>
+        <div class="chat-skeleton__message-content">
+          {{#if placeholder.image}}
+            <div class="chat-skeleton__message-img"></div>
+          {{/if}}
 
-  <div class="chat-skeleton__body">
-    <div class="chat-skeleton__message">
-      <div class="chat-skeleton__message-avatar"></div>
-      <div class="chat-skeleton__message-poster"></div>
-      <div class="chat-skeleton__message-content">
-        <div class="chat-skeleton__message-msg -line1 -small"></div>
-        <div class="chat-skeleton__message-msg -line2 -large"></div>
-      </div>
+          <div class="chat-skeleton__message-text">
+            {{#each placeholder.rows as |row|}}
+              <div class="chat-skeleton__message-msg" style={{row}}></div>
+            {{/each}}
+          </div>
 
-      <div class="chat-skeleton__message-avatar"></div>
-      <div class="chat-skeleton__message-poster"></div>
-      <div class="chat-skeleton__message-content">
-        <div class="chat-skeleton__message-msg -line1 -large"></div>
-        <div class="chat-skeleton__message-msg -line2 -large"></div>
+          {{#if placeholder.reactions}}
+            <div class="chat-skeleton__message-reactions">
+              {{#each placeholder.reactions}}
+                <div class="chat-skeleton__message-reaction"></div>
+              {{/each}}
+            </div>
+          {{/if}}
+        </div>
       </div>
     </div>
-  </div>
-
-  <div class="chat-skeleton__header">
-    <div class="chat-skeleton__header-img"></div>
-    <div class="chat-skeleton__header-name"></div>
-  </div>
-
-  <div class="chat-skeleton__body">
-    <div class="chat-skeleton__message">
-      <div class="chat-skeleton__message-avatar"></div>
-      <div class="chat-skeleton__message-poster"></div>
-      <div class="chat-skeleton__message-content">
-        <div class="chat-skeleton__message-msg -line1 -medium"></div>
-        <div class="chat-skeleton__message-msg -line2 -large"></div>
-      </div>
-    </div>
-
-    <div class="chat-skeleton__message">
-      <div class="chat-skeleton__message-avatar"></div>
-      <div class="chat-skeleton__message-poster"></div>
-      <div class="chat-skeleton__message-content">
-        <div class="chat-skeleton__message-msg -line1 -medium"></div>
-        <div class="chat-skeleton__message-msg -line2 -large"></div>
-      </div>
-    </div>
-
-    <div class="chat-skeleton__message">
-      <div class="chat-skeleton__message-avatar"></div>
-      <div class="chat-skeleton__message-poster"></div>
-      <div class="chat-skeleton__message-content">
-        <div class="chat-skeleton__message-msg -line1 -small"></div>
-        <div class="chat-skeleton__message-msg -line2 -large"></div>
-      </div>
-    </div>
-
-    <div class="chat-skeleton__message">
-      <div class="chat-skeleton__message-avatar"></div>
-      <div class="chat-skeleton__message-poster"></div>
-      <div class="chat-skeleton__message-content">
-        <div class="chat-skeleton__message-msg -line1 -medium"></div>
-        <div class="chat-skeleton__message-msg -line2 -small"></div>
-      </div>
-    </div>
-
-    <div class="chat-skeleton__message">
-      <div class="chat-skeleton__message-avatar"></div>
-      <div class="chat-skeleton__message-poster"></div>
-      <div class="chat-skeleton__message-content">
-        <div class="chat-skeleton__message-msg -line1 -medium"></div>
-        <div class="chat-skeleton__message-msg -line2 -medium"></div>
-      </div>
-    </div>
-  </div>
-
-  <div class="chat-skeleton__header">
-    <div class="chat-skeleton__header-img"></div>
-    <div class="chat-skeleton__header-name"></div>
-  </div>
-
-  <div class="chat-skeleton__body">
-    <div class="chat-skeleton__message">
-      <div class="chat-skeleton__message-avatar"></div>
-      <div class="chat-skeleton__message-poster"></div>
-      <div class="chat-skeleton__message-content">
-        <div class="chat-skeleton__message-msg -line1 -small"></div>
-        <div class="chat-skeleton__message-msg -line2 -large"></div>
-      </div>
-    </div>
-
-    <div class="chat-skeleton__message">
-      <div class="chat-skeleton__message-avatar"></div>
-      <div class="chat-skeleton__message-poster"></div>
-      <div class="chat-skeleton__message-content">
-        <div class="chat-skeleton__message-msg -line1 -medium"></div>
-        <div class="chat-skeleton__message-msg -line2 -large"></div>
-      </div>
-    </div>
-
-    <div class="chat-skeleton__message">
-      <div class="chat-skeleton__message-avatar"></div>
-      <div class="chat-skeleton__message-poster"></div>
-      <div class="chat-skeleton__message-content">
-        <div class="chat-skeleton__message-msg -line1 -large"></div>
-        <div class="chat-skeleton__message-msg -line2 -small"></div>
-      </div>
-    </div>
-
-    <div class="chat-skeleton__message">
-      <div class="chat-skeleton__message-avatar"></div>
-      <div class="chat-skeleton__message-poster"></div>
-      <div class="chat-skeleton__message-content">
-        <div class="chat-skeleton__message-msg -line1 -medium"></div>
-        <div class="chat-skeleton__message-msg -line2 -large"></div>
-      </div>
-    </div>
-  </div>
+  {{/each}}
 </div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-skeleton.js b/plugins/chat/assets/javascripts/discourse/components/chat-skeleton.js
new file mode 100644
index 00000000000..6af83cf2e41
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-skeleton.js
@@ -0,0 +1,20 @@
+import Component from "@glimmer/component";
+import { htmlSafe } from "@ember/template";
+
+export default class ChatSkeleton extends Component {
+  get placeholders() {
+    return Array.from({ length: 15 }, () => {
+      return {
+        image: this.#randomIntFromInterval(1, 10) === 5,
+        rows: Array.from({ length: this.#randomIntFromInterval(1, 5) }, () => {
+          return htmlSafe(`width: ${this.#randomIntFromInterval(20, 95)}%`);
+        }),
+        reactions: Array.from({ length: this.#randomIntFromInterval(0, 3) }),
+      };
+    });
+  }
+
+  #randomIntFromInterval(min, max) {
+    return Math.floor(Math.random() * (max - min + 1) + min);
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-thread.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-thread.hbs
new file mode 100644
index 00000000000..0d5fb60712d
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-thread.hbs
@@ -0,0 +1,62 @@
+<div
+  class={{concat-class
+    "chat-thread"
+    (if this.messagesLoader.loading "loading")
+    (if @thread.staged "staged")
+  }}
+  data-id={{@thread.id}}
+  {{did-insert this.setUploadDropZone}}
+  {{did-insert this.didUpdateThread}}
+  {{did-update this.didUpdateThread @thread.id}}
+  {{will-destroy this.teardown}}
+>
+  {{#if @includeHeader}}
+    <Chat::Thread::Header @channel={{@thread.channel}} @thread={{@thread}} />
+  {{/if}}
+
+  <div
+    class="chat-thread__body popper-viewport chat-messages-scroll"
+    {{did-insert this.setScrollable}}
+    {{chat/scrollable-list
+      (hash onScroll=this.onScroll onScrollEnd=this.onScrollEnd reverse=true)
+    }}
+  >
+    <div
+      class="chat-messages-container"
+      {{chat/on-resize this.didResizePane (hash delay=100 immediate=true)}}
+    >
+      {{#each this.messagesManager.messages key="id" as |message|}}
+        <ChatMessage
+          @message={{message}}
+          @disableMouseEvents={{this.isScrolling}}
+          @resendStagedMessage={{this.resendStagedMessage}}
+          @context="thread"
+        />
+      {{/each}}
+
+      {{#unless this.messagesLoader.fetchedOnce}}
+        {{#if this.messagesLoader.loading}}
+          <ChatSkeleton />
+        {{/if}}
+      {{/unless}}
+    </div>
+  </div>
+
+  <Chat::ScrollToBottomArrow
+    @onScrollToBottom={{this.scrollToLatestMessage}}
+    @isVisible={{this.needsArrow}}
+  />
+
+  {{#if this.chatThreadPane.selectingMessages}}
+    <Chat::SelectionManager @pane={{this.chatThreadPane}} />
+  {{else}}
+    <Chat::Composer::Thread
+      @channel={{@channel}}
+      @thread={{@thread}}
+      @onSendMessage={{this.onSendMessage}}
+      @uploadDropZone={{this.uploadDropZone}}
+    />
+  {{/if}}
+
+  <ChatUploadDropZone @model={{@thread}} />
+</div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-thread.js b/plugins/chat/assets/javascripts/discourse/components/chat-thread.js
new file mode 100644
index 00000000000..98261307bcb
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-thread.js
@@ -0,0 +1,459 @@
+import Component from "@glimmer/component";
+import { NotificationLevels } from "discourse/lib/notification-levels";
+import UserChatThreadMembership from "discourse/plugins/chat/discourse/models/user-chat-thread-membership";
+import { cached, tracked } from "@glimmer/tracking";
+import { action } from "@ember/object";
+import ChatMessage from "discourse/plugins/chat/discourse/models/chat-message";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { bind } from "discourse-common/utils/decorators";
+import { inject as service } from "@ember/service";
+import { cancel, next } from "@ember/runloop";
+import { resetIdle } from "discourse/lib/desktop-notifications";
+import ChatMessagesLoader from "discourse/plugins/chat/discourse/lib/chat-messages-loader";
+import { getOwner } from "discourse-common/lib/get-owner";
+import {
+  FUTURE,
+  PAST,
+  READ_INTERVAL_MS,
+} from "discourse/plugins/chat/discourse/lib/chat-constants";
+import discourseDebounce from "discourse-common/lib/debounce";
+import {
+  bodyScrollFix,
+  stackingContextFix,
+} from "discourse/plugins/chat/discourse/lib/chat-ios-hacks";
+import {
+  scrollListToBottom,
+  scrollListToMessage,
+  scrollListToTop,
+} from "discourse/plugins/chat/discourse/lib/scroll-helpers";
+
+export default class ChatThread extends Component {
+  @service appEvents;
+  @service capabilities;
+  @service chat;
+  @service chatApi;
+  @service chatComposerPresenceManager;
+  @service chatHistory;
+  @service chatThreadComposer;
+  @service chatThreadPane;
+  @service chatThreadPaneSubscriptionsManager;
+  @service currentUser;
+  @service router;
+  @service siteSettings;
+
+  @tracked isAtBottom = true;
+  @tracked isScrolling = false;
+  @tracked needsArrow = false;
+  @tracked uploadDropZone;
+
+  scrollable = null;
+
+  @action
+  resetIdle() {
+    resetIdle();
+  }
+
+  @cached
+  get messagesLoader() {
+    return new ChatMessagesLoader(getOwner(this), this.args.thread);
+  }
+
+  get messagesManager() {
+    return this.args.thread.messagesManager;
+  }
+
+  @action
+  handleKeydown(event) {
+    if (event.key === "Escape") {
+      return this.router.transitionTo(
+        "chat.channel",
+        ...this.args.thread.channel.routeModels
+      );
+    }
+  }
+
+  @action
+  didUpdateThread() {
+    this.messagesManager.clear();
+    this.chatThreadComposer.focus();
+    this.loadMessages();
+    this.resetComposerMessage();
+  }
+
+  @action
+  setUploadDropZone(element) {
+    this.uploadDropZone = element;
+  }
+
+  @action
+  subscribeToUpdates() {
+    this.chatThreadPaneSubscriptionsManager.subscribe(this.args.thread);
+  }
+
+  @action
+  teardown() {
+    this.chatThreadPaneSubscriptionsManager.unsubscribe();
+    cancel(this._debouncedFillPaneAttemptHandler);
+    cancel(this._debounceUpdateLastReadMessageHandler);
+  }
+
+  @action
+  onScroll(state) {
+    next(() => {
+      if (this.#flushIgnoreNextScroll()) {
+        return;
+      }
+
+      bodyScrollFix();
+
+      this.needsArrow =
+        (this.messagesLoader.fetchedOnce &&
+          this.messagesLoader.canLoadMoreFuture) ||
+        (state.distanceToBottom.pixels > 250 && !state.atBottom);
+      this.isScrolling = true;
+      this.debounceUpdateLastReadMessage();
+
+      if (
+        state.atTop ||
+        (!this.capabilities.isIOS &&
+          state.up &&
+          state.distanceToTop.percentage < 40)
+      ) {
+        this.fetchMoreMessages({ direction: PAST });
+      } else if (state.atBottom) {
+        this.fetchMoreMessages({ direction: FUTURE });
+      }
+    });
+  }
+
+  @action
+  onScrollEnd(state) {
+    this.needsArrow =
+      (this.messagesLoader.fetchedOnce &&
+        this.messagesLoader.canLoadMoreFuture) ||
+      (state.distanceToBottom.pixels > 250 && !state.atBottom);
+    this.isScrolling = false;
+    this.resetIdle();
+    this.atBottom = state.atBottom;
+
+    if (state.atBottom) {
+      this.fetchMoreMessages({ direction: FUTURE });
+    }
+  }
+
+  debounceUpdateLastReadMessage() {
+    this._debounceUpdateLastReadMessageHandler = discourseDebounce(
+      this,
+      this.updateLastReadMessage,
+      READ_INTERVAL_MS
+    );
+  }
+
+  @bind
+  updateLastReadMessage() {
+    // HACK: We don't have proper scroll visibility over
+    // what message we are looking at, don't have the lastReadMessageId
+    // for the thread, and this updateLastReadMessage function is only
+    // called when scrolling all the way to the bottom.
+    this.markThreadAsRead();
+  }
+
+  @action
+  setScrollable(element) {
+    this.scrollable = element;
+  }
+
+  @action
+  loadMessages() {
+    this.fetchMessages();
+    this.subscribeToUpdates();
+  }
+
+  @action
+  didResizePane() {
+    this._ignoreNextScroll = true;
+    this.debounceFillPaneAttempt();
+    this.debounceUpdateLastReadMessage();
+  }
+
+  async fetchMessages(findArgs = {}) {
+    if (this.args.thread.staged) {
+      const message = this.args.thread.originalMessage;
+      message.thread = this.args.thread;
+      message.manager = this.messagesManager;
+      this.messagesManager.addMessages([message]);
+      return;
+    }
+
+    if (this.messagesLoader.loading) {
+      return;
+    }
+
+    this.messagesManager.clear();
+
+    findArgs.targetMessageId ??=
+      this.args.targetMessageId ||
+      this.args.thread.currentUserMembership?.lastReadMessageId;
+
+    if (!findArgs.targetMessageId) {
+      findArgs.direction = FUTURE;
+    }
+
+    const result = await this.messagesLoader.load(findArgs);
+    if (!result) {
+      return;
+    }
+
+    const [messages, meta] = this.processMessages(this.args.thread, result);
+    stackingContextFix(this.scrollable, () => {
+      this.messagesManager.addMessages(messages);
+    });
+    this.args.thread.details = meta;
+
+    if (this.args.targetMessageId) {
+      this.scrollToMessageId(this.args.targetMessageId, { highlight: true });
+    } else if (this.args.thread.currentUserMembership?.lastReadMessageId) {
+      this.scrollToMessageId(
+        this.args.thread.currentUserMembership?.lastReadMessageId
+      );
+    } else {
+      this.scrollToTop();
+    }
+
+    this.debounceFillPaneAttempt();
+  }
+
+  @action
+  async fetchMoreMessages({ direction }) {
+    if (this.messagesLoader.loading) {
+      return;
+    }
+
+    const result = await this.messagesLoader.loadMore({ direction });
+    if (!result) {
+      return;
+    }
+
+    const [messages, meta] = this.processMessages(this.args.thread, result);
+    if (!messages?.length) {
+      return;
+    }
+
+    stackingContextFix(this.scrollable, () => {
+      this.messagesManager.addMessages(messages);
+    });
+    this.args.thread.details = meta;
+
+    if (direction === FUTURE) {
+      this.scrollToMessageId(messages.firstObject.id, {
+        position: "end",
+        behavior: "auto",
+      });
+    } else if (direction === PAST) {
+      this.scrollToMessageId(messages.lastObject.id);
+    }
+
+    this.debounceFillPaneAttempt();
+  }
+
+  @action
+  scrollToLatestMessage() {
+    if (this.messagesLoader.canLoadMoreFuture) {
+      this.fetchMessages();
+    } else if (this.messagesManager.messages.length > 0) {
+      this.scrollToBottom();
+    }
+  }
+
+  debounceFillPaneAttempt() {
+    if (!this.messagesLoader.fetchedOnce) {
+      return;
+    }
+
+    this._debouncedFillPaneAttemptHandler = discourseDebounce(
+      this,
+      this.fillPaneAttempt,
+      500
+    );
+  }
+
+  async fillPaneAttempt() {
+    // safeguard
+    if (this.messagesManager.messages.length > 200) {
+      return;
+    }
+
+    if (!this.messagesLoader.canLoadMorePast) {
+      return;
+    }
+
+    const firstMessage = this.messagesManager.messages.firstObject;
+    if (!firstMessage?.visible) {
+      return;
+    }
+
+    await this.fetchMoreMessages({ direction: PAST });
+  }
+
+  scrollToMessageId(
+    messageId,
+    opts = { highlight: false, position: "start", autoExpand: false }
+  ) {
+    this._ignoreNextScroll = true;
+    const message = this.messagesManager.findMessage(messageId);
+    scrollListToMessage(this.scrollable, message, opts);
+  }
+
+  @bind
+  processMessages(thread, result) {
+    const messages = result.messages.map((messageData) => {
+      const ignored = this.currentUser.ignored_users || [];
+      const hidden = ignored.includes(messageData.user.username);
+
+      return ChatMessage.create(thread.channel, {
+        ...messageData,
+        hidden,
+        expanded: !(hidden || messageData.deleted_at),
+        manager: this.messagesManager,
+        thread,
+      });
+    });
+
+    return [messages, result.meta];
+  }
+
+  // NOTE: At some point we want to do this based on visible messages
+  // and scrolling; for now it's enough to do it when the thread panel
+  // opens/messages are loaded since we have no pagination for threads.
+  markThreadAsRead() {
+    if (!this.args.thread || this.args.thread.staged) {
+      return;
+    }
+
+    return this.chatApi.markThreadAsRead(
+      this.args.thread.channel.id,
+      this.args.thread.id
+    );
+  }
+
+  @action
+  async onSendMessage(message) {
+    resetIdle();
+
+    await message.cook();
+    if (message.editing) {
+      await this.#sendEditMessage(message);
+    } else {
+      await this.#sendNewMessage(message);
+    }
+  }
+
+  @action
+  resetComposerMessage() {
+    this.chatThreadComposer.reset(this.args.thread);
+  }
+
+  async #sendNewMessage(message) {
+    if (this.chatThreadPane.sending) {
+      return;
+    }
+
+    this.chatThreadPane.sending = true;
+    this._ignoreNextScroll = true;
+    stackingContextFix(this.scrollable, async () => {
+      await this.args.thread.stageMessage(message);
+    });
+    this.resetComposerMessage();
+
+    if (!this.messagesLoader.canLoadMoreFuture) {
+      this.scrollToLatestMessage();
+    }
+
+    try {
+      const response = await this.chatApi.sendMessage(
+        this.args.thread.channel.id,
+        {
+          message: message.message,
+          in_reply_to_id: message.thread.staged
+            ? message.thread.originalMessage?.id
+            : null,
+          staged_id: message.id,
+          upload_ids: message.uploads.map((upload) => upload.id),
+          thread_id: message.thread.staged ? null : message.thread.id,
+          staged_thread_id: message.thread.staged ? message.thread.id : null,
+        }
+      );
+
+      this.args.thread.currentUserMembership ??=
+        UserChatThreadMembership.create({
+          notification_level: NotificationLevels.TRACKING,
+          last_read_message_id: response.message_id,
+        });
+
+      this.scrollToLatestMessage();
+    } catch (error) {
+      this.#onSendError(message.id, error);
+    } finally {
+      this.chatThreadPane.sending = false;
+    }
+  }
+
+  async #sendEditMessage(message) {
+    this.chatThreadPane.sending = true;
+
+    const data = {
+      new_message: message.message,
+      upload_ids: message.uploads.map((upload) => upload.id),
+    };
+
+    this.resetComposerMessage();
+
+    try {
+      return await this.chatApi.editMessage(
+        message.channel.id,
+        message.id,
+        data
+      );
+    } catch (e) {
+      popupAjaxError(e);
+    } finally {
+      this.chatThreadPane.sending = false;
+    }
+  }
+
+  @action
+  scrollToBottom() {
+    this._ignoreNextScroll = true;
+    scrollListToBottom(this.scrollable);
+  }
+
+  @action
+  scrollToTop() {
+    this._ignoreNextScroll = true;
+    scrollListToTop(this.scrollable);
+  }
+
+  @action
+  resendStagedMessage() {}
+
+  #onSendError(stagedId, error) {
+    const stagedMessage =
+      this.args.thread.messagesManager.findStagedMessage(stagedId);
+    if (stagedMessage) {
+      if (error.jqXHR?.responseJSON?.errors?.length) {
+        stagedMessage.error = error.jqXHR.responseJSON.errors[0];
+      } else {
+        this.chat.markNetworkAsUnreliable();
+        stagedMessage.error = "network_error";
+      }
+    }
+
+    this.resetComposerMessage();
+  }
+
+  #flushIgnoreNextScroll() {
+    const prev = this._ignoreNextScroll;
+    this._ignoreNextScroll = false;
+    return prev;
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-upload-drop-zone.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-upload-drop-zone.hbs
new file mode 100644
index 00000000000..08980dba7aa
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-upload-drop-zone.hbs
@@ -0,0 +1,65 @@
+<div class="chat-upload-drop-zone">
+  <div class="chat-upload-drop-zone__content">
+    <div class="chat-upload-drop-zone__background">
+      <svg
+        width="94"
+        height="90"
+        viewBox="0 0 94 90"
+        fill="none"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M94 40.5591C94 69.8685 64.0686 90 40.9592 90C17.8499 90 0 83.9085 0 60.6907C0 37.4729 28.458 0 51.5674 0C74.6768 0 94 17.3413 94 40.5591Z"
+          fill="#D1F0FF"
+        ></path>
+      </svg>
+    </div>
+    <div class="chat-upload-drop-zone__illustration">
+      <svg
+        width="106"
+        height="84"
+        viewBox="0 0 106 84"
+        fill="none"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <rect
+          x="55.832"
+          y="6.82959"
+          width="45.7854"
+          height="33.8408"
+          transform="rotate(13.4039 55.832 6.82959)"
+          fill="#D9D9D9"
+        ></rect>
+        <path
+          d="M100.66 13.7645L61.1414 4.34705C58.6715 3.75846 56.1786 5.37298 55.59 7.84288L47.6214 41.2815C47.0102 43.8464 48.5297 46.3167 50.9996 46.9053L90.518 56.3227C92.9879 56.9113 95.5532 55.4145 96.1644 52.8496L104.133 19.4109C104.722 16.941 103.225 14.3757 100.66 13.7645ZM58.7093 41.5144C58.5961 41.9894 58.1482 42.1838 57.7682 42.0933L53.2084 41.0067C52.7334 40.8935 52.5163 40.5406 52.6295 40.0656L53.7161 35.5058C53.8067 35.1258 54.1822 34.8137 54.6572 34.9269L59.122 35.9909C59.502 36.0815 59.7915 36.552 59.7009 36.932L58.7093 41.5144ZM61.6069 29.3549C61.4938 29.8299 61.0459 30.0243 60.6659 29.9338L56.1061 28.8472C55.6311 28.734 55.414 28.3811 55.5272 27.9061L56.6138 23.3463C56.7044 22.9663 57.0799 22.6542 57.5549 22.7674L62.0197 23.8314C62.3997 23.922 62.6891 24.3925 62.5986 24.7725L61.5119 29.3323L61.6069 29.3549ZM64.5046 17.1954C64.3914 17.6704 63.9435 17.8648 63.5635 17.7743L59.0037 16.6877C58.5287 16.5745 58.3117 16.2216 58.4249 15.7466L59.5115 11.1868C59.602 10.8068 59.9776 10.4947 60.4526 10.6079L64.9174 11.6719C65.2974 11.7625 65.5868 12.233 65.4962 12.613L64.5046 17.1954ZM81.6894 46.1876C81.4857 47.0426 80.5673 47.5264 79.8073 47.3453L64.6079 43.7232C63.753 43.5195 63.2464 42.6961 63.4502 41.8411L65.6234 32.7215C65.8045 31.9615 66.6506 31.36 67.5056 31.5637L82.705 35.1858C83.4649 35.3669 84.0438 36.308 83.8627 37.068L81.6894 46.1876ZM86.036 27.9483C85.8322 28.8033 84.9138 29.2872 84.1538 29.1061L68.9544 25.484C68.0995 25.2802 67.593 24.4568 67.7967 23.6018L69.97 14.4822C70.1511 13.7222 70.9971 13.1207 71.8521 13.3245L87.0515 16.9466C87.8114 17.1277 88.3903 18.0687 88.2092 18.8287L86.036 27.9483ZM92.1479 49.483C92.0347 49.958 91.5868 50.1524 91.2068 50.0619L86.742 48.9979C86.267 48.8847 86.05 48.5318 86.1631 48.0568L87.2498 43.497C87.3403 43.117 87.8109 42.8276 88.1908 42.9181L92.7507 44.0048C93.1306 44.0953 93.4201 44.5659 93.3295 44.9458L92.2429 49.5057L92.1479 49.483ZM95.0456 37.3235C94.9324 37.7985 94.4845 37.9929 94.1045 37.9024L89.6397 36.8384C89.1647 36.7252 88.9476 36.3723 89.0608 35.8973L90.1474 31.3375C90.238 30.9575 90.6135 30.6455 91.0885 30.7586L95.5533 31.8226C95.9333 31.9132 96.2228 32.3837 96.1322 32.7637L95.0456 37.3235ZM97.9432 25.164C97.8301 25.639 97.3822 25.8334 97.0022 25.7429L92.5374 24.6789C92.0624 24.5657 91.8453 24.2128 91.9585 23.7378L93.0451 19.178C93.1357 18.798 93.5112 18.486 93.8912 18.5765L98.356 19.6405C98.736 19.731 99.0254 20.2016 98.9349 20.5816L97.8483 25.1414L97.9432 25.164Z"
+          fill="#AFAFAF"
+        ></path>
+        <path
+          d="M30.7898 24.814L27.2823 9.2672L4.41944 14.4252C2.81904 14.7863 1.95958 16.3017 2.29486 17.7878L14.2615 70.8296C14.6226 72.43 16.0236 73.3153 17.624 72.9542L56.0337 64.2887C57.5198 63.9534 58.5193 62.5266 58.1582 60.9262L49.699 23.4311L34.1523 26.9385C32.5519 27.2996 31.1508 26.4144 30.7898 24.814ZM48.719 19.0871C48.5643 18.4012 48.0666 17.7927 47.4804 17.3243L33.7501 8.64894C33.0754 8.32063 32.3121 8.13243 31.6263 8.28717L30.9404 8.44191L34.2415 23.0742L48.8738 19.773L48.719 19.0871Z"
+          fill="#0AADFF"
+        ></path>
+        <rect
+          x="41.7334"
+          y="40.3967"
+          width="37.6309"
+          height="28.6511"
+          transform="rotate(6.29289 41.7334 40.3967)"
+          fill="#66CCFF"
+        ></rect>
+        <path
+          d="M76.768 40.4721L44.4638 36.9097C42.3671 36.6785 40.548 38.2071 40.3254 40.2261L37.8591 62.5905C37.6279 64.6872 39.0788 66.4977 41.1755 66.729L73.4796 70.2913C75.4987 70.514 77.3869 69.0716 77.6181 66.9749L80.0843 44.6105C80.307 42.5915 78.787 40.6947 76.768 40.4721ZM73.4248 66.5125L42.0524 63.0529C41.7418 63.0187 41.6036 62.8462 41.6379 62.5356L44.0014 41.103C44.0271 40.8701 44.2081 40.6542 44.5187 40.6885L75.891 44.1481C76.124 44.1738 76.3312 44.4324 76.3056 44.6654L73.9421 66.098C73.9078 66.4086 73.6577 66.5382 73.4248 66.5125ZM49.9226 44.4284C48.1365 44.2314 46.6623 45.4836 46.4739 47.192C46.2769 48.978 47.4514 50.4437 49.2375 50.6407C50.9459 50.8291 52.4892 49.6631 52.6862 47.8771C52.8746 46.1687 51.631 44.6168 49.9226 44.4284ZM45.725 59.6852L70.5743 62.4255L71.2594 56.2131L65.1708 48.7036C64.8254 48.2725 64.2818 48.2126 63.8507 48.558L53.5908 56.7799L50.8186 53.4088C50.4732 52.9777 49.9296 52.9178 49.4985 53.2632L46.136 55.9578L45.725 59.6852Z"
+          fill="white"
+        ></path>
+        <path
+          d="M37.8174 63.0181L77.5892 66.862L77.012 72.8342C76.9057 73.9336 75.9283 74.7388 74.8288 74.6325L39.0385 71.1734C37.939 71.0671 37.1339 70.0897 37.2402 68.9902L37.8174 63.0181Z"
+          fill="white"
+        ></path>
+      </svg>
+    </div>
+    <div class="chat-upload-drop-zone__text">
+      <span class="chat-upload-drop-zone__text__title">
+        {{this.title}}
+      </span>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-upload-drop-zone.js b/plugins/chat/assets/javascripts/discourse/components/chat-upload-drop-zone.js
new file mode 100644
index 00000000000..3e6b2487685
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-upload-drop-zone.js
@@ -0,0 +1,19 @@
+import Component from "@glimmer/component";
+import ChatThread from "discourse/plugins/chat/discourse/models/chat-thread";
+import I18n from "I18n";
+
+export default class ChatUploadDropZone extends Component {
+  get title() {
+    if (this.#isThread()) {
+      return I18n.t("chat.upload_to_thread");
+    } else {
+      return I18n.t("chat.upload_to_channel", {
+        title: this.args.model.title,
+      });
+    }
+  }
+
+  #isThread() {
+    return this.args.model instanceof ChatThread;
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-upload.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-upload.hbs
index ec31764ba70..5af7e46ddaa 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-upload.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-upload.hbs
@@ -7,12 +7,17 @@
     src={{@upload.url}}
     style={{this.imageStyle}}
     loading="lazy"
+    tabindex="0"
     {{on "load" this.imageLoaded}}
   />
 {{else if (eq this.type this.VIDEO_TYPE)}}
   <video class="chat-video-upload" preload="metadata" controls>
     <source src={{@upload.url}} />
   </video>
+{{else if (eq this.type this.AUDIO_TYPE)}}
+  <audio class="chat-audio-upload" preload="metadata" controls>
+    <source src={{@upload.url}} />
+  </audio>
 {{else}}
   <a
     class="chat-other-upload"
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-upload.js b/plugins/chat/assets/javascripts/discourse/components/chat-upload.js
index e81190ed12d..3f69010985b 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-upload.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-upload.js
@@ -1,7 +1,7 @@
 import Component from "@glimmer/component";
 
 import { inject as service } from "@ember/service";
-import { isImage, isVideo } from "discourse/lib/uploads";
+import { isAudio, isImage, isVideo } from "discourse/lib/uploads";
 import { action } from "@ember/object";
 import { tracked } from "@glimmer/tracking";
 import { htmlSafe } from "@ember/template";
@@ -13,6 +13,7 @@ export default class extends Component {
 
   IMAGE_TYPE = "image";
   VIDEO_TYPE = "video";
+  AUDIO_TYPE = "audio";
   ATTACHMENT_TYPE = "attachment";
 
   get type() {
@@ -24,6 +25,10 @@ export default class extends Component {
       return this.VIDEO_TYPE;
     }
 
+    if (isAudio(this.args.upload.original_filename)) {
+      return this.AUDIO_TYPE;
+    }
+
     return this.ATTACHMENT_TYPE;
   }
 
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-user-avatar.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-user-avatar.hbs
deleted file mode 100644
index 3cad164465b..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/chat-user-avatar.hbs
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="chat-user-avatar {{if this.isOnline 'is-online'}}">
-  <div
-    role="button"
-    class="chat-user-avatar-container clickable"
-    data-user-card={{this.user.username}}
-  >
-    {{avatar this.user imageSize=this.avatarSize}}
-  </div>
-</div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-user-avatar.js b/plugins/chat/assets/javascripts/discourse/components/chat-user-avatar.js
deleted file mode 100644
index 0b3853e915e..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/chat-user-avatar.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import Component from "@ember/component";
-import { computed } from "@ember/object";
-import { inject as service } from "@ember/service";
-
-export default class ChatUserAvatar extends Component {
-  @service chat;
-  tagName = "";
-
-  user = null;
-
-  avatarSize = "tiny";
-
-  @computed("chat.presenceChannel.users.[]", "user.{id,username}")
-  get isOnline() {
-    const users = this.chat.presenceChannel?.users;
-
-    return (
-      !!users?.findBy("id", this.user?.id) ||
-      !!users?.findBy("username", this.user?.username)
-    );
-  }
-}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-user-display-name.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-user-display-name.hbs
index cf858f4fb04..a68732864ab 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-user-display-name.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-user-display-name.hbs
@@ -1,15 +1,20 @@
 <span class="chat-user-display-name">
   {{#if this.shouldShowNameFirst}}
-    <span class="chat-user-display-name__name">{{this.user.name}}</span>
+    <span class="chat-user-display-name__name -first">{{@user.name}}</span>
     <span class="separator">—</span>
   {{/if}}
 
-  <span class="chat-user-display-name__username">
+  <span
+    class={{concat-class
+      "chat-user-display-name__username"
+      (unless this.shouldShowNameFirst "-first")
+    }}
+  >
     {{this.formattedUsername}}
   </span>
 
   {{#if this.shouldShowNameLast}}
     <span class="separator">—</span>
-    <span class="chat-user-display-name__name">{{this.user.name}}</span>
+    <span class="chat-user-display-name__name">{{@user.name}}</span>
   {{/if}}
 </span>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-user-display-name.js b/plugins/chat/assets/javascripts/discourse/components/chat-user-display-name.js
index 3130f9d6de6..3016ce869fa 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-user-display-name.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-user-display-name.js
@@ -1,32 +1,26 @@
-import Component from "@ember/component";
-import { computed } from "@ember/object";
+import Component from "@glimmer/component";
 import { formatUsername } from "discourse/lib/utilities";
+import { inject as service } from "@ember/service";
 
 export default class ChatUserDisplayName extends Component {
-  tagName = "";
-  user = null;
+  @service siteSettings;
 
-  @computed
   get shouldPrioritizeNameInUx() {
     return !this.siteSettings.prioritize_username_in_ux;
   }
 
-  @computed("user.name")
   get hasValidName() {
-    return this.user?.name && this.user?.name.trim().length > 0;
+    return this.args.user?.name && this.args.user.name.trim().length > 0;
   }
 
-  @computed("user.username")
   get formattedUsername() {
-    return formatUsername(this.user?.username);
+    return formatUsername(this.args.user?.username);
   }
 
-  @computed("shouldPrioritizeNameInUx", "hasValidName")
   get shouldShowNameFirst() {
     return this.shouldPrioritizeNameInUx && this.hasValidName;
   }
 
-  @computed("shouldPrioritizeNameInUx", "hasValidName")
   get shouldShowNameLast() {
     return !this.shouldPrioritizeNameInUx && this.hasValidName;
   }
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-user-info.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-user-info.hbs
new file mode 100644
index 00000000000..1dd5843bf8e
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-user-info.hbs
@@ -0,0 +1,8 @@
+{{#if @user}}
+  <a href={{this.userPath}} data-user-card={{@user.username}}>
+    <Chat::UserAvatar @user={{@user}} @avatarSize="medium" />
+  </a>
+  <a href={{this.userPath}} data-user-card={{@user.username}}>
+    <ChatUserDisplayName @user={{@user}} />
+  </a>
+{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-user-info.js b/plugins/chat/assets/javascripts/discourse/components/chat-user-info.js
new file mode 100644
index 00000000000..ccc7d150af6
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-user-info.js
@@ -0,0 +1,8 @@
+import Component from "@glimmer/component";
+import { userPath } from "discourse/lib/url";
+
+export default class ChatUserInfo extends Component {
+  get userPath() {
+    return userPath(this.args.user.username);
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-vh.js b/plugins/chat/assets/javascripts/discourse/components/chat-vh.js
index 270e4a3bc95..546134aedb4 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-vh.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-vh.js
@@ -1,97 +1,71 @@
 import { bind } from "discourse-common/utils/decorators";
 import Component from "@ember/component";
+import { inject as service } from "@ember/service";
 import isZoomed from "discourse/plugins/chat/discourse/lib/zoom-check";
 
 const CSS_VAR = "--chat-vh";
-let pendingUpdate = false;
+let lastVH;
 
 export default class ChatVh extends Component {
+  @service capabilities;
+
   tagName = "";
 
   didInsertElement() {
     this._super(...arguments);
 
-    this.setVHFromVisualViewPort();
-
-    (window?.visualViewport || window).addEventListener(
-      "resize",
-      this.setVHFromVisualViewPort
-    );
-
     if ("virtualKeyboard" in navigator) {
-      navigator.virtualKeyboard.addEventListener(
-        "geometrychange",
-        this.setVHFromKeyboard
-      );
+      navigator.virtualKeyboard.overlaysContent = true;
+      navigator.virtualKeyboard.addEventListener("geometrychange", this.setVH);
     }
+
+    this.activeWindow = window.visualViewport || window;
+    this.activeWindow.addEventListener("resize", this.setVH);
+    this.setVH();
   }
 
   willDestroyElement() {
     this._super(...arguments);
 
+    this.activeWindow?.removeEventListener("resize", this.setVH);
+    lastVH = null;
+
     if ("virtualKeyboard" in navigator) {
       navigator.virtualKeyboard.removeEventListener(
         "geometrychange",
-        this.setVHFromKeyboard
+        this.setVH
       );
+    }
+  }
+
+  @bind
+  setVH() {
+    if (isZoomed()) {
+      return;
+    }
+
+    let height;
+    if ("virtualKeyboard" in navigator) {
+      height =
+        window.visualViewport.height -
+        navigator.virtualKeyboard.boundingRect.height;
     } else {
-      (window?.visualViewport || window).removeEventListener(
-        "resize",
-        this.setVHFromVisualViewPort
-      );
+      height = this.activeWindow?.height || window.innerHeight;
     }
 
-    pendingUpdate = false;
+    const vh = height * 0.01;
+
+    if (lastVH === vh) {
+      return;
+    }
+    lastVH = vh;
+
+    document.documentElement.style.setProperty(CSS_VAR, `${vh}px`);
   }
 
-  @bind
-  setVHFromKeyboard(event) {
-    if (pendingUpdate) {
-      return;
+  #blurActiveElement() {
+    if (document.activeElement?.blur) {
+      document.activeElement.blur();
     }
-
-    if (this.isDestroying || this.isDestroyed) {
-      return;
-    }
-
-    if (isZoomed()) {
-      return;
-    }
-
-    pendingUpdate = true;
-
-    requestAnimationFrame(() => {
-      const { height } = event.target.boundingRect;
-      const vhInPixels =
-        ((window.visualViewport?.height || window.innerHeight) - height) * 0.01;
-      document.documentElement.style.setProperty(CSS_VAR, `${vhInPixels}px`);
-
-      pendingUpdate = false;
-    });
-  }
-
-  @bind
-  setVHFromVisualViewPort() {
-    if (pendingUpdate) {
-      return;
-    }
-
-    if (this.isDestroying || this.isDestroyed) {
-      return;
-    }
-
-    if (isZoomed()) {
-      return;
-    }
-
-    pendingUpdate = true;
-
-    requestAnimationFrame(() => {
-      const vhInPixels =
-        (window.visualViewport?.height || window.innerHeight) * 0.01;
-      document.documentElement.style.setProperty(CSS_VAR, `${vhInPixels}px`);
-
-      pendingUpdate = false;
-    });
   }
 }
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/admin/export-messages.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/admin/export-messages.hbs
new file mode 100644
index 00000000000..732d4be7dbb
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/admin/export-messages.hbs
@@ -0,0 +1,10 @@
+<section class="admin-section">
+  <h3>{{i18n "chat.admin.export_messages.title"}}</h3>
+  <p>{{i18n "chat.admin.export_messages.description"}}</p>
+  <DButton
+    @label="chat.admin.export_messages.create_export"
+    @title="chat.admin.export_messages.create_export"
+    @class="btn-primary"
+    @action={{this.exportMessages}}
+  />
+</section>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/admin/export-messages.js b/plugins/chat/assets/javascripts/discourse/components/chat/admin/export-messages.js
new file mode 100644
index 00000000000..8ae8017781e
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/admin/export-messages.js
@@ -0,0 +1,22 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import I18n from "I18n";
+
+export default class ChatAdminExportMessages extends Component {
+  @service chatAdminApi;
+  @service dialog;
+
+  @action
+  async exportMessages() {
+    try {
+      await this.chatAdminApi.exportMessages();
+      this.dialog.alert(
+        I18n.t("chat.admin.export_messages.export_has_started")
+      );
+    } catch (error) {
+      popupAjaxError(error);
+    }
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/composer/button.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/composer/button.hbs
new file mode 100644
index 00000000000..4e12924ce77
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/composer/button.hbs
@@ -0,0 +1,5 @@
+<div class="chat-composer-button__wrapper">
+  <button type="button" class="chat-composer-button" ...attributes>
+    {{d-icon @icon}}
+  </button>
+</div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/composer/button.js b/plugins/chat/assets/javascripts/discourse/components/chat/composer/button.js
new file mode 100644
index 00000000000..f91ff5d29be
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/composer/button.js
@@ -0,0 +1,3 @@
+import Component from "@glimmer/component";
+
+export default class ChatComposerButton extends Component {}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/composer/channel.js b/plugins/chat/assets/javascripts/discourse/components/chat/composer/channel.js
new file mode 100644
index 00000000000..ed67eede4c9
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/composer/channel.js
@@ -0,0 +1,115 @@
+import ChatComposer from "../../chat-composer";
+import { inject as service } from "@ember/service";
+import I18n from "I18n";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { action } from "@ember/object";
+
+export default class ChatComposerChannel extends ChatComposer {
+  @service("chat-channel-composer") composer;
+  @service("chat-channel-pane") pane;
+  @service chatDraftsManager;
+  @service currentUser;
+
+  context = "channel";
+
+  composerId = "channel-composer";
+
+  get shouldRenderReplyingIndicator() {
+    return this.args.channel;
+  }
+
+  get presenceChannelName() {
+    const channel = this.args.channel;
+    return `/chat-reply/${channel.id}`;
+  }
+
+  get disabled() {
+    return (
+      !this.chat.userCanInteractWithChat ||
+      !this.args.channel.canModifyMessages(this.currentUser)
+    );
+  }
+
+  @action
+  reset() {
+    this.composer.reset(this.args.channel);
+  }
+
+  @action
+  persistDraft() {
+    this.chatDraftsManager.add(this.currentMessage);
+
+    this._persistHandler = discourseDebounce(
+      this,
+      this._debouncedPersistDraft,
+      this.args.channel.id,
+      this.currentMessage.toJSONDraft(),
+      2000
+    );
+  }
+
+  @action
+  _debouncedPersistDraft(channelId, jsonDraft) {
+    this.chatApi.saveDraft(channelId, jsonDraft).then(() => {
+      if (this.currentMessage) {
+        this.currentMessage.draftSaved = true;
+      }
+    });
+  }
+
+  get lastMessage() {
+    return this.args.channel.lastMessage;
+  }
+
+  lastUserMessage(user) {
+    return this.args.channel.messagesManager.findLastUserMessage(user);
+  }
+
+  get placeholder() {
+    if (!this.args.channel.canModifyMessages(this.currentUser)) {
+      return I18n.t(
+        `chat.placeholder_new_message_disallowed.${this.args.channel.status}`
+      );
+    }
+
+    if (!this.chat.userCanInteractWithChat) {
+      return I18n.t("chat.placeholder_silenced");
+    } else {
+      return this.#messageRecipients(this.args.channel);
+    }
+  }
+
+  handleEscape(event) {
+    event.stopPropagation();
+
+    if (this.currentMessage?.inReplyTo) {
+      this.reset();
+    } else if (this.currentMessage?.editing) {
+      this.composer.cancel(this.args.channel);
+    } else {
+      event.target.blur();
+    }
+  }
+
+  #messageRecipients(channel) {
+    if (channel.isDirectMessageChannel) {
+      const directMessageRecipients = channel.chatable.users;
+      if (
+        directMessageRecipients.length === 1 &&
+        directMessageRecipients[0].id === this.currentUser.id
+      ) {
+        return I18n.t("chat.placeholder_self");
+      }
+
+      return I18n.t("chat.placeholder_users", {
+        commaSeparatedNames: directMessageRecipients
+          .map((u) => u.name || `@${u.username}`)
+          .join(I18n.t("word_connector.comma")),
+      });
+    } else {
+      return I18n.t("chat.placeholder_channel", {
+        channelName: `#${channel.title}`,
+      });
+    }
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/composer/separator.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/composer/separator.hbs
new file mode 100644
index 00000000000..5991a7287e9
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/composer/separator.hbs
@@ -0,0 +1 @@
+<div class="chat-composer-separator"></div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/composer/separator.js b/plugins/chat/assets/javascripts/discourse/components/chat/composer/separator.js
new file mode 100644
index 00000000000..47b899f4625
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/composer/separator.js
@@ -0,0 +1,3 @@
+import Component from "@glimmer/component";
+
+export default class ChatComposerSeparator extends Component {}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/composer/thread.js b/plugins/chat/assets/javascripts/discourse/components/chat/composer/thread.js
new file mode 100644
index 00000000000..dd061e33b0c
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/composer/thread.js
@@ -0,0 +1,61 @@
+import ChatComposer from "../../chat-composer";
+import { inject as service } from "@ember/service";
+import I18n from "I18n";
+import { action } from "@ember/object";
+
+export default class ChatComposerThread extends ChatComposer {
+  @service("chat-channel-composer") channelComposer;
+  @service("chat-thread-composer") composer;
+  @service("chat-thread-pane") pane;
+  @service currentUser;
+
+  context = "thread";
+
+  composerId = "thread-composer";
+
+  @action
+  reset() {
+    this.composer.reset(this.args.thread);
+  }
+
+  get shouldRenderReplyingIndicator() {
+    return this.args.thread;
+  }
+
+  get disabled() {
+    return (
+      !this.chat.userCanInteractWithChat ||
+      !this.args.thread.channel.canModifyMessages(this.currentUser)
+    );
+  }
+
+  get presenceChannelName() {
+    const thread = this.args.thread;
+    return `/chat-reply/${thread.channel.id}/thread/${thread.id}`;
+  }
+
+  get placeholder() {
+    return I18n.t("chat.placeholder_thread");
+  }
+
+  lastUserMessage(user) {
+    return this.args.thread.messagesManager.findLastUserMessage(user);
+  }
+
+  handleEscape(event) {
+    if (this.currentMessage.editing) {
+      event.stopPropagation();
+      this.composer.cancel(this.args.thread);
+      return;
+    }
+
+    if (this.isFocused) {
+      event.stopPropagation();
+      this.composer.blur();
+    } else {
+      this.pane.close().then(() => {
+        this.channelComposer.focus();
+      });
+    }
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/header/icon.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/header/icon.hbs
new file mode 100644
index 00000000000..00fb2474a4f
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/header/icon.hbs
@@ -0,0 +1,14 @@
+<a
+  href={{this.href}}
+  tabindex="0"
+  class={{concat-class "icon" "btn-flat" (if this.isActive "active")}}
+>
+  {{d-icon "d-chat"}}
+  {{#unless this.currentUserInDnD}}
+    <Chat::Header::Icon::UnreadIndicator
+      @urgentCount={{@urgentCount}}
+      @unreadCount={{@unreadCount}}
+      @indicatorPreference={{@indicatorPreference}}
+    />
+  {{/unless}}
+</a>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-header-icon.js b/plugins/chat/assets/javascripts/discourse/components/chat/header/icon.js
similarity index 50%
rename from plugins/chat/assets/javascripts/discourse/components/chat-header-icon.js
rename to plugins/chat/assets/javascripts/discourse/components/chat/header/icon.js
index 9753f8ab005..6dbf81707d7 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-header-icon.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/header/icon.js
@@ -1,31 +1,38 @@
 import { inject as service } from "@ember/service";
 import Component from "@glimmer/component";
+import getURL from "discourse-common/lib/get-url";
 
 export default class ChatHeaderIcon extends Component {
   @service currentUser;
   @service site;
   @service chatStateManager;
+  @service router;
 
   get currentUserInDnD() {
-    return this.currentUser.isInDoNotDisturb();
-  }
-
-  get href() {
-    if (this.chatStateManager.isFullPageActive && this.site.mobileView) {
-      return "/chat";
-    }
-
-    if (this.chatStateManager.isDrawerActive) {
-      return "/chat";
-    } else {
-      return this.chatStateManager.lastKnownChatURL || "/chat";
-    }
+    return this.args.currentUserInDnD || this.currentUser.isInDoNotDisturb();
   }
 
   get isActive() {
     return (
+      this.args.isActive ||
       this.chatStateManager.isFullPageActive ||
       this.chatStateManager.isDrawerActive
     );
   }
+
+  get href() {
+    if (this.chatStateManager.isFullPageActive) {
+      if (this.site.mobileView) {
+        return getURL("/chat");
+      } else {
+        return getURL(this.router.currentURL);
+      }
+    }
+
+    if (this.chatStateManager.isDrawerActive) {
+      return getURL("/chat");
+    }
+
+    return getURL(this.chatStateManager.lastKnownChatURL || "/chat");
+  }
 }
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/header/icon/unread-indicator.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/header/icon/unread-indicator.hbs
new file mode 100644
index 00000000000..973955c09c3
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/header/icon/unread-indicator.hbs
@@ -0,0 +1,9 @@
+{{#if this.showUrgentIndicator}}
+  <div class="chat-channel-unread-indicator -urgent">
+    <div class="chat-channel-unread-indicator__number">
+      {{this.unreadCountLabel}}
+    </div>
+  </div>
+{{else if this.showUnreadIndicator}}
+  <div class="chat-channel-unread-indicator"></div>
+{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/header/icon/unread-indicator.js b/plugins/chat/assets/javascripts/discourse/components/chat/header/icon/unread-indicator.js
new file mode 100644
index 00000000000..41b8c3e9855
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/header/icon/unread-indicator.js
@@ -0,0 +1,65 @@
+import { inject as service } from "@ember/service";
+import Component from "@glimmer/component";
+import {
+  HEADER_INDICATOR_PREFERENCE_ALL_NEW,
+  HEADER_INDICATOR_PREFERENCE_DM_AND_MENTIONS,
+  HEADER_INDICATOR_PREFERENCE_NEVER,
+} from "discourse/plugins/chat/discourse/controllers/preferences-chat";
+
+export default class ChatHeaderIconUnreadIndicator extends Component {
+  @service chatTrackingStateManager;
+  @service currentUser;
+
+  get urgentCount() {
+    return (
+      this.args.urgentCount ||
+      this.chatTrackingStateManager.allChannelUrgentCount
+    );
+  }
+
+  get unreadCount() {
+    return (
+      this.args.unreadCount ||
+      this.chatTrackingStateManager.publicChannelUnreadCount
+    );
+  }
+
+  get indicatorPreference() {
+    return (
+      this.args.indicatorPreference ||
+      this.currentUser.user_option.chat_header_indicator_preference
+    );
+  }
+
+  get showUrgentIndicator() {
+    return (
+      this.urgentCount > 0 &&
+      this.#hasAnyIndicatorPreference([
+        HEADER_INDICATOR_PREFERENCE_ALL_NEW,
+        HEADER_INDICATOR_PREFERENCE_DM_AND_MENTIONS,
+      ])
+    );
+  }
+
+  get showUnreadIndicator() {
+    return (
+      this.unreadCount > 0 &&
+      this.#hasAnyIndicatorPreference([HEADER_INDICATOR_PREFERENCE_ALL_NEW])
+    );
+  }
+
+  get unreadCountLabel() {
+    return this.urgentCount > 99 ? "99+" : this.urgentCount;
+  }
+
+  #hasAnyIndicatorPreference(preferences) {
+    if (
+      !this.currentUser ||
+      this.indicatorPreference === HEADER_INDICATOR_PREFERENCE_NEVER
+    ) {
+      return false;
+    }
+
+    return preferences.includes(this.indicatorPreference);
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator.hbs
new file mode 100644
index 00000000000..c0bbc86234e
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator.hbs
@@ -0,0 +1,141 @@
+<div class="chat-message-creator__container">
+  <div class="chat-message-creator">
+    <div
+      class="chat-message-creator__selection-container"
+      {{did-insert this.focusInput}}
+      ...attributes
+    >
+      <div class="chat-message-creator__selection">
+        <div class="chat-message-creator__search-icon-container">
+          {{d-icon "search" class="chat-message-creator__search-icon"}}
+        </div>
+
+        {{#each this.selection as |selection|}}
+          <div
+            class={{concat-class
+              "chat-message-creator__selection-item"
+              (concat "-" selection.type)
+              (if
+                (includes this.activeSelectionIdentifiers selection.identifier)
+                "-active"
+              )
+            }}
+            tabindex="-1"
+            data-id={{selection.identifier}}
+            {{on "click" (fn this.removeSelection selection.identifier)}}
+          >
+            {{component
+              (concat "chat/message-creator/" selection.type "-selection")
+              selection=selection
+            }}
+            <i
+              class="chat-message-creator__selection__remove-btn"
+              aria-hidden="true"
+            >
+              {{d-icon "times"}}
+            </i>
+          </div>
+        {{/each}}
+
+        <Input
+          class="chat-message-creator__input"
+          {{did-insert this.setQueryElement}}
+          {{on "input" this.handleInput}}
+          {{on "keydown" this.handleKeydown}}
+          placeholder={{this.placeholder}}
+          @value={{readonly this.query}}
+          @type="text"
+        />
+      </div>
+
+      <DButton
+        class="chat-message-creator__close-btn btn-flat"
+        @icon="times"
+        @action={{@onClose}}
+      />
+    </div>
+
+    {{#if this.showResults}}
+      <div class="chat-message-creator__content-container" role="presentation">
+        <div
+          class="chat-message-creator__content"
+          role="listbox"
+          aria-multiselectable="true"
+          tabindex="-1"
+        >
+          {{#if this.searchRequest.loading}}
+            <div class="chat-message-creator__loader-container">
+              <div class="chat-message-creator__loader spinner small"></div>
+            </div>
+          {{else}}
+            {{#each this.searchRequest.value as |result|}}
+              <div
+                class={{concat-class
+                  "chat-message-creator__row"
+                  (concat "-" result.type)
+                  (unless result.enabled "-disabled")
+                  (if
+                    (eq this.activeResultIdentifier result.identifier) "-active"
+                  )
+                  (if
+                    (includes this.selectionIdentifiers result.identifier)
+                    "-selected"
+                  )
+                }}
+                data-id={{result.identifier}}
+                tabindex="-1"
+                role="option"
+                {{on "click" (fn this.handleRowClick result.identifier)}}
+                {{on "mousemove" (fn (mut this.activeResult) result)}}
+                {{on "keydown" this.handleKeydown}}
+                aria-selected={{if
+                  (includes this.selectionIdentifiers result.identifier)
+                  "true"
+                  "false"
+                }}
+              >
+                {{component
+                  (concat "chat/message-creator/" result.type "-row")
+                  content=result
+                  selected=(includes
+                    this.selectionIdentifiers result.identifier
+                  )
+                  active=(eq this.activeResultIdentifier result.identifier)
+                  hasSelectedUsers=this.hasSelectedUsers
+                }}
+              </div>
+            {{else}}
+              {{#if this.query.length}}
+                <div class="chat-message-creator__no-items-container">
+                  <span class="chat-message-creator__no-items">
+                    {{i18n "chat.new_message_modal.no_items"}}
+                  </span>
+                </div>
+              {{/if}}
+            {{/each}}
+          {{/if}}
+        </div>
+      </div>
+    {{/if}}
+
+    {{#if this.showFooter}}
+      <div class="chat-message-creator__footer-container">
+        <div class="chat-message-creator__footer">
+          {{#if this.showShortcut}}
+            <div class="chat-message-creator__shortcut">
+              {{this.shortcutLabel}}
+            </div>
+          {{/if}}
+
+          {{#if this.hasSelectedUsers}}
+            <DButton
+              class="chat-message-creator__open-dm-btn btn-primary"
+              @action={{fn this.openChannel this.selection}}
+              @translatedLabel={{this.openChannelLabel}}
+            />
+          {{/if}}
+        </div>
+      </div>
+    {{/if}}
+  </div>
+</div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator.js b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator.js
new file mode 100644
index 00000000000..292b78098d1
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator.js
@@ -0,0 +1,542 @@
+import Component from "@glimmer/component";
+import { cached, tracked } from "@glimmer/tracking";
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+import { TrackedArray } from "@ember-compat/tracked-built-ins";
+import { schedule } from "@ember/runloop";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { getOwner, setOwner } from "@ember/application";
+import { INPUT_DELAY } from "discourse-common/config/environment";
+import I18n from "I18n";
+import ChatChatable from "discourse/plugins/chat/discourse/models/chat-chatable";
+import { escapeExpression } from "discourse/lib/utilities";
+import { htmlSafe } from "@ember/template";
+
+const MAX_RESULTS = 10;
+const USER_PREFIX = "@";
+const CHANNEL_PREFIX = "#";
+const CHANNEL_TYPE = "channel";
+const USER_TYPE = "user";
+
+class Search {
+  @service("chat-api") api;
+  @service chat;
+  @service chatChannelsManager;
+
+  @tracked loading = false;
+  @tracked value = [];
+  @tracked query = "";
+
+  constructor(owner, options = {}) {
+    setOwner(this, owner);
+
+    options.preload ??= false;
+    options.onlyUsers ??= false;
+
+    if (!options.term && !options.preload) {
+      return;
+    }
+
+    if (!options.term && options.preload) {
+      this.value = this.#loadExistingChannels();
+      return;
+    }
+
+    this.loading = true;
+
+    this.api
+      .chatables({ term: options.term })
+      .then((results) => {
+        let chatables = [
+          ...results.users,
+          ...results.direct_message_channels,
+          ...results.category_channels,
+        ];
+
+        if (options.excludeUserId) {
+          chatables = chatables.filter(
+            (item) => item.identifier !== `u-${options.excludeUserId}`
+          );
+        }
+
+        this.value = chatables
+          .map((item) => {
+            const chatable = ChatChatable.create(item);
+            chatable.tracking = this.#injectTracking(chatable);
+            return chatable;
+          })
+          .slice(0, MAX_RESULTS);
+      })
+      .catch(() => (this.value = []))
+      .finally(() => (this.loading = false));
+  }
+
+  #loadExistingChannels() {
+    return this.chatChannelsManager.allChannels
+      .map((channel) => {
+        let chatable;
+        if (channel.chatable?.users?.length === 1) {
+          chatable = ChatChatable.createUser(channel.chatable.users[0]);
+          chatable.tracking = this.#injectTracking(chatable);
+        } else {
+          chatable = ChatChatable.createChannel(channel);
+          chatable.tracking = channel.tracking;
+        }
+        return chatable;
+      })
+      .filter(Boolean)
+      .slice(0, MAX_RESULTS);
+  }
+
+  #injectTracking(chatable) {
+    switch (chatable.type) {
+      case CHANNEL_TYPE:
+        return this.chatChannelsManager.allChannels.find(
+          (channel) => channel.id === chatable.model.id
+        )?.tracking;
+        break;
+      case USER_TYPE:
+        return this.chatChannelsManager.directMessageChannels.find(
+          (channel) =>
+            channel.chatable.users.length === 1 &&
+            channel.chatable.users[0].id === chatable.model.id
+        )?.tracking;
+        break;
+    }
+  }
+}
+
+export default class ChatMessageCreator extends Component {
+  @service("chat-api") api;
+  @service("chat-channel-composer") composer;
+  @service chat;
+  @service site;
+  @service router;
+  @service currentUser;
+  @service siteSettings;
+
+  @tracked selection = new TrackedArray();
+  @tracked activeSelection = new TrackedArray();
+  @tracked query = "";
+  @tracked queryElement = null;
+  @tracked loading = false;
+  @tracked activeSelectionIdentifiers = new TrackedArray();
+  @tracked selectedIdentifiers = [];
+  @tracked _activeResultIdentifier = null;
+
+  get placeholder() {
+    if (
+      this.siteSettings.enable_public_channels &&
+      this.chat.userCanDirectMessage
+    ) {
+      if (this.hasSelectedUsers) {
+        return I18n.t("chat.new_message_modal.user_search_placeholder");
+      } else {
+        return I18n.t("chat.new_message_modal.default_search_placeholder");
+      }
+    } else if (this.siteSettings.enable_public_channels) {
+      return I18n.t(
+        "chat.new_message_modal.default_channel_search_placeholder"
+      );
+    } else if (this.chat.userCanDirectMessage) {
+      if (this.hasSelectedUsers) {
+        return I18n.t("chat.new_message_modal.user_search_placeholder");
+      } else {
+        return I18n.t("chat.new_message_modal.default_user_search_placeholder");
+      }
+    }
+  }
+
+  get showFooter() {
+    return this.showShortcut || this.hasSelectedUsers;
+  }
+
+  get showResults() {
+    if (this.hasSelectedUsers && !this.query.length) {
+      return false;
+    }
+
+    return true;
+  }
+
+  get shortcutLabel() {
+    let username;
+
+    if (this.activeResult?.isUser) {
+      username = this.activeResult.model.username;
+    } else {
+      username = this.activeResult.model.chatable.users[0].username;
+    }
+
+    return htmlSafe(
+      I18n.t("chat.new_message_modal.add_user_long", {
+        username: escapeExpression(username),
+      })
+    );
+  }
+
+  get showShortcut() {
+    return (
+      !this.hasSelectedUsers &&
+      this.searchRequest?.value?.length &&
+      this.site.desktopView &&
+      (this.activeResult?.isUser || this.activeResult?.isSingleUserChannel)
+    );
+  }
+
+  get activeResultIdentifier() {
+    return (
+      this._activeResultIdentifier ||
+      this.searchRequest.value.find((result) => result.enabled)?.identifier
+    );
+  }
+
+  get hasSelectedUsers() {
+    return this.selection.some((s) => s.isUser);
+  }
+
+  get activeResult() {
+    return this.searchRequest.value.findBy(
+      "identifier",
+      this.activeResultIdentifier
+    );
+  }
+
+  set activeResult(result) {
+    if (!result?.enabled) {
+      return;
+    }
+
+    this._activeResultIdentifier = result?.identifier;
+  }
+
+  get selectionIdentifiers() {
+    return this.selection.mapBy("identifier");
+  }
+
+  get openChannelLabel() {
+    const users = this.selection.mapBy("model");
+
+    return I18n.t("chat.placeholder_users", {
+      commaSeparatedNames: users
+        .map((u) => u.name || u.username)
+        .join(I18n.t("word_connector.comma")),
+    });
+  }
+
+  @cached
+  get searchRequest() {
+    let term = this.query;
+
+    if (term?.length) {
+      if (this.hasSelectedUsers && term.startsWith(CHANNEL_PREFIX)) {
+        term = term.replace(/^#/, USER_PREFIX);
+      }
+
+      if (this.hasSelectedUsers && !term.startsWith(USER_PREFIX)) {
+        term = USER_PREFIX + term;
+      }
+    }
+
+    return new Search(getOwner(this), {
+      term,
+      preload: !this.selection?.length,
+      onlyUsers: this.hasSelectedUsers,
+      excludeUserId: this.hasSelectedUsers ? this.currentUser?.id : null,
+    });
+  }
+
+  @action
+  onFilter(term) {
+    this._activeResultIdentifier = null;
+    this.activeSelectionIdentifiers = [];
+    this.query = term;
+  }
+
+  @action
+  setQueryElement(element) {
+    this.queryElement = element;
+  }
+
+  @action
+  focusInput() {
+    schedule("afterRender", () => {
+      this.queryElement.focus();
+    });
+  }
+
+  @action
+  handleKeydown(event) {
+    if (event.key === "Escape") {
+      if (this.activeSelectionIdentifiers.length > 0) {
+        this.activeSelectionIdentifiers = [];
+        event.preventDefault();
+        event.stopPropagation();
+        return;
+      }
+    }
+
+    if (event.key === "a" && (event.metaKey || event.ctrlKey)) {
+      this.activeSelectionIdentifiers = this.selection.mapBy("identifier");
+      return;
+    }
+
+    if (event.key === "Enter") {
+      if (this.activeSelectionIdentifiers.length > 0) {
+        this.activeSelectionIdentifiers.forEach((identifier) => {
+          this.removeSelection(identifier);
+        });
+        this.activeSelectionIdentifiers = [];
+        event.preventDefault();
+        return;
+      } else if (this.activeResultIdentifier) {
+        this.toggleSelection(this.activeResultIdentifier, {
+          altSelection: event.shiftKey || event.ctrlKey,
+        });
+        event.preventDefault();
+        return;
+      } else if (this.query?.length === 0) {
+        this.openChannel(this.selection);
+        event.preventDefault();
+        return;
+      }
+    }
+
+    if (event.key === "ArrowDown" && this.searchRequest.value.length > 0) {
+      this.activeSelectionIdentifiers = [];
+      this._activeResultIdentifier = this.#getNextResult()?.identifier;
+      event.preventDefault();
+      return;
+    }
+
+    if (event.key === "ArrowUp" && this.searchRequest.value.length > 0) {
+      this.activeSelectionIdentifiers = [];
+      this._activeResultIdentifier = this.#getPreviousResult()?.identifier;
+      event.preventDefault();
+      return;
+    }
+
+    const digit = this.#getDigit(event.code);
+    if (event.ctrlKey && digit) {
+      this._activeResultIdentifier = this.searchRequest.value.objectAt(
+        digit - 1
+      )?.identifier;
+      event.preventDefault();
+      return;
+    }
+
+    if (event.target.selectionEnd !== 0 || event.target.selectionStart !== 0) {
+      return;
+    }
+
+    if (event.key === "Backspace" && this.selection.length) {
+      if (!this.activeSelectionIdentifiers.length) {
+        this.activeSelectionIdentifiers = [this.#getLastSelection().identifier];
+        event.preventDefault();
+        return;
+      } else {
+        this.activeSelectionIdentifiers.forEach((identifier) => {
+          this.removeSelection(identifier);
+        });
+        this.activeSelectionIdentifiers = [];
+        event.preventDefault();
+        return;
+      }
+    }
+
+    if (event.key === "ArrowLeft" && !event.shiftKey) {
+      this._activeResultIdentifier = null;
+      this.activeSelectionIdentifiers = [
+        this.#getPreviousSelection()?.identifier,
+      ].filter(Boolean);
+      event.preventDefault();
+      return;
+    }
+
+    if (event.key === "ArrowRight" && !event.shiftKey) {
+      this._activeResultIdentifier = null;
+      this.activeSelectionIdentifiers = [
+        this.#getNextSelection()?.identifier,
+      ].filter(Boolean);
+      event.preventDefault();
+      return;
+    }
+  }
+
+  @action
+  replaceActiveSelection(selection) {
+    this.activeSelection.clear();
+    this.activeSelection.push(selection.identifier);
+  }
+
+  @action
+  handleInput(event) {
+    discourseDebounce(this, this.onFilter, event.target.value, INPUT_DELAY);
+  }
+
+  @action
+  toggleSelection(identifier, options = {}) {
+    if (this.selectionIdentifiers.includes(identifier)) {
+      this.removeSelection(identifier, options);
+    } else {
+      this.addSelection(identifier, options);
+    }
+
+    this.focusInput();
+  }
+
+  @action
+  handleRowClick(identifier, event) {
+    this.toggleSelection(identifier, {
+      altSelection: event.shiftKey || event.ctrlKey,
+    });
+    event.preventDefault();
+  }
+
+  @action
+  removeSelection(identifier) {
+    this.selection = this.selection.filter(
+      (selection) => selection.identifier !== identifier
+    );
+
+    this.#handleSelectionChange();
+  }
+
+  @action
+  addSelection(identifier, options = {}) {
+    let selection = this.searchRequest.value.findBy("identifier", identifier);
+
+    if (!selection || !selection.enabled) {
+      return;
+    }
+
+    if (selection.type === CHANNEL_TYPE && !selection.isSingleUserChannel) {
+      this.openChannel([selection]);
+      return;
+    }
+
+    if (
+      !this.hasSelectedUsers &&
+      !options.altSelection &&
+      !this.site.mobileView
+    ) {
+      this.openChannel([selection]);
+      return;
+    }
+
+    if (selection.isSingleUserChannel) {
+      const user = selection.model.chatable.users[0];
+      selection = new ChatChatable({
+        identifier: `u-${user.id}`,
+        type: USER_TYPE,
+        model: user,
+      });
+    }
+
+    this.selection = [
+      ...this.selection.filter((s) => s.type !== CHANNEL_TYPE),
+      selection,
+    ];
+    this.#handleSelectionChange();
+  }
+
+  @action
+  openChannel(selection) {
+    if (selection.length === 1 && selection[0].type === CHANNEL_TYPE) {
+      const channel = selection[0].model;
+      this.router.transitionTo("chat.channel", ...channel.routeModels);
+      this.args.onClose?.();
+      return;
+    }
+
+    const users = selection.filterBy("type", USER_TYPE).mapBy("model");
+    this.chat
+      .upsertDmChannelForUsernames(users.mapBy("username"))
+      .then((channel) => {
+        this.router.transitionTo("chat.channel", ...channel.routeModels);
+        this.args.onClose?.();
+      });
+  }
+
+  #handleSelectionChange() {
+    this.query = "";
+    this.activeSelectionIdentifiers = [];
+    this._activeResultIdentifier = null;
+  }
+
+  #getPreviousSelection() {
+    return this.#getPrevious(
+      this.selection,
+      this.activeSelectionIdentifiers?.[0]
+    );
+  }
+
+  #getNextSelection() {
+    return this.#getNext(this.selection, this.activeSelectionIdentifiers?.[0]);
+  }
+
+  #getLastSelection() {
+    return this.selection[this.selection.length - 1];
+  }
+
+  #getPreviousResult() {
+    return this.#getPrevious(
+      this.searchRequest.value,
+      this.activeResultIdentifier
+    );
+  }
+
+  #getNextResult() {
+    return this.#getNext(this.searchRequest.value, this.activeResultIdentifier);
+  }
+
+  #getNext(list, currentIdentifier = null) {
+    if (list.length === 0) {
+      return null;
+    }
+
+    list = list.filterBy("enabled");
+
+    if (currentIdentifier) {
+      const currentIndex = list.mapBy("identifier").indexOf(currentIdentifier);
+
+      if (currentIndex < list.length - 1) {
+        return list.objectAt(currentIndex + 1);
+      } else {
+        return list[0];
+      }
+    } else {
+      return list[0];
+    }
+  }
+
+  #getPrevious(list, currentIdentifier = null) {
+    if (list.length === 0) {
+      return null;
+    }
+
+    list = list.filterBy("enabled");
+
+    if (currentIdentifier) {
+      const currentIndex = list.mapBy("identifier").indexOf(currentIdentifier);
+
+      if (currentIndex > 0) {
+        return list.objectAt(currentIndex - 1);
+      } else {
+        return list.objectAt(list.length - 1);
+      }
+    } else {
+      return list.objectAt(list.length - 1);
+    }
+  }
+
+  #getDigit(input) {
+    if (typeof input === "string") {
+      const match = input.match(/Digit(\d+)/);
+      if (match) {
+        return parseInt(match[1], 10);
+      }
+    }
+    return false;
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/channel-row.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/channel-row.hbs
new file mode 100644
index 00000000000..ac4f7767f7a
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/channel-row.hbs
@@ -0,0 +1,11 @@
+<ChatChannelTitle @channel={{@content.model}} />
+
+{{#if (gt @content.tracking.unreadCount 0)}}
+  <div
+    class={{concat-class "unread-indicator" (if this.isUrgent "-urgent")}}
+  ></div>
+{{/if}}
+
+{{#if this.site.desktopView}}
+  <span class="action-indicator">{{this.openChannelLabel}}</span>
+{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/channel-row.js b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/channel-row.js
new file mode 100644
index 00000000000..52869e4cf1e
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/channel-row.js
@@ -0,0 +1,20 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+import { htmlSafe } from "@ember/template";
+import I18n from "I18n";
+
+export default class ChatMessageCreatorChannelRow extends Component {
+  @service site;
+
+  get openChannelLabel() {
+    return htmlSafe(I18n.t("chat.new_message_modal.open_channel"));
+  }
+
+  get isUrgent() {
+    return (
+      this.args.content.model.isDirectMessageChannel ||
+      (this.args.content.model.isCategoryChannel &&
+        this.args.content.model.tracking.mentionCount > 0)
+    );
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/user-row.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/user-row.hbs
new file mode 100644
index 00000000000..91785854dba
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/user-row.hbs
@@ -0,0 +1,36 @@
+<Chat::UserAvatar @user={{@content.model}} />
+<ChatUserDisplayName @user={{@content.model}} />
+
+{{#if (gt @content.tracking.unreadCount 0)}}
+  <div class="unread-indicator -urgent"></div>
+{{/if}}
+
+{{user-status @content.model currentUser=this.currentUser}}
+
+{{#unless @content.enabled}}
+  <span class="disabled-text">
+    {{i18n "chat.new_message_modal.disabled_user"}}
+  </span>
+{{/unless}}
+
+{{#if @selected}}
+  {{#if this.site.mobileView}}
+    <span class="selection-indicator -add">
+      {{d-icon "check"}}
+    </span>
+  {{else}}
+    <span
+      class={{concat-class "selection-indicator" (if @active "-remove" "-add")}}
+    >
+      {{d-icon (if @active "times" "check")}}
+    </span>
+  {{/if}}
+{{else}}
+  {{#if this.site.desktopView}}
+    {{#if @hasSelectedUsers}}
+      <span class="action-indicator">{{this.addUserLabel}}</span>
+    {{else}}
+      <span class="action-indicator">{{this.openChannelLabel}}</span>
+    {{/if}}
+  {{/if}}
+{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/user-row.js b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/user-row.js
new file mode 100644
index 00000000000..4ae13f5cafe
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/user-row.js
@@ -0,0 +1,17 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+import { htmlSafe } from "@ember/template";
+import I18n from "I18n";
+
+export default class ChatMessageCreatorUserRow extends Component {
+  @service currentUser;
+  @service site;
+
+  get openChannelLabel() {
+    return htmlSafe(I18n.t("chat.new_message_modal.open_channel"));
+  }
+
+  get addUserLabel() {
+    return htmlSafe(I18n.t("chat.new_message_modal.add_user_short"));
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/user-selection.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/user-selection.hbs
new file mode 100644
index 00000000000..a5bf850b37e
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/user-selection.hbs
@@ -0,0 +1,5 @@
+<Chat::UserAvatar @user={{@selection.model}} @showPresence={{false}} />
+
+<span class="chat-message-creator__selection-item__username">
+  {{@selection.model.username}}
+</span>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message/avatar.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/message/avatar.hbs
new file mode 100644
index 00000000000..c393efa893d
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message/avatar.hbs
@@ -0,0 +1,7 @@
+<div class="chat-message-avatar">
+  {{#if @message.chatWebhookEvent.emoji}}
+    <ChatEmojiAvatar @emoji={{@message.chatWebhookEvent.emoji}} />
+  {{else}}
+    <Chat::UserAvatar @user={{@message.user}} @avatarSize="medium" />
+  {{/if}}
+</div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message/error.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/message/error.hbs
new file mode 100644
index 00000000000..dc9ca63b24a
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message/error.hbs
@@ -0,0 +1,20 @@
+{{#if @message.error}}
+  <div class="chat-message-error">
+    {{#if (eq @message.error "network_error")}}
+      <DButton
+        class="chat-message-error__retry-btn"
+        @action={{fn @onRetry @message}}
+        @icon="exclamation-circle"
+      >
+        <span class="chat-message-error__retry-btn-title">
+          {{i18n "chat.retry_staged_message.title"}}
+        </span>
+        <span class="chat-message-error__retry-btn-action">
+          {{i18n "chat.retry_staged_message.action"}}
+        </span>
+      </DButton>
+    {{else}}
+      {{@message.error}}
+    {{/if}}
+  </div>
+{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message/info.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/message/info.hbs
new file mode 100644
index 00000000000..3ccf1f6adb5
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message/info.hbs
@@ -0,0 +1,63 @@
+{{#if @show}}
+  <div
+    class="chat-message-info"
+    {{did-insert this.trackStatus}}
+    {{will-destroy this.stopTrackingStatus}}
+  >
+    {{#if @message.chatWebhookEvent}}
+      {{#if @message.chatWebhookEvent.username}}
+        <span
+          class={{concat-class
+            "chat-message-info__username"
+            this.usernameClasses
+          }}
+        >
+          {{@message.chatWebhookEvent.username}}
+        </span>
+      {{/if}}
+
+      <span class="chat-message-info__bot-indicator">
+        {{i18n "chat.bot"}}
+      </span>
+    {{else}}
+      <span
+        role="button"
+        class={{concat-class
+          "chat-message-info__username"
+          this.usernameClasses
+          "clickable"
+        }}
+        data-user-card={{@message.user.username}}
+      >
+        <span class="chat-message-info__username__name">{{this.name}}</span>
+        {{#if this.showStatus}}
+          <div class="chat-message-info__status">
+            <UserStatusMessage @status={{@message.user.status}} />
+          </div>
+        {{/if}}
+      </span>
+    {{/if}}
+
+    <span class="chat-message-info__date">
+      {{format-chat-date @message}}
+    </span>
+
+    {{#if @message.bookmark}}
+      <span class="chat-message-info__bookmark">
+        <BookmarkIcon @bookmark={{@message.bookmark}} />
+      </span>
+    {{/if}}
+
+    {{#if this.isFlagged}}
+      <span class="chat-message-info__flag">
+        {{#if @message.reviewableId}}
+          <LinkTo @route="review.show" @model={{@message.reviewableId}}>
+            {{d-icon "flag" title="chat.flagged"}}
+          </LinkTo>
+        {{else}}
+          {{d-icon "flag" title="chat.you_flagged"}}
+        {{/if}}
+      </span>
+    {{/if}}
+  </div>
+{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message/info.js b/plugins/chat/assets/javascripts/discourse/components/chat/message/info.js
new file mode 100644
index 00000000000..e42be62a896
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message/info.js
@@ -0,0 +1,72 @@
+import Component from "@glimmer/component";
+import { prioritizeNameInUx } from "discourse/lib/settings";
+import { inject as service } from "@ember/service";
+import { bind } from "discourse-common/utils/decorators";
+
+export default class ChatMessageInfo extends Component {
+  @service siteSettings;
+
+  @bind
+  trackStatus() {
+    this.#user?.trackStatus?.();
+  }
+
+  @bind
+  stopTrackingStatus() {
+    this.#user?.stopTrackingStatus?.();
+  }
+
+  get usernameClasses() {
+    const user = this.#user;
+
+    const classes = this.prioritizeName ? ["is-full-name"] : ["is-username"];
+    if (!user) {
+      return classes;
+    }
+    if (user.staff) {
+      classes.push("is-staff");
+    }
+    if (user.admin) {
+      classes.push("is-admin");
+    }
+    if (user.moderator) {
+      classes.push("is-moderator");
+    }
+    if (user.new_user) {
+      classes.push("is-new-user");
+    }
+    if (user.primary_group_name) {
+      classes.push("group--" + user.primary_group_name);
+    }
+    return classes.join(" ");
+  }
+
+  get name() {
+    return this.prioritizeName
+      ? this.#user?.get("name")
+      : this.#user?.get("username");
+  }
+
+  get isFlagged() {
+    return this.#message?.reviewableId || this.#message?.userFlagStatus === 0;
+  }
+
+  get prioritizeName() {
+    return (
+      this.siteSettings.display_name_on_posts &&
+      prioritizeNameInUx(this.#user?.get("name"))
+    );
+  }
+
+  get showStatus() {
+    return !!this.#user?.get("status");
+  }
+
+  get #user() {
+    return this.#message?.user;
+  }
+
+  get #message() {
+    return this.args.message;
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-left-gutter.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/message/left-gutter.hbs
similarity index 72%
rename from plugins/chat/assets/javascripts/discourse/components/chat-message-left-gutter.hbs
rename to plugins/chat/assets/javascripts/discourse/components/chat/message/left-gutter.hbs
index 68ce6be6d6a..d83658b4b1f 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-left-gutter.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message/left-gutter.hbs
@@ -1,19 +1,19 @@
 <div class="chat-message-left-gutter">
-  {{#if @message.reviewable_id}}
+  {{#if @message.reviewableId}}
     <LinkTo
       @route="review.show"
-      @model={{@message.reviewable_id}}
+      @model={{@message.reviewableId}}
       class="chat-message-left-gutter__flag"
     >
       {{d-icon "flag" title="chat.flagged"}}
     </LinkTo>
-  {{else if (eq @message.user_flag_status 0)}}
+  {{else if (eq @message.userFlagStatus 0)}}
     <div class="chat-message-left-gutter__flag">
       {{d-icon "flag" title="chat.you_flagged"}}
     </div>
-  {{else}}
+  {{else if this.site.desktopView}}
     <span class="chat-message-left-gutter__date">
-      {{format-chat-date @message @details "tiny"}}
+      {{format-chat-date @message "tiny"}}
     </span>
   {{/if}}
   {{#if @message.bookmark}}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message/left-gutter.js b/plugins/chat/assets/javascripts/discourse/components/chat/message/left-gutter.js
new file mode 100644
index 00000000000..b60adf92b89
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message/left-gutter.js
@@ -0,0 +1,6 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+
+export default class ChatMessageLeftGutter extends Component {
+  @service site;
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message/mention-warning.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/message/mention-warning.hbs
new file mode 100644
index 00000000000..705e809fb29
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message/mention-warning.hbs
@@ -0,0 +1,56 @@
+{{#if this.shouldRender}}
+  <div class="chat-message-mention-warning alert alert-info">
+    {{#if this.mentionWarning.invitationSent}}
+      <span
+        class="chat-message-mention-warning__invitation-sent"
+        {{chat/later-fn this.onDismissInvitationSent 3000}}
+      >
+        {{d-icon "check"}}
+        <span>
+          {{i18n
+            "chat.mention_warning.invitations_sent"
+            count=this.mentionWarning.withoutMembership.length
+          }}
+        </span>
+      </span>
+    {{else}}
+      <DButton
+        class="chat-message-mention-warning__dismiss-btn btn-flat"
+        title={{i18n "chat.mention_warning.dismiss"}}
+        @action={{this.onDismissMentionWarning}}
+        @icon="times"
+      />
+
+      {{#if this.mentionWarning.cannotSee}}
+        <p class="chat-message-mention-warning__text -cannot-see">
+          {{this.mentionedCannotSeeText}}
+        </p>
+      {{/if}}
+
+      {{#if this.mentionWarning.withoutMembership}}
+        <p class="chat-message-mention-warning__text -without-membership">
+          <span>{{this.mentionedWithoutMembershipText}}</span>
+          <a href {{on "click" this.onSendInvite bubbles=false}}>
+            {{i18n "chat.mention_warning.invite"}}
+          </a>
+        </p>
+      {{/if}}
+
+      {{#if this.mentionWarning.groupWithMentionsDisabled}}
+        <p
+          class="chat-message-mention-warning__text -groups-with-mentions-disabled"
+        >
+          {{this.groupsWithDisabledMentions}}
+        </p>
+      {{/if}}
+
+      {{#if this.mentionWarning.groupsWithTooManyMembers}}
+        <p
+          class="chat-message-mention-warning__text -groups-with-too-many-members"
+        >
+          {{this.groupsWithTooManyMembers}}
+        </p>
+      {{/if}}
+    {{/if}}
+  </div>
+{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message/mention-warning.js b/plugins/chat/assets/javascripts/discourse/components/chat/message/mention-warning.js
new file mode 100644
index 00000000000..ae2849da2c4
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message/mention-warning.js
@@ -0,0 +1,98 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { inject as service } from "@ember/service";
+import I18n from "I18n";
+
+export default class ChatMessageMentionWarning extends Component {
+  @service("chat-api") api;
+
+  @action
+  async onSendInvite() {
+    const userIds = this.mentionWarning.withoutMembership.mapBy("id");
+
+    try {
+      await this.api.invite(this.args.message.channel.id, userIds, {
+        messageId: this.args.message.id,
+      });
+
+      this.mentionWarning.invitationSent = true;
+    } catch (error) {
+      popupAjaxError(error);
+    }
+  }
+
+  @action
+  onDismissInvitationSent() {
+    this.mentionWarning.invitationSent = false;
+  }
+
+  @action
+  onDismissMentionWarning() {
+    this.args.message.mentionWarning = null;
+  }
+
+  get shouldRender() {
+    return (
+      this.mentionWarning &&
+      (this.mentionWarning.groupWithMentionsDisabled?.length ||
+        this.mentionWarning.cannotSee?.length ||
+        this.mentionWarning.withoutMembership?.length ||
+        this.mentionWarning.groupsWithTooManyMembers?.length)
+    );
+  }
+
+  get mentionWarning() {
+    return this.args.message.mentionWarning;
+  }
+
+  get mentionedCannotSeeText() {
+    return this.#findTranslatedWarning(
+      "chat.mention_warning.cannot_see",
+      "chat.mention_warning.cannot_see_multiple",
+      {
+        username: this.mentionWarning?.cannotSee?.[0]?.username,
+        count: this.mentionWarning?.cannotSee?.length,
+      }
+    );
+  }
+
+  get mentionedWithoutMembershipText() {
+    return this.#findTranslatedWarning(
+      "chat.mention_warning.without_membership",
+      "chat.mention_warning.without_membership_multiple",
+      {
+        username: this.mentionWarning?.withoutMembership?.[0]?.username,
+        count: this.mentionWarning?.withoutMembership?.length,
+      }
+    );
+  }
+
+  get groupsWithDisabledMentions() {
+    return this.#findTranslatedWarning(
+      "chat.mention_warning.group_mentions_disabled",
+      "chat.mention_warning.group_mentions_disabled_multiple",
+      {
+        group_name: this.mentionWarning?.groupWithMentionsDisabled?.[0],
+        count: this.mentionWarning?.groupWithMentionsDisabled?.length,
+      }
+    );
+  }
+
+  get groupsWithTooManyMembers() {
+    return this.#findTranslatedWarning(
+      "chat.mention_warning.too_many_members",
+      "chat.mention_warning.too_many_members_multiple",
+      {
+        group_name: this.mentionWarning.groupsWithTooManyMembers?.[0],
+        count: this.mentionWarning.groupsWithTooManyMembers?.length,
+      }
+    );
+  }
+
+  #findTranslatedWarning(oneKey, multipleKey, args) {
+    const translationKey = args.count === 1 ? oneKey : multipleKey;
+    args.count--;
+    return I18n.t(translationKey, args);
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/archive-channel.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/archive-channel.hbs
new file mode 100644
index 00000000000..e73ec9fc469
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/archive-channel.hbs
@@ -0,0 +1,32 @@
+<DModal
+  @closeModal={{@closeModal}}
+  class="chat-modal-archive-channel"
+  @inline={{@inline}}
+  @title={{i18n "chat.channel_archive.title"}}
+  @flash={{this.flash}}
+  @flashType={{this.flashType}}
+>
+  <:body>
+    <p class="chat-modal-archive-channel__instructions">
+      {{this.instructionsText}}
+    </p>
+    <ChatToTopicSelector
+      @selection={{this.selection}}
+      @topicTitle={{this.topicTitle}}
+      @categoryId={{this.categoryId}}
+      @tags={{this.tags}}
+      @selectedTopicId={{this.selectedTopicId}}
+      @instructionLabels={{this.instructionLabels}}
+      @allowNewMessage={{false}}
+    />
+  </:body>
+  <:footer>
+    <DButton
+      @class="btn-primary"
+      @disabled={{this.buttonDisabled}}
+      @action={{this.archiveChannel}}
+      @label="chat.channel_archive.title"
+      @id="chat-confirm-archive-channel"
+    />
+  </:footer>
+</DModal>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/archive-channel.js b/plugins/chat/assets/javascripts/discourse/components/chat/modal/archive-channel.js
new file mode 100644
index 00000000000..f8f5b11b4e6
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/archive-channel.js
@@ -0,0 +1,112 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+import { tracked } from "@glimmer/tracking";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { htmlSafe } from "@ember/template";
+import I18n from "I18n";
+import discourseLater from "discourse-common/lib/later";
+import {
+  EXISTING_TOPIC_SELECTION,
+  NEW_TOPIC_SELECTION,
+} from "discourse/plugins/chat/discourse/components/chat-to-topic-selector";
+import { CHANNEL_STATUSES } from "discourse/plugins/chat/discourse/models/chat-channel";
+import { isEmpty } from "@ember/utils";
+
+export default class ChatModalArchiveChannel extends Component {
+  @service chatApi;
+  @service siteSettings;
+
+  @tracked selection = NEW_TOPIC_SELECTION;
+  @tracked saving = false;
+  @tracked topicTitle = null;
+  @tracked categoryId = null;
+  @tracked tags = null;
+  @tracked selectedTopicId = null;
+  @tracked flash;
+  @tracked flashType;
+
+  get channel() {
+    return this.args.model.channel;
+  }
+
+  get newTopic() {
+    return this.selection === NEW_TOPIC_SELECTION;
+  }
+
+  get existingTopic() {
+    return this.selection === EXISTING_TOPIC_SELECTION;
+  }
+
+  get buttonDisabled() {
+    if (this.saving) {
+      return true;
+    }
+
+    if (
+      this.newTopic &&
+      (!this.topicTitle ||
+        this.topicTitle.length < this.siteSettings.min_topic_title_length ||
+        this.topicTitle.length > this.siteSettings.max_topic_title_length)
+    ) {
+      return true;
+    }
+
+    if (this.existingTopic && isEmpty(this.selectedTopicId)) {
+      return true;
+    }
+
+    return false;
+  }
+
+  get instructionLabels() {
+    const labels = {};
+    labels[NEW_TOPIC_SELECTION] = I18n.t(
+      "chat.selection.new_topic.instructions_channel_archive"
+    );
+    labels[EXISTING_TOPIC_SELECTION] = I18n.t(
+      "chat.selection.existing_topic.instructions_channel_archive"
+    );
+    return labels;
+  }
+
+  get instructionsText() {
+    return htmlSafe(
+      I18n.t("chat.channel_archive.instructions", {
+        channelTitle: this.channel.escapedTitle,
+      })
+    );
+  }
+
+  @action
+  archiveChannel() {
+    this.saving = true;
+
+    return this.chatApi
+      .createChannelArchive(this.channel.id, this.#data())
+      .then(() => {
+        this.flash = I18n.t("chat.channel_archive.process_started");
+        this.flashType = "success";
+        this.channel.status = CHANNEL_STATUSES.archived;
+
+        discourseLater(() => {
+          this.args.closeModal();
+        }, 3000);
+      })
+      .catch(popupAjaxError)
+      .finally(() => (this.saving = false));
+  }
+
+  #data() {
+    const data = { type: this.selection };
+    if (this.newTopic) {
+      data.title = this.topicTitle;
+      data.category_id = this.categoryId;
+      data.tags = this.tags;
+    }
+    if (this.existingTopic) {
+      data.topic_id = this.selectedTopicId;
+    }
+    return data;
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/channel-summary.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/channel-summary.hbs
new file mode 100644
index 00000000000..0e16015ae21
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/channel-summary.hbs
@@ -0,0 +1,22 @@
+<DModal
+  @closeModal={{@closeModal}}
+  class="chat-modal-channel-summary"
+  @title={{i18n "chat.summarization.title"}}
+>
+  <:body>
+    <span>{{i18n "chat.summarization.description"}}</span>
+    <ComboBox
+      @value={{this.sinceHours}}
+      @content={{this.sinceOptions}}
+      @onChange={{this.summarize}}
+      @valueProperty="value"
+      @class="summarization-since"
+    />
+    <ConditionalLoadingSection @isLoading={{this.loading}}>
+      <p class="summary-area">{{this.summary}}</p>
+    </ConditionalLoadingSection>
+  </:body>
+  <:footer>
+    <DModalCancel @close={{@closeModal}} />
+  </:footer>
+</DModal>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/channel-summary.js b/plugins/chat/assets/javascripts/discourse/components/chat/modal/channel-summary.js
new file mode 100644
index 00000000000..affee4658af
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/channel-summary.js
@@ -0,0 +1,48 @@
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { action } from "@ember/object";
+import I18n from "I18n";
+import { inject as service } from "@ember/service";
+
+export default class ChatModalChannelSummary extends Component {
+  @service chatApi;
+
+  @tracked sinceHours = null;
+  @tracked loading = false;
+  @tracked summary = null;
+
+  availableSummaries = {};
+
+  sinceOptions = [1, 3, 6, 12, 24, 72, 168].map((hours) => {
+    return {
+      name: I18n.t("chat.summarization.since", { count: hours }),
+      value: hours,
+    };
+  });
+
+  get channelId() {
+    return this.args.model.channelId;
+  }
+
+  @action
+  summarize(since) {
+    this.sinceHours = since;
+    this.loading = true;
+
+    if (this.availableSummaries[since]) {
+      this.summary = this.availableSummaries[since];
+      this.loading = false;
+      return;
+    }
+
+    return this.chatApi
+      .summarize(this.channelId, { since })
+      .then((data) => {
+        this.availableSummaries[this.sinceHours] = data.summary;
+        this.summary = this.availableSummaries[this.sinceHours];
+      })
+      .catch(popupAjaxError)
+      .finally(() => (this.loading = false));
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/create-channel.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/create-channel.hbs
new file mode 100644
index 00000000000..cd30124048e
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/create-channel.hbs
@@ -0,0 +1,134 @@
+<DModal
+  @closeModal={{@closeModal}}
+  class="chat-modal-create-channel"
+  @inline={{@inline}}
+  @title={{i18n "chat.create_channel.title"}}
+  @flash={{this.flash}}
+  @tagName="form"
+  {{on "submit" this.onSave}}
+>
+  <:body>
+    <div class="chat-modal-create-channel__control -name">
+      <label for="name" class="chat-modal-create-channel__label">
+        {{i18n "chat.create_channel.name"}}
+      </label>
+      <Input
+        name="name"
+        class="chat-modal-create-channel__input"
+        @type="text"
+        @value={{this.name}}
+        {{on "input" (action this.onNameChange value="target.value")}}
+      />
+    </div>
+
+    <div class="chat-modal-create-channel__control -slug">
+      <label for="slug" class="chat-modal-create-channel__label">
+        {{i18n "chat.create_channel.slug"}}&nbsp;
+        <span>
+          {{d-icon "info-circle"}}
+          <DTooltip>
+            {{i18n "chat.channel_edit_name_slug_modal.slug_description"}}
+          </DTooltip>
+        </span>
+      </label>
+      <Input
+        name="slug"
+        class="chat-modal-create-channel__input"
+        @type="text"
+        @value={{this.slug}}
+        placeholder={{this.autoGeneratedSlug}}
+      />
+    </div>
+
+    <div class="chat-modal-create-channel__control -description">
+      <label for="description" class="chat-modal-create-channel__label">
+        {{i18n "chat.create_channel.description"}}
+      </label>
+      <Input
+        name="description"
+        class="chat-modal-create-channel__input"
+        @type="textarea"
+        @value={{this.description}}
+      />
+    </div>
+
+    <div class="chat-modal-create-channel__control">
+      <label class="chat-modal-create-channel__label">
+        {{i18n "chat.create_channel.choose_category.label"}}
+      </label>
+      <CategoryChooser
+        @value={{this.categoryId}}
+        @onChange={{action this.onCategoryChange}}
+        @options={{hash
+          formName="chatable_id"
+          none="chat.create_channel.choose_category.none"
+        }}
+      />
+
+      {{#if this.categoryPermissionsHint}}
+        <div
+          class={{concat-class
+            "chat-modal-create-channel__hint"
+            (if this.loadingPermissionHint "loading-permissions")
+          }}
+        >
+          {{this.categoryPermissionsHint}}
+        </div>
+      {{/if}}
+    </div>
+
+    {{#if this.autoJoinAvailable}}
+      <div class="chat-modal-create-channel__control -auto-join">
+        <label class="chat-modal-create-channel__label">
+          <Input
+            name="auto_join_users"
+            @type="checkbox"
+            @checked={{this.autoJoinUsers}}
+          />
+          <div class="auto-join-channel">
+            <span class="chat-modal-create-channel__label-title">
+              {{i18n "chat.settings.auto_join_users_label"}}
+            </span>
+            <p class="chat-modal-create-channel__label-description">
+              {{#if this.categoryName}}
+                {{i18n
+                  "chat.settings.auto_join_users_info"
+                  category=this.categoryName
+                }}
+              {{else}}
+                {{i18n "chat.settings.auto_join_users_info_no_category"}}
+              {{/if}}
+            </p>
+          </div>
+        </label>
+      </div>
+    {{/if}}
+
+    <div class="chat-modal-create-channel__control -threading-toggle">
+      <label class="chat-modal-create-channel__label">
+        <Input
+          name="threading_enabled"
+          @type="checkbox"
+          @checked={{this.threadingEnabled}}
+        />
+        <div class="threading-channel">
+          <span class="chat-modal-create-channel__label-title">
+            {{i18n "chat.create_channel.threading.label"}}
+          </span>
+          <p class="chat-modal-create-channel__label-description">
+            {{i18n "chat.settings.channel_threading_description"}}
+          </p>
+        </div>
+      </label>
+    </div>
+  </:body>
+  <:footer>
+    <button
+      class="btn btn-primary create"
+      disabled={{this.createDisabled}}
+      type="submit"
+    >
+      {{i18n "chat.create_channel.create"}}
+    </button>
+  </:footer>
+</DModal>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/create-channel.js b/plugins/chat/assets/javascripts/discourse/components/chat/modal/create-channel.js
new file mode 100644
index 00000000000..f615a4eb5ba
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/create-channel.js
@@ -0,0 +1,264 @@
+import { escapeExpression } from "discourse/lib/utilities";
+import { ajax } from "discourse/lib/ajax";
+import { cancel } from "@ember/runloop";
+import discourseDebounce from "discourse-common/lib/debounce";
+import Component from "@glimmer/component";
+import I18n from "I18n";
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+import { isBlank, isPresent } from "@ember/utils";
+import { htmlSafe } from "@ember/template";
+import { tracked } from "@glimmer/tracking";
+
+const DEFAULT_HINT = htmlSafe(
+  I18n.t("chat.create_channel.choose_category.default_hint", {
+    link: "/categories",
+    category: "category",
+  })
+);
+
+export default class ChatModalCreateChannel extends Component {
+  @service chat;
+  @service dialog;
+  @service chatChannelsManager;
+  @service chatApi;
+  @service router;
+  @service currentUser;
+  @service siteSettings;
+  @service site;
+
+  @tracked flash;
+  @tracked name;
+  @tracked category;
+  @tracked categoryId;
+  @tracked autoGeneratedSlug = "";
+  @tracked categoryPermissionsHint;
+  @tracked autoJoinWarning = "";
+  @tracked loadingPermissionHint = false;
+
+  #generateSlugHandler = null;
+
+  willDestroy() {
+    cancel(this.#generateSlugHandler);
+  }
+
+  get autoJoinAvailable() {
+    return this.siteSettings.max_chat_auto_joined_users > 0;
+  }
+
+  get categorySelected() {
+    return isPresent(this.category);
+  }
+
+  get createDisabled() {
+    return !this.categorySelected || isBlank(this.name);
+  }
+
+  get categoryName() {
+    return this.categorySelected && isPresent(this.name)
+      ? escapeExpression(this.name)
+      : null;
+  }
+
+  @action
+  onShow() {
+    this.categoryPermissionsHint = DEFAULT_HINT;
+  }
+
+  @action
+  onCategoryChange(categoryId) {
+    const category = categoryId
+      ? this.site.categories.findBy("id", categoryId)
+      : null;
+    this.#updatePermissionsHint(category);
+
+    const name = this.name || category?.name || "";
+    this.categoryId = categoryId;
+    this.category = category;
+    this.name = name;
+    this.#debouncedGenerateSlug(name);
+  }
+
+  @action
+  onNameChange(name) {
+    this.#debouncedGenerateSlug(name);
+  }
+
+  @action
+  onSave(event) {
+    event.preventDefault();
+
+    if (this.createDisabled) {
+      return;
+    }
+
+    const formData = new FormData(event.currentTarget);
+    const data = Object.fromEntries(formData.entries());
+    data.auto_join_users = data.auto_join_users === "on";
+    data.slug ??= this.autoGeneratedSlug;
+    data.threading_enabled = data.threading_enabled === "on";
+
+    if (data.auto_join_users) {
+      this.dialog.yesNoConfirm({
+        message: this.autoJoinWarning,
+        didConfirm: () => this.#createChannel(data),
+      });
+    } else {
+      this.#createChannel(data);
+    }
+  }
+
+  #createChannel(data) {
+    return this.chatApi
+      .createChannel(data)
+      .then((channel) => {
+        this.args.closeModal();
+        this.chatChannelsManager.follow(channel);
+        this.router.transitionTo("chat.channel", ...channel.routeModels);
+      })
+      .catch((e) => {
+        this.flash = e.jqXHR.responseJSON.errors[0];
+      });
+  }
+
+  #buildCategorySlug(category) {
+    const parent = category.parentCategory;
+
+    if (parent) {
+      return `${this.#buildCategorySlug(parent)}/${category.slug}`;
+    } else {
+      return category.slug;
+    }
+  }
+
+  #updateAutoJoinConfirmWarning(category, catPermissions) {
+    const allowedGroups = catPermissions.allowed_groups;
+    let warning;
+
+    if (catPermissions.private) {
+      switch (allowedGroups.length) {
+        case 1:
+          warning = I18n.t(
+            "chat.create_channel.auto_join_users.warning_1_group",
+            {
+              count: catPermissions.members_count,
+              group: escapeExpression(allowedGroups[0]),
+            }
+          );
+          break;
+        case 2:
+          warning = I18n.t(
+            "chat.create_channel.auto_join_users.warning_2_groups",
+            {
+              count: catPermissions.members_count,
+              group1: escapeExpression(allowedGroups[0]),
+              group2: escapeExpression(allowedGroups[1]),
+            }
+          );
+          break;
+        default:
+          warning = I18n.messageFormat(
+            "chat.create_channel.auto_join_users.warning_multiple_groups_MF",
+            {
+              groupCount: allowedGroups.length - 1,
+              userCount: catPermissions.members_count,
+              groupName: escapeExpression(allowedGroups[0]),
+            }
+          );
+          break;
+      }
+    } else {
+      warning = I18n.t(
+        "chat.create_channel.auto_join_users.public_category_warning",
+        {
+          category: escapeExpression(category.name),
+        }
+      );
+    }
+
+    this.autoJoinWarning = warning;
+  }
+
+  #updatePermissionsHint(category) {
+    if (category) {
+      const fullSlug = this.#buildCategorySlug(category);
+
+      this.loadingPermissionHint = true;
+
+      return this.chatApi
+        .categoryPermissions(category.id)
+        .then((catPermissions) => {
+          this.#updateAutoJoinConfirmWarning(category, catPermissions);
+          const allowedGroups = catPermissions.allowed_groups;
+          const settingLink = `/c/${escapeExpression(fullSlug)}/edit/security`;
+          let hint;
+
+          switch (allowedGroups.length) {
+            case 1:
+              hint = I18n.t(
+                "chat.create_channel.choose_category.hint_1_group",
+                {
+                  settingLink,
+                  group: escapeExpression(allowedGroups[0]),
+                }
+              );
+              break;
+            case 2:
+              hint = I18n.t(
+                "chat.create_channel.choose_category.hint_2_groups",
+                {
+                  settingLink,
+                  group1: escapeExpression(allowedGroups[0]),
+                  group2: escapeExpression(allowedGroups[1]),
+                }
+              );
+              break;
+            default:
+              hint = I18n.t(
+                "chat.create_channel.choose_category.hint_multiple_groups",
+                {
+                  settingLink,
+                  group: escapeExpression(allowedGroups[0]),
+                  count: allowedGroups.length - 1,
+                }
+              );
+              break;
+          }
+
+          this.categoryPermissionsHint = htmlSafe(hint);
+        })
+        .finally(() => {
+          this.loadingPermissionHint = false;
+        });
+    } else {
+      this.categoryPermissionsHint = DEFAULT_HINT;
+      this.autoJoinWarning = "";
+    }
+  }
+
+  // intentionally not showing AJAX error for this, we will autogenerate
+  // the slug server-side if they leave it blank
+  #generateSlug(name) {
+    return ajax("/slugs.json", { type: "POST", data: { name } }).then(
+      (response) => {
+        this.autoGeneratedSlug = response.slug;
+      }
+    );
+  }
+
+  #debouncedGenerateSlug(name) {
+    cancel(this.#generateSlugHandler);
+    this.autoGeneratedSlug = "";
+
+    if (!name) {
+      return;
+    }
+
+    this.#generateSlugHandler = discourseDebounce(
+      this,
+      this.#generateSlug,
+      name,
+      300
+    );
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/delete-channel.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/delete-channel.hbs
new file mode 100644
index 00000000000..3e7c026a977
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/delete-channel.hbs
@@ -0,0 +1,32 @@
+<DModal
+  @closeModal={{@closeModal}}
+  class="chat-modal-delete-channel"
+  @inline={{@inline}}
+  @title={{i18n "chat.channel_delete.title"}}
+  @flash={{this.flash}}
+  @flashType={{this.flashType}}
+>
+  <:body>
+    <p class="chat-modal-delete-channel__instructions">
+      {{this.instructionsText}}
+    </p>
+
+    <TextField
+      @value={{this.channelNameConfirmation}}
+      @id="channel-delete-confirm-name"
+      @placeholderKey="chat.channel_delete.confirm_channel_name"
+      @autocorrect="off"
+      @autocapitalize="off"
+    />
+  </:body>
+  <:footer>
+    <DButton
+      @disabled={{this.buttonDisabled}}
+      @class="btn-danger"
+      @action={{this.deleteChannel}}
+      @label="chat.channel_delete.confirm"
+      @id="chat-confirm-delete-channel"
+    />
+    <DButton @label="cancel" @class="btn-flat" @action={{@closeModal}} />
+  </:footer>
+</DModal>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/delete-channel.js b/plugins/chat/assets/javascripts/discourse/components/chat/modal/delete-channel.js
new file mode 100644
index 00000000000..affb248edc6
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/delete-channel.js
@@ -0,0 +1,68 @@
+import Component from "@glimmer/component";
+import { isEmpty } from "@ember/utils";
+import I18n from "I18n";
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import discourseLater from "discourse-common/lib/later";
+import { htmlSafe } from "@ember/template";
+import { tracked } from "@glimmer/tracking";
+
+export default class ChatModalDeleteChannel extends Component {
+  @service chatApi;
+  @service router;
+
+  @tracked channelNameConfirmation;
+  @tracked deleting = false;
+  @tracked confirmed = false;
+  @tracked flash;
+  @tracked flashType;
+
+  get channel() {
+    return this.args.model.channel;
+  }
+
+  get buttonDisabled() {
+    if (this.deleting || this.confirmed) {
+      return true;
+    }
+
+    if (
+      isEmpty(this.channelNameConfirmation) ||
+      this.channelNameConfirmation.toLowerCase() !==
+        this.channel.title.toLowerCase()
+    ) {
+      return true;
+    }
+
+    return false;
+  }
+
+  get instructionsText() {
+    return htmlSafe(
+      I18n.t("chat.channel_delete.instructions", {
+        name: this.channel.escapedTitle,
+      })
+    );
+  }
+
+  @action
+  deleteChannel() {
+    this.deleting = true;
+
+    return this.chatApi
+      .destroyChannel(this.channel.id, this.channelNameConfirmation)
+      .then(() => {
+        this.confirmed = true;
+        this.flash = I18n.t("chat.channel_delete.process_started");
+        this.flashType = "success";
+
+        discourseLater(() => {
+          this.args.closeModal();
+          this.router.transitionTo("chat");
+        }, 3000);
+      })
+      .catch(popupAjaxError)
+      .finally(() => (this.deleting = false));
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-description.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-description.hbs
new file mode 100644
index 00000000000..3a21233edbd
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-description.hbs
@@ -0,0 +1,37 @@
+<DModal
+  @closeModal={{@closeModal}}
+  class="chat-modal-edit-channel-description"
+  @inline={{@inline}}
+  @title={{i18n "chat.channel_edit_description_modal.title"}}
+  @flash={{this.flash}}
+>
+  <:body>
+    <span class="chat-modal-edit-channel-description__description">{{i18n
+        "chat.channel_edit_description_modal.description"
+      }}</span>
+    <CharCounter
+      @value={{this.editedDescription}}
+      @max={{this.descriptionMaxLength}}
+    >
+      <textarea
+        {{on
+          "input"
+          (action this.onChangeChatChannelDescription value="target.value")
+        }}
+        class="chat-modal-edit-channel-description__description-input"
+        placeholder={{i18n
+          "chat.channel_edit_description_modal.input_placeholder"
+        }}
+      >{{this.editedDescription}}</textarea>
+    </CharCounter>
+  </:body>
+  <:footer>
+    <DButton
+      @class="btn-primary create"
+      @action={{this.onSaveChatChannelDescription}}
+      @label="save"
+      @disabled={{this.isSaveDisabled}}
+    />
+    <DModalCancel @close={{@closeModal}} />
+  </:footer>
+</DModal>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-description.js b/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-description.js
new file mode 100644
index 00000000000..2336c6cc040
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-description.js
@@ -0,0 +1,49 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import { tracked } from "@glimmer/tracking";
+import { inject as service } from "@ember/service";
+
+const DESCRIPTION_MAX_LENGTH = 280;
+
+export default class ChatModalEditChannelDescription extends Component {
+  @service chatApi;
+
+  @tracked editedDescription = this.channel.description || "";
+  @tracked flash;
+
+  get channel() {
+    return this.args.model;
+  }
+
+  get isSaveDisabled() {
+    return (
+      this.channel.description === this.editedDescription ||
+      this.editedDescription?.length > DESCRIPTION_MAX_LENGTH
+    );
+  }
+
+  get descriptionMaxLength() {
+    return DESCRIPTION_MAX_LENGTH;
+  }
+
+  @action
+  onSaveChatChannelDescription() {
+    return this.chatApi
+      .updateChannel(this.channel.id, { description: this.editedDescription })
+      .then((result) => {
+        this.channel.description = result.channel.description;
+        this.args.closeModal();
+      })
+      .catch((event) => {
+        if (event.jqXHR?.responseJSON?.errors) {
+          this.flash = event.jqXHR.responseJSON.errors.join("\n");
+        }
+      });
+  }
+
+  @action
+  onChangeChatChannelDescription(description) {
+    this.flash = null;
+    this.editedDescription = description;
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-name.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-name.hbs
new file mode 100644
index 00000000000..b4d8ee1df1c
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-name.hbs
@@ -0,0 +1,54 @@
+<DModal
+  @closeModal={{@closeModal}}
+  class="chat-modal-edit-channel-name"
+  @inline={{@inline}}
+  @title={{i18n "chat.channel_edit_name_slug_modal.title"}}
+  @flash={{this.flash}}
+>
+  <:body>
+    <div class="edit-channel-control">
+      <label for="channel-name" class="edit-channel-label">
+        {{i18n "chat.channel_edit_name_slug_modal.name"}}
+      </label>
+      <Input
+        name="channel-name"
+        class="chat-channel-edit-name-slug-modal__name-input"
+        placeholder={{i18n
+          "chat.channel_edit_name_slug_modal.input_placeholder"
+        }}
+        @type="text"
+        @value={{this.editedName}}
+        {{on "input" (action "onChangeChatChannelName" value="target.value")}}
+      />
+    </div>
+
+    <div class="edit-channel-control">
+      <label for="channel-slug" class="edit-channel-label">
+        {{i18n "chat.channel_edit_name_slug_modal.slug"}}&nbsp;
+        <span>
+          {{d-icon "info-circle"}}
+          <DTooltip>{{i18n
+              "chat.channel_edit_name_slug_modal.slug_description"
+            }}</DTooltip>
+        </span>
+      </label>
+      <Input
+        name="channel-slug"
+        class="chat-channel-edit-name-slug-modal__slug-input"
+        placeholder={{this.autoGeneratedSlug}}
+        {{on "input" (action "onChangeChatChannelSlug" value="target.value")}}
+        @type="text"
+        @value={{this.editedSlug}}
+      />
+    </div>
+  </:body>
+  <:footer>
+    <DButton
+      @class="btn-primary create"
+      @action={{this.onSave}}
+      @label="save"
+      @disabled={{this.isSaveDisabled}}
+    />
+    <DModalCancel @close={{@closeModal}} />
+  </:footer>
+</DModal>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-name.js b/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-name.js
new file mode 100644
index 00000000000..433d6ac0ea6
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-name.js
@@ -0,0 +1,84 @@
+import Component from "@glimmer/component";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { ajax } from "discourse/lib/ajax";
+import { cancel } from "@ember/runloop";
+import { action } from "@ember/object";
+import { extractError } from "discourse/lib/ajax-error";
+import { tracked } from "@glimmer/tracking";
+import { inject as service } from "@ember/service";
+
+export default class ChatModalEditChannelName extends Component {
+  @service chatApi;
+  @service siteSettings;
+
+  @tracked editedName = this.channel.title;
+  @tracked editedSlug = this.channel.slug;
+  @tracked autoGeneratedSlug = "";
+  @tracked flash;
+
+  #generateSlugHandler = null;
+
+  get channel() {
+    return this.args.model;
+  }
+
+  get isSaveDisabled() {
+    return (
+      (this.channel.title === this.editedName &&
+        this.channel.slug === this.editedSlug) ||
+      this.editedName?.length > this.siteSettings.max_topic_title_length
+    );
+  }
+
+  @action
+  onSave() {
+    return this.chatApi
+      .updateChannel(this.channel.id, {
+        name: this.editedName,
+        slug: this.editedSlug || this.autoGeneratedSlug || this.channel.slug,
+      })
+      .then((result) => {
+        this.channel.title = result.channel.title;
+        this.args.closeModal();
+      })
+      .catch((error) => (this.flash = extractError(error)));
+  }
+
+  @action
+  onChangeChatChannelName(title) {
+    this.flash = null;
+    this.#debouncedGenerateSlug(title);
+  }
+
+  @action
+  onChangeChatChannelSlug() {
+    this.flash = null;
+    this.#debouncedGenerateSlug(this.editedName);
+  }
+
+  #debouncedGenerateSlug(name) {
+    cancel(this.#generateSlugHandler);
+    this.autoGeneratedSlug = "";
+
+    if (!name) {
+      return;
+    }
+
+    this.#generateSlugHandler = discourseDebounce(
+      this,
+      this.#generateSlug,
+      name,
+      300
+    );
+  }
+
+  // intentionally not showing AJAX error for this, we will autogenerate
+  // the slug server-side if they leave it blank
+  #generateSlug(name) {
+    return ajax("/slugs.json", { type: "POST", data: { name } }).then(
+      (response) => {
+        this.autoGeneratedSlug = response.slug;
+      }
+    );
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/move-message-to-channel.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/move-message-to-channel.hbs
new file mode 100644
index 00000000000..2d09a13ba89
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/move-message-to-channel.hbs
@@ -0,0 +1,29 @@
+<DModal
+  @closeModal={{@closeModal}}
+  class="chat-modal-move-message-to-channel"
+  @inline={{@inline}}
+  @title={{i18n "chat.move_to_channel.title"}}
+>
+  <:body>
+    {{#if this.selectedMessageCount}}
+      <p>{{this.instructionsText}}</p>
+    {{/if}}
+
+    <ChatChannelChooser
+      @class="chat-modal-move-message-to-channel__channel-chooser"
+      @content={{this.availableChannels}}
+      @value={{this.destinationChannelId}}
+      @nameProperty="title"
+    />
+  </:body>
+  <:footer>
+    <DButton
+      @class="btn-primary"
+      @icon="sign-out-alt"
+      @disabled={{this.disableMoveButton}}
+      @action={{this.moveMessages}}
+      @label="chat.move_to_channel.confirm_move"
+    />
+    <DButton @label="cancel" @class="btn-flat" @action={{@closeModal}} />
+  </:footer>
+</DModal>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-move-to-channel-modal-inner.js b/plugins/chat/assets/javascripts/discourse/components/chat/modal/move-message-to-channel.js
similarity index 58%
rename from plugins/chat/assets/javascripts/discourse/components/chat-message-move-to-channel-modal-inner.js
rename to plugins/chat/assets/javascripts/discourse/components/chat/modal/move-message-to-channel.js
index 7d404060d25..071a59a00f6 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-move-to-channel-modal-inner.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/move-message-to-channel.js
@@ -1,34 +1,49 @@
-import Component from "@ember/component";
-import I18n from "I18n";
-import { reads } from "@ember/object/computed";
+import Component from "@glimmer/component";
 import { isBlank } from "@ember/utils";
-import { action, computed } from "@ember/object";
+import { action } from "@ember/object";
 import { inject as service } from "@ember/service";
+import { tracked } from "@glimmer/tracking";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { htmlSafe } from "@ember/template";
+import I18n from "I18n";
 
-export default class MoveToChannelModalInner extends Component {
+export default class ChatModalMoveMessageToChannel extends Component {
   @service chat;
   @service chatApi;
   @service router;
   @service chatChannelsManager;
-  tagName = "";
-  sourceChannel = null;
-  destinationChannelId = null;
-  selectedMessageIds = null;
 
-  @reads("selectedMessageIds.length") selectedMessageCount;
+  @tracked destinationChannelId;
+
+  get sourceChannel() {
+    return this.args.model.sourceChannel;
+  }
+
+  get selectedMessageIds() {
+    return this.args.model.selectedMessageIds;
+  }
+
+  get selectedMessageCount() {
+    return this.selectedMessageIds?.length;
+  }
 
-  @computed("destinationChannelId")
   get disableMoveButton() {
     return isBlank(this.destinationChannelId);
   }
 
-  @computed("chatChannelsManager.publicMessageChannels.[]")
   get availableChannels() {
-    return this.chatChannelsManager.publicMessageChannels.rejectBy(
-      "id",
-      this.sourceChannel.id
+    return (
+      this.args.model.availableChannels ||
+      this.chatChannelsManager.publicMessageChannels
+    ).rejectBy("id", this.sourceChannel.id);
+  }
+
+  get instructionsText() {
+    return htmlSafe(
+      I18n.t("chat.move_to_channel.instructions", {
+        channelTitle: this.sourceChannel.escapedTitle,
+        count: this.selectedMessageCount,
+      })
     );
   }
 
@@ -40,21 +55,14 @@ export default class MoveToChannelModalInner extends Component {
         destination_channel_id: this.destinationChannelId,
       })
       .then((response) => {
-        return this.chat.openChannelAtMessage(
+        this.args.closeModal();
+        this.router.transitionTo(
+          "chat.channel.near-message",
+          "-",
           response.destination_channel_id,
           response.first_moved_message_id
         );
       })
       .catch(popupAjaxError);
   }
-
-  @computed()
-  get instructionsText() {
-    return htmlSafe(
-      I18n.t("chat.move_to_channel.instructions", {
-        channelTitle: this.sourceChannel.escapedTitle,
-        count: this.selectedMessageCount,
-      })
-    );
-  }
 }
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/new-message.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/new-message.hbs
new file mode 100644
index 00000000000..883cf9903b2
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/new-message.hbs
@@ -0,0 +1,10 @@
+{{#if this.shouldRender}}
+  <DModal
+    @closeModal={{@closeModal}}
+    class="chat-modal-new-message"
+    @title="chat.new_message_modal.title"
+    @inline={{@inline}}
+  >
+    <Chat::MessageCreator @onClose={{@closeModal}} />
+  </DModal>
+{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/new-message.js b/plugins/chat/assets/javascripts/discourse/components/chat/modal/new-message.js
new file mode 100644
index 00000000000..14bf3e405e0
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/new-message.js
@@ -0,0 +1,14 @@
+import Component from "@glimmer/component";
+
+import { inject as service } from "@ember/service";
+
+export default class ChatModalNewMessage extends Component {
+  @service chat;
+  @service siteSettings;
+
+  get shouldRender() {
+    return (
+      this.siteSettings.enable_public_channels || this.chat.userCanDirectMessage
+    );
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/thread-settings.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/thread-settings.hbs
new file mode 100644
index 00000000000..348bf2ccd77
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/thread-settings.hbs
@@ -0,0 +1,26 @@
+<DModal
+  @closeModal={{@closeModal}}
+  class="chat-modal-thread-settings"
+  @inline={{@inline}}
+  @title={{i18n "chat.thread.settings"}}
+>
+  <:body>
+    <label for="thread-title" class="thread-title-label">
+      {{i18n "chat.thread.title"}}
+    </label>
+    <Input
+      name="thread-title"
+      class="chat-modal-thread-settings__title-input"
+      @type="text"
+      @value={{this.editedTitle}}
+    />
+  </:body>
+  <:footer>
+    <DButton
+      @class="btn-primary"
+      @disabled={{this.buttonDisabled}}
+      @action={{this.saveThread}}
+      @label="save"
+    />
+  </:footer>
+</DModal>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/thread-settings.js b/plugins/chat/assets/javascripts/discourse/components/chat/modal/thread-settings.js
new file mode 100644
index 00000000000..6871c195444
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/thread-settings.js
@@ -0,0 +1,38 @@
+import Component from "@glimmer/component";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { tracked } from "@glimmer/tracking";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+
+export default class ChatModalThreadSettings extends Component {
+  @service chatApi;
+
+  @tracked editedTitle = this.thread.title || "";
+  @tracked saving = false;
+
+  get buttonDisabled() {
+    return this.saving;
+  }
+
+  get thread() {
+    return this.args.model;
+  }
+
+  @action
+  saveThread() {
+    this.saving = true;
+
+    this.chatApi
+      .editThread(this.thread.channel.id, this.thread.id, {
+        title: this.editedTitle,
+      })
+      .then(() => {
+        this.thread.title = this.editedTitle;
+        this.args.closeModal();
+      })
+      .catch(popupAjaxError)
+      .finally(() => {
+        this.saving = false;
+      });
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/toggle-channel-status.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/toggle-channel-status.hbs
new file mode 100644
index 00000000000..85e35103ef5
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/toggle-channel-status.hbs
@@ -0,0 +1,20 @@
+<DModal
+  @closeModal={{@closeModal}}
+  class="chat-modal-toggle-channel-status"
+  @inline={{@inline}}
+  @title={{i18n this.modalTitle}}
+>
+  <:body>
+    <p
+      class="chat-modal-toggle-channel-status__instructions"
+    >{{this.instructions}}</p>
+  </:body>
+  <:footer>
+    <DButton
+      @class="btn-primary"
+      @action={{this.onStatusChange}}
+      @label={{this.buttonLabel}}
+      @id="chat-channel-toggle-btn"
+    />
+  </:footer>
+</DModal>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-toggle-view.js b/plugins/chat/assets/javascripts/discourse/components/chat/modal/toggle-channel-status.js
similarity index 65%
rename from plugins/chat/assets/javascripts/discourse/components/chat-channel-toggle-view.js
rename to plugins/chat/assets/javascripts/discourse/components/chat/modal/toggle-channel-status.js
index 5ed0b2dbdf5..d801aa67fe5 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-toggle-view.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/toggle-channel-status.js
@@ -1,40 +1,37 @@
-import Component from "@ember/component";
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
 import { htmlSafe } from "@ember/template";
 import { CHANNEL_STATUSES } from "discourse/plugins/chat/discourse/models/chat-channel";
 import I18n from "I18n";
-import { action, computed } from "@ember/object";
 import { inject as service } from "@ember/service";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default class ChatChannelToggleView extends Component {
-  @service chat;
+export default class ChatModalToggleChannelStatus extends Component {
   @service chatApi;
   @service router;
-  tagName = "";
-  channel = null;
-  onStatusChange = null;
 
-  @computed("channel.isClosed")
+  get channel() {
+    return this.args.model;
+  }
+
   get buttonLabel() {
-    if (this.channel.isClosed) {
+    if (this.channel?.isClosed) {
       return "chat.channel_settings.open_channel";
     } else {
       return "chat.channel_settings.close_channel";
     }
   }
 
-  @computed("channel.isClosed")
   get instructions() {
-    if (this.channel.isClosed) {
+    if (this.channel?.isClosed) {
       return htmlSafe(I18n.t("chat.channel_open.instructions"));
     } else {
       return htmlSafe(I18n.t("chat.channel_close.instructions"));
     }
   }
 
-  @computed("channel.isClosed")
   get modalTitle() {
-    if (this.channel.isClosed) {
+    if (this.channel?.isClosed) {
       return "chat.channel_open.title";
     } else {
       return "chat.channel_close.title";
@@ -42,15 +39,16 @@ export default class ChatChannelToggleView extends Component {
   }
 
   @action
-  changeChannelStatus() {
+  onStatusChange() {
     const status = this.channel.isClosed
       ? CHANNEL_STATUSES.open
       : CHANNEL_STATUSES.closed;
 
     return this.chatApi
       .updateChannelStatus(this.channel.id, status)
-      .finally(() => {
-        this.onStatusChange?.(this.channel);
+      .then(() => {
+        this.args.closeModal();
+        this.router.transitionTo("chat.channel", ...this.channel.routeModels);
       })
       .catch(popupAjaxError);
   }
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/scroll-to-bottom-arrow.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/scroll-to-bottom-arrow.hbs
new file mode 100644
index 00000000000..93d5f270a2d
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/scroll-to-bottom-arrow.hbs
@@ -0,0 +1,14 @@
+<div class="chat-scroll-to-bottom">
+  <DButton
+    class={{concat-class
+      "btn-flat"
+      "chat-scroll-to-bottom__button"
+      (if @isVisible "visible")
+    }}
+    @action={{@onScrollToBottom}}
+  >
+    <span class="chat-scroll-to-bottom__arrow">
+      {{d-icon "arrow-down"}}
+    </span>
+  </DButton>
+</div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-selection-manager.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/selection-manager.hbs
similarity index 54%
rename from plugins/chat/assets/javascripts/discourse/components/chat-selection-manager.hbs
rename to plugins/chat/assets/javascripts/discourse/components/chat/selection-manager.hbs
index 66b616894ba..7468f8b4ada 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-selection-manager.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/selection-manager.hbs
@@ -1,36 +1,33 @@
-<div class="chat-selection-management">
-  <div class="chat-selection-management-buttons">
+<div
+  class="chat-selection-management"
+  data-last-copy-successful={{this.lastCopySuccessful}}
+>
+  <div class="chat-selection-management__buttons">
     <DButton
       @id="chat-quote-btn"
-      @class="btn-secondary"
       @icon="quote-left"
       @label="chat.selection.quote_selection"
-      @title="chat.selection.quote_selection"
       @disabled={{not this.anyMessagesSelected}}
-      @action={{action "quoteMessages"}}
+      @action={{this.quoteMessages}}
     />
 
     {{#if this.site.desktopView}}
       <DButton
         @id="chat-copy-btn"
-        @class="btn-secondary"
         @icon="copy"
         @label="chat.selection.copy"
-        @title="chat.selection.copy"
         @disabled={{not this.anyMessagesSelected}}
-        @action={{action "copyMessages"}}
+        @action={{this.copyMessages}}
       />
     {{/if}}
 
-    {{#if this.showMoveMessageButton}}
+    {{#if this.enableMove}}
       <DButton
         @id="chat-move-to-channel-btn"
-        @class="btn-secondary"
         @icon="sign-out-alt"
         @label="chat.selection.move_selection_to_channel"
-        @title="chat.selection.move_selection_to_channel"
         @disabled={{not this.anyMessagesSelected}}
-        @action={{action "openMoveMessageModal"}}
+        @action={{this.openMoveMessageModal}}
       />
     {{/if}}
 
@@ -39,14 +36,16 @@
       @icon="times"
       @class="btn-secondary cancel-btn"
       @label="chat.selection.cancel"
-      @title="chat.selection.cancel"
-      @action={{this.cancelSelecting}}
+      @action={{@pane.cancelSelecting}}
     />
   </div>
 
-  {{#if this.showChatQuoteSuccess}}
-    <div class="chat-selection-message">
+  {{#if this.showCopySuccess}}
+    <span
+      class="chat-selection-management__copy-success"
+      {{chat/on-animation-end (fn (mut this.showCopySuccess) false)}}
+    >
       {{i18n "chat.quote.copy_success"}}
-    </div>
+    </span>
   {{/if}}
 </div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/selection-manager.js b/plugins/chat/assets/javascripts/discourse/components/chat/selection-manager.js
new file mode 100644
index 00000000000..9614e7b6d13
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/selection-manager.js
@@ -0,0 +1,113 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import { clipboardCopyAsync } from "discourse/lib/utilities";
+import { getOwner } from "discourse-common/lib/get-owner";
+import { isTesting } from "discourse-common/config/environment";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { inject as service } from "@ember/service";
+import { bind } from "discourse-common/utils/decorators";
+import { tracked } from "@glimmer/tracking";
+import ChatModalMoveMessageToChannel from "discourse/plugins/chat/discourse/components/chat/modal/move-message-to-channel";
+
+export default class ChatSelectionManager extends Component {
+  @service("composer") topicComposer;
+  @service router;
+  @service modal;
+  @service site;
+  @service("chat-api") api;
+
+  // NOTE: showCopySuccess is used to display the message which animates
+  // after a delay. The on-animation-end helper is not really usable in
+  // system specs because it fires straight away, so we use lastCopySuccessful
+  // with a data attr instead so it's not instantly mutated.
+  @tracked showCopySuccess = false;
+  @tracked lastCopySuccessful = false;
+
+  get enableMove() {
+    return this.args.enableMove ?? false;
+  }
+
+  get anyMessagesSelected() {
+    return this.args.pane.selectedMessageIds.length > 0;
+  }
+
+  @bind
+  async generateQuote() {
+    const { markdown } = await this.api.generateQuote(
+      this.args.pane.channel.id,
+      this.args.pane.selectedMessageIds
+    );
+
+    return new Blob([markdown], { type: "text/plain" });
+  }
+
+  @action
+  openMoveMessageModal() {
+    this.modal.show(ChatModalMoveMessageToChannel, {
+      model: {
+        sourceChannel: this.args.pane.channel,
+        selectedMessageIds: this.args.pane.selectedMessageIds,
+      },
+    });
+  }
+
+  @action
+  async quoteMessages() {
+    let quoteMarkdown;
+
+    try {
+      const quoteMarkdownBlob = await this.generateQuote();
+      quoteMarkdown = await quoteMarkdownBlob.text();
+    } catch (error) {
+      popupAjaxError(error);
+    }
+
+    const openOpts = {};
+    if (this.args.pane.channel.isCategoryChannel) {
+      openOpts.categoryId = this.args.pane.channel.chatableId;
+    }
+
+    if (this.site.mobileView) {
+      // go to the relevant chatable (e.g. category) and open the
+      // composer to insert text
+      if (this.args.pane.channel.chatableUrl) {
+        this.router.transitionTo(this.args.pane.channel.chatableUrl);
+      }
+
+      await this.topicComposer.focusComposer({
+        fallbackToNewTopic: true,
+        insertText: quoteMarkdown,
+        openOpts,
+      });
+    } else {
+      // open the composer and insert text, reply to the current
+      // topic if there is one, use the active draft if there is one
+      const container = getOwner(this);
+      const topic = container.lookup("controller:topic");
+      await this.topicComposer.focusComposer({
+        fallbackToNewTopic: true,
+        topic: topic?.model,
+        insertText: quoteMarkdown,
+        openOpts,
+      });
+    }
+  }
+
+  @action
+  async copyMessages() {
+    try {
+      this.lastCopySuccessful = false;
+      this.showCopySuccess = false;
+
+      if (!isTesting()) {
+        // clipboard API throws errors in tests
+        await clipboardCopyAsync(this.generateQuote);
+      }
+
+      this.showCopySuccess = true;
+      this.lastCopySuccessful = true;
+    } catch (error) {
+      popupAjaxError(error);
+    }
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/thread-list.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/thread-list.hbs
new file mode 100644
index 00000000000..ed91b635bc3
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/thread-list.hbs
@@ -0,0 +1,38 @@
+{{#if this.shouldRender}}
+  <div
+    class="chat-thread-list"
+    {{did-insert this.subscribe}}
+    {{did-insert this.loadThreads}}
+    {{did-update this.loadThreads @channel}}
+    {{did-update this.subscribe @channel}}
+    {{will-destroy this.teardown}}
+  >
+    {{#if @includeHeader}}
+      <Chat::ThreadList::Header @channel={{@channel}} />
+    {{/if}}
+
+    <div class="chat-thread-list__items">
+      {{#each this.sortedThreads as |thread|}}
+        <Chat::ThreadList::Item
+          @thread={{thread}}
+          {{chat/track-message
+            (if
+              (eq thread this.sortedThreads.lastObject)
+              this.loadThreads
+              (fn (noop))
+            )
+          }}
+        />
+      {{else}}
+        {{#if this.threadsCollection.fetchedOnce}}
+          <div class="chat-thread-list__no-threads">
+            {{i18n "chat.threads.none"}}
+          </div>
+        {{/if}}
+      {{/each}}
+      <ConditionalLoadingSpinner
+        @condition={{this.threadsCollection.loading}}
+      />
+    </div>
+  </div>
+{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/thread-list.js b/plugins/chat/assets/javascripts/discourse/components/chat/thread-list.js
new file mode 100644
index 00000000000..c3d572d5560
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/thread-list.js
@@ -0,0 +1,155 @@
+import Component from "@glimmer/component";
+import { bind } from "discourse-common/utils/decorators";
+import { cached } from "@glimmer/tracking";
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+
+export default class ChatThreadList extends Component {
+  @service chat;
+  @service chatApi;
+  @service messageBus;
+  @service chatTrackingStateManager;
+
+  get threadsManager() {
+    return this.args.channel.threadsManager;
+  }
+
+  // NOTE: This replicates sort logic from the server. We need this because
+  // the thread unread count + last reply date + time update when new messages
+  // are sent to the thread, and we want the list to react in realtime to this.
+  get sortedThreads() {
+    return this.threadsManager.threads
+      .filter(
+        (thread) =>
+          thread.currentUserMembership && !thread.originalMessage.deletedAt
+      )
+      .sort((threadA, threadB) => {
+        // If both are unread we just want to sort by last reply date + time descending.
+        if (threadA.tracking.unreadCount && threadB.tracking.unreadCount) {
+          if (
+            threadA.preview.lastReplyCreatedAt >
+            threadB.preview.lastReplyCreatedAt
+          ) {
+            return -1;
+          } else {
+            return 1;
+          }
+        }
+
+        // If one is unread and the other is not, we want to sort the unread one first.
+        if (threadA.tracking.unreadCount) {
+          return -1;
+        }
+
+        if (threadB.tracking.unreadCount) {
+          return 1;
+        }
+
+        // If both are read, we want to sort by last reply date + time descending.
+        if (
+          threadA.preview.lastReplyCreatedAt >
+          threadB.preview.lastReplyCreatedAt
+        ) {
+          return -1;
+        } else {
+          return 1;
+        }
+      });
+  }
+
+  get shouldRender() {
+    return !!this.args.channel;
+  }
+
+  @action
+  loadThreads() {
+    return this.threadsCollection.load({ limit: 10 });
+  }
+
+  @action
+  subscribe() {
+    this.#unsubscribe();
+
+    this.messageBus.subscribe(
+      `/chat/${this.args.channel.id}`,
+      this.onMessageBus,
+      this.args.channel.messageBusLastId
+    );
+  }
+
+  @bind
+  onMessageBus(busData) {
+    switch (busData.type) {
+      case "delete":
+        this.handleDeleteMessage(busData);
+        break;
+      case "restore":
+        this.handleRestoreMessage(busData);
+        break;
+    }
+  }
+
+  handleDeleteMessage(data) {
+    const deletedOriginalMessageThread = this.threadsManager.threads.findBy(
+      "originalMessage.id",
+      data.deleted_id
+    );
+
+    if (!deletedOriginalMessageThread) {
+      return;
+    }
+
+    deletedOriginalMessageThread.originalMessage.deletedAt = new Date();
+  }
+
+  handleRestoreMessage(data) {
+    const restoredOriginalMessageThread = this.threadsManager.threads.findBy(
+      "originalMessage.id",
+      data.chat_message.id
+    );
+
+    if (!restoredOriginalMessageThread) {
+      return;
+    }
+
+    restoredOriginalMessageThread.originalMessage.deletedAt = null;
+  }
+
+  @cached
+  get threadsCollection() {
+    return this.chatApi.threads(this.args.channel.id, this.handleLoadedThreads);
+  }
+
+  @bind
+  handleLoadedThreads(result) {
+    return result.threads.map((thread) => {
+      const threadModel = this.threadsManager.add(this.args.channel, thread, {
+        replace: true,
+      });
+
+      this.chatTrackingStateManager.setupChannelThreadState(
+        this.args.channel,
+        result.tracking
+      );
+
+      return threadModel;
+    });
+  }
+
+  @action
+  teardown() {
+    this.#unsubscribe();
+  }
+
+  #unsubscribe() {
+    // TODO (joffrey) In drawer we won't have channel anymore at this point
+    if (!this.args.channel) {
+      return;
+    }
+
+    this.messageBus.unsubscribe(
+      `/chat/${this.args.channel.id}`,
+      this.onMessageBus
+    );
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/thread-list/header.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/thread-list/header.hbs
new file mode 100644
index 00000000000..9ddb96fed23
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/thread-list/header.hbs
@@ -0,0 +1,16 @@
+<div class="chat-thread-header">
+  <span class="chat-thread-header__label">
+    {{replace-emoji (i18n "chat.threads.list")}}
+  </span>
+
+  <div class="chat-thread-header__buttons">
+    <LinkTo
+      class="chat-thread__close btn-flat btn btn-icon no-text"
+      @route="chat.channel"
+      @models={{@channel.routeModels}}
+      title={{i18n "chat.thread.close"}}
+    >
+      {{d-icon "times"}}
+    </LinkTo>
+  </div>
+</div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/thread-list/item.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/thread-list/item.hbs
new file mode 100644
index 00000000000..09e5177fd37
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/thread-list/item.hbs
@@ -0,0 +1,43 @@
+<div
+  class={{concat-class
+    "chat-thread-list-item"
+    (if (gt @thread.tracking.unreadCount 0) "-is-unread")
+  }}
+  data-thread-id={{@thread.id}}
+  ...attributes
+>
+  <div class="chat-thread-list-item__main">
+    <div
+      title={{i18n "chat.thread.view_thread"}}
+      role="button"
+      class="chat-thread-list-item__open-button"
+      {{on "click" (fn this.openThread @thread) passive=true}}
+    >
+      <div class="chat-thread-list-item__header">
+        <div class="chat-thread-list-item__om-user-avatar">
+          <Chat::UserAvatar @user={{@thread.originalMessage.user}} />
+        </div>
+        <div class="chat-thread-list-item__title overflow-ellipsis">
+          {{replace-emoji this.title}}
+        </div>
+        <div class="chat-thread-list-item__unread-indicator">
+          <Chat::ThreadList::Item::UnreadIndicator @thread={{@thread}} />
+        </div>
+      </div>
+
+      <div class="chat-thread-list-item__body">
+        {{replace-emoji (html-safe @thread.originalMessage.excerpt)}}
+      </div>
+
+      <div class="chat-thread-list-item__metadata">
+        <div class="chat-thread-list-item__participants"></div>
+        <div class="chat-thread-list-item__last-reply">
+          {{#if @thread.preview.lastReplyCreatedAt}}
+            {{i18n "chat.thread.last_reply"}}
+            {{format-date @thread.preview.lastReplyCreatedAt leaveAgo="true"}}
+          {{/if}}
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/thread-list/item.js b/plugins/chat/assets/javascripts/discourse/components/chat/thread-list/item.js
new file mode 100644
index 00000000000..0e504f71f9a
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/thread-list/item.js
@@ -0,0 +1,16 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+
+export default class ChatThreadListItem extends Component {
+  @service router;
+
+  get title() {
+    return this.args.thread.escapedTitle;
+  }
+
+  @action
+  openThread(thread) {
+    this.router.transitionTo("chat.channel.thread", ...thread.routeModels);
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/thread-list/item/unread-indicator.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/thread-list/item/unread-indicator.hbs
new file mode 100644
index 00000000000..8f389b8db14
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/thread-list/item/unread-indicator.hbs
@@ -0,0 +1,7 @@
+{{#if this.showUnreadIndicator}}
+  <div class="chat-thread-list-item-unread-indicator">
+    <div class="chat-thread-list-item-unread-indicator__number">
+      {{this.unreadCountLabel}}
+    </div>
+  </div>
+{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/thread-list/item/unread-indicator.js b/plugins/chat/assets/javascripts/discourse/components/chat/thread-list/item/unread-indicator.js
new file mode 100644
index 00000000000..7dce93ea2ed
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/thread-list/item/unread-indicator.js
@@ -0,0 +1,15 @@
+import Component from "@glimmer/component";
+
+export default class ChatThreadListItemUnreadIndicator extends Component {
+  get unreadCount() {
+    return this.args.thread.tracking.unreadCount;
+  }
+
+  get showUnreadIndicator() {
+    return this.unreadCount > 0;
+  }
+
+  get unreadCountLabel() {
+    return this.unreadCount > 99 ? "99+" : this.unreadCount;
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/thread/header-unread-indicator.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/thread/header-unread-indicator.hbs
new file mode 100644
index 00000000000..d29401a549c
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/thread/header-unread-indicator.hbs
@@ -0,0 +1,11 @@
+{{#if this.showUnreadIndicator}}
+  <div
+    class="chat-thread-header-unread-indicator"
+    aria-label={{i18n "chat.unread_threads_count" count=this.unreadCountLabel}}
+    title={{i18n "chat.unread_threads_count" count=this.unreadCountLabel}}
+  >
+    <div
+      class="chat-thread-header-unread-indicator__number"
+    >{{this.unreadCountLabel}}</div>
+  </div>
+{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/thread/header-unread-indicator.js b/plugins/chat/assets/javascripts/discourse/components/chat/thread/header-unread-indicator.js
new file mode 100644
index 00000000000..f81c0ca7755
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/thread/header-unread-indicator.js
@@ -0,0 +1,22 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+
+export default class ChatThreadHeaderUnreadIndicator extends Component {
+  @service currentUser;
+
+  get currentUserInDnD() {
+    return this.currentUser.isInDoNotDisturb();
+  }
+
+  get unreadCount() {
+    return this.args.channel.threadsManager.unreadThreadCount;
+  }
+
+  get showUnreadIndicator() {
+    return !this.currentUserInDnD && this.unreadCount > 0;
+  }
+
+  get unreadCountLabel() {
+    return this.unreadCount > 99 ? "99+" : this.unreadCount;
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/thread/header.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/thread/header.hbs
new file mode 100644
index 00000000000..a4fd62890af
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/thread/header.hbs
@@ -0,0 +1,47 @@
+<div class="chat-thread-header">
+  <div class="chat-thread-header__left-buttons">
+    {{#if @thread}}
+      <LinkTo
+        class="chat-thread__back-to-previous-route btn-flat btn btn-icon no-text"
+        @route={{this.backLink.route}}
+        @models={{this.backLink.models}}
+        title={{i18n "chat.return_to_threads_list"}}
+      >
+        <Chat::Thread::HeaderUnreadIndicator @channel={{@thread.channel}} />
+        {{d-icon "chevron-left"}}
+      </LinkTo>
+    {{/if}}
+  </div>
+
+  <span class="chat-thread-header__label overflow-ellipsis">
+    {{replace-emoji this.label}}
+  </span>
+
+  <div
+    class={{concat-class
+      "chat-thread-header__buttons"
+      (if this.persistedNotificationLevel "-persisted")
+    }}
+  >
+    <ThreadNotificationsButton
+      @value={{this.threadNotificationLevel}}
+      @onChange={{this.updateThreadNotificationLevel}}
+    />
+    {{#if this.canChangeThreadSettings}}
+      <DButton
+        @action={{this.openThreadSettings}}
+        @class="btn-flat chat-thread-header__settings"
+        @icon="cog"
+        @title="chat.thread.settings"
+      />
+    {{/if}}
+    <LinkTo
+      class="chat-thread__close btn-flat btn btn-icon no-text"
+      @route="chat.channel"
+      @models={{@thread.channel.routeModels}}
+      title={{i18n "chat.thread.close"}}
+    >
+      {{d-icon "times"}}
+    </LinkTo>
+  </div>
+</div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/thread/header.js b/plugins/chat/assets/javascripts/discourse/components/chat/thread/header.js
new file mode 100644
index 00000000000..4b863f04094
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/thread/header.js
@@ -0,0 +1,100 @@
+import Component from "@glimmer/component";
+import { NotificationLevels } from "discourse/lib/notification-levels";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+import UserChatThreadMembership from "discourse/plugins/chat/discourse/models/user-chat-thread-membership";
+import { tracked } from "@glimmer/tracking";
+import ChatModalThreadSettings from "discourse/plugins/chat/discourse/components/chat/modal/thread-settings";
+
+export default class ChatThreadHeader extends Component {
+  @service currentUser;
+  @service chatApi;
+  @service router;
+  @service chatStateManager;
+  @service chatHistory;
+  @service site;
+  @service modal;
+
+  @tracked persistedNotificationLevel = true;
+
+  get backLink() {
+    let route;
+
+    if (
+      this.chatHistory.previousRoute?.name === "chat.channel.index" &&
+      this.site.mobileView
+    ) {
+      route = "chat.channel.index";
+    } else {
+      route = "chat.channel.threads";
+    }
+
+    return {
+      route,
+      models: this.args.channel.routeModels,
+    };
+  }
+
+  get label() {
+    return this.args.thread.escapedTitle;
+  }
+
+  get canChangeThreadSettings() {
+    if (!this.args.thread) {
+      return false;
+    }
+
+    return (
+      this.currentUser.staff ||
+      this.currentUser.id === this.args.thread.originalMessage.user.id
+    );
+  }
+
+  get threadNotificationLevel() {
+    return this.membership?.notificationLevel || NotificationLevels.REGULAR;
+  }
+
+  get membership() {
+    return this.args.thread.currentUserMembership;
+  }
+
+  @action
+  openThreadSettings() {
+    this.modal.show(ChatModalThreadSettings, { model: this.args.thread });
+  }
+
+  @action
+  updateThreadNotificationLevel(newNotificationLevel) {
+    this.persistedNotificationLevel = false;
+
+    let currentNotificationLevel;
+
+    if (this.membership) {
+      currentNotificationLevel = this.membership.notificationLevel;
+      this.membership.notificationLevel = newNotificationLevel;
+    } else {
+      this.args.thread.currentUserMembership = UserChatThreadMembership.create({
+        notification_level: newNotificationLevel,
+        last_read_message_id: null,
+      });
+    }
+
+    this.chatApi
+      .updateCurrentUserThreadNotificationsSettings(
+        this.args.thread.channel.id,
+        this.args.thread.id,
+        { notificationLevel: newNotificationLevel }
+      )
+      .then((response) => {
+        this.membership.last_read_message_id =
+          response.membership.last_read_message_id;
+
+        this.persistedNotificationLevel = true;
+      })
+      .catch((err) => {
+        this.membership.notificationLevel = currentNotificationLevel;
+        popupAjaxError(err);
+      });
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/thread/participants.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/thread/participants.hbs
new file mode 100644
index 00000000000..e928326cf8b
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/thread/participants.hbs
@@ -0,0 +1,21 @@
+{{#if (gt @thread.preview.participantUsers.length 1)}}
+  <div class="chat-thread-participants">
+    <div class="chat-thread-participants__avatar-group">
+      {{#each @thread.preview.participantUsers as |user|}}
+        <Chat::UserAvatar
+          @user={{user}}
+          @avatarSize="tiny"
+          @showPresence={{false}}
+        />
+      {{/each}}
+    </div>
+    {{#if @thread.preview.otherParticipantCount}}
+      <div class="chat-thread-participants__other-count">
+        {{i18n
+          "chat.thread.participants_other_count"
+          count=@thread.preview.otherParticipantCount
+        }}
+      </div>
+    {{/if}}
+  </div>
+{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/thread/threads-list-button.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/thread/threads-list-button.hbs
new file mode 100644
index 00000000000..c4b7263d1b3
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/thread/threads-list-button.hbs
@@ -0,0 +1,13 @@
+<LinkTo
+  @route="chat.channel.threads"
+  @models={{@channel.routeModels}}
+  title={{i18n "chat.threads.list"}}
+  class={{concat-class
+    "chat-threads-list-button btn btn-flat"
+    (if @channel.threadsManager.unreadThreadCount "has-unreads")
+  }}
+>
+  {{d-icon "discourse-threads"}}
+
+  <Chat::Thread::HeaderUnreadIndicator @channel={{@channel}} />
+</LinkTo>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/thread/threads-list-button.js b/plugins/chat/assets/javascripts/discourse/components/chat/thread/threads-list-button.js
new file mode 100644
index 00000000000..c383e020f9d
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/thread/threads-list-button.js
@@ -0,0 +1,3 @@
+import Component from "@glimmer/component";
+
+export default class ChatThreadsListButton extends Component {}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/user-avatar.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/user-avatar.hbs
new file mode 100644
index 00000000000..d943a4bc652
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/user-avatar.hbs
@@ -0,0 +1,9 @@
+<div class="chat-user-avatar {{if this.isOnline 'is-online'}}">
+  <div
+    role="button"
+    class="chat-user-avatar__container clickable"
+    data-user-card={{@user.username}}
+  >
+    {{avatar @user imageSize=this.avatarSize}}
+  </div>
+</div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/user-avatar.js b/plugins/chat/assets/javascripts/discourse/components/chat/user-avatar.js
new file mode 100644
index 00000000000..b4a616d78c9
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/user-avatar.js
@@ -0,0 +1,26 @@
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+
+export default class ChatUserAvatar extends Component {
+  @service chat;
+
+  get avatarSize() {
+    return this.args.avatarSize || "tiny";
+  }
+
+  get showPresence() {
+    return this.args.showPresence ?? true;
+  }
+
+  get isOnline() {
+    const users = (this.args.chat || this.chat).presenceChannel?.users;
+
+    return (
+      this.showPresence &&
+      !!users?.find(
+        ({ id, username }) =>
+          this.args.user?.id === id || this.args.user?.username === username
+      )
+    );
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/user-card-button.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/user-card-button.hbs
new file mode 100644
index 00000000000..21898c98ec5
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/user-card-button.hbs
@@ -0,0 +1,8 @@
+{{#if this.shouldRender}}
+  <DButton
+    @class="btn-primary chat-user-card-btn"
+    @action={{this.startChatting}}
+    @label="chat.title_capitalized"
+    @icon="d-chat"
+  />
+{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/user-card-button.js b/plugins/chat/assets/javascripts/discourse/components/chat/user-card-button.js
new file mode 100644
index 00000000000..c8466370943
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/user-card-button.js
@@ -0,0 +1,23 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+
+export default class ChatUserCardButton extends Component {
+  @service chat;
+  @service appEvents;
+  @service router;
+
+  get shouldRender() {
+    return this.chat.userCanDirectMessage && !this.args.user.suspended;
+  }
+
+  @action
+  startChatting() {
+    return this.chat
+      .upsertDmChannelForUsernames([this.args.user.username])
+      .then((channel) => {
+        this.router.transitionTo("chat.channel", ...channel.routeModels);
+        this.appEvents.trigger("card:close");
+      });
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/collapser.hbs b/plugins/chat/assets/javascripts/discourse/components/collapser.hbs
index 180186ee62b..7bee61a37b2 100644
--- a/plugins/chat/assets/javascripts/discourse/components/collapser.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/collapser.hbs
@@ -16,6 +16,11 @@
   {{/if}}
 </div>
 
-<div class={{if this.collapsed "hidden" ""}}>
-  {{yield}}
+<div
+  class={{concat-class
+    "chat-message-collapser-body"
+    (if this.collapsed "hidden")
+  }}
+>
+  {{yield this.collapsed}}
 </div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/collapser.js b/plugins/chat/assets/javascripts/discourse/components/collapser.js
index f7d05cf8376..db6a355a6a1 100644
--- a/plugins/chat/assets/javascripts/discourse/components/collapser.js
+++ b/plugins/chat/assets/javascripts/discourse/components/collapser.js
@@ -6,14 +6,17 @@ export default Component.extend({
 
   collapsed: false,
   header: null,
+  onToggle: null,
 
   @action
   open() {
     this.set("collapsed", false);
+    this.onToggle?.(false);
   },
 
   @action
   close() {
     this.set("collapsed", true);
+    this.onToggle?.(true);
   },
 });
diff --git a/plugins/chat/assets/javascripts/discourse/components/d-progress-bar.hbs b/plugins/chat/assets/javascripts/discourse/components/d-progress-bar.hbs
deleted file mode 100644
index 5e7b37cd1a8..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/d-progress-bar.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-<div id={{this.key}} class="d-progress-bar-container">
-  <div class="d-progress-bar"></div>
-</div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/d-progress-bar.js b/plugins/chat/assets/javascripts/discourse/components/d-progress-bar.js
deleted file mode 100644
index 4889d541a17..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/d-progress-bar.js
+++ /dev/null
@@ -1,111 +0,0 @@
-// temporary stuff to be moved in core with discourse-loading-slider
-
-import Component from "@ember/component";
-import { cancel, schedule } from "@ember/runloop";
-import discourseLater from "discourse-common/lib/later";
-
-const STORE_LOADING_TIMES = 5;
-const DEFAULT_LOADING_TIME = 0.3;
-const MIN_LOADING_TIME = 0.1;
-const STILL_LOADING_DURATION = 2;
-
-export default Component.extend({
-  tagName: "",
-  isLoading: false,
-  key: null,
-
-  init() {
-    this._super(...arguments);
-
-    this.loadingTimes = [DEFAULT_LOADING_TIME];
-    this.set("averageTime", DEFAULT_LOADING_TIME);
-    this.i = 0;
-    this.scheduled = [];
-  },
-
-  resetState() {
-    this.container?.classList?.remove("done", "loading", "still-loading");
-  },
-
-  cancelScheduled() {
-    this.scheduled.forEach((s) => cancel(s));
-    this.scheduled = [];
-  },
-
-  didReceiveAttrs() {
-    this._super(...arguments);
-
-    if (!this.key) {
-      return;
-    }
-
-    this.cancelScheduled();
-    this.resetState();
-
-    if (this.isLoading) {
-      this.start();
-    } else {
-      this.end();
-    }
-  },
-
-  get container() {
-    return document.getElementById(this.key);
-  },
-
-  start() {
-    this.set("startedAt", Date.now());
-
-    this.scheduled.push(discourseLater(this, "startLoading"));
-    this.scheduled.push(
-      discourseLater(this, "stillLoading", STILL_LOADING_DURATION * 1000)
-    );
-  },
-
-  startLoading() {
-    this.scheduled.push(
-      schedule("afterRender", () => {
-        this.container?.classList?.add("loading");
-        document.documentElement.style.setProperty(
-          "--loading-duration",
-          `${this.averageTime.toFixed(2)}s`
-        );
-      })
-    );
-  },
-
-  stillLoading() {
-    this.scheduled.push(
-      schedule("afterRender", () => {
-        this.container?.classList?.add("still-loading");
-      })
-    );
-  },
-
-  end() {
-    this.updateAverage((Date.now() - this.startedAt) / 1000);
-
-    this.cancelScheduled();
-
-    this.scheduled.push(
-      schedule("afterRender", () => {
-        this.container?.classList?.remove("loading", "still-loading");
-        this.container?.classList?.add("done");
-      })
-    );
-  },
-
-  updateAverage(durationSeconds) {
-    if (durationSeconds < MIN_LOADING_TIME) {
-      durationSeconds = MIN_LOADING_TIME;
-    }
-
-    this.loadingTimes[this.i] = durationSeconds;
-
-    this.i = (this.i + 1) % STORE_LOADING_TIMES;
-    this.set(
-      "averageTime",
-      this.loadingTimes.reduce((p, c) => p + c, 0) / this.loadingTimes.length
-    );
-  },
-});
diff --git a/plugins/chat/assets/javascripts/discourse/components/dc-filter-input.hbs b/plugins/chat/assets/javascripts/discourse/components/dc-filter-input.hbs
index 17ac5f4ef40..a3d465fe24e 100644
--- a/plugins/chat/assets/javascripts/discourse/components/dc-filter-input.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/dc-filter-input.hbs
@@ -11,6 +11,7 @@
 
   <Input
     class="dc-filter-input"
+    @value={{@value}}
     {{on "input" (if @filterAction @filterAction (noop))}}
     {{on "focusin" (action (mut this.isFocused) true)}}
     {{on "focusout" (action (mut this.isFocused) false)}}
diff --git a/plugins/chat/assets/javascripts/discourse/components/direct-message-creator.hbs b/plugins/chat/assets/javascripts/discourse/components/direct-message-creator.hbs
deleted file mode 100644
index aaa7c9f9420..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/direct-message-creator.hbs
+++ /dev/null
@@ -1,90 +0,0 @@
-{{#if this.chatProgressBarContainer}}
-  {{#in-element this.chatProgressBarContainer}}
-    <DProgressBar @key="dm-recipients-loader" @isLoading={{this.isFiltering}} />
-  {{/in-element}}
-{{/if}}
-
-{{#if (and this.channel.isDraft (not this.isLoading))}}
-  <div class="direct-message-creator">
-    <div
-      class="filter-area {{if this.isFilterFocused 'is-focused'}}"
-      role="button"
-      {{on "click" this.focusFilter}}
-    >
-
-      <span class="prefix">
-        {{i18n "chat.direct_message_creator.prefix"}}
-      </span>
-
-      <div class="recipients">
-        {{#each this.selectedUsers as |selectedUser|}}
-          <DButton
-            @class={{concat
-              "selected-user"
-              (if
-                (eq this.highlightedSelectedUser selectedUser) " is-highlighted"
-              )
-            }}
-            @action={{action "deselectUser" selectedUser}}
-            @translatedTitle={{i18n
-              "chat.direct_message_creator.selected_user_title"
-              username=selectedUser.username
-            }}
-          >
-            <ChatUserAvatar @user={{selectedUser}} />
-            <span class="username">{{selectedUser.username}}</span>
-            {{d-icon "times"}}
-          </DButton>
-        {{/each}}
-
-        <Input
-          class="filter-usernames"
-          @value={{this.term}}
-          autofocus="autofocus"
-          {{on "input" (action "onFilterInput" value="target.value")}}
-          {{on "focusin" (action (mut this.isFilterFocused) true)}}
-          {{on "focusout" (action "onFilterInputFocusOut")}}
-          {{on "keyup" (action "handleFilterKeyUp")}}
-        />
-      </div>
-    </div>
-
-    {{#if this.shouldRenderResults}}
-      {{#if this.users}}
-        <div class="results-container">
-          <ul class="results">
-            {{#each this.users as |user|}}
-              <li
-                class="user {{if (eq this.focusedUser user) 'is-focused'}}"
-                data-username={{user.username}}
-                role="button"
-                tabindex="-1"
-                {{on "click" (action "selectUser" user)}}
-                {{on "mouseenter" (action (mut this.focusedUser) user)}}
-                {{on "focus" (action (mut this.focusedUser) user)}}
-                {{on "keyup" (action "handleUserKeyUp" user)}}
-              >
-                <ChatUserAvatar @user={{user}} @avatarSize="medium" />
-                <UserInfo
-                  @user={{user}}
-                  @includeLink={{false}}
-                  @includeAvatar={{false}}
-                  @showStatus={{true}}
-                  @showStatusDescription={{true}}
-                />
-              </li>
-            {{/each}}
-          </ul>
-        </div>
-      {{else}}
-        {{#if this.term.length}}
-          <div class="no-results-container">
-            <p class="no-results">
-              {{i18n "chat.direct_message_creator.no_results"}}
-            </p>
-          </div>
-        {{/if}}
-      {{/if}}
-    {{/if}}
-  </div>
-{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/direct-message-creator.js b/plugins/chat/assets/javascripts/discourse/components/direct-message-creator.js
deleted file mode 100644
index 66cd36bcee9..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/direct-message-creator.js
+++ /dev/null
@@ -1,316 +0,0 @@
-import { caretPosition } from "discourse/lib/utilities";
-import { isEmpty } from "@ember/utils";
-import Component from "@ember/component";
-import { action } from "@ember/object";
-import discourseDebounce from "discourse-common/lib/debounce";
-import discourseComputed, { bind } from "discourse-common/utils/decorators";
-import { INPUT_DELAY } from "discourse-common/config/environment";
-import { inject as service } from "@ember/service";
-import { schedule } from "@ember/runloop";
-import { gt, not } from "@ember/object/computed";
-import { createDirectMessageChannelDraft } from "discourse/plugins/chat/discourse/models/chat-channel";
-
-export default Component.extend({
-  tagName: "",
-  users: null,
-  selectedUsers: null,
-  term: null,
-  isFiltering: false,
-  isFilterFocused: false,
-  highlightedSelectedUser: null,
-  focusedUser: null,
-  chat: service(),
-  router: service(),
-  chatStateManager: service(),
-  isLoading: false,
-  onSwitchChannel: null,
-
-  init() {
-    this._super(...arguments);
-
-    this.set("users", []);
-    this.set("selectedUsers", []);
-    this.set("channel", createDirectMessageChannelDraft());
-  },
-
-  didInsertElement() {
-    this._super(...arguments);
-
-    this.filterUsernames();
-  },
-
-  didReceiveAttrs() {
-    this._super(...arguments);
-
-    this.set("term", null);
-
-    this.focusFilter();
-
-    if (!this.hasSelection) {
-      this.filterUsernames();
-    }
-  },
-
-  hasSelection: gt("channel.chatable.users.length", 0),
-
-  @discourseComputed
-  chatProgressBarContainer() {
-    return document.querySelector("#chat-progress-bar-container");
-  },
-
-  @bind
-  filterUsernames(term = null) {
-    this.set("isFiltering", true);
-
-    this.chat
-      .searchPossibleDirectMessageUsers({
-        term,
-        limit: 6,
-        exclude: this.channel.chatable?.users?.mapBy("username") || [],
-        lastSeenUsers: isEmpty(term) ? true : false,
-      })
-      .then((r) => {
-        if (this.isDestroying || this.isDestroyed) {
-          return;
-        }
-
-        if (r !== "__CANCELLED") {
-          this.set("users", r.users || []);
-          this.set("focusedUser", this.users.firstObject);
-        }
-      })
-      .finally(() => {
-        if (this.isDestroying || this.isDestroyed) {
-          return;
-        }
-
-        this.set("isFiltering", false);
-      });
-  },
-
-  shouldRenderResults: not("isFiltering"),
-
-  @action
-  selectUser(user) {
-    this.selectedUsers.pushObject(user);
-    this.users.removeObject(user);
-    this.set("users", []);
-    this.set("focusedUser", null);
-    this.set("highlightedSelectedUser", null);
-    this.set("term", null);
-    this.focusFilter();
-    this.onChangeSelectedUsers?.(this.selectedUsers);
-  },
-
-  @action
-  deselectUser(user) {
-    this.users.removeObject(user);
-    this.selectedUsers.removeObject(user);
-    this.set("focusedUser", this.users.firstObject);
-    this.set("highlightedSelectedUser", null);
-    this.set("term", null);
-
-    if (isEmpty(this.selectedUsers)) {
-      this.filterUsernames();
-    }
-
-    this.focusFilter();
-    this.onChangeSelectedUsers?.(this.selectedUsers);
-  },
-
-  @action
-  focusFilter() {
-    this.set("isFilterFocused", true);
-
-    schedule("afterRender", () => {
-      document.querySelector(".filter-usernames")?.focus();
-    });
-  },
-
-  @action
-  onFilterInput(term) {
-    this.set("term", term);
-    this.set("users", []);
-
-    if (!term?.length) {
-      return;
-    }
-
-    this.set("isFiltering", true);
-
-    discourseDebounce(this, this.filterUsernames, term, INPUT_DELAY);
-  },
-
-  @action
-  handleUserKeyUp(user, event) {
-    if (event.key === "Enter") {
-      event.stopPropagation();
-      event.preventDefault();
-      this.selectUser(user);
-    }
-  },
-
-  @action
-  onFilterInputFocusOut() {
-    this.set("isFilterFocused", false);
-    this.set("highlightedSelectedUser", null);
-  },
-
-  @action
-  leaveChannel() {
-    this.router.transitionTo("chat.index");
-  },
-
-  @action
-  handleFilterKeyUp(event) {
-    if (event.key === "Tab") {
-      const enabledComposer = document.querySelector(".chat-composer-input");
-      if (enabledComposer && !enabledComposer.disabled) {
-        event.preventDefault();
-        event.stopPropagation();
-        enabledComposer.focus();
-      }
-    }
-
-    if (
-      (event.key === "Enter" || event.key === "Backspace") &&
-      this.highlightedSelectedUser
-    ) {
-      event.preventDefault();
-      event.stopPropagation();
-      this.deselectUser(this.highlightedSelectedUser);
-      return;
-    }
-
-    if (event.key === "Backspace" && isEmpty(this.term) && this.hasSelection) {
-      event.preventDefault();
-      event.stopPropagation();
-
-      this.deselectUser(this.channel.chatable.users.lastObject);
-    }
-
-    if (event.key === "Enter" && this.focusedUser) {
-      event.preventDefault();
-      event.stopPropagation();
-      this.selectUser(this.focusedUser);
-    }
-
-    if (event.key === "ArrowDown" || event.key === "ArrowUp") {
-      this._handleVerticalArrowKeys(event);
-    }
-
-    if (event.key === "Escape" && this.highlightedSelectedUser) {
-      this.set("highlightedSelectedUser", null);
-    }
-
-    if (event.key === "ArrowLeft" || event.key === "ArrowRight") {
-      this._handleHorizontalArrowKeys(event);
-    }
-  },
-
-  _firstSelectWithArrows(event) {
-    if (event.key === "ArrowRight") {
-      return;
-    }
-
-    if (event.key === "ArrowLeft") {
-      const position = caretPosition(
-        document.querySelector(".filter-usernames")
-      );
-      if (position > 0) {
-        return;
-      } else {
-        event.preventDefault();
-        event.stopPropagation();
-        this.set(
-          "highlightedSelectedUser",
-          this.channel.chatable.users.lastObject
-        );
-      }
-    }
-  },
-
-  _changeSelectionWithArrows(event) {
-    if (event.key === "ArrowRight") {
-      if (
-        this.highlightedSelectedUser === this.channel.chatable.users.lastObject
-      ) {
-        this.set("highlightedSelectedUser", null);
-        return;
-      }
-
-      if (this.channel.chatable.users.length === 1) {
-        return;
-      }
-
-      this._highlightNextSelectedUser(event.key === "ArrowLeft" ? -1 : 1);
-    }
-
-    if (event.key === "ArrowLeft") {
-      if (this.channel.chatable.users.length === 1) {
-        return;
-      }
-
-      this._highlightNextSelectedUser(event.key === "ArrowLeft" ? -1 : 1);
-    }
-  },
-
-  _highlightNextSelectedUser(modifier) {
-    const newIndex =
-      this.channel.chatable.users.indexOf(this.highlightedSelectedUser) +
-      modifier;
-
-    if (this.channel.chatable.users.objectAt(newIndex)) {
-      this.set(
-        "highlightedSelectedUser",
-        this.channel.chatable.users.objectAt(newIndex)
-      );
-    } else {
-      this.set(
-        "highlightedSelectedUser",
-        event.key === "ArrowLeft"
-          ? this.channel.chatable.users.lastObject
-          : this.channel.chatable.users.firstObject
-      );
-    }
-  },
-
-  _handleHorizontalArrowKeys(event) {
-    const position = caretPosition(document.querySelector(".filter-usernames"));
-    if (position > 0) {
-      return;
-    }
-
-    if (!this.highlightedSelectedUser) {
-      this._firstSelectWithArrows(event);
-    } else {
-      this._changeSelectionWithArrows(event);
-    }
-  },
-
-  _handleVerticalArrowKeys(event) {
-    if (isEmpty(this.users)) {
-      return;
-    }
-
-    event.preventDefault();
-    event.stopPropagation();
-
-    if (!this.focusedUser) {
-      this.set("focusedUser", this.users.firstObject);
-      return;
-    }
-
-    const modifier = event.key === "ArrowUp" ? -1 : 1;
-    const newIndex = this.users.indexOf(this.focusedUser) + modifier;
-
-    if (this.users.objectAt(newIndex)) {
-      this.set("focusedUser", this.users.objectAt(newIndex));
-    } else {
-      this.set(
-        "focusedUser",
-        event.key === "ArrowUp" ? this.users.lastObject : this.users.firstObject
-      );
-    }
-  },
-});
diff --git a/plugins/chat/assets/javascripts/discourse/components/full-page-chat.hbs b/plugins/chat/assets/javascripts/discourse/components/full-page-chat.hbs
index eb443dabcd8..97fc62b9593 100644
--- a/plugins/chat/assets/javascripts/discourse/components/full-page-chat.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/full-page-chat.hbs
@@ -1,7 +1,6 @@
-{{#if this.chat.activeChannel}}
-  <ChatLivePane
-    @chatChannel={{this.chat.activeChannel}}
-    @onBackClick={{action "navigateToIndex"}}
-    @onSwitchChannel={{action "switchChannel"}}
+{{#if @channel.id}}
+  <ChatChannel
+    @channel={{@channel}}
+    @targetMessageId={{readonly @targetMessageId}}
   />
 {{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/full-page-chat.js b/plugins/chat/assets/javascripts/discourse/components/full-page-chat.js
index a736c4e9011..94d9c7039f7 100644
--- a/plugins/chat/assets/javascripts/discourse/components/full-page-chat.js
+++ b/plugins/chat/assets/javascripts/discourse/components/full-page-chat.js
@@ -1,84 +1,6 @@
-import Component from "@ember/component";
-import { bind } from "discourse-common/utils/decorators";
-import { action } from "@ember/object";
+import Component from "@glimmer/component";
 import { inject as service } from "@ember/service";
 
-export default Component.extend({
-  tagName: "",
-  router: service(),
-  chat: service(),
-
-  init() {
-    this._super(...arguments);
-  },
-
-  didInsertElement() {
-    this._super(...arguments);
-
-    this._scrollSidebarToBottom();
-    document.addEventListener("keydown", this._autoFocusChatComposer);
-  },
-
-  willDestroyElement() {
-    this._super(...arguments);
-
-    document.removeEventListener("keydown", this._autoFocusChatComposer);
-  },
-
-  @bind
-  _autoFocusChatComposer(event) {
-    if (
-      !event.key ||
-      // Handles things like Enter, Tab, Shift
-      event.key.length > 1 ||
-      // Don't need to focus if the user is beginning a shortcut.
-      event.metaKey ||
-      event.ctrlKey ||
-      // Space's key comes through as ' ' so it's not covered by event.key
-      event.code === "Space" ||
-      // ? is used for the keyboard shortcut modal
-      event.key === "?"
-    ) {
-      return;
-    }
-
-    if (
-      !event.target ||
-      /^(INPUT|TEXTAREA|SELECT)$/.test(event.target.tagName)
-    ) {
-      return;
-    }
-
-    event.preventDefault();
-    event.stopPropagation();
-
-    const composer = document.querySelector(".chat-composer-input");
-    if (composer && !this.chat.activeChannel.isDraft) {
-      this.appEvents.trigger("chat:insert-text", event.key);
-      composer.focus();
-    }
-  },
-
-  _scrollSidebarToBottom() {
-    if (!this.teamsSidebarOn) {
-      return;
-    }
-
-    const sidebarScroll = document.querySelector(
-      ".sidebar-container .scroll-wrapper"
-    );
-    if (sidebarScroll) {
-      sidebarScroll.scrollTop = sidebarScroll.scrollHeight;
-    }
-  },
-
-  @action
-  navigateToIndex() {
-    this.router.transitionTo("chat.index");
-  },
-
-  @action
-  switchChannel(channel) {
-    return this.chat.openChannel(channel);
-  },
-});
+export default class FullPageChat extends Component {
+  @service chat;
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/on-visibility-action.hbs b/plugins/chat/assets/javascripts/discourse/components/on-visibility-action.hbs
deleted file mode 100644
index 16e646ab742..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/on-visibility-action.hbs
+++ /dev/null
@@ -1 +0,0 @@
-<div id={{this.onVisibilityActionId}}></div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/on-visibility-action.js b/plugins/chat/assets/javascripts/discourse/components/on-visibility-action.js
deleted file mode 100644
index 1cda1aaf901..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/on-visibility-action.js
+++ /dev/null
@@ -1,48 +0,0 @@
-import Component from "@ember/component";
-import { computed } from "@ember/object";
-import { bind } from "discourse-common/utils/decorators";
-import { guidFor } from "@ember/object/internals";
-
-export default class OnVisibilityAction extends Component {
-  action = null;
-
-  root = document.body;
-
-  @computed
-  get onVisibilityActionId() {
-    return "on-visibility-action-" + guidFor(this);
-  }
-
-  _element() {
-    return document.getElementById(this.onVisibilityActionId);
-  }
-
-  didInsertElement() {
-    this._super(...arguments);
-
-    let options = {
-      root: this.root,
-      rootMargin: "0px",
-      threshold: 1.0,
-    };
-
-    this._observer = new IntersectionObserver(this._handleIntersect, options);
-    this._observer.observe(this._element());
-  }
-
-  willDestroyElement() {
-    this._super(...arguments);
-
-    this._observer?.disconnect();
-    this.root = null;
-  }
-
-  @bind
-  _handleIntersect(entries) {
-    entries.forEach((entry) => {
-      if (entry.isIntersecting) {
-        this.action?.();
-      }
-    });
-  }
-}
diff --git a/plugins/chat/assets/javascripts/discourse/components/reviewable-chat-message.hbs b/plugins/chat/assets/javascripts/discourse/components/reviewable-chat-message.hbs
index b3f653bbe0d..8401719457d 100644
--- a/plugins/chat/assets/javascripts/discourse/components/reviewable-chat-message.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/reviewable-chat-message.hbs
@@ -1,8 +1,11 @@
 <div class="flagged-post-header">
   <LinkTo
-    @route="chat.channel"
-    @models={{array this.chatChannel.id this.chatChannel.title}}
-    @query={{hash messageId=@reviewable.target_id}}
+    @route="chat.channel.near-message"
+    @models={{array
+      this.chatChannel.slugifiedTitle
+      this.chatChannel.id
+      @reviewable.target_id
+    }}
   >
     <ChatChannelTitle @channel={{this.chatChannel}} />
   </LinkTo>
diff --git a/plugins/chat/assets/javascripts/discourse/components/reviewable-chat-message.js b/plugins/chat/assets/javascripts/discourse/components/reviewable-chat-message.js
index 1857a1b9f11..3331382cec8 100644
--- a/plugins/chat/assets/javascripts/discourse/components/reviewable-chat-message.js
+++ b/plugins/chat/assets/javascripts/discourse/components/reviewable-chat-message.js
@@ -1,15 +1,14 @@
 import Component from "@glimmer/component";
 import { inject as service } from "@ember/service";
 import { cached } from "@glimmer/tracking";
+import ChatChannel from "discourse/plugins/chat/discourse/models/chat-channel";
 
 export default class ReviewableChatMessage extends Component {
   @service store;
+  @service chatChannelsManager;
 
   @cached
   get chatChannel() {
-    return this.store.createRecord(
-      "chat-channel",
-      this.args.reviewable.chat_channel
-    );
+    return ChatChannel.create(this.args.reviewable.chat_channel);
   }
 }
diff --git a/plugins/chat/assets/javascripts/discourse/components/sidebar-channels.hbs b/plugins/chat/assets/javascripts/discourse/components/sidebar-channels.hbs
deleted file mode 100644
index 9f1adaff508..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/sidebar-channels.hbs
+++ /dev/null
@@ -1,7 +0,0 @@
-{{#if this.isDisplayed}}
-  <ChannelsList
-    @onSelect={{action "switchChannel"}}
-    @toggleSection={{this.toggleSection}}
-    @inSidebar={{true}}
-  />
-{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/sidebar-channels.js b/plugins/chat/assets/javascripts/discourse/components/sidebar-channels.js
deleted file mode 100644
index 68884a01910..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/sidebar-channels.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import Component from "@ember/component";
-import { action, computed } from "@ember/object";
-import { inject as service } from "@ember/service";
-
-export default class SidebarChannels extends Component {
-  @service chat;
-  @service router;
-  tagName = "";
-  toggleSection = null;
-
-  @computed("chat.userCanChat")
-  get isDisplayed() {
-    return this.chat.userCanChat;
-  }
-
-  @action
-  switchChannel(channel) {
-    this.chat.openChannel(channel);
-  }
-}
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-composer-message-details.hbs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-composer-message-details.hbs
new file mode 100644
index 00000000000..b4d02f4342c
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-composer-message-details.hbs
@@ -0,0 +1,15 @@
+<StyleguideExample @title="<ChatComposerMessageDetails>">
+  <Styleguide::Component>
+    <ChatComposerMessageDetails @message={{this.message}} />
+  </Styleguide::Component>
+
+  <Styleguide::Controls>
+    <Styleguide::Controls::Row @name="Mode">
+      {{#if this.message.editing}}
+        <DButton @action={{this.toggleMode}} @translatedLabel="Reply" />
+      {{else}}
+        <DButton @action={{this.toggleMode}} @translatedLabel="Editing" />
+      {{/if}}
+    </Styleguide::Controls::Row>
+  </Styleguide::Controls>
+</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-composer-message-details.js b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-composer-message-details.js
new file mode 100644
index 00000000000..e3b6bc8827f
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-composer-message-details.js
@@ -0,0 +1,28 @@
+import Component from "@glimmer/component";
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
+import { action } from "@ember/object";
+import { cached } from "@glimmer/tracking";
+import { inject as service } from "@ember/service";
+
+export default class ChatStyleguideChatComposerMessageDetails extends Component {
+  @service site;
+  @service session;
+  @service keyValueStore;
+  @service currentUser;
+
+  @cached
+  get message() {
+    return fabricators.message({ user: this.currentUser });
+  }
+
+  @action
+  toggleMode() {
+    if (this.message.editing) {
+      this.message.editing = false;
+      this.message.inReplyTo = fabricators.message();
+    } else {
+      this.message.editing = true;
+      this.message.inReplyTo = null;
+    }
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-composer.hbs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-composer.hbs
new file mode 100644
index 00000000000..24f529be21d
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-composer.hbs
@@ -0,0 +1,23 @@
+<StyleguideExample @title="<ChatComposer>">
+  <Styleguide::Component>
+    <Chat::Composer::Channel
+      @channel={{this.channel}}
+      @onSendMessage={{this.onSendMessage}}
+    />
+  </Styleguide::Component>
+
+  <Styleguide::Controls>
+    <Styleguide::Controls::Row @name="Disabled">
+      <DToggleSwitch
+        @state={{this.channel.isReadOnly}}
+        {{on "click" this.toggleDisabled}}
+      />
+    </Styleguide::Controls::Row>
+    <Styleguide::Controls::Row @name="Sending">
+      <DToggleSwitch
+        @state={{this.chatChannelPane.sending}}
+        {{on "click" this.toggleSending}}
+      />
+    </Styleguide::Controls::Row>
+  </Styleguide::Controls>
+</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-composer.js b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-composer.js
new file mode 100644
index 00000000000..ef2bd88ac60
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-composer.js
@@ -0,0 +1,31 @@
+import Component from "@glimmer/component";
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+import { CHANNEL_STATUSES } from "discourse/plugins/chat/discourse/models/chat-channel";
+
+export default class ChatStyleguideChatComposer extends Component {
+  @service chatChannelComposer;
+  @service chatChannelPane;
+
+  channel = fabricators.channel({ id: -999 });
+
+  @action
+  toggleDisabled() {
+    if (this.channel.status === CHANNEL_STATUSES.open) {
+      this.channel.status = CHANNEL_STATUSES.readOnly;
+    } else {
+      this.channel.status = CHANNEL_STATUSES.open;
+    }
+  }
+
+  @action
+  toggleSending() {
+    this.chatChannelPane.sending = !this.chatChannelPane.sending;
+  }
+
+  @action
+  onSendMessage() {
+    this.chatChannelComposer.reset();
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-header-icon.hbs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-header-icon.hbs
new file mode 100644
index 00000000000..373008cf8fb
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-header-icon.hbs
@@ -0,0 +1,59 @@
+<StyleguideExample @title="<Chat::Header::Icon>">
+  <Styleguide::Component>
+    <header
+      class="d-header"
+      style="display: flex; align-items: center; justify-content: center;"
+    >
+      <ul class="d-header-icons">
+        <li class="header-dropdown-toggle chat-header-icon">
+          <Chat::Header::Icon
+            @isActive={{this.isActive}}
+            @currentUserInDnD={{this.currentUserInDnD}}
+            @unreadCount={{this.unreadCount}}
+            @urgentCount={{this.urgentCount}}
+            @indicatorPreference={{this.indicatorPreference}}
+          />
+        </li>
+      </ul>
+    </header>
+  </Styleguide::Component>
+
+  <Styleguide::Controls>
+    <Styleguide::Controls::Row @name="isActive">
+      <DToggleSwitch
+        @state={{this.isActive}}
+        {{on "click" this.toggleIsActive}}
+      />
+    </Styleguide::Controls::Row>
+    <Styleguide::Controls::Row @name="currentUserInDnD">
+      <DToggleSwitch
+        @state={{this.currentUserInDnD}}
+        {{on "click" this.toggleCurrentUserInDnD}}
+      />
+    </Styleguide::Controls::Row>
+  </Styleguide::Controls>
+  <Styleguide::Controls::Row @name="Unread count">
+    <input
+      type="number"
+      {{on "input" this.updateUnreadCount}}
+      value={{this.unreadCount}}
+    />
+  </Styleguide::Controls::Row>
+  <Styleguide::Controls::Row @name="Urgent count">
+    <input
+      type="number"
+      {{on "input" this.updateUrgentCount}}
+      value={{this.urgentCount}}
+    />
+  </Styleguide::Controls::Row>
+  <Styleguide::Controls::Row @name="Indicator preference">
+    <ComboBox
+      @value={{this.indicatorPreference}}
+      @content={{this.indicatorPreferences}}
+      @onChange={{this.updateIndicatorPreference}}
+      @valueProperty={{null}}
+      @nameProperty={{null}}
+    />
+
+  </Styleguide::Controls::Row>
+</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-header-icon.js b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-header-icon.js
new file mode 100644
index 00000000000..b0135656656
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-header-icon.js
@@ -0,0 +1,49 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import {
+  HEADER_INDICATOR_PREFERENCE_ALL_NEW,
+  HEADER_INDICATOR_PREFERENCE_DM_AND_MENTIONS,
+  HEADER_INDICATOR_PREFERENCE_NEVER,
+} from "discourse/plugins/chat/discourse/controllers/preferences-chat";
+import { tracked } from "@glimmer/tracking";
+
+export default class ChatStyleguideChatHeaderIcon extends Component {
+  @tracked isActive = false;
+  @tracked currentUserInDnD = false;
+  @tracked urgentCount;
+  @tracked unreadCount;
+  @tracked indicatorPreference = HEADER_INDICATOR_PREFERENCE_ALL_NEW;
+
+  get indicatorPreferences() {
+    return [
+      HEADER_INDICATOR_PREFERENCE_ALL_NEW,
+      HEADER_INDICATOR_PREFERENCE_DM_AND_MENTIONS,
+      HEADER_INDICATOR_PREFERENCE_NEVER,
+    ];
+  }
+
+  @action
+  toggleIsActive() {
+    this.isActive = !this.isActive;
+  }
+
+  @action
+  toggleCurrentUserInDnD() {
+    this.currentUserInDnD = !this.currentUserInDnD;
+  }
+
+  @action
+  updateUnreadCount(event) {
+    this.unreadCount = event.target.value;
+  }
+
+  @action
+  updateUrgentCount(event) {
+    this.urgentCount = event.target.value;
+  }
+
+  @action
+  updateIndicatorPreference(value) {
+    this.indicatorPreference = value;
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-message-mention-warning.hbs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-message-mention-warning.hbs
new file mode 100644
index 00000000000..76a5d861bb2
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-message-mention-warning.hbs
@@ -0,0 +1,35 @@
+<StyleguideExample @title="<Chat::Message::MentionWarning>">
+  <Styleguide::Component>
+    <Chat::Message::MentionWarning @message={{this.message}} />
+  </Styleguide::Component>
+  <Styleguide::Controls::Row @name="Cannot see">
+    <DToggleSwitch
+      @state={{gt this.message.mentionWarning.cannotSee.length 0}}
+      {{on "click" this.toggleCannotSee}}
+    />
+  </Styleguide::Controls::Row>
+  <Styleguide::Controls::Row @name="Group with mentions disabled">
+    <DToggleSwitch
+      @state={{gt
+        this.message.mentionWarning.groupWithMentionsDisabled.length
+        0
+      }}
+      {{on "click" this.toggleGroupWithMentionsDisabled}}
+    />
+  </Styleguide::Controls::Row>
+  <Styleguide::Controls::Row @name="Group with too many members">
+    <DToggleSwitch
+      @state={{gt
+        this.message.mentionWarning.groupsWithTooManyMembers.length
+        0
+      }}
+      {{on "click" this.toggleGroupsWithTooManyMembers}}
+    />
+  </Styleguide::Controls::Row>
+  <Styleguide::Controls::Row @name="Without membership">
+    <DToggleSwitch
+      @state={{gt this.message.mentionWarning.withoutMembership.length 0}}
+      {{on "click" this.toggleWithoutMembership}}
+    />
+  </Styleguide::Controls::Row>
+</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-message-mention-warning.js b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-message-mention-warning.js
new file mode 100644
index 00000000000..4b22bae1138
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-message-mention-warning.js
@@ -0,0 +1,75 @@
+import Component from "@glimmer/component";
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+
+export default class ChatMessageMentionWarning extends Component {
+  @service currentUser;
+
+  constructor() {
+    super(...arguments);
+    this.message = fabricators.message({ user: this.currentUser });
+  }
+
+  @action
+  toggleCannotSee() {
+    if (this.message.mentionWarning?.cannotSee) {
+      this.message.mentionWarning = null;
+    } else {
+      this.message.mentionWarning = fabricators.messageMentionWarning(
+        this.message,
+        {
+          cannot_see: [fabricators.user({ username: "bob" })].map((u) => {
+            return { username: u.username, id: u.id };
+          }),
+        }
+      );
+    }
+  }
+
+  @action
+  toggleGroupWithMentionsDisabled() {
+    if (this.message.mentionWarning?.groupWithMentionsDisabled) {
+      this.message.mentionWarning = null;
+    } else {
+      this.message.mentionWarning = fabricators.messageMentionWarning(
+        this.message,
+        {
+          group_mentions_disabled: [fabricators.group()].mapBy("name"),
+        }
+      );
+    }
+  }
+
+  @action
+  toggleGroupsWithTooManyMembers() {
+    if (this.message.mentionWarning?.groupsWithTooManyMembers) {
+      this.message.mentionWarning = null;
+    } else {
+      this.message.mentionWarning = fabricators.messageMentionWarning(
+        this.message,
+        {
+          groups_with_too_many_members: [
+            fabricators.group(),
+            fabricators.group({ name: "Moderators" }),
+          ].mapBy("name"),
+        }
+      );
+    }
+  }
+  @action
+  toggleWithoutMembership() {
+    if (this.message.mentionWarning?.withoutMembership) {
+      this.message.mentionWarning = null;
+    } else {
+      this.message.mentionWarning = fabricators.messageMentionWarning(
+        this.message,
+        {
+          without_membership: [fabricators.user()].map((u) => {
+            return { username: u.username, id: u.id };
+          }),
+        }
+      );
+    }
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-message.hbs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-message.hbs
new file mode 100644
index 00000000000..58b6f536db6
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-message.hbs
@@ -0,0 +1,49 @@
+<StyleguideExample @title="<ChatMessage>">
+  <Styleguide::Component>
+    <ChatMessage @message={{this.message}} @context="channel" />
+  </Styleguide::Component>
+
+  <Styleguide::Controls>
+    <Styleguide::Controls::Row @name="Last Visit">
+      <DToggleSwitch
+        @state={{this.message.newest}}
+        {{on "click" this.toggleLastVisit}}
+      />
+    </Styleguide::Controls::Row>
+    <Styleguide::Controls::Row @name="Deleted">
+      <DToggleSwitch
+        @state={{not (not this.message.deletedAt)}}
+        {{on "click" this.toggleDeleted}}
+      />
+    </Styleguide::Controls::Row>
+    <Styleguide::Controls::Row @name="Bookmark">
+      <DToggleSwitch
+        @state={{not (not this.message.bookmark)}}
+        {{on "click" this.toggleBookmarked}}
+      />
+    </Styleguide::Controls::Row>
+    <Styleguide::Controls::Row @name="Thread">
+      <DToggleSwitch
+        @state={{not (not this.message.thread)}}
+        {{on "click" this.toggleThread}}
+      />
+    </Styleguide::Controls::Row>
+    <Styleguide::Controls::Row @name="Reactions">
+      <DToggleSwitch
+        @state={{not (not this.message.reactions)}}
+        {{on "click" this.toggleReaction}}
+      />
+    </Styleguide::Controls::Row>
+    <Styleguide::Controls::Row @name="Upload">
+      <DToggleSwitch
+        @state={{not (not this.message.uploads)}}
+        {{on "click" this.toggleUpload}}
+      />
+    </Styleguide::Controls::Row>
+    <Styleguide::Controls::Row @name="Message">
+      <textarea
+        {{on "input" this.updateMessage}}
+      >{{this.message.message}}</textarea>
+    </Styleguide::Controls::Row>
+  </Styleguide::Controls>
+</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-message.js b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-message.js
new file mode 100644
index 00000000000..0d471a6fa2e
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-message.js
@@ -0,0 +1,92 @@
+import Component from "@glimmer/component";
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
+import { action } from "@ember/object";
+import ChatMessagesManager from "discourse/plugins/chat/discourse/lib/chat-messages-manager";
+import { getOwner } from "discourse-common/lib/get-owner";
+import { inject as service } from "@ember/service";
+
+export default class ChatStyleguideChatMessage extends Component {
+  @service currentUser;
+
+  manager = new ChatMessagesManager(getOwner(this));
+
+  constructor() {
+    super(...arguments);
+    this.message = fabricators.message({ user: this.currentUser });
+    this.message.cook();
+  }
+
+  @action
+  toggleDeleted() {
+    if (this.message.deletedAt) {
+      this.message.deletedAt = null;
+    } else {
+      this.message.deletedAt = moment();
+    }
+  }
+
+  @action
+  toggleBookmarked() {
+    if (this.message.bookmark) {
+      this.message.bookmark = null;
+    } else {
+      this.message.bookmark = fabricators.bookmark();
+    }
+  }
+
+  @action
+  toggleHighlighted() {
+    this.message.highlighted = !this.message.highlighted;
+  }
+
+  @action
+  toggleEdited() {
+    this.message.edited = !this.message.edited;
+  }
+
+  @action
+  toggleLastVisit() {
+    this.message.newest = !this.message.newest;
+  }
+
+  @action
+  toggleThread() {
+    if (this.message.thread) {
+      this.message.channel.threadingEnabled = false;
+      this.message.thread = null;
+    } else {
+      this.message.thread = fabricators.thread({
+        channel: this.message.channel,
+      });
+      this.message.thread.preview.replyCount = 1;
+      this.message.channel.threadingEnabled = true;
+    }
+  }
+
+  @action
+  async updateMessage(event) {
+    this.message.message = event.target.value;
+    await this.message.cook();
+  }
+
+  @action
+  toggleReaction() {
+    if (this.message.reactions?.length) {
+      this.message.reactions = [];
+    } else {
+      this.message.reactions = [
+        fabricators.reaction({ emoji: "heart" }),
+        fabricators.reaction({ emoji: "rocket", reacted: true }),
+      ];
+    }
+  }
+
+  @action
+  toggleUpload() {
+    if (this.message.uploads?.length) {
+      this.message.uploads = [];
+    } else {
+      this.message.uploads = [fabricators.upload(), fabricators.upload()];
+    }
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-archive-channel.hbs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-archive-channel.hbs
new file mode 100644
index 00000000000..d2409d2f27c
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-archive-channel.hbs
@@ -0,0 +1,5 @@
+<StyleguideExample @title="<Chat::Modal::ArchiveChannel>">
+  <Styleguide::Controls::Row>
+    <DButton @translatedLabel="Open modal" @action={{this.openModal}} />
+  </Styleguide::Controls::Row>
+</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-archive-channel.js b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-archive-channel.js
new file mode 100644
index 00000000000..57bcb49834a
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-archive-channel.js
@@ -0,0 +1,20 @@
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+import ChatModalArchiveChannel from "discourse/plugins/chat/discourse/components/chat/modal/archive-channel";
+import Component from "@glimmer/component";
+
+export default class ChatStyleguideChatModalArchiveChannel extends Component {
+  @service modal;
+
+  channel = fabricators.channel();
+
+  @action
+  openModal() {
+    return this.modal.show(ChatModalArchiveChannel, {
+      model: {
+        channel: this.channel,
+      },
+    });
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-channel-summary.hbs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-channel-summary.hbs
new file mode 100644
index 00000000000..099820a0a0f
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-channel-summary.hbs
@@ -0,0 +1,5 @@
+<StyleguideExample @title="<Chat::Modal::ChannelSummary>">
+  <Styleguide::Controls::Row>
+    <DButton @translatedLabel="Open modal" @action={{this.openModal}} />
+  </Styleguide::Controls::Row>
+</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-channel-summary.js b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-channel-summary.js
new file mode 100644
index 00000000000..79008022af7
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-channel-summary.js
@@ -0,0 +1,16 @@
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
+import Component from "@glimmer/component";
+import ChatModalChannelSummary from "discourse/plugins/chat/discourse/components/chat/modal/channel-summary";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+
+export default class ChatStyleguideChatModalChannelSummary extends Component {
+  @service modal;
+
+  @action
+  openModal() {
+    return this.modal.show(ChatModalChannelSummary, {
+      model: { channelId: fabricators.channel().id },
+    });
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-create-channel.hbs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-create-channel.hbs
new file mode 100644
index 00000000000..e2747d289e6
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-create-channel.hbs
@@ -0,0 +1,5 @@
+<StyleguideExample @title="<Chat::Modal::CreateChannel>">
+  <Styleguide::Controls::Row>
+    <DButton @translatedLabel="Open modal" @action={{this.openModal}} />
+  </Styleguide::Controls::Row>
+</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-create-channel.js b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-create-channel.js
new file mode 100644
index 00000000000..3d37663d555
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-create-channel.js
@@ -0,0 +1,13 @@
+import Component from "@glimmer/component";
+import ChatModalCreateChannel from "discourse/plugins/chat/discourse/components/chat/modal/create-channel";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+
+export default class ChatStyleguideChatModalCreateChannel extends Component {
+  @service modal;
+
+  @action
+  openModal() {
+    return this.modal.show(ChatModalCreateChannel);
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-delete-channel.hbs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-delete-channel.hbs
new file mode 100644
index 00000000000..f9787048ce6
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-delete-channel.hbs
@@ -0,0 +1,5 @@
+<StyleguideExample @title="<Chat::Modal::DeleteChannel>">
+  <Styleguide::Controls::Row>
+    <DButton @translatedLabel="Open modal" @action={{this.openModal}} />
+  </Styleguide::Controls::Row>
+</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-delete-channel.js b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-delete-channel.js
new file mode 100644
index 00000000000..02bba90987b
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-delete-channel.js
@@ -0,0 +1,18 @@
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+import ChatModalDeleteChannel from "discourse/plugins/chat/discourse/components/chat/modal/delete-channel";
+import Component from "@glimmer/component";
+
+export default class ChatStyleguideChatModalDeleteChannel extends Component {
+  @service modal;
+
+  channel = fabricators.channel();
+
+  @action
+  openModal() {
+    return this.modal.show(ChatModalDeleteChannel, {
+      model: { channel: this.channel },
+    });
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-description.hbs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-description.hbs
new file mode 100644
index 00000000000..b7d5dcc2804
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-description.hbs
@@ -0,0 +1,5 @@
+<StyleguideExample @title="<Chat::Modal::EditChannelDescription>">
+  <Styleguide::Controls::Row>
+    <DButton @translatedLabel="Open modal" @action={{this.openModal}} />
+  </Styleguide::Controls::Row>
+</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-description.js b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-description.js
new file mode 100644
index 00000000000..018108bc2c7
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-description.js
@@ -0,0 +1,18 @@
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+import ChatModalEditChannelDescription from "discourse/plugins/chat/discourse/components/chat/modal/edit-channel-description";
+import Component from "@glimmer/component";
+
+export default class ChatStyleguideChatModalEditChannelDescription extends Component {
+  @service modal;
+
+  channel = fabricators.channel();
+
+  @action
+  openModal() {
+    return this.modal.show(ChatModalEditChannelDescription, {
+      model: this.channel,
+    });
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-name.hbs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-name.hbs
new file mode 100644
index 00000000000..5a40bff03cd
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-name.hbs
@@ -0,0 +1,5 @@
+<StyleguideExample @title="<Chat::Modal::EditChannelName>">
+  <Styleguide::Controls::Row>
+    <DButton @translatedLabel="Open modal" @action={{this.openModal}} />
+  </Styleguide::Controls::Row>
+</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-name.js b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-name.js
new file mode 100644
index 00000000000..7e9770840ba
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-name.js
@@ -0,0 +1,18 @@
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+import ChatModalEditChannelName from "discourse/plugins/chat/discourse/components/chat/modal/edit-channel-name";
+import Component from "@glimmer/component";
+
+export default class ChatStyleguideChatModalEditChannelName extends Component {
+  @service modal;
+
+  channel = fabricators.channel();
+
+  @action
+  openModal() {
+    return this.modal.show(ChatModalEditChannelName, {
+      model: this.channel,
+    });
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-move-message-to-channel.hbs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-move-message-to-channel.hbs
new file mode 100644
index 00000000000..e508bd7810a
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-move-message-to-channel.hbs
@@ -0,0 +1,5 @@
+<StyleguideExample @title="<Chat::Modal::MoveMessageToChannel>">
+  <Styleguide::Controls::Row>
+    <DButton @translatedLabel="Open modal" @action={{this.openModal}} />
+  </Styleguide::Controls::Row>
+</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-move-message-to-channel.js b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-move-message-to-channel.js
new file mode 100644
index 00000000000..513dda5dcfe
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-move-message-to-channel.js
@@ -0,0 +1,26 @@
+import Component from "@glimmer/component";
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+import ChatModalMoveMessageToChannel from "discourse/plugins/chat/discourse/components/chat/modal/move-message-to-channel";
+
+export default class ChatStyleguideChatModalMoveMessageToChannel extends Component {
+  @service modal;
+
+  channel = fabricators.channel();
+  selectedMessageIds = [fabricators.message({ channel: this.channel })].mapBy(
+    "id"
+  );
+
+  @action
+  openModal() {
+    return this.modal.show(ChatModalMoveMessageToChannel, {
+      model: {
+        sourceChannel: this.channel,
+        selectedMessageIds: [
+          fabricators.message({ channel: this.channel }),
+        ].mapBy("id"),
+      },
+    });
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-new-message.hbs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-new-message.hbs
new file mode 100644
index 00000000000..e39c631ef7c
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-new-message.hbs
@@ -0,0 +1,5 @@
+<StyleguideExample @title="<Chat::Modal::NewMessage>">
+  <Styleguide::Controls::Row>
+    <DButton @translatedLabel="Open modal" @action={{this.openModal}} />
+  </Styleguide::Controls::Row>
+</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-new-message.js b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-new-message.js
new file mode 100644
index 00000000000..1ace191332a
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-new-message.js
@@ -0,0 +1,13 @@
+import Component from "@glimmer/component";
+import ChatModalNewMessage from "discourse/plugins/chat/discourse/components/chat/modal/new-message";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+
+export default class ChatStyleguideChatModalNewMessage extends Component {
+  @service modal;
+
+  @action
+  openModal() {
+    return this.modal.show(ChatModalNewMessage);
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-thread-settings.hbs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-thread-settings.hbs
new file mode 100644
index 00000000000..496b4784b58
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-thread-settings.hbs
@@ -0,0 +1,5 @@
+<StyleguideExample @title="<Chat::Modal::ThreadSettings>">
+  <Styleguide::Controls::Row>
+    <DButton @translatedLabel="Open modal" @action={{this.openModal}} />
+  </Styleguide::Controls::Row>
+</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-thread-settings.js b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-thread-settings.js
new file mode 100644
index 00000000000..106faef111d
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-thread-settings.js
@@ -0,0 +1,16 @@
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
+import Component from "@glimmer/component";
+import ChatModalThreadSettings from "discourse/plugins/chat/discourse/components/modal/chat/thread-settings";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+
+export default class ChatStyleguideChatModalThreadSettings extends Component {
+  @service modal;
+
+  @action
+  openModal() {
+    return this.modal.show(ChatModalThreadSettings, {
+      model: fabricators.thread(),
+    });
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-toggle-channel-status.hbs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-toggle-channel-status.hbs
new file mode 100644
index 00000000000..c11dd520807
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-toggle-channel-status.hbs
@@ -0,0 +1,5 @@
+<StyleguideExample @title="<Chat::Modal::ToggleChannelStatus>">
+  <Styleguide::Controls::Row>
+    <DButton @translatedLabel="Open modal" @action={{this.openModal}} />
+  </Styleguide::Controls::Row>
+</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-toggle-channel-status.js b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-toggle-channel-status.js
new file mode 100644
index 00000000000..afd29aab914
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-toggle-channel-status.js
@@ -0,0 +1,16 @@
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
+import Component from "@glimmer/component";
+import ChatModalToggleChannelStatus from "discourse/plugins/chat/discourse/components/chat/modal/toggle-channel-status";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+
+export default class ChatStyleguideChatModalToggleChannelStatus extends Component {
+  @service modal;
+
+  @action
+  openModal() {
+    return this.modal.show(ChatModalToggleChannelStatus, {
+      model: fabricators.channel(),
+    });
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-thread-list-item.hbs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-thread-list-item.hbs
new file mode 100644
index 00000000000..d6ceaf4ae31
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-thread-list-item.hbs
@@ -0,0 +1,5 @@
+<StyleguideExample @title="<Chat::ThreadList::Item>">
+  <Styleguide::Component>
+    <Chat::ThreadList::Item @thread={{this.thread}} />
+  </Styleguide::Component>
+</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-thread-list-item.js b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-thread-list-item.js
new file mode 100644
index 00000000000..b6108bb0271
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-thread-list-item.js
@@ -0,0 +1,9 @@
+import Component from "@glimmer/component";
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
+import { inject as service } from "@ember/service";
+
+export default class ChatStyleguideChatThreadListItem extends Component {
+  @service currentUser;
+
+  thread = fabricators.thread();
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/organisms/chat.hbs b/plugins/chat/assets/javascripts/discourse/components/styleguide/organisms/chat.hbs
new file mode 100644
index 00000000000..e883457235a
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/organisms/chat.hbs
@@ -0,0 +1,19 @@
+<Styleguide::ChatMessage />
+<Styleguide::ChatComposer />
+<Styleguide::ChatThreadListItem />
+<Styleguide::ChatComposerMessageDetails />
+<Styleguide::ChatHeaderIcon />
+<Styleguide::ChatMessageMentionWarning />
+
+<h2>Modals</h2>
+
+<Styleguide::ChatModalArchiveChannel />
+<Styleguide::ChatModalMoveMessageToChannel />
+<Styleguide::ChatModalDeleteChannel />
+<Styleguide::ChatModalEditChannelDescription />
+<Styleguide::ChatModalEditChannelName />
+<Styleguide::ChatModalThreadSettings />
+<Styleguide::ChatModalCreateChannel />
+<Styleguide::ChatModalToggleChannelStatus />
+<Styleguide::ChatModalNewMessage />
+<Styleguide::ChatModalChannelSummary />
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/user-card-chat-button.hbs b/plugins/chat/assets/javascripts/discourse/components/user-card-chat-button.hbs
deleted file mode 100644
index 764aa1ae8e6..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/user-card-chat-button.hbs
+++ /dev/null
@@ -1,8 +0,0 @@
-{{#if this.chat.userCanDirectMessage}}
-  <DButton
-    @class="btn-primary user-card-chat-btn"
-    @action={{action "startChatting"}}
-    @label="chat.title_capitalized"
-    @icon="comment"
-  />
-{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/user-card-chat-button.js b/plugins/chat/assets/javascripts/discourse/components/user-card-chat-button.js
deleted file mode 100644
index 8d9f7d40ca3..00000000000
--- a/plugins/chat/assets/javascripts/discourse/components/user-card-chat-button.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import Component from "@ember/component";
-import { action } from "@ember/object";
-import { inject as service } from "@ember/service";
-
-export default class UserCardChatButton extends Component {
-  @service chat;
-
-  @action
-  startChatting() {
-    this.chat
-      .upsertDmChannelForUsernames([this.user.username])
-      .then((chatChannel) => {
-        this.chat.openChannel(chatChannel);
-        this.appEvents.trigger("card:close");
-      });
-  }
-}
diff --git a/plugins/chat/assets/javascripts/discourse/connectors/below-footer/chat-channel-message-emoji-picker-connector.hbs b/plugins/chat/assets/javascripts/discourse/connectors/below-footer/chat-channel-message-emoji-picker-connector.hbs
new file mode 100644
index 00000000000..f99d5cc1a02
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/connectors/below-footer/chat-channel-message-emoji-picker-connector.hbs
@@ -0,0 +1 @@
+<ChatChannelMessageEmojiPicker />
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/connectors/below-footer/chat-message-actions-desktop-outlet.hbs b/plugins/chat/assets/javascripts/discourse/connectors/below-footer/chat-message-actions-desktop-outlet.hbs
new file mode 100644
index 00000000000..fb4d97e44ae
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/connectors/below-footer/chat-message-actions-desktop-outlet.hbs
@@ -0,0 +1 @@
+<ChatMessageActionsDesktop />
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/connectors/below-footer/chat-message-actions-mobile-outlet.hbs b/plugins/chat/assets/javascripts/discourse/connectors/below-footer/chat-message-actions-mobile-outlet.hbs
new file mode 100644
index 00000000000..496de999995
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/connectors/below-footer/chat-message-actions-mobile-outlet.hbs
@@ -0,0 +1 @@
+<ChatMessageActionsMobile />
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/connectors/sidebar-bottom/sidebar-connector.hbs b/plugins/chat/assets/javascripts/discourse/connectors/sidebar-bottom/sidebar-connector.hbs
deleted file mode 100644
index fbc4d8f3cc5..00000000000
--- a/plugins/chat/assets/javascripts/discourse/connectors/sidebar-bottom/sidebar-connector.hbs
+++ /dev/null
@@ -1 +0,0 @@
-<SidebarChannels @toggleSection={{this.toggleSection}} />
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/connectors/user-card-below-message-button/chat-button.hbs b/plugins/chat/assets/javascripts/discourse/connectors/user-card-below-message-button/chat-button.hbs
index d60987db2ef..03a17675fa7 100644
--- a/plugins/chat/assets/javascripts/discourse/connectors/user-card-below-message-button/chat-button.hbs
+++ b/plugins/chat/assets/javascripts/discourse/connectors/user-card-below-message-button/chat-button.hbs
@@ -1,3 +1,3 @@
 {{#if this.user.can_chat_user}}
-  <UserCardChatButton @user={{this.user}} />
+  <Chat::UserCardButton @user={{this.user}} />
 {{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/connectors/user-preferences-nav/preferences-chat-link.hbs b/plugins/chat/assets/javascripts/discourse/connectors/user-preferences-nav/user-nav__preferences-chat.hbs
similarity index 56%
rename from plugins/chat/assets/javascripts/discourse/connectors/user-preferences-nav/preferences-chat-link.hbs
rename to plugins/chat/assets/javascripts/discourse/connectors/user-preferences-nav/user-nav__preferences-chat.hbs
index a00d96a6c3d..aeeef0a9a5e 100644
--- a/plugins/chat/assets/javascripts/discourse/connectors/user-preferences-nav/preferences-chat-link.hbs
+++ b/plugins/chat/assets/javascripts/discourse/connectors/user-preferences-nav/user-nav__preferences-chat.hbs
@@ -1,5 +1,6 @@
 {{#if (or this.model.can_chat this.currentUser.admin)}}
   <LinkTo @route="preferences.chat">
-    {{i18n "chat.title_capitalized"}}
+    {{d-icon "d-chat"}}
+    <span>{{i18n "chat.title_capitalized"}}</span>
   </LinkTo>
 {{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-archive-modal.js b/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-archive-modal.js
deleted file mode 100644
index d46a9f241d0..00000000000
--- a/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-archive-modal.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import Controller from "@ember/controller";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-
-export default class ChatChannelArchiveModalController extends Controller.extend(
-  ModalFunctionality
-) {
-  chatChannel = null;
-}
diff --git a/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-edit-description.js b/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-edit-description.js
deleted file mode 100644
index 85e834963ae..00000000000
--- a/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-edit-description.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import Controller from "@ember/controller";
-import { action, computed } from "@ember/object";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import { inject as service } from "@ember/service";
-
-export default class ChatChannelEditDescriptionController extends Controller.extend(
-  ModalFunctionality
-) {
-  @service chatApi;
-  editedDescription = "";
-
-  @computed("model.description", "editedDescription")
-  get isSaveDisabled() {
-    return (
-      this.model.description === this.editedDescription ||
-      this.editedDescription?.length > 280
-    );
-  }
-
-  onShow() {
-    this.set("editedDescription", this.model.description || "");
-  }
-
-  onClose() {
-    this.set("editedDescription", "");
-    this.clearFlash();
-  }
-
-  @action
-  onSaveChatChannelDescription() {
-    return this.chatApi
-      .updateChannel(this.model.id, {
-        description: this.editedDescription,
-      })
-      .then((result) => {
-        this.model.set("description", result.channel.description);
-        this.send("closeModal");
-      })
-      .catch((event) => {
-        if (event.jqXHR?.responseJSON?.errors) {
-          this.flash(event.jqXHR.responseJSON.errors.join("\n"), "error");
-        }
-      });
-  }
-
-  @action
-  onChangeChatChannelDescription(description) {
-    this.clearFlash();
-    this.set("editedDescription", description);
-  }
-}
diff --git a/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-edit-name.js b/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-edit-name.js
deleted file mode 100644
index fcba0d77118..00000000000
--- a/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-edit-name.js
+++ /dev/null
@@ -1,50 +0,0 @@
-import Controller from "@ember/controller";
-import { action, computed } from "@ember/object";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import { inject as service } from "@ember/service";
-export default class ChatChannelEditTitleController extends Controller.extend(
-  ModalFunctionality
-) {
-  @service chatApi;
-  editedName = "";
-
-  @computed("model.title", "editedName")
-  get isSaveDisabled() {
-    return (
-      this.model.title === this.editedName ||
-      this.editedName?.length > this.siteSettings.max_topic_title_length
-    );
-  }
-
-  onShow() {
-    this.set("editedName", this.model.title || "");
-  }
-
-  onClose() {
-    this.set("editedName", "");
-    this.clearFlash();
-  }
-
-  @action
-  onSaveChatChannelName() {
-    return this.chatApi
-      .updateChannel(this.model.id, {
-        name: this.editedName,
-      })
-      .then((result) => {
-        this.model.set("title", result.channel.title);
-        this.send("closeModal");
-      })
-      .catch((event) => {
-        if (event.jqXHR?.responseJSON?.errors) {
-          this.flash(event.jqXHR.responseJSON.errors.join("\n"), "error");
-        }
-      });
-  }
-
-  @action
-  onChangeChatChannelName(title) {
-    this.clearFlash();
-    this.set("editedName", title);
-  }
-}
diff --git a/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-info-about.js b/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-info-about.js
index 73514a7bd6d..8748478788f 100644
--- a/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-info-about.js
+++ b/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-info-about.js
@@ -1,19 +1,25 @@
 import Controller from "@ember/controller";
 import { action } from "@ember/object";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
-import showModal from "discourse/lib/show-modal";
+import { inject as service } from "@ember/service";
+import ChatModalEditChannelDescription from "discourse/plugins/chat/discourse/components/chat/modal/edit-channel-description";
+import ChatModalEditChannelName from "discourse/plugins/chat/discourse/components/chat/modal/edit-channel-name";
 
 export default class ChatChannelInfoAboutController extends Controller.extend(
   ModalFunctionality
 ) {
+  @service modal;
+
   @action
   onEditChatChannelName() {
-    showModal("chat-channel-edit-name", { model: this.model });
+    return this.modal.show(ChatModalEditChannelName, {
+      model: this.model,
+    });
   }
 
   @action
   onEditChatChannelDescription() {
-    showModal("chat-channel-edit-description", {
+    return this.modal.show(ChatModalEditChannelDescription, {
       model: this.model,
     });
   }
diff --git a/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-selector-modal.js b/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-selector-modal.js
deleted file mode 100644
index ac07dd24838..00000000000
--- a/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-selector-modal.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import Controller from "@ember/controller";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import { action } from "@ember/object";
-
-export default class ChatChannelSelectorModalController extends Controller.extend(
-  ModalFunctionality
-) {
-  @action
-  closeSelf() {
-    this.send("closeModal");
-  }
-}
diff --git a/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-thread.js b/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-thread.js
new file mode 100644
index 00000000000..f4c56aceb46
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-thread.js
@@ -0,0 +1,9 @@
+import Controller from "@ember/controller";
+import { inject as service } from "@ember/service";
+import { tracked } from "@glimmer/tracking";
+
+export default class ChatChannelThreadController extends Controller {
+  @service chat;
+
+  @tracked targetMessageId = null;
+}
diff --git a/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-toggle.js b/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-toggle.js
deleted file mode 100644
index e3dfaf5a613..00000000000
--- a/plugins/chat/assets/javascripts/discourse/controllers/chat-channel-toggle.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import Controller from "@ember/controller";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import { action } from "@ember/object";
-import { inject as service } from "@ember/service";
-
-export default class ChatChannelToggleController extends Controller.extend(
-  ModalFunctionality
-) {
-  @service chat;
-
-  chatChannel = null;
-
-  @action
-  channelStatusChanged(channel) {
-    this.send("closeModal");
-    this.chat.openChannel(channel);
-  }
-}
diff --git a/plugins/chat/assets/javascripts/discourse/controllers/chat-channel.js b/plugins/chat/assets/javascripts/discourse/controllers/chat-channel.js
index 75d4a3b4ee9..7984545c101 100644
--- a/plugins/chat/assets/javascripts/discourse/controllers/chat-channel.js
+++ b/plugins/chat/assets/javascripts/discourse/controllers/chat-channel.js
@@ -1,14 +1,12 @@
 import Controller from "@ember/controller";
-import { action } from "@ember/object";
 import { inject as service } from "@ember/service";
+import { tracked } from "@glimmer/tracking";
 
 export default class ChatChannelController extends Controller {
   @service chat;
 
-  queryParams = ["messageId"];
+  @tracked targetMessageId = null;
 
-  @action
-  switchChannel(channel) {
-    this.chat.openChannel(channel);
-  }
+  // Backwards-compatibility
+  queryParams = ["messageId"];
 }
diff --git a/plugins/chat/assets/javascripts/discourse/controllers/chat-draft-channel.js b/plugins/chat/assets/javascripts/discourse/controllers/chat-draft-channel.js
index 162d6a72ef7..2f7f827d27f 100644
--- a/plugins/chat/assets/javascripts/discourse/controllers/chat-draft-channel.js
+++ b/plugins/chat/assets/javascripts/discourse/controllers/chat-draft-channel.js
@@ -1,12 +1,6 @@
 import Controller from "@ember/controller";
-import { action } from "@ember/object";
 import { inject as service } from "@ember/service";
 
 export default class ChatDraftChannelController extends Controller {
   @service chat;
-
-  @action
-  onSwitchChannel(channel) {
-    return this.chat.openChannel(channel);
-  }
 }
diff --git a/plugins/chat/assets/javascripts/discourse/controllers/chat-index.js b/plugins/chat/assets/javascripts/discourse/controllers/chat-index.js
index fd2b50ff962..4a8fb8178cf 100644
--- a/plugins/chat/assets/javascripts/discourse/controllers/chat-index.js
+++ b/plugins/chat/assets/javascripts/discourse/controllers/chat-index.js
@@ -1,12 +1,6 @@
 import Controller from "@ember/controller";
-import { action } from "@ember/object";
 import { inject as service } from "@ember/service";
 
 export default class ChatIndexController extends Controller {
   @service chat;
-
-  @action
-  selectChannel(channel) {
-    return this.chat.openChannel(channel);
-  }
 }
diff --git a/plugins/chat/assets/javascripts/discourse/controllers/chat-message-move-to-channel-modal.js b/plugins/chat/assets/javascripts/discourse/controllers/chat-message-move-to-channel-modal.js
deleted file mode 100644
index 86ebd1e8ab4..00000000000
--- a/plugins/chat/assets/javascripts/discourse/controllers/chat-message-move-to-channel-modal.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import Controller from "@ember/controller";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-
-export default class ChatMessageMoveToChannelModalController extends Controller.extend(
-  ModalFunctionality
-) {
-  chatChannel = null;
-}
diff --git a/plugins/chat/assets/javascripts/discourse/controllers/chat.js b/plugins/chat/assets/javascripts/discourse/controllers/chat.js
index 1ea1e5a478a..888996dd833 100644
--- a/plugins/chat/assets/javascripts/discourse/controllers/chat.js
+++ b/plugins/chat/assets/javascripts/discourse/controllers/chat.js
@@ -3,6 +3,8 @@ import { inject as service } from "@ember/service";
 
 export default class ChatController extends Controller {
   @service chat;
+  @service chatStateManager;
+  @service router;
 
   get shouldUseChatSidebar() {
     if (this.site.mobileView) {
@@ -19,4 +21,21 @@ export default class ChatController extends Controller {
   get shouldUseCoreSidebar() {
     return this.siteSettings.navigation_menu === "sidebar";
   }
+
+  get mainOutletModifierClasses() {
+    let modifierClasses = [];
+
+    if (this.chatStateManager.isSidePanelExpanded) {
+      modifierClasses.push("has-side-panel-expanded");
+    }
+
+    if (
+      !this.router.currentRouteName.startsWith("chat.channel.info") &&
+      !this.router.currentRouteName.startsWith("chat.browse")
+    ) {
+      modifierClasses.push("chat-view");
+    }
+
+    return modifierClasses.join(" ");
+  }
 }
diff --git a/plugins/chat/assets/javascripts/discourse/controllers/create-channel.js b/plugins/chat/assets/javascripts/discourse/controllers/create-channel.js
deleted file mode 100644
index ff24ba44d4d..00000000000
--- a/plugins/chat/assets/javascripts/discourse/controllers/create-channel.js
+++ /dev/null
@@ -1,171 +0,0 @@
-import { escapeExpression } from "discourse/lib/utilities";
-import Controller from "@ember/controller";
-import I18n from "I18n";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-import { action, computed } from "@ember/object";
-import { gt, notEmpty } from "@ember/object/computed";
-import { inject as service } from "@ember/service";
-import { isBlank } from "@ember/utils";
-import { htmlSafe } from "@ember/template";
-
-const DEFAULT_HINT = htmlSafe(
-  I18n.t("chat.create_channel.choose_category.default_hint", {
-    link: "/categories",
-    category: "category",
-  })
-);
-
-export default class CreateChannelController extends Controller.extend(
-  ModalFunctionality
-) {
-  @service chat;
-  @service dialog;
-  @service chatChannelsManager;
-  @service chatApi;
-
-  category = null;
-  categoryId = null;
-  name = "";
-  description = "";
-  categoryPermissionsHint = null;
-  autoJoinUsers = null;
-  autoJoinWarning = "";
-
-  @notEmpty("category") categorySelected;
-  @gt("siteSettings.max_chat_auto_joined_users", 0) autoJoinAvailable;
-
-  @computed("categorySelected", "name")
-  get createDisabled() {
-    return !this.categorySelected || isBlank(this.name);
-  }
-
-  onShow() {
-    this.set("categoryPermissionsHint", DEFAULT_HINT);
-  }
-
-  onClose() {
-    this.setProperties({
-      categoryId: null,
-      category: null,
-      name: "",
-      description: "",
-      categoryPermissionsHint: DEFAULT_HINT,
-      autoJoinWarning: "",
-    });
-  }
-
-  _createChannel() {
-    const data = {
-      chatable_id: this.categoryId,
-      name: this.name,
-      description: this.description,
-      auto_join_users: this.autoJoinUsers,
-    };
-
-    return this.chatApi
-      .createChannel(data)
-      .then((channel) => {
-        this.send("closeModal");
-        this.chatChannelsManager.follow(channel);
-        this.chat.openChannel(channel);
-      })
-      .catch((e) => {
-        this.flash(e.jqXHR.responseJSON.errors[0], "error");
-      });
-  }
-
-  _buildCategorySlug(category) {
-    const parent = category.parentCategory;
-
-    if (parent) {
-      return `${this._buildCategorySlug(parent)}/${category.slug}`;
-    } else {
-      return category.slug;
-    }
-  }
-
-  _updateAutoJoinConfirmWarning(category, catPermissions) {
-    const allowedGroups = catPermissions.allowed_groups;
-
-    if (catPermissions.private) {
-      const warningTranslationKey =
-        allowedGroups.length < 3 ? "warning_groups" : "warning_multiple_groups";
-
-      this.set(
-        "autoJoinWarning",
-        I18n.t(`chat.create_channel.auto_join_users.${warningTranslationKey}`, {
-          members_count: catPermissions.members_count,
-          group: escapeExpression(allowedGroups[0]),
-          group_2: escapeExpression(allowedGroups[1]),
-          count: allowedGroups.length,
-        })
-      );
-    } else {
-      this.set(
-        "autoJoinWarning",
-        I18n.t(`chat.create_channel.auto_join_users.public_category_warning`, {
-          category: escapeExpression(category.name),
-        })
-      );
-    }
-  }
-
-  _updatePermissionsHint(category) {
-    if (category) {
-      const fullSlug = this._buildCategorySlug(category);
-
-      return this.chatApi
-        .categoryPermissions(category.id)
-        .then((catPermissions) => {
-          this._updateAutoJoinConfirmWarning(category, catPermissions);
-          const allowedGroups = catPermissions.allowed_groups;
-          const translationKey =
-            allowedGroups.length < 3 ? "hint_groups" : "hint_multiple_groups";
-
-          this.set(
-            "categoryPermissionsHint",
-            htmlSafe(
-              I18n.t(`chat.create_channel.choose_category.${translationKey}`, {
-                link: `/c/${escapeExpression(fullSlug)}/edit/security`,
-                hint: escapeExpression(allowedGroups[0]),
-                hint_2: escapeExpression(allowedGroups[1]),
-                count: allowedGroups.length,
-              })
-            )
-          );
-        });
-    } else {
-      this.set("categoryPermissionsHint", DEFAULT_HINT);
-      this.set("autoJoinWarning", "");
-    }
-  }
-
-  @action
-  onCategoryChange(categoryId) {
-    let category = categoryId
-      ? this.site.categories.findBy("id", categoryId)
-      : null;
-    this._updatePermissionsHint(category);
-    this.setProperties({
-      categoryId,
-      category,
-      name: this.name || category?.name || "",
-    });
-  }
-
-  @action
-  create() {
-    if (this.createDisabled) {
-      return;
-    }
-
-    if (this.autoJoinUsers) {
-      this.dialog.yesNoConfirm({
-        message: this.autoJoinWarning,
-        didConfirm: () => this._createChannel(),
-      });
-    } else {
-      this._createChannel();
-    }
-  }
-}
diff --git a/plugins/chat/assets/javascripts/discourse/controllers/preferences-chat.js b/plugins/chat/assets/javascripts/discourse/controllers/preferences-chat.js
index bf4ef8a8ae8..b5e346b62c4 100644
--- a/plugins/chat/assets/javascripts/discourse/controllers/preferences-chat.js
+++ b/plugins/chat/assets/javascripts/discourse/controllers/preferences-chat.js
@@ -13,17 +13,39 @@ const CHAT_ATTRS = [
   "ignore_channel_wide_mention",
   "chat_sound",
   "chat_email_frequency",
+  "chat_header_indicator_preference",
 ];
 
+export const HEADER_INDICATOR_PREFERENCE_NEVER = "never";
+export const HEADER_INDICATOR_PREFERENCE_DM_AND_MENTIONS = "dm_and_mentions";
+export const HEADER_INDICATOR_PREFERENCE_ALL_NEW = "all_new";
+
 const EMAIL_FREQUENCY_OPTIONS = [
   { name: I18n.t(`chat.email_frequency.never`), value: "never" },
   { name: I18n.t(`chat.email_frequency.when_away`), value: "when_away" },
 ];
 
+const HEADER_INDICATOR_OPTIONS = [
+  {
+    name: I18n.t(`chat.header_indicator_preference.all_new`),
+    value: HEADER_INDICATOR_PREFERENCE_ALL_NEW,
+  },
+  {
+    name: I18n.t(`chat.header_indicator_preference.dm_and_mentions`),
+    value: HEADER_INDICATOR_PREFERENCE_DM_AND_MENTIONS,
+  },
+  {
+    name: I18n.t(`chat.header_indicator_preference.never`),
+    value: HEADER_INDICATOR_PREFERENCE_NEVER,
+  },
+];
+
 export default class PreferencesChatController extends Controller {
   @service chatAudioManager;
+  subpageTitle = I18n.t("chat.admin.title");
 
   emailFrequencyOptions = EMAIL_FREQUENCY_OPTIONS;
+  headerIndicatorOptions = HEADER_INDICATOR_OPTIONS;
 
   @discourseComputed
   chatSounds() {
diff --git a/plugins/chat/assets/javascripts/discourse/helpers/format-chat-date.js b/plugins/chat/assets/javascripts/discourse/helpers/format-chat-date.js
index 6226d541ed1..0281c252480 100644
--- a/plugins/chat/assets/javascripts/discourse/helpers/format-chat-date.js
+++ b/plugins/chat/assets/javascripts/discourse/helpers/format-chat-date.js
@@ -4,29 +4,25 @@ import getURL from "discourse-common/lib/get-url";
 import I18n from "I18n";
 import User from "discourse/models/user";
 
-registerUnbound("format-chat-date", function (message, details, mode) {
-  let currentUser = User.current();
+registerUnbound("format-chat-date", function (message, mode) {
+  const currentUser = User.current();
+  const tz = currentUser ? currentUser.user_option.timezone : moment.tz.guess();
+  const date = moment(new Date(message.createdAt), tz);
 
-  let tz = currentUser ? currentUser.user_option.timezone : moment.tz.guess();
-
-  let date = moment(new Date(message.created_at), tz);
-
-  let url = "";
-
-  if (details) {
-    url = getURL(
-      `/chat/channel/${details.chat_channel_id}/-?messageId=${message.id}`
-    );
-  }
-
-  let title = date.format(I18n.t("dates.long_with_year"));
-
-  let display =
+  const title = date.format(I18n.t("dates.long_with_year"));
+  const display =
     mode === "tiny"
       ? date.format(I18n.t("chat.dates.time_tiny"))
       : date.format(I18n.t("dates.time"));
 
-  return htmlSafe(
-    `<a title='${title}' class='chat-time' href='${url}'>${display}</a>`
-  );
+  if (message.staged) {
+    return htmlSafe(
+      `<span title='${title}' tabindex="-1" class='chat-time'>${display}</span>`
+    );
+  } else {
+    const url = getURL(`/chat/c/-/${message.channel.id}/${message.id}`);
+    return htmlSafe(
+      `<a title='${title}' tabindex="-1" class='chat-time' href='${url}'>${display}</a>`
+    );
+  }
 });
diff --git a/plugins/chat/assets/javascripts/discourse/helpers/slugify-channel.js b/plugins/chat/assets/javascripts/discourse/helpers/slugify-channel.js
deleted file mode 100644
index adcbee709f7..00000000000
--- a/plugins/chat/assets/javascripts/discourse/helpers/slugify-channel.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import slugifyChannel from "discourse/plugins/chat/discourse/lib/slugify-channel";
-import Helper from "@ember/component/helper";
-
-export default class SlugifyChannel extends Helper {
-  compute(inputs) {
-    return slugifyChannel(inputs[0]);
-  }
-}
diff --git a/plugins/chat/assets/javascripts/discourse/initializers/chat-decorators.js b/plugins/chat/assets/javascripts/discourse/initializers/chat-decorators.js
index 360820ac785..d1564bf8cd9 100644
--- a/plugins/chat/assets/javascripts/discourse/initializers/chat-decorators.js
+++ b/plugins/chat/assets/javascripts/discourse/initializers/chat-decorators.js
@@ -1,4 +1,5 @@
-import { decorateGithubOneboxBody } from "discourse/initializers/onebox-decorators";
+import { decorateGithubOneboxBody } from "discourse/instance-initializers/onebox-decorators";
+import { decorateHashtags } from "discourse/lib/hashtag-autocomplete";
 import { withPluginApi } from "discourse/lib/plugin-api";
 import highlightSyntax from "discourse/lib/highlight-syntax";
 import I18n from "I18n";
@@ -12,6 +13,9 @@ export default {
 
   initializeWithPluginApi(api, container) {
     const siteSettings = container.lookup("service:site-settings");
+    const lightboxService = container.lookup("service:lightbox");
+    const site = container.lookup("service:site");
+
     api.decorateChatMessage((element) => decorateGithubOneboxBody(element), {
       id: "onebox-github-body",
     });
@@ -63,13 +67,30 @@ export default {
       id: "linksNewTab",
     });
 
-    api.decorateChatMessage(
-      (element) =>
-        this.lightbox(element.querySelectorAll("img:not(.emoji, .avatar)")),
-      {
-        id: "lightbox",
-      }
-    );
+    if (siteSettings.enable_experimental_lightbox) {
+      api.decorateChatMessage(
+        (element) => {
+          lightboxService.setupLightboxes({
+            container: element,
+            selector: "img:not(.emoji, .avatar, .site-icon)",
+          });
+        },
+        {
+          id: "experimental-chat-lightbox",
+        }
+      );
+    } else {
+      api.decorateChatMessage(
+        (element) =>
+          this.lightbox(element.querySelectorAll("img:not(.emoji, .avatar)")),
+        {
+          id: "lightbox",
+        }
+      );
+    }
+    api.decorateChatMessage((element) => decorateHashtags(element, site), {
+      id: "hashtagIcons",
+    });
   },
 
   _getScrollParent(node, maxParentSelector) {
diff --git a/plugins/chat/assets/javascripts/discourse/initializers/chat-keyboard-shortcuts.js b/plugins/chat/assets/javascripts/discourse/initializers/chat-keyboard-shortcuts.js
index ae70c3e4543..ba6a1b4434b 100644
--- a/plugins/chat/assets/javascripts/discourse/initializers/chat-keyboard-shortcuts.js
+++ b/plugins/chat/assets/javascripts/discourse/initializers/chat-keyboard-shortcuts.js
@@ -1,9 +1,6 @@
 import { withPluginApi } from "discourse/lib/plugin-api";
-import showModal from "discourse/lib/show-modal";
-
-const APPLE =
-  navigator.platform.startsWith("Mac") || navigator.platform === "iPhone";
-export const KEY_MODIFIER = APPLE ? "meta" : "ctrl";
+import { PLATFORM_KEY_MODIFIER } from "discourse/lib/keyboard-shortcuts";
+import ChatModalNewMessage from "discourse/plugins/chat/discourse/components/chat/modal/new-message";
 
 export default {
   name: "chat-keyboard-shortcuts",
@@ -16,15 +13,19 @@ export default {
 
     const router = container.lookup("service:router");
     const appEvents = container.lookup("service:app-events");
+    const modal = container.lookup("service:modal");
     const chatStateManager = container.lookup("service:chat-state-manager");
-    const openChannelSelector = (e) => {
+    const chatThreadPane = container.lookup("service:chat-thread-pane");
+    const chatThreadListPane = container.lookup(
+      "service:chat-thread-list-pane"
+    );
+    const chatChannelsManager = container.lookup(
+      "service:chat-channels-manager"
+    );
+    const openQuickChannelSelector = (e) => {
       e.preventDefault();
       e.stopPropagation();
-      if (document.getElementById("chat-channel-selector-modal-inner")) {
-        appEvents.trigger("chat-channel-selector-modal:close");
-      } else {
-        showModal("chat-channel-selector-modal");
-      }
+      modal.show(ChatModalNewMessage);
     };
 
     const handleMoveUpShortcut = (e) => {
@@ -39,7 +40,8 @@ export default {
       chatService.switchChannelUpOrDown("down");
     };
 
-    const isChatComposer = (el) => el.classList.contains("chat-composer-input");
+    const isChatComposer = (el) =>
+      el.classList.contains("chat-composer__input");
     const isInputSelection = (el) => {
       const inputs = ["input", "textarea", "select", "button"];
       const elementTagName = el?.tagName.toLowerCase();
@@ -55,7 +57,10 @@ export default {
       }
       event.preventDefault();
       event.stopPropagation();
-      appEvents.trigger("chat:modify-selection", { type });
+      appEvents.trigger("chat:modify-selection", event, {
+        type,
+        context: event.target.dataset.chatComposerContext,
+      });
     };
 
     const openInsertLinkModal = (event) => {
@@ -64,7 +69,9 @@ export default {
       }
       event.preventDefault();
       event.stopPropagation();
-      appEvents.trigger("chat:open-insert-link-modal", { event });
+      appEvents.trigger("chat:open-insert-link-modal", event, {
+        context: event.target.dataset.chatComposerContext,
+      });
     };
 
     const openChatDrawer = (event) => {
@@ -78,32 +85,60 @@ export default {
       router.transitionTo(chatStateManager.lastKnownChatURL || "chat");
     };
 
-    const closeChatDrawer = (event) => {
-      if (!chatStateManager.isDrawerActive) {
+    const closeChat = (event) => {
+      // TODO (joffrey): removes this when we move from magnific popup
+      // there's no proper way to prevent propagation in mfp
+      if (event.srcElement?.classList?.value?.includes("mfp-wrap")) {
         return;
       }
 
-      if (!isChatComposer(event.target)) {
+      if (chatStateManager.isDrawerActive) {
+        event.preventDefault();
+        event.stopPropagation();
+        appEvents.trigger("chat:toggle-close", event);
         return;
       }
 
+      if (chatThreadPane.isOpened) {
+        event.preventDefault();
+        event.stopPropagation();
+        chatThreadPane.close();
+        return;
+      }
+
+      if (chatThreadListPane.isOpened) {
+        event.preventDefault();
+        event.stopPropagation();
+        chatThreadListPane.close();
+        return;
+      }
+    };
+
+    const markAllChannelsRead = (event) => {
       event.preventDefault();
       event.stopPropagation();
-      appEvents.trigger("chat:toggle-close", event);
+
+      if (chatStateManager.isActive) {
+        chatChannelsManager.markAllChannelsRead();
+      }
     };
 
     withPluginApi("0.12.1", (api) => {
-      api.addKeyboardShortcut(`${KEY_MODIFIER}+k`, openChannelSelector, {
-        global: true,
-        help: {
-          category: "chat",
-          name: "chat.keyboard_shortcuts.open_quick_channel_selector",
-          definition: {
-            keys1: ["meta", "k"],
-            keysDelimiter: "plus",
+      api.addKeyboardShortcut(
+        `${PLATFORM_KEY_MODIFIER}+k`,
+        openQuickChannelSelector,
+        {
+          global: true,
+          help: {
+            category: "chat",
+            name: "chat.keyboard_shortcuts.open_quick_channel_selector",
+            definition: {
+              keys1: ["meta", "k"],
+              keysDelimiter: "plus",
+            },
           },
-        },
-      });
+        }
+      );
       api.addKeyboardShortcut("alt+up", handleMoveUpShortcut, {
         global: true,
         help: {
@@ -122,7 +157,7 @@ export default {
         global: true,
       });
       api.addKeyboardShortcut(
-        `${KEY_MODIFIER}+b`,
+        `${PLATFORM_KEY_MODIFIER}+b`,
         (event) => modifyComposerSelection(event, "bold"),
         {
           global: true,
@@ -137,7 +172,7 @@ export default {
         }
       );
       api.addKeyboardShortcut(
-        `${KEY_MODIFIER}+i`,
+        `${PLATFORM_KEY_MODIFIER}+i`,
         (event) => modifyComposerSelection(event, "italic"),
         {
           global: true,
@@ -152,7 +187,7 @@ export default {
         }
       );
       api.addKeyboardShortcut(
-        `${KEY_MODIFIER}+e`,
+        `${PLATFORM_KEY_MODIFIER}+e`,
         (event) => modifyComposerSelection(event, "code"),
         {
           global: true,
@@ -167,7 +202,7 @@ export default {
         }
       );
       api.addKeyboardShortcut(
-        `${KEY_MODIFIER}+l`,
+        `${PLATFORM_KEY_MODIFIER}+l`,
         (event) => openInsertLinkModal(event),
         {
           global: true,
@@ -191,7 +226,7 @@ export default {
           },
         },
       });
-      api.addKeyboardShortcut("esc", (event) => closeChatDrawer(event), {
+      api.addKeyboardShortcut("esc", (event) => closeChat(event), {
         global: true,
         help: {
           category: "chat",
@@ -201,6 +236,21 @@ export default {
           },
         },
       });
+      api.addKeyboardShortcut(
+        `shift+esc`,
+        (event) => markAllChannelsRead(event),
+        {
+          global: true,
+          help: {
+            category: "chat",
+            name: "chat.keyboard_shortcuts.mark_all_channels_read",
+            definition: {
+              keys1: ["shift", "esc"],
+              keysDelimiter: "plus",
+            },
+          },
+        }
+      );
     });
   },
 };
diff --git a/plugins/chat/assets/javascripts/discourse/initializers/chat-plugin-decorators.js b/plugins/chat/assets/javascripts/discourse/initializers/chat-plugin-decorators.js
index 30faee83fb8..877fb9c319b 100644
--- a/plugins/chat/assets/javascripts/discourse/initializers/chat-plugin-decorators.js
+++ b/plugins/chat/assets/javascripts/discourse/initializers/chat-plugin-decorators.js
@@ -34,19 +34,6 @@ export default {
         }
       );
     }
-
-    api.decorateChatMessage(
-      (element) => {
-        element
-          .querySelectorAll(".lazyYT:not(.lazyYT-video-loaded)")
-          .forEach((iframe) => {
-            $(iframe).lazyYT();
-          });
-      },
-      {
-        id: "lazy-yt",
-      }
-    );
   },
 
   initialize(container) {
diff --git a/plugins/chat/assets/javascripts/discourse/initializers/chat-setup.js b/plugins/chat/assets/javascripts/discourse/initializers/chat-setup.js
index 69ee6ab84ee..295e1ba6f1f 100644
--- a/plugins/chat/assets/javascripts/discourse/initializers/chat-setup.js
+++ b/plugins/chat/assets/javascripts/discourse/initializers/chat-setup.js
@@ -4,22 +4,43 @@ import { bind } from "discourse-common/utils/decorators";
 import { getOwner } from "discourse-common/lib/get-owner";
 import { MENTION_KEYWORDS } from "discourse/plugins/chat/discourse/components/chat-message";
 import { clearChatComposerButtons } from "discourse/plugins/chat/discourse/lib/chat-composer-buttons";
+import ChannelHashtagType from "discourse/plugins/chat/discourse/lib/hashtag-types/channel";
+import { replaceIcon } from "discourse-common/lib/icon-library";
+import chatStyleguide from "../components/styleguide/organisms/chat";
 
 let _lastForcedRefreshAt;
 const MIN_REFRESH_DURATION_MS = 180000; // 3 minutes
 
+replaceIcon("d-chat", "comment");
+
 export default {
   name: "chat-setup",
+  before: "hashtag-css-generator",
+
   initialize(container) {
+    this.router = container.lookup("service:router");
     this.chatService = container.lookup("service:chat");
+    this.chatHistory = container.lookup("service:chat-history");
+    this.site = container.lookup("service:site");
     this.siteSettings = container.lookup("service:site-settings");
-    this.appEvents = container.lookup("service:appEvents");
+    this.currentUser = container.lookup("service:current-user");
+    this.appEvents = container.lookup("service:app-events");
     this.appEvents.on("discourse:focus-changed", this, "_handleFocusChanged");
 
     if (!this.chatService.userCanChat) {
       return;
     }
+
     withPluginApi("0.12.1", (api) => {
+      api.onPageChange((path) => {
+        const route = this.router.recognize(path);
+        if (route.name.startsWith("chat.")) {
+          this.chatHistory.visit(route);
+        }
+      });
+
+      api.registerHashtagType("channel", new ChannelHashtagType(container));
+
       api.registerChatComposerButton({
         id: "chat-upload-btn",
         icon: "far-image",
@@ -49,16 +70,54 @@ export default {
         label: "chat.emoji",
         id: "emoji",
         class: "chat-emoji-btn",
-        icon: "discourse-emojis",
-        position: "dropdown",
+        icon: "far-smile",
+        position: this.site.desktopView ? "inline" : "dropdown",
+        context: "channel",
         action() {
           const chatEmojiPickerManager = container.lookup(
             "service:chat-emoji-picker-manager"
           );
-          chatEmojiPickerManager.startFromComposer(this.didSelectEmoji);
+          chatEmojiPickerManager.open({ context: "channel" });
         },
       });
 
+      api.registerChatComposerButton({
+        label: "chat.emoji",
+        id: "channel-emoji",
+        class: "chat-emoji-btn",
+        icon: "discourse-emojis",
+        position: "dropdown",
+        context: "thread",
+        action() {
+          const chatEmojiPickerManager = container.lookup(
+            "service:chat-emoji-picker-manager"
+          );
+          chatEmojiPickerManager.open({ context: "thread" });
+        },
+      });
+
+      const summarizationAllowedGroups =
+        this.siteSettings.custom_summarization_allowed_groups
+          .split("|")
+          .map((id) => parseInt(id, 10));
+
+      const canSummarize =
+        this.siteSettings.summarization_strategy &&
+        this.currentUser &&
+        this.currentUser.groups.some((g) =>
+          summarizationAllowedGroups.includes(g.id)
+        );
+
+      if (canSummarize) {
+        api.registerChatComposerButton({
+          translatedLabel: "chat.summarization.title",
+          id: "channel-summary",
+          icon: "magic",
+          position: "dropdown",
+          action: "showChannelSummaryModal",
+        });
+      }
+
       // we want to decorate the chat quote dates regardless
       // of whether the current user has chat enabled
       api.decorateCookedElement(
@@ -97,6 +156,9 @@ export default {
       document.body.classList.add("chat-enabled");
 
       const currentUser = api.getCurrentUser();
+
+      // NOTE: chat_channels is more than a simple array, it also contains
+      // tracking and membership data, see Chat::StructuredChannelSerializer
       if (currentUser?.chat_channels) {
         this.chatService.setupWithPreloadedChannels(currentUser.chat_channels);
       }
@@ -115,13 +177,27 @@ export default {
 
       api.addToHeaderIcons("chat-header-icon");
 
+      api.addStyleguideSection?.({
+        component: chatStyleguide,
+        category: "organisms",
+        id: "chat",
+      });
+
+      api.addChatDrawerStateCallback(({ isDrawerActive }) => {
+        if (isDrawerActive) {
+          document.body.classList.add("chat-drawer-active");
+        } else {
+          document.body.classList.remove("chat-drawer-active");
+        }
+      });
+
       api.decorateChatMessage(function (chatMessage, chatChannel) {
         if (!this.currentUser) {
           return;
         }
 
         const highlightable = [`@${this.currentUser.username}`];
-        if (chatChannel.allow_channel_wide_mentions) {
+        if (chatChannel.allowChannelWideMentions) {
           highlightable.push(...MENTION_KEYWORDS.map((k) => `@${k}`));
         }
 
diff --git a/plugins/chat/assets/javascripts/discourse/initializers/chat-sidebar.js b/plugins/chat/assets/javascripts/discourse/initializers/chat-sidebar.js
index 547632c6c77..010698b56b1 100644
--- a/plugins/chat/assets/javascripts/discourse/initializers/chat-sidebar.js
+++ b/plugins/chat/assets/javascripts/discourse/initializers/chat-sidebar.js
@@ -1,16 +1,16 @@
 import { htmlSafe } from "@ember/template";
-import slugifyChannel from "discourse/plugins/chat/discourse/lib/slugify-channel";
 import { withPluginApi } from "discourse/lib/plugin-api";
 import I18n from "I18n";
 import { bind } from "discourse-common/utils/decorators";
 import { tracked } from "@glimmer/tracking";
-import { avatarUrl, escapeExpression } from "discourse/lib/utilities";
+import { escapeExpression } from "discourse/lib/utilities";
+import { avatarUrl } from "discourse-common/lib/avatar-utils";
 import { dasherize } from "@ember/string";
 import { emojiUnescape } from "discourse/lib/text";
 import { decorateUsername } from "discourse/helpers/decorate-username-selector";
 import { until } from "discourse/lib/formatter";
 import { inject as service } from "@ember/service";
-import { computed } from "@ember/object";
+import ChatModalNewMessage from "discourse/plugins/chat/discourse/components/chat/modal/new-message";
 
 export default {
   name: "chat-sidebar",
@@ -21,158 +21,166 @@ export default {
       return;
     }
 
+    this.siteSettings = container.lookup("service:site-settings");
+
     withPluginApi("1.3.0", (api) => {
-      api.addSidebarSection(
-        (BaseCustomSidebarSection, BaseCustomSidebarSectionLink) => {
-          const SidebarChatChannelsSectionLink = class extends BaseCustomSidebarSectionLink {
-            constructor({ channel, chatService }) {
-              super(...arguments);
-              this.channel = channel;
-              this.chatService = chatService;
-            }
-
-            get name() {
-              return dasherize(slugifyChannel(this.channel));
-            }
-
-            @computed("chatService.activeChannel")
-            get classNames() {
-              const classes = [];
-
-              if (this.channel.currentUserMembership.muted) {
-                classes.push("sidebar-section-link--muted");
+      if (this.siteSettings.enable_public_channels) {
+        api.addSidebarSection(
+          (BaseCustomSidebarSection, BaseCustomSidebarSectionLink) => {
+            const SidebarChatChannelsSectionLink = class extends BaseCustomSidebarSectionLink {
+              constructor({ channel, chatService }) {
+                super(...arguments);
+                this.channel = channel;
+                this.chatService = chatService;
               }
 
-              if (this.channel.id === this.chatService.activeChannel?.id) {
-                classes.push("sidebar-section-link--active");
+              get name() {
+                return dasherize(this.channel.slugifiedTitle);
               }
 
-              classes.push(`channel-${this.channel.id}`);
+              get classNames() {
+                const classes = [];
 
-              return classes.join(" ");
-            }
+                if (this.channel.currentUserMembership.muted) {
+                  classes.push("sidebar-section-link--muted");
+                }
 
-            get route() {
-              return "chat.channel";
-            }
+                if (this.channel.id === this.chatService.activeChannel?.id) {
+                  classes.push("sidebar-section-link--active");
+                }
 
-            get models() {
-              return [this.channel.id, slugifyChannel(this.channel)];
-            }
+                classes.push(`channel-${this.channel.id}`);
 
-            get text() {
-              return htmlSafe(emojiUnescape(this.channel.escapedTitle));
-            }
-
-            get prefixType() {
-              return "icon";
-            }
-
-            get prefixValue() {
-              return "hashtag";
-            }
-
-            get prefixColor() {
-              return this.channel.chatable.color;
-            }
-
-            get title() {
-              return this.channel.escapedDescription
-                ? htmlSafe(this.channel.escapedDescription)
-                : `${this.channel.escapedTitle} ${I18n.t("chat.title")}`;
-            }
-
-            get prefixBadge() {
-              return this.channel.chatable.read_restricted ? "lock" : "";
-            }
-
-            get suffixType() {
-              return "icon";
-            }
-
-            get suffixValue() {
-              return this.channel.currentUserMembership.unread_count > 0
-                ? "circle"
-                : "";
-            }
-
-            get suffixCSSClass() {
-              return this.channel.currentUserMembership.unread_mentions > 0
-                ? "urgent"
-                : "unread";
-            }
-          };
-
-          const SidebarChatChannelsSection = class extends BaseCustomSidebarSection {
-            @tracked currentUserCanJoinPublicChannels =
-              this.sidebar.currentUser &&
-              (this.sidebar.currentUser.staff ||
-                this.sidebar.currentUser.has_joinable_public_channels);
-
-            constructor() {
-              super(...arguments);
-
-              if (container.isDestroyed) {
-                return;
+                return classes.join(" ");
               }
-              this.chatService = container.lookup("service:chat");
-              this.chatChannelsManager = container.lookup(
-                "service:chat-channels-manager"
-              );
-              this.router = container.lookup("service:router");
-            }
 
-            get sectionLinks() {
-              return this.chatChannelsManager.publicMessageChannels.map(
-                (channel) =>
-                  new SidebarChatChannelsSectionLink({
-                    channel,
-                    chatService: this.chatService,
-                  })
-              );
-            }
+              get route() {
+                return "chat.channel";
+              }
 
-            get name() {
-              return "chat-channels";
-            }
+              get models() {
+                return this.channel.routeModels;
+              }
 
-            get title() {
-              return I18n.t("chat.chat_channels");
-            }
+              get text() {
+                return htmlSafe(emojiUnescape(this.channel.escapedTitle));
+              }
 
-            get text() {
-              return I18n.t("chat.chat_channels");
-            }
+              get prefixType() {
+                return "icon";
+              }
 
-            get actions() {
-              return [
-                {
-                  id: "browseChannels",
-                  title: I18n.t("chat.channels_list_popup.browse"),
-                  action: () => this.router.transitionTo("chat.browse.open"),
-                },
-              ];
-            }
+              get prefixValue() {
+                return "d-chat";
+              }
 
-            get actionsIcon() {
-              return "pencil-alt";
-            }
+              get prefixColor() {
+                return this.channel.chatable.color;
+              }
 
-            get links() {
-              return this.sectionLinks;
-            }
+              get title() {
+                return this.channel.escapedDescription
+                  ? htmlSafe(this.channel.escapedDescription)
+                  : `${this.channel.escapedTitle} ${I18n.t("chat.title")}`;
+              }
 
-            get displaySection() {
-              return (
-                this.sectionLinks.length > 0 ||
-                this.currentUserCanJoinPublicChannels
-              );
-            }
-          };
+              get prefixBadge() {
+                return this.channel.chatable.read_restricted ? "lock" : "";
+              }
 
-          return SidebarChatChannelsSection;
-        }
-      );
+              get suffixType() {
+                return "icon";
+              }
+
+              get suffixValue() {
+                return this.channel.tracking.unreadCount > 0 ||
+                  // We want to do this so we don't show a blue dot if the user is inside
+                  // the channel and a new unread thread comes in.
+                  (this.chatService.activeChannel?.id !== this.channel.id &&
+                    this.channel.unreadThreadsCountSinceLastViewed > 0)
+                  ? "circle"
+                  : "";
+              }
+
+              get suffixCSSClass() {
+                return this.channel.tracking.mentionCount > 0
+                  ? "urgent"
+                  : "unread";
+              }
+            };
+
+            const SidebarChatChannelsSection = class extends BaseCustomSidebarSection {
+              @service currentUser;
+              @tracked currentUserCanJoinPublicChannels =
+                this.currentUser &&
+                (this.currentUser.staff ||
+                  this.currentUser.has_joinable_public_channels);
+
+              constructor() {
+                super(...arguments);
+
+                if (container.isDestroyed) {
+                  return;
+                }
+                this.chatService = container.lookup("service:chat");
+                this.chatChannelsManager = container.lookup(
+                  "service:chat-channels-manager"
+                );
+                this.router = container.lookup("service:router");
+              }
+
+              get sectionLinks() {
+                return this.chatChannelsManager.publicMessageChannels.map(
+                  (channel) =>
+                    new SidebarChatChannelsSectionLink({
+                      channel,
+                      chatService: this.chatService,
+                    })
+                );
+              }
+
+              get name() {
+                return "chat-channels";
+              }
+
+              get title() {
+                return I18n.t("chat.chat_channels");
+              }
+
+              get text() {
+                return I18n.t("chat.chat_channels");
+              }
+
+              get actions() {
+                return [
+                  {
+                    id: "browseChannels",
+                    title: I18n.t("chat.channels_list_popup.browse"),
+                    action: () => this.router.transitionTo("chat.browse.open"),
+                  },
+                ];
+              }
+
+              get actionsIcon() {
+                return "pencil-alt";
+              }
+
+              get links() {
+                return this.sectionLinks;
+              }
+
+              get displaySection() {
+                return (
+                  this.sectionLinks.length > 0 ||
+                  this.currentUserCanJoinPublicChannels
+                );
+              }
+            };
+
+            return SidebarChatChannelsSection;
+          }
+        );
+      }
 
       api.addSidebarSection(
         (BaseCustomSidebarSection, BaseCustomSidebarSectionLink) => {
@@ -195,10 +203,9 @@ export default {
             }
 
             get name() {
-              return slugifyChannel(this.channel);
+              return this.channel.slugifiedTitle;
             }
 
-            @computed("chatService.activeChannel")
             get classNames() {
               const classes = [];
 
@@ -220,12 +227,12 @@ export default {
             }
 
             get models() {
-              return [this.channel.id, slugifyChannel(this.channel)];
+              return this.channel.routeModels;
             }
 
             get title() {
-              return I18n.t("chat.placeholder_others", {
-                messageRecipient: this.channel.escapedTitle,
+              return I18n.t("chat.placeholder_channel", {
+                channelName: this.channel.escapedTitle,
               });
             }
 
@@ -233,15 +240,19 @@ export default {
               return this.channel.chatable.users.length === 1;
             }
 
+            get contentComponentArgs() {
+              return this.channel.chatable.users[0].get("status");
+            }
+
+            get contentComponent() {
+              return "user-status-message";
+            }
+
             get text() {
               const username = this.channel.escapedTitle.replaceAll("@", "");
               if (this.oneOnOneMessage) {
-                const status = this.channel.chatable.users[0].get("status");
-                const statusHtml = status ? this._userStatusHtml(status) : "";
                 return htmlSafe(
-                  `${escapeExpression(
-                    username
-                  )}${statusHtml} ${decorateUsername(
+                  `${escapeExpression(username)}${decorateUsername(
                     escapeExpression(username)
                   )}`
                 );
@@ -286,9 +297,7 @@ export default {
             }
 
             get suffixValue() {
-              return this.channel.currentUserMembership.unread_count > 0
-                ? "circle"
-                : "";
+              return this.channel.tracking.unreadCount > 0 ? "circle" : "";
             }
 
             get suffixCSSClass() {
@@ -315,14 +324,6 @@ export default {
               return I18n.t("chat.direct_messages.leave");
             }
 
-            _userStatusHtml(status) {
-              const emoji = escapeExpression(`:${status.emoji}:`);
-              const title = this._userStatusTitle(status);
-              return `<span class="user-status">${emojiUnescape(emoji, {
-                title,
-              })}</span>`;
-            }
-
             _userStatusTitle(status) {
               let title = `${escapeExpression(status.description)}`;
 
@@ -341,6 +342,7 @@ export default {
 
           const SidebarChatDirectMessagesSection = class extends BaseCustomSidebarSection {
             @service site;
+            @service modal;
             @service router;
             @tracked userCanDirectMessage =
               this.chatService.userCanDirectMessage;
@@ -389,7 +391,7 @@ export default {
                   id: "startDm",
                   title: I18n.t("chat.direct_messages.new"),
                   action: () => {
-                    this.router.transitionTo("chat.draft-channel");
+                    this.modal.show(ChatModalNewMessage);
                   },
                 },
               ];
diff --git a/plugins/chat/assets/javascripts/discourse/initializers/chat-user-menu.js b/plugins/chat/assets/javascripts/discourse/initializers/chat-user-menu.js
index 62758b9b0c5..b2c0d4ca8c5 100644
--- a/plugins/chat/assets/javascripts/discourse/initializers/chat-user-menu.js
+++ b/plugins/chat/assets/javascripts/discourse/initializers/chat-user-menu.js
@@ -24,11 +24,9 @@ export default {
                   title: this.notification.data.chat_channel_title,
                   slug: this.notification.data.chat_channel_slug,
                 });
-                return `/chat/channel/${
+                return `/chat/c/${slug || "-"}/${
                   this.notification.data.chat_channel_id
-                }/${slug || "-"}?messageId=${
-                  this.notification.data.chat_message_id
-                }`;
+                }/${this.notification.data.chat_message_id}`;
               }
 
               get linkTitle() {
@@ -61,11 +59,16 @@ export default {
                   title: this.notification.data.chat_channel_title,
                   slug: this.notification.data.chat_channel_slug,
                 });
-                return `/chat/channel/${
+
+                let notificationRoute = `/chat/c/${slug || "-"}/${
                   this.notification.data.chat_channel_id
-                }/${slug || "-"}?messageId=${
-                  this.notification.data.chat_message_id
                 }`;
+                if (this.notification.data.chat_thread_id) {
+                  notificationRoute += `/t/${this.notification.data.chat_thread_id}`;
+                } else {
+                  notificationRoute += `/${this.notification.data.chat_message_id}`;
+                }
+                return notificationRoute;
               }
 
               get linkTitle() {
@@ -73,7 +76,7 @@ export default {
               }
 
               get icon() {
-                return "comment";
+                return "d-chat";
               }
 
               get label() {
@@ -116,7 +119,7 @@ export default {
             }
 
             get icon() {
-              return "comment";
+              return "d-chat";
             }
 
             get count() {
diff --git a/plugins/chat/assets/javascripts/discourse/initializers/chat-user-options.js b/plugins/chat/assets/javascripts/discourse/initializers/chat-user-options.js
index e7b9af19561..c410763d713 100644
--- a/plugins/chat/assets/javascripts/discourse/initializers/chat-user-options.js
+++ b/plugins/chat/assets/javascripts/discourse/initializers/chat-user-options.js
@@ -5,6 +5,7 @@ const ONLY_CHAT_PUSH_NOTIFICATIONS_FIELD = "only_chat_push_notifications";
 const IGNORE_CHANNEL_WIDE_MENTION = "ignore_channel_wide_mention";
 const CHAT_SOUND = "chat_sound";
 const CHAT_EMAIL_FREQUENCY = "chat_email_frequency";
+const CHAT_HEADER_INDICATOR_PREFERENCE = "chat_header_indicator_preference";
 
 export default {
   name: "chat-user-options",
@@ -18,6 +19,7 @@ export default {
         api.addSaveableUserOptionField(IGNORE_CHANNEL_WIDE_MENTION);
         api.addSaveableUserOptionField(CHAT_SOUND);
         api.addSaveableUserOptionField(CHAT_EMAIL_FREQUENCY);
+        api.addSaveableUserOptionField(CHAT_HEADER_INDICATOR_PREFERENCE);
       }
     });
   },
diff --git a/plugins/chat/assets/javascripts/discourse/lib/chat-composer-buttons.js b/plugins/chat/assets/javascripts/discourse/lib/chat-composer-buttons.js
index 94ca01e9729..9d9390a1df1 100644
--- a/plugins/chat/assets/javascripts/discourse/lib/chat-composer-buttons.js
+++ b/plugins/chat/assets/javascripts/discourse/lib/chat-composer-buttons.js
@@ -66,54 +66,60 @@ export function chatComposerButtonsDependentKeys() {
   );
 }
 
-export function chatComposerButtons(context, position) {
+export function chatComposerButtons(composer, position, context) {
   return Object.values(_chatComposerButtons)
-    .filter(
-      (button) =>
-        computeButton(context, button, "displayed") &&
-        computeButton(context, button, "position") === position
-    )
+    .filter((button) => {
+      let valid =
+        computeButton(composer, button, "displayed") &&
+        computeButton(composer, button, "position") === position;
+
+      if (button.context) {
+        valid = valid && computeButton(composer, button, "context") === context;
+      }
+
+      return valid;
+    })
     .map((button) => {
       const result = { id: button.id };
 
-      const label = computeButton(context, button, "label");
+      const label = computeButton(composer, button, "label");
       result.label = label
         ? label
-        : computeButton(context, button, "translatedLabel");
+        : computeButton(composer, button, "translatedLabel");
 
-      const ariaLabel = computeButton(context, button, "ariaLabel");
+      const ariaLabel = computeButton(composer, button, "ariaLabel");
       if (ariaLabel) {
         result.ariaLabel = I18n.t(ariaLabel);
       } else {
         const translatedAriaLabel = computeButton(
-          context,
+          composer,
           button,
           "translatedAriaLabel"
         );
         result.ariaLabel = translatedAriaLabel || result.label;
       }
 
-      const title = computeButton(context, button, "title");
+      const title = computeButton(composer, button, "title");
       result.title = title
         ? I18n.t(title)
-        : computeButton(context, button, "translatedTitle");
+        : computeButton(composer, button, "translatedTitle");
 
       result.classNames = (
-        computeButton(context, button, "classNames") || []
+        computeButton(composer, button, "classNames") || []
       ).join(" ");
 
-      result.icon = computeButton(context, button, "icon");
-      result.disabled = computeButton(context, button, "disabled");
-      result.priority = computeButton(context, button, "priority");
+      result.icon = computeButton(composer, button, "icon");
+      result.disabled = computeButton(composer, button, "disabled");
+      result.priority = computeButton(composer, button, "priority");
 
       if (isFunction(button.action)) {
         result.action = () => {
-          button.action.apply(context);
+          button.action.apply(composer, [context]);
         };
       } else {
         const actionName = button.action;
         result.action = () => {
-          context[actionName]();
+          composer[actionName](context);
         };
       }
 
diff --git a/plugins/chat/assets/javascripts/discourse/lib/chat-constants.js b/plugins/chat/assets/javascripts/discourse/lib/chat-constants.js
new file mode 100644
index 00000000000..6b1f9abdd73
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/lib/chat-constants.js
@@ -0,0 +1,4 @@
+export const PAST = "past";
+export const FUTURE = "future";
+export const READ_INTERVAL_MS = 1000;
+export const DEFAULT_MESSAGE_PAGE_SIZE = 50;
diff --git a/plugins/chat/assets/javascripts/discourse/lib/chat-ios-hacks.js b/plugins/chat/assets/javascripts/discourse/lib/chat-ios-hacks.js
new file mode 100644
index 00000000000..7d70c11e048
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/lib/chat-ios-hacks.js
@@ -0,0 +1,47 @@
+import isZoomed from "discourse/plugins/chat/discourse/lib/zoom-check";
+import { capabilities } from "discourse/services/capabilities";
+import { next, schedule } from "@ember/runloop";
+import discourseLater from "discourse-common/lib/later";
+
+// since -webkit-overflow-scrolling: touch can't be used anymore to disable momentum scrolling
+// we use different hacks to work around this
+// if you change any line in this method, make sure to test on iOS
+export function stackingContextFix(scrollable, callback) {
+  if (capabilities.isIOS) {
+    scrollable.style.overflow = "hidden";
+    scrollable
+      .querySelectorAll(".chat-message-separator__text-container")
+      .forEach((container) => (container.style.zIndex = "1"));
+  }
+
+  callback?.();
+
+  if (capabilities.isIOS) {
+    next(() => {
+      schedule("afterRender", () => {
+        scrollable.style.overflow = "auto";
+        discourseLater(() => {
+          if (!scrollable) {
+            return;
+          }
+
+          scrollable
+            .querySelectorAll(".chat-message-separator__text-container")
+            .forEach((container) => (container.style.zIndex = "2"));
+        }, 50);
+      });
+    });
+  }
+}
+
+export function bodyScrollFix() {
+  // when keyboard is visible this will ensure body
+  // doesn’t scroll out of viewport
+  if (
+    capabilities.isIOS &&
+    document.documentElement.classList.contains("keyboard-visible") &&
+    !isZoomed()
+  ) {
+    document.documentElement.scrollTo(0, 0);
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/lib/chat-message-container.js b/plugins/chat/assets/javascripts/discourse/lib/chat-message-container.js
new file mode 100644
index 00000000000..ccf5aef3f14
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/lib/chat-message-container.js
@@ -0,0 +1,13 @@
+import { MESSAGE_CONTEXT_THREAD } from "discourse/plugins/chat/discourse/components/chat-message";
+
+export default function chatMessageContainer(id, context) {
+  let selector;
+
+  if (context === MESSAGE_CONTEXT_THREAD) {
+    selector = `.chat-thread .chat-message-container[data-id="${id}"]`;
+  } else {
+    selector = `.chat-channel .chat-message-container[data-id="${id}"]`;
+  }
+
+  return document.querySelector(selector);
+}
diff --git a/plugins/chat/assets/javascripts/discourse/lib/chat-message-flag.js b/plugins/chat/assets/javascripts/discourse/lib/chat-message-flag.js
index 60a20c2206a..9bd86b4ab40 100644
--- a/plugins/chat/assets/javascripts/discourse/lib/chat-message-flag.js
+++ b/plugins/chat/assets/javascripts/discourse/lib/chat-message-flag.js
@@ -38,7 +38,7 @@ export default class ChatMessageFlag {
     let flagsAvailable = site.flagTypes;
 
     flagsAvailable = flagsAvailable.filter((flag) => {
-      return model.available_flags.includes(flag.name_key);
+      return model.availableFlags.includes(flag.name_key);
     });
 
     // "message user" option should be at the top
diff --git a/plugins/chat/assets/javascripts/discourse/lib/chat-message-interactor.js b/plugins/chat/assets/javascripts/discourse/lib/chat-message-interactor.js
new file mode 100644
index 00000000000..0eba137a036
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/lib/chat-message-interactor.js
@@ -0,0 +1,399 @@
+import getURL from "discourse-common/lib/get-url";
+import { bind } from "discourse-common/utils/decorators";
+import showModal from "discourse/lib/show-modal";
+import ChatMessageFlag from "discourse/plugins/chat/discourse/lib/chat-message-flag";
+import Bookmark from "discourse/models/bookmark";
+import BookmarkModal from "discourse/components/modal/bookmark";
+import { BookmarkFormData } from "discourse/lib/bookmark";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+import { isTesting } from "discourse-common/config/environment";
+import { clipboardCopy } from "discourse/lib/utilities";
+import ChatMessageReaction, {
+  REACTIONS,
+} from "discourse/plugins/chat/discourse/models/chat-message-reaction";
+import { setOwner } from "@ember/application";
+import { tracked } from "@glimmer/tracking";
+import ChatMessage from "discourse/plugins/chat/discourse/models/chat-message";
+import { MESSAGE_CONTEXT_THREAD } from "discourse/plugins/chat/discourse/components/chat-message";
+import I18n from "I18n";
+
+const removedSecondaryActions = new Set();
+
+export function removeChatComposerSecondaryActions(actionIds) {
+  actionIds.forEach((id) => removedSecondaryActions.add(id));
+}
+
+export function resetRemovedChatComposerSecondaryActions() {
+  removedSecondaryActions.clear();
+}
+
+export default class ChatMessageInteractor {
+  @service appEvents;
+  @service dialog;
+  @service chat;
+  @service chatEmojiReactionStore;
+  @service chatEmojiPickerManager;
+  @service chatChannelComposer;
+  @service chatThreadComposer;
+  @service chatChannelPane;
+  @service chatThreadPane;
+  @service chatApi;
+  @service currentUser;
+  @service site;
+  @service router;
+  @service modal;
+  @service capabilities;
+
+  @tracked message = null;
+  @tracked context = null;
+
+  cachedFavoritesReactions = null;
+
+  constructor(owner, message, context) {
+    setOwner(this, owner);
+
+    this.message = message;
+    this.context = context;
+    this.cachedFavoritesReactions = this.chatEmojiReactionStore.favorites;
+  }
+
+  get pane() {
+    return this.context === MESSAGE_CONTEXT_THREAD
+      ? this.chatThreadPane
+      : this.chatChannelPane;
+  }
+
+  get emojiReactions() {
+    let favorites = this.cachedFavoritesReactions;
+
+    // may be a {} if no defaults defined in some production builds
+    if (!favorites || !favorites.slice) {
+      return [];
+    }
+
+    return favorites.slice(0, 3).map((emoji) => {
+      return (
+        this.message.reactions.find((reaction) => reaction.emoji === emoji) ||
+        ChatMessageReaction.create({ emoji })
+      );
+    });
+  }
+
+  get canEdit() {
+    return (
+      !this.message.deletedAt &&
+      this.currentUser.id === this.message.user.id &&
+      this.message.channel?.canModifyMessages?.(this.currentUser)
+    );
+  }
+
+  get canInteractWithMessage() {
+    return (
+      !this.message?.deletedAt &&
+      this.message?.channel?.canModifyMessages(this.currentUser)
+    );
+  }
+
+  get canRestoreMessage() {
+    return (
+      this.message?.deletedAt &&
+      (this.currentUser.staff ||
+        (this.message?.user?.id === this.currentUser.id &&
+          this.message?.deletedById === this.currentUser.id)) &&
+      this.message.channel?.canModifyMessages?.(this.currentUser)
+    );
+  }
+
+  get canBookmark() {
+    return this.message?.channel?.canModifyMessages?.(this.currentUser);
+  }
+
+  get canReply() {
+    return (
+      this.canInteractWithMessage && this.context !== MESSAGE_CONTEXT_THREAD
+    );
+  }
+
+  get canReact() {
+    return this.canInteractWithMessage;
+  }
+
+  get canFlagMessage() {
+    return (
+      this.currentUser.id !== this.message?.user?.id &&
+      this.message?.userFlagStatus === undefined &&
+      this.message.channel?.canFlag &&
+      !this.message?.chatWebhookEvent &&
+      !this.message?.deletedAt
+    );
+  }
+
+  get canRebakeMessage() {
+    return (
+      this.currentUser.staff &&
+      this.message.channel?.canModifyMessages?.(this.currentUser)
+    );
+  }
+
+  get canDeleteMessage() {
+    return (
+      this.canDelete &&
+      !this.message?.deletedAt &&
+      this.message.channel?.canModifyMessages?.(this.currentUser)
+    );
+  }
+
+  get canDelete() {
+    return this.currentUser.id === this.message.user.id
+      ? this.message.channel?.canDeleteSelf
+      : this.message.channel?.canDeleteOthers;
+  }
+
+  get composer() {
+    return this.context === MESSAGE_CONTEXT_THREAD
+      ? this.chatThreadComposer
+      : this.chatChannelComposer;
+  }
+
+  get secondaryActions() {
+    const buttons = [];
+
+    buttons.push({
+      id: "copyLink",
+      name: I18n.t("chat.copy_link"),
+      icon: "link",
+    });
+
+    if (this.canEdit) {
+      buttons.push({
+        id: "edit",
+        name: I18n.t("chat.edit"),
+        icon: "pencil-alt",
+      });
+    }
+
+    if (!this.pane.selectingMessages) {
+      buttons.push({
+        id: "select",
+        name: I18n.t("chat.select"),
+        icon: "tasks",
+      });
+    }
+
+    if (this.canFlagMessage) {
+      buttons.push({
+        id: "flag",
+        name: I18n.t("chat.flag"),
+        icon: "flag",
+      });
+    }
+
+    if (this.canDeleteMessage) {
+      buttons.push({
+        id: "delete",
+        name: I18n.t("chat.delete"),
+        icon: "trash-alt",
+      });
+    }
+
+    if (this.canRestoreMessage) {
+      buttons.push({
+        id: "restore",
+        name: I18n.t("chat.restore"),
+        icon: "undo",
+      });
+    }
+
+    if (this.canRebakeMessage) {
+      buttons.push({
+        id: "rebake",
+        name: I18n.t("chat.rebake_message"),
+        icon: "sync-alt",
+      });
+    }
+
+    return buttons.reject((button) => removedSecondaryActions.has(button.id));
+  }
+
+  select(checked = true) {
+    this.message.selected = checked;
+    this.pane.onSelectMessage(this.message);
+  }
+
+  bulkSelect(checked) {
+    const manager = this.message.manager;
+    const lastSelectedIndex = manager.findIndexOfMessage(
+      this.pane.lastSelectedMessage.id
+    );
+    const newlySelectedIndex = manager.findIndexOfMessage(this.message.id);
+    const sortedIndices = [lastSelectedIndex, newlySelectedIndex].sort(
+      (a, b) => a - b
+    );
+
+    for (let i = sortedIndices[0]; i <= sortedIndices[1]; i++) {
+      manager.messages[i].selected = checked;
+    }
+  }
+
+  copyLink() {
+    const { protocol, host } = window.location;
+    const channelId = this.message.channel.id;
+    const threadId = this.message.thread?.id;
+
+    let url;
+    if (this.context === MESSAGE_CONTEXT_THREAD && threadId) {
+      url = getURL(`/chat/c/-/${channelId}/t/${threadId}/${this.message.id}`);
+    } else {
+      url = getURL(`/chat/c/-/${channelId}/${this.message.id}`);
+    }
+
+    url = url.indexOf("/") === 0 ? protocol + "//" + host + url : url;
+    clipboardCopy(url);
+  }
+
+  @action
+  react(emoji, reactAction) {
+    if (!this.chat.userCanInteractWithChat) {
+      return;
+    }
+
+    if (this.pane.reacting) {
+      return;
+    }
+
+    if (this.capabilities.canVibrate && !isTesting()) {
+      navigator.vibrate(5);
+    }
+
+    if (this.site.mobileView) {
+      this.chat.activeMessage = null;
+    }
+
+    if (reactAction === REACTIONS.add) {
+      this.chatEmojiReactionStore.track(`:${emoji}:`);
+    }
+
+    this.pane.reacting = true;
+
+    this.message.react(
+      emoji,
+      reactAction,
+      this.currentUser,
+      this.currentUser.id
+    );
+
+    return this.chatApi
+      .publishReaction(
+        this.message.channel.id,
+        this.message.id,
+        emoji,
+        reactAction
+      )
+      .catch((errResult) => {
+        popupAjaxError(errResult);
+        this.message.react(
+          emoji,
+          REACTIONS.remove,
+          this.currentUser,
+          this.currentUser.id
+        );
+      })
+      .finally(() => {
+        this.pane.reacting = false;
+      });
+  }
+
+  @action
+  toggleBookmark() {
+    this.modal.show(BookmarkModal, {
+      model: {
+        bookmark: new BookmarkFormData(
+          this.message.bookmark ||
+            Bookmark.createFor(
+              this.currentUser,
+              "Chat::Message",
+              this.message.id
+            )
+        ),
+        afterSave: (savedData) => {
+          const bookmark = Bookmark.create(savedData);
+          this.message.bookmark = bookmark;
+          this.appEvents.trigger(
+            "bookmarks:changed",
+            savedData,
+            bookmark.attachedTo()
+          );
+        },
+        afterDelete: () => {
+          this.message.bookmark = null;
+        },
+      },
+    });
+  }
+
+  @action
+  flag() {
+    const model = new ChatMessage(this.message.channel, this.message);
+    model.username = this.message.user?.username;
+    model.user_id = this.message.user?.id;
+    const controller = showModal("flag", { model });
+    controller.set("flagTarget", new ChatMessageFlag());
+  }
+
+  @action
+  delete() {
+    return this.chatApi
+      .trashMessage(this.message.channel.id, this.message.id)
+      .catch(popupAjaxError);
+  }
+
+  @action
+  restore() {
+    return this.chatApi
+      .restoreMessage(this.message.channel.id, this.message.id)
+      .catch(popupAjaxError);
+  }
+
+  @action
+  rebake() {
+    return this.chatApi
+      .rebakeMessage(this.message.channel.id, this.message.id)
+      .catch(popupAjaxError);
+  }
+
+  @action
+  reply() {
+    this.composer.replyTo(this.message);
+  }
+
+  @action
+  edit() {
+    this.composer.edit(this.message);
+  }
+
+  @action
+  openEmojiPicker(_, { target }) {
+    const pickerState = {
+      didSelectEmoji: this.selectReaction,
+      trigger: target,
+      context: "chat-channel-message",
+    };
+    this.chatEmojiPickerManager.open(pickerState);
+  }
+
+  @bind
+  selectReaction(emoji) {
+    if (!this.chat.userCanInteractWithChat) {
+      return;
+    }
+
+    this.react(emoji, REACTIONS.add);
+  }
+
+  @action
+  handleSecondaryActions(id) {
+    this[id](this.message);
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/lib/chat-messages-loader.js b/plugins/chat/assets/javascripts/discourse/lib/chat-messages-loader.js
new file mode 100644
index 00000000000..98ea712062a
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/lib/chat-messages-loader.js
@@ -0,0 +1,127 @@
+import { setOwner } from "@ember/application";
+import { tracked } from "@glimmer/tracking";
+import ChatChannel from "discourse/plugins/chat/discourse/models/chat-channel";
+import { inject as service } from "@ember/service";
+import {
+  DEFAULT_MESSAGE_PAGE_SIZE,
+  FUTURE,
+  PAST,
+} from "discourse/plugins/chat/discourse/lib/chat-constants";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+
+export default class ChatMessagesLoader {
+  @service chatApi;
+
+  @tracked loading = false;
+  @tracked canLoadMorePast = false;
+  @tracked canLoadMoreFuture = false;
+  @tracked fetchedOnce = false;
+
+  constructor(owner, model) {
+    setOwner(this, owner);
+    this.model = model;
+  }
+
+  get loadedPast() {
+    return this.canLoadMorePast === false && this.fetchedOnce;
+  }
+
+  async loadMore(args = {}) {
+    if (this.canLoadMoreFuture === false && args.direction === FUTURE) {
+      return;
+    }
+
+    if (this.canLoadMorePast === false && args.direction === PAST) {
+      return;
+    }
+
+    const nextTargetMessage = this.#computeNextTargetMessage(
+      args.direction,
+      this.model
+    );
+
+    args = {
+      direction: args.direction,
+      page_size: DEFAULT_MESSAGE_PAGE_SIZE,
+      target_message_id: nextTargetMessage?.id,
+    };
+
+    args = this.#cleanArgs(args);
+
+    let result;
+    try {
+      this.loading = true;
+      result = await this.#apiFunction(args);
+      this.canLoadMoreFuture = result.meta.can_load_more_future;
+      this.canLoadMorePast = result.meta.can_load_more_past;
+    } catch (error) {
+      this.#handleError(error);
+    } finally {
+      this.loading = false;
+    }
+
+    return result;
+  }
+
+  async load(args = {}) {
+    this.canLoadMorePast = true;
+    this.canLoadMoreFuture = true;
+    this.fetchedOnce = false;
+    this.loading = true;
+
+    args.page_size ??= DEFAULT_MESSAGE_PAGE_SIZE;
+
+    args = this.#cleanArgs(args);
+
+    let result;
+    try {
+      result = await this.#apiFunction(args);
+      this.canLoadMoreFuture = result.meta.can_load_more_future;
+      this.canLoadMorePast = result.meta.can_load_more_past;
+      this.fetchedOnce = true;
+    } catch (error) {
+      this.#handleError(error);
+    } finally {
+      this.loading = false;
+    }
+
+    return result;
+  }
+
+  #apiFunction(args = {}) {
+    if (this.model instanceof ChatChannel) {
+      return this.chatApi.channelMessages(this.model.id, args);
+    } else {
+      return this.chatApi.channelThreadMessages(
+        this.model.channel.id,
+        this.model.id,
+        args
+      );
+    }
+  }
+
+  #cleanArgs(args) {
+    return Object.keys(args)
+      .filter((k) => args[k] != null)
+      .reduce((a, k) => ({ ...a, [k]: args[k] }), {});
+  }
+
+  #computeNextTargetMessage(direction, model) {
+    return direction === PAST
+      ? model.messagesManager.messages.find((message) => !message.staged)
+      : model.messagesManager.messages.findLast((message) => !message.staged);
+  }
+
+  #handleError(error) {
+    switch (error?.jqXHR?.status) {
+      case 429:
+        popupAjaxError(error);
+        break;
+      case 404:
+        popupAjaxError(error);
+        break;
+      default:
+        throw error;
+    }
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/lib/chat-messages-manager.js b/plugins/chat/assets/javascripts/discourse/lib/chat-messages-manager.js
new file mode 100644
index 00000000000..6063e2f7ff1
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/lib/chat-messages-manager.js
@@ -0,0 +1,74 @@
+import { cached, tracked } from "@glimmer/tracking";
+import { setOwner } from "@ember/application";
+
+export default class ChatMessagesManager {
+  @tracked messages = [];
+
+  constructor(owner) {
+    setOwner(this, owner);
+  }
+
+  @cached
+  get stagedMessages() {
+    return this.messages.filterBy("staged");
+  }
+
+  @cached
+  get selectedMessages() {
+    return this.messages.filterBy("selected");
+  }
+
+  clearSelectedMessages() {
+    this.selectedMessages.forEach((message) => (message.selected = false));
+  }
+
+  clear() {
+    this.messages = [];
+  }
+
+  addMessages(messages = []) {
+    this.messages = this.messages
+      .concat(messages)
+      .uniqBy("id")
+      .sort((a, b) => a.createdAt - b.createdAt);
+  }
+
+  findMessage(messageId) {
+    return this.messages.find(
+      (message) => message.id === parseInt(messageId, 10)
+    );
+  }
+
+  findFirstMessageOfDay(a) {
+    return this.messages.find(
+      (b) =>
+        a.getFullYear() === b.createdAt.getFullYear() &&
+        a.getMonth() === b.createdAt.getMonth() &&
+        a.getDate() === b.createdAt.getDate()
+    );
+  }
+
+  removeMessage(message) {
+    return this.messages.removeObject(message);
+  }
+
+  findStagedMessage(stagedMessageId) {
+    return this.stagedMessages.find(
+      (message) => message.id === stagedMessageId
+    );
+  }
+
+  findIndexOfMessage(id) {
+    return this.messages.findIndex((m) => m.id === id);
+  }
+
+  findLastMessage() {
+    return this.messages.findLast((message) => !message.deletedAt);
+  }
+
+  findLastUserMessage(user) {
+    return this.messages.findLast(
+      (message) => message.user.id === user.id && !message.deletedAt
+    );
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/lib/chat-notification-levels.js b/plugins/chat/assets/javascripts/discourse/lib/chat-notification-levels.js
new file mode 100644
index 00000000000..d23c3d97823
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/lib/chat-notification-levels.js
@@ -0,0 +1,9 @@
+import {
+  NotificationLevels,
+  buttonDetails,
+} from "discourse/lib/notification-levels";
+
+export const threadNotificationButtonLevels = [
+  NotificationLevels.TRACKING,
+  NotificationLevels.REGULAR,
+].map(buttonDetails);
diff --git a/plugins/chat/assets/javascripts/discourse/lib/chat-threads-manager.js b/plugins/chat/assets/javascripts/discourse/lib/chat-threads-manager.js
new file mode 100644
index 00000000000..9fbac99477d
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/lib/chat-threads-manager.js
@@ -0,0 +1,114 @@
+import { inject as service } from "@ember/service";
+import { setOwner } from "@ember/application";
+import Promise from "rsvp";
+import ChatThread from "discourse/plugins/chat/discourse/models/chat-thread";
+import { cached, tracked } from "@glimmer/tracking";
+import { TrackedMap, TrackedObject } from "@ember-compat/tracked-built-ins";
+
+/*
+  The ChatThreadsManager is responsible for managing the loaded chat threads
+  for a ChatChannel model.
+
+  It provides helpers to facilitate using and managing loaded threads instead of constantly
+  fetching them from the server.
+*/
+
+export default class ChatThreadsManager {
+  @service chatTrackingStateManager;
+  @service chatChannelsManager;
+  @service chatApi;
+
+  @tracked _cached = new TrackedObject();
+  @tracked _unreadThreadOverview = new TrackedMap();
+
+  constructor(owner) {
+    setOwner(this, owner);
+  }
+
+  get unreadThreadCount() {
+    return this.unreadThreadOverview.size;
+  }
+
+  get unreadThreadOverview() {
+    return this._unreadThreadOverview;
+  }
+
+  set unreadThreadOverview(unreadThreadOverview) {
+    this._unreadThreadOverview.clear();
+
+    for (const [threadId, lastReplyCreatedAt] of Object.entries(
+      unreadThreadOverview
+    )) {
+      this.markThreadUnread(threadId, lastReplyCreatedAt);
+    }
+  }
+
+  markThreadUnread(threadId, lastReplyCreatedAt) {
+    this.unreadThreadOverview.set(
+      parseInt(threadId, 10),
+      new Date(lastReplyCreatedAt)
+    );
+  }
+
+  @cached
+  get threads() {
+    return Object.values(this._cached);
+  }
+
+  async find(channelId, threadId, options = { fetchIfNotFound: true }) {
+    const existingThread = this.#getFromCache(threadId);
+
+    if (existingThread) {
+      return Promise.resolve(existingThread);
+    } else if (options.fetchIfNotFound) {
+      return this.#fetchFromServer(channelId, threadId);
+    } else {
+      return Promise.resolve();
+    }
+  }
+
+  remove(threadObject) {
+    delete this._cached[threadObject.id];
+  }
+
+  add(channel, threadObject, options = {}) {
+    let model;
+
+    if (!options.replace) {
+      model = this.#getFromCache(threadObject.id);
+    }
+
+    if (!model) {
+      if (threadObject instanceof ChatThread) {
+        model = threadObject;
+      } else {
+        model = ChatThread.create(channel, threadObject);
+      }
+
+      this.#cache(model);
+    }
+
+    if (threadObject?.meta?.message_bus_last_ids?.thread_message_bus_last_id) {
+      model.threadMessageBusLastId =
+        threadObject.meta.message_bus_last_ids.thread_message_bus_last_id;
+    }
+
+    return model;
+  }
+
+  #cache(thread) {
+    this._cached[thread.id] = thread;
+  }
+
+  #getFromCache(id) {
+    return this._cached[id];
+  }
+
+  async #fetchFromServer(channelId, threadId) {
+    return this.chatApi.thread(channelId, threadId).then((result) => {
+      return this.chatChannelsManager.find(channelId).then((channel) => {
+        return channel.threadsManager.add(channel, result.thread);
+      });
+    });
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/lib/check-message-visibility.js b/plugins/chat/assets/javascripts/discourse/lib/check-message-visibility.js
new file mode 100644
index 00000000000..ee35cd62e0d
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/lib/check-message-visibility.js
@@ -0,0 +1,11 @@
+export function checkMessageBottomVisibility(list, message) {
+  const distanceToTop = window.pageYOffset + list.getBoundingClientRect().top;
+  const bounding = message.getBoundingClientRect();
+  return bounding.bottom - distanceToTop <= list.clientHeight + 1;
+}
+
+export function checkMessageTopVisibility(list, message) {
+  const distanceToTop = window.pageYOffset + list.getBoundingClientRect().top;
+  const bounding = message.getBoundingClientRect();
+  return bounding.top - distanceToTop >= -1;
+}
diff --git a/plugins/chat/assets/javascripts/discourse/lib/collection.js b/plugins/chat/assets/javascripts/discourse/lib/collection.js
new file mode 100644
index 00000000000..e472d45bffe
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/lib/collection.js
@@ -0,0 +1,99 @@
+import { ajax } from "discourse/lib/ajax";
+import { tracked } from "@glimmer/tracking";
+import { bind } from "discourse-common/utils/decorators";
+import { Promise } from "rsvp";
+
+/**
+ * Handles a paginated API response.
+ */
+export default class Collection {
+  @tracked items = [];
+  @tracked meta = {};
+  @tracked loading = false;
+  @tracked fetchedOnce = false;
+
+  constructor(resourceURL, handler) {
+    this._resourceURL = resourceURL;
+    this._handler = handler;
+    this._fetchedAll = false;
+  }
+
+  get loadMoreURL() {
+    return this.meta?.load_more_url;
+  }
+
+  get totalRows() {
+    return this.meta?.total_rows;
+  }
+
+  get length() {
+    return this.items?.length;
+  }
+
+  // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols
+  [Symbol.iterator]() {
+    let index = 0;
+
+    return {
+      next: () => {
+        if (index < this.length) {
+          return { value: this.items[index++], done: false };
+        } else {
+          return { done: true };
+        }
+      },
+    };
+  }
+
+  /**
+   * Loads first batch of results
+   * @returns {Promise}
+   */
+  @bind
+  load(params = {}) {
+    if (
+      this.loading ||
+      this._fetchedAll ||
+      (this.totalRows && this.items.length >= this.totalRows)
+    ) {
+      return Promise.resolve();
+    }
+
+    this.loading = true;
+
+    let endpoint;
+    if (this.loadMoreURL) {
+      endpoint = this.loadMoreURL;
+    } else {
+      const filteredQueryParams = Object.entries(params).filter(
+        ([, v]) => v !== undefined
+      );
+
+      const queryString = new URLSearchParams(filteredQueryParams).toString();
+      endpoint = this._resourceURL + (queryString ? `?${queryString}` : "");
+    }
+
+    return this.#fetch(endpoint)
+      .then((result) => {
+        const items = this._handler(result);
+
+        if (items.length) {
+          this.items = (this.items ?? []).concat(items);
+        }
+
+        if (!items.length || items.length < params.limit) {
+          this._fetchedAll = true;
+        }
+
+        this.meta = result.meta;
+        this.fetchedOnce = true;
+      })
+      .finally(() => {
+        this.loading = false;
+      });
+  }
+
+  #fetch(url) {
+    return ajax(url, { type: "GET" });
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/lib/fabricators.js b/plugins/chat/assets/javascripts/discourse/lib/fabricators.js
new file mode 100644
index 00000000000..7c360f020d6
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/lib/fabricators.js
@@ -0,0 +1,194 @@
+/*
+Fabricators are used to create fake data for testing purposes.
+The following fabricators are available in lib folder to allow
+styleguide to use them, and eventually to generate dummy data
+in a placeholder component. It should not be used for any other case.
+*/
+
+import ChatChannel, {
+  CHANNEL_STATUSES,
+  CHATABLE_TYPES,
+} from "discourse/plugins/chat/discourse/models/chat-channel";
+import ChatMessage from "discourse/plugins/chat/discourse/models/chat-message";
+import ChatThread from "discourse/plugins/chat/discourse/models/chat-thread";
+import ChatThreadPreview from "discourse/plugins/chat/discourse/models/chat-thread-preview";
+import ChatDirectMessage from "discourse/plugins/chat/discourse/models/chat-direct-message";
+import ChatMessageMentionWarning from "discourse/plugins/chat/discourse/models/chat-message-mention-warning";
+import ChatMessageReaction from "discourse/plugins/chat/discourse/models/chat-message-reaction";
+import User from "discourse/models/user";
+import Bookmark from "discourse/models/bookmark";
+import Category from "discourse/models/category";
+import Group from "discourse/models/group";
+
+let sequence = 0;
+
+function messageFabricator(args = {}) {
+  const channel = args.channel || channelFabricator();
+
+  const message = ChatMessage.create(
+    channel,
+    Object.assign(
+      {
+        id: args.id || sequence++,
+        user: args.user || userFabricator(),
+        message:
+          args.message ||
+          "@discobot **abc**defghijklmnopqrstuvwxyz [discourse](discourse.org) :rocket: ",
+        created_at: args.created_at || moment(),
+      },
+      args
+    )
+  );
+
+  const excerptLength = 50;
+  const text = message.message.toString();
+  if (text.length <= excerptLength) {
+    message.excerpt = text;
+  } else {
+    message.excerpt = text.slice(0, excerptLength) + "...";
+  }
+
+  return message;
+}
+
+function channelFabricator(args = {}) {
+  const id = args.id || sequence++;
+
+  const channel = ChatChannel.create({
+    id,
+    chatable_type:
+      args.chatable?.type ||
+      args.chatable_type ||
+      CHATABLE_TYPES.categoryChannel,
+    chatable_id: args.chatable?.id || args.chatable_id,
+    title: args.title || "General",
+    description: args.description,
+    chatable: args.chatable || categoryFabricator(),
+    status: args.status || CHANNEL_STATUSES.open,
+    slug: args.chatable?.slug || "general",
+    meta: Object.assign({ can_delete_self: true }, args.meta || {}),
+    archive_failed: args.archive_failed ?? false,
+  });
+
+  channel.lastMessage = messageFabricator({ channel });
+
+  return channel;
+}
+
+function categoryFabricator(args = {}) {
+  return Category.create({
+    id: args.id || sequence++,
+    color: args.color || "D56353",
+    read_restricted: false,
+    name: args.name || "General",
+    slug: args.slug || "general",
+  });
+}
+
+function directMessageFabricator(args = {}) {
+  return ChatDirectMessage.create({
+    id: args.id || sequence++,
+    users: args.users || [userFabricator(), userFabricator()],
+  });
+}
+
+function directMessageChannelFabricator(args = {}) {
+  const directMessage =
+    args.chatable ||
+    directMessageFabricator({
+      id: args.chatable_id || sequence++,
+    });
+
+  return channelFabricator(
+    Object.assign(args, {
+      chatable_type: CHATABLE_TYPES.directMessageChannel,
+      chatable_id: directMessage.id,
+      chatable: directMessage,
+    })
+  );
+}
+
+function userFabricator(args = {}) {
+  return User.create({
+    id: args.id || sequence++,
+    username: args.username || "hawk",
+    name: args.name,
+    avatar_template: "/letter_avatar_proxy/v3/letter/t/41988e/{size}.png",
+    suspended_till: args.suspended_till,
+  });
+}
+
+function bookmarkFabricator(args = {}) {
+  return Bookmark.create({
+    id: args.id || sequence++,
+  });
+}
+
+function threadFabricator(args = {}) {
+  const channel = args.channel || channelFabricator();
+  return ChatThread.create(channel, {
+    id: args.id || sequence++,
+    original_message: args.original_message || messageFabricator({ channel }),
+    preview: args.preview || threadPreviewFabricator({ channel }),
+  });
+}
+function threadPreviewFabricator(args = {}) {
+  return ChatThreadPreview.create({
+    last_reply_id: args.last_reply_id || sequence++,
+    last_reply_created_at: args.last_reply_created_at || Date.now(),
+    last_reply_excerpt: args.last_reply_excerpt || "This is a reply",
+  });
+}
+
+function reactionFabricator(args = {}) {
+  return ChatMessageReaction.create({
+    count: args.count || 1,
+    users: args.users || [userFabricator()],
+    emoji: args.emoji || "heart",
+    reacted: args.reacted || false,
+  });
+}
+
+function groupFabricator(args = {}) {
+  return Group.create({
+    name: args.name || "Engineers",
+  });
+}
+
+function messageMentionWarningFabricator(message, args = {}) {
+  return ChatMessageMentionWarning.create(message, args);
+}
+
+function uploadFabricator() {
+  return {
+    extension: "jpeg",
+    filesize: 126177,
+    height: 800,
+    human_filesize: "123 KB",
+    id: 202,
+    original_filename: "avatar.PNG.jpg",
+    retain_hours: null,
+    short_path: "/images/avatar.png",
+    short_url: "upload://yoj8pf9DdIeHRRULyw7i57GAYdz.jpeg",
+    thumbnail_height: 320,
+    thumbnail_width: 690,
+    url: "/images/avatar.png",
+    width: 1920,
+  };
+}
+
+export default {
+  bookmark: bookmarkFabricator,
+  user: userFabricator,
+  channel: channelFabricator,
+  directMessageChannel: directMessageChannelFabricator,
+  message: messageFabricator,
+  thread: threadFabricator,
+  threadPreview: threadPreviewFabricator,
+  reaction: reactionFabricator,
+  upload: uploadFabricator,
+  category: categoryFabricator,
+  directMessage: directMessageFabricator,
+  messageMentionWarning: messageMentionWarningFabricator,
+  group: groupFabricator,
+};
diff --git a/plugins/chat/assets/javascripts/discourse/lib/hashtag-types/channel.js b/plugins/chat/assets/javascripts/discourse/lib/hashtag-types/channel.js
new file mode 100644
index 00000000000..f49216bbb38
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/lib/hashtag-types/channel.js
@@ -0,0 +1,36 @@
+import HashtagTypeBase from "discourse/lib/hashtag-types/base";
+import { iconHTML } from "discourse-common/lib/icon-library";
+import { inject as service } from "@ember/service";
+
+export default class ChannelHashtagType extends HashtagTypeBase {
+  @service chatChannelsManager;
+  @service currentUser;
+
+  get type() {
+    return "channel";
+  }
+
+  get preloadedData() {
+    if (this.currentUser) {
+      return this.chatChannelsManager.publicMessageChannels;
+    } else {
+      return [];
+    }
+  }
+
+  generateColorCssClasses(channel) {
+    return [
+      `.d-icon.hashtag-color--${this.type}-${channel.id} { color: var(--category-${channel.chatable.id}-color); }`,
+    ];
+  }
+
+  generateIconHTML(hashtag) {
+    const hashtagId = parseInt(hashtag.id, 10);
+    const colorCssClass = !this.preloadedData.mapBy("id").includes(hashtagId)
+      ? "hashtag-missing"
+      : `hashtag-color--${this.type}-${hashtag.id}`;
+    return iconHTML(hashtag.icon, {
+      class: colorCssClass,
+    });
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/lib/scroll-helpers.js b/plugins/chat/assets/javascripts/discourse/lib/scroll-helpers.js
new file mode 100644
index 00000000000..f059be73646
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/lib/scroll-helpers.js
@@ -0,0 +1,49 @@
+import { schedule } from "@ember/runloop";
+import { stackingContextFix } from "discourse/plugins/chat/discourse/lib/chat-ios-hacks";
+
+export function scrollListToBottom(list) {
+  stackingContextFix(list, () => {
+    list.scrollTo({ top: 0, behavior: "auto" });
+  });
+}
+
+export function scrollListToTop(list) {
+  stackingContextFix(list, () => {
+    list.scrollTo({ top: -list.scrollHeight, behavior: "auto" });
+  });
+}
+
+export function scrollListToMessage(
+  list,
+  message,
+  opts = { highlight: false, position: "start", autoExpand: false }
+) {
+  if (!message) {
+    return;
+  }
+
+  if (message?.deletedAt && opts.autoExpand) {
+    message.expanded = true;
+  }
+
+  schedule("afterRender", () => {
+    const messageEl = list.querySelector(
+      `.chat-message-container[data-id='${message.id}']`
+    );
+
+    if (!messageEl) {
+      return;
+    }
+
+    if (opts.highlight) {
+      message.highlight();
+    }
+
+    stackingContextFix(list, () => {
+      messageEl.scrollIntoView({
+        behavior: "auto",
+        block: opts.position || "center",
+      });
+    });
+  });
+}
diff --git a/plugins/chat/assets/javascripts/discourse/lib/slugify-channel.js b/plugins/chat/assets/javascripts/discourse/lib/slugify-channel.js
index f7a2734879e..492a25a9ae5 100644
--- a/plugins/chat/assets/javascripts/discourse/lib/slugify-channel.js
+++ b/plugins/chat/assets/javascripts/discourse/lib/slugify-channel.js
@@ -4,6 +4,11 @@ export default function slugifyChannel(channel) {
   if (channel.slug) {
     return channel.slug;
   }
+
+  if (!channel.escapedTitle && !channel.title) {
+    return "-";
+  }
+
   const slug = slugify(channel.escapedTitle || channel.title);
   const resolvedSlug = (
     slug.length
diff --git a/plugins/chat/assets/javascripts/discourse/lib/textarea-interactor.js b/plugins/chat/assets/javascripts/discourse/lib/textarea-interactor.js
new file mode 100644
index 00000000000..2cdcb6ddf00
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/lib/textarea-interactor.js
@@ -0,0 +1,100 @@
+import EmberObject from "@ember/object";
+import TextareaTextManipulation from "discourse/mixins/textarea-text-manipulation";
+import { next, schedule } from "@ember/runloop";
+import { setOwner } from "@ember/application";
+import { inject as service } from "@ember/service";
+import { registerDestructor } from "@ember/destroyable";
+
+// This class sole purpose is to provide a way to interact with the textarea
+// using the existing TextareaTextManipulation mixin without using it directly
+// in the composer component. It will make future migration easier.
+export default class TextareaInteractor extends EmberObject.extend(
+  TextareaTextManipulation
+) {
+  @service capabilities;
+  @service site;
+  @service siteSettings;
+
+  constructor(owner, textarea) {
+    super(...arguments);
+    setOwner(this, owner);
+    this.textarea = textarea;
+    this._textarea = textarea;
+    this.element = this._textarea;
+    this.ready = true;
+    this.composerFocusSelector = `#${textarea.id}`;
+
+    this.init(); // mixin init wouldn't be called otherwise
+    this.composerEventPrefix = null; // we don't need app events
+
+    // paste is using old native ember events defined on composer
+    this.textarea.addEventListener("paste", this.paste);
+    registerDestructor(this, (instance) => instance.teardown());
+  }
+
+  teardown() {
+    this.textarea.removeEventListener("paste", this.paste);
+  }
+
+  set value(value) {
+    this._textarea.value = value;
+    const event = new Event("input", {
+      bubbles: true,
+      cancelable: true,
+    });
+    this._textarea.dispatchEvent(event);
+  }
+
+  blur() {
+    next(() => {
+      schedule("afterRender", () => {
+        this._textarea.blur();
+      });
+    });
+  }
+
+  focus(opts = { ensureAtEnd: false, refreshHeight: true, addText: null }) {
+    next(() => {
+      schedule("afterRender", () => {
+        if (opts.refreshHeight) {
+          this.refreshHeight();
+        }
+
+        if (opts.ensureAtEnd) {
+          this.ensureCaretAtEnd();
+        }
+
+        if (this.capabilities.isIpadOS || this.site.mobileView) {
+          return;
+        }
+
+        if (opts.addText) {
+          this.addText(this.getSelected(), opts.addText);
+        }
+
+        this.focusTextArea();
+      });
+    });
+  }
+
+  ensureCaretAtEnd() {
+    schedule("afterRender", () => {
+      this._textarea.setSelectionRange(
+        this._textarea.value.length,
+        this._textarea.value.length
+      );
+    });
+  }
+
+  refreshHeight() {
+    schedule("afterRender", () => {
+      // this is a quirk which forces us to `auto` first or textarea
+      // won't resize
+      this._textarea.style.height = "auto";
+
+      // +1 is to workaround a rounding error visible on electron
+      // causing scrollbars to show when they shouldn’t
+      this._textarea.style.height = this._textarea.scrollHeight + 1 + "px";
+    });
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/models/chat-channel-archive.js b/plugins/chat/assets/javascripts/discourse/models/chat-channel-archive.js
new file mode 100644
index 00000000000..5626dc0b5a9
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/models/chat-channel-archive.js
@@ -0,0 +1,21 @@
+import { tracked } from "@glimmer/tracking";
+
+export default class ChatChannelArchive {
+  static create(args = {}) {
+    return new ChatChannelArchive(args);
+  }
+
+  @tracked failed;
+  @tracked completed;
+  @tracked messages;
+  @tracked topicId;
+  @tracked totalMessages;
+
+  constructor(args = {}) {
+    this.failed = args.archive_failed;
+    this.completed = args.archive_completed;
+    this.messages = args.archived_messages;
+    this.topicId = args.archive_topic_id;
+    this.totalMessages = args.total_messages;
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/models/chat-channel.js b/plugins/chat/assets/javascripts/discourse/models/chat-channel.js
index 182b01a1ec3..056c0356133 100644
--- a/plugins/chat/assets/javascripts/discourse/models/chat-channel.js
+++ b/plugins/chat/assets/javascripts/discourse/models/chat-channel.js
@@ -1,10 +1,17 @@
-import RestModel from "discourse/models/rest";
-import I18n from "I18n";
-import User from "discourse/models/user";
 import UserChatChannelMembership from "discourse/plugins/chat/discourse/models/user-chat-channel-membership";
-import { ajax } from "discourse/lib/ajax";
+import ChatMessage from "discourse/plugins/chat/discourse/models/chat-message";
 import { escapeExpression } from "discourse/lib/utilities";
 import { tracked } from "@glimmer/tracking";
+import slugifyChannel from "discourse/plugins/chat/discourse/lib/slugify-channel";
+import ChatThreadsManager from "discourse/plugins/chat/discourse/lib/chat-threads-manager";
+import ChatMessagesManager from "discourse/plugins/chat/discourse/lib/chat-messages-manager";
+import { getOwner } from "discourse-common/lib/get-owner";
+import guid from "pretty-text/guid";
+import ChatThread from "discourse/plugins/chat/discourse/models/chat-thread";
+import ChatDirectMessage from "discourse/plugins/chat/discourse/models/chat-direct-message";
+import ChatChannelArchive from "discourse/plugins/chat/discourse/models/chat-channel-archive";
+import Category from "discourse/models/category";
+import ChatTrackingState from "discourse/plugins/chat/discourse/models/chat-tracking-state";
 
 export const CHATABLE_TYPES = {
   directMessageChannel: "DirectMessage",
@@ -18,19 +25,6 @@ export const CHANNEL_STATUSES = {
   archived: "archived",
 };
 
-export function channelStatusName(channelStatus) {
-  switch (channelStatus) {
-    case CHANNEL_STATUSES.open:
-      return I18n.t("chat.channel_status.open");
-    case CHANNEL_STATUSES.readOnly:
-      return I18n.t("chat.channel_status.read_only");
-    case CHANNEL_STATUSES.closed:
-      return I18n.t("chat.channel_status.closed");
-    case CHANNEL_STATUSES.archived:
-      return I18n.t("chat.channel_status.archived");
-  }
-}
-
 export function channelStatusIcon(channelStatus) {
   if (channelStatus === CHANNEL_STATUSES.open) {
     return null;
@@ -57,13 +51,92 @@ const READONLY_STATUSES = [
   CHANNEL_STATUSES.archived,
 ];
 
-export default class ChatChannel extends RestModel {
-  @tracked currentUserMembership = null;
-  @tracked isDraft = false;
+export default class ChatChannel {
+  static create(args = {}) {
+    return new ChatChannel(args);
+  }
+
   @tracked title;
+  @tracked slug;
   @tracked description;
-  @tracked chatableType;
   @tracked status;
+  @tracked activeThread = null;
+  @tracked meta;
+  @tracked chatableType;
+  @tracked chatableUrl;
+  @tracked autoJoinUsers = false;
+  @tracked allowChannelWideMentions = true;
+  @tracked membershipsCount = 0;
+  @tracked archive;
+  @tracked tracking;
+  @tracked threadingEnabled = false;
+
+  threadsManager = new ChatThreadsManager(getOwner(this));
+  messagesManager = new ChatMessagesManager(getOwner(this));
+
+  @tracked _currentUserMembership;
+  @tracked _lastMessage;
+
+  constructor(args = {}) {
+    this.id = args.id;
+    this.chatableId = args.chatable_id;
+    this.chatableUrl = args.chatable_url;
+    this.chatableType = args.chatable_type;
+    this.membershipsCount = args.memberships_count;
+    this.slug = args.slug;
+    this.title = args.title;
+    this.status = args.status;
+    this.description = args.description;
+    this.threadingEnabled = args.threading_enabled;
+    this.autoJoinUsers = args.auto_join_users;
+    this.allowChannelWideMentions = args.allow_channel_wide_mentions;
+    this.chatable = this.isDirectMessageChannel
+      ? ChatDirectMessage.create({
+          id: args.chatable?.id,
+          users: args.chatable?.users,
+        })
+      : Category.create(args.chatable);
+    this.currentUserMembership = args.current_user_membership;
+
+    if (args.archive_completed || args.archive_failed) {
+      this.archive = ChatChannelArchive.create(args);
+    }
+
+    this.tracking = new ChatTrackingState(getOwner(this));
+    this.lastMessage = args.last_message;
+    this.meta = args.meta;
+  }
+
+  get unreadThreadsCountSinceLastViewed() {
+    return Array.from(this.threadsManager.unreadThreadOverview.values()).filter(
+      (lastReplyCreatedAt) =>
+        lastReplyCreatedAt >= this.currentUserMembership.lastViewedAt
+    ).length;
+  }
+
+  updateLastViewedAt() {
+    this.currentUserMembership.lastViewedAt = new Date();
+  }
+
+  get canDeleteSelf() {
+    return this.meta.can_delete_self;
+  }
+
+  get canDeleteOthers() {
+    return this.meta.can_delete_others;
+  }
+
+  get canFlag() {
+    return this.meta.can_flag;
+  }
+
+  get userSilenced() {
+    return this.meta.user_silenced;
+  }
+
+  get canModerate() {
+    return this.meta.can_moderate;
+  }
 
   get escapedTitle() {
     return escapeExpression(this.title);
@@ -73,12 +146,20 @@ export default class ChatChannel extends RestModel {
     return escapeExpression(this.description);
   }
 
+  get slugifiedTitle() {
+    return this.slug || slugifyChannel(this);
+  }
+
+  get routeModels() {
+    return [this.slugifiedTitle, this.id];
+  }
+
   get isDirectMessageChannel() {
-    return this.chatable_type === CHATABLE_TYPES.directMessageChannel;
+    return this.chatableType === CHATABLE_TYPES.directMessageChannel;
   }
 
   get isCategoryChannel() {
-    return this.chatable_type === CHATABLE_TYPES.categoryChannel;
+    return this.chatableType === CHATABLE_TYPES.categoryChannel;
   }
 
   get isOpen() {
@@ -105,6 +186,45 @@ export default class ChatChannel extends RestModel {
     return this.currentUserMembership.following;
   }
 
+  get canJoin() {
+    return this.meta.can_join_chat_channel;
+  }
+
+  createStagedThread(message) {
+    const clonedMessage = message.duplicate();
+
+    const thread = new ChatThread(this, {
+      id: `staged-thread-${message.channel.id}-${message.id}`,
+      original_message: message,
+      staged: true,
+      created_at: moment.utc().format(),
+    });
+
+    clonedMessage.thread = thread;
+    clonedMessage.manager = thread.messagesManager;
+    thread.messagesManager.addMessages([clonedMessage]);
+
+    return thread;
+  }
+
+  async stageMessage(message) {
+    message.id = guid();
+    message.staged = true;
+    message.draft = false;
+    message.createdAt = new Date();
+    message.channel = this;
+
+    if (message.inReplyTo) {
+      if (!this.threadingEnabled) {
+        this.messagesManager.addMessages([message]);
+      }
+    } else {
+      this.messagesManager.addMessages([message]);
+    }
+
+    message.manager = this.messagesManager;
+  }
+
   canModifyMessages(user) {
     if (user.staff) {
       return !STAFF_READONLY_STATUSES.includes(this.status);
@@ -113,74 +233,33 @@ export default class ChatChannel extends RestModel {
     return !READONLY_STATUSES.includes(this.status);
   }
 
-  updateMembership(membership) {
-    this.currentUserMembership.following = membership.following;
-    this.currentUserMembership.muted = membership.muted;
-    this.currentUserMembership.desktop_notification_level =
-      membership.desktop_notification_level;
-    this.currentUserMembership.mobile_notification_level =
-      membership.mobile_notification_level;
+  get currentUserMembership() {
+    return this._currentUserMembership;
   }
 
-  updateLastReadMessage(messageId) {
-    if (!this.isFollowing || !messageId) {
+  set currentUserMembership(membership) {
+    if (membership instanceof UserChatChannelMembership) {
+      this._currentUserMembership = membership;
+    } else {
+      this._currentUserMembership =
+        UserChatChannelMembership.create(membership);
+    }
+  }
+
+  get lastMessage() {
+    return this._lastMessage;
+  }
+
+  set lastMessage(message) {
+    if (!message) {
+      this._lastMessage = null;
       return;
     }
 
-    return ajax(`/chat/${this.id}/read/${messageId}.json`, {
-      method: "PUT",
-    }).then(() => {
-      this.currentUserMembership.last_read_message_id = messageId;
-    });
+    if (message instanceof ChatMessage) {
+      this._lastMessage = message;
+    } else {
+      this._lastMessage = ChatMessage.create(this, message);
+    }
   }
 }
-
-ChatChannel.reopenClass({
-  create(args) {
-    args = args || {};
-
-    this._initUserModels(args);
-    this._initUserMembership(args);
-
-    args.chatableType = args.chatable_type;
-    args.membershipsCount = args.memberships_count;
-
-    return this._super(args);
-  },
-
-  _initUserModels(args) {
-    if (args.chatable?.users?.length) {
-      for (let i = 0; i < args.chatable?.users?.length; i++) {
-        const userData = args.chatable.users[i];
-        args.chatable.users[i] = User.create(userData);
-      }
-    }
-  },
-
-  _initUserMembership(args) {
-    if (args.currentUserMembership instanceof UserChatChannelMembership) {
-      return;
-    }
-
-    args.currentUserMembership = UserChatChannelMembership.create(
-      args.current_user_membership || {
-        following: false,
-        muted: false,
-        unread_count: 0,
-        unread_mentions: 0,
-      }
-    );
-
-    delete args.current_user_membership;
-  },
-});
-
-export function createDirectMessageChannelDraft() {
-  return ChatChannel.create({
-    isDraft: true,
-    chatable_type: CHATABLE_TYPES.directMessageChannel,
-    chatable: {
-      users: [],
-    },
-  });
-}
diff --git a/plugins/chat/assets/javascripts/discourse/models/chat-chatable.js b/plugins/chat/assets/javascripts/discourse/models/chat-chatable.js
new file mode 100644
index 00000000000..63558ca8f2b
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/models/chat-chatable.js
@@ -0,0 +1,72 @@
+import ChatChannel from "discourse/plugins/chat/discourse/models/chat-channel";
+import User from "discourse/models/user";
+import { tracked } from "@glimmer/tracking";
+import { inject as service } from "@ember/service";
+
+export default class ChatChatable {
+  static create(args = {}) {
+    return new ChatChatable(args);
+  }
+
+  static createUser(model) {
+    return new ChatChatable({
+      type: "user",
+      model,
+      identifier: `u-${model.id}`,
+    });
+  }
+
+  static createChannel(model) {
+    return new ChatChatable({
+      type: "channel",
+      model,
+      identifier: `c-${model.id}`,
+    });
+  }
+
+  @service chatChannelsManager;
+
+  @tracked identifier;
+  @tracked type;
+  @tracked model;
+  @tracked enabled = true;
+  @tracked tracking;
+
+  constructor(args = {}) {
+    this.identifier = args.identifier;
+    this.type = args.type;
+
+    switch (this.type) {
+      case "channel":
+        if (args.model.chatable?.users?.length === 1) {
+          this.enabled = args.model.chatable?.users[0].has_chat_enabled;
+        }
+
+        if (args.model instanceof ChatChannel) {
+          this.model = args.model;
+          break;
+        }
+
+        this.model = ChatChannel.create(args.model);
+        break;
+      case "user":
+        this.enabled = args.model.has_chat_enabled;
+
+        if (args.model instanceof User) {
+          this.model = args.model;
+          break;
+        }
+
+        this.model = User.create(args.model);
+        break;
+    }
+  }
+
+  get isUser() {
+    return this.type === "user";
+  }
+
+  get isSingleUserChannel() {
+    return this.type === "channel" && this.model?.chatable?.users?.length === 1;
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/models/chat-direct-message.js b/plugins/chat/assets/javascripts/discourse/models/chat-direct-message.js
new file mode 100644
index 00000000000..00f996180ec
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/models/chat-direct-message.js
@@ -0,0 +1,29 @@
+import User from "discourse/models/user";
+import { tracked } from "@glimmer/tracking";
+import { CHATABLE_TYPES } from "discourse/plugins/chat/discourse/models/chat-channel";
+
+export default class ChatDirectMessage {
+  static create(args = {}) {
+    return new ChatDirectMessage(args);
+  }
+
+  @tracked id;
+  @tracked users = null;
+
+  type = CHATABLE_TYPES.directMessageChannel;
+
+  constructor(args = {}) {
+    this.id = args.id;
+    this.users = this.#initUsers(args.users || []);
+  }
+
+  #initUsers(users) {
+    return users.map((user) => {
+      if (!user || user instanceof User) {
+        return user;
+      }
+
+      return User.create(user);
+    });
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/models/chat-message-mention-warning.js b/plugins/chat/assets/javascripts/discourse/models/chat-message-mention-warning.js
new file mode 100644
index 00000000000..0aec8f7e16e
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/models/chat-message-mention-warning.js
@@ -0,0 +1,21 @@
+import { tracked } from "@glimmer/tracking";
+
+export default class ChatMessageMentionWarning {
+  static create(message, args = {}) {
+    return new ChatMessageMentionWarning(message, args);
+  }
+
+  @tracked invitationSent = false;
+  @tracked cannotSee;
+  @tracked withoutMembership;
+  @tracked groupsWithTooManyMembers;
+  @tracked groupWithMentionsDisabled;
+
+  constructor(message, args = {}) {
+    this.message = args.message;
+    this.cannotSee = args.cannot_see;
+    this.withoutMembership = args.without_membership;
+    this.groupsWithTooManyMembers = args.groups_with_too_many_members;
+    this.groupWithMentionsDisabled = args.group_mentions_disabled;
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/models/chat-message-reaction.js b/plugins/chat/assets/javascripts/discourse/models/chat-message-reaction.js
new file mode 100644
index 00000000000..86748cab894
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/models/chat-message-reaction.js
@@ -0,0 +1,35 @@
+import { tracked } from "@glimmer/tracking";
+import User from "discourse/models/user";
+import { TrackedArray } from "@ember-compat/tracked-built-ins";
+
+export const REACTIONS = { add: "add", remove: "remove" };
+
+export default class ChatMessageReaction {
+  static create(args = {}) {
+    return new ChatMessageReaction(args);
+  }
+
+  @tracked count = 0;
+  @tracked reacted = false;
+  @tracked users = [];
+  @tracked emoji;
+
+  constructor(args = {}) {
+    this.count = args.count;
+    this.emoji = args.emoji;
+    this.users = this.#initUsersModels(args.users);
+    this.reacted = args.reacted;
+  }
+
+  #initUsersModels(users = []) {
+    return new TrackedArray(
+      users.map((user) => {
+        if (user instanceof User) {
+          return user;
+        }
+
+        return User.create(user);
+      })
+    );
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/models/chat-message.js b/plugins/chat/assets/javascripts/discourse/models/chat-message.js
index 812eb8748db..1cc2f2598fe 100644
--- a/plugins/chat/assets/javascripts/discourse/models/chat-message.js
+++ b/plugins/chat/assets/javascripts/discourse/models/chat-message.js
@@ -1,18 +1,401 @@
-import RestModel from "discourse/models/rest";
 import User from "discourse/models/user";
+import { cached, tracked } from "@glimmer/tracking";
+import { TrackedArray, TrackedObject } from "@ember-compat/tracked-built-ins";
+import ChatMessageReaction from "discourse/plugins/chat/discourse/models/chat-message-reaction";
+import Bookmark from "discourse/models/bookmark";
+import I18n from "I18n";
+import { generateCookFunction } from "discourse/lib/text";
+import simpleCategoryHashMentionTransform from "discourse/plugins/chat/discourse/lib/simple-category-hash-mention-transform";
+import { getOwner } from "discourse-common/lib/get-owner";
+import discourseLater from "discourse-common/lib/later";
 
-export default class ChatMessage extends RestModel {}
+export default class ChatMessage {
+  static cookFunction = null;
 
-ChatMessage.reopenClass({
-  create(args) {
-    args = args || {};
-    this._initUserModel(args);
-    return this._super(args);
-  },
+  static create(channel, args = {}) {
+    return new ChatMessage(channel, args);
+  }
 
-  _initUserModel(args) {
-    if (args.user) {
-      args.user = User.create(args.user);
+  static createDraftMessage(channel, args = {}) {
+    args.draft = true;
+    return ChatMessage.create(channel, args);
+  }
+
+  @tracked id;
+  @tracked error;
+  @tracked selected;
+  @tracked channel;
+  @tracked staged;
+  @tracked draftSaved;
+  @tracked draft;
+  @tracked createdAt;
+  @tracked uploads;
+  @tracked excerpt;
+  @tracked reactions;
+  @tracked reviewableId;
+  @tracked user;
+  @tracked inReplyTo;
+  @tracked expanded = true;
+  @tracked bookmark;
+  @tracked userFlagStatus;
+  @tracked hidden;
+  @tracked version = 0;
+  @tracked edited;
+  @tracked editing;
+  @tracked chatWebhookEvent = new TrackedObject();
+  @tracked mentionWarning;
+  @tracked availableFlags;
+  @tracked newest;
+  @tracked highlighted;
+  @tracked firstOfResults;
+  @tracked message;
+  @tracked manager;
+  @tracked deletedById;
+
+  @tracked _deletedAt;
+  @tracked _cooked;
+  @tracked _thread;
+
+  constructor(channel, args = {}) {
+    // when modifying constructor, be sure to update duplicate function accordingly
+    this.id = args.id;
+    this.channel = channel;
+    this.manager = args.manager;
+    this.newest = args.newest || false;
+    this.draftSaved = args.draftSaved || args.draft_saved || false;
+    this.firstOfResults = args.firstOfResults || args.first_of_results || false;
+    this.staged = args.staged || false;
+    this.edited = args.edited || false;
+    this.editing = args.editing || false;
+    this.availableFlags = args.availableFlags || args.available_flags;
+    this.hidden = args.hidden || false;
+    this.chatWebhookEvent = args.chatWebhookEvent || args.chat_webhook_event;
+    this.createdAt = args.created_at ? new Date(args.created_at) : null;
+    this.deletedById = args.deletedById || args.deleted_by_id;
+    this._deletedAt = args.deletedAt || args.deleted_at;
+    this.expanded =
+      this.hidden || this._deletedAt ? false : args.expanded || true;
+    this.excerpt = args.excerpt;
+    this.reviewableId = args.reviewableId || args.reviewable_id;
+    this.userFlagStatus = args.userFlagStatus || args.user_flag_status;
+    this.draft = args.draft;
+    this.message = args.message || "";
+    this._cooked = args.cooked || "";
+    this.inReplyTo =
+      args.inReplyTo ||
+      (args.in_reply_to || args.replyToMsg
+        ? ChatMessage.create(channel, args.in_reply_to || args.replyToMsg)
+        : null);
+    this.reactions = this.#initChatMessageReactionModel(args.reactions);
+    this.uploads = new TrackedArray(args.uploads || []);
+    this.user = this.#initUserModel(args.user);
+    this.bookmark = args.bookmark ? Bookmark.create(args.bookmark) : null;
+    this.mentionedUsers = this.#initMentionedUsers(args.mentioned_users);
+
+    if (args.thread) {
+      this.thread = args.thread;
     }
-  },
-});
+  }
+
+  duplicate() {
+    // This is important as a message can exist in the context of a channel or a thread
+    // The current strategy is to have a different message object in each cases to avoid
+    // side effects
+    const message = new ChatMessage(this.channel, {
+      id: this.id,
+      newest: this.newest,
+      staged: this.staged,
+      edited: this.edited,
+      availableFlags: this.availableFlags,
+      hidden: this.hidden,
+      chatWebhookEvent: this.chatWebhookEvent,
+      createdAt: this.createdAt,
+      deletedAt: this.deletedAt,
+      excerpt: this.excerpt,
+      reviewableId: this.reviewableId,
+      userFlagStatus: this.userFlagStatus,
+      draft: this.draft,
+      message: this.message,
+      cooked: this.cooked,
+    });
+
+    message.reactions = this.reactions;
+    message.user = this.user;
+    message.inReplyTo = this.inReplyTo;
+    message.bookmark = this.bookmark;
+    message.uploads = this.uploads;
+
+    return message;
+  }
+
+  get replyable() {
+    return !this.staged && !this.error;
+  }
+
+  get editable() {
+    return !this.staged && !this.error;
+  }
+
+  get thread() {
+    return this._thread;
+  }
+
+  set thread(thread) {
+    this._thread = this.channel.threadsManager.add(this.channel, thread, {
+      replace: true,
+    });
+  }
+
+  get deletedAt() {
+    return this._deletedAt;
+  }
+
+  set deletedAt(value) {
+    this._deletedAt = value;
+    this.incrementVersion();
+    return this._deletedAt;
+  }
+
+  get cooked() {
+    return this._cooked;
+  }
+
+  set cooked(newCooked) {
+    // some markdown is cooked differently on the server-side, e.g.
+    // quotes, avatar images etc.
+    if (newCooked !== this._cooked) {
+      this._cooked = newCooked;
+      this.incrementVersion();
+    }
+  }
+
+  async cook() {
+    const site = getOwner(this).lookup("service:site");
+
+    if (this.isDestroyed || this.isDestroying) {
+      return;
+    }
+
+    const markdownOptions = {
+      featuresOverride:
+        site.markdown_additional_options?.chat?.limited_pretty_text_features,
+      markdownItRules:
+        site.markdown_additional_options?.chat
+          ?.limited_pretty_text_markdown_rules,
+      hashtagTypesInPriorityOrder:
+        site.hashtag_configurations?.["chat-composer"],
+      hashtagIcons: site.hashtag_icons,
+    };
+
+    if (ChatMessage.cookFunction) {
+      this.cooked = ChatMessage.cookFunction(this.message);
+    } else {
+      const cookFunction = await generateCookFunction(markdownOptions);
+      ChatMessage.cookFunction = (raw) => {
+        return simpleCategoryHashMentionTransform(
+          cookFunction(raw),
+          site.categories
+        );
+      };
+
+      this.cooked = ChatMessage.cookFunction(this.message);
+    }
+  }
+
+  get read() {
+    return this.channel.currentUserMembership?.lastReadMessageId >= this.id;
+  }
+
+  @cached
+  get firstMessageOfTheDayAt() {
+    if (!this.previousMessage) {
+      return this.#startOfDay(this.createdAt);
+    }
+
+    if (
+      !this.#areDatesOnSameDay(this.previousMessage.createdAt, this.createdAt)
+    ) {
+      return this.#startOfDay(this.createdAt);
+    }
+  }
+
+  @cached
+  get formattedFirstMessageDate() {
+    if (this.firstMessageOfTheDayAt) {
+      return this.#calendarDate(this.firstMessageOfTheDayAt);
+    }
+  }
+
+  #calendarDate(date) {
+    return moment(date).calendar(moment(), {
+      sameDay: `[${I18n.t("chat.chat_message_separator.today")}]`,
+      lastDay: `[${I18n.t("chat.chat_message_separator.yesterday")}]`,
+      lastWeek: "LL",
+      sameElse: "LL",
+    });
+  }
+
+  @cached
+  get index() {
+    return this.manager?.messages?.indexOf(this);
+  }
+
+  @cached
+  get previousMessage() {
+    return this.manager?.messages?.objectAt?.(this.index - 1);
+  }
+
+  @cached
+  get nextMessage() {
+    return this.manager?.messages?.objectAt?.(this.index + 1);
+  }
+
+  highlight() {
+    this.highlighted = true;
+
+    discourseLater(() => {
+      if (this.isDestroying || this.isDestroyed) {
+        return;
+      }
+
+      this.highlighted = false;
+    }, 2000);
+  }
+
+  incrementVersion() {
+    this.version++;
+  }
+
+  toJSONDraft() {
+    if (
+      this.message?.length === 0 &&
+      this.uploads?.length === 0 &&
+      !this.inReplyTo
+    ) {
+      return null;
+    }
+
+    const data = {};
+
+    if (this.uploads?.length > 0) {
+      data.uploads = this.uploads;
+    }
+
+    if (this.message?.length > 0) {
+      data.message = this.message;
+    }
+
+    if (this.inReplyTo) {
+      data.replyToMsg = {
+        id: this.inReplyTo.id,
+        excerpt: this.inReplyTo.excerpt,
+        user: {
+          id: this.inReplyTo.user.id,
+          name: this.inReplyTo.user.name,
+          avatar_template: this.inReplyTo.user.avatar_template,
+          username: this.inReplyTo.user.username,
+        },
+      };
+    }
+
+    if (this.editing) {
+      data.editing = true;
+      data.id = this.id;
+      data.excerpt = this.excerpt;
+    }
+
+    return JSON.stringify(data);
+  }
+
+  react(emoji, action, actor, currentUserId) {
+    const selfReaction = actor.id === currentUserId;
+    const existingReaction = this.reactions.find(
+      (reaction) => reaction.emoji === emoji
+    );
+
+    if (existingReaction) {
+      if (action === "add") {
+        if (selfReaction && existingReaction.reacted) {
+          return;
+        }
+
+        // we might receive a message bus event while loading a channel who would
+        // already have the reaction added to the message
+        if (existingReaction.users.find((user) => user.id === actor.id)) {
+          return;
+        }
+
+        existingReaction.count = existingReaction.count + 1;
+        if (selfReaction) {
+          existingReaction.reacted = true;
+        }
+        existingReaction.users.pushObject(actor);
+      } else {
+        const existingUserReaction = existingReaction.users.find(
+          (user) => user.id === actor.id
+        );
+
+        if (!existingUserReaction) {
+          return;
+        }
+
+        if (selfReaction) {
+          existingReaction.reacted = false;
+        }
+
+        if (existingReaction.count === 1) {
+          this.reactions.removeObject(existingReaction);
+        } else {
+          existingReaction.count = existingReaction.count - 1;
+          existingReaction.users.removeObject(existingUserReaction);
+        }
+      }
+    } else {
+      if (action === "add") {
+        this.reactions.pushObject(
+          ChatMessageReaction.create({
+            count: 1,
+            emoji,
+            reacted: selfReaction,
+            users: [actor],
+          })
+        );
+      }
+    }
+  }
+
+  #initChatMessageReactionModel(reactions = []) {
+    return reactions.map((reaction) => ChatMessageReaction.create(reaction));
+  }
+
+  #initMentionedUsers(mentionedUsers) {
+    const map = new Map();
+    if (mentionedUsers) {
+      mentionedUsers.forEach((userData) => {
+        const user = User.create(userData);
+        map.set(user.id, user);
+      });
+    }
+    return map;
+  }
+
+  #initUserModel(user) {
+    if (!user || user instanceof User) {
+      return user;
+    }
+
+    return User.create(user);
+  }
+
+  #areDatesOnSameDay(a, b) {
+    return (
+      a.getFullYear() === b.getFullYear() &&
+      a.getMonth() === b.getMonth() &&
+      a.getDate() === b.getDate()
+    );
+  }
+
+  #startOfDay(date) {
+    return moment(date).startOf("day").format();
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/models/chat-notice.js b/plugins/chat/assets/javascripts/discourse/models/chat-notice.js
new file mode 100644
index 00000000000..0960846d16e
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/models/chat-notice.js
@@ -0,0 +1,15 @@
+import { tracked } from "@glimmer/tracking";
+
+export default class ChatNotice {
+  static create(args = {}) {
+    return new ChatNotice(args);
+  }
+
+  @tracked channelId;
+  @tracked textContent;
+
+  constructor(args = {}) {
+    this.channelId = args.channel_id;
+    this.textContent = args.text_content;
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/models/chat-thread-preview.js b/plugins/chat/assets/javascripts/discourse/models/chat-thread-preview.js
new file mode 100644
index 00000000000..22547a071aa
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/models/chat-thread-preview.js
@@ -0,0 +1,39 @@
+import { tracked } from "@glimmer/tracking";
+import { TrackedArray } from "@ember-compat/tracked-built-ins";
+
+export default class ChatThreadPreview {
+  static create(args = {}) {
+    return new ChatThreadPreview(args);
+  }
+
+  @tracked replyCount;
+  @tracked lastReplyId;
+  @tracked lastReplyCreatedAt;
+  @tracked lastReplyExcerpt;
+  @tracked lastReplyUser;
+  @tracked participantCount;
+  @tracked participantUsers;
+
+  constructor(args = {}) {
+    if (!args) {
+      args = {};
+    }
+
+    this.replyCount = args.reply_count || args.replyCount || 0;
+    this.lastReplyId = args.last_reply_id || args.lastReplyId;
+    this.lastReplyCreatedAt = new Date(
+      args.last_reply_created_at || args.lastReplyCreatedAt
+    );
+    this.lastReplyExcerpt = args.last_reply_excerpt || args.lastReplyExcerpt;
+    this.lastReplyUser = args.last_reply_user || args.lastReplyUser;
+    this.participantCount =
+      args.participant_count || args.participantCount || 0;
+    this.participantUsers = new TrackedArray(
+      args.participant_users || args.participantUsers || []
+    );
+  }
+
+  get otherParticipantCount() {
+    return this.participantCount - this.participantUsers.length;
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/models/chat-thread.js b/plugins/chat/assets/javascripts/discourse/models/chat-thread.js
new file mode 100644
index 00000000000..c55166c25e0
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/models/chat-thread.js
@@ -0,0 +1,85 @@
+import { getOwner } from "discourse-common/lib/get-owner";
+import I18n from "I18n";
+import ChatMessagesManager from "discourse/plugins/chat/discourse/lib/chat-messages-manager";
+import { escapeExpression } from "discourse/lib/utilities";
+import { tracked } from "@glimmer/tracking";
+import guid from "pretty-text/guid";
+import ChatMessage from "discourse/plugins/chat/discourse/models/chat-message";
+import ChatTrackingState from "discourse/plugins/chat/discourse/models/chat-tracking-state";
+import UserChatThreadMembership from "discourse/plugins/chat/discourse/models/user-chat-thread-membership";
+import ChatThreadPreview from "discourse/plugins/chat/discourse/models/chat-thread-preview";
+
+export const THREAD_STATUSES = {
+  open: "open",
+  readOnly: "read_only",
+  closed: "closed",
+  archived: "archived",
+};
+
+export default class ChatThread {
+  static create(channel, args = {}) {
+    return new ChatThread(channel, args);
+  }
+
+  @tracked id;
+  @tracked title;
+  @tracked status;
+  @tracked draft;
+  @tracked staged;
+  @tracked channel;
+  @tracked originalMessage;
+  @tracked threadMessageBusLastId;
+  @tracked replyCount;
+  @tracked tracking;
+  @tracked currentUserMembership = null;
+  @tracked preview = null;
+
+  messagesManager = new ChatMessagesManager(getOwner(this));
+
+  constructor(channel, args = {}) {
+    this.id = args.id;
+    this.channel = channel;
+    this.status = args.status;
+    this.draft = args.draft;
+    this.staged = args.staged;
+    this.replyCount = args.reply_count;
+
+    this.originalMessage = args.original_message
+      ? ChatMessage.create(channel, args.original_message)
+      : null;
+
+    this.title =
+      args.title ||
+      `${I18n.t("chat.thread.default_title", {
+        thread_id: this.id,
+      })}`;
+
+    if (args.current_user_membership) {
+      this.currentUserMembership = UserChatThreadMembership.create(
+        args.current_user_membership
+      );
+    }
+
+    this.tracking = new ChatTrackingState(getOwner(this));
+    this.preview = ChatThreadPreview.create(args.preview);
+  }
+
+  async stageMessage(message) {
+    message.id = guid();
+    message.staged = true;
+    message.draft = false;
+    message.createdAt ??= moment.utc().format();
+    message.thread = this;
+
+    this.messagesManager.addMessages([message]);
+    message.manager = this.messagesManager;
+  }
+
+  get routeModels() {
+    return [...this.channel.routeModels, this.id];
+  }
+
+  get escapedTitle() {
+    return escapeExpression(this.title);
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/models/chat-tracking-state.js b/plugins/chat/assets/javascripts/discourse/models/chat-tracking-state.js
new file mode 100644
index 00000000000..ff16ac54c4a
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/models/chat-tracking-state.js
@@ -0,0 +1,45 @@
+import { setOwner } from "@ember/application";
+import { inject as service } from "@ember/service";
+import { tracked } from "@glimmer/tracking";
+
+export default class ChatTrackingState {
+  @service chatTrackingStateManager;
+
+  @tracked _unreadCount = 0;
+  @tracked _mentionCount = 0;
+
+  constructor(owner, params = {}) {
+    setOwner(this, owner);
+    this._unreadCount = params.unreadCount || 0;
+    this._mentionCount = params.mentionCount || 0;
+  }
+
+  reset() {
+    this._unreadCount = 0;
+    this._mentionCount = 0;
+  }
+
+  get unreadCount() {
+    return this._unreadCount;
+  }
+
+  set unreadCount(value) {
+    const valueChanged = this._unreadCount !== value;
+    if (valueChanged) {
+      this._unreadCount = value;
+      this.chatTrackingStateManager.triggerNotificationsChanged();
+    }
+  }
+
+  get mentionCount() {
+    return this._mentionCount;
+  }
+
+  set mentionCount(value) {
+    const valueChanged = this._mentionCount !== value;
+    if (valueChanged) {
+      this._mentionCount = value;
+      this.chatTrackingStateManager.triggerNotificationsChanged();
+    }
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/models/user-chat-channel-membership.js b/plugins/chat/assets/javascripts/discourse/models/user-chat-channel-membership.js
index 84a7d55cf98..7a87d280d8d 100644
--- a/plugins/chat/assets/javascripts/discourse/models/user-chat-channel-membership.js
+++ b/plugins/chat/assets/javascripts/discourse/models/user-chat-channel-membership.js
@@ -1,28 +1,34 @@
-import RestModel from "discourse/models/rest";
 import { tracked } from "@glimmer/tracking";
 import User from "discourse/models/user";
-export default class UserChatChannelMembership extends RestModel {
+
+export default class UserChatChannelMembership {
+  static create(args = {}) {
+    return new UserChatChannelMembership(args);
+  }
+
   @tracked following = false;
   @tracked muted = false;
-  @tracked unread_count = 0;
-  @tracked unread_mentions = 0;
-  @tracked desktop_notification_level = null;
-  @tracked mobile_notification_level = null;
-  @tracked last_read_message_id = null;
-}
+  @tracked desktopNotificationLevel = null;
+  @tracked mobileNotificationLevel = null;
+  @tracked lastReadMessageId = null;
+  @tracked lastViewedAt = null;
+  @tracked user = null;
 
-UserChatChannelMembership.reopenClass({
-  create(args) {
-    args = args || {};
-    this._initUser(args);
-    return this._super(args);
-  },
+  constructor(args = {}) {
+    this.following = args.following;
+    this.muted = args.muted;
+    this.desktopNotificationLevel = args.desktop_notification_level;
+    this.mobileNotificationLevel = args.mobile_notification_level;
+    this.lastReadMessageId = args.last_read_message_id;
+    this.lastViewedAt = new Date(args.last_viewed_at);
+    this.user = this.#initUserModel(args.user);
+  }
 
-  _initUser(args) {
-    if (!args.user || args.user instanceof User) {
-      return;
+  #initUserModel(user) {
+    if (!user || user instanceof User) {
+      return user;
     }
 
-    args.user = User.create(args.user);
-  },
-});
+    return User.create(user);
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/models/user-chat-thread-membership.js b/plugins/chat/assets/javascripts/discourse/models/user-chat-thread-membership.js
new file mode 100644
index 00000000000..4dd2ddd94a9
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/models/user-chat-thread-membership.js
@@ -0,0 +1,23 @@
+import { tracked } from "@glimmer/tracking";
+import { NotificationLevels } from "discourse/lib/notification-levels";
+
+export default class UserChatThreadMembership {
+  static create(args = {}) {
+    return new UserChatThreadMembership(args);
+  }
+
+  @tracked lastReadMessageId = null;
+  @tracked notificationLevel = null;
+
+  constructor(args = {}) {
+    this.lastReadMessageId = args.last_read_message_id;
+    this.notificationLevel = args.notification_level;
+  }
+
+  get isQuiet() {
+    return (
+      this.notificationLevel === NotificationLevels.REGULAR ||
+      this.notificationLevel === NotificationLevels.MUTED
+    );
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/modifiers/chat/later-fn.js b/plugins/chat/assets/javascripts/discourse/modifiers/chat/later-fn.js
new file mode 100644
index 00000000000..e70651b426b
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/modifiers/chat/later-fn.js
@@ -0,0 +1,21 @@
+import Modifier from "ember-modifier";
+import { registerDestructor } from "@ember/destroyable";
+import { cancel } from "@ember/runloop";
+import discourseLater from "discourse-common/lib/later";
+
+export default class ChatLaterFn extends Modifier {
+  constructor(owner, args) {
+    super(owner, args);
+    registerDestructor(this, (instance) => instance.cleanup());
+  }
+
+  modify(element, [fn, delay]) {
+    this.handler = discourseLater(() => {
+      fn?.(element);
+    }, delay);
+  }
+
+  cleanup() {
+    cancel(this.handler);
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/modifiers/chat/on-animation-end.js b/plugins/chat/assets/javascripts/discourse/modifiers/chat/on-animation-end.js
new file mode 100644
index 00000000000..68325d87285
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/modifiers/chat/on-animation-end.js
@@ -0,0 +1,34 @@
+import Modifier from "ember-modifier";
+import { registerDestructor } from "@ember/destroyable";
+import { cancel, schedule } from "@ember/runloop";
+import { bind } from "discourse-common/utils/decorators";
+
+export default class ChatOnAnimationEnd extends Modifier {
+  constructor(owner, args) {
+    super(owner, args);
+    registerDestructor(this, (instance) => instance.cleanup());
+  }
+
+  modify(element, [fn]) {
+    this.element = element;
+    this.fn = fn;
+
+    this.handler = schedule("afterRender", () => {
+      this.element.addEventListener("animationend", this.handleAnimationEnd);
+    });
+  }
+
+  @bind
+  handleAnimationEnd() {
+    if (this.isDestroying || this.isDestroyed) {
+      return;
+    }
+
+    this.fn?.(this.element);
+  }
+
+  cleanup() {
+    cancel(this.handler);
+    this.element?.removeEventListener("animationend", this.handleAnimationEnd);
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/modifiers/chat/on-long-press.js b/plugins/chat/assets/javascripts/discourse/modifiers/chat/on-long-press.js
new file mode 100644
index 00000000000..9b69777b913
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/modifiers/chat/on-long-press.js
@@ -0,0 +1,92 @@
+import Modifier from "ember-modifier";
+import { registerDestructor } from "@ember/destroyable";
+import { inject as service } from "@ember/service";
+import { bind } from "discourse-common/utils/decorators";
+import { cancel } from "@ember/runloop";
+import discourseLater from "discourse-common/lib/later";
+
+function cancelEvent(event) {
+  event.stopPropagation();
+}
+
+export default class ChatOnLongPress extends Modifier {
+  @service capabilities;
+  @service site;
+
+  constructor(owner, args) {
+    super(owner, args);
+    registerDestructor(this, (instance) => instance.cleanup());
+  }
+
+  get enabled() {
+    return this.capabilities.touch && this.site.mobileView;
+  }
+
+  modify(element, [onLongPressStart, onLongPressEnd, onLongPressCancel]) {
+    if (!this.enabled) {
+      return;
+    }
+
+    this.element = element;
+    this.onLongPressStart = onLongPressStart || (() => {});
+    this.onLongPressEnd = onLongPressEnd || (() => {});
+    this.onLongPressCancel = onLongPressCancel || (() => {});
+
+    this.element.addEventListener("touchstart", this.handleTouchStart, {
+      passive: true,
+    });
+  }
+
+  @bind
+  onCancel() {
+    cancel(this.timeout);
+
+    if (this.capabilities.touch) {
+      this.element.removeEventListener("touchmove", this.onCancel, {
+        passive: true,
+      });
+      this.element.removeEventListener("touchend", this.onCancel);
+      this.element.removeEventListener("touchcancel", this.onCancel);
+    }
+
+    this.onLongPressCancel(this.element);
+  }
+
+  @bind
+  handleTouchStart(event) {
+    if (event.touches.length > 1) {
+      this.onCancel();
+      return;
+    }
+    this.onLongPressStart(this.element, event);
+    this.element.addEventListener("touchmove", this.onCancel, {
+      passive: true,
+    });
+    this.element.addEventListener("touchend", this.onCancel);
+    this.element.addEventListener("touchcancel", this.onCancel);
+    this.timeout = discourseLater(() => {
+      if (this.isDestroying || this.isDestroyed) {
+        return;
+      }
+
+      this.element.addEventListener("touchend", cancelEvent, {
+        once: true,
+        passive: true,
+      });
+
+      this.onLongPressEnd(this.element, event);
+    }, 400);
+  }
+
+  cleanup() {
+    if (!this.enabled) {
+      return;
+    }
+
+    this.element.removeEventListener("touchstart", this.handleTouchStart, {
+      passive: true,
+    });
+
+    this.onCancel();
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/modifiers/chat/on-resize.js b/plugins/chat/assets/javascripts/discourse/modifiers/chat/on-resize.js
new file mode 100644
index 00000000000..a836d690fde
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/modifiers/chat/on-resize.js
@@ -0,0 +1,29 @@
+import Modifier from "ember-modifier";
+import { registerDestructor } from "@ember/destroyable";
+import { cancel, throttle } from "@ember/runloop";
+
+export default class ChatOnResize extends Modifier {
+  constructor(owner, args) {
+    super(owner, args);
+    registerDestructor(this, (instance) => instance.cleanup());
+  }
+
+  modify(element, [fn, options = {}]) {
+    this.resizeObserver = new ResizeObserver((entries) => {
+      this.throttleHandler = throttle(
+        this,
+        fn,
+        entries,
+        options.delay ?? 0,
+        options.immediate ?? false
+      );
+    });
+
+    this.resizeObserver.observe(element);
+  }
+
+  cleanup() {
+    cancel(this.throttleHandler);
+    this.resizeObserver?.disconnect();
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/modifiers/chat/on-scroll.js b/plugins/chat/assets/javascripts/discourse/modifiers/chat/on-scroll.js
new file mode 100644
index 00000000000..f8368b4513c
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/modifiers/chat/on-scroll.js
@@ -0,0 +1,36 @@
+import Modifier from "ember-modifier";
+import { registerDestructor } from "@ember/destroyable";
+import { cancel, throttle } from "@ember/runloop";
+import { bind } from "discourse-common/utils/decorators";
+
+export default class ChatOnScroll extends Modifier {
+  constructor(owner, args) {
+    super(owner, args);
+    registerDestructor(this, (instance) => instance.cleanup());
+  }
+
+  modify(element, [callback, options]) {
+    this.element = element;
+    this.callback = callback;
+    this.options = options;
+    this.element.addEventListener("scroll", this.throttledCallback, {
+      passive: true,
+    });
+  }
+
+  @bind
+  throttledCallback(event) {
+    this.throttledHandler = throttle(
+      this,
+      this.callback,
+      event,
+      this.options.delay ?? 100,
+      this.options.immediate ?? false
+    );
+  }
+
+  cleanup() {
+    cancel(this.throttledHandler);
+    this.element.removeEventListener("scroll", this.throttledCallback);
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/modifiers/chat/resizable-node.js b/plugins/chat/assets/javascripts/discourse/modifiers/chat/resizable-node.js
new file mode 100644
index 00000000000..42abed17975
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/modifiers/chat/resizable-node.js
@@ -0,0 +1,173 @@
+import Modifier from "ember-modifier";
+import { registerDestructor } from "@ember/destroyable";
+import { bind } from "discourse-common/utils/decorators";
+import { inject as service } from "@ember/service";
+
+const MINIMUM_SIZE = 20;
+
+export default class ResizableNode extends Modifier {
+  @service capabilities;
+
+  element = null;
+  resizerSelector = null;
+  didResizeContainer = null;
+  options = null;
+
+  _originalWidth = 0;
+  _originalHeight = 0;
+  _originalX = 0;
+  _originalY = 0;
+  _originalPageX = 0;
+  _originalPageY = 0;
+
+  constructor(owner, args) {
+    super(owner, args);
+    registerDestructor(this, (instance) => instance.cleanup());
+  }
+
+  modify(element, [resizerSelector, didResizeContainer, options = {}]) {
+    this.resizerSelector = resizerSelector;
+    this.element = element;
+    this.didResizeContainer = didResizeContainer;
+    this.options = Object.assign(
+      { vertical: true, horizontal: true, position: true, mutate: true },
+      options
+    );
+
+    if (this.capabilities.touch) {
+      this.element
+        .querySelector(this.resizerSelector)
+        ?.addEventListener("touchstart", this._startResize);
+    } else {
+      this.element
+        .querySelector(this.resizerSelector)
+        ?.addEventListener("mousedown", this._startResize);
+    }
+  }
+
+  cleanup() {
+    if (this.capabilities.touch) {
+      this.element
+        .querySelector(this.resizerSelector)
+        ?.addEventListener("touchstart", this._startResize);
+    } else {
+      this.element
+        .querySelector(this.resizerSelector)
+        ?.removeEventListener("mousedown", this._startResize);
+    }
+  }
+
+  @bind
+  _startResize(event) {
+    event.preventDefault();
+
+    this._originalWidth = parseFloat(
+      getComputedStyle(this.element, null)
+        .getPropertyValue("width")
+        .replace("px", "")
+    );
+    this._originalHeight = parseFloat(
+      getComputedStyle(this.element, null)
+        .getPropertyValue("height")
+        .replace("px", "")
+    );
+    this._originalX = this.element.getBoundingClientRect().left;
+    this._originalY = this.element.getBoundingClientRect().top;
+
+    this._originalPageX = this._eventValueForProperty(event, "pageX");
+    this._originalPageY = this._eventValueForProperty(event, "pageY");
+
+    if (this.capabilities.touch) {
+      window.addEventListener("touchmove", this._resize);
+      window.addEventListener("touchend", this._stopResize);
+    } else {
+      window.addEventListener("mousemove", this._resize);
+      window.addEventListener("mouseup", this._stopResize);
+    }
+  }
+
+  /*
+    The bulk of the logic is to calculate the new width and height of the element
+    based on the current position on page: width is calculated by subtracting
+    the difference between the current pageX and the original this._originalPageX
+    from the original this._originalWidth, and rounding up to the nearest integer.
+    height is calculated in a similar way using pageY and this._originalPageY.
+
+    In this example (B) is the current element top/left and (A) is x/y of the mouse after dragging:
+
+    A------
+    |     |
+    |  B--|
+    |  |  |
+    -------
+  */
+  @bind
+  _resize(event) {
+    let width = this._originalWidth;
+    let diffWidth =
+      this._eventValueForProperty(event, "pageX") - this._originalPageX;
+    if (document.documentElement.classList.contains("rtl")) {
+      width = Math.ceil(width + diffWidth);
+    } else {
+      width = Math.ceil(width - diffWidth);
+    }
+
+    const height = Math.ceil(
+      this._originalHeight -
+        (this._eventValueForProperty(event, "pageY") - this._originalPageY)
+    );
+
+    const newStyle = {};
+
+    if (this.options.horizontal && width > MINIMUM_SIZE) {
+      newStyle.width = width + "px";
+
+      if (this.options.position) {
+        newStyle.left =
+          Math.ceil(
+            this._originalX +
+              (this._eventValueForProperty(event, "pageX") -
+                this._originalPageX)
+          ) + "px";
+      }
+    }
+
+    if (this.options.vertical && height > MINIMUM_SIZE) {
+      newStyle.height = height + "px";
+
+      if (this.options.position) {
+        newStyle.top =
+          Math.ceil(
+            this._originalY +
+              (this._eventValueForProperty(event, "pageY") -
+                this._originalPageY)
+          ) + "px";
+      }
+    }
+
+    if (this.options.mutate) {
+      Object.assign(this.element.style, newStyle);
+    }
+
+    this.didResizeContainer?.(this.element, { width, height });
+  }
+
+  @bind
+  _stopResize() {
+    if (this.capabilities.touch) {
+      window.removeEventListener("touchmove", this._resize);
+      window.removeEventListener("touchend", this._stopResize);
+    } else {
+      window.removeEventListener("mousemove", this._resize);
+      window.removeEventListener("mouseup", this._stopResize);
+    }
+  }
+
+  _eventValueForProperty(event, property) {
+    if (this.capabilities.touch) {
+      return event.changedTouches[0][property];
+    } else {
+      return event[property];
+    }
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/modifiers/chat/scrollable-list.js b/plugins/chat/assets/javascripts/discourse/modifiers/chat/scrollable-list.js
new file mode 100644
index 00000000000..a356a2f2c6e
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/modifiers/chat/scrollable-list.js
@@ -0,0 +1,130 @@
+import Modifier from "ember-modifier";
+import { registerDestructor } from "@ember/destroyable";
+import { bind } from "discourse-common/utils/decorators";
+import { cancel, throttle } from "@ember/runloop";
+import discourseLater from "discourse-common/lib/later";
+
+const UP = "up";
+const DOWN = "down";
+
+export default class ChatScrollableList extends Modifier {
+  constructor(owner, args) {
+    super(owner, args);
+    registerDestructor(this, (instance) => instance.cleanup());
+  }
+
+  modify(element, [options]) {
+    this.element = element;
+    this.options = options;
+
+    this.lastScrollTop = this.computeInitialScrollTop();
+
+    this.element.addEventListener("scroll", this.handleScroll, {
+      passive: true,
+    });
+    // listen for wheel events to detect scrolling even when at the top or bottom
+    this.element.addEventListener("wheel", this.handleWheel, {
+      passive: true,
+    });
+  }
+
+  @bind
+  handleScroll() {
+    this.throttleComputeScroll();
+  }
+
+  @bind
+  handleWheel() {
+    this.throttleComputeScroll();
+  }
+
+  @bind
+  computeScroll() {
+    const scrollTop = this.element.scrollTop;
+    this.options.onScroll?.(this.computeState());
+    this.lastScrollTop = scrollTop;
+  }
+
+  throttleComputeScroll() {
+    cancel(this.scrollTimer);
+    this.throttleTimer = throttle(this, this.computeScroll, 50, true);
+    this.scrollTimer = discourseLater(() => {
+      this.options.onScrollEnd?.(this.computeState());
+    }, this.options.delay || 250);
+  }
+
+  cleanup() {
+    cancel(this.scrollTimer);
+    cancel(this.throttleTimer);
+    this.element.removeEventListener("scroll", this.handleScroll);
+    this.element.removeEventListener("wheel", this.handleWheel);
+  }
+
+  computeState() {
+    const direction = this.computeScrollDirection();
+    const distanceToBottom = this.computeDistanceToBottom();
+    const distanceToTop = this.computeDistanceToTop();
+    return {
+      up: direction === UP,
+      down: direction === DOWN,
+      distanceToBottom,
+      distanceToTop,
+      atBottom: distanceToBottom.pixels <= 1,
+      atTop: distanceToTop.pixels <= 1,
+    };
+  }
+
+  computeInitialScrollTop() {
+    if (this.options.reverse) {
+      return this.element.scrollHeight - this.element.clientHeight;
+    } else {
+      return this.element.scrollTop;
+    }
+  }
+
+  computeScrollTop() {
+    if (this.options.reverse) {
+      return (
+        this.element.scrollHeight -
+        this.element.clientHeight -
+        this.element.scrollTop
+      );
+    } else {
+      return this.element.scrollTop;
+    }
+  }
+
+  computeDistanceToTop() {
+    let pixels;
+    const height = this.element.scrollHeight - this.element.clientHeight;
+
+    if (this.options.reverse) {
+      pixels = height - Math.abs(this.element.scrollTop);
+    } else {
+      pixels = Math.abs(this.element.scrollTop);
+    }
+
+    return { pixels, percentage: Math.round((pixels / height) * 100) };
+  }
+
+  computeDistanceToBottom() {
+    let pixels;
+    const height = this.element.scrollHeight - this.element.clientHeight;
+
+    if (this.options.reverse) {
+      pixels = -this.element.scrollTop;
+    } else {
+      pixels = height - Math.abs(this.element.scrollTop);
+    }
+
+    return { pixels, percentage: Math.round((pixels / height) * 100) };
+  }
+
+  computeScrollDirection() {
+    if (this.element.scrollTop === this.lastScrollTop) {
+      return null;
+    }
+
+    return this.element.scrollTop < this.lastScrollTop ? UP : DOWN;
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/modifiers/chat/track-message-separator-date.js b/plugins/chat/assets/javascripts/discourse/modifiers/chat/track-message-separator-date.js
new file mode 100644
index 00000000000..480d7a57f88
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/modifiers/chat/track-message-separator-date.js
@@ -0,0 +1,39 @@
+import Modifier from "ember-modifier";
+import { registerDestructor } from "@ember/destroyable";
+
+const IS_PINNED_CLASS = "is-pinned";
+
+/*
+  This modifier is used to track the date separator in the chat message list.
+  The trick is to have an element with `top: -1px` which will stop fully intersecting
+  as soon as it's scrolled a little bit.
+*/
+export default class ChatTrackMessageSeparatorDate extends Modifier {
+  constructor(owner, args) {
+    super(owner, args);
+    registerDestructor(this, (instance) => instance.cleanup());
+  }
+
+  modify(element) {
+    this.intersectionObserver = new IntersectionObserver(
+      ([entry]) => {
+        if (
+          entry.isIntersecting &&
+          entry.intersectionRatio < 1 &&
+          entry.boundingClientRect.y < entry.intersectionRect.y
+        ) {
+          entry.target.classList.add(IS_PINNED_CLASS);
+        } else {
+          entry.target.classList.remove(IS_PINNED_CLASS);
+        }
+      },
+      { threshold: [0, 1] }
+    );
+
+    this.intersectionObserver.observe(element);
+  }
+
+  cleanup() {
+    this.intersectionObserver?.disconnect();
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/modifiers/chat/track-message-visibility.js b/plugins/chat/assets/javascripts/discourse/modifiers/chat/track-message-visibility.js
deleted file mode 100644
index 10474b067cf..00000000000
--- a/plugins/chat/assets/javascripts/discourse/modifiers/chat/track-message-visibility.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import Modifier from "ember-modifier";
-import { inject as service } from "@ember/service";
-import { registerDestructor } from "@ember/destroyable";
-
-export default class TrackMessageVisibility extends Modifier {
-  @service chatMessageVisibilityObserver;
-
-  element = null;
-
-  constructor(owner, args) {
-    super(owner, args);
-    registerDestructor(this, (instance) => instance.cleanup());
-  }
-
-  modify(element) {
-    this.element = element;
-    this.chatMessageVisibilityObserver.observe(element);
-  }
-
-  cleanup() {
-    this.chatMessageVisibilityObserver.unobserve(this.element);
-  }
-}
diff --git a/plugins/chat/assets/javascripts/discourse/modifiers/chat/track-message.js b/plugins/chat/assets/javascripts/discourse/modifiers/chat/track-message.js
new file mode 100644
index 00000000000..7a67cb08121
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/modifiers/chat/track-message.js
@@ -0,0 +1,43 @@
+import Modifier from "ember-modifier";
+import { registerDestructor } from "@ember/destroyable";
+import { bind } from "discourse-common/utils/decorators";
+
+export default class ChatTrackMessage extends Modifier {
+  didEnterViewport = null;
+  didLeaveViewport = null;
+
+  constructor(owner, args) {
+    super(owner, args);
+    registerDestructor(this, (instance) => instance.cleanup());
+  }
+
+  modify(element, [didEnterViewport, didLeaveViewport]) {
+    this.didEnterViewport = didEnterViewport;
+    this.didLeaveViewport = didLeaveViewport;
+
+    this.intersectionObserver = new IntersectionObserver(
+      this._intersectionObserverCallback,
+      {
+        root: document,
+        threshold: 0,
+      }
+    );
+
+    this.intersectionObserver.observe(element);
+  }
+
+  cleanup() {
+    this.intersectionObserver?.disconnect();
+  }
+
+  @bind
+  _intersectionObserverCallback(entries) {
+    entries.forEach((entry) => {
+      if (entry.isIntersecting) {
+        this.didEnterViewport?.();
+      } else {
+        this.didLeaveViewport?.();
+      }
+    });
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/pre-initializers/chat-plugin-api.js b/plugins/chat/assets/javascripts/discourse/pre-initializers/chat-plugin-api.js
index 3a6801ea0b7..6b977a398b8 100644
--- a/plugins/chat/assets/javascripts/discourse/pre-initializers/chat-plugin-api.js
+++ b/plugins/chat/assets/javascripts/discourse/pre-initializers/chat-plugin-api.js
@@ -4,6 +4,125 @@ import {
   resetChatMessageDecorators,
 } from "discourse/plugins/chat/discourse/components/chat-message";
 import { registerChatComposerButton } from "discourse/plugins/chat/discourse/lib/chat-composer-buttons";
+import { addChatDrawerStateCallback } from "discourse/plugins/chat/discourse/services/chat-state-manager";
+import { removeChatComposerSecondaryActions } from "discourse/plugins/chat/discourse/lib/chat-message-interactor";
+
+/**
+ * Class exposing the javascript API available to plugins and themes.
+ * @class PluginApi
+ */
+
+/**
+ * Callback used to decorate a chat message
+ *
+ * @callback PluginApi~decorateChatMessageCallback
+ * @param {ChatMessage} chatMessage - model
+ * @param {HTMLElement} messageContainer - DOM node
+ * @param {ChatChannel} chatChannel - model
+ */
+
+/**
+ * Callback used to decorate a chat message
+ *
+ * @callback PluginApi~chatDrawerStateCallback
+ * @param {Object} state
+ * @param {boolean} state.isDrawerActive - is the chat drawer active
+ * @param {boolean} state.isDrawerExpanded - is the chat drawer expanded
+ */
+
+/**
+ * Decorate a chat message
+ *
+ * @memberof PluginApi
+ * @instance
+ * @function decorateChatMessage
+ * @param {PluginApi~decorateChatMessageCallback} decorator
+ * @example
+ *
+ * api.decorateChatMessage((chatMessage, messageContainer) => {
+ *   messageContainer.dataset.foo = chatMessage.id;
+ * });
+ */
+
+/**
+ * Register a button in the chat composer
+ *
+ * @memberof PluginApi
+ * @instance
+ * @function registerChatComposerButton
+ * @param {Object} options
+ * @param {number} options.id - The id of the button
+ * @param {function} options.action - An action name or an anonymous function called when the button is pressed, eg: "onFooClicked" or `() => { console.log("clicked") }`
+ * @param {string} options.icon - A valid font awesome icon name, eg: "far fa-image"
+ * @param {string} options.label - Text displayed on the button, a translatable key, eg: "foo.bar"
+ * @param {string} options.translatedLabel - Text displayed on the button, a string, eg: "Add gifs"
+ * @param {string} [options.position] - Can be "inline" or "dropdown", defaults to "inline"
+ * @param {string} [options.title] - Title attribute of the button, a translatable key, eg: "foo.bar"
+ * @param {string} [options.translatedTitle] - Title attribute of the button, a string, eg: "Add gifs"
+ * @param {string} [options.ariaLabel] - aria-label attribute of the button, a translatable key, eg: "foo.bar"
+ * @param {string} [options.translatedAriaLabel] - aria-label attribute of the button, a string, eg: "Add gifs"
+ * @param {string} [options.classNames] - Additional names to add to the button’s class attribute, eg: ["foo", "bar"]
+ * @param {boolean} [options.displayed] - Hide or show the button
+ * @param {boolean} [options.disabled] - Sets the disabled attribute on the button
+ * @param {number} [options.priority] - An integer defining the order of the buttons, higher comes first, eg: `700`
+ * @param {Array.<string>} [options.dependentKeys] - List of property names which should trigger a refresh of the buttons when changed, eg: `["foo.bar", "bar.baz"]`
+ * @example
+ *
+ * api.registerChatComposerButton({
+ *   id: "foo",
+ *   displayed() {
+ *     return this.site.mobileView && this.canAttachUploads;
+ *   }
+ * });
+ */
+
+/**
+ * Callback when the sate of the chat drawer changes
+ *
+ * @memberof PluginApi
+ * @instance
+ * @function addChatDrawerStateCallback
+ * @param {PluginApi~chatDrawerStateCallback} callback
+ * @example
+ *
+ * api.addChatDrawerStateCallback(({isDrawerExpanded, isDrawerActive}) => {
+ *   if (isDrawerActive && isDrawerExpanded) {
+ *     // do something
+ *   }
+ * });
+ */
+
+/**
+ * Send a chat message, message or uploads must be provided
+ *
+ * @memberof PluginApi
+ * @instance
+ * @function sendChatMessage
+ * @param {number} channelId - The id of the channel
+ * @param {Object} options
+ * @param {string} [options.message] - The content of the message to send
+ * @param {string} [options.uploads] - A list of uploads to send
+ * @param {number} [options.threadId] - The thread id where the message should be sent
+ *
+ * @example
+ *
+ * api.sendChatMessage(
+ *   1,
+ *  { message: "Hello world", threadId: 2 }
+ * );
+ */
+
+/**
+ * Removes secondary actions from the chat composer
+ *
+ * @memberof PluginApi
+ * @instance
+ * @function removeChatComposerSecondaryActions
+ * @param {...string} [1] - List of secondary action ids to remove, eg: `"copyLink", "select"
+ * @example
+ *
+ * api.removeChatComposerSecondaryActions("copyLink", "select");
+ */
 
 export default {
   name: "chat-plugin-api",
@@ -28,6 +147,40 @@ export default {
           },
         });
       }
+
+      if (!apiPrototype.hasOwnProperty("addChatDrawerStateCallback")) {
+        Object.defineProperty(apiPrototype, "addChatDrawerStateCallback", {
+          value(callback) {
+            addChatDrawerStateCallback(callback);
+          },
+        });
+      }
+
+      if (!apiPrototype.hasOwnProperty("sendChatMessage")) {
+        Object.defineProperty(apiPrototype, "sendChatMessage", {
+          async value(channelId, options = {}) {
+            return this.container
+              .lookup("service:chat-api")
+              .sendMessage(channelId, {
+                thread_id: options.threadId,
+                message: options.message,
+                uploads: options.uploads,
+              });
+          },
+        });
+      }
+
+      if (!apiPrototype.hasOwnProperty("removeChatComposerSecondaryActions")) {
+        Object.defineProperty(
+          apiPrototype,
+          "removeChatComposerSecondaryActions",
+          {
+            value(...actionIds) {
+              removeChatComposerSecondaryActions(actionIds);
+            },
+          }
+        );
+      }
     });
   },
 
diff --git a/plugins/chat/assets/javascripts/discourse/routes/chat-browse-index.js b/plugins/chat/assets/javascripts/discourse/routes/chat-browse-index.js
index 367f4adadbf..7cec808e2cc 100644
--- a/plugins/chat/assets/javascripts/discourse/routes/chat-browse-index.js
+++ b/plugins/chat/assets/javascripts/discourse/routes/chat-browse-index.js
@@ -1,11 +1,20 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import { inject as service } from "@ember/service";
+import { defaultHomepage } from "discourse/lib/utilities";
 
 export default class ChatBrowseIndexRoute extends DiscourseRoute {
   @service chat;
+  @service siteSettings;
+  @service router;
+
+  beforeModel() {
+    if (!this.siteSettings.enable_public_channels) {
+      return this.router.transitionTo(`discovery.${defaultHomepage()}`);
+    }
+  }
 
   activate() {
-    this.chat.setActiveChannel(null);
+    this.chat.activeChannel = null;
   }
 
   afterModel() {
diff --git a/plugins/chat/assets/javascripts/discourse/routes/chat-channel-decorator.js b/plugins/chat/assets/javascripts/discourse/routes/chat-channel-decorator.js
new file mode 100644
index 00000000000..62f9d9d50dd
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/routes/chat-channel-decorator.js
@@ -0,0 +1,82 @@
+import { inject as service } from "@ember/service";
+
+export default function withChatChannel(extendedClass) {
+  return class WithChatChannel extends extendedClass {
+    @service chatChannelsManager;
+    @service chat;
+    @service router;
+
+    async model(params) {
+      return this.chatChannelsManager.find(params.channelId);
+    }
+
+    titleToken() {
+      if (!this.currentModel) {
+        return;
+      }
+
+      if (this.currentModel.isDirectMessageChannel) {
+        return `${this.currentModel.title}`;
+      } else {
+        return `#${this.currentModel.title}`;
+      }
+    }
+
+    afterModel(model) {
+      super.afterModel?.(...arguments);
+
+      this.chat.activeChannel = model;
+
+      if (!model) {
+        return this.router.replaceWith("chat");
+      }
+
+      let { messageId, channelTitle } = this.paramsFor(this.routeName);
+
+      // messageId query param backwards-compatibility
+      if (messageId) {
+        this.router.replaceWith(
+          "chat.channel",
+          ...model.routeModels,
+          messageId
+        );
+      }
+
+      if (channelTitle && channelTitle !== model.slugifiedTitle) {
+        messageId = this.paramsFor("chat.channel.near-message").messageId;
+        const threadId = this.paramsFor("chat.channel.thread").threadId;
+
+        if (threadId) {
+          const threadMessageId = this.paramsFor(
+            "chat.channel.thread.near-message"
+          ).messageId;
+
+          if (threadMessageId) {
+            this.router.replaceWith(
+              "chat.channel.thread.near-message",
+              ...model.routeModels,
+              threadId,
+              threadMessageId
+            );
+          } else {
+            this.router.replaceWith(
+              "chat.channel.thread",
+              ...model.routeModels,
+              threadId
+            );
+          }
+        } else if (messageId) {
+          this.router.replaceWith(
+            "chat.channel.near-message",
+            ...model.routeModels,
+            messageId
+          );
+        } else {
+          this.router.replaceWith("chat.channel", ...model.routeModels);
+        }
+      } else {
+        this.controllerFor("chat-channel").set("targetMessageId", null);
+      }
+    }
+  };
+}
diff --git a/plugins/chat/assets/javascripts/discourse/routes/chat-channel-info.js b/plugins/chat/assets/javascripts/discourse/routes/chat-channel-info.js
index 3a167c4890f..82e0417a23b 100644
--- a/plugins/chat/assets/javascripts/discourse/routes/chat-channel-info.js
+++ b/plugins/chat/assets/javascripts/discourse/routes/chat-channel-info.js
@@ -1,7 +1,9 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import { inject as service } from "@ember/service";
 import { ORIGINS } from "discourse/plugins/chat/discourse/services/chat-channel-info-route-origin-manager";
+import withChatChannel from "./chat-channel-decorator";
 
+@withChatChannel
 export default class ChatChannelInfoRoute extends DiscourseRoute {
   @service chatChannelInfoRouteOriginManager;
 
diff --git a/plugins/chat/assets/javascripts/discourse/routes/chat-channel-legacy.js b/plugins/chat/assets/javascripts/discourse/routes/chat-channel-legacy.js
new file mode 100644
index 00000000000..29c5104d189
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/routes/chat-channel-legacy.js
@@ -0,0 +1,16 @@
+import DiscourseRoute from "discourse/routes/discourse";
+import { inject as service } from "@ember/service";
+
+export default class ChatChannelLegacyRoute extends DiscourseRoute {
+  @service router;
+
+  redirect() {
+    const { channelTitle, channelId, messageId } = this.paramsFor(
+      this.routeName
+    );
+
+    this.router.replaceWith("chat.channel", channelTitle, channelId, {
+      queryParams: { messageId },
+    });
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/routes/chat-channel-near-message.js b/plugins/chat/assets/javascripts/discourse/routes/chat-channel-near-message.js
new file mode 100644
index 00000000000..a5d5771acb8
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/routes/chat-channel-near-message.js
@@ -0,0 +1,23 @@
+import DiscourseRoute from "discourse/routes/discourse";
+import { inject as service } from "@ember/service";
+
+// This route is only here as a convenience method for a clean `/c/:channelTitle/:channelId/:messageId` URL.
+// It's not a real route, it just redirects to the real route after setting a param on the controller.
+export default class ChatChannelNearMessage extends DiscourseRoute {
+  @service router;
+
+  beforeModel() {
+    const channel = this.modelFor("chat-channel");
+    const { messageId } = this.paramsFor(this.routeName);
+    this.controllerFor("chat-channel").set("messageId", null);
+
+    if (
+      messageId ||
+      this.controllerFor("chat-channel").get("targetMessageId")
+    ) {
+      this.controllerFor("chat-channel").set("targetMessageId", messageId);
+    }
+
+    this.router.replaceWith("chat.channel", ...channel.routeModels);
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/routes/chat-channel-thread-near-message.js b/plugins/chat/assets/javascripts/discourse/routes/chat-channel-thread-near-message.js
new file mode 100644
index 00000000000..889a40b6a4c
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/routes/chat-channel-thread-near-message.js
@@ -0,0 +1,25 @@
+import DiscourseRoute from "discourse/routes/discourse";
+import { inject as service } from "@ember/service";
+
+// This route is only here as a convenience method for a clean `/c/:channelTitle/:channelId/t/:threadId/:messageId` URL.
+// It's not a real route, it just redirects to the real route after setting a param on the controller.
+export default class ChatChannelThreadNearMessage extends DiscourseRoute {
+  @service router;
+
+  beforeModel() {
+    const thread = this.modelFor("chat-channel-thread");
+    const { messageId } = this.paramsFor(this.routeName);
+
+    if (
+      messageId ||
+      this.controllerFor("chat-channel-thread").get("targetMessageId")
+    ) {
+      this.controllerFor("chat-channel-thread").set(
+        "targetMessageId",
+        messageId
+      );
+    }
+
+    this.router.replaceWith("chat.channel.thread", ...thread.routeModels);
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/routes/chat-channel-thread.js b/plugins/chat/assets/javascripts/discourse/routes/chat-channel-thread.js
new file mode 100644
index 00000000000..0600e2266a5
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/routes/chat-channel-thread.js
@@ -0,0 +1,76 @@
+import DiscourseRoute from "discourse/routes/discourse";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+
+export default class ChatChannelThread extends DiscourseRoute {
+  @service router;
+  @service chatStateManager;
+  @service chat;
+  @service chatStagedThreadMapping;
+  @service chatThreadPane;
+
+  model(params, transition) {
+    const channel = this.modelFor("chat.channel");
+    return channel.threadsManager
+      .find(channel.id, params.threadId)
+      .catch(() => {
+        transition.abort();
+        this.chatStateManager.closeSidePanel();
+        this.router.transitionTo("chat.channel", ...channel.routeModels);
+        return;
+      });
+  }
+
+  afterModel(model) {
+    this.chat.activeChannel.activeThread = model;
+  }
+
+  @action
+  willTransition(transition) {
+    if (
+      transition.targetName === "chat.channel.index" ||
+      transition.targetName === "chat.channel.near-message" ||
+      transition.targetName === "chat.index"
+    ) {
+      this.chatStateManager.closeSidePanel();
+    }
+  }
+
+  beforeModel(transition) {
+    const channel = this.modelFor("chat.channel");
+
+    if (!channel.threadingEnabled) {
+      transition.abort();
+      this.router.transitionTo("chat.channel", ...channel.routeModels);
+      return;
+    }
+
+    // This is a very special logic to attempt to reconciliate a staged thread id
+    // it happens after creating a new thread and having a temp ID in the URL
+    // if users presses reload at this moment, we would have a 404
+    // replacing the ID in the URL sooner would also cause a reload
+    const { threadId } = this.paramsFor(this.routeName);
+
+    if (threadId?.startsWith("staged-thread-")) {
+      const mapping = this.chatStagedThreadMapping.getMapping();
+
+      if (mapping[threadId]) {
+        transition.abort();
+        return this.router.transitionTo(
+          this.routeName,
+          ...[...channel.routeModels, mapping[threadId]]
+        );
+      }
+    }
+
+    const { messageId } = this.paramsFor(this.routeName + ".near-message");
+    if (
+      !messageId &&
+      this.controllerFor("chat-channel-thread").get("targetMessageId")
+    ) {
+      this.controllerFor("chat-channel-thread").set("targetMessageId", null);
+    }
+
+    this.chatStateManager.openSidePanel();
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/routes/chat-channel-threads.js b/plugins/chat/assets/javascripts/discourse/routes/chat-channel-threads.js
new file mode 100644
index 00000000000..7599442cdba
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/routes/chat-channel-threads.js
@@ -0,0 +1,28 @@
+import DiscourseRoute from "discourse/routes/discourse";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+
+export default class ChatChannelThreads extends DiscourseRoute {
+  @service router;
+  @service chatThreadListPane;
+  @service chatStateManager;
+
+  beforeModel(transition) {
+    const channel = this.modelFor("chat.channel");
+
+    if (!channel.threadingEnabled) {
+      transition.abort();
+      this.router.transitionTo("chat.channel", ...channel.routeModels);
+      return;
+    }
+
+    this.chatStateManager.openSidePanel();
+  }
+
+  @action
+  willTransition(transition) {
+    if (transition.targetName === "chat.channel.index") {
+      this.chatStateManager.closeSidePanel();
+    }
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/routes/chat-channel.js b/plugins/chat/assets/javascripts/discourse/routes/chat-channel.js
index 152348e1f99..96658d1ada4 100644
--- a/plugins/chat/assets/javascripts/discourse/routes/chat-channel.js
+++ b/plugins/chat/assets/javascripts/discourse/routes/chat-channel.js
@@ -1,39 +1,5 @@
 import DiscourseRoute from "discourse/routes/discourse";
-import { inject as service } from "@ember/service";
-import slugifyChannel from "discourse/plugins/chat/discourse/lib/slugify-channel";
-import { action } from "@ember/object";
-import { schedule } from "@ember/runloop";
+import withChatChannel from "./chat-channel-decorator";
 
-export default class ChatChannelRoute extends DiscourseRoute {
-  @service chat;
-  @service router;
-  @service chatChannelsManager;
-
-  async model(params) {
-    return this.chatChannelsManager.find(params.channelId);
-  }
-
-  afterModel(model) {
-    this.chat.setActiveChannel(model);
-
-    const { channelTitle, messageId } = this.paramsFor(this.routeName);
-    const slug = slugifyChannel(model);
-    if (channelTitle !== slug) {
-      this.router.replaceWith("chat.channel.index", model.id, slug, {
-        queryParams: { messageId },
-      });
-    }
-  }
-
-  @action
-  didTransition() {
-    const { channelId, messageId } = this.paramsFor(this.routeName);
-    if (channelId && messageId) {
-      schedule("afterRender", () => {
-        this.chat.openChannelAtMessage(channelId, messageId);
-        this.controller.set("messageId", null); // clear the query param
-      });
-    }
-    return true;
-  }
-}
+@withChatChannel
+export default class ChatChannelRoute extends DiscourseRoute {}
diff --git a/plugins/chat/assets/javascripts/discourse/routes/chat-draft-channel.js b/plugins/chat/assets/javascripts/discourse/routes/chat-draft-channel.js
index a5fd5df9df3..ea6d064588b 100644
--- a/plugins/chat/assets/javascripts/discourse/routes/chat-draft-channel.js
+++ b/plugins/chat/assets/javascripts/discourse/routes/chat-draft-channel.js
@@ -3,14 +3,15 @@ import { inject as service } from "@ember/service";
 
 export default class ChatDraftChannelRoute extends DiscourseRoute {
   @service chat;
+  @service router;
 
   beforeModel() {
     if (!this.chat.userCanDirectMessage) {
-      this.transitionTo("chat");
+      this.router.transitionTo("chat");
     }
   }
 
   activate() {
-    this.chat.setActiveChannel(null);
+    this.chat.activeChannel = null;
   }
 }
diff --git a/plugins/chat/assets/javascripts/discourse/routes/chat-index.js b/plugins/chat/assets/javascripts/discourse/routes/chat-index.js
index 027f21b4672..e818e1c62ab 100644
--- a/plugins/chat/assets/javascripts/discourse/routes/chat-index.js
+++ b/plugins/chat/assets/javascripts/discourse/routes/chat-index.js
@@ -6,6 +6,10 @@ export default class ChatIndexRoute extends DiscourseRoute {
   @service chatChannelsManager;
   @service router;
 
+  activate() {
+    this.chat.activeChannel = null;
+  }
+
   redirect() {
     // Always want the channel index on mobile.
     if (this.site.mobileView) {
@@ -16,10 +20,10 @@ export default class ChatIndexRoute extends DiscourseRoute {
     const id = this.chat.getIdealFirstChannelId();
     if (id) {
       return this.chatChannelsManager.find(id).then((c) => {
-        return this.chat.openChannel(c);
+        return this.router.replaceWith("chat.channel", ...c.routeModels);
       });
     } else {
-      return this.router.transitionTo("chat.browse");
+      return this.router.replaceWith("chat.browse");
     }
   }
 
diff --git a/plugins/chat/assets/javascripts/discourse/routes/chat-message.js b/plugins/chat/assets/javascripts/discourse/routes/chat-message.js
index c96d913c092..4b7aaee0d1a 100644
--- a/plugins/chat/assets/javascripts/discourse/routes/chat-message.js
+++ b/plugins/chat/assets/javascripts/discourse/routes/chat-message.js
@@ -5,17 +5,16 @@ import { inject as service } from "@ember/service";
 
 export default class ChatMessageRoute extends DiscourseRoute {
   @service chat;
+  @service router;
 
   async model(params) {
     return ajax(`/chat/message/${params.messageId}.json`)
       .then((response) => {
-        this.transitionTo(
-          "chat.channel",
-          response.chat_channel_id,
+        this.router.transitionTo(
+          "chat.channel.near-message",
           response.chat_channel_title,
-          {
-            queryParams: { messageId: params.messageId },
-          }
+          response.chat_channel_id,
+          params.messageId
         );
       })
       .catch(() => this.replaceWith("/404"));
@@ -23,7 +22,7 @@ export default class ChatMessageRoute extends DiscourseRoute {
 
   beforeModel() {
     if (!this.chat.userCanChat) {
-      return this.transitionTo(`discovery.${defaultHomepage()}`);
+      return this.router.transitionTo(`discovery.${defaultHomepage()}`);
     }
   }
 }
diff --git a/plugins/chat/assets/javascripts/discourse/routes/chat.js b/plugins/chat/assets/javascripts/discourse/routes/chat.js
index 4c49766601d..cae606d06b2 100644
--- a/plugins/chat/assets/javascripts/discourse/routes/chat.js
+++ b/plugins/chat/assets/javascripts/discourse/routes/chat.js
@@ -4,7 +4,6 @@ import { defaultHomepage } from "discourse/lib/utilities";
 import { inject as service } from "@ember/service";
 import { scrollTop } from "discourse/mixins/scroll-top";
 import { schedule } from "@ember/runloop";
-import { action } from "@ember/object";
 
 export default class ChatRoute extends DiscourseRoute {
   @service chat;
@@ -21,11 +20,16 @@ export default class ChatRoute extends DiscourseRoute {
     }
 
     const INTERCEPTABLE_ROUTES = [
-      "chat.channel.index",
       "chat.channel",
+      "chat.channel.thread",
+      "chat.channel.thread.index",
+      "chat.channel.thread.near-message",
+      "chat.channel.threads",
+      "chat.channel.index",
+      "chat.channel.near-message",
+      "chat.channel-legacy",
       "chat",
       "chat.index",
-      "chat.draft-channel",
     ];
 
     if (
@@ -35,17 +39,17 @@ export default class ChatRoute extends DiscourseRoute {
     ) {
       transition.abort();
 
-      let URL = transition.intent.url;
+      let url = transition.intent.url;
       if (transition.targetName.startsWith("chat.channel")) {
-        URL ??= this.router.urlFor(
+        url ??= this.router.urlFor(
           transition.targetName,
           ...transition.intent.contexts
         );
       } else {
-        URL ??= this.router.urlFor(transition.targetName);
+        url ??= this.router.urlFor(transition.targetName);
       }
 
-      this.appEvents.trigger("chat:open-url", URL);
+      this.appEvents.trigger("chat:open-url", url);
       return;
     }
 
@@ -59,26 +63,22 @@ export default class ChatRoute extends DiscourseRoute {
     schedule("afterRender", () => {
       document.body.classList.add("has-full-page-chat");
       document.documentElement.classList.add("has-full-page-chat");
-    });
-  }
-
-  deactivate() {
-    schedule("afterRender", () => {
-      document.body.classList.remove("has-full-page-chat");
-      document.documentElement.classList.remove("has-full-page-chat");
       scrollTop();
     });
   }
 
-  @action
-  willTransition(transition) {
-    if (!transition?.to?.name?.startsWith("chat.channel")) {
-      this.chat.setActiveChannel(null);
+  deactivate(transition) {
+    if (transition) {
+      const url = this.router.urlFor(transition.from.name);
+      this.chatStateManager.storeChatURL(url);
     }
 
-    if (!transition?.to?.name?.startsWith("chat.")) {
-      this.chatStateManager.storeChatURL();
-      this.chat.updatePresence();
-    }
+    this.chat.activeChannel = null;
+    this.chat.updatePresence();
+
+    schedule("afterRender", () => {
+      document.body.classList.remove("has-full-page-chat");
+      document.documentElement.classList.remove("has-full-page-chat");
+    });
   }
 }
diff --git a/plugins/chat/assets/javascripts/discourse/routes/preferences-chat.js b/plugins/chat/assets/javascripts/discourse/routes/preferences-chat.js
index 07da3697c57..06e2e85a4cf 100644
--- a/plugins/chat/assets/javascripts/discourse/routes/preferences-chat.js
+++ b/plugins/chat/assets/javascripts/discourse/routes/preferences-chat.js
@@ -4,12 +4,13 @@ import { inject as service } from "@ember/service";
 
 export default class PreferencesChatRoute extends RestrictedUserRoute {
   @service chat;
+  @service router;
 
   showFooter = true;
 
   setupController(controller, user) {
     if (!user?.can_chat && !this.currentUser.admin) {
-      return this.transitionTo(`discovery.${defaultHomepage()}`);
+      return this.router.transitionTo(`discovery.${defaultHomepage()}`);
     }
     controller.set("model", user);
   }
diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-admin-api.js b/plugins/chat/assets/javascripts/discourse/services/chat-admin-api.js
new file mode 100644
index 00000000000..38025d89b26
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/services/chat-admin-api.js
@@ -0,0 +1,19 @@
+import Service from "@ember/service";
+import { ajax } from "discourse/lib/ajax";
+
+export default class ChatAdminApi extends Service {
+  async exportMessages() {
+    await this.#post(`/export/messages`);
+  }
+
+  get #basePath() {
+    return "/chat/admin";
+  }
+
+  #post(endpoint, data = {}) {
+    return ajax(`${this.#basePath}${endpoint}`, {
+      type: "POST",
+      data,
+    });
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-api.js b/plugins/chat/assets/javascripts/discourse/services/chat-api.js
index e88cb954cc9..e8677485470 100644
--- a/plugins/chat/assets/javascripts/discourse/services/chat-api.js
+++ b/plugins/chat/assets/javascripts/discourse/services/chat-api.js
@@ -1,123 +1,76 @@
 import Service, { inject as service } from "@ember/service";
 import { ajax } from "discourse/lib/ajax";
 import UserChatChannelMembership from "discourse/plugins/chat/discourse/models/user-chat-channel-membership";
-import { tracked } from "@glimmer/tracking";
-import { bind } from "discourse-common/utils/decorators";
-import { Promise } from "rsvp";
-
-class Collection {
-  @tracked items = [];
-  @tracked meta = {};
-  @tracked loading = false;
-
-  constructor(resourceURL, handler) {
-    this._resourceURL = resourceURL;
-    this._handler = handler;
-    this._fetchedAll = false;
-  }
-
-  get loadMoreURL() {
-    return this.meta.load_more_url;
-  }
-
-  get totalRows() {
-    return this.meta.total_rows;
-  }
-
-  get length() {
-    return this.items.length;
-  }
-
-  // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols
-  [Symbol.iterator]() {
-    let index = 0;
-
-    return {
-      next: () => {
-        if (index < this.items.length) {
-          return { value: this.items[index++], done: false };
-        } else {
-          return { done: true };
-        }
-      },
-    };
-  }
-
-  @bind
-  load(params = {}) {
-    this._fetchedAll = false;
-
-    if (this.loading) {
-      return;
-    }
-
-    this.loading = true;
-
-    const filteredQueryParams = Object.entries(params).filter(
-      ([, v]) => v !== undefined
-    );
-    const queryString = new URLSearchParams(filteredQueryParams).toString();
-
-    const endpoint = this._resourceURL + (queryString ? `?${queryString}` : "");
-    return this.#fetch(endpoint)
-      .then((result) => {
-        this.items = this._handler(result);
-        this.meta = result.meta;
-      })
-      .finally(() => {
-        this.loading = false;
-      });
-  }
-
-  @bind
-  loadMore() {
-    let promise = Promise.resolve();
-
-    if (this.loading) {
-      return promise;
-    }
-
-    if (
-      this._fetchedAll ||
-      (this.totalRows && this.items.length >= this.totalRows)
-    ) {
-      return promise;
-    }
-
-    this.loading = true;
-
-    if (this.loadMoreURL) {
-      promise = this.#fetch(this.loadMoreURL).then((result) => {
-        const newItems = this._handler(result);
-
-        if (newItems.length) {
-          this.items = this.items.concat(newItems);
-        } else {
-          this._fetchedAll = true;
-        }
-        this.meta = result.meta;
-      });
-    }
-
-    return promise.finally(() => {
-      this.loading = false;
-    });
-  }
-
-  #fetch(url) {
-    return ajax(url, { type: "GET" });
-  }
-}
+import Collection from "../lib/collection";
 
+/**
+ * Chat API service. Provides methods to interact with the chat API.
+ *
+ * @module ChatApi
+ * @implements {@ember/service}
+ */
 export default class ChatApi extends Service {
+  @service chat;
   @service chatChannelsManager;
 
-  getChannel(channelId) {
-    return this.#getRequest(`/channels/${channelId}`).then((result) =>
-      this.chatChannelsManager.store(result.channel)
+  channel(channelId) {
+    return this.#getRequest(`/channels/${channelId}`);
+  }
+
+  channelThreadMessages(channelId, threadId, params = {}) {
+    return this.#getRequest(
+      `/channels/${channelId}/threads/${threadId}/messages?${new URLSearchParams(
+        params
+      ).toString()}`
     );
   }
 
+  channelMessages(channelId, params = {}) {
+    return this.#getRequest(
+      `/channels/${channelId}/messages?${new URLSearchParams(
+        params
+      ).toString()}`
+    );
+  }
+
+  /**
+   * Get a thread in a channel by its ID.
+   * @param {number} channelId - The ID of the channel.
+   * @param {number} threadId - The ID of the thread.
+   * @returns {Promise}
+   *
+   * @example
+   *
+   *    this.chatApi.thread(5, 1).then(thread => { ... })
+   */
+  thread(channelId, threadId) {
+    return this.#getRequest(`/channels/${channelId}/threads/${threadId}`);
+  }
+
+  /**
+   * Loads all threads for a channel.
+   * For now we only get the 50 threads ordered
+   * by the last message sent by the user then the
+   * thread creation date, later we will paginate
+   * and add filters.
+   * @param {number} channelId - The ID of the channel.
+   * @returns {Promise}
+   */
+  threads(channelId, handler) {
+    return new Collection(
+      `${this.#basePath}/channels/${channelId}/threads`,
+      handler
+    );
+  }
+
+  /**
+   * List all accessible category channels of the current user.
+   * @returns {Collection}
+   *
+   * @example
+   *
+   *    this.chatApi.channels.then(channels => { ... })
+   */
   channels() {
     return new Collection(`${this.#basePath}/channels`, (response) => {
       return response.channels.map((channel) =>
@@ -126,26 +79,84 @@ export default class ChatApi extends Service {
     });
   }
 
+  /**
+   * Moves messages from one channel to another.
+   * @param {number} channelId - The ID of the original channel.
+   * @param {object} data - Params of the move.
+   * @param {Array.<number>} data.message_ids - IDs of the moved messages.
+   * @param {number} data.destination_channel_id - ID of the channel where the messages are moved to.
+   * @returns {Promise}
+   *
+   * @example
+   *
+   *   this.chatApi
+   *     .moveChannelMessages(1, {
+   *       message_ids: [2, 3],
+   *       destination_channel_id: 4,
+   *     }).then(() => { ... })
+   */
   moveChannelMessages(channelId, data = {}) {
     return this.#postRequest(`/channels/${channelId}/messages/moves`, {
       move: data,
     });
   }
 
-  destroyChannel(channelId, data = {}) {
-    return this.#deleteRequest(`/channels/${channelId}`, { channel: data });
+  /**
+   * Destroys a channel.
+   * @param {number} channelId - The ID of the channel.
+   * @returns {Promise}
+   *
+   * @example
+   *
+   *    this.chatApi.destroyChannel(1).then(() => { ... })
+   */
+  destroyChannel(channelId) {
+    return this.#deleteRequest(`/channels/${channelId}`);
   }
 
+  /**
+   * Creates a channel.
+   * @param {object} data - Params of the channel.
+   * @param {string} data.name - The name of the channel.
+   * @param {string} data.chatable_id - The category of the channel.
+   * @param {string} data.description - The description of the channel.
+   * @param {boolean} [data.auto_join_users] - Should users join this channel automatically.
+   * @returns {Promise}
+   *
+   * @example
+   *
+   *    this.chatApi
+   *      .createChannel({ name: "foo", chatable_id: 1, description "bar" })
+   *      .then((channel) => { ... })
+   */
   createChannel(data = {}) {
     return this.#postRequest("/channels", { channel: data }).then((response) =>
       this.chatChannelsManager.store(response.channel)
     );
   }
 
+  /**
+   * Lists chat permissions for a category.
+   * @param {number} categoryId - ID of the category.
+   * @returns {Promise}
+   */
   categoryPermissions(categoryId) {
-    return ajax(`/chat/api/category-chatables/${categoryId}/permissions`);
+    return this.#getRequest(`/category-chatables/${categoryId}/permissions`);
   }
 
+  /**
+   * Sends a message.
+   * @param {number} channelId - ID of the channel.
+   * @param {object} data - Params of the message.
+   * @param {string} data.message - The raw content of the message in markdown.
+   * @param {string} data.cooked - The cooked content of the message.
+   * @param {number} [data.in_reply_to_id] - The ID of the replied-to message.
+   * @param {number} [data.staged_id] - The staged ID of the message before it was persisted.
+   * @param {number} [data.thread_id] - The ID of the thread where this message should be posted.
+   * @param {number} [data.staged_thread_id] - The staged ID of the thread before it was persisted.
+   * @param {Array.<number>} [data.upload_ids] - Array of upload ids linked to the message.
+   * @returns {Promise}
+   */
   sendMessage(channelId, data = {}) {
     return ajax(`/chat/${channelId}`, {
       ignoreUnsent: false,
@@ -154,20 +165,60 @@ export default class ChatApi extends Service {
     });
   }
 
+  /**
+   * Trashes (soft deletes) a chat message.
+   * @param {number} channelId - ID of the channel.
+   * @param {number} messageId - ID of the message.
+   * @returns {Promise}
+   */
+  trashMessage(channelId, messageId) {
+    return this.#deleteRequest(`/channels/${channelId}/messages/${messageId}`);
+  }
+
+  /**
+   * Creates a channel archive.
+   * @param {number} channelId - The ID of the channel.
+   * @param {object} data - Params of the archive.
+   * @param {string} data.selection - "new_topic" or "existing_topic".
+   * @param {string} [data.title] - Title of the topic when creating a new topic.
+   * @param {string} [data.category_id] - ID of the category used when creating a new topic.
+   * @param {Array.<string>} [data.tags] - tags used when creating a new topic.
+   * @param {string} [data.topic_id] - ID of the topic when using an existing topic.
+   * @returns {Promise}
+   */
   createChannelArchive(channelId, data = {}) {
     return this.#postRequest(`/channels/${channelId}/archives`, {
       archive: data,
     });
   }
 
+  /**
+   * Updates a channel.
+   * @param {number} channelId - The ID of the channel.
+   * @param {object} data - Params of the archive.
+   * @param {string} [data.description] - Description of the channel.
+   * @param {string} [data.name] - Name of the channel.
+   * @returns {Promise}
+   */
   updateChannel(channelId, data = {}) {
     return this.#putRequest(`/channels/${channelId}`, { channel: data });
   }
 
+  /**
+   * Updates the status of a channel.
+   * @param {number} channelId - The ID of the channel.
+   * @param {string} status - The new status, can be "open" or "closed".
+   * @returns {Promise}
+   */
   updateChannelStatus(channelId, status) {
     return this.#putRequest(`/channels/${channelId}/status`, { status });
   }
 
+  /**
+   * Lists members of a channel.
+   * @param {number} channelId - The ID of the channel.
+   * @returns {Collection}
+   */
   listChannelMemberships(channelId) {
     return new Collection(
       `${this.#basePath}/channels/${channelId}/memberships`,
@@ -179,33 +230,251 @@ export default class ChatApi extends Service {
     );
   }
 
+  /**
+   * Lists public and direct message channels of the current user.
+   * @returns {Promise}
+   */
   listCurrentUserChannels() {
-    return this.#getRequest(`/channels/me`).then((result) => {
-      return (result?.channels || []).map((channel) =>
-        this.chatChannelsManager.store(channel)
-      );
-    });
+    return this.#getRequest("/channels/me");
   }
 
+  /**
+   * Makes current user follow a channel.
+   * @param {number} channelId - The ID of the channel.
+   * @returns {Promise}
+   */
   followChannel(channelId) {
     return this.#postRequest(`/channels/${channelId}/memberships/me`).then(
       (result) => UserChatChannelMembership.create(result.membership)
     );
   }
 
+  /**
+   * Makes current user unfollow a channel.
+   * @param {number} channelId - The ID of the channel.
+   * @returns {Promise}
+   */
   unfollowChannel(channelId) {
     return this.#deleteRequest(`/channels/${channelId}/memberships/me`).then(
       (result) => UserChatChannelMembership.create(result.membership)
     );
   }
 
-  updateCurrentUserChatChannelNotificationsSettings(channelId, data = {}) {
+  /**
+   * Update notifications settings of current user for a channel.
+   * @param {number} channelId - The ID of the channel.
+   * @param {object} data - The settings to modify.
+   * @param {boolean} [data.muted] - Mutes the channel.
+   * @param {string} [data.desktop_notification_level] - Notifications level on desktop: never, mention or always.
+   * @param {string} [data.mobile_notification_level] - Notifications level on mobile: never, mention or always.
+   * @returns {Promise}
+   */
+  updateCurrentUserChannelNotificationsSettings(channelId, data = {}) {
     return this.#putRequest(
       `/channels/${channelId}/notifications-settings/me`,
       { notifications_settings: data }
     );
   }
 
+  /**
+   * Update notifications settings of current user for a thread.
+   * @param {number} channelId - The ID of the channel.
+   * @param {number} threadId - The ID of the thread.
+   * @param {object} data - The settings to modify.
+   * @param {boolean} [data.notification_level] - The new notification level, c.f. Chat::NotificationLevels. Threads only support
+   *  "regular" and "tracking" for now.
+   * @returns {Promise}
+   */
+  updateCurrentUserThreadNotificationsSettings(channelId, threadId, data) {
+    return this.#putRequest(
+      `/channels/${channelId}/threads/${threadId}/notifications-settings/me`,
+      { notification_level: data.notificationLevel }
+    );
+  }
+
+  /**
+   * Saves a draft for the channel, which includes message contents and uploads.
+   * @param {number} channelId - The ID of the channel.
+   * @param {object} data - The draft data, see ChatMessage.toJSONDraft() for more details.
+   * @returns {Promise}
+   */
+  saveDraft(channelId, data) {
+    return ajax("/chat/drafts", {
+      type: "POST",
+      data: {
+        chat_channel_id: channelId,
+        data,
+      },
+      ignoreUnsent: false,
+    })
+      .then(() => {
+        this.chat.markNetworkAsReliable();
+      })
+      .catch((error) => {
+        // we ignore a draft which can't be saved because it's too big
+        // and only deal with network error for now
+        if (!error.jqXHR?.responseJSON?.errors?.length) {
+          this.chat.markNetworkAsUnreliable();
+        }
+      });
+  }
+
+  /**
+   * Adds or removes an emoji reaction for a message inside a channel.
+   * @param {number} channelId - The ID of the channel.
+   * @param {number} messageId - The ID of the message to react on.
+   * @param {string} emoji - The text version of the emoji without colons, e.g. tada
+   * @param {string} reaction - Either "add" or "remove"
+   * @returns {Promise}
+   */
+  publishReaction(channelId, messageId, emoji, reactAction) {
+    return ajax(`/chat/${channelId}/react/${messageId}`, {
+      type: "PUT",
+      data: {
+        react_action: reactAction,
+        emoji,
+      },
+    });
+  }
+
+  /**
+   * Restores a single deleted chat message in a channel.
+   *
+   * @param {number} channelId - The ID of the channel for the message being restored.
+   * @param {number} messageId - The ID of the message being restored.
+   */
+  restoreMessage(channelId, messageId) {
+    return this.#putRequest(
+      `/channels/${channelId}/messages/${messageId}/restore`
+    );
+  }
+
+  /**
+   * Rebakes the cooked HTML of a single message in a channel.
+   *
+   * @param {number} channelId - The ID of the channel for the message being restored.
+   * @param {number} messageId - The ID of the message being restored.
+   */
+  rebakeMessage(channelId, messageId) {
+    return ajax(`/chat/${channelId}/${messageId}/rebake`, {
+      type: "PUT",
+    });
+  }
+
+  /**
+   * Saves an edit to a message's contents in a channel.
+   *
+   * @param {number} channelId - The ID of the channel for the message being edited.
+   * @param {number} messageId - The ID of the message being edited.
+   * @param {object} data - Params of the edit.
+   * @param {string} data.new_message - The edited content of the message.
+   * @param {Array<number>} data.upload_ids - The uploads attached to the message after editing.
+   */
+  editMessage(channelId, messageId, data) {
+    return ajax(`/chat/${channelId}/edit/${messageId}`, {
+      type: "PUT",
+      data,
+    });
+  }
+
+  /**
+   * Marks messages for all of a user's chat channel memberships as read.
+   *
+   * @returns {Promise}
+   */
+  markAllChannelsAsRead() {
+    return this.#putRequest(`/channels/read`);
+  }
+
+  /**
+   * Lists all possible chatables.
+   *
+   * @param {term} string - The term to search for. # prefix will scope to channels, @ to users.
+   *
+   * @returns {Promise}
+   */
+  chatables(args = {}) {
+    return this.#getRequest("/chatables", args);
+  }
+
+  /**
+   * Marks messages for a single user chat channel membership as read. If no
+   * message ID is provided, then the latest message for the channel is fetched
+   * on the server and used for the last read message.
+   *
+   * @param {number} channelId - The ID of the channel for the message being marked as read.
+   * @param {number} [messageId] - The ID of the message being marked as read.
+   * @returns {Promise}
+   */
+  markChannelAsRead(channelId, messageId = null) {
+    return this.#putRequest(`/channels/${channelId}/read/${messageId}`);
+  }
+
+  /**
+   * Marks all messages and mentions in a thread as read. This is quite
+   * far-reaching for now, and is not granular since there is no membership/
+   * read state per-user for threads. In future this will be expanded to
+   * also pass message ID in the same way as markChannelAsRead
+   *
+   * @param {number} channelId - The ID of the channel for the thread being marked as read.
+   * @param {number} threadId - The ID of the thread being marked as read.
+   * @returns {Promise}
+   */
+  markThreadAsRead(channelId, threadId) {
+    return this.#putRequest(`/channels/${channelId}/threads/${threadId}/read`);
+  }
+
+  /**
+   * Updates settings of a thread.
+   *
+   * @param {number} channelId - The ID of the channel for the thread being edited.
+   * @param {number} threadId - The ID of the thread being edited.
+   * @param {object} data - Params of the edit.
+   * @param {string} data.title - The new title for the thread.
+   */
+  editThread(channelId, threadId, data) {
+    return this.#putRequest(`/channels/${channelId}/threads/${threadId}`, data);
+  }
+
+  /**
+   * Generate a quote for a list of messages.
+   *
+   * @param {number} channelId - The ID of the channel containing the messages.
+   * @param {Array<number>} messageIds - The IDs of the messages to quote.
+   */
+  generateQuote(channelId, messageIds) {
+    return ajax(`/chat/${channelId}/quote`, {
+      type: "POST",
+      data: { message_ids: messageIds },
+    });
+  }
+
+  /**
+   * Invite users to a channel.
+   *
+   * @param {number} channelId - The ID of the channel.
+   * @param {Array<number>} userIds - The IDs of the users to invite.
+   * @param {object} options
+   * @param {number} options.chat_message_id - A message ID to display in the invite.
+   */
+  invite(channelId, userIds, options = {}) {
+    return ajax(`/chat/${channelId}/invite`, {
+      type: "put",
+      data: { user_ids: userIds, chat_message_id: options.messageId },
+    });
+  }
+
+  /**
+   * Summarize a channel.
+   *
+   * @param {number} channelId - The ID of the channel to summarize.
+   * @param {object} options
+   * @param {number} options.since - Number of hours ago the summary should start (1, 3, 6, 12, 24, 72, 168).
+   */
+  summarize(channelId, options = {}) {
+    return this.#getRequest(`/channels/${channelId}/summarize`, options);
+  }
+
   get #basePath() {
     return "/chat/api";
   }
diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-channel-composer.js b/plugins/chat/assets/javascripts/discourse/services/chat-channel-composer.js
new file mode 100644
index 00000000000..b745b153dff
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/services/chat-channel-composer.js
@@ -0,0 +1,73 @@
+import Service, { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+import ChatMessage from "discourse/plugins/chat/discourse/models/chat-message";
+import { tracked } from "@glimmer/tracking";
+
+export default class ChatChannelComposer extends Service {
+  @service chat;
+  @service currentUser;
+  @service router;
+  @service("chat-thread-composer") threadComposer;
+
+  @tracked message;
+  @tracked textarea;
+
+  @action
+  focus(options = {}) {
+    this.textarea?.focus(options);
+  }
+
+  @action
+  blur() {
+    this.textarea.blur();
+  }
+
+  @action
+  reset(channel) {
+    this.message = ChatMessage.createDraftMessage(channel, {
+      user: this.currentUser,
+    });
+  }
+
+  @action
+  cancel() {
+    if (this.message.editing) {
+      this.reset(this.message.channel);
+    } else if (this.message.inReplyTo) {
+      this.message.inReplyTo = null;
+    }
+
+    this.focus({ ensureAtEnd: true, refreshHeight: true });
+  }
+
+  @action
+  edit(message) {
+    this.chat.activeMessage = null;
+    message.editing = true;
+    this.message = message;
+    this.focus({ refreshHeight: true, ensureAtEnd: true });
+  }
+
+  @action
+  async replyTo(message) {
+    this.chat.activeMessage = null;
+
+    if (message.channel.threadingEnabled) {
+      if (!message.thread?.id) {
+        message.thread = message.channel.createStagedThread(message);
+      }
+
+      this.reset(message.channel);
+
+      await this.router.transitionTo(
+        "chat.channel.thread",
+        ...message.thread.routeModels
+      );
+
+      this.threadComposer.focus({ ensureAtEnd: true, refreshHeight: true });
+    } else {
+      this.message.inReplyTo = message;
+      this.focus({ ensureAtEnd: true, refreshHeight: true });
+    }
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-channel-emoji-picker-manager.js b/plugins/chat/assets/javascripts/discourse/services/chat-channel-emoji-picker-manager.js
new file mode 100644
index 00000000000..fb3975ea87b
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/services/chat-channel-emoji-picker-manager.js
@@ -0,0 +1,3 @@
+import ChatEmojiPickerManager from "./chat-emoji-picker-manager";
+
+export default class ChatChannelEmojiPickerManager extends ChatEmojiPickerManager {}
diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-channel-pane-subscriptions-manager.js b/plugins/chat/assets/javascripts/discourse/services/chat-channel-pane-subscriptions-manager.js
new file mode 100644
index 00000000000..e2e53ea15f6
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/services/chat-channel-pane-subscriptions-manager.js
@@ -0,0 +1,50 @@
+import { inject as service } from "@ember/service";
+import { tracked } from "@glimmer/tracking";
+import { TrackedArray } from "@ember-compat/tracked-built-ins";
+import ChatPaneBaseSubscriptionsManager from "./chat-pane-base-subscriptions-manager";
+import ChatThreadPreview from "../models/chat-thread-preview";
+import ChatNotice from "../models/chat-notice";
+
+export default class ChatChannelPaneSubscriptionsManager extends ChatPaneBaseSubscriptionsManager {
+  @service chat;
+  @service currentUser;
+
+  @tracked notices = new TrackedArray();
+
+  get messageBusChannel() {
+    return `/chat/${this.model.id}`;
+  }
+
+  get messageBusLastId() {
+    return this.model.channelMessageBusLastId;
+  }
+
+  handleSentMessage() {
+    return;
+  }
+
+  handleNotice(data) {
+    this.notices.push(ChatNotice.create(data));
+  }
+
+  clearNotice(notice) {
+    const index = this.notices.indexOf(notice);
+    if (index > -1) {
+      this.notices.splice(index, 1);
+    }
+  }
+
+  handleThreadOriginalMessageUpdate(data) {
+    const message = this.messagesManager.findMessage(data.original_message_id);
+    if (message?.thread) {
+      message.thread.preview = ChatThreadPreview.create(data.preview);
+    }
+  }
+
+  _afterDeleteMessage(targetMsg, data) {
+    if (this.model.currentUserMembership.lastReadMessageId === targetMsg.id) {
+      this.model.currentUserMembership.lastReadMessageId =
+        data.latest_not_deleted_message_id;
+    }
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-channel-pane.js b/plugins/chat/assets/javascripts/discourse/services/chat-channel-pane.js
new file mode 100644
index 00000000000..35e903abbd1
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/services/chat-channel-pane.js
@@ -0,0 +1,32 @@
+import { tracked } from "@glimmer/tracking";
+import { action } from "@ember/object";
+import Service, { inject as service } from "@ember/service";
+
+export default class ChatChannelPane extends Service {
+  @service chat;
+
+  @tracked reacting = false;
+  @tracked selectingMessages = false;
+  @tracked lastSelectedMessage = null;
+  @tracked sending = false;
+
+  get channel() {
+    return this.chat.activeChannel;
+  }
+
+  get selectedMessageIds() {
+    return this.channel.messagesManager.selectedMessages.mapBy("id");
+  }
+
+  @action
+  cancelSelecting() {
+    this.selectingMessages = false;
+    this.channel.messagesManager.clearSelectedMessages();
+  }
+
+  @action
+  onSelectMessage(message) {
+    this.lastSelectedMessage = message;
+    this.selectingMessages = true;
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-channels-manager.js b/plugins/chat/assets/javascripts/discourse/services/chat-channels-manager.js
index 1a73752a07c..f55e58fb849 100644
--- a/plugins/chat/assets/javascripts/discourse/services/chat-channels-manager.js
+++ b/plugins/chat/assets/javascripts/discourse/services/chat-channels-manager.js
@@ -1,4 +1,5 @@
 import Service, { inject as service } from "@ember/service";
+import { debounce } from "discourse-common/utils/decorators";
 import Promise from "rsvp";
 import ChatChannel from "discourse/plugins/chat/discourse/models/chat-channel";
 import { tracked } from "@glimmer/tracking";
@@ -9,7 +10,7 @@ const DIRECT_MESSAGE_CHANNELS_LIMIT = 20;
 
 /*
   The ChatChannelsManager service is responsible for managing the loaded chat channels.
-  It provides helpers to facilitate using and managing laoded channels instead of constantly
+  It provides helpers to facilitate using and managing loaded channels instead of constantly
   fetching them from the server.
 */
 
@@ -34,14 +35,30 @@ export default class ChatChannelsManager extends Service {
     return Object.values(this._cached);
   }
 
-  store(channelObject) {
-    let model = this.#findStale(channelObject.id);
+  store(channelObject, options = {}) {
+    let model;
+
+    if (!options.replace) {
+      model = this.#findStale(channelObject.id);
+    }
 
     if (!model) {
-      model = ChatChannel.create(channelObject);
+      if (channelObject instanceof ChatChannel) {
+        model = channelObject;
+      } else {
+        model = ChatChannel.create(channelObject);
+      }
       this.#cache(model);
     }
 
+    if (
+      channelObject.meta?.message_bus_last_ids?.channel_message_bus_last_id !==
+      undefined
+    ) {
+      model.channelMessageBusLastId =
+        channelObject.meta.message_bus_last_ids.channel_message_bus_last_id;
+    }
+
     return model;
   }
 
@@ -50,17 +67,11 @@ export default class ChatChannelsManager extends Service {
 
     if (!model.currentUserMembership.following) {
       return this.chatApi.followChannel(model.id).then((membership) => {
-        model.currentUserMembership.following = membership.following;
-        model.currentUserMembership.muted = membership.muted;
-        model.currentUserMembership.desktop_notification_level =
-          membership.desktop_notification_level;
-        model.currentUserMembership.mobile_notification_level =
-          membership.mobile_notification_level;
-
+        model.currentUserMembership = membership;
         return model;
       });
     } else {
-      return Promise.resolve(model);
+      return model;
     }
   }
 
@@ -74,23 +85,25 @@ export default class ChatChannelsManager extends Service {
     });
   }
 
-  get unreadCount() {
-    let count = 0;
-    this.publicMessageChannels.forEach((channel) => {
-      count += channel.currentUserMembership.unread_count || 0;
-    });
-    return count;
+  @debounce(300)
+  async markAllChannelsRead() {
+    // The user tracking state for each channel marked read will be propagated by MessageBus
+    return this.chatApi.markAllChannelsAsRead();
   }
 
-  get unreadUrgentCount() {
-    let count = 0;
-    this.channels.forEach((channel) => {
-      if (channel.isDirectMessageChannel) {
-        count += channel.currentUserMembership.unread_count || 0;
+  remove(model) {
+    this.chatSubscriptionsManager.stopChannelSubscription(model);
+    delete this._cached[model.id];
+  }
+
+  get allChannels() {
+    return [...this.publicMessageChannels, ...this.directMessageChannels].sort(
+      (a, b) => {
+        return b?.currentUserMembership?.lastViewedAt?.localeCompare?.(
+          a?.currentUserMembership?.lastViewedAt
+        );
       }
-      count += channel.currentUserMembership.unread_mentions || 0;
-    });
-    return count;
+    );
   }
 
   get publicMessageChannels() {
@@ -99,7 +112,7 @@ export default class ChatChannelsManager extends Service {
         (channel) =>
           channel.isCategoryChannel && channel.currentUserMembership.following
       )
-      .sort((a, b) => a.title.localeCompare(b.title));
+      .sort((a, b) => a?.slug?.localeCompare?.(b?.slug));
   }
 
   get directMessageChannels() {
@@ -117,15 +130,18 @@ export default class ChatChannelsManager extends Service {
 
   async #find(id) {
     return this.chatApi
-      .getChannel(id)
+      .channel(id)
       .catch(popupAjaxError)
-      .then((channel) => {
-        this.#cache(channel);
-        return channel;
+      .then((result) => {
+        return this.store(result.channel);
       });
   }
 
   #cache(channel) {
+    if (!channel) {
+      return;
+    }
+
     this._cached[channel.id] = channel;
   }
 
@@ -135,15 +151,21 @@ export default class ChatChannelsManager extends Service {
 
   #sortDirectMessageChannels(channels) {
     return channels.sort((a, b) => {
-      const unreadCountA = a.currentUserMembership.unread_count || 0;
-      const unreadCountB = b.currentUserMembership.unread_count || 0;
-      if (unreadCountA === unreadCountB) {
-        return new Date(a.get("last_message_sent_at")) >
-          new Date(b.get("last_message_sent_at"))
+      if (!a.lastMessage) {
+        return 1;
+      }
+
+      if (!b.lastMessage) {
+        return -1;
+      }
+
+      if (a.tracking.unreadCount === b.tracking.unreadCount) {
+        return new Date(a.lastMessage.createdAt) >
+          new Date(b.lastMessage.createdAt)
           ? -1
           : 1;
       } else {
-        return unreadCountA > unreadCountB ? -1 : 1;
+        return a.tracking.unreadCount > b.tracking.unreadCount ? -1 : 1;
       }
     });
   }
diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-composer-presence-manager.js b/plugins/chat/assets/javascripts/discourse/services/chat-composer-presence-manager.js
index 57ddd682dbf..25c0490b6c4 100644
--- a/plugins/chat/assets/javascripts/discourse/services/chat-composer-presence-manager.js
+++ b/plugins/chat/assets/javascripts/discourse/services/chat-composer-presence-manager.js
@@ -2,7 +2,6 @@ import Service, { inject as service } from "@ember/service";
 import { cancel, debounce } from "@ember/runloop";
 import { isTesting } from "discourse-common/config/environment";
 
-const CHAT_PRESENCE_CHANNEL_PREFIX = "/chat-reply";
 const KEEP_ALIVE_DURATION_SECONDS = 10;
 
 // This service is loosely based on discourse-presence's ComposerPresenceManager service
@@ -16,15 +15,15 @@ export default class ChatComposerPresenceManager extends Service {
     this.leave();
   }
 
-  notifyState(chatChannelId, replying) {
+  notifyState(channelName, replying) {
     if (!replying) {
       this.leave();
       return;
     }
 
-    if (this._chatChannelId !== chatChannelId) {
-      this._enter(chatChannelId);
-      this._chatChannelId = chatChannelId;
+    if (this._channelName !== channelName) {
+      this._enter(channelName);
+      this._channelName = channelName;
     }
 
     if (!isTesting()) {
@@ -39,17 +38,16 @@ export default class ChatComposerPresenceManager extends Service {
   leave() {
     this._presentChannel?.leave();
     this._presentChannel = null;
-    this._chatChannelId = null;
+    this._channelName = null;
     if (this._autoLeaveTimer) {
       cancel(this._autoLeaveTimer);
       this._autoLeaveTimer = null;
     }
   }
 
-  _enter(chatChannelId) {
+  _enter(channelName) {
     this.leave();
 
-    let channelName = `${CHAT_PRESENCE_CHANNEL_PREFIX}/${chatChannelId}`;
     this._presentChannel = this.presence.getChannel(channelName);
     this._presentChannel.enter();
   }
diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-composer-warnings-tracker.js b/plugins/chat/assets/javascripts/discourse/services/chat-composer-warnings-tracker.js
new file mode 100644
index 00000000000..165d327729d
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/services/chat-composer-warnings-tracker.js
@@ -0,0 +1,146 @@
+import Service, { inject as service } from "@ember/service";
+import { ajax } from "discourse/lib/ajax";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { bind } from "discourse-common/utils/decorators";
+import { mentionRegex } from "pretty-text/mentions";
+import { cancel } from "@ember/runloop";
+import { tracked } from "@glimmer/tracking";
+
+const MENTION_RESULT = {
+  invalid: -1,
+  unreachable: 0,
+  over_members_limit: 1,
+};
+
+const MENTION_DEBOUNCE_MS = 1000;
+
+export default class ChatComposerWarningsTracker extends Service {
+  @service siteSettings;
+
+  // Track mention hints to display warnings
+  @tracked unreachableGroupMentions = [];
+  @tracked overMembersLimitGroupMentions = [];
+  @tracked tooManyMentions = false;
+  @tracked mentionsCount = 0;
+  @tracked mentionsTimer = null;
+
+  // Complimentary structure to avoid repeating mention checks.
+  _mentionWarningsSeen = {};
+
+  willDestroy() {
+    cancel(this.mentionsTimer);
+  }
+
+  @bind
+  trackMentions(message) {
+    this.mentionsTimer = discourseDebounce(
+      this,
+      this._trackMentions,
+      message,
+      MENTION_DEBOUNCE_MS
+    );
+  }
+
+  @bind
+  _trackMentions(message) {
+    if (!this.siteSettings.enable_mentions) {
+      return;
+    }
+
+    const mentions = this._extractMentions(message);
+    this.mentionsCount = mentions?.length;
+
+    if (this.mentionsCount > 0) {
+      this.tooManyMentions =
+        this.mentionsCount > this.siteSettings.max_mentions_per_chat_message;
+
+      if (!this.tooManyMentions) {
+        const newMentions = mentions.filter(
+          (mention) => !(mention in this._mentionWarningsSeen)
+        );
+
+        if (newMentions?.length > 0) {
+          this._recordNewWarnings(newMentions, mentions);
+        } else {
+          this._rebuildWarnings(mentions);
+        }
+      }
+    } else {
+      this.tooManyMentions = false;
+      this.unreachableGroupMentions = [];
+      this.overMembersLimitGroupMentions = [];
+    }
+  }
+
+  _extractMentions(message) {
+    const regex = mentionRegex(this.siteSettings.unicode_usernames);
+    const mentions = [];
+    let mentionsLeft = true;
+
+    while (mentionsLeft) {
+      const matches = message.match(regex);
+
+      if (matches) {
+        const mention = matches[1] || matches[2];
+        mentions.push(mention);
+        message = message.replaceAll(`${mention}`, "");
+
+        if (mentions.length > this.siteSettings.max_mentions_per_chat_message) {
+          mentionsLeft = false;
+        }
+      } else {
+        mentionsLeft = false;
+      }
+    }
+
+    return mentions;
+  }
+
+  _recordNewWarnings(newMentions, mentions) {
+    ajax("/chat/api/mentions/groups.json", {
+      data: { mentions: newMentions },
+    })
+      .then((newWarnings) => {
+        newWarnings.unreachable.forEach((warning) => {
+          this._mentionWarningsSeen[warning] = MENTION_RESULT["unreachable"];
+        });
+
+        newWarnings.over_members_limit.forEach((warning) => {
+          this._mentionWarningsSeen[warning] =
+            MENTION_RESULT["over_members_limit"];
+        });
+
+        newWarnings.invalid.forEach((warning) => {
+          this._mentionWarningsSeen[warning] = MENTION_RESULT["invalid"];
+        });
+
+        this._rebuildWarnings(mentions);
+      })
+      .catch(this._rebuildWarnings(mentions));
+  }
+
+  _rebuildWarnings(mentions) {
+    const newWarnings = mentions.reduce(
+      (memo, mention) => {
+        if (
+          mention in this._mentionWarningsSeen &&
+          !(this._mentionWarningsSeen[mention] === MENTION_RESULT["invalid"])
+        ) {
+          if (
+            this._mentionWarningsSeen[mention] === MENTION_RESULT["unreachable"]
+          ) {
+            memo[0].push(mention);
+          } else {
+            memo[1].push(mention);
+          }
+        }
+
+        return memo;
+      },
+      [[], []]
+    );
+
+    this.unreachableGroupMentions = newWarnings[0];
+    this.overMembersLimitGroupMentions = newWarnings[1];
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-drafts-manager.js b/plugins/chat/assets/javascripts/discourse/services/chat-drafts-manager.js
new file mode 100644
index 00000000000..00662f03edc
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/services/chat-drafts-manager.js
@@ -0,0 +1,25 @@
+import Service from "@ember/service";
+import ChatMessage from "discourse/plugins/chat/discourse/models/chat-message";
+export default class ChatDraftsManager extends Service {
+  drafts = {};
+
+  add(message) {
+    if (message instanceof ChatMessage) {
+      this.drafts[message.channel.id] = message;
+    } else {
+      throw new Error("message must be an instance of ChatMessage");
+    }
+  }
+
+  get({ channelId }) {
+    return this.drafts[channelId];
+  }
+
+  remove({ channelId }) {
+    delete this.drafts[channelId];
+  }
+
+  reset() {
+    this.drafts = {};
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-drawer-router.js b/plugins/chat/assets/javascripts/discourse/services/chat-drawer-router.js
new file mode 100644
index 00000000000..54e19a973f9
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/services/chat-drawer-router.js
@@ -0,0 +1,86 @@
+import Service, { inject as service } from "@ember/service";
+import { tracked } from "@glimmer/tracking";
+import ChatDrawerChannel from "discourse/plugins/chat/discourse/components/chat-drawer/channel";
+import ChatDrawerThread from "discourse/plugins/chat/discourse/components/chat-drawer/thread";
+import ChatDrawerThreads from "discourse/plugins/chat/discourse/components/chat-drawer/threads";
+import ChatDrawerIndex from "discourse/plugins/chat/discourse/components/chat-drawer/index";
+
+const ROUTES = {
+  "chat.channel": { name: ChatDrawerChannel },
+  "chat.channel.thread": {
+    name: ChatDrawerThread,
+    extractParams: (route) => {
+      return {
+        channelId: route.parent.params.channelId,
+        threadId: route.params.threadId,
+      };
+    },
+  },
+  "chat.channel.thread.index": {
+    name: ChatDrawerThread,
+    extractParams: (route) => {
+      return {
+        channelId: route.parent.params.channelId,
+        threadId: route.params.threadId,
+      };
+    },
+  },
+  "chat.channel.thread.near-message": {
+    name: ChatDrawerThread,
+    extractParams: (route) => {
+      return {
+        channelId: route.parent.parent.params.channelId,
+        threadId: route.parent.params.threadId,
+        messageId: route.params.messageId,
+      };
+    },
+  },
+  "chat.channel.threads": {
+    name: ChatDrawerThreads,
+    extractParams: (route) => {
+      return {
+        channelId: route.parent.params.channelId,
+      };
+    },
+  },
+  chat: { name: ChatDrawerIndex },
+  "chat.channel.near-message": {
+    name: ChatDrawerChannel,
+    extractParams: (route) => {
+      return {
+        channelId: route.parent.params.channelId,
+        messageId: route.params.messageId,
+      };
+    },
+  },
+  "chat.channel-legacy": {
+    name: ChatDrawerChannel,
+    extractParams: (route) => {
+      return {
+        channelId: route.params.channelId,
+        messageId: route.queryParams.messageId,
+      };
+    },
+  },
+};
+
+export default class ChatDrawerRouter extends Service {
+  @service router;
+  @service chatHistory;
+
+  @tracked component = null;
+  @tracked drawerRoute = null;
+  @tracked params = null;
+
+  stateFor(route) {
+    this.drawerRoute?.deactivate?.(this.chatHistory.currentRoute);
+
+    this.chatHistory.visit(route);
+
+    this.drawerRoute = ROUTES[route.name];
+    this.params = this.drawerRoute?.extractParams?.(route) || route.params;
+    this.component = this.drawerRoute?.name || ChatDrawerIndex;
+
+    this.drawerRoute.activate?.(route);
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-drawer-size.js b/plugins/chat/assets/javascripts/discourse/services/chat-drawer-size.js
new file mode 100644
index 00000000000..d19c873f32b
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/services/chat-drawer-size.js
@@ -0,0 +1,32 @@
+import Service from "@ember/service";
+import KeyValueStore from "discourse/lib/key-value-store";
+
+export default class ChatDrawerSize extends Service {
+  STORE_NAMESPACE = "discourse_chat_drawer_size_";
+  MIN_HEIGHT = 300;
+  MIN_WIDTH = 250;
+
+  store = new KeyValueStore(this.STORE_NAMESPACE);
+
+  get size() {
+    return {
+      width: this.store.getObject("width") || 400,
+      height: this.store.getObject("height") || 530,
+    };
+  }
+
+  set size({ width, height }) {
+    this.store.setObject({
+      key: "width",
+      value: this.#min(width, this.MIN_WIDTH),
+    });
+    this.store.setObject({
+      key: "height",
+      value: this.#min(height, this.MIN_HEIGHT),
+    });
+  }
+
+  #min(number, min) {
+    return Math.max(number, min);
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-emoji-picker-manager.js b/plugins/chat/assets/javascripts/discourse/services/chat-emoji-picker-manager.js
index b19d53b61a5..280fe7422ff 100644
--- a/plugins/chat/assets/javascripts/discourse/services/chat-emoji-picker-manager.js
+++ b/plugins/chat/assets/javascripts/discourse/services/chat-emoji-picker-manager.js
@@ -1,47 +1,42 @@
-import { headerOffset } from "discourse/lib/offset-calculator";
-import { createPopper } from "@popperjs/core";
-import Service from "@ember/service";
 import { tracked } from "@glimmer/tracking";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { bind } from "discourse-common/utils/decorators";
-import { later, schedule } from "@ember/runloop";
+import { later } from "@ember/runloop";
 import { makeArray } from "discourse-common/lib/helpers";
 import { Promise } from "rsvp";
-import { computed } from "@ember/object";
 import { isTesting } from "discourse-common/config/environment";
+import { action } from "@ember/object";
+import Service, { inject as service } from "@ember/service";
 
 const TRANSITION_TIME = isTesting() ? 0 : 125; // CSS transition time
 const DEFAULT_VISIBLE_SECTIONS = ["favorites", "smileys_&_emotion"];
 const DEFAULT_LAST_SECTION = "favorites";
 
 export default class ChatEmojiPickerManager extends Service {
-  @tracked opened = false;
+  @service appEvents;
+
   @tracked closing = false;
   @tracked loading = false;
-  @tracked context = null;
+  @tracked picker = null;
   @tracked emojis = null;
   @tracked visibleSections = DEFAULT_VISIBLE_SECTIONS;
   @tracked lastVisibleSection = DEFAULT_LAST_SECTION;
   @tracked element = null;
-  @tracked callback;
 
-  @computed("emojis.[]", "loading")
   get sections() {
     return !this.loading && this.emojis ? Object.keys(this.emojis) : [];
   }
 
   @bind
   closeExisting() {
-    this.callback = null;
-    this.opened = false;
     this.visibleSections = DEFAULT_VISIBLE_SECTIONS;
     this.lastVisibleSection = DEFAULT_LAST_SECTION;
+    this.picker = null;
   }
 
   @bind
   close() {
-    this.callback = null;
     this.closing = true;
 
     later(() => {
@@ -52,7 +47,7 @@ export default class ChatEmojiPickerManager extends Service {
       this.visibleSections = DEFAULT_VISIBLE_SECTIONS;
       this.lastVisibleSection = DEFAULT_LAST_SECTION;
       this.closing = false;
-      this.opened = false;
+      this.picker = null;
     }, TRANSITION_TIME);
   }
 
@@ -62,74 +57,23 @@ export default class ChatEmojiPickerManager extends Service {
       .uniq();
   }
 
-  didSelectEmoji(emoji) {
-    this?.callback(emoji);
-    this.callback = null;
-    this.close();
-  }
+  open(picker) {
+    this.loadEmojis();
 
-  startFromMessageReactionList(message, isDesktop, callback) {
-    const trigger = document.querySelector(
-      `.chat-message-container[data-id="${message.id}"] .chat-message-react-btn`
-    );
-    this.startFromMessage(callback, isDesktop, trigger);
-  }
-
-  startFromMessageActions(message, isDesktop, callback) {
-    const trigger = document.querySelector(
-      `.chat-message-actions-container[data-id="${message.id}"] .chat-message-actions`
-    );
-    this.startFromMessage(callback, isDesktop, trigger);
-  }
-
-  startFromMessage(callback, isDesktop, trigger) {
-    this.context = "chat-message";
-    this.element = document.querySelector(".chat-message-emoji-picker-anchor");
-    this.open(callback);
-    this._popper?.destroy();
-
-    if (isDesktop) {
-      schedule("afterRender", () => {
-        this._popper = createPopper(trigger, this.element, {
-          placement: "top",
-          modifiers: [
-            {
-              name: "eventListeners",
-              options: {
-                scroll: false,
-                resize: false,
-              },
-            },
-            {
-              name: "flip",
-              options: {
-                padding: { top: headerOffset() },
-              },
-            },
-          ],
-        });
-      });
+    if (this.picker) {
+      if (this.picker.trigger === picker.trigger) {
+        this.closeExisting();
+      } else {
+        this.closeExisting();
+        this.picker = picker;
+      }
+    } else {
+      this.picker = picker;
     }
   }
 
-  startFromComposer(callback) {
-    this.context = "chat-composer";
-    this.element = document.querySelector(".chat-composer-emoji-picker-anchor");
-    this.open(callback);
-  }
-
-  open(callback) {
-    if (this.opened) {
-      this.closeExisting();
-    }
-
-    this._loadEmojisData();
-
-    this.callback = callback;
-    this.opened = true;
-  }
-
-  _loadEmojisData() {
+  @action
+  loadEmojis() {
     if (this.emojis) {
       return Promise.resolve();
     }
@@ -140,7 +84,6 @@ export default class ChatEmojiPickerManager extends Service {
       .then((emojis) => {
         this.emojis = emojis;
       })
-
       .catch(popupAjaxError)
       .finally(() => {
         this.loading = false;
diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-history.js b/plugins/chat/assets/javascripts/discourse/services/chat-history.js
new file mode 100644
index 00000000000..466529d6cf7
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/services/chat-history.js
@@ -0,0 +1,22 @@
+import Service from "@ember/service";
+import { tracked } from "@glimmer/tracking";
+
+export default class ChatHistory extends Service {
+  @tracked history;
+
+  get previousRoute() {
+    if (this.history?.length > 1) {
+      return this.history[this.history.length - 2];
+    }
+  }
+
+  get currentRoute() {
+    if (this.history?.length > 0) {
+      return this.history[this.history.length - 1];
+    }
+  }
+
+  visit(route) {
+    this.history = (this.history || []).slice(-9).concat([route]);
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-message-visibility-observer.js b/plugins/chat/assets/javascripts/discourse/services/chat-message-visibility-observer.js
deleted file mode 100644
index a5a77a1d4b0..00000000000
--- a/plugins/chat/assets/javascripts/discourse/services/chat-message-visibility-observer.js
+++ /dev/null
@@ -1,63 +0,0 @@
-import Service, { inject as service } from "@ember/service";
-import { isTesting } from "discourse-common/config/environment";
-import { bind } from "discourse-common/utils/decorators";
-
-export default class ChatMessageVisibilityObserver extends Service {
-  @service chat;
-
-  intersectionObserver = new IntersectionObserver(
-    this._intersectionObserverCallback,
-    {
-      root: document,
-      rootMargin: "-10px",
-    }
-  );
-
-  mutationObserver = new MutationObserver(this._mutationObserverCallback, {
-    root: document,
-    rootMargin: "-10px",
-  });
-
-  willDestroy() {
-    this.intersectionObserver.disconnect();
-    this.mutationObserver.disconnect();
-  }
-
-  @bind
-  _intersectionObserverCallback(entries) {
-    entries.forEach((entry) => {
-      entry.target.dataset.visible = entry.isIntersecting;
-
-      if (
-        !entry.target.dataset.stagedId &&
-        entry.isIntersecting &&
-        !isTesting()
-      ) {
-        this.chat.updateLastReadMessage();
-      }
-    });
-  }
-
-  @bind
-  _mutationObserverCallback(mutationList) {
-    mutationList.forEach((mutation) => {
-      const data = mutation.target.dataset;
-      if (data.id && data.visible && !data.stagedId) {
-        this.chat.updateLastReadMessage();
-      }
-    });
-  }
-
-  observe(element) {
-    this.intersectionObserver.observe(element);
-    this.mutationObserver.observe(element, {
-      attributes: true,
-      attributeOldValue: true,
-      attributeFilter: ["data-staged-id"],
-    });
-  }
-
-  unobserve(element) {
-    this.intersectionObserver.unobserve(element);
-  }
-}
diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-notification-manager.js b/plugins/chat/assets/javascripts/discourse/services/chat-notification-manager.js
index 686c552515b..4e96cb76f89 100644
--- a/plugins/chat/assets/javascripts/discourse/services/chat-notification-manager.js
+++ b/plugins/chat/assets/javascripts/discourse/services/chat-notification-manager.js
@@ -1,18 +1,17 @@
 import Service, { inject as service } from "@ember/service";
-import discourseDebounce from "discourse-common/lib/debounce";
 import { withPluginApi } from "discourse/lib/plugin-api";
 import { isTesting } from "discourse-common/config/environment";
 import {
   alertChannel,
   onNotification,
 } from "discourse/lib/desktop-notifications";
-import { bind, observes } from "discourse-common/utils/decorators";
+import { bind } from "discourse-common/utils/decorators";
 
 export default class ChatNotificationManager extends Service {
   @service presence;
   @service chat;
+  @service chatStateManager;
 
-  _inChat = false;
   _subscribedToCore = true;
   _subscribedToChat = false;
   _countChatInDocTitle = true;
@@ -36,6 +35,17 @@ export default class ChatNotificationManager extends Service {
     withPluginApi("0.12.1", (api) => {
       api.onPageChange(this._pageChanged);
     });
+
+    this._pageChanged();
+
+    this._chatPresenceChannel.on(
+      "change",
+      this._subscribeToCorrectNotifications
+    );
+    this._corePresenceChannel.on(
+      "change",
+      this._subscribeToCorrectNotifications
+    );
   }
 
   willDestroy() {
@@ -45,8 +55,17 @@ export default class ChatNotificationManager extends Service {
       return;
     }
 
+    this._chatPresenceChannel.off(
+      "change",
+      this._subscribeToCorrectNotifications
+    );
     this._chatPresenceChannel.unsubscribe();
     this._chatPresenceChannel.leave();
+
+    this._corePresenceChannel.off(
+      "change",
+      this._subscribeToCorrectNotifications
+    );
     this._corePresenceChannel.unsubscribe();
     this._corePresenceChannel.leave();
   }
@@ -56,9 +75,8 @@ export default class ChatNotificationManager extends Service {
   }
 
   @bind
-  _pageChanged(path) {
-    this.set("_inChat", path.startsWith("/chat/channel/"));
-    if (this._inChat) {
+  _pageChanged() {
+    if (this.chatStateManager.isActive) {
       this._chatPresenceChannel.enter({ onlyWhileActive: false });
       this._corePresenceChannel.leave();
     } else {
@@ -67,11 +85,6 @@ export default class ChatNotificationManager extends Service {
     }
   }
 
-  @observes("_chatPresenceChannel.count", "_corePresenceChannel.count")
-  _channelCountsChanged() {
-    discourseDebounce(this, this._subscribeToCorrectNotifications, 2000);
-  }
-
   _coreAlertChannel() {
     return alertChannel(this.currentUser);
   }
@@ -80,12 +93,13 @@ export default class ChatNotificationManager extends Service {
     return `/chat${alertChannel(this.currentUser)}`;
   }
 
+  @bind
   _subscribeToCorrectNotifications() {
     const oneTabForEachOpen =
       this._chatPresenceChannel.count > 0 &&
       this._corePresenceChannel.count > 0;
     if (oneTabForEachOpen) {
-      this._inChat
+      this.chatStateManager.isActive
         ? this._subscribeToChat({ only: true })
         : this._subscribeToCore({ only: true });
     } else {
@@ -103,6 +117,7 @@ export default class ChatNotificationManager extends Service {
 
     if (!this._subscribedToChat) {
       this.messageBus.subscribe(this._chatAlertChannel(), this.onMessage);
+      this.set("_subscribedToChat", true);
     }
 
     if (opts.only && this._subscribedToCore) {
@@ -117,9 +132,10 @@ export default class ChatNotificationManager extends Service {
     }
     if (!this._subscribedToCore) {
       this.messageBus.subscribe(this._coreAlertChannel(), this.onMessage);
+      this.set("_subscribedToCore", true);
     }
 
-    if (this.only && this._subscribedToChat) {
+    if (opts.only && this._subscribedToChat) {
       this.messageBus.unsubscribe(this._chatAlertChannel(), this.onMessage);
       this.set("_subscribedToChat", false);
     }
diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-pane-base-subscriptions-manager.js b/plugins/chat/assets/javascripts/discourse/services/chat-pane-base-subscriptions-manager.js
new file mode 100644
index 00000000000..327b9e2bbf8
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/services/chat-pane-base-subscriptions-manager.js
@@ -0,0 +1,272 @@
+import Service, { inject as service } from "@ember/service";
+import ChatMessage from "discourse/plugins/chat/discourse/models/chat-message";
+import ChatMessageMentionWarning from "discourse/plugins/chat/discourse/models/chat-message-mention-warning";
+import { cloneJSON } from "discourse-common/lib/object";
+import { bind } from "discourse-common/utils/decorators";
+
+export function handleStagedMessage(channel, messagesManager, data) {
+  const stagedMessage = messagesManager.findStagedMessage(data.staged_id);
+
+  if (!stagedMessage) {
+    return;
+  }
+
+  stagedMessage.error = null;
+  stagedMessage.id = data.chat_message.id;
+  stagedMessage.staged = false;
+  stagedMessage.excerpt = data.chat_message.excerpt;
+  stagedMessage.channel = channel;
+  stagedMessage.createdAt = new Date(data.chat_message.created_at);
+  stagedMessage.cooked = data.chat_message.cooked;
+
+  return stagedMessage;
+}
+
+/**
+ * Handles subscriptions for MessageBus messages sent from Chat::Publisher
+ * to the channel and thread panes. There are individual services for
+ * each (ChatChannelPaneSubscriptionsManager and ChatThreadPaneSubscriptionsManager)
+ * that implement their own logic where necessary. Functions which will
+ * always be different between the two raise a "not implemented" error in
+ * the base class, and the child class must define the associated function,
+ * even if it is a noop in that context.
+ *
+ * For example, in the thread context there is no need to handle the thread
+ * creation event, because the panel will not be open in that case.
+ */
+export default class ChatPaneBaseSubscriptionsManager extends Service {
+  @service chat;
+  @service currentUser;
+  @service chatStagedThreadMapping;
+
+  get messageBusChannel() {
+    throw "not implemented";
+  }
+
+  get messageBusLastId() {
+    throw "not implemented";
+  }
+
+  get messagesManager() {
+    return this.model.messagesManager;
+  }
+
+  subscribe(model) {
+    this.unsubscribe();
+    this.model = model;
+    this.messageBus.subscribe(
+      this.messageBusChannel,
+      this.onMessage,
+      this.messageBusLastId
+    );
+  }
+
+  unsubscribe() {
+    if (!this.model) {
+      return;
+    }
+
+    this.messageBus.unsubscribe(this.messageBusChannel, this.onMessage);
+    this.model = null;
+  }
+
+  handleStagedMessageInternal(channel, data) {
+    return handleStagedMessage(channel, this.messagesManager, data);
+  }
+
+  @bind
+  onMessage(busData) {
+    switch (busData.type) {
+      case "sent":
+        this.handleSentMessage(busData);
+        break;
+      case "reaction":
+        this.handleReactionMessage(busData);
+        break;
+      case "processed":
+        this.handleProcessedMessage(busData);
+        break;
+      case "edit":
+        this.handleEditMessage(busData);
+        break;
+      case "refresh":
+        this.handleRefreshMessage(busData);
+        break;
+      case "delete":
+        this.handleDeleteMessage(busData);
+        break;
+      case "bulk_delete":
+        this.handleBulkDeleteMessage(busData);
+        break;
+      case "restore":
+        this.handleRestoreMessage(busData);
+        break;
+      case "mention_warning":
+        this.handleMentionWarning(busData);
+        break;
+      case "self_flagged":
+        this.handleSelfFlaggedMessage(busData);
+        break;
+      case "flag":
+        this.handleFlaggedMessage(busData);
+        break;
+      case "thread_created":
+        this.handleNewThreadCreated(busData);
+        break;
+      case "update_thread_original_message":
+        this.handleThreadOriginalMessageUpdate(busData);
+        break;
+      case "notice":
+        this.handleNotice(busData);
+        break;
+    }
+  }
+
+  handleSentMessage() {
+    throw "not implemented";
+  }
+
+  handleProcessedMessage(data) {
+    const message = this.messagesManager.findMessage(data.chat_message.id);
+    if (message) {
+      message.cooked = data.chat_message.cooked;
+    }
+  }
+
+  handleReactionMessage(data) {
+    const message = this.messagesManager.findMessage(data.chat_message_id);
+    if (message) {
+      message.react(data.emoji, data.action, data.user, this.currentUser.id);
+    }
+  }
+
+  handleEditMessage(data) {
+    const message = this.messagesManager.findMessage(data.chat_message.id);
+    if (message) {
+      message.message = data.chat_message.message;
+      message.cooked = data.chat_message.cooked;
+      message.excerpt = data.chat_message.excerpt;
+      message.uploads = cloneJSON(data.chat_message.uploads || []);
+      message.edited = true;
+    }
+  }
+
+  handleRefreshMessage(data) {
+    const message = this.messagesManager.findMessage(data.chat_message.id);
+    if (message) {
+      message.incrementVersion();
+    }
+  }
+
+  handleBulkDeleteMessage(data) {
+    data.deleted_ids.forEach((deletedId) => {
+      this.handleDeleteMessage({
+        deleted_id: deletedId,
+        deleted_at: data.deleted_at,
+      });
+    });
+  }
+
+  handleDeleteMessage(data) {
+    const deletedId = data.deleted_id;
+    const targetMsg = this.messagesManager.findMessage(deletedId);
+
+    if (!targetMsg) {
+      return;
+    }
+
+    if (this.currentUser.staff || this.currentUser.id === targetMsg.user.id) {
+      targetMsg.deletedAt = data.deleted_at;
+      targetMsg.deletedById = data.deleted_by_id;
+      targetMsg.expanded = false;
+    } else {
+      this.messagesManager.removeMessage(targetMsg);
+    }
+
+    this._afterDeleteMessage(targetMsg, data);
+  }
+
+  handleRestoreMessage(data) {
+    const message = this.messagesManager.findMessage(data.chat_message.id);
+    if (message) {
+      message.deletedAt = null;
+    } else {
+      const newMessage = ChatMessage.create(this.model, data.chat_message);
+      newMessage.manager = this.messagesManager;
+      this.messagesManager.addMessages([newMessage]);
+    }
+  }
+
+  handleMentionWarning(data) {
+    const message = this.messagesManager.findMessage(data.chat_message_id);
+    if (message) {
+      message.mentionWarning = ChatMessageMentionWarning.create(message, data);
+    }
+  }
+
+  handleSelfFlaggedMessage(data) {
+    const message = this.messagesManager.findMessage(data.chat_message_id);
+    if (message) {
+      message.userFlagStatus = data.user_flag_status;
+    }
+  }
+
+  handleFlaggedMessage(data) {
+    const message = this.messagesManager.findMessage(data.chat_message_id);
+    if (message) {
+      message.reviewableId = data.reviewable_id;
+    }
+  }
+
+  handleNewThreadCreated(data) {
+    this.model.threadsManager
+      .find(this.model.id, data.staged_thread_id, { fetchIfNotFound: false })
+      .then((stagedThread) => {
+        if (stagedThread) {
+          this.chatStagedThreadMapping.setMapping(
+            data.thread_id,
+            stagedThread.id
+          );
+          stagedThread.staged = false;
+          stagedThread.id = data.thread_id;
+          stagedThread.originalMessage.thread = stagedThread;
+          stagedThread.originalMessage.thread.preview.replyCount ??= 1;
+
+          // We have to do this because the thread manager cache is keyed by
+          // staged_thread_id, but the thread_id is what we want to use to
+          // look up the thread, otherwise calls to .find() will not return
+          // the thread by its actual ID, and we will end up with double-ups
+          // in places like the thread list when .add() is called.
+          this.model.threadsManager.remove({ id: data.staged_thread_id });
+          this.model.threadsManager.add(this.model, stagedThread, {
+            replace: true,
+          });
+        } else if (data.thread_id) {
+          this.model.threadsManager
+            .find(this.model.id, data.thread_id, { fetchIfNotFound: true })
+            .then((thread) => {
+              const channelOriginalMessage =
+                this.model.messagesManager.findMessage(
+                  thread.originalMessage.id
+                );
+
+              if (channelOriginalMessage) {
+                channelOriginalMessage.thread = thread;
+              }
+            });
+        }
+      });
+  }
+
+  handleThreadOriginalMessageUpdate() {
+    throw "not implemented";
+  }
+
+  handleNotice() {
+    throw "not implemented";
+  }
+
+  _afterDeleteMessage() {
+    throw "not implemented";
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-side-panel-size.js b/plugins/chat/assets/javascripts/discourse/services/chat-side-panel-size.js
new file mode 100644
index 00000000000..e09e354fc67
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/services/chat-side-panel-size.js
@@ -0,0 +1,24 @@
+import Service from "@ember/service";
+import KeyValueStore from "discourse/lib/key-value-store";
+
+export default class ChatSidePanelSize extends Service {
+  STORE_NAMESPACE = "discourse_chat_side_panel_size_";
+  MIN_WIDTH = 250;
+
+  store = new KeyValueStore(this.STORE_NAMESPACE);
+
+  get width() {
+    return this.store.getObject("width") || this.MIN_WIDTH;
+  }
+
+  set width(width) {
+    this.store.setObject({
+      key: "width",
+      value: this.#min(width, this.MIN_WIDTH),
+    });
+  }
+
+  #min(number, min) {
+    return Math.max(number, min);
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-staged-thread-mapping.js b/plugins/chat/assets/javascripts/discourse/services/chat-staged-thread-mapping.js
new file mode 100644
index 00000000000..747e92e3df0
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/services/chat-staged-thread-mapping.js
@@ -0,0 +1,34 @@
+import KeyValueStore from "discourse/lib/key-value-store";
+import Service from "@ember/service";
+
+export default class ChatStagedThreadMapping extends Service {
+  STORE_NAMESPACE = "discourse_chat_";
+  KEY = "staged_thread";
+
+  store = new KeyValueStore(this.STORE_NAMESPACE);
+
+  constructor() {
+    super(...arguments);
+
+    if (!this.store.getObject(this.USER_EMOJIS_STORE_KEY)) {
+      this.storedFavorites = [];
+    }
+  }
+
+  getMapping() {
+    return JSON.parse(this.store.getObject(this.KEY) || "{}");
+  }
+
+  setMapping(id, stagedId) {
+    const mapping = {};
+    mapping[stagedId] = id;
+    this.store.setObject({
+      key: this.KEY,
+      value: JSON.stringify(mapping),
+    });
+  }
+
+  reset() {
+    this.store.setObject({ key: this.KEY, value: "{}" });
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-state-manager.js b/plugins/chat/assets/javascripts/discourse/services/chat-state-manager.js
index ee79bb20bb3..88608e1a41d 100644
--- a/plugins/chat/assets/javascripts/discourse/services/chat-state-manager.js
+++ b/plugins/chat/assets/javascripts/discourse/services/chat-state-manager.js
@@ -3,17 +3,31 @@ import { defaultHomepage } from "discourse/lib/utilities";
 import { tracked } from "@glimmer/tracking";
 import KeyValueStore from "discourse/lib/key-value-store";
 import Site from "discourse/models/site";
+import getURL from "discourse-common/lib/get-url";
 
 const PREFERRED_MODE_KEY = "preferred_mode";
 const PREFERRED_MODE_STORE_NAMESPACE = "discourse_chat_";
 const FULL_PAGE_CHAT = "FULL_PAGE_CHAT";
 const DRAWER_CHAT = "DRAWER_CHAT";
 
+let chatDrawerStateCallbacks = [];
+
+export function addChatDrawerStateCallback(callback) {
+  chatDrawerStateCallbacks.push(callback);
+}
+
+export function resetChatDrawerStateCallbacks() {
+  chatDrawerStateCallbacks = [];
+}
 export default class ChatStateManager extends Service {
   @service chat;
+  @service chatHistory;
   @service router;
-  isDrawerExpanded = false;
-  isDrawerActive = false;
+
+  @tracked isSidePanelExpanded = false;
+  @tracked isDrawerExpanded = false;
+  @tracked isDrawerActive = false;
+
   @tracked _chatURL = null;
   @tracked _appURL = null;
 
@@ -33,37 +47,49 @@ export default class ChatStateManager extends Service {
     this._store.setObject({ key: PREFERRED_MODE_KEY, value: DRAWER_CHAT });
   }
 
-  didOpenDrawer(URL = null) {
-    this.set("isDrawerActive", true);
-    this.set("isDrawerExpanded", true);
+  openSidePanel() {
+    this.isSidePanelExpanded = true;
+  }
 
-    if (URL) {
-      this.storeChatURL(URL);
+  closeSidePanel() {
+    this.isSidePanelExpanded = false;
+  }
+
+  didOpenDrawer(url = null) {
+    this.isDrawerActive = true;
+    this.isDrawerExpanded = true;
+
+    if (url) {
+      this.storeChatURL(url);
     }
 
     this.chat.updatePresence();
+    this.#publishStateChange();
   }
 
   didCloseDrawer() {
-    this.set("isDrawerActive", false);
-    this.set("isDrawerExpanded", false);
+    this.isDrawerActive = false;
+    this.isDrawerExpanded = false;
     this.chat.updatePresence();
+    this.#publishStateChange();
   }
 
   didExpandDrawer() {
-    this.set("isDrawerActive", true);
-    this.set("isDrawerExpanded", true);
+    this.isDrawerActive = true;
+    this.isDrawerExpanded = true;
     this.chat.updatePresence();
   }
 
   didCollapseDrawer() {
-    this.set("isDrawerActive", true);
-    this.set("isDrawerExpanded", false);
+    this.isDrawerActive = true;
+    this.isDrawerExpanded = false;
+    this.#publishStateChange();
   }
 
   didToggleDrawer() {
-    this.set("isDrawerExpanded", !this.isDrawerExpanded);
-    this.set("isDrawerActive", true);
+    this.isDrawerExpanded = !this.isDrawerExpanded;
+    this.isDrawerActive = true;
+    this.#publishStateChange();
   }
 
   get isFullPagePreferred() {
@@ -90,12 +116,18 @@ export default class ChatStateManager extends Service {
     return this.isFullPageActive || this.isDrawerActive;
   }
 
-  storeAppURL(URL = null) {
-    this._appURL = URL || this.router.currentURL;
+  storeAppURL(url = null) {
+    if (url) {
+      this._appURL = url;
+    } else if (this.router.currentURL?.startsWith("/chat")) {
+      this._appURL = "/";
+    } else {
+      this._appURL = this.router.currentURL;
+    }
   }
 
-  storeChatURL(URL = null) {
-    this._chatURL = URL || this.router.currentURL;
+  storeChatURL(url) {
+    this._chatURL = url;
   }
 
   get lastKnownAppURL() {
@@ -104,10 +136,19 @@ export default class ChatStateManager extends Service {
       url = this.router.urlFor(`discovery.${defaultHomepage()}`);
     }
 
-    return url;
+    return getURL(url);
   }
 
   get lastKnownChatURL() {
-    return this._chatURL || "/chat";
+    return getURL(this._chatURL || "/chat");
+  }
+
+  #publishStateChange() {
+    const state = {
+      isDrawerActive: this.isDrawerActive,
+      isDrawerExpanded: this.isDrawerExpanded,
+    };
+
+    chatDrawerStateCallbacks.forEach((callback) => callback(state));
   }
 }
diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-subscriptions-manager.js b/plugins/chat/assets/javascripts/discourse/services/chat-subscriptions-manager.js
index 4b58c3153b9..ea3531f47b5 100644
--- a/plugins/chat/assets/javascripts/discourse/services/chat-subscriptions-manager.js
+++ b/plugins/chat/assets/javascripts/discourse/services/chat-subscriptions-manager.js
@@ -1,12 +1,18 @@
 import Service, { inject as service } from "@ember/service";
+import I18n from "I18n";
 import { bind } from "discourse-common/utils/decorators";
 import { CHANNEL_STATUSES } from "discourse/plugins/chat/discourse/models/chat-channel";
+import ChatChannelArchive from "../models/chat-channel-archive";
 
 export default class ChatSubscriptionsManager extends Service {
   @service store;
   @service chatChannelsManager;
+  @service chatTrackingStateManager;
   @service currentUser;
   @service appEvents;
+  @service chat;
+  @service dialog;
+  @service router;
 
   _channelSubscriptions = new Set();
 
@@ -22,6 +28,7 @@ export default class ChatSubscriptionsManager extends Service {
 
     if (!channel.isDirectMessageChannel) {
       this._startChannelMentionsSubscription(channel);
+      this._startKickFromChannelSubscription(channel);
     }
 
     this._startChannelNewMessagesSubscription(channel);
@@ -37,6 +44,10 @@ export default class ChatSubscriptionsManager extends Service {
         `/chat/${channel.id}/new-mentions`,
         this._onNewMentions
       );
+      this.messageBus.unsubscribe(
+        `/chat/${channel.id}/kick`,
+        this._onKickFromChannel
+      );
     }
 
     this._channelSubscriptions.delete(channel.id);
@@ -93,6 +104,14 @@ export default class ChatSubscriptionsManager extends Service {
     );
   }
 
+  _startKickFromChannelSubscription(channel) {
+    this.messageBus.subscribe(
+      `/chat/${channel.id}/kick`,
+      this._onKickFromChannel,
+      channel.meta.message_bus_last_ids.kick
+    );
+  }
+
   @bind
   _onChannelArchiveStatusUpdate(busData) {
     // we don't want to fetch a channel we don't have locally because archive status changed
@@ -103,13 +122,7 @@ export default class ChatSubscriptionsManager extends Service {
           return;
         }
 
-        channel.setProperties({
-          archive_failed: busData.archive_failed,
-          archive_completed: busData.archive_completed,
-          archived_messages: busData.archived_messages,
-          archive_topic_id: busData.archive_topic_id,
-          total_messages: busData.total_messages,
-        });
+        channel.archive = ChatChannelArchive.create(busData);
       });
   }
 
@@ -117,8 +130,36 @@ export default class ChatSubscriptionsManager extends Service {
   _onNewMentions(busData) {
     this.chatChannelsManager.find(busData.channel_id).then((channel) => {
       const membership = channel.currentUserMembership;
-      if (busData.message_id > membership?.last_read_message_id) {
-        membership.unread_mentions = (membership.unread_mentions || 0) + 1;
+      if (busData.message_id > membership?.lastReadMessageId) {
+        channel.tracking.mentionCount++;
+      }
+    });
+  }
+
+  @bind
+  _onKickFromChannel(busData) {
+    this.chatChannelsManager.find(busData.channel_id).then((channel) => {
+      if (this.chat.activeChannel.id === channel.id) {
+        this.dialog.alert({
+          message: I18n.t("chat.kicked_from_channel"),
+          didConfirm: () => {
+            this.chatChannelsManager.remove(channel);
+
+            const firstChannel =
+              this.chatChannelsManager.publicMessageChannels[0];
+
+            if (firstChannel) {
+              this.router.transitionTo(
+                "chat.channel",
+                ...firstChannel.routeModels
+              );
+            } else {
+              this.router.transitionTo("chat.browse");
+            }
+          },
+        });
+      } else {
+        this.chatChannelsManager.remove(channel);
       }
     });
   }
@@ -133,31 +174,114 @@ export default class ChatSubscriptionsManager extends Service {
 
   @bind
   _onNewMessages(busData) {
+    switch (busData.type) {
+      case "channel":
+        this._onNewChannelMessage(busData);
+        break;
+      case "thread":
+        this._onNewThreadMessage(busData);
+        break;
+    }
+  }
+
+  _onNewChannelMessage(busData) {
     this.chatChannelsManager.find(busData.channel_id).then((channel) => {
-      if (busData.user_id === this.currentUser.id) {
+      channel.lastMessage = busData.message;
+      const user = busData.message.user;
+      if (user.id === this.currentUser.id) {
         // User sent message, update tracking state to no unread
-        channel.currentUserMembership.last_read_message_id = busData.message_id;
+        channel.currentUserMembership.lastReadMessageId =
+          channel.lastMessage.id;
       } else {
         // Ignored user sent message, update tracking state to no unread
-        if (this.currentUser.ignored_users.includes(busData.username)) {
-          channel.currentUserMembership.last_read_message_id =
-            busData.message_id;
+        if (this.currentUser.ignored_users.includes(user.username)) {
+          channel.currentUserMembership.lastReadMessageId =
+            channel.lastMessage.id;
         } else {
-          // Message from other user. Increment trackings state
           if (
-            busData.message_id >
-            (channel.currentUserMembership.last_read_message_id || 0)
+            channel.lastMessage.id >
+            (channel.currentUserMembership.lastReadMessageId || 0)
           ) {
-            channel.currentUserMembership.unread_count =
-              channel.currentUserMembership.unread_count + 1;
+            channel.tracking.unreadCount++;
+          }
+
+          // Thread should be considered unread if not already.
+          if (busData.thread_id && channel.threadingEnabled) {
+            channel.threadsManager
+              .find(channel.id, busData.thread_id)
+              .then((thread) => {
+                if (thread.currentUserMembership) {
+                  channel.threadsManager.markThreadUnread(
+                    busData.thread_id,
+                    busData.message.created_at
+                  );
+                  this._updateActiveLastViewedAt(channel);
+                }
+              });
           }
         }
       }
-
-      channel.set("last_message_sent_at", new Date());
     });
   }
 
+  _onNewThreadMessage(busData) {
+    this.chatChannelsManager.find(busData.channel_id).then((channel) => {
+      if (!channel.threadingEnabled) {
+        return;
+      }
+
+      channel.threadsManager
+        .find(busData.channel_id, busData.thread_id)
+        .then((thread) => {
+          if (busData.message.user.id === this.currentUser.id) {
+            // Thread should no longer be considered unread.
+            if (thread.currentUserMembership) {
+              channel.threadsManager.unreadThreadOverview.delete(
+                parseInt(busData.thread_id, 10)
+              );
+              thread.currentUserMembership.lastReadMessageId =
+                busData.message.id;
+            }
+          } else {
+            // Ignored user sent message, update tracking state to no unread
+            if (
+              this.currentUser.ignored_users.includes(
+                busData.message.user.username
+              )
+            ) {
+              if (thread.currentUserMembership) {
+                thread.currentUserMembership.lastReadMessageId =
+                  busData.message.id;
+              }
+            } else {
+              // Message from other user. Increment unread for thread tracking state.
+              if (
+                thread.currentUserMembership &&
+                busData.message.id >
+                  (thread.currentUserMembership.lastReadMessageId || 0) &&
+                !thread.currentUserMembership.isQuiet
+              ) {
+                channel.threadsManager.markThreadUnread(
+                  busData.thread_id,
+                  busData.message.created_at
+                );
+                thread.tracking.unreadCount++;
+                this._updateActiveLastViewedAt(channel);
+              }
+            }
+          }
+        });
+    });
+  }
+
+  // If the user is currently looking at this channel via activeChannel, we don't want the unread
+  // indicator to show in the sidebar for unread threads (since that is based on the lastViewedAt).
+  _updateActiveLastViewedAt(channel) {
+    if (this.chat.activeChannel?.id === channel.id) {
+      channel.updateLastViewedAt();
+    }
+  }
+
   _startUserTrackingStateSubscription(lastId) {
     if (!this.currentUser) {
       return;
@@ -168,6 +292,11 @@ export default class ChatSubscriptionsManager extends Service {
       this._onUserTrackingStateUpdate,
       lastId
     );
+    this.messageBus.subscribe(
+      `/chat/bulk-user-tracking-state/${this.currentUser.id}`,
+      this._onBulkUserTrackingStateUpdate,
+      lastId
+    );
   }
 
   _stopUserTrackingStateSubscription() {
@@ -179,19 +308,64 @@ export default class ChatSubscriptionsManager extends Service {
       `/chat/user-tracking-state/${this.currentUser.id}`,
       this._onUserTrackingStateUpdate
     );
+
+    this.messageBus.unsubscribe(
+      `/chat/bulk-user-tracking-state/${this.currentUser.id}`,
+      this._onBulkUserTrackingStateUpdate
+    );
+  }
+
+  @bind
+  _onBulkUserTrackingStateUpdate(busData) {
+    Object.keys(busData).forEach((channelId) => {
+      this._updateChannelTrackingData(channelId, busData[channelId]);
+    });
   }
 
   @bind
   _onUserTrackingStateUpdate(busData) {
-    this.chatChannelsManager.find(busData.chat_channel_id).then((channel) => {
+    this._updateChannelTrackingData(busData.channel_id, busData);
+  }
+
+  @bind
+  _updateChannelTrackingData(channelId, busData) {
+    this.chatChannelsManager.find(channelId).then((channel) => {
+      if (!busData.thread_id) {
+        channel.currentUserMembership.lastReadMessageId =
+          busData.last_read_message_id;
+      }
+
+      channel.tracking.unreadCount = busData.unread_count;
+      channel.tracking.mentionCount = busData.mention_count;
+
       if (
-        channel?.currentUserMembership?.last_read_message_id <=
-        busData.chat_message_id
+        busData.hasOwnProperty("unread_thread_overview") &&
+        channel.threadingEnabled
       ) {
-        channel.currentUserMembership.last_read_message_id =
-          busData.chat_message_id;
-        channel.currentUserMembership.unread_count = 0;
-        channel.currentUserMembership.unread_mentions = 0;
+        channel.threadsManager.unreadThreadOverview =
+          busData.unread_thread_overview;
+      }
+
+      if (
+        busData.thread_id &&
+        busData.hasOwnProperty("thread_tracking") &&
+        channel.threadingEnabled
+      ) {
+        channel.threadsManager
+          .find(channelId, busData.thread_id)
+          .then((thread) => {
+            if (
+              thread.currentUserMembership &&
+              !thread.currentUserMembership.isQuiet
+            ) {
+              thread.currentUserMembership.lastReadMessageId =
+                busData.last_read_message_id;
+              thread.tracking.unreadCount =
+                busData.thread_tracking.unread_count;
+              thread.tracking.mentionCount =
+                busData.thread_tracking.mention_count;
+            }
+          });
       }
     });
   }
@@ -214,14 +388,15 @@ export default class ChatSubscriptionsManager extends Service {
   @bind
   _onNewChannelSubscription(data) {
     this.chatChannelsManager.find(data.channel.id).then((channel) => {
-      // we need to refrehs here to have correct last message ids
+      // we need to refresh here to have correct last message ids
       channel.meta = data.channel.meta;
+      channel.currentUserMembership = data.channel.current_user_membership;
 
       if (
         channel.isDirectMessageChannel &&
         !channel.currentUserMembership.following
       ) {
-        channel.currentUserMembership.unread_count = 1;
+        channel.tracking.unreadCount = 1;
       }
 
       this.chatChannelsManager.follow(channel);
@@ -269,24 +444,23 @@ export default class ChatSubscriptionsManager extends Service {
 
   @bind
   _onChannelMetadata(busData) {
-    this.chatChannelsManager.find(busData.chat_channel_id).then((channel) => {
-      if (channel) {
-        channel.setProperties({
-          memberships_count: busData.memberships_count,
-        });
-        this.appEvents.trigger("chat:refresh-channel-members");
-      }
-    });
+    this.chatChannelsManager
+      .find(busData.chat_channel_id, { fetchIfNotFound: false })
+      .then((channel) => {
+        if (channel) {
+          channel.membershipsCount = busData.memberships_count;
+          this.appEvents.trigger("chat:refresh-channel-members");
+        }
+      });
   }
 
   @bind
   _onChannelEdits(busData) {
     this.chatChannelsManager.find(busData.chat_channel_id).then((channel) => {
       if (channel) {
-        channel.setProperties({
-          title: busData.name,
-          description: busData.description,
-        });
+        channel.title = busData.name;
+        channel.description = busData.description;
+        channel.slug = busData.slug;
       }
     });
   }
@@ -294,15 +468,14 @@ export default class ChatSubscriptionsManager extends Service {
   @bind
   _onChannelStatus(busData) {
     this.chatChannelsManager.find(busData.chat_channel_id).then((channel) => {
-      channel.set("status", busData.status);
+      channel.status = busData.status;
 
       // it is not possible for the user to set their last read message id
       // if the channel has been archived, because all the messages have
       // been deleted. we don't want them seeing the blue dot anymore so
       // just completely reset the unreads
       if (busData.status === CHANNEL_STATUSES.archived) {
-        channel.currentUserMembership.unread_count = 0;
-        channel.currentUserMembership.unread_mentions = 0;
+        channel.tracking.reset();
       }
     });
   }
diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-thread-composer.js b/plugins/chat/assets/javascripts/discourse/services/chat-thread-composer.js
new file mode 100644
index 00000000000..318846adc96
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/services/chat-thread-composer.js
@@ -0,0 +1,51 @@
+import ChatMessage from "discourse/plugins/chat/discourse/models/chat-message";
+import { action } from "@ember/object";
+import Service, { inject as service } from "@ember/service";
+import { tracked } from "@glimmer/tracking";
+
+export default class ChatThreadComposer extends Service {
+  @service chat;
+
+  @tracked message;
+  @tracked textarea;
+
+  @action
+  focus(options = {}) {
+    this.textarea?.focus(options);
+  }
+
+  @action
+  blur() {
+    this.textarea?.blur();
+  }
+
+  @action
+  reset(thread) {
+    this.message = ChatMessage.createDraftMessage(thread.channel, {
+      user: this.currentUser,
+      thread,
+    });
+  }
+
+  @action
+  cancel() {
+    if (this.message.editing) {
+      this.reset(this.message.thread);
+    } else if (this.message.inReplyTo) {
+      this.message.inReplyTo = null;
+    }
+  }
+
+  @action
+  edit(message) {
+    this.chat.activeMessage = null;
+    message.editing = true;
+    this.message = message;
+    this.focus({ refreshHeight: true, ensureAtEnd: true });
+  }
+
+  @action
+  replyTo() {
+    this.chat.activeMessage = null;
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-thread-list-pane.js b/plugins/chat/assets/javascripts/discourse/services/chat-thread-list-pane.js
new file mode 100644
index 00000000000..4b42bdfd67a
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/services/chat-thread-list-pane.js
@@ -0,0 +1,24 @@
+import Service, { inject as service } from "@ember/service";
+
+export default class ChatThreadListPane extends Service {
+  @service chat;
+  @service router;
+
+  get isOpened() {
+    return this.router.currentRoute.name === "chat.channel.threads";
+  }
+
+  async close() {
+    await this.router.transitionTo(
+      "chat.channel",
+      ...this.chat.activeChannel.routeModels
+    );
+  }
+
+  async open() {
+    await this.router.transitionTo(
+      "chat.channel.threads",
+      ...this.chat.activeChannel.routeModels
+    );
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-thread-pane-subscriptions-manager.js b/plugins/chat/assets/javascripts/discourse/services/chat-thread-pane-subscriptions-manager.js
new file mode 100644
index 00000000000..1b1845eafae
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/services/chat-thread-pane-subscriptions-manager.js
@@ -0,0 +1,47 @@
+import ChatMessage from "discourse/plugins/chat/discourse/models/chat-message";
+import ChatPaneBaseSubscriptionsManager from "./chat-pane-base-subscriptions-manager";
+
+export default class ChatThreadPaneSubscriptionsManager extends ChatPaneBaseSubscriptionsManager {
+  get messageBusChannel() {
+    return `/chat/${this.model.channel.id}/thread/${this.model.id}`;
+  }
+
+  get messageBusLastId() {
+    return this.model.threadMessageBusLastId;
+  }
+
+  handleSentMessage(data) {
+    if (data.chat_message.user.id === this.currentUser.id && data.staged_id) {
+      const stagedMessage = this.handleStagedMessageInternal(
+        this.model.channel,
+        data
+      );
+      if (stagedMessage) {
+        return;
+      }
+    }
+
+    const message = ChatMessage.create(this.model.channel, data.chat_message);
+    message.thread = this.model;
+    message.manager = this.messagesManager;
+    this.messagesManager.addMessages([message]);
+  }
+
+  // NOTE: noop, there is nothing to do when a thread original message
+  // is updated inside the thread panel (for now).
+  handleThreadOriginalMessageUpdate() {
+    return;
+  }
+
+  // NOTE: We don't yet handle notices inside of threads so do nothing.
+  handleNotice() {
+    return;
+  }
+
+  _afterDeleteMessage(targetMsg, data) {
+    if (this.model.currentUserMembership?.lastReadMessageId === targetMsg.id) {
+      this.model.currentUserMembership.lastReadMessageId =
+        data.latest_not_deleted_message_id;
+    }
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-thread-pane.js b/plugins/chat/assets/javascripts/discourse/services/chat-thread-pane.js
new file mode 100644
index 00000000000..526d3422cb3
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/services/chat-thread-pane.js
@@ -0,0 +1,30 @@
+import ChatChannelPane from "./chat-channel-pane";
+import { inject as service } from "@ember/service";
+
+export default class ChatThreadPane extends ChatChannelPane {
+  @service chat;
+  @service router;
+
+  get thread() {
+    return this.channel?.activeThread;
+  }
+
+  get isOpened() {
+    return this.router.currentRoute.name === "chat.channel.thread";
+  }
+
+  get selectedMessageIds() {
+    return this.thread.messagesManager.selectedMessages.mapBy("id");
+  }
+
+  async close() {
+    await this.router.transitionTo("chat.channel", ...this.channel.routeModels);
+  }
+
+  async open(thread) {
+    await this.router.transitionTo(
+      "chat.channel.thread",
+      ...thread.routeModels
+    );
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-tracking-state-manager.js b/plugins/chat/assets/javascripts/discourse/services/chat-tracking-state-manager.js
new file mode 100644
index 00000000000..208eac437b6
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/services/chat-tracking-state-manager.js
@@ -0,0 +1,106 @@
+import Service, { inject as service } from "@ember/service";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { cancel } from "@ember/runloop";
+import ChatTrackingState from "discourse/plugins/chat/discourse/models/chat-tracking-state";
+import { getOwner } from "discourse-common/lib/get-owner";
+
+/**
+ * This service is used to provide a global interface to tracking individual
+ * channels and threads. In many places in the app, we need to know the global
+ * unread count for channels, threads, etc.
+ *
+ * The individual tracking state of each channel and thread is stored in
+ * a ChatTrackingState class instance and changed via the getters/setters
+ * provided there.
+ *
+ * This service is also used to preload bulk tracking state for channels
+ * and threads, which is used when the user first loads the app, and in
+ * certain cases where we need to set the state for many items at once.
+ */
+export default class ChatTrackingStateManager extends Service {
+  @service chatChannelsManager;
+  @service appEvents;
+
+  // NOTE: In future, we may want to preload some thread tracking state
+  // as well, but for now we do that on demand when the user opens a channel,
+  // to avoid having to load all the threads across all channels into memory at once.
+  setupWithPreloadedState({ channel_tracking = {} }) {
+    this.chatChannelsManager.channels.forEach((channel) => {
+      if (channel_tracking[channel.id.toString()]) {
+        this.#setState(channel, channel_tracking[channel.id.toString()]);
+      }
+    });
+  }
+
+  setupChannelThreadState(channel, threadTracking) {
+    channel.threadsManager.threads.forEach((thread) => {
+      const tracking = threadTracking[thread.id.toString()];
+      if (tracking) {
+        this.#setState(thread, tracking);
+      }
+    });
+  }
+
+  get publicChannelUnreadCount() {
+    return this.#publicChannels().reduce((unreadCount, channel) => {
+      return unreadCount + channel.tracking.unreadCount;
+    }, 0);
+  }
+
+  get allChannelUrgentCount() {
+    let publicChannelMentionCount = this.#publicChannels().reduce(
+      (mentionCount, channel) => {
+        return mentionCount + channel.tracking.mentionCount;
+      },
+      0
+    );
+
+    let dmChannelUnreadCount = this.#directMessageChannels().reduce(
+      (unreadCount, channel) => {
+        return unreadCount + channel.tracking.unreadCount;
+      },
+      0
+    );
+
+    return publicChannelMentionCount + dmChannelUnreadCount;
+  }
+
+  willDestroy() {
+    super.willDestroy(...arguments);
+    cancel(this._onTriggerNotificationDebounceHandler);
+  }
+
+  /**
+   * Some reactivity in the app such as the document title
+   * updates are only done via appEvents -- rather than
+   * sprinkle this appEvent call everywhere we just define
+   * it here so it can be changed as required.
+   */
+  triggerNotificationsChanged() {
+    this._onTriggerNotificationDebounceHandler = discourseDebounce(
+      this,
+      this.#triggerNotificationsChanged,
+      100
+    );
+  }
+
+  #triggerNotificationsChanged() {
+    this.appEvents.trigger("notifications:changed");
+  }
+
+  #setState(model, state) {
+    if (!model.tracking) {
+      model.tracking = new ChatTrackingState(getOwner(this));
+    }
+    model.tracking.unreadCount = state.unread_count;
+    model.tracking.mentionCount = state.mention_count;
+  }
+
+  #publicChannels() {
+    return this.chatChannelsManager.publicMessageChannels;
+  }
+
+  #directMessageChannels() {
+    return this.chatChannelsManager.directMessageChannels;
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/services/chat.js b/plugins/chat/assets/javascripts/discourse/services/chat.js
index 931f480e438..c1ed707f8c4 100644
--- a/plugins/chat/assets/javascripts/discourse/services/chat.js
+++ b/plugins/chat/assets/javascripts/discourse/services/chat.js
@@ -1,42 +1,38 @@
-import slugifyChannel from "discourse/plugins/chat/discourse/lib/slugify-channel";
 import deprecated from "discourse-common/lib/deprecated";
-import userSearch from "discourse/lib/user-search";
+import { tracked } from "@glimmer/tracking";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import Service, { inject as service } from "@ember/service";
-import Site from "discourse/models/site";
 import { ajax } from "discourse/lib/ajax";
-import { generateCookFunction } from "discourse/lib/text";
 import { cancel, next } from "@ember/runloop";
 import { and } from "@ember/object/computed";
 import { computed } from "@ember/object";
-import { Promise } from "rsvp";
-import simpleCategoryHashMentionTransform from "discourse/plugins/chat/discourse/lib/simple-category-hash-mention-transform";
-import discourseDebounce from "discourse-common/lib/debounce";
 import discourseLater from "discourse-common/lib/later";
-import userPresent from "discourse/lib/user-presence";
-
-export const LIST_VIEW = "list_view";
-export const CHAT_VIEW = "chat_view";
-export const DRAFT_CHANNEL_VIEW = "draft_channel_view";
+import ChatMessage from "discourse/plugins/chat/discourse/models/chat-message";
+import {
+  onPresenceChange,
+  removeOnPresenceChange,
+} from "discourse/lib/user-presence";
+import { bind } from "discourse-common/utils/decorators";
 
 const CHAT_ONLINE_OPTIONS = {
   userUnseenTime: 300000, // 5 minutes seconds with no interaction
   browserHiddenTime: 300000, // Or the browser has been in the background for 5 minutes
 };
 
-const READ_INTERVAL = 1000;
-
 export default class Chat extends Service {
+  @service chatApi;
   @service appEvents;
+  @service currentUser;
   @service chatNotificationManager;
   @service chatSubscriptionsManager;
   @service chatStateManager;
+  @service chatDraftsManager;
   @service presence;
   @service router;
   @service site;
   @service chatChannelsManager;
+  @service chatTrackingStateManager;
 
-  activeChannel = null;
   cook = null;
   presenceChannel = null;
   sidebarActive = false;
@@ -44,6 +40,25 @@ export default class Chat extends Service {
 
   @and("currentUser.has_chat_enabled", "siteSettings.chat_enabled") userCanChat;
 
+  @tracked _activeMessage = null;
+  @tracked _activeChannel = null;
+
+  get activeChannel() {
+    return this._activeChannel;
+  }
+
+  set activeChannel(channel) {
+    if (!channel) {
+      this._activeMessage = null;
+    }
+
+    if (this._activeChannel) {
+      this._activeChannel.activeThread = null;
+    }
+
+    this._activeChannel = channel;
+  }
+
   @computed("currentUser.staff", "currentUser.groups.[]")
   get userCanDirectMessage() {
     if (!this.currentUser) {
@@ -60,18 +75,81 @@ export default class Chat extends Service {
     );
   }
 
+  @computed("activeChannel.userSilenced")
+  get userCanInteractWithChat() {
+    return !this.activeChannel?.userSilenced;
+  }
+
+  get activeMessage() {
+    return this._activeMessage;
+  }
+
+  set activeMessage(hash) {
+    if (hash) {
+      this._activeMessage = hash;
+    } else {
+      this._activeMessage = null;
+    }
+  }
+
   init() {
     super.init(...arguments);
 
     if (this.userCanChat) {
       this.presenceChannel = this.presence.getChannel("/chat/online");
-      this.draftStore = {};
 
-      if (this.currentUser.chat_drafts) {
-        this.currentUser.chat_drafts.forEach((draft) => {
-          this.draftStore[draft.channel_id] = JSON.parse(draft.data);
+      onPresenceChange({
+        callback: this.onPresenceChangeCallback,
+        browserHiddenTime: 150000,
+        userUnseenTime: 150000,
+      });
+    }
+  }
+
+  @bind
+  onPresenceChangeCallback(present) {
+    if (present) {
+      // NOTE: channels is more than a simple array, it also contains
+      // tracking and membership data, see Chat::StructuredChannelSerializer
+      this.chatApi.listCurrentUserChannels().then((channelsView) => {
+        this.chatSubscriptionsManager.stopChannelsSubscriptions();
+        this.chatSubscriptionsManager.startChannelsSubscriptions(
+          channelsView.meta.message_bus_last_ids
+        );
+
+        [
+          ...channelsView.public_channels,
+          ...channelsView.direct_message_channels,
+        ].forEach((channelObject) => {
+          this.chatChannelsManager
+            .find(channelObject.id, { fetchIfNotFound: false })
+            .then((channel) => {
+              if (!channel) {
+                return;
+              }
+              // TODO (martin) We need to do something here for thread tracking
+              // state as well on presence change, otherwise we will be back in
+              // the same place as the channels were.
+              //
+              // At some point it would likely be better to just fetch an
+              // endpoint that gives you all channel tracking state and the
+              // thread tracking state for the current channel.
+
+              // ensures we have the latest message bus ids
+              channel.meta.message_bus_last_ids =
+                channelObject.meta.message_bus_last_ids;
+
+              const state = channelsView.tracking.channel_tracking[channel.id];
+              channel.tracking.unreadCount = state.unread_count;
+              channel.tracking.mentionCount = state.mention_count;
+
+              channel.currentUserMembership =
+                channelObject.current_user_membership;
+
+              this.chatSubscriptionsManager.startChannelSubscription(channel);
+            });
         });
-      }
+      });
     }
   }
 
@@ -95,17 +173,43 @@ export default class Chat extends Service {
     this.set("isNetworkUnreliable", false);
   }
 
-  setupWithPreloadedChannels(channels) {
+  setupWithPreloadedChannels(channelsView) {
     this.chatSubscriptionsManager.startChannelsSubscriptions(
-      channels.meta.message_bus_last_ids
+      channelsView.meta.message_bus_last_ids
     );
-    this.presenceChannel.subscribe(channels.global_presence_channel_state);
+    this.presenceChannel.subscribe(channelsView.global_presence_channel_state);
 
-    [...channels.public_channels, ...channels.direct_message_channels].forEach(
-      (channelObject) => {
-        const channel = this.chatChannelsManager.store(channelObject);
-        return this.chatChannelsManager.follow(channel);
+    [
+      ...channelsView.public_channels,
+      ...channelsView.direct_message_channels,
+    ].forEach((channelObject) => {
+      const storedChannel = this.chatChannelsManager.store(channelObject);
+      const storedDraft = (this.currentUser?.chat_drafts || []).find(
+        (draft) => draft.channel_id === storedChannel.id
+      );
+
+      if (storedDraft) {
+        this.chatDraftsManager.add(
+          ChatMessage.createDraftMessage(
+            storedChannel,
+            Object.assign(
+              { user: this.currentUser },
+              JSON.parse(storedDraft.data)
+            )
+          )
+        );
       }
+
+      if (channelsView.unread_thread_overview?.[storedChannel.id]) {
+        storedChannel.threadsManager.unreadThreadOverview =
+          channelsView.unread_thread_overview[storedChannel.id];
+      }
+
+      return this.chatChannelsManager.follow(storedChannel);
+    });
+
+    this.chatTrackingStateManager.setupWithPreloadedState(
+      channelsView.tracking
     );
   }
 
@@ -114,46 +218,20 @@ export default class Chat extends Service {
 
     if (this.userCanChat) {
       this.chatSubscriptionsManager.stopChannelsSubscriptions();
+      removeOnPresenceChange(this.onPresenceChangeCallback);
     }
   }
 
-  setActiveChannel(channel) {
-    this.set("activeChannel", channel);
-  }
-
-  loadCookFunction(categories) {
-    if (this.cook) {
-      return Promise.resolve(this.cook);
-    }
-
-    const markdownOptions = {
-      featuresOverride: Site.currentProp(
-        "markdown_additional_options.chat.limited_pretty_text_features"
-      ),
-      markdownItRules: Site.currentProp(
-        "markdown_additional_options.chat.limited_pretty_text_markdown_rules"
-      ),
-      hashtagTypesInPriorityOrder:
-        this.site.hashtag_configurations["chat-composer"],
-      hashtagIcons: this.site.hashtag_icons,
-    };
-
-    return generateCookFunction(markdownOptions).then((cookFunction) => {
-      return this.set("cook", (raw) => {
-        return simpleCategoryHashMentionTransform(
-          cookFunction(raw),
-          categories
-        );
-      });
-    });
-  }
-
   updatePresence() {
     next(() => {
       if (this.isDestroyed || this.isDestroying) {
         return;
       }
 
+      if (this.currentUser.user_option?.hide_profile_and_presence) {
+        return;
+      }
+
       if (this.chatStateManager.isActive) {
         this.presenceChannel.enter({ activeOptions: CHAT_ONLINE_OPTIONS });
       } else {
@@ -164,7 +242,7 @@ export default class Chat extends Service {
 
   getDocumentTitleCount() {
     return this.chatNotificationManager.shouldCountChatInDocTitle()
-      ? this.chatChannelsManager.unreadUrgentCount
+      ? this.chatTrackingStateManager.allChannelUrgentCount
       : 0;
   }
 
@@ -192,7 +270,10 @@ export default class Chat extends Service {
       currentList[currentChannelIndex + (directionUp ? -1 : 1)];
     if (nextChannelInSameList) {
       // You're navigating in the same list of channels, just use index +- 1
-      return this.openChannel(nextChannelInSameList);
+      return this.router.transitionTo(
+        "chat.channel",
+        ...nextChannelInSameList.routeModels
+      );
     }
 
     // You need to go to the next list of channels, if it exists.
@@ -202,15 +283,13 @@ export default class Chat extends Service {
       : nextList[0];
 
     if (nextChannel.id !== activeChannel.id) {
-      return this.openChannel(nextChannel);
+      return this.router.transitionTo(
+        "chat.channel",
+        ...nextChannel.routeModels
+      );
     }
   }
 
-  searchPossibleDirectMessageUsers(options) {
-    // TODO: implement a chat specific user search function
-    return userSearch(options);
-  }
-
   getIdealFirstChannelId() {
     // When user opens chat we need to give them the 'best' channel when they enter.
     //
@@ -232,8 +311,12 @@ export default class Chat extends Service {
     this.chatChannelsManager.channels.forEach((channel) => {
       const membership = channel.currentUserMembership;
 
+      if (!membership.following) {
+        return;
+      }
+
       if (channel.isDirectMessageChannel) {
-        if (!dmChannelWithUnread && membership.unread_count > 0) {
+        if (!dmChannelWithUnread && channel.tracking.unreadCount > 0) {
           dmChannelWithUnread = channel.id;
         } else if (!dmChannel) {
           dmChannel = channel.id;
@@ -242,7 +325,10 @@ export default class Chat extends Service {
         if (membership.unread_mentions > 0) {
           publicChannelWithMention = channel.id;
           return; // <- We have a public channel with a mention. Break and return this.
-        } else if (!publicChannelWithUnread && membership.unread_count > 0) {
+        } else if (
+          !publicChannelWithUnread &&
+          channel.tracking.unreadCount > 0
+        ) {
           publicChannelWithUnread = channel.id;
         } else if (
           !defaultChannel &&
@@ -266,59 +352,14 @@ export default class Chat extends Service {
     );
   }
 
-  async openChannelAtMessage(channelId, messageId = null) {
-    return this.chatChannelsManager.find(channelId).then((channel) => {
-      return this._openFoundChannelAtMessage(channel, messageId);
-    });
-  }
-
-  async openChannel(channel) {
-    return this._openFoundChannelAtMessage(channel);
-  }
-
-  async _openFoundChannelAtMessage(channel, messageId = null) {
-    if (
-      this.router.currentRouteName === "chat.channel.index" &&
-      this.activeChannel?.id === channel.id
-    ) {
-      this.setActiveChannel(channel);
-      this._fireOpenMessageAppEvent(messageId);
-      return Promise.resolve();
-    }
-
-    this.setActiveChannel(channel);
-
-    if (
-      this.chatStateManager.isFullPageActive ||
-      this.site.mobileView ||
-      this.chatStateManager.isFullPagePreferred
-    ) {
-      const queryParams = messageId ? { messageId } : {};
-
-      return this.router.transitionTo(
-        "chat.channel",
-        channel.id,
-        slugifyChannel(channel),
-        { queryParams }
-      );
-    } else {
-      this._fireOpenFloatAppEvent(channel, messageId);
-      return Promise.resolve();
-    }
-  }
-
   _fireOpenFloatAppEvent(channel, messageId = null) {
     messageId
-      ? this.appEvents.trigger(
-          "chat:open-channel-at-message",
-          channel,
+      ? this.router.transitionTo(
+          "chat.channel.near-message",
+          ...channel.routeModels,
           messageId
         )
-      : this.appEvents.trigger("chat:open-channel", channel);
-  }
-
-  _fireOpenMessageAppEvent(messageId) {
-    this.appEvents.trigger("chat-live-pane:highlight-message", messageId);
+      : this.router.transitionTo("chat.channel", ...channel.routeModels);
   }
 
   async followChannel(channel) {
@@ -346,9 +387,9 @@ export default class Chat extends Service {
   // channel for. The current user will automatically be included in the channel
   // when it is created.
   upsertDmChannelForUsernames(usernames) {
-    return ajax("/chat/direct_messages/create.json", {
+    return ajax("/chat/api/direct-message-channels.json", {
       method: "POST",
-      data: { usernames: usernames.uniq() },
+      data: { target_usernames: usernames.uniq() },
     })
       .then((response) => {
         const channel = this.chatChannelsManager.store(response.channel);
@@ -367,84 +408,6 @@ export default class Chat extends Service {
     });
   }
 
-  _saveDraft(channelId, draft) {
-    const data = { chat_channel_id: channelId };
-    if (draft) {
-      data.data = JSON.stringify(draft);
-    }
-
-    ajax("/chat/drafts.json", { type: "POST", data, ignoreUnsent: false })
-      .then(() => {
-        this.markNetworkAsReliable();
-      })
-      .catch((error) => {
-        // we ignore a draft which can't be saved because it's too big
-        // and only deal with network error for now
-        if (!error.jqXHR?.responseJSON?.errors?.length) {
-          this.markNetworkAsUnreliable();
-        }
-      });
-  }
-
-  setDraftForChannel(channel, draft) {
-    if (
-      draft &&
-      (draft.value || draft.uploads.length > 0 || draft.replyToMsg)
-    ) {
-      this.draftStore[channel.id] = draft;
-    } else {
-      delete this.draftStore[channel.id];
-      draft = null; // _saveDraft will destroy draft
-    }
-
-    discourseDebounce(this, this._saveDraft, channel.id, draft, 2000);
-  }
-
-  getDraftForChannel(channelId) {
-    return (
-      this.draftStore[channelId] || {
-        value: "",
-        uploads: [],
-        replyToMsg: null,
-      }
-    );
-  }
-
-  updateLastReadMessage() {
-    discourseDebounce(this, this._queuedReadMessageUpdate, READ_INTERVAL);
-  }
-
-  _queuedReadMessageUpdate() {
-    const visibleMessages = document.querySelectorAll(
-      ".chat-message-container[data-visible=true]"
-    );
-    const channel = this.activeChannel;
-
-    if (
-      !channel?.isFollowing ||
-      visibleMessages?.length === 0 ||
-      !userPresent()
-    ) {
-      return;
-    }
-
-    const latestUnreadMsgId = parseInt(
-      visibleMessages[visibleMessages.length - 1].dataset.id,
-      10
-    );
-
-    const membership = channel.currentUserMembership;
-    const hasUnreadMessages =
-      latestUnreadMsgId > membership.last_read_message_id;
-    if (
-      hasUnreadMessages ||
-      membership.unread_count > 0 ||
-      membership.unread_mentions > 0
-    ) {
-      channel.updateLastReadMessage(latestUnreadMsgId);
-    }
-  }
-
   addToolbarButton() {
     deprecated(
       "Use the new chat API `api.registerChatComposerButton` instead of `chat.addToolbarButton`"
diff --git a/plugins/chat/assets/javascripts/discourse/templates/admin-plugins-chat.hbs b/plugins/chat/assets/javascripts/discourse/templates/admin-plugins-chat.hbs
index bbab48d73b3..521d3b889a6 100644
--- a/plugins/chat/assets/javascripts/discourse/templates/admin-plugins-chat.hbs
+++ b/plugins/chat/assets/javascripts/discourse/templates/admin-plugins-chat.hbs
@@ -1,3 +1,5 @@
+<Chat::Admin::ExportMessages />
+
 {{#if this.selectedWebhook}}
   <DButton
     @class="incoming-chat-webhooks-back"
diff --git a/plugins/chat/assets/javascripts/discourse/templates/chat-channel-index.hbs b/plugins/chat/assets/javascripts/discourse/templates/chat-channel-index.hbs
deleted file mode 100644
index d0459c0e1c4..00000000000
--- a/plugins/chat/assets/javascripts/discourse/templates/chat-channel-index.hbs
+++ /dev/null
@@ -1 +0,0 @@
-<FullPageChat />
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/templates/chat-channel-info-about.hbs b/plugins/chat/assets/javascripts/discourse/templates/chat-channel-info-about.hbs
index e7c3b8d6a47..83de81608a8 100644
--- a/plugins/chat/assets/javascripts/discourse/templates/chat-channel-info-about.hbs
+++ b/plugins/chat/assets/javascripts/discourse/templates/chat-channel-info-about.hbs
@@ -2,4 +2,4 @@
   @channel={{this.model}}
   @onEditChatChannelName={{action "onEditChatChannelName"}}
   @onEditChatChannelDescription={{action "onEditChatChannelDescription"}}
-/>
+/>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/templates/chat-channel-info.hbs b/plugins/chat/assets/javascripts/discourse/templates/chat-channel-info.hbs
index 83e6b2e8a85..e390f0a194c 100644
--- a/plugins/chat/assets/javascripts/discourse/templates/chat-channel-info.hbs
+++ b/plugins/chat/assets/javascripts/discourse/templates/chat-channel-info.hbs
@@ -13,7 +13,7 @@
         {{else}}
           <LinkTo
             @route="chat.channel"
-            @models={{array this.model.id (slugify-channel this.model)}}
+            @models={{this.model.routeModels}}
             class="chat-full-page-header__back-btn no-text btn-flat btn"
             title={{i18n "chat.channel_info.back_to_channel"}}
           >
@@ -38,7 +38,7 @@
         >
           <LinkTo
             @route={{concat "chat.channel.info." tab}}
-            @models={{array this.model.id (slugify-channel this.model)}}
+            @models={{this.model.routeModels}}
             class="chat-tabs-list__link"
           >
             <span>{{i18n (concat "chat.channel_info.tabs." tab)}}</span>
@@ -62,4 +62,4 @@
       {{outlet}}
     </div>
   </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/templates/chat-channel-thread.hbs b/plugins/chat/assets/javascripts/discourse/templates/chat-channel-thread.hbs
new file mode 100644
index 00000000000..df4708f87a0
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/templates/chat-channel-thread.hbs
@@ -0,0 +1,5 @@
+<ChatThread
+  @thread={{this.model}}
+  @targetMessageId={{this.targetMessageId}}
+  @includeHeader={{true}}
+/>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/templates/chat-channel-threads.hbs b/plugins/chat/assets/javascripts/discourse/templates/chat-channel-threads.hbs
new file mode 100644
index 00000000000..efc4083ac97
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/templates/chat-channel-threads.hbs
@@ -0,0 +1 @@
+<Chat::ThreadList @channel={{this.model}} @includeHeader={{true}} />
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/templates/chat-channel.hbs b/plugins/chat/assets/javascripts/discourse/templates/chat-channel.hbs
index e2147cab02d..6c3a15b47e7 100644
--- a/plugins/chat/assets/javascripts/discourse/templates/chat-channel.hbs
+++ b/plugins/chat/assets/javascripts/discourse/templates/chat-channel.hbs
@@ -1 +1,8 @@
-{{outlet}}
\ No newline at end of file
+<FullPageChat
+  @channel={{this.model}}
+  @targetMessageId={{this.targetMessageId}}
+/>
+
+<ChatSidePanel>
+  {{outlet}}
+</ChatSidePanel>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/templates/chat-draft-channel.hbs b/plugins/chat/assets/javascripts/discourse/templates/chat-draft-channel.hbs
index 858044e3763..8d692797dc0 100644
--- a/plugins/chat/assets/javascripts/discourse/templates/chat-draft-channel.hbs
+++ b/plugins/chat/assets/javascripts/discourse/templates/chat-draft-channel.hbs
@@ -1 +1 @@
-<ChatDraftChannelScreen @onSwitchChannel={{action "onSwitchChannel"}} />
\ No newline at end of file
+<ChatDraftChannelScreen />
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/templates/chat-index.hbs b/plugins/chat/assets/javascripts/discourse/templates/chat-index.hbs
index 0d18ba932b5..ec6c915d310 100644
--- a/plugins/chat/assets/javascripts/discourse/templates/chat-index.hbs
+++ b/plugins/chat/assets/javascripts/discourse/templates/chat-index.hbs
@@ -1 +1 @@
-<ChannelsList @onSelect={{action "selectChannel"}} />
\ No newline at end of file
+<ChannelsList />
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/templates/chat.hbs b/plugins/chat/assets/javascripts/discourse/templates/chat.hbs
index d7a30317d22..3fe25fd695d 100644
--- a/plugins/chat/assets/javascripts/discourse/templates/chat.hbs
+++ b/plugins/chat/assets/javascripts/discourse/templates/chat.hbs
@@ -17,7 +17,10 @@
       <ChannelsList />
     {{/if}}
 
-    <div id="main-chat-outlet">
+    <div
+      id="main-chat-outlet"
+      class={{concat-class "main-chat-outlet" this.mainOutletModifierClasses}}
+    >
       {{outlet}}
     </div>
   </div>
diff --git a/plugins/chat/assets/javascripts/discourse/templates/connectors/below-footer/chat-emoji-picker-connector.hbs b/plugins/chat/assets/javascripts/discourse/templates/connectors/below-footer/chat-emoji-picker-connector.hbs
deleted file mode 100644
index f49c1cb84c9..00000000000
--- a/plugins/chat/assets/javascripts/discourse/templates/connectors/below-footer/chat-emoji-picker-connector.hbs
+++ /dev/null
@@ -1,7 +0,0 @@
-{{#if
-  (and this.chatEmojiPickerManager.opened this.chatEmojiPickerManager.element)
-}}
-  {{#in-element this.chatEmojiPickerManager.element}}
-    <ChatEmojiPicker />
-  {{/in-element}}
-{{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/templates/connectors/below-footer/chat-emoji-picker-connector.js b/plugins/chat/assets/javascripts/discourse/templates/connectors/below-footer/chat-emoji-picker-connector.js
deleted file mode 100644
index 8fa5cf2f402..00000000000
--- a/plugins/chat/assets/javascripts/discourse/templates/connectors/below-footer/chat-emoji-picker-connector.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { getOwner } from "discourse-common/lib/get-owner";
-
-export default {
-  setupComponent(args, component) {
-    const container = getOwner(this);
-    const chatEmojiPickerManager = container.lookup(
-      "service:chat-emoji-picker-manager"
-    );
-
-    component.set("chatEmojiPickerManager", chatEmojiPickerManager);
-  },
-};
diff --git a/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-archive-modal.hbs b/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-archive-modal.hbs
deleted file mode 100644
index bb925b1952b..00000000000
--- a/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-archive-modal.hbs
+++ /dev/null
@@ -1,4 +0,0 @@
-<ChatChannelArchiveModalInner
-  @chatChannel={{this.chatChannel}}
-  @closeModal={{route-action "closeModal"}}
-/>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-delete-modal.hbs b/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-delete-modal.hbs
deleted file mode 100644
index 90820b131a3..00000000000
--- a/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-delete-modal.hbs
+++ /dev/null
@@ -1,4 +0,0 @@
-<ChatChannelDeleteModalInner
-  @chatChannel={{this.chatChannel}}
-  @closeModal={{action "closeModal"}}
-/>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-edit-description.hbs b/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-edit-description.hbs
deleted file mode 100644
index b988acd671e..00000000000
--- a/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-edit-description.hbs
+++ /dev/null
@@ -1,23 +0,0 @@
-<DModalBody @title="chat.channel_edit_description_modal.title">
-  <textarea
-    class="chat-channel-edit-description-modal__description-input"
-    placeholder={{i18n "chat.channel_edit_description_modal.input_placeholder"}}
-    {{on
-      "input"
-      (action "onChangeChatChannelDescription" value="target.value")
-    }}
-  >{{this.model.description}}</textarea>
-  <span class="chat-channel-edit-description-modal__description">
-    {{i18n "chat.channel_edit_description_modal.description"}}
-  </span>
-</DModalBody>
-
-<div class="modal-footer">
-  <DButton
-    @class="btn-primary create"
-    @action={{action "onSaveChatChannelDescription"}}
-    @label="save"
-    @disabled={{this.isSaveDisabled}}
-  />
-  <DModalCancel @close={{route-action "closeModal"}} />
-</div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-edit-name.hbs b/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-edit-name.hbs
deleted file mode 100644
index 00492a25217..00000000000
--- a/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-edit-name.hbs
+++ /dev/null
@@ -1,22 +0,0 @@
-<DModalBody @title="chat.channel_edit_name_modal.title">
-  <input
-    class="chat-channel-edit-name-modal__name-input"
-    placeholder={{i18n "chat.channel_edit_name_modal.input_placeholder"}}
-    {{on "input" (action "onChangeChatChannelName" value="target.value")}}
-    type="text"
-    value={{this.model.title}}
-  />
-  <span class="chat-channel-edit-name-modal__description">
-    {{i18n "chat.channel_edit_name_modal.description"}}
-  </span>
-</DModalBody>
-
-<div class="modal-footer">
-  <DButton
-    @class="btn-primary create"
-    @action={{action "onSaveChatChannelName"}}
-    @label="save"
-    @disabled={{this.isSaveDisabled}}
-  />
-  <DModalCancel @close={{route-action "closeModal"}} />
-</div>
diff --git a/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-selector-modal.hbs b/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-selector-modal.hbs
deleted file mode 100644
index 498861076c6..00000000000
--- a/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-selector-modal.hbs
+++ /dev/null
@@ -1 +0,0 @@
-<ChatChannelSelectorModalInner @close={{this.closeSelf}} />
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-toggle.hbs b/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-toggle.hbs
deleted file mode 100644
index 121e2c8f424..00000000000
--- a/plugins/chat/assets/javascripts/discourse/templates/modal/chat-channel-toggle.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-<ChatChannelToggleView
-  @channel={{this.chatChannel}}
-  @closeModal={{action "closeModal"}}
-  @onStatusChange={{action "channelStatusChanged"}}
-/>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/templates/modal/chat-message-move-to-channel-modal.hbs b/plugins/chat/assets/javascripts/discourse/templates/modal/chat-message-move-to-channel-modal.hbs
deleted file mode 100644
index 0dcc0c1114d..00000000000
--- a/plugins/chat/assets/javascripts/discourse/templates/modal/chat-message-move-to-channel-modal.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-<ChatMessageMoveToChannelModalInner
-  @sourceChannel={{this.sourceChannel}}
-  @selectedMessageIds={{this.selectedMessageIds}}
-  @closeModal={{action "closeModal"}}
-/>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/templates/modal/create-channel.hbs b/plugins/chat/assets/javascripts/discourse/templates/modal/create-channel.hbs
deleted file mode 100644
index 13b2ff45e29..00000000000
--- a/plugins/chat/assets/javascripts/discourse/templates/modal/create-channel.hbs
+++ /dev/null
@@ -1,52 +0,0 @@
-<DModalBody @title="chat.create_channel.title">
-  <label class="create-channel-label">
-    {{i18n "chat.create_channel.choose_category.label"}}
-  </label>
-  <CategoryChooser
-    @value={{this.categoryId}}
-    @onChange={{action "onCategoryChange"}}
-    @options={{hash none="chat.create_channel.choose_category.none"}}
-  />
-
-  {{#if this.categoryPermissionsHint}}
-    <div class="create-channel-hint">
-      {{this.categoryPermissionsHint}}
-    </div>
-  {{/if}}
-
-  {{#if this.autoJoinAvailable}}
-    <label class="create-channel-label">
-      <Input @type="checkbox" @checked={{this.autoJoinUsers}} />
-      <span>{{i18n "chat.settings.enable_auto_join_users"}}</span>
-    </label>
-  {{/if}}
-
-  <label for="channel-name" class="create-channel-label">
-    {{i18n "chat.create_channel.name"}}
-  </label>
-  <Input
-    name="channel-name"
-    class="create-channel-name-input"
-    @type="text"
-    @value={{this.name}}
-  />
-
-  <label for="channel-description" class="create-channel-label">
-    {{i18n "chat.create_channel.description"}}
-  </label>
-  <Input
-    name="channel-description"
-    class="create-channel-description-input"
-    @type="textarea"
-    @value={{this.description}}
-  />
-</DModalBody>
-
-<div class="modal-footer">
-  <DButton
-    @class="btn-primary create"
-    @action={{action "create"}}
-    @label="chat.create_channel.create"
-    @disabled={{this.createDisabled}}
-  />
-</div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/templates/preferences/chat.hbs b/plugins/chat/assets/javascripts/discourse/templates/preferences/chat.hbs
index a2e2d00cc37..15eb67ad181 100644
--- a/plugins/chat/assets/javascripts/discourse/templates/preferences/chat.hbs
+++ b/plugins/chat/assets/javascripts/discourse/templates/preferences/chat.hbs
@@ -1,6 +1,6 @@
 <label class="control-label">{{i18n "chat.title_capitalized"}}</label>
 
-<div class="control-group chat-setting">
+<div class="control-group chat-setting" data-setting-name="user_chat_enabled">
   <label class="controls">
     <Input
       id="user_chat_enabled"
@@ -11,7 +11,10 @@
   </label>
 </div>
 
-<div class="control-group chat-setting">
+<div
+  class="control-group chat-setting"
+  data-setting-name="user_chat_only_push_notifications"
+>
   <label class="controls">
     <Input
       id="user_chat_only_push_notifications"
@@ -25,7 +28,10 @@
   </span>
 </div>
 
-<div class="control-group chat-setting">
+<div
+  class="control-group chat-setting"
+  data-setting-name="user_chat_ignore_channel_wide_mention"
+>
   <label class="controls">
     <Input
       id="user_chat_ignore_channel_wide_mention"
@@ -39,7 +45,10 @@
   </span>
 </div>
 
-<div class="control-group chat-setting controls-dropdown">
+<div
+  class="control-group chat-setting controls-dropdown"
+  data-setting-name="user_chat_sounds"
+>
   <label for="user_chat_sounds">{{i18n "chat.sound.title"}}</label>
   <ComboBox
     @options={{hash none="chat.sounds.none"}}
@@ -51,7 +60,10 @@
   />
 </div>
 
-<div class="control-group chat-setting controls-dropdown">
+<div
+  class="control-group chat-setting controls-dropdown"
+  data-setting-name="user_chat_email_frequency"
+>
   <label for="user_chat_email_frequency">
     {{i18n "chat.email_frequency.title"}}
   </label>
@@ -69,6 +81,24 @@
   {{/if}}
 </div>
 
+<div
+  class="control-group chat-setting controls-dropdown"
+  data-setting-name="user_chat_header_indicator_preference"
+>
+  <label for="user_chat_header_indicator_preference">
+    {{i18n "chat.header_indicator_preference.title"}}
+  </label>
+  <ComboBox
+    @valueProperty="value"
+    @content={{this.headerIndicatorOptions}}
+    @value={{this.model.user_option.chat_header_indicator_preference}}
+    @id="user_chat_header_indicator_preference"
+    @onChange={{action
+      (mut this.model.user_option.chat_header_indicator_preference)
+    }}
+  />
+</div>
+
 <SaveControls
   @id="user_chat_preference_save"
   @model={{this.model}}
diff --git a/plugins/chat/assets/javascripts/discourse/widgets/chat-header-icon.js b/plugins/chat/assets/javascripts/discourse/widgets/chat-header-icon.js
index 84220e86afd..dcacd94f499 100644
--- a/plugins/chat/assets/javascripts/discourse/widgets/chat-header-icon.js
+++ b/plugins/chat/assets/javascripts/discourse/widgets/chat-header-icon.js
@@ -17,7 +17,7 @@ export default createWidget("chat-header-icon", {
       new RenderGlimmer(
         this,
         "div.widget-component-connector",
-        hbs`<ChatHeaderIcon />`
+        hbs`<Chat::Header::Icon />`
       ),
     ];
   },
diff --git a/plugins/chat/assets/javascripts/discourse/widgets/chat-invitation-notification-item.js b/plugins/chat/assets/javascripts/discourse/widgets/chat-invitation-notification-item.js
index f9367adec4a..b9498312ef9 100644
--- a/plugins/chat/assets/javascripts/discourse/widgets/chat-invitation-notification-item.js
+++ b/plugins/chat/assets/javascripts/discourse/widgets/chat-invitation-notification-item.js
@@ -38,7 +38,7 @@ createWidgetFrom(DefaultNotificationItem, "chat-invitation-notification-item", {
       title: data.chat_channel_title,
       slug: data.chat_channel_slug,
     });
-    return `/chat/channel/${data.chat_channel_id}/${slug || "-"}?messageId=${
+    return `/chat/c/${slug || "-"}/${data.chat_channel_id}/${
       data.chat_message_id
     }`;
   },
diff --git a/plugins/chat/assets/javascripts/discourse/widgets/chat-mention-notification-item.js b/plugins/chat/assets/javascripts/discourse/widgets/chat-mention-notification-item.js
index 7d194879dc2..6b64fe8ed9e 100644
--- a/plugins/chat/assets/javascripts/discourse/widgets/chat-mention-notification-item.js
+++ b/plugins/chat/assets/javascripts/discourse/widgets/chat-mention-notification-item.js
@@ -33,7 +33,7 @@ const chatNotificationItem = {
     const title = this.notificationTitle(notificationName, data);
     const text = this.text(notificationName, data);
     const html = new RawHtml({ html: `<div>${text}</div>` });
-    const contents = [iconNode("comment"), html];
+    const contents = [iconNode("d-chat"), html];
     const href = this.url(data);
 
     return h(
@@ -48,9 +48,15 @@ const chatNotificationItem = {
       title: data.chat_channel_title,
       slug: data.chat_channel_slug,
     });
-    return `/chat/channel/${data.chat_channel_id}/${slug || "-"}?messageId=${
-      data.chat_message_id
-    }`;
+
+    let notificationRoute = `/chat/c/${slug || "-"}/${data.chat_channel_id}`;
+    if (data.chat_thread_id) {
+      notificationRoute += `/t/${data.chat_thread_id}`;
+    } else {
+      notificationRoute += `/${data.chat_message_id}`;
+    }
+
+    return notificationRoute;
   },
 };
 
diff --git a/plugins/chat/assets/javascripts/lib/discourse-markdown/chat-transcript.js b/plugins/chat/assets/javascripts/lib/discourse-markdown/chat-transcript.js
index 236277a62fb..515865247e4 100644
--- a/plugins/chat/assets/javascripts/lib/discourse-markdown/chat-transcript.js
+++ b/plugins/chat/assets/javascripts/lib/discourse-markdown/chat-transcript.js
@@ -21,7 +21,7 @@ const chatTranscriptRule = {
     const channelName = tagInfo.attrs.channel;
     const channelId = tagInfo.attrs.channelId;
     const channelLink = channelId
-      ? options.getURL(`/chat/channel/${channelId}/-`)
+      ? options.getURL(`/chat/c/-/${channelId}`)
       : null;
 
     if (!username || !messageIdStart || !messageTimeStart) {
@@ -122,7 +122,7 @@ const chatTranscriptRule = {
     } else {
       let linkToken = state.push("link_open", "a", 1);
       linkToken.attrs = [
-        ["href", `${channelLink}?messageId=${messageIdStart}`],
+        ["href", `${channelLink}/${messageIdStart}`],
         ["title", messageTimeStart],
       ];
 
@@ -232,7 +232,7 @@ export function setup(helper) {
   });
 
   helper.buildCookFunction((opts, generateCookFunction) => {
-    if (!opts.discourse.additionalOptions) {
+    if (!opts.discourse.additionalOptions?.chat) {
       return;
     }
 
diff --git a/plugins/chat/assets/javascripts/select-kit/addons/components/thread-notifications-button.js b/plugins/chat/assets/javascripts/select-kit/addons/components/thread-notifications-button.js
new file mode 100644
index 00000000000..8480d2b07bc
--- /dev/null
+++ b/plugins/chat/assets/javascripts/select-kit/addons/components/thread-notifications-button.js
@@ -0,0 +1,14 @@
+import NotificationsButtonComponent from "select-kit/components/notifications-button";
+import { threadNotificationButtonLevels } from "discourse/plugins/chat/discourse/lib/chat-notification-levels";
+
+export default NotificationsButtonComponent.extend({
+  pluginApiIdentifiers: ["thread-notifications-button"],
+  classNames: ["thread-notifications-button"],
+  content: threadNotificationButtonLevels,
+
+  selectKitOptions: {
+    i18nPrefix: "chat.thread.notifications",
+    showFullTitle: false,
+    btnCustomClasses: "btn-flat",
+  },
+});
diff --git a/plugins/chat/assets/stylesheets/common/base-common.scss b/plugins/chat/assets/stylesheets/common/base-common.scss
new file mode 100644
index 00000000000..794330db303
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/common/base-common.scss
@@ -0,0 +1,388 @@
+:root {
+  --message-left-width: 42px;
+  --full-page-border-radius: 12px;
+  --full-page-sidebar-width: 275px;
+  --channel-list-avatar-size: 30px;
+  --chat-header-offset: 50px;
+}
+
+// Very specific hack to ensure the contextual menu (copy/paste/...) is
+// not completely over the textarea, the rules to position this menu are quite obscure
+// and under DiscourseHUB the space between the textarea and the keyboard is so small that
+// it sometimes prefer to appear on top of the textarea, making any gesture very complicated
+html.ios-device.keyboard-visible body #main-outlet .full-page-chat {
+  padding-bottom: 0.2rem;
+}
+
+.uppy-is-drag-over .chat-composer .drop-a-file {
+  display: flex;
+  position: absolute;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  height: 100%;
+  top: 0;
+  left: 0;
+  background-color: rgba(0, 0, 0, 0.75);
+  z-index: z("header");
+  &-content {
+    width: max-content;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 2em;
+    background-color: #1d1d1d;
+    border-radius: 0.25em;
+    &-images {
+      .d-icon {
+        height: 3em;
+        width: 3em;
+        color: var(--secondary-or-primary);
+        &:first-of-type {
+          transform: rotate(-5deg);
+        }
+        &:nth-of-type(2) {
+          height: 4em;
+          width: 4em;
+        }
+        &:last-of-type {
+          transform: rotate(5deg);
+        }
+      }
+    }
+    &-text {
+      margin: 1.5em 0 0 0;
+      font-size: var(--font-up-1);
+      color: var(--secondary-or-primary);
+      .d-icon-upload {
+        padding-right: 0.25em;
+        position: relative;
+        bottom: 2px;
+        color: var(--secondary-or-primary);
+      }
+    }
+  }
+}
+
+.header-dropdown-toggle.chat-header-icon {
+  .icon {
+    .chat-channel-unread-indicator {
+      @include chat-unread-indicator;
+      border: 2px solid var(--header_background);
+      position: absolute;
+      top: 0;
+      right: 2px;
+
+      &.-urgent {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: auto;
+        height: 1em;
+        min-width: 0.6em;
+        padding: 0.21em 0.42em;
+        top: -1px;
+        right: 0;
+      }
+    }
+  }
+
+  span.icon {
+    cursor: auto;
+
+    &:hover {
+      .d-icon {
+        color: var(--header_primary-low-mid);
+      }
+
+      background: none;
+    }
+  }
+
+  a.icon {
+    &.active {
+      .d-icon-comment {
+        color: var(--primary-medium);
+      }
+    }
+
+    &:hover {
+      .chat-channel-unread-indicator {
+        border-color: var(--primary-low);
+      }
+    }
+  }
+}
+
+.chat-messages-container {
+  word-wrap: break-word;
+  white-space: normal;
+  position: relative;
+
+  .chat-message-container {
+    display: grid;
+
+    &.-selectable {
+      grid-template-columns: 1.5em 1fr;
+    }
+
+    .chat-message-selector {
+      align-self: center;
+      justify-self: end;
+      margin: 0;
+    }
+  }
+
+  .chat-time {
+    color: var(--primary-high);
+    font-size: var(--font-down-2);
+  }
+
+  .emoji-picker {
+    position: fixed;
+  }
+
+  &:hover {
+    .chat-.chat-message-react-btn {
+      display: inline-block;
+    }
+  }
+}
+
+.chat-emoji-avatar {
+  width: var(--message-left-width);
+  align-items: center;
+
+  img {
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
+  }
+}
+
+.avatar {
+  border: 1px solid transparent;
+  padding: 0;
+  box-sizing: border-box;
+
+  .is-online & {
+    border: 1px solid var(--secondary);
+    box-shadow: 0px 0px 0px 1px var(--success);
+  }
+}
+
+.topic-title-chat-icon {
+  display: inline-block;
+  * {
+    display: inline-block;
+  }
+}
+
+body.has-sidebar-page.has-full-page-chat #main-outlet-wrapper {
+  gap: 0;
+}
+
+body.has-full-page-chat {
+  .alert-error,
+  .alert-info,
+  .alert-success,
+  .alert-warning {
+    margin: 0;
+    border-bottom: 1px solid var(--primary-low);
+  }
+}
+
+.full-page-chat {
+  display: grid;
+  grid-template-columns: var(--full-page-sidebar-width) 1fr;
+
+  .chat-full-page-header {
+    border-top: 1px solid var(--primary-low);
+    border-bottom: 1px solid var(--primary-low);
+    background: var(--secondary);
+    z-index: 3;
+    display: flex;
+    align-items: center;
+
+    &__back-btn {
+      width: 40px;
+      min-width: 40px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+
+    .chat-channel-title {
+      .category-chat-name,
+      .chat-name,
+      .dm-usernames {
+        color: var(--primary);
+        display: inline;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+    }
+
+    .-not-following {
+      .chat-channel-title {
+        max-width: calc(100% - 50px);
+      }
+      .join-channel-btn {
+        margin-left: auto;
+      }
+    }
+  }
+
+  .chat-messages-scroll {
+    box-sizing: border-box;
+    height: 100%;
+  }
+}
+
+.chat-full-page-header__left-actions {
+  display: flex;
+  align-items: stretch;
+}
+
+.chat-full-page-header__title {
+  display: flex;
+  align-items: stretch;
+}
+
+.chat-full-page-header__right-actions {
+  align-items: stretch;
+  display: flex;
+  flex-grow: 1;
+  gap: 0.5rem;
+  font-size: var(--font-up-1);
+  justify-content: flex-end;
+}
+
+.chat-full-page-header {
+  box-sizing: border-box;
+
+  .chat-channel-header-details {
+    display: flex;
+    align-items: stretch;
+    flex: 1;
+    max-width: 100%;
+
+    .chat-channel-archive-status {
+      text-align: right;
+      padding-right: 1em;
+    }
+  }
+
+  .chat-channel-title {
+    margin: 0;
+    max-width: 100%;
+
+    .d-icon:not(.d-icon-lock) {
+      height: 1.25em;
+      width: 1.25em;
+    }
+
+    .category-chat-name,
+    .dm-username {
+      font-weight: 700;
+      font-size: var(--font-up-1);
+      line-height: var(--font-up-1);
+    }
+
+    .dm-usernames {
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+  }
+  .chat-channel-retry-archive {
+    display: flex;
+    margin-top: 1em;
+  }
+}
+
+.user-preferences .chat-setting .controls {
+  margin-bottom: 0;
+}
+
+.chat-message-collapser,
+.chat-message-text {
+  > p {
+    margin: 0.5em 0 0.5em;
+  }
+
+  > p:first-of-type {
+    margin-top: 0.1em;
+  }
+
+  > p:last-of-type {
+    margin-bottom: 0.1em;
+  }
+}
+
+.reviewable-chat-message {
+  .chat-channel-title {
+    max-width: 100%;
+  }
+}
+
+.chat-channel-dm-title {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+
+  .channel-name {
+    font-weight: 700;
+    font-size: var(--font-up-1);
+    line-height: var(--font-up-1);
+  }
+}
+
+.chat-channel-status {
+  background: var(--secondary);
+  padding: 0.5rem 1rem;
+  border-bottom: 1px solid var(--primary-low);
+}
+
+html.has-full-page-chat {
+  height: 100%;
+  width: 100%;
+
+  body {
+    height: 100%;
+    width: 100%;
+
+    #main-outlet {
+      display: flex;
+      flex-direction: column;
+
+      .full-page-chat {
+        height: 100%;
+        min-height: 0;
+      }
+
+      .main-chat-outlet {
+        min-height: 0;
+        overflow: hidden;
+      }
+    }
+  }
+
+  &.mobile-view {
+    #main-outlet-wrapper {
+      padding: 0;
+    }
+  }
+
+  // these need to apply to desktop too, because iPads
+  &.discourse-touch {
+    .full-page-chat,
+    .chat-channel,
+    #main-outlet {
+      // allows containers to shrink to fit
+      min-height: 0;
+    }
+  }
+  [data-popper-reference-hidden] {
+    visibility: hidden;
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/common/chat-browse.scss b/plugins/chat/assets/stylesheets/common/chat-browse.scss
index 2d6dda91607..b7934c3af8c 100644
--- a/plugins/chat/assets/stylesheets/common/chat-browse.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-browse.scss
@@ -1,15 +1,7 @@
 .chat-browse-view {
   position: relative;
-  height: calc(100vh - var(--header-offset) - var(--chat-header-offset));
-  padding-top: 1em;
-  padding-bottom: 41px;
   box-sizing: border-box;
-  overflow-y: scroll;
-  @include chat-scrollbar(var(--secondary));
-
-  @include breakpoint(mobile-large) {
-    padding-right: 1rem; //fix for different scroll behaviour on mobile where overflow-y:scroll acts like auto
-  }
+  padding: 1rem 1rem env(safe-area-inset-bottom) 1rem;
 
   &__header {
     display: flex;
@@ -27,18 +19,14 @@
   }
 
   &__content_wrapper {
-    margin: 2rem 0 0 1rem;
     box-sizing: border-box;
-
-    @include breakpoint(tablet) {
-      margin-top: 1rem;
-    }
+    margin-top: 1rem;
   }
 
   &__cards {
     display: grid;
     grid-template-columns: repeat(2, 1fr);
-    grid-gap: 2.5rem;
+    grid-gap: 2rem;
 
     @include breakpoint(tablet) {
       grid-template-columns: repeat(1, 1fr);
@@ -50,7 +38,6 @@
     display: flex;
     justify-content: space-between;
     align-items: end;
-    margin: 0 0 0 1rem;
 
     @include breakpoint(tablet) {
       flex-direction: column;
diff --git a/plugins/chat/assets/stylesheets/common/chat-channel-card.scss b/plugins/chat/assets/stylesheets/common/chat-channel-card.scss
index d8b47c37606..fa514170381 100644
--- a/plugins/chat/assets/stylesheets/common/chat-channel-card.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-channel-card.scss
@@ -4,7 +4,7 @@
   position: relative;
   padding: 1.25rem;
   background-color: var(--primary-very-low);
-  border-radius: 5px;
+  border-radius: var(--d-border-radius);
   min-height: 0;
   min-width: 0;
   border-left: 5px solid transparent;
diff --git a/plugins/chat/assets/stylesheets/common/chat-channel-info.scss b/plugins/chat/assets/stylesheets/common/chat-channel-info.scss
index 091ea9366d8..be5dee75b81 100644
--- a/plugins/chat/assets/stylesheets/common/chat-channel-info.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-channel-info.scss
@@ -32,14 +32,22 @@
   color: var(--primary-medium);
 }
 
-.channel-settings-view__desktop-notification-level-selector,
-.channel-settings-view__mobile-notification-level-selector,
-.channel-settings-view__muted-selector,
-.channel-settings-view__auto-join-selector,
-.channel-settings-view__channel-wide-mentions-selector {
+.channel-info-about-view__slug {
+  color: var(--primary-medium);
+  font-size: var(--font-down-2);
+}
+
+.channel-settings-view__selector {
   width: 220px;
 }
 
+.channel-settings-view__channel-threading-tooltip {
+  padding-left: 0.25rem;
+  color: var(--tertiary);
+  cursor: pointer;
+}
+
+.channel-settings-view__muted-selector,
 .chat-form__btn.delete-btn {
   .d-icon {
     color: var(--danger);
@@ -96,10 +104,6 @@ input.channel-members-view__search-input {
   flex-direction: column;
   margin-top: 1em;
   box-sizing: border-box;
-  min-height: 1px;
-  overflow-y: auto;
-  height: 100%;
-  @include chat-scrollbar(var(--secondary));
 }
 
 .channel-members-view__list-item {
@@ -107,9 +111,8 @@ input.channel-members-view__search-input {
   align-items: center;
   padding: 0.5rem 0 0.5rem 1px;
 
-  &:hover {
-    background-color: var(--tertiary-very-low);
-    border-radius: 0.25rem;
+  &:not(:last-child) {
+    border-bottom: 1px solid var(--primary-low);
   }
 
   .chat-user-avatar {
@@ -117,28 +120,22 @@ input.channel-members-view__search-input {
   }
 }
 
-// Channel info edit name modal
-.chat-channel-edit-name-modal__name-input {
-  display: flex;
-  margin: 0;
-  width: 100%;
+// Channel info edit name and slug modal
+.chat-channel-edit-name-slug-modal {
+  .modal-inner-container {
+    width: 300px;
+  }
+
+  &__name-input,
+  &__slug-input {
+    display: flex;
+    margin: 0;
+    width: 100%;
+  }
 }
 
-.chat-channel-edit-name-modal__description {
+.chat-channel-edit-name-slug-modal__description {
   display: flex;
   padding: 0.5rem 0;
   color: var(--primary-medium);
 }
-
-// Channel info edit description modal
-.chat-channel-edit-description-modal__description-input {
-  display: flex;
-  margin: 0;
-  min-height: 200px;
-}
-
-.chat-channel-edit-description-modal__description {
-  display: flex;
-  padding: 0.75rem 0 0.5rem;
-  color: var(--primary-medium);
-}
diff --git a/plugins/chat/assets/stylesheets/common/chat-channel-preview-card.scss b/plugins/chat/assets/stylesheets/common/chat-channel-preview-card.scss
index 34035311c73..c91c7f39917 100644
--- a/plugins/chat/assets/stylesheets/common/chat-channel-preview-card.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-channel-preview-card.scss
@@ -5,6 +5,7 @@
   display: flex;
   flex-direction: column;
   align-items: center;
+  z-index: 3;
 
   &.-no-description {
     .chat-channel-title {
@@ -12,9 +13,17 @@
     }
   }
 
+  &.-no-button {
+    .chat-channel-preview-card__browse-all {
+      margin-top: 0;
+    }
+  }
+
   &__description {
     color: var(--primary-600);
     text-align: center;
+    overflow-wrap: break-word;
+    max-width: 100%;
   }
 
   .chat-channel-title__name {
@@ -24,7 +33,7 @@
   &__join-channel-btn {
     font-size: var(--font-up-2);
     border: 1px solid transparent;
-    border-radius: 0.25rem;
+    border-radius: var(--d-button-border-radius);
     line-height: normal;
     box-sizing: border-box;
     padding: 0.5em 0.65em;
diff --git a/plugins/chat/assets/stylesheets/common/chat-channel-selector-modal.scss b/plugins/chat/assets/stylesheets/common/chat-channel-selector-modal.scss
deleted file mode 100644
index c5935c249aa..00000000000
--- a/plugins/chat/assets/stylesheets/common/chat-channel-selector-modal.scss
+++ /dev/null
@@ -1,63 +0,0 @@
-:root {
-  --chat-channel-selector-input-height: 40px;
-}
-
-.chat-channel-selector-modal-modal.modal.in {
-  animation: none;
-}
-
-#chat-channel-selector-modal-inner {
-  width: 500px;
-  height: 350px;
-
-  .chat-channel-selector-input-container {
-    position: relative;
-
-    .search-icon {
-      position: absolute;
-      left: 10px;
-      top: 50%;
-      transform: translateY(-50%);
-      color: var(--primary-high);
-    }
-
-    #chat-channel-selector-input {
-      width: 100%;
-      height: var(--chat-channel-selector-input-height);
-      padding-left: 30px;
-      margin: 0 0 1px;
-    }
-  }
-  .channels {
-    height: calc(100% - var(--chat-channel-selector-input-height));
-    overflow: auto;
-
-    .no-channels-notice {
-      padding: 0.5em;
-    }
-
-    .chat-channel-selection-row {
-      display: flex;
-      align-items: center;
-      height: 2.5em;
-      padding-left: 0.5em;
-
-      &.focused {
-        background: var(--primary-low);
-      }
-      .username {
-        margin-left: 0.5em;
-      }
-      .chat-channel-title {
-        color: var(--primary-high);
-      }
-
-      .chat-channel-unread-indicator {
-        border: none;
-        margin-left: 0.5em;
-        height: 12px;
-        width: 12px;
-      }
-    }
-  }
-}
diff --git a/plugins/chat/assets/stylesheets/common/chat-channel-title.scss b/plugins/chat/assets/stylesheets/common/chat-channel-title.scss
index 38968f36c11..a1c21cf4a70 100644
--- a/plugins/chat/assets/stylesheets/common/chat-channel-title.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-channel-title.scss
@@ -1,6 +1,8 @@
+//appears in: header of chat pane, channel info, preview card
 .chat-channel-title-wrapper {
   display: flex;
   align-items: center;
+  overflow: hidden;
 }
 
 .chat-channel-title {
@@ -8,10 +10,23 @@
   align-items: center;
   @include ellipsis;
 
+  .chat-channel-preview-card & {
+    max-width: 100%;
+  }
+
+  &__user-info {
+    overflow: hidden;
+  }
+
   .user-status-message {
     display: none; // we only show when in channels list
   }
 
+  &__user-status-message {
+    flex-shrink: 3;
+    overflow: hidden;
+  }
+
   .chat-name,
   .category-chat-name,
   &__usernames,
diff --git a/plugins/chat/assets/stylesheets/common/chat-channel.scss b/plugins/chat/assets/stylesheets/common/chat-channel.scss
new file mode 100644
index 00000000000..7a80405824b
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/common/chat-channel.scss
@@ -0,0 +1,39 @@
+.chat-channel {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  min-height: 1px;
+  position: relative;
+  overflow: hidden;
+  grid-area: main;
+  min-width: 250px;
+  @include chat-height;
+
+  .chat-messages-scroll {
+    flex-grow: 1;
+    overflow-y: scroll;
+    overscroll-behavior: contain;
+    display: flex;
+    flex-direction: column-reverse;
+    z-index: 1;
+    margin: 0 1px 0 0;
+    will-change: transform;
+    @include chat-scrollbar();
+    min-height: 1px;
+
+    .join-channel-btn.in-float {
+      position: absolute;
+      transform: translateX(-50%);
+      left: 50%;
+      top: 10px;
+      z-index: 10;
+    }
+
+    .all-loaded-message {
+      text-align: center;
+      color: var(--primary-medium);
+      font-size: var(--font-down-1);
+      padding: 0.5em 0.25em 0.25em;
+    }
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/common/chat-composer-button.scss b/plugins/chat/assets/stylesheets/common/chat-composer-button.scss
new file mode 100644
index 00000000000..512283ada9b
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/common/chat-composer-button.scss
@@ -0,0 +1,81 @@
+.chat-composer-button {
+  box-sizing: border-box;
+  width: 50px;
+  border: 0;
+  height: 50px;
+  background: none;
+
+  .is-disabled & {
+    cursor: not-allowed;
+  }
+
+  &__wrapper {
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    align-self: flex-end;
+  }
+
+  .d-icon {
+    color: var(--primary-low-mid);
+
+    &:hover {
+      color: var(--primary-low-mid);
+    }
+
+    .is-focused & {
+      color: var(--primary-high);
+    }
+
+    .is-disabled & {
+      cursor: not-allowed;
+    }
+  }
+
+  &.-send {
+    will-change: scale;
+
+    @keyframes sendingScales {
+      0% {
+        transform: scale(0.9);
+      }
+      50% {
+        transform: scale(1.2);
+      }
+      100% {
+        transform: scale(0.9);
+      }
+    }
+
+    .is-send-disabled & {
+      cursor: default;
+    }
+
+    .chat-composer.is-sending & {
+      animation: sendingScales 1s infinite linear;
+    }
+
+    .d-icon {
+      .is-send-enabled.is-focused & {
+        color: var(--tertiary);
+      }
+    }
+
+    &:hover {
+      .d-icon {
+        .is-send-enabled & {
+          transform: scale(1.2);
+        }
+      }
+    }
+  }
+
+  &.-emoji {
+    .d-icon {
+      .is-focused & {
+        color: var(--tertiary);
+      }
+    }
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/common/chat-composer-dropdown.scss b/plugins/chat/assets/stylesheets/common/chat-composer-dropdown.scss
index 870202a1e2f..a3c08c7839d 100644
--- a/plugins/chat/assets/stylesheets/common/chat-composer-dropdown.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-composer-dropdown.scss
@@ -1,4 +1,4 @@
-.chat-composer-dropdown {
+[data-theme="chat-composer-dropdown"] {
   margin-left: 0.2rem;
 
   .tippy-content {
@@ -6,44 +6,38 @@
   }
 }
 
+.chat-composer.is-disabled {
+  .no-touch & {
+    .chat-composer-dropdown__trigger-btn:hover {
+      cursor: default;
+      .d-icon {
+        color: var(--primary-low-mid);
+      }
+    }
+  }
+}
+
 .chat-composer-dropdown__trigger-btn {
-  padding: 5px;
-  border-radius: 100%;
-  background: var(--primary-med-or-secondary-high);
-  border: 1px solid transparent;
-  display: flex;
-
   .d-icon {
-    color: var(--secondary-very-high);
+    padding: 5px;
+    transition: transform 0.1s ease-in-out;
+    background: var(--secondary-very-high);
+    border-radius: 100%;
   }
 
-  &:focus {
-    border-color: var(--tertiary);
-  }
-
-  .discourse-no-touch &:hover {
-    background: var(--primary-high);
+  &.has-active-panel {
     .d-icon {
-      color: var(--primary-low);
+      transform: rotate(45deg);
     }
   }
 }
 
 .chat-composer-dropdown__list {
-  padding: 0;
   margin: 0;
   list-style: none;
   padding: 0.5rem;
 }
 
-.chat-composer-dropdown__item {
-  padding-bottom: 0.25rem;
-
-  &:last-child {
-    padding-bottom: 0;
-  }
-}
-
 .chat-composer-dropdown__action-btn {
   background: none;
   width: 100%;
diff --git a/plugins/chat/assets/stylesheets/common/chat-composer-inline-button.scss b/plugins/chat/assets/stylesheets/common/chat-composer-inline-button.scss
deleted file mode 100644
index e1b019a3154..00000000000
--- a/plugins/chat/assets/stylesheets/common/chat-composer-inline-button.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-.chat-composer-inline-button {
-  border-radius: 6px;
-  width: 32px;
-  height: 32px;
-
-  & + .chat-composer-inline-button {
-    margin-left: 0.25rem;
-  }
-}
diff --git a/plugins/chat/assets/stylesheets/common/chat-composer-separator.scss b/plugins/chat/assets/stylesheets/common/chat-composer-separator.scss
new file mode 100644
index 00000000000..657e01aef32
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/common/chat-composer-separator.scss
@@ -0,0 +1,8 @@
+.chat-composer-separator {
+  width: 1px;
+  margin: 10px 0.25rem;
+  box-sizing: border-box;
+  background: var(--primary-low-mid);
+  height: 30px;
+  display: flex;
+}
diff --git a/plugins/chat/assets/stylesheets/common/chat-composer-upload.scss b/plugins/chat/assets/stylesheets/common/chat-composer-upload.scss
index 5d4b36303d2..ed2f9beca2a 100644
--- a/plugins/chat/assets/stylesheets/common/chat-composer-upload.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-composer-upload.scss
@@ -1,30 +1,62 @@
 .chat-composer-upload {
   display: inline-flex;
-  height: 50px;
+  height: 64px;
   padding: 0.5rem;
   border: 1px solid var(--primary-low-mid);
   margin-right: 0.5em;
+  position: relative;
+  border-radius: var(--d-border-radius);
+  box-sizing: border-box;
+
+  &--image:not(.chat-composer-upload--in-progress) {
+    padding: 0;
+
+    .preview-img {
+      height: 62px;
+      width: 62px;
+      box-sizing: border-box;
+    }
+  }
 
   &:last-child {
     margin-right: 0;
   }
 
+  &:hover {
+    .chat-composer-upload__remove-btn {
+      visibility: visible;
+      background: rgba(var(--always-black-rgb), 0.9);
+      padding: 5px;
+      border-radius: 100%;
+      font-size: var(--font-down-2);
+    }
+  }
+
+  &__remove-btn {
+    border: 1px solid var(--primary-medium);
+    position: absolute;
+    top: -8px;
+    right: -8px;
+    visibility: hidden;
+  }
+
   .preview {
-    width: 50px;
+    width: 100%;
     height: 100%;
     display: flex;
     align-items: center;
     justify-content: center;
-    margin: 0 1em 0 0;
-    border-radius: 8px;
+    margin: 0;
 
     .d-icon {
       font-size: var(--font-up-6);
+      margin-right: 0.5rem;
     }
 
     .preview-img {
-      max-width: 100%;
-      max-height: 100%;
+      object-position: center;
+      object-fit: cover;
+      border-radius: var(--d-border-radius);
     }
   }
 
@@ -63,7 +95,7 @@
 
     .extension-pill {
       background: var(--primary-low);
-      border-radius: 5px;
+      border-radius: var(--d-border-radius);
       font-size: var(--font-down-2-rem);
       padding: 0.1em 0.4em;
     }
diff --git a/plugins/chat/assets/stylesheets/common/chat-composer-uploads.scss b/plugins/chat/assets/stylesheets/common/chat-composer-uploads.scss
index 8050774913f..81693b18010 100644
--- a/plugins/chat/assets/stylesheets/common/chat-composer-uploads.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-composer-uploads.scss
@@ -1,6 +1,8 @@
 .chat-composer-uploads {
+  max-width: 100%;
+
   .chat-composer-uploads-container {
-    padding: 0.5rem 10px;
+    padding: 0.5rem 0.25rem;
     display: flex;
     white-space: nowrap;
     overflow-x: auto;
diff --git a/plugins/chat/assets/stylesheets/common/chat-composer.scss b/plugins/chat/assets/stylesheets/common/chat-composer.scss
index 9ae341f2473..ecc6032ea04 100644
--- a/plugins/chat/assets/stylesheets/common/chat-composer.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-composer.scss
@@ -1,99 +1,113 @@
-.chat-composer-container {
-  display: flex;
-  flex-direction: column;
-
-  #chat-full-page-uploader,
-  #chat-widget-uploader {
-    display: none;
-  }
-
-  .drop-a-file {
-    display: none;
-  }
-}
-
 .chat-composer {
-  display: flex;
-  align-items: center;
-  background-color: var(--secondary);
-  border: 1px solid var(--primary-low-mid);
-  border-radius: 5px;
-  padding: 0.15rem 0.25rem;
-  margin-top: 0.5rem;
+  &__wrapper {
+    display: flex;
+    flex-direction: column;
+    z-index: 3;
+    background-color: var(--primary-very-low);
+    padding: 0.5rem 0 env(safe-area-inset-bottom) 0;
 
-  &.is-disabled {
-    background-color: var(--primary-low);
-    border: 1px solid var(--primary-low-mid);
+    .keyboard-visible & {
+      padding-bottom: 0;
+    }
+
+    #chat-full-page-uploader,
+    #chat-widget-uploader {
+      display: none;
+    }
+
+    .drop-a-file {
+      display: none;
+    }
+
+    .chat-replying-indicator {
+      padding-inline: 1rem;
+    }
   }
 
-  .send-btn {
-    padding: 0.4rem 0.5rem;
-    border: 1px solid transparent;
-    border-radius: 5px;
+  .chat-composer-button,
+  .chat-composer-separator {
+    align-self: flex-end;
+  }
+
+  &__outer-container {
     display: flex;
     align-items: center;
-
-    .d-icon {
-      color: var(--tertiary);
-    }
-
-    &:disabled {
-      cursor: not-allowed;
-
-      .d-icon {
-        color: var(--primary-low);
-      }
-    }
-
-    &:not(:disabled) {
-      &:hover,
-      &:focus {
-        background: var(--tertiary);
-        .d-icon {
-          color: var(--secondary);
-        }
-      }
-    }
+    box-sizing: border-box;
+    width: 100%;
+    padding-inline: 1rem;
   }
 
-  &__close-emoji-picker-btn {
-    margin-left: 0.2rem;
-    padding: 5px !important;
-    border-radius: 100%;
-    background: var(--primary-med-or-secondary-high);
-    border: 1px solid transparent;
+  &__inner-container {
     display: flex;
+    align-items: center;
+    box-sizing: border-box;
+    width: 100%;
+    flex-direction: row;
+    border: 1px solid var(--primary-low);
+    border-radius: var(--d-border-radius-large);
+    background-color: var(--secondary);
+    min-height: 50px;
+    overflow: hidden;
 
-    .d-icon {
-      color: var(--secondary-very-high);
+    .chat-composer.is-focused & {
+      border-color: var(--primary-low-mid);
+      box-shadow: 0px 0px 4px 1px rgba(0, 0, 0, 0.1);
     }
 
-    &:focus {
-      border-color: var(--tertiary);
-    }
+    .chat-composer.is-disabled & {
+      background: var(--primary-low);
 
-    .discourse-no-touch &:hover {
-      background: var(--primary-high);
-      .d-icon {
-        color: var(--primary-low);
+      &:hover {
+        cursor: not-allowed;
       }
     }
   }
 
-  .chat-composer-input {
+  &__input-container {
+    display: flex;
+    align-items: center;
+    box-sizing: border-box;
+    width: 100%;
+    align-self: stretch;
+  }
+
+  --100dvh: 100vh;
+  @supports (height: 100dvh) {
+    --100dvh: 100dvh;
+  }
+
+  &__input {
     overflow-x: hidden;
     width: 100%;
     appearance: none;
     outline: none;
     border: 0;
     resize: none;
-    max-height: 125px;
-    scrollbar-color: var(--primary-low-mid) transparent;
-    transition: scrollbar-color 0.2s ease-in-out;
+    max-height: calc(
+      (
+          var(--100dvh) - var(--header-offset, 0px) -
+            var(--chat-header-offset, 0px)
+        ) / 100 * 25
+    );
     background: none;
-    margin: 0;
-    padding: 0.25rem 0.5rem;
+    padding: 0;
+    margin: 5px 0;
     text-overflow: ellipsis;
+    cursor: inherit;
+    @include chat-scrollbar();
+
+    &[disabled] {
+      background: none;
+
+      .d-icon {
+        opacity: 0.4;
+      }
+    }
+
+    &:focus,
+    &:active {
+      outline: none;
+    }
 
     &:placeholder-shown,
     &::placeholder {
@@ -101,21 +115,6 @@
       text-overflow: ellipsis;
       white-space: nowrap;
     }
-
-    &::-webkit-scrollbar-thumb {
-      background-color: var(--primary-low-mid);
-      border-radius: 6px;
-      border: 3px solid var(--secondary);
-    }
-    &:hover {
-      scrollbar-color: var(--primary-low-mid) transparent;
-      &::-webkit-scrollbar-thumb {
-        background-color: var(--primary-low-mid);
-      }
-    }
-    &::-webkit-scrollbar {
-      width: 12px;
-    }
   }
 
   &__unreliable-network {
@@ -125,14 +124,9 @@
 }
 
 .chat-composer-message-details {
-  padding: 0.5rem 0.75rem;
-  border-top: 1px solid var(--primary-low);
+  margin: 0 1rem 0.5rem 1rem;
   display: flex;
   align-items: center;
-  @include ellipsis;
-  position: relative;
-  height: 100%;
-  max-height: calc(2em - 5px);
 
   .cancel-message-action {
     margin-left: auto;
diff --git a/plugins/chat/assets/stylesheets/common/chat-draft-channel.scss b/plugins/chat/assets/stylesheets/common/chat-draft-channel.scss
deleted file mode 100644
index 6f295468c6e..00000000000
--- a/plugins/chat/assets/stylesheets/common/chat-draft-channel.scss
+++ /dev/null
@@ -1,43 +0,0 @@
-.full-page-chat.teams-sidebar-on {
-  .chat-draft {
-    grid-template-columns: 1fr;
-  }
-}
-
-.chat-draft {
-  height: 100%;
-  min-height: 1px;
-  width: 100%;
-  display: flex;
-  flex-direction: column;
-  flex: 1;
-
-  &-header {
-    display: flex;
-    align-items: center;
-    padding: 0.75em 10px;
-    border-bottom: 1px solid var(--primary-low);
-
-    &__title {
-      display: flex;
-      align-items: center;
-      gap: 0.5em;
-      margin-bottom: 0;
-      margin-left: 0.5rem;
-      font-size: var(--font-0);
-      font-weight: normal;
-      color: var(--primary);
-      @include ellipsis;
-
-      .d-icon {
-        height: 1.5em;
-        width: 1.5em;
-        color: var(--quaternary);
-      }
-    }
-  }
-
-  .chat-composer-container {
-    padding-bottom: 0.5em;
-  }
-}
diff --git a/plugins/chat/assets/stylesheets/common/chat-drawer.scss b/plugins/chat/assets/stylesheets/common/chat-drawer.scss
index 918dcd6b8c5..f9c13429a80 100644
--- a/plugins/chat/assets/stylesheets/common/chat-drawer.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-drawer.scss
@@ -2,14 +2,40 @@ body.composer-open .chat-drawer-outlet-container {
   bottom: 11px; // prevent height of grippie from obscuring ...is typing indicator
 }
 
+.chat-drawer-resizer {
+  position: absolute;
+  top: -5px;
+  width: 15px;
+  height: 15px;
+}
+
+html:not(.rtl) {
+  .chat-drawer-resizer {
+    cursor: nwse-resize;
+    left: -5px;
+  }
+}
+
+html.rtl {
+  .chat-drawer-resizer {
+    cursor: nesw-resize;
+    right: -5px;
+  }
+}
+
 .chat-drawer-outlet-container {
-  font-family: "Lato", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
-    Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
   // higher than timeline, lower than composer, lower than user card (bump up below)
   z-index: z("usercard");
   position: fixed;
   right: var(--composer-right, 20px);
   left: 0;
+  max-height: calc(100% - var(--header-offset) - 15px);
+
+  .rtl & {
+    left: var(--composer-right, 20px);
+    right: 0;
+  }
+
   margin: 0;
   padding: 0;
   display: flex;
@@ -31,7 +57,6 @@ body.composer-open .chat-drawer-outlet-container {
   }
 
   box-sizing: border-box;
-  max-height: 90vh;
   padding-bottom: var(--composer-height, 0);
   transition: all 100ms ease-in;
   transition-property: bottom, padding-bottom;
@@ -39,44 +64,55 @@ body.composer-open .chat-drawer-outlet-container {
 
 .chat-drawer {
   align-self: flex-end;
+  width: 400px;
+  min-width: 250px !important; // important to override inline styles
+  max-width: calc(100% - var(--composer-right));
+  min-height: 300px !important; // important to override inline styles
 
   .chat-drawer-container {
     background: var(--secondary);
     border: 1px solid var(--primary-low);
     border-bottom: 0;
-    border-top-left-radius: 8px;
-    border-top-right-radius: 8px;
+    border-top-left-radius: var(--d-border-radius-large);
+    border-top-right-radius: var(--d-border-radius-large);
     box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.125);
     box-sizing: border-box;
     display: flex;
     flex-direction: column;
+    position: relative;
+    overflow: hidden;
   }
 
   &.is-expanded {
     .chat-drawer-container {
-      max-height: $float-height;
-      height: calc(85vh - var(--composer-height, 0px));
+      height: 100%;
     }
   }
 
-  .chat-live-pane {
+  &:not(.is-expanded) {
+    min-height: 0 !important;
+    height: auto !important;
+  }
+
+  .chat-channel,
+  .chat-thread,
+  .chat-thread-list {
     height: 100%;
   }
 }
 
 .chat-drawer-header__left-actions {
   display: flex;
-  height: 100%;
+  height: 2rem;
 }
 
 .chat-drawer-header__right-actions {
   display: flex;
-  height: 100%;
+  height: 2rem;
   margin-left: auto;
 }
 
 .chat-drawer-header__top-line {
-  height: 2.5rem;
   display: flex;
   align-items: center;
 }
@@ -90,25 +126,38 @@ body.composer-open .chat-drawer-outlet-container {
 .chat-drawer-header__title {
   @include ellipsis;
   display: flex;
-  flex-direction: column;
-  width: 100%;
+  width: auto;
   font-weight: 700;
-  padding: 0 0.5rem 0 1rem;
+  padding: 0 0.5rem 0 0;
   cursor: pointer;
+  height: 2rem;
+  align-items: center;
 
-  .chat-channel-title {
-    padding: 0;
+  .chat-drawer-header__top-line {
+    padding: 0.25rem;
+    width: 100%;
+  }
+}
+
+a.chat-drawer-header__title {
+  &:hover {
+    .chat-drawer-header__top-line {
+      background: var(--primary-low);
+      border-radius: var(--d-border-radius);
+    }
   }
 }
 
 .chat-drawer-header {
   box-sizing: border-box;
   border-bottom: solid 1px var(--primary-low);
-  border-radius: 8px 8px 0 0;
+  border-radius: var(--d-border-radius-large) var(--d-border-radius-large) 0 0;
   background: var(--primary-very-low);
   width: 100%;
   display: flex;
   align-items: flex-start;
+  cursor: pointer;
+  padding: 0.25rem;
 
   .btn {
     height: 100%;
@@ -118,6 +167,10 @@ body.composer-open .chat-drawer-outlet-container {
     font-weight: 700;
     width: 100%;
 
+    &__user-info {
+      overflow: hidden;
+    }
+
     .chat-name,
     .chat-drawer-name,
     .category-chat-name,
@@ -144,7 +197,7 @@ body.composer-open .chat-drawer-outlet-container {
       text-overflow: ellipsis;
     }
 
-    .d-icon:not(.d-icon-hashtag) {
+    .d-icon:not(.d-icon-d-chat) {
       color: var(--primary-high);
     }
     .category-hashtag {
@@ -153,19 +206,24 @@ body.composer-open .chat-drawer-outlet-container {
   }
 
   &__close-btn,
-  &__return-to-channels-btn,
+  &__back-btn,
   &__full-screen-btn,
+  &__thread-list-btn,
   &__expand-btn {
-    max-height: 2.5rem;
-    height: 100%;
-    min-width: 40px;
-    width: 40px;
+    height: 30px;
+    width: 30px;
     display: flex;
     justify-content: center;
     align-items: center;
+    border-radius: 100%;
+
+    &:hover:active {
+      background: var(--primary-low);
+    }
 
     .d-icon {
       color: var(--primary-low-mid);
+      margin-right: 0;
     }
 
     &:visited {
@@ -180,16 +238,20 @@ body.composer-open .chat-drawer-outlet-container {
 
       .d-icon {
         background: none;
-        color: var(--primary-low-mid);
+        color: var(--primary);
       }
     }
 
     &:hover {
       .d-icon {
-        color: var(--primary-high);
+        color: var(--primary);
       }
     }
   }
+
+  &__thread-list-btn.has-unreads {
+    margin-right: 0.5rem;
+  }
 }
 
 .chat-drawer-content {
@@ -197,4 +259,5 @@ body.composer-open .chat-drawer-outlet-container {
   height: 100%;
   min-height: 1px;
   padding-bottom: 0.25em;
+  position: relative;
 }
diff --git a/plugins/chat/assets/stylesheets/common/chat-emoji-picker.scss b/plugins/chat/assets/stylesheets/common/chat-emoji-picker.scss
index bc61941f3a4..9c51a474b45 100644
--- a/plugins/chat/assets/stylesheets/common/chat-emoji-picker.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-emoji-picker.scss
@@ -17,7 +17,7 @@
     &:hover,
     &:focus {
       background: var(--primary-very-low);
-      border-radius: 5px;
+      border-radius: var(--d-border-radius);
       transform: scale(1.25);
     }
   }
@@ -54,9 +54,11 @@
     height: 100%;
     overflow-y: scroll;
     text-transform: capitalize;
+    @include chat-scrollbar();
+    margin: 1px;
   }
 
-  &__no-reults {
+  &__no-results {
     padding: 1em;
   }
 
@@ -98,7 +100,8 @@
     }
   }
 
-  &__section-emojis {
+  &__section-emojis,
+  &__section.filtered {
     padding: 0.5rem;
   }
 
@@ -136,7 +139,7 @@
     background: none;
     margin-right: 0.5rem;
     border: 0;
-    border-radius: 5px;
+    border-radius: var(--d-border-radius);
 
     .d-icon {
       visibility: hidden;
@@ -164,18 +167,23 @@
     &.t1 {
       background: #ffcc4d;
     }
+
     &.t2 {
       background: #f7dece;
     }
+
     &.t3 {
       background: #f3d2a2;
     }
+
     &.t4 {
       background: #d5ab88;
     }
+
     &.t5 {
       background: #af7e57;
     }
+
     &.t6 {
       background: #7c533e;
     }
@@ -191,12 +199,13 @@
   }
 }
 
-.chat-message-emoji-picker-anchor {
-  z-index: z("header") + 1;
+.chat-channel-message-emoji-picker-connector {
+  position: relative;
 
   .chat-emoji-picker {
     border: 1px solid var(--primary-low);
     width: 320px;
+    z-index: z("header") + 1;
 
     .emoji {
       width: 22px;
@@ -204,31 +213,3 @@
     }
   }
 }
-
-.mobile-view {
-  .chat-message-emoji-picker-anchor.-opened {
-    position: fixed;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    box-shadow: shadowcreatePopper("card");
-
-    .chat-emoji-picker {
-      height: 50vh;
-      width: 100%;
-    }
-  }
-}
-
-.chat-composer-container.with-emoji-picker {
-  background: var(--primary-very-low);
-
-  .chat-emoji-picker {
-    border-bottom: 1px solid var(--primary-low);
-
-    &.closing {
-      height: 0;
-    }
-  }
-}
diff --git a/plugins/chat/assets/stylesheets/common/chat-height-mixin.scss b/plugins/chat/assets/stylesheets/common/chat-height-mixin.scss
new file mode 100644
index 00000000000..fc0ddb5574f
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/common/chat-height-mixin.scss
@@ -0,0 +1,20 @@
+@mixin chat-height($inset: 0px) {
+  // desktop and mobile
+  height: calc(
+    var(--chat-vh, 1vh) * 100 - var(--header-offset, 0px) -
+      var(--composer-height, 0px)
+  );
+
+  // mobile with keyboard opened
+  .keyboard-visible & {
+    height: calc(var(--chat-vh, 1vh) * 100 - var(--header-offset, 0px));
+  }
+
+  // ipad
+  .footer-nav-ipad & {
+    height: calc(
+      var(--chat-vh, 1vh) * 100 - var(--header-offset, 0px) -
+        var(--composer-height, 0px)
+    );
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/common/chat-index.scss b/plugins/chat/assets/stylesheets/common/chat-index.scss
index 1bde956b15f..fbc7977bfa0 100644
--- a/plugins/chat/assets/stylesheets/common/chat-index.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-index.scss
@@ -1,9 +1,38 @@
+.btn-floating.open-new-message-btn {
+  position: fixed;
+  background: var(--tertiary);
+  bottom: 2rem;
+  right: 2rem;
+  border-radius: 50%;
+  font-size: var(--font-up-4);
+  padding: 1rem;
+  transition: transform 0.25s ease, box-shadow 0.25s ease;
+  z-index: z("usercard");
+  box-shadow: 0px 5px 5px -1px rgba(0, 0, 0, 0.25);
+
+  .d-icon {
+    color: var(--primary-very-low);
+  }
+
+  &:active {
+    box-shadow: 0px 0px 5px -1px rgba(0, 0, 0, 0.25);
+    transform: scale(0.9);
+  }
+
+  &:focus {
+    @include default-focus;
+    border-color: var(--quaternary);
+    outline-color: var(--quaternary);
+  }
+}
+
 .channels-list {
   overflow-y: auto;
+  overscroll-behavior: contain;
   height: 100%;
   padding-bottom: env(safe-area-inset-bottom);
   position: relative;
-  @include chat-scrollbar(var(--secondary));
+  @include chat-scrollbar();
 
   @include breakpoint(mobile-large) {
     @include chat-scrollbar();
@@ -68,10 +97,24 @@
     position: relative;
     cursor: pointer;
     color: var(--primary-high);
-    transition: opacity 50ms ease-in;
-    opacity: 1;
+
+    @media (hover: none) {
+      &:hover,
+      &:focus {
+        background: transparent;
+      }
+
+      &:active {
+        background: var(--primary-low);
+      }
+    }
 
     @media (hover: hover) {
+      &:hover,
+      &.active {
+        background: var(--primary-very-low);
+      }
+
       &.can-leave:hover {
         .toggle-channel-membership-button.-leave {
           display: block;
@@ -87,17 +130,8 @@
       }
     }
 
-    .discourse-no-touch &:hover,
-    &.active {
-      background: var(--primary-low);
-    }
-
     &:hover,
     &.active {
-      &.active {
-        font-weight: 600;
-      }
-
       .chat-channel-title {
         &,
         .category-chat-name,
@@ -168,22 +202,18 @@
       }
 
       .chat-channel-unread-indicator {
+        @include chat-unread-indicator;
         display: flex;
         align-items: center;
         justify-content: center;
-        width: auto;
-        min-width: 14px;
-        padding: 2px;
-        font-size: var(--font-down-3);
-        border-radius: 1em;
-        background: var(--tertiary-med-or-tertiary);
+        width: 8px;
+        height: 8px;
 
-        &.urgent {
-          background: var(--success);
-        }
-
-        .number {
-          line-height: 1rem;
+        &.-urgent {
+          width: auto;
+          height: auto;
+          min-width: 0.6em;
+          padding: 0.3em 0.5em;
         }
       }
     }
diff --git a/plugins/chat/assets/stylesheets/common/chat-message-actions.scss b/plugins/chat/assets/stylesheets/common/chat-message-actions.scss
index 356cf39dfa6..e44650921d2 100644
--- a/plugins/chat/assets/stylesheets/common/chat-message-actions.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-message-actions.scss
@@ -6,20 +6,15 @@
 .chat-message-actions {
   .chat-message-reaction {
     @include chat-reaction;
-
-    &:not(.show) {
-      display: none;
-    }
   }
 }
 
 .chat-message-actions-container {
   @include unselectable;
-  position: relative;
+  z-index: z("dropdown") - 1;
 }
 
 .chat-message-actions {
-  border-radius: 0.25em;
   background-color: var(--secondary);
   display: flex;
   box-shadow: 0 0.75px 0px rgba(0, 0, 0, 0.15);
@@ -44,12 +39,17 @@
 
   .react-btn,
   .reply-btn,
+  .chat-message-thread-btn,
   .bookmark-btn {
     margin-right: -1px;
     padding: 0.5em 0;
     width: 2.5em;
     transition: background 0.2s, border-color 0.2s;
 
+    > * {
+      pointer-events: none;
+    }
+
     &:focus {
       .d-icon {
         color: var(--primary);
@@ -62,7 +62,7 @@
     }
 
     &:first-child:not(:hover) {
-      border-color: var(--primary-low);
+      border-color: var(--primary-300);
       border-right-color: transparent;
     }
 
@@ -75,18 +75,25 @@
     }
   }
 
+  &.has-no-secondary-actions {
+    .reply-btn {
+      border-right: 1px solid var(--primary-300);
+      border-top: 1px solid var(--primary-300);
+      border-bottom: 1px solid var(--primary-300);
+    }
+  }
+
   .more-buttons.dropdown-select-box {
     .select-kit-header {
       background: none;
-      border: 1px solid var(--primary-low);
+      border: 1px solid var(--primary-300);
       border-left-color: transparent;
-      border-radius: 0 0.25em 0.25em 0;
       padding: 0.5em 0;
       width: 2.5em;
       transition: background 0.2s, border-color 0.2s;
 
       &:focus {
-        border-color: var(--primary-low);
+        border-color: var(--primary-300);
         border-left-color: transparent;
 
         .select-kit-header-wrapper .d-icon {
@@ -117,8 +124,8 @@
 
     .select-kit-body {
       padding: 0.5rem;
-      box-shadow: shadow("card");
-      border: 1px solid var(--primary-low);
+      box-shadow: var(--shadow-card);
+      border: 1px solid var(--primary-300);
     }
 
     .select-kit-row {
@@ -153,9 +160,7 @@
     }
 
     &:first-child {
-      border-bottom-left-radius: 0.25em;
-      border-left-color: var(--primary-low);
-      border-top-left-radius: 0.25em;
+      border-left-color: var(--primary-300);
     }
 
     &.reacted {
diff --git a/plugins/chat/assets/stylesheets/common/chat-message-collapser.scss b/plugins/chat/assets/stylesheets/common/chat-message-collapser.scss
index c18d6aa83a9..5189621ced8 100644
--- a/plugins/chat/assets/stylesheets/common/chat-message-collapser.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-message-collapser.scss
@@ -19,8 +19,9 @@ $max_video_height: 150px;
   }
 
   .chat-video-upload {
-    height: $max_video_height;
+    max-height: $max_video_height;
     width: calc(#{$max_video_height} / 9 * 16);
+    max-width: 100%;
   }
 
   .chat-message-collapser-link-small {
diff --git a/plugins/chat/assets/stylesheets/common/chat-message-creator.scss b/plugins/chat/assets/stylesheets/common/chat-message-creator.scss
new file mode 100644
index 00000000000..c23ab6cd760
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/common/chat-message-creator.scss
@@ -0,0 +1,310 @@
+.chat-message-creator {
+  display: flex;
+  align-items: center;
+  width: 100%;
+  flex-direction: column;
+
+  --row-height: 36px;
+
+  &__search-icon {
+    color: var(--primary-medium);
+
+    &-container {
+      display: flex;
+      align-items: center;
+      height: var(--row-height);
+      padding-inline: 0.25rem;
+      box-sizing: border-box;
+    }
+  }
+
+  &__container {
+    display: flex;
+    align-items: center;
+    width: 100%;
+    box-sizing: border-box;
+
+    > * {
+      box-sizing: border-box;
+    }
+  }
+
+  &__row {
+    display: flex;
+    padding-inline: 0.25rem;
+    align-items: center;
+    border-radius: 5px;
+    height: var(--row-height);
+
+    .unread-indicator {
+      background: var(--tertiary);
+      width: 8px;
+      height: 8px;
+      display: flex;
+      border-radius: 50%;
+      margin-left: 0.5rem;
+
+      &.-urgent {
+        background: var(--success);
+      }
+    }
+
+    .selection-indicator {
+      visibility: hidden;
+
+      font-size: var(--font-down-2);
+      margin-left: auto;
+
+      &.-add {
+        color: var(--success);
+      }
+
+      &.-remove {
+        color: var(--danger);
+      }
+    }
+
+    .action-indicator {
+      display: none;
+      margin-left: auto;
+      white-space: nowrap;
+      font-size: var(--font-down-1);
+      color: var(--secondary-medium);
+      align-items: center;
+      padding-right: 0.25rem;
+
+      kbd {
+        margin-left: 0.25rem;
+      }
+    }
+
+    &.-active {
+      .action-indicator {
+        display: flex;
+      }
+    }
+
+    .chat-channel-title__name {
+      margin-left: 0;
+    }
+
+    .chat-channel-title__avatar,
+    .chat-channel-title__category-badge,
+    .chat-user-avatar {
+      width: 28px;
+      height: 28px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+
+    .chat-channel-title__name,
+    .chat-user-display-name {
+      @include ellipsis;
+      padding-left: 0.5rem;
+    }
+
+    &.-selected {
+      .selection-indicator {
+        visibility: visible;
+      }
+    }
+
+    &.-disabled {
+      opacity: 0.25;
+    }
+
+    &.-active {
+      cursor: pointer;
+
+      .chat-user-display-name {
+        color: var(--primary);
+      }
+    }
+
+    &.-user {
+      &.-disabled {
+        .chat-user-display-name__username.-first {
+          font-weight: normal;
+        }
+      }
+      .disabled-text {
+        margin-left: auto;
+        white-space: nowrap;
+        padding-left: 0.25rem;
+      }
+    }
+  }
+
+  &__content {
+    box-sizing: border-box;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    width: 100%;
+
+    &-container {
+      display: flex;
+      flex: 1;
+      width: 100%;
+      box-sizing: border-box;
+      padding: 0.25rem 1rem 1rem 1rem;
+    }
+  }
+
+  &__close-btn {
+    margin-bottom: auto;
+    margin-left: 0.25rem;
+    height: 44px;
+    width: 44px;
+    min-width: 44px;
+    border-radius: 5px;
+  }
+
+  &__selection {
+    flex: 1 1 auto;
+    flex-direction: row;
+    flex-wrap: wrap;
+    display: flex;
+    background: var(--secondary-very-high);
+    border-radius: 5px;
+    padding: 3px;
+    position: relative;
+
+    &-container {
+      display: flex;
+      box-sizing: border-box;
+      width: 100%;
+      align-items: center;
+      padding: 1rem;
+      box-sizing: border-box;
+    }
+  }
+
+  &__input[type="text"],
+  &__input[type="text"]:focus {
+    background: none;
+    appearance: none;
+    outline: none;
+    border: 0;
+    resize: none;
+    box-sizing: border-box;
+    min-width: 150px;
+    height: var(--row-height);
+    flex: 1;
+    width: auto;
+    padding: 0 5px;
+    margin: 0;
+    box-sizing: border-box;
+    display: inline-flex;
+  }
+
+  &__loader {
+    &-container {
+      display: flex;
+      align-items: center;
+      padding-inline: 0.5rem;
+      height: var(--row-height);
+    }
+  }
+
+  &__selection-item {
+    align-items: center;
+    box-sizing: border-box;
+    cursor: pointer;
+    display: inline-flex;
+    background: var(--primary-very-low);
+    border-radius: 5px;
+    border: 1px solid var(--primary-low);
+    height: calc(var(--row-height) - 6);
+    padding-inline: 0.25rem;
+    margin: 3px;
+
+    .d-icon-times {
+      margin-top: 4px;
+    }
+
+    .chat-channel-title__name {
+      padding-inline: 0.25rem;
+    }
+
+    &__username {
+      padding-inline: 0.25rem;
+    }
+
+    &.-active {
+      border-color: var(--secondary-high);
+    }
+
+    &-remove-btn {
+      padding-inline: 0.25rem;
+      font-size: var(--font-down-2);
+      display: flex;
+      align-items: center;
+    }
+
+    &:hover {
+      border-color: var(--primary-medium);
+
+      .chat-message-creator__selection__remove-btn {
+        color: var(--danger);
+      }
+    }
+  }
+
+  &__no-items {
+    &-container {
+      display: flex;
+      align-items: center;
+      height: var(--row-height);
+      margin-left: 0.5rem;
+    }
+  }
+
+  &__footer {
+    display: flex;
+    align-items: flex-end;
+    justify-content: space-between;
+    flex-direction: row;
+    width: 100%;
+
+    &-container {
+      margin-top: auto;
+      display: flex;
+      width: 100%;
+      padding: 1rem;
+      box-sizing: border-box;
+      border-top: 1px solid var(--primary-low);
+    }
+  }
+
+  &__open-dm-btn {
+    display: flex;
+    margin-left: auto;
+    @include ellipsis;
+    padding: 0.5rem;
+    max-width: 40%;
+
+    .d-button-label {
+      @include ellipsis;
+    }
+  }
+
+  &__shortcut {
+    display: flex;
+    align-items: center;
+    font-size: var(--font-down-2);
+    color: var(--secondary-medium);
+    flex: 3;
+
+    span {
+      margin-left: 0.25rem;
+      display: inline-flex;
+      line-height: 17px;
+    }
+
+    kbd {
+      margin-inline: 0.25rem;
+    }
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/common/chat-message-error.scss b/plugins/chat/assets/stylesheets/common/chat-message-error.scss
new file mode 100644
index 00000000000..71a40dc4deb
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/common/chat-message-error.scss
@@ -0,0 +1,40 @@
+.chat-message-error {
+  color: var(--danger-medium);
+
+  &__retry-btn {
+    padding: 0.5em 0;
+    background: none;
+
+    &:hover,
+    &:focus,
+    .-active & {
+      background: none !important;
+    }
+
+    &:focus .retry-staged-message-btn__action {
+      text-decoration: underline;
+    }
+
+    .d-icon,
+    &-title,
+    &:hover .d-icon {
+      color: var(--danger) !important;
+      font-size: var(--font-down-1);
+    }
+
+    .d-icon {
+      margin-right: 0.25em !important;
+    }
+
+    &-action {
+      color: var(--tertiary);
+      font-size: var(--font-down-1);
+      margin-left: 0.25em;
+
+      &:hover {
+        color: var(--tertiary-high);
+        text-decoration: underline;
+      }
+    }
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/common/chat-message-images.scss b/plugins/chat/assets/stylesheets/common/chat-message-images.scss
index 2805ed5cacc..09797aa28a5 100644
--- a/plugins/chat/assets/stylesheets/common/chat-message-images.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-message-images.scss
@@ -3,12 +3,13 @@ $max_image_height: 150px;
 .chat-message {
   // append selectors to set images to a
   // max height of $max_image_height
-  .chat-message-collapser .onebox img:not(.ytp-thumbnail-image),
-  .chat-message-collapser img.onebox,
-  .chat-message-collapser .chat-uploads img,
-  .chat-message-collapser p img,
+  .onebox img:not(.ytp-thumbnail-image, .onebox-avatar-inline),
+  img.onebox,
+  .chat-uploads img,
+  p img,
   aside.onebox .onebox-body .aspect-image-full-size,
-  aside.onebox .onebox-body .aspect-image-full-size img {
+  aside.onebox .onebox-body .aspect-image-full-size img,
+  .chat-message-text p img:not(.emoji) {
     object-fit: contain;
     max-height: $max_image_height;
     max-width: 100%;
@@ -16,12 +17,67 @@ $max_image_height: 150px;
     overflow: hidden;
   }
 
+  .onebox {
+    container-type: inline-size;
+
+    .thumbnail {
+      max-width: 40% !important;
+      &.onebox-avatar {
+        max-height: 100px;
+        width: 20%;
+        max-width: 60px;
+        margin-right: 0.5rem;
+      }
+    }
+
+    @container (width < 400px) {
+      .onebox-body {
+        &:not(:has(.thumbnail.onebox-avatar)) {
+          display: flex;
+          flex-direction: column;
+        }
+
+        h3 {
+          margin-block: 0.75rem 0;
+        }
+        p {
+          margin-top: 0.5rem;
+        }
+
+        .thumbnail {
+          max-width: 100% !important;
+          margin: 0;
+
+          &.onebox-avatar {
+            max-width: 20%;
+            margin-right: 0.5rem;
+          }
+        }
+      }
+    }
+  }
+
   .chat-message-collapser
     .chat-message-collapser-header
     + div
-    .chat-message-collapser-youtube {
+    .chat-message-collapser-lazy-video {
     object-fit: contain;
-    height: $max_image_height;
-    width: calc(#{$max_image_height} / 9 * 16);
+    max-height: $max_image_height;
+    max-width: calc(#{$max_image_height} / 9 * 16);
+  }
+
+  // Prevent overflow of old lazy-yt images
+  // TODO: remove in December 2023
+  .lazyYT.lazyYT-container {
+    border: none;
+    a {
+      display: flex;
+    }
+    .ytp-thumbnail-image {
+      object-fit: contain;
+      height: $max_image_height;
+      width: calc(#{$max_image_height} / 9 * 16);
+      pointer-events: none;
+    }
   }
 }
diff --git a/plugins/chat/assets/stylesheets/common/chat-message-info.scss b/plugins/chat/assets/stylesheets/common/chat-message-info.scss
index fb82db5baac..76968afb8dd 100644
--- a/plugins/chat/assets/stylesheets/common/chat-message-info.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-message-info.scss
@@ -25,7 +25,7 @@
   text-transform: uppercase;
   padding: 0.25em;
   background: var(--primary-low);
-  border-radius: 3px;
+  border-radius: var(--d-border-radius);
   font-size: var(--font-down-2);
 
   & + .chat-message-info__date {
diff --git a/plugins/chat/assets/stylesheets/common/chat-message-left-gutter.scss b/plugins/chat/assets/stylesheets/common/chat-message-left-gutter.scss
index 955082fe5fb..2a453f5b79e 100644
--- a/plugins/chat/assets/stylesheets/common/chat-message-left-gutter.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-message-left-gutter.scss
@@ -6,16 +6,15 @@
   width: var(--message-left-width);
 }
 
+.chat-message-container:hover .chat-message-left-gutter {
+  .chat-time {
+    color: var(--secondary-medium);
+  }
+}
+
 .chat-message-left-gutter__date {
   color: var(--primary-high);
   font-size: var(--font-down-1);
-
-  &:hover,
-  &:focus {
-    .chat-time {
-      color: var(--primary);
-    }
-  }
 }
 
 .chat-message-left-gutter__flag {
diff --git a/plugins/chat/assets/stylesheets/common/chat-message-mention-warning.scss b/plugins/chat/assets/stylesheets/common/chat-message-mention-warning.scss
new file mode 100644
index 00000000000..4d69f3c9fd1
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/common/chat-message-mention-warning.scss
@@ -0,0 +1,19 @@
+.chat-message-mention-warning {
+  position: relative;
+  margin-top: 0.25rem;
+  font-size: var(--font-down-1);
+
+  &__dismiss-btn {
+    position: absolute;
+    top: 7px;
+    right: 5px;
+  }
+
+  &__text {
+    margin: 0.25rem 0;
+  }
+
+  &__invite-sent {
+    color: var(--tertiary);
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/common/chat-message-separator.scss b/plugins/chat/assets/stylesheets/common/chat-message-separator.scss
index e918d0c850a..d9a6e2051b5 100644
--- a/plugins/chat/assets/stylesheets/common/chat-message-separator.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-message-separator.scss
@@ -1,42 +1,137 @@
 .chat-message-separator {
   @include unselectable;
-  margin: 0.25rem 0 0.25rem 1rem;
   display: flex;
-  font-size: var(--font-down-1);
-  position: relative;
-  transform: translateZ(0);
-  position: relative;
 
-  &.new-message {
-    color: var(--danger-medium);
+  &-new {
+    display: flex;
+    justify-content: center;
+    padding: 20px 0 20px var(--scrollbarWidth);
+    position: relative;
 
-    .divider {
-      background-color: var(--danger-medium);
+    .chat-message-separator__text-container {
+      text-align: center;
+      position: absolute;
+      height: 40px;
+      box-sizing: border-box;
+      z-index: 1;
+      top: 0;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+
+      .chat-message-separator__text {
+        color: var(--danger-medium);
+        background-color: var(--secondary);
+        padding: 0.25rem 0.5rem;
+        font-size: var(--font-down-1);
+      }
+    }
+
+    .chat-message-separator__line-container {
+      width: 100%;
+    }
+
+    .chat-message-separator__line {
+      border-top: 1px solid var(--danger-medium);
     }
   }
 
-  &.first-daily-message {
-    .text {
-      color: var(--secondary-low);
-      font-weight: 600;
-    }
-
-    .divider {
-      background-color: var(--secondary-high);
-    }
-  }
-
-  .text {
-    margin: 0 auto;
-    padding: 0 0.75rem;
-    z-index: 1;
-    background: var(--secondary);
-  }
-
-  .divider {
+  &-date {
+    box-sizing: border-box;
     position: absolute;
     width: 100%;
-    height: 1px;
-    top: 50%;
+    z-index: 2;
+    display: flex;
+    align-items: flex-start;
+    justify-content: center;
+    padding-left: var(--scrollbarWidth);
+    pointer-events: none;
+
+    &.with-last-visit {
+      & + .chat-message-separator__line-container {
+        .chat-message-separator__line {
+          border-color: var(--danger-medium);
+        }
+      }
+    }
+
+    .chat-message-separator__text-container {
+      align-items: center;
+      display: flex;
+      height: 40px;
+      position: sticky;
+      top: -1px;
+
+      &.is-pinned,
+      &.is-force-pinned {
+        .chat-message-separator__text {
+          border: 1px solid var(--primary-200);
+          border-radius: var(--d-border-radius);
+          color: var(--primary-800);
+          background: var(--primary-50);
+
+          &:hover {
+            border: 1px solid var(--secondary-high);
+          }
+        }
+
+        .chat-message-separator__last-visit {
+          display: none;
+        }
+      }
+    }
+
+    .chat-message-separator__last-visit {
+      display: flex;
+    }
+
+    .chat-message-separator__last-visit-separator {
+      margin: 0 0.25rem;
+    }
+
+    .chat-message-separator__text {
+      @include unselectable;
+      background-color: var(--secondary);
+      border: 1px solid transparent;
+      color: var(--secondary-low);
+      font-size: var(--font-down-1);
+      padding: 0.25rem 0.5rem;
+      box-sizing: border-box;
+      display: flex;
+      cursor: pointer;
+      pointer-events: all;
+
+      .no-touch & {
+        &:hover {
+          border: 1px solid var(--secondary-high);
+          border-radius: var(--d-border-radius);
+          color: var(--primary-800);
+          background: var(--primary-50);
+        }
+      }
+
+      .touch & {
+        &:active {
+          border: 1px solid var(--secondary-high);
+          border-radius: var(--d-border-radius);
+          color: var(--primary-800);
+          background: var(--primary-50);
+        }
+      }
+
+      &:active {
+        transform: scale(0.98);
+      }
+    }
+
+    & + .chat-message-separator__line-container {
+      padding: 20px 0 20px var(--scrollbarWidth);
+      box-sizing: border-box;
+
+      .chat-message-separator__line {
+        border-top: 1px solid var(--secondary-high);
+        margin: 0 0 -1px;
+      }
+    }
   }
 }
diff --git a/plugins/chat/assets/stylesheets/common/chat-message-thread-indicator.scss b/plugins/chat/assets/stylesheets/common/chat-message-thread-indicator.scss
new file mode 100644
index 00000000000..1513a32f801
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/common/chat-message-thread-indicator.scss
@@ -0,0 +1,91 @@
+.chat-message {
+  container-type: inline-size;
+}
+
+.chat-message-thread-indicator {
+  cursor: pointer;
+  grid-area: threadindicator;
+  box-sizing: border-box;
+  display: grid;
+  grid-template-columns: auto 1fr auto auto;
+  background-color: var(--primary-very-low);
+  margin: 4px 0 -2px calc(var(--message-left-width) - 0.25rem);
+  padding: 0.5rem;
+  border-radius: var(--d-border-radius-large);
+  color: var(--primary);
+
+  > * {
+    pointer-events: none;
+  }
+
+  &:visited,
+  &:hover {
+    color: var(--primary);
+  }
+
+  &:hover {
+    .chat-message-thread-indicator__replies-count {
+      text-decoration: underline;
+    }
+  }
+
+  .touch & {
+    &.-active {
+      box-shadow: var(--shadow-dropdown);
+    }
+  }
+
+  .no-touch & {
+    &:hover {
+      box-shadow: var(--shadow-dropdown);
+    }
+  }
+
+  &__last-reply-avatar {
+    grid-area: avatar;
+    margin-right: 0.5rem;
+
+    .chat-user-avatar {
+      width: auto !important;
+    }
+  }
+
+  &__last-reply-username {
+    @include ellipsis;
+    font-weight: bold;
+    color: var(--primary-very-high);
+  }
+
+  &__last-reply-info {
+    grid-area: info;
+    display: flex;
+    align-items: center;
+    gap: 0.25rem;
+  }
+
+  &__last-reply-timestamp {
+    color: var(--primary-high);
+    font-size: var(--font-down-3);
+  }
+
+  &__last-reply-excerpt {
+    @include ellipsis;
+    grid-area: excerpt;
+  }
+
+  .chat-thread-participants {
+    grid-area: participants;
+    flex-shrink: 0;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    gap: 0.25rem;
+  }
+
+  &__replies-count {
+    @include ellipsis;
+    color: var(--tertiary);
+    font-size: var(--font-down-1);
+    text-align: right;
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/common/chat-message.scss b/plugins/chat/assets/stylesheets/common/chat-message.scss
index 6eb92b80ff5..27195653a32 100644
--- a/plugins/chat/assets/stylesheets/common/chat-message.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-message.scss
@@ -1,5 +1,5 @@
-.chat-message-deleted,
-.chat-message-hidden {
+.chat-message-text.-deleted,
+.chat-message-text.-hidden {
   margin-left: calc(var(--message-left-width) + 0.75em);
   padding: 0;
 
@@ -7,6 +7,10 @@
     color: var(--primary-low-mid);
     padding: 0.25em;
 
+    .d-button-label {
+      text-align: left;
+    }
+
     &:hover {
       background: inherit;
       color: inherit;
@@ -14,103 +18,24 @@
   }
 }
 
-@mixin chat-reaction {
-  align-items: center;
-  display: inline-flex;
-  padding: 0.3em 0.6em;
-  margin: 1px 0.25em 1px 0;
-  font-size: var(--font-down-2);
-  border-radius: 4px;
-  border: 1px solid var(--primary-low);
-  background: transparent;
-  cursor: pointer;
-  user-select: none;
-  transition: background 0.2s, border-color 0.2s;
-
-  &.reacted {
-    border-color: var(--tertiary-medium);
-    background: var(--tertiary-very-low);
-    color: var(--tertiary-hover);
-
-    &:hover {
-      background: var(--tertiary-low);
-    }
-  }
-
-  &:not(.reacted) {
-    &:hover {
-      background: var(--primary-low);
-      border-color: var(--primary-low-mid);
-    }
-  }
-
-  .emoji {
-    height: 15px;
-    margin-right: 4px;
-    width: auto;
+.chat-message-reaction {
+  > * {
+    pointer-events: none;
   }
 }
 
 .chat-message {
   align-items: flex-start;
   padding: 0.25em 0.5em 0.25em 0.75em;
-  background-color: var(--secondary);
   display: flex;
   min-width: 0;
 
   .chat-message-reaction {
     @include chat-reaction;
+    will-change: scale;
 
-    &:not(.show) {
-      display: none;
-    }
-  }
-
-  &.chat-action {
-    background-color: var(--highlight-medium);
-  }
-
-  &.errored {
-    color: var(--primary-medium);
-  }
-
-  &.deleted {
-    background-color: var(--danger-low);
-  }
-
-  .not-mobile-device &.deleted:hover {
-    background-color: var(--danger-hover);
-  }
-
-  &.transition-slow {
-    transition: 2s linear background-color;
-  }
-
-  &.user-info-hidden {
-    .chat-time {
-      color: var(--secondary-medium);
-      flex-shrink: 0;
-      font-size: var(--font-down-2);
-      margin-top: 0.4em;
-      display: none;
-      width: var(--message-left-width);
-    }
-  }
-
-  &.is-reply {
-    display: grid;
-    grid-template-columns: var(--message-left-width) 1fr;
-    grid-template-rows: 30px auto;
-    grid-template-areas:
-      "replyto replyto"
-      "avatar message";
-
-    .chat-user-avatar {
-      grid-area: avatar;
-    }
-
-    .chat-message-content {
-      grid-area: message;
+    &:active {
+      transform: scale(0.93);
     }
   }
 
@@ -136,15 +61,12 @@
     .mention.highlighted {
       background: var(--tertiary-low);
       color: var(--primary);
-    }
-
-    img.ytp-thumbnail-image {
-      height: 100%;
-      max-height: unset;
-
-      &:hover {
-        border-radius: 0;
-      }
+      display: inline-block;
+      font-size: 0.93em;
+      font-weight: normal;
+      padding: 0 0.3em 0.07em;
+      border-radius: 0.6em;
+      text-decoration: none;
     }
 
     // Automatic aspect-ratio mapping https://developer.mozilla.org/en-US/docs/Web/Media/images/aspect_ratio_mapping
@@ -172,23 +94,20 @@
     display: flex;
     flex-wrap: wrap;
 
-    .reaction-users-list {
-      position: absolute;
-      top: -2px;
-      transform: translateY(-100%);
-      border: 1px solid var(--primary-low);
-      border-radius: 6px;
-      padding: 0.5em;
-      background: var(--primary-very-low);
-      max-width: 300px;
-      z-index: 3;
-    }
-
     .chat-message-react-btn {
       vertical-align: top;
       padding: 0em 0.25em;
       background: none;
       border: none;
+      will-change: scale;
+
+      &:active {
+        transform: scale(0.93);
+      }
+
+      > * {
+        pointer-events: none;
+      }
 
       .d-icon {
         color: var(--primary-high);
@@ -202,177 +121,116 @@
     }
   }
 
-  .chat-send-error {
-    color: var(--danger-medium);
-  }
-
-  .chat-message-mention-warning {
-    position: relative;
-    margin-top: 0.25em;
-    font-size: var(--font-down-1);
-
-    .dismiss-mention-warning {
-      position: absolute;
-      top: 15px;
-      right: 5px;
-      cursor: pointer;
-    }
-
-    .warning-item {
-      margin: 0.25em 0;
-    }
-
-    .invite-link {
-      color: var(--tertiary);
-      cursor: pointer;
-    }
-  }
-
-  .chat-message-avatar .chat-user-avatar .chat-user-avatar-container .avatar,
+  .chat-message-avatar .chat-user-avatar .chat-user-avatar__container .avatar,
   .chat-emoji-avatar .chat-emoji-avatar-container {
     width: 28px;
     height: 28px;
   }
 }
 
-.chat-message-container.highlighted .chat-message {
-  background-color: var(--tertiary-low) !important;
+.touch .chat-message-container {
+  &.-active {
+    background: var(--d-hover);
+    border-radius: var(--d-border-radius);
+
+    &.-bookmarked {
+      background: var(--highlight-low);
+    }
+  }
 }
 
-.chat-messages-container {
-  .not-mobile-device & .chat-message:hover,
-  .chat-message.chat-message-selected {
-    background: var(--primary-very-low);
+.no-touch .chat-message-container {
+  &:hover,
+  &.-active {
+    background: var(--d-hover);
   }
 
-  .chat-message.chat-message-bookmarked {
-    background: var(--highlight-low);
-  }
-
-  .not-mobile-device & .chat-message-reaction-list .chat-message-react-btn {
-    display: none;
-  }
-
-  .not-mobile-device & .chat-message:hover {
+  &:hover {
     .chat-message-reaction-list .chat-message-react-btn {
       display: inline-block;
     }
   }
-}
 
-.chat-message-flagged {
-  display: inline-block;
-  color: var(--danger);
-  height: 100%;
-  padding: 0 0.3em;
-  cursor: pointer;
+  &.-active,
+  &:hover {
+    &.-bookmarked {
+      background: var(--highlight-medium);
+    }
 
-  .flag-count,
-  .d-icon {
-    color: var(--danger);
-  }
-}
+    &.-deleted {
+      background-color: var(--danger-medium);
+    }
 
-.chat-action-text {
-  font-style: italic;
-}
-
-.chat-message-container.is-hovered,
-.chat-message.chat-message-selected {
-  background: var(--primary-very-low);
-}
-
-.chat-message.chat-message-bookmarked {
-  background: var(--highlight-low);
-}
-
-.has-full-page-chat .chat-message .onebox:not(img),
-.chat-drawer-container .chat-message .onebox {
-  margin: 0.5em 0;
-  border-width: 2px;
-
-  header {
-    margin-bottom: 0.5em;
-  }
-
-  h3 a,
-  h4 a {
-    font-size: 14px;
-  }
-
-  pre {
-    display: flex;
-    max-height: 150px;
-  }
-
-  p {
-    overflow: hidden;
-  }
-}
-
-.chat-drawer-container .chat-message .onebox {
-  width: 85%;
-  border: 2px solid var(--primary-low);
-
-  header {
-    margin-bottom: 0.5em;
-  }
-
-  .onebox-body {
-    grid-template-rows: auto auto auto;
-    overflow: auto;
-  }
-
-  h3 {
-    @include line-clamp(2);
-    font-weight: 500;
-    font-size: var(--font-down-1);
-  }
-
-  p {
-    display: none;
-  }
-}
-
-.chat-message-reaction {
-  > * {
-    pointer-events: none;
-  }
-}
-
-.retry-staged-message-btn {
-  padding: 0.5em 0;
-  background: none;
-
-  &:hover,
-  &:focus,
-  &:active {
-    background: none !important;
-  }
-
-  &:focus .retry-staged-message-btn__action {
-    text-decoration: underline;
-  }
-
-  .d-icon,
-  &__title,
-  &:hover .d-icon {
-    color: var(--danger) !important;
-    font-size: var(--font-down-1);
-  }
-
-  .d-icon {
-    margin-right: 0.25em !important;
-  }
-
-  &__action {
-    color: var(--tertiary);
-    font-size: var(--font-down-1);
-    margin-left: 0.25em;
-
-    &:hover {
-      color: var(--tertiary-high);
-      text-decoration: underline;
+    &.-highlighted {
+      background-color: var(--tertiary-medium);
     }
   }
 }
+
+.chat-message-container {
+  background-color: var(--secondary);
+
+  &.-errored {
+    color: var(--primary-medium);
+  }
+
+  &.-deleted {
+    background-color: var(--danger-low);
+    padding-block: 0.25rem;
+  }
+
+  &.-bookmarked {
+    background: var(--highlight-bg);
+  }
+
+  &.-highlighted {
+    background-color: var(--tertiary-low);
+  }
+
+  &.has-reply {
+    .chat-message {
+      display: grid;
+      grid-template-columns: var(--message-left-width) 1fr;
+      grid-template-rows: 30px auto;
+      grid-template-areas:
+        "replyto replyto"
+        "avatar message";
+
+      .chat-user-avatar {
+        grid-area: avatar;
+      }
+
+      .chat-message-content {
+        grid-area: message;
+      }
+    }
+  }
+
+  &.has-thread-indicator {
+    .chat-message {
+      display: grid;
+      grid-template-columns: var(--message-left-width) 1fr;
+      grid-template-rows: auto;
+      grid-template-areas:
+        "avatar message"
+        "threadindicator threadindicator";
+      padding-bottom: 0.65rem !important;
+
+      .chat-user-avatar {
+        grid-area: avatar;
+      }
+
+      .chat-message-content {
+        grid-area: message;
+      }
+    }
+  }
+
+  &:has(.tippy-box) {
+    position: relative;
+    z-index: 1;
+  }
+  .chat-message-reaction-list .chat-message-react-btn {
+    display: none;
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/common/chat-modal-archive-channel.scss b/plugins/chat/assets/stylesheets/common/chat-modal-archive-channel.scss
new file mode 100644
index 00000000000..aff98188d14
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/common/chat-modal-archive-channel.scss
@@ -0,0 +1,25 @@
+.chat-modal-archive-channel {
+  .chat-to-topic-selector {
+    width: auto;
+    height: 300px;
+  }
+
+  .radios {
+    margin-bottom: 10px;
+    display: flex;
+    flex-direction: row;
+
+    .radio-label {
+      margin-right: 10px;
+    }
+  }
+
+  details {
+    margin-bottom: 9px;
+  }
+
+  input[type="text"],
+  .select-kit.combo-box.category-chooser {
+    width: 100%;
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/common/chat-modal-channel-summary.scss b/plugins/chat/assets/stylesheets/common/chat-modal-channel-summary.scss
new file mode 100644
index 00000000000..3f795455cff
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/common/chat-modal-channel-summary.scss
@@ -0,0 +1,10 @@
+.chat-modal-channel-summary {
+  .summarization-since,
+  .summary-area {
+    margin: 10px 0 10px 0;
+  }
+
+  .summary-area {
+    min-height: 50px;
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/common/chat-modal-create-channel.scss b/plugins/chat/assets/stylesheets/common/chat-modal-create-channel.scss
new file mode 100644
index 00000000000..e1dfc3956f9
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/common/chat-modal-create-channel.scss
@@ -0,0 +1,42 @@
+.chat-modal-create-channel {
+  .modal-inner-container {
+    width: 500px;
+  }
+
+  .choose-topic-results-list {
+    max-height: 200px;
+    overflow-y: scroll;
+  }
+
+  .select-kit.combo-box,
+  &__input,
+  #choose-topic-title {
+    width: 100%;
+    margin-bottom: 0;
+  }
+  .category-chooser {
+    .select-kit-selected-name.selected-name.choice {
+      color: var(
+        --primary-high
+      ); // Make consistent with color of placeholder text when choosing topic
+    }
+  }
+
+  &__hint {
+    font-size: var(--font-down-1);
+    padding-top: 0.25rem;
+    color: var(--secondary-low);
+  }
+
+  &__control,
+  .edit-channel-control {
+    margin-bottom: 1rem;
+  }
+
+  &__label-description {
+    margin: 0;
+    padding-top: 0.25rem;
+    color: var(--secondary-low);
+    font-size: var(--font-down-1) !important;
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/common/chat-modal-edit-channel-description.scss b/plugins/chat/assets/stylesheets/common/chat-modal-edit-channel-description.scss
new file mode 100644
index 00000000000..359f6e8144b
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/common/chat-modal-edit-channel-description.scss
@@ -0,0 +1,20 @@
+.chat-modal-edit-channel-description {
+  .exceeded-word-count {
+    .chat-modal-edit-channel-description__description-input {
+      outline: 1px solid var(--danger);
+      border: 1px solid var(--danger);
+    }
+  }
+
+  &__description-input {
+    display: flex;
+    margin: 0;
+    min-height: 200px;
+  }
+
+  &__description {
+    display: flex;
+    padding-bottom: 0.75rem;
+    color: var(--primary-medium);
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/common/chat-modal-move-message-to-channel.scss b/plugins/chat/assets/stylesheets/common/chat-modal-move-message-to-channel.scss
new file mode 100644
index 00000000000..2f9abebc49e
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/common/chat-modal-move-message-to-channel.scss
@@ -0,0 +1,10 @@
+.chat-modal-move-message-to-channel {
+  &__channel-chooser {
+    width: 100%;
+    .category-chat-badge {
+      .d-icon {
+        color: inherit;
+      }
+    }
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/common/chat-modal-new-message.scss b/plugins/chat/assets/stylesheets/common/chat-modal-new-message.scss
new file mode 100644
index 00000000000..da33bf6813e
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/common/chat-modal-new-message.scss
@@ -0,0 +1,34 @@
+.chat-modal-new-message {
+  & + .modal-backdrop {
+    opacity: 1;
+    background: transparent;
+  }
+
+  .modal-body {
+    padding: 0;
+  }
+
+  .modal-header {
+    display: none;
+  }
+
+  .modal-inner-container {
+    width: var(--modal-max-width);
+    box-shadow: var(--shadow-dropdown);
+    overflow: hidden;
+  }
+
+  .mobile-device & {
+    .modal-inner-container {
+      border-radius: 0;
+      margin: 0 auto auto auto;
+      box-shadow: var(--shadow-modal);
+    }
+  }
+
+  .not-mobile-device & {
+    .modal-inner-container {
+      margin: 10px auto auto auto;
+    }
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/common/chat-notices.scss b/plugins/chat/assets/stylesheets/common/chat-notices.scss
new file mode 100644
index 00000000000..fdd17aa5004
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/common/chat-notices.scss
@@ -0,0 +1,49 @@
+.chat-notices {
+  display: flex;
+  flex-direction: column;
+  gap: 0.5em;
+  position: absolute;
+  top: 0;
+  z-index: 10;
+  width: 100%;
+
+  .full-page-chat & {
+    padding-inline: 1rem;
+    box-sizing: border-box;
+  }
+
+  &__notice,
+  .chat-retention-reminder {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    background: var(--tertiary-low);
+    padding: 0.5em 0 0.5em 1em;
+    color: var(--primary);
+    padding: 0.5em 0 0.5em 1em;
+    min-width: 280px;
+    margin-left: auto;
+    margin-right: auto;
+  }
+
+  .dismiss-btn {
+    margin: 0 0.25em;
+    color: var(--primary-medium);
+    align-self: flex-start;
+
+    &:hover,
+    &:focus {
+      background-color: transparent;
+      .d-icon {
+        color: var(--primary);
+      }
+    }
+    .d-icon {
+      color: var(--primary-medium);
+    }
+  }
+}
+
+.full-page-chat .chat-notices {
+  top: 4rem;
+}
diff --git a/plugins/chat/assets/stylesheets/common/chat-onebox.scss b/plugins/chat/assets/stylesheets/common/chat-onebox.scss
index 39250f62b23..f57d41a56ff 100644
--- a/plugins/chat/assets/stylesheets/common/chat-onebox.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-onebox.scss
@@ -18,6 +18,7 @@
       align-items: center;
       color: var(--primary-medium);
       display: flex;
+      flex-wrap: wrap;
 
       .avatar {
         aspect-ratio: 30 / 30;
@@ -27,8 +28,50 @@
   }
 }
 
-.chat-transcript {
-  .chat-transcript-user-avatar .avatar {
-    aspect-ratio: 20 / 20;
+.chat-drawer-container .chat-message .onebox {
+  width: 85%;
+  border: 2px solid var(--primary-low);
+
+  header {
+    margin-bottom: 0.5em;
+  }
+
+  .onebox-body {
+    grid-template-rows: auto auto auto;
+    overflow: auto;
+  }
+
+  h3 {
+    @include line-clamp(2);
+    font-weight: 500;
+    font-size: var(--font-down-1);
+  }
+
+  p {
+    display: none;
+  }
+}
+
+.has-full-page-chat .chat-message .onebox:not(img),
+.chat-drawer-container .chat-message .onebox {
+  margin: 0.5em 0;
+  border-width: 2px;
+
+  header {
+    margin-bottom: 0.5em;
+  }
+
+  h3 a,
+  h4 a {
+    font-size: 14px;
+  }
+
+  pre {
+    display: flex;
+    max-height: 150px;
+  }
+
+  p {
+    overflow: hidden;
   }
 }
diff --git a/plugins/chat/assets/stylesheets/common/chat-reply.scss b/plugins/chat/assets/stylesheets/common/chat-reply.scss
index 765a04d957f..5b2259ae07d 100644
--- a/plugins/chat/assets/stylesheets/common/chat-reply.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-reply.scss
@@ -1,12 +1,8 @@
 .chat-reply {
-  display: contents;
   align-items: center;
-  box-sizing: border-box;
+  display: grid;
   font-size: var(--font-down-1);
-  padding-left: 0.5em;
-  height: 100%;
-  width: 100%;
-  white-space: nowrap;
+  grid: 1fr / auto-flow;
 
   .d-icon {
     color: var(--primary-low-mid);
diff --git a/plugins/chat/assets/stylesheets/common/chat-replying-indicator.scss b/plugins/chat/assets/stylesheets/common/chat-replying-indicator.scss
index 3d93fc44576..5f3c2cce24d 100644
--- a/plugins/chat/assets/stylesheets/common/chat-replying-indicator.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-replying-indicator.scss
@@ -1,12 +1,12 @@
-.chat-replying-indicator-container {
-  padding: 0 0.5rem;
-}
-
 .chat-replying-indicator {
   color: var(--primary-medium);
   display: inline-flex;
   font-size: var(--font-down-2);
-  padding-bottom: unquote("max(0px, 0.5rem - env(safe-area-inset-bottom, 0))");
+
+  &-container {
+    display: flex;
+    height: 16px;
+  }
 
   &:before {
     // unicode zero width space character
diff --git a/plugins/chat/assets/stylesheets/common/chat-retention-reminder.scss b/plugins/chat/assets/stylesheets/common/chat-retention-reminder.scss
deleted file mode 100644
index d1aeaaf3a91..00000000000
--- a/plugins/chat/assets/stylesheets/common/chat-retention-reminder.scss
+++ /dev/null
@@ -1,35 +0,0 @@
-.chat-retention-reminder {
-  display: flex;
-  position: absolute;
-  top: 0;
-  left: 50%;
-  transform: translateX(-50%);
-  align-items: center;
-  justify-content: space-between;
-  background: var(--tertiary-low);
-  padding: 0.5em 0 0.5em 1em;
-  font-size: var(--font-down-1);
-  color: var(--primary);
-  z-index: 10;
-  min-width: 280px;
-
-  .btn-flat.dismiss-btn {
-    margin-left: 0.25em;
-    color: var(--primary-medium);
-
-    &:hover,
-    &:focus {
-      background-color: transparent;
-      .d-icon {
-        color: var(--primary);
-      }
-    }
-    .d-icon {
-      color: var(--primary-medium);
-    }
-  }
-}
-
-.full-page-chat .chat-retention-reminder {
-  top: 4rem;
-}
diff --git a/plugins/chat/assets/stylesheets/common/chat-scroll-to-bottom.scss b/plugins/chat/assets/stylesheets/common/chat-scroll-to-bottom.scss
new file mode 100644
index 00000000000..eb8cb539643
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/common/chat-scroll-to-bottom.scss
@@ -0,0 +1,72 @@
+.chat-scroll-to-bottom {
+  display: flex;
+  justify-content: center;
+  margin: 0 1rem;
+  position: relative;
+
+  &__arrow {
+    display: flex;
+    background: var(--primary-medium);
+    border-radius: 100%;
+    align-items: center;
+    justify-content: center;
+    height: 32px;
+    width: 32px;
+    position: relative;
+  }
+
+  &__button {
+    align-items: center;
+    justify-content: center;
+    position: absolute;
+    flex-direction: column;
+    bottom: -25px;
+    background: none;
+    opacity: 0;
+    transition: opacity 0.25s ease, transform 0.5s ease;
+    transform: scale(0.1);
+    padding: 0;
+    z-index: z("dropdown");
+
+    .d-icon {
+      color: var(--secondary);
+      margin-left: 1px; // "fixes" the 1px svg shift
+    }
+
+    > * {
+      pointer-events: none;
+    }
+
+    &:hover,
+    &:active,
+    &:focus {
+      background: none !important;
+      .d-icon {
+        color: var(--secondary) !important;
+      }
+    }
+
+    .no-touch & {
+      &:hover {
+        opacity: 1;
+
+        .d-icon {
+          color: var(--primary-very-high) !important;
+        }
+      }
+    }
+
+    &.visible {
+      transform: translateY(-32px) scale(1);
+      opacity: 0.8;
+
+      &:hover {
+        transform: translateY(-32px) scale(1);
+
+        &:active {
+          transform: translateY(-32px) scale(0.8);
+        }
+      }
+    }
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/common/chat-section.scss b/plugins/chat/assets/stylesheets/common/chat-section.scss
new file mode 100644
index 00000000000..bd4eae7ffc8
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/common/chat-section.scss
@@ -0,0 +1,15 @@
+.chat-section {
+  border-bottom: 1px solid var(--primary-low);
+  padding: 1rem;
+  align-items: center;
+  display: flex;
+  flex-shrink: 0;
+  box-sizing: border-box;
+
+  &__text {
+    align-items: baseline;
+    display: flex;
+    flex: 1 1 0;
+    min-width: 0;
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/common/chat-selection-manager.scss b/plugins/chat/assets/stylesheets/common/chat-selection-manager.scss
index 959fad11334..2d3e4bab323 100644
--- a/plugins/chat/assets/stylesheets/common/chat-selection-manager.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-selection-manager.scss
@@ -8,7 +8,7 @@
     flex-direction: column;
   }
 
-  .chat-selection-management-buttons {
+  &__buttons {
     display: flex;
     gap: 0.5rem;
 
@@ -18,7 +18,7 @@
     }
   }
 
-  .chat-selection-message {
+  &__copy-success {
     animation: chat-quote-message-background-fade-highlight 2s ease-out 3s;
     animation-fill-mode: forwards;
     background-color: var(--success-low);
diff --git a/plugins/chat/assets/stylesheets/common/chat-side-panel-resizer.scss b/plugins/chat/assets/stylesheets/common/chat-side-panel-resizer.scss
new file mode 100644
index 00000000000..61186aea264
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/common/chat-side-panel-resizer.scss
@@ -0,0 +1,30 @@
+.chat-side-panel-resizer {
+  top: 0;
+  bottom: 0;
+
+  position: absolute;
+  z-index: calc(z("header") - 1);
+  transition: background-color 0.15s 0.15s;
+  background-color: transparent;
+
+  .touch & {
+    left: -6px;
+    width: 10px;
+
+    &:active {
+      cursor: col-resize;
+      background: var(--tertiary);
+    }
+  }
+
+  .no-touch & {
+    left: -3px;
+    width: 5px;
+
+    &:hover,
+    &:active {
+      cursor: col-resize;
+      background: var(--tertiary);
+    }
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/common/chat-side-panel.scss b/plugins/chat/assets/stylesheets/common/chat-side-panel.scss
new file mode 100644
index 00000000000..e65661a4ad8
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/common/chat-side-panel.scss
@@ -0,0 +1,20 @@
+#main-chat-outlet.chat-view {
+  min-height: 0;
+  display: grid;
+  grid-template-rows: 100%;
+  grid-template-areas: "main threads";
+  grid-template-columns: 1fr auto;
+}
+
+.chat-side-panel {
+  grid-area: threads;
+  box-sizing: border-box;
+  border-left: 1px solid var(--primary-low);
+  position: relative;
+  min-width: 250px;
+
+  &__list {
+    flex-grow: 1;
+    padding: 0 1.5em 1em;
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/common/chat-skeleton.scss b/plugins/chat/assets/stylesheets/common/chat-skeleton.scss
index 36beaa46676..c487474def3 100644
--- a/plugins/chat/assets/stylesheets/common/chat-skeleton.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-skeleton.scss
@@ -1,34 +1,8 @@
-$radius: 10px;
-
 .chat-skeleton {
   height: auto;
 
-  &__header {
-    display: flex;
-    align-items: center;
-    width: 100%;
-    padding: 1em;
-    border-bottom: 1px solid var(--primary-100);
-    box-sizing: border-box;
-  }
-
-  &__header-img {
-    background-color: var(--primary-100);
-    border-radius: 50%;
-    width: 20px;
-    height: 20px;
-    margin-right: 0.5rem;
-  }
-
-  &__header-name {
-    background-color: var(--primary-100);
-    width: 70px;
-    height: 18px;
-    border-radius: $radius;
-  }
-
   &__body {
-    padding: 1em;
+    padding: 0.5em 1em;
   }
 
   &__message {
@@ -52,10 +26,10 @@ $radius: 10px;
     border-radius: 50%;
     margin-right: 0.5rem;
 
-    .chat-skeleton__message:nth-of-type(odd) & {
+    .chat-skeleton__body:nth-of-type(odd) & {
       background-color: var(--primary-100);
     }
-    .chat-skeleton__message:nth-of-type(even) & {
+    .chat-skeleton__body:nth-of-type(even) & {
       background-color: var(--primary-200);
     }
   }
@@ -66,12 +40,12 @@ $radius: 10px;
     margin-bottom: 0.25rem;
     width: 70px;
     height: 20px;
-    border-radius: $radius;
+    border-radius: var(--d-border-radius);
 
-    .chat-skeleton__message:nth-of-type(odd) & {
+    .chat-skeleton__body:nth-of-type(odd) & {
       background-color: var(--primary-100);
     }
-    .chat-skeleton__message:nth-of-type(even) & {
+    .chat-skeleton__body:nth-of-type(even) & {
       background-color: var(--primary-200);
     }
   }
@@ -79,41 +53,66 @@ $radius: 10px;
   &__message-content {
     grid-area: content;
     width: 100%;
+    padding: 10px 0;
   }
-  &__message-msg {
-    height: 13px;
-    border-radius: $radius;
 
-    .chat-skeleton__message:nth-of-type(odd) & {
+  &__message-reactions {
+    display: flex;
+    padding: 5px 0 0 0;
+  }
+
+  &__message-reaction {
+    background-color: var(--primary-100);
+    width: 32px;
+    height: 18px;
+    border-radius: var(--d-border-radius);
+
+    & + & {
+      margin-left: 0.5rem;
+    }
+  }
+
+  &__message-text {
+    display: flex;
+    padding: 0;
+    flex-direction: column;
+  }
+
+  &__message-msg {
+    height: 10px;
+    border-radius: var(--d-border-radius);
+    margin: 2px 0;
+
+    .chat-skeleton__body:nth-of-type(odd) & {
       background-color: var(--primary-100);
     }
-    .chat-skeleton__message:nth-of-type(even) & {
+    .chat-skeleton__body:nth-of-type(even) & {
       background-color: var(--primary-200);
     }
+  }
 
-    &.-line1 {
-      margin-top: 0.5rem;
-      margin-bottom: 0.5em;
-    }
+  &__message-img {
+    height: 80px;
+    border-radius: var(--d-border-radius);
+    margin: 2px 0;
+    width: 200px;
+    background-color: var(--primary-100);
+  }
 
-    &.-small {
-      width: 35%;
-    }
-
-    &.-medium {
-      width: 60%;
-    }
-
-    &.-large {
-      width: 85%;
-    }
+  *[class^="chat-skeleton__message-"] {
+    position: relative;
+    overflow: hidden;
   }
 
   &.-animation {
     position: relative;
     overflow: hidden;
 
-    &::after {
+    *[class^="chat-skeleton__message-"]:not(
+        .chat-skeleton__message-content
+      ):not(.chat-skeleton__message-text):not(
+        .chat-skeleton__message-reactions
+      ):after {
       position: absolute;
       top: 0;
       right: 0;
@@ -123,11 +122,10 @@ $radius: 10px;
       background: linear-gradient(
         90deg,
         rgba(var(--chat-skeleton-animation-rgb), 0) 0,
-        rgba(var(--chat-skeleton-animation-rgb), 0.2) 20%,
-        rgba(var(--chat-skeleton-animation-rgb), 0.5) 60%,
-        rgba(var(--chat-skeleton-animation-rgb), 0)
+        rgba(var(--chat-skeleton-animation-rgb), 0.3) 50%,
+        rgba(var(--chat-skeleton-animation-rgb), 0.5) 100%
       );
-      animation: shimmer 1.5s infinite;
+      animation: shimmer 1.25s infinite;
       content: "";
     }
 
diff --git a/plugins/chat/assets/stylesheets/common/chat-tabs.scss b/plugins/chat/assets/stylesheets/common/chat-tabs.scss
index fe49815231b..70262b2a580 100644
--- a/plugins/chat/assets/stylesheets/common/chat-tabs.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-tabs.scss
@@ -8,6 +8,7 @@
 .chat-tabs__tabpanel {
   height: 100%;
   min-height: 1px;
+  padding-bottom: env(safe-area-inset-bottom);
 }
 
 .chat-tabs-list {
diff --git a/plugins/chat/assets/stylesheets/common/chat-thread-header-buttons.scss b/plugins/chat/assets/stylesheets/common/chat-thread-header-buttons.scss
new file mode 100644
index 00000000000..777637121fa
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/common/chat-thread-header-buttons.scss
@@ -0,0 +1,66 @@
+@mixin chat-channel-header-button {
+  color: var(--primary-low-mid);
+  padding: 0.25em 0.4em;
+
+  .d-icon {
+    color: inherit;
+  }
+
+  &:visited {
+    color: var(--primary-low-mid);
+  }
+
+  &:hover {
+    color: var(--primary-medium);
+    background: var(--primary-very-low);
+    border-radius: var(--d-border-radius);
+
+    &:hover {
+      .d-icon {
+        color: inherit;
+      }
+    }
+  }
+
+  > * {
+    pointer-events: none;
+  }
+}
+
+.chat-channel {
+  .chat-threads-list-button {
+    @include chat-channel-header-button;
+    position: relative;
+    display: flex;
+    align-items: center;
+
+    &.has-unreads {
+      color: var(--tertiary-med-or-tertiary);
+      gap: 0.25rem;
+
+      &:hover {
+        color: var(--tertiary-hover);
+      }
+    }
+
+    .d-icon {
+      margin-right: 0;
+    }
+
+    &:hover {
+      .discourse-touch & {
+        background: none !important;
+      }
+    }
+
+    &:active {
+      .discourse-touch & {
+        background: var(--secondary-very-high) !important;
+      }
+    }
+  }
+
+  .open-drawer-btn {
+    @include chat-channel-header-button;
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/common/chat-thread-header.scss b/plugins/chat/assets/stylesheets/common/chat-thread-header.scss
new file mode 100644
index 00000000000..74547688cfd
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/common/chat-thread-header.scss
@@ -0,0 +1,26 @@
+.chat-thread-header {
+  height: var(--chat-header-offset);
+  min-height: var(--chat-header-offset);
+  border-bottom: 1px solid var(--primary-low);
+  border-top: 1px solid var(--primary-low);
+  box-sizing: border-box;
+  display: flex;
+  align-items: center;
+  padding-inline: 0.5rem;
+
+  .chat-thread__back-to-previous-route {
+    padding: 0.5rem 0;
+    margin-right: 0.5rem;
+  }
+
+  &__buttons {
+    display: flex;
+    margin-left: auto;
+  }
+
+  &__left-buttons {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/common/chat-thread-list-header.scss b/plugins/chat/assets/stylesheets/common/chat-thread-list-header.scss
new file mode 100644
index 00000000000..698afa7c559
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/common/chat-thread-list-header.scss
@@ -0,0 +1,15 @@
+.chat-thread-list-header {
+  height: var(--chat-header-offset);
+  min-height: var(--chat-header-offset);
+  border-bottom: 1px solid var(--primary-low);
+  border-top: 1px solid var(--primary-low);
+  box-sizing: border-box;
+  display: flex;
+  align-items: center;
+  padding-inline: 0.5rem;
+
+  &__buttons {
+    display: flex;
+    margin-left: auto;
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/common/chat-thread-list-item.scss b/plugins/chat/assets/stylesheets/common/chat-thread-list-item.scss
new file mode 100644
index 00000000000..6dc08b08820
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/common/chat-thread-list-item.scss
@@ -0,0 +1,92 @@
+@mixin thread-list-item {
+  display: flex;
+  flex-direction: row;
+  padding: 0.5rem;
+  border-radius: var(--d-border-radius);
+  background-color: var(--primary-very-low);
+  border: 1px solid transparent;
+}
+
+.chat-thread-list-item {
+  @include thread-list-item;
+  cursor: pointer;
+  margin: 0.25rem;
+
+  & + .chat-thread-list-item {
+    margin-top: 0;
+  }
+
+  .touch & {
+    &:active {
+      background-color: var(--d-hover);
+      border: 1px solid var(--primary-300);
+    }
+  }
+
+  .no-touch & {
+    &:hover,
+    &:active {
+      background-color: var(--d-hover);
+      border: 1px solid var(--primary-300);
+    }
+  }
+
+  &__main {
+    flex: 1 1 100%;
+    width: 100%;
+  }
+
+  &__body {
+    padding-bottom: 0.25rem;
+    word-break: break-word;
+    margin: 0.5rem 0rem;
+
+    > * {
+      pointer-events: none;
+    }
+  }
+
+  &__metadata {
+    display: flex;
+    justify-content: flex-end;
+  }
+
+  &__last-reply {
+    color: var(--secondary-low);
+    font-size: var(--font-down-1);
+  }
+
+  &__header {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    margin-bottom: 0.25rem;
+  }
+
+  &__title {
+    flex: 1 1 auto;
+    font-weight: bold;
+  }
+
+  &__unread-indicator {
+    flex: 0 0 auto;
+  }
+
+  &__open-button {
+    display: flex;
+    flex-direction: column;
+    box-sizing: border-box;
+    justify-content: center;
+    color: var(--primary);
+
+    &:hover,
+    &:visited {
+      color: var(--primary);
+    }
+  }
+
+  &__om-user-avatar {
+    margin-right: 0.5rem;
+    flex: 0 0 auto;
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/common/chat-thread-participants.scss b/plugins/chat/assets/stylesheets/common/chat-thread-participants.scss
new file mode 100644
index 00000000000..3fb9cf66f89
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/common/chat-thread-participants.scss
@@ -0,0 +1,48 @@
+.chat-thread-participants {
+  margin-left: 0.5rem;
+  &__other-count {
+    font-size: var(--font-down-2);
+    color: var(--primary-high);
+    white-space: nowrap;
+  }
+
+  &__avatar-group {
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+
+    .chat-user-avatar__container {
+      padding: 0;
+    }
+
+    .chat-user-avatar {
+      width: auto !important;
+
+      .avatar {
+        width: 24px;
+        height: 24px;
+        padding: 0;
+      }
+    }
+  }
+}
+
+@container (max-width: 400px) {
+  .chat-thread-participants {
+    &__avatar-group {
+      flex-direction: row;
+      justify-content: flex-start;
+
+      .chat-user-avatar {
+        &:not(:last-child) {
+          margin-right: -10px;
+        }
+        .avatar {
+          width: 22px;
+          height: 22px;
+          border: 1px solid var(--primary-very-low);
+        }
+      }
+    }
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/common/chat-thread-unread-indicator.scss b/plugins/chat/assets/stylesheets/common/chat-thread-unread-indicator.scss
new file mode 100644
index 00000000000..eaf893aa528
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/common/chat-thread-unread-indicator.scss
@@ -0,0 +1,12 @@
+.chat-thread-header-unread-indicator,
+.chat-thread-list-item-unread-indicator {
+  @include chat-unread-indicator;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: auto;
+  height: auto;
+  padding: 0.21em 0.42em;
+  border-radius: 1em;
+  min-width: 0.6em;
+}
diff --git a/plugins/chat/assets/stylesheets/common/chat-thread.scss b/plugins/chat/assets/stylesheets/common/chat-thread.scss
new file mode 100644
index 00000000000..9a2a48b260f
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/common/chat-thread.scss
@@ -0,0 +1,16 @@
+.chat-thread {
+  display: flex;
+  flex-direction: column;
+  position: relative;
+  @include chat-height;
+
+  &__body {
+    overflow-y: scroll;
+    @include chat-scrollbar();
+    box-sizing: border-box;
+    flex-grow: 1;
+    overscroll-behavior: contain;
+    display: flex;
+    flex-direction: column-reverse;
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/common/chat-threads-list.scss b/plugins/chat/assets/stylesheets/common/chat-threads-list.scss
new file mode 100644
index 00000000000..ea97183b909
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/common/chat-threads-list.scss
@@ -0,0 +1,21 @@
+.chat-thread-list {
+  display: flex;
+  flex-direction: column;
+  position: relative;
+  @include chat-height(env(safe-area-inset-bottom));
+
+  &__items {
+    overflow-y: scroll;
+    @include chat-scrollbar();
+    box-sizing: border-box;
+    flex-grow: 1;
+    overscroll-behavior: contain;
+    display: flex;
+    flex-direction: column;
+  }
+
+  &__no-threads {
+    @include thread-list-item;
+    margin: 0.5rem 0rem 0.5rem 0.5rem;
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/common/chat-transcript.scss b/plugins/chat/assets/stylesheets/common/chat-transcript.scss
index b66d72fcd68..f5b686efebb 100644
--- a/plugins/chat/assets/stylesheets/common/chat-transcript.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-transcript.scss
@@ -53,6 +53,10 @@
     }
   }
 
+  .chat-transcript-user-avatar .avatar {
+    aspect-ratio: 20 / 20;
+  }
+
   .chat-transcript-user {
     display: flex;
     flex-wrap: wrap-reverse;
diff --git a/plugins/chat/assets/stylesheets/common/chat-unread-indicator.scss b/plugins/chat/assets/stylesheets/common/chat-unread-indicator.scss
new file mode 100644
index 00000000000..9759542783b
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/common/chat-unread-indicator.scss
@@ -0,0 +1,23 @@
+@mixin chat-unread-indicator {
+  @include unselectable;
+  width: 14px;
+  height: 14px;
+  border-radius: 1em;
+  box-sizing: content-box;
+  -webkit-touch-callout: none;
+  background: var(--tertiary-med-or-tertiary);
+  color: var(--secondary);
+  font-size: var(--font-down-2);
+  text-align: center;
+  transition: border-color linear 0.15s;
+
+  &.-urgent {
+    background: var(--success);
+    color: var(--secondary);
+  }
+
+  &__number {
+    color: var(--secondary);
+    line-height: var(--line-height-small);
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/common/chat-upload-drop-zone.scss b/plugins/chat/assets/stylesheets/common/chat-upload-drop-zone.scss
new file mode 100644
index 00000000000..b313056f3aa
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/common/chat-upload-drop-zone.scss
@@ -0,0 +1,77 @@
+.chat-upload-drop-zone {
+  position: absolute;
+  visibility: hidden;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: z("max");
+  align-items: center;
+  justify-content: center;
+  display: flex;
+  background: rgba(var(--always-black-rgb), 0.85);
+
+  .uppy-is-drag-over & {
+    visibility: visible;
+  }
+
+  &__content {
+    position: relative;
+    width: 50%;
+    height: 50%;
+  }
+
+  &__background {
+    svg {
+      transform: scale(0.1);
+      transition: transform 200ms ease-in-out;
+      height: 80px;
+
+      .uppy-is-drag-over & {
+        transform: scale(1);
+      }
+    }
+
+    position: absolute;
+    top: 0;
+    left: calc(50% - 100px / 2);
+    z-index: 1;
+  }
+
+  &__illustration {
+    svg {
+      transform: scale(0.1);
+      transition: transform 200ms ease-in-out;
+      height: 80px;
+
+      .uppy-is-drag-over & {
+        transform: scale(1);
+      }
+    }
+
+    position: absolute;
+    top: 0;
+    left: calc(50% - 100px / 2);
+    z-index: 1;
+  }
+
+  &__text {
+    position: absolute;
+    top: 100px;
+    left: 0;
+    right: 0;
+    width: 100%;
+    z-index: 1;
+    display: flex;
+    justify-content: center;
+
+    &__title {
+      width: 100%;
+      font-weight: 600;
+      text-align: center;
+      font-size: var(--font-up-2);
+      padding-inline: 1rem;
+      color: var(--secondary-or-primary);
+    }
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/common/chat-user-avatar.scss b/plugins/chat/assets/stylesheets/common/chat-user-avatar.scss
new file mode 100644
index 00000000000..76bd0f0a4cb
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/common/chat-user-avatar.scss
@@ -0,0 +1,53 @@
+.chat-user-avatar {
+  @include unselectable;
+  display: flex;
+  align-items: center;
+
+  .chat-message-container:not(.has-reply) & {
+    width: var(--message-left-width);
+    flex-shrink: 0;
+  }
+
+  &.is-online {
+    .chat-user-avatar__container .avatar {
+      box-shadow: 0px 0px 0px 1px var(--success);
+      border: 1px solid var(--secondary);
+      padding: 0;
+    }
+  }
+
+  &__container {
+    position: relative;
+    padding: 1px; // for is-online box-shadow effect, preventing cutoff
+
+    .avatar {
+      padding: 1px; // for is-online box-shadow effect, preventing shift
+    }
+
+    .chat-user-presence-flair {
+      box-sizing: border-box;
+      position: absolute;
+      background-color: var(--success);
+      border: 1px solid var(--secondary);
+      border-radius: 50%;
+
+      .chat-message & {
+        width: 10px;
+        height: 10px;
+        right: 0px;
+        bottom: 0px;
+      }
+
+      .chat-channel-title & {
+        width: 8px;
+        height: 8px;
+        right: -1px;
+        bottom: -1px;
+      }
+    }
+  }
+
+  .chat-channel-title & {
+    width: auto;
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/common/common.scss b/plugins/chat/assets/stylesheets/common/common.scss
deleted file mode 100644
index f36cc2920f8..00000000000
--- a/plugins/chat/assets/stylesheets/common/common.scss
+++ /dev/null
@@ -1,683 +0,0 @@
-$float-height: 530px;
-
-:root {
-  --message-left-width: 42px;
-  --full-page-border-radius: 12px;
-  --full-page-sidebar-width: 275px;
-  --channel-list-avatar-size: 30px;
-  --chat-header-offset: 65px;
-}
-
-.chat-message-move-to-channel-modal-modal {
-  .modal-inner-container {
-    .chat-move-message-channel-chooser {
-      width: 100%;
-      .category-chat-badge {
-        .d-icon {
-          color: inherit;
-        }
-      }
-    }
-  }
-}
-
-.uppy-is-drag-over .chat-composer .drop-a-file {
-  display: flex;
-  position: absolute;
-  align-items: center;
-  justify-content: center;
-  width: 100%;
-  height: 100%;
-  top: 0;
-  left: 0;
-  background-color: rgba(0, 0, 0, 0.75);
-  z-index: z("header");
-  &-content {
-    width: max-content;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    padding: 2em;
-    background-color: #1d1d1d;
-    border-radius: 0.25em;
-    &-images {
-      .d-icon {
-        height: 3em;
-        width: 3em;
-        color: var(--secondary-or-primary);
-        &:first-of-type {
-          transform: rotate(-5deg);
-        }
-        &:nth-of-type(2) {
-          height: 4em;
-          width: 4em;
-        }
-        &:last-of-type {
-          transform: rotate(5deg);
-        }
-      }
-    }
-    &-text {
-      margin: 1.5em 0 0 0;
-      font-size: var(--font-up-1);
-      color: var(--secondary-or-primary);
-      .d-icon-upload {
-        padding-right: 0.25em;
-        position: relative;
-        bottom: 2px;
-        color: var(--secondary-or-primary);
-      }
-    }
-  }
-}
-
-.chat-channel-unread-indicator {
-  @include unselectable;
-
-  width: 14px;
-  height: 14px;
-  border-radius: 100%;
-  box-sizing: content-box;
-  -webkit-touch-callout: none;
-  background: var(--tertiary-med-or-tertiary);
-  color: var(--secondary);
-  font-size: var(--font-down-2);
-  text-align: center;
-
-  &.urgent {
-    background: var(--success);
-    color: var(--secondary);
-
-    .number-wrap {
-      position: relative;
-      width: 100%;
-      height: 100%;
-
-      .number {
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        transform: translate(-50%, -50%);
-      }
-    }
-  }
-}
-
-.header-dropdown-toggle.chat-header-icon {
-  .icon {
-    .chat-channel-unread-indicator {
-      border: 2px solid var(--header_background);
-      position: absolute;
-      right: 2px;
-      bottom: 2px;
-      transition: border-color linear 0.15s;
-    }
-  }
-
-  span.icon {
-    cursor: auto;
-
-    &:hover {
-      .d-icon {
-        color: var(--header_primary-low-mid);
-      }
-
-      background: none;
-    }
-  }
-
-  a.icon {
-    &.active {
-      .d-icon-comment {
-        color: var(--primary-medium);
-      }
-    }
-
-    &:hover {
-      .chat-channel-unread-indicator {
-        border-color: var(--primary-low);
-      }
-    }
-  }
-}
-
-.chat-messages-container {
-  word-wrap: break-word;
-  white-space: normal;
-
-  .chat-message-container {
-    display: grid;
-
-    &.selecting-messages {
-      grid-template-columns: 1.5em 1fr;
-    }
-
-    .chat-message-selector {
-      align-self: center;
-      justify-self: end;
-      margin: 0;
-    }
-  }
-
-  .chat-time {
-    color: var(--primary-high);
-    font-size: var(--font-down-2);
-  }
-
-  .emoji-picker {
-    position: fixed;
-  }
-
-  &:hover {
-    .chat-.chat-message-react-btn {
-      display: inline-block;
-    }
-  }
-}
-
-.chat-emoji-avatar {
-  width: var(--message-left-width);
-  align-items: center;
-
-  img {
-    display: block;
-    margin-left: auto;
-    margin-right: auto;
-  }
-}
-
-.avatar {
-  border: 1px solid transparent;
-  padding: 0;
-  box-sizing: border-box;
-
-  .is-online & {
-    border: 1px solid var(--secondary);
-    box-shadow: 0px 0px 0px 1px var(--success);
-  }
-}
-
-.chat-user-avatar {
-  @include unselectable;
-  display: flex;
-  align-items: center;
-
-  .chat-message:not(.is-reply) & {
-    width: var(--message-left-width);
-    flex-shrink: 0;
-  }
-
-  &.is-online {
-    .chat-user-avatar-container .avatar {
-      box-shadow: 0px 0px 0px 1px var(--success);
-      border: 1px solid var(--secondary);
-      padding: 0;
-    }
-  }
-
-  .chat-user-avatar-container {
-    position: relative;
-    padding: 1px; //for is-online boxshadow effect, preventing cutoff
-
-    .avatar {
-      padding: 1px; ////for is-online boxshadow effect, preventing shift
-    }
-
-    .chat-user-presence-flair {
-      box-sizing: border-box;
-      position: absolute;
-      background-color: var(--success);
-      border: 1px solid var(--secondary);
-      border-radius: 50%;
-
-      .chat-message & {
-        width: 10px;
-        height: 10px;
-        right: 0px;
-        bottom: 0px;
-      }
-
-      .chat-channel-title & {
-        width: 8px;
-        height: 8px;
-        right: -1px;
-        bottom: -1px;
-      }
-    }
-  }
-
-  .chat-channel-title & {
-    width: auto;
-  }
-}
-
-.chat-live-pane {
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-  min-height: 1px;
-  position: relative;
-
-  .open-drawer-btn {
-    color: var(--primary-low-mid);
-
-    &:visited {
-      color: var(--primary-low-mid);
-    }
-
-    &:hover {
-      color: var(--primary);
-    }
-
-    > * {
-      pointer-events: none;
-    }
-  }
-
-  .chat-messages-scroll {
-    flex-grow: 1;
-    overflow-y: scroll;
-    scrollbar-color: var(--primary-low) transparent;
-    transition: scrollbar-color 0.2s ease-in-out;
-    display: flex;
-    flex-direction: column-reverse;
-    z-index: 1;
-
-    &::-webkit-scrollbar {
-      width: 15px;
-    }
-    &::-webkit-scrollbar-thumb {
-      background: var(--primary-low);
-      border-radius: 8px;
-      border: 3px solid var(--secondary);
-    }
-    &::-webkit-scrollbar-track {
-      background-color: transparent;
-    }
-    &:hover {
-      scrollbar-color: var(--primary-low-mid) transparent;
-      &::-webkit-scrollbar-thumb {
-        background: var(--primary-low-mid);
-      }
-    }
-
-    .join-channel-btn.in-float {
-      position: absolute;
-      transform: translateX(-50%);
-      left: 50%;
-      top: 10px;
-      z-index: 10;
-    }
-
-    .all-loaded-message {
-      text-align: center;
-      color: var(--primary-medium);
-      font-size: var(--font-down-1);
-      padding: 0.5em 0.25em 0.25em;
-    }
-  }
-
-  .scroll-stick-wrap {
-    position: relative;
-  }
-
-  .chat-scroll-to-bottom {
-    background: var(--primary-medium);
-    bottom: 1em;
-    border-radius: 100%;
-    left: 50%;
-    opacity: 50%;
-    padding: 0.5em;
-    position: absolute;
-    transform: translateX(-50%);
-    z-index: 2;
-
-    &:hover {
-      background: var(--primary-medium);
-      opacity: 100%;
-    }
-
-    .d-icon {
-      color: var(--primary);
-      margin: 0;
-    }
-
-    &.unread-messages {
-      opacity: 85%;
-      border-radius: 0;
-      transition: border-radius 0.1s linear;
-
-      &:hover {
-        opacity: 100%;
-      }
-
-      .d-icon {
-        margin: 0 0 0 0.5em;
-      }
-    }
-  }
-}
-
-.topic-title-chat-icon {
-  display: inline-block;
-  * {
-    display: inline-block;
-  }
-}
-
-body.has-sidebar-page.has-full-page-chat #main-outlet-wrapper {
-  gap: 0;
-}
-
-body.has-full-page-chat {
-  .alert-error,
-  .alert-info,
-  .alert-success,
-  .alert-warning {
-    margin: 0;
-    border-bottom: 1px solid var(--primary-low);
-  }
-}
-
-.full-page-chat {
-  font-family: "Lato", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
-    Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
-  display: grid;
-  grid-template-columns: var(--full-page-sidebar-width) 1fr;
-
-  .chat-full-page-header {
-    border-top: 1px solid var(--primary-low);
-    border-bottom: 1px solid var(--primary-low);
-    background: var(--secondary);
-    z-index: 3;
-    display: flex;
-    align-items: center;
-
-    &__back-btn {
-      width: 40px;
-      min-width: 40px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
-
-    .chat-channel-title {
-      .category-chat-name,
-      .chat-name,
-      .dm-usernames {
-        color: var(--primary);
-        display: inline;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-    }
-
-    .-not-following {
-      .chat-channel-title {
-        max-width: calc(100% - 50px);
-      }
-      .join-channel-btn {
-        margin-left: auto;
-      }
-    }
-  }
-
-  .chat-live-pane,
-  .chat-messages-scroll,
-  .chat-live-pane {
-    box-sizing: border-box;
-    height: 100%;
-  }
-}
-
-.chat-full-page-header__left-actions {
-  display: flex;
-  align-items: stretch;
-}
-
-.chat-full-page-header__title {
-  display: flex;
-  align-items: stretch;
-}
-
-.chat-full-page-header__right-actions {
-  align-items: stretch;
-  display: flex;
-  flex-grow: 1;
-  font-size: var(--font-up-1);
-  justify-content: flex-end;
-}
-
-.chat-full-page-header {
-  box-sizing: border-box;
-
-  .chat-channel-header-details {
-    display: flex;
-    align-items: stretch;
-    flex: 1;
-
-    .chat-channel-archive-status {
-      text-align: right;
-      padding-right: 1em;
-    }
-  }
-
-  .chat-channel-title {
-    margin: 0;
-    max-width: 100%;
-
-    .d-icon:not(.d-icon-lock) {
-      height: 1.25em;
-      width: 1.25em;
-    }
-
-    .category-chat-name,
-    .dm-username {
-      font-weight: 700;
-      font-size: var(--font-up-1);
-      line-height: var(--font-up-1);
-    }
-
-    .dm-usernames {
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-  }
-  .chat-channel-retry-archive {
-    display: flex;
-    margin-top: 1em;
-  }
-}
-
-.chat-channel-archive-modal-inner {
-  .chat-to-topic-selector {
-    width: 500px;
-    height: 300px;
-  }
-
-  .radios {
-    margin-bottom: 10px;
-    display: flex;
-    flex-direction: row;
-
-    .radio-label {
-      margin-right: 10px;
-    }
-  }
-
-  details {
-    margin-bottom: 9px;
-  }
-
-  input[type="text"],
-  .select-kit.combo-box.category-chooser {
-    width: 100%;
-  }
-}
-
-.chat-channel-archive-modal-inner {
-  .chat-to-topic-selector {
-    width: auto;
-  }
-}
-
-.user-preferences .chat-setting .controls {
-  margin-bottom: 0;
-}
-
-.create-channel-modal {
-  .modal-inner-container {
-    width: 500px;
-  }
-  .choose-topic-results-list {
-    max-height: 200px;
-    overflow-y: scroll;
-  }
-  .select-kit.combo-box,
-  .create-channel-name-input,
-  .create-channel-description-input,
-  #choose-topic-title {
-    width: 100%;
-    margin-bottom: 0;
-  }
-  .category-chooser {
-    .select-kit-selected-name.selected-name.choice {
-      color: var(
-        --primary-high
-      ); // Make consistent with color of placeholder text when choosing topic
-    }
-  }
-
-  .create-channel-hint {
-    font-size: 0.8em;
-    margin-top: 0.2em;
-  }
-
-  .create-channel-label,
-  label[for="choose-topic-title"] {
-    margin: 1em 0 0.35em;
-  }
-  .chat-channel-title {
-    margin: 1em 0 0 0;
-  }
-}
-
-.chat-message-collapser,
-.chat-message-text {
-  > p {
-    margin: 0.5em 0 0.5em;
-  }
-
-  > p:first-of-type {
-    margin-top: 0.1em;
-  }
-
-  > p:last-of-type {
-    margin-bottom: 0.1em;
-  }
-}
-
-.reviewable-chat-message {
-  .chat-channel-title {
-    max-width: 100%;
-  }
-}
-
-.chat-channel-dm-title {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-
-  .channel-name {
-    font-weight: 700;
-    font-size: var(--font-up-1);
-    line-height: var(--font-up-1);
-  }
-}
-
-.chat-channel-status {
-  background: var(--secondary);
-  padding: 0.5rem 1rem;
-  border-bottom: 1px solid var(--primary-low);
-}
-
-html.has-full-page-chat {
-  height: 100%;
-  width: 100%;
-
-  &.keyboard-visible body #main-outlet .full-page-chat {
-    padding-bottom: 0.2rem;
-  }
-
-  body {
-    height: 100%;
-    width: 100%;
-
-    #main-outlet {
-      display: flex;
-      flex-direction: column;
-      max-height: calc(
-        var(--chat-vh, 1vh) * 100 - var(--header-offset, 0px) -
-          var(--composer-height, 0px)
-      );
-
-      .full-page-chat {
-        height: 100%;
-        min-height: 0;
-        padding-bottom: env(safe-area-inset-bottom);
-      }
-
-      #main-chat-outlet {
-        min-height: 0;
-      }
-    }
-  }
-
-  &.mobile-view {
-    #main-outlet-wrapper {
-      padding: 0;
-    }
-  }
-
-  // these need to apply to desktop too, because iPads
-  &.discourse-touch {
-    // iPad web
-    #main-outlet-wrapper {
-      // restrict the row height, including when virtual keyboard is open
-      grid-template-rows: calc(
-        var(--chat-vh, 1vh) * 100 - var(--header-offset)
-      );
-      .sidebar-wrapper {
-        // prevents sidebar from overflowing behind the virtual keyboard
-        height: 100%;
-      }
-    }
-
-    // iPad webview
-    .footer-nav-ipad {
-      #main-outlet-wrapper {
-        // restrict the row height, including when virtual keyboard is open
-        grid-template-rows: calc(
-          var(--chat-vh, 1vh) * 100 - calc(var(--header-offset))
-        );
-      }
-    }
-
-    .full-page-chat,
-    .chat-live-pane,
-    #main-outlet {
-      // allows containers to shrink to fit
-      min-height: 0;
-    }
-
-    #main-outlet {
-      // limits height for iPad
-      max-height: calc(
-        100vh - calc(var(--header-offset) + var(--composer-ipad-padding))
-      );
-    }
-  }
-  [data-popper-reference-hidden] {
-    visibility: hidden;
-  }
-}
diff --git a/plugins/chat/assets/stylesheets/common/core-extensions.scss b/plugins/chat/assets/stylesheets/common/core-extensions.scss
index 71c68a54dc4..e9f16af695c 100644
--- a/plugins/chat/assets/stylesheets/common/core-extensions.scss
+++ b/plugins/chat/assets/stylesheets/common/core-extensions.scss
@@ -1,5 +1,5 @@
 .has-full-page-chat {
-  .create-topics-notice,
+  .global-notice,
   .bootstrap-mode-notice {
     display: none;
   }
diff --git a/plugins/chat/assets/stylesheets/common/d-progress-bar.scss b/plugins/chat/assets/stylesheets/common/d-progress-bar.scss
deleted file mode 100644
index 37ade41970b..00000000000
--- a/plugins/chat/assets/stylesheets/common/d-progress-bar.scss
+++ /dev/null
@@ -1,51 +0,0 @@
-// temporary stuff to be moved in core with discourse-loading-slider
-
-.d-progress-bar-container {
-  --loading-width: 80%;
-  --still-loading-width: 90%;
-
-  --still-loading-duration: 10s;
-  --done-duration: 0.4s;
-  --fade-out-duration: 0.4s;
-
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: z("header") + 2000;
-  height: 3px;
-  width: 100%;
-  opacity: 0;
-  transition: opacity var(--fade-out-duration) ease var(--done-duration);
-  background-color: var(--primary-low);
-
-  .d-progress-bar {
-    height: 100%;
-    width: 0%;
-    background-color: var(--tertiary);
-  }
-
-  &.loading,
-  &.still-loading {
-    opacity: 1;
-    transition: opacity 0s;
-  }
-
-  &.loading .d-progress-bar {
-    transition: width var(--loading-duration) ease-in;
-    width: var(--loading-width);
-  }
-
-  &.still-loading .d-progress-bar {
-    transition: width var(--still-loading-duration) linear;
-    width: var(--still-loading-width);
-  }
-
-  &.done .d-progress-bar {
-    transition: width var(--done-duration) ease-out;
-    width: 100%;
-  }
-
-  body.footer-nav-ipad & {
-    top: 49px; // TODO: Share $footer-nav-height from footer-nav.scss
-  }
-}
diff --git a/plugins/chat/assets/stylesheets/common/direct-message-creator.scss b/plugins/chat/assets/stylesheets/common/direct-message-creator.scss
index 02444815adf..c857ae4d8d3 100644
--- a/plugins/chat/assets/stylesheets/common/direct-message-creator.scss
+++ b/plugins/chat/assets/stylesheets/common/direct-message-creator.scss
@@ -40,7 +40,7 @@
     margin: 1px 0.25rem 0.25rem 1px;
     padding: 0.25rem 0.5rem 0.25rem 0.25rem;
     background: var(--primary-very-low);
-    border-radius: 8px;
+    border-radius: var(--d-border-radius-large);
     border: 1px solid var(--primary-300);
     align-items: center;
     display: flex;
@@ -114,7 +114,7 @@
     margin: 0;
     flex-wrap: wrap;
     border-bottom: 1px solid var(--primary-low);
-    box-shadow: shadow("card");
+    box-shadow: var(--shadow-card);
     position: absolute;
     width: 100%;
     z-index: z("dropdown");
@@ -129,7 +129,7 @@
       padding: 0.25em 0.5em;
       margin: 0.25rem;
       align-items: center;
-      border-radius: 4px;
+      border-radius: var(--d-border-radius);
 
       .user-info {
         margin: 0;
@@ -158,7 +158,8 @@
         margin-left: 0.3em;
 
         .emoji {
-          margin-bottom: 0.2em;
+          width: 15px;
+          height: 15px;
         }
       }
     }
@@ -179,7 +180,7 @@
     text-align: center;
     padding: 1rem;
     width: 100%;
-    box-shadow: shadow("card");
+    box-shadow: var(--shadow-card);
     background: var(--secondary);
     margin: 0;
     box-sizing: border-box;
diff --git a/plugins/chat/assets/stylesheets/common/incoming-chat-webhooks.scss b/plugins/chat/assets/stylesheets/common/incoming-chat-webhooks.scss
index 4b75238fcf7..4421a8fa185 100644
--- a/plugins/chat/assets/stylesheets/common/incoming-chat-webhooks.scss
+++ b/plugins/chat/assets/stylesheets/common/incoming-chat-webhooks.scss
@@ -6,7 +6,7 @@
     justify-content: space-between;
     background-color: var(--primary-very-low);
     padding: 1em;
-    border-radius: 6px;
+    border-radius: var(--d-border-radius-large);
     margin-bottom: 1em;
 
     &--details {
diff --git a/plugins/chat/assets/stylesheets/common/index.scss b/plugins/chat/assets/stylesheets/common/index.scss
new file mode 100644
index 00000000000..b94060c5963
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/common/index.scss
@@ -0,0 +1,66 @@
+@import "chat-unread-indicator";
+@import "chat-height-mixin";
+@import "chat-thread-header-buttons";
+@import "base-common";
+@import "sidebar-extensions";
+@import "chat-browse";
+@import "chat-channel";
+@import "chat-channel-card";
+@import "chat-channel-info";
+@import "chat-channel-preview-card";
+@import "chat-channel-settings-saved-indicator";
+@import "chat-channel-title";
+@import "chat-composer-dropdown";
+@import "chat-composer-upload";
+@import "chat-composer-uploads";
+@import "chat-composer";
+@import "chat-composer-button";
+@import "chat-drawer";
+@import "chat-emoji-picker";
+@import "chat-form";
+@import "chat-index";
+@import "chat-mention-warnings";
+@import "chat-message-actions";
+@import "chat-message-collapser";
+@import "chat-message-images";
+@import "chat-message-info";
+@import "chat-message-left-gutter";
+@import "chat-message-separator";
+@import "chat-message-thread-indicator";
+@import "chat-message";
+@import "chat-notices";
+@import "chat-onebox";
+@import "chat-reply";
+@import "chat-replying-indicator";
+@import "chat-selection-manager";
+@import "chat-side-panel";
+@import "chat-skeleton";
+@import "chat-tabs";
+@import "chat-thread";
+@import "chat-side-panel-resizer";
+@import "chat-upload-drop-zone";
+@import "chat-transcript";
+@import "core-extensions";
+@import "dc-filter-input";
+@import "full-page-chat-header";
+@import "incoming-chat-webhooks";
+@import "reviewable-chat-message";
+@import "chat-thread-list-item";
+@import "chat-threads-list";
+@import "chat-composer-separator";
+@import "chat-thread-header";
+@import "chat-thread-list-header";
+@import "chat-thread-unread-indicator";
+@import "chat-thread-participants";
+@import "chat-message-mention-warning";
+@import "chat-message-error";
+@import "chat-message-creator";
+@import "chat-user-avatar";
+@import "chat-modal-new-message";
+@import "chat-modal-archive-channel";
+@import "chat-modal-edit-channel-description";
+@import "chat-modal-create-channel";
+@import "chat-modal-create-channel";
+@import "chat-modal-channel-summary";
+@import "chat-modal-move-message-to-channel";
+@import "chat-scroll-to-bottom";
diff --git a/plugins/chat/assets/stylesheets/sidebar-extensions.scss b/plugins/chat/assets/stylesheets/common/sidebar-extensions.scss
similarity index 94%
rename from plugins/chat/assets/stylesheets/sidebar-extensions.scss
rename to plugins/chat/assets/stylesheets/common/sidebar-extensions.scss
index bc817db6dd0..6d2c572e8f6 100644
--- a/plugins/chat/assets/stylesheets/sidebar-extensions.scss
+++ b/plugins/chat/assets/stylesheets/common/sidebar-extensions.scss
@@ -77,7 +77,7 @@
         }
       }
 
-      .open-draft-channel-page-btn,
+      .open-new-message-btn,
       .open-browse-page-btn,
       .edit-channels-dropdown .select-kit-header,
       .chat-channel-leave-btn {
@@ -136,16 +136,6 @@
 }
 
 .chat-enabled {
-  .sidebar-section-link-suffix.icon {
-    &.urgent svg {
-      color: var(--success);
-    }
-
-    &.unread svg {
-      color: var(--tertiary-med-or-tertiary);
-    }
-  }
-
   .sidebar-section-link-prefix {
     .prefix-image {
       border: 1px solid transparent;
diff --git a/plugins/chat/assets/stylesheets/desktop/desktop.scss b/plugins/chat/assets/stylesheets/desktop/base-desktop.scss
similarity index 60%
rename from plugins/chat/assets/stylesheets/desktop/desktop.scss
rename to plugins/chat/assets/stylesheets/desktop/base-desktop.scss
index 087736187b1..7323f6a67cf 100644
--- a/plugins/chat/assets/stylesheets/desktop/desktop.scss
+++ b/plugins/chat/assets/stylesheets/desktop/base-desktop.scss
@@ -1,8 +1,3 @@
-.chat-drawer {
-  width: 400px;
-  max-width: 100vw;
-}
-
 .user-card,
 .group-card {
   z-index: z("usercard") + 1; // bump up user card
@@ -12,7 +7,7 @@
   &.teams-sidebar-on {
     grid-template-columns: 1fr;
 
-    .chat-live-pane {
+    .chat-channel {
       border-radius: var(--full-page-border-radius);
     }
   }
@@ -24,40 +19,61 @@
     flex-shrink: 0;
   }
 
-  .chat-live-pane {
+  .chat-channel {
     .chat-messages-container {
-      .chat-message {
-        &.is-reply {
-          grid-template-columns: var(--message-left-width) 1fr;
-        }
+      &.has-reply {
+        grid-template-columns: var(--message-left-width) 1fr;
+      }
 
-        .chat-user {
-          width: var(--message-left-width);
-        }
+      .chat-user {
+        width: var(--message-left-width);
       }
     }
   }
 }
 
-.chat-message:not(.user-info-hidden) {
-  padding: 0.65em 1em 0.15em;
-}
-
 .chat-message-text {
-  img:not(.emoji):not(.avatar) {
+  img:not(.emoji):not(.avatar, .onebox-avatar-inline) {
     transition: all 0.6s cubic-bezier(0.165, 0.84, 0.44, 1);
 
     &:hover {
       cursor: pointer;
-      border-radius: 5px;
+      border-radius: var(--d-border-radius);
       box-shadow: 0 2px 5px 0 rgba(var(--always-black-rgb), 0.1),
         0 2px 10px 0 rgba(var(--always-black-rgb), 0.1);
     }
   }
 }
 
-.chat-message.user-info-hidden {
-  padding: 0.15em 1em;
+.chat-message-container:not(.-user-info-hidden) {
+  .chat-message {
+    padding: 0.65rem 1rem 0.15rem;
+  }
+}
+
+.chat-message-container.-user-info-hidden {
+  .chat-message {
+    padding: 0.15rem 1rem;
+  }
+
+  .chat-time {
+    color: var(--secondary-medium);
+    flex-shrink: 0;
+    font-size: var(--font-down-2);
+    margin-top: 0.4em;
+    display: none;
+    width: var(--message-left-width);
+  }
+
+  &:hover {
+    .chat-message-left-gutter__bookmark {
+      display: none;
+    }
+
+    .chat-time {
+      display: block;
+    }
+  }
 }
 
 // Full Page Styling in Core
@@ -72,20 +88,6 @@
   .full-page-chat {
     border-right: 1px solid var(--primary-low);
     border-left: 1px solid var(--primary-low);
-
-    .chat-live-pane {
-      border-radius: unset;
-    }
-
-    .chat-live-pane,
-    .chat-messages-scroll,
-    .chat-message:not(.highlighted):not(.deleted):not(.chat-message-bookmarked) {
-      background-color: transparent;
-    }
-
-    .chat-message:not(.highlighted):not(.deleted):not(.chat-message-bookmarked):hover {
-      background-color: var(--primary-very-low);
-    }
   }
 
   @media screen and (max-width: var(--max-chat-width)) {
@@ -108,22 +110,12 @@
   }
 
   .full-page-chat.teams-sidebar-on {
-    .chat-live-pane {
+    .chat-channel {
       border-radius: 0;
     }
 
-    .chat-live-pane,
-    .chat-messages-scroll,
-    .chat-message:not(.highlighted):not(.deleted):not(.chat-message-bookmarked) {
-      background: transparent;
-    }
-
     .chat-message {
       padding-left: 1em;
-
-      &:hover {
-        background-color: var(--primary-very-low);
-      }
     }
 
     .chat-messages-container .chat-message-deleted {
diff --git a/plugins/chat/assets/stylesheets/desktop/chat-channel-title.scss b/plugins/chat/assets/stylesheets/desktop/chat-channel-title.scss
index 019738fe4d9..c781d127d11 100644
--- a/plugins/chat/assets/stylesheets/desktop/chat-channel-title.scss
+++ b/plugins/chat/assets/stylesheets/desktop/chat-channel-title.scss
@@ -3,6 +3,12 @@
 
   &:hover {
     background: var(--primary-very-low);
-    border-radius: 5px;
+    border-radius: var(--d-border-radius);
+  }
+
+  .chat-channel-title {
+    &__user-info {
+      overflow: hidden;
+    }
   }
 }
diff --git a/plugins/chat/assets/stylesheets/desktop/chat-composer.scss b/plugins/chat/assets/stylesheets/desktop/chat-composer.scss
deleted file mode 100644
index 9ab578cbf85..00000000000
--- a/plugins/chat/assets/stylesheets/desktop/chat-composer.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-.chat-composer-container {
-  .chat-composer {
-    margin: 0.25rem 10px 0 10px;
-  }
-}
diff --git a/plugins/chat/assets/stylesheets/desktop/chat-index-drawer.scss b/plugins/chat/assets/stylesheets/desktop/chat-index-drawer.scss
index 4fa41f81053..809821f2e31 100644
--- a/plugins/chat/assets/stylesheets/desktop/chat-index-drawer.scss
+++ b/plugins/chat/assets/stylesheets/desktop/chat-index-drawer.scss
@@ -4,10 +4,16 @@
     font-size: var(--font-0);
   }
 
+  &.has-scrollbar {
+    .chat-channel-row {
+      margin-right: 0;
+    }
+  }
+
   .chat-channel-row {
     height: 3.6em;
     padding: 0 0.5rem;
-    margin: 0 0 0 0.5rem;
+    margin: 0 0.5rem 0 0.5rem;
 
     &:not(:last-of-type) {
       border-bottom: 1px solid var(--primary-low);
diff --git a/plugins/chat/assets/stylesheets/desktop/chat-index-full-page.scss b/plugins/chat/assets/stylesheets/desktop/chat-index-full-page.scss
index a175d8779dd..3c48c67a52e 100644
--- a/plugins/chat/assets/stylesheets/desktop/chat-index-full-page.scss
+++ b/plugins/chat/assets/stylesheets/desktop/chat-index-full-page.scss
@@ -1,7 +1,7 @@
 .has-full-page-chat:not(.discourse-sidebar) {
   .full-page-chat {
     .channels-list {
-      height: 100%;
+      height: calc(100vh - var(--header-offset));
       border-right: 1px solid var(--primary-low);
       background: var(--primary-very-low);
 
@@ -21,7 +21,6 @@
         height: 2.5em;
         padding: 0 0.5rem;
         margin: 0 0.5rem 0.125rem 0.5rem;
-        border-radius: 0.25em;
         &:hover,
         &.active {
           background-color: var(--primary-low);
diff --git a/plugins/chat/assets/stylesheets/desktop/chat-message-actions.scss b/plugins/chat/assets/stylesheets/desktop/chat-message-actions.scss
index 3d015632e7c..64b2a7382de 100644
--- a/plugins/chat/assets/stylesheets/desktop/chat-message-actions.scss
+++ b/plugins/chat/assets/stylesheets/desktop/chat-message-actions.scss
@@ -1,5 +1,5 @@
-.chat-message-actions[data-popper-reference-hidden],
-.chat-message-actions[data-popper-escaped] {
+.chat-message-actions-container[data-popper-reference-hidden],
+.chat-message-actions-container[data-popper-escaped] {
   visibility: hidden;
   pointer-events: none;
 }
diff --git a/plugins/chat/assets/stylesheets/desktop/chat-message-creator.scss b/plugins/chat/assets/stylesheets/desktop/chat-message-creator.scss
new file mode 100644
index 00000000000..c69516aaab6
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/desktop/chat-message-creator.scss
@@ -0,0 +1,7 @@
+.chat-message-creator {
+  &__row {
+    &.-active {
+      background: var(--tertiary-very-low);
+    }
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/desktop/chat-message-thread-indicator.scss b/plugins/chat/assets/stylesheets/desktop/chat-message-thread-indicator.scss
new file mode 100644
index 00000000000..57a6fadc01d
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/desktop/chat-message-thread-indicator.scss
@@ -0,0 +1,32 @@
+.chat-message-thread-indicator {
+  max-width: 600px;
+  grid-template-areas:
+    "avatar info replies participants"
+    "avatar excerpt excerpt excerpt";
+
+  &__replies-count {
+    display: flex;
+    align-self: center;
+  }
+}
+
+@container (max-width: 400px) {
+  .chat-message-thread-indicator {
+    grid-template-areas:
+      "avatar info info participants"
+      "excerpt excerpt excerpt replies";
+    &__replies-count {
+      align-self: flex-start;
+      grid-area: replies;
+      justify-content: flex-end;
+    }
+    &__last-reply-excerpt {
+      white-space: wrap;
+      display: -webkit-box;
+      -webkit-line-clamp: 2;
+      -webkit-box-orient: vertical;
+      margin-top: 0.5rem;
+      margin-right: 0.25rem;
+    }
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/desktop/chat-message.scss b/plugins/chat/assets/stylesheets/desktop/chat-message.scss
index 8ea9c38357c..ddfea4214c9 100644
--- a/plugins/chat/assets/stylesheets/desktop/chat-message.scss
+++ b/plugins/chat/assets/stylesheets/desktop/chat-message.scss
@@ -1,11 +1,12 @@
 .chat-message-actions {
   .react-btn,
   .reply-btn,
+  .chat-message-thread-btn,
   .bookmark-btn {
     border: 1px solid transparent;
-    border-bottom-color: var(--primary-low);
+    border-bottom-color: var(--primary-300);
     border-radius: 0;
-    border-top-color: var(--primary-low);
+    border-top-color: var(--primary-300);
 
     &:hover {
       background: var(--primary-low);
diff --git a/plugins/chat/assets/stylesheets/desktop/index.scss b/plugins/chat/assets/stylesheets/desktop/index.scss
new file mode 100644
index 00000000000..859b736a081
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/desktop/index.scss
@@ -0,0 +1,10 @@
+@import "base-desktop";
+@import "chat-channel-title";
+@import "chat-composer-uploads";
+@import "chat-index-drawer";
+@import "chat-index-full-page";
+@import "chat-message-actions";
+@import "chat-message";
+@import "chat-message-creator";
+@import "chat-message-thread-indicator";
+@import "sidebar-extensions";
diff --git a/plugins/chat/assets/stylesheets/mixins/chat-reaction.scss b/plugins/chat/assets/stylesheets/mixins/chat-reaction.scss
new file mode 100644
index 00000000000..4d8a75543c8
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/mixins/chat-reaction.scss
@@ -0,0 +1,40 @@
+@mixin chat-reaction {
+  align-items: center;
+  display: inline-flex;
+  padding: 0.3em 0.6em;
+  margin: 1px 0.25em 1px 0;
+  font-size: var(--font-down-2);
+  border-radius: 4px;
+  border: 1px solid var(--primary-300);
+  background: transparent;
+  cursor: pointer;
+  user-select: none;
+  transition: background 0.2s, border-color 0.2s;
+
+  &.reacted {
+    border-color: var(--tertiary-medium);
+    background: var(--tertiary-very-low);
+    color: var(--tertiary-hover);
+
+    &:hover {
+      background: var(--tertiary-low);
+    }
+  }
+
+  &:not(.reacted) {
+    &:hover {
+      background: var(--primary-low);
+      border-color: var(--primary-low-mid);
+    }
+
+    &:focus {
+      background: none;
+    }
+  }
+
+  .emoji {
+    height: 15px;
+    margin-right: 4px;
+    width: auto;
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/mixins/chat-scrollbar.scss b/plugins/chat/assets/stylesheets/mixins/chat-scrollbar.scss
index 0fa99b9fb9f..a0a5d588021 100644
--- a/plugins/chat/assets/stylesheets/mixins/chat-scrollbar.scss
+++ b/plugins/chat/assets/stylesheets/mixins/chat-scrollbar.scss
@@ -1,28 +1,43 @@
-@mixin chat-scrollbar($border: var(--primary-very-low)) {
+@mixin chat-scrollbar() {
   --scrollbarBg: transparent;
   --scrollbarThumbBg: var(--primary-low);
-  --scrollbarWidth: 1.2rem;
+  --scrollbarWidth: 10px;
 
   scrollbar-color: transparent var(--scrollbarBg);
   transition: scrollbar-color 0.25s ease-in-out;
-  transition-delay: 0.5s;
 
+  // chrome, safari
   &::-webkit-scrollbar-thumb {
-    background-color: transparent;
+    background-color: var(--scrollbarThumbBg);
     border-radius: calc(var(--scrollbarWidth) / 2);
-    border: calc(var(--scrollbarWidth) / 4) solid transparent;
+    border: calc(var(--scrollbarWidth) / 4) solid var(--secondary);
   }
-  &:hover {
-    &::-webkit-scrollbar-thumb {
-      border: calc(var(--scrollbarWidth) / 4) solid $border;
-    }
-    scrollbar-color: var(--scrollbarThumbBg) var(--scrollbarBg);
-    &::-webkit-scrollbar-thumb {
-      background-color: var(--scrollbarThumbBg);
-    }
-    transition-delay: 0s;
+
+  &::-webkit-scrollbar-track {
+    background-color: transparent;
   }
+
   &::-webkit-scrollbar {
     width: var(--scrollbarWidth);
   }
+
+  // firefox
+  & {
+    scrollbar-color: var(--scrollbarThumbBg) var(--scrollbarBg);
+    scrollbar-width: thin;
+  }
+
+  &::-moz-scrollbar-thumb {
+    background-color: var(--scrollbarThumbBg);
+    border-radius: calc(var(--scrollbarWidth) / 2);
+    border: calc(var(--scrollbarWidth) / 4) solid var(--secondary);
+  }
+
+  &::-moz-scrollbar-track {
+    background-color: transparent;
+  }
+
+  &::-moz-scrollbar {
+    width: var(--scrollbarWidth);
+  }
 }
diff --git a/plugins/chat/assets/stylesheets/mixins/index.scss b/plugins/chat/assets/stylesheets/mixins/index.scss
new file mode 100644
index 00000000000..82e3451dc32
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/mixins/index.scss
@@ -0,0 +1,2 @@
+@import "chat-scrollbar";
+@import "chat-reaction";
diff --git a/plugins/chat/assets/stylesheets/mobile/mobile.scss b/plugins/chat/assets/stylesheets/mobile/base-mobile.scss
similarity index 71%
rename from plugins/chat/assets/stylesheets/mobile/mobile.scss
rename to plugins/chat/assets/stylesheets/mobile/base-mobile.scss
index ff9c1b60b23..463462f983d 100644
--- a/plugins/chat/assets/stylesheets/mobile/mobile.scss
+++ b/plugins/chat/assets/stylesheets/mobile/base-mobile.scss
@@ -2,17 +2,34 @@
   --channel-list-avatar-size: 38px;
 }
 
-.chat-message:not(.user-info-hidden) {
-  padding-top: 0.75em;
+.chat-message-container:not(.-user-info-hidden) {
+  .chat-message {
+    padding-top: 0.75em;
+  }
 }
 
-body.has-full-page-chat {
+html.has-full-page-chat {
   .footer-nav {
     display: none !important;
   }
 
-  #main-outlet {
+  body #main-outlet {
     padding: 0;
+
+    .main-chat-outlet {
+      .chat-channel {
+        min-width: 0;
+      }
+
+      &.has-side-panel-expanded {
+        grid-template-columns: 1fr;
+        grid-template-areas: "threads";
+
+        .chat-channel {
+          display: none;
+        }
+      }
+    }
   }
 }
 
@@ -30,7 +47,7 @@ body.has-full-page-chat {
     }
   }
 
-  .chat-live-pane {
+  .chat-channel {
     border-radius: 0;
     padding: 0;
   }
@@ -45,10 +62,6 @@ body.has-full-page-chat {
     height: 50px;
     min-height: 50px;
   }
-
-  .chat-messages-scroll {
-    padding: 0 10px;
-  }
 }
 
 .sidebar-container .channels-list .chat-channel-divider {
@@ -77,13 +90,6 @@ body.has-full-page-chat {
   }
 }
 
-html.has-full-page-chat body {
-  #main-outlet-wrapper {
-    // restricts the height of the page
-    grid-template-rows: calc(var(--chat-vh, 1vh) * 100 - var(--header-offset));
-  }
-}
-
 .chat-message-separator {
   margin-left: 0;
 }
@@ -98,5 +104,8 @@ html.has-full-page-chat body {
         color: var(--primary-medium);
       }
     }
+    .chat-channel-unread-indicator {
+      border-color: var(--primary-very-low);
+    }
   }
 }
diff --git a/plugins/chat/assets/stylesheets/mobile/chat-channel.scss b/plugins/chat/assets/stylesheets/mobile/chat-channel.scss
new file mode 100644
index 00000000000..5eabe9eec06
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/mobile/chat-channel.scss
@@ -0,0 +1,5 @@
+.chat-channel {
+  .chat-messages-scroll {
+    padding-bottom: 5px;
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/mobile/chat-composer-upload.scss b/plugins/chat/assets/stylesheets/mobile/chat-composer-upload.scss
new file mode 100644
index 00000000000..b99e9877373
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/mobile/chat-composer-upload.scss
@@ -0,0 +1,11 @@
+.chat-composer-upload {
+  &__remove-btn {
+    visibility: visible;
+    background: rgba(var(--always-black-rgb), 0.9);
+    border-radius: 100%;
+
+    // overwrite ios style
+    font-size: var(--font-down-2) !important;
+    padding: 5px !important;
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/mobile/chat-composer.scss b/plugins/chat/assets/stylesheets/mobile/chat-composer.scss
index edbc974c9dd..d6334192c33 100644
--- a/plugins/chat/assets/stylesheets/mobile/chat-composer.scss
+++ b/plugins/chat/assets/stylesheets/mobile/chat-composer.scss
@@ -1,7 +1,7 @@
-.chat-composer-container {
-  padding: 0;
-
-  .chat-composer {
-    margin: 0.5rem 10px 0 10px;
+.chat-composer {
+  &__input {
+    .ios-device & {
+      background-color: transparent;
+    }
   }
 }
diff --git a/plugins/chat/assets/stylesheets/mobile/chat-emoji-picker.scss b/plugins/chat/assets/stylesheets/mobile/chat-emoji-picker.scss
new file mode 100644
index 00000000000..c169432dcce
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/mobile/chat-emoji-picker.scss
@@ -0,0 +1,26 @@
+.chat-channel-message-emoji-picker-connector {
+  position: relative;
+
+  .chat-emoji-picker {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    height: 50vh;
+    width: 100%;
+    box-shadow: var(--shadow-card);
+    z-index: z("header") + 2;
+    max-width: 100vw;
+    box-sizing: border-box;
+
+    &__backdrop {
+      position: fixed;
+      top: 0;
+      left: 0;
+      right: 0;
+      bottom: 0;
+      background: rgba(var(--always-black-rgb), 0.75);
+      z-index: z("header") + 1;
+    }
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/mobile/chat-index.scss b/plugins/chat/assets/stylesheets/mobile/chat-index.scss
index 7659920f80a..c4f7f696131 100644
--- a/plugins/chat/assets/stylesheets/mobile/chat-index.scss
+++ b/plugins/chat/assets/stylesheets/mobile/chat-index.scss
@@ -1,4 +1,5 @@
 @import "common/foundation/mixins";
+
 .full-page-chat {
   overflow: hidden; //prevents double scroll
 
@@ -7,24 +8,14 @@
     padding-bottom: 6rem;
     box-sizing: border-box;
 
-    @media (hover: none) {
-      .chat-channel-row:hover {
-        background: transparent;
-      }
-
-      .chat-channel-row:active {
-        background: var(--primary-low);
-      }
-    }
-
     .channels-list-container {
       background: var(--secondary);
     }
 
     .chat-channel-row {
       height: 4em;
-      margin: 0 1.5rem;
-      padding: 0;
+      margin: 0;
+      padding: 0 1.5rem;
       border-radius: 0;
       border-bottom: 1px solid var(--primary-low);
 
@@ -77,34 +68,12 @@
       &__category-badge {
         font-size: var(--font-up-1);
       }
-    }
-  }
 
-  .btn-floating.open-draft-channel-page-btn {
-    position: absolute;
-    background: var(--tertiary);
-    bottom: 2.5rem;
-    right: 2.5rem;
-    border-radius: 50%;
-    font-size: var(--font-up-4);
-    padding: 1rem;
-    transition: transform 0.25s ease, box-shadow 0.25s ease;
-    z-index: z("usercard");
-    box-shadow: 0px 5px 5px -1px rgba(0, 0, 0, 0.25);
-
-    .d-icon {
-      color: var(--primary-very-low);
-    }
-
-    &:active {
-      box-shadow: 0px 0px 5px -1px rgba(0, 0, 0, 0.25);
-      transform: scale(0.9);
-    }
-
-    &:focus {
-      @include default-focus;
-      border-color: var(--quaternary);
-      outline-color: var(--quaternary);
+      &__user-status-message {
+        flex-shrink: 3;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
     }
   }
 }
diff --git a/plugins/chat/assets/stylesheets/mobile/chat-message-actions.scss b/plugins/chat/assets/stylesheets/mobile/chat-message-actions.scss
index eac83541f83..cf313273d12 100644
--- a/plugins/chat/assets/stylesheets/mobile/chat-message-actions.scss
+++ b/plugins/chat/assets/stylesheets/mobile/chat-message-actions.scss
@@ -5,9 +5,11 @@
   right: 0;
   display: flex;
   flex-direction: column;
-  border-radius: 8px 8px 0 0;
-  margin: 0 2px;
-  transition: bottom 0.2s ease;
+  margin: 0 5px;
+  transition: bottom 0.2s cubic-bezier(0.4, 0, 0.2, 1),
+    visibility cubic-bezier(0.4, 0, 0.2, 1);
+  visibility: hidden;
+  box-sizing: border-box;
 
   .selected-message-container {
     padding: 0.5em 0.5em 1em 0.5em;
@@ -19,9 +21,10 @@
     padding: 0.5em;
     border: 1px solid var(--primary-low);
     box-shadow: 0 0 4px rgba(0, 0, 0, 0.125);
-    border-radius: 8px;
 
     .selected-message-reply {
+      margin-left: 5px;
+
       &:not(.is-expanded) {
         @include ellipsis;
       }
@@ -75,10 +78,15 @@
 
     .chat-message-reaction,
     .reply-btn,
+    .chat-message-thread-btn,
     .react-btn,
     .bookmark-btn {
       flex-grow: 1;
       height: 42px;
+
+      &:active {
+        background: var(--primary-low);
+      }
     }
 
     .bookmark-btn,
@@ -90,7 +98,6 @@
     }
 
     .reply-btn {
-      border-radius: 3px;
       .d-icon {
         font-size: var(--font-up-4);
       }
@@ -109,14 +116,15 @@
       border-bottom: 1px solid var(--primary-low);
       width: 100%;
       list-style: none;
-      padding-bottom: 0.25em;
-      margin-bottom: 0.25em;
+      padding: 0.25em 0;
       display: flex;
 
+      &:active {
+        background: var(--primary-low);
+      }
+
       &:last-child {
-        border: 0;
-        margin: 0;
-        padding: 0;
+        border-bottom: 0;
       }
 
       .chat-message-action {
@@ -143,7 +151,7 @@
   height: 100%;
   width: 100%;
   z-index: z("header") + 1;
-  transition: background-color 0.2s ease;
+  transition: background-color 0.4s ease-in;
 
   .collapse-area {
     width: 100%;
@@ -151,10 +159,11 @@
   }
 
   &.fade-in {
-    background-color: rgba(0, 0, 0, 0.35);
+    background: rgba(var(--always-black-rgb), 0.6);
 
     .chat-message-actions {
-      bottom: 0;
+      bottom: 0px;
+      visibility: visible;
     }
   }
 }
diff --git a/plugins/chat/assets/stylesheets/mobile/chat-message-creator.scss b/plugins/chat/assets/stylesheets/mobile/chat-message-creator.scss
new file mode 100644
index 00000000000..5f9b7ad18f8
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/mobile/chat-message-creator.scss
@@ -0,0 +1,40 @@
+.chat-message-creator {
+  &__open-dm-btn {
+    width: 100%;
+    max-width: 100%;
+  }
+
+  &__row {
+    padding-block: 0.5rem;
+  }
+
+  .chat-channel-title__name,
+  .chat-user-display-name {
+    font-size: var(--font-up-1);
+  }
+
+  .chat-channel-title__category-badge {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding-inline: 2px;
+    width: 24px;
+    height: 24px;
+
+    svg:not(.chat-channel-title__restricted-category-icon) {
+      height: inherit;
+      width: inherit;
+    }
+  }
+
+  .chat-user-avatar {
+    &__container {
+      padding: 0;
+    }
+    img {
+      width: 28px;
+      height: 28px;
+      box-sizing: border-box;
+    }
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/mobile/chat-message-thread-indicator.scss b/plugins/chat/assets/stylesheets/mobile/chat-message-thread-indicator.scss
new file mode 100644
index 00000000000..ff8614ed93c
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/mobile/chat-message-thread-indicator.scss
@@ -0,0 +1,24 @@
+.chat-message-thread-indicator {
+  grid-template-areas:
+    "avatar info info participants"
+    "excerpt excerpt excerpt replies";
+
+  .chat-thread-participants {
+    .avatar {
+      width: 22px;
+      height: 22px;
+    }
+  }
+
+  &__last-reply-excerpt {
+    white-space: wrap;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    margin-top: 0.5rem;
+    margin-right: 0.25rem;
+  }
+  &__replies-count {
+    grid-area: replies;
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/mobile/chat-message.scss b/plugins/chat/assets/stylesheets/mobile/chat-message.scss
index c3517ab9858..3e66d09af4a 100644
--- a/plugins/chat/assets/stylesheets/mobile/chat-message.scss
+++ b/plugins/chat/assets/stylesheets/mobile/chat-message.scss
@@ -1,10 +1,44 @@
-.chat-message *,
-.chat-composer-row,
-.chat-reply,
-.replying-text {
-  @include unselectable;
-}
+.mobile-view.has-full-page-chat {
+  &.disable-message-actions-touch {
+    .chat-message-actions {
+      > * {
+        pointer-events: none;
+      }
+    }
+  }
 
-.chat-message-container {
-  transform: translateZ(0);
+  #skip-link {
+    @include user-select(none);
+  }
+
+  #skip-link,
+  .d-header,
+  .chat-message-actions-mobile-outlet,
+  .chat-channel,
+  .chat-thread {
+    > * {
+      @include user-select(none);
+    }
+  }
+
+  .chat-message-container {
+    transition: transform 400ms;
+    transform: scale(1);
+
+    &.-active {
+      animation: scale-animation 400ms;
+    }
+  }
+
+  @keyframes scale-animation {
+    0% {
+      transform: scale(1);
+    }
+    80% {
+      transform: scale(0.95);
+    }
+    100% {
+      transform: scale(1);
+    }
+  }
 }
diff --git a/plugins/chat/assets/stylesheets/mobile/chat-modal-thread-settings.scss b/plugins/chat/assets/stylesheets/mobile/chat-modal-thread-settings.scss
new file mode 100644
index 00000000000..db511f4e7d0
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/mobile/chat-modal-thread-settings.scss
@@ -0,0 +1,9 @@
+.modal-chat-thread-settings {
+  .modal-inner-container {
+    width: 98%;
+  }
+
+  &__title-input {
+    width: 100%;
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/mobile/chat-selection-manager.scss b/plugins/chat/assets/stylesheets/mobile/chat-selection-manager.scss
index 97f0643313d..82d69177b03 100644
--- a/plugins/chat/assets/stylesheets/mobile/chat-selection-manager.scss
+++ b/plugins/chat/assets/stylesheets/mobile/chat-selection-manager.scss
@@ -1,8 +1,9 @@
 .chat-selection-management {
-  .chat-selection-management-buttons {
+  &__buttons {
     display: flex;
     flex-direction: column;
     width: 100%;
+    padding-bottom: env(safe-area-inset-bottom);
 
     .cancel-btn {
       margin-left: initial;
@@ -10,6 +11,10 @@
 
     .btn {
       margin-bottom: 0.25em;
+
+      &:last-child {
+        margin-bottom: 0;
+      }
     }
   }
 }
diff --git a/plugins/chat/assets/stylesheets/mobile/chat-side-panel.scss b/plugins/chat/assets/stylesheets/mobile/chat-side-panel.scss
new file mode 100644
index 00000000000..916cd6bbef6
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/mobile/chat-side-panel.scss
@@ -0,0 +1,3 @@
+.chat-side-panel {
+  border-left: 0;
+}
diff --git a/plugins/chat/assets/stylesheets/mobile/chat-thread.scss b/plugins/chat/assets/stylesheets/mobile/chat-thread.scss
new file mode 100644
index 00000000000..7659acf76b8
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/mobile/chat-thread.scss
@@ -0,0 +1,9 @@
+.chat-thread {
+  &__body {
+    margin: 0 1px 0 0;
+  }
+
+  .chat-messages-scroll {
+    padding: 10px 10px 0 10px;
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/mobile/chat-threads-list.scss b/plugins/chat/assets/stylesheets/mobile/chat-threads-list.scss
new file mode 100644
index 00000000000..ddc9ec0e52a
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/mobile/chat-threads-list.scss
@@ -0,0 +1,11 @@
+.chat-thread-list {
+  &__items {
+    .chat-thread-list-item {
+      margin: 0.5rem;
+    }
+
+    &__no-threads {
+      margin: 0.5rem;
+    }
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/mobile/index.scss b/plugins/chat/assets/stylesheets/mobile/index.scss
new file mode 100644
index 00000000000..f9fdace3e91
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/mobile/index.scss
@@ -0,0 +1,16 @@
+@import "base-mobile";
+@import "chat-channel-info";
+@import "chat-channel";
+@import "chat-composer";
+@import "chat-index";
+@import "chat-message-actions";
+@import "chat-message";
+@import "chat-selection-manager";
+@import "chat-emoji-picker";
+@import "chat-composer-upload";
+@import "chat-side-panel";
+@import "chat-thread";
+@import "chat-threads-list";
+@import "chat-modal-thread-settings";
+@import "chat-message-thread-indicator";
+@import "chat-message-creator";
diff --git a/plugins/chat/config/locales/client.ar.yml b/plugins/chat/config/locales/client.ar.yml
index c91cb1329ac..64608803d76 100644
--- a/plugins/chat/config/locales/client.ar.yml
+++ b/plugins/chat/config/locales/client.ar.yml
@@ -38,13 +38,6 @@ ar:
       browse_all_channels: "استعراض كل القنوات"
       move_to_channel:
         title: "نقل الرسائل إلى القناة"
-        instructions:
-          zero: "أنت تنقل <strong>%{count}</strong> رسائل. حدِّد القناة المستهدفة. سيتم إنشاء رسالة كعنصر نائب في قناة <strong>%{channelTitle}</strong> للإشارة إلى أن هذه الرسالة قد تم نقلها."
-          one: "أنت تنقل رسالة واحدة (<strong>%{count}</strong>). حدِّد القناة المستهدفة. سيتم إنشاء رسالة كعنصر نائب في قناة <strong>%{channelTitle}</strong> للإشارة إلى أن هذه الرسالة قد تم نقلها."
-          two: "أنت تنقل رسالتين (<strong>%{count}</strong>). حدِّد القناة المستهدفة. سيتم إنشاء رسالة كعنصر نائب في قناة <strong>%{channelTitle}</strong> للإشارة إلى أن هذه الرسالة قد تم نقلها."
-          few: "أنت تنقل <strong>%{count}</strong> رسائل. حدِّد القناة المستهدفة. سيتم إنشاء رسالة كعنصر نائب في قناة <strong>%{channelTitle}</strong> للإشارة إلى أن هذه الرسالة قد تم نقلها."
-          many: "أنت تنقل <strong>%{count}</strong> رسائل. حدِّد القناة المستهدفة. سيتم إنشاء رسالة كعنصر نائب في قناة <strong>%{channelTitle}</strong> للإشارة إلى أن هذه الرسالة قد تم نقلها."
-          other: "أنت تنقل <strong>%{count}</strong> رسائل. حدِّد القناة المستهدفة. سيتم إنشاء رسالة كعنصر نائب في قناة <strong>%{channelTitle}</strong> للإشارة إلى أن هذه الرسالة قد تم نقلها."
         confirm_move: "نقل الرسائل"
       channel_settings:
         title: "إعدادات القناة"
@@ -75,7 +68,6 @@ ar:
         instructions: "يمنع إغلاق القناة المستخدمين من غير فريق العمل من إرسال رسائل جديدة أو تعديل الرسائل الحالية. هل تريد بالتأكيد إغلاق هذه القناة؟"
       channel_delete:
         title: "حذف القناة"
-        instructions: "<p>يحذف قناة <strong>%{name}</strong> وسجل الدردشة. سيتم حذف جميع الرسائل والبيانات ذات الصلة، مثل التفاعلات والتحميلات نهائيًا. إذا كنت ترغب في الحفاظ على سجل القناة وإيقاف تشغيلها، فقد ترغب في أرشفة القناة بدلًا من ذلك.</p> <p>هل تريد بالتأكيد المتابعة إلى <strong>الحذف النهائي</strong> للقناة؟ للتأكيد، اكتب اسم القناة في المربع أدناه.</p>"
         confirm: "أتفهم العواقب، احذف القناة"
         confirm_channel_name: "أدخل اسم القناة"
         process_started: "لقد بدأت عملية حذف القناة. سيتم إغلاق هذا النموذج بعد قليل، ولن يصبح بإمكانك رؤية القناة المحذوفة في أي مكان."
@@ -86,7 +78,6 @@ ar:
       close: "إغلاق"
       collapse: "طي ساحب الدردشة"
       confirm_flag: "هل تريد بالتأكيد الإبلاغ عن رسالة %{username}؟"
-      deleted: "تم حذف رسالة. [view]"
       hidden: "تم حذف إحدى الرسائل. [view]"
       delete: "حذف"
       edited: "تم التعديل"
@@ -101,6 +92,8 @@ ar:
         never: "أبدًا"
         title: "إشعارات البريد الإلكتروني"
         when_away: "عندما أكون غائبًا فقط"
+      header_indicator_preference:
+        never: "أبدًا"
       enable: "تفعيل الدردشة"
       flag: "الإبلاغ"
       emoji: "إدراج رمز تعبيري"
@@ -110,16 +103,11 @@ ar:
       in_reply_to: "ردًا على"
       heading: "الدردشة"
       join: "الانضمام"
-      new_messages: "رسائل جديدة"
+      last_visit: "آخر زيارة"
+      summarization:
+        summarize: "تلخيص"
       mention_warning:
         dismiss: "تجاهل"
-        cannot_see:
-          zero: "لا يمكن للمستخدم %{username} و%{others} مستخدم آخر الوصول إلى هذه القناة ولن يتلقوا إشعارات."
-          one: "لا يمكن للمستخدم %{username} ومستخدم (%{others}) آخر الوصول إلى هذه القناة ولن يتلقيا إشعارات."
-          two: "لا يمكن للمستخدم %{username} ومستخدمَين (%{others}) آخرين الوصول إلى هذه القناة ولن يتلقوا إشعارات."
-          few: "لا يمكن للمستخدم %{username} و%{others} مستخدمين آخر الوصول إلى هذه القناة ولن يتلقوا إشعارات."
-          many: "لا يمكن للمستخدم %{username} و%{others} مستخدمًا آخر الوصول إلى هذه القناة ولن يتلقوا إشعارات."
-          other: "لا يمكن للمستخدم %{username} و%{others} مستخدم آخر الوصول إلى هذه القناة ولن يتلقوا إشعارات."
         invitations_sent:
           zero: "تم إرسال دعوات"
           one: "تم إرسال دعوة"
@@ -128,70 +116,10 @@ ar:
           many: "تم إرسال دعوات"
           other: "تم إرسال دعوات"
         invite: "دعوة إلى القناة"
-        without_membership:
-          zero: "لم ينضم %{username} إلى هذه القناة."
-          one: "لم ينضم %{username} و%{others} مستخدم آخر إلى هذه القناة."
-          two: "لم ينضم %{username} ومستخدمان (%{others}) آخران إلى هذه القناة."
-          few: "لم ينضم %{username} و%{others} مستخدمين آخرين إلى هذه القناة."
-          many: "لم ينضم %{username} و%{others} مستخدمًا آخر إلى هذه القناة."
-          other: "لم ينضم %{username} و%{others} مستخدم آخر إلى هذه القناة."
-        group_mentions_disabled:
-          zero: "لا تسمح المجموعة %{group_name} و%{others} مجموعة أخرى بالإشارات."
-          one: "لا تسمح المجموعة %{group_name} بالإشارات."
-          two: "لا تسمح المجموعة %{group_name} ومجموعتان (%{others}) أخرتان بالإشارات."
-          few: "لا تسمح المجموعة %{group_name} و%{others} مجموعات أخرى بالإشارات."
-          many: "لا تسمح المجموعة %{group_name} و%{others} مجموعةً أخرى بالإشارات."
-          other: "لا تسمح المجموعة %{group_name} و%{others} مجموعة أخرى بالإشارات."
-        too_many_members:
-          zero: "تحتوي المجموعة %{group_name} و%{others} مجموعة أخرى على أعضاء كثيرين. لم يتلقَّ أحد الإشعارات"
-          one: "تحتوي المجموعة %{group_name} ومجموعة (%{others}) أخرى على أعضاء كثيرين. لم يتلقَّ أحد الإشعارات"
-          two: "تحتوي المجموعة %{group_name} ومجموعتان (%{others}) أخرتان على أعضاء كثيرين. لم يتلقَّ أحد الإشعارات"
-          few: "تحتوي المجموعة %{group_name} و%{others} مجموعات أخرى على أعضاء كثيرين. لم يتلقَّ أحد الإشعارات"
-          many: "تحتوي المجموعة %{group_name} و%{others} مجموعةً أخرى على أعضاء كثيرين. لم يتلقَّ أحد الإشعارات"
-          other: "تحتوي المجموعة %{group_name} و%{others} مجموعة أخرى على أعضاء كثيرين. لم يتلقَّ أحد الإشعارات"
-        warning_multiple:
-          zero: "%{count} آخر"
-          one: "%{count} آخر"
-          two: "%{count} آخران"
-          few: "%{count} آخرين"
-          many: "%{count} آخرين"
-          other: "%{count} آخرين"
         groups:
           header:
             some: "لن يتلقى بعض المستخدمين الإشعارات"
             all: "لن يتلقى أحد الإشعارات"
-          unreachable:
-            zero: "لا تسمح المجموعة @%{group} و@%{group_2} بالإشارات"
-            one: "لا تسمح المجموعة @%{group} بالإشارات"
-            two: "لا تسمح المجموعة @%{group} و@%{group_2} بالإشارات"
-            few: "لا تسمح المجموعة @%{group} و@%{group_2} بالإشارات"
-            many: "لا تسمح المجموعة @%{group} و@%{group_2} بالإشارات"
-            other: "لا تسمح المجموعة @%{group} و@%{group_2} بالإشارات"
-          unreachable_multiple: "لا تسمح المجموعة @%{group} و%{count} من المجموعات الأخرى بالإشارات"
-          too_many_members:
-            zero: "تتجاوز الإشارة إلى @%{group} أو @%{group_2} حد الإشعارات البالغ %{notification_limit} من %{limit}"
-            one: "تتجاوز الإشارة إلى @%{group} حد الإشعارات البالغ %{notification_limit} من %{limit}"
-            two: "تتجاوز الإشارة إلى @%{group} أو @%{group_2} حد الإشعارات البالغ %{notification_limit} من %{limit}"
-            few: "تتجاوز الإشارة إلى @%{group} أو @%{group_2} حد الإشعارات البالغ %{notification_limit} من %{limit}"
-            many: "تتجاوز الإشارة إلى @%{group} أو @%{group_2} حد الإشعارات البالغ %{notification_limit} من %{limit}"
-            other: "تتجاوز الإشارة إلى @%{group} أو @%{group_2} حد الإشعارات البالغ %{notification_limit} من %{limit}"
-          too_many_members_multiple: "تتجاوز هذه المجموعات البالغ عددها %{count} حد الإشعارات البالغ %{notification_limit} من %{limit}"
-          users_limit:
-            zero: "%{count} مستخدم"
-            one: "مستخدم واحد (%{count})"
-            two: "مستخدمان (%{count})"
-            few: "%{count} مستخدمين"
-            many: "%{count} مستخدمًا"
-            other: "%{count} مستخدم"
-          notification_limit: "حد الإشعارات"
-        too_many_mentions: "تتجاوز هذه الرسالة حد الإشعارات البالغ %{notification_limit} من %{limit}"
-        mentions_limit:
-          zero: "%{count} إشارة"
-          one: "إشارة واحدة (%{count})"
-          two: "إشارتان (%{count})"
-          few: "%{count} إشارات"
-          many: "%{count} إشارةً"
-          other: "%{count} إشارة"
       aria_roles:
         header: "رأس الدردشة"
         composer: "أداة إنشاء الدردشة"
@@ -208,10 +136,7 @@ ar:
       close_full_page: "إغلاق الدردشة في وضع الشاشة الكاملة"
       open_message: "فتح رسالة في الدردشة"
       placeholder_self: "تدوين شيء ما"
-      placeholder_others: "الدردشة مع %{messageRecipient}"
-      placeholder_new_message_disallowed: "القناة %{status}، لا يمكنك إرسال رسائل جديدة الآن."
       placeholder_silenced: "لا يمكنك إرسال رسائل في الوقت الحالي."
-      placeholder_start_conversation: ابدأ محادثة مع %{usernames}
       remove_upload: "إزالة ملف"
       react: "التفاعل برمز تعبيري"
       reply: "رد"
@@ -227,7 +152,6 @@ ar:
       restore: "استعادة الرسالة المحذوفة"
       save: "حفظ"
       select: "تحديد"
-      silence: "كتم المستخدم"
       return_to_list: "العودة إلى قائمة القنوات"
       scroll_to_bottom: "التمرير إلى الأسفل"
       scroll_to_new_messages: "عرض الرسائل الجديدة"
@@ -287,10 +211,8 @@ ar:
           about: نبذة
           members: الأعضاء
           settings: الإعدادات
-      channel_edit_name_modal:
-        title: تعديل الاسم
-        input_placeholder: أضِف اسمًا
-        description: أدخل اسمًا وصفيًا قصيرًا لقناتك
+      new_message_modal:
+        no_items: "لا توجد عناصر"
       channel_edit_description_modal:
         title: تعديل الوصف
         input_placeholder: أضِف وصفًا
@@ -300,9 +222,6 @@ ar:
         prefix: "إلى:"
         no_results: لا توجد نتائج
         selected_user_title: "إلغاء تحديد %{username}"
-      channel_selector:
-        title: "الانتقال إلى القناة"
-        no_channels: "لا توجد قنوات تطابق بحثك"
       channel:
         no_memberships: لا يوجد أعضاء في هذه القناة
         no_memberships_found: لم يتم العثور على أعضاء
@@ -316,26 +235,10 @@ ar:
       create_channel:
         auto_join_users:
           public_category_warning: "%{category} هي فئة عامة. هل تريد إضافة كل المستخدمين النشطين مؤخرًا إلى هذه القناة؟"
-          warning_groups:
-            zero: هل تريد إضافة %{members_count} مستخدمًا نشطًا مؤخرًا من %{group} و%{group_2}؟
-            one: هل تريد إضافة مستخدم واحد (%{members_count}) نشط مؤخرًا من %{group}؟
-            two: هل تريد إضافة مستخدمين (%{members_count}) نشطين مؤخرًا من %{group} و%{group_2}؟
-            few: هل تريد إضافة %{members_count} مستخدمين نشطين مؤخرًا من %{group} و%{group_2}؟
-            many: هل تريد إضافة %{members_count} مستخدمًا نشطًا مؤخرًا من %{group} و%{group_2}؟
-            other: هل تريد إضافة %{members_count} مستخدمًا نشطًا مؤخرًا من %{group} و%{group_2}؟
-          warning_multiple_groups: هل تريد إضافة %{members_count} من المستخدمين من %{group_1} و%{count} أخرى؟
         choose_category:
           label: "اختيار فئة"
           none: "اختر واحدة..."
           default_hint: إدارة الوصول بالانتقال إلى <a href=%{link} target="_blank">%{category} إعدادات الأمان</a>
-          hint_groups:
-            zero: سيحظى المستخدمون في %{hint} و%{hint_2} بإمكانية الوصول إلى هذه القناة حسب <a href=%{link} target="_blank">إعدادات الأمان</a>
-            one: سيحظى المستخدمون في %{hint} بإمكانية الوصول إلى هذه القناة حسب <a href=%{link} target="_blank">إعدادات الأمان</a>
-            two: سيحظى المستخدمون في %{hint} و%{hint_2} بإمكانية الوصول إلى هذه القناة حسب <a href=%{link} target="_blank">إعدادات الأمان</a>
-            few: سيحظى المستخدمون في %{hint} و%{hint_2} بإمكانية الوصول إلى هذه القناة حسب <a href=%{link} target="_blank">إعدادات الأمان</a>
-            many: سيحظى المستخدمون في %{hint} و%{hint_2} بإمكانية الوصول إلى هذه القناة حسب <a href=%{link} target="_blank">إعدادات الأمان</a>
-            other: سيحظى المستخدمون في %{hint} و%{hint_2} بإمكانية الوصول إلى هذه القناة حسب <a href=%{link} target="_blank">إعدادات الأمان</a>
-          hint_multiple_groups: سيحظى المستخدمون في %{hint_1} و%{count} من المجموعات الأخرى بإمكانية الوصول إلى هذه القناة حسب <a href=%{link} target="_blank">إعدادات الأمان</a>
         create: "إنشاء قناة"
         description: "الوصف (اختياري)"
         name: "اسم القناة"
@@ -348,15 +251,12 @@ ar:
         type: "رسالة دردشة"
       reactions:
         only_you: "لقد تفاعلت باستخدام :%{emoji}:"
-        and_others: "لقد تفاعلت أنت و%{usernames} باستخدام :%{emoji}:"
-        only_others: "لقد تفاعل %{usernames} باستخدام :%{emoji}:"
-        others_and_more: "تفاعل %{usernames} و%{more} من المستخدمين باستخدام :%{emoji}:"
-        you_others_and_more: "لقد تفاعلت أنت و%{usernames} و%{more} من المستخدمين الآخرين باستخدام :%{emoji}:"
       composer:
         toggle_toolbar: "تشغيل شريط الأدوات"
         italic_text: "نص بارز"
         bold_text: "نص بارز"
         code_text: "نص رمز برمجي"
+        send: "إرسال"
       quote:
         original_channel: 'تم إرساله في الأساس في <a href="%{channelLink}">%{channel}</a>'
         copy_success: "تم نسخ اقتباس الدردشة إلى الحافظة"
@@ -368,14 +268,13 @@ ar:
         channel_wide_mentions_label: "السماح بإشارات @الكل و@هنا"
         channel_wide_mentions_description: "السماح للمستخدمين بإرسال إشعارات إلى جميع أعضاء #%{channel} باستخدام @الكل، أو المستخدمين النشطين في الوقت الحالي فقط باستخدام @هنا"
         auto_join_users_label: "إضافة المستخدمين تلقائيًا"
-        auto_join_users_info: "التحقق كل ساعة من المستخدمين الذين كانوا نشطين في الأشهر الثلاثة الماضية، وإضافتهم إلى هذه القناة إذا كان لديهم إذن الوصول إلى الفئة %{category}."
-        enable_auto_join_users: "إضافة كل المستخدمين النشطين مؤخرًا بشكلٍ تلقائي"
         auto_join_users_warning: "سينضم كل المستخدمين الذين ليسوا أعضاءً في هذه القناة ولديهم وصول إلى فئة %{category}. هل أنت متأكد؟"
         desktop_notification_level: "إشعارات سطح المكتب"
         follow: "الانضمام"
         followed: "انضم"
         mobile_notification_level: "الإشعارات الفورية للجوَّال"
         mute: "كتم القناة"
+        threading_disabled: "متوقفة"
         muted_on: "تشغيل"
         muted_off: "إيقاف"
         notifications: "الإشعارات"
@@ -384,7 +283,6 @@ ar:
         saved: "تم الحفظ"
         unfollow: "مغادرة"
         admin_title: "مسؤول"
-        retention_info: "سيتم الاحتفاظ بسجل الدردشة لمدة %{days} من الأيام."
       admin:
         title: "الدردشة"
       direct_messages:
@@ -465,9 +363,6 @@ ar:
           few: "%{commaSeparatedUsernames} و%{count} آخرون يكتبون"
           many: "%{commaSeparatedUsernames} و%{count} آخرون يكتبون"
           other: "%{commaSeparatedUsernames} و%{count} آخرون يكتبون"
-      retention_reminders:
-        public: "يتم الاحتفاظ بسجل القناة لمدة %{days} من الأيام."
-        dm: "يتم الاحتفاظ بسجل الدردشة الشخصية لمدة %{days} من الأيام."
       flags:
         off_topic: "هذه الرسالة ليست ذات صلة بالمناقشة الحالية كما هو محدَّد في عنوان القناة، وربما ينبغي نقلها إلى مكانٍ آخر."
         inappropriate: "تحتوي هذه الرسالة على محتوى قد يعتبره الشخص العاقل مسيئًا أو مهينًا أو ينتهك <a href=\"%{basePath}/guidelines\">إرشادات المجتمع</a> لدينا."
@@ -489,6 +384,29 @@ ar:
         symbols: "الرموز"
         search_placeholder: "البحث باسم الرمز التعبيري والاسم المستعار..."
         no_results: "لا توجد نتائج"
+      thread:
+        title: "العنوان"
+        replies:
+          zero: "%{count} رد"
+          one: "رد واحد (%{count})"
+          two: "ردَّان (%{count})"
+          few: "%{count} ردود"
+          many: "%{count} ردًا"
+          other: "%{count} رد"
+        settings: "الإعدادات"
+        last_reply: "آخر رد"
+        notifications:
+          regular:
+            title: "طبيعية"
+          tracking:
+            title: "التتبُّع"
+        participants_other_count:
+          zero: "+%{count}"
+          one: "+%{count}"
+          two: "+%{count}"
+          few: "+%{count}"
+          many: "+%{count}"
+          other: "+%{count}"
       draft_channel_screen:
         header: "رسالة جديدة"
         cancel: "إلغاء"
@@ -532,10 +450,6 @@ ar:
     review:
       transcript:
         view: "عرض نص الرسائل السابقة"
-      types:
-        reviewable_chat_message:
-          title: "رسالة دردشة تم الإبلاغ عنها"
-          flagged_by: "تم الإبلاغ بواسطة"
     keyboard_shortcuts_help:
       chat:
         title: "الدردشة"
@@ -570,3 +484,7 @@ ar:
           few: "إشعارات الدردشة - %{count} إشعارات غير مقروءة"
           many: "إشعارات الدردشة - %{count} إشعارًا غير مقروء"
           other: "إشعارات الدردشة - %{count} إشعارًا غير مقروء"
+    styleguide:
+      sections:
+        chat:
+          title: الدردشة
diff --git a/plugins/chat/config/locales/client.be.yml b/plugins/chat/config/locales/client.be.yml
index 5403bb14a78..10d8e26b3f5 100644
--- a/plugins/chat/config/locales/client.be.yml
+++ b/plugins/chat/config/locales/client.be.yml
@@ -18,7 +18,10 @@ be:
       joined: "рэгістрацыя"
       email_frequency:
         never: "ніколі"
+      header_indicator_preference:
+        never: "ніколі"
       flag: "Пазначыць"
+      last_visit: "апошні візыт"
       reply: "Адказаць"
       edit: "рэдагаваць"
       bookmark_message: "закладка"
@@ -54,10 +57,12 @@ be:
       composer:
         italic_text: "выдзялення тэксту"
         bold_text: "Моцнае вылучэнне тэксту"
+        send: "адправіць"
       notification_levels:
         never: "ніколі"
       settings:
         followed: "рэгістрацыя"
+        threading_disabled: "Адключана"
         notifications: "Натыфікацыі"
         preview: "папярэдні прагляд"
         save: "захаваць"
@@ -83,6 +88,13 @@ be:
           title: "Перанос наяўнай тэмы"
       emoji_picker:
         flags: "сцягі"
+      thread:
+        title: "Загаловак"
+        settings: "Налады"
+        last_reply: "апошні адказ"
+        notifications:
+          tracking:
+            title: "Сачыць"
       draft_channel_screen:
         header: "новае паведамленне"
         cancel: "адмяніць"
diff --git a/plugins/chat/config/locales/client.bg.yml b/plugins/chat/config/locales/client.bg.yml
index 06a660a6f0f..e22058f1c2e 100644
--- a/plugins/chat/config/locales/client.bg.yml
+++ b/plugins/chat/config/locales/client.bg.yml
@@ -15,6 +15,7 @@ bg:
           actions:
             chat_channel_status_change: "Статусът на чат канала е променен"
             chat_channel_delete: "Чат каналът е изтрит"
+            chat_auto_remove_membership: "Членството е автоматично премахнато от каналите"
       api:
         scopes:
           descriptions:
@@ -39,28 +40,42 @@ bg:
       move_to_channel:
         title: "Преместване на съобщенията в канал"
         instructions:
-          one: "Вие премествате <strong>%{count}</strong> съобщение. Изберете целеви канал. Заместващо съобщение ще бъде създадено в канала <strong>%{channelTitle}</strong> , за да покаже, че това съобщение е преместено."
-          other: "Вие премествате <strong>%{count}</strong> съобщения. Изберете целеви канал. Заместващо съобщение ще бъде създадено в канала <strong>%{channelTitle}</strong> , за да покаже, че тези съобщения са били преместени."
+          one: "Вие премествате <strong>%{count}</strong> съобщение. Изберете целеви канал. Заместващо съобщение ще бъде създадено в канала <strong>%{channelTitle}</strong> , за да покаже, че това съобщение е преместено. Обърнете внимание, че веригите за отговори няма да бъдат запазени в новия канал и съобщенията в стария канал вече няма да се показват като отговарящи на преместени съобщения."
+          other: "Вие премествате <strong>%{count}</strong> съобщения. Изберете целеви канал. Заместващо съобщение ще бъде създадено в канала <strong>%{channelTitle}</strong> , за да покаже, че тези съобщения са били преместени. Обърнете внимание, че веригите за отговори няма да бъдат запазени в новия канал и съобщенията в стария канал вече няма да се показват като отговарящи на преместени съобщения."
         confirm_move: "Преместване на съобщения"
       channel_settings:
         edit: "Редактирай"
         add: "Добави "
         join: "Влизане"
         leave: "Напусни"
+      channel_delete:
+        instructions: "<p>Изтрива канала <strong>%{name}</strong> и историята на чата. Всички съобщения и свързани с тях данни, като реакции и качвания, ще бъдат изтрити за постоянно. Ако искате да запазите историята на канала и да го деактивирате, може вместо това да архивирате канала.</p> <p>Сигурни ли сте, че искате да <strong>изтриете окончателно</strong> канала? За да потвърдите, въведете името на канала в полето по-долу.</p>"
       close: "Затвори"
+      expand: "Разгънете чекмеджето за чат"
+      deleted:
+        one: "Едно съобщение беше изтрито. [view]"
+        other: "%{count} съобщения бяха изтрити. [виж всички]"
       delete: "Изтрий"
       muted: "заглуши"
       joined: "присъединен"
       email_frequency:
         never: "Никога"
+      header_indicator_preference:
+        title: "Показване на индикатора за активност в хедъра"
+        all_new: "Всички нови съобщения"
+        dm_and_mentions: "Директни съобщения и споменавания"
+        never: "Никога"
       flag: "Сигнализиране"
       join: "Влизане"
+      last_visit: "последно посещение"
+      summarization:
+        summarize: "Обобщаване"
       mention_warning:
         dismiss: "отмени"
-        groups:
-          users_limit:
-            one: "%{count} потребител"
-            other: "%{count} потребители"
+        cannot_see: "%{username} няма достъп до този канал и не е уведомен."
+        cannot_see_multiple:
+          one: "%{username} и %{count} друг потребител нямат достъп до този канал и не са били уведомени."
+          other: "%{username} и %{count} други потребители нямат достъп до този канал и не са били уведомени."
       reply: "Отговорете"
       edit: "Редактирай"
       rebake_message: "Прегенерирай HTML "
@@ -106,6 +121,8 @@ bg:
       settings:
         follow: "Влизане"
         followed: "Присъединен"
+        threading_enabled: "Да е включен"
+        threading_disabled: "Деактивирани"
         notifications: "Известия"
         save: "Запази "
         saved: "Запазено"
@@ -134,6 +151,21 @@ bg:
         activities: "Дейности"
         flags: "Сигнали"
         symbols: "Символи"
+      thread:
+        title: "Заглавие"
+        replies:
+          one: "%{count} отговор"
+          other: "%{count} отговора"
+        settings: "Настройки"
+        last_reply: "последен отговор"
+        notifications:
+          regular:
+            title: "Нормален"
+          tracking:
+            title: "Следене"
+        participants_other_count:
+          one: "+%{count}"
+          other: "+%{count}"
       draft_channel_screen:
         header: "Ново Съобщение"
         cancel: "Прекрати"
@@ -143,7 +175,7 @@ bg:
           fields:
             message:
               label: Съобщение
-    review:
-      types:
-        reviewable_chat_message:
-          flagged_by: "Означено от"
+    styleguide:
+      sections:
+        chat:
+          title: Чат
diff --git a/plugins/chat/config/locales/client.bs_BA.yml b/plugins/chat/config/locales/client.bs_BA.yml
index 414d00793bc..00e4ddf4546 100644
--- a/plugins/chat/config/locales/client.bs_BA.yml
+++ b/plugins/chat/config/locales/client.bs_BA.yml
@@ -21,15 +21,13 @@ bs_BA:
       joined: "pridružio se"
       email_frequency:
         never: "Nikad"
+      header_indicator_preference:
+        never: "Nikad"
       flag: "Prijavi"
       join: "Učlani se"
+      last_visit: "zadnja posjeta"
       mention_warning:
         dismiss: "odbaci"
-        groups:
-          users_limit:
-            one: "%{count} korisnik"
-            few: "%{count} korisnika"
-            other: "%{count} korisnika"
       reply: "Odgovori"
       edit: "Edit"
       rebake_message: "Popravi HTML"
@@ -58,6 +56,8 @@ bs_BA:
           about: O nama
           members: Članovi
           settings: Postavke
+      new_message_modal:
+        no_items: "Nema stavki"
       direct_message_creator:
         title: Nova poruka
         prefix: "Za:"
@@ -69,11 +69,14 @@ bs_BA:
       composer:
         italic_text: "ukošen tekst"
         bold_text: "bold tekst"
+        send: "Pošalji"
       notification_levels:
         never: "Nikad"
       settings:
         follow: "Učlani se"
         followed: "Pridružio se"
+        threading_enabled: "Omogućen"
+        threading_disabled: "Neomogućen"
         notifications: "Obavijest"
         preview: "Pregled"
         save: "Save"
@@ -105,6 +108,19 @@ bs_BA:
         activities: "Aktivnosti"
         flags: "Flags"
         symbols: "Simboli"
+      thread:
+        title: "Naslov"
+        replies:
+          one: "%{count} odgovor"
+          few: "%{count} odgovora"
+          other: "%{count} odgovora"
+        settings: "Postavke"
+        last_reply: "zadnji odgovor"
+        notifications:
+          regular:
+            title: "Normalno"
+          tracking:
+            title: "Praćenje"
       draft_channel_screen:
         header: "Nova poruka"
         cancel: "Odustani"
@@ -116,7 +132,3 @@ bs_BA:
           fields:
             message:
               label: Privatna Poruka
-    review:
-      types:
-        reviewable_chat_message:
-          flagged_by: "Kaznio je"
diff --git a/plugins/chat/config/locales/client.ca.yml b/plugins/chat/config/locales/client.ca.yml
index 79adffade5a..b796b8b83f3 100644
--- a/plugins/chat/config/locales/client.ca.yml
+++ b/plugins/chat/config/locales/client.ca.yml
@@ -21,14 +21,13 @@ ca:
       joined: "registrat"
       email_frequency:
         never: "Mai"
+      header_indicator_preference:
+        never: "Mai"
       flag: "Bandera"
       join: "Registre"
+      last_visit: "darrera visita"
       mention_warning:
         dismiss: "descarta-ho"
-        groups:
-          users_limit:
-            one: "%{count} usuari"
-            other: "%{count} usuaris"
       reply: "Respon"
       edit: "Edita"
       rebake_message: "Refés HTML"
@@ -58,6 +57,8 @@ ca:
           about: Quant a
           members: Membres
           settings: Configuració
+      new_message_modal:
+        no_items: "Sense elements"
       direct_message_creator:
         title: Missatge nou
         prefix: "A:"
@@ -69,11 +70,14 @@ ca:
       composer:
         italic_text: "text en cursiva"
         bold_text: "text en negreta"
+        send: "Envia"
       notification_levels:
         never: "Mai"
       settings:
         follow: "Registre"
         followed: "Registrat"
+        threading_enabled: "Activat"
+        threading_disabled: "Desactivat"
         notifications: "Notificacions"
         preview: "Previsualitza"
         save: "Desa"
@@ -105,6 +109,18 @@ ca:
         activities: "Activitats"
         flags: "Banderes"
         symbols: "Símbols"
+      thread:
+        title: "Títol"
+        replies:
+          one: "%{count} resposta"
+          other: "%{count} respostes"
+        settings: "Configuració"
+        last_reply: "darrera resposta"
+        notifications:
+          regular:
+            title: "Normal"
+          tracking:
+            title: "Seguint"
       draft_channel_screen:
         header: "Missatge nou"
         cancel: "Cancel·la"
@@ -116,7 +132,3 @@ ca:
           fields:
             message:
               label: Missatge
-    review:
-      types:
-        reviewable_chat_message:
-          flagged_by: "Marcat amb bandera per"
diff --git a/plugins/chat/config/locales/client.cs.yml b/plugins/chat/config/locales/client.cs.yml
index f9b87ae1aa6..bcd85d1d683 100644
--- a/plugins/chat/config/locales/client.cs.yml
+++ b/plugins/chat/config/locales/client.cs.yml
@@ -20,16 +20,13 @@ cs:
       joined: "účet vytvořen"
       email_frequency:
         never: "Nikdy"
+      header_indicator_preference:
+        never: "Nikdy"
       flag: "Nahlášení"
       join: "Přidat se ke skupině"
+      last_visit: "poslední návštěva"
       mention_warning:
         dismiss: "označit jako přečtené"
-        groups:
-          users_limit:
-            one: "%{count} uživatel"
-            few: "%{count} uživatelů"
-            many: "%{count} uživatelů"
-            other: "%{count} uživatelů"
       reply: "Odpověď"
       edit: "Upravit"
       rebake_message: "Obnovit HTML"
@@ -70,11 +67,14 @@ cs:
       composer:
         italic_text: "text kurzívou"
         bold_text: "tučný text"
+        send: "Poslat"
       notification_levels:
         never: "Nikdy"
       settings:
         follow: "Přidat se ke skupině"
         followed: "Účet vytvořen"
+        threading_enabled: "Zapnutý"
+        threading_disabled: "Vypnuto"
         notifications: "Upozornění"
         preview: "Náhled"
         save: "Uložit"
@@ -102,6 +102,20 @@ cs:
       emoji_picker:
         objects: "Objekty"
         flags: "Nahlášení"
+      thread:
+        title: "Nadpis"
+        replies:
+          one: "%{count} odpověď"
+          few: "%{count} odpovědí"
+          many: "%{count} odpovědí"
+          other: "%{count} odpovědí"
+        settings: "Nastavení"
+        last_reply: "poslední odpověď"
+        notifications:
+          regular:
+            title: "Normální"
+          tracking:
+            title: "Sledované"
       draft_channel_screen:
         header: "Nová zpráva"
         cancel: "Zrušit"
@@ -113,7 +127,3 @@ cs:
           fields:
             message:
               label: Zpráva
-    review:
-      types:
-        reviewable_chat_message:
-          flagged_by: "Nahlásil"
diff --git a/plugins/chat/config/locales/client.da.yml b/plugins/chat/config/locales/client.da.yml
index e5f94db2f33..986da6cf5e3 100644
--- a/plugins/chat/config/locales/client.da.yml
+++ b/plugins/chat/config/locales/client.da.yml
@@ -38,9 +38,6 @@ da:
       browse_all_channels: "Gennemse alle kanaler"
       move_to_channel:
         title: "Flyt beskeder til kanal"
-        instructions:
-          one: "Du flytter <strong>%{count}</strong> besked. Vælg en destinationskanal. En pladsholdermeddelelse vil blive oprettet i <strong>%{channelTitle}</strong>-kanalen for at angive, at denne besked er blevet flyttet."
-          other: "Du flytter <strong>%{count}</strong> beskeder. Vælg en destinationskanal. En pladsholdermeddelelse vil blive oprettet i <strong>%{channelTitle}</strong>-kanalen for at angive, at disse beskeder er blevet flyttet."
         confirm_move: "Flyt beskeder"
       channel_settings:
         title: "Kanal indstillinger"
@@ -62,7 +59,6 @@ da:
         title: "Luk Kanal"
       channel_delete:
         title: "Slet Kanal"
-        instructions: "<p>Sletter <strong>%{name}</strong>-kanalen og chathistorikken. Alle beskeder og relaterede data, såsom reaktioner og uploads, slettes permanent. Hvis du vil bevare kanalhistorikken og nedlægge den, kan du i stedet for arkivere kanalen.</p> <p>Er du sikker på, at du vil slette <strong>kanalen</strong>? Skriv navnet på kanalen i boksen nedenfor for at bekræfte.</p>"
         confirm_channel_name: "Indtast kanalnavn"
       channels_list_popup:
         browse: "Gennemse kanaler"
@@ -75,6 +71,8 @@ da:
       joined: "tilmeldt"
       email_frequency:
         never: "Aldrig"
+      header_indicator_preference:
+        never: "Aldrig"
       enable: "Aktiver chat"
       flag: "Rapportér"
       invalid_access: "Du har ikke adgang til at se denne chatkanal"
@@ -82,13 +80,9 @@ da:
       in_reply_to: "Som svar til"
       heading: "Chat"
       join: "Tilslut"
-      new_messages: "nye beskeder"
+      last_visit: "sidste besøg"
       mention_warning:
         dismiss: "afvis"
-        groups:
-          users_limit:
-            one: "%{count} bruger"
-            other: "%{count} brugere"
       reply: "Svar"
       edit: "Rediger"
       rebake_message: "Gendan HTML"
@@ -134,12 +128,11 @@ da:
           about: Om
           members: Brugere
           settings: Indstillinger
+      new_message_modal:
+        no_items: "Ingen punkter"
       direct_message_creator:
         title: Ny Besked
         prefix: "Til:"
-      channel_selector:
-        title: "Hop til kanal"
-        no_channels: "Ingen kanaler matcher din søgning"
       create_channel:
         choose_category:
           label: "Vælg en kategori"
@@ -156,14 +149,11 @@ da:
         type: "Chatbesked"
       reactions:
         only_you: "Du reagerede med :%{emoji}:"
-        and_others: "Du, %{usernames} reagerede med :%{emoji}:"
-        only_others: "%{usernames} reagerede med :%{emoji}:"
-        others_and_more: "%{usernames} og %{more} andre reagerede med :%{emoji}:"
-        you_others_and_more: "Du, %{usernames} og %{more} andre reagerede med :%{emoji}:"
       composer:
         italic_text: "kursiv skrift"
         bold_text: "fed skrift"
         code_text: "kode tekst"
+        send: "Send"
       quote:
         copy_success: "Chat-citat kopieret til udklipsholderen"
       notification_levels:
@@ -171,6 +161,8 @@ da:
       settings:
         follow: "Tilslut"
         followed: "Tilmeldt"
+        threading_enabled: "Aktiveret"
+        threading_disabled: "Deaktiveret"
         notifications: "Notifikationer"
         preview: "Forhåndsvisning"
         save: "Gem"
@@ -204,14 +196,26 @@ da:
           title: "Flyt til ny besked"
       replying_indicator:
         single_user: "%{username} skriver"
-      retention_reminders:
-        public: "Kanalhistorikken gemmes i %{days} dage."
-        dm: "Personlig chathistorik gemmes i %{days} dage."
       emoji_picker:
         objects: "Objekter"
         activities: "Aktiviteter"
         flags: "Flag"
         symbols: "Symboler"
+      thread:
+        title: "Titel"
+        replies:
+          one: "%{count} svar"
+          other: "%{count} svar"
+        settings: "Indstillinger"
+        last_reply: "seneste svar"
+        notifications:
+          regular:
+            title: "Normal"
+          tracking:
+            title: "Følger"
+        participants_other_count:
+          one: "+%{count}"
+          other: "+%{count}"
       draft_channel_screen:
         header: "Ny Besked"
         cancel: "Annuller"
@@ -247,10 +251,6 @@ da:
             sender:
               label: Afsender
               description: Standard er system
-    review:
-      types:
-        reviewable_chat_message:
-          flagged_by: "Markeret af"
     keyboard_shortcuts_help:
       chat:
         title: "Chat"
diff --git a/plugins/chat/config/locales/client.de.yml b/plugins/chat/config/locales/client.de.yml
index 9bd5943cce4..21eea82c65f 100644
--- a/plugins/chat/config/locales/client.de.yml
+++ b/plugins/chat/config/locales/client.de.yml
@@ -15,6 +15,7 @@ de:
           actions:
             chat_channel_status_change: "Chat-Kanal-Status geändert"
             chat_channel_delete: "Chat-Kanal gelöscht"
+            chat_auto_remove_membership: "Mitgliedschaften werden automatisch aus den Kanälen entfernt"
       api:
         scopes:
           descriptions:
@@ -39,8 +40,8 @@ de:
       move_to_channel:
         title: "Nachrichten in Kanal verschieben"
         instructions:
-          one: "Du verschiebst <strong>%{count}</strong> Nachricht. Wähle einen Zielkanal aus. Im Kanal <strong>%{channelTitle}</strong> wird eine Platzhalter-Nachricht erstellt, um anzuzeigen, dass diese Nachricht verschoben wurde."
-          other: "Du verschiebst <strong>%{count}</strong> Nachrichten. Wähle einen Zielkanal aus. Im Kanal <strong>%{channelTitle}</strong> wird eine Platzhalter-Nachricht erstellt, um anzuzeigen, dass diese Nachrichten verschoben wurden."
+          one: "Du verschiebst <strong>%{count}</strong> Nachricht. Wähle einen Zielkanal aus. Im Kanal <strong>%{channelTitle}</strong> wird eine Platzhalter-Nachricht erstellt, um anzuzeigen, dass diese Nachricht verschoben wurde. Beachte, dass Antwortketten im neuen Kanal nicht erhalten bleiben und dass Nachrichten im alten Kanal nicht mehr als Antwort auf verschobene Nachrichten angezeigt werden."
+          other: "Du verschiebst <strong>%{count}</strong> Nachrichten. Wähle einen Zielkanal aus. Im Kanal <strong>%{channelTitle}</strong> wird eine Platzhalter-Nachricht erstellt, um anzuzeigen, dass diese Nachrichten verschoben wurden. Beachte, dass die Antwortketten im neuen Kanal nicht erhalten bleiben und dass die Nachrichten im alten Kanal nicht mehr als Antwort auf die verschobenen Nachrichten angezeigt werden."
         confirm_move: "Nachrichten verschieben"
       channel_settings:
         title: "Kanaleinstellungen"
@@ -71,7 +72,7 @@ de:
         instructions: "Das Schließen des Kanals verhindert, dass Nicht-Teammitglieder neue Nachrichten senden oder bestehende Nachrichten bearbeiten können. Bist du sicher, dass du diesen Kanal schließen möchtest?"
       channel_delete:
         title: "Kanal löschen"
-        instructions: "<p>Löscht den Kanal <strong>%{name}</strong> und den Chat-Verlauf. Alle Nachrichten und zugehörigen Daten wie Reaktionen und Uploads werden dauerhaft gelöscht. Wenn du den Kanalverlauf beibehalten und den Kanal nur außer Betrieb nehmen möchtest, kannst du ihn stattdessen archivieren.</p> <p>Möchtest du den Kanal wirklich <strong>dauerhaft löschen</strong>? Gib zur Bestätigung den Namen des Kanals in das Feld unten ein.</p>"
+        instructions: "<p>Löscht den Kanal <strong>%{name}</strong> und den Chatverlauf. Alle Nachrichten und zugehörigen Daten wie Reaktionen und Uploads werden dauerhaft gelöscht. Wenn du den Kanalverlauf aufbewahren und stilllegen möchtest, solltest du den Kanal stattdessen archivieren.</p> <p>Bist du sicher, dass du den Kanal <strong>dauerhaft löschen möchtest</strong>? Gib zur Bestätigung den Namen des Kanals in das Feld unten ein.</p>"
         confirm: "Ich verstehe die Konsequenzen und möchte den Kanal löschen"
         confirm_channel_name: "Kanalnamen eingeben"
         process_started: "Der Löschvorgang für den Kanal hat begonnen. Dieser Modal-Dialog wird in Kürze geschlossen und du wirst den gelöschten Kanal nirgendwo mehr sehen."
@@ -81,8 +82,11 @@ de:
       click_to_join: "Klicke hier, um die verfügbaren Kanäle zu sehen."
       close: "Schließen"
       collapse: "Chat-Bereich ausblenden"
+      expand: "Chat-Bereich erweitern"
       confirm_flag: "Bist du sicher, dass du die Nachricht von %{username} markieren möchtest?"
-      deleted: "Eine Nachricht wurde gelöscht. [Anzeigen]"
+      deleted:
+        one: "Eine Nachricht wurde gelöscht. [Anzeigen]"
+        other: "%{count} Nachrichten wurden gelöscht. [Alle anzeigen]"
       hidden: "Eine Nachricht wurde ausgeblendet. [Anzeigen]"
       delete: "Löschen"
       edited: "bearbeitet"
@@ -97,6 +101,11 @@ de:
         never: "Niemals"
         title: "E-Mail-Benachrichtigungen"
         when_away: "Nur bei Abwesenheit"
+      header_indicator_preference:
+        title: "Aktivitätsindikator in der Kopfzeile anzeigen"
+        all_new: "bei allen neuen Nachrichten"
+        dm_and_mentions: "bei Direktnachrichten und Erwähnungen"
+        never: "niemals"
       enable: "Chat aktivieren"
       flag: "Melden"
       emoji: "Emoji einfügen"
@@ -106,53 +115,111 @@ de:
       in_reply_to: "Als Antwort auf"
       heading: "Chat"
       join: "Beitreten"
-      new_messages: "neue Nachrichten"
+      last_visit: "letzter Besuch"
+      summarization:
+        title: "Nachrichten zusammenfassen"
+        description: "Wähle unten eine Option aus, um die im gewünschten Zeitraum gesendete Konversation zusammenzufassen."
+        summarize: "Zusammenfassen"
+        since:
+          one: "Letzte Stunde"
+          other: "Letzte %{count} Stunden"
       mention_warning:
         dismiss: "verwerfen"
-        cannot_see:
-          one: "%{username} kann nicht auf diesen Kanal zugreifen und wurde nicht benachrichtigt."
-          other: "%{username} und %{others} können nicht auf diesen Kanal zugreifen und wurden nicht benachrichtigt."
+        cannot_see: "%{username} kann nicht auf diesen Kanal zugreifen und wurde nicht benachrichtigt."
+        cannot_see_multiple:
+          one: "%{username} und %{count} anderer Benutzer können nicht auf diesen Kanal zugreifen und wurden nicht benachrichtigt."
+          other: "%{username} und %{count} andere Benutzer können nicht auf diesen Kanal zugreifen und wurden nicht benachrichtigt."
         invitations_sent:
           one: "Einladung gesendet"
           other: "Einladungen gesendet"
         invite: "Zum Kanal einladen"
-        without_membership:
-          one: "%{username} ist diesem Kanal nicht beigetreten."
-          other: "%{username} und %{others} sind diesem Kanal nicht beigetreten."
-        group_mentions_disabled:
-          one: "%{group_name} erlaubt keine Erwähnungen"
-          other: "%{group_name} und %{others} erlauben keine Erwähnungen"
-        too_many_members:
-          one: "%{group_name} hat zu viele Mitglieder. Niemand wurde benachrichtigt"
-          other: "%{group_name} und %{others} haben zu viele Mitglieder. Niemand wurde benachrichtigt"
-        warning_multiple:
-          one: "%{count} anderer"
-          other: "%{count} andere"
+        without_membership: "%{username} ist diesem Kanal nicht beigetreten."
+        without_membership_multiple:
+          one: "%{username} und %{count} anderer Benutzer sind diesem Kanal nicht beigetreten."
+          other: "%{username} und %{count} andere Benutzer sind diesem Kanal nicht beigetreten."
+        group_mentions_disabled: "%{group_name} erlaubt keine Erwähnungen."
+        group_mentions_disabled_multiple:
+          one: "%{group_name} und %{count} andere Gruppe erlauben keine Erwähnungen."
+          other: "%{group_name} und %{count} andere Gruppen erlauben keine Erwähnungen."
+        too_many_members: "%{group_name} hat zu viele Mitglieder. Niemand wurde benachrichtigt."
+        too_many_members_multiple:
+          one: "%{group_name} und %{count} andere Gruppe haben zu viele Mitglieder. Es wurde niemand benachrichtigt."
+          other: "%{group_name} und %{count} andere Gruppen haben zu viele Mitglieder. Es wurde niemand benachrichtigt."
         groups:
           header:
             some: "Einige Benutzer werden nicht benachrichtigt"
             all: "Niemand wird benachrichtigt"
-          unreachable:
-            one: "@%{group} erlaubt keine Erwähnungen"
-            other: "@%{group} und @%{group_2} erlauben keine Erwähnungen"
-          unreachable_multiple: "@%{group} und %{count} andere erlauben keine Erwähnungen"
-          too_many_members:
-            one: "Die Erwähnung von @%{group} übersteigt das %{notification_limit} von %{limit}"
-            other: "Die Erwähnung von @%{group} oder @%{group_2} übersteigt das %{notification_limit} von %{limit}"
-          too_many_members_multiple: "Diese %{count} Gruppen übersteigen das %{notification_limit} von %{limit}"
-          users_limit:
-            one: "%{count} Benutzer"
-            other: "%{count} Benutzer"
-          notification_limit: "Benachrichtigungslimit"
-        too_many_mentions: "Diese Nachricht überschreitet das %{notification_limit} von %{limit}"
-        mentions_limit:
-          one: "%{count} Erwähnung"
-          other: "%{count} Erwähnungen"
+          unreachable_1: "@%{group} erlaubt keine Erwähnungen."
+          unreachable_2: "@%{group1} und @%{group2} erlauben keine Erwähnungen."
+          unreachable_multiple:
+            one: "@%{group} und %{count} andere Gruppe erlauben keine Erwähnungen."
+            other: "@%{group} und %{count} andere Gruppen erlauben keine Erwähnungen."
+          too_many_members_MF: |
+            { groupCount, plural,
+                 =1 {
+                      { isAdmin, select,
+                        true {
+                          { notificationLimit, plural,
+                              one {Erwähnung von @{group1} überschreitet das <a href="{siteSettingUrl}" target="_blank">Benachrichtigungslimit</a> von # Benutzer.}
+                              other {Erwähnung von @{group1} überschreitet das <a href="{siteSettingUrl}" target="_blank">Benachrichtigungslimit</a> von # Benutzern.}
+                          }
+                        }
+                        false {
+                          { notificationLimit, plural,
+                              one {Erwähnung von @{group1} überschreitet das Benachrichtigungslimit von # Benutzer.}
+                              other {Erwähnung von @{group1} überschreitet das Benachrichtigungslimit von # Benutzern.}
+                          }
+                        }
+                        other {}
+                      }
+                    }
+                 =2 {
+                      { isAdmin, select,
+                        true {
+                          { notificationLimit, plural,
+                              one {Erwähnung von @{group1} und @{group2} überschreitet das <a href="{siteSettingUrl}" target="_blank">Benachrichtigungslimit</a> von # Benutzer.}
+                            other {Erwähnung von @{group1} und @{group2} überschreitet das <a href="{siteSettingUrl}" target="_blank">Benachrichtigungslimit</a> von # Benutzern.}
+                          }
+                        }
+                        false {
+                          { notificationLimit, plural,
+                              one {Erwähnung von @{group1} und @{group2} überschreitet das Benachrichtigungslimit von # Benutzer.}
+                            other {Erwähnung von @{group1} und @{group2} überschreitet das Benachrichtigungslimit von # Benutzern.}
+                          }
+                        }
+                        other {}
+                      }
+                    }
+              other {
+                      { isAdmin, select,
+                        true {
+                          { notificationLimit, plural,
+                              one {Erwähnung dieser {groupCount} Gruppen überschreitet das <a href="{siteSettingUrl}" target="_blank">Benachrichtigungslimit</a> von # Benutzer.}
+                            other {Erwähnung dieser {groupCount} Gruppen überschreitet das <a href="{siteSettingUrl}" target="_blank">Benachrichtigungslimit</a> von # Benutzern.}
+                          }
+                        }
+                        false {
+                          { notificationLimit, plural,
+                              one {Erwähnung dieser {groupCount} Gruppen überschreitet das Benachrichtigungslimit von # Benutzer.}
+                            other {Erwähnung dieser {groupCount} Gruppen überschreitet das Benachrichtigungslimit von # Benutzern.}
+                          }
+                        }
+                        other {}
+                      }
+                    }
+            }
+        too_many_mentions:
+          one: "Diese Nachricht überschreitet das Benachrichtigungslimit von %{count} Erwähnung."
+          other: "Diese Nachricht überschreitet das Benachrichtigungslimit von %{count} Erwähnungen."
+        too_many_mentions_admin:
+          one: 'Diese Nachricht überschreitet das <a href="%{siteSettingUrl}" target="_blank">Benachrichtigungslimit</a> von %{count} Erwähnung.'
+          other: 'Diese Nachricht überschreitet das <a href="%{siteSettingUrl}" target="_blank">Benachrichtigungslimit</a> von %{count} Erwähnungen.'
       aria_roles:
         header: "Chat-Kopfzeile"
         composer: "Chat-Composer"
         channels_list: "Liste der Chat-Kanäle"
       no_public_channels: "Du bist keinem Kanal beigetreten."
+      kicked_from_channel: "Du kannst nicht mehr auf diesen Kanal zugreifen."
       only_chat_push_notifications:
         title: "Nur Chat-Push-Benachrichtigungen senden"
         description: "Alle Nicht-Chat-Push-Benachrichtigungen blockieren und nicht senden"
@@ -164,10 +231,16 @@ de:
       close_full_page: "Vollbild-Chat schließen"
       open_message: "Nachricht im Chat öffnen"
       placeholder_self: "Etwas notieren"
-      placeholder_others: "Chat mit %{messageRecipient}"
-      placeholder_new_message_disallowed: "Der Kanal ist %{status}, du kannst im Moment keine neuen Nachrichten senden."
+      placeholder_channel: "Chat in %{channelName}"
+      placeholder_thread: "Chat im Thread"
+      placeholder_users: "Chat mit %{commaSeparatedNames}"
+      placeholder_new_message_disallowed:
+        archived: "Der Kanal ist archiviert, du kannst im Moment keine neuen Nachrichten senden."
+        closed: "Der Kanal ist geschlossen, du kannst im Moment keine neuen Nachrichten senden."
+        read_only: "Der Kanal ist schreibgeschützt, du kannst im Moment keine neuen Nachrichten senden."
       placeholder_silenced: "Du kannst derzeit keine Nachrichten senden."
-      placeholder_start_conversation: Beginne eine Unterhaltung mit %{usernames}
+      placeholder_start_conversation: "Unterhaltung beginnen mit …"
+      placeholder_start_conversation_users: "Unterhaltung mit %{commaSeparatedUsernames} beginnen"
       remove_upload: "Datei löschen"
       react: "Mit Emoji reagieren"
       reply: "Antworten"
@@ -183,8 +256,11 @@ de:
       restore: "Gelöschte Nachricht wiederherstellen"
       save: "Speichern"
       select: "Auswählen"
-      silence: "Benutzer stummschalten"
       return_to_list: "Zurück zur Kanalliste"
+      return_to_threads_list: "Zurück zu den laufenden Diskussionen"
+      unread_threads_count:
+        one: "Du hast %{count} ungelesene Diskussion"
+        other: "Du hast %{count} ungelesene Diskussionen"
       scroll_to_bottom: "Nach unten scrollen"
       scroll_to_new_messages: "Neue Nachrichten anzeigen"
       sound:
@@ -196,6 +272,8 @@ de:
       title: "Chat"
       title_capitalized: "Chat"
       upload: "Datei anhängen"
+      upload_to_channel: "In %{title} hochladen"
+      upload_to_thread: "In Thread hochladen"
       uploaded_files:
         one: "%{count} Datei"
         other: "%{count} Dateien"
@@ -239,10 +317,23 @@ de:
           about: Über
           members: Mitglieder
           settings: Einstellungen
-      channel_edit_name_modal:
-        title: Namen bearbeiten
+      new_message_modal:
+        title: Nachricht senden
+        add_user_long: <kbd>Umschalt + Klick</kbd> oder <kbd>Umschalt + Eingabe</kbd><span>@%{username} hinzufügen</span>
+        add_user_short: <span>Benutzer hinzufügen</span>
+        open_channel: <span>Kanal öffnen</span>
+        default_search_placeholder: "#ein-kanal, @jemand oder sonstiges"
+        default_channel_search_placeholder: "#ein-kanal"
+        default_user_search_placeholder: "@jemand"
+        user_search_placeholder: "... weitere Benutzer hinzufügen"
+        disabled_user: "hat den Chat deaktiviert"
+        no_items: "Keine Elemente"
+      channel_edit_name_slug_modal:
+        title: Kanal bearbeiten
         input_placeholder: Einen Namen hinzufügen
-        description: Gib deinem Kanal einen kurzen aussagekräftigen Namen
+        slug_description: In der URL wird anstelle des Kanalnamens ein Kanal-Kürzel verwendet
+        name: Kanalname
+        slug: Kanal-Kürzel (optional)
       channel_edit_description_modal:
         title: Beschreibung bearbeiten
         input_placeholder: Beschreibung hinzufügen
@@ -252,9 +343,6 @@ de:
         prefix: "An:"
         no_results: Keine Ergebnisse
         selected_user_title: "%{username} abwählen"
-      channel_selector:
-        title: "Zum Kanal springen"
-        no_channels: "Keine Kanäle entsprechen deiner Suche"
       channel:
         no_memberships: Dieser Kanal hat keine Mitglieder
         no_memberships_found: Keine Mitglieder gefunden
@@ -262,23 +350,44 @@ de:
           one: "%{count} Mitglied"
           other: "%{count} Mitglieder"
       create_channel:
+        threading:
+          label: "Threading aktivieren"
         auto_join_users:
           public_category_warning: "%{category} ist eine öffentliche Kategorie. Alle kürzlich aktiven Benutzer automatisch zu diesem Kanal hinzufügen?"
-          warning_groups:
-            one: Automatisch %{members_count} Benutzer von %{group} hinzufügen?
-            other: Automatisch %{members_count} Benutzer von %{group} und %{group_2} hinzufügen?
-          warning_multiple_groups: Automatisch %{members_count} Benutzer von %{group_1} und %{count} anderen hinzufügen?
+          warning_1_group:
+            one: "Automatisch %{count} Benutzer aus %{group} hinzufügen?"
+            other: "Automatisch %{count} Benutzer aus %{group} hinzufügen?"
+          warning_2_groups:
+            one: "Automatisch %{count} Benutzer aus %{group1} und %{group2} hinzufügen?"
+            other: "Automatisch %{count} Benutzer aus %{group1} und %{group2} hinzufügen?"
+          warning_multiple_groups_MF: |
+            { groupCount, plural,
+                one {
+                      { userCount, plural,
+                          one {{userCount} Benutzer aus {groupName} und {groupCount} anderer Gruppe automatisch hinzufügen?}
+                        other {{userCount} Benutzer aus {groupName} und {groupCount} anderer Gruppe automatisch hinzufügen?}
+                      }
+                    }
+              other {
+                      { userCount, plural,
+                          one {{userCount} Benutzer aus {groupName} und {groupCount} anderen Gruppen automatisch hinzufügen?}
+                        other {{userCount} Benutzer aus {groupName} und {groupCount} anderen Gruppen automatisch hinzufügen?}
+                      }
+                    }
+            }
         choose_category:
           label: "Kategorie auswählen"
           none: "eine auswählen …"
           default_hint: Verwalte den Zugang, indem du die <a href=%{link} target="_blank">Sicherheitseinstellungen für %{category}</a> besuchst
-          hint_groups:
-            one: Benutzer in %{hint} haben gemäß den <a href=%{link} target="_blank">Sicherheitseinstellungen</a> Zugriff auf diesen Kanal
-            other: Benutzer in %{hint} und %{hint_2} haben gemäß den <a href=%{link} target="_blank">Sicherheitseinstellungen</a> Zugriff auf diesen Kanal
-          hint_multiple_groups: Benutzer in %{hint_1} und %{count} anderen Gruppen haben gemäß den <a href=%{link} target="_blank">Sicherheitseinstellungen</a> Zugriff auf diesen Kanal
+          hint_1_group: 'Benutzer in %{group} haben gemäß den <a href="%{settingLink}" target="_blank">Sicherheitseinstellungen</a> Zugriff auf diesen Kanal'
+          hint_2_groups: 'Benutzer in %{group1} und %{group2} haben gemäß den <a href="%{settingLink}" target="_blank">Sicherheitseinstellungen</a> Zugriff auf diesen Kanal'
+          hint_multiple_groups:
+            one: 'Benutzer in %{group} und %{count} anderen Gruppe haben gemäß den <a href="%{settingLink}" target="_blank">Sicherheitseinstellungen</a> Zugriff auf diesen Kanal'
+            other: 'Benutzer in %{group} und %{count} anderen Gruppen haben gemäß den <a href="%{settingLink}" target="_blank">Sicherheitseinstellungen</a> Zugriff auf diesen Kanal'
         create: "Kanal erstellen"
         description: "Beschreibung (optional)"
         name: "Kanalname"
+        slug: "Kanal-Kürzel (optional)"
         title: "Neuer Kanal"
         type: "Typ"
         types:
@@ -288,15 +397,22 @@ de:
         type: "Chat-Nachricht"
       reactions:
         only_you: "Du hast reagiert mit :%{emoji}:"
-        and_others: "Du, %{usernames} haben reagiert mit :%{emoji}:"
-        only_others: "%{usernames} haben reagiert mit :%{emoji}:"
-        others_and_more: "%{usernames} und %{more} andere haben reagiert mit :%{emoji}:"
-        you_others_and_more: "Du, %{usernames} und %{more} andere haben reagiert mit :%{emoji}:"
+        you_and_single_user: "Du und %{username} haben mit :%{emoji}: reagiert"
+        you_and_multiple_users: "Du, %{commaSeparatedUsernames} und %{username} haben mit :%{emoji}: reagiert"
+        you_multiple_users_and_more:
+          one: "Du, %{commaSeparatedUsernames} und %{count} andere Person haben mit :%{emoji}: reagiert"
+          other: "Du, %{commaSeparatedUsernames} und %{count} andere haben mit :%{emoji}: reagiert"
+        single_user: "%{username} hat mit :%{emoji}: reagiert"
+        multiple_users: "%{commaSeparatedUsernames} und %{username} haben mit :%{emoji}: reagiert"
+        multiple_users_and_more:
+          one: "%{commaSeparatedUsernames} und %{count} andere Person haben mit :%{emoji}: reagiert"
+          other: "%{commaSeparatedUsernames} und %{count} andere haben mit :%{emoji}: reagiert"
       composer:
         toggle_toolbar: "Symbolleiste umschalten"
         italic_text: "hervorgehobener Text"
         bold_text: "fett gedruckter Text"
         code_text: "Code-Text"
+        send: "Senden"
       quote:
         original_channel: 'Ursprünglich gesendet in <a href="%{channelLink}">%{channel}</a>'
         copy_success: "Chat-Zitat in die Zwischenablage kopiert"
@@ -307,15 +423,19 @@ de:
       settings:
         channel_wide_mentions_label: "@all- und @here-Erwähnungen zulassen"
         channel_wide_mentions_description: "Erlaube Benutzern, alle Mitglieder von #%{channel} mit @all zu benachrichtigen oder nur diejenigen, die gerade aktiv sind, mit @here"
+        channel_threading_label: "Threading"
+        channel_threading_description: "Wenn Threading aktiviert ist, wird durch Antworten auf eine Chat-Nachricht eine separate Unterhaltung erstellt, die neben dem Hauptkanal existiert."
         auto_join_users_label: "Benutzer automatisch hinzufügen"
-        auto_join_users_info: "Stündlich prüfen, welche Benutzer in den letzten 3 Monaten aktiv waren, und zu diesem Kanal hinzufügen, falls sie Zugriff auf die Kategorie %{category} haben."
-        enable_auto_join_users: "Automatisch alle kürzlich aktiven Benutzer hinzufügen"
+        auto_join_users_info: "Stündlich prüfen, welche Benutzer in den letzten 3 Monaten aktiv waren. Diese Benutzer zu diesem Kanal hinzufügen, wenn sie Zugang zur Kategorie %{category} haben."
+        auto_join_users_info_no_category: "Stündlich prüfen, welche Benutzer in den letzten 3 Monaten aktiv waren. Diese Benutzer zu diesem Kanal hinzufügen, wenn sie Zugang zur ausgewählten Kategorie haben."
         auto_join_users_warning: "Jeder Benutzer, der kein Mitglied dieses Kanals ist und Zugriff auf die Kategorie %{category} hat, wird beitreten. Bist du dir sicher?"
         desktop_notification_level: "Desktop-Benachrichtigungen"
         follow: "Beitreten"
         followed: "Beigetreten"
         mobile_notification_level: "Mobile Push-Benachrichtigungen"
         mute: "Kanal stummschalten"
+        threading_enabled: "Aktiviert"
+        threading_disabled: "Deaktiviert"
         muted_on: "An"
         muted_off: "Aus"
         notifications: "Benachrichtigungen"
@@ -324,9 +444,13 @@ de:
         saved: "Gespeichert"
         unfollow: "Verlassen"
         admin_title: "Administrator"
-        retention_info: "Der Chat-Verlauf wird für %{days} Tage gespeichert."
       admin:
         title: "Chat"
+        export_messages:
+          title: "Chat-Nachrichten exportieren"
+          description: "Der Export ist derzeit auf die letzten 10.000 Nachrichten der letzten 6 Monate beschränkt."
+          create_export: "Export erstellen"
+          export_has_started: "Der Export hat begonnen. Du erhältst eine PN, wenn er abgeschlossen ist."
       direct_messages:
         title: "Persönlicher Chat"
         new: "Persönlichen Chat erstellen"
@@ -390,8 +514,14 @@ de:
           one: "%{commaSeparatedUsernames} und %{count} andere Person schreiben"
           other: "%{commaSeparatedUsernames} und %{count} andere Personen schreiben"
       retention_reminders:
-        public: "Der Kanalverlauf wird für %{days} Tage gespeichert."
-        dm: "Der persönliche Chatverlauf wird für %{days} Tage gespeichert."
+        public_none: "Der Kanalverlauf wird auf unbestimmte Zeit gespeichert."
+        public:
+          one: "Der Kanalverlauf wird für %{count} Tag gespeichert."
+          other: "Der Kanalverlauf wird für %{count} Tage gespeichert."
+        dm_none: "Der persönliche Chatverlauf wird auf unbestimmte Zeit gespeichert."
+        dm:
+          one: "Der persönliche Chatverlauf wird für %{count} Tag gespeichert."
+          other: "Der persönliche Chatverlauf wird für %{count} Tage gespeichert."
       flags:
         off_topic: "Diese Nachricht ist für die aktuelle Diskussion im Sinne des Kanaltitels nicht relevant und sollte wahrscheinlich an eine andere Stelle verschoben werden."
         inappropriate: "Diese Nachricht enthält Inhalte, die eine vernünftige Person als anstößig, beleidigend oder als Verstoß gegen <a href=\"%{basePath}/guidelines\">unsere Community-Richtlinien</a> ansehen würde."
@@ -413,6 +543,33 @@ de:
         symbols: "Symbole"
         search_placeholder: "Nach Emoji-Namen und -Alias suchen …"
         no_results: "Keine Ergebnisse"
+      thread:
+        title: "Titel"
+        view_thread: Thread aufrufen
+        default_title: "Thread"
+        replies:
+          one: "%{count} Antwort"
+          other: "%{count} Antworten"
+        label: Thread
+        close: "Thread schließen"
+        original_message:
+          started_by: "Gestartet von"
+        settings: "Einstellungen"
+        last_reply: "letzte Antw."
+        notifications:
+          regular:
+            title: "Normal"
+            description: "Du wirst benachrichtigt, wenn jemand deinen Namen mit @ in diesem Thread erwähnt."
+          tracking:
+            title: "Verfolgen"
+            description: "Die Anzahl der neuen Antworten auf diesen Thread wird in der Thread-Liste und im Kanal angezeigt. Du wirst benachrichtigt, wenn jemand deinen Namen mit @ in diesem Thread erwähnt."
+        participants_other_count:
+          one: "+%{count}"
+          other: "+%{count}"
+      threads:
+        open: "Thread öffnen"
+        list: "Laufende Diskussionen"
+        none: "Du nimmst an keinem Thread in diesem Kanal teil."
       draft_channel_screen:
         header: "Neue Nachricht"
         cancel: "Abbrechen"
@@ -457,9 +614,8 @@ de:
       transcript:
         view: "Transkript früherer Nachrichten anzeigen"
       types:
-        reviewable_chat_message:
-          title: "Chat-Nachricht markiert"
-          flagged_by: "Markiert von"
+        chat_reviewable_message:
+          title: "Markierte Chat-Nachricht"
     keyboard_shortcuts_help:
       chat:
         title: "Chat"
@@ -472,6 +628,7 @@ de:
           composer_code: "%{shortcut} Code (nur Composer)"
           drawer_open: "%{shortcut} Chat-Bereich öffnen"
           drawer_close: "%{shortcut} Chat-Bereich schließen"
+          mark_all_channels_read: "%{shortcut} Alle Kanäle als gelesen markieren"
     topic_statuses:
       chat:
         help: "Der Chat ist für dieses Thema aktiviert"
@@ -490,3 +647,7 @@ de:
         chat_notifications_with_unread:
           one: "Chat-Benachrichtigungen – %{count} ungelesene Benachrichtigung"
           other: "Chat-Benachrichtigungen – %{count} ungelesene Benachrichtigungen"
+    styleguide:
+      sections:
+        chat:
+          title: Chat
diff --git a/plugins/chat/config/locales/client.el.yml b/plugins/chat/config/locales/client.el.yml
index f35be627822..c02979e09c0 100644
--- a/plugins/chat/config/locales/client.el.yml
+++ b/plugins/chat/config/locales/client.el.yml
@@ -21,14 +21,13 @@ el:
       joined: "έγινε μέλος"
       email_frequency:
         never: "Ποτέ"
+      header_indicator_preference:
+        never: "Ποτέ"
       flag: "Επισήμανση"
       join: "Γίνετε μέλος"
+      last_visit: "τελευταία επίσκεψη"
       mention_warning:
         dismiss: "απόρριψη"
-        groups:
-          users_limit:
-            one: "%{count} χρήστης"
-            other: "%{count} χρήστες"
       reply: "Απάντηση"
       edit: "Επεξεργασία"
       rebake_message: "Ανανέωση HTML"
@@ -57,6 +56,8 @@ el:
           about: Σχετικά
           members: Μέλη
           settings: Ρυθμίσεις
+      new_message_modal:
+        no_items: "Δεν υπάρχουν στοιχεία"
       direct_message_creator:
         title: Νέο Μήνυμα
         prefix: "Προς:"
@@ -68,11 +69,13 @@ el:
       composer:
         italic_text: "κείμενο σε έμφαση"
         bold_text: "έντονη γραφή"
+        send: "Αποστολή"
       notification_levels:
         never: "Ποτέ"
       settings:
         follow: "Γίνετε μέλος"
         followed: "Έγινε μέλος"
+        threading_disabled: "Απενεργοποιημένο"
         notifications: "Ειδοποιήσεις"
         preview: "Προεπισκόπηση"
         save: "Αποθήκευση"
@@ -104,6 +107,18 @@ el:
         activities: "Δραστηριότητες"
         flags: "Σημάνσεις"
         symbols: "Σύμβολα"
+      thread:
+        title: "Τίτλος"
+        replies:
+          one: "%{count} απάντηση"
+          other: "%{count} απαντήσεις"
+        settings: "Ρυθμίσεις"
+        last_reply: "τελευταία απάντηση"
+        notifications:
+          regular:
+            title: "Φυσιολογικό"
+          tracking:
+            title: "Παρακολουθείται"
       draft_channel_screen:
         header: "Νέο Μήνυμα"
         cancel: "Ακύρωση"
@@ -115,7 +130,3 @@ el:
           fields:
             message:
               label: Μήνυμα
-    review:
-      types:
-        reviewable_chat_message:
-          flagged_by: "Επισήμανση από"
diff --git a/plugins/chat/config/locales/client.en.yml b/plugins/chat/config/locales/client.en.yml
index 58e3b4d7aee..6c1d82dc2c0 100644
--- a/plugins/chat/config/locales/client.en.yml
+++ b/plugins/chat/config/locales/client.en.yml
@@ -9,6 +9,7 @@ en:
           actions:
             chat_channel_status_change: "Chat channel status changed"
             chat_channel_delete: "Chat channel deleted"
+            chat_auto_remove_membership: "Memberships automatically removed from channels"
       api:
         scopes:
           descriptions:
@@ -34,8 +35,8 @@ en:
       move_to_channel:
         title: "Move messages to channel"
         instructions:
-          one: "You are moving <strong>%{count}</strong> message. Select a destination channel. A placeholder message will be created in the <strong>%{channelTitle}</strong> channel to indicate that this message has been moved."
-          other: "You are moving <strong>%{count}</strong> messages. Select a destination channel. A placeholder message will be created in the <strong>%{channelTitle}</strong> channel to indicate that these messages have been moved."
+          one: "You are moving <strong>%{count}</strong> message. Select a destination channel. A placeholder message will be created in the <strong>%{channelTitle}</strong> channel to indicate that this message has been moved. Note that reply chains will not be preserved in the new channel, and messages in the old channel will no longer show as replying to any moved messages."
+          other: "You are moving <strong>%{count}</strong> messages. Select a destination channel. A placeholder message will be created in the <strong>%{channelTitle}</strong> channel to indicate that these messages have been moved. Note that reply chains will not be preserved in the new channel, and messages in the old channel will no longer show as replying to any moved messages."
         confirm_move: "Move Messages"
       channel_settings:
         title: "Channel settings"
@@ -66,7 +67,7 @@ en:
         instructions: "Closing the channel prevents non-staff users from sending new messages or editing existing messages. Are you sure you want to close this channel?"
       channel_delete:
         title: "Delete Channel"
-        instructions: "<p>Deletes the <strong>%{name}</strong> channel and chat history. All messages and related data, such as reactions and uploads, will be permanently deleted. If you want to preserve the channel history and decomission it, you may want to archive the channel instead.</p>
+        instructions: "<p>Deletes the <strong>%{name}</strong> channel and chat history. All messages and related data, such as reactions and uploads, will be permanently deleted. If you want to preserve the channel history and decommission it, you may want to archive the channel instead.</p>
         <p>Are you sure you want to <strong>permanently delete</strong> the channel? To confirm, type the name of the channel in the box below.</p>"
         confirm: "I understand the consequences, delete the channel"
         confirm_channel_name: "Enter channel name"
@@ -78,8 +79,12 @@ en:
       click_to_join: "Click here to view available channels."
       close: "Close"
       collapse: "Collapse Chat Drawer"
+      expand: "Expand Chat Drawer"
       confirm_flag: "Are you sure you want to flag %{username}'s message?"
-      deleted: "A message was deleted. [view]"
+      deleted:
+        one: "A message was deleted. [view]"
+        other: "%{count} messages were deleted. [view all]"
+
       hidden: "A message was hidden. [view]"
       delete: "Delete"
       edited: "edited"
@@ -94,6 +99,11 @@ en:
         never: "Never"
         title: "Email Notifications"
         when_away: "Only when away"
+      header_indicator_preference:
+        title: "Show activity indicator in header"
+        all_new: "All New Messages"
+        dm_and_mentions: "Direct Messages and Mentions"
+        never: "Never"
       enable: "Enable chat"
       flag: "Flag"
       emoji: "Insert emoji"
@@ -103,55 +113,114 @@ en:
       in_reply_to: "In reply to"
       heading: "Chat"
       join: "Join"
-      new_messages: "new messages"
+      last_visit: "last visit"
+
+      summarization:
+        title: "Summarize messages"
+        description: "Select an option below to summarize the conversation sent during the desired timeframe."
+        summarize: "Summarize"
+        since:
+          one: "Last hour"
+          other: "Last %{count} hours"
       mention_warning:
         dismiss: "dismiss"
-        cannot_see:
-          one: "%{username} cannot access this channel and was not notified."
-          other: "%{username} and %{others} cannot access this channel and were not notified."
+        cannot_see: "%{username} can't access this channel and was not notified."
+        cannot_see_multiple:
+          one: "%{username} and %{count} other user cannot access this channel and were not notified."
+          other: "%{username} and %{count} other users cannot access this channel and were not notified."
         invitations_sent:
           one: "Invitation sent"
           other: "Invitations sent"
         invite: "Invite to channel"
-        without_membership:
-          one: "%{username} has not joined this channel."
-          other: "%{username} and %{others} have not joined this channel."
-        group_mentions_disabled:
-          one: "%{group_name} doesn't allow mentions"
-          other: "%{group_name} and %{others} doesn't allow mentions"
-        too_many_members:
-          one: "%{group_name} has too many members. No one was notified"
-          other: "%{group_name} and %{others} have too many members. No one was notified"
-        warning_multiple:
-          one: "%{count} other"
-          other: "%{count} others"
-
+        without_membership: "%{username} has not joined this channel."
+        without_membership_multiple:
+          one: "%{username} and %{count} other user have not joined this channel."
+          other: "%{username} and %{count} other users have not joined this channel."
+        group_mentions_disabled: "%{group_name} doesn't allow mentions."
+        group_mentions_disabled_multiple:
+          one: "%{group_name} and %{count} other group don't allow mentions."
+          other: "%{group_name} and %{count} other groups don't allow mentions."
+        too_many_members: "%{group_name} has too many members. No one was notified."
+        too_many_members_multiple:
+          one: "%{group_name} and %{count} other group have too many members. No one was notified."
+          other: "%{group_name} and %{count} other groups have too many members. No one was notified."
         groups:
           header:
             some: "Some users won't be notified"
             all: "Nobody will be notified"
-          unreachable:
-            one: "@%{group} doesn't allow mentions"
-            other: "@%{group} and @%{group_2} doesn't allow mentions"
-          unreachable_multiple: "@%{group} and %{count} others doesn't allow mentions"
-          too_many_members:
-            one: "Mentioning @%{group} exceeds the %{notification_limit} of %{limit}"
-            other: "Mentioning both @%{group} or @%{group_2} exceeds the %{notification_limit} of %{limit}"
-          too_many_members_multiple: "These %{count} groups exceed the %{notification_limit} of %{limit}"
-          users_limit:
-            one: "%{count} user"
-            other: "%{count} users"
-          notification_limit: "notification limit"
-        too_many_mentions: "This message exceeds the %{notification_limit} of %{limit}"
-        mentions_limit:
-          one: "%{count} mention"
-          other: "%{count} mentions"
+          unreachable_1: "@%{group} doesn't allow mentions."
+          unreachable_2: "@%{group1} and @%{group2} don't allow mentions."
+          unreachable_multiple:
+            one: "@%{group} and %{count} other group don't allow mentions."
+            other: "@%{group} and %{count} other groups don't allow mentions."
+          too_many_members_MF: |
+            { groupCount, plural,
+                 =1 {
+                      { isAdmin, select,
+                        true {
+                          { notificationLimit, plural,
+                              one {Mentioning @{group1} exceeds the <a href="{siteSettingUrl}" target="_blank">notification limit</a> of # user.}
+                              other {Mentioning @{group1} exceeds the <a href="{siteSettingUrl}" target="_blank">notification limit</a> of # users.}
+                          }
+                        }
+                        false {
+                          { notificationLimit, plural,
+                              one {Mentioning @{group1} exceeds the notification limit of # user.}
+                              other {Mentioning @{group1} exceeds the notification limit of # users.}
+                          }
+                        }
+                        other {}
+                      }
+                    }
+                 =2 {
+                      { isAdmin, select,
+                        true {
+                          { notificationLimit, plural,
+                              one {Mentioning @{group1} and @{group2} exceeds the <a href="{siteSettingUrl}" target="_blank">notification limit</a> of # user.}
+                            other {Mentioning @{group1} and @{group2} exceeds the <a href="{siteSettingUrl}" target="_blank">notification limit</a> of # users.}
+                          }
+                        }
+                        false {
+                          { notificationLimit, plural,
+                              one {Mentioning @{group1} and @{group2} exceeds the notification limit of # user.}
+                            other {Mentioning @{group1} and @{group2} exceeds the notification limit of # users.}
+                          }
+                        }
+                        other {}
+                      }
+                    }
+              other {
+                      { isAdmin, select,
+                        true {
+                          { notificationLimit, plural,
+                              one {Mentioning these {groupCount} groups exceeds the <a href="{siteSettingUrl}" target="_blank">notification limit</a> of # user.}
+                            other {Mentioning these {groupCount} groups exceeds the <a href="{siteSettingUrl}" target="_blank">notification limit</a> of # users.}
+                          }
+                        }
+                        false {
+                          { notificationLimit, plural,
+                              one {Mentioning these {groupCount} groups exceeds the notification limit of # user.}
+                            other {Mentioning these {groupCount} groups exceeds the notification limit of # users.}
+                          }
+                        }
+                        other {}
+                      }
+                    }
+            }
+        too_many_mentions:
+          one: "This message exceeds the notification limit of %{count} mention."
+          other: "This message exceeds the notification limit of %{count} mentions."
+        too_many_mentions_admin:
+          one: 'This message exceeds the <a href="%{siteSettingUrl}" target="_blank">notification limit</a> of %{count} mention.'
+          other: 'This message exceeds the <a href="%{siteSettingUrl}" target="_blank">notification limit</a> of %{count} mentions.'
+
       aria_roles:
         header: "Chat header"
         composer: "Chat composer"
         channels_list: "Chat channels list"
 
       no_public_channels: "You have not joined any channels."
+      kicked_from_channel: "You can no longer access this channel."
       only_chat_push_notifications:
         title: "Only send chat push notifications"
         description: "Block all non-chat push notifications from being sent"
@@ -163,10 +232,16 @@ en:
       close_full_page: "Close full-screen chat"
       open_message: "Open message in chat"
       placeholder_self: "Jot something down"
-      placeholder_others: "Chat with %{messageRecipient}"
-      placeholder_new_message_disallowed: "Channel is %{status}, you cannot send new messages right now."
+      placeholder_channel: "Chat in %{channelName}"
+      placeholder_thread: "Chat in thread"
+      placeholder_users: "Chat with %{commaSeparatedNames}"
+      placeholder_new_message_disallowed:
+        archived: "Channel is archived, you cannot send new messages right now."
+        closed: "Channel is closed, you cannot send new messages right now."
+        read_only: "Channel is read only, you cannot send new messages right now."
       placeholder_silenced: "You cannot send messages at this time."
-      placeholder_start_conversation: Start a conversation with %{usernames}
+      placeholder_start_conversation: "Start a conversation with ..."
+      placeholder_start_conversation_users: "Start a conversation with %{commaSeparatedUsernames}"
       remove_upload: "Remove file"
       react: "React with emoji"
       reply: "Reply"
@@ -182,8 +257,11 @@ en:
       restore: "Restore deleted message"
       save: "Save"
       select: "Select"
-      silence: "Silence user"
       return_to_list: "Return to channels list"
+      return_to_threads_list: "Return to ongoing discussions"
+      unread_threads_count:
+        one: "You have %{count} unread discussion"
+        other: "You have %{count} unread discussions"
       scroll_to_bottom: "Scroll to bottom"
       scroll_to_new_messages: "See new messages"
       sound:
@@ -195,6 +273,8 @@ en:
       title: "chat"
       title_capitalized: "Chat"
       upload: "Attach a file"
+      upload_to_channel: "Upload to %{title}"
+      upload_to_thread: "Upload to thread"
       uploaded_files:
         one: "%{count} file"
         other: "%{count} files"
@@ -205,7 +285,7 @@ en:
         read_only: "Read Only"
         archived_header: "Channel is archived"
         archived: "Archived"
-        archive_failed: "Archive channel failed. %{completed}/%{total} messages have been archived. <a target=\"_blank\" href=\"%{topic_url}\">the destination topic</a>. Press retry to attempt to complete the archive."
+        archive_failed: "Archive channel failed. %{completed}/%{total} messages have been archived. <a target=\"_blank\" href=\"%{topic_url}\">The destination topic</a> was created. Press retry to attempt to complete the archive."
         archive_failed_no_topic: "Archive channel failed. %{completed}/%{total} messages have been archived, the destination topic was not created. Press retry to attempt to complete the archive."
         archive_completed: "See <a target=\"_blank\" href=\"%{topic_url}\">the archive topic</a>"
         closed_header: "Channel is closed"
@@ -244,10 +324,24 @@ en:
           members: Members
           settings: Settings
 
-      channel_edit_name_modal:
-        title: Edit name
+      new_message_modal:
+        title: Send message
+        add_user_long: <kbd>shift + click</kbd> or <kbd>shift + enter</kbd><span>Add @%{username}</span>
+        add_user_short: <span>Add user</span>
+        open_channel: <span>Open channel</span>
+        default_search_placeholder: "#a-channel, @somebody or anything"
+        default_channel_search_placeholder: "#a-channel"
+        default_user_search_placeholder: "@somebody"
+        user_search_placeholder: "...add more users"
+        disabled_user: "has disabled chat"
+        no_items: "No items"
+
+      channel_edit_name_slug_modal:
+        title: Edit channel
         input_placeholder: Add a name
-        description: Give a short descriptive name to your channel
+        slug_description: A channel slug is used in the URL instead of the channel name
+        name: Channel name
+        slug: Channel slug (optional)
 
       channel_edit_description_modal:
         title: Edit description
@@ -260,10 +354,6 @@ en:
         no_results: No results
         selected_user_title: "Deselect %{username}"
 
-      channel_selector:
-        title: "Jump to channel"
-        no_channels: "No channels match your search"
-
       channel:
         no_memberships: This channel has no members
         no_memberships_found: No members found
@@ -272,23 +362,44 @@ en:
           other: "%{count} members"
 
       create_channel:
+        threading:
+          label: "Enable threading"
         auto_join_users:
           public_category_warning: "%{category} is a public category. Automatically add all recently active users to this channel?"
-          warning_groups:
-            one: Automatically add %{members_count} users from %{group}?
-            other: Automatically add %{members_count} users from %{group} and %{group_2}?
-          warning_multiple_groups: Automatically add %{members_count} users from %{group_1} and %{count} others?
+          warning_1_group:
+            one: "Automatically add %{count} user from %{group}?"
+            other: "Automatically add %{count} users from %{group}?"
+          warning_2_groups:
+            one: "Automatically add %{count} user from %{group1} and %{group2}?"
+            other: "Automatically add %{count} users from %{group1} and %{group2}?"
+          warning_multiple_groups_MF: |
+            { groupCount, plural,
+                one {
+                      { userCount, plural,
+                          one {Automatically add {userCount} user from {groupName} and {groupCount} other group?}
+                        other {Automatically add {userCount} users from {groupName} and {groupCount} other group?}
+                      }
+                    }
+              other {
+                      { userCount, plural,
+                          one {Automatically add {userCount} user from {groupName} and {groupCount} other groups?}
+                        other {Automatically add {userCount} users from {groupName} and {groupCount} other groups?}
+                      }
+                    }
+            }
         choose_category:
           label: "Choose a category"
           none: "select one..."
           default_hint: Manage access by visiting <a href=%{link} target="_blank">%{category} security settings</a>
-          hint_groups:
-            one: Users in %{hint} will have access to this channel per the <a href=%{link} target="_blank">security settings</a>
-            other: Users in %{hint} and %{hint_2} will have access to this channel per the <a href=%{link} target="_blank">security settings</a>
-          hint_multiple_groups: Users in %{hint_1} and %{count} other groups will have access to this channel per the <a href=%{link} target="_blank">security settings</a>
+          hint_1_group: 'Users in %{group} will have access to this channel per the <a href="%{settingLink}" target="_blank">security settings</a>'
+          hint_2_groups: 'Users in %{group1} and %{group2} will have access to this channel per the <a href="%{settingLink}" target="_blank">security settings</a>'
+          hint_multiple_groups:
+            one: 'Users in %{group} and %{count} other group will have access to this channel per the <a href="%{settingLink}" target="_blank">security settings</a>'
+            other: 'Users in %{group} and %{count} other groups will have access to this channel per the <a href="%{settingLink}" target="_blank">security settings</a>'
         create: "Create channel"
         description: "Description (optional)"
         name: "Channel name"
+        slug: "Channel slug (optional)"
         title: "New channel"
         type: "Type"
         types:
@@ -300,16 +411,23 @@ en:
 
       reactions:
         only_you: "You reacted with :%{emoji}:"
-        and_others: "You, %{usernames} reacted with :%{emoji}:"
-        only_others: "%{usernames} reacted with :%{emoji}:"
-        others_and_more: "%{usernames} and %{more} others reacted with :%{emoji}:"
-        you_others_and_more: "You, %{usernames} and %{more} others reacted with :%{emoji}:"
+        you_and_single_user: "You and %{username} reacted with :%{emoji}:"
+        you_and_multiple_users: "You, %{commaSeparatedUsernames} and %{username} reacted with :%{emoji}:"
+        you_multiple_users_and_more:
+          one: "You, %{commaSeparatedUsernames} and %{count} other reacted with :%{emoji}:"
+          other: "You, %{commaSeparatedUsernames} and %{count} others reacted with :%{emoji}:"
+        single_user: "%{username} reacted with :%{emoji}:"
+        multiple_users: "%{commaSeparatedUsernames} and %{username} reacted with :%{emoji}:"
+        multiple_users_and_more:
+          one: "%{commaSeparatedUsernames} and %{count} other reacted with :%{emoji}:"
+          other: "%{commaSeparatedUsernames} and %{count} others reacted with :%{emoji}:"
 
       composer:
         toggle_toolbar: "Toggle toolbar"
         italic_text: "emphasized text"
         bold_text: "strong text"
         code_text: "code text"
+        send: "Send"
 
       quote:
         original_channel: 'Originally sent in <a href="%{channelLink}">%{channel}</a>'
@@ -323,15 +441,19 @@ en:
       settings:
         channel_wide_mentions_label: "Allow @all and @here mentions"
         channel_wide_mentions_description: "Allow users to notify all members of #%{channel} with @all or only those who are active in the moment with @here"
+        channel_threading_label: "Threading"
+        channel_threading_description: "When threading is enabled, replies to a chat message will create a separate conversation, which will exist alongside the main channel."
         auto_join_users_label: "Automatically add users"
-        auto_join_users_info: "Check hourly which users have been active in the last 3 months and, if they have access to the %{category} category, add them to this channel."
-        enable_auto_join_users: "Automatically add all recently active users"
+        auto_join_users_info: "Check hourly which users have been active in the last 3 months. Add them to this channel if they have access to the %{category} category."
+        auto_join_users_info_no_category: "Check hourly which users have been active in the last 3 months. Add them to this channel if they have access to the selected category."
         auto_join_users_warning: "Every user who isn't a member of this channel and has access to the %{category} category will join. Are you sure?"
         desktop_notification_level: "Desktop notifications"
         follow: "Join"
         followed: "Joined"
         mobile_notification_level: "Mobile push notifications"
         mute: "Mute channel"
+        threading_enabled: "Enabled"
+        threading_disabled: "Disabled"
         muted_on: "On"
         muted_off: "Off"
         notifications: "Notifications"
@@ -340,10 +462,14 @@ en:
         saved: "Saved"
         unfollow: "Leave"
         admin_title: "Admin"
-        retention_info: "Chat history will be saved for %{days} days."
 
       admin:
         title: "Chat"
+        export_messages:
+          title: "Export chat messages"
+          description: "Export is currently limited to 10000 most recent messages in the last 6 months."
+          create_export: "Create export"
+          export_has_started: "The export has started. You'll receive a PM when it's ready."
 
       direct_messages:
         title: "Personal chat"
@@ -412,8 +538,14 @@ en:
           other: "%{commaSeparatedUsernames} and %{count} others are typing"
 
       retention_reminders:
-        public: "Channel history is retained for %{days} days."
-        dm: "Personal chat history is retained for %{days} days."
+        public_none: "Channel history is retained indefinitely."
+        public:
+          one: "Channel history is retained for %{count} day."
+          other: "Channel history is retained for %{count} days."
+        dm_none: "Personal chat history is retained indefinitely."
+        dm:
+          one: "Personal chat history is retained for %{count} day."
+          other: "Personal chat history is retained for %{count} days."
 
       flags:
         off_topic: "This message is not relevant to the current discussion as defined by the channel title, and should probably be moved elsewhere."
@@ -439,6 +571,34 @@ en:
         search_placeholder: "Search by emoji name and alias..."
         no_results: "No results"
 
+      thread:
+        title: "Title"
+        view_thread: View thread
+        default_title: "Thread"
+        replies:
+          one: "%{count} reply"
+          other: "%{count} replies"
+        label: Thread
+        close: "Close Thread"
+        original_message:
+          started_by: "Started by"
+        settings: "Settings"
+        last_reply: "last reply"
+        notifications:
+          regular:
+            title: "Normal"
+            description: "You will be notified if someone mentions your @name in this thread."
+          tracking:
+            title: "Tracking"
+            description: "A count of new replies for this thread will be shown in the thread list and the channel. You will be notified if someone mentions your @name in this thread."
+        participants_other_count:
+          one: "+%{count}"
+          other: "+%{count}"
+      threads:
+        open: "Open Thread"
+        list: "Ongoing discussions"
+        none: "You are not participating in any threads in this channel."
+
       draft_channel_screen:
         header: "New Message"
         cancel: "Cancel"
@@ -452,11 +612,13 @@ en:
           direct: 'mentioned you in "%{channel}"'
           direct_html: '<span>%{username}</span> <span>mentioned you in "%{channel}"</span>'
           other_plain: 'mentioned %{identifier} in "%{channel}"'
+          # %{identifier} is either @here or @all
           other_html: '<span>%{username}</span> <span>mentioned %{identifier} in "%{channel}"</span>'
         direct_message_chat_mention:
           direct: "mentioned you in personal chat"
           direct_html: "<span>%{username}</span> <span>mentioned you in personal chat</span>"
           other_plain: "mentioned %{identifier} in personal chat"
+          # %{identifier} is either @here or @all
           other_html: "<span>%{username}</span> <span>mentioned %{identifier} in personal chat</span>"
         chat_message: "New chat message"
         chat_quoted: "%{username} quoted your chat message"
@@ -485,9 +647,8 @@ en:
       transcript:
         view: "View previous messages transcript"
       types:
-        reviewable_chat_message:
+        chat_reviewable_message:
           title: "Flagged Chat Message"
-          flagged_by: "Flagged By"
     keyboard_shortcuts_help:
       chat:
         title: "Chat"
@@ -500,6 +661,7 @@ en:
           composer_code: "%{shortcut} Code (composer only)"
           drawer_open: "%{shortcut} Open chat drawer"
           drawer_close: "%{shortcut} Close chat drawer"
+          mark_all_channels_read: "%{shortcut} Mark all channels read"
     topic_statuses:
       chat:
         help: "Chat is enabled for this topic"
@@ -520,3 +682,8 @@ en:
         chat_notifications_with_unread:
           one: "Chat notifications - %{count} unread notification"
           other: "Chat notifications - %{count} unread notifications"
+
+    styleguide:
+      sections:
+        chat:
+          title: Chat
diff --git a/plugins/chat/config/locales/client.es.yml b/plugins/chat/config/locales/client.es.yml
index d0701eec9b4..bb07b7a36bb 100644
--- a/plugins/chat/config/locales/client.es.yml
+++ b/plugins/chat/config/locales/client.es.yml
@@ -15,6 +15,7 @@ es:
           actions:
             chat_channel_status_change: "Se ha cambiado el estado del canal de chat"
             chat_channel_delete: "Canal de chat eliminado"
+            chat_auto_remove_membership: "Las afiliaciones se eliminan automáticamente de los canales"
       api:
         scopes:
           descriptions:
@@ -39,8 +40,8 @@ es:
       move_to_channel:
         title: "Mover los mensajes al canal"
         instructions:
-          one: "Estás moviendo <strong>%{count}</strong> mensaje. Selecciona un canal de destino. Se creará un mensaje marcador de posición en el canal <strong>%{channelTitle}</strong> para indicar que se ha movido este mensaje."
-          other: "Estás moviendo <strong>%{count}</strong> mensajes. Selecciona un canal de destino. Se creará un mensaje marcador de posición en el canal <strong>%{channelTitle}</strong> para indicar que se han movido estos mensajes."
+          one: "Estás moviendo <strong>%{count}</strong> mensaje. Selecciona un canal de destino. Se creará un mensaje de marcador de posición en el canal <strong>%{channelTitle}</strong> para indicar que este mensaje se ha movido. Ten en cuenta que las cadenas de respuesta no se conservarán en el nuevo canal, y los mensajes del canal antiguo ya no aparecerán como respuesta a ningún mensaje movido."
+          other: "Estás moviendo <strong>%{count}</strong> mensajes. Selecciona un canal de destino. Se creará un mensaje de marcador de posición en el canal <strong>%{channelTitle}</strong> para indicar que se han movido estos mensajes. Ten en cuenta que las cadenas de respuesta no se conservarán en el nuevo canal, y los mensajes del canal antiguo ya no aparecerán como respuesta a los mensajes movidos."
         confirm_move: "Mover mensajes"
       channel_settings:
         title: "Ajustes del canal"
@@ -71,7 +72,7 @@ es:
         instructions: "El cierre del canal impide que los usuarios que no son del personal envíen nuevos mensajes o editen los existentes. ¿Seguro que quieres cerrar este canal?"
       channel_delete:
         title: "Eliminar canal"
-        instructions: "<p>Elimina el canal de <strong>%{name}</strong> y el historial de chat. Todos los mensajes y datos relacionados, como las reacciones y las subidas, se eliminarán permanentemente. Si quieres conservar el historial del canal y descomponerlo, quizá quieras archivar el canal en su lugar.</p> <p>¿Seguro que quieres <strong>eliminar permanentemente</strong> el canal? Para confirmarlo, escribe el nombre del canal en la casilla de abajo.</p>"
+        instructions: "<p>Elimina el canal <strong>%{name}</strong> y el historial de chat. Todos los mensajes y datos relacionados, como reacciones y subidas, se eliminarán permanentemente. Si quieres conservar el historial del canal y darlo de baja, tal vez quieras archivar el canal en su lugar.</p> <p>¿Seguro que quieres <strong>eliminar permanentemente</strong> el canal? Para confirmar, escribe el nombre del canal en la casilla de abajo.</p>"
         confirm: "Comprendo las consecuencias, eliminar el canal"
         confirm_channel_name: "Introduce el nombre del canal"
         process_started: "Se ha iniciado el proceso de eliminación del canal. Este modal se cerrará en breve, ya no verás el canal eliminado en ninguna parte."
@@ -81,8 +82,11 @@ es:
       click_to_join: "Haz clic aquí para ver los canales disponibles."
       close: "Cerrar"
       collapse: "Contraer contenedor del chat"
+      expand: "Ampliar el cajón de chat"
       confirm_flag: "¿Seguro que quieres denunciar el mensaje de %{username}?"
-      deleted: "Se eliminó un mensaje. [ver]"
+      deleted:
+        one: "Se eliminó un mensaje. [view]"
+        other: "Se han eliminado %{count} mensajes. [ver todos]"
       hidden: "Se ha ocultado un mensaje. [ver]"
       delete: "Eliminar"
       edited: "editado"
@@ -97,6 +101,11 @@ es:
         never: "Nunca"
         title: "Notificaciones por correo electrónico"
         when_away: "Solo cuando estés ausente"
+      header_indicator_preference:
+        title: "Mostrar indicador de actividad en el encabezado"
+        all_new: "Todos los mensajes nuevos"
+        dm_and_mentions: "Mensajes directos y menciones"
+        never: "Nunca"
       enable: "Habilitar chat"
       flag: "Denunciar"
       emoji: "Insertar emoji"
@@ -106,53 +115,111 @@ es:
       in_reply_to: "En respuesta a"
       heading: "Chat"
       join: "Unirse"
-      new_messages: "nuevos mensajes"
+      last_visit: "última visita"
+      summarization:
+        title: "Resumir mensajes"
+        description: "Selecciona una opción a continuación para resumir la conversación enviada durante el periodo de tiempo deseado."
+        summarize: "Resumir"
+        since:
+          one: "Última hora"
+          other: "Últimas %{count} horas"
       mention_warning:
         dismiss: "descartar"
-        cannot_see:
-          one: "%{username} no puede acceder a este canal y no fue notificado."
-          other: "%{username} y %{others} no pueden acceder a este canal y no fueron notificados."
+        cannot_see: "%{username} no puede acceder a este canal y no ha sido notificado."
+        cannot_see_multiple:
+          one: "%{username} y otro usuario no pueden acceder a este canal y no fueron notificados."
+          other: "%{username} y otros %{count} usuarios no pueden acceder a este canal y no fueron notificados."
         invitations_sent:
           one: "Invitación enviada"
           other: "Invitaciones enviadas"
         invite: "Invitar al canal"
-        without_membership:
-          one: "%{username} no se ha unido a este canal."
-          other: "%{username} y %{others} no se han unido a este canal."
-        group_mentions_disabled:
-          one: "%{group_name} no permite menciones"
-          other: "%{group_name} y %{others} no permiten menciones"
-        too_many_members:
-          one: "%{group_name} tiene demasiados miembros. No se notificó a nadie"
-          other: "%{group_name} y %{others} tienen demasiados miembros. No se notificó a nadie"
-        warning_multiple:
-          one: "%{count} otro"
-          other: "%{count} otros"
+        without_membership: "%{username} no se ha unido a este canal."
+        without_membership_multiple:
+          one: "%{username} y otro usuario no se han unido a este canal."
+          other: "%{username} y otros %{count} usuarios no se han unido a este canal."
+        group_mentions_disabled: "%{group_name} no permite menciones."
+        group_mentions_disabled_multiple:
+          one: "%{group_name} y otro grupo no permiten menciones."
+          other: "%{group_name} y otros %{count} grupos no permiten menciones."
+        too_many_members: "%{group_name} tiene demasiados miembros. No se notificó a nadie."
+        too_many_members_multiple:
+          one: "%{group_name} y otro grupo tienen demasiados miembros. No se ha notificado a nadie."
+          other: "%{group_name} y otros %{count} grupos tienen demasiados miembros. No se ha notificado a nadie."
         groups:
           header:
             some: "Algunos usuarios no serán notificados"
             all: "No se notificará a nadie"
-          unreachable:
-            one: "@%{group} no permite menciones"
-            other: "@%{group} y @%{group_2} no permiten menciones"
-          unreachable_multiple: "@%{group} y otros %{count} no permiten menciones"
-          too_many_members:
-            one: "Mencionar a @%{grupo} supera el %{notification_limit} de %{limit}"
-            other: "Mencionar tanto a @%{grupo} como a @%{group_2} supera el %{notification_limit} de %{limit}"
-          too_many_members_multiple: "Estos %{count} grupos superan el %{notification_limit} de %{limit}"
-          users_limit:
-            one: "%{count} usuario"
-            other: "%{count} usuarios"
-          notification_limit: "límite de notificaciones"
-        too_many_mentions: "Este mensaje supera el %{notification_limit} de %{limit}"
-        mentions_limit:
-          one: "%{count} mención"
-          other: "%{count} menciones"
+          unreachable_1: "@%{group} no permite menciones."
+          unreachable_2: "@%{group1} y @%{group2} no permiten menciones."
+          unreachable_multiple:
+            one: "@%{group} y otro grupo no permiten menciones."
+            other: "@%{group} y otros %{count} grupos no permiten menciones."
+          too_many_members_MF: |
+            { groupCount, plural,
+                 =1 {
+                      { isAdmin, select,
+                        true {
+                          { notificationLimit, plural,
+                              one {Mencionar a @{group1} excede el <a href="{siteSettingUrl}" target="_blank">límite de notificaciones</a> de # usuario.}
+                              other {Mencionar a @{group1} excede el <a href="{siteSettingUrl}" target="_blank">límite de notificaciones</a> de # usuarios.}
+                          }
+                        }
+                        false {
+                          { notificationLimit, plural,
+                              one {Mencionar a @{group1} excede el límite de notificación de # usuario.}
+                              other {Mencionar a @{group1} excede el límite de notificación de # usuarios.}
+                          }
+                        }
+                        other {}
+                      }
+                    }
+                 =2 {
+                      { isAdmin, select,
+                        true {
+                          { notificationLimit, plural,
+                              one {Mencionar a @{group1} y @{group2} excede el <a href="{siteSettingUrl}" target="_blank">límite de notificación</a> de # usuario.}
+                            other {Mencionar a @{group1} y @{group2} excede el <a href="{siteSettingUrl}" target="_blank">límite de notificación</a> de # usuarios.}
+                          }
+                        }
+                        false {
+                          { notificationLimit, plural,
+                              one {Mencionar a @{group1} y @{group2} excede el límite de notificación de # usuario.}
+                            other {Mencionar a @{group1} y @{group2} excede el límite de notificación de # usuarios.}
+                          }
+                        }
+                        other {}
+                      }
+                    }
+              other {
+                      { isAdmin, select,
+                        true {
+                          { notificationLimit, plural,
+                              one {Mencionar a estos {groupCount} grupos excede el <a href="{siteSettingUrl}" target="_blank">límite de notificación</a> de # usuario.}
+                            other {Mencionar a estos {groupCount} grupos excede el <a href="{siteSettingUrl}" target="_blank">límite de notificación</a> de # usuarios.}
+                          }
+                        }
+                        false {
+                          { notificationLimit, plural,
+                              one {Mencionar a estos {groupCount} grupos excede el límite de notificación de # usuario.}
+                            other {Mencionar a estos {groupCount} grupos excede el límite de notificación de # usuarios.}
+                          }
+                        }
+                        other {}
+                      }
+                    }
+            }
+        too_many_mentions:
+          one: "Este mensaje supera el límite de notificaciones de %{count} mención."
+          other: "Este mensaje supera el límite de notificaciones de %{count} menciones."
+        too_many_mentions_admin:
+          one: 'Este mensaje supera el <a href="%{siteSettingUrl}" target="_blank">límite de notificaciones</a> de %{count} mención.'
+          other: 'Este mensaje supera el <a href="%{siteSettingUrl}" target="_blank">límite de notificaciones</a> de %{count} menciones.'
       aria_roles:
         header: "Encabezado del chat"
         composer: "Compositor del chat"
         channels_list: "Lista de canales de chat"
       no_public_channels: "No te has unido a ningún canal."
+      kicked_from_channel: "Ya no puedes acceder a este canal."
       only_chat_push_notifications:
         title: "Enviar solo notificaciones de chat"
         description: "Bloquear el envío de todas las notificaciones que no sean de chat"
@@ -164,10 +231,16 @@ es:
       close_full_page: "Cerrar el chat a pantalla completa"
       open_message: "Abrir mensaje en el chat"
       placeholder_self: "Anota algo"
-      placeholder_others: "Chatear con %{messageRecipient}"
-      placeholder_new_message_disallowed: "El canal está %{status}, no puedes enviar nuevos mensajes en este momento."
+      placeholder_channel: "Chat en %{channelName}"
+      placeholder_thread: "Chatear en el hilo"
+      placeholder_users: "Chatear con %{commaSeparatedNames}"
+      placeholder_new_message_disallowed:
+        archived: "El canal está archivado, no puedes enviar nuevos mensajes en este momento."
+        closed: "El canal está cerrado, no puedes enviar nuevos mensajes en este momento."
+        read_only: "El canal es de solo lectura, no puedes enviar nuevos mensajes en este momento."
       placeholder_silenced: "No puedes enviar mensajes en este momento."
-      placeholder_start_conversation: Inicia una conversación con %{usernames}
+      placeholder_start_conversation: "Iniciar una conversación con ..."
+      placeholder_start_conversation_users: "Iniciar una conversación con %{commaSeparatedUsernames}"
       remove_upload: "Eliminar archivo"
       react: "Reaccionar con emojis"
       reply: "Responder"
@@ -183,8 +256,11 @@ es:
       restore: "Restaurar mensaje eliminado"
       save: "Guardar"
       select: "Seleccionar"
-      silence: "Silenciar al usuario"
       return_to_list: "Volver a la lista de canales"
+      return_to_threads_list: "Volver a las discusiones en curso"
+      unread_threads_count:
+        one: "Tienes %{count} discusión sin leer"
+        other: "Tienes %{count} discusiones sin leer"
       scroll_to_bottom: "Desplazar hacia abajo"
       scroll_to_new_messages: "Ver nuevos mensajes"
       sound:
@@ -196,6 +272,8 @@ es:
       title: "chat"
       title_capitalized: "Chat"
       upload: "Adjuntar un archivo"
+      upload_to_channel: "Subir a %{title}"
+      upload_to_thread: "Subir al hilo"
       uploaded_files:
         one: "%{count} archivo"
         other: "%{count} archivos"
@@ -239,10 +317,23 @@ es:
           about: Acerca de
           members: Miembros
           settings: Ajustes
-      channel_edit_name_modal:
-        title: Editar nombre
+      new_message_modal:
+        title: Enviar mensaje
+        add_user_long: <kbd>mayúsculas + clic</kbd> o <kbd>mayúsculas + intro</kbd><span>Añadir @%{username}</span>
+        add_user_short: <span>Añadir usuario</span>
+        open_channel: <span>Abrir canal</span>
+        default_search_placeholder: "#un-canal, @alguien o lo que sea"
+        default_channel_search_placeholder: "#un-canal"
+        default_user_search_placeholder: "@alguien"
+        user_search_placeholder: "...añadir más usuarios"
+        disabled_user: "ha desactivado el chat"
+        no_items: "No hay elementos"
+      channel_edit_name_slug_modal:
+        title: Editar canal
         input_placeholder: Añadir un nombre
-        description: Pon un título corto y descriptivo a tu canal
+        slug_description: Se utiliza un slug del canal en la URL en lugar del nombre del canal
+        name: Nombre del canal
+        slug: Slug del canal (opcional)
       channel_edit_description_modal:
         title: Editar descripción
         input_placeholder: Añade una descripción
@@ -252,9 +343,6 @@ es:
         prefix: "Para:"
         no_results: No hay resultados
         selected_user_title: "Deseleccionar %{username}"
-      channel_selector:
-        title: "Ir al canal"
-        no_channels: "Ningún canal coincide con tu búsqueda"
       channel:
         no_memberships: Este canal no tiene miembros
         no_memberships_found: No se ha encontrado ningún miembro
@@ -262,23 +350,44 @@ es:
           one: "%{count} miembro"
           other: "%{count} miembros"
       create_channel:
+        threading:
+          label: "Activar el hilado"
         auto_join_users:
           public_category_warning: "%{category} es una categoría pública. ¿Añadir automáticamente a este canal a todos los usuarios activos recientemente?"
-          warning_groups:
-            one: '¿Añadir automáticamente %{members_count} usuarios de %{group}?'
-            other: '¿Añadir automáticamente %{members_count} usuarios de %{group} y %{group_2}?'
-          warning_multiple_groups: '¿Añadir automáticamente %{members_count} usuarios de %{group_1} y %{count} otros?'
+          warning_1_group:
+            one: "¿Añadir automáticamente %{count} usuario de %{group}?"
+            other: "¿Añadir automáticamente %{count} usuarios de %{group}?"
+          warning_2_groups:
+            one: "¿Añadir automáticamente %{count} usuario de %{group1} y %{group2}?"
+            other: "¿Añadir automáticamente %{count} usuarios de %{group1} y %{group2}?"
+          warning_multiple_groups_MF: |
+            { groupCount, plural,
+                one {
+                      { userCount, plural,
+                          one {¿Añadir automáticamente {userCount} usuario de {groupName} y otro grupo?}
+                        other {¿Añadir automáticamente {userCount} usuarios de {groupName} y otro grupo?}
+                      }
+                    }
+              other {
+                      { userCount, plural,
+                          one {¿Añadir automáticamente {userCount} usuario de {groupName} y otros grupos?}
+                        other {¿Añadir automáticamente {userCount} usuarios de {groupName} y otros grupos?}
+                      }
+                    }
+            }
         choose_category:
           label: "Elige una categoría"
           none: "selecciona una..."
           default_hint: Administra el acceso visitando la <a href=%{link} target="_blank">%{category} configuración de seguridad</a>
-          hint_groups:
-            one: Los usuarios de %{hint} tendrán acceso a este canal según la <a href=%{link} target="_blank">configuración de seguridad</a>
-            other: Los usuarios de %{hint} y %{hint_2} tendrán acceso a este canal según la <a href=%{link} target="_blank">configuración de seguridad</a>
-          hint_multiple_groups: Los usuarios de %{hint_1} y %{count} otros grupos tendrán acceso a este canal según la <a href=%{link} target="_blank">configuración de seguridad</a>.
+          hint_1_group: 'Los usuarios de %{group} tendrán acceso a este canal según la <a href="%{settingLink}" target="_blank">configuración de seguridad</a>'
+          hint_2_groups: 'Los usuarios de %{group1} y %{group2} tendrán acceso a este canal según la <a href="%{settingLink}" target="_blank">configuración de seguridad</a>.'
+          hint_multiple_groups:
+            one: 'Los usuarios de %{group} y otro grupo tendrán acceso a este canal según la <a href="%{settingLink}" target="_blank">configuración de seguridad</a>'
+            other: 'Los usuarios de %{group} y otros %{count} grupos tendrán acceso a este canal según la <a href="%{settingLink}" target="_blank">configuración de seguridad</a>'
         create: "Crear canal"
         description: "Descripción (opcional)"
         name: "Nombre del canal"
+        slug: "Slug del canal (opcional)"
         title: "Nuevo canal"
         type: "Tipo"
         types:
@@ -288,15 +397,22 @@ es:
         type: "Mensaje de chat"
       reactions:
         only_you: "Has reaccionado con :%{emoji}:"
-        and_others: "Tú, %{usernames} reaccionaste con :%{emoji}:"
-        only_others: "%{usernames} reaccionó con :%{emoji}:"
-        others_and_more: "%{usernames} y %{more} personas más reaccionaron con :%{emoji}:"
-        you_others_and_more: "Tú, %{usernames} y %{more} personas más reaccionasteis con :%{emoji}:"
+        you_and_single_user: "Tú y %{username} reaccionasteis con :%{emoji}:"
+        you_and_multiple_users: "Tú, %{commaSeparatedUsernames} y %{username} reaccionasteis con :%{emoji}:"
+        you_multiple_users_and_more:
+          one: "Tú, %{commaSeparatedUsernames} y otro reaccionasteis con :%{emoji}:"
+          other: "Tú, %{commaSeparatedUsernames} y %{count} personas más reaccionasteis con :%{emoji}:"
+        single_user: "%{username} reaccionó con :%{emoji}:"
+        multiple_users: "%{commaSeparatedUsernames} y %{username} reaccionaron con :%{emoji}:"
+        multiple_users_and_more:
+          one: "%{commaSeparatedUsernames} y otro reaccionaron con :%{emoji}:"
+          other: "%{commaSeparatedUsernames} y %{count} personas más reaccionaron con :%{emoji}:"
       composer:
         toggle_toolbar: "Alternar barra de herramientas"
         italic_text: "texto enfatizado"
         bold_text: "texto fuerte"
         code_text: "texto del código"
+        send: "Enviar"
       quote:
         original_channel: 'Enviado originalmente en <a href="%{channelLink}">%{channel}</a>'
         copy_success: "Cita del chat copiada en el portapapeles"
@@ -307,15 +423,19 @@ es:
       settings:
         channel_wide_mentions_label: "Permitir menciones @all y @here"
         channel_wide_mentions_description: "Permite a los usuarios notificar a todos los miembros de #%{channel} con @all o solo a los que estén activos en ese momento con @here"
+        channel_threading_label: "Hilado"
+        channel_threading_description: "Cuando se activa el hilado, las respuestas a un mensaje de chat crearán una conversación separada, que existirá junto al canal principal."
         auto_join_users_label: "Añadir usuarios automáticamente"
-        auto_join_users_info: "Consulta cada hora qué usuarios han estado activos en los últimos 3 meses y, si tienen acceso a la categoría %{category} , añádelos a este canal."
-        enable_auto_join_users: "Añade automáticamente todos los usuarios activos recientemente"
+        auto_join_users_info: "Comprueba cada hora qué usuarios han estado activos en los últimos 3 meses. Añádelos a este canal si tienen acceso a la categoría %{category}."
+        auto_join_users_info_no_category: "Comprueba cada hora qué usuarios han estado activos en los últimos 3 meses. Añádelos a este canal si tienen acceso a la categoría seleccionada."
         auto_join_users_warning: "Todos los usuarios que no sean miembros de este canal y tengan acceso a la categoría %{category} se unirán. ¿Estás seguro/a?"
         desktop_notification_level: "Notificaciones de escritorio"
         follow: "Unirse"
         followed: "Se unió"
         mobile_notification_level: "Notificaciones móviles"
         mute: "Silenciar canal"
+        threading_enabled: "Activado"
+        threading_disabled: "Desactivado"
         muted_on: "Activado"
         muted_off: "Desactivado"
         notifications: "Notificaciones"
@@ -324,9 +444,13 @@ es:
         saved: "Guardado"
         unfollow: "Abandonar"
         admin_title: "Administrador"
-        retention_info: "El historial de chat se guardará durante %{days} días."
       admin:
         title: "Chat"
+        export_messages:
+          title: "Exportar mensajes de chat"
+          description: "Actualmente, la exportación está limitada a los 10 000 mensajes más recientes de los últimos 6 meses."
+          create_export: "Crear exportación"
+          export_has_started: "La exportación ha comenzado. Recibirás un MP cuando esté lista."
       direct_messages:
         title: "Chat personal"
         new: "Crear un chat personal"
@@ -390,8 +514,14 @@ es:
           one: "%{commaSeparatedUsernames} y %{count} más está escribiendo"
           other: "%{commaSeparatedUsernames} y %{count} más están escribiendo"
       retention_reminders:
-        public: "El historial del canal se conserva durante %{days} días."
-        dm: "El historial de chat personal se conserva durante %{days} días."
+        public_none: "El historial del canal se conserva indefinidamente."
+        public:
+          one: "El historial del canal se conserva durante %{count} día."
+          other: "El historial del canal se conserva durante %{count} días."
+        dm_none: "El historial personal de chat se conserva indefinidamente."
+        dm:
+          one: "El historial de chat personal se conserva durante %{count} día."
+          other: "El historial de chat personal se conserva durante %{count} días."
       flags:
         off_topic: "Este mensaje no es relevante para la discusión actual, tal y como se define en el título del canal, y probablemente debería moverse a otro lugar."
         inappropriate: "Este mensaje tiene un contenido que una persona razonable consideraría ofensivo, abusivo o que viola las <a href=\"%{basePath}/guidelines\">directrices de nuestra comunidad</a>."
@@ -413,6 +543,33 @@ es:
         symbols: "Símbolos"
         search_placeholder: "Busca por nombre de emoji y alias..."
         no_results: "No hay resultados"
+      thread:
+        title: "Título"
+        view_thread: Ver hilo
+        default_title: "Hilo"
+        replies:
+          one: "%{count} respuesta"
+          other: "%{count} respuestas"
+        label: Hilo
+        close: "Cerrar hilo"
+        original_message:
+          started_by: "Iniciado por"
+        settings: "Ajustes"
+        last_reply: "última respuesta"
+        notifications:
+          regular:
+            title: "Normal"
+            description: "Recibirás una notificación si alguien menciona tu @nombre en este hilo."
+          tracking:
+            title: "En seguimiento"
+            description: "Se mostrará un recuento de las nuevas respuestas de este hilo en la lista de hilos y en el canal. Se te notificará si alguien menciona tu @nombre en este hilo."
+        participants_other_count:
+          one: "+%{count}"
+          other: "+%{count}"
+      threads:
+        open: "Hilo abierto"
+        list: "Discusiones en curso"
+        none: "No participas en ningún hilo de este canal."
       draft_channel_screen:
         header: "Nuevo mensaje"
         cancel: "Cancelar"
@@ -457,9 +614,8 @@ es:
       transcript:
         view: "Ver la transcripción de los mensajes anteriores"
       types:
-        reviewable_chat_message:
+        chat_reviewable_message:
           title: "Mensaje de chat denunciado"
-          flagged_by: "Denunciado por"
     keyboard_shortcuts_help:
       chat:
         title: "Chat"
@@ -472,6 +628,7 @@ es:
           composer_code: "%{shortcut} Código (solo compositor)"
           drawer_open: "%{shortcut} Abrir el cajón del chat"
           drawer_close: "%{shortcut} Cerrar cajón del chat"
+          mark_all_channels_read: "%{shortcut} Marcar todos los canales como leídos"
     topic_statuses:
       chat:
         help: "El chat está activado para este tema"
@@ -490,3 +647,7 @@ es:
         chat_notifications_with_unread:
           one: "Notificaciones del chat: %{count} notificación no leída"
           other: "Notificaciones de chat: %{count} notificaciones no leídas"
+    styleguide:
+      sections:
+        chat:
+          title: Chat
diff --git a/plugins/chat/config/locales/client.et.yml b/plugins/chat/config/locales/client.et.yml
index 08ba7f3f3fd..70354ff4f18 100644
--- a/plugins/chat/config/locales/client.et.yml
+++ b/plugins/chat/config/locales/client.et.yml
@@ -20,14 +20,13 @@ et:
       joined: "liitus"
       email_frequency:
         never: "Mitte kunagi"
+      header_indicator_preference:
+        never: "Mitte kunagi"
       flag: "Tähis"
       join: "Liitu"
+      last_visit: "viimane visiit"
       mention_warning:
         dismiss: "ignoreeri"
-        groups:
-          users_limit:
-            one: "%{count} kasutaja"
-            other: "%{count} kasutajat"
       reply: "Vasta"
       edit: "Muuda"
       rebake_message: "Rekonstrueeri HTML"
@@ -67,11 +66,14 @@ et:
       composer:
         italic_text: "esiletõstetud tekst"
         bold_text: "rasvane tekst"
+        send: "Saada"
       notification_levels:
         never: "Mitte kunagi"
       settings:
         follow: "Liitu"
         followed: "Liitus"
+        threading_enabled: "Sisse lülitatud"
+        threading_disabled: "Välja lülitatud"
         notifications: "Teavitus"
         preview: "Eelvaade"
         save: "Salvesta"
@@ -101,6 +103,21 @@ et:
       emoji_picker:
         objects: "Objektid"
         flags: "Tähised"
+      thread:
+        title: "Pealkiri"
+        replies:
+          one: "%{count} vastus"
+          other: "%{count} vastust"
+        settings: "Sätted"
+        last_reply: "viimane vastus"
+        notifications:
+          regular:
+            title: "Normaalne"
+          tracking:
+            title: "Jälgimine"
+        participants_other_count:
+          one: "+%{count}"
+          other: "+%{count}"
       draft_channel_screen:
         header: "Uus sõnum"
         cancel: "Tühista"
diff --git a/plugins/chat/config/locales/client.fa_IR.yml b/plugins/chat/config/locales/client.fa_IR.yml
index de5f1a01fe4..90f1228b7e0 100644
--- a/plugins/chat/config/locales/client.fa_IR.yml
+++ b/plugins/chat/config/locales/client.fa_IR.yml
@@ -64,7 +64,6 @@ fa_IR:
       click_to_join: "برای مشاهده کانال‌های موجود، اینجا را کلیک کنید."
       close: "بستن"
       confirm_flag: "آیا برای پرچم گذاری پیام %{username} مطمئن هستید؟"
-      deleted: "یک پیام حذف شد. [view]"
       hidden: "یک پیام پنهان شده است. [view]"
       delete: "حذف"
       edited: "ویرایش شده"
@@ -77,6 +76,10 @@ fa_IR:
       email_frequency:
         never: "هرگز"
         title: "آگاه‌سازی‌های ایمیل"
+      header_indicator_preference:
+        all_new: "همه پیام‌های جدید"
+        dm_and_mentions: "پیام‌های خصوصی و اشاره شده"
+        never: "هرگز"
       enable: "فعال کردن گفتگو"
       flag: "پرچم"
       flagged: "این پیام برای بررسی پرچم گذاری شده است"
@@ -84,24 +87,19 @@ fa_IR:
       in_reply_to: "در پاسخ به"
       heading: "گفتگو"
       join: "عضو شدن"
-      new_messages: "پیام‌های جدید"
+      last_visit: "آخرین بازدید"
       mention_warning:
         dismiss: "رد کردن"
         invitations_sent:
           one: "دعوت‌نامه ارسال شد"
           other: "دعوت‌نامه‌ها ارسال شد"
         invite: "دعوت به کانال"
-        groups:
-          users_limit:
-            one: "%{count} کاربر"
-            other: "%{count} کاربر"
       aria_roles:
         channels_list: "فهرست کانال‌های گفتگو"
       no_public_channels: "شما هنوز عضو هیچ کانالی نشده‌اید."
       open: "باز کردن گفتگو..."
       close_full_page: "بستن گفتگو تمام صفحه"
       open_message: "پیام را در گفتگو باز کن"
-      placeholder_start_conversation: شروع گفتگو با %{usernames}
       remove_upload: "حذف پرونده"
       react: "واکنش با شکلک"
       reply: "پاسخ"
@@ -118,6 +116,10 @@ fa_IR:
       save: "ذخیره"
       select: "انتخاب کنید"
       return_to_list: "بازگشت به فهرست کانال‌ها"
+      return_to_threads_list: "بازگشت به گفتگوی جاری"
+      unread_threads_count:
+        one: "شما %{count} گفتگوی خوانده نشده دارید"
+        other: "شما %{count} گفتگوی خوانده نشده دارید"
       scroll_to_bottom: "حرکت به پایین"
       scroll_to_new_messages: "مشاهده پیام‌های جدید"
       sound:
@@ -167,9 +169,10 @@ fa_IR:
           about: درباره
           members: اعضاء
           settings: تنظیمات
-      channel_edit_name_modal:
-        title: ویرایش نام
+      channel_edit_name_slug_modal:
+        title: ویرایش کانال
         input_placeholder: افزودن نام
+        name: نام کانال
       channel_edit_description_modal:
         title: ویرایش توضیحات
         input_placeholder: افزودن توضیحات
@@ -178,8 +181,6 @@ fa_IR:
         title: پیام جدید
         prefix: "به:"
         no_results: هیج نتیجه‌ای نداشت
-      channel_selector:
-        no_channels: "هیچ کانالی با جستجوی شما مطابقت ندارد"
       channel:
         no_memberships: این کانال هنوز هیچ عضوی ندارد
         no_memberships_found: هیچ عضوی یافت نشد
@@ -187,11 +188,6 @@ fa_IR:
           one: "%{count} عضو"
           other: "%{count} عضو"
       create_channel:
-        auto_join_users:
-          warning_groups:
-            one: به طور خودکار %{members_count} کاربر از گروه %{group} اضافه شود؟
-            other: به طور خودکار %{members_count} کاربر از گروه %{group} و %{group_2} اضافه شود؟
-          warning_multiple_groups: به طور خودکار %{members_count} کاربر از گروه %{group_1} و %{count} نفر دیگر اضافه شود؟
         choose_category:
           label: "انتخاب دسته‌بندی"
           none: "یکی را انتخاب کنید..."
@@ -210,6 +206,7 @@ fa_IR:
       composer:
         italic_text: "متن تاکید شده"
         bold_text: "نوشته‌ی ضخیم "
+        send: "ارسال"
       quote:
         copy_success: "نقل قول گفتگو در کلیپ‌بورد کپی شد"
       notification_levels:
@@ -220,12 +217,11 @@ fa_IR:
         channel_wide_mentions_label: "اجازه داده به استفاده از اشاره @all و @here"
         channel_wide_mentions_description: "به کاربران اجازه دهید به همه اعضای #%{channel} با @all یا فقط افرادی که در حال حاضر فعال هستند با @here، آگاه‌سازی کنند."
         auto_join_users_label: "افزودن خودکار کاربران"
-        auto_join_users_info: "بررسی کنید که کاربران در ۳ ماه گذشته فعال بوده‌اند و در دسته‌بندی %{category} دسترسی داشته باشند، آنها را به این کانال اضافه کنید."
-        enable_auto_join_users: "به طور خودکار همه کاربران فعال اخیر را اضافه کنید"
         desktop_notification_level: "آگاه‌سازی‌های دسکتاپ"
         follow: "عضو شدن"
         followed: "عضو شده"
         mute: "بی‌صدا کردن کانال"
+        threading_disabled: "غیرفعال"
         muted_on: "روشن"
         muted_off: "خاموش"
         notifications: "اعلان‌ها"
@@ -234,7 +230,6 @@ fa_IR:
         saved: "ذخیره شد"
         unfollow: "ترک کردن"
         admin_title: "مدیر کل"
-        retention_info: "تاریخچه گفتگو به مدت %{days} روز ذخیره خواهد شد."
       admin:
         title: "گفتگو"
       direct_messages:
@@ -285,6 +280,23 @@ fa_IR:
         flags: "پرچم‌ها"
         symbols: "نشانه ها"
         no_results: "هیج نتیجه‌ای نداشت"
+      thread:
+        title: "عنوان"
+        view_thread: مشاهده موضوع
+        replies:
+          one: "%{count} پاسخ"
+          other: "%{count} پاسخ"
+        original_message:
+          started_by: "شروع شده توسط"
+        settings: "تنظیمات"
+        last_reply: "آخرین پاسخ"
+        notifications:
+          regular:
+            title: "معمولی"
+          tracking:
+            title: "پیگیری"
+      threads:
+        list: "گفتگوهای در حال انجام"
       draft_channel_screen:
         header: "پیام جدید"
         cancel: "انصراف"
@@ -315,10 +327,6 @@ fa_IR:
     review:
       transcript:
         view: "مشاهده رونوشت متن پیام‌های قبلی"
-      types:
-        reviewable_chat_message:
-          title: "پیام گفتگوی پرچم گذاری شده"
-          flagged_by: "پرچم شده توسط"
     keyboard_shortcuts_help:
       chat:
         title: "گفتگو"
@@ -342,3 +350,7 @@ fa_IR:
         chat_notifications_with_unread:
           one: "آگاه‌سازی‌های گفتگو - %{count} آگاه‌سازی خوانده نشده"
           other: "آگاه‌سازی‌های گفتگو - %{count} آگاه‌سازی خوانده نشده"
+    styleguide:
+      sections:
+        chat:
+          title: گفتگو
diff --git a/plugins/chat/config/locales/client.fi.yml b/plugins/chat/config/locales/client.fi.yml
index 45833a40dbb..e10a33cc757 100644
--- a/plugins/chat/config/locales/client.fi.yml
+++ b/plugins/chat/config/locales/client.fi.yml
@@ -38,9 +38,6 @@ fi:
       browse_all_channels: "Selaa kaikkia kanavia"
       move_to_channel:
         title: "Siirrä viestit kanavalle"
-        instructions:
-          one: "Olet siirtämässä <strong>%{count}</strong> viestin. Valitse kohdekanava. Kanavalle <strong>%{channelTitle}</strong> luodaan paikkamerkkiviesti, joka osoittaa, että tämä viesti on siirretty."
-          other: "Olet siirtämässä <strong>%{count}</strong> viestiä. Valitse kohdekanava. Kanavalle <strong>%{channelTitle}</strong> luodaan paikkamerkkiviesti, joka osoittaa, että nämä viestit on siirretty."
         confirm_move: "Siirrä viestit"
       channel_settings:
         title: "Kanavan asetukset"
@@ -71,7 +68,6 @@ fi:
         instructions: "Kanavan sulkeminen estää muita kuin henkilökunnan käyttäjiä lähettämästä uusia viestejä tai muokkaamasta olemassa olevia viestejä. Haluatko varmasti sulkea tämän kanavan?"
       channel_delete:
         title: "Poista kanava"
-        instructions: "<p>Poistaa kanavan <strong>%{name}</strong> ja chat-historian. Kaikki viestit ja niihin liittyvät tiedot, kuten reaktiot ja lataukset, poistetaan pysyvästi. Jos haluat säilyttää kanavan historian ja poistaa sen käytöstä, voit sen sijaan arkistoida kanavan.</p> <p>Haluatko varmasti <strong>poistaa kanavan psyyvästi</strong>? Vahvista kirjoittamalla kanavan nimi alla olevaan ruutuun.</p>"
         confirm: "Ymmärrän seuraukset, poista kanava"
         confirm_channel_name: "Anna kanavan nimi"
         process_started: "Kanavan poistoprosessi on alkanut. Tämä modaalinen ikkuna sulkeutuu pian, etkä näe enää poistettua kanavaa missään."
@@ -81,8 +77,11 @@ fi:
       click_to_join: "Näytä saatavilla olevat kanavat napsauttamalla tätä."
       close: "Sulje"
       collapse: "Tiivistä chat-laatikko"
+      expand: "Laajenna chat-laatikko"
       confirm_flag: "Haluatko varmasti liputtaa käyttäjän %{username} viestin?"
-      deleted: "Viesti poistettiin. [näytä]"
+      deleted:
+        one: "Viesti poistettiin. [näytä]"
+        other: "%{count} viestiä poistettiin. [näytä kaikki]"
       hidden: "Viesti piilotettiin. [näytä]"
       delete: "Poista"
       edited: "muokattu"
@@ -97,6 +96,9 @@ fi:
         never: "Ei koskaan"
         title: "Sähköposti-ilmoitukset"
         when_away: "Vain poissa ollessa"
+      header_indicator_preference:
+        all_new: "Kaikki uudet viestit"
+        never: "Ei koskaan"
       enable: "Ota chat käyttöön"
       flag: "Liputa"
       emoji: "Lisää emoji"
@@ -106,48 +108,22 @@ fi:
       in_reply_to: "Vastauksena:"
       heading: "Chat"
       join: "Liity"
-      new_messages: "uusia viestejä"
+      last_visit: "edellinen vierailu"
+      summarization:
+        summarize: "Tee yhteenveto"
       mention_warning:
         dismiss: "hylkää"
-        cannot_see:
-          one: "%{username} ei voi käyttää tätä kanavaa, eikä hänelle ilmoitettu."
-          other: "%{username} ja %{others} eivät voi käyttää tätä kanavaa, eikä heille ilmoitettu."
         invitations_sent:
           one: "Kutsu lähetetty"
           other: "Kutsut lähetettiin"
         invite: "Kutsu kanavalle"
-        without_membership:
-          one: "%{username} ei ole liittynyt tälle kanavalle."
-          other: "%{username} ja %{others} eivät ole liittyneet tälle kanavalle."
-        group_mentions_disabled:
-          one: "%{group_name} ei salli mainintoja"
-          other: "%{group_name} ja %{others} eivät salli mainintoja"
-        too_many_members:
-          one: "Ryhmässä %{group_name} on liian monta jäsentä. Kukaan ei saanut ilmoitusta."
-          other: "Ryhmä %{group_name} ja %{others} sisältävät liikaa jäseniä. Kukaan ei saanut ilmoitusta."
-        warning_multiple:
-          one: "%{count} muu"
-          other: "%{count} muuta"
+        without_membership: "%{username} ei ole liittynyt tälle kanavalle."
+        group_mentions_disabled: "%{group_name} ei salli mainintoja."
         groups:
           header:
             some: "Osa käyttäjistä ei saa ilmoitusta"
             all: "Kukaan ei saa ilmoitusta"
-          unreachable:
-            one: "@%{group} ei salli mainintoja"
-            other: "@%{group} ja @%{group_2} eivät salli mainintoja"
-          unreachable_multiple: "@%{group} ja %{count} muuta eivät salli mainintoja"
-          too_many_members:
-            one: "Ryhmän @%{group} mainitseminen ylittää %{notification_limit}: %{limit}"
-            other: "Ryhmien @%{group} ja @%{group_2} mainitseminen ylittää %{notification_limit}: %{limit}"
-          too_many_members_multiple: "Nämä %{count} ryhmää ylittää %{notification_limit}: %{limit}"
-          users_limit:
-            one: "%{count} käyttäjä"
-            other: "%{count} käyttäjää"
-          notification_limit: "ilmoitusrajan"
-        too_many_mentions: "Tämä viesti ylittää %{notification_limit}: %{limit}"
-        mentions_limit:
-          one: "%{count} maininta"
-          other: "%{count} mainintaa"
+          unreachable_1: "@%{group} ei salli mainintoja."
       aria_roles:
         header: "Chatin ylätunniste"
         composer: "Chatin tekstieditori"
@@ -164,10 +140,11 @@ fi:
       close_full_page: "Sulje koko näytön chat"
       open_message: "Avaa viesti chatissa"
       placeholder_self: "Kirjoita jotakin"
-      placeholder_others: "Chat-keskustelu käyttäjän %{messageRecipient} kanssa"
-      placeholder_new_message_disallowed: "Kanava on %{status}, et voi lähettää uusia viestejä juuri nyt."
+      placeholder_channel: "Keskustelu kanavalla %{channelName}"
+      placeholder_thread: "Keskustelu ketjussa"
+      placeholder_users: "Chat-keskustelu käyttäjän %{commaSeparatedNames} kanssa"
       placeholder_silenced: "Et voi lähettää viestejä tällä hetkellä."
-      placeholder_start_conversation: Aloita keskustelu käyttäjän %{usernames} kanssa
+      placeholder_start_conversation_users: "Aloita keskustelu käyttäjän %{commaSeparatedUsernames} kanssa"
       remove_upload: "Poista tiedosto"
       react: "Reagoi emojilla"
       reply: "Vastaa"
@@ -183,8 +160,11 @@ fi:
       restore: "Palauta poistettu viesti"
       save: "Tallenna"
       select: "Valitse"
-      silence: "Hiljennä käyttäjä"
       return_to_list: "Palaa kanavaluetteloon"
+      return_to_threads_list: "Palaa aktiivisiin keskusteluihin"
+      unread_threads_count:
+        one: "Sinulla on %{count} lukematon keskustelu"
+        other: "Sinulla on %{count} lukematonta keskustelua"
       scroll_to_bottom: "Vieritä alas"
       scroll_to_new_messages: "Katso uudet viestit"
       sound:
@@ -196,6 +176,8 @@ fi:
       title: "chat"
       title_capitalized: "Chat"
       upload: "Liitä tiedosto"
+      upload_to_channel: "Lähetä kanavalle %{title}"
+      upload_to_thread: "Lähetä ketjuun"
       uploaded_files:
         one: "%{count} tiedosto"
         other: "%{count} tiedostoa"
@@ -237,9 +219,14 @@ fi:
           about: Tietoja
           members: Jäsenet
           settings: Asetukset
-      channel_edit_name_modal:
-        title: Muokkaa nimeä
+      new_message_modal:
+        default_channel_search_placeholder: "#a-kanava"
+        default_user_search_placeholder: "@joku"
+        no_items: "Ei kohteita"
+      channel_edit_name_slug_modal:
+        title: Muokkaa kanavaa
         input_placeholder: Lisää nimi
+        name: Kanavan nimi
       channel_edit_description_modal:
         title: Muokkaa kuvausta
         input_placeholder: Lisää kuvaus
@@ -249,9 +236,6 @@ fi:
         prefix: "Vastaanottaja:"
         no_results: Ei tuloksia
         selected_user_title: "Poista käyttäjän %{username} valinta"
-      channel_selector:
-        title: "Siirry kanavalle"
-        no_channels: "Hakuasi vastaavia kanavia ei ole"
       channel:
         no_memberships: Tällä kanavalla ei ole jäseniä
         no_memberships_found: Jäseniä ei löytynyt
@@ -261,18 +245,10 @@ fi:
       create_channel:
         auto_join_users:
           public_category_warning: "%{category} on julkinen alue. Lisätäänkö kaikki hiljattain aktiiviset käyttäjät automaattisesti tälle kanavalle?"
-          warning_groups:
-            one: Lisätäänkö %{members_count} käyttäjää automaattisesti ryhmästä %{group}?
-            other: Lisätäänkö %{members_count} käyttäjää automaattisesti ryhmistä %{group} ja %{group_2}?
-          warning_multiple_groups: Lisätäänkö %{members_count} käyttäjää automaattisesti ryhmästä %{group_1} ja %{count} muusta?
         choose_category:
           label: "Valitse alue"
           none: "valitse yksi..."
           default_hint: Hallinnoi käyttöoikeutta <a href=%{link} target="_blank">alueen %{category} turvallisuusasetuksissa</a>
-          hint_groups:
-            one: Ryhmän %{hint} käyttäjillä on automaattisesti pääsy tälle kanavalle <a href=%{link} target="_blank">turvallisuusasetusten</a> mukaan
-            other: Ryhmien %{hint} ja %{hint_2} käyttäjillä on automaattisesti pääsy tälle kanavalle <a href=%{link} target="_blank">turvallisuusasetusten</a> mukaan
-          hint_multiple_groups: Ryhmän %{hint_1} ja %{count} muun ryhmän käyttäjillä on automaattisesti pääsy tälle kanavalle <a href=%{link} target="_blank">turvallisuusasetusten</a> mukaan
         create: "Luo kanava"
         description: "Kuvaus (valinnainen)"
         name: "Kanavan nimi"
@@ -285,15 +261,13 @@ fi:
         type: "Chat-viesti"
       reactions:
         only_you: "Reagoit emojilla :%{emoji}:"
-        and_others: "Sinä, %{usernames} reagoitte emojilla :%{emoji}:"
-        only_others: "%{usernames} reagoivat emojilla :%{emoji}:"
-        others_and_more: "%{usernames} ja %{more} muuta reagoivat emojilla :%{emoji}:"
-        you_others_and_more: "Sinä, %{usernames} ja %{more} muuta reagoivat emojilla :%{emoji}:"
+        single_user: "%{username} reagoivat emojilla :%{emoji}:"
       composer:
         toggle_toolbar: "Vaihda työkalupalkki"
         italic_text: "korostettu teksti"
         bold_text: "lihavoitu teksti"
         code_text: "kooditeksti"
+        send: "Lähetä"
       quote:
         original_channel: 'Lähetetty alun perin kanavalla <a href="%{channelLink}">%{channel}</a>'
         copy_success: "Chat-lainaus kopioitiin leikepöydälle"
@@ -305,14 +279,14 @@ fi:
         channel_wide_mentions_label: "Salli @all- ja @here-maininnat"
         channel_wide_mentions_description: "Salli käyttäjien ilmoittaa kaikille kanavan #%{channel} käyttäjille @all-maininnalla tai niille, jotka ovat aktiivisia kyseisellä hetkellä, @here-maininnalla"
         auto_join_users_label: "Lisää käyttäjiä automaattisesti"
-        auto_join_users_info: "Tarkista tunnin välein, ketkä käyttäjistä ovat olleet aktiivisia viimeisten kolmen kuukauden aikana, ja jos heillä on pääsy alueelle %{category}, lisää heidät tälle kanavalle."
-        enable_auto_join_users: "Lisää automaattisesti kaikki hiljattain aktiiviset käyttäjät"
         auto_join_users_warning: "Jokainen käyttäjä, joka ei ole tämän kanavan jäsen ja jolla on pääsy alueelle %{category}, liittyy. Oletko varma?"
         desktop_notification_level: "Työpöytäilmoitukset"
         follow: "Liity"
         followed: "Liittyi"
         mobile_notification_level: "Mobiili-push-ilmoitukset"
         mute: "Vaimenna kanava"
+        threading_enabled: "Otettu käyttöön"
+        threading_disabled: "Pois käytöstä"
         muted_on: "Käytössä"
         muted_off: "Pois käytöstä"
         notifications: "Ilmoitukset"
@@ -321,7 +295,6 @@ fi:
         saved: "Tallennettu"
         unfollow: "Poistu"
         admin_title: "Ylläpitäjä"
-        retention_info: "Chat-historia tallennetaan %{days} päivän ajaksi."
       admin:
         title: "Chat"
       direct_messages:
@@ -386,9 +359,6 @@ fi:
         many_users:
           one: "%{commaSeparatedUsernames} ja %{count} muu kirjoittavat"
           other: "%{commaSeparatedUsernames} ja %{count} muuta kirjoittavat"
-      retention_reminders:
-        public: "Kanavan historia säilytetään %{days} päivän ajan."
-        dm: "Henkilökohtainen chat-historia säilytetään %{days} päivän ajan."
       flags:
         off_topic: "Tämä viesti ei liity nykyiseen keskusteluun kanavan otsikon mukaan, ja se pitäisi todennäköisesti siirtää muualle."
         inappropriate: "Tämä viesti sisältää sisältöä, jota kohtuullinen henkilö pitäisi loukkaavana, herjaavana tai <a href=\"%{basePath}/guidelines\">yhteisömme ohjeiden vastaisena</a>."
@@ -410,6 +380,29 @@ fi:
         symbols: "Symbolit"
         search_placeholder: "Hae emojin nimen ja aliaksen mukaan..."
         no_results: "Ei tuloksia"
+      thread:
+        title: "Otsikko"
+        view_thread: Näytä ketju
+        replies:
+          one: "%{count} vastaus"
+          other: "%{count} vastausta"
+        close: "Sulje ketju"
+        original_message:
+          started_by: "Aloittanut"
+        settings: "Asetukset"
+        last_reply: "viimeisin vastaus"
+        notifications:
+          regular:
+            title: "Normaali"
+          tracking:
+            title: "Seuranta"
+        participants_other_count:
+          one: "+%{count}"
+          other: "+%{count}"
+      threads:
+        open: "Avaa ketju"
+        list: "Käynnissä olevat keskustelut"
+        none: "Et osallistu mihinkään viestiketjuun tällä kanavalla."
       draft_channel_screen:
         header: "Uusi viesti"
         cancel: "Peruuta"
@@ -454,9 +447,8 @@ fi:
       transcript:
         view: "Näytä aiempien viestien transkriptio"
       types:
-        reviewable_chat_message:
+        chat_reviewable_message:
           title: "Liputettu chat-viesti"
-          flagged_by: "Liputtanut"
     keyboard_shortcuts_help:
       chat:
         title: "Chat"
@@ -487,3 +479,7 @@ fi:
         chat_notifications_with_unread:
           one: "Chat-ilmoitukset – %{count} lukematon ilmoitus"
           other: "Chat-ilmoitukset – %{count} lukematonta ilmoitusta"
+    styleguide:
+      sections:
+        chat:
+          title: Chat
diff --git a/plugins/chat/config/locales/client.fr.yml b/plugins/chat/config/locales/client.fr.yml
index 515bcd03054..8572fbb7275 100644
--- a/plugins/chat/config/locales/client.fr.yml
+++ b/plugins/chat/config/locales/client.fr.yml
@@ -38,9 +38,6 @@ fr:
       browse_all_channels: "Parcourir tous les canaux"
       move_to_channel:
         title: "Déplacer les messages vers le canal"
-        instructions:
-          one: "Vous déplacez <strong>%{count}</strong> message. Sélectionnez un canal de destination. Un message de substitution sera créé dans le canal <strong>%{channelTitle}</strong> pour indiquer que ce message a été déplacé."
-          other: "Vous déplacez <strong>%{count}</strong> messages. Sélectionnez un canal de destination. Un message de substitution sera créé dans le canal <strong>%{channelTitle}</strong> pour indiquer que ces messages ont été déplacés."
         confirm_move: "Déplacer les messages"
       channel_settings:
         title: "Paramètres du canal"
@@ -71,7 +68,6 @@ fr:
         instructions: "La fermeture du canal empêche les utilisateurs non responsables d'envoyer de nouveaux messages ou de modifier des messages existants. Voulez-vous vraiment fermer ce canal ?"
       channel_delete:
         title: "Supprimer le canal"
-        instructions: "<p>Supprime le canal <strong>%{name}</strong> et l'historique des discussions. Tous les messages et données associées, telles que les réactions et les téléversements, seront définitivement supprimés. Si vous souhaitez conserver l'historique du canal et le désactiver, vous pouvez plutôt archiver le canal.</p> <p>Voulez-vous vraiment <strong>supprimer définitivement</strong> le canal ? Pour confirmer, saisissez le nom du canal dans la case ci-dessous.</p>"
         confirm: "Je comprends les conséquences. Supprimer le canal"
         confirm_channel_name: "Saisissez le nom du canal"
         process_started: "Le processus de suppression du canal a commencé. Ce modal sera bientôt fermé et vous ne verrez plus le canal supprimé nulle part."
@@ -82,7 +78,6 @@ fr:
       close: "Fermer"
       collapse: "Réduire le tiroir de discussion"
       confirm_flag: "Voulez-vous vraiment signaler le message de %{username} ?"
-      deleted: "Un message a été supprimé. [view]"
       hidden: "Un message a été masqué. [view]"
       delete: "Supprimer"
       edited: "modifié"
@@ -97,6 +92,8 @@ fr:
         never: "Jamais"
         title: "Notifications par e-mail"
         when_away: "Seulement en cas d'absence"
+      header_indicator_preference:
+        never: "Jamais"
       enable: "Activer la discussion"
       flag: "Drapeau"
       emoji: "Insérer un émoji"
@@ -106,48 +103,23 @@ fr:
       in_reply_to: "En réponse à"
       heading: "Discussion"
       join: "Rejoindre"
-      new_messages: "nouveaux messages"
+      last_visit: "dernière visite"
+      summarization:
+        summarize: "Résumer"
       mention_warning:
         dismiss: "rejeter"
-        cannot_see:
-          one: "%{username} ne peut pas accéder à ce canal et n'a pas été averti(e)."
-          other: "%{username} et %{others} ne peuvent pas accéder à ce canal et n'ont pas été avertis."
         invitations_sent:
           one: "Invitation envoyée"
           other: "Invitations envoyées"
         invite: "Inviter à rejoindre le canal"
-        without_membership:
-          one: "%{username} n'a pas rejoint ce canal."
-          other: "%{username} et %{others} n'ont pas rejoint ce canal."
-        group_mentions_disabled:
-          one: "%{group_name} n'autorise pas les mentions"
-          other: "%{group_name} et %{others} n'autorisent pas les mentions"
-        too_many_members:
-          one: "%{group_name} a trop de membres. Personne n'a reçu de notification"
-          other: "%{group_name} et %{others} ont trop de membres. Personne n'a reçu de notification"
-        warning_multiple:
-          one: "%{count} autre"
-          other: "%{count} autres"
+        without_membership: "%{username} n'a pas rejoint ce canal."
+        group_mentions_disabled: "%{group_name} n'autorise pas les mentions."
+        too_many_members: "%{group_name} a trop de membres. Personne n'a reçu de notification."
         groups:
           header:
             some: "Certains utilisateurs ne recevront pas de notification"
             all: "Personne ne recevra de notification"
-          unreachable:
-            one: "@%{group} n'autorise pas les mentions"
-            other: "@%{group} et @%{group_2} n'autorisent pas les mentions"
-          unreachable_multiple: "@%{group} et %{count} autres groupes n'autorisent pas les mentions"
-          too_many_members:
-            one: "Mentionner @%{group} dépasse la %{notification_limit} de %{limit}"
-            other: "Mentionner @%{group} et @%{group_2} dépasse la %{notification_limit} de %{limit}"
-          too_many_members_multiple: "Ces %{count} groupes dépassent la %{notification_limit} de %{limit}"
-          users_limit:
-            one: "%{count} utilisateur"
-            other: "%{count} utilisateurs"
-          notification_limit: "limite de notification"
-        too_many_mentions: "Ce message dépasse la %{notification_limit} de %{limit}"
-        mentions_limit:
-          one: "%{count} mention"
-          other: "%{count} mentions"
+          unreachable_1: "@%{group} n'autorise pas les mentions."
       aria_roles:
         header: "En-tête de discussion"
         composer: "Compositeur de discussion"
@@ -164,10 +136,9 @@ fr:
       close_full_page: "Fermer la discussion en plein écran"
       open_message: "Ouvrir le message dans la discussion"
       placeholder_self: "Noter quelque chose"
-      placeholder_others: "Discuter avec %{messageRecipient}"
-      placeholder_new_message_disallowed: "Le canal a le statut %{status}, vous ne pouvez pas envoyer de nouveaux messages pour le moment."
+      placeholder_users: "Discuter avec %{commaSeparatedNames}"
       placeholder_silenced: "Vous ne pouvez pas envoyer de messages pour le moment."
-      placeholder_start_conversation: Démarrer une conversation avec %{usernames}
+      placeholder_start_conversation_users: "Démarrer une conversation avec %{commaSeparatedUsernames}"
       remove_upload: "Supprimer le fichier"
       react: "Réagir avec un émoji"
       reply: "Répondre"
@@ -183,7 +154,6 @@ fr:
       restore: "Restaurer le message supprimé"
       save: "Enregistrer"
       select: "Sélectionner"
-      silence: "Désactiver l'utilisateur"
       return_to_list: "Retour à la liste des canaux"
       scroll_to_bottom: "Défiler vers le bas"
       scroll_to_new_messages: "Voir les nouveaux messages"
@@ -239,6 +209,10 @@ fr:
           about: À propos
           members: Membres
           settings: Paramètres
+      new_message_modal:
+        no_items: "Aucun élément"
+      channel_edit_name_slug_modal:
+        name: Nom du canal
       channel_edit_description_modal:
         title: Modifier la description
         input_placeholder: Ajouter une description
@@ -248,9 +222,6 @@ fr:
         prefix: "À :"
         no_results: Aucun résultat
         selected_user_title: "Désélectionner %{username}"
-      channel_selector:
-        title: "Accéder au canal"
-        no_channels: "Aucun canal ne correspond à votre recherche"
       channel:
         no_memberships: Ce canal ne comprend aucun membre
         no_memberships_found: Aucun membre trouvé
@@ -260,18 +231,10 @@ fr:
       create_channel:
         auto_join_users:
           public_category_warning: "%{category} est une catégorie publique. Ajouter automatiquement tous les utilisateurs récemment actifs à ce canal ?"
-          warning_groups:
-            one: Ajouter automatiquement %{members_count} utilisateurs de %{group} ?
-            other: Ajouter automatiquement %{members_count} utilisateurs de %{group} et de %{group_2} ?
-          warning_multiple_groups: Ajouter automatiquement %{members_count} utilisateurs de %{group_1} et de %{count} autres groupes ?
         choose_category:
           label: "Choisir une catégorie"
           none: "sélectionnez-en une…"
           default_hint: Gérer l'accès en visitant <a href=%{link} target="_blank">les paramètres de sécurité de %{category}</a>
-          hint_groups:
-            one: Les utilisateurs de %{hint} auront accès à ce canal selon les <a href=%{link} target="_blank">paramètres de sécurité</a>
-            other: Les utilisateurs de %{hint} et de %{hint_2} auront accès à ce canal selon les <a href=%{link} target="_blank">paramètres de sécurité</a>
-          hint_multiple_groups: Les utilisateurs de %{hint_1} et de %{count} autres groupes auront accès à ce canal selon les <a href=%{link} target="_blank">paramètres de sécurité</a>
         create: "Créer un canal"
         description: "Description (facultative)"
         name: "Nom du canal"
@@ -284,15 +247,13 @@ fr:
         type: "Message de discussion"
       reactions:
         only_you: "Vous avez réagi avec :%{emoji}:"
-        and_others: "Vous, %{usernames} avez réagi avec :%{emoji}:"
-        only_others: "%{usernames} a réagi avec :%{emoji} :"
-        others_and_more: "%{usernames} et %{more} autres utilisateurs ont réagi avec :%{emoji}:"
-        you_others_and_more: "Vous, %{usernames} et %{more} autres utilisateurs avez réagi avec :%{emoji}:"
+        single_user: "%{username} a réagi avec :%{emoji} :"
       composer:
         toggle_toolbar: "Basculer la barre d'outils"
         italic_text: "texte souligné"
         bold_text: "texte gras"
         code_text: "texte codé"
+        send: "Envoyer"
       quote:
         original_channel: 'Envoyé à l''origine dans le canal <a href="%{channelLink}">%{channel}</a>'
         copy_success: "Citation de discussion copiée dans le presse-papiers"
@@ -304,14 +265,14 @@ fr:
         channel_wide_mentions_label: "Autoriser les mentions @all et @here"
         channel_wide_mentions_description: "Autoriser les utilisateurs à notifier tous les membres de #%{channel} avec @all ou uniquement ceux qui sont actifs en ce moment avec @here"
         auto_join_users_label: "Ajouter automatiquement des utilisateurs"
-        auto_join_users_info: "Vérifier toutes les heures quels utilisateurs ont été actifs au cours des 3 derniers mois et, s'ils ont accès à la catégorie %{category}, les ajouter à ce canal."
-        enable_auto_join_users: "Ajouter automatiquement tous les utilisateurs récemment actifs"
         auto_join_users_warning: "Chaque utilisateur qui n'est pas membre de ce canal et qui a accès à la catégorie %{category} le rejoindra. Voulez-vous continuer ?"
         desktop_notification_level: "Notifications sur le bureau"
         follow: "Rejoindre"
         followed: "Rejoint"
         mobile_notification_level: "Notifications push mobiles"
         mute: "Mettre le canal en sourdine"
+        threading_enabled: "Activée "
+        threading_disabled: "Désactivée"
         muted_on: "Activé"
         muted_off: "Désactivé"
         notifications: "Notifications"
@@ -320,7 +281,6 @@ fr:
         saved: "Enregistré"
         unfollow: "Quitter"
         admin_title: "Administrateur"
-        retention_info: "L'historique des discussions sera enregistré pendant %{days} jours."
       admin:
         title: "Discussion"
       direct_messages:
@@ -385,9 +345,6 @@ fr:
         many_users:
           one: "%{commaSeparatedUsernames} et %{count} autre utilisateur sont en train d'écrire"
           other: "%{commaSeparatedUsernames} et %{count} autres utilisateurs sont en train d'écrire"
-      retention_reminders:
-        public: "L'historique du canal est conservé pendant %{days} jours."
-        dm: "L'historique des discussions privées est conservé pendant %{days} jours."
       flags:
         off_topic: "Ce message n'est pas pertinent pour la discussion en cours telle que définie par le titre du canal et devrait probablement être déplacé ailleurs."
         inappropriate: "Ce message contient du contenu qu'une personne raisonnable considérerait comme offensant, abusif ou contraire à nos <a href=\"%{basePath}/guidelines\">consignes communautaires</a>."
@@ -409,6 +366,21 @@ fr:
         symbols: "Symboles"
         search_placeholder: "Recherche par nom d'émoji et alias…"
         no_results: "Aucun résultat"
+      thread:
+        title: "Titre"
+        replies:
+          one: "%{count} réponse"
+          other: "%{count} réponses"
+        settings: "Paramètres"
+        last_reply: "dernière réponse"
+        notifications:
+          regular:
+            title: "Normale"
+          tracking:
+            title: "Suivre"
+        participants_other_count:
+          one: "+%{count}"
+          other: "+%{count}"
       draft_channel_screen:
         header: "Nouveau message"
         cancel: "Annuler"
@@ -453,9 +425,8 @@ fr:
       transcript:
         view: "Afficher la transcription des messages précédents"
       types:
-        reviewable_chat_message:
+        chat_reviewable_message:
           title: "Message de discussion signalé"
-          flagged_by: "Signalé par"
     keyboard_shortcuts_help:
       chat:
         title: "Discussion"
@@ -486,3 +457,7 @@ fr:
         chat_notifications_with_unread:
           one: "Notifications de discussion - %{count} notification non lue"
           other: "Notifications de discussion - %{count} notifications non lues"
+    styleguide:
+      sections:
+        chat:
+          title: Discussion
diff --git a/plugins/chat/config/locales/client.gl.yml b/plugins/chat/config/locales/client.gl.yml
index e0c19ffc21f..a642cf89b75 100644
--- a/plugins/chat/config/locales/client.gl.yml
+++ b/plugins/chat/config/locales/client.gl.yml
@@ -21,14 +21,13 @@ gl:
       joined: "uniuse"
       email_frequency:
         never: "Nunca"
+      header_indicator_preference:
+        never: "Nunca"
       flag: "Sinalar"
       join: "Participar"
+      last_visit: "última visita"
       mention_warning:
         dismiss: "desbotar"
-        groups:
-          users_limit:
-            one: "%{count} usuario"
-            other: "%{count} usuarios"
       reply: "Responder"
       edit: "Editar"
       rebake_message: "Reconstruír HTML"
@@ -57,6 +56,8 @@ gl:
           about: Verbo de
           members: Membros
           settings: Configuración
+      new_message_modal:
+        no_items: "Sen elementos"
       direct_message_creator:
         title: Nova mensaxe
         prefix: "A:"
@@ -68,11 +69,14 @@ gl:
       composer:
         italic_text: "texto recalcado"
         bold_text: "texto groso"
+        send: "Enviar"
       notification_levels:
         never: "Nunca"
       settings:
         follow: "Participar"
         followed: "Uniuse"
+        threading_enabled: "Activado"
+        threading_disabled: "Desactivado"
         notifications: "Notificacións"
         preview: "Visualizar"
         save: "Gardar"
@@ -104,6 +108,21 @@ gl:
         activities: "Actividades"
         flags: "Alertas"
         symbols: "Símbolos"
+      thread:
+        title: "Título"
+        replies:
+          one: "%{count} resposta"
+          other: "%{count} repostas"
+        settings: "Configuración"
+        last_reply: "última resposta"
+        notifications:
+          regular:
+            title: "Normal"
+          tracking:
+            title: "Seguimento"
+        participants_other_count:
+          one: "+%{count}"
+          other: "+%{count}"
       draft_channel_screen:
         header: "Nova mensaxe"
         cancel: "Cancelar"
@@ -115,7 +134,3 @@ gl:
           fields:
             message:
               label: Mensaxe
-    review:
-      types:
-        reviewable_chat_message:
-          flagged_by: "Sinalado por"
diff --git a/plugins/chat/config/locales/client.he.yml b/plugins/chat/config/locales/client.he.yml
index fd5e5f56770..2259586f466 100644
--- a/plugins/chat/config/locales/client.he.yml
+++ b/plugins/chat/config/locales/client.he.yml
@@ -15,6 +15,7 @@ he:
           actions:
             chat_channel_status_change: "מצב ערוץ הצ׳אט השתנה"
             chat_channel_delete: "ערוץ הצ׳אט נמחק"
+            chat_auto_remove_membership: "חברות הוסרה אוטומטית מערוצים"
       api:
         scopes:
           descriptions:
@@ -39,10 +40,10 @@ he:
       move_to_channel:
         title: "העברת הודעות לערוץ"
         instructions:
-          one: "פעולה זו תעביר הודעה <strong>%{count}</strong>. יש לבחור ערוץ יעד. הודעה ממלאת מקום תיווצר בערוץ <strong>%{channelTitle}</strong> כדי לציין שההודעה הזאת הועברה."
-          two: "פעולה זו תעביר <strong>%{count}</strong> הודעות. יש לבחור ערוץ יעד. הודעה ממלאת מקום תיווצר בערוץ <strong>%{channelTitle}</strong> כדי לציין שההודעות האלו הועברו."
-          many: "פעולה זו תעביר <strong>%{count}</strong> הודעות. יש לבחור ערוץ יעד. הודעה ממלאת מקום תיווצר בערוץ <strong>%{channelTitle}</strong> כדי לציין שההודעות האלו הועברו."
-          other: "פעולה זו תעביר <strong>%{count}</strong> הודעות. יש לבחור ערוץ יעד. הודעה ממלאת מקום תיווצר בערוץ <strong>%{channelTitle}</strong> כדי לציין שההודעות האלו הועברו."
+          one: "בחרת להעביר הודעה <strong>%{count}</strong>. נא לבחור את ערוץ היעד. הודעה ממלאת מקום תיווצר בערוץ <strong>%{channelTitle}</strong> כדי לציין שההודעה הזאת הועברה. נא לשים לב ששרשורי תגובה לא יישמרו בערוץ החדש והודעות בערוץ הישן לא תופענה עוד כתגובה להודעות כלשהן שהועברו."
+          two: "בחרת להעביר <strong>%{count}</strong> הודעות. נא לבחור את ערוץ היעד. הודעה ממלאת מקום תיווצר בערוץ <strong>%{channelTitle}</strong> כדי לציין שההודעות האלו הועברו. נא לשים לב ששרשורי תגובה לא יישמרו בערוץ החדש והודעות בערוץ הישן לא תופענה עוד כתגובה להודעות כלשהן שהועברו."
+          many: "בחרת להעביר <strong>%{count}</strong> הודעות. נא לבחור את ערוץ היעד. הודעה ממלאת מקום תיווצר בערוץ <strong>%{channelTitle}</strong> כדי לציין שההודעות האלו הועברו. נא לשים לב ששרשורי תגובה לא יישמרו בערוץ החדש והודעות בערוץ הישן לא תופענה עוד כתגובה להודעות כלשהן שהועברו."
+          other: "בחרת להעביר <strong>%{count}</strong> הודעות. נא לבחור את ערוץ היעד. הודעה ממלאת מקום תיווצר בערוץ <strong>%{channelTitle}</strong> כדי לציין שההודעות האלו הועברו. נא לשים לב ששרשורי תגובה לא יישמרו בערוץ החדש והודעות בערוץ הישן לא תופענה עוד כתגובה להודעות כלשהן שהועברו."
         confirm_move: "העברת הודעות"
       channel_settings:
         title: "הגדרות ערוץ"
@@ -73,7 +74,7 @@ he:
         instructions: "סגירת הערוץ מונעת ממשתמשים מחוץ לסגל לשלוח הודעות חדשות או לערוך הודעות קיימות. לסגור את הערוץ הזה?"
       channel_delete:
         title: "מחיקת ערוץ"
-        instructions: "<p>תהליך זה ימחק את הערוץ <strong>%{name}</strong> ואת היסטוריית ההתכתבות בו. כל ההודעות והנתונים הקשורים כגון תגובות והעלאות יימחקו לחלוטין. אם עדיף לך לשמר את היסטוריית הערוץ ולבטל אותו, אפשר להעביר את הערוץ לארכיון במקום.</p> <p>למחוק את הערוץ <strong>לצמיתות</strong>? כדי לאשר, נא למלא את שם הערוץ בתיבה שלהלן.</p>"
+        instructions: "<p>פעולה זו תמחק את הערוץ <strong>%{name}</strong> ואת היסטוריית הצ׳אט. כל ההודעות והנתונים הקשורים, כגון רגשות והעלאות יימחקו לצמיתות. כדי לשמור על היסטוריית הערוץ ולהשבית אותה, יכול להיות שעדיף לך להעביר את הערוץ לארכיון במקום.</p> <p>אכן <strong>למחוק לצמיתות</strong> את הערוץ? כדי לאשר, יש להקליד את שם הערוץ בתיבה שלהלן.</p>"
         confirm: "ההשלכות ברורות לי, נא למחוק את הערוץ"
         confirm_channel_name: "נא למלא את שם הערוץ"
         process_started: "תהליך מחיקת הערוץ החל. חלונית צצה זו תיסגר בקרוב, הערוץ שנמחק לא יופיעו עוד בשום מקום."
@@ -83,8 +84,13 @@ he:
       click_to_join: "לחיצה כאן תציג את הערוצים הזמינים."
       close: "סגירה"
       collapse: "צמצום מגירת צ׳אט"
+      expand: "הרחבת מגירת הצ׳אט"
       confirm_flag: "לסמן את ההודעה של %{username}?"
-      deleted: "הודעה נמחקה. [צפייה]"
+      deleted:
+        one: "הודעה נמחקה. [הצגה]"
+        two: "%{count} הודעות נמחקו. [הצגה של הכול]"
+        many: "%{count} הודעות נמחקו. [הצגה של הכול]"
+        other: "%{count} הודעות נמחקו. [הצגה של הכול]"
       hidden: "הודעה הוסתרה. [צפייה]"
       delete: "מחיקה"
       edited: "נערך"
@@ -99,6 +105,11 @@ he:
         never: "לעולם לא"
         title: "הודעות בדוא״ל"
         when_away: "רק כשלא במערכת"
+      header_indicator_preference:
+        title: "הצגת מחוון פעילות בכותרת"
+        all_new: "כל ההודעות החדשות"
+        dm_and_mentions: "הודעות ישירות ואזכורים"
+        never: "לעולם לא"
       enable: "הפעלת צ׳אט"
       flag: "דיגול"
       emoji: "הוספת אמוג׳י"
@@ -108,73 +119,129 @@ he:
       in_reply_to: "בתגובה אל"
       heading: "צ׳אט"
       join: "הצטרף"
-      new_messages: "הודעות חדשות"
+      last_visit: "ביקור אחרון"
+      summarization:
+        title: "סיכום הודעות"
+        description: "נא לבחור אפשרות להלן כדי לסכם את הדיון שנשלח בפרק הזמן המבוקש."
+        summarize: "סיכום"
+        since:
+          one: "שעה אחרונה"
+          two: "השעתיים האחרונות"
+          many: "%{count} השעות האחרונות"
+          other: "%{count} השעות האחרונות"
       mention_warning:
         dismiss: "התעלמות"
-        cannot_see:
-          one: "ל־%{username} אין גישה לערוץ הזה ולא נשלחה הודעה."
-          two: "ל־%{username} ולעוד %{others} אין גישה לערוץ הזה ולא נשלחו הודעות."
-          many: "ל־%{username} ולעוד %{others} אין גישה לערוץ הזה ולא נשלחו הודעות."
-          other: "ל־%{username} ולעוד %{others} אין גישה לערוץ הזה ולא נשלחו הודעות."
+        cannot_see: "ל־%{username} אין גישה לערוץ הזה ולא נשלחה התראה."
+        cannot_see_multiple:
+          one: "ל־%{username} ולעוד %{count} אין גישה לערוץ הזה ולא נשלחו הודעות."
+          two: "ל־%{username} ולעוד %{count} אין גישה לערוץ הזה ולא נשלחו הודעות."
+          many: "ל־%{username} ולעוד %{count} אין גישה לערוץ הזה ולא נשלחו הודעות."
+          other: "ל־%{username} ולעוד %{count} אין גישה לערוץ הזה ולא נשלחו הודעות."
         invitations_sent:
           one: "נשלחה הזמנה"
           two: "נשלחו הזמנות"
           many: "נשלחו הזמנות"
           other: "נשלחו הזמנות"
         invite: "הזמנה לערוץ"
-        without_membership:
-          one: "לא הצטרפו לערוץ הזה: %{username}."
-          two: "לא הצטרפו לערוץ הזה: %{username} ועוד %{others}."
-          many: "לא הצטרפו לערוץ הזה: %{username} ועוד %{others}."
-          other: "לא הצטרפו לערוץ הזה: %{username} ועוד %{others}."
-        group_mentions_disabled:
-          one: "אזכורים אסורים בקבוצה %{group_name}"
-          two: "אזכורים אסורים בקבוצה %{group_name} ובעוד %{others}"
-          many: "אזכורים אסורים בקבוצה %{group_name} ובעוד %{others}"
-          other: "אזכורים אסורים בקבוצה %{group_name} ובעוד %{others}"
-        too_many_members:
-          one: "בקבוצה %{group_name} יש יותר מדי חברים. לא נשלחו התראות."
-          two: "בקבוצה %{group_name} וב־%{others} נוספות יש יותר מדי חברים. לא נשלחו התראות."
-          many: "בקבוצה %{group_name} וב־%{others} נוספות יש יותר מדי חברים. לא נשלחו התראות."
-          other: "בקבוצה %{group_name} וב־%{others} נוספות יש יותר מדי חברים. לא נשלחו התראות."
-        warning_multiple:
-          one: "%{count} נוסף"
-          two: "%{count} נוספים"
-          many: "%{count} נוספים"
-          other: "%{count} נוספים"
+        without_membership: "לא הצטרפו לערוץ הזה: %{username}."
+        without_membership_multiple:
+          one: "לא הצטרפו לערוץ הזה: %{username} ועוד %{count}."
+          two: "לא הצטרפו לערוץ הזה: %{username} ועוד %{count}."
+          many: "לא הצטרפו לערוץ הזה: %{username} ועוד %{count}."
+          other: "לא הצטרפו לערוץ הזה: %{username} ועוד %{count}."
+        group_mentions_disabled: "אזכורים אסורים בקבוצה %{group_name}."
+        group_mentions_disabled_multiple:
+          one: "%{group_name} וקבוצה %{count} נוספת לא מרשות אזכורים."
+          two: "%{group_name} ו־%{count} קבוצות נוספת לא מרשות אזכורים."
+          many: "%{group_name} ו־%{count} קבוצות נוספת לא מרשות אזכורים."
+          other: "%{group_name} ו־%{count} קבוצות נוספת לא מרשות אזכורים."
+        too_many_members: "בקבוצה %{group_name} יש יותר מדי חברים. לא נשלחו התראות."
+        too_many_members_multiple:
+          one: "בקבוצה %{group_name} וב־%{count} נוספת יש יותר מדי חברים. לא נשלחו התראות."
+          two: "בקבוצה %{group_name} וב־%{count} נוספות יש יותר מדי חברים. לא נשלחו התראות."
+          many: "בקבוצה %{group_name} וב־%{count} נוספות יש יותר מדי חברים. לא נשלחו התראות."
+          other: "בקבוצה %{group_name} וב־%{count} נוספות יש יותר מדי חברים. לא נשלחו התראות."
         groups:
           header:
             some: "חלק מהמשתמשים לא יקבלו התראה"
             all: "אף אחד לא יקבל התראה"
-          unreachable:
-            one: "אזכורים אסורים בקבוצה ‎@%{group}"
-            two: "אזכורים אסורים בקבוצה ‎@%{group} ובקבוצה ‎@%{group_2}"
-            many: "אזכורים אסורים בקבוצה ‎@%{group} ובקבוצה ‎@%{group_2}"
-            other: "אזכורים אסורים בקבוצה ‎@%{group} ובקבוצה ‎@%{group_2}"
-          unreachable_multiple: "‎@%{group} ועוד %{count} נוספות לא מרשות לאזכר"
-          too_many_members:
-            one: "אזכור ‎@%{group} חורג מ%{notification_limit} של %{limit}"
-            two: "אזכור של ‎@%{group} או ‎@%{group_2} חורג מ%{notification_limit} של %{limit}"
-            many: "אזכור של @%{group} או @%{group_2} חורג מ%{notification_limit} של %{limit}"
-            other: "אזכור של @%{group} או @%{group_2} חורג מ%{notification_limit} של %{limit}"
-          too_many_members_multiple: "%{count} קבוצות אלו חורגות מ%{notification_limit} של %{limit}"
-          users_limit:
-            one: "משתמש/ת %{count}"
-            two: "%{count} משתמשים"
-            many: "%{count} משתמשים"
-            other: "%{count} משתמשים"
-          notification_limit: "מגבלת התראה"
-        too_many_mentions: "הודעה זו חורגת מ%{notification_limit} של %{limit}"
-        mentions_limit:
-          one: "אזכור %{count}"
-          two: "%{count} אזכורים"
-          many: "%{count} אזכורים"
-          other: "%{count} אזכורים"
+          unreachable_1: "@אזכורים אסורים בקבוצה %{group}."
+          unreachable_2: "‎@%{group1} ו־‎@%{group2} לא מרשות אזכורים."
+          unreachable_multiple:
+            one: "‎@%{group} וקבוצה %{count} נוספת לא מרשות אזכורים."
+            two: "‎@%{group} ו־%{count} קבוצות נוספת לא מרשות אזכורים."
+            many: "‎@%{group} ו־%{count} קבוצות נוספת לא מרשות אזכורים."
+            other: "‎@%{group} ו־%{count} קבוצות נוספת לא מרשות אזכורים."
+          too_many_members_MF: |
+            { groupCount, plural,
+                 =1 {
+                      { isAdmin, select,
+                        true {
+                          { notificationLimit, plural,
+                              one {אזכור של ‎@{group1} חורג מ<a href="{siteSettingUrl}" target="_blank">מגבלת ההתראה</a> על סך משתמש #.}
+                              other {אזכור של ‎@{group1} חורג מ<a href="{siteSettingUrl}" target="_blank">מגבלת ההתראה</a> על סך # משתמשים.}
+                          }
+                        }
+                        false {
+                          { notificationLimit, plural,
+                              one {אזכור של ‎@{group1} חורג ממגבלת ההתראה על סך משתמש #.}
+                              other {אזכור של ‎@{group1} חורג ממגבלת ההתראה על סך # משתמשים.}
+                          }
+                        }
+                        other {}
+                      }
+                    }
+                 =2 {
+                      { isAdmin, select,
+                        true {
+                          { notificationLimit, plural,
+                              one {אזכור של ‎@{group1} ושל ‎@{group2} חורג מ<a href="{siteSettingUrl}" target="_blank">מגבלת ההתראה</a> על סך משתמש #.}
+                            other {אזכור של ‎@{group1} ושל ‎@{group2} חורג מ<a href="{siteSettingUrl}" target="_blank">מגבלת ההתראה</a> על סך # משתמשים.}
+                          }
+                        }
+                        false {
+                          { notificationLimit, plural,
+                              one {אזכור של ‎@{group1} ושל ‎@{group2} חורג ממגבלת ההתראה על סך משתמש #.}
+                            other {אזכור של ‎@{group1} ושל ‎@{group2} חורג ממגבלת ההתראה על סך # משתמשים.}
+                          }
+                        }
+                        other {}
+                      }
+                    }
+              other {
+                      { isAdmin, select,
+                        true {
+                          { notificationLimit, plural,
+                              one {אזכור {groupCount} הקבוצות האלו חורג מ<a href="{siteSettingUrl}" target="_blank">מגבלת ההתראה</a> על סך משתמש #.}
+                            other {אזכור {groupCount} הקבוצות האלו חורג מ<a href="{siteSettingUrl}" target="_blank">מגבלת ההתראה</a> על סך # משתמשים.}
+                          }
+                        }
+                        false {
+                          { notificationLimit, plural,
+                              one {אזכור {groupCount} הקבוצות האלו חורג ממגבלת ההתראה על סך משתמש #.}
+                            other {אזכור {groupCount} הקבוצות האלו חורג ממגבלת ההתראה על סך # משתמשים.}
+                          }
+                        }
+                        other {}
+                      }
+                    }
+            }
+        too_many_mentions:
+          one: "ההודעה חורגת ממגבלת ההתראות של אזכור %{count}."
+          two: "ההודעה חורגת ממגבלת ההתראות של %{count} אזכורים."
+          many: "ההודעה חורגת ממגבלת ההתראות של %{count} אזכורים."
+          other: "ההודעה חורגת ממגבלת ההתראות של %{count} אזכורים."
+        too_many_mentions_admin:
+          one: 'הודעה זו חורגת מ<a href="%{siteSettingUrl}" target="_blank">מגבלת ההתראות</a> על סך אזכור %{count}.'
+          two: 'הודעה זו חורגת מ<a href="%{siteSettingUrl}" target="_blank">מגבלת ההתראות</a> על סך %{count} אזכורים.'
+          many: 'הודעה זו חורגת מ<a href="%{siteSettingUrl}" target="_blank">מגבלת ההתראות</a> על סך %{count} אזכורים.'
+          other: 'הודעה זו חורגת מ<a href="%{siteSettingUrl}" target="_blank">מגבלת ההתראות</a> על סך %{count} אזכורים.'
       aria_roles:
         header: "כותרת צ׳אט"
         composer: "כותב צ׳אט"
         channels_list: "רשימת ערוצי צ׳אט"
       no_public_channels: "לא הצטרפת לאף ערוץ."
+      kicked_from_channel: "אין לך יותר גישה לערוץ הזה."
       only_chat_push_notifications:
         title: "לשלוח התראות בדחיפה על הצ׳אט בלבד"
         description: "לחסום שליחה של התראות בדחיפה שאינן לגבי הצ׳אט"
@@ -186,10 +253,16 @@ he:
       close_full_page: "סגירת צ׳אט במסך מלא"
       open_message: "פתיחת הודעה בצ׳אט"
       placeholder_self: "לקשקש משהו"
-      placeholder_others: "צ׳אט עם %{messageRecipient}"
-      placeholder_new_message_disallowed: "הערוץ %{status}, אין לך אפשרות לשלוח הודעות חדשות כעת."
+      placeholder_channel: "צ׳אט ב־%{channelName}"
+      placeholder_thread: "צ'אט בשרשור"
+      placeholder_users: "צ׳אט עם %{commaSeparatedNames}"
+      placeholder_new_message_disallowed:
+        archived: "הערוץ הועבר לארכיון, אי אפשר לשלוח אליו הודעות חדשות כעת."
+        closed: "הערוץ סגור, אי אפשר לשלוח אליו הודעות חדשות כעת."
+        read_only: "הערוץ לקריאה בלבד, אי אפשר לשלוח אליו הודעות חדשות כעת."
       placeholder_silenced: "אין לך אפשרות לשלוח הודעות כרגע."
-      placeholder_start_conversation: פתיחת דיון עם %{usernames}
+      placeholder_start_conversation: "פציחה בשיחה עם…"
+      placeholder_start_conversation_users: "פציחה בשיחה עם %{commaSeparatedUsernames}"
       remove_upload: "הסרת קובץ"
       react: "להגיב עם אמוג׳י"
       reply: "להגיב"
@@ -205,8 +278,13 @@ he:
       restore: "שחזור הודעה שנמחקה"
       save: "שמירה"
       select: "בחירה"
-      silence: "השתקת משתמש"
       return_to_list: "חזרה לרשימת הערוצים"
+      return_to_threads_list: "חזרה לדיונים שמתקיימים כרגע"
+      unread_threads_count:
+        one: "יש דיון שטרם קראת"
+        two: "יש %{count} דיונים שטרם קראת"
+        many: "יש %{count} דיונים שטרם קראת"
+        other: "יש %{count} דיונים שטרם קראת"
       scroll_to_bottom: "גלילה לתחתית"
       scroll_to_new_messages: "הצגת הודעות חדשות"
       sound:
@@ -218,6 +296,8 @@ he:
       title: "צ׳אט"
       title_capitalized: "צ׳אט"
       upload: "צירוף קובץ"
+      upload_to_channel: "העלאה אל %{title}"
+      upload_to_thread: "העלאה לשרשור"
       uploaded_files:
         one: "קובץ %{count}"
         two: "%{count} קבצים"
@@ -263,10 +343,23 @@ he:
           about: אודות
           members: חברים
           settings: הגדרות
-      channel_edit_name_modal:
-        title: עריכת שם
+      new_message_modal:
+        title: שליחת הודעה
+        add_user_long: <kbd>shift + לחיצת עכבר</kbd> או <kbd>shift + enter</kbd><span>מוסיפים ‎@%{username}</span>
+        add_user_short: <span>הוספת משתמש</span>
+        open_channel: <span>פתיחת ערוץ</span>
+        default_search_placeholder: "#ערוץ, @מישהם או כל דבר אחר"
+        default_channel_search_placeholder: "#ערוץ"
+        default_user_search_placeholder: "@מישהם"
+        user_search_placeholder: "…הוספת משתמשים נוספים"
+        disabled_user: "השבית את הצ׳אט"
+        no_items: "אין פריטים"
+      channel_edit_name_slug_modal:
+        title: עריכת ערוץ
         input_placeholder: הוספת שם
-        description: נא להעניק שם מפורט אך קצר לערוץ שלך
+        slug_description: במזהה הייצוגי נעשה שימוש בכתובת במקום בשם הערוץ
+        name: שם הערוץ
+        slug: מזהה ייצוגי של הערוץ (רשות)
       channel_edit_description_modal:
         title: עריכת תיאור
         input_placeholder: הוספת תיאור
@@ -276,9 +369,6 @@ he:
         prefix: "אל:"
         no_results: אין תוצאות
         selected_user_title: "ביטול בחירת %{username}"
-      channel_selector:
-        title: "קפיצה לערוץ"
-        no_channels: "אין ערוצים שתואמים לחיפוש שלך"
       channel:
         no_memberships: אין חברים בערוץ הזה
         no_memberships_found: לא נמצאו חברים
@@ -288,27 +378,50 @@ he:
           many: "%{count} חברים"
           other: "%{count} חברים"
       create_channel:
+        threading:
+          label: "הפעלת שרשור"
         auto_join_users:
           public_category_warning: "%{category} היא קטגוריה ציבורית. להוסיף את כל המשתמשים שהיו פעילים לאחרונה לערוץ הזה?"
-          warning_groups:
-            one: להוסיף %{members_count} משתמשים מתוך %{group} אוטומטית?
-            two: להוסיף %{members_count} משתמשים מתוך %{group} ומתוך %{group_2} אוטומטית?
-            many: להוסיף %{members_count} משתמשים מתוך %{group} ומתוך %{group_2} אוטומטית?
-            other: להוסיף %{members_count} משתמשים מתוך %{group} ומתוך %{group_2} אוטומטית?
-          warning_multiple_groups: להוסיף %{members_count} משתמשים מתוך %{group_1} ועוד %{count} קבוצות אוטומטית?
+          warning_1_group:
+            one: "להוסיף משתמש %{count} מהקבוצה %{group} אוטומטית?"
+            two: "להוסיף %{count} משתמשים מהקבוצה %{group} אוטומטית?"
+            many: "להוסיף %{count} משתמשים מהקבוצה %{group} אוטומטית?"
+            other: "להוסיף %{count} משתמשים מהקבוצה %{group} אוטומטית?"
+          warning_2_groups:
+            one: "להוסיף משתמש %{count} מהקבוצות %{group1} וגם %{group2} אוטומטית?"
+            two: "להוסיף %{count} משתמשים מהקבוצות %{group1} וגם %{group2} אוטומטית?"
+            many: "להוסיף %{count} משתמשים מהקבוצות %{group1} וגם %{group2} אוטומטית?"
+            other: "להוסיף %{count} משתמשים מהקבוצות %{group1} וגם %{group2} אוטומטית?"
+          warning_multiple_groups_MF: |
+            { groupCount, plural,
+                one {
+                      { userCount, plural,
+                          one {להוסיף אוטומטית משתמש {userCount} מהקבוצה {groupName} ומ־{groupCount} נוספת?}
+                        other {להוסיף אוטומטית {userCount} משתמשים מהקבוצה {groupName} ומ־{groupCount} נוספת?}
+                      }
+                    }
+              other {
+                      { userCount, plural,
+                          one {להוסיף אוטומטית משתמש {userCount} מהקבוצה {groupName} ומ־{groupCount} נוספות?}
+                        other {להוסיף אוטומטית {userCount} משתמשים מהקבוצה {groupName} ומ־{groupCount} נוספות?}
+                      }
+                    }
+            }
         choose_category:
           label: "נא לבחור קטגוריה"
           none: "נא לבחור אחד…"
           default_hint: ניתן לנהל את הגישה באמצעות ביקור ב<a href=%{link} target="_blank">הגדרות האבטחה של %{category}</a>
-          hint_groups:
-            one: למשתמשים ב־%{hint} תהיה גישה לערוץ בהתאם ל<a href=%{link} target="_blank">הגדרות האבטחה</a>
-            two: למשתמשים ב־%{hint} וב־%{hint_2} תהיה גישה לערוץ בהתאם ל<a href=%{link} target="_blank">הגדרות האבטחה</a>
-            many: למשתמשים ב־%{hint} וב־%{hint_2} תהיה גישה לערוץ בהתאם ל<a href=%{link} target="_blank">הגדרות האבטחה</a>
-            other: למשתמשים ב־%{hint} וב־%{hint_2} תהיה גישה לערוץ בהתאם ל<a href=%{link} target="_blank">הגדרות האבטחה</a>
-          hint_multiple_groups: למשתמשים ב־%{hint_1} וב־%{count} קבוצות נוספות תהיה גישה לערוץ בהתאם ל<a href=%{link} target="_blank">הגדרות האבטחה</a>
+          hint_1_group: 'למשתמשים ב־%{group} תהיה גישה לערוץ הזה בהתאם ל<a href="%{settingLink}" target="_blank">הגדרות האבטחה</a>'
+          hint_2_groups: 'למשתמשים ב־%{group1} וב־%{group2} תהיה גישה לערוץ הזה בהתאם ל<a href="%{settingLink}" target="_blank">הגדרות האבטחה</a>'
+          hint_multiple_groups:
+            one: 'למשתמשים ב־%{group} ובקבוצה %{count} נוספת תהיה גישה לערוץ הזה בהתאם ל<a href="%{settingLink}" target="_blank">הגדרות האבטחה</a>'
+            two: 'למשתמשים ב־%{group} וב־%{count} קבוצות נוספות תהיה גישה לערוץ הזה בהתאם ל<a href="%{settingLink}" target="_blank">הגדרות האבטחה</a>'
+            many: 'למשתמשים ב־%{group} וב־%{count} קבוצות נוספות תהיה גישה לערוץ הזה בהתאם ל<a href="%{settingLink}" target="_blank">הגדרות האבטחה</a>'
+            other: 'למשתמשים ב־%{group} וב־%{count} קבוצות נוספות תהיה גישה לערוץ הזה בהתאם ל<a href="%{settingLink}" target="_blank">הגדרות האבטחה</a>'
         create: "יצירת ערוץ"
         description: "תיאור (רשות)"
         name: "שם הערוץ"
+        slug: "מזהה ייצוגי של הערוץ (רשות)"
         title: "ערוץ חדש"
         type: "סוג"
         types:
@@ -318,15 +431,26 @@ he:
         type: "הודעת צ׳אט"
       reactions:
         only_you: "הגבת עם :%{emoji}:"
-        and_others: "הגבת, יחד עם %{usernames} באמוג׳י :%{emoji}:"
-        only_others: "%{usernames} הגיבו באמוג׳י :%{emoji}:"
-        others_and_more: "%{usernames} ו־%{more} נוספים הגיבו באמוג׳י :%{emoji}:"
-        you_others_and_more: "הגבת, יחד עם %{usernames} ו־%{more} נוספים באמוג׳י :%{emoji}:"
+        you_and_single_user: "הגבת יחד עם %{username} את האמוג׳י :%{emoji}:"
+        you_and_multiple_users: "הגבת יחד עם %{commaSeparatedUsernames} ו־%{username} את האמוג׳י :%{emoji}:"
+        you_multiple_users_and_more:
+          one: "הגבת יחד עם %{commaSeparatedUsernames} ועוד %{count} את האמוג׳י :%{emoji}:"
+          two: "הגבת יחד עם %{commaSeparatedUsernames} ו־%{count} נוספים את האמוג׳י :%{emoji}:"
+          many: "הגבת יחד עם %{commaSeparatedUsernames} ו־%{count} נוספים את האמוג׳י :%{emoji}:"
+          other: "הגבת יחד עם %{commaSeparatedUsernames} ו־%{count} נוספים את האמוג׳י :%{emoji}:"
+        single_user: "האמוג׳י שנוסף ע״י %{username} הוא :%{emoji}:"
+        multiple_users: "%{commaSeparatedUsernames} ו־%{username} הגיבו את האמוג׳י :%{emoji}:"
+        multiple_users_and_more:
+          one: "%{commaSeparatedUsernames} ועוד %{count} הגיבו את האמוג׳י :%{emoji}:"
+          two: "%{commaSeparatedUsernames} ועוד %{count} הגיבו את האמוג׳י :%{emoji}:"
+          many: "%{commaSeparatedUsernames} ועוד %{count} הגיבו את האמוג׳י :%{emoji}:"
+          other: "%{commaSeparatedUsernames} ועוד %{count} הגיבו את האמוג׳י :%{emoji}:"
       composer:
         toggle_toolbar: "החלפת מצב סרגל כלים"
         italic_text: "טקסט נטוי"
         bold_text: "טקסט מודגש"
         code_text: "טקסט קוד"
+        send: "שליחה"
       quote:
         original_channel: 'נשלח במקור ב־<a href="%{channelLink}">%{channel}</a>'
         copy_success: "ציטוט מהצ׳אט הועתק ללוח הגזירים"
@@ -337,15 +461,19 @@ he:
       settings:
         channel_wide_mentions_label: "לאפשר אזכורים של ‎@all (כולם) ו־‎@here (כאן)"
         channel_wide_mentions_description: "לאפשר למשתמשים להודיע לכל החברים שב־‎#%{channel} באמצעות ‎@all (כולם) או רק לאלו שפעילים כרגע עם ‎@here (כאן)"
+        channel_threading_label: "שרשור"
+        channel_threading_description: "כאשר שרשור פעיל, תגובות להודעות בצ׳אט תיצורנה דיון נפרד, שיתקיים לצד הערוץ הראשי."
         auto_join_users_label: "להוסיף משתמשים אוטומטית"
-        auto_join_users_info: "לבדוק כל שעה אילו משתמשים היו פעילים ב־3 החודשים האחרונים ואם יש להם גישה לקטגוריה %{category}, להוסיף אותם לערוץ הזה."
-        enable_auto_join_users: "להוסיף אוטומטית את כל המשתמשים שהיו פעילים לאחרונה"
+        auto_join_users_info: "לבדוק כל שעה אילו משתמשים היו פעילים ב־3 החודשים האחרונים. להוסיף אותם לערוץ אם יש להם גישה לקטגוריה %{category}."
+        auto_join_users_info_no_category: "לבדוק כל שעה אילו משתמשים היו פעילים ב־3 החודשים האחרונים. להוסיף אותם לערוץ אם יש להם גישה לקטגוריה הנבחרת."
         auto_join_users_warning: "כל משתמש שאינו חבר בערוץ הזה ויש לו גישה לקטגוריה %{category} יצטרף. זה בסדר?"
         desktop_notification_level: "התראות שולחן עבודה"
         follow: "הצטרף"
         followed: "הצטרפו"
         mobile_notification_level: "התראות בדחיפה לנייד"
         mute: "השתקת ערוץ"
+        threading_enabled: "פעיל"
+        threading_disabled: "כבוי"
         muted_on: "פעילה"
         muted_off: "כבויה"
         notifications: "התראות"
@@ -354,9 +482,13 @@ he:
         saved: "נשמר"
         unfollow: "עזוב"
         admin_title: "הנהלה"
-        retention_info: "היסטוריית הצ׳אט נשמרת למשך %{days} ימים."
       admin:
         title: "צ׳אט"
+        export_messages:
+          title: "ייצוא הודעות צ׳אט"
+          description: "הייצוא מוגבל כרגע ל־10000 ההודעות העדכניות ביותר ב־6 החודשים האחרונים."
+          create_export: "יצירת ייצוא"
+          export_has_started: "הייצוא החל. תישלח אליך הודעה פרטית כשהוא מוכן."
       direct_messages:
         title: "צ׳אט אישי"
         new: "יצירת צ׳אט אישי"
@@ -428,8 +560,18 @@ he:
           many: "%{commaSeparatedUsernames} ועוד %{count} נוספים מקלידים"
           other: "%{commaSeparatedUsernames} ועוד %{count} נוספים מקלידים"
       retention_reminders:
-        public: "היסטוריית הערוץ נשמרת למשך %{days} ימים."
-        dm: "היסטוריית הצ׳אט האישית נשמרת למשך %{days} ימים."
+        public_none: "היסטוריית הערוץ נשמרת לעד."
+        public:
+          one: "היסטוריית הערוץ נשמרת למשך יום %{count}."
+          two: "היסטוריית הערוץ נשמרת למשך %{count} ימים."
+          many: "היסטוריית הערוץ נשמרת למשך %{count} ימים."
+          other: "היסטוריית הערוץ נשמרת למשך %{count} ימים."
+        dm_none: "היסטוריית הצ׳אט האישי נשמרת לעד."
+        dm:
+          one: "היסטוריית הצ׳אט האישי נשמרת למשך יום %{count}."
+          two: "היסטוריית הצ׳אט האישי נשמרת למשך %{count} ימים."
+          many: "היסטוריית הצ׳אט האישי נשמרת למשך %{count} ימים."
+          other: "היסטוריית הצ׳אט האישי נשמרת למשך %{count} ימים."
       flags:
         off_topic: "הודעה זו לא תואמת לדיון הנוכחי כפי שהוגדר בכותרת הערוץ וכנראה שצריך להעביר אותה."
         inappropriate: "הודעה זו מכילה תוכן שאדם מן השורה עשוי להחשיב כפוגעני, נצלני או מפר את <a href=\"%{basePath}/guidelines\">הכללים המנחים את הקהילה שלנו</a>."
@@ -451,6 +593,37 @@ he:
         symbols: "סמלים"
         search_placeholder: "חיפוש לפי שם וכינוי של האמוג׳י…"
         no_results: "אין תוצאות"
+      thread:
+        title: "כותרת"
+        view_thread: הצגת שרשור
+        default_title: "שרשור"
+        replies:
+          one: "תגובה אחת"
+          two: "%{count} תגובות"
+          many: "%{count} תגובות"
+          other: "%{count} תגובות"
+        label: שרשור
+        close: "סגירת שרשור"
+        original_message:
+          started_by: "נפתח ע״י"
+        settings: "הגדרות"
+        last_reply: "תגובה אחרונה"
+        notifications:
+          regular:
+            title: "רגיל"
+            description: "תישלח אליך התראה אם @שמך מוזכר בשרשור הזה."
+          tracking:
+            title: "מעקב"
+            description: "מספר התגובות החדשות בשרשור הזה יופיע ברשימת השרשורים ובערוץ. תישלח אליך התראה אם הזכירו את @שמך בשרשור הזה."
+        participants_other_count:
+          one: "+%{count}"
+          two: "+%{count}"
+          many: "+%{count}"
+          other: "+%{count}"
+      threads:
+        open: "פתיחת שרשור"
+        list: "דיונים שמתקיימים כרגע"
+        none: "אין לך חלק באף אחד מהשרשורים בערוץ הזה."
       draft_channel_screen:
         header: "הודעה חדשה"
         cancel: "ביטול"
@@ -495,9 +668,8 @@ he:
       transcript:
         view: "הצגת תמלול הודעות קודמות"
       types:
-        reviewable_chat_message:
+        chat_reviewable_message:
           title: "הודעת צ׳אט מסומנת"
-          flagged_by: "דוגל על ידי"
     keyboard_shortcuts_help:
       chat:
         title: "צ׳אט"
@@ -510,6 +682,7 @@ he:
           composer_code: "%{shortcut} קוד (עורך בלבד)"
           drawer_open: "%{shortcut} פתיחת מגירת הצ׳אט"
           drawer_close: "%{shortcut} סגירת מגירת הצ׳אט"
+          mark_all_channels_read: "%{shortcut} סימון כל הערוצים כנקראו"
     topic_statuses:
       chat:
         help: "הצ׳אט מופעל בנושא הזה"
@@ -530,3 +703,7 @@ he:
           two: "התראות צ׳אט - %{count} התראות שלא נקראו"
           many: "התראות צ׳אט - %{count} התראות שלא נקראו"
           other: "התראות צ׳אט - %{count} התראות שלא נקראו"
+    styleguide:
+      sections:
+        chat:
+          title: צ׳אט
diff --git a/plugins/chat/config/locales/client.hr.yml b/plugins/chat/config/locales/client.hr.yml
index 2bd64eca175..3e1ca76d507 100644
--- a/plugins/chat/config/locales/client.hr.yml
+++ b/plugins/chat/config/locales/client.hr.yml
@@ -15,6 +15,7 @@ hr:
           actions:
             chat_channel_status_change: "Status chat kanala je promijenjen"
             chat_channel_delete: "Chat kanal je izbrisan"
+            chat_auto_remove_membership: "Članstva su automatski uklonjena s kanala"
       api:
         scopes:
           descriptions:
@@ -35,6 +36,10 @@ hr:
       chat_channels: "Kanali"
       move_to_channel:
         title: "Premještanje poruka na kanal"
+        instructions:
+          one: "Premještate <strong>%{count}</strong> poruku. Odaberite odredišni kanal. Poruka rezerviranog mjesta stvorit će se u kanalu <strong>%{channelTitle}</strong> kako bi označila da je ova poruka premještena. Imajte na umu da se lanci odgovora neće sačuvati u novom kanalu, a poruke u starom kanalu više se neće prikazivati kao odgovori na premještene poruke."
+          few: "Premještate <strong>%{count}</strong> poruke. Odaberite odredišni kanal. Poruka rezerviranog mjesta stvorit će se u kanalu <strong>%{channelTitle}</strong> kako bi označila da je ova poruka premještena. Imajte na umu da se lanci odgovora neće sačuvati u novom kanalu, a poruke u starom kanalu više se neće prikazivati kao odgovori na premještene poruke."
+          other: "Premještate <strong>%{count}</strong> poruka. Odaberite odredišni kanal. Poruka rezerviranog mjesta stvorit će se u kanalu <strong>%{channelTitle}</strong> kako bi označila da su te poruke premještene. Imajte na umu da se lanci odgovora neće sačuvati u novom kanalu, a poruke u starom kanalu više se neće prikazivati kao odgovori na premještene poruke."
         confirm_move: "Premjesti poruke"
       channel_settings:
         title: "Postavke kanala"
@@ -56,7 +61,7 @@ hr:
         instructions: "Zatvaranje kanala onemogućuje korisnicima koji nisu zaposlenici da šalju nove poruke ili uređuju postojeće poruke. Jeste li sigurni da želite zatvoriti ovaj kanal?"
       channel_delete:
         title: "Izbriši kanal"
-        instructions: "<p>Briše <strong>%{name}</strong> kanal i povijest razgovora. Sve poruke i srodni podaci, kao što su reakcije i prijenosi, trajno će biti izbrisani. Ako želite sačuvati povijest kanala i raspada ga, možda želite arhivirati kanal umjesto.</p> <p>Jeste li sigurni da želite <strong>trajno izbrisati</strong> kanal? Da biste potvrdili, upišite naziv kanala u okvir ispod.</p>"
+        instructions: "<p>Briše <strong>%{name}</strong> kanal i povijest čavrljanja. Sve poruke i povezani podaci, kao što su reakcije i prijenosi, bit će trajno izbrisani. Ako želite sačuvati povijest kanala i poništiti ga, možda radije želite arhivirati kanal.</p> <p>Jeste li sigurni da želite <strong>trajno izbrisati</strong> kanal? Za potvrdu upišite naziv kanala u okvir ispod.</p>"
         confirm: "Razumijem posljedice, obriši kanal"
         confirm_channel_name: "Unesite naziv kanala"
         process_started: "Započeo je proces brisanja kanala. Ovaj modal će se uskoro zatvoriti, više nigdje nećete vidjeti izbrisani kanal."
@@ -65,8 +70,12 @@ hr:
       click_to_join: "Kliknite ovdje da biste vidjeli dostupne kanale."
       close: "Zatvori"
       collapse: "Sažmi ladicu za chat"
+      expand: "Proširi ladicu za čavrljanje"
       confirm_flag: "Jeste li sigurni da želite označiti poruku korisnika %{username}?"
-      deleted: "Poruka je izbrisana. [pogledaj]"
+      deleted:
+        one: "Poruka je izbrisana. [view]"
+        few: "%{count} poruke su izbrisane. [view all]"
+        other: "%{count} poruka je izbrisano. [view all]"
       delete: "Pobriši"
       edited: "uredio"
       muted: "utišano"
@@ -75,6 +84,11 @@ hr:
         direct_message: "Također možete započeti osobni razgovor s jednim ili više korisnika."
       email_frequency:
         never: "Nikad"
+      header_indicator_preference:
+        title: "Prikaži indikator aktivnosti u zaglavlju"
+        all_new: "Sve nove poruke"
+        dm_and_mentions: "Izravne poruke i spominjanja"
+        never: "Nikad"
       enable: "Omogući chat"
       flag: "Označi zastavicom"
       flagged: "Ova poruka je označena za pregled"
@@ -83,32 +97,87 @@ hr:
       in_reply_to: "U odgovoru na"
       heading: "Čet"
       join: "Pridružite se"
-      new_messages: "nove poruke"
+      last_visit: "posljednji posjet"
+      summarization:
+        title: "Sažmi poruke"
+        description: "Odaberite opciju u nastavku da biste saželi razgovor poslan tijekom željenog vremenskog okvira."
+        summarize: "Rezimirati"
+        since:
+          one: "Posljednji sat"
+          few: "Posljednja %{count} sata"
+          other: "Posljednjih %{count} sati"
       mention_warning:
         dismiss: "skloni"
+        cannot_see: "%{username} ne može pristupiti ovom kanalu i nije obaviješten."
+        cannot_see_multiple:
+          one: "%{username} i %{count} drugi korisnik ne mogu pristupiti ovom kanalu i nisu bili obaviješteni."
+          few: "%{username} i %{count} druga korisnika ne mogu pristupiti ovom kanalu i nisu bili obaviješteni."
+          other: "%{username} i %{count} drugih korisnika ne može pristupiti ovom kanalu i nisu bili obaviješteni."
         invitations_sent:
           one: "Poziv poslan"
           few: "Pozivnice poslane"
           other: "Pozivnice poslane"
         invite: "Pozovite na kanal"
+        without_membership: "%{username} se nije pridružio ovom kanalu."
+        without_membership_multiple:
+          one: "%{username} i još %{count} korisnik se nisu pridružili ovom kanalu."
+          few: "%{username} i još %{count} korisnika se nisu pridružili ovom kanalu."
+          other: "%{username} i još %{count} korisnika se nisu pridružili ovom kanalu."
+        group_mentions_disabled: "%{group_name} ne dopušta spominjanje."
+        group_mentions_disabled_multiple:
+          one: "%{group_name} i %{count} druga grupa ne dopuštaju spominjanje."
+          few: "%{group_name} i %{count} druge grupe ne dopuštaju spominjanje."
+          other: "%{group_name} i %{count} drugih grupa ne dopuštaju spominjanje."
+        too_many_members: "%{group_name} ima previše članova. Nitko nije obaviješten."
+        too_many_members_multiple:
+          one: "%{group_name} i %{count} druga grupa imaju previše članova. Nitko nije obaviješten."
+          few: "%{group_name} i %{count} druge grupe imaju previše članova. Nitko nije obaviješten."
+          other: "%{group_name} i %{count} drugih grupa imaju previše članova. Nitko nije obaviješten."
         groups:
-          users_limit:
-            one: "%{count} korisnik"
-            few: "%{count} korisnika"
-            other: "%{count} korisnika"
+          unreachable_1: "@%{group} ne dopušta spominjanje."
+          unreachable_2: "@%{group1} i @%{group2} ne dopuštaju spominjanje."
+          unreachable_multiple:
+            one: "@%{group} i %{count} druga grupa ne dopuštaju spominjanje."
+            few: "@%{group} i %{count} druge grupe ne dopuštaju spominjanje."
+            other: "@%{group} i %{count} drugih grupa ne dopuštaju spominjanje."
+        too_many_mentions:
+          one: "Ova poruka premašuje ograničenje obavijesti od %{count} spominjanja."
+          few: "Ova poruka premašuje ograničenje obavijesti od %{count} spominjanja."
+          other: "Ova poruka premašuje ograničenje obavijesti od %{count} spominjanja."
+        too_many_mentions_admin:
+          one: 'Ova poruka premašuje <a href="%{siteSettingUrl}" target="_blank">ograničenje obavijesti</a> od %{count} spominjanja.'
+          few: 'Ova poruka premašuje <a href="%{siteSettingUrl}" target="_blank">ograničenje obavijesti</a> od %{count} spominjanja.'
+          other: 'Ova poruka premašuje <a href="%{siteSettingUrl}" target="_blank">ograničenje obavijesti</a> od %{count} spominjanja.'
       aria_roles:
         header: "Zaglavlje chata"
         composer: "Skladatelj chata"
+      kicked_from_channel: "Više ne možete pristupiti ovom kanalu."
+      placeholder_channel: "Čavrljanje u %{channelName}"
+      placeholder_thread: "Čavrljanje u niti"
+      placeholder_users: "Čavrljaj s %{commaSeparatedNames}"
+      placeholder_new_message_disallowed:
+        archived: "Kanal je arhiviran, trenutno ne možete slati nove poruke."
+        closed: "Kanal je zatvoren, trenutno ne možete slati nove poruke."
+        read_only: "Kanal je samo za čitanje, trenutno ne možete slati nove poruke."
+      placeholder_start_conversation: "Započnite razgovor s..."
+      placeholder_start_conversation_users: "Započnite razgovor s %{commaSeparatedUsernames}"
       reply: "Odgovor"
       edit: "Uredi"
       rebake_message: "Popravi HTML"
       bookmark_message: "Zabilješka"
       bookmark_message_edit: "Uredi oznaku"
       save: "Spremi"
+      return_to_threads_list: "Povratak na tekuće rasprave"
+      unread_threads_count:
+        one: "Imate %{count} nepročitanu raspravu"
+        few: "Imate %{count} nepročitane rasprave"
+        other: "Imate %{count} nepročitanih rasprava"
       sounds:
         none: "Ništa"
       title: "čet"
       title_capitalized: "Čet"
+      upload_to_channel: "Prenesi na %{title}"
+      upload_to_thread: "Prenesi u nit"
       exit: "natrag"
       channel_status:
         archive_failed: "Arhiviranje kanala nije uspjelo. %{completed}/%{total} poruke su arhivirane. <a target=\"_blank\" href=\"%{topic_url}\">tema odredišta</a>. Pritisnite ponovno za pokušaj dovršetka arhiviranja."
@@ -133,22 +202,62 @@ hr:
           about: O nama
           members: Članovi
           settings: Postavke
+      new_message_modal:
+        no_items: "Nema stvari"
+      channel_edit_name_slug_modal:
+        title: Uredi kanal
+        input_placeholder: Dodajte ime
+        name: Naziv kanala
       direct_message_creator:
         title: Nova poruka
         prefix: "Za:"
       create_channel:
+        auto_join_users:
+          warning_1_group:
+            one: "Automatski dodati %{count} korisnika iz %{group}?"
+            few: "Automatski dodati %{count} korisnika iz %{group}?"
+            other: "Automatski dodati %{count} korisnika iz %{group}?"
+          warning_2_groups:
+            one: "Automatski dodati %{count} korisnika iz %{group1} i %{group2}?"
+            few: "Automatski dodati %{count} korisnika iz %{group1} i %{group2}?"
+            other: "Automatski dodati %{count} korisnika iz %{group1} i %{group2}?"
+        choose_category:
+          hint_1_group: 'Korisnici u %{group} će imati pristup ovom kanalu u skladu sa <a href="%{settingLink}" target="_blank">sigurnosnim postavkama</a>'
+          hint_2_groups: 'Korisnici u %{group1} i %{group2} će imati pristup ovom kanalu u skladu sa <a href="%{settingLink}" target="_blank">sigurnosnim postavkama</a>'
+          hint_multiple_groups:
+            one: 'Korisnici u %{group} i %{count} drugoj grupi će imati pristup ovom kanalu u skladu sa <a href="%{settingLink}" target="_blank">sigurnosnim postavkama</a>'
+            few: 'Korisnici u %{group} i %{count} druge grupe će imati pristup ovom kanalu u skladu sa <a href="%{settingLink}" target="_blank">sigurnosnim postavkama</a>'
+            other: 'Korisnici u %{group} i %{count} drugih grupa će imati pristup ovom kanalu u skladu sa <a href="%{settingLink}" target="_blank">sigurnosnim postavkama</a>'
         type: "Tip"
         types:
           category: "Kategorija"
           topic: "Tema"
+      reactions:
+        you_and_single_user: "Vi i %{username} ste reagirali s :%{emoji}:"
+        you_and_multiple_users: "Vi, %{commaSeparatedUsernames} i %{username} ste reagirali s :%{emoji}:"
+        you_multiple_users_and_more:
+          one: "Vi, %{commaSeparatedUsernames} i još %{count} ste reagirali s :%{emoji}:"
+          few: "Vi, %{commaSeparatedUsernames} i još njih %{count} ste reagirali s :%{emoji}:"
+          other: "Vi, %{commaSeparatedUsernames} i još njih %{count} ste reagirali s :%{emoji}:"
+        single_user: "%{username} je reagirao s :%{emoji}:"
+        multiple_users: "%{commaSeparatedUsernames} i %{username} reagirali su s :%{emoji}:"
+        multiple_users_and_more:
+          one: "%{commaSeparatedUsernames} i još %{count} reagirali su s :%{emoji}:"
+          few: "%{commaSeparatedUsernames} i još %{count} reagirali su s :%{emoji}:"
+          other: "%{commaSeparatedUsernames} i još %{count} reagirali su s :%{emoji}:"
       composer:
         italic_text: "naglašen tekst"
         bold_text: "jaki text"
+        send: "Pošalji"
       notification_levels:
         never: "Nikad"
       settings:
+        auto_join_users_info: "Provjeri svaki sat koji su korisnici bili aktivni u posljednja 3 mjeseca. Dodaj ih na ovaj kanal ako imaju pristup kategoriji %{category}."
+        auto_join_users_info_no_category: "Provjeri svaki sat koji su korisnici bili aktivni u posljednja 3 mjeseca. Dodaj ih na ovaj kanal ako imaju pristup odabranoj kategoriji."
         follow: "Pridružite se"
         followed: "Prijavljen"
+        threading_enabled: "Omogućeno"
+        threading_disabled: "Onemogućeno"
         notifications: "Obavijest"
         preview: "Pregled"
         save: "Spremi"
@@ -157,6 +266,11 @@ hr:
         admin_title: "Administrator"
       admin:
         title: "Čet"
+        export_messages:
+          title: "Izvezi poruke čavrljanja"
+          description: "Izvoz je trenutno ograničen na 10 000 najnovijih poruka u zadnjih 6 mjeseci."
+          create_export: "Stvori izvoz"
+          export_has_started: "Izvoz je počeo. Dobit ćete PM kad bude spreman."
       incoming_webhooks:
         back: "Natrag"
         description: "Opis"
@@ -177,11 +291,51 @@ hr:
           title: "Prebaci u postojeću temu"
         new_message:
           title: "Premjestite u novu poruku"
+      retention_reminders:
+        public_none: "Povijest kanala čuva se na neodređeno vrijeme."
+        public:
+          one: "Povijest kanala čuva se %{count} dan."
+          few: "Povijest kanala čuva se %{count} dana."
+          other: "Povijest kanala čuva se %{count} dana."
+        dm_none: "Osobna povijest čavrljanja čuva se na neodređeno vrijeme."
+        dm:
+          one: "Osobna povijest čavrljanja čuva se %{count} dan."
+          few: "Osobna povijest čavrljanja čuva se %{count} dana."
+          other: "Osobna povijest čavrljanja čuva se %{count} dana."
       emoji_picker:
         objects: "Objekti"
         activities: "Aktivnosti"
         flags: "Oznake zastavicom"
         symbols: "Simboli"
+      thread:
+        title: "Naslov"
+        view_thread: Pogledaj nit
+        default_title: "Nit"
+        replies:
+          one: "%{count} odgovor"
+          few: "%{count} odgovora"
+          other: "%{count} odgovora"
+        label: Nit
+        close: "Zatvori nit"
+        original_message:
+          started_by: "Započeto od"
+        settings: "Postavke"
+        last_reply: "zadnji odgovor"
+        notifications:
+          regular:
+            title: "Normalno"
+            description: "Bit ćete obaviješteni ako netko spominje vaš @name u ovoj temi."
+          tracking:
+            title: "Praćenje"
+            description: "Broj novih odgovora za ovu nit bit će prikazan na popisu niti i kanalu. Bit ćete obaviješteni ako netko spominje Vaš @name u ovoj niti."
+        participants_other_count:
+          one: "+%{count}"
+          few: "+%{count}"
+          other: "+%{count}"
+      threads:
+        open: "Otvori nit"
+        list: "Tekuće rasprave"
+        none: "Ne sudjelujete ni u jednoj niti na ovom kanalu."
       draft_channel_screen:
         header: "Nova poruka"
         cancel: "Odustani"
@@ -196,8 +350,14 @@ hr:
               label: Poruka
     review:
       types:
-        reviewable_chat_message:
-          flagged_by: "Označio"
+        chat_reviewable_message:
+          title: "Označena poruka čavrljanja"
     keyboard_shortcuts_help:
       chat:
         title: "Čet"
+        keyboard_shortcuts:
+          mark_all_channels_read: "%{shortcut} Označi sve kanale kao pročitane"
+    styleguide:
+      sections:
+        chat:
+          title: Čavrljanje
diff --git a/plugins/chat/config/locales/client.hu.yml b/plugins/chat/config/locales/client.hu.yml
index a7bd650036f..903c3bf7b4b 100644
--- a/plugins/chat/config/locales/client.hu.yml
+++ b/plugins/chat/config/locales/client.hu.yml
@@ -15,6 +15,7 @@ hu:
           actions:
             chat_channel_status_change: "A csevegőcsatorna állapota megváltozott"
             chat_channel_delete: "Csevegőcsatorna törölve"
+            chat_auto_remove_membership: "A tagságok automatikusan eltávolításra kerülnek a csatornákról"
       api:
         scopes:
           descriptions:
@@ -64,7 +65,6 @@ hu:
         instructions: "A csatorna lezárása megakadályozza, hogy a nem stábtagok új üzeneteket küldjenek vagy szerkesszék a meglévő üzeneteket. Biztos, hogy be akarja zárni ezt a csatornát?"
       channel_delete:
         title: "Csatorna törlése"
-        instructions: "<p>Törli a(z) <strong>%{name}</strong> csatornát és a csevegési előzményeket. Minden üzenet és a kapcsolódó adat, például a reakciók és a feltöltések véglegesen törlődnek. Ha meg szeretné őrizni a csatorna előzményeit, de meg akarja szüntetni, akkor inkább archiválja a csatornát.</p> <p>Biztos, hogy <strong>véglegesen törli </strong> a csatornát? A megerősítéshez írja be a csatorna nevét az alábbi mezőbe.</p>"
         confirm: "Megértem a következményeket, a csatorna törlése"
         confirm_channel_name: "Adja meg a csatorna nevét"
         process_started: "A csatorna törlése megkezdődött. Ez a kérdésablak hamarosan bezárul, és már nem fogja látni a törölt csatornát."
@@ -74,8 +74,8 @@ hu:
       click_to_join: "Kattintson ide az elérhető csatornák megtekintéséhez."
       close: "Lezárás"
       collapse: "Csevegőfiók összecsukása"
+      expand: "Chat fiók bővítése"
       confirm_flag: "Biztos, hogy jelenti %{username} üzenetét?"
-      deleted: "Egy üzenet törölve lett. [megtekintés]"
       hidden: "Egy üzenet el lett rejtve. [megtekintés]"
       delete: "Törlés"
       edited: "szerkesztve"
@@ -90,6 +90,11 @@ hu:
         never: "Soha"
         title: "E-mail értesítések"
         when_away: "Csak ha távol van"
+      header_indicator_preference:
+        title: "Aktivitásjelző megjelenítése a fejlécben"
+        all_new: "Minden új üzenet"
+        dm_and_mentions: "Közvetlen üzenetek és említések"
+        never: "Soha"
       enable: "Csevegés engedélyezése"
       flag: "Jelölés"
       emoji: "Emodzsi beszúrása"
@@ -99,22 +104,21 @@ hu:
       in_reply_to: "Válaszul erre:"
       heading: "Csevegés"
       join: "Belépés"
-      new_messages: "új üzenetek"
+      last_visit: "utolsó látogatás"
+      summarization:
+        summarize: "Összefoglalás"
       mention_warning:
         dismiss: "elvetés"
         invitations_sent:
           one: "Meghívó elküldve"
           other: "Meghívók elküldve"
         invite: "Meghívás a csatornára"
-        groups:
-          users_limit:
-            one: "%{count} felhasználó"
-            other: "%{count} felhasználó"
       aria_roles:
         header: "Csevegés fejléce"
         composer: "Csevegés szerkesztője"
         channels_list: "Csevegőcsatornák"
       no_public_channels: "Nem csatlakozott egyetlen csatornához sem."
+      kicked_from_channel: "Ezt a csatornát már nem tudja elérni."
       only_chat_push_notifications:
         title: "Csak csevegési leküldéses értesítések küldése"
         description: "Az összes nem csevegési leküldéses értesítés elküldésének letiltása"
@@ -126,10 +130,8 @@ hu:
       close_full_page: "Teljes képernyős csevegés bezárása"
       open_message: "Üzenet megnyitása a csevegésben"
       placeholder_self: "Jegyezzen le valamit"
-      placeholder_others: "Csevegés vele: %{messageRecipient}"
-      placeholder_new_message_disallowed: "A csatorna „%{status}”, jelenleg nem küldhet új üzeneteket."
+      placeholder_channel: "Csevegés %{channelName}"
       placeholder_silenced: "Jelenleg nem küldhet üzeneteket."
-      placeholder_start_conversation: 'Beszélgetés kezdése a következőkkel: %{usernames}'
       remove_upload: "Fájl eltávolítása"
       react: "Reagálás emodzsival"
       reply: "Válasz"
@@ -145,7 +147,6 @@ hu:
       restore: "Törölt üzenet helyreállítása"
       save: "Mentés"
       select: "Válasszon"
-      silence: "Felhasználó némítása"
       return_to_list: "Vissza a csatornákhoz"
       scroll_to_bottom: "Görgetés lefelé"
       scroll_to_new_messages: "Új üzenetek megtekintése"
@@ -158,6 +159,7 @@ hu:
       title: "csevegés"
       title_capitalized: "Csevegés"
       upload: "Fájl csatolása"
+      upload_to_channel: "Feltöltés %{title} címre"
       uploaded_files:
         one: "%{count} fájl"
         other: "%{count} fájl"
@@ -199,8 +201,10 @@ hu:
           about: Névjegy
           members: Tagok
           settings: Beállítások
-      channel_edit_name_modal:
+      channel_edit_name_slug_modal:
+        title: Csatorna szerkesztése
         input_placeholder: Név hozzáadása
+        name: Csatorna neve
       channel_edit_description_modal:
         title: Leírás szerkesztése
         input_placeholder: Leírás hozzáadása
@@ -210,9 +214,6 @@ hu:
         prefix: "Címzett:"
         no_results: Nincs találat
         selected_user_title: "%{username} kijelölésének megszüntetése"
-      channel_selector:
-        title: "Ugrás a csatornára"
-        no_channels: "Egyetlen csatorna sem felel meg a keresésnek"
       channel:
         no_memberships: Ennek a csatornának nincsenek tagjai
         no_memberships_found: Nem találhatók tagok
@@ -222,10 +223,6 @@ hu:
       create_channel:
         auto_join_users:
           public_category_warning: "A(z) %{category} egy nyilvános kategória. Automatikusan hozzáadja az összes nemrég aktív felhasználót ehhez a csatornához?"
-          warning_groups:
-            one: '%{members_count} felhasználó automatikus hozzáadása a(z) %{group} csoportból?'
-            other: '%{members_count} felhasználó automatikus hozzáadása a(z) %{group} és %{group_2} csoportokból?'
-          warning_multiple_groups: Automatikusan hozzáadja a(z) %{group_1} csoport %{members_count} felhasználóját, és további %{count} felhasználót?
         choose_category:
           label: "Válasszon kategóriát"
           none: "válasszon egyet…"
@@ -242,15 +239,12 @@ hu:
         type: "Csevegőüzenet"
       reactions:
         only_you: "Ezzel reagált: :%{emoji}:"
-        and_others: "Ön, %{usernames} ezzel reagált: :%{emoji}:"
-        only_others: "%{usernames} ezzel reagált: :%{emoji}:"
-        others_and_more: "%{usernames} és még %{more} valaki ezzel reagált: :%{emoji}:"
-        you_others_and_more: "Ön, %{usernames} és még %{more} valaki ezzel reagált: :%{emoji}:"
       composer:
         toggle_toolbar: "Eszköztár be/ki"
         italic_text: "dőlt szöveg"
         bold_text: "félkövér szöveg"
         code_text: "kódszöveg"
+        send: "Küldés"
       quote:
         copy_success: "Csevegési idézet a vágólapra másolva"
       notification_levels:
@@ -260,12 +254,13 @@ hu:
       settings:
         channel_wide_mentions_label: "Engedélyezve az @all és @here említések"
         auto_join_users_label: "Felhasználók automatikus hozzáadása"
-        enable_auto_join_users: "Az összes nemrégiben aktív felhasználó automatikus hozzáadása"
         desktop_notification_level: "Asztali értesítések"
         follow: "Belépés"
         followed: "Csatlakozott"
         mobile_notification_level: "Mobilos leküldéses értesítések"
         mute: "Csatorna némítása"
+        threading_enabled: "Engedélyezed"
+        threading_disabled: "Kikapcsolt"
         muted_on: "Be"
         muted_off: "Ki"
         notifications: "Értesítések"
@@ -336,8 +331,8 @@ hu:
           one: "%{commaSeparatedUsernames} és még %{count} valaki gépel"
           other: "%{commaSeparatedUsernames} és még %{count} valaki gépel"
       retention_reminders:
-        public: "A csatorna előzményei %{days} napig maradnak meg."
-        dm: "A személyes csevegési előzményei %{days} napig maradnak meg."
+        public_none: "A csatornaelőzmények korlátlan ideig megőrződnek."
+        dm_none: "A személyes csevegési előzmények korlátlan ideig megőrződnek."
       flagging:
         action: "Üzenet megjelölése"
       emoji_picker:
@@ -352,6 +347,24 @@ hu:
         flags: "Zászlók"
         symbols: "Szimbólumok"
         no_results: "Nincs találat"
+      thread:
+        title: "Cím"
+        view_thread: Téma megtekintése
+        default_title: "Szál"
+        replies:
+          one: "%{count} válasz"
+          other: "%{count} válasz"
+        label: Szál
+        settings: "Beállítások"
+        last_reply: "utolsó válasz"
+        notifications:
+          regular:
+            title: "Normális"
+          tracking:
+            title: "Követés"
+        participants_other_count:
+          one: "+%{count}"
+          other: "+%{count}"
       draft_channel_screen:
         header: "Új üzenet"
         cancel: "Visszavon"
@@ -392,11 +405,6 @@ hu:
             sender:
               label: Feladó
               description: Alapértelmezés szerint a rendszer
-    review:
-      types:
-        reviewable_chat_message:
-          title: "Jelentett csevegőüzenet"
-          flagged_by: "Megjelölte"
     keyboard_shortcuts_help:
       chat:
         title: "Csevegés"
diff --git a/plugins/chat/config/locales/client.hy.yml b/plugins/chat/config/locales/client.hy.yml
index 7e631debd6d..3e05f87a772 100644
--- a/plugins/chat/config/locales/client.hy.yml
+++ b/plugins/chat/config/locales/client.hy.yml
@@ -21,14 +21,13 @@ hy:
       joined: "միացել է"
       email_frequency:
         never: "Երբեք"
+      header_indicator_preference:
+        never: "Երբեք"
       flag: "Դրոշակավորել"
       join: "Միանալ"
+      last_visit: "վերջին այցելությունը"
       mention_warning:
         dismiss: "չեղարկել"
-        groups:
-          users_limit:
-            one: "%{count} օգտատեր"
-            other: "%{count} օգտատեր"
       reply: "Պատասխանել"
       edit: "Խմբագրել"
       rebake_message: "Վերակառուցել HTML-ը"
@@ -57,6 +56,8 @@ hy:
           about: Մասին
           members: Անդամներ
           settings: Կարգավորումներ
+      new_message_modal:
+        no_items: "Տարրեր չկան"
       direct_message_creator:
         title: Նոր Հաղորդագրություն
         prefix: "Ում:"
@@ -68,11 +69,13 @@ hy:
       composer:
         italic_text: "շեղ տեքստ"
         bold_text: "թավ տեքստ"
+        send: "Ուղարկել"
       notification_levels:
         never: "Երբեք"
       settings:
         follow: "Միանալ"
         followed: "Միացել է"
+        threading_disabled: "Անջատված"
         notifications: "Ծանուցումներ"
         preview: "Նախադիտում"
         save: "Պահպանել"
@@ -104,6 +107,18 @@ hy:
         activities: "Ակտիվություն"
         flags: "Դրոշակներ"
         symbols: "Նշաններ"
+      thread:
+        title: "Վերնագիր"
+        replies:
+          one: "%{count} պատասխան"
+          other: "%{count} պատասխան"
+        settings: "Կարգավորումներ"
+        last_reply: "վերջին պատասխանը"
+        notifications:
+          regular:
+            title: "Նորմալ"
+          tracking:
+            title: "Հետևում Եմ"
       draft_channel_screen:
         header: "Նոր Հաղորդագրություն"
         cancel: "Չեղարկել"
@@ -115,7 +130,3 @@ hy:
           fields:
             message:
               label: Նոր Հաղորդագրություն
-    review:
-      types:
-        reviewable_chat_message:
-          flagged_by: "Դրոշակավորել է"
diff --git a/plugins/chat/config/locales/client.id.yml b/plugins/chat/config/locales/client.id.yml
index 0962f1111ed..7972f01aee2 100644
--- a/plugins/chat/config/locales/client.id.yml
+++ b/plugins/chat/config/locales/client.id.yml
@@ -38,8 +38,6 @@ id:
       browse_all_channels: "Jelajahi semua kanal"
       move_to_channel:
         title: "Pindahkan pesan ke kanal"
-        instructions:
-          other: "Anda memindahkan <strong>%{count}</strong> pesan. Pilih kanal tujuan. Pesan placeholder akan dibuat di kanal <strong>%{channelTitle}</strong> untuk menunjukkan bahwa pesan ini telah dipindahkan."
         confirm_move: "Pindahkan Pesan"
       channel_settings:
         title: "Pengaturan kanal"
@@ -55,17 +53,24 @@ id:
       joined: "joined"
       email_frequency:
         never: "Tidak pernah"
+      header_indicator_preference:
+        all_new: "Semua Pesan Baru"
+        never: "Tidak pernah"
       join: "Gabung"
+      summarization:
+        title: "Meringkas pesan"
+        description: "Pilih opsi di bawah untuk meringkas percakapan yang dikirim selama jangka waktu yang diinginkan."
+        summarize: "Meringkas"
+        since:
+          other: "%{count} jam terakhir"
       mention_warning:
         dismiss: "bubar"
-        groups:
-          users_limit:
-            other: "%{count} pengguna"
       reply: "Balas"
       edit: "Ubah"
       bookmark_message: "Penandaan"
       bookmark_message_edit: "Edit Bookmark"
       save: "Simpan"
+      return_to_threads_list: "Kembali ke diskusi yang sedang berlangsung"
       sounds:
         none: "Tidak ada"
       channel_status:
@@ -82,10 +87,23 @@ id:
           about: Tentang
           members: Anggota
           settings: Pengaturan
+      new_message_modal:
+        title: Kirim pesan
+        add_user_long: <kbd>shift + click</kbd> atau <kbd>shift + enter</kbd><span>Tambahkan @%{username}</span>
+        add_user_short: <span>Tambahkan pengguna</span>
+        open_channel: <span>Buka saluran</span>
+        default_search_placeholder: "#a-channel, @somebody atau apapun"
+        default_channel_search_placeholder: "#a-channel"
+        default_user_search_placeholder: "@somebody"
+        user_search_placeholder: "...menambahkan lebih banyak pengguna"
+        disabled_user: "telah menonaktifkan obrolan"
+        no_items: "Tidak ada item"
       direct_message_creator:
         title: Pesan Baru
         prefix: "Kepada:"
       create_channel:
+        threading:
+          label: "Aktifkan threading"
         type: "Tipe"
         types:
           category: "Kategori"
@@ -93,13 +111,23 @@ id:
       notification_levels:
         never: "Tidak pernah"
       settings:
+        channel_threading_label: "Threading"
+        channel_threading_description: "Ketika threading diaktifkan, balasan ke pesan obrolan akan membuat percakapan terpisah, yang akan ada di samping saluran utama."
         follow: "Gabung"
         followed: "Joined"
+        threading_enabled: "Diaktifkan"
+        threading_disabled: "Dinonaktifkan"
         notifications: "Pemberitahuan"
         save: "Simpan"
         saved: "Tersimpan"
         unfollow: "Keluar"
         admin_title: "Admin"
+      admin:
+        export_messages:
+          title: "Ekspor pesan obrolan"
+          description: "Ekspor saat ini dibatasi hingga 10.000 pesan terbaru dalam 6 bulan terakhir."
+          create_export: "Buat ekspor"
+          export_has_started: "Ekspor telah dimulai. Anda akan menerima PM jika sudah siap."
       incoming_webhooks:
         delete: "Hapus"
         name: "Name"
@@ -114,6 +142,27 @@ id:
       emoji_picker:
         objects: "Objek"
         flags: "Flags"
+      thread:
+        title: "Judul"
+        default_title: "Utas"
+        replies:
+          other: "%{count} balasan"
+        original_message:
+          started_by: "Dimulai oleh"
+        settings: "Pengaturan"
+        last_reply: "balasan terakhir"
+        notifications:
+          regular:
+            title: "Normal"
+            description: "Anda akan diberi tahu jika seseorang menyebut @nama Anda di utas ini."
+          tracking:
+            title: "Pelacakan"
+            description: "Jumlah balasan baru untuk utas ini akan ditampilkan di daftar utas dan kanal. Anda akan diberi tahu jika seseorang menyebut @nama Anda di utas ini."
+        participants_other_count:
+          other: "+%{count}"
+      threads:
+        list: "Diskusi yang sedang berlangsung"
+        none: "Anda tidak berpartisipasi dalam utas apa pun di kanal ini."
       draft_channel_screen:
         header: "Pesan Baru"
         cancel: "Batal"
@@ -123,7 +172,7 @@ id:
           fields:
             message:
               label: pesan
-    review:
-      types:
-        reviewable_chat_message:
-          flagged_by: "Dipanji Oleh"
+    styleguide:
+      sections:
+        chat:
+          title: Obrolan
diff --git a/plugins/chat/config/locales/client.it.yml b/plugins/chat/config/locales/client.it.yml
index 23c5729c2d2..774d70554fb 100644
--- a/plugins/chat/config/locales/client.it.yml
+++ b/plugins/chat/config/locales/client.it.yml
@@ -15,6 +15,7 @@ it:
           actions:
             chat_channel_status_change: "Lo stato del canale di chat è cambiato"
             chat_channel_delete: "Canale di chat eliminato"
+            chat_auto_remove_membership: "Membri automaticamente rimossi dai canali"
       api:
         scopes:
           descriptions:
@@ -39,8 +40,8 @@ it:
       move_to_channel:
         title: "Sposta i messaggi sul canale"
         instructions:
-          one: "Stai spostando <strong>%{count}</strong> messaggio. Seleziona un canale di destinazione. Verrà creato un messaggio segnaposto nel canale <strong>%{channelTitle}</strong> per indicare che questo messaggio è stato spostato."
-          other: "Stai spostando <strong>%{count}</strong> messaggi. Seleziona un canale di destinazione. Verrà creato un messaggio segnaposto nel canale <strong>%{channelTitle}</strong> per indicare che questi messaggi sono stati spostati."
+          one: "Stai spostando il messaggio <strong>%{count}</strong> . Seleziona un canale di destinazione. Verrà creato un messaggio segnaposto nel canale <strong>%{channelTitle}</strong> per indicare che questo messaggio è stato spostato. Tieni presente che le catene di risposta non verranno mantenute nel nuovo canale e i messaggi nel vecchio canale non verranno più visualizzati come risposta ai messaggi spostati."
+          other: "Stai spostando <strong>%{count}</strong> messaggi. Seleziona un canale di destinazione. Verrà creato un messaggio segnaposto nel canale <strong>%{channelTitle}</strong> per indicare che questi messaggi sono stati spostati. Tieni presente che le catene di risposta non verranno mantenute nel nuovo canale e i messaggi nel vecchio canale non verranno più visualizzati come risposta ai messaggi spostati."
         confirm_move: "Sposta messaggi"
       channel_settings:
         title: "Impostazioni del canale"
@@ -81,8 +82,11 @@ it:
       click_to_join: "Fai clic qui per visualizzare i canali disponibili."
       close: "Chiudi"
       collapse: "Comprimi il cassetto della chat"
+      expand: "Espandi il pannello della chat"
       confirm_flag: "Vuoi segnalare il messaggio di %{username}?"
-      deleted: "Un messaggio è stato eliminato. [visualizza]"
+      deleted:
+        one: "Un messaggio è stato cancellato. [view]"
+        other: "%{count} messaggi sono stati eliminati. [visualizza tutti]"
       hidden: "Un messaggio è stato nascosto. [visualizza]"
       delete: "Elimina"
       edited: "modificato"
@@ -97,6 +101,11 @@ it:
         never: "Mai"
         title: "Notifiche via e-mail"
         when_away: "Solo quando non sono collegato"
+      header_indicator_preference:
+        title: "Mostra l'indicatore di attività nell'intestazione"
+        all_new: "Tutti i nuovi messaggi"
+        dm_and_mentions: "Messaggi diretti e menzioni"
+        never: "Mai"
       enable: "Abilita chat"
       flag: "Segnala"
       emoji: "Inserisci emoji"
@@ -106,53 +115,57 @@ it:
       in_reply_to: "In risposta a"
       heading: "Chat"
       join: "Partecipa"
-      new_messages: "nuovi messaggi"
+      last_visit: "ultima visita"
+      summarization:
+        title: "Riassumi i messaggi"
+        description: "Seleziona un'opzione qui sotto per riepilogare la conversazione inviata nel periodo di tempo desiderato."
+        summarize: "Riassumi"
+        since:
+          one: "Ultima ora"
+          other: "Ultime %{count} ore"
       mention_warning:
         dismiss: "ignora"
-        cannot_see:
-          one: "%{username} non può accedere a questo canale e non è stato avvisato."
-          other: "%{username} e %{others} non possono accedere a questo canale e non sono stati avvisati."
+        cannot_see: "%{username} non può accedere a questo canale e non è stato avvisato."
+        cannot_see_multiple:
+          one: "%{username} e %{count} altro utente non possono accedere a questo canale e non sono stati avvisati."
+          other: "%{username} e altri %{count} utenti non possono accedere a questo canale e non sono stati avvisati."
         invitations_sent:
           one: "Invito inviato"
           other: "Inviti inviati"
         invite: "Invita al canale"
-        without_membership:
-          one: "%{username} non ha partecipato a questo canale."
-          other: "%{username} e %{others} non hanno partecipato a questo canale."
-        group_mentions_disabled:
-          one: "%{group_name} non consente menzioni"
-          other: "%{group_name} e %{others} non consentono menzioni"
-        too_many_members:
-          one: "%{group_name} ha troppi membri. Nessuno è stato avvisato"
-          other: "%{group_name} e %{others} hanno troppi membri. Nessuno è stato avvisato"
-        warning_multiple:
-          one: "%{count} altro"
-          other: "%{count} altri"
+        without_membership: "%{username} non ha partecipato a questo canale."
+        without_membership_multiple:
+          one: "%{username} e %{count} altro utente non si sono uniti a questo canale."
+          other: "%{username} e altri %{count} utenti non si sono uniti a questo canale."
+        group_mentions_disabled: "%{group_name} non consente menzioni."
+        group_mentions_disabled_multiple:
+          one: "%{group_name} e %{count} altro gruppo non consentono menzioni."
+          other: "%{group_name} e %{count} altri gruppi non consentono menzioni."
+        too_many_members: "%{group_name} ha troppi membri. Nessuno è stato avvisato."
+        too_many_members_multiple:
+          one: "%{group_name} e %{count} altro gruppo hanno troppi membri. Nessuno è stato notificato."
+          other: "%{group_name} e %{count} altri gruppi hanno troppi membri. Nessuno è stato notificato."
         groups:
           header:
             some: "Alcuni utenti non riceveranno notifiche"
             all: "Nessuno verrà avvisato"
-          unreachable:
-            one: "@%{group} non consente menzioni"
-            other: "@%{group} e @%{group_2} non consentono menzioni"
-          unreachable_multiple: "@%{group} e altri %{count} non consentono menzioni"
-          too_many_members:
-            one: "La menzione di @%{group} supera il %{notification_limit} di %{limit}"
-            other: "Menzionando sia @%{group} che @%{group_2} si supera il %{notification_limit} di %{limit}"
-          too_many_members_multiple: "Questi %{count} gruppi superano il %{notification_limit} di %{limit}"
-          users_limit:
-            one: "%{count} utente"
-            other: "%{count} utenti"
-          notification_limit: "limite di notifica"
-        too_many_mentions: "Questo messaggio supera il %{notification_limit} di %{limit}"
-        mentions_limit:
-          one: "%{count} menzione"
-          other: "%{count} menzioni"
+          unreachable_1: "@%{group} non consente menzioni."
+          unreachable_2: "@%{group1} e @%{group2} non consentono menzioni."
+          unreachable_multiple:
+            one: "@%{group} e %{count} altro gruppo non consentono menzioni."
+            other: "@%{group} e %{count} altri gruppi non consentono menzioni."
+        too_many_mentions:
+          one: "Questo messaggio supera il limite di notifica di %{count} menzione."
+          other: "Questo messaggio supera il limite di notifica di %{count} menzioni."
+        too_many_mentions_admin:
+          one: 'Questo messaggio supera il limite di <a href="%{siteSettingUrl}" target="_blank">notifiche</a> di %{count} menzione.'
+          other: 'Questo messaggio supera il limite di <a href="%{siteSettingUrl}" target="_blank">notifiche</a> di %{count} menzioni.'
       aria_roles:
         header: "Intestazione della chat"
         composer: "Compositore di chat"
         channels_list: "Elenco dei canali di chat"
       no_public_channels: "Non hai partecipato a nessun canale."
+      kicked_from_channel: "Non puoi più accedere a questo canale."
       only_chat_push_notifications:
         title: "Invia solo le notifiche push della chat"
         description: "Blocca l'invio di tutte le notifiche push non relative alla chat"
@@ -164,10 +177,16 @@ it:
       close_full_page: "Chiudi la chat a schermo intero"
       open_message: "Apri messaggio in chat"
       placeholder_self: "Scrivi qualche annotazione"
-      placeholder_others: "Chatta con %{messageRecipient}"
-      placeholder_new_message_disallowed: "Il canale è %{status}, non puoi inviare nuovi messaggi in questo momento."
+      placeholder_channel: "Chatta in %{channelName}"
+      placeholder_thread: "Chat nel thread"
+      placeholder_users: "Chatta con %{commaSeparatedNames}"
+      placeholder_new_message_disallowed:
+        archived: "Il canale è archiviato, non puoi inviare nuovi messaggi in questo momento."
+        closed: "Il canale è chiuso, non puoi inviare nuovi messaggi in questo momento."
+        read_only: "Il canale è in sola lettura, non è possibile inviare nuovi messaggi in questo momento."
       placeholder_silenced: "In questo momento non puoi inviare messaggi."
-      placeholder_start_conversation: Inizia una conversazione con %{usernames}
+      placeholder_start_conversation: "Inizia una conversazione con..."
+      placeholder_start_conversation_users: "Inizia una conversazione con %{commaSeparatedUsernames}"
       remove_upload: "Rimuovi file"
       react: "Reagisci con delle emoji"
       reply: "Rispondi"
@@ -183,8 +202,11 @@ it:
       restore: "Ripristina messaggio eliminato"
       save: "Salva"
       select: "Seleziona"
-      silence: "Silenzia utente"
       return_to_list: "Torna all'elenco dei canali"
+      return_to_threads_list: "Torna alle discussioni in corso"
+      unread_threads_count:
+        one: "Hai %{count} discussione non lette"
+        other: "Hai %{count} discussioni non lette"
       scroll_to_bottom: "Scorri fino in fondo"
       scroll_to_new_messages: "Vedi nuovi messaggi"
       sound:
@@ -196,6 +218,8 @@ it:
       title: "chat"
       title_capitalized: "Chat"
       upload: "Allega un file"
+      upload_to_channel: "Carica su %{title}"
+      upload_to_thread: "Carica nel thread"
       uploaded_files:
         one: "%{count} file"
         other: "%{count} file"
@@ -239,10 +263,23 @@ it:
           about: Informazioni
           members: Membri
           settings: Impostazioni
-      channel_edit_name_modal:
-        title: Modifica nome
+      new_message_modal:
+        title: Invia messaggio
+        add_user_long: <kbd>MAIUSC + clic</kbd> o <kbd>MAIUSC + INVIO</kbd><span>Aggiunge @%{username}</span>
+        add_user_short: <span>Aggiungi utente</span>
+        open_channel: <span>Apri canale</span>
+        default_search_placeholder: "#uncanale, @qualcuno o altro"
+        default_channel_search_placeholder: "#un-canale"
+        default_user_search_placeholder: "@qualcuno"
+        user_search_placeholder: "...aggiungi altri utenti"
+        disabled_user: "ha disabilitato la chat"
+        no_items: "Nessun elemento"
+      channel_edit_name_slug_modal:
+        title: Modifica canale
         input_placeholder: Aggiungi un nome
-        description: Assegna un breve nome descrittivo al tuo canale
+        slug_description: Lo slug del canale viene utilizzato nell'URL al posto del nome del canale
+        name: Nome del canale
+        slug: Slug canale (opzionale)
       channel_edit_description_modal:
         title: Modifica descrizione
         input_placeholder: Aggiungi una descrizione
@@ -252,9 +289,6 @@ it:
         prefix: "A:"
         no_results: Nessun risultato
         selected_user_title: "Deseleziona %{username}"
-      channel_selector:
-        title: "Vai al canale"
-        no_channels: "Nessun canale corrisponde alla tua ricerca"
       channel:
         no_memberships: Questo canale non ha membri
         no_memberships_found: Nessun membro trovato
@@ -262,23 +296,44 @@ it:
           one: "%{count} membro"
           other: "%{count} membri"
       create_channel:
+        threading:
+          label: "Abilita il threading"
         auto_join_users:
           public_category_warning: "%{category} è una categoria pubblica. Aggiungere automaticamente tutti gli utenti attivi di recente a questo canale?"
-          warning_groups:
-            one: Aggiungere automaticamente %{members_count} utenti da %{group}?
-            other: Aggiungere automaticamente %{members_count} utenti da %{group} e %{group_2}?
-          warning_multiple_groups: Aggiungere automaticamente %{members_count} utenti da %{group_1} e altri %{count}?
+          warning_1_group:
+            one: "Aggiungere automaticamente %{count} utente da %{group}?"
+            other: "Aggiungere automaticamente %{count} utenti da %{group}?"
+          warning_2_groups:
+            one: "Aggiungere automaticamente %{count} utente da %{group1} e %{group2}?"
+            other: "Aggiungere automaticamente %{count} utenti da %{group1} e %{group2}?"
+          warning_multiple_groups_MF: |
+            { groupCount, plural,
+                one {
+                      { userCount, plural,
+                          one {Aggiungere automaticamente {userCount} utente di {groupName} e {groupCount} altro gruppo?}
+                        other {Aggiungere automaticamente {userCount} utenti di {groupName} e {groupCount} altro gruppo ?}
+                      }
+                    }
+              other {
+                      { userCount, plural,
+                          one {Aggiungere automaticamente {userCount} utente di {groupName} e di {groupCount} altri gruppi?}
+                        other {Aggiungere automaticamente {userCount} utenti di {groupName} e di {groupCount} altri gruppi?}
+                      }
+                    }
+            }
         choose_category:
           label: "Scegli una categoria"
           none: "selezionane una..."
           default_hint: Gestisci l'accesso visitando le <a href=%{link} target="_blank">impostazioni di sicurezza di %{category}</a>
-          hint_groups:
-            one: Gli utenti in %{hint} avranno accesso a questo canale in base alle <a href=%{link} target="_blank">impostazioni di sicurezza</a>
-            other: Gli utenti in %{hint} e %{hint_2} avranno accesso a questo canale in base alle <a href=%{link} target="_blank">impostazioni di sicurezza</a>
-          hint_multiple_groups: Gli utenti in %{hint_1} e altri %{count} gruppi avranno accesso a questo canale in base alle <a href=%{link} target="_blank">impostazioni di sicurezza</a>
+          hint_1_group: 'Gli utenti in %{group} avranno accesso a questo canale in base alle <a href=%{settingLink} target="_blank">impostazioni di sicurezza</a>'
+          hint_2_groups: 'Gli utenti in %{group1} e %{group2} avranno accesso a questo canale in base alle <a href=%{settingLink} target="_blank">impostazioni di sicurezza</a>'
+          hint_multiple_groups:
+            one: 'Gli utenti in %{group} e un altro gruppo avranno accesso a questo canale in base alle <a href=%{settingLink} target="_blank">impostazioni di sicurezza</a>'
+            other: 'Gli utenti in %{group} e altri %{count} gruppi avranno accesso a questo canale in base alle <a href=%{settingLink} target="_blank">impostazioni di sicurezza</a>'
         create: "Crea canale"
         description: "Descrizione (facoltativa)"
         name: "Nome del canale"
+        slug: "Slug canale (opzionale)"
         title: "Nuovo canale"
         type: "Tipo"
         types:
@@ -288,15 +343,22 @@ it:
         type: "Messaggio di chat"
       reactions:
         only_you: "Hai reagito con :%{emoji}:"
-        and_others: "Tu, %{usernames} avete reagito con :%{emoji}:"
-        only_others: "%{usernames} ha reagito con :%{emoji}:"
-        others_and_more: "%{usernames} e altri %{more} hanno reagito con :%{emoji}:"
-        you_others_and_more: "Tu, %{usernames} e altri %{more} avete reagito con :%{emoji}:"
+        you_and_single_user: "Tu e %{username} avete reagito con :%{emoji}:"
+        you_and_multiple_users: "Tu, %{commaSeparatedUsernames} e %{username} avete reagito con :%{emoji}:"
+        you_multiple_users_and_more:
+          one: "Tu, %{commaSeparatedUsernames} e %{count} altro avete reagito con :%{emoji}:"
+          other: "Tu, %{commaSeparatedUsernames} e altri %{count} avete reagito con :%{emoji}:"
+        single_user: "%{username} ha reagito con :%{emoji}:"
+        multiple_users: "%{commaSeparatedUsernames} e %{username} hanno reagito con :%{emoji}:"
+        multiple_users_and_more:
+          one: "%{commaSeparatedUsernames} e %{count} altro avete reagito con :%{emoji}:"
+          other: "%{commaSeparatedUsernames} e altri %{count} avete reagito con :%{emoji}:"
       composer:
         toggle_toolbar: "Attiva barra degli strumenti"
         italic_text: "testo in evidenza"
         bold_text: "testo in grassetto"
         code_text: "testo di codice"
+        send: "Invia"
       quote:
         original_channel: 'Inviato in origine in <a href="%{channelLink}">#%{channel}</a>'
         copy_success: "Citazione della chat copiata negli appunti"
@@ -307,15 +369,19 @@ it:
       settings:
         channel_wide_mentions_label: "Consenti le menzioni @all e @here"
         channel_wide_mentions_description: "Consenti agli utenti di avvisare tutti i membri di #%{channel} con @all o solo quelli che sono attivi al momento con @here"
+        channel_threading_label: "Threading"
+        channel_threading_description: "Quando il threading è abilitato, le risposte a un messaggio di chat creeranno una conversazione separata, che esisterà accanto al canale principale."
         auto_join_users_label: "Aggiunta automatica utenti"
-        auto_join_users_info: "Controlla ogni ora quali utenti sono stati attivi negli ultimi 3 mesi e, se hanno accesso alla categoria %{category}, aggiungili a questo canale."
-        enable_auto_join_users: "Aggiungi automaticamente tutti gli utenti attivi di recente"
+        auto_join_users_info: "Controlla ogni ora quali utenti sono stati attivi negli ultimi 3 mesi. Aggiungili a questo canale se hanno accesso alla categoria %{category}."
+        auto_join_users_info_no_category: "Controlla ogni ora quali utenti sono stati attivi negli ultimi tre mesi. Aggiungili a questo canale se hanno accesso alla categoria selezionata."
         auto_join_users_warning: "Tutti gli utenti che non sono membri di questo canale e hanno accesso alla categoria %{category} parteciperanno. Vuoi procedere?"
         desktop_notification_level: "Notifiche sul desktop"
         follow: "Partecipa"
         followed: "Partecipante"
         mobile_notification_level: "Notifiche push su dispositivi mobili"
         mute: "Silenzia canale"
+        threading_enabled: "Abilitato"
+        threading_disabled: "Disabilitato"
         muted_on: "On"
         muted_off: "Off"
         notifications: "Notifiche"
@@ -324,9 +390,13 @@ it:
         saved: "Salvato"
         unfollow: "Esci"
         admin_title: "Amministratore"
-        retention_info: "La cronologia delle chat verrà salvata per %{days} giorni."
       admin:
         title: "Chat"
+        export_messages:
+          title: "Esporta i messaggi della chat"
+          description: "L'esportazione è attualmente limitata a 10000 messaggi più recenti negli ultimi 6 mesi."
+          create_export: "Crea esportazione"
+          export_has_started: "L'esportazione è iniziata. Riceverai un messaggio personale quando sarà pronto."
       direct_messages:
         title: "Chat personale"
         new: "Crea una chat personale"
@@ -390,8 +460,14 @@ it:
           one: "%{commaSeparatedUsernames} e %{count} altro stanno scrivendo"
           other: "%{commaSeparatedUsernames} e altri %{count} stanno scrivendo"
       retention_reminders:
-        public: "La cronologia del canale è conservata per %{days} giorni."
-        dm: "La cronologia della chat personale è conservata per %{days} giorni."
+        public_none: "La cronologia del canale viene conservata a tempo indeterminato."
+        public:
+          one: "La cronologia del canale è conservata per %{count} giorno."
+          other: "La cronologia del canale è conservata per %{count} giorni."
+        dm_none: "La cronologia della chat personale viene conservata a tempo indeterminato."
+        dm:
+          one: "La cronologia della chat personale è conservata per %{count} giorno."
+          other: "La cronologia della chat personale è conservata per %{count} giorni."
       flags:
         off_topic: "Questo messaggio non è rilevante per la discussione in corso in base alla definizione del titolo del canale e probabilmente dovrebbe essere spostato altrove."
         inappropriate: "Questo messaggio ha contenuti che chiunque considererebbe offensivi o ingiuriosi, oppure contiene violazioni delle <a href=\"%{basePath}/guidelines\">nostre linee guida della community</a>."
@@ -413,6 +489,33 @@ it:
         symbols: "Simboli"
         search_placeholder: "Cerca per nome emoji e alias..."
         no_results: "Nessun risultato"
+      thread:
+        title: "Titolo"
+        view_thread: Visualizza thread
+        default_title: "Thread"
+        replies:
+          one: "%{count} risposta"
+          other: "%{count} risposte"
+        label: Thread
+        close: "Chiudi Thread"
+        original_message:
+          started_by: "Iniziato da"
+        settings: "Impostazioni"
+        last_reply: "ultima risposta"
+        notifications:
+          regular:
+            title: "Normale"
+            description: "Riceverai notifiche se qualcuno menziona il tuo @nome o ti risponde."
+          tracking:
+            title: "Contenuto seguito"
+            description: "Il conteggio delle nuove risposte a questa discussione sarà visualizzato nell'elenco delle discussioni e nel canale. Sarai avvisato se qualcuno menziona il tuo @nome in questa discussione."
+        participants_other_count:
+          one: "+%{count}"
+          other: "+%{count}"
+      threads:
+        open: "Apri Discussione"
+        list: "Discussioni in corso"
+        none: "Non stai partecipando a nessun thread in questo canale."
       draft_channel_screen:
         header: "Nuovo messaggio"
         cancel: "Annulla"
@@ -457,9 +560,8 @@ it:
       transcript:
         view: "Visualizza la trascrizione dei messaggi precedenti"
       types:
-        reviewable_chat_message:
+        chat_reviewable_message:
           title: "Messaggio di chat segnalato"
-          flagged_by: "Segnalato da"
     keyboard_shortcuts_help:
       chat:
         title: "Chat"
@@ -472,6 +574,7 @@ it:
           composer_code: "%{shortcut} Codice (solo compositore)"
           drawer_open: "%{shortcut} Apri il cassetto della chat"
           drawer_close: "%{shortcut} Chiudi il cassetto della chat"
+          mark_all_channels_read: "%{shortcut} Contrassegna tutti i canali come letti"
     topic_statuses:
       chat:
         help: "La chat è abilitata per questo argomento"
@@ -490,3 +593,7 @@ it:
         chat_notifications_with_unread:
           one: "Notifiche chat - %{count} notifica non letta"
           other: "Notifiche chat - %{count} notifiche non lette"
+    styleguide:
+      sections:
+        chat:
+          title: Chat
diff --git a/plugins/chat/config/locales/client.ja.yml b/plugins/chat/config/locales/client.ja.yml
index 0b2d430755f..1f7b82706dd 100644
--- a/plugins/chat/config/locales/client.ja.yml
+++ b/plugins/chat/config/locales/client.ja.yml
@@ -38,8 +38,6 @@ ja:
       browse_all_channels: "すべてのチャンネルを閲覧する"
       move_to_channel:
         title: "メッセージをチャンネルに移動する"
-        instructions:
-          other: "<strong>%{count}</strong> 件のメッセージを移動しようとしています。移動先のチャンネルを選択してください。<strong>%{channelTitle}</strong> チャンネルに、これらのメッセージが移動されたことを示すプレースホルダーメッセージが作成されます。"
         confirm_move: "メッセージを移動"
       channel_settings:
         title: "チャンネルの設定"
@@ -70,7 +68,6 @@ ja:
         instructions: "チャンネルを閉鎖すると、スタッフ以外のユーザーが新しいメッセージの送信や既存のメッセージの編集を行えなくなります。このチャンネルを閉鎖してもよろしいですか？"
       channel_delete:
         title: "チャンネルを削除"
-        instructions: "<p><strong>%{name}</strong> チャンネルとチャット履歴を削除します。すべてのメッセージと、リアクションやアップロードといった関連データは永久に削除されます。チャンネルの履歴を保持して閉鎖するには、チャンネルを削除ではなくアーカイブすることをお勧めします。</p><p>チャンネルを<strong>永久に削除</strong>してもよろしいですか？確定するには、チャンネルの名前を下のボックスに入力してください。</p>"
         confirm: "結果を理解し、チャンネルを削除します"
         confirm_channel_name: "チャンネル名を入力してください"
         process_started: "チャンネルの削除処理が開始しました。このモーダルは間もなく閉じられ、削除されたチャンネルがどこにも表示されなくなります。"
@@ -81,7 +78,6 @@ ja:
       close: "閉じる"
       collapse: "チャットドロワーを折りたたむ"
       confirm_flag: "%{username} のメッセージを通報してよろしいですか？"
-      deleted: "メッセージは削除されました。[view]"
       hidden: "メッセージが非表示でした。[view]"
       delete: "削除"
       edited: "編集済み"
@@ -96,6 +92,8 @@ ja:
         never: "なし"
         title: "メール通知"
         when_away: "退席中の時のみ"
+      header_indicator_preference:
+        never: "なし"
       enable: "チャットを有効にする"
       flag: "通報する"
       emoji: "絵文字を挿入する"
@@ -105,38 +103,18 @@ ja:
       in_reply_to: "返信先"
       heading: "チャット"
       join: "参加"
-      new_messages: "新しいメッセージ"
+      last_visit: "最後の訪問"
+      summarization:
+        summarize: "要約"
       mention_warning:
         dismiss: "閉じる"
-        cannot_see:
-          other: "%{username} と他 %{others} 人はこのチャンネルにアクセスできないため通知されませんでした。"
         invitations_sent:
           other: "招待状を送信しました"
         invite: "チャンネルに招待する"
-        without_membership:
-          other: "%{username} と他 %{others} 人はこのチャンネルに参加していません。"
-        group_mentions_disabled:
-          other: "%{group_name} と他 %{others} グループはメンションを許可していません"
-        too_many_members:
-          other: "%{group_name} と他 %{others} グループのメンバーが多すぎます。誰にも通知されませんでした"
-        warning_multiple:
-          other: "他 %{count} 件"
         groups:
           header:
             some: "一部のユーザーには通知されません"
             all: "誰にも通知されません"
-          unreachable:
-            other: "@%{group} と @%{group_2} はメンションを許可していません"
-          unreachable_multiple: "@%{group} と他 %{count} グループはメンションを許可していません"
-          too_many_members:
-            other: "@%{group} と @%{group_2} の両方をメンションすると、%{limit}の%{notification_limit}を超過します"
-          too_many_members_multiple: "これらの %{count} グループは、%{limit}の%{notification_limit}を超過しています"
-          users_limit:
-            other: "%{count} 人のユーザー"
-          notification_limit: "通知制限"
-        too_many_mentions: "このメッセージは %{limit}の%{notification_limit}を超過しています"
-        mentions_limit:
-          other: "%{count} メンション"
       aria_roles:
         header: "チャットヘッダー"
         composer: "チャット作成ツール"
@@ -153,10 +131,9 @@ ja:
       close_full_page: "全画面チャットを閉じる"
       open_message: "メッセージをチャットで開く"
       placeholder_self: "メモを書き留める"
-      placeholder_others: "%{messageRecipient} とチャット"
-      placeholder_new_message_disallowed: "チャンネルは %{status} です。現在、新しいメッセージを送信できません。"
+      placeholder_users: "%{commaSeparatedNames} とチャット"
       placeholder_silenced: "現在、メッセージを送信できません。"
-      placeholder_start_conversation: '%{usernames} と会話を始める'
+      placeholder_start_conversation_users: "%{commaSeparatedUsernames} と会話を始める"
       remove_upload: "ファイルを削除する"
       react: "絵文字でリアクション"
       reply: "返信"
@@ -172,7 +149,6 @@ ja:
       restore: "削除されたメッセージを復元する"
       save: "保存"
       select: "選択"
-      silence: "ユーザーを投稿禁止にする"
       return_to_list: "チャンネルリストに戻る"
       scroll_to_bottom: "一番下にスクロール"
       scroll_to_new_messages: "新しいメッセージを見る"
@@ -225,6 +201,10 @@ ja:
           about: 紹介
           members: メンバー
           settings: 設定
+      new_message_modal:
+        no_items: "項目なし"
+      channel_edit_name_slug_modal:
+        name: チャンネル名
       channel_edit_description_modal:
         title: 説明を編集する
         input_placeholder: 説明を追加する
@@ -234,9 +214,6 @@ ja:
         prefix: "宛先:"
         no_results: 結果がありません
         selected_user_title: "%{username} を選択解除"
-      channel_selector:
-        title: "チャンネルにジャンプ"
-        no_channels: "検索に一致するチャンネルはありません"
       channel:
         no_memberships: このチャンネルにはメンバーがいません
         no_memberships_found: メンバーが見つかりません
@@ -245,16 +222,12 @@ ja:
       create_channel:
         auto_join_users:
           public_category_warning: "%{category} は公開カテゴリです。最近アクティブなすべてのユーザーをこのチャンネルに自動的に追加しますか？"
-          warning_groups:
-            other: '%{group} と %{group_2} から %{members_count} 人のユーザーを自動的に追加しますか？'
-          warning_multiple_groups: '%{group_1} の %{members_count} 人のユーザーと他 %{count} 人を自動的に追加しますか？'
+          warning_2_groups:
+            other: "%{group1} と %{group2} から %{count} 人のユーザーを自動的に追加しますか？"
         choose_category:
           label: "カテゴリを選択する"
           none: "1 つ選択してください..."
           default_hint: <a href=%{link} target="_blank">%{category} のセキュリティ設定</a>に移動し、アクセス権を管理します
-          hint_groups:
-            other: '%{hint} と %{hint_2} のユーザーは、<a href=%{link} target="_blank">セキュリティ設定</a>に従って、このチャンネルにアクセスできます。'
-          hint_multiple_groups: '%{hint_1} と他 %{count} 個のグループのユーザーは、<a href=%{link} target="_blank">セキュリティ設定</a>に従って、このチャンネルにアクセスできます。'
         create: "チャンネルを作成"
         description: "説明 (オプション)"
         name: "チャンネル名"
@@ -267,15 +240,17 @@ ja:
         type: "チャットメッセージ"
       reactions:
         only_you: ":%{emoji}: でリアクションしました"
-        and_others: "あなたと %{usernames} が :%{emoji}: でリアクションしました"
-        only_others: "%{usernames} が :%{emoji}: でリアクションしました"
-        others_and_more: "%{usernames} と他 %{more} 人が :%{emoji}: でリアクションしました"
-        you_others_and_more: "あなた、%{usernames} と他 %{more} 人が :%{emoji}: でリアクションしました"
+        you_multiple_users_and_more:
+          other: "あなた、%{commaSeparatedUsernames} と他 %{count} 人が :%{emoji}: でリアクションしました"
+        single_user: "%{username} が :%{emoji}: でリアクションしました"
+        multiple_users_and_more:
+          other: "%{commaSeparatedUsernames} と他 %{count} 人が :%{emoji}: でリアクションしました"
       composer:
         toggle_toolbar: "ツールバーの切り替え"
         italic_text: "強調文字"
         bold_text: "太字"
         code_text: "コードテキスト"
+        send: "送信"
       quote:
         original_channel: '最初に <a href="%{channelLink}">%{channel}</a> で送信されました'
         copy_success: "チャットの引用をクリップボードにコピーしました"
@@ -287,14 +262,13 @@ ja:
         channel_wide_mentions_label: "@all と @here メンションを許可する"
         channel_wide_mentions_description: "@all で #%{channel} の全メンバーに通知するか、@here で現在アクティブなメンバーのみに通知することを許可します"
         auto_join_users_label: "自動的にユーザーを追加する"
-        auto_join_users_info: "過去 3 か月にアクティブだったユーザーを 1 時間ごとに確認し、それらのユーザーが %{category} カテゴリにアクセスできる場合はこのチャンネルに追加します。"
-        enable_auto_join_users: "最近アクティブなユーザーをすべて自動的に追加する"
         auto_join_users_warning: "このチャンネルのメンバーでなく、%{category} カテゴリにアクセスできるすべてのユーザーが参加します。よろしいですか？"
         desktop_notification_level: "デスクトップ通知"
         follow: "参加"
         followed: "参加中"
         mobile_notification_level: "モバイルプッシュ通知"
         mute: "チャンネルをミュート"
+        threading_disabled: "無効"
         muted_on: "オン"
         muted_off: "オフ"
         notifications: "通知"
@@ -303,7 +277,6 @@ ja:
         saved: "保存済み"
         unfollow: "退出"
         admin_title: "管理者"
-        retention_info: "チャット履歴は %{days} 日間保存されます。"
       admin:
         title: "チャット"
       direct_messages:
@@ -365,8 +338,10 @@ ja:
         many_users:
           other: "%{commaSeparatedUsernames} と他 %{count} 人が入力中です"
       retention_reminders:
-        public: "チャンネル履歴は %{days} 日間保持されます。"
-        dm: "パーソナルチャット履歴は %{days} 日間保持されます。"
+        public:
+          other: "チャンネル履歴は %{count} 日間保持されます。"
+        dm:
+          other: "パーソナルチャット履歴は %{count} 日間保持されます。"
       flags:
         off_topic: "このメッセージは、チャンネルのタイトルで定義された現在のディスカッションとは関係がないため、おそらく別の場所に移動する必要があります。"
         inappropriate: "このメッセージには、合理的な人が攻撃的、虐待的、または<a href=\"%{basePath}/guidelines\">コミュニティーガイドライン</a>に違反すると見なすコンテンツが含まれます。"
@@ -388,6 +363,19 @@ ja:
         symbols: "記号"
         search_placeholder: "絵文字名とエイリアスで検索..."
         no_results: "結果がありません"
+      thread:
+        title: "タグライン"
+        replies:
+          other: "返信: %{count} 件"
+        settings: "設定"
+        last_reply: "最後の返信"
+        notifications:
+          regular:
+            title: "標準"
+          tracking:
+            title: "追跡中"
+        participants_other_count:
+          other: "+%{count} 件"
       draft_channel_screen:
         header: "新しいメッセージ"
         cancel: "キャンセル"
@@ -432,9 +420,8 @@ ja:
       transcript:
         view: "前のメッセージのトランスクリプトを表示"
       types:
-        reviewable_chat_message:
+        chat_reviewable_message:
           title: "通報されたチャットメッセージ"
-          flagged_by: "通報者"
     keyboard_shortcuts_help:
       chat:
         title: "チャット"
@@ -464,3 +451,7 @@ ja:
         chat_notifications: "チャット通知"
         chat_notifications_with_unread:
           other: "チャット通知 - %{count} 件の未読の通知"
+    styleguide:
+      sections:
+        chat:
+          title: チャット
diff --git a/plugins/chat/config/locales/client.ko.yml b/plugins/chat/config/locales/client.ko.yml
index 9a0c7cee1a9..2ace0db2237 100644
--- a/plugins/chat/config/locales/client.ko.yml
+++ b/plugins/chat/config/locales/client.ko.yml
@@ -59,18 +59,19 @@ ko:
         never: "알림 받지 않기"
         title: "이메일 알림"
         when_away: "자리를 비울 때만"
+      header_indicator_preference:
+        never: "알림 받지 않기"
       enable: "채팅 활성화"
       flag: "신고"
       emoji: "이모티콘 삽입"
       flagged: "이 메시지는 신고가 되어 검토가 필요합니다."
       heading: "채팅"
       join: "가입"
-      new_messages: "새 메시지"
+      last_visit: "마지막 방문"
+      summarization:
+        summarize: "요약하기"
       mention_warning:
         dismiss: "무시"
-        groups:
-          users_limit:
-            other: "사용자 %{count}명"
       aria_roles:
         header: "채팅 헤더"
         composer: "채팅 작성기"
@@ -138,6 +139,10 @@ ko:
           about: 소개
           members: 회원
           settings: 설정
+      new_message_modal:
+        no_items: "항목이 없습니다"
+      channel_edit_name_slug_modal:
+        name: 채널명
       channel_edit_description_modal:
         title: 설명 수정
         input_placeholder: 설명 추가
@@ -145,9 +150,6 @@ ko:
         title: 새로운 메시지
         prefix: "받는사람:"
         no_results: 결과 없음
-      channel_selector:
-        title: "채널로 이동"
-        no_channels: "검색과 일치하는 채널이 없습니다."
       channel:
         no_memberships: 이 채널에는 회원이 없습니다.
         no_memberships_found: 회원을 찾을 수 없음
@@ -172,6 +174,7 @@ ko:
         italic_text: "강조하기"
         bold_text: "굵게하기"
         code_text: "코드 텍스트"
+        send: "보내기"
       notification_levels:
         never: "알림 받지 않기"
       settings:
@@ -179,6 +182,8 @@ ko:
         desktop_notification_level: "데스크톱 알림"
         follow: "가입"
         followed: "가입"
+        threading_enabled: "활성화"
+        threading_disabled: "비활성"
         muted_on: "켜기"
         muted_off: "끄기"
         notifications: "알림"
@@ -236,6 +241,19 @@ ko:
         symbols: "기호"
         search_placeholder: "이모티콘 이름과 별칭으로 검색..."
         no_results: "결과 없음"
+      thread:
+        title: "제목"
+        replies:
+          other: "%{count} 댓글"
+        settings: "사이트 설정"
+        last_reply: "마지막 댓글"
+        notifications:
+          regular:
+            title: "일반"
+          tracking:
+            title: "알림"
+        participants_other_count:
+          other: "+%{count}"
       draft_channel_screen:
         header: "새로운 메시지"
         cancel: "취소"
@@ -261,9 +279,8 @@ ko:
               description: 시스템 기본값
     review:
       types:
-        reviewable_chat_message:
+        chat_reviewable_message:
           title: "신고된 채팅 메시지"
-          flagged_by: "신고자"
     keyboard_shortcuts_help:
       chat:
         title: "채팅"
@@ -272,3 +289,7 @@ ko:
         chat_notifications: "채팅 알림"
         chat_notifications_with_unread:
           other: "채팅 알림 - 읽지 않은 알림 %{count}개"
+    styleguide:
+      sections:
+        chat:
+          title: 채팅
diff --git a/plugins/chat/config/locales/client.lt.yml b/plugins/chat/config/locales/client.lt.yml
index 45434460581..fe2e7395b3e 100644
--- a/plugins/chat/config/locales/client.lt.yml
+++ b/plugins/chat/config/locales/client.lt.yml
@@ -21,16 +21,15 @@ lt:
       joined: "prisijungė"
       email_frequency:
         never: "Niekada"
+      header_indicator_preference:
+        never: "Niekada"
       flag: "Pranešti"
       join: "Prisijungti"
+      last_visit: "paskutinis apsilankymas"
+      summarization:
+        summarize: "Apibendrinti"
       mention_warning:
         dismiss: "praleisti"
-        groups:
-          users_limit:
-            one: "%{count} vartotojas"
-            few: "%{count} vartotojų"
-            many: "%{count} vartotojų"
-            other: "%{count} vartotojų"
       reply: "Atsakyti"
       edit: "Redaguoti"
       rebake_message: "Perkurti HTML"
@@ -60,6 +59,8 @@ lt:
           about: Apie
           members: Nariai
           settings: Nustatymai
+      new_message_modal:
+        no_items: "Nėra elementų"
       direct_message_creator:
         title: Nauja žinutė
         prefix: "Kam:"
@@ -71,11 +72,14 @@ lt:
       composer:
         italic_text: "pasviras tekstas"
         bold_text: "paryškintas tekstas"
+        send: "Siųsti"
       notification_levels:
         never: "Niekada"
       settings:
         follow: "Prisijungti"
         followed: "Prisijungė"
+        threading_enabled: "Galimas"
+        threading_disabled: "Uždrausta"
         notifications: "Pranešimai"
         preview: "Peržiūrėti"
         save: "Išsaugoti"
@@ -107,6 +111,25 @@ lt:
         activities: "Veikla"
         flags: "Pažymėk!"
         symbols: "Simboliai"
+      thread:
+        title: "Antraštė"
+        replies:
+          one: "%{count} atsakymas"
+          few: "%{count} atsakymai"
+          many: "%{count} atsakymai"
+          other: "%{count} atsakymai"
+        settings: "Nustatymai"
+        last_reply: "Paskutinis atsakymas"
+        notifications:
+          regular:
+            title: "Įprastas"
+          tracking:
+            title: "Seku"
+        participants_other_count:
+          one: "+%{count}"
+          few: "+%{count}"
+          many: "+%{count}"
+          other: "+%{count}"
       draft_channel_screen:
         header: "Nauja žinutė"
         cancel: "Atšaukti"
@@ -118,7 +141,3 @@ lt:
           fields:
             message:
               label: Žinutės
-    review:
-      types:
-        reviewable_chat_message:
-          flagged_by: "Pažymėjo"
diff --git a/plugins/chat/config/locales/client.lv.yml b/plugins/chat/config/locales/client.lv.yml
index 4e11375693c..f35132e4765 100644
--- a/plugins/chat/config/locales/client.lv.yml
+++ b/plugins/chat/config/locales/client.lv.yml
@@ -21,15 +21,13 @@ lv:
       joined: "pievienojās"
       email_frequency:
         never: "Nekad"
+      header_indicator_preference:
+        never: "Nekad"
       flag: "Sūdzība"
       join: "Pievienojieties"
+      last_visit: "pēdējais apmeklējums"
       mention_warning:
         dismiss: "nerādīt"
-        groups:
-          users_limit:
-            zero: "%{count} lietotāji"
-            one: "%{count} lietotājs"
-            other: "%{count} lietotāji"
       reply: "Atbilde"
       edit: "Rediģēt"
       rebake_message: "Pārbūvēt HTML"
@@ -70,11 +68,14 @@ lv:
       composer:
         italic_text: "Uzsvērts teksts"
         bold_text: "treknrakstā"
+        send: "Sūtīt"
       notification_levels:
         never: "Nekad"
       settings:
         follow: "Pievienojieties"
         followed: "Pievienojās"
+        threading_enabled: "Ieslēgts"
+        threading_disabled: "Atslēgt"
         notifications: "Paziņojumi"
         preview: "Priekšskatījums"
         save: "Saglabāt"
@@ -104,6 +105,19 @@ lv:
         activities: "Aktivitātes"
         flags: "Sūdzības"
         symbols: "Simboli"
+      thread:
+        title: "Virsraksts"
+        replies:
+          zero: "%{count} atbildes"
+          one: "%{count} atbilde"
+          other: "%{count} atbildes"
+        settings: "Iestatījumi"
+        last_reply: "pēdējā atbilde"
+        notifications:
+          regular:
+            title: "Normāls"
+          tracking:
+            title: "Sekot"
       draft_channel_screen:
         header: "Jauns ziņa"
         cancel: "Atcelt"
@@ -113,7 +127,3 @@ lv:
           fields:
             message:
               label: Ziņa
-    review:
-      types:
-        reviewable_chat_message:
-          flagged_by: "Atzīmēja"
diff --git a/plugins/chat/config/locales/client.nb_NO.yml b/plugins/chat/config/locales/client.nb_NO.yml
index 5f413a287ee..eb47e6eafc2 100644
--- a/plugins/chat/config/locales/client.nb_NO.yml
+++ b/plugins/chat/config/locales/client.nb_NO.yml
@@ -21,14 +21,13 @@ nb_NO:
       joined: "medlem fra"
       email_frequency:
         never: "Aldri"
+      header_indicator_preference:
+        never: "Aldri"
       flag: "Flagg"
       join: "Bli medlem"
+      last_visit: "siste besøk"
       mention_warning:
         dismiss: "forkast"
-        groups:
-          users_limit:
-            one: "%{count} bruker"
-            other: "%{count} brukere"
       reply: "Svar"
       edit: "Endre"
       rebake_message: "Generer HTML på nytt"
@@ -69,6 +68,7 @@ nb_NO:
       composer:
         italic_text: "kursiv tekst"
         bold_text: "sterk tekst"
+        send: "Send"
       notification_levels:
         never: "Aldri"
       settings:
@@ -76,6 +76,8 @@ nb_NO:
         channel_wide_mentions_description: "Tillat brukere å varsle alle medlemmer av #%{channel} med @alle eller bare de som er aktive i øyeblikket med @alleher"
         follow: "Bli medlem"
         followed: "Medlem fra"
+        threading_enabled: "Aktivert"
+        threading_disabled: "Deaktivert"
         notifications: "Varsler"
         preview: "Forhåndsvis"
         save: "Lagre"
@@ -107,6 +109,21 @@ nb_NO:
         activities: "Aktiviteter"
         flags: "Flagg"
         symbols: "Symboler"
+      thread:
+        title: "Tittel"
+        replies:
+          one: "%{count} svar"
+          other: "%{count} svar"
+        settings: "Instillinger"
+        last_reply: "siste svar"
+        notifications:
+          regular:
+            title: "Normal"
+          tracking:
+            title: "Overvåkning"
+        participants_other_count:
+          one: "+%{count}"
+          other: "+%{count}"
       draft_channel_screen:
         header: "Ny Melding"
         cancel: "Avbryt"
@@ -118,7 +135,3 @@ nb_NO:
           fields:
             message:
               label: Send
-    review:
-      types:
-        reviewable_chat_message:
-          flagged_by: "Rapportert av"
diff --git a/plugins/chat/config/locales/client.nl.yml b/plugins/chat/config/locales/client.nl.yml
index 02f8fe730e3..c98b74e5fe6 100644
--- a/plugins/chat/config/locales/client.nl.yml
+++ b/plugins/chat/config/locales/client.nl.yml
@@ -38,9 +38,6 @@ nl:
       browse_all_channels: "Alle kanalen bekijken"
       move_to_channel:
         title: "Berichten verplaatsen naar kanaal"
-        instructions:
-          one: "Je gaat <strong>%{count}</strong> bericht verplaatsen. Selecteer een bestemmingskanaal. Er wordt een vervangend bericht gemaakt in het kanaal <strong>%{channelTitle}</strong> om aan te geven dat dit bericht is verplaatst."
-          other: "Je gaat <strong>%{count}</strong> berichten verplaatsen. Selecteer een bestemmingskanaal. Er wordt een vervangend bericht gemaakt in het kanaal <strong>%{channelTitle}</strong> om aan te geven dat deze berichten zijn verplaatst."
         confirm_move: "Berichten verplaatsen"
       channel_settings:
         title: "Kanaalinstellingen"
@@ -71,7 +68,6 @@ nl:
         instructions: "Door het kanaal te sluiten, kunnen niet-medewerkers geen nieuwe berichten sturen of bestaande berichten bewerken. Weet je zeker dat je dit kanaal wilt sluiten?"
       channel_delete:
         title: "Kanaal verwijderen"
-        instructions: "<p>Verwijdert de het kanaal <strong>%{name}</strong> en de chatgeschiedenis. Alle berichten en gerelateerde gegevens, zoals antwoorden en uploads, worden definitief verwijderd. Als je de kanaalgeschiedenis wilt behouden en buiten gebruik wilt stellen, kun je het kanaal in plaats daarvan archiveren.</p> <p>Weet je zeker dat je het kanaal <strong>permanent wilt verwijderen</strong>? Typ ter bevestiging de naam van het kanaal in het onderstaande vak.</p>"
         confirm: "Ik begrijp de gevolgen, verwijder het kanaal"
         confirm_channel_name: "Voer kanaalnaam in"
         process_started: "Het proces om het kanaal te verwijderen is gestart. Dit venster wordt over enkele ogenblikken gesloten, je ziet het verwijderde kanaal nergens meer."
@@ -82,7 +78,6 @@ nl:
       close: "Sluiten"
       collapse: "Chatlade samenvouwen"
       confirm_flag: "Weet je zeker dat je het bericht van %{username} wilt markeren?"
-      deleted: "Er is een bericht verwijderd. [weergeven]"
       hidden: "Er is een bericht verborgen. [weergeven]"
       delete: "Verwijderen"
       edited: "bewerkt"
@@ -97,6 +92,8 @@ nl:
         never: "Nooit"
         title: "E-mailmeldingen"
         when_away: "Alleen wanneer afwezig"
+      header_indicator_preference:
+        never: "Nooit"
       enable: "Chat inschakelen"
       flag: "Markeren"
       emoji: "Emoji invoegen"
@@ -106,48 +103,23 @@ nl:
       in_reply_to: "In antwoord op"
       heading: "Chat"
       join: "Deelnemen"
-      new_messages: "nieuwe berichten"
+      last_visit: "laatste bezoek"
+      summarization:
+        summarize: "Samenvatten"
       mention_warning:
         dismiss: "negeren"
-        cannot_see:
-          one: "%{username} heeft geen toegang tot dit kanaal en is niet geïnformeerd."
-          other: "%{username} hebben geen toegang tot dit kanaal en zijn niet geïnformeerd."
         invitations_sent:
           one: "Uitnodiging gestuurd"
           other: "Uitnodigingen gestuurd"
         invite: "Uitnodigen voor kanaal"
-        without_membership:
-          one: "%{username} neemt niet deel aan dit kanaal."
-          other: "%{username} en %{others} nemen niet deel aan dit kanaal."
-        group_mentions_disabled:
-          one: "%{group_name} staat geen vermeldingen toe"
-          other: "%{group_name} en %{others} staan geen vermeldingen toe"
-        too_many_members:
-          one: "%{group_name} heeft te veel leden. Niemand is geïnformeerd"
-          other: "%{group_name} en %{others} hebben te veel leden. Niemand is geïnformeerd"
-        warning_multiple:
-          one: "%{count} ander"
-          other: "%{count} anderen"
+        without_membership: "%{username} neemt niet deel aan dit kanaal."
+        group_mentions_disabled: "%{group_name} staat geen vermeldingen toe."
+        too_many_members: "%{group_name} heeft te veel leden. Niemand is geïnformeerd."
         groups:
           header:
             some: "Sommige gebruikers worden niet geïnformeerd"
             all: "Niemand wordt geïnformeerd"
-          unreachable:
-            one: "@%{group} staat geen vermeldingen toe"
-            other: "@%{group} en %{group_2} staan geen vermeldingen toe"
-          unreachable_multiple: "@%{group} en %{count} andere groepen staan geen vermeldingen toe"
-          too_many_members:
-            one: "Het noemen van @%{group} overschrijdt de %{notification_limit} van %{limit}"
-            other: "Het noemen van zowel @%{group} als @%{group_2} overschrijdt de %{notification_limit} van %{limit}"
-          too_many_members_multiple: "Deze %{count} groepen overschrijden de %{notification_limit} van %{limit}"
-          users_limit:
-            one: "%{count} gebruiker"
-            other: "%{count} gebruikers"
-          notification_limit: "meldingslimiet"
-        too_many_mentions: "Dit bericht overschrijdt de %{notification_limit} van %{limit}"
-        mentions_limit:
-          one: "%{count} vermelding"
-          other: "%{count} vermeldingen"
+          unreachable_1: "@%{group} staat geen vermeldingen toe."
       aria_roles:
         header: "Chatkop"
         composer: "Chateditor"
@@ -164,10 +136,9 @@ nl:
       close_full_page: "Chat op volledig scherm sluiten"
       open_message: "Bericht openen in chat"
       placeholder_self: "Schrijf iets"
-      placeholder_others: "Chatten met %{messageRecipient}"
-      placeholder_new_message_disallowed: "Kanaal is %{status}, je kunt momenteel geen nieuwe berichten sturen."
+      placeholder_users: "Chatten met %{commaSeparatedNames}"
       placeholder_silenced: "Je kunt op dit moment geen berichten sturen."
-      placeholder_start_conversation: Begin een gesprek met %{usernames}
+      placeholder_start_conversation_users: "Begin een gesprek met %{commaSeparatedUsernames}"
       remove_upload: "Bestand verwijderen"
       react: "Reageren met emoji"
       reply: "Antwoorden"
@@ -183,7 +154,6 @@ nl:
       restore: "Verwijderd bericht herstellen"
       save: "Opslaan"
       select: "Selecteren"
-      silence: "Gebruiker dempen"
       return_to_list: "Terug naar kanalenlijst"
       scroll_to_bottom: "Naar beneden scrollen"
       scroll_to_new_messages: "Nieuwe berichten weergeven"
@@ -237,6 +207,10 @@ nl:
           about: Over
           members: Leden
           settings: Instellingen
+      new_message_modal:
+        no_items: "Geen items"
+      channel_edit_name_slug_modal:
+        name: Kanaalnaam
       channel_edit_description_modal:
         title: Beschrijving bewerken
         input_placeholder: Voeg een beschrijving toe
@@ -246,9 +220,6 @@ nl:
         prefix: "Aan:"
         no_results: Geen resultaten
         selected_user_title: "%{username} deselecteren"
-      channel_selector:
-        title: "Naar kanaal springen"
-        no_channels: "Er komen geen kanalen overeen met je zoekopdracht"
       channel:
         no_memberships: Dit kanaal heeft geen leden
         no_memberships_found: Geen leden gevonden
@@ -258,18 +229,10 @@ nl:
       create_channel:
         auto_join_users:
           public_category_warning: "%{category} is een openbare categorie. Alle recent actieve gebruikers automatisch toevoegen aan dit kanaal?"
-          warning_groups:
-            one: '%{members_count} gebruikers uit %{group} automatisch toevoegen?'
-            other: '%{members_count} gebruikers uit %{group} en %{group_2} automatisch toevoegen?'
-          warning_multiple_groups: '%{members_count} gebruikers uit %{group_1} en %{count} anderen automatisch toevoegen?'
         choose_category:
           label: "Kies een categorie"
           none: "selecteer een..."
           default_hint: Beheer de toegang door naar <a href=%{link} target="_blank">%{category}beveiligingsinstellingen</a> te gaan
-          hint_groups:
-            one: Gebruikers in %{hint} hebben toegang tot dit kanaal volgens de <a href=%{link} target="_blank">beveiligingsinstellingen</a>
-            other: Gebruikers in %{hint} en %{hint_2} hebben toegang tot dit kanaal volgens de <a href=%{link} target="_blank">beveiligingsinstellingen</a>
-          hint_multiple_groups: Gebruikers in %{hint_1} en %{count} andere groepen hebben toegang tot dit kanaal volgens de <a href=%{link} target="_blank">beveiligingsinstellingen</a>
         create: "Kanaal maken"
         description: "Beschrijving (optioneel)"
         name: "Kanaalnaam"
@@ -282,15 +245,13 @@ nl:
         type: "Chatbericht"
       reactions:
         only_you: "Je hebt gereageerd met :%{emoji}:"
-        and_others: "Jij, %{usernames} hebben gereageerd met :%{emoji}:"
-        only_others: "%{usernames} hebben gereageerd met :%{emoji}:"
-        others_and_more: "%{usernames} en %{more} anderen hebben gereageerd met :%{emoji}:"
-        you_others_and_more: "Jij, %{usernames} en %{more} anderen hebben gereageerd met :%{emoji}:"
+        single_user: "%{username} hebben gereageerd met :%{emoji}:"
       composer:
         toggle_toolbar: "Werkbalk schakelen"
         italic_text: "Cursieve tekst"
         bold_text: "Vetgedrukte tekst"
         code_text: "codetekst"
+        send: "Verzenden"
       quote:
         original_channel: 'Oorspronkelijk gestuurd in <a href="%{channelLink}">%{channel}</a>'
         copy_success: "Chatcitaat gekopieerd naar klembord"
@@ -302,14 +263,14 @@ nl:
         channel_wide_mentions_label: "Sta vermeldingen van @all en @here toe"
         channel_wide_mentions_description: "Sta gebruikers toe om alle leden van #%{channel} te informeren met @all of alleen degenen die op dat moment actief zijn met @here"
         auto_join_users_label: "Gebruikers automatisch toevoegen"
-        auto_join_users_info: "Controleer elk uur welke gebruikers de afgelopen 3 maanden actief zijn geweest en voeg ze toe aan dit kanaal als ze toegang hebben tot de categorie %{category}."
-        enable_auto_join_users: "Automatisch alle recent actieve gebruikers toevoegen"
         auto_join_users_warning: "Elke gebruiker die geen lid is van dit kanaal en toegang heeft tot de categorie %{category} wordt lid. Weet je het zeker?"
         desktop_notification_level: "Bureaubladmeldingen"
         follow: "Deelnemen"
         followed: "Lid sinds"
         mobile_notification_level: "Mobiele pushmeldingen"
         mute: "Kanaal dempen"
+        threading_enabled: "Ingeschakeld"
+        threading_disabled: "Uitgeschakeld"
         muted_on: "Aan"
         muted_off: "Uit"
         notifications: "Meldingen"
@@ -318,7 +279,6 @@ nl:
         saved: "Opgeslagen"
         unfollow: "Verlaten"
         admin_title: "Beheerder"
-        retention_info: "Chatgeschiedenis wordt %{days} dagen bewaard."
       admin:
         title: "Chat"
       direct_messages:
@@ -383,9 +343,6 @@ nl:
         many_users:
           one: "%{commaSeparatedUsernames} en %{count} ander zijn aan het typen"
           other: "%{commaSeparatedUsernames} en %{count} anderen zijn aan het typen"
-      retention_reminders:
-        public: "Kanaalgeschiedenis wordt %{days} dagen bewaard."
-        dm: "Persoonlijke chatgeschiedenis wordt %{days} dagen bewaard."
       flags:
         off_topic: "Dit bericht is niet relevant voor de huidige discussie zoals gedefinieerd door de kanaaltitel en moet waarschijnlijk worden verplaats naar elders."
         inappropriate: "Dit bericht bevat inhoud die een redelijk persoon als aanstootgevend, kwetsend of een overtreding van <a href=\"%{basePath}/guidelines\">onze communityrichtlijnen</a> zou beschouwen."
@@ -407,6 +364,21 @@ nl:
         symbols: "Symbolen"
         search_placeholder: "Zoek op emojinaam en -alias..."
         no_results: "Geen resultaten"
+      thread:
+        title: "Titel"
+        replies:
+          one: "%{count} antwoord"
+          other: "%{count} antwoorden"
+        settings: "Instellingen"
+        last_reply: "laatste antwoord"
+        notifications:
+          regular:
+            title: "Normaal"
+          tracking:
+            title: "Tracking"
+        participants_other_count:
+          one: "+%{count}"
+          other: "+%{count}"
       draft_channel_screen:
         header: "Nieuw bericht"
         cancel: "Annuleren"
@@ -451,9 +423,8 @@ nl:
       transcript:
         view: "Transcript van eerdere berichten weergeven"
       types:
-        reviewable_chat_message:
+        chat_reviewable_message:
           title: "Gemarkeerd chatbericht"
-          flagged_by: "Gemarkeerd door"
     keyboard_shortcuts_help:
       chat:
         title: "Chat"
@@ -484,3 +455,7 @@ nl:
         chat_notifications_with_unread:
           one: "Chatmeldingen - %{count} ongelezen melding"
           other: "Chatmeldingen - %{count} ongelezen meldingen"
+    styleguide:
+      sections:
+        chat:
+          title: Chat
diff --git a/plugins/chat/config/locales/client.pl_PL.yml b/plugins/chat/config/locales/client.pl_PL.yml
index c920efb054e..ac735ee974a 100644
--- a/plugins/chat/config/locales/client.pl_PL.yml
+++ b/plugins/chat/config/locales/client.pl_PL.yml
@@ -15,6 +15,7 @@ pl_PL:
           actions:
             chat_channel_status_change: "Zmieniono status kanału czatu"
             chat_channel_delete: "Kanał czatu usunięty"
+            chat_auto_remove_membership: "Członkostwa automatycznie usuwane z kanałów"
       api:
         scopes:
           descriptions:
@@ -39,10 +40,10 @@ pl_PL:
       move_to_channel:
         title: "Przenieś wiadomości na kanał"
         instructions:
-          one: "Przenosisz <strong>%{count}</strong> wiadomość. Wybierz kanał docelowy. Na kanale <strong>%{channelTitle}</strong> zostanie utworzona wiadomość zastępcza informująca o przeniesieniu tej wiadomości."
-          few: "Przenosisz <strong>%{count}</strong> wiadomości. Wybierz kanał docelowy. Na kanale <strong>%{channelTitle}</strong> zostanie utworzona wiadomość zastępcza informująca o przeniesieniu tych wiadomości."
-          many: "Przenosisz <strong>%{count}</strong> wiadomości. Wybierz kanał docelowy. Na kanale <strong>%{channelTitle}</strong> zostanie utworzona wiadomość zastępcza informująca o przeniesieniu tych wiadomości."
-          other: "Przenosisz <strong>%{count}</strong> wiadomości. Wybierz kanał docelowy. Na kanale <strong>%{channelTitle}</strong> zostanie utworzona wiadomość zastępcza informująca o przeniesieniu tych wiadomości."
+          one: "Przenosisz <strong>%{count}</strong> wiadomość. Wybierz kanał docelowy. W kanale <strong>%{channelTitle}</strong> zostanie utworzona wiadomość zastępcza, aby wskazać, że ta wiadomość została przeniesiona. Pamiętaj, że łańcuchy odpowiedzi nie zostaną zachowane w nowym kanale, a wiadomości w starym kanale nie będą już wyświetlane jako odpowiedzi na przeniesione wiadomości."
+          few: "Przenosisz <strong>%{count}</strong> wiadomości. Wybierz kanał docelowy. W kanale <strong>%{channelTitle}</strong> zostanie utworzona wiadomość zastępcza, aby wskazać, że te wiadomości zostały przeniesione. Pamiętaj, że łańcuchy odpowiedzi nie zostaną zachowane w nowym kanale, a wiadomości w starym kanale nie będą już wyświetlane jako odpowiedzi na przeniesione wiadomości."
+          many: "Przenosisz <strong>%{count}</strong> wiadomości. Wybierz kanał docelowy. W kanale <strong>%{channelTitle}</strong> zostanie utworzona wiadomość zastępcza, aby wskazać, że te wiadomości zostały przeniesione. Pamiętaj, że łańcuchy odpowiedzi nie zostaną zachowane w nowym kanale, a wiadomości w starym kanale nie będą już wyświetlane jako odpowiedzi na przeniesione wiadomości."
+          other: "Przenosisz <strong>%{count}</strong> wiadomości. Wybierz kanał docelowy. W kanale <strong>%{channelTitle}</strong> zostanie utworzona wiadomość zastępcza, aby wskazać, że te wiadomości zostały przeniesione. Pamiętaj, że łańcuchy odpowiedzi nie zostaną zachowane w nowym kanale, a wiadomości w starym kanale nie będą już wyświetlane jako odpowiedzi na przeniesione wiadomości."
         confirm_move: "Przenieś wiadomości"
       channel_settings:
         title: "Ustawienia kanału"
@@ -73,7 +74,7 @@ pl_PL:
         instructions: "Zamknięcie kanału uniemożliwia użytkownikom niebędącym personelem wysyłanie nowych wiadomości ani edytowanie istniejących wiadomości. Czy na pewno chcesz zamknąć ten kanał?"
       channel_delete:
         title: "Usuń kanał"
-        instructions: "<p>Usuwa kanał <strong>%{name}</strong> i historię czatów. Wszystkie wiadomości i powiązane dane, takie jak reakcje i przesłane treści, zostaną trwale usunięte. Jeśli chcesz zachować historię kanału i usunąć go, możesz zamiast tego zarchiwizować kanał.</p> <p>Czy na pewno chcesz <strong>trwale usunąć</strong> kanał? Aby potwierdzić, wpisz nazwę kanału w polu poniżej.</p>"
+        instructions: "<p>Usuwa kanał <strong>%{name}</strong> i historię czatu. Wszystkie wiadomości i powiązane dane, takie jak reakcje i przesłane pliki, zostaną trwale usunięte. Jeśli chcesz zachować historię kanału i zlikwidować go, możesz zamiast tego zarchiwizować kanał.</p> <p>Czy na pewno chcesz <strong>trwale usunąć</strong> kanał? Aby potwierdzić, wpisz nazwę kanału w polu poniżej.</p>"
         confirm: "Rozumiem konsekwencje, usuń kanał"
         confirm_channel_name: "Wpisz nazwę kanału"
         process_started: "Rozpoczął się proces usuwania kanału. Ten modal zostanie wkrótce zamknięty, nigdzie nie zobaczysz już usuniętego kanału."
@@ -83,8 +84,13 @@ pl_PL:
       click_to_join: "Kliknij tutaj, aby wyświetlić dostępne kanały."
       close: "Zamknij"
       collapse: "Zwiń szufladę czatu"
+      expand: "Rozwiń szufladę czatu"
       confirm_flag: "Czy na pewno chcesz oflagować wiadomość od %{username}?"
-      deleted: "Wiadomość została usunięta. [view]"
+      deleted:
+        one: "Wiadomość została usunięta. [view]"
+        few: "%{count} wiadomości zostały usunięte. [view all]"
+        many: "%{count} wiadomości zostało usuniętych. [view all]"
+        other: "%{count} wiadomości zostało usuniętych. [view all]"
       hidden: "Wiadomość została ukryta. [view]"
       delete: "Usuń"
       edited: "edytowane"
@@ -99,6 +105,11 @@ pl_PL:
         never: "Nigdy"
         title: "Powiadomienia e-mail"
         when_away: "Tylko gdy jesteś daleko"
+      header_indicator_preference:
+        title: "Pokaż wskaźnik aktywności w nagłówku"
+        all_new: "Wszystkie nowe wiadomości"
+        dm_and_mentions: "Bezpośrednie wiadomości i wzmianki"
+        never: "Nigdy"
       enable: "Włącz czat"
       flag: "Oflaguj"
       emoji: "Wstaw emoji"
@@ -108,73 +119,75 @@ pl_PL:
       in_reply_to: "W odpowiedzi na"
       heading: "Czat"
       join: "Dołącz"
-      new_messages: "nowe wiadomości"
+      last_visit: "ostatnia wizyta"
+      summarization:
+        title: "Podsumuj wiadomości"
+        description: "Wybierz opcję poniżej, aby podsumować rozmowę wysłaną w żądanym przedziale czasowym."
+        summarize: "Podsumuj"
+        since:
+          one: "Ostatnia godzina"
+          few: "Ostatnie %{count} godziny"
+          many: "Ostatnie %{count} godzin"
+          other: "Ostatnie %{count} godzin"
       mention_warning:
         dismiss: "odrzuć"
-        cannot_see:
-          one: "%{username} nie może uzyskać dostępu do tego kanału i nie został powiadomiony."
-          few: "%{username} i %{others} nie mogą uzyskać dostępu do tego kanału i nie zostali powiadomieni."
-          many: "%{username} i %{others} nie mogą uzyskać dostępu do tego kanału i nie zostali powiadomieni."
-          other: "%{username} i %{others} nie mogą uzyskać dostępu do tego kanału i nie zostali powiadomieni."
+        cannot_see: "%{username} nie ma dostępu do tego kanału i nie został powiadomiony."
+        cannot_see_multiple:
+          one: "%{username} i %{count} inny użytkownik nie ma dostępu do tego kanału i nie został powiadomiony."
+          few: "%{username} i %{count} innych użytkowników nie ma dostępu do tego kanału i nie zostali powiadomieni."
+          many: "%{username} i %{count} innych użytkowników nie ma dostępu do tego kanału i nie zostali powiadomieni."
+          other: "%{username} i %{count} innych użytkowników nie ma dostępu do tego kanału i nie zostali powiadomieni."
         invitations_sent:
           one: "Zaproszenie wysłane"
           few: "Zaproszenia wysłane"
           many: "Zaproszenia wysłane"
           other: "Zaproszenia wysłane"
         invite: "Zaproś do kanału"
-        without_membership:
-          one: "%{username} nie dołączył do tego kanału."
-          few: "%{username} i %{others} nie dołączyli do tego kanału."
-          many: "%{username} i %{others} nie dołączyli do tego kanału."
-          other: "%{username} i %{others} nie dołączyli do tego kanału."
-        group_mentions_disabled:
-          one: "%{group_name} nie zezwala na wzmianki"
-          few: "%{group_name} i %{others} nie zezwalają na wzmianki"
-          many: "%{group_name} i %{others} nie zezwalają na wzmianki"
-          other: "%{group_name} i %{others} nie zezwalają na wzmianki"
-        too_many_members:
-          one: "%{group_name} ma zbyt wielu członków. Nikt nie został powiadomiony"
-          few: "%{group_name} i %{others} mają zbyt wielu członków. Nikt nie został powiadomiony"
-          many: "%{group_name} i %{others} mają zbyt wielu członków. Nikt nie został powiadomiony"
-          other: "%{group_name} i %{others} mają zbyt wielu członków. Nikt nie został powiadomiony"
-        warning_multiple:
-          one: "%{count} inny"
-          few: "%{count} inni"
-          many: "%{count} inni"
-          other: "%{count} inni"
+        without_membership: "%{username} nie dołączył(a) do tego kanału."
+        without_membership_multiple:
+          one: "%{username} i %{count} inny użytkownik nie dołączył do tego kanału."
+          few: "%{username} i %{count} inni użytkownicy nie dołączyli do tego kanału."
+          many: "%{username} i %{count} inni użytkownicy nie dołączyli do tego kanału."
+          other: "%{username} i %{count} inni użytkownicy nie dołączyli do tego kanału."
+        group_mentions_disabled: "%{group_name} nie zezwala na wzmianki."
+        group_mentions_disabled_multiple:
+          one: "%{group_name} i %{count} inna grupa nie zezwala na wzmianki."
+          few: "%{group_name} i %{count} inne grupy nie zezwalają na wzmianki."
+          many: "%{group_name} i %{count} inne grupy nie zezwalają na wzmianki."
+          other: "%{group_name} i %{count} inne grupy nie zezwalają na wzmianki."
+        too_many_members: "%{group_name} ma zbyt wielu członków. Nikt nie został powiadomiony."
+        too_many_members_multiple:
+          one: "%{group_name} i %{count} inna grupa ma zbyt wielu członków. Nikt nie został powiadomiony."
+          few: "%{group_name} i %{count} inne grupy mają zbyt wielu członków. Nikt nie został powiadomiony."
+          many: "%{group_name} i %{count} innych grup ma zbyt wielu członków. Nikt nie został powiadomiony."
+          other: "%{group_name} i %{count} innych grup ma zbyt wielu członków. Nikt nie został powiadomiony."
         groups:
           header:
             some: "Niektórzy użytkownicy nie zostaną powiadomieni"
             all: "Nikt nie zostanie powiadomiony"
-          unreachable:
-            one: "@%{group} nie zezwala na wzmianki"
-            few: "@%{group} i @%{group_2} nie zezwalają na wzmianki"
-            many: "@%{group} i @%{group_2} nie zezwalają na wzmianki"
-            other: "@%{group} i @%{group_2} nie zezwalają na wzmianki"
-          unreachable_multiple: "@%{group} i %{count} inni nie zezwalają na wzmianki"
-          too_many_members:
-            one: "Wzmianka @%{group} przekracza %{notification_limit} z %{limit}"
-            few: "Wzmianka zarówno @%{group} lub %{group_2} przekracza %{notification_limit} z %{limit}"
-            many: "Wzmianka zarówno @%{group} lub %{group_2} przekracza %{notification_limit} z %{limit}"
-            other: "Wzmianka zarówno @%{group} lub %{group_2} przekracza %{notification_limit} z %{limit}"
-          too_many_members_multiple: "Te %{count} grup przekracza %{notification_limit} z %{limit}"
-          users_limit:
-            one: "%{count} użytkownik"
-            few: "%{count} użytkownicy"
-            many: "%{count} użytkowników"
-            other: "%{count} użytkownicy"
-          notification_limit: "limit powiadomień"
-        too_many_mentions: "Ta wiadomość przekracza %{notification_limit} z %{limit}"
-        mentions_limit:
-          one: "%{count} wzmianka"
-          few: "%{count} wzmianki"
-          many: "%{count} wzmianek"
-          other: "%{count} wzmianek"
+          unreachable_1: "@%{group} nie zezwala na wzmianki."
+          unreachable_2: "@%{group1} i @%{group2} nie zezwalają na wzmianki."
+          unreachable_multiple:
+            one: "@%{group} i %{count} inna grupa nie zezwala na wzmianki."
+            few: "@%{group} i %{count} inne grupy nie zezwalają na wzmianki."
+            many: "@%{group} i %{count} innych grup nie zezwala na wzmianki."
+            other: "@%{group} i %{count} innych grup nie zezwala na wzmianki."
+        too_many_mentions:
+          one: "Ta wiadomość przekracza limit powiadomień wynoszący %{count} wzmiankę."
+          few: "Ta wiadomość przekracza limit powiadomień wynoszący %{count} wzmianki."
+          many: "Ta wiadomość przekracza limit powiadomień wynoszący %{count} wzmianek."
+          other: "Ta wiadomość przekracza limit powiadomień wynoszący %{count} wzmianek."
+        too_many_mentions_admin:
+          one: 'Ta wiadomość przekracza limit <a href="%{siteSettingUrl}" target="_blank">powiadomień</a> z %{count} wzmianki.'
+          few: 'Ta wiadomość przekracza limit <a href="%{siteSettingUrl}" target="_blank">powiadomień</a> z %{count} wzmianek.'
+          many: 'Ta wiadomość przekracza limit <a href="%{siteSettingUrl}" target="_blank">powiadomień</a> z %{count} wzmianek.'
+          other: 'Ta wiadomość przekracza limit <a href="%{siteSettingUrl}" target="_blank">powiadomień</a> z %{count} wzmianek.'
       aria_roles:
         header: "Nagłówek czatu"
         composer: "Edytor czatu"
         channels_list: "Lista kanałów czatu"
       no_public_channels: "Nie dołączyłeś do żadnego kanału."
+      kicked_from_channel: "Nie masz już dostępu do tego kanału."
       only_chat_push_notifications:
         title: "Wysyłaj tylko powiadomienia push czatu"
         description: "Zablokuj wysyłanie wszystkich powiadomień push niezwiązanych z czatem"
@@ -186,10 +199,16 @@ pl_PL:
       close_full_page: "Zamknij czat pełnoekranowy"
       open_message: "Otwórz wiadomość na czacie"
       placeholder_self: "Zanotuj coś"
-      placeholder_others: "Czat z %{messageRecipient}"
-      placeholder_new_message_disallowed: "Kanał ma %{status}, nie możesz teraz wysyłać nowych wiadomości."
+      placeholder_channel: "Czat w %{channelName}"
+      placeholder_thread: "Czat w wątku"
+      placeholder_users: "Czat z %{commaSeparatedNames}"
+      placeholder_new_message_disallowed:
+        archived: "Kanał jest zarchiwizowany, nie możesz teraz wysyłać nowych wiadomości."
+        closed: "Kanał jest zamknięty, nie możesz teraz wysyłać nowych wiadomości."
+        read_only: "Kanał jest tylko do odczytu, nie możesz teraz wysyłać nowych wiadomości."
       placeholder_silenced: "W tej chwili nie możesz wysyłać wiadomości."
-      placeholder_start_conversation: Rozpocznij rozmowę z %{usernames}
+      placeholder_start_conversation: "Rozpocznij rozmowę z..."
+      placeholder_start_conversation_users: "Rozpocznij rozmowę z %{commaSeparatedUsernames}"
       remove_upload: "Usuń plik"
       react: "Zareaguj z emoji"
       reply: "Odpowiedz"
@@ -205,8 +224,13 @@ pl_PL:
       restore: "Przywróć usuniętą wiadomość"
       save: "Zapisz"
       select: "Wybierz"
-      silence: "Wycisz użytkownika"
       return_to_list: "Powrót do listy kanałów"
+      return_to_threads_list: "Wróć do trwających dyskusji"
+      unread_threads_count:
+        one: "Masz %{count} nieprzeczytaną dyskusje"
+        few: "Masz %{count} nieprzeczytane dyskusje"
+        many: "Masz %{count} nieprzeczytanych dyskusji"
+        other: "Masz %{count} nieprzeczytanych dyskusji"
       scroll_to_bottom: "Przewiń na dół"
       scroll_to_new_messages: "Zobacz nowe wiadomości"
       sound:
@@ -218,6 +242,8 @@ pl_PL:
       title: "czat"
       title_capitalized: "Czat"
       upload: "Dołącz plik"
+      upload_to_channel: "Prześlij do %{title}"
+      upload_to_thread: "Prześlij do wątku"
       uploaded_files:
         one: "%{count} plik"
         few: "%{count} pliki"
@@ -263,10 +289,22 @@ pl_PL:
           about: O stronie
           members: Członkowie
           settings: Ustawienia
-      channel_edit_name_modal:
-        title: Edytuj nazwę
+      new_message_modal:
+        title: Wyślij wiadomość
+        add_user_long: <kbd>shift + click</kbd> lub <kbd>shift + enter</kbd><span>Dodaj @%{username}</span>
+        add_user_short: <span>Dodaj użytkownika</span>
+        open_channel: <span>Otwórz kanał</span>
+        default_search_placeholder: "#kanał, @ktoś lub cokolwiek"
+        default_user_search_placeholder: "@ktoś"
+        user_search_placeholder: "...dodaj więcej użytkowników"
+        disabled_user: "wyłączył czat"
+        no_items: "Brak elementu"
+      channel_edit_name_slug_modal:
+        title: Edytuj kanał
         input_placeholder: Dodaj nazwę
-        description: Nadaj swojemu kanałowi krótką, opisową nazwę
+        slug_description: Slug kanału jest używany w adresie URL zamiast nazwy kanału
+        name: Nazwa kanału
+        slug: Slug kanału (opcjonalnie)
       channel_edit_description_modal:
         title: Edytuj opis
         input_placeholder: Dodaj opis
@@ -276,9 +314,6 @@ pl_PL:
         prefix: "Do:"
         no_results: Brak wyników
         selected_user_title: "Odznacz %{username}"
-      channel_selector:
-        title: "Przejdź do kanału"
-        no_channels: "Żadne kanały nie pasują do Twojego wyszukiwania"
       channel:
         no_memberships: Ten kanał nie ma członków
         no_memberships_found: Nie znaleziono członków
@@ -288,27 +323,35 @@ pl_PL:
           many: "%{count} członków"
           other: "%{count} członków"
       create_channel:
+        threading:
+          label: "Włącz wątki"
         auto_join_users:
           public_category_warning: "%{category} to kategoria publiczna. Automatycznie dodać wszystkich ostatnio aktywnych użytkowników do tego kanału?"
-          warning_groups:
-            one: Automatycznie dodać %{members_count} użytkowników z %{group}?
-            few: Automatycznie dodać %{members_count} użytkowników z %{group} i %{group_2}?
-            many: Automatycznie dodać %{members_count} użytkowników z %{group} i %{group_2}?
-            other: Automatycznie dodać %{members_count} użytkowników z %{group} i %{group_2}?
-          warning_multiple_groups: Automatycznie dodać %{members_count} użytkowników z %{group_1} i %{count} innych?
+          warning_1_group:
+            one: "Automatycznie dodać %{count} użytkownika z %{group}?"
+            few: "Automatycznie dodać %{count} użytkowników z %{group}?"
+            many: "Automatycznie dodać %{count} użytkowników z %{group}?"
+            other: "Automatycznie dodać %{count} użytkowników z %{group}?"
+          warning_2_groups:
+            one: "Automatycznie dodać %{count} użytkownika z %{group1} i %{group2}?"
+            few: "Automatycznie dodać %{count} użytkowników z %{group1} i %{group2}?"
+            many: "Automatycznie dodać %{count} użytkowników z %{group1} i %{group2}?"
+            other: "Automatycznie dodać %{count} użytkowników z %{group1} i %{group2}?"
         choose_category:
           label: "Wybierz kategorię"
           none: "wybierz jeden..."
           default_hint: Zarządzaj dostępem, odwiedzając <a href=%{link} target="_blank">ustawienia bezpieczeństwa %{category} </a>
-          hint_groups:
-            one: Użytkownicy w %{hint} będą mieli dostęp do tego kanału zgodnie z <a href=%{link} target="_blank">ustawieniami zabezpieczeń</a>
-            few: Użytkownicy w %{hint} i %{hint_2} będą mieli dostęp do tego kanału zgodnie z <a href=%{link} target="_blank">ustawieniami zabezpieczeń</a>
-            many: Użytkownicy w %{hint} i %{hint_2} będą mieli dostęp do tego kanału zgodnie z <a href=%{link} target="_blank">ustawieniami zabezpieczeń</a>
-            other: Użytkownicy w %{hint} i %{hint_2} będą mieli dostęp do tego kanału zgodnie z <a href=%{link} target="_blank">ustawieniami zabezpieczeń</a>
-          hint_multiple_groups: Użytkownicy w %{hint_1} i %{count} innych grupach będą mieli dostęp do tego kanału zgodnie z <a href=%{link} target="_blank">ustawieniami zabezpieczeń</a>
+          hint_1_group: 'Użytkownicy w %{group} będą mieli dostęp do tego kanału zgodnie z <a href="%{settingLink}" target="_blank">ustawieniami zabezpieczeń</a>'
+          hint_2_groups: 'Użytkownicy w %{group1} i %{group2} będą mieli dostęp do tego kanału zgodnie z <a href="%{settingLink}" target="_blank">ustawieniami zabezpieczeń</a>'
+          hint_multiple_groups:
+            one: 'Użytkownicy w %{group} i %{count} innej grupie będą mieli dostęp do tego kanału zgodnie z <a href="%{settingLink}" target="_blank">ustawieniami zabezpieczeń</a>'
+            few: 'Użytkownicy w %{group} i %{count} innych grupach będą mieli dostęp do tego kanału zgodnie z <a href="%{settingLink}" target="_blank">ustawieniami zabezpieczeń</a>'
+            many: 'Użytkownicy w %{group} i %{count} innych grupach będą mieli dostęp do tego kanału zgodnie z <a href="%{settingLink}" target="_blank">ustawieniami zabezpieczeń</a>'
+            other: 'Użytkownicy w %{group} i %{count} innych grupach będą mieli dostęp do tego kanału zgodnie z <a href="%{settingLink}" target="_blank">ustawieniami zabezpieczeń</a>'
         create: "Utwórz kanał"
         description: "Opis (opcjonalnie)"
         name: "Nazwa kanału"
+        slug: "Slug kanału (opcjonalnie)"
         title: "Nowy kanał"
         type: "Typ"
         types:
@@ -318,15 +361,26 @@ pl_PL:
         type: "Wiadomość na czacie"
       reactions:
         only_you: "Zareagowałeś z :%{emoji}:"
-        and_others: "Ty, %{usernames} zareagowaliście z :%{emoji}:"
-        only_others: "%{usernames} zareagowali z :%{emoji}:"
-        others_and_more: "%{usernames} i %{more} inni reagowali z :%{emoji}:"
-        you_others_and_more: "Ty, %{usernames} i %{more} inni zareagowaliście z :%{emoji}:"
+        you_and_single_user: "Ty i %{username} zareagowaliście za pomocą :%{emoji}:"
+        you_and_multiple_users: "Ty, %{commaSeparatedUsernames} i %{username} zareagowaliście za pomocą :%{emoji}:"
+        you_multiple_users_and_more:
+          one: "Ty, %{commaSeparatedUsernames} i %{count} inny zareagowaliście za pomocą :%{emoji}:"
+          few: "Ty, %{commaSeparatedUsernames} i %{count} inni zareagowaliście za pomocą :%{emoji}:"
+          many: "Ty, %{commaSeparatedUsernames} i %{count} inni zareagowaliście za pomocą :%{emoji}:"
+          other: "Ty, %{commaSeparatedUsernames} i %{count} inni zareagowaliście za pomocą :%{emoji}:"
+        single_user: "%{username} zareagował za pomocą :%{emoji}:"
+        multiple_users: "%{commaSeparatedUsernames} i %{username} zareagowali za pomocą :%{emoji}:"
+        multiple_users_and_more:
+          one: "%{commaSeparatedUsernames} i %{count} inni zareagowali za pomocą :%{emoji}:"
+          few: "%{commaSeparatedUsernames} i %{count} inni zareagowali za pomocą :%{emoji}:"
+          many: "%{commaSeparatedUsernames} i %{count} inni zareagowali za pomocą :%{emoji}:"
+          other: "%{commaSeparatedUsernames} i %{count} inni zareagowali za pomocą :%{emoji}:"
       composer:
         toggle_toolbar: "Przełącz pasek narzędzi"
         italic_text: "wyróżniony tekst"
         bold_text: "pogrubiony tekst"
         code_text: "kod"
+        send: "Wyślij"
       quote:
         original_channel: 'Oryginalnie wysłane w <a href="%{channelLink}">%{channel}</a>'
         copy_success: "Cytat z czatu skopiowany do schowka"
@@ -337,15 +391,19 @@ pl_PL:
       settings:
         channel_wide_mentions_label: "Zezwalaj na wzmianki @all i @here"
         channel_wide_mentions_description: "Zezwalaj użytkownikom na powiadamianie wszystkich członków #%{channel} za pomocą @all lub tylko tych, którzy są aktywni w danym momencie za pomocą @here"
+        channel_threading_label: "Wątki"
+        channel_threading_description: "Gdy wątki są włączone, odpowiedzi na wiadomości czatu utworzą osobną rozmowę, która będzie istnieć obok głównego kanału."
         auto_join_users_label: "Automatycznie dodawaj użytkowników"
-        auto_join_users_info: "Sprawdzaj co godzinę, którzy użytkownicy byli aktywni w ciągu ostatnich 3 miesięcy i jeśli mają dostęp do kategorii %{category} , dodaj ich do tego kanału."
-        enable_auto_join_users: "Automatycznie dodawaj wszystkich ostatnio aktywnych użytkowników"
+        auto_join_users_info: "Sprawdzaj co godzinę, którzy użytkownicy byli aktywni w ciągu ostatnich 3 miesięcy. Dodaj ich do tego kanału, jeśli mają dostęp do kategorii %{category}."
+        auto_join_users_info_no_category: "Sprawdzaj co godzinę, którzy użytkownicy byli aktywni w ciągu ostatnich 3 miesięcy. Dodaj ich do tego kanału, jeśli mają dostęp do wybranej kategorii."
         auto_join_users_warning: "Każdy użytkownik, który nie jest członkiem tego kanału i ma dostęp do kategorii %{category} , dołączy do niego. Czy jesteś pewien?"
         desktop_notification_level: "Powiadomienia na pulpicie"
         follow: "Dołącz"
         followed: "Dołączył"
         mobile_notification_level: "Mobilne powiadomienia push"
         mute: "Wycisz kanał"
+        threading_enabled: "Włączona"
+        threading_disabled: "Wyłączone"
         muted_on: "Wł"
         muted_off: "Wył"
         notifications: "Powiadomienia"
@@ -354,9 +412,13 @@ pl_PL:
         saved: "Zapisano"
         unfollow: "Opuść"
         admin_title: "Administratorzy"
-        retention_info: "Historia czatu będzie zapisywana przez %{days} dni."
       admin:
         title: "Czat"
+        export_messages:
+          title: "Eksportuj wiadomości czatu"
+          description: "Eksport jest obecnie ograniczony do 10 000 najnowszych wiadomości z ostatnich 6 miesięcy."
+          create_export: "Utwórz eksport"
+          export_has_started: "Eksport rozpoczął się. Otrzymasz wiadomość prywatną, gdy będzie gotowy."
       direct_messages:
         title: "Czat osobisty"
         new: "Utwórz osobisty czat"
@@ -427,8 +489,18 @@ pl_PL:
           many: "%{commaSeparatedUsernames} i %{count} inni piszą"
           other: "%{commaSeparatedUsernames} i %{count} innych piszą"
       retention_reminders:
-        public: "Historia kanału jest przechowywana przez %{days} dni."
-        dm: "Historia osobistego czatu jest przechowywana przez %{days} dni."
+        public_none: "Historia kanału jest przechowywana przez czas nieokreślony."
+        public:
+          one: "Historia kanału jest przechowywana przez %{count} dzień."
+          few: "Historia kanału jest przechowywana przez %{count} dni."
+          many: "Historia kanału jest przechowywana przez %{count} dni."
+          other: "Historia kanału jest przechowywana przez %{count} dni."
+        dm_none: "Osobista historia czatu jest przechowywana przez czas nieokreślony."
+        dm:
+          one: "Osobista historia czatu jest zachowywana przez %{count} dzień."
+          few: "Osobista historia czatu jest zachowywana przez %{count} dni."
+          many: "Osobista historia czatu jest zachowywana przez %{count} dni."
+          other: "Osobista historia czatu jest zachowywana przez %{count} dni."
       flags:
         off_topic: "Ta wiadomość nie jest związana z bieżącą dyskusją określoną w tytule kanału i prawdopodobnie powinna zostać przeniesiona w inne miejsce."
         inappropriate: "Ta wiadomość zawiera treści, które rozsądna osoba mogłaby uznać za obraźliwe, krzywdzące lub stanowiące naruszenie <a href=\"%{basePath}/guidelines\">naszych wytycznych dotyczących społeczności</a>."
@@ -450,6 +522,37 @@ pl_PL:
         symbols: "Symbolika"
         search_placeholder: "Szukaj według nazwy emoji i aliasu..."
         no_results: "Brak wyników"
+      thread:
+        title: "Tytuł"
+        view_thread: Zobacz wątek
+        default_title: "Wątek"
+        replies:
+          one: "%{count} odpowiedź"
+          few: "%{count} odpowiedzi"
+          many: "%{count} odpowiedzi"
+          other: "%{count} odpowiedzi"
+        label: Wątek
+        close: "Zamknij wątek"
+        original_message:
+          started_by: "Rozpoczęty przez"
+        settings: "Ustawienia"
+        last_reply: "ostatnia odpowiedź"
+        notifications:
+          regular:
+            title: "Normalny"
+            description: "Otrzymasz powiadomienie, jeśli ktoś wspomni Twoją @nazwę w tym wątku."
+          tracking:
+            title: "Śledzona"
+            description: "Liczba nowych odpowiedzi w tym wątku zostanie wyświetlona na liście wątków i na kanale. Otrzymasz powiadomienie, jeśli ktoś wspomni Twoją @nazwę w tym wątku."
+        participants_other_count:
+          one: "+%{count}"
+          few: "+%{count}"
+          many: "+%{count}"
+          other: "+%{count}"
+      threads:
+        open: "Otwórz wątek"
+        list: "Trwające dyskusje"
+        none: "Nie uczestniczysz w żadnych wątkach na tym kanale."
       draft_channel_screen:
         header: "Nowa wiadomość"
         cancel: "Anuluj"
@@ -494,9 +597,8 @@ pl_PL:
       transcript:
         view: "Zobacz transkrypcję poprzednich wiadomości"
       types:
-        reviewable_chat_message:
-          title: "Oznaczona wiadomość czatu"
-          flagged_by: "Oflagowany przez"
+        chat_reviewable_message:
+          title: "Oflagowana wiadomość na czacie"
     keyboard_shortcuts_help:
       chat:
         title: "Czat"
@@ -509,6 +611,7 @@ pl_PL:
           composer_code: "%{shortcut} Kod (tylko kompozytor)"
           drawer_open: "%{shortcut} Otwórz szufladę czatu"
           drawer_close: "%{shortcut} Zamknij szufladę czatu"
+          mark_all_channels_read: "%{shortcut} Zaznacz wszystkie kanały jako przeczytane"
     topic_statuses:
       chat:
         help: "Czat jest włączony dla tego tematu"
@@ -529,3 +632,7 @@ pl_PL:
           few: "Powiadomienia czatu — %{count} nieprzeczytane powiadomienia"
           many: "Powiadomienia czatu — %{count} nieprzeczytanych powiadomień"
           other: "Powiadomienia czatu — %{count} nieprzeczytanych powiadomień"
+    styleguide:
+      sections:
+        chat:
+          title: Czat
diff --git a/plugins/chat/config/locales/client.pt.yml b/plugins/chat/config/locales/client.pt.yml
index f1a94c7b36e..809506a5304 100644
--- a/plugins/chat/config/locales/client.pt.yml
+++ b/plugins/chat/config/locales/client.pt.yml
@@ -55,7 +55,6 @@ pt:
       close: "Fechar"
       collapse: "Colapsar gaveta de Chat"
       confirm_flag: "Tem certeza de que deseja sinalizar a mensagem de %{username}?"
-      deleted: "Uma mensagem foi apagada. [view]"
       hidden: "Uma mensagem foi ocultada. [view]"
       delete: "Eliminar"
       edited: "editado"
@@ -66,14 +65,15 @@ pt:
         direct_message: "Você também pode iniciar um Chat pessoal com um ou mais utilizadores."
       email_frequency:
         never: "Nunca"
+      header_indicator_preference:
+        never: "Nunca"
       flag: "Denunciar"
       join: "Entrar"
+      last_visit: "última visita"
+      summarization:
+        summarize: "Resumir"
       mention_warning:
         dismiss: "marcar Visto"
-        groups:
-          users_limit:
-            one: "%{count} usuário"
-            other: "%{count} usuários"
       only_chat_push_notifications:
         title: "Enviar notificações push apenas para chat"
       reply: "Responder"
@@ -89,7 +89,6 @@ pt:
       restore: "Restaurar mensagem apagada"
       save: "Guardar"
       select: "Selecionar"
-      silence: "Silenciar utilizador"
       return_to_list: "Voltar à lista de canais"
       scroll_to_bottom: "Rolar até o final"
       scroll_to_new_messages: "Ver novas mensagens"
@@ -122,14 +121,16 @@ pt:
           about: Sobre
           members: Membros
           settings: Configurações
-      channel_edit_name_modal:
-        title: Editar nome
+      new_message_modal:
+        no_items: "Sem itens"
+      channel_edit_name_slug_modal:
         input_placeholder: Adicionar um nome
-        description: Dê um breve nome descritivo ao seu canal
+        slug: Slug do canal (opcional)
       direct_message_creator:
         title: Nova Mensagem
         prefix: "Para:"
       create_channel:
+        slug: "Slug do canal (opcional)"
         title: "Novo canal"
         type: "Tipo"
         types:
@@ -138,11 +139,16 @@ pt:
       composer:
         italic_text: "texto em itálico"
         bold_text: "texto em negrito"
+        send: "Enviar"
       notification_levels:
         never: "Nunca"
       settings:
+        auto_join_users_info: "Verificar de hora em hora quais os utilizadores que estiveram activos nos últimos 3 meses. Adicione-os a este canal se tiverem acesso à categoria %{category} ."
+        auto_join_users_info_no_category: "Verificar de hora em hora quais os utilizadores que estiveram activos nos últimos 3 meses. Adicione-os a este canal se tiverem acesso à categoria seleccionada."
         follow: "Entrar"
         followed: "Juntou-se"
+        threading_enabled: "Ativado"
+        threading_disabled: "Desativado"
         notifications: "Notificações"
         preview: "Pré-visualização"
         save: "Guardar"
@@ -174,6 +180,21 @@ pt:
         activities: "Atividades"
         flags: "Sinalizações"
         symbols: "Símbolos"
+      thread:
+        title: "Título"
+        replies:
+          one: "%{count} resposta"
+          other: "%{count} respostas"
+        settings: "Configurações"
+        last_reply: "última resposta"
+        notifications:
+          regular:
+            title: "Normal"
+          tracking:
+            title: "A Seguir"
+        participants_other_count:
+          one: "+%{count}"
+          other: "+%{count}"
       draft_channel_screen:
         header: "Nova Mensagem"
         cancel: "Cancelar"
@@ -185,7 +206,3 @@ pt:
           fields:
             message:
               label: Mensagem
-    review:
-      types:
-        reviewable_chat_message:
-          flagged_by: "Sinalizado por"
diff --git a/plugins/chat/config/locales/client.pt_BR.yml b/plugins/chat/config/locales/client.pt_BR.yml
index 80851cce379..e1605f44375 100644
--- a/plugins/chat/config/locales/client.pt_BR.yml
+++ b/plugins/chat/config/locales/client.pt_BR.yml
@@ -15,6 +15,7 @@ pt_BR:
           actions:
             chat_channel_status_change: "Status do canal de chat alterado"
             chat_channel_delete: "Canal de chat excluído"
+            chat_auto_remove_membership: "Assinaturas removidas automaticamente dos canais"
       api:
         scopes:
           descriptions:
@@ -39,8 +40,8 @@ pt_BR:
       move_to_channel:
         title: "Mover mensagens para o canal"
         instructions:
-          one: "Você está movendo <strong>%{count}</strong> mensagem. Selecione um canal de destino. Uma mensagem de espaço reservado será criada no canal <strong>%{channelTitle}</strong> para indicar que esta mensagem foi movida."
-          other: "Você está movendo <strong>%{count}</strong> mensagens. Selecione um canal de destino. Uma mensagem de espaço reservado será criada no canal <strong>%{channelTitle}</strong> para indicar que essas mensagens foram movidas."
+          one: "Você está movendo <strong>%{count}</strong> mensagem. Selecione o canal de destino. Uma mensagem de placeholder será criada no canal <strong>%{channelTitle}</strong> para indicar que esta mensagem foi movida. Note que as respostas não serão movidas junto para o novo canal, e mensagens no antigo canal não serão mais exibidas como respostas às mensagens movidas."
+          other: "Você está movendo <strong>%{count}</strong> mensagens. Selecione o canal de destino. Uma mensagem de placeholder será criada no canal <strong>%{channelTitle}</strong> para indicar que estas mensagens foram movidas. Note que as respostas não serão movidas junto para o novo canal, e mensagens no antigo canal não serão mais exibidas como respostas às mensagens movidas."
         confirm_move: "Mover mensagens"
       channel_settings:
         title: "Definições do canal"
@@ -71,7 +72,7 @@ pt_BR:
         instructions: "Fechar o canal impede que usuários(as) não funcionários(as) enviem novas mensagens ou editem mensagens existentes. Tem certeza de que deseja fechar este canal?"
       channel_delete:
         title: "Excluir canal"
-        instructions: "<p>Exclui o canal <strong>%{name}</strong> e o histórico do chat. Todas as mensagens e dados relacionados, como reações e envios, serão excluídos permanentemente. Se você quiser preservar o histórico do canal e desativá-lo, talvez seja melhor arquivar o canal.</p> <p>Tem certeza de que deseja <strong>excluir permanentemente</strong> o canal? Para confirmar, digite o nome do canal na caixa abaixo.</p>"
+        instructions: "<p>Exclui o canal e histórico de chat de <strong>%{name}</strong> . Todas as mensagens e dados relacionados, como as reações e uploads, serão permanentemente excluídos. Se você deseja preservar o histórico do canal e apenas desativá-lo, talvez seja melhor arquivá-lo</p><p>Tem certeza que quer <strong>excluir permanentemente</strong> o canal? Para confirmar, escreva o nome do canal no campo abaixo.</p>"
         confirm: "Eu entendo as consequências, exclua o canal"
         confirm_channel_name: "Digite o nome do canal"
         process_started: "O processo para excluir o canal foi iniciado. Este modal será fechado em breve, você não verá mais o canal excluído em lugar algum."
@@ -81,8 +82,8 @@ pt_BR:
       click_to_join: "Clique aqui para visualizar os canais disponíveis."
       close: "Fechar"
       collapse: "Recolher gaveta de chat"
+      expand: "Expandir Chat"
       confirm_flag: "Tem certeza de que deseja sinalizar a mensagem de %{username}?"
-      deleted: "Uma mensagem foi excluída. [view]"
       hidden: "Uma mensagem foi ocultada. [view]"
       delete: "Excluir"
       edited: "editou"
@@ -97,6 +98,11 @@ pt_BR:
         never: "Nunca"
         title: "Notificações por e-mail"
         when_away: "Só quando estiver ausente"
+      header_indicator_preference:
+        title: "Mostrar indicador de atividade no cabeçalho"
+        all_new: "Todas as Novas Mensagens"
+        dm_and_mentions: "Mensagens Diretas e Menções"
+        never: "Nunca"
       enable: "Ativar chat"
       flag: "Sinalizar"
       emoji: "Inserir emoji"
@@ -106,53 +112,51 @@ pt_BR:
       in_reply_to: "Em resposta a"
       heading: "Chat"
       join: "Participar"
-      new_messages: "novas mensagens"
+      last_visit: "último acesso"
+      summarization:
+        title: "Resumir mensagens"
+        description: "Selecione uma opção abaixo para resumir a conversa enviada durante o período desejado."
+        summarize: "Resumir"
+        since:
+          one: "Última hora"
+          other: "Últimas %{count} horas"
       mention_warning:
         dismiss: "ignorar"
-        cannot_see:
-          one: "%{username} não pode acessar este canal e não recebeu notificação."
-          other: "%{username} e %{others} não podem acessar este canal e não receberam notificação."
+        cannot_see: "%{username} não pode acessar este canal e não foi notificado."
+        cannot_see_multiple:
+          one: "%{username} e %{count} outro usuário não podem acessar este canal e não foram notificados"
+          other: "%{username} e %{count} outros usuários não podem acessar este canal e não foram notificados"
         invitations_sent:
           one: "Convite enviado"
           other: "Convites enviados"
         invite: "convidar para canal"
-        without_membership:
-          one: "%{username} não entrou neste canal."
-          other: "%{username} e %{others} não entraram neste canal."
-        group_mentions_disabled:
-          one: "%{group_name} não permite menções"
-          other: "%{group_name} e %{others} não permitem menções"
-        too_many_members:
-          one: "%{group_name} tem membros demais. Ninguém foi notificado"
-          other: "%{group_name} e %{others} têm membros demais. Ninguém foi notificado"
-        warning_multiple:
-          one: "mais %{count}"
-          other: "mais %{count}"
+        without_membership: "%{username} não entrou neste canal."
+        without_membership_multiple:
+          one: "%{username} e %{count} outro usuário não se juntaram a este canal"
+          other: "%{username} e %{count} outros usuários não se juntaram a este canal"
+        group_mentions_disabled: "%{group_name} não permite menções."
+        group_mentions_disabled_multiple:
+          one: "%{group_name} e %{count} outro grupo não permitem menções"
+          other: "%{group_name} e %{count} outros grupos não permitem menções"
+        too_many_members: "%{group_name} tem membros demais. Ninguém foi notificado."
+        too_many_members_multiple:
+          one: "%{group_name} e %{count} outro grupo têm membros demais. Ninguém foi notificado."
+          other: "%{group_name} e %{count} outros grupos têm membros demais. Ninguém foi notificado."
         groups:
           header:
             some: "Alguns usuários não serão notificados"
             all: "Ninguém será notificado"
-          unreachable:
-            one: "@%{group} não permite menções"
-            other: "@%{group} e @%{group_2} não permitem menções"
-          unreachable_multiple: "@%{group} e outros %{count} não permitem menções"
-          too_many_members:
-            one: "Mencionar @%{group} excede o %{notification_limit} de %{limit}"
-            other: "Mencionar ambos @%{group} ou @%{group_2} excede o %{notification_limit} de %{limit}"
-          too_many_members_multiple: "Esses %{count} grupos excedem o %{notification_limit} de %{limit}"
-          users_limit:
-            one: "%{count} usuário"
-            other: "%{count} usuários"
-          notification_limit: "limite de notificações"
-        too_many_mentions: "Esta mensagem excede o %{notification_limit} de %{limit}"
-        mentions_limit:
-          one: "%{count} menção"
-          other: "%{count} menções"
+          unreachable_1: "@%{group} não permite menções."
+          unreachable_2: "@%{group1} e @%{group2} não permitem menções"
+          unreachable_multiple:
+            one: "@%{group} e %{count} outro grupo não permitem menções"
+            other: "@%{group} e %{count} outros grupos não permitem menções"
       aria_roles:
         header: "Cabeçalho do chat"
         composer: "Compositor de chat"
         channels_list: "Lista de canais de chat"
       no_public_channels: "Você não entrou em nenhum canal."
+      kicked_from_channel: "Você não pode mais acessar este canal."
       only_chat_push_notifications:
         title: "Enviar apenas notificações por push"
         description: "Bloquear envio de todas as notificações por push não relacionadas a chat"
@@ -164,10 +168,16 @@ pt_BR:
       close_full_page: "Fechar chat em tela cheia"
       open_message: "Abrir mensagem no chat"
       placeholder_self: "Anotar algo"
-      placeholder_others: "Conversar com %{messageRecipient}"
-      placeholder_new_message_disallowed: "O canal é %{status}, você não pode enviar novas mensagens agora."
+      placeholder_channel: "Converse em %{channelName}"
+      placeholder_thread: "Converse no tópico"
+      placeholder_users: "Conversar com %{commaSeparatedNames}"
+      placeholder_new_message_disallowed:
+        archived: "Canal arquivado, não é possível enviar novas mensagens no momento."
+        closed: "Canal fechado, não é possível enviar novas mensagens no momento."
+        read_only: "Canal somente para leitura, não é possível enviar novas mensagens no momento."
       placeholder_silenced: "Você não pode enviar mensagens neste momento."
-      placeholder_start_conversation: Iniciar uma conversa com %{usernames}
+      placeholder_start_conversation: "Iniciar uma conversa com ..."
+      placeholder_start_conversation_users: "Iniciar uma conversa com %{commaSeparatedUsernames}"
       remove_upload: "Remover arquivo"
       react: "Reagir com emoji"
       reply: "Responder"
@@ -183,8 +193,8 @@ pt_BR:
       restore: "Restaurar mensagem excluída"
       save: "Salvar"
       select: "Selecionar"
-      silence: "Silenciar usuário(a)"
       return_to_list: "Retornar para lista de canais"
+      return_to_threads_list: "Retornar às discussões em andamento"
       scroll_to_bottom: "Rolar para a parte inferior"
       scroll_to_new_messages: "Ver novas mensagens"
       sound:
@@ -239,10 +249,10 @@ pt_BR:
           about: Sobre
           members: Membros
           settings: Definições
-      channel_edit_name_modal:
-        title: Editar Nome
-        input_placeholder: Adicionar um Nome
-        description: Dê um nome breve e descritivo ao seu canal
+      new_message_modal:
+        no_items: "Nenhum item"
+      channel_edit_name_slug_modal:
+        name: Nome do canal
       channel_edit_description_modal:
         title: Editar descrição
         input_placeholder: Adicione uma descrição
@@ -252,9 +262,6 @@ pt_BR:
         prefix: "Para:"
         no_results: Nenhum resultado
         selected_user_title: "Desmarcar %{username}"
-      channel_selector:
-        title: "Pular para o canal"
-        no_channels: "Nenhum canal corresponde à sua pesquisa"
       channel:
         no_memberships: Este canal não tem membros
         no_memberships_found: Nenhum membro encontrado
@@ -264,18 +271,10 @@ pt_BR:
       create_channel:
         auto_join_users:
           public_category_warning: "%{category} é uma categoria pública. Deseja adicionar automaticamente todos os(as) usuários(as) recentemente ativos(as) a este canal?"
-          warning_groups:
-            one: Adicionar automaticamente %{members_count} usuários(as) de %{group}?
-            other: Adicionar automaticamente %{members_count} usuários(as) de %{group} e %{group_2}?
-          warning_multiple_groups: Adicionar automaticamente %{members_count} usuários(as) de %{group_1} e outros %{count}?
         choose_category:
           label: "Escolha uma categoria"
           none: "selecionar um..."
           default_hint: Gerencie o acesso ao acessar as <a href=%{link} target="_blank">%{category} configurações de segurança</a>
-          hint_groups:
-            one: Os(as) usuários(as) em %{hint} terão acesso a este canal de acordo com as <a href=%{link} target="_blank">configurações de segurança</a>
-            other: Os(as) usuários(as) em %{hint} e %{hint_2} terão acesso a este canal de acordo com as <a href=%{link} target="_blank">configurações de segurança</a>
-          hint_multiple_groups: Os(as) usuários(as) em %{hint_1} e %{count} terão acesso a este canal de acordo com as <a href=%{link} target="_blank">configurações de segurança</a>
         create: "Criar canal"
         description: "Descrição (opcional)"
         name: "Nome do canal"
@@ -288,15 +287,13 @@ pt_BR:
         type: "Mensagem de chat"
       reactions:
         only_you: "Você reagiu com :%{emoji}:"
-        and_others: "Você, %{usernames} reagiram com :%{emoji}:"
-        only_others: "%{usernames} reagiu com :%{emoji}:"
-        others_and_more: "%{usernames} e mais %{more} reagiram com :%{emoji}:"
-        you_others_and_more: "Você, %{usernames} e mais %{more} reagiram com :%{emoji}:"
+        single_user: "%{username} reagiu com :%{emoji}:"
       composer:
         toggle_toolbar: "Ativar/desativar barra de ferramentas"
         italic_text: "texto enfatizado"
         bold_text: "texto forte"
         code_text: "texto do código"
+        send: "Enviar"
       quote:
         original_channel: 'Originalmente enviado em <a href="%{channelLink}">%{channel}</a>'
         copy_success: "Citação do chat copiada para área de transferência"
@@ -307,15 +304,16 @@ pt_BR:
       settings:
         channel_wide_mentions_label: "Permitir menções @all e @here"
         channel_wide_mentions_description: "Permitir que os usuários notifiquem todos os membros de #%{channel} com @all ou apenas aqueles que estão ativos no momento com @here"
+        channel_threading_label: "Discussões"
         auto_join_users_label: "Adicionar usuários(as) automaticamente"
-        auto_join_users_info: "Verifique a cada hora quais usuários(as) estiveram ativos(as) nos últimos três meses e, se tiverem acesso à categria %{category}, adicione a este canal."
-        enable_auto_join_users: "Adicionar automaticamente todos os usuários ativos recentemente"
         auto_join_users_warning: "Todos(as) os(as) usuários(as) que não são membros deste canal e têm acesso à categoria %{category} participarão. Tem certeza?"
         desktop_notification_level: "Notificações do desktop"
         follow: "Participar"
         followed: "Entrou"
         mobile_notification_level: "Notificações por push em dispositivos móveis"
         mute: "Silenciar canal"
+        threading_enabled: "Ativado"
+        threading_disabled: "Desativado(a)"
         muted_on: "Ligado"
         muted_off: "Desligado"
         notifications: "Notificações"
@@ -324,9 +322,10 @@ pt_BR:
         saved: "Salvou"
         unfollow: "Sair"
         admin_title: "Administrador(a)"
-        retention_info: "O histórico do canal será salvo por %{days} dias."
       admin:
         title: "Chat"
+        export_messages:
+          title: "Exportar mensagens do chat"
       direct_messages:
         title: "Chat pessoal"
         new: "Criar um chat pessoal"
@@ -389,9 +388,6 @@ pt_BR:
         many_users:
           one: "%{commaSeparatedUsernames} e mais %{count} estão digitando"
           other: "%{commaSeparatedUsernames} e mais %{count} estão digitando"
-      retention_reminders:
-        public: "Histórico do canal é mantido por %{days} dias."
-        dm: "Histórico de conversas pessoais é mantido por %{days} dias."
       flags:
         off_topic: "Esta mensagem não é relevante para a discussão atual, conforme definido pelo título do canal, e provavelmente deve ser movida para outro lugar."
         inappropriate: "Esta mensagem contém conteúdo que uma pessoa razoável consideraria ofensivo, abusivo ou uma violação de <a href=\"%{basePath}/guidelines\">nossas diretrizes da comunidade</a>."
@@ -413,6 +409,27 @@ pt_BR:
         symbols: "Símbolos"
         search_placeholder: "Pesquisar por nome de emoji e codinomes..."
         no_results: "Nenhum resultado"
+      thread:
+        title: "Título"
+        default_title: "Tópico"
+        replies:
+          one: "%{count} resposta"
+          other: "%{count} respostas"
+        label: Tópico
+        original_message:
+          started_by: "Iniciado por"
+        settings: "Definições"
+        last_reply: "última resposta"
+        notifications:
+          regular:
+            title: "Normal"
+          tracking:
+            title: "Monitorando"
+        participants_other_count:
+          one: "+%{count}"
+          other: "+%{count}"
+      threads:
+        open: "Tópico Aberto"
       draft_channel_screen:
         header: "Novas mensagens"
         cancel: "Cancelar"
@@ -457,9 +474,8 @@ pt_BR:
       transcript:
         view: "Ver transcrição de mensagens anteriores"
       types:
-        reviewable_chat_message:
+        chat_reviewable_message:
           title: "Mensagem de chat sinalizada"
-          flagged_by: "Sinalizada por"
     keyboard_shortcuts_help:
       chat:
         title: "Chat"
@@ -472,6 +488,7 @@ pt_BR:
           composer_code: "%{shortcut} Código (somente compositor)"
           drawer_open: "%{shortcut} Abrir a gaveta do chat"
           drawer_close: "%{shortcut} Fechar a gaveta do chat"
+          mark_all_channels_read: "%{shortcut} Marcar todos os canais como lidos"
     topic_statuses:
       chat:
         help: "O chat está ativado para este tópico"
@@ -490,3 +507,7 @@ pt_BR:
         chat_notifications_with_unread:
           one: "Notificações do chat - %{count} notificação não lida"
           other: "Notificações do chat - %{count} notificações não lidas"
+    styleguide:
+      sections:
+        chat:
+          title: Chat
diff --git a/plugins/chat/config/locales/client.ro.yml b/plugins/chat/config/locales/client.ro.yml
index 8de377d70c6..6c5d2e91d3e 100644
--- a/plugins/chat/config/locales/client.ro.yml
+++ b/plugins/chat/config/locales/client.ro.yml
@@ -6,6 +6,11 @@
 
 ro:
   js:
+    admin:
+      logs:
+        staff_actions:
+          actions:
+            chat_auto_remove_membership: "Membrii sunt eliminați automat din canale"
     chat:
       create: "Creează"
       cancel: "Anulare"
@@ -14,21 +19,33 @@ ro:
         add: "Adaugă"
         join: "Alătură-te"
         leave: "Părăsește"
+      channel_delete:
+        instructions: "<p>Șterge canalul <strong>%{name}</strong> și istoricul de chat. Toate mesajele și datele asociate, cum ar fi reacțiile și încărcările, vor fi șterse permanent. Dacă doriți să păstrați istoricul canalului și să-l decomisionați, s-ar putea să doriți să arhivați canalul în schimb.</p> <p>Sunteți sigur că doriți să ștergeți <strong>permanent</strong> canalul? Pentru a confirma, tastați numele canalului în caseta de mai jos.</p>"
       close: "Închide sondajul"
+      expand: "Extinde sertarul de chat"
       delete: "Șterge"
       muted: "silențios"
       joined: "înscris"
       email_frequency:
         never: "Niciodată"
+      header_indicator_preference:
+        title: "Afișați indicatorul de activitate în antet"
+        all_new: "Toate mesajele noi"
+        dm_and_mentions: "Mesaje directe și mențiuni"
+        never: "Niciodată"
       flag: "Marchează cu marcaj de avertizare"
       join: "Alătură-te"
+      last_visit: "ultima vizită"
+      summarization:
+        title: "Rezumați mesajele"
+        description: "Selectați o opțiune de mai jos pentru a rezuma conversația trimisă în intervalul de timp dorit."
+        summarize: "Rezumat"
       mention_warning:
         dismiss: "renunță"
-        groups:
-          users_limit:
-            one: "%{count} utilizator"
-            few: "%{count} utilizatori"
-            other: "%{count} utilizatori"
+        cannot_see: "%{username} nu poate accesa acest canal și nu a fost notificat."
+        without_membership: "%{username} nu s-a alăturat acestui canal."
+        group_mentions_disabled: "%{group_name} nu permite mențiuni."
+        too_many_members: "%{group_name} are prea mulți membri. Nimeni nu a fost anunțat."
       reply: "Răspunde"
       edit: "Modifică"
       rebake_message: "Reconstruieşte HTML"
@@ -69,11 +86,13 @@ ro:
       composer:
         italic_text: "text italic"
         bold_text: "text aldin"
+        send: "Trimite"
       notification_levels:
         never: "Niciodată"
       settings:
         follow: "Alătură-te"
         followed: "Înscris"
+        threading_enabled: "Activat"
         notifications: "Notificări"
         preview: "Previzualizează"
         save: "Salvare"
@@ -101,6 +120,19 @@ ro:
       emoji_picker:
         objects: "Obiecte"
         flags: "Marcaje de avertizare"
+      thread:
+        title: "Titlu"
+        replies:
+          one: "%{count} răspuns"
+          few: "%{count} răspunsuri"
+          other: "%{count} răspunsuri"
+        settings: "Opțiuni"
+        last_reply: "Ultimul răspuns"
+        notifications:
+          regular:
+            title: "Normal"
+          tracking:
+            title: "Urmărire"
       draft_channel_screen:
         header: "Mesaj nou"
         cancel: "Anulare"
@@ -112,7 +144,3 @@ ro:
           fields:
             message:
               label: Mesaj
-    review:
-      types:
-        reviewable_chat_message:
-          flagged_by: "Semnalat de"
diff --git a/plugins/chat/config/locales/client.ru.yml b/plugins/chat/config/locales/client.ru.yml
index 11390e67359..6d7039ae2c9 100644
--- a/plugins/chat/config/locales/client.ru.yml
+++ b/plugins/chat/config/locales/client.ru.yml
@@ -38,11 +38,6 @@ ru:
       browse_all_channels: "Просмотреть все каналы"
       move_to_channel:
         title: "Переместить сообщения в канал"
-        instructions:
-          one: "Вы перемещаете <strong>%{count}</strong> сообщение. Выберите целевой канал. В канале <strong>%{channelTitle}</strong> будет создано сообщение, указывающее, что это сообщение было перемещено."
-          few: "Вы перемещаете <strong>%{count}</strong> сообщения. Выберите целевой канал. В канале <strong>%{channelTitle}</strong> будет создано сообщение, указывающее, что эти сообщения были перемещены."
-          many: "Вы перемещаете <strong>%{count}</strong> сообщений. Выберите целевой канал. В канале <strong>%{channelTitle}</strong> будет создано сообщение, указывающее, что эти сообщения были перемещены."
-          other: "Вы перемещаете <strong>%{count}</strong> сообщений. Выберите целевой канал. В канале <strong>%{channelTitle}</strong> будет создано сообщение, указывающее, что эти сообщения были перемещены."
         confirm_move: "Переместить сообщения"
       channel_settings:
         title: "Настройки канала"
@@ -73,7 +68,6 @@ ru:
         instructions: "Закрытие канала; запрет пользователям, не являющихся сотрудниками, отправлять новые или редактировать существующие сообщения. Действительно закрыть этот канал?"
       channel_delete:
         title: "Удалить канал"
-        instructions: "<p>Удаление канала <strong>%{name}</strong> и истории чата. Все сообщения и связанные с ними данные, такие как эмодзи и загрузки, будут безвозвратно удалены. Если вы не хотите использовать канал, при этом сохранив его историю, вы можете его заархивировать.</p> <p>Действительно <strong>навсегда удалить</strong> канал? Для подтверждения введите название канала в расположенное ниже поле.</p>"
         confirm: "Я понимаю последствия, удалить канал"
         confirm_channel_name: "Введите название канала"
         process_started: "Процесс удаления канала запущен. Это окно закроется в ближайшее время, вы больше не увидите удалённый канал."
@@ -84,7 +78,6 @@ ru:
       close: "Закрыть"
       collapse: "Свернуть чат"
       confirm_flag: "Действительно пожаловаться на сообщение пользователя %{username}?"
-      deleted: "Сообщение было удалено. [view]"
       hidden: "Сообщение было скрыто. [view]"
       delete: "Удалить"
       edited: "Отредактировано"
@@ -99,6 +92,8 @@ ru:
         never: "Никогда"
         title: "Настройка почтовых уведомлений"
         when_away: "Если вы находитесь офлайн"
+      header_indicator_preference:
+        never: "Никогда"
       enable: "Включить чат"
       flag: "Пожаловаться"
       emoji: "Вставить эмодзи"
@@ -108,68 +103,21 @@ ru:
       in_reply_to: "В ответ на"
       heading: "Чат"
       join: "Подписаться"
-      new_messages: "Новые сообщения"
+      last_visit: "последнее посещение"
+      summarization:
+        summarize: "Сводка"
       mention_warning:
         dismiss: "Отклонить"
-        cannot_see:
-          one: "%{username} и еще %{others} не имеют доступа к этому каналу и не были уведомлены."
-          few: "%{username} и еще %{others} не имеют доступа к этому каналу и не были уведомлены."
-          many: "%{username} и еще %{others} не имеют доступа к этому каналу и не были уведомлены."
-          other: "%{username} и еще %{others} не имеют доступа к этому каналу и не были уведомлены."
         invitations_sent:
           one: "Приглашение отправлено"
           few: "Приглашения отправлены"
           many: "Приглашений отправлены"
           other: "Приглашений отправлены"
         invite: "Пригласить в канал"
-        without_membership:
-          one: "%{username} и еще %{others} не являются участниками канала."
-          few: "%{username} и еще %{others} не являются участниками канала."
-          many: "%{username} и еще %{others} не являются участниками канала."
-          other: "%{username} и еще %{others} не являются участниками канала."
-        group_mentions_disabled:
-          one: "Группа «%{group_name}» и еще %{others} не разрешают упоминания"
-          few: "Группа «%{group_name}» и еще %{others} не разрешают упоминания"
-          many: "Группа «%{group_name}» и еще %{others} не разрешают упоминания"
-          other: "Группа «%{group_name}» и еще %{others} не разрешают упоминания"
-        too_many_members:
-          one: "В группе «%{group_name}» и еще %{others} слишком много участников. Никто не был уведомлен."
-          few: "В группе «%{group_name}» и еще %{others} слишком много участников. Никто не был уведомлен."
-          many: "В группе «%{group_name}» и еще %{others} слишком много участников. Никто не был уведомлен."
-          other: "В группе «%{group_name}» и еще %{others} слишком много участников. Никто не был уведомлен."
-        warning_multiple:
-          one: "еще %{count}"
-          few: "еще %{count}"
-          many: "еще %{count}"
-          other: "еще %{count}"
         groups:
           header:
             some: "Некоторые пользователи не будут уведомлены"
             all: "Никто не будет уведомлен"
-          unreachable:
-            one: "Группа «@%{group}» не разрешает упоминания"
-            few: "Группы «@%{group}» и «@%{group_2}» не разрешают упоминания"
-            many: "Группы «@%{group}» и «@%{group_2}» не разрешают упоминания"
-            other: "Группы «@%{group}» и «@%{group_2}» не разрешают упоминания"
-          unreachable_multiple: "Группа «@%{group}» и еще %{count} не разрешают упоминания"
-          too_many_members:
-            one: "Упоминание группы «@%{group}» превышает %{notification_limit} (%{limit})"
-            few: "Упоминание групп «@%{group}» и «%{group_2}» превышает %{notification_limit} (%{limit})"
-            many: "Упоминание групп «@%{group}» и «%{group_2}» превышает %{notification_limit} (%{limit})"
-            other: "Упоминание групп «@%{group}» и «%{group_2}» превышает %{notification_limit} (%{limit})"
-          too_many_members_multiple: "Группы (%{count}) превышают %{notification_limit} (%{limit})"
-          users_limit:
-            one: "%{count} пользователь"
-            few: "%{count} пользователя"
-            many: "%{count} пользователей"
-            other: "%{count} пользователя"
-          notification_limit: "лимит уведомлений"
-        too_many_mentions: "Сообщение превышает %{notification_limit} (%{limit})"
-        mentions_limit:
-          one: "%{count} упоминание"
-          few: "%{count} упоминания"
-          many: "%{count} упоминаний"
-          other: "%{count} упоминания"
       aria_roles:
         header: "Заголовок чата"
         composer: "Редактор чата"
@@ -186,10 +134,9 @@ ru:
       close_full_page: "Закрыть полноэкранный чат"
       open_message: "Открыть сообщение в чате"
       placeholder_self: "Напишите что-нибудь"
-      placeholder_others: "Чат с %{messageRecipient}"
-      placeholder_new_message_disallowed: "Канал %{status}, в данный момент вы не можете отправлять новые сообщения."
+      placeholder_users: "Чат с %{commaSeparatedNames}"
       placeholder_silenced: "В настоящее время вы не можете отправлять сообщения."
-      placeholder_start_conversation: Начать беседу с пользователем %{usernames}
+      placeholder_start_conversation_users: "Начать беседу с пользователем %{commaSeparatedUsernames}"
       remove_upload: "Удалить файл"
       react: "Реакция с помощью эмодзи"
       reply: "Ответить"
@@ -205,7 +152,6 @@ ru:
       restore: "Восстановить удаленное сообщение"
       save: "Сохранить"
       select: "Выбрать"
-      silence: "Заморозить пользователя"
       return_to_list: "Вернуться к списку каналов"
       scroll_to_bottom: "Прокрутка вниз"
       scroll_to_new_messages: "Новые сообщения"
@@ -261,6 +207,10 @@ ru:
           about: Информация
           members: Участники
           settings: Настройки
+      new_message_modal:
+        no_items: "Нет компонентов"
+      channel_edit_name_slug_modal:
+        name: Название канала
       channel_edit_description_modal:
         title: Изменить описание
         input_placeholder: Добавить описание
@@ -270,9 +220,6 @@ ru:
         prefix: "Кому:"
         no_results: Нет результатов
         selected_user_title: "Отменить выбор пользователя %{username}"
-      channel_selector:
-        title: "Перейти на канал"
-        no_channels: "Нет каналов, соответствующих вашему запросу"
       channel:
         no_memberships: На этом канале нет участников
         no_memberships_found: Участники не найдены
@@ -284,22 +231,10 @@ ru:
       create_channel:
         auto_join_users:
           public_category_warning: "Раздел %{category} является общедоступным. Автоматически добавлять в этот канал всех активных пользователей?"
-          warning_groups:
-            one: Автоматически добавить %{members_count} пользователя из группы %{group}?
-            few: Автоматически добавить %{members_count} пользователей из группы %{group} и группы %{group_2}?
-            many: Автоматически добавить %{members_count} пользователей из группы %{group} и группы %{group_2}?
-            other: Автоматически добавить %{members_count} пользователей из группы %{group} и группы %{group_2}?
-          warning_multiple_groups: Автоматически добавить %{members_count} пользователей из группы %{group_1} и ещё из %{count} групп?
         choose_category:
           label: "Выберите раздел"
           none: "выберите раздел…"
           default_hint: Управляйте доступом к разделу через <a href=%{link} target="_blank">%{category}настройки безопасности</a>
-          hint_groups:
-            one: Пользователи группы %{hint} будут иметь доступ к этому каналу в соответствии с <a href=%{link} target="_blank">настройками безопасности</a>
-            few: Пользователи групп %{hint} и %{hint_2} будут иметь доступ к этому каналу в соответствии с <a href=%{link} target="_blank">настройками безопасности</a>
-            many: Пользователи групп %{hint} и %{hint_2} будут иметь доступ к этому каналу в соответствии с <a href=%{link} target="_blank">настройками безопасности</a>
-            other: Пользователи групп %{hint} и %{hint_2} будут иметь доступ к этому каналу в соответствии с <a href=%{link} target="_blank">настройками безопасности</a>
-          hint_multiple_groups: Пользователи группы %{hint_1} и ещё %{count} групп будут иметь доступ к этому каналу в соответствии с <a href=%{link} target="_blank">настройками безопасности</a>
         create: "Создать канал"
         description: "Описание (необязательно)"
         name: "Название канала"
@@ -312,15 +247,13 @@ ru:
         type: "Сообщение чата"
       reactions:
         only_you: "Вы отреагировали при помощи эмодзи :%{emoji}:"
-        and_others: "Вы, %{usernames}, отреагировали при помощи эмодзи :%{emoji}:"
-        only_others: "Пользователи %{usernames} отреагировали при помощи эмодзи %{emoji}:"
-        others_and_more: "Пользователи %{usernames} и %{more} отреагировали при помощи эмодзи %{emoji}:"
-        you_others_and_more: "Вы, %{usernames} и %{more}, отреагировали при помощи эмодзи %{emoji}:"
+        single_user: "Пользователи %{username} отреагировали при помощи эмодзи %{emoji}:"
       composer:
         toggle_toolbar: "Переключить панель инструментов"
         italic_text: "текст, выделенный курсивом"
         bold_text: "Жирный"
         code_text: "Код"
+        send: "Отправить"
       quote:
         original_channel: 'Первоначально отправлено в <a href="%{channelLink}">%{channel}</a>'
         copy_success: "Цитата из чата скопирована в буфер обмена"
@@ -332,14 +265,14 @@ ru:
         channel_wide_mentions_label: "Разрешить упоминания @all и @here"
         channel_wide_mentions_description: "Разрешить пользователям уведомлять всех в канале #%{channel} (@all) и только активных участников (@here)"
         auto_join_users_label: "Автоматически добавлять пользователей"
-        auto_join_users_info: "Каждый час проверять, какие пользователи были активны за последние три месяца, и добавлять их в этот канал, если у них есть доступ к категории «%{category}»."
-        enable_auto_join_users: "Автоматически добавлять всех активных пользователей"
         auto_join_users_warning: "Любой пользователь, не являющийся участником этого канала, но имеющий доступ к разделу %{category}, будет автоматически подключён. Продолжить?"
         desktop_notification_level: "Уведомления на рабочем столе"
         follow: "Подписаться"
         followed: "Подписан"
         mobile_notification_level: "Мобильные push-уведомления"
         mute: "Отключить канал"
+        threading_enabled: "Включён"
+        threading_disabled: "Отключен"
         muted_on: "Включено"
         muted_off: "Выключено"
         notifications: "Уведомления"
@@ -348,7 +281,6 @@ ru:
         saved: "Сохранено"
         unfollow: "Отписаться"
         admin_title: "Администрирование"
-        retention_info: "История чата будет храниться %{days} сут."
       admin:
         title: "Чат"
       direct_messages:
@@ -421,9 +353,6 @@ ru:
           few: "Отвечают %{commaSeparatedUsernames} и ещё %{count} пользователя"
           many: "Отвечают %{commaSeparatedUsernames} и ещё %{count} пользователей"
           other: "Отвечают %{commaSeparatedUsernames} и ещё %{count} пользователей"
-      retention_reminders:
-        public: "История канала хранится %{days} дней."
-        dm: "История личного чата хранится %{days} дней."
       flags:
         off_topic: "Это сообщение не имеет отношения к текущему обсуждению, как указано в названии канала, и, вероятно, его следует переместить в другое место."
         inappropriate: "Это сообщение содержит контент, который обоснованно можно считать оскорбительным или нарушающим <a href=\"%{basePath}/guidelines\">рекомендации для сообщества</a>."
@@ -445,6 +374,25 @@ ru:
         symbols: "Символы"
         search_placeholder: "Поиск по названию эмодзи и псевдониму…"
         no_results: "Нет результатов"
+      thread:
+        title: "Название"
+        replies:
+          one: "%{count} ответ"
+          few: "%{count} ответа"
+          many: "%{count} ответ"
+          other: "%{count} ответ"
+        settings: "Настройки"
+        last_reply: "последний ответ"
+        notifications:
+          regular:
+            title: "Обычный"
+          tracking:
+            title: "В отслеживаемых"
+        participants_other_count:
+          one: "+%{count}"
+          few: "+%{count}"
+          many: "+%{count}"
+          other: "+%{count}"
       draft_channel_screen:
         header: "Новое сообщение"
         cancel: "Отмена"
@@ -489,9 +437,8 @@ ru:
       transcript:
         view: "Просмотр предыдущих сообщений"
       types:
-        reviewable_chat_message:
+        chat_reviewable_message:
           title: "Сообщение на премодерации"
-          flagged_by: "Кто пожаловался"
     keyboard_shortcuts_help:
       chat:
         title: "Чат"
@@ -524,3 +471,7 @@ ru:
           few: "Уведомления чата —%{count} непрочитанных уведомления"
           many: "Уведомления чата —%{count} непрочитанных уведомлений"
           other: "Уведомления чата —%{count} непрочитанных уведомлений"
+    styleguide:
+      sections:
+        chat:
+          title: Чат
diff --git a/plugins/chat/config/locales/client.sk.yml b/plugins/chat/config/locales/client.sk.yml
index 8eb983411a1..060dc3a4b97 100644
--- a/plugins/chat/config/locales/client.sk.yml
+++ b/plugins/chat/config/locales/client.sk.yml
@@ -6,6 +6,11 @@
 
 sk:
   js:
+    admin:
+      logs:
+        staff_actions:
+          actions:
+            chat_auto_remove_membership: "Automatické odstránenie členstiev z kanálov"
     chat:
       create: "Vytvoriť"
       cancel: "Zrušiť"
@@ -14,29 +19,53 @@ sk:
         add: "Pridať"
         join: "Pridať sa"
         leave: "Opustiť"
+      channel_delete:
+        instructions: "<p>Odstráni kanál <strong>%{name}</strong> a históriu chatu. Všetky správy a súvisiace údaje, ako sú reakcie a médiá, budú natrvalo vymazané. Ak chcete zachovať históriu kanála a vyradiť ho z prevádzky, môžete namiesto toho kanál archivovať.</p> <p>Ste si istí, že chcete kanál <strong>natrvalo odstrániť</strong>? Pre potvrdenie zadajte názov kanála do poľa nižšie.</p>"
       close: "Zavrieť"
+      expand: "Rozbaliť chat"
       delete: "Odstrániť"
       muted: "ignorovaní"
       joined: "vytvorený"
       email_frequency:
         never: "Nikdy"
+      header_indicator_preference:
+        title: "Zobrazenie indikátora aktivity v záhlaví"
+        all_new: "Všetky nové správy"
+        dm_and_mentions: "Súkromné správy a zmienky"
+        never: "Nikdy"
       flag: "Označenie"
       join: "Pridať sa"
+      last_visit: "posledná návševa"
+      summarization:
+        title: "Zhrnutie správ"
+        description: "Ak chcete zhrnúť konverzáciu odoslanú počas požadovaného časového obdobia, vyberte nižšie uvedenú možnosť."
+        summarize: "Zhrnúť"
       mention_warning:
         dismiss: "zahodiť"
+        cannot_see: "%{username} nemá prístup k tomuto kanálu a nebol upozornený."
         groups:
-          users_limit:
-            one: "%{count} používateľ"
-            few: "%{count} používatelia"
-            many: "%{count} používateľov"
-            other: "%{count} používateľov"
+          unreachable_1: "@%{group} nepovoľuje označovanie."
+          unreachable_2: "@%{group1} a @%{group2} nepovoľujú oznčovanie."
+      kicked_from_channel: "K tomuto kanálu už nemáte prístup."
+      placeholder_channel: "Chat v %{channelName}"
+      placeholder_thread: "Chatovať vo vlákne"
+      placeholder_users: "Chatovať s %{commaSeparatedNames}"
+      placeholder_new_message_disallowed:
+        archived: "Kanál je archivovaný, nie je možné posielať nové správy."
+        closed: "Kanál je zatvorený, nie je možné posielať nové správy."
+        read_only: "Kanál je len na čítanie, nie je možné posielať nové správy."
+      placeholder_start_conversation: "Začnite konverzáciu s ..."
+      placeholder_start_conversation_users: "Začnite konverzáciu s %{commaSeparatedUsernames}"
       reply: "Odpoveď"
       edit: "Upraviť"
       rebake_message: "Pregenerovať HTML"
       bookmark_message: "Záložka"
       save: "Uložiť"
+      return_to_threads_list: "Návrat k prebiehajúcim diskusiám"
       sounds:
         none: "Žiadny"
+      upload_to_channel: "Nahrať do %{title}"
+      upload_to_thread: "Nahrať do vlákna"
       exit: "späť"
       channel_status:
         closed: "Zatvorené"
@@ -58,28 +87,61 @@ sk:
           about: O stránke
           members: Členovia
           settings: Nastavenia
+      new_message_modal:
+        title: Odoslať správu
+        add_user_long: <kbd>shift + klik</kbd> alebo <kbd>shift + enter</kbd><span>Pridať @%{username}</span>
+        add_user_short: <span>Pridať používateľa</span>
+        open_channel: <span>Otvoriť kanál</span>
+        default_search_placeholder: "#a-channel, @somebody alebo čokoľvek."
+        default_channel_search_placeholder: "#a-channel"
+        default_user_search_placeholder: "@niekto"
+        user_search_placeholder: "...pridať ďalších používateľov"
+        disabled_user: "má vypnutý chat"
+        no_items: "Žiadne položky"
+      channel_edit_name_slug_modal:
+        title: Upraviť kanál
+        input_placeholder: Pridať meno
+        name: Názov kanála
+        slug: URL adresa kanála (voliteľné)
       direct_message_creator:
         title: Nová správa
         prefix: "Komu:"
       create_channel:
+        threading:
+          label: "Povoliť vytváranie podvlákien"
+        slug: "URL adresa kanála (voliteľné)"
         type: "Typ"
         types:
           category: "Kategória"
           topic: "Témy"
+      reactions:
+        you_and_single_user: "Vy a %{username} ste reagovali s :%{emoji}:"
+        you_and_multiple_users: "Vy, %{commaSeparatedUsernames} a %{username} ste reagovali s :%{emoji}:"
+        single_user: "%{username} reagoval s :%{emoji}:"
       composer:
         italic_text: "zdôraznený text"
         bold_text: "výrazný text"
+        send: "Odoslať"
       notification_levels:
         never: "Nikdy"
       settings:
+        channel_threading_label: "Vláknenie"
         follow: "Pridať sa"
         followed: "Vytvorený"
+        threading_enabled: "Povolené"
+        threading_disabled: "Vypnuté"
         notifications: "Upozornenia"
         preview: "Ukážka"
         save: "Uložiť"
         saved: "Uložené"
         unfollow: "Opustiť"
         admin_title: "Admin"
+      admin:
+        export_messages:
+          title: "Exportovať správy z chatu"
+          description: "Export je v súčasnosti obmedzený na 10000 najnovších správ za posledných 6 mesiacov."
+          create_export: "Vytvoriť export"
+          export_has_started: "Export sa začal. Keď bude hotový, budeme Vás informovať cez súkromnú správu."
       incoming_webhooks:
         back: "Späť"
         description: "Popis"
@@ -98,9 +160,38 @@ sk:
           title: "Presuň na novú tému"
         existing_topic:
           title: "Presuň do existujúcej témy."
+      retention_reminders:
+        public_none: "História kanálov sa uchováva na neurčito."
+        dm_none: "História osobných chatov sa uchováva na neurčito."
       emoji_picker:
         objects: "Objekty"
         flags: "Označenia"
+      thread:
+        title: "Názov"
+        view_thread: Zobraziť vlákno
+        default_title: "Vlákno"
+        replies:
+          one: "%{count} odpoveď"
+          few: "%{count} odpovede"
+          many: "%{count} odpovedí"
+          other: "%{count} odpovedí"
+        label: Vlákno
+        close: "Uzavrieť vlákno"
+        original_message:
+          started_by: "Začal"
+        settings: "Nastavenia"
+        last_reply: "posledná odpoveď"
+        notifications:
+          regular:
+            title: "Normálne"
+            description: "Budete upozornení, ak niekto v tomto vlákne uvedie vaše @meno."
+          tracking:
+            title: "Pozorovať"
+            description: "Počet nových odpovedí na toto vlákno sa zobrazí v zozname vlákien a v kanáli. Budete upozornení, ak niekto v tomto vlákne spomenie vaše @meno."
+      threads:
+        open: "Otvoriť vlákno"
+        list: "Prebiehajúca diskusia"
+        none: "Nezúčastňujete sa na žiadnych vláknach v tomto kanáli."
       draft_channel_screen:
         header: "Nová správa"
         cancel: "Zrušiť"
@@ -110,3 +201,15 @@ sk:
           fields:
             message:
               label: Správa
+    review:
+      types:
+        chat_reviewable_message:
+          title: "Označená správa"
+    keyboard_shortcuts_help:
+      chat:
+        keyboard_shortcuts:
+          mark_all_channels_read: "%{shortcut} Označiť všetky kanály ako prečítané"
+    styleguide:
+      sections:
+        chat:
+          title: Chat
diff --git a/plugins/chat/config/locales/client.sl.yml b/plugins/chat/config/locales/client.sl.yml
index bea08857986..c354770f945 100644
--- a/plugins/chat/config/locales/client.sl.yml
+++ b/plugins/chat/config/locales/client.sl.yml
@@ -21,16 +21,13 @@ sl:
       joined: "pridružen"
       email_frequency:
         never: "Nikoli"
+      header_indicator_preference:
+        never: "Nikoli"
       flag: "Prijavi"
       join: "Pridruži se"
+      last_visit: "zadnji obisk"
       mention_warning:
         dismiss: "opusti"
-        groups:
-          users_limit:
-            one: "%{count} uporabnik"
-            two: "%{count} uporabnika"
-            few: "%{count} uporabniki"
-            other: "%{count} uporabnikov"
       reply: "Odgovori"
       edit: "Uredi"
       rebake_message: "Obnovi HTML"
@@ -75,6 +72,8 @@ sl:
       settings:
         follow: "Pridruži se"
         followed: "Pridružen"
+        threading_enabled: "Vključeno"
+        threading_disabled: "Onemogočeno"
         notifications: "Obvestila"
         preview: "Predogled"
         save: "Shrani"
@@ -106,6 +105,25 @@ sl:
         activities: "Dejavnosti"
         flags: "Zastave"
         symbols: "Simboli"
+      thread:
+        title: "Naziv"
+        replies:
+          one: "%{count} odgovor"
+          two: "%{count} odgovora"
+          few: "%{count} odgovori"
+          other: "%{count} odgovorov"
+        settings: "Nastavitve"
+        last_reply: "zadnji odgovor"
+        notifications:
+          regular:
+            title: "Običajna"
+          tracking:
+            title: "Sledim"
+        participants_other_count:
+          one: "+%{count}"
+          two: "+%{count}"
+          few: "+%{count}"
+          other: "+%{count}"
       draft_channel_screen:
         header: "Novo zasebno sporočilo"
         cancel: "Prekliči"
@@ -117,7 +135,3 @@ sl:
           fields:
             message:
               label: Opozorilo
-    review:
-      types:
-        reviewable_chat_message:
-          flagged_by: "Prijavljen od"
diff --git a/plugins/chat/config/locales/client.sq.yml b/plugins/chat/config/locales/client.sq.yml
index 1bf58248323..94d9d7e4891 100644
--- a/plugins/chat/config/locales/client.sq.yml
+++ b/plugins/chat/config/locales/client.sq.yml
@@ -17,13 +17,12 @@ sq:
       joined: "anëtarësuar"
       email_frequency:
         never: "Asnjëherë"
+      header_indicator_preference:
+        never: "Asnjëherë"
       flag: "Sinjalizoni"
+      last_visit: "vizita e fundit"
       mention_warning:
         dismiss: "hiqe"
-        groups:
-          users_limit:
-            one: "%{count} anëtar"
-            other: "%{count} anëtarë"
       reply: "Përgjigju"
       edit: "Redakto"
       rebake_message: "Rindërtoni HTML"
@@ -65,6 +64,7 @@ sq:
         never: "Asnjëherë"
       settings:
         followed: "Anëtarësuar"
+        threading_enabled: "Aktivizuar"
         notifications: "Njoftimet"
         preview: "Parashikimi"
         save: "Ruaj"
@@ -90,6 +90,18 @@ sq:
           title: "Transfero tek një Temë tjetër"
       emoji_picker:
         flags: "Sinjalizime"
+      thread:
+        title: "Titulli"
+        replies:
+          one: "%{count} përgjigje"
+          other: "%{count} përgjigje"
+        settings: "Rregullimet"
+        last_reply: "përgjigja e fundit"
+        notifications:
+          regular:
+            title: "Normal"
+          tracking:
+            title: "Në gjurmim"
       draft_channel_screen:
         header: "Mesazh i ri"
         cancel: "Anulo"
diff --git a/plugins/chat/config/locales/client.sr.yml b/plugins/chat/config/locales/client.sr.yml
index 888b9273bc5..0c9447d766a 100644
--- a/plugins/chat/config/locales/client.sr.yml
+++ b/plugins/chat/config/locales/client.sr.yml
@@ -19,14 +19,12 @@ sr:
       joined: "pridružen"
       email_frequency:
         never: "Nikad"
+      header_indicator_preference:
+        never: "Nikad"
       flag: "Označi Zastavom"
+      last_visit: "poslednja poseta"
       mention_warning:
         dismiss: "одбаци"
-        groups:
-          users_limit:
-            one: "{count} korisnik"
-            few: "%{count} korisnika"
-            other: "%{count} korisnika"
       reply: "Odgovori"
       edit: "Izmeni"
       rebake_message: "Popravi HTML"
@@ -92,6 +90,15 @@ sr:
           title: "Prebaci u Postojeću Temu"
       emoji_picker:
         flags: "Zastave"
+      thread:
+        title: "Naslov"
+        settings: "Podešavanja"
+        last_reply: "poslednji odgovor"
+        notifications:
+          regular:
+            title: "Normalno"
+          tracking:
+            title: "Praćeno"
       draft_channel_screen:
         header: "Nova privatna poruka"
         cancel: "Odustani"
diff --git a/plugins/chat/config/locales/client.sv.yml b/plugins/chat/config/locales/client.sv.yml
index 9d8454fa73e..f4c08459d40 100644
--- a/plugins/chat/config/locales/client.sv.yml
+++ b/plugins/chat/config/locales/client.sv.yml
@@ -15,6 +15,7 @@ sv:
           actions:
             chat_channel_status_change: "Chattkanalens status har ändrats"
             chat_channel_delete: "Chattkanal raderad"
+            chat_auto_remove_membership: "Medlemskap tas automatiskt bort från kanaler"
       api:
         scopes:
           descriptions:
@@ -39,8 +40,8 @@ sv:
       move_to_channel:
         title: "Flytta meddelanden till kanal"
         instructions:
-          one: "Du flyttar <strong>%{count}</strong> meddelande. Välj en destinationskanal. Ett platshållarmeddelande kommer att skapas i kanalen <strong>%{channelTitle}</strong> för att indikera att detta meddelande har flyttats."
-          other: "Du flyttar <strong>%{count}</strong> meddelanden. Välj en destinationskanal. Ett platshållarmeddelande kommer att skapas i kanalen <strong>%{channelTitle}</strong> för att indikera att dessa meddelanden har flyttats."
+          one: "Du flyttar <strong>%{count}</strong> meddelande. Välj en destinationskanal. Ett platshållarmeddelande kommer att skapas i kanalen <strong>%{channelTitle}</strong> för att indikera att detta meddelande har flyttats. Observera att svarskedjor inte kommer att bevaras i den nya kanalen, och meddelanden i den gamla kanalen kommer inte längre att visas som svar på flyttade meddelanden."
+          other: "Du flyttar <strong>%{count}</strong> meddelanden. Välj en destinationskanal. Ett platshållarmeddelande kommer att skapas i kanalen <strong>%{channelTitle}</strong> för att indikera att dessa meddelanden har flyttats. Observera att svarskedjor inte kommer att bevaras i den nya kanalen, och meddelanden i den gamla kanalen kommer inte längre att visas som svar på flyttade meddelanden."
         confirm_move: "Flytta meddelanden"
       channel_settings:
         title: "Kanalinställningar"
@@ -71,7 +72,7 @@ sv:
         instructions: "Genom att stänga kanalen hindras användare som inte är personal att skicka nya meddelanden eller redigera befintliga meddelanden. Är du säker på att du vill stänga denna kanal?"
       channel_delete:
         title: "Radera kanal"
-        instructions: "<p>Tar bort <strong>%{name}</strong> kanalen och chatthistoriken. Alla meddelanden och relaterad data, såsom reaktioner och uppladdningar, kommer att raderas permanent. Om du vill bevara kanalhistoriken men avveckla den, kanske du vill arkivera kanalen istället.</p> <p>Är du säker på att du <strong>permanent vill ta bort</strong> kanalen? För att bekräfta, skriv in namnet på kanalen i rutan nedan.</p>"
+        instructions: "<p>Tar bort kanalen <strong>%{name}</strong> och chatthistoriken. Alla meddelanden och relaterad data, såsom reaktioner och uppladdningar, kommer att raderas permanent. Om du vill bevara kanalhistoriken och avveckla den, kanske du vill arkivera kanalen istället.</p> <p>Är du säker på att du vill <strong>ta bort kanalen permanent</strong>? Bekräfta genom att skriva in kanalens namn i rutan nedan.</p>"
         confirm: "Jag förstår konsekvenserna, radera kanalen"
         confirm_channel_name: "Ange kanalnamn"
         process_started: "Processen för att radera kanalen har påbörjats. Denna modal kommer att stängas inom kort och du kommer inte längre att se den raderade kanalen någonstans."
@@ -81,8 +82,11 @@ sv:
       click_to_join: "Klicka här för att se tillgängliga kanaler."
       close: "Stäng"
       collapse: "Komprimera chattruta"
+      expand: "Expandera chattlådan"
       confirm_flag: "Är du säker på att du vill flagga %{username}:s meddelande?"
-      deleted: "Ett meddelande raderades. [view]"
+      deleted:
+        one: "Ett meddelande raderades. [view]"
+        other: "%{count} meddelanden raderades. [visa alla]"
       hidden: "Ett meddelande doldes. [view]"
       delete: "Radera"
       edited: "redigerad"
@@ -97,6 +101,11 @@ sv:
         never: "Aldrig"
         title: "E-postaviseringar"
         when_away: "Endast när du är borta"
+      header_indicator_preference:
+        title: "Visa aktivitetsindikator i sidhuvudet"
+        all_new: "Alla nya meddelanden"
+        dm_and_mentions: "Direktmeddelanden och omnämnanden"
+        never: "Aldrig"
       enable: "Aktivera chatt"
       flag: "Flagga"
       emoji: "Infoga emoji"
@@ -106,53 +115,111 @@ sv:
       in_reply_to: "Som svar på"
       heading: "Chatt"
       join: "Gå med"
-      new_messages: "nya meddelanden"
+      last_visit: "senaste besök"
+      summarization:
+        title: "Sammanfatta meddelanden"
+        description: "Välj ett alternativ nedan för att sammanfatta samtalet som skickades under den önskade tidsramen."
+        summarize: "Sammanfatta"
+        since:
+          one: "Senaste timmen"
+          other: "Senaste %{count} timmarna"
       mention_warning:
         dismiss: "avfärda"
-        cannot_see:
-          one: "%{username} kan inte komma åt den här kanalen och har inte aviserats."
-          other: "%{username} och %{others} kan inte komma åt den här kanalen och har inte aviserats."
+        cannot_see: "%{username} kan inte komma åt den här kanalen och har inte aviserats."
+        cannot_see_multiple:
+          one: "%{username} och %{count} annan användare kan inte komma åt den här kanalen och har inte aviserats."
+          other: "%{username} och %{count} andra användare kan inte komma åt den här kanalen och har inte aviserats."
         invitations_sent:
           one: "Inbjudan skickad"
           other: "Inbjudningar skickade"
         invite: "Bjud in till kanal"
-        without_membership:
-          one: "%{username} har inte gått med i den här kanalen."
-          other: "%{username} och %{others} har inte gått med i den här kanalen."
-        group_mentions_disabled:
-          one: "%{group_name} tillåter inte omnämnanden"
-          other: "%{group_name} och %{others} tillåter inte omnämnanden"
-        too_many_members:
-          one: "%{group_name} har för många medlemmar. Ingen aviserades"
-          other: "%{group_name} och %{others} har för många medlemmar. Ingen aviserades"
-        warning_multiple:
-          one: "%{count} annan"
-          other: "%{count} andra"
+        without_membership: "%{username} har inte gått med i den här kanalen."
+        without_membership_multiple:
+          one: "%{username} och %{count} annan användare har inte gått med i den här kanalen."
+          other: "%{username} och %{count} andra användare har inte gått med i den här kanalen."
+        group_mentions_disabled: "%{group_name} tillåter inte omnämnanden."
+        group_mentions_disabled_multiple:
+          one: "%{group_name} och ytterligare %{count} grupp tillåter inte omnämnanden."
+          other: "%{group_name} och ytterligare %{count} grupper tillåter inte omnämnanden."
+        too_many_members: "%{group_name} har för många medlemmar. Ingen aviserades."
+        too_many_members_multiple:
+          one: "%{group_name} och %{count} annan grupp har för många medlemmar. Ingen aviserades."
+          other: "%{group_name} och %{count} andra grupper har för många medlemmar. Ingen aviserades."
         groups:
           header:
             some: "Vissa användare kommer inte att aviseras"
             all: "Ingen kommer att aviseras"
-          unreachable:
-            one: "@%{group} tillåter inte omnämnanden"
-            other: "@%{group} och @%{group_2} tillåter inte omnämnanden"
-          unreachable_multiple: "@%{group} och ytterligare %{count} tillåter inte omnämnanden"
-          too_many_members:
-            one: "Att nämna @%{group} överstiger %{notification_limit} av %{limit}"
-            other: "Att nämna både @%{group} eller @%{group_2} överstiger %{notification_limit} av %{limit}"
-          too_many_members_multiple: "Dessa %{count} grupper överstiger %{notification_limit} av %{limit}"
-          users_limit:
-            one: "%{count} användare"
-            other: "%{count} användare"
-          notification_limit: "aviseringsgräns"
-        too_many_mentions: "Detta meddelande överstiger %{notification_limit} av %{limit}"
-        mentions_limit:
-          one: "%{count} omnämnande"
-          other: "%{count} omnämnanden"
+          unreachable_1: "@%{group} tillåter inte omnämnanden."
+          unreachable_2: "@%{group1} och @%{group2} tillåter inte omnämnanden."
+          unreachable_multiple:
+            one: "@%{group} och ytterligare %{count} grupp tillåter inte omnämnanden."
+            other: "@%{group} och ytterligare %{count} grupper tillåter inte omnämnanden."
+          too_many_members_MF: |
+            { groupCount, plural,
+                 =1 {
+                      { isAdmin, select,
+                        true {
+                          { notificationLimit, plural,
+                              one {Att nämna @{group1} överstiger <a href="{siteSettingUrl}" target="_blank">aviseringsgränsen</a> som är # användare.}
+                              other {Att nämna @{group1} överstiger <a href="{siteSettingUrl}" target="_blank">aviseringsgränsen</a> som är # användare.}
+                          }
+                        }
+                        false {
+                          { notificationLimit, plural,
+                              one {Att nämna @{group1} överstiger aviseringsgränsen som är # användare.}
+                              other {Att nämna @{group1} överstiger aviseringsgränsen som är # användare.}
+                          }
+                        }
+                        other {}
+                      }
+                    }
+                 =2 {
+                      { isAdmin, select,
+                        true {
+                          { notificationLimit, plural,
+                              one {Att nämna @{group1} och @{group2} överstiger <a href="{siteSettingUrl}" target="_blank">aviseringsgränsen</a> som är # användare.}
+                            other {Att nämna @{group1} och @{group2} överstiger <a href="{siteSettingUrl}" target="_blank">aviseringsgränsen</a> som är # användare.}
+                          }
+                        }
+                        false {
+                          { notificationLimit, plural,
+                              one {Att nämna @{group1} och @{group2} överstiger aviseringsgränsen som är # användare.}
+                            other {Att nämna @{group1} och @{group2} överstiger aviseringsgränsen som är # användare.}
+                          }
+                        }
+                        other {}
+                      }
+                    }
+              other {
+                      { isAdmin, select,
+                        true {
+                          { notificationLimit, plural,
+                              one {Att nämna dessa {groupCount} grupper överstiger <a href="{siteSettingUrl}" target="_blank">aviseringsgränsen</a> som är # användare.}
+                            other {Att nämna dessa {groupCount} grupper överstiger <a href="{siteSettingUrl}" target="_blank">aviseringsgränsen</a> som är # användare.}
+                          }
+                        }
+                        false {
+                          { notificationLimit, plural,
+                              one {Att nämna dessa {groupCount} grupper överstiger aviseringsgränsen som är # användare.}
+                            other {Att nämna dessa {groupCount} grupper överstiger aviseringsgränsen som är # användare.}
+                          }
+                        }
+                        other {}
+                      }
+                    }
+            }
+        too_many_mentions:
+          one: "Detta meddelande överstiger aviseringsgränsen, som är %{count} omnämnande."
+          other: "Detta meddelande överstiger aviseringsgränsen, som är %{count} omnämnanden."
+        too_many_mentions_admin:
+          one: 'Det här meddelandet överstiger <a href="%{siteSettingUrl}" target="_blank">aviseringsgränsen</a> som är %{count} omnämnande.'
+          other: 'Det här meddelandet överstiger <a href="%{siteSettingUrl}" target="_blank">aviseringsgränsen</a> som är %{count} omnämnanden.'
       aria_roles:
         header: "Chatthuvud"
         composer: "Chattkompositör"
         channels_list: "Lista över chattkanaler"
       no_public_channels: "Du har inte gått med i några kanaler."
+      kicked_from_channel: "Du har inte längre tillgång till den här kanalen."
       only_chat_push_notifications:
         title: "Skicka bara push-meddelanden för chatt"
         description: "Blockera alla push-meddelanden som inte är chattmeddelanden från att skickas"
@@ -164,10 +231,16 @@ sv:
       close_full_page: "Stäng helskärmschatt"
       open_message: "Öppna meddelande i chatten"
       placeholder_self: "Gör en anteckning"
-      placeholder_others: "Chatta med %{messageRecipient}"
-      placeholder_new_message_disallowed: "Kanalen är %{status}, du kan inte skicka nya meddelanden just nu."
+      placeholder_channel: "Chatta i %{channelName}"
+      placeholder_thread: "Chatta i tråden"
+      placeholder_users: "Chatta med %{commaSeparatedNames}"
+      placeholder_new_message_disallowed:
+        archived: "Kanalen är arkiverad, och du kan inte skicka nya meddelanden just nu."
+        closed: "Kanalen är stängd, och du kan inte skicka nya meddelanden just nu."
+        read_only: "Kanalen är lässkyddad, och du kan inte skicka nya meddelanden just nu."
       placeholder_silenced: "Du kan inte skicka meddelanden just nu."
-      placeholder_start_conversation: Starta en konversation med %{usernames}
+      placeholder_start_conversation: "Inled ett samtal med ..."
+      placeholder_start_conversation_users: "Inled ett samtal med %{commaSeparatedUsernames}"
       remove_upload: "Ta bort fil"
       react: "Reagera med emoji"
       reply: "Svara"
@@ -183,8 +256,11 @@ sv:
       restore: "Återställ raderat meddelande"
       save: "Spara"
       select: "Välj"
-      silence: "Tysta användare"
       return_to_list: "Återgå till listan över kanaler"
+      return_to_threads_list: "Gå tillbaka till pågående diskussioner"
+      unread_threads_count:
+        one: "Du har %{count} oläst diskussion"
+        other: "Du har %{count} olästa diskussioner"
       scroll_to_bottom: "Scrolla till botten"
       scroll_to_new_messages: "Se nya meddelanden"
       sound:
@@ -196,6 +272,8 @@ sv:
       title: "chatt"
       title_capitalized: "Chatt"
       upload: "Bifoga en fil"
+      upload_to_channel: "Ladda upp till %{title}"
+      upload_to_thread: "Ladda upp till tråd"
       uploaded_files:
         one: "%{count} fil"
         other: "%{count} filer"
@@ -239,10 +317,23 @@ sv:
           about: Om
           members: Medlemmar
           settings: Inställningar
-      channel_edit_name_modal:
-        title: Redigera namn
+      new_message_modal:
+        title: Skicka meddelande
+        add_user_long: <kbd>skift + klicka</kbd> eller <kbd>skift + enter</kbd><span>Lägg till @%{username}</span>
+        add_user_short: <span>Lägg till användare</span>
+        open_channel: <span>Öppna kanal</span>
+        default_search_placeholder: "#a-kanal, @någon eller något"
+        default_channel_search_placeholder: "#en-kanal"
+        default_user_search_placeholder: "@någon"
+        user_search_placeholder: "...lägg till fler användare"
+        disabled_user: "har inaktiverat chatten"
+        no_items: "Inga objekt"
+      channel_edit_name_slug_modal:
+        title: Redigera kanal
         input_placeholder: Lägg till ett namn
-        description: Ge din kanal ett kort beskrivande namn
+        slug_description: Ett dynamiskt kanalfält används i URL:en istället för kanalnamnet
+        name: Kanalnamn
+        slug: Dynamiskt kanalfält (valfritt)
       channel_edit_description_modal:
         title: Redigera beskrivning
         input_placeholder: Lägg till en beskrivning
@@ -252,9 +343,6 @@ sv:
         prefix: "Till:"
         no_results: Inga resultat
         selected_user_title: "Avmarkera %{username}"
-      channel_selector:
-        title: "Byt till kanal"
-        no_channels: "Inga kanaler matchar din sökning"
       channel:
         no_memberships: Denna kanal har inga medlemmar
         no_memberships_found: Inga medlemmar hittades
@@ -262,23 +350,44 @@ sv:
           one: "%{count} medlem"
           other: "%{count} medlemmar"
       create_channel:
+        threading:
+          label: "Aktivera trådning"
         auto_join_users:
           public_category_warning: "%{category} är en offentlig kategori. Vill du automatiskt lägga till alla nyligen aktiva användare till den här kanalen?"
-          warning_groups:
-            one: Lägg automatiskt till %{members_count} användare från %{group}?
-            other: Lägg automatiskt till %{members_count} användare från %{group} och %{group_2}?
-          warning_multiple_groups: Lägg automatiskt till %{members_count} användare från %{group_1} och %{count} andra?
+          warning_1_group:
+            one: "Vill du automatiskt lägga till %{count} användare från %{group}?"
+            other: "Vill du automatiskt lägga till %{count} användare från %{group}?"
+          warning_2_groups:
+            one: "Vill du automatiskt lägga till %{count} användare från %{group1} och %{group2}?"
+            other: "Vill du automatiskt lägga till %{count} användare från %{group1} och %{group2}?"
+          warning_multiple_groups_MF: |
+            { groupCount, plural,
+                one {
+                      { userCount, plural,
+                          one {Vill du automatiskt lägga till {userCount} användare från {groupName} och ytterligare {groupCount} grupp?}
+                        other {Vill du automatiskt lägga till {userCount} användare från {groupName} och ytterligare {groupCount} grupp?}
+                      }
+                    }
+              other {
+                      { userCount, plural,
+                          one {Vill du automatiskt lägga till {userCount} användare från {groupName} och ytterligare {groupCount} grupper?}
+                        other {Vill du automatiskt lägga till {userCount} användare från {groupName} och ytterligare {groupCount} grupper?}
+                      }
+                    }
+            }
         choose_category:
           label: "Välj en kategori"
           none: "Välj en..."
           default_hint: Hantera åtkomst genom att besöka <a href=%{link} target="_blank">%{category} säkerhetsinställningar</a>
-          hint_groups:
-            one: Användare i %{hint} kommer att ha åtkomst till denna kanal enligt <a href=%{link} target="_blank">säkerhetsinställningar</a>
-            other: Användare i %{hint} och %{hint_2} kommer att ha åtkomst till denna kanal enligt <a href=%{link} target="_blank">säkerhetsinställningarna</a>
-          hint_multiple_groups: Användare i %{hint_1} och %{count} andra grupper kommer att ha åtkomst till denna kanal enligt <a href=%{link} target="_blank">säkerhetsinställningarna</a>
+          hint_1_group: 'Användare i %{group} kommer att ha åtkomst till denna kanal enligt <a href="%{settingLink}" target="_blank">säkerhetsinställningar</a>'
+          hint_2_groups: 'Användare i %{group1} och %{group2} kommer att ha åtkomst till denna kanal enligt <a href="%{settingLink}" target="_blank">säkerhetsinställningar</a>'
+          hint_multiple_groups:
+            one: 'Användare i %{group} och ytterligare %{count} grupp kommer att ha åtkomst till denna kanal enligt <a href="%{settingLink}" target="_blank">säkerhetsinställningarna</a>'
+            other: 'Användare i %{group} och ytterligare %{count} grupper kommer att ha åtkomst till denna kanal enligt <a href="%{settingLink}" target="_blank">säkerhetsinställningarna</a>'
         create: "Skapa kanal"
         description: "Beskrivning (valfritt)"
         name: "Kanalnamn"
+        slug: "Dynamiskt kanalfält (valfritt)"
         title: "Ny kanal"
         type: "Typ"
         types:
@@ -288,15 +397,22 @@ sv:
         type: "Chatt meddelande"
       reactions:
         only_you: "Du reagerade med :%{emoji}:"
-        and_others: "Du, %{usernames} reagerade med :%{emoji}:"
-        only_others: "%{usernames} reagerade med :%{emoji}:"
-        others_and_more: "%{usernames} och %{more} andra reagerade med :%{emoji}:"
-        you_others_and_more: "Du, %{usernames} och %{more} andra reagerade med :%{emoji}:"
+        you_and_single_user: "Du och %{username} reagerade med :%{emoji}:"
+        you_and_multiple_users: "Du, %{commaSeparatedUsernames} och %{username} reagerade med :%{emoji}:"
+        you_multiple_users_and_more:
+          one: "Du, %{commaSeparatedUsernames} och %{count} till reagerade med :%{emoji}:"
+          other: "Du, %{commaSeparatedUsernames} och %{count} till reagerade med :%{emoji}:"
+        single_user: "%{username} reagerade med :%{emoji}:"
+        multiple_users: "%{commaSeparatedUsernames} och %{username} reagerade med :%{emoji}:"
+        multiple_users_and_more:
+          one: "%{commaSeparatedUsernames} och ytterligare %{count} reagerade med :%{emoji}:"
+          other: "%{commaSeparatedUsernames} och ytterligare %{count} reagerade med :%{emoji}:"
       composer:
         toggle_toolbar: "Växla verktygsfält"
         italic_text: "kursiv text"
         bold_text: "fet text"
         code_text: "kod text"
+        send: "Skicka"
       quote:
         original_channel: 'Ursprungligen skickad i <a href="%{channelLink}">%{channel}</a>'
         copy_success: "Chattcitat kopierat till urklipp"
@@ -307,15 +423,19 @@ sv:
       settings:
         channel_wide_mentions_label: "Tillåt @all och @here omnämnanden"
         channel_wide_mentions_description: "Tillåt användare att avisera alla #%{channel}-medlemmar med @all eller bara de som är aktiva för tillfället med @here"
+        channel_threading_label: "Trådning"
+        channel_threading_description: "När trådning är aktiverat kommer svar på ett chattmeddelande att skapa ett separat samtal som existerar parallellt med huvudkanalen."
         auto_join_users_label: "Lägg till användare automatiskt"
-        auto_join_users_info: "Kontrollera varje timme vilka användare som har varit aktiva under de senaste 3 månaderna och, om de har tillgång till kategorin %{category}, lägg till dem i den här kanalen."
-        enable_auto_join_users: "Lägg automatiskt till alla nyligen aktiva användare"
+        auto_join_users_info: "Kontrollera varje timme vilka användare som har varit aktiva under de senaste 3 månaderna. Lägg till dem till den här kanalen om de har tillgång till kategorin %{category}."
+        auto_join_users_info_no_category: "Kontrollera varje timme vilka användare som har varit aktiva under de senaste 3 månaderna. Lägg till dem till den här kanalen om de har tillgång till vald kategori."
         auto_join_users_warning: "Varje användare som inte är medlem i den här kanalen och har tillgång till kategorin %{category} kommer att gå med. Är du säker?"
         desktop_notification_level: "Skrivbordsaviseringar"
         follow: "Gå med"
         followed: "Gick med"
         mobile_notification_level: "Mobila push-meddelanden"
         mute: "Tysta kanal"
+        threading_enabled: "Aktiverad"
+        threading_disabled: "Inaktiverad"
         muted_on: "På"
         muted_off: "Av"
         notifications: "Aviseringar"
@@ -324,9 +444,13 @@ sv:
         saved: "Sparad"
         unfollow: "Lämna"
         admin_title: "Admin"
-        retention_info: "Chatthistoriken sparas i %{days} dagar."
       admin:
         title: "Chatt"
+        export_messages:
+          title: "Exportera chattmeddelanden"
+          description: "Exporten är för närvarande begränsad till de 10 000 senaste meddelanden under de senaste 6 månaderna."
+          create_export: "Skapa export"
+          export_has_started: "Exporten har börjat. Du får ett PM när det är klart."
       direct_messages:
         title: "Personlig chatt"
         new: "Skapa en personlig chatt"
@@ -390,8 +514,14 @@ sv:
           one: "%{commaSeparatedUsernames} och %{count} skriver"
           other: "%{commaSeparatedUsernames} och %{count} andra skriver"
       retention_reminders:
-        public: "Kanalhistoriken behålls i %{days} dagar."
-        dm: "Personlig chatthistorik behålls i %{days} dagar."
+        public_none: "Kanalhistoriken bevaras på obestämd tid."
+        public:
+          one: "Kanalhistoriken bevaras %{count} dag."
+          other: "Kanalhistoriken bevaras %{count} dagar."
+        dm_none: "Personlig chatthistorik bevaras på obestämd tid."
+        dm:
+          one: "Personlig chatthistorik bevaras %{count} dag."
+          other: "Personlig chatthistorik bevaras %{count} dagar."
       flags:
         off_topic: "Det här meddelandet är inte relevant för den aktuella diskussionen enligt kanaltiteln och bör förmodligen flyttas någon annanstans."
         inappropriate: "Detta meddelande innehåller saker som en förnuftig person skulle anse vara stötande, kränkande eller en överträdelse av <a href=\"%{basePath}/guidelines\">vårt forums riktlinjer</a>."
@@ -413,6 +543,33 @@ sv:
         symbols: "Symboler"
         search_placeholder: "Sök efter emojinamn och alias..."
         no_results: "Inga resultat"
+      thread:
+        title: "Rubrik"
+        view_thread: Visa tråd
+        default_title: "Tråd"
+        replies:
+          one: "%{count} svar"
+          other: "%{count} svar"
+        label: Tråd
+        close: "Stäng tråd"
+        original_message:
+          started_by: "Startad av"
+        settings: "Webbplatsinställningar"
+        last_reply: "senaste svar"
+        notifications:
+          regular:
+            title: "Normal"
+            description: "Du aviseras om någon nämner ditt @namn i den här tråden."
+          tracking:
+            title: "Följer"
+            description: "Ett antal nya svar för denna tråd kommer att visas i trådlistan och kanalen. Du aviseras om någon nämner ditt @namn i denna tråd."
+        participants_other_count:
+          one: "+%{count}"
+          other: "+%{count}"
+      threads:
+        open: "Öppna tråd"
+        list: "Pågående diskussioner"
+        none: "Du deltar inte i några trådar i den här kanalen."
       draft_channel_screen:
         header: "Nytt meddelande"
         cancel: "Avbryt"
@@ -457,9 +614,8 @@ sv:
       transcript:
         view: "Visa tidigare meddelandens avskrift"
       types:
-        reviewable_chat_message:
+        chat_reviewable_message:
           title: "Flaggat chattmeddelande"
-          flagged_by: "Flaggat av"
     keyboard_shortcuts_help:
       chat:
         title: "Chatt"
@@ -472,6 +628,7 @@ sv:
           composer_code: "%{shortcut} Kod (endast kompositör)"
           drawer_open: "%{shortcut} Öppna chattmenyn"
           drawer_close: "%{shortcut} Stäng chattmenyn"
+          mark_all_channels_read: "%{shortcut} Markera alla kanaler som lästa"
     topic_statuses:
       chat:
         help: "Chatt är aktiverat för detta ämne"
@@ -490,3 +647,7 @@ sv:
         chat_notifications_with_unread:
           one: "Chattaviseringar - %{count} oläst avisering"
           other: "Chattaviseringar - %{count} olästa aviseringar"
+    styleguide:
+      sections:
+        chat:
+          title: Chatt
diff --git a/plugins/chat/config/locales/client.sw.yml b/plugins/chat/config/locales/client.sw.yml
index eafb4beb24e..784299bcd79 100644
--- a/plugins/chat/config/locales/client.sw.yml
+++ b/plugins/chat/config/locales/client.sw.yml
@@ -20,14 +20,13 @@ sw:
       joined: "alijiunga"
       email_frequency:
         never: "Kamwe"
+      header_indicator_preference:
+        never: "Kamwe"
       flag: "Bendera"
       join: "Jiunge"
+      last_visit: "Mara ya mwisho imetembelewa"
       mention_warning:
         dismiss: "ondosha..."
-        groups:
-          users_limit:
-            one: "Mtumiaji mmoja"
-            other: "%{count} watumiaji"
       reply: "Jibu"
       edit: "Hariri"
       rebake_message: "Tengeneza upya HTML"
@@ -67,11 +66,14 @@ sw:
       composer:
         italic_text: "Maneno yaliyo tiliwa mkazo"
         bold_text: "Maneno yaliyokolezwa"
+        send: "Tuma"
       notification_levels:
         never: "Kamwe"
       settings:
         follow: "Jiunge"
         followed: "Alijiunga"
+        threading_enabled: "Imeruhusiwa"
+        threading_disabled: "Imezuiwa"
         notifications: "Taarifa"
         preview: "Kihakiki"
         save: "Hifadhi"
@@ -99,6 +101,18 @@ sw:
       emoji_picker:
         objects: "Vitu"
         flags: "Bendera"
+      thread:
+        title: "Kichwa cha Habari"
+        replies:
+          one: "%{count} jibu"
+          other: "%{count} majibu"
+        settings: "Mipangilio"
+        last_reply: "jibu la mwisho"
+        notifications:
+          regular:
+            title: "Kawaida"
+          tracking:
+            title: "Fuatilia"
       draft_channel_screen:
         header: "Ujumbe Mpya"
         cancel: "Ghairi"
diff --git a/plugins/chat/config/locales/client.te.yml b/plugins/chat/config/locales/client.te.yml
index 8740839c870..efd4f209866 100644
--- a/plugins/chat/config/locales/client.te.yml
+++ b/plugins/chat/config/locales/client.te.yml
@@ -71,5 +71,11 @@ te:
           title: "ఇప్పటికే ఉన్న విషయానికి జరుపు"
       emoji_picker:
         flags: "కేతనాలు"
+      thread:
+        title: "శీర్షిక"
+        settings: "అమరికలు"
+        notifications:
+          tracking:
+            title: "గమనిస్తున్నారు"
       draft_channel_screen:
         cancel: "రద్దుచేయి"
diff --git a/plugins/chat/config/locales/client.th.yml b/plugins/chat/config/locales/client.th.yml
index 738d06e551f..23ecb93f0cb 100644
--- a/plugins/chat/config/locales/client.th.yml
+++ b/plugins/chat/config/locales/client.th.yml
@@ -21,13 +21,13 @@ th:
       joined: "สมัครสมาชิกเมื่อ"
       email_frequency:
         never: "ไม่เคย"
+      header_indicator_preference:
+        never: "ไม่เคย"
       flag: "ธง"
       join: "เข้าร่วม"
+      last_visit: "เยี่ยมชมครั้งล่าสุด"
       mention_warning:
         dismiss: "ซ่อน"
-        groups:
-          users_limit:
-            other: "%{count} ผู้ใช้"
       reply: "ตอบ"
       edit: "แก้ไข"
       bookmark_message: "บุ๊คมาร์ค"
@@ -67,11 +67,13 @@ th:
       composer:
         italic_text: "ตัวอักษรเอียง"
         bold_text: "ตัวอักษรหนา"
+        send: "ส่ง"
       notification_levels:
         never: "ไม่เคย"
       settings:
         follow: "เข้าร่วม"
         followed: "สมัครสมาชิกเมื่อ"
+        threading_disabled: "ปิดใช้งานแล้ว"
         notifications: "การแจ้งเตือน"
         preview: "แสดงตัวอย่าง"
         save: "บันทึก"
@@ -103,6 +105,17 @@ th:
         activities: "กิจกรรม"
         flags: "ธง"
         symbols: "สัญลักษณ์"
+      thread:
+        title: "ชื่อเรื่อง"
+        replies:
+          other: "%{count} ตอบ"
+        settings: "การตั้งค่า"
+        last_reply: "การตอบล่าสุด"
+        notifications:
+          regular:
+            title: "ปกติ"
+          tracking:
+            title: "ติดตาม"
       draft_channel_screen:
         header: "สร้างข้อความใหม่"
         cancel: "ยกเลิก"
@@ -114,7 +127,3 @@ th:
           fields:
             message:
               label: ข้อความ
-    review:
-      types:
-        reviewable_chat_message:
-          flagged_by: "ถูกปักธงโดย"
diff --git a/plugins/chat/config/locales/client.tr_TR.yml b/plugins/chat/config/locales/client.tr_TR.yml
index 91c50c2c40e..c8f770cfbba 100644
--- a/plugins/chat/config/locales/client.tr_TR.yml
+++ b/plugins/chat/config/locales/client.tr_TR.yml
@@ -15,6 +15,7 @@ tr_TR:
           actions:
             chat_channel_status_change: "Sohbet kanalı durumu değişti"
             chat_channel_delete: "Sohbet kanalı silindi"
+            chat_auto_remove_membership: "Üyelikler kanallardan otomatik olarak kaldırıldı"
       api:
         scopes:
           descriptions:
@@ -39,8 +40,8 @@ tr_TR:
       move_to_channel:
         title: "Mesajları kanala taşı"
         instructions:
-          one: "<strong>%{count}</strong> mesajı taşıyorsunuz. Bir hedef kanal seçin. Bu mesajın taşındığını belirtmek için <strong>%{channelTitle}</strong> adlı kanalda bir yer tutucu mesaj oluşturulacak."
-          other: "<strong>%{count}</strong> mesajı taşıyorsunuz. Bir hedef kanal seçin. Bu mesajın taşındığını belirtmek için <strong>%{channelTitle}</strong> adlı kanalda bir yer tutucu mesaj oluşturulacak."
+          one: "<strong>%{count}</strong> mesajı taşıyorsunuz. Bir hedef kanal seçin. Bu mesajın taşındığını belirtmek için <strong>%{channelTitle}</strong> kanalında bir yer tutucu mesaj oluşturulacak. Yanıt zincirlerinin yeni kanalda korunmayacağını ve eski kanaldaki iletilerin artık taşınan iletilere yanıt veriyormuş gibi görünmeyeceğini unutmayın."
+          other: "<strong>%{count}</strong> mesajı taşıyorsunuz. Bir hedef kanal seçin. Bu mesajın taşındığını belirtmek için <strong>%{channelTitle}</strong> kanalında bir yer tutucu mesaj oluşturulacak. Yanıt zincirlerinin yeni kanalda korunmayacağını ve eski kanaldaki iletilerin artık taşınan iletilere yanıt veriyormuş gibi görünmeyeceğini unutmayın."
         confirm_move: "Mesajları Taşı"
       channel_settings:
         title: "Kanal ayarları"
@@ -71,7 +72,7 @@ tr_TR:
         instructions: "Kanalın kapatılması, personel olmayan kullanıcıların yeni mesaj göndermesini veya mevcut mesajları düzenlemesini engeller. Bu kanalı kapatmak istediğinizden emin misiniz?"
       channel_delete:
         title: "Kanalı Sil"
-        instructions: "<p> <strong>%{name}</strong> adlı kanalı ve sohbet geçmişini siler. Tepkiler ve yüklemeler gibi tüm mesajlar ve ilgili veriler kalıcı olarak silinir. Kanal geçmişini korumak ve kullanımdan kaldırmak istiyorsanız bunun yerine kanalı arşivlemek isteyebilirsiniz.</p> <p> Kanalı <strong>kalıcı olarak silmek</strong> istediğinizden emin misiniz? Onaylamak için aşağıdaki kutuya kanalın adını yazın.</p>"
+        instructions: "<p><strong>%{name}</strong> kanalını ve sohbet geçmişini siler. Tepkiler ve yüklemeler gibi tüm mesajlar ve ilgili veriler kalıcı olarak silinecektir. Kanal geçmişini korumak ve devre dışı bırakmak istiyorsanız, bunun yerine kanalı arşivlemek isteyebilirsiniz.</p> <p>Kanalı <strong>kalıcı olarak silmek</strong> istediğinizden emin misiniz? Onaylamak için aşağıdaki kutuya kanalın adını yazın.</p>"
         confirm: "Sonuçları anlıyorum, kanalı sil"
         confirm_channel_name: "Kanal adı girin"
         process_started: "Kanalı silme işlemi başladı. Bu mod kısa bir süre sonra kapanacak, silinen kanalı artık hiçbir yerde görmeyeceksiniz."
@@ -81,8 +82,11 @@ tr_TR:
       click_to_join: "Mevcut kanalları görüntülemek için buraya tıklayın."
       close: "Kapat"
       collapse: "Sohbet Çekmecesini Daralt"
+      expand: "Sohbet Çekmecesini Genişlet"
       confirm_flag: "%{username} adlı kullanıcının mesajına bayrak eklemek istediğinizden emin misiniz?"
-      deleted: "Bir mesaj silindi. [görüntüleyin]"
+      deleted:
+        one: "Bir mesaj silindi. [görüntüleyin]"
+        other: "%{count} mesaj silindi. [tümünü görüntüle]"
       hidden: "Bir mesaj gizlendi. [görüntüleyin]"
       delete: "Sil"
       edited: "düzenlendi"
@@ -97,6 +101,11 @@ tr_TR:
         never: "Asla"
         title: "E-posta Bildirimleri"
         when_away: "Sadece uzaktayken"
+      header_indicator_preference:
+        title: "Etkinlik göstergesini başlıkta göster"
+        all_new: "Tüm Yeni Mesajlar"
+        dm_and_mentions: "Direkt Mesajlar ve Bahsetmeler"
+        never: "Asla"
       enable: "Sohbeti etkinleştir"
       flag: "Bayrak ekle"
       emoji: "Emoji ekle"
@@ -106,53 +115,111 @@ tr_TR:
       in_reply_to: "Şuna yanıt olarak:"
       heading: "Sohbet"
       join: "Katıl"
-      new_messages: "yeni mesajlar"
+      last_visit: "son ziyaret"
+      summarization:
+        title: "Mesajları özetle"
+        description: "İstediğiniz zaman diliminde gönderilen görüşmeyi özetlemek için aşağıdaki seçeneklerden birini belirleyin."
+        summarize: "Özetle"
+        since:
+          one: "Son bir saat"
+          other: "Son %{count} saat"
       mention_warning:
         dismiss: "kapat"
-        cannot_see:
-          one: "%{username} bu kanala erişemiyor ve bildirim almadı."
-          other: "%{username} ve %{others} bu kanala erişemiyor ve bildirim almadı."
+        cannot_see: "%{username} bu kanala erişemiyor ve bilgilendirilmedi."
+        cannot_see_multiple:
+          one: "%{username} ve diğer %{count} kullanıcı bu kanala erişemiyor ve bilgilendirilmediler."
+          other: "%{username} ve diğer %{count} kullanıcı bu kanala erişemiyor ve bilgilendirilmediler."
         invitations_sent:
           one: "Davet gönderildi"
           other: "Davet gönderildi"
         invite: "Kanala davet et"
-        without_membership:
-          one: "%{username} bu kanala katılmadı."
-          other: "%{username} ve %{others} bu kanala katılmadı."
-        group_mentions_disabled:
-          one: "%{group_name} bahsetmeye izin vermiyor"
-          other: "%{group_name} ve %{others} bahsetmeye izin vermiyor"
-        too_many_members:
-          one: "%{group_name} çok fazla üyeye sahip. Kimseye bildirim gönderilmedi"
-          other: "%{group_name} ve %{others} çok fazla üyeye sahip. Kimseye bildirim gönderilmedi"
-        warning_multiple:
-          one: "%{count} tane daha"
-          other: "%{count} tane daha"
+        without_membership: "%{username} bu kanala katılmadı."
+        without_membership_multiple:
+          one: "%{username} ve diğer %{count} kullanıcı bu kanala katılmadı."
+          other: "%{username} ve diğer %{count} kullanıcı bu kanala katılmadı."
+        group_mentions_disabled: "%{group_name} bahsetmeye izin vermiyor."
+        group_mentions_disabled_multiple:
+          one: "%{group_name} ve diğer %{count} grup bahsetmeye izin vermiyor."
+          other: "%{group_name} ve diğer %{count} grup bahsetmeye izin vermiyor."
+        too_many_members: "%{group_name} çok fazla üyeye sahip. Kimseye bildirim gönderilmedi."
+        too_many_members_multiple:
+          one: "%{group_name} ve diğer %{count} grubun çok fazla üyesi var. Kimse bilgilendirilmedi."
+          other: "%{group_name} ve diğer %{count} grubun çok fazla üyesi var. Kimse bilgilendirilmedi."
         groups:
           header:
             some: "Bazı kullanıcılara bildirim gönderilmeyecek"
             all: "Kimseye bildirim gönderilmeyecek"
-          unreachable:
-            one: "@%{group} bahsetmeye izin vermiyor"
-            other: "@%{group} ve @%{group_2} bahsetmeye izin vermiyor"
-          unreachable_multiple: "@%{group} ve %{count} grup daha bahsetmeye izin vermiyor"
-          too_many_members:
-            one: "@%{group} adlı gruptan bahsetmek %{limit} %{notification_limit} değerini aşıyor"
-            other: "Hem @%{group} hem de @%{group_2} adlı gruplardan bahsetmek %{limit} %{notification_limit} değerini aşıyor"
-          too_many_members_multiple: "Bu %{count} grup %{limit} %{notification_limit} değerini aşıyor."
-          users_limit:
-            one: "%{count} kullanıcı"
-            other: "%{count} kullanıcı"
-          notification_limit: "bildirim limiti"
-        too_many_mentions: "Bu mesaj, %{limit} %{notification_limit} değerini aşıyor"
-        mentions_limit:
-          one: "%{count} bahsetme"
-          other: "%{count} bahsetme"
+          unreachable_1: "@%{group} bahsetmeye izin vermiyor."
+          unreachable_2: "@%{group1} ve @%{group2} bahsetmeye izin vermiyor."
+          unreachable_multiple:
+            one: "@%{group} ve diğer %{count} grup bahsetmeye izin vermiyor."
+            other: "@%{group} ve diğer %{count} grup bahsetmeye izin vermiyor."
+          too_many_members_MF: |
+            { groupCount, plural,
+                 =1 {
+                      { isAdmin, select,
+                        true {
+                          { notificationLimit, plural,
+                              one {@{group1} adlı gruptan bahsetmek # kullanıcının <a href="{siteSettingUrl}" target="_blank">bildirim limitini</a> aşıyor.}
+                              other {@{group1} adlı gruptan bahsetmek # kullanıcının <a href="{siteSettingUrl}" target="_blank"> bildirim limitini </a> aşıyor.}
+                          }
+                        }
+                        false {
+                          { notificationLimit, plural,
+                              one {@{group1} adlı gruptan bahsetmek # kullanıcının bildirim limitini aşıyor.}
+                              other {@{group1} adlı gruptan bahsetmek # kullanıcının bildirim limitini aşıyor.}
+                          }
+                        }
+                        other {}
+                      }
+                    }
+                 =2 {
+                      { isAdmin, select,
+                        true {
+                          { notificationLimit, plural,
+                              one {@{group1} ve @{group2} adlı gruplardan bahsetmek # kullanıcının <a href="{siteSettingUrl}" target="_blank"> bildirim limitini </a> aşıyor.}
+                            other {@{group1} ve @{group2} adlı gruplardan bahsetmek # kullanıcının <a href="{siteSettingUrl}" target="_blank"> bildirim limitini </a> aşıyor.}
+                          }
+                        }
+                        false {
+                          { notificationLimit, plural,
+                              one {@{group1} ve @{group2} adlı gruplardan bahsetmek # kullanıcının bildirim limitini aşıyor.}
+                            other {@{group1} ve @{group2} adlı gruplardan bahsetmek # kullanıcının bildirim limitini aşıyor.}
+                          }
+                        }
+                        other {}
+                      }
+                    }
+              other {
+                      { isAdmin, select,
+                        true {
+                          { notificationLimit, plural,
+                              one {Bu {groupCount} gruptan bahsetmek # kullanıcının <a href="{siteSettingUrl}" target="_blank">bildirim limitini</a> aşıyor.}
+                            other {Bu {groupCount} gruptan bahsetmek # kullanıcının <a href="{siteSettingUrl}" target="_blank"> bildirim limitini </a> aşıyor.}
+                          }
+                        }
+                        false {
+                          { notificationLimit, plural,
+                              one {Bu {groupCount} gruptan bahsetmek # kullanıcının bildirim limitini aşıyor.}
+                            other {Bu {groupCount} gruptan bahsetmek # kullanıcının bildirim limitini aşıyor.}
+                          }
+                        }
+                        other {}
+                      }
+                    }
+            }
+        too_many_mentions:
+          one: "Bu mesaj, %{count} bahsetme bildirim sınırını aşıyor."
+          other: "Bu mesaj, %{count} bahsetme bildirim sınırını aşıyor."
+        too_many_mentions_admin:
+          one: 'Bu mesaj, %{count} bahsin <a href="%{siteSettingUrl}" target="_blank">bildirim sınırını</a> aşıyor.'
+          other: 'Bu mesaj, %{count} bahsin <a href="%{siteSettingUrl}" target="_blank">bildirim sınırını</a> aşıyor.'
       aria_roles:
         header: "Sohbet başlığı"
         composer: "Sohbet oluşturucu"
         channels_list: "Sohbet kanalları listesi"
       no_public_channels: "Hiçbir kanala katılmadınız."
+      kicked_from_channel: "Artık bu kanala erişemezsiniz."
       only_chat_push_notifications:
         title: "Yalnızca sohbet anlık bildirimleri gönder"
         description: "Tüm sohbet dışı anlık bildirimlerinin gönderilmesini engelle"
@@ -164,10 +231,16 @@ tr_TR:
       close_full_page: "Tam ekran sohbeti kapat"
       open_message: "Mesajı sohbette aç"
       placeholder_self: "Bir şeyler not edin"
-      placeholder_others: "%{messageRecipient} ile sohbet et"
-      placeholder_new_message_disallowed: "Kanal %{status}, şu anda yeni mesaj gönderemezsiniz."
+      placeholder_channel: "%{channelName} kanalında sohbet et"
+      placeholder_thread: "Konuda sohbet et"
+      placeholder_users: "%{commaSeparatedNames} ile sohbet et"
+      placeholder_new_message_disallowed:
+        archived: "Kanal arşivlendi, şu anda yeni mesaj gönderemezsiniz."
+        closed: "Kanal kapalı, şu anda yeni mesaj gönderemezsiniz."
+        read_only: "Kanal salt okunurdur, şu anda yeni mesaj gönderemezsiniz."
       placeholder_silenced: "Şu anda mesaj gönderemezsiniz."
-      placeholder_start_conversation: '%{usernames} ile bir konuşma başlat'
+      placeholder_start_conversation: "Şu kişi ile bir sohbet başlatın:"
+      placeholder_start_conversation_users: "%{commaSeparatedUsernames} ile bir konuşma başlat"
       remove_upload: "Dosyayı kaldır"
       react: "Emoji ile tepki ver"
       reply: "Yanıtla"
@@ -183,8 +256,11 @@ tr_TR:
       restore: "Silinen mesajı geri yükle"
       save: "Kaydet"
       select: "Seç"
-      silence: "Kullanıcıyı sustur"
       return_to_list: "Kanal listesine dön"
+      return_to_threads_list: "Devam eden tartışmalara dön"
+      unread_threads_count:
+        one: "Henüz okumadığınız %{count} tartışma var"
+        other: "Henüz okumadığınız %{count} tartışma var"
       scroll_to_bottom: "En alta kaydır"
       scroll_to_new_messages: "Yeni mesajlara bak"
       sound:
@@ -196,6 +272,8 @@ tr_TR:
       title: "sohbet"
       title_capitalized: "Sohbet"
       upload: "Dosya ekle"
+      upload_to_channel: "%{title} başlığına yükle"
+      upload_to_thread: "Konuya yükle"
       uploaded_files:
         one: "%{count} dosya"
         other: "%{count} dosya"
@@ -239,10 +317,23 @@ tr_TR:
           about: Hakkında
           members: Üyeler
           settings: Ayarlar
-      channel_edit_name_modal:
-        title: İsmi düzenle
-        input_placeholder: İsim ekle
-        description: Kanalınıza kısa ve açıklayıcı bir isim verin
+      new_message_modal:
+        title: Mesaj gönder
+        add_user_long: <kbd>shift + tıklama</kbd> veya <kbd>shift + enter</kbd><span>@%{username} ekleyin</span>
+        add_user_short: <span>Kullanıcı ekleyin</span>
+        open_channel: <span>Kanal açın</span>
+        default_search_placeholder: "#bir-kanal, @biri veya herhangi bir şey"
+        default_channel_search_placeholder: "#bir-kanal"
+        default_user_search_placeholder: "@biri"
+        user_search_placeholder: "...daha fazla kullanıcı ekleyin"
+        disabled_user: "sohbeti devre dışı bıraktı"
+        no_items: "Öge yok"
+      channel_edit_name_slug_modal:
+        title: Kanalı düzenle
+        input_placeholder: Bir isim ekle
+        slug_description: URL'de kanal adı yerine bir kanal bilgisi kullanılmış
+        name: Kanal adı
+        slug: Kanal slug (isteğe bağlı)
       channel_edit_description_modal:
         title: Açıklamayı düzenle
         input_placeholder: Açıklama ekle
@@ -252,9 +343,6 @@ tr_TR:
         prefix: "Kime:"
         no_results: Sonuç yok
         selected_user_title: "%{username} seçimini kaldır"
-      channel_selector:
-        title: "Kanala atla"
-        no_channels: "Aramanızla eşleşen kanal yok"
       channel:
         no_memberships: Bu kanalda üye yok
         no_memberships_found: Üye bulunamadı
@@ -262,23 +350,44 @@ tr_TR:
           one: "%{count} üye"
           other: "%{count} üye"
       create_channel:
+        threading:
+          label: "İleti dizisine izin ver"
         auto_join_users:
           public_category_warning: "%{category} herkese açık bir kategori. Son zamanlarda aktif olan tüm kullanıcılar bu kanala otomatik olarak eklensin mi?"
-          warning_groups:
-            one: '%{group} grubundaki %{members_count} kullanıcı otomatik olarak eklensin mi?'
-            other: '%{group} ve %{group_2} gruplarındaki %{members_count} kullanıcı otomatik olarak eklensin mi?'
-          warning_multiple_groups: '%{group_1} ve %{count} diğer gruptaki %{members_count} kullanıcı otomatik olarak eklensin mi?'
+          warning_1_group:
+            one: "%{group} grubundan %{count} kullanıcı otomatik olarak eklensin mi?"
+            other: "%{group} grubundan %{count} kullanıcı otomatik olarak eklensin mi?"
+          warning_2_groups:
+            one: "%{group1} ve %{group2} gruplarından %{count} kullanıcı otomatik olarak eklensin mi?"
+            other: "%{group1} ve %{group2} gruplarından %{count} kullanıcı otomatik olarak eklensin mi?"
+          warning_multiple_groups_MF: |
+            { groupCount, plural,
+                one {
+                      { userCount, plural,
+                          one {{groupName} ve {groupCount} gruptan daha {userCount} kullanıcı otomatik olarak eklensin mi?}
+                        other {{groupName} ve {groupCount} gruptan daha {userCount} kullanıcı otomatik olarak eklensin mi?}
+                      }
+                    }
+              other {
+                      { userCount, plural,
+                          one {{groupName} ve {groupCount} gruptan daha {userCount} kullanıcı otomatik olarak eklensin mi?}
+                        other {{groupName} ve {groupCount} gruptan daha {userCount} kullanıcı otomatik olarak eklensin mi?}
+                      }
+                    }
+            }
         choose_category:
           label: "Kategori seçin"
           none: "birini seçin..."
           default_hint: <a href=%{link} target="_blank">%{category} güvenlik ayarlarını</a> ziyaret ederek erişimi yönetin
-          hint_groups:
-            one: '%{hint} ögesindeki kullanıcılar <a href=%{link} target="_blank">güvenlik ayarlarına</a> göre bu kanala erişebilirler'
-            other: '%{hint} ve %{hint_2} ögesindeki kullanıcılar <a href=%{link} target="_blank">güvenlik ayarlarına</a> göre bu kanala erişebilirler'
-          hint_multiple_groups: '%{hint_1} ve %{count} diğer gruptaki kullanıcılar <a href=%{link} target="_blank">güvenlik ayarlarına</a> göre bu kanala erişebilirler'
+          hint_1_group: '%{group} içindeki kullanıcılar <a href="%{settingLink}" target="_blank">güvenlik ayarlarına</a> göre bu kanala erişebilecek'
+          hint_2_groups: '%{group1} ve %{group2} içindeki kullanıcıların <a href="%{settingLink}" target="_blank">güvenlik ayarları</a> uyarınca bu kanala erişimi olacak'
+          hint_multiple_groups:
+            one: '%{group} ve diğer %{count} gruptaki kullanıcılar, <a href="%{settingLink}" target="_blank">güvenlik ayarlarına</a> göre bu kanala erişebilecek'
+            other: '%{group} ve diğer %{count} gruptaki kullanıcılar, <a href="%{settingLink}" target="_blank">güvenlik ayarlarına</a> göre bu kanala erişebilecek'
         create: "Kanal oluştur"
         description: "Açıklama (isteğe bağlı)"
         name: "Kanal adı"
+        slug: "Kanal slug (isteğe bağlı)"
         title: "Yeni kanal"
         type: "Tür"
         types:
@@ -288,15 +397,22 @@ tr_TR:
         type: "Sohbet mesajı"
       reactions:
         only_you: ":%{emoji}: ile tepki verdiniz"
-        and_others: "Siz, %{usernames} :%{emoji}: ile tepki verdiniz"
-        only_others: "%{usernames} :%{emoji}: ile tepki verdi"
-        others_and_more: "%{usernames} ve %{more} kişi daha :%{emoji}: ile tepki verdi"
-        you_others_and_more: "Siz, %{usernames} ve %{more} kişi daha :%{emoji}: ile tepki verdiniz"
+        you_and_single_user: "Siz ve %{username}, :%{emoji} ile tepki verdiniz:"
+        you_and_multiple_users: "Siz, %{commaSeparatedUsernames} ve %{username}, :%{emoji} ile tepki gösterdiniz:"
+        you_multiple_users_and_more:
+          one: "Siz, %{commaSeparatedUsernames} ve %{count} kişi daha :%{emoji}: ile tepki verdiniz"
+          other: "Siz, %{commaSeparatedUsernames} ve %{count} kişi daha :%{emoji}: ile tepki verdiniz"
+        single_user: "%{username} :%{emoji}: ile tepki verdi"
+        multiple_users: "%{commaSeparatedUsernames} ve %{username}, :%{emoji} ile tepki gösterdi:"
+        multiple_users_and_more:
+          one: "%{commaSeparatedUsernames} ve %{count} kişi daha :%{emoji}: ile tepki verdi"
+          other: "%{commaSeparatedUsernames} ve %{count} kişi daha :%{emoji}: ile tepki verdi"
       composer:
         toggle_toolbar: "Araç çubuğunu aç/kapat"
         italic_text: "vurgulanan yazı"
         bold_text: "güçlü metin"
         code_text: "kod metni"
+        send: "Gönder"
       quote:
         original_channel: 'İlk olarak <a href="%{channelLink}">%{channel}</a> adlı kanalda gönderildi'
         copy_success: "Sohbet alıntısı panoya kopyalandı"
@@ -307,15 +423,19 @@ tr_TR:
       settings:
         channel_wide_mentions_label: "@all ve @here bahsetmelerine izin ver"
         channel_wide_mentions_description: "Kullanıcıların @all ile #%{channel} kanalının tüm üyelerine veya @here ile yalnızca o anda aktif olanlara bildirim göndermelerine izin verin"
+        channel_threading_label: "İleti dizisi"
+        channel_threading_description: "İleti dizisi etkinleştirildiğinde, bir sohbet mesajına verilen yanıtlar, ana kanalın yanında yer alacak ayrı bir konuşma oluşturur."
         auto_join_users_label: "Kullanıcıları otomatik olarak ekle"
-        auto_join_users_info: "Son 3 ayda hangi kullanıcıların aktif olduğunu saatlik olarak kontrol edin ve %{category} adlı kategoriye erişimleri varsa bu kanala ekleyin."
-        enable_auto_join_users: "Son zamanlarda aktif olan tüm kullanıcıları otomatik olarak ekle"
+        auto_join_users_info: "Son 3 ayda hangi kullanıcıların aktif olduğunu saatlik olarak kontrol edin. %{category} kategorisine erişimleri varsa onları bu kanala ekleyin."
+        auto_join_users_info_no_category: "Son 3 ayda hangi kullanıcıların aktif olduğunu saatlik olarak kontrol edin. Seçilen kategoriye erişimleri varsa onları bu kanala ekleyin."
         auto_join_users_warning: "Bu kanala üye olmayan ve %{category} adlı kategoriye erişimi olan her kullanıcı katılacak. Emin misiniz?"
         desktop_notification_level: "Masaüstü bildirimleri"
         follow: "Katıl"
         followed: "Katıldı"
         mobile_notification_level: "Mobil anlık bildirimleri"
         mute: "Kanalı sessize al"
+        threading_enabled: "Etkin mi"
+        threading_disabled: "Devre Dışı"
         muted_on: "Açık"
         muted_off: "Kapalı"
         notifications: "Bildirimler"
@@ -324,9 +444,13 @@ tr_TR:
         saved: "Kaydedildi"
         unfollow: "Ayrıl"
         admin_title: "Yönetici"
-        retention_info: "Sohbet geçmişi %{days} gün boyunca kaydedilecek."
       admin:
         title: "Sohbet"
+        export_messages:
+          title: "Sohbet mesajlarını dışa aktar"
+          description: "Dışa aktarma şu anda son 6 aydaki en son 10.000 mesajla sınırlıdır."
+          create_export: "Dışa aktarma oluştur"
+          export_has_started: "Dışa aktarım başladı. Hazır olduğunda bir PM alacaksınız."
       direct_messages:
         title: "Kişisel sohbet"
         new: "Kişisel sohbet oluşturun"
@@ -390,8 +514,14 @@ tr_TR:
           one: "%{commaSeparatedUsernames} ve %{count} kişi daha yazıyor"
           other: "%{commaSeparatedUsernames} ve %{count} kişi daha yazıyor"
       retention_reminders:
-        public: "Kanal geçmişi %{days} gün boyunca saklanır."
-        dm: "Kişisel sohbet geçmişi %{days} gün boyunca saklanır."
+        public_none: "Kanal geçmişi süresiz olarak saklanır."
+        public:
+          one: "Kanal geçmişi %{count} gün boyunca saklanır."
+          other: "Kanal geçmişi %{count} gün boyunca saklanır."
+        dm_none: "Kişisel sohbet geçmişi süresiz olarak saklanır."
+        dm:
+          one: "Kişisel sohbet geçmişi %{count} gün boyunca saklanır."
+          other: "Kişisel sohbet geçmişi %{count} gün boyunca saklanır."
       flags:
         off_topic: "Bu mesaj, kanal başlığı tarafından tanımlanan mevcut tartışma ile ilgili değildir ve muhtemelen başka bir yere taşınmalıdır."
         inappropriate: "Bu mesaj, makul bir kişinin saldırgan, taciz edici veya <a href=\"%{basePath}/guidelines\">topluluk kurallarımızı</a> ihlal ettiğini düşüneceği içerik içeriyor."
@@ -413,6 +543,33 @@ tr_TR:
         symbols: "Semboller"
         search_placeholder: "Emoji adına ve takma ada göre arama yapın..."
         no_results: "Sonuç yok"
+      thread:
+        title: "Başlık"
+        view_thread: Konuyu görüntüle
+        default_title: "Konu"
+        replies:
+          one: "%{count} yanıt"
+          other: "%{count} yanıt"
+        label: Konu
+        close: "Konuyu Kapat"
+        original_message:
+          started_by: "Başlatan"
+        settings: "Ayarlar"
+        last_reply: "son yanıt"
+        notifications:
+          regular:
+            title: "Normal"
+            description: "Birisi bu başlıkta sizden bahsederse bilgilendirileceksiniz."
+          tracking:
+            title: "Takip Ediliyor"
+            description: "Bu konudaki yeni yanıtların sayısı konu listesinde ve kanalda gösterilecektir. Birisi bu ileti dizisinde sizden bahsederse bilgilendirileceksiniz."
+        participants_other_count:
+          one: "+%{count}"
+          other: "+%{count}"
+      threads:
+        open: "Konu Aç"
+        list: "Devam eden tartışmalar"
+        none: "Bu kanaldaki herhangi bir ileti dizisine katılmamışsınız."
       draft_channel_screen:
         header: "Yeni Mesaj"
         cancel: "İptal et"
@@ -457,9 +614,8 @@ tr_TR:
       transcript:
         view: "Önceki mesajların dökümünü görüntüle"
       types:
-        reviewable_chat_message:
+        chat_reviewable_message:
           title: "Bayrak Eklenen Sohbet Mesajı"
-          flagged_by: "Bayrak Ekleyen Kişi"
     keyboard_shortcuts_help:
       chat:
         title: "Sohbet"
@@ -472,6 +628,7 @@ tr_TR:
           composer_code: "%{shortcut} Kod (yalnızca besteci)"
           drawer_open: "%{shortcut} Sohbet çekmecesini aç"
           drawer_close: "%{shortcut} Sohbet çekmecesini kapat"
+          mark_all_channels_read: "%{shortcut} Tüm kanalları okundu olarak işaretle"
     topic_statuses:
       chat:
         help: "Bu konu için sohbet etkinleştirildi"
@@ -490,3 +647,7 @@ tr_TR:
         chat_notifications_with_unread:
           one: "Sohbet bildirimleri - %{count} okunmamış bildirim"
           other: "Sohbet bildirimleri - %{count} okunmamış bildirim"
+    styleguide:
+      sections:
+        chat:
+          title: Sohbet
diff --git a/plugins/chat/config/locales/client.uk.yml b/plugins/chat/config/locales/client.uk.yml
index 5aaf311cea6..f562d6e10c7 100644
--- a/plugins/chat/config/locales/client.uk.yml
+++ b/plugins/chat/config/locales/client.uk.yml
@@ -15,6 +15,7 @@ uk:
           actions:
             chat_channel_status_change: "Статус каналу чату змінено"
             chat_channel_delete: "Канал чату видалено"
+            chat_auto_remove_membership: "Підписки автоматично видаляються з каналів"
       api:
         scopes:
           descriptions:
@@ -39,10 +40,10 @@ uk:
       move_to_channel:
         title: "Перенести повідомлення в канал"
         instructions:
-          one: "Ви переміщуєте <strong>%{count}</strong> повідомлення. Виберіть канал призначення. Буде створено повідомлення в каналі <strong>%{channelTitle}</strong> про те, що це повідомлення було переміщено."
-          few: "Ви переміщуєте <strong>%{count}</strong> повідомлення. Виберіть канал призначення. Буде створено повідомлення в каналі <strong>%{channelTitle}</strong> про те, що ці повідомлення були переміщені."
-          many: "Ви переміщуєте <strong>%{count}</strong> повідомлень. Виберіть канал призначення. Буде створено повідомлення в каналі <strong>%{channelTitle}</strong> про те, що ці повідомлення були переміщені."
-          other: "Ви переміщуєте <strong>%{count}</strong> повідомлень. Виберіть канал призначення. Буде створено повідомлення в каналі <strong>%{channelTitle}</strong> про те, що ці повідомлення були переміщені."
+          one: "Ви переміщуєте повідомлення <strong>%{count}</strong> . Виберіть канал призначення. У каналі <strong>%{channelTitle}</strong> буде створено повідомлення-заповнювач, яке вказуватиме на те, що це повідомлення було переміщено. Зверніть увагу, що ланцюжки відповідей не будуть збережені в новому каналі, а повідомлення в старому каналі більше не будуть відображатися як відповіді на переміщені повідомлення."
+          few: "Ви переміщуєте <strong>%{count}</strong> повідомлень. Виберіть канал призначення. У каналі <strong>%{channelTitle}</strong> будуть створені повідомлення-заповнювачі, які вказуватимуть на те, що ці повідомлення було переміщено. Зверніть увагу, що ланцюжки відповідей не будуть збережені в новому каналі, а повідомлення в старому каналі більше не будуть відображатися як відповіді на переміщені повідомлення."
+          many: "Ви переміщуєте <strong>%{count}</strong> повідомлень. Виберіть канал призначення. У каналі <strong>%{channelTitle}</strong> будуть створені повідомлення-заповнювачі, які вказуватимуть на те, що ці повідомлення було переміщено. Зверніть увагу, що ланцюжки відповідей не будуть збережені в новому каналі, а повідомлення в старому каналі більше не будуть відображатися як відповіді на переміщені повідомлення."
+          other: "Ви переміщуєте <strong>%{count}</strong> повідомлень. Виберіть канал призначення. У каналі <strong>%{channelTitle}</strong> будуть створені повідомлення-заповнювачі, які вказуватимуть на те, що ці повідомлення було переміщено. Зверніть увагу, що ланцюжки відповідей не будуть збережені в новому каналі, а повідомлення в старому каналі більше не будуть відображатися як відповіді на переміщені повідомлення."
         confirm_move: "Перемістити повідомлення"
       channel_settings:
         title: "Налаштування каналу"
@@ -73,7 +74,7 @@ uk:
         instructions: "Закриття каналу забороняє стороннім користувачам надсилати нові повідомлення або редагувати наявні повідомлення. Ви впевнені, що хочете закрити цей канал?"
       channel_delete:
         title: "Видалити канал"
-        instructions: "<p>Видаляє <strong>%{name}</strong> канал і історію чату. Усі повідомлення та пов'язані з ними дані, такі як реакції та завантаження, будуть остаточно видалені. Якщо ви хочете зберегти історію каналу та вивести її з експлуатації, ви можете заархівувати канал замість цього.</p> <p>Ви впевнені, що хочете <strong>назавжди видалити</strong> канал? Для підтвердження введіть назву каналу в поле нижче.</p>"
+        instructions: "<p>Видаляє канал <strong>%{name}</strong> і історію чату. Усі повідомлення та пов’язані з ними дані, як-от реакції та завантаження, буде остаточно видалено. Якщо ви хочете зберегти історію каналу та вивести його з експлуатації, ви можете натомість заархівувати канал.</p> <p>Ви впевнені, що бажаєте <strong>остаточно видалити</strong> канал? Для підтвердження введіть назву каналу в поле нижче.</p>"
         confirm: "Я розумію наслідки, видаліть канал"
         confirm_channel_name: "Введіть назву каналу"
         process_started: "Процес видалення каналу розпочався. Це спливаюче вікно закриється найближчим часом, ви більше не побачите видалений канал."
@@ -83,8 +84,13 @@ uk:
       click_to_join: "Натисніть тут, щоб переглянути доступні канали."
       close: "Закрити"
       collapse: "Згорнути вікно чату"
+      expand: "Розгорнути вікно чату"
       confirm_flag: "Ви впевнені, що хочете позначити прапором повідомлення %{username}?"
-      deleted: "Повідомлення було видалено. [view]"
+      deleted:
+        one: "Повідомлення було видалено. [view]"
+        few: "%{count} повідомлення видалено. [view all]"
+        many: "%{count} повідомлень видалено. [view all]"
+        other: "%{count} повідомлень видалено. [view all]"
       hidden: "Повідомлення було приховано. [view]"
       delete: "Видалити"
       edited: "відредагований"
@@ -99,6 +105,11 @@ uk:
         never: "Ніколи"
         title: "Сповіщення електронною поштою"
         when_away: "Тільки коли офлайн"
+      header_indicator_preference:
+        title: "Показувати індикатор активності в заголовку"
+        all_new: "Усі нові повідомлення"
+        dm_and_mentions: "Прямі повідомлення та згадки"
+        never: "Ніколи"
       enable: "Увімкнути чат"
       flag: "Поскаржитися"
       emoji: "Вставити емодзі"
@@ -108,68 +119,70 @@ uk:
       in_reply_to: "У відповідь на"
       heading: "Чат"
       join: "Приєднатися"
-      new_messages: "нові повідомлення"
+      last_visit: "останнє відвідування"
+      summarization:
+        title: "Підсумкове повідомлення"
+        description: "Виберіть опцію нижче, щоб підсумувати розмову, надіслану протягом визначеного періоду."
+        summarize: "Підсумок"
+        since:
+          one: "Остання година"
+          few: "Останні %{count} години"
+          many: "Останні %{count} годин"
+          other: "Останні %{count} годин"
       mention_warning:
         dismiss: "відкласти"
-        cannot_see:
-          one: "%{username} не має доступу до цього каналу і не був сповіщений про це."
-          few: "%{username} і ще %{others} інших не мають доступу до цього каналу і не були сповіщені про це."
-          many: "%{username} і ще %{others} інших не мають доступу до цього каналу і не були сповіщені про це."
-          other: "%{username} і ще %{others} інших не мають доступу до цього каналу і не були сповіщені про це."
+        cannot_see: "%{username} не має доступу до цього каналу і не отримав сповіщення."
+        cannot_see_multiple:
+          one: "%{username} і %{count} інший користувач не мають доступу до цього каналу та не отримали сповіщення."
+          few: "%{username} і %{count} інші користувачі не мають доступу до цього каналу та не отримали сповіщення."
+          many: "%{username} та %{count} інших користувачів не мають доступу до цього каналу та не отримали сповіщення."
+          other: "%{username} та %{count} інших користувачів не мають доступу до цього каналу та не отримали сповіщення."
         invite: "Запросити до каналу"
-        without_membership:
-          one: "%{username} не приєднався до цього каналу."
-          few: "%{username} та ще %{others} інших не приєдналися до цього каналу."
-          many: "%{username} та ще %{others} інших не приєдналися до цього каналу."
-          other: "%{username} та ще %{others} інших не приєдналися до цього каналу."
-        group_mentions_disabled:
-          one: "%{group_name} не дозволяє згадувати"
-          few: "%{group_name} та %{others} інших не дозволяє згадувати"
-          many: "%{group_name} та %{others} інших не дозволяє згадувати"
-          other: "%{group_name} та %{others} інших не дозволяє згадувати"
-        too_many_members:
-          one: "%{group_name} має занадто багато членів. Нікого не було повідомлено"
-          few: "%{group_name} і %{others} інших мають занадто багато членів. Нікого не було повідомлено"
-          many: "%{group_name} і %{others} інших не дозволяє згадувати"
-          other: "%{group_name} і %{others} мають забагато учасників. Нікого не повідомили"
-        warning_multiple:
-          one: "%{count} інший"
-          few: "%{count} інших"
-          many: "%{count} інших"
-          other: "%{count} інших"
+        without_membership: "%{username} не приєднався до цього каналу."
+        without_membership_multiple:
+          one: "%{username} і ще %{count} користувач не приєдналися до цього каналу."
+          few: "%{username} і ще %{count} користувачі не приєдналися до цього каналу."
+          many: "%{username} і ще %{count} користувачів не приєдналися до цього каналу."
+          other: "%{username} і ще %{count} користувачів не приєдналися до цього каналу."
+        group_mentions_disabled: "%{group_name} не дозволяє згадки."
+        group_mentions_disabled_multiple:
+          one: "%{group_name} та %{count} інша група забороняють згадки."
+          few: "%{group_name} та %{count} інші групи забороняють згадки."
+          many: "%{group_name} та %{count} інших груп забороняють згадки."
+          other: "%{group_name} та %{count} інших груп забороняють згадки."
+        too_many_members: "%{group_name} має занадто багато учасників. Ніхто не був повідомлений."
+        too_many_members_multiple:
+          one: "%{group_name} та %{count} інша група мають занадто багато членів. Ніхто не був сповіщений."
+          few: "%{group_name} та %{count} інші групи мають занадто багато членів. Ніхто не був сповіщений."
+          many: "%{group_name} та %{count} інших груп мають занадто багато членів. Ніхто не був сповіщений."
+          other: "%{group_name} та %{count} інших груп мають занадто багато членів. Ніхто не був сповіщений."
         groups:
           header:
             some: "Деякі користувачі не отримають сповіщення"
             all: "Ніхто не буде повідомлений"
-          unreachable:
-            one: "@%{group} не дозволяє згадувати"
-            few: "@%{group} та @%{group_2} не дозволяють згадувати"
-            many: "@%{group} та @%{group_2} не дозволяють згадувати"
-            other: "@%{group} та @%{group_2} не дозволяють згадувати"
-          unreachable_multiple: "@%{group} та %{count} інші не дозволяють згадувати"
-          too_many_members:
-            one: "Згадка @%{group} перевищує %{notification_limit} із %{limit}"
-            few: "Згадка @%{group} чи @%{group_2} перевищує %{notification_limit} із %{limit}"
-            many: "Згадка @%{group} чи @%{group_2} перевищує %{notification_limit} із %{limit}"
-            other: "Згадка @%{group} чи @%{group_2} перевищує %{notification_limit} із %{limit}"
-          too_many_members_multiple: "Ці %{count} групи перевищили %{notification_limit} з %{limit}"
-          users_limit:
-            one: "%{count} користувач"
-            few: "%{count} користувача"
-            many: "%{count} користувача"
-            other: "%{count} користувача"
-          notification_limit: "ліміт сповіщень"
-        too_many_mentions: "Це повідомлення перевищує %{notification_limit} з %{limit}"
-        mentions_limit:
-          one: "%{count} згадка"
-          few: "%{count} згадки"
-          many: "%{count} згадок"
-          other: "%{count} згадок"
+          unreachable_1: "@%{group} не дозволяє згадки."
+          unreachable_2: "@%{group1} і @%{group2} не дозволяють згадувати."
+          unreachable_multiple:
+            one: "@%{group} та %{count} інша група забороняють згадки."
+            few: "@%{group} та %{count} інші групи забороняють згадки."
+            many: "@%{group} та %{count} інших груп забороняють згадки."
+            other: "@%{group} та %{count} інших груп забороняють згадки."
+        too_many_mentions:
+          one: "Це повідомлення перевищує ліміт сповіщень у %{count} згадку."
+          few: "Це повідомлення перевищує ліміт сповіщень у %{count} згадки."
+          many: "Це повідомлення перевищує ліміт сповіщень у %{count} згадок."
+          other: "Це повідомлення перевищує ліміт сповіщень у %{count} згадок."
+        too_many_mentions_admin:
+          one: 'Це повідомлення перевищує обмеження <a href="%{siteSettingUrl}" target="_blank">сповіщень</a> із %{count} згадок.'
+          few: 'Це повідомлення перевищує обмеження <a href="%{siteSettingUrl}" target="_blank">сповіщень</a> із %{count} згадок.'
+          many: 'Це повідомлення перевищує обмеження <a href="%{siteSettingUrl}" target="_blank">сповіщень</a> із %{count} згадок.'
+          other: 'Це повідомлення перевищує обмеження <a href="%{siteSettingUrl}" target="_blank">сповіщень</a> із %{count} згадок.'
       aria_roles:
         header: "Заголовок чату"
         composer: "Редактор чату"
         channels_list: "Список каналів чату"
       no_public_channels: "Ви не приєдналися до жодного каналу."
+      kicked_from_channel: "Ви більше не можете отримати доступ до цього каналу."
       only_chat_push_notifications:
         title: "Надсилати лише push-сповіщення в чаті"
         description: "Заблокувати всі push-сповіщення, не пов’язані з чатом"
@@ -181,10 +194,16 @@ uk:
       close_full_page: "Закрити повноекранний чат"
       open_message: "Відкрити повідомлення в чаті"
       placeholder_self: "Запишіть щось"
-      placeholder_others: "Чат з %{messageRecipient}"
-      placeholder_new_message_disallowed: "Канал %{status}, зараз ви не можете надсилати нові повідомлення."
+      placeholder_channel: "Чат в %{channelName}"
+      placeholder_thread: "Чат в гілці"
+      placeholder_users: "Чат з %{commaSeparatedNames}"
+      placeholder_new_message_disallowed:
+        archived: "Канал заархівований, зараз ви не можете надсилати нові повідомлення."
+        closed: "Канал закритий, зараз ви не можете надсилати нові повідомлення."
+        read_only: "Канал доступний лише для читання, зараз ви не можете надсилати нові повідомлення."
       placeholder_silenced: "В даний момент ви не можете надсилати повідомлення."
-      placeholder_start_conversation: Почати розмову з %{usernames}
+      placeholder_start_conversation: "Почніть розмову з..."
+      placeholder_start_conversation_users: "Почніть розмову з %{commaSeparatedUsernames}"
       remove_upload: "Видалити файл"
       react: "Реагувати з emoji"
       reply: "Відповідь"
@@ -200,8 +219,13 @@ uk:
       restore: "Відновити видалене повідомлення"
       save: "Зберегти"
       select: "Вибрати"
-      silence: "Заблокувати користувача"
       return_to_list: "Повернутися до списку каналів"
+      return_to_threads_list: "Повернутися до поточних дискусій"
+      unread_threads_count:
+        one: "У вас %{count} непрочитане обговорення"
+        few: "У вас %{count} непрочитаних обговорень"
+        many: "У вас %{count} непрочитані обговорення"
+        other: "У вас %{count} непрочитані обговорення"
       scroll_to_bottom: "Прокрутити вниз"
       scroll_to_new_messages: "Переглянути нові повідомлення"
       sound:
@@ -213,6 +237,8 @@ uk:
       title: "чат"
       title_capitalized: "Чат"
       upload: "Прикріпити файл"
+      upload_to_channel: "Завантажити до %{title}"
+      upload_to_thread: "Завантажити в гілку"
       uploaded_files:
         one: "%{count} файл"
         few: "%{count} файли"
@@ -258,10 +284,23 @@ uk:
           about: Про
           members: Учасники
           settings: Налаштування
-      channel_edit_name_modal:
-        title: Редагувати назву
+      new_message_modal:
+        title: Надіслати повідомлення
+        add_user_long: <kbd>shift + click</kbd> or <kbd>shift + enter</kbd><span>Додати @%{username}</span>
+        add_user_short: <span>Додати користувача</span>
+        open_channel: <span>Відкрити канал</span>
+        default_search_placeholder: "#канал, @хтось або щось"
+        default_channel_search_placeholder: "#канал"
+        default_user_search_placeholder: "@хтось"
+        user_search_placeholder: "...додати більше користувачів"
+        disabled_user: "вимкнув чат"
+        no_items: "Немає елементів"
+      channel_edit_name_slug_modal:
+        title: Редагувати канал
         input_placeholder: Додайте назву
-        description: Дайте своєму каналу коротку описову назву
+        slug_description: Замість назви каналу в URL-адресі використовується slug каналу
+        name: Назва каналу
+        slug: Slug каналу (опціонально)
       channel_edit_description_modal:
         title: Редагувати опис
         input_placeholder: Додати опис
@@ -271,9 +310,6 @@ uk:
         prefix: "До:"
         no_results: Немає результатів
         selected_user_title: "Зніміть позначку з %{username}"
-      channel_selector:
-        title: "Перейти на канал"
-        no_channels: "Немає каналів, які відповідають вашому запиту"
       channel:
         no_memberships: Цей канал не має учасників
         no_memberships_found: Учасників не знайдено
@@ -283,20 +319,69 @@ uk:
           many: "%{count} учасників"
           other: "%{count} учасників"
       create_channel:
+        threading:
+          label: "Увімкнути потоки/ланцюжки"
         auto_join_users:
           public_category_warning: "%{category} є публічною категорією. Автоматично додавати всіх нещодавно активних користувачів до цього каналу?"
-          warning_groups:
-            one: Автоматично додати %{members_count} користувача з %{group}?
-            few: Автоматично додати %{members_count} користувачі з %{group}?
-            many: Автоматично додати %{members_count} користувачів з %{group}?
-            other: Автоматично додати %{members_count} користувачів з %{group} та %{group_2}?
-          warning_multiple_groups: Автоматично додавати %{members_count} користувачів з %{group_1} і %{count} інших?
+          warning_1_group:
+            one: "Автоматично додати %{count} користувача з %{group}?"
+            few: "Автоматично додати %{count} користувачі із %{group}?"
+            many: "Автоматично додати %{count} користувачів із %{group}?"
+            other: "Автоматично додати %{count} користувачів із %{group}?"
+          warning_2_groups:
+            one: "Автоматично додати %{count} користувача з %{group1} та %{group2}?"
+            few: "Автоматично додати %{count} користувачі з %{group1} та %{group2}?"
+            many: "Автоматично додати %{count} користувачів з %{group1} та %{group2}?"
+            other: "Автоматично додати %{count} користувачів з %{group1} та %{group2}?"
+          warning_multiple_groups_MF: |
+            { groupCount, plural,
+                one {
+                      { userCount, plural,
+                          one {Автоматично додавати {userCount} користувача з {groupName} і {groupCount} інших груп?}
+                          few {Автоматично додавати {userCount} користувачі з {groupName} і {groupCount} інших груп?}
+                          many {Автоматично додавати {userCount} користувачів з {groupName} і {groupCount} інших груп?}
+                          other {Автоматично додавати {userCount} користувачів з {groupName} і {groupCount} інших груп?}
+                      }
+                    }
+              few {
+                      { userCount, plural,
+                          one {Автоматично додавати {userCount} користувача із {groupName} і {groupCount} інші групи?}
+                          few {Автоматично додавати {userCount} користувачі з {groupName} і {groupCount} інші групи?}
+                          many {Автоматично додавати {userCount} користувачів з {groupName} і {groupCount} інші групи?}
+                          other {Автоматично додавати {userCount} користувачів з {groupName} і {groupCount} інші групи?}
+                      }
+                    }
+                many {
+                      { userCount, plural,
+                          one {Автоматично додавати {userCount} користувача із {groupName} і {groupCount} інших груп?}
+                          few {Автоматично додавати {userCount} користувачі із {groupName} і {groupCount} інших груп?}
+                          many {Автоматично додавати {userCount} користувачів із {groupName} і {groupCount} інших груп?}
+                          other {Автоматично додавати {userCount} користувачів із {groupName} і {groupCount} інших груп?}
+                      }
+                    }
+              other {
+                      { userCount, plural,
+                          one {Автоматично додавати {userCount} користувача із {groupName} і {groupCount} інших груп?}
+                          few {Автоматично додавати {userCount} користувачі із {groupName} і {groupCount} інших груп?}
+                          many {Автоматично додавати {userCount} користувачів із {groupName} і {groupCount} інших груп?}
+                          other {Автоматично додавати {userCount} користувачів із {groupName} і {groupCount} інших груп?}
+                      }
+                    }
+            }
         choose_category:
           label: "Оберіть категорію"
           none: "виберіть..."
+          hint_1_group: 'Користувачі в %{group} матимуть доступ до цього каналу відповідно до <a href="%{settingLink}" target="_blank">налаштувань безпеки</a>'
+          hint_2_groups: 'Користувачі в %{group1} і %{group2} матимуть доступ до цього каналу відповідно до <a href="%{settingLink}" target="_blank">параметрів безпеки</a>'
+          hint_multiple_groups:
+            one: 'Користувачі в %{group} і %{count} іншій групі матимуть доступ до цього каналу відповідно до <a href="%{settingLink}" target="_blank">налаштувань безпеки</a>'
+            few: 'Користувачі в %{group} і %{count} інших групах матимуть доступ до цього каналу відповідно до <a href="%{settingLink}" target="_blank">налаштувань безпеки</a>'
+            many: 'Користувачі в %{group} і %{count} інших групах матимуть доступ до цього каналу відповідно до <a href="%{settingLink}" target="_blank">налаштувань безпеки</a>'
+            other: 'Користувачі в %{group} і %{count} інших групах матимуть доступ до цього каналу відповідно до <a href="%{settingLink}" target="_blank">налаштувань безпеки</a>'
         create: "Створити канал"
         description: "Опис (необов'язково)"
         name: "Назва каналу"
+        slug: "Slug каналу (опціонально)"
         title: "Новий канал"
         type: "Тип"
         types:
@@ -306,15 +391,26 @@ uk:
         type: "Повідомлення чату"
       reactions:
         only_you: "Ви відреагували :%{emoji}:"
-        and_others: "Ви та %{usernames} відреагували :%{emoji}:"
-        only_others: "%{usernames} відреагував :%{emoji}:"
-        others_and_more: "%{usernames} і ще %{more} відреагували :%{emoji}:"
-        you_others_and_more: "Ви, %{usernames} та %{more} інших відреагували :%{emoji}:"
+        you_and_single_user: "Ви та %{username} відреагували :%{emoji}:"
+        you_and_multiple_users: "Ви, %{commaSeparatedUsernames} і %{username} відреагували :%{emoji}:"
+        you_multiple_users_and_more:
+          one: "Ви, %{commaSeparatedUsernames} та %{count} інший відреагували:%{emoji}:"
+          few: "Ви, %{commaSeparatedUsernames} та %{count} інших відреагували:%{emoji}:"
+          many: "Ви, %{commaSeparatedUsernames} та %{count} інших відреагували:%{emoji}:"
+          other: "Ви, %{commaSeparatedUsernames} та %{count} інших відреагували:%{emoji}:"
+        single_user: "%{username} відреагував:%{emoji}:"
+        multiple_users: "%{commaSeparatedUsernames} і %{username} відреагували:%{emoji}:"
+        multiple_users_and_more:
+          one: "%{commaSeparatedUsernames} і ще %{count} відреагували :%{emoji}:"
+          few: "%{commaSeparatedUsernames} і ще %{count} відреагували :%{emoji}:"
+          many: "%{commaSeparatedUsernames} і ще %{count} відреагували :%{emoji}:"
+          other: "%{commaSeparatedUsernames} і ще %{count} відреагували :%{emoji}:"
       composer:
         toggle_toolbar: "Перемикання панелі інструментів"
         italic_text: "виділення тексту курсивом"
         bold_text: "Сильне виділення тексту"
         code_text: "текст коду"
+        send: "Надіслати"
       quote:
         original_channel: 'Спочатку надіслано в <a href="%{channelLink}">%{channel}</a>'
         copy_success: "Цитату чату скопійовано в буфер обміну"
@@ -325,15 +421,19 @@ uk:
       settings:
         channel_wide_mentions_label: "Дозволити згадки @all та @here"
         channel_wide_mentions_description: "Дозволити користувачам сповіщати всіх учасників #%{channel} за допомогою @all або лише тих, хто активний на даний момент, за допомогою @here"
+        channel_threading_label: "Потоки/ланцюжки"
+        channel_threading_description: "Якщо ланцюжки увімкнено, відповіді на повідомлення чату створюватимуть окрему бесіду, яка існуватиме поряд з основним каналом."
         auto_join_users_label: "Автоматично додавати користувачів"
-        auto_join_users_info: "Щогодини перевіряйте, які користувачі були активними протягом останніх 3 місяців, і, якщо вони мають доступ до категорії %{category} , додайте їх до цього каналу."
-        enable_auto_join_users: "Автоматично додавати всіх нещодавно активних користувачів"
+        auto_join_users_info: "Перевіряйте погодинно, які користувачі були активними протягом останніх 3 місяців. Додайте їх до цього каналу, якщо вони мають доступ до категорії %{category}."
+        auto_join_users_info_no_category: "Погодинно перевіряйте, які користувачі були активними протягом останніх 3 місяців. Додайте їх до цього каналу, якщо вони мають доступ до обраної категорії."
         auto_join_users_warning: "Кожен користувач, який не є учасником цього каналу і має доступ до категорії %{category} , приєднається до нього. Ви впевнені?"
         desktop_notification_level: "Сповіщення на робочому столі"
         follow: "Приєднатися"
         followed: "Приєднався(лась)"
         mobile_notification_level: "Мобільні push-сповіщення"
         mute: "Вимкнути канал"
+        threading_enabled: "Включено"
+        threading_disabled: "Вимкнено"
         muted_on: "Увімк"
         muted_off: "Вимк."
         notifications: "Сповіщення"
@@ -342,7 +442,12 @@ uk:
         saved: "Збережено"
         unfollow: "Покинути"
         admin_title: "Адміністратор"
-        retention_info: "Історія чату зберігатиметься %{days} днів."
+      admin:
+        export_messages:
+          title: "Експорт повідомлень чату"
+          description: "Наразі експорт обмежено до 10 000 повідомлень за останні 6 місяців."
+          create_export: "Створити експорт"
+          export_has_started: "Експорт почався. Ви отримаєте ПП коли він буде готовий."
       incoming_webhooks:
         back: "Назад"
         description: "Опис"
@@ -388,8 +493,18 @@ uk:
           many: "%{commaSeparatedUsernames} та %{count} інших набирають текст"
           other: "%{commaSeparatedUsernames} та %{count} інших набирають текст"
       retention_reminders:
-        public: "Історія каналу зберігається %{days} днів."
-        dm: "Особиста історія чату зберігається %{days} днів."
+        public_none: "Історія каналу зберігається нескінченно довго."
+        public:
+          one: "Історія каналу зберігається протягом %{count} дня."
+          few: "Історія каналу зберігається протягом %{count} днів."
+          many: "Історія каналу зберігається протягом %{count} днів."
+          other: "Історія каналу зберігається протягом %{count} днів."
+        dm_none: "Історія особистого чату зберігається безстроково."
+        dm:
+          one: "Особиста історія чату зберігається %{count} день."
+          few: "Особиста історія чату зберігається %{count} дні."
+          many: "Особиста історія чату зберігається %{count} днів."
+          other: "Особиста історія чату зберігається %{count} днів."
       flags:
         off_topic: "Це повідомлення не має відношення до поточної дискусії як визначено назвою каналів, і, ймовірно, має бути переміщене в інше місце."
         inappropriate: "Це повідомлення містить вміст, який розумна людина вважає образливим або порушенням <a href=\"%{basePath}/guidelines\">наших правил спільноти</a>."
@@ -411,6 +526,37 @@ uk:
         symbols: "Атрибутика"
         search_placeholder: "Пошук за назвою та псевдонімом emoji..."
         no_results: "Немає результатів"
+      thread:
+        title: "Назва"
+        view_thread: Відкрити діалог
+        default_title: "Нитка"
+        replies:
+          one: "%{count} відповідь"
+          few: "%{count} відповіді"
+          many: "%{count} відповідь"
+          other: "%{count} відповідь"
+        label: Нитка
+        close: "Закрити тему"
+        original_message:
+          started_by: "Розпочато"
+        settings: "Налаштування"
+        last_reply: "остання відповідь"
+        notifications:
+          regular:
+            title: "Нормальний"
+            description: "Ви отримаєте сповіщення, якщо хтось згадає ваш @name у цій темі."
+          tracking:
+            title: "Стежити"
+            description: "Кількість нових відповідей для цього ланцюжка буде показано в списку ланцюжків і на каналі. Ви отримаєте сповіщення, якщо хтось згадає ваше @name у цій темі."
+        participants_other_count:
+          one: "+%{count}"
+          few: "+%{count}"
+          many: "+%{count}"
+          other: "+%{count}"
+      threads:
+        open: "Відкрийте тему"
+        list: "Поточні обговорення"
+        none: "Ви не берете участі в жодній темі на цьому каналі."
       draft_channel_screen:
         header: "Нове повідомлення"
         cancel: "Скасувати"
@@ -455,9 +601,8 @@ uk:
       transcript:
         view: "Показати попередні повідомлення"
       types:
-        reviewable_chat_message:
-          title: "Повідомлення чату на перевірці"
-          flagged_by: "Позначено"
+        chat_reviewable_message:
+          title: "Позначене повідомлення чату"
     keyboard_shortcuts_help:
       chat:
         title: "Чат"
@@ -470,6 +615,7 @@ uk:
           composer_code: "%{shortcut} Код (тільки в редакторі)"
           drawer_open: "%{shortcut} Відкрити панель чату"
           drawer_close: "%{shortcut} Закрийте панель чату"
+          mark_all_channels_read: "%{shortcut} Позначити всі канали як прочитані"
     topic_statuses:
       chat:
         help: "Чат увімкнено для цієї теми"
@@ -486,3 +632,7 @@ uk:
           few: "Повідомлення чату – %{count} непрочитані повідомлення"
           many: "Повідомлення чату – %{count} непрочитаних повідомлень"
           other: "Повідомлення чату – %{count} непрочитаних повідомлень"
+    styleguide:
+      sections:
+        chat:
+          title: Чат
diff --git a/plugins/chat/config/locales/client.ur.yml b/plugins/chat/config/locales/client.ur.yml
index 3f7f16269e6..b9c56cc85b1 100644
--- a/plugins/chat/config/locales/client.ur.yml
+++ b/plugins/chat/config/locales/client.ur.yml
@@ -21,14 +21,15 @@ ur:
       joined: "شمولیت اختیار کی"
       email_frequency:
         never: "کبھی نہیں"
+      header_indicator_preference:
+        never: "کبھی نہیں"
       flag: "فلَیگ"
       join: "شمولیت اختیار کریں"
+      last_visit: "آخری وزٹ"
+      summarization:
+        summarize: "خلاصہ"
       mention_warning:
         dismiss: "بر خاست کریں"
-        groups:
-          users_limit:
-            one: "%{count} صارف"
-            other: "%{count} صارفین"
       reply: "جواب"
       edit: "ترمیم کریں"
       rebake_message: "HTML دوبارہ بِلڈ کریں"
@@ -58,6 +59,8 @@ ur:
           about: بارے میں
           members: ممبران
           settings: ترتیبات
+      new_message_modal:
+        no_items: "کوئی اشیاء نہیں"
       direct_message_creator:
         title: نیا پیغام
         prefix: "کے لئے:"
@@ -69,11 +72,13 @@ ur:
       composer:
         italic_text: "زور دیا گیا ٹَیکسٹ"
         bold_text: "گہرا ٹَیکسٹ"
+        send: "بھیجیں"
       notification_levels:
         never: "کبھی نہیں"
       settings:
         follow: "شمولیت اختیار کریں"
         followed: "شمولیت اختیار کی"
+        threading_disabled: "غیر فعال"
         notifications: "اطلاعات"
         preview: "پیشگی دیکھیں"
         save: "محفوظ کریں"
@@ -105,6 +110,21 @@ ur:
         activities: "سرگرمیاں"
         flags: "فلَیگز"
         symbols: "علامات"
+      thread:
+        title: "عنوان"
+        replies:
+          one: "%{count} جواب"
+          other: "%{count} جوابات"
+        settings: "ترتیبات"
+        last_reply: "آخری جواب"
+        notifications:
+          regular:
+            title: "عمومی"
+          tracking:
+            title: "ٹریک کیا جا رہا"
+        participants_other_count:
+          one: "+%{count}"
+          other: "+%{count}"
       draft_channel_screen:
         header: "نیا پیغام"
         cancel: "منسوخ"
@@ -116,7 +136,3 @@ ur:
           fields:
             message:
               label: پیغام
-    review:
-      types:
-        reviewable_chat_message:
-          flagged_by: "کی طرف سے فلَیگ کردہ"
diff --git a/plugins/chat/config/locales/client.vi.yml b/plugins/chat/config/locales/client.vi.yml
index 4c1039356df..f90d06e3a69 100644
--- a/plugins/chat/config/locales/client.vi.yml
+++ b/plugins/chat/config/locales/client.vi.yml
@@ -21,34 +21,19 @@ vi:
       joined: "đã tham gia"
       email_frequency:
         never: "Không bao giờ"
+      header_indicator_preference:
+        never: "Không bao giờ"
       flag: "Gắn cờ"
       join: "Tham gia"
+      last_visit: "lần thăm cuối"
+      summarization:
+        summarize: "Tóm tắt"
       mention_warning:
         dismiss: "bỏ qua"
-        cannot_see:
-          other: "%{username} và %{others} không thể truy cập kênh này và không được thông báo."
-        without_membership:
-          other: "%{username} và %{others} chưa tham gia kênh này."
-        group_mentions_disabled:
-          other: "%{group_name} và %{others} không cho phép đề cập"
-        too_many_members:
-          other: "%{group_name} và %{others} có quá nhiều thành viên. Không ai được thông báo"
-        warning_multiple:
-          other: "%{count} khác"
         groups:
           header:
             some: "Một số người dùng sẽ không được thông báo"
             all: "Sẽ không ai được thông báo"
-          unreachable:
-            other: "@%{group} và @%{group_2} không cho phép đề cập"
-          unreachable_multiple: "@%{group} và %{count} người khác không cho phép đề cập"
-          too_many_members_multiple: "%{count} nhóm vượt quá %{notification_limit} của %{limit}"
-          users_limit:
-            other: "%{count} người dùng"
-          notification_limit: "giới hạn thông báo"
-        too_many_mentions: "Tin nhắn này vượt quá %{notification_limit} của %{limit}"
-        mentions_limit:
-          other: "%{count} đề cập"
       reply: "Trả lời"
       edit: "Sửa"
       rebake_message: "Tạo lại HTML"
@@ -78,6 +63,8 @@ vi:
           about: Giới thiệu
           members: Các thành viên
           settings: Cài đặt
+      new_message_modal:
+        no_items: "Không có mẫu nào"
       direct_message_creator:
         title: Tin nhắn mới
         prefix: "Tới:"
@@ -89,11 +76,13 @@ vi:
       composer:
         italic_text: "văn bản nhấn mạnh"
         bold_text: "chữ in đậm"
+        send: "Gửi"
       notification_levels:
         never: "Không bao giờ"
       settings:
         follow: "Tham gia"
         followed: "Đã tham gia"
+        threading_disabled: "Vô hiệu hóa"
         notifications: "Thông báo"
         preview: "Xem trước"
         save: "Lưu lại"
@@ -127,6 +116,19 @@ vi:
         activities: "Hoạt động"
         flags: "Dấu cờ - Flags"
         symbols: "Ký hiệu"
+      thread:
+        title: "Tiêu đề"
+        replies:
+          other: "%{count} trả lời"
+        settings: "Cài đặt"
+        last_reply: "trả lời cuối cùng"
+        notifications:
+          regular:
+            title: "Bình thường"
+          tracking:
+            title: "Đang theo dõi"
+        participants_other_count:
+          other: "+%{count}"
       draft_channel_screen:
         header: "Tin nhắn mới"
         cancel: "Huỷ"
@@ -138,7 +140,3 @@ vi:
           fields:
             message:
               label: Tin nhắn
-    review:
-      types:
-        reviewable_chat_message:
-          flagged_by: "Gắn cờ bởi"
diff --git a/plugins/chat/config/locales/client.zh_CN.yml b/plugins/chat/config/locales/client.zh_CN.yml
index 31738d4702d..8ff476da7f0 100644
--- a/plugins/chat/config/locales/client.zh_CN.yml
+++ b/plugins/chat/config/locales/client.zh_CN.yml
@@ -15,6 +15,7 @@ zh_CN:
           actions:
             chat_channel_status_change: "聊天频道状态已更改"
             chat_channel_delete: "聊天频道已删除"
+            chat_auto_remove_membership: "从频道自动移除成员"
       api:
         scopes:
           descriptions:
@@ -39,7 +40,7 @@ zh_CN:
       move_to_channel:
         title: "将消息移至频道"
         instructions:
-          other: "您正在移动 <strong>%{count}</strong> 条消息。选择一个目标频道。 将在<strong>%{channelTitle}</strong>频道中创建一条占位符消息，以表明这些消息已被移动。"
+          other: "您正在移动 <strong>%{count}</strong> 条消息。选择目标频道。将在 <strong>%{channelTitle}</strong> 频道中创建占位符消息，以表明这些消息已被移动。请注意，新频道中不会保留回复链，旧频道中的消息将不再显示为回复任何移动的消息。"
         confirm_move: "移动消息"
       channel_settings:
         title: "频道设置"
@@ -80,8 +81,10 @@ zh_CN:
       click_to_join: "点击此处查看可用频道。"
       close: "关闭"
       collapse: "收起聊天抽屉"
+      expand: "展开聊天栏"
       confirm_flag: "确定要举报 %{username} 的消息吗？"
-      deleted: "一条消息已被删除。[查看]"
+      deleted:
+        other: "%{count} 条消息已被删除。[查看全部]"
       hidden: "一条消息已被隐藏。[查看]"
       delete: "删除"
       edited: "已编辑"
@@ -96,6 +99,11 @@ zh_CN:
         never: "永不"
         title: "电子邮件通知"
         when_away: "仅在离开时"
+      header_indicator_preference:
+        title: "在标题中显示活动指示器"
+        all_new: "所有新消息"
+        dm_and_mentions: "直接消息和提及"
+        never: "永不"
       enable: "启用聊天"
       flag: "举报"
       emoji: "插入表情符号"
@@ -105,43 +113,48 @@ zh_CN:
       in_reply_to: "回复"
       heading: "聊天"
       join: "加入"
-      new_messages: "新消息"
+      last_visit: "上次访问"
+      summarization:
+        title: "总结消息"
+        description: "选择以下选项，以总结在所需时间范围内发送的对话。"
+        summarize: "摘要"
+        since:
+          other: "最后 %{count} 小时"
       mention_warning:
         dismiss: "忽略"
-        cannot_see:
-          other: "%{username} 和 %{others} 无法访问此频道且未收到通知。"
+        cannot_see: "%{username} 无法访问此频道且未被通知。"
+        cannot_see_multiple:
+          other: "%{username} 和 %{count} 位其他用户无法访问此频道且未被通知。"
         invitations_sent:
           other: "已发送邀请"
         invite: "邀请加入频道"
-        without_membership:
-          other: "%{username} 和 %{others} 尚未加入此频道。"
-        group_mentions_disabled:
-          other: "%{group_name} 和 %{others} 不允许提及"
-        too_many_members:
-          other: "%{group_name} 和 %{others} 的成员过多。任何人都不会收到通知"
-        warning_multiple:
-          other: "其他 %{count} 个"
+        without_membership: "%{username} 尚未加入此频道。"
+        without_membership_multiple:
+          other: "%{username} 和其他 %{count} 位用户尚未加入此频道。"
+        group_mentions_disabled: "%{group_name} 不允许被提及。"
+        group_mentions_disabled_multiple:
+          other: "%{group_name} 和其他 %{count} 个群组不允许被提及."
+        too_many_members: "%{group_name} 的成员过多。没有人被通知。"
+        too_many_members_multiple:
+          other: "%{group_name} 和 其他%{count} 个群组的成员过多。没有人被通知。"
         groups:
           header:
             some: "某些用户不会收到通知"
             all: "任何人都不会收到通知"
-          unreachable:
-            other: "@%{group} 和 @%{group_2} 不允许提及"
-          unreachable_multiple: "@%{group} 和其他 %{count} 个群组不允许提及"
-          too_many_members:
-            other: "提及 @%{group}或 @%{group_2}超出 %{limit}的%{notification_limit}"
-          too_many_members_multiple: "这 %{count} 个群组超出了 %{limit}的%{notification_limit}"
-          users_limit:
-            other: "%{count} 位用户"
-          notification_limit: "通知限制"
-        too_many_mentions: "此消息超出 %{limit}的%{notification_limit}"
-        mentions_limit:
-          other: "%{count} 个提及"
+          unreachable_1: "%{group} 不允许被提及。"
+          unreachable_2: "@%{group1} 和 @%{group2} 不允许被提及."
+          unreachable_multiple:
+            other: "@%{group} 和其他 %{count} 个群组不允许被提及。"
+        too_many_mentions:
+          other: "此消息超过了 %{count} 次提及的通知限制。"
+        too_many_mentions_admin:
+          other: '此消息超过了 <a href="%{siteSettingUrl}" target="_blank">通知限制</a> （共 %{count} 次）。'
       aria_roles:
         header: "聊天标题"
         composer: "聊天输入框"
         channels_list: "聊天频道列表"
       no_public_channels: "您还没有加入任何频道。"
+      kicked_from_channel: "你不能再访问这个频道了。"
       only_chat_push_notifications:
         title: "只发送聊天推送通知"
         description: "阻止发送所有非聊天推送通知"
@@ -153,10 +166,16 @@ zh_CN:
       close_full_page: "关闭全屏聊天"
       open_message: "在聊天中打开消息"
       placeholder_self: "做些记录"
-      placeholder_others: "在 %{messageRecipient} 聊天"
-      placeholder_new_message_disallowed: "频道的状态为%{status}，您现在无法发送新消息。"
+      placeholder_channel: "在 %{channelName} 聊天"
+      placeholder_thread: "在聊天串中聊天"
+      placeholder_users: "在 %{commaSeparatedNames} 聊天"
+      placeholder_new_message_disallowed:
+        archived: "频道已归档，你无法在此发送新信息。"
+        closed: "频道已关闭，你无法在此发送新信息。"
+        read_only: "频道为只读，您现在不能发送新消息。"
       placeholder_silenced: "您目前无法发送消息。"
-      placeholder_start_conversation: 开始与 %{usernames} 的对话
+      placeholder_start_conversation: "与...开始对话"
+      placeholder_start_conversation_users: "开始与 %{commaSeparatedUsernames} 的对话"
       remove_upload: "移除文件"
       react: "使用表情符号回复"
       reply: "回复"
@@ -172,8 +191,10 @@ zh_CN:
       restore: "恢复已删除的消息"
       save: "保存"
       select: "选择"
-      silence: "将用户禁言"
       return_to_list: "返回频道列表"
+      return_to_threads_list: "返回正在进行的讨论"
+      unread_threads_count:
+        other: "你有 %{count} 个未读的讨论"
       scroll_to_bottom: "滚动到底部"
       scroll_to_new_messages: "查看新消息"
       sound:
@@ -185,6 +206,8 @@ zh_CN:
       title: "聊天"
       title_capitalized: "聊天"
       upload: "附加文件"
+      upload_to_channel: "上传到 %{title}"
+      upload_to_thread: "上传到聊天串"
       uploaded_files:
         other: "%{count} 个文件"
       you_flagged: "您已举报此消息"
@@ -227,10 +250,23 @@ zh_CN:
           about: 关于
           members: 成员
           settings: 设置
-      channel_edit_name_modal:
-        title: 编辑名称
+      new_message_modal:
+        title: 发送消息
+        add_user_long: <kbd>shift + 点击</kbd>或 <kbd>shift + enter</kbd><span>添加 @%{username}</span>
+        add_user_short: <span>添加用户</span>
+        open_channel: <span>打开频道</span>
+        default_search_placeholder: "#一个频道、@某人或任何内容"
+        default_channel_search_placeholder: "#一个频道"
+        default_user_search_placeholder: "@某人"
+        user_search_placeholder: "...添加更多用户"
+        disabled_user: "已禁用聊天功能"
+        no_items: "无条目"
+      channel_edit_name_slug_modal:
+        title: 编辑频道
         input_placeholder: 添加一个名字
-        description: 为你的频道起一个简短的描述性名称
+        slug_description: 在 URL 中使用频道 slug 而不是频道名称
+        name: 频道名称
+        slug: 频道 slug (可选)
       channel_edit_description_modal:
         title: 编辑描述
         input_placeholder: 添加描述
@@ -240,30 +276,40 @@ zh_CN:
         prefix: "至："
         no_results: 没有结果
         selected_user_title: "取消选择 %{username}"
-      channel_selector:
-        title: "跳转到频道"
-        no_channels: "没有频道符合您的搜索"
       channel:
         no_memberships: 此频道没有成员
         no_memberships_found: 找不到成员
         memberships_count:
           other: "%{count} 个成员"
       create_channel:
+        threading:
+          label: "启用聊天串"
         auto_join_users:
           public_category_warning: "%{category}是公共类别。是否自动将所有最近活跃的用户添加到此频道？"
-          warning_groups:
-            other: 自动从%{group}和%{group_2}添加 %{members_count} 个用户？
-          warning_multiple_groups: 自动从%{group_1}和其他 %{count} 个群组添加 %{members_count} 个用户？
+          warning_1_group:
+            other: "自动从 %{group} 添加 %{count} 用户？"
+          warning_2_groups:
+            other: "自动从%{group1}和%{group2}添加 %{count} 个用户？"
+          warning_multiple_groups_MF: |
+            { groupCount, plural,
+                other {
+                      { userCount, plural,
+                          other {是否自动添加 {userCount} 个来自 {groupName} 和 {groupCount} 个其他组的用户？}
+                      }
+                    }
+            }
         choose_category:
           label: "选择一个类别"
           none: "选择一个…"
           default_hint: 访问<a href=%{link} target="_blank">%{category}安全设置</a>管理访问权限
-          hint_groups:
-            other: 根据<a href=%{link} target="_blank">安全设置</a>，%{hint}和%{hint_2}中的用户将可以访问此频道
-          hint_multiple_groups: 根据<a href=%{link} target="_blank">安全设置</a>，%{hint_1}和其他 %{count} 个群组中的用户将有权访问此频道
+          hint_1_group: '%{group} 中的用户根据 <a href="%{settingLink}" target="_blank">安全设置</a>可以访问这个频道'
+          hint_2_groups: '%{group1} 和 %{group2} 中的用户根据 <a href="%{settingLink}" target="_blank">安全设置</a>可以访问这个频道'
+          hint_multiple_groups:
+            other: '%{group} 和 %{count} 其他组的用户根据 <a href="%{settingLink}" target="_blank">安全</a>可以设置访问这个频道'
         create: "创建频道"
         description: "描述（可选）"
         name: "频道名称"
+        slug: "频道 slug (可选)"
         title: "新建频道"
         type: "类型"
         types:
@@ -273,15 +319,20 @@ zh_CN:
         type: "聊天消息"
       reactions:
         only_you: "您回应了 :%{emoji}:"
-        and_others: "您、%{usernames} 回应了 :%{emoji}:"
-        only_others: "%{usernames} 回应了 :%{emoji}:"
-        others_and_more: "%{usernames} 和其他 %{more} 人回应了 :%{emoji}:"
-        you_others_and_more: "您、%{usernames} 和其他 %{more} 人回应了 :%{emoji}:"
+        you_and_single_user: "你和 %{username} 的回应了: %{emoji}:"
+        you_and_multiple_users: "你、%{commaSeparatedUsernames} 和 %{username} 回应了 :%{emoji}:"
+        you_multiple_users_and_more:
+          other: "您、%{commaSeparatedUsernames} 和其他 %{count} 人回应了 :%{emoji}:"
+        single_user: "%{username} 回应了 :%{emoji}:"
+        multiple_users: "%{commaSeparatedUsernames} 和 %{username} 回应 :%{emoji}:"
+        multiple_users_and_more:
+          other: "%{commaSeparatedUsernames} 和其他 %{count} 人回应了 :%{emoji}:"
       composer:
         toggle_toolbar: "切换工具栏"
         italic_text: "斜体"
         bold_text: "粗体"
         code_text: "代码文本"
+        send: "发送"
       quote:
         original_channel: '最初在<a href="%{channelLink}">%{channel}</a>中发送。'
         copy_success: "聊天引用已复制到剪贴板"
@@ -292,15 +343,19 @@ zh_CN:
       settings:
         channel_wide_mentions_label: "允许 @all 和 @here 提及"
         channel_wide_mentions_description: "允许用户使用 @all 通知#%{channel} 的所有成员，或仅使用 @here 通知当前活跃的成员"
+        channel_threading_label: "串"
+        channel_threading_description: "启用聊天串后，对聊天消息的回复将创建一个单独的对话，该对话将与主频道并存。"
         auto_join_users_label: "自动添加用户"
-        auto_join_users_info: "每小时检查哪些用户在过去 3 个月内处于活跃状态，如果他们有权访问“%{category}”类别，则将他们添加到此频道。"
-        enable_auto_join_users: "自动添加所有最近活跃的用户"
+        auto_join_users_info: "每小时检查哪些用户在过去3个月中是活跃的。如果他们有权限进入 %{category} 类别，就把他们添加到这个频道。"
+        auto_join_users_info_no_category: "每小时检查哪些用户在过去 3 个月内处于活跃状态。如果他们有权访问所选类别，则将他们添加到此频道。"
         auto_join_users_warning: "所有不是此频道成员且有权访问“%{category}”类别的用户都将加入。确定吗？"
         desktop_notification_level: "桌面通知"
         follow: "加入"
         followed: "已加入"
         mobile_notification_level: "移动推送通知"
         mute: "将频道设为免打扰"
+        threading_enabled: "已启用"
+        threading_disabled: "已禁用"
         muted_on: "开"
         muted_off: "关"
         notifications: "通知"
@@ -309,9 +364,13 @@ zh_CN:
         saved: "已保存"
         unfollow: "离开"
         admin_title: "管理员"
-        retention_info: "聊天历史记录将保存 %{days} 天。"
       admin:
         title: "聊天"
+        export_messages:
+          title: "导出聊天消息"
+          description: "目前只能导出过去 6 个月内的 10000 条最新消息。"
+          create_export: "创建导出"
+          export_has_started: "导出已开始。导出完成后，您将收到一条私信。"
       direct_messages:
         title: "个人聊天"
         new: "创建个人聊天"
@@ -371,8 +430,12 @@ zh_CN:
         many_users:
           other: "%{commaSeparatedUsernames} 和其他 %{count} 人正在输入"
       retention_reminders:
-        public: "频道历史记录保留 %{days} 天。"
-        dm: "个人聊天记录保留 %{days} 天。"
+        public_none: "频道历史记录会被永久保留。"
+        public:
+          other: "频道历史记录保留 %{count} 天。"
+        dm_none: "个人聊天记录将会被永久保留。"
+        dm:
+          other: "个人聊天记录保留 %{count} 天。"
       flags:
         off_topic: "此消息与频道标题定义的当前讨论无关，可能应当移至其他地方。"
         inappropriate: "此消息包含理性的人会认为具有攻击性、辱骂性或违反<a href=\"%{basePath}/guidelines\">我们的社区准则</a>的内容。"
@@ -394,6 +457,31 @@ zh_CN:
         symbols: "符号"
         search_placeholder: "按表情符号名称和别名搜索…"
         no_results: "没有结果"
+      thread:
+        title: "标题"
+        view_thread: 查看聊天串
+        default_title: "聊天串"
+        replies:
+          other: "%{count} 个回复"
+        label: 聊天串
+        close: "关闭聊天串"
+        original_message:
+          started_by: "开始于"
+        settings: "设置"
+        last_reply: "最后回复"
+        notifications:
+          regular:
+            title: "正常"
+            description: "您会在别人在聊天串里 @ 您或回复您时收到通知。"
+          tracking:
+            title: "跟踪"
+            description: "该聊天串的新回复计数将显示在聊天串列表和频道中。如果有人在此串中提及您的@name，您将会收到通知。"
+        participants_other_count:
+          other: "+%{count}"
+      threads:
+        open: "打开聊天串"
+        list: "正在进行的讨论"
+        none: "你没有参与这个频道中的任何聊天串。"
       draft_channel_screen:
         header: "新消息"
         cancel: "取消"
@@ -438,9 +526,8 @@ zh_CN:
       transcript:
         view: "查看以前的消息副本"
       types:
-        reviewable_chat_message:
+        chat_reviewable_message:
           title: "举报的聊天消息"
-          flagged_by: "举报者"
     keyboard_shortcuts_help:
       chat:
         title: "聊天"
@@ -453,6 +540,7 @@ zh_CN:
           composer_code: "%{shortcut} 代码（仅输入框）"
           drawer_open: "%{shortcut} 打开聊天抽屉"
           drawer_close: "%{shortcut} 关闭聊天抽屉"
+          mark_all_channels_read: "%{shortcut} 标记所有频道已读"
     topic_statuses:
       chat:
         help: "已为此话题启用聊天"
@@ -470,3 +558,7 @@ zh_CN:
         chat_notifications: "聊天通知"
         chat_notifications_with_unread:
           other: "聊天通知 - %{count} 个未读通知"
+    styleguide:
+      sections:
+        chat:
+          title: 聊天
diff --git a/plugins/chat/config/locales/client.zh_TW.yml b/plugins/chat/config/locales/client.zh_TW.yml
index 3fabfa46006..4a0320fdfdf 100644
--- a/plugins/chat/config/locales/client.zh_TW.yml
+++ b/plugins/chat/config/locales/client.zh_TW.yml
@@ -72,15 +72,15 @@ zh_TW:
         direct_message: "您還可以與一個或多個使用者開始個人聊天。"
       email_frequency:
         never: "永不"
+      header_indicator_preference:
+        never: "永不"
       flag: "檢舉"
       heading: "聊天"
       join: "加入"
+      last_visit: "上次到訪"
       mention_warning:
         dismiss: "忽略"
-        groups:
-          users_limit:
-            other: "%{count} 個使用者"
-      placeholder_start_conversation: 從 %{usernames}開始對話
+      placeholder_start_conversation_users: "從 %{commaSeparatedUsernames}開始對話"
       remove_upload: "移除檔案"
       react: "用表情符號反應"
       reply: "回覆"
@@ -95,7 +95,6 @@ zh_TW:
       restore: "還原已刪除的訊息"
       save: "保存"
       select: "選擇"
-      silence: "使用者靜音"
       scroll_to_bottom: "捲動到底部"
       scroll_to_new_messages: "查看新訊息"
       sound:
@@ -135,6 +134,8 @@ zh_TW:
           about: 關於
           members: 成員
           settings: 設定
+      new_message_modal:
+        no_items: "沒有物件"
       channel_edit_description_modal:
         title: 編輯描述
         input_placeholder: 新增描述
@@ -143,8 +144,6 @@ zh_TW:
         prefix: "發至:"
         no_results: 沒有結果
         selected_user_title: "取消選取 %{username}"
-      channel_selector:
-        title: "跳轉到頻道"
       create_channel:
         type: "類型"
         types:
@@ -153,11 +152,14 @@ zh_TW:
       composer:
         italic_text: "斜體字"
         bold_text: "粗體字"
+        send: "發送"
       notification_levels:
         never: "永不"
       settings:
         follow: "加入"
         followed: "建立日期"
+        threading_enabled: "啟用"
+        threading_disabled: "停用"
         notifications: "通知"
         preview: "預覽"
         save: "保存"
@@ -192,6 +194,17 @@ zh_TW:
         flags: "投訴"
         symbols: "象徵<br>"
         no_results: "沒有結果"
+      thread:
+        title: "標題"
+        replies:
+          other: "%{count}個回覆"
+        settings: "設定"
+        last_reply: "最新回覆"
+        notifications:
+          regular:
+            title: "一般"
+          tracking:
+            title: "跟蹤"
       draft_channel_screen:
         header: "新訊息"
         cancel: "取消"
@@ -203,10 +216,10 @@ zh_TW:
           fields:
             message:
               label: 訊息
-    review:
-      types:
-        reviewable_chat_message:
-          flagged_by: "標記由"
     keyboard_shortcuts_help:
       chat:
         title: "聊天"
+    styleguide:
+      sections:
+        chat:
+          title: 聊天
diff --git a/plugins/chat/config/locales/server.ar.yml b/plugins/chat/config/locales/server.ar.yml
index eb1401fe744..abd738363c4 100644
--- a/plugins/chat/config/locales/server.ar.yml
+++ b/plugins/chat/config/locales/server.ar.yml
@@ -54,16 +54,19 @@ ar:
     deleted_chat_username: تم الحذف
     errors:
       channel_exists_for_category: "توجد قناة بالفعل في هذه الفئة وبهذا الاسم"
-      channel_new_message_disallowed: "القناة %{status}، لا يمكن إرسال رسائل جديدة"
-      channel_modify_message_disallowed: "القناة %{status}، لا يمكن تعديل أو حذف أي رسائل"
       user_cannot_send_message: "لا يمكنك إرسال رسائل في الوقت الحالي."
       rate_limit_exceeded: "تم تجاوز حد رسائل الدردشة التي يمكن إرسالها خلال 30 ثانية"
       auto_silence_from_flags: "تم الإبلاغ عن الرسالة عددًا كافيًا من المرات لكتم المستخدم."
       channel_cannot_be_archived: "لا يمكن أرشفة القناة في الوقت الحالي، يجب أن تكون إما مغلقة أو مفتوحة للأرشفة."
       duplicate_message: "لقد نشرت رسالة مماثلة مؤخرًا."
       delete_channel_failed: "فشل حذف القناة، يُرجى إعادة المحاولة."
-      minimum_length_not_met: "الرسالة قصيرة جدًا، ويجب ألا تقل عن %{minimum} من الأحرف."
-      message_too_long: "الرسالة طويلة جدًا، يجب ألا يزيد عدد أحرف الرسائل عن %{maximum} من الأحرف."
+      message_too_long:
+        zero: "الرسالة طويلة جدًا، يجب ألا يزيد عدد أحرف الرسائل عن %{count} حرف."
+        one: "الرسالة طويلة جدًا، يجب ألا يزيد عدد أحرف الرسائل عن حرف واحد (%{count})."
+        two: "الرسالة طويلة جدًا، يجب ألا يزيد عدد أحرف الرسائل عن حرفين (%{count})."
+        few: "الرسالة طويلة جدًا، يجب ألا يزيد عدد أحرف الرسائل عن %{count} أحرف."
+        many: "الرسالة طويلة جدًا، يجب ألا يزيد عدد أحرف الرسائل عن %{count} حرفًا."
+        other: "الرسالة طويلة جدًا، يجب ألا يزيد عدد أحرف الرسائل عن %{count} حرف."
       max_reactions_limit_reached: "غير مسموح بتفاعلات جديدة على هذه الرسالة."
       message_move_invalid_channel: "يجب أن تكون القناة المصدر والمستهدفة قناتين عامتين."
       message_move_no_messages_found: "لم يتم العثور على رسائل بمعرِّفات الرسائل المقدَّمة."
@@ -74,13 +77,7 @@ ar:
       actor_disallowed_dms: "لقد اخترت منع المستخدمين من إرسال رسائل خاصة ومباشرة إليك؛ لذا لا يمكنك إنشاء رسائل مباشرة جديدة."
       actor_preventing_target_user_from_dm: "لقد اخترت منع %{username} من إرسال رسائل خاصة ومباشرة إليك؛ لذا لا يمكنك إنشاء رسائل مباشرة جديدة إليه."
       user_cannot_send_direct_messages: "عذرًا، لا يمكنك إرسال الرسائل المباشرة."
-      over_chat_max_direct_message_users:
-        zero: "يمكنك إرسال رسالة مباشرة إلى نفسك و%{count} مستخدم آخر."
-        one: "يمكنك إرسال رسالة مباشرة إلى نفسك فقط."
-        two: "يمكنك إرسال رسالة مباشرة إلى نفسك ومستخدمَين (%{count}) آخرين."
-        few: "يمكنك إرسال رسالة مباشرة إلى نفسك و%{count} مستخدمين آخرين."
-        many: "يمكنك إرسال رسالة مباشرة إلى نفسك و%{count} مستخدمًا آخر."
-        other: "يمكنك إرسال رسالة مباشرة إلى نفسك و%{count} مستخدم آخر."
+      over_chat_max_direct_message_users_allow_self: "يمكنك إرسال رسالة مباشرة إلى نفسك فقط."
     reviewables:
       message_already_handled: "شكرًا، لكننا راجعنا هذه الرسالة بالفعل وقرَّرنا أنك لست بحاجة إلى الإبلاغ عنها مرة أخرى."
       actions:
@@ -117,11 +114,6 @@ ar:
         transcript_title: "نص الرسائل السابقة في %{channel_name}"
         transcript_body: "لمنحك مزيدًا من السياق، فقد ضمَّنا نسخة من الرسائل السابقة في هذه المحادثة (حتى عشر رسائل):\n\n%{transcript}"
     channel:
-      statuses:
-        read_only: "للقراءة فقط"
-        archived: "مؤرشفة"
-        closed: "مغلقة"
-        open: "مفتوحة"
       archive:
         first_post_raw: "هذا الموضوع عبارة عن أرشيف لقناة الدردشة [%{channel_name}] (%{channel_url})."
       messages_moved:
@@ -132,9 +124,14 @@ ar:
         many: "نقل @%{acting_username} %{count} رسائل إلى القناة [%{channel_name}](%{first_moved_message_url})."
         other: "نقل @%{acting_username} %{count} رسائل إلى القناة [%{channel_name}](%{first_moved_message_url})."
       dm_title:
-        single_user: "%{user}"
-        multi_user: "%{users}"
-        multi_user_truncated: "%{users} و%{leftover} آخرين"
+        single_user: "%{username}"
+        multi_user_truncated:
+          zero: "%{comma_separated_usernames} و%{count} آخرين"
+          one: "%{comma_separated_usernames} وواحد (%{count}) آخر"
+          two: "%{comma_separated_usernames} واثنان (%{count}) آخران"
+          few: "%{comma_separated_usernames} و%{count} آخرين"
+          many: "%{comma_separated_usernames} و%{count} آخرين"
+          other: "%{comma_separated_usernames} و%{count} آخرين"
     category_channel:
       errors:
         slug_contains_non_ascii_chars: "يتضمَّن حروفًا لا تنتمي إلى ترميز ASCII"
diff --git a/plugins/chat/config/locales/server.be.yml b/plugins/chat/config/locales/server.be.yml
index 0be1dcea5e6..74047d09386 100644
--- a/plugins/chat/config/locales/server.be.yml
+++ b/plugins/chat/config/locales/server.be.yml
@@ -23,9 +23,6 @@ be:
           title: "не згаджацца"
         ignore:
           title: "ігнараваць"
-    channel:
-      statuses:
-        closed: "Закрыта"
   reviewable_score_types:
     notify_user:
       chat_pm_body: "%{link}\n\n%{message}"
diff --git a/plugins/chat/config/locales/server.bg.yml b/plugins/chat/config/locales/server.bg.yml
index 7f6d844e418..30738705cd9 100644
--- a/plugins/chat/config/locales/server.bg.yml
+++ b/plugins/chat/config/locales/server.bg.yml
@@ -16,9 +16,8 @@ bg:
         ignore:
           title: "Игнорирай"
     channel:
-      statuses:
-        closed: "Затворена"
-        open: "Отвори"
+      dm_title:
+        single_user: "%{username}"
   discourse_push_notifications:
     popup:
       chat_mention:
diff --git a/plugins/chat/config/locales/server.bs_BA.yml b/plugins/chat/config/locales/server.bs_BA.yml
index 1060aaa9bce..6c550cbbea8 100644
--- a/plugins/chat/config/locales/server.bs_BA.yml
+++ b/plugins/chat/config/locales/server.bs_BA.yml
@@ -20,9 +20,8 @@ bs_BA:
         ignore:
           title: "Zanemari"
     channel:
-      statuses:
-        closed: "Zatvoreno"
-        open: "Otvori"
+      dm_title:
+        single_user: "%{username}"
   discourse_push_notifications:
     popup:
       chat_mention:
diff --git a/plugins/chat/config/locales/server.ca.yml b/plugins/chat/config/locales/server.ca.yml
index c0e7b4def35..fee12b99806 100644
--- a/plugins/chat/config/locales/server.ca.yml
+++ b/plugins/chat/config/locales/server.ca.yml
@@ -24,9 +24,8 @@ ca:
         ignore:
           title: "Ignora"
     channel:
-      statuses:
-        closed: "Tancat"
-        open: "Obre"
+      dm_title:
+        single_user: "%{username}"
   discourse_push_notifications:
     popup:
       chat_mention:
diff --git a/plugins/chat/config/locales/server.cs.yml b/plugins/chat/config/locales/server.cs.yml
index e81b47dc6dd..e402d97701f 100644
--- a/plugins/chat/config/locales/server.cs.yml
+++ b/plugins/chat/config/locales/server.cs.yml
@@ -22,9 +22,8 @@ cs:
         ignore:
           title: "ignorovat"
     channel:
-      statuses:
-        closed: "Uzavřeno"
-        open: "Otevřít"
+      dm_title:
+        single_user: "%{username}"
   discourse_push_notifications:
     popup:
       chat_mention:
diff --git a/plugins/chat/config/locales/server.da.yml b/plugins/chat/config/locales/server.da.yml
index dfc14fdf574..cb321d1feb2 100644
--- a/plugins/chat/config/locales/server.da.yml
+++ b/plugins/chat/config/locales/server.da.yml
@@ -34,13 +34,10 @@ da:
         ignore:
           title: "Ignorér"
     channel:
-      statuses:
-        read_only: "Kun læsning"
-        archived: "Arkiveret"
-        closed: "Lukket"
-        open: "Åbn"
       archive:
         first_post_raw: "Dette emne er et arkiv af chatkanalen [%{channel_name}] (%{channel_url})."
+      dm_title:
+        single_user: "%{username}"
     category_channel:
       errors:
         slug_contains_non_ascii_chars: "indeholder ikke-ascii- tegn"
diff --git a/plugins/chat/config/locales/server.de.yml b/plugins/chat/config/locales/server.de.yml
index a2623833d33..1346446c69e 100644
--- a/plugins/chat/config/locales/server.de.yml
+++ b/plugins/chat/config/locales/server.de.yml
@@ -7,6 +7,7 @@
 de:
   site_settings:
     chat_enabled: "Chat-Plug-in aktivieren."
+    enable_public_channels: "Öffentliche Kanäle basierend auf Kategorien aktivieren."
     chat_allowed_groups: "Benutzer in diesen Gruppen können chatten. Bitte beachte, dass Teammitglieder jederzeit auf den Chat zugreifen können."
     chat_channel_retention_days: "Chat-Nachrichten in regulären Kanälen werden so viele Tage lang aufbewahrt. Auf „0“ setzen, um Nachrichten für immer aufzubewahren."
     chat_dm_retention_days: "Chat-Nachrichten in persönlichen Chat-Kanälen werden so viele Tage lang aufbewahrt. Auf „0“ setzen, um Nachrichten für immer aufzubewahren."
@@ -54,16 +55,26 @@ de:
     deleted_chat_username: gelöscht
     errors:
       channel_exists_for_category: "Für diese Kategorie und diesen Namen existiert bereits ein Kanal"
-      channel_new_message_disallowed: "Der Kanal ist %{status}, es können keine neuen Nachrichten gesendet werden"
-      channel_modify_message_disallowed: "Der Kanal ist %{status}, es können keine Nachrichten bearbeitet oder gelöscht werden"
+      channel_new_message_disallowed:
+        archived: "Der Kanal ist archiviert, es können keine neuen Nachrichten gesendet werden"
+        closed: "Der Kanal ist geschlossen, es können keine neuen Nachrichten gesendet werden"
+        read_only: "Der Kanal ist schreibgeschützt, es können keine neuen Nachrichten gesendet werden"
+      channel_modify_message_disallowed:
+        archived: "Der Kanal ist archiviert, es können keine Nachrichten bearbeitet oder gelöscht werden"
+        closed: "Der Kanal ist geschlossen, es können keine Nachrichten bearbeitet oder gelöscht werden"
+        read_only: "Der Kanal ist schreibgeschützt, es können keine Nachrichten bearbeitet oder gelöscht werden"
       user_cannot_send_message: "Du kannst derzeit keine Nachrichten senden."
       rate_limit_exceeded: "Das Limit der Chat-Nachrichten, die innerhalb von 30 Sekunden gesendet werden können, wurde überschritten"
       auto_silence_from_flags: "Chat-Nachricht wurde mit einer Punktzahl markiert, die hoch genug ist, um den Benutzer stummzuschalten."
       channel_cannot_be_archived: "Der Kanal kann zu diesem Zeitpunkt nicht archiviert werden, er muss entweder geschlossen oder geöffnet sein."
       duplicate_message: "Du hast vor Kurzem eine identische Nachricht gepostet."
       delete_channel_failed: "Löschen des Kanals fehlgeschlagen, bitte versuche es erneut."
-      minimum_length_not_met: "Die Nachricht ist zu kurz, sie muss mindestens %{minimum} Zeichen lang sein."
-      message_too_long: "Nachricht ist zu lang. Nachrichten dürfen maximal %{maximum} Zeichen lang sein."
+      minimum_length_not_met:
+        one: "Die Nachricht ist zu kurz, sie muss mindestens %{count} Zeichen lang sein."
+        other: "Die Nachricht ist zu kurz, sie muss mindestens %{count} Zeichen lang sein."
+      message_too_long:
+        one: "Nachricht ist zu lang. Nachrichten dürfen maximal %{count} Zeichen lang sein."
+        other: "Nachricht ist zu lang. Nachrichten dürfen maximal %{count} Zeichen lang sein."
       draft_too_long: "Der Entwurf ist zu lang."
       max_reactions_limit_reached: "Neue Reaktionen auf diese Nachricht sind nicht erlaubt."
       message_move_invalid_channel: "Quell- und Zielkanal müssen öffentliche Kanäle sein."
@@ -75,9 +86,13 @@ de:
       actor_disallowed_dms: "Du hast dich dafür entschieden, dass Benutzer dir keine privaten und Direktnachrichten schicken können, daher kannst du keine neuen Direktnachrichten erstellen."
       actor_preventing_target_user_from_dm: "Du hast dich dafür entschieden, dass %{username} dir keine privaten und Direktnachrichten schicken kann, daher kannst du keine neuen Direktnachrichten an diese Person erstellen."
       user_cannot_send_direct_messages: "Du kannst leider keine Direktnachrichten senden."
+      over_chat_max_direct_message_users_allow_self: "Du kannst nur eine Direktnachricht an dich selbst erstellen."
       over_chat_max_direct_message_users:
-        one: "Du kannst nur eine Direktnachricht an dich selbst erstellen."
+        one: "Du kannst keine Direktnachricht an mehr als %{count} anderen Benutzer erstellen."
         other: "Du kannst keine Direktnachricht an mehr als %{count} andere Benutzer erstellen."
+      original_message_not_found: "Der Vorgänger der Nachricht, auf die du antwortest, kann nicht gefunden werden oder wurde gelöscht."
+      thread_invalid_for_channel: "Der Thread ist nicht Teil des bereitgestellten Kanals."
+      thread_does_not_match_parent: "Der Thread stimmt nicht mit der übergeordneten Nachricht überein."
     reviewables:
       message_already_handled: "Danke, aber wir haben diese Nachricht bereits überprüft und festgestellt, dass sie nicht erneut markiert werden muss."
       actions:
@@ -114,20 +129,17 @@ de:
         transcript_title: "Transkript früherer Nachrichten in %{channel_name}"
         transcript_body: "Um dir mehr Kontext zu geben, haben wir ein Transkript der vorherigen Nachrichten in dieser Unterhaltung beigefügt (bis zu zehn):\n\n%{transcript}"
     channel:
-      statuses:
-        read_only: "Schreibgeschützt"
-        archived: "Archiviert"
-        closed: "Geschlossen"
-        open: "Offen"
       archive:
         first_post_raw: "Dieses Thema ist ein Archiv des Chat-Kanals [%{channel_name}](%{channel_url})."
       messages_moved:
         one: "@%{acting_username} hat eine Nachricht in den Kanal [%{channel_name}](%{first_moved_message_url}) verschoben."
         other: "@%{acting_username} hat %{count} Nachrichten in den Kanal [%{channel_name}](%{first_moved_message_url}) verschoben."
       dm_title:
-        single_user: "%{user}"
-        multi_user: "%{users}"
-        multi_user_truncated: "%{users} und %{leftover} andere"
+        single_user: "%{username}"
+        multi_user: "%{comma_separated_usernames}"
+        multi_user_truncated:
+          one: "%{comma_separated_usernames} und %{count} andere Person"
+          other: "%{comma_separated_usernames} und %{count} andere"
     category_channel:
       errors:
         slug_contains_non_ascii_chars: "enthält Nicht-ASCII-Zeichen"
@@ -145,6 +157,8 @@ de:
       and_x_others:
         one: "und %{count} andere Person"
         other: "und %{count} andere"
+    summaries:
+      no_targets: "Im ausgewählten Zeitraum gab es keine Nachrichten."
   discourse_push_notifications:
     popup:
       chat_mention:
diff --git a/plugins/chat/config/locales/server.el.yml b/plugins/chat/config/locales/server.el.yml
index 8f772e805f2..ae6a510fbcb 100644
--- a/plugins/chat/config/locales/server.el.yml
+++ b/plugins/chat/config/locales/server.el.yml
@@ -20,9 +20,8 @@ el:
         ignore:
           title: "Αγνόηση"
     channel:
-      statuses:
-        closed: "Κλειστό"
-        open: "Ξεκίνημα"
+      dm_title:
+        single_user: "%{username}"
   discourse_push_notifications:
     popup:
       chat_mention:
diff --git a/plugins/chat/config/locales/server.en.yml b/plugins/chat/config/locales/server.en.yml
index 372eda5e4a3..a8b4c143a43 100644
--- a/plugins/chat/config/locales/server.en.yml
+++ b/plugins/chat/config/locales/server.en.yml
@@ -1,6 +1,7 @@
 en:
   site_settings:
     chat_enabled: "Enable the chat plugin."
+    enable_public_channels: "Enable public channels based on categories."
     chat_allowed_groups: "Users in these groups can chat. Note that staff can always access chat."
     chat_channel_retention_days: "Chat messages in regular channels will be retained for this many days. Set to '0' to retain messages forever."
     chat_dm_retention_days: "Chat messages in personal chat channels will be retained for this many days. Set to '0' to retain messages forever."
@@ -49,16 +50,26 @@ en:
     deleted_chat_username: deleted
     errors:
       channel_exists_for_category: "A channel already exists for this category and name"
-      channel_new_message_disallowed: "The channel is %{status}, no new messages can be sent"
-      channel_modify_message_disallowed: "The channel is %{status}, no messages can be edited or deleted"
+      channel_new_message_disallowed:
+        archived: "The channel is archived, no new messages can be sent"
+        closed: "The channel is closed, no new messages can be sent"
+        read_only: "The channel is read only, no new messages can be sent"
+      channel_modify_message_disallowed:
+        archived: "The channel is archived, no messages can be edited or deleted"
+        closed: "The channel is closed, no messages can be edited or deleted"
+        read_only: "The channel is read only, no messages can be edited or deleted"
       user_cannot_send_message: "You cannot send messages at this time."
       rate_limit_exceeded: "Exceeded the limit of chat messages that can be sent within 30 seconds"
       auto_silence_from_flags: "Chat message flagged with score high enough to silence user."
       channel_cannot_be_archived: "The channel cannot be archived at this time, it must be either closed or open to archive."
       duplicate_message: "You posted an identical message too recently."
       delete_channel_failed: "Delete channel failed, please try again."
-      minimum_length_not_met: "Message is too short, must have a minimum of %{minimum} characters."
-      message_too_long: "Message is too long, messages must be a maximum of %{maximum} characters."
+      minimum_length_not_met:
+        one: "Message is too short, must have a minimum of %{count} character."
+        other: "Message is too short, must have a minimum of %{count} characters."
+      message_too_long:
+        one: "Message is too long, messages must be a maximum of %{count} character."
+        other: "Message is too long, messages must be a maximum of %{count} characters."
       draft_too_long: "Draft is too long."
       max_reactions_limit_reached: "New reactions are not allowed on this message."
       message_move_invalid_channel: "The source and destination channel must be public channels."
@@ -70,9 +81,13 @@ en:
       actor_disallowed_dms: "You have chosen to prevent users from sending you private and direct messages, so you cannot create new direct messages."
       actor_preventing_target_user_from_dm: "You have chosen to prevent %{username} from sending you private and direct messages, so you cannot create new direct messages to them."
       user_cannot_send_direct_messages: "Sorry, you cannot send direct messages."
+      over_chat_max_direct_message_users_allow_self: "You can only create a direct message with yourself."
       over_chat_max_direct_message_users:
-        one: "You can only create a direct message with yourself."
+        one: "You can't create a direct message with more than %{count} other user."
         other: "You can't create a direct message with more than %{count} other users."
+      original_message_not_found: "The ancestor of the message you are replying to cannot be found or has been deleted."
+      thread_invalid_for_channel: "Thread is not part of the provided channel."
+      thread_does_not_match_parent: "Thread does not match parent message."
     reviewables:
       message_already_handled: "Thanks, but we've already reviewed this message and determined it does not need to be flagged again."
       actions:
@@ -109,20 +124,17 @@ en:
         transcript_title: "Transcript of previous messages in %{channel_name}"
         transcript_body: "To give you more context, we included a transcript of the previous messages in this conversation (up to ten):\n\n%{transcript}"
     channel:
-      statuses:
-        read_only: "Read Only"
-        archived: "Archived"
-        closed: "Closed"
-        open: "Open"
       archive:
         first_post_raw: "This topic is an archive of the [%{channel_name}](%{channel_url}) chat channel."
       messages_moved:
         one: "@%{acting_username} moved a message to the [%{channel_name}](%{first_moved_message_url}) channel."
         other: "@%{acting_username} moved %{count} messages to the [%{channel_name}](%{first_moved_message_url}) channel."
       dm_title:
-        single_user: "%{user}"
-        multi_user: "%{users}"
-        multi_user_truncated: "%{users} and %{leftover} others"
+        single_user: "%{username}"
+        multi_user: "%{comma_separated_usernames}"
+        multi_user_truncated:
+          one: "%{comma_separated_usernames} and %{count} other"
+          other: "%{comma_separated_usernames} and %{count} others"
 
     category_channel:
       errors:
@@ -147,6 +159,9 @@ en:
         one: "and %{count} other"
         other: "and %{count} others"
 
+    summaries:
+      no_targets: "There were no messages during the selected period."
+
   discourse_push_notifications:
     popup:
       chat_mention:
diff --git a/plugins/chat/config/locales/server.es.yml b/plugins/chat/config/locales/server.es.yml
index 89e3a61c261..647460132e7 100644
--- a/plugins/chat/config/locales/server.es.yml
+++ b/plugins/chat/config/locales/server.es.yml
@@ -7,6 +7,7 @@
 es:
   site_settings:
     chat_enabled: "Habilitar el complemento de chat."
+    enable_public_channels: "Habilitar canales públicos basados en categorías."
     chat_allowed_groups: "Los usuarios de estos grupos pueden chatear. Ten en cuenta que el personal siempre puede acceder al chat."
     chat_channel_retention_days: "Los mensajes del chat en los canales regulares se conservarán durante este número de días. Poner a «0» para retener los mensajes para siempre."
     chat_dm_retention_days: "Los mensajes de chat en los canales de chat personales se conservarán durante este número de días. Ponlo en «0» para retener los mensajes para siempre."
@@ -54,16 +55,26 @@ es:
     deleted_chat_username: eliminado
     errors:
       channel_exists_for_category: "Ya existe un canal para esta categoría y nombre"
-      channel_new_message_disallowed: "El canal es %{status}, no se pueden enviar nuevos mensajes"
-      channel_modify_message_disallowed: "El canal está %{status}, no se pueden editar ni eliminar mensajes"
+      channel_new_message_disallowed:
+        archived: "El canal está archivado, no se pueden enviar nuevos mensajes"
+        closed: "El canal está cerrado, no se pueden enviar nuevos mensajes"
+        read_only: "El canal es de solo lectura, no se pueden enviar nuevos mensajes"
+      channel_modify_message_disallowed:
+        archived: "El canal está archivado, no se pueden editar ni eliminar mensajes"
+        closed: "El canal está cerrado, no se pueden editar ni eliminar mensajes"
+        read_only: "El canal es de solo lectura, no se pueden editar ni eliminar mensajes"
       user_cannot_send_message: "No puedes enviar mensajes en este momento."
       rate_limit_exceeded: "Se ha superado el límite de mensajes de chat que se pueden enviar en 30 segundos"
       auto_silence_from_flags: "Mensaje de chat marcado con una puntuación lo suficientemente alta como para silenciar al usuario."
       channel_cannot_be_archived: "El canal no se puede archivar en este momento, debe estar cerrado o abierto para ser archivado."
       duplicate_message: "Tú también publicaste un mensaje idéntico hace poco."
       delete_channel_failed: "No se pudo eliminar el canal, inténtalo de nuevo."
-      minimum_length_not_met: "El mensaje es demasiado corto, debe tener un mínimo de %{minimum} caracteres."
-      message_too_long: "El mensaje es demasiado largo, los mensajes deben tener un máximo de %{maximum} caracteres."
+      minimum_length_not_met:
+        one: "El mensaje es demasiado corto, debe tener un mínimo de %{count} carácter."
+        other: "El mensaje es demasiado corto, debe tener un mínimo de %{count} caracteres."
+      message_too_long:
+        one: "El mensaje es demasiado largo, los mensajes deben tener un máximo de %{count} carácter."
+        other: "El mensaje es demasiado largo, los mensajes deben tener un máximo de %{count} caracteres."
       draft_too_long: "El borrador es demasiado largo."
       max_reactions_limit_reached: "No se permiten nuevas reacciones en este mensaje."
       message_move_invalid_channel: "El canal de origen y el de destino deben ser canales públicos."
@@ -75,9 +86,13 @@ es:
       actor_disallowed_dms: "Has elegido impedir que los usuarios te envíen mensajes privados y directos, por lo que no puedes crear nuevos mensajes directos."
       actor_preventing_target_user_from_dm: "Has elegido impedir que %{username} te envíe mensajes privados y directos, por lo que no puedes crear nuevos mensajes directos para ellos."
       user_cannot_send_direct_messages: "Lo sentimos, no puedes enviar mensajes directos."
+      over_chat_max_direct_message_users_allow_self: "Solo puedes crear un mensaje directo contigo mismo."
       over_chat_max_direct_message_users:
-        one: "Solo puedes crear un mensaje directo contigo mismo."
+        one: "No puedes crear un mensaje directo con más de %{count} usuario."
         other: "No puedes crear un mensaje directo con más de %{count} usuarios."
+      original_message_not_found: "El antecesor del mensaje al que estás respondiendo no se encuentra o ha sido eliminado."
+      thread_invalid_for_channel: "El hilo no forma parte del canal proporcionado."
+      thread_does_not_match_parent: "El hilo no coincide con el mensaje principal."
     reviewables:
       message_already_handled: "Gracias, pero ya hemos revisado este mensaje y hemos determinado que no es necesario marcarlo de nuevo."
       actions:
@@ -114,20 +129,17 @@ es:
         transcript_title: "Transcripción de los mensajes anteriores en %{channel_name}"
         transcript_body: "Para darte más contexto, incluimos una transcripción de los mensajes anteriores de esta conversación (hasta diez):\n\n%{transcript}"
     channel:
-      statuses:
-        read_only: "Solo lectura"
-        archived: "Archivado"
-        closed: "Cerrado"
-        open: "Abierto"
       archive:
         first_post_raw: "Este tema es un archivo del canal de chat de [%{channel_name}](%{channel_url})."
       messages_moved:
         one: "@%{acting_username} movió un mensaje al canal [%{channel_name}](%{first_moved_message_url})."
         other: "@%{acting_username} movió %{count} mensajes al canal [%{channel_name}](%{first_moved_message_url})."
       dm_title:
-        single_user: "%{user}"
-        multi_user: "%{users}"
-        multi_user_truncated: "%{users} y %{leftover} otros"
+        single_user: "%{username}"
+        multi_user: "%{comma_separated_usernames}"
+        multi_user_truncated:
+          one: "%{comma_separated_usernames} y %{count} más"
+          other: "%{comma_separated_usernames} y otros %{count}"
     category_channel:
       errors:
         slug_contains_non_ascii_chars: "contiene caracteres no ascii"
@@ -145,6 +157,8 @@ es:
       and_x_others:
         one: "y %{count} otros"
         other: "y %{count} otros"
+    summaries:
+      no_targets: "No hubo mensajes durante el periodo seleccionado."
   discourse_push_notifications:
     popup:
       chat_mention:
diff --git a/plugins/chat/config/locales/server.et.yml b/plugins/chat/config/locales/server.et.yml
index 432df77dfce..3be298b397c 100644
--- a/plugins/chat/config/locales/server.et.yml
+++ b/plugins/chat/config/locales/server.et.yml
@@ -20,9 +20,8 @@ et:
         ignore:
           title: "Ignoreeri"
     channel:
-      statuses:
-        closed: "Suletud"
-        open: "Ava"
+      dm_title:
+        single_user: "%{username}"
   discourse_push_notifications:
     popup:
       chat_mention:
diff --git a/plugins/chat/config/locales/server.fa_IR.yml b/plugins/chat/config/locales/server.fa_IR.yml
index a9f994cca76..195f79de7e7 100644
--- a/plugins/chat/config/locales/server.fa_IR.yml
+++ b/plugins/chat/config/locales/server.fa_IR.yml
@@ -20,7 +20,9 @@ fa_IR:
     deleted_chat_username: حذف شد
     errors:
       channel_exists_for_category: "یک کانال دیگر از قبل برای این دسته‌بندی و نام وجود دارد"
-      message_too_long: "پیام خیلی طولانی است، پیام‌ها باید حداکثر %{maximum} کاراکتر داشته باشند."
+      message_too_long:
+        one: "پیام خیلی طولانی است، پیام‌ها باید حداکثر %{count} کاراکتر داشته باشند."
+        other: "پیام خیلی طولانی است، پیام‌ها باید حداکثر %{count} کاراکتر داشته باشند."
       draft_too_long: "پیش‌نویس خیلی طولانی است."
       cant_update_direct_message_channel: "ویژگی پیام مستقیم کانال مانند نام و توضیحات را نمی‌توان به‌روز کرد."
       not_accepting_dms: "با عرض پوزش، کاربر %{username} در حال حاضر پیام نمی‌پذیرد."
@@ -52,15 +54,11 @@ fa_IR:
         transcript_title: "رونوشت پیام‌های قبلی در %{channel_name}"
         transcript_body: "برای ارائه متن بیشتر به شما، رونوشتی از پیام‌های قبلی را در این گفتگو (حداکثر ده مورد) قرار دادیم:\n\n%{transcript}"
     channel:
-      statuses:
-        read_only: "فقط خواندنی"
-        archived: "بایگانی شد"
-        closed: "بسته"
-        open: "باز"
       dm_title:
-        single_user: "%{user}"
-        multi_user: "%{users}"
-        multi_user_truncated: "%{users} و %{leftover} نفر دیگر"
+        single_user: "%{username}"
+        multi_user_truncated:
+          one: "%{comma_separated_usernames} و %{count} نفر دیگر"
+          other: "%{comma_separated_usernames} و %{count} نفر دیگر"
     bookmarkable:
       notification_title: "پیام در %{channel_name}"
     personal_chat: "گفتگوی شخصی"
diff --git a/plugins/chat/config/locales/server.fi.yml b/plugins/chat/config/locales/server.fi.yml
index 822200ae878..a472a015158 100644
--- a/plugins/chat/config/locales/server.fi.yml
+++ b/plugins/chat/config/locales/server.fi.yml
@@ -7,6 +7,7 @@
 fi:
   site_settings:
     chat_enabled: "Ota chat-lisäosa käyttöön."
+    enable_public_channels: "Käytä julkisia kanavia kategorioiden perusteella."
     chat_allowed_groups: "Näiden ryhmien käyttäjät voivat keskustella chatissa. Huomaa, että henkilökunnalla on aina chatin käyttöoikeus."
     chat_channel_retention_days: "Tavallisten kanavien chat-viestit säilytetään näin monta päivää. Viestit säilytetään ikuisesti, jos asetat arvoksi 0."
     chat_dm_retention_days: "Henkilökohtaisten chat-kanavien chat-viestit säilytetään näin monta päivää. Viestit säilytetään ikuisesti, jos asetat arvoksi 0."
@@ -44,16 +45,15 @@ fi:
     deleted_chat_username: poistettu
     errors:
       channel_exists_for_category: "Tällä alueella ja nimellä on jo olemassa kanava"
-      channel_new_message_disallowed: "Kanava on %{status}, uusia viestejä ei voi lähettää"
-      channel_modify_message_disallowed: "Kanava on %{status}, viestejä ei voi muokata tai poistaa"
       user_cannot_send_message: "Et voi lähettää viestejä tällä hetkellä."
       rate_limit_exceeded: "Ylitti 30 sekunnin sisällä lähetettävien chat-viestien rajan"
       auto_silence_from_flags: "Chat-viesti liputettiin riittävän korkealla pistemäärällä käyttäjän hiljentämiseksi."
       channel_cannot_be_archived: "Kanavaa ei voi arkistoida tällä hetkellä, sen täytyy olla suljettu tai avoinna, jotta sen voi arkistoida."
       duplicate_message: "Lähetit identtisen viestin liian äskettäin."
       delete_channel_failed: "Kanavan poistaminen epäonnistui, yritä uudelleen."
-      minimum_length_not_met: "Viesti on liian lyhyt, siinä täytyy olla vähintään %{minimum} merkkiä."
-      message_too_long: "Viesti on liian pitkä, viesteissä täytyy olla enintään %{maximum} merkkiä."
+      message_too_long:
+        one: "Viesti on liian pitkä, viesteissä täytyy olla enintään %{count} merkkiä."
+        other: "Viesti on liian pitkä, viesteissä täytyy olla enintään %{count} merkkiä."
       max_reactions_limit_reached: "Uusia reaktioita ei sallita tässä viestissä."
       message_move_invalid_channel: "Lähde- ja kohdekanavan täytyy olla julkisia kanavia."
       message_move_no_messages_found: "Annetuilla viestitunnuksilla ei löytynyt viestejä."
@@ -64,9 +64,9 @@ fi:
       actor_disallowed_dms: "Olet päättänyt estää käyttäjiä lähettämästä sinulle yksityisviestejä, joten et voi luoda uusia yksityisviestejä."
       actor_preventing_target_user_from_dm: "Olet päättänyt estää käyttäjää %{username} lähettämästä sinulle yksityisviestejä, joten et voi luoda uusia yksityisviestejä hänelle."
       user_cannot_send_direct_messages: "Valitettavasti et voi lähettää yksityisviestejä."
-      over_chat_max_direct_message_users:
-        one: "Voit luoda yksityisviestin vain itsellesi."
-        other: "Et voi luoda yksityisviestiä useammalle kuin %{count} muulle käyttäjälle."
+      over_chat_max_direct_message_users_allow_self: "Voit luoda yksityisviestin vain itsellesi."
+      thread_invalid_for_channel: "Ketju ei kuulu ilmoitetulle kanavalle."
+      thread_does_not_match_parent: "Ketju ei vastaa ylemmän tason viestiä."
     reviewables:
       message_already_handled: "Kiitos, mutta olemme jo käsitelleet tämän viestin ja todenneet, ettei sitä tarvitse liputtaa uudelleen."
       actions:
@@ -103,20 +103,16 @@ fi:
         transcript_title: "Kanavan %{channel_name} aiempien viestin transkriptio"
         transcript_body: "Antaaksemme sinulle enemmän kontekstia lisäsimme tämän keskustelun aiempien viestien transkription (enintään kymmenen):\n\n%{transcript}"
     channel:
-      statuses:
-        read_only: "Vain luku"
-        archived: "Arkistoitu"
-        closed: "Suljettu"
-        open: "Avoinna"
       archive:
         first_post_raw: "Tämä ketju on chat-kanavan [%{channel_name}](%{channel_url}) arkisto."
       messages_moved:
         one: "@%{acting_username} siirsi viestin kanavalle [%{channel_name}](%{first_moved_message_url})."
         other: "@%{acting_username} siirsi %{count} viestiä kanavalle [%{channel_name}](%{first_moved_message_url})."
       dm_title:
-        single_user: "%{user}"
-        multi_user: "%{users}"
-        multi_user_truncated: "%{users} ja %{leftover} muuta"
+        single_user: "%{username}"
+        multi_user_truncated:
+          one: "%{comma_separated_usernames} ja %{count} muu"
+          other: "%{comma_separated_usernames} ja %{count} muuta"
     category_channel:
       errors:
         slug_contains_non_ascii_chars: "sisältää muita kuin ascii-merkkejä"
diff --git a/plugins/chat/config/locales/server.fr.yml b/plugins/chat/config/locales/server.fr.yml
index 76ae88a4de2..18941228f3b 100644
--- a/plugins/chat/config/locales/server.fr.yml
+++ b/plugins/chat/config/locales/server.fr.yml
@@ -54,16 +54,15 @@ fr:
     deleted_chat_username: supprimé
     errors:
       channel_exists_for_category: "Un canal existe déjà pour cette catégorie et ce nom"
-      channel_new_message_disallowed: "Le canal a le statut %{status}, aucun nouveau message ne peut être envoyé"
-      channel_modify_message_disallowed: "Le canal a le statut %{status}, aucun message ne peut être modifié ou supprimé"
       user_cannot_send_message: "Vous ne pouvez pas envoyer de messages pour le moment."
       rate_limit_exceeded: "Dépassement de la limite de messages de discussion pouvant être envoyés dans les 30 secondes"
       auto_silence_from_flags: "Message de discussion marqué avec un score suffisamment élevé pour mettre l'utilisateur en sourdine."
       channel_cannot_be_archived: "Le canal ne peut pas être archivé pour le moment, il doit être soit fermé, soit ouvert à l'archivage."
       duplicate_message: "Vous avez publié un message identique trop récemment."
       delete_channel_failed: "Échec de la suppression du canal, veuillez réessayer."
-      minimum_length_not_met: "Le message est trop court. Il doit comporter au moins %{minimum} caractères."
-      message_too_long: "Le message est trop long, les messages doivent comporter au maximum %{maximum} caractères."
+      message_too_long:
+        one: "Le message est trop long, les messages doivent comporter au maximum %{count} caractères."
+        other: "Le message est trop long, les messages doivent comporter au maximum %{count} caractères."
       max_reactions_limit_reached: "Les nouvelles réactions ne sont pas autorisées sur ce message."
       message_move_invalid_channel: "Le canal source et le canal de destination doivent être des canaux publics."
       message_move_no_messages_found: "Aucun message n'a été trouvé avec les ID de message fournis."
@@ -74,9 +73,7 @@ fr:
       actor_disallowed_dms: "Vous avez choisi d'empêcher les utilisateurs de vous envoyer des messages privés et directs, vous ne pouvez donc pas créer de nouveaux messages directs."
       actor_preventing_target_user_from_dm: "Vous avez choisi d'empêcher %{username} de vous envoyer des messages privés et directs, vous ne pouvez donc pas lui envoyer de nouveaux messages privés."
       user_cannot_send_direct_messages: "Nous sommes désolés, vous ne pouvez pas envoyer de messages privés."
-      over_chat_max_direct_message_users:
-        one: "Vous ne pouvez créer un message privé qu'avec vous-même."
-        other: "Vous ne pouvez pas créer de message privé avec plus de %{count} autres utilisateurs."
+      over_chat_max_direct_message_users_allow_self: "Vous ne pouvez créer un message privé qu'avec vous-même."
     reviewables:
       message_already_handled: "Merci, mais nous avons déjà examiné ce message et déterminé qu'il n'a pas besoin d'être signalé à nouveau."
       actions:
@@ -113,20 +110,16 @@ fr:
         transcript_title: "Transcription des messages précédents dans le canal %{channel_name}"
         transcript_body: "Pour vous donner plus de contexte, nous avons inclus une transcription des messages précédents de cette conversation (jusqu'à dix) :\n\n%{transcript}"
     channel:
-      statuses:
-        read_only: "Lecture seule"
-        archived: "Archivé"
-        closed: "Fermé"
-        open: "Ouvert"
       archive:
         first_post_raw: "Ce sujet est une archive du canal de discussion [%{channel_name}](%{channel_url})."
       messages_moved:
         one: "@%{acting_username} a déplacé un message vers le canal [%{channel_name}](%{first_moved_message_url})."
         other: "@%{acting_username} a déplacé %{count} messages vers le canal [%{channel_name}](%{first_moved_message_url})."
       dm_title:
-        single_user: "%{user}"
-        multi_user: "%{users}"
-        multi_user_truncated: "%{users} et %{leftover} autres utilisateurs"
+        single_user: "%{username}"
+        multi_user_truncated:
+          one: "%{comma_separated_usernames} et %{count} autre participant"
+          other: "%{comma_separated_usernames} et %{count} autres utilisateurs"
     category_channel:
       errors:
         slug_contains_non_ascii_chars: "contient des caractères non ASCII"
diff --git a/plugins/chat/config/locales/server.gl.yml b/plugins/chat/config/locales/server.gl.yml
index c1abe6a185a..05e39da2bbf 100644
--- a/plugins/chat/config/locales/server.gl.yml
+++ b/plugins/chat/config/locales/server.gl.yml
@@ -24,9 +24,8 @@ gl:
         ignore:
           title: "Ignorar"
     channel:
-      statuses:
-        closed: "Pechado"
-        open: "Abrir"
+      dm_title:
+        single_user: "%{username}"
   discourse_push_notifications:
     popup:
       chat_mention:
diff --git a/plugins/chat/config/locales/server.he.yml b/plugins/chat/config/locales/server.he.yml
index 85772838abe..a2372479c4b 100644
--- a/plugins/chat/config/locales/server.he.yml
+++ b/plugins/chat/config/locales/server.he.yml
@@ -7,6 +7,7 @@
 he:
   site_settings:
     chat_enabled: "הפעלת תוסף הצ׳אט."
+    enable_public_channels: "הפעלת ערוצים ציבוריים על בסיס קטגוריות."
     chat_allowed_groups: "משתמשים בקבוצות אלה יכולים לשוחח בצ׳אט. נא לשים לב שהסגל תמיד יכול לגשת לצ׳אט."
     chat_channel_retention_days: "הודעות הצ׳אט בערוצים הרגילים ישמרו למשך כמות כזאת של ימים. הגדרה לאפס תשמור את ההודעות לעד."
     chat_dm_retention_days: "הודעות הצ׳אט בערוצי הצ׳אט האישיים ישמרו למשך כמות כזאת של ימים. הגדרה לאפס תשמור את ההודעות לעד."
@@ -54,16 +55,30 @@ he:
     deleted_chat_username: נמחק
     errors:
       channel_exists_for_category: "כבר קיים ערוץ לקטגוריה ולשם האלו"
-      channel_new_message_disallowed: "הערוץ %{status}, לא ניתן לשלוח הודעות חדשות"
-      channel_modify_message_disallowed: "הערוץ %{status}, לא ניתן לערוך או למחוק הודעות"
+      channel_new_message_disallowed:
+        archived: "הערוץ נמצא בארכיון, לא ניתן לשלוח הודעות חדשות"
+        closed: "הערוץ סגור, לא ניתן לשלוח הודעות חדשות"
+        read_only: "הערוץ הוא לקריאה בלבד, לא ניתן לשלוח הודעות חדשות"
+      channel_modify_message_disallowed:
+        archived: "הערוץ שמור בארכיון, אין אפשרות לערוך או למחוק הודעות"
+        closed: "הערוץ סגור, אין אפשרות לערוך או למחוק הודעות"
+        read_only: "הערוץ הוא לקריאה בלבד, אין אפשרות לערוך או למחוק הודעות"
       user_cannot_send_message: "אין לך אפשרות לשלוח הודעות כרגע."
       rate_limit_exceeded: "חריגה ממגבלת הודעות הצ׳אט שניתן לשלוח תוך 30 שניות"
       auto_silence_from_flags: "הודעת צ׳אט שסומנה בציון גבוה מספיק כדי להשתיק את המשתמש."
       channel_cannot_be_archived: "אי אפשר להעביר את הערוץ לארכיון כרגע, הוא חייב להיות סגור או פתוח להעברה לארכיון."
       duplicate_message: "פרסמת הודעה זהה לפני זמן קצר מדי."
       delete_channel_failed: "מחיקת הערוץ נכשלה, נא לנסות שוב."
-      minimum_length_not_met: "ההודעה קצרה מדי, היא חייבת להיות ארוכה מ־%{minimum} תווים"
-      message_too_long: "ההודעה ארוכה מדי, היא חייבת להיות באורך של עד %{maximum} תווים לכל היותר."
+      minimum_length_not_met:
+        one: "ההודעה קצרה מדי, חייבת להיות באורך של תו %{count} לפחות."
+        two: "ההודעה קצרה מדי, חייבת להיות באורך של %{count} תווים לפחות."
+        many: "ההודעה קצרה מדי, חייבת להיות באורך של %{count} תווים לפחות."
+        other: "ההודעה קצרה מדי, חייבת להיות באורך של %{count} תווים לפחות."
+      message_too_long:
+        one: "ההודעה ארוכה מדי, היא חייבת להיות באורך של עד %{count} תווים לכל היותר."
+        two: "ההודעה ארוכה מדי, היא חייבת להיות באורך של עד %{count} תווים לכל היותר."
+        many: "ההודעה ארוכה מדי, היא חייבת להיות באורך של עד %{count} תווים לכל היותר."
+        other: "ההודעה ארוכה מדי, היא חייבת להיות באורך של עד %{count} תווים לכל היותר."
       draft_too_long: "הטיוטה ארוכה מדי."
       max_reactions_limit_reached: "רגשות חדשים אסורים בהודעה זו."
       message_move_invalid_channel: "ערוצי המקור והיעד חייבים להיות ערוצים ציבוריים."
@@ -75,11 +90,15 @@ he:
       actor_disallowed_dms: "בחרת למנוע ממשתמשים לשלוח אליך הודעות פרטיות וישירות כך שאין לך אפשרות ליצור הודעות ישירות חדשות."
       actor_preventing_target_user_from_dm: "בחרת למנוע מ־%{username} לשלוח אליך הודעות פרטיות וישירות כך שאין לך אפשרות ליצור הודעות ישירות חדשות אליהם."
       user_cannot_send_direct_messages: "מחילה, אין לך אפשרות לשלוח הודעות ישירות."
+      over_chat_max_direct_message_users_allow_self: "אין לך אפשרות ליצור הודעות ישירות מול עצמך."
       over_chat_max_direct_message_users:
-        one: "אין לך אפשרות ליצור הודעות ישירות מול עצמך."
+        one: "אין לך אפשרות ליצור הודעות ישירות מול למעלה ממשתמש %{count} נוסף."
         two: "אין לך אפשרות ליצור הודעות ישירות מול למעלה מ־%{count} משתמשים נוספים."
         many: "אין לך אפשרות ליצור הודעות ישירות מול למעלה מ־%{count} משתמשים נוספים."
         other: "אין לך אפשרות ליצור הודעות ישירות מול למעלה מ־%{count} משתמשים נוספים."
+      original_message_not_found: "מקור ההודעה אליה ניסית להגיב לא נמצא או שנמחק."
+      thread_invalid_for_channel: "השרשור הוא לא חלק מהערוץ שסופק."
+      thread_does_not_match_parent: "השרשור לא תואם להודעת ההורה."
     reviewables:
       message_already_handled: "תודה, אבל כבר סקרנו הודעה זו וקבענו שאין צורך לסמן אותה שוב."
       actions:
@@ -116,11 +135,6 @@ he:
         transcript_title: "תמלול הודעות קודמות בערוץ %{channel_name}"
         transcript_body: "כדי לתת לך יותר הקשר, הוספנו תמליל של (עד עשר) ההודעות הקודמות בשיחה זו:\n\n%{transcript}"
     channel:
-      statuses:
-        read_only: "לקריאה בלבד"
-        archived: "בארכיון"
-        closed: "סגורה"
-        open: "פתיחה"
       archive:
         first_post_raw: "הנושא הזה הוא הארכיון של ערוץ הצ׳אט [%{channel_name}](%{channel_url})."
       messages_moved:
@@ -129,9 +143,13 @@ he:
         many: "%{count} הודעות הועברו על ידי ‎@%{acting_username} לערוץ [%{channel_name}](%{first_moved_message_url})."
         other: "%{count} הודעות הועברו על ידי ‎@%{acting_username} לערוץ [%{channel_name}](%{first_moved_message_url})."
       dm_title:
-        single_user: "%{user}"
-        multi_user: "%{users}"
-        multi_user_truncated: "%{users} ועוד %{leftover}"
+        single_user: "%{username}"
+        multi_user: "%{comma_separated_usernames}"
+        multi_user_truncated:
+          one: "%{comma_separated_usernames} ועוד %{count}"
+          two: "%{comma_separated_usernames} ועוד %{count}"
+          many: "%{comma_separated_usernames} ועוד %{count}"
+          other: "%{comma_separated_usernames} ועוד %{count}"
     category_channel:
       errors:
         slug_contains_non_ascii_chars: "מכיל תווים שאינם בתחום ASCII"
@@ -153,6 +171,8 @@ he:
         two: "ו־%{count} נוספים"
         many: "ו־%{count} נוספים"
         other: "ו־%{count} נוספים"
+    summaries:
+      no_targets: "לא היו הודעות במהלך התקופה הנבחרת."
   discourse_push_notifications:
     popup:
       chat_mention:
diff --git a/plugins/chat/config/locales/server.hr.yml b/plugins/chat/config/locales/server.hr.yml
index b3ecf9d0fee..b3229ed1857 100644
--- a/plugins/chat/config/locales/server.hr.yml
+++ b/plugins/chat/config/locales/server.hr.yml
@@ -27,9 +27,8 @@ hr:
         ignore:
           title: "Zanemari"
     channel:
-      statuses:
-        closed: "Zatvoreno"
-        open: "Otvori"
+      dm_title:
+        single_user: "%{username}"
     category_channel:
       errors:
         slug_contains_non_ascii_chars: "sadrži ne-ascii znakove"
diff --git a/plugins/chat/config/locales/server.hu.yml b/plugins/chat/config/locales/server.hu.yml
index 21e49c8edf0..db7d5545414 100644
--- a/plugins/chat/config/locales/server.hu.yml
+++ b/plugins/chat/config/locales/server.hu.yml
@@ -33,16 +33,15 @@ hu:
     deleted_chat_username: törölt
     errors:
       channel_exists_for_category: "Már létezik csatorna ehhez a kategóriával, és ezzel a névvel"
-      channel_new_message_disallowed: "A csatorna „%{status}”, új üzenet nem küldhető"
-      channel_modify_message_disallowed: "A csatorna „%{status}”, az üzenetek nem szerkeszthetők vagy törölhetők"
       user_cannot_send_message: "Jelenleg nem küldhet üzeneteket."
       rate_limit_exceeded: "Túllépte a 30 másodpercen belül elküldhető csevegőüzenetek korlátját"
       auto_silence_from_flags: "A csevegőüzenet elég magas pontszámmal lett megjelölve, hogy a felhasználó némítva legyen."
       channel_cannot_be_archived: "A csatorna jelenleg nem archiválható, a csatornát vagy le kell zárni, vagy meg kell nyitni az archiváláshoz."
       duplicate_message: "Nemrég küldött egy azonos tartalmú üzenetet."
       delete_channel_failed: "A csatorna törlése sikertelen, próbálja meg újra."
-      minimum_length_not_met: "Az üzenet túl rövid, legalább %{minimum} karaktert kell tartalmaznia."
-      message_too_long: "Az üzenet túl hosszú, az üzenetek legfeljebb %{maximum} karakterekből állhatnak."
+      message_too_long:
+        one: "Az üzenet túl hosszú, az üzenetek legfeljebb %{count} karakterekből állhatnak."
+        other: "Az üzenet túl hosszú, az üzenetek legfeljebb %{count} karakterekből állhatnak."
       draft_too_long: "A vázlat túl hosszú."
       max_reactions_limit_reached: "Új reakciók nem engedélyezettek ezen az üzeneten."
       message_move_invalid_channel: "A forrás- és célcsatornának nyilvános csatornának kell lennie."
@@ -79,20 +78,16 @@ hu:
         ignore:
           title: "Letiltás"
     channel:
-      statuses:
-        read_only: "Csak olvasható"
-        archived: "Archivált"
-        closed: "Zárt"
-        open: "Megnyitás"
       archive:
         first_post_raw: "Ez a téma a(z) [%{channel_name}](%{channel_url}) csevegőcsatorna archívuma."
       messages_moved:
         one: "@%{acting_username} áthelyezett egy üzenetet a(z) [%{channel_name}](%{first_moved_message_url}) csatornába."
         other: "@%{acting_username} áthelyezett %{count} üzenetet a(z) [%{channel_name}](%{first_moved_message_url}) csatornába."
       dm_title:
-        single_user: "%{user}"
-        multi_user: "%{users}"
-        multi_user_truncated: "%{users} és még %{leftover} fő"
+        single_user: "%{username}"
+        multi_user_truncated:
+          one: "%{comma_separated_usernames} és még %{count} fő"
+          other: "%{comma_separated_usernames} és még %{count} fő"
     category_channel:
       errors:
         slug_contains_non_ascii_chars: "nem ASCII karaktereket tartalmaz"
diff --git a/plugins/chat/config/locales/server.hy.yml b/plugins/chat/config/locales/server.hy.yml
index 6248aff03a1..ceae459c455 100644
--- a/plugins/chat/config/locales/server.hy.yml
+++ b/plugins/chat/config/locales/server.hy.yml
@@ -22,9 +22,8 @@ hy:
         ignore:
           title: "Անտեսել"
     channel:
-      statuses:
-        closed: "Փակված"
-        open: "Բացել"
+      dm_title:
+        single_user: "%{username}"
   discourse_push_notifications:
     popup:
       chat_mention:
diff --git a/plugins/chat/config/locales/server.id.yml b/plugins/chat/config/locales/server.id.yml
index 45f2f9674c8..9a9100c1c2a 100644
--- a/plugins/chat/config/locales/server.id.yml
+++ b/plugins/chat/config/locales/server.id.yml
@@ -7,6 +7,7 @@
 id:
   site_settings:
     chat_enabled: "Aktifkan plugin obrolan."
+    enable_public_channels: "Aktifkan saluran publik berdasarkan kategori."
     chat_allowed_groups: "Pengguna dalam grup ini dapat mengobrol. Perhatikan bahwa staf selalu dapat mengakses obrolan."
     chat_channel_retention_days: "Pesan obrolan di kanal reguler akan disimpan selama beberapa hari ini. Setel ke '0' untuk mempertahankan pesan selamanya."
     chat_dm_retention_days: "Pesan obrolan di kanal obrolan pribadi akan dipertahankan selama beberapa hari ini. Setel ke '0' untuk mempertahankan pesan selamanya."
@@ -54,16 +55,24 @@ id:
     deleted_chat_username: dihapus
     errors:
       channel_exists_for_category: "Kanal sudah ada untuk kategori dan nama ini"
-      channel_new_message_disallowed: "Kanalnya %{status}, tidak ada pesan baru yang dapat dikirim"
-      channel_modify_message_disallowed: "Kanalnya %{status}, tidak ada pesan yang dapat diedit atau dihapus"
+      channel_new_message_disallowed:
+        archived: "Kanal diarsipkan, tidak ada pesan baru yang dapat dikirim"
+        closed: "Kanal ditutup, tidak ada pesan baru yang dapat dikirim"
+        read_only: "Kanal hanya dapat dibaca, tidak ada pesan baru yang dapat dikirim"
+      channel_modify_message_disallowed:
+        archived: "Kanal diarsipkan, tidak ada pesan yang dapat diedit atau dihapus"
+        closed: "Kanal ditutup, tidak ada pesan yang dapat diedit atau dihapus"
+        read_only: "Kanal hanya dapat dibaca, tidak ada pesan yang dapat diedit atau dihapus"
       user_cannot_send_message: "Anda tidak dapat mengirim pesan saat ini."
       rate_limit_exceeded: "Melebihi batas pesan obrolan yang dapat dikirim dalam waktu 30 detik"
       auto_silence_from_flags: "Pesan obrolan ditandai dengan skor yang cukup tinggi untuk membuat senyap pengguna."
       channel_cannot_be_archived: "Kanal tidak dapat diarsipkan saat ini, harus ditutup atau dibuka untuk diarsipkan."
       duplicate_message: "Anda mengirim pesan yang sama baru-baru ini."
       delete_channel_failed: "Hapus kanal gagal, harap coba lagi."
-      minimum_length_not_met: "Pesan terlalu singkat, minimal harus berisi %{minimum} karakter."
-      message_too_long: "Pesan terlalu panjang, pesan harus maksimal %{maximum} karakter."
+      minimum_length_not_met:
+        other: "Pesan terlalu singkat, minimal harus berisi %{count} karakter."
+      message_too_long:
+        other: "Pesan terlalu panjang, pesan harus maksimal %{count} karakter."
       draft_too_long: "Draf terlalu panjang."
       max_reactions_limit_reached: "Reaksi baru tidak diperbolehkan pada pesan ini."
       message_move_invalid_channel: "Kanal sumber dan tujuan harus kanal publik."
@@ -75,8 +84,12 @@ id:
       actor_disallowed_dms: "Anda telah memilih untuk mencegah pengguna mengirimi Anda pesan langsung dan pribadi, sehingga Anda tidak dapat membuat pesan langsung baru."
       actor_preventing_target_user_from_dm: "Anda telah memilih untuk mencegah %{username} mengirimi Anda pesan langsung dan pribadi, sehingga Anda tidak dapat membuat pesan langsung baru untuk dia."
       user_cannot_send_direct_messages: "Maaf, Anda tidak dapat mengirim pesan langsung."
+      over_chat_max_direct_message_users_allow_self: "Anda hanya dapat membuat pesan langsung dengan diri Anda sendiri."
       over_chat_max_direct_message_users:
         other: "Anda tidak dapat membuat pesan langsung dengan lebih dari %{count} pengguna lain."
+      original_message_not_found: "Nenek moyang pesan yang Anda balas tidak dapat ditemukan atau telah dihapus."
+      thread_invalid_for_channel: "Utas bukan bagian dari saluran yang disediakan."
+      thread_does_not_match_parent: "Utas tidak cocok dengan pesan induk."
     reviewables:
       message_already_handled: "Terima kasih, tetapi kami telah meninjau pesan ini dan memutuskan bahwa pesan ini tidak perlu ditandai lagi."
       actions:
@@ -113,19 +126,15 @@ id:
         transcript_title: "Transkrip pesan sebelumnya di %{channel_name}"
         transcript_body: "Untuk memberi Anda lebih banyak konteks, kami menyertakan transkrip pesan sebelumnya dalam percakapan ini (hingga sepuluh):\n\n%{transcript}"
     channel:
-      statuses:
-        read_only: "Hanya Baca"
-        archived: "Diarsipkan"
-        closed: "Tertutup"
-        open: "Buka"
       archive:
         first_post_raw: "Topik ini adalah arsip dari kanal obrolan [%{channel_name}](%{channel_url})."
       messages_moved:
         other: "@%{acting_username} memindahkan %{count} pesan ke kanal [%{channel_name}](%{first_moved_message_url})."
       dm_title:
-        single_user: "%{user}"
-        multi_user: "%{users}"
-        multi_user_truncated: "%{users} dan %{leftover} lainnya"
+        single_user: "%{username}"
+        multi_user: "%{comma_separated_usernames}"
+        multi_user_truncated:
+          other: "%{comma_separated_usernames} dan %{count} lainnya"
     category_channel:
       errors:
         slug_contains_non_ascii_chars: "berisi karakter non-ascii"
@@ -141,6 +150,8 @@ id:
         other: "%{count} anggota"
       and_x_others:
         other: "dan %{count} lainnya"
+    summaries:
+      no_targets: "Tidak ada pesan selama periode yang dipilih."
   discourse_push_notifications:
     popup:
       chat_mention:
diff --git a/plugins/chat/config/locales/server.it.yml b/plugins/chat/config/locales/server.it.yml
index f5db57f1f65..c069e1bc1dc 100644
--- a/plugins/chat/config/locales/server.it.yml
+++ b/plugins/chat/config/locales/server.it.yml
@@ -7,6 +7,7 @@
 it:
   site_settings:
     chat_enabled: "Abilita il plug-in della chat."
+    enable_public_channels: "Abilita i canali pubblici in base alle categorie."
     chat_allowed_groups: "Gli utenti di questi gruppi possono chattare. Tieni presente che lo staff può sempre accedere alla chat."
     chat_channel_retention_days: "I messaggi di chat nei canali normali saranno conservati per i giorni indicati. Impostare il parametro a '0' per conservare i messaggi per sempre."
     chat_dm_retention_days: "I messaggi di chat nei canali di chat personali saranno conservati per i giorni indicati. Impostare il parametro a '0' per conservare i messaggi per sempre."
@@ -48,16 +49,23 @@ it:
     deleted_chat_username: eliminato
     errors:
       channel_exists_for_category: "Esiste già un canale per questa categoria e questo nome"
-      channel_new_message_disallowed: "Il canale è %{status}, non è possibile inviare nuovi messaggi"
-      channel_modify_message_disallowed: "Il canale è %{status}, nessun messaggio può essere modificato o cancellato"
+      channel_new_message_disallowed:
+        archived: "Il canale è archiviato, non è possibile inviare nuovi messaggi"
+        closed: "Il canale è chiuso, non è possibile inviare nuovi messaggi"
+        read_only: "Il canale è di sola lettura, non è possibile inviare nuovi messaggi"
+      channel_modify_message_disallowed:
+        archived: "Il canale è archiviato, nessun messaggio può essere modificato o cancellato"
+        closed: "Il canale è chiuso, nessun messaggio può essere modificato o cancellato"
+        read_only: "Il canale è a sola lettura, nessun messaggio può essere modificato o cancellato"
       user_cannot_send_message: "In questo momento non puoi inviare messaggi."
       rate_limit_exceeded: "Superato il limite dei messaggi di chat che possono essere inviati in 30 secondi"
       auto_silence_from_flags: "Messaggio di chat contrassegnato con un punteggio sufficientemente alto per silenziare l'utente."
       channel_cannot_be_archived: "Il canale non può essere archiviato in questo momento, deve essere chiuso o aperto per l'archiviazione."
       duplicate_message: "Hai pubblicato un messaggio identico troppo di recente."
       delete_channel_failed: "Eliminazione del canale non riuscita, riprova."
-      minimum_length_not_met: "Il messaggio è troppo breve, deve contenere almeno %{minimum} caratteri."
-      message_too_long: "Il messaggio è troppo lungo. I messaggi devono contenere al massimo %{maximum} caratteri."
+      message_too_long:
+        one: "Il messaggio è troppo lungo. I messaggi devono contenere al massimo %{count} caratteri."
+        other: "Il messaggio è troppo lungo. I messaggi devono contenere al massimo %{count} caratteri."
       draft_too_long: "La bozza è troppo lunga."
       max_reactions_limit_reached: "Non sono consentite nuove reazioni su questo messaggio."
       message_move_invalid_channel: "I canali di origine e di destinazione devono essere canali pubblici."
@@ -69,9 +77,10 @@ it:
       actor_disallowed_dms: "Hai scelto di impedire agli utenti di inviarti messaggi privati e diretti, quindi non puoi creare nuovi messaggi diretti."
       actor_preventing_target_user_from_dm: "Hai scelto di impedire a %{username} di inviarti messaggi privati e diretti, quindi non puoi creare nuovi messaggi diretti per questo destinatario."
       user_cannot_send_direct_messages: "Spiacenti, non puoi inviare messaggi diretti."
-      over_chat_max_direct_message_users:
-        one: "Puoi creare solo un messaggio diretto a te stesso."
-        other: "Non puoi creare un messaggio diretto con più di altri %{count} utenti."
+      over_chat_max_direct_message_users_allow_self: "Puoi creare solo un messaggio diretto a te stesso."
+      original_message_not_found: "L'antenato del messaggio a cui stai rispondendo non è stato trovato o è stato eliminato."
+      thread_invalid_for_channel: "Il thread non fa parte del canale fornito."
+      thread_does_not_match_parent: "Il thread non corrisponde al messaggio principale."
     reviewables:
       message_already_handled: "Grazie, ma abbiamo già esaminato questo messaggio e stabilito che non è necessario contrassegnarlo di nuovo."
       actions:
@@ -108,20 +117,17 @@ it:
         transcript_title: "Trascrizione dei messaggi precedenti in %{channel_name}"
         transcript_body: "Per darti più contesto, abbiamo incluso una trascrizione dei messaggi precedenti in questa conversazione (fino a dieci):\n\n%{transcript}"
     channel:
-      statuses:
-        read_only: "Sola lettura"
-        archived: "Archiviato"
-        closed: "Chiuso"
-        open: "Aperto"
       archive:
         first_post_raw: "Questo argomento è un archivio del canale di chat [%{channel_name}](%{channel_url})."
       messages_moved:
         one: "@%{acting_username} ha spostato un messaggio nel canale [%{channel_name}](%{first_moved_message_url})."
         other: "@%{acting_username} ha spostato %{count} messaggi sul canale [%{channel_name}](%{first_moved_message_url})."
       dm_title:
-        single_user: "%{user}"
-        multi_user: "%{users}"
-        multi_user_truncated: "%{users} e altri %{leftover}"
+        single_user: "%{username}"
+        multi_user: "%{comma_separated_usernames}"
+        multi_user_truncated:
+          one: "%{comma_separated_usernames} e %{count} altro"
+          other: "%{comma_separated_usernames} e altri %{count}"
     category_channel:
       errors:
         slug_contains_non_ascii_chars: "contiene caratteri non-ascii"
@@ -139,6 +145,8 @@ it:
       and_x_others:
         one: "e %{count} altro"
         other: "e %{count} altri"
+    summaries:
+      no_targets: "Non ci sono stati messaggi durante il periodo selezionato."
   discourse_push_notifications:
     popup:
       chat_mention:
diff --git a/plugins/chat/config/locales/server.ja.yml b/plugins/chat/config/locales/server.ja.yml
index ba98e2e4828..79c2de29fc3 100644
--- a/plugins/chat/config/locales/server.ja.yml
+++ b/plugins/chat/config/locales/server.ja.yml
@@ -44,16 +44,16 @@ ja:
     deleted_chat_username: 削除済み
     errors:
       channel_exists_for_category: "このカテゴリと名前のチャンネルはすでに存在します"
-      channel_new_message_disallowed: "チャンネルは %{status} です。新しいメッセージは送信できません"
-      channel_modify_message_disallowed: "チャンネルは %{status} です。メッセージの編集や削除は行えません"
       user_cannot_send_message: "現在、メッセージを送信できません。"
       rate_limit_exceeded: "30 秒間で送信できるチャットメッセージの件数制限を超えました"
       auto_silence_from_flags: "ユーザーを投稿禁止にするのに十分なスコアで通報されたチャットメッセージ。"
       channel_cannot_be_archived: "現在、チャンネルをアーカイブできません。アーカイブするには閉鎖されているかオープンである必要があります。"
       duplicate_message: "同一のメッセージを最近投稿しました。"
       delete_channel_failed: "チャンネルの削除に失敗しました。もう一度お試しください。"
-      minimum_length_not_met: "メッセージが短すぎます。最低 %{minimum} 文字が必要です。"
-      message_too_long: "メッセージが長すぎます。メッセージは最大 %{maximum} 文字までです。"
+      minimum_length_not_met:
+        other: "メッセージが短すぎます。最低 %{count} 文字が必要です。"
+      message_too_long:
+        other: "メッセージが長すぎます。メッセージは最大 %{count} 文字までです。"
       max_reactions_limit_reached: "このメッセージでは、新しいリアクションは許可されていません。"
       message_move_invalid_channel: "移動元と移動先のチャンネルは公開チャンネルである必要があります。"
       message_move_no_messages_found: "指定されたメッセージ ID を持つメッセージは見つかりませんでした。"
@@ -102,19 +102,14 @@ ja:
         transcript_title: "%{channel_name} の過去のメッセージのトランスクリプト"
         transcript_body: "より文脈を掴みやすいように、この会話の過去のメッセージのトランスクリプトを含めました (最大 10 件)。\n\n%{transcript}"
     channel:
-      statuses:
-        read_only: "より文脈を掴みやすいように、この会話の過去のメッセージのトランスクリプトを含めました (最大 10 件)。\n\n%{transcript}"
-        archived: "アーカイブ済み"
-        closed: "閉鎖"
-        open: "オープン"
       archive:
         first_post_raw: "このトピックは、[%{channel_name}](%{channel_url}) チャットチャンネルのアーカイブです。"
       messages_moved:
         other: "@%{acting_username} が %{count} 件のメッセージを [%{channel_name}](%{first_moved_message_url}) チャンネルに移動しました。"
       dm_title:
-        single_user: "%{user}"
-        multi_user: "%{users}"
-        multi_user_truncated: "%{users} および他 %{leftover} 人"
+        single_user: "%{username}"
+        multi_user_truncated:
+          other: "%{comma_separated_usernames} および他 %{count} 人"
     category_channel:
       errors:
         slug_contains_non_ascii_chars: "に非 ASCII 文字が含まれます"
diff --git a/plugins/chat/config/locales/server.ko.yml b/plugins/chat/config/locales/server.ko.yml
index d430a901bb2..3d7c2ede5d5 100644
--- a/plugins/chat/config/locales/server.ko.yml
+++ b/plugins/chat/config/locales/server.ko.yml
@@ -36,11 +36,8 @@ ko:
         ignore:
           title: "무시"
     channel:
-      statuses:
-        read_only: "읽기 전용"
-        archived: "저장됨"
-        closed: "닫힘"
-        open: "열기"
+      dm_title:
+        single_user: "%{username}"
     category_channel:
       errors:
         slug_contains_non_ascii_chars: "비 ASCII 문자 포함"
diff --git a/plugins/chat/config/locales/server.lt.yml b/plugins/chat/config/locales/server.lt.yml
index d6dc1b7c1e1..d0810cc3132 100644
--- a/plugins/chat/config/locales/server.lt.yml
+++ b/plugins/chat/config/locales/server.lt.yml
@@ -23,9 +23,8 @@ lt:
         ignore:
           title: "Ignoruoti"
     channel:
-      statuses:
-        closed: "Uždaryta"
-        open: "Atidaryti"
+      dm_title:
+        single_user: "%{username}"
   discourse_push_notifications:
     popup:
       chat_mention:
diff --git a/plugins/chat/config/locales/server.lv.yml b/plugins/chat/config/locales/server.lv.yml
index 9c059cb15e0..aadf2f99b4d 100644
--- a/plugins/chat/config/locales/server.lv.yml
+++ b/plugins/chat/config/locales/server.lv.yml
@@ -16,9 +16,8 @@ lv:
         ignore:
           title: "Ignorēt"
     channel:
-      statuses:
-        closed: "Slēgts"
-        open: "Atvērt"
+      dm_title:
+        single_user: "%{username}"
   discourse_push_notifications:
     popup:
       chat_mention:
diff --git a/plugins/chat/config/locales/server.nb_NO.yml b/plugins/chat/config/locales/server.nb_NO.yml
index bc8fd472cc0..17e00928687 100644
--- a/plugins/chat/config/locales/server.nb_NO.yml
+++ b/plugins/chat/config/locales/server.nb_NO.yml
@@ -22,9 +22,8 @@ nb_NO:
         ignore:
           title: "Ignorer"
     channel:
-      statuses:
-        closed: "Lukket"
-        open: "Åpne"
+      dm_title:
+        single_user: "%{username}"
   discourse_push_notifications:
     popup:
       chat_mention:
diff --git a/plugins/chat/config/locales/server.nl.yml b/plugins/chat/config/locales/server.nl.yml
index 909e2217584..d7da7369958 100644
--- a/plugins/chat/config/locales/server.nl.yml
+++ b/plugins/chat/config/locales/server.nl.yml
@@ -44,16 +44,15 @@ nl:
     deleted_chat_username: verwijderd
     errors:
       channel_exists_for_category: "Er bestaat al een kanaal voor deze categorie en naam"
-      channel_new_message_disallowed: "Het kanaal is %{status}, er kunnen geen nieuwe berichten worden gestuurd"
-      channel_modify_message_disallowed: "Het kanaal is %{status}, er kunnen geen berichten worden bewerkt of verwijderd"
       user_cannot_send_message: "Je kunt op dit moment geen berichten sturen."
       rate_limit_exceeded: "De limiet van chatberichten die binnen 30 seconden kunnen worden gestuurd is overschreden"
       auto_silence_from_flags: "Chatbericht gemarkeerd met een score die hoog genoeg is om de gebruiker te dempen."
       channel_cannot_be_archived: "Het kanaal kan op dit moment niet worden gearchiveerd, het moet gesloten zijn of open voor archivering."
       duplicate_message: "Je hebt te kort geleden een identiek bericht geplaatst."
       delete_channel_failed: "Kanaal verwijderen mislukt, probeer het opnieuw."
-      minimum_length_not_met: "Bericht is te kort, moet minimaal %{minimum} tekens bevatten."
-      message_too_long: "Bericht is te lang, berichten mogen maximaal %{maximum} tekens lang zijn."
+      message_too_long:
+        one: "Bericht is te lang, berichten mogen maximaal %{count} tekens lang zijn."
+        other: "Bericht is te lang, berichten mogen maximaal %{count} tekens lang zijn."
       max_reactions_limit_reached: "Nieuwe reacties op dit bericht zijn niet toegestaan."
       message_move_invalid_channel: "Het bron- en bestemmingskanaal moeten openbare kanalen zijn."
       message_move_no_messages_found: "Er zijn geen berichten gevonden met de opgegeven bericht-ID's."
@@ -64,9 +63,7 @@ nl:
       actor_disallowed_dms: "Je hebt ervoor gekozen om te voorkomen dat gebruikers je privé- en directe berichten sturen, dus je kunt geen nieuwe directe berichten maken."
       actor_preventing_target_user_from_dm: "Je hebt ervoor gekozen om te voorkomen dat %{username} je privé- en directe berichten stuurt, dus je kunt geen nieuwe directe berichten maken."
       user_cannot_send_direct_messages: "Sorry, je kunt geen directe berichten sturen."
-      over_chat_max_direct_message_users:
-        one: "Je kunt alleen een direct bericht met jezelf maken."
-        other: "Je kunt geen direct bericht met meer dan %{count} andere gebruikers maken."
+      over_chat_max_direct_message_users_allow_self: "Je kunt alleen een direct bericht met jezelf maken."
     reviewables:
       message_already_handled: "Bedankt, maar we hebben dat bericht al beoordeeld en vastgesteld dat het niet opnieuw hoeft te worden gemarkeerd."
       actions:
@@ -103,20 +100,16 @@ nl:
         transcript_title: "Transcript van eerdere berichten in %{channel_name}"
         transcript_body: "Om je meer context te geven, hebben we een transcript van de vorige berichten opgenomen in deze conversatie (maximaal tien):\n\n%{transcript}"
     channel:
-      statuses:
-        read_only: "Alleen-lezen"
-        archived: "Gearchiveerd"
-        closed: "Gesloten"
-        open: "Open"
       archive:
         first_post_raw: "Dit topic is een archief van het chatkanaal [%{channel_name}](%{channel_url})."
       messages_moved:
         one: "@%{acting_username} heeft een bericht verplaatst naar het kanaal [%{channel_name}](%{first_moved_message_url})."
         other: "@%{acting_username} heeft %{count} berichten verplaatst naar het kanaal [%{channel_name}](%{first_moved_message_url})."
       dm_title:
-        single_user: "%{user}"
-        multi_user: "%{users}"
-        multi_user_truncated: "%{users} en %{leftover} anderen"
+        single_user: "%{username}"
+        multi_user_truncated:
+          one: "%{comma_separated_usernames} en %{count} ander"
+          other: "%{comma_separated_usernames} en %{count} anderen"
     category_channel:
       errors:
         slug_contains_non_ascii_chars: "bevat niet-ASCII-tekens"
diff --git a/plugins/chat/config/locales/server.pl_PL.yml b/plugins/chat/config/locales/server.pl_PL.yml
index 9deea8b5329..68047c8ba56 100644
--- a/plugins/chat/config/locales/server.pl_PL.yml
+++ b/plugins/chat/config/locales/server.pl_PL.yml
@@ -54,16 +54,30 @@ pl_PL:
     deleted_chat_username: usunięte
     errors:
       channel_exists_for_category: "Istnieje już kanał dla tej kategorii i nazwy"
-      channel_new_message_disallowed: "Kanał jest %{status}, nie można wysyłać nowych wiadomości."
-      channel_modify_message_disallowed: "Kanał jest %{status}, żadne wiadomości nie mogą być edytowane ani usuwane"
+      channel_new_message_disallowed:
+        archived: "Kanał jest zarchiwizowany, nie można wysyłać nowych wiadomości"
+        closed: "Kanał jest zamknięty, nie można wysyłać nowych wiadomości"
+        read_only: "Kanał jest tylko do odczytu, nie można wysyłać nowych wiadomości"
+      channel_modify_message_disallowed:
+        archived: "Kanał jest zarchiwizowany, nie można edytować ani usuwać żadnych wiadomości"
+        closed: "Kanał jest zamknięty, nie można edytować ani usuwać żadnych wiadomości"
+        read_only: "Kanał jest tylko do odczytu, nie można edytować ani usuwać żadnych wiadomości"
       user_cannot_send_message: "W tej chwili nie możesz wysyłać wiadomości."
       rate_limit_exceeded: "Przekroczono limit wiadomości na czacie, które można wysłać w ciągu 30 sekund"
       auto_silence_from_flags: "Wiadomość na czacie oflagowana z wynikiem wystarczającym do wyciszenia użytkownika."
       channel_cannot_be_archived: "Kanał nie może być w tej chwili zarchiwizowany, musi być zamknięty lub otwarty do archiwizacji."
       duplicate_message: "Zbyt niedawno opublikowałeś identyczną wiadomość."
       delete_channel_failed: "Nie udało się usunąć kanału, spróbuj ponownie."
-      minimum_length_not_met: "Wiadomość jest za krótka, musi mieć co najmniej %{minimum} znaków."
-      message_too_long: "Wiadomość jest za długa, wiadomości mogą mieć maksymalnie %{maximum} znaków."
+      minimum_length_not_met:
+        one: "Wiadomość jest za krótka, musi mieć co najmniej %{count} znak."
+        few: "Wiadomość jest za krótka, musi mieć co najmniej %{count} znaki."
+        many: "Wiadomość jest za krótka, musi mieć co najmniej %{count} znaków."
+        other: "Wiadomość jest za krótka, musi mieć co najmniej %{count} znaków."
+      message_too_long:
+        one: "Wiadomość jest za długa, wiadomości mogą mieć maksymalnie %{count} znaków."
+        few: "Wiadomość jest za długa, wiadomości mogą mieć maksymalnie %{count} znaków."
+        many: "Wiadomość jest za długa, wiadomości mogą mieć maksymalnie %{count} znaków."
+        other: "Wiadomość jest za długa, wiadomości mogą mieć maksymalnie %{count} znaków."
       draft_too_long: "Wersja robocza jest za długa."
       max_reactions_limit_reached: "Nowe reakcje nie są dozwolone w tej wiadomości."
       message_move_invalid_channel: "Kanał źródłowy i docelowy muszą być kanałami publicznymi."
@@ -75,11 +89,15 @@ pl_PL:
       actor_disallowed_dms: "Zdecydowałeś się uniemożliwić użytkownikom wysyłanie Ci wiadomości prywatnych i bezpośrednich, więc nie możesz tworzyć nowych wiadomości bezpośrednich."
       actor_preventing_target_user_from_dm: "Zdecydowałeś się uniemożliwić %{username} wysyłanie Ci prywatnych i bezpośrednich wiadomości, więc nie możesz tworzyć nowych bezpośrednich wiadomości do niego."
       user_cannot_send_direct_messages: "Przepraszamy, nie możesz wysyłać bezpośrednich wiadomości."
+      over_chat_max_direct_message_users_allow_self: "Możesz utworzyć bezpośrednią wiadomość tylko z samym sobą."
       over_chat_max_direct_message_users:
-        one: "Możesz utworzyć bezpośrednią wiadomość tylko z samym sobą."
-        few: "Nie można utworzyć wiadomości bezpośredniej z więcej niż %{count} innymi użytkownikami."
-        many: "Nie można utworzyć wiadomości bezpośredniej z więcej niż %{count} innymi użytkownikami."
-        other: "Nie można utworzyć wiadomości bezpośredniej z więcej niż %{count} innymi użytkownikami."
+        one: "Nie możesz utworzyć bezpośredniej wiadomości z więcej niż %{count} innym użytkownikiem."
+        few: "Nie możesz utworzyć bezpośredniej wiadomości z więcej niż %{count} innymi użytkownikami."
+        many: "Nie możesz utworzyć bezpośredniej wiadomości z więcej niż %{count} innymi użytkownikami."
+        other: "Nie możesz utworzyć bezpośredniej wiadomości z więcej niż %{count} innymi użytkownikami."
+      original_message_not_found: "Nie można znaleźć przodka wiadomości, na którą odpowiadasz, lub został on usunięty."
+      thread_invalid_for_channel: "Wątek nie jest częścią udostępnionego kanału."
+      thread_does_not_match_parent: "Wątek nie pasuje do wiadomości nadrzędnej."
     reviewables:
       message_already_handled: "Dziękujemy, ale sprawdziliśmy już tę wiadomość i ustaliliśmy, że nie trzeba jej ponownie oznaczać."
       actions:
@@ -116,11 +134,6 @@ pl_PL:
         transcript_title: "Transkrypcja poprzednich wiadomości w %{channel_name}"
         transcript_body: "Aby dać Ci więcej kontekstu, zamieściliśmy transkrypcję poprzednich wiadomości w tej rozmowie (do dziesięciu):\n\n%{transcript}"
     channel:
-      statuses:
-        read_only: "Tylko do odczytu"
-        archived: "Zarchiwizowany"
-        closed: "Zamknięte"
-        open: "Otwórz"
       archive:
         first_post_raw: "Ten temat jest archiwum kanału czatu [%{channel_name}](%{channel_url})."
       messages_moved:
@@ -129,9 +142,13 @@ pl_PL:
         many: "@%{acting_username} przeniósł %{count} wiadomości do kanału [%{channel_name}](%{first_moved_message_url})."
         other: "@%{acting_username} przeniósł %{count} wiadomości do kanału [%{channel_name}](%{first_moved_message_url})."
       dm_title:
-        single_user: "%{user}"
-        multi_user: "%{users}"
-        multi_user_truncated: "%{users} i %{leftover} innych"
+        single_user: "%{username}"
+        multi_user: "%{comma_separated_usernames}"
+        multi_user_truncated:
+          one: "%{comma_separated_usernames} i %{count} inny"
+          few: "%{comma_separated_usernames} i %{count} inni"
+          many: "%{comma_separated_usernames} i %{count} innych"
+          other: "%{comma_separated_usernames} i %{count} innych"
     category_channel:
       errors:
         slug_contains_non_ascii_chars: "zawiera znaki inne niż ascii"
diff --git a/plugins/chat/config/locales/server.pt.yml b/plugins/chat/config/locales/server.pt.yml
index e5d909991cc..286291f3a22 100644
--- a/plugins/chat/config/locales/server.pt.yml
+++ b/plugins/chat/config/locales/server.pt.yml
@@ -62,9 +62,8 @@ pt:
         ignore:
           title: "Ignorar"
     channel:
-      statuses:
-        closed: "Fechado"
-        open: "Abrir"
+      dm_title:
+        single_user: "%{username}"
   discourse_push_notifications:
     popup:
       chat_mention:
diff --git a/plugins/chat/config/locales/server.pt_BR.yml b/plugins/chat/config/locales/server.pt_BR.yml
index 84800211492..ad65ee1774c 100644
--- a/plugins/chat/config/locales/server.pt_BR.yml
+++ b/plugins/chat/config/locales/server.pt_BR.yml
@@ -54,16 +54,23 @@ pt_BR:
     deleted_chat_username: excluído
     errors:
       channel_exists_for_category: "Já existe um canal para este nome e categoria"
-      channel_new_message_disallowed: "O canal está %{status}, nenhuma mensagem nova pode ser enviada"
-      channel_modify_message_disallowed: "O canal está %{status}, nenhuma mensagem pode ser editada ou excluída"
+      channel_new_message_disallowed:
+        archived: "O canal está arquivado, nenhuma mensagem nova pode ser enviada"
+        closed: "O canal está fechado, nenhuma nova mensagem pode ser enviada"
+        read_only: "O canal é somente para leitura, nenhuma nova mensagem pode ser enviada"
+      channel_modify_message_disallowed:
+        archived: "O canal está arquivado, nenhuma mensagem pode ser editada ou excluída"
+        closed: "O canal está fechado, nenhuma mensagem pode ser editada ou excluída"
+        read_only: "O canal é somente para leitura, nenhuma mensagem pode ser editada ou excluída"
       user_cannot_send_message: "Você não pode enviar mensagens neste momento."
       rate_limit_exceeded: "Excedeu o limite de mensagens de chat que podem ser enviadas em 30 segundos"
       auto_silence_from_flags: "Mensagem de chat sinalizada com pontuação alta o suficiente para silenciar o(a) usuário(a)."
       channel_cannot_be_archived: "O canal não pode ser arquivado no momento, ele deve estar fechado ou aberto para arquivar."
       duplicate_message: "Você postou uma mensagem idêntica muito recentemente."
       delete_channel_failed: "Falha ao excluir canal. Tente novamente."
-      minimum_length_not_met: "A mensagem é muito curta, deve ter no mínimo %{minimum} caracteres."
-      message_too_long: "A mensagem é muito longa; as mensagens devem ter no máximo %{maximum} caracteres."
+      message_too_long:
+        one: "A mensagem é muito longa; as mensagens devem ter no máximo %{count} caracteres."
+        other: "A mensagem é muito longa; as mensagens devem ter no máximo %{count} caracteres."
       draft_too_long: "O rascunho é muito longo."
       max_reactions_limit_reached: "Novas reações não são permitidas nesta mensagem."
       message_move_invalid_channel: "O canal de origem e de destino deve ser canais públicos."
@@ -75,9 +82,11 @@ pt_BR:
       actor_disallowed_dms: "Você optou por impedir que os(as) usuários(as) enviem mensagens privadas e diretas, portanto, você não pode criar novas mensagens diretas."
       actor_preventing_target_user_from_dm: "Você optou por impedir que %{username} envie mensagens privadas e diretas, portanto, você não pode criar novas mensagens diretas para ele(a)."
       user_cannot_send_direct_messages: "Desculpe, você não pode enviar mensagens diretas."
+      over_chat_max_direct_message_users_allow_self: "Você poderá criar uma mensagem direta apenas consigo mesmo(a)."
       over_chat_max_direct_message_users:
-        one: "Você poderá criar uma mensagem direta apenas consigo mesmo(a)."
+        one: "Você não poderá criar uma mensagem direta com mais de %{count} outro(a) usuário(a)."
         other: "Você não poderá criar uma mensagem direta com mais de %{count} outros(as) usuários(as)."
+      original_message_not_found: "A mensagem que você está respondendo não pode ser encontrada ou foi excluída."
     reviewables:
       message_already_handled: "Obrigado, mas já analisamos esta mensagem e determinamos que ela não precisa ser sinalizada novamente."
       actions:
@@ -114,20 +123,17 @@ pt_BR:
         transcript_title: "Transcrição de mensagens anteriores em %{channel_name}"
         transcript_body: "Para dar mais contexto, incluímos uma transcrição das mensagens anteriores nesta conversa (até dez):\n\n%{transcript}"
     channel:
-      statuses:
-        read_only: "Somente leitura"
-        archived: "Arquivados"
-        closed: "Fechados"
-        open: "Aberto"
       archive:
         first_post_raw: "Este tópico é um arquivo do canal do chat [%{channel_name}](%{channel_url})."
       messages_moved:
         one: "@%{acting_username} moveu uma mensagem para o canal [%{channel_name}](%{first_moved_message_url})."
         other: "@%{acting_username} moveu %{count} mensagens para o canal [%{channel_name}](%{first_moved_message_url})."
       dm_title:
-        single_user: "%{user}"
-        multi_user: "%{users}"
-        multi_user_truncated: "%{users} e %{leftover} outros"
+        single_user: "%{username}"
+        multi_user: "%{comma_separated_usernames}"
+        multi_user_truncated:
+          one: "%{comma_separated_usernames} e %{count} outro"
+          other: "%{comma_separated_usernames} e %{count} outros"
     category_channel:
       errors:
         slug_contains_non_ascii_chars: "contém caracteres não ascii"
diff --git a/plugins/chat/config/locales/server.ro.yml b/plugins/chat/config/locales/server.ro.yml
index f6d61b6885f..94657b439ed 100644
--- a/plugins/chat/config/locales/server.ro.yml
+++ b/plugins/chat/config/locales/server.ro.yml
@@ -20,9 +20,8 @@ ro:
         ignore:
           title: "Ignoră"
     channel:
-      statuses:
-        closed: "Închis"
-        open: "Deschide sondajul"
+      dm_title:
+        single_user: "%{username}"
   discourse_push_notifications:
     popup:
       chat_mention:
diff --git a/plugins/chat/config/locales/server.ru.yml b/plugins/chat/config/locales/server.ru.yml
index 9e7b1b7af22..f5bbbe2501d 100644
--- a/plugins/chat/config/locales/server.ru.yml
+++ b/plugins/chat/config/locales/server.ru.yml
@@ -44,16 +44,17 @@ ru:
     deleted_chat_username: удалён
     errors:
       channel_exists_for_category: "Канал для этой категории уже существует"
-      channel_new_message_disallowed: "Канал %{status}, в него не могут быть отправлены новые сообщения"
-      channel_modify_message_disallowed: "Канал %{status}, существующие сообщения не могут быть отредактированы или удалены"
       user_cannot_send_message: "В настоящее время вы не можете отправлять сообщения."
       rate_limit_exceeded: "Превышен лимит сообщений, которые могут быть отправлены в течение 30 секунд"
       auto_silence_from_flags: "На сообщение поступило большое количество жалоб, и пользователь был заморожен."
       channel_cannot_be_archived: "Канал в данный момент не может быть заархивирован, он должен быть либо закрыт, либо открыт для архивации."
       duplicate_message: "Вы отправляете одно и то же сообщение слишком часто."
       delete_channel_failed: "Не удалось удалить канал, попробуйте ещё раз."
-      minimum_length_not_met: "Сообщение слишком короткое, оно должно содержать не менее %{minimum} символов."
-      message_too_long: "Сообщение слишком длинное, максимум символов — %{maximum}."
+      message_too_long:
+        one: "Сообщение слишком длинное, максимум символов — %{count}."
+        few: "Сообщение слишком длинное, максимум символов — %{count}."
+        many: "Сообщение слишком длинное, максимум символов — %{count}."
+        other: "Сообщение слишком длинное, максимум символов — %{count}."
       max_reactions_limit_reached: "Новые реакции на это сообщение запрещены."
       message_move_invalid_channel: "Исходный и целевой каналы должны быть общедоступными."
       message_move_no_messages_found: "Не найдено сообщений с указанными идентификаторами сообщений."
@@ -64,11 +65,7 @@ ru:
       actor_disallowed_dms: "Вы решили запретить пользователям отправлять вам личные и прямые сообщения чата, поэтому вы не можете создавать новые прямые сообщения."
       actor_preventing_target_user_from_dm: "Вы решили запретить %{username} отправлять вам личные и прямые сообщения чата, поэтому вы не можете создавать для них новые прямые сообщения."
       user_cannot_send_direct_messages: "Вы не можете отправлять прямые сообщения."
-      over_chat_max_direct_message_users:
-        one: "Вы не можете создать прямое сообщение более чем с %{count} пользователем."
-        few: "Вы не можете создать прямое сообщение более чем с %{count} пользователями."
-        many: "Вы не можете создать прямое сообщение более чем с %{count} пользователями."
-        other: "Вы не можете создать прямое сообщение более чем с %{count} пользователя."
+      over_chat_max_direct_message_users_allow_self: "Вы не можете создать прямое сообщение более чем с %{count} пользователем."
     reviewables:
       message_already_handled: "Спасибо, но мы уже рассмотрели жалобу на это сообщение, поэтому жаловаться на него снова нет необходимости."
       actions:
@@ -105,11 +102,6 @@ ru:
         transcript_title: "Содержимое предыдущих сообщений в канале %{channel_name}"
         transcript_body: "Чтобы дать больше контекста, мы отображаем содержимое предыдущих сообщений этой беседы (до десяти):\n\n%{transcript}"
     channel:
-      statuses:
-        read_only: "Только для чтения"
-        archived: "Архивные"
-        closed: "Закрытые"
-        open: "Открыт"
       archive:
         first_post_raw: "Эта тема является архивом канала [%{channel_name}](%{channel_url})."
       messages_moved:
@@ -118,9 +110,12 @@ ru:
         many: "Пользователь @%{acting_username} переместил %{count} сообщений в канал [%{channel_name}](%{first_moved_message_url})."
         other: "Пользователь @%{acting_username} переместил %{count} сообщений в канал [%{channel_name}](%{first_moved_message_url})."
       dm_title:
-        single_user: "%{user}"
-        multi_user: "%{users}"
-        multi_user_truncated: "%{users} и ещё %{leftover}"
+        single_user: "%{username}"
+        multi_user_truncated:
+          one: "%{comma_separated_usernames} и ещё %{count}"
+          few: "%{comma_separated_usernames} и ещё %{count}"
+          many: "%{comma_separated_usernames} и ещё %{count}"
+          other: "%{comma_separated_usernames} и ещё %{count}"
     category_channel:
       errors:
         slug_contains_non_ascii_chars: "содержит символы не в ascii-кодировке"
diff --git a/plugins/chat/config/locales/server.sk.yml b/plugins/chat/config/locales/server.sk.yml
index dadd6d5049a..5b758198214 100644
--- a/plugins/chat/config/locales/server.sk.yml
+++ b/plugins/chat/config/locales/server.sk.yml
@@ -12,7 +12,19 @@ sk:
   chat:
     deleted_chat_username: vymazané
     errors:
+      channel_new_message_disallowed:
+        archived: "Kanál je archivovaný, nie je možné posielať nové správy"
+        closed: "Kanál je uzavretý, nie je možné posielať nové správy"
+        read_only: "Kanál je len na čítanie, nie je možné odosielať nové správy"
+      channel_modify_message_disallowed:
+        archived: "Kanál je archivovaný, správy nie je možné upravovať ani vymazávať"
+        closed: "Kanál je uzavretý, správy nie je možné upravovať ani odstraňovať"
+        read_only: "Kanál je len na čítanie, správy nie je možné upravovať ani vymazávať"
       draft_too_long: "Koncept je príliš dlhý."
+      over_chat_max_direct_message_users_allow_self: "Súkromnú správu môžete vytvoriť len sami so sebou."
+      original_message_not_found: "Tvorca správy, na ktorú odpovedáte, nemožno nájsť alebo bol vymazaný."
+      thread_invalid_for_channel: "Vlákno nie je súčasťou zvoleného kanála."
+      thread_does_not_match_parent: "Vlákno nezodpovedá nadradenej správe."
     reviewables:
       actions:
         agree_and_suspend:
@@ -22,9 +34,11 @@ sk:
         disagree:
           title: "Nesúhlasiť"
     channel:
-      statuses:
-        closed: "Zatvorené"
-        open: "Zahájiť"
+      dm_title:
+        single_user: "%{username}"
+        multi_user: "%{comma_separated_usernames}"
+    summaries:
+      no_targets: "Počas vybraného obdobia neboli zaznamenané žiadne správy."
   discourse_push_notifications:
     popup:
       chat_mention:
diff --git a/plugins/chat/config/locales/server.sl.yml b/plugins/chat/config/locales/server.sl.yml
index 02225d59112..1e8b4840520 100644
--- a/plugins/chat/config/locales/server.sl.yml
+++ b/plugins/chat/config/locales/server.sl.yml
@@ -22,9 +22,8 @@ sl:
         ignore:
           title: "Prezri"
     channel:
-      statuses:
-        closed: "Zaprto"
-        open: "Odpri"
+      dm_title:
+        single_user: "%{username}"
   discourse_push_notifications:
     popup:
       chat_mention:
diff --git a/plugins/chat/config/locales/server.sq.yml b/plugins/chat/config/locales/server.sq.yml
index 3b2bd872fbb..0ec7a49b609 100644
--- a/plugins/chat/config/locales/server.sq.yml
+++ b/plugins/chat/config/locales/server.sq.yml
@@ -14,8 +14,8 @@ sq:
         disagree:
           title: "Jo dakord"
     channel:
-      statuses:
-        open: "Fillo"
+      dm_title:
+        single_user: "%{username}"
   discourse_push_notifications:
     popup:
       chat_mention:
diff --git a/plugins/chat/config/locales/server.sr.yml b/plugins/chat/config/locales/server.sr.yml
index 7da3cd0571c..b83810a0ffe 100644
--- a/plugins/chat/config/locales/server.sr.yml
+++ b/plugins/chat/config/locales/server.sr.yml
@@ -15,8 +15,8 @@ sr:
         disagree:
           title: "Odbaci"
     channel:
-      statuses:
-        open: "Otvori"
+      dm_title:
+        single_user: "%{username}"
   unsubscribe:
     chat_summary:
       never: Nikad
diff --git a/plugins/chat/config/locales/server.sv.yml b/plugins/chat/config/locales/server.sv.yml
index bd21cfa9d12..440327fa8b5 100644
--- a/plugins/chat/config/locales/server.sv.yml
+++ b/plugins/chat/config/locales/server.sv.yml
@@ -7,6 +7,7 @@
 sv:
   site_settings:
     chat_enabled: "Aktivera chattillägget."
+    enable_public_channels: "Aktivera offentliga kanaler baserat på kategorier."
     chat_allowed_groups: "Användare i dessa grupper kan chatta. Observera att personalen alltid har tillgång till chatten."
     chat_channel_retention_days: "Chattmeddelanden i ordinarie kanaler kommer att behållas i så här många dagar. Sätt till '0' för att behålla meddelanden för alltid."
     chat_dm_retention_days: "Chattmeddelanden i personliga chattkanaler kommer att behållas i så här många dagar. Sätt till '0' för att behålla meddelanden för alltid."
@@ -54,16 +55,26 @@ sv:
     deleted_chat_username: raderat
     errors:
       channel_exists_for_category: "En kanal finns redan för denna kategori och namn"
-      channel_new_message_disallowed: "Kanalen är %{status}, inga nya meddelanden kan skickas"
-      channel_modify_message_disallowed: "Kanalen är %{status}, inga meddelanden kan redigeras eller tas bort"
+      channel_new_message_disallowed:
+        archived: "Kanalen är arkiverad, inga nya meddelanden kan skickas"
+        closed: "Kanalen är stängd, inga nya meddelanden kan skickas"
+        read_only: "Kanalen är lässkyddad, inga nya meddelanden kan skickas"
+      channel_modify_message_disallowed:
+        archived: "Kanalen är arkiverad, inga meddelanden kan redigeras eller raderas"
+        closed: "Kanalen är stängd, inga meddelanden kan redigeras eller raderas"
+        read_only: "Kanalen är lässkyddad, inga meddelanden kan redigeras eller raderas"
       user_cannot_send_message: "Du kan inte skicka meddelanden just nu."
       rate_limit_exceeded: "Överskred gränsen för chattmeddelanden som kan skickas inom 30 sekunder"
       auto_silence_from_flags: "Chattmeddelande flaggat med tillräckligt hög poäng för att tysta användaren."
       channel_cannot_be_archived: "Kanalen kan inte arkiveras just nu, den måste vara antingen stängd eller öppen för arkivering."
       duplicate_message: "Du skrev också ett identiskt meddelande nyligen."
       delete_channel_failed: "Det gick inte att ta bort kanalen, försök igen."
-      minimum_length_not_met: "Meddelandet är för kort, måste ha minst %{minimum} tecken."
-      message_too_long: "Meddelandet är för långt, måste ha högst %{maximum} tecken."
+      minimum_length_not_met:
+        one: "Meddelandet är för kort. Det måste innehålla minst %{count} tecken."
+        other: "Meddelandet är för kort. Det måste innehålla minst %{count} tecken."
+      message_too_long:
+        one: "Meddelandet är för långt, måste ha högst %{count} tecken."
+        other: "Meddelandet är för långt, måste ha högst %{count} tecken."
       draft_too_long: "Utkastet är för långt."
       max_reactions_limit_reached: "Nya reaktioner är inte tillåtna för detta meddelande."
       message_move_invalid_channel: "Käll- och destinationskanalen måste vara offentliga kanaler."
@@ -75,9 +86,13 @@ sv:
       actor_disallowed_dms: "Du har valt att hindra användare från att skicka dig privata och direkta meddelanden, så du kan inte skapa nya direkta meddelanden."
       actor_preventing_target_user_from_dm: "Du har valt att hindra %{username} från att skicka privata och direkta meddelanden, så du kan inte skapa nya direktmeddelanden till dem."
       user_cannot_send_direct_messages: "Tyvärr kan du inte skicka direktmeddelanden."
+      over_chat_max_direct_message_users_allow_self: "Du kan bara skapa ett direktmeddelande med dig själv."
       over_chat_max_direct_message_users:
-        one: "Du kan bara skapa ett direktmeddelande med dig själv."
+        one: "Du kan inte skapa ett direktmeddelande med fler än %{count} annan användare."
         other: "Du kan inte skapa ett direktmeddelande med fler än %{count} andra användare."
+      original_message_not_found: "Det första meddelandet i meddelandekedjan som du svarar på kan inte hittas eller har tagits bort."
+      thread_invalid_for_channel: "Tråden är inte en del av angiven kanal."
+      thread_does_not_match_parent: "Tråden matchar inte överordnat meddelande."
     reviewables:
       message_already_handled: "Tack, men vi har redan granskat det här meddelandet och beslutat att det inte behöver flaggas igen."
       actions:
@@ -114,20 +129,17 @@ sv:
         transcript_title: "Avskrift av tidigare meddelanden i %{channel_name}"
         transcript_body: "För att ge dig mer sammanhang inkluderade vi en avskrift av de tidigare meddelandena i det här samtalet (upp till tio):\n\n%{transcript}"
     channel:
-      statuses:
-        read_only: "Endast läsning"
-        archived: "Arkiverad"
-        closed: "Stängda"
-        open: "Öppna"
       archive:
         first_post_raw: "Detta ämne är ett arkiv av chatt kanalen [%{channel_name}](%{channel_url})."
       messages_moved:
         one: "@%{acting_username} flyttade ett meddelande till kanalen [%{channel_name}](%{first_moved_message_url})."
         other: "@%{acting_username} flyttade %{count} meddelanden till kanalen [%{channel_name}](%{first_moved_message_url})."
       dm_title:
-        single_user: "%{user}"
-        multi_user: "%{users}"
-        multi_user_truncated: "%{users} och %{leftover} andra"
+        single_user: "%{username}"
+        multi_user: "%{comma_separated_usernames}"
+        multi_user_truncated:
+          one: "%{comma_separated_usernames} och %{count} andra"
+          other: "%{comma_separated_usernames} och %{count} andra"
     category_channel:
       errors:
         slug_contains_non_ascii_chars: "innehåller icke-ascii-tecken"
@@ -145,6 +157,8 @@ sv:
       and_x_others:
         one: "och %{count} annan"
         other: "och %{count} andra"
+    summaries:
+      no_targets: "Det fanns inga meddelanden under den valda perioden."
   discourse_push_notifications:
     popup:
       chat_mention:
diff --git a/plugins/chat/config/locales/server.sw.yml b/plugins/chat/config/locales/server.sw.yml
index 24aa9730477..a3c8d9a8422 100644
--- a/plugins/chat/config/locales/server.sw.yml
+++ b/plugins/chat/config/locales/server.sw.yml
@@ -22,9 +22,8 @@ sw:
         ignore:
           title: "Puuzia"
     channel:
-      statuses:
-        closed: "Imefungwa"
-        open: "Fungua"
+      dm_title:
+        single_user: "%{username}"
   reviewable_score_types:
     notify_user:
       chat_pm_body: "%{link}\n\n%{message}"
diff --git a/plugins/chat/config/locales/server.te.yml b/plugins/chat/config/locales/server.te.yml
index 7fd9140d31f..d456f19ceaa 100644
--- a/plugins/chat/config/locales/server.te.yml
+++ b/plugins/chat/config/locales/server.te.yml
@@ -13,6 +13,9 @@ te:
           title: "సభ్యుడిని సస్పెండు చేయి"
         disagree:
           title: "ఒప్పుకోకు"
+    channel:
+      dm_title:
+        single_user: "%{username}"
   reviewable_score_types:
     notify_user:
       chat_pm_body: "%{link}\n\n%{message}"
diff --git a/plugins/chat/config/locales/server.th.yml b/plugins/chat/config/locales/server.th.yml
index 9fd7f0cdb1b..d475d7f2016 100644
--- a/plugins/chat/config/locales/server.th.yml
+++ b/plugins/chat/config/locales/server.th.yml
@@ -14,9 +14,8 @@ th:
         ignore:
           title: "ไม่สนใจ"
     channel:
-      statuses:
-        closed: "ปิด"
-        open: "เปิด"
+      dm_title:
+        single_user: "%{username}"
   discourse_push_notifications:
     popup:
       chat_mention:
diff --git a/plugins/chat/config/locales/server.tr_TR.yml b/plugins/chat/config/locales/server.tr_TR.yml
index 249ad27d93e..263146ff2d7 100644
--- a/plugins/chat/config/locales/server.tr_TR.yml
+++ b/plugins/chat/config/locales/server.tr_TR.yml
@@ -7,6 +7,7 @@
 tr_TR:
   site_settings:
     chat_enabled: "Sohbet eklentisini etkinleştirin."
+    enable_public_channels: "Kategorilere göre herkese açık kanalları etkinleştirin."
     chat_allowed_groups: "Bu gruplardaki kullanıcılar sohbet edebilir. Personelin sohbete her zaman erişebileceğini dikkate alın."
     chat_channel_retention_days: "Normal kanallardaki sohbet mesajları bu kadar gün boyunca saklanır. Mesajları sonsuza kadar saklamak için \"0\" olarak ayarlayın."
     chat_dm_retention_days: "Kişisel sohbet kanallarındaki sohbet mesajları bu kadar gün boyunca saklanır. Mesajları sonsuza kadar saklamak için \"0\" olarak ayarlayın."
@@ -54,16 +55,26 @@ tr_TR:
     deleted_chat_username: silindi
     errors:
       channel_exists_for_category: "Bu kategori ve ada sahip bir kanal zaten var"
-      channel_new_message_disallowed: "Kanal %{status}, yeni mesaj gönderilemiyor"
-      channel_modify_message_disallowed: "Kanal %{status}, mesaj düzenlenemez veya silinemez"
+      channel_new_message_disallowed:
+        archived: "Kanal arşivlendi, yeni mesaj gönderilemez"
+        closed: "Kanal kapalı, yeni mesaj gönderilemiyor"
+        read_only: "Kanal salt okunur, yeni mesaj gönderilemiyor"
+      channel_modify_message_disallowed:
+        archived: "Kanal arşivlendi, hiçbir mesaj düzenlenemez veya silinemez"
+        closed: "Kanal kapalı, hiçbir mesaj düzenlenemez veya silinemez"
+        read_only: "Kanal salt okunur, hiçbir mesaj düzenlenemez veya silinemez"
       user_cannot_send_message: "Şu anda mesaj gönderemezsiniz."
       rate_limit_exceeded: "30 saniye içinde gönderilebilecek sohbet mesajı limiti aşıldı"
       auto_silence_from_flags: "Kullanıcıyı susturmaya yetecek kadar yüksek puanla bayrak eklenen sohbet mesajı."
       channel_cannot_be_archived: "Kanal şu anda arşivlenemez, arşivlemek için kapalı veya açık olmalı."
       duplicate_message: "Çok yakın zamanda aynı mesajı gönderdiniz."
       delete_channel_failed: "Kanal silinemedi, lütfen tekrar deneyin."
-      minimum_length_not_met: "Mesaj çok kısa, en az %{minimum} karakter içermeli."
-      message_too_long: "Mesaj çok uzun, mesajlar maksimum %{maximum} karakter olmalı."
+      minimum_length_not_met:
+        one: "Mesaj çok kısa, en az %{count} karakter içermeli."
+        other: "Mesaj çok kısa, en az %{count} karakter içermeli."
+      message_too_long:
+        one: "Mesaj çok uzun, mesajlar en çok %{count} karakter olmalı."
+        other: "Mesaj çok uzun, mesajlar en çok %{count} karakter olmalı."
       draft_too_long: "Taslak pek uzun."
       max_reactions_limit_reached: "Bu mesajda yeni tepkilere izin verilmiyor."
       message_move_invalid_channel: "Kaynak ve hedef kanal herkese açık kanallar olmalıdır."
@@ -75,9 +86,13 @@ tr_TR:
       actor_disallowed_dms: "Kullanıcıların size özel ve doğrudan mesaj göndermesini engellemeyi seçtiniz, dolayısıyla yeni doğrudan mesaj oluşturamazsınız."
       actor_preventing_target_user_from_dm: "%{username} adlı kullanıcının size özel ve doğrudan mesaj göndermesini engellemeyi seçtiniz, dolayısıyla ona yeni doğrudan mesaj oluşturamazsınız."
       user_cannot_send_direct_messages: "Üzgünüz, doğrudan mesaj gönderemezsiniz."
+      over_chat_max_direct_message_users_allow_self: "Yalnızca kendinizle bir doğrudan mesaj oluşturabilirsiniz."
       over_chat_max_direct_message_users:
-        one: "Yalnızca kendinizle bir doğrudan mesaj oluşturabilirsiniz."
+        one: "%{count} üzeri başka kullanıcıyla doğrudan mesaj oluşturamazsınız."
         other: "%{count} üzeri başka kullanıcıyla doğrudan mesaj oluşturamazsınız."
+      original_message_not_found: "Yanıtladığınız iletinin atası bulunamıyor veya silinmiş."
+      thread_invalid_for_channel: "Konu, sağlanan kanalın bir parçası değildir."
+      thread_does_not_match_parent: "Konu ana mesajla eşleşmiyor."
     reviewables:
       message_already_handled: "Teşekkürler, ancak bu mesajı daha önce inceledik ve yeniden bayrak eklenmesine gerek olmadığına karar verdik."
       actions:
@@ -114,20 +129,17 @@ tr_TR:
         transcript_title: "%{channel_name} adlı kanaldaki önceki mesajların dökümü"
         transcript_body: "Size daha fazla bağlam sağlamak için bu konuşmadaki önceki mesajların bir dökümünü ekledik (en fazla on):\n\n%{transcript}"
     channel:
-      statuses:
-        read_only: "Salt Okunur"
-        archived: "Arşivlendi"
-        closed: "Kapalı"
-        open: "Aç"
       archive:
         first_post_raw: "Bu konu, [%{channel_name}](%{channel_url}) sohbet kanalının bir arşividir."
       messages_moved:
         one: "@%{acting_username} bir mesajı [%{channel_name}](%{first_moved_message_url}) kanalına taşıdı."
         other: "@%{acting_username} , %{count} mesajı [%{channel_name}](%{first_moved_message_url}) kanalına taşıdı."
       dm_title:
-        single_user: "%{user}"
-        multi_user: "%{users}"
-        multi_user_truncated: "%{users} ve %{leftover} kişi daha"
+        single_user: "%{username}"
+        multi_user: "%{comma_separated_usernames}"
+        multi_user_truncated:
+          one: "%{comma_separated_usernames} ve %{count} kişi daha"
+          other: "%{comma_separated_usernames} ve %{count} kişi daha"
     category_channel:
       errors:
         slug_contains_non_ascii_chars: "ascii olmayan karakterler içeriyor"
@@ -145,6 +157,8 @@ tr_TR:
       and_x_others:
         one: "ve %{count} üye daha"
         other: "ve %{count} üye daha"
+    summaries:
+      no_targets: "Seçilen dönemde hiç mesaj yok."
   discourse_push_notifications:
     popup:
       chat_mention:
diff --git a/plugins/chat/config/locales/server.uk.yml b/plugins/chat/config/locales/server.uk.yml
index 57f751bc552..c31cdbeb151 100644
--- a/plugins/chat/config/locales/server.uk.yml
+++ b/plugins/chat/config/locales/server.uk.yml
@@ -54,10 +54,34 @@ uk:
     deleted_chat_username: видалено
     errors:
       channel_exists_for_category: "Для цієї категорії та назви вже існує канал"
-      channel_new_message_disallowed: "Канал %{status}, нові повідомлення не надсилаються"
+      channel_new_message_disallowed:
+        archived: "Канал заархівований, нові повідомлення не надсилаються"
+        closed: "Канал закрито, нові повідомлення не надсилаються"
+        read_only: "Канал тільки для читання, нові повідомлення не надсилаються"
+      channel_modify_message_disallowed:
+        archived: "Канал заархівовано, жодні повідомлення не можна редагувати чи видаляти"
+        closed: "Канал закритий, жодні повідомлення не можна редагувати чи видаляти"
+        read_only: "Канал доступний лише для читання, жодні повідомлення не можна редагувати чи видаляти"
       auto_silence_from_flags: "Повідомлення чату, позначене достатньо високим балом, щоб заблокувати користувача."
+      minimum_length_not_met:
+        one: "Повідомлення занадто коротке, повинно містити мінімум %{count} символ."
+        few: "Повідомлення занадто коротке, повинно містити мінімум %{count} символи."
+        many: "Повідомлення занадто коротке, повинно містити мінімум %{count} символів."
+        other: "Повідомлення занадто коротке, повинно містити мінімум %{count} символів."
+      message_too_long:
+        one: "Повідомлення занадто довге, повідомлення має бути не більше %{count} символ."
+        few: "Повідомлення занадто довге, повідомлення має бути не більше %{count} символи."
+        many: "Повідомлення занадто довге, повідомлення має бути не більше %{count} символів."
+        other: "Повідомлення занадто довге, повідомлення має бути не більше %{count} символів."
       draft_too_long: "Чернетка занадто довга."
       not_accepting_dms: "На жаль, %{username} в даний момент не приймає повідомлення."
+      over_chat_max_direct_message_users_allow_self: "Ви можете створити пряме повідомлення тільки з самим собою."
+      over_chat_max_direct_message_users:
+        one: "Ви не можете створити пряме повідомлення більше ніж з %{count} іншим користувачем."
+        few: "Ви не можете створити пряме повідомлення більше ніж з %{count} іншими користувачами."
+        many: "Ви не можете створити пряме повідомлення більше ніж з %{count} іншими користувачами."
+        other: "Ви не можете створити пряме повідомлення більше ніж з %{count} іншими користувачами."
+      original_message_not_found: "Попередника повідомлення, на яке ви відповідаєте, неможливо знайти або його було видалено."
     reviewables:
       actions:
         agree:
@@ -86,15 +110,14 @@ uk:
         ignore:
           title: "Ігнорувати"
     channel:
-      statuses:
-        read_only: "Тільки для читання"
-        archived: "Архівовано"
-        closed: "Закриті"
-        open: "Відкрити"
       dm_title:
-        single_user: "%{user}"
-        multi_user: "%{users}"
-        multi_user_truncated: "%{users} і ще %{leftover}"
+        single_user: "%{username}"
+        multi_user: "%{comma_separated_usernames}"
+        multi_user_truncated:
+          one: "%{comma_separated_usernames} і ще %{count}"
+          few: "%{comma_separated_usernames} і ще %{count}"
+          many: "%{comma_separated_usernames} і ще %{count}"
+          other: "%{comma_separated_usernames} і ще %{count}"
     category_channel:
       errors:
         slug_contains_non_ascii_chars: "містить символи, які не є ASCII"
diff --git a/plugins/chat/config/locales/server.ur.yml b/plugins/chat/config/locales/server.ur.yml
index 38179a4083f..40fd1c32f20 100644
--- a/plugins/chat/config/locales/server.ur.yml
+++ b/plugins/chat/config/locales/server.ur.yml
@@ -24,9 +24,8 @@ ur:
         ignore:
           title: "نظر انداز کریں"
     channel:
-      statuses:
-        closed: "بند"
-        open: "کھولیں"
+      dm_title:
+        single_user: "%{username}"
     category_channel:
       errors:
         slug_contains_non_ascii_chars: "غیر ascii حروف پر مشتمل ہے"
diff --git a/plugins/chat/config/locales/server.vi.yml b/plugins/chat/config/locales/server.vi.yml
index c6a4d7c51ee..1e33286eccc 100644
--- a/plugins/chat/config/locales/server.vi.yml
+++ b/plugins/chat/config/locales/server.vi.yml
@@ -24,11 +24,10 @@ vi:
         ignore:
           title: "Bỏ qua"
     channel:
-      statuses:
-        closed: "Đã "
-        open: "Mở"
       dm_title:
-        multi_user_truncated: "%{users} và %{leftover} khác"
+        single_user: "%{username}"
+        multi_user_truncated:
+          other: "%{comma_separated_usernames} và %{count} khác"
   discourse_push_notifications:
     popup:
       chat_mention:
diff --git a/plugins/chat/config/locales/server.zh_CN.yml b/plugins/chat/config/locales/server.zh_CN.yml
index ebf59dc21a9..939555d2fd6 100644
--- a/plugins/chat/config/locales/server.zh_CN.yml
+++ b/plugins/chat/config/locales/server.zh_CN.yml
@@ -7,6 +7,7 @@
 zh_CN:
   site_settings:
     chat_enabled: "启用聊天插件。"
+    enable_public_channels: "根据类别启用公共频道。"
     chat_allowed_groups: "这些群组中的用户可以聊天。请注意，管理人员始终可以访问聊天。"
     chat_channel_retention_days: "常规频道中的聊天消息将保留此天数。设置为 0 将永久保留消息。"
     chat_dm_retention_days: "个人聊天频道中的聊天消息将保留此天数。设置为 0 将永久保留消息。"
@@ -54,16 +55,24 @@ zh_CN:
     deleted_chat_username: 已删除
     errors:
       channel_exists_for_category: "此类别和名称的频道已经存在"
-      channel_new_message_disallowed: "频道的状态为%{status}，无法发送新消息"
-      channel_modify_message_disallowed: "频道的状态为%{status}，无法编辑或删除消息"
+      channel_new_message_disallowed:
+        archived: "该频道已被存档，无法发送新消息"
+        closed: "该频道已关闭，无法发送新消息"
+        read_only: "该频道是只读的，不能发送新消息"
+      channel_modify_message_disallowed:
+        archived: "频道已关闭，无法编辑或删除任何消息"
+        closed: "频道已关闭，无法编辑或删除任何消息"
+        read_only: "该频道为只读频道，无法编辑或删除任何消息"
       user_cannot_send_message: "您目前无法发送消息。"
       rate_limit_exceeded: "超过了 30 秒内可发送的聊天消息的上限"
       auto_silence_from_flags: "聊天消息被举报的分数高到足以将用户禁言。"
       channel_cannot_be_archived: "目前无法归档该频道，必须将其关闭或打开才能归档。"
       duplicate_message: "您在短时间内发布了一条相同的消息。"
       delete_channel_failed: "删除频道失败，请重试。"
-      minimum_length_not_met: "消息太短，必须至少有 %{minimum} 个字符。"
-      message_too_long: "消息过长，最多只能包含 %{maximum} 个字符。"
+      minimum_length_not_met:
+        other: "消息太短，必须至少有 %{count} 个字符。"
+      message_too_long:
+        other: "消息过长，最多只能包含 %{count} 个字符。"
       draft_too_long: "草稿太长了。"
       max_reactions_limit_reached: "此消息不允许有新的回应。"
       message_move_invalid_channel: "源频道和目标频道必须是公共频道。"
@@ -75,8 +84,12 @@ zh_CN:
       actor_disallowed_dms: "您已选择阻止用户向您发送私人和直接消息，因此您无法创建新的直接消息。"
       actor_preventing_target_user_from_dm: "您已选择阻止 %{username} 向您发送私人和直接消息，因此您无法创建给他们的新直接消息。"
       user_cannot_send_direct_messages: "抱歉，您无法发送直接消息。"
+      over_chat_max_direct_message_users_allow_self: "你只能创建一个与自己的直接信息。"
       over_chat_max_direct_message_users:
         other: "您无法创建与超过 %{count} 个其他用户的直接消息。"
+      original_message_not_found: "无法找到您要回复信息的内容，或已被删除。"
+      thread_invalid_for_channel: "该聊天串不是所提供频道的一部分。"
+      thread_does_not_match_parent: "聊天串与父消息不匹配。"
     reviewables:
       message_already_handled: "谢谢，但我们已经审核此消息，并确定它不需要被再次举报。"
       actions:
@@ -113,19 +126,15 @@ zh_CN:
         transcript_title: "%{channel_name}中以前消息的副本"
         transcript_body: "为了向您提供更多背景，我们在此对话中包含了以前消息的副本（最多十条）：\n\n%{transcript}"
     channel:
-      statuses:
-        read_only: "只读"
-        archived: "已归档"
-        closed: "已关闭"
-        open: "开放"
       archive:
         first_post_raw: "此话题是[%{channel_name}](%{channel_url})聊天频道的归档。"
       messages_moved:
         other: "@%{acting_username} 将 %{count} 条消息移至[%{channel_name}](%{first_moved_message_url})频道。"
       dm_title:
-        single_user: "%{user}"
-        multi_user: "%{users}"
-        multi_user_truncated: "%{users} 和其他 %{leftover} 人"
+        single_user: "%{username}"
+        multi_user: "%{comma_separated_usernames}"
+        multi_user_truncated:
+          other: "%{comma_separated_usernames} 和其他 %{count} 人"
     category_channel:
       errors:
         slug_contains_non_ascii_chars: "包含非 ASCII 字符"
@@ -141,6 +150,8 @@ zh_CN:
         other: "%{count} 个成员"
       and_x_others:
         other: "和其他 %{count} 人"
+    summaries:
+      no_targets: "在所选时间段内没有消息。"
   discourse_push_notifications:
     popup:
       chat_mention:
diff --git a/plugins/chat/config/locales/server.zh_TW.yml b/plugins/chat/config/locales/server.zh_TW.yml
index b134c030f24..f027146cdf1 100644
--- a/plugins/chat/config/locales/server.zh_TW.yml
+++ b/plugins/chat/config/locales/server.zh_TW.yml
@@ -24,11 +24,8 @@ zh_TW:
         ignore:
           title: "忽略"
     channel:
-      statuses:
-        read_only: "唯讀"
-        archived: "已封存"
-        closed: "不公開"
-        open: "開啟"
+      dm_title:
+        single_user: "%{username}"
   reviewable_score_types:
     notify_user:
       chat_pm_body: "%{link}\n\n%{message}"
diff --git a/plugins/chat/config/routes.rb b/plugins/chat/config/routes.rb
new file mode 100644
index 00000000000..de4b47d489b
--- /dev/null
+++ b/plugins/chat/config/routes.rb
@@ -0,0 +1,108 @@
+# frozen_string_literal: true
+
+Chat::Engine.routes.draw do
+  namespace :api, defaults: { format: :json } do
+    get "/chatables" => "chatables#index"
+    get "/channels" => "channels#index"
+    get "/channels/me" => "current_user_channels#index"
+    post "/channels" => "channels#create"
+    put "/channels/read/" => "reads#update_all"
+    put "/channels/:channel_id/read/:message_id" => "reads#update"
+    delete "/channels/:channel_id" => "channels#destroy"
+    put "/channels/:channel_id" => "channels#update"
+    get "/channels/:channel_id" => "channels#show"
+    put "/channels/:channel_id/status" => "channels_status#update"
+    get "/channels/:channel_id/messages" => "channel_messages#index"
+    post "/channels/:channel_id/messages/moves" => "channels_messages_moves#create"
+    post "/channels/:channel_id/archives" => "channels_archives#create"
+    get "/channels/:channel_id/memberships" => "channels_memberships#index"
+    delete "/channels/:channel_id/memberships/me" => "channels_current_user_membership#destroy"
+    post "/channels/:channel_id/memberships/me" => "channels_current_user_membership#create"
+    put "/channels/:channel_id/notifications-settings/me" =>
+          "channels_current_user_notifications_settings#update"
+
+    # Category chatables controller hints. Only used by staff members, we don't want to leak category permissions.
+    get "/category-chatables/:id/permissions" => "category_chatables#permissions",
+        :format => :json,
+        :constraints => StaffConstraint.new
+
+    # Hints for JIT warnings.
+    get "/mentions/groups" => "hints#check_group_mentions", :format => :json
+
+    get "/channels/:channel_id/threads" => "channel_threads#index"
+    put "/channels/:channel_id/threads/:thread_id" => "channel_threads#update"
+    get "/channels/:channel_id/threads/:thread_id" => "channel_threads#show"
+    get "/channels/:channel_id/threads/:thread_id/messages" => "channel_thread_messages#index"
+    put "/channels/:channel_id/threads/:thread_id/read" => "thread_reads#update"
+    put "/channels/:channel_id/threads/:thread_id/notifications-settings/me" =>
+          "channel_threads_current_user_notifications_settings#update"
+
+    # TODO (martin) Remove this when we refactor the DM channel creation to happen
+    # via message creation in a different API controller.
+    post "/direct-message-channels" => "direct_messages#create"
+
+    put "/channels/:channel_id/messages/:message_id/restore" => "channel_messages#restore"
+    delete "/channels/:channel_id/messages/:message_id" => "channel_messages#destroy"
+
+    get "/channels/:channel_id/summarize" => "summaries#get_summary"
+  end
+
+  namespace :admin, defaults: { format: :json, constraints: StaffConstraint.new } do
+    post "export/messages" => "export#export_messages"
+  end
+
+  # direct_messages_controller routes
+  get "/direct_messages" => "direct_messages#index"
+
+  # incoming_webhooks_controller routes
+  post "/hooks/:key" => "incoming_webhooks#create_message"
+
+  # incoming_webhooks_controller routes
+  post "/hooks/:key/slack" => "incoming_webhooks#create_message_slack_compatible"
+
+  # chat_controller routes
+  get "/" => "chat#respond"
+  get "/browse" => "chat#respond"
+  get "/browse/all" => "chat#respond"
+  get "/browse/closed" => "chat#respond"
+  get "/browse/open" => "chat#respond"
+  get "/browse/archived" => "chat#respond"
+  post "/enable" => "chat#enable_chat"
+  post "/disable" => "chat#disable_chat"
+  post "/dismiss-retention-reminder" => "chat#dismiss_retention_reminder"
+  get "/message/:message_id" => "chat#message_link"
+  put ":chat_channel_id/edit/:message_id" => "chat#edit_message"
+  put ":chat_channel_id/react/:message_id" => "chat#react"
+  put "/:chat_channel_id/:message_id/rebake" => "chat#rebake"
+  post "/:chat_channel_id/:message_id/flag" => "chat#flag"
+  post "/:chat_channel_id/quote" => "chat#quote_messages"
+  put "/user_chat_enabled/:user_id" => "chat#set_user_chat_status"
+  put "/:chat_channel_id/invite" => "chat#invite_users"
+  post "/drafts" => "chat#set_draft"
+  post "/:chat_channel_id" => "chat#create_message"
+  put "/flag" => "chat#flag"
+  get "/emojis" => "emojis#index"
+
+  base_c_route = "/c/:channel_title/:channel_id"
+  get base_c_route => "chat#respond", :as => "channel"
+  get "#{base_c_route}/:message_id" => "chat#respond"
+
+  %w[info info/about info/members info/settings].each do |route|
+    get "#{base_c_route}/#{route}" => "chat#respond"
+  end
+
+  # /channel -> /c redirects
+  get "/channel/:channel_id", to: redirect("/chat/c/-/%{channel_id}")
+
+  get "#{base_c_route}/t/:thread_id" => "chat#respond"
+  get "#{base_c_route}/t/:thread_id/:message_id" => "chat#respond"
+
+  base_channel_route = "/channel/:channel_id/:channel_title"
+  redirect_base = "/chat/c/%{channel_title}/%{channel_id}"
+
+  get base_channel_route, to: redirect(redirect_base)
+
+  %w[info info/about info/members info/settings].each do |route|
+    get "#{base_channel_route}/#{route}", to: redirect("#{redirect_base}/#{route}")
+  end
+end
diff --git a/plugins/chat/config/settings.yml b/plugins/chat/config/settings.yml
index 015477dc038..e5958c82cde 100644
--- a/plugins/chat/config/settings.yml
+++ b/plugins/chat/config/settings.yml
@@ -2,6 +2,9 @@ chat:
   chat_enabled:
     default: true
     client: true
+  enable_public_channels:
+    default: true
+    client: true
   chat_allowed_groups:
     client: true
     type: group_list
@@ -59,7 +62,7 @@ chat:
   chat_default_channel_id:
     default: ""
     client: true
-    validator: "ChatDefaultChannelValidator"
+    validator: "Chat::DefaultChannelValidator"
   chat_duplicate_message_sensitivity:
     type: float
     default: 0.5
@@ -85,7 +88,7 @@ chat:
   chat_allow_uploads:
     default: true
     client: true
-    validator: "ChatAllowUploadsValidator"
+    validator: "Chat::AllowUploadsValidator"
   max_chat_auto_joined_users:
     min: 0
     default: 10000
@@ -97,7 +100,7 @@ chat:
     client: true
     allow_any: false
     refresh: true
-    validator: "DirectMessageEnabledGroupsValidator"
+    validator: "Chat::DirectMessageEnabledGroupsValidator"
   chat_message_flag_allowed_groups:
     default: "11" # @trust_level_1
     type: group_list
diff --git a/plugins/chat/db/fixtures/600_chat_channels.rb b/plugins/chat/db/fixtures/600_chat_channels.rb
index 972398ba7f0..63b55a19cc3 100644
--- a/plugins/chat/db/fixtures/600_chat_channels.rb
+++ b/plugins/chat/db/fixtures/600_chat_channels.rb
@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-ChatSeeder.new.execute if !Rails.env.test?
+Chat::Seeder.new.execute if !Rails.env.test?
diff --git a/plugins/chat/db/post_migrate/20220321235638_drop_chat_message_post_connections_table.rb b/plugins/chat/db/migrate/20220321235638_drop_chat_message_post_connections_table.rb
similarity index 100%
rename from plugins/chat/db/post_migrate/20220321235638_drop_chat_message_post_connections_table.rb
rename to plugins/chat/db/migrate/20220321235638_drop_chat_message_post_connections_table.rb
diff --git a/plugins/chat/db/post_migrate/20220504080457_drop_old_chat_message_post_id_action_code_columns.rb b/plugins/chat/db/migrate/20220504080457_drop_old_chat_message_post_id_action_code_columns.rb
similarity index 100%
rename from plugins/chat/db/post_migrate/20220504080457_drop_old_chat_message_post_id_action_code_columns.rb
rename to plugins/chat/db/migrate/20220504080457_drop_old_chat_message_post_id_action_code_columns.rb
diff --git a/plugins/chat/db/post_migrate/20220516142658_remove_email_statuses_table.rb b/plugins/chat/db/migrate/20220516142658_remove_email_statuses_table.rb
similarity index 100%
rename from plugins/chat/db/post_migrate/20220516142658_remove_email_statuses_table.rb
rename to plugins/chat/db/migrate/20220516142658_remove_email_statuses_table.rb
diff --git a/plugins/chat/db/post_migrate/20220518180642_remove_user_option_last_emailed_at.rb b/plugins/chat/db/migrate/20220518180642_remove_user_option_last_emailed_at.rb
similarity index 100%
rename from plugins/chat/db/post_migrate/20220518180642_remove_user_option_last_emailed_at.rb
rename to plugins/chat/db/migrate/20220518180642_remove_user_option_last_emailed_at.rb
diff --git a/plugins/chat/db/post_migrate/20220526135414_remove_corrupted_last_read_message_id.rb b/plugins/chat/db/migrate/20220526135414_remove_corrupted_last_read_message_id.rb
similarity index 100%
rename from plugins/chat/db/post_migrate/20220526135414_remove_corrupted_last_read_message_id.rb
rename to plugins/chat/db/migrate/20220526135414_remove_corrupted_last_read_message_id.rb
diff --git a/plugins/chat/db/post_migrate/20220531105951_drop_user_chat_channel_last_reads.rb b/plugins/chat/db/migrate/20220531105951_drop_user_chat_channel_last_reads.rb
similarity index 100%
rename from plugins/chat/db/post_migrate/20220531105951_drop_user_chat_channel_last_reads.rb
rename to plugins/chat/db/migrate/20220531105951_drop_user_chat_channel_last_reads.rb
diff --git a/plugins/chat/db/post_migrate/20220630074200_drop_chat_isolated_from_user_options.rb b/plugins/chat/db/migrate/20220630074200_drop_chat_isolated_from_user_options.rb
similarity index 100%
rename from plugins/chat/db/post_migrate/20220630074200_drop_chat_isolated_from_user_options.rb
rename to plugins/chat/db/migrate/20220630074200_drop_chat_isolated_from_user_options.rb
diff --git a/plugins/chat/db/post_migrate/20220701195731_convert_chatable_topics_to_categories.rb b/plugins/chat/db/migrate/20220701195731_convert_chatable_topics_to_categories.rb
similarity index 100%
rename from plugins/chat/db/post_migrate/20220701195731_convert_chatable_topics_to_categories.rb
rename to plugins/chat/db/migrate/20220701195731_convert_chatable_topics_to_categories.rb
diff --git a/plugins/chat/db/post_migrate/20221004122254_delete_reviewables_targetting_deleted_chat_messages.rb b/plugins/chat/db/migrate/20221004122254_delete_reviewables_targetting_deleted_chat_messages.rb
similarity index 100%
rename from plugins/chat/db/post_migrate/20221004122254_delete_reviewables_targetting_deleted_chat_messages.rb
rename to plugins/chat/db/migrate/20221004122254_delete_reviewables_targetting_deleted_chat_messages.rb
diff --git a/plugins/chat/db/post_migrate/20221018091412_migrate_chat_channels.rb b/plugins/chat/db/migrate/20221018091412_migrate_chat_channels.rb
similarity index 100%
rename from plugins/chat/db/post_migrate/20221018091412_migrate_chat_channels.rb
rename to plugins/chat/db/migrate/20221018091412_migrate_chat_channels.rb
diff --git a/plugins/chat/db/post_migrate/20221027090832_migrate_dm_channels.rb b/plugins/chat/db/migrate/20221027090832_migrate_dm_channels.rb
similarity index 100%
rename from plugins/chat/db/post_migrate/20221027090832_migrate_dm_channels.rb
rename to plugins/chat/db/migrate/20221027090832_migrate_dm_channels.rb
diff --git a/plugins/chat/db/post_migrate/20221104054957_backfill_channel_slugs.rb b/plugins/chat/db/migrate/20221104054957_backfill_channel_slugs.rb
similarity index 100%
rename from plugins/chat/db/post_migrate/20221104054957_backfill_channel_slugs.rb
rename to plugins/chat/db/migrate/20221104054957_backfill_channel_slugs.rb
diff --git a/plugins/chat/db/post_migrate/20221117052348_truncate_chat_messages_over_max_length.rb b/plugins/chat/db/migrate/20221117052348_truncate_chat_messages_over_max_length.rb
similarity index 100%
rename from plugins/chat/db/post_migrate/20221117052348_truncate_chat_messages_over_max_length.rb
rename to plugins/chat/db/migrate/20221117052348_truncate_chat_messages_over_max_length.rb
diff --git a/plugins/chat/db/post_migrate/20221117142910_delete_orphaned_channels.rb b/plugins/chat/db/migrate/20221117142910_delete_orphaned_channels.rb
similarity index 100%
rename from plugins/chat/db/post_migrate/20221117142910_delete_orphaned_channels.rb
rename to plugins/chat/db/migrate/20221117142910_delete_orphaned_channels.rb
diff --git a/plugins/chat/db/post_migrate/20221201032830_drop_tmp_chat_slug_tables.rb b/plugins/chat/db/migrate/20221201032830_drop_tmp_chat_slug_tables.rb
similarity index 100%
rename from plugins/chat/db/post_migrate/20221201032830_drop_tmp_chat_slug_tables.rb
rename to plugins/chat/db/migrate/20221201032830_drop_tmp_chat_slug_tables.rb
diff --git a/plugins/chat/db/post_migrate/20221202043755_update_chat_channel_message_counts.rb b/plugins/chat/db/migrate/20221202043755_update_chat_channel_message_counts.rb
similarity index 100%
rename from plugins/chat/db/post_migrate/20221202043755_update_chat_channel_message_counts.rb
rename to plugins/chat/db/migrate/20221202043755_update_chat_channel_message_counts.rb
diff --git a/plugins/chat/db/migrate/20230123020036_move_chat_uploads_to_upload_references.rb b/plugins/chat/db/migrate/20230123020036_move_chat_uploads_to_upload_references.rb
new file mode 100644
index 00000000000..22dafbcff20
--- /dev/null
+++ b/plugins/chat/db/migrate/20230123020036_move_chat_uploads_to_upload_references.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class MoveChatUploadsToUploadReferences < ActiveRecord::Migration[7.0]
+  def up
+    execute <<~SQL
+      INSERT INTO upload_references(upload_id, target_type, target_id, created_at, updated_at)
+      SELECT chat_uploads.upload_id, 'ChatMessage', chat_uploads.chat_message_id, chat_uploads.created_at, chat_uploads.updated_at
+      FROM chat_uploads
+      INNER JOIN uploads ON uploads.id = chat_uploads.upload_id
+      ON CONFLICT DO NOTHING
+    SQL
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/plugins/chat/db/migrate/20230130053144_add_threading_enabled_to_chat_channels.rb b/plugins/chat/db/migrate/20230130053144_add_threading_enabled_to_chat_channels.rb
new file mode 100644
index 00000000000..830259644be
--- /dev/null
+++ b/plugins/chat/db/migrate/20230130053144_add_threading_enabled_to_chat_channels.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddThreadingEnabledToChatChannels < ActiveRecord::Migration[7.0]
+  def change
+    add_column :chat_channels, :threading_enabled, :boolean, default: false, null: false
+  end
+end
diff --git a/plugins/chat/db/migrate/20230201012734_create_chat_threading_models.rb b/plugins/chat/db/migrate/20230201012734_create_chat_threading_models.rb
new file mode 100644
index 00000000000..a18ad69e92a
--- /dev/null
+++ b/plugins/chat/db/migrate/20230201012734_create_chat_threading_models.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+class CreateChatThreadingModels < ActiveRecord::Migration[7.0]
+  def change
+    create_table :chat_threads do |t|
+      t.bigint :channel_id, null: false
+      t.bigint :original_message_id, null: false
+      t.bigint :original_message_user_id, null: false
+      t.integer :status, null: false, default: 0
+      t.string :title, null: true
+
+      t.timestamps
+    end
+
+    add_index :chat_threads, :channel_id
+    add_index :chat_threads, :original_message_id
+    add_index :chat_threads, :original_message_user_id
+    add_index :chat_threads, :status
+    add_index :chat_threads, %i[channel_id status]
+
+    add_column :chat_messages, :thread_id, :bigint, null: true
+    add_index :chat_messages, :thread_id
+  end
+end
diff --git a/plugins/chat/db/migrate/20230228062442_add_chat_header_indicator_preference.rb b/plugins/chat/db/migrate/20230228062442_add_chat_header_indicator_preference.rb
new file mode 100644
index 00000000000..e6b5d7c38cb
--- /dev/null
+++ b/plugins/chat/db/migrate/20230228062442_add_chat_header_indicator_preference.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddChatHeaderIndicatorPreference < ActiveRecord::Migration[7.0]
+  def change
+    add_column :user_options, :chat_header_indicator_preference, :integer, default: 0, null: false
+  end
+end
diff --git a/plugins/chat/db/migrate/20230411012630_add_thread_not_deleted_index_chat_messages.rb b/plugins/chat/db/migrate/20230411012630_add_thread_not_deleted_index_chat_messages.rb
new file mode 100644
index 00000000000..3596ea46a09
--- /dev/null
+++ b/plugins/chat/db/migrate/20230411012630_add_thread_not_deleted_index_chat_messages.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+class AddThreadNotDeletedIndexChatMessages < ActiveRecord::Migration[7.0]
+  disable_ddl_transaction!
+
+  def change
+    execute <<~SQL
+      DROP INDEX IF EXISTS idx_chat_messages_by_thread_id_not_deleted
+    SQL
+
+    execute <<~SQL
+      CREATE INDEX CONCURRENTLY IF NOT EXISTS
+      idx_chat_messages_by_thread_id_not_deleted
+      ON chat_messages (thread_id)
+      WHERE deleted_at IS NULL
+    SQL
+  end
+
+  def down
+    execute <<~SQL
+      DROP INDEX IF EXISTS idx_chat_messages_by_thread_id_not_deleted
+    SQL
+  end
+end
diff --git a/plugins/chat/db/migrate/20230411023246_add_chat_message_replies_count_to_chat_threads.rb b/plugins/chat/db/migrate/20230411023246_add_chat_message_replies_count_to_chat_threads.rb
new file mode 100644
index 00000000000..6c2702d2876
--- /dev/null
+++ b/plugins/chat/db/migrate/20230411023246_add_chat_message_replies_count_to_chat_threads.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddChatMessageRepliesCountToChatThreads < ActiveRecord::Migration[7.0]
+  def change
+    add_column :chat_threads, :replies_count, :integer, null: false, default: 0
+    add_index :chat_threads, :replies_count
+  end
+end
diff --git a/plugins/chat/db/migrate/20230510142249_add_user_chat_thread_memberships.rb b/plugins/chat/db/migrate/20230510142249_add_user_chat_thread_memberships.rb
new file mode 100644
index 00000000000..bb8e88ce48d
--- /dev/null
+++ b/plugins/chat/db/migrate/20230510142249_add_user_chat_thread_memberships.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class AddUserChatThreadMemberships < ActiveRecord::Migration[7.0]
+  def change
+    create_table :user_chat_thread_memberships do |t|
+      t.bigint :user_id, null: false
+      t.bigint :thread_id, null: false
+      t.bigint :last_read_message_id
+      t.integer :notification_level, default: 2, null: false # default to tracking
+      t.timestamps
+    end
+
+    add_index :user_chat_thread_memberships,
+              %i[user_id thread_id],
+              unique: true,
+              name: "user_chat_thread_unique_memberships"
+  end
+end
diff --git a/plugins/chat/db/migrate/20230607091233_backfill_thread_memberships.rb b/plugins/chat/db/migrate/20230607091233_backfill_thread_memberships.rb
new file mode 100644
index 00000000000..8dfedf140ab
--- /dev/null
+++ b/plugins/chat/db/migrate/20230607091233_backfill_thread_memberships.rb
@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+class BackfillThreadMemberships < ActiveRecord::Migration[7.0]
+  def up
+    thread_tracking_notification_level = 2
+
+    sql = <<~SQL
+      INSERT INTO user_chat_thread_memberships(
+        user_id,
+        thread_id,
+        notification_level,
+        last_read_message_id,
+        created_at,
+        updated_at
+      )
+      SELECT
+        thread_participant_stats.user_id,
+        thread_participant_stats.thread_id,
+        #{thread_tracking_notification_level},
+        (
+          SELECT id FROM chat_messages
+          WHERE thread_id = thread_participant_stats.thread_id
+          AND deleted_at IS NULL
+          ORDER BY created_at DESC, id DESC
+          LIMIT 1
+        ),
+        NOW(),
+        NOW()
+      FROM (
+        SELECT chat_messages.thread_id, chat_messages.user_id
+        FROM chat_messages
+        INNER JOIN chat_threads ON chat_threads.id = chat_messages.thread_id
+        WHERE chat_messages.thread_id IS NOT NULL
+        GROUP BY chat_messages.thread_id, chat_messages.user_id
+        ORDER BY chat_messages.thread_id ASC, chat_messages.user_id ASC
+      ) AS thread_participant_stats
+      INNER JOIN users ON users.id = thread_participant_stats.user_id
+      LEFT JOIN user_chat_thread_memberships ON user_chat_thread_memberships.thread_id = thread_participant_stats.thread_id
+        AND user_chat_thread_memberships.user_id = thread_participant_stats.user_id
+      WHERE user_chat_thread_memberships IS NULL
+      ORDER BY user_chat_thread_memberships.thread_id ASC
+      ON CONFLICT DO NOTHING;
+    SQL
+
+    execute(sql)
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/plugins/chat/db/migrate/20230627044755_add_last_viewed_at_to_user_chat_channel_memberships.rb b/plugins/chat/db/migrate/20230627044755_add_last_viewed_at_to_user_chat_channel_memberships.rb
new file mode 100644
index 00000000000..b930d356ae1
--- /dev/null
+++ b/plugins/chat/db/migrate/20230627044755_add_last_viewed_at_to_user_chat_channel_memberships.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class AddLastViewedAtToUserChatChannelMemberships < ActiveRecord::Migration[7.0]
+  def change
+    add_column :user_chat_channel_memberships,
+               :last_viewed_at,
+               :datetime,
+               null: false,
+               default: -> { "CURRENT_TIMESTAMP" }
+  end
+end
diff --git a/plugins/chat/db/migrate/20230707025733_add_last_message_id_to_channel_and_thread.rb b/plugins/chat/db/migrate/20230707025733_add_last_message_id_to_channel_and_thread.rb
new file mode 100644
index 00000000000..b8befcef009
--- /dev/null
+++ b/plugins/chat/db/migrate/20230707025733_add_last_message_id_to_channel_and_thread.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class AddLastMessageIdToChannelAndThread < ActiveRecord::Migration[7.0]
+  def change
+    add_column :chat_channels, :last_message_id, :bigint, null: true
+    add_column :chat_threads, :last_message_id, :bigint, null: true
+
+    add_index :chat_channels, :last_message_id
+    add_index :chat_threads, :last_message_id
+  end
+end
diff --git a/plugins/chat/db/migrate/20230707082645_backfill_chat_channel_and_thread_last_message_ids.rb b/plugins/chat/db/migrate/20230707082645_backfill_chat_channel_and_thread_last_message_ids.rb
new file mode 100644
index 00000000000..cba288c9b33
--- /dev/null
+++ b/plugins/chat/db/migrate/20230707082645_backfill_chat_channel_and_thread_last_message_ids.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+class BackfillChatChannelAndThreadLastMessageIds < ActiveRecord::Migration[7.0]
+  def up
+    execute <<-SQL
+      UPDATE chat_channels
+      SET last_message_id = (
+        SELECT cm.id
+        FROM chat_messages cm
+        LEFT JOIN chat_threads ON chat_threads.original_message_id = cm.id
+        WHERE cm.chat_channel_id = chat_channels.id
+          AND cm.deleted_at IS NULL
+          AND (cm.thread_id IS NULL OR chat_threads.id IS NOT NULL)
+        ORDER BY cm.created_at DESC, cm.id DESC
+        LIMIT 1
+      );
+    SQL
+
+    execute <<-SQL
+      UPDATE chat_threads
+      SET last_message_id = (
+        SELECT cm.id
+        FROM chat_messages cm
+        WHERE cm.thread_id = chat_threads.id
+          AND cm.deleted_at IS NULL
+        ORDER BY cm.created_at DESC, cm.id DESC
+        LIMIT 1
+      );
+    SQL
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/plugins/chat/db/migrate/20230721025249_remove_experimental_site_setting_for_threads.rb b/plugins/chat/db/migrate/20230721025249_remove_experimental_site_setting_for_threads.rb
new file mode 100644
index 00000000000..795b5bfb081
--- /dev/null
+++ b/plugins/chat/db/migrate/20230721025249_remove_experimental_site_setting_for_threads.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class RemoveExperimentalSiteSettingForThreads < ActiveRecord::Migration[7.0]
+  def up
+    execute "DELETE FROM site_settings WHERE name='enable_experimental_chat_threaded_discussions'"
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/plugins/chat/db/post_migrate/20230123025112_move_chat_uploads_to_upload_references_post.rb b/plugins/chat/db/post_migrate/20230123025112_move_chat_uploads_to_upload_references_post.rb
new file mode 100644
index 00000000000..02ec2dfbffe
--- /dev/null
+++ b/plugins/chat/db/post_migrate/20230123025112_move_chat_uploads_to_upload_references_post.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class MoveChatUploadsToUploadReferencesPost < ActiveRecord::Migration[7.0]
+  def up
+    execute <<~SQL
+      INSERT INTO upload_references(upload_id, target_type, target_id, created_at, updated_at)
+      SELECT chat_uploads.upload_id, 'ChatMessage', chat_uploads.chat_message_id, chat_uploads.created_at, chat_uploads.updated_at
+      FROM chat_uploads
+      INNER JOIN uploads ON uploads.id = chat_uploads.upload_id
+      ON CONFLICT DO NOTHING
+    SQL
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/plugins/chat/db/post_migrate/20230227172543_make_chat_mention_notification_id_nullable.rb b/plugins/chat/db/post_migrate/20230227172543_make_chat_mention_notification_id_nullable.rb
new file mode 100644
index 00000000000..b3bbcef23be
--- /dev/null
+++ b/plugins/chat/db/post_migrate/20230227172543_make_chat_mention_notification_id_nullable.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class MakeChatMentionNotificationIdNullable < ActiveRecord::Migration[7.0]
+  def up
+    change_column_null :chat_mentions, :notification_id, true
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/plugins/chat/db/post_migrate/20230403012844_drop_chat_uploads.rb b/plugins/chat/db/post_migrate/20230403012844_drop_chat_uploads.rb
new file mode 100644
index 00000000000..d36f031e425
--- /dev/null
+++ b/plugins/chat/db/post_migrate/20230403012844_drop_chat_uploads.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class DropChatUploads < ActiveRecord::Migration[7.0]
+  DROPPED_TABLES ||= %i[chat_uploads]
+
+  def up
+    DROPPED_TABLES.each { |table| Migration::TableDropper.execute_drop(table) }
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/plugins/chat/db/post_migrate/20230411023340_update_thread_reply_counts.rb b/plugins/chat/db/post_migrate/20230411023340_update_thread_reply_counts.rb
new file mode 100644
index 00000000000..b3dc2998e8c
--- /dev/null
+++ b/plugins/chat/db/post_migrate/20230411023340_update_thread_reply_counts.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class UpdateThreadReplyCounts < ActiveRecord::Migration[7.0]
+  def up
+    DB.exec <<~SQL
+      UPDATE chat_threads threads
+      SET replies_count = subquery.replies_count
+      FROM (
+        SELECT COUNT(*) - 1 AS replies_count, thread_id
+        FROM chat_messages
+        WHERE chat_messages.deleted_at IS NULL AND thread_id IS NOT NULL
+        GROUP BY thread_id
+      ) subquery
+      WHERE threads.id = subquery.thread_id
+      AND subquery.replies_count != threads.replies_count
+    SQL
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/plugins/chat/db/post_migrate/20230710040640_backfill_chat_channel_and_thread_last_message_ids_post_migrate.rb b/plugins/chat/db/post_migrate/20230710040640_backfill_chat_channel_and_thread_last_message_ids_post_migrate.rb
new file mode 100644
index 00000000000..08384e31191
--- /dev/null
+++ b/plugins/chat/db/post_migrate/20230710040640_backfill_chat_channel_and_thread_last_message_ids_post_migrate.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class BackfillChatChannelAndThreadLastMessageIdsPostMigrate < ActiveRecord::Migration[7.0]
+  execute <<-SQL
+    UPDATE chat_channels
+    SET last_message_id = (
+      SELECT cm.id
+      FROM chat_messages cm
+      LEFT JOIN chat_threads ON chat_threads.original_message_id = cm.id
+      WHERE cm.chat_channel_id = chat_channels.id
+        AND cm.deleted_at IS NULL
+        AND (cm.thread_id IS NULL OR chat_threads.id IS NOT NULL)
+      ORDER BY cm.created_at DESC, cm.id DESC
+      LIMIT 1
+    );
+  SQL
+
+  execute <<-SQL
+    UPDATE chat_threads
+    SET last_message_id = (
+      SELECT cm.id
+      FROM chat_messages cm
+      WHERE cm.thread_id = chat_threads.id
+        AND cm.deleted_at IS NULL
+      ORDER BY cm.created_at DESC, cm.id DESC
+      LIMIT 1
+    );
+  SQL
+end
diff --git a/plugins/chat/lib/chat/bookmark_extension.rb b/plugins/chat/lib/chat/bookmark_extension.rb
new file mode 100644
index 00000000000..a4385da1b82
--- /dev/null
+++ b/plugins/chat/lib/chat/bookmark_extension.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Chat
+  module BookmarkExtension
+    extend ActiveSupport::Concern
+
+    prepended { include TypeMappable }
+
+    class_methods { def polymorphic_class_mapping = { "ChatMessage" => Chat::Message } }
+  end
+end
diff --git a/plugins/chat/lib/chat/category_extension.rb b/plugins/chat/lib/chat/category_extension.rb
new file mode 100644
index 00000000000..185cec5e83b
--- /dev/null
+++ b/plugins/chat/lib/chat/category_extension.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Chat
+  module CategoryExtension
+    extend ActiveSupport::Concern
+
+    include Chat::Chatable
+
+    prepended do
+      has_one :category_channel,
+              as: :chatable,
+              class_name: "Chat::CategoryChannel",
+              dependent: :destroy
+    end
+
+    def cannot_delete_reason
+      return I18n.t("category.cannot_delete.has_chat_channels") if category_channel
+      super
+    end
+
+    def deletable_for_chat?
+      return true if !category_channel
+      category_channel.chat_messages_empty?
+    end
+  end
+end
diff --git a/plugins/chat/lib/chat/channel_archive_service.rb b/plugins/chat/lib/chat/channel_archive_service.rb
new file mode 100644
index 00000000000..d3d7a349588
--- /dev/null
+++ b/plugins/chat/lib/chat/channel_archive_service.rb
@@ -0,0 +1,310 @@
+# frozen_string_literal: true
+
+##
+# From time to time, site admins may choose to sunset a chat channel and archive
+# the messages within. It cannot be used for DM channels in its current iteration.
+#
+# To archive a channel, we mark it read_only first to prevent any further message
+# additions or changes, and create a record to track whether the archive topic
+# will be new or existing. When we archive the channel, messages are copied into
+# posts in batches using the [chat] BBCode to quote the messages. The messages are
+# deleted once the batch has its post made. The execute action of this class is
+# idempotent, so if we fail halfway through the archive process it can be run again.
+#
+# Once all of the messages have been copied then we mark the channel as archived.
+module Chat
+  class ChannelArchiveService
+    ARCHIVED_MESSAGES_PER_POST = 100
+
+    class ArchiveValidationError < StandardError
+      attr_reader :errors
+
+      def initialize(errors: [])
+        super
+        @errors = errors
+      end
+    end
+
+    def self.create_archive_process(chat_channel:, acting_user:, topic_params:)
+      return if Chat::ChannelArchive.exists?(chat_channel: chat_channel)
+
+      # Only need to validate topic params for a new topic, not an existing one.
+      if topic_params[:topic_id].blank?
+        valid, errors =
+          Chat::ChannelArchiveService.validate_topic_params(Guardian.new(acting_user), topic_params)
+
+        raise ArchiveValidationError.new(errors: errors) if !valid
+      end
+
+      Chat::ChannelArchive.transaction do
+        chat_channel.read_only!(acting_user)
+
+        archive =
+          Chat::ChannelArchive.create!(
+            chat_channel: chat_channel,
+            archived_by: acting_user,
+            total_messages: chat_channel.chat_messages.count,
+            destination_topic_id: topic_params[:topic_id],
+            destination_topic_title: topic_params[:topic_title],
+            destination_category_id: topic_params[:category_id],
+            destination_tags: topic_params[:tags],
+          )
+        Jobs.enqueue(Jobs::Chat::ChannelArchive, chat_channel_archive_id: archive.id)
+
+        archive
+      end
+    end
+
+    def self.retry_archive_process(chat_channel:)
+      return if !chat_channel.chat_channel_archive&.failed?
+      Jobs.enqueue(
+        Jobs::Chat::ChannelArchive,
+        chat_channel_archive_id: chat_channel.chat_channel_archive.id,
+      )
+      chat_channel.chat_channel_archive
+    end
+
+    def self.validate_topic_params(guardian, topic_params)
+      topic_creator =
+        TopicCreator.new(
+          Discourse.system_user,
+          guardian,
+          {
+            title: topic_params[:topic_title],
+            category: topic_params[:category_id],
+            tags: topic_params[:tags],
+            import_mode: true,
+          },
+        )
+      [topic_creator.valid?, topic_creator.errors.full_messages]
+    end
+
+    attr_reader :chat_channel_archive, :chat_channel, :chat_channel_title
+
+    def initialize(chat_channel_archive)
+      @chat_channel_archive = chat_channel_archive
+      @chat_channel = chat_channel_archive.chat_channel
+      @chat_channel_title = chat_channel.title(chat_channel_archive.archived_by)
+    end
+
+    def execute
+      chat_channel_archive.update(archive_error: nil)
+
+      begin
+        return if !ensure_destination_topic_exists!
+
+        Rails.logger.info(
+          "Creating posts from message batches for #{chat_channel_title} archive, #{chat_channel_archive.total_messages} messages to archive (#{chat_channel_archive.total_messages / ARCHIVED_MESSAGES_PER_POST} posts).",
+        )
+
+        # A batch should be idempotent, either the post is created and the
+        # messages are deleted or we roll back the whole thing.
+        #
+        # At some point we may want to reconsider disabling post validations,
+        # and add in things like dynamic resizing of the number of messages per
+        # post based on post length, but that can be done later.
+        #
+        # Another future improvement is to send a MessageBus message for each
+        # completed batch, so the UI can receive updates and show a progress
+        # bar or something similar.
+        chat_channel
+          .chat_messages
+          .find_in_batches(batch_size: ARCHIVED_MESSAGES_PER_POST) do |chat_messages|
+            create_post(
+              Chat::TranscriptService.new(
+                chat_channel,
+                chat_channel_archive.archived_by,
+                messages_or_ids: chat_messages,
+                opts: {
+                  no_link: true,
+                  include_reactions: true,
+                },
+              ).generate_markdown,
+            ) { delete_message_batch(chat_messages.map(&:id)) }
+          end
+
+        kick_all_users
+        complete_archive
+      rescue => err
+        notify_archiver(:failed, error_message: err.message)
+        raise err
+      end
+    end
+
+    private
+
+    def create_post(raw)
+      pc = nil
+      Post.transaction do
+        pc =
+          PostCreator.new(
+            Discourse.system_user,
+            raw: raw,
+            # we must skip these because the posts are created in a big transaction,
+            # we do them all at the end instead
+            skip_jobs: true,
+            # we do not want to be sending out notifications etc. from this
+            # automatic background process
+            import_mode: true,
+            # don't want to be stopped by watched word or post length validations
+            skip_validations: true,
+            topic_id: chat_channel_archive.destination_topic_id,
+          )
+
+        pc.create
+
+        # so we can also delete chat messages in the same transaction
+        yield if block_given?
+      end
+      pc.enqueue_jobs
+    end
+
+    def ensure_destination_topic_exists!
+      if !chat_channel_archive.destination_topic.present?
+        Rails.logger.info("Creating topic for #{chat_channel_title} archive.")
+        Topic.transaction do
+          topic_creator =
+            TopicCreator.new(
+              Discourse.system_user,
+              Guardian.new(chat_channel_archive.archived_by),
+              {
+                title: chat_channel_archive.destination_topic_title,
+                category: chat_channel_archive.destination_category_id,
+                tags: chat_channel_archive.destination_tags,
+                import_mode: true,
+              },
+            )
+
+          if topic_creator.valid?
+            chat_channel_archive.update!(destination_topic: topic_creator.create)
+          else
+            Rails.logger.info("Destination topic for #{chat_channel_title} archive was not valid.")
+            notify_archiver(
+              :failed_no_topic,
+              error_message: topic_creator.errors.full_messages.join("\n"),
+            )
+          end
+        end
+
+        if chat_channel_archive.destination_topic.present?
+          Rails.logger.info("Creating first post for #{chat_channel_title} archive.")
+          create_post(
+            I18n.t(
+              "chat.channel.archive.first_post_raw",
+              channel_name: chat_channel_title,
+              channel_url: chat_channel.url,
+            ),
+          )
+        end
+      else
+        Rails.logger.info("Topic already exists for #{chat_channel_title} archive.")
+      end
+
+      if chat_channel_archive.destination_topic.present?
+        update_destination_topic_status
+        return true
+      end
+
+      false
+    end
+
+    def update_destination_topic_status
+      # We only want to do this when the destination topic is new, not an
+      # existing topic, because we don't want to update the status unexpectedly
+      # on an existing topic
+      if chat_channel_archive.new_topic?
+        if SiteSetting.chat_archive_destination_topic_status == "archived"
+          chat_channel_archive.destination_topic.update!(archived: true)
+        elsif SiteSetting.chat_archive_destination_topic_status == "closed"
+          chat_channel_archive.destination_topic.update!(closed: true)
+        end
+      end
+    end
+
+    def delete_message_batch(message_ids)
+      Chat::Message.transaction do
+        Chat::Message.where(id: message_ids).update_all(
+          deleted_at: DateTime.now,
+          deleted_by_id: chat_channel_archive.archived_by.id,
+        )
+
+        chat_channel_archive.update!(
+          archived_messages: chat_channel_archive.archived_messages + message_ids.length,
+        )
+      end
+
+      Rails.logger.info(
+        "Archived #{chat_channel_archive.archived_messages} messages for #{chat_channel_title} archive.",
+      )
+    end
+
+    def complete_archive
+      Rails.logger.info("Creating posts completed for #{chat_channel_title} archive.")
+      chat_channel.archived!(chat_channel_archive.archived_by)
+      notify_archiver(:success)
+    end
+
+    def notify_archiver(result, error_message: nil)
+      base_translation_params = {
+        channel_hashtag_or_name: channel_hashtag_or_name,
+        topic_title: chat_channel_archive.destination_topic&.title,
+        topic_url: chat_channel_archive.destination_topic&.url,
+        topic_validation_errors: result == :failed_no_topic ? error_message : nil,
+      }
+
+      if result == :failed || result == :failed_no_topic
+        Discourse.warn_exception(
+          error_message,
+          message: "Error when archiving chat channel #{chat_channel_title}.",
+          env: {
+            chat_channel_id: chat_channel.id,
+            chat_channel_name: chat_channel_title,
+          },
+        )
+        error_translation_params =
+          base_translation_params.merge(
+            channel_url: chat_channel.url,
+            messages_archived: chat_channel_archive.archived_messages,
+          )
+        chat_channel_archive.update(archive_error: error_message)
+        message_translation_key =
+          case result
+          when :failed
+            :chat_channel_archive_failed
+          when :failed_no_topic
+            :chat_channel_archive_failed_no_topic
+          end
+        SystemMessage.create_from_system_user(
+          chat_channel_archive.archived_by,
+          message_translation_key,
+          error_translation_params,
+        )
+      else
+        SystemMessage.create_from_system_user(
+          chat_channel_archive.archived_by,
+          :chat_channel_archive_complete,
+          base_translation_params,
+        )
+      end
+
+      Chat::Publisher.publish_archive_status(
+        chat_channel,
+        archive_status: result != :success ? :failed : :success,
+        archived_messages: chat_channel_archive.archived_messages,
+        archive_topic_id: chat_channel_archive.destination_topic_id,
+        total_messages: chat_channel_archive.total_messages,
+      )
+    end
+
+    def kick_all_users
+      Chat::ChannelMembershipManager.new(chat_channel).unfollow_all_users
+    end
+
+    def channel_hashtag_or_name
+      if chat_channel.slug.present? && SiteSetting.enable_experimental_hashtag_autocomplete
+        return "##{chat_channel.slug}::channel"
+      end
+      chat_channel_title
+    end
+  end
+end
diff --git a/plugins/chat/lib/chat/channel_fetcher.rb b/plugins/chat/lib/chat/channel_fetcher.rb
new file mode 100644
index 00000000000..61112b5e3e3
--- /dev/null
+++ b/plugins/chat/lib/chat/channel_fetcher.rb
@@ -0,0 +1,262 @@
+# frozen_string_literal: true
+
+module Chat
+  class ChannelFetcher
+    MAX_PUBLIC_CHANNEL_RESULTS = 50
+
+    def self.structured(guardian, include_threads: false)
+      memberships = Chat::ChannelMembershipManager.all_for_user(guardian.user)
+      public_channels = secured_public_channels(guardian, status: :open, following: true)
+      direct_message_channels = secured_direct_message_channels(guardian.user.id, guardian)
+      {
+        public_channels: public_channels,
+        direct_message_channels: direct_message_channels,
+        memberships: memberships,
+        tracking:
+          tracking_state(
+            public_channels.map(&:id) + direct_message_channels.map(&:id),
+            guardian,
+            include_threads: include_threads,
+          ),
+      }
+    end
+
+    def self.all_secured_channel_ids(guardian, following: true)
+      allowed_channel_ids_sql = generate_allowed_channel_ids_sql(guardian)
+
+      return DB.query_single(allowed_channel_ids_sql) if !following
+
+      DB.query_single(<<~SQL, user_id: guardian.user.id)
+      SELECT chat_channel_id
+      FROM user_chat_channel_memberships
+      WHERE user_chat_channel_memberships.user_id = :user_id
+      AND user_chat_channel_memberships.chat_channel_id IN (
+        #{allowed_channel_ids_sql}
+      )
+    SQL
+    end
+
+    def self.generate_allowed_channel_ids_sql(guardian, exclude_dm_channels: false)
+      category_channel_sql =
+        Category
+          .post_create_allowed(guardian)
+          .joins(
+            "INNER JOIN chat_channels ON chat_channels.chatable_id = categories.id AND chat_channels.chatable_type = 'Category'",
+          )
+          .select("chat_channels.id")
+          .to_sql
+      dm_channel_sql = ""
+      if !exclude_dm_channels
+        dm_channel_sql = <<~SQL
+      UNION
+
+      -- secured direct message chat channels
+      #{
+          Chat::Channel
+            .select(:id)
+            .joins(
+              "INNER JOIN direct_message_channels ON direct_message_channels.id = chat_channels.chatable_id
+               AND chat_channels.chatable_type = 'DirectMessage'
+               INNER JOIN direct_message_users ON direct_message_users.direct_message_channel_id = direct_message_channels.id",
+            )
+            .where("direct_message_users.user_id = :user_id", user_id: guardian.user.id)
+            .to_sql
+        }
+      SQL
+      end
+
+      <<~SQL
+      -- secured category chat channels
+      #{category_channel_sql}
+      #{dm_channel_sql}
+    SQL
+    end
+
+    def self.secured_public_channel_slug_lookup(guardian, slugs)
+      allowed_channel_ids = generate_allowed_channel_ids_sql(guardian, exclude_dm_channels: true)
+
+      Chat::Channel
+        .with_categories
+        .where(chatable_type: Chat::Channel.public_channel_chatable_types)
+        .where("chat_channels.id IN (#{allowed_channel_ids})")
+        .where("chat_channels.slug IN (:slugs)", slugs: slugs)
+        .limit(1)
+    end
+
+    def self.secured_public_channel_search(guardian, options = {})
+      return ::Chat::Channel.none if !SiteSetting.enable_public_channels
+
+      allowed_channel_ids = generate_allowed_channel_ids_sql(guardian, exclude_dm_channels: true)
+
+      channels = Chat::Channel.includes(:last_message, chatable: [:topic_only_relative_url])
+      channels = channels.includes(:chat_channel_archive) if options[:include_archives]
+
+      channels =
+        channels
+          .with_categories
+          .where(chatable_type: Chat::Channel.public_channel_chatable_types)
+          .where("chat_channels.id IN (#{allowed_channel_ids})")
+
+      channels = channels.where(status: options[:status]) if options[:status].present?
+
+      if options[:filter].present?
+        category_filter =
+          (options[:filter_on_category_name] ? "OR categories.name ILIKE :filter" : "")
+
+        sql =
+          "chat_channels.name ILIKE :filter OR chat_channels.slug ILIKE :filter #{category_filter}"
+        if options[:match_filter_on_starts_with]
+          filter_sql = "#{options[:filter].downcase}%"
+        else
+          filter_sql = "%#{options[:filter].downcase}%"
+        end
+
+        channels =
+          channels.where(sql, filter: filter_sql).order(
+            "chat_channels.name ASC, categories.name ASC",
+          )
+      end
+
+      if options.key?(:slugs)
+        channels = channels.where("chat_channels.slug IN (:slugs)", slugs: options[:slugs])
+      end
+
+      if options.key?(:following)
+        if options[:following]
+          channels =
+            channels.joins(:user_chat_channel_memberships).where(
+              user_chat_channel_memberships: {
+                user_id: guardian.user.id,
+                following: true,
+              },
+            )
+        else
+          channels =
+            channels.where(
+              "chat_channels.id NOT IN (SELECT chat_channel_id FROM user_chat_channel_memberships uccm WHERE uccm.chat_channel_id = chat_channels.id AND following IS TRUE AND user_id = ?)",
+              guardian.user.id,
+            )
+        end
+      end
+
+      options[:limit] = (options[:limit] || MAX_PUBLIC_CHANNEL_RESULTS).to_i.clamp(
+        1,
+        MAX_PUBLIC_CHANNEL_RESULTS,
+      )
+      options[:offset] = [options[:offset].to_i, 0].max
+
+      channels.limit(options[:limit]).offset(options[:offset])
+    end
+
+    def self.secured_public_channels(guardian, options = { following: true })
+      channels =
+        secured_public_channel_search(
+          guardian,
+          options.merge(include_archives: true, filter_on_category_name: true),
+        )
+
+      channels = channels.to_a
+      preload_custom_fields_for(channels)
+      channels
+    end
+
+    def self.preload_custom_fields_for(channels)
+      preload_fields = Category.instance_variable_get(:@custom_field_types).keys
+      Category.preload_custom_fields(
+        channels
+          .select { |c| c.chatable_type == "Category" || c.chatable_type == "category" }
+          .map(&:chatable),
+        preload_fields,
+      )
+    end
+
+    def self.secured_direct_message_channels(user_id, guardian)
+      secured_direct_message_channels_search(user_id, guardian, following: true)
+    end
+
+    def self.secured_direct_message_channels_search(user_id, guardian, options = {})
+      query =
+        Chat::Channel.strict_loading.includes(
+          last_message: [:uploads],
+          chatable: [{ direct_message_users: [user: :user_option] }, :users],
+        )
+      query = query.includes(chatable: [{ users: :user_status }]) if SiteSetting.enable_user_status
+      query = query.joins(:user_chat_channel_memberships)
+      query =
+        query.joins(
+          "LEFT JOIN chat_messages last_message ON last_message.id = chat_channels.last_message_id",
+        )
+
+      scoped_channels =
+        Chat::Channel
+          .joins(
+            "INNER JOIN direct_message_channels ON direct_message_channels.id = chat_channels.chatable_id AND chat_channels.chatable_type = 'DirectMessage'",
+          )
+          .joins(
+            "INNER JOIN direct_message_users ON direct_message_users.direct_message_channel_id = direct_message_channels.id",
+          )
+          .where("direct_message_users.user_id = :user_id", user_id: user_id)
+
+      if options[:user_ids]
+        scoped_channels =
+          scoped_channels.where(
+            "EXISTS (
+              SELECT 1
+              FROM direct_message_channels AS dmc
+              INNER JOIN direct_message_users AS dmu ON dmu.direct_message_channel_id = dmc.id
+              WHERE dmc.id = chat_channels.chatable_id AND dmu.user_id IN (:user_ids)
+            )",
+            user_ids: options[:user_ids],
+          )
+      end
+
+      if options.key?(:following)
+        query =
+          query.where(
+            user_chat_channel_memberships: {
+              user_id: user_id,
+              following: options[:following],
+            },
+          )
+      else
+        query = query.where(user_chat_channel_memberships: { user_id: user_id })
+      end
+
+      query =
+        query
+          .where(chatable_type: Chat::Channel.direct_channel_chatable_types)
+          .where(chat_channels: { id: scoped_channels })
+          .order("last_message.created_at DESC NULLS LAST")
+
+      channels = query.to_a
+      preload_fields =
+        User.allowed_user_custom_fields(guardian) +
+          UserField.all.pluck(:id).map { |fid| "#{User::USER_FIELD_PREFIX}#{fid}" }
+      User.preload_custom_fields(channels.map { |c| c.chatable.users }.flatten, preload_fields)
+      channels
+    end
+
+    def self.tracking_state(channel_ids, guardian, include_threads: false)
+      Chat::TrackingState.call(
+        channel_ids: channel_ids,
+        guardian: guardian,
+        include_missing_memberships: true,
+        include_threads: include_threads,
+      ).report
+    end
+
+    def self.find_with_access_check(channel_id_or_slug, guardian)
+      base_channel_relation = Chat::Channel.includes(:chatable)
+
+      if guardian.user.staff?
+        base_channel_relation = base_channel_relation.includes(:chat_channel_archive)
+      end
+
+      chat_channel = base_channel_relation.find_by_id_or_slug(channel_id_or_slug)
+
+      raise Discourse::NotFound if chat_channel.blank?
+      raise Discourse::InvalidAccess if !guardian.can_join_chat_channel?(chat_channel)
+      chat_channel
+    end
+  end
+end
diff --git a/plugins/chat/lib/chat/channel_hashtag_data_source.rb b/plugins/chat/lib/chat/channel_hashtag_data_source.rb
new file mode 100644
index 00000000000..c5ccf8eff49
--- /dev/null
+++ b/plugins/chat/lib/chat/channel_hashtag_data_source.rb
@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+module Chat
+  class ChannelHashtagDataSource
+    def self.enabled?
+      SiteSetting.enable_experimental_hashtag_autocomplete && SiteSetting.enable_public_channels
+    end
+
+    def self.icon
+      "comment"
+    end
+
+    def self.type
+      "channel"
+    end
+
+    def self.channel_to_hashtag_item(guardian, channel)
+      HashtagAutocompleteService::HashtagItem.new.tap do |item|
+        item.text = channel.title
+        item.description = channel.description
+        item.slug = channel.slug
+        item.icon = icon
+        item.relative_url = channel.relative_url
+        item.type = "channel"
+        item.id = channel.id
+      end
+    end
+
+    def self.lookup(guardian, slugs)
+      return [] if !guardian.can_chat?
+      Chat::ChannelFetcher
+        .secured_public_channel_slug_lookup(guardian, slugs)
+        .map { |channel| channel_to_hashtag_item(guardian, channel) }
+    end
+
+    def self.search(
+      guardian,
+      term,
+      limit,
+      condition = HashtagAutocompleteService.search_conditions[:contains]
+    )
+      return [] if !guardian.can_chat?
+      Chat::ChannelFetcher
+        .secured_public_channel_search(
+          guardian,
+          filter: term,
+          limit: limit,
+          exclude_dm_channels: true,
+          match_filter_on_starts_with:
+            condition == HashtagAutocompleteService.search_conditions[:starts_with],
+        )
+        .map { |channel| channel_to_hashtag_item(guardian, channel) }
+    end
+
+    def self.search_sort(search_results, _)
+      search_results.sort_by { |result| result.text.downcase }
+    end
+
+    def self.search_without_term(guardian, limit)
+      return [] if !guardian.can_chat?
+      allowed_channel_ids_sql =
+        Chat::ChannelFetcher.generate_allowed_channel_ids_sql(guardian, exclude_dm_channels: true)
+      Chat::Channel
+        .joins(
+          "INNER JOIN user_chat_channel_memberships
+            ON user_chat_channel_memberships.chat_channel_id = chat_channels.id
+            AND user_chat_channel_memberships.user_id = #{guardian.user.id}
+            AND user_chat_channel_memberships.following = true",
+        )
+        .where("chat_channels.id IN (#{allowed_channel_ids_sql})")
+        .order(messages_count: :desc)
+        .limit(limit)
+        .map { |channel| channel_to_hashtag_item(guardian, channel) }
+    end
+  end
+end
diff --git a/plugins/chat/lib/chat/channel_membership_manager.rb b/plugins/chat/lib/chat/channel_membership_manager.rb
new file mode 100644
index 00000000000..838456c1018
--- /dev/null
+++ b/plugins/chat/lib/chat/channel_membership_manager.rb
@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+module Chat
+  class ChannelMembershipManager
+    def self.all_for_user(user)
+      Chat::UserChatChannelMembership.where(user: user)
+    end
+
+    attr_reader :channel
+
+    def initialize(channel)
+      @channel = channel
+    end
+
+    def find_for_user(user, following: nil)
+      params = { user_id: user.id, chat_channel_id: channel.id }
+      params[:following] = following if following.present?
+
+      Chat::UserChatChannelMembership.includes(:user, :chat_channel).find_by(params)
+    end
+
+    def follow(user)
+      membership =
+        find_for_user(user) ||
+          Chat::UserChatChannelMembership.new(user: user, chat_channel: channel, following: true)
+
+      ActiveRecord::Base.transaction do
+        if membership.new_record?
+          membership.save!
+          recalculate_user_count
+        elsif !membership.following
+          membership.update!(following: true)
+          recalculate_user_count
+        end
+      end
+
+      membership
+    end
+
+    def unfollow(user)
+      membership = find_for_user(user)
+
+      return if membership.blank?
+
+      ActiveRecord::Base.transaction do
+        if membership.following
+          membership.update!(following: false)
+          recalculate_user_count
+        end
+      end
+
+      membership
+    end
+
+    def recalculate_user_count
+      return if Chat::Channel.exists?(id: channel.id, user_count_stale: true)
+      channel.update!(user_count_stale: true)
+      Jobs.enqueue_in(3.seconds, Jobs::Chat::UpdateChannelUserCount, chat_channel_id: channel.id)
+    end
+
+    def unfollow_all_users
+      Chat::UserChatChannelMembership.where(chat_channel: channel).update_all(
+        following: false,
+        last_read_message_id: channel.chat_messages.last&.id,
+      )
+    end
+
+    def enforce_automatic_channel_memberships
+      Jobs.enqueue(Jobs::Chat::AutoJoinChannelMemberships, chat_channel_id: channel.id)
+    end
+
+    def enforce_automatic_user_membership(user)
+      Jobs.enqueue(
+        Jobs::Chat::AutoJoinChannelBatch,
+        chat_channel_id: channel.id,
+        starts_at: user.id,
+        ends_at: user.id,
+      )
+    end
+  end
+end
diff --git a/plugins/chat/lib/chat/duplicate_message_validator.rb b/plugins/chat/lib/chat/duplicate_message_validator.rb
new file mode 100644
index 00000000000..fa9175b8ed7
--- /dev/null
+++ b/plugins/chat/lib/chat/duplicate_message_validator.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Chat
+  class DuplicateMessageValidator
+    attr_reader :chat_message
+
+    def initialize(chat_message)
+      @chat_message = chat_message
+    end
+
+    def validate
+      return if SiteSetting.chat_duplicate_message_sensitivity.zero?
+      matrix =
+        DuplicateMessageValidator.sensitivity_matrix(SiteSetting.chat_duplicate_message_sensitivity)
+
+      # Check if the length of the message is too short to check for a duplicate message
+      return if chat_message.message.length < matrix[:min_message_length]
+
+      # Check if there are enough users in the channel to check for a duplicate message
+      return if (chat_message.chat_channel.user_count || 0) < matrix[:min_user_count]
+
+      # Check if the same duplicate message has been posted in the last N seconds by any user
+      if !chat_message
+           .chat_channel
+           .chat_messages
+           .where("created_at > ?", matrix[:min_past_seconds].seconds.ago)
+           .where(message: chat_message.message)
+           .exists?
+        return
+      end
+
+      chat_message.errors.add(:base, I18n.t("chat.errors.duplicate_message"))
+    end
+
+    def self.sensitivity_matrix(sensitivity)
+      {
+        # 0.1 sensitivity = 100 users and 1.0 sensitivity = 5 users.
+        min_user_count: (-1.0 * 105.5 * sensitivity + 110.55).to_i,
+        # 0.1 sensitivity = 30 chars and 1.0 sensitivity = 10 chars.
+        min_message_length: (-1.0 * 22.2 * sensitivity + 32.22).to_i,
+        # 0.1 sensitivity = 10 seconds and 1.0 sensitivity = 60 seconds.
+        min_past_seconds: (55.55 * sensitivity + 4.5).to_i,
+      }
+    end
+  end
+end
diff --git a/plugins/chat/lib/chat/engine.rb b/plugins/chat/lib/chat/engine.rb
new file mode 100644
index 00000000000..38cca8ab7ba
--- /dev/null
+++ b/plugins/chat/lib/chat/engine.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module ::Chat
+  HAS_CHAT_ENABLED = "has_chat_enabled"
+
+  class Engine < ::Rails::Engine
+    engine_name PLUGIN_NAME
+    isolate_namespace Chat
+    config.autoload_paths << File.join(config.root, "lib")
+  end
+
+  def self.allowed_group_ids
+    SiteSetting.chat_allowed_groups_map
+  end
+
+  def self.onebox_template
+    @onebox_template ||=
+      begin
+        path = "#{Rails.root}/plugins/chat/lib/onebox/templates/discourse_chat.mustache"
+        File.read(path)
+      end
+  end
+end
diff --git a/plugins/chat/lib/chat/guardian_extensions.rb b/plugins/chat/lib/chat/guardian_extensions.rb
new file mode 100644
index 00000000000..c26506ebf1e
--- /dev/null
+++ b/plugins/chat/lib/chat/guardian_extensions.rb
@@ -0,0 +1,223 @@
+# frozen_string_literal: true
+
+module Chat
+  module GuardianExtensions
+    def can_moderate_chat?(chatable)
+      case chatable.class.name
+      when "Category"
+        is_staff? || is_category_group_moderator?(chatable)
+      else
+        is_staff?
+      end
+    end
+
+    def can_chat?
+      return false if anonymous?
+      @user.staff? || @user.in_any_groups?(Chat.allowed_group_ids)
+    end
+
+    def can_create_chat_message?
+      !SpamRule::AutoSilence.prevent_posting?(@user)
+    end
+
+    def can_create_direct_message?
+      is_staff? || @user.in_any_groups?(SiteSetting.direct_message_enabled_groups_map)
+    end
+
+    def hidden_tag_names
+      @hidden_tag_names ||= DiscourseTagging.hidden_tag_names(self)
+    end
+
+    def can_create_chat_channel?
+      is_staff?
+    end
+
+    def can_delete_chat_channel?
+      is_staff?
+    end
+
+    # Channel status intentionally has no bearing on whether the channel
+    # name and description can be edited.
+    def can_edit_chat_channel?
+      is_staff?
+    end
+
+    # The only part of the thread that can be changed is the title
+    # so this isn't too dangerous, if we end up wanting to change
+    # more things in future we may want to re-evaluate to be staff-only here.
+    def can_edit_thread?(thread)
+      is_staff? || thread.original_message_user_id == @user.id
+    end
+
+    def can_move_chat_messages?(channel)
+      can_moderate_chat?(channel.chatable)
+    end
+
+    def can_create_channel_message?(chat_channel)
+      valid_statuses = is_staff? ? %w[open closed] : ["open"]
+      valid_statuses.include?(chat_channel.status)
+    end
+
+    # This is intentionally identical to can_create_channel_message, we
+    # may want to have different conditions here in future.
+    def can_modify_channel_message?(chat_channel)
+      return chat_channel.open? || chat_channel.closed? if is_staff?
+      chat_channel.open?
+    end
+
+    def can_change_channel_status?(chat_channel, target_status)
+      return false if chat_channel.status.to_sym == target_status.to_sym
+      return false if !is_staff?
+
+      # FIXME: This logic shouldn't be handled in guardian
+      case target_status
+      when :closed
+        chat_channel.open?
+      when :open
+        chat_channel.closed?
+      when :archived
+        chat_channel.read_only?
+      when :read_only
+        chat_channel.closed? || chat_channel.open?
+      else
+        false
+      end
+    end
+
+    def can_rebake_chat_message?(message)
+      return false if !can_modify_channel_message?(message.chat_channel)
+      is_staff? || @user.has_trust_level?(TrustLevel[4])
+    end
+
+    def can_preview_chat_channel?(chat_channel)
+      return false unless chat_channel.chatable
+
+      if chat_channel.direct_message_channel?
+        chat_channel.chatable.user_can_access?(@user)
+      elsif chat_channel.category_channel?
+        can_see_category?(chat_channel.chatable)
+      else
+        true
+      end
+    end
+
+    def can_join_chat_channel?(chat_channel, post_allowed_category_ids: nil)
+      return false if anonymous?
+      return false unless can_chat?
+      can_preview_chat_channel?(chat_channel) &&
+        can_post_in_chatable?(
+          chat_channel.chatable,
+          post_allowed_category_ids: post_allowed_category_ids,
+        )
+    end
+
+    def can_post_in_chatable?(chatable, post_allowed_category_ids: nil)
+      case chatable
+      when Category
+        # technically when fetching channels in channel_fetcher we alread scope it to
+        # categories with post_create_allowed(guardian) so this is redundant but still
+        # valuable to have here when we're not fetching channels through channel_fetcher
+        if post_allowed_category_ids
+          return false unless chatable
+          return false if is_anonymous?
+          return true if is_admin?
+          post_allowed_category_ids.include?(chatable.id)
+        else
+          can_post_in_category?(chatable)
+        end
+      when Chat::DirectMessage
+        true
+      end
+    end
+
+    def can_flag_chat_messages?
+      return false if @user.silenced?
+      return true if @user.staff?
+
+      @user.in_any_groups?(SiteSetting.chat_message_flag_allowed_groups_map)
+    end
+
+    def can_flag_in_chat_channel?(chat_channel, post_allowed_category_ids: nil)
+      return false if !can_modify_channel_message?(chat_channel)
+
+      can_join_chat_channel?(chat_channel, post_allowed_category_ids: post_allowed_category_ids)
+    end
+
+    def can_flag_chat_message?(chat_message)
+      if !authenticated? || !chat_message || chat_message.trashed? || !chat_message.user
+        return false
+      end
+      return false if chat_message.user.staff? && !SiteSetting.allow_flagging_staff
+      return false if chat_message.user_id == @user.id
+
+      can_flag_chat_messages? && can_flag_in_chat_channel?(chat_message.chat_channel)
+    end
+
+    def can_flag_message_as?(chat_message, flag_type_id, opts)
+      return false if !is_staff? && (opts[:take_action] || opts[:queue_for_review])
+
+      if flag_type_id == ReviewableScore.types[:notify_user]
+        is_warning = ActiveRecord::Type::Boolean.new.deserialize(opts[:is_warning])
+
+        return false if is_warning && !is_staff?
+      end
+
+      true
+    end
+
+    def can_delete_chat?(message, chatable)
+      return false if @user.silenced?
+      return false if !can_modify_channel_message?(message.chat_channel)
+
+      if message.user_id == current_user.id
+        can_delete_own_chats?(chatable)
+      else
+        can_delete_other_chats?(chatable)
+      end
+    end
+
+    def can_delete_own_chats?(chatable)
+      return false if (SiteSetting.max_post_deletions_per_day < 1)
+      return true if can_moderate_chat?(chatable)
+
+      true
+    end
+
+    def can_delete_other_chats?(chatable)
+      return true if can_moderate_chat?(chatable)
+
+      false
+    end
+
+    def can_restore_chat?(message, chatable)
+      return false if !can_modify_channel_message?(message.chat_channel)
+
+      if message.user_id == current_user.id
+        case chatable
+        when Category
+          return message.deleted_by_id == current_user.id || can_see_category?(chatable)
+        when Chat::DirectMessage
+          return message.deleted_by_id == current_user.id || is_staff?
+        end
+      end
+
+      can_delete_other_chats?(chatable)
+    end
+
+    def can_restore_other_chats?(chatable)
+      can_moderate_chat?(chatable)
+    end
+
+    def can_edit_chat?(message)
+      message.user_id == @user.id && !@user.silenced?
+    end
+
+    def can_react?
+      can_create_chat_message?
+    end
+
+    def can_delete_category?(category)
+      super && category.deletable_for_chat?
+    end
+  end
+end
diff --git a/plugins/chat/lib/chat/mailer.rb b/plugins/chat/lib/chat/mailer.rb
new file mode 100644
index 00000000000..f6a2579af1e
--- /dev/null
+++ b/plugins/chat/lib/chat/mailer.rb
@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+module Chat
+  class Mailer
+    def self.send_unread_mentions_summary
+      return unless SiteSetting.chat_enabled
+
+      users_with_unprocessed_unread_mentions.find_each do |user|
+        # user#memberships_with_unread_messages is a nested array that looks like [[membership_id, unread_message_id]]
+        # Find the max unread id per membership.
+        membership_and_max_unread_mention_ids =
+          user
+            .memberships_with_unread_messages
+            .group_by { |memberships| memberships[0] }
+            .transform_values do |membership_and_msg_ids|
+              membership_and_msg_ids.max_by { |membership, msg| msg }
+            end
+            .values
+
+        Jobs.enqueue(
+          :user_email,
+          type: "chat_summary",
+          user_id: user.id,
+          force_respect_seen_recently: true,
+          memberships_to_update_data: membership_and_max_unread_mention_ids,
+        )
+      end
+    end
+
+    private
+
+    def self.users_with_unprocessed_unread_mentions
+      when_away_frequency = UserOption.chat_email_frequencies[:when_away]
+      allowed_group_ids = Chat.allowed_group_ids
+
+      users =
+        User
+          .joins(:user_option)
+          .where(user_options: { chat_enabled: true, chat_email_frequency: when_away_frequency })
+          .where("users.last_seen_at < ?", 15.minutes.ago)
+
+      if !allowed_group_ids.include?(Group::AUTO_GROUPS[:everyone])
+        users = users.joins(:groups).where(groups: { id: allowed_group_ids })
+      end
+
+      users
+        .select(
+          "users.id",
+          "ARRAY_AGG(ARRAY[uccm.id, c_msg.id]) AS memberships_with_unread_messages",
+        )
+        .joins("INNER JOIN user_chat_channel_memberships uccm ON uccm.user_id = users.id")
+        .joins("INNER JOIN chat_channels cc ON cc.id = uccm.chat_channel_id")
+        .joins("INNER JOIN chat_messages c_msg ON c_msg.chat_channel_id = uccm.chat_channel_id")
+        .joins("LEFT OUTER JOIN chat_mentions c_mentions ON c_mentions.chat_message_id = c_msg.id")
+        .where("c_msg.deleted_at IS NULL AND c_msg.user_id <> users.id")
+        .where("c_msg.created_at > ?", 1.week.ago)
+        .where(<<~SQL)
+        (uccm.last_read_message_id IS NULL OR c_msg.id > uccm.last_read_message_id) AND
+        (uccm.last_unread_mention_when_emailed_id IS NULL OR c_msg.id > uccm.last_unread_mention_when_emailed_id) AND
+        (
+          (uccm.user_id = c_mentions.user_id AND uccm.following IS true AND cc.chatable_type = 'Category') OR
+          (cc.chatable_type = 'DirectMessage')
+        )
+      SQL
+        .group("users.id, uccm.user_id")
+    end
+  end
+end
diff --git a/plugins/chat/lib/chat/message_bookmarkable.rb b/plugins/chat/lib/chat/message_bookmarkable.rb
new file mode 100644
index 00000000000..a759aef1209
--- /dev/null
+++ b/plugins/chat/lib/chat/message_bookmarkable.rb
@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+module Chat
+  class MessageBookmarkable < BaseBookmarkable
+    def self.model
+      Chat::Message
+    end
+
+    def self.serializer
+      Chat::UserMessageBookmarkSerializer
+    end
+
+    def self.preload_associations
+      [:chat_channel]
+    end
+
+    def self.list_query(user, guardian)
+      accessible_channel_ids = Chat::ChannelFetcher.all_secured_channel_ids(guardian)
+      return if accessible_channel_ids.empty?
+
+      joins =
+        ActiveRecord::Base.public_send(
+          :sanitize_sql_array,
+          [
+            "INNER JOIN chat_messages ON chat_messages.id = bookmarks.bookmarkable_id AND chat_messages.deleted_at IS NULL AND bookmarks.bookmarkable_type = ?",
+            Chat::Message.polymorphic_name,
+          ],
+        )
+
+      user
+        .bookmarks_of_type(Chat::Message.polymorphic_name)
+        .joins(joins)
+        .where("chat_messages.chat_channel_id IN (?)", accessible_channel_ids)
+    end
+
+    def self.search_query(bookmarks, query, ts_query, &bookmarkable_search)
+      bookmarkable_search.call(bookmarks, "chat_messages.message ILIKE :q")
+    end
+
+    def self.validate_before_create(guardian, bookmarkable)
+      if bookmarkable.blank? || !guardian.can_join_chat_channel?(bookmarkable.chat_channel)
+        raise Discourse::InvalidAccess
+      end
+    end
+
+    def self.reminder_handler(bookmark)
+      send_reminder_notification(
+        bookmark,
+        data: {
+          title:
+            I18n.t(
+              "chat.bookmarkable.notification_title",
+              channel_name: bookmark.bookmarkable.chat_channel.title(bookmark.user),
+            ),
+          bookmarkable_url: bookmark.bookmarkable.url,
+        },
+      )
+    end
+
+    def self.reminder_conditions(bookmark)
+      bookmark.bookmarkable.present? && bookmark.bookmarkable.chat_channel.present?
+    end
+
+    def self.can_see?(guardian, bookmark)
+      guardian.can_join_chat_channel?(bookmark.bookmarkable.chat_channel)
+    end
+
+    def self.cleanup_deleted
+      DB.query(<<~SQL, grace_time: 3.days.ago, bookmarkable_type: Chat::Message.polymorphic_name)
+      DELETE FROM bookmarks b
+      USING chat_messages cm
+      WHERE b.bookmarkable_id = cm.id
+      AND b.bookmarkable_type = :bookmarkable_type
+      AND (cm.deleted_at < :grace_time)
+    SQL
+    end
+  end
+end
diff --git a/plugins/chat/lib/chat/message_creator.rb b/plugins/chat/lib/chat/message_creator.rb
new file mode 100644
index 00000000000..2c917cbfadb
--- /dev/null
+++ b/plugins/chat/lib/chat/message_creator.rb
@@ -0,0 +1,249 @@
+# frozen_string_literal: true
+module Chat
+  class MessageCreator
+    attr_reader :error, :chat_message
+
+    def self.create(opts)
+      instance = new(**opts)
+      instance.create
+      instance
+    end
+
+    def initialize(
+      chat_channel:,
+      in_reply_to_id: nil,
+      thread_id: nil,
+      staged_thread_id: nil,
+      user:,
+      content:,
+      staged_id: nil,
+      incoming_chat_webhook: nil,
+      upload_ids: nil,
+      created_at: nil
+    )
+      @chat_channel = chat_channel
+      @user = user
+      @guardian = Guardian.new(user)
+
+      # NOTE: We confirm this exists and the user can access it in the ChatController,
+      # but in future the checks should be here
+      @in_reply_to_id = in_reply_to_id
+      @content = content
+      @staged_id = staged_id
+      @incoming_chat_webhook = incoming_chat_webhook
+      @upload_ids = upload_ids || []
+      @thread_id = thread_id
+      @staged_thread_id = staged_thread_id
+      @error = nil
+
+      @chat_message =
+        Chat::Message.new(
+          chat_channel: @chat_channel,
+          user_id: @user.id,
+          last_editor_id: @user.id,
+          in_reply_to_id: @in_reply_to_id,
+          message: @content,
+          created_at: created_at,
+        )
+    end
+
+    def create
+      begin
+        validate_channel_status!
+        @chat_message.uploads = get_uploads
+        validate_message!
+        validate_reply_chain!
+        validate_existing_thread!
+
+        @chat_message.thread_id = @existing_thread&.id
+        @chat_message.cook
+        @chat_message.save!
+        @chat_message.create_mentions
+
+        create_chat_webhook_event
+        create_thread
+        Chat::Draft.where(user_id: @user.id, chat_channel_id: @chat_channel.id).destroy_all
+        post_process_resolved_thread
+        update_channel_last_message
+        Chat::Publisher.publish_new!(
+          @chat_channel,
+          @chat_message,
+          @staged_id,
+          staged_thread_id: @staged_thread_id,
+        )
+        Jobs.enqueue(Jobs::Chat::ProcessMessage, { chat_message_id: @chat_message.id })
+        Chat::Notifier.notify_new(chat_message: @chat_message, timestamp: @chat_message.created_at)
+        DiscourseEvent.trigger(:chat_message_created, @chat_message, @chat_channel, @user)
+      rescue => error
+        @error = error
+      end
+    end
+
+    def failed?
+      @error.present?
+    end
+
+    private
+
+    def validate_channel_status!
+      return if @guardian.can_create_channel_message?(@chat_channel)
+
+      if @chat_channel.direct_message_channel? && !@guardian.can_create_direct_message?
+        raise StandardError.new(I18n.t("chat.errors.user_cannot_send_direct_messages"))
+      else
+        raise StandardError.new(
+                I18n.t("chat.errors.channel_new_message_disallowed.#{@chat_channel.status}"),
+              )
+      end
+    end
+
+    def validate_reply_chain!
+      return if @in_reply_to_id.blank?
+
+      @original_message_id = DB.query_single(<<~SQL).last
+      WITH RECURSIVE original_message_finder( id, in_reply_to_id )
+      AS (
+        -- start with the message id we want to find the parents of
+        SELECT id, in_reply_to_id
+        FROM chat_messages
+        WHERE id = #{@in_reply_to_id}
+
+        UNION ALL
+
+        -- get the chain of direct parents of the message
+        -- following in_reply_to_id
+        SELECT cm.id, cm.in_reply_to_id
+        FROM original_message_finder rm
+        JOIN chat_messages cm ON rm.in_reply_to_id = cm.id
+      )
+      SELECT id FROM original_message_finder
+
+      -- this makes it so only the root parent ID is returned, we can
+      -- exclude this to return all parents in the chain
+      WHERE in_reply_to_id IS NULL;
+    SQL
+
+      if @original_message_id.blank?
+        raise StandardError.new(I18n.t("chat.errors.original_message_not_found"))
+      end
+
+      @original_message = Chat::Message.with_deleted.find_by(id: @original_message_id)
+      if @original_message&.trashed?
+        raise StandardError.new(I18n.t("chat.errors.original_message_not_found"))
+      end
+    end
+
+    def validate_existing_thread!
+      return if @staged_thread_id.present? && @thread_id.blank?
+
+      return if @thread_id.blank?
+      @existing_thread = Chat::Thread.find(@thread_id)
+
+      if @existing_thread.channel_id != @chat_channel.id
+        raise StandardError.new(I18n.t("chat.errors.thread_invalid_for_channel"))
+      end
+
+      reply_to_thread_mismatch =
+        @chat_message.in_reply_to&.thread_id &&
+          @chat_message.in_reply_to.thread_id != @existing_thread.id
+      original_message_has_no_thread = @original_message && @original_message.thread_id.blank?
+      original_message_thread_mismatch =
+        @original_message && @original_message.thread_id != @existing_thread.id
+      if reply_to_thread_mismatch || original_message_has_no_thread ||
+           original_message_thread_mismatch
+        raise StandardError.new(I18n.t("chat.errors.thread_does_not_match_parent"))
+      end
+    end
+
+    def validate_message!
+      return if @chat_message.valid?
+      raise StandardError.new(@chat_message.errors.map(&:full_message).join(", "))
+    end
+
+    def create_chat_webhook_event
+      return if @incoming_chat_webhook.blank?
+      Chat::WebhookEvent.create(
+        chat_message: @chat_message,
+        incoming_chat_webhook: @incoming_chat_webhook,
+      )
+    end
+
+    def get_uploads
+      return [] if @upload_ids.blank? || !SiteSetting.chat_allow_uploads
+
+      ::Upload.where(id: @upload_ids, user_id: @user.id)
+    end
+
+    def create_thread
+      return if @in_reply_to_id.blank?
+      return if @chat_message.in_thread? && !@staged_thread_id.present?
+
+      if @original_message.thread
+        thread = @original_message.thread
+      else
+        thread =
+          Chat::Thread.create!(
+            original_message: @chat_message.in_reply_to,
+            original_message_user: @chat_message.in_reply_to.user,
+            channel: @chat_message.chat_channel,
+          )
+        @chat_message.in_reply_to.thread_id = thread.id
+      end
+
+      @chat_message.thread_id = thread.id
+
+      # NOTE: We intentionally do not try to correct thread IDs within the chain
+      # if they are incorrect, and only set the thread ID of messages where the
+      # thread ID is NULL. In future we may want some sync/background job to correct
+      # any inconsistencies.
+      DB.exec(<<~SQL)
+        WITH RECURSIVE thread_updater AS (
+          SELECT cm.id, cm.in_reply_to_id
+          FROM chat_messages cm
+          WHERE cm.in_reply_to_id IS NULL AND cm.id = #{@original_message_id}
+
+          UNION ALL
+
+          SELECT cm.id, cm.in_reply_to_id
+          FROM chat_messages cm
+          JOIN thread_updater ON cm.in_reply_to_id = thread_updater.id
+        )
+        UPDATE chat_messages
+        SET thread_id = #{thread.id}
+        FROM thread_updater
+        WHERE thread_id IS NULL AND chat_messages.id = thread_updater.id
+      SQL
+
+      if @chat_message.chat_channel.threading_enabled
+        Chat::Publisher.publish_thread_created!(
+          @chat_message.chat_channel,
+          @chat_message.in_reply_to,
+          thread.id,
+          @staged_thread_id,
+        )
+      end
+    end
+
+    def resolved_thread
+      @existing_thread || @chat_message.thread
+    end
+
+    def post_process_resolved_thread
+      return if resolved_thread.blank?
+
+      resolved_thread.update!(last_message: @chat_message)
+      resolved_thread.increment_replies_count_cache
+      current_user_thread_membership = resolved_thread.add(@user)
+      current_user_thread_membership.update!(last_read_message_id: @chat_message.id)
+
+      if resolved_thread.original_message_user != @user
+        resolved_thread.add(resolved_thread.original_message_user)
+      end
+    end
+
+    def update_channel_last_message
+      return if @chat_message.thread_reply?
+      @chat_channel.update!(last_message: @chat_message)
+    end
+  end
+end
diff --git a/plugins/chat/lib/chat/message_mover.rb b/plugins/chat/lib/chat/message_mover.rb
new file mode 100644
index 00000000000..2c7c86d69a1
--- /dev/null
+++ b/plugins/chat/lib/chat/message_mover.rb
@@ -0,0 +1,250 @@
+# frozen_string_literal: true
+
+##
+# Used to move chat messages from a chat channel to some other
+# location.
+#
+# Channel -> Channel:
+# -------------------
+#
+# Messages are sometimes misplaced and must be moved to another channel. For
+# now we only support moving messages between public channels, handling the
+# permissions and membership around moving things in and out of DMs is a little
+# much for V1.
+#
+# The original messages will be deleted, and then similar to PostMover in core,
+# all of the references associated to a chat message (e.g. reactions, bookmarks,
+# notifications, revisions, mentions, uploads) will be updated to the new
+# message IDs via a moved_chat_messages temporary table.
+#
+# Reply chains are a little complex. No reply chains are preserved when moving
+# messages into a new channel. Remaining messages that referenced moved ones
+# have their in_reply_to_id cleared so the data makes sense.
+#
+# Threads are even more complex. No threads are preserved when moving messages
+# into a new channel, they end up as just a flat series of messages that are
+# not in a chain. If the original message of a thread and N other messages
+# in that thread, then any messages left behind just get placed into a new
+# thread. Message moving will be disabled in the thread UI, its too complicated
+# to have end users reason about for now, and we may want a standalone
+# "Move Thread" UI later on.
+module Chat
+  class MessageMover
+    class NoMessagesFound < StandardError
+    end
+    class InvalidChannel < StandardError
+    end
+
+    def initialize(acting_user:, source_channel:, message_ids:)
+      @source_channel = source_channel
+      @acting_user = acting_user
+      @source_message_ids = message_ids
+      @source_messages = find_messages(@source_message_ids, source_channel)
+      @ordered_source_message_ids = @source_messages.map(&:id)
+    end
+
+    def move_to_channel(destination_channel)
+      if !@source_channel.public_channel? || !destination_channel.public_channel?
+        raise InvalidChannel.new(I18n.t("chat.errors.message_move_invalid_channel"))
+      end
+
+      if @ordered_source_message_ids.empty?
+        raise NoMessagesFound.new(I18n.t("chat.errors.message_move_no_messages_found"))
+      end
+
+      moved_messages = nil
+
+      Chat::Message.transaction do
+        create_temp_table
+        moved_messages =
+          find_messages(
+            create_destination_messages_in_channel(destination_channel),
+            destination_channel,
+          )
+        bulk_insert_movement_metadata
+        update_references
+        delete_source_messages
+        update_reply_references
+        update_tracking_state
+        update_thread_references
+      end
+
+      add_moved_placeholder(destination_channel, moved_messages.first)
+      moved_messages
+    end
+
+    private
+
+    def find_messages(message_ids, channel)
+      Chat::Message
+        .includes(thread: %i[original_message original_message_user])
+        .where(id: message_ids, chat_channel_id: channel.id)
+        .order("created_at ASC, id ASC")
+    end
+
+    def create_temp_table
+      DB.exec("DROP TABLE IF EXISTS moved_chat_messages") if Rails.env.test?
+
+      DB.exec <<~SQL
+      CREATE TEMPORARY TABLE moved_chat_messages (
+        old_chat_message_id INTEGER,
+        new_chat_message_id INTEGER
+      ) ON COMMIT DROP;
+
+      CREATE INDEX moved_chat_messages_old_chat_message_id ON moved_chat_messages(old_chat_message_id);
+    SQL
+    end
+
+    def bulk_insert_movement_metadata
+      values_sql = @movement_metadata.map { |mm| "(#{mm[:old_id]}, #{mm[:new_id]})" }.join(",\n")
+      DB.exec(
+        "INSERT INTO moved_chat_messages(old_chat_message_id, new_chat_message_id) VALUES #{values_sql}",
+      )
+    end
+
+    ##
+    # We purposefully omit in_reply_to_id when creating the messages in the
+    # new channel, because it could be pointing to a message that has not
+    # been moved.
+    def create_destination_messages_in_channel(destination_channel)
+      query_args = {
+        message_ids: @ordered_source_message_ids,
+        destination_channel_id: destination_channel.id,
+      }
+
+      moved_message_ids = DB.query_single(<<~SQL, query_args)
+      INSERT INTO chat_messages(
+        chat_channel_id, user_id, last_editor_id, message, cooked, cooked_version, created_at, updated_at
+      )
+      SELECT :destination_channel_id,
+             user_id,
+             last_editor_id,
+             message,
+             cooked,
+             cooked_version,
+             CLOCK_TIMESTAMP(),
+             CLOCK_TIMESTAMP()
+      FROM chat_messages
+      WHERE id IN (:message_ids)
+      ORDER BY created_at ASC, id ASC
+      RETURNING id
+    SQL
+
+      @movement_metadata =
+        moved_message_ids.map.with_index do |chat_message_id, idx|
+          { old_id: @ordered_source_message_ids[idx], new_id: chat_message_id }
+        end
+      moved_message_ids
+    end
+
+    def update_references
+      DB.exec(<<~SQL)
+      UPDATE chat_message_reactions cmr
+      SET chat_message_id = mm.new_chat_message_id
+      FROM moved_chat_messages mm
+      WHERE cmr.chat_message_id = mm.old_chat_message_id
+    SQL
+
+      DB.exec(<<~SQL, target_type: Chat::Message.polymorphic_name)
+      UPDATE upload_references uref
+      SET target_id = mm.new_chat_message_id
+      FROM moved_chat_messages mm
+      WHERE uref.target_id = mm.old_chat_message_id AND uref.target_type = :target_type
+    SQL
+
+      DB.exec(<<~SQL)
+      UPDATE chat_mentions cment
+      SET chat_message_id = mm.new_chat_message_id
+      FROM moved_chat_messages mm
+      WHERE cment.chat_message_id = mm.old_chat_message_id
+    SQL
+
+      DB.exec(<<~SQL)
+      UPDATE chat_message_revisions crev
+      SET chat_message_id = mm.new_chat_message_id
+      FROM moved_chat_messages mm
+      WHERE crev.chat_message_id = mm.old_chat_message_id
+    SQL
+
+      DB.exec(<<~SQL)
+      UPDATE chat_webhook_events cweb
+      SET chat_message_id = mm.new_chat_message_id
+      FROM moved_chat_messages mm
+      WHERE cweb.chat_message_id = mm.old_chat_message_id
+    SQL
+    end
+
+    def delete_source_messages
+      # We do this so @source_messages is not nulled out, which is the
+      # case when using update_all here.
+      DB.exec(<<~SQL, source_message_ids: @source_message_ids, deleted_by_id: @acting_user.id)
+      UPDATE chat_messages
+      SET deleted_at = NOW(), deleted_by_id = :deleted_by_id
+      WHERE id IN (:source_message_ids)
+    SQL
+      Chat::Publisher.publish_bulk_delete!(@source_channel, @source_message_ids)
+    end
+
+    def add_moved_placeholder(destination_channel, first_moved_message)
+      Chat::MessageCreator.create(
+        chat_channel: @source_channel,
+        user: Discourse.system_user,
+        content:
+          I18n.t(
+            "chat.channel.messages_moved",
+            count: @source_message_ids.length,
+            acting_username: @acting_user.username,
+            channel_name: destination_channel.title(@acting_user),
+            first_moved_message_url: first_moved_message.url,
+          ),
+      )
+    end
+
+    def update_reply_references
+      DB.exec(<<~SQL, deleted_reply_to_ids: @source_message_ids)
+      UPDATE chat_messages
+      SET in_reply_to_id = NULL
+      WHERE in_reply_to_id IN (:deleted_reply_to_ids)
+    SQL
+    end
+
+    def update_tracking_state
+      ::Chat::Action::ResetUserLastReadChannelMessage.call(@source_message_ids, @source_channel.id)
+    end
+
+    def update_thread_references
+      threads_to_update = []
+      @source_messages
+        .select { |message| message.in_thread? }
+        .each do |message_with_thread|
+          # If one of the messages we are moving is the original message in a thread,
+          # then all the remaining messages for that thread must be moved to a new one,
+          # otherwise they will be pointing to a thread in a different channel.
+          if message_with_thread.thread.original_message_id == message_with_thread.id
+            threads_to_update << message_with_thread.thread
+          end
+        end
+
+      threads_to_update.each do |thread|
+        # NOTE: We may want to do something different with the old empty thread at some
+        # point when we add an explicit thread move UI, for now we can just delete it,
+        # since it will not contain any important data.
+        if thread.chat_messages.empty?
+          thread.destroy!
+          next
+        end
+
+        Chat::Thread.transaction do
+          original_message = thread.chat_messages.first
+          new_thread =
+            Chat::Thread.create!(
+              original_message: original_message,
+              original_message_user: original_message.user,
+              channel: @source_channel,
+            )
+          thread.chat_messages.update_all(thread_id: new_thread.id)
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/lib/chat/message_processor.rb b/plugins/chat/lib/chat/message_processor.rb
new file mode 100644
index 00000000000..ae663ecb624
--- /dev/null
+++ b/plugins/chat/lib/chat/message_processor.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Chat
+  class MessageProcessor
+    include ::CookedProcessorMixin
+
+    def initialize(chat_message)
+      @model = chat_message
+      @previous_cooked = (chat_message.cooked || "").dup
+      @with_secure_uploads = false
+      @size_cache = {}
+      @opts = {}
+
+      cooked = Chat::Message.cook(chat_message.message, user_id: chat_message.last_editor_id)
+      @doc = Loofah.html5_fragment(cooked)
+    end
+
+    def run!
+      post_process_oneboxes
+      DiscourseEvent.trigger(:chat_message_processed, @doc, @model)
+    end
+
+    def large_images
+      []
+    end
+
+    def broken_images
+      []
+    end
+
+    def downloaded_images
+      {}
+    end
+  end
+end
diff --git a/plugins/chat/lib/chat/message_rate_limiter.rb b/plugins/chat/lib/chat/message_rate_limiter.rb
new file mode 100644
index 00000000000..8d1f3b83f00
--- /dev/null
+++ b/plugins/chat/lib/chat/message_rate_limiter.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Chat
+  class MessageRateLimiter
+    def self.run!(user)
+      instance = self.new(user)
+      instance.run!
+    end
+
+    def initialize(user)
+      @user = user
+    end
+
+    def run!
+      return if @user.staff?
+
+      allowed_message_count =
+        (
+          if @user.trust_level == TrustLevel[0]
+            SiteSetting.chat_allowed_messages_for_trust_level_0
+          else
+            SiteSetting.chat_allowed_messages_for_other_trust_levels
+          end
+        )
+      return if allowed_message_count.zero?
+
+      @rate_limiter =
+        RateLimiter.new(@user, "create_chat_message", allowed_message_count, 30.seconds)
+      silence_user if @rate_limiter.remaining.zero?
+      @rate_limiter.performed!
+    end
+
+    def clear!
+      # Used only for testing. Need to clear the rate limiter between tests.
+      @rate_limiter.clear! if defined?(@rate_limiter)
+    end
+
+    private
+
+    def silence_user
+      silenced_for_minutes = SiteSetting.chat_auto_silence_duration
+      return if silenced_for_minutes.zero?
+
+      UserSilencer.silence(
+        @user,
+        Discourse.system_user,
+        silenced_till: silenced_for_minutes.minutes.from_now,
+        reason: I18n.t("chat.errors.rate_limit_exceeded"),
+      )
+    end
+  end
+end
diff --git a/plugins/chat/lib/chat/message_reactor.rb b/plugins/chat/lib/chat/message_reactor.rb
new file mode 100644
index 00000000000..74dcdc2c8c5
--- /dev/null
+++ b/plugins/chat/lib/chat/message_reactor.rb
@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+module Chat
+  class MessageReactor
+    ADD_REACTION = :add
+    REMOVE_REACTION = :remove
+    MAX_REACTIONS_LIMIT = 30
+
+    def initialize(user, chat_channel)
+      @user = user
+      @chat_channel = chat_channel
+      @guardian = Guardian.new(user)
+    end
+
+    def react!(message_id:, react_action:, emoji:)
+      @guardian.ensure_can_join_chat_channel!(@chat_channel)
+      @guardian.ensure_can_react!
+      validate_channel_status!
+      validate_reaction!(react_action, emoji)
+      message = ensure_chat_message!(message_id)
+      validate_max_reactions!(message, react_action, emoji)
+
+      reaction = nil
+      ActiveRecord::Base.transaction do
+        enforce_channel_membership!
+        reaction = create_reaction(message, react_action, emoji)
+      end
+
+      publish_reaction(message, react_action, emoji)
+
+      reaction
+    end
+
+    private
+
+    def ensure_chat_message!(message_id)
+      message = Chat::Message.find_by(id: message_id, chat_channel: @chat_channel)
+      raise Discourse::NotFound unless message
+      message
+    end
+
+    def validate_reaction!(react_action, emoji)
+      if ![ADD_REACTION, REMOVE_REACTION].include?(react_action) || !Emoji.exists?(emoji)
+        raise Discourse::InvalidParameters
+      end
+    end
+
+    def enforce_channel_membership!
+      Chat::ChannelMembershipManager.new(@chat_channel).follow(@user)
+    end
+
+    def validate_channel_status!
+      return if @guardian.can_create_channel_message?(@chat_channel)
+      raise Discourse::InvalidAccess.new(
+              nil,
+              nil,
+              custom_message:
+                "chat.errors.channel_modify_message_disallowed.#{@chat_channel.status}",
+            )
+    end
+
+    def validate_max_reactions!(message, react_action, emoji)
+      if react_action == ADD_REACTION &&
+           message.reactions.count("DISTINCT emoji") >= MAX_REACTIONS_LIMIT &&
+           !message.reactions.exists?(emoji: emoji)
+        raise Discourse::InvalidAccess.new(
+                nil,
+                nil,
+                custom_message: "chat.errors.max_reactions_limit_reached",
+              )
+      end
+    end
+
+    def create_reaction(message, react_action, emoji)
+      if react_action == ADD_REACTION
+        message.reactions.find_or_create_by!(user: @user, emoji: emoji)
+      else
+        message.reactions.where(user: @user, emoji: emoji).destroy_all
+      end
+    end
+
+    def publish_reaction(message, react_action, emoji)
+      Chat::Publisher.publish_reaction!(@chat_channel, message, react_action, @user, emoji)
+    end
+  end
+end
diff --git a/plugins/chat/lib/chat/message_updater.rb b/plugins/chat/lib/chat/message_updater.rb
new file mode 100644
index 00000000000..04eb7ba5e6b
--- /dev/null
+++ b/plugins/chat/lib/chat/message_updater.rb
@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+module Chat
+  class MessageUpdater
+    attr_reader :error
+
+    def self.update(opts)
+      instance = new(**opts)
+      instance.update
+      instance
+    end
+
+    def initialize(guardian:, chat_message:, new_content:, upload_ids: nil)
+      @guardian = guardian
+      @user = guardian.user
+      @chat_message = chat_message
+      @old_message_content = chat_message.message
+      @chat_channel = @chat_message.chat_channel
+      @new_content = new_content
+      @upload_ids = upload_ids
+      @error = nil
+    end
+
+    def update
+      begin
+        validate_channel_status!
+        @guardian.ensure_can_edit_chat!(@chat_message)
+        @chat_message.message = @new_content
+        @chat_message.last_editor_id = @user.id
+        upload_info = get_upload_info
+        @chat_message.uploads = upload_info[:uploads] if upload_info[:changed]
+        validate_message!
+        @chat_message.cook
+        @chat_message.save!
+
+        @chat_message.update_mentions
+        revision = save_revision!
+
+        @chat_message.reload
+        Chat::Publisher.publish_edit!(@chat_channel, @chat_message)
+        Jobs.enqueue(Jobs::Chat::ProcessMessage, { chat_message_id: @chat_message.id })
+        Chat::Notifier.notify_edit(chat_message: @chat_message, timestamp: revision.created_at)
+        DiscourseEvent.trigger(:chat_message_edited, @chat_message, @chat_channel, @user)
+
+        if @chat_message.thread.present?
+          Chat::Publisher.publish_thread_original_message_metadata!(@chat_message.thread)
+        end
+      rescue => error
+        @error = error
+      end
+    end
+
+    def failed?
+      @error.present?
+    end
+
+    private
+
+    def validate_channel_status!
+      return if @guardian.can_modify_channel_message?(@chat_channel)
+      raise StandardError.new(
+              I18n.t("chat.errors.channel_modify_message_disallowed.#{@chat_channel.status}"),
+            )
+    end
+
+    def validate_message!
+      return if @chat_message.valid?
+      raise StandardError.new(@chat_message.errors.map(&:full_message).join(", "))
+    end
+
+    def get_upload_info
+      return { uploads: [] } if @upload_ids.nil? || !SiteSetting.chat_allow_uploads
+
+      uploads = ::Upload.where(id: @upload_ids, user_id: @user.id)
+      if uploads.count != @upload_ids.count
+        # User is passing upload_ids for uploads that they don't own. Don't change anything.
+        return { uploads: @chat_message.uploads, changed: false }
+      end
+
+      new_upload_ids = uploads.map(&:id)
+      existing_upload_ids = @chat_message.upload_ids
+      difference = (existing_upload_ids + new_upload_ids) - (existing_upload_ids & new_upload_ids)
+      { uploads: uploads, changed: difference.any? }
+    end
+
+    def save_revision!
+      @chat_message.revisions.create!(
+        old_message: @old_message_content,
+        new_message: @chat_message.message,
+        user_id: @user.id,
+      )
+    end
+  end
+end
diff --git a/plugins/chat/lib/chat/messages_exporter.rb b/plugins/chat/lib/chat/messages_exporter.rb
new file mode 100644
index 00000000000..e2018099dde
--- /dev/null
+++ b/plugins/chat/lib/chat/messages_exporter.rb
@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module Chat
+  module MessagesExporter
+    def chat_message_export(&block)
+      # perform 1 db query per month:
+      now = Time.now
+      from = Chat::Message.minimum(:created_at)
+      while from <= now
+        export(from, from + 1.month, &block)
+        from = from + 1.month
+      end
+    end
+
+    def get_header(entity)
+      if entity === "chat_message"
+        %w[
+          id
+          chat_channel_id
+          chat_channel_name
+          user_id
+          username
+          message
+          cooked
+          created_at
+          updated_at
+          deleted_at
+          in_reply_to_id
+          last_editor_id
+          last_editor_username
+        ]
+      else
+        super
+      end
+    end
+
+    private
+
+    def export(from, to)
+      Chat::Message
+        .unscoped
+        .where(created_at: from..to)
+        .includes(:chat_channel)
+        .includes(:user)
+        .includes(:last_editor)
+        .find_each do |chat_message|
+          yield(
+            [
+              chat_message.id,
+              chat_message.chat_channel.id,
+              chat_message.chat_channel.name,
+              chat_message.user.id,
+              chat_message.user.username,
+              chat_message.message,
+              chat_message.cooked,
+              chat_message.created_at,
+              chat_message.updated_at,
+              chat_message.deleted_at,
+              chat_message.in_reply_to&.id,
+              chat_message.last_editor&.id,
+              chat_message.last_editor&.username,
+            ]
+          )
+        end
+    end
+  end
+end
diff --git a/plugins/chat/lib/chat/notification_levels.rb b/plugins/chat/lib/chat/notification_levels.rb
new file mode 100644
index 00000000000..3ac06d6a0fa
--- /dev/null
+++ b/plugins/chat/lib/chat/notification_levels.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Chat
+  class NotificationLevels
+    def self.all
+      @all_levels ||= Enum.new(muted: 0, normal: 1, tracking: 2, watching: 3)
+    end
+  end
+end
diff --git a/plugins/chat/lib/chat/notifier.rb b/plugins/chat/lib/chat/notifier.rb
new file mode 100644
index 00000000000..052d222b4da
--- /dev/null
+++ b/plugins/chat/lib/chat/notifier.rb
@@ -0,0 +1,288 @@
+# frozen_string_literal: true
+
+##
+# When we are attempting to notify users based on a message we have to take
+# into account the following:
+#
+# * Individual user mentions like @alfred
+# * Group mentions that include N users such as @support
+# * Global @here and @all mentions
+# * Users watching the channel via Chat::UserChatChannelMembership
+#
+# For various reasons a mention may not notify a user:
+#
+# * The target user of the mention is ignoring or muting the user who created the message
+# * The target user either cannot chat or cannot see the chat channel, in which case
+#   they are defined as `unreachable`
+# * The target user is not a member of the channel, in which case they are defined
+#   as `welcome_to_join`
+# * In the case of global @here and @all mentions users with the preference
+#   `ignore_channel_wide_mention` set to true will not be notified
+#
+# For any users that fall under the `unreachable` or `welcome_to_join` umbrellas
+# we send a MessageBus message to the UI and to inform the creating user. The
+# creating user can invite any `welcome_to_join` users to the channel. Target
+# users who are ignoring or muting the creating user _do not_ fall into this bucket.
+#
+# The ignore/mute filtering is also applied via the Jobs::Chat::NotifyWatching job,
+# which prevents desktop / push notifications being sent.
+module Chat
+  class Notifier
+    class << self
+      def user_has_seen_message?(membership, chat_message_id)
+        (membership.last_read_message_id || 0) >= chat_message_id
+      end
+
+      def push_notification_tag(type, chat_channel_id)
+        "#{Discourse.current_hostname}-chat-#{type}-#{chat_channel_id}"
+      end
+
+      def notify_edit(chat_message:, timestamp:)
+        Jobs.enqueue(
+          Jobs::Chat::SendMessageNotifications,
+          chat_message_id: chat_message.id,
+          timestamp: timestamp.iso8601(6),
+          reason: "edit",
+        )
+      end
+
+      def notify_new(chat_message:, timestamp:)
+        Jobs.enqueue(
+          Jobs::Chat::SendMessageNotifications,
+          chat_message_id: chat_message.id,
+          timestamp: timestamp.iso8601(6),
+          reason: "new",
+        )
+      end
+    end
+
+    def initialize(chat_message, timestamp)
+      @chat_message = chat_message
+      @parsed_mentions = @chat_message.parsed_mentions
+      @timestamp = timestamp
+      @chat_channel = @chat_message.chat_channel
+      @user = @chat_message.user
+    end
+
+    ### Public API
+
+    def notify_new
+      to_notify, inaccessible, all_mentioned_user_ids = list_users_to_notify
+
+      all_mentioned_user_ids.each do |member_id|
+        Chat::Publisher.publish_new_mention(member_id, @chat_channel.id, @chat_message.id)
+      end
+
+      notify_creator_of_inaccessible_mentions(inaccessible)
+
+      notify_mentioned_users(to_notify)
+      notify_watching_users(except: all_mentioned_user_ids << @user.id)
+
+      to_notify
+    end
+
+    def notify_edit
+      already_notified_user_ids =
+        Chat::Mention
+          .where(chat_message: @chat_message)
+          .where.not(notification: nil)
+          .pluck(:user_id)
+
+      to_notify, inaccessible, all_mentioned_user_ids = list_users_to_notify
+      needs_notification_ids = all_mentioned_user_ids - already_notified_user_ids
+      return if needs_notification_ids.blank?
+
+      notify_creator_of_inaccessible_mentions(inaccessible)
+      notify_mentioned_users(to_notify, already_notified_user_ids: already_notified_user_ids)
+
+      to_notify
+    end
+
+    private
+
+    def list_users_to_notify
+      skip_notifications = @parsed_mentions.count > SiteSetting.max_mentions_per_chat_message
+
+      to_notify = {}
+      inaccessible = {}
+      all_mentioned_user_ids = []
+
+      # The order of these methods is the precedence
+      # between different mention types.
+      expand_direct_mentions(to_notify, inaccessible, all_mentioned_user_ids, skip_notifications)
+      if !skip_notifications
+        expand_group_mentions(to_notify, inaccessible, all_mentioned_user_ids)
+        expand_here_mention(to_notify, all_mentioned_user_ids)
+        expand_global_mention(to_notify, all_mentioned_user_ids)
+      end
+
+      filter_users_ignoring_or_muting_creator(to_notify, inaccessible, all_mentioned_user_ids)
+
+      [to_notify, inaccessible, all_mentioned_user_ids]
+    end
+
+    def expand_global_mention(to_notify, already_covered_ids)
+      has_all_mention = @parsed_mentions.has_global_mention
+
+      if has_all_mention && @chat_channel.allow_channel_wide_mentions
+        to_notify[:global_mentions] = @parsed_mentions
+          .global_mentions
+          .not_suspended
+          .where(user_options: { ignore_channel_wide_mention: [false, nil] })
+          .where.not(username_lower: @user.username_lower)
+          .where.not(id: already_covered_ids)
+          .pluck(:id)
+
+        already_covered_ids.concat(to_notify[:global_mentions])
+      else
+        to_notify[:global_mentions] = []
+      end
+    end
+
+    def expand_here_mention(to_notify, already_covered_ids)
+      has_here_mention = @parsed_mentions.has_here_mention
+
+      if has_here_mention && @chat_channel.allow_channel_wide_mentions
+        to_notify[:here_mentions] = @parsed_mentions
+          .here_mentions
+          .not_suspended
+          .where(user_options: { ignore_channel_wide_mention: [false, nil] })
+          .where.not(username_lower: @user.username_lower)
+          .where.not(id: already_covered_ids)
+          .pluck(:id)
+
+        already_covered_ids.concat(to_notify[:here_mentions])
+      else
+        to_notify[:here_mentions] = []
+      end
+    end
+
+    def group_users_to_notify(users)
+      potential_members, unreachable =
+        users.partition { |user| user.guardian.can_join_chat_channel?(@chat_channel) }
+
+      members, welcome_to_join =
+        potential_members.partition { |user| @chat_channel.joined_by?(user) }
+
+      {
+        members: members || [],
+        welcome_to_join: welcome_to_join || [],
+        unreachable: unreachable || [],
+      }
+    end
+
+    def expand_direct_mentions(to_notify, inaccessible, already_covered_ids, skip)
+      if skip
+        direct_mentions = []
+      else
+        direct_mentions =
+          @parsed_mentions
+            .direct_mentions
+            .not_suspended
+            .where.not(username_lower: @user.username_lower)
+            .where.not(id: already_covered_ids)
+      end
+
+      grouped = group_users_to_notify(direct_mentions)
+
+      to_notify[:direct_mentions] = grouped[:members].map(&:id)
+      inaccessible[:welcome_to_join] = grouped[:welcome_to_join]
+      inaccessible[:unreachable] = grouped[:unreachable]
+      already_covered_ids.concat(to_notify[:direct_mentions])
+    end
+
+    def expand_group_mentions(to_notify, inaccessible, already_covered_ids)
+      return if @parsed_mentions.visible_groups.empty?
+
+      reached_by_group =
+        @parsed_mentions
+          .group_mentions
+          .not_suspended
+          .where("user_count <= ?", SiteSetting.max_users_notified_per_group_mention)
+          .where.not(username_lower: @user.username_lower)
+          .where.not(id: already_covered_ids)
+
+      @parsed_mentions.groups_to_mention.each { |g| to_notify[g.name.downcase] = [] }
+
+      grouped = group_users_to_notify(reached_by_group)
+      grouped[:members].each do |user|
+        # When a user is a member of multiple mentioned groups,
+        # the most far to the left should take precedence.
+        ordered_group_names =
+          @parsed_mentions.parsed_group_mentions &
+            @parsed_mentions.groups_to_mention.map { |mg| mg.name.downcase }
+        user_group_names = user.groups.map { |ug| ug.name.downcase }
+        group_name = ordered_group_names.detect { |gn| user_group_names.include?(gn) }
+
+        to_notify[group_name] << user.id
+        already_covered_ids << user.id
+      end
+
+      inaccessible[:welcome_to_join] = inaccessible[:welcome_to_join].concat(
+        grouped[:welcome_to_join],
+      )
+      inaccessible[:unreachable] = inaccessible[:unreachable].concat(grouped[:unreachable])
+    end
+
+    def notify_creator_of_inaccessible_mentions(inaccessible)
+      group_mentions_disabled = @parsed_mentions.groups_with_disabled_mentions.to_a
+      too_many_members = @parsed_mentions.groups_with_too_many_members.to_a
+      if inaccessible.values.all?(&:blank?) && group_mentions_disabled.empty? &&
+           too_many_members.empty?
+        return
+      end
+
+      Chat::Publisher.publish_inaccessible_mentions(
+        @user.id,
+        @chat_message,
+        inaccessible[:unreachable].to_a,
+        inaccessible[:welcome_to_join].to_a,
+        too_many_members,
+        group_mentions_disabled,
+      )
+    end
+
+    # Filters out users from global, here, group, and direct mentions that are
+    # ignoring or muting the creator of the message, so they will not receive
+    # a notification via the Jobs::Chat::NotifyMentioned job and are not prompted for
+    # invitation by the creator.
+    def filter_users_ignoring_or_muting_creator(to_notify, inaccessible, already_covered_ids)
+      screen_targets = already_covered_ids.concat(inaccessible[:welcome_to_join].map(&:id))
+
+      return if screen_targets.blank?
+
+      screener = UserCommScreener.new(acting_user: @user, target_user_ids: screen_targets)
+      to_notify.each do |key, user_ids|
+        to_notify[key] = user_ids.reject { |user_id| screener.ignoring_or_muting_actor?(user_id) }
+      end
+
+      # :welcome_to_join contains users because it's serialized by MB.
+      inaccessible[:welcome_to_join] = inaccessible[:welcome_to_join].reject do |user|
+        screener.ignoring_or_muting_actor?(user.id)
+      end
+
+      already_covered_ids.reject! do |already_covered|
+        screener.ignoring_or_muting_actor?(already_covered)
+      end
+    end
+
+    def notify_mentioned_users(to_notify, already_notified_user_ids: [])
+      Jobs.enqueue(
+        Jobs::Chat::NotifyMentioned,
+        {
+          chat_message_id: @chat_message.id,
+          to_notify_ids_map: to_notify.as_json,
+          already_notified_user_ids: already_notified_user_ids,
+          timestamp: @timestamp,
+        },
+      )
+    end
+
+    def notify_watching_users(except: [])
+      Jobs.enqueue(
+        Jobs::Chat::NotifyWatching,
+        { chat_message_id: @chat_message.id, except_user_ids: except, timestamp: @timestamp },
+      )
+    end
+  end
+end
diff --git a/plugins/chat/lib/chat/parsed_mentions.rb b/plugins/chat/lib/chat/parsed_mentions.rb
new file mode 100644
index 00000000000..3b0bd69649e
--- /dev/null
+++ b/plugins/chat/lib/chat/parsed_mentions.rb
@@ -0,0 +1,123 @@
+# frozen_string_literal: true
+
+module Chat
+  class ParsedMentions
+    def initialize(message)
+      @message = message
+
+      mentions = parse_mentions(message)
+      group_mentions = parse_group_mentions(message)
+
+      @has_global_mention = mentions.include?("@all")
+      @has_here_mention = mentions.include?("@here")
+      @parsed_direct_mentions = normalize(mentions)
+      @parsed_group_mentions = normalize(group_mentions)
+    end
+
+    attr_accessor :has_global_mention,
+                  :has_here_mention,
+                  :parsed_direct_mentions,
+                  :parsed_group_mentions
+
+    def all_mentioned_users_ids
+      @all_mentioned_users_ids ||=
+        begin
+          user_ids = global_mentions.pluck(:id)
+          user_ids.concat(direct_mentions.pluck(:id))
+          user_ids.concat(group_mentions.pluck(:id))
+          user_ids.concat(here_mentions.pluck(:id))
+          user_ids.uniq!
+          user_ids
+        end
+    end
+
+    def count
+      @count ||=
+        begin
+          result = @parsed_direct_mentions.length + @parsed_group_mentions.length
+          result += 1 if @has_global_mention
+          result += 1 if @has_here_mention
+          result
+        end
+    end
+
+    def global_mentions
+      return User.none unless @has_global_mention
+      channel_members.where.not(username_lower: @parsed_direct_mentions)
+    end
+
+    def direct_mentions
+      chat_users.where(username_lower: @parsed_direct_mentions)
+    end
+
+    def group_mentions
+      chat_users.includes(:groups).joins(:groups).where(groups: mentionable_groups)
+    end
+
+    def here_mentions
+      return User.none unless @has_here_mention
+
+      channel_members
+        .where("last_seen_at > ?", 5.minutes.ago)
+        .where.not(username_lower: @parsed_direct_mentions)
+    end
+
+    def groups_to_mention
+      @groups_to_mention = mentionable_groups - groups_with_too_many_members
+    end
+
+    def groups_with_disabled_mentions
+      @groups_with_disabled_mentions ||= visible_groups - mentionable_groups
+    end
+
+    def groups_with_too_many_members
+      @groups_with_too_many_members ||=
+        mentionable_groups.where("user_count > ?", SiteSetting.max_users_notified_per_group_mention)
+    end
+
+    def visible_groups
+      @visible_groups ||=
+        Group.where("LOWER(name) IN (?)", @parsed_group_mentions).visible_groups(@message.user)
+    end
+
+    private
+
+    def channel_members
+      chat_users.where(
+        user_chat_channel_memberships: {
+          following: true,
+          chat_channel_id: @message.chat_channel.id,
+        },
+      )
+    end
+
+    def chat_users
+      User
+        .includes(:user_chat_channel_memberships, :group_users)
+        .distinct
+        .joins("LEFT OUTER JOIN user_chat_channel_memberships uccm ON uccm.user_id = users.id")
+        .joins(:user_option)
+        .real
+        .where(user_options: { chat_enabled: true })
+    end
+
+    def mentionable_groups
+      @mentionable_groups ||=
+        Group.mentionable(@message.user, include_public: false).where(id: visible_groups.map(&:id))
+    end
+
+    def parse_mentions(message)
+      Nokogiri::HTML5.fragment(message.cooked).css(".mention").map(&:text)
+    end
+
+    def parse_group_mentions(message)
+      Nokogiri::HTML5.fragment(message.cooked).css(".mention-group").map(&:text)
+    end
+
+    def normalize(mentions)
+      mentions.reduce([]) do |memo, mention|
+        %w[@here @all].include?(mention.downcase) ? memo : (memo << mention[1..-1].downcase)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/lib/chat/plugin_instance_extension.rb b/plugins/chat/lib/chat/plugin_instance_extension.rb
new file mode 100644
index 00000000000..58c5ebc308f
--- /dev/null
+++ b/plugins/chat/lib/chat/plugin_instance_extension.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Chat
+  module PluginInstanceExtension
+    def self.prepended(base)
+      DiscoursePluginRegistry.define_register(:chat_markdown_features, Set)
+    end
+
+    def chat
+      ChatPluginApiExtensions
+    end
+
+    module ChatPluginApiExtensions
+      def self.enable_markdown_feature(name)
+        DiscoursePluginRegistry.chat_markdown_features << name
+      end
+    end
+  end
+end
diff --git a/plugins/chat/lib/chat/post_notification_handler.rb b/plugins/chat/lib/chat/post_notification_handler.rb
new file mode 100644
index 00000000000..449d6c27a22
--- /dev/null
+++ b/plugins/chat/lib/chat/post_notification_handler.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+##
+# Handles :post_alerter_after_save_post events from
+# core. Used for notifying users that their chat message
+# has been quoted in a post.
+module Chat
+  class PostNotificationHandler
+    attr_reader :post
+
+    def initialize(post, notified_users)
+      @post = post
+      @notified_users = notified_users
+    end
+
+    def handle
+      return false if post.post_type == Post.types[:whisper]
+      return false if post.topic.blank?
+      return false if post.topic.private_message?
+
+      quoted_users = extract_quoted_users(post)
+      if @notified_users.present?
+        quoted_users = quoted_users.where("users.id NOT IN (?)", @notified_users)
+      end
+
+      opts = { user_id: post.user.id, display_username: post.user.username }
+      quoted_users.each do |user|
+        # PostAlerter.create_notification handles many edge cases, such as
+        # muting, ignoring, double notifications etc.
+        PostAlerter.new.create_notification(user, Notification.types[:chat_quoted], post, opts)
+      end
+    end
+
+    private
+
+    def extract_quoted_users(post)
+      usernames =
+        post.raw.scan(/\[chat quote=\"([^;]+);.+\"\]/).uniq.map { |q| q.first.strip.downcase }
+      User.where.not(id: post.user_id).where(username_lower: usernames)
+    end
+  end
+end
diff --git a/plugins/chat/lib/chat/review_queue.rb b/plugins/chat/lib/chat/review_queue.rb
new file mode 100644
index 00000000000..e90d46f9fb5
--- /dev/null
+++ b/plugins/chat/lib/chat/review_queue.rb
@@ -0,0 +1,212 @@
+# frozen_string_literal: true
+
+# Acceptable options:
+#   - message: Used when the flag type is notify_user or notify_moderators and we have to create
+#     a separate PM.
+#   - is_warning: Staff can send warnings when using the notify_user flag.
+#   - take_action: Automatically approves the created reviewable and deletes the chat message.
+#   - queue_for_review: Adds a special reason to the reviewable score and creates the reviewable using
+#     the force_review option.
+
+module Chat
+  class ReviewQueue
+    def flag_message(chat_message, guardian, flag_type_id, opts = {})
+      result = { success: false, errors: [] }
+
+      is_notify_type =
+        ReviewableScore.types.slice(:notify_user, :notify_moderators).values.include?(flag_type_id)
+      is_dm = chat_message.chat_channel.direct_message_channel?
+
+      raise Discourse::InvalidParameters.new(:flag_type) if is_dm && is_notify_type
+
+      guardian.ensure_can_flag_chat_message!(chat_message)
+      guardian.ensure_can_flag_message_as!(chat_message, flag_type_id, opts)
+
+      existing_reviewable = Reviewable.includes(:reviewable_scores).find_by(target: chat_message)
+
+      if !can_flag_again?(existing_reviewable, chat_message, guardian.user, flag_type_id)
+        result[:errors] << I18n.t("chat.reviewables.message_already_handled")
+        return result
+      end
+
+      payload = { message_cooked: chat_message.cooked }
+
+      if opts[:message].present? && !is_dm && is_notify_type
+        creator = companion_pm_creator(chat_message, guardian.user, flag_type_id, opts)
+        post = creator.create
+
+        if creator.errors.present?
+          creator.errors.full_messages.each { |msg| result[:errors] << msg }
+          return result
+        end
+      elsif is_dm
+        transcript = find_or_create_transcript(chat_message, guardian.user, existing_reviewable)
+        payload[:transcript_topic_id] = transcript.topic_id if transcript
+      end
+
+      queued_for_review = !!ActiveRecord::Type::Boolean.new.deserialize(opts[:queue_for_review])
+
+      reviewable =
+        Chat::ReviewableMessage.needs_review!(
+          created_by: guardian.user,
+          target: chat_message,
+          reviewable_by_moderator: true,
+          potential_spam: flag_type_id == ReviewableScore.types[:spam],
+          payload: payload,
+        )
+      reviewable.update(target_created_by: chat_message.user)
+      score =
+        reviewable.add_score(
+          guardian.user,
+          flag_type_id,
+          meta_topic_id: post&.topic_id,
+          take_action: opts[:take_action],
+          reason: queued_for_review ? "chat_message_queued_by_staff" : nil,
+          force_review: queued_for_review,
+        )
+
+      if opts[:take_action]
+        reviewable.perform(guardian.user, :agree_and_delete)
+        Chat::Publisher.publish_delete!(chat_message.chat_channel, chat_message)
+      else
+        enforce_auto_silence_threshold(reviewable)
+        Chat::Publisher.publish_flag!(chat_message, guardian.user, reviewable, score)
+      end
+
+      result.tap do |r|
+        r[:success] = true
+        r[:reviewable] = reviewable
+      end
+    end
+
+    private
+
+    def enforce_auto_silence_threshold(reviewable)
+      auto_silence_duration = SiteSetting.chat_auto_silence_from_flags_duration
+      return if auto_silence_duration.zero?
+      return if reviewable.score <= Chat::ReviewableMessage.score_to_silence_user
+
+      user = reviewable.target_created_by
+      return if user.admin?
+      return unless user
+      return if user.silenced?
+
+      UserSilencer.silence(
+        user,
+        Discourse.system_user,
+        silenced_till: auto_silence_duration.minutes.from_now,
+        reason: I18n.t("chat.errors.auto_silence_from_flags"),
+      )
+    end
+
+    def companion_pm_creator(chat_message, flagger, flag_type_id, opts)
+      notifying_user = flag_type_id == ReviewableScore.types[:notify_user]
+
+      i18n_key = notifying_user ? "notify_user" : "notify_moderators"
+
+      title =
+        I18n.t(
+          "reviewable_score_types.#{i18n_key}.chat_pm_title",
+          channel_name: chat_message.chat_channel.title(flagger),
+          locale: SiteSetting.default_locale,
+        )
+
+      body =
+        I18n.t(
+          "reviewable_score_types.#{i18n_key}.chat_pm_body",
+          message: opts[:message],
+          link: chat_message.full_url,
+          locale: SiteSetting.default_locale,
+        )
+
+      create_args = {
+        archetype: Archetype.private_message,
+        title: title.truncate(SiteSetting.max_topic_title_length, separator: /\s/),
+        raw: body,
+      }
+
+      if notifying_user
+        create_args[:subtype] = TopicSubtype.notify_user
+        create_args[:target_usernames] = chat_message.user.username
+
+        create_args[:is_warning] = opts[:is_warning] if flagger.staff?
+      else
+        create_args[:subtype] = TopicSubtype.notify_moderators
+        create_args[:target_group_names] = [Group[:moderators].name]
+      end
+
+      PostCreator.new(flagger, create_args)
+    end
+
+    def find_or_create_transcript(chat_message, flagger, existing_reviewable)
+      previous_message_ids =
+        Chat::Message
+          .where(chat_channel: chat_message.chat_channel)
+          .where("id < ?", chat_message.id)
+          .order("created_at DESC")
+          .limit(10)
+          .pluck(:id)
+          .reverse
+
+      return if previous_message_ids.empty?
+
+      service =
+        Chat::TranscriptService.new(
+          chat_message.chat_channel,
+          Discourse.system_user,
+          messages_or_ids: previous_message_ids,
+        )
+
+      title =
+        I18n.t(
+          "chat.reviewables.direct_messages.transcript_title",
+          channel_name: chat_message.chat_channel.title(flagger),
+          locale: SiteSetting.default_locale,
+        )
+
+      body =
+        I18n.t(
+          "chat.reviewables.direct_messages.transcript_body",
+          transcript: service.generate_markdown,
+          locale: SiteSetting.default_locale,
+        )
+
+      create_args = {
+        archetype: Archetype.private_message,
+        title: title.truncate(SiteSetting.max_topic_title_length, separator: /\s/),
+        raw: body,
+        subtype: TopicSubtype.notify_moderators,
+        target_group_names: [Group[:moderators].name],
+      }
+
+      PostCreator.new(Discourse.system_user, create_args).create
+    end
+
+    def can_flag_again?(reviewable, message, flagger, flag_type_id)
+      return true if reviewable.blank?
+
+      flagger_has_pending_flags =
+        reviewable.reviewable_scores.any? { |rs| rs.user == flagger && rs.pending? }
+
+      if !flagger_has_pending_flags && flag_type_id == ReviewableScore.types[:notify_moderators]
+        return true
+      end
+
+      flag_used =
+        reviewable.reviewable_scores.any? do |rs|
+          rs.reviewable_score_type == flag_type_id && rs.pending?
+        end
+      handled_recently =
+        !(
+          reviewable.pending? ||
+            reviewable.updated_at < SiteSetting.cooldown_hours_until_reflag.to_i.hours.ago
+        )
+
+      latest_revision = message.revisions.last
+      edited_since_last_review =
+        latest_revision && latest_revision.updated_at > reviewable.updated_at
+
+      !flag_used && !flagger_has_pending_flags && (!handled_recently || edited_since_last_review)
+    end
+  end
+end
diff --git a/plugins/chat/lib/chat/reviewable_extension.rb b/plugins/chat/lib/chat/reviewable_extension.rb
new file mode 100644
index 00000000000..c856701dbf7
--- /dev/null
+++ b/plugins/chat/lib/chat/reviewable_extension.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Chat
+  module ReviewableExtension
+    extend ActiveSupport::Concern
+
+    prepended { include TypeMappable }
+
+    class_methods do
+      def sti_class_mapping = { "ReviewableChatMessage" => Chat::ReviewableMessage }
+      def polymorphic_class_mapping = { "ChatMessage" => Chat::Message }
+    end
+  end
+end
diff --git a/plugins/chat/lib/chat/secure_uploads_compatibility.rb b/plugins/chat/lib/chat/secure_uploads_compatibility.rb
new file mode 100644
index 00000000000..1a63f0ff743
--- /dev/null
+++ b/plugins/chat/lib/chat/secure_uploads_compatibility.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Chat
+  class SecureUploadsCompatibility
+    ##
+    # At this point in time, secure uploads is not compatible with chat,
+    # so if it is enabled then chat uploads must be disabled to avoid undesirable
+    # behaviour.
+    #
+    # The env var DISCOURSE_ALLOW_UNSECURE_CHAT_UPLOADS can be set to keep
+    # it enabled, but this is strongly advised against.
+    def self.update_settings
+      if SiteSetting.secure_uploads && SiteSetting.chat_allow_uploads &&
+           !GlobalSetting.allow_unsecure_chat_uploads
+        SiteSetting.chat_allow_uploads = false
+        StaffActionLogger.new(Discourse.system_user).log_site_setting_change(
+          "chat_allow_uploads",
+          true,
+          false,
+          context: "Disabled because secure_uploads is enabled",
+        )
+      end
+    end
+  end
+end
diff --git a/plugins/chat/lib/chat/seeder.rb b/plugins/chat/lib/chat/seeder.rb
new file mode 100644
index 00000000000..b6853be92bb
--- /dev/null
+++ b/plugins/chat/lib/chat/seeder.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Chat
+  class Seeder
+    def execute(args = {})
+      return if !SiteSetting.needs_chat_seeded
+
+      begin
+        create_category_channel_from(SiteSetting.staff_category_id)
+        create_category_channel_from(SiteSetting.general_category_id)
+      rescue => error
+        Rails.logger.warn("Error seeding chat category - #{error.inspect}")
+      ensure
+        SiteSetting.needs_chat_seeded = false
+      end
+    end
+
+    def create_category_channel_from(category_id)
+      category = Category.find_by(id: category_id)
+      return if category.nil?
+
+      chat_channel = category.create_chat_channel!(auto_join_users: true, name: category.name)
+      category.custom_fields[Chat::HAS_CHAT_ENABLED] = true
+      category.save!
+
+      Chat::ChannelMembershipManager.new(chat_channel).enforce_automatic_channel_memberships
+      chat_channel
+    end
+  end
+end
diff --git a/plugins/chat/lib/chat/slack_compatibility.rb b/plugins/chat/lib/chat/slack_compatibility.rb
new file mode 100644
index 00000000000..1c8b628668c
--- /dev/null
+++ b/plugins/chat/lib/chat/slack_compatibility.rb
@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+##
+# Processes slack-formatted text messages, as Mattermost does with
+# Slack incoming webhook interoperability, for example links in the
+# format <LINK> and <LINK|TEXT>, <!here> and <!all> mentions.
+#
+# See https://api.slack.com/reference/surfaces/formatting for all of
+# the different formatting slack supports with mrkdwn which is mostly
+# identical to Markdown.
+#
+# Mattermost docs for translating the slack format:
+#
+# https://docs.mattermost.com/developer/webhooks-incoming.html?highlight=translate%20slack%20data%20format%20mattermost#translate-slack-s-data-format-to-mattermost
+#
+# We may want to process attachments and blocks from slack in future, and
+# convert user IDs into user mentions.
+module Chat
+  class SlackCompatibility
+    MRKDWN_LINK_REGEX = Regexp.new(/(<[^\n<\|>]+>|<[^\n<\>]+>)/).freeze
+
+    class << self
+      def process_text(text)
+        text = text.gsub("<!here>", "@here")
+        text = text.gsub("<!all>", "@all")
+
+        text.scan(MRKDWN_LINK_REGEX) do |match|
+          match = match.first
+
+          if match.include?("|")
+            link, title = match.split("|")[0..1]
+          else
+            link = match
+          end
+
+          title = title&.gsub(/<|>/, "")
+          link = link&.gsub(/<|>/, "")
+
+          if title
+            text = text.gsub(match, "[#{title}](#{link})")
+          else
+            text = text.gsub(match, "#{link}")
+          end
+        end
+
+        text
+      end
+
+      # TODO: This is quite hacky and is only here to support a single
+      # attachment for our OpsGenie integration. In future we would
+      # want to iterate through this attachments array and extract
+      # things properly.
+      #
+      # See https://api.slack.com/reference/messaging/attachments for
+      # more details on what fields are here.
+      def process_legacy_attachments(attachments)
+        text = CGI.unescape(attachments[0][:fallback])
+        process_text(text)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/lib/chat/statistics.rb b/plugins/chat/lib/chat/statistics.rb
new file mode 100644
index 00000000000..cc9a6b3f313
--- /dev/null
+++ b/plugins/chat/lib/chat/statistics.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Chat
+  class Statistics
+    def self.about_messages
+      {
+        :last_day => Chat::Message.where("created_at > ?", 1.days.ago).count,
+        "7_days" => Chat::Message.where("created_at > ?", 7.days.ago).count,
+        "30_days" => Chat::Message.where("created_at > ?", 30.days.ago).count,
+        :previous_30_days =>
+          Chat::Message.where("created_at BETWEEN ? AND ?", 60.days.ago, 30.days.ago).count,
+        :count => Chat::Message.count,
+      }
+    end
+
+    def self.about_channels
+      {
+        :last_day => Chat::Channel.where(status: :open).where("created_at > ?", 1.days.ago).count,
+        "7_days" => Chat::Channel.where(status: :open).where("created_at > ?", 7.days.ago).count,
+        "30_days" => Chat::Channel.where(status: :open).where("created_at > ?", 30.days.ago).count,
+        :previous_30_days =>
+          Chat::Channel
+            .where(status: :open)
+            .where("created_at BETWEEN ? AND ?", 60.days.ago, 30.days.ago)
+            .count,
+        :count => Chat::Channel.where(status: :open).count,
+      }
+    end
+
+    def self.about_users
+      {
+        :last_day => Chat::Message.where("created_at > ?", 1.days.ago).distinct.count(:user_id),
+        "7_days" => Chat::Message.where("created_at > ?", 7.days.ago).distinct.count(:user_id),
+        "30_days" => Chat::Message.where("created_at > ?", 30.days.ago).distinct.count(:user_id),
+        :previous_30_days =>
+          Chat::Message
+            .where("created_at BETWEEN ? AND ?", 60.days.ago, 30.days.ago)
+            .distinct
+            .count(:user_id),
+        :count => Chat::Message.distinct.count(:user_id),
+      }
+    end
+
+    def self.monthly
+      start_of_month = Time.zone.now.beginning_of_month
+      {
+        messages: Chat::Message.where("created_at > ?", start_of_month).count,
+        channels: Chat::Channel.where(status: :open).where("created_at > ?", start_of_month).count,
+        users: Chat::Message.where("created_at > ?", start_of_month).distinct.count(:user_id),
+      }
+    end
+  end
+end
diff --git a/plugins/chat/lib/chat/steps_inspector.rb b/plugins/chat/lib/chat/steps_inspector.rb
new file mode 100644
index 00000000000..2cc40a0c1f6
--- /dev/null
+++ b/plugins/chat/lib/chat/steps_inspector.rb
@@ -0,0 +1,129 @@
+# frozen_string_literal: true
+
+module Chat
+  # = Chat::StepsInspector
+  #
+  # This class takes a {Service::Base::Context} object and inspects it.
+  # It will output a list of steps and what is their known state.
+  class StepsInspector
+    # @!visibility private
+    class Step
+      attr_reader :step, :result, :nesting_level
+
+      delegate :name, to: :step
+      delegate :failure?, :success?, :error, to: :step_result, allow_nil: true
+
+      def self.for(step, result, nesting_level: 0)
+        class_name =
+          "#{module_parent_name}::#{step.class.name.split("::").last.sub(/^(\w+)Step$/, "\\1")}"
+        class_name.constantize.new(step, result, nesting_level: nesting_level)
+      end
+
+      def initialize(step, result, nesting_level: 0)
+        @step = step
+        @result = result
+        @nesting_level = nesting_level
+      end
+
+      def type
+        self.class.name.split("::").last.downcase
+      end
+
+      def emoji
+        "#{result_emoji}#{unexpected_result_emoji}"
+      end
+
+      def steps
+        [self]
+      end
+
+      def inspect
+        "#{"  " * nesting_level}[#{type}] '#{name}' #{emoji}".rstrip
+      end
+
+      private
+
+      def step_result
+        result["result.#{type}.#{name}"]
+      end
+
+      def result_emoji
+        return "❌" if failure?
+        return "✅" if success?
+        ""
+      end
+
+      def unexpected_result_emoji
+        " ⚠️#{unexpected_result_text}" if step_result.try(:[], "spec.unexpected_result")
+      end
+
+      def unexpected_result_text
+        return "  <= expected to return true but got false instead" if failure?
+        "  <= expected to return false but got true instead"
+      end
+    end
+
+    # @!visibility private
+    class Model < Step
+      def error
+        return result[name].errors.inspect if step_result.invalid
+        step_result.exception.full_message
+      end
+    end
+
+    # @!visibility private
+    class Contract < Step
+      def error
+        step_result.errors.inspect
+      end
+    end
+
+    # @!visibility private
+    class Policy < Step
+      def error
+        step_result.reason
+      end
+    end
+
+    # @!visibility private
+    class Transaction < Step
+      def steps
+        [self, *step.steps.map { Step.for(_1, result, nesting_level: nesting_level + 1).steps }]
+      end
+
+      def inspect
+        "#{"  " * nesting_level}[#{type}]"
+      end
+
+      def step_result
+        nil
+      end
+    end
+
+    attr_reader :steps, :result
+
+    def initialize(result)
+      @steps = result.__steps__.map { Step.for(_1, result).steps }.flatten
+      @result = result
+    end
+
+    # Inspect the provided result object.
+    # Example output:
+    #   [1/4] [model] 'channel' ✅
+    #   [2/4] [contract] 'default' ✅
+    #   [3/4] [policy] 'check_channel_permission' ❌
+    #   [4/4] [step] 'change_status'
+    # @return [String] the steps of the result object with their state
+    def inspect
+      steps
+        .map
+        .with_index { |step, index| "[#{index + 1}/#{steps.size}] #{step.inspect}" }
+        .join("\n")
+    end
+
+    # @return [String, nil] the first available error, if any.
+    def error
+      steps.detect(&:failure?)&.error
+    end
+  end
+end
diff --git a/plugins/chat/lib/chat/transcript_service.rb b/plugins/chat/lib/chat/transcript_service.rb
new file mode 100644
index 00000000000..82f27dca428
--- /dev/null
+++ b/plugins/chat/lib/chat/transcript_service.rb
@@ -0,0 +1,179 @@
+# frozen_string_literal: true
+
+##
+# Used to generate BBCode [chat] tags for the message IDs provided.
+#
+# If there is > 1 message then the channel name will be shown at
+# the top of the first message, and subsequent messages will have
+# the chained attribute, which will affect how they are displayed
+# in the UI.
+#
+# Subsequent messages from the same user will be put into the same
+# tag. Each new user in the chain of messages will have a new [chat]
+# tag created.
+#
+# A single message will have the channel name displayed to the right
+# of the username and datetime of the message.
+module Chat
+  class TranscriptService
+    CHAINED_ATTR = "chained=\"true\""
+    MULTIQUOTE_ATTR = "multiQuote=\"true\""
+    NO_LINK_ATTR = "noLink=\"true\""
+
+    class TranscriptBBCode
+      attr_reader :channel, :multiquote, :chained, :no_link, :include_reactions
+
+      def initialize(
+        channel: nil,
+        acting_user: nil,
+        multiquote: false,
+        chained: false,
+        no_link: false,
+        include_reactions: false
+      )
+        @channel = channel
+        @acting_user = acting_user
+        @multiquote = multiquote
+        @chained = chained
+        @no_link = no_link
+        @include_reactions = include_reactions
+        @message_data = []
+      end
+
+      def add(message:, reactions: nil)
+        @message_data << { message: message, reactions: reactions }
+      end
+
+      def render
+        attrs = [quote_attr(@message_data.first[:message])]
+
+        if channel
+          attrs << channel_attr
+          attrs << channel_id_attr
+        end
+
+        attrs << MULTIQUOTE_ATTR if multiquote
+        attrs << CHAINED_ATTR if chained
+        attrs << NO_LINK_ATTR if no_link
+        attrs << reactions_attr if include_reactions
+
+        <<~MARKDOWN
+      [chat #{attrs.compact.join(" ")}]
+      #{@message_data.map { |msg| msg[:message].to_markdown }.join("\n\n")}
+      [/chat]
+      MARKDOWN
+      end
+
+      private
+
+      def reactions_attr
+        reaction_data =
+          @message_data.reduce([]) do |array, msg_data|
+            if msg_data[:reactions].any?
+              array << msg_data[:reactions].map { |react| "#{react.emoji}:#{react.usernames}" }
+            end
+            array
+          end
+        return if reaction_data.empty?
+        "reactions=\"#{reaction_data.join(";")}\""
+      end
+
+      def quote_attr(message)
+        "quote=\"#{message.user.username};#{message.id};#{message.created_at.iso8601}\""
+      end
+
+      def channel_attr
+        "channel=\"#{channel.title(@acting_user)}\""
+      end
+
+      def channel_id_attr
+        "channelId=\"#{channel.id}\""
+      end
+    end
+
+    def initialize(channel, acting_user, messages_or_ids: [], opts: {})
+      @channel = channel
+      @acting_user = acting_user
+
+      if messages_or_ids.all? { |m| m.is_a?(Numeric) }
+        @message_ids = messages_or_ids
+      else
+        @messages = messages_or_ids
+      end
+      @opts = opts
+    end
+
+    def generate_markdown
+      previous_message = nil
+      rendered_markdown = []
+      all_messages_same_user = messages.count(:user_id) == 1
+      open_bbcode_tag =
+        TranscriptBBCode.new(
+          channel: @channel,
+          acting_user: @acting_user,
+          multiquote: messages.length > 1,
+          chained: !all_messages_same_user,
+          no_link: @opts[:no_link],
+          include_reactions: @opts[:include_reactions],
+        )
+
+      messages.each.with_index do |message, idx|
+        if previous_message.present? && previous_message.user_id != message.user_id
+          rendered_markdown << open_bbcode_tag.render
+
+          open_bbcode_tag =
+            TranscriptBBCode.new(
+              acting_user: @acting_user,
+              chained: !all_messages_same_user,
+              no_link: @opts[:no_link],
+              include_reactions: @opts[:include_reactions],
+            )
+        end
+
+        if @opts[:include_reactions]
+          open_bbcode_tag.add(message: message, reactions: reactions_for_message(message))
+        else
+          open_bbcode_tag.add(message: message)
+        end
+        previous_message = message
+      end
+
+      # tie off the last open bbcode + render
+      rendered_markdown << open_bbcode_tag.render
+      rendered_markdown.join("\n")
+    end
+
+    private
+
+    def messages
+      @messages ||=
+        Chat::Message
+          .includes(:user, upload_references: :upload)
+          .where(id: @message_ids, chat_channel_id: @channel.id)
+          .order(:created_at)
+    end
+
+    ##
+    # Queries reactions and returns them in this format
+    #
+    # emoji   |  usernames  |  chat_message_id
+    # ----------------------------------------
+    # +1      | foo,bar,baz | 102
+    # heart   | foo         | 102
+    # sob     | bar,baz     | 103
+    def reactions
+      @reactions ||= DB.query(<<~SQL, @messages.map(&:id))
+    SELECT emoji, STRING_AGG(DISTINCT users.username, ',') AS usernames, chat_message_id
+    FROM chat_message_reactions
+    INNER JOIN users on users.id = chat_message_reactions.user_id
+    WHERE chat_message_id IN (?)
+    GROUP BY emoji, chat_message_id
+    ORDER BY chat_message_id, emoji
+    SQL
+    end
+
+    def reactions_for_message(message)
+      reactions.select { |react| react.chat_message_id == message.id }
+    end
+  end
+end
diff --git a/plugins/chat/lib/chat/types/array.rb b/plugins/chat/lib/chat/types/array.rb
new file mode 100644
index 00000000000..a8491a868b1
--- /dev/null
+++ b/plugins/chat/lib/chat/types/array.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Chat
+  module Types
+    class Array < ActiveModel::Type::Value
+      def serializable?(_)
+        false
+      end
+
+      def cast_value(value)
+        case value
+        when String
+          value.split(",")
+        else
+          ::Array.wrap(value)
+        end
+      end
+    end
+  end
+end
+
+ActiveSupport.on_load(:active_record) { ActiveModel::Type.register(:array, Chat::Types::Array) }
diff --git a/plugins/chat/lib/chat/user_email_extension.rb b/plugins/chat/lib/chat/user_email_extension.rb
new file mode 100644
index 00000000000..366fc41bb32
--- /dev/null
+++ b/plugins/chat/lib/chat/user_email_extension.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Chat
+  module UserEmailExtension
+    def execute(args)
+      super(args)
+
+      if args[:type] == "chat_summary" && args[:memberships_to_update_data].present?
+        args[:memberships_to_update_data].to_a.each do |membership_id, max_unread_mention_id|
+          Chat::UserChatChannelMembership.find_by(
+            user: args[:user_id],
+            id: membership_id.to_i,
+          )&.update(last_unread_mention_when_emailed_id: max_unread_mention_id.to_i)
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/lib/chat/user_extension.rb b/plugins/chat/lib/chat/user_extension.rb
new file mode 100644
index 00000000000..d5c7e14c926
--- /dev/null
+++ b/plugins/chat/lib/chat/user_extension.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Chat
+  module UserExtension
+    extend ActiveSupport::Concern
+
+    prepended do
+      has_many :user_chat_channel_memberships,
+               class_name: "Chat::UserChatChannelMembership",
+               dependent: :destroy
+      has_many :user_chat_thread_memberships,
+               class_name: "Chat::UserChatThreadMembership",
+               dependent: :destroy
+      has_many :chat_message_reactions, class_name: "Chat::MessageReaction", dependent: :destroy
+      has_many :chat_mentions, class_name: "Chat::Mention"
+    end
+  end
+end
diff --git a/plugins/chat/lib/chat/user_notifications_extension.rb b/plugins/chat/lib/chat/user_notifications_extension.rb
new file mode 100644
index 00000000000..6c73ceb1d0d
--- /dev/null
+++ b/plugins/chat/lib/chat/user_notifications_extension.rb
@@ -0,0 +1,144 @@
+# frozen_string_literal: true
+
+module Chat
+  module UserNotificationsExtension
+    def chat_summary(user, opts)
+      guardian = Guardian.new(user)
+      return unless guardian.can_chat?
+
+      @messages =
+        Chat::Message
+          .joins(:user, :chat_channel)
+          .where.not(user: user)
+          .where("chat_messages.created_at > ?", 1.week.ago)
+          .joins(
+            "LEFT OUTER JOIN chat_mentions cm ON cm.chat_message_id = chat_messages.id AND cm.notification_id IS NOT NULL",
+          )
+          .joins(
+            "INNER JOIN user_chat_channel_memberships uccm ON uccm.chat_channel_id = chat_channels.id",
+          )
+          .where(<<~SQL, user_id: user.id)
+          uccm.user_id = :user_id AND
+          (uccm.last_read_message_id IS NULL OR chat_messages.id > uccm.last_read_message_id) AND
+          (uccm.last_unread_mention_when_emailed_id IS NULL OR chat_messages.id > uccm.last_unread_mention_when_emailed_id) AND
+          (
+            (cm.user_id = :user_id AND uccm.following IS true AND chat_channels.chatable_type = 'Category') OR
+            (chat_channels.chatable_type = 'DirectMessage')
+          )
+        SQL
+          .to_a
+
+      return if @messages.empty?
+      @grouped_messages = @messages.group_by { |message| message.chat_channel }
+      @grouped_messages =
+        @grouped_messages.select { |channel, _| guardian.can_join_chat_channel?(channel) }
+      return if @grouped_messages.empty?
+
+      @grouped_messages.each do |chat_channel, messages|
+        @grouped_messages[chat_channel] = messages.sort_by(&:created_at)
+      end
+      @user = user
+      @user_tz = UserOption.user_tzinfo(user.id)
+      @display_usernames = SiteSetting.prioritize_username_in_ux || !SiteSetting.enable_names
+
+      build_summary_for(user)
+      @preferences_path = "#{Discourse.base_url}/my/preferences/chat"
+
+      # TODO(roman): Remove after the 2.9 release
+      add_unsubscribe_link = UnsubscribeKey.respond_to?(:get_unsubscribe_strategy_for)
+
+      if add_unsubscribe_link
+        unsubscribe_key = UnsubscribeKey.create_key_for(@user, "chat_summary")
+        @unsubscribe_link = "#{Discourse.base_url}/email/unsubscribe/#{unsubscribe_key}"
+        opts[:unsubscribe_url] = @unsubscribe_link
+      end
+
+      opts = {
+        from_alias: I18n.t("user_notifications.chat_summary.from", site_name: Email.site_title),
+        subject: summary_subject(user, @grouped_messages),
+        add_unsubscribe_link: add_unsubscribe_link,
+      }
+
+      build_email(user.email, opts)
+    end
+
+    def summary_subject(user, grouped_messages)
+      all_channels = grouped_messages.keys
+      grouped_channels = all_channels.partition { |c| !c.direct_message_channel? }
+      channels = grouped_channels.first
+
+      dm_messages = grouped_channels.last.flat_map { |c| grouped_messages[c] }
+      dm_users = dm_messages.sort_by(&:created_at).uniq { |m| m.user_id }.map(&:user)
+
+      # Prioritize messages from regular channels over direct messages
+      if channels.any?
+        channel_notification_text(
+          channels.sort_by { |channel| [channel.last_message.created_at, channel.created_at] },
+          dm_users,
+        )
+      else
+        direct_message_notification_text(dm_users)
+      end
+    end
+
+    private
+
+    def channel_notification_text(channels, dm_users)
+      total_count = channels.size + dm_users.size
+
+      if total_count > 2
+        I18n.t(
+          "user_notifications.chat_summary.subject.chat_channel_more",
+          email_prefix: @email_prefix,
+          channel: channels.first.title,
+          count: total_count - 1,
+        )
+      elsif channels.size == 1 && dm_users.size == 0
+        I18n.t(
+          "user_notifications.chat_summary.subject.chat_channel_1",
+          email_prefix: @email_prefix,
+          channel: channels.first.title,
+        )
+      elsif channels.size == 1 && dm_users.size == 1
+        I18n.t(
+          "user_notifications.chat_summary.subject.chat_channel_and_direct_message",
+          email_prefix: @email_prefix,
+          channel: channels.first.title,
+          username: dm_users.first.username,
+        )
+      elsif channels.size == 2
+        I18n.t(
+          "user_notifications.chat_summary.subject.chat_channel_2",
+          email_prefix: @email_prefix,
+          channel1: channels.first.title,
+          channel2: channels.second.title,
+        )
+      end
+    end
+
+    def direct_message_notification_text(dm_users)
+      case dm_users.size
+      when 1
+        I18n.t(
+          "user_notifications.chat_summary.subject.direct_message_from_1",
+          email_prefix: @email_prefix,
+          username: dm_users.first.username,
+        )
+      when 2
+        I18n.t(
+          "user_notifications.chat_summary.subject.direct_message_from_2",
+          email_prefix: @email_prefix,
+          username1: dm_users.first.username,
+          username2: dm_users.second.username,
+        )
+      else
+        I18n.t(
+          "user_notifications.chat_summary.subject.direct_message_from_more",
+          email_prefix: @email_prefix,
+          username: dm_users.first.username,
+          count: dm_users.size - 1,
+        )
+      end
+    end
+  end
+end
diff --git a/plugins/chat/lib/chat/user_option_extension.rb b/plugins/chat/lib/chat/user_option_extension.rb
new file mode 100644
index 00000000000..290f6361d55
--- /dev/null
+++ b/plugins/chat/lib/chat/user_option_extension.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Chat
+  module UserOptionExtension
+    # TODO: remove last_emailed_for_chat and chat_isolated in 2023
+    def self.prepended(base)
+      if base.ignored_columns
+        base.ignored_columns = base.ignored_columns + %i[last_emailed_for_chat chat_isolated]
+      else
+        base.ignored_columns = %i[last_emailed_for_chat chat_isolated]
+      end
+
+      def base.chat_email_frequencies
+        @chat_email_frequencies ||= { never: 0, when_away: 1 }
+      end
+
+      def base.chat_header_indicator_preferences
+        @chat_header_indicator_preferences ||= { all_new: 0, dm_and_mentions: 1, never: 2 }
+      end
+
+      if !base.method_defined?(:send_chat_email_never?) # Avoid attempting to override when autoloading
+        base.enum :chat_email_frequency, base.chat_email_frequencies, prefix: "send_chat_email"
+      end
+
+      if !base.method_defined?(:chat_header_indicator_never?) # Avoid attempting to override when autoloading
+        base.enum :chat_header_indicator_preference,
+                  base.chat_header_indicator_preferences,
+                  prefix: "chat_header_indicator"
+      end
+    end
+  end
+end
diff --git a/plugins/chat/lib/chat_channel_archive_service.rb b/plugins/chat/lib/chat_channel_archive_service.rb
deleted file mode 100644
index cf656ef4cac..00000000000
--- a/plugins/chat/lib/chat_channel_archive_service.rb
+++ /dev/null
@@ -1,311 +0,0 @@
-# frozen_string_literal: true
-
-##
-# From time to time, site admins may choose to sunset a chat channel and archive
-# the messages within. It cannot be used for DM channels in its current iteration.
-#
-# To archive a channel, we mark it read_only first to prevent any further message
-# additions or changes, and create a record to track whether the archive topic
-# will be new or existing. When we archive the channel, messages are copied into
-# posts in batches using the [chat] BBCode to quote the messages. The messages are
-# deleted once the batch has its post made. The execute action of this class is
-# idempotent, so if we fail halfway through the archive process it can be run again.
-#
-# Once all of the messages have been copied then we mark the channel as archived.
-class Chat::ChatChannelArchiveService
-  ARCHIVED_MESSAGES_PER_POST = 100
-
-  class ArchiveValidationError < StandardError
-    attr_reader :errors
-
-    def initialize(errors: [])
-      super
-      @errors = errors
-    end
-  end
-
-  def self.create_archive_process(chat_channel:, acting_user:, topic_params:)
-    return if ChatChannelArchive.exists?(chat_channel: chat_channel)
-
-    # Only need to validate topic params for a new topic, not an existing one.
-    if topic_params[:topic_id].blank?
-      valid, errors =
-        Chat::ChatChannelArchiveService.validate_topic_params(
-          Guardian.new(acting_user),
-          topic_params,
-        )
-
-      raise ArchiveValidationError.new(errors: errors) if !valid
-    end
-
-    ChatChannelArchive.transaction do
-      chat_channel.read_only!(acting_user)
-
-      archive =
-        ChatChannelArchive.create!(
-          chat_channel: chat_channel,
-          archived_by: acting_user,
-          total_messages: chat_channel.chat_messages.count,
-          destination_topic_id: topic_params[:topic_id],
-          destination_topic_title: topic_params[:topic_title],
-          destination_category_id: topic_params[:category_id],
-          destination_tags: topic_params[:tags],
-        )
-      Jobs.enqueue(:chat_channel_archive, chat_channel_archive_id: archive.id)
-
-      archive
-    end
-  end
-
-  def self.retry_archive_process(chat_channel:)
-    return if !chat_channel.chat_channel_archive&.failed?
-    Jobs.enqueue(
-      :chat_channel_archive,
-      chat_channel_archive_id: chat_channel.chat_channel_archive.id,
-    )
-    chat_channel.chat_channel_archive
-  end
-
-  def self.validate_topic_params(guardian, topic_params)
-    topic_creator =
-      TopicCreator.new(
-        Discourse.system_user,
-        guardian,
-        {
-          title: topic_params[:topic_title],
-          category: topic_params[:category_id],
-          tags: topic_params[:tags],
-          import_mode: true,
-        },
-      )
-    [topic_creator.valid?, topic_creator.errors.full_messages]
-  end
-
-  attr_reader :chat_channel_archive, :chat_channel, :chat_channel_title
-
-  def initialize(chat_channel_archive)
-    @chat_channel_archive = chat_channel_archive
-    @chat_channel = chat_channel_archive.chat_channel
-    @chat_channel_title = chat_channel.title(chat_channel_archive.archived_by)
-  end
-
-  def execute
-    chat_channel_archive.update(archive_error: nil)
-
-    begin
-      return if !ensure_destination_topic_exists!
-
-      Rails.logger.info(
-        "Creating posts from message batches for #{chat_channel_title} archive, #{chat_channel_archive.total_messages} messages to archive (#{chat_channel_archive.total_messages / ARCHIVED_MESSAGES_PER_POST} posts).",
-      )
-
-      # A batch should be idempotent, either the post is created and the
-      # messages are deleted or we roll back the whole thing.
-      #
-      # At some point we may want to reconsider disabling post validations,
-      # and add in things like dynamic resizing of the number of messages per
-      # post based on post length, but that can be done later.
-      #
-      # Another future improvement is to send a MessageBus message for each
-      # completed batch, so the UI can receive updates and show a progress
-      # bar or something similar.
-      chat_channel
-        .chat_messages
-        .find_in_batches(batch_size: ARCHIVED_MESSAGES_PER_POST) do |chat_messages|
-          create_post(
-            ChatTranscriptService.new(
-              chat_channel,
-              chat_channel_archive.archived_by,
-              messages_or_ids: chat_messages,
-              opts: {
-                no_link: true,
-                include_reactions: true,
-              },
-            ).generate_markdown,
-          ) { delete_message_batch(chat_messages.map(&:id)) }
-        end
-
-      kick_all_users
-      complete_archive
-    rescue => err
-      notify_archiver(:failed, error_message: err.message)
-      raise err
-    end
-  end
-
-  private
-
-  def create_post(raw)
-    pc = nil
-    Post.transaction do
-      pc =
-        PostCreator.new(
-          Discourse.system_user,
-          raw: raw,
-          # we must skip these because the posts are created in a big transaction,
-          # we do them all at the end instead
-          skip_jobs: true,
-          # we do not want to be sending out notifications etc. from this
-          # automatic background process
-          import_mode: true,
-          # don't want to be stopped by watched word or post length validations
-          skip_validations: true,
-          topic_id: chat_channel_archive.destination_topic_id,
-        )
-
-      pc.create
-
-      # so we can also delete chat messages in the same transaction
-      yield if block_given?
-    end
-    pc.enqueue_jobs
-  end
-
-  def ensure_destination_topic_exists!
-    if !chat_channel_archive.destination_topic.present?
-      Rails.logger.info("Creating topic for #{chat_channel_title} archive.")
-      Topic.transaction do
-        topic_creator =
-          TopicCreator.new(
-            Discourse.system_user,
-            Guardian.new(chat_channel_archive.archived_by),
-            {
-              title: chat_channel_archive.destination_topic_title,
-              category: chat_channel_archive.destination_category_id,
-              tags: chat_channel_archive.destination_tags,
-              import_mode: true,
-            },
-          )
-
-        if topic_creator.valid?
-          chat_channel_archive.update!(destination_topic: topic_creator.create)
-        else
-          Rails.logger.info("Destination topic for #{chat_channel_title} archive was not valid.")
-          notify_archiver(
-            :failed_no_topic,
-            error_message: topic_creator.errors.full_messages.join("\n"),
-          )
-        end
-      end
-
-      if chat_channel_archive.destination_topic.present?
-        Rails.logger.info("Creating first post for #{chat_channel_title} archive.")
-        create_post(
-          I18n.t(
-            "chat.channel.archive.first_post_raw",
-            channel_name: chat_channel_title,
-            channel_url: chat_channel.url,
-          ),
-        )
-      end
-    else
-      Rails.logger.info("Topic already exists for #{chat_channel_title} archive.")
-    end
-
-    if chat_channel_archive.destination_topic.present?
-      update_destination_topic_status
-      return true
-    end
-
-    false
-  end
-
-  def update_destination_topic_status
-    # We only want to do this when the destination topic is new, not an
-    # existing topic, because we don't want to update the status unexpectedly
-    # on an existing topic
-    if chat_channel_archive.new_topic?
-      if SiteSetting.chat_archive_destination_topic_status == "archived"
-        chat_channel_archive.destination_topic.update!(archived: true)
-      elsif SiteSetting.chat_archive_destination_topic_status == "closed"
-        chat_channel_archive.destination_topic.update!(closed: true)
-      end
-    end
-  end
-
-  def delete_message_batch(message_ids)
-    ChatMessage.transaction do
-      ChatMessage.where(id: message_ids).update_all(
-        deleted_at: DateTime.now,
-        deleted_by_id: chat_channel_archive.archived_by.id,
-      )
-
-      chat_channel_archive.update!(
-        archived_messages: chat_channel_archive.archived_messages + message_ids.length,
-      )
-    end
-
-    Rails.logger.info(
-      "Archived #{chat_channel_archive.archived_messages} messages for #{chat_channel_title} archive.",
-    )
-  end
-
-  def complete_archive
-    Rails.logger.info("Creating posts completed for #{chat_channel_title} archive.")
-    chat_channel.archived!(chat_channel_archive.archived_by)
-    notify_archiver(:success)
-  end
-
-  def notify_archiver(result, error_message: nil)
-    base_translation_params = {
-      channel_hashtag_or_name: channel_hashtag_or_name,
-      topic_title: chat_channel_archive.destination_topic&.title,
-      topic_url: chat_channel_archive.destination_topic&.url,
-      topic_validation_errors: result == :failed_no_topic ? error_message : nil,
-    }
-
-    if result == :failed || result == :failed_no_topic
-      Discourse.warn_exception(
-        error_message,
-        message: "Error when archiving chat channel #{chat_channel_title}.",
-        env: {
-          chat_channel_id: chat_channel.id,
-          chat_channel_name: chat_channel_title,
-        },
-      )
-      error_translation_params =
-        base_translation_params.merge(
-          channel_url: chat_channel.url,
-          messages_archived: chat_channel_archive.archived_messages,
-        )
-      chat_channel_archive.update(archive_error: error_message)
-      message_translation_key =
-        case result
-        when :failed
-          :chat_channel_archive_failed
-        when :failed_no_topic
-          :chat_channel_archive_failed_no_topic
-        end
-      SystemMessage.create_from_system_user(
-        chat_channel_archive.archived_by,
-        message_translation_key,
-        error_translation_params,
-      )
-    else
-      SystemMessage.create_from_system_user(
-        chat_channel_archive.archived_by,
-        :chat_channel_archive_complete,
-        base_translation_params,
-      )
-    end
-
-    ChatPublisher.publish_archive_status(
-      chat_channel,
-      archive_status: result != :success ? :failed : :success,
-      archived_messages: chat_channel_archive.archived_messages,
-      archive_topic_id: chat_channel_archive.destination_topic_id,
-      total_messages: chat_channel_archive.total_messages,
-    )
-  end
-
-  def kick_all_users
-    Chat::ChatChannelMembershipManager.new(chat_channel).unfollow_all_users
-  end
-
-  def channel_hashtag_or_name
-    if chat_channel.slug.present? && SiteSetting.enable_experimental_hashtag_autocomplete
-      return "##{chat_channel.slug}::channel"
-    end
-    chat_channel_title
-  end
-end
diff --git a/plugins/chat/lib/chat_channel_fetcher.rb b/plugins/chat/lib/chat_channel_fetcher.rb
deleted file mode 100644
index 028e0f3643e..00000000000
--- a/plugins/chat/lib/chat_channel_fetcher.rb
+++ /dev/null
@@ -1,257 +0,0 @@
-# frozen_string_literal: true
-
-module Chat::ChatChannelFetcher
-  MAX_PUBLIC_CHANNEL_RESULTS = 50
-
-  def self.structured(guardian)
-    memberships = Chat::ChatChannelMembershipManager.all_for_user(guardian.user)
-    {
-      public_channels:
-        secured_public_channels(guardian, memberships, status: :open, following: true),
-      direct_message_channels:
-        secured_direct_message_channels(guardian.user.id, memberships, guardian),
-      memberships: memberships,
-    }
-  end
-
-  def self.all_secured_channel_ids(guardian, following: true)
-    allowed_channel_ids_sql = generate_allowed_channel_ids_sql(guardian)
-
-    return DB.query_single(allowed_channel_ids_sql) if !following
-
-    DB.query_single(<<~SQL, user_id: guardian.user.id)
-      SELECT chat_channel_id
-      FROM user_chat_channel_memberships
-      WHERE user_chat_channel_memberships.user_id = :user_id
-      AND user_chat_channel_memberships.chat_channel_id IN (
-        #{allowed_channel_ids_sql}
-      )
-    SQL
-  end
-
-  def self.generate_allowed_channel_ids_sql(guardian, exclude_dm_channels: false)
-    category_channel_sql =
-      Category
-        .post_create_allowed(guardian)
-        .joins(
-          "INNER JOIN chat_channels ON chat_channels.chatable_id = categories.id AND chat_channels.chatable_type = 'Category'",
-        )
-        .select("chat_channels.id")
-        .to_sql
-    dm_channel_sql = ""
-    if !exclude_dm_channels
-      dm_channel_sql = <<~SQL
-      UNION
-
-      -- secured direct message chat channels
-      #{
-        ChatChannel
-          .select(:id)
-          .joins(
-            "INNER JOIN direct_message_channels ON direct_message_channels.id = chat_channels.chatable_id
-            AND chat_channels.chatable_type = 'DirectMessage'
-        INNER JOIN direct_message_users ON direct_message_users.direct_message_channel_id = direct_message_channels.id",
-          )
-          .where("direct_message_users.user_id = :user_id", user_id: guardian.user.id)
-          .to_sql
-      }
-      SQL
-    end
-
-    <<~SQL
-      -- secured category chat channels
-      #{category_channel_sql}
-      #{dm_channel_sql}
-    SQL
-  end
-
-  def self.secured_public_channel_slug_lookup(guardian, slugs)
-    allowed_channel_ids = generate_allowed_channel_ids_sql(guardian, exclude_dm_channels: true)
-
-    ChatChannel
-      .joins(
-        "LEFT JOIN categories ON categories.id = chat_channels.chatable_id AND chat_channels.chatable_type = 'Category'",
-      )
-      .where(chatable_type: ChatChannel.public_channel_chatable_types)
-      .where("chat_channels.id IN (#{allowed_channel_ids})")
-      .where("chat_channels.slug IN (:slugs)", slugs: slugs)
-      .limit(1)
-  end
-
-  def self.secured_public_channel_search(guardian, options = {})
-    allowed_channel_ids = generate_allowed_channel_ids_sql(guardian, exclude_dm_channels: true)
-
-    channels = ChatChannel.includes(chatable: [:topic_only_relative_url])
-    channels = channels.includes(:chat_channel_archive) if options[:include_archives]
-
-    channels =
-      channels
-        .joins(
-          "LEFT JOIN categories ON categories.id = chat_channels.chatable_id AND chat_channels.chatable_type = 'Category'",
-        )
-        .where(chatable_type: ChatChannel.public_channel_chatable_types)
-        .where("chat_channels.id IN (#{allowed_channel_ids})")
-
-    channels = channels.where(status: options[:status]) if options[:status].present?
-
-    if options[:filter].present?
-      category_filter =
-        (options[:filter_on_category_name] ? "OR categories.name ILIKE :filter" : "")
-
-      sql =
-        "chat_channels.name ILIKE :filter OR chat_channels.slug ILIKE :filter #{category_filter}"
-      if options[:match_filter_on_starts_with]
-        filter_sql = "#{options[:filter].downcase}%"
-      else
-        filter_sql = "%#{options[:filter].downcase}%"
-      end
-
-      channels =
-        channels.where(sql, filter: filter_sql).order("chat_channels.name ASC, categories.name ASC")
-    end
-
-    if options.key?(:slugs)
-      channels = channels.where("chat_channels.slug IN (:slugs)", slugs: options[:slugs])
-    end
-
-    if options.key?(:following)
-      if options[:following]
-        channels =
-          channels.joins(:user_chat_channel_memberships).where(
-            user_chat_channel_memberships: {
-              user_id: guardian.user.id,
-              following: true,
-            },
-          )
-      else
-        channels =
-          channels.where(
-            "chat_channels.id NOT IN (SELECT chat_channel_id FROM user_chat_channel_memberships uccm WHERE uccm.chat_channel_id = chat_channels.id AND following IS TRUE AND user_id = ?)",
-            guardian.user.id,
-          )
-      end
-    end
-
-    options[:limit] = (options[:limit] || MAX_PUBLIC_CHANNEL_RESULTS).to_i.clamp(
-      1,
-      MAX_PUBLIC_CHANNEL_RESULTS,
-    )
-    options[:offset] = [options[:offset].to_i, 0].max
-
-    channels.limit(options[:limit]).offset(options[:offset])
-  end
-
-  def self.secured_public_channels(guardian, memberships, options = { following: true })
-    channels =
-      secured_public_channel_search(
-        guardian,
-        options.merge(include_archives: true, filter_on_category_name: true),
-      )
-
-    decorate_memberships_with_tracking_data(guardian, channels, memberships)
-    channels = channels.to_a
-    preload_custom_fields_for(channels)
-    channels
-  end
-
-  def self.preload_custom_fields_for(channels)
-    preload_fields = Category.instance_variable_get(:@custom_field_types).keys
-    Category.preload_custom_fields(
-      channels.select { |c| c.chatable_type == "Category" }.map(&:chatable),
-      preload_fields,
-    )
-  end
-
-  def self.secured_direct_message_channels(user_id, memberships, guardian)
-    query = ChatChannel.includes(chatable: [{ direct_message_users: :user }, :users])
-    query = query.includes(chatable: [{ users: :user_status }]) if SiteSetting.enable_user_status
-
-    channels =
-      query
-        .joins(:user_chat_channel_memberships)
-        .where(user_chat_channel_memberships: { user_id: user_id, following: true })
-        .where(chatable_type: "DirectMessage")
-        .where("chat_channels.id IN (#{generate_allowed_channel_ids_sql(guardian)})")
-        .order(last_message_sent_at: :desc)
-        .to_a
-
-    preload_fields =
-      User.allowed_user_custom_fields(guardian) +
-        UserField.all.pluck(:id).map { |fid| "#{User::USER_FIELD_PREFIX}#{fid}" }
-    User.preload_custom_fields(channels.map { |c| c.chatable.users }.flatten, preload_fields)
-
-    decorate_memberships_with_tracking_data(guardian, channels, memberships)
-  end
-
-  def self.decorate_memberships_with_tracking_data(guardian, channels, memberships)
-    unread_counts_per_channel = unread_counts(channels, guardian.user.id)
-
-    mention_notifications =
-      Notification.unread.where(
-        user_id: guardian.user.id,
-        notification_type: Notification.types[:chat_mention],
-      )
-    mention_notification_data = mention_notifications.map { |m| JSON.parse(m.data) }
-
-    channels.each do |channel|
-      membership = memberships.find { |m| m.chat_channel_id == channel.id }
-
-      if membership
-        membership.unread_mentions =
-          mention_notification_data.count do |data|
-            data["chat_channel_id"] == channel.id &&
-              data["chat_message_id"] > (membership.last_read_message_id || 0)
-          end
-
-        membership.unread_count = unread_counts_per_channel[channel.id] if !membership.muted
-      end
-    end
-  end
-
-  def self.unread_counts(channels, user_id)
-    unread_counts = DB.query_array(<<~SQL, channel_ids: channels.map(&:id), user_id: user_id).to_h
-      SELECT cc.id, COUNT(*) as count
-      FROM chat_messages cm
-      JOIN chat_channels cc ON cc.id = cm.chat_channel_id
-      JOIN user_chat_channel_memberships uccm ON uccm.chat_channel_id = cc.id
-      WHERE cc.id IN (:channel_ids)
-        AND cm.user_id != :user_id
-        AND uccm.user_id = :user_id
-        AND cm.id > COALESCE(uccm.last_read_message_id, 0)
-        AND cm.deleted_at IS NULL
-      GROUP BY cc.id
-    SQL
-    unread_counts.default = 0
-    unread_counts
-  end
-
-  def self.find_with_access_check(channel_id_or_name, guardian)
-    begin
-      channel_id_or_name = Integer(channel_id_or_name)
-    rescue ArgumentError
-    end
-
-    base_channel_relation =
-      ChatChannel.includes(:chatable).joins(
-        "LEFT JOIN categories ON categories.id = chat_channels.chatable_id AND chat_channels.chatable_type = 'Category'",
-      )
-
-    if guardian.user.staff?
-      base_channel_relation = base_channel_relation.includes(:chat_channel_archive)
-    end
-
-    if channel_id_or_name.is_a? Integer
-      chat_channel = base_channel_relation.find_by(id: channel_id_or_name)
-    else
-      chat_channel =
-        base_channel_relation.find_by(
-          "LOWER(categories.name) = :name OR LOWER(chat_channels.name) = :name",
-          name: channel_id_or_name.downcase,
-        )
-    end
-
-    raise Discourse::NotFound if chat_channel.blank?
-    raise Discourse::InvalidAccess if !guardian.can_join_chat_channel?(chat_channel)
-    chat_channel
-  end
-end
diff --git a/plugins/chat/lib/chat_channel_hashtag_data_source.rb b/plugins/chat/lib/chat_channel_hashtag_data_source.rb
deleted file mode 100644
index 5c4e31cd867..00000000000
--- a/plugins/chat/lib/chat_channel_hashtag_data_source.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-# frozen_string_literal: true
-
-class Chat::ChatChannelHashtagDataSource
-  def self.icon
-    "comment"
-  end
-
-  def self.type
-    "channel"
-  end
-
-  def self.channel_to_hashtag_item(guardian, channel)
-    HashtagAutocompleteService::HashtagItem.new.tap do |item|
-      item.text = channel.title
-      item.description = channel.description
-      item.slug = channel.slug
-      item.icon = icon
-      item.relative_url = channel.relative_url
-      item.type = "channel"
-    end
-  end
-
-  def self.lookup(guardian, slugs)
-    if SiteSetting.enable_experimental_hashtag_autocomplete
-      return [] if !guardian.can_chat?
-      Chat::ChatChannelFetcher
-        .secured_public_channel_slug_lookup(guardian, slugs)
-        .map { |channel| channel_to_hashtag_item(guardian, channel) }
-    else
-      []
-    end
-  end
-
-  def self.search(
-    guardian,
-    term,
-    limit,
-    condition = HashtagAutocompleteService.search_conditions[:contains]
-  )
-    if SiteSetting.enable_experimental_hashtag_autocomplete
-      return [] if !guardian.can_chat?
-      Chat::ChatChannelFetcher
-        .secured_public_channel_search(
-          guardian,
-          filter: term,
-          limit: limit,
-          exclude_dm_channels: true,
-          match_filter_on_starts_with:
-            condition == HashtagAutocompleteService.search_conditions[:starts_with],
-        )
-        .map { |channel| channel_to_hashtag_item(guardian, channel) }
-    else
-      []
-    end
-  end
-
-  def self.search_sort(search_results, _)
-    search_results.sort_by { |result| result.text.downcase }
-  end
-
-  def self.search_without_term(guardian, limit)
-    if SiteSetting.enable_experimental_hashtag_autocomplete
-      return [] if !guardian.can_chat?
-      allowed_channel_ids_sql =
-        Chat::ChatChannelFetcher.generate_allowed_channel_ids_sql(
-          guardian,
-          exclude_dm_channels: true,
-        )
-      ChatChannel
-        .joins(
-          "INNER JOIN user_chat_channel_memberships
-            ON user_chat_channel_memberships.chat_channel_id = chat_channels.id
-            AND user_chat_channel_memberships.user_id = #{guardian.user.id}
-            AND user_chat_channel_memberships.following = true",
-        )
-        .where("chat_channels.id IN (#{allowed_channel_ids_sql})")
-        .order(messages_count: :desc)
-        .limit(limit)
-        .map { |channel| channel_to_hashtag_item(guardian, channel) }
-    else
-      []
-    end
-  end
-end
diff --git a/plugins/chat/lib/chat_channel_membership_manager.rb b/plugins/chat/lib/chat_channel_membership_manager.rb
deleted file mode 100644
index 5947f23d7a4..00000000000
--- a/plugins/chat/lib/chat_channel_membership_manager.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-# frozen_string_literal: true
-
-class Chat::ChatChannelMembershipManager
-  def self.all_for_user(user)
-    UserChatChannelMembership.where(user: user)
-  end
-
-  attr_reader :channel
-
-  def initialize(channel)
-    @channel = channel
-  end
-
-  def find_for_user(user, following: nil)
-    params = { user_id: user.id, chat_channel_id: channel.id }
-    params[:following] = following if following.present?
-
-    UserChatChannelMembership.includes(:user, :chat_channel).find_by(params)
-  end
-
-  def follow(user)
-    membership =
-      find_for_user(user) ||
-        UserChatChannelMembership.new(user: user, chat_channel: channel, following: true)
-
-    ActiveRecord::Base.transaction do
-      if membership.new_record?
-        membership.save!
-        recalculate_user_count
-      elsif !membership.following
-        membership.update!(following: true)
-        recalculate_user_count
-      end
-    end
-
-    membership
-  end
-
-  def unfollow(user)
-    membership = find_for_user(user)
-
-    return if membership.blank?
-
-    ActiveRecord::Base.transaction do
-      if membership.following
-        membership.update!(following: false)
-        recalculate_user_count
-      end
-    end
-
-    membership
-  end
-
-  def recalculate_user_count
-    return if ChatChannel.exists?(id: channel.id, user_count_stale: true)
-    channel.update!(user_count_stale: true)
-    Jobs.enqueue_in(3.seconds, :update_channel_user_count, chat_channel_id: channel.id)
-  end
-
-  def unfollow_all_users
-    UserChatChannelMembership.where(chat_channel: channel).update_all(
-      following: false,
-      last_read_message_id: channel.chat_messages.last&.id,
-    )
-  end
-
-  def enforce_automatic_channel_memberships
-    Jobs.enqueue(:auto_manage_channel_memberships, chat_channel_id: channel.id)
-  end
-
-  def enforce_automatic_user_membership(user)
-    Jobs.enqueue(
-      :auto_join_channel_batch,
-      chat_channel_id: channel.id,
-      starts_at: user.id,
-      ends_at: user.id,
-    )
-  end
-end
diff --git a/plugins/chat/lib/chat_mailer.rb b/plugins/chat/lib/chat_mailer.rb
deleted file mode 100644
index 7600a25fe4c..00000000000
--- a/plugins/chat/lib/chat_mailer.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-# frozen_string_literal: true
-
-class Chat::ChatMailer
-  def self.send_unread_mentions_summary
-    return unless SiteSetting.chat_enabled
-
-    users_with_unprocessed_unread_mentions.find_each do |user|
-      # user#memberships_with_unread_messages is a nested array that looks like [[membership_id, unread_message_id]]
-      # Find the max unread id per membership.
-      membership_and_max_unread_mention_ids =
-        user
-          .memberships_with_unread_messages
-          .group_by { |memberships| memberships[0] }
-          .transform_values do |membership_and_msg_ids|
-            membership_and_msg_ids.max_by { |membership, msg| msg }
-          end
-          .values
-
-      Jobs.enqueue(
-        :user_email,
-        type: "chat_summary",
-        user_id: user.id,
-        force_respect_seen_recently: true,
-        memberships_to_update_data: membership_and_max_unread_mention_ids,
-      )
-    end
-  end
-
-  private
-
-  def self.users_with_unprocessed_unread_mentions
-    when_away_frequency = UserOption.chat_email_frequencies[:when_away]
-    allowed_group_ids = Chat.allowed_group_ids
-
-    users =
-      User
-        .joins(:user_option)
-        .where(user_options: { chat_enabled: true, chat_email_frequency: when_away_frequency })
-        .where("users.last_seen_at < ?", 15.minutes.ago)
-
-    if !allowed_group_ids.include?(Group::AUTO_GROUPS[:everyone])
-      users = users.joins(:groups).where(groups: { id: allowed_group_ids })
-    end
-
-    users
-      .select("users.id", "ARRAY_AGG(ARRAY[uccm.id, c_msg.id]) AS memberships_with_unread_messages")
-      .joins("INNER JOIN user_chat_channel_memberships uccm ON uccm.user_id = users.id")
-      .joins("INNER JOIN chat_channels cc ON cc.id = uccm.chat_channel_id")
-      .joins("INNER JOIN chat_messages c_msg ON c_msg.chat_channel_id = uccm.chat_channel_id")
-      .joins("LEFT OUTER JOIN chat_mentions c_mentions ON c_mentions.chat_message_id = c_msg.id")
-      .where("c_msg.deleted_at IS NULL AND c_msg.user_id <> users.id")
-      .where("c_msg.created_at > ?", 1.week.ago)
-      .where(<<~SQL)
-        (uccm.last_read_message_id IS NULL OR c_msg.id > uccm.last_read_message_id) AND
-        (uccm.last_unread_mention_when_emailed_id IS NULL OR c_msg.id > uccm.last_unread_mention_when_emailed_id) AND
-        (
-          (uccm.user_id = c_mentions.user_id AND uccm.following IS true AND cc.chatable_type = 'Category') OR
-          (cc.chatable_type = 'DirectMessage')
-        )
-      SQL
-      .group("users.id, uccm.user_id")
-  end
-end
diff --git a/plugins/chat/lib/chat_message_bookmarkable.rb b/plugins/chat/lib/chat_message_bookmarkable.rb
deleted file mode 100644
index 09353508701..00000000000
--- a/plugins/chat/lib/chat_message_bookmarkable.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-# frozen_string_literal: true
-
-class ChatMessageBookmarkable < BaseBookmarkable
-  def self.model
-    ChatMessage
-  end
-
-  def self.serializer
-    UserChatMessageBookmarkSerializer
-  end
-
-  def self.preload_associations
-    [:chat_channel]
-  end
-
-  def self.list_query(user, guardian)
-    accessible_channel_ids = Chat::ChatChannelFetcher.all_secured_channel_ids(guardian)
-    return if accessible_channel_ids.empty?
-    user
-      .bookmarks_of_type("ChatMessage")
-      .joins(
-        "INNER JOIN chat_messages ON chat_messages.id = bookmarks.bookmarkable_id
-          AND chat_messages.deleted_at IS NULL
-          AND bookmarks.bookmarkable_type = 'ChatMessage'",
-      )
-      .where("chat_messages.chat_channel_id IN (?)", accessible_channel_ids)
-  end
-
-  def self.search_query(bookmarks, query, ts_query, &bookmarkable_search)
-    bookmarkable_search.call(bookmarks, "chat_messages.message ILIKE :q")
-  end
-
-  def self.validate_before_create(guardian, bookmarkable)
-    if bookmarkable.blank? || !guardian.can_join_chat_channel?(bookmarkable.chat_channel)
-      raise Discourse::InvalidAccess
-    end
-  end
-
-  def self.reminder_handler(bookmark)
-    send_reminder_notification(
-      bookmark,
-      data: {
-        title:
-          I18n.t(
-            "chat.bookmarkable.notification_title",
-            channel_name: bookmark.bookmarkable.chat_channel.title(bookmark.user),
-          ),
-        bookmarkable_url: bookmark.bookmarkable.url,
-      },
-    )
-  end
-
-  def self.reminder_conditions(bookmark)
-    bookmark.bookmarkable.present? && bookmark.bookmarkable.chat_channel.present?
-  end
-
-  def self.can_see?(guardian, bookmark)
-    guardian.can_join_chat_channel?(bookmark.bookmarkable.chat_channel)
-  end
-
-  def self.cleanup_deleted
-    DB.query(<<~SQL, grace_time: 3.days.ago)
-      DELETE FROM bookmarks b
-      USING chat_messages cm
-      WHERE b.bookmarkable_id = cm.id AND b.bookmarkable_type = 'ChatMessage'
-      AND (cm.deleted_at < :grace_time)
-    SQL
-  end
-end
diff --git a/plugins/chat/lib/chat_message_creator.rb b/plugins/chat/lib/chat_message_creator.rb
deleted file mode 100644
index fe7fed04599..00000000000
--- a/plugins/chat/lib/chat_message_creator.rb
+++ /dev/null
@@ -1,104 +0,0 @@
-# frozen_string_literal: true
-class Chat::ChatMessageCreator
-  attr_reader :error, :chat_message
-
-  def self.create(opts)
-    instance = new(**opts)
-    instance.create
-    instance
-  end
-
-  def initialize(
-    chat_channel:,
-    in_reply_to_id: nil,
-    user:,
-    content:,
-    staged_id: nil,
-    incoming_chat_webhook: nil,
-    upload_ids: nil
-  )
-    @chat_channel = chat_channel
-    @user = user
-    @guardian = Guardian.new(user)
-    @in_reply_to_id = in_reply_to_id
-    @content = content
-    @staged_id = staged_id
-    @incoming_chat_webhook = incoming_chat_webhook
-    @upload_ids = upload_ids || []
-    @error = nil
-
-    @chat_message =
-      ChatMessage.new(
-        chat_channel: @chat_channel,
-        user_id: @user.id,
-        last_editor_id: @user.id,
-        in_reply_to_id: @in_reply_to_id,
-        message: @content,
-      )
-  end
-
-  def create
-    begin
-      validate_channel_status!
-      uploads = get_uploads
-      validate_message!(has_uploads: uploads.any?)
-      @chat_message.cook
-      @chat_message.save!
-      create_chat_webhook_event
-      @chat_message.attach_uploads(uploads)
-      ChatDraft.where(user_id: @user.id, chat_channel_id: @chat_channel.id).destroy_all
-      ChatPublisher.publish_new!(@chat_channel, @chat_message, @staged_id)
-      Jobs.enqueue(:process_chat_message, { chat_message_id: @chat_message.id })
-      Chat::ChatNotifier.notify_new(
-        chat_message: @chat_message,
-        timestamp: @chat_message.created_at,
-      )
-      @chat_channel.touch(:last_message_sent_at)
-      DiscourseEvent.trigger(:chat_message_created, @chat_message, @chat_channel, @user)
-    rescue => error
-      @error = error
-    end
-  end
-
-  def failed?
-    @error.present?
-  end
-
-  private
-
-  def validate_channel_status!
-    return if @guardian.can_create_channel_message?(@chat_channel)
-
-    if @chat_channel.direct_message_channel? && !@guardian.can_create_direct_message?
-      raise StandardError.new(I18n.t("chat.errors.user_cannot_send_direct_messages"))
-    else
-      raise StandardError.new(
-              I18n.t(
-                "chat.errors.channel_new_message_disallowed",
-                status: @chat_channel.status_name,
-              ),
-            )
-    end
-  end
-
-  def validate_message!(has_uploads:)
-    @chat_message.validate_message(has_uploads: has_uploads)
-    if @chat_message.errors.present?
-      raise StandardError.new(@chat_message.errors.map(&:full_message).join(", "))
-    end
-  end
-
-  def create_chat_webhook_event
-    return if @incoming_chat_webhook.blank?
-    ChatWebhookEvent.create(
-      chat_message: @chat_message,
-      incoming_chat_webhook: @incoming_chat_webhook,
-    )
-  end
-
-  def get_uploads
-    return [] if @upload_ids.blank? || !SiteSetting.chat_allow_uploads
-
-    Upload.where(id: @upload_ids, user_id: @user.id)
-  end
-end
diff --git a/plugins/chat/lib/chat_message_processor.rb b/plugins/chat/lib/chat_message_processor.rb
deleted file mode 100644
index bf2a621d920..00000000000
--- a/plugins/chat/lib/chat_message_processor.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-class Chat::ChatMessageProcessor
-  include ::CookedProcessorMixin
-
-  def initialize(chat_message)
-    @model = chat_message
-    @previous_cooked = (chat_message.cooked || "").dup
-    @with_secure_uploads = false
-    @size_cache = {}
-    @opts = {}
-
-    cooked = ChatMessage.cook(chat_message.message, user_id: chat_message.last_editor_id)
-    @doc = Loofah.fragment(cooked)
-  end
-
-  def run!
-    post_process_oneboxes
-    DiscourseEvent.trigger(:chat_message_processed, @doc, @model)
-  end
-
-  def large_images
-    []
-  end
-
-  def broken_images
-    []
-  end
-
-  def downloaded_images
-    {}
-  end
-end
diff --git a/plugins/chat/lib/chat_message_rate_limiter.rb b/plugins/chat/lib/chat_message_rate_limiter.rb
deleted file mode 100644
index 9f205098e7b..00000000000
--- a/plugins/chat/lib/chat_message_rate_limiter.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-class Chat::ChatMessageRateLimiter
-  def self.run!(user)
-    instance = self.new(user)
-    instance.run!
-  end
-
-  def initialize(user)
-    @user = user
-  end
-
-  def run!
-    return if @user.staff?
-
-    allowed_message_count =
-      (
-        if @user.trust_level == TrustLevel[0]
-          SiteSetting.chat_allowed_messages_for_trust_level_0
-        else
-          SiteSetting.chat_allowed_messages_for_other_trust_levels
-        end
-      )
-    return if allowed_message_count.zero?
-
-    @rate_limiter = RateLimiter.new(@user, "create_chat_message", allowed_message_count, 30.seconds)
-    silence_user if @rate_limiter.remaining.zero?
-    @rate_limiter.performed!
-  end
-
-  def clear!
-    # Used only for testing. Need to clear the rate limiter between tests.
-    @rate_limiter.clear! if defined?(@rate_limiter)
-  end
-
-  private
-
-  def silence_user
-    silenced_for_minutes = SiteSetting.chat_auto_silence_duration
-    return unless silenced_for_minutes > 0
-
-    UserSilencer.silence(
-      @user,
-      Discourse.system_user,
-      silenced_till: silenced_for_minutes.minutes.from_now,
-      reason: I18n.t("chat.errors.rate_limit_exceeded"),
-    )
-  end
-end
diff --git a/plugins/chat/lib/chat_message_reactor.rb b/plugins/chat/lib/chat_message_reactor.rb
deleted file mode 100644
index 9e7260f7979..00000000000
--- a/plugins/chat/lib/chat_message_reactor.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-# frozen_string_literal: true
-
-class Chat::ChatMessageReactor
-  ADD_REACTION = :add
-  REMOVE_REACTION = :remove
-  MAX_REACTIONS_LIMIT = 30
-
-  def initialize(user, chat_channel)
-    @user = user
-    @chat_channel = chat_channel
-    @guardian = Guardian.new(user)
-  end
-
-  def react!(message_id:, react_action:, emoji:)
-    @guardian.ensure_can_join_chat_channel!(@chat_channel)
-    @guardian.ensure_can_react!
-    validate_channel_status!
-    validate_reaction!(react_action, emoji)
-    message = ensure_chat_message!(message_id)
-    validate_max_reactions!(message, react_action, emoji)
-
-    reaction = nil
-    ActiveRecord::Base.transaction do
-      enforce_channel_membership!
-      reaction = create_reaction(message, react_action, emoji)
-    end
-
-    publish_reaction(message, react_action, emoji)
-
-    reaction
-  end
-
-  private
-
-  def ensure_chat_message!(message_id)
-    message = ChatMessage.find_by(id: message_id, chat_channel: @chat_channel)
-    raise Discourse::NotFound unless message
-    message
-  end
-
-  def validate_reaction!(react_action, emoji)
-    if ![ADD_REACTION, REMOVE_REACTION].include?(react_action) || !Emoji.exists?(emoji)
-      raise Discourse::InvalidParameters
-    end
-  end
-
-  def enforce_channel_membership!
-    Chat::ChatChannelMembershipManager.new(@chat_channel).follow(@user)
-  end
-
-  def validate_channel_status!
-    return if @guardian.can_create_channel_message?(@chat_channel)
-    raise Discourse::InvalidAccess.new(
-            nil,
-            nil,
-            custom_message: "chat.errors.channel_modify_message_disallowed",
-            custom_message_params: {
-              status: @chat_channel.status_name,
-            },
-          )
-  end
-
-  def validate_max_reactions!(message, react_action, emoji)
-    if react_action == ADD_REACTION &&
-         message.reactions.count("DISTINCT emoji") >= MAX_REACTIONS_LIMIT &&
-         !message.reactions.exists?(emoji: emoji)
-      raise Discourse::InvalidAccess.new(
-              nil,
-              nil,
-              custom_message: "chat.errors.max_reactions_limit_reached",
-            )
-    end
-  end
-
-  def create_reaction(message, react_action, emoji)
-    if react_action == ADD_REACTION
-      message.reactions.find_or_create_by!(user: @user, emoji: emoji)
-    else
-      message.reactions.where(user: @user, emoji: emoji).destroy_all
-    end
-  end
-
-  def publish_reaction(message, react_action, emoji)
-    ChatPublisher.publish_reaction!(@chat_channel, message, react_action, @user, emoji)
-  end
-end
diff --git a/plugins/chat/lib/chat_message_updater.rb b/plugins/chat/lib/chat_message_updater.rb
deleted file mode 100644
index 04e8ae9372b..00000000000
--- a/plugins/chat/lib/chat_message_updater.rb
+++ /dev/null
@@ -1,97 +0,0 @@
-# frozen_string_literal: true
-
-class Chat::ChatMessageUpdater
-  attr_reader :error
-
-  def self.update(opts)
-    instance = new(**opts)
-    instance.update
-    instance
-  end
-
-  def initialize(guardian:, chat_message:, new_content:, upload_ids: nil)
-    @guardian = guardian
-    @user = guardian.user
-    @chat_message = chat_message
-    @old_message_content = chat_message.message
-    @chat_channel = @chat_message.chat_channel
-    @new_content = new_content
-    @upload_ids = upload_ids
-    @error = nil
-  end
-
-  def update
-    begin
-      validate_channel_status!
-      @guardian.ensure_can_edit_chat!(@chat_message)
-      @chat_message.message = @new_content
-      @chat_message.last_editor_id = @user.id
-      upload_info = get_upload_info
-      validate_message!(has_uploads: upload_info[:uploads].any?)
-      @chat_message.cook
-      @chat_message.save!
-      update_uploads(upload_info)
-      revision = save_revision!
-      @chat_message.reload
-      ChatPublisher.publish_edit!(@chat_channel, @chat_message)
-      Jobs.enqueue(:process_chat_message, { chat_message_id: @chat_message.id })
-      Chat::ChatNotifier.notify_edit(chat_message: @chat_message, timestamp: revision.created_at)
-      DiscourseEvent.trigger(:chat_message_edited, @chat_message, @chat_channel, @user)
-    rescue => error
-      @error = error
-    end
-  end
-
-  def failed?
-    @error.present?
-  end
-
-  private
-
-  def validate_channel_status!
-    return if @guardian.can_modify_channel_message?(@chat_channel)
-    raise StandardError.new(
-            I18n.t(
-              "chat.errors.channel_modify_message_disallowed",
-              status: @chat_channel.status_name,
-            ),
-          )
-  end
-
-  def validate_message!(has_uploads:)
-    @chat_message.validate_message(has_uploads: has_uploads)
-    if @chat_message.errors.present?
-      raise StandardError.new(@chat_message.errors.map(&:full_message).join(", "))
-    end
-  end
-
-  def get_upload_info
-    return { uploads: [] } if @upload_ids.nil? || !SiteSetting.chat_allow_uploads
-
-    uploads = Upload.where(id: @upload_ids, user_id: @user.id)
-    if uploads.count != @upload_ids.count
-      # User is passing upload_ids for uploads that they don't own. Don't change anything.
-      return { uploads: @chat_message.uploads, changed: false }
-    end
-
-    new_upload_ids = uploads.map(&:id)
-    existing_upload_ids = @chat_message.upload_ids
-    difference = (existing_upload_ids + new_upload_ids) - (existing_upload_ids & new_upload_ids)
-    { uploads: uploads, changed: difference.any? }
-  end
-
-  def update_uploads(upload_info)
-    return unless upload_info[:changed]
-
-    ChatUpload.where(chat_message: @chat_message).destroy_all
-    @chat_message.attach_uploads(upload_info[:uploads])
-  end
-
-  def save_revision!
-    @chat_message.revisions.create!(
-      old_message: @old_message_content,
-      new_message: @chat_message.message,
-      user_id: @user.id,
-    )
-  end
-end
diff --git a/plugins/chat/lib/chat_notifier.rb b/plugins/chat/lib/chat_notifier.rb
deleted file mode 100644
index 017aa1b3200..00000000000
--- a/plugins/chat/lib/chat_notifier.rb
+++ /dev/null
@@ -1,359 +0,0 @@
-# frozen_string_literal: true
-
-##
-# When we are attempting to notify users based on a message we have to take
-# into account the following:
-#
-# * Individual user mentions like @alfred
-# * Group mentions that include N users such as @support
-# * Global @here and @all mentions
-# * Users watching the channel via UserChatChannelMembership
-#
-# For various reasons a mention may not notify a user:
-#
-# * The target user of the mention is ignoring or muting the user who created the message
-# * The target user either cannot chat or cannot see the chat channel, in which case
-#   they are defined as `unreachable`
-# * The target user is not a member of the channel, in which case they are defined
-#   as `welcome_to_join`
-# * In the case of global @here and @all mentions users with the preference
-#   `ignore_channel_wide_mention` set to true will not be notified
-#
-# For any users that fall under the `unreachable` or `welcome_to_join` umbrellas
-# we send a MessageBus message to the UI and to inform the creating user. The
-# creating user can invite any `welcome_to_join` users to the channel. Target
-# users who are ignoring or muting the creating user _do not_ fall into this bucket.
-#
-# The ignore/mute filtering is also applied via the ChatNotifyWatching job,
-# which prevents desktop / push notifications being sent.
-class Chat::ChatNotifier
-  class << self
-    def user_has_seen_message?(membership, chat_message_id)
-      (membership.last_read_message_id || 0) >= chat_message_id
-    end
-
-    def push_notification_tag(type, chat_channel_id)
-      "#{Discourse.current_hostname}-chat-#{type}-#{chat_channel_id}"
-    end
-
-    def notify_edit(chat_message:, timestamp:)
-      Jobs.enqueue(
-        :send_message_notifications,
-        chat_message_id: chat_message.id,
-        timestamp: timestamp.iso8601(6),
-        reason: :edit,
-      )
-    end
-
-    def notify_new(chat_message:, timestamp:)
-      Jobs.enqueue(
-        :send_message_notifications,
-        chat_message_id: chat_message.id,
-        timestamp: timestamp.iso8601(6),
-        reason: :new,
-      )
-    end
-  end
-
-  def initialize(chat_message, timestamp)
-    @chat_message = chat_message
-    @timestamp = timestamp
-    @chat_channel = @chat_message.chat_channel
-    @user = @chat_message.user
-  end
-
-  ### Public API
-
-  def notify_new
-    to_notify = list_users_to_notify
-    mentioned_user_ids = to_notify.extract!(:all_mentioned_user_ids)[:all_mentioned_user_ids]
-
-    mentioned_user_ids.each do |member_id|
-      ChatPublisher.publish_new_mention(member_id, @chat_channel.id, @chat_message.id)
-    end
-
-    notify_creator_of_inaccessible_mentions(to_notify)
-
-    notify_mentioned_users(to_notify)
-    notify_watching_users(except: mentioned_user_ids << @user.id)
-
-    to_notify
-  end
-
-  def notify_edit
-    existing_notifications =
-      ChatMention.includes(:user, :notification).where(chat_message: @chat_message)
-    already_notified_user_ids = existing_notifications.map(&:user_id)
-
-    to_notify = list_users_to_notify
-    mentioned_user_ids = to_notify.extract!(:all_mentioned_user_ids)[:all_mentioned_user_ids]
-
-    needs_deletion = already_notified_user_ids - mentioned_user_ids
-    needs_deletion.each do |user_id|
-      chat_mention = existing_notifications.detect { |n| n.user_id == user_id }
-      chat_mention.notification.destroy!
-      chat_mention.destroy!
-    end
-
-    needs_notification_ids = mentioned_user_ids - already_notified_user_ids
-    return if needs_notification_ids.blank?
-
-    notify_creator_of_inaccessible_mentions(to_notify)
-
-    notify_mentioned_users(to_notify, already_notified_user_ids: already_notified_user_ids)
-
-    to_notify
-  end
-
-  private
-
-  def list_users_to_notify
-    direct_mentions_count = direct_mentions_from_cooked.length
-    group_mentions_count = group_name_mentions.length
-
-    skip_notifications =
-      (direct_mentions_count + group_mentions_count) > SiteSetting.max_mentions_per_chat_message
-
-    {}.tap do |to_notify|
-      # The order of these methods is the precedence
-      # between different mention types.
-
-      already_covered_ids = []
-
-      expand_direct_mentions(to_notify, already_covered_ids, skip_notifications)
-      expand_group_mentions(to_notify, already_covered_ids, skip_notifications)
-      expand_here_mention(to_notify, already_covered_ids, skip_notifications)
-      expand_global_mention(to_notify, already_covered_ids, skip_notifications)
-
-      filter_users_ignoring_or_muting_creator(to_notify, already_covered_ids)
-
-      to_notify[:all_mentioned_user_ids] = already_covered_ids
-    end
-  end
-
-  def chat_users
-    User
-      .includes(:user_chat_channel_memberships, :group_users)
-      .distinct
-      .joins("LEFT OUTER JOIN user_chat_channel_memberships uccm ON uccm.user_id = users.id")
-      .joins(:user_option)
-      .real
-      .not_suspended
-      .where(user_options: { chat_enabled: true })
-      .where.not(username_lower: @user.username.downcase)
-  end
-
-  def rest_of_the_channel
-    chat_users.where(
-      user_chat_channel_memberships: {
-        following: true,
-        chat_channel_id: @chat_channel.id,
-      },
-    )
-  end
-
-  def members_accepting_channel_wide_notifications
-    rest_of_the_channel.where(user_options: { ignore_channel_wide_mention: [false, nil] })
-  end
-
-  def direct_mentions_from_cooked
-    @direct_mentions_from_cooked ||=
-      Nokogiri::HTML5.fragment(@chat_message.cooked).css(".mention").map(&:text)
-  end
-
-  def normalized_mentions(mentions)
-    mentions.reduce([]) do |memo, mention|
-      %w[@here @all].include?(mention.downcase) ? memo : (memo << mention[1..-1].downcase)
-    end
-  end
-
-  def expand_global_mention(to_notify, already_covered_ids, skip)
-    typed_global_mention = direct_mentions_from_cooked.include?("@all")
-
-    if typed_global_mention && @chat_channel.allow_channel_wide_mentions && !skip
-      to_notify[:global_mentions] = members_accepting_channel_wide_notifications
-        .where.not(username_lower: normalized_mentions(direct_mentions_from_cooked))
-        .where.not(id: already_covered_ids)
-        .pluck(:id)
-
-      already_covered_ids.concat(to_notify[:global_mentions])
-    else
-      to_notify[:global_mentions] = []
-    end
-  end
-
-  def expand_here_mention(to_notify, already_covered_ids, skip)
-    typed_here_mention = direct_mentions_from_cooked.include?("@here")
-
-    if typed_here_mention && @chat_channel.allow_channel_wide_mentions && !skip
-      to_notify[:here_mentions] = members_accepting_channel_wide_notifications
-        .where("last_seen_at > ?", 5.minutes.ago)
-        .where.not(username_lower: normalized_mentions(direct_mentions_from_cooked))
-        .where.not(id: already_covered_ids)
-        .pluck(:id)
-
-      already_covered_ids.concat(to_notify[:here_mentions])
-    else
-      to_notify[:here_mentions] = []
-    end
-  end
-
-  def group_users_to_notify(users)
-    potential_participants, unreachable =
-      users.partition do |user|
-        guardian = Guardian.new(user)
-        guardian.can_chat? && guardian.can_join_chat_channel?(@chat_channel)
-      end
-
-    participants, welcome_to_join =
-      potential_participants.partition do |participant|
-        participant.user_chat_channel_memberships.any? do |m|
-          predicate = m.chat_channel_id == @chat_channel.id
-          predicate = predicate && m.following == true if @chat_channel.public_channel?
-          predicate
-        end
-      end
-
-    {
-      already_participating: participants || [],
-      welcome_to_join: welcome_to_join || [],
-      unreachable: unreachable || [],
-    }
-  end
-
-  def expand_direct_mentions(to_notify, already_covered_ids, skip)
-    if skip
-      direct_mentions = []
-    else
-      direct_mentions =
-        chat_users
-          .where(username_lower: normalized_mentions(direct_mentions_from_cooked))
-          .where.not(id: already_covered_ids)
-    end
-
-    grouped = group_users_to_notify(direct_mentions)
-
-    to_notify[:direct_mentions] = grouped[:already_participating].map(&:id)
-    to_notify[:welcome_to_join] = grouped[:welcome_to_join]
-    to_notify[:unreachable] = grouped[:unreachable]
-    already_covered_ids.concat(to_notify[:direct_mentions])
-  end
-
-  def group_name_mentions
-    @group_mentions_from_cooked ||=
-      normalized_mentions(
-        Nokogiri::HTML5.fragment(@chat_message.cooked).css(".mention-group").map(&:text),
-      )
-  end
-
-  def visible_groups
-    @visible_groups ||= Group.where("LOWER(name) IN (?)", group_name_mentions).visible_groups(@user)
-  end
-
-  def expand_group_mentions(to_notify, already_covered_ids, skip)
-    return [] if skip || visible_groups.empty?
-
-    mentionable_groups =
-      Group.mentionable(@user, include_public: false).where(id: visible_groups.map(&:id))
-
-    mentions_disabled = visible_groups - mentionable_groups
-
-    too_many_members, mentionable =
-      mentionable_groups.partition do |group|
-        group.user_count > SiteSetting.max_users_notified_per_group_mention
-      end
-
-    to_notify[:group_mentions_disabled] = mentions_disabled
-    to_notify[:too_many_members] = too_many_members
-
-    mentionable.each { |g| to_notify[g.name.downcase] = [] }
-
-    reached_by_group =
-      chat_users
-        .includes(:groups)
-        .joins(:groups)
-        .where(groups: mentionable)
-        .where.not(id: already_covered_ids)
-
-    grouped = group_users_to_notify(reached_by_group)
-
-    grouped[:already_participating].each do |user|
-      # When a user is a member of multiple mentioned groups,
-      # the most far to the left should take precedence.
-      ordered_group_names = group_name_mentions & mentionable.map { |mg| mg.name.downcase }
-      user_group_names = user.groups.map { |ug| ug.name.downcase }
-      group_name = ordered_group_names.detect { |gn| user_group_names.include?(gn) }
-
-      to_notify[group_name] << user.id
-      already_covered_ids << user.id
-    end
-
-    to_notify[:welcome_to_join] = to_notify[:welcome_to_join].concat(grouped[:welcome_to_join])
-    to_notify[:unreachable] = to_notify[:unreachable].concat(grouped[:unreachable])
-  end
-
-  def notify_creator_of_inaccessible_mentions(to_notify)
-    inaccessible =
-      to_notify.extract!(
-        :unreachable,
-        :welcome_to_join,
-        :too_many_members,
-        :group_mentions_disabled,
-      )
-    return if inaccessible.values.all?(&:blank?)
-
-    ChatPublisher.publish_inaccessible_mentions(
-      @user.id,
-      @chat_message,
-      inaccessible[:unreachable].to_a,
-      inaccessible[:welcome_to_join].to_a,
-      inaccessible[:too_many_members].to_a,
-      inaccessible[:group_mentions_disabled].to_a,
-    )
-  end
-
-  # Filters out users from global, here, group, and direct mentions that are
-  # ignoring or muting the creator of the message, so they will not receive
-  # a notification via the ChatNotifyMentioned job and are not prompted for
-  # invitation by the creator.
-  def filter_users_ignoring_or_muting_creator(to_notify, already_covered_ids)
-    screen_targets = already_covered_ids.concat(to_notify[:welcome_to_join].map(&:id))
-
-    return if screen_targets.blank?
-
-    screener = UserCommScreener.new(acting_user: @user, target_user_ids: screen_targets)
-    to_notify
-      .except(:unreachable, :welcome_to_join)
-      .each do |key, user_ids|
-        to_notify[key] = user_ids.reject { |user_id| screener.ignoring_or_muting_actor?(user_id) }
-      end
-
-    # :welcome_to_join contains users because it's serialized by MB.
-    to_notify[:welcome_to_join] = to_notify[:welcome_to_join].reject do |user|
-      screener.ignoring_or_muting_actor?(user.id)
-    end
-
-    already_covered_ids.reject! do |already_covered|
-      screener.ignoring_or_muting_actor?(already_covered)
-    end
-  end
-
-  def notify_mentioned_users(to_notify, already_notified_user_ids: [])
-    Jobs.enqueue(
-      :chat_notify_mentioned,
-      {
-        chat_message_id: @chat_message.id,
-        to_notify_ids_map: to_notify.as_json,
-        already_notified_user_ids: already_notified_user_ids,
-        timestamp: @timestamp,
-      },
-    )
-  end
-
-  def notify_watching_users(except: [])
-    Jobs.enqueue(
-      :chat_notify_watching,
-      { chat_message_id: @chat_message.id, except_user_ids: except, timestamp: @timestamp },
-    )
-  end
-end
diff --git a/plugins/chat/lib/chat_review_queue.rb b/plugins/chat/lib/chat_review_queue.rb
deleted file mode 100644
index 4b0392e1511..00000000000
--- a/plugins/chat/lib/chat_review_queue.rb
+++ /dev/null
@@ -1,208 +0,0 @@
-# frozen_string_literal: true
-
-# Acceptable options:
-#   - message: Used when the flag type is notify_user or notify_moderators and we have to create
-#     a separate PM.
-#   - is_warning: Staff can send warnings when using the notify_user flag.
-#   - take_action: Automatically approves the created reviewable and deletes the chat message.
-#   - queue_for_review: Adds a special reason to the reviwable score and creates the reviewable using
-#     the force_review option.
-
-class Chat::ChatReviewQueue
-  def flag_message(chat_message, guardian, flag_type_id, opts = {})
-    result = { success: false, errors: [] }
-
-    is_notify_type =
-      ReviewableScore.types.slice(:notify_user, :notify_moderators).values.include?(flag_type_id)
-    is_dm = chat_message.chat_channel.direct_message_channel?
-
-    raise Discourse::InvalidParameters.new(:flag_type) if is_dm && is_notify_type
-
-    guardian.ensure_can_flag_chat_message!(chat_message)
-    guardian.ensure_can_flag_message_as!(chat_message, flag_type_id, opts)
-
-    existing_reviewable = Reviewable.includes(:reviewable_scores).find_by(target: chat_message)
-
-    if !can_flag_again?(existing_reviewable, chat_message, guardian.user, flag_type_id)
-      result[:errors] << I18n.t("chat.reviewables.message_already_handled")
-      return result
-    end
-
-    payload = { message_cooked: chat_message.cooked }
-
-    if opts[:message].present? && !is_dm && is_notify_type
-      creator = companion_pm_creator(chat_message, guardian.user, flag_type_id, opts)
-      post = creator.create
-
-      if creator.errors.present?
-        creator.errors.full_messages.each { |msg| result[:errors] << msg }
-        return result
-      end
-    elsif is_dm
-      transcript = find_or_create_transcript(chat_message, guardian.user, existing_reviewable)
-      payload[:transcript_topic_id] = transcript.topic_id if transcript
-    end
-
-    queued_for_review = !!ActiveRecord::Type::Boolean.new.deserialize(opts[:queue_for_review])
-
-    reviewable =
-      ReviewableChatMessage.needs_review!(
-        created_by: guardian.user,
-        target: chat_message,
-        reviewable_by_moderator: true,
-        potential_spam: flag_type_id == ReviewableScore.types[:spam],
-        payload: payload,
-      )
-    reviewable.update(target_created_by: chat_message.user)
-    score =
-      reviewable.add_score(
-        guardian.user,
-        flag_type_id,
-        meta_topic_id: post&.topic_id,
-        take_action: opts[:take_action],
-        reason: queued_for_review ? "chat_message_queued_by_staff" : nil,
-        force_review: queued_for_review,
-      )
-
-    if opts[:take_action]
-      reviewable.perform(guardian.user, :agree_and_delete)
-      ChatPublisher.publish_delete!(chat_message.chat_channel, chat_message)
-    else
-      enforce_auto_silence_threshold(reviewable)
-      ChatPublisher.publish_flag!(chat_message, guardian.user, reviewable, score)
-    end
-
-    result.tap do |r|
-      r[:success] = true
-      r[:reviewable] = reviewable
-    end
-  end
-
-  private
-
-  def enforce_auto_silence_threshold(reviewable)
-    auto_silence_duration = SiteSetting.chat_auto_silence_from_flags_duration
-    return if auto_silence_duration.zero?
-    return if reviewable.score <= ReviewableChatMessage.score_to_silence_user
-
-    user = reviewable.target_created_by
-    return unless user
-    return if user.silenced?
-
-    UserSilencer.silence(
-      user,
-      Discourse.system_user,
-      silenced_till: auto_silence_duration.minutes.from_now,
-      reason: I18n.t("chat.errors.auto_silence_from_flags"),
-    )
-  end
-
-  def companion_pm_creator(chat_message, flagger, flag_type_id, opts)
-    notifying_user = flag_type_id == ReviewableScore.types[:notify_user]
-
-    i18n_key = notifying_user ? "notify_user" : "notify_moderators"
-
-    title =
-      I18n.t(
-        "reviewable_score_types.#{i18n_key}.chat_pm_title",
-        channel_name: chat_message.chat_channel.title(flagger),
-        locale: SiteSetting.default_locale,
-      )
-
-    body =
-      I18n.t(
-        "reviewable_score_types.#{i18n_key}.chat_pm_body",
-        message: opts[:message],
-        link: chat_message.full_url,
-        locale: SiteSetting.default_locale,
-      )
-
-    create_args = {
-      archetype: Archetype.private_message,
-      title: title.truncate(SiteSetting.max_topic_title_length, separator: /\s/),
-      raw: body,
-    }
-
-    if notifying_user
-      create_args[:subtype] = TopicSubtype.notify_user
-      create_args[:target_usernames] = chat_message.user.username
-
-      create_args[:is_warning] = opts[:is_warning] if flagger.staff?
-    else
-      create_args[:subtype] = TopicSubtype.notify_moderators
-      create_args[:target_group_names] = [Group[:moderators].name]
-    end
-
-    PostCreator.new(flagger, create_args)
-  end
-
-  def find_or_create_transcript(chat_message, flagger, existing_reviewable)
-    previous_message_ids =
-      ChatMessage
-        .where(chat_channel: chat_message.chat_channel)
-        .where("id < ?", chat_message.id)
-        .order("created_at DESC")
-        .limit(10)
-        .pluck(:id)
-        .reverse
-
-    return if previous_message_ids.empty?
-
-    service =
-      ChatTranscriptService.new(
-        chat_message.chat_channel,
-        Discourse.system_user,
-        messages_or_ids: previous_message_ids,
-      )
-
-    title =
-      I18n.t(
-        "chat.reviewables.direct_messages.transcript_title",
-        channel_name: chat_message.chat_channel.title(flagger),
-        locale: SiteSetting.default_locale,
-      )
-
-    body =
-      I18n.t(
-        "chat.reviewables.direct_messages.transcript_body",
-        transcript: service.generate_markdown,
-        locale: SiteSetting.default_locale,
-      )
-
-    create_args = {
-      archetype: Archetype.private_message,
-      title: title.truncate(SiteSetting.max_topic_title_length, separator: /\s/),
-      raw: body,
-      subtype: TopicSubtype.notify_moderators,
-      target_group_names: [Group[:moderators].name],
-    }
-
-    PostCreator.new(Discourse.system_user, create_args).create
-  end
-
-  def can_flag_again?(reviewable, message, flagger, flag_type_id)
-    return true if reviewable.blank?
-
-    flagger_has_pending_flags =
-      reviewable.reviewable_scores.any? { |rs| rs.user == flagger && rs.pending? }
-
-    if !flagger_has_pending_flags && flag_type_id == ReviewableScore.types[:notify_moderators]
-      return true
-    end
-
-    flag_used =
-      reviewable.reviewable_scores.any? do |rs|
-        rs.reviewable_score_type == flag_type_id && rs.pending?
-      end
-    handled_recently =
-      !(
-        reviewable.pending? ||
-          reviewable.updated_at < SiteSetting.cooldown_hours_until_reflag.to_i.hours.ago
-      )
-
-    latest_revision = message.revisions.last
-    edited_since_last_review = latest_revision && latest_revision.updated_at > reviewable.updated_at
-
-    !flag_used && !flagger_has_pending_flags && (!handled_recently || edited_since_last_review)
-  end
-end
diff --git a/plugins/chat/lib/chat_seeder.rb b/plugins/chat/lib/chat_seeder.rb
deleted file mode 100644
index 79d8dc23bda..00000000000
--- a/plugins/chat/lib/chat_seeder.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-class ChatSeeder
-  def execute(args = {})
-    return if !SiteSetting.needs_chat_seeded
-
-    begin
-      create_category_channel_from(SiteSetting.staff_category_id)
-      create_category_channel_from(SiteSetting.general_category_id)
-    rescue => error
-      Rails.logger.warn("Error seeding chat category - #{error.inspect}")
-    ensure
-      SiteSetting.needs_chat_seeded = false
-    end
-  end
-
-  def create_category_channel_from(category_id)
-    category = Category.find_by(id: category_id)
-    return if category.nil?
-
-    chat_channel = category.create_chat_channel!(auto_join_users: true, name: category.name)
-    category.custom_fields[Chat::HAS_CHAT_ENABLED] = true
-    category.save!
-
-    Chat::ChatChannelMembershipManager.new(chat_channel).enforce_automatic_channel_memberships
-    chat_channel
-  end
-end
diff --git a/plugins/chat/lib/chat_statistics.rb b/plugins/chat/lib/chat_statistics.rb
deleted file mode 100644
index ab79fcf1110..00000000000
--- a/plugins/chat/lib/chat_statistics.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-class Chat::Statistics
-  def self.about_messages
-    {
-      :last_day => ChatMessage.where("created_at > ?", 1.days.ago).count,
-      "7_days" => ChatMessage.where("created_at > ?", 7.days.ago).count,
-      "30_days" => ChatMessage.where("created_at > ?", 30.days.ago).count,
-      :previous_30_days =>
-        ChatMessage.where("created_at BETWEEN ? AND ?", 60.days.ago, 30.days.ago).count,
-      :count => ChatMessage.count,
-    }
-  end
-
-  def self.about_channels
-    {
-      :last_day => ChatChannel.where(status: :open).where("created_at > ?", 1.days.ago).count,
-      "7_days" => ChatChannel.where(status: :open).where("created_at > ?", 7.days.ago).count,
-      "30_days" => ChatChannel.where(status: :open).where("created_at > ?", 30.days.ago).count,
-      :previous_30_days =>
-        ChatChannel
-          .where(status: :open)
-          .where("created_at BETWEEN ? AND ?", 60.days.ago, 30.days.ago)
-          .count,
-      :count => ChatChannel.where(status: :open).count,
-    }
-  end
-
-  def self.about_users
-    {
-      :last_day => ChatMessage.where("created_at > ?", 1.days.ago).distinct.count(:user_id),
-      "7_days" => ChatMessage.where("created_at > ?", 7.days.ago).distinct.count(:user_id),
-      "30_days" => ChatMessage.where("created_at > ?", 30.days.ago).distinct.count(:user_id),
-      :previous_30_days =>
-        ChatMessage
-          .where("created_at BETWEEN ? AND ?", 60.days.ago, 30.days.ago)
-          .distinct
-          .count(:user_id),
-      :count => ChatMessage.distinct.count(:user_id),
-    }
-  end
-
-  def self.monthly
-    start_of_month = Time.zone.now.beginning_of_month
-    {
-      messages: ChatMessage.where("created_at > ?", start_of_month).count,
-      channels: ChatChannel.where(status: :open).where("created_at > ?", start_of_month).count,
-      users: ChatMessage.where("created_at > ?", start_of_month).distinct.count(:user_id),
-    }
-  end
-end
diff --git a/plugins/chat/lib/chat_transcript_service.rb b/plugins/chat/lib/chat_transcript_service.rb
deleted file mode 100644
index 6326494cdde..00000000000
--- a/plugins/chat/lib/chat_transcript_service.rb
+++ /dev/null
@@ -1,177 +0,0 @@
-# frozen_string_literal: true
-
-##
-# Used to generate BBCode [chat] tags for the message IDs provided.
-#
-# If there is > 1 message then the channel name will be shown at
-# the top of the first message, and subsequent messages will have
-# the chained attribute, which will affect how they are displayed
-# in the UI.
-#
-# Subsequent messages from the same user will be put into the same
-# tag. Each new user in the chain of messages will have a new [chat]
-# tag created.
-#
-# A single message will have the channel name displayed to the right
-# of the username and datetime of the message.
-class ChatTranscriptService
-  CHAINED_ATTR = "chained=\"true\""
-  MULTIQUOTE_ATTR = "multiQuote=\"true\""
-  NO_LINK_ATTR = "noLink=\"true\""
-
-  class ChatTranscriptBBCode
-    attr_reader :channel, :multiquote, :chained, :no_link, :include_reactions
-
-    def initialize(
-      channel: nil,
-      acting_user: nil,
-      multiquote: false,
-      chained: false,
-      no_link: false,
-      include_reactions: false
-    )
-      @channel = channel
-      @acting_user = acting_user
-      @multiquote = multiquote
-      @chained = chained
-      @no_link = no_link
-      @include_reactions = include_reactions
-      @message_data = []
-    end
-
-    def add(message:, reactions: nil)
-      @message_data << { message: message, reactions: reactions }
-    end
-
-    def render
-      attrs = [quote_attr(@message_data.first[:message])]
-
-      if channel
-        attrs << channel_attr
-        attrs << channel_id_attr
-      end
-
-      attrs << MULTIQUOTE_ATTR if multiquote
-      attrs << CHAINED_ATTR if chained
-      attrs << NO_LINK_ATTR if no_link
-      attrs << reactions_attr if include_reactions
-
-      <<~MARKDOWN
-      [chat #{attrs.compact.join(" ")}]
-      #{@message_data.map { |msg| msg[:message].to_markdown }.join("\n\n")}
-      [/chat]
-      MARKDOWN
-    end
-
-    private
-
-    def reactions_attr
-      reaction_data =
-        @message_data.reduce([]) do |array, msg_data|
-          if msg_data[:reactions].any?
-            array << msg_data[:reactions].map { |react| "#{react.emoji}:#{react.usernames}" }
-          end
-          array
-        end
-      return if reaction_data.empty?
-      "reactions=\"#{reaction_data.join(";")}\""
-    end
-
-    def quote_attr(message)
-      "quote=\"#{message.user.username};#{message.id};#{message.created_at.iso8601}\""
-    end
-
-    def channel_attr
-      "channel=\"#{channel.title(@acting_user)}\""
-    end
-
-    def channel_id_attr
-      "channelId=\"#{channel.id}\""
-    end
-  end
-
-  def initialize(channel, acting_user, messages_or_ids: [], opts: {})
-    @channel = channel
-    @acting_user = acting_user
-
-    if messages_or_ids.all? { |m| m.is_a?(Numeric) }
-      @message_ids = messages_or_ids
-    else
-      @messages = messages_or_ids
-    end
-    @opts = opts
-  end
-
-  def generate_markdown
-    previous_message = nil
-    rendered_markdown = []
-    all_messages_same_user = messages.count(:user_id) == 1
-    open_bbcode_tag =
-      ChatTranscriptBBCode.new(
-        channel: @channel,
-        acting_user: @acting_user,
-        multiquote: messages.length > 1,
-        chained: !all_messages_same_user,
-        no_link: @opts[:no_link],
-        include_reactions: @opts[:include_reactions],
-      )
-
-    messages.each.with_index do |message, idx|
-      if previous_message.present? && previous_message.user_id != message.user_id
-        rendered_markdown << open_bbcode_tag.render
-
-        open_bbcode_tag =
-          ChatTranscriptBBCode.new(
-            acting_user: @acting_user,
-            chained: !all_messages_same_user,
-            no_link: @opts[:no_link],
-            include_reactions: @opts[:include_reactions],
-          )
-      end
-
-      if @opts[:include_reactions]
-        open_bbcode_tag.add(message: message, reactions: reactions_for_message(message))
-      else
-        open_bbcode_tag.add(message: message)
-      end
-      previous_message = message
-    end
-
-    # tie off the last open bbcode + render
-    rendered_markdown << open_bbcode_tag.render
-    rendered_markdown.join("\n")
-  end
-
-  private
-
-  def messages
-    @messages ||=
-      ChatMessage
-        .includes(:user, chat_uploads: :upload)
-        .where(id: @message_ids, chat_channel_id: @channel.id)
-        .order(:created_at)
-  end
-
-  ##
-  # Queries reactions and returns them in this format
-  #
-  # emoji   |  usernames  |  chat_message_id
-  # ----------------------------------------
-  # +1      | foo,bar,baz | 102
-  # heart   | foo         | 102
-  # sob     | bar,baz     | 103
-  def reactions
-    @reactions ||= DB.query(<<~SQL, @messages.map(&:id))
-    SELECT emoji, STRING_AGG(DISTINCT users.username, ',') AS usernames, chat_message_id
-    FROM chat_message_reactions
-    INNER JOIN users on users.id = chat_message_reactions.user_id
-    WHERE chat_message_id IN (?)
-    GROUP BY emoji, chat_message_id
-    ORDER BY chat_message_id, emoji
-    SQL
-  end
-
-  def reactions_for_message(message)
-    reactions.select { |react| react.chat_message_id == message.id }
-  end
-end
diff --git a/plugins/chat/lib/direct_message_channel_creator.rb b/plugins/chat/lib/direct_message_channel_creator.rb
deleted file mode 100644
index 63342e3cfb7..00000000000
--- a/plugins/chat/lib/direct_message_channel_creator.rb
+++ /dev/null
@@ -1,126 +0,0 @@
-# frozen_string_literal: true
-
-module Chat::DirectMessageChannelCreator
-  class NotAllowed < StandardError
-  end
-
-  def self.create!(acting_user:, target_users:)
-    Guardian.new(acting_user).ensure_can_create_direct_message!
-    target_users.uniq!
-    direct_message = DirectMessage.for_user_ids(target_users.map(&:id))
-    if direct_message
-      chat_channel = ChatChannel.find_by!(chatable: direct_message)
-    else
-      enforce_max_direct_message_users!(acting_user, target_users)
-      ensure_actor_can_communicate!(acting_user, target_users)
-      direct_message = DirectMessage.create!(user_ids: target_users.map(&:id))
-      chat_channel = direct_message.create_chat_channel!
-    end
-
-    update_memberships(acting_user, target_users, chat_channel.id)
-    ChatPublisher.publish_new_channel(chat_channel, target_users)
-
-    chat_channel
-  end
-
-  private
-
-  def self.enforce_max_direct_message_users!(acting_user, target_users)
-    # We never want to prevent the actor from communicating with themself.
-    target_users = target_users.reject { |user| user.id == acting_user.id }
-
-    if !acting_user.staff? && target_users.size > SiteSetting.chat_max_direct_message_users
-      raise NotAllowed.new(
-              I18n.t(
-                "chat.errors.over_chat_max_direct_message_users",
-                count: SiteSetting.chat_max_direct_message_users + 1, # +1 for the acting_user
-              ),
-            )
-    end
-  end
-
-  def self.update_memberships(acting_user, target_users, chat_channel_id)
-    sql_params = {
-      acting_user_id: acting_user.id,
-      user_ids: target_users.map(&:id),
-      chat_channel_id: chat_channel_id,
-      always_notification_level: UserChatChannelMembership::NOTIFICATION_LEVELS[:always],
-    }
-
-    DB.exec(<<~SQL, sql_params)
-      INSERT INTO user_chat_channel_memberships(
-        user_id,
-        chat_channel_id,
-        muted,
-        following,
-        desktop_notification_level,
-        mobile_notification_level,
-        created_at,
-        updated_at
-      )
-      VALUES(
-        unnest(array[:user_ids]),
-        :chat_channel_id,
-        false,
-        false,
-        :always_notification_level,
-        :always_notification_level,
-        NOW(),
-        NOW()
-      )
-      ON CONFLICT (user_id, chat_channel_id) DO NOTHING;
-
-      UPDATE user_chat_channel_memberships
-      SET following = true
-      WHERE user_id = :acting_user_id AND chat_channel_id = :chat_channel_id;
-    SQL
-  end
-
-  def self.ensure_actor_can_communicate!(acting_user, target_users)
-    # We never want to prevent the actor from communicating with themself.
-    target_users = target_users.reject { |user| user.id == acting_user.id }
-
-    screener =
-      UserCommScreener.new(acting_user: acting_user, target_user_ids: target_users.map(&:id))
-
-    # People blocking the actor.
-    screener.preventing_actor_communication.each do |user_id|
-      raise NotAllowed.new(
-              I18n.t(
-                "chat.errors.not_accepting_dms",
-                username: target_users.find { |user| user.id == user_id }.username,
-              ),
-            )
-    end
-
-    # The actor cannot start DMs with people if they are not allowing anyone
-    # to start DMs with them, that's no fair!
-    if screener.actor_disallowing_all_pms?
-      raise NotAllowed.new(I18n.t("chat.errors.actor_disallowed_dms"))
-    end
-
-    # People the actor is blocking.
-    target_users.each do |target_user|
-      if screener.actor_disallowing_pms?(target_user.id)
-        raise NotAllowed.new(
-                I18n.t(
-                  "chat.errors.actor_preventing_target_user_from_dm",
-                  username: target_user.username,
-                ),
-              )
-      end
-
-      if screener.actor_ignoring?(target_user.id)
-        raise NotAllowed.new(
-                I18n.t("chat.errors.actor_ignoring_target_user", username: target_user.username),
-              )
-      end
-
-      if screener.actor_muting?(target_user.id)
-        raise NotAllowed.new(
-                I18n.t("chat.errors.actor_muting_target_user", username: target_user.username),
-              )
-      end
-    end
-  end
-end
diff --git a/plugins/chat/lib/discourse_dev/public_channel.rb b/plugins/chat/lib/discourse_dev/category_channel.rb
similarity index 64%
rename from plugins/chat/lib/discourse_dev/public_channel.rb
rename to plugins/chat/lib/discourse_dev/category_channel.rb
index cb9c672caa9..c6ed4d29b24 100644
--- a/plugins/chat/lib/discourse_dev/public_channel.rb
+++ b/plugins/chat/lib/discourse_dev/category_channel.rb
@@ -4,9 +4,9 @@ require "discourse_dev/record"
 require "faker"
 
 module DiscourseDev
-  class PublicChannel < Record
+  class CategoryChannel < Record
     def initialize
-      super(::CategoryChannel, 5)
+      super(::Chat::CategoryChannel, 5)
     end
 
     def data
@@ -22,6 +22,7 @@ module DiscourseDev
     end
 
     def create!
+      users = []
       super do |channel|
         Faker::Number
           .between(from: 5, to: 10)
@@ -36,7 +37,17 @@ module DiscourseDev
               admin_user = ::User.find_by(username: admin_username) if admin_username
             end
 
-            Chat::ChatChannelMembershipManager.new(channel).follow(admin_user || User.new.create!)
+            user = admin_user || User.new(username: Faker::Internet.username(specifier: 10)).create!
+            Chat::ChannelMembershipManager.new(channel).follow(user)
+            users << user
+          end
+
+        Faker::Number
+          .between(from: 20, to: 80)
+          .times do
+            Chat::MessageCreator.create(
+              { user: users.sample, chat_channel: channel, content: Faker::Lorem.paragraph },
+            )
           end
       end
     end
diff --git a/plugins/chat/lib/discourse_dev/direct_channel.rb b/plugins/chat/lib/discourse_dev/direct_channel.rb
deleted file mode 100644
index 4ee6e835fe2..00000000000
--- a/plugins/chat/lib/discourse_dev/direct_channel.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-require "discourse_dev/record"
-require "faker"
-
-module DiscourseDev
-  class DirectChannel < Record
-    def initialize
-      super(::DirectMessage, 5)
-    end
-
-    def data
-      if Faker::Boolean.boolean(true_ratio: 0.5)
-        admin_username =
-          begin
-            DiscourseDev::Config.new.config[:admin][:username]
-          rescue StandardError
-            nil
-          end
-        admin_user = ::User.find_by(username: admin_username) if admin_username
-      end
-
-      [User.new.create!, admin_user || User.new.create!]
-    end
-
-    def create!
-      users = data
-      Chat::DirectMessageChannelCreator.create!(acting_user: users[0], target_users: users)
-    end
-  end
-end
diff --git a/plugins/chat/lib/discourse_dev/message.rb b/plugins/chat/lib/discourse_dev/message.rb
index 6cd72225a11..bbc38b9ab6c 100644
--- a/plugins/chat/lib/discourse_dev/message.rb
+++ b/plugins/chat/lib/discourse_dev/message.rb
@@ -5,26 +5,30 @@ require "faker"
 
 module DiscourseDev
   class Message < Record
-    def initialize
-      super(::ChatMessage, 200)
+    def initialize(channel_id: nil, count: nil, ignore_current_count: false)
+      @channel_id = channel_id
+      @ignore_current_count = ignore_current_count
+      super(::Chat::Message, count&.to_i || 200)
     end
 
     def data
-      if Faker::Boolean.boolean(true_ratio: 0.5)
-        channel = ::ChatChannel.where(chatable_type: "DirectMessage").order("RANDOM()").first
-        channel.user_chat_channel_memberships.update_all(following: true)
-        user = channel.chatable.users.order("RANDOM()").first
+      if @channel_id
+        channel = ::Chat::Channel.find(@channel_id)
       else
-        membership = ::UserChatChannelMembership.order("RANDOM()").first
-        channel = membership.chat_channel
-        user = membership.user
+        channel = ::Chat::Channel.where(chatable_type: "Category").order("RANDOM()").first
       end
 
+      return if !channel
+
+      membership =
+        ::Chat::UserChatChannelMembership.where(chat_channel: channel).order("RANDOM()").first
+      user = membership.user
+
       { user: user, content: Faker::Lorem.paragraph, chat_channel: channel }
     end
 
     def create!
-      Chat::ChatMessageCreator.create(data)
+      Chat::MessageCreator.create(data)
     end
   end
 end
diff --git a/plugins/chat/lib/discourse_dev/thread.rb b/plugins/chat/lib/discourse_dev/thread.rb
new file mode 100644
index 00000000000..fefa1264c61
--- /dev/null
+++ b/plugins/chat/lib/discourse_dev/thread.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require "discourse_dev/record"
+require "faker"
+
+module DiscourseDev
+  class Thread < Record
+    def initialize(channel_id:, message_count: nil, ignore_current_count: false)
+      @channel_id = channel_id
+      @message_count = message_count&.to_i || 30
+      @ignore_current_count = ignore_current_count
+      super(::Chat::Thread, 1)
+    end
+
+    def data
+      channel = ::Chat::Channel.find(@channel_id)
+      return if !channel
+
+      if !channel.threading_enabled
+        puts "Enabling threads in channel #{channel.id}"
+        channel.update!(threading_enabled: true)
+      end
+
+      membership =
+        ::Chat::UserChatChannelMembership.where(chat_channel: channel).order("RANDOM()").first
+      user = membership.user
+
+      om =
+        Chat::MessageCreator.create(
+          user: user,
+          content: Faker::Lorem.paragraph,
+          chat_channel: channel,
+        ).chat_message
+
+      { original_message_user: user, original_message: om, channel: channel }
+    end
+
+    def create!
+      super do |thread|
+        thread.original_message.update!(thread: thread)
+        user =
+          ::Chat::UserChatChannelMembership
+            .where(chat_channel: thread.channel)
+            .order("RANDOM()")
+            .first
+            .user
+        @message_count.times do
+          Chat::MessageCreator.create(
+            {
+              user: user,
+              chat_channel: thread.channel,
+              content: Faker::Lorem.paragraph,
+              thread_id: thread.id,
+            },
+          )
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/lib/duplicate_message_validator.rb b/plugins/chat/lib/duplicate_message_validator.rb
deleted file mode 100644
index 7b094692ff4..00000000000
--- a/plugins/chat/lib/duplicate_message_validator.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-class Chat::DuplicateMessageValidator
-  attr_reader :chat_message
-
-  def initialize(chat_message)
-    @chat_message = chat_message
-  end
-
-  def validate
-    return if SiteSetting.chat_duplicate_message_sensitivity.zero?
-    matrix =
-      Chat::DuplicateMessageValidator.sensitivity_matrix(
-        SiteSetting.chat_duplicate_message_sensitivity,
-      )
-
-    # Check if the length of the message is too short to check for a duplicate message
-    return if chat_message.message.length < matrix[:min_message_length]
-
-    # Check if there are enough users in the channel to check for a duplicate message
-    return if (chat_message.chat_channel.user_count || 0) < matrix[:min_user_count]
-
-    # Check if the same duplicate message has been posted in the last N seconds by any user
-    if !chat_message
-         .chat_channel
-         .chat_messages
-         .where("created_at > ?", matrix[:min_past_seconds].seconds.ago)
-         .where(message: chat_message.message)
-         .exists?
-      return
-    end
-
-    chat_message.errors.add(:base, I18n.t("chat.errors.duplicate_message"))
-  end
-
-  def self.sensitivity_matrix(sensitivity)
-    {
-      # 0.1 sensitivity = 100 users and 1.0 sensitivity = 5 users.
-      min_user_count: (-1.0 * 105.5 * sensitivity + 110.55).to_i,
-      # 0.1 sensitivity = 30 chars and 1.0 sensitivity = 10 chars.
-      min_message_length: (-1.0 * 22.2 * sensitivity + 32.22).to_i,
-      # 0.1 sensitivity = 10 seconds and 1.0 sensitivity = 60 seconds.
-      min_past_seconds: (55.55 * sensitivity + 4.5).to_i,
-    }
-  end
-end
diff --git a/plugins/chat/lib/extensions/category_extension.rb b/plugins/chat/lib/extensions/category_extension.rb
deleted file mode 100644
index d12ce387645..00000000000
--- a/plugins/chat/lib/extensions/category_extension.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Chat::CategoryExtension
-  extend ActiveSupport::Concern
-
-  include Chatable
-
-  prepended { has_one :category_channel, as: :chatable, dependent: :destroy }
-
-  def cannot_delete_reason
-    return I18n.t("category.cannot_delete.has_chat_channels") if category_channel
-    super
-  end
-
-  def deletable_for_chat?
-    return true if !category_channel
-    category_channel.chat_messages_empty?
-  end
-end
diff --git a/plugins/chat/lib/extensions/user_email_extension.rb b/plugins/chat/lib/extensions/user_email_extension.rb
deleted file mode 100644
index 6742dccbe37..00000000000
--- a/plugins/chat/lib/extensions/user_email_extension.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Chat::UserEmailExtension
-  def execute(args)
-    super(args)
-
-    if args[:type] == "chat_summary" && args[:memberships_to_update_data].present?
-      args[:memberships_to_update_data].to_a.each do |membership_id, max_unread_mention_id|
-        UserChatChannelMembership.find_by(user: args[:user_id], id: membership_id.to_i)&.update(
-          last_unread_mention_when_emailed_id: max_unread_mention_id.to_i,
-        )
-      end
-    end
-  end
-end
diff --git a/plugins/chat/lib/extensions/user_extension.rb b/plugins/chat/lib/extensions/user_extension.rb
deleted file mode 100644
index b4c041d4d8b..00000000000
--- a/plugins/chat/lib/extensions/user_extension.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Chat::UserExtension
-  extend ActiveSupport::Concern
-
-  prepended do
-    has_many :user_chat_channel_memberships, dependent: :destroy
-    has_many :chat_message_reactions, dependent: :destroy
-    has_many :chat_mentions
-  end
-end
diff --git a/plugins/chat/lib/extensions/user_notifications_extension.rb b/plugins/chat/lib/extensions/user_notifications_extension.rb
deleted file mode 100644
index a054b108d85..00000000000
--- a/plugins/chat/lib/extensions/user_notifications_extension.rb
+++ /dev/null
@@ -1,137 +0,0 @@
-# frozen_string_literal: true
-
-module Chat::UserNotificationsExtension
-  def chat_summary(user, opts)
-    guardian = Guardian.new(user)
-    return unless guardian.can_chat?
-
-    @messages =
-      ChatMessage
-        .joins(:user, :chat_channel)
-        .where.not(user: user)
-        .where("chat_messages.created_at > ?", 1.week.ago)
-        .joins("LEFT OUTER JOIN chat_mentions cm ON cm.chat_message_id = chat_messages.id")
-        .joins(
-          "INNER JOIN user_chat_channel_memberships uccm ON uccm.chat_channel_id = chat_channels.id",
-        )
-        .where(<<~SQL, user_id: user.id)
-          uccm.user_id = :user_id AND
-          (uccm.last_read_message_id IS NULL OR chat_messages.id > uccm.last_read_message_id) AND
-          (uccm.last_unread_mention_when_emailed_id IS NULL OR chat_messages.id > uccm.last_unread_mention_when_emailed_id) AND
-          (
-            (cm.user_id = :user_id AND uccm.following IS true AND chat_channels.chatable_type = 'Category') OR
-            (chat_channels.chatable_type = 'DirectMessage')
-          )
-        SQL
-        .to_a
-
-    return if @messages.empty?
-    @grouped_messages = @messages.group_by { |message| message.chat_channel }
-    @grouped_messages =
-      @grouped_messages.select { |channel, _| guardian.can_join_chat_channel?(channel) }
-    return if @grouped_messages.empty?
-
-    @grouped_messages.each do |chat_channel, messages|
-      @grouped_messages[chat_channel] = messages.sort_by(&:created_at)
-    end
-    @user = user
-    @user_tz = UserOption.user_tzinfo(user.id)
-    @display_usernames = SiteSetting.prioritize_username_in_ux || !SiteSetting.enable_names
-
-    build_summary_for(user)
-    @preferences_path = "#{Discourse.base_url}/my/preferences/chat"
-
-    # TODO(roman): Remove after the 2.9 release
-    add_unsubscribe_link = UnsubscribeKey.respond_to?(:get_unsubscribe_strategy_for)
-
-    if add_unsubscribe_link
-      unsubscribe_key = UnsubscribeKey.create_key_for(@user, "chat_summary")
-      @unsubscribe_link = "#{Discourse.base_url}/email/unsubscribe/#{unsubscribe_key}"
-      opts[:unsubscribe_url] = @unsubscribe_link
-    end
-
-    opts = {
-      from_alias: I18n.t("user_notifications.chat_summary.from", site_name: Email.site_title),
-      subject: summary_subject(user, @grouped_messages),
-      add_unsubscribe_link: add_unsubscribe_link,
-    }
-
-    build_email(user.email, opts)
-  end
-
-  def summary_subject(user, grouped_messages)
-    all_channels = grouped_messages.keys
-    grouped_channels = all_channels.partition { |c| !c.direct_message_channel? }
-    channels = grouped_channels.first
-
-    dm_messages = grouped_channels.last.flat_map { |c| grouped_messages[c] }
-    dm_users = dm_messages.sort_by(&:created_at).uniq { |m| m.user_id }.map(&:user)
-
-    # Prioritize messages from regular channels over direct messages
-    if channels.any?
-      channel_notification_text(channels.sort_by(&:last_message_sent_at), dm_users)
-    else
-      direct_message_notification_text(dm_users)
-    end
-  end
-
-  private
-
-  def channel_notification_text(channels, dm_users)
-    total_count = channels.size + dm_users.size
-
-    if total_count > 2
-      I18n.t(
-        "user_notifications.chat_summary.subject.chat_channel_more",
-        email_prefix: @email_prefix,
-        channel: channels.first.title,
-        count: total_count - 1,
-      )
-    elsif channels.size == 1 && dm_users.size == 0
-      I18n.t(
-        "user_notifications.chat_summary.subject.chat_channel_1",
-        email_prefix: @email_prefix,
-        channel: channels.first.title,
-      )
-    elsif channels.size == 1 && dm_users.size == 1
-      I18n.t(
-        "user_notifications.chat_summary.subject.chat_channel_and_direct_message",
-        email_prefix: @email_prefix,
-        channel: channels.first.title,
-        username: dm_users.first.username,
-      )
-    elsif channels.size == 2
-      I18n.t(
-        "user_notifications.chat_summary.subject.chat_channel_2",
-        email_prefix: @email_prefix,
-        channel1: channels.first.title,
-        channel2: channels.second.title,
-      )
-    end
-  end
-
-  def direct_message_notification_text(dm_users)
-    case dm_users.size
-    when 1
-      I18n.t(
-        "user_notifications.chat_summary.subject.direct_message_from_1",
-        email_prefix: @email_prefix,
-        username: dm_users.first.username,
-      )
-    when 2
-      I18n.t(
-        "user_notifications.chat_summary.subject.direct_message_from_2",
-        email_prefix: @email_prefix,
-        username1: dm_users.first.username,
-        username2: dm_users.second.username,
-      )
-    else
-      I18n.t(
-        "user_notifications.chat_summary.subject.direct_message_from_more",
-        email_prefix: @email_prefix,
-        username: dm_users.first.username,
-        count: dm_users.size - 1,
-      )
-    end
-  end
-end
diff --git a/plugins/chat/lib/extensions/user_option_extension.rb b/plugins/chat/lib/extensions/user_option_extension.rb
deleted file mode 100644
index ae2993a216f..00000000000
--- a/plugins/chat/lib/extensions/user_option_extension.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module Chat::UserOptionExtension
-  # TODO: remove last_emailed_for_chat and chat_isolated in 2023
-  def self.prepended(base)
-    if base.ignored_columns
-      base.ignored_columns = base.ignored_columns + %i[last_emailed_for_chat chat_isolated]
-    else
-      base.ignored_columns = %i[last_emailed_for_chat chat_isolated]
-    end
-
-    def base.chat_email_frequencies
-      @chat_email_frequencies ||= { never: 0, when_away: 1 }
-    end
-
-    base.enum :chat_email_frequency, base.chat_email_frequencies, prefix: "send_chat_email"
-  end
-end
diff --git a/plugins/chat/lib/guardian_extensions.rb b/plugins/chat/lib/guardian_extensions.rb
deleted file mode 100644
index d539c122548..00000000000
--- a/plugins/chat/lib/guardian_extensions.rb
+++ /dev/null
@@ -1,188 +0,0 @@
-# frozen_string_literal: true
-
-module Chat::GuardianExtensions
-  def can_moderate_chat?(chatable)
-    case chatable.class.name
-    when "Category"
-      is_staff? || is_category_group_moderator?(chatable)
-    else
-      is_staff?
-    end
-  end
-
-  def can_chat?
-    return false if anonymous?
-    @user.staff? || @user.in_any_groups?(Chat.allowed_group_ids)
-  end
-
-  def can_create_chat_message?
-    !SpamRule::AutoSilence.prevent_posting?(@user)
-  end
-
-  def can_create_direct_message?
-    is_staff? || @user.in_any_groups?(SiteSetting.direct_message_enabled_groups_map)
-  end
-
-  def hidden_tag_names
-    @hidden_tag_names ||= DiscourseTagging.hidden_tag_names(self)
-  end
-
-  def can_create_chat_channel?
-    is_staff?
-  end
-
-  def can_delete_chat_channel?
-    is_staff?
-  end
-
-  # Channel status intentionally has no bearing on whether the channel
-  # name and description can be edited.
-  def can_edit_chat_channel?
-    is_staff?
-  end
-
-  def can_move_chat_messages?(channel)
-    can_moderate_chat?(channel.chatable)
-  end
-
-  def can_create_channel_message?(chat_channel)
-    valid_statuses = is_staff? ? %w[open closed] : ["open"]
-    valid_statuses.include?(chat_channel.status)
-  end
-
-  # This is intentionally identical to can_create_channel_message, we
-  # may want to have different conditions here in future.
-  def can_modify_channel_message?(chat_channel)
-    return chat_channel.open? || chat_channel.closed? if is_staff?
-    chat_channel.open?
-  end
-
-  def can_change_channel_status?(chat_channel, target_status)
-    return false if chat_channel.status.to_sym == target_status.to_sym
-    return false if !is_staff?
-
-    case target_status
-    when :closed
-      chat_channel.open?
-    when :open
-      chat_channel.closed?
-    when :archived
-      chat_channel.read_only?
-    when :read_only
-      chat_channel.closed? || chat_channel.open?
-    else
-      false
-    end
-  end
-
-  def can_rebake_chat_message?(message)
-    return false if !can_modify_channel_message?(message.chat_channel)
-    is_staff? || @user.has_trust_level?(TrustLevel[4])
-  end
-
-  def can_preview_chat_channel?(chat_channel)
-    return false unless chat_channel.chatable
-
-    if chat_channel.direct_message_channel?
-      chat_channel.chatable.user_can_access?(@user)
-    elsif chat_channel.category_channel?
-      can_see_category?(chat_channel.chatable)
-    else
-      true
-    end
-  end
-
-  def can_join_chat_channel?(chat_channel)
-    return false if anonymous?
-    can_preview_chat_channel?(chat_channel) &&
-      (chat_channel.direct_message_channel? || can_post_in_category?(chat_channel.chatable))
-  end
-
-  def can_flag_chat_messages?
-    return false if @user.silenced?
-    return true if @user.staff?
-
-    @user.in_any_groups?(SiteSetting.chat_message_flag_allowed_groups_map)
-  end
-
-  def can_flag_in_chat_channel?(chat_channel)
-    return false if !can_modify_channel_message?(chat_channel)
-
-    can_join_chat_channel?(chat_channel)
-  end
-
-  def can_flag_chat_message?(chat_message)
-    return false if !authenticated? || !chat_message || chat_message.trashed? || !chat_message.user
-    return false if chat_message.user.staff? && !SiteSetting.allow_flagging_staff
-    return false if chat_message.user_id == @user.id
-
-    can_flag_chat_messages? && can_flag_in_chat_channel?(chat_message.chat_channel)
-  end
-
-  def can_flag_message_as?(chat_message, flag_type_id, opts)
-    return false if !is_staff? && (opts[:take_action] || opts[:queue_for_review])
-
-    if flag_type_id == ReviewableScore.types[:notify_user]
-      is_warning = ActiveRecord::Type::Boolean.new.deserialize(opts[:is_warning])
-
-      return false if is_warning && !is_staff?
-    end
-
-    true
-  end
-
-  def can_delete_chat?(message, chatable)
-    return false if @user.silenced?
-    return false if !can_modify_channel_message?(message.chat_channel)
-
-    if message.user_id == current_user.id
-      can_delete_own_chats?(chatable)
-    else
-      can_delete_other_chats?(chatable)
-    end
-  end
-
-  def can_delete_own_chats?(chatable)
-    return false if (SiteSetting.max_post_deletions_per_day < 1)
-    return true if can_moderate_chat?(chatable)
-
-    true
-  end
-
-  def can_delete_other_chats?(chatable)
-    return true if can_moderate_chat?(chatable)
-
-    false
-  end
-
-  def can_restore_chat?(message, chatable)
-    return false if !can_modify_channel_message?(message.chat_channel)
-
-    if message.user_id == current_user.id
-      case chatable
-      when Category
-        return can_see_category?(chatable)
-      when DirectMessage
-        return true
-      end
-    end
-
-    can_delete_other_chats?(chatable)
-  end
-
-  def can_restore_other_chats?(chatable)
-    can_moderate_chat?(chatable)
-  end
-
-  def can_edit_chat?(message)
-    message.user_id == @user.id && !@user.silenced?
-  end
-
-  def can_react?
-    can_create_chat_message?
-  end
-
-  def can_delete_category?(category)
-    super && category.deletable_for_chat?
-  end
-end
diff --git a/plugins/chat/lib/message_mover.rb b/plugins/chat/lib/message_mover.rb
deleted file mode 100644
index fc290f757ca..00000000000
--- a/plugins/chat/lib/message_mover.rb
+++ /dev/null
@@ -1,175 +0,0 @@
-# frozen_string_literal: true
-
-##
-# Used to move chat messages from a chat channel to some other
-# location.
-#
-# Channel -> Channel:
-# -------------------
-#
-# Messages are sometimes misplaced and must be moved to another channel. For
-# now we only support moving messages between public channels, handling the
-# permissions and membership around moving things in and out of DMs is a little
-# much for V1.
-#
-# The original messages will be deleted, and then similar to PostMover in core,
-# all of the references associated to a chat message (e.g. reactions, bookmarks,
-# notifications, revisions, mentions, uploads) will be updated to the new
-# message IDs via a moved_chat_messages temporary table.
-class Chat::MessageMover
-  class NoMessagesFound < StandardError
-  end
-  class InvalidChannel < StandardError
-  end
-
-  def initialize(acting_user:, source_channel:, message_ids:)
-    @source_channel = source_channel
-    @acting_user = acting_user
-    @source_message_ids = message_ids
-    @source_messages = find_messages(@source_message_ids, source_channel)
-    @ordered_source_message_ids = @source_messages.map(&:id)
-  end
-
-  def move_to_channel(destination_channel)
-    if !@source_channel.public_channel? || !destination_channel.public_channel?
-      raise InvalidChannel.new(I18n.t("chat.errors.message_move_invalid_channel"))
-    end
-
-    if @ordered_source_message_ids.empty?
-      raise NoMessagesFound.new(I18n.t("chat.errors.message_move_no_messages_found"))
-    end
-
-    moved_messages = nil
-
-    ChatMessage.transaction do
-      create_temp_table
-      moved_messages =
-        find_messages(
-          create_destination_messages_in_channel(destination_channel),
-          destination_channel,
-        )
-      bulk_insert_movement_metadata
-      update_references
-      delete_source_messages
-    end
-
-    add_moved_placeholder(destination_channel, moved_messages.first)
-    moved_messages
-  end
-
-  private
-
-  def find_messages(message_ids, channel)
-    ChatMessage.where(id: message_ids, chat_channel_id: channel.id).order("created_at ASC, id ASC")
-  end
-
-  def create_temp_table
-    DB.exec("DROP TABLE IF EXISTS moved_chat_messages") if Rails.env.test?
-
-    DB.exec <<~SQL
-      CREATE TEMPORARY TABLE moved_chat_messages (
-        old_chat_message_id INTEGER,
-        new_chat_message_id INTEGER
-      ) ON COMMIT DROP;
-
-      CREATE INDEX moved_chat_messages_old_chat_message_id ON moved_chat_messages(old_chat_message_id);
-    SQL
-  end
-
-  def bulk_insert_movement_metadata
-    values_sql = @movement_metadata.map { |mm| "(#{mm[:old_id]}, #{mm[:new_id]})" }.join(",\n")
-    DB.exec(
-      "INSERT INTO moved_chat_messages(old_chat_message_id, new_chat_message_id) VALUES #{values_sql}",
-    )
-  end
-
-  ##
-  # We purposefully omit in_reply_to_id when creating the messages in the
-  # new channel, because it could be pointing to a message that has not
-  # been moved.
-  def create_destination_messages_in_channel(destination_channel)
-    query_args = {
-      message_ids: @ordered_source_message_ids,
-      destination_channel_id: destination_channel.id,
-    }
-    moved_message_ids = DB.query_single(<<~SQL, query_args)
-      INSERT INTO chat_messages(
-        chat_channel_id, user_id, last_editor_id, message, cooked, cooked_version, created_at, updated_at
-      )
-      SELECT :destination_channel_id,
-             user_id,
-             last_editor_id,
-             message,
-             cooked,
-             cooked_version,
-             CLOCK_TIMESTAMP(),
-             CLOCK_TIMESTAMP()
-      FROM chat_messages
-      WHERE id IN (:message_ids)
-      RETURNING id
-    SQL
-
-    @movement_metadata =
-      moved_message_ids.map.with_index do |chat_message_id, idx|
-        { old_id: @ordered_source_message_ids[idx], new_id: chat_message_id }
-      end
-    moved_message_ids
-  end
-
-  def update_references
-    DB.exec(<<~SQL)
-      UPDATE chat_message_reactions cmr
-      SET chat_message_id = mm.new_chat_message_id
-      FROM moved_chat_messages mm
-      WHERE cmr.chat_message_id = mm.old_chat_message_id
-    SQL
-
-    DB.exec(<<~SQL)
-      UPDATE chat_uploads cu
-      SET chat_message_id = mm.new_chat_message_id
-      FROM moved_chat_messages mm
-      WHERE cu.chat_message_id = mm.old_chat_message_id
-    SQL
-
-    DB.exec(<<~SQL)
-      UPDATE chat_mentions cment
-      SET chat_message_id = mm.new_chat_message_id
-      FROM moved_chat_messages mm
-      WHERE cment.chat_message_id = mm.old_chat_message_id
-    SQL
-
-    DB.exec(<<~SQL)
-      UPDATE chat_message_revisions crev
-      SET chat_message_id = mm.new_chat_message_id
-      FROM moved_chat_messages mm
-      WHERE crev.chat_message_id = mm.old_chat_message_id
-    SQL
-
-    DB.exec(<<~SQL)
-      UPDATE chat_webhook_events cweb
-      SET chat_message_id = mm.new_chat_message_id
-      FROM moved_chat_messages mm
-      WHERE cweb.chat_message_id = mm.old_chat_message_id
-    SQL
-  end
-
-  def delete_source_messages
-    @source_messages.update_all(deleted_at: Time.zone.now, deleted_by_id: @acting_user.id)
-    ChatPublisher.publish_bulk_delete!(@source_channel, @source_message_ids)
-  end
-
-  def add_moved_placeholder(destination_channel, first_moved_message)
-    Chat::ChatMessageCreator.create(
-      chat_channel: @source_channel,
-      user: Discourse.system_user,
-      content:
-        I18n.t(
-          "chat.channel.messages_moved",
-          count: @source_message_ids.length,
-          acting_username: @acting_user.username,
-          channel_name: destination_channel.title(@acting_user),
-          first_moved_message_url: first_moved_message.url,
-        ),
-    )
-  end
-end
diff --git a/plugins/chat/lib/onebox/templates/discourse_chat.mustache b/plugins/chat/lib/onebox/templates/discourse_chat.mustache
index b0bcc8ef5e8..c0fdf1ff9d4 100644
--- a/plugins/chat/lib/onebox/templates/discourse_chat.mustache
+++ b/plugins/chat/lib/onebox/templates/discourse_chat.mustache
@@ -5,7 +5,7 @@
       <a href="{{url}}">
         {{#is_category}}
           <span class="category-chat-badge" style="color: #{{color}}">
-            <svg class="fa d-icon d-icon-hashtag svg-icon svg-string" xmlns="http://www.w3.org/2000/svg"><use href="#hashtag"></use></svg>
+            <svg class="fa d-icon d-icon-d-chat svg-icon svg-string" xmlns="http://www.w3.org/2000/svg"><use href="#d-chat"></use></svg>
           </span>
         {{/is_category}}
         <span class="clear-badge">{{{channel_name}}}</span>
@@ -39,10 +39,10 @@
     <div class="chat-transcript-datetime">
       <a href="{{url}}" title="{{created_at}}">{{created_at}}</a>
     </div>
-    <a class="chat-transcript-channel" href="/chat/channel/{{channel_id}}/-">
+    <a class="chat-transcript-channel" href="/chat/c/-/{{channel_id}}">
       {{#is_category}}
         <span class="category-chat-badge" style="color: #{{color}}">
-          <svg class="fa d-icon d-icon-hashtag svg-icon svg-string" xmlns="http://www.w3.org/2000/svg"><use href="#hashtag"></use></svg>
+          <svg class="fa d-icon d-icon-d-chat svg-icon svg-string" xmlns="http://www.w3.org/2000/svg"><use href="#d-chat"></use></svg>
         </span>
       {{/is_category}}
       {{#is_topic}}
diff --git a/plugins/chat/lib/post_notification_handler.rb b/plugins/chat/lib/post_notification_handler.rb
deleted file mode 100644
index beefe24ab73..00000000000
--- a/plugins/chat/lib/post_notification_handler.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-##
-# Handles :post_alerter_after_save_post events from
-# core. Used for notifying users that their chat message
-# has been quoted in a post.
-class Chat::PostNotificationHandler
-  attr_reader :post
-
-  def initialize(post, notified_users)
-    @post = post
-    @notified_users = notified_users
-  end
-
-  def handle
-    return false if post.post_type == Post.types[:whisper]
-    return false if post.topic.blank?
-    return false if post.topic.private_message?
-
-    quoted_users = extract_quoted_users(post)
-    if @notified_users.present?
-      quoted_users = quoted_users.where("users.id NOT IN (?)", @notified_users)
-    end
-
-    opts = { user_id: post.user.id, display_username: post.user.username }
-    quoted_users.each do |user|
-      # PostAlerter.create_notification handles many edge cases, such as
-      # muting, ignoring, double notifications etc.
-      PostAlerter.new.create_notification(user, Notification.types[:chat_quoted], post, opts)
-    end
-  end
-
-  private
-
-  def extract_quoted_users(post)
-    usernames =
-      post.raw.scan(/\[chat quote=\"([^;]+);.+\"\]/).uniq.map { |q| q.first.strip.downcase }
-    User.where.not(id: post.user_id).where(username_lower: usernames)
-  end
-end
diff --git a/plugins/chat/lib/secure_uploads_compatibility.rb b/plugins/chat/lib/secure_uploads_compatibility.rb
deleted file mode 100644
index 6fd898f10bc..00000000000
--- a/plugins/chat/lib/secure_uploads_compatibility.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-class Chat::SecureUploadsCompatibility
-  ##
-  # At this point in time, secure uploads is not compatible with chat,
-  # so if it is enabled then chat uploads must be disabled to avoid undesirable
-  # behaviour.
-  #
-  # The env var DISCOURSE_ALLOW_UNSECURE_CHAT_UPLOADS can be set to keep
-  # it enabled, but this is strongly advised against.
-  def self.update_settings
-    if SiteSetting.secure_uploads && SiteSetting.chat_allow_uploads &&
-         !GlobalSetting.allow_unsecure_chat_uploads
-      SiteSetting.chat_allow_uploads = false
-      StaffActionLogger.new(Discourse.system_user).log_site_setting_change(
-        "chat_allow_uploads",
-        true,
-        false,
-        context: "Disabled because secure_uploads is enabled",
-      )
-    end
-  end
-end
diff --git a/plugins/chat/lib/service_runner.rb b/plugins/chat/lib/service_runner.rb
new file mode 100644
index 00000000000..78ecff46998
--- /dev/null
+++ b/plugins/chat/lib/service_runner.rb
@@ -0,0 +1,160 @@
+# frozen_string_literal: true
+#
+# = ServiceRunner
+#
+# This class is to be used via its helper +with_service+ in any class. Its
+# main purpose is to ease how actions can be run upon a service completion.
+# Since a service will likely return the same kind of things over and over,
+# this allows us to not have to repeat the same boilerplate code in every
+# object.
+#
+# There are several available actions and we can add new ones very easily:
+#
+# * +on_success+: will execute the provided block if the service succeeds
+# * +on_failure+: will execute the provided block if the service fails
+# * +on_failed_step(name)+: will execute the provided block if the step named
+#   `name` fails
+# * +on_failed_policy(name)+: will execute the provided block if the policy
+#   named `name` fails
+# * +on_failed_contract(name)+: will execute the provided block if the contract
+#   named `name` fails
+# * +on_model_not_found(name)+: will execute the provided block if the model
+#   named `name` is not present
+# * +on_model_errors(name)+: will execute the provided block if the model named
+#   `name` contains validation errors
+#
+# All the specialized steps receive the failing step result object as an
+# argument to their block. `on_model_errors` receives the actual model so it’s
+# easier to inspect it.
+#
+# Default actions for each of these are defined in [Chat::ApiController#default_actions_for_service]
+#
+# @example In a controller
+#   def create
+#     with_service MyService do
+#       on_success do
+#         flash[:notice] = "Success!"
+#         redirect_to a_path
+#       end
+#       on_failed_policy(:a_named_policy) { |policy| redirect_to root_path, alert: policy.reason }
+#       on_failure { render :new }
+#     end
+#   end
+#
+# @example In a job (inheriting from +ServiceJob+)
+#   def execute(args = {})
+#     with_service(MyService, **args) do
+#       on_success { Rails.logger.info "SUCCESS" }
+#       on_failure { Rails.logger.error "FAILURE" }
+#     end
+#   end
+#
+# The actions will be evaluated in the order they appear. So even if the
+# service will ultimately fail with a failed policy, in this example only the
+# +on_failed_policy+ action will be executed and not the +on_failure+ one.
+# The only exception to this being +on_failure+ as it will always be executed
+# last.
+#
+
+class ServiceRunner
+  # @!visibility private
+  AVAILABLE_ACTIONS = {
+    on_success: {
+      condition: -> { result.success? },
+      key: [],
+    },
+    on_failure: {
+      condition: -> { result.failure? },
+      key: [],
+    },
+    on_failed_step: {
+      condition: ->(name) { failure_for?("result.step.#{name}") },
+      key: %w[result step],
+    },
+    on_failed_policy: {
+      condition: ->(name = "default") { failure_for?("result.policy.#{name}") },
+      key: %w[result policy],
+      default_name: "default",
+    },
+    on_failed_contract: {
+      condition: ->(name = "default") { failure_for?("result.contract.#{name}") },
+      key: %w[result contract],
+      default_name: "default",
+    },
+    on_model_not_found: {
+      condition: ->(name = "model") { failure_for?("result.model.#{name}") && result[name].blank? },
+      key: %w[result model],
+      default_name: "model",
+    },
+    on_model_errors: {
+      condition: ->(name = "model") do
+        failure_for?("result.model.#{name}") && result["result.model.#{name}"].invalid
+      end,
+      key: [],
+      default_name: "model",
+    },
+  }.with_indifferent_access.freeze
+
+  # @!visibility private
+  attr_reader :service, :object, :dependencies
+
+  delegate :result, to: :object
+
+  # @!visibility private
+  def initialize(service, object, **dependencies)
+    @service = service
+    @object = object
+    @dependencies = dependencies
+    @actions = {}
+  end
+
+  # @param service [Class] a class including {Service::Base}
+  # @param block [Proc] a block containing the steps to match on
+  # @return [void]
+  def self.call(service, object, **dependencies, &block)
+    new(service, object, **dependencies).call(&block)
+  end
+
+  # @!visibility private
+  def call(&block)
+    instance_eval(&block)
+    object.run_service(service, dependencies)
+    # Always have `on_failure` as the last action
+    (
+      actions
+        .except(:on_failure)
+        .merge(actions.slice(:on_failure))
+        .detect { |name, (condition, _)| condition.call } || [-> {}]
+    ).flatten.last.call
+  end
+
+  private
+
+  attr_reader :actions
+
+  def failure_for?(key)
+    object.result[key]&.failure?
+  end
+
+  def add_action(name, *args, &block)
+    action = AVAILABLE_ACTIONS[name]
+    actions[[name, *args].join("_").to_sym] = [
+      -> { instance_exec(*args, &action[:condition]) },
+      -> do
+        object.instance_exec(
+          result[[*action[:key], args.first || action[:default_name]].join(".")],
+          &block
+        )
+      end,
+    ]
+  end
+
+  def method_missing(method_name, *args, &block)
+    return super unless AVAILABLE_ACTIONS[method_name]
+    add_action(method_name, *args, &block)
+  end
+
+  def respond_to_missing?(method_name, include_private = false)
+    AVAILABLE_ACTIONS[method_name] || super
+  end
+end
diff --git a/plugins/chat/lib/slack_compatibility.rb b/plugins/chat/lib/slack_compatibility.rb
deleted file mode 100644
index 106af32caf3..00000000000
--- a/plugins/chat/lib/slack_compatibility.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-# frozen_string_literal: true
-
-##
-# Processes slack-formatted text messages, as Mattermost does with
-# Slack incoming webhook interoperability, for example links in the
-# format <LINK> and <LINK|TEXT>, <!here> and <!all> mentions.
-#
-# See https://api.slack.com/reference/surfaces/formatting for all of
-# the different formatting slack supports with mrkdwn which is mostly
-# identical to Markdown.
-#
-# Mattermost docs for translating the slack format:
-#
-# https://docs.mattermost.com/developer/webhooks-incoming.html?highlight=translate%20slack%20data%20format%20mattermost#translate-slack-s-data-format-to-mattermost
-#
-# We may want to process attachments and blocks from slack in future, and
-# convert user IDs into user mentions.
-class Chat::SlackCompatibility
-  MRKDWN_LINK_REGEX = Regexp.new(/(<[^\n<\|>]+>|<[^\n<\>]+>)/).freeze
-
-  class << self
-    def process_text(text)
-      text = text.gsub("<!here>", "@here")
-      text = text.gsub("<!all>", "@all")
-
-      text.scan(MRKDWN_LINK_REGEX) do |match|
-        match = match.first
-
-        if match.include?("|")
-          link, title = match.split("|")[0..1]
-        else
-          link = match
-        end
-
-        title = title&.gsub(/<|>/, "")
-        link = link&.gsub(/<|>/, "")
-
-        if title
-          text = text.gsub(match, "[#{title}](#{link})")
-        else
-          text = text.gsub(match, "#{link}")
-        end
-      end
-
-      text
-    end
-
-    # TODO: This is quite hacky and is only here to support a single
-    # attachment for our OpsGenie integration. In future we would
-    # want to iterate through this attachments array and extract
-    # things properly.
-    #
-    # See https://api.slack.com/reference/messaging/attachments for
-    # more details on what fields are here.
-    def process_legacy_attachments(attachments)
-      text = CGI.unescape(attachments[0][:fallback])
-      process_text(text)
-    end
-  end
-end
diff --git a/plugins/chat/lib/tasks/chat.rake b/plugins/chat/lib/tasks/chat.rake
index a53e1b319cc..2e91673c900 100644
--- a/plugins/chat/lib/tasks/chat.rake
+++ b/plugins/chat/lib/tasks/chat.rake
@@ -1,23 +1,26 @@
 # frozen_string_literal: true
 
 if Discourse.allow_dev_populate?
-  chat_task = Rake::Task["dev:populate"]
-  chat_task.enhance do
-    SiteSetting.chat_enabled = true
-    DiscourseDev::PublicChannel.populate!
-    DiscourseDev::DirectChannel.populate!
-    DiscourseDev::Message.populate!
-  end
-
-  desc "Generates sample content for chat"
-  task "chat:populate" => ["db:load_config"] do |_, args|
-    DiscourseDev::PublicChannel.new.populate!(ignore_current_count: true)
-    DiscourseDev::DirectChannel.new.populate!(ignore_current_count: true)
-    DiscourseDev::Message.new.populate!(ignore_current_count: true)
-  end
-
   desc "Generates sample messages in channels"
-  task "chat:message:populate" => ["db:load_config"] do |_, args|
-    DiscourseDev::Message.new.populate!(ignore_current_count: true)
+  task "chat:message:populate", %i[channel_id count] => ["db:load_config"] do |_, args|
+    DiscourseDev::Message.populate!(
+      ignore_current_count: true,
+      channel_id: args[:channel_id],
+      count: args[:count],
+    )
+  end
+
+  desc "Generates random channels from categories"
+  task "chat:category_channel:populate" => ["db:load_config"] do |_, args|
+    DiscourseDev::CategoryChannel.populate!(ignore_current_count: true)
+  end
+
+  desc "Creates a thread with sample messages in a channel"
+  task "chat:thread:populate", %i[channel_id message_count] => ["db:load_config"] do |_, args|
+    DiscourseDev::Thread.populate!(
+      ignore_current_count: true,
+      channel_id: args[:channel_id],
+      message_count: args[:message_count],
+    )
   end
 end
diff --git a/plugins/chat/lib/tasks/chat_message.rake b/plugins/chat/lib/tasks/chat_message.rake
index 603722e4ba4..316033fcd21 100644
--- a/plugins/chat/lib/tasks/chat_message.rake
+++ b/plugins/chat/lib/tasks/chat_message.rake
@@ -15,7 +15,7 @@ end
 
 def rebake_uncooked_chat_messages
   puts "Rebaking uncooked chat messages on #{RailsMultisite::ConnectionManagement.current_db}"
-  uncooked = ChatMessage.uncooked
+  uncooked = Chat::Message.uncooked
 
   rebaked = 0
   total = uncooked.count
@@ -100,7 +100,7 @@ task "chat:make_channel_to_test_archiving", [:user_for_membership] => :environme
       raw: "This is some cool first post for archive stuff",
     )
     chat_channel =
-      ChatChannel.create(
+      Chat::Channel.create(
         chatable: topic,
         chatable_type: "Topic",
         name: "testing channel for archiving #{SecureRandom.hex(4)}",
@@ -112,12 +112,13 @@ task "chat:make_channel_to_test_archiving", [:user_for_membership] => :environme
 
   users = [make_test_user, make_test_user, make_test_user]
 
-  ChatChannel.transaction do
+  Chat::Channel.transaction do
     start_time = Time.now
 
     puts "creating 1039 messages for the channel"
     1039.times do
-      cm = ChatMessage.new(message: messages.sample, user: users.sample, chat_channel: chat_channel)
+      cm =
+        Chat::Message.new(message: messages.sample, user: users.sample, chat_channel: chat_channel)
       cm.cook
       cm.save!
     end
@@ -125,7 +126,7 @@ task "chat:make_channel_to_test_archiving", [:user_for_membership] => :environme
     puts "message creation done"
     puts "took #{Time.now - start_time} seconds"
 
-    UserChatChannelMembership.create(
+    Chat::UserChatChannelMembership.create(
       chat_channel: chat_channel,
       last_read_message_id: 0,
       user: User.find_by(username: user_for_membership),
diff --git a/plugins/chat/lib/validators/chat_allow_uploads_validator.rb b/plugins/chat/lib/validators/chat_allow_uploads_validator.rb
deleted file mode 100644
index bd7bbd4b020..00000000000
--- a/plugins/chat/lib/validators/chat_allow_uploads_validator.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-class ChatAllowUploadsValidator
-  def initialize(opts = {})
-    @opts = opts
-  end
-
-  def valid_value?(value)
-    return false if value == "t" && prevent_enabling_chat_uploads?
-    true
-  end
-
-  def error_message
-    if prevent_enabling_chat_uploads?
-      I18n.t("site_settings.errors.chat_upload_not_allowed_secure_uploads")
-    end
-  end
-
-  def prevent_enabling_chat_uploads?
-    SiteSetting.secure_uploads && !GlobalSetting.allow_unsecure_chat_uploads
-  end
-end
diff --git a/plugins/chat/lib/validators/chat_default_channel_validator.rb b/plugins/chat/lib/validators/chat_default_channel_validator.rb
deleted file mode 100644
index 917663fcfea..00000000000
--- a/plugins/chat/lib/validators/chat_default_channel_validator.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-class ChatDefaultChannelValidator
-  def initialize(opts = {})
-    @opts = opts
-  end
-
-  def valid_value?(value)
-    !!(value == "" || ChatChannel.find_by(id: value.to_i)&.public_channel?)
-  end
-
-  def error_message
-    I18n.t("site_settings.errors.chat_default_channel")
-  end
-end
diff --git a/plugins/chat/lib/validators/direct_message_enabled_groups_validator.rb b/plugins/chat/lib/validators/direct_message_enabled_groups_validator.rb
deleted file mode 100644
index bcd54905124..00000000000
--- a/plugins/chat/lib/validators/direct_message_enabled_groups_validator.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-class DirectMessageEnabledGroupsValidator
-  def initialize(opts = {})
-    @opts = opts
-  end
-
-  def valid_value?(val)
-    val.present? && val != ""
-  end
-
-  def error_message
-    I18n.t("site_settings.errors.direct_message_enabled_groups_invalid")
-  end
-end
diff --git a/plugins/chat/plugin.rb b/plugins/chat/plugin.rb
index 8a9127e51e6..16584f9de06 100644
--- a/plugins/chat/plugin.rb
+++ b/plugins/chat/plugin.rb
@@ -9,71 +9,15 @@
 
 enabled_site_setting :chat_enabled
 
-register_asset "stylesheets/mixins/chat-scrollbar.scss"
-register_asset "stylesheets/common/core-extensions.scss"
-register_asset "stylesheets/common/chat-emoji-picker.scss"
-register_asset "stylesheets/common/chat-channel-card.scss"
-register_asset "stylesheets/common/dc-filter-input.scss"
-register_asset "stylesheets/common/common.scss"
-register_asset "stylesheets/common/chat-browse.scss"
-register_asset "stylesheets/common/chat-drawer.scss"
-register_asset "stylesheets/common/chat-index.scss"
-register_asset "stylesheets/mobile/chat-index.scss", :mobile
-register_asset "stylesheets/desktop/chat-index-full-page.scss", :desktop
-register_asset "stylesheets/desktop/chat-index-drawer.scss", :desktop
-register_asset "stylesheets/common/chat-channel-preview-card.scss"
-register_asset "stylesheets/common/chat-channel-info.scss"
-register_asset "stylesheets/common/chat-draft-channel.scss"
-register_asset "stylesheets/common/chat-tabs.scss"
-register_asset "stylesheets/common/chat-form.scss"
-register_asset "stylesheets/common/d-progress-bar.scss"
-register_asset "stylesheets/common/incoming-chat-webhooks.scss"
-register_asset "stylesheets/mobile/chat-message.scss", :mobile
-register_asset "stylesheets/desktop/chat-message.scss", :desktop
-register_asset "stylesheets/common/chat-channel-title.scss"
-register_asset "stylesheets/desktop/chat-channel-title.scss", :desktop
-register_asset "stylesheets/common/full-page-chat-header.scss"
-register_asset "stylesheets/common/chat-reply.scss"
-register_asset "stylesheets/common/chat-message.scss"
-register_asset "stylesheets/common/chat-message-left-gutter.scss"
-register_asset "stylesheets/common/chat-message-info.scss"
-register_asset "stylesheets/common/chat-composer-inline-button.scss"
-register_asset "stylesheets/common/chat-replying-indicator.scss"
-register_asset "stylesheets/common/chat-composer.scss"
-register_asset "stylesheets/desktop/chat-composer.scss", :desktop
-register_asset "stylesheets/mobile/chat-composer.scss", :mobile
-register_asset "stylesheets/common/direct-message-creator.scss"
-register_asset "stylesheets/common/chat-message-collapser.scss"
-register_asset "stylesheets/common/chat-message-images.scss"
-register_asset "stylesheets/common/chat-transcript.scss"
-register_asset "stylesheets/common/chat-composer-dropdown.scss"
-register_asset "stylesheets/common/chat-retention-reminder.scss"
-register_asset "stylesheets/common/chat-composer-uploads.scss"
-register_asset "stylesheets/desktop/chat-composer-uploads.scss", :desktop
-register_asset "stylesheets/common/chat-composer-upload.scss"
-register_asset "stylesheets/common/chat-selection-manager.scss"
-register_asset "stylesheets/mobile/chat-selection-manager.scss", :mobile
-register_asset "stylesheets/common/chat-channel-selector-modal.scss"
-register_asset "stylesheets/mobile/mobile.scss", :mobile
-register_asset "stylesheets/desktop/desktop.scss", :desktop
-register_asset "stylesheets/sidebar-extensions.scss"
-register_asset "stylesheets/desktop/sidebar-extensions.scss", :desktop
-register_asset "stylesheets/common/chat-message-actions.scss"
-register_asset "stylesheets/desktop/chat-message-actions.scss", :desktop
-register_asset "stylesheets/mobile/chat-message-actions.scss", :mobile
-register_asset "stylesheets/common/chat-message-separator.scss"
-register_asset "stylesheets/common/chat-onebox.scss"
-register_asset "stylesheets/common/chat-skeleton.scss"
 register_asset "stylesheets/colors.scss", :color_definitions
-register_asset "stylesheets/common/reviewable-chat-message.scss"
-register_asset "stylesheets/common/chat-mention-warnings.scss"
-register_asset "stylesheets/common/chat-channel-settings-saved-indicator.scss"
+register_asset "stylesheets/mixins/index.scss"
+register_asset "stylesheets/common/index.scss"
+register_asset "stylesheets/desktop/index.scss", :desktop
+register_asset "stylesheets/mobile/index.scss", :mobile
 
 register_svg_icon "comments"
 register_svg_icon "comment-slash"
-register_svg_icon "hashtag"
 register_svg_icon "lock"
-
 register_svg_icon "file-audio"
 register_svg_icon "file-video"
 register_svg_icon "file-image"
@@ -81,160 +25,18 @@ register_svg_icon "file-image"
 # route: /admin/plugins/chat
 add_admin_route "chat.admin.title", "chat"
 
-# Site setting validators must be loaded before initialize
-require_relative "lib/validators/chat_default_channel_validator.rb"
-require_relative "lib/validators/chat_allow_uploads_validator.rb"
-require_relative "lib/validators/direct_message_enabled_groups_validator.rb"
-require_relative "app/core_ext/plugin_instance.rb"
-
 GlobalSetting.add_default(:allow_unsecure_chat_uploads, false)
 
+module ::Chat
+  PLUGIN_NAME = "chat"
+end
+
+require_relative "lib/chat/engine"
+require_relative "lib/chat/types/array"
+
 after_initialize do
-  module ::Chat
-    PLUGIN_NAME = "chat"
-    HAS_CHAT_ENABLED = "has_chat_enabled"
-
-    class Engine < ::Rails::Engine
-      engine_name PLUGIN_NAME
-      isolate_namespace Chat
-    end
-
-    def self.allowed_group_ids
-      SiteSetting.chat_allowed_groups_map
-    end
-
-    def self.onebox_template
-      @onebox_template ||=
-        begin
-          path = "#{Rails.root}/plugins/chat/lib/onebox/templates/discourse_chat.mustache"
-          File.read(path)
-        end
-    end
-  end
-
   register_seedfu_fixtures(Rails.root.join("plugins", "chat", "db", "fixtures"))
 
-  load File.expand_path(
-         "../app/controllers/admin/admin_incoming_chat_webhooks_controller.rb",
-         __FILE__,
-       )
-  load File.expand_path("../app/controllers/chat_base_controller.rb", __FILE__)
-  load File.expand_path("../app/controllers/chat_controller.rb", __FILE__)
-  load File.expand_path("../app/controllers/emojis_controller.rb", __FILE__)
-  load File.expand_path("../app/controllers/direct_messages_controller.rb", __FILE__)
-  load File.expand_path("../app/controllers/incoming_chat_webhooks_controller.rb", __FILE__)
-  load File.expand_path("../app/models/concerns/chatable.rb", __FILE__)
-  load File.expand_path("../app/models/deleted_chat_user.rb", __FILE__)
-  load File.expand_path("../app/models/user_chat_channel_membership.rb", __FILE__)
-  load File.expand_path("../app/models/chat_channel.rb", __FILE__)
-  load File.expand_path("../app/models/chat_channel_archive.rb", __FILE__)
-  load File.expand_path("../app/models/chat_draft.rb", __FILE__)
-  load File.expand_path("../app/models/chat_message.rb", __FILE__)
-  load File.expand_path("../app/models/chat_message_reaction.rb", __FILE__)
-  load File.expand_path("../app/models/chat_message_revision.rb", __FILE__)
-  load File.expand_path("../app/models/chat_mention.rb", __FILE__)
-  load File.expand_path("../app/models/chat_upload.rb", __FILE__)
-  load File.expand_path("../app/models/chat_webhook_event.rb", __FILE__)
-  load File.expand_path("../app/models/direct_message_channel.rb", __FILE__)
-  load File.expand_path("../app/models/direct_message.rb", __FILE__)
-  load File.expand_path("../app/models/direct_message_user.rb", __FILE__)
-  load File.expand_path("../app/models/incoming_chat_webhook.rb", __FILE__)
-  load File.expand_path("../app/models/reviewable_chat_message.rb", __FILE__)
-  load File.expand_path("../app/models/chat_view.rb", __FILE__)
-  load File.expand_path("../app/models/category_channel.rb", __FILE__)
-  load File.expand_path("../app/serializers/structured_channel_serializer.rb", __FILE__)
-  load File.expand_path("../app/serializers/chat_webhook_event_serializer.rb", __FILE__)
-  load File.expand_path("../app/serializers/chat_in_reply_to_serializer.rb", __FILE__)
-  load File.expand_path("../app/serializers/base_chat_channel_membership_serializer.rb", __FILE__)
-  load File.expand_path("../app/serializers/user_chat_channel_membership_serializer.rb", __FILE__)
-  load File.expand_path("../app/serializers/chat_message_serializer.rb", __FILE__)
-  load File.expand_path("../app/serializers/chat_channel_serializer.rb", __FILE__)
-  load File.expand_path("../app/serializers/chat_channel_index_serializer.rb", __FILE__)
-  load File.expand_path("../app/serializers/chat_channel_search_serializer.rb", __FILE__)
-  load File.expand_path("../app/serializers/chat_view_serializer.rb", __FILE__)
-  load File.expand_path(
-         "../app/serializers/user_with_custom_fields_and_status_serializer.rb",
-         __FILE__,
-       )
-  load File.expand_path("../app/serializers/direct_message_serializer.rb", __FILE__)
-  load File.expand_path("../app/serializers/incoming_chat_webhook_serializer.rb", __FILE__)
-  load File.expand_path("../app/serializers/admin_chat_index_serializer.rb", __FILE__)
-  load File.expand_path("../app/serializers/user_chat_message_bookmark_serializer.rb", __FILE__)
-  load File.expand_path("../app/serializers/reviewable_chat_message_serializer.rb", __FILE__)
-  load File.expand_path("../lib/chat_channel_fetcher.rb", __FILE__)
-  load File.expand_path("../lib/chat_channel_hashtag_data_source.rb", __FILE__)
-  load File.expand_path("../lib/chat_mailer.rb", __FILE__)
-  load File.expand_path("../lib/chat_message_creator.rb", __FILE__)
-  load File.expand_path("../lib/chat_message_processor.rb", __FILE__)
-  load File.expand_path("../lib/chat_message_updater.rb", __FILE__)
-  load File.expand_path("../lib/chat_message_rate_limiter.rb", __FILE__)
-  load File.expand_path("../lib/chat_message_reactor.rb", __FILE__)
-  load File.expand_path("../lib/chat_notifier.rb", __FILE__)
-  load File.expand_path("../lib/chat_seeder.rb", __FILE__)
-  load File.expand_path("../lib/chat_statistics.rb", __FILE__)
-  load File.expand_path("../lib/chat_transcript_service.rb", __FILE__)
-  load File.expand_path("../lib/duplicate_message_validator.rb", __FILE__)
-  load File.expand_path("../lib/message_mover.rb", __FILE__)
-  load File.expand_path("../lib/chat_channel_membership_manager.rb", __FILE__)
-  load File.expand_path("../lib/chat_message_bookmarkable.rb", __FILE__)
-  load File.expand_path("../lib/chat_channel_archive_service.rb", __FILE__)
-  load File.expand_path("../lib/chat_review_queue.rb", __FILE__)
-  load File.expand_path("../lib/direct_message_channel_creator.rb", __FILE__)
-  load File.expand_path("../lib/guardian_extensions.rb", __FILE__)
-  load File.expand_path("../lib/extensions/user_option_extension.rb", __FILE__)
-  load File.expand_path("../lib/extensions/user_notifications_extension.rb", __FILE__)
-  load File.expand_path("../lib/extensions/user_email_extension.rb", __FILE__)
-  load File.expand_path("../lib/extensions/category_extension.rb", __FILE__)
-  load File.expand_path("../lib/extensions/user_extension.rb", __FILE__)
-  load File.expand_path("../lib/slack_compatibility.rb", __FILE__)
-  load File.expand_path("../lib/post_notification_handler.rb", __FILE__)
-  load File.expand_path("../lib/secure_uploads_compatibility.rb", __FILE__)
-  load File.expand_path("../app/jobs/regular/auto_manage_channel_memberships.rb", __FILE__)
-  load File.expand_path("../app/jobs/regular/auto_join_channel_batch.rb", __FILE__)
-  load File.expand_path("../app/jobs/regular/process_chat_message.rb", __FILE__)
-  load File.expand_path("../app/jobs/regular/chat_channel_archive.rb", __FILE__)
-  load File.expand_path("../app/jobs/regular/chat_channel_delete.rb", __FILE__)
-  load File.expand_path("../app/jobs/regular/chat_notify_mentioned.rb", __FILE__)
-  load File.expand_path("../app/jobs/regular/chat_notify_watching.rb", __FILE__)
-  load File.expand_path("../app/jobs/regular/update_channel_user_count.rb", __FILE__)
-  load File.expand_path("../app/jobs/regular/delete_user_messages.rb", __FILE__)
-  load File.expand_path("../app/jobs/regular/send_message_notifications.rb", __FILE__)
-  load File.expand_path("../app/jobs/scheduled/delete_old_chat_messages.rb", __FILE__)
-  load File.expand_path("../app/jobs/scheduled/update_user_counts_for_chat_channels.rb", __FILE__)
-  load File.expand_path("../app/jobs/scheduled/email_chat_notifications.rb", __FILE__)
-  load File.expand_path("../app/jobs/scheduled/auto_join_users.rb", __FILE__)
-  load File.expand_path("../app/jobs/scheduled/chat_periodical_updates.rb", __FILE__)
-  load File.expand_path("../app/services/chat_publisher.rb", __FILE__)
-  load File.expand_path("../app/services/chat_message_destroyer.rb", __FILE__)
-  load File.expand_path("../app/controllers/api_controller.rb", __FILE__)
-  load File.expand_path("../app/controllers/api/chat_channels_controller.rb", __FILE__)
-  load File.expand_path("../app/controllers/api/chat_current_user_channels_controller.rb", __FILE__)
-  load File.expand_path(
-         "../app/controllers/api/chat_channels_current_user_membership_controller.rb",
-         __FILE__,
-       )
-  load File.expand_path("../app/controllers/api/chat_channels_memberships_controller.rb", __FILE__)
-  load File.expand_path(
-         "../app/controllers/api/chat_channels_messages_moves_controller.rb",
-         __FILE__,
-       )
-  load File.expand_path("../app/controllers/api/chat_channels_archives_controller.rb", __FILE__)
-  load File.expand_path("../app/controllers/api/chat_channels_status_controller.rb", __FILE__)
-  load File.expand_path(
-         "../app/controllers/api/chat_channels_current_user_notifications_settings_controller.rb",
-         __FILE__,
-       )
-  load File.expand_path("../app/controllers/api/category_chatables_controller.rb", __FILE__)
-  load File.expand_path("../app/controllers/api/hints_controller.rb", __FILE__)
-  load File.expand_path("../app/controllers/api/chat_chatables_controller.rb", __FILE__)
-  load File.expand_path("../app/queries/chat_channel_memberships_query.rb", __FILE__)
-
-  if Discourse.allow_dev_populate?
-    load File.expand_path("../lib/discourse_dev/public_channel.rb", __FILE__)
-    load File.expand_path("../lib/discourse_dev/direct_channel.rb", __FILE__)
-    load File.expand_path("../lib/discourse_dev/message.rb", __FILE__)
-  end
-
   UserNotifications.append_view_path(File.expand_path("../app/views", __FILE__))
 
   register_category_custom_field_type(Chat::HAS_CHAT_ENABLED, :boolean)
@@ -244,8 +46,9 @@ after_initialize do
   UserUpdater::OPTION_ATTR.push(:chat_sound)
   UserUpdater::OPTION_ATTR.push(:ignore_channel_wide_mention)
   UserUpdater::OPTION_ATTR.push(:chat_email_frequency)
+  UserUpdater::OPTION_ATTR.push(:chat_header_indicator_preference)
 
-  register_reviewable_type ReviewableChatMessage
+  register_reviewable_type Chat::ReviewableMessage
 
   reloadable_patch do |plugin|
     ReviewableScore.add_new_types([:needs_review])
@@ -256,30 +59,25 @@ after_initialize do
     UserNotifications.prepend Chat::UserNotificationsExtension
     UserOption.prepend Chat::UserOptionExtension
     Category.prepend Chat::CategoryExtension
+    Reviewable.prepend Chat::ReviewableExtension
+    Bookmark.prepend Chat::BookmarkExtension
     User.prepend Chat::UserExtension
     Jobs::UserEmail.prepend Chat::UserEmailExtension
-    Bookmark.register_bookmarkable(ChatMessageBookmarkable)
+    Plugin::Instance.prepend Chat::PluginInstanceExtension
+    Jobs::ExportCsvFile.class_eval { prepend Chat::MessagesExporter }
   end
 
   if Oneboxer.respond_to?(:register_local_handler)
     Oneboxer.register_local_handler("chat/chat") do |url, route|
-      queryParams =
-        begin
-          CGI.parse(URI.parse(url).query)
-        rescue StandardError
-          {}
-        end
-      messageId = queryParams["messageId"]&.first
-
-      if messageId.present?
-        message = ChatMessage.find_by(id: messageId)
+      if route[:message_id].present?
+        message = Chat::Message.find_by(id: route[:message_id])
         next if !message
 
         chat_channel = message.chat_channel
         user = message.user
         next if !chat_channel || !user
       else
-        chat_channel = ChatChannel.find_by(id: route[:channel_id])
+        chat_channel = Chat::Channel.find_by(id: route[:channel_id])
         next if !chat_channel
       end
 
@@ -332,16 +130,8 @@ after_initialize do
 
   if InlineOneboxer.respond_to?(:register_local_handler)
     InlineOneboxer.register_local_handler("chat/chat") do |url, route|
-      queryParams =
-        begin
-          CGI.parse(URI.parse(url).query)
-        rescue StandardError
-          {}
-        end
-      messageId = queryParams["messageId"]&.first
-
-      if messageId.present?
-        message = ChatMessage.find_by(id: messageId)
+      if route[:message_id].present?
+        message = Chat::Message.find_by(id: route[:message_id])
         next if !message
 
         chat_channel = message.chat_channel
@@ -356,7 +146,7 @@ after_initialize do
             username: user.username,
           )
       else
-        chat_channel = ChatChannel.find_by(id: route[:channel_id])
+        chat_channel = Chat::Channel.find_by(id: route[:channel_id])
         next if !chat_channel
 
         title =
@@ -371,22 +161,14 @@ after_initialize do
     end
   end
 
-  if respond_to?(:register_upload_unused)
-    register_upload_unused do |uploads|
-      uploads.joins("LEFT JOIN chat_uploads cu ON cu.upload_id = uploads.id").where(
-        "cu.upload_id IS NULL",
-      )
-    end
-  end
-
   if respond_to?(:register_upload_in_use)
     register_upload_in_use do |upload|
-      ChatMessage.where(
+      Chat::Message.where(
         "message LIKE ? OR message LIKE ?",
         "%#{upload.sha1}%",
         "%#{upload.base62_sha1}%",
       ).exists? ||
-        ChatDraft.where(
+        Chat::Draft.where(
           "data LIKE ? OR data LIKE ?",
           "%#{upload.sha1}%",
           "%#{upload.base62_sha1}%",
@@ -401,34 +183,51 @@ after_initialize do
     scope.user.id != object.id && scope.can_chat? && Guardian.new(object).can_chat?
   end
 
-  add_to_serializer(:current_user, :can_chat) { true }
+  add_to_serializer(
+    :current_user,
+    :can_chat,
+    include_condition: -> do
+      return @can_chat if defined?(@can_chat)
+      @can_chat = SiteSetting.chat_enabled && scope.can_chat?
+    end,
+  ) { true }
 
-  add_to_serializer(:current_user, :include_can_chat?) do
-    return @can_chat if defined?(@can_chat)
+  add_to_serializer(
+    :current_user,
+    :has_chat_enabled,
+    include_condition: -> do
+      return @has_chat_enabled if defined?(@has_chat_enabled)
+      @has_chat_enabled = include_can_chat? && object.user_option.chat_enabled
+    end,
+  ) { true }
 
-    @can_chat = SiteSetting.chat_enabled && scope.can_chat?
-  end
+  add_to_serializer(
+    :current_user,
+    :chat_sound,
+    include_condition: -> { include_has_chat_enabled? && object.user_option.chat_sound },
+  ) { object.user_option.chat_sound }
 
-  add_to_serializer(:current_user, :has_chat_enabled) { true }
+  add_to_serializer(
+    :current_user,
+    :needs_channel_retention_reminder,
+    include_condition: -> do
+      include_has_chat_enabled? && object.staff? &&
+        !object.user_option.dismissed_channel_retention_reminder &&
+        !SiteSetting.chat_channel_retention_days.zero?
+    end,
+  ) { true }
 
-  add_to_serializer(:current_user, :include_has_chat_enabled?) do
-    return @has_chat_enabled if defined?(@has_chat_enabled)
-
-    @has_chat_enabled = include_can_chat? && object.user_option.chat_enabled
-  end
-
-  add_to_serializer(:current_user, :chat_sound) { object.user_option.chat_sound }
-
-  add_to_serializer(:current_user, :include_chat_sound?) do
-    include_has_chat_enabled? && object.user_option.chat_sound
-  end
-
-  add_to_serializer(:current_user, :needs_channel_retention_reminder) { true }
-
-  add_to_serializer(:current_user, :needs_dm_retention_reminder) { true }
+  add_to_serializer(
+    :current_user,
+    :needs_dm_retention_reminder,
+    include_condition: -> do
+      include_has_chat_enabled? && !object.user_option.dismissed_dm_retention_reminder &&
+        !SiteSetting.chat_dm_retention_days.zero?
+    end,
+  ) { true }
 
   add_to_serializer(:current_user, :has_joinable_public_channels) do
-    Chat::ChatChannelFetcher.secured_public_channel_search(
+    Chat::ChannelFetcher.secured_public_channel_search(
       self.scope,
       following: false,
       limit: 1,
@@ -437,23 +236,34 @@ after_initialize do
   end
 
   add_to_serializer(:current_user, :chat_channels) do
-    structured = Chat::ChatChannelFetcher.structured(self.scope)
-    ChatChannelIndexSerializer.new(structured, scope: self.scope, root: false).as_json
+    structured = Chat::ChannelFetcher.structured(self.scope)
+
+    structured[:unread_thread_overview] = ::Chat::TrackingStateReportQuery.call(
+      guardian: self.scope,
+      channel_ids: structured[:public_channels].map(&:id),
+      include_threads: true,
+      include_read: false,
+      include_last_reply_details: true,
+    ).thread_unread_overview_by_channel
+
+    category_ids = structured[:public_channels].map { |c| c.chatable_id }
+    post_allowed_category_ids =
+      Category.post_create_allowed(self.scope).where(id: category_ids).pluck(:id)
+
+    Chat::ChannelIndexSerializer.new(
+      structured,
+      scope: self.scope,
+      root: false,
+      post_allowed_category_ids: post_allowed_category_ids,
+    ).as_json
   end
 
-  add_to_serializer(:current_user, :include_needs_channel_retention_reminder?) do
-    include_has_chat_enabled? && object.staff? &&
-      !object.user_option.dismissed_channel_retention_reminder &&
-      !SiteSetting.chat_channel_retention_days.zero?
-  end
-
-  add_to_serializer(:current_user, :include_needs_dm_retention_reminder?) do
-    include_has_chat_enabled? && !object.user_option.dismissed_dm_retention_reminder &&
-      !SiteSetting.chat_dm_retention_days.zero?
-  end
-
-  add_to_serializer(:current_user, :chat_drafts) do
-    ChatDraft
+  add_to_serializer(
+    :current_user,
+    :chat_drafts,
+    include_condition: -> { include_has_chat_enabled? },
+  ) do
+    Chat::Draft
       .where(user_id: object.id)
       .order(updated_at: :desc)
       .limit(20)
@@ -461,13 +271,13 @@ after_initialize do
       .map { |row| { channel_id: row[0], data: row[1] } }
   end
 
-  add_to_serializer(:current_user, :include_chat_drafts?) { include_has_chat_enabled? }
-
   add_to_serializer(:user_option, :chat_enabled) { object.chat_enabled }
 
-  add_to_serializer(:user_option, :chat_sound) { object.chat_sound }
-
-  add_to_serializer(:user_option, :include_chat_sound?) { !object.chat_sound.blank? }
+  add_to_serializer(
+    :user_option,
+    :chat_sound,
+    include_condition: -> { !object.chat_sound.blank? },
+  ) { object.chat_sound }
 
   add_to_serializer(:user_option, :only_chat_push_notifications) do
     object.only_chat_push_notifications
@@ -479,6 +289,14 @@ after_initialize do
 
   add_to_serializer(:user_option, :chat_email_frequency) { object.chat_email_frequency }
 
+  add_to_serializer(:user_option, :chat_header_indicator_preference) do
+    object.chat_header_indicator_preference
+  end
+
+  add_to_serializer(:current_user_option, :chat_header_indicator_preference) do
+    object.chat_header_indicator_preference
+  end
+
   RETENTION_SETTINGS_TO_USER_OPTION_FIELDS = {
     chat_channel_retention_days: :dismissed_channel_retention_reminder,
     chat_dm_retention_days: :dismissed_dm_retention_reminder,
@@ -498,6 +316,13 @@ after_initialize do
     if name == :secure_uploads && old_value == false && new_value == true
       Chat::SecureUploadsCompatibility.update_settings
     end
+
+    if name == :chat_allowed_groups
+      Jobs.enqueue(
+        Jobs::Chat::AutoRemoveMembershipHandleChatAllowedGroupsChange,
+        new_allowed_groups: new_value,
+      )
+    end
   end
 
   on(:post_alerter_after_save_post) do |post, new_record, notified|
@@ -505,6 +330,13 @@ after_initialize do
     Chat::PostNotificationHandler.new(post, notified).handle
   end
 
+  on(:group_destroyed) do |group, user_ids|
+    Jobs.enqueue(
+      Jobs::Chat::AutoRemoveMembershipHandleDestroyedGroup,
+      destroyed_group_user_ids: user_ids,
+    )
+  end
+
   register_presence_channel_prefix("chat") do |channel_name|
     next nil unless channel_name == "/chat/online"
     config = PresenceChannel::Config.new
@@ -514,7 +346,7 @@ after_initialize do
 
   register_presence_channel_prefix("chat-reply") do |channel_name|
     if chat_channel_id = channel_name[%r{/chat-reply/(\d+)}, 1]
-      chat_channel = ChatChannel.find(chat_channel_id)
+      chat_channel = Chat::Channel.find(chat_channel_id)
 
       PresenceChannel::Config.new.tap do |config|
         config.allowed_group_ids = chat_channel.allowed_group_ids
@@ -548,27 +380,27 @@ after_initialize do
 
   on(:user_seen) do |user|
     if user.last_seen_at == user.first_seen_at
-      ChatChannel
+      Chat::Channel
         .where(auto_join_users: true)
         .each do |channel|
-          Chat::ChatChannelMembershipManager.new(channel).enforce_automatic_user_membership(user)
+          Chat::ChannelMembershipManager.new(channel).enforce_automatic_user_membership(user)
         end
     end
   end
 
   on(:user_confirmed_email) do |user|
     if user.active?
-      ChatChannel
+      Chat::Channel
         .where(auto_join_users: true)
         .each do |channel|
-          Chat::ChatChannelMembershipManager.new(channel).enforce_automatic_user_membership(user)
+          Chat::ChannelMembershipManager.new(channel).enforce_automatic_user_membership(user)
         end
     end
   end
 
   on(:user_added_to_group) do |user, group|
     channels_to_add =
-      ChatChannel
+      Chat::Channel
         .distinct
         .where(auto_join_users: true, chatable_type: "Category")
         .joins(
@@ -577,106 +409,38 @@ after_initialize do
         .where(category_groups: { group_id: group.id })
 
     channels_to_add.each do |channel|
-      Chat::ChatChannelMembershipManager.new(channel).enforce_automatic_user_membership(user)
+      Chat::ChannelMembershipManager.new(channel).enforce_automatic_user_membership(user)
     end
   end
 
+  on(:user_removed_from_group) do |user, group|
+    Jobs.enqueue(Jobs::Chat::AutoRemoveMembershipHandleUserRemovedFromGroup, user_id: user.id)
+  end
+
   on(:category_updated) do |category|
     # TODO(roman): remove early return after 2.9 release.
     # There's a bug on core where this event is triggered with an `#update` result (true/false)
-    return if !category.is_a?(Category)
-    category_channel = ChatChannel.find_by(auto_join_users: true, chatable: category)
+    if category.is_a?(Category) && category_channel = Chat::Channel.find_by(chatable: category)
+      if category_channel.auto_join_users
+        Chat::ChannelMembershipManager.new(category_channel).enforce_automatic_channel_memberships
+      end
 
-    if category_channel
-      Chat::ChatChannelMembershipManager.new(category_channel).enforce_automatic_channel_memberships
+      Jobs.enqueue(Jobs::Chat::AutoRemoveMembershipHandleCategoryUpdated, category_id: category.id)
     end
   end
 
-  Chat::Engine.routes.draw do
-    namespace :api, defaults: { format: :json } do
-      get "/chatables" => "chat_chatables#index"
-      get "/channels" => "chat_channels#index"
-      get "/channels/me" => "chat_current_user_channels#index"
-      post "/channels" => "chat_channels#create"
-      delete "/channels/:channel_id" => "chat_channels#destroy"
-      put "/channels/:channel_id" => "chat_channels#update"
-      get "/channels/:channel_id" => "chat_channels#show"
-      put "/channels/:channel_id/status" => "chat_channels_status#update"
-      post "/channels/:channel_id/messages/moves" => "chat_channels_messages_moves#create"
-      post "/channels/:channel_id/archives" => "chat_channels_archives#create"
-      get "/channels/:channel_id/memberships" => "chat_channels_memberships#index"
-      delete "/channels/:channel_id/memberships/me" =>
-               "chat_channels_current_user_membership#destroy"
-      post "/channels/:channel_id/memberships/me" => "chat_channels_current_user_membership#create"
-      put "/channels/:channel_id/notifications-settings/me" =>
-            "chat_channels_current_user_notifications_settings#update"
-
-      # Category chatables controller hints. Only used by staff members, we don't want to leak category permissions.
-      get "/category-chatables/:id/permissions" => "category_chatables#permissions",
-          :format => :json,
-          :constraints => StaffConstraint.new
-
-      # Hints for JIT warnings.
-      get "/mentions/groups" => "hints#check_group_mentions", :format => :json
-    end
-
-    # direct_messages_controller routes
-    get "/direct_messages" => "direct_messages#index"
-    post "/direct_messages/create" => "direct_messages#create"
-
-    # incoming_webhooks_controller routes
-    post "/hooks/:key" => "incoming_chat_webhooks#create_message"
-
-    # incoming_webhooks_controller routes
-    post "/hooks/:key/slack" => "incoming_chat_webhooks#create_message_slack_compatible"
-
-    # chat_controller routes
-    get "/" => "chat#respond"
-    get "/browse" => "chat#respond"
-    get "/browse/all" => "chat#respond"
-    get "/browse/closed" => "chat#respond"
-    get "/browse/open" => "chat#respond"
-    get "/browse/archived" => "chat#respond"
-    get "/draft-channel" => "chat#respond"
-    get "/channel/:channel_id" => "chat#respond"
-    get "/channel/:channel_id/:channel_title" => "chat#respond", :as => "channel"
-    get "/channel/:channel_id/:channel_title/info" => "chat#respond"
-    get "/channel/:channel_id/:channel_title/info/about" => "chat#respond"
-    get "/channel/:channel_id/:channel_title/info/members" => "chat#respond"
-    get "/channel/:channel_id/:channel_title/info/settings" => "chat#respond"
-    post "/enable" => "chat#enable_chat"
-    post "/disable" => "chat#disable_chat"
-    post "/dismiss-retention-reminder" => "chat#dismiss_retention_reminder"
-    get "/:chat_channel_id/messages" => "chat#messages"
-    get "/message/:message_id" => "chat#message_link"
-    put ":chat_channel_id/edit/:message_id" => "chat#edit_message"
-    put ":chat_channel_id/react/:message_id" => "chat#react"
-    delete "/:chat_channel_id/:message_id" => "chat#delete"
-    put "/:chat_channel_id/:message_id/rebake" => "chat#rebake"
-    post "/:chat_channel_id/:message_id/flag" => "chat#flag"
-    post "/:chat_channel_id/quote" => "chat#quote_messages"
-    put "/:chat_channel_id/restore/:message_id" => "chat#restore"
-    get "/lookup/:message_id" => "chat#lookup_message"
-    put "/:chat_channel_id/read/:message_id" => "chat#update_user_last_read"
-    put "/user_chat_enabled/:user_id" => "chat#set_user_chat_status"
-    put "/:chat_channel_id/invite" => "chat#invite_users"
-    post "/drafts" => "chat#set_draft"
-    post "/:chat_channel_id" => "chat#create_message"
-    put "/flag" => "chat#flag"
-    get "/emojis" => "emojis#index"
-  end
-
   Discourse::Application.routes.append do
     mount ::Chat::Engine, at: "/chat"
-    get "/admin/plugins/chat" => "chat/admin_incoming_chat_webhooks#index",
+
+    get "/admin/plugins/chat" => "chat/admin/incoming_webhooks#index",
         :constraints => StaffConstraint.new
-    post "/admin/plugins/chat/hooks" => "chat/admin_incoming_chat_webhooks#create",
+    post "/admin/plugins/chat/hooks" => "chat/admin/incoming_webhooks#create",
          :constraints => StaffConstraint.new
     put "/admin/plugins/chat/hooks/:incoming_chat_webhook_id" =>
-          "chat/admin_incoming_chat_webhooks#update",
+          "chat/admin/incoming_webhooks#update",
         :constraints => StaffConstraint.new
     delete "/admin/plugins/chat/hooks/:incoming_chat_webhook_id" =>
-             "chat/admin_incoming_chat_webhooks#destroy",
+             "chat/admin/incoming_webhooks#destroy",
            :constraints => StaffConstraint.new
     get "u/:username/preferences/chat" => "users#preferences",
         :constraints => {
@@ -696,12 +460,12 @@ after_initialize do
 
       script do |context, fields, automation|
         sender = User.find_by(username: fields.dig("sender", "value")) || Discourse.system_user
-        channel = ChatChannel.find_by(id: fields.dig("chat_channel_id", "value"))
+        channel = Chat::Channel.find_by(id: fields.dig("chat_channel_id", "value"))
 
         placeholders = { channel_name: channel.title(sender) }.merge(context["placeholders"] || {})
 
         creator =
-          Chat::ChatMessageCreator.create(
+          Chat::MessageCreator.create(
             chat_channel: channel,
             user: sender,
             content: utils.apply_placeholders(fields.dig("message", "value"), placeholders),
@@ -725,11 +489,7 @@ after_initialize do
     fragment.css(".chat-summary-content").each { |element| element[:dm] = "body" }
   end
 
-  # TODO(roman): Remove `respond_to?` after 2.9 release
-  if respond_to?(:register_email_unsubscriber)
-    load File.expand_path("../lib/email_controller_helper/chat_summary_unsubscriber.rb", __FILE__)
-    register_email_unsubscriber("chat_summary", EmailControllerHelper::ChatSummaryUnsubscriber)
-  end
+  register_email_unsubscriber("chat_summary", EmailControllerHelper::ChatSummaryUnsubscriber)
 
   register_about_stat_group("chat_messages", show_in_ui: true) { Chat::Statistics.about_messages }
 
@@ -738,21 +498,23 @@ after_initialize do
   register_about_stat_group("chat_users") { Chat::Statistics.about_users }
 
   # Make sure to update spec/system/hashtag_autocomplete_spec.rb when changing this.
-  register_hashtag_data_source(Chat::ChatChannelHashtagDataSource)
+  register_hashtag_data_source(Chat::ChannelHashtagDataSource)
   register_hashtag_type_priority_for_context("channel", "chat-composer", 200)
   register_hashtag_type_priority_for_context("category", "chat-composer", 100)
   register_hashtag_type_priority_for_context("tag", "chat-composer", 50)
   register_hashtag_type_priority_for_context("channel", "topic-composer", 10)
 
   Site.markdown_additional_options["chat"] = {
-    limited_pretty_text_features: ChatMessage::MARKDOWN_FEATURES,
-    limited_pretty_text_markdown_rules: ChatMessage::MARKDOWN_IT_RULES,
+    limited_pretty_text_features: Chat::Message::MARKDOWN_FEATURES,
+    limited_pretty_text_markdown_rules: Chat::Message::MARKDOWN_IT_RULES,
     hashtag_configurations: HashtagAutocompleteService.contexts_with_ordered_types,
   }
 
   register_user_destroyer_on_content_deletion_callback(
-    Proc.new { |user| Jobs.enqueue(:delete_user_messages, user_id: user.id) },
+    Proc.new { |user| Jobs.enqueue(Jobs::Chat::DeleteUserMessages, user_id: user.id) },
   )
+
+  register_bookmarkable(Chat::MessageBookmarkable)
 end
 
 if Rails.env == "test"
diff --git a/plugins/chat/spec/components/chat_mailer_spec.rb b/plugins/chat/spec/components/chat/mailer_spec.rb
similarity index 95%
rename from plugins/chat/spec/components/chat_mailer_spec.rb
rename to plugins/chat/spec/components/chat/mailer_spec.rb
index 20229526a89..dec8390e20a 100644
--- a/plugins/chat/spec/components/chat_mailer_spec.rb
+++ b/plugins/chat/spec/components/chat/mailer_spec.rb
@@ -2,7 +2,7 @@
 
 require "rails_helper"
 
-describe Chat::ChatMailer do
+describe Chat::Mailer do
   fab!(:chatters_group) { Fabricate(:group) }
   fab!(:sender) { Fabricate(:user, group_ids: [chatters_group.id]) }
   fab!(:user_1) { Fabricate(:user, group_ids: [chatters_group.id], last_seen_at: 15.minutes.ago) }
@@ -18,7 +18,13 @@ describe Chat::ChatMailer do
   end
   fab!(:private_chat_channel) do
     Group.refresh_automatic_groups!
-    Chat::DirectMessageChannelCreator.create!(acting_user: sender, target_users: [sender, user_1])
+    result =
+      Chat::CreateDirectMessageChannel.call(
+        guardian: sender.guardian,
+        target_usernames: [sender.username, user_1.username],
+      )
+    service_failed!(result) if result.failure?
+    result.channel
   end
 
   before do
@@ -170,13 +176,12 @@ describe Chat::ChatMailer do
     it "doesn't mix mentions from other users" do
       mention.destroy!
       user_2 = Fabricate(:user, groups: [chatters_group], last_seen_at: 20.minutes.ago)
-      user_2_membership =
-        Fabricate(
-          :user_chat_channel_membership,
-          user: user_2,
-          chat_channel: chat_channel,
-          last_read_message_id: nil,
-        )
+      Fabricate(
+        :user_chat_channel_membership,
+        user: user_2,
+        chat_channel: chat_channel,
+        last_read_message_id: nil,
+      )
       new_message = Fabricate(:chat_message, chat_channel: chat_channel, user: sender)
       Fabricate(:chat_mention, user: user_2, chat_message: new_message)
 
@@ -266,7 +271,7 @@ describe Chat::ChatMailer do
       assert_only_queued_once
     end
 
-    it "Doesn't mix or update mentions from other users when joining tables" do
+    it "doesn't mix or update mentions from other users when joining tables" do
       user_2 = Fabricate(:user, groups: [chatters_group], last_seen_at: 20.minutes.ago)
       user_2_membership =
         Fabricate(
diff --git a/plugins/chat/spec/components/chat/message_creator_spec.rb b/plugins/chat/spec/components/chat/message_creator_spec.rb
new file mode 100644
index 00000000000..3da123f44f0
--- /dev/null
+++ b/plugins/chat/spec/components/chat/message_creator_spec.rb
@@ -0,0 +1,1246 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+describe Chat::MessageCreator do
+  fab!(:admin1) { Fabricate(:admin) }
+  fab!(:admin2) { Fabricate(:admin) }
+  fab!(:user1) { Fabricate(:user, group_ids: [Group::AUTO_GROUPS[:everyone]]) }
+  fab!(:user2) { Fabricate(:user) }
+  fab!(:user3) { Fabricate(:user) }
+  fab!(:user4) { Fabricate(:user) }
+  fab!(:admin_group) do
+    Fabricate(
+      :public_group,
+      users: [admin1, admin2],
+      mentionable_level: Group::ALIAS_LEVELS[:everyone],
+    )
+  end
+  fab!(:user_group) do
+    Fabricate(
+      :public_group,
+      users: [user1, user2, user3],
+      mentionable_level: Group::ALIAS_LEVELS[:everyone],
+    )
+  end
+  fab!(:user_without_memberships) { Fabricate(:user) }
+  fab!(:public_chat_channel) { Fabricate(:category_channel) }
+  fab!(:dm_chat_channel) do
+    Fabricate(
+      :direct_message_channel,
+      chatable: Fabricate(:direct_message, users: [user1, user2, user3]),
+    )
+  end
+  let(:direct_message_channel) do
+    result =
+      Chat::CreateDirectMessageChannel.call(
+        guardian: user1.guardian,
+        target_usernames: [user1.username, user2.username],
+      )
+    service_failed!(result) if result.failure?
+    result.channel
+  end
+
+  before do
+    SiteSetting.chat_enabled = true
+    SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:everyone]
+    SiteSetting.chat_duplicate_message_sensitivity = 0
+
+    # Create channel memberships
+    [admin1, admin2, user1, user2, user3].each do |user|
+      Fabricate(:user_chat_channel_membership, chat_channel: public_chat_channel, user: user)
+    end
+
+    Group.refresh_automatic_groups!
+    direct_message_channel
+  end
+
+  describe "Integration tests with jobs running immediately" do
+    before { Jobs.run_immediately! }
+
+    it "errors when length is less than `chat_minimum_message_length`" do
+      SiteSetting.chat_minimum_message_length = 10
+      creator =
+        described_class.create(chat_channel: public_chat_channel, user: user1, content: "2 short")
+      expect(creator.failed?).to eq(true)
+      expect(creator.error.message).to match(
+        I18n.t(
+          "chat.errors.minimum_length_not_met",
+          { count: SiteSetting.chat_minimum_message_length },
+        ),
+      )
+    end
+
+    it "errors when a blank message is sent" do
+      creator =
+        described_class.create(chat_channel: public_chat_channel, user: user1, content: "   ")
+      expect(creator.failed?).to eq(true)
+      expect(creator.error.message).to match(
+        I18n.t(
+          "chat.errors.minimum_length_not_met",
+          { count: SiteSetting.chat_minimum_message_length },
+        ),
+      )
+    end
+
+    it "errors when length is greater than `chat_maximum_message_length`" do
+      SiteSetting.chat_maximum_message_length = 100
+      creator =
+        described_class.create(
+          chat_channel: public_chat_channel,
+          user: user1,
+          content: "a really long and in depth message that is just too detailed" * 100,
+        )
+      expect(creator.failed?).to eq(true)
+      expect(creator.error.message).to match(
+        I18n.t("chat.errors.message_too_long", { count: SiteSetting.chat_maximum_message_length }),
+      )
+    end
+
+    it "allows message creation when length is less than `chat_minimum_message_length` when upload is present" do
+      upload = Fabricate(:upload, user: user1)
+      SiteSetting.chat_minimum_message_length = 10
+      expect {
+        described_class.create(
+          chat_channel: public_chat_channel,
+          user: user1,
+          content: "2 short",
+          upload_ids: [upload.id],
+        )
+      }.to change { Chat::Message.count }.by(1)
+    end
+
+    it "creates messages for users who can see the channel" do
+      expect {
+        described_class.create(
+          chat_channel: public_chat_channel,
+          user: user1,
+          content: "this is a message",
+        )
+      }.to change { Chat::Message.count }.by(1)
+    end
+
+    it "updates the last_message for the channel" do
+      message =
+        described_class.create(
+          chat_channel: public_chat_channel,
+          user: user1,
+          content: "this is a message",
+        ).chat_message
+      expect(public_chat_channel.reload.last_message).to eq(message)
+    end
+
+    it "sets the last_editor_id to the user who created the message" do
+      message =
+        described_class.create(
+          chat_channel: public_chat_channel,
+          user: user1,
+          content: "this is a message",
+        ).chat_message
+      expect(message.last_editor_id).to eq(user1.id)
+    end
+
+    it "publishes a DiscourseEvent for new messages" do
+      events =
+        DiscourseEvent.track_events do
+          described_class.create(
+            chat_channel: public_chat_channel,
+            user: user1,
+            content: "this is a message",
+          )
+        end
+      expect(events.map { _1[:event_name] }).to include(:chat_message_created)
+    end
+
+    it "publishes created message to message bus" do
+      content = "a test chat message"
+      messages =
+        MessageBus.track_publish("/chat/#{public_chat_channel.id}") do
+          described_class.create(chat_channel: public_chat_channel, user: user1, content: content)
+        end
+
+      expect(messages.count).to be(1)
+      message = messages[0].data
+      expect(message["chat_message"]["message"]).to eq(content)
+      expect(message["chat_message"]["user"]["id"]).to eq(user1.id)
+    end
+
+    context "with mentions" do
+      it "creates mentions and mention notifications for public chat" do
+        message =
+          described_class.create(
+            chat_channel: public_chat_channel,
+            user: user1,
+            content:
+              "this is a @#{user1.username} message with @system @mentions @#{user2.username} and @#{user3.username}",
+          ).chat_message
+
+        # a mention for the user himself was created, but a notification wasn't
+        user1_mention = user1.chat_mentions.where(chat_message: message).first
+        expect(user1_mention).to be_present
+        expect(user1_mention.notification).to be_nil
+
+        system_user_mention = Discourse.system_user.chat_mentions.where(chat_message: message).first
+        expect(system_user_mention).to be_nil
+
+        user2_mention = user2.chat_mentions.where(chat_message: message).first
+        expect(user2_mention).to be_present
+        expect(user2_mention.notification).to be_present
+
+        user3_mention = user3.chat_mentions.where(chat_message: message).first
+        expect(user3_mention).to be_present
+        expect(user3_mention.notification).to be_present
+      end
+
+      it "mentions are case insensitive" do
+        expect {
+          described_class.create(
+            chat_channel: public_chat_channel,
+            user: user1,
+            content: "Hey @#{user2.username.upcase}",
+          )
+        }.to change { user2.chat_mentions.count }.by(1)
+      end
+
+      context "when mentioning @all" do
+        it "creates a chat mention record for every user" do
+          expect {
+            described_class.create(chat_channel: public_chat_channel, user: user1, content: "@all")
+          }.to change { Chat::Mention.count }.by(5)
+
+          Chat::UserChatChannelMembership.where(
+            user: user2,
+            chat_channel: public_chat_channel,
+          ).update_all(following: false)
+
+          expect {
+            described_class.create(
+              chat_channel: public_chat_channel,
+              user: user1,
+              content: "again! @all",
+            )
+          }.to change { Chat::Mention.count }.by(4)
+        end
+
+        it "does not create a notification for acting user" do
+          message =
+            described_class.create(
+              chat_channel: public_chat_channel,
+              user: user1,
+              content: "@all",
+            ).chat_message
+
+          mention = user1.chat_mentions.where(chat_message: message).first
+          expect(mention).to be_present
+          expect(mention.notification).to be_blank
+        end
+      end
+
+      context "when mentioning @here" do
+        it "creates a chat mention record for every active user" do
+          admin1.update(last_seen_at: 1.year.ago)
+          admin2.update(last_seen_at: 1.year.ago)
+
+          user1.update(last_seen_at: Time.now)
+          user2.update(last_seen_at: Time.now)
+          user3.update(last_seen_at: Time.now)
+
+          expect {
+            described_class.create(chat_channel: public_chat_channel, user: user1, content: "@here")
+          }.to change { Chat::Mention.count }.by(3)
+        end
+
+        it "does not create a notification for acting user" do
+          user1.update(last_seen_at: Time.now)
+
+          message =
+            described_class.create(
+              chat_channel: public_chat_channel,
+              user: user1,
+              content: "@here",
+            ).chat_message
+
+          mention = user1.chat_mentions.where(chat_message: message).first
+          expect(mention).to be_present
+          expect(mention.notification).to be_blank
+        end
+
+        it "doesn't send double notifications" do
+          user2.update(last_seen_at: Time.now)
+          expect {
+            described_class.create(
+              chat_channel: public_chat_channel,
+              user: user1,
+              content: "@here @#{user2.username}",
+            )
+          }.to change { user2.chat_mentions.count }.by(1)
+        end
+
+        it "notifies @here plus other mentions" do
+          admin1.update(last_seen_at: Time.now)
+          admin2.update(last_seen_at: 1.year.ago)
+          user1.update(last_seen_at: 1.year.ago)
+          user2.update(last_seen_at: 1.year.ago)
+          user3.update(last_seen_at: 1.year.ago)
+          expect {
+            described_class.create(
+              chat_channel: public_chat_channel,
+              user: user1,
+              content: "@here plus @#{user3.username}",
+            )
+          }.to change { user3.chat_mentions.count }.by(1)
+        end
+      end
+
+      context "with group mentions" do
+        it "creates chat mentions for group mentions where the group is mentionable" do
+          expect {
+            described_class.create(
+              chat_channel: public_chat_channel,
+              user: user1,
+              content: "hello @#{admin_group.name}",
+            )
+          }.to change { admin1.chat_mentions.count }.by(1).and change {
+                  admin2.chat_mentions.count
+                }.by(1)
+        end
+
+        it "doesn't mention users twice if they are direct mentioned and group mentioned" do
+          expect {
+            described_class.create(
+              chat_channel: public_chat_channel,
+              user: user1,
+              content: "hello @#{admin_group.name} @#{admin1.username} and @#{admin2.username}",
+            )
+          }.to change { admin1.chat_mentions.count }.by(1).and change {
+                  admin2.chat_mentions.count
+                }.by(1)
+        end
+
+        it "creates chat mentions for group mentions and direct mentions" do
+          expect {
+            described_class.create(
+              chat_channel: public_chat_channel,
+              user: user1,
+              content: "hello @#{admin_group.name} @#{user2.username}",
+            )
+          }.to change { admin1.chat_mentions.count }.by(1).and change {
+                  admin2.chat_mentions.count
+                }.by(1).and change { user2.chat_mentions.count }.by(1)
+        end
+
+        it "creates chat mentions for group mentions and direct mentions" do
+          expect {
+            described_class.create(
+              chat_channel: public_chat_channel,
+              user: user1,
+              content: "hello @#{admin_group.name} @#{user_group.name}",
+            )
+          }.to change { admin1.chat_mentions.count }.by(1).and change {
+                  admin2.chat_mentions.count
+                }.by(1).and change { user2.chat_mentions.count }.by(1).and change {
+                              user3.chat_mentions.count
+                            }.by(1)
+        end
+
+        it "doesn't create chat mentions for group mentions where the group is un-mentionable" do
+          admin_group.update(mentionable_level: Group::ALIAS_LEVELS[:nobody])
+          expect {
+            described_class.create(
+              chat_channel: public_chat_channel,
+              user: user1,
+              content: "hello @#{admin_group.name}",
+            )
+          }.not_to change { Chat::Mention.count }
+        end
+
+        it "creates a chat mention without notification for acting user" do
+          message =
+            described_class.create(
+              chat_channel: public_chat_channel,
+              user: user1,
+              content: "@#{user_group.name}",
+            ).chat_message
+
+          mention = user1.chat_mentions.where(chat_message: message).first
+          expect(mention).to be_present
+          expect(mention.notification).to be_blank
+        end
+      end
+
+      context "when ignore_channel_wide_mention is enabled" do
+        before { user2.user_option.update(ignore_channel_wide_mention: true) }
+
+        it "when mentioning @all creates a mention without notification" do
+          message =
+            described_class.create(
+              chat_channel: public_chat_channel,
+              user: user1,
+              content: "hi! @all",
+            ).chat_message
+
+          mention = user2.chat_mentions.where(chat_message: message).first
+          expect(mention).to be_present
+          expect(mention.notification).to be_nil
+        end
+
+        it "when mentioning @here creates a mention without notification" do
+          user2.update(last_seen_at: Time.now)
+
+          message =
+            described_class.create(
+              chat_channel: public_chat_channel,
+              user: user1,
+              content: "@here",
+            ).chat_message
+
+          mention = user2.chat_mentions.where(chat_message: message).first
+          expect(mention).to be_present
+          expect(mention.notification).to be_nil
+        end
+      end
+
+      it "doesn't create mention notifications for users without a membership record" do
+        message =
+          described_class.create(
+            chat_channel: public_chat_channel,
+            user: user1,
+            content: "hello @#{user_without_memberships.username}",
+          ).chat_message
+
+        mention = user_without_memberships.chat_mentions.where(chat_message: message).first
+        expect(mention.notification).to be_nil
+      end
+
+      it "doesn't create mention notifications for users who cannot chat" do
+        new_group = Group.create
+        SiteSetting.chat_allowed_groups = new_group.id
+
+        message =
+          described_class.create(
+            chat_channel: public_chat_channel,
+            user: user1,
+            content: "hi @#{user2.username} @#{user3.username}",
+          ).chat_message
+
+        user2_mention = user2.chat_mentions.where(chat_message: message).first
+        expect(user2_mention.notification).to be_nil
+
+        user3_mention = user2.chat_mentions.where(chat_message: message).first
+        expect(user3_mention.notification).to be_nil
+      end
+
+      it "doesn't create mentions for users with chat disabled" do
+        user2.user_option.update(chat_enabled: false)
+
+        message =
+          described_class.create(
+            chat_channel: public_chat_channel,
+            user: user1,
+            content: "hi @#{user2.username}",
+          ).chat_message
+
+        mention = user2.chat_mentions.where(chat_message: message).first
+        expect(mention).to be_nil
+      end
+
+      it "creates only mention notifications for users with access in private chat" do
+        message =
+          described_class.create(
+            chat_channel: direct_message_channel,
+            user: user1,
+            content: "hello there @#{user2.username} and @#{user3.username}",
+          ).chat_message
+
+        # Only user2 should be notified
+        user2_mention = user2.chat_mentions.where(chat_message: message).first
+        expect(user2_mention.notification).to be_present
+
+        user3_mention = user3.chat_mentions.where(chat_message: message).first
+        expect(user3_mention.notification).to be_nil
+      end
+
+      it "creates a mention for group users even if they're not participating in private chat" do
+        expect {
+          described_class.create(
+            chat_channel: direct_message_channel,
+            user: user1,
+            content: "hello there @#{user_group.name}",
+          )
+        }.to change { user2.chat_mentions.count }.by(1).and change { user3.chat_mentions.count }.by(
+                1,
+              )
+      end
+
+      it "creates a mention notifications only for group users that are participating in private chat" do
+        message =
+          described_class.create(
+            chat_channel: direct_message_channel,
+            user: user1,
+            content: "hello there @#{user_group.name}",
+          ).chat_message
+
+        user2_mention = user2.chat_mentions.where(chat_message: message).first
+        expect(user2_mention.notification).to be_present
+
+        user3_mention = user3.chat_mentions.where(chat_message: message).first
+        expect(user3_mention.notification).to be_nil
+      end
+
+      it "publishes inaccessible mentions when user isn't aren't a part of the channel" do
+        Chat::Publisher.expects(:publish_inaccessible_mentions).once
+        described_class.create(
+          chat_channel: public_chat_channel,
+          user: admin1,
+          content: "hello @#{user4.username}",
+        )
+      end
+
+      it "publishes inaccessible mentions when user doesn't have chat access" do
+        SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:staff]
+        Chat::Publisher.expects(:publish_inaccessible_mentions).once
+        described_class.create(
+          chat_channel: public_chat_channel,
+          user: admin1,
+          content: "hello @#{user3.username}",
+        )
+      end
+
+      it "doesn't publish inaccessible mentions when user is following channel" do
+        Chat::Publisher.expects(:publish_inaccessible_mentions).never
+        described_class.create(
+          chat_channel: public_chat_channel,
+          user: admin1,
+          content: "hello @#{admin2.username}",
+        )
+      end
+
+      it "creates mentions for suspended users" do
+        user2.update(suspended_till: Time.now + 10.years)
+
+        message =
+          described_class.create(
+            chat_channel: direct_message_channel,
+            user: user1,
+            content: "hello @#{user2.username}",
+          ).chat_message
+
+        mention = user2.chat_mentions.where(chat_message: message).first
+        expect(mention).to be_present
+      end
+
+      it "does not create mention notifications for suspended users" do
+        user2.update(suspended_till: Time.now + 10.years)
+
+        message =
+          described_class.create(
+            chat_channel: direct_message_channel,
+            user: user1,
+            content: "hello @#{user2.username}",
+          ).chat_message
+
+        mention = user2.chat_mentions.where(chat_message: message).first
+        expect(mention.notification).to be_nil
+      end
+
+      it "adds mentioned user and their status to the message bus message" do
+        SiteSetting.enable_user_status = true
+        status = { description: "dentist", emoji: "tooth" }
+        user2.set_status!(status[:description], status[:emoji])
+
+        messages =
+          MessageBus.track_publish("/chat/#{public_chat_channel.id}") do
+            described_class.create(
+              chat_channel: public_chat_channel,
+              user: user1,
+              content: "Hey @#{user2.username}",
+            )
+          end
+
+        expect(messages.count).to be(1)
+        message = messages[0].data
+        expect(message["chat_message"]["mentioned_users"].count).to be(1)
+        mentioned_user = message["chat_message"]["mentioned_users"][0]
+
+        expect(mentioned_user["id"]).to eq(user2.id)
+        expect(mentioned_user["username"]).to eq(user2.username)
+        expect(mentioned_user["status"]).to be_present
+        expect(mentioned_user["status"].slice(:description, :emoji)).to eq(status)
+      end
+
+      it "doesn't add mentioned user's status to the message bus message when status is disabled" do
+        SiteSetting.enable_user_status = false
+        user2.set_status!("dentist", "tooth")
+
+        messages =
+          MessageBus.track_publish("/chat/#{public_chat_channel.id}") do
+            described_class.create(
+              chat_channel: public_chat_channel,
+              user: user1,
+              content: "Hey @#{user2.username}",
+            )
+          end
+
+        expect(messages.count).to be(1)
+        message = messages[0].data
+        expect(message["chat_message"]["mentioned_users"].count).to be(1)
+        mentioned_user = message["chat_message"]["mentioned_users"][0]
+
+        expect(mentioned_user["status"]).to be_blank
+      end
+
+      it "creates a chat_mention record without notification when self mentioning" do
+        message =
+          described_class.create(
+            chat_channel: direct_message_channel,
+            user: user1,
+            content: "hello @#{user1.username}",
+          ).chat_message
+
+        mention = user1.chat_mentions.where(chat_message: message).first
+        expect(mention).to be_present
+        expect(mention.notification).to be_nil
+      end
+    end
+
+    describe "replies" do
+      fab!(:reply_message) do
+        Fabricate(:chat_message, chat_channel: public_chat_channel, user: user2)
+      end
+      fab!(:unrelated_message_1) { Fabricate(:chat_message, chat_channel: public_chat_channel) }
+      fab!(:unrelated_message_2) { Fabricate(:chat_message, chat_channel: public_chat_channel) }
+
+      it "links the message that the user is replying to" do
+        message =
+          described_class.create(
+            chat_channel: public_chat_channel,
+            user: user1,
+            content: "this is a message",
+            in_reply_to_id: reply_message.id,
+          ).chat_message
+
+        expect(message.in_reply_to_id).to eq(reply_message.id)
+      end
+
+      it "creates a thread and includes the original message and the reply" do
+        message = nil
+        expect {
+          message =
+            described_class.create(
+              chat_channel: public_chat_channel,
+              user: user1,
+              content: "this is a message",
+              in_reply_to_id: reply_message.id,
+            ).chat_message
+        }.to change { Chat::Thread.count }.by(1)
+
+        expect(message.reload.thread).not_to eq(nil)
+        expect(message.in_reply_to.thread).to eq(message.thread)
+        expect(message.thread.original_message).to eq(reply_message)
+        expect(message.thread.original_message_user).to eq(reply_message.user)
+        expect(message.thread.last_message).to eq(message)
+      end
+
+      it "does not change the last_message of the channel for a thread reply" do
+        original_last_message = public_chat_channel.last_message
+        described_class.create(
+          chat_channel: public_chat_channel,
+          user: user1,
+          content: "this is a message",
+          in_reply_to_id: reply_message.id,
+        )
+        expect(public_chat_channel.reload.last_message).to eq(original_last_message)
+      end
+
+      it "creates a user thread membership" do
+        message = nil
+        expect {
+          message =
+            described_class.create(
+              chat_channel: public_chat_channel,
+              user: user1,
+              content: "this is a message",
+              in_reply_to_id: reply_message.id,
+            ).chat_message
+        }.to change { Chat::UserChatThreadMembership.count }.by(2)
+
+        expect(
+          Chat::UserChatThreadMembership.exists?(user: user1, thread: message.thread),
+        ).to be_truthy
+      end
+
+      it "creates a thread membership for the original message user" do
+        message = nil
+        expect {
+          message =
+            described_class.create(
+              chat_channel: public_chat_channel,
+              user: user1,
+              content: "this is a message",
+              in_reply_to_id: reply_message.id,
+            ).chat_message
+        }.to change { Chat::UserChatThreadMembership.count }.by(2)
+
+        expect(
+          Chat::UserChatThreadMembership.exists?(user: reply_message.user, thread: message.thread),
+        ).to be_truthy
+      end
+
+      context "when threading is enabled" do
+        it "publishes the new thread" do
+          public_chat_channel.update!(threading_enabled: true)
+
+          messages =
+            MessageBus.track_publish do
+              described_class.create(
+                chat_channel: public_chat_channel,
+                user: user1,
+                content: "this is a message",
+                in_reply_to_id: reply_message.id,
+              ).chat_message
+            end
+
+          thread_created_message = messages.find { |m| m.data["type"] == "thread_created" }
+          expect(thread_created_message.channel).to eq("/chat/#{public_chat_channel.id}")
+        end
+      end
+
+      context "when threading is disabled" do
+        it "doesn’t publish the new thread" do
+          public_chat_channel.update!(threading_enabled: false)
+
+          messages =
+            MessageBus.track_publish do
+              described_class.create(
+                chat_channel: public_chat_channel,
+                user: user1,
+                content: "this is a message",
+                in_reply_to_id: reply_message.id,
+              ).chat_message
+            end
+
+          thread_created_message = messages.find { |m| m.data["type"] == "thread_created" }
+          expect(thread_created_message).to be_nil
+        end
+      end
+
+      context "when a staged_thread_id is provided" do
+        fab!(:existing_thread) { Fabricate(:chat_thread, channel: public_chat_channel) }
+
+        it "creates a thread and publishes with the staged id" do
+          public_chat_channel.update!(threading_enabled: true)
+
+          messages =
+            MessageBus.track_publish do
+              described_class.create(
+                chat_channel: public_chat_channel,
+                user: user1,
+                content: "this is a message",
+                in_reply_to_id: reply_message.id,
+                staged_thread_id: "stagedthreadid",
+              ).chat_message
+            end
+
+          thread_event = messages.find { |m| m.data["type"] == "thread_created" }
+          expect(thread_event.data["staged_thread_id"]).to eq("stagedthreadid")
+          expect(Chat::Thread.find(thread_event.data["thread_id"])).to be_persisted
+
+          send_event = messages.find { |m| m.data["type"] == "sent" }
+          expect(send_event.data["staged_thread_id"]).to eq("stagedthreadid")
+        end
+      end
+
+      context "when the thread_id is provided" do
+        fab!(:existing_thread) { Fabricate(:chat_thread, channel: public_chat_channel) }
+
+        it "does not create a thread when one is passed in" do
+          message = nil
+          expect {
+            message =
+              described_class.create(
+                chat_channel: public_chat_channel,
+                user: user1,
+                content: "this is a message",
+                thread_id: existing_thread.id,
+              ).chat_message
+          }.not_to change { Chat::Thread.count }
+
+          expect(message.reload.thread).to eq(existing_thread)
+          expect(existing_thread.reload.last_message).to eq(message)
+        end
+
+        it "creates a user thread membership if one does not exist" do
+          expect {
+            described_class.create(
+              chat_channel: public_chat_channel,
+              user: user1,
+              content: "this is a message",
+              thread_id: existing_thread.id,
+            ).chat_message
+          }.to change { Chat::UserChatThreadMembership.count }
+
+          expect(
+            Chat::UserChatThreadMembership.exists?(user: user1, thread: existing_thread),
+          ).to be_truthy
+        end
+
+        it "does not create a thread membership if one exists" do
+          Fabricate(:user_chat_thread_membership, user: user1, thread: existing_thread)
+          expect {
+            described_class.create(
+              chat_channel: public_chat_channel,
+              user: user1,
+              content: "this is a message",
+              thread_id: existing_thread.id,
+            ).chat_message
+          }.not_to change { Chat::UserChatThreadMembership.count }
+        end
+
+        it "sets the last_read_message_id of the existing UserChatThreadMembership for the user to the new message id" do
+          message = Fabricate(:chat_message, thread: existing_thread)
+          membership =
+            Fabricate(
+              :user_chat_thread_membership,
+              user: user1,
+              thread: existing_thread,
+              last_read_message_id: message.id,
+            )
+          new_message =
+            described_class.create(
+              chat_channel: public_chat_channel,
+              user: user1,
+              content: "this is a message",
+              thread_id: existing_thread.id,
+            ).chat_message
+
+          expect(membership.reload.last_read_message_id).to eq(new_message.id)
+        end
+
+        it "errors when the thread ID is for a different channel" do
+          other_channel_thread = Fabricate(:chat_thread, channel: Fabricate(:chat_channel))
+          result =
+            described_class.create(
+              chat_channel: public_chat_channel,
+              user: user1,
+              content: "this is a message",
+              thread_id: other_channel_thread.id,
+            )
+          expect(result.error.message).to eq(I18n.t("chat.errors.thread_invalid_for_channel"))
+        end
+
+        it "errors when the thread does not match the in_reply_to thread" do
+          reply_message.update!(thread: existing_thread)
+          result =
+            described_class.create(
+              chat_channel: public_chat_channel,
+              user: user1,
+              content: "this is a message",
+              in_reply_to_id: reply_message.id,
+              thread_id: Fabricate(:chat_thread, channel: public_chat_channel).id,
+            )
+          expect(result.error.message).to eq(I18n.t("chat.errors.thread_does_not_match_parent"))
+        end
+
+        it "errors when the root message does not have a thread ID" do
+          reply_message.update!(thread: nil)
+          result =
+            described_class.create(
+              chat_channel: public_chat_channel,
+              user: user1,
+              content: "this is a message",
+              in_reply_to_id: reply_message.id,
+              thread_id: existing_thread.id,
+            )
+          expect(result.error.message).to eq(I18n.t("chat.errors.thread_does_not_match_parent"))
+        end
+      end
+
+      context "for missing root messages" do
+        fab!(:original_message) do
+          Fabricate(
+            :chat_message,
+            chat_channel: public_chat_channel,
+            user: user2,
+            created_at: 1.day.ago,
+          )
+        end
+
+        before { reply_message.update!(in_reply_to: original_message) }
+
+        it "raises an error when the root message has been trashed" do
+          original_message.trash!
+          result =
+            described_class.create(
+              chat_channel: public_chat_channel,
+              user: user1,
+              content: "this is a message",
+              in_reply_to_id: reply_message.id,
+            )
+          expect(result.error.message).to eq(I18n.t("chat.errors.original_message_not_found"))
+        end
+
+        it "uses the next message in the chain as the root when the root is deleted" do
+          original_message.destroy!
+          described_class.create(
+            chat_channel: public_chat_channel,
+            user: user1,
+            content: "this is a message",
+            in_reply_to_id: reply_message.id,
+          )
+          expect(reply_message.reload.thread).not_to eq(nil)
+        end
+      end
+
+      context "when there is an existing reply chain" do
+        fab!(:old_message_1) do
+          Fabricate(
+            :chat_message,
+            chat_channel: public_chat_channel,
+            user: user1,
+            created_at: 6.hours.ago,
+          )
+        end
+        fab!(:old_message_2) do
+          Fabricate(
+            :chat_message,
+            chat_channel: public_chat_channel,
+            user: user2,
+            in_reply_to: old_message_1,
+            created_at: 4.hours.ago,
+          )
+        end
+        fab!(:old_message_3) do
+          Fabricate(
+            :chat_message,
+            chat_channel: public_chat_channel,
+            user: user1,
+            in_reply_to: old_message_2,
+            created_at: 1.hour.ago,
+          )
+        end
+
+        before do
+          reply_message.update!(
+            created_at: old_message_3.created_at + 1.hour,
+            in_reply_to: old_message_3,
+          )
+        end
+
+        it "creates a thread and updates all the messages in the chain" do
+          # This must be done since the fabricator uses Chat::MessageCreator
+          # under the hood and it creates the thread already.
+          old_message_1.update!(thread_id: nil)
+          old_message_2.update!(thread_id: nil)
+          old_message_3.update!(thread_id: nil)
+          reply_message.update!(thread_id: nil)
+
+          thread_count = Chat::Thread.count
+          message =
+            described_class.create(
+              chat_channel: public_chat_channel,
+              user: user1,
+              content: "this is a message",
+              in_reply_to_id: reply_message.id,
+            ).chat_message
+
+          expect(Chat::Thread.count).to eq(thread_count + 1)
+          expect(message.reload.thread).not_to eq(nil)
+          expect(message.reload.in_reply_to.thread).to eq(message.thread)
+          expect(old_message_1.reload.thread).to eq(message.thread)
+          expect(old_message_2.reload.thread).to eq(message.thread)
+          expect(old_message_3.reload.thread).to eq(message.thread)
+          expect(message.thread.chat_messages.count).to eq(5)
+          message =
+            described_class.create(
+              chat_channel: public_chat_channel,
+              user: user1,
+              content: "this is a message",
+              in_reply_to_id: reply_message.id,
+            ).chat_message
+        end
+
+        context "when a thread already exists and the thread_id is passed in" do
+          let!(:last_message) do
+            described_class.create(
+              chat_channel: public_chat_channel,
+              user: user1,
+              content: "this is a message",
+              in_reply_to_id: reply_message.id,
+            ).chat_message
+          end
+          let!(:existing_thread) { last_message.reload.thread }
+
+          it "does not create a new thread" do
+            thread_count = Chat::Thread.count
+
+            message =
+              described_class.create(
+                chat_channel: public_chat_channel,
+                user: user1,
+                content: "this is a message again",
+                in_reply_to_id: last_message.id,
+                thread_id: existing_thread.id,
+              ).chat_message
+
+            expect(Chat::Thread.count).to eq(thread_count)
+            expect(message.reload.thread).to eq(existing_thread)
+            expect(message.reload.in_reply_to.thread).to eq(existing_thread)
+            expect(message.thread.chat_messages.count).to eq(6)
+          end
+
+          it "errors when the thread does not match the root thread" do
+            old_message_1.update!(thread: Fabricate(:chat_thread, channel: public_chat_channel))
+            result =
+              described_class.create(
+                chat_channel: public_chat_channel,
+                user: user1,
+                content: "this is a message",
+                in_reply_to_id: reply_message.id,
+                thread_id: existing_thread.id,
+              )
+            expect(result.error.message).to eq(I18n.t("chat.errors.thread_does_not_match_parent"))
+          end
+
+          it "errors when the root message does not have a thread ID" do
+            old_message_1.update!(thread: nil)
+            result =
+              described_class.create(
+                chat_channel: public_chat_channel,
+                user: user1,
+                content: "this is a message",
+                in_reply_to_id: reply_message.id,
+                thread_id: existing_thread.id,
+              )
+            expect(result.error.message).to eq(I18n.t("chat.errors.thread_does_not_match_parent"))
+          end
+        end
+
+        context "when there are hundreds of messages in a reply chain already" do
+          before do
+            previous_message = nil
+            1000.times do |i|
+              previous_message =
+                Fabricate(
+                  :chat_message,
+                  chat_channel: public_chat_channel,
+                  user: [user1, user2].sample,
+                  in_reply_to: previous_message,
+                  created_at: i.hours.ago,
+                )
+            end
+            @last_message_in_chain = previous_message
+          end
+
+          xit "works" do
+            thread_count = Chat::Thread.count
+
+            message = nil
+            puts Benchmark.measure {
+                   message =
+                     described_class.create(
+                       chat_channel: public_chat_channel,
+                       user: user1,
+                       content: "this is a message",
+                       in_reply_to_id: @last_message_in_chain.id,
+                     ).chat_message
+                 }
+
+            expect(Chat::Thread.count).to eq(thread_count + 1)
+            expect(message.reload.thread).not_to eq(nil)
+            expect(message.reload.in_reply_to.thread).to eq(message.thread)
+            expect(message.thread.chat_messages.count).to eq(1001)
+          end
+        end
+
+        context "if the root message already had a thread" do
+          fab!(:old_thread) { Fabricate(:chat_thread, original_message: old_message_1) }
+          fab!(:incorrect_thread) { Fabricate(:chat_thread, channel: public_chat_channel) }
+
+          before do
+            old_message_1.update!(thread: old_thread)
+            old_message_2.update!(thread: old_thread)
+            old_message_3.update!(thread: incorrect_thread)
+          end
+
+          it "does not change any messages in the chain, assumes they have the correct thread ID" do
+            thread_count = Chat::Thread.count
+            message =
+              described_class.create(
+                chat_channel: public_chat_channel,
+                user: user1,
+                content: "this is a message",
+                in_reply_to_id: reply_message.id,
+              ).chat_message
+
+            expect(Chat::Thread.count).to eq(thread_count)
+            expect(message.reload.thread).to eq(old_thread)
+            expect(message.reload.in_reply_to.thread).to eq(old_thread)
+            expect(old_message_1.reload.thread).to eq(old_thread)
+            expect(old_message_2.reload.thread).to eq(old_thread)
+            expect(old_message_3.reload.thread).to eq(incorrect_thread)
+            expect(message.thread.chat_messages.count).to eq(4)
+          end
+        end
+      end
+    end
+
+    describe "push notifications" do
+      before do
+        Chat::UserChatChannelMembership.where(
+          user: user1,
+          chat_channel: public_chat_channel,
+        ).update(
+          mobile_notification_level: Chat::UserChatChannelMembership::NOTIFICATION_LEVELS[:always],
+        )
+        PresenceChannel.clear_all!
+      end
+
+      it "sends a push notification to watching users who are not in chat" do
+        PostAlerter.expects(:push_notification).once
+        described_class.create(chat_channel: public_chat_channel, user: user2, content: "Beep boop")
+      end
+
+      it "does not send a push notification to watching users who are in chat" do
+        PresenceChannel.new("/chat/online").present(user_id: user1.id, client_id: 1)
+        PostAlerter.expects(:push_notification).never
+        described_class.create(chat_channel: public_chat_channel, user: user2, content: "Beep boop")
+      end
+    end
+
+    describe "with uploads" do
+      fab!(:upload1) { Fabricate(:upload, user: user1) }
+      fab!(:upload2) { Fabricate(:upload, user: user1) }
+      fab!(:private_upload) { Fabricate(:upload, user: user2) }
+
+      it "can attach 1 upload to a new message" do
+        expect {
+          described_class.create(
+            chat_channel: public_chat_channel,
+            user: user1,
+            content: "Beep boop",
+            upload_ids: [upload1.id],
+          )
+        }.to change { UploadReference.where(upload_id: upload1.id).count }.by(1)
+      end
+
+      it "can attach multiple uploads to a new message" do
+        expect {
+          described_class.create(
+            chat_channel: public_chat_channel,
+            user: user1,
+            content: "Beep boop",
+            upload_ids: [upload1.id, upload2.id],
+          )
+        }.to change { UploadReference.where(upload_id: [upload1.id, upload2.id]).count }.by(2)
+      end
+
+      it "filters out uploads that weren't uploaded by the user" do
+        expect {
+          described_class.create(
+            chat_channel: public_chat_channel,
+            user: user1,
+            content: "Beep boop",
+            upload_ids: [private_upload.id],
+          )
+        }.not_to change { UploadReference.where(upload_id: private_upload.id).count }
+      end
+
+      it "doesn't attach uploads when `chat_allow_uploads` is false" do
+        SiteSetting.chat_allow_uploads = false
+        expect {
+          described_class.create(
+            chat_channel: public_chat_channel,
+            user: user1,
+            content: "Beep boop",
+            upload_ids: [upload1.id],
+          )
+        }.to not_change { UploadReference.where(upload_id: upload1.id).count }
+      end
+    end
+  end
+
+  it "destroys draft after message was created" do
+    Chat::Draft.create!(user: user1, chat_channel: public_chat_channel, data: "{}")
+
+    expect do
+      described_class.create(
+        chat_channel: public_chat_channel,
+        user: user1,
+        content: "Hi @#{user2.username}",
+      )
+    end.to change { Chat::Draft.count }.by(-1)
+  end
+
+  describe "watched words" do
+    fab!(:watched_word) { Fabricate(:watched_word) }
+
+    it "errors when a blocked word is present" do
+      creator =
+        described_class.create(
+          chat_channel: public_chat_channel,
+          user: user1,
+          content: "bad word - #{watched_word.word}",
+        )
+      expect(creator.failed?).to eq(true)
+      expect(creator.error.message).to match(
+        I18n.t("contains_blocked_word", { word: watched_word.word }),
+      )
+    end
+  end
+
+  describe "channel statuses" do
+    def create_message(user)
+      described_class.create(chat_channel: public_chat_channel, user: user, content: "test message")
+    end
+
+    context "when channel is closed" do
+      before { public_chat_channel.update(status: :closed) }
+
+      it "errors when trying to create the message for non-staff" do
+        creator = create_message(user1)
+        expect(creator.failed?).to eq(true)
+        expect(creator.error.message).to eq(
+          I18n.t("chat.errors.channel_new_message_disallowed.closed"),
+        )
+      end
+
+      it "does not error when trying to create a message for staff" do
+        expect { create_message(admin1) }.to change { Chat::Message.count }.by(1)
+      end
+    end
+
+    context "when channel is read_only" do
+      before { public_chat_channel.update(status: :read_only) }
+
+      it "errors when trying to create the message for all users" do
+        creator = create_message(user1)
+        expect(creator.failed?).to eq(true)
+        expect(creator.error.message).to eq(
+          I18n.t("chat.errors.channel_new_message_disallowed.read_only"),
+        )
+        creator = create_message(admin1)
+        expect(creator.failed?).to eq(true)
+        expect(creator.error.message).to eq(
+          I18n.t("chat.errors.channel_new_message_disallowed.read_only"),
+        )
+      end
+    end
+
+    context "when channel is archived" do
+      before { public_chat_channel.update(status: :archived) }
+
+      it "errors when trying to create the message for all users" do
+        creator = create_message(user1)
+        expect(creator.failed?).to eq(true)
+        expect(creator.error.message).to eq(
+          I18n.t("chat.errors.channel_new_message_disallowed.archived"),
+        )
+        creator = create_message(admin1)
+        expect(creator.failed?).to eq(true)
+        expect(creator.error.message).to eq(
+          I18n.t("chat.errors.channel_new_message_disallowed.archived"),
+        )
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/components/chat_message_rate_limiter_spec.rb b/plugins/chat/spec/components/chat/message_rate_limiter_spec.rb
similarity index 98%
rename from plugins/chat/spec/components/chat_message_rate_limiter_spec.rb
rename to plugins/chat/spec/components/chat/message_rate_limiter_spec.rb
index fa73e927819..50d394ffa33 100644
--- a/plugins/chat/spec/components/chat_message_rate_limiter_spec.rb
+++ b/plugins/chat/spec/components/chat/message_rate_limiter_spec.rb
@@ -2,7 +2,7 @@
 
 require "rails_helper"
 
-describe Chat::ChatMessageRateLimiter do
+describe Chat::MessageRateLimiter do
   fab!(:user) { Fabricate(:user, trust_level: 3) }
   let(:limiter) { described_class.new(user) }
 
diff --git a/plugins/chat/spec/components/chat_message_updater_spec.rb b/plugins/chat/spec/components/chat/message_updater_spec.rb
similarity index 52%
rename from plugins/chat/spec/components/chat_message_updater_spec.rb
rename to plugins/chat/spec/components/chat/message_updater_spec.rb
index f32f979faaf..dd611f72d46 100644
--- a/plugins/chat/spec/components/chat_message_updater_spec.rb
+++ b/plugins/chat/spec/components/chat/message_updater_spec.rb
@@ -2,7 +2,7 @@
 
 require "rails_helper"
 
-describe Chat::ChatMessageUpdater do
+describe Chat::MessageUpdater do
   let(:guardian) { Guardian.new(user1) }
   fab!(:admin1) { Fabricate(:admin) }
   fab!(:admin2) { Fabricate(:admin) }
@@ -30,13 +30,11 @@ describe Chat::ChatMessageUpdater do
       Fabricate(:user_chat_channel_membership, chat_channel: public_chat_channel, user: user)
     end
     Group.refresh_automatic_groups!
-    @direct_message_channel =
-      Chat::DirectMessageChannelCreator.create!(acting_user: user1, target_users: [user1, user2])
   end
 
   def create_chat_message(user, message, channel, upload_ids: nil)
     creator =
-      Chat::ChatMessageCreator.create(
+      Chat::MessageCreator.create(
         chat_channel: channel,
         user: user,
         in_reply_to_id: nil,
@@ -53,7 +51,7 @@ describe Chat::ChatMessageUpdater do
     new_message = "2 short"
 
     updater =
-      Chat::ChatMessageUpdater.update(
+      Chat::MessageUpdater.update(
         guardian: guardian,
         chat_message: chat_message,
         new_content: new_message,
@@ -62,7 +60,7 @@ describe Chat::ChatMessageUpdater do
     expect(updater.error.message).to match(
       I18n.t(
         "chat.errors.minimum_length_not_met",
-        { minimum: SiteSetting.chat_minimum_message_length },
+        { count: SiteSetting.chat_minimum_message_length },
       ),
     )
     expect(chat_message.reload.message).to eq(og_message)
@@ -75,14 +73,35 @@ describe Chat::ChatMessageUpdater do
     new_message = "2 long" * 100
 
     updater =
-      Chat::ChatMessageUpdater.update(
+      Chat::MessageUpdater.update(
         guardian: guardian,
         chat_message: chat_message,
         new_content: new_message,
       )
     expect(updater.failed?).to eq(true)
     expect(updater.error.message).to match(
-      I18n.t("chat.errors.message_too_long", { maximum: SiteSetting.chat_maximum_message_length }),
+      I18n.t("chat.errors.message_too_long", { count: SiteSetting.chat_maximum_message_length }),
+    )
+    expect(chat_message.reload.message).to eq(og_message)
+  end
+
+  it "errors when a blank message is sent" do
+    og_message = "This won't be changed!"
+    chat_message = create_chat_message(user1, og_message, public_chat_channel)
+    new_message = "    "
+
+    updater =
+      Chat::MessageUpdater.update(
+        guardian: guardian,
+        chat_message: chat_message,
+        new_content: new_message,
+      )
+    expect(updater.failed?).to eq(true)
+    expect(updater.error.message).to match(
+      I18n.t(
+        "chat.errors.minimum_length_not_met",
+        { count: SiteSetting.chat_minimum_message_length },
+      ),
     )
     expect(chat_message.reload.message).to eq(og_message)
   end
@@ -92,7 +111,7 @@ describe Chat::ChatMessageUpdater do
     chat_message = create_chat_message(user1, og_message, public_chat_channel)
     new_message = "2 short"
     updater =
-      Chat::ChatMessageUpdater.update(
+      Chat::MessageUpdater.update(
         guardian: Guardian.new(Fabricate(:user)),
         chat_message: chat_message,
         new_content: new_message,
@@ -105,7 +124,7 @@ describe Chat::ChatMessageUpdater do
     chat_message = create_chat_message(user1, "This will be changed", public_chat_channel)
     new_message = "Change to this!"
 
-    Chat::ChatMessageUpdater.update(
+    Chat::MessageUpdater.update(
       guardian: guardian,
       chat_message: chat_message,
       new_content: new_message,
@@ -117,7 +136,7 @@ describe Chat::ChatMessageUpdater do
     chat_message = create_chat_message(user1, "This will be changed", public_chat_channel)
     events =
       DiscourseEvent.track_events do
-        Chat::ChatMessageUpdater.update(
+        Chat::MessageUpdater.update(
           guardian: guardian,
           chat_message: chat_message,
           new_content: "Change to this!",
@@ -126,118 +145,255 @@ describe Chat::ChatMessageUpdater do
     expect(events.map { _1[:event_name] }).to include(:chat_message_edited)
   end
 
-  it "creates mention notifications for unmentioned users" do
+  it "publishes updated message to message bus" do
     chat_message = create_chat_message(user1, "This will be changed", public_chat_channel)
-    expect {
-      Chat::ChatMessageUpdater.update(
-        guardian: guardian,
-        chat_message: chat_message,
-        new_content:
-          "this is a message with @system @mentions @#{user2.username} and @#{user3.username}",
-      )
-    }.to change { user2.chat_mentions.count }.by(1).and change { user3.chat_mentions.count }.by(1)
+    new_content = "New content"
+    messages =
+      MessageBus.track_publish("/chat/#{public_chat_channel.id}") do
+        described_class.update(
+          guardian: guardian,
+          chat_message: chat_message,
+          new_content: new_content,
+        )
+      end
+
+    expect(messages.count).to be(1)
+    message = messages[0].data
+    expect(message["chat_message"]["message"]).to eq(new_content)
   end
 
-  it "doesn't create mentions for already mentioned users" do
-    message = "ping @#{user2.username} @#{user3.username}"
-    chat_message = create_chat_message(user1, message, public_chat_channel)
-    expect {
-      Chat::ChatMessageUpdater.update(
+  context "with mentions" do
+    it "sends notifications if a message was updated with new mentions" do
+      message = create_chat_message(user1, "Mentioning @#{user2.username}", public_chat_channel)
+
+      Chat::MessageUpdater.update(
         guardian: guardian,
-        chat_message: chat_message,
-        new_content: message + " editedddd",
+        chat_message: message,
+        new_content: "Mentioning @#{user2.username} and @#{user3.username}",
       )
-    }.not_to change { ChatMention.count }
-  end
 
-  it "doesn't create mentions for users without access" do
-    message = "ping"
-    chat_message = create_chat_message(user1, message, public_chat_channel)
+      mention = user3.chat_mentions.where(chat_message: message).first
+      expect(mention.notification).to be_present
+    end
 
-    expect {
-      Chat::ChatMessageUpdater.update(
+    it "doesn't create mentions for already mentioned users" do
+      message = "ping @#{user2.username} @#{user3.username}"
+      chat_message = create_chat_message(user1, message, public_chat_channel)
+      expect {
+        Chat::MessageUpdater.update(
+          guardian: guardian,
+          chat_message: chat_message,
+          new_content: message + " editedddd",
+        )
+      }.not_to change { Chat::Mention.count }
+    end
+
+    it "doesn't create mention notification for users without access" do
+      message = "ping"
+      chat_message = create_chat_message(user1, message, public_chat_channel)
+
+      Chat::MessageUpdater.update(
         guardian: guardian,
         chat_message: chat_message,
         new_content: message + " @#{user_without_memberships.username}",
       )
-    }.not_to change { ChatMention.count }
-  end
 
-  it "destroys mention notifications that should be removed" do
-    chat_message =
-      create_chat_message(user1, "ping @#{user2.username} @#{user3.username}", public_chat_channel)
-    expect {
-      Chat::ChatMessageUpdater.update(
+      mention = user_without_memberships.chat_mentions.where(chat_message: chat_message).first
+      expect(mention.notification).to be_nil
+    end
+
+    it "destroys mentions that should be removed" do
+      chat_message =
+        create_chat_message(
+          user1,
+          "ping @#{user2.username} @#{user3.username}",
+          public_chat_channel,
+        )
+      expect {
+        Chat::MessageUpdater.update(
+          guardian: guardian,
+          chat_message: chat_message,
+          new_content: "ping @#{user3.username}",
+        )
+      }.to change { user2.chat_mentions.count }.by(-1).and not_change { user3.chat_mentions.count }
+    end
+
+    it "creates new, leaves existing, and removes old mentions all at once" do
+      chat_message =
+        create_chat_message(
+          user1,
+          "ping @#{user2.username} @#{user3.username}",
+          public_chat_channel,
+        )
+      Chat::MessageUpdater.update(
         guardian: guardian,
         chat_message: chat_message,
-        new_content: "ping @#{user3.username}",
+        new_content: "ping @#{user3.username} @#{user4.username}",
       )
-    }.to change { user2.chat_mentions.count }.by(-1).and not_change { user3.chat_mentions.count }
-  end
 
-  it "creates new, leaves existing, and removes old mentions all at once" do
-    chat_message =
-      create_chat_message(user1, "ping @#{user2.username} @#{user3.username}", public_chat_channel)
-    Chat::ChatMessageUpdater.update(
-      guardian: guardian,
-      chat_message: chat_message,
-      new_content: "ping @#{user3.username} @#{user4.username}",
-    )
+      expect(user2.chat_mentions.where(chat_message: chat_message)).not_to be_present
+      expect(user3.chat_mentions.where(chat_message: chat_message)).to be_present
+      expect(user4.chat_mentions.where(chat_message: chat_message)).to be_present
+    end
 
-    expect(user2.chat_mentions.where(chat_message: chat_message)).not_to be_present
-    expect(user3.chat_mentions.where(chat_message: chat_message)).to be_present
-    expect(user4.chat_mentions.where(chat_message: chat_message)).to be_present
-  end
+    it "doesn't create mention notification in direct message for users without access" do
+      result =
+        Chat::CreateDirectMessageChannel.call(
+          guardian: user1.guardian,
+          target_usernames: [user1.username, user2.username],
+        )
+      service_failed!(result) if result.failure?
+      direct_message_channel = result.channel
+      message = create_chat_message(user1, "ping nobody", direct_message_channel)
 
-  it "does not create new mentions in direct message for users who don't have access" do
-    chat_message = create_chat_message(user1, "ping nobody", @direct_message_channel)
-    expect {
-      Chat::ChatMessageUpdater.update(
+      Chat::MessageUpdater.update(
         guardian: guardian,
-        chat_message: chat_message,
+        chat_message: message,
         new_content: "ping @#{admin1.username}",
       )
-    }.not_to change { ChatMention.count }
-  end
 
-  describe "group mentions" do
-    it "creates group mentions on update" do
-      chat_message = create_chat_message(user1, "ping nobody", public_chat_channel)
-      expect {
-        Chat::ChatMessageUpdater.update(
-          guardian: guardian,
-          chat_message: chat_message,
-          new_content: "ping @#{admin_group.name}",
-        )
-      }.to change { ChatMention.where(chat_message: chat_message).count }.by(2)
-
-      expect(admin1.chat_mentions.where(chat_message: chat_message)).to be_present
-      expect(admin2.chat_mentions.where(chat_message: chat_message)).to be_present
+      mention = admin1.chat_mentions.where(chat_message: message).first
+      expect(mention.notification).to be_nil
     end
 
-    it "doesn't duplicate mentions when the user is already direct mentioned and then group mentioned" do
-      chat_message = create_chat_message(user1, "ping @#{admin2.username}", public_chat_channel)
-      expect {
-        Chat::ChatMessageUpdater.update(
-          guardian: guardian,
-          chat_message: chat_message,
-          new_content: "ping @#{admin_group.name} @#{admin2.username}",
-        )
-      }.to change { admin1.chat_mentions.count }.by(1).and not_change { admin2.chat_mentions.count }
+    it "creates a chat_mention record without notification when self mentioning" do
+      chat_message = create_chat_message(user1, "I will mention myself soon", public_chat_channel)
+      new_content = "hello @#{user1.username}"
+
+      described_class.update(
+        guardian: guardian,
+        chat_message: chat_message,
+        new_content: new_content,
+      )
+
+      mention = user1.chat_mentions.where(chat_message: chat_message).first
+      expect(mention).to be_present
+      expect(mention.notification).to be_nil
     end
 
-    it "deletes old mentions when group mention is removed" do
-      chat_message = create_chat_message(user1, "ping @#{admin_group.name}", public_chat_channel)
-      expect {
-        Chat::ChatMessageUpdater.update(
+    it "adds mentioned user and their status to the message bus message" do
+      SiteSetting.enable_user_status = true
+      status = { description: "dentist", emoji: "tooth" }
+      user2.set_status!(status[:description], status[:emoji])
+      chat_message = create_chat_message(user1, "This will be updated", public_chat_channel)
+      new_content = "Hey @#{user2.username}"
+
+      messages =
+        MessageBus.track_publish("/chat/#{public_chat_channel.id}") do
+          described_class.update(
+            guardian: guardian,
+            chat_message: chat_message,
+            new_content: new_content,
+          )
+        end
+
+      expect(messages.count).to be(1)
+      message = messages[0].data
+      expect(message["chat_message"]["mentioned_users"].count).to be(1)
+      mentioned_user = message["chat_message"]["mentioned_users"][0]
+
+      expect(mentioned_user["id"]).to eq(user2.id)
+      expect(mentioned_user["username"]).to eq(user2.username)
+      expect(mentioned_user["status"]).to be_present
+      expect(mentioned_user["status"].slice(:description, :emoji)).to eq(status)
+    end
+
+    it "doesn't add mentioned user's status to the message bus message when status is disabled" do
+      SiteSetting.enable_user_status = false
+      user2.set_status!("dentist", "tooth")
+      chat_message = create_chat_message(user1, "This will be updated", public_chat_channel)
+      new_content = "Hey @#{user2.username}"
+
+      messages =
+        MessageBus.track_publish("/chat/#{public_chat_channel.id}") do
+          described_class.update(
+            guardian: guardian,
+            chat_message: chat_message,
+            new_content: new_content,
+          )
+        end
+
+      expect(messages.count).to be(1)
+      message = messages[0].data
+      expect(message["chat_message"]["mentioned_users"].count).to be(1)
+      mentioned_user = message["chat_message"]["mentioned_users"][0]
+
+      expect(mentioned_user["status"]).to be_blank
+    end
+
+    context "when updating a mentioned user" do
+      it "updates the mention record" do
+        chat_message = create_chat_message(user1, "ping @#{user2.username}", public_chat_channel)
+
+        Chat::MessageUpdater.update(
           guardian: guardian,
           chat_message: chat_message,
-          new_content: "ping nobody anymore!",
+          new_content: "ping @#{user3.username}",
         )
-      }.to change { ChatMention.where(chat_message: chat_message).count }.by(-2)
 
-      expect(admin1.chat_mentions.where(chat_message: chat_message)).not_to be_present
-      expect(admin2.chat_mentions.where(chat_message: chat_message)).not_to be_present
+        user2_mentions = user2.chat_mentions.where(chat_message: chat_message)
+        expect(user2_mentions.length).to be(0)
+
+        user3_mentions = user3.chat_mentions.where(chat_message: chat_message)
+        expect(user3_mentions.length).to be(1)
+      end
+    end
+
+    context "when there are duplicate mentions" do
+      it "creates a single mention record per user" do
+        chat_message = create_chat_message(user1, "ping @#{user2.username}", public_chat_channel)
+
+        Chat::MessageUpdater.update(
+          guardian: guardian,
+          chat_message: chat_message,
+          new_content: "ping @#{user2.username} @#{user2.username} edited",
+        )
+
+        expect(user2.chat_mentions.where(chat_message: chat_message).count).to eq(1)
+      end
+    end
+
+    describe "with group mentions" do
+      it "creates group mentions on update" do
+        chat_message = create_chat_message(user1, "ping nobody", public_chat_channel)
+        expect {
+          Chat::MessageUpdater.update(
+            guardian: guardian,
+            chat_message: chat_message,
+            new_content: "ping @#{admin_group.name}",
+          )
+        }.to change { Chat::Mention.where(chat_message: chat_message).count }.by(2)
+
+        expect(admin1.chat_mentions.where(chat_message: chat_message)).to be_present
+        expect(admin2.chat_mentions.where(chat_message: chat_message)).to be_present
+      end
+
+      it "doesn't duplicate mentions when the user is already direct mentioned and then group mentioned" do
+        chat_message = create_chat_message(user1, "ping @#{admin2.username}", public_chat_channel)
+        expect {
+          Chat::MessageUpdater.update(
+            guardian: guardian,
+            chat_message: chat_message,
+            new_content: "ping @#{admin_group.name} @#{admin2.username}",
+          )
+        }.to change { admin1.chat_mentions.count }.by(1).and not_change {
+                admin2.chat_mentions.count
+              }
+      end
+
+      it "deletes old mentions when group mention is removed" do
+        chat_message = create_chat_message(user1, "ping @#{admin_group.name}", public_chat_channel)
+        expect {
+          Chat::MessageUpdater.update(
+            guardian: guardian,
+            chat_message: chat_message,
+            new_content: "ping nobody anymore!",
+          )
+        }.to change { Chat::Mention.where(chat_message: chat_message).count }.by(-2)
+
+        expect(admin1.chat_mentions.where(chat_message: chat_message)).not_to be_present
+        expect(admin2.chat_mentions.where(chat_message: chat_message)).not_to be_present
+      end
     end
   end
 
@@ -245,7 +401,7 @@ describe Chat::ChatMessageUpdater do
     old_message = "It's a thrsday!"
     new_message = "It's a thursday!"
     chat_message = create_chat_message(user1, old_message, public_chat_channel)
-    Chat::ChatMessageUpdater.update(
+    Chat::MessageUpdater.update(
       guardian: guardian,
       chat_message: chat_message,
       new_content: new_message,
@@ -279,7 +435,7 @@ describe Chat::ChatMessageUpdater do
       chat_message_2.update!(created_at: 20.seconds.ago)
 
       updater =
-        Chat::ChatMessageUpdater.update(
+        Chat::MessageUpdater.update(
           guardian: guardian,
           chat_message: chat_message_1,
           new_content: "another different chat message here",
@@ -299,7 +455,7 @@ describe Chat::ChatMessageUpdater do
       chat_message.update!(created_at: 30.seconds.ago)
 
       updater =
-        Chat::ChatMessageUpdater.update(
+        Chat::MessageUpdater.update(
           guardian: guardian,
           chat_message: chat_message,
           new_content: "this is some chat message",
@@ -323,13 +479,13 @@ describe Chat::ChatMessageUpdater do
           upload_ids: [upload1.id, upload2.id],
         )
       expect {
-        Chat::ChatMessageUpdater.update(
+        Chat::MessageUpdater.update(
           guardian: guardian,
           chat_message: chat_message,
           new_content: "I guess this is different",
           upload_ids: [upload2.id, upload1.id],
         )
-      }.not_to change { ChatUpload.count }
+      }.to not_change { UploadReference.count }
     end
 
     it "removes uploads that should be removed" do
@@ -340,14 +496,15 @@ describe Chat::ChatMessageUpdater do
           public_chat_channel,
           upload_ids: [upload1.id, upload2.id],
         )
+
       expect {
-        Chat::ChatMessageUpdater.update(
+        Chat::MessageUpdater.update(
           guardian: guardian,
           chat_message: chat_message,
           new_content: "I guess this is different",
           upload_ids: [upload1.id],
         )
-      }.to change { ChatUpload.where(upload_id: upload2.id).count }.by(-1)
+      }.to change { UploadReference.where(upload_id: upload2.id).count }.by(-1)
     end
 
     it "removes all uploads if they should be removed" do
@@ -358,64 +515,65 @@ describe Chat::ChatMessageUpdater do
           public_chat_channel,
           upload_ids: [upload1.id, upload2.id],
         )
+
       expect {
-        Chat::ChatMessageUpdater.update(
+        Chat::MessageUpdater.update(
           guardian: guardian,
           chat_message: chat_message,
           new_content: "I guess this is different",
           upload_ids: [],
         )
-      }.to change { ChatUpload.where(chat_message: chat_message).count }.by(-2)
+      }.to change { UploadReference.where(target: chat_message).count }.by(-2)
     end
 
     it "adds one upload if none exist" do
       chat_message = create_chat_message(user1, "something", public_chat_channel)
       expect {
-        Chat::ChatMessageUpdater.update(
+        Chat::MessageUpdater.update(
           guardian: guardian,
           chat_message: chat_message,
           new_content: "I guess this is different",
           upload_ids: [upload1.id],
         )
-      }.to change { ChatUpload.where(chat_message: chat_message).count }.by(1)
+      }.to change { UploadReference.where(target: chat_message).count }.by(1)
     end
 
     it "adds multiple uploads if none exist" do
       chat_message = create_chat_message(user1, "something", public_chat_channel)
       expect {
-        Chat::ChatMessageUpdater.update(
+        Chat::MessageUpdater.update(
           guardian: guardian,
           chat_message: chat_message,
           new_content: "I guess this is different",
           upload_ids: [upload1.id, upload2.id],
         )
-      }.to change { ChatUpload.where(chat_message: chat_message).count }.by(2)
+      }.to change { UploadReference.where(target: chat_message).count }.by(2)
     end
 
     it "doesn't remove existing uploads when upload ids that do not exist are passed in" do
       chat_message =
         create_chat_message(user1, "something", public_chat_channel, upload_ids: [upload1.id])
       expect {
-        Chat::ChatMessageUpdater.update(
+        Chat::MessageUpdater.update(
           guardian: guardian,
           chat_message: chat_message,
           new_content: "I guess this is different",
           upload_ids: [0],
         )
-      }.not_to change { ChatUpload.where(chat_message: chat_message).count }
+      }.to not_change { UploadReference.where(target: chat_message).count }
     end
 
     it "doesn't add uploads if `chat_allow_uploads` is false" do
       SiteSetting.chat_allow_uploads = false
       chat_message = create_chat_message(user1, "something", public_chat_channel)
       expect {
-        Chat::ChatMessageUpdater.update(
+        Chat::MessageUpdater.update(
           guardian: guardian,
           chat_message: chat_message,
           new_content: "I guess this is different",
           upload_ids: [upload1.id, upload2.id],
         )
-      }.not_to change { ChatUpload.where(chat_message: chat_message).count }
+      }.to not_change { UploadReference.where(target: chat_message).count }
     end
 
     it "doesn't remove existing uploads if `chat_allow_uploads` is false" do
@@ -428,13 +586,13 @@ describe Chat::ChatMessageUpdater do
           upload_ids: [upload1.id, upload2.id],
         )
       expect {
-        Chat::ChatMessageUpdater.update(
+        Chat::MessageUpdater.update(
           guardian: guardian,
           chat_message: chat_message,
           new_content: "I guess this is different",
           upload_ids: [],
         )
-      }.not_to change { ChatUpload.where(chat_message: chat_message).count }
+      }.to not_change { UploadReference.where(target: chat_message).count }
     end
 
     it "updates if upload is present even if length is less than `chat_minimum_message_length`" do
@@ -447,7 +605,7 @@ describe Chat::ChatMessageUpdater do
         )
       SiteSetting.chat_minimum_message_length = 10
       new_message = "hi :)"
-      Chat::ChatMessageUpdater.update(
+      Chat::MessageUpdater.update(
         guardian: guardian,
         chat_message: chat_message,
         new_content: new_message,
@@ -457,13 +615,36 @@ describe Chat::ChatMessageUpdater do
     end
   end
 
+  context "when the message is in a thread" do
+    fab!(:message) do
+      Fabricate(
+        :chat_message,
+        user: user1,
+        chat_channel: public_chat_channel,
+        thread: Fabricate(:chat_thread, channel: public_chat_channel),
+      )
+    end
+
+    it "publishes a MessageBus event to update the original message metadata" do
+      messages =
+        MessageBus.track_publish("/chat/#{public_chat_channel.id}") do
+          Chat::MessageUpdater.update(
+            guardian: guardian,
+            chat_message: message,
+            new_content: "some new updated content",
+          )
+        end
+      expect(messages.find { |m| m.data["type"] == "update_thread_original_message" }).to be_present
+    end
+  end
+
   describe "watched words" do
     fab!(:watched_word) { Fabricate(:watched_word) }
 
     it "errors when a blocked word is present" do
       chat_message = create_chat_message(user1, "something", public_chat_channel)
       creator =
-        Chat::ChatMessageCreator.create(
+        Chat::MessageCreator.create(
           chat_channel: public_chat_channel,
           user: user1,
           content: "bad word - #{watched_word.word}",
@@ -480,7 +661,7 @@ describe Chat::ChatMessageUpdater do
 
     def update_message(user)
       message.update(user: user)
-      Chat::ChatMessageUpdater.update(
+      Chat::MessageUpdater.update(
         guardian: Guardian.new(user),
         chat_message: message,
         new_content: "I guess this is different",
@@ -494,10 +675,7 @@ describe Chat::ChatMessageUpdater do
         updater = update_message(user1)
         expect(updater.failed?).to eq(true)
         expect(updater.error.message).to eq(
-          I18n.t(
-            "chat.errors.channel_modify_message_disallowed",
-            status: public_chat_channel.status_name,
-          ),
+          I18n.t("chat.errors.channel_modify_message_disallowed.closed"),
         )
       end
 
@@ -514,18 +692,12 @@ describe Chat::ChatMessageUpdater do
         updater = update_message(user1)
         expect(updater.failed?).to eq(true)
         expect(updater.error.message).to eq(
-          I18n.t(
-            "chat.errors.channel_modify_message_disallowed",
-            status: public_chat_channel.status_name,
-          ),
+          I18n.t("chat.errors.channel_modify_message_disallowed.read_only"),
         )
         updater = update_message(admin1)
         expect(updater.failed?).to eq(true)
         expect(updater.error.message).to eq(
-          I18n.t(
-            "chat.errors.channel_modify_message_disallowed",
-            status: public_chat_channel.status_name,
-          ),
+          I18n.t("chat.errors.channel_modify_message_disallowed.read_only"),
         )
       end
     end
@@ -537,18 +709,12 @@ describe Chat::ChatMessageUpdater do
         updater = update_message(user1)
         expect(updater.failed?).to eq(true)
         expect(updater.error.message).to eq(
-          I18n.t(
-            "chat.errors.channel_modify_message_disallowed",
-            status: public_chat_channel.status_name,
-          ),
+          I18n.t("chat.errors.channel_modify_message_disallowed.archived"),
         )
         updater = update_message(admin1)
         expect(updater.failed?).to eq(true)
         expect(updater.error.message).to eq(
-          I18n.t(
-            "chat.errors.channel_modify_message_disallowed",
-            status: public_chat_channel.status_name,
-          ),
+          I18n.t("chat.errors.channel_modify_message_disallowed.archived"),
         )
       end
     end
diff --git a/plugins/chat/spec/components/chat_seeder_spec.rb b/plugins/chat/spec/components/chat/seeder_spec.rb
similarity index 76%
rename from plugins/chat/spec/components/chat_seeder_spec.rb
rename to plugins/chat/spec/components/chat/seeder_spec.rb
index e0a7c5222a6..f0ee8d1faac 100644
--- a/plugins/chat/spec/components/chat_seeder_spec.rb
+++ b/plugins/chat/spec/components/chat/seeder_spec.rb
@@ -2,7 +2,7 @@
 
 require "rails_helper"
 
-describe ChatSeeder do
+describe Chat::Seeder do
   fab!(:staff_category) { Fabricate(:private_category, name: "Staff", group: Group[:staff]) }
   fab!(:general_category) { Fabricate(:category, name: "General") }
 
@@ -27,16 +27,16 @@ describe ChatSeeder do
 
     expected_members_count = GroupUser.where(group: group).count
     memberships_count =
-      UserChatChannelMembership.automatic.where(chat_channel: channel, following: true).count
+      Chat::UserChatChannelMembership.automatic.where(chat_channel: channel, following: true).count
 
     expect(memberships_count).to eq(expected_members_count)
   end
 
   it "seeds default channels" do
-    ChatSeeder.new.execute
+    Chat::Seeder.new.execute
 
-    staff_channel = ChatChannel.find_by(chatable: staff_category)
-    general_channel = ChatChannel.find_by(chatable: general_category)
+    staff_channel = Chat::Channel.find_by(chatable_id: staff_category)
+    general_channel = Chat::Channel.find_by(chatable_id: general_category)
 
     assert_channel_was_correctly_seeded(staff_channel, Group[:staff])
     assert_channel_was_correctly_seeded(general_channel, Group[:everyone])
@@ -49,24 +49,24 @@ describe ChatSeeder do
   it "applies a name to the general category channel" do
     expected_name = general_category.name
 
-    ChatSeeder.new.execute
+    Chat::Seeder.new.execute
 
-    general_channel = ChatChannel.find_by(chatable: general_category)
+    general_channel = Chat::Channel.find_by(chatable_id: general_category)
     expect(general_channel.name).to eq(expected_name)
   end
 
   it "applies a name to the staff category channel" do
     expected_name = staff_category.name
 
-    ChatSeeder.new.execute
+    Chat::Seeder.new.execute
 
-    staff_channel = ChatChannel.find_by(chatable: staff_category)
+    staff_channel = Chat::Channel.find_by(chatable_id: staff_category)
     expect(staff_channel.name).to eq(expected_name)
   end
 
   it "does nothing when 'SiteSetting.needs_chat_seeded' is false" do
     SiteSetting.needs_chat_seeded = false
 
-    expect { ChatSeeder.new.execute }.not_to change { ChatChannel.count }
+    expect { Chat::Seeder.new.execute }.not_to change { Chat::Channel.count }
   end
 end
diff --git a/plugins/chat/spec/components/chat_message_creator_spec.rb b/plugins/chat/spec/components/chat_message_creator_spec.rb
deleted file mode 100644
index 45f3a4ad2e3..00000000000
--- a/plugins/chat/spec/components/chat_message_creator_spec.rb
+++ /dev/null
@@ -1,608 +0,0 @@
-# frozen_string_literal: true
-
-require "rails_helper"
-
-describe Chat::ChatMessageCreator do
-  fab!(:admin1) { Fabricate(:admin) }
-  fab!(:admin2) { Fabricate(:admin) }
-  fab!(:user1) { Fabricate(:user, group_ids: [Group::AUTO_GROUPS[:everyone]]) }
-  fab!(:user2) { Fabricate(:user) }
-  fab!(:user3) { Fabricate(:user) }
-  fab!(:user4) { Fabricate(:user) }
-  fab!(:admin_group) do
-    Fabricate(
-      :public_group,
-      users: [admin1, admin2],
-      mentionable_level: Group::ALIAS_LEVELS[:everyone],
-    )
-  end
-  fab!(:user_group) do
-    Fabricate(
-      :public_group,
-      users: [user1, user2, user3],
-      mentionable_level: Group::ALIAS_LEVELS[:everyone],
-    )
-  end
-  fab!(:user_without_memberships) { Fabricate(:user) }
-  fab!(:public_chat_channel) { Fabricate(:category_channel) }
-  fab!(:dm_chat_channel) do
-    Fabricate(
-      :direct_message_channel,
-      chatable: Fabricate(:direct_message, users: [user1, user2, user3]),
-    )
-  end
-  let(:direct_message_channel) do
-    Chat::DirectMessageChannelCreator.create!(acting_user: user1, target_users: [user1, user2])
-  end
-
-  before do
-    SiteSetting.chat_enabled = true
-    SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:everyone]
-    SiteSetting.chat_duplicate_message_sensitivity = 0
-
-    # Create channel memberships
-    [admin1, admin2, user1, user2, user3].each do |user|
-      Fabricate(:user_chat_channel_membership, chat_channel: public_chat_channel, user: user)
-    end
-
-    Group.refresh_automatic_groups!
-    direct_message_channel
-  end
-
-  describe "Integration tests with jobs running immediately" do
-    before { Jobs.run_immediately! }
-
-    it "errors when length is less than `chat_minimum_message_length`" do
-      SiteSetting.chat_minimum_message_length = 10
-      creator =
-        Chat::ChatMessageCreator.create(
-          chat_channel: public_chat_channel,
-          user: user1,
-          content: "2 short",
-        )
-      expect(creator.failed?).to eq(true)
-      expect(creator.error.message).to match(
-        I18n.t(
-          "chat.errors.minimum_length_not_met",
-          { minimum: SiteSetting.chat_minimum_message_length },
-        ),
-      )
-    end
-
-    it "errors when length is greater than `chat_maximum_message_length`" do
-      SiteSetting.chat_maximum_message_length = 100
-      creator =
-        Chat::ChatMessageCreator.create(
-          chat_channel: public_chat_channel,
-          user: user1,
-          content: "a really long and in depth message that is just too detailed" * 100,
-        )
-      expect(creator.failed?).to eq(true)
-      expect(creator.error.message).to match(
-        I18n.t(
-          "chat.errors.message_too_long",
-          { maximum: SiteSetting.chat_maximum_message_length },
-        ),
-      )
-    end
-
-    it "allows message creation when length is less than `chat_minimum_message_length` when upload is present" do
-      upload = Fabricate(:upload, user: user1)
-      SiteSetting.chat_minimum_message_length = 10
-      expect {
-        Chat::ChatMessageCreator.create(
-          chat_channel: public_chat_channel,
-          user: user1,
-          content: "2 short",
-          upload_ids: [upload.id],
-        )
-      }.to change { ChatMessage.count }.by(1)
-    end
-
-    it "creates messages for users who can see the channel" do
-      expect {
-        Chat::ChatMessageCreator.create(
-          chat_channel: public_chat_channel,
-          user: user1,
-          content: "this is a message",
-        )
-      }.to change { ChatMessage.count }.by(1)
-    end
-
-    it "updates the channel’s last message date" do
-      previous_last_message_sent_at = public_chat_channel.last_message_sent_at
-
-      Chat::ChatMessageCreator.create(
-        chat_channel: public_chat_channel,
-        user: user1,
-        content: "this is a message",
-      )
-
-      expect(previous_last_message_sent_at).to be < public_chat_channel.reload.last_message_sent_at
-    end
-
-    it "sets the last_editor_id to the user who created the message" do
-      message =
-        Chat::ChatMessageCreator.create(
-          chat_channel: public_chat_channel,
-          user: user1,
-          content: "this is a message",
-        ).chat_message
-      expect(message.last_editor_id).to eq(user1.id)
-    end
-
-    it "publishes a DiscourseEvent for new messages" do
-      events =
-        DiscourseEvent.track_events do
-          Chat::ChatMessageCreator.create(
-            chat_channel: public_chat_channel,
-            user: user1,
-            content: "this is a message",
-          )
-        end
-      expect(events.map { _1[:event_name] }).to include(:chat_message_created)
-    end
-
-    it "creates mention notifications for public chat" do
-      expect {
-        Chat::ChatMessageCreator.create(
-          chat_channel: public_chat_channel,
-          user: user1,
-          content:
-            "this is a @#{user1.username} message with @system @mentions @#{user2.username} and @#{user3.username}",
-        )
-        # Only 2 mentions are created because user mentioned themselves, system, and an invalid username.
-      }.to change { ChatMention.count }.by(2).and not_change { user1.chat_mentions.count }
-    end
-
-    it "mentions are case insensitive" do
-      expect {
-        Chat::ChatMessageCreator.create(
-          chat_channel: public_chat_channel,
-          user: user1,
-          content: "Hey @#{user2.username.upcase}",
-        )
-      }.to change { user2.chat_mentions.count }.by(1)
-    end
-
-    it "notifies @all properly" do
-      expect {
-        Chat::ChatMessageCreator.create(
-          chat_channel: public_chat_channel,
-          user: user1,
-          content: "@all",
-        )
-      }.to change { ChatMention.count }.by(4)
-
-      UserChatChannelMembership.where(user: user2, chat_channel: public_chat_channel).update_all(
-        following: false,
-      )
-      expect {
-        Chat::ChatMessageCreator.create(
-          chat_channel: public_chat_channel,
-          user: user1,
-          content: "again! @all",
-        )
-      }.to change { ChatMention.count }.by(3)
-    end
-
-    it "notifies @here properly" do
-      admin1.update(last_seen_at: 1.year.ago)
-      admin2.update(last_seen_at: 1.year.ago)
-      user1.update(last_seen_at: Time.now)
-      user2.update(last_seen_at: Time.now)
-      user3.update(last_seen_at: Time.now)
-      expect {
-        Chat::ChatMessageCreator.create(
-          chat_channel: public_chat_channel,
-          user: user1,
-          content: "@here",
-        )
-      }.to change { ChatMention.count }.by(2)
-    end
-
-    it "doesn't sent double notifications when '@here' is mentioned" do
-      user2.update(last_seen_at: Time.now)
-      expect {
-        Chat::ChatMessageCreator.create(
-          chat_channel: public_chat_channel,
-          user: user1,
-          content: "@here @#{user2.username}",
-        )
-      }.to change { user2.chat_mentions.count }.by(1)
-    end
-
-    it "notifies @here plus other mentions" do
-      admin1.update(last_seen_at: Time.now)
-      admin2.update(last_seen_at: 1.year.ago)
-      user1.update(last_seen_at: 1.year.ago)
-      user2.update(last_seen_at: 1.year.ago)
-      user3.update(last_seen_at: 1.year.ago)
-      expect {
-        Chat::ChatMessageCreator.create(
-          chat_channel: public_chat_channel,
-          user: user1,
-          content: "@here plus @#{user3.username}",
-        )
-      }.to change { user3.chat_mentions.count }.by(1)
-    end
-
-    it "doesn't create mention notifications for users without a membership record" do
-      expect {
-        Chat::ChatMessageCreator.create(
-          chat_channel: public_chat_channel,
-          user: user1,
-          content: "hello @#{user_without_memberships.username}",
-        )
-      }.not_to change { ChatMention.count }
-    end
-
-    it "doesn't create mention notifications for users who cannot chat" do
-      new_group = Group.create
-      SiteSetting.chat_allowed_groups = new_group.id
-      expect {
-        Chat::ChatMessageCreator.create(
-          chat_channel: public_chat_channel,
-          user: user1,
-          content: "hi @#{user2.username} @#{user3.username}",
-        )
-      }.not_to change { ChatMention.count }
-    end
-
-    it "doesn't create mention notifications for users with chat disabled" do
-      user2.user_option.update(chat_enabled: false)
-      expect {
-        Chat::ChatMessageCreator.create(
-          chat_channel: public_chat_channel,
-          user: user1,
-          content: "hi @#{user2.username}",
-        )
-      }.not_to change { ChatMention.count }
-    end
-
-    it "creates only mention notifications for users with access in private chat" do
-      expect {
-        Chat::ChatMessageCreator.create(
-          chat_channel: direct_message_channel,
-          user: user1,
-          content: "hello there @#{user2.username} and @#{user3.username}",
-        )
-        # Only user2 should be notified
-      }.to change { user2.chat_mentions.count }.by(1).and not_change { user3.chat_mentions.count }
-    end
-
-    it "creates a mention notifications for group users that are participating in private chat" do
-      expect {
-        Chat::ChatMessageCreator.create(
-          chat_channel: direct_message_channel,
-          user: user1,
-          content: "hello there @#{user_group.name}",
-        )
-        # Only user2 should be notified
-      }.to change { user2.chat_mentions.count }.by(1).and not_change { user3.chat_mentions.count }
-    end
-
-    it "publishes inaccessible mentions when user isn't aren't a part of the channel" do
-      ChatPublisher.expects(:publish_inaccessible_mentions).once
-      Chat::ChatMessageCreator.create(
-        chat_channel: public_chat_channel,
-        user: admin1,
-        content: "hello @#{user4.username}",
-      )
-    end
-
-    it "publishes inaccessible mentions when user doesn't have chat access" do
-      SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:staff]
-      ChatPublisher.expects(:publish_inaccessible_mentions).once
-      Chat::ChatMessageCreator.create(
-        chat_channel: public_chat_channel,
-        user: admin1,
-        content: "hello @#{user3.username}",
-      )
-    end
-
-    it "doesn't publish inaccessible mentions when user is following channel" do
-      ChatPublisher.expects(:publish_inaccessible_mentions).never
-      Chat::ChatMessageCreator.create(
-        chat_channel: public_chat_channel,
-        user: admin1,
-        content: "hello @#{admin2.username}",
-      )
-    end
-
-    it "does not create mentions for suspended users" do
-      user2.update(suspended_till: Time.now + 10.years)
-      expect {
-        Chat::ChatMessageCreator.create(
-          chat_channel: direct_message_channel,
-          user: user1,
-          content: "hello @#{user2.username}",
-        )
-      }.not_to change { user2.chat_mentions.count }
-    end
-
-    it "does not create @all mentions for users when ignore_channel_wide_mention is enabled" do
-      expect {
-        Chat::ChatMessageCreator.create(
-          chat_channel: public_chat_channel,
-          user: user1,
-          content: "@all",
-        )
-      }.to change { ChatMention.count }.by(4)
-
-      user2.user_option.update(ignore_channel_wide_mention: true)
-      expect {
-        Chat::ChatMessageCreator.create(
-          chat_channel: public_chat_channel,
-          user: user1,
-          content: "hi! @all",
-        )
-      }.to change { ChatMention.count }.by(3)
-    end
-
-    it "does not create @here mentions for users when ignore_channel_wide_mention is enabled" do
-      admin1.update(last_seen_at: 1.year.ago)
-      admin2.update(last_seen_at: 1.year.ago)
-      user1.update(last_seen_at: Time.now)
-      user2.update(last_seen_at: Time.now)
-      user2.user_option.update(ignore_channel_wide_mention: true)
-      user3.update(last_seen_at: Time.now)
-
-      expect {
-        Chat::ChatMessageCreator.create(
-          chat_channel: public_chat_channel,
-          user: user1,
-          content: "@here",
-        )
-      }.to change { ChatMention.count }.by(1)
-    end
-
-    describe "group mentions" do
-      it "creates chat mentions for group mentions where the group is mentionable" do
-        expect {
-          Chat::ChatMessageCreator.create(
-            chat_channel: public_chat_channel,
-            user: user1,
-            content: "hello @#{admin_group.name}",
-          )
-        }.to change { admin1.chat_mentions.count }.by(1).and change {
-                admin2.chat_mentions.count
-              }.by(1)
-      end
-
-      it "doesn't mention users twice if they are direct mentioned and group mentioned" do
-        expect {
-          Chat::ChatMessageCreator.create(
-            chat_channel: public_chat_channel,
-            user: user1,
-            content: "hello @#{admin_group.name} @#{admin1.username} and @#{admin2.username}",
-          )
-        }.to change { admin1.chat_mentions.count }.by(1).and change {
-                admin2.chat_mentions.count
-              }.by(1)
-      end
-
-      it "creates chat mentions for group mentions and direct mentions" do
-        expect {
-          Chat::ChatMessageCreator.create(
-            chat_channel: public_chat_channel,
-            user: user1,
-            content: "hello @#{admin_group.name} @#{user2.username}",
-          )
-        }.to change { admin1.chat_mentions.count }.by(1).and change {
-                admin2.chat_mentions.count
-              }.by(1).and change { user2.chat_mentions.count }.by(1)
-      end
-
-      it "creates chat mentions for group mentions and direct mentions" do
-        expect {
-          Chat::ChatMessageCreator.create(
-            chat_channel: public_chat_channel,
-            user: user1,
-            content: "hello @#{admin_group.name} @#{user_group.name}",
-          )
-        }.to change { admin1.chat_mentions.count }.by(1).and change {
-                admin2.chat_mentions.count
-              }.by(1).and change { user2.chat_mentions.count }.by(1).and change {
-                            user3.chat_mentions.count
-                          }.by(1)
-      end
-
-      it "doesn't create chat mentions for group mentions where the group is un-mentionable" do
-        admin_group.update(mentionable_level: Group::ALIAS_LEVELS[:nobody])
-        expect {
-          Chat::ChatMessageCreator.create(
-            chat_channel: public_chat_channel,
-            user: user1,
-            content: "hello @#{admin_group.name}",
-          )
-        }.not_to change { ChatMention.count }
-      end
-    end
-
-    describe "push notifications" do
-      before do
-        UserChatChannelMembership.where(user: user1, chat_channel: public_chat_channel).update(
-          mobile_notification_level: UserChatChannelMembership::NOTIFICATION_LEVELS[:always],
-        )
-        PresenceChannel.clear_all!
-      end
-
-      it "sends a push notification to watching users who are not in chat" do
-        PostAlerter.expects(:push_notification).once
-        Chat::ChatMessageCreator.create(
-          chat_channel: public_chat_channel,
-          user: user2,
-          content: "Beep boop",
-        )
-      end
-
-      it "does not send a push notification to watching users who are in chat" do
-        PresenceChannel.new("/chat/online").present(user_id: user1.id, client_id: 1)
-        PostAlerter.expects(:push_notification).never
-        Chat::ChatMessageCreator.create(
-          chat_channel: public_chat_channel,
-          user: user2,
-          content: "Beep boop",
-        )
-      end
-    end
-
-    describe "with uploads" do
-      fab!(:upload1) { Fabricate(:upload, user: user1) }
-      fab!(:upload2) { Fabricate(:upload, user: user1) }
-      fab!(:private_upload) { Fabricate(:upload, user: user2) }
-
-      it "can attach 1 upload to a new message" do
-        expect {
-          Chat::ChatMessageCreator.create(
-            chat_channel: public_chat_channel,
-            user: user1,
-            content: "Beep boop",
-            upload_ids: [upload1.id],
-          )
-        }.to change { ChatUpload.where(upload_id: upload1.id).count }.by(1)
-      end
-
-      it "can attach multiple uploads to a new message" do
-        expect {
-          Chat::ChatMessageCreator.create(
-            chat_channel: public_chat_channel,
-            user: user1,
-            content: "Beep boop",
-            upload_ids: [upload1.id, upload2.id],
-          )
-        }.to change { ChatUpload.where(upload_id: upload1.id).count }.by(1).and change {
-                ChatUpload.where(upload_id: upload2.id).count
-              }.by(1)
-      end
-
-      it "filters out uploads that weren't uploaded by the user" do
-        expect {
-          Chat::ChatMessageCreator.create(
-            chat_channel: public_chat_channel,
-            user: user1,
-            content: "Beep boop",
-            upload_ids: [private_upload.id],
-          )
-        }.not_to change { ChatUpload.where(upload_id: private_upload.id).count }
-      end
-
-      it "doesn't attach uploads when `chat_allow_uploads` is false" do
-        SiteSetting.chat_allow_uploads = false
-        expect {
-          Chat::ChatMessageCreator.create(
-            chat_channel: public_chat_channel,
-            user: user1,
-            content: "Beep boop",
-            upload_ids: [upload1.id],
-          )
-        }.not_to change { ChatUpload.where(upload_id: upload1.id).count }
-      end
-    end
-  end
-
-  it "destroys draft after message was created" do
-    ChatDraft.create!(user: user1, chat_channel: public_chat_channel, data: "{}")
-
-    expect do
-      Chat::ChatMessageCreator.create(
-        chat_channel: public_chat_channel,
-        user: user1,
-        content: "Hi @#{user2.username}",
-      )
-    end.to change { ChatDraft.count }.by(-1)
-  end
-
-  describe "watched words" do
-    fab!(:watched_word) { Fabricate(:watched_word) }
-
-    it "errors when a blocked word is present" do
-      creator =
-        Chat::ChatMessageCreator.create(
-          chat_channel: public_chat_channel,
-          user: user1,
-          content: "bad word - #{watched_word.word}",
-        )
-      expect(creator.failed?).to eq(true)
-      expect(creator.error.message).to match(
-        I18n.t("contains_blocked_word", { word: watched_word.word }),
-      )
-    end
-  end
-
-  describe "channel statuses" do
-    def create_message(user)
-      Chat::ChatMessageCreator.create(
-        chat_channel: public_chat_channel,
-        user: user,
-        content: "test message",
-      )
-    end
-
-    context "when channel is closed" do
-      before { public_chat_channel.update(status: :closed) }
-
-      it "errors when trying to create the message for non-staff" do
-        creator = create_message(user1)
-        expect(creator.failed?).to eq(true)
-        expect(creator.error.message).to eq(
-          I18n.t(
-            "chat.errors.channel_new_message_disallowed",
-            status: public_chat_channel.status_name,
-          ),
-        )
-      end
-
-      it "does not error when trying to create a message for staff" do
-        expect { create_message(admin1) }.to change { ChatMessage.count }.by(1)
-      end
-    end
-
-    context "when channel is read_only" do
-      before { public_chat_channel.update(status: :read_only) }
-
-      it "errors when trying to create the message for all users" do
-        creator = create_message(user1)
-        expect(creator.failed?).to eq(true)
-        expect(creator.error.message).to eq(
-          I18n.t(
-            "chat.errors.channel_new_message_disallowed",
-            status: public_chat_channel.status_name,
-          ),
-        )
-        creator = create_message(admin1)
-        expect(creator.failed?).to eq(true)
-        expect(creator.error.message).to eq(
-          I18n.t(
-            "chat.errors.channel_new_message_disallowed",
-            status: public_chat_channel.status_name,
-          ),
-        )
-      end
-    end
-
-    context "when channel is archived" do
-      before { public_chat_channel.update(status: :archived) }
-
-      it "errors when trying to create the message for all users" do
-        creator = create_message(user1)
-        expect(creator.failed?).to eq(true)
-        expect(creator.error.message).to eq(
-          I18n.t(
-            "chat.errors.channel_new_message_disallowed",
-            status: public_chat_channel.status_name,
-          ),
-        )
-        creator = create_message(admin1)
-        expect(creator.failed?).to eq(true)
-        expect(creator.error.message).to eq(
-          I18n.t(
-            "chat.errors.channel_new_message_disallowed",
-            status: public_chat_channel.status_name,
-          ),
-        )
-      end
-    end
-  end
-end
diff --git a/plugins/chat/spec/fabricators/chat_fabricator.rb b/plugins/chat/spec/fabricators/chat_fabricator.rb
index a8d7f3e544e..359a813db6e 100644
--- a/plugins/chat/spec/fabricators/chat_fabricator.rb
+++ b/plugins/chat/spec/fabricators/chat_fabricator.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-Fabricator(:chat_channel) do
+Fabricator(:chat_channel, class_name: "Chat::Channel") do
   name do
     sequence(:name) do |n|
       random_name = [
@@ -25,14 +25,14 @@ Fabricator(:chat_channel) do
   status { :open }
 end
 
-Fabricator(:category_channel, from: :chat_channel, class_name: :category_channel) {}
+Fabricator(:category_channel, from: :chat_channel) {}
 
-Fabricator(:private_category_channel, from: :category_channel, class_name: :category_channel) do
+Fabricator(:private_category_channel, from: :category_channel) do
   transient :group
   chatable { |attrs| Fabricate(:private_category, group: attrs[:group] || Group[:staff]) }
 end
 
-Fabricator(:direct_message_channel, from: :chat_channel, class_name: :direct_message_channel) do
+Fabricator(:direct_message_channel, from: :chat_channel) do
   transient :users, following: true, with_membership: true
   chatable do |attrs|
     Fabricate(:direct_message, users: attrs[:users] || [Fabricate(:user), Fabricate(:user)])
@@ -49,22 +49,41 @@ Fabricator(:direct_message_channel, from: :chat_channel, class_name: :direct_mes
   end
 end
 
-Fabricator(:chat_message) do
-  chat_channel
-  user
-  message "Beep boop"
-  cooked { |attrs| ChatMessage.cook(attrs[:message]) }
-  cooked_version ChatMessage::BAKED_VERSION
-  in_reply_to nil
+Fabricator(:chat_message, class_name: "Chat::MessageCreator") do
+  transient :chat_channel
+  transient :user
+  transient :message
+  transient :in_reply_to
+  transient :thread
+  transient :upload_ids
+
+  initialize_with do |transients|
+    user = transients[:user] || Fabricate(:user)
+    channel =
+      transients[:chat_channel] || transients[:thread]&.channel ||
+        transients[:in_reply_to]&.chat_channel || Fabricate(:chat_channel)
+
+    resolved_class.create(
+      chat_channel: channel,
+      user: user,
+      content: transients[:message] || Faker::Lorem.paragraph_by_chars(number: 500),
+      thread_id: transients[:thread]&.id,
+      in_reply_to_id: transients[:in_reply_to]&.id,
+      upload_ids: transients[:upload_ids],
+    ).chat_message
+  end
 end
 
-Fabricator(:chat_mention) do
-  chat_message { Fabricate(:chat_message) }
+Fabricator(:chat_mention, class_name: "Chat::Mention") do
+  transient read: false
+  transient high_priority: true
+  transient identifier: :direct_mentions
+
   user { Fabricate(:user) }
-  notification { Fabricate(:notification) }
+  chat_message { Fabricate(:chat_message) }
 end
 
-Fabricator(:chat_message_reaction) do
+Fabricator(:chat_message_reaction, class_name: "Chat::MessageReaction") do
   chat_message { Fabricate(:chat_message) }
   user { Fabricate(:user) }
   emoji { %w[+1 tada heart joffrey_facepalm].sample }
@@ -73,47 +92,39 @@ Fabricator(:chat_message_reaction) do
   end
 end
 
-Fabricator(:chat_upload) do
-  transient :user
-
-  user { Fabricate(:user) }
-
-  chat_message { |attrs| Fabricate(:chat_message, user: attrs[:user]) }
-  upload { |attrs| Fabricate(:upload, user: attrs[:user]) }
-end
-
-Fabricator(:chat_message_revision) do
+Fabricator(:chat_message_revision, class_name: "Chat::MessageRevision") do
   chat_message { Fabricate(:chat_message) }
   old_message { "something old" }
   new_message { "something new" }
   user { |attrs| attrs[:chat_message].user }
 end
 
-Fabricator(:reviewable_chat_message) do
+Fabricator(:chat_reviewable_message, class_name: "Chat::ReviewableMessage") do
   reviewable_by_moderator true
   type "ReviewableChatMessage"
   created_by { Fabricate(:user) }
-  target_type "ChatMessage"
   target { Fabricate(:chat_message) }
   reviewable_scores { |p| [Fabricate.build(:reviewable_score, reviewable_id: p[:id])] }
 end
 
-Fabricator(:direct_message) { users { [Fabricate(:user), Fabricate(:user)] } }
+Fabricator(:direct_message, class_name: "Chat::DirectMessage") do
+  users { [Fabricate(:user), Fabricate(:user)] }
+end
 
-Fabricator(:chat_webhook_event) do
+Fabricator(:chat_webhook_event, class_name: "Chat::WebhookEvent") do
   chat_message { Fabricate(:chat_message) }
   incoming_chat_webhook do |attrs|
     Fabricate(:incoming_chat_webhook, chat_channel: attrs[:chat_message].chat_channel)
   end
 end
 
-Fabricator(:incoming_chat_webhook) do
+Fabricator(:incoming_chat_webhook, class_name: "Chat::IncomingWebhook") do
   name { sequence(:name) { |i| "#{i + 1}" } }
   key { sequence(:key) { |i| "#{i + 1}" } }
   chat_channel { Fabricate(:chat_channel, chatable: Fabricate(:category)) }
 end
 
-Fabricator(:user_chat_channel_membership) do
+Fabricator(:user_chat_channel_membership, class_name: "Chat::UserChatChannelMembership") do
   user
   chat_channel
   following true
@@ -127,7 +138,7 @@ Fabricator(:user_chat_channel_membership_for_dm, from: :user_chat_channel_member
   mobile_notification_level 2
 end
 
-Fabricator(:chat_draft) do
+Fabricator(:chat_draft, class_name: "Chat::Draft") do
   user
   chat_channel
 
@@ -139,3 +150,48 @@ Fabricator(:chat_draft) do
     { value: attrs[:value], replyToMsg: attrs[:reply_to_msg], uploads: attrs[:uploads] }.to_json
   end
 end
+
+Fabricator(:chat_thread, class_name: "Chat::Thread") do
+  before_create do |thread, transients|
+    thread.original_message_user = original_message.user
+    thread.channel = original_message.chat_channel
+  end
+
+  transient :with_replies
+  transient :channel
+  transient :original_message_user
+  transient :old_om
+
+  original_message do |attrs|
+    Fabricate(
+      :chat_message,
+      chat_channel: attrs[:channel] || Fabricate(:chat_channel),
+      user: attrs[:original_message_user] || Fabricate(:user),
+    )
+  end
+
+  after_create do |thread, transients|
+    attrs = { thread_id: thread.id }
+
+    # Sometimes we  make this older via created_at so any messages fabricated for this thread
+    # afterwards are not created earlier in time than the OM.
+    attrs[:created_at] = 1.week.ago if transients[:old_om]
+
+    thread.original_message.update!(**attrs)
+    thread.add(thread.original_message_user)
+
+    if transients[:with_replies]
+      Fabricate.times(transients[:with_replies], :chat_message, thread: thread)
+    end
+  end
+end
+
+Fabricator(:user_chat_thread_membership, class_name: "Chat::UserChatThreadMembership") do
+  user
+  after_create do |membership|
+    Chat::UserChatChannelMembership.find_or_create_by!(
+      user: membership.user,
+      chat_channel: membership.thread.channel,
+    ).update!(following: true)
+  end
+end
diff --git a/plugins/chat/spec/integration/auto_channel_user_removal_spec.rb b/plugins/chat/spec/integration/auto_channel_user_removal_spec.rb
new file mode 100644
index 00000000000..3265bacd172
--- /dev/null
+++ b/plugins/chat/spec/integration/auto_channel_user_removal_spec.rb
@@ -0,0 +1,285 @@
+# frozen_string_literal: true
+
+describe "Automatic user removal from channels" do
+  fab!(:user_1) { Fabricate(:user, trust_level: TrustLevel[1]) }
+  let(:user_1_guardian) { Guardian.new(user_1) }
+  fab!(:user_2) { Fabricate(:user, trust_level: TrustLevel[1]) }
+
+  fab!(:secret_group) { Fabricate(:group) }
+  fab!(:private_category) { Fabricate(:private_category, group: secret_group) }
+
+  fab!(:public_channel) { Fabricate(:chat_channel) }
+  fab!(:private_channel) { Fabricate(:chat_channel, chatable: private_category) }
+  fab!(:dm_channel) { Fabricate(:direct_message_channel, users: [user_1, user_2]) }
+
+  before do
+    SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:trust_level_1]
+    SiteSetting.chat_enabled = true
+    Group.refresh_automatic_groups!
+    Jobs.run_immediately!
+
+    secret_group.add(user_1)
+    public_channel.add(user_1)
+    private_channel.add(user_1)
+    public_channel.add(user_2)
+
+    CategoryGroup.create(category: public_channel.chatable, group_id: Group::AUTO_GROUPS[:everyone])
+  end
+
+  context "when the chat_allowed_groups site setting changes" do
+    it "removes the user who is no longer in chat_allowed_groups" do
+      expect { SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:trust_level_3] }.to change {
+        Chat::UserChatChannelMembership.count
+      }.by(-3)
+
+      expect(
+        Chat::UserChatChannelMembership.exists?(user: user_1, chat_channel: public_channel),
+      ).to eq(false)
+      expect(Chat::ChannelFetcher.all_secured_channel_ids(user_1_guardian)).not_to include(
+        public_channel.id,
+      )
+
+      expect(
+        Chat::UserChatChannelMembership.exists?(user: user_1, chat_channel: private_channel),
+      ).to eq(false)
+      expect(Chat::ChannelFetcher.all_secured_channel_ids(user_1_guardian)).not_to include(
+        private_channel.id,
+      )
+    end
+
+    it "does not remove the user who is in one of the chat_allowed_groups" do
+      user_2.change_trust_level!(TrustLevel[4])
+      expect { SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:trust_level_3] }.to change {
+        Chat::UserChatChannelMembership.count
+      }.by(-2)
+      expect(
+        Chat::UserChatChannelMembership.exists?(user: user_2, chat_channel: public_channel),
+      ).to eq(true)
+    end
+
+    it "does not remove users from their DM channels" do
+      expect { SiteSetting.chat_allowed_groups = "" }.to change {
+        Chat::UserChatChannelMembership.count
+      }.by(-3)
+
+      expect(Chat::UserChatChannelMembership.exists?(user: user_1, chat_channel: dm_channel)).to eq(
+        true,
+      )
+      expect(Chat::UserChatChannelMembership.exists?(user: user_2, chat_channel: dm_channel)).to eq(
+        true,
+      )
+    end
+
+    context "for staff users" do
+      fab!(:staff_user) { Fabricate(:admin) }
+
+      it "does not remove them from public channels" do
+        public_channel.add(staff_user)
+        private_channel.add(staff_user)
+        SiteSetting.chat_allowed_groups = ""
+        expect(
+          Chat::UserChatChannelMembership.where(
+            user: staff_user,
+            chat_channel: [public_channel, private_channel],
+          ).count,
+        ).to eq(2)
+      end
+
+      it "does not remove them from DM channels" do
+        staff_dm_channel = Fabricate(:direct_message_channel, users: [user_1, staff_user])
+        expect(
+          Chat::UserChatChannelMembership.where(
+            user: staff_user,
+            chat_channel: [staff_dm_channel],
+          ).count,
+        ).to eq(1)
+      end
+    end
+  end
+
+  context "when a user is removed from a group" do
+    context "when the user is no longer in any chat_allowed_groups" do
+      fab!(:group) { Fabricate(:group) }
+
+      before do
+        group.add(user_1)
+        SiteSetting.chat_allowed_groups = group.id
+      end
+
+      it "removes the user from the category channels" do
+        group.remove(user_1)
+        expect(
+          Chat::UserChatChannelMembership.where(
+            user: user_1,
+            chat_channel: [public_channel, private_channel],
+          ).count,
+        ).to eq(0)
+      end
+
+      it "does not remove the user from DM channels" do
+        group.remove(user_1)
+        expect(
+          Chat::UserChatChannelMembership.where(user: user_1, chat_channel: dm_channel).count,
+        ).to eq(1)
+      end
+
+      context "for staff users" do
+        fab!(:staff_user) { Fabricate(:admin) }
+
+        it "does not remove them from public channels" do
+          public_channel.add(staff_user)
+          private_channel.add(staff_user)
+          group.add(staff_user)
+          group.remove(staff_user)
+
+          expect(
+            Chat::UserChatChannelMembership.where(
+              user: staff_user,
+              chat_channel: [public_channel, private_channel],
+            ).count,
+          ).to eq(2)
+        end
+      end
+    end
+
+    context "when a user is removed from a private category group" do
+      context "when the user is in another group that can interact with the channel" do
+        fab!(:stealth_group) { Fabricate(:group) }
+        before do
+          CategoryGroup.create!(
+            category: private_category,
+            group: stealth_group,
+            permission_type: CategoryGroup.permission_types[:full],
+          )
+          stealth_group.add(user_1)
+        end
+
+        it "does not remove them from the corresponding channel" do
+          secret_group.remove(user_1)
+          expect(
+            Chat::UserChatChannelMembership.exists?(user: user_1, chat_channel: private_channel),
+          ).to eq(true)
+          expect(Chat::ChannelFetcher.all_secured_channel_ids(user_1_guardian)).to include(
+            private_channel.id,
+          )
+        end
+      end
+
+      context "when the user is in no other groups that can interact with the channel" do
+        it "removes them from the corresponding channel" do
+          secret_group.remove(user_1)
+          expect(
+            Chat::UserChatChannelMembership.exists?(user: user_1, chat_channel: private_channel),
+          ).to eq(false)
+          expect(Chat::ChannelFetcher.all_secured_channel_ids(user_1_guardian)).not_to include(
+            private_channel.id,
+          )
+        end
+      end
+    end
+  end
+
+  context "when a category is updated" do
+    context "when the group's permission changes from reply+see to just see for the category" do
+      it "removes the user from the corresponding category channel" do
+        private_category.update!(permissions: { secret_group.id => :readonly })
+        expect(
+          Chat::UserChatChannelMembership.exists?(user: user_1, chat_channel: private_channel),
+        ).to eq(false)
+        expect(Chat::ChannelFetcher.all_secured_channel_ids(user_1_guardian)).not_to include(
+          private_channel.id,
+        )
+      end
+
+      context "for staff users" do
+        fab!(:staff_user) { Fabricate(:admin) }
+
+        it "does not remove them from the channel" do
+          secret_group.add(staff_user)
+          private_channel.add(staff_user)
+          private_category.update!(permissions: { secret_group.id => :readonly })
+          expect(
+            Chat::UserChatChannelMembership.exists?(
+              user: staff_user,
+              chat_channel: private_channel,
+            ),
+          ).to eq(true)
+        end
+      end
+    end
+
+    context "when the secret_group is no longer allowed to access the private category" do
+      it "removes the user from the corresponding category channel" do
+        private_category.update!(permissions: { Group::AUTO_GROUPS[:staff] => :full })
+        expect(
+          Chat::UserChatChannelMembership.exists?(user: user_1, chat_channel: private_channel),
+        ).to eq(false)
+        expect(Chat::ChannelFetcher.all_secured_channel_ids(user_1_guardian)).not_to include(
+          private_channel.id,
+        )
+      end
+
+      context "for staff users" do
+        fab!(:staff_user) { Fabricate(:admin) }
+
+        it "does not remove them from the channel" do
+          secret_group.add(staff_user)
+          private_channel.add(staff_user)
+          private_category.update!(permissions: {})
+          expect(
+            Chat::UserChatChannelMembership.exists?(
+              user: staff_user,
+              chat_channel: private_channel,
+            ),
+          ).to eq(true)
+        end
+      end
+    end
+  end
+
+  context "when a group is destroyed" do
+    context "when it was the last group on the private category" do
+      it "no users are removed because the category defaults to Everyone having full access" do
+        secret_group.destroy!
+
+        expect(
+          Chat::UserChatChannelMembership.exists?(user: user_1, chat_channel: private_channel),
+        ).to eq(true)
+        expect(Chat::ChannelFetcher.all_secured_channel_ids(user_1_guardian)).to include(
+          private_channel.id,
+        )
+
+        expect(
+          Chat::UserChatChannelMembership.exists?(user: user_1, chat_channel: public_channel),
+        ).to eq(true)
+        expect(Chat::ChannelFetcher.all_secured_channel_ids(user_1_guardian)).to include(
+          public_channel.id,
+        )
+      end
+    end
+
+    context "when there is another group on the private category" do
+      before do
+        CategoryGroup.create(group_id: Group::AUTO_GROUPS[:staff], category: private_category)
+      end
+
+      it "only removes users who are not in that group" do
+        secret_group.destroy!
+
+        expect(
+          Chat::UserChatChannelMembership.exists?(user: user_1, chat_channel: private_channel),
+        ).to eq(false)
+        expect(Chat::ChannelFetcher.all_secured_channel_ids(user_1_guardian)).not_to include(
+          private_channel.id,
+        )
+
+        expect(
+          Chat::UserChatChannelMembership.exists?(user: user_1, chat_channel: public_channel),
+        ).to eq(true)
+        expect(Chat::ChannelFetcher.all_secured_channel_ids(user_1_guardian)).to include(
+          public_channel.id,
+        )
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/integration/custom_api_key_scopes_spec.rb b/plugins/chat/spec/integration/custom_api_key_scopes_spec.rb
index 6fa39be8848..b981161ebc2 100644
--- a/plugins/chat/spec/integration/custom_api_key_scopes_spec.rb
+++ b/plugins/chat/spec/integration/custom_api_key_scopes_spec.rb
@@ -44,7 +44,7 @@ describe "API keys scoped to chat#create_message" do
   end
 
   it "can create chat messages" do
-    UserChatChannelMembership.create(user: admin, chat_channel: chat_channel, following: true)
+    Chat::UserChatChannelMembership.create(user: admin, chat_channel: chat_channel, following: true)
     expect {
       post "/chat/#{chat_channel.id}.json",
            headers: {
@@ -54,12 +54,12 @@ describe "API keys scoped to chat#create_message" do
            params: {
              message: "asdfasdf asdfasdf",
            }
-    }.to change { ChatMessage.where(chat_channel: chat_channel).count }.by(1)
+    }.to change { Chat::Message.where(chat_channel: chat_channel).count }.by(1)
     expect(response.status).to eq(200)
   end
 
   it "cannot post in a channel it is not scoped for" do
-    UserChatChannelMembership.create(user: admin, chat_channel: chat_channel, following: true)
+    Chat::UserChatChannelMembership.create(user: admin, chat_channel: chat_channel, following: true)
     expect {
       post "/chat/#{chat_channel.id}.json",
            headers: {
@@ -69,12 +69,16 @@ describe "API keys scoped to chat#create_message" do
            params: {
              message: "asdfasdf asdfasdf",
            }
-    }.not_to change { ChatMessage.where(chat_channel: chat_channel).count }
+    }.not_to change { Chat::Message.where(chat_channel: chat_channel).count }
     expect(response.status).to eq(403)
   end
 
   it "can only post in scoped channels" do
-    UserChatChannelMembership.create(user: admin, chat_channel: chat_channel_2, following: true)
+    Chat::UserChatChannelMembership.create(
+      user: admin,
+      chat_channel: chat_channel_2,
+      following: true,
+    )
     expect {
       post "/chat/#{chat_channel_2.id}.json",
            headers: {
@@ -84,7 +88,7 @@ describe "API keys scoped to chat#create_message" do
            params: {
              message: "asdfasdf asdfasdf",
            }
-    }.to change { ChatMessage.where(chat_channel: chat_channel_2).count }.by(1)
+    }.to change { Chat::Message.where(chat_channel: chat_channel_2).count }.by(1)
     expect(response.status).to eq(200)
   end
 end
diff --git a/plugins/chat/spec/integration/post_chat_quote_spec.rb b/plugins/chat/spec/integration/post_chat_quote_spec.rb
index a49ae55665f..83e4b83ed4d 100644
--- a/plugins/chat/spec/integration/post_chat_quote_spec.rb
+++ b/plugins/chat/spec/integration/post_chat_quote_spec.rb
@@ -16,12 +16,10 @@ describe "chat bbcode quoting in posts" do
       <div class="chat-transcript-username">
       martin</div>
       <div class="chat-transcript-datetime">
-      <span title="2022-01-25T05:40:39Z"></span>
-      </div>
+      <span title="2022-01-25T05:40:39Z"></span></div>
       </div>
       <div class="chat-transcript-messages">
-      <p>This is a chat message.</p>
-      </div>
+      <p>This is a chat message.</p></div>
       </div>
     COOKED
   end
@@ -34,19 +32,16 @@ describe "chat bbcode quoting in posts" do
     expect(post.cooked.chomp).to eq(<<~COOKED.chomp)
       <div class="chat-transcript" data-message-id="2321" data-username="martin" data-datetime="2022-01-25T05:40:39Z" data-channel-name="Cool Cats Club" data-channel-id="1234">
       <div class="chat-transcript-meta">
-      Originally sent in <a href="/chat/channel/1234/-">Cool Cats Club</a>
-      </div>
+      Originally sent in <a href="/chat/c/-/1234">Cool Cats Club</a></div>
       <div class="chat-transcript-user">
       <div class="chat-transcript-user-avatar"></div>
       <div class="chat-transcript-username">
       martin</div>
       <div class="chat-transcript-datetime">
-      <a href="/chat/channel/1234/-?messageId=2321" title="2022-01-25T05:40:39Z"></a>
-      </div>
+      <a href="/chat/c/-/1234/2321" title="2022-01-25T05:40:39Z"></a></div>
       </div>
       <div class="chat-transcript-messages">
-      <p>This is a chat message.</p>
-      </div>
+      <p>This is a chat message.</p></div>
       </div>
     COOKED
   end
@@ -63,14 +58,11 @@ describe "chat bbcode quoting in posts" do
       <div class="chat-transcript-username">
       martin</div>
       <div class="chat-transcript-datetime">
-      <a href="/chat/channel/1234/-?messageId=2321" title="2022-01-25T05:40:39Z"></a>
-      </div>
-      <a class="chat-transcript-channel" href="/chat/channel/1234/-">
-      #Cool Cats Club</a>
-      </div>
+      <a href="/chat/c/-/1234/2321" title="2022-01-25T05:40:39Z"></a></div>
+      <a class="chat-transcript-channel" href="/chat/c/-/1234">
+      #Cool Cats Club</a></div>
       <div class="chat-transcript-messages">
-      <p>This is a chat message.</p>
-      </div>
+      <p>This is a chat message.</p></div>
       </div>
     COOKED
   end
@@ -87,14 +79,11 @@ describe "chat bbcode quoting in posts" do
       <div class="chat-transcript-username">
       martin</div>
       <div class="chat-transcript-datetime">
-      <a href="/chat/channel/1234/-?messageId=2321" title="2022-01-25T05:40:39Z"></a>
-      </div>
-      <a class="chat-transcript-channel" href="/chat/channel/1234/-">
-      #Cool Cats Club</a>
-      </div>
+      <a href="/chat/c/-/1234/2321" title="2022-01-25T05:40:39Z"></a></div>
+      <a class="chat-transcript-channel" href="/chat/c/-/1234">
+      #Cool Cats Club</a></div>
       <div class="chat-transcript-messages">
-      <p>This is a chat message.</p>
-      </div>
+      <p>This is a chat message.</p></div>
       </div>
     COOKED
   end
@@ -107,19 +96,16 @@ describe "chat bbcode quoting in posts" do
     expect(post.cooked.chomp).to eq(<<~COOKED.chomp)
       <div class="chat-transcript" data-message-id="2321" data-username="martin" data-datetime="2022-01-25T05:40:39Z" data-channel-name="Cool Cats Club" data-channel-id="1234">
       <div class="chat-transcript-meta">
-      Originally sent in <a href="/chat/channel/1234/-">Cool Cats Club</a>
-      </div>
+      Originally sent in <a href="/chat/c/-/1234">Cool Cats Club</a></div>
       <div class="chat-transcript-user">
       <div class="chat-transcript-user-avatar"></div>
       <div class="chat-transcript-username">
       martin</div>
       <div class="chat-transcript-datetime">
-      <span title="2022-01-25T05:40:39Z"></span>
-      </div>
+      <span title="2022-01-25T05:40:39Z"></span></div>
       </div>
       <div class="chat-transcript-messages">
-      <p>This is a chat message.</p>
-      </div>
+      <p>This is a chat message.</p></div>
       </div>
     COOKED
   end
@@ -137,14 +123,11 @@ describe "chat bbcode quoting in posts" do
       <div class="chat-transcript-username">
       martin</div>
       <div class="chat-transcript-datetime">
-      <a href="/chat/channel/1234/-?messageId=2321" title="2022-01-25T05:40:39Z"></a>
-      </div>
-      <a class="chat-transcript-channel" href="/chat/channel/1234/-">
-      #Cool Cats Club</a>
-      </div>
+      <a href="/chat/c/-/1234/2321" title="2022-01-25T05:40:39Z"></a></div>
+      <a class="chat-transcript-channel" href="/chat/c/-/1234">
+      #Cool Cats Club</a></div>
       <div class="chat-transcript-messages">
-      <p>This is a chat message.</p>
-      <div class="chat-transcript-reactions">
+      <p>This is a chat message.</p><div class="chat-transcript-reactions">
       <div class="chat-transcript-reaction">
       <img width="20" height="20" src="/images/emoji/twitter/+1.png?v=12" title="+1" loading="lazy" alt="+1" class="emoji"> 1</div>
       <div class="chat-transcript-reaction">
@@ -198,12 +181,10 @@ This is an inline onebox https://en.wikipedia.org/wiki/Hyperlink.
 <div class="chat-transcript-username">
 martin</div>
 <div class="chat-transcript-datetime">
-<span title="2022-01-25T05:40:39Z"></span>
-</div>
+<span title="2022-01-25T05:40:39Z"></span></div>
 </div>
 <div class="chat-transcript-messages">
-<p>This is a chat message.</p>
-</div>
+<p>This is a chat message.</p></div>
 </div>
 #{full_onebox_html}
 <p>This is an inline onebox <a href="https://en.wikipedia.org/wiki/Hyperlink" class="inline-onebox-loading" rel="noopener nofollow ugc">https://en.wikipedia.org/wiki/Hyperlink</a>.</p>
@@ -220,14 +201,14 @@ martin</div>
     message1 = Fabricate(:chat_message, chat_channel: channel, user: post.user)
     message2 = Fabricate(:chat_message, chat_channel: channel, user: post.user)
     md =
-      ChatTranscriptService.new(
+      Chat::TranscriptService.new(
         channel,
         message2.user,
         messages_or_ids: [message2.id],
       ).generate_markdown
     message1.update!(message: md)
     md_for_post =
-      ChatTranscriptService.new(
+      Chat::TranscriptService.new(
         channel,
         message1.user,
         messages_or_ids: [message1.id],
@@ -237,35 +218,27 @@ martin</div>
 <div class="chat-transcript" data-message-id="#{message1.id}" data-username="#{message1.user.username}" data-datetime="#{message1.created_at.iso8601}" data-channel-name="#{channel.name}" data-channel-id="#{channel.id}">
 <div class="chat-transcript-user">
 <div class="chat-transcript-user-avatar">
-<img loading="lazy" alt="" width="20" height="20" src="//test.localhost#{post.user.avatar_template.gsub("{size}", "40")}" class="avatar">
-</div>
+<img loading="lazy" alt="" width="24" height="24" src="//test.localhost#{post.user.avatar_template.gsub("{size}", "48")}" class="avatar"></div>
 <div class="chat-transcript-username">
 #{message1.user.username}</div>
 <div class="chat-transcript-datetime">
-<a href="/chat/channel/#{channel.id}/-?messageId=#{message1.id}" title="#{message1.created_at.iso8601}"></a>
-</div>
-<a class="chat-transcript-channel" href="/chat/channel/#{channel.id}/-">
-##{channel.name}</a>
-</div>
+<a href="/chat/c/-/#{channel.id}/#{message1.id}" title="#{message1.created_at.iso8601}"></a></div>
+<a class="chat-transcript-channel" href="/chat/c/-/#{channel.id}">
+##{channel.name}</a></div>
 <div class="chat-transcript-messages">
 <div class="chat-transcript" data-message-id="#{message2.id}" data-username="#{message2.user.username}" data-datetime="#{message2.created_at.iso8601}" data-channel-name="#{channel.name}" data-channel-id="#{channel.id}">
 <div class="chat-transcript-user">
 <div class="chat-transcript-user-avatar">
-<img loading="lazy" alt="" width="20" height="20" src="//test.localhost#{post.user.avatar_template.gsub("{size}", "40")}" class="avatar">
-</div>
+<img loading="lazy" alt="" width="24" height="24" src="//test.localhost#{post.user.avatar_template.gsub("{size}", "48")}" class="avatar"></div>
 <div class="chat-transcript-username">
 #{message2.user.username}</div>
 <div class="chat-transcript-datetime">
-<a href="/chat/channel/#{channel.id}/-?messageId=#{message2.id}" title="#{message1.created_at.iso8601}"></a>
-</div>
-<a class="chat-transcript-channel" href="/chat/channel/#{channel.id}/-">
-##{channel.name}</a>
-</div>
+<a href="/chat/c/-/#{channel.id}/#{message2.id}" title="#{message1.created_at.iso8601}"></a></div>
+<a class="chat-transcript-channel" href="/chat/c/-/#{channel.id}">
+##{channel.name}</a></div>
 <div class="chat-transcript-messages">
-<p>#{message2.message}</p>
-</div>
-</div>
-</div>
+<p>#{message2.message}</p></div>
+</div></div>
 </div>
     COOKED
   end
diff --git a/plugins/chat/spec/integration/thread_replies_count_cache_accuracy_spec.rb b/plugins/chat/spec/integration/thread_replies_count_cache_accuracy_spec.rb
new file mode 100644
index 00000000000..01df30c356b
--- /dev/null
+++ b/plugins/chat/spec/integration/thread_replies_count_cache_accuracy_spec.rb
@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+RSpec.describe "Chat::Thread replies_count cache accuracy" do
+  include ActiveSupport::Testing::TimeHelpers
+
+  fab!(:user) { Fabricate(:user) }
+  fab!(:thread) { Fabricate(:chat_thread) }
+
+  before { SiteSetting.chat_enabled = true }
+
+  it "keeps an accurate replies_count cache" do
+    freeze_time
+    Jobs.run_immediately!
+
+    expect(thread.replies_count).to eq(0)
+    expect(thread.replies_count_cache).to eq(0)
+
+    # Create 5 replies
+    5.times do |i|
+      Chat::MessageCreator.create(
+        chat_channel: thread.channel,
+        user: user,
+        thread_id: thread.id,
+        content: "Hello world #{i}",
+      )
+    end
+
+    # The job only runs to completion if the cache has not been recently
+    # updated, so the DB count will only be 1.
+    expect(thread.replies_count_cache).to eq(5)
+    expect(thread.reload.replies_count).to eq(1)
+
+    # Travel to the future so the cache expires.
+    travel_to 6.minutes.from_now
+    Chat::MessageCreator.create(
+      chat_channel: thread.channel,
+      user: user,
+      thread_id: thread.id,
+      content: "Hello world now that time has passed",
+    )
+    expect(thread.replies_count_cache).to eq(6)
+    expect(thread.reload.replies_count).to eq(6)
+
+    # Lose the cache intentionally.
+    Chat::Thread.clear_caches!(thread.id)
+    message_to_destroy = thread.last_message
+    Chat::TrashMessage.call(
+      message_id: message_to_destroy.id,
+      channel_id: thread.channel_id,
+      guardian: Guardian.new(user),
+    )
+    expect(thread.replies_count_cache).to eq(5)
+    expect(thread.reload.replies_count).to eq(5)
+
+    # Lose the cache intentionally.
+    Chat::Thread.clear_caches!(thread.id)
+    Chat::RestoreMessage.call(
+      message_id: message_to_destroy.id,
+      channel_id: thread.channel_id,
+      guardian: Guardian.new(user),
+    )
+    expect(thread.replies_count_cache).to eq(6)
+    expect(thread.reload.replies_count).to eq(6)
+  end
+end
diff --git a/plugins/chat/spec/jobs/chat_channel_delete_spec.rb b/plugins/chat/spec/jobs/chat_channel_delete_spec.rb
deleted file mode 100644
index 033274f04c0..00000000000
--- a/plugins/chat/spec/jobs/chat_channel_delete_spec.rb
+++ /dev/null
@@ -1,78 +0,0 @@
-# frozen_string_literal: true
-
-describe Jobs::ChatChannelDelete do
-  fab!(:chat_channel) { Fabricate(:chat_channel) }
-  fab!(:user1) { Fabricate(:user) }
-  fab!(:user2) { Fabricate(:user) }
-  fab!(:user3) { Fabricate(:user) }
-  let(:users) { [user1, user2, user3] }
-
-  before do
-    messages = []
-    20.times do
-      messages << Fabricate(:chat_message, chat_channel: chat_channel, user: users.sample)
-    end
-    @message_ids = messages.map(&:id)
-
-    10.times { ChatMessageReaction.create(chat_message: messages.sample, user: users.sample) }
-
-    10.times do
-      ChatUpload.create(
-        upload: Fabricate(:upload, user: users.sample),
-        chat_message: messages.sample,
-      )
-    end
-
-    ChatMention.create(
-      user: user2,
-      chat_message: messages.sample,
-      notification: Fabricate(:notification),
-    )
-
-    @incoming_chat_webhook_id = Fabricate(:incoming_chat_webhook, chat_channel: chat_channel)
-    ChatWebhookEvent.create(
-      incoming_chat_webhook: @incoming_chat_webhook_id,
-      chat_message: messages.sample,
-    )
-
-    revision_message = messages.sample
-    Fabricate(
-      :chat_message_revision,
-      chat_message: revision_message,
-      old_message: "some old message",
-      new_message: revision_message.message,
-    )
-
-    ChatDraft.create(chat_channel: chat_channel, user: users.sample, data: "wow some draft")
-
-    Fabricate(:user_chat_channel_membership, chat_channel: chat_channel, user: user1)
-    Fabricate(:user_chat_channel_membership, chat_channel: chat_channel, user: user2)
-    Fabricate(:user_chat_channel_membership, chat_channel: chat_channel, user: user3)
-
-    chat_channel.trash!
-  end
-
-  it "deletes all of the messages and related records completely" do
-    expect { described_class.new.execute(chat_channel_id: chat_channel.id) }.to change {
-      IncomingChatWebhook.where(chat_channel_id: chat_channel.id).count
-    }.by(-1).and change {
-            ChatWebhookEvent.where(incoming_chat_webhook_id: @incoming_chat_webhook_id).count
-          }.by(-1).and change { ChatDraft.where(chat_channel: chat_channel).count }.by(
-                  -1,
-                ).and change {
-                        UserChatChannelMembership.where(chat_channel: chat_channel).count
-                      }.by(-3).and change {
-                              ChatMessageRevision.where(chat_message_id: @message_ids).count
-                            }.by(-1).and change {
-                                    ChatMention.where(chat_message_id: @message_ids).count
-                                  }.by(-1).and change {
-                                          ChatUpload.where(chat_message_id: @message_ids).count
-                                        }.by(-10).and change {
-                                                ChatMessage.where(id: @message_ids).count
-                                              }.by(-20).and change {
-                                                      ChatMessageReaction.where(
-                                                        chat_message_id: @message_ids,
-                                                      ).count
-                                                    }.by(-10)
-  end
-end
diff --git a/plugins/chat/spec/jobs/regular/auto_join_channel_batch_spec.rb b/plugins/chat/spec/jobs/regular/auto_join_channel_batch_spec.rb
deleted file mode 100644
index e97776b10fe..00000000000
--- a/plugins/chat/spec/jobs/regular/auto_join_channel_batch_spec.rb
+++ /dev/null
@@ -1,190 +0,0 @@
-# frozen_string_literal: true
-
-require "rails_helper"
-
-describe Jobs::AutoJoinChannelBatch do
-  describe "#execute" do
-    fab!(:category) { Fabricate(:category) }
-    let!(:user) { Fabricate(:user, last_seen_at: 15.minutes.ago) }
-    let(:channel) { Fabricate(:chat_channel, auto_join_users: true, chatable: category) }
-
-    it "joins all valid users in the batch" do
-      subject.execute(chat_channel_id: channel.id, starts_at: user.id, ends_at: user.id)
-
-      assert_users_follows_channel(channel, [user])
-    end
-
-    it "doesn't join users outside the batch" do
-      another_user = Fabricate(:user, last_seen_at: 15.minutes.ago)
-
-      subject.execute(chat_channel_id: channel.id, starts_at: user.id, ends_at: user.id)
-
-      assert_users_follows_channel(channel, [user])
-      assert_user_skipped(channel, another_user)
-    end
-
-    it "doesn't join suspended users" do
-      user.update!(suspended_till: 1.year.from_now)
-
-      subject.execute(chat_channel_id: channel.id, starts_at: user.id, ends_at: user.id)
-
-      assert_user_skipped(channel, user)
-    end
-
-    it "doesn't join users last_seen more than 3 months ago" do
-      user.update!(last_seen_at: 4.months.ago)
-
-      subject.execute(chat_channel_id: channel.id, starts_at: user.id, ends_at: user.id)
-
-      assert_user_skipped(channel, user)
-    end
-
-    it "joins users with last_seen set to null" do
-      user.update!(last_seen_at: nil)
-
-      subject.execute(chat_channel_id: channel.id, starts_at: user.id, ends_at: user.id)
-
-      assert_users_follows_channel(channel, [user])
-    end
-
-    it "does nothing if the channel is invalid" do
-      subject.execute(chat_channel_id: -1, starts_at: user.id, ends_at: user.id)
-
-      assert_user_skipped(channel, user)
-    end
-
-    it "does nothing if the channel chatable is not a category" do
-      direct_message = Fabricate(:direct_message)
-      channel.update!(chatable: direct_message)
-
-      subject.execute(chat_channel_id: channel.id, starts_at: user.id, ends_at: user.id)
-
-      assert_user_skipped(channel, user)
-    end
-
-    it "enqueues the user count update job and marks the channel user count as stale" do
-      subject.execute(chat_channel_id: channel.id, starts_at: user.id, ends_at: user.id)
-      expect_job_enqueued(job: :update_channel_user_count, args: { chat_channel_id: channel.id })
-
-      expect(channel.reload.user_count_stale).to eq(true)
-    end
-
-    it "does not enqueue the user count update job or mark the channel user count as stale when there is more than use user" do
-      user_2 = Fabricate(:user)
-      expect_not_enqueued_with(
-        job: :update_channel_user_count,
-        args: {
-          chat_channel_id: channel.id,
-        },
-      ) { subject.execute(chat_channel_id: channel.id, starts_at: user.id, ends_at: user_2.id) }
-
-      expect(channel.reload.user_count_stale).to eq(false)
-    end
-
-    it "ignores users without chat_enabled" do
-      user.user_option.update!(chat_enabled: false)
-
-      subject.execute(chat_channel_id: channel.id, starts_at: user.id, ends_at: user.id)
-
-      assert_user_skipped(channel, user)
-    end
-
-    it "sets the join reason to automatic" do
-      subject.execute(chat_channel_id: channel.id, starts_at: user.id, ends_at: user.id)
-
-      new_membership = UserChatChannelMembership.find_by(user: user, chat_channel: channel)
-      expect(new_membership.automatic?).to eq(true)
-    end
-
-    it "skips anonymous users" do
-      user_2 = Fabricate(:anonymous)
-
-      subject.execute(chat_channel_id: channel.id, starts_at: user.id, ends_at: user_2.id)
-
-      assert_users_follows_channel(channel, [user])
-      assert_user_skipped(channel, user_2)
-    end
-
-    it "skips non-active users" do
-      user_2 = Fabricate(:user, active: false, last_seen_at: 15.minutes.ago)
-
-      subject.execute(chat_channel_id: channel.id, starts_at: user.id, ends_at: user_2.id)
-
-      assert_users_follows_channel(channel, [user])
-      assert_user_skipped(channel, user_2)
-    end
-
-    it "skips staged users" do
-      user_2 = Fabricate(:user, staged: true, last_seen_at: 15.minutes.ago)
-
-      subject.execute(chat_channel_id: channel.id, starts_at: user.id, ends_at: user_2.id)
-
-      assert_users_follows_channel(channel, [user])
-      assert_user_skipped(channel, user_2)
-    end
-
-    it "adds every user in the batch" do
-      user_2 = Fabricate(:user, last_seen_at: 15.minutes.ago)
-
-      subject.execute(chat_channel_id: channel.id, starts_at: user.id, ends_at: user_2.id)
-
-      assert_users_follows_channel(channel, [user, user_2])
-    end
-
-    it "publishes a message only to joined users" do
-      messages =
-        MessageBus.track_publish("/chat/new-channel") do
-          subject.execute(chat_channel_id: channel.id, starts_at: user.id, ends_at: user.id)
-        end
-
-      expect(messages.size).to eq(1)
-      expect(messages.first.data.dig(:channel, :id)).to eq(channel.id)
-    end
-
-    describe "context when the channel's category is read restricted" do
-      fab!(:chatters_group) { Fabricate(:group) }
-      let(:private_category) { Fabricate(:private_category, group: chatters_group) }
-      let(:channel) { Fabricate(:chat_channel, auto_join_users: true, chatable: private_category) }
-
-      before { chatters_group.add(user) }
-
-      it "only joins group members with access to the category" do
-        another_user = Fabricate(:user, last_seen_at: 15.minutes.ago)
-
-        subject.execute(chat_channel_id: channel.id, starts_at: user.id, ends_at: another_user.id)
-
-        assert_users_follows_channel(channel, [user])
-        assert_user_skipped(channel, another_user)
-      end
-
-      it "works if the user has access through more than one group" do
-        second_chatters_group = Fabricate(:group)
-        Fabricate(:category_group, category: category, group: second_chatters_group)
-        second_chatters_group.add(user)
-
-        subject.execute(chat_channel_id: channel.id, starts_at: user.id, ends_at: user.id)
-
-        assert_users_follows_channel(channel, [user])
-      end
-
-      it "joins every user with access to the category" do
-        another_user = Fabricate(:user, last_seen_at: 15.minutes.ago)
-        chatters_group.add(another_user)
-
-        subject.execute(chat_channel_id: channel.id, starts_at: user.id, ends_at: another_user.id)
-
-        assert_users_follows_channel(channel, [user, another_user])
-      end
-    end
-  end
-
-  def assert_users_follows_channel(channel, users)
-    new_memberships = UserChatChannelMembership.where(user: users, chat_channel: channel)
-    expect(new_memberships.all?(&:following)).to eq(true)
-  end
-
-  def assert_user_skipped(channel, user)
-    new_membership = UserChatChannelMembership.find_by(user: user, chat_channel: channel)
-    expect(new_membership).to be_nil
-  end
-end
diff --git a/plugins/chat/spec/jobs/regular/chat/auto_join_channel_batch_spec.rb b/plugins/chat/spec/jobs/regular/chat/auto_join_channel_batch_spec.rb
new file mode 100644
index 00000000000..fa8d7534ef9
--- /dev/null
+++ b/plugins/chat/spec/jobs/regular/chat/auto_join_channel_batch_spec.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+describe Jobs::Chat::AutoJoinChannelBatch do
+  it "can successfully queue this job" do
+    expect {
+      Jobs.enqueue(
+        described_class,
+        channel_id: Fabricate(:chat_channel).id,
+        start_user_id: 0,
+        end_user_id: 10,
+      )
+    }.to change(Jobs::Chat::AutoJoinChannelBatch.jobs, :size).by(1)
+  end
+
+  context "when contract fails" do
+    before { Jobs.run_immediately! }
+
+    it "logs an error" do
+      Rails.logger.expects(:error).with(regexp_matches(/Channel can't be blank/)).at_least_once
+
+      Jobs.enqueue(described_class)
+    end
+  end
+
+  context "when model is not found" do
+    before { Jobs.run_immediately! }
+
+    it "logs an error" do
+      Rails.logger.expects(:error).with("Channel not found (id=-999)").at_least_once
+
+      Jobs.enqueue(described_class, channel_id: -999, start_user_id: 1, end_user_id: 2)
+    end
+  end
+end
diff --git a/plugins/chat/spec/jobs/regular/auto_manage_channel_memberships_spec.rb b/plugins/chat/spec/jobs/regular/chat/auto_join_channel_memberships_spec.rb
similarity index 87%
rename from plugins/chat/spec/jobs/regular/auto_manage_channel_memberships_spec.rb
rename to plugins/chat/spec/jobs/regular/chat/auto_join_channel_memberships_spec.rb
index 1ea5470c7f9..bfb6cacfd02 100644
--- a/plugins/chat/spec/jobs/regular/auto_manage_channel_memberships_spec.rb
+++ b/plugins/chat/spec/jobs/regular/chat/auto_join_channel_memberships_spec.rb
@@ -2,7 +2,7 @@
 
 require "rails_helper"
 
-describe Jobs::AutoManageChannelMemberships do
+describe Jobs::Chat::AutoJoinChannelMemberships do
   let(:user) { Fabricate(:user, last_seen_at: 15.minutes.ago) }
   let(:category) { Fabricate(:category, user: user) }
   let(:channel) { Fabricate(:category_channel, auto_join_users: true, chatable: category) }
@@ -13,7 +13,7 @@ describe Jobs::AutoManageChannelMemberships do
     end
 
     it "does nothing when the channel doesn't exist" do
-      assert_batches_enqueued(ChatChannel.new(id: -1), 0)
+      assert_batches_enqueued(Chat::Channel.new(id: -1), 0)
     end
 
     it "does nothing when the chatable is not a category" do
@@ -44,24 +44,24 @@ describe Jobs::AutoManageChannelMemberships do
     it "does nothing when we already reached the max_chat_auto_joined_users limit" do
       SiteSetting.max_chat_auto_joined_users = 1
       user_2 = Fabricate(:user, last_seen_at: 2.minutes.ago)
-      UserChatChannelMembership.create!(
+      Chat::UserChatChannelMembership.create!(
         user: user_2,
         chat_channel: channel,
         following: true,
-        join_mode: UserChatChannelMembership.join_modes[:automatic],
+        join_mode: Chat::UserChatChannelMembership.join_modes[:automatic],
       )
 
       assert_batches_enqueued(channel, 0)
     end
 
     it "ignores users that are already channel members" do
-      UserChatChannelMembership.create!(user: user, chat_channel: channel, following: true)
+      Chat::UserChatChannelMembership.create!(user: user, chat_channel: channel, following: true)
 
       assert_batches_enqueued(channel, 0)
     end
 
     it "doesn't queue a batch when the user doesn't follow the channel" do
-      UserChatChannelMembership.create!(user: user, chat_channel: channel, following: false)
+      Chat::UserChatChannelMembership.create!(user: user, chat_channel: channel, following: false)
 
       assert_batches_enqueued(channel, 0)
     end
@@ -120,7 +120,7 @@ describe Jobs::AutoManageChannelMemberships do
 
   def assert_batches_enqueued(channel, expected)
     expect { subject.execute(chat_channel_id: channel.id) }.to change(
-      Jobs::AutoJoinChannelBatch.jobs,
+      Jobs::Chat::AutoJoinChannelBatch.jobs,
       :size,
     ).by(expected)
   end
diff --git a/plugins/chat/spec/jobs/chat_channel_archive_spec.rb b/plugins/chat/spec/jobs/regular/chat/channel_archive_spec.rb
similarity index 88%
rename from plugins/chat/spec/jobs/chat_channel_archive_spec.rb
rename to plugins/chat/spec/jobs/regular/chat/channel_archive_spec.rb
index a60c8de55d2..02b43d1749a 100644
--- a/plugins/chat/spec/jobs/chat_channel_archive_spec.rb
+++ b/plugins/chat/spec/jobs/regular/chat/channel_archive_spec.rb
@@ -2,12 +2,12 @@
 
 require "rails_helper"
 
-describe Jobs::ChatChannelArchive do
+describe Jobs::Chat::ChannelArchive do
   fab!(:chat_channel) { Fabricate(:category_channel) }
   fab!(:user) { Fabricate(:user, admin: true) }
   fab!(:category) { Fabricate(:category) }
   fab!(:chat_archive) do
-    ChatChannelArchive.create!(
+    Chat::ChannelArchive.create!(
       chat_channel: chat_channel,
       archived_by: user,
       destination_topic_title: "This will be the archive topic",
@@ -34,7 +34,7 @@ describe Jobs::ChatChannelArchive do
   end
 
   it "processes the archive" do
-    Chat::ChatChannelArchiveService.any_instance.expects(:execute)
+    Chat::ChannelArchiveService.any_instance.expects(:execute)
     run_job
   end
 end
diff --git a/plugins/chat/spec/jobs/regular/chat/channel_delete_spec.rb b/plugins/chat/spec/jobs/regular/chat/channel_delete_spec.rb
new file mode 100644
index 00000000000..7d7bf75bef3
--- /dev/null
+++ b/plugins/chat/spec/jobs/regular/chat/channel_delete_spec.rb
@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+describe Jobs::Chat::ChannelDelete do
+  fab!(:chat_channel) { Fabricate(:chat_channel) }
+  fab!(:user1) { Fabricate(:user) }
+  fab!(:user2) { Fabricate(:user) }
+  fab!(:user3) { Fabricate(:user) }
+  let(:users) { [user1, user2, user3] }
+
+  before do
+    messages = []
+    20.times do
+      messages << Fabricate(:chat_message, chat_channel: chat_channel, user: users.sample)
+    end
+    @message_ids = messages.map(&:id)
+
+    10.times { Chat::MessageReaction.create(chat_message: messages.sample, user: users.sample) }
+
+    10.times do
+      upload = Fabricate(:upload, user: users.sample)
+      message = messages.sample
+
+      UploadReference.create(target: message, upload: upload)
+    end
+
+    Chat::Mention.create(
+      user: user2,
+      chat_message: messages.sample,
+      notification: Fabricate(:notification),
+    )
+
+    @incoming_chat_webhook_id = Fabricate(:incoming_chat_webhook, chat_channel: chat_channel)
+    Chat::WebhookEvent.create(
+      incoming_chat_webhook: @incoming_chat_webhook_id,
+      chat_message: messages.sample,
+    )
+
+    revision_message = messages.sample
+    Fabricate(
+      :chat_message_revision,
+      chat_message: revision_message,
+      old_message: "some old message",
+      new_message: revision_message.message,
+    )
+
+    Chat::Draft.create(chat_channel: chat_channel, user: users.sample, data: "wow some draft")
+
+    Fabricate(:user_chat_channel_membership, chat_channel: chat_channel, user: user1)
+    Fabricate(:user_chat_channel_membership, chat_channel: chat_channel, user: user2)
+    Fabricate(:user_chat_channel_membership, chat_channel: chat_channel, user: user3)
+
+    chat_channel.trash!
+  end
+
+  def counts
+    {
+      incoming_webhooks: Chat::IncomingWebhook.where(chat_channel_id: chat_channel.id).count,
+      webhook_events:
+        Chat::WebhookEvent.where(incoming_chat_webhook_id: @incoming_chat_webhook_id).count,
+      drafts: Chat::Draft.where(chat_channel: chat_channel).count,
+      channel_memberships: Chat::UserChatChannelMembership.where(chat_channel: chat_channel).count,
+      revisions: Chat::MessageRevision.where(chat_message_id: @message_ids).count,
+      mentions: Chat::Mention.where(chat_message_id: @message_ids).count,
+      upload_references:
+        UploadReference.where(
+          target_id: @message_ids,
+          target_type: Chat::Message.polymorphic_name,
+        ).count,
+      messages: Chat::Message.where(id: @message_ids).count,
+      reactions: Chat::MessageReaction.where(chat_message_id: @message_ids).count,
+    }
+  end
+
+  it "deletes all of the messages and related records completely" do
+    initial_counts = counts
+    described_class.new.execute(chat_channel_id: chat_channel.id)
+    new_counts = counts
+
+    expect(new_counts[:incoming_webhooks]).to eq(initial_counts[:incoming_webhooks] - 1)
+    expect(new_counts[:webhook_events]).to eq(initial_counts[:webhook_events] - 1)
+    expect(new_counts[:drafts]).to eq(initial_counts[:drafts] - 1)
+    expect(new_counts[:channel_memberships]).to eq(initial_counts[:channel_memberships] - 3)
+    expect(new_counts[:revisions]).to eq(initial_counts[:revisions] - 1)
+    expect(new_counts[:mentions]).to eq(initial_counts[:mentions] - 1)
+    expect(new_counts[:upload_references]).to eq(initial_counts[:upload_references] - 10)
+    expect(new_counts[:messages]).to eq(initial_counts[:messages] - 20)
+    expect(new_counts[:reactions]).to eq(initial_counts[:reactions] - 10)
+  end
+
+  it "does not error if there are no messages in the channel" do
+    other_channel = Fabricate(:chat_channel)
+    expect { described_class.new.execute(chat_channel_id: other_channel.id) }.not_to raise_error
+  end
+end
diff --git a/plugins/chat/spec/jobs/regular/delete_user_messages_spec.rb b/plugins/chat/spec/jobs/regular/chat/delete_user_messages_spec.rb
similarity index 73%
rename from plugins/chat/spec/jobs/regular/delete_user_messages_spec.rb
rename to plugins/chat/spec/jobs/regular/chat/delete_user_messages_spec.rb
index 26242bae9c7..1cb3f1c8da3 100644
--- a/plugins/chat/spec/jobs/regular/delete_user_messages_spec.rb
+++ b/plugins/chat/spec/jobs/regular/chat/delete_user_messages_spec.rb
@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 
-RSpec.describe Jobs::DeleteUserMessages do
+RSpec.describe Jobs::Chat::DeleteUserMessages do
   describe "#execute" do
+    subject(:execute) { described_class.new.execute(user_id: user_1) }
+
     fab!(:user_1) { Fabricate(:user) }
     fab!(:channel) { Fabricate(:chat_channel) }
     fab!(:chat_message) { Fabricate(:chat_message, chat_channel: channel, user: user_1) }
 
     it "deletes messages from the user" do
-      subject.execute(user_id: user_1)
+      execute
 
       expect { chat_message.reload }.to raise_error(ActiveRecord::RecordNotFound)
     end
@@ -16,7 +18,7 @@ RSpec.describe Jobs::DeleteUserMessages do
       user_2 = Fabricate(:user)
       user_2_message = Fabricate(:chat_message, chat_channel: channel, user: user_2)
 
-      subject.execute(user_id: user_1)
+      execute
 
       expect(user_2_message.reload).to be_present
     end
@@ -24,9 +26,9 @@ RSpec.describe Jobs::DeleteUserMessages do
     it "deletes trashed messages" do
       chat_message.trash!
 
-      subject.execute(user_id: user_1)
+      execute
 
-      expect(ChatMessage.with_deleted.where(id: chat_message.id)).to be_empty
+      expect(Chat::Message.with_deleted.where(id: chat_message.id)).to be_empty
     end
   end
 end
diff --git a/plugins/chat/spec/jobs/regular/chat/kick_users_from_channel_spec.rb b/plugins/chat/spec/jobs/regular/chat/kick_users_from_channel_spec.rb
new file mode 100644
index 00000000000..caecf6ef3e7
--- /dev/null
+++ b/plugins/chat/spec/jobs/regular/chat/kick_users_from_channel_spec.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+RSpec.describe Jobs::Chat::KickUsersFromChannel do
+  fab!(:channel) { Fabricate(:chat_channel) }
+
+  it "publishes the correct MessageBus message" do
+    message =
+      MessageBus
+        .track_publish(Chat::Publisher.kick_users_message_bus_channel(channel.id)) do
+          described_class.new.execute(channel_id: channel.id, user_ids: [1, 2, 3])
+        end
+        .first
+
+    expect(message.user_ids).to eq([1, 2, 3])
+  end
+
+  it "does nothing if the channel is deleted" do
+    channel_id = channel.id
+    channel.trash!
+    message =
+      MessageBus
+        .track_publish(Chat::Publisher.kick_users_message_bus_channel(channel.id)) do
+          described_class.new.execute(channel_id: channel_id, user_ids: [1, 2, 3])
+        end
+        .first
+    expect(message).to be_nil
+  end
+
+  it "does nothing if no user_ids are provided" do
+    message =
+      MessageBus
+        .track_publish(Chat::Publisher.kick_users_message_bus_channel(channel.id)) do
+          described_class.new.execute(channel_id: channel.id)
+        end
+        .first
+    expect(message).to be_nil
+  end
+end
diff --git a/plugins/chat/spec/jobs/regular/chat_notify_mentioned_spec.rb b/plugins/chat/spec/jobs/regular/chat/notify_mentioned_spec.rb
similarity index 82%
rename from plugins/chat/spec/jobs/regular/chat_notify_mentioned_spec.rb
rename to plugins/chat/spec/jobs/regular/chat/notify_mentioned_spec.rb
index 32204adc9cd..1810a843168 100644
--- a/plugins/chat/spec/jobs/regular/chat_notify_mentioned_spec.rb
+++ b/plugins/chat/spec/jobs/regular/chat/notify_mentioned_spec.rb
@@ -2,7 +2,9 @@
 
 require "rails_helper"
 
-describe Jobs::ChatNotifyMentioned do
+describe Jobs::Chat::NotifyMentioned do
+  subject(:job) { described_class.new }
+
   fab!(:user_1) { Fabricate(:user) }
   fab!(:user_2) { Fabricate(:user) }
   fab!(:public_channel) { Fabricate(:category_channel) }
@@ -13,16 +15,37 @@ describe Jobs::ChatNotifyMentioned do
     user_2.reload
 
     @chat_group = Fabricate(:group, users: [user_1, user_2])
-    @personal_chat_channel =
-      Chat::DirectMessageChannelCreator.create!(acting_user: user_1, target_users: [user_1, user_2])
+    result =
+      Chat::CreateDirectMessageChannel.call(
+        guardian: user_1.guardian,
+        target_usernames: [user_1.username, user_2.username],
+      )
+
+    service_failed!(result) if result.failure?
+
+    @personal_chat_channel = result.channel
 
     [user_1, user_2].each do |u|
       Fabricate(:user_chat_channel_membership, chat_channel: public_channel, user: u)
     end
   end
 
-  def create_chat_message(channel: public_channel, user: user_1)
-    Fabricate(:chat_message, chat_channel: channel, user: user, created_at: 10.minutes.ago)
+  def create_chat_message(
+    channel: public_channel,
+    author: user_1,
+    mentioned_user: user_2,
+    thread: nil
+  )
+    message =
+      Fabricate(
+        :chat_message,
+        chat_channel: channel,
+        user: author,
+        created_at: 10.minutes.ago,
+        thread: thread,
+      )
+    Fabricate(:chat_mention, chat_message: message, user: mentioned_user)
+    message
   end
 
   def track_desktop_notification(
@@ -33,7 +56,7 @@ describe Jobs::ChatNotifyMentioned do
   )
     MessageBus
       .track_publish("/chat/notification-alert/#{user.id}") do
-        subject.execute(
+        job.execute(
           chat_message_id: message.id,
           timestamp: message.created_at,
           to_notify_ids_map: to_notify_ids_map,
@@ -44,7 +67,7 @@ describe Jobs::ChatNotifyMentioned do
   end
 
   def track_core_notification(user: user_2, message:, to_notify_ids_map:)
-    subject.execute(
+    job.execute(
       chat_message_id: message.id,
       timestamp: message.created_at,
       to_notify_ids_map: to_notify_ids_map,
@@ -74,7 +97,7 @@ describe Jobs::ChatNotifyMentioned do
     it "does nothing when user is not following the channel" do
       message = create_chat_message
 
-      UserChatChannelMembership.where(chat_channel: public_channel, user: user_2).update!(
+      Chat::UserChatChannelMembership.where(chat_channel: public_channel, user: user_2).update!(
         following: false,
       )
 
@@ -92,7 +115,7 @@ describe Jobs::ChatNotifyMentioned do
     it "does nothing when user doesn't have a membership record" do
       message = create_chat_message
 
-      UserChatChannelMembership.find_by(chat_channel: public_channel, user: user_2).destroy!
+      Chat::UserChatChannelMembership.find_by(chat_channel: public_channel, user: user_2).destroy!
 
       PostAlerter.expects(:push_notification).never
 
@@ -143,8 +166,8 @@ describe Jobs::ChatNotifyMentioned do
 
     it "skips desktop notifications based on user preferences" do
       message = create_chat_message
-      UserChatChannelMembership.find_by(chat_channel: public_channel, user: user_2).update!(
-        desktop_notification_level: UserChatChannelMembership::NOTIFICATION_LEVELS[:never],
+      Chat::UserChatChannelMembership.find_by(chat_channel: public_channel, user: user_2).update!(
+        desktop_notification_level: Chat::UserChatChannelMembership::NOTIFICATION_LEVELS[:never],
       )
 
       desktop_notification =
@@ -155,13 +178,13 @@ describe Jobs::ChatNotifyMentioned do
 
     it "skips push notifications based on user preferences" do
       message = create_chat_message
-      UserChatChannelMembership.find_by(chat_channel: public_channel, user: user_2).update!(
-        mobile_notification_level: UserChatChannelMembership::NOTIFICATION_LEVELS[:never],
+      Chat::UserChatChannelMembership.find_by(chat_channel: public_channel, user: user_2).update!(
+        mobile_notification_level: Chat::UserChatChannelMembership::NOTIFICATION_LEVELS[:never],
       )
 
       PostAlerter.expects(:push_notification).never
 
-      subject.execute(
+      job.execute(
         chat_message_id: message.id,
         timestamp: message.created_at,
         to_notify_ids_map: to_notify_ids_map,
@@ -170,8 +193,8 @@ describe Jobs::ChatNotifyMentioned do
 
     it "skips desktop notifications based on user muting preferences" do
       message = create_chat_message
-      UserChatChannelMembership.find_by(chat_channel: public_channel, user: user_2).update!(
-        desktop_notification_level: UserChatChannelMembership::NOTIFICATION_LEVELS[:always],
+      Chat::UserChatChannelMembership.find_by(chat_channel: public_channel, user: user_2).update!(
+        desktop_notification_level: Chat::UserChatChannelMembership::NOTIFICATION_LEVELS[:always],
         muted: true,
       )
 
@@ -183,14 +206,14 @@ describe Jobs::ChatNotifyMentioned do
 
     it "skips push notifications based on user muting preferences" do
       message = create_chat_message
-      UserChatChannelMembership.find_by(chat_channel: public_channel, user: user_2).update!(
-        mobile_notification_level: UserChatChannelMembership::NOTIFICATION_LEVELS[:always],
+      Chat::UserChatChannelMembership.find_by(chat_channel: public_channel, user: user_2).update!(
+        mobile_notification_level: Chat::UserChatChannelMembership::NOTIFICATION_LEVELS[:always],
         muted: true,
       )
 
       PostAlerter.expects(:push_notification).never
 
-      subject.execute(
+      job.execute(
         chat_message_id: message.id,
         timestamp: message.created_at,
         to_notify_ids_map: to_notify_ids_map,
@@ -211,11 +234,11 @@ describe Jobs::ChatNotifyMentioned do
       expect(desktop_notification.data[:notification_type]).to eq(Notification.types[:chat_mention])
       expect(desktop_notification.data[:username]).to eq(user_1.username)
       expect(desktop_notification.data[:tag]).to eq(
-        Chat::ChatNotifier.push_notification_tag(:mention, public_channel.id),
+        Chat::Notifier.push_notification_tag(:mention, public_channel.id),
       )
       expect(desktop_notification.data[:excerpt]).to eq(message.push_notification_excerpt)
       expect(desktop_notification.data[:post_url]).to eq(
-        "/chat/channel/#{public_channel.id}/#{public_channel.slug}?messageId=#{message.id}",
+        "/chat/c/#{public_channel.slug}/#{public_channel.id}/#{message.id}",
       )
     end
 
@@ -227,15 +250,14 @@ describe Jobs::ChatNotifyMentioned do
         {
           notification_type: Notification.types[:chat_mention],
           username: user_1.username,
-          tag: Chat::ChatNotifier.push_notification_tag(:mention, public_channel.id),
+          tag: Chat::Notifier.push_notification_tag(:mention, public_channel.id),
           excerpt: message.push_notification_excerpt,
-          post_url:
-            "/chat/channel/#{public_channel.id}/#{public_channel.slug}?messageId=#{message.id}",
+          post_url: "/chat/c/#{public_channel.slug}/#{public_channel.id}/#{message.id}",
           translated_title: payload_translated_title,
         },
       )
 
-      subject.execute(
+      job.execute(
         chat_message_id: message.id,
         timestamp: message.created_at,
         to_notify_ids_map: to_notify_ids_map,
@@ -262,7 +284,7 @@ describe Jobs::ChatNotifyMentioned do
       expect(data_hash[:chat_channel_slug]).to eq(public_channel.slug)
 
       chat_mention =
-        ChatMention.where(notification: created_notification, user: user_2, chat_message: message)
+        Chat::Mention.where(notification: created_notification, user: user_2, chat_message: message)
       expect(chat_mention).to be_present
     end
   end
@@ -406,6 +428,26 @@ describe Jobs::ChatNotifyMentioned do
         expect(desktop_notification.data[:translated_title]).to eq(payload_translated_title)
       end
 
+      context "when the mention is within a thread" do
+        before { public_channel.update!(threading_enabled: true) }
+
+        fab!(:thread) { Fabricate(:chat_thread, channel: public_channel) }
+
+        it "uses the thread URL for the post_url in the desktop notification" do
+          message = create_chat_message(thread: thread)
+          desktop_notification =
+            track_desktop_notification(message: message, to_notify_ids_map: to_notify_ids_map)
+          expect(desktop_notification.data[:post_url]).to eq(thread.relative_url)
+        end
+
+        it "includes the thread ID in the core notification data" do
+          message = create_chat_message(thread: thread)
+          created_notification =
+            track_core_notification(message: message, to_notify_ids_map: to_notify_ids_map)
+          expect(created_notification.data_hash[:chat_thread_id]).to eq(thread.id)
+        end
+      end
+
       context "with private channels" do
         it "users a different translated title" do
           message = create_chat_message(channel: @personal_chat_channel)
diff --git a/plugins/chat/spec/jobs/regular/chat_notify_watching_spec.rb b/plugins/chat/spec/jobs/regular/chat/notify_watching_spec.rb
similarity index 90%
rename from plugins/chat/spec/jobs/regular/chat_notify_watching_spec.rb
rename to plugins/chat/spec/jobs/regular/chat/notify_watching_spec.rb
index 72a09d58bf8..0b19f1e6972 100644
--- a/plugins/chat/spec/jobs/regular/chat_notify_watching_spec.rb
+++ b/plugins/chat/spec/jobs/regular/chat/notify_watching_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe Jobs::ChatNotifyWatching do
+RSpec.describe Jobs::Chat::NotifyWatching do
   fab!(:user1) { Fabricate(:user) }
   fab!(:user2) { Fabricate(:user) }
   fab!(:user3) { Fabricate(:user) }
@@ -39,7 +39,7 @@ RSpec.describe Jobs::ChatNotifyWatching do
 
     before do
       membership2.update!(
-        desktop_notification_level: UserChatChannelMembership::NOTIFICATION_LEVELS[:always],
+        desktop_notification_level: Chat::UserChatChannelMembership::NOTIFICATION_LEVELS[:always],
       )
     end
 
@@ -56,7 +56,7 @@ RSpec.describe Jobs::ChatNotifyWatching do
               "discourse_push_notifications.popup.new_chat_message",
               { username: user1.username, channel: channel.title(user2) },
             ),
-          tag: Chat::ChatNotifier.push_notification_tag(:message, channel.id),
+          tag: Chat::Notifier.push_notification_tag(:message, channel.id),
           excerpt: message.message,
         },
       )
@@ -75,8 +75,8 @@ RSpec.describe Jobs::ChatNotifyWatching do
     context "when mobile_notification_level is always and desktop_notification_level is none" do
       before do
         membership2.update!(
-          desktop_notification_level: UserChatChannelMembership::NOTIFICATION_LEVELS[:never],
-          mobile_notification_level: UserChatChannelMembership::NOTIFICATION_LEVELS[:always],
+          desktop_notification_level: Chat::UserChatChannelMembership::NOTIFICATION_LEVELS[:never],
+          mobile_notification_level: Chat::UserChatChannelMembership::NOTIFICATION_LEVELS[:always],
         )
       end
 
@@ -93,7 +93,7 @@ RSpec.describe Jobs::ChatNotifyWatching do
                   "discourse_push_notifications.popup.new_chat_message",
                   { username: user1.username, channel: channel.title(user2) },
                 ),
-              tag: Chat::ChatNotifier.push_notification_tag(:message, channel.id),
+              tag: Chat::Notifier.push_notification_tag(:message, channel.id),
               excerpt: message.message,
             },
           ),
@@ -179,7 +179,7 @@ RSpec.describe Jobs::ChatNotifyWatching do
 
     before do
       membership2.update!(
-        desktop_notification_level: UserChatChannelMembership::NOTIFICATION_LEVELS[:always],
+        desktop_notification_level: Chat::UserChatChannelMembership::NOTIFICATION_LEVELS[:always],
       )
     end
 
@@ -196,8 +196,8 @@ RSpec.describe Jobs::ChatNotifyWatching do
               "discourse_push_notifications.popup.new_direct_chat_message",
               { username: user1.username, channel: channel.title(user2) },
             ),
-          tag: Chat::ChatNotifier.push_notification_tag(:message, channel.id),
-          excerpt: message.message,
+          tag: Chat::Notifier.push_notification_tag(:message, channel.id),
+          excerpt: message.push_notification_excerpt,
         },
       )
     end
@@ -215,8 +215,8 @@ RSpec.describe Jobs::ChatNotifyWatching do
     context "when mobile_notification_level is always and desktop_notification_level is none" do
       before do
         membership2.update!(
-          desktop_notification_level: UserChatChannelMembership::NOTIFICATION_LEVELS[:never],
-          mobile_notification_level: UserChatChannelMembership::NOTIFICATION_LEVELS[:always],
+          desktop_notification_level: Chat::UserChatChannelMembership::NOTIFICATION_LEVELS[:never],
+          mobile_notification_level: Chat::UserChatChannelMembership::NOTIFICATION_LEVELS[:always],
         )
       end
 
@@ -233,8 +233,8 @@ RSpec.describe Jobs::ChatNotifyWatching do
                   "discourse_push_notifications.popup.new_direct_chat_message",
                   { username: user1.username, channel: channel.title(user2) },
                 ),
-              tag: Chat::ChatNotifier.push_notification_tag(:message, channel.id),
-              excerpt: message.message,
+              tag: Chat::Notifier.push_notification_tag(:message, channel.id),
+              excerpt: message.push_notification_excerpt,
             },
           ),
         )
diff --git a/plugins/chat/spec/jobs/process_chat_message_spec.rb b/plugins/chat/spec/jobs/regular/chat/process_message_spec.rb
similarity index 88%
rename from plugins/chat/spec/jobs/process_chat_message_spec.rb
rename to plugins/chat/spec/jobs/regular/chat/process_message_spec.rb
index cb98c286afc..658bb2e3d1c 100644
--- a/plugins/chat/spec/jobs/process_chat_message_spec.rb
+++ b/plugins/chat/spec/jobs/regular/chat/process_message_spec.rb
@@ -2,7 +2,7 @@
 
 require "rails_helper"
 
-describe Jobs::ProcessChatMessage do
+describe Jobs::Chat::ProcessMessage do
   fab!(:chat_message) { Fabricate(:chat_message, message: "https://discourse.org/team") }
 
   it "updates cooked with oneboxes" do
@@ -23,7 +23,7 @@ describe Jobs::ProcessChatMessage do
     fab!(:chat_message) { Fabricate(:chat_message, message: "a very lovely cat") }
 
     it "publishes the update" do
-      ChatPublisher.expects(:publish_processed!).once
+      Chat::Publisher.expects(:publish_processed!).once
       described_class.new.execute(chat_message_id: chat_message.id, is_dirty: true)
     end
   end
@@ -32,14 +32,14 @@ describe Jobs::ProcessChatMessage do
     fab!(:chat_message) { Fabricate(:chat_message, message: "a very lovely cat") }
 
     it "doesn’t publish the update" do
-      ChatPublisher.expects(:publish_processed!).never
+      Chat::Publisher.expects(:publish_processed!).never
       described_class.new.execute(chat_message_id: chat_message.id)
     end
 
     context "when the cooked message changed" do
       it "publishes the update" do
         chat_message.update!(cooked: "another lovely cat")
-        ChatPublisher.expects(:publish_processed!).once
+        Chat::Publisher.expects(:publish_processed!).once
         described_class.new.execute(chat_message_id: chat_message.id)
       end
     end
diff --git a/plugins/chat/spec/jobs/regular/chat/send_message_notifications_spec.rb b/plugins/chat/spec/jobs/regular/chat/send_message_notifications_spec.rb
new file mode 100644
index 00000000000..93d395da9ac
--- /dev/null
+++ b/plugins/chat/spec/jobs/regular/chat/send_message_notifications_spec.rb
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+RSpec.describe Jobs::Chat::SendMessageNotifications do
+  subject(:job) { described_class.new }
+
+  describe "#execute" do
+    context "when the message doesn't exist" do
+      it "does nothing" do
+        Chat::Notifier.any_instance.expects(:notify_new).never
+        Chat::Notifier.any_instance.expects(:notify_edit).never
+
+        job.execute(reason: "new", timestamp: 1.minute.ago)
+      end
+    end
+
+    context "when there's a message" do
+      fab!(:chat_message) { Fabricate(:chat_message) }
+
+      it "does nothing when the reason is invalid" do
+        Chat::Notifier.expects(:notify_new).never
+        Chat::Notifier.expects(:notify_edit).never
+
+        job.execute(chat_message_id: chat_message.id, reason: "invalid", timestamp: 1.minute.ago)
+      end
+
+      it "does nothing if there is no timestamp" do
+        Chat::Notifier.any_instance.expects(:notify_new).never
+        Chat::Notifier.any_instance.expects(:notify_edit).never
+
+        job.execute(chat_message_id: chat_message.id, reason: "new")
+      end
+
+      it "calls notify_new when the reason is 'new'" do
+        Chat::Notifier.any_instance.expects(:notify_new).once
+        Chat::Notifier.any_instance.expects(:notify_edit).never
+
+        job.execute(chat_message_id: chat_message.id, reason: "new", timestamp: 1.minute.ago)
+      end
+
+      it "calls notify_edit when the reason is 'edit'" do
+        Chat::Notifier.any_instance.expects(:notify_new).never
+        Chat::Notifier.any_instance.expects(:notify_edit).once
+
+        job.execute(chat_message_id: chat_message.id, reason: "edit", timestamp: 1.minute.ago)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/jobs/regular/update_channel_user_count_spec.rb b/plugins/chat/spec/jobs/regular/chat/update_channel_user_count_spec.rb
similarity index 82%
rename from plugins/chat/spec/jobs/regular/update_channel_user_count_spec.rb
rename to plugins/chat/spec/jobs/regular/chat/update_channel_user_count_spec.rb
index 6674e53b9e7..a6d2bffbe27 100644
--- a/plugins/chat/spec/jobs/regular/update_channel_user_count_spec.rb
+++ b/plugins/chat/spec/jobs/regular/chat/update_channel_user_count_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe Jobs::UpdateChannelUserCount do
+RSpec.describe Jobs::Chat::UpdateChannelUserCount do
   fab!(:channel) { Fabricate(:category_channel, user_count: 0, user_count_stale: true) }
   fab!(:user1) { Fabricate(:user) }
   fab!(:user2) { Fabricate(:user) }
@@ -18,18 +18,18 @@ RSpec.describe Jobs::UpdateChannelUserCount do
 
   it "does nothing if the channel does not exist" do
     channel.destroy
-    ChatPublisher.expects(:publish_chat_channel_metadata).never
+    Chat::Publisher.expects(:publish_chat_channel_metadata).never
     expect(described_class.new.execute(chat_channel_id: channel.id)).to eq(nil)
   end
 
   it "does nothing if the user count has not been marked stale" do
     channel.update!(user_count_stale: false)
-    ChatPublisher.expects(:publish_chat_channel_metadata).never
+    Chat::Publisher.expects(:publish_chat_channel_metadata).never
     expect(described_class.new.execute(chat_channel_id: channel.id)).to eq(nil)
   end
 
   it "updates the channel user_count and sets user_count_stale back to false" do
-    ChatPublisher.expects(:publish_chat_channel_metadata).with(channel)
+    Chat::Publisher.expects(:publish_chat_channel_metadata).with(channel)
     described_class.new.execute(chat_channel_id: channel.id)
     channel.reload
     expect(channel.user_count).to eq(3)
diff --git a/plugins/chat/spec/jobs/regular/mark_all_channel_threads_read_spec.rb b/plugins/chat/spec/jobs/regular/mark_all_channel_threads_read_spec.rb
new file mode 100644
index 00000000000..b98db58b589
--- /dev/null
+++ b/plugins/chat/spec/jobs/regular/mark_all_channel_threads_read_spec.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+RSpec.describe Jobs::Chat::MarkAllChannelThreadsRead do
+  fab!(:channel) { Fabricate(:chat_channel, threading_enabled: true) }
+  fab!(:thread_1) { Fabricate(:chat_thread, channel: channel) }
+  fab!(:thread_2) { Fabricate(:chat_thread, channel: channel) }
+  fab!(:user_1) { Fabricate(:user) }
+  fab!(:user_2) { Fabricate(:user) }
+  fab!(:thread_1_message_1) { Fabricate(:chat_message, thread: thread_1) }
+  fab!(:thread_1_message_2) { Fabricate(:chat_message, thread: thread_1) }
+  fab!(:thread_1_message_3) { Fabricate(:chat_message, thread: thread_1) }
+  fab!(:thread_2_message_1) { Fabricate(:chat_message, thread: thread_2) }
+  fab!(:thread_2_message_2) { Fabricate(:chat_message, thread: thread_2) }
+
+  before do
+    channel.add(user_1)
+    channel.add(user_2)
+    thread_1.add(user_1)
+    thread_2.add(user_2)
+  end
+
+  def unread_count(user)
+    Chat::ThreadUnreadsQuery.call(channel_ids: [channel.id], user_id: user.id).first.unread_count
+  end
+
+  it "marks all threads as read across all users in the channel" do
+    expect(unread_count(user_1)).to eq(3)
+    expect(unread_count(user_2)).to eq(2)
+    described_class.new.execute(channel_id: channel.id)
+    expect(unread_count(user_1)).to eq(0)
+    expect(unread_count(user_2)).to eq(0)
+  end
+end
diff --git a/plugins/chat/spec/jobs/regular/send_message_notifications_spec.rb b/plugins/chat/spec/jobs/regular/send_message_notifications_spec.rb
deleted file mode 100644
index e00bad83f5c..00000000000
--- a/plugins/chat/spec/jobs/regular/send_message_notifications_spec.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Jobs::SendMessageNotifications do
-  describe "#execute" do
-    context "when the message doesn't exist" do
-      it "does nothing" do
-        Chat::ChatNotifier.any_instance.expects(:notify_new).never
-        Chat::ChatNotifier.any_instance.expects(:notify_edit).never
-
-        subject.execute(eason: "new", timestamp: 1.minute.ago)
-      end
-    end
-
-    context "when there's a message" do
-      fab!(:chat_message) { Fabricate(:chat_message) }
-
-      it "does nothing when the reason is invalid" do
-        Chat::ChatNotifier.expects(:notify_new).never
-        Chat::ChatNotifier.expects(:notify_edit).never
-
-        subject.execute(
-          chat_message_id: chat_message.id,
-          reason: "invalid",
-          timestamp: 1.minute.ago,
-        )
-      end
-
-      it "does nothing if there is no timestamp" do
-        Chat::ChatNotifier.any_instance.expects(:notify_new).never
-        Chat::ChatNotifier.any_instance.expects(:notify_edit).never
-
-        subject.execute(chat_message_id: chat_message.id, reason: "new")
-      end
-
-      it "calls notify_new when the reason is 'new'" do
-        Chat::ChatNotifier.any_instance.expects(:notify_new).once
-        Chat::ChatNotifier.any_instance.expects(:notify_edit).never
-
-        subject.execute(chat_message_id: chat_message.id, reason: "new", timestamp: 1.minute.ago)
-      end
-
-      it "calls notify_edit when the reason is 'edit'" do
-        Chat::ChatNotifier.any_instance.expects(:notify_new).never
-        Chat::ChatNotifier.any_instance.expects(:notify_edit).once
-
-        subject.execute(chat_message_id: chat_message.id, reason: "edit", timestamp: 1.minute.ago)
-      end
-    end
-  end
-end
diff --git a/plugins/chat/spec/jobs/regular/update_thread_reply_count_spec.rb b/plugins/chat/spec/jobs/regular/update_thread_reply_count_spec.rb
new file mode 100644
index 00000000000..8c844c4fad8
--- /dev/null
+++ b/plugins/chat/spec/jobs/regular/update_thread_reply_count_spec.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+RSpec.describe Jobs::Chat::UpdateThreadReplyCount do
+  fab!(:thread) { Fabricate(:chat_thread) }
+  fab!(:message_1) { Fabricate(:chat_message, thread: thread) }
+  fab!(:message_2) { Fabricate(:chat_message, thread: thread) }
+
+  before { Chat::Thread.clear_caches!(thread.id) }
+
+  it "does not error if the thread is deleted" do
+    id = thread.id
+    thread.destroy!
+    expect { described_class.new.execute(thread_id: id) }.not_to raise_error
+  end
+
+  it "does not set the reply count in the DB if it has been changed recently" do
+    described_class.new.execute(thread_id: thread.id)
+    expect(thread.reload.replies_count).to eq(2)
+    Fabricate(:chat_message, thread: thread)
+    described_class.new.execute(thread_id: thread.id)
+    expect(thread.reload.replies_count).to eq(2)
+  end
+
+  it "sets the updated_at cache to the current time" do
+    freeze_time
+    described_class.new.execute(thread_id: thread.id)
+    expect(thread.replies_count_cache_updated_at).to eq_time(
+      Time.at(Time.zone.now.to_i, in: Time.zone),
+    )
+  end
+end
diff --git a/plugins/chat/spec/jobs/scheduled/auto_join_users_spec.rb b/plugins/chat/spec/jobs/scheduled/auto_join_users_spec.rb
index e420b0a8a58..4abbdc37405 100644
--- a/plugins/chat/spec/jobs/scheduled/auto_join_users_spec.rb
+++ b/plugins/chat/spec/jobs/scheduled/auto_join_users_spec.rb
@@ -2,18 +2,20 @@
 
 require "rails_helper"
 
-describe Jobs::AutoJoinUsers do
+describe Jobs::Chat::AutoJoinUsers do
+  subject(:job) { described_class.new }
+
   it "works" do
     Jobs.run_immediately!
     channel = Fabricate(:category_channel, auto_join_users: true)
     user = Fabricate(:user, last_seen_at: 1.minute.ago, active: true)
 
-    membership = UserChatChannelMembership.find_by(user: user, chat_channel: channel)
+    membership = Chat::UserChatChannelMembership.find_by(user: user, chat_channel: channel)
     expect(membership).to be_nil
 
-    subject.execute({})
+    job.execute({})
 
-    membership = UserChatChannelMembership.find_by(user: user, chat_channel: channel)
+    membership = Chat::UserChatChannelMembership.find_by(user: user, chat_channel: channel)
     expect(membership.following).to eq(true)
   end
 end
diff --git a/plugins/chat/spec/jobs/delete_old_chat_messages_spec.rb b/plugins/chat/spec/jobs/scheduled/delete_old_chat_messages_spec.rb
similarity index 83%
rename from plugins/chat/spec/jobs/delete_old_chat_messages_spec.rb
rename to plugins/chat/spec/jobs/scheduled/delete_old_chat_messages_spec.rb
index 79b0ea94c21..d812460bac3 100644
--- a/plugins/chat/spec/jobs/delete_old_chat_messages_spec.rb
+++ b/plugins/chat/spec/jobs/scheduled/delete_old_chat_messages_spec.rb
@@ -2,7 +2,7 @@
 
 require "rails_helper"
 
-describe Jobs::DeleteOldChatMessages do
+describe Jobs::Chat::DeleteOldMessages do
   base_date = DateTime.parse("2020-12-01 00:00 UTC")
 
   fab!(:public_channel) { Fabricate(:category_channel) }
@@ -79,13 +79,16 @@ describe Jobs::DeleteOldChatMessages do
     )
   end
 
-  before { freeze_time(base_date) }
+  before do
+    freeze_time(base_date)
+    SiteSetting.chat_enabled = true
+  end
 
   it "doesn't delete messages when settings are 0" do
     SiteSetting.chat_channel_retention_days = 0
     SiteSetting.chat_dm_retention_days = 0
 
-    expect { described_class.new.execute }.not_to change { ChatMessage.count }
+    expect { described_class.new.execute }.not_to change { Chat::Message.count }
   end
 
   describe "public channels" do
@@ -107,7 +110,17 @@ describe Jobs::DeleteOldChatMessages do
 
     it "does nothing when no messages fall in the time range" do
       SiteSetting.chat_channel_retention_days = 800
-      expect { described_class.new.execute }.not_to change { ChatMessage.in_public_channel.count }
+      expect { described_class.new.execute }.not_to change { Chat::Message.in_public_channel.count }
+    end
+
+    context "when chat is disabled" do
+      before { SiteSetting.chat_enabled = false }
+
+      it "does nothing" do
+        expect { described_class.new.execute }.not_to change {
+          Chat::Message.in_public_channel.count
+        }
+      end
     end
   end
 
@@ -130,7 +143,15 @@ describe Jobs::DeleteOldChatMessages do
 
     it "does nothing when no messages fall in the time range" do
       SiteSetting.chat_dm_retention_days = 800
-      expect { described_class.new.execute }.not_to change { ChatMessage.in_dm_channel.count }
+      expect { described_class.new.execute }.not_to change { Chat::Message.in_dm_channel.count }
+    end
+
+    context "when chat is disabled" do
+      before { SiteSetting.chat_enabled = false }
+
+      it "does nothing" do
+        expect { described_class.new.execute }.not_to change { Chat::Message.in_dm_channel.count }
+      end
     end
   end
 end
diff --git a/plugins/chat/spec/jobs/scheduled/email_chat_notifications_spec.rb b/plugins/chat/spec/jobs/scheduled/email_notifications_spec.rb
similarity index 55%
rename from plugins/chat/spec/jobs/scheduled/email_chat_notifications_spec.rb
rename to plugins/chat/spec/jobs/scheduled/email_notifications_spec.rb
index c061288aabd..a0c2975e68e 100644
--- a/plugins/chat/spec/jobs/scheduled/email_chat_notifications_spec.rb
+++ b/plugins/chat/spec/jobs/scheduled/email_notifications_spec.rb
@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-describe Jobs::EmailChatNotifications do
+describe Jobs::Chat::EmailNotifications do
   before { Jobs.run_immediately! }
 
   context "when chat is enabled" do
     before { SiteSetting.chat_enabled = true }
 
     it "starts the mailer" do
-      Chat::ChatMailer.expects(:send_unread_mentions_summary)
+      Chat::Mailer.expects(:send_unread_mentions_summary)
 
-      Jobs.enqueue(:email_chat_notifications)
+      Jobs.enqueue(Jobs::Chat::EmailNotifications)
     end
   end
 
@@ -17,9 +17,9 @@ describe Jobs::EmailChatNotifications do
     before { SiteSetting.chat_enabled = false }
 
     it "does nothing" do
-      Chat::ChatMailer.expects(:send_unread_mentions_summary).never
+      Chat::Mailer.expects(:send_unread_mentions_summary).never
 
-      Jobs.enqueue(:email_chat_notifications)
+      Jobs.enqueue(Jobs::Chat::EmailNotifications)
     end
   end
 end
diff --git a/plugins/chat/spec/jobs/chat_periodical_updates_spec.rb b/plugins/chat/spec/jobs/scheduled/periodical_updates_spec.rb
similarity index 53%
rename from plugins/chat/spec/jobs/chat_periodical_updates_spec.rb
rename to plugins/chat/spec/jobs/scheduled/periodical_updates_spec.rb
index 113a58229ce..5fa751779a3 100644
--- a/plugins/chat/spec/jobs/chat_periodical_updates_spec.rb
+++ b/plugins/chat/spec/jobs/scheduled/periodical_updates_spec.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-RSpec.describe Jobs::ChatPeriodicalUpdates do
+RSpec.describe Jobs::Chat::PeriodicalUpdates do
   it "works" do
     # does not blow up, no mocks, everything is called
-    Jobs::ChatPeriodicalUpdates.new.execute(nil)
+    Jobs::Chat::PeriodicalUpdates.new.execute(nil)
   end
 end
diff --git a/plugins/chat/spec/jobs/update_user_counts_for_chat_channels_spec.rb b/plugins/chat/spec/jobs/update_user_counts_for_chat_channels_spec.rb
deleted file mode 100644
index 753b7b7bdfa..00000000000
--- a/plugins/chat/spec/jobs/update_user_counts_for_chat_channels_spec.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-# frozen_string_literal: true
-
-require "rails_helper"
-
-describe Jobs::UpdateUserCountsForChatChannels do
-  fab!(:chat_channel_1) { Fabricate(:category_channel, user_count: 0) }
-  fab!(:chat_channel_2) { Fabricate(:category_channel, user_count: 0) }
-  fab!(:user_1) { Fabricate(:user) }
-  fab!(:user_2) { Fabricate(:user) }
-  fab!(:user_3) { Fabricate(:user) }
-  fab!(:user_4) { Fabricate(:user) }
-
-  def create_memberships
-    user_1.user_chat_channel_memberships.create!(chat_channel: chat_channel_1, following: true)
-    user_1.user_chat_channel_memberships.create!(chat_channel: chat_channel_2, following: true)
-
-    user_2.user_chat_channel_memberships.create!(chat_channel: chat_channel_1, following: true)
-    user_2.user_chat_channel_memberships.create!(chat_channel: chat_channel_2, following: true)
-
-    user_3.user_chat_channel_memberships.create!(chat_channel: chat_channel_1, following: false)
-    user_3.user_chat_channel_memberships.create!(chat_channel: chat_channel_2, following: true)
-  end
-
-  it "sets the user_count correctly for each chat channel" do
-    create_memberships
-
-    Jobs::UpdateUserCountsForChatChannels.new.execute
-
-    expect(chat_channel_1.reload.user_count).to eq(2)
-    expect(chat_channel_2.reload.user_count).to eq(3)
-  end
-
-  it "does not count suspended, non-activated, nor staged users" do
-    user_1.user_chat_channel_memberships.create!(chat_channel: chat_channel_1, following: true)
-    user_2.user_chat_channel_memberships.create!(chat_channel: chat_channel_2, following: true)
-    user_3.user_chat_channel_memberships.create!(chat_channel: chat_channel_2, following: true)
-    user_4.user_chat_channel_memberships.create!(chat_channel: chat_channel_2, following: true)
-    user_2.update(suspended_till: 3.weeks.from_now)
-    user_3.update(staged: true)
-    user_4.update(active: false)
-
-    Jobs::UpdateUserCountsForChatChannels.new.execute
-
-    expect(chat_channel_1.reload.user_count).to eq(1)
-    expect(chat_channel_2.reload.user_count).to eq(0)
-  end
-
-  it "does not count archived, or read_only channels" do
-    create_memberships
-
-    chat_channel_1.update!(status: :archived)
-    Jobs::UpdateUserCountsForChatChannels.new.execute
-    expect(chat_channel_1.reload.user_count).to eq(0)
-
-    chat_channel_1.update!(status: :read_only)
-    Jobs::UpdateUserCountsForChatChannels.new.execute
-    expect(chat_channel_1.reload.user_count).to eq(0)
-  end
-end
diff --git a/plugins/chat/spec/lib/chat_channel_archive_service_spec.rb b/plugins/chat/spec/lib/chat/channel_archive_service_spec.rb
similarity index 78%
rename from plugins/chat/spec/lib/chat_channel_archive_service_spec.rb
rename to plugins/chat/spec/lib/chat/channel_archive_service_spec.rb
index d42c0f3d1a9..1911e2fa3c6 100644
--- a/plugins/chat/spec/lib/chat_channel_archive_service_spec.rb
+++ b/plugins/chat/spec/lib/chat/channel_archive_service_spec.rb
@@ -2,15 +2,15 @@
 
 require "rails_helper"
 
-describe Chat::ChatChannelArchiveService do
+describe Chat::ChannelArchiveService do
   class FakeArchiveError < StandardError
   end
 
   fab!(:channel) { Fabricate(:category_channel) }
   fab!(:user) { Fabricate(:user, admin: true) }
   fab!(:category) { Fabricate(:category) }
+
   let(:topic_params) { { topic_title: "This will be a new topic", category_id: category.id } }
-  subject { Chat::ChatChannelArchiveService }
 
   before { SiteSetting.chat_enabled = true }
 
@@ -18,7 +18,7 @@ describe Chat::ChatChannelArchiveService do
     before { 3.times { Fabricate(:chat_message, chat_channel: channel) } }
 
     it "marks the channel as read_only" do
-      subject.create_archive_process(
+      described_class.create_archive_process(
         chat_channel: channel,
         acting_user: user,
         topic_params: topic_params,
@@ -27,12 +27,12 @@ describe Chat::ChatChannelArchiveService do
     end
 
     it "creates the chat channel archive record to save progress and topic params" do
-      subject.create_archive_process(
+      described_class.create_archive_process(
         chat_channel: channel,
         acting_user: user,
         topic_params: topic_params,
       )
-      channel_archive = ChatChannelArchive.find_by(chat_channel: channel)
+      channel_archive = Chat::ChannelArchive.find_by(chat_channel: channel)
       expect(channel_archive.archived_by).to eq(user)
       expect(channel_archive.destination_topic_title).to eq("This will be a new topic")
       expect(channel_archive.destination_category_id).to eq(category.id)
@@ -42,14 +42,14 @@ describe Chat::ChatChannelArchiveService do
 
     it "enqueues the archive job" do
       channel_archive =
-        subject.create_archive_process(
+        described_class.create_archive_process(
           chat_channel: channel,
           acting_user: user,
           topic_params: topic_params,
         )
       expect(
         job_enqueued?(
-          job: :chat_channel_archive,
+          job: Jobs::Chat::ChannelArchive,
           args: {
             chat_channel_archive_id: channel_archive.id,
           },
@@ -58,25 +58,25 @@ describe Chat::ChatChannelArchiveService do
     end
 
     it "does nothing if there is already an archive record for the channel" do
-      subject.create_archive_process(
+      described_class.create_archive_process(
         chat_channel: channel,
         acting_user: user,
         topic_params: topic_params,
       )
       expect {
-        subject.create_archive_process(
+        described_class.create_archive_process(
           chat_channel: channel,
           acting_user: user,
           topic_params: topic_params,
         )
-      }.not_to change { ChatChannelArchive.count }
+      }.not_to change { Chat::ChannelArchive.count }
     end
 
     it "does not count already deleted messages toward the archive total" do
       new_message = Fabricate(:chat_message, chat_channel: channel)
       new_message.trash!
       channel_archive =
-        subject.create_archive_process(
+        described_class.create_archive_process(
           chat_channel: channel,
           acting_user: user,
           topic_params: topic_params,
@@ -92,7 +92,7 @@ describe Chat::ChatChannelArchiveService do
 
     def start_archive
       @channel_archive =
-        subject.create_archive_process(
+        described_class.create_archive_process(
           chat_channel: channel,
           acting_user: user,
           topic_params: topic_params,
@@ -106,14 +106,14 @@ describe Chat::ChatChannelArchiveService do
 
       it "makes a topic, deletes all the messages, creates posts for batches of messages, and changes the channel to archived" do
         create_messages(50) && start_archive
-        reaction_message = ChatMessage.last
-        ChatMessageReaction.create!(
+        reaction_message = Chat::Message.last
+        Chat::MessageReaction.create!(
           chat_message: reaction_message,
           user: Fabricate(:user),
           emoji: "+1",
         )
-        stub_const(Chat::ChatChannelArchiveService, "ARCHIVED_MESSAGES_PER_POST", 5) do
-          subject.new(@channel_archive).execute
+        stub_const(Chat::ChannelArchiveService, "ARCHIVED_MESSAGES_PER_POST", 5) do
+          described_class.new(@channel_archive).execute
         end
 
         @channel_archive.reload
@@ -146,21 +146,21 @@ describe Chat::ChatChannelArchiveService do
       it "does not stop the process if the post length is too high (validations disabled)" do
         create_messages(50) && start_archive
         SiteSetting.max_post_length = 1
-        subject.new(@channel_archive).execute
+        described_class.new(@channel_archive).execute
         expect(@channel_archive.reload.complete?).to eq(true)
       end
 
       it "successfully links uploads from messages to the post" do
         create_messages(3) && start_archive
-        ChatUpload.create(chat_message: ChatMessage.last, upload: Fabricate(:upload))
-        subject.new(@channel_archive).execute
+        UploadReference.create!(target: Chat::Message.last, upload: Fabricate(:upload))
+        described_class.new(@channel_archive).execute
         expect(@channel_archive.reload.complete?).to eq(true)
         expect(@channel_archive.destination_topic.posts.last.upload_references.count).to eq(1)
       end
 
       it "successfully sends a private message to the archiving user" do
         create_messages(3) && start_archive
-        subject.new(@channel_archive).execute
+        described_class.new(@channel_archive).execute
         expect(@channel_archive.reload.complete?).to eq(true)
         pm_topic = Topic.private_messages.last
         expect(pm_topic.topic_allowed_users.first.user).to eq(@channel_archive.archived_by)
@@ -174,7 +174,7 @@ describe Chat::ChatChannelArchiveService do
 
         create_messages(3) && start_archive
         @channel_archive.update!(destination_topic_title: "Wow this is the new title :tada: :joy:")
-        subject.new(@channel_archive).execute
+        described_class.new(@channel_archive).execute
         expect(@channel_archive.reload.complete?).to eq(false)
         expect(@channel_archive.reload.failed?).to eq(true)
         expect(@channel_archive.archive_error).to eq("Title can't have more than 1 emoji")
@@ -191,12 +191,23 @@ describe Chat::ChatChannelArchiveService do
 
         it "uses the channel slug to autolink a hashtag for the channel in the PM" do
           create_messages(3) && start_archive
-          subject.new(@channel_archive).execute
+          described_class.new(@channel_archive).execute
           expect(@channel_archive.reload.complete?).to eq(true)
           pm_topic = Topic.private_messages.last
-          expect(pm_topic.first_post.cooked).to include(
-            "<a class=\"hashtag-cooked\" href=\"#{channel.relative_url}\" data-type=\"channel\" data-slug=\"#{channel.slug}\" data-ref=\"#{channel.slug}::channel\"><svg class=\"fa d-icon d-icon-comment svg-icon svg-node\"><use href=\"#comment\"></use></svg><span>#{channel.title(user)}</span></a>",
-          )
+          expect(pm_topic.first_post.cooked).to have_tag(
+            "a",
+            with: {
+              class: "hashtag-cooked",
+              href: channel.relative_url,
+              "data-type": "channel",
+              "data-slug": channel.slug,
+              "data-id": channel.id,
+              "data-ref": "#{channel.slug}::channel",
+            },
+          ) do
+            with_tag("span", with: { class: "hashtag-icon-placeholder" })
+            with_tag("span", text: channel.title(user))
+          end
         end
       end
 
@@ -207,30 +218,34 @@ describe Chat::ChatChannelArchiveService do
             .chat_messages
             .map(&:user)
             .each do |user|
-              UserChatChannelMembership.create!(chat_channel: channel, user: user, following: true)
+              Chat::UserChatChannelMembership.create!(
+                chat_channel: channel,
+                user: user,
+                following: true,
+              )
             end
         end
 
         it "unfollows (leaves) the channel for all users" do
           expect(
-            UserChatChannelMembership.where(chat_channel: channel, following: true).count,
+            Chat::UserChatChannelMembership.where(chat_channel: channel, following: true).count,
           ).to eq(3)
           start_archive
-          subject.new(@channel_archive).execute
+          described_class.new(@channel_archive).execute
           expect(@channel_archive.reload.complete?).to eq(true)
           expect(
-            UserChatChannelMembership.where(chat_channel: channel, following: true).count,
+            Chat::UserChatChannelMembership.where(chat_channel: channel, following: true).count,
           ).to eq(0)
         end
 
         it "resets unread state for all users" do
-          UserChatChannelMembership.last.update!(
+          Chat::UserChatChannelMembership.last.update!(
             last_read_message_id: channel.chat_messages.first.id,
           )
           start_archive
-          subject.new(@channel_archive).execute
+          described_class.new(@channel_archive).execute
           expect(@channel_archive.reload.complete?).to eq(true)
-          expect(UserChatChannelMembership.last.last_read_message_id).to eq(
+          expect(Chat::UserChatChannelMembership.last.last_read_message_id).to eq(
             channel.chat_messages.last.id,
           )
         end
@@ -242,7 +257,7 @@ describe Chat::ChatChannelArchiveService do
 
           it "archives the topic" do
             create_messages(3) && start_archive
-            subject.new(@channel_archive).execute
+            described_class.new(@channel_archive).execute
             topic = @channel_archive.destination_topic
             topic.reload
             expect(topic.archived).to eq(true)
@@ -254,7 +269,7 @@ describe Chat::ChatChannelArchiveService do
 
           it "leaves the topic open" do
             create_messages(3) && start_archive
-            subject.new(@channel_archive).execute
+            described_class.new(@channel_archive).execute
             topic = @channel_archive.destination_topic
             topic.reload
             expect(topic.archived).to eq(false)
@@ -267,7 +282,7 @@ describe Chat::ChatChannelArchiveService do
 
           it "closes the topic" do
             create_messages(3) && start_archive
-            subject.new(@channel_archive).execute
+            described_class.new(@channel_archive).execute
             topic = @channel_archive.destination_topic
             topic.reload
             expect(topic.archived).to eq(false)
@@ -282,7 +297,7 @@ describe Chat::ChatChannelArchiveService do
               destination_topic_title: nil,
               destination_topic_id: Fabricate(:topic).id,
             )
-            subject.new(@channel_archive).execute
+            described_class.new(@channel_archive).execute
             topic = @channel_archive.destination_topic
             topic.reload
             expect(topic.archived).to eq(false)
@@ -300,14 +315,14 @@ describe Chat::ChatChannelArchiveService do
 
       it "deletes all the messages, creates posts for batches of messages, and changes the channel to archived" do
         create_messages(50) && start_archive
-        reaction_message = ChatMessage.last
-        ChatMessageReaction.create!(
+        reaction_message = Chat::Message.last
+        Chat::MessageReaction.create!(
           chat_message: reaction_message,
           user: Fabricate(:user),
           emoji: "+1",
         )
-        stub_const(Chat::ChatChannelArchiveService, "ARCHIVED_MESSAGES_PER_POST", 5) do
-          subject.new(@channel_archive).execute
+        stub_const(Chat::ChannelArchiveService, "ARCHIVED_MESSAGES_PER_POST", 5) do
+          described_class.new(@channel_archive).execute
         end
 
         @channel_archive.reload
@@ -342,13 +357,13 @@ describe Chat::ChatChannelArchiveService do
         Rails.logger = @fake_logger = FakeLogger.new
         create_messages(35) && start_archive
 
-        Chat::ChatChannelArchiveService
+        Chat::ChannelArchiveService
           .any_instance
           .stubs(:create_post)
           .raises(FakeArchiveError.new("this is a test error"))
 
-        stub_const(Chat::ChatChannelArchiveService, "ARCHIVED_MESSAGES_PER_POST", 5) do
-          expect { subject.new(@channel_archive).execute }.to raise_error(FakeArchiveError)
+        stub_const(Chat::ChannelArchiveService, "ARCHIVED_MESSAGES_PER_POST", 5) do
+          expect { described_class.new(@channel_archive).execute }.to raise_error(FakeArchiveError)
         end
 
         expect(@channel_archive.reload.archive_error).to eq("this is a test error")
@@ -359,9 +374,9 @@ describe Chat::ChatChannelArchiveService do
           I18n.t("system_messages.chat_channel_archive_failed.subject_template"),
         )
 
-        Chat::ChatChannelArchiveService.any_instance.unstub(:create_post)
-        stub_const(Chat::ChatChannelArchiveService, "ARCHIVED_MESSAGES_PER_POST", 5) do
-          subject.new(@channel_archive).execute
+        Chat::ChannelArchiveService.any_instance.unstub(:create_post)
+        stub_const(Chat::ChannelArchiveService, "ARCHIVED_MESSAGES_PER_POST", 5) do
+          described_class.new(@channel_archive).execute
         end
 
         @channel_archive.reload
diff --git a/plugins/chat/spec/lib/chat_channel_fetcher_spec.rb b/plugins/chat/spec/lib/chat/channel_fetcher_spec.rb
similarity index 58%
rename from plugins/chat/spec/lib/chat_channel_fetcher_spec.rb
rename to plugins/chat/spec/lib/chat/channel_fetcher_spec.rb
index 46a1f394197..82de60560e6 100644
--- a/plugins/chat/spec/lib/chat_channel_fetcher_spec.rb
+++ b/plugins/chat/spec/lib/chat/channel_fetcher_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe Chat::ChatChannelFetcher do
+describe Chat::ChannelFetcher do
   fab!(:category) { Fabricate(:category, name: "support") }
   fab!(:private_category) { Fabricate(:private_category, group: Fabricate(:group)) }
   fab!(:category_channel) { Fabricate(:category_channel, chatable: category, slug: "support") }
@@ -8,7 +8,8 @@ describe Chat::ChatChannelFetcher do
   fab!(:dm_channel2) { Fabricate(:direct_message) }
   fab!(:direct_message_channel1) { Fabricate(:direct_message_channel, chatable: dm_channel1) }
   fab!(:direct_message_channel2) { Fabricate(:direct_message_channel, chatable: dm_channel2) }
-  fab!(:user1) { Fabricate(:user) }
+  fab!(:chatters) { Fabricate(:group) }
+  fab!(:user1) { Fabricate(:user, group_ids: [chatters.id]) }
   fab!(:user2) { Fabricate(:user) }
 
   def guardian
@@ -16,36 +17,38 @@ describe Chat::ChatChannelFetcher do
   end
 
   def memberships
-    UserChatChannelMembership.where(user: user1)
+    Chat::UserChatChannelMembership.where(user: user1)
   end
 
+  before { SiteSetting.chat_allowed_groups = [chatters] }
+
   describe ".structured" do
     it "returns open channel only" do
       category_channel.user_chat_channel_memberships.create!(user: user1, following: true)
 
-      channels = subject.structured(guardian)[:public_channels]
+      channels = described_class.structured(guardian)[:public_channels]
 
       expect(channels).to contain_exactly(category_channel)
 
       category_channel.closed!(Discourse.system_user)
-      channels = subject.structured(guardian)[:public_channels]
+      channels = described_class.structured(guardian)[:public_channels]
 
       expect(channels).to be_blank
     end
 
     it "returns followed channel only" do
-      channels = subject.structured(guardian)[:public_channels]
+      channels = described_class.structured(guardian)[:public_channels]
 
       expect(channels).to be_blank
 
       category_channel.user_chat_channel_memberships.create!(user: user1, following: true)
-      channels = subject.structured(guardian)[:public_channels]
+      channels = described_class.structured(guardian)[:public_channels]
 
       expect(channels).to contain_exactly(category_channel)
     end
   end
 
-  describe ".unread_counts" do
+  describe ".tracking_state" do
     context "when user is member of the channel" do
       before do
         Fabricate(:user_chat_channel_membership, chat_channel: category_channel, user: user1)
@@ -58,15 +61,17 @@ describe Chat::ChatChannelFetcher do
         end
 
         it "returns the correct count" do
-          unread_counts = subject.unread_counts([category_channel], user1)
-          expect(unread_counts[category_channel.id]).to eq(2)
+          tracking_state =
+            described_class.tracking_state([category_channel.id], Guardian.new(user1))
+          expect(tracking_state.find_channel(category_channel.id).unread_count).to eq(2)
         end
       end
 
       context "with no unread messages" do
         it "returns the correct count" do
-          unread_counts = subject.unread_counts([category_channel], user1)
-          expect(unread_counts[category_channel.id]).to eq(0)
+          tracking_state =
+            described_class.tracking_state([category_channel.id], Guardian.new(user1))
+          expect(tracking_state.find_channel(category_channel.id).unread_count).to eq(0)
         end
       end
 
@@ -78,8 +83,9 @@ describe Chat::ChatChannelFetcher do
         before { last_unread.update!(deleted_at: Time.zone.now) }
 
         it "returns the correct count" do
-          unread_counts = subject.unread_counts([category_channel], user1)
-          expect(unread_counts[category_channel.id]).to eq(0)
+          tracking_state =
+            described_class.tracking_state([category_channel.id], Guardian.new(user1))
+          expect(tracking_state.find_channel(category_channel.id).unread_count).to eq(0)
         end
       end
     end
@@ -91,8 +97,9 @@ describe Chat::ChatChannelFetcher do
         end
 
         it "returns the correct count" do
-          unread_counts = subject.unread_counts([category_channel], user1)
-          expect(unread_counts[category_channel.id]).to eq(0)
+          tracking_state =
+            described_class.tracking_state([category_channel.id], Guardian.new(user1))
+          expect(tracking_state.find_channel(category_channel.id).unread_count).to eq(0)
         end
       end
     end
@@ -100,41 +107,45 @@ describe Chat::ChatChannelFetcher do
 
   describe ".all_secured_channel_ids" do
     it "returns nothing by default if the user has no memberships" do
-      expect(subject.all_secured_channel_ids(guardian)).to eq([])
+      expect(described_class.all_secured_channel_ids(guardian)).to eq([])
     end
 
     context "when the user has memberships to all the channels" do
       before do
-        UserChatChannelMembership.create!(
+        Chat::UserChatChannelMembership.create!(
           user: user1,
           chat_channel: category_channel,
           following: true,
         )
-        UserChatChannelMembership.create!(
+        Chat::UserChatChannelMembership.create!(
           user: user1,
           chat_channel: direct_message_channel1,
           following: true,
-          desktop_notification_level: UserChatChannelMembership::NOTIFICATION_LEVELS[:always],
-          mobile_notification_level: UserChatChannelMembership::NOTIFICATION_LEVELS[:always],
+          desktop_notification_level: Chat::UserChatChannelMembership::NOTIFICATION_LEVELS[:always],
+          mobile_notification_level: Chat::UserChatChannelMembership::NOTIFICATION_LEVELS[:always],
         )
       end
 
       it "returns category channel because they are public by default" do
-        expect(subject.all_secured_channel_ids(guardian)).to match_array([category_channel.id])
+        expect(described_class.all_secured_channel_ids(guardian)).to match_array(
+          [category_channel.id],
+        )
       end
 
       it "returns all the channels if the user is a member of the DM channel also" do
-        DirectMessageUser.create!(user: user1, direct_message: dm_channel1)
-        expect(subject.all_secured_channel_ids(guardian)).to match_array(
+        Chat::DirectMessageUser.create!(user: user1, direct_message: dm_channel1)
+        expect(described_class.all_secured_channel_ids(guardian)).to match_array(
           [category_channel.id, direct_message_channel1.id],
         )
       end
 
       it "does not include the category channel if the category is a private category the user cannot see" do
         category_channel.update!(chatable: private_category)
-        expect(subject.all_secured_channel_ids(guardian)).to be_empty
+        expect(described_class.all_secured_channel_ids(guardian)).to be_empty
         GroupUser.create!(group: private_category.groups.last, user: user1)
-        expect(subject.all_secured_channel_ids(guardian)).to match_array([category_channel.id])
+        expect(described_class.all_secured_channel_ids(guardian)).to match_array(
+          [category_channel.id],
+        )
       end
 
       context "when restricted category" do
@@ -150,7 +161,7 @@ describe Chat::ChatChannelFetcher do
                 permission_type: CategoryGroup.permission_types[:readonly],
               ),
           )
-          expect(subject.all_secured_channel_ids(guardian)).to be_empty
+          expect(described_class.all_secured_channel_ids(guardian)).to be_empty
         end
 
         it "includes the category channel for member of group with create_post access" do
@@ -162,7 +173,9 @@ describe Chat::ChatChannelFetcher do
                 permission_type: CategoryGroup.permission_types[:create_post],
               ),
           )
-          expect(subject.all_secured_channel_ids(guardian)).to match_array([category_channel.id])
+          expect(described_class.all_secured_channel_ids(guardian)).to match_array(
+            [category_channel.id],
+          )
         end
 
         it "includes the category channel for member of group with full access" do
@@ -174,7 +187,9 @@ describe Chat::ChatChannelFetcher do
                 permission_type: CategoryGroup.permission_types[:full],
               ),
           )
-          expect(subject.all_secured_channel_ids(guardian)).to match_array([category_channel.id])
+          expect(described_class.all_secured_channel_ids(guardian)).to match_array(
+            [category_channel.id],
+          )
         end
       end
     end
@@ -185,15 +200,20 @@ describe Chat::ChatChannelFetcher do
 
     it "does not include DM channels" do
       expect(
-        subject.secured_public_channels(guardian, memberships, following: following).map(&:id),
+        described_class.secured_public_channels(guardian, following: following).map(&:id),
       ).to match_array([category_channel.id])
     end
 
+    it "returns an empty array when public channels are disabled" do
+      SiteSetting.enable_public_channels = false
+
+      expect(described_class.secured_public_channels(guardian, following: nil)).to be_empty
+    end
+
     it "can filter by channel name, or category name" do
       expect(
-        subject.secured_public_channels(
+        described_class.secured_public_channels(
           guardian,
-          memberships,
           following: following,
           filter: "support",
         ).map(&:id),
@@ -202,9 +222,8 @@ describe Chat::ChatChannelFetcher do
       category_channel.update!(name: "cool stuff")
 
       expect(
-        subject.secured_public_channels(
+        described_class.secured_public_channels(
           guardian,
-          memberships,
           following: following,
           filter: "cool stuff",
         ).map(&:id),
@@ -213,29 +232,29 @@ describe Chat::ChatChannelFetcher do
 
     it "can filter by an array of slugs" do
       expect(
-        subject.secured_public_channels(guardian, memberships, slugs: ["support"]).map(&:id),
+        described_class.secured_public_channels(guardian, slugs: ["support"]).map(&:id),
       ).to match_array([category_channel.id])
     end
 
     it "returns nothing if the array of slugs is empty" do
-      expect(subject.secured_public_channels(guardian, memberships, slugs: []).map(&:id)).to eq([])
+      expect(described_class.secured_public_channels(guardian, slugs: []).map(&:id)).to eq([])
     end
 
     it "can filter by status" do
       expect(
-        subject.secured_public_channels(guardian, memberships, status: "closed").map(&:id),
+        described_class.secured_public_channels(guardian, status: "closed").map(&:id),
       ).to match_array([])
 
       category_channel.closed!(Discourse.system_user)
 
       expect(
-        subject.secured_public_channels(guardian, memberships, status: "closed").map(&:id),
+        described_class.secured_public_channels(guardian, status: "closed").map(&:id),
       ).to match_array([category_channel.id])
     end
 
     it "can filter by following" do
       expect(
-        subject.secured_public_channels(guardian, memberships, following: true).map(&:id),
+        described_class.secured_public_channels(guardian, following: true).map(&:id),
       ).to be_blank
     end
 
@@ -244,35 +263,35 @@ describe Chat::ChatChannelFetcher do
       another_channel = Fabricate(:category_channel)
 
       expect(
-        subject.secured_public_channels(guardian, memberships, following: false).map(&:id),
+        described_class.secured_public_channels(guardian, following: false).map(&:id),
       ).to match_array([category_channel.id, another_channel.id])
     end
 
     it "ensures offset is >= 0" do
       expect(
-        subject.secured_public_channels(guardian, memberships, offset: -235).map(&:id),
+        described_class.secured_public_channels(guardian, offset: -235).map(&:id),
       ).to match_array([category_channel.id])
     end
 
     it "ensures limit is > 0" do
       expect(
-        subject.secured_public_channels(guardian, memberships, limit: -1, offset: 0).map(&:id),
+        described_class.secured_public_channels(guardian, limit: -1, offset: 0).map(&:id),
       ).to match_array([category_channel.id])
     end
 
     it "ensures limit has a max value" do
-      over_limit = Chat::ChatChannelFetcher::MAX_PUBLIC_CHANNEL_RESULTS + 1
+      over_limit = Chat::ChannelFetcher::MAX_PUBLIC_CHANNEL_RESULTS + 1
       over_limit.times { Fabricate(:category_channel) }
 
-      expect(
-        subject.secured_public_channels(guardian, memberships, limit: over_limit).length,
-      ).to eq(Chat::ChatChannelFetcher::MAX_PUBLIC_CHANNEL_RESULTS)
+      expect(described_class.secured_public_channels(guardian, limit: over_limit).length).to eq(
+        Chat::ChannelFetcher::MAX_PUBLIC_CHANNEL_RESULTS,
+      )
     end
 
     it "does not show the user category channels they cannot access" do
       category_channel.update!(chatable: private_category)
       expect(
-        subject.secured_public_channels(guardian, memberships, following: following).map(&:id),
+        described_class.secured_public_channels(guardian, following: following).map(&:id),
       ).to be_empty
     end
 
@@ -281,22 +300,22 @@ describe Chat::ChatChannelFetcher do
 
       it "only returns channels where the user is a member and is following the channel" do
         expect(
-          subject.secured_public_channels(guardian, memberships, following: following).map(&:id),
+          described_class.secured_public_channels(guardian, following: following).map(&:id),
         ).to be_empty
 
-        UserChatChannelMembership.create!(
+        Chat::UserChatChannelMembership.create!(
           user: user1,
           chat_channel: category_channel,
           following: true,
         )
 
         expect(
-          subject.secured_public_channels(guardian, memberships, following: following).map(&:id),
+          described_class.secured_public_channels(guardian, following: following).map(&:id),
         ).to match_array([category_channel.id])
       end
 
       it "includes the unread count based on mute settings" do
-        UserChatChannelMembership.create!(
+        Chat::UserChatChannelMembership.create!(
           user: user1,
           chat_channel: category_channel,
           following: true,
@@ -306,53 +325,49 @@ describe Chat::ChatChannelFetcher do
         Fabricate(:chat_message, user: user2, chat_channel: category_channel)
 
         resolved_memberships = memberships
-        subject.secured_public_channels(guardian, resolved_memberships, following: following)
+        result =
+          described_class.tracking_state(resolved_memberships.map(&:chat_channel_id), guardian)
 
-        expect(
-          resolved_memberships
-            .find { |membership| membership.chat_channel_id == category_channel.id }
-            .unread_count,
-        ).to eq(2)
-
-        resolved_memberships.last.update!(muted: true)
+        expect(result.channel_tracking[category_channel.id][:unread_count]).to eq(2)
 
         resolved_memberships = memberships
-        subject.secured_public_channels(guardian, resolved_memberships, following: following)
+        resolved_memberships.last.update!(muted: true)
+        result =
+          described_class.tracking_state(resolved_memberships.map(&:chat_channel_id), guardian)
 
-        expect(
-          resolved_memberships
-            .find { |membership| membership.chat_channel_id == category_channel.id }
-            .unread_count,
-        ).to eq(0)
+        expect(result.channel_tracking[category_channel.id][:unread_count]).to eq(0)
       end
     end
   end
 
-  describe "#secured_direct_message_channels" do
-    it "includes direct message channels the user is a member of ordered by last_message_sent_at" do
+  describe ".secured_direct_message_channels" do
+    it "includes direct message channels the user is a member of ordered by last_message.created_at" do
       Fabricate(
         :user_chat_channel_membership_for_dm,
         chat_channel: direct_message_channel1,
         user: user1,
         following: true,
       )
-      DirectMessageUser.create!(direct_message: dm_channel1, user: user1)
-      DirectMessageUser.create!(direct_message: dm_channel1, user: user2)
+      Chat::DirectMessageUser.create!(direct_message: dm_channel1, user: user1)
+      Chat::DirectMessageUser.create!(direct_message: dm_channel1, user: user2)
       Fabricate(
         :user_chat_channel_membership_for_dm,
         chat_channel: direct_message_channel2,
         user: user1,
         following: true,
       )
-      DirectMessageUser.create!(direct_message: dm_channel2, user: user1)
-      DirectMessageUser.create!(direct_message: dm_channel2, user: user2)
+      Chat::DirectMessageUser.create!(direct_message: dm_channel2, user: user1)
+      Chat::DirectMessageUser.create!(direct_message: dm_channel2, user: user2)
 
-      direct_message_channel1.update!(last_message_sent_at: 1.day.ago)
-      direct_message_channel2.update!(last_message_sent_at: 1.hour.ago)
+      Fabricate(:chat_message, user: user1, chat_channel: direct_message_channel1)
+      Fabricate(:chat_message, user: user1, chat_channel: direct_message_channel2)
 
-      expect(
-        subject.secured_direct_message_channels(user1.id, memberships, guardian).map(&:id),
-      ).to eq([direct_message_channel2.id, direct_message_channel1.id])
+      direct_message_channel1.last_message.update!(created_at: 1.day.ago)
+      direct_message_channel2.last_message.update!(created_at: 1.hour.ago)
+
+      expect(described_class.secured_direct_message_channels(user1.id, guardian).map(&:id)).to eq(
+        [direct_message_channel2.id, direct_message_channel1.id],
+      )
     end
 
     it "does not include direct message channels where the user is a member but not a direct_message_user" do
@@ -362,10 +377,10 @@ describe Chat::ChatChannelFetcher do
         user: user1,
         following: true,
       )
-      DirectMessageUser.create!(direct_message: dm_channel1, user: user2)
+      Chat::DirectMessageUser.create!(direct_message: dm_channel1, user: user2)
 
       expect(
-        subject.secured_direct_message_channels(user1.id, memberships, guardian).map(&:id),
+        described_class.secured_direct_message_channels(user1.id, guardian).map(&:id),
       ).not_to include(direct_message_channel1.id)
     end
 
@@ -377,44 +392,46 @@ describe Chat::ChatChannelFetcher do
           user: user1,
           following: true,
         )
-      DirectMessageUser.create!(direct_message: dm_channel1, user: user1)
-      DirectMessageUser.create!(direct_message: dm_channel1, user: user2)
+      Chat::DirectMessageUser.create!(direct_message: dm_channel1, user: user1)
+      Chat::DirectMessageUser.create!(direct_message: dm_channel1, user: user2)
 
       Fabricate(:chat_message, user: user2, chat_channel: direct_message_channel1)
       Fabricate(:chat_message, user: user2, chat_channel: direct_message_channel1)
       resolved_memberships = memberships
 
-      subject.secured_direct_message_channels(user1.id, resolved_memberships, guardian)
       target_membership =
         resolved_memberships.find { |mem| mem.chat_channel_id == direct_message_channel1.id }
-      expect(target_membership.unread_count).to eq(2)
+      result = described_class.tracking_state([direct_message_channel1.id], guardian)
+      expect(result.channel_tracking[target_membership.chat_channel_id][:unread_count]).to eq(2)
 
       resolved_memberships = memberships
       target_membership =
         resolved_memberships.find { |mem| mem.chat_channel_id == direct_message_channel1.id }
       target_membership.update!(muted: true)
-      subject.secured_direct_message_channels(user1.id, resolved_memberships, guardian)
-      expect(target_membership.unread_count).to eq(0)
+      result = described_class.tracking_state([direct_message_channel1.id], guardian)
+      expect(result.channel_tracking[target_membership.chat_channel_id][:unread_count]).to eq(0)
     end
   end
 
   describe ".find_with_access_check" do
     it "raises NotFound if the channel does not exist" do
       category_channel.destroy!
-      expect { subject.find_with_access_check(category_channel.id, guardian) }.to raise_error(
-        Discourse::NotFound,
-      )
+      expect {
+        described_class.find_with_access_check(category_channel.id, guardian)
+      }.to raise_error(Discourse::NotFound)
     end
 
     it "raises InvalidAccess if the user cannot see the channel" do
       category_channel.update!(chatable: private_category)
-      expect { subject.find_with_access_check(category_channel.id, guardian) }.to raise_error(
-        Discourse::InvalidAccess,
-      )
+      expect {
+        described_class.find_with_access_check(category_channel.id, guardian)
+      }.to raise_error(Discourse::InvalidAccess)
     end
 
     it "returns the chat channel if it is found and accessible" do
-      expect(subject.find_with_access_check(category_channel.id, guardian)).to eq(category_channel)
+      expect(described_class.find_with_access_check(category_channel.id, guardian)).to eq(
+        category_channel,
+      )
     end
   end
 end
diff --git a/plugins/chat/spec/lib/chat_channel_hashtag_data_source_spec.rb b/plugins/chat/spec/lib/chat/channel_hashtag_data_source_spec.rb
similarity index 92%
rename from plugins/chat/spec/lib/chat_channel_hashtag_data_source_spec.rb
rename to plugins/chat/spec/lib/chat/channel_hashtag_data_source_spec.rb
index cf7de252b76..87c44e90e1c 100644
--- a/plugins/chat/spec/lib/chat_channel_hashtag_data_source_spec.rb
+++ b/plugins/chat/spec/lib/chat/channel_hashtag_data_source_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe Chat::ChatChannelHashtagDataSource do
+RSpec.describe Chat::ChannelHashtagDataSource do
   fab!(:user) { Fabricate(:user) }
   fab!(:category) { Fabricate(:category) }
   fab!(:group) { Fabricate(:group) }
@@ -32,6 +32,18 @@ RSpec.describe Chat::ChatChannelHashtagDataSource do
     Group.refresh_automatic_groups!
   end
 
+  describe "#enabled?" do
+    it "returns false if public channels are disabled" do
+      SiteSetting.enable_public_channels = false
+      expect(described_class.enabled?).to eq(false)
+    end
+
+    it "returns true if public channels are disabled" do
+      SiteSetting.enable_public_channels = true
+      expect(described_class.enabled?).to eq(true)
+    end
+  end
+
   describe "#lookup" do
     it "finds a channel by a slug" do
       result = described_class.lookup(guardian, ["random"]).first
@@ -41,6 +53,7 @@ RSpec.describe Chat::ChatChannelHashtagDataSource do
           text: "Zany Things",
           description: "Just weird stuff",
           icon: "comment",
+          id: channel1.id,
           type: "channel",
           ref: nil,
           slug: "random",
@@ -60,6 +73,7 @@ RSpec.describe Chat::ChatChannelHashtagDataSource do
           text: "Secret Stuff",
           description: nil,
           icon: "comment",
+          id: channel2.id,
           type: "channel",
           ref: nil,
           slug: "secret",
@@ -94,6 +108,7 @@ RSpec.describe Chat::ChatChannelHashtagDataSource do
           text: "Zany Things",
           description: "Just weird stuff",
           icon: "comment",
+          id: channel1.id,
           type: "channel",
           ref: nil,
           slug: "random",
@@ -109,6 +124,7 @@ RSpec.describe Chat::ChatChannelHashtagDataSource do
           text: "Zany Things",
           description: "Just weird stuff",
           icon: "comment",
+          id: channel1.id,
           type: "channel",
           ref: nil,
           slug: "random",
@@ -127,6 +143,7 @@ RSpec.describe Chat::ChatChannelHashtagDataSource do
           text: "Secret Stuff",
           description: nil,
           icon: "comment",
+          id: channel2.id,
           type: "channel",
           ref: nil,
           slug: "secret",
diff --git a/plugins/chat/spec/lib/chat_channel_membership_manager_spec.rb b/plugins/chat/spec/lib/chat/channel_membership_manager_spec.rb
similarity index 86%
rename from plugins/chat/spec/lib/chat_channel_membership_manager_spec.rb
rename to plugins/chat/spec/lib/chat/channel_membership_manager_spec.rb
index f5c9c694792..ac96a8fb979 100644
--- a/plugins/chat/spec/lib/chat_channel_membership_manager_spec.rb
+++ b/plugins/chat/spec/lib/chat/channel_membership_manager_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe Chat::ChatChannelMembershipManager do
+RSpec.describe Chat::ChannelMembershipManager do
   fab!(:user) { Fabricate(:user) }
   fab!(:channel1) { Fabricate(:category_channel) }
   fab!(:channel2) { Fabricate(:category_channel) }
@@ -31,7 +31,7 @@ RSpec.describe Chat::ChatChannelMembershipManager do
     it "creates a membership if one does not exist for the user and channel already" do
       membership = nil
       expect { membership = described_class.new(channel1).follow(user) }.to change {
-        UserChatChannelMembership.count
+        Chat::UserChatChannelMembership.count
       }.by(1)
       expect(membership.following).to eq(true)
       expect(membership.chat_channel).to eq(channel1)
@@ -41,7 +41,12 @@ RSpec.describe Chat::ChatChannelMembershipManager do
     it "enqueues user_count recalculation and marks user_count_stale as true" do
       described_class.new(channel1).follow(user)
       expect(channel1.reload.user_count_stale).to eq(true)
-      expect_job_enqueued(job: :update_channel_user_count, args: { chat_channel_id: channel1.id })
+      expect_job_enqueued(
+        job: Jobs::Chat::UpdateChannelUserCount,
+        args: {
+          chat_channel_id: channel1.id,
+        },
+      )
     end
 
     it "updates the membership to following if it already existed" do
@@ -53,7 +58,7 @@ RSpec.describe Chat::ChatChannelMembershipManager do
           following: false,
         )
       expect { membership = described_class.new(channel1).follow(user) }.not_to change {
-        UserChatChannelMembership.count
+        Chat::UserChatChannelMembership.count
       }
       expect(membership.reload.following).to eq(true)
     end
@@ -76,7 +81,12 @@ RSpec.describe Chat::ChatChannelMembershipManager do
       membership.reload
       expect(membership.following).to eq(false)
       expect(channel1.reload.user_count_stale).to eq(true)
-      expect_job_enqueued(job: :update_channel_user_count, args: { chat_channel_id: channel1.id })
+      expect_job_enqueued(
+        job: Jobs::Chat::UpdateChannelUserCount,
+        args: {
+          chat_channel_id: channel1.id,
+        },
+      )
     end
 
     it "does not recalculate user count if the user was already not following the channel" do
@@ -88,7 +98,7 @@ RSpec.describe Chat::ChatChannelMembershipManager do
           following: false,
         )
       expect_not_enqueued_with(
-        job: :update_channel_user_count,
+        job: Jobs::Chat::UpdateChannelUserCount,
         args: {
           chat_channel_id: channel1.id,
         },
diff --git a/plugins/chat/spec/lib/duplicate_message_validator_spec.rb b/plugins/chat/spec/lib/chat/duplicate_message_validator_spec.rb
similarity index 100%
rename from plugins/chat/spec/lib/duplicate_message_validator_spec.rb
rename to plugins/chat/spec/lib/chat/duplicate_message_validator_spec.rb
diff --git a/plugins/chat/spec/lib/guardian_extensions_spec.rb b/plugins/chat/spec/lib/chat/guardian_extensions_spec.rb
similarity index 77%
rename from plugins/chat/spec/lib/guardian_extensions_spec.rb
rename to plugins/chat/spec/lib/chat/guardian_extensions_spec.rb
index e2e4c4cbc70..2501d208e13 100644
--- a/plugins/chat/spec/lib/guardian_extensions_spec.rb
+++ b/plugins/chat/spec/lib/chat/guardian_extensions_spec.rb
@@ -3,7 +3,8 @@
 require "rails_helper"
 
 RSpec.describe Chat::GuardianExtensions do
-  fab!(:user) { Fabricate(:user) }
+  fab!(:chatters) { Fabricate(:group) }
+  fab!(:user) { Fabricate(:user, group_ids: [chatters.id]) }
   fab!(:staff) { Fabricate(:user, admin: true) }
   fab!(:chat_group) { Fabricate(:group) }
   fab!(:channel) { Fabricate(:category_channel) }
@@ -11,6 +12,8 @@ RSpec.describe Chat::GuardianExtensions do
   let(:guardian) { Guardian.new(user) }
   let(:staff_guardian) { Guardian.new(staff) }
 
+  before { SiteSetting.chat_allowed_groups = [chatters] }
+
   it "cannot chat if the user is not in the Chat.allowed_group_ids" do
     SiteSetting.chat_allowed_groups = ""
     expect(guardian.can_chat?).to eq(false)
@@ -82,7 +85,7 @@ RSpec.describe Chat::GuardianExtensions do
         end
 
         it "returns true if the user is part of the direct message" do
-          DirectMessageUser.create!(user: user, direct_message: chatable)
+          Chat::DirectMessageUser.create!(user: user, direct_message: chatable)
           expect(guardian.can_join_chat_channel?(channel)).to eq(true)
         end
       end
@@ -125,6 +128,112 @@ RSpec.describe Chat::GuardianExtensions do
       end
     end
 
+    describe "#can_post_in_chatable?" do
+      alias_matcher :be_able_to_post_in_chatable, :be_can_post_in_chatable
+
+      context "when channel is a category channel" do
+        context "when post_allowed_category_ids given" do
+          context "when no chatable given" do
+            it "returns false" do
+              expect(guardian).not_to be_able_to_post_in_chatable(
+                nil,
+                post_allowed_category_ids: [channel.chatable.id],
+              )
+            end
+          end
+
+          context "when user is anonymous" do
+            it "returns false" do
+              expect(Guardian.new).not_to be_able_to_post_in_chatable(
+                channel.chatable,
+                post_allowed_category_ids: [channel.chatable.id],
+              )
+            end
+          end
+
+          context "when user is admin" do
+            it "returns true" do
+              guardian = Fabricate(:admin).guardian
+              expect(guardian).to be_able_to_post_in_chatable(
+                channel.chatable,
+                post_allowed_category_ids: [channel.chatable.id],
+              )
+            end
+          end
+
+          context "when chatable id is part of allowed ids" do
+            it "returns true" do
+              expect(guardian).to be_able_to_post_in_chatable(
+                channel.chatable,
+                post_allowed_category_ids: [channel.chatable.id],
+              )
+            end
+          end
+
+          context "when chatable id is not part of allowed ids" do
+            it "returns false" do
+              expect(guardian).not_to be_able_to_post_in_chatable(
+                channel.chatable,
+                post_allowed_category_ids: [-1],
+              )
+            end
+          end
+        end
+
+        context "when no post_allowed_category_ids given" do
+          context "when no chatable given" do
+            it "returns false" do
+              expect(guardian).not_to be_able_to_post_in_chatable(nil)
+            end
+          end
+
+          context "when user is anonymous" do
+            it "returns false" do
+              expect(Guardian.new).not_to be_able_to_post_in_chatable(channel.chatable)
+            end
+          end
+
+          context "when user is admin" do
+            it "returns true" do
+              guardian = Fabricate(:admin).guardian
+              expect(guardian).to be_able_to_post_in_chatable(channel.chatable)
+            end
+          end
+
+          context "when chatable id is part of allowed ids" do
+            it "returns true" do
+              expect(guardian).to be_able_to_post_in_chatable(channel.chatable)
+            end
+          end
+
+          context "when user can't post in chatable" do
+            fab!(:group) { Fabricate(:group) }
+            fab!(:channel) { Fabricate(:private_category_channel, group: group) }
+
+            before do
+              channel.chatable.category_groups.first.update!(
+                permission_type: CategoryGroup.permission_types[:readonly],
+              )
+              group.add(user)
+              channel.add(user)
+            end
+
+            it "returns false" do
+              expect(guardian).not_to be_able_to_post_in_chatable(channel.chatable)
+            end
+          end
+        end
+      end
+
+      context "when channel is a direct message channel" do
+        let(:channel) { Fabricate(:direct_message_channel) }
+
+        it "returns true" do
+          expect(guardian).to be_able_to_post_in_chatable(channel.chatable)
+        end
+      end
+    end
+
     describe "#can_flag_in_chat_channel?" do
       alias_matcher :be_able_to_flag_in_chat_channel, :be_can_flag_in_chat_channel
 
@@ -206,7 +315,7 @@ RSpec.describe Chat::GuardianExtensions do
       end
 
       context "for DM channel" do
-        fab!(:dm_channel) { DirectMessage.create! }
+        fab!(:dm_channel) { Chat::DirectMessage.create! }
 
         before { channel.update(chatable_type: "DirectMessageType", chatable: dm_channel) }
 
@@ -234,12 +343,18 @@ RSpec.describe Chat::GuardianExtensions do
       end
 
       context "when chatable is a direct message" do
-        fab!(:chatable) { DirectMessage.create! }
+        fab!(:chatable) { Chat::DirectMessage.create! }
 
-        it "allows owner to restore" do
+        it "allows owner to restore when deleted by owner" do
+          message.trash!(guardian.user)
           expect(guardian.can_restore_chat?(message, chatable)).to eq(true)
         end
 
+        it "disallow owner to restore when deleted by staff" do
+          message.trash!(staff_guardian.user)
+          expect(guardian.can_restore_chat?(message, chatable)).to eq(false)
+        end
+
         it "allows staff to restore" do
           expect(staff_guardian.can_restore_chat?(message, chatable)).to eq(true)
         end
@@ -284,7 +399,7 @@ RSpec.describe Chat::GuardianExtensions do
           end
 
           context "when chatable is a direct message" do
-            fab!(:chatable) { DirectMessage.create! }
+            fab!(:chatable) { Chat::DirectMessage.create! }
 
             it "allows staff to restore" do
               expect(staff_guardian.can_restore_chat?(message, chatable)).to eq(true)
@@ -317,15 +432,21 @@ RSpec.describe Chat::GuardianExtensions do
         end
 
         context "when chatable is a direct message" do
-          fab!(:chatable) { DirectMessage.create! }
+          fab!(:chatable) { Chat::DirectMessage.create! }
 
           it "allows staff to restore" do
             expect(staff_guardian.can_restore_chat?(message, chatable)).to eq(true)
           end
 
-          it "allows owner to restore" do
+          it "allows owner to restore when deleted by owner" do
+            message.trash!(guardian.user)
             expect(guardian.can_restore_chat?(message, chatable)).to eq(true)
           end
+
+          it "disallow owner to restore when deleted by staff" do
+            message.trash!(staff_guardian.user)
+            expect(guardian.can_restore_chat?(message, chatable)).to eq(false)
+          end
         end
       end
     end
diff --git a/plugins/chat/spec/lib/chat_message_bookmarkable_spec.rb b/plugins/chat/spec/lib/chat/message_bookmarkable_spec.rb
similarity index 61%
rename from plugins/chat/spec/lib/chat_message_bookmarkable_spec.rb
rename to plugins/chat/spec/lib/chat/message_bookmarkable_spec.rb
index a78aa55588c..f5d050dcf77 100644
--- a/plugins/chat/spec/lib/chat_message_bookmarkable_spec.rb
+++ b/plugins/chat/spec/lib/chat/message_bookmarkable_spec.rb
@@ -2,8 +2,11 @@
 
 require "rails_helper"
 
-describe ChatMessageBookmarkable do
-  fab!(:user) { Fabricate(:user) }
+describe Chat::MessageBookmarkable do
+  subject(:registered_bookmarkable) { RegisteredBookmarkable.new(described_class) }
+
+  fab!(:chatters) { Fabricate(:group) }
+  fab!(:user) { Fabricate(:user, group_ids: [chatters.id]) }
   fab!(:guardian) { Guardian.new(user) }
   fab!(:other_category) { Fabricate(:private_category, group: Fabricate(:group)) }
   fab!(:category_channel) { Fabricate(:category_channel, chatable: other_category) }
@@ -11,10 +14,13 @@ describe ChatMessageBookmarkable do
   fab!(:channel) { Fabricate(:category_channel) }
 
   before do
-    Bookmark.register_bookmarkable(ChatMessageBookmarkable)
-    UserChatChannelMembership.create(chat_channel: channel, user: user, following: true)
+    register_test_bookmarkable(described_class)
+    Chat::UserChatChannelMembership.create(chat_channel: channel, user: user, following: true)
+    SiteSetting.chat_allowed_groups = [chatters]
   end
 
+  after { DiscoursePluginRegistry.reset_register!(:bookmarkables) }
+
   let!(:message1) { Fabricate(:chat_message, chat_channel: channel) }
   let!(:message2) { Fabricate(:chat_message, chat_channel: channel) }
   let!(:bookmark1) do
@@ -23,23 +29,21 @@ describe ChatMessageBookmarkable do
   let!(:bookmark2) { Fabricate(:bookmark, user: user, bookmarkable: message2) }
   let!(:bookmark3) { Fabricate(:bookmark) }
 
-  subject { RegisteredBookmarkable.new(ChatMessageBookmarkable) }
-
   describe "#perform_list_query" do
     it "returns all the user's bookmarks" do
-      expect(subject.perform_list_query(user, guardian).map(&:id)).to match_array(
+      expect(registered_bookmarkable.perform_list_query(user, guardian).map(&:id)).to match_array(
         [bookmark1.id, bookmark2.id],
       )
     end
 
     it "does not return bookmarks for messages inside category chat channels the user cannot access" do
       channel.update(chatable: other_category)
-      expect(subject.perform_list_query(user, guardian)).to eq(nil)
+      expect(registered_bookmarkable.perform_list_query(user, guardian)).to eq(nil)
       other_category.groups.last.add(user)
       bookmark1.reload
       user.reload
       guardian = Guardian.new(user)
-      expect(subject.perform_list_query(user, guardian).map(&:id)).to match_array(
+      expect(registered_bookmarkable.perform_list_query(user, guardian).map(&:id)).to match_array(
         [bookmark1.id, bookmark2.id],
       )
     end
@@ -47,12 +51,12 @@ describe ChatMessageBookmarkable do
     it "does not return bookmarks for messages inside direct message chat channels the user cannot access" do
       direct_message = Fabricate(:direct_message)
       channel.update(chatable: direct_message)
-      expect(subject.perform_list_query(user, guardian)).to eq(nil)
-      DirectMessageUser.create(user: user, direct_message: direct_message)
+      expect(registered_bookmarkable.perform_list_query(user, guardian)).to eq(nil)
+      Chat::DirectMessageUser.create(user: user, direct_message: direct_message)
       bookmark1.reload
       user.reload
       guardian = Guardian.new(user)
-      expect(subject.perform_list_query(user, guardian).map(&:id)).to match_array(
+      expect(registered_bookmarkable.perform_list_query(user, guardian).map(&:id)).to match_array(
         [bookmark1.id, bookmark2.id],
       )
     end
@@ -60,7 +64,9 @@ describe ChatMessageBookmarkable do
     it "does not return bookmarks for deleted messages" do
       message1.trash!
       guardian = Guardian.new(user)
-      expect(subject.perform_list_query(user, guardian).map(&:id)).to match_array([bookmark2.id])
+      expect(registered_bookmarkable.perform_list_query(user, guardian).map(&:id)).to match_array(
+        [bookmark2.id],
+      )
     end
   end
 
@@ -70,8 +76,8 @@ describe ChatMessageBookmarkable do
     it "returns bookmarks that match by name" do
       ts_query = Search.ts_query(term: "gotta", ts_config: "simple")
       expect(
-        subject.perform_search_query(
-          subject.perform_list_query(user, guardian),
+        registered_bookmarkable.perform_search_query(
+          registered_bookmarkable.perform_list_query(user, guardian),
           "%gotta%",
           ts_query,
         ).map(&:id),
@@ -83,8 +89,8 @@ describe ChatMessageBookmarkable do
 
       ts_query = Search.ts_query(term: "good soup", ts_config: "simple")
       expect(
-        subject.perform_search_query(
-          subject.perform_list_query(user, guardian),
+        registered_bookmarkable.perform_search_query(
+          registered_bookmarkable.perform_list_query(user, guardian),
           "%good soup%",
           ts_query,
         ).map(&:id),
@@ -92,8 +98,8 @@ describe ChatMessageBookmarkable do
 
       ts_query = Search.ts_query(term: "blah", ts_config: "simple")
       expect(
-        subject.perform_search_query(
-          subject.perform_list_query(user, guardian),
+        registered_bookmarkable.perform_search_query(
+          registered_bookmarkable.perform_list_query(user, guardian),
           "%blah%",
           ts_query,
         ).map(&:id),
@@ -103,23 +109,23 @@ describe ChatMessageBookmarkable do
 
   describe "#can_send_reminder?" do
     it "cannot send the reminder if the message or channel is deleted" do
-      expect(subject.can_send_reminder?(bookmark1)).to eq(true)
+      expect(registered_bookmarkable.can_send_reminder?(bookmark1)).to eq(true)
       bookmark1.bookmarkable.trash!
       bookmark1.reload
-      expect(subject.can_send_reminder?(bookmark1)).to eq(false)
-      ChatMessage.with_deleted.find_by(id: bookmark1.bookmarkable_id).recover!
+      expect(registered_bookmarkable.can_send_reminder?(bookmark1)).to eq(false)
+      Chat::Message.with_deleted.find_by(id: bookmark1.bookmarkable_id).recover!
       bookmark1.reload
       bookmark1.bookmarkable.chat_channel.trash!
       bookmark1.reload
-      expect(subject.can_send_reminder?(bookmark1)).to eq(false)
+      expect(registered_bookmarkable.can_send_reminder?(bookmark1)).to eq(false)
     end
   end
 
   describe "#reminder_handler" do
     it "creates a notification for the user with the correct details" do
-      expect { subject.send_reminder_notification(bookmark1) }.to change { Notification.count }.by(
-        1,
-      )
+      expect { registered_bookmarkable.send_reminder_notification(bookmark1) }.to change {
+        Notification.count
+      }.by(1)
       notification = user.notifications.last
       expect(notification.notification_type).to eq(Notification.types[:bookmark_reminder])
       expect(notification.data).to eq(
@@ -140,38 +146,44 @@ describe ChatMessageBookmarkable do
 
   describe "#can_see?" do
     it "returns false if the chat message is in a channel the user cannot see" do
-      expect(subject.can_see?(guardian, bookmark1)).to eq(true)
+      expect(registered_bookmarkable.can_see?(guardian, bookmark1)).to eq(true)
       bookmark1.bookmarkable.chat_channel.update!(chatable: private_category)
-      expect(subject.can_see?(guardian, bookmark1)).to eq(false)
+      expect(registered_bookmarkable.can_see?(guardian, bookmark1)).to eq(false)
       private_category.groups.last.add(user)
       bookmark1.reload
       user.reload
       guardian = Guardian.new(user)
-      expect(subject.can_see?(guardian, bookmark1)).to eq(true)
+      expect(registered_bookmarkable.can_see?(guardian, bookmark1)).to eq(true)
     end
   end
 
   describe "#validate_before_create" do
     it "raises InvalidAccess if the user cannot see the chat channel" do
-      expect { subject.validate_before_create(guardian, bookmark1.bookmarkable) }.not_to raise_error
+      expect {
+        registered_bookmarkable.validate_before_create(guardian, bookmark1.bookmarkable)
+      }.not_to raise_error
       bookmark1.bookmarkable.chat_channel.update!(chatable: private_category)
-      expect { subject.validate_before_create(guardian, bookmark1.bookmarkable) }.to raise_error(
-        Discourse::InvalidAccess,
-      )
+      expect {
+        registered_bookmarkable.validate_before_create(guardian, bookmark1.bookmarkable)
+      }.to raise_error(Discourse::InvalidAccess)
       private_category.groups.last.add(user)
       bookmark1.reload
       user.reload
       guardian = Guardian.new(user)
-      expect { subject.validate_before_create(guardian, bookmark1.bookmarkable) }.not_to raise_error
+      expect {
+        registered_bookmarkable.validate_before_create(guardian, bookmark1.bookmarkable)
+      }.not_to raise_error
     end
 
     it "raises InvalidAccess if the chat message is deleted" do
-      expect { subject.validate_before_create(guardian, bookmark1.bookmarkable) }.not_to raise_error
+      expect {
+        registered_bookmarkable.validate_before_create(guardian, bookmark1.bookmarkable)
+      }.not_to raise_error
       bookmark1.bookmarkable.trash!
       bookmark1.reload
-      expect { subject.validate_before_create(guardian, bookmark1.bookmarkable) }.to raise_error(
-        Discourse::InvalidAccess,
-      )
+      expect {
+        registered_bookmarkable.validate_before_create(guardian, bookmark1.bookmarkable)
+      }.to raise_error(Discourse::InvalidAccess)
     end
   end
 
@@ -180,7 +192,7 @@ describe ChatMessageBookmarkable do
       bookmark_post = Fabricate(:bookmark, bookmarkable: Fabricate(:post))
       bookmark1.bookmarkable.trash!
       bookmark1.bookmarkable.update!(deleted_at: 4.days.ago)
-      subject.cleanup_deleted
+      registered_bookmarkable.cleanup_deleted
       expect(Bookmark.exists?(id: bookmark1.id)).to eq(false)
       expect(Bookmark.exists?(id: bookmark2.id)).to eq(true)
       expect(Bookmark.exists?(id: bookmark_post.id)).to eq(true)
diff --git a/plugins/chat/spec/lib/chat/message_mover_spec.rb b/plugins/chat/spec/lib/chat/message_mover_spec.rb
new file mode 100644
index 00000000000..c458a7d749f
--- /dev/null
+++ b/plugins/chat/spec/lib/chat/message_mover_spec.rb
@@ -0,0 +1,265 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+describe Chat::MessageMover do
+  fab!(:acting_user) { Fabricate(:admin, username: "testmovechat") }
+  fab!(:source_channel) { Fabricate(:category_channel) }
+  fab!(:destination_channel) { Fabricate(:category_channel) }
+
+  fab!(:message1) do
+    Fabricate(
+      :chat_message,
+      chat_channel: source_channel,
+      created_at: 3.minutes.ago,
+      message: "the first to be moved",
+    )
+  end
+  fab!(:message2) do
+    Fabricate(
+      :chat_message,
+      chat_channel: source_channel,
+      created_at: 2.minutes.ago,
+      message: "message deux @testmovechat",
+    )
+  end
+  fab!(:message3) do
+    Fabricate(
+      :chat_message,
+      chat_channel: source_channel,
+      created_at: 1.minute.ago,
+      message: "the third message",
+    )
+  end
+  fab!(:message4) { Fabricate(:chat_message, chat_channel: destination_channel) }
+  fab!(:message5) { Fabricate(:chat_message, chat_channel: destination_channel) }
+  fab!(:message6) { Fabricate(:chat_message, chat_channel: destination_channel) }
+  let(:move_message_ids) { [message1.id, message2.id, message3.id] }
+
+  describe "#move_to_channel" do
+    def move!(move_message_ids = [message1.id, message2.id, message3.id])
+      described_class.new(
+        acting_user: acting_user,
+        source_channel: source_channel,
+        message_ids: move_message_ids,
+      ).move_to_channel(destination_channel)
+    end
+
+    it "raises an error if either the source or destination channels are not public (they cannot be DM channels)" do
+      expect {
+        described_class.new(
+          acting_user: acting_user,
+          source_channel: Fabricate(:direct_message_channel),
+          message_ids: move_message_ids,
+        ).move_to_channel(destination_channel)
+      }.to raise_error(Chat::MessageMover::InvalidChannel)
+      expect {
+        described_class.new(
+          acting_user: acting_user,
+          source_channel: source_channel,
+          message_ids: move_message_ids,
+        ).move_to_channel(Fabricate(:direct_message_channel))
+      }.to raise_error(Chat::MessageMover::InvalidChannel)
+    end
+
+    it "raises an error if no messages are found using the message ids" do
+      other_channel = Fabricate(:chat_channel)
+      message1.update(chat_channel: other_channel)
+      message2.update(chat_channel: other_channel)
+      message3.update(chat_channel: other_channel)
+      expect { move! }.to raise_error(Chat::MessageMover::NoMessagesFound)
+    end
+
+    it "deletes the messages from the source channel and sends messagebus delete messages" do
+      messages = MessageBus.track_publish { move! }
+      expect(Chat::Message.where(id: move_message_ids)).to eq([])
+      deleted_messages = Chat::Message.with_deleted.where(id: move_message_ids).order(:id)
+      expect(deleted_messages.count).to eq(3)
+      expect(messages.first.channel).to eq("/chat/#{source_channel.id}")
+      expect(messages.first.data["type"]).to eq("bulk_delete")
+      expect(messages.first.data["deleted_ids"]).to eq(deleted_messages.map(&:id))
+      expect(messages.first.data["deleted_at"]).not_to eq(nil)
+    end
+
+    it "creates a message in the source channel to indicate that the messages have been moved" do
+      move!
+      placeholder_message =
+        Chat::Message.where(chat_channel: source_channel).order(:created_at).last
+      destination_first_moved_message =
+        Chat::Message.find_by(chat_channel: destination_channel, message: "the first to be moved")
+      expect(placeholder_message.message).to eq(
+        I18n.t(
+          "chat.channel.messages_moved",
+          count: move_message_ids.length,
+          acting_username: acting_user.username,
+          channel_name: destination_channel.title(acting_user),
+          first_moved_message_url: destination_first_moved_message.url,
+        ),
+      )
+    end
+
+    it "preserves the order of the messages in the destination channel" do
+      move!
+      moved_messages =
+        Chat::Message
+          .where(chat_channel: destination_channel)
+          .order("created_at ASC, id ASC")
+          .last(3)
+      expect(moved_messages.map(&:message)).to eq(
+        ["the first to be moved", "message deux @testmovechat", "the third message"],
+      )
+    end
+
+    it "updates references for reactions, uploads, revisions, mentions, etc." do
+      reaction = Fabricate(:chat_message_reaction, chat_message: message1)
+      upload = Fabricate(:upload_reference, target: message1)
+      mention = Fabricate(:chat_mention, chat_message: message2, user: acting_user)
+      revision = Fabricate(:chat_message_revision, chat_message: message3)
+      webhook_event = Fabricate(:chat_webhook_event, chat_message: message3)
+      move!
+
+      moved_messages =
+        Chat::Message
+          .where(chat_channel: destination_channel)
+          .order("created_at ASC, id ASC")
+          .last(3)
+      expect(reaction.reload.chat_message_id).to eq(moved_messages.first.id)
+      expect(upload.reload.target_id).to eq(moved_messages.first.id)
+      expect(mention.reload.chat_message_id).to eq(moved_messages.second.id)
+      expect(revision.reload.chat_message_id).to eq(moved_messages.third.id)
+      expect(webhook_event.reload.chat_message_id).to eq(moved_messages.third.id)
+    end
+
+    it "does not preserve reply chains using in_reply_to_id" do
+      message3.update!(in_reply_to: message2)
+      message2.update!(in_reply_to: message1)
+      move!
+      moved_messages =
+        Chat::Message
+          .where(chat_channel: destination_channel)
+          .order("created_at ASC, id ASC")
+          .last(3)
+
+      expect(moved_messages.pluck(:in_reply_to_id).uniq).to eq([nil])
+    end
+
+    it "clears in_reply_to_id for remaining messages when the messages they were replying to are moved" do
+      message3.update!(in_reply_to: message2)
+      message2.update!(in_reply_to: message1)
+      move!([message2.id])
+      expect(message3.reload.in_reply_to_id).to eq(nil)
+    end
+
+    context "when there is a thread" do
+      fab!(:thread) { Fabricate(:chat_thread, channel: source_channel, original_message: message1) }
+
+      before do
+        message1.update!(thread: thread)
+        message2.update!(thread: thread)
+        message3.update!(thread: thread)
+      end
+
+      it "does not preserve thread_ids" do
+        move!
+        moved_messages =
+          Chat::Message
+            .where(chat_channel: destination_channel)
+            .order("created_at ASC, id ASC")
+            .last(3)
+
+        expect(moved_messages.pluck(:thread_id).uniq).to eq([nil])
+      end
+
+      it "deletes the empty thread" do
+        move!
+        expect(Chat::Thread.exists?(id: thread.id)).to eq(false)
+      end
+
+      it "clears in_reply_to_id for remaining messages when the messages they were replying to are moved but leaves the thread_id" do
+        message3.update!(in_reply_to: message2)
+        message2.update!(in_reply_to: message1)
+        move!([message2.id])
+        expect(message3.reload.in_reply_to_id).to eq(nil)
+        expect(message3.reload.thread).to eq(thread)
+      end
+
+      it "updates the tracking to the last non-deleted channel message for users whose last_read_message_id was the moved message" do
+        membership_1 =
+          Fabricate(
+            :user_chat_channel_membership,
+            chat_channel: source_channel,
+            last_read_message: message1,
+          )
+        membership_2 =
+          Fabricate(
+            :user_chat_channel_membership,
+            chat_channel: source_channel,
+            last_read_message: message2,
+          )
+        membership_3 =
+          Fabricate(
+            :user_chat_channel_membership,
+            chat_channel: source_channel,
+            last_read_message: message3,
+          )
+        move!([message2.id])
+        expect(membership_1.reload.last_read_message_id).to eq(message1.id)
+        expect(membership_2.reload.last_read_message_id).to eq(message3.id)
+        expect(membership_3.reload.last_read_message_id).to eq(message3.id)
+      end
+
+      context "when a thread original message is moved" do
+        it "creates a new thread for the messages left behind in the old channel" do
+          message4 =
+            Fabricate(
+              :chat_message,
+              chat_channel: source_channel,
+              message: "the fourth message",
+              in_reply_to: message3,
+              thread: thread,
+            )
+          message5 =
+            Fabricate(
+              :chat_message,
+              chat_channel: source_channel,
+              message: "the fifth message",
+              thread: thread,
+            )
+          expect { move! }.to change { Chat::Thread.count }.by(1)
+          new_thread = Chat::Thread.last
+          expect(message4.reload.thread_id).to eq(new_thread.id)
+          expect(message5.reload.thread_id).to eq(new_thread.id)
+          expect(new_thread.channel).to eq(source_channel)
+          expect(new_thread.original_message).to eq(message4)
+        end
+      end
+
+      context "when multiple thread original messages are moved" do
+        it "works the same as when one is" do
+          message4 =
+            Fabricate(:chat_message, chat_channel: source_channel, message: "the fourth message")
+          message5 =
+            Fabricate(
+              :chat_message,
+              chat_channel: source_channel,
+              in_reply_to: message5,
+              message: "the fifth message",
+            )
+          other_thread =
+            Fabricate(:chat_thread, channel: source_channel, original_message: message4)
+          message4.update!(thread: other_thread)
+          message5.update!(thread: other_thread)
+          expect { move!([message1.id, message4.id]) }.to change { Chat::Thread.count }.by(2)
+
+          new_threads = Chat::Thread.order(:created_at).last(2)
+          expect(message3.reload.thread_id).to eq(new_threads.first.id)
+          expect(message5.reload.thread_id).to eq(new_threads.second.id)
+          expect(new_threads.first.channel).to eq(source_channel)
+          expect(new_threads.second.channel).to eq(source_channel)
+          expect(new_threads.first.original_message).to eq(message2)
+          expect(new_threads.second.original_message).to eq(message5)
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/lib/chat_message_processor_spec.rb b/plugins/chat/spec/lib/chat/message_processor_spec.rb
similarity index 57%
rename from plugins/chat/spec/lib/chat_message_processor_spec.rb
rename to plugins/chat/spec/lib/chat/message_processor_spec.rb
index 3fdbd19baa7..2fb51caf257 100644
--- a/plugins/chat/spec/lib/chat_message_processor_spec.rb
+++ b/plugins/chat/spec/lib/chat/message_processor_spec.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-RSpec.describe Chat::ChatMessageProcessor do
+RSpec.describe Chat::MessageProcessor do
   fab!(:message) { Fabricate(:chat_message) }
 
   it "cooks using the last_editor_id of the message" do
-    ChatMessage.expects(:cook).with(message.message, user_id: message.last_editor_id)
+    Chat::Message.expects(:cook).with(message.message, user_id: message.last_editor_id)
     described_class.new(message)
   end
 end
diff --git a/plugins/chat/spec/lib/chat_message_reactor_spec.rb b/plugins/chat/spec/lib/chat/message_reactor_spec.rb
similarity index 67%
rename from plugins/chat/spec/lib/chat_message_reactor_spec.rb
rename to plugins/chat/spec/lib/chat/message_reactor_spec.rb
index 565fab80db1..6efe970e746 100644
--- a/plugins/chat/spec/lib/chat_message_reactor_spec.rb
+++ b/plugins/chat/spec/lib/chat/message_reactor_spec.rb
@@ -2,41 +2,44 @@
 
 require "rails_helper"
 
-describe Chat::ChatMessageReactor do
+describe Chat::MessageReactor do
+  subject(:message_reactor) { described_class.new(reacting_user, channel) }
+
   fab!(:reacting_user) { Fabricate(:user) }
   fab!(:channel) { Fabricate(:category_channel) }
   fab!(:reactor) { described_class.new(reacting_user, channel) }
   fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel, user: reacting_user) }
-  let(:subject) { described_class.new(reacting_user, channel) }
+
+  before { SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:everyone] }
 
   it "calls guardian ensure_can_join_chat_channel!" do
     Guardian.any_instance.expects(:ensure_can_join_chat_channel!).once
-    subject.react!(message_id: message_1.id, react_action: :add, emoji: ":+1:")
+    message_reactor.react!(message_id: message_1.id, react_action: :add, emoji: ":+1:")
   end
 
   it "raises an error if the user cannot see the channel" do
     channel.update!(chatable: Fabricate(:private_category, group: Group[:staff]))
     expect {
-      subject.react!(message_id: message_1.id, react_action: :add, emoji: ":+1:")
+      message_reactor.react!(message_id: message_1.id, react_action: :add, emoji: ":+1:")
     }.to raise_error(Discourse::InvalidAccess)
   end
 
   it "raises an error if the user cannot react" do
     SpamRule::AutoSilence.new(reacting_user).silence_user
     expect {
-      subject.react!(message_id: message_1.id, react_action: :add, emoji: ":+1:")
+      message_reactor.react!(message_id: message_1.id, react_action: :add, emoji: ":+1:")
     }.to raise_error(Discourse::InvalidAccess)
   end
 
   it "raises an error if the channel status is not open" do
-    channel.update!(status: ChatChannel.statuses[:archived])
+    channel.update!(status: Chat::Channel.statuses[:archived])
     expect {
-      subject.react!(message_id: message_1.id, react_action: :add, emoji: ":+1:")
+      message_reactor.react!(message_id: message_1.id, react_action: :add, emoji: ":+1:")
     }.to raise_error(Discourse::InvalidAccess)
-    channel.update!(status: ChatChannel.statuses[:open])
+    channel.update!(status: Chat::Channel.statuses[:open])
     expect {
-      subject.react!(message_id: message_1.id, react_action: :add, emoji: ":+1:")
-    }.to change(ChatMessageReaction, :count).by(1)
+      message_reactor.react!(message_id: message_1.id, react_action: :add, emoji: ":+1:")
+    }.to change(Chat::MessageReaction, :count).by(1)
   end
 
   it "raises an error if the reaction is not valid" do
@@ -59,9 +62,9 @@ describe Chat::ChatMessageReactor do
 
   context "when max reactions has been reached" do
     before do
-      emojis = Emoji.all.slice(0, Chat::ChatMessageReactor::MAX_REACTIONS_LIMIT)
+      emojis = Emoji.all.slice(0, described_class::MAX_REACTIONS_LIMIT)
       emojis.each do |emoji|
-        ChatMessageReaction.create!(
+        Chat::MessageReaction.create!(
           chat_message: message_1,
           user: reacting_user,
           emoji: ":#{emoji.name}:",
@@ -93,47 +96,51 @@ describe Chat::ChatMessageReactor do
   it "creates a membership when not present" do
     expect {
       reactor.react!(message_id: message_1.id, react_action: :add, emoji: ":heart:")
-    }.to change(UserChatChannelMembership, :count).by(1)
+    }.to change(Chat::UserChatChannelMembership, :count).by(1)
   end
 
   it "doesn’t create a membership when present" do
-    UserChatChannelMembership.create!(user: reacting_user, chat_channel: channel, following: true)
+    Chat::UserChatChannelMembership.create!(
+      user: reacting_user,
+      chat_channel: channel,
+      following: true,
+    )
 
     expect {
       reactor.react!(message_id: message_1.id, react_action: :add, emoji: ":heart:")
-    }.not_to change(UserChatChannelMembership, :count)
+    }.not_to change(Chat::UserChatChannelMembership, :count)
   end
 
   it "can add a reaction" do
     expect {
       reactor.react!(message_id: message_1.id, react_action: :add, emoji: ":heart:")
-    }.to change(ChatMessageReaction, :count).by(1)
+    }.to change(Chat::MessageReaction, :count).by(1)
   end
 
   it "doesn’t duplicate reactions" do
-    ChatMessageReaction.create!(chat_message: message_1, user: reacting_user, emoji: ":heart:")
+    Chat::MessageReaction.create!(chat_message: message_1, user: reacting_user, emoji: ":heart:")
 
     expect {
       reactor.react!(message_id: message_1.id, react_action: :add, emoji: ":heart:")
-    }.not_to change(ChatMessageReaction, :count)
+    }.not_to change(Chat::MessageReaction, :count)
   end
 
   it "can remove an existing reaction" do
-    ChatMessageReaction.create!(chat_message: message_1, user: reacting_user, emoji: ":heart:")
+    Chat::MessageReaction.create!(chat_message: message_1, user: reacting_user, emoji: ":heart:")
 
     expect {
       reactor.react!(message_id: message_1.id, react_action: :remove, emoji: ":heart:")
-    }.to change(ChatMessageReaction, :count).by(-1)
+    }.to change(Chat::MessageReaction, :count).by(-1)
   end
 
   it "does nothing when removing if no reaction found" do
     expect {
       reactor.react!(message_id: message_1.id, react_action: :remove, emoji: ":heart:")
-    }.not_to change(ChatMessageReaction, :count)
+    }.not_to change(Chat::MessageReaction, :count)
   end
 
   it "publishes the reaction" do
-    ChatPublisher.expects(:publish_reaction!).once
+    Chat::Publisher.expects(:publish_reaction!).once
 
     reactor.react!(message_id: message_1.id, react_action: :add, emoji: ":heart:")
   end
diff --git a/plugins/chat/spec/lib/chat/messages_exporter_spec.rb b/plugins/chat/spec/lib/chat/messages_exporter_spec.rb
new file mode 100644
index 00000000000..8c2274e5f31
--- /dev/null
+++ b/plugins/chat/spec/lib/chat/messages_exporter_spec.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+describe Chat::MessagesExporter do
+  fab!(:public_channel) { Fabricate(:chat_channel) }
+  fab!(:public_channel_message_1) { Fabricate(:chat_message, chat_channel: public_channel) }
+  fab!(:public_channel_message_2) { Fabricate(:chat_message, chat_channel: public_channel) }
+  # this message is deleted in the before block:
+  fab!(:deleted_message) { Fabricate(:chat_message, chat_channel: public_channel) }
+
+  fab!(:private_channel) { Fabricate(:private_category_channel, group: Fabricate(:group)) }
+  fab!(:private_channel_message_1) { Fabricate(:chat_message, chat_channel: private_channel) }
+  fab!(:private_channel_message_2) { Fabricate(:chat_message, chat_channel: private_channel) }
+
+  fab!(:user_1) { Fabricate(:user) }
+  fab!(:user_2) { Fabricate(:user) }
+  fab!(:dm_channel) { Fabricate(:direct_message_channel, users: [user_1, user_2]) }
+  fab!(:direct_message_1) { Fabricate(:chat_message, chat_channel: private_channel, user: user_1) }
+  fab!(:direct_message_2) { Fabricate(:chat_message, chat_channel: private_channel, user: user_2) }
+
+  before { deleted_message.trash! }
+
+  it "exports messages" do
+    exporter = Class.new.extend(Chat::MessagesExporter)
+
+    result = []
+    exporter.chat_message_export { |data_row| result << data_row }
+
+    expect(result.length).to be(7)
+    assert_exported_message(result[0], public_channel_message_1)
+    assert_exported_message(result[1], public_channel_message_2)
+    assert_exported_message(result[2], deleted_message)
+    assert_exported_message(result[3], private_channel_message_1)
+    assert_exported_message(result[4], private_channel_message_2)
+    assert_exported_message(result[5], direct_message_1)
+    assert_exported_message(result[6], direct_message_2)
+  end
+
+  def assert_exported_message(data_row, message)
+    expect(data_row[0]).to eq(message.id)
+    expect(data_row[1]).to eq(message.chat_channel.id)
+    expect(data_row[2]).to eq(message.chat_channel.name)
+    expect(data_row[3]).to eq(message.user.id)
+    expect(data_row[4]).to eq(message.user.username)
+    expect(data_row[5]).to eq(message.message)
+    expect(data_row[6]).to eq(message.cooked)
+    expect(data_row[7]).to eq_time(message.created_at)
+    expect(data_row[8]).to eq_time(message.updated_at)
+    expect(data_row[9]).to eq_time(message.deleted_at)
+    expect(data_row[10]).to eq(message.in_reply_to_id)
+    expect(data_row[11]).to eq(message.last_editor.id)
+    expect(data_row[12]).to eq(message.last_editor.username)
+  end
+end
diff --git a/plugins/chat/spec/lib/chat_notifier_spec.rb b/plugins/chat/spec/lib/chat/notifier_spec.rb
similarity index 95%
rename from plugins/chat/spec/lib/chat_notifier_spec.rb
rename to plugins/chat/spec/lib/chat/notifier_spec.rb
index e9f413cfd68..f892bcca6a4 100644
--- a/plugins/chat/spec/lib/chat_notifier_spec.rb
+++ b/plugins/chat/spec/lib/chat/notifier_spec.rb
@@ -2,7 +2,7 @@
 
 require "rails_helper"
 
-describe Chat::ChatNotifier do
+describe Chat::Notifier do
   describe "#notify_new" do
     fab!(:channel) { Fabricate(:category_channel) }
     fab!(:user_1) { Fabricate(:user) }
@@ -23,7 +23,7 @@ describe Chat::ChatNotifier do
     end
 
     def build_cooked_msg(message_body, user, chat_channel: channel)
-      ChatMessage.new(
+      Chat::Message.create(
         chat_channel: chat_channel,
         user: user,
         message: message_body,
@@ -121,6 +121,28 @@ describe Chat::ChatNotifier do
       include_examples "channel-wide mentions"
       include_examples "ensure only channel members are notified"
 
+      describe "editing a direct mention into a global mention" do
+        let(:mention) { "hello @#{user_2.username}!" }
+
+        it "doesn't send notifications with :all_mentioned_user_ids as an identifier" do
+          Jobs.run_immediately!
+          msg = build_cooked_msg(mention, user_1)
+
+          Chat::MessageUpdater.update(
+            guardian: user_1.guardian,
+            chat_message: msg,
+            new_content: "hello @all",
+          )
+
+          described_class.new(msg, msg.created_at).notify_edit
+
+          notifications = Notification.where(user: user_2)
+          notifications.each do |notification|
+            expect(notification.data).not_to include("\"identifier\":\"all_mentioned_user_ids\"")
+          end
+        end
+      end
+
       describe "users ignoring or muting the user creating the message" do
         it "does not send notifications to the user who is muting the acting user" do
           Fabricate(:muted_user, user: user_2, muted_user: user_1)
@@ -233,7 +255,7 @@ describe Chat::ChatNotifier do
           Fabricate(:muted_user, user: user_2, muted_user: user_1)
           msg = build_cooked_msg("hey @#{user_2.username} stop muting me!", user_1)
 
-          ChatPublisher.expects(:publish_new_mention).never
+          Chat::Publisher.expects(:publish_new_mention).never
           to_notify = described_class.new(msg, msg.created_at).notify_new
         end
 
@@ -386,10 +408,13 @@ describe Chat::ChatNotifier do
       context "when in a personal message" do
         let(:personal_chat_channel) do
           Group.refresh_automatic_groups!
-          Chat::DirectMessageChannelCreator.create!(
-            acting_user: user_1,
-            target_users: [user_1, user_2],
-          )
+          result =
+            Chat::CreateDirectMessageChannel.call(
+              guardian: user_1.guardian,
+              target_usernames: [user_1.username, user_2.username],
+            )
+          service_failed!(result) if result.failure?
+          result.channel
         end
 
         before { @chat_group.add(user_3) }
diff --git a/plugins/chat/spec/lib/chat/parsed_mentions_spec.rb b/plugins/chat/spec/lib/chat/parsed_mentions_spec.rb
new file mode 100644
index 00000000000..f03ca7850d0
--- /dev/null
+++ b/plugins/chat/spec/lib/chat/parsed_mentions_spec.rb
@@ -0,0 +1,180 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+RSpec.describe Chat::ParsedMentions do
+  fab!(:channel_member_1) { Fabricate(:user) }
+  fab!(:channel_member_2) { Fabricate(:user) }
+  fab!(:channel_member_3) { Fabricate(:user) }
+  fab!(:not_a_channel_member) { Fabricate(:user) }
+  fab!(:chat_channel) { Fabricate(:chat_channel) }
+
+  before do
+    chat_channel.add(channel_member_1)
+    chat_channel.add(channel_member_2)
+    chat_channel.add(channel_member_3)
+  end
+
+  describe "#global_mentions" do
+    it "returns all members of the channel" do
+      message = create_message("mentioning @all")
+
+      mentions = described_class.new(message)
+      result = mentions.global_mentions.pluck(:username)
+
+      expect(result).to contain_exactly(
+        channel_member_1.username,
+        channel_member_2.username,
+        channel_member_3.username,
+      )
+    end
+
+    it "doesn't include users that were also mentioned directly" do
+      message = create_message("mentioning @all and @#{channel_member_1.username}")
+
+      mentions = described_class.new(message)
+      result = mentions.global_mentions.pluck(:username)
+
+      expect(result).to contain_exactly(channel_member_2.username, channel_member_3.username)
+    end
+
+    it "returns an empty list if there are no global mentions" do
+      message = create_message("not mentioning anybody")
+
+      mentions = described_class.new(message)
+      result = mentions.global_mentions.pluck(:username)
+
+      expect(result).to be_empty
+    end
+  end
+
+  describe "#here_mentions" do
+    before do
+      freeze_time
+      channel_member_1.update(last_seen_at: 2.minutes.ago)
+      channel_member_2.update(last_seen_at: 2.minutes.ago)
+      channel_member_3.update(last_seen_at: 5.minutes.ago)
+    end
+
+    it "returns all members of the channel who were online in the last 5 minutes" do
+      message = create_message("mentioning @here")
+
+      mentions = described_class.new(message)
+      result = mentions.here_mentions.pluck(:username)
+
+      expect(result).to contain_exactly(channel_member_1.username, channel_member_2.username)
+    end
+
+    it "doesn't include users that were also mentioned directly" do
+      message = create_message("mentioning @here and @#{channel_member_1.username}")
+
+      mentions = described_class.new(message)
+      result = mentions.here_mentions.pluck(:username)
+
+      expect(result).to contain_exactly(channel_member_2.username)
+    end
+
+    it "returns an empty list if there are no here mentions" do
+      message = create_message("not mentioning anybody")
+
+      mentions = described_class.new(message)
+      result = mentions.here_mentions.pluck(:username)
+
+      expect(result).to be_empty
+    end
+  end
+
+  describe "#direct_mentions" do
+    it "returns users who were mentioned directly" do
+      message =
+        create_message("mentioning @#{channel_member_1.username} and @#{channel_member_2.username}")
+
+      mentions = described_class.new(message)
+      result = mentions.direct_mentions.pluck(:username)
+
+      expect(result).to contain_exactly(channel_member_1.username, channel_member_2.username)
+    end
+
+    it "returns a user when self-mentioning" do
+      message =
+        Fabricate(
+          :chat_message,
+          chat_channel: chat_channel,
+          message: "Hey @#{channel_member_1.username}",
+          user: channel_member_1,
+        )
+
+      mentions = described_class.new(message)
+
+      result = mentions.direct_mentions.pluck(:username)
+      expect(result).to contain_exactly(channel_member_1.username)
+    end
+
+    it "returns a mentioned user even if he's not a member of the channel" do
+      message = create_message("mentioning @#{not_a_channel_member.username}")
+
+      mentions = described_class.new(message)
+      result = mentions.direct_mentions.pluck(:username)
+
+      expect(result).to contain_exactly(not_a_channel_member.username)
+    end
+
+    it "returns an empty list if no one was mentioned directly" do
+      message = create_message("not mentioning anybody")
+
+      mentions = described_class.new(message)
+      result = mentions.direct_mentions.pluck(:username)
+
+      expect(result).to be_empty
+    end
+  end
+
+  describe "#group_mentions" do
+    fab!(:group1) { Fabricate(:group, mentionable_level: Group::ALIAS_LEVELS[:everyone]) }
+    fab!(:group_member_1) { Fabricate(:user, group_ids: [group1.id]) }
+    fab!(:group_member_2) { Fabricate(:user, group_ids: [group1.id]) }
+    fab!(:group_member_3) { Fabricate(:user, group_ids: [group1.id]) }
+
+    before do
+      chat_channel.add(group_member_1)
+      chat_channel.add(group_member_2)
+    end
+
+    it "returns members of a mentioned group even if some of them is not members of the channel" do
+      message = create_message("mentioning @#{group1.name}")
+
+      mentions = described_class.new(message)
+      result = mentions.group_mentions.pluck(:username)
+
+      expect(result).to contain_exactly(
+        group_member_1.username,
+        group_member_2.username,
+        group_member_3.username,
+      )
+    end
+
+    it "returns an empty list if no group was mentioned" do
+      message = create_message("not mentioning anyone")
+
+      mentions = described_class.new(message)
+      result = mentions.group_mentions.pluck(:username)
+
+      expect(result).to be_empty
+    end
+
+    it "returns an empty list when mentioning an unmentionable group" do
+      group1.mentionable_level = Group::ALIAS_LEVELS[:nobody]
+      group1.save!
+      message = create_message("mentioning @#{group1.name}")
+
+      mentions = described_class.new(message)
+      result = mentions.group_mentions.pluck(:username)
+
+      expect(result).to be_empty
+    end
+  end
+
+  def create_message(text)
+    Fabricate(:chat_message, chat_channel: chat_channel, message: text)
+  end
+end
diff --git a/plugins/chat/spec/lib/post_notification_handler_spec.rb b/plugins/chat/spec/lib/chat/post_notification_handler_spec.rb
similarity index 90%
rename from plugins/chat/spec/lib/post_notification_handler_spec.rb
rename to plugins/chat/spec/lib/chat/post_notification_handler_spec.rb
index 620fe991e0c..47705958594 100644
--- a/plugins/chat/spec/lib/post_notification_handler_spec.rb
+++ b/plugins/chat/spec/lib/chat/post_notification_handler_spec.rb
@@ -3,10 +3,11 @@
 require "rails_helper"
 
 describe Chat::PostNotificationHandler do
+  subject(:handler) { described_class.new(post, notified_users) }
+
   let(:acting_user) { Fabricate(:user) }
   let(:post) { Fabricate(:post) }
   let(:notified_users) { [] }
-  let(:subject) { Chat::PostNotificationHandler.new(post, notified_users) }
 
   fab!(:channel) { Fabricate(:category_channel) }
   fab!(:message1) do
@@ -24,13 +25,13 @@ describe Chat::PostNotificationHandler do
 
   def expect_no_notification
     return_val = nil
-    expect { return_val = subject.handle }.not_to change { Notification.count }
+    expect { return_val = handler.handle }.not_to change { Notification.count }
     expect(return_val).to eq(false)
   end
 
   def update_post_with_chat_quote(messages)
     quote_markdown =
-      ChatTranscriptService.new(channel, acting_user, messages_or_ids: messages).generate_markdown
+      Chat::TranscriptService.new(channel, acting_user, messages_or_ids: messages).generate_markdown
     post.update!(raw: post.raw + "\n\n" + quote_markdown)
   end
 
@@ -51,7 +52,7 @@ describe Chat::PostNotificationHandler do
 
   it "sends notifications to all of the quoted users" do
     update_post_with_chat_quote([message1, message2])
-    subject.handle
+    handler.handle
     expect(
       Notification.where(
         user: message1.user,
@@ -68,8 +69,8 @@ describe Chat::PostNotificationHandler do
 
   it "does not send the same chat_quoted notification twice to the same post and user" do
     update_post_with_chat_quote([message1, message2])
-    subject.handle
-    subject.handle
+    handler.handle
+    handler.handle
     expect(
       Notification.where(
         user: message1.user,
@@ -87,7 +88,7 @@ describe Chat::PostNotificationHandler do
       topic: post.topic,
       user: message1.user,
     )
-    subject.handle
+    handler.handle
     expect(
       Notification.where(
         user: message1.user,
@@ -101,7 +102,7 @@ describe Chat::PostNotificationHandler do
 
     it "does not send notifications to those users" do
       update_post_with_chat_quote([message1, message2])
-      subject.handle
+      handler.handle
       expect(
         Notification.where(
           user: message1.user,
diff --git a/plugins/chat/spec/lib/chat_review_queue_spec.rb b/plugins/chat/spec/lib/chat/review_queue_spec.rb
similarity index 91%
rename from plugins/chat/spec/lib/chat_review_queue_spec.rb
rename to plugins/chat/spec/lib/chat/review_queue_spec.rb
index 5559543c52a..01b560ac6dd 100644
--- a/plugins/chat/spec/lib/chat_review_queue_spec.rb
+++ b/plugins/chat/spec/lib/chat/review_queue_spec.rb
@@ -2,18 +2,18 @@
 
 require "rails_helper"
 
-describe Chat::ChatReviewQueue do
+describe Chat::ReviewQueue do
+  subject(:queue) { described_class.new }
+
   fab!(:message_poster) { Fabricate(:user) }
   fab!(:flagger) { Fabricate(:user) }
   fab!(:chat_channel) { Fabricate(:category_channel) }
   fab!(:message) { Fabricate(:chat_message, user: message_poster, chat_channel: chat_channel) }
-
   fab!(:admin) { Fabricate(:admin) }
+
   let(:guardian) { Guardian.new(flagger) }
   let(:admin_guardian) { Guardian.new(admin) }
 
-  subject(:queue) { described_class.new }
-
   before do
     chat_channel.add(message_poster)
     chat_channel.add(flagger)
@@ -32,7 +32,7 @@ describe Chat::ChatReviewQueue do
     it "stores the message cooked content inside the reviewable" do
       queue.flag_message(message, guardian, ReviewableScore.types[:off_topic])
 
-      reviewable = ReviewableChatMessage.last
+      reviewable = Chat::ReviewableMessage.last
 
       expect(reviewable.payload["message_cooked"]).to eq(message.cooked)
     end
@@ -73,7 +73,7 @@ describe Chat::ChatReviewQueue do
           queue.flag_message(message, admin_guardian, ReviewableScore.types[:off_topic])
         expect(second_flag_result).to include success: true
 
-        reviewable = ReviewableChatMessage.find_by(target: message)
+        reviewable = Chat::ReviewableMessage.find_by(target: message)
         scores = reviewable.reviewable_scores
 
         expect(scores.size).to eq(2)
@@ -99,7 +99,7 @@ describe Chat::ChatReviewQueue do
       before do
         queue.flag_message(message, guardian, ReviewableScore.types[:spam])
 
-        reviewable = ReviewableChatMessage.last
+        reviewable = Chat::ReviewableMessage.last
         reviewable.perform(admin, :ignore)
       end
 
@@ -109,14 +109,14 @@ describe Chat::ChatReviewQueue do
       end
 
       it "allows the user to re-flag after the cooldown period" do
-        reviewable = ReviewableChatMessage.last
+        reviewable = Chat::ReviewableMessage.last
         reviewable.update!(updated_at: (SiteSetting.cooldown_hours_until_reflag.to_i + 1).hours.ago)
 
         expect(second_flag_result).to include success: true
       end
 
       it "ignores the cooldown window when the message is edited" do
-        Chat::ChatMessageUpdater.update(
+        Chat::MessageUpdater.update(
           guardian: Guardian.new(message.user),
           chat_message: message,
           new_content: "I'm editing this message. Please flag it.",
@@ -157,7 +157,7 @@ describe Chat::ChatReviewQueue do
           .map(&:data)
 
       flag_msg = messages.detect { |m| m["type"] == "flag" }
-      new_reviewable = ReviewableChatMessage.find_by(target: message)
+      new_reviewable = Chat::ReviewableMessage.find_by(target: message)
 
       expect(flag_msg["chat_message_id"]).to eq(message.id)
       expect(flag_msg["reviewable_id"]).to eq(new_reviewable.id)
@@ -261,7 +261,7 @@ describe Chat::ChatReviewQueue do
           take_action: true,
         )
 
-        reviewable = ReviewableChatMessage.find_by(target: message)
+        reviewable = Chat::ReviewableMessage.find_by(target: message)
 
         expect(reviewable.approved?).to eq(true)
         expect(message.reload.trashed?).to eq(true)
@@ -280,15 +280,16 @@ describe Chat::ChatReviewQueue do
             end
             .map(&:data)
 
-        delete_msg = messages.detect { |m| m[:type] == "delete" }
+        delete_msg = messages.detect { |m| m["type"] == "delete" }
 
-        expect(delete_msg[:deleted_id]).to eq(message.id)
+        expect(delete_msg["deleted_id"]).to eq(message.id)
       end
 
       it "agrees with other flags on the same message" do
         queue.flag_message(message, guardian, ReviewableScore.types[:off_topic])
 
-        reviewable = ReviewableChatMessage.includes(:reviewable_scores).find_by(target: message)
+        reviewable =
+          Chat::ReviewableMessage.includes(:reviewable_scores).find_by(target_id: message)
         scores = reviewable.reviewable_scores
 
         expect(scores.size).to eq(1)
@@ -323,7 +324,8 @@ describe Chat::ChatReviewQueue do
           queue_for_review: true,
         )
 
-        reviewable = ReviewableChatMessage.includes(:reviewable_scores).find_by(target: message)
+        reviewable =
+          Chat::ReviewableMessage.includes(:reviewable_scores).find_by(target_id: message)
         score = reviewable.reviewable_scores.first
 
         expect(score.reason).to eq("chat_message_queued_by_staff")
@@ -367,6 +369,18 @@ describe Chat::ChatReviewQueue do
 
         expect(message_poster.reload.silenced?).to eq(false)
       end
+
+      context "when the target is an admin" do
+        it "does not silence the user" do
+          SiteSetting.chat_auto_silence_from_flags_duration = 1
+          flagger.update!(trust_level: TrustLevel[4]) # Increase Score due to TL Bonus.
+          message_poster.update!(admin: true)
+
+          queue.flag_message(message, guardian, ReviewableScore.types[:off_topic])
+
+          expect(message_poster.reload.silenced?).to eq(false)
+        end
+      end
     end
 
     context "when flagging a DM" do
@@ -397,8 +411,7 @@ describe Chat::ChatReviewQueue do
 
       it "includes a transcript of the previous 10 message for the rest of the flags" do
         queue.flag_message(dm_message_12, guardian, ReviewableScore.types[:off_topic])
-
-        reviewable = ReviewableChatMessage.last
+        reviewable = Chat::ReviewableMessage.last
         expect(reviewable.target).to eq(dm_message_12)
         transcript_post = Post.find_by(topic_id: reviewable.payload["transcript_topic_id"])
 
@@ -410,7 +423,7 @@ describe Chat::ChatReviewQueue do
       it "doesn't include a transcript if there a no previous messages" do
         queue.flag_message(dm_message_1, guardian, ReviewableScore.types[:off_topic])
 
-        reviewable = ReviewableChatMessage.last
+        reviewable = Chat::ReviewableMessage.last
 
         expect(reviewable.payload["transcript_topic_id"]).to be_nil
       end
@@ -423,7 +436,7 @@ describe Chat::ChatReviewQueue do
 
         queue.flag_message(dm_message_12, guardian, ReviewableScore.types[:off_topic])
 
-        reviewable = ReviewableChatMessage.last
+        reviewable = Chat::ReviewableMessage.last
         transcript_topic = Topic.find(reviewable.payload["transcript_topic_id"])
 
         expect(guardian.can_see_topic?(transcript_topic)).to eq(false)
diff --git a/plugins/chat/spec/lib/slack_compatibility_spec.rb b/plugins/chat/spec/lib/chat/slack_compatibility_spec.rb
similarity index 100%
rename from plugins/chat/spec/lib/slack_compatibility_spec.rb
rename to plugins/chat/spec/lib/chat/slack_compatibility_spec.rb
diff --git a/plugins/chat/spec/lib/chat_statistics_spec.rb b/plugins/chat/spec/lib/chat/statistics_spec.rb
similarity index 100%
rename from plugins/chat/spec/lib/chat_statistics_spec.rb
rename to plugins/chat/spec/lib/chat/statistics_spec.rb
diff --git a/plugins/chat/spec/lib/chat/steps_inspector_spec.rb b/plugins/chat/spec/lib/chat/steps_inspector_spec.rb
new file mode 100644
index 00000000000..51b956d9cb6
--- /dev/null
+++ b/plugins/chat/spec/lib/chat/steps_inspector_spec.rb
@@ -0,0 +1,256 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::StepsInspector do
+  class DummyService
+    include Service::Base
+
+    model :model
+    policy :policy
+    contract
+    transaction do
+      step :in_transaction_step_1
+      step :in_transaction_step_2
+    end
+    step :final_step
+
+    class Contract
+      attribute :parameter
+
+      validates :parameter, presence: true
+    end
+  end
+
+  subject(:inspector) { described_class.new(result) }
+
+  let(:parameter) { "present" }
+  let(:result) { DummyService.call(parameter: parameter) }
+
+  before do
+    class DummyService
+      %i[fetch_model policy in_transaction_step_1 in_transaction_step_2 final_step].each do |name|
+        define_method(name) { true }
+      end
+    end
+  end
+
+  describe "#inspect" do
+    subject(:output) { inspector.inspect.strip }
+
+    context "when service runs without error" do
+      it "outputs all the steps of the service" do
+        expect(output).to eq <<~OUTPUT.chomp
+        [1/7] [model] 'model' ✅
+        [2/7] [policy] 'policy' ✅
+        [3/7] [contract] 'default' ✅
+        [4/7] [transaction]
+        [5/7]   [step] 'in_transaction_step_1' ✅
+        [6/7]   [step] 'in_transaction_step_2' ✅
+        [7/7] [step] 'final_step' ✅
+        OUTPUT
+      end
+    end
+
+    context "when the model step is failing" do
+      before do
+        class DummyService
+          def fetch_model
+            false
+          end
+        end
+      end
+
+      it "shows the failing step" do
+        expect(output).to eq <<~OUTPUT.chomp
+        [1/7] [model] 'model' ❌
+        [2/7] [policy] 'policy'
+        [3/7] [contract] 'default'
+        [4/7] [transaction]
+        [5/7]   [step] 'in_transaction_step_1'
+        [6/7]   [step] 'in_transaction_step_2'
+        [7/7] [step] 'final_step'
+        OUTPUT
+      end
+    end
+
+    context "when the policy step is failing" do
+      before do
+        class DummyService
+          def policy
+            false
+          end
+        end
+      end
+
+      it "shows the failing step" do
+        expect(output).to eq <<~OUTPUT.chomp
+        [1/7] [model] 'model' ✅
+        [2/7] [policy] 'policy' ❌
+        [3/7] [contract] 'default'
+        [4/7] [transaction]
+        [5/7]   [step] 'in_transaction_step_1'
+        [6/7]   [step] 'in_transaction_step_2'
+        [7/7] [step] 'final_step'
+        OUTPUT
+      end
+    end
+
+    context "when the contract step is failing" do
+      let(:parameter) { nil }
+
+      it "shows the failing step" do
+        expect(output).to eq <<~OUTPUT.chomp
+        [1/7] [model] 'model' ✅
+        [2/7] [policy] 'policy' ✅
+        [3/7] [contract] 'default' ❌
+        [4/7] [transaction]
+        [5/7]   [step] 'in_transaction_step_1'
+        [6/7]   [step] 'in_transaction_step_2'
+        [7/7] [step] 'final_step'
+        OUTPUT
+      end
+    end
+
+    context "when a common step is failing" do
+      before do
+        class DummyService
+          def in_transaction_step_2
+            fail!("step error")
+          end
+        end
+      end
+
+      it "shows the failing step" do
+        expect(output).to eq <<~OUTPUT.chomp
+        [1/7] [model] 'model' ✅
+        [2/7] [policy] 'policy' ✅
+        [3/7] [contract] 'default' ✅
+        [4/7] [transaction]
+        [5/7]   [step] 'in_transaction_step_1' ✅
+        [6/7]   [step] 'in_transaction_step_2' ❌
+        [7/7] [step] 'final_step'
+        OUTPUT
+      end
+    end
+
+    context "when running in specs" do
+      context "when a successful step is flagged as being an unexpected result" do
+        before { result["result.policy.policy"]["spec.unexpected_result"] = true }
+
+        it "adapts its output accordingly" do
+          expect(output).to eq <<~OUTPUT.chomp
+          [1/7] [model] 'model' ✅
+          [2/7] [policy] 'policy' ✅ ⚠️  <= expected to return false but got true instead
+          [3/7] [contract] 'default' ✅
+          [4/7] [transaction]
+          [5/7]   [step] 'in_transaction_step_1' ✅
+          [6/7]   [step] 'in_transaction_step_2' ✅
+          [7/7] [step] 'final_step' ✅
+          OUTPUT
+        end
+      end
+
+      context "when a failing step is flagged as being an unexpected result" do
+        before do
+          class DummyService
+            def policy
+              false
+            end
+          end
+          result["result.policy.policy"]["spec.unexpected_result"] = true
+        end
+
+        it "adapts its output accordingly" do
+          expect(output).to eq <<~OUTPUT.chomp
+          [1/7] [model] 'model' ✅
+          [2/7] [policy] 'policy' ❌ ⚠️  <= expected to return true but got false instead
+          [3/7] [contract] 'default'
+          [4/7] [transaction]
+          [5/7]   [step] 'in_transaction_step_1'
+          [6/7]   [step] 'in_transaction_step_2'
+          [7/7] [step] 'final_step'
+          OUTPUT
+        end
+      end
+    end
+  end
+
+  describe "#error" do
+    subject(:error) { inspector.error }
+
+    context "when there are no errors" do
+      it "returns nothing" do
+        expect(error).to be_blank
+      end
+    end
+
+    context "when the model step is failing" do
+      context "when the model is missing" do
+        before do
+          class DummyService
+            def fetch_model
+              false
+            end
+          end
+        end
+
+        it "returns an error related to the model" do
+          expect(error).to match(/Model not found/)
+        end
+      end
+
+      context "when the model has errors" do
+        before do
+          class DummyService
+            def fetch_model
+              OpenStruct.new(invalid?: true, errors: ActiveModel::Errors.new(nil))
+            end
+          end
+        end
+
+        it "returns an error related to the model" do
+          expect(error).to match(/ActiveModel::Errors \[\]/)
+        end
+      end
+    end
+
+    context "when the contract step is failing" do
+      let(:parameter) { nil }
+
+      it "returns an error related to the contract" do
+        expect(error).to match(/ActiveModel::Error attribute=parameter, type=blank, options={}/)
+      end
+    end
+
+    context "when the policy step is failing" do
+      before do
+        class DummyService
+          def policy
+            false
+          end
+        end
+      end
+
+      context "when there is no reason provided" do
+        it "returns nothing" do
+          expect(error).to be_blank
+        end
+      end
+
+      context "when a reason is provided" do
+        before { result["result.policy.policy"].reason = "failed" }
+
+        it "returns the reason" do
+          expect(error).to eq "failed"
+        end
+      end
+    end
+
+    context "when a common step is failing" do
+      before { result["result.step.final_step"].fail(error: "my error") }
+
+      it "returns an error related to the step" do
+        expect(error).to eq("my error")
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/lib/chat_transcript_service_spec.rb b/plugins/chat/spec/lib/chat/transcript_service_spec.rb
similarity index 91%
rename from plugins/chat/spec/lib/chat_transcript_service_spec.rb
rename to plugins/chat/spec/lib/chat/transcript_service_spec.rb
index 0f14d92f016..96d086ce17e 100644
--- a/plugins/chat/spec/lib/chat_transcript_service_spec.rb
+++ b/plugins/chat/spec/lib/chat/transcript_service_spec.rb
@@ -2,7 +2,7 @@
 
 require "rails_helper"
 
-describe ChatTranscriptService do
+describe Chat::TranscriptService do
   let(:acting_user) { Fabricate(:user) }
   let(:user1) { Fabricate(:user, username: "martinchat") }
   let(:user2) { Fabricate(:user, username: "brucechat") }
@@ -118,7 +118,6 @@ describe ChatTranscriptService do
 
   it "generates image / attachment / video / audio markdown inside the [chat] bbcode for upload-only messages" do
     SiteSetting.authorized_extensions = "mp4|mp3|pdf|jpg"
-    message = Fabricate(:chat_message, user: user1, chat_channel: channel, message: "")
     video = Fabricate(:upload, original_filename: "test_video.mp4", extension: "mp4")
     audio = Fabricate(:upload, original_filename: "test_audio.mp3", extension: "mp3")
     attachment = Fabricate(:upload, original_filename: "test_file.pdf", extension: "pdf")
@@ -130,10 +129,14 @@ describe ChatTranscriptService do
         original_filename: "test_img.jpg",
         extension: "jpg",
       )
-    cu1 = ChatUpload.create(chat_message: message, created_at: 10.seconds.ago, upload: video)
-    cu2 = ChatUpload.create(chat_message: message, created_at: 9.seconds.ago, upload: audio)
-    cu3 = ChatUpload.create(chat_message: message, created_at: 8.seconds.ago, upload: attachment)
-    cu4 = ChatUpload.create(chat_message: message, created_at: 7.seconds.ago, upload: image)
+    message =
+      Fabricate(
+        :chat_message,
+        user: user1,
+        chat_channel: channel,
+        message: "",
+        uploads: [video, audio, attachment, image],
+      )
     video_markdown = UploadMarkdown.new(video).to_markdown
     audio_markdown = UploadMarkdown.new(audio).to_markdown
     attachment_markdown = UploadMarkdown.new(attachment).to_markdown
@@ -166,7 +169,7 @@ describe ChatTranscriptService do
         original_filename: "test_img.jpg",
         extension: "jpg",
       )
-    cu = ChatUpload.create(chat_message: message, created_at: 7.seconds.ago, upload: image)
+    UploadReference.create(target: message, created_at: 7.seconds.ago, upload: image)
     image_markdown = UploadMarkdown.new(image).to_markdown
 
     expect(service(message.id).generate_markdown).to eq(<<~MARKDOWN)
@@ -206,27 +209,27 @@ describe ChatTranscriptService do
     message3 =
       Fabricate(:chat_message, user: user2, chat_channel: channel, message: "a new perspective")
 
-    ChatMessageReaction.create!(
+    Chat::MessageReaction.create!(
       chat_message: message,
       user: Fabricate(:user, username: "bjorn"),
       emoji: "heart",
     )
-    ChatMessageReaction.create!(
+    Chat::MessageReaction.create!(
       chat_message: message,
       user: Fabricate(:user, username: "sigurd"),
       emoji: "heart",
     )
-    ChatMessageReaction.create!(
+    Chat::MessageReaction.create!(
       chat_message: message,
       user: Fabricate(:user, username: "hvitserk"),
       emoji: "+1",
     )
-    ChatMessageReaction.create!(
+    Chat::MessageReaction.create!(
       chat_message: message2,
       user: Fabricate(:user, username: "ubbe"),
       emoji: "money_mouth_face",
     )
-    ChatMessageReaction.create!(
+    Chat::MessageReaction.create!(
       chat_message: message3,
       user: Fabricate(:user, username: "ivar"),
       emoji: "sob",
diff --git a/plugins/chat/spec/lib/chat/types/array_spec.rb b/plugins/chat/spec/lib/chat/types/array_spec.rb
new file mode 100644
index 00000000000..c6e843d4a18
--- /dev/null
+++ b/plugins/chat/spec/lib/chat/types/array_spec.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+RSpec.describe Chat::Types::Array do
+  subject(:type) { described_class.new }
+
+  describe "#cast" do
+    subject(:casted_value) { type.cast(value) }
+
+    context "when 'value' is a string" do
+      let(:value) { "first,second,third" }
+
+      it "splits it" do
+        expect(casted_value).to eq(%w[first second third])
+      end
+    end
+
+    context "when 'value' is an array" do
+      let(:value) { %w[existing array] }
+
+      it "returns it" do
+        expect(casted_value).to eq(value)
+      end
+    end
+
+    context "when 'value' is something else" do
+      let(:value) { Time.current }
+
+      it "wraps it in a new array" do
+        expect(casted_value).to eq([value])
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/lib/direct_message_channel_creator_spec.rb b/plugins/chat/spec/lib/direct_message_channel_creator_spec.rb
deleted file mode 100644
index ff3863ca3a7..00000000000
--- a/plugins/chat/spec/lib/direct_message_channel_creator_spec.rb
+++ /dev/null
@@ -1,361 +0,0 @@
-# frozen_string_literal: true
-
-require "rails_helper"
-
-describe Chat::DirectMessageChannelCreator do
-  fab!(:user_1) { Fabricate(:user) }
-  fab!(:user_2) { Fabricate(:user) }
-  fab!(:user_3) { Fabricate(:user) }
-
-  before { Group.refresh_automatic_groups! }
-
-  context "with an existing direct message channel" do
-    fab!(:dm_chat_channel) do
-      Fabricate(:direct_message_channel, users: [user_1, user_2, user_3], with_membership: false)
-    end
-    fab!(:own_chat_channel) do
-      Fabricate(:direct_message_channel, users: [user_1], with_membership: false)
-    end
-
-    it "doesn't create a new chat channel" do
-      existing_channel = nil
-      expect {
-        existing_channel =
-          subject.create!(acting_user: user_1, target_users: [user_1, user_2, user_3])
-      }.not_to change { ChatChannel.count }
-      expect(existing_channel).to eq(dm_chat_channel)
-    end
-
-    it "creates UserChatChannelMembership records and sets their notification levels, and only updates creator membership to following" do
-      Fabricate(
-        :user_chat_channel_membership,
-        user: user_2,
-        chat_channel: dm_chat_channel,
-        following: false,
-        muted: true,
-        desktop_notification_level: UserChatChannelMembership::NOTIFICATION_LEVELS[:never],
-        mobile_notification_level: UserChatChannelMembership::NOTIFICATION_LEVELS[:never],
-      )
-      Fabricate(
-        :user_chat_channel_membership,
-        user: user_3,
-        chat_channel: dm_chat_channel,
-        following: false,
-        muted: true,
-        desktop_notification_level: UserChatChannelMembership::NOTIFICATION_LEVELS[:never],
-        mobile_notification_level: UserChatChannelMembership::NOTIFICATION_LEVELS[:never],
-      )
-
-      expect {
-        subject.create!(acting_user: user_1, target_users: [user_1, user_2, user_3])
-      }.to change { UserChatChannelMembership.count }.by(1)
-
-      user_1_membership =
-        UserChatChannelMembership.find_by(user_id: user_1.id, chat_channel_id: dm_chat_channel)
-      expect(user_1_membership.last_read_message_id).to eq(nil)
-      expect(user_1_membership.desktop_notification_level).to eq("always")
-      expect(user_1_membership.mobile_notification_level).to eq("always")
-      expect(user_1_membership.muted).to eq(false)
-      expect(user_1_membership.following).to eq(true)
-
-      user_2_membership =
-        UserChatChannelMembership.find_by(user_id: user_2.id, chat_channel_id: dm_chat_channel)
-      expect(user_2_membership.last_read_message_id).to eq(nil)
-      expect(user_2_membership.desktop_notification_level).to eq("never")
-      expect(user_2_membership.mobile_notification_level).to eq("never")
-      expect(user_2_membership.muted).to eq(true)
-      expect(user_2_membership.following).to eq(false)
-
-      user_3_membership =
-        UserChatChannelMembership.find_by(user_id: user_3.id, chat_channel_id: dm_chat_channel)
-      expect(user_3_membership.last_read_message_id).to eq(nil)
-      expect(user_3_membership.desktop_notification_level).to eq("never")
-      expect(user_3_membership.mobile_notification_level).to eq("never")
-      expect(user_3_membership.muted).to eq(true)
-      expect(user_3_membership.following).to eq(false)
-    end
-
-    it "publishes the new DM channel message bus message for each user not following yet" do
-      messages =
-        MessageBus
-          .track_publish do
-            subject.create!(acting_user: user_1, target_users: [user_1, user_2, user_3])
-          end
-          .filter { |m| m.channel == "/chat/new-channel" }
-
-      expect(messages.count).to eq(3)
-      expect(messages.first[:data]).to be_kind_of(Hash)
-      expect(messages.map { |m| m.dig(:data, :channel, :id) }).to eq(
-        [dm_chat_channel.id, dm_chat_channel.id, dm_chat_channel.id],
-      )
-    end
-
-    it "allows a user to create a direct message to themselves, without creating a new channel" do
-      existing_channel = nil
-      expect {
-        existing_channel = subject.create!(acting_user: user_1, target_users: [user_1])
-      }.to not_change { ChatChannel.count }.and change { UserChatChannelMembership.count }.by(1)
-      expect(existing_channel).to eq(own_chat_channel)
-    end
-
-    it "deduplicates target_users" do
-      existing_channel = nil
-      expect {
-        existing_channel = subject.create!(acting_user: user_1, target_users: [user_1, user_1])
-      }.to not_change { ChatChannel.count }.and change { UserChatChannelMembership.count }.by(1)
-      expect(existing_channel).to eq(own_chat_channel)
-    end
-
-    context "when the user is not a member of direct_message_enabled_groups" do
-      before { SiteSetting.direct_message_enabled_groups = Group::AUTO_GROUPS[:trust_level_4] }
-
-      it "raises an error and does not change membership or channel counts" do
-        channel_count = ChatChannel.count
-        membership_count = UserChatChannelMembership.count
-        expect {
-          existing_channel = subject.create!(acting_user: user_1, target_users: [user_1, user_1])
-        }.to raise_error(Discourse::InvalidAccess)
-        expect(ChatChannel.count).to eq(channel_count)
-        expect(UserChatChannelMembership.count).to eq(membership_count)
-      end
-
-      context "when user is staff" do
-        before { user_1.update!(admin: true) }
-
-        it "doesn't create an error and returns the existing channel" do
-          existing_channel = nil
-          expect {
-            existing_channel =
-              subject.create!(acting_user: user_1, target_users: [user_1, user_2, user_3])
-          }.not_to change { ChatChannel.count }
-          expect(existing_channel).to eq(dm_chat_channel)
-        end
-      end
-    end
-  end
-
-  context "with non existing direct message channel" do
-    it "creates a new chat channel" do
-      expect { subject.create!(acting_user: user_1, target_users: [user_1, user_2]) }.to change {
-        ChatChannel.count
-      }.by(1)
-    end
-
-    it "creates UserChatChannelMembership records and sets their notification levels" do
-      expect { subject.create!(acting_user: user_1, target_users: [user_1, user_2]) }.to change {
-        UserChatChannelMembership.count
-      }.by(2)
-
-      chat_channel = ChatChannel.last
-      user_1_membership =
-        UserChatChannelMembership.find_by(user_id: user_1.id, chat_channel_id: chat_channel)
-      expect(user_1_membership.last_read_message_id).to eq(nil)
-      expect(user_1_membership.desktop_notification_level).to eq("always")
-      expect(user_1_membership.mobile_notification_level).to eq("always")
-      expect(user_1_membership.muted).to eq(false)
-      expect(user_1_membership.following).to eq(true)
-    end
-
-    it "publishes the new DM channel message bus message for each user" do
-      messages =
-        MessageBus
-          .track_publish { subject.create!(acting_user: user_1, target_users: [user_1, user_2]) }
-          .filter { |m| m.channel == "/chat/new-channel" }
-
-      chat_channel = ChatChannel.last
-      expect(messages.count).to eq(2)
-      expect(messages.first[:data]).to be_kind_of(Hash)
-      expect(messages.map { |m| m.dig(:data, :channel, :id) }).to eq(
-        [chat_channel.id, chat_channel.id],
-      )
-    end
-
-    it "allows a user to create a direct message to themselves" do
-      expect { subject.create!(acting_user: user_1, target_users: [user_1]) }.to change {
-        ChatChannel.count
-      }.by(1).and change { UserChatChannelMembership.count }.by(1)
-    end
-
-    it "deduplicates target_users" do
-      expect { subject.create!(acting_user: user_1, target_users: [user_1, user_1]) }.to change {
-        ChatChannel.count
-      }.by(1).and change { UserChatChannelMembership.count }.by(1)
-    end
-
-    context "when number of users is over the limit" do
-      before { SiteSetting.chat_max_direct_message_users = 1 }
-
-      it "raises an error" do
-        expect {
-          subject.create!(acting_user: user_1, target_users: [user_1, user_2, user_3])
-        }.to raise_error(
-          Chat::DirectMessageChannelCreator::NotAllowed,
-          I18n.t("chat.errors.over_chat_max_direct_message_users", count: 2),
-        )
-      end
-
-      context "when acting user is staff" do
-        fab!(:admin) { Fabricate(:admin) }
-
-        it "creates a new chat channel" do
-          expect {
-            subject.create!(acting_user: admin, target_users: [admin, user_1, user_2])
-          }.to change { ChatChannel.count }.by(1)
-        end
-      end
-
-      context "when limit is zero" do
-        before { SiteSetting.chat_max_direct_message_users = 0 }
-
-        it "raises an error" do
-          expect {
-            subject.create!(acting_user: user_1, target_users: [user_1, user_2])
-          }.to raise_error(
-            Chat::DirectMessageChannelCreator::NotAllowed,
-            I18n.t("chat.errors.over_chat_max_direct_message_users", count: 1),
-          )
-        end
-      end
-    end
-
-    context "when number of users is at the limit" do
-      before { SiteSetting.chat_max_direct_message_users = 0 }
-
-      it "creates a new chat channel" do
-        expect { subject.create!(acting_user: user_1, target_users: [user_1]) }.to change {
-          ChatChannel.count
-        }.by(1)
-      end
-    end
-
-    context "when number of users is under the limit" do
-      before { SiteSetting.chat_max_direct_message_users = 1 }
-
-      it "creates a new chat channel" do
-        expect { subject.create!(acting_user: user_1, target_users: [user_1]) }.to change {
-          ChatChannel.count
-        }.by(1)
-      end
-    end
-
-    context "when the user is not a member of direct_message_enabled_groups" do
-      before { SiteSetting.direct_message_enabled_groups = Group::AUTO_GROUPS[:trust_level_4] }
-
-      it "raises an error and does not change membership or channel counts" do
-        channel_count = ChatChannel.count
-        membership_count = UserChatChannelMembership.count
-        expect {
-          subject.create!(acting_user: user_1, target_users: [user_1, user_2])
-        }.to raise_error(Discourse::InvalidAccess)
-        expect(ChatChannel.count).to eq(channel_count)
-        expect(UserChatChannelMembership.count).to eq(membership_count)
-      end
-
-      context "when user is staff" do
-        before { user_1.update!(admin: true) }
-
-        it "creates a new chat channel" do
-          expect {
-            subject.create!(acting_user: user_1, target_users: [user_1, user_2])
-          }.to change { ChatChannel.count }.by(1)
-        end
-      end
-    end
-  end
-
-  describe "ignoring, muting, and preventing DMs from other users" do
-    context "when any of the users that the acting user is open in a DM with are ignoring the acting user" do
-      before do
-        Fabricate(:ignored_user, user: user_2, ignored_user: user_1, expiring_at: 1.day.from_now)
-      end
-
-      it "raises an error with a helpful message" do
-        expect {
-          subject.create!(acting_user: user_1, target_users: [user_1, user_2, user_3])
-        }.to raise_error(
-          Chat::DirectMessageChannelCreator::NotAllowed,
-          I18n.t("chat.errors.not_accepting_dms", username: user_2.username),
-        )
-      end
-
-      it "does not let the ignoring user create a DM either and raises an error with a helpful message" do
-        expect {
-          subject.create!(acting_user: user_2, target_users: [user_2, user_1, user_3])
-        }.to raise_error(
-          Chat::DirectMessageChannelCreator::NotAllowed,
-          I18n.t("chat.errors.actor_ignoring_target_user", username: user_1.username),
-        )
-      end
-    end
-
-    context "when any of the users that the acting user is open in a DM with are muting the acting user" do
-      before { Fabricate(:muted_user, user: user_2, muted_user: user_1) }
-
-      it "raises an error with a helpful message" do
-        expect {
-          subject.create!(acting_user: user_1, target_users: [user_1, user_2, user_3])
-        }.to raise_error(
-          Chat::DirectMessageChannelCreator::NotAllowed,
-          I18n.t("chat.errors.not_accepting_dms", username: user_2.username),
-        )
-      end
-
-      it "does not let the muting user create a DM either and raises an error with a helpful message" do
-        expect {
-          subject.create!(acting_user: user_2, target_users: [user_2, user_1, user_3])
-        }.to raise_error(
-          Chat::DirectMessageChannelCreator::NotAllowed,
-          I18n.t("chat.errors.actor_muting_target_user", username: user_1.username),
-        )
-      end
-    end
-
-    context "when any of the users that the acting user is open in a DM with is preventing private/direct messages" do
-      before { user_2.user_option.update(allow_private_messages: false) }
-
-      it "raises an error with a helpful message" do
-        expect {
-          subject.create!(acting_user: user_1, target_users: [user_1, user_2, user_3])
-        }.to raise_error(
-          Chat::DirectMessageChannelCreator::NotAllowed,
-          I18n.t("chat.errors.not_accepting_dms", username: user_2.username),
-        )
-      end
-
-      it "does not let the user who is preventing PM/DM create a DM either and raises an error with a helpful message" do
-        expect {
-          subject.create!(acting_user: user_2, target_users: [user_2, user_1, user_3])
-        }.to raise_error(
-          Chat::DirectMessageChannelCreator::NotAllowed,
-          I18n.t("chat.errors.actor_disallowed_dms"),
-        )
-      end
-    end
-
-    context "when any of the users that the acting user is open in a DM with only allow private/direct messages from certain users" do
-      before { user_2.user_option.update!(enable_allowed_pm_users: true) }
-
-      it "raises an error with a helpful message" do
-        expect {
-          subject.create!(acting_user: user_1, target_users: [user_1, user_2, user_3])
-        }.to raise_error(Chat::DirectMessageChannelCreator::NotAllowed)
-      end
-
-      it "does not raise an error if the acting user is allowed to send the PM" do
-        AllowedPmUser.create!(user: user_2, allowed_pm_user: user_1)
-        expect {
-          subject.create!(acting_user: user_1, target_users: [user_1, user_2, user_3])
-        }.to change { ChatChannel.count }.by(1)
-      end
-
-      it "does not let the user who is preventing PM/DM create a DM either and raises an error with a helpful message" do
-        expect {
-          subject.create!(acting_user: user_2, target_users: [user_2, user_1, user_3])
-        }.to raise_error(
-          Chat::DirectMessageChannelCreator::NotAllowed,
-          I18n.t("chat.errors.actor_preventing_target_user_from_dm", username: user_1.username),
-        )
-      end
-    end
-  end
-end
diff --git a/plugins/chat/spec/lib/message_mover_spec.rb b/plugins/chat/spec/lib/message_mover_spec.rb
deleted file mode 100644
index 43182c64c1f..00000000000
--- a/plugins/chat/spec/lib/message_mover_spec.rb
+++ /dev/null
@@ -1,130 +0,0 @@
-# frozen_string_literal: true
-
-require "rails_helper"
-
-describe Chat::MessageMover do
-  fab!(:acting_user) { Fabricate(:admin, username: "testmovechat") }
-  fab!(:source_channel) { Fabricate(:category_channel) }
-  fab!(:destination_channel) { Fabricate(:category_channel) }
-
-  fab!(:message1) do
-    Fabricate(
-      :chat_message,
-      chat_channel: source_channel,
-      created_at: 3.minutes.ago,
-      message: "the first to be moved",
-    )
-  end
-  fab!(:message2) do
-    Fabricate(
-      :chat_message,
-      chat_channel: source_channel,
-      created_at: 2.minutes.ago,
-      message: "message deux @testmovechat",
-    )
-  end
-  fab!(:message3) do
-    Fabricate(
-      :chat_message,
-      chat_channel: source_channel,
-      created_at: 1.minute.ago,
-      message: "the third message",
-    )
-  end
-  fab!(:message4) { Fabricate(:chat_message, chat_channel: destination_channel) }
-  fab!(:message5) { Fabricate(:chat_message, chat_channel: destination_channel) }
-  fab!(:message6) { Fabricate(:chat_message, chat_channel: destination_channel) }
-  let(:move_message_ids) { [message1.id, message2.id, message3.id] }
-
-  subject do
-    described_class.new(
-      acting_user: acting_user,
-      source_channel: source_channel,
-      message_ids: move_message_ids,
-    )
-  end
-
-  describe "#move_to_channel" do
-    def move!
-      subject.move_to_channel(destination_channel)
-    end
-
-    it "raises an error if either the source or destination channels are not public (they cannot be DM channels)" do
-      expect {
-        described_class.new(
-          acting_user: acting_user,
-          source_channel: Fabricate(:direct_message_channel),
-          message_ids: move_message_ids,
-        ).move_to_channel(destination_channel)
-      }.to raise_error(Chat::MessageMover::InvalidChannel)
-      expect {
-        described_class.new(
-          acting_user: acting_user,
-          source_channel: source_channel,
-          message_ids: move_message_ids,
-        ).move_to_channel(Fabricate(:direct_message_channel))
-      }.to raise_error(Chat::MessageMover::InvalidChannel)
-    end
-
-    it "raises an error if no messages are found using the message ids" do
-      other_channel = Fabricate(:chat_channel)
-      message1.update(chat_channel: other_channel)
-      message2.update(chat_channel: other_channel)
-      message3.update(chat_channel: other_channel)
-      expect { move! }.to raise_error(Chat::MessageMover::NoMessagesFound)
-    end
-
-    it "deletes the messages from the source channel and sends messagebus delete messages" do
-      messages = MessageBus.track_publish { move! }
-      expect(ChatMessage.where(id: move_message_ids)).to eq([])
-      deleted_messages = ChatMessage.with_deleted.where(id: move_message_ids).order(:id)
-      expect(deleted_messages.count).to eq(3)
-      expect(messages.first.channel).to eq("/chat/#{source_channel.id}")
-      expect(messages.first.data[:typ]).to eq("bulk_delete")
-      expect(messages.first.data[:deleted_ids]).to eq(deleted_messages.map(&:id))
-      expect(messages.first.data[:deleted_at]).not_to eq(nil)
-    end
-
-    it "creates a message in the source channel to indicate that the messages have been moved" do
-      move!
-      placeholder_message = ChatMessage.where(chat_channel: source_channel).order(:created_at).last
-      destination_first_moved_message =
-        ChatMessage.find_by(chat_channel: destination_channel, message: "the first to be moved")
-      expect(placeholder_message.message).to eq(
-        I18n.t(
-          "chat.channel.messages_moved",
-          count: move_message_ids.length,
-          acting_username: acting_user.username,
-          channel_name: destination_channel.title(acting_user),
-          first_moved_message_url: destination_first_moved_message.url,
-        ),
-      )
-    end
-
-    it "preserves the order of the messages in the destination channel" do
-      move!
-      moved_messages =
-        ChatMessage.where(chat_channel: destination_channel).order("created_at ASC, id ASC").last(3)
-      expect(moved_messages.map(&:message)).to eq(
-        ["the first to be moved", "message deux @testmovechat", "the third message"],
-      )
-    end
-
-    it "updates references for reactions, uploads, revisions, mentions, etc." do
-      reaction = Fabricate(:chat_message_reaction, chat_message: message1)
-      upload = Fabricate(:chat_upload, chat_message: message1)
-      mention = Fabricate(:chat_mention, chat_message: message2, user: acting_user)
-      revision = Fabricate(:chat_message_revision, chat_message: message3)
-      webhook_event = Fabricate(:chat_webhook_event, chat_message: message3)
-      move!
-
-      moved_messages =
-        ChatMessage.where(chat_channel: destination_channel).order("created_at ASC, id ASC").last(3)
-      expect(reaction.reload.chat_message_id).to eq(moved_messages.first.id)
-      expect(upload.reload.chat_message_id).to eq(moved_messages.first.id)
-      expect(mention.reload.chat_message_id).to eq(moved_messages.second.id)
-      expect(revision.reload.chat_message_id).to eq(moved_messages.third.id)
-      expect(webhook_event.reload.chat_message_id).to eq(moved_messages.third.id)
-    end
-  end
-end
diff --git a/plugins/chat/spec/lib/service_runner_spec.rb b/plugins/chat/spec/lib/service_runner_spec.rb
new file mode 100644
index 00000000000..9afa8d39722
--- /dev/null
+++ b/plugins/chat/spec/lib/service_runner_spec.rb
@@ -0,0 +1,424 @@
+# frozen_string_literal: true
+
+RSpec.describe ServiceRunner do
+  class SuccessService
+    include Service::Base
+  end
+
+  class FailureService
+    include Service::Base
+
+    step :fail_step
+
+    def fail_step
+      fail!("error")
+    end
+  end
+
+  class FailedPolicyService
+    include Service::Base
+
+    policy :test
+
+    def test
+      false
+    end
+  end
+
+  class SuccessPolicyService
+    include Service::Base
+
+    policy :test
+
+    def test
+      true
+    end
+  end
+
+  class FailedContractService
+    include Service::Base
+
+    class Contract
+      attribute :test
+      validates :test, presence: true
+    end
+
+    contract
+  end
+
+  class SuccessContractService
+    include Service::Base
+
+    contract
+  end
+
+  class FailureWithModelService
+    include Service::Base
+
+    model :fake_model, :fetch_fake_model
+
+    private
+
+    def fetch_fake_model
+      nil
+    end
+  end
+
+  class FailureWithOptionalModelService
+    include Service::Base
+
+    model :fake_model, optional: true
+
+    private
+
+    def fetch_fake_model
+      nil
+    end
+  end
+
+  class FailureWithModelErrorsService
+    include Service::Base
+
+    model :fake_model, :fetch_fake_model
+
+    private
+
+    def fetch_fake_model
+      OpenStruct.new(invalid?: true)
+    end
+  end
+
+  class SuccessWithModelService
+    include Service::Base
+
+    model :fake_model, :fetch_fake_model
+
+    private
+
+    def fetch_fake_model
+      :model_found
+    end
+  end
+
+  class SuccessWithModelErrorsService
+    include Service::Base
+
+    model :fake_model, :fetch_fake_model
+
+    private
+
+    def fetch_fake_model
+      OpenStruct.new
+    end
+  end
+
+  class FailureWithCollectionModelService
+    include Service::Base
+
+    model :fake_model, :fetch_fake_model
+
+    private
+
+    def fetch_fake_model
+      []
+    end
+  end
+
+  class SuccessWithCollectionModelService
+    include Service::Base
+
+    model :fake_model, :fetch_fake_model
+
+    private
+
+    def fetch_fake_model
+      [:models_found]
+    end
+  end
+
+  describe ".call(service, &block)" do
+    subject(:runner) { described_class.call(service, object, &actions_block) }
+
+    let(:result) { object.result }
+    let(:actions_block) { object.instance_eval(actions) }
+    let(:service) { SuccessService }
+    let(:actions) { "proc {}" }
+    let(:object) do
+      Class
+        .new(Chat::ApiController) do
+          def request
+            OpenStruct.new
+          end
+
+          def params
+            ActionController::Parameters.new
+          end
+
+          def guardian
+          end
+        end
+        .new
+    end
+
+    it "runs the provided service in the context of a controller" do
+      runner
+      expect(result).to be_a Service::Base::Context
+      expect(result).to be_a_success
+    end
+
+    context "when using the on_success action" do
+      let(:actions) { <<-BLOCK }
+          proc do
+            on_success { :success }
+          end
+        BLOCK
+
+      context "when the service succeeds" do
+        it "runs the provided block" do
+          expect(runner).to eq :success
+        end
+      end
+
+      context "when the service does not succeed" do
+        let(:service) { FailureService }
+
+        it "does not run the provided block" do
+          expect(runner).not_to eq :success
+        end
+      end
+    end
+
+    context "when using the on_failure action" do
+      let(:actions) { <<-BLOCK }
+          proc do
+            on_failure { :fail }
+          end
+        BLOCK
+
+      context "when the service fails" do
+        let(:service) { FailureService }
+
+        it "runs the provided block" do
+          expect(runner).to eq :fail
+        end
+      end
+
+      context "when the service does not fail" do
+        let(:service) { SuccessService }
+
+        it "does not run the provided block" do
+          expect(runner).not_to eq :fail
+        end
+      end
+    end
+
+    context "when using the on_failed_policy action" do
+      let(:actions) { <<-BLOCK }
+          proc do
+            on_failed_policy(:test) { :policy_failure }
+          end
+        BLOCK
+
+      context "when the service policy fails" do
+        let(:service) { FailedPolicyService }
+
+        context "when not using the block argument" do
+          it "runs the provided block" do
+            expect(runner).to eq :policy_failure
+          end
+        end
+
+        context "when using the block argument" do
+          let(:actions) { <<-BLOCK }
+              proc do
+                on_failed_policy(:test) { |policy| policy == result["result.policy.test"] }
+              end
+            BLOCK
+
+          it "runs the provided block" do
+            expect(runner).to be true
+          end
+        end
+      end
+
+      context "when the service policy does not fail" do
+        let(:service) { SuccessPolicyService }
+
+        it "does not run the provided block" do
+          expect(runner).not_to eq :policy_failure
+        end
+      end
+    end
+
+    context "when using the on_failed_contract action" do
+      let(:actions) { <<-BLOCK }
+          proc do
+            on_failed_contract { :contract_failure }
+          end
+        BLOCK
+
+      context "when the service contract fails" do
+        let(:service) { FailedContractService }
+
+        context "when not using the block argument" do
+          it "runs the provided block" do
+            expect(runner).to eq :contract_failure
+          end
+        end
+
+        context "when using the block argument" do
+          let(:actions) { <<-BLOCK }
+              proc do
+                on_failed_contract { |contract| contract == result["result.contract.default"] }
+              end
+            BLOCK
+
+          it "runs the provided block" do
+            expect(runner).to be true
+          end
+        end
+      end
+
+      context "when the service contract does not fail" do
+        let(:service) { SuccessContractService }
+
+        it "does not run the provided block" do
+          expect(runner).not_to eq :contract_failure
+        end
+      end
+    end
+
+    context "when using the on_model_not_found action" do
+      let(:actions) { <<-BLOCK }
+          proc do
+            on_model_not_found(:fake_model) { :no_model }
+          end
+        BLOCK
+
+      context "when fetching a single model" do
+        context "when the service uses an optional model" do
+          let(:service) { FailureWithOptionalModelService }
+
+          it "does not run the provided block" do
+            expect(runner).not_to eq :no_model
+          end
+        end
+
+        context "when the service fails without a model" do
+          let(:service) { FailureWithModelService }
+
+          context "when not using the block argument" do
+            it "runs the provided block" do
+              expect(runner).to eq :no_model
+            end
+          end
+
+          context "when using the block argument" do
+            let(:actions) { <<-BLOCK }
+                proc do
+                  on_model_not_found(:fake_model) { |model| model == result["result.model.fake_model"] }
+                end
+              BLOCK
+
+            it "runs the provided block" do
+              expect(runner).to be true
+            end
+          end
+        end
+
+        context "when the service does not fail with a model" do
+          let(:service) { SuccessWithModelService }
+
+          it "does not run the provided block" do
+            expect(runner).not_to eq :no_model
+          end
+        end
+      end
+
+      context "when fetching a collection" do
+        context "when the service fails without a model" do
+          let(:service) { FailureWithCollectionModelService }
+
+          it "runs the provided block" do
+            expect(runner).to eq :no_model
+          end
+        end
+
+        context "when the service does not fail with a model" do
+          let(:service) { SuccessWithCollectionModelService }
+
+          it "does not run the provided block" do
+            expect(runner).not_to eq :no_model
+          end
+        end
+      end
+    end
+
+    context "when using the on_model_errors action" do
+      let(:actions) { <<-BLOCK }
+          proc do
+            on_model_errors(:fake_model) { :model_errors }
+          end
+        BLOCK
+
+      context "when the service fails with a model containing errors" do
+        let(:service) { FailureWithModelErrorsService }
+
+        context "when not using the block argument" do
+          it "runs the provided block" do
+            expect(runner).to eq :model_errors
+          end
+        end
+
+        context "when using the block argument" do
+          let(:actions) { <<-BLOCK }
+              proc do
+                on_model_errors(:fake_model) { |model| model == OpenStruct.new(invalid?: true) }
+              end
+            BLOCK
+
+          it "runs the provided block" do
+            expect(runner).to be true
+          end
+        end
+      end
+
+      context "when the service does not fail with a model containing errors" do
+        let(:service) { SuccessWithModelErrorsService }
+
+        it "does not run the provided block" do
+          expect(runner).not_to eq :model_errors
+        end
+      end
+    end
+
+    context "when using several actions together" do
+      let(:service) { FailureService }
+      let(:actions) { <<-BLOCK }
+          proc do
+            on_success { :success }
+            on_failure { :failure }
+            on_failed_policy { :policy_failure }
+          end
+        BLOCK
+
+      it "runs the first matching action" do
+        expect(runner).to eq :failure
+      end
+    end
+
+    context "when running in the context of a job" do
+      let(:object) { Class.new(ServiceJob).new }
+      let(:actions) { <<-BLOCK }
+          proc do
+            on_success { :success }
+            on_failure { :failure }
+          end
+        BLOCK
+
+      it "runs properly" do
+        expect(runner).to eq :success
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/mailers/user_notifications_spec.rb b/plugins/chat/spec/mailers/user_notifications_spec.rb
index fa282a8a133..734687c81c1 100644
--- a/plugins/chat/spec/mailers/user_notifications_spec.rb
+++ b/plugins/chat/spec/mailers/user_notifications_spec.rb
@@ -22,7 +22,7 @@ describe UserNotifications do
     context "with private channel" do
       fab!(:channel) do
         refresh_auto_groups
-        Chat::DirectMessageChannelCreator.create!(acting_user: sender, target_users: [sender, user])
+        create_dm_channel(sender, [sender, user])
       end
 
       it "calls guardian can_join_chat_channel?" do
@@ -54,7 +54,10 @@ describe UserNotifications do
             user: another_participant,
             chat_channel: channel,
           )
-          DirectMessageUser.create!(direct_message: channel.chatable, user: another_participant)
+          Chat::DirectMessageUser.create!(
+            direct_message: channel.chatable,
+            user: another_participant,
+          )
           expected_subject =
             I18n.t(
               "user_notifications.chat_summary.subject.direct_message_from_1",
@@ -73,11 +76,7 @@ describe UserNotifications do
           another_dm_user = Fabricate(:user, group_ids: [chatters_group.id])
           refresh_auto_groups
           another_dm_user.reload
-          another_channel =
-            Chat::DirectMessageChannelCreator.create!(
-              acting_user: user,
-              target_users: [another_dm_user, user],
-            )
+          another_channel = create_dm_channel(user, [another_dm_user, user])
           Fabricate(:chat_message, user: another_dm_user, chat_channel: another_channel)
           Fabricate(:chat_message, user: sender, chat_channel: channel)
           email = described_class.chat_summary(user, {})
@@ -104,11 +103,8 @@ describe UserNotifications do
             refresh_auto_groups
             sender.reload
             senders << sender
-            channel =
-              Chat::DirectMessageChannelCreator.create!(
-                acting_user: sender,
-                target_users: [user, sender],
-              )
+            channel = create_dm_channel(sender, [sender, user])
+
             user
               .user_chat_channel_memberships
               .where(chat_channel_id: channel.id)
@@ -146,7 +142,8 @@ describe UserNotifications do
     context "with public channel" do
       fab!(:channel) { Fabricate(:category_channel) }
       fab!(:chat_message) { Fabricate(:chat_message, user: sender, chat_channel: channel) }
-      fab!(:user_membership) do
+      # using fab! for user_membership below makes these specs flaky
+      let!(:user_membership) do
         Fabricate(
           :user_chat_channel_membership,
           chat_channel: channel,
@@ -161,9 +158,83 @@ describe UserNotifications do
         expect(email.to).to be_blank
       end
 
+      context "with channel-wide mentions" do
+        before { Jobs.run_immediately! }
+
+        def create_chat_message_with_mentions_and_notifications(content)
+          # Sometimes it's not enough to just fabricate a message
+          # and we have to create it like here. In this case all the necessary
+          # db records for mentions and notifications will be created under the hood.
+          Chat::MessageCreator.create(chat_channel: channel, user: sender, content: content)
+        end
+
+        it "returns email for @all mention by default" do
+          create_chat_message_with_mentions_and_notifications("Mentioning @all")
+          email = described_class.chat_summary(user, {})
+          expect(email.to).to contain_exactly(user.email)
+        end
+
+        it "returns email for @here mention by default" do
+          user.update(last_seen_at: 1.second.ago)
+
+          create_chat_message_with_mentions_and_notifications("Mentioning @here")
+          email = described_class.chat_summary(user, {})
+
+          expect(email.to).to contain_exactly(user.email)
+        end
+
+        context "when channel-wide mentions are disabled in a channel" do
+          before { channel.update!(allow_channel_wide_mentions: false) }
+
+          it "doesn't return email for @all mention" do
+            create_chat_message_with_mentions_and_notifications("Mentioning @all")
+            email = described_class.chat_summary(user, {})
+
+            expect(email.to).to be_blank
+          end
+
+          it "doesn't return email for @here mention" do
+            user.update(last_seen_at: 1.second.ago)
+
+            create_chat_message_with_mentions_and_notifications("Mentioning @here")
+            email = described_class.chat_summary(user, {})
+
+            expect(email.to).to be_blank
+          end
+        end
+
+        context "when user has disabled channel-wide mentions" do
+          before { user.user_option.update!(ignore_channel_wide_mention: true) }
+
+          it "doesn't return email for @all mention" do
+            create_chat_message_with_mentions_and_notifications("Mentioning @all")
+            email = described_class.chat_summary(user, {})
+
+            expect(email.to).to be_blank
+          end
+
+          it "doesn't return email for @here mention" do
+            user.update(last_seen_at: 1.second.ago)
+
+            create_chat_message_with_mentions_and_notifications("Mentioning @here")
+            email = described_class.chat_summary(user, {})
+
+            expect(email.to).to be_blank
+          end
+        end
+      end
+
       describe "email subject" do
         context "with regular mentions" do
-          before { Fabricate(:chat_mention, user: user, chat_message: chat_message) }
+          before do
+            notification = Fabricate(:notification)
+            Fabricate(
+              :chat_mention,
+              user: user,
+              chat_message: chat_message,
+              notification: notification,
+            )
+          end
 
           it "includes the sender username in the subject" do
             expected_subject =
@@ -194,7 +265,13 @@ describe UserNotifications do
               user: user,
               last_read_message_id: another_chat_message.id - 2,
             )
-            Fabricate(:chat_mention, user: user, chat_message: another_chat_message)
+            notification = Fabricate(:notification)
+            Fabricate(
+              :chat_mention,
+              user: user,
+              chat_message: another_chat_message,
+              notification: notification,
+            )
 
             email = described_class.chat_summary(user, {})
 
@@ -227,7 +304,13 @@ describe UserNotifications do
                 user: user,
                 last_read_message_id: another_chat_message.id - 2,
               )
-              Fabricate(:chat_mention, user: user, chat_message: another_chat_message)
+              notification = Fabricate(:notification)
+              Fabricate(
+                :chat_mention,
+                user: user,
+                chat_message: another_chat_message,
+                notification: notification,
+              )
             end
 
             expected_subject =
@@ -247,13 +330,15 @@ describe UserNotifications do
         context "with both unread DM messages and mentions" do
           before do
             refresh_auto_groups
-            channel =
-              Chat::DirectMessageChannelCreator.create!(
-                acting_user: sender,
-                target_users: [sender, user],
-              )
+            channel = create_dm_channel(sender, [sender, user])
             Fabricate(:chat_message, user: sender, chat_channel: channel)
-            Fabricate(:chat_mention, user: user, chat_message: chat_message)
+            notification = Fabricate(:notification)
+            Fabricate(
+              :chat_mention,
+              user: user,
+              chat_message: chat_message,
+              notification: notification,
+            )
           end
 
           it "always includes the DM second" do
@@ -273,7 +358,15 @@ describe UserNotifications do
       end
 
       describe "When there are mentions" do
-        before { Fabricate(:chat_mention, user: user, chat_message: chat_message) }
+        before do
+          notification = Fabricate(:notification)
+          Fabricate(
+            :chat_mention,
+            user: user,
+            chat_message: chat_message,
+            notification: notification,
+          )
+        end
 
         describe "selecting mentions" do
           it "doesn't return an email if the user can't see chat" do
@@ -358,11 +451,7 @@ describe UserNotifications do
           it "returns an email when the user has unread private messages" do
             user_membership.update!(last_read_message_id: chat_message.id)
             refresh_auto_groups
-            channel =
-              Chat::DirectMessageChannelCreator.create!(
-                acting_user: sender,
-                target_users: [sender, user],
-              )
+            channel = create_dm_channel(sender, [sender, user])
             Fabricate(:chat_message, user: sender, chat_channel: channel)
 
             email = described_class.chat_summary(user, {})
@@ -377,7 +466,13 @@ describe UserNotifications do
             )
 
             new_message = Fabricate(:chat_message, user: sender, chat_channel: channel)
-            Fabricate(:chat_mention, user: user, chat_message: new_message)
+            notification = Fabricate(:notification)
+            Fabricate(
+              :chat_mention,
+              user: user,
+              chat_message: new_message,
+              notification: notification,
+            )
 
             email = described_class.chat_summary(user, {})
 
@@ -478,7 +573,8 @@ describe UserNotifications do
           it "includes a view more link when there are more than two mentions" do
             2.times do
               msg = Fabricate(:chat_message, user: sender, chat_channel: channel)
-              Fabricate(:chat_mention, user: user, chat_message: msg)
+              notification = Fabricate(:notification)
+              Fabricate(:chat_mention, user: user, chat_message: msg, notification: notification)
             end
 
             email = described_class.chat_summary(user, {})
@@ -499,7 +595,13 @@ describe UserNotifications do
 
             new_message =
               Fabricate(:chat_message, user: sender, chat_channel: channel, cooked: "New message")
-            Fabricate(:chat_mention, user: user, chat_message: new_message)
+            notification = Fabricate(:notification)
+            Fabricate(
+              :chat_mention,
+              user: user,
+              chat_message: new_message,
+              notification: notification,
+            )
 
             email = described_class.chat_summary(user, {})
             body = email.html_part.body.to_s
@@ -511,4 +613,14 @@ describe UserNotifications do
       end
     end
   end
+
+  def create_dm_channel(sender, target_users)
+    result =
+      Chat::CreateDirectMessageChannel.call(
+        guardian: sender.guardian,
+        target_usernames: target_users.map(&:username),
+      )
+    service_failed!(result) if result.failure?
+    result.channel
+  end
 end
diff --git a/plugins/chat/spec/models/category_spec.rb b/plugins/chat/spec/models/category_spec.rb
index bf16ff3e618..d02d3036524 100644
--- a/plugins/chat/spec/models/category_spec.rb
+++ b/plugins/chat/spec/models/category_spec.rb
@@ -5,7 +5,7 @@ require "rails_helper"
 RSpec.describe Category do
   it_behaves_like "a chatable model" do
     fab!(:chatable) { Fabricate(:category) }
-    let(:channel_class) { CategoryChannel }
+    let(:channel_class) { Chat::CategoryChannel }
   end
 
   it { is_expected.to have_one(:category_channel).dependent(:destroy) }
diff --git a/plugins/chat/spec/models/category_channel_spec.rb b/plugins/chat/spec/models/chat/category_channel_spec.rb
similarity index 99%
rename from plugins/chat/spec/models/category_channel_spec.rb
rename to plugins/chat/spec/models/chat/category_channel_spec.rb
index e78681eb8bc..1408d18829d 100644
--- a/plugins/chat/spec/models/category_channel_spec.rb
+++ b/plugins/chat/spec/models/chat/category_channel_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe CategoryChannel do
+RSpec.describe Chat::CategoryChannel do
   subject(:channel) { Fabricate.build(:category_channel) }
 
   it_behaves_like "a chat channel model"
diff --git a/plugins/chat/spec/models/chat/channel_spec.rb b/plugins/chat/spec/models/chat/channel_spec.rb
new file mode 100644
index 00000000000..6d8cd244db9
--- /dev/null
+++ b/plugins/chat/spec/models/chat/channel_spec.rb
@@ -0,0 +1,274 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::Channel do
+  fab!(:category_channel_1) { Fabricate(:category_channel) }
+  fab!(:dm_channel_1) { Fabricate(:direct_message_channel) }
+
+  describe ".find_by_id_or_slug" do
+    subject(:find_channel) { described_class.find_by_id_or_slug(channel_id) }
+
+    context "when the channel is a direct message one" do
+      let(:channel_id) { dm_channel_1.id }
+
+      it "finds it" do
+        expect(find_channel).to eq dm_channel_1
+      end
+    end
+
+    context "when the channel is a category one" do
+      context "when providing its id" do
+        let(:channel_id) { category_channel_1.id }
+
+        it "finds it" do
+          expect(find_channel).to eq category_channel_1
+        end
+      end
+
+      context "when providing its slug" do
+        let(:channel_id) { category_channel_1.slug }
+
+        it "finds it" do
+          expect(find_channel).to eq category_channel_1
+        end
+      end
+
+      context "when providing its category slug" do
+        let(:channel_id) { category_channel_1.category.slug }
+
+        it "finds it" do
+          expect(find_channel).to eq category_channel_1
+        end
+      end
+    end
+
+    context "when providing a non existent id" do
+      let(:channel_id) { -1 }
+
+      it "returns nothing" do
+        expect(find_channel).to be_blank
+      end
+    end
+  end
+
+  describe "#relative_url" do
+    context "when the slug is nil" do
+      it "uses a - instead" do
+        category_channel_1.slug = nil
+        expect(category_channel_1.relative_url).to eq("/chat/c/-/#{category_channel_1.id}")
+      end
+    end
+
+    context "when the slug is not nil" do
+      before { category_channel_1.update!(slug: "some-cool-channel") }
+
+      it "includes the slug for the channel" do
+        expect(category_channel_1.relative_url).to eq(
+          "/chat/c/some-cool-channel/#{category_channel_1.id}",
+        )
+      end
+    end
+  end
+
+  describe ".ensure_consistency!" do
+    fab!(:category_channel_2) { Fabricate(:category_channel) }
+
+    describe "updating messages_count for all channels" do
+      fab!(:category_channel_3) { Fabricate(:category_channel) }
+      fab!(:category_channel_4) { Fabricate(:category_channel) }
+      fab!(:dm_channel_2) { Fabricate(:direct_message_channel) }
+
+      before do
+        Fabricate(:chat_message, chat_channel: category_channel_1)
+        Fabricate(:chat_message, chat_channel: category_channel_1)
+        Fabricate(:chat_message, chat_channel: category_channel_1)
+
+        Fabricate(:chat_message, chat_channel: category_channel_2)
+        Fabricate(:chat_message, chat_channel: category_channel_2)
+        Fabricate(:chat_message, chat_channel: category_channel_2)
+        Fabricate(:chat_message, chat_channel: category_channel_2)
+
+        Fabricate(:chat_message, chat_channel: category_channel_3)
+
+        Fabricate(:chat_message, chat_channel: dm_channel_2)
+        Fabricate(:chat_message, chat_channel: dm_channel_2)
+      end
+
+      it "counts correctly" do
+        described_class.ensure_consistency!
+        expect(category_channel_1.reload.messages_count).to eq(3)
+        expect(category_channel_2.reload.messages_count).to eq(4)
+        expect(category_channel_3.reload.messages_count).to eq(1)
+        expect(category_channel_4.reload.messages_count).to eq(0)
+        expect(dm_channel_1.reload.messages_count).to eq(0)
+        expect(dm_channel_2.reload.messages_count).to eq(2)
+      end
+
+      it "does not count deleted messages" do
+        category_channel_3.chat_messages.last.trash!
+        described_class.ensure_consistency!
+        expect(category_channel_3.reload.messages_count).to eq(0)
+      end
+
+      it "does not update deleted channels" do
+        described_class.ensure_consistency!
+        category_channel_3.chat_messages.last.trash!
+        category_channel_3.trash!
+        described_class.ensure_consistency!
+        expect(category_channel_3.reload.messages_count).to eq(1)
+      end
+    end
+
+    describe "updating user_count for all channels" do
+      fab!(:user_1) { Fabricate(:user) }
+      fab!(:user_2) { Fabricate(:user) }
+      fab!(:user_3) { Fabricate(:user) }
+      fab!(:user_4) { Fabricate(:user) }
+
+      def create_memberships
+        user_1.user_chat_channel_memberships.create!(
+          chat_channel: category_channel_1,
+          following: true,
+        )
+        user_1.user_chat_channel_memberships.create!(
+          chat_channel: category_channel_2,
+          following: true,
+        )
+
+        user_2.user_chat_channel_memberships.create!(
+          chat_channel: category_channel_1,
+          following: true,
+        )
+        user_2.user_chat_channel_memberships.create!(
+          chat_channel: category_channel_2,
+          following: true,
+        )
+
+        user_3.user_chat_channel_memberships.create!(
+          chat_channel: category_channel_1,
+          following: false,
+        )
+        user_3.user_chat_channel_memberships.create!(
+          chat_channel: category_channel_2,
+          following: true,
+        )
+      end
+
+      it "sets the user_count correctly for each chat channel" do
+        create_memberships
+
+        described_class.ensure_consistency!
+
+        expect(category_channel_1.reload.user_count).to eq(2)
+        expect(category_channel_2.reload.user_count).to eq(3)
+      end
+
+      it "does not count suspended, non-activated, nor staged users" do
+        user_1.user_chat_channel_memberships.create!(
+          chat_channel: category_channel_1,
+          following: true,
+        )
+        user_2.user_chat_channel_memberships.create!(
+          chat_channel: category_channel_2,
+          following: true,
+        )
+        user_3.user_chat_channel_memberships.create!(
+          chat_channel: category_channel_2,
+          following: true,
+        )
+        user_4.user_chat_channel_memberships.create!(
+          chat_channel: category_channel_2,
+          following: true,
+        )
+        user_2.update(suspended_till: 3.weeks.from_now)
+        user_3.update(staged: true)
+        user_4.update(active: false)
+
+        described_class.ensure_consistency!
+
+        expect(category_channel_1.reload.user_count).to eq(1)
+        expect(category_channel_2.reload.user_count).to eq(0)
+      end
+
+      it "does not count archived, or read_only channels" do
+        create_memberships
+
+        category_channel_1.update!(status: :archived)
+        described_class.ensure_consistency!
+        expect(category_channel_1.reload.user_count).to eq(0)
+
+        category_channel_1.update!(status: :read_only)
+        described_class.ensure_consistency!
+        expect(category_channel_1.reload.user_count).to eq(0)
+      end
+
+      it "publishes all the updated channels" do
+        create_memberships
+
+        messages = MessageBus.track_publish { described_class.ensure_consistency! }
+
+        expect(messages.length).to eq(3)
+        expect(messages.map(&:data)).to match_array(
+          [
+            { chat_channel_id: category_channel_1.id, memberships_count: 2 },
+            { chat_channel_id: category_channel_2.id, memberships_count: 3 },
+            { chat_channel_id: dm_channel_1.id, memberships_count: 2 },
+          ],
+        )
+
+        messages = MessageBus.track_publish { described_class.ensure_consistency! }
+        expect(messages.length).to eq(0)
+      end
+    end
+  end
+
+  describe "#allow_channel_wide_mentions" do
+    it "defaults to true" do
+      expect(category_channel_1.allow_channel_wide_mentions).to be(true)
+    end
+
+    it "cant be nullified" do
+      expect { category_channel_1.update!(allow_channel_wide_mentions: nil) }.to raise_error(
+        ActiveRecord::NotNullViolation,
+      )
+    end
+  end
+
+  describe "#latest_not_deleted_message_id" do
+    fab!(:channel) { Fabricate(:category_channel) }
+    fab!(:old_message) { Fabricate(:chat_message, chat_channel: channel) }
+    fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel) }
+
+    before { old_message.update!(created_at: 1.day.ago) }
+
+    it "accepts an anchor message to only get messages of a lower id" do
+      expect(channel.latest_not_deleted_message_id(anchor_message_id: message_1.id)).to eq(
+        old_message.id,
+      )
+    end
+
+    it "gets the latest message by created_at" do
+      expect(channel.latest_not_deleted_message_id).to eq(message_1.id)
+    end
+
+    it "does not get other channel messages" do
+      Fabricate(:chat_message)
+      expect(channel.latest_not_deleted_message_id).to eq(message_1.id)
+    end
+
+    it "does not get thread replies" do
+      thread = Fabricate(:chat_thread, channel: channel, old_om: true)
+      message_1.update!(thread: thread)
+      expect(channel.latest_not_deleted_message_id).to eq(old_message.id)
+    end
+
+    it "does get thread original message" do
+      thread = Fabricate(:chat_thread, channel: channel)
+      expect(channel.latest_not_deleted_message_id).to eq(thread.original_message_id)
+    end
+
+    it "does not get deleted messages" do
+      message_1.trash!
+      expect(channel.latest_not_deleted_message_id).to eq(old_message.id)
+    end
+  end
+end
diff --git a/plugins/chat/spec/models/chat/deleted_chat_user_spec.rb b/plugins/chat/spec/models/chat/deleted_chat_user_spec.rb
new file mode 100644
index 00000000000..9a1beeaf757
--- /dev/null
+++ b/plugins/chat/spec/models/chat/deleted_chat_user_spec.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+describe Chat::DeletedUser do
+  subject(:deleted_user) { described_class.new }
+
+  describe "#username" do
+    it "returns a default username" do
+      expect(deleted_user.username).to eq(I18n.t("chat.deleted_chat_username"))
+    end
+  end
+
+  describe "#avatar_template" do
+    it "returns a default path" do
+      expect(deleted_user.avatar_template).to eq(
+        "/plugins/chat/images/deleted-chat-user-avatar.png",
+      )
+    end
+  end
+end
diff --git a/plugins/chat/spec/models/direct_message_channel_spec.rb b/plugins/chat/spec/models/chat/direct_message_channel_spec.rb
similarity index 97%
rename from plugins/chat/spec/models/direct_message_channel_spec.rb
rename to plugins/chat/spec/models/chat/direct_message_channel_spec.rb
index 227a143d60d..0c45370f374 100644
--- a/plugins/chat/spec/models/direct_message_channel_spec.rb
+++ b/plugins/chat/spec/models/chat/direct_message_channel_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe DirectMessageChannel do
+RSpec.describe Chat::DirectMessageChannel do
   subject(:channel) { Fabricate.build(:direct_message_channel) }
 
   it_behaves_like "a chat channel model"
diff --git a/plugins/chat/spec/models/direct_message_spec.rb b/plugins/chat/spec/models/chat/direct_message_spec.rb
similarity index 78%
rename from plugins/chat/spec/models/direct_message_spec.rb
rename to plugins/chat/spec/models/chat/direct_message_spec.rb
index 9e44e51cd5d..9d526f3bb1c 100644
--- a/plugins/chat/spec/models/direct_message_spec.rb
+++ b/plugins/chat/spec/models/chat/direct_message_spec.rb
@@ -2,14 +2,14 @@
 
 require "rails_helper"
 
-describe DirectMessage do
+describe Chat::DirectMessage do
   fab!(:user1) { Fabricate(:user, username: "chatdmfellow1") }
   fab!(:user2) { Fabricate(:user, username: "chatdmuser") }
   fab!(:chat_channel) { Fabricate(:direct_message_channel) }
 
   it_behaves_like "a chatable model" do
     fab!(:chatable) { Fabricate(:direct_message) }
-    let(:channel_class) { DirectMessageChannel }
+    let(:channel_class) { Chat::DirectMessageChannel }
   end
 
   describe "#chat_channel_title_for_user" do
@@ -20,7 +20,8 @@ describe DirectMessage do
       expect(direct_message.chat_channel_title_for_user(chat_channel, user1)).to eq(
         I18n.t(
           "chat.channel.dm_title.multi_user",
-          users: [user3, user2].map { |u| "@#{u.username}" }.join(", "),
+          comma_separated_usernames:
+            [user3, user2].map { |u| "@#{u.username}" }.join(I18n.t("word_connector.comma")),
         ),
       )
     end
@@ -36,8 +37,12 @@ describe DirectMessage do
       expect(direct_message.chat_channel_title_for_user(chat_channel, user1)).to eq(
         I18n.t(
           "chat.channel.dm_title.multi_user_truncated",
-          users: users[1..5].sort_by(&:username).map { |u| "@#{u.username}" }.join(", "),
-          leftover: 2,
+          comma_separated_usernames:
+            users[1..5]
+              .sort_by(&:username)
+              .map { |u| "@#{u.username}" }
+              .join(I18n.t("word_connector.comma")),
+          count: 2,
         ),
       )
     end
@@ -46,7 +51,7 @@ describe DirectMessage do
       direct_message = Fabricate(:direct_message, users: [user1, user2])
 
       expect(direct_message.chat_channel_title_for_user(chat_channel, user1)).to eq(
-        I18n.t("chat.channel.dm_title.single_user", user: "@#{user2.username}"),
+        I18n.t("chat.channel.dm_title.single_user", username: "@#{user2.username}"),
       )
     end
 
@@ -54,7 +59,7 @@ describe DirectMessage do
       direct_message = Fabricate(:direct_message, users: [user1])
 
       expect(direct_message.chat_channel_title_for_user(chat_channel, user1)).to eq(
-        I18n.t("chat.channel.dm_title.single_user", user: "@#{user1.username}"),
+        I18n.t("chat.channel.dm_title.single_user", username: "@#{user1.username}"),
       )
     end
 
diff --git a/plugins/chat/spec/models/chat_draft_spec.rb b/plugins/chat/spec/models/chat/draft_spec.rb
similarity index 94%
rename from plugins/chat/spec/models/chat_draft_spec.rb
rename to plugins/chat/spec/models/chat/draft_spec.rb
index 27794bafaec..4694c1ff7e8 100644
--- a/plugins/chat/spec/models/chat_draft_spec.rb
+++ b/plugins/chat/spec/models/chat/draft_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe ChatDraft do
+RSpec.describe Chat::Draft do
   before { SiteSetting.max_chat_draft_length = 100 }
 
   it "errors when data.value is greater than `max_chat_draft_length`" do
diff --git a/plugins/chat/spec/models/chat_message_spec.rb b/plugins/chat/spec/models/chat/message_spec.rb
similarity index 72%
rename from plugins/chat/spec/models/chat_message_spec.rb
rename to plugins/chat/spec/models/chat/message_spec.rb
index 9e305f98f25..e0a5c232078 100644
--- a/plugins/chat/spec/models/chat_message_spec.rb
+++ b/plugins/chat/spec/models/chat/message_spec.rb
@@ -2,36 +2,38 @@
 
 require "rails_helper"
 
-describe ChatMessage do
+describe Chat::Message do
   fab!(:message) { Fabricate(:chat_message, message: "hey friend, what's up?!") }
 
+  it { is_expected.to have_many(:chat_mentions).dependent(:destroy) }
+
   describe ".cook" do
     it "does not support HTML tags" do
-      cooked = ChatMessage.cook("<h1>test</h1>")
+      cooked = described_class.cook("<h1>test</h1>")
 
       expect(cooked).to eq("<p>&lt;h1&gt;test&lt;/h1&gt;</p>")
     end
 
     it "does not support headings" do
-      cooked = ChatMessage.cook("## heading 2")
+      cooked = described_class.cook("## heading 2")
 
       expect(cooked).to eq("<p>## heading 2</p>")
     end
 
     it "does not support horizontal rules" do
-      cooked = ChatMessage.cook("---")
+      cooked = described_class.cook("---")
 
       expect(cooked).to eq("<p>---</p>")
     end
 
     it "supports backticks rule" do
-      cooked = ChatMessage.cook("`test`")
+      cooked = described_class.cook("`test`")
 
       expect(cooked).to eq("<p><code>test</code></p>")
     end
 
     it "supports fence rule" do
-      cooked = ChatMessage.cook(<<~RAW)
+      cooked = described_class.cook(<<~RAW)
       ```
       something = test
       ```
@@ -44,7 +46,7 @@ describe ChatMessage do
     end
 
     it "supports fence rule with language support" do
-      cooked = ChatMessage.cook(<<~RAW)
+      cooked = described_class.cook(<<~RAW)
       ```ruby
       Widget.triangulate(argument: "no u")
       ```
@@ -57,13 +59,13 @@ describe ChatMessage do
     end
 
     it "supports code rule" do
-      cooked = ChatMessage.cook("    something = test")
+      cooked = described_class.cook("    something = test")
 
       expect(cooked).to eq("<pre><code>something = test\n</code></pre>")
     end
 
     it "supports blockquote rule" do
-      cooked = ChatMessage.cook("> a quote")
+      cooked = described_class.cook("> a quote")
 
       expect(cooked).to eq("<blockquote>\n<p>a quote</p>\n</blockquote>")
     end
@@ -73,9 +75,9 @@ describe ChatMessage do
       post = Fabricate(:post, topic: topic)
       SiteSetting.external_system_avatars_enabled = false
       avatar_src =
-        "//test.localhost#{User.system_avatar_template(post.user.username).gsub("{size}", "40")}"
+        "//test.localhost#{User.system_avatar_template(post.user.username).gsub("{size}", "48")}"
 
-      cooked = ChatMessage.cook(<<~RAW)
+      cooked = described_class.cook(<<~RAW)
       [quote="#{post.user.username}, post:#{post.post_number}, topic:#{topic.id}"]
       Mark me...this will go down in history.
       [/quote]
@@ -85,8 +87,7 @@ describe ChatMessage do
       <aside class="quote no-group" data-username="#{post.user.username}" data-post="#{post.post_number}" data-topic="#{topic.id}">
       <div class="title">
       <div class="quote-controls"></div>
-      <img loading="lazy" alt="" width="20" height="20" src="#{avatar_src}" class="avatar"><a href="http://test.localhost/t/some-quotable-topic/#{topic.id}/#{post.post_number}">#{topic.title}</a>
-      </div>
+      <img loading="lazy" alt="" width="24" height="24" src="#{avatar_src}" class="avatar"><a href="http://test.localhost/t/some-quotable-topic/#{topic.id}/#{post.post_number}">#{topic.title}</a></div>
       <blockquote>
       <p>Mark me...this will go down in history.</p>
       </blockquote>
@@ -99,9 +100,9 @@ describe ChatMessage do
       user = Fabricate(:user, username: "chatbbcodeuser")
       user2 = Fabricate(:user, username: "otherbbcodeuser")
       avatar_src =
-        "//test.localhost#{User.system_avatar_template(user.username).gsub("{size}", "40")}"
+        "//test.localhost#{User.system_avatar_template(user.username).gsub("{size}", "48")}"
       avatar_src2 =
-        "//test.localhost#{User.system_avatar_template(user2.username).gsub("{size}", "40")}"
+        "//test.localhost#{User.system_avatar_template(user2.username).gsub("{size}", "48")}"
       msg1 =
         Fabricate(
           :chat_message,
@@ -118,8 +119,8 @@ describe ChatMessage do
         )
       other_messages_to_quote = [msg1, msg2]
       cooked =
-        ChatMessage.cook(
-          ChatTranscriptService.new(
+        described_class.cook(
+          Chat::TranscriptService.new(
             chat_channel,
             Fabricate(:user),
             messages_or_ids: other_messages_to_quote.map(&:id),
@@ -129,48 +130,41 @@ describe ChatMessage do
       expect(cooked).to eq(<<~COOKED.chomp)
         <div class="chat-transcript chat-transcript-chained" data-message-id="#{msg1.id}" data-username="chatbbcodeuser" data-datetime="#{msg1.created_at.iso8601}" data-channel-name="testchannel" data-channel-id="#{chat_channel.id}">
         <div class="chat-transcript-meta">
-        Originally sent in <a href="/chat/channel/#{chat_channel.id}/-">testchannel</a>
-        </div>
+        Originally sent in <a href="/chat/c/-/#{chat_channel.id}">testchannel</a></div>
         <div class="chat-transcript-user">
         <div class="chat-transcript-user-avatar">
-        <img loading="lazy" alt="" width="20" height="20" src="#{avatar_src}" class="avatar">
-        </div>
+        <img loading="lazy" alt="" width="24" height="24" src="#{avatar_src}" class="avatar"></div>
         <div class="chat-transcript-username">
         chatbbcodeuser</div>
         <div class="chat-transcript-datetime">
-        <a href="/chat/channel/#{chat_channel.id}/-?messageId=#{msg1.id}" title="#{msg1.created_at.iso8601}"></a>
-        </div>
+        <a href="/chat/c/-/#{chat_channel.id}/#{msg1.id}" title="#{msg1.created_at.iso8601}"></a></div>
         </div>
         <div class="chat-transcript-messages">
-        <p>this is the first message</p>
-        </div>
+        <p>this is the first message</p></div>
         </div>
         <div class="chat-transcript chat-transcript-chained" data-message-id="#{msg2.id}" data-username="otherbbcodeuser" data-datetime="#{msg2.created_at.iso8601}">
         <div class="chat-transcript-user">
         <div class="chat-transcript-user-avatar">
-        <img loading="lazy" alt="" width="20" height="20" src="#{avatar_src2}" class="avatar">
-        </div>
+        <img loading="lazy" alt="" width="24" height="24" src="#{avatar_src2}" class="avatar"></div>
         <div class="chat-transcript-username">
         otherbbcodeuser</div>
         <div class="chat-transcript-datetime">
-        <span title="#{msg2.created_at.iso8601}"></span>
-        </div>
+        <span title="#{msg2.created_at.iso8601}"></span></div>
         </div>
         <div class="chat-transcript-messages">
-        <p>and another cool one</p>
-        </div>
+        <p>and another cool one</p></div>
         </div>
       COOKED
     end
 
     it "supports strikethrough rule" do
-      cooked = ChatMessage.cook("~~test~~")
+      cooked = described_class.cook("~~test~~")
 
       expect(cooked).to eq("<p><s>test</s></p>")
     end
 
     it "supports emphasis rule" do
-      cooked = ChatMessage.cook("**bold**")
+      cooked = described_class.cook("**bold**")
 
       expect(cooked).to eq("<p><strong>bold</strong></p>")
     end
@@ -184,7 +178,7 @@ describe ChatMessage do
     end
 
     it "supports table markdown plugin" do
-      cooked = ChatMessage.cook(<<~RAW)
+      cooked = described_class.cook(<<~RAW)
       | Command | Description |
       | --- | --- |
       | git status | List all new or modified files |
@@ -213,7 +207,7 @@ describe ChatMessage do
     end
 
     it "supports onebox markdown plugin" do
-      cooked = ChatMessage.cook("https://www.example.com")
+      cooked = described_class.cook("https://www.example.com")
 
       expect(cooked).to eq(
         "<p><a href=\"https://www.example.com\" class=\"onebox\" target=\"_blank\" rel=\"noopener nofollow ugc\">https://www.example.com</a></p>",
@@ -221,7 +215,7 @@ describe ChatMessage do
     end
 
     it "supports emoji plugin" do
-      cooked = ChatMessage.cook(":grin:")
+      cooked = described_class.cook(":grin:")
 
       expect(cooked).to eq(
         "<p><img src=\"/images/emoji/twitter/grin.png?v=12\" title=\":grin:\" class=\"emoji only-emoji\" alt=\":grin:\" loading=\"lazy\" width=\"20\" height=\"20\"></p>",
@@ -229,7 +223,7 @@ describe ChatMessage do
     end
 
     it "supports mentions plugin" do
-      cooked = ChatMessage.cook("@mention")
+      cooked = described_class.cook("@mention")
 
       expect(cooked).to eq("<p><span class=\"mention\">@mention</span></p>")
     end
@@ -240,31 +234,40 @@ describe ChatMessage do
 
       category = Fabricate(:category)
 
-      cooked = ChatMessage.cook("##{category.slug}")
+      cooked = described_class.cook("##{category.slug}")
 
       expect(cooked).to eq(
         "<p><a class=\"hashtag\" href=\"#{category.url}\">#<span>#{category.slug}</span></a></p>",
       )
     end
 
-    it "supports hashtag-autocomplete plugin" do
+    it "supports hashtag autocomplete" do
       SiteSetting.chat_enabled = true
       SiteSetting.enable_experimental_hashtag_autocomplete = true
 
       category = Fabricate(:category)
       user = Fabricate(:user)
 
-      cooked = ChatMessage.cook("##{category.slug}", user_id: user.id)
+      cooked = described_class.cook("##{category.slug}", user_id: user.id)
 
-      expect(cooked).to eq(
-        "<p><a class=\"hashtag-cooked\" href=\"#{category.url}\" data-type=\"category\" data-slug=\"#{category.slug}\"><svg class=\"fa d-icon d-icon-folder svg-icon svg-node\"><use href=\"#folder\"></use></svg><span>#{category.name}</span></a></p>",
-      )
+      expect(cooked).to have_tag(
+        "a",
+        with: {
+          class: "hashtag-cooked",
+          href: category.url,
+          "data-type": "category",
+          "data-slug": category.slug,
+          "data-id": category.id,
+        },
+      ) do
+        with_tag("span", with: { class: "hashtag-icon-placeholder" })
+      end
     end
 
     it "supports censored plugin" do
       watched_word = Fabricate(:watched_word, action: WatchedWord.actions[:censor])
 
-      cooked = ChatMessage.cook(watched_word.word)
+      cooked = described_class.cook(watched_word.word)
 
       expect(cooked).to eq("<p>■■■■■</p>")
     end
@@ -285,37 +288,18 @@ describe ChatMessage do
         COOKED
         )
       expect(message.excerpt).to eq("https://twitter.com/EffinBirds/status/1518743508378697729")
-      message =
-        Fabricate.build(
-          :chat_message,
-          message:
-            "wow check out these birbs https://twitter.com/EffinBirds/status/1518743508378697729",
-        )
-      expect(message.excerpt).to eq(
-        "wow check out these birbs <a href=\"https://twitter.com/EffinBirds/status/1518743508378697729\" class=\"inline-onebox-loading\" rel=\"noopener nofollow ugc\">https://twitter.com/Effi&hellip;</a>",
-      )
-    end
-
-    it "returns an empty string if PrettyText.excerpt returns empty string" do
-      message = Fabricate(:chat_message, message: <<~MSG)
-      [quote="martin, post:30, topic:3179, full:true"]
-      This is a real **quote** topic with some *markdown* in it I can quote.
-      [/quote]
-      MSG
-      expect(message.excerpt).to eq("")
     end
 
     it "excerpts upload file name if message is empty" do
       gif =
         Fabricate(:upload, original_filename: "cat.gif", width: 400, height: 300, extension: "gif")
-      message = Fabricate(:chat_message, message: "")
-      ChatUpload.create(chat_message: message, upload: gif)
+      message = Fabricate(:chat_message, message: "", uploads: [gif])
 
       expect(message.excerpt).to eq "cat.gif"
     end
 
     it "supports autolink with <>" do
-      cooked = ChatMessage.cook("<https://github.com/discourse/discourse-chat/pull/468>")
+      cooked = described_class.cook("<https://github.com/discourse/discourse-chat/pull/468>")
 
       expect(cooked).to eq(
         "<p><a href=\"https://github.com/discourse/discourse-chat/pull/468\" rel=\"noopener nofollow ugc\">https://github.com/discourse/discourse-chat/pull/468</a></p>",
@@ -323,7 +307,7 @@ describe ChatMessage do
     end
 
     it "supports lists" do
-      cooked = ChatMessage.cook(<<~MSG)
+      cooked = described_class.cook(<<~MSG)
       wow look it's a list
 
       * item 1
@@ -340,14 +324,14 @@ describe ChatMessage do
     end
 
     it "supports inline emoji" do
-      cooked = ChatMessage.cook(":D")
+      cooked = described_class.cook(":D")
       expect(cooked).to eq(<<~HTML.chomp)
       <p><img src="/images/emoji/twitter/smiley.png?v=12" title=":smiley:" class="emoji only-emoji" alt=":smiley:" loading=\"lazy\" width=\"20\" height=\"20\"></p>
       HTML
     end
 
     it "supports emoji shortcuts" do
-      cooked = ChatMessage.cook("this is a replace test :P :|")
+      cooked = described_class.cook("this is a replace test :P :|")
       expect(cooked).to eq(<<~HTML.chomp)
         <p>this is a replace test <img src="/images/emoji/twitter/stuck_out_tongue.png?v=12" title=":stuck_out_tongue:" class="emoji" alt=":stuck_out_tongue:" loading=\"lazy\" width=\"20\" height=\"20\"> <img src="/images/emoji/twitter/expressionless.png?v=12" title=":expressionless:" class="emoji" alt=":expressionless:" loading=\"lazy\" width=\"20\" height=\"20\"></p>
       HTML
@@ -355,7 +339,8 @@ describe ChatMessage do
 
     it "supports spoilers" do
       if SiteSetting.respond_to?(:spoiler_enabled) && SiteSetting.spoiler_enabled
-        cooked = ChatMessage.cook("[spoiler]the planet of the apes was earth all along[/spoiler]")
+        cooked =
+          described_class.cook("[spoiler]the planet of the apes was earth all along[/spoiler]")
 
         expect(cooked).to eq(
           "<div class=\"spoiler\">\n<p>the planet of the apes was earth all along</p>\n</div>",
@@ -368,7 +353,7 @@ describe ChatMessage do
 
       it "cooks unicode mentions" do
         user = Fabricate(:unicode_user)
-        cooked = ChatMessage.cook("<h1>@#{user.username}</h1>")
+        cooked = described_class.cook("<h1>@#{user.username}</h1>")
 
         expect(cooked).to eq("<p>&lt;h1&gt;@#{user.username}&lt;/h1&gt;</p>")
       end
@@ -391,8 +376,7 @@ describe ChatMessage do
         )
       image2 =
         Fabricate(:upload, original_filename: "meme.jpg", width: 10, height: 10, extension: "jpg")
-      ChatUpload.create(chat_message: message, upload: image)
-      ChatUpload.create(chat_message: message, upload: image2)
+      message.uploads = [image, image2]
       expect(message.to_markdown).to eq(<<~MSG.chomp)
       hey friend, what's up?!
 
@@ -404,12 +388,12 @@ describe ChatMessage do
 
   describe ".push_notification_excerpt" do
     it "truncates to 400 characters" do
-      message = ChatMessage.new(message: "Hello, World!" * 40)
+      message = described_class.new(message: "Hello, World!" * 40)
       expect(message.push_notification_excerpt.size).to eq(400)
     end
 
     it "encodes emojis" do
-      message = ChatMessage.new(message: ":grinning:")
+      message = described_class.new(message: ":grinning:")
       expect(message.push_notification_excerpt).to eq("😀")
     end
   end
@@ -423,8 +407,9 @@ describe ChatMessage do
 
     it "blocks duplicate messages for the message, channel user, and message age requirements" do
       Fabricate(:chat_message, message: "this is duplicate", chat_channel: channel, user: user1)
-      message = ChatMessage.new(message: "this is duplicate", chat_channel: channel, user: user2)
-      message.validate_message(has_uploads: false)
+      message =
+        described_class.new(message: "this is duplicate", chat_channel: channel, user: user2)
+      message.valid?
       expect(message.errors.full_messages).to include(I18n.t("chat.errors.duplicate_message"))
     end
   end
@@ -463,39 +448,46 @@ describe ChatMessage do
 
     it "destroys chat_mention" do
       message_1 = Fabricate(:chat_message)
-      mention_1 = Fabricate(:chat_mention, chat_message: message_1)
+      notification = Fabricate(:notification)
+      mention_1 = Fabricate(:chat_mention, chat_message: message_1, notification: notification)
 
-      message_1.destroy!
+      message_1.reload.destroy!
 
       expect { mention_1.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect { notification.reload }.to raise_error(ActiveRecord::RecordNotFound)
     end
 
     it "destroys chat_webhook_event" do
       message_1 = Fabricate(:chat_message)
       webhook_1 = Fabricate(:chat_webhook_event, chat_message: message_1)
 
-      message_1.destroy!
+      # Need to reload because chat_webhook_event instantiates the message
+      # before the relationship is created
+      message_1.reload.destroy!
 
       expect { webhook_1.reload }.to raise_error(ActiveRecord::RecordNotFound)
     end
 
-    it "destroys chat_uploads" do
+    it "destroys upload_references" do
       message_1 = Fabricate(:chat_message)
-      chat_upload_1 = Fabricate(:chat_upload, chat_message: message_1)
+      upload_reference_1 = Fabricate(:upload_reference, target: message_1)
+      upload_1 = Fabricate(:upload)
 
       message_1.destroy!
 
-      expect { chat_upload_1.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect { upload_reference_1.reload }.to raise_error(ActiveRecord::RecordNotFound)
     end
 
     describe "bookmarks" do
-      before { Bookmark.register_bookmarkable(ChatMessageBookmarkable) }
+      before { register_test_bookmarkable(Chat::MessageBookmarkable) }
+
+      after { DiscoursePluginRegistry.reset_register!(:bookmarkables) }
 
       it "destroys bookmarks" do
         message_1 = Fabricate(:chat_message)
         bookmark_1 = Fabricate(:bookmark, bookmarkable: message_1)
 
-        message_1.destroy!
+        message_1.reload.destroy!
 
         expect { bookmark_1.reload }.to raise_error(ActiveRecord::RecordNotFound)
       end
@@ -532,4 +524,78 @@ describe ChatMessage do
       end
     end
   end
+
+  describe "#create_mentions" do
+    fab!(:message) { Fabricate(:chat_message) }
+    fab!(:user1) { Fabricate(:user) }
+    fab!(:user2) { Fabricate(:user) }
+
+    it "creates mentions for mentioned  usernames" do
+      message.message = "Mentioning @#{user1.username} and @#{user2.username}"
+      message.cook
+
+      message.create_mentions
+      message.reload
+
+      expect(message.chat_mentions.pluck(:user_id)).to match_array([user1.id, user2.id])
+    end
+
+    it "ignores duplicated mentions" do
+      message.message =
+        "Mentioning @#{user1.username} @#{user1.username} @#{user1.username} @#{user1.username}"
+      message.cook
+
+      message.create_mentions
+      message.reload
+
+      expect(message.chat_mentions.pluck(:user_id)).to contain_exactly(user1.id)
+    end
+  end
+
+  describe "#update_mentions" do
+    fab!(:user1) { Fabricate(:user) }
+    fab!(:user2) { Fabricate(:user) }
+    fab!(:user3) { Fabricate(:user) }
+    fab!(:user4) { Fabricate(:user) }
+    fab!(:message) do
+      Fabricate(:chat_message, message: "Hey @#{user1.username} and @#{user2.username}")
+    end
+    let(:already_mentioned) { [user1.id, user2.id] }
+
+    it "creates newly added mentions" do
+      existing_mention_ids = message.chat_mentions.pluck(:id)
+      message.message = message.message + " @#{user3.username} @#{user4.username} "
+      message.cook
+
+      message.update_mentions
+      message.reload
+
+      expect(message.chat_mentions.pluck(:user_id)).to match_array(
+        [user1.id, user2.id, user3.id, user4.id],
+      )
+      expect(message.chat_mentions.pluck(:id)).to include(*existing_mention_ids) # existing mentions weren't recreated
+    end
+
+    it "drops removed mentions" do
+      message.message = "Hey @#{user1.username}" # user 2 is not mentioned anymore
+      message.cook
+
+      message.update_mentions
+      message.reload
+
+      expect(message.chat_mentions.pluck(:user_id)).to contain_exactly(user1.id)
+    end
+
+    it "changes nothing if passed mentions are identical to existing mentions" do
+      existing_mention_ids = message.chat_mentions.pluck(:id)
+      message.message = message.message
+      message.cook
+
+      message.update_mentions
+      message.reload
+
+      expect(message.chat_mentions.pluck(:user_id)).to match_array(already_mentioned)
+      expect(message.chat_mentions.pluck(:id)).to include(*existing_mention_ids) # the mentions weren't recreated
+    end
+  end
 end
diff --git a/plugins/chat/spec/models/reviewable_chat_message_spec.rb b/plugins/chat/spec/models/chat/reviewable_chat_message_spec.rb
similarity index 91%
rename from plugins/chat/spec/models/reviewable_chat_message_spec.rb
rename to plugins/chat/spec/models/chat/reviewable_chat_message_spec.rb
index 95e7fab29a0..d7f6a951018 100644
--- a/plugins/chat/spec/models/reviewable_chat_message_spec.rb
+++ b/plugins/chat/spec/models/chat/reviewable_chat_message_spec.rb
@@ -2,13 +2,13 @@
 
 require "rails_helper"
 
-RSpec.describe ReviewableChatMessage, type: :model do
+RSpec.describe Chat::ReviewableMessage, type: :model do
   fab!(:moderator) { Fabricate(:moderator) }
   fab!(:user) { Fabricate(:user) }
   fab!(:chat_channel) { Fabricate(:chat_channel) }
   fab!(:chat_message) { Fabricate(:chat_message, chat_channel: chat_channel, user: user) }
   fab!(:reviewable) do
-    Fabricate(:reviewable_chat_message, target: chat_message, created_by: moderator)
+    Fabricate(:chat_reviewable_message, target: chat_message, created_by: moderator)
   end
 
   it "agree_and_keep agrees with the flag and doesn't delete the message" do
@@ -23,7 +23,7 @@ RSpec.describe ReviewableChatMessage, type: :model do
     reviewable.perform(moderator, :agree_and_delete)
 
     expect(reviewable).to be_approved
-    expect(ChatMessage.with_deleted.find_by(id: chat_message_id).deleted_at).to be_present
+    expect(Chat::Message.with_deleted.find_by(id: chat_message_id).deleted_at).to be_present
   end
 
   it "agree_and_restore agrees with the flag and restores the message" do
diff --git a/plugins/chat/spec/models/chat/thread_spec.rb b/plugins/chat/spec/models/chat/thread_spec.rb
new file mode 100644
index 00000000000..cc9483df9b7
--- /dev/null
+++ b/plugins/chat/spec/models/chat/thread_spec.rb
@@ -0,0 +1,236 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::Thread do
+  before { SiteSetting.chat_enabled = true }
+
+  describe ".ensure_consistency!" do
+    fab!(:channel) { Fabricate(:category_channel) }
+    fab!(:thread_1) { Fabricate(:chat_thread, channel: channel) }
+    fab!(:thread_2) { Fabricate(:chat_thread, channel: channel) }
+    fab!(:thread_3) { Fabricate(:chat_thread, channel: channel) }
+
+    before do
+      Fabricate(:chat_message, chat_channel: channel, thread: thread_1)
+      Fabricate(:chat_message, chat_channel: channel, thread: thread_1)
+      Fabricate(:chat_message, chat_channel: channel, thread: thread_1)
+
+      Fabricate(:chat_message, chat_channel: channel, thread: thread_2)
+      Fabricate(:chat_message, chat_channel: channel, thread: thread_2)
+      Fabricate(:chat_message, chat_channel: channel, thread: thread_2)
+      Fabricate(:chat_message, chat_channel: channel, thread: thread_2)
+
+      Fabricate(:chat_message, chat_channel: channel, thread: thread_3)
+    end
+
+    describe "updating replies_count for all threads" do
+      it "counts correctly and does not include the original message" do
+        described_class.ensure_consistency!
+        expect(thread_1.reload.replies_count).to eq(3)
+        expect(thread_2.reload.replies_count).to eq(4)
+        expect(thread_3.reload.replies_count).to eq(1)
+      end
+
+      it "does not count deleted messages" do
+        thread_1.chat_messages.last.trash!
+        described_class.ensure_consistency!
+        expect(thread_1.reload.replies_count).to eq(2)
+      end
+
+      it "sets the replies count to 0 if all the messages but the original message are deleted" do
+        thread_1.replies.delete_all
+
+        described_class.ensure_consistency!
+        expect(thread_1.reload.replies_count).to eq(0)
+      end
+
+      it "clears the affected replies_count caches" do
+        thread_1.set_replies_count_cache(100)
+        expect(thread_1.replies_count_cache).to eq(100)
+        expect(thread_1.replies_count_cache_updated_at).not_to eq(nil)
+
+        described_class.ensure_consistency!
+        expect(Discourse.redis.get(Chat::Thread.replies_count_cache_redis_key(thread_1.id))).to eq(
+          nil,
+        )
+        expect(
+          Discourse.redis.get(Chat::Thread.replies_count_cache_updated_at_redis_key(thread_1.id)),
+        ).to eq(nil)
+      end
+
+      it "does not attempt to clear caches if no replies_count caches are updated" do
+        described_class.ensure_consistency!
+        Chat::Thread.expects(:clear_caches!).never
+        described_class.ensure_consistency!
+      end
+    end
+  end
+
+  describe ".clear_caches" do
+    fab!(:channel) { Fabricate(:category_channel) }
+    fab!(:thread_1) { Fabricate(:chat_thread, channel: channel) }
+    fab!(:thread_2) { Fabricate(:chat_thread, channel: channel) }
+
+    before do
+      thread_1.set_replies_count_cache(100)
+      thread_2.set_replies_count_cache(100)
+    end
+
+    it "clears multiple keys" do
+      Chat::Thread.clear_caches!([thread_1.id, thread_2.id])
+      expect(Discourse.redis.get(Chat::Thread.replies_count_cache_redis_key(thread_1.id))).to eq(
+        nil,
+      )
+      expect(
+        Discourse.redis.get(Chat::Thread.replies_count_cache_updated_at_redis_key(thread_1.id)),
+      ).to eq(nil)
+      expect(Discourse.redis.get(Chat::Thread.replies_count_cache_redis_key(thread_2.id))).to eq(
+        nil,
+      )
+      expect(
+        Discourse.redis.get(Chat::Thread.replies_count_cache_updated_at_redis_key(thread_2.id)),
+      ).to eq(nil)
+    end
+
+    it "wraps the ids into an array if only an integer is provided" do
+      Chat::Thread.clear_caches!(thread_1.id)
+      expect(Discourse.redis.get(Chat::Thread.replies_count_cache_redis_key(thread_1.id))).to eq(
+        nil,
+      )
+      expect(
+        Discourse.redis.get(Chat::Thread.replies_count_cache_updated_at_redis_key(thread_1.id)),
+      ).to eq(nil)
+    end
+  end
+
+  describe ".grouped_messages" do
+    fab!(:channel) { Fabricate(:category_channel) }
+    fab!(:thread_1) { Fabricate(:chat_thread, channel: channel) }
+    fab!(:thread_2) { Fabricate(:chat_thread, channel: channel) }
+
+    fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel, thread: thread_1) }
+    fab!(:message_2) { Fabricate(:chat_message, chat_channel: channel, thread: thread_1) }
+    fab!(:message_3) { Fabricate(:chat_message, chat_channel: channel, thread: thread_2) }
+
+    let(:result) { Chat::Thread.grouped_messages(**params) }
+
+    context "when thread_ids provided" do
+      let(:params) { { thread_ids: [thread_1.id, thread_2.id] } }
+
+      it "groups all the message ids in each thread by thread ID" do
+        expect(result.find { |res| res.thread_id == thread_1.id }.to_h).to eq(
+          {
+            thread_message_ids: [thread_1.original_message_id, message_1.id, message_2.id],
+            thread_id: thread_1.id,
+            original_message_id: thread_1.original_message_id,
+          },
+        )
+        expect(result.find { |res| res.thread_id == thread_2.id }.to_h).to eq(
+          {
+            thread_message_ids: [thread_2.original_message_id, message_3.id],
+            thread_id: thread_2.id,
+            original_message_id: thread_2.original_message_id,
+          },
+        )
+      end
+
+      context "when include_original_message is false" do
+        let(:params) { { thread_ids: [thread_1.id, thread_2.id], include_original_message: false } }
+
+        it "does not include the original message in the thread_message_ids" do
+          expect(result.find { |res| res.thread_id == thread_1.id }.to_h).to eq(
+            {
+              thread_message_ids: [message_1.id, message_2.id],
+              thread_id: thread_1.id,
+              original_message_id: thread_1.original_message_id,
+            },
+          )
+        end
+      end
+    end
+
+    context "when message_ids provided" do
+      let(:params) do
+        {
+          message_ids: [
+            thread_1.original_message_id,
+            thread_2.original_message_id,
+            message_1.id,
+            message_2.id,
+            message_3.id,
+          ],
+        }
+      end
+
+      it "groups all the message ids in each thread by thread ID" do
+        expect(result.find { |res| res.thread_id == thread_1.id }.to_h).to eq(
+          {
+            thread_message_ids: [thread_1.original_message_id, message_1.id, message_2.id],
+            thread_id: thread_1.id,
+            original_message_id: thread_1.original_message_id,
+          },
+        )
+        expect(result.find { |res| res.thread_id == thread_2.id }.to_h).to eq(
+          {
+            thread_message_ids: [thread_2.original_message_id, message_3.id],
+            thread_id: thread_2.id,
+            original_message_id: thread_2.original_message_id,
+          },
+        )
+      end
+
+      context "when include_original_message is false" do
+        let(:params) do
+          {
+            message_ids: [
+              thread_1.original_message_id,
+              thread_2.original_message_id,
+              message_1.id,
+              message_2.id,
+              message_3.id,
+            ],
+            include_original_message: false,
+          }
+        end
+
+        it "does not include the original message in the thread_message_ids" do
+          expect(result.find { |res| res.thread_id == thread_1.id }.to_h).to eq(
+            {
+              thread_message_ids: [message_1.id, message_2.id],
+              thread_id: thread_1.id,
+              original_message_id: thread_1.original_message_id,
+            },
+          )
+        end
+      end
+    end
+  end
+
+  describe "#latest_not_deleted_message_id" do
+    fab!(:channel) { Fabricate(:category_channel) }
+    fab!(:thread) { Fabricate(:chat_thread, channel: channel, old_om: true) }
+    fab!(:old_message) { Fabricate(:chat_message, chat_channel: channel, thread: thread) }
+    fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel, thread: thread) }
+
+    before { old_message.update!(created_at: 1.day.ago) }
+
+    it "accepts an anchor message to only get messages of a lower id" do
+      expect(thread.latest_not_deleted_message_id(anchor_message_id: message_1.id)).to eq(
+        old_message.id,
+      )
+    end
+
+    it "gets the latest message by created_at" do
+      expect(thread.latest_not_deleted_message_id).to eq(message_1.id)
+    end
+
+    it "does not get other channel messages" do
+      Fabricate(:chat_message)
+      expect(thread.latest_not_deleted_message_id).to eq(message_1.id)
+    end
+
+    it "does not get deleted messages" do
+      message_1.trash!
+      expect(thread.latest_not_deleted_message_id).to eq(old_message.id)
+    end
+  end
+end
diff --git a/plugins/chat/spec/models/chat/user_chat_thread_membership_spec.rb b/plugins/chat/spec/models/chat/user_chat_thread_membership_spec.rb
new file mode 100644
index 00000000000..9786f30164d
--- /dev/null
+++ b/plugins/chat/spec/models/chat/user_chat_thread_membership_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::UserChatThreadMembership do
+  it { is_expected.to belong_to(:user).class_name("User") }
+  it { is_expected.to belong_to(:last_read_message).class_name("Chat::Message") }
+  it { is_expected.to belong_to(:thread).class_name("Chat::Thread") }
+
+  it do
+    is_expected.to define_enum_for(:notification_level).with_values(
+      muted: 0,
+      normal: 1,
+      tracking: 2,
+      watching: 3,
+    )
+  end
+end
diff --git a/plugins/chat/spec/models/chat_channel_spec.rb b/plugins/chat/spec/models/chat_channel_spec.rb
deleted file mode 100644
index 06d12125106..00000000000
--- a/plugins/chat/spec/models/chat_channel_spec.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe ChatChannel do
-  fab!(:category_channel1) { Fabricate(:category_channel) }
-  fab!(:dm_channel1) { Fabricate(:direct_message_channel) }
-
-  describe "#relative_url" do
-    context "when the slug is nil" do
-      it "uses a - instead" do
-        category_channel1.slug = nil
-        expect(category_channel1.relative_url).to eq("/chat/channel/#{category_channel1.id}/-")
-      end
-    end
-
-    context "when the slug is not nil" do
-      before { category_channel1.update!(slug: "some-cool-channel") }
-
-      it "includes the slug for the channel" do
-        expect(category_channel1.relative_url).to eq(
-          "/chat/channel/#{category_channel1.id}/some-cool-channel",
-        )
-      end
-    end
-  end
-
-  describe ".ensure_consistency!" do
-    fab!(:category_channel2) { Fabricate(:category_channel) }
-    fab!(:category_channel3) { Fabricate(:category_channel) }
-    fab!(:category_channel4) { Fabricate(:category_channel) }
-    fab!(:dm_channel2) { Fabricate(:direct_message_channel) }
-
-    before do
-      Fabricate(:chat_message, chat_channel: category_channel1)
-      Fabricate(:chat_message, chat_channel: category_channel1)
-      Fabricate(:chat_message, chat_channel: category_channel1)
-
-      Fabricate(:chat_message, chat_channel: category_channel2)
-      Fabricate(:chat_message, chat_channel: category_channel2)
-      Fabricate(:chat_message, chat_channel: category_channel2)
-      Fabricate(:chat_message, chat_channel: category_channel2)
-
-      Fabricate(:chat_message, chat_channel: category_channel3)
-
-      Fabricate(:chat_message, chat_channel: dm_channel2)
-      Fabricate(:chat_message, chat_channel: dm_channel2)
-    end
-
-    describe "updating messages_count for all channels" do
-      it "counts correctly" do
-        described_class.ensure_consistency!
-        expect(category_channel1.reload.messages_count).to eq(3)
-        expect(category_channel2.reload.messages_count).to eq(4)
-        expect(category_channel3.reload.messages_count).to eq(1)
-        expect(category_channel4.reload.messages_count).to eq(0)
-        expect(dm_channel1.reload.messages_count).to eq(0)
-        expect(dm_channel2.reload.messages_count).to eq(2)
-      end
-
-      it "does not count deleted messages" do
-        category_channel3.chat_messages.last.trash!
-        described_class.ensure_consistency!
-        expect(category_channel3.reload.messages_count).to eq(0)
-      end
-
-      it "does not update deleted channels" do
-        described_class.ensure_consistency!
-        category_channel3.chat_messages.last.trash!
-        category_channel3.trash!
-        described_class.ensure_consistency!
-        expect(category_channel3.reload.messages_count).to eq(1)
-      end
-    end
-  end
-
-  describe "#allow_channel_wide_mentions" do
-    it "defaults to true" do
-      expect(category_channel1.allow_channel_wide_mentions).to be(true)
-    end
-
-    it "cant be nullified" do
-      expect { category_channel1.update!(allow_channel_wide_mentions: nil) }.to raise_error(
-        ActiveRecord::NotNullViolation,
-      )
-    end
-  end
-end
diff --git a/plugins/chat/spec/models/deleted_chat_user_spec.rb b/plugins/chat/spec/models/deleted_chat_user_spec.rb
deleted file mode 100644
index 387eb5c89f9..00000000000
--- a/plugins/chat/spec/models/deleted_chat_user_spec.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require "rails_helper"
-
-describe DeletedChatUser do
-  describe "#username" do
-    it "returns a default username" do
-      expect(subject.username).to eq(I18n.t("chat.deleted_chat_username"))
-    end
-  end
-
-  describe "#avatar_template" do
-    it "returns a default path" do
-      expect(subject.avatar_template).to eq("/plugins/chat/images/deleted-chat-user-avatar.png")
-    end
-  end
-end
diff --git a/plugins/chat/spec/plugin_helper.rb b/plugins/chat/spec/plugin_helper.rb
index 33657da1fc5..657646b905c 100644
--- a/plugins/chat/spec/plugin_helper.rb
+++ b/plugins/chat/spec/plugin_helper.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "faker"
+
 module ChatSystemHelpers
   def chat_system_bootstrap(user = Fabricate(:admin), channels_for_membership = [])
     # ensures we have one valid registered admin/user
@@ -16,10 +18,65 @@ module ChatSystemHelpers
     end
 
     Group.refresh_automatic_groups!
+  end
 
-    # this is reset after each test
-    Bookmark.register_bookmarkable(ChatMessageBookmarkable)
+  def chat_system_user_bootstrap(user:, channel:)
+    user.activate
+    user.user_option.update!(chat_enabled: true)
+    Group.refresh_automatic_group!("trust_level_#{user.trust_level}".to_sym)
+    Fabricate(:user_chat_channel_membership, chat_channel: channel, user: user)
+  end
+
+  def chat_thread_chain_bootstrap(channel:, users:, messages_count: 4, thread_attrs: {})
+    last_user = nil
+    last_message = nil
+
+    messages_count.times do |i|
+      in_reply_to = i.zero? ? nil : last_message.id
+      thread_id = i.zero? ? nil : last_message.thread_id
+      last_user = last_user.present? ? (users - [last_user]).sample : users.sample
+      creator =
+        Chat::MessageCreator.new(
+          chat_channel: channel,
+          in_reply_to_id: in_reply_to,
+          thread_id: thread_id,
+          user: last_user,
+          content: Faker::Lorem.paragraph,
+        )
+      creator.create
+
+      raise creator.error if creator.error
+      last_message = creator.chat_message
+    end
+
+    last_message.thread.set_replies_count_cache(messages_count - 1, update_db: true)
+    last_message.thread.update!(thread_attrs) if thread_attrs.any?
+    last_message.thread
+  end
+
+  def thread_excerpt(message)
+    CGI.escapeHTML(
+      message.censored_excerpt(max_length: ::Chat::Thread::EXCERPT_LENGTH).gsub("&hellip;", "…"),
+    )
   end
 end
 
-RSpec.configure { |config| config.include ChatSystemHelpers, type: :system }
+module ChatSpecHelpers
+  def service_failed!(result)
+    raise RSpec::Expectations::ExpectationNotMetError.new(
+            "Service failed, see below for step details:\n\n" + result.inspect_steps.inspect,
+          )
+  end
+end
+
+RSpec.configure do |config|
+  config.include ChatSystemHelpers, type: :system
+  config.include ChatSpecHelpers
+  config.include Chat::WithServiceHelper
+  config.include Chat::ServiceMatchers
+
+  config.expect_with :rspec do |c|
+    # Or a very large value, if you do want to truncate at some point
+    c.max_formatted_output_length = nil
+  end
+end
diff --git a/plugins/chat/spec/plugin_spec.rb b/plugins/chat/spec/plugin_spec.rb
index 68cdda55f97..67ba998b4e3 100644
--- a/plugins/chat/spec/plugin_spec.rb
+++ b/plugins/chat/spec/plugin_spec.rb
@@ -17,7 +17,7 @@ describe Chat do
     fab!(:unused_upload) { Fabricate(:upload, user: user, created_at: 1.month.ago) }
 
     let!(:chat_message) do
-      Chat::ChatMessageCreator.create(
+      Chat::MessageCreator.create(
         chat_channel: chat_channel,
         user: user,
         in_reply_to_id: nil,
@@ -26,7 +26,7 @@ describe Chat do
       )
     end
 
-    it "marks uploads with ChatUpload in use" do
+    it "marks uploads with reference to ChatMessage via UploadReference in use" do
       unused_upload
 
       expect { Jobs::CleanUpUploads.new.execute({}) }.to change { Upload.count }.by(-1)
@@ -43,7 +43,7 @@ describe Chat do
     fab!(:unused_upload) { Fabricate(:upload, user: user, created_at: 1.month.ago) }
 
     let!(:chat_message) do
-      Chat::ChatMessageCreator.create(
+      Chat::MessageCreator.create(
         chat_channel: chat_channel,
         user: user,
         in_reply_to_id: nil,
@@ -53,7 +53,7 @@ describe Chat do
     end
 
     let!(:draft_message) do
-      ChatDraft.create!(
+      Chat::Draft.create!(
         user: user,
         chat_channel: chat_channel,
         data:
@@ -61,7 +61,7 @@ describe Chat do
       )
     end
 
-    it "marks uploads with ChatUpload in use" do
+    it "marks uploads with reference to ChatMessage via UploadReference in use" do
       draft_upload
       unused_upload
 
@@ -135,7 +135,7 @@ describe Chat do
     fab!(:user_4) { Fabricate(:user, suspended_till: 3.weeks.from_now) }
 
     let!(:chat_message) do
-      Chat::ChatMessageCreator.create(
+      Chat::MessageCreator.create(
         chat_channel: chat_channel,
         user: user,
         in_reply_to_id: nil,
@@ -144,7 +144,7 @@ describe Chat do
       ).chat_message
     end
 
-    let(:chat_url) { "#{Discourse.base_url}/chat/channel/#{chat_channel.id}" }
+    let(:chat_url) { "#{Discourse.base_url}/chat/c/-/#{chat_channel.id}" }
 
     context "when inline" do
       it "renders channel" do
@@ -155,10 +155,9 @@ describe Chat do
       end
 
       it "renders messages" do
-        results =
-          InlineOneboxer.new(["#{chat_url}?messageId=#{chat_message.id}"], skip_cache: true).process
+        results = InlineOneboxer.new(["#{chat_url}/#{chat_message.id}"], skip_cache: true).process
         expect(results).to be_present
-        expect(results[0][:url]).to eq("#{chat_url}?messageId=#{chat_message.id}")
+        expect(results[0][:url]).to eq("#{chat_url}/#{chat_message.id}")
         expect(results[0][:title]).to eq(
           "Message ##{chat_message.id} by #{chat_message.user.username} – ##{chat_channel.name}",
         )
@@ -171,7 +170,7 @@ describe Chat do
         user_2.user_chat_channel_memberships.create!(chat_channel: chat_channel, following: true)
         user_3.user_chat_channel_memberships.create!(chat_channel: chat_channel, following: true)
         user_4.user_chat_channel_memberships.create!(chat_channel: chat_channel, following: true)
-        Jobs::UpdateUserCountsForChatChannels.new.execute({})
+        Chat::Channel.ensure_consistency!
 
         expect(Oneboxer.preview(chat_url)).to match_html <<~HTML
           <aside class="onebox chat-onebox">
@@ -179,7 +178,7 @@ describe Chat do
               <h3 class="chat-onebox-title">
                 <a href="#{chat_url}">
                   <span class="category-chat-badge" style="color: ##{chat_channel.chatable.color}">
-                    <svg class="fa d-icon d-icon-hashtag svg-icon svg-string" xmlns="http://www.w3.org/2000/svg"><use href="#hashtag"></use></svg>
+                    <svg class="fa d-icon d-icon-d-chat svg-icon svg-string" xmlns="http://www.w3.org/2000/svg"><use href="#d-chat"></use></svg>
                  </span>
                   <span class="clear-badge">#{chat_channel.name}</span>
                 </a>
@@ -197,7 +196,7 @@ describe Chat do
       end
 
       it "renders messages" do
-        expect(Oneboxer.preview("#{chat_url}?messageId=#{chat_message.id}")).to match_html <<~HTML
+        expect(Oneboxer.preview("#{chat_url}/#{chat_message.id}")).to match_html <<~HTML
           <div class="chat-transcript" data-message-id="#{chat_message.id}" data-username="#{user.username}" data-datetime="#{chat_message.created_at.iso8601}" data-channel-name="#{chat_channel.name}" data-channel-id="#{chat_channel.id}">
           <div class="chat-transcript-user">
             <div class="chat-transcript-user-avatar">
@@ -207,11 +206,11 @@ describe Chat do
             </div>
             <div class="chat-transcript-username">#{user.username}</div>
               <div class="chat-transcript-datetime">
-                <a href="#{chat_url}?messageId=#{chat_message.id}" title="#{chat_message.created_at}">#{chat_message.created_at}</a>
+                <a href="#{chat_url}/#{chat_message.id}" title="#{chat_message.created_at}">#{chat_message.created_at}</a>
               </div>
-              <a class="chat-transcript-channel" href="/chat/channel/#{chat_channel.id}/-">
+              <a class="chat-transcript-channel" href="/chat/c/-/#{chat_channel.id}">
                 <span class="category-chat-badge" style="color: ##{chat_channel.chatable.color}">
-                  <svg class="fa d-icon d-icon-hashtag svg-icon svg-string" xmlns="http://www.w3.org/2000/svg"><use href="#hashtag"></use></svg>
+                  <svg class="fa d-icon d-icon-d-chat svg-icon svg-string" xmlns="http://www.w3.org/2000/svg"><use href="#d-chat"></use></svg>
                 </span>
                 #{chat_channel.name}
               </a>
@@ -231,7 +230,7 @@ describe Chat do
     before { Jobs.run_immediately! }
 
     def assert_user_following_state(user, channel, following:)
-      membership = UserChatChannelMembership.find_by(user: user, chat_channel: channel)
+      membership = Chat::UserChatChannelMembership.find_by(user: user, chat_channel: channel)
 
       following ? (expect(membership.following).to eq(true)) : (expect(membership).to be_nil)
     end
@@ -370,6 +369,27 @@ describe Chat do
         expect(serializer.chat_channels[:public_channels][0].id).to eq(channel.id)
       end
     end
+
+    context "when the category is restricted and user has readonly persmissions" do
+      fab!(:channel_1) { Fabricate(:chat_channel) }
+      fab!(:group_1) { Fabricate(:group) }
+      fab!(:private_channel_1) { Fabricate(:private_category_channel, group: group_1) }
+
+      before do
+        private_channel_1.chatable.category_groups.first.update!(
+          permission_type: CategoryGroup.permission_types[:readonly],
+        )
+        group_1.add(user)
+        channel_1.add(user)
+        private_channel_1.add(user)
+      end
+
+      it "doesn’t list the associated channel" do
+        expect(serializer.chat_channels[:public_channels].map(&:id)).to contain_exactly(
+          channel_1.id,
+        )
+      end
+    end
   end
 
   describe "current_user_serializer#has_joinable_public_channels" do
@@ -424,7 +444,7 @@ describe Chat do
       deletion_opts = { delete_posts: true }
 
       expect { UserDestroyer.new(Discourse.system_user).destroy(user, deletion_opts) }.to change(
-        Jobs::DeleteUserMessages.jobs,
+        Jobs::Chat::DeleteUserMessages.jobs,
         :size,
       ).by(1)
     end
diff --git a/plugins/chat/spec/queries/chat_channel_memberships_query_spec.rb b/plugins/chat/spec/queries/chat/channel_memberships_query_spec.rb
similarity index 65%
rename from plugins/chat/spec/queries/chat_channel_memberships_query_spec.rb
rename to plugins/chat/spec/queries/chat/channel_memberships_query_spec.rb
index 409349c0ef9..25a89e78e40 100644
--- a/plugins/chat/spec/queries/chat_channel_memberships_query_spec.rb
+++ b/plugins/chat/spec/queries/chat/channel_memberships_query_spec.rb
@@ -2,7 +2,7 @@
 
 require "rails_helper"
 
-describe ChatChannelMembershipsQuery do
+describe Chat::ChannelMembershipsQuery do
   fab!(:user_1) { Fabricate(:user, username: "Aline", name: "Boetie") }
   fab!(:user_2) { Fabricate(:user, username: "Bertrand", name: "Arlan") }
 
@@ -17,18 +17,26 @@ describe ChatChannelMembershipsQuery do
 
       context "when no memberships exists" do
         it "returns an empty array" do
-          expect(described_class.call(channel_1)).to eq([])
+          expect(described_class.call(channel: channel_1)).to eq([])
         end
       end
 
       context "when memberships exist" do
         before do
-          UserChatChannelMembership.create(user: user_1, chat_channel: channel_1, following: true)
-          UserChatChannelMembership.create(user: user_2, chat_channel: channel_1, following: true)
+          Chat::UserChatChannelMembership.create(
+            user: user_1,
+            chat_channel: channel_1,
+            following: true,
+          )
+          Chat::UserChatChannelMembership.create(
+            user: user_2,
+            chat_channel: channel_1,
+            following: true,
+          )
         end
 
         it "returns the memberships" do
-          memberships = described_class.call(channel_1)
+          memberships = described_class.call(channel: channel_1)
 
           expect(memberships.pluck(:user_id)).to contain_exactly(user_1.id, user_2.id)
         end
@@ -45,11 +53,15 @@ describe ChatChannelMembershipsQuery do
 
         context "when membership exists" do
           before do
-            UserChatChannelMembership.create(user: user_1, chat_channel: channel_1, following: true)
+            Chat::UserChatChannelMembership.create(
+              user: user_1,
+              chat_channel: channel_1,
+              following: true,
+            )
           end
 
           it "lists the user" do
-            memberships = described_class.call(channel_1)
+            memberships = described_class.call(channel: channel_1)
 
             expect(memberships.pluck(:user_id)).to include(user_1.id)
           end
@@ -62,14 +74,16 @@ describe ChatChannelMembershipsQuery do
               permission_type: CategoryGroup.permission_types[:full],
             )
 
-            expect(described_class.call(channel_1).pluck(:user_id)).to contain_exactly(user_1.id)
+            expect(described_class.call(channel: channel_1).pluck(:user_id)).to contain_exactly(
+              user_1.id,
+            )
           end
 
           it "returns the membership if the user still has access through a staff group" do
             chatters_group.remove(user_1)
             Group.find_by(id: Group::AUTO_GROUPS[:staff]).add(user_1)
 
-            memberships = described_class.call(channel_1)
+            memberships = described_class.call(channel: channel_1)
 
             expect(memberships.pluck(:user_id)).to include(user_1.id)
           end
@@ -77,7 +91,7 @@ describe ChatChannelMembershipsQuery do
 
         context "when membership doesn’t exist" do
           it "doesn’t list the user" do
-            memberships = described_class.call(channel_1)
+            memberships = described_class.call(channel: channel_1)
 
             expect(memberships.pluck(:user_id)).to be_empty
           end
@@ -87,11 +101,15 @@ describe ChatChannelMembershipsQuery do
       context "when user is not in group" do
         context "when membership exists" do
           before do
-            UserChatChannelMembership.create(user: user_1, chat_channel: channel_1, following: true)
+            Chat::UserChatChannelMembership.create(
+              user: user_1,
+              chat_channel: channel_1,
+              following: true,
+            )
           end
 
           it "doesn’t list the user" do
-            memberships = described_class.call(channel_1)
+            memberships = described_class.call(channel: channel_1)
 
             expect(memberships).to be_empty
           end
@@ -99,7 +117,7 @@ describe ChatChannelMembershipsQuery do
 
         context "when membership doesn’t exist" do
           it "doesn’t list the user" do
-            memberships = described_class.call(channel_1)
+            memberships = described_class.call(channel: channel_1)
 
             expect(memberships).to be_empty
           end
@@ -114,7 +132,7 @@ describe ChatChannelMembershipsQuery do
         end
 
         it "returns an empty array" do
-          expect(described_class.call(channel_1)).to eq([])
+          expect(described_class.call(channel: channel_1)).to eq([])
         end
       end
 
@@ -122,7 +140,7 @@ describe ChatChannelMembershipsQuery do
         fab!(:channel_1) { Fabricate(:direct_message_channel, users: [user_1, user_2]) }
 
         it "returns the memberships" do
-          memberships = described_class.call(channel_1)
+          memberships = described_class.call(channel: channel_1)
 
           expect(memberships.pluck(:user_id)).to contain_exactly(user_1.id, user_2.id)
         end
@@ -133,13 +151,21 @@ describe ChatChannelMembershipsQuery do
       fab!(:channel_1) { Fabricate(:category_channel) }
 
       before do
-        UserChatChannelMembership.create(user: user_1, chat_channel: channel_1, following: true)
-        UserChatChannelMembership.create(user: user_2, chat_channel: channel_1, following: true)
+        Chat::UserChatChannelMembership.create(
+          user: user_1,
+          chat_channel: channel_1,
+          following: true,
+        )
+        Chat::UserChatChannelMembership.create(
+          user: user_2,
+          chat_channel: channel_1,
+          following: true,
+        )
       end
 
       describe "offset param" do
         it "offsets the results" do
-          memberships = described_class.call(channel_1, offset: 1)
+          memberships = described_class.call(channel: channel_1, offset: 1)
 
           expect(memberships.length).to eq(1)
         end
@@ -147,7 +173,7 @@ describe ChatChannelMembershipsQuery do
 
       describe "limit param" do
         it "limits the results" do
-          memberships = described_class.call(channel_1, limit: 1)
+          memberships = described_class.call(channel: channel_1, limit: 1)
 
           expect(memberships.length).to eq(1)
         end
@@ -158,12 +184,20 @@ describe ChatChannelMembershipsQuery do
       fab!(:channel_1) { Fabricate(:category_channel) }
 
       before do
-        UserChatChannelMembership.create(user: user_1, chat_channel: channel_1, following: true)
-        UserChatChannelMembership.create(user: user_2, chat_channel: channel_1, following: true)
+        Chat::UserChatChannelMembership.create(
+          user: user_1,
+          chat_channel: channel_1,
+          following: true,
+        )
+        Chat::UserChatChannelMembership.create(
+          user: user_2,
+          chat_channel: channel_1,
+          following: true,
+        )
       end
 
       it "filters the results" do
-        memberships = described_class.call(channel_1, username: user_1.username)
+        memberships = described_class.call(channel: channel_1, username: user_1.username)
 
         expect(memberships.length).to eq(1)
         expect(memberships[0].user).to eq(user_1)
@@ -174,15 +208,23 @@ describe ChatChannelMembershipsQuery do
       fab!(:channel_1) { Fabricate(:category_channel) }
 
       before do
-        UserChatChannelMembership.create(user: user_1, chat_channel: channel_1, following: true)
-        UserChatChannelMembership.create(user: user_2, chat_channel: channel_1, following: true)
+        Chat::UserChatChannelMembership.create(
+          user: user_1,
+          chat_channel: channel_1,
+          following: true,
+        )
+        Chat::UserChatChannelMembership.create(
+          user: user_2,
+          chat_channel: channel_1,
+          following: true,
+        )
       end
 
       context "when prioritizes username in ux is enabled" do
         before { SiteSetting.prioritize_username_in_ux = true }
 
         it "is using ascending order on username" do
-          memberships = described_class.call(channel_1)
+          memberships = described_class.call(channel: channel_1)
 
           expect(memberships[0].user).to eq(user_1)
           expect(memberships[1].user).to eq(user_2)
@@ -193,7 +235,7 @@ describe ChatChannelMembershipsQuery do
         before { SiteSetting.prioritize_username_in_ux = false }
 
         it "is using ascending order on name" do
-          memberships = described_class.call(channel_1)
+          memberships = described_class.call(channel: channel_1)
 
           expect(memberships[0].user).to eq(user_2)
           expect(memberships[1].user).to eq(user_1)
@@ -203,7 +245,7 @@ describe ChatChannelMembershipsQuery do
           before { SiteSetting.enable_names = false }
 
           it "is using ascending order on username" do
-            memberships = described_class.call(channel_1)
+            memberships = described_class.call(channel: channel_1)
 
             expect(memberships[0].user).to eq(user_1)
             expect(memberships[1].user).to eq(user_2)
@@ -218,11 +260,15 @@ describe ChatChannelMembershipsQuery do
     fab!(:staged_user) { Fabricate(:staged) }
 
     before do
-      UserChatChannelMembership.create(user: staged_user, chat_channel: channel_1, following: true)
+      Chat::UserChatChannelMembership.create(
+        user: staged_user,
+        chat_channel: channel_1,
+        following: true,
+      )
     end
 
     it "doesn’t list staged users" do
-      memberships = described_class.call(channel_1)
+      memberships = described_class.call(channel: channel_1)
       expect(memberships).to be_blank
     end
   end
@@ -234,7 +280,7 @@ describe ChatChannelMembershipsQuery do
     end
 
     before do
-      UserChatChannelMembership.create(
+      Chat::UserChatChannelMembership.create(
         user: suspended_user,
         chat_channel: channel_1,
         following: true,
@@ -242,7 +288,7 @@ describe ChatChannelMembershipsQuery do
     end
 
     it "doesn’t list suspended users" do
-      memberships = described_class.call(channel_1)
+      memberships = described_class.call(channel: channel_1)
       expect(memberships).to be_blank
     end
   end
@@ -252,7 +298,7 @@ describe ChatChannelMembershipsQuery do
     fab!(:inactive_user) { Fabricate(:inactive_user) }
 
     before do
-      UserChatChannelMembership.create(
+      Chat::UserChatChannelMembership.create(
         user: inactive_user,
         chat_channel: channel_1,
         following: true,
@@ -260,7 +306,7 @@ describe ChatChannelMembershipsQuery do
     end
 
     it "doesn’t list inactive users" do
-      memberships = described_class.call(channel_1)
+      memberships = described_class.call(channel: channel_1)
       expect(memberships).to be_blank
     end
   end
diff --git a/plugins/chat/spec/queries/chat/channel_unreads_query_spec.rb b/plugins/chat/spec/queries/chat/channel_unreads_query_spec.rb
new file mode 100644
index 00000000000..112b255c3b7
--- /dev/null
+++ b/plugins/chat/spec/queries/chat/channel_unreads_query_spec.rb
@@ -0,0 +1,195 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+describe Chat::ChannelUnreadsQuery do
+  subject(:query) do
+    described_class.call(
+      channel_ids: channel_ids,
+      user_id: current_user.id,
+      include_missing_memberships: include_missing_memberships,
+      include_read: include_read,
+    ).map(&:to_h)
+  end
+
+  fab!(:channel_1) { Fabricate(:category_channel) }
+  fab!(:current_user) { Fabricate(:user) }
+  let(:include_missing_memberships) { false }
+  let(:include_read) { true }
+  let(:channel_ids) { [channel_1.id] }
+
+  before do
+    SiteSetting.chat_enabled = true
+    SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:everyone]
+    channel_1.add(current_user)
+  end
+
+  context "with unread message" do
+    before { Fabricate(:chat_message, chat_channel: channel_1) }
+
+    it "returns a correct unread count" do
+      expect(query.first).to eq({ mention_count: 0, unread_count: 1, channel_id: channel_1.id })
+    end
+
+    context "when the membership has been muted" do
+      before do
+        channel_1
+          .user_chat_channel_memberships
+          .find_by(user_id: current_user.id)
+          .update!(muted: true)
+      end
+
+      it "returns a zeroed unread count" do
+        expect(query.first).to eq({ mention_count: 0, unread_count: 0, channel_id: channel_1.id })
+      end
+    end
+
+    context "for unread messages in a thread" do
+      fab!(:thread_om) { Fabricate(:chat_message, chat_channel: channel_1) }
+      fab!(:thread) { Fabricate(:chat_thread, channel: channel_1, original_message: thread_om) }
+
+      it "does include the original message in the unread count" do
+        expect(query.first).to eq({ mention_count: 0, unread_count: 2, channel_id: channel_1.id })
+      end
+
+      it "does not include other thread messages in the unread count" do
+        Fabricate(:chat_message, chat_channel: channel_1, thread: thread)
+        Fabricate(:chat_message, chat_channel: channel_1, thread: thread)
+        expect(query.first).to eq({ mention_count: 0, unread_count: 2, channel_id: channel_1.id })
+      end
+    end
+
+    context "for multiple channels" do
+      fab!(:channel_2) { Fabricate(:category_channel) }
+      let(:channel_ids) { [channel_1.id, channel_2.id] }
+
+      before do
+        channel_2.add(current_user)
+        Fabricate(:chat_message, chat_channel: channel_2)
+        Fabricate(:chat_message, chat_channel: channel_2)
+      end
+
+      it "returns accurate counts" do
+        expect(query).to match_array(
+          [
+            { mention_count: 0, unread_count: 1, channel_id: channel_1.id },
+            { mention_count: 0, unread_count: 2, channel_id: channel_2.id },
+          ],
+        )
+      end
+
+      context "for channels where the user has no membership" do
+        before do
+          current_user
+            .user_chat_channel_memberships
+            .where(chat_channel_id: channel_2.id)
+            .destroy_all
+        end
+
+        it "does not return counts for the channels" do
+          expect(query).to match_array(
+            [{ mention_count: 0, unread_count: 1, channel_id: channel_1.id }],
+          )
+        end
+
+        context "when include_missing_memberships is true" do
+          let(:include_missing_memberships) { true }
+
+          it "does return zeroed counts for the channels" do
+            expect(query).to match_array(
+              [
+                { mention_count: 0, unread_count: 1, channel_id: channel_1.id },
+                { mention_count: 0, unread_count: 0, channel_id: channel_2.id },
+              ],
+            )
+          end
+
+          context "when include_read is false" do
+            let(:include_read) { false }
+
+            it "does not return counts for the channels" do
+              expect(query).to match_array(
+                [{ mention_count: 0, unread_count: 1, channel_id: channel_1.id }],
+              )
+            end
+          end
+        end
+      end
+    end
+  end
+
+  context "with unread mentions" do
+    before { Jobs.run_immediately! }
+
+    def create_mention(message, channel)
+      notification =
+        Notification.create!(
+          notification_type: Notification.types[:chat_mention],
+          user_id: current_user.id,
+          data: { chat_message_id: message.id, chat_channel_id: channel.id }.to_json,
+        )
+      Chat::Mention.create!(notification: notification, user: current_user, chat_message: message)
+    end
+
+    it "returns a correct unread mention" do
+      message = Fabricate(:chat_message, chat_channel: channel_1)
+      create_mention(message, channel_1)
+
+      expect(query.first).to eq({ mention_count: 1, unread_count: 1, channel_id: channel_1.id })
+    end
+
+    context "for unread mentions in a thread" do
+      fab!(:thread_om) { Fabricate(:chat_message, chat_channel: channel_1) }
+      fab!(:thread) { Fabricate(:chat_thread, channel: channel_1, original_message: thread_om) }
+
+      it "does include the original message in the mention count" do
+        create_mention(thread_om, channel_1)
+        expect(query.first).to eq({ mention_count: 1, unread_count: 1, channel_id: channel_1.id })
+      end
+
+      it "does not include other thread messages in the mention count" do
+        thread_message_1 = Fabricate(:chat_message, chat_channel: channel_1, thread: thread)
+        thread_message_2 = Fabricate(:chat_message, chat_channel: channel_1, thread: thread)
+        create_mention(thread_message_1, channel_1)
+        create_mention(thread_message_2, channel_1)
+        expect(query.first).to eq({ mention_count: 0, unread_count: 1, channel_id: channel_1.id })
+      end
+    end
+
+    context "for multiple channels" do
+      fab!(:channel_2) { Fabricate(:category_channel) }
+      let(:channel_ids) { [channel_1.id, channel_2.id] }
+
+      it "returns accurate counts" do
+        message = Fabricate(:chat_message, chat_channel: channel_1)
+        create_mention(message, channel_1)
+
+        channel_2.add(current_user)
+        Fabricate(:chat_message, chat_channel: channel_2)
+        message_2 = Fabricate(:chat_message, chat_channel: channel_2)
+        create_mention(message_2, channel_2)
+
+        expect(query).to match_array(
+          [
+            { mention_count: 1, unread_count: 1, channel_id: channel_1.id },
+            { mention_count: 1, unread_count: 2, channel_id: channel_2.id },
+          ],
+        )
+      end
+    end
+  end
+
+  context "with nothing unread" do
+    it "returns a correct state" do
+      expect(query.first).to eq({ mention_count: 0, unread_count: 0, channel_id: channel_1.id })
+    end
+
+    context "when include_read is false" do
+      let(:include_read) { false }
+
+      it "returns nothing" do
+        expect(query).to eq([])
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/queries/chat/messages_query_spec.rb b/plugins/chat/spec/queries/chat/messages_query_spec.rb
new file mode 100644
index 00000000000..fb63f90f458
--- /dev/null
+++ b/plugins/chat/spec/queries/chat/messages_query_spec.rb
@@ -0,0 +1,187 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::MessagesQuery do
+  subject(:query) do
+    described_class.call(guardian: current_user.guardian, channel: channel, **options)
+  end
+
+  fab!(:channel) { Fabricate(:category_channel) }
+  fab!(:current_user) { Fabricate(:user) }
+
+  let(:include_thread_messages) { false }
+  let(:thread_id) { nil }
+  let(:page_size) { nil }
+  let(:direction) { nil }
+  let(:target_message_id) { nil }
+  let(:target_date) { nil }
+  let(:options) do
+    {
+      thread_id: thread_id,
+      include_thread_messages: include_thread_messages,
+      page_size: page_size,
+      direction: direction,
+      target_message_id: target_message_id,
+      target_date: target_date,
+    }
+  end
+
+  fab!(:message_1) do
+    message = Fabricate(:chat_message, chat_channel: channel)
+    message.update!(created_at: 2.days.ago)
+    message
+  end
+  fab!(:message_2) do
+    message = Fabricate(:chat_message, chat_channel: channel)
+    message.update!(created_at: 6.hours.ago)
+    message
+  end
+  fab!(:message_3) { Fabricate(:chat_message, chat_channel: channel) }
+
+  context "when target_message_id provided" do
+    let(:target_message) { message_2 }
+    let(:target_message_id) { target_message.id }
+
+    it "queries messages in the channel and finds the past and future messages" do
+      expect(query).to eq(
+        past_messages: [message_1],
+        future_messages: [message_3],
+        target_message: target_message,
+        can_load_more_past: false,
+        can_load_more_future: false,
+      )
+    end
+
+    it "does not include deleted messages" do
+      message_3.trash!
+      expect(query[:future_messages]).to eq([])
+    end
+
+    it "still includes the target message if it is deleted" do
+      target_message.trash!
+      expect(query[:target_message]).to eq(target_message)
+    end
+
+    it "can_load_more_past is true when the past messages reach the limit" do
+      stub_const(described_class, "PAST_MESSAGE_LIMIT", 1) do
+        expect(query[:can_load_more_past]).to be_truthy
+      end
+    end
+
+    it "can_load_more_future is true when the future messages reach the limit" do
+      stub_const(described_class, "FUTURE_MESSAGE_LIMIT", 1) do
+        expect(query[:can_load_more_future]).to be_truthy
+      end
+    end
+
+    it "limits results of paginated query when page_size is not set" do
+      options[:target_message_id] = nil
+      stub_const(described_class, "MAX_PAGE_SIZE", 1) { expect(query[:messages].length).to eq(1) }
+    end
+
+    describe "when some messages are in threads" do
+      fab!(:thread) { Fabricate(:chat_thread, channel: channel) }
+
+      it "does not include messages which are thread replies but does include thread original messages" do
+        message_3.update!(thread: thread)
+        expect(query[:future_messages]).to eq([thread.original_message])
+      end
+
+      context "when include_thread_messages is true" do
+        let(:include_thread_messages) { true }
+
+        it "does include messages which are part of a thread" do
+          message_3.update!(
+            thread: thread,
+            created_at: thread.original_message.created_at + 1.minute,
+          )
+          expect(query[:future_messages]).to eq([thread.original_message, message_3])
+        end
+      end
+
+      context "when thread_id is provided" do
+        let(:thread_id) { thread.id }
+        it "does include messages which are part of a thread" do
+          message_3.update!(
+            thread: thread,
+            created_at: thread.original_message.created_at + 1.minute,
+          )
+          expect(query[:future_messages]).to eq([thread.original_message, message_3])
+        end
+      end
+    end
+
+    context "when the user can moderate chat" do
+      before { current_user.update!(admin: true) }
+
+      it "does include deleted messages" do
+        message_3.trash!
+        expect(query[:future_messages]).to eq([message_3])
+      end
+    end
+  end
+
+  context "when target_date provided" do
+    let(:target_date) { 1.day.ago }
+
+    it "queries messages in the channel and finds the past and future messages" do
+      expect(query).to eq(
+        past_messages: [message_1],
+        future_messages: [message_2, message_3],
+        target_date: target_date,
+        can_load_more_past: false,
+        can_load_more_future: false,
+        target_message_id: message_2.id,
+      )
+    end
+  end
+
+  context "when target_message_id not provided" do
+    it "queries messages in the channel" do
+      expect(query).to eq(
+        messages: [message_1, message_2, message_3],
+        can_load_more_past: false,
+        can_load_more_future: false,
+      )
+    end
+
+    context "when the messages length is equal to the page_size" do
+      let(:page_size) { 3 }
+
+      it "can_load_more_past is true" do
+        expect(query[:can_load_more_past]).to be_truthy
+      end
+    end
+
+    context "when direction is future" do
+      let(:direction) { described_class::FUTURE }
+
+      it "returns messages in ascending order by created_at" do
+        expect(query[:messages]).to eq([message_1, message_2, message_3])
+      end
+
+      context "when the messages length is equal to the page_size" do
+        let(:page_size) { 3 }
+
+        it "can_load_more_future is true" do
+          expect(query[:can_load_more_future]).to be_truthy
+        end
+      end
+    end
+
+    context "when direction is past" do
+      let(:direction) { described_class::PAST }
+
+      it "returns messages in ascending order by created_at" do
+        expect(query[:messages]).to eq([message_1, message_2, message_3])
+      end
+
+      context "when the messages length is equal to the page_size" do
+        let(:page_size) { 3 }
+
+        it "can_load_more_past is true" do
+          expect(query[:can_load_more_past]).to be_truthy
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/queries/chat/thread_participant_query_spec.rb b/plugins/chat/spec/queries/chat/thread_participant_query_spec.rb
new file mode 100644
index 00000000000..9aa6d4e3c4e
--- /dev/null
+++ b/plugins/chat/spec/queries/chat/thread_participant_query_spec.rb
@@ -0,0 +1,108 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::ThreadParticipantQuery do
+  fab!(:thread_1) { Fabricate(:chat_thread) }
+  fab!(:thread_2) { Fabricate(:chat_thread) }
+
+  context "when users have messaged in the thread" do
+    fab!(:user_1) { Fabricate(:user) }
+    fab!(:user_2) { Fabricate(:user) }
+    fab!(:user_3) { Fabricate(:user) }
+
+    before do
+      Fabricate(:chat_message, thread: thread_1, user: user_1)
+      Fabricate(:chat_message, thread: thread_1, user: user_1)
+      Fabricate(:chat_message, thread: thread_1, user: user_1)
+      Fabricate(:chat_message, thread: thread_1, user: user_2)
+      Fabricate(:chat_message, thread: thread_1, user: user_2)
+      Fabricate(:chat_message, thread: thread_1, user: user_3)
+
+      thread_1.add(user_1)
+      thread_1.add(user_2)
+      thread_1.add(user_3)
+    end
+
+    it "has all the user details needed for BasicUserSerializer" do
+      result = described_class.call(thread_ids: [thread_1.id, thread_2.id])
+      expect(result[thread_1.id][:users].first).to eq(
+        {
+          id: user_1.id,
+          username: user_1.username,
+          name: user_1.name,
+          uploaded_avatar_id: user_1.uploaded_avatar_id,
+        },
+      )
+    end
+
+    it "does not return more than 3 thread participants" do
+      other_user = Fabricate(:user)
+      thread_1.add(other_user)
+      Fabricate(:chat_message, thread: thread_1, user: other_user)
+      result = described_class.call(thread_ids: [thread_1.id])
+      expect(result[thread_1.id][:users].length).to eq(3)
+    end
+
+    it "calculates the top messagers in a thread as well as the last messager" do
+      result = described_class.call(thread_ids: [thread_1.id, thread_2.id])
+      expect(result[thread_1.id][:users].map { |u| u[:id] }).to eq(
+        [user_1.id, user_2.id, user_3.id],
+      )
+    end
+
+    it "does not count deleted messages for last messager" do
+      thread_1.replies.where(user: user_3).each(&:trash!)
+      result = described_class.call(thread_ids: [thread_1.id, thread_2.id])
+      expect(result[thread_1.id][:users].map { |u| u[:id] }).to eq(
+        [user_1.id, thread_1.original_message_user_id, user_2.id],
+      )
+    end
+
+    it "does not count deleted messages for participation" do
+      thread_1.replies.where(user: user_1).each(&:trash!)
+      result = described_class.call(thread_ids: [thread_1.id, thread_2.id])
+      expect(result[thread_1.id][:users].map { |u| u[:id] }).to eq(
+        [user_2.id, thread_1.original_message_user_id, user_3.id],
+      )
+    end
+
+    it "does not count users who are not members of the thread any longer for participation" do
+      thread_1.remove(user_1)
+      result = described_class.call(thread_ids: [thread_1.id, thread_2.id])
+      expect(result[thread_1.id][:users].map { |u| u[:id] }).to eq(
+        [user_2.id, thread_1.original_message_user_id, user_3.id],
+      )
+    end
+
+    it "calculates the total number of thread participants" do
+      result = described_class.call(thread_ids: [thread_1.id, thread_2.id])
+      expect(result[thread_1.id][:total_count]).to eq(4)
+    end
+
+    it "gets results for both threads" do
+      thread_2.add(user_2)
+      Fabricate(:chat_message, thread: thread_2, user: user_2)
+      Fabricate(:chat_message, thread: thread_2, user: user_2)
+      result = described_class.call(thread_ids: [thread_1.id, thread_2.id])
+      expect(result[thread_1.id][:users].map { |u| u[:id] }).to eq(
+        [user_1.id, user_2.id, user_3.id],
+      )
+      expect(result[thread_2.id][:users].map { |u| u[:id] }).to eq(
+        [thread_2.original_message_user_id, user_2.id],
+      )
+    end
+  end
+
+  context "when no one has messaged in either thread but the original message user" do
+    it "only returns that user as a participant" do
+      result = described_class.call(thread_ids: [thread_1.id, thread_2.id])
+      expect(result[thread_1.id][:users].map { |u| u[:id] }).to eq(
+        [thread_1.original_message.user_id],
+      )
+      expect(result[thread_1.id][:total_count]).to eq(1)
+      expect(result[thread_2.id][:users].map { |u| u[:id] }).to eq(
+        [thread_2.original_message.user_id],
+      )
+      expect(result[thread_2.id][:total_count]).to eq(1)
+    end
+  end
+end
diff --git a/plugins/chat/spec/queries/chat/thread_unreads_query_spec.rb b/plugins/chat/spec/queries/chat/thread_unreads_query_spec.rb
new file mode 100644
index 00000000000..9970d7e4eef
--- /dev/null
+++ b/plugins/chat/spec/queries/chat/thread_unreads_query_spec.rb
@@ -0,0 +1,234 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+describe Chat::ThreadUnreadsQuery do
+  subject(:query) do
+    described_class.call(
+      channel_ids: channel_ids,
+      thread_ids: thread_ids,
+      user_id: current_user.id,
+      include_missing_memberships: include_missing_memberships,
+      include_read: include_read,
+    )
+  end
+
+  fab!(:channel_1) { Fabricate(:category_channel, threading_enabled: true) }
+  fab!(:channel_2) { Fabricate(:category_channel, threading_enabled: true) }
+  fab!(:thread_1) { Fabricate(:chat_thread, channel: channel_1) }
+  fab!(:thread_2) { Fabricate(:chat_thread, channel: channel_1) }
+  fab!(:thread_3) { Fabricate(:chat_thread, channel: channel_2) }
+  fab!(:thread_4) { Fabricate(:chat_thread, channel: channel_2) }
+  fab!(:current_user) { Fabricate(:user) }
+
+  let(:params) { { user_id: current_user.id, channel_ids: channel_ids, thread_ids: thread_ids } }
+  let(:include_missing_memberships) { false }
+  let(:include_read) { true }
+  let(:channel_ids) { [] }
+  let(:thread_ids) { [] }
+
+  before do
+    SiteSetting.chat_enabled = true
+    SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:everyone]
+    channel_1.add(current_user)
+    channel_2.add(current_user)
+    thread_1.add(current_user)
+    thread_2.add(current_user)
+    thread_3.add(current_user)
+    thread_4.add(current_user)
+  end
+
+  context "with unread messages across multiple threads" do
+    fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1, thread: thread_1) }
+    fab!(:message_2) { Fabricate(:chat_message, chat_channel: channel_2, thread: thread_3) }
+    fab!(:message_3) { Fabricate(:chat_message, chat_channel: channel_2, thread: thread_4) }
+
+    context "when only the channel ids are provided" do
+      let(:channel_ids) { [channel_1.id, channel_2.id] }
+
+      it "gets a count of all the thread unreads across the channels" do
+        expect(query.map(&:to_h)).to match_array(
+          [
+            { channel_id: channel_1.id, mention_count: 0, thread_id: thread_1.id, unread_count: 1 },
+            { channel_id: channel_1.id, mention_count: 0, thread_id: thread_2.id, unread_count: 0 },
+            { channel_id: channel_2.id, mention_count: 0, thread_id: thread_3.id, unread_count: 1 },
+            { channel_id: channel_2.id, mention_count: 0, thread_id: thread_4.id, unread_count: 1 },
+          ],
+        )
+      end
+
+      it "does not count deleted messages" do
+        message_1.trash!
+        expect(query.map(&:to_h).find { |tracking| tracking[:thread_id] == thread_1.id }).to eq(
+          { channel_id: channel_1.id, mention_count: 0, thread_id: thread_1.id, unread_count: 0 },
+        )
+      end
+
+      it "does not messages in threads where threading_enabled is false on the channel" do
+        channel_1.update!(threading_enabled: false)
+        expect(query.map(&:to_h).find { |tracking| tracking[:thread_id] == thread_1.id }).to eq(
+          { channel_id: channel_1.id, mention_count: 0, thread_id: thread_1.id, unread_count: 0 },
+        )
+        expect(query.map(&:to_h).find { |tracking| tracking[:thread_id] == thread_2.id }).to eq(
+          { channel_id: channel_1.id, mention_count: 0, thread_id: thread_2.id, unread_count: 0 },
+        )
+      end
+
+      it "does not count as unread if the last_read_message_id is greater than or equal to the message id" do
+        thread_1
+          .user_chat_thread_memberships
+          .find_by(user: current_user)
+          .update!(last_read_message_id: message_1.id)
+        expect(query.map(&:to_h).find { |tracking| tracking[:thread_id] == thread_1.id }).to eq(
+          { channel_id: channel_1.id, mention_count: 0, thread_id: thread_1.id, unread_count: 0 },
+        )
+      end
+
+      it "does not count the original message ID as unread" do
+        thread_1.original_message.destroy
+        thread_1.update!(original_message: message_1)
+        expect(query.map(&:to_h).find { |tracking| tracking[:thread_id] == thread_1.id }).to eq(
+          { channel_id: channel_1.id, mention_count: 0, thread_id: thread_1.id, unread_count: 0 },
+        )
+      end
+
+      it "does not count the thread as unread if the original message is deleted" do
+        thread_1.original_message.destroy
+        expect(query.map(&:to_h).find { |tracking| tracking[:thread_id] == thread_1.id }).to eq(
+          { channel_id: channel_1.id, mention_count: 0, thread_id: thread_1.id, unread_count: 0 },
+        )
+      end
+
+      context "when include_read is false" do
+        let(:include_read) { false }
+
+        it "does not get threads with no unread messages" do
+          expect(query.map(&:to_h)).not_to include(
+            [
+              {
+                channel_id: channel_1.id,
+                mention_count: 0,
+                thread_id: thread_2.id,
+                unread_count: 0,
+              },
+            ],
+          )
+        end
+      end
+    end
+
+    context "when only the thread_ids are provided" do
+      let(:thread_ids) { [thread_1.id, thread_3.id] }
+
+      it "gets a count of all the thread unreads for the specified threads" do
+        expect(query.map(&:to_h)).to match_array(
+          [
+            { channel_id: channel_1.id, mention_count: 0, thread_id: thread_1.id, unread_count: 1 },
+            { channel_id: channel_2.id, mention_count: 0, thread_id: thread_3.id, unread_count: 1 },
+          ],
+        )
+      end
+
+      context "when the notification_level for the thread is muted" do
+        before do
+          thread_1
+            .user_chat_thread_memberships
+            .find_by(user: current_user)
+            .update!(notification_level: :muted)
+        end
+
+        it "gets a zeroed out count for the thread" do
+          expect(query.map(&:to_h)).to include(
+            { channel_id: channel_1.id, mention_count: 0, thread_id: thread_1.id, unread_count: 0 },
+          )
+        end
+      end
+
+      context "when the notification_level for the thread is normal" do
+        before do
+          thread_1
+            .user_chat_thread_memberships
+            .find_by(user: current_user)
+            .update!(notification_level: :normal)
+        end
+
+        it "gets a zeroed out count for the thread" do
+          expect(query.map(&:to_h)).to include(
+            { channel_id: channel_1.id, mention_count: 0, thread_id: thread_1.id, unread_count: 0 },
+          )
+        end
+      end
+
+      context "when the user is not a member of a thread" do
+        before { thread_1.user_chat_thread_memberships.find_by(user: current_user).destroy! }
+
+        it "does not get that thread unread count by default" do
+          expect(query.map(&:to_h)).to match_array(
+            [
+              {
+                channel_id: channel_2.id,
+                mention_count: 0,
+                thread_id: thread_3.id,
+                unread_count: 1,
+              },
+            ],
+          )
+        end
+
+        context "when include_missing_memberships is true" do
+          let(:include_missing_memberships) { true }
+
+          it "includes the thread that the user is not a member of with zeroed out counts" do
+            expect(query.map(&:to_h)).to match_array(
+              [
+                {
+                  channel_id: channel_1.id,
+                  mention_count: 0,
+                  thread_id: thread_1.id,
+                  unread_count: 0,
+                },
+                {
+                  channel_id: channel_2.id,
+                  mention_count: 0,
+                  thread_id: thread_3.id,
+                  unread_count: 1,
+                },
+              ],
+            )
+          end
+
+          context "when include_read is false" do
+            let(:include_read) { false }
+
+            it "does not include the thread that the user is not a member of with zeroed out counts" do
+              expect(query.map(&:to_h)).to match_array(
+                [
+                  {
+                    channel_id: channel_2.id,
+                    mention_count: 0,
+                    thread_id: thread_3.id,
+                    unread_count: 1,
+                  },
+                ],
+              )
+            end
+          end
+        end
+      end
+    end
+
+    context "when channel_ids and thread_ids are provided" do
+      let(:channel_ids) { [channel_1.id, channel_2.id] }
+      let(:thread_ids) { [thread_1.id, thread_3.id] }
+
+      it "gets a count of all the thread unreads across the channels filtered by thread id" do
+        expect(query.map(&:to_h)).to match_array(
+          [
+            { channel_id: channel_1.id, mention_count: 0, thread_id: thread_1.id, unread_count: 1 },
+            { channel_id: channel_2.id, mention_count: 0, thread_id: thread_3.id, unread_count: 1 },
+          ],
+        )
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/queries/chat/tracking_state_report_query_spec.rb b/plugins/chat/spec/queries/chat/tracking_state_report_query_spec.rb
new file mode 100644
index 00000000000..4649a171f7e
--- /dev/null
+++ b/plugins/chat/spec/queries/chat/tracking_state_report_query_spec.rb
@@ -0,0 +1,195 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::TrackingStateReportQuery do
+  subject(:query) do
+    described_class.call(
+      guardian: guardian,
+      channel_ids: channel_ids,
+      thread_ids: thread_ids,
+      include_missing_memberships: include_missing_memberships,
+      include_threads: include_threads,
+      include_read: include_read,
+      include_last_reply_details: include_last_reply_details,
+    )
+  end
+
+  fab!(:current_user) { Fabricate(:user) }
+  let(:guardian) { current_user.guardian }
+
+  let(:channel_ids) { [] }
+  let(:thread_ids) { [] }
+  let(:include_missing_memberships) { false }
+  let(:include_threads) { false }
+  let(:include_read) { true }
+  let(:include_last_reply_details) { false }
+  context "when channel_ids empty" do
+    it "returns empty object for channel_tracking" do
+      expect(query.channel_tracking).to eq({})
+    end
+  end
+
+  context "when channel_ids provided" do
+    fab!(:channel_1) { Fabricate(:category_channel) }
+    fab!(:channel_2) { Fabricate(:category_channel) }
+    let(:channel_ids) { [channel_1.id, channel_2.id] }
+
+    it "calls the channel unreads query with the corect params" do
+      Chat::ChannelUnreadsQuery
+        .expects(:call)
+        .with(
+          channel_ids: channel_ids,
+          user_id: current_user.id,
+          include_missing_memberships: include_missing_memberships,
+          include_read: include_read,
+        )
+        .returns([])
+      query
+    end
+
+    it "generates a correct unread report for the channels the user is a member of" do
+      channel_1.add(current_user)
+      channel_2.add(current_user)
+      Fabricate(:chat_message, chat_channel: channel_1)
+      Fabricate(:chat_message, chat_channel: channel_2)
+
+      expect(query.channel_tracking).to eq(
+        {
+          channel_1.id => {
+            unread_count: 1,
+            mention_count: 0,
+          },
+          channel_2.id => {
+            unread_count: 1,
+            mention_count: 0,
+          },
+        },
+      )
+    end
+
+    it "does not include threads by default" do
+      Chat::ThreadUnreadsQuery.expects(:call).never
+      expect(query.thread_tracking).to eq({})
+    end
+
+    context "when include_threads is true" do
+      let(:include_threads) { true }
+      fab!(:thread_1) { Fabricate(:chat_thread, channel: channel_1) }
+      fab!(:thread_2) { Fabricate(:chat_thread, channel: channel_2) }
+
+      before do
+        channel_1.update!(threading_enabled: true)
+        channel_2.update!(threading_enabled: true)
+      end
+
+      it "calls the thread unreads query with the corect params" do
+        Chat::ThreadUnreadsQuery
+          .expects(:call)
+          .with(
+            channel_ids: channel_ids,
+            thread_ids: thread_ids,
+            user_id: current_user.id,
+            include_missing_memberships: include_missing_memberships,
+            include_read: include_read,
+          )
+          .returns([])
+        query
+      end
+
+      it "generates a correct unread for the threads the user is a member of in the channels" do
+        channel_1.add(current_user)
+        channel_2.add(current_user)
+        thread_1.add(current_user)
+        thread_2.add(current_user)
+        Fabricate(:chat_message, chat_channel: channel_1, thread: thread_1)
+        Fabricate(:chat_message, chat_channel: channel_2, thread: thread_2)
+
+        expect(query.channel_tracking).to eq(
+          {
+            channel_1.id => {
+              unread_count: 1,
+              mention_count: 0,
+            },
+            channel_2.id => {
+              unread_count: 1,
+              mention_count: 0,
+            },
+          },
+        )
+        expect(query.thread_tracking).to eq(
+          {
+            thread_1.id => {
+              unread_count: 1,
+              mention_count: 0,
+              channel_id: channel_1.id,
+            },
+            thread_2.id => {
+              unread_count: 1,
+              mention_count: 0,
+              channel_id: channel_2.id,
+            },
+          },
+        )
+      end
+
+      context "when include_last_reply_details is true" do
+        let(:include_last_reply_details) { true }
+
+        before do
+          thread_1.add(current_user)
+          thread_2.add(current_user)
+          Fabricate(:chat_message, chat_channel: channel_1, thread: thread_1)
+          Fabricate(:chat_message, chat_channel: channel_2, thread: thread_2)
+        end
+
+        it "gets the last_reply_created_at for each thread based on the last_message" do
+          expect(query.thread_tracking).to eq(
+            {
+              thread_1.id => {
+                unread_count: 1,
+                mention_count: 0,
+                channel_id: channel_1.id,
+                last_reply_created_at: thread_1.reload.last_message.created_at,
+              },
+              thread_2.id => {
+                unread_count: 1,
+                mention_count: 0,
+                channel_id: channel_2.id,
+                last_reply_created_at: thread_2.reload.last_message.created_at,
+              },
+            },
+          )
+        end
+
+        it "does not get the last_reply_created_at for threads where the last_message is deleted" do
+          thread_1.reload.last_message.trash!
+          expect(query.thread_tracking).to eq(
+            {
+              thread_1.id => {
+                unread_count: 0,
+                mention_count: 0,
+                channel_id: channel_1.id,
+                last_reply_created_at: nil,
+              },
+              thread_2.id => {
+                unread_count: 1,
+                mention_count: 0,
+                channel_id: channel_2.id,
+                last_reply_created_at: thread_2.reload.last_message.created_at,
+              },
+            },
+          )
+        end
+      end
+
+      context "when thread_ids and channel_ids is empty" do
+        let(:thread_ids) { [] }
+        let(:channel_ids) { [] }
+
+        it "does not query threads" do
+          Chat::ThreadUnreadsQuery.expects(:call).never
+          expect(query.thread_tracking).to eq({})
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/requests/admin/export_controller_spec.rb b/plugins/chat/spec/requests/admin/export_controller_spec.rb
new file mode 100644
index 00000000000..8ba0f278ade
--- /dev/null
+++ b/plugins/chat/spec/requests/admin/export_controller_spec.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+RSpec.describe Chat::ChatController do
+  describe "#export_messages" do
+    fab!(:user) { Fabricate(:user) }
+    fab!(:moderator) { Fabricate(:moderator) }
+    fab!(:admin) { Fabricate(:admin) }
+
+    it "enqueues the export job and logs into staff actions" do
+      sign_in(admin)
+
+      post "/chat/admin/export/messages"
+
+      expect(response.status).to eq(204)
+
+      expect(Jobs::ExportCsvFile.jobs.size).to eq(1)
+      job_data = Jobs::ExportCsvFile.jobs.first["args"].first
+      expect(job_data["entity"]).to eq("chat_message")
+      expect(job_data["user_id"]).to eq(admin.id)
+
+      staff_log_entry = UserHistory.last
+      expect(staff_log_entry.acting_user_id).to eq(admin.id)
+      expect(staff_log_entry.subject).to eq("chat_message")
+    end
+
+    it "regular users don't have access" do
+      sign_in(user)
+      post "/chat/admin/export/messages"
+      expect(response.status).to eq(403)
+    end
+
+    it "moderators don't have access" do
+      sign_in(moderator)
+      post "/chat/admin/export/messages"
+      expect(response.status).to eq(403)
+    end
+  end
+end
diff --git a/plugins/chat/spec/requests/api/chat_chatables_controller_spec.rb b/plugins/chat/spec/requests/api/chat_chatables_controller_spec.rb
deleted file mode 100644
index a0ba6ee4ffd..00000000000
--- a/plugins/chat/spec/requests/api/chat_chatables_controller_spec.rb
+++ /dev/null
@@ -1,201 +0,0 @@
-# frozen_string_literal: true
-
-require "rails_helper"
-
-RSpec.describe Chat::Api::ChatChatablesController do
-  before do
-    SiteSetting.chat_enabled = true
-    SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:everyone]
-  end
-
-  describe "#index" do
-    fab!(:user) { Fabricate(:user, username: "johndoe", name: "John Doe") }
-
-    describe "without chat permissions" do
-      it "errors errors for anon" do
-        get "/chat/api/chatables", params: { filter: "so" }
-        expect(response.status).to eq(403)
-      end
-
-      it "errors when user cannot chat" do
-        SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:staff]
-        sign_in(user)
-        get "/chat/api/chatables", params: { filter: "so" }
-        expect(response.status).to eq(403)
-      end
-    end
-
-    describe "with chat permissions" do
-      fab!(:other_user) { Fabricate(:user, username: "janemay", name: "Jane May") }
-      fab!(:admin) { Fabricate(:admin, username: "andyjones", name: "Andy Jones") }
-      fab!(:category) { Fabricate(:category) }
-      fab!(:chat_channel) { Fabricate(:category_channel, chatable: category) }
-      fab!(:dm_chat_channel) { Fabricate(:direct_message_channel, users: [user, admin]) }
-
-      before do
-        chat_channel.update(name: "something")
-        sign_in(user)
-      end
-
-      it "returns the correct channels with filter 'so'" do
-        get "/chat/api/chatables", params: { filter: "so" }
-        expect(response.status).to eq(200)
-        expect(response.parsed_body["public_channels"][0]["id"]).to eq(chat_channel.id)
-        expect(response.parsed_body["direct_message_channels"].count).to eq(0)
-        expect(response.parsed_body["users"].count).to eq(0)
-      end
-
-      it "returns the correct channels with filter 'something'" do
-        get "/chat/api/chatables", params: { filter: "something" }
-        expect(response.status).to eq(200)
-        expect(response.parsed_body["public_channels"][0]["id"]).to eq(chat_channel.id)
-        expect(response.parsed_body["direct_message_channels"].count).to eq(0)
-        expect(response.parsed_body["users"].count).to eq(0)
-      end
-
-      it "returns the correct channels with filter 'andyjones'" do
-        get "/chat/api/chatables", params: { filter: "andyjones" }
-        expect(response.status).to eq(200)
-        expect(response.parsed_body["public_channels"].count).to eq(0)
-        expect(response.parsed_body["direct_message_channels"][0]["id"]).to eq(dm_chat_channel.id)
-        expect(response.parsed_body["users"].count).to eq(0)
-      end
-
-      it "returns the current user inside the users array if their username matches the filter too" do
-        user.update!(username: "andysmith")
-        get "/chat/api/chatables", params: { filter: "andy" }
-        expect(response.status).to eq(200)
-        expect(response.parsed_body["direct_message_channels"][0]["id"]).to eq(dm_chat_channel.id)
-        expect(response.parsed_body["users"].map { |u| u["id"] }).to match_array([user.id])
-      end
-
-      it "returns no channels with a whacky filter" do
-        get "/chat/api/chatables", params: { filter: "hello good sir" }
-        expect(response.status).to eq(200)
-        expect(response.parsed_body["public_channels"].count).to eq(0)
-        expect(response.parsed_body["direct_message_channels"].count).to eq(0)
-        expect(response.parsed_body["users"].count).to eq(0)
-      end
-
-      it "only returns open channels" do
-        chat_channel.update(status: ChatChannel.statuses[:closed])
-        get "/chat/api/chatables", params: { filter: "so" }
-        expect(response.parsed_body["public_channels"].count).to eq(0)
-
-        chat_channel.update(status: ChatChannel.statuses[:read_only])
-        get "/chat/api/chatables", params: { filter: "so" }
-        expect(response.parsed_body["public_channels"].count).to eq(0)
-
-        chat_channel.update(status: ChatChannel.statuses[:archived])
-        get "/chat/api/chatables", params: { filter: "so" }
-        expect(response.parsed_body["public_channels"].count).to eq(0)
-
-        # Now set status to open and the channel is there!
-        chat_channel.update(status: ChatChannel.statuses[:open])
-        get "/chat/api/chatables", params: { filter: "so" }
-        expect(response.parsed_body["public_channels"][0]["id"]).to eq(chat_channel.id)
-      end
-
-      it "only finds users by username_lower if not enable_names" do
-        SiteSetting.enable_names = false
-        get "/chat/api/chatables", params: { filter: "Andy J" }
-        expect(response.status).to eq(200)
-        expect(response.parsed_body["public_channels"].count).to eq(0)
-        expect(response.parsed_body["direct_message_channels"].count).to eq(0)
-
-        get "/chat/api/chatables", params: { filter: "andyjones" }
-        expect(response.status).to eq(200)
-        expect(response.parsed_body["public_channels"].count).to eq(0)
-        expect(response.parsed_body["direct_message_channels"][0]["id"]).to eq(dm_chat_channel.id)
-      end
-
-      it "only finds users by username if prioritize_username_in_ux" do
-        SiteSetting.prioritize_username_in_ux = true
-        get "/chat/api/chatables", params: { filter: "Andy J" }
-        expect(response.status).to eq(200)
-        expect(response.parsed_body["public_channels"].count).to eq(0)
-        expect(response.parsed_body["direct_message_channels"].count).to eq(0)
-
-        get "/chat/api/chatables", params: { filter: "andyjones" }
-        expect(response.status).to eq(200)
-        expect(response.parsed_body["public_channels"].count).to eq(0)
-        expect(response.parsed_body["direct_message_channels"][0]["id"]).to eq(dm_chat_channel.id)
-      end
-
-      it "can find users by name or username if not prioritize_username_in_ux and enable_names" do
-        SiteSetting.prioritize_username_in_ux = false
-        SiteSetting.enable_names = true
-        get "/chat/api/chatables", params: { filter: "Andy J" }
-        expect(response.status).to eq(200)
-        expect(response.parsed_body["public_channels"].count).to eq(0)
-        expect(response.parsed_body["direct_message_channels"][0]["id"]).to eq(dm_chat_channel.id)
-
-        get "/chat/api/chatables", params: { filter: "andyjones" }
-        expect(response.status).to eq(200)
-        expect(response.parsed_body["public_channels"].count).to eq(0)
-        expect(response.parsed_body["direct_message_channels"][0]["id"]).to eq(dm_chat_channel.id)
-      end
-
-      it "does not return DM channels for users who do not have chat enabled" do
-        admin.user_option.update!(chat_enabled: false)
-        get "/chat/api/chatables", params: { filter: "andyjones" }
-        expect(response.status).to eq(200)
-        expect(response.parsed_body["direct_message_channels"].count).to eq(0)
-      end
-
-      it "does not return DM channels for users who are not in the chat allowed group" do
-        group = Fabricate(:group, name: "chatpeeps")
-        SiteSetting.chat_allowed_groups = group.id
-        GroupUser.create(user: user, group: group)
-        dm_chat_channel_2 = Fabricate(:direct_message_channel, users: [user, other_user])
-
-        get "/chat/api/chatables", params: { filter: "janemay" }
-        expect(response.status).to eq(200)
-        expect(response.parsed_body["direct_message_channels"].count).to eq(0)
-
-        GroupUser.create(user: other_user, group: group)
-        get "/chat/api/chatables", params: { filter: "janemay" }
-        expect(response.status).to eq(200)
-        expect(response.parsed_body["direct_message_channels"][0]["id"]).to eq(dm_chat_channel_2.id)
-      end
-
-      it "returns DM channels for staff users even if they are not in chat_allowed_groups" do
-        group = Fabricate(:group, name: "chatpeeps")
-        SiteSetting.chat_allowed_groups = group.id
-        GroupUser.create(user: user, group: group)
-
-        get "/chat/api/chatables", params: { filter: "andyjones" }
-        expect(response.status).to eq(200)
-        expect(response.parsed_body["direct_message_channels"][0]["id"]).to eq(dm_chat_channel.id)
-      end
-
-      it "returns followed channels" do
-        Fabricate(
-          :user_chat_channel_membership,
-          user: user,
-          chat_channel: chat_channel,
-          following: true,
-        )
-
-        get "/chat/api/chatables", params: { filter: chat_channel.name }
-
-        expect(response.status).to eq(200)
-        expect(response.parsed_body["public_channels"][0]["id"]).to eq(chat_channel.id)
-      end
-
-      it "returns not followed channels" do
-        Fabricate(
-          :user_chat_channel_membership,
-          user: user,
-          chat_channel: chat_channel,
-          following: false,
-        )
-
-        get "/chat/api/chatables", params: { filter: chat_channel.name }
-
-        expect(response.status).to eq(200)
-        expect(response.parsed_body["public_channels"][0]["id"]).to eq(chat_channel.id)
-      end
-    end
-  end
-end
diff --git a/plugins/chat/spec/requests/admin/admin_incoming_chat_webhooks_controller_spec.rb b/plugins/chat/spec/requests/chat/admin/incoming_webhooks_controller_spec.rb
similarity index 95%
rename from plugins/chat/spec/requests/admin/admin_incoming_chat_webhooks_controller_spec.rb
rename to plugins/chat/spec/requests/chat/admin/incoming_webhooks_controller_spec.rb
index 8d9a8701407..8a20809b773 100644
--- a/plugins/chat/spec/requests/admin/admin_incoming_chat_webhooks_controller_spec.rb
+++ b/plugins/chat/spec/requests/chat/admin/incoming_webhooks_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require "rails_helper"
 
-RSpec.describe Chat::AdminIncomingChatWebhooksController do
+RSpec.describe Chat::Admin::IncomingWebhooksController do
   fab!(:admin) { Fabricate(:admin) }
   fab!(:user) { Fabricate(:user) }
   fab!(:chat_channel1) { Fabricate(:category_channel) }
@@ -56,7 +56,7 @@ RSpec.describe Chat::AdminIncomingChatWebhooksController do
       post "/admin/plugins/chat/hooks.json",
            params: {
              name: "test1a",
-             chat_channel_id: ChatChannel.last.id + 1,
+             chat_channel_id: Chat::Channel.last.id + 1,
            }
       expect(response.status).to eq(404)
     end
@@ -64,7 +64,7 @@ RSpec.describe Chat::AdminIncomingChatWebhooksController do
     it "creates a new incoming_chat_webhook record" do
       sign_in(admin)
       expect { post "/admin/plugins/chat/hooks.json", params: attrs }.to change {
-        IncomingChatWebhook.count
+        Chat::IncomingWebhook.count
       }.by(1)
       expect(response.parsed_body["name"]).to eq(attrs[:name])
       expect(response.parsed_body["chat_channel"]["id"]).to eq(attrs[:chat_channel_id])
@@ -117,7 +117,7 @@ RSpec.describe Chat::AdminIncomingChatWebhooksController do
     end
   end
 
-  describe "#update" do
+  describe "#delete" do
     fab!(:existing) { Fabricate(:incoming_chat_webhook, chat_channel: chat_channel1) }
 
     it "errors for non-staff" do
@@ -129,7 +129,7 @@ RSpec.describe Chat::AdminIncomingChatWebhooksController do
     it "destroys incoming_chat_webhook records" do
       sign_in(admin)
       expect { delete "/admin/plugins/chat/hooks/#{existing.id}.json" }.to change {
-        IncomingChatWebhook.count
+        Chat::IncomingWebhook.count
       }.by(-1)
     end
   end
diff --git a/plugins/chat/spec/requests/api/category_chatables_controller_spec.rb b/plugins/chat/spec/requests/chat/api/category_chatables_controller_spec.rb
similarity index 100%
rename from plugins/chat/spec/requests/api/category_chatables_controller_spec.rb
rename to plugins/chat/spec/requests/chat/api/category_chatables_controller_spec.rb
diff --git a/plugins/chat/spec/requests/chat/api/channel_messages_controller_spec.rb b/plugins/chat/spec/requests/chat/api/channel_messages_controller_spec.rb
new file mode 100644
index 00000000000..d91840d2342
--- /dev/null
+++ b/plugins/chat/spec/requests/chat/api/channel_messages_controller_spec.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+RSpec.describe Chat::Api::ChannelMessagesController do
+  fab!(:current_user) { Fabricate(:user) }
+  fab!(:channel) { Fabricate(:chat_channel) }
+
+  before do
+    SiteSetting.chat_enabled = true
+    SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:everyone]
+    channel.add(current_user)
+    sign_in(current_user)
+  end
+
+  describe "index" do
+    describe "success" do
+      fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel) }
+      fab!(:message_2) { Fabricate(:chat_message) }
+
+      it "works" do
+        get "/chat/api/channels/#{channel.id}/messages"
+
+        expect(response.status).to eq(200)
+        expect(response.parsed_body["messages"].map { |m| m["id"] }).to contain_exactly(
+          message_1.id,
+        )
+      end
+    end
+
+    context "when channnel doesn’t exist" do
+      it "returns a 404" do
+        get "/chat/api/channels/-999/messages"
+
+        expect(response.status).to eq(404)
+      end
+    end
+
+    context "when target message doesn’t exist" do
+      it "returns a 404" do
+        get "/chat/api/channels/#{channel.id}/messages?target_message_id=-999"
+
+        expect(response.status).to eq(404)
+      end
+    end
+
+    context "when user can’t see channel" do
+      fab!(:channel) { Fabricate(:private_category_channel) }
+
+      it "returns a 403" do
+        get "/chat/api/channels/#{channel.id}/messages"
+
+        expect(response.status).to eq(403)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/requests/chat/api/channel_thread_messages_controller_spec.rb b/plugins/chat/spec/requests/chat/api/channel_thread_messages_controller_spec.rb
new file mode 100644
index 00000000000..731a3a712be
--- /dev/null
+++ b/plugins/chat/spec/requests/chat/api/channel_thread_messages_controller_spec.rb
@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+RSpec.describe Chat::Api::ChannelThreadMessagesController do
+  fab!(:current_user) { Fabricate(:user) }
+  fab!(:thread) do
+    Fabricate(:chat_thread, channel: Fabricate(:chat_channel, threading_enabled: true))
+  end
+
+  before do
+    SiteSetting.chat_enabled = true
+    SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:everyone]
+    thread.channel.add(current_user)
+    sign_in(current_user)
+  end
+
+  describe "index" do
+    describe "success" do
+      fab!(:message_1) { Fabricate(:chat_message, thread: thread) }
+      fab!(:message_2) { Fabricate(:chat_message) }
+
+      it "works" do
+        get "/chat/api/channels/#{thread.channel.id}/threads/#{thread.id}/messages"
+
+        expect(response.status).to eq(200)
+        expect(response.parsed_body["messages"].map { |m| m["id"] }).to contain_exactly(
+          thread.original_message.id,
+          message_1.id,
+        )
+      end
+    end
+
+    context "when thread doesn’t exist" do
+      it "returns a 404" do
+        get "/chat/api/channels/#{thread.channel.id}/threads/-999/messages"
+
+        expect(response.status).to eq(404)
+      end
+    end
+
+    context "when target message doesn’t exist" do
+      it "returns a 404" do
+        get "/chat/api/channels/#{thread.channel.id}/threads/#{thread.id}/messages?target_message_id=-999"
+
+        expect(response.status).to eq(404)
+      end
+    end
+
+    context "when user can’t see channel" do
+      fab!(:thread) do
+        Fabricate(
+          :chat_thread,
+          channel: Fabricate(:private_category_channel, threading_enabled: true),
+        )
+      end
+
+      it "returns a 403" do
+        get "/chat/api/channels/#{thread.channel.id}/threads/#{thread.id}/messages"
+
+        expect(response.status).to eq(403)
+      end
+    end
+
+    context "when channel disabled threading" do
+      fab!(:thread) do
+        Fabricate(:chat_thread, channel: Fabricate(:chat_channel, threading_enabled: false))
+      end
+
+      it "returns a 404" do
+        get "/chat/api/channels/#{thread.channel.id}/threads/#{thread.id}/messages"
+
+        expect(response.status).to eq(404)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/requests/chat/api/channel_threads_controller_spec.rb b/plugins/chat/spec/requests/chat/api/channel_threads_controller_spec.rb
new file mode 100644
index 00000000000..f3e4f40a300
--- /dev/null
+++ b/plugins/chat/spec/requests/chat/api/channel_threads_controller_spec.rb
@@ -0,0 +1,232 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+RSpec.describe Chat::Api::ChannelThreadsController do
+  fab!(:current_user) { Fabricate(:user) }
+  fab!(:public_channel) { Fabricate(:chat_channel, threading_enabled: true) }
+
+  before do
+    SiteSetting.chat_enabled = true
+    SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:everyone]
+    Group.refresh_automatic_groups!
+    sign_in(current_user)
+  end
+
+  describe "show" do
+    context "when thread does not exist" do
+      fab!(:thread) do
+        Fabricate(
+          :chat_thread,
+          original_message: Fabricate(:chat_message, chat_channel: public_channel),
+        )
+      end
+
+      it "returns 404" do
+        thread.destroy!
+        get "/chat/api/channels/#{thread.channel_id}/threads/#{thread.id}"
+        expect(response.status).to eq(404)
+      end
+    end
+
+    context "when thread exists" do
+      fab!(:thread) do
+        Fabricate(
+          :chat_thread,
+          original_message: Fabricate(:chat_message, chat_channel: public_channel),
+        )
+      end
+
+      it "works" do
+        get "/chat/api/channels/#{thread.channel_id}/threads/#{thread.id}"
+        expect(response.status).to eq(200)
+        expect(response.parsed_body["thread"]["id"]).to eq(thread.id)
+      end
+
+      context "when the channel_id does not match the thread id" do
+        fab!(:other_channel) { Fabricate(:chat_channel) }
+
+        it "returns 404" do
+          get "/chat/api/channels/#{other_channel.id}/threads/#{thread.id}"
+          expect(response.status).to eq(404)
+        end
+      end
+
+      context "when channel does not have threading enabled" do
+        before { thread.channel.update!(threading_enabled: false) }
+
+        it "returns 404" do
+          get "/chat/api/channels/#{thread.channel_id}/threads/#{thread.id}"
+          expect(response.status).to eq(404)
+        end
+      end
+
+      context "when user cannot access the channel" do
+        before do
+          thread.channel.update!(chatable: Fabricate(:private_category, group: Fabricate(:group)))
+        end
+
+        it "returns 403" do
+          get "/chat/api/channels/#{thread.channel_id}/threads/#{thread.id}"
+          expect(response.status).to eq(403)
+        end
+      end
+
+      context "when user cannot chat" do
+        before { SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:trust_level_4] }
+
+        it "returns 403" do
+          get "/chat/api/channels/#{thread.channel_id}/threads/#{thread.id}"
+          expect(response.status).to eq(403)
+        end
+      end
+    end
+  end
+
+  describe "index" do
+    fab!(:thread_1) { Fabricate(:chat_thread, channel: public_channel) }
+    fab!(:thread_2) { Fabricate(:chat_thread, channel: public_channel) }
+    fab!(:thread_3) { Fabricate(:chat_thread, channel: public_channel) }
+    fab!(:message_1) do
+      Fabricate(
+        :chat_message,
+        user: current_user,
+        chat_channel: public_channel,
+        thread: thread_1,
+        created_at: 10.minutes.ago,
+      )
+    end
+    fab!(:message_2) do
+      Fabricate(
+        :chat_message,
+        user: current_user,
+        chat_channel: public_channel,
+        thread: thread_3,
+        created_at: 2.seconds.ago,
+      )
+    end
+
+    it "returns the threads the user has sent messages in for the channel" do
+      get "/chat/api/channels/#{public_channel.id}/threads"
+      expect(response.status).to eq(200)
+      expect(response.parsed_body["threads"].map { |thread| thread["id"] }).to eq(
+        [thread_3.id, thread_1.id],
+      )
+    end
+
+    it "has preloaded chat mentions and users for the thread original message" do
+      thread_1.original_message.update!(
+        message: "@#{current_user.username} hello and @#{thread_2.original_message_user.username}!",
+      )
+      thread_1.original_message.rebake!
+      thread_1.original_message.create_mentions
+
+      get "/chat/api/channels/#{public_channel.id}/threads"
+      expect(response.status).to eq(200)
+      expect(
+        response.parsed_body["threads"]
+          .find { |thread| thread["id"] == thread_1.id }
+          .dig("original_message", "mentioned_users"),
+      ).to eq(
+        [
+          {
+            "avatar_template" => User.system_avatar_template(current_user.username),
+            "id" => current_user.id,
+            "name" => current_user.name,
+            "username" => current_user.username,
+          },
+          {
+            "avatar_template" =>
+              User.system_avatar_template(thread_2.original_message_user.username),
+            "id" => thread_2.original_message_user.id,
+            "name" => thread_2.original_message_user.name,
+            "username" => thread_2.original_message_user.username,
+          },
+        ],
+      )
+    end
+
+    context "when the channel is not accessible to the useer" do
+      before do
+        public_channel.update!(chatable: Fabricate(:private_category, group: Fabricate(:group)))
+      end
+
+      it "returns 404" do
+        get "/chat/api/channels/#{public_channel.id}/threads"
+        expect(response.status).to eq(403)
+      end
+    end
+
+    context "when channel does not have threading enabled" do
+      before { public_channel.update!(threading_enabled: false) }
+
+      it "returns 404" do
+        get "/chat/api/channels/#{public_channel.id}/threads"
+        expect(response.status).to eq(404)
+      end
+    end
+  end
+
+  describe "update" do
+    let(:title) { "New title" }
+    let(:params) { { title: title } }
+    fab!(:thread) do
+      Fabricate(:chat_thread, channel: public_channel, original_message_user: current_user)
+    end
+
+    context "when thread does not exist" do
+      it "returns 404" do
+        thread.destroy!
+        put "/chat/api/channels/#{thread.channel_id}/threads/#{thread.id}", params: params
+        expect(response.status).to eq(404)
+      end
+    end
+
+    context "when thread exists" do
+      it "updates the title" do
+        put "/chat/api/channels/#{thread.channel_id}/threads/#{thread.id}", params: params
+        expect(response.status).to eq(200)
+        expect(thread.reload.title).to eq(title)
+      end
+
+      context "when user cannot view the channel" do
+        before { thread.update!(channel: Fabricate(:private_category_channel)) }
+
+        it "returns 403" do
+          put "/chat/api/channels/#{thread.channel_id}/threads/#{thread.id}", params: params
+          expect(response.status).to eq(403)
+        end
+      end
+
+      context "when the user is not the original message user" do
+        before { thread.update!(original_message_user: Fabricate(:user)) }
+
+        it "returns 403" do
+          put "/chat/api/channels/#{thread.channel_id}/threads/#{thread.id}", params: params
+          expect(response.status).to eq(403)
+        end
+      end
+
+      context "when the title is too long" do
+        let(:title) { "x" * Chat::Thread::MAX_TITLE_LENGTH + "x" }
+
+        it "returns 400" do
+          put "/chat/api/channels/#{thread.channel_id}/threads/#{thread.id}", params: params
+          expect(response.status).to eq(400)
+          expect(response.parsed_body["errors"]).to eq(
+            ["Title is too long (maximum is #{Chat::Thread::MAX_TITLE_LENGTH} characters)"],
+          )
+        end
+      end
+    end
+
+    context "when channel does not have threading enabled" do
+      before { public_channel.update!(threading_enabled: false) }
+
+      it "returns 404" do
+        put "/chat/api/channels/#{thread.channel_id}/threads/#{thread.id}", params: params
+        expect(response.status).to eq(404)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/requests/chat/api/channel_threads_current_user_notification_settings_controller_spec.rb b/plugins/chat/spec/requests/chat/api/channel_threads_current_user_notification_settings_controller_spec.rb
new file mode 100644
index 00000000000..710040233c7
--- /dev/null
+++ b/plugins/chat/spec/requests/chat/api/channel_threads_current_user_notification_settings_controller_spec.rb
@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::Api::ChannelThreadsCurrentUserNotificationsSettingsController do
+  fab!(:current_user) { Fabricate(:user) }
+  fab!(:channel) { Fabricate(:chat_channel, threading_enabled: true) }
+  fab!(:thread) { Fabricate(:chat_thread, channel: channel) }
+  fab!(:last_reply) { Fabricate(:chat_message, thread: thread, chat_channel: channel) }
+
+  before do
+    SiteSetting.chat_enabled = true
+    SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:everyone]
+    sign_in(current_user)
+  end
+
+  describe "#update" do
+    context "when the user cannot access the channel" do
+      fab!(:channel) { Fabricate(:private_category_channel) }
+      fab!(:thread) { Fabricate(:chat_thread, channel: channel) }
+
+      it "raises invalid access" do
+        put "/chat/api/channels/#{channel.id}/threads/#{thread.id}/notifications-settings/me.json",
+            params: {
+              notification_level: Chat::UserChatThreadMembership.notification_levels[:normal],
+            }
+        expect(response.status).to eq(403)
+      end
+    end
+
+    context "when the channel_id and thread_id params do not match" do
+      it "raises a not found" do
+        put "/chat/api/channels/#{Fabricate(:chat_channel).id}/threads/#{thread.id}/notifications-settings/me.json",
+            params: {
+              notification_level: Chat::UserChatThreadMembership.notification_levels[:normal],
+            }
+        expect(response.status).to eq(404)
+      end
+    end
+
+    context "when the notification_level is invalid" do
+      it "raises invalid parameters" do
+        put "/chat/api/channels/#{Fabricate(:chat_channel).id}/threads/#{thread.id}/notifications-settings/me.json",
+            params: {
+              notification_level: 100,
+            }
+        expect(response.status).to eq(400)
+      end
+    end
+
+    context "when the user is a member of the thread" do
+      before { thread.add(current_user) }
+
+      it "updates the notification_level" do
+        expect do
+          put "/chat/api/channels/#{channel.id}/threads/#{thread.id}/notifications-settings/me.json",
+              params: {
+                notification_level: Chat::UserChatThreadMembership.notification_levels[:normal],
+              }
+        end.not_to change { Chat::UserChatThreadMembership.count }
+
+        expect(response.status).to eq(200)
+        expect(thread.membership_for(current_user).notification_level).to eq("normal")
+      end
+    end
+
+    context "when the user is not a member of the thread" do
+      it "creates a membership for the user" do
+        expect do
+          put "/chat/api/channels/#{channel.id}/threads/#{thread.id}/notifications-settings/me.json",
+              params: {
+                notification_level: Chat::UserChatThreadMembership.notification_levels[:normal],
+              }
+        end.to change { Chat::UserChatThreadMembership.count }.by(1)
+
+        expect(response.status).to eq(200)
+        expect(response.parsed_body["membership"]).to eq(
+          "notification_level" => Chat::UserChatThreadMembership.notification_levels[:normal],
+          "thread_id" => thread.id,
+          "last_read_message_id" => last_reply.id,
+        )
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/requests/api/chat_channels_archives_controller_spec.rb b/plugins/chat/spec/requests/chat/api/channels_archives_controller_spec.rb
similarity index 91%
rename from plugins/chat/spec/requests/api/chat_channels_archives_controller_spec.rb
rename to plugins/chat/spec/requests/chat/api/channels_archives_controller_spec.rb
index 2acd568e9ec..9e53ead716a 100644
--- a/plugins/chat/spec/requests/api/chat_channels_archives_controller_spec.rb
+++ b/plugins/chat/spec/requests/chat/api/channels_archives_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require "rails_helper"
 
-RSpec.describe Chat::Api::ChatChannelsArchivesController do
+RSpec.describe Chat::Api::ChannelsArchivesController do
   fab!(:user) { Fabricate(:user) }
   fab!(:admin) { Fabricate(:admin) }
   fab!(:category) { Fabricate(:category) }
@@ -62,10 +62,10 @@ RSpec.describe Chat::Api::ChatChannelsArchivesController do
     it "starts the archive process using a new topic" do
       sign_in(admin)
       post "/chat/api/channels/#{channel.id}/archives", params: new_topic_params
-      channel_archive = ChatChannelArchive.find_by(chat_channel: channel)
+      channel_archive = Chat::ChannelArchive.find_by(chat_channel: channel)
       expect(
         job_enqueued?(
-          job: :chat_channel_archive,
+          job: Jobs::Chat::ChannelArchive,
           args: {
             chat_channel_archive_id: channel_archive.id,
           },
@@ -77,10 +77,10 @@ RSpec.describe Chat::Api::ChatChannelsArchivesController do
     it "starts the archive process using an existing topic" do
       sign_in(admin)
       post "/chat/api/channels/#{channel.id}/archives", params: existing_topic_params
-      channel_archive = ChatChannelArchive.find_by(chat_channel: channel)
+      channel_archive = Chat::ChannelArchive.find_by(chat_channel: channel)
       expect(
         job_enqueued?(
-          job: :chat_channel_archive,
+          job: Jobs::Chat::ChannelArchive,
           args: {
             chat_channel_archive_id: channel_archive.id,
           },
@@ -95,7 +95,7 @@ RSpec.describe Chat::Api::ChatChannelsArchivesController do
       expect(response.status).to eq(200)
       expect {
         post "/chat/api/channels/#{channel.id}/archives", params: new_topic_params
-      }.not_to change { ChatChannelArchive.count }
+      }.not_to change { Chat::ChannelArchive.count }
     end
 
     context "when archiving to a new topic" do
@@ -108,7 +108,7 @@ RSpec.describe Chat::Api::ChatChannelsArchivesController do
         sign_in(admin)
         expect {
           post "/chat/api/channels/#{channel.id}/archives", params: new_topic_params_invalid
-        }.not_to change { ChatChannelArchive.count }
+        }.not_to change { Chat::ChannelArchive.count }
         expect(response.status).to eq(400)
         expect(response.parsed_body["errors"]).to eq(["Title can't have more than 1 emoji"])
       end
@@ -117,7 +117,7 @@ RSpec.describe Chat::Api::ChatChannelsArchivesController do
     describe "when retrying the archive process" do
       fab!(:channel) { Fabricate(:category_channel, chatable: category, status: :read_only) }
       fab!(:archive) do
-        ChatChannelArchive.create!(
+        Chat::ChannelArchive.create!(
           chat_channel: channel,
           destination_topic_title: "test archive topic title",
           archived_by: admin,
@@ -151,7 +151,7 @@ RSpec.describe Chat::Api::ChatChannelsArchivesController do
         archive.update!(archive_error: "bad stuff", archived_messages: 1)
 
         expect { post "/chat/api/channels/#{channel.id}/archives" }.to change(
-          Jobs::ChatChannelArchive.jobs,
+          Jobs::Chat::ChannelArchive.jobs,
           :size,
         ).by (1)
         expect(response.status).to eq(200)
diff --git a/plugins/chat/spec/requests/api/chat_channels_controller_spec.rb b/plugins/chat/spec/requests/chat/api/channels_controller_spec.rb
similarity index 75%
rename from plugins/chat/spec/requests/api/chat_channels_controller_spec.rb
rename to plugins/chat/spec/requests/chat/api/channels_controller_spec.rb
index e72c9bf34fc..1ca60282b17 100644
--- a/plugins/chat/spec/requests/api/chat_channels_controller_spec.rb
+++ b/plugins/chat/spec/requests/chat/api/channels_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require "rails_helper"
 
-RSpec.describe Chat::Api::ChatChannelsController do
+RSpec.describe Chat::Api::ChannelsController do
   before do
     SiteSetting.chat_enabled = true
     SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:everyone]
@@ -155,7 +155,7 @@ RSpec.describe Chat::Api::ChatChannelsController do
           get "/chat/api/channels/#{channel_1.id}"
 
           expect(response.status).to eq(200)
-          expect(response.parsed_body["channel"]["id"]).to eq(channel_1.id)
+          expect(response.parsed_body.dig("channel", "id")).to eq(channel_1.id)
         end
       end
     end
@@ -170,12 +170,7 @@ RSpec.describe Chat::Api::ChatChannelsController do
       before { sign_in(current_user) }
 
       it "returns an error" do
-        delete "/chat/api/channels/#{channel_1.id}",
-               params: {
-                 channel: {
-                   name_confirmation: channel_1.title(current_user),
-                 },
-               }
+        delete "/chat/api/channels/#{channel_1.id}"
 
         expect(response.status).to eq(403)
       end
@@ -190,43 +185,20 @@ RSpec.describe Chat::Api::ChatChannelsController do
         before { channel_1.destroy! }
 
         it "returns an error" do
-          delete "/chat/api/channels/#{channel_1.id}",
-                 params: {
-                   channel: {
-                     name_confirmation: channel_1.title(current_user),
-                   },
-                 }
+          delete "/chat/api/channels/#{channel_1.id}"
 
           expect(response.status).to eq(404)
         end
       end
 
-      context "when the confirmation doesn’t match the channel name" do
-        it "returns an error" do
-          delete "/chat/api/channels/#{channel_1.id}",
-                 params: {
-                   channel: {
-                     name_confirmation: channel_1.title(current_user) + "foo",
-                   },
-                 }
-
-          expect(response.status).to eq(400)
-        end
-      end
-
       context "with valid params" do
         it "properly destroys the channel" do
-          delete "/chat/api/channels/#{channel_1.id}",
-                 params: {
-                   channel: {
-                     name_confirmation: channel_1.title(current_user),
-                   },
-                 }
+          delete "/chat/api/channels/#{channel_1.id}"
 
           expect(response.status).to eq(200)
           expect(channel_1.reload.trashed?).to eq(true)
           expect(
-            job_enqueued?(job: :chat_channel_delete, args: { chat_channel_id: channel_1.id }),
+            job_enqueued?(job: Jobs::Chat::ChannelDelete, args: { chat_channel_id: channel_1.id }),
           ).to eq(true)
           expect(
             UserHistory.exists?(
@@ -238,16 +210,12 @@ RSpec.describe Chat::Api::ChatChannelsController do
         end
 
         it "generates a valid new slug to prevent collisions" do
-          SiteSetting.max_topic_title_length = 15
+          SiteSetting.max_topic_title_length = 20
+          channel_1 = Fabricate(:chat_channel, name: "a" * SiteSetting.max_topic_title_length)
           freeze_time(DateTime.parse("2022-07-08 09:30:00"))
           old_slug = channel_1.slug
 
-          delete "/chat/api/channels/#{channel_1.id}",
-                 params: {
-                   channel: {
-                     name_confirmation: channel_1.title(current_user),
-                   },
-                 }
+          delete "/chat/api/channels/#{channel_1.id}"
 
           expect(response.status).to eq(200)
           expect(channel_1.reload.slug).to eq(
@@ -272,6 +240,7 @@ RSpec.describe Chat::Api::ChatChannelsController do
           chatable_id: category.id,
           name: "channel name",
           description: "My new channel",
+          threading_enabled: false,
         },
       }
     end
@@ -280,19 +249,46 @@ RSpec.describe Chat::Api::ChatChannelsController do
 
     it "creates a channel associated to a category" do
       post "/chat/api/channels", params: params
+      expect(response.status).to eq(200)
 
-      new_channel = ChatChannel.last
+      new_channel = Chat::Channel.find(response.parsed_body.dig("channel", "id"))
 
       expect(new_channel.name).to eq(params[:channel][:name])
+      expect(new_channel.slug).to eq("channel-name")
       expect(new_channel.description).to eq(params[:channel][:description])
       expect(new_channel.chatable_type).to eq(category.class.name)
       expect(new_channel.chatable_id).to eq(category.id)
     end
 
+    it "creates a channel using the user-provided slug" do
+      new_params = params.dup
+      new_params[:channel][:slug] = "wow-so-cool"
+      post "/chat/api/channels", params: new_params
+      expect(response.status).to eq(200)
+
+      new_channel = Chat::Channel.find(response.parsed_body.dig("channel", "id"))
+
+      expect(new_channel.slug).to eq("wow-so-cool")
+    end
+
+    context "when the user-provided slug already exists for a channel" do
+      before do
+        params[:channel][:slug] = "wow-so-cool"
+        post "/chat/api/channels", params: params
+        params[:channel][:name] = "new name"
+      end
+
+      it "returns an error" do
+        post "/chat/api/channels", params: params
+        expect(response).to have_http_status :unprocessable_entity
+      end
+    end
+
     it "creates a channel sets auto_join_users to false by default" do
       post "/chat/api/channels", params: params
+      expect(response.status).to eq(200)
 
-      new_channel = ChatChannel.last
+      new_channel = Chat::Channel.find(response.parsed_body.dig("channel", "id"))
 
       expect(new_channel.auto_join_users).to eq(false)
     end
@@ -300,12 +296,32 @@ RSpec.describe Chat::Api::ChatChannelsController do
     it "creates a channel with auto_join_users set to true" do
       params[:channel][:auto_join_users] = true
       post "/chat/api/channels", params: params
+      expect(response.status).to eq(200)
 
-      new_channel = ChatChannel.last
+      new_channel = Chat::Channel.find(response.parsed_body.dig("channel", "id"))
 
       expect(new_channel.auto_join_users).to eq(true)
     end
 
+    it "creates a channel sets threading_enabled to false by default" do
+      post "/chat/api/channels", params: params
+      expect(response.status).to eq(200)
+
+      new_channel = Chat::Channel.find(response.parsed_body.dig("channel", "id"))
+
+      expect(new_channel.threading_enabled).to eq(false)
+    end
+
+    it "creates a channel with threading_enabled set to true" do
+      params[:channel][:threading_enabled] = true
+      post "/chat/api/channels", params: params
+      expect(response.status).to eq(200)
+
+      new_channel = Chat::Channel.find(response.parsed_body.dig("channel", "id"))
+
+      expect(new_channel.threading_enabled).to eq(true)
+    end
+
     describe "triggers the auto-join process" do
       fab!(:chatters_group) { Fabricate(:group) }
       fab!(:user) { Fabricate(:user, last_seen_at: 15.minute.ago) }
@@ -319,10 +335,11 @@ RSpec.describe Chat::Api::ChatChannelsController do
       it "joins the user when auto_join_users is true" do
         params[:channel][:auto_join_users] = true
         post "/chat/api/channels", params: params
+        expect(response.status).to eq(200)
 
         created_channel_id = response.parsed_body.dig("channel", "id")
         membership_exists =
-          UserChatChannelMembership.find_by(
+          Chat::UserChatChannelMembership.find_by(
             user: user,
             chat_channel_id: created_channel_id,
             following: true,
@@ -334,10 +351,11 @@ RSpec.describe Chat::Api::ChatChannelsController do
       it "doesn't join the user when auto_join_users is false" do
         params[:channel][:auto_join_users] = false
         post "/chat/api/channels", params: params
+        expect(response.status).to eq(200)
 
         created_channel_id = response.parsed_body.dig("channel", "id")
         membership_exists =
-          UserChatChannelMembership.find_by(
+          Chat::UserChatChannelMembership.find_by(
             user: user,
             chat_channel_id: created_channel_id,
             following: true,
@@ -357,7 +375,13 @@ RSpec.describe Chat::Api::ChatChannelsController do
       before { sign_in(Fabricate(:user)) }
 
       it "returns a 403" do
-        put "/chat/api/channels/#{channel.id}"
+        put "/chat/api/channels/#{channel.id}",
+            params: {
+              channel: {
+                name: "joffrey",
+                description: "cat owner",
+              },
+            }
 
         expect(response.status).to eq(403)
       end
@@ -386,7 +410,7 @@ RSpec.describe Chat::Api::ChatChannelsController do
       it "nullifies the field and doesn’t store an empty string" do
         put "/chat/api/channels/#{channel.id}", params: { channel: { name: "  " } }
 
-        expect(channel.reload.name).to be_nil
+        expect(channel.reload.name).to eq(nil)
       end
 
       it "doesn’t nullify the description" do
@@ -407,7 +431,7 @@ RSpec.describe Chat::Api::ChatChannelsController do
       it "nullifies the field and doesn’t store an empty string" do
         put "/chat/api/channels/#{channel.id}", params: { channel: { description: "  " } }
 
-        expect(channel.reload.description).to be_nil
+        expect(channel.reload.description).to eq(nil)
       end
 
       it "doesn’t nullify the name" do
@@ -417,6 +441,21 @@ RSpec.describe Chat::Api::ChatChannelsController do
       end
     end
 
+    context "when user provides an empty slug" do
+      fab!(:user) { Fabricate(:admin) }
+      fab!(:channel) do
+        Fabricate(:category_channel, name: "something else", description: "something")
+      end
+
+      before { sign_in(user) }
+
+      it "does not nullify the slug" do
+        put "/chat/api/channels/#{channel.id}", params: { channel: { slug: " " } }
+
+        expect(channel.reload.slug).to eq("something-else")
+      end
+    end
+
     context "when channel is a direct message channel" do
       fab!(:user) { Fabricate(:admin) }
       fab!(:channel) { Fabricate(:direct_message_channel) }
@@ -441,11 +480,13 @@ RSpec.describe Chat::Api::ChatChannelsController do
             params: {
               channel: {
                 name: "joffrey",
+                slug: "cat-king",
                 description: "cat owner",
               },
             }
 
         expect(channel.reload.name).to eq("joffrey")
+        expect(channel.reload.slug).to eq("cat-king")
         expect(channel.reload.description).to eq("cat owner")
       end
 
@@ -460,7 +501,12 @@ RSpec.describe Chat::Api::ChatChannelsController do
                 }
           end
 
-        expect(messages[0].data[:chat_channel_id]).to eq(channel.id)
+        message = messages[0]
+        channel.reload
+        expect(message.data[:chat_channel_id]).to eq(channel.id)
+        expect(message.data[:name]).to eq(channel.name)
+        expect(message.data[:slug]).to eq(channel.slug)
+        expect(message.data[:description]).to eq(channel.description)
       end
 
       it "returns a valid chat channel" do
@@ -469,6 +515,16 @@ RSpec.describe Chat::Api::ChatChannelsController do
         expect(response.parsed_body["channel"]).to match_response_schema("category_chat_channel")
       end
 
+      describe "when updating threading_enabled" do
+        it "sets the new value" do
+          expect {
+            put "/chat/api/channels/#{channel.id}", params: { channel: { threading_enabled: true } }
+          }.to change { channel.reload.threading_enabled }.from(false).to(true)
+
+          expect(response.parsed_body["channel"]["threading_enabled"]).to eq(true)
+        end
+      end
+
       describe "when updating allow_channel_wide_mentions" do
         it "sets the new value" do
           put "/chat/api/channels/#{channel.id}",
@@ -512,9 +568,9 @@ RSpec.describe Chat::Api::ChatChannelsController do
           it "joins the user when auto_join_users is true" do
             put "/chat/api/channels/#{channel.id}", params: { channel: { auto_join_users: true } }
 
-            created_channel_id = response.parsed_body["channel"]["id"]
+            created_channel_id = response.parsed_body.dig("channel", "id")
             membership_exists =
-              UserChatChannelMembership.find_by(
+              Chat::UserChatChannelMembership.find_by(
                 user: another_user,
                 chat_channel_id: created_channel_id,
                 following: true,
@@ -526,12 +582,12 @@ RSpec.describe Chat::Api::ChatChannelsController do
           it "doesn't join the user when auto_join_users is false" do
             put "/chat/api/channels/#{channel.id}", params: { channel: { auto_join_users: false } }
 
-            created_channel_id = response.parsed_body["channel"]["id"]
+            created_channel_id = response.parsed_body.dig("channel", "id")
 
             expect(created_channel_id).to be_present
 
             membership_exists =
-              UserChatChannelMembership.find_by(
+              Chat::UserChatChannelMembership.find_by(
                 user: another_user,
                 chat_channel_id: created_channel_id,
                 following: true,
@@ -543,4 +599,8 @@ RSpec.describe Chat::Api::ChatChannelsController do
       end
     end
   end
+
+  def flag_message(message, flagger, flag_type: ReviewableScore.types[:off_topic])
+    Chat::ReviewQueue.new.flag_message(message, Guardian.new(flagger), flag_type)[:reviewable]
+  end
 end
diff --git a/plugins/chat/spec/requests/api/chat_channels_current_user_membership_spec.rb b/plugins/chat/spec/requests/chat/api/channels_current_user_membership_spec.rb
similarity index 90%
rename from plugins/chat/spec/requests/api/chat_channels_current_user_membership_spec.rb
rename to plugins/chat/spec/requests/chat/api/channels_current_user_membership_spec.rb
index 80fd842fb34..3c0acb3db34 100644
--- a/plugins/chat/spec/requests/api/chat_channels_current_user_membership_spec.rb
+++ b/plugins/chat/spec/requests/chat/api/channels_current_user_membership_spec.rb
@@ -2,7 +2,7 @@
 
 require "rails_helper"
 
-describe Chat::Api::ChatChannelsCurrentUserMembershipController do
+describe Chat::Api::ChannelsCurrentUserMembershipController do
   fab!(:current_user) { Fabricate(:user) }
   fab!(:channel_1) { Fabricate(:category_channel) }
 
@@ -16,7 +16,7 @@ describe Chat::Api::ChatChannelsCurrentUserMembershipController do
     context "when no existing membership exists" do
       it "creates a membership" do
         expect { post "/chat/api/channels/#{channel_1.id}/memberships/me" }.to change {
-          UserChatChannelMembership.where(user_id: current_user.id, following: true).count
+          Chat::UserChatChannelMembership.where(user_id: current_user.id, following: true).count
         }.by(1)
         expect(response.status).to eq(200)
         expect(response.parsed_body["membership"]["following"]).to eq(true)
@@ -30,7 +30,7 @@ describe Chat::Api::ChatChannelsCurrentUserMembershipController do
 
       it "fails" do
         expect { post "/chat/api/channels/#{channel_2.id}/memberships/me" }.not_to change {
-          UserChatChannelMembership.where(user_id: current_user.id).count
+          Chat::UserChatChannelMembership.where(user_id: current_user.id).count
         }
         expect(response.status).to eq(403)
       end
@@ -54,7 +54,7 @@ describe Chat::Api::ChatChannelsCurrentUserMembershipController do
 
         it "fails" do
           expect { post "/chat/api/channels/#{channel_2.id}/memberships/me" }.not_to change {
-            UserChatChannelMembership.where(user_id: current_user.id).count
+            Chat::UserChatChannelMembership.where(user_id: current_user.id).count
           }
           expect(response.status).to eq(403)
         end
@@ -77,7 +77,7 @@ describe Chat::Api::ChatChannelsCurrentUserMembershipController do
 
         it "works" do
           expect { post "/chat/api/channels/#{channel_2.id}/memberships/me" }.to change {
-            UserChatChannelMembership.where(user_id: current_user.id).count
+            Chat::UserChatChannelMembership.where(user_id: current_user.id).count
           }.by(1)
           expect(response.status).to eq(200)
         end
@@ -87,7 +87,7 @@ describe Chat::Api::ChatChannelsCurrentUserMembershipController do
     context "when an existing membership exists" do
       it "enforces 'following' to true" do
         membership_record =
-          UserChatChannelMembership.create!(
+          Chat::UserChatChannelMembership.create!(
             chat_channel_id: channel_1.id,
             user_id: current_user.id,
             following: false,
@@ -125,7 +125,7 @@ describe Chat::Api::ChatChannelsCurrentUserMembershipController do
 
         it "fails" do
           expect { delete "/chat/api/channels/#{channel_2.id}/memberships/me" }.not_to change {
-            UserChatChannelMembership.where(user_id: current_user.id).count
+            Chat::UserChatChannelMembership.where(user_id: current_user.id).count
           }
           expect(response.status).to eq(403)
         end
diff --git a/plugins/chat/spec/requests/api/chat_channels_current_user_notifications_settings_controller_spec.rb b/plugins/chat/spec/requests/chat/api/channels_current_user_notifications_settings_controller_spec.rb
similarity index 91%
rename from plugins/chat/spec/requests/api/chat_channels_current_user_notifications_settings_controller_spec.rb
rename to plugins/chat/spec/requests/chat/api/channels_current_user_notifications_settings_controller_spec.rb
index f5fe1f3ae34..e36d794b429 100644
--- a/plugins/chat/spec/requests/api/chat_channels_current_user_notifications_settings_controller_spec.rb
+++ b/plugins/chat/spec/requests/chat/api/channels_current_user_notifications_settings_controller_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe Chat::Api::ChatChannelsCurrentUserNotificationsSettingsController do
+RSpec.describe Chat::Api::ChannelsCurrentUserNotificationsSettingsController do
   fab!(:current_user) { Fabricate(:user) }
 
   before do
@@ -23,7 +23,11 @@ RSpec.describe Chat::Api::ChatChannelsCurrentUserNotificationsSettingsController
       end
 
       it "doesn’t use invalid params" do
-        UserChatChannelMembership.any_instance.expects(:update!).with({ "muted" => "true" }).once
+        Chat::UserChatChannelMembership
+          .any_instance
+          .expects(:update!)
+          .with({ "muted" => "true" })
+          .once
 
         put "/chat/api/channels/#{channel_1.id}/notifications-settings/me",
             params: {
@@ -91,7 +95,11 @@ RSpec.describe Chat::Api::ChatChannelsCurrentUserNotificationsSettingsController
       before { sign_in(current_user) }
 
       it "doesn’t use invalid params" do
-        UserChatChannelMembership.any_instance.expects(:update!).with({ "muted" => "true" }).once
+        Chat::UserChatChannelMembership
+          .any_instance
+          .expects(:update!)
+          .with({ "muted" => "true" })
+          .once
 
         put "/chat/api/channels/#{dm_channel_1.id}/notifications-settings/me",
             params: {
diff --git a/plugins/chat/spec/requests/api/chat_channels_moves_controller_spec.rb b/plugins/chat/spec/requests/chat/api/channels_moves_controller_spec.rb
similarity index 96%
rename from plugins/chat/spec/requests/api/chat_channels_moves_controller_spec.rb
rename to plugins/chat/spec/requests/chat/api/channels_moves_controller_spec.rb
index 767b55e8220..e110aa8bde6 100644
--- a/plugins/chat/spec/requests/api/chat_channels_moves_controller_spec.rb
+++ b/plugins/chat/spec/requests/chat/api/channels_moves_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require "rails_helper"
 
-RSpec.describe Chat::Api::ChatChannelsMessagesMovesController do
+RSpec.describe Chat::Api::ChannelsMessagesMovesController do
   fab!(:channel) { Fabricate(:category_channel) }
 
   70.times { |n| fab!("message_#{n}") { Fabricate(:chat_message, chat_channel: channel) } }
@@ -13,7 +13,7 @@ RSpec.describe Chat::Api::ChatChannelsMessagesMovesController do
   end
 
   def flag_message(message, flagger, flag_type: ReviewableScore.types[:off_topic])
-    Chat::ChatReviewQueue.new.flag_message(message, Guardian.new(flagger), flag_type)[:reviewable]
+    Chat::ReviewQueue.new.flag_message(message, Guardian.new(flagger), flag_type)[:reviewable]
   end
 
   describe "#create" do
diff --git a/plugins/chat/spec/requests/api/chat_channels_status_controller_spec.rb b/plugins/chat/spec/requests/chat/api/channels_status_controller_spec.rb
similarity index 97%
rename from plugins/chat/spec/requests/api/chat_channels_status_controller_spec.rb
rename to plugins/chat/spec/requests/chat/api/channels_status_controller_spec.rb
index c2e687da594..d05a3d48ce7 100644
--- a/plugins/chat/spec/requests/api/chat_channels_status_controller_spec.rb
+++ b/plugins/chat/spec/requests/chat/api/channels_status_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require "rails_helper"
 
-RSpec.describe Chat::Api::ChatChannelsStatusController do
+RSpec.describe Chat::Api::ChannelsStatusController do
   fab!(:channel_1) { Fabricate(:category_channel, status: :open) }
 
   before do
diff --git a/plugins/chat/spec/requests/chat/api/chatables_controller_spec.rb b/plugins/chat/spec/requests/chat/api/chatables_controller_spec.rb
new file mode 100644
index 00000000000..8892ef4b680
--- /dev/null
+++ b/plugins/chat/spec/requests/chat/api/chatables_controller_spec.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+RSpec.describe Chat::Api::ChatablesController do
+  before do
+    SiteSetting.chat_enabled = true
+    SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:everyone]
+  end
+
+  fab!(:current_user) { Fabricate(:user) }
+
+  describe "#index" do
+    describe "without chat permissions" do
+      it "errors errors for anon" do
+        get "/chat/api/chatables"
+        expect(response.status).to eq(403)
+      end
+
+      it "errors when user cannot chat" do
+        SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:staff]
+        sign_in(current_user)
+        get "/chat/api/chatables"
+        expect(response.status).to eq(403)
+      end
+    end
+
+    describe "with chat permissions" do
+      fab!(:channel_1) { Fabricate(:chat_channel) }
+
+      before { sign_in(current_user) }
+
+      it "returns results" do
+        get "/chat/api/chatables", params: { term: channel_1.name }
+
+        expect(response.status).to eq(200)
+        expect(response.parsed_body["category_channels"][0]["identifier"]).to eq(
+          "c-#{channel_1.id}",
+        )
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/requests/api/chat_current_user_channels_spec.rb b/plugins/chat/spec/requests/chat/api/current_user_channels_spec.rb
similarity index 98%
rename from plugins/chat/spec/requests/api/chat_current_user_channels_spec.rb
rename to plugins/chat/spec/requests/chat/api/current_user_channels_spec.rb
index c1b2327c2a1..60b514747c4 100644
--- a/plugins/chat/spec/requests/api/chat_current_user_channels_spec.rb
+++ b/plugins/chat/spec/requests/chat/api/current_user_channels_spec.rb
@@ -2,7 +2,7 @@
 
 require "rails_helper"
 
-describe Chat::Api::ChatCurrentUserChannelsController do
+describe Chat::Api::CurrentUserChannelsController do
   fab!(:current_user) { Fabricate(:user) }
 
   before do
diff --git a/plugins/chat/spec/requests/chat/api/direct_messages_controller_spec.rb b/plugins/chat/spec/requests/chat/api/direct_messages_controller_spec.rb
new file mode 100644
index 00000000000..b3458d47c23
--- /dev/null
+++ b/plugins/chat/spec/requests/chat/api/direct_messages_controller_spec.rb
@@ -0,0 +1,121 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::Api::DirectMessagesController do
+  fab!(:current_user) { Fabricate(:user) }
+  fab!(:user1) { Fabricate(:user) }
+  fab!(:user2) { Fabricate(:user) }
+  fab!(:user3) { Fabricate(:user) }
+
+  before do
+    SiteSetting.chat_enabled = true
+    SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:everyone]
+    sign_in(current_user)
+  end
+
+  def create_dm_channel(user_ids)
+    direct_messages_channel = Chat::DirectMessage.create!
+    user_ids.each do |user_id|
+      direct_messages_channel.direct_message_users.create!(user_id: user_id)
+    end
+    Chat::DirectMessageChannel.create!(chatable: direct_messages_channel)
+  end
+
+  describe "#create" do
+    before { Group.refresh_automatic_groups! }
+
+    shared_examples "creating dms" do
+      it "creates a new dm channel with username(s) provided" do
+        expect {
+          post "/chat/api/direct-message-channels.json", params: { target_usernames: [usernames] }
+        }.to change { Chat::DirectMessage.count }.by(1)
+        expect(Chat::DirectMessage.last.direct_message_users.map(&:user_id)).to match_array(
+          direct_message_user_ids,
+        )
+      end
+
+      it "returns existing dm channel if one exists for username(s)" do
+        create_dm_channel(direct_message_user_ids)
+        expect {
+          post "/chat/api/direct-message-channels.json", params: { target_usernames: [usernames] }
+        }.not_to change { Chat::DirectMessage.count }
+      end
+    end
+
+    describe "dm with one other user" do
+      let(:usernames) { user1.username }
+      let(:direct_message_user_ids) { [current_user.id, user1.id] }
+
+      include_examples "creating dms"
+    end
+
+    describe "dm with myself" do
+      let(:usernames) { [current_user.username] }
+      let(:direct_message_user_ids) { [current_user.id] }
+
+      include_examples "creating dms"
+    end
+
+    describe "dm with two other users" do
+      let(:usernames) { [user1, user2, user3].map(&:username) }
+      let(:direct_message_user_ids) { [current_user.id, user1.id, user2.id, user3.id] }
+
+      include_examples "creating dms"
+    end
+
+    it "creates Chat::UserChatChannelMembership records" do
+      users = [user2, user3]
+      usernames = users.map(&:username)
+      expect {
+        post "/chat/api/direct-message-channels.json", params: { target_usernames: usernames }
+      }.to change { Chat::UserChatChannelMembership.count }.by(3)
+    end
+
+    context "when one of the users I am messaging has ignored, muted, or prevented DMs from the acting user creating the channel" do
+      let(:usernames) { [user1, user2, user3].map(&:username) }
+      let(:direct_message_user_ids) { [current_user.id, user1.id, user2.id, user3.id] }
+
+      shared_examples "creating dms with communication error" do
+        it "responds with a friendly error" do
+          expect {
+            post "/chat/api/direct-message-channels.json", params: { target_usernames: [usernames] }
+          }.not_to change { Chat::DirectMessage.count }
+          expect(response.status).to eq(422)
+          expect(response.parsed_body["errors"]).to eq(
+            [I18n.t("chat.errors.not_accepting_dms", username: user1.username)],
+          )
+        end
+      end
+
+      describe "user ignoring the actor" do
+        before do
+          Fabricate(
+            :ignored_user,
+            user: user1,
+            ignored_user: current_user,
+            expiring_at: 1.day.from_now,
+          )
+        end
+
+        include_examples "creating dms with communication error"
+      end
+
+      describe "user muting the actor" do
+        before { Fabricate(:muted_user, user: user1, muted_user: current_user) }
+
+        include_examples "creating dms with communication error"
+      end
+
+      describe "user preventing all DMs" do
+        before { user1.user_option.update(allow_private_messages: false) }
+
+        include_examples "creating dms with communication error"
+      end
+
+      describe "user only allowing DMs from certain users" do
+        before { user1.user_option.update(enable_allowed_pm_users: true) }
+
+        include_examples "creating dms with communication error"
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/requests/api/hints_controller_spec.rb b/plugins/chat/spec/requests/chat/api/hints_controller_spec.rb
similarity index 100%
rename from plugins/chat/spec/requests/api/hints_controller_spec.rb
rename to plugins/chat/spec/requests/chat/api/hints_controller_spec.rb
diff --git a/plugins/chat/spec/requests/chat/api/messages_controller_spec.rb b/plugins/chat/spec/requests/chat/api/messages_controller_spec.rb
new file mode 100644
index 00000000000..3a0584d2099
--- /dev/null
+++ b/plugins/chat/spec/requests/chat/api/messages_controller_spec.rb
@@ -0,0 +1,200 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::Api::ChannelMessagesController do
+  fab!(:current_user) { Fabricate(:user) }
+  fab!(:admin) { Fabricate(:admin) }
+
+  before do
+    SiteSetting.chat_enabled = true
+    SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:everyone]
+  end
+
+  describe "#delete" do
+    RSpec.shared_examples "chat_message_deletion" do
+      it "doesn't allow a user to delete another user's message" do
+        sign_in(other_user)
+
+        delete "/chat/api/channels/#{message.chat_channel_id}/messages/#{message.id}.json"
+        expect(response.status).to eq(403)
+      end
+
+      it "doesn't allow a silenced user to delete their message" do
+        sign_in(other_user)
+        UserSilencer.new(other_user).silence
+
+        delete "/chat/api/channels/#{message.chat_channel_id}/messages/#{other_user_message.id}.json"
+        expect(response.status).to eq(403)
+      end
+
+      it "allows admin to delete others' messages" do
+        sign_in(admin)
+
+        expect {
+          delete "/chat/api/channels/#{message.chat_channel_id}/messages/#{message.id}.json"
+        }.to change { Chat::Message.count }.by(-1)
+        expect(response.status).to eq(200)
+      end
+
+      it "does not allow message delete when chat channel is read_only" do
+        sign_in(message.user)
+
+        chat_channel.update!(status: :read_only)
+        expect {
+          delete "/chat/api/channels/#{message.chat_channel_id}/messages/#{message.id}.json"
+        }.not_to change { Chat::Message.count }
+        expect(response.status).to eq(403)
+
+        sign_in(admin)
+        delete "/chat/api/channels/#{message.chat_channel_id}/messages/#{message.id}.json"
+        expect(response.status).to eq(403)
+      end
+
+      it "only allows admin to delete when chat channel is closed" do
+        sign_in(admin)
+
+        chat_channel.update!(status: :read_only)
+        expect {
+          delete "/chat/api/channels/#{message.chat_channel_id}/messages/#{message.id}.json"
+        }.not_to change { Chat::Message.count }
+        expect(response.status).to eq(403)
+
+        chat_channel.update!(status: :closed)
+        expect {
+          delete "/chat/api/channels/#{message.chat_channel_id}/messages/#{message.id}.json"
+        }.to change { Chat::Message.count }.by(-1)
+        expect(response.status).to eq(200)
+      end
+    end
+
+    describe "for category" do
+      fab!(:user_2) { Fabricate(:user) }
+      fab!(:chat_channel) { Fabricate(:chat_channel) }
+      fab!(:message) { Fabricate(:chat_message, chat_channel: chat_channel, user: current_user) }
+      fab!(:user_2_message) { Fabricate(:chat_message, chat_channel: chat_channel, user: user_2) }
+
+      it_behaves_like "chat_message_deletion" do
+        let(:other_user) { user_2 }
+        let(:other_user_message) { user_2_message }
+      end
+
+      it "allows users to delete their own messages" do
+        sign_in(current_user)
+        expect {
+          delete "/chat/api/channels/#{message.chat_channel_id}/messages/#{message.id}.json"
+        }.to change { Chat::Message.count }.by(-1)
+        expect(response.status).to eq(200)
+      end
+    end
+
+    describe "for dm channel" do
+      fab!(:user_2) { Fabricate(:user) }
+      fab!(:chat_channel) { Fabricate(:direct_message_channel, users: [current_user, user_2]) }
+      fab!(:message) { Fabricate(:chat_message, chat_channel: chat_channel, user: current_user) }
+      fab!(:user_2_message) { Fabricate(:chat_message, chat_channel: chat_channel, user: user_2) }
+
+      it_behaves_like "chat_message_deletion" do
+        let(:other_user) { user_2 }
+        let(:other_user_message) { user_2_message }
+      end
+
+      it "allows users to delete their own messages" do
+        sign_in(current_user)
+        expect {
+          delete "/chat/api/channels/#{message.chat_channel_id}/messages/#{message.id}.json"
+        }.to change { Chat::Message.count }.by(-1)
+        expect(response.status).to eq(200)
+      end
+    end
+  end
+
+  describe "#restore" do
+    RSpec.shared_examples "chat_message_restoration" do
+      it "doesn't allow a user to restore another user's message" do
+        another_user = Fabricate(:user)
+        message = Fabricate(:chat_message, chat_channel: chat_channel, user: another_user)
+        message.trash!(another_user)
+
+        sign_in(current_user)
+
+        put "/chat/api/channels/#{chat_channel.id}/messages/#{message.id}/restore.json"
+        expect(response.status).to eq(403)
+      end
+
+      it "allows a user to restore their own messages" do
+        message = Fabricate(:chat_message, chat_channel: chat_channel, user: current_user)
+        message.trash!(current_user)
+
+        sign_in(current_user)
+
+        put "/chat/api/channels/#{chat_channel.id}/messages/#{message.id}/restore.json"
+        expect(response.status).to eq(200)
+        expect(message.reload.deleted_at).to be_nil
+      end
+
+      it "allows admin to restore others' messages" do
+        message = Fabricate(:chat_message, chat_channel: chat_channel, user: current_user)
+        message.trash!(current_user)
+
+        sign_in(admin)
+
+        put "/chat/api/channels/#{chat_channel.id}/messages/#{message.id}/restore.json"
+        expect(response.status).to eq(200)
+        expect(message.reload.deleted_at).to be_nil
+      end
+
+      it "does not allow message restore when channel is read_only" do
+        message = Fabricate(:chat_message, chat_channel: chat_channel, user: current_user)
+        message.trash!(current_user)
+
+        sign_in(current_user)
+
+        chat_channel.update!(status: :read_only)
+
+        put "/chat/api/channels/#{chat_channel.id}/messages/#{message.id}/restore.json"
+        expect(response.status).to eq(403)
+        expect(message.reload.deleted_at).not_to be_nil
+
+        sign_in(admin)
+        put "/chat/api/channels/#{chat_channel.id}/messages/#{message.id}/restore.json"
+        expect(response.status).to eq(403)
+      end
+
+      it "only allows admin to restore when channel is closed" do
+        message = Fabricate(:chat_message, chat_channel: chat_channel, user: current_user)
+        message.trash!(current_user)
+
+        sign_in(admin)
+
+        chat_channel.update!(status: :read_only)
+
+        put "/chat/api/channels/#{chat_channel.id}/messages/#{message.id}/restore.json"
+        expect(response.status).to eq(403)
+        expect(message.reload.deleted_at).not_to be_nil
+
+        chat_channel.update!(status: :closed)
+        put "/chat/api/channels/#{chat_channel.id}/messages/#{message.id}/restore.json"
+        expect(response.status).to eq(200)
+        expect(message.reload.deleted_at).to be_nil
+      end
+    end
+
+    fab!(:admin) { Fabricate(:admin) }
+    fab!(:another_user) { Fabricate(:user) }
+
+    describe "for category" do
+      fab!(:category) { Fabricate(:category) }
+      fab!(:chat_channel) { Fabricate(:category_channel, chatable: category) }
+
+      it_behaves_like "chat_message_restoration"
+    end
+
+    describe "for dm channel" do
+      fab!(:user_2) { Fabricate(:user) }
+      fab!(:chat_channel) do
+        Fabricate(:direct_message_channel, users: [current_user, another_user])
+      end
+
+      it_behaves_like "chat_message_restoration"
+    end
+  end
+end
diff --git a/plugins/chat/spec/requests/chat/api/reads_controller_spec.rb b/plugins/chat/spec/requests/chat/api/reads_controller_spec.rb
new file mode 100644
index 00000000000..11a6a37f5cc
--- /dev/null
+++ b/plugins/chat/spec/requests/chat/api/reads_controller_spec.rb
@@ -0,0 +1,199 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::Api::ReadsController do
+  fab!(:current_user) { Fabricate(:user) }
+
+  before do
+    SiteSetting.chat_enabled = true
+    SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:everyone]
+    sign_in(current_user)
+  end
+
+  describe "#read" do
+    describe "marking a single message read" do
+      fab!(:chat_channel) { Fabricate(:chat_channel) }
+      fab!(:other_user) { Fabricate(:user) }
+      fab!(:message_1) { Fabricate(:chat_message, chat_channel: chat_channel, user: other_user) }
+      fab!(:message_2) { Fabricate(:chat_message, chat_channel: chat_channel, user: other_user) }
+
+      it "returns a 404 when the user is not a channel member" do
+        put "/chat/api/channels/#{chat_channel.id}/read/#{message_1.id}.json"
+        expect(response.status).to eq(404)
+      end
+
+      it "returns a 404 when the user is not following the channel" do
+        Fabricate(
+          :user_chat_channel_membership,
+          chat_channel: chat_channel,
+          user: current_user,
+          following: false,
+        )
+
+        put "/chat/api/channels/#{chat_channel.id}/read/#{message_1.id}.json"
+        expect(response.status).to eq(404)
+      end
+
+      describe "when the user is a channel member" do
+        fab!(:membership) do
+          Fabricate(:user_chat_channel_membership, chat_channel: chat_channel, user: current_user)
+        end
+
+        context "when message_id param doesn't link to a message of the channel" do
+          it "raises a not found" do
+            put "/chat/api/channels/#{chat_channel.id}/read/-999.json"
+            expect(response.status).to eq(404)
+          end
+        end
+
+        context "when message_id param is inferior to existing last read" do
+          before { membership.update!(last_read_message_id: message_2.id) }
+
+          it "raises an invalid request" do
+            put "/chat/api/channels/#{chat_channel.id}/read/#{message_1.id}.json"
+            expect(response.status).to eq(400)
+            expect(response.parsed_body["errors"][0]).to match(/message_id/)
+          end
+        end
+
+        context "when message_id refers to deleted message" do
+          before { message_1.trash!(Discourse.system_user) }
+
+          it "works" do
+            put "/chat/api/channels/#{chat_channel.id}/read/#{message_1.id}"
+            expect(response.status).to eq(200)
+          end
+        end
+
+        it "updates timing records" do
+          expect {
+            put "/chat/api/channels/#{chat_channel.id}/read/#{message_1.id}.json"
+          }.not_to change { Chat::UserChatChannelMembership.count }
+
+          membership.reload
+          expect(membership.chat_channel_id).to eq(chat_channel.id)
+          expect(membership.last_read_message_id).to eq(message_1.id)
+          expect(membership.user_id).to eq(current_user.id)
+        end
+
+        it "marks all mention notifications as read for the channel" do
+          notification = create_notification_and_mention_for(current_user, other_user, message_1)
+
+          put "/chat/api/channels/#{chat_channel.id}/read/#{message_2.id}.json"
+          expect(response.status).to eq(200)
+          expect(notification.reload.read).to eq(true)
+        end
+
+        it "doesn't mark notifications of messages that weren't read yet" do
+          message_3 = Fabricate(:chat_message, chat_channel: chat_channel, user: other_user)
+          notification = create_notification_and_mention_for(current_user, other_user, message_3)
+
+          put "/chat/api/channels/#{chat_channel.id}/read/#{message_2.id}.json"
+          expect(response.status).to eq(200)
+          expect(notification.reload.read).to eq(false)
+        end
+      end
+    end
+
+    describe "marking all messages read" do
+      fab!(:chat_channel_1) { Fabricate(:chat_channel) }
+      fab!(:chat_channel_2) { Fabricate(:chat_channel) }
+      fab!(:chat_channel_3) { Fabricate(:chat_channel) }
+
+      fab!(:other_user) { Fabricate(:user) }
+
+      fab!(:message_1) { Fabricate(:chat_message, chat_channel: chat_channel_1, user: other_user) }
+      fab!(:message_2) { Fabricate(:chat_message, chat_channel: chat_channel_1, user: other_user) }
+      fab!(:message_3) { Fabricate(:chat_message, chat_channel: chat_channel_2, user: other_user) }
+      fab!(:message_4) { Fabricate(:chat_message, chat_channel: chat_channel_2, user: other_user) }
+      fab!(:message_5) { Fabricate(:chat_message, chat_channel: chat_channel_3, user: other_user) }
+      fab!(:message_6) { Fabricate(:chat_message, chat_channel: chat_channel_3, user: other_user) }
+
+      fab!(:membership_1) do
+        Fabricate(
+          :user_chat_channel_membership,
+          chat_channel: chat_channel_1,
+          user: current_user,
+          following: true,
+        )
+      end
+      fab!(:membership_2) do
+        Fabricate(
+          :user_chat_channel_membership,
+          chat_channel: chat_channel_2,
+          user: current_user,
+          following: true,
+        )
+      end
+      fab!(:membership_3) do
+        Fabricate(
+          :user_chat_channel_membership,
+          chat_channel: chat_channel_3,
+          user: current_user,
+          following: true,
+        )
+      end
+
+      it "marks all messages as read across the user's channel memberships with the correct last_read_message_id" do
+        put "/chat/api/channels/read.json"
+
+        expect(membership_1.reload.last_read_message_id).to eq(message_2.id)
+        expect(membership_2.reload.last_read_message_id).to eq(message_4.id)
+        expect(membership_3.reload.last_read_message_id).to eq(message_6.id)
+      end
+
+      it "doesn't mark messages for channels the user is not following as read" do
+        membership_1.update!(following: false)
+
+        put "/chat/api/channels/read.json"
+
+        expect(membership_1.reload.last_read_message_id).to eq(nil)
+        expect(membership_2.reload.last_read_message_id).to eq(message_4.id)
+        expect(membership_3.reload.last_read_message_id).to eq(message_6.id)
+      end
+
+      it "returns the updated memberships, channels, and last message id" do
+        put "/chat/api/channels/read.json"
+        expect(response.parsed_body["updated_memberships"]).to match_array(
+          [
+            {
+              "channel_id" => chat_channel_1.id,
+              "last_read_message_id" => message_2.id,
+              "membership_id" => membership_1.id,
+            },
+            {
+              "channel_id" => chat_channel_2.id,
+              "last_read_message_id" => message_4.id,
+              "membership_id" => membership_2.id,
+            },
+            {
+              "channel_id" => chat_channel_3.id,
+              "last_read_message_id" => message_6.id,
+              "membership_id" => membership_3.id,
+            },
+          ],
+        )
+      end
+    end
+  end
+
+  def create_notification_and_mention_for(user, sender, msg)
+    Notification
+      .create!(
+        notification_type: Notification.types[:chat_mention],
+        user: user,
+        high_priority: true,
+        read: false,
+        data: {
+          message: "chat.mention_notification",
+          chat_message_id: msg.id,
+          chat_channel_id: msg.chat_channel_id,
+          chat_channel_title: msg.chat_channel.title(user),
+          chat_channel_slug: msg.chat_channel.slug,
+          mentioned_by_username: sender.username,
+        }.to_json,
+      )
+      .tap do |notification|
+        Chat::Mention.create!(user: user, chat_message: msg, notification: notification)
+      end
+  end
+end
diff --git a/plugins/chat/spec/requests/chat/api/summaries_controller_spec.rb b/plugins/chat/spec/requests/chat/api/summaries_controller_spec.rb
new file mode 100644
index 00000000000..19f9f7d1df7
--- /dev/null
+++ b/plugins/chat/spec/requests/chat/api/summaries_controller_spec.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::Api::SummariesController do
+  fab!(:current_user) { Fabricate(:user) }
+  fab!(:group) { Fabricate(:group) }
+  let(:plugin) { Plugin::Instance.new }
+
+  before do
+    group.add(current_user)
+
+    strategy = DummyCustomSummarization.new("dummy")
+    plugin.register_summarization_strategy(strategy)
+    SiteSetting.summarization_strategy = strategy.model
+    SiteSetting.custom_summarization_allowed_groups = group.id
+
+    SiteSetting.chat_enabled = true
+    SiteSetting.chat_allowed_groups = group.id
+    sign_in(current_user)
+  end
+
+  describe "#get_summary" do
+    context "when the user is not allowed to join the channel" do
+      fab!(:channel) { Fabricate(:private_category_channel) }
+
+      it "returns a 403" do
+        get "/chat/api/channels/#{channel.id}/summarize", params: { since: 6 }
+
+        expect(response.status).to eq(403)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/requests/chat/api/thread_reads_controller_spec.rb b/plugins/chat/spec/requests/chat/api/thread_reads_controller_spec.rb
new file mode 100644
index 00000000000..4f1c0808c33
--- /dev/null
+++ b/plugins/chat/spec/requests/chat/api/thread_reads_controller_spec.rb
@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::Api::ThreadReadsController do
+  fab!(:current_user) { Fabricate(:user) }
+
+  before do
+    SiteSetting.chat_enabled = true
+    SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:everyone]
+    sign_in(current_user)
+  end
+
+  describe "#update" do
+    describe "marking the thread messages as read" do
+      fab!(:channel) { Fabricate(:chat_channel) }
+      fab!(:other_user) { Fabricate(:user) }
+      fab!(:thread) { Fabricate(:chat_thread, channel: channel) }
+      fab!(:message_1) do
+        Fabricate(:chat_message, chat_channel: channel, user: other_user, thread: thread)
+      end
+      fab!(:message_2) do
+        Fabricate(:chat_message, chat_channel: channel, user: other_user, thread: thread)
+      end
+
+      context "when the user cannot access the channel" do
+        fab!(:channel) { Fabricate(:private_category_channel) }
+        fab!(:thread) { Fabricate(:chat_thread, channel: channel) }
+        it "raises invalid access" do
+          put "/chat/api/channels/#{channel.id}/threads/#{thread.id}/read.json"
+          expect(response.status).to eq(403)
+        end
+      end
+
+      context "when the channel_id and thread_id params do not match" do
+        it "raises a not found" do
+          put "/chat/api/channels/#{Fabricate(:chat_channel).id}/threads/#{thread.id}/read.json"
+          expect(response.status).to eq(404)
+        end
+      end
+
+      it "marks all mention notifications as read for the thread" do
+        notification_1 = create_notification_and_mention_for(current_user, other_user, message_1)
+        notification_2 = create_notification_and_mention_for(current_user, other_user, message_2)
+
+        put "/chat/api/channels/#{channel.id}/threads/#{thread.id}/read.json"
+        expect(response.status).to eq(200)
+        expect(notification_1.reload.read).to eq(true)
+        expect(notification_2.reload.read).to eq(true)
+      end
+    end
+  end
+
+  def create_notification_and_mention_for(user, sender, msg)
+    Notification
+      .create!(
+        notification_type: Notification.types[:chat_mention],
+        user: user,
+        high_priority: true,
+        read: false,
+        data: {
+          message: "chat.mention_notification",
+          chat_message_id: msg.id,
+          chat_channel_id: msg.chat_channel_id,
+          chat_channel_title: msg.chat_channel.title(user),
+          chat_channel_slug: msg.chat_channel.slug,
+          mentioned_by_username: sender.username,
+        }.to_json,
+      )
+      .tap do |notification|
+        Chat::Mention.create!(user: user, chat_message: msg, notification: notification)
+      end
+  end
+end
diff --git a/plugins/chat/spec/requests/incoming_chat_webhooks_controller_spec.rb b/plugins/chat/spec/requests/chat/incoming_webhooks_controller_spec.rb
similarity index 65%
rename from plugins/chat/spec/requests/incoming_chat_webhooks_controller_spec.rb
rename to plugins/chat/spec/requests/chat/incoming_webhooks_controller_spec.rb
index a8a54334718..553159cf4ed 100644
--- a/plugins/chat/spec/requests/incoming_chat_webhooks_controller_spec.rb
+++ b/plugins/chat/spec/requests/chat/incoming_webhooks_controller_spec.rb
@@ -2,13 +2,24 @@
 
 require "rails_helper"
 
-RSpec.describe Chat::IncomingChatWebhooksController do
+RSpec.describe Chat::IncomingWebhooksController do
   fab!(:chat_channel) { Fabricate(:category_channel) }
   fab!(:webhook) { Fabricate(:incoming_chat_webhook, chat_channel: chat_channel) }
 
   before { SiteSetting.chat_debug_webhook_payloads = true }
 
+  let(:valid_payload) { { text: "A new signup woo!" } }
+
   describe "#create_message" do
+    context "with chat disabled" do
+      before { SiteSetting.chat_enabled = false }
+
+      it "returns a 404" do
+        post "/chat/hooks/#{webhook.key}.json", params: valid_payload
+        expect(response.status).to eq(404)
+      end
+    end
+
     it "errors with invalid key" do
       post "/chat/hooks/null.json"
       expect(response.status).to eq(400)
@@ -28,12 +39,12 @@ RSpec.describe Chat::IncomingChatWebhooksController do
     end
 
     it "creates a new chat message" do
-      expect {
-        post "/chat/hooks/#{webhook.key}.json", params: { text: "A new signup woo!" }
-      }.to change { ChatMessage.where(chat_channel: chat_channel).count }.by(1)
+      expect { post "/chat/hooks/#{webhook.key}.json", params: valid_payload }.to change {
+        Chat::Message.where(chat_channel: chat_channel).count
+      }.by(1)
       expect(response.status).to eq(200)
-      chat_webhook_event = ChatWebhookEvent.last
-      expect(chat_webhook_event.chat_message_id).to eq(ChatMessage.last.id)
+      chat_webhook_event = Chat::WebhookEvent.last
+      expect(chat_webhook_event.chat_message_id).to eq(Chat::Message.last.id)
     end
 
     it "handles create message failures gracefully and does not create the chat message" do
@@ -41,7 +52,7 @@ RSpec.describe Chat::IncomingChatWebhooksController do
 
       expect {
         post "/chat/hooks/#{webhook.key}.json", params: { text: "hey #{watched_word.word}" }
-      }.not_to change { ChatMessage.where(chat_channel: chat_channel).count }
+      }.not_to change { Chat::Message.where(chat_channel: chat_channel).count }
       expect(response.status).to eq(422)
       expect(response.parsed_body["errors"]).to include(
         "Sorry, you can't post the word '#{watched_word.word}'; it's not allowed.",
@@ -52,31 +63,43 @@ RSpec.describe Chat::IncomingChatWebhooksController do
       chat_channel.update!(status: :read_only)
       expect {
         post "/chat/hooks/#{webhook.key}.json", params: { text: "hey this is a message" }
-      }.not_to change { ChatMessage.where(chat_channel: chat_channel).count }
+      }.not_to change { Chat::Message.where(chat_channel: chat_channel).count }
       expect(response.status).to eq(422)
       expect(response.parsed_body["errors"]).to include(
-        I18n.t("chat.errors.channel_new_message_disallowed", status: chat_channel.status_name),
+        I18n.t("chat.errors.channel_new_message_disallowed.read_only"),
       )
     end
 
-    it "rate limits" do
-      RateLimiter.enable
-      RateLimiter.clear_all!
-      10.times { post "/chat/hooks/#{webhook.key}.json", params: { text: "A new signup woo!" } }
-      expect(response.status).to eq(200)
+    describe "rate limiting" do
+      use_redis_snapshotting
 
-      post "/chat/hooks/#{webhook.key}.json", params: { text: "A new signup woo!" }
-      expect(response.status).to eq(429)
+      it "rate limits" do
+        RateLimiter.enable
+        10.times { post "/chat/hooks/#{webhook.key}.json", params: valid_payload }
+        expect(response.status).to eq(200)
+
+        post "/chat/hooks/#{webhook.key}.json", params: valid_payload
+        expect(response.status).to eq(429)
+      end
     end
   end
 
   describe "#create_message_slack_compatible" do
+    context "with chat disabled" do
+      before { SiteSetting.chat_enabled = false }
+
+      it "returns a 404" do
+        post "/chat/hooks/#{webhook.key}/slack.json", params: valid_payload
+        expect(response.status).to eq(404)
+      end
+    end
+
     it "processes the text param with SlackCompatibility" do
       expect {
         post "/chat/hooks/#{webhook.key}/slack.json", params: { text: "A new signup woo <!here>!" }
-      }.to change { ChatMessage.where(chat_channel: chat_channel).count }.by(1)
+      }.to change { Chat::Message.where(chat_channel: chat_channel).count }.by(1)
       expect(response.status).to eq(200)
-      expect(ChatMessage.last.message).to eq("A new signup woo @here!")
+      expect(Chat::Message.last.message).to eq("A new signup woo @here!")
     end
 
     it "processes the attachments param with SlackCompatibility, using the fallback" do
@@ -94,14 +117,14 @@ RSpec.describe Chat::IncomingChatWebhooksController do
         ],
       }
       expect { post "/chat/hooks/#{webhook.key}/slack.json", params: payload_data }.to change {
-        ChatMessage.where(chat_channel: chat_channel).count
+        Chat::Message.where(chat_channel: chat_channel).count
       }.by(1)
-      expect(ChatMessage.last.message).to eq(
-        "New alert: \"[StatusCake] https://www.test_notification.com (StatusCake Test Alert): Down,\" [46353](https://eu.opsg.in/a/i/test/blahguid)\nTags: ",
+      expect(Chat::Message.last.message).to eq(
+        "New alert: \"[StatusCake] https://www.test_notification.com (StatusCake Test Alert): Down,\" [46353](https://eu.opsg.in/a/i/test/blahguid)\nTags:",
       )
       expect {
         post "/chat/hooks/#{webhook.key}/slack.json", params: { payload: payload_data }
-      }.to change { ChatMessage.where(chat_channel: chat_channel).count }.by(1)
+      }.to change { Chat::Message.where(chat_channel: chat_channel).count }.by(1)
     end
 
     it "can process the payload when it's a JSON string" do
@@ -120,9 +143,9 @@ RSpec.describe Chat::IncomingChatWebhooksController do
       }
       expect {
         post "/chat/hooks/#{webhook.key}/slack.json", params: { payload: payload_data.to_json }
-      }.to change { ChatMessage.where(chat_channel: chat_channel).count }.by(1)
-      expect(ChatMessage.last.message).to eq(
-        "New alert: \"[StatusCake] https://www.test_notification.com (StatusCake Test Alert): Down,\" [46353](https://eu.opsg.in/a/i/test/blahguid)\nTags: ",
+      }.to change { Chat::Message.where(chat_channel: chat_channel).count }.by(1)
+      expect(Chat::Message.last.message).to eq(
+        "New alert: \"[StatusCake] https://www.test_notification.com (StatusCake Test Alert): Down,\" [46353](https://eu.opsg.in/a/i/test/blahguid)\nTags:",
       )
     end
   end
diff --git a/plugins/chat/spec/requests/chat_controller_spec.rb b/plugins/chat/spec/requests/chat_controller_spec.rb
index c2eac575378..2d2233499f2 100644
--- a/plugins/chat/spec/requests/chat_controller_spec.rb
+++ b/plugins/chat/spec/requests/chat_controller_spec.rb
@@ -29,216 +29,7 @@ RSpec.describe Chat::ChatController do
   end
 
   def flag_message(message, flagger, flag_type: ReviewableScore.types[:off_topic])
-    Chat::ChatReviewQueue.new.flag_message(message, Guardian.new(flagger), flag_type)[:reviewable]
-  end
-
-  describe "#messages" do
-    let(:page_size) { 30 }
-
-    before do
-      sign_in(user)
-      Group.refresh_automatic_groups!
-    end
-
-    it "errors for user when they are not allowed to chat" do
-      SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:staff]
-      get "/chat/#{chat_channel.id}/messages.json", params: { page_size: page_size }
-      expect(response.status).to eq(403)
-    end
-
-    it "errors when page size is over 50" do
-      get "/chat/#{chat_channel.id}/messages.json", params: { page_size: 51 }
-      expect(response.status).to eq(400)
-    end
-
-    it "errors when page size is nil" do
-      get "/chat/#{chat_channel.id}/messages.json"
-      expect(response.status).to eq(400)
-    end
-
-    it "returns the latest messages in created_at, id order" do
-      get "/chat/#{chat_channel.id}/messages.json", params: { page_size: page_size }
-      messages = response.parsed_body["chat_messages"]
-      expect(messages.count).to eq(page_size)
-      expect(messages.first["created_at"].to_time).to be < messages.last["created_at"].to_time
-    end
-
-    it "returns `can_flag=true` for public channels" do
-      get "/chat/#{chat_channel.id}/messages.json", params: { page_size: page_size }
-      expect(response.parsed_body["meta"]["can_flag"]).to be true
-    end
-
-    it "returns `can_flag=true` for DM channels" do
-      get "/chat/#{dm_chat_channel.id}/messages.json", params: { page_size: page_size }
-      expect(response.parsed_body["meta"]["can_flag"]).to be true
-    end
-
-    it "returns `can_moderate=true` based on whether the user can moderate the chatable" do
-      1.upto(4) do |n|
-        user.update!(trust_level: n)
-        get "/chat/#{chat_channel.id}/messages.json", params: { page_size: page_size }
-        expect(response.parsed_body["meta"]["can_moderate"]).to be false
-      end
-
-      get "/chat/#{chat_channel.id}/messages.json", params: { page_size: page_size }
-      expect(response.parsed_body["meta"]["can_moderate"]).to be false
-
-      user.update!(admin: true)
-      get "/chat/#{chat_channel.id}/messages.json", params: { page_size: page_size }
-      expect(response.parsed_body["meta"]["can_moderate"]).to be true
-      user.update!(admin: false)
-
-      SiteSetting.enable_category_group_moderation = true
-      group = Fabricate(:group)
-      group.add(user)
-      category.update!(reviewable_by_group: group)
-      get "/chat/#{chat_channel.id}/messages.json", params: { page_size: page_size }
-      expect(response.parsed_body["meta"]["can_moderate"]).to be true
-    end
-
-    it "serializes `user_flag_status` for user who has a pending flag" do
-      chat_message = chat_channel.chat_messages.last
-      reviewable = flag_message(chat_message, user)
-      score = reviewable.reviewable_scores.last
-
-      get "/chat/#{chat_channel.id}/messages.json", params: { page_size: page_size }
-      expect(response.parsed_body["chat_messages"].last["user_flag_status"]).to eq(
-        score.status_for_database,
-      )
-    end
-
-    it "doesn't serialize `reviewable_ids` for non-staff" do
-      reviewable = flag_message(chat_channel.chat_messages.last, admin)
-
-      get "/chat/#{chat_channel.id}/messages.json", params: { page_size: page_size }
-
-      expect(response.parsed_body["chat_messages"].last["reviewable_id"]).to be_nil
-    end
-
-    it "serializes `reviewable_ids` correctly for staff" do
-      sign_in(admin)
-      reviewable = flag_message(chat_channel.chat_messages.last, admin)
-
-      get "/chat/#{chat_channel.id}/messages.json", params: { page_size: page_size }
-      expect(response.parsed_body["chat_messages"].last["reviewable_id"]).to eq(reviewable.id)
-    end
-
-    it "correctly marks reactions as 'reacted' for the current_user" do
-      heart_emoji = ":heart:"
-      smile_emoji = ":smile"
-
-      last_message = chat_channel.chat_messages.last
-      last_message.reactions.create(user: user, emoji: heart_emoji)
-      last_message.reactions.create(user: admin, emoji: smile_emoji)
-
-      get "/chat/#{chat_channel.id}/messages.json", params: { page_size: page_size }
-      reactions = response.parsed_body["chat_messages"].last["reactions"]
-      expect(reactions[heart_emoji]["reacted"]).to be true
-      expect(reactions[smile_emoji]["reacted"]).to be false
-    end
-
-    it "sends the last message bus id for the channel" do
-      get "/chat/#{chat_channel.id}/messages.json", params: { page_size: page_size }
-      expect(response.parsed_body["meta"]["channel_message_bus_last_id"]).not_to eq(nil)
-    end
-
-    describe "scrolling to the past" do
-      it "returns the correct messages in created_at, id order" do
-        get "/chat/#{chat_channel.id}/messages.json",
-            params: {
-              message_id: message_40.id,
-              direction: described_class::PAST,
-              page_size: page_size,
-            }
-        messages = response.parsed_body["chat_messages"]
-        expect(messages.count).to eq(page_size)
-        expect(messages.first["created_at"].to_time).to eq_time(message_10.created_at)
-        expect(messages.last["created_at"].to_time).to eq_time(message_39.created_at)
-      end
-
-      it "returns 'can_load...' properly when there are more past messages" do
-        get "/chat/#{chat_channel.id}/messages.json",
-            params: {
-              message_id: message_40.id,
-              direction: described_class::PAST,
-              page_size: page_size,
-            }
-        expect(response.parsed_body["meta"]["can_load_more_past"]).to be true
-        expect(response.parsed_body["meta"]["can_load_more_future"]).to be_nil
-      end
-
-      it "returns 'can_load...' properly when there are no past messages" do
-        get "/chat/#{chat_channel.id}/messages.json",
-            params: {
-              message_id: message_3.id,
-              direction: described_class::PAST,
-              page_size: page_size,
-            }
-        expect(response.parsed_body["meta"]["can_load_more_past"]).to be false
-        expect(response.parsed_body["meta"]["can_load_more_future"]).to be_nil
-      end
-    end
-
-    describe "scrolling to the future" do
-      it "returns the correct messages in created_at, id order when there are many after" do
-        get "/chat/#{chat_channel.id}/messages.json",
-            params: {
-              message_id: message_10.id,
-              direction: described_class::FUTURE,
-              page_size: page_size,
-            }
-        messages = response.parsed_body["chat_messages"]
-        expect(messages.count).to eq(page_size)
-        expect(messages.first["created_at"].to_time).to eq_time(message_11.created_at)
-        expect(messages.last["created_at"].to_time).to eq_time(message_40.created_at)
-      end
-
-      it "return 'can_load..' properly when there are future messages" do
-        get "/chat/#{chat_channel.id}/messages.json",
-            params: {
-              message_id: message_10.id,
-              direction: described_class::FUTURE,
-              page_size: page_size,
-            }
-        expect(response.parsed_body["meta"]["can_load_more_past"]).to be_nil
-        expect(response.parsed_body["meta"]["can_load_more_future"]).to be true
-      end
-
-      it "returns 'can_load..' properly when there are no future messages" do
-        get "/chat/#{chat_channel.id}/messages.json",
-            params: {
-              message_id: message_60.id,
-              direction: described_class::FUTURE,
-              page_size: page_size,
-            }
-        expect(response.parsed_body["meta"]["can_load_more_past"]).to be_nil
-        expect(response.parsed_body["meta"]["can_load_more_future"]).to be false
-      end
-    end
-
-    describe "without direction (latest messages)" do
-      it "signals there are no future messages" do
-        get "/chat/#{chat_channel.id}/messages.json", params: { page_size: page_size }
-
-        expect(response.parsed_body["meta"]["can_load_more_future"]).to eq(false)
-      end
-
-      it "signals there are more messages in the past" do
-        get "/chat/#{chat_channel.id}/messages.json", params: { page_size: page_size }
-
-        expect(response.parsed_body["meta"]["can_load_more_past"]).to eq(true)
-      end
-
-      it "signals there are no more messages" do
-        new_channel = Fabricate(:category_channel)
-        Fabricate(:chat_message, chat_channel: new_channel, user: other_user, message: "message")
-        chat_messages_qty = 1
-
-        get "/chat/#{new_channel.id}/messages.json", params: { page_size: chat_messages_qty + 1 }
-
-        expect(response.parsed_body["meta"]["can_load_more_past"]).to eq(false)
-      end
-    end
+    Chat::ReviewQueue.new.flag_message(message, Guardian.new(flagger), flag_type)[:reviewable]
   end
 
   describe "#enable_chat" do
@@ -250,7 +41,7 @@ RSpec.describe Chat::ChatController do
         Guardian.any_instance.expects(:can_join_chat_channel?).with(channel)
 
         sign_in(admin)
-        post "/chat/enable.json", params: { chatable_type: "category", chatable_id: category.id }
+        post "/chat/enable.json", params: { chatable_type: "Category", chatable_id: category.id }
       end
 
       # TODO: rewrite specs to ensure no exception is raised
@@ -258,7 +49,7 @@ RSpec.describe Chat::ChatController do
         Guardian.any_instance.expects(:can_join_chat_channel?)
 
         sign_in(admin)
-        post "/chat/enable.json", params: { chatable_type: "category", chatable_id: category.id }
+        post "/chat/enable.json", params: { chatable_type: "Category", chatable_id: category.id }
       end
     end
   end
@@ -273,7 +64,7 @@ RSpec.describe Chat::ChatController do
         Guardian.any_instance.expects(:can_join_chat_channel?).with(channel)
 
         sign_in(admin)
-        post "/chat/disable.json", params: { chatable_type: "category", chatable_id: category.id }
+        post "/chat/disable.json", params: { chatable_type: "Category", chatable_id: category.id }
       end
     end
   end
@@ -286,7 +77,11 @@ RSpec.describe Chat::ChatController do
 
       context "when current user is silenced" do
         before do
-          UserChatChannelMembership.create(user: user, chat_channel: chat_channel, following: true)
+          Chat::UserChatChannelMembership.create(
+            user: user,
+            chat_channel: chat_channel,
+            following: true,
+          )
           sign_in(user)
           UserSilencer.new(user).silence
         end
@@ -320,7 +115,7 @@ RSpec.describe Chat::ChatController do
         post "/chat/#{chat_channel.id}.json", params: { message: message }
         expect(response.status).to eq(422)
         expect(response.parsed_body["errors"]).to include(
-          I18n.t("chat.errors.channel_new_message_disallowed", status: chat_channel.status_name),
+          I18n.t("chat.errors.channel_new_message_disallowed.closed"),
         )
       end
 
@@ -336,19 +131,102 @@ RSpec.describe Chat::ChatController do
         post "/chat/#{chat_channel.id}.json", params: { message: message }
         expect(response.status).to eq(422)
         expect(response.parsed_body["errors"]).to include(
-          I18n.t("chat.errors.channel_new_message_disallowed", status: chat_channel.status_name),
+          I18n.t("chat.errors.channel_new_message_disallowed.read_only"),
         )
       end
 
-      it "sends a message for regular user when staff-only is disabled and they are following channel" do
-        sign_in(user)
-        UserChatChannelMembership.create(user: user, chat_channel: chat_channel, following: true)
+      context "when the regular user is following the channel" do
+        fab!(:message_1) { Fabricate(:chat_message, chat_channel: chat_channel) }
+        fab!(:membership) do
+          Chat::UserChatChannelMembership.create(
+            user: user,
+            chat_channel: chat_channel,
+            following: true,
+            last_read_message_id: message_1.id,
+          )
+        end
 
-        expect { post "/chat/#{chat_channel.id}.json", params: { message: message } }.to change {
-          ChatMessage.count
-        }.by(1)
-        expect(response.status).to eq(200)
-        expect(ChatMessage.last.message).to eq(message)
+        it "sends a message for regular user when staff-only is disabled and they are following channel" do
+          sign_in(user)
+
+          expect { post "/chat/#{chat_channel.id}.json", params: { message: message } }.to change {
+            Chat::Message.count
+          }.by(1)
+          expect(response.status).to eq(200)
+          expect(Chat::Message.last.message).to eq(message)
+        end
+
+        it "updates the last_read_message_id for the user who sent the message" do
+          sign_in(user)
+          post "/chat/#{chat_channel.id}.json", params: { message: message }
+          expect(response.status).to eq(200)
+          expect(membership.reload.last_read_message_id).to eq(Chat::Message.last.id)
+        end
+
+        it "publishes user tracking state using the new chat message as the last_read_message_id" do
+          sign_in(user)
+          messages =
+            MessageBus.track_publish(
+              Chat::Publisher.user_tracking_state_message_bus_channel(user.id),
+            ) { post "/chat/#{chat_channel.id}.json", params: { message: message } }
+          expect(response.status).to eq(200)
+          expect(messages.first.data["last_read_message_id"]).to eq(Chat::Message.last.id)
+        end
+
+        context "when sending a message in a staged thread" do
+          it "creates the thread and publishes with the staged id" do
+            sign_in(user)
+            chat_channel.update!(threading_enabled: true)
+
+            messages =
+              MessageBus.track_publish do
+                post "/chat/#{chat_channel.id}.json",
+                     params: {
+                       message: message,
+                       in_reply_to_id: message_1.id,
+                       staged_thread_id: "stagedthreadid",
+                     }
+              end
+
+            expect(response.status).to eq(200)
+
+            thread_event = messages.find { |m| m.data["type"] == "thread_created" }
+            expect(thread_event.data["staged_thread_id"]).to eq("stagedthreadid")
+            expect(Chat::Thread.find(thread_event.data["thread_id"])).to be_persisted
+
+            sent_event = messages.find { |m| m.data["type"] == "sent" }
+            expect(sent_event.data["staged_thread_id"]).to eq("stagedthreadid")
+          end
+        end
+
+        context "when sending a message in a thread" do
+          fab!(:thread) do
+            Fabricate(:chat_thread, channel: chat_channel, original_message: message_1)
+          end
+
+          it "does not update the last_read_message_id for the user who sent the message" do
+            sign_in(user)
+            post "/chat/#{chat_channel.id}.json", params: { message: message, thread_id: thread.id }
+            expect(response.status).to eq(200)
+            expect(membership.reload.last_read_message_id).to eq(message_1.id)
+          end
+
+          it "publishes user tracking state using the old membership last_read_message_id" do
+            sign_in(user)
+            messages =
+              MessageBus.track_publish(
+                Chat::Publisher.user_tracking_state_message_bus_channel(user.id),
+              ) do
+                post "/chat/#{chat_channel.id}.json",
+                     params: {
+                       message: message,
+                       thread_id: thread.id,
+                     }
+              end
+            expect(response.status).to eq(200)
+            expect(messages.first.data["last_read_message_id"]).to eq(message_1.id)
+          end
+        end
       end
     end
 
@@ -361,22 +239,30 @@ RSpec.describe Chat::ChatController do
       it "forces users to follow the channel" do
         direct_message_channel.remove(user2)
 
-        ChatPublisher.expects(:publish_new_channel).once
+        Chat::Publisher.expects(:publish_new_channel).once
 
         sign_in(user1)
 
         post "/chat/#{direct_message_channel.id}.json", params: { message: message }
 
-        expect(UserChatChannelMembership.find_by(user_id: user2.id).following).to be true
+        expect(Chat::UserChatChannelMembership.find_by(user_id: user2.id).following).to be true
+      end
+
+      it "doesn’t call publish new channel when already following" do
+        Chat::Publisher.expects(:publish_new_channel).never
+
+        sign_in(user1)
+
+        post "/chat/#{direct_message_channel.id}.json", params: { message: message }
       end
 
       it "errors when the user is not part of the direct message channel" do
-        DirectMessageUser.find_by(user: user1, direct_message: chatable).destroy!
+        Chat::DirectMessageUser.find_by(user: user1, direct_message: chatable).destroy!
         sign_in(user1)
         post "/chat/#{direct_message_channel.id}.json", params: { message: message }
         expect(response.status).to eq(403)
 
-        UserChatChannelMembership.find_by(user_id: user2.id).update!(following: true)
+        Chat::UserChatChannelMembership.find_by(user_id: user2.id).update!(following: true)
         sign_in(user2)
         post "/chat/#{direct_message_channel.id}.json", params: { message: message }
         expect(response.status).to eq(200)
@@ -402,12 +288,12 @@ RSpec.describe Chat::ChatController do
         it "does not force them to follow the channel or send a publish_new_channel message" do
           direct_message_channel.remove(user2)
 
-          ChatPublisher.expects(:publish_new_channel).never
+          Chat::Publisher.expects(:publish_new_channel).never
 
           sign_in(user1)
           post "/chat/#{direct_message_channel.id}.json", params: { message: message }
 
-          expect(UserChatChannelMembership.find_by(user_id: user2.id).following).to be false
+          expect(Chat::UserChatChannelMembership.find_by(user_id: user2.id).following).to be false
         end
       end
     end
@@ -421,7 +307,7 @@ RSpec.describe Chat::ChatController do
         sign_in(Fabricate(:admin))
 
         expect_enqueued_with(
-          job: :process_chat_message,
+          job: Jobs::Chat::ProcessMessage,
           args: {
             chat_message_id: chat_message.id,
           },
@@ -455,7 +341,7 @@ RSpec.describe Chat::ChatController do
           chat_message.update!(message: "new content")
 
           expect_enqueued_with(
-            job: :process_chat_message,
+            job: Jobs::Chat::ProcessMessage,
             args: {
               chat_message_id: chat_message.id,
               is_dirty: true,
@@ -548,277 +434,6 @@ RSpec.describe Chat::ChatController do
     end
   end
 
-  RSpec.shared_examples "chat_message_deletion" do
-    it "doesn't allow a user to delete another user's message" do
-      sign_in(other_user)
-
-      delete "/chat/#{chat_channel.id}/#{ChatMessage.last.id}.json"
-      expect(response.status).to eq(403)
-    end
-
-    it "doesn't allow a silenced user to delete their message" do
-      sign_in(other_user)
-      UserSilencer.new(other_user).silence
-
-      delete "/chat/#{other_user_message.chat_channel.id}/#{other_user_message.id}.json"
-      expect(response.status).to eq(403)
-    end
-
-    it "Allows admin to delete others' messages" do
-      sign_in(admin)
-
-      expect { delete "/chat/#{chat_channel.id}/#{ChatMessage.last.id}.json" }.to change {
-        ChatMessage.count
-      }.by(-1)
-      expect(response.status).to eq(200)
-    end
-
-    it "does not allow message delete when chat channel is read_only" do
-      sign_in(ChatMessage.last.user)
-
-      chat_channel.update!(status: :read_only)
-      expect { delete "/chat/#{chat_channel.id}/#{ChatMessage.last.id}.json" }.not_to change {
-        ChatMessage.count
-      }
-      expect(response.status).to eq(403)
-
-      sign_in(admin)
-      delete "/chat/#{chat_channel.id}/#{ChatMessage.last.id}.json"
-      expect(response.status).to eq(403)
-    end
-
-    it "only allows admin to delete when chat channel is closed" do
-      sign_in(admin)
-
-      chat_channel.update!(status: :read_only)
-      expect { delete "/chat/#{chat_channel.id}/#{ChatMessage.last.id}.json" }.not_to change {
-        ChatMessage.count
-      }
-      expect(response.status).to eq(403)
-
-      chat_channel.update!(status: :closed)
-      expect { delete "/chat/#{chat_channel.id}/#{ChatMessage.last.id}.json" }.to change {
-        ChatMessage.count
-      }.by(-1)
-      expect(response.status).to eq(200)
-    end
-  end
-
-  describe "#delete" do
-    fab!(:second_user) { Fabricate(:user) }
-    fab!(:second_user_message) do
-      Fabricate(:chat_message, user: second_user, chat_channel: chat_channel)
-    end
-
-    before do
-      ChatMessage.create(user: user, message: "this is a message", chat_channel: chat_channel)
-    end
-
-    describe "for category" do
-      fab!(:chat_channel) { Fabricate(:category_channel, chatable: category) }
-
-      it_behaves_like "chat_message_deletion" do
-        let(:other_user) { second_user }
-        let(:other_user_message) { second_user_message }
-      end
-
-      it "Allows users to delete their own messages" do
-        sign_in(user)
-        expect { delete "/chat/#{chat_channel.id}/#{ChatMessage.last.id}.json" }.to change {
-          ChatMessage.count
-        }.by(-1)
-        expect(response.status).to eq(200)
-      end
-    end
-  end
-
-  RSpec.shared_examples "chat_message_restoration" do
-    it "doesn't allow a user to restore another user's message" do
-      sign_in(other_user)
-
-      put "/chat/#{chat_channel.id}/restore/#{ChatMessage.unscoped.last.id}.json"
-      expect(response.status).to eq(403)
-    end
-
-    it "allows a user to restore their own posts" do
-      sign_in(user)
-
-      deleted_message = ChatMessage.unscoped.last
-      put "/chat/#{chat_channel.id}/restore/#{deleted_message.id}.json"
-      expect(response.status).to eq(200)
-      expect(deleted_message.reload.deleted_at).to be_nil
-    end
-
-    it "allows admin to restore others' posts" do
-      sign_in(admin)
-
-      deleted_message = ChatMessage.unscoped.last
-      put "/chat/#{chat_channel.id}/restore/#{deleted_message.id}.json"
-      expect(response.status).to eq(200)
-      expect(deleted_message.reload.deleted_at).to be_nil
-    end
-
-    it "does not allow message restore when chat channel is read_only" do
-      sign_in(ChatMessage.last.user)
-
-      chat_channel.update!(status: :read_only)
-
-      deleted_message = ChatMessage.unscoped.last
-      put "/chat/#{chat_channel.id}/restore/#{deleted_message.id}.json"
-      expect(response.status).to eq(403)
-      expect(deleted_message.reload.deleted_at).not_to be_nil
-
-      sign_in(admin)
-      put "/chat/#{chat_channel.id}/restore/#{deleted_message.id}.json"
-      expect(response.status).to eq(403)
-    end
-
-    it "only allows admin to restore when chat channel is closed" do
-      sign_in(admin)
-
-      chat_channel.update!(status: :read_only)
-
-      deleted_message = ChatMessage.unscoped.last
-      put "/chat/#{chat_channel.id}/restore/#{deleted_message.id}.json"
-      expect(response.status).to eq(403)
-      expect(deleted_message.reload.deleted_at).not_to be_nil
-
-      chat_channel.update!(status: :closed)
-      put "/chat/#{chat_channel.id}/restore/#{deleted_message.id}.json"
-      expect(response.status).to eq(200)
-      expect(deleted_message.reload.deleted_at).to be_nil
-    end
-  end
-
-  describe "#restore" do
-    fab!(:second_user) { Fabricate(:user) }
-
-    before do
-      message =
-        ChatMessage.create(user: user, message: "this is a message", chat_channel: chat_channel)
-      message.trash!
-    end
-
-    describe "for category" do
-      fab!(:chat_channel) { Fabricate(:category_channel, chatable: category) }
-
-      it_behaves_like "chat_message_restoration" do
-        let(:other_user) { second_user }
-      end
-    end
-  end
-
-  describe "#update_user_last_read" do
-    before { sign_in(user) }
-
-    fab!(:message_1) { Fabricate(:chat_message, chat_channel: chat_channel, user: other_user) }
-    fab!(:message_2) { Fabricate(:chat_message, chat_channel: chat_channel, user: other_user) }
-
-    it "returns a 404 when the user is not a channel member" do
-      put "/chat/#{chat_channel.id}/read/#{message_1.id}.json"
-
-      expect(response.status).to eq(404)
-    end
-
-    it "returns a 404 when the user is not following the channel" do
-      Fabricate(
-        :user_chat_channel_membership,
-        chat_channel: chat_channel,
-        user: user,
-        following: false,
-      )
-
-      put "/chat/#{chat_channel.id}/read/#{message_1.id}.json"
-
-      expect(response.status).to eq(404)
-    end
-
-    describe "when the user is a channel member" do
-      fab!(:membership) do
-        Fabricate(:user_chat_channel_membership, chat_channel: chat_channel, user: user)
-      end
-
-      context "when message_id param doesn't link to a message of the channel" do
-        it "raises a not found" do
-          put "/chat/#{chat_channel.id}/read/-999.json"
-
-          expect(response.status).to eq(404)
-        end
-      end
-
-      context "when message_id param is inferior to existing last read" do
-        before { membership.update!(last_read_message_id: message_2.id) }
-
-        it "raises an invalid request" do
-          put "/chat/#{chat_channel.id}/read/#{message_1.id}.json"
-
-          expect(response.status).to eq(400)
-          expect(response.parsed_body["errors"][0]).to match(/message_id/)
-        end
-      end
-
-      context "when message_id refers to deleted message" do
-        before { message_1.trash!(Discourse.system_user) }
-
-        it "works" do
-          put "/chat/#{chat_channel.id}/read/#{message_1.id}.json"
-
-          expect(response.status).to eq(200)
-        end
-      end
-
-      it "updates timing records" do
-        expect { put "/chat/#{chat_channel.id}/read/#{message_1.id}.json" }.not_to change {
-          UserChatChannelMembership.count
-        }
-
-        membership.reload
-        expect(membership.chat_channel_id).to eq(chat_channel.id)
-        expect(membership.last_read_message_id).to eq(message_1.id)
-        expect(membership.user_id).to eq(user.id)
-      end
-
-      def create_notification_and_mention_for(user, sender, msg)
-        Notification
-          .create!(
-            notification_type: Notification.types[:chat_mention],
-            user: user,
-            high_priority: true,
-            read: false,
-            data: {
-              message: "chat.mention_notification",
-              chat_message_id: msg.id,
-              chat_channel_id: msg.chat_channel_id,
-              chat_channel_title: msg.chat_channel.title(user),
-              chat_channel_slug: msg.chat_channel.slug,
-              mentioned_by_username: sender.username,
-            }.to_json,
-          )
-          .tap do |notification|
-            ChatMention.create!(user: user, chat_message: msg, notification: notification)
-          end
-      end
-
-      it "marks all mention notifications as read for the channel" do
-        notification = create_notification_and_mention_for(user, other_user, message_1)
-
-        put "/chat/#{chat_channel.id}/read/#{message_2.id}.json"
-        expect(response.status).to eq(200)
-        expect(notification.reload.read).to eq(true)
-      end
-
-      it "doesn't mark notifications of messages that weren't read yet" do
-        message_3 = Fabricate(:chat_message, chat_channel: chat_channel, user: other_user)
-        notification = create_notification_and_mention_for(user, other_user, message_3)
-
-        put "/chat/#{chat_channel.id}/read/#{message_2.id}.json"
-
-        expect(response.status).to eq(200)
-        expect(notification.reload.read).to eq(false)
-      end
-    end
-  end
-
   describe "react" do
     fab!(:chat_channel) { Fabricate(:category_channel) }
     fab!(:chat_message) { Fabricate(:chat_message, chat_channel: chat_channel, user: user) }
@@ -870,7 +485,7 @@ RSpec.describe Chat::ChatController do
               emoji: ":heart:",
               react_action: "add",
             }
-      }.to change { UserChatChannelMembership.count }.by(1)
+      }.to change { Chat::UserChatChannelMembership.count }.by(1)
       expect(response.status).to eq(200)
     end
 
@@ -897,7 +512,7 @@ RSpec.describe Chat::ChatController do
       }.not_to change { chat_message.reactions.where(user: user, emoji: emoji).count }
       expect(response.status).to eq(403)
       expect(response.parsed_body["errors"]).to include(
-        I18n.t("chat.errors.channel_modify_message_disallowed", status: chat_channel.status_name),
+        I18n.t("chat.errors.channel_modify_message_disallowed.#{chat_channel.status}"),
       )
     end
 
@@ -997,7 +612,8 @@ RSpec.describe Chat::ChatController do
     end
 
     it "doesn't invite users who cannot chat" do
-      SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:admin]
+      SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:admins]
+
       expect {
         put "/chat/#{chat_channel.id}/invite.json", params: { user_ids: [user.id] }
       }.not_to change {
@@ -1179,7 +795,7 @@ RSpec.describe Chat::ChatController do
               chat_message_id: admin_chat_message.id,
               flag_type_id: ReviewableScore.types[:off_topic],
             }
-      }.to change { ReviewableChatMessage.where(target: admin_chat_message).count }.by(1)
+      }.to change { Chat::ReviewableMessage.where(target: admin_chat_message).count }.by(1)
       expect(response.status).to eq(200)
     end
 
@@ -1255,10 +871,10 @@ RSpec.describe Chat::ChatController do
     it "can create and destroy chat drafts" do
       expect {
         post "/chat/drafts.json", params: { chat_channel_id: chat_channel.id, data: "{}" }
-      }.to change { ChatDraft.count }.by(1)
+      }.to change { Chat::Draft.count }.by(1)
 
       expect { post "/chat/drafts.json", params: { chat_channel_id: chat_channel.id } }.to change {
-        ChatDraft.count
+        Chat::Draft.count
       }.by(-1)
     end
 
@@ -1273,17 +889,17 @@ RSpec.describe Chat::ChatController do
       GroupUser.create!(user: user, group: group)
       expect {
         post "/chat/drafts.json", params: { chat_channel_id: chat_channel.id, data: "{}" }
-      }.to change { ChatDraft.count }.by(1)
+      }.to change { Chat::Draft.count }.by(1)
     end
 
     it "cannot create chat drafts for a direct message channel the user cannot access" do
       post "/chat/drafts.json", params: { chat_channel_id: dm_channel.id, data: "{}" }
       expect(response.status).to eq(403)
 
-      DirectMessageUser.create(user: user, direct_message: dm_channel.chatable)
+      Chat::DirectMessageUser.create(user: user, direct_message: dm_channel.chatable)
       expect {
         post "/chat/drafts.json", params: { chat_channel_id: dm_channel.id, data: "{}" }
-      }.to change { ChatDraft.count }.by(1)
+      }.to change { Chat::Draft.count }.by(1)
     end
 
     it "cannot create a too long chat draft" do
@@ -1311,63 +927,4 @@ RSpec.describe Chat::ChatController do
       get "/chat/message/#{message.id}.json"
     end
   end
-
-  describe "#lookup_message" do
-    let!(:message) { Fabricate(:chat_message, chat_channel: channel) }
-    let(:channel) { Fabricate(:direct_message_channel) }
-    let(:chatable) { channel.chatable }
-    fab!(:user) { Fabricate(:user) }
-
-    before { sign_in(user) }
-
-    it "ensures message's channel can be seen" do
-      Guardian.any_instance.expects(:can_join_chat_channel?).with(channel)
-      get "/chat/lookup/#{message.id}.json", params: { chat_channel_id: channel.id }
-    end
-
-    context "when the message doesn’t belong to the channel" do
-      let!(:message) { Fabricate(:chat_message) }
-
-      it "returns a 404" do
-        get "/chat/lookup/#{message.id}.json", params: { chat_channel_id: channel.id }
-
-        expect(response.status).to eq(404)
-      end
-    end
-
-    context "when the chat channel is for a category" do
-      let(:channel) { Fabricate(:category_channel) }
-
-      it "ensures the user can access that category" do
-        get "/chat/lookup/#{message.id}.json", params: { chat_channel_id: channel.id }
-        expect(response.status).to eq(200)
-        expect(response.parsed_body["chat_messages"][0]["id"]).to eq(message.id)
-
-        group = Fabricate(:group)
-        chatable.update!(read_restricted: true)
-        Fabricate(:category_group, group: group, category: chatable)
-        get "/chat/lookup/#{message.id}.json", params: { chat_channel_id: channel.id }
-        expect(response.status).to eq(403)
-
-        GroupUser.create!(user: user, group: group)
-        get "/chat/lookup/#{message.id}.json", params: { chat_channel_id: channel.id }
-        expect(response.status).to eq(200)
-        expect(response.parsed_body["chat_messages"][0]["id"]).to eq(message.id)
-      end
-    end
-
-    context "when the chat channel is for a direct message channel" do
-      let(:channel) { Fabricate(:direct_message_channel) }
-
-      it "ensures the user can access that direct message channel" do
-        get "/chat/lookup/#{message.id}.json", params: { chat_channel_id: channel.id }
-        expect(response.status).to eq(403)
-
-        DirectMessageUser.create!(user: user, direct_message: chatable)
-        get "/chat/lookup/#{message.id}.json", params: { chat_channel_id: channel.id }
-        expect(response.status).to eq(200)
-        expect(response.parsed_body["chat_messages"][0]["id"]).to eq(message.id)
-      end
-    end
-  end
 end
diff --git a/plugins/chat/spec/requests/core_ext/bookmarks_controller_spec.rb b/plugins/chat/spec/requests/core_ext/bookmarks_controller_spec.rb
new file mode 100644
index 00000000000..c4d35355b31
--- /dev/null
+++ b/plugins/chat/spec/requests/core_ext/bookmarks_controller_spec.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+RSpec.describe BookmarksController do
+  fab!(:chatters) { Fabricate(:group) }
+  let(:current_user) { Fabricate(:user, group_ids: [chatters.id]) }
+  let(:bookmark_message) { Fabricate(:chat_message) }
+  let(:bookmark_user) { current_user }
+
+  before do
+    register_test_bookmarkable(Chat::MessageBookmarkable)
+    SiteSetting.chat_allowed_groups = [chatters]
+    sign_in(current_user)
+  end
+
+  after { DiscoursePluginRegistry.reset_register!(:bookmarkables) }
+
+  context "when bookmarking a chat message" do
+    describe "#create" do
+      it "creates the bookmark" do
+        post "/bookmarks.json",
+             params: {
+               bookmarkable_id: bookmark_message.id,
+               bookmarkable_type: "Chat::Message",
+               reminder_at: (Time.zone.now + 1.day).iso8601,
+             }
+
+        expect(response.status).to eq(200)
+        expect(Bookmark.find_by(bookmarkable: bookmark_message).user_id).to eq(current_user.id)
+      end
+    end
+
+    describe "#destroy" do
+      let!(:bookmark) { Fabricate(:bookmark, bookmarkable: bookmark_message, user: bookmark_user) }
+
+      it "destroys the bookmark" do
+        delete "/bookmarks/#{bookmark.id}.json"
+
+        expect(response.status).to eq(200)
+        expect(Bookmark.find_by(id: bookmark.id)).to eq(nil)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/requests/core_ext/categories_controller_spec.rb b/plugins/chat/spec/requests/core_ext/categories_controller_spec.rb
index 3ecc2011ff2..f4c3517c579 100644
--- a/plugins/chat/spec/requests/core_ext/categories_controller_spec.rb
+++ b/plugins/chat/spec/requests/core_ext/categories_controller_spec.rb
@@ -26,7 +26,7 @@ RSpec.describe CategoriesController do
           end
 
           it "deletes the associated channel" do
-            expect { destroy_category }.to change { CategoryChannel.count }.by(-1)
+            expect { destroy_category }.to change { Chat::CategoryChannel.count }.by(-1)
           end
         end
 
diff --git a/plugins/chat/spec/requests/core_ext/latest_performance_spec.rb b/plugins/chat/spec/requests/core_ext/latest_performance_spec.rb
index 185279e1d41..050b753a1fb 100644
--- a/plugins/chat/spec/requests/core_ext/latest_performance_spec.rb
+++ b/plugins/chat/spec/requests/core_ext/latest_performance_spec.rb
@@ -15,13 +15,7 @@ describe ListController do
       Fabricate(:direct_message_channel, users: [current_user, user_1])
       public_channel_1 = Fabricate(:chat_channel)
       public_channel_2 = Fabricate(:chat_channel)
-
-      Fabricate(
-        :user_chat_channel_membership,
-        user: current_user,
-        chat_channel: public_channel_1,
-        following: true,
-      )
+      public_channel_1.add(current_user)
 
       # warm up
       get "/latest.html"
@@ -41,12 +35,7 @@ describe ListController do
           end
         end.count
 
-      Fabricate(
-        :user_chat_channel_membership,
-        user: current_user,
-        chat_channel: public_channel_2,
-        following: true,
-      )
+      public_channel_2.add(current_user)
       user_2 = Fabricate(:user)
       Fabricate(:direct_message_channel, users: [current_user, user_2])
 
diff --git a/plugins/chat/spec/requests/core_ext/users_controller_spec.rb b/plugins/chat/spec/requests/core_ext/users_controller_spec.rb
index 4b518fda752..8e9d060589d 100644
--- a/plugins/chat/spec/requests/core_ext/users_controller_spec.rb
+++ b/plugins/chat/spec/requests/core_ext/users_controller_spec.rb
@@ -18,7 +18,7 @@ describe UsersController do
       put "/u/activate-account/#{email_token.token}"
 
       expect(response.status).to eq(200)
-      membership = UserChatChannelMembership.find_by(user: user, chat_channel: channel)
+      membership = Chat::UserChatChannelMembership.find_by(user: user, chat_channel: channel)
       expect(membership.following).to eq(true)
     end
   end
diff --git a/plugins/chat/spec/requests/direct_messages_controller_spec.rb b/plugins/chat/spec/requests/direct_messages_controller_spec.rb
index c4c32de74f4..3c9017bc202 100644
--- a/plugins/chat/spec/requests/direct_messages_controller_spec.rb
+++ b/plugins/chat/spec/requests/direct_messages_controller_spec.rb
@@ -15,11 +15,11 @@ RSpec.describe Chat::DirectMessagesController do
   end
 
   def create_dm_channel(user_ids)
-    direct_messages_channel = DirectMessage.create!
+    direct_messages_channel = Chat::DirectMessage.create!
     user_ids.each do |user_id|
       direct_messages_channel.direct_message_users.create!(user_id: user_id)
     end
-    DirectMessageChannel.create!(chatable: direct_messages_channel)
+    Chat::DirectMessageChannel.create!(chatable: direct_messages_channel)
   end
 
   describe "#index" do
@@ -41,10 +41,10 @@ RSpec.describe Chat::DirectMessagesController do
 
     context "when channel exists" do
       let!(:channel) do
-        direct_messages_channel = DirectMessage.create!
+        direct_messages_channel = Chat::DirectMessage.create!
         direct_messages_channel.direct_message_users.create!(user_id: user.id)
         direct_messages_channel.direct_message_users.create!(user_id: user1.id)
-        DirectMessageChannel.create!(chatable: direct_messages_channel)
+        Chat::DirectMessageChannel.create!(chatable: direct_messages_channel)
       end
 
       it "returns the channel" do
@@ -68,98 +68,4 @@ RSpec.describe Chat::DirectMessagesController do
       end
     end
   end
-
-  describe "#create" do
-    before { Group.refresh_automatic_groups! }
-
-    shared_examples "creating dms" do
-      it "creates a new dm channel with username(s) provided" do
-        expect {
-          post "/chat/direct_messages/create.json", params: { usernames: [usernames] }
-        }.to change { DirectMessage.count }.by(1)
-        expect(DirectMessage.last.direct_message_users.map(&:user_id)).to match_array(
-          direct_message_user_ids,
-        )
-      end
-
-      it "returns existing dm channel if one exists for username(s)" do
-        create_dm_channel(direct_message_user_ids)
-        expect {
-          post "/chat/direct_messages/create.json", params: { usernames: [usernames] }
-        }.not_to change { DirectMessage.count }
-      end
-    end
-
-    describe "dm with one other user" do
-      let(:usernames) { user1.username }
-      let(:direct_message_user_ids) { [user.id, user1.id] }
-
-      include_examples "creating dms"
-    end
-
-    describe "dm with myself" do
-      let(:usernames) { [user.username] }
-      let(:direct_message_user_ids) { [user.id] }
-
-      include_examples "creating dms"
-    end
-
-    describe "dm with two other users" do
-      let(:usernames) { [user1, user2, user3].map(&:username) }
-      let(:direct_message_user_ids) { [user.id, user1.id, user2.id, user3.id] }
-
-      include_examples "creating dms"
-    end
-
-    it "creates UserChatChannelMembership records" do
-      users = [user2, user3]
-      usernames = users.map(&:username)
-      expect {
-        post "/chat/direct_messages/create.json", params: { usernames: usernames }
-      }.to change { UserChatChannelMembership.count }.by(3)
-    end
-
-    context "when one of the users I am messaging has ignored, muted, or prevented DMs from the acting user creating the channel" do
-      let(:usernames) { [user1, user2, user3].map(&:username) }
-      let(:direct_message_user_ids) { [user.id, user1.id, user2.id, user3.id] }
-
-      shared_examples "creating dms with communication error" do
-        it "responds with a friendly error" do
-          expect {
-            post "/chat/direct_messages/create.json", params: { usernames: [usernames] }
-          }.not_to change { DirectMessage.count }
-          expect(response.status).to eq(422)
-          expect(response.parsed_body["errors"]).to eq(
-            [I18n.t("chat.errors.not_accepting_dms", username: user1.username)],
-          )
-        end
-      end
-
-      describe "user ignoring the actor" do
-        before do
-          Fabricate(:ignored_user, user: user1, ignored_user: user, expiring_at: 1.day.from_now)
-        end
-
-        include_examples "creating dms with communication error"
-      end
-
-      describe "user muting the actor" do
-        before { Fabricate(:muted_user, user: user1, muted_user: user) }
-
-        include_examples "creating dms with communication error"
-      end
-
-      describe "user preventing all DMs" do
-        before { user1.user_option.update(allow_private_messages: false) }
-
-        include_examples "creating dms with communication error"
-      end
-
-      describe "user only allowing DMs from certain users" do
-        before { user1.user_option.update(enable_allowed_pm_users: true) }
-
-        include_examples "creating dms with communication error"
-      end
-    end
-  end
 end
diff --git a/plugins/chat/spec/serializer/chat/channel_serializer_spec.rb b/plugins/chat/spec/serializer/chat/channel_serializer_spec.rb
new file mode 100644
index 00000000000..8a4160ff9cd
--- /dev/null
+++ b/plugins/chat/spec/serializer/chat/channel_serializer_spec.rb
@@ -0,0 +1,118 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+describe Chat::ChannelSerializer do
+  subject(:serializer) { described_class.new(chat_channel, scope: guardian, root: nil) }
+
+  fab!(:user) { Fabricate(:user) }
+  fab!(:admin) { Fabricate(:admin) }
+  fab!(:chat_channel) { Fabricate(:chat_channel) }
+
+  let(:guardian_user) { user }
+  let(:guardian) { Guardian.new(guardian_user) }
+
+  describe "archive status" do
+    context "when user is not staff" do
+      let(:guardian_user) { user }
+
+      it "does not return any sort of archive status" do
+        expect(serializer.as_json.key?(:archive_completed)).to eq(false)
+      end
+
+      it "includes allow_channel_wide_mentions" do
+        expect(serializer.as_json.key?(:allow_channel_wide_mentions)).to eq(true)
+      end
+    end
+
+    context "when user is staff" do
+      let(:guardian_user) { admin }
+
+      it "includes the archive status if the channel is archived and the archive record exists" do
+        expect(serializer.as_json.key?(:archive_completed)).to eq(false)
+
+        chat_channel.update!(status: Chat::Channel.statuses[:archived])
+        expect(serializer.as_json.key?(:archive_completed)).to eq(false)
+
+        Chat::ChannelArchive.create!(
+          chat_channel: chat_channel,
+          archived_by: admin,
+          destination_topic_title: "This will be the archive topic",
+          total_messages: 10,
+        )
+        chat_channel.reload
+        expect(serializer.as_json.key?(:archive_completed)).to eq(true)
+      end
+
+      it "includes allow_channel_wide_mentions" do
+        expect(serializer.as_json.key?(:allow_channel_wide_mentions)).to eq(true)
+      end
+    end
+  end
+
+  describe "#meta" do
+    context "for category channels" do
+      fab!(:chat_channel) { Fabricate(:chat_channel) }
+
+      it "has the required message_bus_last_ids keys and calls MessageBus" do
+        MessageBus.expects(:last_id).with(Chat::Publisher.root_message_bus_channel(chat_channel.id))
+        MessageBus.expects(:last_id).with(
+          Chat::Publisher.new_messages_message_bus_channel(chat_channel.id),
+        )
+        MessageBus.expects(:last_id).with(
+          Chat::Publisher.new_mentions_message_bus_channel(chat_channel.id),
+        )
+        MessageBus.expects(:last_id).with(
+          Chat::Publisher.kick_users_message_bus_channel(chat_channel.id),
+        )
+        expect(serializer.as_json.dig(:meta, :message_bus_last_ids).keys).to eq(
+          %i[channel_message_bus_last_id new_messages new_mentions kick],
+        )
+      end
+
+      it "gets the kick_message_bus_last_id" do
+        MessageBus.expects(:last_id).at_least_once
+        MessageBus.expects(:last_id).with(
+          Chat::Publisher.kick_users_message_bus_channel(chat_channel.id),
+        )
+        expect(serializer.as_json[:meta][:message_bus_last_ids].key?(:kick)).to eq(true)
+      end
+
+      it "does not call MessageBus for last_id if all the last IDs are already passed in" do
+        MessageBus.expects(:last_id).never
+        described_class.new(
+          chat_channel,
+          scope: guardian,
+          root: nil,
+          channel_message_bus_last_id: 1,
+          new_messages_message_bus_last_id: 1,
+          new_mentions_message_bus_last_id: 1,
+          kick_message_bus_last_id: 1,
+        ).as_json
+      end
+    end
+
+    context "for direct message channels" do
+      fab!(:chat_channel) { Fabricate(:direct_message_channel) }
+
+      it "has the required message_bus_last_ids keys and calls MessageBus" do
+        MessageBus.expects(:last_id).with(Chat::Publisher.root_message_bus_channel(chat_channel.id))
+        MessageBus.expects(:last_id).with(
+          Chat::Publisher.new_messages_message_bus_channel(chat_channel.id),
+        )
+        MessageBus.expects(:last_id).with(
+          Chat::Publisher.new_mentions_message_bus_channel(chat_channel.id),
+        )
+        expect(serializer.as_json.dig(:meta, :message_bus_last_ids).keys).to eq(
+          %i[channel_message_bus_last_id new_messages new_mentions],
+        )
+      end
+
+      it "does not get the kick_message_bus_last_id" do
+        MessageBus.expects(:last_id).at_least_once
+        MessageBus.expects(:last_id).never
+        expect(serializer.as_json[:meta][:message_bus_last_ids].key?(:kick)).to eq(false)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/serializer/chat_message_serializer_spec.rb b/plugins/chat/spec/serializer/chat/chat_message_serializer_spec.rb
similarity index 73%
rename from plugins/chat/spec/serializer/chat_message_serializer_spec.rb
rename to plugins/chat/spec/serializer/chat/chat_message_serializer_spec.rb
index ea97d0310de..a3baad0d96a 100644
--- a/plugins/chat/spec/serializer/chat_message_serializer_spec.rb
+++ b/plugins/chat/spec/serializer/chat/chat_message_serializer_spec.rb
@@ -2,14 +2,15 @@
 
 require "rails_helper"
 
-describe ChatMessageSerializer do
+describe Chat::MessageSerializer do
+  subject(:serializer) { described_class.new(message_1, scope: guardian, root: nil) }
+
   fab!(:chat_channel) { Fabricate(:category_channel) }
   fab!(:message_poster) { Fabricate(:user) }
   fab!(:message_1) { Fabricate(:chat_message, user: message_poster, chat_channel: chat_channel) }
   fab!(:guardian_user) { Fabricate(:user) }
-  let(:guardian) { Guardian.new(guardian_user) }
 
-  subject { described_class.new(message_1, scope: guardian, root: nil) }
+  let(:guardian) { Guardian.new(guardian_user) }
 
   describe "#reactions" do
     fab!(:custom_emoji) { CustomEmoji.create!(name: "trout", upload: Fabricate(:upload)) }
@@ -21,12 +22,14 @@ describe ChatMessageSerializer do
       it "doesn’t return the reaction" do
         Emoji.clear_cache
 
-        expect(subject.as_json[:reactions]["trout"]).to be_present
+        trout_reaction = serializer.as_json[:reactions].find { |r| r[:emoji] == "trout" }
+        expect(trout_reaction).to be_present
 
         custom_emoji.destroy!
         Emoji.clear_cache
 
-        expect(subject.as_json[:reactions]["trout"]).to_not be_present
+        trout_reaction = serializer.as_json[:reactions].find { |r| r[:emoji] == "trout" }
+        expect(trout_reaction).to_not be_present
       end
     end
   end
@@ -47,7 +50,7 @@ describe ChatMessageSerializer do
         message_1.user.destroy!
         message_1.reload
 
-        expect(subject.as_json[:user][:username]).to eq(I18n.t("chat.deleted_chat_username"))
+        expect(serializer.as_json[:user][:username]).to eq(I18n.t("chat.deleted_chat_username"))
       end
     end
   end
@@ -58,14 +61,14 @@ describe ChatMessageSerializer do
         message_1.user.destroy!
         message_1.reload
 
-        expect(subject.as_json[:deleted_at]).to(be_within(1.second).of(Time.zone.now))
+        expect(serializer.as_json[:deleted_at]).to(be_within(1.second).of(Time.zone.now))
       end
 
       it "is marked as deleted by system user" do
         message_1.user.destroy!
         message_1.reload
 
-        expect(subject.as_json[:deleted_by_id]).to eq(Discourse.system_user.id)
+        expect(serializer.as_json[:deleted_by_id]).to eq(Discourse.system_user.id)
       end
     end
   end
@@ -77,7 +80,7 @@ describe ChatMessageSerializer do
       let(:options) { { scope: guardian, root: nil, chat_channel: message_1.chat_channel } }
 
       it "returns an empty list if the user already flagged the message" do
-        reviewable = Fabricate(:reviewable_chat_message, target: message_1)
+        reviewable = Fabricate(:chat_reviewable_message, target: message_1)
 
         serialized =
           described_class.new(
@@ -96,7 +99,7 @@ describe ChatMessageSerializer do
       end
 
       it "return available flags if staff already reviewed the previous flag" do
-        reviewable = Fabricate(:reviewable_chat_message, target: message_1)
+        reviewable = Fabricate(:chat_reviewable_message, target: message_1)
 
         serialized =
           described_class.new(
@@ -206,4 +209,46 @@ describe ChatMessageSerializer do
       end
     end
   end
+
+  describe "#mentioned_users" do
+    it "doesn't fail if mentioned user was deleted" do
+      mentioned_user = Fabricate(:user)
+      message =
+        Fabricate(
+          :chat_message,
+          message:
+            "here should be a mention, but since we're fabricating objects it doesn't matter",
+        )
+      Fabricate(:chat_mention, chat_message: message, user: mentioned_user)
+
+      mentioned_user.destroy!
+      message.reload
+      serializer = described_class.new(message, scope: guardian, root: nil)
+
+      expect { serializer.as_json }.not_to raise_error
+      expect(serializer.as_json[:mentioned_users]).to be_empty
+    end
+  end
+
+  describe "threading data" do
+    before { message_1.update!(thread: Fabricate(:chat_thread, channel: chat_channel)) }
+
+    context "when the channel has threading_enabled false" do
+      before { chat_channel.update!(threading_enabled: false) }
+
+      it "does not include thread data" do
+        serialized = described_class.new(message_1, scope: guardian, root: nil).as_json
+        expect(serialized).not_to have_key(:thread_id)
+      end
+    end
+
+    context "when the channel has threading_enabled true" do
+      before { chat_channel.update!(threading_enabled: true) }
+
+      it "does include thread data" do
+        serialized = described_class.new(message_1, scope: guardian, root: nil).as_json
+        expect(serialized).to have_key(:thread_id)
+      end
+    end
+  end
 end
diff --git a/plugins/chat/spec/serializer/chat/chat_message_user_serializer_spec.rb b/plugins/chat/spec/serializer/chat/chat_message_user_serializer_spec.rb
new file mode 100644
index 00000000000..fa12515bc2b
--- /dev/null
+++ b/plugins/chat/spec/serializer/chat/chat_message_user_serializer_spec.rb
@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+RSpec.describe Chat::MessageUserSerializer do
+  subject(:serializer) do
+    user = Fabricate(:user, **params)
+    guardian = Guardian.new(user)
+    described_class.new(user, scope: guardian, root: nil).as_json
+  end
+
+  let(:params) do
+    { trust_level: TrustLevel[1], admin: false, moderator: false, primary_group_id: nil }
+  end
+
+  context "with default user" do
+    it "displays user as regular" do
+      expect(serializer[:new_user]).to eq(false)
+      expect(serializer[:staff]).to eq(false)
+      expect(serializer[:admin]).to eq(false)
+      expect(serializer[:moderator]).to eq(false)
+      expect(serializer[:primary_group_name]).to be_blank
+    end
+  end
+
+  context "when user is TL0" do
+    before { params[:trust_level] = TrustLevel[0] }
+
+    it "displays user as new" do
+      expect(serializer[:new_user]).to eq(true)
+    end
+  end
+
+  context "when user is staff" do
+    before { params[:admin] = true }
+
+    it "displays user as staff" do
+      expect(serializer[:staff]).to eq(true)
+    end
+  end
+
+  context "when user is admin" do
+    before { params[:admin] = true }
+
+    it "displays user as admin" do
+      expect(serializer[:admin]).to eq(true)
+    end
+  end
+
+  context "when user is moderator" do
+    before { params[:moderator] = true }
+
+    it "displays user as moderator" do
+      expect(serializer[:moderator]).to eq(true)
+    end
+  end
+
+  context "when user has a primary group" do
+    fab!(:group) { Fabricate(:group) }
+
+    before { params[:primary_group_id] = group.id }
+
+    it "displays user as moderator" do
+      expect(serializer[:primary_group_name]).to eq(group.name)
+    end
+  end
+end
diff --git a/plugins/chat/spec/serializer/direct_message_serializer_spec.rb b/plugins/chat/spec/serializer/chat/direct_message_serializer_spec.rb
similarity index 97%
rename from plugins/chat/spec/serializer/direct_message_serializer_spec.rb
rename to plugins/chat/spec/serializer/chat/direct_message_serializer_spec.rb
index 0747661ce64..3315b2c37fe 100644
--- a/plugins/chat/spec/serializer/direct_message_serializer_spec.rb
+++ b/plugins/chat/spec/serializer/chat/direct_message_serializer_spec.rb
@@ -2,7 +2,7 @@
 
 require "rails_helper"
 
-describe DirectMessageSerializer do
+describe Chat::DirectMessageSerializer do
   describe "#user" do
     it "returns you when there are two of us" do
       me = Fabricate.build(:user)
diff --git a/plugins/chat/spec/serializer/chat_in_reply_to_serializer_spec.rb b/plugins/chat/spec/serializer/chat/in_reply_to_serializer_spec.rb
similarity index 95%
rename from plugins/chat/spec/serializer/chat_in_reply_to_serializer_spec.rb
rename to plugins/chat/spec/serializer/chat/in_reply_to_serializer_spec.rb
index bf873d90717..b19e10fcd98 100644
--- a/plugins/chat/spec/serializer/chat_in_reply_to_serializer_spec.rb
+++ b/plugins/chat/spec/serializer/chat/in_reply_to_serializer_spec.rb
@@ -2,7 +2,7 @@
 
 require "rails_helper"
 
-RSpec.describe ChatInReplyToSerializer do
+RSpec.describe Chat::InReplyToSerializer do
   subject(:serializer) { described_class.new(message, scope: guardian, root: nil) }
 
   fab!(:chat_channel) { Fabricate(:chat_channel) }
diff --git a/plugins/chat/spec/serializer/chat/structured_channel_serializer_spec.rb b/plugins/chat/spec/serializer/chat/structured_channel_serializer_spec.rb
new file mode 100644
index 00000000000..c5fd80cf44b
--- /dev/null
+++ b/plugins/chat/spec/serializer/chat/structured_channel_serializer_spec.rb
@@ -0,0 +1,207 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::StructuredChannelSerializer do
+  fab!(:user1) { Fabricate(:user) }
+  fab!(:guardian) { Guardian.new(user1) }
+  fab!(:user2) { Fabricate(:user) }
+  fab!(:user3) { Fabricate(:user) }
+  fab!(:channel1) { Fabricate(:category_channel) }
+  fab!(:channel2) { Fabricate(:category_channel) }
+  fab!(:channel3) do
+    Fabricate(:direct_message_channel, users: [user1, user2], with_membership: false)
+  end
+  fab!(:channel4) do
+    Fabricate(:direct_message_channel, users: [user1, user3], with_membership: false)
+  end
+  fab!(:membership1) do
+    Fabricate(:user_chat_channel_membership, user: user1, chat_channel: channel1)
+  end
+  fab!(:membership2) do
+    Fabricate(:user_chat_channel_membership, user: user1, chat_channel: channel2)
+  end
+  fab!(:membership3) do
+    Fabricate(:user_chat_channel_membership_for_dm, user: user1, chat_channel: channel3)
+  end
+  fab!(:membership4) do
+    Fabricate(:user_chat_channel_membership_for_dm, user: user1, chat_channel: channel4)
+  end
+  fab!(:membership5) do
+    Fabricate(:user_chat_channel_membership_for_dm, user: user2, chat_channel: channel3)
+  end
+  fab!(:membership6) do
+    Fabricate(:user_chat_channel_membership_for_dm, user: user3, chat_channel: channel4)
+  end
+
+  def fetch_data
+    Chat::ChannelFetcher.structured(guardian)
+  end
+
+  it "serializes a public channel correctly with membership embedded" do
+    expect(
+      described_class
+        .new(fetch_data, scope: guardian)
+        .public_channels
+        .find { |channel| channel.id == channel1.id }
+        .current_user_membership
+        .as_json,
+    ).to include(
+      "chat_channel_id" => channel1.id,
+      "desktop_notification_level" => "mention",
+      "following" => true,
+      "last_read_message_id" => nil,
+      "mobile_notification_level" => "mention",
+      "muted" => false,
+    )
+  end
+
+  it "serializes a direct message channel correctly with membership embedded" do
+    expect(
+      described_class
+        .new(fetch_data, scope: guardian)
+        .direct_message_channels
+        .find { |channel| channel.id == channel3.id }
+        .current_user_membership
+        .as_json,
+    ).to include(
+      "chat_channel_id" => channel3.id,
+      "desktop_notification_level" => "always",
+      "following" => true,
+      "last_read_message_id" => nil,
+      "mobile_notification_level" => "always",
+      "muted" => false,
+    )
+  end
+
+  it "does not include membership details for an anonymous user" do
+    expect(
+      described_class
+        .new(fetch_data, scope: Guardian.new)
+        .public_channels
+        .find { |channel| channel.id == channel1.id }
+        .as_json[
+        :current_user_membership
+      ],
+    ).to eq(nil)
+  end
+
+  it "does not include membership if somehow the data is missing" do
+    data = fetch_data
+    data[:memberships] = data[:memberships].reject do |membership|
+      membership.chat_channel_id == channel1.id
+    end
+
+    expect(
+      described_class
+        .new(data, scope: guardian)
+        .public_channels
+        .find { |channel| channel.id == channel1.id }
+        .as_json[
+        :current_user_membership
+      ],
+    ).to eq(nil)
+  end
+
+  describe "#meta" do
+    context "when user is anonymous" do
+      it "does not query MessageBus for the user_tracking_state_message_bus_channel last_id" do
+        Chat::Publisher.expects(:user_tracking_state_message_bus_channel).never
+        json = described_class.new(fetch_data, scope: Guardian.new).as_json
+        expect(
+          json.dig(:structured_channel, :meta, :message_bus_last_ids).key?(:user_tracking_state),
+        ).to eq(false)
+      end
+    end
+
+    context "when user is not anonymous" do
+      it "has the required message_bus_last_ids" do
+        expect(
+          described_class
+            .new(fetch_data, scope: guardian)
+            .as_json
+            .dig(:structured_channel, :meta, :message_bus_last_ids)
+            .keys,
+        ).to eq(
+          %i[
+            channel_metadata
+            channel_edits
+            channel_status
+            new_channel
+            archive_status
+            user_tracking_state
+          ],
+        )
+      end
+
+      it "calls MessageBus.last_ids with all the required channels for each public and DM chat chat channel" do
+        MessageBus
+          .expects(:last_ids)
+          .with do |*args|
+            [
+              Chat::Publisher::CHANNEL_METADATA_MESSAGE_BUS_CHANNEL,
+              Chat::Publisher::CHANNEL_EDITS_MESSAGE_BUS_CHANNEL,
+              Chat::Publisher::CHANNEL_STATUS_MESSAGE_BUS_CHANNEL,
+              Chat::Publisher::NEW_CHANNEL_MESSAGE_BUS_CHANNEL,
+              Chat::Publisher::CHANNEL_ARCHIVE_STATUS_MESSAGE_BUS_CHANNEL,
+              Chat::Publisher.user_tracking_state_message_bus_channel(user1.id),
+              Chat::Publisher.new_messages_message_bus_channel(channel1.id),
+              Chat::Publisher.new_mentions_message_bus_channel(channel1.id),
+              Chat::Publisher.kick_users_message_bus_channel(channel1.id),
+              Chat::Publisher.root_message_bus_channel(channel1.id),
+              Chat::Publisher.new_messages_message_bus_channel(channel2.id),
+              Chat::Publisher.new_mentions_message_bus_channel(channel2.id),
+              Chat::Publisher.kick_users_message_bus_channel(channel2.id),
+              Chat::Publisher.root_message_bus_channel(channel2.id),
+              Chat::Publisher.new_messages_message_bus_channel(channel3.id),
+              Chat::Publisher.new_mentions_message_bus_channel(channel3.id),
+              Chat::Publisher.root_message_bus_channel(channel3.id),
+              Chat::Publisher.new_messages_message_bus_channel(channel4.id),
+              Chat::Publisher.new_mentions_message_bus_channel(channel4.id),
+              Chat::Publisher.root_message_bus_channel(channel4.id),
+            ].to_set == args.to_set
+          end
+          .returns({})
+
+        described_class.new(fetch_data, scope: guardian).as_json
+      end
+
+      it "passes down the required message_bus ids for category channels to Chat::ChannelSerializer" do
+        data = fetch_data
+        Chat::ChannelSerializer.expects(:new).at_least_once
+        Chat::ChannelSerializer
+          .expects(:new)
+          .with(
+            channel1,
+            root: nil,
+            scope: guardian,
+            membership: membership1,
+            new_messages_message_bus_last_id: 0,
+            new_mentions_message_bus_last_id: 0,
+            kick_message_bus_last_id: 0,
+            channel_message_bus_last_id: 0,
+            can_join_chat_channel: true,
+            post_allowed_category_ids: nil,
+          )
+          .once
+        described_class.new(data, scope: guardian).as_json
+      end
+
+      it "passes down the required message_bus ids for direct message channels to Chat::ChannelSerializer" do
+        data = fetch_data
+        Chat::ChannelSerializer.expects(:new).at_least_once
+        Chat::ChannelSerializer
+          .expects(:new)
+          .with(
+            channel3,
+            root: nil,
+            scope: guardian,
+            membership: membership3,
+            new_messages_message_bus_last_id: 0,
+            new_mentions_message_bus_last_id: 0,
+            channel_message_bus_last_id: 0,
+          )
+          .once
+        described_class.new(data, scope: guardian).as_json
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/serializer/chat_channel_serializer_spec.rb b/plugins/chat/spec/serializer/chat_channel_serializer_spec.rb
deleted file mode 100644
index 86ccea5c3fb..00000000000
--- a/plugins/chat/spec/serializer/chat_channel_serializer_spec.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-require "rails_helper"
-
-describe ChatChannelSerializer do
-  fab!(:user) { Fabricate(:user) }
-  fab!(:admin) { Fabricate(:admin) }
-  fab!(:chat_channel) { Fabricate(:chat_channel) }
-  let(:guardian_user) { user }
-  let(:guardian) { Guardian.new(guardian_user) }
-  subject { described_class.new(chat_channel, scope: guardian, root: nil) }
-
-  describe "archive status" do
-    context "when user is not staff" do
-      let(:guardian_user) { user }
-
-      it "does not return any sort of archive status" do
-        expect(subject.as_json.key?(:archive_completed)).to eq(false)
-      end
-
-      it "includes allow_channel_wide_mentions" do
-        expect(subject.as_json.key?(:allow_channel_wide_mentions)).to eq(true)
-      end
-    end
-
-    context "when user is staff" do
-      let(:guardian_user) { admin }
-
-      it "includes the archive status if the channel is archived and the archive record exists" do
-        expect(subject.as_json.key?(:archive_completed)).to eq(false)
-
-        chat_channel.update!(status: ChatChannel.statuses[:archived])
-        expect(subject.as_json.key?(:archive_completed)).to eq(false)
-
-        ChatChannelArchive.create!(
-          chat_channel: chat_channel,
-          archived_by: admin,
-          destination_topic_title: "This will be the archive topic",
-          total_messages: 10,
-        )
-        chat_channel.reload
-        expect(subject.as_json.key?(:archive_completed)).to eq(true)
-      end
-
-      it "includes allow_channel_wide_mentions" do
-        expect(subject.as_json.key?(:allow_channel_wide_mentions)).to eq(true)
-      end
-    end
-  end
-end
diff --git a/plugins/chat/spec/serializer/core_ext/current_user_serializer_spec.rb b/plugins/chat/spec/serializer/current_user_serializer_spec.rb
similarity index 100%
rename from plugins/chat/spec/serializer/core_ext/current_user_serializer_spec.rb
rename to plugins/chat/spec/serializer/current_user_serializer_spec.rb
diff --git a/plugins/chat/spec/serializer/structured_channel_serializer_spec.rb b/plugins/chat/spec/serializer/structured_channel_serializer_spec.rb
deleted file mode 100644
index 0cfd801ebbf..00000000000
--- a/plugins/chat/spec/serializer/structured_channel_serializer_spec.rb
+++ /dev/null
@@ -1,107 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe StructuredChannelSerializer do
-  fab!(:user1) { Fabricate(:user) }
-  fab!(:guardian) { Guardian.new(user1) }
-  fab!(:user2) { Fabricate(:user) }
-  fab!(:user3) { Fabricate(:user) }
-  fab!(:channel1) { Fabricate(:category_channel) }
-  fab!(:channel2) { Fabricate(:category_channel) }
-  fab!(:channel3) do
-    Fabricate(:direct_message_channel, users: [user1, user2], with_membership: false)
-  end
-  fab!(:channel4) do
-    Fabricate(:direct_message_channel, users: [user1, user3], with_membership: false)
-  end
-  fab!(:membership1) do
-    Fabricate(:user_chat_channel_membership, user: user1, chat_channel: channel1)
-  end
-  fab!(:membership2) do
-    Fabricate(:user_chat_channel_membership, user: user1, chat_channel: channel2)
-  end
-  fab!(:membership3) do
-    Fabricate(:user_chat_channel_membership_for_dm, user: user1, chat_channel: channel3)
-  end
-  fab!(:membership4) do
-    Fabricate(:user_chat_channel_membership_for_dm, user: user1, chat_channel: channel4)
-  end
-  fab!(:membership5) do
-    Fabricate(:user_chat_channel_membership_for_dm, user: user2, chat_channel: channel3)
-  end
-  fab!(:membership6) do
-    Fabricate(:user_chat_channel_membership_for_dm, user: user3, chat_channel: channel4)
-  end
-
-  def fetch_data
-    Chat::ChatChannelFetcher.structured(guardian)
-  end
-
-  it "serializes a public channel correctly with membership embedded" do
-    expect(
-      described_class
-        .new(fetch_data, scope: guardian)
-        .public_channels
-        .find { |channel| channel.id == channel1.id }
-        .current_user_membership
-        .as_json,
-    ).to include(
-      "chat_channel_id" => channel1.id,
-      "desktop_notification_level" => "mention",
-      "following" => true,
-      "last_read_message_id" => nil,
-      "mobile_notification_level" => "mention",
-      "muted" => false,
-      "unread_count" => 0,
-      "unread_mentions" => 0,
-    )
-  end
-
-  it "serializes a direct message channel correctly with membership embedded" do
-    expect(
-      described_class
-        .new(fetch_data, scope: guardian)
-        .direct_message_channels
-        .find { |channel| channel.id == channel3.id }
-        .current_user_membership
-        .as_json,
-    ).to include(
-      "chat_channel_id" => channel3.id,
-      "desktop_notification_level" => "always",
-      "following" => true,
-      "last_read_message_id" => nil,
-      "mobile_notification_level" => "always",
-      "muted" => false,
-      "unread_count" => 0,
-      "unread_mentions" => 0,
-    )
-  end
-
-  it "does not include membership details for an anonymous user" do
-    expect(
-      described_class
-        .new(fetch_data, scope: Guardian.new)
-        .public_channels
-        .find { |channel| channel.id == channel1.id }
-        .as_json[
-        :current_user_membership
-      ],
-    ).to eq(nil)
-  end
-
-  it "does not include membership if somehow the data is missing" do
-    data = fetch_data
-    data[:memberships] = data[:memberships].reject do |membership|
-      membership.chat_channel_id == channel1.id
-    end
-
-    expect(
-      described_class
-        .new(data, scope: guardian)
-        .public_channels
-        .find { |channel| channel.id == channel1.id }
-        .as_json[
-        :current_user_membership
-      ],
-    ).to eq(nil)
-  end
-end
diff --git a/plugins/chat/spec/services/actions/create_memberships_for_auto_join_spec.rb b/plugins/chat/spec/services/actions/create_memberships_for_auto_join_spec.rb
new file mode 100644
index 00000000000..dbc15d92b7c
--- /dev/null
+++ b/plugins/chat/spec/services/actions/create_memberships_for_auto_join_spec.rb
@@ -0,0 +1,172 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::Action::CreateMembershipsForAutoJoin do
+  subject(:action) { described_class.call(channel: channel, contract: contract) }
+
+  fab!(:channel) { Fabricate(:chat_channel, auto_join_users: true) }
+  fab!(:user_1) { Fabricate(:user, last_seen_at: 15.minutes.ago) }
+
+  let(:start_user_id) { user_1.id }
+  let(:end_user_id) { user_1.id }
+  let(:contract) { OpenStruct.new(start_user_id: start_user_id, end_user_id: end_user_id) }
+
+  it "adds correct members" do
+    expect(action).to eq([user_1.id])
+  end
+
+  it "sets the reason to automatic" do
+    action
+    expect(channel.membership_for(user_1)).to be_automatic
+  end
+
+  context "with others users not in the batch" do
+    fab!(:user_2) { Fabricate(:user) }
+
+    it "adds correct members" do
+      expect(action).to eq([user_1.id])
+    end
+  end
+
+  context "with suspended users" do
+    before { user_1.update!(suspended_till: 1.year.from_now) }
+
+    it "skips suspended users" do
+      expect(action).to eq([])
+    end
+  end
+
+  context "with users not seen recently" do
+    before { user_1.update!(last_seen_at: 4.months.ago) }
+
+    it "skips users last_seen more than 3 months ago" do
+      expect(action).to eq([])
+    end
+  end
+
+  context "with never seen users" do
+    before { user_1.update!(last_seen_at: nil) }
+
+    it "includes users with last_seen set to null" do
+      expect(action).to eq([user_1.id])
+    end
+  end
+
+  context "with disabled chat users" do
+    before { user_1.user_option.update!(chat_enabled: false) }
+
+    it "skips users without chat_enabled" do
+      expect(action).to eq([])
+    end
+  end
+
+  context "with anonymous users" do
+    fab!(:user_1) { Fabricate(:anonymous, last_seen_at: 15.minutes.ago) }
+
+    it "skips anonymous users" do
+      expect(action).to eq([])
+    end
+  end
+
+  context "with inactive users" do
+    before { user_1.update!(active: false) }
+
+    it "skips inactive users" do
+      expect(action).to eq([])
+    end
+  end
+
+  context "with staged users" do
+    before { user_1.update!(staged: true) }
+
+    it "skips staged users" do
+      expect(action).to eq([])
+    end
+  end
+
+  context "when user is already a member" do
+    before { channel.add(user_1) }
+
+    it "is a noop" do
+      expect(action).to eq([])
+    end
+  end
+
+  context "when category is restricted" do
+    fab!(:user_1) { Fabricate(:user) }
+    fab!(:user_2) { Fabricate(:user) }
+    fab!(:group_1) { Fabricate(:group) }
+    fab!(:channel) { Fabricate(:private_category_channel, group: group_1, auto_join_users: true) }
+
+    let(:end_user_id) { user_2.id }
+
+    before { group_1.add(user_1) }
+
+    it "only joins users with access to the category through the group" do
+      expect(action).to eq([user_1.id])
+    end
+
+    context "when the user has access through multiple groups" do
+      fab!(:group_2) { Fabricate(:group) }
+
+      before do
+        channel.category.category_groups.create!(
+          group_id: group_2.id,
+          permission_type: CategoryGroup.permission_types[:full],
+        )
+        group_2.add(user_1)
+      end
+
+      it "correctly joins the user" do
+        expect(action).to eq([user_1.id])
+      end
+    end
+
+    context "when the category group is read only" do
+      fab!(:channel) { Fabricate(:private_category_channel, auto_join_users: true) }
+
+      before do
+        channel.category.category_groups.create!(
+          group_id: group_1.id,
+          permission_type: CategoryGroup.permission_types[:readonly],
+        )
+        group_1.add(user_1)
+      end
+
+      it "doesn’t join the users of the group" do
+        expect(action).to eq([])
+      end
+    end
+
+    context "when the category group has create post permission" do
+      fab!(:channel) { Fabricate(:private_category_channel, auto_join_users: true) }
+
+      before do
+        channel.category.category_groups.create!(
+          group_id: group_1.id,
+          permission_type: CategoryGroup.permission_types[:create_post],
+        )
+        group_1.add(user_1)
+      end
+
+      it "correctly joins the user" do
+        expect(action).to eq([user_1.id])
+      end
+    end
+
+    context "when user has allowed groups and disallowed groups" do
+      fab!(:group_2) { Fabricate(:group) }
+
+      before do
+        channel.category.category_groups.create!(
+          group_id: group_2.id,
+          permission_type: CategoryGroup.permission_types[:readonly],
+        )
+        group_2.add(user_1)
+      end
+
+      it "correctly joins the user" do
+        expect(action).to eq([user_1.id])
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/services/actions/reset_user_last_read_channel_message_spec.rb b/plugins/chat/spec/services/actions/reset_user_last_read_channel_message_spec.rb
new file mode 100644
index 00000000000..60b182ceac0
--- /dev/null
+++ b/plugins/chat/spec/services/actions/reset_user_last_read_channel_message_spec.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::Action::ResetUserLastReadChannelMessage do
+  fab!(:channel_1) { Fabricate(:chat_channel) }
+  fab!(:channel_2) { Fabricate(:chat_channel) }
+  fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1, created_at: 1.hour.ago) }
+  fab!(:message_2) { Fabricate(:chat_message, chat_channel: channel_1, created_at: 2.seconds.ago) }
+  fab!(:message_3) { Fabricate(:chat_message, chat_channel: channel_1, created_at: 3.minutes.ago) }
+  fab!(:message_4) { Fabricate(:chat_message, chat_channel: channel_2, created_at: 30.seconds.ago) }
+  fab!(:message_5) { Fabricate(:chat_message, chat_channel: channel_2, created_at: 3.seconds.ago) }
+  fab!(:message_6) { Fabricate(:chat_message, chat_channel: channel_2, created_at: 1.day.ago) }
+  fab!(:membership_1) do
+    Fabricate(
+      :user_chat_channel_membership,
+      chat_channel: channel_1,
+      last_read_message_id: message_3.id,
+    )
+  end
+  fab!(:membership_2) do
+    Fabricate(
+      :user_chat_channel_membership,
+      chat_channel: channel_2,
+      last_read_message_id: message_6.id,
+    )
+  end
+
+  context "when there are non-deleted messages left in the channel" do
+    before do
+      message_3.trash!
+      message_3.chat_channel.update_last_message_id!
+      message_6.trash!
+      message_6.chat_channel.update_last_message_id!
+    end
+
+    it "sets the matching membership last_read_message_ids to the most recently created message ID" do
+      described_class.call([message_3.id, message_6.id], [channel_1.id, channel_2.id])
+      expect(membership_1.reload.last_read_message_id).to eq(message_2.id)
+      expect(membership_2.reload.last_read_message_id).to eq(message_5.id)
+    end
+  end
+
+  context "when there are no more non-deleted messages left in the channel" do
+    before do
+      [message_1, message_2, message_4, message_5].each(&:trash!)
+      channel_1.update_last_message_id!
+      channel_2.update_last_message_id!
+    end
+
+    it "sets the matching membership last_read_message_ids to NULL" do
+      described_class.call([message_3.id, message_6.id], [channel_1.id, channel_2.id])
+      expect(membership_1.reload.last_read_message_id).to be_nil
+      expect(membership_2.reload.last_read_message_id).to be_nil
+    end
+  end
+end
diff --git a/plugins/chat/spec/services/actions/reset_user_last_read_thread_message_spec.rb b/plugins/chat/spec/services/actions/reset_user_last_read_thread_message_spec.rb
new file mode 100644
index 00000000000..760a7858291
--- /dev/null
+++ b/plugins/chat/spec/services/actions/reset_user_last_read_thread_message_spec.rb
@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::Action::ResetUserLastReadThreadMessage do
+  fab!(:thread_1) { Fabricate(:chat_thread) }
+  fab!(:thread_2) { Fabricate(:chat_thread) }
+  fab!(:message_1) do
+    Fabricate(
+      :chat_message,
+      chat_channel: thread_1.channel,
+      thread: thread_1,
+      created_at: 1.hour.ago,
+    )
+  end
+  fab!(:message_2) do
+    Fabricate(
+      :chat_message,
+      chat_channel: thread_1.channel,
+      thread: thread_1,
+      created_at: 2.seconds.ago,
+    )
+  end
+  fab!(:message_3) do
+    Fabricate(
+      :chat_message,
+      chat_channel: thread_1.channel,
+      thread: thread_1,
+      created_at: 3.minutes.ago,
+    )
+  end
+  fab!(:message_4) do
+    Fabricate(
+      :chat_message,
+      chat_channel: thread_2.channel,
+      thread: thread_2,
+      created_at: 30.seconds.ago,
+    )
+  end
+  fab!(:message_5) do
+    Fabricate(
+      :chat_message,
+      chat_channel: thread_2.channel,
+      thread: thread_2,
+      created_at: 3.seconds.ago,
+    )
+  end
+  fab!(:message_6) do
+    Fabricate(
+      :chat_message,
+      chat_channel: thread_2.channel,
+      thread: thread_2,
+      created_at: 1.day.ago,
+    )
+  end
+  fab!(:membership_1) do
+    Fabricate(:user_chat_thread_membership, thread: thread_1, last_read_message_id: message_3.id)
+  end
+  fab!(:membership_2) do
+    Fabricate(:user_chat_thread_membership, thread: thread_2, last_read_message_id: message_6.id)
+  end
+
+  context "when there are non-deleted messages left in the thread" do
+    before do
+      message_3.trash!
+      message_6.trash!
+    end
+
+    it "sets the matching membership last_read_message_ids to the most recently created message ID" do
+      described_class.call([message_3.id, message_6.id], [thread_1.id, thread_2.id])
+      expect(membership_1.reload.last_read_message_id).to eq(message_2.id)
+      expect(membership_2.reload.last_read_message_id).to eq(message_5.id)
+    end
+  end
+
+  context "when there are no more non-deleted messages left in the thread (excluding the original message)" do
+    before { [message_1, message_2, message_4, message_5].each(&:trash!) }
+
+    it "sets the matching membership last_read_message_ids to NULL" do
+      described_class.call([message_3.id, message_6.id], [thread_1.id, thread_2.id])
+      expect(membership_1.reload.last_read_message_id).to be_nil
+      expect(membership_2.reload.last_read_message_id).to be_nil
+    end
+  end
+end
diff --git a/plugins/chat/spec/services/auto_remove/handle_category_updated_spec.rb b/plugins/chat/spec/services/auto_remove/handle_category_updated_spec.rb
new file mode 100644
index 00000000000..87ef5c75d92
--- /dev/null
+++ b/plugins/chat/spec/services/auto_remove/handle_category_updated_spec.rb
@@ -0,0 +1,166 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::AutoRemove::HandleCategoryUpdated do
+  describe ".call" do
+    subject(:result) { described_class.call(params) }
+
+    let(:params) { { category_id: updated_category.id } }
+
+    fab!(:updated_category) { Fabricate(:category) }
+    fab!(:user_1) { Fabricate(:user) }
+    fab!(:user_2) { Fabricate(:user) }
+    fab!(:admin_1) { Fabricate(:admin) }
+    fab!(:admin_2) { Fabricate(:admin) }
+    fab!(:channel_1) { Fabricate(:chat_channel, chatable: updated_category) }
+    fab!(:channel_2) { Fabricate(:chat_channel, chatable: updated_category) }
+
+    context "when chat is not enabled" do
+      before { SiteSetting.chat_enabled = false }
+
+      it { is_expected.to fail_a_policy(:chat_enabled) }
+    end
+
+    context "when chat is enabled" do
+      before { SiteSetting.chat_enabled = true }
+
+      context "if the category is deleted" do
+        before { updated_category.destroy! }
+
+        it "fails to find category model" do
+          expect(result).to fail_to_find_a_model(:category)
+        end
+      end
+
+      context "when there are no channels associated with the category" do
+        before do
+          channel_1.destroy!
+          channel_2.destroy!
+        end
+
+        it "fails to find category_channel_ids model" do
+          expect(result).to fail_to_find_a_model(:category_channel_ids)
+        end
+      end
+
+      context "when the category has no more category_group records" do
+        before do
+          [user_1, user_2, admin_1, admin_2].each do |user|
+            channel_1.add(user)
+            channel_2.add(user)
+          end
+          updated_category.category_groups.delete_all
+        end
+
+        it "sets the service result as successful" do
+          expect(result).to be_a_success
+        end
+
+        it "does not kick any users since the default permission is Everyone (full)" do
+          expect { result }.not_to change {
+            Chat::UserChatChannelMembership.where(
+              user: [user_1, user_2, admin_1, admin_2],
+              chat_channel: [channel_1, channel_2],
+            ).count
+          }
+        end
+      end
+
+      context "when the category still has category_group records" do
+        before do
+          [user_1, user_2, admin_1, admin_2].each do |user|
+            channel_1.add(user)
+            channel_2.add(user)
+          end
+
+          group_1 = Fabricate(:group)
+          CategoryGroup.create(
+            group: group_1,
+            category: updated_category,
+            permission_type: CategoryGroup.permission_types[:full],
+          )
+
+          group_2 = Fabricate(:group)
+          CategoryGroup.create(
+            group: group_2,
+            category: updated_category,
+            permission_type: CategoryGroup.permission_types[:readonly],
+          )
+
+          group_1.add(user_1)
+          group_2.add(user_1)
+        end
+
+        it "sets the service result as successful" do
+          expect(result).to be_a_success
+        end
+
+        it "kicks all regular users who are not in any groups with reply + see permissions" do
+          expect { result }.to change {
+            Chat::UserChatChannelMembership.where(
+              user: [user_1, user_2],
+              chat_channel: [channel_1, channel_2],
+            ).count
+          }.to 2
+        end
+
+        it "does not kick admin users who are not in any groups with reply + see permissions" do
+          expect { result }.not_to change {
+            Chat::UserChatChannelMembership.where(
+              user: [admin_1, admin_2],
+              chat_channel: [channel_1, channel_2],
+            ).count
+          }
+        end
+
+        it "enqueues a job to kick each batch of users from the channel" do
+          freeze_time
+          result
+          expect(
+            job_enqueued?(
+              job: Jobs::Chat::KickUsersFromChannel,
+              at: 5.seconds.from_now,
+              args: {
+                user_ids: [user_2.id],
+                channel_id: channel_1.id,
+              },
+            ),
+          ).to eq(true)
+
+          expect(
+            job_enqueued?(
+              job: Jobs::Chat::KickUsersFromChannel,
+              at: 5.seconds.from_now,
+              args: {
+                user_ids: [user_2.id],
+                channel_id: channel_2.id,
+              },
+            ),
+          ).to eq(true)
+        end
+
+        it "logs a staff action" do
+          result
+
+          changes =
+            UserHistory
+              .where(custom_type: "chat_auto_remove_membership")
+              .all
+              .map { |uh| uh.slice(:details, :acting_user_id) }
+
+          expect(changes).to match_array(
+            [
+              {
+                details: "users_removed: 1\nchannel_id: #{channel_1.id}\nevent: category_updated",
+                acting_user_id: Discourse.system_user.id,
+              },
+              {
+                details: "users_removed: 1\nchannel_id: #{channel_2.id}\nevent: category_updated",
+                acting_user_id: Discourse.system_user.id,
+              },
+            ],
+          )
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/services/auto_remove/handle_chat_allowed_groups_change_spec.rb b/plugins/chat/spec/services/auto_remove/handle_chat_allowed_groups_change_spec.rb
new file mode 100644
index 00000000000..9b634f98a6d
--- /dev/null
+++ b/plugins/chat/spec/services/auto_remove/handle_chat_allowed_groups_change_spec.rb
@@ -0,0 +1,174 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::AutoRemove::HandleChatAllowedGroupsChange do
+  describe ".call" do
+    subject(:result) { described_class.call(params) }
+
+    let(:params) { { new_allowed_groups: new_allowed_groups } }
+    fab!(:user_1) { Fabricate(:user) }
+    fab!(:user_2) { Fabricate(:user) }
+    fab!(:admin_1) { Fabricate(:admin) }
+    fab!(:admin_2) { Fabricate(:admin) }
+
+    fab!(:dm_channel_1) { Fabricate(:direct_message_channel, users: [admin_1, user_1]) }
+    fab!(:dm_channel_2) { Fabricate(:direct_message_channel, users: [user_1, user_2]) }
+
+    fab!(:public_channel_1) { Fabricate(:chat_channel) }
+    fab!(:public_channel_2) { Fabricate(:chat_channel) }
+
+    context "when chat is not enabled" do
+      let(:new_allowed_groups) { "1|2" }
+
+      before { SiteSetting.chat_enabled = false }
+
+      it { is_expected.to fail_a_policy(:chat_enabled) }
+    end
+
+    context "when chat is enabled" do
+      before { SiteSetting.chat_enabled = true }
+
+      context "when new_allowed_groups is empty" do
+        let(:new_allowed_groups) { "" }
+
+        before do
+          public_channel_1.add(user_1)
+          public_channel_1.add(user_2)
+          public_channel_2.add(user_1)
+          public_channel_2.add(user_2)
+          public_channel_1.add(admin_1)
+          public_channel_1.add(admin_2)
+          freeze_time
+        end
+
+        it "sets the service result as successful" do
+          expect(result).to be_a_success
+        end
+
+        it "removes users from all public channels" do
+          expect { result }.to change {
+            Chat::UserChatChannelMembership.where(
+              user: [user_1, user_2],
+              chat_channel: [public_channel_1, public_channel_2],
+            ).count
+          }.to 0
+        end
+
+        it "does not remove admin users from public channels" do
+          expect { result }.not_to change {
+            Chat::UserChatChannelMembership.where(
+              user: [admin_1, admin_2],
+              chat_channel: [public_channel_1],
+            ).count
+          }
+        end
+
+        it "does not remove users from direct message channels" do
+          expect { result }.not_to change {
+            Chat::UserChatChannelMembership.where(chat_channel: [dm_channel_1, dm_channel_2]).count
+          }
+        end
+
+        it "enqueues a job to kick each batch of users from the channel" do
+          result
+          expect(
+            job_enqueued?(
+              job: Jobs::Chat::KickUsersFromChannel,
+              at: 5.seconds.from_now,
+              args: {
+                user_ids: [user_1.id, user_2.id],
+                channel_id: public_channel_1.id,
+              },
+            ),
+          ).to eq(true)
+          expect(
+            job_enqueued?(
+              job: Jobs::Chat::KickUsersFromChannel,
+              at: 5.seconds.from_now,
+              args: {
+                user_ids: [user_1.id, user_2.id],
+                channel_id: public_channel_2.id,
+              },
+            ),
+          ).to eq(true)
+        end
+
+        it "logs a staff action" do
+          result
+
+          changes =
+            UserHistory
+              .where(custom_type: "chat_auto_remove_membership")
+              .all
+              .map { |uh| uh.slice(:details, :acting_user_id) }
+
+          expect(changes).to match_array(
+            [
+              {
+                details:
+                  "users_removed: 2\nchannel_id: #{public_channel_1.id}\nevent: chat_allowed_groups_changed",
+                acting_user_id: Discourse.system_user.id,
+              },
+              {
+                details:
+                  "users_removed: 2\nchannel_id: #{public_channel_2.id}\nevent: chat_allowed_groups_changed",
+                acting_user_id: Discourse.system_user.id,
+              },
+            ],
+          )
+        end
+      end
+
+      context "when new_allowed_groups includes all the users in public channels" do
+        let(:new_allowed_groups) { Group::AUTO_GROUPS[:trust_level_1] }
+
+        before do
+          public_channel_1.add(user_1)
+          public_channel_2.add(user_1)
+          Group.refresh_automatic_groups!
+        end
+
+        it "does nothing" do
+          expect { result }.not_to change { Chat::UserChatChannelMembership.count }
+          expect(result).to fail_to_find_a_model(:users)
+        end
+      end
+
+      context "when new_allowed_groups includes everyone" do
+        let(:new_allowed_groups) { Group::AUTO_GROUPS[:everyone] }
+
+        it { is_expected.to fail_a_policy(:not_everyone_allowed) }
+
+        it "does nothing" do
+          expect { result }.not_to change { Chat::UserChatChannelMembership.count }
+        end
+      end
+
+      context "when some users are not in any of the new allowed groups" do
+        let(:new_allowed_groups) { Group::AUTO_GROUPS[:trust_level_4] }
+
+        before do
+          public_channel_1.add(user_1)
+          public_channel_1.add(user_2)
+          public_channel_2.add(user_1)
+          public_channel_2.add(user_2)
+          user_1.change_trust_level!(TrustLevel[2])
+          user_2.change_trust_level!(TrustLevel[4])
+        end
+
+        it "removes them from public channels" do
+          expect { result }.to change {
+            Chat::UserChatChannelMembership.where(
+              chat_channel: [public_channel_1, public_channel_2],
+            ).count
+          }.by(-2)
+        end
+
+        it "does not remove them from direct message channels" do
+          expect { result }.not_to change {
+            Chat::UserChatChannelMembership.where(chat_channel: [dm_channel_2]).count
+          }
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/services/auto_remove/handle_destroyed_group_spec.rb b/plugins/chat/spec/services/auto_remove/handle_destroyed_group_spec.rb
new file mode 100644
index 00000000000..6e920fab63c
--- /dev/null
+++ b/plugins/chat/spec/services/auto_remove/handle_destroyed_group_spec.rb
@@ -0,0 +1,260 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::AutoRemove::HandleDestroyedGroup do
+  describe ".call" do
+    subject(:result) { described_class.call(params) }
+
+    let(:params) { { destroyed_group_user_ids: [admin_1.id, admin_2.id, user_1.id, user_2.id] } }
+    fab!(:user_1) { Fabricate(:user) }
+    fab!(:user_2) { Fabricate(:user) }
+    fab!(:admin_1) { Fabricate(:admin) }
+    fab!(:admin_2) { Fabricate(:admin) }
+
+    fab!(:dm_channel_1) { Fabricate(:direct_message_channel, users: [admin_1, user_1]) }
+    fab!(:dm_channel_2) { Fabricate(:direct_message_channel, users: [user_1, user_2]) }
+
+    fab!(:channel_1) { Fabricate(:chat_channel) }
+    fab!(:channel_2) { Fabricate(:chat_channel) }
+
+    context "when chat is not enabled" do
+      before { SiteSetting.chat_enabled = false }
+
+      it { is_expected.to fail_a_policy(:chat_enabled) }
+    end
+
+    context "when chat is enabled" do
+      before { SiteSetting.chat_enabled = true }
+
+      context "if none of the group_user_ids users exist" do
+        before { User.where(id: params[:destroyed_group_user_ids]).destroy_all }
+
+        it "fails to find scoped_users model" do
+          expect(result).to fail_to_find_a_model(:scoped_users)
+        end
+      end
+
+      describe "step remove_users_outside_allowed_groups" do
+        context "when chat_allowed_groups is empty" do
+          before do
+            SiteSetting.chat_allowed_groups = ""
+            channel_1.add(user_1)
+            channel_1.add(user_2)
+            channel_2.add(user_1)
+            channel_2.add(user_2)
+            channel_1.add(admin_1)
+            channel_1.add(admin_2)
+          end
+
+          it "sets the service result as successful" do
+            expect(result).to be_a_success
+          end
+
+          it "removes the destroyed_group_user_ids from all public channels" do
+            expect { result }.to change {
+              Chat::UserChatChannelMembership.where(
+                user: [user_1, user_2],
+                chat_channel: [channel_1, channel_2],
+              ).count
+            }.to 0
+          end
+
+          it "does not remove admin users from public channels" do
+            expect { result }.not_to change {
+              Chat::UserChatChannelMembership.where(
+                user: [admin_1, admin_2],
+                chat_channel: [channel_1],
+              ).count
+            }
+          end
+
+          it "does not remove regular or admin users from direct message channels" do
+            expect { result }.not_to change {
+              Chat::UserChatChannelMembership.where(
+                chat_channel: [dm_channel_1, dm_channel_2],
+              ).count
+            }
+          end
+
+          it "enqueues a job to kick each batch of users from the channel" do
+            freeze_time
+            result
+            expect(
+              job_enqueued?(
+                job: Jobs::Chat::KickUsersFromChannel,
+                at: 5.seconds.from_now,
+                args: {
+                  user_ids: [user_1.id, user_2.id],
+                  channel_id: channel_1.id,
+                },
+              ),
+            ).to eq(true)
+            expect(
+              job_enqueued?(
+                job: Jobs::Chat::KickUsersFromChannel,
+                at: 5.seconds.from_now,
+                args: {
+                  user_ids: [user_1.id, user_2.id],
+                  channel_id: channel_2.id,
+                },
+              ),
+            ).to eq(true)
+          end
+
+          it "logs a staff action" do
+            result
+            actions = UserHistory.where(custom_type: "chat_auto_remove_membership")
+            expect(actions.count).to eq(2)
+            expect(
+              actions.exists?(
+                details: "users_removed: 2\nchannel_id: #{channel_2.id}\nevent: destroyed_group",
+                acting_user_id: Discourse.system_user.id,
+                custom_type: "chat_auto_remove_membership",
+              ),
+            ).to eq(true)
+            expect(
+              actions.exists?(
+                details: "users_removed: 2\nchannel_id: #{channel_1.id}\nevent: destroyed_group",
+                acting_user_id: Discourse.system_user.id,
+                custom_type: "chat_auto_remove_membership",
+              ),
+            ).to eq(true)
+          end
+        end
+
+        context "when chat_allowed_groups includes all the users in public channels" do
+          before do
+            SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:trust_level_1]
+            channel_1.add(user_1)
+            channel_1.add(user_2)
+            channel_2.add(user_1)
+            channel_2.add(user_2)
+            channel_1.add(admin_1)
+            channel_1.add(admin_2)
+            Group.refresh_automatic_groups!
+          end
+
+          it "sets the service result as successful" do
+            expect(result).to be_a_success
+          end
+
+          it "does not remove any memberships" do
+            expect { result }.not_to change { Chat::UserChatChannelMembership.count }
+          end
+        end
+
+        context "when chat_allowed_groups includes everyone" do
+          before do
+            SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:everyone]
+            channel_1.add(user_1)
+            channel_1.add(user_2)
+            channel_2.add(user_1)
+            channel_2.add(user_2)
+            channel_1.add(admin_1)
+            channel_1.add(admin_2)
+            Group.refresh_automatic_groups!
+          end
+
+          it { is_expected.to fail_a_policy(:not_everyone_allowed) }
+
+          it "does not remove any memberships" do
+            expect { result }.not_to change { Chat::UserChatChannelMembership.count }
+          end
+        end
+      end
+
+      describe "step remove_users_without_channel_permission" do
+        before do
+          channel_1.add(user_1)
+          channel_1.add(user_2)
+          channel_2.add(user_1)
+          channel_2.add(user_2)
+          channel_1.add(admin_1)
+          channel_1.add(admin_2)
+          Group.refresh_automatic_groups!
+        end
+
+        context "when channel category not read_restricted with no category_groups" do
+          before do
+            channel_1.chatable.update!(read_restricted: false)
+            channel_1.chatable.category_groups.destroy_all
+          end
+
+          it "does not remove any memberships" do
+            expect { result }.not_to change { Chat::UserChatChannelMembership.count }
+          end
+        end
+
+        context "when category channel not read_restricted with no full/create_post permission groups" do
+          before do
+            channel_1.chatable.update!(read_restricted: false)
+            CategoryGroup.create!(
+              category: channel_1.chatable,
+              group_id: Group::AUTO_GROUPS[:everyone],
+              permission_type: CategoryGroup.permission_types[:readonly],
+            )
+            CategoryGroup.create!(
+              category: channel_1.chatable,
+              group_id: Group::AUTO_GROUPS[:trust_level_1],
+              permission_type: CategoryGroup.permission_types[:readonly],
+            )
+          end
+
+          it "sets the service result as successful" do
+            expect(result).to be_a_success
+          end
+
+          it "removes the destroyed_group_user_ids from the channel" do
+            expect { result }.to change {
+              Chat::UserChatChannelMembership.where(
+                user: [user_1, user_2],
+                chat_channel: [channel_1],
+              ).count
+            }.to 0
+          end
+
+          it "does not remove any admin destroyed_group_user_ids from the channel" do
+            expect { result }.not_to change {
+              Chat::UserChatChannelMembership.where(
+                user: [admin_1, admin_2],
+                chat_channel: [channel_1],
+              ).count
+            }
+          end
+        end
+
+        context "when category channel not read_restricted with at least one full/create_post permission group" do
+          before do
+            channel_1.chatable.update!(read_restricted: false)
+            CategoryGroup.create!(
+              category: channel_1.chatable,
+              group_id: Group::AUTO_GROUPS[:everyone],
+              permission_type: CategoryGroup.permission_types[:readonly],
+            )
+            CategoryGroup.create!(
+              category: channel_1.chatable,
+              group_id: Group::AUTO_GROUPS[:trust_level_2],
+              permission_type: CategoryGroup.permission_types[:create_post],
+            )
+          end
+
+          context "when one of the users is not in any of the groups" do
+            before { user_2.change_trust_level!(TrustLevel[3]) }
+
+            it "sets the service result as successful" do
+              expect(result).to be_a_success
+            end
+
+            it "removes the destroyed_group_user_ids from the channel" do
+              expect { result }.to change {
+                Chat::UserChatChannelMembership.where(
+                  user: [user_1, user_2],
+                  chat_channel: [channel_1],
+                ).count
+              }.to 1
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/services/auto_remove/handle_user_removed_from_group_spec.rb b/plugins/chat/spec/services/auto_remove/handle_user_removed_from_group_spec.rb
new file mode 100644
index 00000000000..2c904bcf3d0
--- /dev/null
+++ b/plugins/chat/spec/services/auto_remove/handle_user_removed_from_group_spec.rb
@@ -0,0 +1,246 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::AutoRemove::HandleUserRemovedFromGroup do
+  describe ".call" do
+    subject(:result) { described_class.call(params) }
+
+    let(:params) { { user_id: removed_user.id } }
+    fab!(:removed_user) { Fabricate(:user) }
+    fab!(:user_1) { Fabricate(:user) }
+    fab!(:user_2) { Fabricate(:user) }
+
+    fab!(:dm_channel_1) { Fabricate(:direct_message_channel, users: [removed_user, user_1]) }
+    fab!(:dm_channel_2) { Fabricate(:direct_message_channel, users: [removed_user, user_2]) }
+
+    fab!(:public_channel_1) { Fabricate(:chat_channel) }
+    fab!(:public_channel_2) { Fabricate(:chat_channel) }
+
+    context "when chat is not enabled" do
+      before { SiteSetting.chat_enabled = false }
+
+      it { is_expected.to fail_a_policy(:chat_enabled) }
+    end
+
+    context "when chat is enabled" do
+      before { SiteSetting.chat_enabled = true }
+
+      context "if user is deleted" do
+        before { removed_user.destroy! }
+
+        it "fails to find the user model" do
+          expect(result).to fail_to_find_a_model(:user)
+        end
+      end
+
+      context "when the user is no longer in any of the chat_allowed_groups" do
+        before do
+          SiteSetting.chat_allowed_groups = Fabricate(:group).id
+          public_channel_1.add(removed_user)
+          public_channel_2.add(removed_user)
+        end
+
+        it "sets the service result as successful" do
+          expect(result).to be_a_success
+        end
+
+        it "removes them from public channels" do
+          expect { result }.to change {
+            Chat::UserChatChannelMembership.where(
+              user: [removed_user],
+              chat_channel: [public_channel_1, public_channel_2],
+            ).count
+          }.to 0
+        end
+
+        it "does not remove them from direct message channels" do
+          expect { result }.not_to change {
+            Chat::UserChatChannelMembership.where(
+              user: [removed_user],
+              chat_channel: [dm_channel_1, dm_channel_2],
+            ).count
+          }
+        end
+
+        it "enqueues a job to kick each batch of users from the channel" do
+          freeze_time
+          result
+          expect(
+            job_enqueued?(
+              job: Jobs::Chat::KickUsersFromChannel,
+              at: 5.seconds.from_now,
+              args: {
+                user_ids: [removed_user.id],
+                channel_id: public_channel_1.id,
+              },
+            ),
+          ).to eq(true)
+          expect(
+            job_enqueued?(
+              job: Jobs::Chat::KickUsersFromChannel,
+              at: 5.seconds.from_now,
+              args: {
+                user_ids: [removed_user.id],
+                channel_id: public_channel_2.id,
+              },
+            ),
+          ).to eq(true)
+        end
+
+        it "logs staff actions" do
+          result
+
+          expect(
+            UserHistory
+              .where(
+                acting_user_id: Discourse.system_user.id,
+                custom_type: "chat_auto_remove_membership",
+              )
+              .last(2)
+              .map(&:details),
+          ).to contain_exactly(
+            "users_removed: 1\nchannel_id: #{public_channel_1.id}\nevent: user_removed_from_group",
+            "users_removed: 1\nchannel_id: #{public_channel_2.id}\nevent: user_removed_from_group",
+          )
+        end
+
+        context "when the user is staff" do
+          fab!(:removed_user) { Fabricate(:admin) }
+
+          it { is_expected.to fail_a_policy(:user_not_staff) }
+
+          it "does not remove them from public channels" do
+            expect { result }.not_to change {
+              Chat::UserChatChannelMembership.where(
+                user: [removed_user],
+                chat_channel: [public_channel_1, public_channel_2],
+              ).count
+            }
+          end
+        end
+
+        context "when the only chat_allowed_group is everyone" do
+          before { SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:everyone] }
+
+          it { is_expected.to fail_a_policy(:not_everyone_allowed) }
+
+          it "does not remove them from public channels" do
+            expect { result }.not_to change {
+              Chat::UserChatChannelMembership.where(
+                user: [removed_user],
+                chat_channel: [public_channel_1, public_channel_2],
+              ).count
+            }
+          end
+        end
+      end
+
+      context "for private channels" do
+        fab!(:group_1) { Fabricate(:group) }
+        fab!(:group_2) { Fabricate(:group) }
+        fab!(:private_category) { Fabricate(:private_category, group: group_1) }
+        fab!(:private_channel_1) { Fabricate(:chat_channel, chatable: private_category) }
+
+        before do
+          group_1.add(removed_user)
+          group_2.add(removed_user)
+          SiteSetting.chat_allowed_groups = group_1.id.to_s + "|" + group_2.id.to_s
+          CategoryGroup.create(
+            category: private_category,
+            group: group_2,
+            permission_type: CategoryGroup.permission_types[:full],
+          )
+          private_channel_1.add(removed_user)
+        end
+
+        context "when the user remains in one of the groups that can access a private channel" do
+          before { group_1.remove(removed_user) }
+
+          it "sets the service result as successful" do
+            expect(result).to be_a_success
+          end
+
+          it "does not remove them from that channel" do
+            expect { result }.not_to change {
+              Chat::UserChatChannelMembership.where(
+                user: [removed_user],
+                chat_channel: [private_channel_1],
+              ).count
+            }
+          end
+        end
+
+        context "when the user in remains in one of the groups but that group only has readonly access to the channel" do
+          before do
+            CategoryGroup.find_by(group: group_2, category: private_category).update!(
+              permission_type: CategoryGroup.permission_types[:readonly],
+            )
+            group_1.remove(removed_user)
+          end
+
+          it "sets the service result as successful" do
+            expect(result).to be_a_success
+          end
+
+          it "removes them from that channel" do
+            expect { result }.to change {
+              Chat::UserChatChannelMembership.where(
+                user: [removed_user],
+                chat_channel: [private_channel_1],
+              ).count
+            }.to 0
+          end
+
+          context "when the user is staff" do
+            fab!(:removed_user) { Fabricate(:admin) }
+
+            it { is_expected.to fail_a_policy(:user_not_staff) }
+
+            it "does not remove them from that channel" do
+              expect { result }.not_to change {
+                Chat::UserChatChannelMembership.where(
+                  user: [removed_user],
+                  chat_channel: [private_channel_1],
+                ).count
+              }
+            end
+          end
+        end
+
+        context "when the user is no longer in any group that can access a private channel" do
+          before do
+            group_1.remove(removed_user)
+            group_2.remove(removed_user)
+          end
+
+          it "sets the service result as successful" do
+            expect(result).to be_a_success
+          end
+
+          it "removes them from that channel" do
+            expect { result }.to change {
+              Chat::UserChatChannelMembership.where(
+                user: [removed_user],
+                chat_channel: [private_channel_1],
+              ).count
+            }.to 0
+          end
+
+          context "when the user is staff" do
+            fab!(:removed_user) { Fabricate(:admin) }
+
+            it { is_expected.to fail_a_policy(:user_not_staff) }
+
+            it "does not remove them from that channel" do
+              expect { result }.not_to change {
+                Chat::UserChatChannelMembership.where(
+                  user: [removed_user],
+                  chat_channel: [private_channel_1],
+                ).count
+              }
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/services/chat/auto_join_channel_batch_spec.rb b/plugins/chat/spec/services/chat/auto_join_channel_batch_spec.rb
new file mode 100644
index 00000000000..69a42cdef46
--- /dev/null
+++ b/plugins/chat/spec/services/chat/auto_join_channel_batch_spec.rb
@@ -0,0 +1,130 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+describe Chat::AutoJoinChannelBatch do
+  describe Chat::AutoJoinChannelBatch::Contract, type: :model do
+    subject(:contract) { described_class.new(start_user_id: 10) }
+
+    it { is_expected.to validate_presence_of(:channel_id) }
+    it { is_expected.to validate_presence_of(:start_user_id) }
+    it { is_expected.to validate_presence_of(:end_user_id) }
+    it do
+      is_expected.to validate_comparison_of(:end_user_id).is_greater_than_or_equal_to(
+        :start_user_id,
+      )
+    end
+
+    describe "Backward compatibility" do
+      subject(:contract) { described_class.new(args) }
+
+      before { contract.valid? }
+
+      context "when providing 'chat_channel_id'" do
+        let(:args) { { chat_channel_id: 2 } }
+
+        it "sets 'channel_id'" do
+          expect(contract.channel_id).to eq(2)
+        end
+      end
+
+      context "when providing 'starts_at'" do
+        let(:args) { { starts_at: 5 } }
+
+        it "sets 'start_user_id'" do
+          expect(contract.start_user_id).to eq(5)
+        end
+      end
+
+      context "when providing 'ends_at'" do
+        let(:args) { { ends_at: 8 } }
+
+        it "sets 'end_user_id'" do
+          expect(contract.end_user_id).to eq(8)
+        end
+      end
+    end
+  end
+
+  describe ".call" do
+    subject(:result) { described_class.call(params) }
+
+    fab!(:channel) { Fabricate(:chat_channel, auto_join_users: true) }
+
+    let(:channel_id) { channel.id }
+    let(:start_user_id) { 0 }
+    let(:end_user_id) { 10 }
+    let(:params) do
+      { channel_id: channel_id, start_user_id: start_user_id, end_user_id: end_user_id }
+    end
+
+    context "when arguments are invalid" do
+      let(:channel_id) { nil }
+
+      it { is_expected.to fail_a_contract }
+    end
+
+    context "when arguments are valid" do
+      context "when channel does not exist" do
+        let(:channel_id) { -1 }
+
+        it { is_expected.to fail_to_find_a_model(:channel) }
+      end
+
+      context "when channel is not a category channel" do
+        fab!(:channel) { Fabricate(:direct_message_channel, auto_join_users: true) }
+
+        it { is_expected.to fail_to_find_a_model(:channel) }
+      end
+
+      context "when channel is not in auto_join_users mode" do
+        before { channel.update!(auto_join_users: false) }
+
+        it { is_expected.to fail_to_find_a_model(:channel) }
+      end
+
+      context "when channel is found" do
+        fab!(:users) { Fabricate.times(2, :user) }
+
+        let(:manager) { mock.responds_like_instance_of(Chat::ChannelMembershipManager) }
+
+        before do
+          Chat::Action::CreateMembershipsForAutoJoin
+            .stubs(:call)
+            .with(has_entries(channel: channel, contract: instance_of(described_class::Contract)))
+            .returns(user_ids)
+          Chat::ChannelMembershipManager.stubs(:new).with(channel).returns(manager)
+          manager.stubs(:recalculate_user_count)
+        end
+
+        context "when more than one membership is created" do
+          let(:user_ids) { users.map(&:id) }
+
+          it "does not recalculate user count" do
+            manager.expects(:recalculate_user_count).never
+            result
+          end
+
+          it "publishes an event" do
+            Chat::Publisher.expects(:publish_new_channel).with(channel, users)
+            result
+          end
+        end
+
+        context "when only one membership is created" do
+          let(:user_ids) { [users.first.id] }
+
+          it "recalculates user count" do
+            manager.expects(:recalculate_user_count)
+            result
+          end
+
+          it "publishes an event" do
+            Chat::Publisher.expects(:publish_new_channel).with(channel, [users.first])
+            result
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/services/chat/create_category_channel_spec.rb b/plugins/chat/spec/services/chat/create_category_channel_spec.rb
new file mode 100644
index 00000000000..ef4742a9c70
--- /dev/null
+++ b/plugins/chat/spec/services/chat/create_category_channel_spec.rb
@@ -0,0 +1,130 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::CreateCategoryChannel do
+  describe Chat::CreateCategoryChannel::Contract, type: :model do
+    it { is_expected.to validate_presence_of :category_id }
+    it { is_expected.to validate_length_of(:name).is_at_most(SiteSetting.max_topic_title_length) }
+  end
+
+  describe ".call" do
+    subject(:result) { described_class.call(params) }
+
+    fab!(:current_user) { Fabricate(:admin) }
+    fab!(:category) { Fabricate(:category) }
+    let(:category_id) { category.id }
+
+    let(:guardian) { Guardian.new(current_user) }
+    let(:params) { { guardian: guardian, category_id: category_id, name: "cool channel" } }
+
+    context "when public channels are disabled" do
+      fab!(:current_user) { Fabricate(:user) }
+
+      before { SiteSetting.enable_public_channels = false }
+
+      it { is_expected.to fail_a_policy(:public_channels_enabled) }
+    end
+
+    context "when the current user cannot make a channel" do
+      fab!(:current_user) { Fabricate(:user) }
+
+      it { is_expected.to fail_a_policy(:can_create_channel) }
+    end
+
+    context "when the current user can make a channel" do
+      context "when there is already a channel for the category with the same name" do
+        fab!(:old_channel) { Fabricate(:chat_channel, chatable: category, name: "old channel") }
+        let(:params) { { guardian: guardian, category_id: category_id, name: "old channel" } }
+
+        it { is_expected.to fail_a_policy(:category_channel_does_not_exist) }
+      end
+
+      context "when the category does not exist" do
+        before { category.destroy! }
+
+        it { is_expected.to fail_to_find_a_model(:category) }
+      end
+
+      context "when all steps pass" do
+        it "creates the channel" do
+          expect { result }.to change { Chat::Channel.count }.by(1)
+          expect(result.channel).to have_attributes(
+            chatable: category,
+            name: "cool channel",
+            slug: "cool-channel",
+          )
+        end
+
+        it "creates a membership for the user" do
+          expect { result }.to change { Chat::UserChatChannelMembership.count }.by(1)
+          expect(result.membership).to have_attributes(
+            user: current_user,
+            chat_channel: result.channel,
+            following: true,
+          )
+        end
+
+        it "does not enforce automatic memberships" do
+          Chat::ChannelMembershipManager
+            .any_instance
+            .expects(:enforce_automatic_channel_memberships)
+            .never
+          result
+        end
+
+        context "when the slug is already in use" do
+          fab!(:channel) { Fabricate(:chat_channel, chatable: category, slug: "in-use") }
+          let(:params) { { guardian: guardian, category_id: category_id, slug: "in-use" } }
+
+          it { is_expected.to fail_with_an_invalid_model(:channel) }
+        end
+
+        context "if auto_join_users is blank" do
+          let(:params) { { guardian: guardian, category_id: category_id, auto_join_users: "" } }
+
+          it "defaults to false" do
+            Chat::ChannelMembershipManager
+              .any_instance
+              .expects(:enforce_automatic_channel_memberships)
+              .never
+            result
+          end
+        end
+
+        context "if auto_join_users is true" do
+          let(:params) { { guardian: guardian, category_id: category_id, auto_join_users: "true" } }
+
+          it "enforces automatic memberships" do
+            Chat::ChannelMembershipManager
+              .any_instance
+              .expects(:enforce_automatic_channel_memberships)
+              .once
+            result
+          end
+        end
+
+        describe "threading_enabled" do
+          context "when true" do
+            it "sets threading_enabled to true" do
+              params[:threading_enabled] = true
+              expect(result.channel.threading_enabled).to eq(true)
+            end
+          end
+
+          context "when blank" do
+            it "sets threading_enabled to false" do
+              params[:threading_enabled] = nil
+              expect(result.channel.threading_enabled).to eq(false)
+            end
+          end
+
+          context "when false" do
+            it "sets threading_enabled to false" do
+              params[:threading_enabled] = false
+              expect(result.channel.threading_enabled).to eq(false)
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/services/chat/create_direct_message_channel_spec.rb b/plugins/chat/spec/services/chat/create_direct_message_channel_spec.rb
new file mode 100644
index 00000000000..e90ec4c7e5f
--- /dev/null
+++ b/plugins/chat/spec/services/chat/create_direct_message_channel_spec.rb
@@ -0,0 +1,144 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::CreateDirectMessageChannel do
+  describe Chat::CreateDirectMessageChannel::Contract, type: :model do
+    subject(:contract) { described_class.new(params) }
+
+    let(:params) { { target_usernames: %w[lechuck elaine] } }
+
+    it { is_expected.to validate_presence_of :target_usernames }
+
+    context "when the target_usernames argument is a string" do
+      let(:params) { { target_usernames: "lechuck,elaine" } }
+
+      it "splits it into an array" do
+        contract.validate
+        expect(contract.target_usernames).to eq(%w[lechuck elaine])
+      end
+    end
+  end
+
+  describe ".call" do
+    subject(:result) { described_class.call(params) }
+
+    fab!(:current_user) { Fabricate(:user, username: "guybrush") }
+    fab!(:user_1) { Fabricate(:user, username: "lechuck") }
+    fab!(:user_2) { Fabricate(:user, username: "elaine") }
+
+    let(:guardian) { Guardian.new(current_user) }
+    let(:params) { { guardian: guardian, target_usernames: %w[lechuck elaine] } }
+
+    before { Group.refresh_automatic_groups! }
+
+    context "when all steps pass" do
+      it "sets the service result as successful" do
+        expect(result).to be_a_success
+      end
+
+      it "creates the channel" do
+        expect { result }.to change { Chat::Channel.count }
+        expect(result.channel.chatable).to have_attributes(
+          user_ids: match_array([current_user.id, user_1.id, user_2.id]),
+        )
+      end
+
+      it "makes all target users a member of the channel and updates all users to following" do
+        expect { result }.to change { Chat::UserChatChannelMembership.count }.by(3)
+        expect(result.channel.user_chat_channel_memberships.pluck(:user_id)).to match_array(
+          [current_user.id, user_1.id, user_2.id],
+        )
+        result.channel.user_chat_channel_memberships.each do |membership|
+          expect(membership).to have_attributes(
+            following: false,
+            muted: false,
+            desktop_notification_level: "always",
+            mobile_notification_level: "always",
+          )
+        end
+      end
+
+      context "when there is an existing direct message channel for the target users" do
+        before { described_class.call(params) }
+
+        it "does not create a channel" do
+          expect { result }.to not_change { Chat::Channel.count }.and not_change {
+                  Chat::DirectMessage.count
+                }
+        end
+
+        it "does not double-insert the channel memberships" do
+          expect { result }.not_to change { Chat::UserChatChannelMembership.count }
+        end
+      end
+    end
+
+    context "when the current user cannot make direct messages" do
+      fab!(:current_user) { Fabricate(:user) }
+
+      before { SiteSetting.direct_message_enabled_groups = Fabricate(:group).id }
+
+      it { is_expected.to fail_a_policy(:can_create_direct_message) }
+    end
+
+    context "when the number of target users exceeds chat_max_direct_message_users" do
+      before { SiteSetting.chat_max_direct_message_users = 1 }
+
+      it { is_expected.to fail_a_policy(:satisfies_dms_max_users_limit) }
+
+      context "when the user is staff" do
+        fab!(:current_user) { Fabricate(:admin) }
+
+        it { is_expected.not_to fail_a_policy(:satisfies_dms_max_users_limit) }
+      end
+    end
+
+    context "when the actor is not allowing anyone to message them" do
+      before { current_user.user_option.update!(allow_private_messages: false) }
+
+      it { is_expected.to fail_a_policy(:actor_allows_dms) }
+    end
+
+    context "when one of the target users is ignoring the current user" do
+      before do
+        IgnoredUser.create!(user: user_1, ignored_user: current_user, expiring_at: 1.day.from_now)
+      end
+
+      it { is_expected.to fail_a_policy(:targets_allow_dms_from_user) }
+    end
+
+    context "when one of the target users is muting the current user" do
+      before { MutedUser.create!(user: user_1, muted_user: current_user) }
+
+      it { is_expected.to fail_a_policy(:targets_allow_dms_from_user) }
+    end
+
+    context "when one of the target users is disallowing messages" do
+      before { user_1.user_option.update!(allow_private_messages: false) }
+
+      it { is_expected.to fail_a_policy(:targets_allow_dms_from_user) }
+    end
+
+    context "when the current user is allowing messages from all but one of the target users" do
+      before do
+        current_user.user_option.update!(enable_allowed_pm_users: true)
+        AllowedPmUser.create!(user: current_user, allowed_pm_user: user_2)
+      end
+
+      it { is_expected.to fail_a_policy(:targets_allow_dms_from_user) }
+    end
+
+    context "when the current user is ignoring one of the target users" do
+      before do
+        IgnoredUser.create!(user: current_user, ignored_user: user_1, expiring_at: 1.day.from_now)
+      end
+
+      it { is_expected.to fail_a_policy(:targets_allow_dms_from_user) }
+    end
+
+    context "when the current user is muting one of the target users" do
+      before { MutedUser.create!(user: current_user, muted_user: user_1) }
+
+      it { is_expected.to fail_a_policy(:targets_allow_dms_from_user) }
+    end
+  end
+end
diff --git a/plugins/chat/spec/services/chat/list_channel_messages_spec.rb b/plugins/chat/spec/services/chat/list_channel_messages_spec.rb
new file mode 100644
index 00000000000..b3a1fa312e6
--- /dev/null
+++ b/plugins/chat/spec/services/chat/list_channel_messages_spec.rb
@@ -0,0 +1,193 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::ListChannelMessages do
+  subject(:result) { described_class.call(params) }
+
+  fab!(:user) { Fabricate(:user) }
+  fab!(:channel) { Fabricate(:chat_channel) }
+
+  let(:guardian) { Guardian.new(user) }
+  let(:channel_id) { channel.id }
+  let(:optional_params) { {} }
+  let(:params) { { guardian: guardian, channel_id: channel_id }.merge(optional_params) }
+
+  before { channel.add(user) }
+
+  context "when contract" do
+    context "when channel_id is not present" do
+      let(:channel_id) { nil }
+
+      it { is_expected.to fail_a_contract }
+    end
+  end
+
+  context "when fetch_channel" do
+    context "when channel doesn’t exist" do
+      let(:channel_id) { -1 }
+
+      it { is_expected.to fail_to_find_a_model(:channel) }
+    end
+
+    context "when channel exists" do
+      it "finds the correct channel" do
+        expect(result.channel).to eq(channel)
+      end
+    end
+  end
+
+  context "when fetch_eventual_membership" do
+    context "when user has membership" do
+      it "finds the correct membership" do
+        expect(result.membership).to eq(channel.membership_for(user))
+      end
+    end
+
+    context "when user has no membership" do
+      before { channel.membership_for(user).destroy! }
+
+      it "finds no membership" do
+        expect(result.membership).to be_blank
+      end
+    end
+  end
+
+  context "when enabled_threads?" do
+    context "when channel threading is disabled" do
+      before { channel.update!(threading_enabled: false) }
+
+      it "marks threads as disabled" do
+        expect(result.enabled_threads).to eq(false)
+      end
+    end
+
+    context "when channel and site setting are enabling threading" do
+      before { channel.update!(threading_enabled: true) }
+
+      it "marks threads as enabled" do
+        expect(result.enabled_threads).to eq(true)
+      end
+    end
+  end
+
+  context "when determine_target_message_id" do
+    context "when fetch_from_last_read is true" do
+      let(:optional_params) { { fetch_from_last_read: true } }
+
+      before do
+        channel.add(user)
+        channel.membership_for(user).update!(last_read_message_id: 1)
+      end
+
+      it "sets target_message_id to last_read_message_id" do
+        expect(result.target_message_id).to eq(1)
+      end
+    end
+  end
+
+  context "when target_message_exists" do
+    context "when no target_message_id is given" do
+      it { is_expected.to be_a_success }
+    end
+
+    context "when target message is not found" do
+      let(:optional_params) { { target_message_id: -1 } }
+
+      it { is_expected.to fail_a_policy(:target_message_exists) }
+    end
+
+    context "when target message is found" do
+      fab!(:target_message) { Fabricate(:chat_message, chat_channel: channel) }
+      let(:optional_params) { { target_message_id: target_message.id } }
+
+      it { is_expected.to be_a_success }
+    end
+
+    context "when target message is trashed" do
+      fab!(:target_message) { Fabricate(:chat_message, chat_channel: channel) }
+      let(:optional_params) { { target_message_id: target_message.id } }
+
+      before { target_message.trash! }
+
+      context "when user is regular" do
+        it { is_expected.to fail_a_policy(:target_message_exists) }
+      end
+
+      context "when user is the message creator" do
+        fab!(:target_message) { Fabricate(:chat_message, chat_channel: channel, user: user) }
+
+        it { is_expected.to be_a_success }
+      end
+
+      context "when user is admin" do
+        fab!(:user) { Fabricate(:admin) }
+
+        it { is_expected.to be_a_success }
+      end
+    end
+  end
+
+  context "when fetch_messages" do
+    context "with no params" do
+      fab!(:messages) { Fabricate.times(20, :chat_message, chat_channel: channel) }
+
+      it "returns messages" do
+        expect(result.can_load_more_past).to eq(false)
+        expect(result.can_load_more_future).to eq(false)
+        expect(result.messages).to contain_exactly(*messages)
+      end
+    end
+
+    context "when target_date is provided" do
+      fab!(:past_message) do
+        Fabricate(:chat_message, chat_channel: channel, created_at: 3.days.ago)
+      end
+      fab!(:future_message) do
+        Fabricate(:chat_message, chat_channel: channel, created_at: 1.days.ago)
+      end
+
+      let(:optional_params) { { target_date: 2.days.ago } }
+
+      it "includes past and future messages" do
+        expect(result.messages).to eq([past_message, future_message])
+      end
+    end
+  end
+
+  context "when fetch_tracking" do
+    context "when threads are disabled" do
+      fab!(:thread_1) { Fabricate(:chat_thread, channel: channel) }
+
+      before { channel.update!(threading_enabled: false) }
+
+      it "returns empty tracking" do
+        expect(result.tracking).to eq({})
+      end
+    end
+
+    context "when threads are enabled" do
+      fab!(:thread_1) { Fabricate(:chat_thread, channel: channel) }
+
+      before do
+        channel.update!(threading_enabled: true)
+        thread_1.add(user)
+      end
+
+      it "returns tracking" do
+        Fabricate(:chat_message, chat_channel: channel, thread: thread_1)
+
+        expect(result.tracking.channel_tracking).to eq({})
+        expect(result.tracking.thread_tracking).to eq(
+          { thread_1.id => { channel_id: channel.id, mention_count: 0, unread_count: 1 } },
+        )
+      end
+    end
+  end
+
+  context "when update_membership_last_viewed_at" do
+    it "updates the last viewed at" do
+      expect { result }.to change { channel.membership_for(user).last_viewed_at }.to be_within(
+        1.second,
+      ).of(Time.zone.now)
+    end
+  end
+end
diff --git a/plugins/chat/spec/services/chat/list_channel_thread_messages_spec.rb b/plugins/chat/spec/services/chat/list_channel_thread_messages_spec.rb
new file mode 100644
index 00000000000..d032e2f5024
--- /dev/null
+++ b/plugins/chat/spec/services/chat/list_channel_thread_messages_spec.rb
@@ -0,0 +1,168 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::ListChannelThreadMessages do
+  subject(:result) { described_class.call(params) }
+
+  fab!(:user) { Fabricate(:user) }
+  fab!(:thread) do
+    Fabricate(:chat_thread, channel: Fabricate(:chat_channel, threading_enabled: true))
+  end
+
+  let(:guardian) { Guardian.new(user) }
+  let(:thread_id) { thread.id }
+  let(:optional_params) { {} }
+  let(:params) { { guardian: guardian, thread_id: thread_id }.merge(optional_params) }
+
+  before { thread.channel.add(user) }
+
+  context "when contract" do
+    context "when thread_id is not present" do
+      let(:thread_id) { nil }
+
+      it { is_expected.to fail_a_contract }
+    end
+  end
+
+  context "when fetch_thread" do
+    context "when thread doesn’t exist" do
+      let(:thread_id) { -1 }
+
+      it { is_expected.to fail_to_find_a_model(:thread) }
+    end
+
+    context "when thread exists" do
+      it "finds the correct channel" do
+        expect(result.thread).to eq(thread)
+      end
+    end
+  end
+
+  context "when ensure_thread_enabled?" do
+    context "when channel threading is disabled" do
+      before { thread.channel.update!(threading_enabled: false) }
+
+      it { is_expected.to fail_a_policy(:ensure_thread_enabled) }
+    end
+
+    context "when channel and site setting are enabling threading" do
+      before { thread.channel.update!(threading_enabled: true) }
+
+      it { is_expected.to be_a_success }
+    end
+  end
+
+  context "when can_view_thread" do
+    context "when channel is private" do
+      fab!(:thread) do
+        Fabricate(
+          :chat_thread,
+          channel: Fabricate(:private_category_channel, threading_enabled: true),
+        )
+      end
+
+      it { is_expected.to fail_a_policy(:can_view_thread) }
+    end
+  end
+
+  context "when determine_target_message_id" do
+    context "when fetch_from_last_read is true" do
+      let(:optional_params) { { fetch_from_last_read: true } }
+
+      before do
+        thread.add(user)
+        thread.membership_for(guardian.user).update!(last_read_message_id: 1)
+      end
+
+      it "sets target_message_id to last_read_message_id" do
+        expect(result.target_message_id).to eq(1)
+      end
+    end
+  end
+
+  context "when target_message_exists" do
+    context "when no target_message_id is given" do
+      it { is_expected.to be_a_success }
+    end
+
+    context "when target message is not found" do
+      let(:optional_params) { { target_message_id: -1 } }
+
+      it { is_expected.to fail_a_policy(:target_message_exists) }
+    end
+
+    context "when target message is found" do
+      fab!(:target_message) do
+        Fabricate(:chat_message, chat_channel: thread.channel, thread: thread)
+      end
+      let(:optional_params) { { target_message_id: target_message.id } }
+
+      it { is_expected.to be_a_success }
+    end
+
+    context "when target message is trashed" do
+      fab!(:target_message) do
+        Fabricate(:chat_message, chat_channel: thread.channel, thread: thread)
+      end
+      let(:optional_params) { { target_message_id: target_message.id } }
+
+      before { target_message.trash! }
+
+      context "when user is regular" do
+        it { is_expected.to fail_a_policy(:target_message_exists) }
+      end
+
+      context "when user is the message creator" do
+        fab!(:target_message) do
+          Fabricate(:chat_message, chat_channel: thread.channel, thread: thread, user: user)
+        end
+
+        it { is_expected.to be_a_success }
+      end
+
+      context "when user is admin" do
+        fab!(:user) { Fabricate(:admin) }
+
+        it { is_expected.to be_a_success }
+      end
+    end
+  end
+
+  context "when fetch_messages" do
+    context "with not params" do
+      fab!(:messages) do
+        Fabricate.times(20, :chat_message, chat_channel: thread.channel, thread: thread)
+      end
+
+      it "returns messages" do
+        expect(result.can_load_more_past).to eq(false)
+        expect(result.can_load_more_future).to eq(false)
+        expect(result.messages).to contain_exactly(thread.original_message, *messages)
+      end
+    end
+
+    context "when target_date is provided" do
+      fab!(:past_message) do
+        Fabricate(
+          :chat_message,
+          chat_channel: thread.channel,
+          thread: thread,
+          created_at: 1.days.from_now,
+        )
+      end
+      fab!(:future_message) do
+        Fabricate(
+          :chat_message,
+          chat_channel: thread.channel,
+          thread: thread,
+          created_at: 3.days.from_now,
+        )
+      end
+
+      let(:optional_params) { { target_date: 2.days.ago } }
+
+      it "includes past and future messages" do
+        expect(result.messages).to eq([thread.original_message, past_message, future_message])
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/services/chat/lookup_channel_threads_spec.rb b/plugins/chat/spec/services/chat/lookup_channel_threads_spec.rb
new file mode 100644
index 00000000000..1727a8adc4a
--- /dev/null
+++ b/plugins/chat/spec/services/chat/lookup_channel_threads_spec.rb
@@ -0,0 +1,269 @@
+# frozen_string_literal: true
+
+RSpec.describe ::Chat::LookupChannelThreads::Contract, type: :model do
+  it { is_expected.to validate_presence_of :channel_id }
+end
+
+RSpec.describe ::Chat::LookupChannelThreads do
+  subject(:result) { described_class.call(params) }
+
+  fab!(:current_user) { Fabricate(:user) }
+
+  let(:guardian) { Guardian.new(current_user) }
+  let(:channel_id) { nil }
+  let(:limit) { 10 }
+  let(:offset) { 0 }
+  let(:params) { { guardian: guardian, channel_id: channel_id, limit: limit, offset: offset } }
+
+  describe "step - set_limit" do
+    fab!(:channel_1) { Fabricate(:chat_channel) }
+    let(:channel_id) { channel_1.id }
+
+    context "when limit is not set" do
+      let(:limit) { nil }
+
+      it "defaults to a max value" do
+        expect(result.limit).to eq(described_class::THREADS_LIMIT)
+      end
+    end
+
+    context "when limit is over max" do
+      let(:limit) { described_class::THREADS_LIMIT + 1 }
+
+      it "defaults to a max value" do
+        expect(result.limit).to eq(described_class::THREADS_LIMIT)
+      end
+    end
+
+    context "when limit is under min" do
+      let(:limit) { 0 }
+
+      it "defaults to a max value" do
+        expect(result.limit).to eq(1)
+      end
+    end
+  end
+
+  describe "step - set_offset" do
+    fab!(:channel_1) { Fabricate(:chat_channel) }
+    let(:channel_id) { channel_1.id }
+
+    context "when offset is not set" do
+      let(:offset) { nil }
+
+      it "defaults to zero" do
+        expect(result.offset).to eq(0)
+      end
+    end
+
+    context "when offset is under min" do
+      let(:offset) { -99 }
+
+      it "defaults to a min value" do
+        expect(result.offset).to eq(0)
+      end
+    end
+  end
+
+  describe "model - channel" do
+    context "when channel doesn’t exist" do
+      let(:channel_id) { -999 }
+
+      it { is_expected.to fail_to_find_a_model(:channel) }
+    end
+  end
+
+  describe "policy - threading_enabled_for_channel" do
+    context "when channel threading is disabled" do
+      fab!(:channel_1) { Fabricate(:chat_channel, threading_enabled: false) }
+      let(:channel_id) { channel_1.id }
+
+      it { is_expected.to fail_a_policy(:threading_enabled_for_channel) }
+    end
+  end
+
+  describe "policy - can_view_channel" do
+    context "when channel threading is disabled" do
+      fab!(:channel_1) { Fabricate(:private_category_channel, threading_enabled: true) }
+      let(:channel_id) { channel_1.id }
+
+      it { is_expected.to fail_a_policy(:can_view_channel) }
+    end
+  end
+
+  context "when channel has no threads" do
+    fab!(:channel_1) { Fabricate(:chat_channel, threading_enabled: true) }
+    let(:channel_id) { channel_1.id }
+
+    describe "model - threads" do
+      it "returns an empty list of threads" do
+        expect(result.threads).to eq([])
+      end
+    end
+  end
+
+  context "when channel has threads" do
+    fab!(:channel_1) { Fabricate(:chat_channel, threading_enabled: true) }
+    fab!(:thread_1) { Fabricate(:chat_thread, channel: channel_1) }
+    fab!(:thread_2) { Fabricate(:chat_thread, channel: channel_1) }
+    fab!(:thread_3) { Fabricate(:chat_thread, channel: channel_1) }
+
+    let(:channel_id) { channel_1.id }
+
+    before do
+      [thread_1, thread_2, thread_3].each.with_index do |t, index|
+        t.original_message.update!(created_at: (index + 1).weeks.ago)
+        t.add(current_user)
+      end
+    end
+
+    describe "model - threads" do
+      it { is_expected.to be_a_success }
+
+      it "orders threads by the last reply created_at timestamp" do
+        [
+          [thread_1, 10.minutes.ago],
+          [thread_2, 1.day.ago],
+          [thread_3, 2.seconds.ago],
+        ].each do |thread, created_at|
+          Fabricate(
+            :chat_message,
+            user: current_user,
+            chat_channel: channel_1,
+            thread: thread,
+            created_at: created_at,
+          )
+        end
+
+        expect(result.threads.map(&:id)).to eq([thread_3.id, thread_1.id, thread_2.id])
+      end
+
+      it "sorts by unread over recency" do
+        unread_message = Fabricate(:chat_message, chat_channel: channel_1, thread: thread_2)
+        unread_message.update!(created_at: 2.days.ago)
+
+        expect(result.threads.map(&:id)).to eq([thread_2.id, thread_1.id, thread_3.id])
+      end
+
+      describe "when there are more threads than the limit" do
+        let(:limit) { 5 }
+
+        it "sorts very old unreads to top over recency, and sorts both unreads and other threads by recency" do
+          thread_4 = Fabricate(:chat_thread, channel: channel_1)
+          thread_5 = Fabricate(:chat_thread, channel: channel_1)
+          thread_6 = Fabricate(:chat_thread, channel: channel_1)
+          thread_7 = Fabricate(:chat_thread, channel: channel_1)
+
+          [thread_4, thread_5, thread_6, thread_7].each do |t|
+            t.add(current_user)
+            t.mark_read_for_user!(current_user)
+          end
+          [thread_1, thread_2, thread_3].each { |t| t.mark_read_for_user!(current_user) }
+
+          # The old unread messages.
+          Fabricate(:chat_message, chat_channel: channel_1, thread: thread_7).update!(
+            created_at: 2.months.ago,
+          )
+          Fabricate(:chat_message, chat_channel: channel_1, thread: thread_6).update!(
+            created_at: 3.months.ago,
+          )
+
+          expect(result.threads.map(&:id)).to eq(
+            [thread_7.id, thread_6.id, thread_5.id, thread_4.id, thread_1.id],
+          )
+        end
+      end
+
+      it "does not return threads where the original message is trashed" do
+        thread_1.original_message.trash!
+
+        expect(result.threads.map(&:id)).to eq([thread_2.id, thread_3.id])
+      end
+
+      it "does not return threads where the original message is deleted" do
+        thread_1.original_message.destroy
+
+        expect(result.threads.map(&:id)).to eq([thread_2.id, thread_3.id])
+      end
+
+      it "does not return threads from another channel" do
+        thread_4 = Fabricate(:chat_thread)
+        Fabricate(
+          :chat_message,
+          user: current_user,
+          thread: thread_4,
+          chat_channel: thread_4.channel,
+          created_at: 2.seconds.ago,
+        )
+
+        expect(result.threads.map(&:id)).to eq([thread_1.id, thread_2.id, thread_3.id])
+      end
+
+      it "only returns threads where the user has their thread notification level as tracking or regular" do
+        thread_4 = Fabricate(:chat_thread, channel: channel_1)
+        thread_4.add(current_user)
+        thread_4.membership_for(current_user).update!(
+          notification_level: ::Chat::UserChatThreadMembership.notification_levels[:muted],
+        )
+        Fabricate(:chat_thread, channel: channel_1)
+
+        expect(result.threads.map(&:id)).to eq([thread_1.id, thread_2.id, thread_3.id])
+      end
+
+      it "does not count deleted messages for sort order" do
+        original_last_message_id = thread_3.reload.last_message_id
+        unread_message = Fabricate(:chat_message, chat_channel: channel_1, thread: thread_3)
+        unread_message.update!(created_at: 2.days.ago)
+        unread_message.trash!
+        thread_3.reload.update!(last_message_id: original_last_message_id)
+
+        expect(result.threads.map(&:id)).to eq([thread_1.id, thread_2.id, thread_3.id])
+      end
+
+      context "when limit param is set" do
+        let(:limit) { 1 }
+
+        it "limits the number of threads returned" do
+          expect(result.threads).to contain_exactly(thread_1)
+        end
+      end
+
+      context "when offset param is set" do
+        let(:offset) { 1 }
+
+        it "returns results from the offset the number of threads returned" do
+          expect(result.threads).to eq([thread_2, thread_3])
+        end
+      end
+    end
+
+    describe "step - fetch_tracking" do
+      it "returns correct threads tracking" do
+        expect(result.tracking).to eq(
+          ::Chat::TrackingStateReportQuery.call(
+            guardian: guardian,
+            thread_ids: [thread_1, thread_2, thread_3].map(&:id),
+            include_threads: true,
+          ).thread_tracking,
+        )
+      end
+    end
+
+    describe "step - fetch_memberships" do
+      it "returns correct memberships" do
+        expect(result.memberships).to eq(
+          ::Chat::UserChatThreadMembership.where(
+            thread_id: [thread_1, thread_2, thread_3].map(&:id),
+            user_id: current_user.id,
+          ),
+        )
+      end
+    end
+
+    describe "step - build_load_more_url" do
+      it "returns a url with the correct params" do
+        expect(result.load_more_url).to eq("/chat/api/channels/#{channel_1.id}/threads?offset=10")
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/services/chat/lookup_thread_spec.rb b/plugins/chat/spec/services/chat/lookup_thread_spec.rb
new file mode 100644
index 00000000000..a6c806a394e
--- /dev/null
+++ b/plugins/chat/spec/services/chat/lookup_thread_spec.rb
@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::LookupThread do
+  describe Chat::LookupThread::Contract, type: :model do
+    it { is_expected.to validate_presence_of :channel_id }
+    it { is_expected.to validate_presence_of :thread_id }
+  end
+
+  describe ".call" do
+    subject(:result) { described_class.call(params) }
+
+    fab!(:current_user) { Fabricate(:user) }
+    fab!(:channel) { Fabricate(:chat_channel, threading_enabled: true) }
+    fab!(:private_channel) { Fabricate(:private_category_channel, group: Fabricate(:group)) }
+    fab!(:thread) { Fabricate(:chat_thread, channel: channel) }
+    fab!(:other_thread) { Fabricate(:chat_thread) }
+
+    let(:guardian) { Guardian.new(current_user) }
+    let(:params) { { guardian: guardian, thread_id: thread.id, channel_id: thread.channel_id } }
+
+    context "when all steps pass" do
+      it "sets the service result as successful" do
+        expect(result).to be_a_success
+      end
+
+      it "fetches the thread" do
+        expect(result.thread).to eq(thread)
+      end
+    end
+
+    context "when params are not valid" do
+      before { params.delete(:thread_id) }
+
+      it { is_expected.to fail_a_contract }
+    end
+
+    context "when thread is not found because the channel ID differs" do
+      before { params[:thread_id] = other_thread.id }
+
+      it { is_expected.to fail_to_find_a_model(:thread) }
+    end
+
+    context "when thread is not found" do
+      before { thread.destroy! }
+
+      it { is_expected.to fail_to_find_a_model(:thread) }
+    end
+
+    context "when user cannot see channel" do
+      before { thread.update!(channel: private_channel) }
+
+      it { is_expected.to fail_a_policy(:invalid_access) }
+    end
+
+    context "when threading is not enabled for the channel" do
+      before { channel.update!(threading_enabled: false) }
+
+      it { is_expected.to fail_a_policy(:threading_enabled_for_channel) }
+    end
+  end
+end
diff --git a/plugins/chat/spec/services/chat/mark_all_user_channels_read_spec.rb b/plugins/chat/spec/services/chat/mark_all_user_channels_read_spec.rb
new file mode 100644
index 00000000000..4d1d0d32904
--- /dev/null
+++ b/plugins/chat/spec/services/chat/mark_all_user_channels_read_spec.rb
@@ -0,0 +1,180 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::MarkAllUserChannelsRead do
+  describe ".call" do
+    subject(:result) { described_class.call(params) }
+
+    let(:params) { { guardian: guardian } }
+    let(:guardian) { Guardian.new(current_user) }
+
+    fab!(:current_user) { Fabricate(:user) }
+
+    fab!(:channel_1) { Fabricate(:chat_channel) }
+    fab!(:channel_2) { Fabricate(:chat_channel) }
+    fab!(:channel_3) { Fabricate(:chat_channel) }
+
+    fab!(:other_user) { Fabricate(:user) }
+
+    fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1, user: other_user) }
+    fab!(:message_2) { Fabricate(:chat_message, chat_channel: channel_1, user: other_user) }
+    fab!(:message_3) { Fabricate(:chat_message, chat_channel: channel_2, user: other_user) }
+    fab!(:message_4) { Fabricate(:chat_message, chat_channel: channel_2, user: other_user) }
+    fab!(:message_5) { Fabricate(:chat_message, chat_channel: channel_3, user: other_user) }
+    fab!(:message_6) { Fabricate(:chat_message, chat_channel: channel_3, user: other_user) }
+
+    fab!(:membership_1) do
+      Fabricate(
+        :user_chat_channel_membership,
+        chat_channel: channel_1,
+        user: current_user,
+        following: true,
+      )
+    end
+    fab!(:membership_2) do
+      Fabricate(
+        :user_chat_channel_membership,
+        chat_channel: channel_2,
+        user: current_user,
+        following: true,
+      )
+    end
+    fab!(:membership_3) do
+      Fabricate(
+        :user_chat_channel_membership,
+        chat_channel: channel_3,
+        user: current_user,
+        following: true,
+      )
+    end
+
+    context "when the user has no memberships" do
+      let(:guardian) { Guardian.new(Fabricate(:user)) }
+
+      it "sets the service result as successful" do
+        expect(result).to be_a_success
+      end
+
+      it "returns the updated_memberships in context" do
+        expect(result.updated_memberships).to eq([])
+      end
+    end
+
+    context "when everything is fine" do
+      fab!(:notification_1) do
+        Fabricate(
+          :notification,
+          notification_type: Notification.types[:chat_mention],
+          user: current_user,
+        )
+      end
+      fab!(:notification_2) do
+        Fabricate(
+          :notification,
+          notification_type: Notification.types[:chat_mention],
+          user: current_user,
+        )
+      end
+
+      let(:messages) { MessageBus.track_publish { result } }
+
+      before do
+        Chat::Mention.create!(
+          notification: notification_1,
+          user: current_user,
+          chat_message: message_1,
+        )
+        Chat::Mention.create!(
+          notification: notification_2,
+          user: current_user,
+          chat_message: message_3,
+        )
+      end
+
+      it "sets the service result as successful" do
+        expect(result).to be_a_success
+      end
+
+      it "updates the last_read_message_ids" do
+        result
+        expect(membership_1.reload.last_read_message_id).to eq(message_2.id)
+        expect(membership_2.reload.last_read_message_id).to eq(message_4.id)
+        expect(membership_3.reload.last_read_message_id).to eq(message_6.id)
+      end
+
+      it "does not update memberships where the user is not following" do
+        membership_1.update!(following: false)
+        result
+        expect(membership_1.reload.last_read_message_id).to eq(nil)
+      end
+
+      it "does not use deleted messages for the last_read_message_id" do
+        message_2.trash!
+        message_2.chat_channel.update_last_message_id!
+        result
+        expect(membership_1.reload.last_read_message_id).to eq(message_1.id)
+      end
+
+      it "returns the updated_memberships in context" do
+        expect(result.updated_memberships.map(&:channel_id)).to match_array(
+          [channel_1.id, channel_2.id, channel_3.id],
+        )
+      end
+
+      it "marks existing notifications for all affected channels as read" do
+        expect { result }.to change {
+          Notification.where(
+            notification_type: Notification.types[:chat_mention],
+            user: current_user,
+            read: false,
+          ).count
+        }.by(-2)
+      end
+
+      it "publishes tracking state in bulk for affected channels" do
+        message =
+          messages.find { |m| m.channel == "/chat/bulk-user-tracking-state/#{current_user.id}" }
+
+        expect(message.data).to eq(
+          channel_1.id.to_s => {
+            "last_read_message_id" => message_2.id,
+            "last_reply_created_at" => nil,
+            "membership_id" => membership_1.id,
+            "mention_count" => 0,
+            "unread_count" => 0,
+          },
+          channel_2.id.to_s => {
+            "last_read_message_id" => message_4.id,
+            "last_reply_created_at" => nil,
+            "membership_id" => membership_2.id,
+            "mention_count" => 0,
+            "unread_count" => 0,
+          },
+          channel_3.id.to_s => {
+            "last_read_message_id" => message_6.id,
+            "last_reply_created_at" => nil,
+            "membership_id" => membership_3.id,
+            "mention_count" => 0,
+            "unread_count" => 0,
+          },
+        )
+      end
+
+      context "for threads" do
+        fab!(:thread) { Fabricate(:chat_thread, channel: channel_1, original_message: message_2) }
+
+        it "does not use thread replies for last_read_message_id" do
+          Fabricate(:chat_message, chat_channel: channel_1, user: other_user, thread: thread)
+          result
+          expect(membership_1.reload.last_read_message_id).to eq(message_2.id)
+        end
+
+        it "does use thread original messages for last_read_message_id" do
+          new_om = Fabricate(:chat_message, chat_channel: channel_1, user: other_user)
+          thread.update!(original_message: new_om, original_message_user: other_user)
+          result
+          expect(membership_1.reload.last_read_message_id).to eq(new_om.id)
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/services/chat/message_destroyer_spec.rb b/plugins/chat/spec/services/chat/message_destroyer_spec.rb
new file mode 100644
index 00000000000..ec16a275a9f
--- /dev/null
+++ b/plugins/chat/spec/services/chat/message_destroyer_spec.rb
@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::MessageDestroyer do
+  describe "#destroy_in_batches" do
+    fab!(:message_1) { Fabricate(:chat_message) }
+    fab!(:user_1) { Fabricate(:user) }
+
+    it "resets last_read_message_id from memberships" do
+      membership =
+        Chat::UserChatChannelMembership.create!(
+          user: user_1,
+          chat_channel: message_1.chat_channel,
+          last_read_message: message_1,
+          following: true,
+          desktop_notification_level: 2,
+          mobile_notification_level: 2,
+        )
+
+      described_class.new.destroy_in_batches(Chat::Message.where(id: message_1.id))
+
+      expect(membership.reload.last_read_message_id).to be_nil
+    end
+
+    it "resets last_read_message_id to the most recent non-deleted message if there is one from memberships" do
+      message_2 = Fabricate(:chat_message, chat_channel: message_1.chat_channel)
+      message_3 = Fabricate(:chat_message, chat_channel: message_1.chat_channel)
+      message_4 = Fabricate(:chat_message, chat_channel: message_1.chat_channel)
+      message_3.trash!
+      membership =
+        Chat::UserChatChannelMembership.create!(
+          user: user_1,
+          chat_channel: message_1.chat_channel,
+          last_read_message: message_4,
+          following: true,
+          desktop_notification_level: 2,
+          mobile_notification_level: 2,
+        )
+
+      described_class.new.destroy_in_batches(Chat::Message.where(id: message_4.id))
+
+      expect(membership.reload.last_read_message_id).to eq(message_2.id)
+    end
+
+    it "deletes flags associated to deleted chat messages" do
+      guardian = Guardian.new(Discourse.system_user)
+      Chat::ReviewQueue.new.flag_message(message_1, guardian, ReviewableScore.types[:off_topic])
+
+      reviewable = Chat::ReviewableMessage.last
+      expect(reviewable).to be_present
+
+      described_class.new.destroy_in_batches(Chat::Message.where(id: message_1.id))
+
+      expect { message_1.reload }.to raise_exception(ActiveRecord::RecordNotFound)
+      expect { reviewable.reload }.to raise_exception(ActiveRecord::RecordNotFound)
+    end
+
+    it "doesn't delete other messages" do
+      message_2 = Fabricate(:chat_message, chat_channel: message_1.chat_channel)
+
+      described_class.new.destroy_in_batches(Chat::Message.where(id: message_1.id))
+
+      expect { message_1.reload }.to raise_exception(ActiveRecord::RecordNotFound)
+      expect(message_2.reload).to be_present
+    end
+
+    it "sets the last_message_id for the channel if that message is deleted" do
+      expect(message_1.chat_channel.last_message_id).to eq(message_1.id)
+      described_class.new.destroy_in_batches(Chat::Message.where(id: message_1.id))
+      expect(message_1.chat_channel.reload.last_message_id).to eq(nil)
+    end
+  end
+end
diff --git a/plugins/chat/spec/services/chat/publisher_spec.rb b/plugins/chat/spec/services/chat/publisher_spec.rb
new file mode 100644
index 00000000000..0385cb0e95d
--- /dev/null
+++ b/plugins/chat/spec/services/chat/publisher_spec.rb
@@ -0,0 +1,307 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+describe Chat::Publisher do
+  fab!(:channel) { Fabricate(:category_channel) }
+  fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel) }
+
+  describe ".publish_delete!" do
+    fab!(:message_2) { Fabricate(:chat_message, chat_channel: channel) }
+    before { message_2.trash! }
+
+    it "publishes the correct data" do
+      data =
+        MessageBus.track_publish { described_class.publish_delete!(channel, message_2) }[0].data
+
+      expect(data["deleted_at"]).to eq(message_2.deleted_at.iso8601(3))
+      expect(data["deleted_by_id"]).to eq(message_2.deleted_by_id)
+      expect(data["deleted_id"]).to eq(message_2.id)
+      expect(data["latest_not_deleted_message_id"]).to eq(message_1.id)
+      expect(data["type"]).to eq("delete")
+    end
+
+    context "when there are no earlier messages in the channel to send as latest_not_deleted_message_id" do
+      it "publishes nil" do
+        data =
+          MessageBus.track_publish { described_class.publish_delete!(channel, message_1) }[0].data
+
+        expect(data["latest_not_deleted_message_id"]).to eq(nil)
+      end
+    end
+
+    context "when the message is in a thread and the channel has threading_enabled" do
+      before do
+        thread = Fabricate(:chat_thread, channel: channel)
+        message_1.update!(thread: thread)
+        message_2.update!(thread: thread)
+        channel.update!(threading_enabled: true)
+      end
+
+      it "publishes the correct latest not deleted message id" do
+        data =
+          MessageBus.track_publish { described_class.publish_delete!(channel, message_2) }[0].data
+
+        expect(data["deleted_at"]).to eq(message_2.deleted_at.iso8601(3))
+        expect(data["deleted_id"]).to eq(message_2.id)
+        expect(data["latest_not_deleted_message_id"]).to eq(message_1.id)
+        expect(data["type"]).to eq("delete")
+      end
+    end
+  end
+
+  describe ".publish_refresh!" do
+    it "publishes the message" do
+      data =
+        MessageBus.track_publish { described_class.publish_refresh!(channel, message_1) }[0].data
+
+      expect(data["chat_message"]["id"]).to eq(message_1.id)
+      expect(data["type"]).to eq("refresh")
+    end
+  end
+
+  describe ".publish_user_tracking_state!" do
+    fab!(:channel) { Fabricate(:category_channel) }
+    fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel) }
+    fab!(:user) { Fabricate(:user) }
+
+    let(:data) do
+      MessageBus
+        .track_publish { described_class.publish_user_tracking_state!(user, channel, message_1) }
+        .first
+        .data
+    end
+
+    context "when the user has channel membership" do
+      fab!(:membership) do
+        Fabricate(:user_chat_channel_membership, chat_channel: channel, user: user)
+      end
+
+      it "publishes the tracking state with correct counts" do
+        expect(data["unread_count"]).to eq(1)
+        expect(data["mention_count"]).to eq(0)
+      end
+    end
+
+    context "when the user has no channel membership" do
+      it "publishes the tracking state with zeroed out counts" do
+        expect(data["channel_id"]).to eq(channel.id)
+        expect(data["last_read_message_id"]).to eq(message_1.id)
+        expect(data["thread_id"]).to eq(nil)
+        expect(data["unread_count"]).to eq(0)
+        expect(data["mention_count"]).to eq(0)
+      end
+    end
+
+    context "when the channel has threading enabled and the message is a thread reply" do
+      fab!(:thread) { Fabricate(:chat_thread, channel: channel) }
+
+      before do
+        message_1.update!(thread: thread)
+        thread.update_last_message_id!
+        channel.update!(threading_enabled: true)
+      end
+
+      context "when the user has thread membership" do
+        fab!(:membership) { Fabricate(:user_chat_thread_membership, thread: thread, user: user) }
+
+        it "publishes the tracking state with correct counts" do
+          expect(data["thread_id"]).to eq(thread.id)
+          expect(data["unread_thread_overview"]).to eq(
+            { thread.id.to_s => thread.reload.last_message.created_at.iso8601(3) },
+          )
+          expect(data["thread_tracking"]).to eq(
+            { "unread_count" => 1, "mention_count" => 0, "last_reply_created_at" => nil },
+          )
+        end
+      end
+
+      context "when the user has no thread membership" do
+        it "publishes the tracking state with zeroed out counts" do
+          expect(data["thread_id"]).to eq(thread.id)
+          expect(data["unread_thread_overview"]).to eq({})
+          expect(data["thread_tracking"]).to eq(
+            { "unread_count" => 0, "mention_count" => 0, "last_reply_created_at" => nil },
+          )
+        end
+      end
+    end
+  end
+
+  describe ".calculate_publish_targets" do
+    context "when threading_enabled is false for the channel" do
+      before { channel.update!(threading_enabled: false) }
+
+      context "when the message is the original message of a thread" do
+        fab!(:thread) { Fabricate(:chat_thread, original_message: message_1, channel: channel) }
+
+        it "generates the correct targets" do
+          targets = described_class.calculate_publish_targets(channel, message_1)
+          expect(targets).to contain_exactly("/chat/#{channel.id}")
+        end
+      end
+
+      context "when the message is a thread reply" do
+        fab!(:thread) do
+          Fabricate(
+            :chat_thread,
+            original_message: Fabricate(:chat_message, chat_channel: channel),
+            channel: channel,
+          )
+        end
+
+        before { message_1.update!(thread: thread) }
+
+        it "generates the correct targets" do
+          targets = described_class.calculate_publish_targets(channel, message_1)
+          expect(targets).to contain_exactly("/chat/#{channel.id}")
+        end
+      end
+
+      context "when the message is not part of a thread" do
+        it "generates the correct targets" do
+          targets = described_class.calculate_publish_targets(channel, message_1)
+          expect(targets).to contain_exactly("/chat/#{channel.id}")
+        end
+      end
+    end
+
+    context "when threading_enabled is true for the channel" do
+      before { channel.update!(threading_enabled: true) }
+
+      context "when the message is the original message of a thread" do
+        fab!(:thread) { Fabricate(:chat_thread, original_message: message_1, channel: channel) }
+
+        it "generates the correct targets" do
+          targets = described_class.calculate_publish_targets(channel, message_1)
+          expect(targets).to contain_exactly(
+            "/chat/#{channel.id}",
+            "/chat/#{channel.id}/thread/#{thread.id}",
+          )
+        end
+      end
+
+      context "when a staged thread has been provided" do
+        fab!(:thread) do
+          Fabricate(
+            :chat_thread,
+            original_message: Fabricate(:chat_message, chat_channel: channel),
+            channel: channel,
+          )
+        end
+
+        before { message_1.update!(thread: thread) }
+
+        it "generates the correct targets" do
+          targets =
+            described_class.calculate_publish_targets(
+              channel,
+              message_1,
+              staged_thread_id: "stagedthreadid",
+            )
+
+          expect(targets).to contain_exactly(
+            "/chat/#{channel.id}/thread/#{thread.id}",
+            "/chat/#{channel.id}/thread/stagedthreadid",
+          )
+        end
+      end
+
+      context "when the message is a thread reply" do
+        fab!(:thread) do
+          Fabricate(
+            :chat_thread,
+            original_message: Fabricate(:chat_message, chat_channel: channel),
+            channel: channel,
+          )
+        end
+
+        before { message_1.update!(thread: thread) }
+
+        it "generates the correct targets" do
+          targets = described_class.calculate_publish_targets(channel, message_1)
+          expect(targets).to contain_exactly("/chat/#{channel.id}/thread/#{thread.id}")
+        end
+      end
+
+      context "when the message is not part of a thread" do
+        it "generates the correct targets" do
+          targets = described_class.calculate_publish_targets(channel, message_1)
+          expect(targets).to contain_exactly("/chat/#{channel.id}")
+        end
+      end
+    end
+  end
+
+  describe ".publish_new!" do
+    let(:staged_id) { 999 }
+
+    context "when the message is not a thread reply" do
+      it "publishes to the new_messages_message_bus_channel" do
+        messages =
+          MessageBus.track_publish(described_class.new_messages_message_bus_channel(channel.id)) do
+            described_class.publish_new!(channel, message_1, staged_id)
+          end
+        expect(messages.first.data).to eq(
+          {
+            type: "channel",
+            channel_id: channel.id,
+            thread_id: nil,
+            message:
+              Chat::MessageSerializer.new(
+                message_1,
+                { scope: Guardian.new(nil), root: false },
+              ).as_json,
+          },
+        )
+      end
+    end
+
+    context "when the message is a thread reply" do
+      fab!(:thread) do
+        Fabricate(
+          :chat_thread,
+          original_message: Fabricate(:chat_message, chat_channel: channel),
+          channel: channel,
+        )
+      end
+
+      before { message_1.update!(thread: thread) }
+
+      context "if threading_enabled is false for the channel" do
+        before { channel.update!(threading_enabled: false) }
+
+        it "publishes to the new_messages_message_bus_channel" do
+          messages =
+            MessageBus.track_publish(
+              described_class.new_messages_message_bus_channel(channel.id),
+            ) { described_class.publish_new!(channel, message_1, staged_id) }
+          expect(messages).not_to be_empty
+        end
+
+        context "if threading_enabled is true for the channel" do
+          before { channel.update!(threading_enabled: true) }
+
+          it "does publish to the new_messages_message_bus_channel" do
+            messages =
+              MessageBus.track_publish(
+                described_class.new_messages_message_bus_channel(channel.id),
+              ) { described_class.publish_new!(channel, message_1, staged_id) }
+            expect(messages.first.data).to eq(
+              {
+                type: "thread",
+                channel_id: channel.id,
+                thread_id: thread.id,
+                message:
+                  Chat::MessageSerializer.new(
+                    message_1,
+                    { scope: Guardian.new(nil), root: false },
+                  ).as_json,
+              },
+            )
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/services/chat/restore_message_spec.rb b/plugins/chat/spec/services/chat/restore_message_spec.rb
new file mode 100644
index 00000000000..cd482b6ad38
--- /dev/null
+++ b/plugins/chat/spec/services/chat/restore_message_spec.rb
@@ -0,0 +1,109 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::RestoreMessage do
+  fab!(:current_user) { Fabricate(:user) }
+  let!(:guardian) { Guardian.new(current_user) }
+  fab!(:message) { Fabricate(:chat_message, user: current_user) }
+
+  before do
+    message.trash!
+    message.chat_channel.update!(
+      last_message_id: message.chat_channel.latest_not_deleted_message_id,
+    )
+  end
+
+  describe ".call" do
+    subject(:result) { described_class.call(params) }
+
+    context "when params are not valid" do
+      let(:params) { { guardian: guardian } }
+
+      it { is_expected.to fail_a_contract }
+    end
+
+    context "when params are valid" do
+      let(:params) do
+        { guardian: guardian, message_id: message.id, channel_id: message.chat_channel_id }
+      end
+
+      context "when the user does not have permission to restore" do
+        before { message.update!(user: Fabricate(:admin)) }
+
+        it { is_expected.to fail_a_policy(:invalid_access) }
+      end
+
+      context "when the channel does not match the message" do
+        let(:params) do
+          { guardian: guardian, message_id: message.id, channel_id: Fabricate(:chat_channel).id }
+        end
+
+        it { is_expected.to fail_to_find_a_model(:message) }
+      end
+
+      context "when the user has permission to restore" do
+        it "sets the service result as successful" do
+          expect(result).to be_a_success
+        end
+
+        it "restores the message" do
+          result
+          expect(Chat::Message.find_by(id: message.id)).not_to be_nil
+        end
+
+        it "updates the channel last_message_id if the message is now the last one in the channel" do
+          expect(message.chat_channel.reload.last_message_id).to be_nil
+          result
+          expect(message.chat_channel.reload.last_message_id).to eq(message.id)
+        end
+
+        it "does not update the channel last_message_id if the message is not the last one in the channel" do
+          next_message = Fabricate(:chat_message, chat_channel: message.chat_channel)
+          expect(message.chat_channel.reload.last_message_id).to eq(next_message.id)
+          result
+          expect(message.chat_channel.reload.last_message_id).to eq(next_message.id)
+        end
+
+        it "publishes associated Discourse and MessageBus events" do
+          freeze_time
+          messages = nil
+          event =
+            DiscourseEvent.track_events { messages = MessageBus.track_publish { result } }.first
+          expect(event[:event_name]).to eq(:chat_message_restored)
+          expect(event[:params]).to eq([message, message.chat_channel, current_user])
+          expect(
+            messages.find { |m| m.channel == "/chat/#{message.chat_channel_id}" }.data,
+          ).to include({ "type" => "restore" })
+        end
+
+        context "when the message has a thread" do
+          fab!(:thread) { Fabricate(:chat_thread, channel: message.chat_channel) }
+
+          before do
+            message.update!(thread: thread)
+            thread.update_last_message_id!
+            thread.original_message.update!(created_at: message.created_at - 2.hours)
+          end
+
+          it "increments the thread reply count" do
+            thread.set_replies_count_cache(1)
+            result
+            expect(thread.replies_count_cache).to eq(2)
+          end
+
+          it "updates the thread last_message_id if the message is now the last one in the thread" do
+            expect(message.thread.reload.last_message_id).to eq(thread.original_message_id)
+            result
+            expect(message.thread.reload.last_message_id).to eq(message.id)
+          end
+
+          it "does not update the thread last_message_id if the message is not the last one in the channel" do
+            next_message = Fabricate(:chat_message, thread: message.thread)
+            expect(message.thread.reload.last_message_id).to eq(next_message.id)
+            result
+            expect(message.thread.reload.last_message_id).to eq(next_message.id)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/services/chat/search_chatable_spec.rb b/plugins/chat/spec/services/chat/search_chatable_spec.rb
new file mode 100644
index 00000000000..831032a7f58
--- /dev/null
+++ b/plugins/chat/spec/services/chat/search_chatable_spec.rb
@@ -0,0 +1,147 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::SearchChatable do
+  describe ".call" do
+    subject(:result) { described_class.call(params) }
+
+    fab!(:current_user) { Fabricate(:user, username: "bob-user") }
+    fab!(:sam) { Fabricate(:user, username: "sam-user") }
+    fab!(:charlie) { Fabricate(:user, username: "charlie-user") }
+    fab!(:channel_1) { Fabricate(:chat_channel, name: "bob-channel") }
+    fab!(:channel_2) { Fabricate(:direct_message_channel, users: [current_user, sam]) }
+    fab!(:channel_3) { Fabricate(:direct_message_channel, users: [current_user, sam, charlie]) }
+    fab!(:channel_4) { Fabricate(:direct_message_channel, users: [sam, charlie]) }
+
+    let(:guardian) { Guardian.new(current_user) }
+    let(:params) { { guardian: guardian, term: term } }
+    let(:term) { "" }
+
+    before do
+      SiteSetting.direct_message_enabled_groups = Group::AUTO_GROUPS[:everyone]
+      # simpler user search without having to worry about user search data
+      SiteSetting.enable_names = false
+      return unless guardian.can_create_direct_message?
+      channel_1.add(current_user)
+    end
+
+    context "when all steps pass" do
+      it "sets the service result as successful" do
+        expect(result).to be_a_success
+      end
+
+      it "returns chatables" do
+        expect(result.memberships).to contain_exactly(
+          channel_1.membership_for(current_user),
+          channel_2.membership_for(current_user),
+          channel_3.membership_for(current_user),
+        )
+        expect(result.category_channels).to contain_exactly(channel_1)
+        expect(result.direct_message_channels).to contain_exactly(channel_2, channel_3)
+        expect(result.users).to include(current_user, sam)
+      end
+
+      it "doesn’t return direct message of other users" do
+        expect(result.direct_message_channels).to_not include(channel_4)
+      end
+
+      context "with private channel" do
+        fab!(:private_channel_1) { Fabricate(:private_category_channel, name: "private") }
+        let(:term) { "#private" }
+
+        it "doesn’t return category channels you can't access" do
+          expect(result.category_channels).to_not include(private_channel_1)
+        end
+      end
+
+      context "when public channels are disabled" do
+        it "does not return category channels" do
+          SiteSetting.enable_public_channels = false
+
+          expect(described_class.call(params).category_channels).to be_blank
+        end
+      end
+    end
+
+    context "when term is prefixed with #" do
+      let(:term) { "#" }
+
+      it "doesn’t return users" do
+        expect(result.users).to be_blank
+        expect(result.category_channels).to contain_exactly(channel_1)
+        expect(result.direct_message_channels).to contain_exactly(channel_2, channel_3)
+      end
+    end
+
+    context "when term is prefixed with @" do
+      let(:term) { "@" }
+
+      it "doesn’t return channels" do
+        expect(result.users).to include(current_user, sam)
+        expect(result.category_channels).to be_blank
+        expect(result.direct_message_channels).to be_blank
+      end
+    end
+
+    context "when filtering" do
+      context "with full match" do
+        let(:term) { "bob" }
+
+        it "returns matching channels" do
+          expect(result.users).to contain_exactly(current_user)
+          expect(result.category_channels).to contain_exactly(channel_1)
+          expect(result.direct_message_channels).to contain_exactly(channel_2, channel_3)
+        end
+      end
+
+      context "with partial match" do
+        let(:term) { "cha" }
+
+        it "returns matching channels" do
+          expect(result.users).to contain_exactly(charlie)
+          expect(result.category_channels).to contain_exactly(channel_1)
+          expect(result.direct_message_channels).to contain_exactly(channel_3)
+        end
+      end
+    end
+
+    context "when filtering with non existing term" do
+      let(:term) { "xxxxxxxxxx" }
+
+      it "returns matching channels" do
+        expect(result.users).to be_blank
+        expect(result.category_channels).to be_blank
+        expect(result.direct_message_channels).to be_blank
+      end
+    end
+
+    context "when filtering with @prefix" do
+      let(:term) { "@bob" }
+
+      it "returns matching channels" do
+        expect(result.users).to contain_exactly(current_user)
+        expect(result.category_channels).to be_blank
+        expect(result.direct_message_channels).to be_blank
+      end
+    end
+
+    context "when filtering with #prefix" do
+      let(:term) { "#bob" }
+
+      it "returns matching channels" do
+        expect(result.users).to be_blank
+        expect(result.category_channels).to contain_exactly(channel_1)
+        expect(result.direct_message_channels).to contain_exactly(channel_2, channel_3)
+      end
+    end
+
+    context "when current user can't created direct messages" do
+      let(:term) { "@bob" }
+
+      before { SiteSetting.direct_message_enabled_groups = Group::AUTO_GROUPS[:staff] }
+
+      it "doesn’t return users" do
+        expect(result.users).to be_blank
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/services/chat/tracking_state_spec.rb b/plugins/chat/spec/services/chat/tracking_state_spec.rb
new file mode 100644
index 00000000000..f68a3f288cb
--- /dev/null
+++ b/plugins/chat/spec/services/chat/tracking_state_spec.rb
@@ -0,0 +1,163 @@
+# frozen_string_literal: true
+
+RSpec.describe ::Chat::TrackingState do
+  describe ".call" do
+    subject(:result) { described_class.call(params) }
+
+    fab!(:current_user) { Fabricate(:user) }
+    fab!(:channel_1) { Fabricate(:chat_channel, threading_enabled: true) }
+    fab!(:channel_2) { Fabricate(:chat_channel, threading_enabled: true) }
+    fab!(:thread_1) { Fabricate(:chat_thread, channel: channel_1) }
+    fab!(:thread_2) { Fabricate(:chat_thread, channel: channel_1) }
+    fab!(:thread_3) { Fabricate(:chat_thread, channel: channel_2) }
+    fab!(:thread_4) { Fabricate(:chat_thread, channel: channel_2) }
+
+    let(:guardian) { Guardian.new(current_user) }
+    let(:id_params) { { channel_ids: [channel_1.id], thread_ids: [thread_1.id] } }
+    let(:include_threads) { true }
+    let(:include_missing_memberships) { nil }
+
+    let(:params) do
+      id_params.merge(guardian: guardian).merge(
+        include_threads: include_threads,
+        include_missing_memberships: include_missing_memberships,
+      )
+    end
+
+    fab!(:channel_1_membership) do
+      Fabricate(:user_chat_channel_membership, chat_channel: channel_1, user: current_user)
+    end
+    fab!(:thread_1_membership) do
+      Fabricate(:user_chat_thread_membership, thread: thread_1, user: current_user)
+    end
+    fab!(:thread_2_membership) do
+      Fabricate(:user_chat_thread_membership, thread: thread_2, user: current_user)
+    end
+
+    context "when not including channels and threads where the user is not a member" do
+      context "when only channel_ids are provided" do
+        let(:id_params) { { channel_ids: [channel_1.id, channel_2.id] } }
+
+        it "gets the tracking state of the channels" do
+          generate_tracking_state
+          expect(result.report.channel_tracking).to eq(
+            channel_1.id => {
+              unread_count: 4, # 2 messages + 2 thread original messages
+              mention_count: 0,
+            },
+          )
+        end
+
+        it "gets the tracking state of the threads in the channels" do
+          generate_tracking_state
+          expect(result.report.thread_tracking).to eq(
+            thread_1.id => {
+              channel_id: channel_1.id,
+              unread_count: 1,
+              mention_count: 0,
+            },
+            thread_2.id => {
+              channel_id: channel_1.id,
+              unread_count: 2,
+              mention_count: 0,
+            },
+          )
+        end
+
+        context "when include_threads is false" do
+          let(:include_threads) { false }
+
+          it "only gets channel tracking state and no thread tracking state" do
+            generate_tracking_state
+            expect(result.report.thread_tracking).to eq({})
+            expect(result.report.channel_tracking).to eq(
+              channel_1.id => {
+                unread_count: 4, # 2 messages + 2 thread original messages
+                mention_count: 0,
+              },
+            )
+          end
+        end
+      end
+
+      context "when thread_ids and channel_ids are provided" do
+        let(:id_params) { { channel_ids: [channel_1.id, channel_2.id], thread_ids: [thread_2.id] } }
+
+        it "gets the tracking state of the channels" do
+          generate_tracking_state
+          expect(result.report.channel_tracking).to eq(
+            channel_1.id => {
+              unread_count: 4, # 2 messages + 2 thread original messages
+              mention_count: 0,
+            },
+          )
+        end
+
+        it "only gets the tracking state of the specified threads in the channels" do
+          generate_tracking_state
+          expect(result.report.thread_tracking).to eq(
+            thread_2.id => {
+              channel_id: channel_1.id,
+              unread_count: 2,
+              mention_count: 0,
+            },
+          )
+        end
+      end
+    end
+
+    context "when including channels and threads where the user is not a member" do
+      let(:id_params) { { channel_ids: [channel_1.id, channel_2.id] } }
+      let(:include_missing_memberships) { true }
+      let(:include_threads) { true }
+
+      it "gets the tracking state of all channels including the ones where the user is not a member" do
+        generate_tracking_state
+        expect(result.report.channel_tracking).to eq(
+          channel_1.id => {
+            unread_count: 4, # 2 messages + 2 thread original messages
+            mention_count: 0,
+          },
+          channel_2.id => {
+            unread_count: 0,
+            mention_count: 0,
+          },
+        )
+      end
+
+      it "gets the tracking state of all the threads in the channels including the ones where the user is not a member" do
+        generate_tracking_state
+        expect(result.report.thread_tracking).to eq(
+          thread_1.id => {
+            channel_id: channel_1.id,
+            unread_count: 1,
+            mention_count: 0,
+          },
+          thread_2.id => {
+            channel_id: channel_1.id,
+            unread_count: 2,
+            mention_count: 0,
+          },
+          thread_3.id => {
+            channel_id: channel_2.id,
+            unread_count: 0,
+            mention_count: 0,
+          },
+          thread_4.id => {
+            channel_id: channel_2.id,
+            unread_count: 0,
+            mention_count: 0,
+          },
+        )
+      end
+    end
+  end
+
+  def generate_tracking_state
+    Fabricate(:chat_message, chat_channel: channel_1)
+    Fabricate(:chat_message, chat_channel: channel_1)
+    Fabricate(:chat_message, chat_channel: channel_1, thread: thread_1)
+    Fabricate(:chat_message, chat_channel: channel_1, thread: thread_2)
+    Fabricate(:chat_message, chat_channel: channel_1, thread: thread_2)
+  end
+end
diff --git a/plugins/chat/spec/services/chat/trash_channel_spec.rb b/plugins/chat/spec/services/chat/trash_channel_spec.rb
new file mode 100644
index 00000000000..120394e9d8b
--- /dev/null
+++ b/plugins/chat/spec/services/chat/trash_channel_spec.rb
@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+RSpec.describe(Chat::TrashChannel) do
+  subject(:result) { described_class.call(guardian: guardian) }
+
+  let(:guardian) { Guardian.new(current_user) }
+
+  context "when channel_id is not provided" do
+    fab!(:current_user) { Fabricate(:admin) }
+
+    it { is_expected.to fail_to_find_a_model(:channel) }
+  end
+
+  context "when channel_id is provided" do
+    subject(:result) { described_class.call(channel_id: channel.id, guardian: guardian) }
+
+    fab!(:channel) { Fabricate(:chat_channel) }
+
+    context "when user is not allowed to perform the action" do
+      fab!(:current_user) { Fabricate(:user) }
+
+      it { is_expected.to fail_a_policy(:invalid_access) }
+    end
+
+    context "when user is allowed to perform the action" do
+      fab!(:current_user) { Fabricate(:admin) }
+
+      it "sets the service result as successful" do
+        expect(result).to be_a_success
+      end
+
+      it "trashes the channel" do
+        expect(result[:channel]).to be_trashed
+      end
+
+      it "logs the action" do
+        expect { result }.to change { UserHistory.count }.by(1)
+        expect(UserHistory.last).to have_attributes(
+          custom_type: "chat_channel_delete",
+          details:
+            "chat_channel_id: #{result[:channel].id}\nchat_channel_name: #{result[:channel].title(guardian.user)}",
+        )
+      end
+
+      it "changes the slug to prevent colisions" do
+        expect(result[:channel].slug).to include("deleted")
+      end
+
+      it "queues a job to delete channel relations" do
+        expect { result }.to change(Jobs::Chat::ChannelDelete.jobs, :size).by(1)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/services/chat/trash_message_spec.rb b/plugins/chat/spec/services/chat/trash_message_spec.rb
new file mode 100644
index 00000000000..a57390ce177
--- /dev/null
+++ b/plugins/chat/spec/services/chat/trash_message_spec.rb
@@ -0,0 +1,201 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::TrashMessage do
+  fab!(:current_user) { Fabricate(:user) }
+  let!(:guardian) { Guardian.new(current_user) }
+  fab!(:message) { Fabricate(:chat_message, user: current_user) }
+
+  describe ".call" do
+    subject(:result) { described_class.call(params) }
+
+    context "when params are not valid" do
+      let(:params) { { guardian: guardian } }
+
+      it { is_expected.to fail_a_contract }
+    end
+
+    context "when params are valid" do
+      let(:params) do
+        { guardian: guardian, message_id: message.id, channel_id: message.chat_channel_id }
+      end
+
+      context "when the user does not have permission to delete" do
+        before { message.update!(user: Fabricate(:admin)) }
+
+        it { is_expected.to fail_a_policy(:invalid_access) }
+      end
+
+      context "when the channel does not match the message" do
+        let(:params) do
+          { guardian: guardian, message_id: message.id, channel_id: Fabricate(:chat_channel).id }
+        end
+
+        it { is_expected.to fail_to_find_a_model(:message) }
+      end
+
+      context "when the user has permission to delete" do
+        it "sets the service result as successful" do
+          expect(result).to be_a_success
+        end
+
+        it "trashes the message" do
+          result
+          expect(Chat::Message.find_by(id: message.id)).to be_nil
+
+          deleted_message = Chat::Message.unscoped.find_by(id: message.id)
+          expect(deleted_message.deleted_by_id).to eq(current_user.id)
+          expect(deleted_message.deleted_at).to be_within(1.minute).of(Time.zone.now)
+        end
+
+        it "destroys notifications for mentions" do
+          notification = Fabricate(:notification)
+          mention = Fabricate(:chat_mention, chat_message: message, notification: notification)
+
+          result
+
+          mention = Chat::Mention.find_by(id: mention.id)
+          expect(mention).to be_present
+          expect(mention.notification_id).to be_nil
+        end
+
+        it "publishes associated Discourse and MessageBus events" do
+          freeze_time
+          messages = nil
+          event =
+            DiscourseEvent.track_events { messages = MessageBus.track_publish { result } }.first
+          expect(event[:event_name]).to eq(:chat_message_trashed)
+          expect(event[:params]).to eq([message, message.chat_channel, current_user])
+          expect(messages.find { |m| m.channel == "/chat/#{message.chat_channel_id}" }.data).to eq(
+            {
+              "type" => "delete",
+              "deleted_id" => message.id,
+              "deleted_by_id" => current_user.id,
+              "deleted_at" => message.reload.deleted_at.iso8601(3),
+              "latest_not_deleted_message_id" => nil,
+            },
+          )
+        end
+
+        it "updates the tracking to the last non-deleted channel message for users whose last_read_message_id was the trashed message" do
+          other_message = Fabricate(:chat_message, chat_channel: message.chat_channel)
+          membership_1 =
+            Fabricate(
+              :user_chat_channel_membership,
+              chat_channel: message.chat_channel,
+              last_read_message: message,
+            )
+          membership_2 =
+            Fabricate(
+              :user_chat_channel_membership,
+              chat_channel: message.chat_channel,
+              last_read_message: message,
+            )
+          membership_3 =
+            Fabricate(
+              :user_chat_channel_membership,
+              chat_channel: message.chat_channel,
+              last_read_message: other_message,
+            )
+          result
+          expect(membership_1.reload.last_read_message_id).to eq(other_message.id)
+          expect(membership_2.reload.last_read_message_id).to eq(other_message.id)
+          expect(membership_3.reload.last_read_message_id).to eq(other_message.id)
+        end
+
+        it "updates the tracking to nil when there are no other messages left in the channnel" do
+          membership_1 =
+            Fabricate(
+              :user_chat_channel_membership,
+              chat_channel: message.chat_channel,
+              last_read_message: message,
+            )
+          membership_2 =
+            Fabricate(
+              :user_chat_channel_membership,
+              chat_channel: message.chat_channel,
+              last_read_message: message,
+            )
+          result
+          expect(membership_1.reload.last_read_message_id).to be_nil
+          expect(membership_2.reload.last_read_message_id).to be_nil
+        end
+
+        it "updates the channel last_message_id to the previous message in the channel" do
+          next_message =
+            Fabricate(:chat_message, chat_channel: message.chat_channel, user: current_user)
+          params[:message_id] = next_message.id
+          expect(message.chat_channel.reload.last_message).to eq(next_message)
+          result
+          expect(message.chat_channel.reload.last_message).to eq(message)
+        end
+
+        context "when the message has a thread" do
+          fab!(:thread) { Fabricate(:chat_thread, channel: message.chat_channel) }
+
+          before do
+            message.update!(thread: thread)
+            thread.update!(last_message: message)
+            thread.original_message.update!(created_at: message.created_at - 2.hours)
+          end
+
+          it "decrements the thread reply count" do
+            thread.set_replies_count_cache(5)
+            result
+            expect(thread.replies_count_cache).to eq(4)
+          end
+
+          it "updates the tracking to the last non-deleted thread message for users whose last_read_message_id was the trashed message" do
+            other_message =
+              Fabricate(:chat_message, chat_channel: message.chat_channel, thread: thread)
+            membership_1 =
+              Fabricate(:user_chat_thread_membership, thread: thread, last_read_message: message)
+            membership_2 =
+              Fabricate(:user_chat_thread_membership, thread: thread, last_read_message: message)
+            membership_3 =
+              Fabricate(
+                :user_chat_thread_membership,
+                thread: thread,
+                last_read_message: other_message,
+              )
+            result
+            expect(membership_1.reload.last_read_message_id).to eq(other_message.id)
+            expect(membership_2.reload.last_read_message_id).to eq(other_message.id)
+            expect(membership_3.reload.last_read_message_id).to eq(other_message.id)
+          end
+
+          it "updates the tracking to nil when there are no other messages left in the thread" do
+            membership_1 =
+              Fabricate(:user_chat_thread_membership, thread: thread, last_read_message: message)
+            membership_2 =
+              Fabricate(:user_chat_thread_membership, thread: thread, last_read_message: message)
+            result
+            expect(membership_1.reload.last_read_message_id).to be_nil
+            expect(membership_2.reload.last_read_message_id).to be_nil
+          end
+
+          it "updates the thread last_message_id to the previous message in the thread" do
+            next_message = Fabricate(:chat_message, thread: thread, user: current_user)
+            params[:message_id] = next_message.id
+            expect(thread.reload.last_message).to eq(next_message)
+            result
+            expect(thread.reload.last_message).to eq(message)
+          end
+
+          context "when there are no other messages left in the thread except the original message" do
+            it "updates the thread last_message_id to the original message" do
+              expect(thread.last_message).to eq(message)
+              result
+              expect(thread.reload.last_message).to eq(thread.original_message)
+            end
+          end
+        end
+
+        context "when message is already deleted" do
+          before { message.trash! }
+
+          it { is_expected.to fail_to_find_a_model(:message) }
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/services/chat/update_channel_spec.rb b/plugins/chat/spec/services/chat/update_channel_spec.rb
new file mode 100644
index 00000000000..e2445925e7a
--- /dev/null
+++ b/plugins/chat/spec/services/chat/update_channel_spec.rb
@@ -0,0 +1,153 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::UpdateChannel do
+  subject(:result) { described_class.call(guardian: guardian, channel_id: channel.id, **params) }
+
+  fab!(:channel) { Fabricate(:chat_channel) }
+  fab!(:current_user) { Fabricate(:admin) }
+
+  let(:guardian) { Guardian.new(current_user) }
+  let(:params) do
+    {
+      name: "cool channel",
+      description: "a channel description",
+      slug: "snail",
+      allow_channel_wide_mentions: true,
+      auto_join_users: false,
+    }
+  end
+
+  context "when the user cannot edit the channel" do
+    fab!(:current_user) { Fabricate(:user) }
+
+    it { is_expected.to fail_a_policy(:check_channel_permission) }
+  end
+
+  context "when the user tries to edit a DM channel" do
+    fab!(:channel) { Fabricate(:direct_message_channel, users: [current_user, Fabricate(:user)]) }
+
+    it { is_expected.to fail_a_policy(:no_direct_message_channel) }
+  end
+
+  context "when channel is a category one" do
+    context "when a valid user provides valid params" do
+      let(:message) do
+        MessageBus
+          .track_publish(Chat::Publisher::CHANNEL_EDITS_MESSAGE_BUS_CHANNEL) { result }
+          .first
+      end
+
+      it "sets the service result as successful" do
+        expect(result).to be_a_success
+      end
+
+      it "updates the channel accordingly" do
+        result
+        expect(channel.reload).to have_attributes(
+          name: "cool channel",
+          slug: "snail",
+          description: "a channel description",
+          allow_channel_wide_mentions: true,
+          auto_join_users: false,
+        )
+      end
+
+      it "publishes a MessageBus message" do
+        expect(message.data).to eq(
+          {
+            chat_channel_id: channel.id,
+            name: "cool channel",
+            description: "a channel description",
+            slug: "snail",
+          },
+        )
+      end
+
+      describe "name" do
+        context "when blank" do
+          before { params[:name] = "" }
+
+          it "nils out the name" do
+            result
+            expect(channel.reload.name).to be_nil
+          end
+        end
+      end
+
+      describe "description" do
+        context "when blank" do
+          before do
+            channel.update!(description: "something")
+            params[:description] = ""
+          end
+
+          it "nils out the description" do
+            result
+            expect(channel.reload.description).to be_nil
+          end
+        end
+      end
+
+      describe "#auto_join_users" do
+        context "when set to 'true'" do
+          before do
+            channel.update!(auto_join_users: false)
+            params[:auto_join_users] = true
+          end
+
+          it "updates the model accordingly" do
+            result
+            expect(channel.reload).to have_attributes(auto_join_users: true)
+          end
+
+          it "auto joins users" do
+            expect_enqueued_with(
+              job: Jobs::Chat::AutoJoinChannelMemberships,
+              args: {
+                chat_channel_id: channel.id,
+              },
+            ) { result }
+          end
+        end
+      end
+
+      describe "threading_enabled" do
+        context "when true" do
+          before { params[:threading_enabled] = true }
+
+          it "changes the value to true" do
+            expect { result }.to change { channel.reload.threading_enabled }.from(false).to(true)
+          end
+
+          it "enqueues a job to mark all threads in the channel as read" do
+            expect_enqueued_with(
+              job: Jobs::Chat::MarkAllChannelThreadsRead,
+              args: {
+                channel_id: channel.id,
+              },
+            ) { result }
+          end
+        end
+
+        context "when false" do
+          before { params[:threading_enabled] = false }
+
+          it "changes the value to false" do
+            channel.update!(threading_enabled: true)
+
+            expect { result }.to change { channel.reload.threading_enabled }.from(true).to(false)
+          end
+
+          it "does not enqueue a job to mark all threads in the channel as read" do
+            expect_not_enqueued_with(
+              job: Jobs::Chat::MarkAllChannelThreadsRead,
+              args: {
+                channel_id: channel.id,
+              },
+            ) { result }
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/services/chat/update_channel_status_spec.rb b/plugins/chat/spec/services/chat/update_channel_status_spec.rb
new file mode 100644
index 00000000000..e5ac9b92a8a
--- /dev/null
+++ b/plugins/chat/spec/services/chat/update_channel_status_spec.rb
@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+RSpec.describe(Chat::UpdateChannelStatus) do
+  subject(:result) do
+    described_class.call(guardian: guardian, channel_id: channel.id, status: status)
+  end
+
+  fab!(:channel) { Fabricate(:chat_channel) }
+  fab!(:current_user) { Fabricate(:admin) }
+
+  let(:guardian) { Guardian.new(current_user) }
+  let(:status) { "open" }
+
+  context "when no channel_id is given" do
+    subject(:result) { described_class.call(guardian: guardian, status: status) }
+
+    it { is_expected.to fail_to_find_a_model(:channel) }
+  end
+
+  context "when user is not allowed to change channel status" do
+    fab!(:current_user) { Fabricate(:user) }
+
+    it { is_expected.to fail_a_policy(:check_channel_permission) }
+  end
+
+  context "when status is not allowed" do
+    (Chat::Channel.statuses.keys - Chat::Channel.editable_statuses.keys).each do |na_status|
+      context "when status is '#{na_status}'" do
+        let(:status) { na_status }
+
+        it { is_expected.to fail_a_contract }
+      end
+    end
+  end
+
+  context "when new status is the same than the existing one" do
+    let(:status) { channel.status }
+
+    it { is_expected.to fail_a_policy(:check_channel_permission) }
+  end
+
+  context "when status is allowed" do
+    let(:status) { "closed" }
+
+    it "sets the service result as successful" do
+      expect(result).to be_a_success
+    end
+
+    it "changes the status" do
+      result
+      expect(channel.reload).to be_closed
+    end
+  end
+end
diff --git a/plugins/chat/spec/services/chat/update_thread_notification_settings_spec.rb b/plugins/chat/spec/services/chat/update_thread_notification_settings_spec.rb
new file mode 100644
index 00000000000..6d93564be85
--- /dev/null
+++ b/plugins/chat/spec/services/chat/update_thread_notification_settings_spec.rb
@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::UpdateThreadNotificationSettings do
+  describe Chat::UpdateThreadNotificationSettings::Contract, type: :model do
+    it { is_expected.to validate_presence_of :channel_id }
+    it { is_expected.to validate_presence_of :thread_id }
+    it { is_expected.to validate_presence_of :notification_level }
+  end
+
+  describe ".call" do
+    subject(:result) { described_class.call(params) }
+
+    fab!(:current_user) { Fabricate(:user) }
+    fab!(:channel) { Fabricate(:chat_channel, threading_enabled: true) }
+    fab!(:private_channel) { Fabricate(:private_category_channel, group: Fabricate(:group)) }
+    fab!(:thread) { Fabricate(:chat_thread, channel: channel) }
+    fab!(:last_reply) { Fabricate(:chat_message, thread: thread, chat_channel: channel) }
+
+    let(:guardian) { Guardian.new(current_user) }
+    let(:params) do
+      {
+        guardian: guardian,
+        thread_id: thread.id,
+        channel_id: thread.channel_id,
+        notification_level: Chat::UserChatThreadMembership.notification_levels[:normal],
+      }
+    end
+
+    context "when all steps pass" do
+      it "sets the service result as successful" do
+        expect(result).to be_a_success
+      end
+
+      context "when the user is a member of the thread" do
+        fab!(:membership) { thread.add(current_user) }
+
+        it "updates the notification_level" do
+          expect { result }.not_to change { Chat::UserChatThreadMembership.count }
+          expect(membership.reload.notification_level).to eq("normal")
+        end
+      end
+
+      context "when the user is not a member of the thread yet" do
+        it "creates the membership and sets the last read message id to the last reply" do
+          expect { result }.to change { Chat::UserChatThreadMembership.count }.by(1)
+          expect(result.membership.notification_level).to eq("normal")
+          expect(result.membership.last_read_message_id).to eq(last_reply.id)
+        end
+      end
+    end
+
+    context "when params are not valid" do
+      before { params.delete(:thread_id) }
+
+      it { is_expected.to fail_a_contract }
+    end
+
+    context "when notification_level is not valid" do
+      before { params[:notification_level] = 100 }
+
+      it { is_expected.to fail_a_contract }
+    end
+
+    context "when thread is not found because the channel ID differs" do
+      before { params[:thread_id] = Fabricate(:chat_thread).id }
+
+      it { is_expected.to fail_to_find_a_model(:thread) }
+    end
+
+    context "when thread is not found" do
+      before { thread.destroy! }
+
+      it { is_expected.to fail_to_find_a_model(:thread) }
+    end
+
+    context "when user cannot see channel" do
+      before { thread.update!(channel: private_channel) }
+
+      it { is_expected.to fail_a_policy(:can_view_channel) }
+    end
+
+    context "when threading is not enabled for the channel" do
+      before { channel.update!(threading_enabled: false) }
+
+      it { is_expected.to fail_a_policy(:threading_enabled_for_channel) }
+    end
+  end
+end
diff --git a/plugins/chat/spec/services/chat/update_thread_spec.rb b/plugins/chat/spec/services/chat/update_thread_spec.rb
new file mode 100644
index 00000000000..2d5c121ba31
--- /dev/null
+++ b/plugins/chat/spec/services/chat/update_thread_spec.rb
@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::UpdateThread do
+  describe Chat::UpdateThread::Contract, type: :model do
+    it { is_expected.to validate_presence_of :channel_id }
+    it { is_expected.to validate_presence_of :thread_id }
+  end
+
+  describe ".call" do
+    subject(:result) { described_class.call(params) }
+
+    fab!(:current_user) { Fabricate(:user) }
+    fab!(:channel) { Fabricate(:chat_channel, threading_enabled: true) }
+    fab!(:private_channel) { Fabricate(:private_category_channel, group: Fabricate(:group)) }
+    fab!(:thread) { Fabricate(:chat_thread, channel: channel, original_message_user: current_user) }
+    fab!(:other_thread) { Fabricate(:chat_thread) }
+
+    let(:guardian) { Guardian.new(current_user) }
+    let(:title) { "some new title :D" }
+    let(:params) do
+      { guardian: guardian, thread_id: thread.id, channel_id: thread.channel_id, title: title }
+    end
+
+    context "when all steps pass" do
+      it "sets the service result as successful" do
+        expect(result).to be_a_success
+      end
+
+      it "updates the title of the thread" do
+        result
+        expect(thread.reload.title).to eq(title)
+      end
+
+      it "publishes a MessageBus message" do
+        message =
+          MessageBus
+            .track_publish(Chat::Publisher.root_message_bus_channel(thread.channel_id)) { result }
+            .first
+
+        expect(message.data["type"]).to eq("update_thread_original_message")
+      end
+    end
+
+    context "when params are not valid" do
+      before { params.delete(:thread_id) }
+
+      it { is_expected.to fail_a_contract }
+    end
+
+    context "when title is too long" do
+      let(:title) { "a" * Chat::Thread::MAX_TITLE_LENGTH + "a" }
+
+      it { is_expected.to fail_a_contract }
+    end
+
+    context "when thread is not found because the channel ID differs" do
+      before { params[:thread_id] = other_thread.id }
+
+      it { is_expected.to fail_to_find_a_model(:thread) }
+    end
+
+    context "when thread is not found" do
+      before { thread.destroy! }
+
+      it { is_expected.to fail_to_find_a_model(:thread) }
+    end
+
+    context "when user cannot see channel" do
+      before { thread.update!(channel: private_channel) }
+
+      it { is_expected.to fail_a_policy(:can_view_channel) }
+    end
+
+    context "when user is not the thread original message creator" do
+      before { thread.update!(original_message_user: Fabricate(:user)) }
+
+      it { is_expected.to fail_a_policy(:can_edit_thread) }
+    end
+
+    context "when user is not the thread original message creator but they are staff" do
+      before do
+        thread.original_message.update!(user: Fabricate(:user))
+        current_user.update!(admin: true)
+      end
+
+      it { is_expected.not_to fail_a_policy(:can_edit_thread) }
+    end
+
+    context "when threading is not enabled for the channel" do
+      before { channel.update!(threading_enabled: false) }
+
+      it { is_expected.to fail_a_policy(:threading_enabled_for_channel) }
+    end
+  end
+end
diff --git a/plugins/chat/spec/services/chat/update_user_last_read_spec.rb b/plugins/chat/spec/services/chat/update_user_last_read_spec.rb
new file mode 100644
index 00000000000..9db2ee92fff
--- /dev/null
+++ b/plugins/chat/spec/services/chat/update_user_last_read_spec.rb
@@ -0,0 +1,125 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::UpdateUserLastRead do
+  describe Chat::UpdateUserLastRead::Contract, type: :model do
+    it { is_expected.to validate_presence_of :channel_id }
+    it { is_expected.to validate_presence_of :message_id }
+  end
+
+  describe ".call" do
+    subject(:result) { described_class.call(params) }
+
+    fab!(:chatters) { Fabricate(:group) }
+    fab!(:current_user) { Fabricate(:user, group_ids: [chatters.id]) }
+    fab!(:channel) { Fabricate(:chat_channel) }
+    let(:membership) do
+      Fabricate(:user_chat_channel_membership, user: current_user, chat_channel: channel)
+    end
+    let(:message_1) { Fabricate(:chat_message, chat_channel: membership.chat_channel) }
+
+    let(:guardian) { Guardian.new(current_user) }
+    let(:params) { { guardian: guardian, channel_id: channel.id, message_id: message_1.id } }
+
+    before { SiteSetting.chat_allowed_groups = [chatters] }
+
+    context "when params are not valid" do
+      before { params.delete(:message_id) }
+
+      it { is_expected.to fail_a_contract }
+    end
+
+    context "when params are valid" do
+      context "when user has no membership" do
+        before { membership.destroy! }
+
+        it { is_expected.to fail_to_find_a_model(:active_membership) }
+      end
+
+      context "when user can’t access the channel" do
+        fab!(:membership) do
+          Fabricate(
+            :user_chat_channel_membership,
+            user: current_user,
+            chat_channel: Fabricate(:private_category_channel),
+          )
+        end
+
+        before { params[:channel_id] = membership.chat_channel.id }
+
+        it { is_expected.to fail_a_policy(:invalid_access) }
+      end
+
+      context "when message_id is older than membership's last_read_message_id" do
+        before do
+          message_old = Fabricate(:chat_message, chat_channel: channel)
+          message_new = Fabricate(:chat_message, chat_channel: channel)
+          params[:message_id] = message_old.id
+          membership.update!(last_read_message_id: message_new.id)
+        end
+
+        it { is_expected.to fail_a_policy(:ensure_message_id_recency) }
+      end
+
+      context "when message doesn’t exist" do
+        before do
+          message = Fabricate(:chat_message)
+          params[:message_id] = message.id
+          message.trash!
+          membership.update!(last_read_message_id: 1)
+        end
+
+        it { is_expected.to fail_to_find_a_model(:message) }
+      end
+
+      context "when everything is fine" do
+        fab!(:notification) do
+          Fabricate(
+            :notification,
+            notification_type: Notification.types[:chat_mention],
+            user: current_user,
+          )
+        end
+
+        let(:messages) { MessageBus.track_publish { result } }
+
+        before do
+          Jobs.run_immediately!
+          Chat::Mention.create!(
+            notification: notification,
+            user: current_user,
+            chat_message: message_1,
+          )
+        end
+
+        it "sets the service result as successful" do
+          expect(result).to be_a_success
+        end
+
+        it "updates the last_read message id" do
+          expect { result }.to change { membership.reload.last_read_message_id }.to(message_1.id)
+        end
+
+        it "marks existing notifications related to the message as read" do
+          expect { result }.to change {
+            Notification.where(
+              notification_type: Notification.types[:chat_mention],
+              user: current_user,
+              read: false,
+            ).count
+          }.by(-1)
+        end
+
+        it "publishes new last read to clients" do
+          expect(messages.map(&:channel)).to include("/chat/user-tracking-state/#{current_user.id}")
+        end
+
+        it "updates the channel membership last_viewed_at datetime" do
+          membership.update!(last_viewed_at: 1.day.ago)
+          old_last_viewed_at = membership.last_viewed_at
+          result
+          expect(membership.reload.last_viewed_at).not_to eq_time(old_last_viewed_at)
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/services/chat/update_user_thread_last_read_spec.rb b/plugins/chat/spec/services/chat/update_user_thread_last_read_spec.rb
new file mode 100644
index 00000000000..c1bd66fcb03
--- /dev/null
+++ b/plugins/chat/spec/services/chat/update_user_thread_last_read_spec.rb
@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::UpdateUserThreadLastRead do
+  describe Chat::UpdateUserThreadLastRead::Contract, type: :model do
+    it { is_expected.to validate_presence_of :channel_id }
+    it { is_expected.to validate_presence_of :thread_id }
+  end
+
+  describe ".call" do
+    subject(:result) { described_class.call(params) }
+
+    fab!(:chatters) { Fabricate(:group) }
+    fab!(:current_user) { Fabricate(:user, group_ids: [chatters.id]) }
+    fab!(:channel) { Fabricate(:chat_channel) }
+    fab!(:thread) { Fabricate(:chat_thread, channel: channel, old_om: true) }
+    fab!(:thread_reply_1) { Fabricate(:chat_message, chat_channel: channel, thread: thread) }
+    fab!(:thread_reply_2) { Fabricate(:chat_message, chat_channel: channel, thread: thread) }
+
+    let(:guardian) { Guardian.new(current_user) }
+    let(:params) { { guardian: guardian, channel_id: channel.id, thread_id: thread.id } }
+
+    before { SiteSetting.chat_allowed_groups = [chatters] }
+
+    context "when params are not valid" do
+      before { params.delete(:thread_id) }
+
+      it { is_expected.to fail_a_contract }
+    end
+
+    context "when params are valid" do
+      context "when user can’t access the channel" do
+        fab!(:channel) { Fabricate(:private_category_channel) }
+        fab!(:thread) { Fabricate(:chat_thread, channel: channel) }
+
+        it { is_expected.to fail_a_policy(:invalid_access) }
+      end
+
+      context "when thread cannot be found" do
+        before { params[:channel_id] = Fabricate(:chat_channel).id }
+
+        it { is_expected.to fail_to_find_a_model(:thread) }
+      end
+
+      context "when everything is fine" do
+        fab!(:notification_1) do
+          Fabricate(
+            :notification,
+            notification_type: Notification.types[:chat_mention],
+            user: current_user,
+          )
+        end
+        fab!(:notification_2) do
+          Fabricate(
+            :notification,
+            notification_type: Notification.types[:chat_mention],
+            user: current_user,
+          )
+        end
+
+        let(:messages) { MessageBus.track_publish { result } }
+
+        before do
+          Jobs.run_immediately!
+          Chat::Mention.create!(
+            notification: notification_1,
+            user: current_user,
+            chat_message: Fabricate(:chat_message, chat_channel: channel, thread: thread),
+          )
+          Chat::Mention.create!(
+            notification: notification_2,
+            user: current_user,
+            chat_message: Fabricate(:chat_message, chat_channel: channel, thread: thread),
+          )
+        end
+
+        it "sets the service result as successful" do
+          expect(result).to be_a_success
+        end
+
+        it "marks existing notifications related to all messages in the thread as read" do
+          expect { result }.to change {
+            Notification.where(
+              notification_type: Notification.types[:chat_mention],
+              user: current_user,
+              read: false,
+            ).count
+          }.by(-2)
+        end
+
+        it "publishes new last read to clients" do
+          expect(messages.map(&:channel)).to include("/chat/user-tracking-state/#{current_user.id}")
+        end
+
+        context "when the user is a member of the thread" do
+          fab!(:membership) do
+            Fabricate(:user_chat_thread_membership, user: current_user, thread: thread)
+          end
+
+          it "updates the last_read_message_id of the thread" do
+            result
+            expect(membership.reload.last_read_message_id).to eq(thread.reload.last_message.id)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/services/chat_message_destroyer_spec.rb b/plugins/chat/spec/services/chat_message_destroyer_spec.rb
deleted file mode 100644
index e6016b7bca3..00000000000
--- a/plugins/chat/spec/services/chat_message_destroyer_spec.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe ChatMessageDestroyer do
-  describe "#destroy_in_batches" do
-    fab!(:message_1) { Fabricate(:chat_message) }
-    fab!(:user_1) { Fabricate(:user) }
-
-    it "resets last_read_message_id from memberships" do
-      membership =
-        UserChatChannelMembership.create!(
-          user: user_1,
-          chat_channel: message_1.chat_channel,
-          last_read_message: message_1,
-          following: true,
-          desktop_notification_level: 2,
-          mobile_notification_level: 2,
-        )
-
-      described_class.new.destroy_in_batches(ChatMessage.where(id: message_1.id))
-
-      expect(membership.reload.last_read_message_id).to be_nil
-    end
-
-    it "deletes flags associated to deleted chat messages" do
-      guardian = Guardian.new(Discourse.system_user)
-      Chat::ChatReviewQueue.new.flag_message(message_1, guardian, ReviewableScore.types[:off_topic])
-
-      reviewable = ReviewableChatMessage.last
-      expect(reviewable).to be_present
-
-      described_class.new.destroy_in_batches(ChatMessage.where(id: message_1.id))
-
-      expect { message_1.reload }.to raise_exception(ActiveRecord::RecordNotFound)
-      expect { reviewable.reload }.to raise_exception(ActiveRecord::RecordNotFound)
-    end
-
-    it "doesn't delete other messages" do
-      message_2 = Fabricate(:chat_message, chat_channel: message_1.chat_channel)
-
-      described_class.new.destroy_in_batches(ChatMessage.where(id: message_1.id))
-
-      expect { message_1.reload }.to raise_exception(ActiveRecord::RecordNotFound)
-      expect(message_2.reload).to be_present
-    end
-  end
-end
diff --git a/plugins/chat/spec/services/chat_publisher_spec.rb b/plugins/chat/spec/services/chat_publisher_spec.rb
deleted file mode 100644
index 3416170a329..00000000000
--- a/plugins/chat/spec/services/chat_publisher_spec.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require "rails_helper"
-
-describe ChatPublisher do
-  fab!(:channel) { Fabricate(:category_channel) }
-  fab!(:message) { Fabricate(:chat_message, chat_channel: channel) }
-
-  describe ".publish_refresh!" do
-    it "publishes the message" do
-      data = MessageBus.track_publish { ChatPublisher.publish_refresh!(channel, message) }[0].data
-
-      expect(data["chat_message"]["id"]).to eq(message.id)
-      expect(data["type"]).to eq("refresh")
-    end
-  end
-end
diff --git a/plugins/chat/spec/support/api/schemas/category_chat_channel.json b/plugins/chat/spec/support/api/schemas/category_chat_channel.json
index 60fe90b3fd6..2e952ebbd56 100644
--- a/plugins/chat/spec/support/api/schemas/category_chat_channel.json
+++ b/plugins/chat/spec/support/api/schemas/category_chat_channel.json
@@ -21,7 +21,7 @@
     "chatable_url": { "type": "string" },
     "title": { "type": "string" },
     "chatable_id": { "type": "number" },
-    "last_message_sent_at": { "type": "string" },
+    "last_message": { "type": ["object", "null"] },
     "status": { "type": "string" },
     "chatable": {
       "type": "object",
diff --git a/plugins/chat/spec/support/api/schemas/user_chat_channel_membership.json b/plugins/chat/spec/support/api/schemas/user_chat_channel_membership.json
index 30725b7d446..4111fe5fa22 100644
--- a/plugins/chat/spec/support/api/schemas/user_chat_channel_membership.json
+++ b/plugins/chat/spec/support/api/schemas/user_chat_channel_membership.json
@@ -6,7 +6,8 @@
     "muted",
     "desktop_notification_level",
     "mobile_notification_level",
-    "following"
+    "following",
+    "last_viewed_at"
   ],
   "properties": {
     "chat_channel_id": { "type": "number" },
@@ -14,9 +15,8 @@
     "muted": { "type": "boolean" },
     "desktop_notification_level": { "type": "string" },
     "mobile_notification_level": { "type": "string" },
+    "last_viewed_at": { "type": "string" },
     "following": { "type": "boolean" },
-    "unread_count": { "type": "number" },
-    "unread_mentions": { "type": "number" },
     "user": {
       "type": ["object", "null"],
       "required": ["id", "name", "avatar_template", "username"],
@@ -26,6 +26,7 @@
         "avatar_template": { "type": "string" },
         "username": { "type": "string" }
       }
-    }
+    },
+    "last_viewed_at": { "type": "datetime" }
   }
 }
diff --git a/plugins/chat/spec/support/api_schema_matcher.rb b/plugins/chat/spec/support/api_schema_matcher.rb
index e78e158d79c..2c36fe40d6f 100644
--- a/plugins/chat/spec/support/api_schema_matcher.rb
+++ b/plugins/chat/spec/support/api_schema_matcher.rb
@@ -9,7 +9,7 @@ RSpec::Matchers.define :match_response_schema do |schema|
       JSON::Validator.validate!(schema_path, object, strict: true)
     rescue JSON::Schema::ValidationError => e
       puts "-- Printing response body after validation error\n"
-      pp object
+      pp object # rubocop:disable Lint/Debugger
       raise e
     end
   end
diff --git a/plugins/chat/spec/support/chat_helper.rb b/plugins/chat/spec/support/chat_helper.rb
deleted file mode 100644
index 9a093be4368..00000000000
--- a/plugins/chat/spec/support/chat_helper.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module ChatHelper
-  def self.make_messages!(chatable, users, count)
-    users = [users] unless Array === users
-    raise ArgumentError if users.length <= 0
-
-    chatable = Fabricate(:category) unless chatable
-    chat_channel = Fabricate(:chat_channel, chatable: chatable)
-
-    count.times do |n|
-      ChatMessage.new(
-        chat_channel: chat_channel,
-        user: users[n % users.length],
-        message: "Chat message for test #{n}",
-      ).save!
-    end
-  end
-end
diff --git a/plugins/chat/spec/support/chat_service_matcher.rb b/plugins/chat/spec/support/chat_service_matcher.rb
new file mode 100644
index 00000000000..e3ca0ac067d
--- /dev/null
+++ b/plugins/chat/spec/support/chat_service_matcher.rb
@@ -0,0 +1,135 @@
+# frozen_string_literal: true
+
+module Chat
+  module ServiceMatchers
+    class FailStep
+      attr_reader :name, :result
+
+      def initialize(name)
+        @name = name
+      end
+
+      def matches?(result)
+        @result = result
+        step_exists? && step_failed? && service_failed?
+      end
+
+      def failure_message
+        set_unexpected_result
+        message =
+          if !step_exists?
+            "Expected #{type} '#{name}' (key: '#{step}') was not found in the result object."
+          elsif !step_failed?
+            "Expected #{type} '#{name}' (key: '#{step}') to fail but it succeeded."
+          else
+            "expected the service to fail but it succeeded."
+          end
+        error_message_with_inspection(message)
+      end
+
+      def failure_message_when_negated
+        set_unexpected_result
+        message = "Expected #{type} '#{name}' (key: '#{step}') to succeed but it failed."
+        error_message_with_inspection(message)
+      end
+
+      def description
+        "fail a #{type} named '#{name}'"
+      end
+
+      private
+
+      def step_exists?
+        result[step].present?
+      end
+
+      def step_failed?
+        result[step].failure?
+      end
+
+      def service_failed?
+        result.failure?
+      end
+
+      def type
+        self.class.name.split("::").last.sub("Fail", "").downcase
+      end
+
+      def step
+        "result.#{type}.#{name}"
+      end
+
+      def error_message_with_inspection(message)
+        inspector = StepsInspector.new(result)
+        "#{message}\n\n#{inspector.inspect}\n\n#{inspector.error}"
+      end
+
+      def set_unexpected_result
+        return unless result[step]
+        result[step]["spec.unexpected_result"] = true
+      end
+    end
+
+    class FailContract < FailStep
+    end
+
+    class FailPolicy < FailStep
+    end
+
+    class FailToFindModel < FailStep
+      def type
+        "model"
+      end
+
+      def description
+        "fail to find a model named '#{name}'"
+      end
+
+      def step_failed?
+        super && result[name].blank?
+      end
+    end
+
+    class FailWithInvalidModel < FailStep
+      def type
+        "model"
+      end
+
+      def description
+        "fail to have a valid model named '#{name}'"
+      end
+
+      def step_failed?
+        super && result[step].invalid
+      end
+    end
+
+    def fail_a_policy(name)
+      FailPolicy.new(name)
+    end
+
+    def fail_a_contract(name = "default")
+      FailContract.new(name)
+    end
+
+    def fail_to_find_a_model(name = "model")
+      FailToFindModel.new(name)
+    end
+
+    def fail_with_an_invalid_model(name = "model")
+      FailWithInvalidModel.new(name)
+    end
+
+    def fail_a_step(name = "model")
+      FailStep.new(name)
+    end
+
+    def inspect_steps(result)
+      inspector = Chat::StepsInspector.new(result)
+      puts "Steps:"
+      puts inspector.inspect
+      puts "\nFirst error:"
+      puts inspector.error
+    end
+  end
+end
diff --git a/plugins/chat/spec/support/examples/chat_channel_model.rb b/plugins/chat/spec/support/examples/chat_channel_model.rb
index 58ae52b29cb..debeda7f38f 100644
--- a/plugins/chat/spec/support/examples/chat_channel_model.rb
+++ b/plugins/chat/spec/support/examples/chat_channel_model.rb
@@ -41,7 +41,7 @@ RSpec.shared_examples "a chat channel model" do
       before { category_channel_1.chatable.destroy! }
 
       it "doesn’t list the channel" do
-        ids = ChatChannel.public_channels.pluck(:chatable_id)
+        ids = Chat::Channel.public_channels.pluck(:chatable_id)
         expect(ids).to_not include(category_channel_1.chatable_id)
         expect(ids).to include(category_channel_2.chatable_id)
       end
@@ -235,7 +235,7 @@ RSpec.shared_examples "a chat channel model" do
       expect(membership.chat_channel).to eq(private_category_channel)
       expect(private_category_channel.user_count_stale).to eq(true)
       expect_job_enqueued(
-        job: :update_channel_user_count,
+        job: Jobs::Chat::UpdateChannelUserCount,
         args: {
           chat_channel_id: private_category_channel.id,
         },
@@ -244,7 +244,7 @@ RSpec.shared_examples "a chat channel model" do
 
     it "updates an existing membership for the user and enqueues a job to update the count" do
       membership =
-        UserChatChannelMembership.create!(
+        Chat::UserChatChannelMembership.create!(
           chat_channel: private_category_channel,
           user: user1,
           following: false,
@@ -256,7 +256,7 @@ RSpec.shared_examples "a chat channel model" do
       expect(membership.reload.following).to eq(true)
       expect(private_category_channel.user_count_stale).to eq(true)
       expect_job_enqueued(
-        job: :update_channel_user_count,
+        job: Jobs::Chat::UpdateChannelUserCount,
         args: {
           chat_channel_id: private_category_channel.id,
         },
@@ -265,7 +265,7 @@ RSpec.shared_examples "a chat channel model" do
 
     it "does nothing if the user is already a member" do
       membership =
-        UserChatChannelMembership.create!(
+        Chat::UserChatChannelMembership.create!(
           chat_channel: private_category_channel,
           user: user1,
           following: true,
@@ -273,7 +273,7 @@ RSpec.shared_examples "a chat channel model" do
 
       expect(private_category_channel.user_count_stale).to eq(false)
       expect_not_enqueued_with(
-        job: :update_channel_user_count,
+        job: Jobs::Chat::UpdateChannelUserCount,
         args: {
           chat_channel_id: private_category_channel.id,
         },
@@ -283,7 +283,7 @@ RSpec.shared_examples "a chat channel model" do
     it "does not recalculate user count if it's already been marked as stale" do
       private_category_channel.update!(user_count_stale: true)
       expect_not_enqueued_with(
-        job: :update_channel_user_count,
+        job: Jobs::Chat::UpdateChannelUserCount,
         args: {
           chat_channel_id: private_category_channel.id,
         },
@@ -306,7 +306,7 @@ RSpec.shared_examples "a chat channel model" do
       expect(@membership.reload.following).to eq(false)
       expect(private_category_channel.user_count_stale).to eq(true)
       expect_job_enqueued(
-        job: :update_channel_user_count,
+        job: Jobs::Chat::UpdateChannelUserCount,
         args: {
           chat_channel_id: private_category_channel.id,
         },
@@ -325,7 +325,7 @@ RSpec.shared_examples "a chat channel model" do
 
       expect(private_category_channel.user_count_stale).to eq(false)
       expect_job_enqueued(
-        job: :update_channel_user_count,
+        job: Jobs::Chat::UpdateChannelUserCount,
         args: {
           chat_channel_id: private_category_channel.id,
         },
@@ -335,7 +335,7 @@ RSpec.shared_examples "a chat channel model" do
     it "does not recalculate user count if it's already been marked as stale" do
       private_category_channel.update!(user_count_stale: true)
       expect_not_enqueued_with(
-        job: :update_channel_user_count,
+        job: Jobs::Chat::UpdateChannelUserCount,
         args: {
           chat_channel_id: private_category_channel.id,
         },
diff --git a/plugins/chat/spec/system/admin/csv_exports_spec.rb b/plugins/chat/spec/system/admin/csv_exports_spec.rb
new file mode 100644
index 00000000000..339f9b61da0
--- /dev/null
+++ b/plugins/chat/spec/system/admin/csv_exports_spec.rb
@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+RSpec.describe "Chat CSV exports", type: :system do
+  fab!(:admin) { Fabricate(:admin) }
+  let(:csv_export_pm_page) { PageObjects::Pages::CSVExportPM.new }
+
+  before do
+    Jobs.run_immediately!
+    sign_in(admin)
+    chat_system_bootstrap
+  end
+
+  xit "exports chat messages" do
+    message_1 = Fabricate(:chat_message, created_at: 12.months.ago)
+    message_2 = Fabricate(:chat_message, created_at: 6.months.ago)
+    message_3 = Fabricate(:chat_message, created_at: 1.months.ago)
+    message_4 = Fabricate(:chat_message, created_at: Time.now)
+
+    visit "/admin/plugins/chat"
+    click_button "Create export"
+
+    visit "/u/#{admin.username}/messages"
+    click_link "[Chat Message] Data export complete"
+    expect(csv_export_pm_page).to have_download_link
+    exported_data = csv_export_pm_page.download_and_extract
+
+    expect(exported_data.first).to eq(
+      %w[
+        id
+        chat_channel_id
+        chat_channel_name
+        user_id
+        username
+        message
+        cooked
+        created_at
+        updated_at
+        deleted_at
+        in_reply_to_id
+        last_editor_id
+        last_editor_username
+      ],
+    )
+
+    assert_message(exported_data.second, message_1)
+    assert_message(exported_data.third, message_2)
+    assert_message(exported_data.fourth, message_3)
+    assert_message(exported_data.fifth, message_4)
+  ensure
+    csv_export_pm_page.clear_downloads
+  end
+
+  def assert_message(exported_message, message)
+    time_format = "%Y-%m-%d %H:%M:%S UTC"
+    expect(exported_message).to eq(
+      [
+        message.id.to_s,
+        message.chat_channel.id.to_s,
+        message.chat_channel.name,
+        message.user.id.to_s,
+        message.user.username,
+        message.message,
+        message.cooked,
+        message.created_at.strftime(time_format),
+        message.updated_at.strftime(time_format),
+        nil,
+        nil,
+        message.last_editor.id.to_s,
+        message.last_editor.username,
+      ],
+    )
+  end
+end
diff --git a/plugins/chat/spec/system/anonymous_spec.rb b/plugins/chat/spec/system/anonymous_spec.rb
index e33ffa97462..4b5a51e2601 100644
--- a/plugins/chat/spec/system/anonymous_spec.rb
+++ b/plugins/chat/spec/system/anonymous_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "Anonymous", type: :system, js: true do
+RSpec.describe "Anonymous", type: :system do
   fab!(:topic) { Fabricate(:topic) }
 
   before { chat_system_bootstrap }
diff --git a/plugins/chat/spec/system/archive_channel_spec.rb b/plugins/chat/spec/system/archive_channel_spec.rb
index bfbb33f3e94..7d3c5105ee0 100644
--- a/plugins/chat/spec/system/archive_channel_spec.rb
+++ b/plugins/chat/spec/system/archive_channel_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "Archive channel", type: :system, js: true do
+RSpec.describe "Archive channel", type: :system do
   fab!(:channel_1) { Fabricate(:chat_channel) }
 
   let(:chat) { PageObjects::Pages::Chat.new }
@@ -61,20 +61,7 @@ RSpec.describe "Archive channel", type: :system, js: true do
           find("#split-topic-name").fill_in(with: "An interesting topic for cats")
           click_button(I18n.t("js.chat.channel_archive.title"))
 
-          expect(page).to have_content(I18n.t("js.chat.channel_archive.process_started"))
-          expect(page).to have_css(".chat-channel-archive-status")
-        end
-
-        it "shows an error when the topic is invalid" do
-          chat.visit_channel_settings(channel_1)
-          click_button(I18n.t("js.chat.channel_settings.archive_channel"))
-          find("#split-topic-name").fill_in(
-            with: "An interesting topic for cats :cat: :cat2: :smile_cat:",
-          )
-          click_button(I18n.t("js.chat.channel_archive.title"))
-
-          expect(page).not_to have_content(I18n.t("js.chat.channel_archive.process_started"))
-          expect(page).to have_content("Title can't have more than 1 emoji")
+          expect(page).to have_css(".chat-channel-archive-status", wait: 15)
         end
 
         context "when archived channels had unreads" do
@@ -85,7 +72,7 @@ RSpec.describe "Archive channel", type: :system, js: true do
 
             other_user = Fabricate(:user)
             channel_1.add(other_user)
-            Chat::ChatMessageCreator.create(
+            Chat::MessageCreator.create(
               chat_channel: channel_1,
               user: other_user,
               content: "this is fine @#{current_user.username}",
@@ -108,7 +95,7 @@ RSpec.describe "Archive channel", type: :system, js: true do
         before { channel_1.update!(status: :read_only) }
 
         fab!(:archive) do
-          ChatChannelArchive.create!(
+          Chat::ChannelArchive.create!(
             chat_channel: channel_1,
             archived_by: current_user,
             destination_topic_title: "This will be the archive topic",
@@ -118,11 +105,12 @@ RSpec.describe "Archive channel", type: :system, js: true do
           )
         end
 
-        it "can be retried" do
+        xit "can be retried" do
           Jobs.run_immediately!
 
           chat.visit_channel(channel_1)
           click_button(I18n.t("js.chat.channel_archive.retry"))
+          expect(page).to have_css(".chat-channel-archive-status a")
 
           new_window = window_opened_by { find(".chat-channel-archive-status a").click }
           within_window(new_window) do
diff --git a/plugins/chat/spec/system/bookmark_message_spec.rb b/plugins/chat/spec/system/bookmark_message_spec.rb
index 2b843360958..816e0beaaef 100644
--- a/plugins/chat/spec/system/bookmark_message_spec.rb
+++ b/plugins/chat/spec/system/bookmark_message_spec.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-RSpec.describe "Bookmark message", type: :system, js: true do
+RSpec.describe "Bookmark message", type: :system do
   fab!(:current_user) { Fabricate(:user) }
 
-  let(:chat) { PageObjects::Pages::Chat.new }
-  let(:channel) { PageObjects::Pages::ChatChannel.new }
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:channel_page) { PageObjects::Pages::ChatChannel.new }
   let(:bookmark_modal) { PageObjects::Modals::Bookmark.new }
 
   fab!(:category_channel_1) { Fabricate(:category_channel) }
@@ -18,13 +18,13 @@ RSpec.describe "Bookmark message", type: :system, js: true do
 
   context "when desktop" do
     it "allows to bookmark a message" do
-      chat.visit_channel(category_channel_1)
-      channel.bookmark_message(message_1)
+      chat_page.visit_channel(category_channel_1)
+      channel_page.bookmark_message(message_1)
 
       bookmark_modal.fill_name("Check this out later")
       bookmark_modal.select_preset_reminder(:next_month)
 
-      expect(channel).to have_bookmarked_message(message_1)
+      expect(channel_page).to have_bookmarked_message(message_1)
     end
 
     context "when the user has a bookmark auto_delete_preference" do
@@ -35,11 +35,11 @@ RSpec.describe "Bookmark message", type: :system, js: true do
       end
 
       it "is respected when the user creates a new bookmark" do
-        chat.visit_channel(category_channel_1)
-        channel.bookmark_message(message_1)
+        chat_page.visit_channel(category_channel_1)
+        channel_page.bookmark_message(message_1)
 
         bookmark_modal.save
-        expect(channel).to have_bookmarked_message(message_1)
+        expect(channel_page).to have_bookmarked_message(message_1)
 
         bookmark = Bookmark.find_by(bookmarkable: message_1, user: current_user)
         expect(bookmark.auto_delete_preference).to eq(
@@ -51,15 +51,13 @@ RSpec.describe "Bookmark message", type: :system, js: true do
 
   context "when mobile", mobile: true do
     it "allows to bookmark a message" do
-      chat.visit_channel(category_channel_1)
-
-      channel.message_by_id(message_1.id).click(delay: 0.5)
-      find(".bookmark-btn").click
+      chat_page.visit_channel(category_channel_1)
+      channel_page.bookmark_message(message_1)
 
       bookmark_modal.fill_name("Check this out later")
       bookmark_modal.select_preset_reminder(:next_month)
 
-      expect(channel).to have_bookmarked_message(message_1)
+      expect(channel_page).to have_bookmarked_message(message_1)
     end
   end
 end
diff --git a/plugins/chat/spec/system/browse_page_spec.rb b/plugins/chat/spec/system/browse_page_spec.rb
index 31392066c38..2568a04c801 100644
--- a/plugins/chat/spec/system/browse_page_spec.rb
+++ b/plugins/chat/spec/system/browse_page_spec.rb
@@ -1,13 +1,10 @@
 # frozen_string_literal: true
 
-RSpec.describe "Browse page", type: :system, js: true do
+RSpec.describe "Browse page", type: :system do
   fab!(:current_user) { Fabricate(:user) }
 
-  let(:chat) { PageObjects::Pages::Chat.new }
-
-  def browse_view
-    page.find(".chat-browse-view")
-  end
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:browse_page) { PageObjects::Pages::ChatBrowse.new }
 
   before do
     sign_in(current_user)
@@ -18,8 +15,16 @@ RSpec.describe "Browse page", type: :system, js: true do
     before { current_user.user_option.update!(chat_enabled: false) }
 
     it "redirects to homepage" do
-      visit("/chat/browse")
+      visit("/chat/browse") # no page object here as we actually don't load it
+      expect(page).to have_current_path("/latest")
+    end
+  end
 
+  context "when public channels are disabled" do
+    before { SiteSetting.enable_public_channels = false }
+
+    it "redirects to homepage" do
+      visit("/chat/browse") # no page object here as we actually don't load it
       expect(page).to have_current_path("/latest")
     end
   end
@@ -27,79 +32,75 @@ RSpec.describe "Browse page", type: :system, js: true do
   context "when user has chat enabled" do
     context "when visiting browse page" do
       it "defaults to open filer" do
-        visit("/chat/browse")
-
-        expect(page).to have_current_path("/chat/browse/open")
+        chat_page.visit_browse
+        expect(browse_page).to have_current_path("/chat/browse/open")
       end
 
       it "has the expected tabs" do
-        visit("/chat/browse")
-
-        expect(browse_view).to have_content(I18n.t("js.chat.browse.filter_all"))
-        expect(browse_view).to have_content(I18n.t("js.chat.browse.filter_open"))
-        expect(browse_view).to have_content(I18n.t("js.chat.browse.filter_closed"))
+        chat_page.visit_browse
+        expect(browse_page).to have_channel(name: I18n.t("js.chat.browse.filter_all"))
+        expect(browse_page).to have_channel(name: I18n.t("js.chat.browse.filter_open"))
+        expect(browse_page).to have_channel(name: I18n.t("js.chat.browse.filter_closed"))
       end
 
       it "has not archived tab available" do
-        visit("/chat/browse")
-
-        expect(browse_view).to have_no_content(I18n.t("js.chat.browse.filter_archived"))
+        chat_page.visit_browse
+        expect(browse_page).to have_no_channel(name: I18n.t("js.chat.browse.filter_archived"))
       end
 
       it "redirects archived tab to default tab" do
-        visit("/chat/browse/archived")
+        chat_page.visit_browse(:archived)
 
-        expect(page).to have_current_path("/chat/browse/open")
+        expect(browse_page).to have_current_path("/chat/browse/open")
       end
 
       context "when archiving channels is enabled" do
         before { SiteSetting.chat_allow_archiving_channels = true }
 
         it "has the archived tab" do
-          visit("/chat/browse")
-
-          expect(browse_view).to have_content(I18n.t("js.chat.browse.filter_archived"))
+          chat_page.visit_browse
+          expect(browse_page).to have_channel(name: I18n.t("js.chat.browse.filter_archived"))
         end
       end
     end
 
     context "when on mobile", mobile: true do
       it "has a back button" do
-        visit("/chat/browse")
+        chat_page.visit_browse
         find(".chat-full-page-header__back-btn").click
 
-        expect(page).to have_current_path("/chat")
+        expect(browse_page).to have_current_path("/chat")
       end
     end
 
-    context "when filtering resuls" do
+    context "when filtering results" do
       fab!(:category_channel_1) { Fabricate(:chat_channel, name: "foo") }
       fab!(:category_channel_2) { Fabricate(:chat_channel, name: "bar") }
 
       context "when results are found" do
         it "lists expected results" do
-          visit("/chat/browse")
-          find(".dc-filter-input").fill_in(with: category_channel_1.name)
+          chat_page.visit_browse
+          browse_page.search(category_channel_1.name)
 
-          expect(browse_view).to have_content(category_channel_1.name)
-          expect(browse_view).to have_no_content(category_channel_2.name)
+          expect(browse_page).to have_channel(name: category_channel_1.name)
+          expect(browse_page).to have_no_channel(name: category_channel_2.name)
         end
       end
 
       context "when results are not found" do
         it "displays the correct message" do
-          visit("/chat/browse")
-          find(".dc-filter-input").fill_in(with: "x")
+          chat_page.visit_browse
+          browse_page.search("x")
 
-          expect(browse_view).to have_content(I18n.t("js.chat.empty_state.title"))
+          expect(browse_page).to have_channel(name: I18n.t("js.chat.empty_state.title"))
         end
 
         it "doesn’t display any channel" do
-          visit("/chat/browse")
-          find(".dc-filter-input").fill_in(with: "x")
+          chat_page.visit_browse
+          browse_page.search("x")
 
-          expect(browse_view).to have_no_content(category_channel_1.name)
-          expect(browse_view).to have_no_content(category_channel_2.name)
+          expect(browse_page).to have_no_channel(name: category_channel_1.name)
+          expect(browse_page).to have_no_channel(name: category_channel_2.name)
         end
       end
     end
@@ -116,48 +117,48 @@ RSpec.describe "Browse page", type: :system, js: true do
 
       shared_examples "never visible channels" do
         it "doesn’t list direct message channel" do
-          expect(browse_view).to have_no_content(direct_message_channel_1.title(current_user))
+          expect(browse_page).to have_no_channel(name: direct_message_channel_1.title(current_user))
         end
 
         it "doesn’t list destroyed channels" do
-          expect(browse_view).to have_no_content(category_channel_5.title)
+          expect(browse_page).to have_no_channel(name: category_channel_5.title)
         end
       end
 
       context "when filter is all" do
         it "lists all category channels" do
-          visit("/chat/browse/all")
+          chat_page.visit_browse(:all)
 
-          expect(browse_view).to have_content(category_channel_1.name)
-          expect(browse_view).to have_content(category_channel_2.name)
-          expect(browse_view).to have_content(category_channel_3.name)
-          expect(browse_view).to have_content(category_channel_4.name)
+          expect(browse_page).to have_channel(name: category_channel_1.name)
+          expect(browse_page).to have_channel(name: category_channel_2.name)
+          expect(browse_page).to have_channel(name: category_channel_3.name)
+          expect(browse_page).to have_channel(name: category_channel_4.name)
         end
 
         context "when loading more" do
           before { 25.times { Fabricate(:chat_channel, status: :open) } }
 
           it "works" do
-            visit("/chat/browse/all")
+            chat_page.visit_browse(:all)
             scroll_to(find(".chat-channel-card:last-child"))
 
-            expect(page).to have_selector(".chat-channel-card", count: 29)
+            expect(browse_page).to have_selector(".chat-channel-card", count: 29)
           end
         end
 
         include_examples "never visible channels" do
-          before { visit("/chat/browse/all") }
+          before { chat_page.visit_browse(:all) }
         end
       end
 
       context "when filter is open" do
         it "lists all opened category channels" do
-          visit("/chat/browse/open")
+          chat_page.visit_browse(:open)
 
-          expect(browse_view).to have_content(category_channel_1.name)
-          expect(browse_view).to have_no_content(category_channel_2.name)
-          expect(browse_view).to have_no_content(category_channel_3.name)
-          expect(browse_view).to have_no_content(category_channel_4.name)
+          expect(browse_page).to have_channel(name: category_channel_1.name)
+          expect(browse_page).to have_no_channel(name: category_channel_2.name)
+          expect(browse_page).to have_no_channel(name: category_channel_3.name)
+          expect(browse_page).to have_no_channel(name: category_channel_4.name)
         end
 
         context "when loading more" do
@@ -165,26 +166,26 @@ RSpec.describe "Browse page", type: :system, js: true do
           fab!(:invalid_channel) { Fabricate(:chat_channel, status: :closed) }
 
           it "keeps the filter" do
-            visit("/chat/browse/open")
+            chat_page.visit_browse(:open)
 
-            expect(page).to have_content(valid_channel.title)
-            expect(page).to have_no_content(invalid_channel.title)
+            expect(browse_page).to have_channel(name: valid_channel.title)
+            expect(browse_page).to have_no_channel(name: invalid_channel.title)
           end
         end
 
         include_examples "never visible channels" do
-          before { visit("/chat/browse/open") }
+          before { chat_page.visit_browse(:open) }
         end
       end
 
       context "when filter is closed" do
         it "lists all closed category channels" do
-          visit("/chat/browse/closed")
+          chat_page.visit_browse(:closed)
 
-          expect(browse_view).to have_no_content(category_channel_1.name)
-          expect(browse_view).to have_no_content(category_channel_2.name)
-          expect(browse_view).to have_content(category_channel_3.name)
-          expect(browse_view).to have_no_content(category_channel_4.name)
+          expect(browse_page).to have_no_channel(name: category_channel_1.name)
+          expect(browse_page).to have_no_channel(name: category_channel_2.name)
+          expect(browse_page).to have_channel(name: category_channel_3.name)
+          expect(browse_page).to have_no_channel(name: category_channel_4.name)
         end
 
         context "when loading more" do
@@ -192,15 +193,15 @@ RSpec.describe "Browse page", type: :system, js: true do
           fab!(:invalid_channel) { Fabricate(:chat_channel, status: :open) }
 
           it "keeps the filter" do
-            visit("/chat/browse/closed")
+            chat_page.visit_browse(:closed)
 
-            expect(page).to have_content(valid_channel.title)
-            expect(page).to have_no_content(invalid_channel.title)
+            expect(browse_page).to have_channel(name: valid_channel.title)
+            expect(browse_page).to have_no_channel(name: invalid_channel.title)
           end
         end
 
         include_examples "never visible channels" do
-          before { visit("/chat/browse/closed") }
+          before { chat_page.visit_browse(:closed) }
         end
       end
 
@@ -208,12 +209,12 @@ RSpec.describe "Browse page", type: :system, js: true do
         before { SiteSetting.chat_allow_archiving_channels = true }
 
         it "lists all archived category channels" do
-          visit("/chat/browse/archived")
+          chat_page.visit_browse(:archived)
 
-          expect(browse_view).to have_no_content(category_channel_1.name)
-          expect(browse_view).to have_no_content(category_channel_2.name)
-          expect(browse_view).to have_no_content(category_channel_3.name)
-          expect(browse_view).to have_content(category_channel_4.name)
+          expect(browse_page).to have_no_channel(name: category_channel_1.name)
+          expect(browse_page).to have_no_channel(name: category_channel_2.name)
+          expect(browse_page).to have_no_channel(name: category_channel_3.name)
+          expect(browse_page).to have_channel(name: category_channel_4.name)
         end
 
         context "when loading more" do
@@ -221,15 +222,15 @@ RSpec.describe "Browse page", type: :system, js: true do
           fab!(:invalid_channel) { Fabricate(:chat_channel, status: :open) }
 
           it "keeps the filter" do
-            visit("/chat/browse/archived")
+            chat_page.visit_browse(:archived)
 
-            expect(page).to have_content(valid_channel.title)
-            expect(page).to have_no_content(invalid_channel.title)
+            expect(browse_page).to have_channel(name: valid_channel.title)
+            expect(browse_page).to have_no_channel(name: invalid_channel.title)
           end
         end
 
         include_examples "never visible channels" do
-          before { visit("/chat/browse/archived") }
+          before { chat_page.visit_browse(:archived) }
         end
       end
     end
diff --git a/plugins/chat/spec/system/channel_about_page_spec.rb b/plugins/chat/spec/system/channel_about_page_spec.rb
index 192ddd94b6b..550fa4c3ee4 100644
--- a/plugins/chat/spec/system/channel_about_page_spec.rb
+++ b/plugins/chat/spec/system/channel_about_page_spec.rb
@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
-RSpec.describe "Channel - Info - About page", type: :system, js: true do
+RSpec.describe "Channel - Info - About page", type: :system do
   fab!(:channel_1) { Fabricate(:category_channel) }
 
   let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:chat_channel_about_page) { PageObjects::Pages::ChatChannelAbout.new }
 
   before { chat_system_bootstrap }
 
@@ -17,6 +18,7 @@ RSpec.describe "Channel - Info - About page", type: :system, js: true do
 
       expect(page.find(".category-name")).to have_content(channel_1.chatable.name)
       expect(page.find(".channel-info-about-view__name")).to have_content(channel_1.title)
+      expect(page.find(".channel-info-about-view__slug")).to have_content(channel_1.slug)
     end
 
     it "escapes channel title" do
@@ -31,10 +33,10 @@ RSpec.describe "Channel - Info - About page", type: :system, js: true do
       )
     end
 
-    it "can’t edit name" do
+    it "can’t edit name or slug" do
       chat_page.visit_channel_about(channel_1)
 
-      expect(page).to have_no_selector(".edit-name-btn")
+      expect(page).to have_no_selector(".edit-name-slug-btn")
     end
 
     it "can’t edit description" do
@@ -65,7 +67,7 @@ RSpec.describe "Channel - Info - About page", type: :system, js: true do
           click_button(I18n.t("js.chat.channel_settings.join_channel"))
           expect(page).to have_content(I18n.t("js.chat.channel_settings.leave_channel"))
         }.to change {
-          UserChatChannelMembership.where(user_id: current_user.id, following: true).count
+          Chat::UserChatChannelMembership.where(user_id: current_user.id, following: true).count
         }.by(1)
       end
     end
@@ -78,15 +80,16 @@ RSpec.describe "Channel - Info - About page", type: :system, js: true do
 
     it "can edit name" do
       chat_page.visit_channel_about(channel_1)
-      find(".edit-name-btn").click
 
-      expect(find(".chat-channel-edit-name-modal__name-input").value).to eq(channel_1.title)
+      edit_modal = chat_channel_about_page.open_edit_modal
+
+      expect(edit_modal).to have_name_input(channel_1.title)
 
       name = "A new name"
-      find(".chat-channel-edit-name-modal__name-input").fill_in(with: name)
-      find(".create").click
 
-      expect(page).to have_content(name)
+      edit_modal.fill_and_save_name(name)
+
+      expect(chat_channel_about_page).to have_name(name)
     end
 
     it "can edit description" do
@@ -94,15 +97,42 @@ RSpec.describe "Channel - Info - About page", type: :system, js: true do
       find(".edit-description-btn").click
 
       expect(page).to have_selector(
-        ".chat-channel-edit-description-modal__description-input",
+        ".chat-modal-edit-channel-description__description-input",
         text: channel_1.description,
       )
 
       description = "A new description"
-      find(".chat-channel-edit-description-modal__description-input").fill_in(with: description)
+      find(".chat-modal-edit-channel-description__description-input").fill_in(with: description)
       find(".create").click
 
       expect(page).to have_content(description)
     end
+
+    it "can edit slug" do
+      chat_page.visit_channel_about(channel_1)
+      edit_modal = chat_channel_about_page.open_edit_modal
+
+      slug = "gonzo-slug"
+
+      expect(edit_modal).to have_slug_input(channel_1.slug)
+
+      edit_modal.fill_and_save_slug(slug)
+
+      expect(chat_channel_about_page).to have_slug(slug)
+    end
+
+    it "can clear the slug to use the autogenerated version based on the name" do
+      channel_1.update!(name: "test channel")
+      chat_page.visit_channel_about(channel_1)
+      edit_modal = chat_channel_about_page.open_edit_modal
+
+      expect(edit_modal).to have_slug_input(channel_1.slug)
+
+      edit_modal.fill_in_slug_input("")
+      edit_modal.wait_for_auto_generated_slug
+      edit_modal.save_changes
+
+      expect(chat_channel_about_page).to have_slug("test-channel")
+    end
   end
 end
diff --git a/plugins/chat/spec/system/channel_info_pages_spec.rb b/plugins/chat/spec/system/channel_info_pages_spec.rb
index 64fb8b8da26..0b53d1e0f05 100644
--- a/plugins/chat/spec/system/channel_info_pages_spec.rb
+++ b/plugins/chat/spec/system/channel_info_pages_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "Info pages", type: :system, js: true do
+RSpec.describe "Info pages", type: :system do
   let(:chat_page) { PageObjects::Pages::Chat.new }
   let(:channel) { PageObjects::Pages::ChatChannel.new }
   fab!(:current_user) { Fabricate(:user) }
@@ -8,8 +8,8 @@ RSpec.describe "Info pages", type: :system, js: true do
 
   before do
     chat_system_bootstrap
-    sign_in(current_user)
     channel_1.add(current_user)
+    sign_in(current_user)
   end
 
   context "when visiting from browse page" do
@@ -31,7 +31,7 @@ RSpec.describe "Info pages", type: :system, js: true do
         find(".chat-channel-title-wrapper").click
         find(".chat-full-page-header__back-btn").click
 
-        expect(page).to have_current_path(chat.channel_path(channel_1.id, channel_1.slug))
+        expect(page).to have_current_path(chat.channel_path(channel_1.slug, channel_1.id))
       end
     end
   end
diff --git a/plugins/chat/spec/system/channel_members_page_spec.rb b/plugins/chat/spec/system/channel_members_page_spec.rb
index 952a45df592..becfd2812f7 100644
--- a/plugins/chat/spec/system/channel_members_page_spec.rb
+++ b/plugins/chat/spec/system/channel_members_page_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "Channel - Info - Members page", type: :system, js: true do
+RSpec.describe "Channel - Info - Members page", type: :system do
   let(:chat_page) { PageObjects::Pages::Chat.new }
 
   fab!(:current_user) { Fabricate(:user) }
@@ -26,9 +26,7 @@ RSpec.describe "Channel - Info - Members page", type: :system, js: true do
       it "redirects to about page" do
         chat_page.visit_channel_members(channel_1)
 
-        expect(page).to have_current_path(
-          "/chat/channel/#{channel_1.id}/#{channel_1.slug}/info/about",
-        )
+        expect(page).to have_current_path("/chat/c/#{channel_1.slug}/#{channel_1.id}/info/about")
       end
     end
 
@@ -42,26 +40,26 @@ RSpec.describe "Channel - Info - Members page", type: :system, js: true do
       it "shows all members" do
         Jobs.run_immediately!
         channel_1.update!(user_count_stale: true)
-        Jobs::UpdateChannelUserCount.new.execute(chat_channel_id: channel_1.id)
+        Jobs::Chat::UpdateChannelUserCount.new.execute(chat_channel_id: channel_1.id)
 
         chat_page.visit_channel_members(channel_1)
 
-        expect(page).to have_selector(".channel-members-view__list-item", count: 50)
+        expect(page).to have_selector(".channel-members-view__list-item", count: 50, wait: 15)
 
         scroll_to(find(".channel-members-view__list-item:nth-child(50)"))
 
-        expect(page).to have_selector(".channel-members-view__list-item", count: 100, wait: 5)
+        expect(page).to have_selector(".channel-members-view__list-item", count: 100, wait: 15)
 
         scroll_to(find(".channel-members-view__list-item:nth-child(100)"))
 
-        expect(page).to have_selector(".channel-members-view__list-item", count: 100)
+        expect(page).to have_selector(".channel-members-view__list-item", count: 100, wait: 15)
       end
 
       context "with filter" do
         it "filters members" do
           Jobs.run_immediately!
           channel_1.update!(user_count_stale: true)
-          Jobs::UpdateChannelUserCount.new.execute(chat_channel_id: channel_1.id)
+          Jobs::Chat::UpdateChannelUserCount.new.execute(chat_channel_id: channel_1.id)
 
           chat_page.visit_channel_members(channel_1)
           find(".channel-members-view__search-input").fill_in(with: "cat")
diff --git a/plugins/chat/spec/system/channel_message_upload_spec.rb b/plugins/chat/spec/system/channel_message_upload_spec.rb
new file mode 100644
index 00000000000..c8e0e5e88d2
--- /dev/null
+++ b/plugins/chat/spec/system/channel_message_upload_spec.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+RSpec.describe "Channel message selection", type: :system do
+  fab!(:current_user) { Fabricate(:user) }
+  fab!(:channel_1) { Fabricate(:chat_channel) }
+  fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1) }
+
+  let(:chat) { PageObjects::Pages::Chat.new }
+  let(:channel) { PageObjects::Pages::ChatChannel.new }
+  let(:image) do
+    Fabricate(
+      :upload,
+      original_filename: "test_image.jpg",
+      width: 400,
+      height: 300,
+      extension: "jpg",
+    )
+  end
+
+  before do
+    chat_system_bootstrap
+    channel_1.add(current_user)
+    sign_in(current_user)
+    message_1.uploads = [image]
+  end
+
+  it "can collapse/expand an image and still have lightbox working" do
+    chat.visit_channel(channel_1)
+
+    find(".chat-message-collapser-button").click
+    expect(page).to have_css(".chat-message-collapser-body.hidden", visible: :false)
+    find(".chat-message-collapser-button").click
+    expect(page).to have_no_css(".chat-message-collapser-body.hidden")
+    find(".chat-img-upload").click
+
+    # visible false is because the upload doesn’t exist but it's enough to know lightbox is working
+    expect(page).to have_css(".mfp-image-holder img[src*='#{image.url}']", visible: false)
+  end
+end
diff --git a/plugins/chat/spec/system/channel_selector_modal_spec.rb b/plugins/chat/spec/system/channel_selector_modal_spec.rb
deleted file mode 100644
index 2cb9f5713fb..00000000000
--- a/plugins/chat/spec/system/channel_selector_modal_spec.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "Channel selector modal", type: :system, js: true do
-  fab!(:current_user) { Fabricate(:user) }
-
-  let(:chat_page) { PageObjects::Pages::Chat.new }
-  let(:channel_page) { PageObjects::Pages::ChatChannel.new }
-
-  before do
-    chat_system_bootstrap
-    sign_in(current_user)
-    visit("/")
-  end
-
-  KEY_MODIFIER = RUBY_PLATFORM =~ /darwin/i ? :meta : :control
-
-  context "when used with public channel" do
-    fab!(:channel_1) { Fabricate(:category_channel) }
-
-    it "works" do
-      find("body").send_keys([KEY_MODIFIER, "k"])
-      find("#chat-channel-selector-input").fill_in(with: channel_1.title)
-      find(".chat-channel-selection-row[data-id='#{channel_1.id}']").click
-      channel_page.send_message("Hello world")
-
-      expect(channel_page).to have_message(text: "Hello world")
-    end
-  end
-
-  context "when used with user" do
-    fab!(:user_1) { Fabricate(:user) }
-
-    it "works" do
-      find("body").send_keys([KEY_MODIFIER, "k"])
-      find("#chat-channel-selector-input").fill_in(with: user_1.username)
-      find(".chat-channel-selection-row[data-id='#{user_1.id}']").click
-      channel_page.send_message("Hello world")
-
-      expect(channel_page).to have_message(text: "Hello world")
-    end
-  end
-
-  context "when used with dm channel" do
-    fab!(:dm_channel_1) { Fabricate(:direct_message_channel, users: [current_user]) }
-
-    it "works" do
-      find("body").send_keys([KEY_MODIFIER, "k"])
-      find("#chat-channel-selector-input").fill_in(with: current_user.username)
-      find(".chat-channel-selection-row[data-id='#{dm_channel_1.id}']").click
-      channel_page.send_message("Hello world")
-
-      expect(channel_page).to have_message(text: "Hello world")
-    end
-  end
-
-  context "when on a channel" do
-    fab!(:channel_1) { Fabricate(:category_channel) }
-
-    it "it doesn’t include current channel" do
-      chat_page.visit_channel(channel_1)
-      find("body").send_keys([KEY_MODIFIER, "k"])
-      find("#chat-channel-selector-input").click
-
-      expect(page).to have_no_css(".chat-channel-selection-row[data-id='#{channel_1.id}']")
-    end
-  end
-
-  context "with limited access channels" do
-    fab!(:group_1) { Fabricate(:group) }
-    fab!(:channel_1) { Fabricate(:private_category_channel, group: group_1) }
-
-    it "it doesn’t include limited access channel" do
-      chat_page.visit_channel(channel_1)
-      find("body").send_keys([KEY_MODIFIER, "k"])
-      find("#chat-channel-selector-input").fill_in(with: channel_1.title)
-
-      expect(page).to have_no_css(".chat-channel-selection-row[data-id='#{channel_1.id}']")
-    end
-  end
-end
diff --git a/plugins/chat/spec/system/channel_settings_page_spec.rb b/plugins/chat/spec/system/channel_settings_page_spec.rb
index 83df778c4fc..5196a3e8856 100644
--- a/plugins/chat/spec/system/channel_settings_page_spec.rb
+++ b/plugins/chat/spec/system/channel_settings_page_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "Channel - Info - Settings page", type: :system, js: true do
+RSpec.describe "Channel - Info - Settings page", type: :system do
   let(:chat_page) { PageObjects::Pages::Chat.new }
   fab!(:current_user) { Fabricate(:user) }
   fab!(:channel_1) { Fabricate(:category_channel) }
@@ -25,9 +25,7 @@ RSpec.describe "Channel - Info - Settings page", type: :system, js: true do
       it "redirects to about tab" do
         chat_page.visit_channel_settings(channel_1)
 
-        expect(page).to have_current_path(
-          "/chat/channel/#{channel_1.id}/#{channel_1.slug}/info/about",
-        )
+        expect(page).to have_current_path("/chat/c/#{channel_1.slug}/#{channel_1.id}/info/about")
       end
 
       it "doesn’t have settings tab" do
@@ -49,7 +47,7 @@ RSpec.describe "Channel - Info - Settings page", type: :system, js: true do
           chat_page.visit_channel_settings(channel_1)
 
           expect(page).to have_current_path(
-            "/chat/channel/#{channel_1.id}/#{channel_1.slug}/info/settings",
+            "/chat/c/#{channel_1.slug}/#{channel_1.id}/info/settings",
           )
         end
       end
@@ -58,7 +56,7 @@ RSpec.describe "Channel - Info - Settings page", type: :system, js: true do
     context "as a member" do
       before { channel_1.add(current_user) }
 
-      context "when visitng the settings of a recently joined channel" do
+      context "when visiting the settings of a recently joined channel" do
         fab!(:channel_2) { Fabricate(:category_channel) }
 
         it "is correctly populated" do
@@ -84,8 +82,11 @@ RSpec.describe "Channel - Info - Settings page", type: :system, js: true do
         membership = channel_1.membership_for(current_user)
 
         expect {
-          find(".channel-settings-view__muted-selector").click
-          find(".channel-settings-view__muted-selector [data-name='On']").click
+          select_kit =
+            PageObjects::Components::SelectKit.new(".-mute .channel-settings-view__selector")
+          select_kit.expand
+          select_kit.select_row_by_name("On")
+
           expect(page).to have_content(I18n.t("js.chat.settings.saved"))
         }.to change { membership.reload.muted }.from(false).to(true)
       end
@@ -95,10 +96,13 @@ RSpec.describe "Channel - Info - Settings page", type: :system, js: true do
         membership = channel_1.membership_for(current_user)
 
         expect {
-          find(".channel-settings-view__desktop-notification-level-selector").click
-          find(
-            ".channel-settings-view__desktop-notification-level-selector [data-name='Never']",
-          ).click
+          select_kit =
+            PageObjects::Components::SelectKit.new(
+              ".-desktop-notification-level .channel-settings-view__selector",
+            )
+          select_kit.expand
+          select_kit.select_row_by_name("Never")
+
           expect(page).to have_content(I18n.t("js.chat.settings.saved"))
         }.to change { membership.reload.desktop_notification_level }.from("mention").to("never")
       end
@@ -108,10 +112,13 @@ RSpec.describe "Channel - Info - Settings page", type: :system, js: true do
         membership = channel_1.membership_for(current_user)
 
         expect {
-          find(".channel-settings-view__mobile-notification-level-selector").click
-          find(
-            ".channel-settings-view__mobile-notification-level-selector [data-name='Never']",
-          ).click
+          select_kit =
+            PageObjects::Components::SelectKit.new(
+              ".-mobile-notification-level .channel-settings-view__selector",
+            )
+          select_kit.expand
+          select_kit.select_row_by_name("Never")
+
           expect(page).to have_content(I18n.t("js.chat.settings.saved"))
         }.to change { membership.reload.mobile_notification_level }.from("mention").to("never")
       end
@@ -135,9 +142,12 @@ RSpec.describe "Channel - Info - Settings page", type: :system, js: true do
           chat_page.visit_channel_settings(channel_1)
 
           expect {
-            find(".channel-settings-view__auto-join-selector").click
-            find(".channel-settings-view__auto-join-selector [data-name='Yes']").click
+            select_kit =
+              PageObjects::Components::SelectKit.new(".-autojoin .channel-settings-view__selector")
+            select_kit.expand
+            select_kit.select_row_by_name("Yes")
             find("#dialog-holder .btn-primary").click
+
             expect(page).to have_content(I18n.t("js.chat.settings.saved"))
           }.to change { channel_1.reload.auto_join_users }.from(false).to(true)
         end
@@ -146,8 +156,13 @@ RSpec.describe "Channel - Info - Settings page", type: :system, js: true do
           chat_page.visit_channel_settings(channel_1)
 
           expect {
-            find(".channel-settings-view__channel-wide-mentions-selector").click
-            find(".channel-settings-view__channel-wide-mentions-selector [data-name='No']").click
+            select_kit =
+              PageObjects::Components::SelectKit.new(
+                ".-channel-wide-mentions .channel-settings-view__selector",
+              )
+            select_kit.expand
+            select_kit.select_row_by_name("No")
+
             expect(page).to have_content(I18n.t("js.chat.settings.saved"))
           }.to change { channel_1.reload.allow_channel_wide_mentions }.from(true).to(false)
         end
@@ -162,6 +177,18 @@ RSpec.describe "Channel - Info - Settings page", type: :system, js: true do
           }.to change { channel_1.reload.status }.from("open").to("closed")
         end
 
+        it "can enable threading" do
+          chat_page.visit_channel_settings(channel_1)
+
+          expect {
+            select_kit =
+              PageObjects::Components::SelectKit.new(".-threading .channel-settings-view__selector")
+            select_kit.expand
+            select_kit.select_row_by_name("Enabled")
+            expect(page).to have_content(I18n.t("js.chat.settings.saved"))
+          }.to change { channel_1.reload.threading_enabled }.from(false).to(true)
+        end
+
         it "can delete channel" do
           chat_page.visit_channel_settings(channel_1)
 
diff --git a/plugins/chat/spec/system/channel_thread_message_echoing_spec.rb b/plugins/chat/spec/system/channel_thread_message_echoing_spec.rb
new file mode 100644
index 00000000000..52f4c25739e
--- /dev/null
+++ b/plugins/chat/spec/system/channel_thread_message_echoing_spec.rb
@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+describe "Channel thread message echoing", type: :system do
+  fab!(:current_user) { Fabricate(:user) }
+  fab!(:other_user) { Fabricate(:user) }
+
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:channel_page) { PageObjects::Pages::ChatChannel.new }
+  let(:side_panel) { PageObjects::Pages::ChatSidePanel.new }
+  let(:open_thread) { PageObjects::Pages::ChatThread.new }
+  let(:chat_drawer_page) { PageObjects::Pages::ChatDrawer.new }
+
+  before do
+    chat_system_bootstrap(current_user, [channel])
+    sign_in(current_user)
+  end
+
+  context "when threading_enabled is false for the channel" do
+    fab!(:channel) { Fabricate(:chat_channel) }
+    before { channel.update!(threading_enabled: false) }
+
+    it "echoes the thread messages into the main channel stream" do
+      thread = chat_thread_chain_bootstrap(channel: channel, users: [current_user, other_user])
+      chat_page.visit_channel(channel)
+      thread.chat_messages.each do |thread_message|
+        expect(channel_page).to have_css(channel_page.message_by_id_selector(thread_message.id))
+      end
+    end
+  end
+
+  context "when threading is enabled for the channel" do
+    fab!(:channel) { Fabricate(:chat_channel) }
+    fab!(:thread) do
+      chat_thread_chain_bootstrap(channel: channel, users: [current_user, other_user])
+    end
+
+    before { channel.update!(threading_enabled: true) }
+
+    it "does not echo the thread messages except for the original message into the channel stream" do
+      chat_page.visit_channel(channel)
+      expect(channel_page).to have_css(
+        channel_page.message_by_id_selector(thread.original_message.id),
+      )
+      thread.replies.each do |thread_message|
+        expect(channel_page).not_to have_css(channel_page.message_by_id_selector(thread_message.id))
+      end
+    end
+
+    it "does not echo new thread messages into the channel stream" do
+      chat_page.visit_channel(channel)
+      channel_page.message_thread_indicator(thread.original_message).click
+      expect(side_panel).to have_open_thread(thread)
+      open_thread.send_message("new thread message")
+      expect(open_thread).to have_message(thread_id: thread.id, text: "new thread message")
+      new_message = thread.reload.replies.last
+      expect(channel_page).not_to have_css(channel_page.message_by_id_selector(new_message.id))
+    end
+
+    it "does not echo the looked up message into the channel stream if it is in a thread" do
+      current_user
+        .user_chat_channel_memberships
+        .find_by(chat_channel: channel)
+        .update!(last_read_message_id: thread.last_message_id)
+      chat_page.visit_channel(channel)
+      expect(channel_page).not_to have_css(
+        channel_page.message_by_id_selector(thread.last_message_id),
+      )
+    end
+
+    it "does show the thread original_message if it is the last message in the channel" do
+      new_thread = Fabricate(:chat_thread, channel: channel)
+      current_user
+        .user_chat_channel_memberships
+        .find_by(chat_channel: channel)
+        .update!(last_read_message_id: new_thread.original_message_id)
+      chat_page.visit_channel(channel)
+      expect(channel_page).to have_css(
+        channel_page.message_by_id_selector(new_thread.original_message_id),
+      )
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/chat/composer/channel_spec.rb b/plugins/chat/spec/system/chat/composer/channel_spec.rb
new file mode 100644
index 00000000000..0143aae7107
--- /dev/null
+++ b/plugins/chat/spec/system/chat/composer/channel_spec.rb
@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+RSpec.describe "Chat | composer | channel", type: :system, js: true do
+  fab!(:channel_1) { Fabricate(:chat_channel) }
+  fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1) }
+  fab!(:current_user) { Fabricate(:admin) }
+
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:channel_page) { PageObjects::Pages::ChatChannel.new }
+  let(:thread_page) { PageObjects::Pages::ChatThread.new }
+
+  before do
+    chat_system_bootstrap
+    channel_1.add(current_user)
+    sign_in(current_user)
+  end
+
+  describe "reply to message" do
+    it "renders text in the details" do
+      message_1.update!(message: "<mark>not marked</mark>")
+      message_1.rebake!
+      chat_page.visit_channel(channel_1)
+      channel_page.reply_to(message_1)
+
+      expect(channel_page.composer.message_details).to have_message(
+        id: message_1.id,
+        exact_text: "<mark>not marked</mark>",
+      )
+    end
+
+    context "when threading is disabled" do
+      it "replies to the message" do
+        chat_page.visit_channel(channel_1)
+        channel_page.reply_to(message_1)
+
+        expect(channel_page.composer.message_details).to be_replying_to(message_1)
+      end
+    end
+
+    context "when threading is enabled" do
+      before { channel_1.update!(threading_enabled: true) }
+
+      it "replies in the thread" do
+        chat_page.visit_channel(channel_1)
+        channel_page.reply_to(message_1)
+
+        expect(thread_page.composer).to be_focused
+      end
+    end
+  end
+
+  describe "edit message" do
+    fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1, user: current_user) }
+
+    it "adds the edit indicator" do
+      chat_page.visit_channel(channel_1)
+      channel_page.edit_message(message_1)
+
+      expect(channel_page.composer).to be_editing_message(message_1)
+    end
+
+    it "updates the message instantly" do
+      chat_page.visit_channel(channel_1)
+      page.driver.browser.network_conditions = { offline: true }
+      channel_page.edit_message(message_1, "instant")
+
+      expect(channel_page.messages).to have_message(
+        text: message_1.message + "instant",
+        persisted: false,
+      )
+    ensure
+      page.driver.browser.network_conditions = { offline: false }
+    end
+
+    context "when pressing escape" do
+      it "cancels editing" do
+        chat_page.visit_channel(channel_1)
+        channel_page.edit_message(message_1)
+        channel_page.composer.cancel_shortcut
+
+        expect(channel_page.composer).to be_editing_no_message
+        expect(channel_page.composer.value).to eq("")
+      end
+    end
+
+    context "when closing edited message" do
+      it "cancels editing" do
+        chat_page.visit_channel(channel_1)
+        channel_page.edit_message(message_1)
+        channel_page.composer.cancel_editing
+
+        expect(channel_page.composer).to be_editing_no_message
+        expect(channel_page.composer.value).to eq("")
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/chat/composer/shortcuts/channel_spec.rb b/plugins/chat/spec/system/chat/composer/shortcuts/channel_spec.rb
new file mode 100644
index 00000000000..fcd2524f22c
--- /dev/null
+++ b/plugins/chat/spec/system/chat/composer/shortcuts/channel_spec.rb
@@ -0,0 +1,124 @@
+# frozen_string_literal: true
+
+RSpec.describe "Chat | composer | shortcuts | channel", type: :system do
+  fab!(:channel_1) { Fabricate(:chat_channel) }
+  fab!(:current_user) { Fabricate(:admin) }
+
+  let(:chat) { PageObjects::Pages::Chat.new }
+  let(:channel_page) { PageObjects::Pages::ChatChannel.new }
+  let(:thread_page) { PageObjects::Pages::ChatThread.new }
+
+  before do
+    chat_system_bootstrap
+    channel_1.add(current_user)
+    sign_in(current_user)
+  end
+
+  context "when using meta + b" do
+    it "adds bold text" do
+      chat.visit_channel(channel_1)
+
+      channel_page.composer.bold_text_shortcut
+
+      expect(channel_page.composer.value).to eq("**strong text**")
+    end
+  end
+
+  context "when using meta + i" do
+    it "adds italic text" do
+      chat.visit_channel(channel_1)
+
+      channel_page.composer.emphasized_text_shortcut
+
+      expect(channel_page.composer.value).to eq("_emphasized text_")
+    end
+  end
+
+  context "when using meta + e" do
+    it "adds preformatted text" do
+      chat.visit_channel(channel_1)
+
+      channel_page.composer.indented_text_shortcut
+
+      expect(channel_page.composer.value).to eq("`indent preformatted text by 4 spaces`")
+    end
+  end
+
+  context "when the thread panel is also open" do
+    fab!(:user_2) { Fabricate(:user) }
+    fab!(:thread) do
+      chat_thread_chain_bootstrap(
+        channel: channel_1,
+        users: [current_user, user_2],
+        messages_count: 2,
+      )
+    end
+
+    before { channel_1.update!(threading_enabled: true) }
+
+    it "directs the shortcut to the focused composer" do
+      chat.visit_channel(channel_1)
+      channel_page.message_thread_indicator(thread.original_message).click
+      channel_page.composer.emphasized_text_shortcut
+
+      expect(channel_page.composer.value).to eq("_emphasized text_")
+      expect(thread_page.composer.value).to eq("")
+
+      channel_page.composer.fill_in(with: "")
+      thread_page.composer.fill_in(with: "")
+
+      thread_page.composer.emphasized_text_shortcut
+
+      expect(channel_page.composer.value).to eq("")
+      expect(thread_page.composer.value).to eq("_emphasized text_")
+    end
+  end
+
+  context "when using ArrowUp" do
+    fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1, user: current_user) }
+    fab!(:message_2) { Fabricate(:chat_message, chat_channel: channel_1) }
+
+    it "edits last editable message" do
+      chat.visit_channel(channel_1)
+
+      channel_page.composer.edit_last_message_shortcut
+
+      expect(channel_page.composer.message_details).to be_editing(message_1)
+    end
+
+    context "when last message is staged" do
+      it "does not edit a message" do
+        chat.visit_channel(channel_1)
+        page.driver.browser.network_conditions = { offline: true }
+        channel_page.send_message
+        channel_page.composer.edit_last_message_shortcut
+
+        expect(channel_page.composer.message_details).to have_no_message
+      ensure
+        page.driver.browser.network_conditions = { offline: false }
+      end
+    end
+
+    context "when last message is deleted" do
+      before { message_1.trash! }
+
+      it "does not edit a message" do
+        chat.visit_channel(channel_1)
+
+        channel_page.composer.edit_last_message_shortcut
+
+        expect(channel_page.composer.message_details).to have_no_message
+      end
+    end
+
+    context "with shift" do
+      it "starts replying to the last message" do
+        chat.visit_channel(channel_1)
+
+        channel_page.composer.reply_to_last_message_shortcut
+
+        expect(channel_page.composer.message_details).to be_replying_to(message_2)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/chat/composer/shortcuts/thread_spec.rb b/plugins/chat/spec/system/chat/composer/shortcuts/thread_spec.rb
new file mode 100644
index 00000000000..860d52063ae
--- /dev/null
+++ b/plugins/chat/spec/system/chat/composer/shortcuts/thread_spec.rb
@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+RSpec.describe "Chat | composer | shortcuts | thread", type: :system do
+  fab!(:channel_1) { Fabricate(:chat_channel, threading_enabled: true) }
+  fab!(:current_user) { Fabricate(:admin) }
+  fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1) }
+  fab!(:thread_1) { Fabricate(:chat_message, user: current_user, in_reply_to: message_1).thread }
+
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:thread_page) { PageObjects::Pages::ChatThread.new }
+  let(:side_panel_page) { PageObjects::Pages::ChatSidePanel.new }
+
+  before do
+    chat_system_bootstrap
+    channel_1.add(current_user)
+    sign_in(current_user)
+  end
+
+  describe "Escape" do
+    context "when composer is focused" do
+      it "blurs the composer" do
+        chat_page.visit_thread(thread_1)
+        thread_page.composer.focus
+        thread_page.composer.cancel_shortcut
+
+        expect(side_panel_page).to have_open_thread
+      end
+    end
+  end
+
+  describe "ArrowUp" do
+    let(:last_thread_message) { thread_1.replies.last }
+
+    context "when there are editable messages" do
+      before { Fabricate(:chat_message, user: current_user, thread: thread_1) }
+
+      it "starts editing the last editable message" do
+        chat_page.visit_thread(thread_1)
+
+        thread_page.composer.edit_last_message_shortcut
+
+        expect(thread_page.composer_message_details).to have_message(id: last_thread_message.id)
+        expect(thread_page.composer.value).to eq(last_thread_message.message)
+      end
+    end
+
+    context "when last message is staged" do
+      it "does not edit a message" do
+        chat_page.visit_thread(thread_1)
+        page.driver.browser.network_conditions = { offline: true }
+        thread_page.send_message
+        thread_page.composer.edit_last_message_shortcut
+
+        expect(thread_page.composer.message_details).to have_no_message
+      ensure
+        page.driver.browser.network_conditions = { offline: false }
+      end
+    end
+
+    context "when last message is deleted" do
+      before do
+        last_thread_message.trash!
+        thread_1.update_last_message_id!
+      end
+
+      it "does not edit a message" do
+        chat_page.visit_thread(thread_1)
+
+        thread_page.composer.edit_last_message_shortcut
+
+        expect(thread_page.composer.message_details).to have_no_message
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/chat/composer/thread_spec.rb b/plugins/chat/spec/system/chat/composer/thread_spec.rb
new file mode 100644
index 00000000000..708fb5e221f
--- /dev/null
+++ b/plugins/chat/spec/system/chat/composer/thread_spec.rb
@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+RSpec.describe "Chat | composer | thread", type: :system, js: true do
+  fab!(:channel_1) { Fabricate(:chat_channel, threading_enabled: true) }
+  fab!(:current_user) { Fabricate(:admin) }
+  fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1, user: current_user) }
+  fab!(:message_2) do
+    Fabricate(:chat_message, chat_channel: channel_1, user: current_user, in_reply_to: message_1)
+  end
+
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:channel_page) { PageObjects::Pages::ChatChannel.new }
+  let(:thread_page) { PageObjects::Pages::ChatThread.new }
+
+  before do
+    chat_system_bootstrap
+    channel_1.add(current_user)
+    sign_in(current_user)
+  end
+
+  describe "edit message" do
+    it "adds the edit indicator" do
+      chat_page.visit_thread(message_2.thread)
+      thread_page.edit_message(message_2)
+
+      expect(thread_page.composer).to be_editing_message(message_2)
+    end
+
+    it "updates the message instantly" do
+      chat_page.visit_thread(message_2.thread)
+      page.driver.browser.network_conditions = { offline: true }
+      thread_page.edit_message(message_2, "instant")
+
+      expect(thread_page.messages).to have_message(
+        text: message_2.message + "instant",
+        persisted: false,
+      )
+    ensure
+      page.driver.browser.network_conditions = { offline: false }
+    end
+
+    context "when pressing escape" do
+      it "cancels editing" do
+        chat_page.visit_thread(message_2.thread)
+        thread_page.edit_message(message_2)
+        thread_page.composer.cancel_shortcut
+
+        expect(thread_page.composer).to be_editing_no_message
+        expect(thread_page.composer).to be_blank
+      end
+    end
+
+    context "when closing edited message" do
+      it "cancels editing" do
+        chat_page.visit_thread(message_2.thread)
+        thread_page.edit_message(message_2)
+        thread_page.composer.cancel_editing
+
+        expect(thread_page.composer).to be_editing_no_message
+        expect(thread_page.composer.value).to be_blank
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/chat_channel_spec.rb b/plugins/chat/spec/system/chat_channel_spec.rb
index f0e51ae6d51..ce65cde36f2 100644
--- a/plugins/chat/spec/system/chat_channel_spec.rb
+++ b/plugins/chat/spec/system/chat_channel_spec.rb
@@ -1,63 +1,109 @@
 # frozen_string_literal: true
 
-RSpec.describe "Chat channel", type: :system, js: true do
+RSpec.describe "Chat channel", type: :system do
   fab!(:current_user) { Fabricate(:user) }
   fab!(:channel_1) { Fabricate(:chat_channel) }
   fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1) }
 
   let(:chat) { PageObjects::Pages::Chat.new }
-  let(:channel) { PageObjects::Pages::ChatChannel.new }
+  let(:channel_page) { PageObjects::Pages::ChatChannel.new }
+  let(:sidebar_page) { PageObjects::Pages::Sidebar.new }
 
-  before { chat_system_bootstrap }
+  before do
+    chat_system_bootstrap
+    channel_1.add(current_user)
+    sign_in(current_user)
+  end
+
+  context "when first batch of messages doesnt fill page" do
+    before { 30.times { Fabricate(:chat_message, user: current_user, chat_channel: channel_1) } }
+
+    it "autofills for more messages" do
+      chat.prefers_full_page
+      visit("/")
+      # cheap trick to ensure the messages don't fill the initial page
+      page.execute_script(
+        "document.head.insertAdjacentHTML('beforeend', `<style>.chat-message-text{font-size:3px;}</style>`)",
+      )
+      sidebar_page.open_channel(channel_1)
+
+      expect(channel_page.messages).to have_message(id: message_1.id)
+    end
+  end
 
   context "when sending a message" do
-    before do
-      channel_1.add(current_user)
-      50.times { Fabricate(:chat_message, chat_channel: channel_1) }
-      sign_in(current_user)
+    context "with lots of messages" do
+      before { 50.times { Fabricate(:chat_message, chat_channel: channel_1) } }
+
+      it "loads most recent messages" do
+        unloaded_message = Fabricate(:chat_message, chat_channel: channel_1)
+        chat.visit_channel(channel_1, message_id: message_1.id)
+
+        expect(channel_page.messages).to have_no_message(id: unloaded_message.id)
+
+        channel_page.send_message
+
+        expect(channel_page.messages).to have_message(id: unloaded_message.id)
+      end
     end
 
-    it "loads most recent messages" do
-      unloaded_message = Fabricate(:chat_message, chat_channel: channel_1)
-      visit("/chat/message/#{message_1.id}")
+    context "with two sessions opened on same channel" do
+      it "syncs the messages" do
+        using_session(:tab_1) do
+          sign_in(current_user)
+          chat.visit_channel(channel_1)
+        end
 
-      expect(channel).to have_no_loading_skeleton
-      expect(page).to have_no_css("[data-id='#{unloaded_message.id}']")
+        using_session(:tab_2) do
+          sign_in(current_user)
+          chat.visit_channel(channel_1)
+        end
 
-      channel.send_message("test_message")
+        using_session(:tab_1) do |session|
+          channel_page.send_message("test_message")
+          session.quit
+        end
 
-      expect(channel).to have_no_loading_skeleton
-      expect(page).to have_css("[data-id='#{unloaded_message.id}']")
+        using_session(:tab_2) do |session|
+          expect(channel_page).to have_message(text: "test_message")
+          session.quit
+        end
+      end
+    end
+
+    it "allows to edit this message once persisted" do
+      chat.visit_channel(channel_1)
+      channel_page.send_message("aaaaaa")
+
+      expect(channel_page.messages).to have_message(persisted: true, text: "aaaaaa")
+
+      last_message = find(".chat-message-container:last-child")
+      last_message.hover
+
+      expect(channel_page).to have_css(
+        ".chat-message-actions-container[data-id='#{last_message["data-id"]}']",
+      )
     end
   end
 
   context "when clicking the arrow button" do
-    before do
-      channel_1.add(current_user)
-      50.times { Fabricate(:chat_message, chat_channel: channel_1) }
-      sign_in(current_user)
-    end
+    before { 50.times { Fabricate(:chat_message, chat_channel: channel_1) } }
 
     it "jumps to the bottom of the channel" do
       unloaded_message = Fabricate(:chat_message, chat_channel: channel_1)
       visit("/chat/message/#{message_1.id}")
 
-      expect(channel).to have_no_loading_skeleton
+      expect(channel_page).to have_no_loading_skeleton
       expect(page).to have_no_css("[data-id='#{unloaded_message.id}']")
 
-      find(".chat-scroll-to-bottom").click
+      find(".chat-scroll-to-bottom__button.visible").click
 
-      expect(channel).to have_no_loading_skeleton
+      expect(channel_page).to have_no_loading_skeleton
       expect(page).to have_css("[data-id='#{unloaded_message.id}']")
     end
   end
 
   context "when returning to a channel where last read is not last message" do
-    before do
-      channel_1.add(current_user)
-      sign_in(current_user)
-    end
-
     it "jumps to the bottom of the channel" do
       channel_1.membership_for(current_user).update!(last_read_message: message_1)
       messages = 50.times.map { Fabricate(:chat_message, chat_channel: channel_1) }
@@ -73,20 +119,13 @@ RSpec.describe "Chat channel", type: :system, js: true do
 
     before do
       channel_1.add(other_user)
-      channel_1.add(current_user)
       50.times { Fabricate(:chat_message, chat_channel: channel_1) }
-      sign_in(current_user)
     end
 
-    it "doesn’t scroll the pane" do
+    xit "doesn’t scroll the pane" do
       visit("/chat/message/#{message_1.id}")
 
-      new_message =
-        Chat::ChatMessageCreator.create(
-          chat_channel: channel_1,
-          user: other_user,
-          content: "this is fine",
-        ).chat_message
+      new_message = Fabricate(:chat_message, chat_channel: channel_1)
 
       expect(page).to have_no_content(new_message.message)
     end
@@ -94,19 +133,17 @@ RSpec.describe "Chat channel", type: :system, js: true do
 
   context "when a message contains mentions" do
     fab!(:other_user) { Fabricate(:user) }
-
-    before do
-      channel_1.add(other_user)
-      channel_1.add(current_user)
+    fab!(:message) do
       Fabricate(
         :chat_message,
         chat_channel: channel_1,
         message: "hello @here @all @#{current_user.username} @#{other_user.username} @unexisting",
         user: other_user,
       )
-      sign_in(current_user)
     end
 
+    before { channel_1.add(other_user) }
+
     it "highlights the mentions" do
       chat.visit_channel(channel_1)
 
@@ -119,6 +156,23 @@ RSpec.describe "Chat channel", type: :system, js: true do
       expect(page).to have_selector(".mention", text: "@#{other_user.username}")
       expect(page).to have_selector(".mention", text: "@unexisting")
     end
+
+    it "renders user status on mentions" do
+      SiteSetting.enable_user_status = true
+      current_user.set_status!("off to dentist", "tooth")
+      other_user.set_status!("surfing", "surfing_man")
+      Fabricate(:chat_mention, user: current_user, chat_message: message)
+      Fabricate(:chat_mention, user: other_user, chat_message: message)
+
+      chat.visit_channel(channel_1)
+
+      expect(page).to have_selector(
+        ".mention .user-status-message img[alt='#{current_user.user_status.emoji}']",
+      )
+      expect(page).to have_selector(
+        ".mention .user-status-message img[alt='#{other_user.user_status.emoji}']",
+      )
+    end
   end
 
   context "when reply is right under" do
@@ -127,8 +181,6 @@ RSpec.describe "Chat channel", type: :system, js: true do
     before do
       Fabricate(:chat_message, in_reply_to: message_1, user: other_user, chat_channel: channel_1)
       channel_1.add(other_user)
-      channel_1.add(current_user)
-      sign_in(current_user)
     end
 
     it "doesn’t show the reply-to line" do
@@ -145,8 +197,6 @@ RSpec.describe "Chat channel", type: :system, js: true do
       Fabricate(:chat_message, user: other_user, chat_channel: channel_1)
       Fabricate(:chat_message, in_reply_to: message_1, user: other_user, chat_channel: channel_1)
       channel_1.add(other_user)
-      channel_1.add(current_user)
-      sign_in(current_user)
     end
 
     it "shows the reply-to line" do
@@ -156,39 +206,49 @@ RSpec.describe "Chat channel", type: :system, js: true do
     end
   end
 
-  context "when messages are separated by a day" do
-    before do
-      Fabricate(:chat_message, chat_channel: channel_1, created_at: 2.days.ago)
-
-      channel_1.add(current_user)
-      sign_in(current_user)
+  context "when replying to message that has HTML tags" do
+    fab!(:other_user) { Fabricate(:user) }
+    fab!(:message_2) do
+      Fabricate(
+        :chat_message,
+        user: other_user,
+        chat_channel: channel_1,
+        message: "<mark>not marked</mark>",
+      )
     end
 
+    before do
+      Fabricate(:chat_message, user: other_user, chat_channel: channel_1)
+      Fabricate(:chat_message, in_reply_to: message_2, user: current_user, chat_channel: channel_1)
+      channel_1.add(other_user)
+    end
+
+    it "renders text in the reply-to" do
+      chat.visit_channel(channel_1)
+
+      expect(find(".chat-reply .chat-reply__excerpt")["innerHTML"].strip).to eq(
+        "&lt;mark&gt;not marked&lt;/mark&gt;",
+      )
+    end
+
+    it "renders safe HTML like mentions (which are just links) in the reply-to" do
+      message_2.update!(message: "@#{other_user.username} <mark>not marked</mark>")
+      message_2.rebake!
+      chat.visit_channel(channel_1)
+
+      expect(find(".chat-reply .chat-reply__excerpt")["innerHTML"].strip).to eq(
+        "<a class=\"mention\" href=\"/u/#{other_user.username}\">@#{other_user.username}</a> &lt;mark&gt;not marked&lt;/mark&gt;",
+      )
+    end
+  end
+
+  context "when messages are separated by a day" do
+    before { Fabricate(:chat_message, chat_channel: channel_1, created_at: 2.days.ago) }
+
     it "shows a date separator" do
       chat.visit_channel(channel_1)
 
-      expect(page).to have_selector(".first-daily-message", text: "Today")
-    end
-  end
-
-  context "when visiting another channel" do
-    fab!(:channel_2) { Fabricate(:chat_channel) }
-
-    before do
-      channel_1.add(current_user)
-      channel_2.add(current_user)
-      sign_in(current_user)
-    end
-
-    it "resets message selection" do
-      chat.visit_channel(channel_1)
-      channel.select_message(message_1)
-
-      expect(page).to have_css(".chat-selection-management")
-
-      chat.visit_channel(channel_2)
-
-      expect(page).to have_no_css(".chat-selection-management")
+      expect(page).to have_selector(".chat-message-separator__text", text: "Today")
     end
   end
 
@@ -201,15 +261,30 @@ RSpec.describe "Chat channel", type: :system, js: true do
       \`\`\`
       MESSAGE
 
-    before do
-      channel_1.add(current_user)
-      sign_in(current_user)
-    end
-
     it "adds the correct lang" do
       chat.visit_channel(channel_1)
 
       expect(page).to have_selector("code.lang-ruby")
     end
   end
+
+  context "when scrolling" do
+    before { 50.times { Fabricate(:chat_message, chat_channel: channel_1) } }
+
+    it "resets the active message" do
+      chat.visit_channel(channel_1)
+      last_message = find(".chat-message-container:last-child")
+      last_message.hover
+
+      expect(page).to have_css(
+        ".chat-message-actions-container[data-id='#{last_message["data-id"]}']",
+      )
+
+      find(".chat-messages-scroll").scroll_to(0, -1000)
+
+      expect(page).to have_no_css(
+        ".chat-message-actions-container[data-id='#{last_message["data-id"]}']",
+      )
+    end
+  end
 end
diff --git a/plugins/chat/spec/system/chat_composer_draft_spec.rb b/plugins/chat/spec/system/chat_composer_draft_spec.rb
new file mode 100644
index 00000000000..a0c254f8d6c
--- /dev/null
+++ b/plugins/chat/spec/system/chat_composer_draft_spec.rb
@@ -0,0 +1,152 @@
+# frozen_string_literal: true
+
+RSpec.describe "Chat composer draft", type: :system do
+  fab!(:current_user) { Fabricate(:user) }
+  fab!(:channel_1) { Fabricate(:chat_channel) }
+  fab!(:message_1) do
+    Fabricate(
+      :chat_message,
+      chat_channel: channel_1,
+      message: "This is a message for draft and replies",
+    )
+  end
+
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:channel_page) { PageObjects::Pages::ChatChannel.new }
+
+  before { chat_system_bootstrap }
+
+  context "when loading a channel with a draft" do
+    fab!(:draft_1) do
+      Chat::Draft.create!(
+        chat_channel: channel_1,
+        user: current_user,
+        data: { message: "draft" }.to_json,
+      )
+    end
+
+    before do
+      channel_1.add(current_user)
+      sign_in(current_user)
+    end
+
+    it "loads the draft" do
+      chat_page.visit_channel(channel_1)
+
+      expect(channel_page.composer.value).to eq("draft")
+    end
+
+    context "when loading another channel and back" do
+      fab!(:channel_2) { Fabricate(:chat_channel) }
+
+      fab!(:draft_2) do
+        Chat::Draft.create!(
+          chat_channel: channel_2,
+          user: current_user,
+          data: { message: "draft2" }.to_json,
+        )
+      end
+
+      before { channel_2.add(current_user) }
+
+      it "loads the correct drafts" do
+        chat_page.visit_channel(channel_1)
+
+        expect(channel_page.composer.value).to eq("draft")
+
+        chat_page.visit_channel(channel_2)
+
+        expect(channel_page.composer.value).to eq("draft2")
+
+        chat_page.visit_channel(channel_1)
+
+        expect(channel_page.composer.value).to eq("draft")
+      end
+    end
+
+    context "with editing" do
+      fab!(:draft_1) do
+        Chat::Draft.create!(
+          chat_channel: channel_1,
+          user: current_user,
+          data: { message: message_1.message, id: message_1.id, editing: true }.to_json,
+        )
+      end
+
+      it "loads the draft with the editing state" do
+        chat_page.visit_channel(channel_1)
+
+        expect(channel_page.composer).to be_editing_message(message_1)
+      end
+
+      context "when canceling editing" do
+        it "resets the draft" do
+          chat_page.visit_channel(channel_1)
+          channel_page.composer.message_details.cancel_edit
+
+          expect(channel_page.composer).to be_blank
+          expect(channel_page.composer).to have_unsaved_draft
+          expect(channel_page.composer).to have_saved_draft
+        end
+      end
+    end
+
+    context "with uploads" do
+      fab!(:upload_1) do
+        Fabricate(
+          :upload,
+          url: "/images/logo-dark.png",
+          original_filename: "logo_dark.png",
+          width: 400,
+          height: 300,
+          extension: "png",
+        )
+      end
+
+      fab!(:draft_1) do
+        Chat::Draft.create!(
+          chat_channel: channel_1,
+          user: current_user,
+          data: { message: "draft", uploads: [upload_1] }.to_json,
+        )
+      end
+
+      it "loads the draft with the upload" do
+        chat_page.visit_channel(channel_1)
+
+        expect(channel_page.composer.value).to eq("draft")
+        expect(page).to have_selector(".chat-composer-upload--image", count: 1)
+      end
+    end
+
+    context "when replying" do
+      fab!(:draft_1) do
+        Chat::Draft.create!(
+          chat_channel: channel_1,
+          user: current_user,
+          data: {
+            message: "draft",
+            replyToMsg: {
+              id: message_1.id,
+              excerpt: message_1.excerpt,
+              user: {
+                id: message_1.user.id,
+                name: nil,
+                avatar_template: message_1.user.avatar_template,
+                username: message_1.user.username,
+              },
+            },
+          }.to_json,
+        )
+      end
+
+      it "loads the draft with replied to mesage" do
+        chat_page.visit_channel(channel_1)
+
+        expect(channel_page.composer.value).to eq("draft")
+        expect(page).to have_selector(".chat-reply__username", text: message_1.user.username)
+        expect(page).to have_selector(".chat-reply__excerpt", text: message_1.excerpt)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/chat_composer_spec.rb b/plugins/chat/spec/system/chat_composer_spec.rb
index 28b1016ea23..d0eb36235e1 100644
--- a/plugins/chat/spec/system/chat_composer_spec.rb
+++ b/plugins/chat/spec/system/chat_composer_spec.rb
@@ -1,119 +1,149 @@
 # frozen_string_literal: true
 
-RSpec.describe "Chat composer", type: :system, js: true do
+RSpec.describe "Chat composer", type: :system do
   fab!(:current_user) { Fabricate(:user) }
   fab!(:channel_1) { Fabricate(:chat_channel) }
-  fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1) }
+  fab!(:message_1) { Fabricate(:chat_message, user: current_user, chat_channel: channel_1) }
 
-  let(:chat) { PageObjects::Pages::Chat.new }
-  let(:channel) { PageObjects::Pages::ChatChannel.new }
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:channel_page) { PageObjects::Pages::ChatChannel.new }
 
-  before { chat_system_bootstrap }
-
-  xit "it stores draft in replies" do
-  end
-
-  xit "it stores draft" do
-  end
-
-  context "when replying to a message" do
-    before do
-      channel_1.add(current_user)
-      sign_in(current_user)
-    end
-
-    it "adds the reply indicator to the composer" do
-      chat.visit_channel(channel_1)
-      channel.reply_to(message_1)
-
-      expect(page).to have_selector(
-        ".chat-composer-message-details .chat-reply__username",
-        text: message_1.user.username,
-      )
-    end
-  end
-
-  context "when editing a message" do
-    fab!(:message_2) { Fabricate(:chat_message, chat_channel: channel_1, user: current_user) }
-
-    before do
-      channel_1.add(current_user)
-      sign_in(current_user)
-    end
-
-    it "adds the edit indicator" do
-      chat.visit_channel(channel_1)
-      channel.edit_message(message_2)
-
-      expect(page).to have_selector(
-        ".chat-composer-message-details .chat-reply__username",
-        text: current_user.username,
-      )
-      expect(find(".chat-composer-input").value).to eq(message_2.message)
-    end
-
-    context "when pressing escape" do
-      it "cancels editing" do
-        chat.visit_channel(channel_1)
-        channel.edit_message(message_2)
-        find(".chat-composer-input").send_keys(:escape)
-
-        expect(page).to have_no_selector(".chat-composer-message-details .chat-reply__username")
-      end
-    end
+  before do
+    chat_system_bootstrap
+    channel_1.add(current_user)
+    sign_in(current_user)
   end
 
   context "when adding an emoji through the picker" do
-    before do
-      channel_1.add(current_user)
-      sign_in(current_user)
-    end
-
-    it "adds the emoji to the composer" do
-      chat.visit_channel(channel_1)
-      channel.open_action_menu
-      channel.click_action_button("emoji")
+    xit "adds the emoji to the composer" do
+      chat_page.visit_channel(channel_1)
+      channel_page.open_action_menu
+      channel_page.click_action_button("emoji")
       find("[data-emoji='grimacing']").click(wait: 0.5)
 
-      expect(find(".chat-composer-input").value).to eq(":grimacing:")
+      expect(channel_page.composer.value).to eq(":grimacing:")
+    end
+
+    it "removes denied emojis from insert emoji picker" do
+      SiteSetting.emoji_deny_list = "monkey|peach"
+
+      chat_page.visit_channel(channel_1)
+      channel_page.composer.open_emoji_picker
+
+      expect(page).to have_no_selector("[data-emoji='monkey']")
+      expect(page).to have_no_selector("[data-emoji='peach']")
     end
   end
 
   context "when adding an emoji through the autocomplete" do
-    before do
-      channel_1.add(current_user)
-      sign_in(current_user)
-    end
-
     it "adds the emoji to the composer" do
-      chat.visit_channel(channel_1)
-      find(".chat-composer-input").fill_in(with: ":gri")
+      chat_page.visit_channel(channel_1)
+      find(".chat-composer__input").fill_in(with: ":gri")
       find(".emoji-shortname", text: "grimacing").click
 
-      expect(find(".chat-composer-input").value).to eq(":grimacing: ")
+      expect(channel_page.composer.value).to eq(":grimacing: ")
+    end
+
+    it "doesn't suggest denied emojis and aliases" do
+      SiteSetting.emoji_deny_list = "peach|poop"
+      chat_page.visit_channel(channel_1)
+
+      find(".chat-composer__input").fill_in(with: ":peac")
+      expect(page).to have_no_selector(".emoji-shortname", text: "peach")
+
+      find(".chat-composer__input").fill_in(with: ":hank") # alias
+      expect(page).to have_no_selector(".emoji-shortname", text: "poop")
+    end
+  end
+
+  context "when opening emoji picker through more button of the autocomplete" do
+    xit "prefills the emoji picker filter input" do
+      chat_page.visit_channel(channel_1)
+      find(".chat-composer__input").fill_in(with: ":gri")
+
+      click_link(I18n.t("js.composer.more_emoji"))
+
+      expect(find(".chat-emoji-picker .dc-filter-input").value).to eq("gri")
+    end
+
+    xit "filters with the prefilled input" do
+      chat_page.visit_channel(channel_1)
+      find(".chat-composer__input").fill_in(with: ":fr")
+
+      click_link(I18n.t("js.composer.more_emoji"))
+
+      expect(page).to have_selector(".chat-emoji-picker [data-emoji='fr']")
+      expect(page).to have_no_selector(".chat-emoji-picker [data-emoji='grinning']")
     end
   end
 
   context "when typing on keyboard" do
-    before do
-      channel_1.add(current_user)
-      sign_in(current_user)
-    end
-
     it "propagates keys to composer" do
-      chat.visit_channel(channel_1)
+      chat_page.visit_channel(channel_1)
 
       find("body").send_keys("b")
 
-      expect(find(".chat-composer-input").value).to eq("b")
+      expect(channel_page.composer.value).to eq("b")
 
       find("body").send_keys("b")
 
-      expect(find(".chat-composer-input").value).to eq("bb")
+      expect(channel_page.composer.value).to eq("bb")
 
       find("body").send_keys(:enter) # special case
 
-      expect(find(".chat-composer-input").value).to eq("bb")
+      expect(channel_page.composer.value).to eq("bb")
+    end
+  end
+
+  context "when editing a message with no length" do
+    it "deletes the message" do
+      chat_page.visit_channel(channel_1)
+      channel_page.composer.edit_last_message_shortcut
+      channel_page.composer.fill_in(with: "")
+      channel_page.click_send_message
+
+      expect(channel_page.messages).to have_message(deleted: 1)
+    end
+  end
+
+  context "when posting a message with length equal to minimum length" do
+    before { SiteSetting.chat_minimum_message_length = 1 }
+
+    it "works" do
+      chat_page.visit_channel(channel_1)
+      channel_page.send_message("1")
+
+      expect(channel_page.messages).to have_message(text: "1")
+    end
+  end
+
+  context "when posting a message with length superior to minimum length" do
+    before { SiteSetting.chat_minimum_message_length = 2 }
+
+    it "doesn’t allow to send" do
+      chat_page.visit_channel(channel_1)
+      find("body").send_keys("1")
+
+      expect(page).to have_css(".chat-composer.is-send-disabled")
+    end
+  end
+
+  context "when upload is in progress" do
+    it "doesn’t allow to send" do
+      chat_page.visit_channel(channel_1)
+
+      page.driver.browser.network_conditions = { latency: 20_000 }
+
+      file_path = file_from_fixtures("logo.png", "images").path
+      attach_file(file_path) do
+        channel_page.open_action_menu
+        channel_page.click_action_button("chat-upload-btn")
+      end
+
+      expect(page).to have_css(".chat-composer-upload--in-progress")
+      expect(page).to have_css(".chat-composer.is-send-disabled")
+    ensure
+      page.driver.browser.network_conditions = { latency: 0 }
     end
   end
 end
diff --git a/plugins/chat/spec/system/chat_message/channel_spec.rb b/plugins/chat/spec/system/chat_message/channel_spec.rb
new file mode 100644
index 00000000000..5f3c6778ab8
--- /dev/null
+++ b/plugins/chat/spec/system/chat_message/channel_spec.rb
@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+RSpec.describe "Chat message - channel", type: :system do
+  fab!(:current_user) { Fabricate(:user) }
+  fab!(:channel_1) { Fabricate(:chat_channel) }
+  fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1) }
+
+  let(:cdp) { PageObjects::CDP.new }
+  let(:chat) { PageObjects::Pages::Chat.new }
+  let(:channel) { PageObjects::Pages::ChatChannel.new }
+
+  before do
+    chat_system_bootstrap
+    channel_1.add(current_user)
+    sign_in(current_user)
+  end
+
+  context "when hovering a message" do
+    it "adds an active class" do
+      chat.visit_channel(channel_1)
+
+      channel.hover_message(message_1)
+
+      expect(page).to have_css(
+        ".chat-channel[data-id='#{channel_1.id}'] .chat-message-container[data-id='#{message_1.id}'].-active",
+      )
+    end
+  end
+
+  context "when copying link to a message" do
+    before { cdp.allow_clipboard }
+
+    it "copies the link to the message" do
+      chat.visit_channel(channel_1)
+
+      channel.copy_link(message_1)
+
+      expect(cdp.read_clipboard).to include("/chat/c/-/#{channel_1.id}/#{message_1.id}")
+    end
+
+    context "when the message is part of a thread" do
+      before { channel_1.update!(threading_enabled: true) }
+
+      fab!(:thread_1) do
+        chat_thread_chain_bootstrap(
+          channel: channel_1,
+          users: [current_user, Fabricate(:user)],
+          messages_count: 2,
+        )
+      end
+
+      it "copies the link to the message and not to the thread" do
+        chat.visit_channel(channel_1)
+
+        channel.copy_link(thread_1.original_message)
+
+        expect(cdp.read_clipboard).to include(
+          "/chat/c/-/#{channel_1.id}/#{thread_1.original_message.id}",
+        )
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/chat_message/thread_spec.rb b/plugins/chat/spec/system/chat_message/thread_spec.rb
new file mode 100644
index 00000000000..0d11eb9156b
--- /dev/null
+++ b/plugins/chat/spec/system/chat_message/thread_spec.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+RSpec.describe "Chat message - thread", type: :system do
+  fab!(:current_user) { Fabricate(:user) }
+  fab!(:channel_1) { Fabricate(:chat_channel, threading_enabled: true) }
+  fab!(:thread_message_1) do
+    message_1 = Fabricate(:chat_message, chat_channel: channel_1)
+    Fabricate(:chat_message, chat_channel: channel_1, in_reply_to: message_1)
+  end
+
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:thread_page) { PageObjects::Pages::ChatThread.new }
+
+  before do
+    chat_system_bootstrap
+    channel_1.add(current_user)
+    sign_in(current_user)
+  end
+
+  context "when hovering a message" do
+    it "adds an active class" do
+      chat_page.visit_thread(thread_message_1.thread)
+
+      thread_page.hover_message(thread_message_1)
+
+      expect(page).to have_css(
+        ".chat-thread[data-id='#{thread_message_1.thread.id}'] [data-id='#{thread_message_1.id}'].chat-message-container.-active",
+      )
+    end
+  end
+
+  context "when copying link to a message" do
+    let(:cdp) { PageObjects::CDP.new }
+
+    before { cdp.allow_clipboard }
+
+    it "copies the link to the thread" do
+      chat_page.visit_thread(thread_message_1.thread)
+
+      thread_page.copy_link(thread_message_1)
+
+      expect(cdp.read_clipboard).to include(
+        "/chat/c/-/#{channel_1.id}/t/#{thread_message_1.thread.id}/#{thread_message_1.id}",
+      )
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/chat_message_onebox_spec.rb b/plugins/chat/spec/system/chat_message_onebox_spec.rb
new file mode 100644
index 00000000000..cdb5bc15b7b
--- /dev/null
+++ b/plugins/chat/spec/system/chat_message_onebox_spec.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+RSpec.describe "Chat message onebox", type: :system do
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:channel_page) { PageObjects::Pages::ChatChannel.new }
+
+  fab!(:current_user) { Fabricate(:user) }
+  fab!(:channel_1) { Fabricate(:category_channel) }
+
+  before do
+    chat_system_bootstrap
+    channel_1.add(current_user)
+    sign_in(current_user)
+  end
+
+  context "when sending a message with a link" do
+    before do
+      SiteSetting.enable_inline_onebox_on_all_domains = true
+
+      full_onebox_html = <<~HTML.chomp
+        <aside class="onebox wikipedia" data-onebox-src="https://en.wikipedia.org/wiki/Hyperlink">
+          <article class="onebox-body">
+            <p>This is a test</p>
+          </article>
+        </aside>
+      HTML
+      Oneboxer
+        .stubs(:cached_onebox)
+        .with("https://en.wikipedia.org/wiki/Hyperlink")
+        .returns(full_onebox_html)
+
+      stub_request(:get, "https://en.wikipedia.org/wiki/Hyperlink").to_return(
+        status: 200,
+        body: "<html><head><title>a</title></head></html>",
+      )
+    end
+
+    it "is oneboxed" do
+      chat_page.visit_channel(channel_1)
+      channel_page.send_message("https://en.wikipedia.org/wiki/Hyperlink")
+
+      expect(page).to have_content("This is a test", wait: 20)
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/chat_summarization_spec.rb b/plugins/chat/spec/system/chat_summarization_spec.rb
new file mode 100644
index 00000000000..57401b57559
--- /dev/null
+++ b/plugins/chat/spec/system/chat_summarization_spec.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+RSpec.describe "Summarize a channel since your last visit", type: :system, js: true do
+  fab!(:current_user) { Fabricate(:user) }
+  fab!(:group) { Fabricate(:group) }
+  let(:plugin) { Plugin::Instance.new }
+
+  fab!(:channel) { Fabricate(:chat_channel) }
+
+  fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel) }
+
+  let(:chat) { PageObjects::Pages::Chat.new }
+
+  let(:summarization_result) { { summary: "This is a summary", chunks: [] } }
+
+  before do
+    group.add(current_user)
+
+    strategy = DummyCustomSummarization.new(summarization_result)
+    plugin.register_summarization_strategy(strategy)
+    SiteSetting.summarization_strategy = strategy.model
+    SiteSetting.custom_summarization_allowed_groups = group.id.to_s
+
+    SiteSetting.chat_enabled = true
+    SiteSetting.chat_allowed_groups = group.id.to_s
+    sign_in(current_user)
+    chat_system_bootstrap(current_user, [channel])
+  end
+
+  it "displays a summary of the messages since the selected timeframe" do
+    chat.visit_channel(channel)
+
+    find(".chat-composer-dropdown__trigger-btn").click
+    find(".chat-composer-dropdown__action-btn.channel-summary").click
+
+    expect(page.has_css?(".chat-modal-channel-summary")).to eq(true)
+
+    find(".summarization-since").click
+    find(".select-kit-row[data-value=\"3\"]").click
+
+    expect(find(".summary-area").text).to eq(summarization_result[:summary])
+  end
+end
diff --git a/plugins/chat/spec/system/closed_channel_spec.rb b/plugins/chat/spec/system/closed_channel_spec.rb
index 7237db225fe..921a7428a0b 100644
--- a/plugins/chat/spec/system/closed_channel_spec.rb
+++ b/plugins/chat/spec/system/closed_channel_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "Closed channel", type: :system, js: true do
+RSpec.describe "Closed channel", type: :system do
   fab!(:channel_1) { Fabricate(:chat_channel) }
 
   let(:chat) { PageObjects::Pages::Chat.new }
@@ -30,11 +30,7 @@ RSpec.describe "Closed channel", type: :system, js: true do
       chat.visit_channel(channel_1)
 
       expect(page).to have_field(
-        placeholder:
-          I18n.t(
-            "js.chat.placeholder_new_message_disallowed",
-            status: I18n.t("js.chat.channel_status.closed").downcase,
-          ),
+        placeholder: I18n.t("js.chat.placeholder_new_message_disallowed.closed"),
         disabled: true,
       )
     end
@@ -54,7 +50,7 @@ RSpec.describe "Closed channel", type: :system, js: true do
       chat.visit_channel(channel_1)
 
       expect(page).to have_no_field(
-        placeholder: I18n.t("js.chat.placeholder_new_message_disallowed"),
+        placeholder: I18n.t("js.chat.placeholder_new_message_disallowed.closed"),
         disabled: true,
       )
     end
diff --git a/plugins/chat/spec/system/create_channel_spec.rb b/plugins/chat/spec/system/create_channel_spec.rb
index a525f09371c..0b10a181321 100644
--- a/plugins/chat/spec/system/create_channel_spec.rb
+++ b/plugins/chat/spec/system/create_channel_spec.rb
@@ -1,35 +1,52 @@
 # frozen_string_literal: true
 
-RSpec.describe "Create channel", type: :system, js: true do
-  fab!(:current_admin_user) { Fabricate(:admin) }
+RSpec.describe "Create channel", type: :system do
   fab!(:category_1) { Fabricate(:category) }
 
   let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:channel_modal) { PageObjects::Modals::ChatChannelCreate.new }
 
-  before do
-    chat_system_bootstrap
-    sign_in(current_admin_user)
+  before { chat_system_bootstrap }
+
+  context "when user cannot create channel" do
+    fab!(:current_user) { Fabricate(:user) }
+
+    before { sign_in(current_user) }
+
+    it "does not show the create channel button" do
+      chat_page.visit_browse
+      expect(chat_page).to have_no_new_channel_button
+    end
   end
 
   context "when can create channel" do
+    fab!(:current_admin_user) { Fabricate(:admin) }
+    before { sign_in(current_admin_user) }
+
     context "when selecting a category" do
       it "shows access hint" do
-        visit("/chat")
-        find(".new-channel-btn").click
-        find(".category-chooser").click
-        find(".category-row[data-value=\"#{category_1.id}\"]").click
+        chat_page.visit_browse
+        chat_page.new_channel_button.click
+        channel_modal.select_category(category_1)
 
-        expect(find(".create-channel-hint")).to have_content(Group[:everyone].name)
+        expect(channel_modal).to have_create_hint(Group[:everyone].name)
+      end
+
+      it "shows threading toggle" do
+        chat_page.visit_browse
+        chat_page.new_channel_button.click
+        channel_modal.select_category(category_1)
+
+        expect(channel_modal).to have_threading_toggle
       end
 
       it "does not override channel name if that was already specified" do
-        visit("/chat")
-        find(".new-channel-btn").click
-        fill_in("channel-name", with: "My Cool Channel")
-        find(".category-chooser").click
-        find(".category-row[data-value=\"#{category_1.id}\"]").click
+        chat_page.visit_browse
+        chat_page.new_channel_button.click
+        channel_modal.fill_name("My Cool Channel")
+        channel_modal.select_category(category_1)
 
-        expect(page).to have_field("channel-name", with: "My Cool Channel")
+        expect(channel_modal).to have_name_prefilled("My Cool Channel")
       end
 
       context "when category is private" do
@@ -37,12 +54,11 @@ RSpec.describe "Create channel", type: :system, js: true do
         fab!(:private_category_1) { Fabricate(:private_category, group: group_1) }
 
         it "shows access hint when selecting the category" do
-          visit("/chat")
-          find(".new-channel-btn").click
-          find(".category-chooser").click
-          find(".category-row[data-value=\"#{private_category_1.id}\"]").click
+          chat_page.visit_browse
+          chat_page.new_channel_button.click
+          channel_modal.select_category(private_category_1)
 
-          expect(find(".create-channel-hint")).to have_content(group_1.name)
+          expect(channel_modal).to have_create_hint(group_1.name)
         end
 
         context "when category is a child" do
@@ -52,18 +68,17 @@ RSpec.describe "Create channel", type: :system, js: true do
           end
 
           it "shows access hint when selecting the category" do
-            visit("/chat")
-            find(".new-channel-btn").click
-            find(".category-chooser").click
-            find(".category-row[data-value=\"#{child_category.id}\"]").click
+            chat_page.visit_browse
+            chat_page.new_channel_button.click
+            channel_modal.select_category(child_category)
 
-            expect(find(".create-channel-hint")).to have_content(group_2.name)
+            expect(channel_modal).to have_create_hint(group_2.name)
           end
         end
       end
     end
 
-    context "when category has a malicous group name" do
+    context "when category has a malicious group name" do
       fab!(:group_1) do
         group = Group.new(name: "<script>e</script>")
         group.save(validate: false)
@@ -72,48 +87,201 @@ RSpec.describe "Create channel", type: :system, js: true do
       fab!(:private_category_1) { Fabricate(:private_category, group: group_1) }
 
       it "escapes the group name" do
-        visit("/chat")
-        find(".new-channel-btn").click
-        find(".category-chooser").click
-        find(".category-row[data-value=\"#{private_category_1.id}\"]").click
+        chat_page.visit_browse
+        chat_page.new_channel_button.click
+        channel_modal.select_category(private_category_1)
+        expect(page).to have_no_css(".loading-permissions")
 
-        expect(find(".create-channel-hint")["innerHTML"].strip).to include(
+        expect(channel_modal.create_channel_hint["innerHTML"].strip).to include(
           "&lt;script&gt;e&lt;/script&gt;",
         )
       end
     end
 
+    it "autogenerates slug from name and changes slug placeholder" do
+      chat_page.visit_browse
+      chat_page.new_channel_button.click
+      name = "Cats & Dogs"
+      channel_modal.select_category(category_1)
+      channel_modal.fill_name(name)
+      channel_modal.fill_description("All kind of cute cats")
+
+      wait_for_attribute(channel_modal.slug_input, :placeholder, "cats-dogs")
+
+      channel_modal.click_primary_button
+
+      expect(page).to have_content(name)
+      created_channel = Chat::Channel.find_by(chatable_id: category_1.id)
+      expect(created_channel.slug).to eq("cats-dogs")
+      expect(page).to have_current_path(chat.channel_path(created_channel.slug, created_channel.id))
+    end
+
+    it "allows the user to set a slug independently of name" do
+      chat_page.visit_browse
+      chat_page.new_channel_button.click
+      name = "Cats & Dogs"
+      channel_modal.select_category(category_1)
+      channel_modal.fill_name(name)
+      channel_modal.fill_description("All kind of cute cats")
+      channel_modal.fill_slug("pets-everywhere")
+      channel_modal.click_primary_button
+
+      expect(page).to have_content(name)
+      created_channel = Chat::Channel.find_by(chatable_id: category_1.id)
+      expect(created_channel.slug).to eq("pets-everywhere")
+      expect(page).to have_current_path(chat.channel_path(created_channel.slug, created_channel.id))
+    end
+
     context "when saving" do
+      context "when user has chosen to automatically add users" do
+        let(:dialog) { PageObjects::Components::Dialog.new }
+        let(:name) { "Cats & Dogs" }
+
+        before do
+          chat_page.visit_browse
+          chat_page.new_channel_button.click
+          channel_modal.fill_name(name)
+        end
+
+        context "for a public category" do
+          before do
+            channel_modal.select_category(category_1)
+            find(".-auto-join .chat-modal-create-channel__label").click
+            channel_modal.click_primary_button
+          end
+
+          it "displays the correct warning" do
+            expect(dialog).to have_content(
+              I18n.t(
+                "js.chat.create_channel.auto_join_users.public_category_warning",
+                category: category_1.name,
+              ),
+            )
+          end
+
+          it "allows the user to proceed with channel creation" do
+            dialog.click_yes
+            expect(page).to have_content(name)
+            created_channel = Chat::Channel.find_by(chatable_id: category_1.id)
+            expect(page).to have_current_path(
+              chat.channel_path(created_channel.slug, created_channel.id),
+            )
+          end
+
+          it "does nothing if no is clicked" do
+            dialog.click_no
+            expect(page).to have_css(".chat-modal-create-channel")
+            expect(Chat::Channel.exists?(chatable_id: category_1.id)).to eq(false)
+          end
+        end
+
+        context "for a private category" do
+          fab!(:group_1) { Fabricate(:group) }
+          fab!(:user_1) { Fabricate(:user) }
+          fab!(:private_category) { Fabricate(:private_category, group: group_1) }
+
+          before do
+            group_1.add(user_1)
+            channel_modal.select_category(private_category)
+            find(".-auto-join .chat-modal-create-channel__label").click
+            channel_modal.click_primary_button
+          end
+
+          context "when only 1 group can access the category" do
+            it "displays the correct warning" do
+              expect(dialog).to have_content(
+                I18n.t(
+                  "js.chat.create_channel.auto_join_users.warning_1_group",
+                  count: 1,
+                  group: "@#{group_1.name}",
+                ),
+              )
+            end
+          end
+
+          context "when 2 groups can access the category" do
+            fab!(:group_2) { Fabricate(:group) }
+            fab!(:category_group_2) do
+              CategoryGroup.create(group: group_2, category: private_category)
+            end
+
+            it "displays the correct warning" do
+              expect(dialog).to have_content(
+                I18n.t(
+                  "js.chat.create_channel.auto_join_users.warning_2_groups",
+                  count: 1,
+                  group1: "@#{group_1.name}",
+                  group2: "@#{group_2.name}",
+                ),
+              )
+            end
+          end
+
+          context "when > 2 groups can access the category" do
+            fab!(:group_2) { Fabricate(:group) }
+            fab!(:category_group_2) do
+              CategoryGroup.create(group: group_2, category: private_category)
+            end
+
+            fab!(:group_3) { Fabricate(:group) }
+            fab!(:category_group_3) do
+              CategoryGroup.create(group: group_3, category: private_category)
+            end
+
+            it "displays the correct warning" do
+              # NOTE: This has to be hardcoded because the I18n module in ruby
+              # does not support messageFormat.
+              expect(dialog).to have_content(
+                "Automatically add 1 user from @#{group_1.name} and 2 other groups?",
+              )
+            end
+          end
+        end
+      end
+
       context "when error" do
         it "displays the error" do
           existing_channel = Fabricate(:chat_channel)
-          visit("/chat")
-          find(".new-channel-btn").click
-          find(".category-chooser").click
-          find(".category-row[data-value=\"#{existing_channel.chatable_id}\"]").click
-          fill_in("channel-name", with: existing_channel.name)
-          find(".create-channel-modal .create").click
+          chat_page.visit_browse
+          chat_page.new_channel_button.click
+          channel_modal.select_category(existing_channel.chatable)
+          channel_modal.fill_name(existing_channel.name)
+          channel_modal.click_primary_button
 
           expect(page).to have_content(I18n.t("chat.errors.channel_exists_for_category"))
         end
       end
 
+      context "when slug is already being used" do
+        it "displays the error" do
+          Fabricate(:chat_channel, slug: "pets-everywhere")
+          chat_page.visit_browse
+          chat_page.new_channel_button.click
+          channel_modal.select_category(category_1)
+          channel_modal.fill_name("Testing")
+          channel_modal.fill_slug("pets-everywhere")
+          channel_modal.click_primary_button
+
+          expect(page).to have_content(
+            "Slug " + I18n.t("chat.category_channel.errors.is_already_in_use"),
+          )
+        end
+      end
+
       context "when successful" do
         it "redirects to created channel" do
-          visit("/chat")
-          find(".new-channel-btn").click
-          name = "Cats"
-          find(".category-chooser").click
-          find(".category-row[data-value=\"#{category_1.id}\"]").click
-          expect(page).to have_field("channel-name", with: category_1.name)
-          fill_in("channel-name", with: name)
-          fill_in("channel-description", with: "All kind of cute cats")
-          find(".create-channel-modal .create").click
+          chat_page.visit_browse
+          chat_page.new_channel_button.click
+          channel_modal.select_category(category_1)
+          expect(channel_modal).to have_name_prefilled(category_1.name)
 
-          expect(page).to have_content(name)
-          created_channel = ChatChannel.find_by(chatable_id: category_1.id)
+          channel_modal.fill_description("All kind of cute cats")
+          channel_modal.click_primary_button
+
+          expect(page).to have_content(category_1.name)
+          created_channel = Chat::Channel.find_by(chatable_id: category_1.id)
           expect(page).to have_current_path(
-            chat.channel_path(created_channel.id, created_channel.slug),
+            chat.channel_path(created_channel.slug, created_channel.id),
           )
         end
       end
diff --git a/plugins/chat/spec/system/dates_separators_spec.rb b/plugins/chat/spec/system/dates_separators_spec.rb
new file mode 100644
index 00000000000..b72f63fe079
--- /dev/null
+++ b/plugins/chat/spec/system/dates_separators_spec.rb
@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+RSpec.describe "Dates separators", type: :system do
+  fab!(:current_user) { Fabricate(:user) }
+  fab!(:channel_1) { Fabricate(:chat_channel) }
+
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:channel_page) { PageObjects::Pages::ChatChannel.new }
+
+  before do
+    chat_system_bootstrap
+    channel_1.add(current_user)
+    sign_in(current_user)
+  end
+
+  context "when today separator is out of screen" do
+    before do
+      15.times { Fabricate(:chat_message, chat_channel: channel_1, created_at: 1.day.ago) }
+      30.times { Fabricate(:chat_message, chat_channel: channel_1) }
+    end
+
+    xit "shows it as a sticky date" do
+      chat_page.visit_channel(channel_1)
+
+      expect(page.find(".chat-message-separator__text-container.is-pinned")).to have_content(
+        I18n.t("js.chat.chat_message_separator.today"),
+      )
+      expect(page).to have_css(
+        ".chat-message-separator__text-container:not(.is-pinned)",
+        visible: :hidden,
+        text:
+          "#{I18n.t("js.chat.chat_message_separator.yesterday")} - #{I18n.t("js.chat.last_visit")}",
+      )
+    end
+  end
+
+  context "when receiving messages on a different channel" do
+    fab!(:channel_2) { Fabricate(:chat_channel) }
+    fab!(:user_1) { Fabricate(:user) }
+
+    before do
+      channel_2.add(current_user)
+      channel_1.add(user_1)
+    end
+
+    it "doesn't impact the last visit separator" do
+      chat_page.visit_channel(channel_1)
+      channel_page.send_message("message1")
+      chat_page.visit_channel(channel_2)
+
+      using_session(:user_1) do |session|
+        sign_in(user_1)
+        chat_page.visit_channel(channel_1)
+        channel_page.send_message("message2")
+        session.quit
+      end
+
+      chat_page.visit_channel(channel_1)
+
+      expect(page).to have_css(
+        ".chat-message-separator__text-container",
+        text: I18n.t("js.chat.last_visit"),
+      )
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/deleted_channel_spec.rb b/plugins/chat/spec/system/deleted_channel_spec.rb
index 60b95d5f7ea..9534464b219 100644
--- a/plugins/chat/spec/system/deleted_channel_spec.rb
+++ b/plugins/chat/spec/system/deleted_channel_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "Deleted channel", type: :system, js: true do
+RSpec.describe "Deleted channel", type: :system do
   fab!(:channel_1) { Fabricate(:chat_channel) }
 
   let(:chat_page) { PageObjects::Pages::Chat.new }
diff --git a/plugins/chat/spec/system/deleted_message_spec.rb b/plugins/chat/spec/system/deleted_message_spec.rb
new file mode 100644
index 00000000000..cd40289619d
--- /dev/null
+++ b/plugins/chat/spec/system/deleted_message_spec.rb
@@ -0,0 +1,161 @@
+# frozen_string_literal: true
+
+RSpec.describe "Deleted message", type: :system do
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:channel_page) { PageObjects::Pages::ChatChannel.new }
+  let(:sidebar_component) { PageObjects::Components::NavigationMenu::Sidebar.new }
+
+  fab!(:current_user) { Fabricate(:admin) }
+  fab!(:channel_1) { Fabricate(:category_channel) }
+
+  before do
+    chat_system_bootstrap
+    channel_1.add(current_user)
+    sign_in(current_user)
+  end
+
+  context "when deleting a message" do
+    it "shows as deleted" do
+      chat_page.visit_channel(channel_1)
+      channel_page.send_message("aaaaaaaaaaaaaaaaaaaa")
+
+      expect(page).to have_css(".-persisted")
+
+      last_message = find(".chat-message-container:last-child")
+      channel_page.delete_message(OpenStruct.new(id: last_message["data-id"]))
+
+      expect(channel_page.messages).to have_deleted_message(
+        OpenStruct.new(id: last_message["data-id"]),
+        count: 1,
+      )
+    end
+
+    it "does not error when coming back to the channel from another channel" do
+      message = Fabricate(:chat_message, chat_channel: channel_1)
+      channel_2 = Fabricate(:category_channel, name: "other channel")
+      channel_2.add(current_user)
+      channel_1
+        .user_chat_channel_memberships
+        .find_by(user: current_user)
+        .update!(last_read_message_id: message.id)
+      chat_page.visit_channel(channel_1)
+      channel_page.delete_message(message)
+      expect(channel_page.messages).to have_deleted_message(message, count: 1)
+      sidebar_component.click_link(channel_2.name)
+      expect(channel_page).to have_no_loading_skeleton
+
+      sidebar_component.click_link(channel_1.name)
+      expect(channel_page.messages).to have_deleted_message(message, count: 1)
+    end
+
+    context "when the current user is not admin" do
+      fab!(:current_user) { Fabricate(:user) }
+
+      it "does not error when coming back to the channel from another channel" do
+        message = Fabricate(:chat_message, chat_channel: channel_1)
+        channel_2 = Fabricate(:category_channel, name: "other channel")
+        channel_2.add(current_user)
+        channel_1
+          .user_chat_channel_memberships
+          .find_by(user: current_user)
+          .update!(last_read_message_id: message.id)
+        chat_page.visit_channel(channel_1)
+        sidebar_component.click_link(channel_2.name)
+
+        other_user = Fabricate(:admin)
+        chat_system_user_bootstrap(user: other_user, channel: channel_1)
+        using_session(:tab_2) do |session|
+          sign_in(other_user)
+          chat_page.visit_channel(channel_1)
+          channel_page.delete_message(message)
+          session.quit
+        end
+
+        sidebar_component.click_link(channel_1.name)
+        expect(channel_page.messages).to have_no_message(id: message.id)
+      end
+    end
+  end
+
+  context "when deleting multiple messages" do
+    fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1) }
+    fab!(:message_2) { Fabricate(:chat_message, chat_channel: channel_1) }
+    fab!(:message_3) { Fabricate(:chat_message, chat_channel: channel_1) }
+    fab!(:message_4) { Fabricate(:chat_message, chat_channel: channel_1) }
+    fab!(:message_5) { Fabricate(:chat_message, chat_channel: channel_1) }
+    fab!(:message_6) { Fabricate(:chat_message, chat_channel: channel_1) }
+
+    it "groups them" do
+      chat_page.visit_channel(channel_1)
+
+      channel_page.delete_message(message_1)
+      channel_page.delete_message(message_3)
+      channel_page.delete_message(message_4)
+      channel_page.delete_message(message_6)
+
+      expect(channel_page.messages).to have_deleted_messages(message_1, message_6)
+      expect(channel_page.messages).to have_deleted_message(message_4, count: 2)
+      expect(channel_page.messages).to have_no_message(id: message_3.id)
+    end
+  end
+
+  context "when bulk deleting messages across the channel and a thread" do
+    let(:side_panel) { PageObjects::Pages::ChatSidePanel.new }
+    let(:open_thread) { PageObjects::Pages::ChatThread.new }
+
+    fab!(:other_user) { Fabricate(:user) }
+
+    fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1, user: other_user) }
+    fab!(:message_2) { Fabricate(:chat_message, chat_channel: channel_1, user: other_user) }
+    fab!(:message_3) { Fabricate(:chat_message, chat_channel: channel_1, user: other_user) }
+    fab!(:thread_1) { Fabricate(:chat_thread, channel: channel_1, original_message: message_3) }
+
+    fab!(:message_4) do
+      Fabricate(
+        :chat_message,
+        in_reply_to_id: message_3.id,
+        chat_channel: channel_1,
+        user: other_user,
+        thread_id: thread_1.id,
+      )
+    end
+    fab!(:message_5) do
+      Fabricate(
+        :chat_message,
+        in_reply_to_id: message_3.id,
+        chat_channel: channel_1,
+        user: other_user,
+        thread_id: thread_1.id,
+      )
+    end
+
+    before do
+      channel_1.update!(threading_enabled: true)
+      chat_system_user_bootstrap(user: other_user, channel: channel_1)
+      Chat::Thread.update_counts
+      thread_1.add(current_user)
+    end
+
+    xit "hides the deleted messages" do
+      chat_page.visit_channel(channel_1)
+
+      channel_page.message_thread_indicator(message_3).click
+      expect(side_panel).to have_open_thread(message_3.thread)
+
+      expect(channel_page.messages).to have_message(id: message_2.id)
+      expect(channel_page.messages).to have_message(id: message_1.id)
+      expect(open_thread.messages).to have_message(thread_id: thread_1.id, id: message_4.id)
+      expect(open_thread.messages).to have_message(thread_id: thread_1.id, id: message_5.id)
+
+      Chat::Publisher.publish_bulk_delete!(
+        channel_1,
+        [message_1.id, message_2.id, message_4.id, message_5.id].flatten,
+      )
+
+      expect(channel_page.messages).to have_no_message(id: message_1.id)
+      expect(channel_page.messages).to have_deleted_message(message_2, count: 2)
+      expect(open_thread.messages).to have_no_message(thread_id: thread_1.id, id: message_4.id)
+      expect(open_thread.messages).to have_deleted_message(message_5, count: 2)
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/document_title_spec.rb b/plugins/chat/spec/system/document_title_spec.rb
new file mode 100644
index 00000000000..83250eae3d7
--- /dev/null
+++ b/plugins/chat/spec/system/document_title_spec.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+RSpec.describe "Document title", type: :system do
+  fab!(:current_user) { Fabricate(:user) }
+
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+
+  context "when visiting a public channel" do
+    fab!(:channel_1) { Fabricate(:category_channel) }
+
+    before do
+      chat_system_bootstrap
+      channel_1.add(current_user)
+      sign_in(current_user)
+    end
+
+    it "shows the channel name in the document title" do
+      chat_page.visit_channel(channel_1)
+
+      expect(page.title).to start_with("##{channel_1.title}")
+    end
+  end
+
+  context "when visiting a direct message channel" do
+    fab!(:channel_1) { Fabricate(:direct_message_channel, users: [current_user]) }
+
+    before do
+      chat_system_bootstrap
+      channel_1.add(current_user)
+      sign_in(current_user)
+    end
+
+    it "shows the channel name in the document title" do
+      chat_page.visit_channel(channel_1)
+
+      expect(page.title).to start_with("#{channel_1.title(current_user)}")
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/drawer_spec.rb b/plugins/chat/spec/system/drawer_spec.rb
new file mode 100644
index 00000000000..82ae5aa0542
--- /dev/null
+++ b/plugins/chat/spec/system/drawer_spec.rb
@@ -0,0 +1,137 @@
+# frozen_string_literal: true
+
+RSpec.describe "Drawer", type: :system do
+  fab!(:current_user) { Fabricate(:admin) }
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:channel_page) { PageObjects::Pages::ChatChannel.new }
+  let(:drawer) { PageObjects::Pages::ChatDrawer.new }
+
+  before do
+    chat_system_bootstrap
+    sign_in(current_user)
+  end
+
+  context "when on channel" do
+    fab!(:channel) { Fabricate(:chat_channel) }
+    fab!(:membership) do
+      Fabricate(:user_chat_channel_membership, user: current_user, chat_channel: channel)
+    end
+
+    context "when clicking channel title" do
+      it "opens channel info page" do
+        visit("/")
+        chat_page.open_from_header
+        drawer.open_channel(channel)
+        page.find(".chat-channel-title").click
+
+        expect(page).to have_current_path("/chat/c/#{channel.slug}/#{channel.id}/info/about")
+      end
+    end
+  end
+
+  context "when opening" do
+    it "uses stored size" do
+      visit("/") # we need to visit the page first to set the local storage
+
+      page.execute_script "window.localStorage.setItem('discourse_chat_drawer_size_width','500');"
+      page.execute_script "window.localStorage.setItem('discourse_chat_drawer_size_height','500');"
+
+      visit("/")
+
+      chat_page.open_from_header
+
+      expect(page.find(".chat-drawer").native.style("width")).to eq("500px")
+      expect(page.find(".chat-drawer").native.style("height")).to eq("500px")
+    end
+
+    it "has a default size" do
+      visit("/")
+
+      chat_page.open_from_header
+
+      expect(page.find(".chat-drawer").native.style("width")).to eq("400px")
+      expect(page.find(".chat-drawer").native.style("height")).to eq("530px")
+    end
+  end
+
+  context "when toggling open/close" do
+    it "toggles a css class on body" do
+      visit("/")
+
+      chat_page.open_from_header
+
+      expect(page.find("body.chat-drawer-active")).to be_visible
+
+      drawer.close
+
+      expect(page.find("body:not(.chat-drawer-active)")).to be_visible
+    end
+  end
+
+  context "when closing the drawer" do
+    fab!(:channel_1) { Fabricate(:chat_channel) }
+    fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1) }
+
+    before { channel_1.add(current_user) }
+
+    it "resets the active message" do
+      visit("/")
+      chat_page.open_from_header
+      drawer.open_channel(channel_1)
+      channel_page.hover_message(message_1)
+
+      expect(page).to have_css(".chat-message-actions-container", visible: :all)
+
+      drawer.close
+
+      expect(page).to have_no_css(".chat-message-actions-container")
+    end
+  end
+
+  context "when clicking the drawer's header" do
+    it "collapses the drawer" do
+      visit("/")
+      chat_page.open_from_header
+      expect(page).to have_selector(".chat-drawer.is-expanded")
+
+      page.find(".chat-drawer-header").click
+
+      expect(page).to have_selector(".chat-drawer:not(.is-expanded)")
+    end
+  end
+
+  context "when going from drawer to full page" do
+    fab!(:channel_1) { Fabricate(:chat_channel) }
+    fab!(:channel_2) { Fabricate(:chat_channel) }
+    fab!(:user_1) { Fabricate(:user) }
+
+    before do
+      channel_1.add(current_user)
+      channel_2.add(current_user)
+      channel_1.add(user_1)
+      channel_2.add(user_1)
+    end
+
+    it "correctly resets subscriptions" do
+      visit("/")
+
+      chat_page.open_from_header
+      drawer.maximize
+      chat_page.minimize_full_page
+      drawer.maximize
+
+      using_session("user_1") do |session|
+        sign_in(user_1)
+        chat_page.visit_channel(channel_1)
+        channel_page.send_message("onlyonce")
+        session.quit
+      end
+
+      expect(page).to have_content("onlyonce", count: 1, wait: 20)
+
+      chat_page.visit_channel(channel_2)
+
+      expect(page).to have_content("onlyonce", count: 0, wait: 20)
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/edited_message_spec.rb b/plugins/chat/spec/system/edited_message_spec.rb
index 550b1ea9f15..4e9f51a3d13 100644
--- a/plugins/chat/spec/system/edited_message_spec.rb
+++ b/plugins/chat/spec/system/edited_message_spec.rb
@@ -1,33 +1,47 @@
 # frozen_string_literal: true
 
-RSpec.describe "Edited message", type: :system, js: true do
+RSpec.describe "Edited message", type: :system do
   let(:chat_page) { PageObjects::Pages::Chat.new }
   let(:channel_page) { PageObjects::Pages::ChatChannel.new }
 
   fab!(:current_user) { Fabricate(:user) }
-  fab!(:editing_user) { Fabricate(:user) }
   fab!(:channel_1) { Fabricate(:category_channel) }
-  fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1, user: editing_user) }
 
   before do
     chat_system_bootstrap
     channel_1.add(current_user)
-    channel_1.add(editing_user)
     sign_in(current_user)
   end
 
   context "when editing message" do
-    it "shows as edited for all users" do
-      chat_page.visit_channel(channel_1)
+    context "with multiple users in the channel" do
+      fab!(:editing_user) { Fabricate(:user) }
+      fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1, user: editing_user) }
 
-      using_session(:user_1) do
-        sign_in(editing_user)
+      before { channel_1.add(editing_user) }
+
+      it "shows as edited for all users" do
         chat_page.visit_channel(channel_1)
-        channel_page.edit_message(message_1, "a different message")
+
+        using_session(:user_1) do |session|
+          sign_in(editing_user)
+          chat_page.visit_channel(channel_1)
+          channel_page.edit_message(message_1, "a different message")
+          expect(page).to have_content(I18n.t("js.chat.edited"))
+          session.quit
+        end
+
         expect(page).to have_content(I18n.t("js.chat.edited"))
       end
+    end
 
-      expect(page).to have_content(I18n.t("js.chat.edited"))
+    it "runs decorators on the edited message" do
+      message_1 = Fabricate(:chat_message, chat_channel: channel_1, user: current_user)
+      chat_page.visit_channel(channel_1)
+
+      channel_page.edit_message(message_1, '[date=2025-03-10 timezone="Europe/Paris"]')
+
+      expect(page).to have_css(".cooked-date")
     end
   end
 end
diff --git a/plugins/chat/spec/system/flag_message_spec.rb b/plugins/chat/spec/system/flag_message_spec.rb
index 8b40ba93cd8..f42bada31f7 100644
--- a/plugins/chat/spec/system/flag_message_spec.rb
+++ b/plugins/chat/spec/system/flag_message_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "Flag message", type: :system, js: true do
+RSpec.describe "Flag message", type: :system do
   fab!(:current_user) { Fabricate(:user) }
 
   let(:chat) { PageObjects::Pages::Chat.new }
@@ -32,13 +32,13 @@ RSpec.describe "Flag message", type: :system, js: true do
 
   context "when direct message channel" do
     fab!(:dm_channel_1) { Fabricate(:direct_message_channel, users: [current_user]) }
-    fab!(:message_1) { Fabricate(:chat_message, chat_channel: dm_channel_1, user: current_user) }
+    fab!(:message_1) { Fabricate(:chat_message, chat_channel: dm_channel_1) }
 
-    it "doesn’t allow to flag a message" do
+    it "allows to flag a message" do
       chat.visit_channel(dm_channel_1)
       channel.expand_message_actions(message_1)
 
-      expect(page).to have_no_css("[data-value='flag']")
+      expect(page).to have_css("[data-value='flag']")
     end
   end
 end
diff --git a/plugins/chat/spec/system/hashtag_autocomplete_spec.rb b/plugins/chat/spec/system/hashtag_autocomplete_spec.rb
index 47d4401c7a4..fa4b31e5648 100644
--- a/plugins/chat/spec/system/hashtag_autocomplete_spec.rb
+++ b/plugins/chat/spec/system/hashtag_autocomplete_spec.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-describe "Using #hashtag autocompletion to search for and lookup channels",
-         type: :system,
-         js: true do
+describe "Using #hashtag autocompletion to search for and lookup channels", type: :system do
   fab!(:user) { Fabricate(:user) }
   fab!(:channel1) { Fabricate(:chat_channel, name: "Music Lounge", slug: "music") }
   fab!(:channel2) { Fabricate(:chat_channel, name: "Random", slug: "random") }
@@ -25,8 +23,7 @@ describe "Using #hashtag autocompletion to search for and lookup channels",
 
   it "searches for channels, categories, and tags with # and prioritises channels in the results" do
     chat_page.visit_channel(channel1)
-    expect(chat_channel_page).to have_no_loading_skeleton
-    chat_channel_page.type_in_composer("this is #ra")
+    chat_channel_page.composer.fill_in(with: "this is #ra")
     expect(page).to have_css(
       ".hashtag-autocomplete .hashtag-autocomplete__option .hashtag-autocomplete__link",
       count: 3,
@@ -53,7 +50,6 @@ describe "Using #hashtag autocompletion to search for and lookup channels",
 
   it "cooks the hashtags for channels, categories, and tags serverside when the chat message is saved to the database" do
     chat_page.visit_channel(channel1)
-    expect(chat_channel_page).to have_no_loading_skeleton
     chat_channel_page.type_in_composer(
       "this is #random and this is #raspberry-beret and this is #razed which is cool",
     )
@@ -62,24 +58,116 @@ describe "Using #hashtag autocompletion to search for and lookup channels",
     message = nil
     try_until_success do
       message =
-        ChatMessage.find_by(
+        Chat::Message.find_by(
           user: user,
           message: "this is #random and this is #raspberry-beret and this is #razed which is cool",
         )
       expect(message).not_to eq(nil)
     end
-    expect(chat_channel_page).to have_message(id: message.id)
+    expect(chat_channel_page.messages).to have_message(id: message.id)
+
+    expect(page).to have_css(".hashtag-cooked[aria-label]", count: 3)
 
     cooked_hashtags = page.all(".hashtag-cooked", count: 3)
 
-    expect(cooked_hashtags[0]["outerHTML"]).to eq(<<~HTML.chomp)
-    <a class=\"hashtag-cooked\" href=\"#{channel2.relative_url}\" data-type=\"channel\" data-slug=\"random\"><svg class=\"fa d-icon d-icon-comment svg-icon svg-node\"><use href=\"#comment\"></use></svg><span>Random</span></a>
-    HTML
-    expect(cooked_hashtags[1]["outerHTML"]).to eq(<<~HTML.chomp)
-    <a class=\"hashtag-cooked\" href=\"#{category.url}\" data-type=\"category\" data-slug=\"raspberry-beret\"><svg class=\"fa d-icon d-icon-folder svg-icon svg-node\"><use href=\"#folder\"></use></svg><span>Raspberry</span></a>
-    HTML
-    expect(cooked_hashtags[2]["outerHTML"]).to eq(<<~HTML.chomp)
-    <a class=\"hashtag-cooked\" href=\"#{tag.url}\" data-type=\"tag\" data-slug=\"razed\"><svg class=\"fa d-icon d-icon-tag svg-icon svg-node\"><use href=\"#tag\"></use></svg><span>razed</span></a>
-    HTML
+    expect(cooked_hashtags[0]["outerHTML"]).to have_tag(
+      "a",
+      with: {
+        class: "hashtag-cooked",
+        href: channel2.relative_url,
+        "data-type": "channel",
+        "data-slug": "random",
+        "data-id": channel2.id,
+        "aria-label": "Random",
+      },
+    ) do
+      with_tag(
+        "svg",
+        with: {
+          class:
+            "fa d-icon d-icon-comment svg-icon hashtag-color--channel-#{channel2.id} svg-string",
+        },
+      ) { with_tag("use", with: { href: "#comment" }) }
+    end
+
+    expect(cooked_hashtags[1]["outerHTML"]).to have_tag(
+      "a",
+      with: {
+        class: "hashtag-cooked",
+        href: category.url,
+        "data-type": "category",
+        "data-slug": "raspberry-beret",
+        "data-id": category.id,
+        "aria-label": "Raspberry",
+      },
+    ) do
+      with_tag(
+        "span",
+        with: {
+          class: "hashtag-category-badge hashtag-color--category-#{category.id}",
+        },
+      )
+    end
+
+    expect(cooked_hashtags[2]["outerHTML"]).to have_tag(
+      "a",
+      with: {
+        class: "hashtag-cooked",
+        href: tag.url,
+        "data-type": "tag",
+        "data-slug": "razed",
+        "data-id": tag.id,
+        "aria-label": "razed",
+      },
+    ) do
+      with_tag(
+        "svg",
+        with: {
+          class: "fa d-icon d-icon-tag svg-icon hashtag-color--tag-#{tag.id} svg-string",
+        },
+      ) { with_tag("use", with: { href: "#tag" }) }
+    end
+  end
+
+  context "when a user cannot access the category for a cooked channel hashtag" do
+    fab!(:admin) { Fabricate(:admin) }
+    fab!(:manager_group) { Fabricate(:group, name: "Managers") }
+    fab!(:private_category) do
+      Fabricate(:private_category, name: "Management", slug: "management", group: manager_group)
+    end
+    fab!(:admin_group_user) { Fabricate(:group_user, user: admin, group: manager_group) }
+    fab!(:management_channel) do
+      Fabricate(:chat_channel, chatable: private_category, slug: "management")
+    end
+    fab!(:post_with_private_category) do
+      Fabricate(
+        :post,
+        topic: topic,
+        raw: "this is a secret #management::channel channel",
+        user: admin,
+      )
+    end
+    fab!(:message_with_private_channel) do
+      Fabricate(
+        :chat_message,
+        chat_channel: channel1,
+        user: admin,
+        message: "this is a secret #management channel",
+      )
+    end
+
+    before { management_channel.add(admin) }
+
+    it "shows a default color and css class for the channel icon in a post" do
+      topic_page.visit_topic(topic, post_number: post_with_private_category.post_number)
+      expect(page).to have_css(".hashtag-cooked")
+      expect(page).to have_css(".hashtag-cooked .hashtag-missing")
+    end
+
+    it "shows a default color and css class for the channel icon in a channel" do
+      chat_page.visit_channel(channel1)
+      expect(page).to have_css(".hashtag-cooked")
+      expect(page).to have_css(".hashtag-cooked .hashtag-missing")
+    end
   end
 end
diff --git a/plugins/chat/spec/system/jit_messages_spec.rb b/plugins/chat/spec/system/jit_messages_spec.rb
index d5e0a2e7df4..789ab570df6 100644
--- a/plugins/chat/spec/system/jit_messages_spec.rb
+++ b/plugins/chat/spec/system/jit_messages_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "JIT messages", type: :system, js: true do
+RSpec.describe "JIT messages", type: :system do
   fab!(:channel_1) { Fabricate(:chat_channel) }
   fab!(:current_user) { Fabricate(:user) }
   fab!(:other_user) { Fabricate(:user) }
@@ -14,21 +14,45 @@ RSpec.describe "JIT messages", type: :system, js: true do
     sign_in(current_user)
   end
 
-  context "when mentioning a user not on the channel" do
-    it "displays a mention warning" do
-      Jobs.run_immediately!
+  context "when mentioning a user" do
+    context "when user is not on the channel" do
+      it "displays a mention warning" do
+        Jobs.run_immediately!
 
-      chat.visit_channel(channel_1)
-      channel.send_message("hi @#{other_user.username}")
+        chat.visit_channel(channel_1)
+        channel.send_message("hi @#{other_user.username}")
 
-      expect(page).to have_content(
-        I18n.t("js.chat.mention_warning.without_membership.one", username: other_user.username),
-        wait: 5,
-      )
+        expect(page).to have_content(
+          I18n.t("js.chat.mention_warning.without_membership", username: other_user.username),
+          wait: 5,
+        )
+      end
+    end
+
+    context "when user can’t access the channel" do
+      fab!(:group_1) { Fabricate(:group) }
+      fab!(:private_channel_1) { Fabricate(:private_category_channel, group: group_1) }
+
+      before do
+        group_1.add(current_user)
+        private_channel_1.add(current_user)
+      end
+
+      it "displays a mention warning" do
+        Jobs.run_immediately!
+
+        chat.visit_channel(private_channel_1)
+        channel.send_message("hi @#{other_user.username}")
+
+        expect(page).to have_content(
+          I18n.t("js.chat.mention_warning.cannot_see", username: other_user.username),
+          wait: 5,
+        )
+      end
     end
   end
 
-  context "when mentioning a user who can’t access the channel" do
+  context "when category channel permission is readonly for everyone" do
     fab!(:group_1) { Fabricate(:group) }
     fab!(:private_channel_1) { Fabricate(:private_category_channel, group: group_1) }
 
@@ -44,7 +68,7 @@ RSpec.describe "JIT messages", type: :system, js: true do
       channel.send_message("hi @#{other_user.username}")
 
       expect(page).to have_content(
-        I18n.t("js.chat.mention_warning.cannot_see.one", username: other_user.username),
+        I18n.t("js.chat.mention_warning.cannot_see", username: other_user.username),
         wait: 5,
       )
     end
@@ -61,7 +85,7 @@ RSpec.describe "JIT messages", type: :system, js: true do
         channel.send_message("hi @#{group_1.name}")
 
         expect(page).to have_content(
-          I18n.t("js.chat.mention_warning.group_mentions_disabled.one", group_name: group_1.name),
+          I18n.t("js.chat.mention_warning.group_mentions_disabled", group_name: group_1.name),
           wait: 5,
         )
       end
diff --git a/plugins/chat/spec/system/kick_user_from_channel_spec.rb b/plugins/chat/spec/system/kick_user_from_channel_spec.rb
new file mode 100644
index 00000000000..ebf7d2bfa18
--- /dev/null
+++ b/plugins/chat/spec/system/kick_user_from_channel_spec.rb
@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+describe "Kick user from chat channel", type: :system do
+  fab!(:current_user) { Fabricate(:user) }
+  fab!(:channel_1) { Fabricate(:chat_channel) }
+  fab!(:channel_2) { Fabricate(:chat_channel) }
+
+  let(:chat) { PageObjects::Pages::Chat.new }
+  let(:channel) { PageObjects::Pages::ChatChannel.new }
+  let(:dialog) { PageObjects::Components::Dialog.new }
+  let(:sidebar_page) { PageObjects::Pages::Sidebar.new }
+
+  before do
+    SiteSetting.navigation_menu = "sidebar"
+    chat_system_bootstrap
+    sign_in(current_user)
+    channel_1.add(current_user)
+    channel_2.add(current_user)
+  end
+
+  def publish_kick
+    Chat::Publisher.publish_kick_users(channel_1.id, [current_user.id])
+  end
+
+  context "when the user is looking at the channel they are kicked from" do
+    before { chat.visit_channel(channel_1) }
+
+    it "shows an alert" do
+      publish_kick
+      expect(dialog).to have_content(I18n.t("js.chat.kicked_from_channel"))
+    end
+
+    context "when the user presses ok" do
+      it "redirects them to the first other public channel they have" do
+        publish_kick
+        dialog.click_yes
+        expect(page).to have_current_path(channel_2.url)
+      end
+
+      context "when the user has no other public channels" do
+        before do
+          channel_2.remove(current_user)
+          chat.visit_channel(channel_1)
+        end
+
+        it "redirects them to the chat browse page" do
+          publish_kick
+          dialog.click_yes
+          expect(page).to have_current_path("/chat/browse/open")
+        end
+      end
+    end
+  end
+
+  context "when the user is not looking at the channel they are kicked from" do
+    before { chat.visit_channel(channel_2) }
+
+    it "removes it from their sidebar and does not redirect" do
+      publish_kick
+      expect(sidebar_page.channels_section).not_to have_css(
+        ".sidebar-section-link.channel-#{channel_1.id}",
+      )
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/list_channels/mobile_spec.rb b/plugins/chat/spec/system/list_channels/mobile_spec.rb
index 59744187b7b..9c0efbb0e9c 100644
--- a/plugins/chat/spec/system/list_channels/mobile_spec.rb
+++ b/plugins/chat/spec/system/list_channels/mobile_spec.rb
@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
-RSpec.describe "List channels | mobile", type: :system, js: true, mobile: true do
+RSpec.describe "List channels | mobile", type: :system, mobile: true do
   fab!(:current_user) { Fabricate(:user) }
 
   let(:chat) { PageObjects::Pages::Chat.new }
+  let(:topic_page) { PageObjects::Pages::Topic.new }
 
   before do
     chat_system_bootstrap
@@ -120,8 +121,8 @@ RSpec.describe "List channels | mobile", type: :system, js: true, mobile: true d
 
   it "has a new dm channel button" do
     visit("/chat")
-    find(".open-draft-channel-page-btn").click
+    find(".open-new-message-btn").click
 
-    expect(page).to have_current_path("/chat/draft-channel")
+    expect(chat.message_creator).to be_opened
   end
 end
diff --git a/plugins/chat/spec/system/list_channels/no_sidebar_spec.rb b/plugins/chat/spec/system/list_channels/no_sidebar_spec.rb
index 9f751df0471..79b64eb18c2 100644
--- a/plugins/chat/spec/system/list_channels/no_sidebar_spec.rb
+++ b/plugins/chat/spec/system/list_channels/no_sidebar_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "List channels | no sidebar", type: :system, js: true do
+RSpec.describe "List channels | no sidebar", type: :system do
   fab!(:current_user) { Fabricate(:user) }
 
   let(:chat) { PageObjects::Pages::Chat.new }
diff --git a/plugins/chat/spec/system/list_channels/sidebar_spec.rb b/plugins/chat/spec/system/list_channels/sidebar_spec.rb
index f7c4889c569..034188861f8 100644
--- a/plugins/chat/spec/system/list_channels/sidebar_spec.rb
+++ b/plugins/chat/spec/system/list_channels/sidebar_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "List channels | sidebar", type: :system, js: true do
+RSpec.describe "List channels | sidebar", type: :system do
   fab!(:current_user) { Fabricate(:user) }
 
   let(:chat) { PageObjects::Pages::Chat.new }
@@ -22,7 +22,7 @@ RSpec.describe "List channels | sidebar", type: :system, js: true do
         end
 
         it "shows the channel in the correct section" do
-          expect(page.find(".sidebar-section-chat-channels")).to have_content(
+          expect(page.find(".sidebar-section[data-section-name='chat-channels']")).to have_content(
             category_channel_1.name,
           )
         end
@@ -42,15 +42,15 @@ RSpec.describe "List channels | sidebar", type: :system, js: true do
     end
 
     context "when multiple category channels are present" do
-      fab!(:channel_1) { Fabricate(:category_channel, name: "b channel") }
-      fab!(:channel_2) { Fabricate(:category_channel, name: "a channel") }
+      fab!(:channel_1) { Fabricate(:category_channel, name: ":art: b channel") }
+      fab!(:channel_2) { Fabricate(:category_channel, name: ":art: a channel") }
 
       before do
         channel_1.add(current_user)
         channel_2.add(current_user)
       end
 
-      it "sorts them alphabetically" do
+      it "sorts them by slug" do
         visit("/")
 
         expect(page.find("#sidebar-section-content-chat-channels li:nth-child(1)")).to have_css(
@@ -70,7 +70,9 @@ RSpec.describe "List channels | sidebar", type: :system, js: true do
         before { visit("/") }
 
         it "shows the channel in the correct section" do
-          expect(page.find(".sidebar-section-chat-dms")).to have_content(current_user.username)
+          expect(page.find(".sidebar-section[data-section-name='chat-dms']")).to have_content(
+            current_user.username,
+          )
         end
       end
 
@@ -87,7 +89,7 @@ RSpec.describe "List channels | sidebar", type: :system, js: true do
   context "when no category channels" do
     it "doesn’t show the section" do
       visit("/")
-      expect(page).to have_no_css(".sidebar-section-chat-channels")
+      expect(page).to have_no_css(".sidebar-section[data-section-name='chat-channels']")
     end
 
     context "when user can create channels" do
@@ -95,7 +97,7 @@ RSpec.describe "List channels | sidebar", type: :system, js: true do
 
       it "shows the section" do
         visit("/")
-        expect(page).to have_css(".sidebar-section-chat-channels")
+        expect(page).to have_css(".sidebar-section[data-section-name='chat-channels']")
       end
     end
   end
@@ -104,7 +106,7 @@ RSpec.describe "List channels | sidebar", type: :system, js: true do
     before { visit("/") }
 
     it "shows the section" do
-      expect(page).to have_css(".sidebar-section-chat-dms")
+      expect(page).to have_css(".sidebar-section[data-section-name='chat-dms']")
     end
   end
 
@@ -115,8 +117,8 @@ RSpec.describe "List channels | sidebar", type: :system, js: true do
     end
 
     it "doesn’t show the sections" do
-      expect(page).to have_no_css(".sidebar-section-chat-channels")
-      expect(page).to have_no_css(".sidebar-section-chat-dms")
+      expect(page).to have_no_css(".sidebar-section[data-section-name='chat-channels']")
+      expect(page).to have_no_css(".sidebar-section[data-section-name='chat-dms']")
     end
   end
 
@@ -128,8 +130,8 @@ RSpec.describe "List channels | sidebar", type: :system, js: true do
     end
 
     it "doesn’t show the sections" do
-      expect(page).to have_no_css(".sidebar-section-chat-channels")
-      expect(page).to have_no_css(".sidebar-section-chat-dms")
+      expect(page).to have_no_css(".sidebar-section[data-section-name='chat-channels']")
+      expect(page).to have_no_css(".sidebar-section[data-section-name='chat-dms']")
     end
   end
 
diff --git a/plugins/chat/spec/system/mention_warnings_spec.rb b/plugins/chat/spec/system/mention_warnings_spec.rb
new file mode 100644
index 00000000000..530c68c2909
--- /dev/null
+++ b/plugins/chat/spec/system/mention_warnings_spec.rb
@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+RSpec.describe "Mentions warnings", type: :system do
+  fab!(:current_user) { Fabricate(:user) }
+  fab!(:channel_1) { Fabricate(:chat_channel) }
+
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:chat_channel_page) { PageObjects::Pages::ChatChannel.new }
+
+  before do
+    chat_system_bootstrap(current_user, [channel_1])
+    sign_in(current_user)
+  end
+
+  describe "composing a message with mentions" do
+    context "when mentioning a group" do
+      context "when the group doesn’t allow mentions" do
+        fab!(:admin_mentionable_group) do
+          Fabricate(:group, mentionable_level: Group::ALIAS_LEVELS[:only_admins])
+        end
+
+        it "displays a warning" do
+          chat_page.visit_channel(channel_1)
+          chat_channel_page.type_in_composer("@#{admin_mentionable_group.name} ")
+
+          expect(page).to have_css(".chat-mention-warnings")
+          expect(page.find(".chat-mention-warnings-list__simple")).to have_content(
+            admin_mentionable_group.name,
+          )
+        end
+      end
+
+      context "when the group allow mentions" do
+        fab!(:publicly_mentionable_group) do
+          Fabricate(:group, mentionable_level: Group::ALIAS_LEVELS[:everyone])
+        end
+        fab!(:user_2) { Fabricate(:user) }
+
+        context "when the group has too many members" do
+          before do
+            SiteSetting.max_users_notified_per_group_mention = 1
+            publicly_mentionable_group.add(user_2)
+            publicly_mentionable_group.add(Fabricate(:user))
+          end
+
+          it "displays a warning" do
+            chat_page.visit_channel(channel_1)
+            chat_channel_page.type_in_composer("@#{publicly_mentionable_group.name} ")
+
+            expect(page).to have_css(".chat-mention-warnings")
+            expect(page.find(".chat-mention-warnings-list__simple")).to have_content(
+              publicly_mentionable_group.name,
+            )
+          end
+        end
+
+        context "when typing too many mentions" do
+          before { SiteSetting.max_mentions_per_chat_message = 1 }
+
+          it "displays a warning" do
+            chat_page.visit_channel(channel_1)
+            chat_channel_page.type_in_composer(
+              "@#{user_2.username} @#{publicly_mentionable_group.name} ",
+            )
+
+            expect(page).to have_css(".chat-mention-warnings")
+            expect(page.find(".chat-mention-warnings-list__simple")).to be_present
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/message_errors_spec.rb b/plugins/chat/spec/system/message_errors_spec.rb
new file mode 100644
index 00000000000..98b15865011
--- /dev/null
+++ b/plugins/chat/spec/system/message_errors_spec.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+RSpec.describe "Message errors", type: :system do
+  fab!(:current_user) { Fabricate(:admin) }
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:channel_page) { PageObjects::Pages::ChatChannel.new }
+  let(:max_length) { SiteSetting.chat_maximum_message_length }
+
+  before { chat_system_bootstrap }
+
+  context "when message is too long" do
+    fab!(:channel) { Fabricate(:chat_channel) }
+
+    it "only shows the error, not the message" do
+      channel.add(current_user)
+      sign_in(current_user)
+      chat_page.visit_channel(channel)
+
+      channel_page.send_message("atoolongmessage" + "a" * max_length)
+
+      expect(page).to have_no_content("atoolongmessage")
+      expect(page).to have_content(I18n.t("chat.errors.message_too_long", count: max_length))
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/message_notifications_mobile_spec.rb b/plugins/chat/spec/system/message_notifications_mobile_spec.rb
index b56a6d25be6..cc7f60b4f29 100644
--- a/plugins/chat/spec/system/message_notifications_mobile_spec.rb
+++ b/plugins/chat/spec/system/message_notifications_mobile_spec.rb
@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
-RSpec.describe "Message notifications - mobile", type: :system, js: true, mobile: true do
+RSpec.describe "Message notifications - mobile", type: :system, mobile: true do
   fab!(:current_user) { Fabricate(:user) }
 
   let!(:chat_page) { PageObjects::Pages::Chat.new }
   let!(:chat_channel_page) { PageObjects::Pages::ChatChannel.new }
+  let!(:channel_index_page) { PageObjects::Components::Chat::ChannelIndex.new }
 
   before do
     SiteSetting.navigation_menu = "sidebar"
@@ -35,12 +36,13 @@ RSpec.describe "Message notifications - mobile", type: :system, js: true, mobile
               Jobs.run_immediately!
 
               visit("/chat")
-              using_session(:user_1) { create_message(channel: channel_1, creator: user_1) }
+              using_session(:user_1) do |session|
+                create_message(channel: channel_1, creator: user_1)
+                session.quit
+              end
 
               expect(page).to have_no_css(".chat-header-icon .chat-channel-unread-indicator")
-              expect(page).to have_no_css(
-                ".chat-channel-row[data-chat-channel-id=\"#{channel_1.id}\"]",
-              )
+              expect(page).to have_no_css(channel_index_page.channel_row_selector(channel_1))
             end
           end
         end
@@ -62,7 +64,10 @@ RSpec.describe "Message notifications - mobile", type: :system, js: true, mobile
               Jobs.run_immediately!
 
               visit("/chat")
-              using_session(:user_1) { create_message(channel: channel_1, creator: user_1) }
+              using_session(:user_1) do |session|
+                create_message(channel: channel_1, creator: user_1)
+                session.quit
+              end
 
               expect(page).to have_css(".do-not-disturb-background")
               expect(page).to have_no_css(".chat-header-icon .chat-channel-unread-indicator")
@@ -77,12 +82,13 @@ RSpec.describe "Message notifications - mobile", type: :system, js: true, mobile
                 Jobs.run_immediately!
 
                 visit("/chat")
-                using_session(:user_1) { create_message(channel: channel_1, creator: user_1) }
+                using_session(:user_1) do |session|
+                  create_message(channel: channel_1, creator: user_1)
+                  session.quit
+                end
 
                 expect(page).to have_no_css(".chat-header-icon .chat-channel-unread-indicator")
-                expect(page).to have_no_css(
-                  ".chat-channel-row[data-chat-channel-id=\"#{channel_1.id}\"] .chat-channel-unread-indicator",
-                )
+                expect(channel_index_page).to have_no_unread_channel(channel_1)
               end
             end
           end
@@ -92,13 +98,13 @@ RSpec.describe "Message notifications - mobile", type: :system, js: true, mobile
               Jobs.run_immediately!
 
               visit("/chat")
-              using_session(:user_1) { create_message(channel: channel_1, creator: user_1) }
+              using_session(:user_1) do |session|
+                create_message(channel: channel_1, creator: user_1)
+                session.quit
+              end
 
               expect(page).to have_css(".chat-header-icon .chat-channel-unread-indicator", text: "")
-              expect(page).to have_css(
-                ".chat-channel-row[data-chat-channel-id=\"#{channel_1.id}\"] .chat-channel-unread-indicator",
-                text: 1,
-              )
+              expect(channel_index_page).to have_unread_channel(channel_1)
             end
           end
 
@@ -116,10 +122,7 @@ RSpec.describe "Message notifications - mobile", type: :system, js: true, mobile
               end
 
               expect(page).to have_css(".chat-header-icon .chat-channel-unread-indicator")
-              expect(page).to have_css(
-                ".chat-channel-row[data-chat-channel-id=\"#{channel_1.id}\"] .chat-channel-unread-indicator",
-                text: 1,
-              )
+              expect(channel_index_page).to have_unread_channel(channel_1, count: 1)
             end
           end
         end
@@ -138,16 +141,28 @@ RSpec.describe "Message notifications - mobile", type: :system, js: true, mobile
             Jobs.run_immediately!
 
             visit("/chat")
-            using_session(:user_1) { create_message(channel: dm_channel_1, creator: user_1) }
+            using_session(:user_1) do |session|
+              create_message(channel: dm_channel_1, creator: user_1)
+              session.quit
+            end
 
-            expect(page).to have_css(".chat-header-icon .chat-channel-unread-indicator", text: "1")
             expect(page).to have_css(
-              ".chat-channel-row[data-chat-channel-id=\"#{dm_channel_1.id}\"] .chat-channel-unread-indicator",
+              ".chat-header-icon .chat-channel-unread-indicator",
+              text: "1",
+              wait: 25,
             )
+            expect(channel_index_page).to have_unread_channel(dm_channel_1, wait: 25)
 
-            using_session(:user_1) { create_message(channel: dm_channel_1, creator: user_1) }
+            using_session(:user_1) do |session|
+              create_message(channel: dm_channel_1, creator: user_1)
+              session.quit
+            end
 
-            expect(page).to have_css(".chat-header-icon .chat-channel-unread-indicator", text: "2")
+            expect(page).to have_css(
+              ".chat-header-icon .chat-channel-unread-indicator",
+              text: "2",
+              wait: 25,
+            )
           end
 
           it "reorders channels" do
@@ -162,7 +177,10 @@ RSpec.describe "Message notifications - mobile", type: :system, js: true, mobile
               ".chat-channel-row:nth-child(2)[data-chat-channel-id=\"#{dm_channel_2.id}\"]",
             )
 
-            using_session(:user_1) { create_message(channel: dm_channel_2, creator: user_2) }
+            using_session(:user_1) do |session|
+              create_message(channel: dm_channel_2, creator: user_2)
+              session.quit
+            end
 
             expect(page).to have_css(
               ".chat-channel-row:nth-child(1)[data-chat-channel-id=\"#{dm_channel_2.id}\"]",
@@ -190,18 +208,20 @@ RSpec.describe "Message notifications - mobile", type: :system, js: true, mobile
             Jobs.run_immediately!
 
             visit("/chat")
-            using_session(:user_1) { create_message(channel: channel_1, creator: user_1) }
+            using_session(:user_1) do |session|
+              create_message(channel: channel_1, creator: user_1)
+              session.quit
+            end
 
             expect(page).to have_css(".chat-header-icon .chat-channel-unread-indicator", text: "")
-            expect(page).to have_css(
-              ".chat-channel-row[data-chat-channel-id=\"#{channel_1.id}\"] .chat-channel-unread-indicator",
-            )
+            expect(channel_index_page).to have_unread_channel(channel_1)
 
-            using_session(:user_1) { create_message(channel: dm_channel_1, creator: user_1) }
+            using_session(:user_1) do |session|
+              create_message(channel: dm_channel_1, creator: user_1)
+              session.quit
+            end
 
-            expect(page).to have_css(
-              ".chat-channel-row[data-chat-channel-id=\"#{dm_channel_1.id}\"] .chat-channel-unread-indicator",
-            )
+            expect(channel_index_page).to have_unread_channel(dm_channel_1)
             expect(page).to have_css(".chat-header-icon .chat-channel-unread-indicator", text: "1")
           end
         end
diff --git a/plugins/chat/spec/system/message_notifications_with_sidebar_spec.rb b/plugins/chat/spec/system/message_notifications_with_sidebar_spec.rb
index b12d23da0f2..656d16ab3f2 100644
--- a/plugins/chat/spec/system/message_notifications_with_sidebar_spec.rb
+++ b/plugins/chat/spec/system/message_notifications_with_sidebar_spec.rb
@@ -1,21 +1,23 @@
 # frozen_string_literal: true
 
-RSpec.describe "Message notifications - with sidebar", type: :system, js: true do
+RSpec.describe "Message notifications - with sidebar", type: :system do
   fab!(:current_user) { Fabricate(:user) }
 
   let!(:chat_page) { PageObjects::Pages::Chat.new }
-  let!(:chat_channel_page) { PageObjects::Pages::ChatChannel.new }
+  let!(:channel_page) { PageObjects::Pages::ChatChannel.new }
 
   before do
     SiteSetting.navigation_menu = "sidebar"
     chat_system_bootstrap
   end
 
-  def create_message(text: "this is fine", channel:, creator: Fabricate(:user))
+  def create_message(text: nil, channel:, creator: Fabricate(:user))
     sign_in(creator)
     chat_page.visit_channel(channel)
-    chat_channel_page.send_message(text)
-    expect(chat_channel_page).to have_message(text: text)
+    channel_page.send_message(text)
+    args = { persisted: true }
+    args[:text] = text if text
+    expect(channel_page.messages).to have_message(**args)
   end
 
   context "as a user" do
@@ -33,7 +35,11 @@ RSpec.describe "Message notifications - with sidebar", type: :system, js: true d
           context "when a message is created" do
             it "doesn't show anything" do
               visit("/")
-              using_session(:user_1) { create_message(channel: channel_1, creator: user_1) }
+
+              using_session(:user_1) do |session|
+                create_message(channel: channel_1, creator: user_1)
+                session.quit
+              end
 
               expect(page).to have_no_css(".chat-header-icon .chat-channel-unread-indicator")
               expect(page).to have_no_css(".sidebar-row.channel-#{channel_1.id}")
@@ -58,7 +64,10 @@ RSpec.describe "Message notifications - with sidebar", type: :system, js: true d
               Jobs.run_immediately!
 
               visit("/")
-              using_session(:user_1) { create_message(channel: channel_1, creator: user_1) }
+              using_session(:user_1) do |session|
+                create_message(channel: channel_1, creator: user_1)
+                session.quit
+              end
 
               expect(page).to have_css(".do-not-disturb-background")
               expect(page).to have_no_css(".chat-header-icon .chat-channel-unread-indicator")
@@ -71,7 +80,10 @@ RSpec.describe "Message notifications - with sidebar", type: :system, js: true d
             context "when a message is created" do
               it "doesn't show anything" do
                 visit("/")
-                using_session(:user_1) { create_message(channel: channel_1, creator: user_1) }
+                using_session(:user_1) do |session|
+                  create_message(channel: channel_1, creator: user_1)
+                  session.quit
+                end
 
                 expect(page).to have_no_css(".chat-header-icon .chat-channel-unread-indicator")
                 expect(page).to have_no_css(".sidebar-row.channel-#{channel_1.id} .unread")
@@ -79,10 +91,73 @@ RSpec.describe "Message notifications - with sidebar", type: :system, js: true d
             end
           end
 
+          context "when user chat_header_indicator_preference is set to 'never'" do
+            before do
+              current_user.user_option.update!(
+                chat_header_indicator_preference:
+                  UserOption.chat_header_indicator_preferences[:never],
+              )
+            end
+
+            context "when a message is created" do
+              it "doesn't show any indicator on chat-header-icon" do
+                visit("/")
+                using_session(:user_1) do |session|
+                  create_message(channel: channel_1, creator: user_1)
+                  session.quit
+                end
+
+                expect(page).to have_no_css(".chat-header-icon .chat-channel-unread-indicator")
+              end
+            end
+          end
+
+          context "when user chat_header_indicator_preference is set to 'dm_and_mentions'" do
+            before do
+              current_user.user_option.update!(
+                chat_header_indicator_preference:
+                  UserOption.chat_header_indicator_preferences[:dm_and_mentions],
+              )
+            end
+
+            context "when a message is created" do
+              it "doesn't show any indicator on chat-header-icon" do
+                visit("/")
+                using_session(:user_1) do |session|
+                  create_message(channel: channel_1, creator: user_1)
+                  session.quit
+                end
+
+                expect(page).to have_no_css(
+                  ".chat-header-icon .chat-channel-unread-indicator.-urgent",
+                )
+              end
+            end
+
+            context "when a message with a mention is created" do
+              it "does show an indicator on chat-header-icon" do
+                Jobs.run_immediately!
+
+                visit("/")
+                using_session(:user_1) do
+                  create_message(
+                    text: "hey what's going on @#{current_user.username}?",
+                    channel: channel_1,
+                    creator: user_1,
+                  )
+                end
+                expect(page).to have_css(".chat-header-icon .chat-channel-unread-indicator.-urgent")
+              end
+            end
+          end
+
           context "when a message is created" do
             it "correctly renders notifications" do
               visit("/")
-              using_session(:user_1) { create_message(channel: channel_1, creator: user_1) }
+              using_session(:user_1) do |session|
+                create_message(channel: channel_1, creator: user_1)
+                session.quit
+              end
 
               expect(page).to have_css(".chat-header-icon .chat-channel-unread-indicator", text: "")
               expect(page).to have_css(".sidebar-row.channel-#{channel_1.id} .unread")
@@ -103,7 +178,7 @@ RSpec.describe "Message notifications - with sidebar", type: :system, js: true d
               end
 
               expect(page).to have_css(
-                ".chat-header-icon .chat-channel-unread-indicator.urgent",
+                ".chat-header-icon .chat-channel-unread-indicator.-urgent",
                 text: "1",
               )
               expect(page).to have_css(".sidebar-row.channel-#{channel_1.id} .icon.urgent")
@@ -123,12 +198,18 @@ RSpec.describe "Message notifications - with sidebar", type: :system, js: true d
         context "when a message is created" do
           it "correctly renders notifications" do
             visit("/")
-            using_session(:user_1) { create_message(channel: dm_channel_1, creator: user_1) }
+            using_session(:user_1) do |session|
+              create_message(channel: dm_channel_1, creator: user_1)
+              session.quit
+            end
 
             expect(page).to have_css(".chat-header-icon .chat-channel-unread-indicator", text: "1")
             expect(page).to have_css(".sidebar-row.channel-#{dm_channel_1.id} .icon.urgent")
 
-            using_session(:user_1) { create_message(channel: dm_channel_1, creator: user_1) }
+            using_session(:user_1) do |session|
+              create_message(channel: dm_channel_1, creator: user_1)
+              session.quit
+            end
 
             expect(page).to have_css(".chat-header-icon .chat-channel-unread-indicator", text: "2")
           end
@@ -143,7 +224,10 @@ RSpec.describe "Message notifications - with sidebar", type: :system, js: true d
               "#sidebar-section-content-chat-dms .sidebar-section-link-wrapper:nth-child(2) .channel-#{dm_channel_2.id}",
             )
 
-            using_session(:user_1) { create_message(channel: dm_channel_2, creator: user_2) }
+            using_session(:user_1) do |session|
+              create_message(channel: dm_channel_2, creator: user_2)
+              session.quit
+            end
 
             expect(page).to have_css(
               "#sidebar-section-content-chat-dms .sidebar-section-link-wrapper:nth-child(1) .channel-#{dm_channel_2.id}",
@@ -154,33 +238,6 @@ RSpec.describe "Message notifications - with sidebar", type: :system, js: true d
           end
         end
       end
-
-      context "with dm and public channel" do
-        fab!(:current_user) { Fabricate(:admin) }
-        fab!(:user_1) { Fabricate(:user) }
-        fab!(:channel_1) { Fabricate(:category_channel) }
-        fab!(:dm_channel_1) { Fabricate(:direct_message_channel, users: [current_user, user_1]) }
-
-        before do
-          channel_1.add(user_1)
-          channel_1.add(current_user)
-        end
-
-        context "when messages are created" do
-          it "correctly renders notifications" do
-            visit("/")
-            using_session(:user_1) { create_message(channel: channel_1, creator: user_1) }
-
-            expect(page).to have_css(".chat-header-icon .chat-channel-unread-indicator", text: "")
-            expect(page).to have_css(".sidebar-row.channel-#{channel_1.id} .unread")
-
-            using_session(:user_1) { create_message(channel: dm_channel_1, creator: user_1) }
-
-            expect(page).to have_css(".sidebar-row.channel-#{dm_channel_1.id} .icon.urgent")
-            expect(page).to have_css(".chat-header-icon .chat-channel-unread-indicator", text: "1")
-          end
-        end
-      end
     end
   end
 end
diff --git a/plugins/chat/spec/system/message_thread_indicator_spec.rb b/plugins/chat/spec/system/message_thread_indicator_spec.rb
new file mode 100644
index 00000000000..ab3af576cb3
--- /dev/null
+++ b/plugins/chat/spec/system/message_thread_indicator_spec.rb
@@ -0,0 +1,173 @@
+# frozen_string_literal: true
+
+describe "Thread indicator for chat messages", type: :system do
+  fab!(:current_user) { Fabricate(:user) }
+  fab!(:other_user) { Fabricate(:user) }
+
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:channel_page) { PageObjects::Pages::ChatChannel.new }
+  let(:side_panel) { PageObjects::Pages::ChatSidePanel.new }
+  let(:open_thread) { PageObjects::Pages::ChatThread.new }
+  let(:chat_drawer_page) { PageObjects::Pages::ChatDrawer.new }
+
+  before do
+    chat_system_bootstrap(current_user, [channel])
+    sign_in(current_user)
+  end
+
+  context "when threading_enabled is false for the channel" do
+    fab!(:channel) { Fabricate(:chat_channel) }
+    before { channel.update!(threading_enabled: false) }
+
+    it "shows no thread inidcators in the channel" do
+      thread = chat_thread_chain_bootstrap(channel: channel, users: [current_user, other_user])
+      chat_page.visit_channel(channel)
+      expect(channel_page).to have_no_thread_indicator(thread.original_message)
+    end
+  end
+
+  context "when threading is enabled for the channel" do
+    fab!(:channel) { Fabricate(:chat_channel) }
+    fab!(:thread_1) do
+      chat_thread_chain_bootstrap(channel: channel, users: [current_user, other_user])
+    end
+    fab!(:thread_2) do
+      chat_thread_chain_bootstrap(
+        channel: channel,
+        users: [current_user, other_user],
+        messages_count: 2,
+      )
+    end
+
+    before { channel.update!(threading_enabled: true) }
+
+    it "throws thread indicators on all original messages" do
+      chat_page.visit_channel(channel)
+      expect(channel_page).to have_thread_indicator(thread_1.original_message)
+      expect(channel_page).to have_thread_indicator(thread_2.original_message)
+    end
+
+    it "shows the correct reply counts" do
+      chat_page.visit_channel(channel)
+      expect(channel_page.message_thread_indicator(thread_1.original_message)).to have_reply_count(
+        3,
+      )
+      expect(channel_page.message_thread_indicator(thread_2.original_message)).to have_reply_count(
+        1,
+      )
+    end
+
+    it "it shows the reply count but no participant avatars when there is only one participant" do
+      single_user_thread =
+        Fabricate(:chat_thread, channel: channel, original_message_user: current_user)
+      Fabricate(:chat_message, thread: single_user_thread, user: current_user)
+      Fabricate(:chat_message, thread: single_user_thread, user: current_user)
+      chat_page.visit_channel(channel)
+      expect(
+        channel_page.message_thread_indicator(single_user_thread.original_message),
+      ).to have_reply_count(2)
+      expect(
+        channel_page.message_thread_indicator(single_user_thread.original_message),
+      ).to have_no_participants
+    end
+
+    it "clicking a thread indicator opens the thread panel" do
+      chat_page.visit_channel(channel)
+      channel_page.message_thread_indicator(thread_1.original_message).click
+      expect(side_panel).to have_open_thread(thread_1)
+    end
+
+    it "shows the thread indicator and hides the sent message when a user first replies to a message without a thread" do
+      message_without_thread = Fabricate(:chat_message, chat_channel: channel, user: other_user)
+      chat_page.visit_channel(channel)
+      channel_page.reply_to(message_without_thread)
+      open_thread.fill_composer("this is a reply to make a new thread")
+      open_thread.click_send_message
+
+      expect(channel_page).to have_thread_indicator(message_without_thread)
+
+      new_thread = nil
+      try_until_success(timeout: 5) do
+        new_thread = message_without_thread.reload.thread
+        expect(new_thread).to be_present
+      end
+
+      expect(page).not_to have_css(channel_page.message_by_id_selector(new_thread.replies.first))
+    end
+
+    it "increments the indicator when a new reply is sent in the thread" do
+      chat_page.visit_channel(channel)
+
+      expect(channel_page.message_thread_indicator(thread_1.original_message)).to have_reply_count(
+        3,
+      )
+
+      channel_page.message_thread_indicator(thread_1.original_message).click
+
+      expect(side_panel).to have_open_thread(thread_1)
+
+      open_thread.send_message
+
+      expect(channel_page.message_thread_indicator(thread_1.original_message)).to have_reply_count(
+        4,
+      )
+    end
+
+    it "shows avatars for the participants of the thread" do
+      chat_page.visit_channel(channel)
+      expect(channel_page.message_thread_indicator(thread_1.original_message)).to have_participant(
+        current_user,
+      )
+      expect(channel_page.message_thread_indicator(thread_1.original_message)).to have_participant(
+        other_user,
+      )
+    end
+
+    it "shows an excerpt of the last reply in the thread" do
+      thread_1.last_message.update!(message: "test for excerpt")
+      thread_1.last_message.rebake!
+
+      chat_page.visit_channel(channel)
+      expect(
+        channel_page.message_thread_indicator(thread_1.original_message).excerpt,
+      ).to have_content(thread_excerpt(thread_1.last_message))
+    end
+
+    it "updates the last reply excerpt and participants when a new message is added to the thread" do
+      new_user = Fabricate(:user)
+      chat_system_user_bootstrap(user: new_user, channel: channel)
+      original_last_reply = thread_1.last_message
+      original_last_reply.update!(message: "test for excerpt")
+      original_last_reply.rebake!
+
+      chat_page.visit_channel(channel)
+
+      excerpt_text = thread_excerpt(original_last_reply)
+
+      expect(channel_page.message_thread_indicator(thread_1.original_message)).to have_content(
+        excerpt_text,
+      )
+
+      using_session(:new_user) do |session|
+        sign_in(new_user)
+        chat_page.visit_channel(channel)
+        channel_page.message_thread_indicator(thread_1.original_message).click
+
+        expect(side_panel).to have_open_thread(thread_1)
+
+        open_thread.send_message("wow i am happy to join this thread!")
+      end
+
+      expect(channel_page.message_thread_indicator(thread_1.original_message)).to have_participant(
+        new_user,
+      )
+
+      new_user_reply = thread_1.replies.where(user: new_user).first
+      excerpt_text = thread_excerpt(new_user_reply)
+
+      expect(
+        channel_page.message_thread_indicator(thread_1.original_message).excerpt,
+      ).to have_content(excerpt_text)
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/message_user_info.rb b/plugins/chat/spec/system/message_user_info.rb
new file mode 100644
index 00000000000..8980f994387
--- /dev/null
+++ b/plugins/chat/spec/system/message_user_info.rb
@@ -0,0 +1,106 @@
+# frozen_string_literal: true
+
+RSpec.describe "Message user info", type: :system do
+  fab!(:current_user) { Fabricate(:user) }
+  fab!(:channel_1) { Fabricate(:category_channel) }
+
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+
+  before do
+    chat_system_bootstrap
+    channel_1.add(current_user)
+    sign_in(current_user)
+  end
+
+  context "with one message" do
+    fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1) }
+
+    it "shows user info on the message" do
+      chat_page.visit_channel(channel_1)
+
+      expect(page.find("[data-id='#{message_1.id}']")).to have_css(".chat-message-avatar")
+    end
+  end
+
+  context "with two messages from the same user" do
+    fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1, user: current_user) }
+    fab!(:message_2) { Fabricate(:chat_message, chat_channel: channel_1, user: current_user) }
+
+    it "shows user info only on first message" do
+      chat_page.visit_channel(channel_1)
+
+      expect(page.find("[data-id='#{message_1.id}']")).to have_css(".chat-message-avatar")
+      expect(page.find("[data-id='#{message_2.id}']")).to have_no_css(".chat-message-avatar")
+    end
+  end
+
+  context "with a deleted previous message" do
+    fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1, user: current_user) }
+    fab!(:message_2) { Fabricate(:chat_message, chat_channel: channel_1, user: current_user) }
+
+    it "shows user info only on second message" do
+      message_1.trash!
+      chat_page.visit_channel(channel_1)
+
+      expect(page.find("[data-id='#{message_2.id}']")).to have_css(".chat-message-avatar")
+    end
+  end
+
+  context "with messages from a webhook" do
+    fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1) }
+    fab!(:message_2) { Fabricate(:chat_message, chat_channel: channel_1) }
+
+    it "shows user info only on boths messages" do
+      Fabricate(:chat_webhook_event, chat_message: message_1)
+      Fabricate(:chat_webhook_event, chat_message: message_2)
+      chat_page.visit_channel(channel_1)
+
+      expect(page.find("[data-id='#{message_1.id}']")).to have_css(".chat-message-avatar")
+      expect(page.find("[data-id='#{message_2.id}']")).to have_css(".chat-message-avatar")
+    end
+  end
+
+  context "with large time difference between messages" do
+    fab!(:message_1) do
+      Fabricate(:chat_message, chat_channel: channel_1, user: current_user, created_at: 1.days.ago)
+    end
+    fab!(:message_2) { Fabricate(:chat_message, chat_channel: channel_1, user: current_user) }
+
+    it "shows user info on both messages" do
+      chat_page.visit_channel(channel_1)
+
+      expect(page.find("[data-id='#{message_1.id}']")).to have_css(".chat-message-avatar")
+      expect(page.find("[data-id='#{message_2.id}']")).to have_css(".chat-message-avatar")
+    end
+  end
+
+  context "when replying to own previous message" do
+    fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1, user: current_user) }
+    fab!(:message_2) do
+      Fabricate(:chat_message, in_reply_to: message_1, user: current_user, chat_channel: channel_1)
+    end
+
+    it "shows user info on first message only" do
+      chat_page.visit_channel(channel_1)
+
+      expect(page.find("[data-id='#{message_1.id}']")).to have_css(".chat-message-avatar")
+      expect(page.find("[data-id='#{message_2.id}']")).to have_no_css(".chat-message-avatar")
+    end
+  end
+
+  context "when replying to another user previous message and previous message is yours" do
+    fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1) }
+    fab!(:message_2) { Fabricate(:chat_message, chat_channel: channel_1, user: current_user) }
+    fab!(:message_3) do
+      Fabricate(:chat_message, in_reply_to: message_1, user: current_user, chat_channel: channel_1)
+    end
+
+    it "shows user info on each message" do
+      chat_page.visit_channel(channel_1)
+
+      expect(page.find("[data-id='#{message_1.id}']")).to have_css(".chat-message-avatar")
+      expect(page.find("[data-id='#{message_2.id}']")).to have_css(".chat-message-avatar")
+      expect(page.find("[data-id='#{message_3.id}']")).to have_css(".chat-message-avatar")
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/move_message_to_channel_spec.rb b/plugins/chat/spec/system/move_message_to_channel_spec.rb
index e605ce2b87b..c98121a6da4 100644
--- a/plugins/chat/spec/system/move_message_to_channel_spec.rb
+++ b/plugins/chat/spec/system/move_message_to_channel_spec.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-RSpec.describe "Move message to channel", type: :system, js: true do
-  let(:chat) { PageObjects::Pages::Chat.new }
-  let(:channel) { PageObjects::Pages::ChatChannel.new }
+RSpec.describe "Move message to channel", type: :system do
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:channel_page) { PageObjects::Pages::ChatChannel.new }
 
   before { chat_system_bootstrap }
 
@@ -17,10 +17,10 @@ RSpec.describe "Move message to channel", type: :system, js: true do
     end
 
     it "is not available" do
-      chat.visit_channel(channel_1)
-      channel.select_message(message_1)
+      chat_page.visit_channel(channel_1)
+      channel_page.messages.select(message_1)
 
-      expect(page).to have_no_content(I18n.t("js.chat.selection.move_selection_to_channel"))
+      expect(channel_page.selection_management).to have_no_move_action
     end
 
     context "when can moderate channel" do
@@ -36,10 +36,10 @@ RSpec.describe "Move message to channel", type: :system, js: true do
       end
 
       it "is available" do
-        chat.visit_channel(channel_1)
-        channel.select_message(message_1)
+        chat_page.visit_channel(channel_1)
+        channel_page.messages.select(message_1)
 
-        expect(page).to have_content(I18n.t("js.chat.selection.move_selection_to_channel"))
+        expect(channel_page.selection_management).to have_move_action
       end
     end
   end
@@ -56,10 +56,10 @@ RSpec.describe "Move message to channel", type: :system, js: true do
       end
 
       it "is not available" do
-        chat.visit_channel(dm_channel_1)
-        channel.select_message(message_1)
+        chat_page.visit_channel(dm_channel_1)
+        channel_page.messages.select(message_1)
 
-        expect(page).to have_no_content(I18n.t("js.chat.selection.move_selection_to_channel"))
+        expect(channel_page.selection_management).to have_no_move_action
       end
     end
 
@@ -76,19 +76,19 @@ RSpec.describe "Move message to channel", type: :system, js: true do
       end
 
       it "moves the message" do
-        chat.visit_channel(channel_1)
-        channel.select_message(message_1)
-        click_button(I18n.t("js.chat.selection.move_selection_to_channel"))
-        find(".chat-move-message-channel-chooser").click
+        chat_page.visit_channel(channel_1)
+        channel_page.messages.select(message_1)
+        channel_page.selection_management.move
+        find(".chat-modal-move-message-to-channel__channel-chooser").click
         find("[data-value='#{channel_2.id}']").click
         click_button(I18n.t("js.chat.move_to_channel.confirm_move"))
 
-        expect(page).to have_content(message_1.message)
+        expect(page).to have_current_path(chat.channel_path(channel_2.slug, channel_2.id))
+        expect(channel_page.messages).to have_message(text: message_1.message)
 
-        chat.visit_channel(channel_1)
+        chat_page.visit_channel(channel_1)
 
-        expect(page).to have_no_content(message_1.message)
-        expect(page).to have_content(I18n.t("js.chat.deleted"))
+        expect(channel_page.messages).to have_deleted_message(message_1)
       end
     end
   end
diff --git a/plugins/chat/spec/system/navigating_to_message_spec.rb b/plugins/chat/spec/system/navigating_to_message_spec.rb
deleted file mode 100644
index 7dc60d697e2..00000000000
--- a/plugins/chat/spec/system/navigating_to_message_spec.rb
+++ /dev/null
@@ -1,164 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "Navigating to message", type: :system, js: true do
-  fab!(:current_user) { Fabricate(:user) }
-  fab!(:channel_1) { Fabricate(:category_channel) }
-  fab!(:first_message) { Fabricate(:chat_message, chat_channel: channel_1) }
-
-  let(:chat_page) { PageObjects::Pages::Chat.new }
-  let(:chat_drawer_page) { PageObjects::Pages::ChatDrawer.new }
-  let(:link) { "My favorite message" }
-
-  before do
-    chat_system_bootstrap
-    channel_1.add(current_user)
-    75.times { Fabricate(:chat_message, chat_channel: channel_1) }
-    sign_in(current_user)
-  end
-
-  context "when in full page mode" do
-    before { chat_page.prefers_full_page }
-
-    context "when clicking a link containing a message id" do
-      fab!(:topic_1) { Fabricate(:topic) }
-
-      before do
-        Fabricate(
-          :post,
-          topic: topic_1,
-          raw:
-            "<a href=\"/chat/channel/#{channel_1.id}/-?messageId=#{first_message.id}\">#{link}</a>",
-        )
-      end
-
-      it "highlights the correct message" do
-        visit("/t/-/#{topic_1.id}")
-        click_link(link)
-
-        expect(page).to have_css(
-          ".chat-message-container.highlighted[data-id='#{first_message.id}']",
-        )
-      end
-    end
-
-    context "when clicking a link to a message from the current channel" do
-      before do
-        Fabricate(
-          :chat_message,
-          chat_channel: channel_1,
-          message: "[#{link}](/chat/channel/#{channel_1.id}/-?messageId=#{first_message.id})",
-        )
-      end
-
-      it "highglights the correct message" do
-        chat_page.visit_channel(channel_1)
-        click_link(link)
-
-        expect(page).to have_css(
-          ".chat-message-container.highlighted[data-id='#{first_message.id}']",
-        )
-      end
-
-      it "highlights the correct message after using the bottom arrow" do
-        chat_page.visit_channel(channel_1)
-        click_link(link)
-        click_link(I18n.t("js.chat.scroll_to_bottom"))
-        click_link(link)
-
-        expect(page).to have_css(
-          ".chat-message-container.highlighted[data-id='#{first_message.id}']",
-        )
-      end
-    end
-
-    context "when clicking a link to a message from another channel" do
-      fab!(:channel_2) { Fabricate(:category_channel) }
-
-      before do
-        Fabricate(
-          :chat_message,
-          chat_channel: channel_2,
-          message: "[#{link}](/chat/channel/#{channel_1.id}/-?messageId=#{first_message.id})",
-        )
-        channel_2.add(current_user)
-      end
-
-      it "highglights the correct message" do
-        chat_page.visit_channel(channel_2)
-        click_link(link)
-
-        expect(page).to have_css(
-          ".chat-message-container.highlighted[data-id='#{first_message.id}']",
-        )
-      end
-    end
-
-    context "when navigating directly to a message link" do
-      it "highglights the correct message" do
-        visit("/chat/channel/#{channel_1.id}/-?messageId=#{first_message.id}")
-
-        expect(page).to have_css(
-          ".chat-message-container.highlighted[data-id='#{first_message.id}']",
-        )
-      end
-    end
-  end
-
-  context "when in drawer" do
-    context "when clicking a link containing a message id" do
-      fab!(:topic_1) { Fabricate(:topic) }
-
-      before do
-        Fabricate(
-          :post,
-          topic: topic_1,
-          raw:
-            "<a href=\"/chat/channel/#{channel_1.id}/-?messageId=#{first_message.id}\">#{link}</a>",
-        )
-      end
-
-      it "highlights correct message" do
-        visit("/t/-/#{topic_1.id}")
-        click_link(link)
-
-        expect(page).to have_css(
-          ".chat-drawer.is-expanded .chat-message-container.highlighted[data-id='#{first_message.id}']",
-        )
-      end
-    end
-
-    context "when clicking a link to a message from the current channel" do
-      before do
-        Fabricate(
-          :chat_message,
-          chat_channel: channel_1,
-          message: "[#{link}](/chat/channel/#{channel_1.id}/-?messageId=#{first_message.id})",
-        )
-      end
-
-      it "highglights the correct message" do
-        visit("/")
-        chat_page.open_from_header
-        chat_drawer_page.open_channel(channel_1)
-        click_link(link)
-
-        expect(page).to have_css(
-          ".chat-message-container.highlighted[data-id='#{first_message.id}']",
-        )
-      end
-
-      it "highlights the correct message after using the bottom arrow" do
-        visit("/")
-        chat_page.open_from_header
-        chat_drawer_page.open_channel(channel_1)
-        click_link(link)
-        click_link(I18n.t("js.chat.scroll_to_bottom"))
-        click_link(link)
-
-        expect(page).to have_css(
-          ".chat-message-container.highlighted[data-id='#{first_message.id}']",
-        )
-      end
-    end
-  end
-end
diff --git a/plugins/chat/spec/system/navigation_spec.rb b/plugins/chat/spec/system/navigation_spec.rb
index e9ee13b565f..40bead2f3d0 100644
--- a/plugins/chat/spec/system/navigation_spec.rb
+++ b/plugins/chat/spec/system/navigation_spec.rb
@@ -1,20 +1,25 @@
 # frozen_string_literal: true
 
-RSpec.describe "Navigation", type: :system, js: true do
+RSpec.describe "Navigation", type: :system do
   fab!(:category) { Fabricate(:category) }
   fab!(:topic) { Fabricate(:topic) }
   fab!(:post) { Fabricate(:post, topic: topic) }
-  fab!(:user) { Fabricate(:admin) }
+  fab!(:current_user) { Fabricate(:admin) }
   fab!(:category_channel) { Fabricate(:category_channel) }
   fab!(:category_channel_2) { Fabricate(:category_channel) }
   fab!(:message) { Fabricate(:chat_message, chat_channel: category_channel) }
   let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:thread_page) { PageObjects::Pages::ChatThread.new }
+  let(:thread_list_page) { PageObjects::Components::Chat::ThreadList.new }
+  let(:channel_page) { PageObjects::Pages::ChatChannel.new }
+  let(:side_panel_page) { PageObjects::Pages::ChatSidePanel.new }
   let(:sidebar_page) { PageObjects::Pages::Sidebar.new }
+  let(:sidebar_component) { PageObjects::Components::NavigationMenu::Sidebar.new }
   let(:chat_drawer_page) { PageObjects::Pages::ChatDrawer.new }
 
   before do
-    chat_system_bootstrap(user, [category_channel, category_channel_2])
-    sign_in(user)
+    chat_system_bootstrap(current_user, [category_channel, category_channel_2])
+    sign_in(current_user)
   end
 
   context "when clicking chat icon and drawer is viewing channel" do
@@ -46,7 +51,7 @@ RSpec.describe "Navigation", type: :system, js: true do
       chat_page.open_from_header
 
       expect(page).to have_current_path(
-        chat.channel_path(category_channel_2.id, category_channel_2.slug),
+        chat.channel_path(category_channel_2.slug, category_channel_2.id),
       )
     end
   end
@@ -56,7 +61,7 @@ RSpec.describe "Navigation", type: :system, js: true do
       chat_page.open
 
       expect(page).to have_current_path(
-        chat.channel_path(category_channel.id, category_channel.slug),
+        chat.channel_path(category_channel.slug, category_channel.id),
       )
       expect(page).to have_css("html.has-full-page-chat")
       expect(page).to have_css(".chat-message-container[data-id='#{message.id}']")
@@ -79,14 +84,14 @@ RSpec.describe "Navigation", type: :system, js: true do
       chat_drawer_page.maximize
 
       expect(page).to have_current_path(
-        chat.channel_path(category_channel.id, category_channel.slug),
+        chat.channel_path(category_channel.slug, category_channel.id),
       )
 
       visit("/")
       chat_page.open_from_header
 
       expect(page).to have_current_path(
-        chat.channel_path(category_channel.id, category_channel.slug),
+        chat.channel_path(category_channel.slug, category_channel.id),
       )
     end
   end
@@ -126,6 +131,81 @@ RSpec.describe "Navigation", type: :system, js: true do
     end
   end
 
+  context "when opening a thread" do
+    fab!(:thread) { Fabricate(:chat_thread, channel: category_channel) }
+
+    before do
+      category_channel.update!(threading_enabled: true)
+      Fabricate(:chat_message, thread: thread, chat_channel: thread.channel)
+      thread.add(current_user)
+    end
+
+    context "when opening a thread from the thread list" do
+      it "goes back to the thread list when clicking the back button" do
+        skip("Flaky on CI") if ENV["CI"]
+
+        visit("/chat")
+        chat_page.visit_channel(category_channel)
+        channel_page.open_thread_list
+        expect(thread_list_page).to have_loaded
+        thread_list_page.open_thread(thread)
+        expect(side_panel_page).to have_open_thread(thread)
+        expect(thread_page).to have_back_link_to_thread_list(category_channel)
+        thread_page.back_to_previous_route
+        expect(page).to have_current_path("#{category_channel.relative_url}/t")
+        expect(thread_list_page).to have_loaded
+      end
+
+      context "for mobile" do
+        it "goes back to the thread list when clicking the back button", mobile: true do
+          skip("Flaky on CI") if ENV["CI"]
+
+          visit("/chat")
+          chat_page.visit_channel(category_channel)
+          channel_page.open_thread_list
+          expect(thread_list_page).to have_loaded
+          thread_list_page.open_thread(thread)
+          expect(side_panel_page).to have_open_thread(thread)
+          expect(thread_page).to have_back_link_to_thread_list(category_channel)
+          thread_page.back_to_previous_route
+          expect(page).to have_current_path("#{category_channel.relative_url}/t")
+          expect(thread_list_page).to have_loaded
+        end
+      end
+    end
+
+    context "when opening a thread from indicator" do
+      it "goes back to the thread list when clicking the back button" do
+        skip("Flaky on CI") if ENV["CI"]
+
+        visit("/chat")
+        chat_page.visit_channel(category_channel)
+        channel_page.message_thread_indicator(thread.original_message).click
+        expect(side_panel_page).to have_open_thread(thread)
+        expect(thread_page).to have_back_link_to_thread_list(category_channel)
+        thread_page.back_to_previous_route
+        expect(page).to have_current_path("#{category_channel.relative_url}/t")
+        expect(thread_list_page).to have_loaded
+      end
+
+      context "for mobile" do
+        it "closes the thread and goes back to the channel when clicking the back button",
+           mobile: true do
+          skip("Flaky on CI") if ENV["CI"]
+
+          visit("/chat")
+          chat_page.visit_channel(category_channel)
+          channel_page.message_thread_indicator(thread.original_message).click
+          expect(side_panel_page).to have_open_thread(thread)
+          expect(thread_page).to have_back_link_to_channel(category_channel)
+          thread_page.back_to_previous_route
+          expect(page).to have_current_path("#{category_channel.relative_url}")
+          expect(side_panel_page).to be_closed
+        end
+      end
+    end
+  end
+
   context "when sidebar is configured as the navigation menu" do
     before { SiteSetting.navigation_menu = "sidebar" }
 
@@ -134,7 +214,7 @@ RSpec.describe "Navigation", type: :system, js: true do
         visit("/t/-/#{topic.id}")
         chat_page.open_from_header
         chat_drawer_page.close
-        find("a[class*='sidebar-section-link-#{category_channel.slug}']").click
+        sidebar_component.click_link(category_channel.name)
 
         expect(page).to have_css(".chat-message-container[data-id='#{message.id}']")
       end
@@ -146,45 +226,23 @@ RSpec.describe "Navigation", type: :system, js: true do
         chat_page.open_from_header
         chat_drawer_page.maximize
         visit("/")
-        find("a[class*='sidebar-section-link-#{category_channel.slug}']").click
+        sidebar_component.click_link(category_channel.name)
 
         expect(page).to have_current_path(
-          chat.channel_path(category_channel.id, category_channel.slug),
+          chat.channel_path(category_channel.slug, category_channel.id),
         )
       end
     end
 
-    context "when starting draft from sidebar with drawer preferred" do
-      it "opens draft in drawer" do
-        visit("/")
-        sidebar_page.open_draft_channel
-
-        expect(page).to have_current_path("/")
-        expect(page).to have_css(".chat-drawer.is-expanded .direct-message-creator")
-      end
-    end
-
-    context "when starting draft from drawer with drawer preferred" do
-      it "opens draft in drawer" do
-        visit("/")
-        chat_page.open_from_header
-        chat_drawer_page.open_draft_channel
-
-        expect(page).to have_current_path("/")
-        expect(page).to have_css(".chat-drawer.is-expanded .direct-message-creator")
-      end
-    end
-
     context "when starting draft from sidebar with full page preferred" do
       it "opens draft in full page" do
         visit("/")
         chat_page.open_from_header
         chat_drawer_page.maximize
         visit("/")
-        sidebar_page.open_draft_channel
+        chat_page.open_new_message
 
-        expect(page).to have_current_path("/chat/draft-channel")
-        expect(page).not_to have_css(".chat-drawer.is-expanded")
+        expect(chat_page.message_creator).to be_opened
       end
     end
 
@@ -215,7 +273,7 @@ RSpec.describe "Navigation", type: :system, js: true do
         visit("/")
         chat_page.open_from_header
         chat_drawer_page.open_channel(category_channel_2)
-        chat_drawer_page.open_index
+        chat_drawer_page.back
         chat_drawer_page.close
         chat_page.open_from_header
 
@@ -227,32 +285,48 @@ RSpec.describe "Navigation", type: :system, js: true do
 
     context "when re-opening full page chat after navigating to a channel" do
       it "opens full page chat on correct channel" do
+        chat_channel_path = chat.channel_path(category_channel_2.slug, category_channel_2.id)
+
         visit("/")
         chat_page.open_from_header
         chat_drawer_page.maximize
         sidebar_page.open_channel(category_channel_2)
         find("#site-logo").click
+
+        expect(chat_page).to have_header_href(chat_channel_path)
+
         chat_page.open_from_header
 
-        expect(page).to have_current_path(
-          chat.channel_path(category_channel_2.id, category_channel_2.slug),
-        )
+        expect(page).to have_current_path(chat_channel_path)
         expect(page).to have_content(category_channel_2.title)
       end
     end
 
     context "when opening a channel in full page" do
+      fab!(:other_user) { Fabricate(:user) }
+      fab!(:dm_channel) { Fabricate(:direct_message_channel, users: [current_user, other_user]) }
+
       it "activates the channel in the sidebar" do
-        visit("/chat/channel/#{category_channel.id}/#{category_channel.slug}")
-        expect(page).to have_css(
-          ".sidebar-section-link-#{category_channel.slug}.sidebar-section-link--active",
-        )
+        visit("/chat/c/#{category_channel.slug}/#{category_channel.id}")
+
+        expect(sidebar_component).to have_section_link(category_channel.name, active: true)
+      end
+
+      it "does not have multiple channels marked active in the sidebar" do
+        chat_page.visit_channel(dm_channel)
+
+        expect(sidebar_component).to have_section_link(other_user.username, active: true)
+
+        sidebar_component.click_section_link(category_channel.name)
+
+        expect(sidebar_component).to have_section_link(category_channel.name, active: true)
+        expect(sidebar_component).to have_one_active_section_link
       end
     end
 
     context "when going back to channel from channel settings in full page" do
       it "activates the channel in the sidebar" do
-        visit("/chat/channel/#{category_channel.id}/#{category_channel.slug}/info/settings")
+        visit("/chat/c/#{category_channel.slug}/#{category_channel.id}/info/settings")
         find(".chat-full-page-header__back-btn").click
         expect(page).to have_content(message.message)
       end
@@ -260,12 +334,10 @@ RSpec.describe "Navigation", type: :system, js: true do
 
     context "when clicking logo from a channel in full page" do
       it "deactivates the channel in the sidebar" do
-        visit("/chat/channel/#{category_channel.id}/#{category_channel.slug}")
+        visit("/chat/c/#{category_channel.slug}/#{category_channel.id}")
         find("#site-logo").click
 
-        expect(page).not_to have_css(
-          ".sidebar-section-link-#{category_channel.slug}.sidebar-section-link--active",
-        )
+        expect(sidebar_component).to have_no_section_link(category_channel.name, active: true)
       end
     end
 
@@ -273,11 +345,9 @@ RSpec.describe "Navigation", type: :system, js: true do
       it "activates the channel in the sidebar" do
         visit("/")
         chat_page.open_from_header
-        find("a[class*='#{category_channel.slug}']").click
+        sidebar_component.click_link(category_channel.name)
 
-        expect(page).to have_css(
-          ".sidebar-section-link-#{category_channel.slug}.sidebar-section-link--active",
-        )
+        expect(sidebar_component).to have_section_link(category_channel.name, active: true)
       end
     end
 
@@ -285,12 +355,11 @@ RSpec.describe "Navigation", type: :system, js: true do
       it "deactivates the channel in the sidebar" do
         visit("/")
         chat_page.open_from_header
-        find("a[class*='sidebar-section-link-#{category_channel.slug}']").click
+
+        sidebar_component.click_link(category_channel.name)
         chat_drawer_page.close
 
-        expect(page).not_to have_css(
-          ".sidebar-section-link-#{category_channel.slug}.sidebar-section-link--active",
-        )
+        expect(sidebar_component).to have_no_section_link(category_channel.name, active: true)
       end
     end
   end
diff --git a/plugins/chat/spec/system/network_reconciliation_spec.rb b/plugins/chat/spec/system/network_reconciliation_spec.rb
deleted file mode 100644
index 8ceb9b4a19a..00000000000
--- a/plugins/chat/spec/system/network_reconciliation_spec.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "Network reconciliation", type: :system, js: true do
-  fab!(:current_user) { Fabricate(:user) }
-  fab!(:other_user) { Fabricate(:user) }
-  fab!(:channel_1) { Fabricate(:category_channel) }
-
-  let(:chat_page) { PageObjects::Pages::Chat.new }
-  let(:chat_channel_page) { PageObjects::Pages::ChatChannel.new }
-
-  before do
-    chat_system_bootstrap
-    channel_1.add(current_user)
-    channel_1.add(other_user)
-  end
-
-  context "when user recovers network" do
-    it "recovers state" do
-      using_session(:disconnected_current_user) do
-        sign_in(current_user)
-        visit("/")
-        page.driver.browser.network_conditions = { offline: true, latency: 0, throughput: 0 }
-      end
-
-      using_session(:other_user) do |session|
-        sign_in(other_user)
-        chat_page.visit_channel(channel_1)
-        chat_channel_page.send_message("hello @#{current_user.username}!")
-        session.quit
-      end
-
-      using_session(:connected_current_user) do |session|
-        sign_in(current_user)
-        visit("/")
-        expect(page).to have_css(".chat-header-icon .chat-channel-unread-indicator")
-        chat_page.visit_channel(channel_1)
-        expect(page).to have_no_css(".chat-header-icon .chat-channel-unread-indicator")
-        session.quit
-      end
-
-      using_session(:disconnected_current_user) do |session|
-        expect(page).to have_no_css(".chat-header-icon .chat-channel-unread-indicator")
-        page.driver.browser.network_conditions = { offline: false, latency: 0, throughput: 0 }
-        expect(page).to have_no_css(".chat-header-icon .chat-channel-unread-indicator")
-
-        # generally speaking sleep should be avoided in tests, but in this case
-        # we need to wait for the client to reconnect and receive the message
-        # right at the start the icon won't be there so checking for not will be true
-        # and checking for present could also be true as it might be within capybara finder delay
-        # which is what we are testing here and want to avoid
-        sleep 1
-
-        expect(page).to have_no_css(".chat-header-icon .chat-channel-unread-indicator")
-        session.quit
-      end
-    end
-  end
-end
diff --git a/plugins/chat/spec/system/new_message_spec.rb b/plugins/chat/spec/system/new_message_spec.rb
new file mode 100644
index 00000000000..f82e4951e69
--- /dev/null
+++ b/plugins/chat/spec/system/new_message_spec.rb
@@ -0,0 +1,445 @@
+# frozen_string_literal: true
+
+RSpec.describe "New message", type: :system do
+  fab!(:current_user) { Fabricate(:admin) }
+
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+
+  before do
+    # simpler user search without having to worry about user search data
+    SiteSetting.enable_names = false
+
+    chat_system_bootstrap
+    sign_in(current_user)
+  end
+
+  it "cmd + k opens new message" do
+    visit("/")
+    chat_page.open_new_message
+
+    expect(chat_page.message_creator).to be_opened
+  end
+
+  context "when public channels are disabled" do
+    fab!(:channel_1) { Fabricate(:chat_channel) }
+
+    before do
+      SiteSetting.enable_public_channels = false
+      channel_1.add(current_user)
+    end
+
+    it "doesn’t list public channels" do
+      visit("/")
+      chat_page.open_new_message
+
+      expect(chat_page.message_creator).to be_not_listing(channel_1)
+    end
+
+    it "has a correct placeholder" do
+      visit("/")
+      chat_page.open_new_message
+
+      expect(chat_page.message_creator.input["placeholder"]).to eq(
+        I18n.t("js.chat.new_message_modal.default_user_search_placeholder"),
+      )
+    end
+  end
+
+  context "when public channels are disabled and user can't create direct message" do
+    fab!(:current_user) { Fabricate(:user) }
+
+    before do
+      SiteSetting.enable_public_channels = false
+      SiteSetting.direct_message_enabled_groups = Group::AUTO_GROUPS[:staff]
+    end
+
+    it "doesn’t list public channels" do
+      visit("/")
+      chat_page.open_new_message(ensure_open: false)
+
+      expect(chat_page.message_creator).to be_closed
+    end
+  end
+
+  context "when the the content is not filtered" do
+    fab!(:channel_1) { Fabricate(:chat_channel) }
+    fab!(:channel_2) { Fabricate(:chat_channel) }
+    fab!(:user_1) { Fabricate(:user) }
+    fab!(:user_2) { Fabricate(:user) }
+    fab!(:direct_message_channel_1) do
+      Fabricate(:direct_message_channel, users: [current_user, user_1])
+    end
+    fab!(:direct_message_channel_2) { Fabricate(:direct_message_channel, users: [user_1, user_2]) }
+
+    before { channel_1.add(current_user) }
+
+    it "lists channels the user is following" do
+      visit("/")
+      chat_page.open_new_message
+
+      expect(chat_page.message_creator).to be_listing(channel_1)
+      expect(chat_page.message_creator).to be_not_listing(channel_2)
+      expect(chat_page.message_creator).to be_not_listing(direct_message_channel_2)
+      expect(chat_page.message_creator).to be_listing(user_1)
+      expect(chat_page.message_creator).to be_not_listing(user_2)
+    end
+  end
+
+  context "with no selection" do
+    context "with unread state" do
+      fab!(:user_1) { Fabricate(:user) }
+      fab!(:channel_1) { Fabricate(:chat_channel) }
+      fab!(:channel_2) { Fabricate(:direct_message_channel, users: [current_user, user_1]) }
+
+      before do
+        channel_1.add(user_1)
+        channel_1.add(current_user)
+        Fabricate(:chat_message, chat_channel: channel_1, user: user_1)
+        Fabricate(:chat_message, chat_channel: channel_2, user: user_1)
+      end
+
+      it "shows the correct state" do
+        visit("/")
+        chat_page.open_new_message
+
+        expect(chat_page.message_creator).to have_unread_row(channel_1, urgent: false)
+        expect(chat_page.message_creator).to have_unread_row(user_1, urgent: true)
+      end
+    end
+
+    context "when clicking a row" do
+      context "when the row is a channel" do
+        fab!(:channel_1) { Fabricate(:chat_channel) }
+
+        before { channel_1.add(current_user) }
+
+        it "opens the channel" do
+          visit("/")
+          chat_page.open_new_message
+          chat_page.message_creator.click_row(channel_1)
+
+          expect(chat_page).to have_drawer(channel_id: channel_1.id)
+        end
+      end
+
+      context "when the row is a user" do
+        fab!(:user_1) { Fabricate(:user) }
+        fab!(:channel_1) { Fabricate(:direct_message_channel, users: [current_user, user_1]) }
+
+        it "opens the channel" do
+          visit("/")
+          chat_page.open_new_message
+          chat_page.message_creator.click_row(user_1)
+
+          expect(chat_page).to have_drawer(channel_id: channel_1.id)
+        end
+      end
+    end
+
+    context "when shift clicking a row" do
+      context "when the row is a channel" do
+        fab!(:channel_1) { Fabricate(:chat_channel) }
+
+        before { channel_1.add(current_user) }
+
+        it "opens the channel" do
+          visit("/")
+          chat_page.open_new_message
+          chat_page.message_creator.shift_click_row(channel_1)
+
+          expect(chat_page).to have_drawer(channel_id: channel_1.id)
+        end
+      end
+
+      context "when the row is a user" do
+        fab!(:user_1) { Fabricate(:user) }
+        fab!(:channel_1) { Fabricate(:direct_message_channel, users: [current_user, user_1]) }
+
+        it "adds the user" do
+          visit("/")
+          chat_page.open_new_message
+          chat_page.message_creator.shift_click_row(user_1)
+
+          expect(chat_page.message_creator).to be_selecting(user_1)
+        end
+      end
+    end
+
+    context "when pressing enter" do
+      context "when the row is a channel" do
+        fab!(:channel_1) { Fabricate(:chat_channel) }
+
+        before { channel_1.add(current_user) }
+
+        it "opens the channel" do
+          visit("/")
+          chat_page.open_new_message
+          chat_page.message_creator.click_row(channel_1)
+
+          expect(chat_page).to have_drawer(channel_id: channel_1.id)
+        end
+      end
+
+      context "when the row is a user" do
+        fab!(:user_1) { Fabricate(:user) }
+        fab!(:channel_1) { Fabricate(:direct_message_channel, users: [current_user, user_1]) }
+
+        it "opens the channel" do
+          visit("/")
+          chat_page.open_new_message
+          chat_page.message_creator.click_row(user_1)
+
+          expect(chat_page).to have_drawer(channel_id: channel_1.id)
+        end
+      end
+    end
+
+    context "when pressing shift+enter" do
+      context "when the row is a channel" do
+        fab!(:channel_1) { Fabricate(:chat_channel) }
+
+        before { channel_1.add(current_user) }
+
+        it "opens the channel" do
+          visit("/")
+          chat_page.open_new_message
+          chat_page.message_creator.shift_enter_shortcut
+
+          expect(chat_page).to have_drawer(channel_id: channel_1.id)
+        end
+      end
+
+      context "when the row is a user" do
+        fab!(:user_1) { Fabricate(:user) }
+        fab!(:channel_1) { Fabricate(:direct_message_channel, users: [current_user, user_1]) }
+
+        it "adds the user" do
+          visit("/")
+          chat_page.open_new_message
+          chat_page.message_creator.shift_enter_shortcut
+
+          expect(chat_page.message_creator).to be_selecting(user_1)
+        end
+      end
+    end
+
+    context "when navigating content with arrows" do
+      fab!(:channel_1) { Fabricate(:chat_channel, name: "channela") }
+      fab!(:channel_2) { Fabricate(:chat_channel, name: "channelb") }
+
+      before do
+        channel_1.add(current_user)
+        channel_2.add(current_user)
+      end
+
+      it "changes active content" do
+        visit("/")
+        chat_page.open_new_message
+
+        expect(chat_page.message_creator).to be_listing(channel_1, active: true)
+
+        chat_page.message_creator.arrow_down_shortcut
+
+        expect(chat_page.message_creator).to be_listing(channel_2, active: true)
+
+        chat_page.message_creator.arrow_down_shortcut
+
+        expect(chat_page.message_creator).to be_listing(channel_1, active: true)
+
+        chat_page.message_creator.arrow_up_shortcut
+
+        expect(chat_page.message_creator).to be_listing(channel_2, active: true)
+      end
+    end
+
+    context "with disabled content" do
+      fab!(:user_1) { Fabricate(:user) }
+      fab!(:channel_1) { Fabricate(:direct_message_channel, users: [current_user, user_1]) }
+
+      before { user_1.user_option.update!(chat_enabled: false) }
+
+      it "doesn’t make the content active" do
+        visit("/")
+        chat_page.open_new_message
+
+        expect(chat_page.message_creator).to be_listing(user_1, inactive: true, disabled: true)
+      end
+    end
+  end
+
+  context "when filtering" do
+    fab!(:channel_1) { Fabricate(:chat_channel, name: "bob-channel") }
+    fab!(:user_1) { Fabricate(:user, username: "bob-user") }
+    fab!(:user_2) { Fabricate(:user) }
+    fab!(:channel_2) { Fabricate(:direct_message_channel, users: [current_user, user_1]) }
+    fab!(:channel_3) { Fabricate(:direct_message_channel, users: [current_user, user_1, user_2]) }
+
+    before { channel_1.add(current_user) }
+
+    context "when query is the name of the category" do
+      fab!(:category) { Fabricate(:category, name: "dev") }
+      fab!(:channel_1) { Fabricate(:category_channel, chatable: category, name: "something dev") }
+      fab!(:channel_2) { Fabricate(:category_channel, chatable: category, name: "something else") }
+
+      it "favors the channel name" do
+        visit("/")
+        chat_page.open_new_message
+
+        chat_page.message_creator.filter("dev")
+
+        expect(chat_page.message_creator).to be_listing(channel_1)
+        expect(chat_page.message_creator).to be_not_listing(channel_2)
+      end
+    end
+
+    context "with no prefix" do
+      it "lists all matching content" do
+        visit("/")
+        chat_page.open_new_message
+
+        chat_page.message_creator.filter("bob")
+
+        expect(chat_page.message_creator).to be_listing(channel_1)
+        expect(chat_page.message_creator).to be_not_listing(channel_2)
+        expect(chat_page.message_creator).to be_listing(channel_3)
+        expect(chat_page.message_creator).to be_listing(user_1)
+        expect(chat_page.message_creator).to be_not_listing(user_2)
+      end
+    end
+
+    context "with channel prefix" do
+      it "lists matching channel" do
+        visit("/")
+        chat_page.open_new_message
+
+        chat_page.message_creator.filter("#bob")
+
+        expect(chat_page.message_creator).to be_listing(channel_1)
+        expect(chat_page.message_creator).to be_not_listing(channel_2)
+        expect(chat_page.message_creator).to be_listing(channel_3)
+        expect(chat_page.message_creator).to be_not_listing(user_1)
+        expect(chat_page.message_creator).to be_not_listing(user_2)
+      end
+    end
+
+    context "with user prefix" do
+      it "lists matching users" do
+        visit("/")
+        chat_page.open_new_message
+
+        chat_page.message_creator.filter("@bob")
+
+        expect(chat_page.message_creator).to be_not_listing(channel_1)
+        expect(chat_page.message_creator).to be_not_listing(channel_2)
+        expect(chat_page.message_creator).to be_not_listing(channel_3)
+        expect(chat_page.message_creator).to be_listing(user_1)
+        expect(chat_page.message_creator).to be_not_listing(user_2)
+      end
+    end
+  end
+
+  context "with selection" do
+    fab!(:channel_1) { Fabricate(:chat_channel, name: "bob-channel") }
+    fab!(:user_1) { Fabricate(:user, username: "bob-user") }
+    fab!(:user_2) { Fabricate(:user, username: "bobby-user") }
+    fab!(:user_3) { Fabricate(:user, username: "sam-user") }
+    fab!(:channel_2) { Fabricate(:direct_message_channel, users: [current_user, user_1]) }
+    fab!(:channel_3) { Fabricate(:direct_message_channel, users: [current_user, user_2]) }
+
+    before do
+      channel_1.add(current_user)
+      visit("/")
+      chat_page.open_new_message
+      chat_page.message_creator.shift_click_row(user_1)
+    end
+
+    context "when pressing enter" do
+      it "opens the channel" do
+        chat_page.message_creator.enter_shortcut
+
+        expect(chat_page).to have_drawer(channel_id: channel_2.id)
+      end
+    end
+
+    context "when clicking cta" do
+      it "opens the channel" do
+        chat_page.message_creator.click_cta
+
+        expect(chat_page).to have_drawer(channel_id: channel_2.id)
+      end
+    end
+
+    context "when filtering" do
+      it "shows only matching users regarless of prefix" do
+        chat_page.message_creator.filter("#bob")
+
+        expect(chat_page.message_creator).to be_listing(user_1)
+        expect(chat_page.message_creator).to be_listing(user_2)
+        expect(chat_page.message_creator).to be_not_listing(user_3)
+        expect(chat_page.message_creator).to be_not_listing(channel_1)
+        expect(chat_page.message_creator).to be_not_listing(channel_2)
+        expect(chat_page.message_creator).to be_not_listing(channel_3)
+      end
+
+      it "shows selected user as selected in content" do
+        chat_page.message_creator.filter("@bob")
+
+        expect(chat_page.message_creator).to be_listing(user_1, selected: true)
+        expect(chat_page.message_creator).to be_listing(user_2, selected: false)
+      end
+    end
+
+    context "when clicking another user" do
+      it "adds it to the selection" do
+        chat_page.message_creator.filter("@bob")
+        chat_page.message_creator.click_row(user_2)
+
+        expect(chat_page.message_creator).to be_selecting(user_1)
+        expect(chat_page.message_creator).to be_selecting(user_2)
+      end
+    end
+
+    context "when pressing backspace" do
+      it "removes it" do
+        chat_page.message_creator.backspace_shortcut
+
+        expect(chat_page.message_creator).to be_selecting(user_1, active: true)
+
+        chat_page.message_creator.backspace_shortcut
+
+        expect(chat_page.message_creator).to be_not_selecting(user_1)
+      end
+    end
+
+    context "when navigating selection with arrow left/right" do
+      it "changes active item" do
+        chat_page.message_creator.filter("@bob")
+        chat_page.message_creator.click_row(user_2)
+
+        chat_page.message_creator.arrow_left_shortcut
+
+        expect(chat_page.message_creator).to be_selecting(user_2, active: true)
+
+        chat_page.message_creator.arrow_left_shortcut
+
+        expect(chat_page.message_creator).to be_selecting(user_1, active: true)
+
+        chat_page.message_creator.arrow_left_shortcut
+
+        expect(chat_page.message_creator).to be_selecting(user_2, active: true)
+
+        chat_page.message_creator.arrow_right_shortcut
+
+        expect(chat_page.message_creator).to be_selecting(user_1, active: true)
+      end
+    end
+
+    context "when clicking selection" do
+      it "removes it" do
+        chat_page.message_creator.click_item(user_1)
+
+        expect(chat_page.message_creator).to be_not_selecting(user_1)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/page_objects/chat/browse_page.rb b/plugins/chat/spec/system/page_objects/chat/browse_page.rb
new file mode 100644
index 00000000000..eaff9fa1bf9
--- /dev/null
+++ b/plugins/chat/spec/system/page_objects/chat/browse_page.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Pages
+    class ChatBrowse < PageObjects::Pages::Base
+      def component
+        find(".chat-browse-view")
+      end
+
+      def has_finished_loading?
+        component.has_css?(".loading-container .spinner", wait: 0)
+        component.has_no_css?(".loading-container .spinner")
+      end
+
+      def search(query)
+        component.find(".dc-filter-input").fill_in(with: query)
+        component.has_css?(".loading-container .spinner", wait: 0)
+        component.has_no_css?(".loading-container .spinner")
+      end
+
+      def has_channel?(name: nil)
+        component.has_content?(name)
+      end
+
+      def has_no_channel?(name: nil)
+        component.has_no_content?(name)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/page_objects/chat/chat.rb b/plugins/chat/spec/system/page_objects/chat/chat.rb
index 38e341e46d2..694d0719507 100644
--- a/plugins/chat/spec/system/page_objects/chat/chat.rb
+++ b/plugins/chat/spec/system/page_objects/chat/chat.rb
@@ -3,6 +3,14 @@
 module PageObjects
   module Pages
     class Chat < PageObjects::Pages::Base
+      def message_creator
+        @message_creator ||= PageObjects::Components::Chat::MessageCreator.new
+      end
+
+      def sidebar
+        @sidebar ||= PageObjects::Components::Chat::Sidebar.new
+      end
+
       def prefers_full_page
         page.execute_script(
           "window.localStorage.setItem('discourse_chat_preferred_mode', '\"FULL_PAGE_CHAT\"');",
@@ -13,12 +21,36 @@ module PageObjects
         find(".chat-header-icon").click
       end
 
+      def has_header_href?(href)
+        find(".chat-header-icon").has_link?(href: href)
+      end
+
       def open
         visit("/chat")
       end
 
-      def visit_channel(channel, mobile: false)
-        visit(channel.url + (mobile ? "?mobile_view=1" : ""))
+      def open_new_message(ensure_open: true)
+        send_keys([PLATFORM_KEY_MODIFIER, "k"])
+        find(".chat-modal-new-message") if ensure_open
+      end
+
+      def has_drawer?(channel_id: nil, expanded: true)
+        drawer?(expectation: true, channel_id: channel_id, expanded: expanded)
+      end
+
+      def has_no_drawer?(channel_id: nil, expanded: true)
+        drawer?(expectation: false, channel_id: channel_id, expanded: expanded)
+      end
+
+      def visit_channel(channel, message_id: nil)
+        visit(channel.url + (message_id ? "/#{message_id}" : ""))
+        has_no_css?(".chat-channel--not-loaded-once")
+        has_no_css?(".chat-skeleton")
+      end
+
+      def visit_thread(thread)
+        visit(thread.url)
+        has_css?(".chat-skeleton")
         has_no_css?(".chat-skeleton")
       end
 
@@ -38,8 +70,11 @@ module PageObjects
         visit(channel.url + "/info")
       end
 
-      def visit_browse
-        visit("/chat/browse")
+      def visit_browse(filter = nil)
+        url = "/chat/browse"
+        url += "/" + filter.to_s if filter
+        visit(url)
+        PageObjects::Pages::ChatBrowse.new.has_finished_loading?
       end
 
       def minimize_full_page
@@ -47,10 +82,33 @@ module PageObjects
       end
 
       def has_message?(message)
-        container = find(".chat-message-container[data-id=\"#{message.id}\"")
+        container = find(".chat-message-container[data-id=\"#{message.id}\"]")
         container.has_content?(message.message)
         container.has_content?(message.user.username)
       end
+
+      NEW_CHANNEL_BUTTON_SELECTOR = ".new-channel-btn"
+
+      def new_channel_button
+        find(NEW_CHANNEL_BUTTON_SELECTOR)
+      end
+
+      def has_new_channel_button?
+        has_css?(NEW_CHANNEL_BUTTON_SELECTOR)
+      end
+
+      def has_no_new_channel_button?
+        has_no_css?(NEW_CHANNEL_BUTTON_SELECTOR)
+      end
+
+      private
+
+      def drawer?(expectation:, channel_id: nil, expanded: true)
+        selector = ".chat-drawer"
+        selector += ".is-expanded" if expanded
+        selector += "[data-chat-channel-id=\"#{channel_id}\"]" if channel_id
+        expectation ? has_css?(selector) : has_no_css?(selector)
+      end
     end
   end
 end
diff --git a/plugins/chat/spec/system/page_objects/chat/chat_channel.rb b/plugins/chat/spec/system/page_objects/chat/chat_channel.rb
index 715c2a3d2ef..b0610c3462e 100644
--- a/plugins/chat/spec/system/page_objects/chat/chat_channel.rb
+++ b/plugins/chat/spec/system/page_objects/chat/chat_channel.rb
@@ -3,20 +3,51 @@
 module PageObjects
   module Pages
     class ChatChannel < PageObjects::Pages::Base
+      def composer
+        @composer ||= PageObjects::Components::Chat::Composer.new(".chat-channel")
+      end
+
+      def messages
+        @messages ||= PageObjects::Components::Chat::Messages.new(".chat-channel")
+      end
+
+      def selection_management
+        @selection_management ||=
+          PageObjects::Components::Chat::SelectionManagement.new(".chat-channel")
+      end
+
+      def has_selected_messages?(*messages)
+        self.messages.has_selected_messages?(*messages)
+      end
+
+      def replying_to?(message)
+        find(".chat-channel .chat-reply", text: message.message)
+      end
+
       def type_in_composer(input)
-        find(".chat-composer-input").send_keys(input)
+        find(".chat-channel .chat-composer__input").click # makes helper more reliable by ensuring focus is not lost
+        find(".chat-channel .chat-composer__input").send_keys(input)
       end
 
       def fill_composer(input)
-        find(".chat-composer-input").fill_in(with: input)
+        find(".chat-channel .chat-composer__input").click # makes helper more reliable by ensuring focus is not lost
+        find(".chat-channel .chat-composer__input").fill_in(with: input)
+      end
+
+      def click_composer
+        find(".chat-channel .chat-composer__input").click # ensures autocomplete is closed and not masking anything
       end
 
       def click_send_message
-        find(".chat-composer .send-btn:enabled").click
+        find(".chat-composer.is-send-enabled .chat-composer-button.-send").click
+      end
+
+      def message_by_id_selector(id)
+        ".chat-channel .chat-messages-container .chat-message-container[data-id=\"#{id}\"]"
       end
 
       def message_by_id(id)
-        find(".chat-message-container[data-id=\"#{id}\"]")
+        find(message_by_id_selector(id))
       end
 
       def has_no_loading_skeleton?
@@ -27,73 +58,113 @@ module PageObjects
         has_css?(".chat-selection-management")
       end
 
+      def expand_deleted_message(message)
+        message_by_id(message.id).find(".chat-message-expand").click
+      end
+
       def expand_message_actions(message)
         hover_message(message)
-        click_more_buttons(message)
+        click_more_button
+      end
+
+      def expand_message_actions_mobile(message, delay: 2)
+        find(message_by_id_selector(message.id)).find(".chat-message-content").click(delay: delay)
+      end
+
+      def click_message_action_mobile(message, message_action)
+        expand_message_actions_mobile(message, delay: 0.4)
+        find(".chat-message-actions [data-id=\"#{message_action}\"]").click
       end
 
       def hover_message(message)
-        message_by_id(message.id).hover
+        message = message_by_id(message.id)
+        # Scroll to top of message so that the actions are not hidden
+        page.scroll_to(message, align: :top)
+        message.hover
       end
 
       def bookmark_message(message)
-        hover_message(message)
-        find(".bookmark-btn").click
+        if page.has_css?("html.mobile-view", wait: 0)
+          click_message_action_mobile(message, "bookmark")
+        else
+          hover_message(message)
+          find(".bookmark-btn").click
+        end
       end
 
-      def click_more_buttons(message)
+      def click_more_button
         find(".more-buttons").click
       end
 
       def flag_message(message)
         hover_message(message)
-        click_more_buttons(message)
+        click_more_button
         find("[data-value='flag']").click
       end
 
-      def select_message(message)
+      def copy_link(message)
         hover_message(message)
-        click_more_buttons(message)
-        find("[data-value='selectMessage']").click
+        click_more_button
+        find("[data-value='copyLink']").click
+      end
+
+      def flag_message(message)
+        hover_message(message)
+        click_more_button
+        find("[data-value='flag']").click
+      end
+
+      def delete_message(message)
+        hover_message(message)
+        click_more_button
+        find("[data-value='delete']").click
+      end
+
+      def restore_message(message)
+        hover_message(message)
+        click_more_button
+        find("[data-value='restore']").click
       end
 
       def open_edit_message(message)
         hover_message(message)
-        click_more_buttons(message)
+        click_more_button
         find("[data-value='edit']").click
       end
 
       def edit_message(message, text = nil)
         open_edit_message(message)
-        send_message(text) if text
+        send_message(message.message + text) if text
       end
 
       def send_message(text = nil)
+        text ||= Faker::Lorem.characters(number: SiteSetting.chat_minimum_message_length)
         text = text.chomp if text.present? # having \n on the end of the string counts as an Enter keypress
-        find(".chat-composer-input").click # makes helper more reliable by ensuring focus is not lost
-        find(".chat-composer-input").fill_in(with: text)
+        composer.fill_in(with: text)
         click_send_message
-        find(".chat-composer-input").click # ensures autocomplete is closed and not masking anything
+        text
       end
 
       def reply_to(message)
-        hover_message(message)
-        find(".reply-btn").click
-      end
-
-      def has_bookmarked_message?(message)
-        within(message_by_id(message.id)) { find(".chat-message-bookmarked") }
-      end
-
-      def find_reaction(message, reaction)
-        within(message_reactions_list(message)) do
-          return find("[data-emoji-name=\"#{reaction.emoji}\"]")
+        if page.has_css?("html.mobile-view", wait: 0)
+          click_message_action_mobile(message, "reply")
+        else
+          hover_message(message)
+          find(".reply-btn").click
         end
       end
 
-      def has_reaction?(message, reaction, text = nil)
+      def has_bookmarked_message?(message)
+        find(message_by_id_selector(message.id) + ".-bookmarked")
+      end
+
+      def find_reaction(message, emoji)
+        within(message_reactions_list(message)) { return find("[data-emoji-name=\"#{emoji}\"]") }
+      end
+
+      def has_reaction?(message, emoji, text = nil)
         within(message_reactions_list(message)) do
-          has_css?("[data-emoji-name=\"#{reaction.emoji}\"]", text: text)
+          has_css?("[data-emoji-name=\"#{emoji}\"]", text: text)
         end
       end
 
@@ -109,8 +180,8 @@ module PageObjects
         within(message_by_id(message.id)) { has_no_css?(".chat-message-reaction-list") }
       end
 
-      def click_reaction(message, reaction)
-        find_reaction(message, reaction).click
+      def click_reaction(message, emoji)
+        find_reaction(message, emoji).click
       end
 
       def open_action_menu
@@ -122,12 +193,64 @@ module PageObjects
       end
 
       def has_message?(text: nil, id: nil)
+        check_message_presence(exists: true, text: text, id: id)
+      end
+
+      def has_no_message?(text: nil, id: nil)
+        check_message_presence(exists: false, text: text, id: id)
+      end
+
+      def check_message_presence(exists: true, text: nil, id: nil)
+        css_method = exists ? :has_css? : :has_no_css?
         if text
-          has_css?(".chat-message-text", text: text)
+          find(".chat-channel").send(css_method, ".chat-message-text", text: text, wait: 5)
         elsif id
-          has_css?(".chat-message-container[data-id=\"#{id}\"]", wait: 10)
+          find(".chat-channel").send(
+            css_method,
+            ".chat-message-container[data-id=\"#{id}\"]",
+            wait: 10,
+          )
         end
       end
+
+      def has_thread_indicator?(message)
+        message_thread_indicator(message).exists?
+      end
+
+      def has_no_thread_indicator?(message)
+        message_thread_indicator(message).does_not_exist?
+      end
+
+      def message_thread_indicator(message)
+        PageObjects::Components::Chat::ThreadIndicator.new(message_by_id_selector(message.id))
+      end
+
+      def open_thread_list
+        find(thread_list_button_selector).click
+        PageObjects::Components::Chat::ThreadList.new.has_loaded?
+      end
+
+      def has_unread_thread_indicator?(count:)
+        has_css?("#{thread_list_button_selector}.has-unreads") &&
+          has_css?(
+            ".chat-thread-header-unread-indicator .chat-thread-header-unread-indicator__number",
+            text: count.to_s,
+          )
+      end
+
+      def has_no_unread_thread_indicator?
+        has_no_css?("#{thread_list_button_selector}.has-unreads")
+      end
+
+      def thread_list_button_selector
+        ".chat-threads-list-button"
+      end
+
+      private
+
+      def message_thread_indicator_selector(message)
+        "#{message_by_id_selector(message.id)} .chat-message-thread-indicator"
+      end
     end
   end
 end
diff --git a/plugins/chat/spec/system/page_objects/chat/chat_channel_about.rb b/plugins/chat/spec/system/page_objects/chat/chat_channel_about.rb
new file mode 100644
index 00000000000..a28836bb59f
--- /dev/null
+++ b/plugins/chat/spec/system/page_objects/chat/chat_channel_about.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Pages
+    class ChatChannelAbout < PageObjects::Pages::Base
+      EDIT_MODAL_SELECTOR = ".chat-modal-edit-channel-name"
+
+      def open_edit_modal
+        click_button(class: "edit-name-slug-btn")
+        find(EDIT_MODAL_SELECTOR) # wait for modal to appear
+        PageObjects::Modals::ChatChannelEdit.new
+      end
+
+      def has_slug?(slug)
+        page.has_css?(".channel-info-about-view__slug", text: slug)
+      end
+
+      def has_name?(name)
+        page.has_css?(".channel-info-about-view__name", text: name)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/page_objects/chat/chat_side_panel.rb b/plugins/chat/spec/system/page_objects/chat/chat_side_panel.rb
new file mode 100644
index 00000000000..dbc041ed097
--- /dev/null
+++ b/plugins/chat/spec/system/page_objects/chat/chat_side_panel.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Pages
+    class ChatSidePanel < PageObjects::Pages::Base
+      def open?
+        has_css?(".chat-side-panel")
+      end
+
+      def closed?
+        has_no_css?(".chat-side-panel")
+      end
+
+      def has_open_thread?(thread = nil)
+        if thread
+          has_css?(".chat-side-panel .chat-thread[data-id='#{thread.id}']")
+        else
+          has_css?(".chat-side-panel .chat-thread")
+        end
+        PageObjects::Pages::ChatThread.new.has_no_loading_skeleton?
+      end
+
+      def has_no_open_thread?
+        has_no_css?(".chat-side-panel .chat-thread")
+      end
+
+      def has_open_thread_list?
+        has_css?(".chat-side-panel .chat-thread-list")
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/page_objects/chat/chat_thread.rb b/plugins/chat/spec/system/page_objects/chat/chat_thread.rb
new file mode 100644
index 00000000000..e190ee6207f
--- /dev/null
+++ b/plugins/chat/spec/system/page_objects/chat/chat_thread.rb
@@ -0,0 +1,188 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Pages
+    class ChatThread < PageObjects::Pages::Base
+      def composer
+        @composer ||= PageObjects::Components::Chat::Composer.new(".chat-thread")
+      end
+
+      def composer_message_details
+        @composer_message_details ||=
+          PageObjects::Components::Chat::ComposerMessageDetails.new(".chat-thread")
+      end
+
+      def messages
+        @messages ||= PageObjects::Components::Chat::Messages.new(".chat-thread")
+      end
+
+      def header
+        @header ||= PageObjects::Components::Chat::ThreadHeader.new(".chat-thread")
+      end
+
+      def notifications_button
+        @notifications_button ||=
+          PageObjects::Components::SelectKit.new(".thread-notifications-button")
+      end
+
+      def notification_level=(level)
+        notifications_button.expand
+        notifications_button.select_row_by_value(
+          ::Chat::UserChatThreadMembership.notification_levels[level.to_sym],
+        )
+        notifications_button.has_selected_value?(
+          ::Chat::UserChatThreadMembership.notification_levels[level.to_sym],
+        )
+      end
+
+      def has_notification_level?(level)
+        select_kit =
+          PageObjects::Components::SelectKit.new(
+            ".chat-thread-header__buttons.-persisted .thread-notifications-button",
+          )
+        select_kit.has_selected_value?(
+          ::Chat::UserChatThreadMembership.notification_levels[level.to_sym],
+        )
+      end
+
+      def selection_management
+        @selection_management ||=
+          PageObjects::Components::Chat::SelectionManagement.new(".chat-channel")
+      end
+
+      def has_selected_messages?(*messages)
+        self.messages.has_selected_messages?(*messages)
+      end
+
+      def close
+        header.find(".chat-thread__close").click
+      end
+
+      def has_back_link_to_thread_list?(channel)
+        header.has_css?(
+          ".chat-thread__back-to-previous-route[href='#{channel.relative_url + "/t"}']",
+        )
+      end
+
+      def has_back_link_to_channel?(channel)
+        header.has_css?(".chat-thread__back-to-previous-route[href='#{channel.relative_url}']")
+      end
+
+      def back_to_previous_route
+        header.find(".chat-thread__back-to-previous-route").click
+      end
+
+      def has_no_unread_list_indicator?
+        has_no_css?(".chat-thread__back-to-previous-route .chat-thread-header-unread-indicator")
+      end
+
+      def has_unread_list_indicator?(count:)
+        has_css?(
+          ".chat-thread__back-to-previous-route .chat-thread-header-unread-indicator  .chat-thread-header-unread-indicator__number",
+          text: count.to_s,
+        )
+      end
+
+      def has_no_loading_skeleton?
+        has_no_css?(".chat-thread__messages .chat-skeleton")
+      end
+
+      def type_in_composer(input)
+        find(".chat-thread .chat-composer__input").click # makes helper more reliable by ensuring focus is not lost
+        find(".chat-thread .chat-composer__input").send_keys(input)
+      end
+
+      def fill_composer(input)
+        find(".chat-thread .chat-composer__input").click # makes helper more reliable by ensuring focus is not lost
+        find(".chat-thread .chat-composer__input").fill_in(with: input)
+      end
+
+      def click_composer
+        find(".chat-thread .chat-composer__input").click # ensures autocomplete is closed and not masking anything
+      end
+
+      def send_message(text = nil)
+        text ||= Faker::Lorem.characters(number: SiteSetting.chat_minimum_message_length)
+        text = text.chomp if text.present? # having \n on the end of the string counts as an Enter keypress
+        composer.fill_in(with: text)
+        click_send_message
+        click_composer
+        text
+      end
+
+      def click_send_message
+        find(".chat-thread .chat-composer.is-send-enabled .chat-composer-button.-send").click
+      end
+
+      def has_message?(text: nil, id: nil, thread_id: nil)
+        check_message_presence(exists: true, text: text, id: id, thread_id: thread_id)
+      end
+
+      def has_no_message?(text: nil, id: nil, thread_id: nil)
+        check_message_presence(exists: false, text: text, id: id, thread_id: thread_id)
+      end
+
+      def check_message_presence(exists: true, text: nil, id: nil, thread_id: nil)
+        css_method = exists ? :has_css? : :has_no_css?
+        selector = thread_id ? ".chat-thread[data-id=\"#{thread_id}\"]" : ".chat-thread"
+        if text
+          find(selector).send(css_method, ".chat-message-text", text: text, wait: 5)
+        elsif id
+          find(selector).send(css_method, ".chat-message-container[data-id=\"#{id}\"]", wait: 10)
+        end
+      end
+
+      def expand_deleted_message(message)
+        message_by_id(message.id).find(".chat-message-expand").click
+      end
+
+      def copy_link(message)
+        expand_message_actions(message)
+        find("[data-value='copyLink']").click
+      end
+
+      def delete_message(message)
+        expand_message_actions(message)
+        find("[data-value='delete']").click
+      end
+
+      def restore_message(message)
+        expand_deleted_message(message)
+        expand_message_actions(message)
+        find("[data-value='restore']").click
+      end
+
+      def expand_message_actions(message)
+        hover_message(message)
+        click_more_button
+      end
+
+      def click_more_button
+        find(".more-buttons").click
+      end
+
+      def hover_message(message)
+        message_by_id(message.id).hover
+      end
+
+      def message_by_id(id)
+        find(message_by_id_selector(id))
+      end
+
+      def message_by_id_selector(id)
+        ".chat-thread .chat-messages-container .chat-message-container[data-id=\"#{id}\"]"
+      end
+
+      def open_edit_message(message)
+        hover_message(message)
+        click_more_button
+        find("[data-value='edit']").click
+      end
+
+      def edit_message(message, text = nil)
+        open_edit_message(message)
+        send_message(message.message + text) if text
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/page_objects/chat/components/channel_index.rb b/plugins/chat/spec/system/page_objects/chat/components/channel_index.rb
new file mode 100644
index 00000000000..d62bc4b7b59
--- /dev/null
+++ b/plugins/chat/spec/system/page_objects/chat/components/channel_index.rb
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Components
+    module Chat
+      class ChannelIndex < PageObjects::Components::Base
+        attr_reader :context
+
+        SELECTOR = ".channels-list"
+
+        def initialize(context = nil)
+          @context = context
+        end
+
+        def component
+          return find(SELECTOR) if !@context
+          find(context).find(SELECTOR)
+        end
+
+        def open_channel(channel)
+          component.find("#{channel_row_selector(channel)}").click
+        end
+
+        def channel_row_selector(channel)
+          ".chat-channel-row[data-chat-channel-id='#{channel.id}']"
+        end
+
+        def has_unread_channel?(channel, count: nil, wait: Capybara.default_max_wait_time)
+          unread_indicator_selector =
+            "#{channel_row_selector(channel)} .chat-channel-unread-indicator"
+          has_css?(unread_indicator_selector) &&
+            if count
+              has_css?(
+                "#{unread_indicator_selector} .chat-channel-unread-indicator__number",
+                text: count,
+              )
+            else
+              true
+            end
+        end
+
+        def has_no_unread_channel?(channel)
+          has_no_css?("#{channel_row_selector(channel)} .chat-channel-unread-indicator")
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/page_objects/chat/components/composer.rb b/plugins/chat/spec/system/page_objects/chat/components/composer.rb
new file mode 100644
index 00000000000..07695148542
--- /dev/null
+++ b/plugins/chat/spec/system/page_objects/chat/components/composer.rb
@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Components
+    module Chat
+      class Composer < PageObjects::Components::Base
+        attr_reader :context
+
+        SELECTOR = ".chat-composer__wrapper"
+
+        def initialize(context)
+          @context = context
+        end
+
+        def blank?
+          input.value.blank?
+        end
+
+        def enabled?
+          component.has_css?(".chat-composer.is-enabled")
+        end
+
+        def has_saved_draft?
+          component.has_css?(".chat-composer.is-draft-saved")
+        end
+
+        def has_unsaved_draft?
+          component.has_css?(".chat-composer.is-draft-unsaved")
+        end
+
+        def message_details
+          @message_details ||= PageObjects::Components::Chat::ComposerMessageDetails.new(context)
+        end
+
+        def input
+          component.find(".chat-composer__input")
+        end
+
+        def component
+          find(context).find(SELECTOR)
+        end
+
+        def fill_in(**args)
+          input.fill_in(**args)
+        end
+
+        def value
+          input.value
+        end
+
+        def reply_to_last_message_shortcut
+          input.click
+          input.send_keys(%i[shift arrow_up])
+        end
+
+        def edit_last_message_shortcut
+          input.click
+          input.send_keys(%i[arrow_up])
+        end
+
+        def emphasized_text_shortcut
+          input.click
+          input.send_keys([PLATFORM_KEY_MODIFIER, "i"])
+        end
+
+        def cancel_shortcut
+          input.click
+          input.send_keys(:escape)
+        end
+
+        def indented_text_shortcut
+          input.click
+          input.send_keys([PLATFORM_KEY_MODIFIER, "e"])
+        end
+
+        def bold_text_shortcut
+          input.click
+          input.send_keys([PLATFORM_KEY_MODIFIER, "b"])
+        end
+
+        def open_emoji_picker
+          find(context).find(SELECTOR).find(".chat-composer-button.-emoji").click
+        end
+
+        def cancel_editing
+          component.click_button(class: "cancel-message-action")
+        end
+
+        def editing_message?(message)
+          value == message.message && message_details.editing?(message)
+        end
+
+        def editing_no_message?
+          value == "" && message_details.has_no_message?
+        end
+
+        def focus
+          component.click
+        end
+
+        def focused?
+          component.has_css?(".chat-composer.is-focused")
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/page_objects/chat/components/composer_message_details.rb b/plugins/chat/spec/system/page_objects/chat/components/composer_message_details.rb
new file mode 100644
index 00000000000..45850758bb4
--- /dev/null
+++ b/plugins/chat/spec/system/page_objects/chat/components/composer_message_details.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Components
+    module Chat
+      class ComposerMessageDetails < PageObjects::Components::Base
+        attr_reader :context
+
+        SELECTOR = ".chat-composer-message-details"
+
+        def initialize(context)
+          @context = context
+        end
+
+        def component
+          find(context)
+        end
+
+        def has_message?(**args)
+          selectors = SELECTOR
+          selectors += "[data-id=\"#{args[:id]}\"]" if args[:id]
+          selectors += "[data-action=\"#{args[:action]}\"]" if args[:action]
+          selector_method = args[:does_not_exist] ? :has_no_selector? : :has_selector?
+          predicate = component.send(selector_method, selectors)
+
+          text_options = {}
+          text_options[:text] = args[:text] if args[:text]
+          text_options[:exact_text] = args[:exact_text] if args[:exact_text]
+          if text_options.present?
+            predicate &&=
+              component.send(selector_method, "#{selectors} .chat-reply__excerpt", **text_options)
+          end
+
+          predicate
+        end
+
+        def has_no_message?(**args)
+          has_message?(**args, does_not_exist: true)
+        end
+
+        def editing?(message)
+          has_message?(id: message.id, action: :edit)
+        end
+
+        def replying_to?(message)
+          has_message?(id: message.id, action: :reply)
+        end
+
+        def cancel_edit
+          component.find(".cancel-message-action").click
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/page_objects/chat/components/message.rb b/plugins/chat/spec/system/page_objects/chat/components/message.rb
new file mode 100644
index 00000000000..f98a7a2ce3c
--- /dev/null
+++ b/plugins/chat/spec/system/page_objects/chat/components/message.rb
@@ -0,0 +1,106 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Components
+    module Chat
+      class Message < PageObjects::Components::Base
+        attr_reader :context
+        attr_reader :component
+
+        SELECTOR = ".chat-message-container:not(.has-thread-indicator)"
+
+        def initialize(context)
+          @context = context
+        end
+
+        def does_not_exist?(**args)
+          exists?(**args, does_not_exist: true)
+        end
+
+        def hover
+          component.hover
+        end
+
+        def open_more_menu
+          hover
+          click_more_button
+        end
+
+        def expand
+          component.find(".chat-message-expand").click
+        end
+
+        def select(shift: false)
+          if component[:class].include?("-selectable")
+            message_selector = component.find(".chat-message-selector")
+            if shift
+              message_selector.click(:shift)
+            else
+              message_selector.click
+            end
+
+            return
+          end
+
+          if page.has_css?("html.mobile-view", wait: 0)
+            component.click(delay: 0.6)
+            page.find(".chat-message-actions [data-id=\"select\"]").click
+          else
+            hover
+            click_more_button
+            page.find("[data-value='select']").click
+          end
+        end
+
+        def find(**args)
+          selector = build_selector(**args)
+          text = args[:text]
+          text = I18n.t("js.chat.deleted", count: args[:deleted]) if args[:deleted]
+
+          if text
+            @component =
+              find(context).find("#{selector} .chat-message-text", text: /#{Regexp.escape(text)}/)
+          else
+            @component = page.find(context).find(selector)
+          end
+
+          self
+        end
+
+        def exists?(**args)
+          selector = build_selector(**args)
+          text = args[:text]
+          text = I18n.t("js.chat.deleted", count: args[:deleted]) if args[:deleted]
+
+          selector_method = args[:does_not_exist] ? :has_no_selector? : :has_selector?
+
+          if text
+            page.find(context).send(
+              selector_method,
+              selector + " " + ".chat-message-text",
+              text: /#{Regexp.escape(text)}/,
+            )
+          else
+            page.find(context).send(selector_method, selector)
+          end
+        end
+
+        private
+
+        def click_more_button
+          page.find(".more-buttons").click
+        end
+
+        def build_selector(**args)
+          selector = SELECTOR
+          selector += "[data-id=\"#{args[:id]}\"]" if args[:id]
+          selector += ".-selected" if args[:selected]
+          selector += ".-persisted" if args[:persisted]
+          selector += ".-staged" if args[:staged]
+          selector += ".-deleted" if args[:deleted]
+          selector
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/page_objects/chat/components/message_creator.rb b/plugins/chat/spec/system/page_objects/chat/components/message_creator.rb
new file mode 100644
index 00000000000..d6e8c692eb9
--- /dev/null
+++ b/plugins/chat/spec/system/page_objects/chat/components/message_creator.rb
@@ -0,0 +1,143 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Components
+    module Chat
+      class MessageCreator < PageObjects::Components::Base
+        attr_reader :context
+
+        SELECTOR = ".chat-modal-new-message"
+
+        def component
+          find(SELECTOR)
+        end
+
+        def input
+          component.find(".chat-message-creator__input")
+        end
+
+        def filter(query = "")
+          input.fill_in(with: query)
+        end
+
+        def opened?
+          page.has_css?(SELECTOR)
+        end
+
+        def closed?
+          page.has_no_css?(SELECTOR)
+        end
+
+        def enter_shortcut
+          input.send_keys(:enter)
+        end
+
+        def backspace_shortcut
+          input.send_keys(:backspace)
+        end
+
+        def shift_enter_shortcut
+          input.send_keys(:shift, :enter)
+        end
+
+        def click_cta
+          component.find(".chat-message-creator__open-dm-btn").click
+        end
+
+        def arrow_left_shortcut
+          input.send_keys(:arrow_left)
+        end
+
+        def arrow_right_shortcut
+          input.send_keys(:arrow_right)
+        end
+
+        def arrow_down_shortcut
+          input.send_keys(:arrow_down)
+        end
+
+        def arrow_up_shortcut
+          input.send_keys(:arrow_up)
+        end
+
+        def listing?(chatable, **args)
+          component.has_css?(build_row_selector(chatable, **args))
+        end
+
+        def not_listing?(chatable, **args)
+          component.has_no_css?(build_row_selector(chatable, **args))
+        end
+
+        def selecting?(chatable, **args)
+          component.has_css?(build_item_selector(chatable, **args))
+        end
+
+        def not_selecting?(chatable, **args)
+          component.has_no_css?(build_item_selector(chatable, **args))
+        end
+
+        def click_item(chatable, **args)
+          component.find(build_item_selector(chatable, **args)).click
+        end
+
+        def click_row(chatable, **args)
+          component.find(build_row_selector(chatable, **args)).click
+        end
+
+        def shift_click_row(chatable, **args)
+          component.find(build_row_selector(chatable, **args)).click(:shift)
+        end
+
+        def has_unread_row?(chatable, **args)
+          unread_selector = build_row_selector(chatable, **args)
+          unread_selector += " .unread-indicator"
+          unread_selector += ".-urgent" if args[:urgent]
+          unread_selector += ":not(.-urgent)" unless args[:urgent]
+          component.has_css?(unread_selector)
+        end
+
+        def build_item_selector(chatable, **args)
+          selector = ".chat-message-creator__selection-item"
+          selector += content_selector(**args)
+          selector += chatable_selector(chatable)
+          selector
+        end
+
+        def build_row_selector(chatable, **args)
+          selector = ".chat-message-creator__row"
+          selector += content_selector(**args)
+          selector += chatable_selector(chatable, **args)
+          selector
+        end
+
+        def content_selector(**args)
+          selector = ""
+          selector = ".-disabled" if args[:disabled]
+          selector = ".-selected" if args[:selected]
+          selector = ":not(.-disabled)" if args[:enabled]
+          if args[:active]
+            selector += ".-active"
+          elsif args[:inactive]
+            selector += ":not(.-active)"
+          end
+          selector
+        end
+
+        def chatable_selector(chatable, **args)
+          selector = ""
+          if chatable.try(:category_channel?)
+            selector += ".-channel"
+            selector += "[data-id='c-#{chatable.id}']"
+          elsif chatable.try(:direct_message_channel?)
+            selector += ".-channel"
+            selector += "[data-id='c-#{chatable.id}']"
+          else
+            selector += ".-user"
+            selector += "[data-id='u-#{chatable.id}']"
+          end
+          selector
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/page_objects/chat/components/messages.rb b/plugins/chat/spec/system/page_objects/chat/components/messages.rb
new file mode 100644
index 00000000000..a9a2aceed7a
--- /dev/null
+++ b/plugins/chat/spec/system/page_objects/chat/components/messages.rb
@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Components
+    module Chat
+      class Messages < PageObjects::Components::Base
+        attr_reader :context
+
+        SELECTOR = ".chat-messages-scroll"
+
+        def initialize(context)
+          @context = context
+        end
+
+        def component
+          page.find(context)
+        end
+
+        def has_action?(action, **args)
+          message = find(args)
+          message.open_more_menu
+          page.has_css?("[data-value='#{action}']")
+        end
+
+        def has_no_action?(action, **args)
+          message = find(args)
+          message.open_more_menu
+          page.has_no_css?("[data-value='#{action}']")
+        end
+
+        def expand(**args)
+          find(args).expand
+        end
+
+        def select(args)
+          find(args).select
+        end
+
+        def shift_select(args)
+          find(args).select(shift: true)
+        end
+
+        def find(args)
+          if args.is_a?(Hash)
+            message.find(**args)
+          else
+            message.find(id: args.id)
+          end
+        end
+
+        def has_message?(**args)
+          message.exists?(**args)
+        end
+
+        def has_no_message?(**args)
+          message.does_not_exist?(**args)
+        end
+
+        def has_selected_messages?(*messages)
+          messages.all? { |message| has_message?(id: message.id, selected: true) }
+        end
+
+        def has_deleted_messages?(*messages)
+          messages.all? { |message| has_message?(id: message.id, deleted: 1) }
+        end
+
+        def has_deleted_message?(message, count: 1)
+          has_message?(id: message.id, deleted: count)
+        end
+
+        private
+
+        def message
+          PageObjects::Components::Chat::Message.new("#{context} #{SELECTOR}")
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/page_objects/chat/components/selection_management.rb b/plugins/chat/spec/system/page_objects/chat/components/selection_management.rb
new file mode 100644
index 00000000000..3d89b6e6696
--- /dev/null
+++ b/plugins/chat/spec/system/page_objects/chat/components/selection_management.rb
@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Components
+    module Chat
+      class SelectionManagement < PageObjects::Components::Base
+        attr_reader :context
+
+        SELECTOR = ".chat-selection-management"
+
+        def initialize(context)
+          @context = context
+        end
+
+        def visible?
+          find(context).has_css?(SELECTOR)
+        end
+
+        def not_visible?
+          find(context).has_no_css?(SELECTOR)
+        end
+
+        def has_no_move_action?
+          has_no_button?(selector_for("move"))
+        end
+
+        def has_move_action?
+          has_button?(selector_for("move"))
+        end
+
+        def component
+          find(context).find(SELECTOR)
+        end
+
+        def cancel
+          click_button("cancel")
+        end
+
+        def quote
+          click_button("quote")
+        end
+
+        def copy
+          click_button("copy")
+        end
+
+        def move
+          click_button("move")
+        end
+
+        private
+
+        def selector_for(action)
+          case action
+          when "quote"
+            "chat-quote-btn"
+          when "copy"
+            "chat-copy-btn"
+          when "cancel"
+            "chat-cancel-selection-btn"
+          when "move"
+            "chat-move-to-channel-btn"
+          end
+        end
+
+        def click_button(action)
+          find_button(selector_for(action), disabled: false).click
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/page_objects/chat/components/sidebar.rb b/plugins/chat/spec/system/page_objects/chat/components/sidebar.rb
new file mode 100644
index 00000000000..95984bfbbe4
--- /dev/null
+++ b/plugins/chat/spec/system/page_objects/chat/components/sidebar.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Components
+    module Chat
+      class Sidebar < PageObjects::Components::Base
+        attr_reader :context
+
+        SELECTOR = "#d-sidebar"
+
+        def component
+          page.find(SELECTOR)
+        end
+
+        def has_direct_message_channel?(channel, **args)
+          channel_selector = direct_message_channel_selector(channel, **args)
+          predicate = component.has_css?(channel_selector)
+
+          if args[:unread]
+            predicate &&
+              component.has_css?("#{channel_selector} .sidebar-section-link-suffix.icon.unread")
+          elsif args[:mention]
+            predicate &&
+              component.has_css?("#{channel_selector} .sidebar-section-link-suffix.icon.urgent")
+          else
+            predicate &&
+              component.has_no_css?("#{channel_selector} .sidebar-section-link-suffix.icon")
+          end
+        end
+
+        def has_no_direct_message_channel?(channel, **args)
+          component.has_no_css?(direct_message_channel_selector(channel, **args))
+        end
+
+        def direct_message_channel_selector(channel, **args)
+          selector = "#sidebar-section-content-chat-dms"
+          selector += " .sidebar-section-link.channel-#{channel.id}"
+          selector
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/page_objects/chat/components/thread_header.rb b/plugins/chat/spec/system/page_objects/chat/components/thread_header.rb
new file mode 100644
index 00000000000..c8f75a67b64
--- /dev/null
+++ b/plugins/chat/spec/system/page_objects/chat/components/thread_header.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Components
+    module Chat
+      class ThreadHeader < PageObjects::Components::Base
+        attr_reader :context
+
+        SELECTOR = ".chat-thread-header"
+
+        def initialize(context)
+          @context = context
+        end
+
+        def component
+          find(context)
+        end
+
+        def has_content?(content)
+          component.find(SELECTOR).has_content?(content)
+        end
+
+        def has_title_content?(content)
+          component.find(SELECTOR + " .chat-thread-header__label").has_content?(content)
+        end
+
+        def open_settings
+          component.find(SELECTOR + " .chat-thread-header__settings").click
+        end
+
+        def has_no_settings_button?
+          component.has_no_css?(SELECTOR + " .chat-thread-header__settings")
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/page_objects/chat/components/thread_indicator.rb b/plugins/chat/spec/system/page_objects/chat/components/thread_indicator.rb
new file mode 100644
index 00000000000..7eab3824b68
--- /dev/null
+++ b/plugins/chat/spec/system/page_objects/chat/components/thread_indicator.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Components
+    module Chat
+      class ThreadIndicator < PageObjects::Components::Base
+        attr_reader :context
+
+        SELECTOR = ".chat-message-thread-indicator"
+
+        def initialize(context)
+          @context = context
+        end
+
+        def click
+          find(@context).find(SELECTOR).click
+        end
+
+        def exists?(**args)
+          find(@context).has_css?(SELECTOR)
+        end
+
+        def does_not_exist?(**args)
+          find(@context).has_no_css?(SELECTOR)
+        end
+
+        def has_reply_count?(count)
+          find(@context).has_css?(
+            "#{SELECTOR}__replies-count",
+            text: I18n.t("js.chat.thread.replies", count: count),
+          )
+        end
+
+        def has_participant?(user)
+          find(@context).has_css?(
+            ".chat-thread-participants__avatar-group .chat-user-avatar .chat-user-avatar__container[data-user-card=\"#{user.username}\"] img",
+          )
+        end
+
+        def has_no_participants?
+          find(@context).has_no_css?(".chat-thread-participants")
+        end
+
+        def excerpt
+          find(@context).find("#{SELECTOR}__last-reply-excerpt")
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/page_objects/chat/components/thread_list.rb b/plugins/chat/spec/system/page_objects/chat/components/thread_list.rb
new file mode 100644
index 00000000000..09bb11757ef
--- /dev/null
+++ b/plugins/chat/spec/system/page_objects/chat/components/thread_list.rb
@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Components
+    module Chat
+      class ThreadList < PageObjects::Components::Base
+        SELECTOR = ".chat-thread-list"
+
+        def component
+          find(SELECTOR)
+        end
+
+        def has_loaded?
+          component.has_css?(".spinner", wait: 0)
+          component.has_no_css?(".spinner")
+        end
+
+        def open_thread(thread)
+          item_by_id(thread.id).click
+        end
+
+        def has_thread?(thread)
+          item_by_id(thread.id)
+        end
+
+        def has_threads?(count:)
+          component.has_css?(".chat-thread-list-item", count: count)
+        end
+
+        def has_no_thread?(thread)
+          component.has_no_css?(item_by_id_selector(thread.id))
+        end
+
+        def item_by_id(id)
+          component.find(item_by_id_selector(id), visible: :all)
+        end
+
+        def avatar_selector(user)
+          ".chat-thread-list-item__om-user-avatar .chat-user-avatar .chat-user-avatar__container[data-user-card=\"#{user.username}\"] img"
+        end
+
+        def last_reply_datetime_selector(last_reply)
+          ".chat-thread-list-item__last-reply .relative-date[data-time='#{(last_reply.created_at.iso8601.to_time.to_f * 1000).to_i}']"
+        end
+
+        def has_no_unread_item?(id)
+          component.has_no_css?(item_by_id_selector(id) + ".-is-unread")
+        end
+
+        def has_unread_item?(id, count: nil)
+          if count.nil?
+            component.has_css?(item_by_id_selector(id) + ".-is-unread")
+          else
+            component.has_css?(
+              item_by_id_selector(id) +
+                ".-is-unread .chat-thread-list-item-unread-indicator__number",
+              text: count.to_s,
+            )
+          end
+        end
+
+        def has_no_unread_item?(id)
+          component.has_no_css?(item_by_id_selector(id) + ".-is-unread")
+        end
+
+        def item_by_id_selector(id)
+          ".chat-thread-list__items .chat-thread-list-item[data-thread-id=\"#{id}\"]"
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/page_objects/chat_drawer/chat_drawer.rb b/plugins/chat/spec/system/page_objects/chat_drawer/chat_drawer.rb
index e49a1070162..8a71764a2a9 100644
--- a/plugins/chat/spec/system/page_objects/chat_drawer/chat_drawer.rb
+++ b/plugins/chat/spec/system/page_objects/chat_drawer/chat_drawer.rb
@@ -4,32 +4,89 @@ module PageObjects
   module Pages
     class ChatDrawer < PageObjects::Pages::Base
       VISIBLE_DRAWER = ".chat-drawer.is-expanded"
+
+      def channel_index
+        @channel_index ||= ::PageObjects::Components::Chat::ChannelIndex.new(VISIBLE_DRAWER)
+      end
+
       def open_browse
+        mouseout
         find("#{VISIBLE_DRAWER} .open-browse-page-btn").click
       end
 
-      def open_draft_channel
-        find("#{VISIBLE_DRAWER} .open-draft-channel-page-btn").click
-      end
-
       def close
+        mouseout
         find("#{VISIBLE_DRAWER} .chat-drawer-header__close-btn").click
       end
 
-      def open_index
-        find("#{VISIBLE_DRAWER} .chat-drawer-header__return-to-channels-btn").click
+      def back
+        mouseout
+        find("#{VISIBLE_DRAWER} .chat-drawer-header__back-btn").click
       end
 
       def open_channel(channel)
-        find(
-          "#{VISIBLE_DRAWER} .channels-list .chat-channel-row[data-chat-channel-id='#{channel.id}']",
-        ).click
+        channel_index.open_channel(channel)
         has_no_css?(".chat-skeleton")
       end
 
+      def has_unread_channel?(channel)
+        channel_index.has_unread_channel?(channel)
+      end
+
+      def has_no_unread_channel?(channel)
+        channel_index.has_no_unread_channel?(channel)
+      end
+
       def maximize
+        mouseout
         find("#{VISIBLE_DRAWER} .chat-drawer-header__full-screen-btn").click
       end
+
+      def has_open_thread?(thread = nil)
+        if thread
+          has_css?("#{VISIBLE_DRAWER} .chat-thread[data-id='#{thread.id}']")
+        else
+          has_css?("#{VISIBLE_DRAWER} .chat-thread")
+        end
+      end
+
+      def has_open_channel?(channel)
+        has_css?("#{VISIBLE_DRAWER} .chat-channel[data-id='#{channel.id}']")
+      end
+
+      def has_open_thread_list?
+        has_css?("#{VISIBLE_DRAWER} .chat-thread-list")
+      end
+
+      def open_thread_list
+        find(thread_list_button_selector).click
+      end
+
+      def thread_list_button_selector
+        ".chat-threads-list-button"
+      end
+
+      def has_unread_thread_indicator?(count:)
+        has_css?("#{thread_list_button_selector}.has-unreads") &&
+          has_css?(
+            ".chat-thread-header-unread-indicator .chat-thread-header-unread-indicator__number",
+            text: count.to_s,
+          )
+      end
+
+      def has_no_unread_thread_indicator?
+        has_no_css?("#{thread_list_button_selector}.has-unreads")
+      end
+
+      private
+
+      def mouseout
+        # Ensure that the mouse is not hovering over the drawer
+        # and that the message actions menu is closed.
+        # This check is essential because the message actions menu might partially
+        # overlap with the header, making certain buttons inaccessible.
+        find("#site-logo").hover
+      end
     end
   end
 end
diff --git a/plugins/chat/spec/system/page_objects/modals/chat_channel_create.rb b/plugins/chat/spec/system/page_objects/modals/chat_channel_create.rb
new file mode 100644
index 00000000000..228760729cb
--- /dev/null
+++ b/plugins/chat/spec/system/page_objects/modals/chat_channel_create.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Modals
+    class ChatChannelCreate < PageObjects::Modals::Base
+      def select_category(category)
+        find(".category-chooser").click
+        find(".category-row[data-value=\"#{category.id}\"]").click
+      end
+
+      def create_channel_hint
+        find(".chat-modal-create-channel__hint")
+      end
+
+      def slug_input
+        find(".-slug .chat-modal-create-channel__input")
+      end
+
+      def has_create_hint?(content)
+        create_channel_hint.has_content?(content)
+      end
+
+      def has_threading_toggle?
+        has_selector?(".chat-modal-create-channel__control.-threading-toggle")
+      end
+
+      def fill_name(name)
+        fill_in("name", with: name)
+      end
+
+      def fill_slug(slug)
+        fill_in("slug", with: slug)
+      end
+
+      def fill_description(description)
+        fill_in("description", with: description)
+      end
+
+      def has_name_prefilled?(name)
+        has_field?("name", with: name)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/page_objects/modals/chat_edit_modal.rb b/plugins/chat/spec/system/page_objects/modals/chat_edit_modal.rb
new file mode 100644
index 00000000000..d678db64485
--- /dev/null
+++ b/plugins/chat/spec/system/page_objects/modals/chat_edit_modal.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Modals
+    class ChatChannelEdit < PageObjects::Modals::Base
+      include SystemHelpers
+
+      EDIT_MODAL_SELECTOR = PageObjects::Pages::ChatChannelAbout::EDIT_MODAL_SELECTOR
+      SLUG_INPUT_SELECTOR = ".chat-channel-edit-name-slug-modal__slug-input"
+      NAME_INPUT_SELECTOR = ".chat-channel-edit-name-slug-modal__name-input"
+
+      def fill_in_slug(slug)
+        within(EDIT_MODAL_SELECTOR) { find(SLUG_INPUT_SELECTOR).fill_in(with: slug) }
+
+        self
+      end
+
+      def wait_for_auto_generated_slug
+        wait_for_attribute(page.find(SLUG_INPUT_SELECTOR), :placeholder, "test-channel")
+      end
+
+      def fill_in_slug_input(slug)
+        within(EDIT_MODAL_SELECTOR) { find(SLUG_INPUT_SELECTOR).fill_in(with: slug) }
+      end
+
+      def save_changes(successful: true)
+        within(EDIT_MODAL_SELECTOR) { click_button(I18n.t("js.save")) }
+
+        # ensures modal is closed after successfully saving
+        page.has_no_css?(EDIT_MODAL_SELECTOR) if successful
+      end
+
+      def fill_and_save_slug(slug)
+        fill_in_slug_input(slug)
+        save_changes
+        self
+      end
+
+      def fill_in_name_input(name)
+        within(EDIT_MODAL_SELECTOR) { find(NAME_INPUT_SELECTOR).fill_in(with: name) }
+      end
+
+      def fill_and_save_name(name)
+        fill_in_name_input(name)
+        save_changes
+        self
+      end
+
+      def has_slug_input?(value)
+        within(EDIT_MODAL_SELECTOR) { find(SLUG_INPUT_SELECTOR).value == value }
+      end
+
+      def has_name_input?(value)
+        within(EDIT_MODAL_SELECTOR) { find(NAME_INPUT_SELECTOR).value == value }
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/page_objects/sidebar/sidebar.rb b/plugins/chat/spec/system/page_objects/sidebar/sidebar.rb
index e416e67c897..448c9e5b0b1 100644
--- a/plugins/chat/spec/system/page_objects/sidebar/sidebar.rb
+++ b/plugins/chat/spec/system/page_objects/sidebar/sidebar.rb
@@ -3,22 +3,53 @@
 module PageObjects
   module Pages
     class Sidebar < PageObjects::Pages::Base
-      def open_draft_channel
-        find(".sidebar-section-chat-dms .sidebar-section-header-button", visible: false).click
+      PUBLIC_CHANNELS_SECTION_SELECTOR = ".sidebar-section[data-section-name='chat-channels']"
+      DM_CHANNELS_SECTION_SELECTOR = ".sidebar-section[data-section-name='chat-dms']"
+
+      def has_no_public_channels_section?
+        has_no_css?(PUBLIC_CHANNELS_SECTION_SELECTOR)
+      end
+
+      def channels_section
+        find(PUBLIC_CHANNELS_SECTION_SELECTOR)
+      end
+
+      def channels_section
+        find(PUBLIC_CHANNELS_SECTION_SELECTOR)
+      end
+
+      def dms_section
+        find(DM_CHANNELS_SECTION_SELECTOR)
       end
 
       def open_browse
-        find(".sidebar-section-chat-channels .sidebar-section-header-button", visible: false).click
+        channels_section.find(".sidebar-section-header-button", visible: false).click
       end
 
       def open_channel(channel)
-        find(".sidebar-section-link[href='/chat/channel/#{channel.id}/#{channel.slug}']").click
+        find(".sidebar-section-link.channel-#{channel.id}").click
+      end
+
+      def remove_channel(channel)
+        selector = ".sidebar-section-link.channel-#{channel.id}"
+        find(selector).hover
+        find(selector + " .sidebar-section-hover-button").click
       end
 
       def find_channel(channel)
-        find(".sidebar-section-link[href='/chat/channel/#{channel.id}/#{channel.slug}']")
+        find(".sidebar-section-link.channel-#{channel.id}")
         self
       end
+
+      def has_unread_channel?(channel)
+        has_css?(".sidebar-section-link.channel-#{channel.id} .sidebar-section-link-suffix.unread")
+      end
+
+      def has_no_unread_channel?(channel)
+        has_no_css?(
+          ".sidebar-section-link.channel-#{channel.id} .sidebar-section-link-suffix.unread",
+        )
+      end
     end
   end
 end
diff --git a/plugins/chat/spec/system/react_to_message_spec.rb b/plugins/chat/spec/system/react_to_message_spec.rb
index 311ead6de1b..50acaed31dc 100644
--- a/plugins/chat/spec/system/react_to_message_spec.rb
+++ b/plugins/chat/spec/system/react_to_message_spec.rb
@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
-RSpec.describe "React to message", type: :system, js: true do
-  fab!(:current_user) { Fabricate(:user) }
+RSpec.describe "React to message", type: :system do
+  fab!(:current_user) { Fabricate(:user, group_ids: [Group::AUTO_GROUPS[:trust_level_1]]) }
+  fab!(:other_user) { Fabricate(:user, group_ids: [Group::AUTO_GROUPS[:trust_level_1]]) }
   fab!(:category_channel_1) { Fabricate(:category_channel) }
   fab!(:message_1) { Fabricate(:chat_message, chat_channel: category_channel_1) }
 
@@ -11,12 +12,12 @@ RSpec.describe "React to message", type: :system, js: true do
   before do
     chat_system_bootstrap
     category_channel_1.add(current_user)
-    sign_in(current_user)
+    category_channel_1.add(other_user)
   end
 
   context "when other user has reacted" do
     fab!(:reaction_1) do
-      Chat::ChatMessageReactor.new(Fabricate(:user), category_channel_1).react!(
+      Chat::MessageReactor.new(other_user, category_channel_1).react!(
         message_id: message_1.id,
         react_action: :add,
         emoji: "female_detective",
@@ -25,14 +26,16 @@ RSpec.describe "React to message", type: :system, js: true do
 
     shared_examples "inline reactions" do
       it "shows existing reactions under the message" do
+        sign_in(current_user)
         chat.visit_channel(category_channel_1)
-        expect(channel).to have_reaction(message_1, reaction_1)
+        expect(channel).to have_reaction(message_1, reaction_1.emoji)
       end
 
       it "increments when clicking it" do
+        sign_in(current_user)
         chat.visit_channel(category_channel_1)
-        channel.click_reaction(message_1, reaction_1)
-        expect(channel).to have_reaction(message_1, reaction_1, 2)
+        channel.click_reaction(message_1, reaction_1.emoji)
+        expect(channel).to have_reaction(message_1, reaction_1.emoji, 2)
       end
     end
 
@@ -47,7 +50,7 @@ RSpec.describe "React to message", type: :system, js: true do
 
   context "when current user reacts" do
     fab!(:reaction_1) do
-      Chat::ChatMessageReactor.new(Fabricate(:user), category_channel_1).react!(
+      Chat::MessageReactor.new(other_user, category_channel_1).react!(
         message_id: message_1.id,
         react_action: :add,
         emoji: "female_detective",
@@ -57,50 +60,73 @@ RSpec.describe "React to message", type: :system, js: true do
     context "when desktop" do
       context "when using inline reaction button" do
         it "adds a reaction" do
+          sign_in(current_user)
           chat.visit_channel(category_channel_1)
           channel.hover_message(message_1)
           find(".chat-message-react-btn").click
-          find(".chat-emoji-picker [data-emoji=\"nerd_face\"]").click
+          find(".chat-emoji-picker [data-emoji=\"grimacing\"]").click
 
-          expect(channel).to have_reaction(message_1, reaction_1)
+          expect(channel).to have_reaction(message_1, "grimacing")
         end
 
-        xit "adds the reaction to the frequently used list" do
-          chat.visit_channel(category_channel_1)
-          channel.hover_message(message_1)
-          find(".chat-message-react-btn").click
-          find(".chat-emoji-picker [data-emoji=\"nerd_face\"]").click
+        context "when current user has multiple sessions" do
+          xit "adds reaction on each session" do
+            reaction = "grimacing"
 
-          channel.hover_message(message_1)
+            sign_in(current_user)
+            chat.visit_channel(category_channel_1)
+
+            using_session(:tab_1) do
+              sign_in(current_user)
+              chat.visit_channel(category_channel_1)
+            end
+
+            using_session(:tab_1) do |session|
+              channel.hover_message(message_1)
+              find(".chat-message-react-btn").click
+              find(".chat-emoji-picker [data-emoji=\"#{reaction}\"]").click
+
+              expect(channel).to have_reaction(message_1, reaction)
+
+              session.quit
+            end
+
+            expect(channel).to have_reaction(message_1, "grimacing")
+          end
         end
       end
 
       context "when using message actions menu" do
         context "when using the emoji picker" do
           it "adds a reaction" do
+            sign_in(current_user)
             chat.visit_channel(category_channel_1)
             channel.hover_message(message_1)
             find(".chat-message-actions .react-btn").click
             find(".chat-emoji-picker [data-emoji=\"nerd_face\"]").click
 
-            expect(channel).to have_reaction(message_1, reaction_1)
+            expect(channel).to have_reaction(message_1, reaction_1.emoji)
           end
 
-          xit "adds the reaction to the frequently used list" do
+          it "removes denied emojis and aliases from reactions" do
+            SiteSetting.emoji_deny_list = "fu"
+
+            sign_in(current_user)
             chat.visit_channel(category_channel_1)
             channel.hover_message(message_1)
             find(".chat-message-actions .react-btn").click
-            find(".chat-emoji-picker [data-emoji=\"nerd_face\"]").click
 
-            channel.hover_message(message_1)
+            expect(page).to have_no_css(".chat-emoji-picker [data-emoji=\"fu\"]")
+            expect(page).to have_no_css(".chat-emoji-picker [data-emoji=\"middle_finger\"]")
           end
         end
 
         context "when using frequent reactions" do
           it "adds a reaction" do
+            sign_in(current_user)
             chat.visit_channel(category_channel_1)
             channel.hover_message(message_1)
-            find(".chat-message-actions [data-emoji-name=\"+1\"").click
+            find(".chat-message-actions [data-emoji-name=\"+1\"]").click
 
             expect(channel.message_reactions_list(message_1)).to have_css(
               "[data-emoji-name=\"+1\"]",
@@ -111,9 +137,45 @@ RSpec.describe "React to message", type: :system, js: true do
     end
   end
 
+  context "when current user and another have reacted" do
+    fab!(:other_user) { Fabricate(:user, group_ids: [Group::AUTO_GROUPS[:trust_level_1]]) }
+
+    fab!(:reaction_1) do
+      Chat::MessageReactor.new(current_user, category_channel_1).react!(
+        message_id: message_1.id,
+        react_action: :add,
+        emoji: "female_detective",
+      )
+    end
+
+    fab!(:reaction_2) do
+      Chat::MessageReactor.new(other_user, category_channel_1).react!(
+        message_id: message_1.id,
+        react_action: :add,
+        emoji: "female_detective",
+      )
+    end
+
+    context "when removing the reaction" do
+      it "removes only the reaction from the current user" do
+        sign_in(current_user)
+        chat.visit_channel(category_channel_1)
+
+        expect(channel).to have_reaction(message_1, "female_detective", "2")
+
+        channel.click_reaction(message_1, "female_detective")
+
+        expect(channel).to have_reaction(message_1, "female_detective", "1")
+        expect(
+          channel.find_reaction(message_1, "female_detective")["data-tippy-content"],
+        ).to include(other_user.username)
+      end
+    end
+  end
+
   context "when current user has reacted" do
     fab!(:reaction_1) do
-      Chat::ChatMessageReactor.new(current_user, category_channel_1).react!(
+      Chat::MessageReactor.new(current_user, category_channel_1).react!(
         message_id: message_1.id,
         react_action: :add,
         emoji: "female_detective",
@@ -122,13 +184,15 @@ RSpec.describe "React to message", type: :system, js: true do
 
     shared_examples "inline reactions" do
       it "shows existing reactions under the message" do
+        sign_in(current_user)
         chat.visit_channel(category_channel_1)
-        expect(channel).to have_reaction(message_1, reaction_1)
+        expect(channel).to have_reaction(message_1, reaction_1.emoji)
       end
 
       it "removes it when clicking it" do
+        sign_in(current_user)
         chat.visit_channel(category_channel_1)
-        channel.click_reaction(message_1, reaction_1)
+        channel.click_reaction(message_1, reaction_1.emoji)
         expect(channel).to have_no_reactions(message_1)
       end
     end
@@ -140,5 +204,27 @@ RSpec.describe "React to message", type: :system, js: true do
     context "when mobile", mobile: true do
       include_examples "inline reactions"
     end
+
+    context "when receiving a duplicate reaction event" do
+      fab!(:user_1) { Fabricate(:user, group_ids: [Group::AUTO_GROUPS[:trust_level_1]]) }
+
+      fab!(:reaction_2) do
+        Chat::MessageReactor.new(user_1, category_channel_1).react!(
+          message_id: message_1.id,
+          react_action: :add,
+          emoji: "heart",
+        )
+      end
+
+      it "doesn’t create duplicate reactions" do
+        sign_in(current_user)
+        chat.visit_channel(category_channel_1)
+
+        Chat::Publisher.publish_reaction!(category_channel_1, message_1, "add", user_1, "heart")
+        channel.send_message("test") # cheap trick to ensure reaction has been processed
+
+        expect(channel).to have_reaction(message_1, reaction_2.emoji, "1")
+      end
+    end
   end
 end
diff --git a/plugins/chat/spec/system/read_only_spec.rb b/plugins/chat/spec/system/read_only_spec.rb
index 3610e55020e..d3023c3bfe4 100644
--- a/plugins/chat/spec/system/read_only_spec.rb
+++ b/plugins/chat/spec/system/read_only_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "Read only", type: :system, js: true do
+RSpec.describe "Read only", type: :system do
   fab!(:channel_1) { Fabricate(:chat_channel) }
 
   let(:chat) { PageObjects::Pages::Chat.new }
@@ -30,7 +30,7 @@ RSpec.describe "Read only", type: :system, js: true do
       chat.visit_channel(channel_1)
 
       expect(page).to have_field(
-        placeholder: I18n.t("js.chat.placeholder_new_message_disallowed", status: "read only"),
+        placeholder: I18n.t("js.chat.placeholder_new_message_disallowed.read_only"),
         disabled: true,
       )
     end
@@ -50,7 +50,7 @@ RSpec.describe "Read only", type: :system, js: true do
       chat.visit_channel(channel_1)
 
       expect(page).to have_field(
-        placeholder: I18n.t("js.chat.placeholder_new_message_disallowed", status: "read only"),
+        placeholder: I18n.t("js.chat.placeholder_new_message_disallowed.read_only"),
         disabled: true,
       )
     end
diff --git a/plugins/chat/spec/system/removing_channel_spec.rb b/plugins/chat/spec/system/removing_channel_spec.rb
new file mode 100644
index 00000000000..b52bdac3442
--- /dev/null
+++ b/plugins/chat/spec/system/removing_channel_spec.rb
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+RSpec.describe "Removing channel", type: :system do
+  fab!(:current_user) { Fabricate(:user) }
+
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:chat_sidebar_page) { PageObjects::Pages::Sidebar.new }
+
+  before do
+    chat_system_bootstrap
+    sign_in(current_user)
+  end
+
+  context "when removing last followed channel" do
+    fab!(:channel_1) { Fabricate(:chat_channel) }
+    fab!(:channel_2) { Fabricate(:direct_message_channel, users: [current_user, Fabricate(:user)]) }
+
+    before do
+      Fabricate(
+        :user_chat_channel_membership,
+        user: current_user,
+        chat_channel: channel_1,
+        following: false,
+      )
+    end
+
+    it "redirects to browse page" do
+      chat_page.visit_channel(channel_2)
+      chat_sidebar_page.remove_channel(channel_2)
+
+      expect(page).to have_current_path("/chat/browse/open")
+    end
+  end
+
+  context "when removing channel" do
+    fab!(:channel_1) { Fabricate(:chat_channel) }
+    fab!(:channel_2) { Fabricate(:direct_message_channel, users: [current_user, Fabricate(:user)]) }
+
+    before { channel_1.add(current_user) }
+
+    it "redirects to another followed channgel" do
+      chat_page.visit_channel(channel_2)
+      chat_sidebar_page.remove_channel(channel_2)
+
+      expect(page).to have_current_path(chat.channel_path(channel_1.slug, channel_1.id))
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/reply_to_message/drawer_spec.rb b/plugins/chat/spec/system/reply_to_message/drawer_spec.rb
new file mode 100644
index 00000000000..7d327511cf2
--- /dev/null
+++ b/plugins/chat/spec/system/reply_to_message/drawer_spec.rb
@@ -0,0 +1,101 @@
+# frozen_string_literal: true
+
+RSpec.describe "Reply to message - channel - drawer", type: :system do
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:channel_page) { PageObjects::Pages::ChatChannel.new }
+  let(:thread_page) { PageObjects::Pages::ChatThread.new }
+  let(:drawer_page) { PageObjects::Pages::ChatDrawer.new }
+
+  fab!(:current_user) { Fabricate(:user) }
+  fab!(:channel_1) { Fabricate(:category_channel) }
+  fab!(:original_message) do
+    Fabricate(
+      :chat_message,
+      chat_channel: channel_1,
+      user: Fabricate(:user),
+      message: "This is a message to reply to!",
+    )
+  end
+
+  before do
+    chat_system_bootstrap
+    channel_1.update!(threading_enabled: true)
+    channel_1.add(current_user)
+    sign_in(current_user)
+  end
+
+  context "when the message has not current thread" do
+    it "starts a thread" do
+      visit("/")
+      chat_page.open_from_header
+      drawer_page.open_channel(channel_1)
+      channel_page.reply_to(original_message)
+
+      expect(drawer_page).to have_open_thread
+
+      thread_page.send_message("reply to message")
+
+      expect(thread_page.messages).to have_message(text: "reply to message")
+
+      drawer_page.back
+
+      expect(channel_page).to have_thread_indicator(original_message)
+    end
+  end
+
+  context "when the message has an existing thread" do
+    fab!(:message_1) do
+      creator =
+        Chat::MessageCreator.new(
+          chat_channel: channel_1,
+          in_reply_to_id: original_message.id,
+          user: Fabricate(:user),
+          content: Faker::Lorem.paragraph,
+        )
+      creator.create
+      creator.chat_message
+    end
+
+    it "replies to the existing thread" do
+      visit("/")
+      chat_page.open_from_header
+      drawer_page.open_channel(channel_1)
+
+      expect(channel_page.message_thread_indicator(original_message)).to have_reply_count(1)
+
+      channel_page.reply_to(original_message)
+
+      expect(drawer_page).to have_open_thread
+
+      thread_page.send_message("reply to message")
+
+      expect(thread_page.messages).to have_message(text: message_1.message)
+      expect(thread_page.messages).to have_message(text: "reply to message")
+
+      drawer_page.back
+
+      expect(channel_page.message_thread_indicator(original_message)).to have_reply_count(2)
+      expect(channel_page.messages).to have_no_message(text: "reply to message")
+    end
+  end
+
+  context "with threading disabled" do
+    before { channel_1.update!(threading_enabled: false) }
+
+    it "makes a reply in the channel" do
+      visit("/")
+      chat_page.open_from_header
+      drawer_page.open_channel(channel_1)
+      channel_page.reply_to(original_message)
+
+      expect(page).to have_selector(
+        ".chat-channel .chat-reply__excerpt",
+        text: original_message.excerpt,
+      )
+
+      channel_page.send_message("reply to message")
+
+      expect(channel_page.messages).to have_message(text: "reply to message")
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/reply_to_message/full_page_spec.rb b/plugins/chat/spec/system/reply_to_message/full_page_spec.rb
new file mode 100644
index 00000000000..0725938994a
--- /dev/null
+++ b/plugins/chat/spec/system/reply_to_message/full_page_spec.rb
@@ -0,0 +1,118 @@
+# frozen_string_literal: true
+
+RSpec.describe "Reply to message - channel - full page", type: :system do
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:channel_page) { PageObjects::Pages::ChatChannel.new }
+  let(:thread_page) { PageObjects::Pages::ChatThread.new }
+  let(:side_panel_page) { PageObjects::Pages::ChatSidePanel.new }
+
+  fab!(:current_user) { Fabricate(:user) }
+  fab!(:channel_1) { Fabricate(:category_channel) }
+  fab!(:original_message) do
+    Fabricate(
+      :chat_message,
+      chat_channel: channel_1,
+      user: Fabricate(:user),
+      message: "This is a message to reply to!",
+    )
+  end
+
+  before do
+    chat_system_bootstrap
+    channel_1.add(current_user)
+    sign_in(current_user)
+    channel_1.update!(threading_enabled: true)
+  end
+
+  context "when the message has not current thread" do
+    it "starts a thread" do
+      chat_page.visit_channel(channel_1)
+      channel_page.reply_to(original_message)
+
+      expect(side_panel_page).to have_open_thread
+
+      thread_page.fill_composer("reply to message")
+      thread_page.click_send_message
+
+      expect(thread_page).to have_message(text: "reply to message")
+      expect(channel_page).to have_thread_indicator(original_message)
+    end
+
+    context "when reloading after creating thread" do
+      it "correctly loads the thread" do
+        chat_page.visit_channel(channel_1)
+        channel_page.reply_to(original_message)
+        thread_page.fill_composer("reply to message")
+        thread_page.click_send_message
+
+        expect(thread_page).to have_message(text: "reply to message")
+        expect(channel_page).to have_thread_indicator(original_message)
+
+        refresh
+
+        expect(thread_page).to have_message(text: "reply to message")
+      end
+    end
+  end
+
+  context "when the message has an existing thread" do
+    fab!(:message_1) do
+      Fabricate(:chat_message, chat_channel: channel_1, in_reply_to: original_message)
+    end
+
+    before { original_message.thread.add(current_user) }
+
+    it "replies to the existing thread" do
+      chat_page.visit_channel(channel_1)
+
+      expect(channel_page.message_thread_indicator(original_message)).to have_reply_count(1)
+
+      channel_page.reply_to(original_message)
+
+      expect(side_panel_page).to have_open_thread
+
+      message = thread_page.send_message
+
+      expect(thread_page.messages).to have_message(text: message_1.message)
+      expect(thread_page.messages).to have_message(text: message)
+      expect(channel_page.message_thread_indicator(original_message)).to have_reply_count(2)
+      expect(channel_page.messages).to have_no_message(text: message)
+    end
+  end
+
+  context "with threading disabled" do
+    before { channel_1.update!(threading_enabled: false) }
+
+    it "makes a reply in the channel" do
+      chat_page.visit_channel(channel_1)
+      channel_page.reply_to(original_message)
+
+      expect(page).to have_selector(
+        ".chat-channel .chat-reply__excerpt",
+        text: original_message.excerpt,
+      )
+
+      channel_page.fill_composer("reply to message")
+      channel_page.click_send_message
+
+      expect(channel_page).to have_message(text: "reply to message")
+    end
+
+    it "renders safe HTML from the original message excerpt" do
+      other_user = Fabricate(:user)
+      original_message.update!(message: "@#{other_user.username} <mark>not marked</mark>")
+      original_message.rebake!
+      chat_page.visit_channel(channel_1)
+      channel_page.reply_to(original_message)
+
+      expect(find(".chat-reply .chat-reply__excerpt")["innerHTML"].strip).to eq(
+        "<a class=\"mention\" href=\"/u/#{other_user.username}\">@#{other_user.username}</a> &lt;mark&gt;not marked&lt;/mark&gt;",
+      )
+
+      channel_page.fill_composer("reply to message")
+      channel_page.click_send_message
+
+      expect(channel_page).to have_message(text: "reply to message")
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/reply_to_message/mobile_spec.rb b/plugins/chat/spec/system/reply_to_message/mobile_spec.rb
new file mode 100644
index 00000000000..b425cb363aa
--- /dev/null
+++ b/plugins/chat/spec/system/reply_to_message/mobile_spec.rb
@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+RSpec.describe "Reply to message - channel - mobile", type: :system, mobile: true do
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:channel_page) { PageObjects::Pages::ChatChannel.new }
+  let(:thread_page) { PageObjects::Pages::ChatThread.new }
+  let(:side_panel_page) { PageObjects::Pages::ChatSidePanel.new }
+
+  fab!(:current_user) { Fabricate(:user) }
+  fab!(:channel_1) { Fabricate(:category_channel) }
+  fab!(:original_message) do
+    Fabricate(
+      :chat_message,
+      chat_channel: channel_1,
+      user: Fabricate(:user),
+      message: "This is a message to reply to!",
+    )
+  end
+
+  before do
+    chat_system_bootstrap
+    channel_1.update!(threading_enabled: true)
+    channel_1.add(current_user)
+    sign_in(current_user)
+  end
+
+  context "when the message has not current thread" do
+    it "starts a thread" do
+      chat_page.visit_channel(channel_1)
+      channel_page.reply_to(original_message)
+
+      expect(side_panel_page).to have_open_thread
+
+      text = thread_page.send_message
+
+      expect(thread_page.messages).to have_message(text: text, persisted: true)
+
+      thread_page.close
+
+      expect(channel_page).to have_thread_indicator(original_message)
+    end
+
+    context "when reloading after creating thread" do
+      it "correctly loads the thread" do
+        chat_page.visit_channel(channel_1)
+        channel_page.reply_to(original_message)
+        thread_page.send_message("reply to message")
+
+        expect(thread_page.messages).to have_message(text: "reply to message")
+
+        refresh
+
+        expect(thread_page.messages).to have_message(text: "reply to message")
+      end
+    end
+  end
+
+  context "when the message has an existing thread" do
+    fab!(:message_1) do
+      Fabricate(:chat_message, chat_channel: channel_1, in_reply_to: original_message)
+    end
+
+    it "replies to the existing thread" do
+      chat_page.visit_channel(channel_1)
+
+      expect(channel_page.message_thread_indicator(original_message)).to have_reply_count(1)
+
+      channel_page.message_thread_indicator(original_message).click
+      thread_page.send_message("reply to message")
+
+      expect(thread_page.messages).to have_message(text: message_1.message)
+      expect(thread_page.messages).to have_message(text: "reply to message")
+
+      thread_page.close
+
+      expect(channel_page.message_thread_indicator(original_message)).to have_reply_count(2)
+      expect(channel_page.messages).to have_no_message(text: "reply to message")
+    end
+  end
+
+  context "with threading disabled" do
+    before { channel_1.update!(threading_enabled: false) }
+
+    it "makes a reply in the channel" do
+      chat_page.visit_channel(channel_1)
+      channel_page.reply_to(original_message)
+
+      expect(page).to have_selector(
+        ".chat-channel .chat-reply__excerpt",
+        text: original_message.excerpt,
+      )
+
+      channel_page.fill_composer("reply to message")
+      channel_page.click_send_message
+
+      expect(channel_page.messages).to have_message(text: "reply to message")
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/reply_to_message/smoke_spec.rb b/plugins/chat/spec/system/reply_to_message/smoke_spec.rb
new file mode 100644
index 00000000000..0fdb543ac92
--- /dev/null
+++ b/plugins/chat/spec/system/reply_to_message/smoke_spec.rb
@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+RSpec.describe "Reply to message - smoke", type: :system do
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:channel_page) { PageObjects::Pages::ChatChannel.new }
+  let(:thread_page) { PageObjects::Pages::ChatThread.new }
+
+  fab!(:user_1) { Fabricate(:user) }
+  fab!(:user_2) { Fabricate(:user) }
+  fab!(:channel_1) { Fabricate(:category_channel) }
+  fab!(:original_message) { Fabricate(:chat_message, chat_channel: channel_1) }
+
+  before do
+    chat_system_bootstrap
+    channel_1.add(user_1)
+    channel_1.add(user_2)
+    channel_1.update!(threading_enabled: true)
+  end
+
+  context "when two users create a thread on the same message" do
+    it "works" do
+      using_session(:user_1) do
+        sign_in(user_1)
+        chat_page.visit_channel(channel_1)
+        channel_page.reply_to(original_message)
+      end
+
+      using_session(:user_2) do
+        sign_in(user_2)
+        chat_page.visit_channel(channel_1)
+        channel_page.reply_to(original_message)
+      end
+
+      using_session(:user_1) do
+        thread_page.fill_composer("user1reply")
+        thread_page.click_send_message
+
+        expect(channel_page.message_thread_indicator(original_message)).to have_reply_count(1)
+
+        expect(thread_page).to have_message(text: "user1reply")
+      end
+
+      using_session(:user_2) do |session|
+        expect(thread_page).to have_message(text: "user1reply")
+        expect(channel_page.message_thread_indicator(original_message)).to have_reply_count(1)
+
+        thread_page.fill_composer("user2reply")
+        thread_page.click_send_message
+
+        expect(thread_page).to have_message(text: "user2reply")
+        expect(channel_page.message_thread_indicator(original_message)).to have_reply_count(2)
+
+        refresh
+
+        expect(thread_page).to have_message(text: "user1reply")
+        expect(thread_page).to have_message(text: "user2reply")
+        expect(channel_page.message_thread_indicator(original_message)).to have_reply_count(2)
+
+        session.quit
+      end
+
+      using_session(:user_1) do |session|
+        expect(thread_page).to have_message(text: "user2reply")
+        expect(channel_page.message_thread_indicator(original_message)).to have_reply_count(2)
+
+        refresh
+
+        expect(thread_page).to have_message(text: "user1reply")
+        expect(thread_page).to have_message(text: "user2reply")
+        expect(channel_page.message_thread_indicator(original_message)).to have_reply_count(2)
+
+        session.quit
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/replying_indicator_spec.rb b/plugins/chat/spec/system/replying_indicator_spec.rb
deleted file mode 100644
index d2c1dd1a256..00000000000
--- a/plugins/chat/spec/system/replying_indicator_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "Replying indicator", type: :system, js: true do
-  fab!(:channel_1) { Fabricate(:chat_channel) }
-  fab!(:current_user) { Fabricate(:user) }
-  fab!(:other_user) { Fabricate(:user) }
-
-  let(:chat) { PageObjects::Pages::Chat.new }
-
-  before do
-    channel_1.add(current_user)
-    channel_1.add(other_user)
-    chat_system_bootstrap
-    sign_in(current_user)
-  end
-
-  context "when on a channel" do
-    context "when another user is replying" do
-      it "shows the replying indicator" do
-        using_session(:user_1) do
-          sign_in(other_user)
-          chat.visit_channel(channel_1)
-          find(".chat-composer-input").fill_in(with: "hello there")
-        end
-
-        chat.visit_channel(channel_1)
-
-        expect(page).to have_selector(
-          ".chat-replying-indicator",
-          text: I18n.t("js.chat.replying_indicator.single_user", username: other_user.username),
-        )
-      end
-    end
-  end
-end
diff --git a/plugins/chat/spec/system/restore_message_spec.rb b/plugins/chat/spec/system/restore_message_spec.rb
new file mode 100644
index 00000000000..ce04ab86634
--- /dev/null
+++ b/plugins/chat/spec/system/restore_message_spec.rb
@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+RSpec.describe "Restore message", type: :system do
+  fab!(:admin_user) { Fabricate(:admin) }
+  fab!(:regular_user) { Fabricate(:user) }
+  fab!(:another_user) { Fabricate(:user) }
+  fab!(:channel_1) { Fabricate(:category_channel) }
+
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:chat_channel_page) { PageObjects::Pages::ChatChannel.new }
+
+  before do
+    chat_system_bootstrap
+    channel_1.add(admin_user)
+    channel_1.add(regular_user)
+    channel_1.add(another_user)
+  end
+
+  context "when user deletes its own message" do
+    fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1, user: regular_user) }
+
+    it "can be restored by the owner" do
+      sign_in(regular_user)
+      chat_page.visit_channel(channel_1)
+
+      chat_channel_page.delete_message(message_1)
+
+      expect(chat_channel_page.messages).to have_deleted_message(message_1, count: 1)
+      expect(chat_channel_page.messages).to have_action("restore", id: message_1.id)
+    end
+
+    it "can't be restored by another user" do
+      using_session(:another_user) do
+        sign_in(another_user)
+        chat_page.visit_channel(channel_1)
+      end
+
+      using_session(:regular_user) do |session|
+        sign_in(regular_user)
+        chat_page.visit_channel(channel_1)
+        chat_channel_page.delete_message(message_1)
+        session.quit
+      end
+
+      using_session(:another_user) do |session|
+        expect(chat_channel_page.messages).to have_no_message(id: message_1.id)
+        session.quit
+      end
+    end
+  end
+
+  context "when staff deletes user message" do
+    fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1, user: regular_user) }
+
+    it "can't be restored by owner" do
+      using_session(:regular_user) do
+        sign_in(regular_user)
+        chat_page.visit_channel(channel_1)
+      end
+
+      using_session(:admin_user) do |session|
+        sign_in(admin_user)
+        chat_page.visit_channel(channel_1)
+        chat_channel_page.delete_message(message_1)
+        session.quit
+      end
+
+      using_session(:regular_user) do |session|
+        expect(chat_channel_page.messages).to have_deleted_message(message_1, count: 1)
+        chat_channel_page.messages.expand(id: message_1.id)
+        expect(chat_channel_page.messages).to have_no_action("restore", id: message_1.id)
+        session.quit
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/reviewables_spec.rb b/plugins/chat/spec/system/reviewables_spec.rb
new file mode 100644
index 00000000000..2480faad3d6
--- /dev/null
+++ b/plugins/chat/spec/system/reviewables_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+describe "Reviewables", type: :system do
+  fab!(:current_user) { Fabricate(:admin) }
+  fab!(:channel_1) { Fabricate(:chat_channel) }
+  fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1) }
+
+  before do
+    chat_system_bootstrap(current_user)
+    channel_1.add(current_user)
+    sign_in(current_user)
+
+    Chat::ReviewQueue.new.flag_message(
+      message_1,
+      current_user.guardian,
+      ReviewableScore.types[:spam],
+    )
+  end
+
+  context "when visiting reviews for messages " do
+    it "lists the correct message" do
+      visit("/review?type=Chat%3A%3AReviewableMessage")
+
+      expect(page).to have_content(message_1.message)
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/select_message/channel_spec.rb b/plugins/chat/spec/system/select_message/channel_spec.rb
new file mode 100644
index 00000000000..6eb83d7c6e4
--- /dev/null
+++ b/plugins/chat/spec/system/select_message/channel_spec.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+RSpec.describe "Chat | Select message | channel", type: :system do
+  fab!(:current_user) { Fabricate(:user) }
+  fab!(:channel_1) { Fabricate(:chat_channel) }
+  fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1) }
+  fab!(:message_2) { Fabricate(:chat_message, chat_channel: channel_1) }
+  fab!(:message_3) { Fabricate(:chat_message, chat_channel: channel_1) }
+
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:channel_page) { PageObjects::Pages::ChatChannel.new }
+
+  before do
+    chat_system_bootstrap
+    channel_1.add(current_user)
+    sign_in(current_user)
+  end
+
+  it "can select multiple messages" do
+    chat_page.visit_channel(channel_1)
+
+    channel_page.messages.select(message_1)
+    channel_page.messages.select(message_2)
+
+    expect(channel_page).to have_selected_messages(message_1, message_2)
+  end
+
+  it "can shift + click to select messages between the first and last" do
+    chat_page.visit_channel(channel_1)
+    channel_page.messages.select(message_1)
+    channel_page.messages.shift_select(message_3)
+
+    expect(channel_page).to have_selected_messages(message_1, message_2, message_3)
+  end
+
+  context "when visiting another channel" do
+    fab!(:channel_2) { Fabricate(:chat_channel) }
+
+    before { channel_2.add(current_user) }
+
+    it "resets message selection" do
+      chat_page.visit_channel(channel_1)
+      channel_page.messages.select(message_1)
+
+      expect(channel_page.selection_management).to be_visible
+
+      chat_page.visit_channel(channel_2)
+
+      expect(channel_page.selection_management).to be_not_visible
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/select_message/thread_spec.rb b/plugins/chat/spec/system/select_message/thread_spec.rb
new file mode 100644
index 00000000000..77d13bae394
--- /dev/null
+++ b/plugins/chat/spec/system/select_message/thread_spec.rb
@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+RSpec.describe "Chat | Select message | thread", type: :system do
+  fab!(:current_user) { Fabricate(:user) }
+  fab!(:channel_1) { Fabricate(:chat_channel, threading_enabled: true) }
+  fab!(:thread_1) { Fabricate(:chat_thread, channel: channel_1) }
+  fab!(:original_message) { Fabricate(:chat_message, chat_channel: channel_1) }
+
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:channel_page) { PageObjects::Pages::ChatChannel.new }
+  let(:thread_page) { PageObjects::Pages::ChatThread.new }
+
+  before do
+    chat_system_bootstrap
+    channel_1.add(current_user)
+    sign_in(current_user)
+  end
+
+  fab!(:thread_message_1) do
+    Fabricate(
+      :chat_message,
+      thread_id: thread_1.id,
+      chat_channel: channel_1,
+      in_reply_to: original_message,
+    )
+  end
+  fab!(:thread_message_2) do
+    Fabricate(
+      :chat_message,
+      thread_id: thread_1.id,
+      chat_channel: channel_1,
+      in_reply_to: original_message,
+    )
+  end
+  fab!(:thread_message_3) do
+    Fabricate(
+      :chat_message,
+      thread_id: thread_1.id,
+      chat_channel: channel_1,
+      in_reply_to: original_message,
+    )
+  end
+
+  it "can select multiple messages" do
+    chat_page.visit_thread(thread_1)
+
+    thread_page.messages.select(thread_message_1)
+    thread_page.messages.select(thread_message_2)
+
+    expect(thread_page).to have_selected_messages(thread_message_1, thread_message_2)
+  end
+
+  it "can shift + click to select messages between the first and last" do
+    chat_page.visit_thread(thread_1)
+    thread_page.messages.select(thread_message_1)
+    thread_page.messages.shift_select(thread_message_3)
+
+    expect(thread_page).to have_selected_messages(
+      thread_message_1,
+      thread_message_2,
+      thread_message_3,
+    )
+  end
+end
diff --git a/plugins/chat/spec/system/send_message_spec.rb b/plugins/chat/spec/system/send_message_spec.rb
new file mode 100644
index 00000000000..05e49104346
--- /dev/null
+++ b/plugins/chat/spec/system/send_message_spec.rb
@@ -0,0 +1,115 @@
+# frozen_string_literal: true
+
+RSpec.describe "Send message", type: :system do
+  fab!(:user_1) { Fabricate(:admin) }
+  fab!(:user_2) { Fabricate(:admin) }
+
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:channel_page) { PageObjects::Pages::ChatChannel.new }
+
+  before do
+    # simpler user search without having to worry about user search data
+    SiteSetting.enable_names = false
+
+    chat_system_bootstrap
+  end
+
+  context "with direct message channels" do
+    context "when users are not following the channel" do
+      fab!(:channel_1) { Fabricate(:direct_message_channel, users: [user_1, user_2]) }
+
+      before do
+        channel_1.remove(user_1)
+        channel_1.remove(user_2)
+      end
+
+      it "shows correct state" do
+        using_session(:user_1) do
+          sign_in(user_1)
+          visit("/")
+
+          expect(chat_page.sidebar).to have_no_direct_message_channel(channel_1)
+        end
+
+        using_session(:user_2) do
+          sign_in(user_2)
+          visit("/")
+
+          expect(chat_page.sidebar).to have_no_direct_message_channel(channel_1)
+        end
+
+        using_session(:user_1) do
+          chat_page.open_new_message
+          chat_page.message_creator.filter(user_2.username)
+          chat_page.message_creator.click_row(user_2)
+
+          expect(chat_page.sidebar).to have_direct_message_channel(channel_1)
+        end
+
+        using_session(:user_2) do
+          expect(chat_page.sidebar).to have_no_direct_message_channel(channel_1)
+        end
+
+        using_session(:user_1) do |session|
+          channel_page.send_message
+
+          expect(chat_page.sidebar).to have_direct_message_channel(channel_1)
+
+          session.quit
+        end
+
+        using_session(:user_2) do |session|
+          expect(chat_page.sidebar).to have_direct_message_channel(channel_1, mention: true)
+
+          session.quit
+        end
+      end
+    end
+
+    context "when users are following the channel" do
+      fab!(:channel_1) { Fabricate(:direct_message_channel, users: [user_1, user_2]) }
+
+      it "shows correct state" do
+        using_session(:user_1) do
+          sign_in(user_1)
+          visit("/")
+
+          expect(chat_page.sidebar).to have_direct_message_channel(channel_1)
+        end
+
+        using_session(:user_2) do
+          sign_in(user_2)
+          visit("/")
+
+          expect(chat_page.sidebar).to have_direct_message_channel(channel_1)
+        end
+
+        using_session(:user_1) do
+          chat_page.open_new_message
+          chat_page.message_creator.filter(user_2.username)
+          chat_page.message_creator.click_row(user_2)
+
+          expect(chat_page.sidebar).to have_direct_message_channel(channel_1)
+        end
+
+        using_session(:user_2) do
+          expect(chat_page.sidebar).to have_direct_message_channel(channel_1)
+        end
+
+        using_session(:user_1) do |session|
+          channel_page.send_message
+
+          expect(chat_page.sidebar).to have_direct_message_channel(channel_1)
+
+          session.quit
+        end
+
+        using_session(:user_2) do |session|
+          expect(chat_page.sidebar).to have_direct_message_channel(channel_1, mention: true)
+
+          session.quit
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/shortcuts/chat_composer_spec.rb b/plugins/chat/spec/system/shortcuts/chat_composer_spec.rb
deleted file mode 100644
index 7126ffa8322..00000000000
--- a/plugins/chat/spec/system/shortcuts/chat_composer_spec.rb
+++ /dev/null
@@ -1,72 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "Shorcuts | chat composer", type: :system, js: true do
-  fab!(:channel_1) { Fabricate(:chat_channel) }
-  fab!(:current_user) { Fabricate(:user) }
-
-  let(:chat) { PageObjects::Pages::Chat.new }
-
-  KEY_MODIFIER = RUBY_PLATFORM =~ /darwin/i ? :meta : :control
-
-  before do
-    chat_system_bootstrap
-    channel_1.add(current_user)
-    sign_in(current_user)
-  end
-
-  context "when using meta + l" do
-    xit "handles insert link shorcut" do
-    end
-  end
-
-  context "when using meta + b" do
-    xit "adds bold text" do
-      chat.visit_channel(channel_1)
-
-      within(".chat-composer-input") do |composer|
-        composer.send_keys([KEY_MODIFIER, "b"])
-
-        expect(composer.value).to eq("**strong text**")
-      end
-    end
-  end
-
-  context "when using meta + i" do
-    xit "adds italic text" do
-      chat.visit_channel(channel_1)
-
-      within(".chat-composer-input") do |composer|
-        composer.send_keys([KEY_MODIFIER, "i"])
-
-        expect(composer.value).to eq("_emphasized text_")
-      end
-    end
-  end
-
-  context "when using meta + e" do
-    it "adds preformatted text" do
-      chat.visit_channel(channel_1)
-
-      within(".chat-composer-input") do |composer|
-        composer.send_keys([KEY_MODIFIER, "e"])
-
-        expect(composer.value).to eq("`indent preformatted text by 4 spaces`")
-      end
-    end
-  end
-
-  context "when using ArrowUp" do
-    fab!(:message_1) do
-      Fabricate(:chat_message, message: "message 1", chat_channel: channel_1, user: current_user)
-    end
-    before { Fabricate(:chat_message, message: "message 2", chat_channel: channel_1) }
-
-    it "edits last editable message" do
-      chat.visit_channel(channel_1)
-
-      within(".chat-composer-input") { |composer| composer.send_keys(:arrow_up) }
-
-      expect(page.find(".chat-composer-message-details")).to have_content(message_1.message)
-    end
-  end
-end
diff --git a/plugins/chat/spec/system/shortcuts/drawer_spec.rb b/plugins/chat/spec/system/shortcuts/drawer_spec.rb
index 336e6988b45..6db7494820d 100644
--- a/plugins/chat/spec/system/shortcuts/drawer_spec.rb
+++ b/plugins/chat/spec/system/shortcuts/drawer_spec.rb
@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
-RSpec.describe "Shortcuts | drawer", type: :system, js: true do
+RSpec.describe "Shortcuts | drawer", type: :system do
   fab!(:user_1) { Fabricate(:admin) }
   fab!(:channel_1) { Fabricate(:chat_channel) }
   fab!(:channel_2) { Fabricate(:chat_channel) }
 
   let(:chat_page) { PageObjects::Pages::Chat.new }
-  let(:drawer) { PageObjects::Pages::ChatDrawer.new }
+  let(:channel_page) { PageObjects::Pages::ChatChannel.new }
+  let(:drawer_page) { PageObjects::Pages::ChatDrawer.new }
 
   before do
     chat_system_bootstrap(user_1, [channel_1, channel_2])
@@ -18,9 +19,9 @@ RSpec.describe "Shortcuts | drawer", type: :system, js: true do
 
     context "when pressing dash" do
       it "opens the drawer" do
-        find("body").send_keys("-")
+        page.send_keys("-")
 
-        expect(page).to have_css(".chat-drawer.is-expanded")
+        expect(chat_page).to have_drawer
       end
     end
   end
@@ -32,33 +33,59 @@ RSpec.describe "Shortcuts | drawer", type: :system, js: true do
     end
 
     context "when pressing escape" do
-      it "closes the drawer" do
-        expect(page).to have_css(".chat-drawer.is-expanded")
+      context "when the composer is not focused" do
+        it "closes the drawer" do
+          expect(chat_page).to have_drawer
 
-        drawer.open_channel(channel_1)
-        find(".chat-composer-input").send_keys(:escape)
+          drawer_page.open_channel(channel_1)
+          page.send_keys(:tab) # ensures we focus out of input
+          page.send_keys(:escape)
 
-        expect(page).to have_no_css(".chat-drawer.is-expanded")
+          expect(chat_page).to have_no_drawer
+        end
+      end
+
+      context "when the composer is focused" do
+        it "blurs the input" do
+          expect(chat_page).to have_drawer
+
+          drawer_page.open_channel(channel_1)
+          channel_page.composer.input.click
+
+          page.send_keys(:escape)
+
+          expect(chat_page).to have_drawer
+        end
+      end
+    end
+
+    context "when pressing a letter" do
+      it "doesn’t intercept the event" do
+        drawer_page.open_channel(channel_1)
+        page.send_keys(:tab) # simple way to ensure composer is not focused
+        page.send_keys("e")
+
+        expect(channel_page.composer.value).to eq("")
       end
     end
 
     context "when using Up/Down arrows" do
       it "navigates through the channels" do
-        drawer.open_channel(channel_1)
+        drawer_page.open_channel(channel_1)
 
-        expect(page).to have_selector(".chat-drawer[data-chat-channel-id=\"#{channel_1.id}\"]")
+        expect(chat_page).to have_drawer(channel_id: channel_1.id)
 
-        find(".chat-composer-input").send_keys(%i[alt arrow_down])
+        page.send_keys(%i[alt arrow_down])
 
-        expect(page).to have_selector(".chat-drawer[data-chat-channel-id=\"#{channel_2.id}\"]")
+        expect(chat_page).to have_drawer(channel_id: channel_2.id)
 
-        find(".chat-composer-input").send_keys(%i[alt arrow_down])
+        page.send_keys(%i[alt arrow_down])
 
-        expect(page).to have_selector(".chat-drawer[data-chat-channel-id=\"#{channel_1.id}\"]")
+        expect(chat_page).to have_drawer(channel_id: channel_1.id)
 
-        find(".chat-composer-input").send_keys(%i[alt arrow_up])
+        page.send_keys(%i[alt arrow_up])
 
-        expect(page).to have_selector(".chat-drawer[data-chat-channel-id=\"#{channel_2.id}\"]")
+        expect(chat_page).to have_drawer(channel_id: channel_2.id)
       end
     end
   end
diff --git a/plugins/chat/spec/system/shortcuts/full_page_spec.rb b/plugins/chat/spec/system/shortcuts/full_page_spec.rb
new file mode 100644
index 00000000000..a32075bcba1
--- /dev/null
+++ b/plugins/chat/spec/system/shortcuts/full_page_spec.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+RSpec.describe "Shortcuts | full page", type: :system do
+  fab!(:channel_1) { Fabricate(:chat_channel) }
+  fab!(:current_user) { Fabricate(:user) }
+
+  let(:chat) { PageObjects::Pages::Chat.new }
+
+  before do
+    chat_system_bootstrap
+    channel_1.add(current_user)
+    sign_in(current_user)
+  end
+
+  context "when pressing a letter" do
+    it "intercepts the event and propagates it to the composer" do
+      chat.visit_channel(channel_1)
+      find(".header-sidebar-toggle").click # simple way to ensure composer is not focused
+
+      page.send_keys("e")
+
+      expect(find(".chat-composer__input").value).to eq("e")
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/shortcuts/mark_all_read_spec.rb b/plugins/chat/spec/system/shortcuts/mark_all_read_spec.rb
new file mode 100644
index 00000000000..d232f294589
--- /dev/null
+++ b/plugins/chat/spec/system/shortcuts/mark_all_read_spec.rb
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+RSpec.describe "Shortcuts | mark all read", type: :system do
+  fab!(:user_1) { Fabricate(:admin) }
+  fab!(:channel_1) { Fabricate(:chat_channel) }
+  fab!(:channel_2) { Fabricate(:chat_channel) }
+  fab!(:channel_3) { Fabricate(:chat_channel) }
+
+  let(:chat_sidebar) { PageObjects::Pages::Sidebar.new }
+  let(:channel_page) { PageObjects::Pages::ChatChannel.new }
+  let(:drawer) { PageObjects::Pages::ChatDrawer.new }
+
+  before do
+    SiteSetting.navigation_menu = "sidebar"
+    chat_system_bootstrap(user_1, [channel_1, channel_2, channel_3])
+    sign_in(user_1)
+    Fabricate(:chat_message, chat_channel: channel_1)
+    Fabricate(:chat_message, chat_channel: channel_1)
+    10.times do |i|
+      Fabricate(:chat_message, chat_channel: channel_2, message: "all read message #{i}")
+    end
+  end
+
+  context "when chat is open" do
+    before { visit(channel_3.url) }
+
+    context "when pressing shift+esc" do
+      it "marks all channels read" do
+        expect(page).to have_css(
+          ".sidebar-section-link.channel-#{channel_1.id} .sidebar-section-link-suffix.unread",
+        )
+        expect(page).to have_css(
+          ".sidebar-section-link.channel-#{channel_2.id} .sidebar-section-link-suffix.unread",
+        )
+        find("body").send_keys(%i[shift escape])
+        expect(page).not_to have_css(
+          ".sidebar-section-link.channel-#{channel_1.id} .sidebar-section-link-suffix.unread",
+        )
+        expect(page).not_to have_css(
+          ".sidebar-section-link.channel-#{channel_2.id} .sidebar-section-link-suffix.unread",
+        )
+        chat_sidebar.open_channel(channel_2)
+        expect(page).to have_content("all read message 9")
+        expect(page).not_to have_content(I18n.t("js.chat.last_visit"))
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/shortcuts/sidebar_spec.rb b/plugins/chat/spec/system/shortcuts/sidebar_spec.rb
index ccf6c298e50..6ba9aabe305 100644
--- a/plugins/chat/spec/system/shortcuts/sidebar_spec.rb
+++ b/plugins/chat/spec/system/shortcuts/sidebar_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "Shorcuts | sidebar", type: :system, js: true do
+RSpec.describe "Shortcuts | sidebar", type: :system do
   fab!(:current_user) { Fabricate(:admin) }
 
   let(:chat) { PageObjects::Pages::Chat.new }
diff --git a/plugins/chat/spec/system/sidebar_navigation_menu_spec.rb b/plugins/chat/spec/system/sidebar_navigation_menu_spec.rb
index 33f7a9b78dd..a6cb8329d8e 100644
--- a/plugins/chat/spec/system/sidebar_navigation_menu_spec.rb
+++ b/plugins/chat/spec/system/sidebar_navigation_menu_spec.rb
@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
-RSpec.describe "Sidebar navigation menu", type: :system, js: true do
+RSpec.describe "Sidebar navigation menu", type: :system do
+  let(:sidebar_page) { PageObjects::Pages::Sidebar.new }
+  let(:sidebar_component) { PageObjects::Components::NavigationMenu::Sidebar.new }
+
   fab!(:current_user) { Fabricate(:user) }
 
   before do
@@ -18,8 +21,8 @@ RSpec.describe "Sidebar navigation menu", type: :system, js: true do
     it "displays correct channels section title" do
       visit("/")
 
-      expect(page).to have_css(
-        ".sidebar-section-chat-channels .sidebar-section-header-text",
+      expect(sidebar_page.channels_section).to have_css(
+        ".sidebar-section-header-text",
         text: I18n.t("js.chat.chat_channels"),
       )
     end
@@ -27,18 +30,15 @@ RSpec.describe "Sidebar navigation menu", type: :system, js: true do
     it "displays the correct hash icon prefix" do
       visit("/")
 
-      expect(page).to have_css(
-        ".sidebar-section-chat-channels .sidebar-section-link-#{channel_1.slug} .sidebar-section-link-prefix svg.prefix-icon.d-icon-hashtag",
+      expect(sidebar_page.channels_section).to have_css(
+        ".sidebar-section-link[data-link-name='#{channel_1.slug}'] .sidebar-section-link-prefix svg.prefix-icon.d-icon-d-chat",
       )
     end
 
     it "channel link has the correct href" do
       visit("/")
 
-      expect(page).to have_link(
-        channel_1.name,
-        href: "/chat/channel/#{channel_1.id}/#{channel_1.slug}",
-      )
+      expect(page).to have_link(channel_1.name, href: "/chat/c/#{channel_1.slug}/#{channel_1.id}")
     end
 
     context "when the category is private" do
@@ -53,8 +53,8 @@ RSpec.describe "Sidebar navigation menu", type: :system, js: true do
       it "has a lock badge" do
         visit("/")
 
-        expect(page).to have_css(
-          ".sidebar-section-chat-channels .sidebar-section-link-#{private_channel_1.slug} .sidebar-section-link-prefix svg.prefix-badge.d-icon-lock",
+        expect(sidebar_page.channels_section).to have_css(
+          ".sidebar-section-link[data-link-name='#{private_channel_1.slug}'] .sidebar-section-link-prefix svg.prefix-badge.d-icon-lock",
         )
       end
     end
@@ -67,8 +67,8 @@ RSpec.describe "Sidebar navigation menu", type: :system, js: true do
       it "unescapes the emoji" do
         visit("/")
 
-        expect(page).to have_css(
-          ".sidebar-section-chat-channels .sidebar-section-link-#{channel_1.slug} .emoji",
+        expect(sidebar_page.channels_section).to have_css(
+          ".sidebar-section-link[data-link-name='#{channel_1.slug}'] .emoji",
         )
       end
     end
@@ -88,8 +88,8 @@ RSpec.describe "Sidebar navigation menu", type: :system, js: true do
       it "has a muted class" do
         visit("/")
 
-        expect(page).to have_css(
-          ".sidebar-section-chat-channels .sidebar-section-link-#{channel_2.slug}.sidebar-section-link--muted",
+        expect(sidebar_page.channels_section).to have_css(
+          ".sidebar-section-link[data-link-name='#{channel_2.slug}'].sidebar-section-link--muted",
         )
       end
     end
@@ -101,7 +101,9 @@ RSpec.describe "Sidebar navigation menu", type: :system, js: true do
         visit("/")
 
         expect(
-          page.find(".sidebar-section-chat-channels .sidebar-section-link-#{channel_1.slug}")[
+          sidebar_page.channels_section.find(
+            ".sidebar-section-link[data-link-name='#{channel_1.slug}']",
+          )[
             "title"
           ],
         ).to eq("&lt;script&gt;alert(&#x27;hello&#x27;)&lt;/script&gt;")
@@ -118,8 +120,8 @@ RSpec.describe "Sidebar navigation menu", type: :system, js: true do
         visit("/")
 
         expect(
-          page.find(
-            ".sidebar-section-chat-dms a.sidebar-section-link:nth-child(1) .sidebar-section-link-prefix img",
+          sidebar_page.dms_section.find(
+            "a.sidebar-section-link:nth-child(1) .sidebar-section-link-prefix img",
           )[
             "src"
           ],
@@ -130,7 +132,7 @@ RSpec.describe "Sidebar navigation menu", type: :system, js: true do
         visit("/")
 
         expect(
-          page.find(".sidebar-section-chat-dms a.sidebar-section-link:nth-child(1)"),
+          sidebar_page.dms_section.find("a.sidebar-section-link:nth-child(1)"),
         ).to have_content(other_user.username)
       end
 
@@ -143,27 +145,27 @@ RSpec.describe "Sidebar navigation menu", type: :system, js: true do
         it "displays the status" do
           visit("/")
 
-          expect(
-            page.find(".sidebar-section-chat-dms a.sidebar-section-link:nth-child(1)"),
-          ).to have_css(".user-status")
+          expect(sidebar_page.dms_section.find("a.sidebar-section-link:nth-child(1)")).to have_css(
+            ".user-status-message",
+          )
         end
       end
     end
 
     context "when channel has more than 2 participants" do
-      fab!(:user_1) { Fabricate(:user) }
-      fab!(:user_2) { Fabricate(:user) }
+      fab!(:user_1) { Fabricate(:user, username: "zoesmith") }
+      fab!(:user_2) { Fabricate(:user, username: "alansmith") }
       fab!(:dm_channel_1) do
         Fabricate(:direct_message_channel, users: [current_user, user_1, user_2])
       end
 
-      it "displays all participants names" do
+      it "displays all participants names in alphabetical order" do
         visit("/")
         expect(
-          page.find(
-            ".sidebar-section-chat-dms a.sidebar-section-link:nth-child(1) .sidebar-section-link-content-text",
+          sidebar_page.dms_section.find(
+            "a.sidebar-section-link:nth-child(1) .sidebar-section-link-content-text",
           ),
-        ).to have_content("#{user_1.username}, #{user_2.username}")
+        ).to have_content("alansmith, zoesmith")
       end
     end
 
@@ -179,8 +181,8 @@ RSpec.describe "Sidebar navigation menu", type: :system, js: true do
       it "escapes the title attribute using it" do
         visit("/")
 
-        expect(page.find(".sidebar-section-chat-dms .channel-#{dm_channel_1.id}")["title"]).to eq(
-          "Chat with @&lt;script&gt;alert(&#x27;hello&#x27;)&lt;/script&gt;",
+        expect(sidebar_page.dms_section.find(".channel-#{dm_channel_1.id}")["title"]).to eq(
+          "Chat in @&lt;script&gt;alert(&#x27;hello&#x27;)&lt;/script&gt;",
         )
       end
     end
diff --git a/plugins/chat/spec/system/sidebars_spec.rb b/plugins/chat/spec/system/sidebars_spec.rb
index 81a0f12ddd5..d1df0415164 100644
--- a/plugins/chat/spec/system/sidebars_spec.rb
+++ b/plugins/chat/spec/system/sidebars_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "Navigation", type: :system, js: true do
+RSpec.describe "Navigation", type: :system do
   fab!(:category) { Fabricate(:category) }
   fab!(:topic) { Fabricate(:topic) }
   fab!(:post) { Fabricate(:post, topic: topic) }
@@ -8,6 +8,7 @@ RSpec.describe "Navigation", type: :system, js: true do
   fab!(:category_channel) { Fabricate(:category_channel) }
   fab!(:category_channel_2) { Fabricate(:category_channel) }
   let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:sidebar_page) { PageObjects::Pages::Sidebar.new }
 
   before do
     chat_system_bootstrap(user, [category_channel, category_channel_2])
@@ -40,6 +41,16 @@ RSpec.describe "Navigation", type: :system, js: true do
         expect(page).to have_no_css("#d-sidebar")
       end
     end
+
+    context "when public channels are disabled" do
+      before { SiteSetting.enable_public_channels = false }
+
+      it "has public channels section" do
+        visit("/")
+
+        expect(sidebar_page).to have_no_public_channels_section
+      end
+    end
   end
 
   context "when visiting on mobile" do
diff --git a/plugins/chat/spec/system/silenced_user_spec.rb b/plugins/chat/spec/system/silenced_user_spec.rb
index 50a73ee1497..7e1aa1ee397 100644
--- a/plugins/chat/spec/system/silenced_user_spec.rb
+++ b/plugins/chat/spec/system/silenced_user_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "Silenced user", type: :system, js: true do
+RSpec.describe "Silenced user", type: :system do
   fab!(:channel_1) { Fabricate(:category_channel) }
 
   let(:chat) { PageObjects::Pages::Chat.new }
@@ -27,10 +27,10 @@ RSpec.describe "Silenced user", type: :system, js: true do
       )
     end
 
-    it "removes the send button" do
+    it "disables the send button" do
       chat.visit_channel(channel_1)
 
-      expect(page).to have_css(".send-btn[disabled]")
+      expect(page).to have_css(".chat-composer-button.-send[disabled]")
     end
 
     it "prevents reactions" do
diff --git a/plugins/chat/spec/system/single_thread_spec.rb b/plugins/chat/spec/system/single_thread_spec.rb
new file mode 100644
index 00000000000..d9cb64a861a
--- /dev/null
+++ b/plugins/chat/spec/system/single_thread_spec.rb
@@ -0,0 +1,179 @@
+# frozen_string_literal: true
+
+describe "Single thread in side panel", type: :system do
+  fab!(:current_user) { Fabricate(:user) }
+
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:channel_page) { PageObjects::Pages::ChatChannel.new }
+  let(:side_panel) { PageObjects::Pages::ChatSidePanel.new }
+  let(:thread_page) { PageObjects::Pages::ChatThread.new }
+  let(:chat_drawer_page) { PageObjects::Pages::ChatDrawer.new }
+  let(:sidebar_page) { PageObjects::Pages::Sidebar.new }
+
+  before do
+    chat_system_bootstrap(current_user, [channel])
+    sign_in(current_user)
+  end
+
+  context "when threading_enabled is false for the channel" do
+    fab!(:channel) { Fabricate(:chat_channel) }
+    before { channel.update!(threading_enabled: false) }
+
+    it "does not open the side panel for a single thread" do
+      thread =
+        chat_thread_chain_bootstrap(channel: channel, users: [current_user, Fabricate(:user)])
+      chat_page.visit_channel(channel)
+      channel_page.hover_message(thread.original_message)
+      expect(page).not_to have_css(".chat-message-thread-btn")
+    end
+  end
+
+  context "when threading is enabled for the channel" do
+    fab!(:user_2) { Fabricate(:user) }
+    fab!(:channel) { Fabricate(:chat_channel, threading_enabled: true) }
+    fab!(:thread) { chat_thread_chain_bootstrap(channel: channel, users: [current_user, user_2]) }
+
+    context "when in full page" do
+      context "when switching channel" do
+        fab!(:channel_2) { Fabricate(:chat_channel, threading_enabled: true) }
+
+        before { channel_2.add(current_user) }
+
+        it "closes the opened thread" do
+          chat_page.visit_thread(thread)
+          expect(side_panel).to have_open_thread(thread)
+
+          sidebar_page.open_channel(channel_2)
+
+          expect(side_panel).to have_no_open_thread
+        end
+      end
+
+      context "when closing the thread" do
+        it "closes it" do
+          chat_page.visit_thread(thread)
+          expect(side_panel).to have_open_thread(thread)
+
+          thread_page.close
+
+          expect(side_panel).to have_no_open_thread
+        end
+      end
+    end
+
+    it "opens the single thread in the drawer using the indicator" do
+      visit("/latest")
+      chat_page.open_from_header
+      chat_drawer_page.open_channel(channel)
+      channel_page.message_thread_indicator(thread.original_message).click
+      expect(chat_drawer_page).to have_open_thread(thread)
+    end
+
+    it "navigates back to the channel when clicking back button from a thread" do
+      visit("/latest")
+      chat_page.open_from_header
+      chat_drawer_page.open_channel(channel)
+      channel_page.message_thread_indicator(thread.original_message).click
+      expect(chat_drawer_page).to have_open_thread(thread)
+
+      chat_drawer_page.back
+
+      expect(chat_drawer_page).to have_open_channel(channel)
+    end
+
+    it "opens the side panel for a single thread from the indicator" do
+      chat_page.visit_channel(channel)
+      channel_page.message_thread_indicator(thread.original_message).click
+      expect(side_panel).to have_open_thread(thread)
+    end
+
+    describe "sending a message" do
+      it "shows the message in the thread pane and links it to the correct channel" do
+        chat_page.visit_channel(channel)
+        channel_page.message_thread_indicator(thread.original_message).click
+        expect(side_panel).to have_open_thread(thread)
+        thread_page.send_message("new thread message")
+        expect(thread_page).to have_message(thread_id: thread.id, text: "new thread message")
+        thread_message = thread.last_message
+        expect(thread_message.chat_channel_id).to eq(channel.id)
+        expect(thread_message.thread.channel_id).to eq(channel.id)
+      end
+
+      it "does not echo the message in the channel pane" do
+        chat_page.visit_channel(channel)
+        channel_page.message_thread_indicator(thread.original_message).click
+        expect(side_panel).to have_open_thread(thread)
+        thread_page.send_message("new thread message")
+        expect(thread_page).to have_message(thread_id: thread.id, text: "new thread message")
+        thread_message = thread.reload.replies.last
+        expect(channel_page).not_to have_css(channel_page.message_by_id_selector(thread_message.id))
+      end
+
+      it "changes the tracking bell to be Tracking level in the thread panel" do
+        new_thread = Fabricate(:chat_thread, channel: channel, with_replies: 1)
+        chat_page.visit_channel(channel)
+        channel_page.message_thread_indicator(new_thread.original_message).click
+        expect(side_panel).to have_open_thread(new_thread)
+        expect(thread_page).to have_notification_level("normal")
+        thread_page.send_message("new thread message")
+        expect(thread_page).to have_notification_level("tracking")
+      end
+
+      it "handles updates from multiple users sending messages in the thread" do
+        using_session(:tab_1) do
+          sign_in(current_user)
+          chat_page.visit_channel(channel)
+          channel_page.message_thread_indicator(thread.original_message).click
+        end
+
+        other_user = Fabricate(:user)
+        chat_system_user_bootstrap(user: other_user, channel: channel)
+        sign_in(other_user)
+        chat_page.visit_channel(channel)
+        channel_page.message_thread_indicator(thread.original_message).click
+
+        expect(side_panel).to have_open_thread(thread)
+
+        thread_page.send_message("the other user message")
+
+        expect(thread_page).to have_message(thread_id: thread.id, text: "the other user message")
+
+        using_session(:tab_1) do
+          expect(side_panel).to have_open_thread(thread)
+          expect(thread_page).to have_message(thread_id: thread.id, text: "the other user message")
+
+          thread_page.send_message("this is a test message")
+
+          expect(thread_page).to have_message(thread_id: thread.id, text: "this is a test message")
+        end
+
+        expect(thread_page).to have_message(thread_id: thread.id, text: "this is a test message")
+      end
+
+      it "does not mark the channel unread if another user sends a message in the thread" do
+        other_user = Fabricate(:user)
+        chat_system_user_bootstrap(user: other_user, channel: channel)
+        Chat::MessageCreator.create(
+          chat_channel: channel,
+          user: other_user,
+          content: "Hello world!",
+          thread_id: thread.id,
+        )
+        sign_in(current_user)
+        chat_page.visit_channel(channel)
+        expect(page).not_to have_css(
+          ".sidebar-section-link.channel-#{channel.id} .sidebar-section-link-suffix.unread",
+        )
+      end
+    end
+
+    context "when using mobile" do
+      it "opens the side panel for a single thread using the indicator", mobile: true do
+        chat_page.visit_channel(channel)
+        channel_page.message_thread_indicator(thread.original_message).click
+
+        expect(side_panel).to have_open_thread(thread)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/thread_list/drawer_spec.rb b/plugins/chat/spec/system/thread_list/drawer_spec.rb
new file mode 100644
index 00000000000..315d84186c0
--- /dev/null
+++ b/plugins/chat/spec/system/thread_list/drawer_spec.rb
@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+describe "Thread list in side panel | drawer", type: :system do
+  fab!(:current_user) { Fabricate(:admin) }
+  fab!(:channel) { Fabricate(:chat_channel) }
+  fab!(:other_user) { Fabricate(:user) }
+
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:channel_page) { PageObjects::Pages::ChatChannel.new }
+  let(:side_panel) { PageObjects::Pages::ChatSidePanel.new }
+  let(:thread_page) { PageObjects::Pages::ChatThread.new }
+  let(:thread_list_page) { PageObjects::Components::Chat::ThreadList.new }
+  let(:drawer_page) { PageObjects::Pages::ChatDrawer.new }
+
+  before do
+    chat_system_bootstrap(current_user, [channel])
+    sign_in(current_user)
+  end
+
+  context "when threading not enabled for the channel" do
+    before { channel.update!(threading_enabled: false) }
+
+    it "does not show the thread list button in drawer header" do
+      visit("/")
+      chat_page.open_from_header
+      drawer_page.open_channel(channel)
+      expect(find(".chat-drawer-header__right-actions")).not_to have_css(
+        drawer_page.thread_list_button_selector,
+      )
+    end
+  end
+
+  context "when threading is enabled for the channel" do
+    before { channel.update!(threading_enabled: true) }
+
+    fab!(:thread_1) do
+      chat_thread_chain_bootstrap(
+        channel: channel,
+        users: [current_user, other_user],
+        thread_attrs: {
+          title: "favourite album?",
+        },
+      )
+    end
+    fab!(:thread_2) do
+      chat_thread_chain_bootstrap(
+        channel: channel,
+        users: [current_user, other_user],
+        thread_attrs: {
+          title: "current event",
+        },
+      )
+    end
+
+    it "opens the thread list from the header button" do
+      visit("/")
+      chat_page.open_from_header
+      drawer_page.open_channel(channel)
+      drawer_page.open_thread_list
+      expect(drawer_page).to have_open_thread_list
+    end
+
+    it "shows the titles of the threads the user is participating in" do
+      visit("/")
+      chat_page.open_from_header
+      drawer_page.open_channel(channel)
+      drawer_page.open_thread_list
+      expect(drawer_page).to have_open_thread_list
+      expect(thread_list_page).to have_content(thread_1.title)
+      expect(thread_list_page).to have_content(thread_2.title)
+    end
+
+    it "opens a thread" do
+      visit("/")
+      chat_page.open_from_header
+      drawer_page.open_channel(channel)
+      drawer_page.open_thread_list
+      expect(drawer_page).to have_open_thread_list
+      thread_list_page.item_by_id(thread_1.id).click
+      expect(drawer_page).to have_open_thread(thread_1)
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/thread_list/full_page_spec.rb b/plugins/chat/spec/system/thread_list/full_page_spec.rb
new file mode 100644
index 00000000000..3afd91a3d05
--- /dev/null
+++ b/plugins/chat/spec/system/thread_list/full_page_spec.rb
@@ -0,0 +1,230 @@
+# frozen_string_literal: true
+
+describe "Thread list in side panel | full page", type: :system do
+  fab!(:current_user) { Fabricate(:user) }
+  fab!(:channel) { Fabricate(:chat_channel, threading_enabled: true) }
+  fab!(:other_user) { Fabricate(:user) }
+
+  let(:side_panel_page) { PageObjects::Pages::ChatSidePanel.new }
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:channel_page) { PageObjects::Pages::ChatChannel.new }
+  let(:side_panel) { PageObjects::Pages::ChatSidePanel.new }
+  let(:thread_page) { PageObjects::Pages::ChatThread.new }
+  let(:thread_list_page) { PageObjects::Components::Chat::ThreadList.new }
+
+  before do
+    chat_system_bootstrap(current_user, [channel])
+    sign_in(current_user)
+  end
+
+  context "when there are no threads that the user is participating in" do
+    it "shows a message" do
+      chat_page.visit_channel(channel)
+      channel_page.open_thread_list
+      expect(page).to have_content(I18n.t("js.chat.threads.none"))
+    end
+  end
+
+  context "for threads the user is not a participant in" do
+    fab!(:thread_om) { Fabricate(:chat_message, chat_channel: channel) }
+
+    before { chat_system_user_bootstrap(user: other_user, channel: channel) }
+
+    it "does not show existing threads in the channel if the user is not tracking them" do
+      Fabricate(:chat_thread, original_message: thread_om, channel: channel)
+      chat_page.visit_channel(channel)
+      channel_page.open_thread_list
+      expect(page).to have_content(I18n.t("js.chat.threads.none"))
+    end
+
+    it "does not show new threads in the channel in the thread list if the user is not tracking them" do
+      chat_page.visit_channel(channel)
+
+      using_session(:other_user) do |session|
+        sign_in(other_user)
+        chat_page.visit_channel(channel)
+        channel_page.reply_to(thread_om)
+        thread_page.send_message("hey everyone!")
+        expect(channel_page).to have_thread_indicator(thread_om)
+        session.quit
+      end
+
+      channel_page.open_thread_list
+      expect(page).to have_content(I18n.t("js.chat.threads.none"))
+    end
+
+    describe "when the user creates a new thread" do
+      it "does not double up the staged thread and the actual thread in the list" do
+        chat_page.visit_channel(channel)
+        channel_page.reply_to(thread_om)
+        thread_page.send_message("hey everyone!")
+        expect(channel_page).to have_thread_indicator(thread_om)
+        thread_page.close
+        channel_page.open_thread_list
+        expect(page).to have_css(
+          thread_list_page.item_by_id_selector(thread_om.reload.thread_id),
+          count: 1,
+        )
+      end
+    end
+  end
+
+  context "when there are threads that the user is participating in" do
+    fab!(:thread_1) do
+      chat_thread_chain_bootstrap(channel: channel, users: [current_user, other_user])
+    end
+    fab!(:thread_2) do
+      chat_thread_chain_bootstrap(channel: channel, users: [current_user, other_user])
+    end
+
+    before do
+      chat_system_user_bootstrap(user: other_user, channel: channel)
+      thread_1.add(current_user)
+      thread_2.add(current_user)
+    end
+
+    it "shows a default title for threads without a title" do
+      chat_page.visit_channel(channel)
+      channel_page.open_thread_list
+      expect(page).to have_content(I18n.t("js.chat.thread.default_title", thread_id: thread_1.id))
+    end
+
+    it "shows the thread title with emoji" do
+      thread_1.update!(title: "What is for dinner? :hamburger:")
+      chat_page.visit_channel(channel)
+      channel_page.open_thread_list
+      expect(thread_list_page.item_by_id(thread_1.id)).to have_content("What is for dinner?")
+      expect(thread_list_page.item_by_id(thread_1.id)).to have_css("img.emoji[alt='hamburger']")
+    end
+
+    it "shows an excerpt of the original message of the thread" do
+      thread_1.original_message.update!(message: "This is a long message for the excerpt")
+      thread_1.original_message.rebake!
+      chat_page.visit_channel(channel)
+      channel_page.open_thread_list
+      expect(thread_list_page.item_by_id(thread_1.id)).to have_content(
+        "This is a long message for the excerpt",
+      )
+    end
+
+    it "shows the thread original message user avatar" do
+      chat_page.visit_channel(channel)
+      channel_page.open_thread_list
+      expect(thread_list_page.item_by_id(thread_1.id)).to have_css(
+        thread_list_page.avatar_selector(thread_1.original_message.user),
+      )
+    end
+
+    it "shows the last reply date of the thread" do
+      freeze_time
+      last_reply = Fabricate(:chat_message, chat_channel: thread_1.channel, thread: thread_1)
+      chat_page.visit_channel(channel)
+      channel_page.open_thread_list
+      expect(thread_list_page.item_by_id(thread_1.id)).to have_css(
+        thread_list_page.last_reply_datetime_selector(last_reply),
+      )
+    end
+
+    it "opens a thread" do
+      chat_page.visit_channel(channel)
+      channel_page.open_thread_list
+      thread_list_page.item_by_id(thread_1.id).click
+      expect(side_panel).to have_open_thread(thread_1)
+    end
+
+    describe "deleting and restoring the original message of the thread" do
+      fab!(:thread_1) do
+        chat_thread_chain_bootstrap(
+          channel: channel,
+          messages_count: 2,
+          users: [current_user, other_user],
+        )
+      end
+
+      before do
+        thread_1.update!(original_message_user: other_user)
+        thread_1.original_message.update!(user: other_user)
+      end
+
+      it "hides the thread in the list when another user deletes the original message" do
+        chat_page.visit_channel(channel)
+        channel_page.open_thread_list
+        expect(thread_list_page).to have_thread(thread_1)
+
+        using_session(:tab_2) do |session|
+          sign_in(other_user)
+          chat_page.visit_thread(thread_1)
+          expect(side_panel_page).to have_open_thread(thread_1)
+          thread_page.delete_message(thread_1.original_message)
+          session.quit
+        end
+
+        expect(thread_list_page).to have_no_thread(thread_1)
+      end
+
+      it "shows the thread in the list when another user restores the original message" do
+        # This is necessary because normal users can't see deleted messages
+        other_user.update!(admin: true)
+        current_user.update!(admin: true)
+
+        thread_1.original_message.trash!
+        chat_page.visit_channel(channel)
+        channel_page.open_thread_list
+        expect(thread_list_page).to have_no_thread(thread_1)
+
+        using_session(:tab_2) do |session|
+          sign_in(other_user)
+          chat_page.visit_channel(channel)
+          expect(channel_page).to have_no_loading_skeleton
+          channel_page.expand_deleted_message(thread_1.original_message)
+          channel_page.message_thread_indicator(thread_1.original_message).click
+          expect(side_panel_page).to have_open_thread(thread_1)
+          thread_page.restore_message(thread_1.original_message)
+          session.quit
+        end
+
+        expect(thread_list_page).to have_thread(thread_1)
+      end
+    end
+
+    describe "updating the title of the thread" do
+      let(:new_title) { "wow new title" }
+
+      def open_thread_list
+        chat_page.visit_channel(channel)
+        channel_page.open_thread_list
+        expect(side_panel).to have_open_thread_list
+      end
+
+      it "allows updating when user is admin" do
+        current_user.update!(admin: true)
+        open_thread_list
+        thread_list_page.item_by_id(thread_1.id).click
+        thread_page.header.open_settings
+        find(".chat-modal-thread-settings__title-input").fill_in(with: new_title)
+        find(".modal-footer .btn-primary").click
+        expect(thread_page.header).to have_title_content(new_title)
+      end
+
+      it "allows updating when user is same as the chat original message user" do
+        thread_1.update!(original_message_user: current_user)
+        thread_1.original_message.update!(user: current_user)
+        open_thread_list
+        thread_list_page.item_by_id(thread_1.id).click
+        thread_page.header.open_settings
+        find(".chat-modal-thread-settings__title-input").fill_in(with: new_title)
+        find(".modal-footer .btn-primary").click
+        expect(thread_page.header).to have_title_content(new_title)
+      end
+
+      it "does not allow updating if user is neither admin nor original message user" do
+        thread_1.update!(original_message_user: other_user)
+        thread_1.original_message.update!(user: other_user)
+
+        open_thread_list
+        thread_list_page.item_by_id(thread_1.id).click
+        expect(thread_page.header).to have_no_settings_button
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/thread_tracking/drawer_spec.rb b/plugins/chat/spec/system/thread_tracking/drawer_spec.rb
new file mode 100644
index 00000000000..c545b73118b
--- /dev/null
+++ b/plugins/chat/spec/system/thread_tracking/drawer_spec.rb
@@ -0,0 +1,120 @@
+# frozen_string_literal: true
+
+describe "Thread tracking state | drawer", type: :system do
+  include ActiveSupport::Testing::TimeHelpers
+
+  fab!(:current_user) { Fabricate(:admin) }
+  fab!(:channel) { Fabricate(:chat_channel, threading_enabled: true) }
+  fab!(:other_user) { Fabricate(:user) }
+  fab!(:thread) { Fabricate(:chat_thread, channel: channel) }
+
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:channel_page) { PageObjects::Pages::ChatChannel.new }
+  let(:thread_page) { PageObjects::Pages::ChatThread.new }
+  let(:thread_list_page) { PageObjects::Components::Chat::ThreadList.new }
+  let(:drawer_page) { PageObjects::Pages::ChatDrawer.new }
+
+  before do
+    chat_system_bootstrap(current_user, [channel])
+    chat_system_user_bootstrap(user: other_user, channel: channel)
+    sign_in(current_user)
+    thread.add(current_user)
+  end
+
+  context "when the user has unread messages for a thread" do
+    fab!(:message_1) do
+      Fabricate(:chat_message, chat_channel: channel, thread: thread, user: current_user)
+    end
+    fab!(:message_2) { Fabricate(:chat_message, chat_channel: channel, thread: thread) }
+
+    it "shows the count of threads with unread messages on the thread list button" do
+      visit("/")
+      chat_page.open_from_header
+      drawer_page.open_channel(channel)
+      expect(drawer_page).to have_unread_thread_indicator(count: 1)
+    end
+
+    it "shows an indicator on the unread thread in the list" do
+      visit("/")
+      chat_page.open_from_header
+      drawer_page.open_channel(channel)
+      drawer_page.open_thread_list
+      expect(drawer_page).to have_open_thread_list
+      expect(thread_list_page).to have_unread_item(thread.id)
+    end
+
+    it "marks the thread as read and removes both indicators when the user opens it" do
+      visit("/")
+      chat_page.open_from_header
+      drawer_page.open_channel(channel)
+      drawer_page.open_thread_list
+      thread_list_page.item_by_id(thread.id).click
+      expect(drawer_page).to have_no_unread_thread_indicator
+      drawer_page.open_thread_list
+      expect(thread_list_page).to have_no_unread_item(thread.id)
+    end
+
+    xit "shows unread indicators for the header icon and the list when a new unread arrives" do
+      thread.membership_for(current_user).update!(last_read_message_id: message_2.id)
+      visit("/")
+      chat_page.open_from_header
+      drawer_page.open_channel(channel)
+      drawer_page.open_thread_list
+      expect(drawer_page).to have_no_unread_thread_indicator
+      expect(thread_list_page).to have_no_unread_item(thread.id)
+      travel_to(1.minute.from_now)
+      Fabricate(:chat_message, chat_channel: channel, thread: thread, user: other_user)
+      expect(drawer_page).to have_unread_thread_indicator(count: 1)
+      expect(thread_list_page).to have_unread_item(thread.id)
+    end
+
+    describe "channel index unread indicators" do
+      fab!(:other_channel) { Fabricate(:chat_channel) }
+
+      before { other_channel.add(current_user) }
+
+      it "shows an unread indicator for the channel with unread threads in the index" do
+        visit("/")
+        chat_page.open_from_header
+        expect(drawer_page).to have_unread_channel(channel)
+      end
+
+      it "does not show an unread indicator for the channel if the user has visited the channel since the unread thread message arrived" do
+        channel.membership_for(current_user).update!(last_viewed_at: Time.zone.now)
+        visit("/")
+        chat_page.open_from_header
+        expect(drawer_page).to have_no_unread_channel(channel)
+      end
+
+      it "clears the index unread indicator for the channel when opening it but keeps the thread list unread indicator" do
+        visit("/")
+        chat_page.open_from_header
+        drawer_page.open_channel(channel)
+        expect(channel_page).to have_unread_thread_indicator(count: 1)
+        drawer_page.back
+        expect(drawer_page).to have_no_unread_channel(channel)
+      end
+
+      it "does not show an unread indicator for the channel index if a new thread message arrives while the user is looking at the channel" do
+        visit("/")
+        chat_page.open_from_header
+        expect(drawer_page).to have_unread_channel(channel)
+        drawer_page.open_channel(channel)
+        Fabricate(:chat_message, thread: thread, user: other_user)
+        drawer_page.back
+        expect(drawer_page).to have_no_unread_channel(channel)
+      end
+
+      it "shows an unread indicator for the channel index if a new thread message arrives while the user is not looking at the channel" do
+        visit("/")
+        chat_page.open_from_header
+        drawer_page.open_channel(channel)
+        drawer_page.back
+        expect(drawer_page).to have_no_unread_channel(channel)
+        travel_to(1.minute.from_now)
+        Fabricate(:chat_message, thread: thread, user: other_user)
+        expect(drawer_page).to have_unread_channel(channel)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/thread_tracking/full_page_spec.rb b/plugins/chat/spec/system/thread_tracking/full_page_spec.rb
new file mode 100644
index 00000000000..9f284d4a336
--- /dev/null
+++ b/plugins/chat/spec/system/thread_tracking/full_page_spec.rb
@@ -0,0 +1,145 @@
+# frozen_string_literal: true
+
+describe "Thread tracking state | full page", type: :system do
+  fab!(:current_user) { Fabricate(:user) }
+  fab!(:channel) { Fabricate(:chat_channel, threading_enabled: true) }
+  fab!(:other_user) { Fabricate(:user) }
+  fab!(:thread) { Fabricate(:chat_thread, channel: channel) }
+
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:channel_page) { PageObjects::Pages::ChatChannel.new }
+  let(:thread_page) { PageObjects::Pages::ChatThread.new }
+  let(:thread_list_page) { PageObjects::Components::Chat::ThreadList.new }
+  let(:sidebar_page) { PageObjects::Pages::Sidebar.new }
+
+  before do
+    chat_system_bootstrap(current_user, [channel])
+    sign_in(current_user)
+    thread.add(current_user)
+  end
+
+  context "when the user has unread messages for a thread" do
+    fab!(:message_1) do
+      Fabricate(:chat_message, chat_channel: channel, thread: thread, user: current_user)
+    end
+    fab!(:message_2) { Fabricate(:chat_message, chat_channel: channel, thread: thread) }
+
+    it "shows the count of threads with unread messages on the thread list button" do
+      chat_page.visit_channel(channel)
+      expect(channel_page).to have_unread_thread_indicator(count: 1)
+    end
+
+    it "does not include threads with deleted original messages in the count of threads with unread messages" do
+      thread.original_message.trash!
+      chat_page.visit_channel(channel)
+      expect(thread_page).to have_no_unread_list_indicator
+    end
+
+    it "shows an indicator on the unread thread in the list" do
+      chat_page.visit_channel(channel)
+      channel_page.open_thread_list
+      expect(thread_list_page).to have_unread_item(thread.id, count: 1)
+    end
+
+    it "marks the thread as read and removes both indicators when the user opens it" do
+      chat_page.visit_channel(channel)
+      channel_page.open_thread_list
+      thread_list_page.item_by_id(thread.id).click
+      expect(thread_page).to have_no_unread_list_indicator
+      thread_page.back_to_previous_route
+      expect(thread_list_page).to have_no_unread_item(thread.id)
+    end
+
+    it "shows unread indicators for the header of the list when a new unread arrives" do
+      thread.membership_for(current_user).update!(last_read_message_id: message_2.id)
+      chat_page.visit_channel(channel)
+      channel_page.open_thread_list
+      expect(thread_list_page).to have_no_unread_item(thread.id)
+      Fabricate(:chat_message, chat_channel: channel, thread: thread)
+      expect(thread_list_page).to have_unread_item(thread.id)
+    end
+
+    it "does not change the unread indicator for the header icon when the user is not a member of the thread" do
+      thread.remove(current_user)
+      chat_page.visit_channel(channel)
+      expect(channel_page).to have_no_unread_thread_indicator
+      Fabricate(:chat_message, chat_channel: channel, thread: thread)
+      expect(channel_page).to have_no_unread_thread_indicator
+      channel_page.open_thread_list
+      expect(thread_list_page).to have_no_unread_item(thread.id)
+    end
+
+    it "allows the user to change their tracking level for an existing thread" do
+      chat_page.visit_thread(thread)
+      thread_page.notification_level = :normal
+      expect(thread_page).to have_notification_level("normal")
+    end
+
+    it "allows the user to start tracking a thread they have not replied to" do
+      new_thread = Fabricate(:chat_thread, channel: channel)
+      Fabricate(:chat_message, chat_channel: channel, thread: new_thread)
+      chat_page.visit_thread(new_thread)
+      thread_page.notification_level = :tracking
+      expect(thread_page).to have_notification_level("tracking")
+      chat_page.visit_channel(channel)
+      channel_page.open_thread_list
+      expect(thread_list_page).to have_thread(new_thread)
+    end
+
+    describe "sidebar unread indicators" do
+      fab!(:other_channel) { Fabricate(:chat_channel) }
+
+      before do
+        other_channel.add(current_user)
+        SiteSetting.navigation_menu = "sidebar"
+      end
+
+      it "shows an unread indicator for the channel with unread threads in the sidebar" do
+        chat_page.visit_channel(other_channel)
+        expect(sidebar_page).to have_unread_channel(channel)
+      end
+
+      it "does not show an unread indicator for the channel if the user has visited the channel since the unread thread message arrived" do
+        channel.membership_for(current_user).update!(last_viewed_at: Time.zone.now)
+        chat_page.visit_channel(other_channel)
+        expect(sidebar_page).to have_no_unread_channel(channel)
+      end
+
+      it "clears the sidebar unread indicator for the channel when opening it but keeps the thread list unread indicator" do
+        chat_page.visit_channel(channel)
+        expect(sidebar_page).to have_no_unread_channel(channel)
+        expect(channel_page).to have_unread_thread_indicator(count: 1)
+      end
+
+      it "does not show an unread indicator for the channel sidebar if a new thread message arrives while the user is looking at the channel" do
+        chat_page.visit_channel(channel)
+        expect(sidebar_page).to have_no_unread_channel(channel)
+        Fabricate(:chat_message, thread: thread)
+        expect(sidebar_page).to have_no_unread_channel(channel)
+      end
+
+      it "shows an unread indicator for the channel sidebar if a new thread message arrives while the user is not looking at the channel" do
+        chat_page.visit_channel(channel)
+        expect(sidebar_page).to have_no_unread_channel(channel)
+        chat_page.visit_channel(other_channel)
+        Fabricate(:chat_message, thread: thread)
+        expect(sidebar_page).to have_unread_channel(channel)
+      end
+    end
+
+    context "when the user's notification level for the thread is set to normal" do
+      before { thread.membership_for(current_user).update!(notification_level: :normal) }
+
+      it "does not show a the count of threads with unread messages on the thread list button" do
+        chat_page.visit_channel(channel)
+        expect(channel_page).to have_no_unread_thread_indicator
+      end
+
+      it "does not show an indicator on the unread thread in the list" do
+        chat_page.visit_channel(channel)
+        channel_page.open_thread_list
+        expect(thread_list_page).to have_no_unread_item(thread.id)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/transcript_spec.rb b/plugins/chat/spec/system/transcript_spec.rb
index ad5e75212b5..d75e376e3cc 100644
--- a/plugins/chat/spec/system/transcript_spec.rb
+++ b/plugins/chat/spec/system/transcript_spec.rb
@@ -1,99 +1,41 @@
 # frozen_string_literal: true
 
-RSpec.describe "Quoting chat message transcripts", type: :system, js: true do
+RSpec.describe "Quoting chat message transcripts", type: :system do
   fab!(:current_user) { Fabricate(:user) }
+  fab!(:admin) { Fabricate(:admin) }
   fab!(:chat_channel_1) { Fabricate(:chat_channel) }
 
+  let(:cdp) { PageObjects::CDP.new }
   let(:chat_page) { PageObjects::Pages::Chat.new }
-  let(:chat_channel_page) { PageObjects::Pages::ChatChannel.new }
+  let(:channel_page) { PageObjects::Pages::ChatChannel.new }
   let(:topic_page) { PageObjects::Pages::Topic.new }
 
   before do
-    chat_system_bootstrap(Fabricate(:admin), [chat_channel_1])
+    chat_system_bootstrap(admin, [chat_channel_1])
     chat_channel_1.add(current_user)
     sign_in(current_user)
   end
 
-  def select_message_desktop(message)
-    if page.has_css?(".chat-message-container.selecting-messages")
-      chat_channel_page.message_by_id(message.id).find(".chat-message-selector").click
-    else
-      chat_channel_page.message_by_id(message.id).hover
-      expect(page).to have_css(".chat-message-actions .more-buttons")
-      find(".chat-message-actions .more-buttons").click
-      find(".select-kit-row[data-value=\"selectMessage\"]").click
-    end
-  end
-
-  def select_message_mobile(message)
-    if page.has_css?(".chat-message-container.selecting-messages")
-      chat_channel_page.message_by_id(message.id).find(".chat-message-selector").click
-    else
-      chat_channel_page.message_by_id(message.id).click(delay: 0.5)
-      find(".chat-message-action-item[data-id=\"selectMessage\"]").click
-    end
-  end
-
-  def cdp_allow_clipboard_access!
-    cdp_params = {
-      origin: page.server_url,
-      permission: {
-        name: "clipboard-read",
-      },
-      setting: "granted",
-    }
-    page.driver.browser.execute_cdp("Browser.setPermission", **cdp_params)
-
-    cdp_params = {
-      origin: page.server_url,
-      permission: {
-        name: "clipboard-write",
-      },
-      setting: "granted",
-    }
-    page.driver.browser.execute_cdp("Browser.setPermission", **cdp_params)
-  end
-
-  def read_clipboard
-    page.evaluate_async_script("navigator.clipboard.readText().then(arguments[0])")
-  end
-
-  def click_selection_button(button)
-    selector =
-      case button
-      when "quote"
-        "#chat-quote-btn"
-      when "copy"
-        "#chat-copy-btn"
-      when "cancel"
-        "#chat-cancel-selection-btn"
-      when "move"
-        "#chat-move-to-channel-btn"
-      end
-    within(".chat-selection-management-buttons") { find(selector).click }
-  end
-
   def copy_messages_to_clipboard(messages)
     messages = Array.wrap(messages)
-    messages.each { |message| select_message_desktop(message) }
-    expect(chat_channel_page).to have_selection_management
-    click_selection_button("copy")
-    expect(page).to have_content("Chat quote copied to clipboard")
-    clip_text = read_clipboard
+    messages.each { |message| channel_page.messages.select(message) }
+    channel_page.selection_management.copy
+    expect(page).to have_css(".chat-selection-management[data-last-copy-successful]")
+    clip_text = cdp.read_clipboard
     expect(clip_text.chomp).to eq(generate_transcript(messages, current_user))
     clip_text
   end
 
   def generate_transcript(messages, acting_user)
     messages = Array.wrap(messages)
-    ChatTranscriptService
+    Chat::TranscriptService
       .new(messages.first.chat_channel, acting_user, messages_or_ids: messages.map(&:id))
       .generate_markdown
       .chomp
   end
 
   describe "copying quote transcripts with the clipboard" do
-    before { cdp_allow_clipboard_access! }
+    before { cdp.allow_clipboard }
 
     context "when quoting a single message into a topic" do
       fab!(:post_1) { Fabricate(:post) }
@@ -102,8 +44,6 @@ RSpec.describe "Quoting chat message transcripts", type: :system, js: true do
       it "quotes the message" do
         chat_page.visit_channel(chat_channel_1)
 
-        expect(chat_channel_page).to have_no_loading_skeleton
-
         clip_text = copy_messages_to_clipboard(message_1)
         topic_page.visit_topic_and_open_composer(post_1.topic)
         topic_page.fill_in_composer("This is a new post!\n\n" + clip_text)
@@ -126,8 +66,6 @@ RSpec.describe "Quoting chat message transcripts", type: :system, js: true do
       it "quotes the messages" do
         chat_page.visit_channel(chat_channel_1)
 
-        expect(chat_channel_page).to have_no_loading_skeleton
-
         clip_text = copy_messages_to_clipboard([message_1, message_2])
         topic_page.visit_topic_and_open_composer(post_1.topic)
         topic_page.fill_in_composer("This is a new post!\n\n" + clip_text)
@@ -158,8 +96,6 @@ RSpec.describe "Quoting chat message transcripts", type: :system, js: true do
       it "works" do
         chat_page.visit_channel(chat_channel_1)
 
-        expect(chat_channel_page).to have_no_loading_skeleton
-
         clip_text = copy_messages_to_clipboard(message_1)
         topic_page.visit_topic_and_open_composer(post_1.topic)
         topic_page.fill_in_composer(clip_text)
@@ -176,19 +112,12 @@ RSpec.describe "Quoting chat message transcripts", type: :system, js: true do
       it "quotes the message" do
         chat_page.visit_channel(chat_channel_1)
 
-        expect(chat_channel_page).to have_no_loading_skeleton
-
         clip_text = copy_messages_to_clipboard(message_1)
-        click_selection_button("cancel")
-        chat_channel_page.send_message(clip_text)
+        channel_page.selection_management.cancel
+        channel_page.send_message(clip_text)
 
-        expect(page).to have_selector(".chat-message", count: 2)
-
-        message = ChatMessage.find_by(user: current_user, message: clip_text.chomp)
-
-        within(chat_channel_page.message_by_id(message.id)) do
-          expect(page).to have_css(".chat-transcript")
-        end
+        expect(page).to have_css(".chat-message", count: 2)
+        expect(page).to have_css(".chat-transcript")
       end
     end
   end
@@ -199,11 +128,8 @@ RSpec.describe "Quoting chat message transcripts", type: :system, js: true do
 
     it "opens the topic composer with correct state" do
       chat_page.visit_channel(chat_channel_1)
-
-      expect(chat_channel_page).to have_no_loading_skeleton
-
-      select_message_desktop(message_1)
-      click_selection_button("quote")
+      channel_page.messages.select(message_1)
+      channel_page.selection_management.quote
 
       expect(topic_page).to have_expanded_composer
       expect(topic_page).to have_composer_content(generate_transcript(message_1, current_user))
@@ -227,10 +153,8 @@ RSpec.describe "Quoting chat message transcripts", type: :system, js: true do
       it "first navigates to the channel's category before opening the topic composer with the quote prefilled",
          mobile: true do
         chat_page.visit_channel(chat_channel_1)
-        expect(chat_channel_page).to have_no_loading_skeleton
-
-        select_message_mobile(message_1)
-        click_selection_button("quote")
+        channel_page.messages.select(message_1)
+        channel_page.selection_management.quote
 
         expect(topic_page).to have_expanded_composer
         expect(topic_page).to have_composer_content(generate_transcript(message_1, current_user))
diff --git a/plugins/chat/spec/system/unfollow_dm_channel_spec.rb b/plugins/chat/spec/system/unfollow_dm_channel_spec.rb
index aff4a419009..e814e272499 100644
--- a/plugins/chat/spec/system/unfollow_dm_channel_spec.rb
+++ b/plugins/chat/spec/system/unfollow_dm_channel_spec.rb
@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-RSpec.describe "Unfollow dm channel", type: :system, js: true do
+RSpec.describe "Unfollow dm channel", type: :system do
   fab!(:current_user) { Fabricate(:user) }
   fab!(:other_user) { Fabricate(:user) }
   fab!(:dm_channel_1) { Fabricate(:direct_message_channel, users: [current_user, other_user]) }
 
   let!(:chat_page) { PageObjects::Pages::Chat.new }
-  let!(:chat_channel_page) { PageObjects::Pages::ChatChannel.new }
+  let!(:channel_page) { PageObjects::Pages::ChatChannel.new }
 
   before do
     SiteSetting.navigation_menu = "sidebar"
@@ -22,15 +22,16 @@ RSpec.describe "Unfollow dm channel", type: :system, js: true do
 
       expect(page).to have_no_css(".channel-#{dm_channel_1.id}")
 
-      using_session(:user_1) do
+      using_session(:user_1) do |session|
         text = "this is fine"
         sign_in(other_user)
         chat_page.visit_channel(dm_channel_1)
-        chat_channel_page.send_message(text)
-        expect(chat_channel_page).to have_message(text: text)
+        channel_page.send_message(text)
+        expect(channel_page).to have_message(text: text)
+        session.quit
       end
 
-      expect(page).to have_css(".channel-#{dm_channel_1.id} .urgent")
+      expect(page).to have_css(".channel-#{dm_channel_1.id} .urgent", wait: 25)
     end
   end
 end
diff --git a/plugins/chat/spec/system/update_last_read.rb b/plugins/chat/spec/system/update_last_read.rb
new file mode 100644
index 00000000000..5c51a49482f
--- /dev/null
+++ b/plugins/chat/spec/system/update_last_read.rb
@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+RSpec.describe "Update last read", type: :system do
+  fab!(:current_user) { Fabricate(:user) }
+  fab!(:channel_1) { Fabricate(:chat_channel) }
+  fab!(:first_unread) { Fabricate(:chat_message, chat_channel: channel_1) }
+
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:channel_page) { PageObjects::Pages::ChatChannel.new }
+  let(:membership) { Chat::ChannelMembershipManager.new(channel_1).find_for_user(current_user) }
+
+  before do
+    chat_system_bootstrap
+    channel_1.add(current_user)
+    membership.update!(last_read_message_id: first_unread.id)
+    25.times { |i| Fabricate(:chat_message, chat_channel: channel_1) }
+    sign_in(current_user)
+  end
+
+  context "when the full message is not visible" do
+    it "doesn’t mark it as read" do
+      before_last_message = Fabricate(:chat_message, chat_channel: channel_1)
+      last_message = Fabricate(:chat_message, chat_channel: channel_1)
+      chat_page.visit_channel(channel_1)
+
+      page.execute_script("document.querySelector('.chat-messages-scroll').scrollTo(0, -5)")
+
+      try_until_success(timeout: 5) do
+        expect(membership.reload.last_read_message_id).to eq(before_last_message.id)
+      end
+    end
+  end
+
+  context "when the full message is visible" do
+    it "marks it as read" do
+      last_message = Fabricate(:chat_message, chat_channel: channel_1)
+      chat_page.visit_channel(channel_1)
+
+      page.execute_script("document.querySelector('.chat-messages-scroll').scrollTo(0, 0)")
+
+      try_until_success(timeout: 5) do
+        expect(membership.reload.last_read_message_id).to eq(last_message.id)
+      end
+    end
+  end
+
+  context "when user had not previous last read" do
+    before { membership.update!(last_read_message_id: nil) }
+
+    it "marks last message as read" do
+      last_message = Fabricate(:chat_message, chat_channel: channel_1)
+      chat_page.visit_channel(channel_1)
+
+      try_until_success(timeout: 5) do
+        expect(membership.reload.last_read_message_id).to eq(last_message.id)
+      end
+    end
+  end
+
+  context "when scrolling from not visible to bottom" do
+    it "marks last message as read" do
+      before_last_message = Fabricate(:chat_message, chat_channel: channel_1)
+      last_message = Fabricate(:chat_message, chat_channel: channel_1)
+      chat_page.visit_channel(channel_1)
+
+      page.execute_script("document.querySelector('.chat-messages-scroll').scrollTo(0, -15)")
+
+      try_until_success(timeout: 5) do
+        expect(membership.reload.last_read_message_id).to eq(before_last_message.id)
+      end
+
+      page.execute_script("document.querySelector('.chat-messages-scroll').scrollTo(0, -1)")
+
+      try_until_success(timeout: 5) do
+        expect(membership.reload.last_read_message_id).to eq(last_message.id)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/uploads_spec.rb b/plugins/chat/spec/system/uploads_spec.rb
index 6e49290023c..9f5760a09ec 100644
--- a/plugins/chat/spec/system/uploads_spec.rb
+++ b/plugins/chat/spec/system/uploads_spec.rb
@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-describe "Uploading files in chat messages", type: :system, js: true do
+describe "Uploading files in chat messages", type: :system do
   fab!(:current_user) { Fabricate(:user) }
   fab!(:channel_1) { Fabricate(:chat_channel) }
   fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1) }
 
   let(:chat) { PageObjects::Pages::Chat.new }
-  let(:channel) { PageObjects::Pages::ChatChannel.new }
+  let(:channel_page) { PageObjects::Pages::ChatChannel.new }
 
   before { chat_system_bootstrap }
 
@@ -20,103 +20,107 @@ describe "Uploading files in chat messages", type: :system, js: true do
       chat.visit_channel(channel_1)
       file_path = file_from_fixtures("logo.png", "images").path
       attach_file(file_path) do
-        channel.open_action_menu
-        channel.click_action_button("chat-upload-btn")
+        channel_page.open_action_menu
+        channel_page.click_action_button("chat-upload-btn")
       end
 
       expect(page).to have_css(".chat-composer-upload .preview .preview-img")
-      expect(page).to have_content(File.basename(file_path))
 
-      channel.send_message("upload testing")
+      channel_page.send_message("upload testing")
 
       expect(page).not_to have_css(".chat-composer-upload")
-      expect(channel).to have_message(text: "upload testing")
-      expect(ChatMessage.last.uploads.count).to eq(1)
+      expect(channel_page.messages).to have_message(text: "upload testing", persisted: true)
+      expect(Chat::Message.last.uploads.count).to eq(1)
     end
 
     it "allows uploading multiple files" do
       chat.visit_channel(channel_1)
+
       file_path_1 = file_from_fixtures("logo.png", "images").path
       file_path_2 = file_from_fixtures("logo.jpg", "images").path
       attach_file([file_path_1, file_path_2]) do
-        channel.open_action_menu
-        channel.click_action_button("chat-upload-btn")
+        channel_page.open_action_menu
+        channel_page.click_action_button("chat-upload-btn")
       end
+
       expect(page).to have_css(".chat-composer-upload .preview .preview-img", count: 2)
-      channel.send_message("upload testing")
+      channel_page.send_message("upload testing")
 
       expect(page).not_to have_css(".chat-composer-upload")
-      expect(channel).to have_message(text: "upload testing")
-      expect(ChatMessage.last.uploads.count).to eq(2)
+      expect(channel_page.messages).to have_message(text: "upload testing", persisted: true)
+      expect(Chat::Message.last.uploads.count).to eq(2)
     end
 
-    it "allows uploading a huge image file with preprocessing" do
+    xit "allows uploading a huge image file with preprocessing" do
       SiteSetting.composer_media_optimization_image_bytes_optimization_threshold = 200.kilobytes
       chat.visit_channel(channel_1)
       file_path = file_from_fixtures("huge.jpg", "images").path
       attach_file(file_path) do
-        channel.open_action_menu
-        channel.click_action_button("chat-upload-btn")
+        channel_page.open_action_menu
+        channel_page.click_action_button("chat-upload-btn")
       end
 
-      expect(page).to have_content(File.basename(file_path))
       expect(find(".chat-composer-upload")).to have_content("Processing")
 
       # image processing clientside is slow! here we are waiting for processing
       # to complete then the upload to complete as well
-      using_wait_time(10) do
-        expect(find(".chat-composer-upload")).to have_content("Uploading")
-        expect(page).to have_css(".chat-composer-upload .preview .preview-img")
-      end
+      expect(page).to have_css(".chat-composer-upload .preview .preview-img", wait: 25)
 
-      channel.send_message("upload testing")
+      channel_page.send_message("upload testing")
 
       expect(page).not_to have_css(".chat-composer-upload")
-      expect(channel).to have_message(text: "upload testing")
-      expect(ChatMessage.last.uploads.count).to eq(1)
+      expect(channel_page.messages).to have_message(text: "upload testing", persisted: true)
+      expect(Chat::Message.last.uploads.count).to eq(1)
     end
   end
 
   context "when editing a message with uploads" do
     fab!(:message_2) { Fabricate(:chat_message, user: current_user, chat_channel: channel_1) }
-    fab!(:chat_upload) { Fabricate(:chat_upload, chat_message: message_2, user: current_user) }
+    fab!(:upload_reference) do
+      Fabricate(
+        :upload_reference,
+        target: message_2,
+        upload: Fabricate(:upload, user: current_user),
+      )
+    end
 
     before do
       channel_1.add(current_user)
       sign_in(current_user)
 
       file = file_from_fixtures("logo-dev.png", "images")
-      url = Discourse.store.store_upload(file, chat_upload.upload)
-      chat_upload.upload.update!(url: url, sha1: Upload.generate_digest(file))
+      url = Discourse.store.store_upload(file, upload_reference.upload)
+      upload_reference.upload.update!(url: url, sha1: Upload.generate_digest(file))
     end
 
     it "allows deleting uploads" do
       chat.visit_channel(channel_1)
-      channel.open_edit_message(message_2)
-      find(".chat-composer-upload").find(".remove-upload").click
-      channel.click_send_message
-      expect(channel.message_by_id(message_2.id)).not_to have_css(".chat-uploads")
-      expect(message_2.reload.uploads).to be_empty
+      channel_page.open_edit_message(message_2)
+      find(".chat-composer-upload").hover
+      find(".chat-composer-upload__remove-btn").click
+      channel_page.click_send_message
+      expect(channel_page.message_by_id(message_2.id)).not_to have_css(".chat-uploads")
+      try_until_success(timeout: 5) { expect(message_2.reload.uploads).to be_empty }
     end
 
     it "allows adding more uploads" do
       chat.visit_channel(channel_1)
-      channel.open_edit_message(message_2)
+      channel_page.open_edit_message(message_2)
 
       file_path = file_from_fixtures("logo.png", "images").path
       attach_file(file_path) do
-        channel.open_action_menu
-        channel.click_action_button("chat-upload-btn")
+        channel_page.open_action_menu
+        channel_page.click_action_button("chat-upload-btn")
       end
 
       expect(page).to have_css(".chat-composer-upload .preview .preview-img", count: 2)
-      expect(page).to have_content(File.basename(file_path))
 
-      channel.click_send_message
+      channel_page.click_send_message
 
       expect(page).not_to have_css(".chat-composer-upload")
       expect(page).to have_css(".chat-img-upload", count: 2)
-      expect(message_2.reload.uploads.count).to eq(2)
+
+      try_until_success(timeout: 5) { expect(message_2.reload.uploads.count).to eq(2) }
     end
   end
 
@@ -134,13 +138,13 @@ describe "Uploading files in chat messages", type: :system, js: true do
 
     it "does not show the action button for uploading files in public channels" do
       chat.visit_channel(channel_1)
-      channel.open_action_menu
+      channel_page.open_action_menu
       expect(page).not_to have_css(".chat-upload-btn")
     end
 
     it "does not show the action button for uploading files in direct message channels" do
       chat.visit_channel(direct_message_channel_1)
-      channel.open_action_menu
+      channel_page.open_action_menu
       expect(page).not_to have_css(".chat-upload-btn")
     end
   end
diff --git a/plugins/chat/spec/system/user_card_spec.rb b/plugins/chat/spec/system/user_card_spec.rb
index 07427ed79dc..da5348ba1c2 100644
--- a/plugins/chat/spec/system/user_card_spec.rb
+++ b/plugins/chat/spec/system/user_card_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "User card", type: :system, js: true do
+RSpec.describe "User card", type: :system do
   fab!(:current_user) { Fabricate(:user) }
   fab!(:topic_1) { Fabricate(:topic) }
 
@@ -10,13 +10,13 @@ RSpec.describe "User card", type: :system, js: true do
 
   shared_examples "not showing chat button" do
     it "doesn’t show the chat buttton" do
-      expect(page).to have_no_css(".user-card-chat-btn")
+      expect(page).to have_no_css(".chat-user-card-btn")
     end
   end
 
   shared_examples "showing chat button" do
     it "shows the chat buttton" do
-      expect(page).to have_css(".user-card-chat-btn")
+      expect(page).to have_css(".chat-user-card-btn")
     end
   end
 
@@ -49,13 +49,13 @@ RSpec.describe "User card", type: :system, js: true do
         include_examples "showing chat button"
 
         context "when clicking chat button" do
-          before { find(".user-card-chat-btn").click }
+          before { find(".chat-user-card-btn").click }
 
           it "opens correct channel" do
             # at this point the ChatChannel is not created yet
             expect(page).to have_css(".chat-drawer.is-expanded")
             expect(page).to have_css(
-              ".chat-drawer.is-expanded[data-chat-channel-id='#{ChatChannel.last.id}']",
+              ".chat-drawer.is-expanded[data-chat-channel-id='#{Chat::Channel.last.id}']",
             )
           end
         end
diff --git a/plugins/chat/spec/system/user_chat_preferences_spec.rb b/plugins/chat/spec/system/user_chat_preferences_spec.rb
index 70adf38e6f6..69ade2eb6a1 100644
--- a/plugins/chat/spec/system/user_chat_preferences_spec.rb
+++ b/plugins/chat/spec/system/user_chat_preferences_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "User chat preferences", type: :system, js: true do
+RSpec.describe "User chat preferences", type: :system do
   fab!(:current_user) { Fabricate(:user) }
 
   let(:chat) { PageObjects::Pages::Chat.new }
@@ -32,6 +32,17 @@ RSpec.describe "User chat preferences", type: :system, js: true do
     expect(page).to have_css("#user_chat_sounds .select-kit-header[data-value='bell']")
   end
 
+  it "can select header_indicator_preference" do
+    visit("/u/#{current_user.username}/preferences/chat")
+    find("#user_chat_header_indicator_preference .select-kit-header[data-value]").click
+    find("[data-value='dm_and_mentions']").click
+    find(".save-changes").click
+
+    expect(page).to have_css(
+      "#user_chat_header_indicator_preference .select-kit-header[data-value='dm_and_mentions']",
+    )
+  end
+
   context "as an admin on another user's preferences" do
     fab!(:current_user) { Fabricate(:admin) }
     fab!(:user_1) { Fabricate(:user) }
@@ -40,7 +51,8 @@ RSpec.describe "User chat preferences", type: :system, js: true do
 
     it "allows to change settings" do
       visit("/u/#{user_1.username}/preferences")
-      find(".preferences-chat-link").click
+
+      find(".user-nav__preferences-chat").click
 
       expect(page).to have_current_path("/u/#{user_1.username}/preferences/chat")
     end
diff --git a/plugins/chat/spec/system/user_menu_notifications/sidebar_spec.rb b/plugins/chat/spec/system/user_menu_notifications/sidebar_spec.rb
index 6dfbff7105a..725fd015efa 100644
--- a/plugins/chat/spec/system/user_menu_notifications/sidebar_spec.rb
+++ b/plugins/chat/spec/system/user_menu_notifications/sidebar_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "User menu notifications | sidebar", type: :system, js: true do
+RSpec.describe "User menu notifications | sidebar", type: :system do
   fab!(:current_user) { Fabricate(:user) }
 
   let(:chat) { PageObjects::Pages::Chat.new }
@@ -44,7 +44,7 @@ RSpec.describe "User menu notifications | sidebar", type: :system, js: true do
           Jobs.run_immediately!
 
           message =
-            Chat::ChatMessageCreator.create(
+            Chat::MessageCreator.create(
               chat_channel: dm_channel_1,
               user: other_user,
               content: "this is fine @#{current_user.username}",
@@ -59,7 +59,7 @@ RSpec.describe "User menu notifications | sidebar", type: :system, js: true do
           end
           expect(find("#quick-access-chat-notifications")).to have_link(
             I18n.t("js.notifications.popup.direct_message_chat_mention.direct"),
-            href: "/chat/channel/#{dm_channel_1.id}/#{other_user.username}?messageId=#{message.id}",
+            href: "/chat/c/#{other_user.username}/#{dm_channel_1.id}/#{message.id}",
           )
         end
       end
@@ -81,7 +81,7 @@ RSpec.describe "User menu notifications | sidebar", type: :system, js: true do
 
         xit "shows a group mention notification" do
           message =
-            Chat::ChatMessageCreator.create(
+            Chat::MessageCreator.create(
               chat_channel: channel_1,
               user: other_user,
               content: "this is fine @#{group.name}",
@@ -100,7 +100,7 @@ RSpec.describe "User menu notifications | sidebar", type: :system, js: true do
               identifier: "@#{group.name}",
               channel: channel_1.name,
             ),
-            href: "/chat/channel/#{channel_1.id}/#{channel_1.slug}?messageId=#{message.id}",
+            href: "/chat/c/#{channel_1.slug}/#{channel_1.id}/#{message.id}",
           )
         end
       end
@@ -110,7 +110,7 @@ RSpec.describe "User menu notifications | sidebar", type: :system, js: true do
           Jobs.run_immediately!
 
           message =
-            Chat::ChatMessageCreator.create(
+            Chat::MessageCreator.create(
               chat_channel: channel_1,
               user: other_user,
               content: "this is fine @#{current_user.username}",
@@ -126,7 +126,32 @@ RSpec.describe "User menu notifications | sidebar", type: :system, js: true do
 
           expect(find("#quick-access-chat-notifications")).to have_link(
             I18n.t("js.notifications.popup.chat_mention.direct", channel: channel_1.name),
-            href: "/chat/channel/#{channel_1.id}/#{channel_1.slug}?messageId=#{message.id}",
+            href: "/chat/c/#{channel_1.slug}/#{channel_1.id}/#{message.id}",
+          )
+        end
+
+        it "shows a mention notification when the message is in a thread" do
+          Jobs.run_immediately!
+
+          message =
+            Chat::MessageCreator.create(
+              chat_channel: channel_1,
+              user: other_user,
+              content: "this is fine @#{current_user.username}",
+              thread_id: Fabricate(:chat_thread, channel: channel_1).id,
+            ).chat_message
+
+          visit("/")
+
+          find(".header-dropdown-toggle.current-user").click
+          within("#user-menu-button-chat-notifications") do |panel|
+            expect(panel).to have_content(1)
+            panel.click
+          end
+
+          expect(find("#quick-access-chat-notifications")).to have_link(
+            I18n.t("js.notifications.popup.chat_mention.direct", channel: channel_1.name),
+            href: "/chat/c/#{channel_1.slug}/#{channel_1.id}/t/#{message.thread_id}",
           )
         end
       end
@@ -134,7 +159,7 @@ RSpec.describe "User menu notifications | sidebar", type: :system, js: true do
       context "when @all" do
         xit "shows a mention notification" do
           message =
-            Chat::ChatMessageCreator.create(
+            Chat::MessageCreator.create(
               chat_channel: channel_1,
               user: other_user,
               content: "this is fine @all",
@@ -153,7 +178,7 @@ RSpec.describe "User menu notifications | sidebar", type: :system, js: true do
               identifier: "@all",
               channel: channel_1.name,
             ),
-            href: "/chat/channel/#{channel_1.id}/#{channel_1.slug}?messageId=#{message.id}",
+            href: "/chat/c/#{channel_1.slug}/#{channel_1.id}/#{message.id}",
           )
         end
       end
@@ -173,13 +198,14 @@ RSpec.describe "User menu notifications | sidebar", type: :system, js: true do
       channel.send_message("this is fine @#{other_user.username}")
       find(".invite-link", wait: 5).click
 
-      using_session(:user_1) do
+      using_session(:user_1) do |session|
         sign_in(other_user)
         visit("/")
         find(".header-dropdown-toggle.current-user").click
 
         expect(find("#user-menu-button-chat-notifications")).to have_content(1)
         expect(find("#quick-access-all-notifications")).to have_css(".chat-invitation.unread")
+        session.quit
       end
     end
   end
diff --git a/plugins/chat/spec/system/user_presence.rb b/plugins/chat/spec/system/user_presence.rb
new file mode 100644
index 00000000000..147a7c1e027
--- /dev/null
+++ b/plugins/chat/spec/system/user_presence.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+RSpec.describe "User presence", type: :system do
+  fab!(:channel_1) { Fabricate(:chat_channel) }
+  fab!(:current_user) { Fabricate(:user) }
+
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:channel) { PageObjects::Pages::ChatChannel.new }
+
+  before do
+    chat_system_bootstrap
+    channel_1.add(current_user)
+  end
+
+  it "shows presence indicator" do
+    sign_in(current_user)
+    chat_page.visit_channel(channel_1)
+    channel.send_message("Am I present?")
+
+    expect(page).to have_css(".chat-message .chat-user-avatar.is-online")
+  end
+
+  context "when user hides presence" do
+    it "hides the presence indicator" do
+      current_user.user_option.update!(hide_profile_and_presence: true)
+      sign_in(current_user)
+      chat_page.visit_channel(channel_1)
+      channel.send_message("Am I present?")
+
+      expect(page).to have_no_css(".chat-user-avatar.is-online")
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/user_status/sidebar_spec.rb b/plugins/chat/spec/system/user_status/sidebar_spec.rb
index ee8a99ebac1..7b210d04b18 100644
--- a/plugins/chat/spec/system/user_status/sidebar_spec.rb
+++ b/plugins/chat/spec/system/user_status/sidebar_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "User status | sidebar", type: :system, js: true do
+RSpec.describe "User status | sidebar", type: :system do
   fab!(:current_user) { Fabricate(:user) }
   fab!(:dm_channel_1) { Fabricate(:direct_message_channel, users: [current_user]) }
 
@@ -20,8 +20,8 @@ RSpec.describe "User status | sidebar", type: :system, js: true do
 
     visit("/")
 
-    expect(find(".user-status .emoji")["title"]).to eq("online")
-    expect(find(".user-status .emoji")["src"]).to include("heart")
+    expect(find(".user-status-message .emoji")["alt"]).to eq("heart")
+    expect(find(".user-status-message .emoji")["src"]).to include("heart")
   end
 
   context "when changing status" do
@@ -31,8 +31,8 @@ RSpec.describe "User status | sidebar", type: :system, js: true do
       visit("/")
       current_user.set_status!("offline", "tooth")
 
-      expect(page).to have_css('.user-status .emoji[title="offline"]')
-      expect(find(".user-status .emoji")["src"]).to include("tooth")
+      expect(page).to have_css('.user-status-message .emoji[alt="tooth"]')
+      expect(find(".user-status-message .emoji")["src"]).to include("tooth")
     end
   end
 
@@ -43,7 +43,7 @@ RSpec.describe "User status | sidebar", type: :system, js: true do
       visit("/")
       current_user.clear_status!
 
-      expect(page).to have_no_css(".user-status")
+      expect(page).to have_no_css(".user-status-message")
     end
   end
 end
diff --git a/plugins/chat/spec/system/visit_channel_spec.rb b/plugins/chat/spec/system/visit_channel_spec.rb
index 6aad666d0dd..5acc34970aa 100644
--- a/plugins/chat/spec/system/visit_channel_spec.rb
+++ b/plugins/chat/spec/system/visit_channel_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "Visit channel", type: :system, js: true do
+RSpec.describe "Visit channel", type: :system do
   fab!(:category) { Fabricate(:category) }
   fab!(:topic) { Fabricate(:topic) }
   fab!(:post) { Fabricate(:post, topic: topic) }
@@ -11,6 +11,9 @@ RSpec.describe "Visit channel", type: :system, js: true do
   fab!(:inaccessible_dm_channel_1) { Fabricate(:direct_message_channel) }
 
   let(:chat) { PageObjects::Pages::Chat.new }
+  let(:sidebar_page) { PageObjects::Pages::Sidebar.new }
+  let(:channel_page) { PageObjects::Pages::ChatChannel.new }
+  let(:dialog) { PageObjects::Components::Dialog.new }
 
   before { chat_system_bootstrap }
 
@@ -61,7 +64,7 @@ RSpec.describe "Visit channel", type: :system, js: true do
 
       context "when channel is not found" do
         it "shows an error" do
-          visit("/chat/channel/999/-")
+          visit("/chat/c/-/999")
 
           expect(page).to have_content("Not Found") # this is not a translated key
         end
@@ -69,7 +72,7 @@ RSpec.describe "Visit channel", type: :system, js: true do
 
       context "when loading a non existing message of a channel" do
         it "shows an error" do
-          visit("/chat/channel/#{category_channel_1.id}/-?messageId=-999")
+          visit("/chat/c/-/#{category_channel_1.id}/-999")
 
           expect(page).to have_content(I18n.t("not_found"))
         end
@@ -93,6 +96,30 @@ RSpec.describe "Visit channel", type: :system, js: true do
         end
       end
 
+      context "when category channel is read-only" do
+        fab!(:restricted_category) { Fabricate(:category, read_restricted: true) }
+        fab!(:readonly_group_1) { Fabricate(:group, users: [current_user]) }
+        fab!(:readonly_category_channel_1) do
+          Fabricate(:category_channel, chatable: restricted_category)
+        end
+        fab!(:message_1) { Fabricate(:chat_message, chat_channel: readonly_category_channel_1) }
+
+        before do
+          Fabricate(
+            :category_group,
+            category: restricted_category,
+            group: readonly_group_1,
+            permission_type: CategoryGroup.permission_types[:readonly],
+          )
+        end
+
+        it "shows an error" do
+          chat.visit_channel(inaccessible_dm_channel_1)
+
+          expect(page).to have_content(I18n.t("invalid_access"))
+        end
+      end
+
       context "when current user is not member of the channel" do
         context "when category channel" do
           fab!(:message_1) { Fabricate(:chat_message, chat_channel: category_channel_1) }
@@ -119,13 +146,7 @@ RSpec.describe "Visit channel", type: :system, js: true do
           it "allows to join it" do
             chat.visit_channel(dm_channel_1)
 
-            expect(page).to have_content(I18n.t("js.chat.channel_settings.join_channel"))
-          end
-
-          it "shows a preview of the channel" do
-            chat.visit_channel(dm_channel_1)
-
-            expect(chat).to have_message(message_1)
+            expect(channel_page.composer).to be_enabled
           end
         end
       end
@@ -151,13 +172,35 @@ RSpec.describe "Visit channel", type: :system, js: true do
 
           context "when URL doesn’t contain slug" do
             it "redirects to correct URL" do
-              visit("/chat/channel/#{category_channel_1.id}/-")
+              visit("/chat/c/-/#{category_channel_1.id}")
 
               expect(page).to have_current_path(
-                "/chat/channel/#{category_channel_1.id}/#{category_channel_1.slug}",
+                "/chat/c/#{category_channel_1.slug}/#{category_channel_1.id}",
               )
             end
           end
+
+          context "when visiting a specific channel message ID then navigating to another channel" do
+            fab!(:early_message) { Fabricate(:chat_message, chat_channel: category_channel_1) }
+            fab!(:other_channel) do
+              Fabricate(:category_channel, category: category_channel_1.chatable)
+            end
+            fab!(:other_channel_message) { Fabricate(:chat_message, chat_channel: other_channel) }
+
+            before do
+              30.times { Fabricate(:chat_message, chat_channel: category_channel_1) }
+              other_channel.add(current_user)
+            end
+
+            it "does not error" do
+              visit(early_message.url)
+              expect(channel_page).to have_no_loading_skeleton
+              expect(channel_page).to have_message(id: early_message.id)
+              sidebar_page.open_channel(other_channel)
+              expect(dialog).to be_closed
+              expect(channel_page).to have_message(id: other_channel_message.id)
+            end
+          end
         end
 
         context "when direct message channel" do
@@ -179,10 +222,10 @@ RSpec.describe "Visit channel", type: :system, js: true do
 
           context "when URL doesn’t contain slug" do
             it "redirects to correct URL" do
-              visit("/chat/channel/#{dm_channel_1.id}/-")
+              visit("/chat/c/-/#{dm_channel_1.id}")
 
               expect(page).to have_current_path(
-                "/chat/channel/#{dm_channel_1.id}/#{Slug.for(dm_channel_1.title(current_user))}",
+                "/chat/c/#{Slug.for(dm_channel_1.title(current_user))}/#{dm_channel_1.id}",
               )
             end
           end
diff --git a/plugins/chat/spec/validators/chat_allow_uploads_validator_spec.rb b/plugins/chat/spec/validators/chat_allow_uploads_validator_spec.rb
index 9a2531120de..db24616ab4f 100644
--- a/plugins/chat/spec/validators/chat_allow_uploads_validator_spec.rb
+++ b/plugins/chat/spec/validators/chat_allow_uploads_validator_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe ChatAllowUploadsValidator do
+RSpec.describe Chat::AllowUploadsValidator do
   it "always returns true if setting the value to false" do
     validator = described_class.new
     expect(validator.valid_value?("f")).to eq(true)
diff --git a/plugins/chat/spec/validators/chat_default_channel_validator_spec.rb b/plugins/chat/spec/validators/chat_default_channel_validator_spec.rb
index 762c3fce78c..8622e1021b8 100644
--- a/plugins/chat/spec/validators/chat_default_channel_validator_spec.rb
+++ b/plugins/chat/spec/validators/chat_default_channel_validator_spec.rb
@@ -2,7 +2,7 @@
 
 require "rails_helper"
 
-describe ChatDefaultChannelValidator do
+describe Chat::DefaultChannelValidator do
   fab!(:channel) { Fabricate(:category_channel) }
 
   it "provides an error message" do
diff --git a/plugins/chat/test/javascripts/acceptance/chat-composer-test.js b/plugins/chat/test/javascripts/acceptance/chat-composer-test.js
index 40f6d2386d5..b6444ae3a8c 100644
--- a/plugins/chat/test/javascripts/acceptance/chat-composer-test.js
+++ b/plugins/chat/test/javascripts/acceptance/chat-composer-test.js
@@ -45,7 +45,7 @@ acceptance("Discourse Chat - Composer", function (needs) {
   });
 
   skip("when pasting html in composer", async function (assert) {
-    await visit("/chat/channel/11/another-category");
+    await visit("/chat/c/another-category/11");
 
     const clipboardEvent = new Event("paste", { bubbles: true });
     clipboardEvent.clipboardData = {
@@ -58,12 +58,12 @@ acceptance("Discourse Chat - Composer", function (needs) {
     };
 
     document
-      .querySelector(".chat-composer-input")
+      .querySelector(".chat-composer__input")
       .dispatchEvent(clipboardEvent);
 
     await settled();
 
-    assert.equal(document.querySelector(".chat-composer-input").value, "Foo");
+    assert.equal(document.querySelector(".chat-composer__input").value, "Foo");
   });
 });
 
@@ -96,20 +96,20 @@ acceptance("Discourse Chat - Composer - unreliable network", function (needs) {
   });
 
   skip("Sending a message with unreliable network", async function (assert) {
-    await visit("/chat/channel/11/-");
-    await fillIn(".chat-composer-input", "network-error-message");
-    await click(".send-btn");
+    await visit("/chat/c/-/11");
+    await fillIn(".chat-composer__input", "network-error-message");
+    await click(".chat-composer-button.-send");
 
     assert.ok(
       exists(".chat-message-container[data-id='1'] .retry-staged-message-btn"),
       "it adds a retry button"
     );
 
-    await fillIn(".chat-composer-input", "network-error-message");
-    await click(".send-btn");
+    await fillIn(".chat-composer__input", "network-error-message");
+    await click(".chat-composer-button.-send");
     await publishToMessageBus(`/chat/11`, {
       type: "sent",
-      stagedId: 1,
+      staged_id: 1,
       chat_message: {
         cooked: "network-error-message",
         id: 175,
@@ -126,14 +126,14 @@ acceptance("Discourse Chat - Composer - unreliable network", function (needs) {
       "it sends the message"
     );
     assert.strictEqual(
-      query(".chat-composer-input").value,
+      query(".chat-composer__input").value,
       "",
       "it clears the input"
     );
   });
 
   skip("Draft with unreliable network", async function (assert) {
-    await visit("/chat/channel/11/-");
+    await visit("/chat/c/-/11");
     this.chatService.set("isNetworkUnreliable", true);
     await settled();
 
diff --git a/plugins/chat/test/javascripts/acceptance/chat-live-pane-collapse-test.js b/plugins/chat/test/javascripts/acceptance/chat-live-pane-collapse-test.js
index 3874fb8b3a8..c59e0ece4dd 100644
--- a/plugins/chat/test/javascripts/acceptance/chat-live-pane-collapse-test.js
+++ b/plugins/chat/test/javascripts/acceptance/chat-live-pane-collapse-test.js
@@ -30,7 +30,7 @@ acceptance("Discourse Chat - Chat live pane collapse", function (needs) {
             id: 1,
             message: "https://www.youtube.com/watch?v=aOWkVdU4NH0",
             cooked:
-              '<div class="onebox lazyYT lazyYT-container" data-youtube-id="aOWkVdU4NH0" data-youtube-title="Picnic with my cat (shaved ice &amp; lemonade)" data-parameters="feature=oembed&amp;wmode=opaque"> <a href="https://www.youtube.com/watch?v=aOWkVdU4NH0" target="_blank" rel="nofollow ugc noopener"> <img class="ytp-thumbnail-image" src="/images/discourse-logo-sketch.png" title="Picnic with my cat (shaved ice &amp; lemonade)"></a></div>',
+              '<div class="youtube-onebox lazy-video-container" data-video-id="aOWkVdU4NH0" data-video-title="Picnic with my cat (shaved ice &amp; lemonade)" data-provider-name="youtube"> <a href="https://www.youtube.com/watch?v=aOWkVdU4NH0" target="_blank" rel="nofollow ugc noopener"> <img class="youtube-thumbnail" src="https://img.youtube.com/vi/aOWkVdU4NH0/maxresdefault.jpg" title="Picnic with my cat (shaved ice &amp; lemonade)"> </a> </div>',
             excerpt:
               '<a href="https://www.youtube.com/watch?v=aOWkVdU4NH0">[Picnic with my cat (shaved ice &amp; lemonade&hellip;</a>',
             created_at: "2021-07-20T08:14:16.950Z",
@@ -106,28 +106,29 @@ acceptance("Discourse Chat - Chat live pane collapse", function (needs) {
     );
   });
 
-  skip("can collapse and expand youtube chat", async function (assert) {
-    const youtubeContainer = ".chat-message-container[data-id='1'] .lazyYT";
+  skip("can collapse and expand videos in chat", async function (assert) {
+    const videoContainer =
+      ".chat-message-container[data-id='1'] .lazy-video-container";
     const expandImage =
       ".chat-message-container[data-id='1'] .chat-message-collapser-closed";
     const collapseImage =
       ".chat-message-container[data-id='1'] .chat-message-collapser-opened";
 
-    await visit("/chat/channel/1/cat");
+    await visit("/chat/c/cat/1");
 
-    assert.ok(visible(youtubeContainer));
+    assert.ok(visible(videoContainer));
     assert.ok(visible(collapseImage), "the open arrow is shown");
     assert.notOk(exists(expandImage), "the close arrow is hidden");
 
     await click(collapseImage);
 
-    assert.notOk(visible(youtubeContainer));
+    assert.notOk(visible(videoContainer));
     assert.ok(visible(expandImage), "the close arrow is shown");
     assert.notOk(exists(collapseImage), "the open arrow is hidden");
 
     await click(expandImage);
 
-    assert.ok(visible(youtubeContainer));
+    assert.ok(visible(videoContainer));
     assert.ok(visible(collapseImage), "the open arrow is shown again");
     assert.notOk(exists(expandImage), "the close arrow is hidden again");
   });
@@ -140,7 +141,7 @@ acceptance("Discourse Chat - Chat live pane collapse", function (needs) {
     const collapseImage =
       ".chat-message-container[data-id='2'] .chat-message-collapser-opened";
 
-    await visit("/chat/channel/1/cat");
+    await visit("/chat/c/cat/1");
 
     await click(image);
 
diff --git a/plugins/chat/test/javascripts/acceptance/chat-live-pane-test.js b/plugins/chat/test/javascripts/acceptance/chat-live-pane-test.js
index acbf425896d..8a17d2f2039 100644
--- a/plugins/chat/test/javascripts/acceptance/chat-live-pane-test.js
+++ b/plugins/chat/test/javascripts/acceptance/chat-live-pane-test.js
@@ -55,7 +55,7 @@ acceptance(
     });
 
     skip("Handles 429 errors by displaying an alert", async function (assert) {
-      await visit("/chat/channel/1/cat");
+      await visit("/chat/c/cat/1");
 
       assert.ok(exists(".dialog-content"), "We displayed a 429 error");
       await click(".dialog-footer .btn-primary");
diff --git a/plugins/chat/test/javascripts/acceptance/hashtag-css-generator-test.js b/plugins/chat/test/javascripts/acceptance/hashtag-css-generator-test.js
new file mode 100644
index 00000000000..b752873b41d
--- /dev/null
+++ b/plugins/chat/test/javascripts/acceptance/hashtag-css-generator-test.js
@@ -0,0 +1,70 @@
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { visit } from "@ember/test-helpers";
+import { test } from "qunit";
+
+acceptance("Chat | Hashtag CSS Generator", function (needs) {
+  const category1 = { id: 1, color: "ff0000", name: "category1" };
+  const category2 = { id: 2, color: "333", name: "category2" };
+  const category3 = {
+    id: 4,
+    color: "2B81AF",
+    parentCategory: { id: 1 },
+    name: "category3",
+  };
+
+  needs.settings({ chat_enabled: true });
+  needs.user({
+    has_chat_enabled: true,
+    chat_channels: {
+      public_channels: [
+        {
+          id: 44,
+          chatable_id: 1,
+          chatable_type: "Category",
+          meta: { message_bus_last_ids: {} },
+          current_user_membership: { following: true },
+          chatable: category1,
+        },
+        {
+          id: 74,
+          chatable_id: 2,
+          chatable_type: "Category",
+          meta: { message_bus_last_ids: {} },
+          current_user_membership: { following: true },
+          chatable: category2,
+        },
+        {
+          id: 88,
+          chatable_id: 4,
+          chatable_type: "Category",
+          meta: { message_bus_last_ids: {} },
+          current_user_membership: { following: true },
+          chatable: category3,
+        },
+      ],
+      direct_message_channels: [],
+      meta: { message_bus_last_ids: {} },
+      tracking: {
+        channel_tracking: {
+          44: { unread_count: 0, mention_count: 0 },
+          74: { unread_count: 0, mention_count: 0 },
+          88: { unread_count: 0, mention_count: 0 },
+        },
+        thread_tracking: {},
+      },
+    },
+  });
+  needs.site({
+    categories: [category1, category2, category3],
+  });
+
+  test("hashtag CSS classes are generated", async function (assert) {
+    await visit("/");
+    const cssTag = document.querySelector("style#hashtag-css-generator");
+    assert.equal(
+      cssTag.innerHTML,
+
+      ".hashtag-color--category-1 {\n  background: linear-gradient(-90deg, var(--category-1-color) 50%, var(--category-1-color) 50%);\n}\n.hashtag-color--category-2 {\n  background: linear-gradient(-90deg, var(--category-2-color) 50%, var(--category-2-color) 50%);\n}\n.hashtag-color--category-4 {\n  background: linear-gradient(-90deg, var(--category-4-color) 50%, var(--category-1-color) 50%);\n}\n.d-icon.hashtag-color--channel-44 { color: var(--category-1-color); }\n.d-icon.hashtag-color--channel-74 { color: var(--category-2-color); }\n.d-icon.hashtag-color--channel-88 { color: var(--category-4-color); }"
+    );
+  });
+});
diff --git a/plugins/chat/test/javascripts/acceptance/user-status-on-mentions-test.js b/plugins/chat/test/javascripts/acceptance/user-status-on-mentions-test.js
new file mode 100644
index 00000000000..9015b80fadf
--- /dev/null
+++ b/plugins/chat/test/javascripts/acceptance/user-status-on-mentions-test.js
@@ -0,0 +1,375 @@
+import {
+  acceptance,
+  emulateAutocomplete,
+  loggedInUser,
+  publishToMessageBus,
+  query,
+} from "discourse/tests/helpers/qunit-helpers";
+import { skip } from "qunit";
+import { click, triggerEvent, visit, waitFor } from "@ember/test-helpers";
+import pretender, { response } from "discourse/tests/helpers/create-pretender";
+
+acceptance("Chat | User status on mentions", function (needs) {
+  const channelId = 1;
+  const messageId = 1;
+  const actingUser = {
+    id: 1,
+    username: "acting_user",
+  };
+  const mentionedUser1 = {
+    id: 1000,
+    username: "user1",
+    status: {
+      description: "surfing",
+      emoji: "surfing_man",
+    },
+  };
+  const mentionedUser2 = {
+    id: 2000,
+    username: "user2",
+    status: {
+      description: "vacation",
+      emoji: "desert_island",
+    },
+  };
+  const mentionedUser3 = {
+    id: 3000,
+    username: "user3",
+    status: {
+      description: "off to dentist",
+      emoji: "tooth",
+    },
+  };
+  const message = {
+    id: messageId,
+    message: `Hey @${mentionedUser1.username}`,
+    cooked: `<p>Hey <a class="mention" href="/u/${mentionedUser1.username}">@${mentionedUser1.username}</a></p>`,
+    mentioned_users: [mentionedUser1],
+    user: actingUser,
+  };
+  const newStatus = {
+    description: "working remotely",
+    emoji: "house",
+  };
+  const channel = {
+    id: channelId,
+    chatable_id: 1,
+    chatable_type: "Category",
+    meta: { message_bus_last_ids: {} },
+    current_user_membership: { following: true },
+    chatable: { id: 1 },
+  };
+
+  needs.settings({ chat_enabled: true });
+
+  needs.user({
+    ...actingUser,
+    has_chat_enabled: true,
+    chat_channels: {
+      public_channels: [channel],
+      direct_message_channels: [],
+      meta: { message_bus_last_ids: {} },
+      tracking: {},
+    },
+  });
+
+  needs.hooks.beforeEach(function () {
+    pretender.post(`/chat/1`, () => response({}));
+    pretender.put(`/chat/1/edit/${messageId}`, () => response({}));
+    pretender.post(`/chat/drafts`, () => response({}));
+    pretender.put(`/chat/api/channels/1/read/1`, () => response({}));
+    pretender.delete(`/chat/api/channels/1/messages/${messageId}`, () =>
+      response({})
+    );
+    pretender.put(`/chat/api/channels/1/messages/${messageId}/restore`, () =>
+      response({})
+    );
+
+    pretender.get(`/chat/api/channels/1`, () =>
+      response({
+        channel,
+        chat_messages: [message],
+        meta: { can_delete_self: true },
+      })
+    );
+
+    pretender.get("/u/search/users", () =>
+      response({
+        users: [mentionedUser2, mentionedUser3],
+      })
+    );
+
+    pretender.get("/chat/api/mentions/groups.json", () =>
+      response({
+        unreachable: [],
+        over_members_limit: [],
+        invalid: ["and"],
+      })
+    );
+  });
+
+  skip("just posted messages | it shows status on mentions ", async function (assert) {
+    await visit(`/chat/c/-/${channelId}`);
+    await typeWithAutocompleteAndSend(`mentioning @${mentionedUser2.username}`);
+    assertStatusIsRendered(
+      assert,
+      statusSelector(mentionedUser2.username),
+      mentionedUser2.status
+    );
+    await assertStatusTooltipIsRendered(
+      assert,
+      statusSelector(mentionedUser2.username),
+      mentionedUser2.status
+    );
+  });
+
+  skip("just posted messages | it updates status on mentions", async function (assert) {
+    await visit(`/chat/c/-/${channelId}`);
+    await typeWithAutocompleteAndSend(`mentioning @${mentionedUser2.username}`);
+
+    loggedInUser().appEvents.trigger("user-status:changed", {
+      [mentionedUser2.id]: newStatus,
+    });
+
+    const selector = statusSelector(mentionedUser2.username);
+    await waitFor(selector);
+    assertStatusIsRendered(assert, selector, newStatus);
+    await assertStatusTooltipIsRendered(assert, selector, newStatus);
+  });
+
+  skip("just posted messages | it deletes status on mentions", async function (assert) {
+    await visit(`/chat/c/-/${channelId}`);
+
+    await typeWithAutocompleteAndSend(`mentioning @${mentionedUser2.username}`);
+
+    loggedInUser().appEvents.trigger("user-status:changed", {
+      [mentionedUser2.id]: null,
+    });
+
+    const selector = statusSelector(mentionedUser2.username);
+    await waitFor(selector, { count: 0 });
+    assert.dom(selector).doesNotExist("status is deleted");
+  });
+
+  skip("edited messages | it shows status on mentions", async function (assert) {
+    await visit(`/chat/c/-/${channelId}`);
+
+    await editMessage(
+      ".chat-message-content",
+      `mentioning @${mentionedUser3.username}`
+    );
+
+    assertStatusIsRendered(
+      assert,
+      statusSelector(mentionedUser3.username),
+      mentionedUser3.status
+    );
+    await assertStatusTooltipIsRendered(
+      assert,
+      statusSelector(mentionedUser3.username),
+      mentionedUser3.status
+    );
+  });
+
+  skip("edited messages | it updates status on mentions", async function (assert) {
+    await visit(`/chat/c/-/${channelId}`);
+    await editMessage(
+      ".chat-message-content",
+      `mentioning @${mentionedUser3.username}`
+    );
+
+    loggedInUser().appEvents.trigger("user-status:changed", {
+      [mentionedUser3.id]: newStatus,
+    });
+
+    const selector = statusSelector(mentionedUser3.username);
+    await waitFor(selector);
+    assertStatusIsRendered(assert, selector, newStatus);
+    await assertStatusTooltipIsRendered(assert, selector, newStatus);
+  });
+
+  skip("edited messages | it deletes status on mentions", async function (assert) {
+    await visit(`/chat/c/-/${channelId}`);
+
+    await editMessage(
+      ".chat-message-content",
+      `mentioning @${mentionedUser3.username}`
+    );
+
+    loggedInUser().appEvents.trigger("user-status:changed", {
+      [mentionedUser3.id]: null,
+    });
+
+    const selector = statusSelector(mentionedUser3.username);
+    await waitFor(selector, { count: 0 });
+    assert.dom(selector).doesNotExist("status is deleted");
+  });
+
+  skip("deleted messages | it shows status on mentions", async function (assert) {
+    await visit(`/chat/c/-/${channelId}`);
+
+    await deleteMessage(".chat-message-content");
+    await click(".chat-message-expand");
+
+    assertStatusIsRendered(
+      assert,
+      statusSelector(mentionedUser1.username),
+      mentionedUser1.status
+    );
+    await assertStatusTooltipIsRendered(
+      assert,
+      statusSelector(mentionedUser1.username),
+      mentionedUser1.status
+    );
+  });
+
+  skip("deleted messages | it updates status on mentions", async function (assert) {
+    await visit(`/chat/c/-/${channelId}`);
+
+    await deleteMessage(".chat-message-content");
+    await click(".chat-message-expand");
+
+    loggedInUser().appEvents.trigger("user-status:changed", {
+      [mentionedUser1.id]: newStatus,
+    });
+
+    const selector = statusSelector(mentionedUser1.username);
+    await waitFor(selector);
+    assertStatusIsRendered(assert, selector, newStatus);
+    await assertStatusTooltipIsRendered(assert, selector, newStatus);
+  });
+
+  skip("deleted messages | it deletes status on mentions", async function (assert) {
+    await visit(`/chat/c/-/${channelId}`);
+
+    await deleteMessage(".chat-message-content");
+    await click(".chat-message-expand");
+
+    loggedInUser().appEvents.trigger("user-status:changed", {
+      [mentionedUser1.id]: null,
+    });
+
+    const selector = statusSelector(mentionedUser1.username);
+    await waitFor(selector, { count: 0 });
+    assert.dom(selector).doesNotExist("status is deleted");
+  });
+
+  skip("restored messages | it shows status on mentions", async function (assert) {
+    await visit(`/chat/c/-/${channelId}`);
+
+    await deleteMessage(".chat-message-content");
+    await restoreMessage(".chat-message-text.-deleted");
+
+    assertStatusIsRendered(
+      assert,
+      statusSelector(mentionedUser1.username),
+      mentionedUser1.status
+    );
+    await assertStatusTooltipIsRendered(
+      assert,
+      statusSelector(mentionedUser1.username),
+      mentionedUser1.status
+    );
+  });
+
+  skip("restored messages | it updates status on mentions", async function (assert) {
+    await visit(`/chat/c/-/${channelId}`);
+
+    await deleteMessage(".chat-message-content");
+    await restoreMessage(".chat-message-text.-deleted");
+
+    loggedInUser().appEvents.trigger("user-status:changed", {
+      [mentionedUser1.id]: newStatus,
+    });
+
+    const selector = statusSelector(mentionedUser1.username);
+    await waitFor(selector);
+    assertStatusIsRendered(assert, selector, newStatus);
+    await assertStatusTooltipIsRendered(assert, selector, newStatus);
+  });
+
+  skip("restored messages | it deletes status on mentions", async function (assert) {
+    await visit(`/chat/c/-/${channelId}`);
+
+    await deleteMessage(".chat-message-content");
+    await restoreMessage(".chat-message-text.-deleted");
+
+    loggedInUser().appEvents.trigger("user-status:changed", {
+      [mentionedUser1.id]: null,
+    });
+
+    const selector = statusSelector(mentionedUser1.username);
+    await waitFor(selector, { count: 0 });
+    assert.dom(selector).doesNotExist("status is deleted");
+  });
+
+  function assertStatusIsRendered(assert, selector, status) {
+    assert
+      .dom(selector)
+      .exists("status is rendered")
+      .hasAttribute(
+        "src",
+        new RegExp(`${status.emoji}.png`),
+        "status emoji is updated"
+      );
+  }
+
+  async function assertStatusTooltipIsRendered(assert, selector, status) {
+    await triggerEvent(selector, "mouseenter");
+
+    assert.equal(
+      document
+        .querySelector(".user-status-tooltip-description")
+        .textContent.trim(),
+      status.description,
+      "status description is correct"
+    );
+
+    assert.ok(
+      document.querySelector(
+        `.user-status-message-tooltip img[alt='${status.emoji}']`
+      ),
+      "status emoji is correct"
+    );
+
+    await triggerEvent(selector, "mouseleave");
+  }
+
+  async function deleteMessage(messageSelector) {
+    await triggerEvent(query(messageSelector), "mouseenter");
+    await click(".more-buttons .select-kit-header-wrapper");
+    await click(".select-kit-collection .select-kit-row[data-value='delete']");
+    await publishToMessageBus(`/chat/${channelId}`, {
+      type: "delete",
+      deleted_id: messageId,
+      deleted_at: "2022-01-01T08:00:00.000Z",
+    });
+  }
+
+  async function editMessage(messageSelector, text) {
+    await triggerEvent(query(messageSelector), "mouseenter");
+    await click(".more-buttons .select-kit-header-wrapper");
+    await click(".select-kit-collection .select-kit-row[data-value='edit']");
+    await typeWithAutocompleteAndSend(text);
+  }
+
+  async function restoreMessage(messageSelector) {
+    await triggerEvent(query(messageSelector), "mouseenter");
+    await click(".more-buttons .select-kit-header-wrapper");
+    await click(".select-kit-collection .select-kit-row[data-value='restore']");
+    await publishToMessageBus(`/chat/${channelId}`, {
+      type: "restore",
+      chat_message: message,
+    });
+  }
+
+  async function typeWithAutocompleteAndSend(text) {
+    await emulateAutocomplete(".chat-composer__input", text);
+    await click(".autocomplete.ac-user .selected");
+    await click(".chat-composer-button.-send");
+  }
+
+  function statusSelector(username) {
+    return `.mention[href='/u/${username}'] .user-status-message img`;
+  }
+});
diff --git a/plugins/chat/test/javascripts/chat-fixtures.js b/plugins/chat/test/javascripts/chat-fixtures.js
index df68bc1597a..7f4e1f83c0f 100644
--- a/plugins/chat/test/javascripts/chat-fixtures.js
+++ b/plugins/chat/test/javascripts/chat-fixtures.js
@@ -27,12 +27,11 @@ export const directMessageChannels = [
       id: 75,
       title: "@hawk",
       current_user_membership: {
-        unread_count: 0,
         muted: false,
         following: true,
       },
       allow_channel_wide_mentions: true,
-      last_message_sent_at: "2021-07-20T08:14:16.950Z",
+      last_message: { id: 333, created_at: "2021-07-02T08:14:16.950Z" },
       message_bus_last_ids: {
         new_mentions: 0,
         new_messages: 0,
@@ -63,12 +62,11 @@ export const directMessageChannels = [
       id: 76,
       title: "@eviltrout, @markvanlan",
       current_user_membership: {
-        unread_count: 0,
         muted: false,
         following: true,
       },
       allow_channel_wide_mentions: true,
-      last_message_sent_at: "2021-07-05T12:04:00.850Z",
+      last_message: { id: 333, created_at: "2021-07-02T08:14:16.950Z" },
       message_bus_last_ids: {
         new_mentions: 0,
         new_messages: 0,
@@ -110,9 +108,8 @@ export const chatChannels = {
       status: "open",
       chatable: chatables[1],
       allow_channel_wide_mentions: true,
-      last_message_sent_at: "2021-07-24T08:14:16.950Z",
+      last_message: { id: 333, created_at: "2021-07-02T08:14:16.950Z" },
       current_user_membership: {
-        unread_count: 0,
         muted: false,
         following: true,
       },
@@ -130,9 +127,8 @@ export const chatChannels = {
       status: "open",
       chatable: chatables[1],
       allow_channel_wide_mentions: true,
-      last_message_sent_at: "2021-07-15T08:14:16.950Z",
+      last_message: { id: 333, created_at: "2021-07-02T08:14:16.950Z" },
       current_user_membership: {
-        unread_count: 0,
         muted: false,
         following: true,
       },
@@ -150,9 +146,8 @@ export const chatChannels = {
       status: "open",
       chatable: chatables[8],
       allow_channel_wide_mentions: true,
-      last_message_sent_at: "2021-07-14T08:14:16.950Z",
+      last_message: { id: 333, created_at: "2021-07-02T08:14:16.950Z" },
       current_user_membership: {
-        unread_count: 0,
         muted: false,
         following: true,
       },
@@ -170,9 +165,8 @@ export const chatChannels = {
       status: "read_only",
       chatable: chatables[8],
       allow_channel_wide_mentions: true,
-      last_message_sent_at: "2021-07-10T08:14:16.950Z",
+      last_message: { id: 333, created_at: "2021-07-02T08:14:16.950Z" },
       current_user_membership: {
-        unread_count: 0,
         muted: false,
         following: true,
       },
@@ -190,9 +184,8 @@ export const chatChannels = {
       status: "closed",
       chatable: chatables[8],
       allow_channel_wide_mentions: true,
-      last_message_sent_at: "2021-07-21T08:14:16.950Z",
+      last_message: { id: 333, created_at: "2021-07-02T08:14:16.950Z" },
       current_user_membership: {
-        unread_count: 0,
         muted: false,
         following: true,
       },
@@ -210,9 +203,8 @@ export const chatChannels = {
       status: "archived",
       chatable: chatables[8],
       allow_channel_wide_mentions: true,
-      last_message_sent_at: "2021-07-25T08:14:16.950Z",
+      last_message: { id: 333, created_at: "2021-07-02T08:14:16.950Z" },
       current_user_membership: {
-        unread_count: 0,
         muted: false,
         following: true,
       },
@@ -230,9 +222,8 @@ export const chatChannels = {
       status: "open",
       chatable: chatables[12],
       allow_channel_wide_mentions: true,
-      last_message_sent_at: "2021-07-02T08:14:16.950Z",
+      last_message: { id: 333, created_at: "2021-07-02T08:14:16.950Z" },
       current_user_membership: {
-        unread_count: 0,
         muted: false,
         following: true,
       },
@@ -242,6 +233,20 @@ export const chatChannels = {
       },
     },
   ],
+  tracking: {
+    channel_tracking: {
+      4: { unread_count: 0, mention_count: 0 },
+      5: { unread_count: 0, mention_count: 0 },
+      6: { unread_count: 0, mention_count: 0 },
+      7: { unread_count: 0, mention_count: 0 },
+      9: { unread_count: 0, mention_count: 0 },
+      10: { unread_count: 0, mention_count: 0 },
+      11: { unread_count: 0, mention_count: 0 },
+      75: { unread_count: 0, mention_count: 0 },
+      76: { unread_count: 0, mention_count: 0 },
+    },
+    thread_tracking: {},
+  },
   direct_message_channels: directMessageChannels.mapBy("chat_channel"),
   message_bus_last_ids: {
     channel_metadata: 0,
diff --git a/plugins/chat/test/javascripts/components/chat-channel-card-test.js b/plugins/chat/test/javascripts/components/chat-channel-card-test.js
index a2f818a3127..6efa762562b 100644
--- a/plugins/chat/test/javascripts/components/chat-channel-card-test.js
+++ b/plugins/chat/test/javascripts/components/chat-channel-card-test.js
@@ -1,7 +1,7 @@
 import { setupRenderingTest } from "discourse/tests/helpers/component-test";
 import { exists, query } from "discourse/tests/helpers/qunit-helpers";
 import hbs from "htmlbars-inline-precompile";
-import fabricators from "../helpers/fabricators";
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
 import { render } from "@ember/test-helpers";
 import { module, test } from "qunit";
 import I18n from "I18n";
@@ -10,15 +10,13 @@ module("Discourse Chat | Component | chat-channel-card", function (hooks) {
   setupRenderingTest(hooks);
 
   hooks.beforeEach(function () {
-    this.set("channel", fabricators.chatChannel());
-    this.channel.set(
-      "description",
-      "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
-    );
+    this.channel = fabricators.channel();
+    this.channel.description =
+      "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.";
   });
 
   test("escapes channel title", async function (assert) {
-    this.channel.set("title", "<div class='xss'>evil</div>");
+    this.channel.title = "<div class='xss'>evil</div>";
 
     await render(hbs`<ChatChannelCard @channel={{this.channel}} />`);
 
@@ -26,7 +24,7 @@ module("Discourse Chat | Component | chat-channel-card", function (hooks) {
   });
 
   test("escapes channel description", async function (assert) {
-    this.channel.set("description", "<div class='xss'>evil</div>");
+    this.channel.description = "<div class='xss'>evil</div>";
 
     await render(hbs`<ChatChannelCard @channel={{this.channel}} />`);
 
@@ -34,14 +32,14 @@ module("Discourse Chat | Component | chat-channel-card", function (hooks) {
   });
 
   test("Closed channel", async function (assert) {
-    this.channel.set("status", "closed");
+    this.channel.status = "closed";
     await render(hbs`<ChatChannelCard @channel={{this.channel}} />`);
 
     assert.true(exists(".chat-channel-card.-closed"));
   });
 
   test("Archived channel", async function (assert) {
-    this.channel.set("status", "archived");
+    this.channel.status = "archived";
     await render(hbs`<ChatChannelCard @channel={{this.channel}} />`);
 
     assert.true(exists(".chat-channel-card.-archived"));
@@ -59,7 +57,7 @@ module("Discourse Chat | Component | chat-channel-card", function (hooks) {
   });
 
   test("Joined channel", async function (assert) {
-    this.channel.currentUserMembership.set("following", true);
+    this.channel.currentUserMembership.following = true;
     await render(hbs`<ChatChannelCard @channel={{this.channel}} />`);
 
     assert.strictEqual(
@@ -77,7 +75,7 @@ module("Discourse Chat | Component | chat-channel-card", function (hooks) {
   });
 
   test("Memberships count", async function (assert) {
-    this.channel.set("membershipsCount", 4);
+    this.channel.membershipsCount = 4;
     await render(hbs`<ChatChannelCard @channel={{this.channel}} />`);
 
     assert.strictEqual(
@@ -87,7 +85,7 @@ module("Discourse Chat | Component | chat-channel-card", function (hooks) {
   });
 
   test("No description", async function (assert) {
-    this.channel.set("description", null);
+    this.channel.description = null;
     await render(hbs`<ChatChannelCard @channel={{this.channel}} />`);
 
     assert.false(exists(".chat-channel-card__description"));
@@ -118,7 +116,7 @@ module("Discourse Chat | Component | chat-channel-card", function (hooks) {
   });
 
   test("Read restricted chatable", async function (assert) {
-    this.channel.set("chatable.read_restricted", true);
+    this.channel.chatable.read_restricted = true;
     await render(hbs`<ChatChannelCard @channel={{this.channel}} />`);
 
     assert.true(exists(".d-icon-lock"));
diff --git a/plugins/chat/test/javascripts/components/chat-channel-leave-btn-test.js b/plugins/chat/test/javascripts/components/chat-channel-leave-btn-test.js
index d75f533bd5e..09cee5fd4b8 100644
--- a/plugins/chat/test/javascripts/components/chat-channel-leave-btn-test.js
+++ b/plugins/chat/test/javascripts/components/chat-channel-leave-btn-test.js
@@ -5,20 +5,15 @@ import hbs from "htmlbars-inline-precompile";
 import pretender from "discourse/tests/helpers/create-pretender";
 import I18n from "I18n";
 import { module, test } from "qunit";
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
 
 module("Discourse Chat | Component | chat-channel-leave-btn", function (hooks) {
   setupRenderingTest(hooks);
 
   test("accepts an optional onLeaveChannel callback", async function (assert) {
-    this.set("foo", 1);
-    this.set("onLeaveChannel", () => this.set("foo", 2));
-    this.set("channel", {
-      id: 1,
-      chatable_type: "DirectMessage",
-      chatable: {
-        users: [{ id: 1 }],
-      },
-    });
+    this.foo = 1;
+    this.onLeaveChannel = () => (this.foo = 2);
+    this.channel = fabricators.directMessageChannel();
 
     await render(
       hbs`<ChatChannelLeaveBtn @channel={{this.channel}} @onLeaveChannel={{this.onLeaveChannel}} />`
@@ -34,7 +29,7 @@ module("Discourse Chat | Component | chat-channel-leave-btn", function (hooks) {
   });
 
   test("has a specific title for direct message channel", async function (assert) {
-    this.set("channel", { chatable_type: "DirectMessage" });
+    this.channel = fabricators.directMessageChannel();
 
     await render(hbs`<ChatChannelLeaveBtn @channel={{this.channel}} />`);
 
@@ -43,7 +38,7 @@ module("Discourse Chat | Component | chat-channel-leave-btn", function (hooks) {
   });
 
   test("has a specific title for message channel", async function (assert) {
-    this.set("channel", { chatable_type: "Topic" });
+    this.channel = fabricators.channel();
 
     await render(hbs`<ChatChannelLeaveBtn @channel={{this.channel}} />`);
 
@@ -53,7 +48,7 @@ module("Discourse Chat | Component | chat-channel-leave-btn", function (hooks) {
 
   test("is not visible on mobile", async function (assert) {
     this.site.mobileView = true;
-    this.set("channel", { chatable_type: "Topic" });
+    this.channel = fabricators.channel();
 
     await render(hbs`<ChatChannelLeaveBtn @channel={{this.channel}} />`);
 
diff --git a/plugins/chat/test/javascripts/components/chat-channel-metadata-test.js b/plugins/chat/test/javascripts/components/chat-channel-metadata-test.js
index 4a8c7f391c8..6304da0ed2d 100644
--- a/plugins/chat/test/javascripts/components/chat-channel-metadata-test.js
+++ b/plugins/chat/test/javascripts/components/chat-channel-metadata-test.js
@@ -1,24 +1,27 @@
 import { setupRenderingTest } from "discourse/tests/helpers/component-test";
 import { exists } from "discourse/tests/helpers/qunit-helpers";
 import hbs from "htmlbars-inline-precompile";
-import fabricators from "../helpers/fabricators";
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
 import { module, test } from "qunit";
 import { render } from "@ember/test-helpers";
 
 module("Discourse Chat | Component | chat-channel-metadata", function (hooks) {
   setupRenderingTest(hooks);
 
-  test("displays last message sent at", async function (assert) {
-    let lastMessageSentAt = moment().subtract(1, "day");
-    this.channel = fabricators.directMessageChatChannel({
-      last_message_sent_at: lastMessageSentAt,
+  test("displays last message created at", async function (assert) {
+    let lastMessageSentAt = moment().subtract(1, "day").format();
+    this.channel = fabricators.directMessageChannel();
+    this.channel.lastMessage = fabricators.message({
+      channel: this.channel,
+      created_at: lastMessageSentAt,
     });
+
     await render(hbs`<ChatChannelMetadata @channel={{this.channel}} />`);
 
     assert.dom(".chat-channel-metadata__date").hasText("Yesterday");
 
     lastMessageSentAt = moment();
-    this.channel.set("last_message_sent_at", lastMessageSentAt);
+    this.channel.lastMessage.createdAt = lastMessageSentAt;
     await render(hbs`<ChatChannelMetadata @channel={{this.channel}} />`);
 
     assert
@@ -27,8 +30,8 @@ module("Discourse Chat | Component | chat-channel-metadata", function (hooks) {
   });
 
   test("unreadIndicator", async function (assert) {
-    this.channel = fabricators.directMessageChatChannel();
-    this.channel.currentUserMembership.unread_count = 1;
+    this.channel = fabricators.directMessageChannel();
+    this.channel.tracking.unreadCount = 1;
 
     this.unreadIndicator = true;
     await render(
diff --git a/plugins/chat/test/javascripts/components/chat-channel-preview-card-test.js b/plugins/chat/test/javascripts/components/chat-channel-preview-card-test.js
index ee8356527f2..0c4c7d0c350 100644
--- a/plugins/chat/test/javascripts/components/chat-channel-preview-card-test.js
+++ b/plugins/chat/test/javascripts/components/chat-channel-preview-card-test.js
@@ -3,7 +3,7 @@ import { exists, query } from "discourse/tests/helpers/qunit-helpers";
 import hbs from "htmlbars-inline-precompile";
 import { render } from "@ember/test-helpers";
 import { module, test } from "qunit";
-import fabricators from "../helpers/fabricators";
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
 
 module(
   "Discourse Chat | Component | chat-channel-preview-card",
@@ -11,14 +11,11 @@ module(
     setupRenderingTest(hooks);
 
     hooks.beforeEach(function () {
-      this.set(
-        "channel",
-        fabricators.chatChannel({ chatable_type: "Category" })
-      );
-      this.channel.setProperties({
-        description: "Important stuff is announced here.",
-        title: "announcements",
-      });
+      this.set("channel", fabricators.channel({ chatable_type: "Category" }));
+
+      this.channel.description = "Important stuff is announced here.";
+      this.channel.title = "announcements";
+      this.channel.meta = { can_join_chat_channel: true };
       this.currentUser.set("has_chat_enabled", true);
       this.siteSettings.chat_enabled = true;
     });
@@ -49,7 +46,7 @@ module(
     });
 
     test("no channel description", async function (assert) {
-      this.channel.set("description", null);
+      this.channel.description = null;
 
       await render(hbs`<ChatChannelPreviewCard @channel={{this.channel}} />`);
 
@@ -83,7 +80,7 @@ module(
     });
 
     test("closed channel", async function (assert) {
-      this.channel.set("status", "closed");
+      this.channel.status = "closed";
       await render(hbs`<ChatChannelPreviewCard @channel={{this.channel}} />`);
 
       assert.false(
diff --git a/plugins/chat/test/javascripts/components/chat-channel-row-test.js b/plugins/chat/test/javascripts/components/chat-channel-row-test.js
index 357c6c7366f..e37d1887e4b 100644
--- a/plugins/chat/test/javascripts/components/chat-channel-row-test.js
+++ b/plugins/chat/test/javascripts/components/chat-channel-row-test.js
@@ -2,14 +2,14 @@ import { module, test } from "qunit";
 import { setupRenderingTest } from "discourse/tests/helpers/component-test";
 import { render } from "@ember/test-helpers";
 import { hbs } from "ember-cli-htmlbars";
-import fabricators from "../helpers/fabricators";
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
 
 module("Discourse Chat | Component | chat-channel-row", function (hooks) {
   setupRenderingTest(hooks);
 
   hooks.beforeEach(function () {
-    this.categoryChatChannel = fabricators.chatChannel();
-    this.directMessageChatChannel = fabricators.directMessageChatChannel();
+    this.categoryChatChannel = fabricators.channel();
+    this.directMessageChannel = fabricators.directMessageChannel();
   });
 
   test("links to correct channel", async function (assert) {
@@ -17,7 +17,10 @@ module("Discourse Chat | Component | chat-channel-row", function (hooks) {
 
     assert
       .dom(".chat-channel-row")
-      .hasAttribute("href", `/chat/channel/${this.categoryChatChannel.id}/-`);
+      .hasAttribute(
+        "href",
+        `/chat/c/${this.categoryChatChannel.slugifiedTitle}/${this.categoryChatChannel.id}`
+      );
   });
 
   test("allows tabbing", async function (assert) {
@@ -44,12 +47,15 @@ module("Discourse Chat | Component | chat-channel-row", function (hooks) {
   });
 
   test("renders correct channel metadata", async function (assert) {
+    this.categoryChatChannel.lastMessage = fabricators.message({
+      created_at: moment().toISOString(),
+    });
     await render(hbs`<ChatChannelRow @channel={{this.categoryChatChannel}} />`);
 
     assert
       .dom(".chat-channel-metadata")
       .hasText(
-        moment(this.categoryChatChannel.last_message_sent_at).format("l")
+        moment(this.categoryChatChannel.lastMessage.createdAt).format("h:mm A")
       );
   });
 
@@ -130,7 +136,7 @@ module("Discourse Chat | Component | chat-channel-row", function (hooks) {
 
     assert.dom(".chat-channel-row").doesNotHaveClass("has-unread");
 
-    this.categoryChatChannel.currentUserMembership.unread_count = 1;
+    this.categoryChatChannel.tracking.unreadCount = 1;
 
     await render(hbs`<ChatChannelRow @channel={{this.categoryChatChannel}} />`);
 
@@ -144,11 +150,14 @@ module("Discourse Chat | Component | chat-channel-row", function (hooks) {
   });
 
   test("user status with direct message channel", async function (assert) {
+    this.directMessageChannel.chatable = fabricators.directMessage({
+      users: [fabricators.user()],
+    });
     const status = { description: "Off to dentist", emoji: "tooth" };
-    this.directMessageChatChannel.chatable.users[0].status = status;
+    this.directMessageChannel.chatable.users[0].status = status;
 
     await render(
-      hbs`<ChatChannelRow @channel={{this.directMessageChatChannel}} />`
+      hbs`<ChatChannelRow @channel={{this.directMessageChannel}} />`
     );
 
     assert.dom(".user-status-message").exists();
@@ -156,9 +165,9 @@ module("Discourse Chat | Component | chat-channel-row", function (hooks) {
 
   test("user status with direct message channel and multiple users", async function (assert) {
     const status = { description: "Off to dentist", emoji: "tooth" };
-    this.directMessageChatChannel.chatable.users[0].status = status;
+    this.directMessageChannel.chatable.users[0].status = status;
 
-    this.directMessageChatChannel.chatable.users.push({
+    this.directMessageChannel.chatable.users.push({
       id: 2,
       username: "bill",
       name: null,
@@ -166,7 +175,7 @@ module("Discourse Chat | Component | chat-channel-row", function (hooks) {
     });
 
     await render(
-      hbs`<ChatChannelRow @channel={{this.directMessageChatChannel}} />`
+      hbs`<ChatChannelRow @channel={{this.directMessageChannel}} />`
     );
 
     assert.dom(".user-status-message").doesNotExist();
diff --git a/plugins/chat/test/javascripts/components/chat-channel-settings-view-test.js b/plugins/chat/test/javascripts/components/chat-channel-settings-view-test.js
new file mode 100644
index 00000000000..3bc294b528f
--- /dev/null
+++ b/plugins/chat/test/javascripts/components/chat-channel-settings-view-test.js
@@ -0,0 +1,25 @@
+import ChatChannel from "discourse/plugins/chat/discourse/models/chat-channel";
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import hbs from "htmlbars-inline-precompile";
+import I18n from "I18n";
+import { module, test } from "qunit";
+import { render } from "@ember/test-helpers";
+
+module(
+  "Discourse Chat | Component | chat-channel-settings-view",
+  function (hooks) {
+    setupRenderingTest(hooks);
+
+    test("display retention info", async function (assert) {
+      this.set("channel", ChatChannel.create({ chatable_type: "Category" }));
+
+      await render(hbs`<ChatChannelSettingsView @channel={{this.channel}} />`);
+
+      assert.dom(".chat-retention-info").hasText(
+        I18n.t("chat.retention_reminders.public", {
+          count: this.siteSettings.chat_channel_retention_days,
+        })
+      );
+    });
+  }
+);
diff --git a/plugins/chat/test/javascripts/components/chat-channel-status-test.js b/plugins/chat/test/javascripts/components/chat-channel-status-test.js
new file mode 100644
index 00000000000..cba9e9a286c
--- /dev/null
+++ b/plugins/chat/test/javascripts/components/chat-channel-status-test.js
@@ -0,0 +1,68 @@
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import hbs from "htmlbars-inline-precompile";
+import I18n from "I18n";
+import { module, test } from "qunit";
+import { render } from "@ember/test-helpers";
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
+import {
+  CHANNEL_STATUSES,
+  channelStatusIcon,
+} from "discourse/plugins/chat/discourse/models/chat-channel";
+
+module("Discourse Chat | Component | chat-channel-status", function (hooks) {
+  setupRenderingTest(hooks);
+
+  test("renders nothing when channel is opened", async function (assert) {
+    this.channel = fabricators.channel();
+
+    await render(hbs`<ChatChannelStatus @channel={{this.channel}} />`);
+
+    assert.dom(".chat-channel-status").doesNotExist();
+  });
+
+  test("defaults to long format", async function (assert) {
+    this.channel = fabricators.channel({ status: CHANNEL_STATUSES.closed });
+
+    await render(hbs`<ChatChannelStatus @channel={{this.channel}} />`);
+
+    assert
+      .dom(".chat-channel-status")
+      .hasText(I18n.t("chat.channel_status.closed_header"));
+  });
+
+  test("accepts a format argument", async function (assert) {
+    this.channel = fabricators.channel({
+      status: CHANNEL_STATUSES.archived,
+    });
+
+    await render(
+      hbs`<ChatChannelStatus @channel={{this.channel}} @format="short" />`
+    );
+
+    assert
+      .dom(".chat-channel-status")
+      .hasText(I18n.t("chat.channel_status.archived"));
+  });
+
+  test("renders the correct icon", async function (assert) {
+    this.channel = fabricators.channel({
+      status: CHANNEL_STATUSES.archived,
+    });
+
+    await render(hbs`<ChatChannelStatus @channel={{this.channel}} />`);
+
+    assert.dom(`.d-icon-${channelStatusIcon(this.channel.status)}`).exists();
+  });
+
+  test("renders archive status", async function (assert) {
+    this.currentUser.admin = true;
+    this.channel = fabricators.channel({
+      status: CHANNEL_STATUSES.archived,
+      archive_failed: true,
+    });
+
+    await render(hbs`<ChatChannelStatus @channel={{this.channel}} />`);
+
+    assert.dom(".chat-channel-retry-archive").exists();
+  });
+});
diff --git a/plugins/chat/test/javascripts/components/chat-channel-test.js b/plugins/chat/test/javascripts/components/chat-channel-test.js
new file mode 100644
index 00000000000..c53359d10db
--- /dev/null
+++ b/plugins/chat/test/javascripts/components/chat-channel-test.js
@@ -0,0 +1,227 @@
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import hbs from "htmlbars-inline-precompile";
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
+import { render, triggerEvent, waitFor } from "@ember/test-helpers";
+import { module, test } from "qunit";
+import pretender, { response } from "discourse/tests/helpers/create-pretender";
+import { publishToMessageBus } from "discourse/tests/helpers/qunit-helpers";
+
+module(
+  "Discourse Chat | Component | chat-channel | status on mentions",
+  function (hooks) {
+    setupRenderingTest(hooks);
+
+    const channelId = 1;
+    const actingUser = {
+      id: 1,
+      username: "acting_user",
+    };
+    const mentionedUser = {
+      id: 1000,
+      username: "user1",
+      status: {
+        description: "surfing",
+        emoji: "surfing_man",
+      },
+    };
+    const mentionedUser2 = {
+      id: 2000,
+      username: "user2",
+      status: {
+        description: "vacation",
+        emoji: "desert_island",
+      },
+    };
+    const message = {
+      id: 1891,
+      message: `Hey @${mentionedUser.username}`,
+      cooked: `<p>Hey <a class="mention" href="/u/${mentionedUser.username}">@${mentionedUser.username}</a></p>`,
+      mentioned_users: [mentionedUser],
+      created_at: "2020-08-04T15:00:00.000Z",
+      user: {
+        id: 1,
+        username: "jesse",
+      },
+    };
+
+    hooks.beforeEach(function () {
+      pretender.get(`/chat/api/channels/1/messages`, () =>
+        response({
+          messages: [message],
+          meta: { can_delete_self: true },
+        })
+      );
+
+      this.channel = fabricators.channel({
+        id: channelId,
+        currentUserMembership: { following: true },
+        meta: { can_join_chat_channel: false },
+      });
+      this.appEvents = this.container.lookup("service:appEvents");
+    });
+
+    test("it shows status on mentions", async function (assert) {
+      await render(hbs`<ChatChannel @channel={{this.channel}} />`);
+
+      assertStatusIsRendered(
+        assert,
+        statusSelector(mentionedUser.username),
+        mentionedUser.status
+      );
+      await assertStatusTooltipIsRendered(
+        assert,
+        statusSelector(mentionedUser.username),
+        mentionedUser.status
+      );
+    });
+
+    test("it updates status on mentions", async function (assert) {
+      await render(hbs`<ChatChannel @channel={{this.channel}} />`);
+
+      const newStatus = {
+        description: "off to dentist",
+        emoji: "tooth",
+      };
+
+      this.appEvents.trigger("user-status:changed", {
+        [mentionedUser.id]: newStatus,
+      });
+
+      const selector = statusSelector(mentionedUser.username);
+      await waitFor(selector);
+      assertStatusIsRendered(
+        assert,
+        statusSelector(mentionedUser.username),
+        newStatus
+      );
+      await assertStatusTooltipIsRendered(
+        assert,
+        statusSelector(mentionedUser.username),
+        newStatus
+      );
+    });
+
+    test("it deletes status on mentions", async function (assert) {
+      await render(hbs`<ChatChannel @channel={{this.channel}} />`);
+
+      this.appEvents.trigger("user-status:changed", {
+        [mentionedUser.id]: null,
+      });
+
+      const selector = statusSelector(mentionedUser.username);
+      await waitFor(selector, { count: 0 });
+      assert.dom(selector).doesNotExist("status is deleted");
+    });
+
+    test("it shows status on mentions on messages that came from Message Bus", async function (assert) {
+      await render(hbs`<ChatChannel @channel={{this.channel}} />`);
+
+      await receiveChatMessageViaMessageBus();
+
+      assertStatusIsRendered(
+        assert,
+        statusSelector(mentionedUser2.username),
+        mentionedUser2.status
+      );
+      await assertStatusTooltipIsRendered(
+        assert,
+        statusSelector(mentionedUser2.username),
+        mentionedUser2.status
+      );
+    });
+
+    test("it updates status on mentions on messages that came from Message Bus", async function (assert) {
+      await render(hbs`<ChatChannel @channel={{this.channel}} />`);
+      await receiveChatMessageViaMessageBus();
+
+      const newStatus = {
+        description: "off to meeting",
+        emoji: "calendar",
+      };
+      this.appEvents.trigger("user-status:changed", {
+        [mentionedUser2.id]: newStatus,
+      });
+
+      const selector = statusSelector(mentionedUser2.username);
+      await waitFor(selector);
+      assertStatusIsRendered(
+        assert,
+        statusSelector(mentionedUser2.username),
+        newStatus
+      );
+      await assertStatusTooltipIsRendered(
+        assert,
+        statusSelector(mentionedUser2.username),
+        newStatus
+      );
+    });
+
+    test("it deletes status on mentions on messages that came from Message Bus", async function (assert) {
+      await render(hbs`<ChatChannel @channel={{this.channel}} />`);
+      await receiveChatMessageViaMessageBus();
+
+      this.appEvents.trigger("user-status:changed", {
+        [mentionedUser2.id]: null,
+      });
+
+      const selector = statusSelector(mentionedUser2.username);
+      await waitFor(selector, { count: 0 });
+      assert.dom(selector).doesNotExist("status is deleted");
+    });
+
+    function assertStatusIsRendered(assert, selector, status) {
+      assert
+        .dom(selector)
+        .exists("status is rendered")
+        .hasAttribute(
+          "src",
+          new RegExp(`${status.emoji}.png`),
+          "status emoji is updated"
+        );
+    }
+
+    async function assertStatusTooltipIsRendered(assert, selector, status) {
+      await triggerEvent(selector, "mouseenter");
+
+      assert.equal(
+        document
+          .querySelector(".user-status-tooltip-description")
+          .textContent.trim(),
+        status.description,
+        "status description is correct"
+      );
+
+      assert.ok(
+        document.querySelector(
+          `.user-status-message-tooltip img[alt='${status.emoji}']`
+        ),
+        "status emoji is correct"
+      );
+
+      await triggerEvent(selector, "mouseleave");
+    }
+
+    async function receiveChatMessageViaMessageBus() {
+      await publishToMessageBus(`/chat/${channelId}`, {
+        chat_message: {
+          id: 2138,
+          message: `Hey @${mentionedUser2.username}`,
+          cooked: `<p>Hey <a class="mention" href="/u/${mentionedUser2.username}">@${mentionedUser2.username}</a></p>`,
+          created_at: "2023-05-18T16:07:59.588Z",
+          excerpt: `Hey @${mentionedUser2.username}`,
+          available_flags: [],
+          chat_channel_id: 7,
+          mentioned_users: [mentionedUser2],
+          user: actingUser,
+          chat_webhook_event: null,
+          uploads: [],
+        },
+        type: "sent",
+      });
+    }
+
+    function statusSelector(username) {
+      return `.mention[href='/u/${username}'] .user-status-message img`;
+    }
+  }
+);
diff --git a/plugins/chat/test/javascripts/components/chat-channel-title-test.js b/plugins/chat/test/javascripts/components/chat-channel-title-test.js
index c43838b2709..03cbe9a6879 100644
--- a/plugins/chat/test/javascripts/components/chat-channel-title-test.js
+++ b/plugins/chat/test/javascripts/components/chat-channel-title-test.js
@@ -1,7 +1,7 @@
 import { setupRenderingTest } from "discourse/tests/helpers/component-test";
 import { exists, query } from "discourse/tests/helpers/qunit-helpers";
 import hbs from "htmlbars-inline-precompile";
-import fabricators from "../helpers/fabricators";
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
 import { CHATABLE_TYPES } from "discourse/plugins/chat/discourse/models/chat-channel";
 import { module, test } from "qunit";
 import { render } from "@ember/test-helpers";
@@ -10,12 +10,9 @@ module("Discourse Chat | Component | chat-channel-title", function (hooks) {
   setupRenderingTest(hooks);
 
   test("category channel", async function (assert) {
-    this.set(
-      "channel",
-      fabricators.chatChannel({
-        chatable_type: CHATABLE_TYPES.categoryChannel,
-      })
-    );
+    this.channel = fabricators.channel({
+      chatable_type: CHATABLE_TYPES.categoryChannel,
+    });
 
     await render(hbs`<ChatChannelTitle @channel={{this.channel}} />`);
 
@@ -30,13 +27,10 @@ module("Discourse Chat | Component | chat-channel-title", function (hooks) {
   });
 
   test("category channel - escapes title", async function (assert) {
-    this.set(
-      "channel",
-      fabricators.chatChannel({
-        chatable_type: CHATABLE_TYPES.categoryChannel,
-        title: "<div class='xss'>evil</div>",
-      })
-    );
+    this.channel = fabricators.channel({
+      chatable_type: CHATABLE_TYPES.categoryChannel,
+      title: "<div class='xss'>evil</div>",
+    });
 
     await render(hbs`<ChatChannelTitle @channel={{this.channel}} />`);
 
@@ -44,13 +38,10 @@ module("Discourse Chat | Component | chat-channel-title", function (hooks) {
   });
 
   test("category channel - read restricted", async function (assert) {
-    this.set(
-      "channel",
-      fabricators.chatChannel({
-        chatable_type: CHATABLE_TYPES.categoryChannel,
-        chatable: { read_restricted: true },
-      })
-    );
+    this.channel = fabricators.channel({
+      chatable_type: CHATABLE_TYPES.categoryChannel,
+      chatable: { read_restricted: true },
+    });
 
     await render(hbs`<ChatChannelTitle @channel={{this.channel}} />`);
 
@@ -58,13 +49,10 @@ module("Discourse Chat | Component | chat-channel-title", function (hooks) {
   });
 
   test("category channel - not read restricted", async function (assert) {
-    this.set(
-      "channel",
-      fabricators.chatChannel({
-        chatable_type: CHATABLE_TYPES.categoryChannel,
-        chatable: { read_restricted: false },
-      })
-    );
+    this.channel = fabricators.channel({
+      chatable_type: CHATABLE_TYPES.categoryChannel,
+      chatable: { read_restricted: false },
+    });
 
     await render(hbs`<ChatChannelTitle @channel={{this.channel}} />`);
 
@@ -72,14 +60,18 @@ module("Discourse Chat | Component | chat-channel-title", function (hooks) {
   });
 
   test("direct message channel - one user", async function (assert) {
-    this.set("channel", fabricators.directMessageChatChannel());
+    this.channel = fabricators.directMessageChannel({
+      chatable: fabricators.directMessage({
+        users: [fabricators.user()],
+      }),
+    });
 
     await render(hbs`<ChatChannelTitle @channel={{this.channel}} />`);
 
     const user = this.channel.chatable.users[0];
 
     assert.true(
-      exists(`.chat-user-avatar-container .avatar[title="${user.username}"]`)
+      exists(`.chat-user-avatar__container .avatar[title="${user.username}"]`)
     );
 
     assert.strictEqual(
@@ -89,7 +81,7 @@ module("Discourse Chat | Component | chat-channel-title", function (hooks) {
   });
 
   test("direct message channel - multiple users", async function (assert) {
-    const channel = fabricators.directMessageChatChannel();
+    const channel = fabricators.directMessageChannel();
 
     channel.chatable.users.push({
       id: 2,
@@ -98,7 +90,7 @@ module("Discourse Chat | Component | chat-channel-title", function (hooks) {
       avatar_template: "/letter_avatar_proxy/v3/letter/t/31188e/{size}.png",
     });
 
-    this.set("channel", channel);
+    this.channel = channel;
 
     await render(hbs`<ChatChannelTitle @channel={{this.channel}} />`);
 
diff --git a/plugins/chat/test/javascripts/components/chat-composer-inline-buttons-test.js b/plugins/chat/test/javascripts/components/chat-composer-inline-buttons-test.js
deleted file mode 100644
index 3933a396a28..00000000000
--- a/plugins/chat/test/javascripts/components/chat-composer-inline-buttons-test.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import { setupRenderingTest } from "discourse/tests/helpers/component-test";
-import { exists } from "discourse/tests/helpers/qunit-helpers";
-import hbs from "htmlbars-inline-precompile";
-import { module, test } from "qunit";
-import { render } from "@ember/test-helpers";
-
-module(
-  "Discourse Chat | Component | chat-composer-inline-buttons",
-  function (hooks) {
-    setupRenderingTest(hooks);
-
-    test("buttons", async function (assert) {
-      this.set("buttons", [{ id: "foo", icon: "times", action: () => {} }]);
-
-      await render(
-        hbs`<ChatComposerInlineButtons @buttons={{this.buttons}} />`
-      );
-
-      assert.true(exists(".chat-composer-inline-button.foo"));
-      assert.true(exists(".chat-composer-inline-button.foo .d-icon-times"));
-    });
-  }
-);
diff --git a/plugins/chat/test/javascripts/components/chat-composer-message-details-test.js b/plugins/chat/test/javascripts/components/chat-composer-message-details-test.js
new file mode 100644
index 00000000000..147d50a89cc
--- /dev/null
+++ b/plugins/chat/test/javascripts/components/chat-composer-message-details-test.js
@@ -0,0 +1,77 @@
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import hbs from "htmlbars-inline-precompile";
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
+import { module, test } from "qunit";
+import { render } from "@ember/test-helpers";
+
+module(
+  "Discourse Chat | Component | chat-composer-message-details",
+  function (hooks) {
+    setupRenderingTest(hooks);
+
+    test("data-id attribute", async function (assert) {
+      this.message = fabricators.message();
+
+      await render(
+        hbs`<ChatComposerMessageDetails @message={{this.message}} />`
+      );
+
+      assert
+        .dom(".chat-composer-message-details")
+        .hasAttribute("data-id", this.message.id.toString());
+    });
+
+    test("editing a message has the pencil icon", async function (assert) {
+      this.message = fabricators.message({ editing: true });
+
+      await render(
+        hbs`<ChatComposerMessageDetails @message={{this.message}} />`
+      );
+
+      assert.dom(".chat-composer-message-details .d-icon-pencil-alt").exists();
+    });
+
+    test("replying to a message has the reply icon", async function (assert) {
+      const firstMessage = fabricators.message();
+      this.message = fabricators.message({ inReplyTo: firstMessage });
+
+      await render(
+        hbs`<ChatComposerMessageDetails @message={{this.message}} />`
+      );
+
+      assert.dom(".chat-composer-message-details .d-icon-reply").exists();
+    });
+
+    test("displays user avatar", async function (assert) {
+      this.message = fabricators.message();
+
+      await render(
+        hbs`<ChatComposerMessageDetails @message={{this.message}} />`
+      );
+
+      assert
+        .dom(".chat-composer-message-details .chat-user-avatar .avatar")
+        .hasAttribute("title", this.message.user.username);
+    });
+
+    test("displays message excerpt", async function (assert) {
+      this.message = fabricators.message();
+
+      await render(
+        hbs`<ChatComposerMessageDetails @message={{this.message}} />`
+      );
+
+      assert.dom(".chat-reply__excerpt").hasText(this.message.excerpt);
+    });
+
+    test("displays user’s username", async function (assert) {
+      this.message = fabricators.message();
+
+      await render(
+        hbs`<ChatComposerMessageDetails @message={{this.message}} />`
+      );
+
+      assert.dom(".chat-reply__username").hasText(this.message.user.username);
+    });
+  }
+);
diff --git a/plugins/chat/test/javascripts/components/chat-composer-placeholder-test.js b/plugins/chat/test/javascripts/components/chat-composer-placeholder-test.js
index 411aea8ca5a..eb9342fb608 100644
--- a/plugins/chat/test/javascripts/components/chat-composer-placeholder-test.js
+++ b/plugins/chat/test/javascripts/components/chat-composer-placeholder-test.js
@@ -4,6 +4,7 @@ import hbs from "htmlbars-inline-precompile";
 import ChatChannel from "discourse/plugins/chat/discourse/models/chat-channel";
 import { module, test } from "qunit";
 import { render } from "@ember/test-helpers";
+import pretender from "discourse/tests/helpers/create-pretender";
 
 module(
   "Discourse Chat | Component | chat-composer placeholder",
@@ -11,62 +12,59 @@ module(
     setupRenderingTest(hooks);
 
     test("direct message to self shows Jot something down", async function (assert) {
-      this.currentUser.set("id", 1);
-      this.set(
-        "chatChannel",
-        ChatChannel.create({
-          chatable_type: "DirectMessage",
-          chatable: {
-            users: [{ id: 1 }],
-          },
-        })
-      );
+      pretender.get("/chat/emojis.json", () => [200, [], {}]);
 
-      await render(hbs`<ChatComposer @chatChannel={{this.chatChannel}} />`);
+      this.currentUser.set("id", 1);
+      this.channel = ChatChannel.create({
+        chatable_type: "DirectMessage",
+        chatable: {
+          users: [{ id: 1 }],
+        },
+      });
+
+      await render(hbs`<Chat::Composer::Channel @channel={{this.channel}} />`);
 
       assert.strictEqual(
-        query(".chat-composer-input").placeholder,
+        query(".chat-composer__input").placeholder,
         "Jot something down"
       );
     });
 
     test("direct message to multiple folks shows their names", async function (assert) {
-      this.set(
-        "chatChannel",
-        ChatChannel.create({
-          chatable_type: "DirectMessage",
-          chatable: {
-            users: [
-              { name: "Tomtom" },
-              { name: "Steaky" },
-              { username: "zorro" },
-            ],
-          },
-        })
-      );
+      pretender.get("/chat/emojis.json", () => [200, [], {}]);
 
-      await render(hbs`<ChatComposer @chatChannel={{this.chatChannel}} />`);
+      this.channel = ChatChannel.create({
+        chatable_type: "DirectMessage",
+        chatable: {
+          users: [
+            { name: "Tomtom" },
+            { name: "Steaky" },
+            { username: "zorro" },
+          ],
+        },
+      });
+
+      await render(hbs`<Chat::Composer::Channel @channel={{this.channel}} />`);
 
       assert.strictEqual(
-        query(".chat-composer-input").placeholder,
+        query(".chat-composer__input").placeholder,
         "Chat with Tomtom, Steaky, @zorro"
       );
     });
 
     test("message to channel shows send message to channel name", async function (assert) {
-      this.set(
-        "chatChannel",
-        ChatChannel.create({
-          chatable_type: "Category",
-          title: "just-cats",
-        })
-      );
+      pretender.get("/chat/emojis.json", () => [200, [], {}]);
 
-      await render(hbs`<ChatComposer @chatChannel={{this.chatChannel}} />`);
+      this.channel = ChatChannel.create({
+        chatable_type: "Category",
+        title: "just-cats",
+      });
+
+      await render(hbs`<Chat::Composer::Channel @channel={{this.channel}} />`);
 
       assert.strictEqual(
-        query(".chat-composer-input").placeholder,
-        "Chat with #just-cats"
+        query(".chat-composer__input").placeholder,
+        "Chat in #just-cats"
       );
     });
   }
diff --git a/plugins/chat/test/javascripts/components/chat-composer-upload-test.js b/plugins/chat/test/javascripts/components/chat-composer-upload-test.js
index 7a5d3526b2a..f57820c9f70 100644
--- a/plugins/chat/test/javascripts/components/chat-composer-upload-test.js
+++ b/plugins/chat/test/javascripts/components/chat-composer-upload-test.js
@@ -86,8 +86,6 @@ module("Discourse Chat | Component | chat-composer-upload", function (hooks) {
     );
 
     assert.true(exists("img.preview-img[src='/images/avatar.png']"));
-    assert.strictEqual(query(".file-name").innerText.trim(), "bar_image.png");
-    assert.strictEqual(query(".extension-pill").innerText.trim(), "png");
   });
 
   test("removing completed upload", async function (assert) {
@@ -106,7 +104,7 @@ module("Discourse Chat | Component | chat-composer-upload", function (hooks) {
       hbs`<ChatComposerUpload @isDone={{true}} @upload={{this.upload}} @onCancel={{fn this.removeUpload this.upload}} />`
     );
 
-    await click(".remove-upload");
+    await click(".chat-composer-upload__remove-btn");
     assert.strictEqual(this.uploadRemoved, true);
   });
 
@@ -126,7 +124,7 @@ module("Discourse Chat | Component | chat-composer-upload", function (hooks) {
       hbs`<ChatComposerUpload @upload={{this.upload}} @onCancel={{fn this.removeUpload this.upload}} />`
     );
 
-    await click(".remove-upload");
+    await click(".chat-composer-upload__remove-btn");
     assert.strictEqual(this.uploadRemoved, true);
   });
 });
diff --git a/plugins/chat/test/javascripts/components/chat-composer-uploads-test.js b/plugins/chat/test/javascripts/components/chat-composer-uploads-test.js
index b256887fff8..ecfc95fb1f3 100644
--- a/plugins/chat/test/javascripts/components/chat-composer-uploads-test.js
+++ b/plugins/chat/test/javascripts/components/chat-composer-uploads-test.js
@@ -8,7 +8,6 @@ import {
 import hbs from "htmlbars-inline-precompile";
 import { click, render, settled, waitFor } from "@ember/test-helpers";
 import { module, test } from "qunit";
-import { run } from "@ember/runloop";
 
 const fakeUpload = {
   type: ".png",
@@ -47,12 +46,11 @@ module("Discourse Chat | Component | chat-composer-uploads", function (hooks) {
   setupRenderingTest(hooks);
 
   test("loading uploads from an outside source (e.g. draft or editing message)", async function (assert) {
-    await render(hbs`
-      <ChatComposerUploads @fileUploadElementId="chat-widget-uploader" />
-    `);
+    this.existingUploads = [fakeUpload];
 
-    this.appEvents = this.container.lookup("service:appEvents");
-    this.appEvents.trigger("chat-composer:load-uploads", [fakeUpload]);
+    await render(hbs`
+      <ChatComposerUploads @existingUploads={{this.existingUploads}} @fileUploadElementId="chat-widget-uploader" />
+    `);
     await settled();
 
     assert.strictEqual(count(".chat-composer-upload"), 1);
@@ -61,17 +59,14 @@ module("Discourse Chat | Component | chat-composer-uploads", function (hooks) {
 
   test("upload starts and completes", async function (assert) {
     setupUploadPretender();
-    this.set("changedUploads", null);
-    this.set("onUploadChanged", (uploads) => {
-      this.set("changedUploads", uploads);
-    });
+    this.set("onUploadChanged", () => {});
 
     await render(hbs`
       <ChatComposerUploads @fileUploadElementId="chat-widget-uploader" @onUploadChanged={{this.onUploadChanged}} />
     `);
 
     const done = assert.async();
-    this.appEvents = this.container.lookup("service:appEvents");
+    this.appEvents = this.container.lookup("service:app-events");
     this.appEvents.on(
       "upload-mixin:chat-composer-uploader:upload-success",
       (fileName, upload) => {
@@ -80,34 +75,31 @@ module("Discourse Chat | Component | chat-composer-uploads", function (hooks) {
         done();
       }
     );
-
     this.appEvents.trigger(
       "upload-mixin:chat-composer-uploader:add-files",
       createFile("avatar.png")
     );
 
     await waitFor(".chat-composer-upload");
-    assert.strictEqual(count(".chat-composer-upload"), 1);
+
+    assert.dom(".chat-composer-upload").exists({ count: 1 });
   });
 
   test("removing a completed upload", async function (assert) {
     this.set("changedUploads", null);
-    this.set("onUploadChanged", (uploads) => {
-      this.set("changedUploads", uploads);
-    });
+    this.set("onUploadChanged", () => {});
+
+    this.existingUploads = [fakeUpload];
 
     await render(hbs`
-      <ChatComposerUploads @fileUploadElementId="chat-widget-uploader" @onUploadChanged={{this.onUploadChanged}} />
+      <ChatComposerUploads @existingUploads={{this.existingUploads}} @fileUploadElementId="chat-widget-uploader" @onUploadChanged={{this.onUploadChanged}} />
     `);
 
-    this.appEvents = this.container.lookup("service:appEvents");
-    run(() =>
-      this.appEvents.trigger("chat-composer:load-uploads", [fakeUpload])
-    );
-    assert.strictEqual(count(".chat-composer-upload"), 1);
+    assert.dom(".chat-composer-upload").exists({ count: 1 });
 
-    await click(".remove-upload");
-    assert.strictEqual(count(".chat-composer-upload"), 0);
+    await click(".chat-composer-upload__remove-btn");
+
+    assert.dom(".chat-composer-upload").exists({ count: 0 });
   });
 
   test("cancelling in progress upload", async function (assert) {
@@ -124,7 +116,7 @@ module("Discourse Chat | Component | chat-composer-uploads", function (hooks) {
 
     const image = createFile("avatar.png");
     const done = assert.async();
-    this.appEvents = this.container.lookup("service:appEvents");
+    this.appEvents = this.container.lookup("service:app-events");
 
     this.appEvents.on(
       `upload-mixin:chat-composer-uploader:upload-cancelled`,
@@ -146,7 +138,7 @@ module("Discourse Chat | Component | chat-composer-uploads", function (hooks) {
     await waitFor(".chat-composer-upload");
     assert.strictEqual(count(".chat-composer-upload"), 1);
 
-    await click(".remove-upload");
+    await click(".chat-composer-upload__remove-btn");
     assert.strictEqual(count(".chat-composer-upload"), 0);
   });
 });
diff --git a/plugins/chat/test/javascripts/components/chat-emoji-picker-test.js b/plugins/chat/test/javascripts/components/chat-emoji-picker-test.js
index 134fdf8f147..ea917aa5ba0 100644
--- a/plugins/chat/test/javascripts/components/chat-emoji-picker-test.js
+++ b/plugins/chat/test/javascripts/components/chat-emoji-picker-test.js
@@ -3,7 +3,7 @@ import { exists, query, queryAll } from "discourse/tests/helpers/qunit-helpers";
 import hbs from "htmlbars-inline-precompile";
 import { module, test } from "qunit";
 import pretender from "discourse/tests/helpers/create-pretender";
-import { click, fillIn, render } from "@ember/test-helpers";
+import { click, fillIn, render, triggerKeyEvent } from "@ember/test-helpers";
 
 function emojisResponse() {
   return {
@@ -68,7 +68,7 @@ module("Discourse Chat | Component | chat-emoji-picker", function (hooks) {
     this.chatEmojiPickerManager = this.container.lookup(
       "service:chat-emoji-picker-manager"
     );
-    this.chatEmojiPickerManager.startFromComposer(() => {});
+    this.chatEmojiPickerManager.open(() => {});
     this.chatEmojiPickerManager.addVisibleSections([
       "smileys_&_emotion",
       "people_&_body",
@@ -128,7 +128,8 @@ module("Discourse Chat | Component | chat-emoji-picker", function (hooks) {
     await click(`.chat-emoji-picker__section-btn[data-section="objects"]`);
 
     assert.true(
-      document.querySelector("#ember-testing-container").scrollTop > 0,
+      document.querySelector(".chat-emoji-picker__scrollable-content")
+        .scrollTop > 0,
       "it scrolls to the section"
     );
   });
@@ -138,47 +139,119 @@ module("Discourse Chat | Component | chat-emoji-picker", function (hooks) {
     await fillIn(".dc-filter-input", "grinning");
 
     assert.strictEqual(
-      queryAll(".chat-emoji-picker__sections > img").length,
+      queryAll(".chat-emoji-picker__section.filtered > img").length,
       1,
       "it filters the emojis list"
     );
     assert.true(
-      exists('.chat-emoji-picker__sections > img[alt="grinning"]'),
+      exists('.chat-emoji-picker__section.filtered > img[alt="grinning"]'),
       "it filters the correct emoji"
     );
 
     await fillIn(".dc-filter-input", "Grinning");
 
     assert.true(
-      exists('.chat-emoji-picker__sections > img[alt="grinning"]'),
+      exists('.chat-emoji-picker__section.filtered > img[alt="grinning"]'),
       "it is case insensitive"
     );
 
     await fillIn(".dc-filter-input", "smiley_cat");
 
     assert.true(
-      exists('.chat-emoji-picker__sections > img[alt="grinning"]'),
+      exists('.chat-emoji-picker__section.filtered > img[alt="grinning"]'),
       "it filters the correct emoji using search alias"
     );
   });
 
   test("When selecting an emoji", async function (assert) {
     let selection;
-    this.chatEmojiPickerManager.didSelectEmoji = (emoji) => {
+    this.didSelectEmoji = (emoji) => {
       selection = emoji;
     };
-    await render(hbs`<ChatEmojiPicker />`);
+
+    await render(
+      hbs`<ChatEmojiPicker @didSelectEmoji={{this.didSelectEmoji}} />`
+    );
     await click('img.emoji[data-emoji="grinning"]');
 
     assert.strictEqual(selection, "grinning");
   });
 
+  test("When navigating sections", async function (assert) {
+    await render(hbs`<ChatEmojiPicker />`);
+
+    await triggerKeyEvent(document.activeElement, "keydown", "ArrowDown");
+    assert.strictEqual(
+      document.activeElement.dataset.emoji,
+      "grinning",
+      "ArrowDown focuses on the first favorite emoji"
+    );
+
+    await triggerKeyEvent(document.activeElement, "keydown", "ArrowDown");
+    await triggerKeyEvent(document.activeElement, "keydown", "ArrowDown");
+    assert.strictEqual(
+      document.activeElement.dataset.emoji,
+      "raised_hands",
+      "ArrowDown focuses on the first emoji form the third section"
+    );
+
+    await triggerKeyEvent(document.activeElement, "keydown", "ArrowRight");
+    assert.strictEqual(
+      document.activeElement.dataset.emoji,
+      "man_rowing_boat",
+      "ArrowRight focuses on the emoji at the right"
+    );
+
+    await triggerKeyEvent(document.activeElement, "keydown", "ArrowLeft");
+    assert.strictEqual(
+      document.activeElement.dataset.emoji,
+      "raised_hands",
+      "ArrowLeft focuses on the emoji at the left"
+    );
+
+    await triggerKeyEvent(document.activeElement, "keydown", "ArrowUp");
+    assert.strictEqual(
+      document.activeElement.dataset.emoji,
+      "grinning",
+      "ArrowUp focuses on the first emoji form the second section"
+    );
+  });
+
+  test("When navigating filtered emojis", async function (assert) {
+    await render(hbs`<ChatEmojiPicker />`);
+    await fillIn(".dc-filter-input", "man");
+
+    await triggerKeyEvent(document.activeElement, "keydown", "ArrowDown");
+    assert.strictEqual(
+      document.activeElement.dataset.emoji,
+      "man_rowing_boat",
+      "ArrowDown focuses on the first filtered emoji"
+    );
+
+    await triggerKeyEvent(document.activeElement, "keydown", "ArrowRight");
+    assert.strictEqual(
+      document.activeElement.dataset.emoji,
+      "womans_clothes",
+      "ArrowRight focuses on the emoji at the right"
+    );
+
+    await triggerKeyEvent(document.activeElement, "keydown", "ArrowLeft");
+    assert.strictEqual(
+      document.activeElement.dataset.emoji,
+      "man_rowing_boat",
+      "ArrowLeft focuses on the emoji at the left"
+    );
+  });
+
   test("When selecting a toned an emoji", async function (assert) {
     let selection;
-    this.chatEmojiPickerManager.didSelectEmoji = (emoji) => {
+    this.didSelectEmoji = (emoji) => {
       selection = emoji;
     };
-    await render(hbs`<ChatEmojiPicker />`);
+
+    await render(
+      hbs`<ChatEmojiPicker @didSelectEmoji={{this.didSelectEmoji}} />`
+    );
     this.emojiReactionStore.diversity = 1;
     await click('img.emoji[data-emoji="man_rowing_boat"]');
 
diff --git a/plugins/chat/test/javascripts/components/chat-live-pane-test.js b/plugins/chat/test/javascripts/components/chat-live-pane-test.js
deleted file mode 100644
index 244439eb38e..00000000000
--- a/plugins/chat/test/javascripts/components/chat-live-pane-test.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import { setupRenderingTest } from "discourse/tests/helpers/component-test";
-import { exists } from "discourse/tests/helpers/qunit-helpers";
-import hbs from "htmlbars-inline-precompile";
-import { module, test } from "qunit";
-import fabricators from "../helpers/fabricators";
-import { render } from "@ember/test-helpers";
-import pretender, { response } from "discourse/tests/helpers/create-pretender";
-import MockPresenceChannel from "../helpers/mock-presence-channel";
-
-function mockChat(context) {
-  const mock = context.container.lookup("service:chat");
-  mock.draftStore = {};
-  mock.currentUser = context.currentUser;
-  mock.presenceChannel = MockPresenceChannel.create();
-  return mock;
-}
-
-module("Discourse Chat | Component | chat-live-pane", function (hooks) {
-  setupRenderingTest(hooks);
-
-  hooks.beforeEach(function () {
-    this.set("chat", mockChat(this));
-    this.set("channel", fabricators.chatChannel());
-  });
-
-  test("Shows skeleton when loading", async function (assert) {
-    pretender.get(`/chat/chat_channels.json`, () => response(this.channel));
-    pretender.get(`/chat/:id/messages.json`, () =>
-      response({ chat_messages: [], meta: { can_delete_self: true } })
-    );
-
-    await render(
-      hbs`<ChatLivePane @loadingMorePast={{true}} @chat={{this.chat}} @chatChannel={{this.channel}} />`
-    );
-
-    assert.true(exists(".chat-skeleton"));
-
-    await render(
-      hbs`<ChatLivePane @loadingMoreFuture={{true}} @chat={{this.chat}} @chatChannel={{this.channel}} />`
-    );
-
-    assert.true(exists(".chat-skeleton"));
-  });
-});
diff --git a/plugins/chat/test/javascripts/components/chat-message-avatar-test.js b/plugins/chat/test/javascripts/components/chat-message-avatar-test.js
index 56244f9803b..b9140651efb 100644
--- a/plugins/chat/test/javascripts/components/chat-message-avatar-test.js
+++ b/plugins/chat/test/javascripts/components/chat-message-avatar-test.js
@@ -3,22 +3,28 @@ import hbs from "htmlbars-inline-precompile";
 import { exists, query } from "discourse/tests/helpers/qunit-helpers";
 import { module, test } from "qunit";
 import { render } from "@ember/test-helpers";
+import ChatMessage from "discourse/plugins/chat/discourse/models/chat-message";
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
 
 module("Discourse Chat | Component | chat-message-avatar", function (hooks) {
   setupRenderingTest(hooks);
 
   test("chat_webhook_event", async function (assert) {
-    this.set("message", { chat_webhook_event: { emoji: ":heart:" } });
+    this.message = ChatMessage.create(fabricators.channel(), {
+      chat_webhook_event: { emoji: ":heart:" },
+    });
 
-    await render(hbs`<ChatMessageAvatar @message={{this.message}} />`);
+    await render(hbs`<Chat::Message::Avatar @message={{this.message}} />`);
 
     assert.strictEqual(query(".chat-emoji-avatar .emoji").title, "heart");
   });
 
   test("user", async function (assert) {
-    this.set("message", { user: { username: "discobot" } });
+    this.message = ChatMessage.create(fabricators.channel(), {
+      user: { username: "discobot" },
+    });
 
-    await render(hbs`<ChatMessageAvatar @message={{this.message}} />`);
+    await render(hbs`<Chat::Message::Avatar @message={{this.message}} />`);
 
     assert.true(exists('.chat-user-avatar [data-user-card="discobot"]'));
   });
diff --git a/plugins/chat/test/javascripts/components/chat-message-collapser-test.js b/plugins/chat/test/javascripts/components/chat-message-collapser-test.js
index 56be03b199c..0025a99fdbd 100644
--- a/plugins/chat/test/javascripts/components/chat-message-collapser-test.js
+++ b/plugins/chat/test/javascripts/components/chat-message-collapser-test.js
@@ -10,9 +10,9 @@ import { module, test } from "qunit";
 
 const youtubeCooked =
   "<p>written text</p>" +
-  '<div class="onebox lazyYT-container" data-youtube-id="ytId1" data-youtube-title="Cats are great">Vid 1</div>' +
+  '<div class="youtube-onebox lazy-video-container" data-video-id="ytId1" data-video-title="Cats are great" data-provider-name="youtube"> <a href="https://www.youtube.com/watch?v=ytId1"></a>Vid 1</div>' +
   "<p>more written text</p>" +
-  '<div class="onebox lazyYT-container" data-youtube-id="ytId2" data-youtube-title="Kittens are great">Vid 2</div>' +
+  '<div class="youtube-onebox lazy-video-container" data-video-id="ytId2" data-video-title="Kittens are great" data-provider-name="youtube"> <a href="https://www.youtube.com/watch?v=ytId2"></a>Vid 2</div>' +
   "<p>and even more</p>";
 
 const animatedImageCooked =
@@ -71,7 +71,13 @@ module(
     setupRenderingTest(hooks);
 
     test("escapes youtube header", async function (assert) {
-      this.set("cooked", youtubeCooked.replace("ytId1", evilString));
+      this.set(
+        "cooked",
+        youtubeCooked.replace(
+          "https://www.youtube.com/watch?v=ytId1",
+          `https://www.youtube.com/watch?v=${evilString}`
+        )
+      );
       await render(hbs`<ChatMessageCollapser @cooked={{this.cooked}} />`);
 
       assert.true(
@@ -124,7 +130,7 @@ module(
 
       await render(hbs`<ChatMessageCollapser @cooked={{this.cooked}} />`);
 
-      const youtubeDivs = queryAll(".onebox");
+      const youtubeDivs = queryAll(".youtube-onebox");
 
       assert.strictEqual(
         youtubeDivs.length,
@@ -138,11 +144,11 @@ module(
       );
 
       assert.false(
-        visible(".onebox[data-youtube-id='ytId1']"),
+        visible(".youtube-onebox[data-video-id='ytId1']"),
         "first youtube preview hidden"
       );
       assert.true(
-        visible(".onebox[data-youtube-id='ytId2']"),
+        visible(".youtube-onebox[data-video-id='ytId2']"),
         "second youtube preview still visible"
       );
 
@@ -160,11 +166,11 @@ module(
       );
 
       assert.true(
-        visible(".onebox[data-youtube-id='ytId1']"),
+        visible(".youtube-onebox[data-video-id='ytId1']"),
         "first youtube preview still visible"
       );
       assert.false(
-        visible(".onebox[data-youtube-id='ytId2']"),
+        visible(".youtube-onebox[data-video-id='ytId2']"),
         "second youtube preview hidden"
       );
 
diff --git a/plugins/chat/test/javascripts/components/chat-message-info-test.js b/plugins/chat/test/javascripts/components/chat-message-info-test.js
index 4fea2ebd07e..44d42e2f42a 100644
--- a/plugins/chat/test/javascripts/components/chat-message-info-test.js
+++ b/plugins/chat/test/javascripts/components/chat-message-info-test.js
@@ -4,20 +4,27 @@ import hbs from "htmlbars-inline-precompile";
 import { exists, query } from "discourse/tests/helpers/qunit-helpers";
 import I18n from "I18n";
 import { module, test } from "qunit";
-import User from "discourse/models/user";
 import { render } from "@ember/test-helpers";
+import ChatMessage from "discourse/plugins/chat/discourse/models/chat-message";
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
 
 module("Discourse Chat | Component | chat-message-info", function (hooks) {
   setupRenderingTest(hooks);
 
-  test("chat_webhook_event", async function (assert) {
-    this.set("message", { chat_webhook_event: { username: "discobot" } });
+  const template = hbs`
+    <Chat::Message::Info @message={{this.message}} @show={{true}} />
+  `;
 
-    await render(hbs`<ChatMessageInfo @message={{this.message}} />`);
+  test("chat_webhook_event", async function (assert) {
+    this.message = fabricators.message({
+      chat_webhook_event: { username: "discobot" },
+    });
+
+    await render(template);
 
     assert.strictEqual(
       query(".chat-message-info__username").innerText.trim(),
-      this.message.chat_webhook_event.username
+      this.message.chatWebhookEvent.username
     );
     assert.strictEqual(
       query(".chat-message-info__bot-indicator").textContent.trim(),
@@ -26,9 +33,11 @@ module("Discourse Chat | Component | chat-message-info", function (hooks) {
   });
 
   test("user", async function (assert) {
-    this.set("message", { user: { username: "discobot" } });
+    this.message = fabricators.message({
+      user: { username: "discobot" },
+    });
 
-    await render(hbs`<ChatMessageInfo @message={{this.message}} />`);
+    await render(template);
 
     assert.strictEqual(
       query(".chat-message-info__username").innerText.trim(),
@@ -37,18 +46,18 @@ module("Discourse Chat | Component | chat-message-info", function (hooks) {
   });
 
   test("date", async function (assert) {
-    this.set("message", {
+    this.message = fabricators.message({
       user: { username: "discobot" },
       created_at: moment(),
     });
 
-    await render(hbs`<ChatMessageInfo @message={{this.message}} />`);
+    await render(template);
 
     assert.true(exists(".chat-message-info__date"));
   });
 
   test("bookmark (with reminder)", async function (assert) {
-    this.set("message", {
+    this.message = fabricators.message({
       user: { username: "discobot" },
       bookmark: Bookmark.create({
         reminder_at: moment(),
@@ -56,7 +65,7 @@ module("Discourse Chat | Component | chat-message-info", function (hooks) {
       }),
     });
 
-    await render(hbs`<ChatMessageInfo @message={{this.message}} />`);
+    await render(template);
 
     assert.true(
       exists(".chat-message-info__bookmark .d-icon-discourse-bookmark-clock")
@@ -64,48 +73,84 @@ module("Discourse Chat | Component | chat-message-info", function (hooks) {
   });
 
   test("bookmark (no reminder)", async function (assert) {
-    this.set("message", {
+    this.message = ChatMessage.create(fabricators.channel(), {
       user: { username: "discobot" },
       bookmark: Bookmark.create({
         name: "some name",
       }),
     });
 
-    await render(hbs`<ChatMessageInfo @message={{this.message}} />`);
+    await render(template);
 
     assert.true(exists(".chat-message-info__bookmark .d-icon-bookmark"));
   });
 
   test("user status", async function (assert) {
     const status = { description: "off to dentist", emoji: "tooth" };
-    this.set("message", { user: User.create({ status }) });
+    this.message = fabricators.message({ user: { status } });
 
-    await render(hbs`<ChatMessageInfo @message={{this.message}} />`);
+    await render(template);
 
     assert.true(exists(".chat-message-info__status .user-status-message"));
   });
 
-  test("reviewable", async function (assert) {
-    this.set("message", {
+  test("flag status", async function (assert) {
+    this.message = fabricators.message({
       user: { username: "discobot" },
       user_flag_status: 0,
     });
 
-    await render(hbs`<ChatMessageInfo @message={{this.message}} />`);
+    await render(template);
 
-    assert.strictEqual(
-      query(".chat-message-info__flag > .svg-icon-title").title,
-      I18n.t("chat.you_flagged")
-    );
+    assert
+      .dom(".chat-message-info__flag > .svg-icon-title")
+      .hasAttribute("title", I18n.t("chat.you_flagged"));
+  });
 
-    this.set("message", {
+  test("reviewable", async function (assert) {
+    this.message = fabricators.message({
       user: { username: "discobot" },
-      reviewable_id: 1,
+      user_flag_status: 0,
     });
 
-    assert.strictEqual(
-      query(".chat-message-info__flag a .svg-icon-title").title,
-      I18n.t("chat.flagged")
-    );
+    await render(template);
+
+    assert
+      .dom(".chat-message-info__flag > .svg-icon-title")
+      .hasAttribute("title", I18n.t("chat.you_flagged"));
+  });
+
+  test("with username classes", async function (assert) {
+    this.message = fabricators.message({
+      user: {
+        username: "discobot",
+        admin: true,
+        moderator: true,
+        new_user: true,
+        primary_group_name: "foo",
+      },
+    });
+
+    await render(template);
+
+    assert.dom(".chat-message-info__username.is-staff").exists();
+    assert.dom(".chat-message-info__username.is-admin").exists();
+    assert.dom(".chat-message-info__username.is-moderator").exists();
+    assert.dom(".chat-message-info__username.is-new-user").exists();
+    assert.dom(".chat-message-info__username.group--foo").exists();
+  });
+
+  test("without username classes", async function (assert) {
+    this.message = fabricators.message({
+      user: { username: "discobot" },
+    });
+
+    await render(template);
+
+    assert.dom(".chat-message-info__username.is-staff").doesNotExist();
+    assert.dom(".chat-message-info__username.is-admin").doesNotExist();
+    assert.dom(".chat-message-info__username.is-moderator").doesNotExist();
+    assert.dom(".chat-message-info__username.is-new-user").doesNotExist();
+    assert.dom(".chat-message-info__username.group--foo").doesNotExist();
   });
 });
diff --git a/plugins/chat/test/javascripts/components/chat-message-left-gutter-test.js b/plugins/chat/test/javascripts/components/chat-message-left-gutter-test.js
new file mode 100644
index 00000000000..26415eb0440
--- /dev/null
+++ b/plugins/chat/test/javascripts/components/chat-message-left-gutter-test.js
@@ -0,0 +1,54 @@
+import { render } from "@ember/test-helpers";
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import hbs from "htmlbars-inline-precompile";
+import { module, test } from "qunit";
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
+import I18n from "I18n";
+
+module(
+  "Discourse Chat | Component | Chat::Message::LeftGutter",
+  function (hooks) {
+    setupRenderingTest(hooks);
+
+    const template = hbs`
+      <Chat::Message::LeftGutter @message={{this.message}} />
+    `;
+
+    test("default", async function (assert) {
+      this.message = fabricators.message();
+
+      await render(template);
+
+      assert.dom(".chat-message-left-gutter__date").exists();
+    });
+
+    test("with reviewable", async function (assert) {
+      this.message = fabricators.message({ reviewable_id: 1 });
+
+      await render(template);
+
+      assert
+        .dom(".chat-message-left-gutter__flag .svg-icon-title")
+        .hasAttribute("title", I18n.t("chat.flagged"));
+    });
+
+    test("with flag status", async function (assert) {
+      this.message = fabricators.message({ user_flag_status: 0 });
+
+      await render(template);
+
+      assert
+        .dom(".chat-message-left-gutter__flag .svg-icon-title")
+        .hasAttribute("title", I18n.t("chat.you_flagged"));
+    });
+
+    test("bookmark", async function (assert) {
+      this.message = fabricators.message({ bookmark: fabricators.bookmark() });
+
+      await render(template);
+
+      assert.dom(".chat-message-left-gutter__date").exists();
+      assert.dom(".chat-message-left-gutter__bookmark").exists();
+    });
+  }
+);
diff --git a/plugins/chat/test/javascripts/components/chat-message-mention-warning-test.js b/plugins/chat/test/javascripts/components/chat-message-mention-warning-test.js
new file mode 100644
index 00000000000..35af421d57f
--- /dev/null
+++ b/plugins/chat/test/javascripts/components/chat-message-mention-warning-test.js
@@ -0,0 +1,102 @@
+import { render } from "@ember/test-helpers";
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import hbs from "htmlbars-inline-precompile";
+import { module, test } from "qunit";
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
+
+module(
+  "Discourse Chat | Component | Chat::Message::MentionWarning",
+  function (hooks) {
+    setupRenderingTest(hooks);
+
+    const template = hbs`
+      <Chat::Message::MentionWarning @message={{this.message}} />
+    `;
+
+    test("without memberships", async function (assert) {
+      this.message = fabricators.message();
+      this.message.mentionWarning = fabricators.messageMentionWarning(
+        this.message,
+        {
+          without_membership: [fabricators.user()].map((u) => {
+            return { username: u.username, id: u.id };
+          }),
+        }
+      );
+
+      await render(template);
+
+      assert
+        .dom(".chat-message-mention-warning__text.-without-membership")
+        .exists();
+    });
+
+    test("cannot see channel", async function (assert) {
+      this.message = fabricators.message();
+      this.message.mentionWarning = fabricators.messageMentionWarning(
+        this.message,
+        {
+          cannot_see: [fabricators.user()].map((u) => {
+            return { username: u.username, id: u.id };
+          }),
+        }
+      );
+
+      await render(template);
+
+      assert.dom(".chat-message-mention-warning__text.-cannot-see").exists();
+    });
+
+    test("cannot see channel", async function (assert) {
+      this.message = fabricators.message();
+      this.message.mentionWarning = fabricators.messageMentionWarning(
+        this.message,
+        {
+          cannot_see: [fabricators.user()].map((u) => {
+            return { username: u.username, id: u.id };
+          }),
+        }
+      );
+
+      await render(template);
+
+      assert.dom(".chat-message-mention-warning__text.-cannot-see").exists();
+    });
+
+    test("too many groups", async function (assert) {
+      this.message = fabricators.message();
+      this.message.mentionWarning = fabricators.messageMentionWarning(
+        this.message,
+        {
+          groups_with_too_many_members: [fabricators.group()].mapBy("name"),
+        }
+      );
+
+      await render(template);
+
+      assert
+        .dom(
+          ".chat-message-mention-warning__text.-groups-with-too-many-members"
+        )
+        .exists();
+    });
+
+    test("groups with mentions disabled", async function (assert) {
+      this.message = fabricators.message();
+      this.message.mentionWarning = fabricators.messageMentionWarning(
+        this.message,
+        {
+          group_mentions_disabled: [fabricators.group()].mapBy("name"),
+        }
+      );
+
+      await render(template);
+
+      assert
+        .dom(
+          ".chat-message-mention-warning__text.-groups-with-mentions-disabled"
+        )
+        .exists();
+    });
+  }
+);
diff --git a/plugins/chat/test/javascripts/components/chat-message-move-to-channel-modal-inner-test.js b/plugins/chat/test/javascripts/components/chat-message-move-to-channel-modal-inner-test.js
deleted file mode 100644
index ebf72124b06..00000000000
--- a/plugins/chat/test/javascripts/components/chat-message-move-to-channel-modal-inner-test.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import { setupRenderingTest } from "discourse/tests/helpers/component-test";
-import fabricators from "../helpers/fabricators";
-import { query } from "discourse/tests/helpers/qunit-helpers";
-import hbs from "htmlbars-inline-precompile";
-import { render } from "@ember/test-helpers";
-import { module, test } from "qunit";
-
-module(
-  "Discourse Chat | Component | chat-message-move-to-channel-modal-inner",
-  function (hooks) {
-    setupRenderingTest(hooks);
-
-    test("channel title is escaped in instructions correctly", async function (assert) {
-      this.set(
-        "channel",
-        fabricators.chatChannel({ title: "<script>someeviltitle</script>" })
-      );
-      this.set("chat", { publicChannels: [this.channel] });
-      this.set("selectedMessageIds", [1]);
-
-      await render(hbs`
-        <ChatMessageMoveToChannelModalInner
-          @selectedMessageIds={{this.selectedMessageIds}}
-          @sourceChannel={{this.channel}}
-          @chat={{this.chat}}
-        />
-      `);
-
-      assert.true(
-        query(".chat-message-move-to-channel-modal-inner").innerHTML.includes(
-          "&lt;script&gt;someeviltitle&lt;/script&gt;"
-        )
-      );
-    });
-  }
-);
diff --git a/plugins/chat/test/javascripts/components/chat-message-reaction-test.js b/plugins/chat/test/javascripts/components/chat-message-reaction-test.js
index 86f1ca04c7f..4c3b6e8fab3 100644
--- a/plugins/chat/test/javascripts/components/chat-message-reaction-test.js
+++ b/plugins/chat/test/javascripts/components/chat-message-reaction-test.js
@@ -7,14 +7,6 @@ import { module, test } from "qunit";
 module("Discourse Chat | Component | chat-message-reaction", function (hooks) {
   setupRenderingTest(hooks);
 
-  test("accepts arbitrary class property", async function (assert) {
-    await render(hbs`
-      <ChatMessageReaction @reaction={{hash emoji="heart"}} @class="foo" />
-    `);
-
-    assert.true(exists(".chat-message-reaction.foo"));
-  });
-
   test("adds reacted class when user reacted", async function (assert) {
     await render(hbs`
       <ChatMessageReaction @reaction={{hash emoji="heart" reacted=true}} />
@@ -29,19 +21,6 @@ module("Discourse Chat | Component | chat-message-reaction", function (hooks) {
     assert.true(exists(`.chat-message-reaction[data-emoji-name="heart"]`));
   });
 
-  test("adds show class when count is positive", async function (assert) {
-    this.set("count", 0);
-
-    await render(hbs`
-      <ChatMessageReaction @reaction={{hash emoji="heart" count=this.count}} />
-    `);
-
-    assert.false(exists(".chat-message-reaction.show"));
-
-    this.set("count", 1);
-    assert.true(exists(".chat-message-reaction.show"));
-  });
-
   test("title/alt attributes", async function (assert) {
     await render(hbs`<ChatMessageReaction @reaction={{hash emoji="heart"}} />`);
 
@@ -76,7 +55,7 @@ module("Discourse Chat | Component | chat-message-reaction", function (hooks) {
     });
 
     await render(hbs`
-      <ChatMessageReaction class="show" @reaction={{hash emoji="heart" count=this.count}} @react={{this.react}} />
+      <ChatMessageReaction class="show" @reaction={{hash emoji="heart" count=this.count}} @onReaction={{this.react}} />
     `);
 
     assert.false(exists(".chat-message-reaction .count"));
diff --git a/plugins/chat/test/javascripts/components/chat-message-separator-date-test.js b/plugins/chat/test/javascripts/components/chat-message-separator-date-test.js
new file mode 100644
index 00000000000..bac862aa8ea
--- /dev/null
+++ b/plugins/chat/test/javascripts/components/chat-message-separator-date-test.js
@@ -0,0 +1,27 @@
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import { query } from "discourse/tests/helpers/qunit-helpers";
+import hbs from "htmlbars-inline-precompile";
+import { module, test } from "qunit";
+import { render } from "@ember/test-helpers";
+
+module(
+  "Discourse Chat | Component | chat-message-separator-date",
+  function (hooks) {
+    setupRenderingTest(hooks);
+
+    test("first message of the day", async function (assert) {
+      this.set("date", moment().format("LLL"));
+      this.set("message", { formattedFirstMessageDate: this.date });
+      this.set("fetchMessagesByDate", () => {});
+
+      await render(
+        hbs`<ChatMessageSeparatorDate @message={{this.message}} @fetchMessagesByDate={{this.fetchMessagesByDate}} />`
+      );
+
+      assert.strictEqual(
+        query(".chat-message-separator-date").innerText.trim(),
+        this.date
+      );
+    });
+  }
+);
diff --git a/plugins/chat/test/javascripts/components/chat-message-separator-new-test.js b/plugins/chat/test/javascripts/components/chat-message-separator-new-test.js
new file mode 100644
index 00000000000..ee91a122043
--- /dev/null
+++ b/plugins/chat/test/javascripts/components/chat-message-separator-new-test.js
@@ -0,0 +1,24 @@
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import { query } from "discourse/tests/helpers/qunit-helpers";
+import hbs from "htmlbars-inline-precompile";
+import I18n from "I18n";
+import { module, test } from "qunit";
+import { render } from "@ember/test-helpers";
+
+module(
+  "Discourse Chat | Component | chat-message-separator-new",
+  function (hooks) {
+    setupRenderingTest(hooks);
+
+    test("newest message", async function (assert) {
+      this.set("message", { newest: true });
+
+      await render(hbs`<ChatMessageSeparatorNew @message={{this.message}} />`);
+
+      assert.strictEqual(
+        query(".chat-message-separator-new").innerText.trim(),
+        I18n.t("chat.last_visit")
+      );
+    });
+  }
+);
diff --git a/plugins/chat/test/javascripts/components/chat-message-separator-test.js b/plugins/chat/test/javascripts/components/chat-message-separator-test.js
deleted file mode 100644
index 4b4aad0e565..00000000000
--- a/plugins/chat/test/javascripts/components/chat-message-separator-test.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import { setupRenderingTest } from "discourse/tests/helpers/component-test";
-import { query } from "discourse/tests/helpers/qunit-helpers";
-import hbs from "htmlbars-inline-precompile";
-import I18n from "I18n";
-import { module, test } from "qunit";
-import { render } from "@ember/test-helpers";
-
-module("Discourse Chat | Component | chat-message-separator", function (hooks) {
-  setupRenderingTest(hooks);
-
-  test("newest message", async function (assert) {
-    this.set("message", { newestMessage: true });
-
-    await render(hbs`<ChatMessageSeparator @message={{this.message}} />`);
-
-    assert.strictEqual(
-      query(".chat-message-separator.new-message .text").innerText.trim(),
-      I18n.t("chat.new_messages")
-    );
-  });
-
-  test("first message of the day", async function (assert) {
-    this.set("date", moment().format("LLL"));
-    this.set("message", { firstMessageOfTheDayAt: this.date });
-
-    await render(hbs`<ChatMessageSeparator @message={{this.message}} />`);
-
-    assert.strictEqual(
-      query(
-        ".chat-message-separator.first-daily-message .text"
-      ).innerText.trim(),
-      this.date
-    );
-  });
-});
diff --git a/plugins/chat/test/javascripts/components/chat-message-test.js b/plugins/chat/test/javascripts/components/chat-message-test.js
index 3dbaf2737e0..0d0efb76e96 100644
--- a/plugins/chat/test/javascripts/components/chat-message-test.js
+++ b/plugins/chat/test/javascripts/components/chat-message-test.js
@@ -1,119 +1,54 @@
-import User from "discourse/models/user";
-import { render, waitFor } from "@ember/test-helpers";
-import ChatMessage from "discourse/plugins/chat/discourse/models/chat-message";
+import { render } from "@ember/test-helpers";
 import { exists } from "discourse/tests/helpers/qunit-helpers";
 import { setupRenderingTest } from "discourse/tests/helpers/component-test";
 import hbs from "htmlbars-inline-precompile";
-import ChatChannel from "discourse/plugins/chat/discourse/models/chat-channel";
 import { module, test } from "qunit";
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
 
 module("Discourse Chat | Component | chat-message", function (hooks) {
   setupRenderingTest(hooks);
 
-  function generateMessageProps(messageData = {}) {
-    const chatChannel = ChatChannel.create({
-      chatable: { id: 1 },
-      chatable_type: "Category",
-      id: 9,
-      title: "Site",
-      last_message_sent_at: "2021-11-08T21:26:05.710Z",
-      current_user_membership: {
-        unread_count: 0,
-        muted: false,
-      },
-    });
-    return {
-      message: ChatMessage.create(
-        Object.assign(
-          {
-            id: 178,
-            message: "from deleted user",
-            cooked: "<p>from deleted user</p>",
-            excerpt: "<p>from deleted user</p>",
-            created_at: "2021-07-22T08:14:16.950Z",
-            flag_count: 0,
-            user: User.create({ username: "someguy", id: 1424 }),
-            edited: false,
-          },
-          messageData
-        )
-      ),
-      canInteractWithChat: true,
-      details: {
-        can_delete_self: true,
-        can_delete_others: true,
-        can_flag: true,
-        user_silenced: false,
-        can_moderate: true,
-      },
-      chatChannel,
-      setReplyTo: () => {},
-      replyMessageClicked: () => {},
-      editButtonClicked: () => {},
-      afterExpand: () => {},
-      selectingMessages: false,
-      onStartSelectingMessages: () => {},
-      onSelectMessage: () => {},
-      bulkSelectMessages: () => {},
-      afterReactionAdded: () => {},
-      onHoverMessage: () => {},
-    };
-  }
-
   const template = hbs`
-    <ChatMessage
-      @message={{this.message}}
-      @canInteractWithChat={{this.canInteractWithChat}}
-      @details={{this.details}}
-      @chatChannel={{this.chatChannel}}
-      @setReplyTo={{this.setReplyTo}}
-      @replyMessageClicked={{this.replyMessageClicked}}
-      @editButtonClicked={{this.editButtonClicked}}
-      @selectingMessages={{this.selectingMessages}}
-      @onStartSelectingMessages={{this.onStartSelectingMessages}}
-      @onSelectMessage={{this.onSelectMessage}}
-      @bulkSelectMessages={{this.bulkSelectMessages}}
-      @onHoverMessage={{this.onHoverMessage}}
-      @afterReactionAdded={{this.reStickScrollIfNeeded}}
-    />
+    <ChatMessage @message={{this.message}} />
   `;
 
   test("Message with edits", async function (assert) {
-    this.setProperties(generateMessageProps({ edited: true }));
+    this.message = fabricators.message({ edited: true });
     await render(template);
-    assert.true(
-      exists(".chat-message-edited"),
-      "has the correct edited css class"
-    );
+
+    assert.true(exists(".chat-message-edited"), "has the correct css class");
   });
 
   test("Deleted message", async function (assert) {
-    this.setProperties(generateMessageProps({ deleted_at: moment() }));
+    this.message = fabricators.message({
+      user: this.currentUser,
+      deleted_at: moment(),
+    });
     await render(template);
+
     assert.true(
-      exists(".chat-message-deleted .chat-message-expand"),
-      "has the correct deleted css class and expand button within"
+      exists(".chat-message-text.-deleted .chat-message-expand"),
+      "has the correct css class and expand button within"
     );
   });
 
   test("Hidden message", async function (assert) {
-    this.setProperties(generateMessageProps({ hidden: true }));
+    this.message = fabricators.message({ hidden: true });
     await render(template);
+
     assert.true(
-      exists(".chat-message-hidden .chat-message-expand"),
-      "has the correct hidden css class and expand button within"
+      exists(".chat-message-text.-hidden .chat-message-expand"),
+      "has the correct css class and expand button within"
     );
   });
 
-  test("Message marked as visible", async function (assert) {
-    this.setProperties(generateMessageProps());
-
+  test("Message with reply", async function (assert) {
+    this.message = fabricators.message({ inReplyTo: fabricators.message() });
     await render(template);
-    await waitFor("div[data-visible=true]");
 
     assert.true(
-      exists(".chat-message-container[data-visible=true]"),
-      "message is marked as visible"
+      exists(".chat-message-container.has-reply"),
+      "has the correct css class"
     );
   });
 });
diff --git a/plugins/chat/test/javascripts/components/chat-message-text-test.js b/plugins/chat/test/javascripts/components/chat-message-text-test.js
index f0ba6fcd14f..b5f05f80bc3 100644
--- a/plugins/chat/test/javascripts/components/chat-message-text-test.js
+++ b/plugins/chat/test/javascripts/components/chat-message-text-test.js
@@ -22,7 +22,7 @@ module("Discourse Chat | Component | chat-message-text", function (hooks) {
   test("shows collapsed", async function (assert) {
     this.set(
       "cooked",
-      '<div class="onebox lazyYT lazyYT-container" data-youtube-id="WaT_rLGuUr8" data-youtube-title="Japanese Katsu Curry (Pork Cutlet)"/>'
+      '<div class="youtube-onebox lazy-video-container" data-video-id="WaT_rLGuUr8" data-video-title="Japanese Katsu Curry (Pork Cutlet)" data-provider-name="youtube"/>'
     );
 
     await render(
@@ -51,7 +51,10 @@ module("Discourse Chat | Component | chat-message-text", function (hooks) {
   });
 
   test("shows edits - collapsible message", async function (assert) {
-    this.set("cooked", '<div class="onebox lazyYT-container"></div>');
+    this.set(
+      "cooked",
+      '<div class="youtube-onebox lazy-video-container"></div>'
+    );
 
     await render(
       hbs`<ChatMessageText @cooked={{this.cooked}} @edited={{true}} />`
diff --git a/plugins/chat/test/javascripts/components/chat-channel-delete-modal-inner-test.js b/plugins/chat/test/javascripts/components/chat-modal-archive-channel-test.js
similarity index 57%
rename from plugins/chat/test/javascripts/components/chat-channel-delete-modal-inner-test.js
rename to plugins/chat/test/javascripts/components/chat-modal-archive-channel-test.js
index da9a92c4855..847a5162b7e 100644
--- a/plugins/chat/test/javascripts/components/chat-channel-delete-modal-inner-test.js
+++ b/plugins/chat/test/javascripts/components/chat-modal-archive-channel-test.js
@@ -1,29 +1,26 @@
 import { setupRenderingTest } from "discourse/tests/helpers/component-test";
-import fabricators from "../helpers/fabricators";
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
 import { query } from "discourse/tests/helpers/qunit-helpers";
 import hbs from "htmlbars-inline-precompile";
 import { render } from "@ember/test-helpers";
 import { module, test } from "qunit";
 
 module(
-  "Discourse Chat | Component | chat-channel-delete-modal-inner",
+  "Discourse Chat | Component | <Chat::Modal::ArchiveChannel>",
   function (hooks) {
     setupRenderingTest(hooks);
 
     test("channel title is escaped in instructions correctly", async function (assert) {
-      this.set(
-        "channel",
-        fabricators.chatChannel({
-          title: `<script>someeviltitle</script>`,
-        })
-      );
+      this.channel = fabricators.channel({
+        title: `<script>someeviltitle</script>`,
+      });
 
       await render(
-        hbs`<ChatChannelDeleteModalInner @chatChannel={{this.channel}} />`
+        hbs`<Chat::Modal::ArchiveChannel @inline={{true}} @model={{hash channel=this.channel}} />`
       );
 
       assert.true(
-        query(".chat-channel-delete-modal-instructions").innerHTML.includes(
+        query(".chat-modal-archive-channel").innerHTML.includes(
           "&lt;script&gt;someeviltitle&lt;/script&gt;"
         )
       );
diff --git a/plugins/chat/test/javascripts/components/chat-channel-archive-modal-inner-test.js b/plugins/chat/test/javascripts/components/chat-modal-delete-channel-test.js
similarity index 58%
rename from plugins/chat/test/javascripts/components/chat-channel-archive-modal-inner-test.js
rename to plugins/chat/test/javascripts/components/chat-modal-delete-channel-test.js
index 02362286623..2d441aa2619 100644
--- a/plugins/chat/test/javascripts/components/chat-channel-archive-modal-inner-test.js
+++ b/plugins/chat/test/javascripts/components/chat-modal-delete-channel-test.js
@@ -1,29 +1,26 @@
 import { setupRenderingTest } from "discourse/tests/helpers/component-test";
-import fabricators from "../helpers/fabricators";
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
 import { query } from "discourse/tests/helpers/qunit-helpers";
 import hbs from "htmlbars-inline-precompile";
 import { render } from "@ember/test-helpers";
 import { module, test } from "qunit";
 
 module(
-  "Discourse Chat | Component | chat-channel-archive-modal-inner",
+  "Discourse Chat | Component | <Chat::Modal::DeleteChannel />",
   function (hooks) {
     setupRenderingTest(hooks);
 
     test("channel title is escaped in instructions correctly", async function (assert) {
-      this.set(
-        "channel",
-        fabricators.chatChannel({
-          title: `<script>someeviltitle</script>`,
-        })
-      );
+      this.channel = fabricators.channel({
+        title: `<script>someeviltitle</script>`,
+      });
 
       await render(
-        hbs`<ChatChannelArchiveModalInner @chatChannel={{this.channel}} />`
+        hbs`<Chat::Modal::DeleteChannel @inline={{true}} @model={{hash channel=this.channel}} />`
       );
 
       assert.true(
-        query(".chat-channel-archive-modal-instructions").innerHTML.includes(
+        query(".chat-modal-delete-channel__instructions").innerHTML.includes(
           "&lt;script&gt;someeviltitle&lt;/script&gt;"
         )
       );
diff --git a/plugins/chat/test/javascripts/components/chat-modal-move-message-to-channel-test.js b/plugins/chat/test/javascripts/components/chat-modal-move-message-to-channel-test.js
new file mode 100644
index 00000000000..086e8756a79
--- /dev/null
+++ b/plugins/chat/test/javascripts/components/chat-modal-move-message-to-channel-test.js
@@ -0,0 +1,33 @@
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
+import { query } from "discourse/tests/helpers/qunit-helpers";
+import hbs from "htmlbars-inline-precompile";
+import { render } from "@ember/test-helpers";
+import { module, test } from "qunit";
+
+module(
+  "Discourse Chat | Component | <Chat::Modal::MoveMessageToChannel />",
+  function (hooks) {
+    setupRenderingTest(hooks);
+
+    test("channel title is escaped in instructions correctly", async function (assert) {
+      this.channel = fabricators.channel({
+        title: "<script>someeviltitle</script>",
+      });
+      this.selectedMessageIds = [this.channel.id];
+
+      await render(hbs`
+        <Chat::Modal::MoveMessageToChannel
+          @inline={{true}}
+          @model={{hash sourceChannel=this.channel selectedMessageIds=this.selectedMessageIds}}
+        />
+      `);
+
+      assert.true(
+        query(".chat-modal-move-message-to-channel").innerHTML.includes(
+          "&lt;script&gt;someeviltitle&lt;/script&gt;"
+        )
+      );
+    });
+  }
+);
diff --git a/plugins/chat/test/javascripts/components/chat-notices-test.js b/plugins/chat/test/javascripts/components/chat-notices-test.js
new file mode 100644
index 00000000000..8181eb03c5a
--- /dev/null
+++ b/plugins/chat/test/javascripts/components/chat-notices-test.js
@@ -0,0 +1,65 @@
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import hbs from "htmlbars-inline-precompile";
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
+import { query, queryAll } from "discourse/tests/helpers/qunit-helpers";
+import { module, test } from "qunit";
+import { click, render } from "@ember/test-helpers";
+
+module("Discourse Chat | Component | chat-notice", function (hooks) {
+  setupRenderingTest(hooks);
+
+  test("displays all notices for a channel", async function (assert) {
+    this.channel = fabricators.channel();
+    this.manager = this.container.lookup(
+      "service:chatChannelPaneSubscriptionsManager"
+    );
+    this.manager.handleNotice({
+      channel_id: this.channel.id,
+      text_content: "hello",
+    });
+    this.manager.handleNotice({
+      channel_id: this.channel.id,
+      text_content: "goodbye",
+    });
+    this.manager.handleNotice({
+      channel_id: this.channel.id + 1,
+      text_content: "N/A",
+    });
+
+    await render(hbs`<ChatNotices @channel={{this.channel}} />`);
+
+    const notices = queryAll(".chat-notices .chat-notices__notice");
+
+    assert.strictEqual(notices.length, 2, "Two notices are rendered");
+
+    assert.true(notices[0].innerText.includes("hello"));
+    assert.true(notices[1].innerText.includes("goodbye"));
+  });
+
+  test("Notices can be cleared", async function (assert) {
+    this.channel = fabricators.channel();
+    this.manager = this.container.lookup(
+      "service:chatChannelPaneSubscriptionsManager"
+    );
+    this.manager.handleNotice({
+      channel_id: this.channel.id,
+      text_content: "hello",
+    });
+
+    await render(hbs`<ChatNotices @channel={{this.channel}} />`);
+
+    assert.strictEqual(
+      queryAll(".chat-notices .chat-notices__notice").length,
+      1,
+      "Notice is present"
+    );
+
+    await click(query(".chat-notices__notice__clear"), "Clear the notice");
+
+    assert.strictEqual(
+      queryAll(".chat-notices .chat-notices__notice").length,
+      0,
+      "Notice was cleared"
+    );
+  });
+});
diff --git a/plugins/chat/test/javascripts/components/chat-replying-indicator-test.js b/plugins/chat/test/javascripts/components/chat-replying-indicator-test.js
index 3ee425029bd..2d4475ae6f1 100644
--- a/plugins/chat/test/javascripts/components/chat-replying-indicator-test.js
+++ b/plugins/chat/test/javascripts/components/chat-replying-indicator-test.js
@@ -1,10 +1,27 @@
 import { setupRenderingTest } from "discourse/tests/helpers/component-test";
-import { exists, query } from "discourse/tests/helpers/qunit-helpers";
+import { query } from "discourse/tests/helpers/qunit-helpers";
 import hbs from "htmlbars-inline-precompile";
-import fabricators from "../helpers/fabricators";
-import MockPresenceChannel from "../helpers/mock-presence-channel";
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
 import { module, test } from "qunit";
 import { render } from "@ember/test-helpers";
+import {
+  joinChannel,
+  leaveChannel,
+} from "discourse/tests/helpers/presence-pretender";
+
+async function addUser(id, username, channelName = "/chat-reply/1") {
+  await joinChannel(channelName, {
+    id,
+    avatar_template: "/images/avatar.png",
+    username,
+  });
+}
+
+async function removeUser(id, channelName = "/chat-reply/1") {
+  await leaveChannel(channelName, {
+    id,
+  });
+}
 
 module(
   "Discourse Chat | Component | chat-replying-indicator",
@@ -12,155 +29,138 @@ module(
     setupRenderingTest(hooks);
 
     test("not displayed when no one is replying", async function (assert) {
-      this.set("chatChannel", fabricators.chatChannel());
-      this.set(
-        "presenceChannel",
-        MockPresenceChannel.create({
-          name: `/chat-reply/${this.chatChannel.id}`,
-        })
-      );
-
       await render(
-        hbs`<ChatReplyingIndicator @presenceChannel={{this.presenceChannel}} @chatChannel={{this.chatChannel}} />`
+        hbs`<ChatReplyingIndicator @presenceChannelName="/chat-reply/1" />`
       );
 
-      assert.false(exists(".chat-replying-indicator__text"));
+      assert.dom(".chat-replying-indicator__text").doesNotExist();
     });
 
-    test("displays indicator when user is replying", async function (assert) {
-      this.set("chatChannel", fabricators.chatChannel());
-      this.set(
-        "presenceChannel",
-        MockPresenceChannel.create({
-          name: `/chat-reply/${this.chatChannel.id}`,
-        })
-      );
-
+    test("working for thread", async function (assert) {
       await render(
-        hbs`<ChatReplyingIndicator @presenceChannel={{this.presenceChannel}} @chatChannel={{this.chatChannel}} />`
+        hbs`<ChatReplyingIndicator @presenceChannelName="/chat-reply/1/thread/1" />`
       );
 
-      const sam = { id: 1, username: "sam" };
-      this.set("presenceChannel.users", [sam]);
+      await addUser(1, "sam", "/chat-reply/1/thread/1");
 
       assert.strictEqual(
         query(".chat-replying-indicator__text").innerText,
-        `${sam.username} is typing`
+        "sam is typing"
+      );
+    });
+
+    test("doesn’t leak in other indicators", async function (assert) {
+      await render(
+        hbs`
+          <div class="channel"><ChatReplyingIndicator @presenceChannelName="/chat-reply/1" /></div>
+          <div class="thread"><ChatReplyingIndicator @presenceChannelName="/chat-reply/1/thread/1" /></div>
+        `
+      );
+
+      await addUser(1, "sam");
+
+      assert
+        .dom(".channel .chat-replying-indicator__text")
+        .hasText("sam is typing");
+      assert.dom(".thread .chat-replying-indicator__text").doesNotExist();
+
+      await addUser(2, "mark", "/chat-reply/1/thread/1");
+      await removeUser(1);
+
+      assert.dom(".channel .chat-replying-indicator__text").doesNotExist();
+      assert
+        .dom(".thread .chat-replying-indicator__text")
+        .hasText("mark is typing");
+    });
+
+    test("displays indicator when user is replying", async function (assert) {
+      await render(
+        hbs`<ChatReplyingIndicator @presenceChannelName="/chat-reply/1" />`
+      );
+
+      await addUser(1, "sam");
+
+      assert.strictEqual(
+        query(".chat-replying-indicator__text").innerText,
+        `sam is typing`
       );
     });
 
     test("displays indicator when 2 or 3 users are replying", async function (assert) {
-      this.set("chatChannel", fabricators.chatChannel());
-      this.set(
-        "presenceChannel",
-        MockPresenceChannel.create({
-          name: `/chat-reply/${this.chatChannel.id}`,
-        })
-      );
+      this.channel = fabricators.channel();
 
       await render(
-        hbs`<ChatReplyingIndicator @presenceChannel={{this.presenceChannel}} @chatChannel={{this.chatChannel}} />`
+        hbs`<ChatReplyingIndicator @presenceChannelName="/chat-reply/1" />`
       );
 
-      const sam = { id: 1, username: "sam" };
-      const mark = { id: 2, username: "mark" };
-      this.set("presenceChannel.users", [sam, mark]);
+      await addUser(1, "sam");
+      await addUser(2, "mark");
 
-      assert.strictEqual(
-        query(".chat-replying-indicator__text").innerText,
-        `${sam.username} and ${mark.username} are typing`
-      );
+      assert
+        .dom(".chat-replying-indicator__text")
+        .hasText("sam and mark are typing");
     });
 
     test("displays indicator when 3 users are replying", async function (assert) {
-      this.set("chatChannel", fabricators.chatChannel());
-      this.set(
-        "presenceChannel",
-        MockPresenceChannel.create({
-          name: `/chat-reply/${this.chatChannel.id}`,
-        })
-      );
+      this.channel = fabricators.channel();
 
       await render(
-        hbs`<ChatReplyingIndicator @presenceChannel={{this.presenceChannel}} @chatChannel={{this.chatChannel}} />`
+        hbs`<ChatReplyingIndicator @presenceChannelName="/chat-reply/1" />`
       );
 
-      const sam = { id: 1, username: "sam" };
-      const mark = { id: 2, username: "mark" };
-      const joffrey = { id: 3, username: "joffrey" };
-      this.set("presenceChannel.users", [sam, mark, joffrey]);
+      await addUser(1, "sam");
+      await addUser(2, "mark");
+      await addUser(3, "joffrey");
 
-      assert.strictEqual(
-        query(".chat-replying-indicator__text").innerText,
-        `${sam.username}, ${mark.username} and ${joffrey.username} are typing`
-      );
+      assert
+        .dom(".chat-replying-indicator__text")
+        .hasText("sam, mark and joffrey are typing");
     });
 
     test("displays indicator when more than 3 users are replying", async function (assert) {
-      this.set("chatChannel", fabricators.chatChannel());
-      this.set(
-        "presenceChannel",
-        MockPresenceChannel.create({
-          name: `/chat-reply/${this.chatChannel.id}`,
-        })
-      );
+      this.channel = fabricators.channel();
 
       await render(
-        hbs`<ChatReplyingIndicator @presenceChannel={{this.presenceChannel}} @chatChannel={{this.chatChannel}} />`
+        hbs`<ChatReplyingIndicator  @presenceChannelName="/chat-reply/1" />`
       );
 
-      const sam = { id: 1, username: "sam" };
-      const mark = { id: 2, username: "mark" };
-      const joffrey = { id: 3, username: "joffrey" };
-      const taylor = { id: 4, username: "taylor" };
-      this.set("presenceChannel.users", [sam, mark, joffrey, taylor]);
+      await addUser(1, "sam");
+      await addUser(2, "mark");
+      await addUser(3, "joffrey");
+      await addUser(4, "taylor");
 
-      assert.strictEqual(
-        query(".chat-replying-indicator__text").innerText,
-        `${sam.username}, ${mark.username} and 2 others are typing`
-      );
+      assert
+        .dom(".chat-replying-indicator__text")
+        .hasText("sam, mark and 2 others are typing");
     });
 
     test("filters current user from list of repliers", async function (assert) {
-      this.set("chatChannel", fabricators.chatChannel());
-      this.set(
-        "presenceChannel",
-        MockPresenceChannel.create({
-          name: `/chat-reply/${this.chatChannel.id}`,
-        })
-      );
+      this.channel = fabricators.channel();
 
       await render(
-        hbs`<ChatReplyingIndicator @presenceChannel={{this.presenceChannel}} @chatChannel={{this.chatChannel}} />`
+        hbs`<ChatReplyingIndicator  @presenceChannelName="/chat-reply/1" />`
       );
 
-      const sam = { id: 1, username: "sam" };
-      this.set("presenceChannel.users", [sam, this.currentUser]);
+      await addUser(1, "sam");
+      await addUser(this.currentUser.id, this.currentUser.username);
 
-      assert.strictEqual(
-        query(".chat-replying-indicator__text").innerText,
-        `${sam.username} is typing`
-      );
+      assert.dom(".chat-replying-indicator__text").hasText("sam is typing");
     });
 
-    test("resets presence when channel is draft", async function (assert) {
-      this.set("chatChannel", fabricators.chatChannel());
-      this.set(
-        "presenceChannel",
-        MockPresenceChannel.create({
-          name: `/chat-reply/${this.chatChannel.id}`,
-          subscribed: true,
-        })
-      );
+    test("resets presence when channel changes", async function (assert) {
+      this.set("presenceChannelName", "/chat-reply/1");
+
+      await addUser(1, "sam");
 
       await render(
-        hbs`<ChatReplyingIndicator @presenceChannel={{this.presenceChannel}} @chatChannel={{this.chatChannel}} />`
+        hbs`<ChatReplyingIndicator @presenceChannelName={{this.presenceChannelName}} />`
       );
 
-      assert.true(this.presenceChannel.subscribed);
+      assert.dom(".chat-replying-indicator__text").hasText("sam is typing");
 
-      this.set("chatChannel", fabricators.chatChannel({ isDraft: true }));
-      assert.false(this.presenceChannel.subscribed);
+      this.set("presenceChannelName", "/chat-reply/2");
+
+      assert.dom(".chat-replying-indicator__text").doesNotExist();
     });
   }
 );
diff --git a/plugins/chat/test/javascripts/components/chat-retention-reminder-test.js b/plugins/chat/test/javascripts/components/chat-retention-reminder-test.js
index d22042478d8..820e28a8308 100644
--- a/plugins/chat/test/javascripts/components/chat-retention-reminder-test.js
+++ b/plugins/chat/test/javascripts/components/chat-retention-reminder-test.js
@@ -1,6 +1,5 @@
 import ChatChannel from "discourse/plugins/chat/discourse/models/chat-channel";
 import { setupRenderingTest } from "discourse/tests/helpers/component-test";
-import { exists, query } from "discourse/tests/helpers/qunit-helpers";
 import hbs from "htmlbars-inline-precompile";
 import I18n from "I18n";
 import { module, test } from "qunit";
@@ -11,70 +10,17 @@ module(
   function (hooks) {
     setupRenderingTest(hooks);
 
-    test("Shows for public channels when user needs it", async function (assert) {
-      this.set(
-        "chatChannel",
-        ChatChannel.create({ chatable_type: "Category" })
-      );
+    test("display retention info", async function (assert) {
+      this.channel = ChatChannel.create({ chatable_type: "Category" });
       this.currentUser.set("needs_channel_retention_reminder", true);
-      this.siteSettings.chat_channel_retention_days = 100;
 
-      await render(
-        hbs`<ChatRetentionReminder @chatChannel={{this.chatChannel}} />`
+      await render(hbs`<ChatRetentionReminder @channel={{this.channel}} />`);
+
+      assert.dom(".chat-retention-reminder").includesText(
+        I18n.t("chat.retention_reminders.public", {
+          count: this.siteSettings.chat_channel_retention_days,
+        })
       );
-
-      assert.strictEqual(
-        query(".chat-retention-reminder-text").innerText.trim(),
-        I18n.t("chat.retention_reminders.public", { days: 100 })
-      );
-    });
-
-    test("Doesn't show for public channels when user has dismissed it", async function (assert) {
-      this.set(
-        "chatChannel",
-        ChatChannel.create({ chatable_type: "Category" })
-      );
-      this.currentUser.set("needs_channel_retention_reminder", false);
-      this.siteSettings.chat_channel_retention_days = 100;
-
-      await render(
-        hbs`<ChatRetentionReminder @chatChannel={{this.chatChannel}} />`
-      );
-
-      assert.false(exists(".chat-retention-reminder"));
-    });
-
-    test("Shows for direct message channels when user needs it", async function (assert) {
-      this.set(
-        "chatChannel",
-        ChatChannel.create({ chatable_type: "DirectMessage" })
-      );
-      this.currentUser.set("needs_dm_retention_reminder", true);
-      this.siteSettings.chat_dm_retention_days = 100;
-
-      await render(
-        hbs`<ChatRetentionReminder @chatChannel={{this.chatChannel}} />`
-      );
-
-      assert.strictEqual(
-        query(".chat-retention-reminder-text").innerText.trim(),
-        I18n.t("chat.retention_reminders.dm", { days: 100 })
-      );
-    });
-
-    test("Doesn't show for dm channels when user has dismissed it", async function (assert) {
-      this.set(
-        "chatChannel",
-        ChatChannel.create({ chatable_type: "DirectMessage" })
-      );
-      this.currentUser.set("needs_dm_retention_reminder", false);
-      this.siteSettings.chat_dm_retention_days = 100;
-
-      await render(
-        hbs`<ChatRetentionReminder @chatChannel={{this.chatChannel}} />`
-      );
-
-      assert.false(exists(".chat-retention-reminder"));
     });
   }
 );
diff --git a/plugins/chat/test/javascripts/components/chat-retention-reminder-text-test.js b/plugins/chat/test/javascripts/components/chat-retention-reminder-text-test.js
new file mode 100644
index 00000000000..52acf8bd1d8
--- /dev/null
+++ b/plugins/chat/test/javascripts/components/chat-retention-reminder-text-test.js
@@ -0,0 +1,54 @@
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import hbs from "htmlbars-inline-precompile";
+import I18n from "I18n";
+import { module, test } from "qunit";
+import { render } from "@ember/test-helpers";
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
+
+module(
+  "Discourse Chat | Component | chat-retention-reminder-text",
+  function (hooks) {
+    setupRenderingTest(hooks);
+
+    test("when setting is set on 0", async function (assert) {
+      this.channel = fabricators.channel();
+      this.siteSettings.chat_channel_retention_days = 0;
+
+      await render(
+        hbs`<ChatRetentionReminderText @channel={{this.channel}} />`
+      );
+
+      assert
+        .dom(".chat-retention-reminder-text")
+        .includesText(I18n.t("chat.retention_reminders.public_none"));
+    });
+
+    test("when channel is a public channel", async function (assert) {
+      const count = 10;
+      this.channel = fabricators.channel();
+      this.siteSettings.chat_channel_retention_days = count;
+
+      await render(
+        hbs`<ChatRetentionReminderText @channel={{this.channel}} />`
+      );
+
+      assert
+        .dom(".chat-retention-reminder-text")
+        .includesText(I18n.t("chat.retention_reminders.public", { count }));
+    });
+
+    test("when channel is a DM channel", async function (assert) {
+      const count = 10;
+      this.channel = fabricators.directMessageChannel();
+      this.siteSettings.chat_dm_retention_days = count;
+
+      await render(
+        hbs`<ChatRetentionReminderText @channel={{this.channel}} />`
+      );
+
+      assert
+        .dom(".chat-retention-reminder-text")
+        .includesText(I18n.t("chat.retention_reminders.dm", { count }));
+    });
+  }
+);
diff --git a/plugins/chat/test/javascripts/components/chat-upload-test.js b/plugins/chat/test/javascripts/components/chat-upload-test.js
index c423b2f11ad..a9716bcb29b 100644
--- a/plugins/chat/test/javascripts/components/chat-upload-test.js
+++ b/plugins/chat/test/javascripts/components/chat-upload-test.js
@@ -23,7 +23,7 @@ const IMAGE_FIXTURE = {
 
 const VIDEO_FIXTURE = {
   id: 290,
-  url: null, // Nulled out to avoid actually setting the img src - avoids an HTTP request
+  url: null, // Nulled out to avoid actually setting the src - avoids an HTTP request
   original_filename: "video.mp4",
   filesize: 172214,
   width: 1024,
@@ -37,6 +37,22 @@ const VIDEO_FIXTURE = {
   human_filesize: "168 KB",
 };
 
+const AUDIO_FIXTURE = {
+  id: 290,
+  url: null, // Nulled out to avoid actually setting the src - avoids an HTTP request
+  original_filename: "song.mp3",
+  filesize: 172214,
+  width: 1024,
+  height: 768,
+  thumbnail_width: 666,
+  thumbnail_height: 500,
+  extension: "mp3",
+  short_url: "upload://mnCnqY5tunCFw2qMgtPnu1mu1C9.mp3",
+  short_path: "/uploads/short-url/mnCnqY5tunCFw2qMgtPnu1mu1C9.mp3",
+  retain_hours: null,
+  human_filesize: "168 KB",
+};
+
 const TXT_FIXTURE = {
   id: 290,
   url: "https://example.com/file.txt",
@@ -92,6 +108,21 @@ module("Discourse Chat | Component | chat-upload", function (hooks) {
     );
   });
 
+  test("with a audio", async function (assert) {
+    this.set("upload", AUDIO_FIXTURE);
+
+    await render(hbs`<ChatUpload @upload={{this.upload}} />`);
+
+    assert.true(exists("audio.chat-audio-upload"), "displays as an audio");
+    const audio = query("audio.chat-audio-upload");
+    assert.true(audio.hasAttribute("controls"), "has audio controls");
+    assert.strictEqual(
+      audio.getAttribute("preload"),
+      "metadata",
+      "audio has correct preload settings"
+    );
+  });
+
   test("non image upload", async function (assert) {
     this.set("upload", TXT_FIXTURE);
 
diff --git a/plugins/chat/test/javascripts/components/chat-user-avatar-test.js b/plugins/chat/test/javascripts/components/chat-user-avatar-test.js
index 0cd68f37ab5..342ec3d3aae 100644
--- a/plugins/chat/test/javascripts/components/chat-user-avatar-test.js
+++ b/plugins/chat/test/javascripts/components/chat-user-avatar-test.js
@@ -1,50 +1,55 @@
 import { setupRenderingTest } from "discourse/tests/helpers/component-test";
-import { exists } from "discourse/tests/helpers/qunit-helpers";
 import hbs from "htmlbars-inline-precompile";
 import { module, test } from "qunit";
 import { render } from "@ember/test-helpers";
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
 
-const user = {
-  id: 1,
-  username: "markvanlan",
-  name: null,
-  avatar_template: "/letter_avatar_proxy/v4/letter/m/48db29/{size}.png",
-};
+function containerSelector(user, options = {}) {
+  let onlineSelector = ":not(.is-online)";
+  if (options.online) {
+    onlineSelector = ".is-online";
+  }
 
-module("Discourse Chat | Component | chat-user-avatar", function (hooks) {
+  return `.chat-user-avatar${onlineSelector} .chat-user-avatar__container[data-user-card=${user.username}] .avatar[title=${user.username}]`;
+}
+
+module("Discourse Chat | Component | <Chat::UserAvatar />", function (hooks) {
   setupRenderingTest(hooks);
 
   test("user is not online", async function (assert) {
-    this.set("user", user);
-    this.set("chat", { presenceChannel: { users: [] } });
+    this.user = fabricators.user();
+    this.chat = { presenceChannel: { users: [] } };
 
     await render(
-      hbs`<ChatUserAvatar @chat={{this.chat}} @user={{this.user}} />`
+      hbs`<Chat::UserAvatar @chat={{this.chat}} @user={{this.user}} />`
     );
 
-    assert.true(
-      exists(
-        `.chat-user-avatar .chat-user-avatar-container[data-user-card=${user.username}] .avatar[title=${user.username}]`
-      )
-    );
-    assert.false(exists(".chat-user-avatar.is-online"));
+    assert.dom(containerSelector(this.user, { online: false })).exists();
   });
 
   test("user is online", async function (assert) {
-    this.set("user", user);
-    this.set("chat", {
-      presenceChannel: { users: [{ id: user.id }] },
-    });
+    this.user = fabricators.user();
+    this.chat = {
+      presenceChannel: { users: [{ id: this.user.id }] },
+    };
 
     await render(
-      hbs`<ChatUserAvatar @chat={{this.chat}} @user={{this.user}} />`
+      hbs`<Chat::UserAvatar @chat={{this.chat}} @user={{this.user}} />`
     );
 
-    assert.true(
-      exists(
-        `.chat-user-avatar .chat-user-avatar-container[data-user-card=${user.username}] .avatar[title=${user.username}]`
-      )
+    assert.dom(containerSelector(this.user, { online: true })).exists();
+  });
+
+  test("showPresence=false", async function (assert) {
+    this.user = fabricators.user();
+    this.chat = {
+      presenceChannel: { users: [{ id: this.user.id }] },
+    };
+
+    await render(
+      hbs`<Chat::UserAvatar @showPresence={{false}} @chat={{this.chat}} @user={{this.user}} />`
     );
-    assert.true(exists(".chat-user-avatar.is-online"));
+
+    assert.dom(containerSelector(this.user, { online: false })).exists();
   });
 });
diff --git a/plugins/chat/test/javascripts/components/chat-user-card-button-test.js b/plugins/chat/test/javascripts/components/chat-user-card-button-test.js
new file mode 100644
index 00000000000..7a750dc06b8
--- /dev/null
+++ b/plugins/chat/test/javascripts/components/chat-user-card-button-test.js
@@ -0,0 +1,53 @@
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import hbs from "htmlbars-inline-precompile";
+import { render } from "@ember/test-helpers";
+import { module, test } from "qunit";
+import sinon from "sinon";
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
+
+module(
+  "Discourse Chat | Component | <Chat::UserCardButton />",
+  function (hooks) {
+    setupRenderingTest(hooks);
+
+    test("when current user can send direct messages", async function (assert) {
+      sinon
+        .stub(this.owner.lookup("service:chat"), "userCanDirectMessage")
+        .value(true);
+      this.user = fabricators.user();
+
+      await render(hbs`<Chat::UserCardButton @user={{user}} />`);
+
+      assert.dom(".chat-user-card-btn").exists("it shows the chat button");
+    });
+
+    test("when current user can’t send direct messages", async function (assert) {
+      sinon
+        .stub(this.owner.lookup("service:chat"), "userCanDirectMessage")
+        .value(false);
+      this.user = fabricators.user();
+
+      await render(hbs`<Chat::UserCardButton @user={{user}} />`);
+
+      assert
+        .dom(".chat-user-card-btn")
+        .doesNotExist("it doesn’t show the chat button");
+    });
+
+    test("when displayed user is suspended", async function (assert) {
+      sinon
+        .stub(this.owner.lookup("service:chat"), "userCanDirectMessage")
+        .value(true);
+
+      this.user = fabricators.user({
+        suspended_till: moment().add(1, "year").toDate(),
+      });
+
+      await render(hbs`<Chat::UserCardButton @user={{user}}/>`);
+
+      assert
+        .dom(".chat-user-card-btn")
+        .doesNotExist("it doesn’t show the chat button");
+    });
+  }
+);
diff --git a/plugins/chat/test/javascripts/components/chat-user-info-test.js b/plugins/chat/test/javascripts/components/chat-user-info-test.js
new file mode 100644
index 00000000000..b19ab3a7ec6
--- /dev/null
+++ b/plugins/chat/test/javascripts/components/chat-user-info-test.js
@@ -0,0 +1,24 @@
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import hbs from "htmlbars-inline-precompile";
+import { module, test } from "qunit";
+import { render } from "@ember/test-helpers";
+
+module("Discourse Chat | Component | chat-user-info", function (hooks) {
+  setupRenderingTest(hooks);
+
+  test("avatar and name", async function (assert) {
+    this.set("user", this.currentUser);
+
+    await render(hbs`<ChatUserInfo @user={{this.user}} />`);
+
+    assert
+      .dom(`a[data-user-card=${this.user.username}] div.chat-user-avatar`)
+      .exists();
+
+    assert
+      .dom(
+        `a[data-user-card=${this.user.username}] span.chat-user-display-name`
+      )
+      .includesText(this.user.username);
+  });
+});
diff --git a/plugins/chat/test/javascripts/components/direct-message-creator-test.js b/plugins/chat/test/javascripts/components/direct-message-creator-test.js
deleted file mode 100644
index 822003f7c9b..00000000000
--- a/plugins/chat/test/javascripts/components/direct-message-creator-test.js
+++ /dev/null
@@ -1,141 +0,0 @@
-import { setupRenderingTest } from "discourse/tests/helpers/component-test";
-import { click, fillIn, render } from "@ember/test-helpers";
-import hbs from "htmlbars-inline-precompile";
-import { exists, query } from "discourse/tests/helpers/qunit-helpers";
-import { createDirectMessageChannelDraft } from "discourse/plugins/chat/discourse/models/chat-channel";
-import { Promise } from "rsvp";
-import fabricators from "../helpers/fabricators";
-import { module, test } from "qunit";
-
-function mockChat(context, options = {}) {
-  const mock = context.container.lookup("service:chat");
-  mock.searchPossibleDirectMessageUsers = () => {
-    return Promise.resolve({
-      users: options.users || [{ username: "hawk" }, { username: "mark" }],
-    });
-  };
-  mock.getDmChannelForUsernames = () => {
-    return Promise.resolve({ chat_channel: fabricators.chatChannel() });
-  };
-  return mock;
-}
-
-module("Discourse Chat | Component | direct-message-creator", function (hooks) {
-  setupRenderingTest(hooks);
-
-  test("search", async function (assert) {
-    this.set("chat", mockChat(this));
-    this.set("channel", createDirectMessageChannelDraft());
-
-    await render(
-      hbs`<DirectMessageCreator @channel={{this.channel}} @chat={{this.chat}} />`
-    );
-
-    await fillIn(".filter-usernames", "hawk");
-    assert.true(exists("li.user[data-username='hawk']"));
-  });
-
-  test("select/deselect", async function (assert) {
-    this.set("chat", mockChat(this));
-    this.set("channel", createDirectMessageChannelDraft());
-
-    await render(
-      hbs`<DirectMessageCreator @channel={{this.channel}} @chat={{this.chat}} />`
-    );
-    assert.false(exists(".selected-user"));
-
-    await fillIn(".filter-usernames", "hawk");
-    await click("li.user[data-username='hawk']");
-    assert.true(exists(".selected-user"));
-
-    await click(".selected-user");
-    assert.false(exists(".selected-user"));
-  });
-
-  test("no search results", async function (assert) {
-    this.set("chat", mockChat(this, { users: [] }));
-    this.set("channel", createDirectMessageChannelDraft());
-
-    await render(
-      hbs`<DirectMessageCreator @channel={{this.channel}} @chat={{this.chat}} />`
-    );
-
-    await fillIn(".filter-usernames", "bad cat");
-    assert.true(exists(".no-results"));
-  });
-
-  test("loads user on first load", async function (assert) {
-    this.set("chat", mockChat(this));
-    this.set("channel", createDirectMessageChannelDraft());
-
-    await render(
-      hbs`<DirectMessageCreator @channel={{this.channel}} @chat={{this.chat}} />`
-    );
-
-    assert.true(exists("li.user[data-username='hawk']"));
-    assert.true(exists("li.user[data-username='mark']"));
-  });
-
-  test("do not load more users after selection", async function (assert) {
-    this.set("chat", mockChat(this));
-    this.set("channel", createDirectMessageChannelDraft());
-
-    await render(
-      hbs`<DirectMessageCreator @channel={{this.channel}} @chat={{this.chat}} />`
-    );
-
-    await click("li.user[data-username='hawk']");
-    assert.false(exists("li.user[data-username='mark']"));
-  });
-
-  test("apply is-focused to filter-area on focus input", async function (assert) {
-    this.set("chat", mockChat(this));
-    this.set("channel", createDirectMessageChannelDraft());
-
-    await render(
-      hbs`<DirectMessageCreator @channel={{this.channel}} @chat={{this.chat}} /><button class="test-blur">blur</button>`
-    );
-
-    await click(".filter-usernames");
-    assert.true(exists(".filter-area.is-focused"));
-
-    await click(".test-blur");
-    assert.false(exists(".filter-area.is-focused"));
-  });
-
-  test("state is reset on channel change", async function (assert) {
-    this.set("chat", mockChat(this));
-    this.set("channel", createDirectMessageChannelDraft());
-
-    await render(
-      hbs`<DirectMessageCreator @channel={{this.channel}} @chat={{this.chat}} />`
-    );
-
-    await fillIn(".filter-usernames", "hawk");
-    assert.strictEqual(query(".filter-usernames").value, "hawk");
-
-    this.set("channel", fabricators.chatChannel());
-    this.set("channel", createDirectMessageChannelDraft());
-
-    assert.strictEqual(query(".filter-usernames").value, "");
-    assert.true(exists(".filter-area.is-focused"));
-    assert.true(exists("li.user[data-username='hawk']"));
-  });
-
-  test("shows user status", async function (assert) {
-    const userWithStatus = {
-      username: "hawk",
-      status: { emoji: "tooth", description: "off to dentist" },
-    };
-    const chat = mockChat(this, { users: [userWithStatus] });
-    this.set("chat", chat);
-    this.set("channel", createDirectMessageChannelDraft());
-
-    await render(
-      hbs`<DirectMessageCreator @channel={{this.channel}} @chat={{this.chat}} />`
-    );
-
-    await fillIn(".filter-usernames", "hawk");
-    assert.true(exists(".user-status-message"));
-  });
-});
diff --git a/plugins/chat/test/javascripts/components/on-visibility-action-test.js b/plugins/chat/test/javascripts/components/on-visibility-action-test.js
deleted file mode 100644
index 759d2c4ab5c..00000000000
--- a/plugins/chat/test/javascripts/components/on-visibility-action-test.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import { setupRenderingTest } from "discourse/tests/helpers/component-test";
-import hbs from "htmlbars-inline-precompile";
-import { render, waitUntil } from "@ember/test-helpers";
-import { module, test } from "qunit";
-
-module("Discourse Chat | Component | on-visibility-action", function (hooks) {
-  setupRenderingTest(hooks);
-
-  test("Calling an action on visibility gained", async function (assert) {
-    this.set("value", null);
-    this.set("display", false);
-    this.set("action", () => {
-      this.set("value", "foo");
-    });
-
-    this.set("root", document.querySelector("#ember-testing"));
-
-    await render(hbs`
-      {{#if display}}
-        <OnVisibilityAction @action={{this.action}} @root={{this.root}} />
-      {{/if}}
-    `);
-
-    assert.strictEqual(this.value, null);
-
-    this.set("display", true);
-    await waitUntil(() => this.value !== null);
-
-    assert.strictEqual(this.value, "foo");
-  });
-});
diff --git a/plugins/chat/test/javascripts/components/user-card-chat-button-test.js b/plugins/chat/test/javascripts/components/user-card-chat-button-test.js
deleted file mode 100644
index 953efb9e455..00000000000
--- a/plugins/chat/test/javascripts/components/user-card-chat-button-test.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import { setupRenderingTest } from "discourse/tests/helpers/component-test";
-import hbs from "htmlbars-inline-precompile";
-import { render } from "@ember/test-helpers";
-import { module, test } from "qunit";
-import sinon from "sinon";
-import { exists } from "discourse/tests/helpers/qunit-helpers";
-
-module("Discourse Chat | Component | user-card-chat-button", function (hooks) {
-  setupRenderingTest(hooks);
-
-  test("when current user can send direct messages", async function (assert) {
-    sinon
-      .stub(this.owner.lookup("service:chat"), "userCanDirectMessage")
-      .value(true);
-
-    await render(hbs`<UserCardChatButton/>`);
-
-    assert.true(exists(".user-card-chat-btn"), "it shows the chat button");
-  });
-
-  test("when current user can’t send direct messages", async function (assert) {
-    sinon
-      .stub(this.owner.lookup("service:chat"), "userCanDirectMessage")
-      .value(false);
-
-    await render(hbs`<UserCardChatButton/>`);
-
-    assert.false(
-      exists(".user-card-chat-btn"),
-      "it doesn’t show the chat button"
-    );
-  });
-});
diff --git a/plugins/chat/test/javascripts/helpers/chat-pretenders.js b/plugins/chat/test/javascripts/helpers/chat-pretenders.js
index a72c917f7d4..9d46961fc05 100644
--- a/plugins/chat/test/javascripts/helpers/chat-pretenders.js
+++ b/plugins/chat/test/javascripts/helpers/chat-pretenders.js
@@ -138,7 +138,6 @@ export function directMessageChannelPretender(
   opts = { unread_count: 0, muted: false }
 ) {
   let copy = cloneJSON(directMessageChannels[0]);
-  copy.chat_channel.currentUserMembership.unread_count = opts.unread_count;
   copy.chat_channel.currentUserMembership.muted = opts.muted;
   server.get("/chat/chat_channels/75.json", () => helper.response(copy));
 }
@@ -150,13 +149,11 @@ export function chatChannelPretender(server, helper, changes = []) {
     let found;
     found = copy.public_channels.find((c) => c.id === change.id);
     if (found) {
-      found.currentUserMembership.unread_count = change.unread_count;
       found.currentUserMembership.muted = change.muted;
     }
     if (!found) {
       found = copy.direct_message_channels.find((c) => c.id === change.id);
       if (found) {
-        found.currentUserMembership.unread_count = change.unread_count;
         found.currentUserMembership.muted = change.muted;
       }
     }
diff --git a/plugins/chat/test/javascripts/helpers/fabricator.js b/plugins/chat/test/javascripts/helpers/fabricator.js
deleted file mode 100644
index 8a513c48128..00000000000
--- a/plugins/chat/test/javascripts/helpers/fabricator.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import { cloneJSON } from "discourse-common/lib/object";
-
-// heavily inspired by https://github.com/travelperk/fabricator
-export function Fabricator(Model, attributes = {}) {
-  return (opts) => fabricate(Model, attributes, opts);
-}
-
-function fabricate(Model, attributes, opts = {}) {
-  if (typeof attributes === "function") {
-    return attributes();
-  }
-
-  const extendedModel = cloneJSON({ ...attributes, ...opts });
-  const props = {};
-
-  for (const [key, value] of Object.entries(extendedModel)) {
-    props[key] = typeof value === "function" ? value() : value;
-  }
-
-  return Model.create(props);
-}
diff --git a/plugins/chat/test/javascripts/helpers/fabricators.js b/plugins/chat/test/javascripts/helpers/fabricators.js
deleted file mode 100644
index 924685b6e6e..00000000000
--- a/plugins/chat/test/javascripts/helpers/fabricators.js
+++ /dev/null
@@ -1,59 +0,0 @@
-import ChatChannel, {
-  CHATABLE_TYPES,
-} from "discourse/plugins/chat/discourse/models/chat-channel";
-import EmberObject from "@ember/object";
-import { Fabricator } from "./fabricator";
-
-const userFabricator = Fabricator(EmberObject, {
-  id: 1,
-  username: "hawk",
-  name: null,
-  avatar_template: "/letter_avatar_proxy/v3/letter/t/41988e/{size}.png",
-});
-
-const categoryChatableFabricator = Fabricator(EmberObject, {
-  id: 1,
-  color: "D56353",
-  read_restricted: false,
-  name: "My category",
-});
-
-const directChannelChatableFabricator = Fabricator(EmberObject, {
-  users: [userFabricator({ id: 1, username: "bob" })],
-});
-
-export default {
-  chatChannel: Fabricator(ChatChannel, {
-    id: 1,
-    chatable_type: CHATABLE_TYPES.categoryChannel,
-    status: "open",
-    title: "My category title",
-    name: "My category name",
-    chatable: categoryChatableFabricator(),
-    last_message_sent_at: "2021-11-08T21:26:05.710Z",
-    allow_channel_wide_mentions: true,
-    message_bus_last_ids: {
-      new_mentions: 0,
-      new_messages: 0,
-    },
-  }),
-
-  chatChannelMessage: Fabricator(EmberObject, {
-    id: 1,
-    chat_channel_id: 1,
-    user_id: 1,
-    cooked: "This is a test message",
-  }),
-
-  directMessageChatChannel: Fabricator(ChatChannel, {
-    id: 1,
-    chatable_type: CHATABLE_TYPES.directMessageChannel,
-    status: "open",
-    chatable: directChannelChatableFabricator(),
-    last_message_sent_at: "2021-11-08T21:26:05.710Z",
-    message_bus_last_ids: {
-      new_mentions: 0,
-      new_messages: 0,
-    },
-  }),
-};
diff --git a/plugins/chat/test/javascripts/helpers/mock-presence-channel.js b/plugins/chat/test/javascripts/helpers/mock-presence-channel.js
deleted file mode 100644
index 320529dfbde..00000000000
--- a/plugins/chat/test/javascripts/helpers/mock-presence-channel.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import EmberObject from "@ember/object";
-
-export default class MockPresenceChannel extends EmberObject {
-  users = [];
-  name = null;
-  subscribed = false;
-
-  async unsubscribe() {
-    this.set("subscribed", false);
-  }
-
-  async subscribe() {
-    this.set("subscribed", true);
-  }
-}
diff --git a/plugins/chat/test/javascripts/modifiers/track-message-visibility-test.js b/plugins/chat/test/javascripts/modifiers/track-message-visibility-test.js
deleted file mode 100644
index e05981401b3..00000000000
--- a/plugins/chat/test/javascripts/modifiers/track-message-visibility-test.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import { render, waitFor } from "@ember/test-helpers";
-import { exists } from "discourse/tests/helpers/qunit-helpers";
-import { setupRenderingTest } from "discourse/tests/helpers/component-test";
-import hbs from "htmlbars-inline-precompile";
-import { module, test } from "qunit";
-
-module(
-  "Discourse Chat | Modifier | track-message-visibility",
-  function (hooks) {
-    setupRenderingTest(hooks);
-
-    test("Marks message as visible when it intersects with the viewport", async function (assert) {
-      const template = hbs`<div {{chat/track-message-visibility}}></div>`;
-
-      await render(template);
-      await waitFor("div[data-visible=true]");
-
-      assert.ok(
-        exists("div[data-visible=true]"),
-        "message is marked as visible"
-      );
-    });
-
-    test("Marks message as visible when it doesn't intersect with the viewport", async function (assert) {
-      const template = hbs`<div style="display:none;" {{chat/track-message-visibility}}></div>`;
-
-      await render(template);
-      await waitFor("div[data-visible=false]");
-
-      assert.ok(
-        exists("div[data-visible=false]"),
-        "message is not marked as visible"
-      );
-    });
-  }
-);
diff --git a/plugins/chat/test/javascripts/unit/helpers/format-chat-date-test.js b/plugins/chat/test/javascripts/unit/helpers/format-chat-date-test.js
index fc974208893..d5d11a8c1c2 100644
--- a/plugins/chat/test/javascripts/unit/helpers/format-chat-date-test.js
+++ b/plugins/chat/test/javascripts/unit/helpers/format-chat-date-test.js
@@ -3,18 +3,20 @@ import hbs from "htmlbars-inline-precompile";
 import { render } from "@ember/test-helpers";
 import { setupRenderingTest } from "discourse/tests/helpers/component-test";
 import { query } from "discourse/tests/helpers/qunit-helpers";
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
 
 module("Discourse Chat | Unit | Helpers | format-chat-date", function (hooks) {
   setupRenderingTest(hooks);
 
   test("link to chat message", async function (assert) {
-    this.set("details", { chat_channel_id: 1 });
-    this.set("message", { id: 1 });
-    await render(hbs`{{format-chat-date this.message this.details}}`);
+    const channel = fabricators.channel();
+    this.message = fabricators.message({ channel });
+
+    await render(hbs`{{format-chat-date this.message}}`);
 
     assert.equal(
       query(".chat-time").getAttribute("href"),
-      "/chat/channel/1/-?messageId=1"
+      `/chat/c/-/${channel.id}/${this.message.id}`
     );
   });
 });
diff --git a/plugins/chat/test/javascripts/unit/lib/chat-emoji-reaction-store-test.js b/plugins/chat/test/javascripts/unit/lib/chat-emoji-reaction-store-test.js
index b53a2084dc5..2f34312a6d5 100644
--- a/plugins/chat/test/javascripts/unit/lib/chat-emoji-reaction-store-test.js
+++ b/plugins/chat/test/javascripts/unit/lib/chat-emoji-reaction-store-test.js
@@ -16,13 +16,10 @@ module("Discourse Chat | Unit | chat-emoji-reaction-store", function (hooks) {
     this.chatEmojiReactionStore.reset();
   });
 
-  // TODO (martin) Remove site setting workarounds after core PR#1290
   test("defaults", function (assert) {
     assert.deepEqual(
       this.chatEmojiReactionStore.favorites,
-      (this.siteSettings.default_emoji_reactions || "")
-        .split("|")
-        .filter((val) => val)
+      this.siteSettings.default_emoji_reactions.split("|").filter((val) => val)
     );
   });
 
diff --git a/plugins/chat/test/javascripts/unit/services/chat-drafts-manager-test.js b/plugins/chat/test/javascripts/unit/services/chat-drafts-manager-test.js
new file mode 100644
index 00000000000..9c5338cddf9
--- /dev/null
+++ b/plugins/chat/test/javascripts/unit/services/chat-drafts-manager-test.js
@@ -0,0 +1,53 @@
+import { module, test } from "qunit";
+import { setupTest } from "ember-qunit";
+import { getOwner } from "discourse-common/lib/get-owner";
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
+
+module(
+  "Discourse Chat | Unit | Service | chat-drafts-manager",
+  function (hooks) {
+    setupTest(hooks);
+
+    hooks.beforeEach(function () {
+      this.subject = getOwner(this).lookup("service:chat-drafts-manager");
+    });
+
+    hooks.afterEach(function () {
+      this.subject.reset();
+    });
+
+    test("storing and retrieving message", function (assert) {
+      const message1 = fabricators.message();
+      this.subject.add(message1);
+
+      assert.strictEqual(
+        this.subject.get({ channelId: message1.channel.id }),
+        message1
+      );
+
+      const message2 = fabricators.message();
+      this.subject.add(message2);
+
+      assert.strictEqual(
+        this.subject.get({ channelId: message2.channel.id }),
+        message2
+      );
+    });
+
+    test("stores only chat messages", function (assert) {
+      assert.throws(function () {
+        this.subject.add({ foo: "bar" });
+      }, /instance of ChatMessage/);
+    });
+
+    test("#reset", function (assert) {
+      this.subject.add(fabricators.message());
+
+      assert.strictEqual(Object.keys(this.subject.drafts).length, 1);
+
+      this.subject.reset();
+
+      assert.strictEqual(Object.keys(this.subject.drafts).length, 0);
+    });
+  }
+);
diff --git a/plugins/chat/test/javascripts/unit/services/chat-drawer-size-test.js b/plugins/chat/test/javascripts/unit/services/chat-drawer-size-test.js
new file mode 100644
index 00000000000..3bc9ca81adb
--- /dev/null
+++ b/plugins/chat/test/javascripts/unit/services/chat-drawer-size-test.js
@@ -0,0 +1,22 @@
+import { module, test } from "qunit";
+import { getOwner } from "discourse-common/lib/get-owner";
+
+module("Discourse Chat | Unit | Service | chat-drawer-size", function (hooks) {
+  hooks.beforeEach(function () {
+    this.subject = getOwner(this).lookup("service:chat-drawer-size");
+  });
+
+  test("get size (with default)", async function (assert) {
+    assert.deepEqual(this.subject.size, { width: 400, height: 530 });
+  });
+
+  test("set size", async function (assert) {
+    this.subject.size = { width: 400, height: 500 };
+    assert.deepEqual(this.subject.size, { width: 400, height: 500 });
+  });
+
+  test("min size", async function (assert) {
+    this.subject.size = { width: 100, height: 100 };
+    assert.deepEqual(this.subject.size, { width: 250, height: 300 });
+  });
+});
diff --git a/plugins/chat/test/javascripts/unit/services/chat-emoji-picker-manager-test.js b/plugins/chat/test/javascripts/unit/services/chat-emoji-picker-manager-test.js
index 052a31a683d..1276368faa9 100644
--- a/plugins/chat/test/javascripts/unit/services/chat-emoji-picker-manager-test.js
+++ b/plugins/chat/test/javascripts/unit/services/chat-emoji-picker-manager-test.js
@@ -22,46 +22,6 @@ module(
       this.manager.close();
     });
 
-    test("startFromMessageReactionList", async function (assert) {
-      const callback = () => {};
-      this.manager.startFromMessageReactionList({ id: 1 }, false, callback);
-
-      assert.ok(this.manager.loading);
-      assert.ok(this.manager.opened);
-      assert.strictEqual(this.manager.context, "chat-message");
-      assert.strictEqual(this.manager.callback, callback);
-      assert.deepEqual(this.manager.visibleSections, [
-        "favorites",
-        "smileys_&_emotion",
-      ]);
-      assert.strictEqual(this.manager.lastVisibleSection, "favorites");
-
-      await settled();
-
-      assert.deepEqual(this.manager.emojis, emojisReponse());
-      assert.strictEqual(this.manager.loading, false);
-    });
-
-    test("startFromMessageActions", async function (assert) {
-      const callback = () => {};
-      this.manager.startFromMessageReactionList({ id: 1 }, false, callback);
-
-      assert.ok(this.manager.loading);
-      assert.ok(this.manager.opened);
-      assert.strictEqual(this.manager.context, "chat-message");
-      assert.strictEqual(this.manager.callback, callback);
-      assert.deepEqual(this.manager.visibleSections, [
-        "favorites",
-        "smileys_&_emotion",
-      ]);
-      assert.strictEqual(this.manager.lastVisibleSection, "favorites");
-
-      await settled();
-
-      assert.deepEqual(this.manager.emojis, emojisReponse());
-      assert.strictEqual(this.manager.loading, false);
-    });
-
     test("addVisibleSections", async function (assert) {
       this.manager.addVisibleSections(["favorites", "objects"]);
 
@@ -75,7 +35,7 @@ module(
     test("sections", async function (assert) {
       assert.deepEqual(this.manager.sections, []);
 
-      this.manager.startFromComposer(() => {});
+      this.manager.open({});
 
       assert.deepEqual(this.manager.sections, []);
 
@@ -84,14 +44,12 @@ module(
       assert.deepEqual(this.manager.sections, ["favorites"]);
     });
 
-    test("startFromComposer", async function (assert) {
-      const callback = () => {};
-      this.manager.startFromComposer(callback);
+    test("open", async function (assert) {
+      this.manager.open({ context: "chat-composer" });
 
       assert.ok(this.manager.loading);
-      assert.ok(this.manager.opened);
-      assert.strictEqual(this.manager.context, "chat-composer");
-      assert.strictEqual(this.manager.callback, callback);
+      assert.ok(this.manager.picker);
+      assert.strictEqual(this.manager.picker.context, "chat-composer");
       assert.deepEqual(this.manager.visibleSections, [
         "favorites",
         "smileys_&_emotion",
@@ -105,19 +63,15 @@ module(
     });
 
     test("closeExisting", async function (assert) {
-      const callback = () => {
-        return;
-      };
-
-      this.manager.startFromComposer(() => {});
+      this.manager.open({ context: "channel-composer", trigger: "foo" });
       this.manager.addVisibleSections("objects");
       this.manager.lastVisibleSection = "objects";
-      this.manager.startFromComposer(callback);
+      this.manager.open({ context: "thread-composer", trigger: "bar" });
 
       assert.strictEqual(
-        this.manager.callback,
-        callback,
-        "it resets the callback to latest picker"
+        this.manager.picker.context,
+        "thread-composer",
+        "it resets the picker to latest picker"
       );
       assert.deepEqual(
         this.manager.visibleSections,
@@ -131,39 +85,21 @@ module(
       );
     });
 
-    test("didSelectEmoji", async function (assert) {
-      let value;
-      const callback = (emoji) => {
-        value = emoji.name;
-      };
-      this.manager.startFromComposer(callback);
-      this.manager.didSelectEmoji({ name: "joy" });
-
-      assert.notOk(this.manager.callback);
-      assert.strictEqual(value, "joy");
-
-      await settled();
-
-      assert.notOk(this.manager.opened, "it closes the picker after selection");
-    });
-
     test("close", async function (assert) {
-      this.manager.startFromComposer(() => {});
+      this.manager.open({ context: "channel-composer" });
 
-      assert.ok(this.manager.opened);
-      assert.ok(this.manager.callback);
+      assert.ok(this.manager.picker);
 
       this.manager.addVisibleSections("objects");
       this.manager.lastVisibleSection = "objects";
       this.manager.close();
 
-      assert.notOk(this.manager.callback);
       assert.ok(this.manager.closing);
-      assert.ok(this.manager.opened);
+      assert.ok(this.manager.picker);
 
       await settled();
 
-      assert.notOk(this.manager.opened);
+      assert.notOk(this.manager.picker);
       assert.notOk(this.manager.closing);
       assert.deepEqual(
         this.manager.visibleSections,
diff --git a/plugins/chat/test/javascripts/unit/services/chat-guardian-test.js b/plugins/chat/test/javascripts/unit/services/chat-guardian-test.js
index cc9fb4f171a..136701eea8d 100644
--- a/plugins/chat/test/javascripts/unit/services/chat-guardian-test.js
+++ b/plugins/chat/test/javascripts/unit/services/chat-guardian-test.js
@@ -1,7 +1,7 @@
 import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { test } from "qunit";
 import { set } from "@ember/object";
-import fabricators from "../../helpers/fabricators";
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
 
 acceptance("Discourse Chat | Unit | Service | chat-guardian", function (needs) {
   needs.hooks.beforeEach(function () {
@@ -69,7 +69,7 @@ acceptance("Discourse Chat | Unit | Service | chat-guardian", function (needs) {
   });
 
   test("#canArchiveChannel", async function (assert) {
-    const channel = fabricators.chatChannel();
+    const channel = fabricators.channel();
 
     set(this.currentUser, "has_chat_enabled", true);
     set(this.currentUser, "admin", true);
@@ -83,12 +83,12 @@ acceptance("Discourse Chat | Unit | Service | chat-guardian", function (needs) {
     set(this.currentUser, "admin", true);
     set(this.currentUser, "moderator", true);
 
-    channel.set("status", "read_only");
+    channel.status = "read_only";
     assert.notOk(this.chatGuardian.canArchiveChannel(channel));
-    channel.set("status", "open");
+    channel.status = "open";
 
-    channel.set("status", "archived");
+    channel.status = "archived";
     assert.notOk(this.chatGuardian.canArchiveChannel(channel));
-    channel.set("status", "open");
+    channel.status = "open";
   });
 });
diff --git a/plugins/chat/test/javascripts/unit/services/chat-state-manager-test.js b/plugins/chat/test/javascripts/unit/services/chat-state-manager-test.js
index cca77828a08..1242caea51a 100644
--- a/plugins/chat/test/javascripts/unit/services/chat-state-manager-test.js
+++ b/plugins/chat/test/javascripts/unit/services/chat-state-manager-test.js
@@ -2,6 +2,11 @@ import { module, test } from "qunit";
 import { setupTest } from "ember-qunit";
 import Site from "discourse/models/site";
 import sinon from "sinon";
+import { getOwner } from "discourse-common/lib/get-owner";
+import {
+  addChatDrawerStateCallback,
+  resetChatDrawerStateCallbacks,
+} from "discourse/plugins/chat/discourse/services/chat-state-manager";
 
 module(
   "Discourse Chat | Unit | Service | chat-state-manager",
@@ -9,7 +14,7 @@ module(
     setupTest(hooks);
 
     hooks.beforeEach(function () {
-      this.subject = this.owner.lookup("service:chat-state-manager");
+      this.subject = getOwner(this).lookup("service:chat-state-manager");
     });
 
     hooks.afterEach(function () {
@@ -48,11 +53,6 @@ module(
     test("lastKnownChatURL", function (assert) {
       assert.strictEqual(this.subject.lastKnownChatURL, "/chat");
 
-      sinon.stub(this.subject.router, "currentURL").value("/foo");
-      this.subject.storeChatURL();
-
-      assert.strictEqual(this.subject.lastKnownChatURL, "/foo");
-
       this.subject.storeChatURL("/bar");
 
       assert.strictEqual(this.subject.lastKnownChatURL, "/bar");
@@ -129,5 +129,24 @@ module(
       assert.strictEqual(this.subject.lastKnownChatURL, "/foo");
       sinon.assert.calledTwice(stub);
     });
+
+    test("callbacks", function (assert) {
+      this.state = null;
+      addChatDrawerStateCallback((state) => {
+        this.state = state;
+      });
+
+      this.subject.didOpenDrawer();
+
+      assert.strictEqual(this.state.isDrawerActive, true);
+      assert.strictEqual(this.state.isDrawerExpanded, true);
+
+      this.subject.didCloseDrawer();
+
+      assert.strictEqual(this.state.isDrawerActive, false);
+      assert.strictEqual(this.state.isDrawerExpanded, false);
+
+      resetChatDrawerStateCallbacks();
+    });
   }
 );
diff --git a/plugins/chat/test/javascripts/unit/utility/plugin-api-test.js b/plugins/chat/test/javascripts/unit/utility/plugin-api-test.js
new file mode 100644
index 00000000000..986fd8f7e99
--- /dev/null
+++ b/plugins/chat/test/javascripts/unit/utility/plugin-api-test.js
@@ -0,0 +1,80 @@
+import { setupTest } from "ember-qunit";
+import { module, test } from "qunit";
+import { getOwner } from "discourse-common/lib/get-owner";
+import { withPluginApi } from "discourse/lib/plugin-api";
+import User from "discourse/models/user";
+import ChatMessageInteractor, {
+  resetRemovedChatComposerSecondaryActions,
+} from "discourse/plugins/chat/discourse/lib/chat-message-interactor";
+import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
+import pretender from "discourse/tests/helpers/create-pretender";
+import { logIn } from "discourse/tests/helpers/qunit-helpers";
+
+module("Chat | Unit | Utility | plugin-api", function (hooks) {
+  setupTest(hooks);
+
+  test("#sendChatMessage", async function (assert) {
+    const done = assert.async();
+
+    pretender.post("/chat/1", (request) => {
+      assert.strictEqual(request.url, "/chat/1");
+      assert.strictEqual(request.requestBody, "thread_id=2&message=hello");
+      done();
+      return [200, {}, {}];
+    });
+
+    withPluginApi("1.1.0", async (api) => {
+      await api.sendChatMessage(1, { message: "hello", threadId: 2 });
+    });
+  });
+
+  test("#removeChatComposerSecondaryActions", async function (assert) {
+    withPluginApi("1.1.0", async (api) => {
+      // assert that the api method is defined
+      assert.equal(typeof api.removeChatComposerSecondaryActions, "function");
+
+      logIn();
+      const currentUser = User.current();
+      getOwner(this).unregister("service:current-user");
+      getOwner(this).register("service:current-user", currentUser, {
+        instantiate: false,
+      });
+
+      const message = fabricators.message({
+        user: currentUser,
+      });
+      const context = "channel";
+      const interactor = new ChatMessageInteractor(
+        getOwner(this),
+        message,
+        context
+      );
+
+      // assert that the initial secondary actions are present
+      const secondaryActions = interactor.secondaryActions;
+      assert.ok(secondaryActions.length > 0);
+
+      try {
+        // remove the first secondary action listed
+        api.removeChatComposerSecondaryActions(secondaryActions[0].id);
+
+        const updatedSecondaryActions = interactor.secondaryActions;
+
+        // assert that the secondary action was removed
+        assert.ok(
+          updatedSecondaryActions.length < secondaryActions.length,
+          "the updated secondary actions must contain less items than the original"
+        );
+        assert.notOk(
+          updatedSecondaryActions
+            .map((v) => v.id)
+            .includes(secondaryActions[0]),
+          "the updated secondary actions must not include the removed action"
+        );
+      } finally {
+        // reset the secondary actions removed to prevent leakage to other tests
+        resetRemovedChatComposerSecondaryActions();
+      }
+    });
+  });
+});
diff --git a/plugins/chat/test/javascripts/widgets/chat-invitation-notification-item-test.js b/plugins/chat/test/javascripts/widgets/chat-invitation-notification-item-test.js
index 8e850d9f8ff..16b16fd3585 100644
--- a/plugins/chat/test/javascripts/widgets/chat-invitation-notification-item-test.js
+++ b/plugins/chat/test/javascripts/widgets/chat-invitation-notification-item-test.js
@@ -43,9 +43,9 @@ module(
       const data = this.args.data;
       assert.strictEqual(
         query(".chat-invitation a").getAttribute("href"),
-        `/chat/channel/${data.chat_channel_id}/${slugifyChannel({
+        `/chat/c/${slugifyChannel({
           title: data.chat_channel_title,
-        })}?messageId=${data.chat_message_id}`
+        })}/${data.chat_channel_id}/${data.chat_message_id}`
       );
     });
   }
diff --git a/plugins/chat/test/javascripts/widgets/chat-mention-notification-item-test.js b/plugins/chat/test/javascripts/widgets/chat-mention-notification-item-test.js
index 65532c33b10..d640ba8fccf 100644
--- a/plugins/chat/test/javascripts/widgets/chat-mention-notification-item-test.js
+++ b/plugins/chat/test/javascripts/widgets/chat-mention-notification-item-test.js
@@ -52,9 +52,9 @@ module(
 
       assert.strictEqual(
         query(".chat-invitation a").getAttribute("href"),
-        `/chat/channel/${data.chat_channel_id}/${slugifyChannel({
+        `/chat/c/${slugifyChannel({
           title: data.chat_channel_title,
-        })}?messageId=${data.chat_message_id}`
+        })}/${data.chat_channel_id}/${data.chat_message_id}`
       );
     });
   }
@@ -91,9 +91,9 @@ module(
 
       assert.strictEqual(
         query(".chat-invitation a").getAttribute("href"),
-        `/chat/channel/${data.chat_channel_id}/${slugifyChannel({
+        `/chat/c/${slugifyChannel({
           title: data.chat_channel_title,
-        })}?messageId=${data.chat_message_id}`
+        })}/${data.chat_channel_id}/${data.chat_message_id}`
       );
     });
   }
@@ -130,9 +130,9 @@ module(
 
       assert.strictEqual(
         query(".chat-invitation a").getAttribute("href"),
-        `/chat/channel/${data.chat_channel_id}/${slugifyChannel({
+        `/chat/c/${slugifyChannel({
           title: data.chat_channel_title,
-        })}?messageId=${data.chat_message_id}`
+        })}/${data.chat_channel_id}/${data.chat_message_id}`
       );
     });
   }
diff --git a/plugins/discourse-lazy-videos/README.md b/plugins/discourse-lazy-videos/README.md
new file mode 100644
index 00000000000..47d4df67524
--- /dev/null
+++ b/plugins/discourse-lazy-videos/README.md
@@ -0,0 +1,12 @@
+## Discourse Lazy Videos
+
+Adds lazy loading support for embedded videos
+
+### Supported providers
+
+  - YouTube
+  - Vimeo
+
+### Experimental
+
+  - TikTok
\ No newline at end of file
diff --git a/plugins/discourse-lazy-videos/assets/javascripts/discourse/components/lazy-iframe.hbs b/plugins/discourse-lazy-videos/assets/javascripts/discourse/components/lazy-iframe.hbs
new file mode 100644
index 00000000000..d662c4787a5
--- /dev/null
+++ b/plugins/discourse-lazy-videos/assets/javascripts/discourse/components/lazy-iframe.hbs
@@ -0,0 +1,11 @@
+{{#if @providerName}}
+  <iframe
+    src={{this.iframeSrc}}
+    title={{@title}}
+    allowFullScreen
+    scrolling="no"
+    frameborder="0"
+    seamless="seamless"
+    allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture"
+  ></iframe>
+{{/if}}
\ No newline at end of file
diff --git a/plugins/discourse-lazy-videos/assets/javascripts/discourse/components/lazy-iframe.js b/plugins/discourse-lazy-videos/assets/javascripts/discourse/components/lazy-iframe.js
new file mode 100644
index 00000000000..d5507392d79
--- /dev/null
+++ b/plugins/discourse-lazy-videos/assets/javascripts/discourse/components/lazy-iframe.js
@@ -0,0 +1,34 @@
+import Component from "@glimmer/component";
+
+export default class LazyVideo extends Component {
+  get iframeSrc() {
+    switch (this.args.providerName) {
+      case "youtube":
+        let url = `https://www.youtube.com/embed/${this.args.videoId}?autoplay=1`;
+        if (this.args.startTime) {
+          url += `&start=${this.convertToSeconds(this.args.startTime)}`;
+        }
+        return url;
+      case "vimeo":
+        return `https://player.vimeo.com/video/${this.args.videoId}${
+          this.args.videoId.includes("?") ? "&" : "?"
+        }autoplay=1`;
+      case "tiktok":
+        return `https://www.tiktok.com/embed/v2/${this.args.videoId}`;
+    }
+  }
+
+  convertToSeconds(time) {
+    const match = time.toString().match(/(?:(\d+)h)?(?:(\d+)m)?(?:(\d+)s)?/);
+    const [hours, minutes, seconds] = match.slice(1);
+
+    if (hours || minutes || seconds) {
+      const h = parseInt(hours, 10) || 0;
+      const m = parseInt(minutes, 10) || 0;
+      const s = parseInt(seconds, 10) || 0;
+
+      return h * 3600 + m * 60 + s;
+    }
+    return time;
+  }
+}
diff --git a/plugins/discourse-lazy-videos/assets/javascripts/discourse/components/lazy-video.hbs b/plugins/discourse-lazy-videos/assets/javascripts/discourse/components/lazy-video.hbs
new file mode 100644
index 00000000000..0d0ae7138af
--- /dev/null
+++ b/plugins/discourse-lazy-videos/assets/javascripts/discourse/components/lazy-video.hbs
@@ -0,0 +1,54 @@
+<div
+  class={{concat-class
+    "lazy-video-container"
+    (concat @videoAttributes.providerName "-onebox")
+    (if this.isLoaded "video-loaded")
+  }}
+  data-video-id={{@videoAttributes.id}}
+  data-video-title={{@videoAttributes.title}}
+  data-video-start-time={{@videoAttributes.startTime}}
+  data-provider-name={{@videoAttributes.providerName}}
+>
+  {{#if this.isLoaded}}
+    <LazyIframe
+      @providerName={{@videoAttributes.providerName}}
+      @title={{@videoAttributes.title}}
+      @videoId={{@videoAttributes.id}}
+      @startTime={{@videoAttributes.startTime}}
+    />
+  {{else}}
+    <div
+      class={{concat-class "video-thumbnail" @videoAttributes.providerName}}
+      tabindex="0"
+      style={{this.thumbnailStyle}}
+      {{on "click" this.loadEmbed}}
+      {{on "keypress" this.loadEmbed}}
+    >
+      <img
+        class={{concat @videoAttributes.providerName "-thumbnail"}}
+        src={{@videoAttributes.thumbnail}}
+        title={{@videoAttributes.title}}
+        loading="lazy"
+      />
+      <div
+        class={{concat-class
+          "icon"
+          (concat @videoAttributes.providerName "-icon")
+        }}
+      ></div>
+    </div>
+    <div class="title-container">
+      <div class="title-wrapper">
+        <a
+          target="_blank"
+          rel="noopener noreferrer"
+          class="title-link"
+          href={{@videoAttributes.url}}
+          title={{@videoAttributes.title}}
+        >
+          {{@videoAttributes.title}}
+        </a>
+      </div>
+    </div>
+  {{/if}}
+</div>
\ No newline at end of file
diff --git a/plugins/discourse-lazy-videos/assets/javascripts/discourse/components/lazy-video.js b/plugins/discourse-lazy-videos/assets/javascripts/discourse/components/lazy-video.js
new file mode 100644
index 00000000000..9f556b4740f
--- /dev/null
+++ b/plugins/discourse-lazy-videos/assets/javascripts/discourse/components/lazy-video.js
@@ -0,0 +1,31 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import { tracked } from "@glimmer/tracking";
+import { htmlSafe } from "@ember/template";
+
+export default class LazyVideo extends Component {
+  @tracked isLoaded = false;
+
+  @action
+  loadEmbed() {
+    if (!this.isLoaded) {
+      this.isLoaded = true;
+      this.args.onLoadedVideo?.();
+    }
+  }
+
+  @action
+  onKeyPress(event) {
+    if (event.key === "Enter") {
+      event.preventDefault();
+      this.loadEmbed();
+    }
+  }
+
+  get thumbnailStyle() {
+    const color = this.args.videoAttributes.dominantColor;
+    if (color?.match(/^[0-9A-Fa-f]+$/)) {
+      return htmlSafe(`background-color: #${color};`);
+    }
+  }
+}
diff --git a/plugins/discourse-lazy-videos/assets/javascripts/initializers/lazy-videos.js b/plugins/discourse-lazy-videos/assets/javascripts/initializers/lazy-videos.js
new file mode 100644
index 00000000000..ffee62ef815
--- /dev/null
+++ b/plugins/discourse-lazy-videos/assets/javascripts/initializers/lazy-videos.js
@@ -0,0 +1,46 @@
+import { withPluginApi } from "discourse/lib/plugin-api";
+import getVideoAttributes from "../lib/lazy-video-attributes";
+import { hbs } from "ember-cli-htmlbars";
+
+function initLazyEmbed(api) {
+  api.decorateCookedElement(
+    (cooked, helper) => {
+      if (cooked.classList.contains("d-editor-preview")) {
+        return;
+      }
+
+      const lazyContainers = cooked.querySelectorAll(".lazy-video-container");
+
+      lazyContainers.forEach((container) => {
+        const siteSettings = api.container.lookup("site-settings:main");
+        const videoAttributes = getVideoAttributes(container);
+
+        if (siteSettings[`lazy_${videoAttributes.providerName}_enabled`]) {
+          const onLoadedVideo = () => {
+            const postId = cooked.closest("article")?.dataset?.postId;
+            if (postId) {
+              api.preventCloak(parseInt(postId, 10));
+            }
+          };
+
+          const lazyVideo = helper.renderGlimmer(
+            "p.lazy-video-wrapper",
+            hbs`<LazyVideo @videoAttributes={{@data.param}} @onLoadedVideo={{@data.onLoadedVideo}}/>`,
+            { param: videoAttributes, onLoadedVideo }
+          );
+
+          container.replaceWith(lazyVideo);
+        }
+      });
+    },
+    { onlyStream: true, id: "discourse-lazy-videos" }
+  );
+}
+
+export default {
+  name: "discourse-lazy-videos",
+
+  initialize() {
+    withPluginApi("1.6.0", initLazyEmbed);
+  },
+};
diff --git a/plugins/discourse-lazy-videos/assets/javascripts/lib/lazy-video-attributes.js b/plugins/discourse-lazy-videos/assets/javascripts/lib/lazy-video-attributes.js
new file mode 100644
index 00000000000..2efc85d80c0
--- /dev/null
+++ b/plugins/discourse-lazy-videos/assets/javascripts/lib/lazy-video-attributes.js
@@ -0,0 +1,16 @@
+export default function getVideoAttributes(cooked) {
+  if (!cooked.classList.contains("lazy-video-container")) {
+    return {};
+  }
+
+  const url = cooked.querySelector("a")?.getAttribute("href");
+  const img = cooked.querySelector("img");
+  const thumbnail = img?.getAttribute("src");
+  const dominantColor = img?.dataset?.dominantColor;
+  const title = cooked.dataset.videoTitle;
+  const startTime = cooked.dataset.videoStartTime;
+  const providerName = cooked.dataset.providerName;
+  const id = cooked.dataset.videoId;
+
+  return { url, thumbnail, title, providerName, id, dominantColor, startTime };
+}
diff --git a/plugins/discourse-lazy-videos/assets/stylesheets/lazy-videos.scss b/plugins/discourse-lazy-videos/assets/stylesheets/lazy-videos.scss
new file mode 100644
index 00000000000..d957b702325
--- /dev/null
+++ b/plugins/discourse-lazy-videos/assets/stylesheets/lazy-videos.scss
@@ -0,0 +1,145 @@
+.lazy-video-container {
+  z-index: z("base");
+  position: relative;
+  display: block;
+  height: 0;
+  padding: 0 0 56.25% 0;
+  background-color: #000;
+  margin-bottom: 12px;
+
+  .video-thumbnail {
+    cursor: pointer;
+    overflow: hidden;
+    height: 0;
+    padding: 0 0 56.25% 0;
+
+    img {
+      object-fit: cover;
+      width: 100%;
+      pointer-events: none;
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%, -50%);
+      max-height: 100%;
+    }
+
+    &:hover,
+    &:focus {
+      .icon {
+        transform: translate(-50%, -50%) scale(1.1);
+      }
+    }
+
+    &:focus {
+      outline: 5px auto Highlight;
+      outline: 5px auto -webkit-focus-ring-color;
+    }
+
+    &:active {
+      outline: 0px;
+    }
+  }
+
+  .title-container {
+    position: absolute;
+    display: flex;
+    align-items: center;
+    top: 0;
+    width: 100%;
+    height: 60px;
+    overflow: hidden;
+    background: linear-gradient(rgba(0, 0, 0, 0.6), rgba(255, 0, 0, 0));
+
+    .title-wrapper {
+      overflow: hidden;
+      padding-inline: 20px;
+      padding-block: 10px;
+
+      .title-link {
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        color: #fff;
+        text-decoration: none;
+        font-size: 18px;
+        font-family: Arial, sans-serif;
+
+        &:hover {
+          text-decoration: underline;
+        }
+      }
+    }
+  }
+
+  iframe {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    border: 0;
+  }
+
+  .icon {
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+    transition: 150ms;
+    background-repeat: no-repeat;
+    background-position: center;
+    max-width: 30%;
+
+    // Default play button
+    background-image: svg-uri(
+      "<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'><path fill='#181818' d='M512 256c0 141.4-114.6 256-256 256S0 397.4 0 256S114.6 0 256 0S512 114.6 512 256zM188.3 147.1c-7.6 4.2-12.3 12.3-12.3 20.9V344c0 8.7 4.7 16.7 12.3 20.9s16.8 4.1 24.3-.5l144-88c7.1-4.4 11.5-12.1 11.5-20.5s-4.4-16.1-11.5-20.5l-144-88c-7.4-4.5-16.7-4.7-24.3-.5z'/></svg>"
+    );
+    width: 60px;
+    height: 60px;
+
+    &.youtube-icon {
+      width: 68px;
+      height: 48px;
+      background-image: svg-uri(
+        "<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 68 48'><path d='M66.52,7.74c-0.78-2.93-2.49-5.41-5.42-6.19C55.79,.13,34,0,34,0S12.21,.13,6.9,1.55 C3.97,2.33,2.27,4.81,1.48,7.74C0.06,13.05,0,24,0,24s0.06,10.95,1.48,16.26c0.78,2.93,2.49,5.41,5.42,6.19 C12.21,47.87,34,48,34,48s21.79-0.13,27.1-1.55c2.93-0.78,4.64-3.26,5.42-6.19C67.94,34.95,68,24,68,24S67.94,13.05,66.52,7.74z' fill='#f00'></path><path d='M 45,24 27,14 27,34' fill='#fff'></path></svg>"
+      );
+    }
+
+    &.vimeo-icon {
+      width: 77px;
+      height: 44px;
+      background-image: svg-uri(
+        "<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 37.042 21.167'><g transform='translate(.026013)'><rect x='-.026013' y='8.8818e-16' width='37.042' height='21.167' rx='1.3229' ry='1.3229' fill='#00adef' stroke-width='.33658'/><g transform='matrix(.39688 0 0 .39688 10.557 2.6459)' display='block' fill='none'><path d='m31.666 20c0 0.5928-0.3148 1.141-0.8269 1.4397l-20 11.667c-0.5155 0.3007-1.1524 0.3029-1.6699 0.0056-0.51749-0.2972-0.83656-0.8484-0.83656-1.4452v-23.333c0-0.59677 0.31907-1.148 0.83656-1.4452s1.1544-0.29509 1.6699 0.00561l20 11.667c0.5121 0.2987 0.8269 0.8469 0.8269 1.4396z' fill='#fff'/></g></g></svg>"
+      );
+    }
+
+    &.tiktok-icon {
+      width: 58px;
+      height: 64px;
+      background-image: svg-uri(
+        "<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 29 32'> <g stroke='none' stroke-width='1' fill='none' fill-rule='evenodd' > <g id='编组-2' transform='translate(0.979236, 0.000000)' fill-rule='nonzero' > <path d='M10.7907645,12.33 L10.7907645,11.11 C10.3672629,11.0428887 9.93950674,11.0061284 9.51076448,10.9999786 C5.35996549,10.9912228 1.68509679,13.6810205 0.438667694,17.6402658 C-0.807761399,21.5995112 0.663505842,25.9093887 4.07076448,28.28 C1.51848484,25.5484816 0.809799545,21.5720834 2.26126817,18.1270053 C3.71273679,14.6819273 7.05329545,12.4115428 10.7907645,12.33 L10.7907645,12.33 Z' id='路径' fill='#25F4EE' ></path> <path d='M11.0207645,26.15 C13.3415287,26.1468776 15.2491662,24.3185414 15.3507645,22 L15.3507645,1.31 L19.1307645,1.31 C19.0536068,0.877682322 19.0167818,0.439130992 19.0207645,0 L13.8507645,0 L13.8507645,20.67 C13.764798,23.0003388 11.8526853,24.846212 9.52076448,24.85 C8.82390914,24.844067 8.13842884,24.6726969 7.52076448,24.35 C8.33268245,25.4749154 9.63346203,26.1438878 11.0207645,26.15 Z' id='路径' fill='#25F4EE' ></path> <path d='M26.1907645,8.33 L26.1907645,7.18 C24.79964,7.18047625 23.4393781,6.76996242 22.2807645,6 C23.2964446,7.18071769 24.6689622,7.99861177 26.1907645,8.33 L26.1907645,8.33 Z' id='路径' fill='#25F4EE' ></path> <path d='M22.2807645,6 C21.1394675,4.70033161 20.5102967,3.02965216 20.5107645,1.3 L19.1307645,1.3 C19.4909812,3.23268519 20.6300383,4.93223067 22.2807645,6 L22.2807645,6 Z' id='路径' fill='#FE2C55' ></path> <path d='M9.51076448,16.17 C7.51921814,16.1802178 5.79021626,17.544593 5.31721201,19.4791803 C4.84420777,21.4137677 5.74860956,23.4220069 7.51076448,24.35 C6.55594834,23.0317718 6.42106871,21.2894336 7.16162883,19.8399613 C7.90218896,18.3904889 9.39306734,17.4787782 11.0207645,17.48 C11.4547752,17.4854084 11.8857908,17.5527546 12.3007645,17.68 L12.3007645,12.42 C11.8769919,12.3565056 11.4492562,12.3230887 11.0207645,12.32 L10.7907645,12.32 L10.7907645,16.32 C10.3736368,16.2081544 9.94244934,16.1576246 9.51076448,16.17 Z' id='路径' fill='#FE2C55' ></path> <path d='M26.1907645,8.33 L26.1907645,12.33 C23.61547,12.3250193 21.107025,11.5098622 19.0207645,10 L19.0207645,20.51 C19.0097352,25.7544158 14.7551919,30.0000116 9.51076448,30 C7.56312784,30.0034556 5.66240321,29.4024912 4.07076448,28.28 C6.72698674,31.1368108 10.8608257,32.0771989 14.4914706,30.6505586 C18.1221155,29.2239183 20.5099375,25.7208825 20.5107645,21.82 L20.5107645,11.34 C22.604024,12.8399663 25.1155724,13.6445013 27.6907645,13.64 L27.6907645,8.49 C27.1865925,8.48839535 26.6839313,8.43477816 26.1907645,8.33 Z' id='路径' fill='#FE2C55' ></path> <path d='M19.0207645,20.51 L19.0207645,10 C21.1134087,11.5011898 23.6253623,12.3058546 26.2007645,12.3 L26.2007645,8.3 C24.6792542,7.97871265 23.3034403,7.17147491 22.2807645,6 C20.6300383,4.93223067 19.4909812,3.23268519 19.1307645,1.3 L15.3507645,1.3 L15.3507645,22 C15.2751521,23.8467664 14.0381991,25.4430201 12.268769,25.9772302 C10.4993389,26.5114403 8.58570942,25.8663815 7.50076448,24.37 C5.73860956,23.4420069 4.83420777,21.4337677 5.30721201,19.4991803 C5.78021626,17.564593 7.50921814,16.2002178 9.50076448,16.19 C9.934903,16.1938693 10.3661386,16.2612499 10.7807645,16.39 L10.7807645,12.39 C7.0223379,12.4536691 3.65653929,14.7319768 2.20094561,18.1976761 C0.745351938,21.6633753 1.47494493,25.6617476 4.06076448,28.39 C5.66809542,29.4755063 7.57158782,30.0378224 9.51076448,30 C14.7551919,30.0000116 19.0097352,25.7544158 19.0207645,20.51 Z' id='路径' fill='#000000' ></path> </g> </g> </svg> "
+      );
+    }
+  }
+}
+
+// TikTok iframe isn't fluid
+.lazy-video-container.tiktok-onebox {
+  width: 332px;
+  height: 745px;
+  padding: 0;
+
+  .video-thumbnail.tiktok img {
+    height: 745px;
+  }
+
+  iframe {
+    min-width: 332px;
+    height: 742px;
+    background-color: #fff;
+    border-top: 3px solid #fff;
+    border-radius: 9px;
+  }
+}
diff --git a/plugins/discourse-lazy-videos/config/locales/server.en.yml b/plugins/discourse-lazy-videos/config/locales/server.en.yml
new file mode 100644
index 00000000000..66ffba02e05
--- /dev/null
+++ b/plugins/discourse-lazy-videos/config/locales/server.en.yml
@@ -0,0 +1,6 @@
+en:
+  site_settings:
+    lazy_videos_enabled: "Enable the Lazy Videos plugin"
+    lazy_youtube_enabled: "Enable lazy loading for YouTube embeds"
+    lazy_vimeo_enabled: "Enable lazy loading for Vimeo embeds"
+    lazy_tiktok_enabled: "Enable lazy loading for TikTok embeds (experimental)"
\ No newline at end of file
diff --git a/plugins/discourse-lazy-videos/config/settings.yml b/plugins/discourse-lazy-videos/config/settings.yml
new file mode 100644
index 00000000000..b89902684ca
--- /dev/null
+++ b/plugins/discourse-lazy-videos/config/settings.yml
@@ -0,0 +1,17 @@
+plugins:
+  lazy_videos_enabled:
+    default: true
+    client: true
+    hidden: true
+  lazy_youtube_enabled:
+    default: true
+    client: true
+    hidden: false
+  lazy_vimeo_enabled:
+    default: true
+    client: true
+    hidden: false
+  lazy_tiktok_enabled:
+    default: false
+    client: true
+    hidden: false
\ No newline at end of file
diff --git a/plugins/discourse-lazy-videos/db/post_migrate/20230317194217_rebake_lazy_yt_posts.rb b/plugins/discourse-lazy-videos/db/post_migrate/20230317194217_rebake_lazy_yt_posts.rb
new file mode 100644
index 00000000000..ab99a586b3f
--- /dev/null
+++ b/plugins/discourse-lazy-videos/db/post_migrate/20230317194217_rebake_lazy_yt_posts.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class RebakeLazyYtPosts < ActiveRecord::Migration[7.0]
+  def up
+    execute <<~SQL
+      UPDATE posts SET baked_version = 0
+      WHERE cooked LIKE '%lazyYT-container%'
+    SQL
+  end
+
+  def down
+    # do nothing
+  end
+end
diff --git a/plugins/discourse-lazy-videos/lib/lazy-videos/lazy_tiktok.rb b/plugins/discourse-lazy-videos/lib/lazy-videos/lazy_tiktok.rb
new file mode 100644
index 00000000000..d667cce6948
--- /dev/null
+++ b/plugins/discourse-lazy-videos/lib/lazy-videos/lazy_tiktok.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require "onebox"
+
+class Onebox::Engine::TiktokOnebox
+  include Onebox::Engine
+  alias_method :default_onebox_to_html, :to_html
+
+  def to_html
+    if SiteSetting.lazy_videos_enabled && SiteSetting.lazy_tiktok_enabled &&
+         oembed_data.embed_product_id
+      thumbnail_url = oembed_data.thumbnail_url
+      escaped_title = ERB::Util.html_escape(oembed_data.title)
+
+      <<~HTML
+        <div class="tiktok-onebox lazy-video-container"
+          data-video-id="#{oembed_data.embed_product_id}"
+          data-video-title="#{escaped_title}"
+          data-provider-name="tiktok">
+          <a href="#{url}" target="_blank">
+            <img class="tiktok-thumbnail"
+              src="#{thumbnail_url}"
+              title="#{escaped_title}">
+          </a>
+        </div>
+      HTML
+    else
+      default_onebox_to_html
+    end
+  end
+end
diff --git a/plugins/discourse-lazy-videos/lib/lazy-videos/lazy_vimeo.rb b/plugins/discourse-lazy-videos/lib/lazy-videos/lazy_vimeo.rb
new file mode 100644
index 00000000000..dfa6152f9ed
--- /dev/null
+++ b/plugins/discourse-lazy-videos/lib/lazy-videos/lazy_vimeo.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require "onebox"
+
+class Onebox::Engine::VimeoOnebox
+  include Onebox::Engine
+  alias_method :default_onebox_to_html, :to_html
+
+  def to_html
+    if SiteSetting.lazy_videos_enabled && SiteSetting.lazy_vimeo_enabled
+      full_video_id = oembed_data[:uri].sub("/videos/", "").sub(":", "/")
+
+      # This is used to discern public and private video
+      # Unlisted videos have an adidtional alphanumeric ID in their URI.
+      if !oembed_data[:uri].match?(%r{videos/\d+:.+})
+        iframe_id = full_video_id
+      else
+        iframe_src = Nokogiri::HTML5.fragment(oembed_data[:html]).at_css("iframe")&.[]("src")
+        iframe_id = iframe_src.sub("https://player.vimeo.com/video/", "")
+      end
+
+      <<~HTML
+        <div class="vimeo-onebox lazy-video-container"
+          data-video-id="#{iframe_id}"
+          data-video-title="#{og_data.title}"
+          data-provider-name="vimeo">
+          <a href="https://vimeo.com/#{full_video_id}" target="_blank">
+            <img class="vimeo-thumbnail"
+              src="#{og_data.image}"
+              title="#{og_data.title}">
+          </a>
+        </div>
+      HTML
+    else
+      default_onebox_to_html
+    end
+  end
+end
diff --git a/plugins/discourse-lazy-videos/lib/lazy-videos/lazy_youtube.rb b/plugins/discourse-lazy-videos/lib/lazy-videos/lazy_youtube.rb
new file mode 100644
index 00000000000..334afc69d76
--- /dev/null
+++ b/plugins/discourse-lazy-videos/lib/lazy-videos/lazy_youtube.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require "onebox"
+
+class Onebox::Engine::YoutubeOnebox
+  include Onebox::Engine
+  alias_method :default_onebox_to_html, :to_html
+
+  def to_html
+    if SiteSetting.lazy_videos_enabled && SiteSetting.lazy_youtube_enabled && video_id &&
+         !params["list"]
+      result = parse_embed_response
+      result ||= get_opengraph.data
+
+      thumbnail_url = "https://img.youtube.com/vi/#{video_id}/maxresdefault.jpg"
+
+      begin
+        Onebox::Helpers.fetch_response(thumbnail_url)
+      rescue StandardError
+        thumbnail_url = result[:image]
+      end
+
+      escaped_title = ERB::Util.html_escape(video_title)
+      escaped_start_time = ERB::Util.html_escape(params["t"])
+      t_param = "&t=#{escaped_start_time}" if escaped_start_time.present?
+
+      <<~HTML
+        <div class="youtube-onebox lazy-video-container"
+          data-video-id="#{video_id}"
+          data-video-title="#{escaped_title}"
+          data-video-start-time="#{escaped_start_time}"
+          data-provider-name="youtube">
+          <a href="https://www.youtube.com/watch?v=#{video_id}#{t_param}" target="_blank">
+            <img class="youtube-thumbnail"
+              src="#{thumbnail_url}"
+              title="#{escaped_title}">
+          </a>
+        </div>
+      HTML
+    else
+      default_onebox_to_html
+    end
+  end
+end
diff --git a/plugins/discourse-lazy-videos/plugin.rb b/plugins/discourse-lazy-videos/plugin.rb
new file mode 100644
index 00000000000..8875cad76af
--- /dev/null
+++ b/plugins/discourse-lazy-videos/plugin.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+# name: discourse-lazy-videos
+# about: Lazy loading for embedded videos
+# version: 0.1
+# authors: Jan Cernik
+# url: https://github.com/discourse/discourse-lazy-videos
+
+hide_plugin if self.respond_to?(:hide_plugin)
+enabled_site_setting :lazy_videos_enabled
+
+register_asset "stylesheets/lazy-videos.scss"
+
+require_relative "lib/lazy-videos/lazy_youtube"
+require_relative "lib/lazy-videos/lazy_vimeo"
+require_relative "lib/lazy-videos/lazy_tiktok"
+
+after_initialize do
+  on(:reduce_cooked) do |fragment|
+    fragment
+      .css(".lazy-video-container")
+      .each do |video|
+        title = video["data-video-title"]
+        href = video.at_css("a")["href"]
+        video.replace("<p><a href=\"#{href}\">#{title}</a></p>")
+      end
+  end
+end
diff --git a/plugins/discourse-lazy-videos/spec/components/pretty_text_spec.rb b/plugins/discourse-lazy-videos/spec/components/pretty_text_spec.rb
new file mode 100644
index 00000000000..e01c2ca5154
--- /dev/null
+++ b/plugins/discourse-lazy-videos/spec/components/pretty_text_spec.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+require "pretty_text"
+
+RSpec.describe PrettyText do
+  let(:post) { Fabricate(:post) }
+
+  it "replaces lazy videos in emails" do
+    cooked_html = <<~HTML
+      <div class="youtube-onebox lazy-video-container" data-video-id="kPRA0W1kECg" data-video-title="15 Sorting Algorithms in 6 Minutes" data-provider-name="youtube">
+        <a href="https://www.youtube.com/watch?v=kPRA0W1kECg" target="_blank" rel="noopener">
+          <img class="youtube-thumbnail" src="thumbnail.jpeg" title="15 Sorting Algorithms in 6 Minutes" width="690" height="388">
+        </a>
+      </div>
+
+      <div class="vimeo-onebox lazy-video-container" data-video-id="786646692" data-video-title="Dear Rich" data-provider-name="vimeo">
+        <a href="https://vimeo.com/786646692" target="_blank" rel="noopener">
+          <img class="vimeo-thumbnail" src="thumbnail.jpeg" title="Dear Rich" width="640" height="360">
+        </a>
+      </div>
+
+    HTML
+
+    email_formatted = <<~HTML
+      <p><a href="https://www.youtube.com/watch?v=kPRA0W1kECg">15 Sorting Algorithms in 6 Minutes</a></p>
+      <p><a href="https://vimeo.com/786646692">Dear Rich</a></p>
+      HTML
+
+    expect(PrettyText.format_for_email(cooked_html, post)).to match_html(email_formatted)
+  end
+end
diff --git a/plugins/discourse-lazy-videos/spec/fixtures/vimeo-unlisted.response b/plugins/discourse-lazy-videos/spec/fixtures/vimeo-unlisted.response
new file mode 100644
index 00000000000..784b132374b
--- /dev/null
+++ b/plugins/discourse-lazy-videos/spec/fixtures/vimeo-unlisted.response
@@ -0,0 +1,420 @@
+<!DOCTYPE html>
+<!-- saved from url=(0014)about:internet -->
+<html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="viewport" content="width=device-width"><style>
+      #ot-sdk-btn {
+        display: none;
+      }
+    </style><meta name="next-head-count" content="3"><script type="text/javascript" async="" src="./eleonore __ michael - middlebury, vt_files/singular-gtm-interface.js" data-airgap-id="0"></script><script type="text/javascript" async="" src="./eleonore __ michael - middlebury, vt_files/js" data-airgap-id="1"></script><script type="text/javascript" async="" src="./eleonore __ michael - middlebury, vt_files/singular-gtm-interface.js" data-airgap-id="2"></script><script type="text/javascript" async="" src="./eleonore __ michael - middlebury, vt_files/analytics.js" data-airgap-id="3"></script><script type="text/javascript" src="./eleonore __ michael - middlebury, vt_files/689d5b4562" data-airgap-id="4"></script><script src="./eleonore __ michael - middlebury, vt_files/nr-spa-1208.min.js" data-airgap-id="5"></script><script>;window.NREUM||(NREUM={});NREUM.init={distributed_tracing:{enabled:true},privacy:{cookies_enabled:true}};
+window.NREUM||(NREUM={}),__nr_require=function(t,e,n){function r(n){if(!e[n]){var o=e[n]={exports:{}};t[n][0].call(o.exports,function(e){var o=t[n][1][e];return r(o||e)},o,o.exports)}return e[n].exports}if("function"==typeof __nr_require)return __nr_require;for(var o=0;o<n.length;o++)r(n[o]);return r}({1:[function(t,e,n){function r(t){try{c.console&&console.log(t)}catch(e){}}var o,i=t("ee"),a=t(28),c={};try{o=localStorage.getItem("__nr_flags").split(","),console&&"function"==typeof console.log&&(c.console=!0,o.indexOf("dev")!==-1&&(c.dev=!0),o.indexOf("nr_dev")!==-1&&(c.nrDev=!0))}catch(s){}c.nrDev&&i.on("internal-error",function(t){r(t.stack)}),c.dev&&i.on("fn-err",function(t,e,n){r(n.stack)}),c.dev&&(r("NR AGENT IN DEVELOPMENT MODE"),r("flags: "+a(c,function(t,e){return t}).join(", ")))},{}],2:[function(t,e,n){function r(t,e,n,r,c){try{l?l-=1:o(c||new UncaughtException(t,e,n),!0)}catch(u){try{i("ierr",[u,s.now(),!0])}catch(d){}}return"function"==typeof f&&f.apply(this,a(arguments))}function UncaughtException(t,e,n){this.message=t||"Uncaught error with no additional information",this.sourceURL=e,this.line=n}function o(t,e){var n=e?null:s.now();i("err",[t,n])}var i=t("handle"),a=t(29),c=t("ee"),s=t("loader"),u=t("gos"),f=window.onerror,d=!1,p="nr@seenError",l=0;s.features.err=!0,t(1),window.onerror=r;try{throw new Error}catch(h){"stack"in h&&(t(13),t(12),"addEventListener"in window&&t(6),s.xhrWrappable&&t(14),d=!0)}c.on("fn-start",function(t,e,n){d&&(l+=1)}),c.on("fn-err",function(t,e,n){d&&!n[p]&&(u(n,p,function(){return!0}),this.thrown=!0,o(n))}),c.on("fn-end",function(){d&&!this.thrown&&l>0&&(l-=1)}),c.on("internal-error",function(t){i("ierr",[t,s.now(),!0])})},{}],3:[function(t,e,n){t("loader").features.ins=!0},{}],4:[function(t,e,n){function r(){L++,T=g.hash,this[f]=y.now()}function o(){L--,g.hash!==T&&i(0,!0);var t=y.now();this[h]=~~this[h]+t-this[f],this[d]=t}function i(t,e){E.emit("newURL",[""+g,e])}function a(t,e){t.on(e,function(){this[e]=y.now()})}var c="-start",s="-end",u="-body",f="fn"+c,d="fn"+s,p="cb"+c,l="cb"+s,h="jsTime",m="fetch",v="addEventListener",w=window,g=w.location,y=t("loader");if(w[v]&&y.xhrWrappable){var x=t(10),b=t(11),E=t(8),R=t(6),O=t(13),N=t(7),P=t(14),M=t(9),S=t("ee"),C=S.get("tracer");t(16),y.features.spa=!0;var T,L=0;S.on(f,r),b.on(p,r),M.on(p,r),S.on(d,o),b.on(l,o),M.on(l,o),S.buffer([f,d,"xhr-done","xhr-resolved"]),R.buffer([f]),O.buffer(["setTimeout"+s,"clearTimeout"+c,f]),P.buffer([f,"new-xhr","send-xhr"+c]),N.buffer([m+c,m+"-done",m+u+c,m+u+s]),E.buffer(["newURL"]),x.buffer([f]),b.buffer(["propagate",p,l,"executor-err","resolve"+c]),C.buffer([f,"no-"+f]),M.buffer(["new-jsonp","cb-start","jsonp-error","jsonp-end"]),a(P,"send-xhr"+c),a(S,"xhr-resolved"),a(S,"xhr-done"),a(N,m+c),a(N,m+"-done"),a(M,"new-jsonp"),a(M,"jsonp-end"),a(M,"cb-start"),E.on("pushState-end",i),E.on("replaceState-end",i),w[v]("hashchange",i,!0),w[v]("load",i,!0),w[v]("popstate",function(){i(0,L>1)},!0)}},{}],5:[function(t,e,n){function r(t){}if(window.performance&&window.performance.timing&&window.performance.getEntriesByType){var o=t("ee"),i=t("handle"),a=t(13),c=t(12),s="learResourceTimings",u="addEventListener",f="resourcetimingbufferfull",d="bstResource",p="resource",l="-start",h="-end",m="fn"+l,v="fn"+h,w="bstTimer",g="pushState",y=t("loader");y.features.stn=!0,t(8),"addEventListener"in window&&t(6);var x=NREUM.o.EV;o.on(m,function(t,e){var n=t[0];n instanceof x&&(this.bstStart=y.now())}),o.on(v,function(t,e){var n=t[0];n instanceof x&&i("bst",[n,e,this.bstStart,y.now()])}),a.on(m,function(t,e,n){this.bstStart=y.now(),this.bstType=n}),a.on(v,function(t,e){i(w,[e,this.bstStart,y.now(),this.bstType])}),c.on(m,function(){this.bstStart=y.now()}),c.on(v,function(t,e){i(w,[e,this.bstStart,y.now(),"requestAnimationFrame"])}),o.on(g+l,function(t){this.time=y.now(),this.startPath=location.pathname+location.hash}),o.on(g+h,function(t){i("bstHist",[location.pathname+location.hash,this.startPath,this.time])}),u in window.performance&&(window.performance["c"+s]?window.performance[u](f,function(t){i(d,[window.performance.getEntriesByType(p)]),window.performance["c"+s]()},!1):window.performance[u]("webkit"+f,function(t){i(d,[window.performance.getEntriesByType(p)]),window.performance["webkitC"+s]()},!1)),document[u]("scroll",r,{passive:!0}),document[u]("keypress",r,!1),document[u]("click",r,!1)}},{}],6:[function(t,e,n){function r(t){for(var e=t;e&&!e.hasOwnProperty(f);)e=Object.getPrototypeOf(e);e&&o(e)}function o(t){c.inPlace(t,[f,d],"-",i)}function i(t,e){return t[1]}var a=t("ee").get("events"),c=t("wrap-function")(a,!0),s=t("gos"),u=XMLHttpRequest,f="addEventListener",d="removeEventListener";e.exports=a,"getPrototypeOf"in Object?(r(document),r(window),r(u.prototype)):u.prototype.hasOwnProperty(f)&&(o(window),o(u.prototype)),a.on(f+"-start",function(t,e){var n=t[1],r=s(n,"nr@wrapped",function(){function t(){if("function"==typeof n.handleEvent)return n.handleEvent.apply(n,arguments)}var e={object:t,"function":n}[typeof n];return e?c(e,"fn-",null,e.name||"anonymous"):n});this.wrapped=t[1]=r}),a.on(d+"-start",function(t){t[1]=this.wrapped||t[1]})},{}],7:[function(t,e,n){function r(t,e,n){var r=t[e];"function"==typeof r&&(t[e]=function(){var t=i(arguments),e={};o.emit(n+"before-start",[t],e);var a;e[m]&&e[m].dt&&(a=e[m].dt);var c=r.apply(this,t);return o.emit(n+"start",[t,a],c),c.then(function(t){return o.emit(n+"end",[null,t],c),t},function(t){throw o.emit(n+"end",[t],c),t})})}var o=t("ee").get("fetch"),i=t(29),a=t(28);e.exports=o;var c=window,s="fetch-",u=s+"body-",f=["arrayBuffer","blob","json","text","formData"],d=c.Request,p=c.Response,l=c.fetch,h="prototype",m="nr@context";d&&p&&l&&(a(f,function(t,e){r(d[h],e,u),r(p[h],e,u)}),r(c,"fetch",s),o.on(s+"end",function(t,e){var n=this;if(e){var r=e.headers.get("content-length");null!==r&&(n.rxSize=r),o.emit(s+"done",[null,e],n)}else o.emit(s+"done",[t],n)}))},{}],8:[function(t,e,n){var r=t("ee").get("history"),o=t("wrap-function")(r);e.exports=r;var i=window.history&&window.history.constructor&&window.history.constructor.prototype,a=window.history;i&&i.pushState&&i.replaceState&&(a=i),o.inPlace(a,["pushState","replaceState"],"-")},{}],9:[function(t,e,n){function r(t){function e(){s.emit("jsonp-end",[],p),t.removeEventListener("load",e,!1),t.removeEventListener("error",n,!1)}function n(){s.emit("jsonp-error",[],p),s.emit("jsonp-end",[],p),t.removeEventListener("load",e,!1),t.removeEventListener("error",n,!1)}var r=t&&"string"==typeof t.nodeName&&"script"===t.nodeName.toLowerCase();if(r){var o="function"==typeof t.addEventListener;if(o){var a=i(t.src);if(a){var f=c(a),d="function"==typeof f.parent[f.key];if(d){var p={};u.inPlace(f.parent,[f.key],"cb-",p),t.addEventListener("load",e,!1),t.addEventListener("error",n,!1),s.emit("new-jsonp",[t.src],p)}}}}}function o(){return"addEventListener"in window}function i(t){var e=t.match(f);return e?e[1]:null}function a(t,e){var n=t.match(p),r=n[1],o=n[3];return o?a(o,e[r]):e[r]}function c(t){var e=t.match(d);return e&&e.length>=3?{key:e[2],parent:a(e[1],window)}:{key:t,parent:window}}var s=t("ee").get("jsonp"),u=t("wrap-function")(s);if(e.exports=s,o()){var f=/[?&](?:callback|cb)=([^&#]+)/,d=/(.*)\.([^.]+)/,p=/^(\w+)(.|$)(.*)$/,l=["appendChild","insertBefore","replaceChild"];Node&&Node.prototype&&Node.prototype.appendChild?u.inPlace(Node.prototype,l,"dom-"):(u.inPlace(HTMLElement.prototype,l,"dom-"),u.inPlace(HTMLHeadElement.prototype,l,"dom-"),u.inPlace(HTMLBodyElement.prototype,l,"dom-")),s.on("dom-start",function(t){r(t[0])})}},{}],10:[function(t,e,n){var r=t("ee").get("mutation"),o=t("wrap-function")(r),i=NREUM.o.MO;e.exports=r,i&&(window.MutationObserver=function(t){return this instanceof i?new i(o(t,"fn-")):i.apply(this,arguments)},MutationObserver.prototype=i.prototype)},{}],11:[function(t,e,n){function r(t){var e=i.context(),n=c(t,"executor-",e,null,!1),r=new u(n);return i.context(r).getCtx=function(){return e},r}var o=t("wrap-function"),i=t("ee").get("promise"),a=t("ee").getOrSetContext,c=o(i),s=t(28),u=NREUM.o.PR;e.exports=i,u&&(window.Promise=r,["all","race"].forEach(function(t){var e=u[t];u[t]=function(n){function r(t){return function(){i.emit("propagate",[null,!o],a,!1,!1),o=o||!t}}var o=!1;s(n,function(e,n){Promise.resolve(n).then(r("all"===t),r(!1))});var a=e.apply(u,arguments),c=u.resolve(a);return c}}),["resolve","reject"].forEach(function(t){var e=u[t];u[t]=function(t){var n=e.apply(u,arguments);return t!==n&&i.emit("propagate",[t,!0],n,!1,!1),n}}),u.prototype["catch"]=function(t){return this.then(null,t)},u.prototype=Object.create(u.prototype,{constructor:{value:r}}),s(Object.getOwnPropertyNames(u),function(t,e){try{r[e]=u[e]}catch(n){}}),o.wrapInPlace(u.prototype,"then",function(t){return function(){var e=this,n=o.argsToArray.apply(this,arguments),r=a(e);r.promise=e,n[0]=c(n[0],"cb-",r,null,!1),n[1]=c(n[1],"cb-",r,null,!1);var s=t.apply(this,n);return r.nextPromise=s,i.emit("propagate",[e,!0],s,!1,!1),s}}),i.on("executor-start",function(t){t[0]=c(t[0],"resolve-",this,null,!1),t[1]=c(t[1],"resolve-",this,null,!1)}),i.on("executor-err",function(t,e,n){t[1](n)}),i.on("cb-end",function(t,e,n){i.emit("propagate",[n,!0],this.nextPromise,!1,!1)}),i.on("propagate",function(t,e,n){this.getCtx&&!e||(this.getCtx=function(){if(t instanceof Promise)var e=i.context(t);return e&&e.getCtx?e.getCtx():this})}),r.toString=function(){return""+u})},{}],12:[function(t,e,n){var r=t("ee").get("raf"),o=t("wrap-function")(r),i="equestAnimationFrame";e.exports=r,o.inPlace(window,["r"+i,"mozR"+i,"webkitR"+i,"msR"+i],"raf-"),r.on("raf-start",function(t){t[0]=o(t[0],"fn-")})},{}],13:[function(t,e,n){function r(t,e,n){t[0]=a(t[0],"fn-",null,n)}function o(t,e,n){this.method=n,this.timerDuration=isNaN(t[1])?0:+t[1],t[0]=a(t[0],"fn-",this,n)}var i=t("ee").get("timer"),a=t("wrap-function")(i),c="setTimeout",s="setInterval",u="clearTimeout",f="-start",d="-";e.exports=i,a.inPlace(window,[c,"setImmediate"],c+d),a.inPlace(window,[s],s+d),a.inPlace(window,[u,"clearImmediate"],u+d),i.on(s+f,r),i.on(c+f,o)},{}],14:[function(t,e,n){function r(t,e){d.inPlace(e,["onreadystatechange"],"fn-",c)}function o(){var t=this,e=f.context(t);t.readyState>3&&!e.resolved&&(e.resolved=!0,f.emit("xhr-resolved",[],t)),d.inPlace(t,g,"fn-",c)}function i(t){y.push(t),h&&(b?b.then(a):v?v(a):(E=-E,R.data=E))}function a(){for(var t=0;t<y.length;t++)r([],y[t]);y.length&&(y=[])}function c(t,e){return e}function s(t,e){for(var n in t)e[n]=t[n];return e}t(6);var u=t("ee"),f=u.get("xhr"),d=t("wrap-function")(f),p=NREUM.o,l=p.XHR,h=p.MO,m=p.PR,v=p.SI,w="readystatechange",g=["onload","onerror","onabort","onloadstart","onloadend","onprogress","ontimeout"],y=[];e.exports=f;var x=window.XMLHttpRequest=function(t){var e=new l(t);try{f.emit("new-xhr",[e],e),e.addEventListener(w,o,!1)}catch(n){try{f.emit("internal-error",[n])}catch(r){}}return e};if(s(l,x),x.prototype=l.prototype,d.inPlace(x.prototype,["open","send"],"-xhr-",c),f.on("send-xhr-start",function(t,e){r(t,e),i(e)}),f.on("open-xhr-start",r),h){var b=m&&m.resolve();if(!v&&!m){var E=1,R=document.createTextNode(E);new h(a).observe(R,{characterData:!0})}}else u.on("fn-end",function(t){t[0]&&t[0].type===w||a()})},{}],15:[function(t,e,n){function r(t){if(!c(t))return null;var e=window.NREUM;if(!e.loader_config)return null;var n=(e.loader_config.accountID||"").toString()||null,r=(e.loader_config.agentID||"").toString()||null,u=(e.loader_config.trustKey||"").toString()||null;if(!n||!r)return null;var h=l.generateSpanId(),m=l.generateTraceId(),v=Date.now(),w={spanId:h,traceId:m,timestamp:v};return(t.sameOrigin||s(t)&&p())&&(w.traceContextParentHeader=o(h,m),w.traceContextStateHeader=i(h,v,n,r,u)),(t.sameOrigin&&!f()||!t.sameOrigin&&s(t)&&d())&&(w.newrelicHeader=a(h,m,v,n,r,u)),w}function o(t,e){return"00-"+e+"-"+t+"-01"}function i(t,e,n,r,o){var i=0,a="",c=1,s="",u="";return o+"@nr="+i+"-"+c+"-"+n+"-"+r+"-"+t+"-"+a+"-"+s+"-"+u+"-"+e}function a(t,e,n,r,o,i){var a="btoa"in window&&"function"==typeof window.btoa;if(!a)return null;var c={v:[0,1],d:{ty:"Browser",ac:r,ap:o,id:t,tr:e,ti:n}};return i&&r!==i&&(c.d.tk=i),btoa(JSON.stringify(c))}function c(t){return u()&&s(t)}function s(t){var e=!1,n={};if("init"in NREUM&&"distributed_tracing"in NREUM.init&&(n=NREUM.init.distributed_tracing),t.sameOrigin)e=!0;else if(n.allowed_origins instanceof Array)for(var r=0;r<n.allowed_origins.length;r++){var o=h(n.allowed_origins[r]);if(t.hostname===o.hostname&&t.protocol===o.protocol&&t.port===o.port){e=!0;break}}return e}function u(){return"init"in NREUM&&"distributed_tracing"in NREUM.init&&!!NREUM.init.distributed_tracing.enabled}function f(){return"init"in NREUM&&"distributed_tracing"in NREUM.init&&!!NREUM.init.distributed_tracing.exclude_newrelic_header}function d(){return"init"in NREUM&&"distributed_tracing"in NREUM.init&&NREUM.init.distributed_tracing.cors_use_newrelic_header!==!1}function p(){return"init"in NREUM&&"distributed_tracing"in NREUM.init&&!!NREUM.init.distributed_tracing.cors_use_tracecontext_headers}var l=t(25),h=t(17);e.exports={generateTracePayload:r,shouldGenerateTrace:c}},{}],16:[function(t,e,n){function r(t){var e=this.params,n=this.metrics;if(!this.ended){this.ended=!0;for(var r=0;r<p;r++)t.removeEventListener(d[r],this.listener,!1);e.aborted||(n.duration=a.now()-this.startTime,this.loadCaptureCalled||4!==t.readyState?null==e.status&&(e.status=0):i(this,t),n.cbTime=this.cbTime,f.emit("xhr-done",[t],t),c("xhr",[e,n,this.startTime]))}}function o(t,e){var n=s(e),r=t.params;r.host=n.hostname+":"+n.port,r.pathname=n.pathname,t.parsedOrigin=s(e),t.sameOrigin=t.parsedOrigin.sameOrigin}function i(t,e){t.params.status=e.status;var n=v(e,t.lastSize);if(n&&(t.metrics.rxSize=n),t.sameOrigin){var r=e.getResponseHeader("X-NewRelic-App-Data");r&&(t.params.cat=r.split(", ").pop())}t.loadCaptureCalled=!0}var a=t("loader");if(a.xhrWrappable){var c=t("handle"),s=t(17),u=t(15).generateTracePayload,f=t("ee"),d=["load","error","abort","timeout"],p=d.length,l=t("id"),h=t(21),m=t(20),v=t(18),w=window.XMLHttpRequest;a.features.xhr=!0,t(14),t(7),f.on("new-xhr",function(t){var e=this;e.totalCbs=0,e.called=0,e.cbTime=0,e.end=r,e.ended=!1,e.xhrGuids={},e.lastSize=null,e.loadCaptureCalled=!1,t.addEventListener("load",function(n){i(e,t)},!1),h&&(h>34||h<10)||window.opera||t.addEventListener("progress",function(t){e.lastSize=t.loaded},!1)}),f.on("open-xhr-start",function(t){this.params={method:t[0]},o(this,t[1]),this.metrics={}}),f.on("open-xhr-end",function(t,e){"loader_config"in NREUM&&"xpid"in NREUM.loader_config&&this.sameOrigin&&e.setRequestHeader("X-NewRelic-ID",NREUM.loader_config.xpid);var n=u(this.parsedOrigin);if(n){var r=!1;n.newrelicHeader&&(e.setRequestHeader("newrelic",n.newrelicHeader),r=!0),n.traceContextParentHeader&&(e.setRequestHeader("traceparent",n.traceContextParentHeader),n.traceContextStateHeader&&e.setRequestHeader("tracestate",n.traceContextStateHeader),r=!0),r&&(this.dt=n)}}),f.on("send-xhr-start",function(t,e){var n=this.metrics,r=t[0],o=this;if(n&&r){var i=m(r);i&&(n.txSize=i)}this.startTime=a.now(),this.listener=function(t){try{"abort"!==t.type||o.loadCaptureCalled||(o.params.aborted=!0),("load"!==t.type||o.called===o.totalCbs&&(o.onloadCalled||"function"!=typeof e.onload))&&o.end(e)}catch(n){try{f.emit("internal-error",[n])}catch(r){}}};for(var c=0;c<p;c++)e.addEventListener(d[c],this.listener,!1)}),f.on("xhr-cb-time",function(t,e,n){this.cbTime+=t,e?this.onloadCalled=!0:this.called+=1,this.called!==this.totalCbs||!this.onloadCalled&&"function"==typeof n.onload||this.end(n)}),f.on("xhr-load-added",function(t,e){var n=""+l(t)+!!e;this.xhrGuids&&!this.xhrGuids[n]&&(this.xhrGuids[n]=!0,this.totalCbs+=1)}),f.on("xhr-load-removed",function(t,e){var n=""+l(t)+!!e;this.xhrGuids&&this.xhrGuids[n]&&(delete this.xhrGuids[n],this.totalCbs-=1)}),f.on("addEventListener-end",function(t,e){e instanceof w&&"load"===t[0]&&f.emit("xhr-load-added",[t[1],t[2]],e)}),f.on("removeEventListener-end",function(t,e){e instanceof w&&"load"===t[0]&&f.emit("xhr-load-removed",[t[1],t[2]],e)}),f.on("fn-start",function(t,e,n){e instanceof w&&("onload"===n&&(this.onload=!0),("load"===(t[0]&&t[0].type)||this.onload)&&(this.xhrCbStart=a.now()))}),f.on("fn-end",function(t,e){this.xhrCbStart&&f.emit("xhr-cb-time",[a.now()-this.xhrCbStart,this.onload,e],e)}),f.on("fetch-before-start",function(t){function e(t,e){var n=!1;return e.newrelicHeader&&(t.set("newrelic",e.newrelicHeader),n=!0),e.traceContextParentHeader&&(t.set("traceparent",e.traceContextParentHeader),e.traceContextStateHeader&&t.set("tracestate",e.traceContextStateHeader),n=!0),n}var n,r=t[1]||{};"string"==typeof t[0]?n=t[0]:t[0]&&t[0].url?n=t[0].url:window.URL&&t[0]&&t[0]instanceof URL&&(n=t[0].href),n&&(this.parsedOrigin=s(n),this.sameOrigin=this.parsedOrigin.sameOrigin);var o=u(this.parsedOrigin);if(o&&(o.newrelicHeader||o.traceContextParentHeader))if("string"==typeof t[0]||window.URL&&t[0]&&t[0]instanceof URL){var i={};for(var a in r)i[a]=r[a];i.headers=new Headers(r.headers||{}),e(i.headers,o)&&(this.dt=o),t.length>1?t[1]=i:t.push(i)}else t[0]&&t[0].headers&&e(t[0].headers,o)&&(this.dt=o)})}},{}],17:[function(t,e,n){var r={};e.exports=function(t){if(t in r)return r[t];var e=document.createElement("a"),n=window.location,o={};e.href=t,o.port=e.port;var i=e.href.split("://");!o.port&&i[1]&&(o.port=i[1].split("/")[0].split("@").pop().split(":")[1]),o.port&&"0"!==o.port||(o.port="https"===i[0]?"443":"80"),o.hostname=e.hostname||n.hostname,o.pathname=e.pathname,o.protocol=i[0],"/"!==o.pathname.charAt(0)&&(o.pathname="/"+o.pathname);var a=!e.protocol||":"===e.protocol||e.protocol===n.protocol,c=e.hostname===document.domain&&e.port===n.port;return o.sameOrigin=a&&(!e.hostname||c),"/"===o.pathname&&(r[t]=o),o}},{}],18:[function(t,e,n){function r(t,e){var n=t.responseType;return"json"===n&&null!==e?e:"arraybuffer"===n||"blob"===n||"json"===n?o(t.response):"text"===n||""===n||void 0===n?o(t.responseText):void 0}var o=t(20);e.exports=r},{}],19:[function(t,e,n){function r(){}function o(t,e,n){return function(){return i(t,[u.now()].concat(c(arguments)),e?null:this,n),e?void 0:this}}var i=t("handle"),a=t(28),c=t(29),s=t("ee").get("tracer"),u=t("loader"),f=NREUM;"undefined"==typeof window.newrelic&&(newrelic=f);var d=["setPageViewName","setCustomAttribute","setErrorHandler","finished","addToTrace","inlineHit","addRelease"],p="api-",l=p+"ixn-";a(d,function(t,e){f[e]=o(p+e,!0,"api")}),f.addPageAction=o(p+"addPageAction",!0),f.setCurrentRouteName=o(p+"routeName",!0),e.exports=newrelic,f.interaction=function(){return(new r).get()};var h=r.prototype={createTracer:function(t,e){var n={},r=this,o="function"==typeof e;return i(l+"tracer",[u.now(),t,n],r),function(){if(s.emit((o?"":"no-")+"fn-start",[u.now(),r,o],n),o)try{return e.apply(this,arguments)}catch(t){throw s.emit("fn-err",[arguments,this,t],n),t}finally{s.emit("fn-end",[u.now()],n)}}}};a("actionText,setName,setAttribute,save,ignore,onEnd,getContext,end,get".split(","),function(t,e){h[e]=o(l+e)}),newrelic.noticeError=function(t,e){"string"==typeof t&&(t=new Error(t)),i("err",[t,u.now(),!1,e])}},{}],20:[function(t,e,n){e.exports=function(t){if("string"==typeof t&&t.length)return t.length;if("object"==typeof t){if("undefined"!=typeof ArrayBuffer&&t instanceof ArrayBuffer&&t.byteLength)return t.byteLength;if("undefined"!=typeof Blob&&t instanceof Blob&&t.size)return t.size;if(!("undefined"!=typeof FormData&&t instanceof FormData))try{return JSON.stringify(t).length}catch(e){return}}}},{}],21:[function(t,e,n){var r=0,o=navigator.userAgent.match(/Firefox[/s](d+.d+)/);o&&(r=+o[1]),e.exports=r},{}],22:[function(t,e,n){function r(){return c.exists&&performance.now?Math.round(performance.now()):(i=Math.max((new Date).getTime(),i))-a}function o(){return i}var i=(new Date).getTime(),a=i,c=t(30);e.exports=r,e.exports.offset=a,e.exports.getLastTimestamp=o},{}],23:[function(t,e,n){function r(t){return!(!t||!t.protocol||"file:"===t.protocol)}e.exports=r},{}],24:[function(t,e,n){function r(t,e){var n=t.getEntries();n.forEach(function(t){"first-paint"===t.name?d("timing",["fp",Math.floor(t.startTime)]):"first-contentful-paint"===t.name&&d("timing",["fcp",Math.floor(t.startTime)])})}function o(t,e){var n=t.getEntries();n.length>0&&d("lcp",[n[n.length-1]])}function i(t){t.getEntries().forEach(function(t){t.hadRecentInput||d("cls",[t])})}function a(t){if(t instanceof h&&!v){var e=Math.round(t.timeStamp),n={type:t.type};e<=p.now()?n.fid=p.now()-e:e>p.offset&&e<=Date.now()?(e-=p.offset,n.fid=p.now()-e):e=p.now(),v=!0,d("timing",["fi",e,n])}}function c(t){d("pageHide",[p.now(),t])}if(!("init"in NREUM&&"page_view_timing"in NREUM.init&&"enabled"in NREUM.init.page_view_timing&&NREUM.init.page_view_timing.enabled===!1)){var s,u,f,d=t("handle"),p=t("loader"),l=t(27),h=NREUM.o.EV;if("PerformanceObserver"in window&&"function"==typeof window.PerformanceObserver){s=new PerformanceObserver(r);try{s.observe({entryTypes:["paint"]})}catch(m){}u=new PerformanceObserver(o);try{u.observe({entryTypes:["largest-contentful-paint"]})}catch(m){}f=new PerformanceObserver(i);try{f.observe({type:"layout-shift",buffered:!0})}catch(m){}}if("addEventListener"in document){var v=!1,w=["click","keydown","mousedown","pointerdown","touchstart"];w.forEach(function(t){document.addEventListener(t,a,!1)})}l(c)}},{}],25:[function(t,e,n){function r(){function t(){return e?15&e[n++]:16*Math.random()|0}var e=null,n=0,r=window.crypto||window.msCrypto;r&&r.getRandomValues&&(e=r.getRandomValues(new Uint8Array(31)));for(var o,i="xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx",a="",c=0;c<i.length;c++)o=i[c],"x"===o?a+=t().toString(16):"y"===o?(o=3&t()|8,a+=o.toString(16)):a+=o;return a}function o(){return a(16)}function i(){return a(32)}function a(t){function e(){return n?15&n[r++]:16*Math.random()|0}var n=null,r=0,o=window.crypto||window.msCrypto;o&&o.getRandomValues&&Uint8Array&&(n=o.getRandomValues(new Uint8Array(31)));for(var i=[],a=0;a<t;a++)i.push(e().toString(16));return i.join("")}e.exports={generateUuid:r,generateSpanId:o,generateTraceId:i}},{}],26:[function(t,e,n){function r(t,e){if(!o)return!1;if(t!==o)return!1;if(!e)return!0;if(!i)return!1;for(var n=i.split("."),r=e.split("."),a=0;a<r.length;a++)if(r[a]!==n[a])return!1;return!0}var o=null,i=null,a=/Version\/(\S+)\s+Safari/;if(navigator.userAgent){var c=navigator.userAgent,s=c.match(a);s&&c.indexOf("Chrome")===-1&&c.indexOf("Chromium")===-1&&(o="Safari",i=s[1])}e.exports={agent:o,version:i,match:r}},{}],27:[function(t,e,n){function r(t){function e(){t(a&&document[a]?document[a]:document[o]?"hidden":"visible")}"addEventListener"in document&&i&&document.addEventListener(i,e,!1)}e.exports=r;var o,i,a;"undefined"!=typeof document.hidden?(o="hidden",i="visibilitychange",a="visibilityState"):"undefined"!=typeof document.msHidden?(o="msHidden",i="msvisibilitychange"):"undefined"!=typeof document.webkitHidden&&(o="webkitHidden",i="webkitvisibilitychange",a="webkitVisibilityState")},{}],28:[function(t,e,n){function r(t,e){var n=[],r="",i=0;for(r in t)o.call(t,r)&&(n[i]=e(r,t[r]),i+=1);return n}var o=Object.prototype.hasOwnProperty;e.exports=r},{}],29:[function(t,e,n){function r(t,e,n){e||(e=0),"undefined"==typeof n&&(n=t?t.length:0);for(var r=-1,o=n-e||0,i=Array(o<0?0:o);++r<o;)i[r]=t[e+r];return i}e.exports=r},{}],30:[function(t,e,n){e.exports={exists:"undefined"!=typeof window.performance&&window.performance.timing&&"undefined"!=typeof window.performance.timing.navigationStart}},{}],ee:[function(t,e,n){function r(){}function o(t){function e(t){return t&&t instanceof r?t:t?u(t,s,a):a()}function n(n,r,o,i,a){if(a!==!1&&(a=!0),!l.aborted||i){t&&a&&t(n,r,o);for(var c=e(o),s=m(n),u=s.length,f=0;f<u;f++)s[f].apply(c,r);var p=d[y[n]];return p&&p.push([x,n,r,c]),c}}function i(t,e){g[t]=m(t).concat(e)}function h(t,e){var n=g[t];if(n)for(var r=0;r<n.length;r++)n[r]===e&&n.splice(r,1)}function m(t){return g[t]||[]}function v(t){return p[t]=p[t]||o(n)}function w(t,e){f(t,function(t,n){e=e||"feature",y[n]=e,e in d||(d[e]=[])})}var g={},y={},x={on:i,addEventListener:i,removeEventListener:h,emit:n,get:v,listeners:m,context:e,buffer:w,abort:c,aborted:!1};return x}function i(t){return u(t,s,a)}function a(){return new r}function c(){(d.api||d.feature)&&(l.aborted=!0,d=l.backlog={})}var s="nr@context",u=t("gos"),f=t(28),d={},p={},l=e.exports=o();e.exports.getOrSetContext=i,l.backlog=d},{}],gos:[function(t,e,n){function r(t,e,n){if(o.call(t,e))return t[e];var r=n();if(Object.defineProperty&&Object.keys)try{return Object.defineProperty(t,e,{value:r,writable:!0,enumerable:!1}),r}catch(i){}return t[e]=r,r}var o=Object.prototype.hasOwnProperty;e.exports=r},{}],handle:[function(t,e,n){function r(t,e,n,r){o.buffer([t],r),o.emit(t,e,n)}var o=t("ee").get("handle");e.exports=r,r.ee=o},{}],id:[function(t,e,n){function r(t){var e=typeof t;return!t||"object"!==e&&"function"!==e?-1:t===window?0:a(t,i,function(){return o++})}var o=1,i="nr@id",a=t("gos");e.exports=r},{}],loader:[function(t,e,n){function r(){if(!E++){var t=b.info=NREUM.info,e=l.getElementsByTagName("script")[0];if(setTimeout(u.abort,3e4),!(t&&t.licenseKey&&t.applicationID&&e))return u.abort();s(y,function(e,n){t[e]||(t[e]=n)});var n=a();c("mark",["onload",n+b.offset],null,"api"),c("timing",["load",n]);var r=l.createElement("script");r.src="https://"+t.agent,e.parentNode.insertBefore(r,e)}}function o(){"complete"===l.readyState&&i()}function i(){c("mark",["domContent",a()+b.offset],null,"api")}var a=t(22),c=t("handle"),s=t(28),u=t("ee"),f=t(26),d=t(23),p=window,l=p.document,h="addEventListener",m="attachEvent",v=p.XMLHttpRequest,w=v&&v.prototype;if(d(p.location)){NREUM.o={ST:setTimeout,SI:p.setImmediate,CT:clearTimeout,XHR:v,REQ:p.Request,EV:p.Event,PR:p.Promise,MO:p.MutationObserver};var g=""+location,y={beacon:"bam.nr-data.net",errorBeacon:"bam.nr-data.net",agent:"js-agent.newrelic.com/nr-spa-1208.min.js"},x=v&&w&&w[h]&&!/CriOS/.test(navigator.userAgent),b=e.exports={offset:a.getLastTimestamp(),now:a,origin:g,features:{},xhrWrappable:x,userAgent:f};t(19),t(24),l[h]?(l[h]("DOMContentLoaded",i,!1),p[h]("load",r,!1)):(l[m]("onreadystatechange",o),p[m]("onload",r)),c("mark",["firstbyte",a.getLastTimestamp()],null,"api");var E=0}},{}],"wrap-function":[function(t,e,n){function r(t,e){function n(e,n,r,s,u){function nrWrapper(){var i,a,f,p;try{a=this,i=d(arguments),f="function"==typeof r?r(i,a):r||{}}catch(l){o([l,"",[i,a,s],f],t)}c(n+"start",[i,a,s],f,u);try{return p=e.apply(a,i)}catch(h){throw c(n+"err",[i,a,h],f,u),h}finally{c(n+"end",[i,a,p],f,u)}}return a(e)?e:(n||(n=""),nrWrapper[p]=e,i(e,nrWrapper,t),nrWrapper)}function r(t,e,r,o,i){r||(r="");var c,s,u,f="-"===r.charAt(0);for(u=0;u<e.length;u++)s=e[u],c=t[s],a(c)||(t[s]=n(c,f?s+r:r,o,s,i))}function c(n,r,i,a){if(!h||e){var c=h;h=!0;try{t.emit(n,r,i,e,a)}catch(s){o([s,n,r,i],t)}h=c}}return t||(t=f),n.inPlace=r,n.flag=p,n}function o(t,e){e||(e=f);try{e.emit("internal-error",t)}catch(n){}}function i(t,e,n){if(Object.defineProperty&&Object.keys)try{var r=Object.keys(t);return r.forEach(function(n){Object.defineProperty(e,n,{get:function(){return t[n]},set:function(e){return t[n]=e,e}})}),e}catch(i){o([i],n)}for(var a in t)l.call(t,a)&&(e[a]=t[a]);return e}function a(t){return!(t&&t instanceof Function&&t.apply&&!t[p])}function c(t,e){var n=e(t);return n[p]=t,i(t,n,f),n}function s(t,e,n){var r=t[e];t[e]=c(r,n)}function u(){for(var t=arguments.length,e=new Array(t),n=0;n<t;++n)e[n]=arguments[n];return e}var f=t("ee"),d=t(29),p="nr@original",l=Object.prototype.hasOwnProperty,h=!1;e.exports=r,e.exports.wrapFunction=c,e.exports.wrapInPlace=s,e.exports.argsToArray=u},{}]},{},["loader",2,16,5,3,4]);
+;NREUM.loader_config={accountID:"39284",trustKey:"39284",agentID:"7447468",licenseKey:"689d5b4562",applicationID:"2011224"}
+;NREUM.info={beacon:"bam-cell.nr-data.net",errorBeacon:"bam-cell.nr-data.net",licenseKey:"689d5b4562",applicationID:"2011224",sa:1};</script><script>if(window.newrelic){window.newrelic.setCustomAttribute('userId', '0');window.newrelic.setCustomAttribute('accountType', 'UNKNOWN');window.newrelic.setCustomAttribute('teamOwnerId', '0');window.newrelic.setCustomAttribute('teamOwnerAccountType', 'UNKNOWN');};</script><title>eleonore // michael - middlebury, vt</title>    <script id="microdata" type="application/ld+json">
+        [{"url":"https://vimeo.com/192207770/0faf1dd09d","thumbnailUrl":"https://i.vimeocdn.com/filter/overlay?src0=https%3A%2F%2Fi.vimeocdn.com%2Fvideo%2F603496523-33935d2b2cbf32d39c4697fa5b03364507eb81dc03a0be84b9a9fe4ec7b89868-d_1280x544&src1=https%3A%2F%2Ff.vimeocdn.com%2Fimages_v6%2Fshare%2Fplay_icon_overlay.png","embedUrl":"https://player.vimeo.com/video/192207770?h=0faf1dd09d","name":"eleonore // michael - middlebury, vt","description":"This is &quot;eleonore // michael - middlebury, vt&quot; by Velare on Vimeo, the home for high quality videos and the people who love them.","height":816,"width":1920,"playerType":"HTML5 Flash","videoQuality":"HD","uploadDate":"2016-11-18T19:57:13-05:00","dateModified":"2023-04-03T18:05:08-04:00","thumbnail":{"@type":"ImageObject","url":"https://i.vimeocdn.com/filter/overlay?src0=https%3A%2F%2Fi.vimeocdn.com%2Fvideo%2F603496523-33935d2b2cbf32d39c4697fa5b03364507eb81dc03a0be84b9a9fe4ec7b89868-d_1280x544&src1=https%3A%2F%2Ff.vimeocdn.com%2Fimages_v6%2Fshare%2Fplay_icon_overlay.png","width":1280,"height":544},"author":{"@type":"Person","name":"Velare","url":"https://vimeo.com/velare"},"potentialAction":{"@type":"ViewAction","target":"vimeo://app.vimeo.com/videos/192207770"},"duration":"PT00H05M04S","interactionStatistic":[{"@type":"InteractionCounter","interactionType":"http://schema.org/CommentAction","userInteractionCount":0},{"@type":"InteractionCounter","interactionType":"http://schema.org/LikeAction","userInteractionCount":0},{"@type":"InteractionCounter","interactionType":"http://schema.org/WatchAction","userInteractionCount":959}],"@type":"VideoObject","@context":"http://schema.org"},{"itemListElement":[{"@type":"ListItem","position":1,"item":{"@id":"https://vimeo.com/velare","name":"Velare"}},{"@type":"ListItem","position":2,"item":{"@id":"https://vimeo.com/velare/videos","name":"Videos"}}],"@type":"BreadcrumbList","@context":"http://schema.org"}]    </script>
+                        <meta property="og:site_name" content="Vimeo">
+                                <meta property="og:url" content="https://vimeo.com/192207770/0faf1dd09d">
+                                <meta property="og:type" content="video.other">
+                                <meta property="og:title" content="eleonore // michael - middlebury, vt">
+                                <meta property="og:description" content="This is &quot;eleonore // michael - middlebury, vt&quot; by Velare on Vimeo, the home for high quality videos and the people who love them.">
+                                <meta property="og:updated_time" content="2023-04-03T18:05:08-04:00">
+                                <meta property="og:image" content="https://i.vimeocdn.com/filter/overlay?src0=https%3A%2F%2Fi.vimeocdn.com%2Fvideo%2F603496523-33935d2b2cbf32d39c4697fa5b03364507eb81dc03a0be84b9a9fe4ec7b89868-d_1280x544&amp;src1=https%3A%2F%2Ff.vimeocdn.com%2Fimages_v6%2Fshare%2Fplay_icon_overlay.png">
+                                <meta property="og:image:secure_url" content="https://i.vimeocdn.com/filter/overlay?src0=https%3A%2F%2Fi.vimeocdn.com%2Fvideo%2F603496523-33935d2b2cbf32d39c4697fa5b03364507eb81dc03a0be84b9a9fe4ec7b89868-d_1280x544&amp;src1=https%3A%2F%2Ff.vimeocdn.com%2Fimages_v6%2Fshare%2Fplay_icon_overlay.png">
+                                <meta property="og:image:type" content="image/jpg">
+                                <meta property="og:image:width" content="1280">
+                                <meta property="og:image:height" content="544">
+                                <meta property="og:video:url" content="https://player.vimeo.com/video/192207770?autoplay=1&amp;h=0faf1dd09d">
+                                <meta property="og:video:secure_url" content="https://player.vimeo.com/video/192207770?autoplay=1&amp;h=0faf1dd09d">
+                                <meta property="og:video:type" content="text/html">
+                                <meta property="og:video:width" content="1280">
+                                <meta property="og:video:height" content="544">
+                                <meta property="al:ios:app_name" content="Vimeo">
+                                <meta property="al:ios:app_store_id" content="425194759">
+                                <meta property="al:ios:url" content="vimeo://app.vimeo.com/videos/192207770">
+                                <meta property="al:android:app_name" content="Vimeo">
+                                <meta property="al:android:package" content="com.vimeo.android.videoapp">
+                                <meta property="al:android:url" content="vimeo://app.vimeo.com/videos/192207770">
+                                <meta property="al:web:should_fallback" content="true">
+            
+        <meta name="robots" content="noindex, nofollow">
+        <meta name="description" content="This is &quot;eleonore // michael - middlebury, vt&quot; by Velare on Vimeo, the home for high quality videos and the people who love them.">
+        <meta name="twitter:card" content="player">
+        <meta name="twitter:site" content="@vimeo">
+        <meta name="twitter:title" content="eleonore // michael - middlebury, vt">
+        <meta name="twitter:description" content="This is &quot;eleonore // michael - middlebury, vt&quot; by Velare on Vimeo, the home for high quality videos and the people who love them.">
+        <meta name="twitter:image" content="https://i.vimeocdn.com/filter/overlay?src0=https%3A%2F%2Fi.vimeocdn.com%2Fvideo%2F603496523-33935d2b2cbf32d39c4697fa5b03364507eb81dc03a0be84b9a9fe4ec7b89868-d_1280x544&amp;src1=https%3A%2F%2Ff.vimeocdn.com%2Fimages_v6%2Fshare%2Fplay_icon_overlay.png">
+        <meta name="twitter:player" content="https://player.vimeo.com/video/192207770?h=0faf1dd09d">
+        <meta name="twitter:player:width" content="1280">
+        <meta name="twitter:player:height" content="544">
+        <meta name="twitter:site" content="@vimeo">
+        <meta name="twitter:app:name:iphone" content="Vimeo">
+        <meta name="twitter:app:id:iphone" content="425194759">
+        <meta name="twitter:app:url:iphone" content="vimeo://app.vimeo.com/videos/192207770">
+        <meta name="twitter:app:name:ipad" content="Vimeo">
+        <meta name="twitter:app:id:ipad" content="425194759">
+        <meta name="twitter:app:url:ipad" content="vimeo://app.vimeo.com/videos/192207770">
+        <meta name="twitter:app:name:googleplay" content="Vimeo">
+        <meta name="twitter:app:id:googleplay" content="com.vimeo.android.videoapp">
+        <meta name="twitter:app:url:googleplay" content="vimeo://app.vimeo.com/videos/192207770">
+
+
+
+            <link id="clip-thumbnail-192207770" rel="preload" as="image" fetchpriority="high" href="https://i.vimeocdn.com/video/603496523-33935d2b2cbf32d39c4697fa5b03364507eb81dc03a0be84b9a9fe4ec7b89868-d_2400" data-airgap-id="6">
+                <link rel="alternate" href="https://vimeo.com/api/oembed.json?url=https%3A%2F%2Fvimeo.com%2F192207770%2F0faf1dd09d%3Fh%3D0faf1dd09d" type="application/json+oembed" title="eleonore // michael - middlebury, vt" data-airgap-id="7">
+                <link rel="alternate" href="https://vimeo.com/api/oembed.xml?url=https%3A%2F%2Fvimeo.com%2F192207770%2F0faf1dd09d%3Fh%3D0faf1dd09d" type="text/xml+oembed" title="eleonore // michael - middlebury, vt" data-airgap-id="8">
+                <link rel="pingback" href="https://vimeo.com/_pingback" data-airgap-id="9">
+                <link rel="canonical" href="https://vimeo.com/192207770/0faf1dd09d">
+    
+
+<meta property="fb:app_id" content="19884028963">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<link rel="preconnect" href="https://player.vimeo.com/" data-airgap-id="10">
+<link rel="preconnect" href="https://i.vimeocdn.com/" data-airgap-id="11">
+<link rel="preconnect" href="https://f.vimeocdn.com/" data-airgap-id="12">
+<link rel="search" type="application/opensearchdescription+xml" href="https://vimeo.com/search/opensearch.xml" title="Vimeo">
+<link rel="logo" type="image/svg" href="https://f.vimeocdn.com/logo.svg">
+<link rel="mask-icon" href="https://f.vimeocdn.com/svg/legacy_view_support/iris_icon_v_64.svg?fa494654d82fbd93f6bdc3a2306927cb52ebb523" color="#17272e">
+
+<link rel="shortcut icon" href="https://f.vimeocdn.com/images_v6/favicon.ico?fa494654d82fbd93f6bdc3a2306927cb52ebb523" data-airgap-id="13">
+
+<meta name="msapplication-TileImage" content="https://i.vimeocdn.com/favicon/main-touch_144">
+<meta name="msapplication-TileColor" content="#00adef">
+<script>var ablincoln_tests = {"JS.RecordExtension.OverlayVsInlineIntegrations":{"id":995,"name":"JS.RecordExtension.OverlayVsInlineIntegrations","buckets":1000,"input":"vuid","url":"\/","experiments":[{"id":2818,"name":"Record Extension Inline vs Overlay Integrations test","buckets":1000,"state":3,"published_on":"2023-02-27 07:51:25","paused_on":"0000-00-00 00:00:00","stopped_on":"2023-02-27 07:59:44","parameters":[{"id":4641,"name":"override_with_overlay","choice":"control","weight":1},{"id":4642,"name":"override_with_overlay","choice":"variant","weight":0}],"segments":[]},{"id":2819,"name":"* Record Extension Inline vs Overlay Integrations test","buckets":1000,"state":3,"published_on":"2023-02-27 08:00:03","paused_on":"0000-00-00 00:00:00","stopped_on":"2023-03-15 05:04:52","parameters":[{"id":4643,"name":"override_with_overlay","choice":"control","weight":0},{"id":4644,"name":"override_with_overlay","choice":"variant","weight":1}],"segments":[]},{"id":2853,"name":"* * Record Extension Inline vs Overlay Integrations test","buckets":1000,"state":1,"published_on":"2023-03-23 18:09:55","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4697,"name":"override_with_overlay","choice":"control","weight":1},{"id":4698,"name":"override_with_overlay","choice":"variant","weight":1}],"segments":[]}]},"JS.Create.ContentRating":{"id":994,"name":"JS.Create.ContentRating","buckets":1000,"input":"cuid","url":"\/upload\/videos","experiments":[{"id":2823,"name":"Rating modal 1%","buckets":10,"state":3,"published_on":"2023-03-14 06:20:46","paused_on":"0000-00-00 00:00:00","stopped_on":"2023-03-14 06:22:20","parameters":[{"id":4651,"name":"create_content_rating","choice":"control","weight":1},{"id":4652,"name":"create_content_rating","choice":"variant","weight":1}],"segments":[]},{"id":2834,"name":"content rating","buckets":1000,"state":3,"published_on":"2023-03-14 06:23:52","paused_on":"0000-00-00 00:00:00","stopped_on":"2023-03-14 06:29:44","parameters":[{"id":4666,"name":"create_content_rating","choice":"variant","weight":1},{"id":4667,"name":"create_content_rating","choice":"control","weight":1}],"segments":[]},{"id":2836,"name":"content rating2","buckets":1000,"state":3,"published_on":"2023-03-14 06:31:29","paused_on":"2023-03-14 06:33:44","stopped_on":"2023-03-14 10:39:32","parameters":[{"id":4668,"name":"create_content_rating","choice":"variant","weight":1}],"segments":[]},{"id":2837,"name":"Rating modal open for 1%","buckets":10,"state":1,"published_on":"2023-03-14 10:41:16","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4669,"name":"create_content_rating","choice":"control","weight":1},{"id":4670,"name":"create_content_rating","choice":"variant","weight":1}],"segments":[]}]},"JS.RecordExtension.PhotoAvatar":{"id":992,"name":"JS.RecordExtension.PhotoAvatar","buckets":1000,"input":"vuid","url":"\/","experiments":[{"id":2817,"name":"PA","buckets":1000,"state":3,"published_on":"2023-02-27 08:35:48","paused_on":"2023-02-27 08:36:54","stopped_on":"2023-02-27 08:37:28","parameters":[{"id":4639,"name":"photo_avatar","choice":"variant","weight":1},{"id":4640,"name":"photo_avatar","choice":"control","weight":1}],"segments":[]},{"id":2820,"name":"* PA","buckets":1000,"state":3,"published_on":"2023-02-27 09:09:31","paused_on":"0000-00-00 00:00:00","stopped_on":"2023-02-27 09:11:46","parameters":[{"id":4645,"name":"photo_avatar","choice":"variant","weight":1},{"id":4646,"name":"photo_avatar","choice":"control","weight":1}],"segments":[]},{"id":2821,"name":"* * PA","buckets":1000,"state":3,"published_on":"2023-03-06 09:08:08","paused_on":"0000-00-00 00:00:00","stopped_on":"2023-03-10 04:13:08","parameters":[{"id":4647,"name":"photo_avatar","choice":"variant","weight":1}],"segments":[]},{"id":2856,"name":"* * * PA","buckets":1000,"state":1,"published_on":"2023-03-23 18:11:33","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4699,"name":"photo_avatar","choice":"variant","weight":1},{"id":4700,"name":"photo_avatar","choice":"control","weight":1}],"segments":[]}]},"JS.Omnisearch.Actions":{"id":988,"name":"JS.Omnisearch.Actions","buckets":1000,"input":"cuid","url":"\/","experiments":[{"id":2810,"name":"50% roll - `copy link` in Omnisearch","buckets":500,"state":1,"published_on":"2023-02-27 11:46:42","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4625,"name":"copy_link","choice":"variant","weight":1},{"id":4626,"name":"copy_link","choice":"control","weight":1}],"segments":[]}]},"JS.RecordExtension.DesktopRollout":{"id":985,"name":"JS.RecordExtension.DesktopRollout","buckets":1000,"input":"vuid","url":"\/record\/auth-complete","experiments":[{"id":2802,"name":"DesktopRollout","buckets":1000,"state":1,"published_on":"2023-02-20 14:57:17","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4618,"name":"desktop_rollout","choice":"variant","weight":1},{"id":4619,"name":"desktop_rollout","choice":"control","weight":1}],"segments":[]}]},"JS.Editor.SmartCrop":{"id":982,"name":"JS.Editor.SmartCrop","buckets":1000,"input":"cuid","url":"\/create\/customize\/","experiments":[{"id":2798,"name":"smart_crop","buckets":200,"state":2,"published_on":"2023-02-16 02:34:38","paused_on":"2023-02-26 07:28:43","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4610,"name":"smart_crop","choice":"variant","weight":100},{"id":4611,"name":"smart_crop","choice":"control","weight":100}],"segments":[{"id":329,"type":"location","include":0,"values":["US"]}]}]},"JS.PurchaseSeatsOnboarding":{"id":981,"name":"JS.PurchaseSeatsOnboarding","buckets":1000,"input":"cuid","url":"\/store\/receipt\/seat_subscription","experiments":[{"id":2811,"name":"10 rollout","buckets":100,"state":1,"published_on":"2023-02-13 16:52:26","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4627,"name":"can_purchase_seats","choice":"control","weight":1},{"id":4628,"name":"can_purchase_seats","choice":"variant","weight":1}],"segments":[]},{"id":2840,"name":"50 rollout","buckets":400,"state":3,"published_on":"2023-03-15 16:08:59","paused_on":"0000-00-00 00:00:00","stopped_on":"2023-03-16 14:26:30","parameters":[{"id":4675,"name":"can_purchase_seats","choice":"control","weight":1},{"id":4676,"name":"can_purchase_seats","choice":"variant","weight":2}],"segments":[]},{"id":2844,"name":"100 rollout","buckets":900,"state":2,"published_on":"2023-03-16 14:27:15","paused_on":"2023-03-16 17:47:04","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4681,"name":"can_purchase_seats","choice":"control","weight":1},{"id":4682,"name":"can_purchase_seats","choice":"variant","weight":1}],"segments":[]}]},"JS.Editor.DisableTVE":{"id":976,"name":"JS.Editor.DisableTVE","buckets":1000,"input":"cuid","url":"\/manage\/videos","experiments":[{"id":2771,"name":"disable_tve","buckets":1,"state":1,"published_on":"2022-12-13 09:01:18","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4564,"name":"disable_tve","choice":"variant","weight":1},{"id":4565,"name":"disable_tve","choice":"control","weight":1000000000}],"segments":[]}]},"JS.Editor.AddTextSidePanel":{"id":973,"name":"JS.Editor.AddTextSidePanel","buckets":1000,"input":"cuid","url":"\/create\/customize\/","experiments":[{"id":2762,"name":"show_add_text_side_panel","buckets":1,"state":3,"published_on":"2022-12-11 10:19:34","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-12-12 03:04:13","parameters":[{"id":4548,"name":"show_add_text_side_panel","choice":"control","weight":1},{"id":4549,"name":"show_add_text_side_panel","choice":"variant","weight":0}],"segments":[]},{"id":2770,"name":"4 default text size 200","buckets":200,"state":3,"published_on":"2022-12-12 03:05:24","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-12-26 02:33:19","parameters":[{"id":4562,"name":"show_add_text_side_panel","choice":"control","weight":1},{"id":4563,"name":"show_add_text_side_panel","choice":"variant","weight":1}],"segments":[]},{"id":2779,"name":"4 default text size 1000","buckets":800,"state":3,"published_on":"2022-12-20 06:49:59","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-12-26 02:33:14","parameters":[{"id":4573,"name":"show_add_text_side_panel","choice":"control","weight":1},{"id":4574,"name":"show_add_text_side_panel","choice":"variant","weight":1}],"segments":[]},{"id":2784,"name":"4 default text size 1000 variant","buckets":1000,"state":1,"published_on":"2022-12-26 02:35:27","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4576,"name":"show_add_text_side_panel","choice":"variant","weight":1}],"segments":[]}]},"JS.Builderio.AbTest":{"id":971,"name":"JS.Builderio.AbTest","buckets":1000,"input":"vuid","url":"\/cms-abtest","experiments":[{"id":2759,"name":"Data flow CMS A\/B test","buckets":500,"state":1,"published_on":"2022-12-05 00:14:43","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4542,"name":"show_page","choice":"control","weight":1},{"id":4543,"name":"show_page","choice":"variant","weight":1}],"segments":[]}]},"JS.Editor.TemplatesInspector":{"id":966,"name":"JS.Editor.TemplatesInspector","buckets":1000,"input":"cuid","url":"\/create\/customize\/","experiments":[{"id":2720,"name":"show_templates_inspector","buckets":1000,"state":3,"published_on":"2022-11-13 06:39:11","paused_on":"0000-00-00 00:00:00","stopped_on":"2023-01-03 09:03:15","parameters":[{"id":4498,"name":"show_templates_inspector","choice":"control","weight":1},{"id":4499,"name":"show_templates_inspector","choice":"variant","weight":0}],"segments":[]},{"id":2786,"name":"show_templates_inspector_2","buckets":1000,"state":3,"published_on":"2023-01-03 09:07:22","paused_on":"0000-00-00 00:00:00","stopped_on":"2023-01-08 04:18:17","parameters":[{"id":4579,"name":"show_templates_inspector","choice":"variant","weight":0},{"id":4580,"name":"show_templates_inspector","choice":"control","weight":1}],"segments":[]},{"id":2787,"name":"show_templates_inspector_200","buckets":200,"state":3,"published_on":"2023-01-08 04:19:44","paused_on":"0000-00-00 00:00:00","stopped_on":"2023-02-13 02:17:42","parameters":[{"id":4581,"name":"show_templates_inspector","choice":"variant","weight":1},{"id":4582,"name":"show_templates_inspector","choice":"control","weight":1}],"segments":[]},{"id":2788,"name":"show_templates_inspector_400","buckets":200,"state":3,"published_on":"2023-01-10 05:29:49","paused_on":"0000-00-00 00:00:00","stopped_on":"2023-02-13 02:17:33","parameters":[{"id":4583,"name":"show_templates_inspector","choice":"variant","weight":1},{"id":4584,"name":"show_templates_inspector","choice":"control","weight":1}],"segments":[]},{"id":2789,"name":"show_templates_inspector_1000","buckets":600,"state":3,"published_on":"2023-01-11 03:31:21","paused_on":"0000-00-00 00:00:00","stopped_on":"2023-02-13 02:17:25","parameters":[{"id":4585,"name":"show_templates_inspector","choice":"variant","weight":1},{"id":4586,"name":"show_templates_inspector","choice":"control","weight":1}],"segments":[]},{"id":2813,"name":"show_templates_inspector_clode on variant ","buckets":1000,"state":1,"published_on":"2023-02-13 02:18:30","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4631,"name":"show_templates_inspector","choice":"variant","weight":1}],"segments":[]}]},"JS.Settings.MembershipPlan.DisableAutoRenewRedesign":{"id":955,"name":"JS.Settings.MembershipPlan.DisableAutoRenewRedesign","buckets":1000,"input":"cuid","url":"\/settings\/billing\/membership_plan","experiments":[{"id":2697,"name":"Show redesigned Disable auto renew modal","buckets":200,"state":2,"published_on":"2022-11-01 15:35:37","paused_on":"2023-02-17 13:15:10","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4460,"name":"disable_auto_renew_redesign","choice":"control","weight":1},{"id":4461,"name":"disable_auto_renew_redesign","choice":"variant","weight":1}],"segments":[{"id":307,"type":"location","include":0,"values":["DE"]}]}]},"JS.VM.InviteInEmptyState":{"id":943,"name":"JS.VM.InviteInEmptyState","buckets":1000,"input":"cuid","url":"\/manage\/videos","experiments":[{"id":2656,"name":"Invite in Empty State Rollout to 10%","buckets":100,"state":1,"published_on":"2022-10-20 12:40:52","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4391,"name":"invite_in_empty_state","choice":"control","weight":1},{"id":4392,"name":"invite_in_empty_state","choice":"variant1","weight":1}],"segments":[]},{"id":2700,"name":"Invite in Empty State Rollout to 100%","buckets":900,"state":3,"published_on":"2022-10-28 10:02:33","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-12-07 16:50:07","parameters":[{"id":4464,"name":"invite_in_empty_state","choice":"control","weight":1},{"id":4465,"name":"invite_in_empty_state","choice":"variant1","weight":1}],"segments":[]}]},"JS.Upload.ShowQuotaWarningToFreeUsers":{"id":939,"name":"JS.Upload.ShowQuotaWarningToFreeUsers","buckets":1000,"input":"cuid","url":"\/upload\/videos","experiments":[{"id":2649,"name":"* Show quota warning to Free users on upload page","buckets":100,"state":3,"published_on":"2022-09-30 12:28:32","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-10-05 16:23:41","parameters":[{"id":4381,"name":"quota_warning_free_users","choice":"control","weight":1},{"id":4382,"name":"quota_warning_free_users","choice":"variant","weight":1}],"segments":[]},{"id":2655,"name":"+40% - Show quota warning to Free users on upload page","buckets":400,"state":3,"published_on":"2022-10-03 11:45:40","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-10-05 16:23:47","parameters":[{"id":4389,"name":"quota_warning_free_users","choice":"control","weight":1},{"id":4390,"name":"quota_warning_free_users","choice":"variant","weight":1}],"segments":[]},{"id":2660,"name":"50% - Show quota warning to Free users on upload page","buckets":500,"state":1,"published_on":"2022-10-05 16:23:34","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4400,"name":"quota_warning_free_users","choice":"control","weight":1},{"id":4401,"name":"quota_warning_free_users","choice":"variant","weight":1}],"segments":[]},{"id":2703,"name":"+50% - Show quota warning to Free users on upload page","buckets":500,"state":1,"published_on":"2022-10-31 13:03:52","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4470,"name":"quota_warning_free_users","choice":"control","weight":1},{"id":4471,"name":"quota_warning_free_users","choice":"variant","weight":1}],"segments":[]}]},"JS.AVS.SunsetAVSPrivacy":{"id":932,"name":"JS.AVS.SunsetAVSPrivacy","buckets":1000,"input":"cuid","url":"\/manage\/:clipId\/advanced","experiments":[{"id":2644,"name":"AVS Privacy Migration","buckets":100,"state":3,"published_on":"2022-09-30 10:24:14","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-10-24 11:21:54","parameters":[{"id":4372,"name":"migrate_privacy_svv","choice":"control","weight":1},{"id":4373,"name":"migrate_privacy_svv","choice":"variant","weight":1}],"segments":[]},{"id":2692,"name":"100% ramp - AVS Privacy Migration","buckets":900,"state":1,"published_on":"2022-10-24 11:21:49","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4451,"name":"migrate_privacy_svv","choice":"control","weight":1},{"id":4452,"name":"migrate_privacy_svv","choice":"variant","weight":1}],"segments":[]}]},"JS.Editor.MediaInspector":{"id":928,"name":"JS.Editor.MediaInspector","buckets":1000,"input":"cuid","url":"\/create\/customize\/","experiments":[{"id":2622,"name":"show_media_inspector (100)","buckets":100,"state":3,"published_on":"2022-09-18 13:09:32","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-09-21 06:25:45","parameters":[{"id":4334,"name":"show_media_inspector","choice":"control","weight":1}],"segments":[]},{"id":2628,"name":"show_media_inspector (200)","buckets":200,"state":3,"published_on":"2022-09-21 06:26:40","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-09-29 03:17:57","parameters":[{"id":4345,"name":"show_media_inspector","choice":"control","weight":1},{"id":4346,"name":"show_media_inspector","choice":"variant","weight":1}],"segments":[]},{"id":2706,"name":"show_media_inspector (200)new","buckets":200,"state":3,"published_on":"2022-11-02 05:02:37","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-11-27 06:05:38","parameters":[{"id":4476,"name":"show_media_inspector","choice":"control","weight":1},{"id":4477,"name":"show_media_inspector","choice":"variant","weight":1}],"segments":[]},{"id":2718,"name":"show_media_inspector (800)new","buckets":800,"state":3,"published_on":"2022-11-10 07:42:49","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-11-27 06:05:32","parameters":[{"id":4493,"name":"show_media_inspector","choice":"control","weight":1},{"id":4494,"name":"show_media_inspector","choice":"variant","weight":1}],"segments":[]},{"id":2746,"name":"show_media_inspector (variant) ","buckets":1000,"state":1,"published_on":"2022-11-27 06:06:31","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4527,"name":"show_media_inspector","choice":"variant","weight":1}],"segments":[]},{"id":2785,"name":"show_media_inspector_new2","buckets":1000,"state":1,"published_on":"2022-12-28 04:31:36","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4577,"name":"show_media_inspector","choice":"control","weight":0},{"id":4578,"name":"show_media_inspector","choice":"variant","weight":1}],"segments":[]}]},"JS.RecordExtension.LandingPageNonChromeCallToSDK":{"id":923,"name":"JS.RecordExtension.LandingPageNonChromeCallToSDK","buckets":1000,"input":"vuid","url":"\/features\/screen-recorder","experiments":[{"id":2600,"name":"CallToSDK","buckets":1000,"state":3,"published_on":"2022-09-22 09:42:21","paused_on":"2022-10-03 09:47:11","stopped_on":"2022-10-03 09:50:56","parameters":[{"id":4295,"name":"landing_non_chrome_to_sdk","choice":"control","weight":0},{"id":4296,"name":"landing_non_chrome_to_sdk","choice":"variant","weight":1}],"segments":[]},{"id":2654,"name":"CallToSDK - prod","buckets":1000,"state":1,"published_on":"2022-10-03 09:52:09","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4387,"name":"landing_non_chrome_to_sdk","choice":"control","weight":1},{"id":4388,"name":"landing_non_chrome_to_sdk","choice":"variant","weight":1}],"segments":[]}]},"JS.RecordExtension.DirectToSVV":{"id":922,"name":"JS.RecordExtension.DirectToSVV","buckets":1000,"input":"vuid","url":"\/","experiments":[{"id":2599,"name":"DTS1","buckets":1000,"state":3,"published_on":"2022-09-09 04:37:29","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-09-16 02:41:37","parameters":[{"id":4294,"name":"should_direct_to_svv","choice":"variant","weight":1}],"segments":[]},{"id":2619,"name":"* DTS1_2","buckets":1000,"state":3,"published_on":"2022-09-16 02:43:05","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-09-16 02:52:55","parameters":[{"id":4328,"name":"should_direct_to_svv","choice":"variant","weight":0}],"segments":[]},{"id":2620,"name":"DTS2","buckets":1000,"state":3,"published_on":"2022-09-16 02:53:44","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-09-26 12:09:11","parameters":[{"id":4329,"name":"should_direct_to_svv","choice":"variant","weight":0},{"id":4330,"name":"should_direct_to_svv","choice":"control","weight":1}],"segments":[]},{"id":2640,"name":"Direct-to-SVV","buckets":1000,"state":3,"published_on":"2022-09-26 12:12:44","paused_on":"0000-00-00 00:00:00","stopped_on":"2023-02-08 13:44:23","parameters":[{"id":4364,"name":"should_direct_to_svv","choice":"variant","weight":1},{"id":4365,"name":"should_direct_to_svv","choice":"control","weight":1}],"segments":[]},{"id":2685,"name":"Dirtect_to_SVV","buckets":1000,"state":3,"published_on":"2022-10-19 07:33:44","paused_on":"0000-00-00 00:00:00","stopped_on":"2023-02-08 13:44:17","parameters":[{"id":4442,"name":"should_direct_to_svv","choice":"variant","weight":1},{"id":4443,"name":"should_direct_to_svv","choice":"control","weight":1}],"segments":[]},{"id":2806,"name":"DTS_6","buckets":1000,"state":1,"published_on":"2023-02-13 11:32:46","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4623,"name":"should_direct_to_svv","choice":"variant","weight":1},{"id":4624,"name":"should_direct_to_svv","choice":"control","weight":1}],"segments":[]}]},"JS.RecordExtension.OverlayIntegrationsSeptember":{"id":921,"name":"JS.RecordExtension.OverlayIntegrationsSeptember","buckets":1000,"input":"vuid","url":"\/","experiments":[{"id":2590,"name":"OIS1","buckets":1000,"state":3,"published_on":"2022-09-06 06:55:00","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-09-12 08:09:14","parameters":[{"id":4287,"name":"are_overlay_integrations_enabled","choice":"variant","weight":1}],"segments":[]},{"id":2634,"name":"Integrations set v3","buckets":1000,"state":1,"published_on":"2022-09-22 08:02:24","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4355,"name":"are_overlay_integrations_enabled","choice":"control","weight":1},{"id":4356,"name":"are_overlay_integrations_enabled","choice":"variant","weight":1}],"segments":[]}]},"JS.SVV.Chapters":{"id":920,"name":"JS.SVV.Chapters","buckets":1000,"input":"cuid","url":"\/manage\/videos","experiments":[{"id":2581,"name":"SVV Chapters Rollout 10%","buckets":100,"state":1,"published_on":"2022-10-12 11:36:45","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4277,"name":"svv_chapter_rollout","choice":"variant","weight":1}],"segments":[]},{"id":2674,"name":"SVV Chapters Rollout 40%","buckets":300,"state":1,"published_on":"2022-10-13 07:27:04","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4424,"name":"svv_chapter_rollout","choice":"variant","weight":1}],"segments":[]},{"id":2676,"name":"SVV Chapters Rollout 50%","buckets":100,"state":1,"published_on":"2022-10-14 11:58:13","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4427,"name":"svv_chapter_rollout","choice":"variant","weight":1}],"segments":[]},{"id":2680,"name":"SVV Chapters Rollout 75%","buckets":250,"state":1,"published_on":"2022-10-17 10:53:59","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4436,"name":"svv_chapter_rollout","choice":"variant","weight":1}],"segments":[]},{"id":2682,"name":"SVV Chapters Rollout 100%","buckets":250,"state":1,"published_on":"2022-10-17 12:14:23","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4437,"name":"svv_chapter_rollout","choice":"variant","weight":1}],"segments":[]},{"id":2691,"name":"SVV Chapters Rollout 100% (2nd)","buckets":250,"state":1,"published_on":"2022-10-21 12:22:45","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4450,"name":"svv_chapter_rollout","choice":"variant","weight":1}],"segments":[]}]},"JS.Settings.MembershipPlan.ShowContactSupportLink":{"id":918,"name":"JS.Settings.MembershipPlan.ShowContactSupportLink","buckets":1000,"input":"cuid","url":"\/settings\/billing\/membership_plan","experiments":[{"id":2621,"name":"Offer a downgrade option","buckets":1000,"state":3,"published_on":"2022-09-22 07:54:02","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-09-22 07:54:32","parameters":[{"id":4331,"name":"ab_show_contact_support_link","choice":"control","weight":1},{"id":4332,"name":"ab_show_contact_support_link","choice":"variant","weight":1}],"segments":[]},{"id":2633,"name":"* Offer a downgrade option","buckets":200,"state":3,"published_on":"2022-09-22 07:54:56","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-10-28 11:46:25","parameters":[{"id":4353,"name":"ab_show_contact_support_link","choice":"control","weight":1},{"id":4354,"name":"ab_show_contact_support_link","choice":"variant","weight":1}],"segments":[]},{"id":2701,"name":"Downgrade CTA","buckets":200,"state":1,"published_on":"2022-10-28 11:47:03","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4466,"name":"show_contact_support_link","choice":"control","weight":1},{"id":4467,"name":"show_contact_support_link","choice":"variant","weight":1}],"segments":[]}]},"JS.Editor.hideStyles":{"id":915,"name":"JS.Editor.hideStyles","buckets":1000,"input":"cuid","url":"\/create\/customize\/","experiments":[{"id":2560,"name":"hideStyles","buckets":100,"state":3,"published_on":"2022-08-14 02:50:11","paused_on":"0000-00-00 00:00:00","stopped_on":"2023-02-16 06:52:36","parameters":[{"id":4246,"name":"hide_styles","choice":"variant","weight":1},{"id":4247,"name":"hide_styles","choice":"control","weight":1}],"segments":[]},{"id":2563,"name":"hideStyles 200","buckets":100,"state":3,"published_on":"2022-08-14 13:02:46","paused_on":"0000-00-00 00:00:00","stopped_on":"2023-02-16 06:52:46","parameters":[{"id":4251,"name":"hide_styles","choice":"variant","weight":1},{"id":4252,"name":"hide_styles","choice":"control","weight":1}],"segments":[]},{"id":2564,"name":"hideStyles 500","buckets":300,"state":3,"published_on":"2022-09-06 03:06:41","paused_on":"0000-00-00 00:00:00","stopped_on":"2023-02-16 06:52:54","parameters":[{"id":4253,"name":"hide_styles","choice":"variant","weight":1},{"id":4254,"name":"hide_styles","choice":"control","weight":1}],"segments":[]},{"id":2572,"name":"hideStyles 1000","buckets":500,"state":1,"published_on":"2022-09-06 05:58:14","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4265,"name":"hide_styles","choice":"variant","weight":1},{"id":4266,"name":"hide_styles","choice":"control","weight":1}],"segments":[]}]},"JS.Editor.TranscriptionVideoEditor":{"id":911,"name":"JS.Editor.TranscriptionVideoEditor","buckets":1000,"input":"cuid","url":"\/manage\/videos","experiments":[{"id":2547,"name":"transcription_video_editor","buckets":1,"state":1,"published_on":"2022-09-28 07:00:56","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4220,"name":"transcription_video_editor","choice":"variant","weight":1},{"id":4221,"name":"transcription_video_editor","choice":"control","weight":1000000000}],"segments":[]},{"id":2778,"name":"transcription_video_editor_release","buckets":999,"state":1,"published_on":"2022-12-15 05:01:21","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4571,"name":"transcription_video_editor","choice":"variant","weight":1},{"id":4572,"name":"transcription_video_editor","choice":"control","weight":0}],"segments":[]}]},"JS.SVV.TagVideosOnDownload":{"id":910,"name":"JS.SVV.TagVideosOnDownload","buckets":1000,"input":"vuid","url":"*","experiments":[{"id":2536,"name":"Tag videos on download to 25%","buckets":500,"state":3,"published_on":"2022-07-25 09:49:55","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-10-11 04:52:39","parameters":[{"id":4204,"name":"tag_videos_on_download","choice":"true","weight":1},{"id":4205,"name":"tag_videos_on_download","choice":"false","weight":1}],"segments":[]},{"id":2669,"name":"Tag videos on download to 50%","buckets":1000,"state":3,"published_on":"2022-10-11 04:53:31","paused_on":"2022-10-31 08:56:58","stopped_on":"2022-10-31 08:57:08","parameters":[{"id":4415,"name":"tag_videos_on_download","choice":"true","weight":1},{"id":4416,"name":"tag_videos_on_download","choice":"false","weight":1}],"segments":[]},{"id":2702,"name":"Tag videos on download to 75%","buckets":1000,"state":3,"published_on":"2022-10-31 08:57:39","paused_on":"2023-01-19 09:37:22","stopped_on":"2023-01-19 09:37:31","parameters":[{"id":4468,"name":"tag_videos_on_download","choice":"true","weight":3},{"id":4469,"name":"tag_videos_on_download","choice":"false","weight":1}],"segments":[]},{"id":2793,"name":"* Tag videos on download to 100%","buckets":1000,"state":1,"published_on":"2023-01-19 09:37:58","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4595,"name":"tag_videos_on_download","choice":"true","weight":1},{"id":4596,"name":"tag_videos_on_download","choice":"false","weight":0}],"segments":[]}]},"JS.Editor.dragonfly":{"id":908,"name":"JS.Editor.dragonfly","buckets":1000,"input":"cuid","url":"\/manage\/videos\/create\/customize","experiments":[{"id":2532,"name":"show_dragonfly","buckets":1000,"state":3,"published_on":"2022-07-26 08:53:25","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-07-28 02:22:23","parameters":[{"id":4197,"name":"show_dragonfly","choice":"variant","weight":1},{"id":4198,"name":"show_dragonfly","choice":"control","weight":1}],"segments":[]},{"id":2544,"name":"show_dragonfly 100%","buckets":1000,"state":1,"published_on":"2022-07-28 02:24:08","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4215,"name":"show_dragonfly","choice":"variant","weight":1}],"segments":[]}]},"JS.Editor.showToolbar":{"id":897,"name":"JS.Editor.showToolbar","buckets":1000,"input":"cuid","url":"vimeo.com\/create\/customize","experiments":[{"id":2514,"name":"Show tool bar (10%)","buckets":100,"state":3,"published_on":"2022-07-11 15:16:45","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-07-24 03:58:18","parameters":[{"id":4167,"name":"show_toolbar","choice":"control","weight":1},{"id":4168,"name":"show_toolbar","choice":"variant","weight":1}],"segments":[]},{"id":2516,"name":"Show tool bar (90%)","buckets":900,"state":3,"published_on":"2022-07-13 04:19:20","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-07-24 03:58:28","parameters":[{"id":4171,"name":"show_toolbar","choice":"control","weight":1},{"id":4172,"name":"show_toolbar","choice":"variant","weight":1}],"segments":[]},{"id":2535,"name":"Show tool bar (close test)","buckets":1000,"state":1,"published_on":"2022-07-24 03:59:28","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4203,"name":"show_toolbar","choice":"variant","weight":1}],"segments":[]}]},"JS.Settings.Cancellation.Germany":{"id":895,"name":"JS.Settings.Cancellation.Germany","buckets":1000,"input":"cuid","url":"\/settings\/billing\/membership_plan","experiments":[{"id":2487,"name":"Germany Region","buckets":1000,"state":1,"published_on":"2022-07-01 09:38:18","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4129,"name":"cancel_in_survey","choice":"control","weight":0},{"id":4130,"name":"cancel_in_survey","choice":"variant","weight":1}],"segments":[{"id":286,"type":"location","include":1,"values":["DE"]}]}]},"JS.Create.Record":{"id":890,"name":"JS.Create.Record","buckets":1000,"input":"cuid","url":"\/create\/templates","experiments":[{"id":2474,"name":"CreateRecord","buckets":200,"state":3,"published_on":"2022-06-21 09:44:03","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-07-17 10:22:20","parameters":[{"id":4110,"name":"create_record_test","choice":"control","weight":1},{"id":4111,"name":"create_record_test","choice":"variant","weight":1}],"segments":[]},{"id":2481,"name":"CreateRecord 100%","buckets":800,"state":3,"published_on":"2022-06-27 05:26:22","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-07-17 10:22:28","parameters":[{"id":4120,"name":"create_record_test","choice":" control","weight":1},{"id":4121,"name":"create_record_test","choice":" variant","weight":1}],"segments":[]},{"id":2524,"name":"Create_Record 100%","buckets":1000,"state":1,"published_on":"2022-07-17 10:24:30","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4184,"name":"create_record_test","choice":"variant","weight":1}],"segments":[]}]},"JS.RecordExtension.Notifications":{"id":883,"name":"JS.RecordExtension.Notifications","buckets":1000,"input":"vuid","url":"\/","experiments":[{"id":2470,"name":"* * Notifications V1 3","buckets":1000,"state":3,"published_on":"2022-06-19 16:01:57","paused_on":"2022-06-19 16:03:30","stopped_on":"2022-06-19 16:03:55","parameters":[{"id":4102,"name":"show_notifications","choice":"variant","weight":1},{"id":4103,"name":"show_notifications","choice":"control","weight":0}],"segments":[]},{"id":2469,"name":"* Notifications V1 2","buckets":1000,"state":3,"published_on":"2022-06-19 16:04:06","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-06-19 16:10:54","parameters":[{"id":4100,"name":"show_notifications","choice":"variant","weight":0},{"id":4101,"name":"show_notifications","choice":"control","weight":1}],"segments":[]},{"id":2471,"name":"* * * Notifications V1 4","buckets":1000,"state":3,"published_on":"2022-06-19 16:11:36","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-06-23 04:29:15","parameters":[{"id":4104,"name":"show_notifications","choice":"variant","weight":1},{"id":4105,"name":"show_notifications","choice":"control","weight":0}],"segments":[]},{"id":2490,"name":"* * * * Notifications V1 5","buckets":1000,"state":3,"published_on":"2022-07-01 07:38:29","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-07-01 07:47:44","parameters":[{"id":4134,"name":"show_notifications","choice":"variant","weight":1},{"id":4135,"name":"show_notifications","choice":"control","weight":0}],"segments":[]},{"id":2459,"name":"Notifications V1","buckets":1000,"state":1,"published_on":"2022-07-06 10:22:48","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4090,"name":"show_notifications","choice":"variant","weight":1},{"id":4091,"name":"show_notifications","choice":"control","weight":1}],"segments":[]}]},"JS.LOHP.FullPageRedesign":{"id":882,"name":"JS.LOHP.FullPageRedesign","buckets":1000,"input":"vuid","url":"https:\/\/vimeo.com\/","experiments":[{"id":2456,"name":"Home page - New Version - All Users","buckets":1000,"state":3,"published_on":"2022-06-14 16:21:30","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-06-28 01:19:38","parameters":[{"id":4085,"name":"show_page","choice":"variant","weight":1}],"segments":[]},{"id":2483,"name":"Home page Mobile Test","buckets":1000,"state":3,"published_on":"2022-06-28 01:20:42","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-08-12 09:43:58","parameters":[{"id":4123,"name":"show_page","choice":"control","weight":1},{"id":4124,"name":"show_page","choice":"variant","weight":1}],"segments":[]},{"id":2561,"name":"Variant to 100% users","buckets":1000,"state":1,"published_on":"2022-08-12 09:45:07","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4248,"name":"show_page","choice":"variant","weight":1}],"segments":[]}]},"JS.RecordExtension.Checklist":{"id":868,"name":"JS.RecordExtension.Checklist","buckets":1000,"input":"vuid","url":"\/","experiments":[{"id":2393,"name":"CLS1","buckets":1000,"state":3,"published_on":"2022-05-24 06:11:07","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-05-24 06:18:08","parameters":[{"id":3998,"name":"show_checklist","choice":"variant","weight":1},{"id":3999,"name":"show_checklist","choice":"control","weight":1}],"segments":[]},{"id":2415,"name":"* CLS1","buckets":1000,"state":3,"published_on":"2022-05-24 06:18:57","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-05-24 06:52:27","parameters":[{"id":4028,"name":"show_checklist","choice":"variant","weight":1}],"segments":[]},{"id":2416,"name":"* * CLS1","buckets":1000,"state":3,"published_on":"2022-05-24 06:53:01","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-05-30 09:42:21","parameters":[{"id":4029,"name":"show_checklist","choice":"variant","weight":1}],"segments":[]},{"id":2436,"name":"* * * CLS1","buckets":1000,"state":3,"published_on":"2022-05-31 08:40:44","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-06-01 04:39:01","parameters":[{"id":4055,"name":"show_checklist","choice":"variant","weight":1}],"segments":[]},{"id":2442,"name":"Checklist v1","buckets":500,"state":3,"published_on":"2022-06-07 05:27:24","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-07-29 10:15:31","parameters":[{"id":4066,"name":"show_checklist","choice":"variant","weight":1},{"id":4067,"name":"show_checklist","choice":"control","weight":1}],"segments":[]},{"id":2546,"name":"Checklist v1 - rollout","buckets":1000,"state":1,"published_on":"2022-07-29 10:16:00","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4219,"name":"show_checklist","choice":"variant","weight":1}],"segments":[]}]},"JS.SVV.Omnisearch":{"id":864,"name":"JS.SVV.Omnisearch","buckets":1000,"input":"cuid","url":"\/manage\/videos\/:videoId, \/:videoId","experiments":[{"id":2384,"name":"Omnisearch in SVV","buckets":1000,"state":3,"published_on":"2022-05-24 13:45:47","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-12-14 17:10:32","parameters":[{"id":3983,"name":"show_omnisearch","choice":"variant","weight":1},{"id":3984,"name":"show_omnisearch","choice":"control","weight":1}],"segments":[]},{"id":2776,"name":"100% roll - Omnisearch in SVV","buckets":1000,"state":1,"published_on":"2022-12-14 17:11:00","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4570,"name":"show_omnisearch","choice":"variant","weight":1}],"segments":[]}]},"JS.RecordExtension.SignUpWall":{"id":849,"name":"JS.RecordExtension.SignUpWall","buckets":1000,"input":"vuid","url":"\/","experiments":[{"id":2325,"name":"Record Extension SignUp Wall","buckets":0,"state":3,"published_on":"2022-04-28 08:53:50","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-04-28 08:55:56","parameters":[{"id":3912,"name":"force_sign_up_wall","choice":"variant","weight":1},{"id":3913,"name":"force_sign_up_wall","choice":"control","weight":1}],"segments":[]},{"id":2352,"name":"* Record Extension SignUp Wall","buckets":1000,"state":3,"published_on":"2022-04-28 08:56:29","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-04-29 10:37:52","parameters":[{"id":3939,"name":"force_sign_up_wall","choice":"variant","weight":1},{"id":3940,"name":"force_sign_up_wall","choice":"control","weight":0}],"segments":[]},{"id":2439,"name":"Record Extension SignUp Wall - prod","buckets":500,"state":3,"published_on":"2022-06-07 05:20:10","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-06-29 11:03:57","parameters":[{"id":4060,"name":"force_sign_up_wall","choice":"variant","weight":1},{"id":4061,"name":"force_sign_up_wall","choice":"control","weight":1}],"segments":[]},{"id":2486,"name":"Record Extension SignUp Wall \u043c2 - prod","buckets":1000,"state":3,"published_on":"2022-06-29 11:06:04","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-07-04 11:45:47","parameters":[{"id":4127,"name":"force_sign_up_wall","choice":"variant","weight":1},{"id":4128,"name":"force_sign_up_wall","choice":"control","weight":1}],"segments":[]},{"id":2500,"name":"Record Extension SignUp Wall v2 - prod","buckets":1000,"state":3,"published_on":"2022-07-06 10:25:18","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-08-09 08:02:41","parameters":[{"id":4147,"name":"force_sign_up_wall","choice":"variant","weight":1},{"id":4148,"name":"force_sign_up_wall","choice":"control","weight":1}],"segments":[]},{"id":2556,"name":"Record Extension SignUp Wall v2 - prod (A\/A\/B\/B)","buckets":1000,"state":3,"published_on":"2022-08-09 08:03:46","paused_on":"2022-08-09 08:03:57","stopped_on":"2022-08-09 08:04:57","parameters":[{"id":4237,"name":"force_sign_up_wall","choice":"variant","weight":1},{"id":4238,"name":"force_sign_up_wall","choice":"control","weight":1}],"segments":[]},{"id":2557,"name":"Record Extension SignUp Wall v2 - prod (A\/A\/B\/B) I","buckets":500,"state":3,"published_on":"2022-08-09 08:51:06","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-09-22 07:49:32","parameters":[{"id":4240,"name":"force_sign_up_wall","choice":"variant","weight":1},{"id":4241,"name":"force_sign_up_wall","choice":"control","weight":1}],"segments":[]},{"id":2558,"name":"Record Extension SignUp Wall v2 - prod (A\/A\/B\/B) II","buckets":500,"state":3,"published_on":"2022-08-09 08:51:12","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-09-22 07:49:27","parameters":[{"id":4242,"name":"force_sign_up_wall","choice":"variant","weight":1},{"id":4243,"name":"force_sign_up_wall","choice":"control","weight":1}],"segments":[]},{"id":2632,"name":"Record Extension SignUp Wall - Rollout","buckets":1000,"state":3,"published_on":"2022-09-22 07:50:08","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-09-22 08:51:51","parameters":[],"segments":[]},{"id":2635,"name":"* Record Extension SignUp Wall - Rollout","buckets":1000,"state":1,"published_on":"2022-09-22 08:52:14","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4357,"name":"force_sign_up_wall","choice":"variant","weight":1}],"segments":[]}]},"JS.VideoManager.LeftNewVideo.SkipEventCreationModal":{"id":837,"name":"JS.VideoManager.LeftNewVideo.SkipEventCreationModal","buckets":1000,"input":"cuid","url":"\/","experiments":[{"id":2283,"name":"Show OLE Deprecation Modal","buckets":100,"state":1,"published_on":"2022-04-12 12:07:50","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":3858,"name":"vm_skip_event_creation_modal","choice":"variant","weight":1},{"id":3859,"name":"vm_skip_event_creation_modal","choice":"control","weight":1}],"segments":[]},{"id":2285,"name":"* Show OLE Deprecation Modal","buckets":100,"state":1,"published_on":"2022-04-13 14:14:30","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":3861,"name":"vm_skip_event_creation_modal","choice":"variant","weight":1},{"id":3862,"name":"vm_skip_event_creation_modal","choice":"control","weight":1}],"segments":[]},{"id":2323,"name":"* * Show OLE Deprecation Modal","buckets":800,"state":1,"published_on":"2022-04-18 17:27:53","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":3908,"name":"vm_skip_event_creation_modal","choice":"variant","weight":1},{"id":3909,"name":"vm_skip_event_creation_modal","choice":"control","weight":1}],"segments":[]}]},"JS.Webinar.RegistrantCapForPremium":{"id":820,"name":"JS.Webinar.RegistrantCapForPremium","buckets":1000,"input":"vuid","url":"upgrade, checkout and marketing pages","experiments":[{"id":2243,"name":"Rollout to 10% traffic","buckets":100,"state":2,"published_on":"2022-06-01 05:27:17","paused_on":"2022-07-01 14:31:45","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":3803,"name":"show_premium_registrant_cap","choice":"control","weight":1},{"id":3804,"name":"show_premium_registrant_cap","choice":"variant","weight":1}],"segments":[]},{"id":2438,"name":"* Rollout to 40% traffic","buckets":400,"state":2,"published_on":"2022-06-06 11:14:01","paused_on":"2022-07-01 14:31:58","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4058,"name":"show_premium_registrant_cap","choice":"control","weight":1},{"id":4059,"name":"show_premium_registrant_cap","choice":"variant","weight":1}],"segments":[]},{"id":2444,"name":"* * Rollout to 50% traffic","buckets":500,"state":2,"published_on":"2022-06-08 00:05:31","paused_on":"2022-07-01 14:32:04","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4069,"name":"show_premium_registrant_cap","choice":"control","weight":1},{"id":4070,"name":"show_premium_registrant_cap","choice":"variant","weight":1}],"segments":[]}]},"JS.Editor.BlankEditor":{"id":811,"name":"JS.Editor.BlankEditor","buckets":1000,"input":"cuid","url":"https:\/\/vimeo.com\/create\/customize","experiments":[{"id":2176,"name":"BlankEditor","buckets":100,"state":3,"published_on":"2022-04-27 04:31:24","paused_on":"2022-07-04 00:58:53","stopped_on":"2022-07-04 01:00:04","parameters":[{"id":3728,"name":"show_blank_editor","choice":"control","weight":1},{"id":3729,"name":"show_blank_editor","choice":"variant","weight":1}],"segments":[]},{"id":2346,"name":"BlankEditor (20%)","buckets":100,"state":3,"published_on":"2022-04-27 04:38:05","paused_on":"2022-07-04 00:58:48","stopped_on":"2022-07-04 00:59:58","parameters":[{"id":3931,"name":"show_blank_editor","choice":"control","weight":1},{"id":3932,"name":"show_blank_editor","choice":"variant","weight":1}],"segments":[]},{"id":2386,"name":"BlankEditor (100%)","buckets":800,"state":3,"published_on":"2022-05-12 05:31:09","paused_on":"2022-07-04 00:58:40","stopped_on":"2022-07-04 00:59:52","parameters":[{"id":3986,"name":"show_blank_editor","choice":"control","weight":1},{"id":3987,"name":"show_blank_editor","choice":"variant","weight":1}],"segments":[]},{"id":2491,"name":"BlankEditor (1000%)","buckets":1000,"state":1,"published_on":"2022-07-04 01:00:59","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4136,"name":"show_blank_editor","choice":"variant","weight":1}],"segments":[]}]},"JS.Editor.MasksGradualRelease":{"id":807,"name":"JS.Editor.MasksGradualRelease","buckets":1000,"input":"cuid","url":"https:\/\/vimeo.com\/create\/customize","experiments":[{"id":2164,"name":"MasksGradualRelease","buckets":200,"state":3,"published_on":"2022-03-30 02:29:07","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-04-26 08:08:43","parameters":[{"id":3707,"name":"support_masks","choice":"variant","weight":1},{"id":3708,"name":"support_masks","choice":"control","weight":1}],"segments":[]},{"id":2268,"name":"_MasksGradualRelease","buckets":800,"state":3,"published_on":"2022-04-05 08:41:27","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-04-26 08:08:33","parameters":[{"id":3833,"name":"support_masks","choice":"variant","weight":1},{"id":3834,"name":"support_masks","choice":"control","weight":1}],"segments":[]},{"id":2339,"name":"___MasksGradualRelease","buckets":1000,"state":1,"published_on":"2022-04-26 14:57:15","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":3928,"name":"support_masks","choice":"variant","weight":1}],"segments":[]}]},"JS.Editor.PreviewWithoutSave":{"id":787,"name":"JS.Editor.PreviewWithoutSave","buckets":1000,"input":"cuid","url":"vimeo.com\/create\/customize","experiments":[{"id":2137,"name":"Show preview modal","buckets":10,"state":3,"published_on":"2022-04-27 04:21:52","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-05-31 04:14:53","parameters":[{"id":3656,"name":"enable_preview_modal","choice":"control","weight":1},{"id":3657,"name":"enable_preview_modal","choice":"variant","weight":1}],"segments":[]},{"id":2347,"name":"Show preview modal (205)","buckets":190,"state":3,"published_on":"2022-04-27 04:39:52","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-05-31 04:15:00","parameters":[{"id":3933,"name":"enable_preview_modal","choice":"control","weight":1},{"id":3934,"name":"enable_preview_modal","choice":"variant","weight":1}],"segments":[]},{"id":2355,"name":"Show preview modal (40%)","buckets":200,"state":3,"published_on":"2022-05-02 07:05:49","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-05-31 04:15:08","parameters":[{"id":3944,"name":"enable_preview_modal","choice":"control","weight":1},{"id":3945,"name":"enable_preview_modal","choice":"variant","weight":1}],"segments":[]},{"id":2359,"name":"Show preview modal (100%)","buckets":600,"state":3,"published_on":"2022-05-03 11:22:59","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-05-31 04:15:40","parameters":[{"id":3952,"name":"enable_preview_modal","choice":"control","weight":1},{"id":3953,"name":"enable_preview_modal","choice":"variant","weight":1}],"segments":[]},{"id":2435,"name":"* Show preview modal (100%)","buckets":1000,"state":1,"published_on":"2022-05-31 04:21:58","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4054,"name":"enable_preview_modal","choice":"variant","weight":1}],"segments":[]}]},"JS.ClipPageEUBlock":{"id":672,"name":"JS.ClipPageEUBlock","buckets":1000,"input":"vuid","url":"\/","experiments":[{"id":1810,"name":"Initial sampling of OFCOM population","buckets":100,"state":3,"published_on":"2021-07-07 15:18:39","paused_on":"0000-00-00 00:00:00","stopped_on":"2021-08-10 15:04:14","parameters":[{"id":3149,"name":"should_block","choice":"control","weight":1},{"id":3150,"name":"should_block","choice":"variant","weight":1}],"segments":[]},{"id":1866,"name":"90% of EU\/UK users see blocker","buckets":900,"state":1,"published_on":"2021-08-16 11:19:56","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":3227,"name":"should_block","choice":"control","weight":1}],"segments":[]},{"id":1867,"name":"10% Experiment","buckets":100,"state":3,"published_on":"2021-08-16 11:20:01","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-04-06 16:39:46","parameters":[{"id":3228,"name":"should_block","choice":"control","weight":1},{"id":3229,"name":"should_block","choice":"variant","weight":1}],"segments":[]},{"id":2273,"name":"the remaining 10% of EU\/UK users see blocker","buckets":100,"state":1,"published_on":"2022-04-06 16:40:07","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":3841,"name":"should_block","choice":"control","weight":1}],"segments":[]}]},"JS.Checkout.ApplePayDefaultSelected":{"id":613,"name":"JS.Checkout.ApplePayDefaultSelected","buckets":1000,"input":"vuid","url":"pro, premium, plus, business checkout pages","experiments":[{"id":1618,"name":"Apple pay selected by default","buckets":100,"state":1,"published_on":"2021-03-30 11:15:26","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":2827,"name":"select_apple_pay_by_default","choice":"control","weight":1},{"id":2828,"name":"select_apple_pay_by_default","choice":"variant","weight":1}],"segments":[]},{"id":1699,"name":"+90% - Apple pay selected by default","buckets":900,"state":1,"published_on":"2021-04-05 17:38:05","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":2958,"name":"select_apple_pay_by_default","choice":"control","weight":1},{"id":2959,"name":"select_apple_pay_by_default","choice":"variant","weight":1}],"segments":[]}]},"JS.Review.RegisterToComment":{"id":601,"name":"JS.Review.RegisterToComment","buckets":1000,"input":"vuid","url":"\/:username\/review\/:clipId\/:clipHash","experiments":[{"id":1589,"name":"Register to Comment 10%","buckets":100,"state":3,"published_on":"2021-02-11 11:18:41","paused_on":"0000-00-00 00:00:00","stopped_on":"2021-03-01 11:51:10","parameters":[{"id":2787,"name":"require_registration","choice":"true","weight":1}],"segments":[]},{"id":1623,"name":"Register to Comment #2","buckets":100,"state":1,"published_on":"2021-03-01 11:53:55","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":2837,"name":"require_registration","choice":"true","weight":1},{"id":2838,"name":"require_registration","choice":"false","weight":1}],"segments":[]}]}};</script><script>
+(function() {
+    window._gtm = [{"language":"en","user_status":"logged_out","user_type":"none","ga_universal_id":"UA-76641-8","comscore_site_id":10348289}];
+
+        var gdprCookie = (document.cookie.match(/^(?:.*;)?\s*vimeo_gdpr_optin\s*=\s*([^;]+)(?:.*)?$/)||[,null])[1];
+    if (gdprCookie === '-1') {
+        return;
+    }
+
+        window._gtm.push({
+        'vuid': document.cookie.replace(/(?:(?:^|.*;\s*)vuid\s*\=\s*([^;]*).*$)|^.*$/, "$1"),
+        'gtm.start': new Date().getTime(),
+        'event': 'gtm.js'
+    });
+        
+    var activeGroups = window.OnetrustActiveGroups || '';
+    var gtms = document.createElement('script'),
+        node;
+    gtms.async = true;
+    gtms.type = activeGroups.indexOf("C0002") === -1 ? 'text/plain' : 'text/javascript';
+    gtms.className = "optanon-category-C0002";
+    gtms.src = '//www.googletagmanager.com/gtm.js?id=GTM-RBKK&l=_gtm';
+    node = document.head;
+    node.appendChild(gtms);
+})();
+</script>
+<script>
+    var googletag = googletag || {},
+        gptadslots = [],
+        language,
+        has_uploaded,
+        cohort;
+    googletag.cmd = googletag.cmd || [];
+
+    (function() {
+        var gdprCookie = (document.cookie.match(/^(?:.*;)?\s*vimeo_gdpr_optin\s*=\s*([^;]+)(?:.*)?$/)||[,null])[1];
+        if (gdprCookie === '-1') {
+            return;
+        }
+        var activeGroups = window.OnetrustActiveGroups || '';
+        var gads = document.createElement('script'),
+            useSSL = 'https:' == document.location.protocol,
+            node;
+        gads.async = true;
+        gads.type = activeGroups.indexOf("C0002") === -1 ? 'text/plain' : 'text/javascript';
+        gads.className = "optanon-category-C0002";
+        gads.src = (useSSL ? 'https:' : 'http:') + '//www.googletagservices.com/tag/js/gpt.js';
+        node = document.head;
+        node.appendChild(gads);
+    })();
+
+    googletag.cmd.push(function() {
+        
+                    language = document.cookie.replace(/(?:(?:^|.*;\s*)language\s*\=\s*([^;]*).*$)|^.*$/, "$1");
+            has_uploaded = (document.cookie.replace(/(?:(?:^|.*;\s*)has_uploaded\s*\=\s*([^;]*).*$)|^.*$/, "$1")) ? 'Y' : 'N';
+            consent = (document.cookie.replace(/(?:(?:^|.*;\s*)vimeo_gdpr_optin\s*\=\s*([^;]*).*$)|^.*$/, "$1")) === '-1' ? 1 : 0;
+            cohort = 'A';
+        
+        googletag.pubads().setTargeting('language', [language]);
+        googletag.pubads().setTargeting('is_uploader', [has_uploaded]);
+        googletag.pubads().setTargeting('cohort', [cohort]);
+        googletag.pubads().setTargeting('cohort_a', [(cohort === 'A') ? 'Y' : 'N']);
+        googletag.pubads().setTargeting('cohort_b', [(cohort === 'B') ? 'Y' : 'N']);
+        googletag.pubads().setTargeting('product', ['']);
+        googletag.pubads().setTargeting('storage', ['N']);
+
+                googletag.pubads().setTargeting('sec', ['false']);
+
+        googletag.pubads().setTargeting('logged_in', ['false']);
+
+                googletag.pubads().setTargeting('rpv', (Math.floor(Math.random()*100)+1).toString());
+
+        googletag.pubads().setRequestNonPersonalizedAds(consent);
+        googletag.pubads().enableAsyncRendering();
+        googletag.pubads().disableInitialLoad();
+        googletag.enableServices();
+    });
+</script>
+<script type="text/javascript">
+if(window&&window.fetch&&-1===window.fetch.toString().indexOf("Profiling")&&-1!==document.cookie.indexOf("logs=1")){const e=window.fetch,n=["api.vimeo.com","vimeo.com"];window.fetch=(async(...t)=>{let[i,o]=t;const d=new URL(i,document.baseURI).host;return o&&o.headers&&n.includes(d)&&(o.headers.Profiling=1),await e(i,o)})}
+</script>
+<script>var playerAssetUrls = {"barebone_js":"https:\/\/f.vimeocdn.com\/p\/4.23.4\/js\/barebone.js","chromeless_css":"https:\/\/f.vimeocdn.com\/p\/4.23.4\/css\/chromeless.css","chromeless_js":"https:\/\/f.vimeocdn.com\/p\/4.23.4\/js\/chromeless.js","js":"https:\/\/f.vimeocdn.com\/p\/4.23.4\/js\/player.js","css":"https:\/\/f.vimeocdn.com\/p\/4.23.4\/css\/player.css","player_url":"player.vimeo.com"};</script><script>var magistoResourceUrls = {"prodBundleUrl":"d3pvxrmcry8qui.cloudfront.net","devBundleUrl":"vimeo.magisto.com\/media\/editor\/dist","devLocalUrl":"https:\/\/localhost:8443\/dist","apiProdUrl":"vimeo.magisto.com","apiDevUrl":"vimeo.magisto.com"};</script><script>var activePromos = null;</script><script id="test-new-relic" data-nscript="beforeInteractive">if (window.newrelic) { try { window.newrelic.setCustomAttribute('page', '/recipient-page/[clipId]/[clipHash]'); var IGNORED_JS_ERRORS = [ 'ResizeObserver loop limit exceeded', 'ResizeObserver loop completed with undelivered notifications.', ]; window.newrelic.setErrorHandler(function (err) { if (IGNORED_JS_ERRORS.indexOf(err.message) !== -1) { return true; } return false; }); } catch (e) { console.warn(e); } }</script><noscript data-n-css=""></noscript><script defer="" nomodule="" src="./eleonore __ michael - middlebury, vt_files/polyfills-0d1b80a048d4787e.js" data-airgap-id="14"></script><script src="./eleonore __ michael - middlebury, vt_files/webpack-eb7d99a5a6a125cd.js" defer="" data-airgap-id="15"></script><script src="./eleonore __ michael - middlebury, vt_files/framework-475471f453230e9d.js" defer="" data-airgap-id="16"></script><script src="./eleonore __ michael - middlebury, vt_files/main-25f3a9cac17df26c.js" defer="" data-airgap-id="17"></script><script src="./eleonore __ michael - middlebury, vt_files/_app-f97df4df4f25a563.js" defer="" data-airgap-id="18"></script><script src="./eleonore __ michael - middlebury, vt_files/f1803fa6-299b0c40f4ba233d.js" defer="" data-airgap-id="19"></script><script src="./eleonore __ michael - middlebury, vt_files/96ca19b1-cbee24303cf5e74d.js" defer="" data-airgap-id="20"></script><script src="./eleonore __ michael - middlebury, vt_files/30731-0ea7e8ce248cfdf9.js" defer="" data-airgap-id="21"></script><script src="./eleonore __ michael - middlebury, vt_files/96930-e83e1b4db8388eae.js" defer="" data-airgap-id="22"></script><script src="./eleonore __ michael - middlebury, vt_files/33319-e478fd70f3222013.js" defer="" data-airgap-id="23"></script><script src="./eleonore __ michael - middlebury, vt_files/22839-626f18e2ba8a20c1.js" defer="" data-airgap-id="24"></script><script src="./eleonore __ michael - middlebury, vt_files/57819-fe89f9f13a405262.js" defer="" data-airgap-id="25"></script><script src="./eleonore __ michael - middlebury, vt_files/40174-b59af9ea22456846.js" defer="" data-airgap-id="26"></script><script src="./eleonore __ michael - middlebury, vt_files/16830-868cd66ab6f040e6.js" defer="" data-airgap-id="27"></script><script src="./eleonore __ michael - middlebury, vt_files/21329-f4f38ccaef3621d4.js" defer="" data-airgap-id="28"></script><script src="./eleonore __ michael - middlebury, vt_files/21187-ec7fd116394c4a7e.js" defer="" data-airgap-id="29"></script><script src="./eleonore __ michael - middlebury, vt_files/50757-e7e9928dc7cc7b01.js" defer="" data-airgap-id="30"></script><script src="./eleonore __ michael - middlebury, vt_files/98097-e82ba4887b09f13b.js" defer="" data-airgap-id="31"></script><script src="./eleonore __ michael - middlebury, vt_files/92444-54f84c71d5894680.js" defer="" data-airgap-id="32"></script><script src="./eleonore __ michael - middlebury, vt_files/60977-279abe55d03e1cd5.js" defer="" data-airgap-id="33"></script><script src="./eleonore __ michael - middlebury, vt_files/31210-87050a254e3db1fa.js" defer="" data-airgap-id="34"></script><script src="./eleonore __ michael - middlebury, vt_files/85393-7c88dd504f077398.js" defer="" data-airgap-id="35"></script><script src="./eleonore __ michael - middlebury, vt_files/79447-b45f325452ef9308.js" defer="" data-airgap-id="36"></script><script src="./eleonore __ michael - middlebury, vt_files/45182-980132df62f78971.js" defer="" data-airgap-id="37"></script><script src="./eleonore __ michael - middlebury, vt_files/61838-da725e9a4d8b19bc.js" defer="" data-airgap-id="38"></script><script src="./eleonore __ michael - middlebury, vt_files/75699-cd4263672943d965.js" defer="" data-airgap-id="39"></script><script src="./eleonore __ michael - middlebury, vt_files/90036-da93ad000541d8a4.js" defer="" data-airgap-id="40"></script><script src="./eleonore __ michael - middlebury, vt_files/82579-7a29f4dc27d6ee96.js" defer="" data-airgap-id="41"></script><script src="./eleonore __ michael - middlebury, vt_files/51586-1e75af6d1a97240c.js" defer="" data-airgap-id="42"></script><script src="./eleonore __ michael - middlebury, vt_files/30301-c777fa48dedc2fb8.js" defer="" data-airgap-id="43"></script><script src="./eleonore __ michael - middlebury, vt_files/42228-e8c99cb13e5f948e.js" defer="" data-airgap-id="44"></script><script src="./eleonore __ michael - middlebury, vt_files/1761-fd00f3f06fb2b4c1.js" defer="" data-airgap-id="45"></script><script src="./eleonore __ michael - middlebury, vt_files/84792-e7b1654615f6e888.js" defer="" data-airgap-id="46"></script><script src="./eleonore __ michael - middlebury, vt_files/84641-efe6966948b3dc69.js" defer="" data-airgap-id="47"></script><script src="./eleonore __ michael - middlebury, vt_files/19190-e5907612956d7c27.js" defer="" data-airgap-id="48"></script><script src="./eleonore __ michael - middlebury, vt_files/58519-8ad1ec27379954b0.js" defer="" data-airgap-id="49"></script><script src="./eleonore __ michael - middlebury, vt_files/53554-2854cf2a6a42551b.js" defer="" data-airgap-id="50"></script><script src="./eleonore __ michael - middlebury, vt_files/70472-3680a4835a4e7d32.js" defer="" data-airgap-id="51"></script><script src="./eleonore __ michael - middlebury, vt_files/46769-a702a7502e75a448.js" defer="" data-airgap-id="52"></script><script src="./eleonore __ michael - middlebury, vt_files/[clipHash]-2ee72c9f7d89a489.js" defer="" data-airgap-id="53"></script><script src="./eleonore __ michael - middlebury, vt_files/_buildManifest.js" defer="" data-airgap-id="54"></script><script src="./eleonore __ michael - middlebury, vt_files/_ssgManifest.js" defer="" data-airgap-id="55"></script><style data-styled="active" data-styled-version="5.3.3"></style><style type="text/css">.TranscriptCue_lazy_module_cueListItem__da7e05d9{position:absolute;width:100%;top:0;left:0;padding:0;list-style:none;margin-bottom:8px}.TranscriptCue_lazy_module_cueListItem__da7e05d9 .TranscriptCue_lazy_module_cue__da7e05d9{height:100%;display:block;margin-bottom:8px}.TranscriptCue_lazy_module_cueListItem__da7e05d9:hover{text-decoration:underline}</style><style type="text/css">.TranscriptList_lazy_module_container__8b125cfe{display:flex;padding:12px 30px;background-color:rgba(0,0,0,.9);overflow-y:scroll;height:calc(100% - 32px)}.TranscriptList_lazy_module_list__8b125cfe{width:100%;position:relative;font-size:1.5em;list-style:none}</style><style type="text/css">.Transcript_lazy_module_transcript__38bf48c3{pointer-events:all;width:100%;position:absolute;top:0;bottom:0;height:calc(100% - 32px)}.Transcript_lazy_module_transcript__38bf48c3 .Transcript_lazy_module_controls__38bf48c3{display:flex;width:100%}.Transcript_lazy_module_transcript__38bf48c3 .Transcript_lazy_module_controls__38bf48c3 form{flex:10}.Transcript_lazy_module_transcript__38bf48c3 .Transcript_lazy_module_controls__38bf48c3 select{flex:1;width:64px}</style><script src="./eleonore __ michael - middlebury, vt_files/otBannerSdk.js" async="" type="text/javascript" data-airgap-id="56"></script><style id="onetrust-style">#onetrust-banner-sdk{-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}#onetrust-banner-sdk .onetrust-vendors-list-handler{cursor:pointer;color:#1f96db;font-size:inherit;font-weight:bold;text-decoration:none;margin-left:5px}#onetrust-banner-sdk .onetrust-vendors-list-handler:hover{color:#1f96db}#onetrust-banner-sdk:focus{outline:2px solid #000;outline-offset:-2px}#onetrust-banner-sdk a:focus{outline:2px solid #000}#onetrust-banner-sdk #onetrust-accept-btn-handler,#onetrust-banner-sdk #onetrust-reject-all-handler,#onetrust-banner-sdk #onetrust-pc-btn-handler{outline-offset:1px}#onetrust-banner-sdk .ot-close-icon,#onetrust-pc-sdk .ot-close-icon,#ot-sync-ntfy .ot-close-icon{background-image:url("data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IiB3aWR0aD0iMzQ4LjMzM3B4IiBoZWlnaHQ9IjM0OC4zMzNweCIgdmlld0JveD0iMCAwIDM0OC4zMzMgMzQ4LjMzNCIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzQ4LjMzMyAzNDguMzM0OyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+PGc+PHBhdGggZmlsbD0iIzU2NTY1NiIgZD0iTTMzNi41NTksNjguNjExTDIzMS4wMTYsMTc0LjE2NWwxMDUuNTQzLDEwNS41NDljMTUuNjk5LDE1LjcwNSwxNS42OTksNDEuMTQ1LDAsNTYuODVjLTcuODQ0LDcuODQ0LTE4LjEyOCwxMS43NjktMjguNDA3LDExLjc2OWMtMTAuMjk2LDAtMjAuNTgxLTMuOTE5LTI4LjQxOS0xMS43NjlMMTc0LjE2NywyMzEuMDAzTDY4LjYwOSwzMzYuNTYzYy03Ljg0Myw3Ljg0NC0xOC4xMjgsMTEuNzY5LTI4LjQxNiwxMS43NjljLTEwLjI4NSwwLTIwLjU2My0zLjkxOS0yOC40MTMtMTEuNzY5Yy0xNS42OTktMTUuNjk4LTE1LjY5OS00MS4xMzksMC01Ni44NWwxMDUuNTQtMTA1LjU0OUwxMS43NzQsNjguNjExYy0xNS42OTktMTUuNjk5LTE1LjY5OS00MS4xNDUsMC01Ni44NDRjMTUuNjk2LTE1LjY4Nyw0MS4xMjctMTUuNjg3LDU2LjgyOSwwbDEwNS41NjMsMTA1LjU1NEwyNzkuNzIxLDExLjc2N2MxNS43MDUtMTUuNjg3LDQxLjEzOS0xNS42ODcsNTYuODMyLDBDMzUyLjI1OCwyNy40NjYsMzUyLjI1OCw1Mi45MTIsMzM2LjU1OSw2OC42MTF6Ii8+PC9nPjwvc3ZnPg==");background-size:contain;background-repeat:no-repeat;background-position:center;height:12px;width:12px}#onetrust-banner-sdk .powered-by-logo,#onetrust-banner-sdk .ot-pc-footer-logo a,#onetrust-pc-sdk .powered-by-logo,#onetrust-pc-sdk .ot-pc-footer-logo a,#ot-sync-ntfy .powered-by-logo,#ot-sync-ntfy .ot-pc-footer-logo a{background-size:contain;background-repeat:no-repeat;background-position:center;height:25px;width:152px;display:block}#onetrust-banner-sdk h3 *,#onetrust-banner-sdk h4 *,#onetrust-banner-sdk h6 *,#onetrust-banner-sdk button *,#onetrust-banner-sdk a[data-parent-id] *,#onetrust-pc-sdk h3 *,#onetrust-pc-sdk h4 *,#onetrust-pc-sdk h6 *,#onetrust-pc-sdk button *,#onetrust-pc-sdk a[data-parent-id] *,#ot-sync-ntfy h3 *,#ot-sync-ntfy h4 *,#ot-sync-ntfy h6 *,#ot-sync-ntfy button *,#ot-sync-ntfy a[data-parent-id] *{font-size:inherit;font-weight:inherit;color:inherit}#onetrust-banner-sdk .ot-hide,#onetrust-pc-sdk .ot-hide,#ot-sync-ntfy .ot-hide{display:none !important}#onetrust-pc-sdk .ot-sdk-row .ot-sdk-column{padding:0}#onetrust-pc-sdk .ot-sdk-container{padding-right:0}#onetrust-pc-sdk .ot-sdk-row{flex-direction:initial;width:100%}#onetrust-pc-sdk [type="checkbox"]:checked,#onetrust-pc-sdk [type="checkbox"]:not(:checked){pointer-events:initial}#onetrust-pc-sdk [type="checkbox"]:disabled+label::before,#onetrust-pc-sdk [type="checkbox"]:disabled+label:after,#onetrust-pc-sdk [type="checkbox"]:disabled+label{pointer-events:none;opacity:0.7}#onetrust-pc-sdk #vendor-list-content{transform:translate3d(0, 0, 0)}#onetrust-pc-sdk li input[type="checkbox"]{z-index:1}#onetrust-pc-sdk li .ot-checkbox label{z-index:2}#onetrust-pc-sdk li .ot-checkbox input[type="checkbox"]{height:auto;width:auto}#onetrust-pc-sdk li .host-title a,#onetrust-pc-sdk li .ot-host-name a,#onetrust-pc-sdk li .accordion-text,#onetrust-pc-sdk li .ot-acc-txt{z-index:2;position:relative}#onetrust-pc-sdk input{margin:3px 0.1ex}#onetrust-pc-sdk .pc-logo,#onetrust-pc-sdk .ot-pc-logo{height:60px;width:180px;background-position:center;background-size:contain;background-repeat:no-repeat}#onetrust-pc-sdk .screen-reader-only,#onetrust-pc-sdk .ot-scrn-rdr,.ot-sdk-cookie-policy .screen-reader-only,.ot-sdk-cookie-policy .ot-scrn-rdr{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}#onetrust-pc-sdk.ot-fade-in,.onetrust-pc-dark-filter.ot-fade-in,#onetrust-banner-sdk.ot-fade-in{animation-name:onetrust-fade-in;animation-duration:400ms;animation-timing-function:ease-in-out}#onetrust-pc-sdk.ot-hide{display:none !important}.onetrust-pc-dark-filter.ot-hide{display:none !important}#ot-sdk-btn.ot-sdk-show-settings,#ot-sdk-btn.optanon-show-settings{color:#68b631;border:1px solid #68b631;height:auto;white-space:normal;word-wrap:break-word;padding:0.8em 2em;font-size:0.8em;line-height:1.2;cursor:pointer;-moz-transition:0.1s ease;-o-transition:0.1s ease;-webkit-transition:1s ease;transition:0.1s ease}#ot-sdk-btn.ot-sdk-show-settings:hover,#ot-sdk-btn.optanon-show-settings:hover{color:#fff;background-color:#68b631}.onetrust-pc-dark-filter{background:rgba(0,0,0,0.5);z-index:2147483646;width:100%;height:100%;overflow:hidden;position:fixed;top:0;bottom:0;left:0}@keyframes onetrust-fade-in{0%{opacity:0}100%{opacity:1}}.ot-cookie-label{text-decoration:underline}@media only screen and (min-width: 426px) and (max-width: 896px) and (orientation: landscape){#onetrust-pc-sdk p{font-size:0.75em}}#onetrust-banner-sdk .banner-option-input:focus+label{outline:1px solid #000;outline-style:auto}.category-vendors-list-handler+a:focus,.category-vendors-list-handler+a:focus-visible{outline:2px solid #000}
+#onetrust-banner-sdk,#onetrust-pc-sdk,#ot-sdk-cookie-policy,#ot-sync-ntfy{font-size:16px}#onetrust-banner-sdk *,#onetrust-banner-sdk ::after,#onetrust-banner-sdk ::before,#onetrust-pc-sdk *,#onetrust-pc-sdk ::after,#onetrust-pc-sdk ::before,#ot-sdk-cookie-policy *,#ot-sdk-cookie-policy ::after,#ot-sdk-cookie-policy ::before,#ot-sync-ntfy *,#ot-sync-ntfy ::after,#ot-sync-ntfy ::before{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}#onetrust-banner-sdk div,#onetrust-banner-sdk span,#onetrust-banner-sdk h1,#onetrust-banner-sdk h2,#onetrust-banner-sdk h3,#onetrust-banner-sdk h4,#onetrust-banner-sdk h5,#onetrust-banner-sdk h6,#onetrust-banner-sdk p,#onetrust-banner-sdk img,#onetrust-banner-sdk svg,#onetrust-banner-sdk button,#onetrust-banner-sdk section,#onetrust-banner-sdk a,#onetrust-banner-sdk label,#onetrust-banner-sdk input,#onetrust-banner-sdk ul,#onetrust-banner-sdk li,#onetrust-banner-sdk nav,#onetrust-banner-sdk table,#onetrust-banner-sdk thead,#onetrust-banner-sdk tr,#onetrust-banner-sdk td,#onetrust-banner-sdk tbody,#onetrust-banner-sdk .ot-main-content,#onetrust-banner-sdk .ot-toggle,#onetrust-banner-sdk #ot-content,#onetrust-banner-sdk #ot-pc-content,#onetrust-banner-sdk .checkbox,#onetrust-pc-sdk div,#onetrust-pc-sdk span,#onetrust-pc-sdk h1,#onetrust-pc-sdk h2,#onetrust-pc-sdk h3,#onetrust-pc-sdk h4,#onetrust-pc-sdk h5,#onetrust-pc-sdk h6,#onetrust-pc-sdk p,#onetrust-pc-sdk img,#onetrust-pc-sdk svg,#onetrust-pc-sdk button,#onetrust-pc-sdk section,#onetrust-pc-sdk a,#onetrust-pc-sdk label,#onetrust-pc-sdk input,#onetrust-pc-sdk ul,#onetrust-pc-sdk li,#onetrust-pc-sdk nav,#onetrust-pc-sdk table,#onetrust-pc-sdk thead,#onetrust-pc-sdk tr,#onetrust-pc-sdk td,#onetrust-pc-sdk tbody,#onetrust-pc-sdk .ot-main-content,#onetrust-pc-sdk .ot-toggle,#onetrust-pc-sdk #ot-content,#onetrust-pc-sdk #ot-pc-content,#onetrust-pc-sdk .checkbox,#ot-sdk-cookie-policy div,#ot-sdk-cookie-policy span,#ot-sdk-cookie-policy h1,#ot-sdk-cookie-policy h2,#ot-sdk-cookie-policy h3,#ot-sdk-cookie-policy h4,#ot-sdk-cookie-policy h5,#ot-sdk-cookie-policy h6,#ot-sdk-cookie-policy p,#ot-sdk-cookie-policy img,#ot-sdk-cookie-policy svg,#ot-sdk-cookie-policy button,#ot-sdk-cookie-policy section,#ot-sdk-cookie-policy a,#ot-sdk-cookie-policy label,#ot-sdk-cookie-policy input,#ot-sdk-cookie-policy ul,#ot-sdk-cookie-policy li,#ot-sdk-cookie-policy nav,#ot-sdk-cookie-policy table,#ot-sdk-cookie-policy thead,#ot-sdk-cookie-policy tr,#ot-sdk-cookie-policy td,#ot-sdk-cookie-policy tbody,#ot-sdk-cookie-policy .ot-main-content,#ot-sdk-cookie-policy .ot-toggle,#ot-sdk-cookie-policy #ot-content,#ot-sdk-cookie-policy #ot-pc-content,#ot-sdk-cookie-policy .checkbox,#ot-sync-ntfy div,#ot-sync-ntfy span,#ot-sync-ntfy h1,#ot-sync-ntfy h2,#ot-sync-ntfy h3,#ot-sync-ntfy h4,#ot-sync-ntfy h5,#ot-sync-ntfy h6,#ot-sync-ntfy p,#ot-sync-ntfy img,#ot-sync-ntfy svg,#ot-sync-ntfy button,#ot-sync-ntfy section,#ot-sync-ntfy a,#ot-sync-ntfy label,#ot-sync-ntfy input,#ot-sync-ntfy ul,#ot-sync-ntfy li,#ot-sync-ntfy nav,#ot-sync-ntfy table,#ot-sync-ntfy thead,#ot-sync-ntfy tr,#ot-sync-ntfy td,#ot-sync-ntfy tbody,#ot-sync-ntfy .ot-main-content,#ot-sync-ntfy .ot-toggle,#ot-sync-ntfy #ot-content,#ot-sync-ntfy #ot-pc-content,#ot-sync-ntfy .checkbox{font-family:inherit;font-weight:normal;-webkit-font-smoothing:auto;letter-spacing:normal;line-height:normal;padding:0;margin:0;height:auto;min-height:0;max-height:none;width:auto;min-width:0;max-width:none;border-radius:0;border:none;clear:none;float:none;position:static;bottom:auto;left:auto;right:auto;top:auto;text-align:left;text-decoration:none;text-indent:0;text-shadow:none;text-transform:none;white-space:normal;background:none;overflow:visible;vertical-align:baseline;visibility:visible;z-index:auto;box-shadow:none}#onetrust-banner-sdk label:before,#onetrust-banner-sdk label:after,#onetrust-banner-sdk .checkbox:after,#onetrust-banner-sdk .checkbox:before,#onetrust-pc-sdk label:before,#onetrust-pc-sdk label:after,#onetrust-pc-sdk .checkbox:after,#onetrust-pc-sdk .checkbox:before,#ot-sdk-cookie-policy label:before,#ot-sdk-cookie-policy label:after,#ot-sdk-cookie-policy .checkbox:after,#ot-sdk-cookie-policy .checkbox:before,#ot-sync-ntfy label:before,#ot-sync-ntfy label:after,#ot-sync-ntfy .checkbox:after,#ot-sync-ntfy .checkbox:before{content:"";content:none}
+#onetrust-banner-sdk .ot-sdk-container,#onetrust-pc-sdk .ot-sdk-container,#ot-sdk-cookie-policy .ot-sdk-container{position:relative;width:100%;max-width:100%;margin:0 auto;padding:0 20px;box-sizing:border-box}#onetrust-banner-sdk .ot-sdk-column,#onetrust-banner-sdk .ot-sdk-columns,#onetrust-pc-sdk .ot-sdk-column,#onetrust-pc-sdk .ot-sdk-columns,#ot-sdk-cookie-policy .ot-sdk-column,#ot-sdk-cookie-policy .ot-sdk-columns{width:100%;float:left;box-sizing:border-box;padding:0;display:initial}@media (min-width: 400px){#onetrust-banner-sdk .ot-sdk-container,#onetrust-pc-sdk .ot-sdk-container,#ot-sdk-cookie-policy .ot-sdk-container{width:90%;padding:0}}@media (min-width: 550px){#onetrust-banner-sdk .ot-sdk-container,#onetrust-pc-sdk .ot-sdk-container,#ot-sdk-cookie-policy .ot-sdk-container{width:100%}#onetrust-banner-sdk .ot-sdk-column,#onetrust-banner-sdk .ot-sdk-columns,#onetrust-pc-sdk .ot-sdk-column,#onetrust-pc-sdk .ot-sdk-columns,#ot-sdk-cookie-policy .ot-sdk-column,#ot-sdk-cookie-policy .ot-sdk-columns{margin-left:4%}#onetrust-banner-sdk .ot-sdk-column:first-child,#onetrust-banner-sdk .ot-sdk-columns:first-child,#onetrust-pc-sdk .ot-sdk-column:first-child,#onetrust-pc-sdk .ot-sdk-columns:first-child,#ot-sdk-cookie-policy .ot-sdk-column:first-child,#ot-sdk-cookie-policy .ot-sdk-columns:first-child{margin-left:0}#onetrust-banner-sdk .ot-sdk-two.ot-sdk-columns,#onetrust-pc-sdk .ot-sdk-two.ot-sdk-columns,#ot-sdk-cookie-policy .ot-sdk-two.ot-sdk-columns{width:13.3333333333%}#onetrust-banner-sdk .ot-sdk-three.ot-sdk-columns,#onetrust-pc-sdk .ot-sdk-three.ot-sdk-columns,#ot-sdk-cookie-policy .ot-sdk-three.ot-sdk-columns{width:22%}#onetrust-banner-sdk .ot-sdk-four.ot-sdk-columns,#onetrust-pc-sdk .ot-sdk-four.ot-sdk-columns,#ot-sdk-cookie-policy .ot-sdk-four.ot-sdk-columns{width:30.6666666667%}#onetrust-banner-sdk .ot-sdk-eight.ot-sdk-columns,#onetrust-pc-sdk .ot-sdk-eight.ot-sdk-columns,#ot-sdk-cookie-policy .ot-sdk-eight.ot-sdk-columns{width:65.3333333333%}#onetrust-banner-sdk .ot-sdk-nine.ot-sdk-columns,#onetrust-pc-sdk .ot-sdk-nine.ot-sdk-columns,#ot-sdk-cookie-policy .ot-sdk-nine.ot-sdk-columns{width:74%}#onetrust-banner-sdk .ot-sdk-ten.ot-sdk-columns,#onetrust-pc-sdk .ot-sdk-ten.ot-sdk-columns,#ot-sdk-cookie-policy .ot-sdk-ten.ot-sdk-columns{width:82.6666666667%}#onetrust-banner-sdk .ot-sdk-eleven.ot-sdk-columns,#onetrust-pc-sdk .ot-sdk-eleven.ot-sdk-columns,#ot-sdk-cookie-policy .ot-sdk-eleven.ot-sdk-columns{width:91.3333333333%}#onetrust-banner-sdk .ot-sdk-twelve.ot-sdk-columns,#onetrust-pc-sdk .ot-sdk-twelve.ot-sdk-columns,#ot-sdk-cookie-policy .ot-sdk-twelve.ot-sdk-columns{width:100%;margin-left:0}}#onetrust-banner-sdk h1,#onetrust-banner-sdk h2,#onetrust-banner-sdk h3,#onetrust-banner-sdk h4,#onetrust-banner-sdk h5,#onetrust-banner-sdk h6,#onetrust-pc-sdk h1,#onetrust-pc-sdk h2,#onetrust-pc-sdk h3,#onetrust-pc-sdk h4,#onetrust-pc-sdk h5,#onetrust-pc-sdk h6,#ot-sdk-cookie-policy h1,#ot-sdk-cookie-policy h2,#ot-sdk-cookie-policy h3,#ot-sdk-cookie-policy h4,#ot-sdk-cookie-policy h5,#ot-sdk-cookie-policy h6{margin-top:0;font-weight:600;font-family:inherit}#onetrust-banner-sdk h1,#onetrust-pc-sdk h1,#ot-sdk-cookie-policy h1{font-size:1.5rem;line-height:1.2}#onetrust-banner-sdk h2,#onetrust-pc-sdk h2,#ot-sdk-cookie-policy h2{font-size:1.5rem;line-height:1.25}#onetrust-banner-sdk h3,#onetrust-pc-sdk h3,#ot-sdk-cookie-policy h3{font-size:1.5rem;line-height:1.3}#onetrust-banner-sdk h4,#onetrust-pc-sdk h4,#ot-sdk-cookie-policy h4{font-size:1.5rem;line-height:1.35}#onetrust-banner-sdk h5,#onetrust-pc-sdk h5,#ot-sdk-cookie-policy h5{font-size:1.5rem;line-height:1.5}#onetrust-banner-sdk h6,#onetrust-pc-sdk h6,#ot-sdk-cookie-policy h6{font-size:1.5rem;line-height:1.6}@media (min-width: 550px){#onetrust-banner-sdk h1,#onetrust-pc-sdk h1,#ot-sdk-cookie-policy h1{font-size:1.5rem}#onetrust-banner-sdk h2,#onetrust-pc-sdk h2,#ot-sdk-cookie-policy h2{font-size:1.5rem}#onetrust-banner-sdk h3,#onetrust-pc-sdk h3,#ot-sdk-cookie-policy h3{font-size:1.5rem}#onetrust-banner-sdk h4,#onetrust-pc-sdk h4,#ot-sdk-cookie-policy h4{font-size:1.5rem}#onetrust-banner-sdk h5,#onetrust-pc-sdk h5,#ot-sdk-cookie-policy h5{font-size:1.5rem}#onetrust-banner-sdk h6,#onetrust-pc-sdk h6,#ot-sdk-cookie-policy h6{font-size:1.5rem}}#onetrust-banner-sdk p,#onetrust-pc-sdk p,#ot-sdk-cookie-policy p{margin:0 0 1em 0;font-family:inherit;line-height:normal}#onetrust-banner-sdk a,#onetrust-pc-sdk a,#ot-sdk-cookie-policy a{color:#565656;text-decoration:underline}#onetrust-banner-sdk a:hover,#onetrust-pc-sdk a:hover,#ot-sdk-cookie-policy a:hover{color:#565656;text-decoration:none}#onetrust-banner-sdk .ot-sdk-button,#onetrust-banner-sdk button,#onetrust-pc-sdk .ot-sdk-button,#onetrust-pc-sdk button,#ot-sdk-cookie-policy .ot-sdk-button,#ot-sdk-cookie-policy button{margin-bottom:1rem;font-family:inherit}#onetrust-banner-sdk .ot-sdk-button,#onetrust-banner-sdk button,#onetrust-pc-sdk .ot-sdk-button,#onetrust-pc-sdk button,#ot-sdk-cookie-policy .ot-sdk-button,#ot-sdk-cookie-policy button{display:inline-block;height:38px;padding:0 30px;color:#555;text-align:center;font-size:0.9em;font-weight:400;line-height:38px;letter-spacing:0.01em;text-decoration:none;white-space:nowrap;background-color:transparent;border-radius:2px;border:1px solid #bbb;cursor:pointer;box-sizing:border-box}#onetrust-banner-sdk .ot-sdk-button:hover,#onetrust-banner-sdk :not(.ot-leg-btn-container)>button:hover,#onetrust-banner-sdk :not(.ot-leg-btn-container)>button:focus,#onetrust-pc-sdk .ot-sdk-button:hover,#onetrust-pc-sdk :not(.ot-leg-btn-container)>button:hover,#onetrust-pc-sdk :not(.ot-leg-btn-container)>button:focus,#ot-sdk-cookie-policy .ot-sdk-button:hover,#ot-sdk-cookie-policy :not(.ot-leg-btn-container)>button:hover,#ot-sdk-cookie-policy :not(.ot-leg-btn-container)>button:focus{color:#333;border-color:#888;opacity:0.7}#onetrust-banner-sdk .ot-sdk-button:focus,#onetrust-banner-sdk :not(.ot-leg-btn-container)>button:focus,#onetrust-pc-sdk .ot-sdk-button:focus,#onetrust-pc-sdk :not(.ot-leg-btn-container)>button:focus,#ot-sdk-cookie-policy .ot-sdk-button:focus,#ot-sdk-cookie-policy :not(.ot-leg-btn-container)>button:focus{outline:2px solid #000}#onetrust-banner-sdk .ot-sdk-button.ot-sdk-button-primary,#onetrust-banner-sdk button.ot-sdk-button-primary,#onetrust-banner-sdk input[type="submit"].ot-sdk-button-primary,#onetrust-banner-sdk input[type="reset"].ot-sdk-button-primary,#onetrust-banner-sdk input[type="button"].ot-sdk-button-primary,#onetrust-pc-sdk .ot-sdk-button.ot-sdk-button-primary,#onetrust-pc-sdk button.ot-sdk-button-primary,#onetrust-pc-sdk input[type="submit"].ot-sdk-button-primary,#onetrust-pc-sdk input[type="reset"].ot-sdk-button-primary,#onetrust-pc-sdk input[type="button"].ot-sdk-button-primary,#ot-sdk-cookie-policy .ot-sdk-button.ot-sdk-button-primary,#ot-sdk-cookie-policy button.ot-sdk-button-primary,#ot-sdk-cookie-policy input[type="submit"].ot-sdk-button-primary,#ot-sdk-cookie-policy input[type="reset"].ot-sdk-button-primary,#ot-sdk-cookie-policy input[type="button"].ot-sdk-button-primary{color:#fff;background-color:#33c3f0;border-color:#33c3f0}#onetrust-banner-sdk .ot-sdk-button.ot-sdk-button-primary:hover,#onetrust-banner-sdk button.ot-sdk-button-primary:hover,#onetrust-banner-sdk input[type="submit"].ot-sdk-button-primary:hover,#onetrust-banner-sdk input[type="reset"].ot-sdk-button-primary:hover,#onetrust-banner-sdk input[type="button"].ot-sdk-button-primary:hover,#onetrust-banner-sdk .ot-sdk-button.ot-sdk-button-primary:focus,#onetrust-banner-sdk button.ot-sdk-button-primary:focus,#onetrust-banner-sdk input[type="submit"].ot-sdk-button-primary:focus,#onetrust-banner-sdk input[type="reset"].ot-sdk-button-primary:focus,#onetrust-banner-sdk input[type="button"].ot-sdk-button-primary:focus,#onetrust-pc-sdk .ot-sdk-button.ot-sdk-button-primary:hover,#onetrust-pc-sdk button.ot-sdk-button-primary:hover,#onetrust-pc-sdk input[type="submit"].ot-sdk-button-primary:hover,#onetrust-pc-sdk input[type="reset"].ot-sdk-button-primary:hover,#onetrust-pc-sdk input[type="button"].ot-sdk-button-primary:hover,#onetrust-pc-sdk .ot-sdk-button.ot-sdk-button-primary:focus,#onetrust-pc-sdk button.ot-sdk-button-primary:focus,#onetrust-pc-sdk input[type="submit"].ot-sdk-button-primary:focus,#onetrust-pc-sdk input[type="reset"].ot-sdk-button-primary:focus,#onetrust-pc-sdk input[type="button"].ot-sdk-button-primary:focus,#ot-sdk-cookie-policy .ot-sdk-button.ot-sdk-button-primary:hover,#ot-sdk-cookie-policy button.ot-sdk-button-primary:hover,#ot-sdk-cookie-policy input[type="submit"].ot-sdk-button-primary:hover,#ot-sdk-cookie-policy input[type="reset"].ot-sdk-button-primary:hover,#ot-sdk-cookie-policy input[type="button"].ot-sdk-button-primary:hover,#ot-sdk-cookie-policy .ot-sdk-button.ot-sdk-button-primary:focus,#ot-sdk-cookie-policy button.ot-sdk-button-primary:focus,#ot-sdk-cookie-policy input[type="submit"].ot-sdk-button-primary:focus,#ot-sdk-cookie-policy input[type="reset"].ot-sdk-button-primary:focus,#ot-sdk-cookie-policy input[type="button"].ot-sdk-button-primary:focus{color:#fff;background-color:#1eaedb;border-color:#1eaedb}#onetrust-banner-sdk input[type="text"],#onetrust-pc-sdk input[type="text"],#ot-sdk-cookie-policy input[type="text"]{height:38px;padding:6px 10px;background-color:#fff;border:1px solid #d1d1d1;border-radius:4px;box-shadow:none;box-sizing:border-box}#onetrust-banner-sdk input[type="text"],#onetrust-pc-sdk input[type="text"],#ot-sdk-cookie-policy input[type="text"]{-webkit-appearance:none;-moz-appearance:none;appearance:none}#onetrust-banner-sdk input[type="text"]:focus,#onetrust-pc-sdk input[type="text"]:focus,#ot-sdk-cookie-policy input[type="text"]:focus{border:1px solid #000;outline:0}#onetrust-banner-sdk label,#onetrust-pc-sdk label,#ot-sdk-cookie-policy label{display:block;margin-bottom:0.5rem;font-weight:600}#onetrust-banner-sdk input[type="checkbox"],#onetrust-pc-sdk input[type="checkbox"],#ot-sdk-cookie-policy input[type="checkbox"]{display:inline}#onetrust-banner-sdk ul,#onetrust-pc-sdk ul,#ot-sdk-cookie-policy ul{list-style:circle inside}#onetrust-banner-sdk ul,#onetrust-pc-sdk ul,#ot-sdk-cookie-policy ul{padding-left:0;margin-top:0}#onetrust-banner-sdk ul ul,#onetrust-pc-sdk ul ul,#ot-sdk-cookie-policy ul ul{margin:1.5rem 0 1.5rem 3rem;font-size:90%}#onetrust-banner-sdk li,#onetrust-pc-sdk li,#ot-sdk-cookie-policy li{margin-bottom:1rem}#onetrust-banner-sdk th,#onetrust-banner-sdk td,#onetrust-pc-sdk th,#onetrust-pc-sdk td,#ot-sdk-cookie-policy th,#ot-sdk-cookie-policy td{padding:12px 15px;text-align:left;border-bottom:1px solid #e1e1e1}#onetrust-banner-sdk button,#onetrust-pc-sdk button,#ot-sdk-cookie-policy button{margin-bottom:1rem;font-family:inherit}#onetrust-banner-sdk .ot-sdk-container:after,#onetrust-banner-sdk .ot-sdk-row:after,#onetrust-pc-sdk .ot-sdk-container:after,#onetrust-pc-sdk .ot-sdk-row:after,#ot-sdk-cookie-policy .ot-sdk-container:after,#ot-sdk-cookie-policy .ot-sdk-row:after{content:"";display:table;clear:both}#onetrust-banner-sdk .ot-sdk-row,#onetrust-pc-sdk .ot-sdk-row,#ot-sdk-cookie-policy .ot-sdk-row{margin:0;max-width:none;display:block}
+#onetrust-banner-sdk{box-shadow:0 0 18px rgba(0,0,0,.2)}#onetrust-banner-sdk.otFlat{position:fixed;z-index:2147483645;bottom:0;right:0;left:0;background-color:#fff;max-height:90%;overflow-x:hidden;overflow-y:auto}#onetrust-banner-sdk.otFlat.top{top:0px;bottom:auto}#onetrust-banner-sdk.otRelFont{font-size:1rem}#onetrust-banner-sdk>.ot-sdk-container{overflow:hidden}#onetrust-banner-sdk::-webkit-scrollbar{width:11px}#onetrust-banner-sdk::-webkit-scrollbar-thumb{border-radius:10px;background:#c1c1c1}#onetrust-banner-sdk{scrollbar-arrow-color:#c1c1c1;scrollbar-darkshadow-color:#c1c1c1;scrollbar-face-color:#c1c1c1;scrollbar-shadow-color:#c1c1c1}#onetrust-banner-sdk #onetrust-policy{margin:1.25em 0 .625em 2em;overflow:hidden}#onetrust-banner-sdk #onetrust-policy .ot-gv-list-handler{float:left;font-size:.82em;padding:0;margin-bottom:0;border:0;line-height:normal;height:auto;width:auto}#onetrust-banner-sdk #onetrust-policy-title{font-size:1.2em;line-height:1.3;margin-bottom:10px}#onetrust-banner-sdk #onetrust-policy-text{clear:both;text-align:left;font-size:.88em;line-height:1.4}#onetrust-banner-sdk #onetrust-policy-text *{font-size:inherit;line-height:inherit}#onetrust-banner-sdk #onetrust-policy-text a{font-weight:bold;margin-left:5px}#onetrust-banner-sdk #onetrust-policy-title,#onetrust-banner-sdk #onetrust-policy-text{color:dimgray;float:left}#onetrust-banner-sdk #onetrust-button-group-parent{min-height:1px;text-align:center}#onetrust-banner-sdk #onetrust-button-group{display:inline-block}#onetrust-banner-sdk #onetrust-accept-btn-handler,#onetrust-banner-sdk #onetrust-reject-all-handler,#onetrust-banner-sdk #onetrust-pc-btn-handler{background-color:#68b631;color:#fff;border-color:#68b631;margin-right:1em;min-width:125px;height:auto;white-space:normal;word-break:break-word;word-wrap:break-word;padding:12px 10px;line-height:1.2;font-size:.813em;font-weight:600}#onetrust-banner-sdk #onetrust-pc-btn-handler.cookie-setting-link{background-color:#fff;border:none;color:#68b631;text-decoration:underline;padding-left:0;padding-right:0}#onetrust-banner-sdk .onetrust-close-btn-ui{width:44px;height:44px;background-size:12px;border:none;position:relative;margin:auto;padding:0}#onetrust-banner-sdk .banner_logo{display:none}#onetrust-banner-sdk .ot-b-addl-desc{clear:both;float:left;display:block}#onetrust-banner-sdk #banner-options{float:left;display:table;margin-right:0;margin-left:1em;width:calc(100% - 1em)}#onetrust-banner-sdk .banner-option-input{cursor:pointer;width:auto;height:auto;border:none;padding:0;padding-right:3px;margin:0 0 10px;font-size:.82em;line-height:1.4}#onetrust-banner-sdk .banner-option-input *{pointer-events:none;font-size:inherit;line-height:inherit}#onetrust-banner-sdk .banner-option-input[aria-expanded=true]~.banner-option-details{display:block;height:auto}#onetrust-banner-sdk .banner-option-input[aria-expanded=true] .ot-arrow-container{transform:rotate(90deg)}#onetrust-banner-sdk .banner-option{margin-bottom:12px;margin-left:0;border:none;float:left;padding:0}#onetrust-banner-sdk .banner-option:first-child{padding-left:2px}#onetrust-banner-sdk .banner-option:not(:first-child){padding:0;border:none}#onetrust-banner-sdk .banner-option-header{cursor:pointer;display:inline-block}#onetrust-banner-sdk .banner-option-header :first-child{color:dimgray;font-weight:bold;float:left}#onetrust-banner-sdk .banner-option-header .ot-arrow-container{display:inline-block;border-top:6px solid transparent;border-bottom:6px solid transparent;border-left:6px solid dimgray;margin-left:10px;vertical-align:middle}#onetrust-banner-sdk .banner-option-details{display:none;font-size:.83em;line-height:1.5;padding:10px 0px 5px 10px;margin-right:10px;height:0px}#onetrust-banner-sdk .banner-option-details *{font-size:inherit;line-height:inherit;color:dimgray}#onetrust-banner-sdk .ot-arrow-container,#onetrust-banner-sdk .banner-option-details{transition:all 300ms ease-in 0s;-webkit-transition:all 300ms ease-in 0s;-moz-transition:all 300ms ease-in 0s;-o-transition:all 300ms ease-in 0s}#onetrust-banner-sdk .ot-dpd-container{float:left}#onetrust-banner-sdk .ot-dpd-title{margin-bottom:10px}#onetrust-banner-sdk .ot-dpd-title,#onetrust-banner-sdk .ot-dpd-desc{font-size:.88em;line-height:1.4;color:dimgray}#onetrust-banner-sdk .ot-dpd-title *,#onetrust-banner-sdk .ot-dpd-desc *{font-size:inherit;line-height:inherit}#onetrust-banner-sdk.ot-iab-2 #onetrust-policy-text *{margin-bottom:0}#onetrust-banner-sdk.ot-iab-2 .onetrust-vendors-list-handler{display:block;margin-left:0;margin-top:5px;clear:both;margin-bottom:0;padding:0;border:0;height:auto;width:auto}#onetrust-banner-sdk.ot-iab-2 #onetrust-button-group button{display:block}#onetrust-banner-sdk.ot-close-btn-link{padding-top:25px}#onetrust-banner-sdk.ot-close-btn-link #onetrust-close-btn-container{top:15px;transform:none;right:15px}#onetrust-banner-sdk.ot-close-btn-link #onetrust-close-btn-container button{padding:0;white-space:pre-wrap;border:none;height:auto;line-height:1.5;text-decoration:underline;font-size:.69em}#onetrust-banner-sdk #onetrust-policy-text,#onetrust-banner-sdk .ot-dpd-desc,#onetrust-banner-sdk .ot-b-addl-desc{font-size:.813em;line-height:1.5}#onetrust-banner-sdk .ot-dpd-desc{margin-bottom:10px}#onetrust-banner-sdk .ot-dpd-desc>.ot-b-addl-desc{margin-top:10px;margin-bottom:10px;font-size:1em}@media only screen and (max-width: 425px){#onetrust-banner-sdk #onetrust-close-btn-container{position:absolute;top:6px;right:2px}#onetrust-banner-sdk #onetrust-policy{margin-left:0;margin-top:3em}#onetrust-banner-sdk #onetrust-button-group{display:block}#onetrust-banner-sdk #onetrust-accept-btn-handler,#onetrust-banner-sdk #onetrust-reject-all-handler,#onetrust-banner-sdk #onetrust-pc-btn-handler{width:100%}#onetrust-banner-sdk .onetrust-close-btn-ui{top:auto;transform:none}#onetrust-banner-sdk #onetrust-policy-title{display:inline;float:none}#onetrust-banner-sdk #banner-options{margin:0;padding:0;width:100%}}@media only screen and (min-width: 426px)and (max-width: 896px){#onetrust-banner-sdk #onetrust-close-btn-container{position:absolute;top:0;right:0}#onetrust-banner-sdk #onetrust-policy{margin-left:1em;margin-right:1em}#onetrust-banner-sdk .onetrust-close-btn-ui{top:10px;right:10px}#onetrust-banner-sdk:not(.ot-iab-2) #onetrust-group-container{width:95%}#onetrust-banner-sdk.ot-iab-2 #onetrust-group-container{width:100%}#onetrust-banner-sdk #onetrust-button-group-parent{width:100%;position:relative;margin-left:0}#onetrust-banner-sdk #onetrust-button-group button{display:inline-block}#onetrust-banner-sdk #onetrust-button-group{margin-right:0;text-align:center}#onetrust-banner-sdk .has-reject-all-button #onetrust-pc-btn-handler{float:left}#onetrust-banner-sdk .has-reject-all-button #onetrust-reject-all-handler,#onetrust-banner-sdk .has-reject-all-button #onetrust-accept-btn-handler{float:right}#onetrust-banner-sdk .has-reject-all-button #onetrust-button-group{width:calc(100% - 2em);margin-right:0}#onetrust-banner-sdk .has-reject-all-button #onetrust-pc-btn-handler.cookie-setting-link{padding-left:0px;text-align:left}#onetrust-banner-sdk.ot-buttons-fw .ot-sdk-three button{width:100%;text-align:center}#onetrust-banner-sdk.ot-buttons-fw #onetrust-button-group-parent button{float:none}#onetrust-banner-sdk.ot-buttons-fw #onetrust-pc-btn-handler.cookie-setting-link{text-align:center}}@media only screen and (min-width: 550px){#onetrust-banner-sdk .banner-option:not(:first-child){border-left:1px solid #d8d8d8;padding-left:25px}}@media only screen and (min-width: 425px)and (max-width: 550px){#onetrust-banner-sdk.ot-iab-2 #onetrust-button-group,#onetrust-banner-sdk.ot-iab-2 #onetrust-policy,#onetrust-banner-sdk.ot-iab-2 .banner-option{width:100%}}@media only screen and (min-width: 769px){#onetrust-banner-sdk #onetrust-button-group{margin-right:30%}#onetrust-banner-sdk #banner-options{margin-left:2em;margin-right:5em;margin-bottom:1.25em;width:calc(100% - 7em)}}@media only screen and (min-width: 897px)and (max-width: 1023px){#onetrust-banner-sdk.vertical-align-content #onetrust-button-group-parent{position:absolute;top:50%;left:75%;transform:translateY(-50%)}#onetrust-banner-sdk #onetrust-close-btn-container{top:50%;margin:auto;transform:translate(-50%, -50%);position:absolute;padding:0;right:0}#onetrust-banner-sdk #onetrust-close-btn-container button{position:relative;margin:0;right:-22px;top:2px}}@media only screen and (min-width: 1024px){#onetrust-banner-sdk #onetrust-close-btn-container{top:50%;margin:auto;transform:translate(-50%, -50%);position:absolute;right:0}#onetrust-banner-sdk #onetrust-close-btn-container button{right:-12px}#onetrust-banner-sdk #onetrust-policy{margin-left:2em}#onetrust-banner-sdk.vertical-align-content #onetrust-button-group-parent{position:absolute;top:50%;left:60%;transform:translateY(-50%)}#onetrust-banner-sdk.ot-iab-2 #onetrust-policy-title{width:50%}#onetrust-banner-sdk.ot-iab-2 #onetrust-policy-text,#onetrust-banner-sdk.ot-iab-2 :not(.ot-dpd-desc)>.ot-b-addl-desc{margin-bottom:1em;width:50%;border-right:1px solid #d8d8d8;padding-right:1rem}#onetrust-banner-sdk.ot-iab-2 #onetrust-policy-text{margin-bottom:0;padding-bottom:1em}#onetrust-banner-sdk.ot-iab-2 :not(.ot-dpd-desc)>.ot-b-addl-desc{margin-bottom:0;padding-bottom:1em}#onetrust-banner-sdk.ot-iab-2 .ot-dpd-container{width:45%;padding-left:1rem;display:inline-block;float:none}#onetrust-banner-sdk.ot-iab-2 .ot-dpd-title{line-height:1.7}#onetrust-banner-sdk.ot-iab-2 #onetrust-button-group-parent{left:auto;right:4%;margin-left:0}#onetrust-banner-sdk.ot-iab-2 #onetrust-button-group button{display:block}#onetrust-banner-sdk:not(.ot-iab-2) #onetrust-button-group-parent{margin:auto;width:30%}#onetrust-banner-sdk:not(.ot-iab-2) #onetrust-group-container{width:60%}#onetrust-banner-sdk #onetrust-button-group{margin-right:auto}#onetrust-banner-sdk #onetrust-accept-btn-handler,#onetrust-banner-sdk #onetrust-reject-all-handler,#onetrust-banner-sdk #onetrust-pc-btn-handler{margin-top:1em}}@media only screen and (min-width: 890px){#onetrust-banner-sdk.ot-buttons-fw:not(.ot-iab-2) #onetrust-button-group-parent{padding-left:3%;padding-right:4%;margin-left:0}#onetrust-banner-sdk.ot-buttons-fw:not(.ot-iab-2) #onetrust-button-group{margin-right:0;margin-top:1.25em;width:100%}#onetrust-banner-sdk.ot-buttons-fw:not(.ot-iab-2) #onetrust-button-group button{width:100%;margin-bottom:5px;margin-top:5px}#onetrust-banner-sdk.ot-buttons-fw:not(.ot-iab-2) #onetrust-button-group button:last-of-type{margin-bottom:20px}}@media only screen and (min-width: 1280px){#onetrust-banner-sdk:not(.ot-iab-2) #onetrust-group-container{width:55%}#onetrust-banner-sdk:not(.ot-iab-2) #onetrust-button-group-parent{width:44%;padding-left:2%;padding-right:2%}#onetrust-banner-sdk:not(.ot-iab-2).vertical-align-content #onetrust-button-group-parent{position:absolute;left:55%}}
+        #onetrust-consent-sdk #onetrust-banner-sdk {background-color: #FFFFFF;}
+            #onetrust-consent-sdk #onetrust-policy-title,
+                    #onetrust-consent-sdk #onetrust-policy-text,
+                    #onetrust-consent-sdk .ot-b-addl-desc,
+                    #onetrust-consent-sdk .ot-dpd-desc,
+                    #onetrust-consent-sdk .ot-dpd-title,
+                    #onetrust-consent-sdk #onetrust-policy-text *:not(.onetrust-vendors-list-handler),
+                    #onetrust-consent-sdk .ot-dpd-desc *:not(.onetrust-vendors-list-handler),
+                    #onetrust-consent-sdk #onetrust-banner-sdk #banner-options *,
+                    #onetrust-banner-sdk .ot-cat-header {
+                        color: #696969;
+                    }
+            #onetrust-consent-sdk #onetrust-banner-sdk .banner-option-details {
+                    background-color: #E9E9E9;}
+             #onetrust-consent-sdk #onetrust-banner-sdk a[href],
+                    #onetrust-consent-sdk #onetrust-banner-sdk a[href] font,
+                    #onetrust-consent-sdk #onetrust-banner-sdk .ot-link-btn
+                        {
+                            color: #3860BE;
+                        }#onetrust-consent-sdk #onetrust-accept-btn-handler,
+                         #onetrust-banner-sdk #onetrust-reject-all-handler {
+                            background-color: #1371C3;border-color: #1371C3;
+                color: #FFFFFF;
+            }
+            #onetrust-consent-sdk #onetrust-banner-sdk *:focus,
+            #onetrust-consent-sdk #onetrust-banner-sdk:focus {
+               outline-color: #000000;
+               outline-width: 1px;
+            }
+            #onetrust-consent-sdk #onetrust-pc-btn-handler,
+            #onetrust-consent-sdk #onetrust-pc-btn-handler.cookie-setting-link {
+                color: #1371C3; border-color: #1371C3;
+                background-color: 
+                #FFFFFF;
+            }#onetrust-pc-sdk.otPcCenter{overflow:hidden;position:fixed;margin:0 auto;top:5%;right:0;left:0;width:40%;max-width:575px;min-width:575px;border-radius:2.5px;z-index:2147483647;background-color:#fff;-webkit-box-shadow:0px 2px 10px -3px #999;-moz-box-shadow:0px 2px 10px -3px #999;box-shadow:0px 2px 10px -3px #999}#onetrust-pc-sdk.otPcCenter[dir=rtl]{right:0;left:0}#onetrust-pc-sdk.otRelFont{font-size:1rem}#onetrust-pc-sdk #ot-addtl-venlst .ot-arw-cntr,#onetrust-pc-sdk #ot-addtl-venlst .ot-plus-minus,#onetrust-pc-sdk .ot-hide-tgl{visibility:hidden}#onetrust-pc-sdk #ot-addtl-venlst .ot-arw-cntr *,#onetrust-pc-sdk #ot-addtl-venlst .ot-plus-minus *,#onetrust-pc-sdk .ot-hide-tgl *{visibility:hidden}#onetrust-pc-sdk #ot-gn-venlst .ot-ven-item .ot-acc-hdr{min-height:40px}#onetrust-pc-sdk .ot-pc-header{height:39px;padding:10px 0 10px 30px;border-bottom:1px solid #e9e9e9}#onetrust-pc-sdk #ot-pc-title,#onetrust-pc-sdk #ot-category-title,#onetrust-pc-sdk .ot-cat-header,#onetrust-pc-sdk #ot-lst-title,#onetrust-pc-sdk .ot-ven-hdr .ot-ven-name,#onetrust-pc-sdk .ot-always-active{font-weight:bold;color:dimgray}#onetrust-pc-sdk .ot-cat-header{float:left;font-weight:600;font-size:.875em;line-height:1.5;max-width:90%;vertical-align:middle}#onetrust-pc-sdk .ot-always-active-group .ot-cat-header{width:55%;font-weight:700}#onetrust-pc-sdk .ot-cat-item p{clear:both;float:left;margin-top:10px;margin-bottom:5px;line-height:1.5;font-size:.812em;color:dimgray}#onetrust-pc-sdk .ot-close-icon{height:44px;width:44px;background-size:10px}#onetrust-pc-sdk #ot-pc-title{float:left;font-size:1em;line-height:1.5;margin-bottom:10px;margin-top:10px;width:100%}#onetrust-pc-sdk #accept-recommended-btn-handler{margin-right:10px;margin-bottom:25px;outline-offset:-1px}#onetrust-pc-sdk #ot-pc-desc{clear:both;width:100%;font-size:.812em;line-height:1.5;margin-bottom:25px}#onetrust-pc-sdk #ot-pc-desc a{margin-left:5px}#onetrust-pc-sdk #ot-pc-desc *{font-size:inherit;line-height:inherit}#onetrust-pc-sdk #ot-pc-desc ul li{padding:10px 0px}#onetrust-pc-sdk a{color:#656565;cursor:pointer}#onetrust-pc-sdk a:hover{color:#3860be}#onetrust-pc-sdk label{margin-bottom:0}#onetrust-pc-sdk #vdr-lst-dsc{font-size:.812em;line-height:1.5;padding:10px 15px 5px 15px}#onetrust-pc-sdk button{max-width:394px;padding:12px 30px;line-height:1;word-break:break-word;word-wrap:break-word;white-space:normal;font-weight:bold;height:auto}#onetrust-pc-sdk .ot-link-btn{padding:0;margin-bottom:0;border:0;font-weight:normal;line-height:normal;width:auto;height:auto}#onetrust-pc-sdk #ot-pc-content{position:absolute;overflow-y:scroll;padding-left:0px;padding-right:30px;top:60px;bottom:110px;margin:1px 3px 0 30px;width:calc(100% - 63px)}#onetrust-pc-sdk .ot-cat-grp .ot-always-active{float:right;clear:none;color:#3860be;margin:0;font-size:.813em;line-height:1.3}#onetrust-pc-sdk .ot-pc-scrollbar::-webkit-scrollbar-track{margin-right:20px}#onetrust-pc-sdk .ot-pc-scrollbar::-webkit-scrollbar{width:11px}#onetrust-pc-sdk .ot-pc-scrollbar::-webkit-scrollbar-thumb{border-radius:10px;background:#d8d8d8}#onetrust-pc-sdk input[type=checkbox]:focus+.ot-acc-hdr{outline:#000 1px solid}#onetrust-pc-sdk .ot-pc-scrollbar{scrollbar-arrow-color:#d8d8d8;scrollbar-darkshadow-color:#d8d8d8;scrollbar-face-color:#d8d8d8;scrollbar-shadow-color:#d8d8d8}#onetrust-pc-sdk .save-preference-btn-handler{margin-right:20px}#onetrust-pc-sdk .ot-pc-refuse-all-handler{margin-right:10px}#onetrust-pc-sdk #ot-pc-desc .privacy-notice-link{margin-left:0}#onetrust-pc-sdk .ot-subgrp-cntr{display:inline-block;clear:both;width:100%;padding-top:15px}#onetrust-pc-sdk .ot-switch+.ot-subgrp-cntr{padding-top:10px}#onetrust-pc-sdk ul.ot-subgrps{margin:0;font-size:initial}#onetrust-pc-sdk ul.ot-subgrps li p,#onetrust-pc-sdk ul.ot-subgrps li h5{font-size:.813em;line-height:1.4;color:dimgray}#onetrust-pc-sdk ul.ot-subgrps .ot-switch{min-height:auto}#onetrust-pc-sdk ul.ot-subgrps .ot-switch-nob{top:0}#onetrust-pc-sdk ul.ot-subgrps .ot-acc-hdr{display:inline-block;width:100%}#onetrust-pc-sdk ul.ot-subgrps .ot-acc-txt{margin:0}#onetrust-pc-sdk ul.ot-subgrps li{padding:0;border:none}#onetrust-pc-sdk ul.ot-subgrps li h5{position:relative;top:5px;font-weight:bold;margin-bottom:0;float:left}#onetrust-pc-sdk li.ot-subgrp{margin-left:20px;overflow:auto}#onetrust-pc-sdk li.ot-subgrp>h5{width:calc(100% - 100px)}#onetrust-pc-sdk .ot-cat-item p>ul,#onetrust-pc-sdk li.ot-subgrp p>ul{margin:0px;list-style:disc;margin-left:15px;font-size:inherit}#onetrust-pc-sdk .ot-cat-item p>ul li,#onetrust-pc-sdk li.ot-subgrp p>ul li{font-size:inherit;padding-top:10px;padding-left:0px;padding-right:0px;border:none}#onetrust-pc-sdk .ot-cat-item p>ul li:last-child,#onetrust-pc-sdk li.ot-subgrp p>ul li:last-child{padding-bottom:10px}#onetrust-pc-sdk .ot-pc-logo{height:40px;width:120px;display:inline-block}#onetrust-pc-sdk .ot-pc-footer{position:absolute;bottom:0px;width:100%;max-height:160px;border-top:1px solid #d8d8d8}#onetrust-pc-sdk.ot-ftr-stacked .ot-pc-refuse-all-handler{margin-bottom:0px}#onetrust-pc-sdk.ot-ftr-stacked #ot-pc-content{bottom:160px}#onetrust-pc-sdk.ot-ftr-stacked .ot-pc-footer button{width:100%;max-width:none}#onetrust-pc-sdk.ot-ftr-stacked .ot-btn-container{margin:0 30px;width:calc(100% - 60px);padding-right:0}#onetrust-pc-sdk .ot-pc-footer-logo{height:30px;width:100%;text-align:right;background:#f4f4f4}#onetrust-pc-sdk .ot-pc-footer-logo a{display:inline-block;margin-top:5px;margin-right:10px}#onetrust-pc-sdk[dir=rtl] .ot-pc-footer-logo{direction:rtl}#onetrust-pc-sdk[dir=rtl] .ot-pc-footer-logo a{margin-right:25px}#onetrust-pc-sdk .ot-tgl{float:right;position:relative;z-index:1}#onetrust-pc-sdk .ot-tgl input:checked+.ot-switch .ot-switch-nob{background-color:#cddcf2;border:1px solid #3860be}#onetrust-pc-sdk .ot-tgl input:checked+.ot-switch .ot-switch-nob:before{-webkit-transform:translateX(20px);-ms-transform:translateX(20px);transform:translateX(20px);background-color:#3860be;border-color:#3860be}#onetrust-pc-sdk .ot-tgl input:focus+.ot-switch{outline:#000 solid 1px}#onetrust-pc-sdk .ot-switch{position:relative;display:inline-block;width:45px;height:25px}#onetrust-pc-sdk .ot-switch-nob{position:absolute;cursor:pointer;top:0;left:0;right:0;bottom:0;background-color:#f2f1f1;border:1px solid #ddd;transition:all .2s ease-in 0s;-moz-transition:all .2s ease-in 0s;-o-transition:all .2s ease-in 0s;-webkit-transition:all .2s ease-in 0s;border-radius:20px}#onetrust-pc-sdk .ot-switch-nob:before{position:absolute;content:"";height:21px;width:21px;bottom:1px;background-color:#7d7d7d;-webkit-transition:.4s;transition:.4s;border-radius:20px}#onetrust-pc-sdk .ot-chkbox input:checked~label::before{background-color:#3860be}#onetrust-pc-sdk .ot-chkbox input+label::after{content:none;color:#fff}#onetrust-pc-sdk .ot-chkbox input:checked+label::after{content:""}#onetrust-pc-sdk .ot-chkbox input:focus+label::before{outline-style:solid;outline-width:2px;outline-style:auto}#onetrust-pc-sdk .ot-chkbox label{position:relative;display:inline-block;padding-left:30px;cursor:pointer;font-weight:500}#onetrust-pc-sdk .ot-chkbox label::before,#onetrust-pc-sdk .ot-chkbox label::after{position:absolute;content:"";display:inline-block;border-radius:3px}#onetrust-pc-sdk .ot-chkbox label::before{height:18px;width:18px;border:1px solid #3860be;left:0px;top:auto}#onetrust-pc-sdk .ot-chkbox label::after{height:5px;width:9px;border-left:3px solid;border-bottom:3px solid;transform:rotate(-45deg);-o-transform:rotate(-45deg);-ms-transform:rotate(-45deg);-webkit-transform:rotate(-45deg);left:4px;top:5px}#onetrust-pc-sdk .ot-label-txt{display:none}#onetrust-pc-sdk .ot-chkbox input,#onetrust-pc-sdk .ot-tgl input{position:absolute;opacity:0;width:0;height:0}#onetrust-pc-sdk .ot-arw-cntr{float:right;position:relative;pointer-events:none}#onetrust-pc-sdk .ot-arw-cntr .ot-arw{width:16px;height:16px;margin-left:5px;color:dimgray;display:inline-block;vertical-align:middle;-webkit-transition:all 150ms ease-in 0s;-moz-transition:all 150ms ease-in 0s;-o-transition:all 150ms ease-in 0s;transition:all 150ms ease-in 0s}#onetrust-pc-sdk input:checked~.ot-acc-hdr .ot-arw,#onetrust-pc-sdk button[aria-expanded=true]~.ot-acc-hdr .ot-arw-cntr svg{transform:rotate(90deg);-o-transform:rotate(90deg);-ms-transform:rotate(90deg);-webkit-transform:rotate(90deg)}#onetrust-pc-sdk input[type=checkbox]:focus+.ot-acc-hdr{outline:#000 1px solid}#onetrust-pc-sdk .ot-tgl-cntr,#onetrust-pc-sdk .ot-arw-cntr{display:inline-block}#onetrust-pc-sdk .ot-tgl-cntr{width:45px;float:right;margin-top:2px}#onetrust-pc-sdk #ot-lst-cnt .ot-tgl-cntr{margin-top:10px}#onetrust-pc-sdk .ot-always-active-subgroup{width:auto;padding-left:0px !important;top:3px;position:relative}#onetrust-pc-sdk .ot-label-status{padding-left:5px;font-size:.75em;display:none}#onetrust-pc-sdk .ot-arw-cntr{margin-top:-1px}#onetrust-pc-sdk .ot-arw-cntr svg{-webkit-transition:all 300ms ease-in 0s;-moz-transition:all 300ms ease-in 0s;-o-transition:all 300ms ease-in 0s;transition:all 300ms ease-in 0s;height:10px;width:10px}#onetrust-pc-sdk input:checked~.ot-acc-hdr .ot-arw{transform:rotate(90deg);-o-transform:rotate(90deg);-ms-transform:rotate(90deg);-webkit-transform:rotate(90deg)}#onetrust-pc-sdk .ot-arw{width:10px;margin-left:15px;transition:all 300ms ease-in 0s;-webkit-transition:all 300ms ease-in 0s;-moz-transition:all 300ms ease-in 0s;-o-transition:all 300ms ease-in 0s}#onetrust-pc-sdk .ot-vlst-cntr{margin-bottom:0}#onetrust-pc-sdk .ot-hlst-cntr{margin-top:5px;display:inline-block;width:100%}#onetrust-pc-sdk .category-vendors-list-handler,#onetrust-pc-sdk .category-vendors-list-handler+a,#onetrust-pc-sdk .category-host-list-handler{clear:both;color:#3860be;margin-left:0;font-size:.813em;text-decoration:none;float:left;overflow:hidden}#onetrust-pc-sdk .category-vendors-list-handler:hover,#onetrust-pc-sdk .category-vendors-list-handler+a:hover,#onetrust-pc-sdk .category-host-list-handler:hover{color:#1883fd}#onetrust-pc-sdk .category-vendors-list-handler+a{clear:none}#onetrust-pc-sdk .category-vendors-list-handler+a::after{content:"";height:15px;width:15px;background-repeat:no-repeat;margin-left:5px;float:right;background-image:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 511.626 511.627'%3E%3Cg fill='%231276CE'%3E%3Cpath d='M392.857 292.354h-18.274c-2.669 0-4.859.855-6.563 2.573-1.718 1.708-2.573 3.897-2.573 6.563v91.361c0 12.563-4.47 23.315-13.415 32.262-8.945 8.945-19.701 13.414-32.264 13.414H82.224c-12.562 0-23.317-4.469-32.264-13.414-8.945-8.946-13.417-19.698-13.417-32.262V155.31c0-12.562 4.471-23.313 13.417-32.259 8.947-8.947 19.702-13.418 32.264-13.418h200.994c2.669 0 4.859-.859 6.57-2.57 1.711-1.713 2.566-3.9 2.566-6.567V82.221c0-2.662-.855-4.853-2.566-6.563-1.711-1.713-3.901-2.568-6.57-2.568H82.224c-22.648 0-42.016 8.042-58.102 24.125C8.042 113.297 0 132.665 0 155.313v237.542c0 22.647 8.042 42.018 24.123 58.095 16.086 16.084 35.454 24.13 58.102 24.13h237.543c22.647 0 42.017-8.046 58.101-24.13 16.085-16.077 24.127-35.447 24.127-58.095v-91.358c0-2.669-.856-4.859-2.574-6.57-1.713-1.718-3.903-2.573-6.565-2.573z'/%3E%3Cpath d='M506.199 41.971c-3.617-3.617-7.905-5.424-12.85-5.424H347.171c-4.948 0-9.233 1.807-12.847 5.424-3.617 3.615-5.428 7.898-5.428 12.847s1.811 9.233 5.428 12.85l50.247 50.248-186.147 186.151c-1.906 1.903-2.856 4.093-2.856 6.563 0 2.479.953 4.668 2.856 6.571l32.548 32.544c1.903 1.903 4.093 2.852 6.567 2.852s4.665-.948 6.567-2.852l186.148-186.148 50.251 50.248c3.614 3.617 7.898 5.426 12.847 5.426s9.233-1.809 12.851-5.426c3.617-3.616 5.424-7.898 5.424-12.847V54.818c-.001-4.952-1.814-9.232-5.428-12.847z'/%3E%3C/g%3E%3C/svg%3E")}#onetrust-pc-sdk .back-btn-handler{font-size:1em;text-decoration:none}#onetrust-pc-sdk .back-btn-handler:hover{opacity:.6}#onetrust-pc-sdk #ot-lst-title h3{display:inline-block;word-break:break-word;word-wrap:break-word;margin-bottom:0;color:#656565;font-size:1em;font-weight:bold;margin-left:15px}#onetrust-pc-sdk #ot-lst-title{margin:10px 0 10px 0px;font-size:1em;text-align:left}#onetrust-pc-sdk #ot-pc-hdr{margin:0 0 0 30px;height:auto;width:auto}#onetrust-pc-sdk #ot-pc-hdr input::placeholder{color:#d4d4d4;font-style:italic}#onetrust-pc-sdk #vendor-search-handler{height:31px;width:100%;border-radius:50px;font-size:.8em;padding-right:35px;padding-left:15px;float:left;margin-left:15px}#onetrust-pc-sdk .ot-ven-name{display:block;width:auto;padding-right:5px}#onetrust-pc-sdk #ot-lst-cnt{overflow-y:auto;margin-left:20px;margin-right:7px;width:calc(100% - 27px);max-height:calc(100% - 80px);height:100%;transform:translate3d(0, 0, 0)}#onetrust-pc-sdk #ot-pc-lst{width:100%;bottom:100px;position:absolute;top:60px}#onetrust-pc-sdk #ot-pc-lst:not(.ot-enbl-chr) .ot-tgl-cntr .ot-arw-cntr,#onetrust-pc-sdk #ot-pc-lst:not(.ot-enbl-chr) .ot-tgl-cntr .ot-arw-cntr *{visibility:hidden}#onetrust-pc-sdk #ot-pc-lst .ot-tgl-cntr{right:12px;position:absolute}#onetrust-pc-sdk #ot-pc-lst .ot-arw-cntr{float:right;position:relative}#onetrust-pc-sdk #ot-pc-lst .ot-arw{margin-left:10px}#onetrust-pc-sdk #ot-pc-lst .ot-acc-hdr{overflow:hidden;cursor:pointer}#onetrust-pc-sdk .ot-vlst-cntr{overflow:hidden}#onetrust-pc-sdk #ot-sel-blk{overflow:hidden;width:100%;position:sticky;position:-webkit-sticky;top:0;z-index:3}#onetrust-pc-sdk #ot-back-arw{height:12px;width:12px}#onetrust-pc-sdk .ot-lst-subhdr{width:100%;display:inline-block}#onetrust-pc-sdk .ot-search-cntr{float:left;width:78%;position:relative}#onetrust-pc-sdk .ot-search-cntr>svg{width:30px;height:30px;position:absolute;float:left;right:-15px}#onetrust-pc-sdk .ot-fltr-cntr{float:right;right:50px;position:relative}#onetrust-pc-sdk #filter-btn-handler{background-color:#3860be;border-radius:17px;display:inline-block;position:relative;width:32px;height:32px;-moz-transition:.1s ease;-o-transition:.1s ease;-webkit-transition:1s ease;transition:.1s ease;padding:0;margin:0}#onetrust-pc-sdk #filter-btn-handler:hover{background-color:#3860be}#onetrust-pc-sdk #filter-btn-handler svg{width:12px;height:12px;margin:3px 10px 0 10px;display:block;position:static;right:auto;top:auto}#onetrust-pc-sdk .ot-ven-link{color:#3860be;text-decoration:none;font-weight:100;display:inline-block;padding-top:10px;transform:translate(0, 1%);-o-transform:translate(0, 1%);-ms-transform:translate(0, 1%);-webkit-transform:translate(0, 1%);position:relative;z-index:2}#onetrust-pc-sdk .ot-ven-link *{font-size:inherit}#onetrust-pc-sdk .ot-ven-link:hover{text-decoration:underline}#onetrust-pc-sdk .ot-ven-hdr{width:calc(100% - 160px);height:auto;float:left;word-break:break-word;word-wrap:break-word;vertical-align:middle;padding-bottom:3px}#onetrust-pc-sdk .ot-ven-link{letter-spacing:.03em;font-size:.75em;font-weight:400}#onetrust-pc-sdk .ot-ven-dets{border-radius:2px;background-color:#f8f8f8}#onetrust-pc-sdk .ot-ven-dets li:first-child p:first-child{border-top:none}#onetrust-pc-sdk .ot-ven-dets .ot-ven-disc:not(:first-child){border-top:1px solid #e9e9e9}#onetrust-pc-sdk .ot-ven-dets .ot-ven-disc:nth-child(n+3) p{display:inline-block}#onetrust-pc-sdk .ot-ven-dets .ot-ven-disc:nth-child(n+3) p:nth-of-type(odd){width:30%}#onetrust-pc-sdk .ot-ven-dets .ot-ven-disc:nth-child(n+3) p:nth-of-type(even){width:50%;word-break:break-word;word-wrap:break-word}#onetrust-pc-sdk .ot-ven-dets .ot-ven-disc p,#onetrust-pc-sdk .ot-ven-dets .ot-ven-disc h4{padding-top:5px;padding-bottom:5px;display:block}#onetrust-pc-sdk .ot-ven-dets .ot-ven-disc h4{display:inline-block}#onetrust-pc-sdk .ot-ven-dets p,#onetrust-pc-sdk .ot-ven-dets h4,#onetrust-pc-sdk .ot-ven-dets span{font-size:.69em;text-align:left;vertical-align:middle;word-break:break-word;word-wrap:break-word;margin:0;padding-bottom:10px;padding-left:15px;color:#2e3644}#onetrust-pc-sdk .ot-ven-dets h4{padding-top:5px}#onetrust-pc-sdk .ot-ven-dets span{color:dimgray;padding:0;vertical-align:baseline}#onetrust-pc-sdk .ot-ven-dets .ot-ven-pur h4{border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;padding-bottom:5px;margin-bottom:5px;font-weight:bold}#onetrust-pc-sdk #ot-host-lst .ot-sel-all{float:right;position:relative;margin-right:42px;top:10px}#onetrust-pc-sdk #ot-host-lst .ot-sel-all input[type=checkbox]{width:auto;height:auto}#onetrust-pc-sdk #ot-host-lst .ot-sel-all label{height:20px;width:20px;padding-left:0px}#onetrust-pc-sdk #ot-host-lst .ot-acc-txt{overflow:hidden;width:95%}#onetrust-pc-sdk .ot-host-hdr{position:relative;z-index:1;pointer-events:none;width:calc(100% - 125px);float:left}#onetrust-pc-sdk .ot-host-name,#onetrust-pc-sdk .ot-host-desc{display:inline-block;width:90%}#onetrust-pc-sdk .ot-host-name{pointer-events:none}#onetrust-pc-sdk .ot-host-hdr>a{text-decoration:underline;font-size:.82em;position:relative;z-index:2;float:left;margin-bottom:5px;pointer-events:initial}#onetrust-pc-sdk .ot-host-name+a{margin-top:5px}#onetrust-pc-sdk .ot-host-name,#onetrust-pc-sdk .ot-host-name a,#onetrust-pc-sdk .ot-host-desc,#onetrust-pc-sdk .ot-host-info{color:dimgray;word-break:break-word;word-wrap:break-word}#onetrust-pc-sdk .ot-host-name,#onetrust-pc-sdk .ot-host-name a{font-weight:bold;font-size:.82em;line-height:1.3}#onetrust-pc-sdk .ot-host-name a{font-size:1em}#onetrust-pc-sdk .ot-host-expand{margin-top:3px;margin-bottom:3px;clear:both;display:block;color:#3860be;font-size:.72em;font-weight:normal}#onetrust-pc-sdk .ot-host-expand *{font-size:inherit}#onetrust-pc-sdk .ot-host-desc,#onetrust-pc-sdk .ot-host-info{font-size:.688em;line-height:1.4;font-weight:normal}#onetrust-pc-sdk .ot-host-desc{margin-top:10px}#onetrust-pc-sdk .ot-host-opt{margin:0;font-size:inherit;display:inline-block;width:100%}#onetrust-pc-sdk .ot-host-opt li>div div{font-size:.8em;padding:5px 0}#onetrust-pc-sdk .ot-host-opt li>div div:nth-child(1){width:30%;float:left}#onetrust-pc-sdk .ot-host-opt li>div div:nth-child(2){width:70%;float:left;word-break:break-word;word-wrap:break-word}#onetrust-pc-sdk .ot-host-info{border:none;display:inline-block;width:calc(100% - 10px);padding:10px;margin-bottom:10px;background-color:#f8f8f8}#onetrust-pc-sdk .ot-host-info>div{overflow:auto}#onetrust-pc-sdk #no-results{text-align:center;margin-top:30px}#onetrust-pc-sdk #no-results p{font-size:1em;color:#2e3644;word-break:break-word;word-wrap:break-word}#onetrust-pc-sdk #no-results p span{font-weight:bold}#onetrust-pc-sdk #ot-fltr-modal{width:100%;height:auto;display:none;-moz-transition:.2s ease;-o-transition:.2s ease;-webkit-transition:2s ease;transition:.2s ease;overflow:hidden;opacity:1;right:0}#onetrust-pc-sdk #ot-fltr-modal .ot-label-txt{display:inline-block;font-size:.85em;color:dimgray}#onetrust-pc-sdk #ot-fltr-cnt{z-index:2147483646;background-color:#fff;position:absolute;height:90%;max-height:300px;width:325px;left:210px;margin-top:10px;margin-bottom:20px;padding-right:10px;border-radius:3px;-webkit-box-shadow:0px 0px 12px 2px #c7c5c7;-moz-box-shadow:0px 0px 12px 2px #c7c5c7;box-shadow:0px 0px 12px 2px #c7c5c7}#onetrust-pc-sdk .ot-fltr-scrlcnt{overflow-y:auto;overflow-x:hidden;clear:both;max-height:calc(100% - 60px)}#onetrust-pc-sdk #ot-anchor{border:12px solid transparent;display:none;position:absolute;z-index:2147483647;right:55px;top:75px;transform:rotate(45deg);-o-transform:rotate(45deg);-ms-transform:rotate(45deg);-webkit-transform:rotate(45deg);background-color:#fff;-webkit-box-shadow:-3px -3px 5px -2px #c7c5c7;-moz-box-shadow:-3px -3px 5px -2px #c7c5c7;box-shadow:-3px -3px 5px -2px #c7c5c7}#onetrust-pc-sdk .ot-fltr-btns{margin-left:15px}#onetrust-pc-sdk #filter-apply-handler{margin-right:15px}#onetrust-pc-sdk .ot-fltr-opt{margin-bottom:25px;margin-left:15px;width:75%;position:relative}#onetrust-pc-sdk .ot-fltr-opt p{display:inline-block;margin:0;font-size:.9em;color:#2e3644}#onetrust-pc-sdk .ot-chkbox label span{font-size:.85em;color:dimgray}#onetrust-pc-sdk .ot-chkbox input[type=checkbox]+label::after{content:none;color:#fff}#onetrust-pc-sdk .ot-chkbox input[type=checkbox]:checked+label::after{content:""}#onetrust-pc-sdk .ot-chkbox input[type=checkbox]:focus+label::before{outline-style:solid;outline-width:2px;outline-style:auto}#onetrust-pc-sdk #ot-selall-vencntr,#onetrust-pc-sdk #ot-selall-adtlvencntr,#onetrust-pc-sdk #ot-selall-hostcntr,#onetrust-pc-sdk #ot-selall-licntr,#onetrust-pc-sdk #ot-selall-gnvencntr{right:15px;position:relative;width:20px;height:20px;float:right}#onetrust-pc-sdk #ot-selall-vencntr label,#onetrust-pc-sdk #ot-selall-adtlvencntr label,#onetrust-pc-sdk #ot-selall-hostcntr label,#onetrust-pc-sdk #ot-selall-licntr label,#onetrust-pc-sdk #ot-selall-gnvencntr label{float:left;padding-left:0}#onetrust-pc-sdk #ot-ven-lst:first-child{border-top:1px solid #e2e2e2}#onetrust-pc-sdk ul{list-style:none;padding:0}#onetrust-pc-sdk ul li{position:relative;margin:0;padding:15px 15px 15px 10px;border-bottom:1px solid #e2e2e2}#onetrust-pc-sdk ul li h3{font-size:.75em;color:#656565;margin:0;display:inline-block;width:70%;height:auto;word-break:break-word;word-wrap:break-word}#onetrust-pc-sdk ul li p{margin:0;font-size:.7em}#onetrust-pc-sdk ul li input[type=checkbox]{position:absolute;cursor:pointer;width:100%;height:100%;opacity:0;margin:0;top:0;left:0}#onetrust-pc-sdk .ot-cat-item>button:focus,#onetrust-pc-sdk .ot-acc-cntr>button:focus,#onetrust-pc-sdk li>button:focus{outline:#000 solid 2px}#onetrust-pc-sdk .ot-cat-item>button,#onetrust-pc-sdk .ot-acc-cntr>button,#onetrust-pc-sdk li>button{position:absolute;cursor:pointer;width:100%;height:100%;margin:0;top:0;left:0;z-index:1;max-width:none;border:none}#onetrust-pc-sdk .ot-cat-item>button[aria-expanded=false]~.ot-acc-txt,#onetrust-pc-sdk .ot-acc-cntr>button[aria-expanded=false]~.ot-acc-txt,#onetrust-pc-sdk li>button[aria-expanded=false]~.ot-acc-txt{margin-top:0;max-height:0;opacity:0;overflow:hidden;width:100%;transition:.25s ease-out;display:none}#onetrust-pc-sdk .ot-cat-item>button[aria-expanded=true]~.ot-acc-txt,#onetrust-pc-sdk .ot-acc-cntr>button[aria-expanded=true]~.ot-acc-txt,#onetrust-pc-sdk li>button[aria-expanded=true]~.ot-acc-txt{transition:.1s ease-in;margin-top:10px;width:100%;overflow:auto;display:block}#onetrust-pc-sdk .ot-cat-item>button[aria-expanded=true]~.ot-acc-grpcntr,#onetrust-pc-sdk .ot-acc-cntr>button[aria-expanded=true]~.ot-acc-grpcntr,#onetrust-pc-sdk li>button[aria-expanded=true]~.ot-acc-grpcntr{width:auto;margin-top:0px;padding-bottom:10px}#onetrust-pc-sdk .ot-host-item>button:focus,#onetrust-pc-sdk .ot-ven-item>button:focus{outline:0;border:2px solid #000}#onetrust-pc-sdk .ot-hide-acc>button{pointer-events:none}#onetrust-pc-sdk .ot-hide-acc .ot-plus-minus>*,#onetrust-pc-sdk .ot-hide-acc .ot-arw-cntr>*{visibility:hidden}#onetrust-pc-sdk .ot-hide-acc .ot-acc-hdr{min-height:30px}#onetrust-pc-sdk.ot-addtl-vendors #ot-lst-cnt:not(.ot-host-cnt){padding-right:10px;width:calc(100% - 37px);margin-top:10px;max-height:calc(100% - 90px)}#onetrust-pc-sdk.ot-addtl-vendors #ot-lst-cnt:not(.ot-host-cnt) #ot-sel-blk{background-color:#f9f9fc;border:1px solid #e2e2e2;width:calc(100% - 2px);padding-bottom:5px;padding-top:5px}#onetrust-pc-sdk.ot-addtl-vendors #ot-lst-cnt:not(.ot-host-cnt) .ot-sel-all{padding-right:34px}#onetrust-pc-sdk.ot-addtl-vendors #ot-lst-cnt:not(.ot-host-cnt) .ot-sel-all-chkbox{width:auto}#onetrust-pc-sdk.ot-addtl-vendors #ot-lst-cnt:not(.ot-host-cnt) ul li{border:1px solid #e2e2e2;margin-bottom:10px}#onetrust-pc-sdk.ot-addtl-vendors #ot-lst-cnt:not(.ot-host-cnt) .ot-acc-cntr>.ot-acc-hdr{padding:10px 0 10px 15px}#onetrust-pc-sdk.ot-addtl-vendors .ot-sel-all-chkbox{float:right}#onetrust-pc-sdk.ot-addtl-vendors .ot-plus-minus~.ot-sel-all-chkbox{right:34px}#onetrust-pc-sdk.ot-addtl-vendors #ot-ven-lst:first-child{border-top:none}#onetrust-pc-sdk .ot-acc-cntr{position:relative;border-left:1px solid #e2e2e2;border-right:1px solid #e2e2e2;border-bottom:1px solid #e2e2e2}#onetrust-pc-sdk .ot-acc-cntr input{z-index:1}#onetrust-pc-sdk .ot-acc-cntr>.ot-acc-hdr{background-color:#f9f9fc;padding:5px 0 5px 15px;width:auto}#onetrust-pc-sdk .ot-acc-cntr>.ot-acc-hdr .ot-plus-minus{vertical-align:middle;top:auto}#onetrust-pc-sdk .ot-acc-cntr>.ot-acc-hdr .ot-arw-cntr{right:10px}#onetrust-pc-sdk .ot-acc-cntr>.ot-acc-hdr input{z-index:2}#onetrust-pc-sdk .ot-acc-cntr>input[type=checkbox]:checked~.ot-acc-hdr{border-bottom:1px solid #e2e2e2}#onetrust-pc-sdk .ot-acc-cntr>.ot-acc-txt{padding-left:10px;padding-right:10px}#onetrust-pc-sdk .ot-acc-cntr button[aria-expanded=true]~.ot-acc-txt{width:auto}#onetrust-pc-sdk .ot-acc-cntr .ot-addtl-venbox{display:none}#onetrust-pc-sdk .ot-vlst-cntr{margin-bottom:0;width:100%}#onetrust-pc-sdk .ot-vensec-title{font-size:.813em;vertical-align:middle;display:inline-block}#onetrust-pc-sdk .category-vendors-list-handler,#onetrust-pc-sdk .category-vendors-list-handler+a{margin-left:0;margin-top:10px}#onetrust-pc-sdk #ot-selall-vencntr.line-through label::after,#onetrust-pc-sdk #ot-selall-adtlvencntr.line-through label::after,#onetrust-pc-sdk #ot-selall-licntr.line-through label::after,#onetrust-pc-sdk #ot-selall-hostcntr.line-through label::after,#onetrust-pc-sdk #ot-selall-gnvencntr.line-through label::after{height:auto;border-left:0;transform:none;-o-transform:none;-ms-transform:none;-webkit-transform:none;left:5px;top:9px}#onetrust-pc-sdk #ot-category-title{float:left;padding-bottom:10px;font-size:1em;width:100%}#onetrust-pc-sdk .ot-cat-grp{margin-top:10px}#onetrust-pc-sdk .ot-cat-item{line-height:1.1;margin-top:10px;display:inline-block;width:100%}#onetrust-pc-sdk .ot-btn-container{text-align:right}#onetrust-pc-sdk .ot-btn-container button{display:inline-block;font-size:.75em;letter-spacing:.08em;margin-top:19px}#onetrust-pc-sdk #close-pc-btn-handler.ot-close-icon{position:absolute;top:10px;right:0;z-index:1;padding:0;background-color:transparent;border:none}#onetrust-pc-sdk #close-pc-btn-handler.ot-close-icon:hover{opacity:.7}#onetrust-pc-sdk #close-pc-btn-handler.ot-close-icon svg{display:block;height:10px;width:10px}#onetrust-pc-sdk #clear-filters-handler{margin-top:20px;margin-bottom:10px;float:right;max-width:200px;text-decoration:none;color:#3860be;font-size:.9em;font-weight:bold;background-color:transparent;border-color:transparent;padding:1px}#onetrust-pc-sdk #clear-filters-handler:hover{color:#2285f7}#onetrust-pc-sdk #clear-filters-handler:focus{outline:#000 solid 1px}#onetrust-pc-sdk .ot-accordion-layout.ot-cat-item{position:relative;border-radius:2px;margin:0;padding:0;border:1px solid #d8d8d8;border-top:none;width:calc(100% - 2px);float:left}#onetrust-pc-sdk .ot-accordion-layout.ot-cat-item:first-of-type{margin-top:10px;border-top:1px solid #d8d8d8}#onetrust-pc-sdk .ot-accordion-layout .ot-acc-grpdesc{padding-left:20px;padding-right:20px;width:calc(100% - 40px);font-size:.812em;margin-bottom:10px;margin-top:15px}#onetrust-pc-sdk .ot-accordion-layout .ot-acc-grpdesc>ul{padding-top:10px}#onetrust-pc-sdk .ot-accordion-layout .ot-acc-grpdesc>ul li{padding-top:0;line-height:1.5;padding-bottom:10px}#onetrust-pc-sdk .ot-accordion-layout div+.ot-acc-grpdesc{margin-top:5px}#onetrust-pc-sdk .ot-accordion-layout .ot-vlst-cntr:first-child{margin-top:10px}#onetrust-pc-sdk .ot-accordion-layout .ot-vlst-cntr:last-child,#onetrust-pc-sdk .ot-accordion-layout .ot-hlst-cntr:last-child{margin-bottom:5px}#onetrust-pc-sdk .ot-accordion-layout .ot-acc-hdr{padding-top:11.5px;padding-bottom:11.5px;padding-left:20px;padding-right:20px;width:calc(100% - 40px);display:inline-block}#onetrust-pc-sdk .ot-accordion-layout .ot-acc-txt{width:100%;padding:0px}#onetrust-pc-sdk .ot-accordion-layout .ot-subgrp-cntr{padding-left:20px;padding-right:15px;padding-bottom:0;width:calc(100% - 35px)}#onetrust-pc-sdk .ot-accordion-layout .ot-subgrp{padding-right:5px}#onetrust-pc-sdk .ot-accordion-layout .ot-acc-grpcntr{z-index:1;position:relative}#onetrust-pc-sdk .ot-accordion-layout .ot-cat-header+.ot-arw-cntr{position:absolute;top:50%;transform:translateY(-50%);right:20px;margin-top:-2px}#onetrust-pc-sdk .ot-accordion-layout .ot-cat-header+.ot-arw-cntr .ot-arw{width:15px;height:20px;margin-left:5px;color:dimgray}#onetrust-pc-sdk .ot-accordion-layout .ot-cat-header{float:none;color:#2e3644;margin:0;display:inline-block;height:auto;word-wrap:break-word;min-height:inherit}#onetrust-pc-sdk .ot-accordion-layout .ot-vlst-cntr,#onetrust-pc-sdk .ot-accordion-layout .ot-hlst-cntr{padding-left:20px;width:calc(100% - 20px);display:inline-block;margin-top:0px;padding-bottom:2px}#onetrust-pc-sdk .ot-accordion-layout .ot-acc-hdr{position:relative;min-height:25px}#onetrust-pc-sdk .ot-accordion-layout h4~.ot-tgl,#onetrust-pc-sdk .ot-accordion-layout h4~.ot-always-active{position:absolute;top:50%;transform:translateY(-50%);right:20px}#onetrust-pc-sdk .ot-accordion-layout h4~.ot-tgl+.ot-tgl{right:95px}#onetrust-pc-sdk .ot-accordion-layout .category-vendors-list-handler,#onetrust-pc-sdk .ot-accordion-layout .category-vendors-list-handler+a{margin-top:5px}#onetrust-pc-sdk .ot-enbl-chr h4~.ot-tgl,#onetrust-pc-sdk .ot-enbl-chr h4~.ot-always-active{right:45px}#onetrust-pc-sdk .ot-enbl-chr h4~.ot-tgl+.ot-tgl{right:120px}#onetrust-pc-sdk .ot-enbl-chr .ot-pli-hdr.ot-leg-border-color span:first-child{width:90px}#onetrust-pc-sdk .ot-enbl-chr li.ot-subgrp>h5+.ot-tgl-cntr{padding-right:25px}#onetrust-pc-sdk .ot-plus-minus{width:20px;height:20px;font-size:1.5em;position:relative;display:inline-block;margin-right:5px;top:3px}#onetrust-pc-sdk .ot-plus-minus span{position:absolute;background:#27455c;border-radius:1px}#onetrust-pc-sdk .ot-plus-minus span:first-of-type{top:25%;bottom:25%;width:10%;left:45%}#onetrust-pc-sdk .ot-plus-minus span:last-of-type{left:25%;right:25%;height:10%;top:45%}#onetrust-pc-sdk button[aria-expanded=true]~.ot-acc-hdr .ot-arw,#onetrust-pc-sdk button[aria-expanded=true]~.ot-acc-hdr .ot-plus-minus span:first-of-type,#onetrust-pc-sdk button[aria-expanded=true]~.ot-acc-hdr .ot-plus-minus span:last-of-type{transform:rotate(90deg)}#onetrust-pc-sdk button[aria-expanded=true]~.ot-acc-hdr .ot-plus-minus span:last-of-type{left:50%;right:50%}#onetrust-pc-sdk #ot-selall-vencntr label,#onetrust-pc-sdk #ot-selall-adtlvencntr label,#onetrust-pc-sdk #ot-selall-hostcntr label,#onetrust-pc-sdk #ot-selall-licntr label{position:relative;display:inline-block;width:20px;height:20px}#onetrust-pc-sdk .ot-host-item .ot-plus-minus,#onetrust-pc-sdk .ot-ven-item .ot-plus-minus{float:left;margin-right:8px;top:10px}#onetrust-pc-sdk .ot-ven-item ul{list-style:none inside;font-size:100%;margin:0}#onetrust-pc-sdk .ot-ven-item ul li{margin:0 !important;padding:0;border:none !important}#onetrust-pc-sdk .ot-pli-hdr{color:#77808e;overflow:hidden;padding-top:7.5px;padding-bottom:7.5px;width:calc(100% - 2px);border-top-left-radius:3px;border-top-right-radius:3px}#onetrust-pc-sdk .ot-pli-hdr span:first-child{top:50%;transform:translateY(50%);max-width:90px}#onetrust-pc-sdk .ot-pli-hdr span:last-child{padding-right:10px;max-width:95px;text-align:center}#onetrust-pc-sdk .ot-li-title{float:right;font-size:.813em}#onetrust-pc-sdk .ot-pli-hdr.ot-leg-border-color{background-color:#f4f4f4;border:1px solid #d8d8d8}#onetrust-pc-sdk .ot-pli-hdr.ot-leg-border-color span:first-child{text-align:left;width:70px}#onetrust-pc-sdk li.ot-subgrp>h5,#onetrust-pc-sdk .ot-cat-header{width:calc(100% - 130px)}#onetrust-pc-sdk li.ot-subgrp>h5+.ot-tgl-cntr{padding-left:13px}#onetrust-pc-sdk .ot-acc-grpcntr .ot-acc-grpdesc{margin-bottom:5px}#onetrust-pc-sdk .ot-acc-grpcntr .ot-subgrp-cntr{border-top:1px solid #d8d8d8}#onetrust-pc-sdk .ot-acc-grpcntr .ot-vlst-cntr+.ot-subgrp-cntr{border-top:none}#onetrust-pc-sdk .ot-acc-hdr .ot-arw-cntr+.ot-tgl-cntr,#onetrust-pc-sdk .ot-acc-txt h4+.ot-tgl-cntr{padding-left:13px}#onetrust-pc-sdk .ot-pli-hdr~.ot-cat-item .ot-subgrp>h5,#onetrust-pc-sdk .ot-pli-hdr~.ot-cat-item .ot-cat-header{width:calc(100% - 145px)}#onetrust-pc-sdk .ot-pli-hdr~.ot-cat-item h5+.ot-tgl-cntr,#onetrust-pc-sdk .ot-pli-hdr~.ot-cat-item .ot-cat-header+.ot-tgl{padding-left:28px}#onetrust-pc-sdk .ot-sel-all-hdr,#onetrust-pc-sdk .ot-sel-all-chkbox{display:inline-block;width:100%;position:relative}#onetrust-pc-sdk .ot-sel-all-chkbox{z-index:1}#onetrust-pc-sdk .ot-sel-all{margin:0;position:relative;padding-right:23px;float:right}#onetrust-pc-sdk .ot-consent-hdr,#onetrust-pc-sdk .ot-li-hdr{float:right;font-size:.812em;line-height:normal;text-align:center;word-break:break-word;word-wrap:break-word}#onetrust-pc-sdk .ot-li-hdr{max-width:100px;padding-right:10px}#onetrust-pc-sdk .ot-consent-hdr{max-width:55px}#onetrust-pc-sdk #ot-selall-licntr{display:block;width:21px;height:auto;float:right;position:relative;right:80px}#onetrust-pc-sdk #ot-selall-licntr label{position:absolute}#onetrust-pc-sdk .ot-ven-ctgl{margin-left:66px}#onetrust-pc-sdk .ot-ven-litgl+.ot-arw-cntr{margin-left:81px}#onetrust-pc-sdk .ot-enbl-chr .ot-host-cnt .ot-tgl-cntr{width:auto}#onetrust-pc-sdk #ot-lst-cnt:not(.ot-host-cnt) .ot-tgl-cntr{width:auto;top:auto;height:20px}#onetrust-pc-sdk #ot-lst-cnt .ot-chkbox{position:relative;display:inline-block;width:20px;height:20px}#onetrust-pc-sdk #ot-lst-cnt .ot-chkbox label{position:absolute;padding:0;width:20px;height:20px}#onetrust-pc-sdk .ot-acc-grpdesc+.ot-leg-btn-container{padding-left:20px;padding-right:20px;width:calc(100% - 40px);margin-bottom:5px}#onetrust-pc-sdk .ot-subgrp .ot-leg-btn-container{margin-bottom:5px}#onetrust-pc-sdk #ot-ven-lst .ot-leg-btn-container{margin-top:10px}#onetrust-pc-sdk .ot-leg-btn-container{display:inline-block;width:100%;margin-bottom:10px}#onetrust-pc-sdk .ot-leg-btn-container button{height:auto;padding:6.5px 8px;margin-bottom:0;letter-spacing:0;font-size:.75em;line-height:normal}#onetrust-pc-sdk .ot-leg-btn-container svg{display:none;height:14px;width:14px;padding-right:5px;vertical-align:sub}#onetrust-pc-sdk .ot-active-leg-btn{cursor:default;pointer-events:none}#onetrust-pc-sdk .ot-active-leg-btn svg{display:inline-block}#onetrust-pc-sdk .ot-remove-objection-handler{text-decoration:underline;padding:0;font-size:.75em;font-weight:600;line-height:1;padding-left:10px}#onetrust-pc-sdk .ot-obj-leg-btn-handler span{font-weight:bold;text-align:center;font-size:inherit;line-height:1.5}#onetrust-pc-sdk.ot-close-btn-link #close-pc-btn-handler{border:none;height:auto;line-height:1.5;text-decoration:underline;font-size:.69em;background:none;right:15px;top:15px;width:auto;font-weight:normal}#onetrust-pc-sdk[dir=rtl] #ot-back-arw,#onetrust-pc-sdk[dir=rtl] input~.ot-acc-hdr .ot-arw{transform:rotate(180deg);-o-transform:rotate(180deg);-ms-transform:rotate(180deg);-webkit-transform:rotate(180deg)}#onetrust-pc-sdk[dir=rtl] input:checked~.ot-acc-hdr .ot-arw{transform:rotate(270deg);-o-transform:rotate(270deg);-ms-transform:rotate(270deg);-webkit-transform:rotate(270deg)}#onetrust-pc-sdk[dir=rtl] .ot-chkbox label::after{transform:rotate(45deg);-webkit-transform:rotate(45deg);-o-transform:rotate(45deg);-ms-transform:rotate(45deg);border-left:0;border-right:3px solid}#onetrust-pc-sdk[dir=rtl] .ot-search-cntr>svg{right:0}@media only screen and (max-width: 600px){#onetrust-pc-sdk.otPcCenter{left:0;min-width:100%;height:100%;top:0;border-radius:0}#onetrust-pc-sdk #ot-pc-content,#onetrust-pc-sdk.ot-ftr-stacked .ot-btn-container{margin:1px 3px 0 10px;padding-right:10px;width:calc(100% - 23px)}#onetrust-pc-sdk .ot-btn-container button{max-width:none;letter-spacing:.01em}#onetrust-pc-sdk #close-pc-btn-handler{top:10px;right:17px}#onetrust-pc-sdk p{font-size:.7em}#onetrust-pc-sdk #ot-pc-hdr{margin:10px 10px 0 5px;width:calc(100% - 15px)}#onetrust-pc-sdk .vendor-search-handler{font-size:1em}#onetrust-pc-sdk #ot-back-arw{margin-left:12px}#onetrust-pc-sdk #ot-lst-cnt{margin:0;padding:0 5px 0 10px;min-width:95%}#onetrust-pc-sdk .switch+p{max-width:80%}#onetrust-pc-sdk .ot-ftr-stacked button{width:100%}#onetrust-pc-sdk #ot-fltr-cnt{max-width:320px;width:90%;border-top-right-radius:0;border-bottom-right-radius:0;margin:0;margin-left:15px;left:auto;right:40px;top:85px}#onetrust-pc-sdk .ot-fltr-opt{margin-left:25px;margin-bottom:10px}#onetrust-pc-sdk .ot-pc-refuse-all-handler{margin-bottom:0}#onetrust-pc-sdk #ot-fltr-cnt{right:40px}}@media only screen and (max-width: 476px){#onetrust-pc-sdk .ot-fltr-cntr,#onetrust-pc-sdk #ot-fltr-cnt{right:10px}#onetrust-pc-sdk #ot-anchor{right:25px}#onetrust-pc-sdk button{width:100%}#onetrust-pc-sdk:not(.ot-addtl-vendors) #ot-pc-lst:not(.ot-enbl-chr) .ot-sel-all{padding-right:9px}#onetrust-pc-sdk:not(.ot-addtl-vendors) #ot-pc-lst:not(.ot-enbl-chr) .ot-tgl-cntr{right:0}}@media only screen and (max-width: 896px)and (max-height: 425px)and (orientation: landscape){#onetrust-pc-sdk.otPcCenter{left:0;top:0;min-width:100%;height:100%;border-radius:0}#onetrust-pc-sdk #ot-anchor{left:initial;right:50px}#onetrust-pc-sdk #ot-lst-title{margin-top:12px}#onetrust-pc-sdk #ot-lst-title *{font-size:inherit}#onetrust-pc-sdk #ot-pc-hdr input{margin-right:0;padding-right:45px}#onetrust-pc-sdk .switch+p{max-width:85%}#onetrust-pc-sdk #ot-sel-blk{position:static}#onetrust-pc-sdk #ot-pc-lst{overflow:auto}#onetrust-pc-sdk #ot-lst-cnt{max-height:none;overflow:initial}#onetrust-pc-sdk #ot-lst-cnt.no-results{height:auto}#onetrust-pc-sdk input{font-size:1em !important}#onetrust-pc-sdk p{font-size:.6em}#onetrust-pc-sdk #ot-fltr-modal{width:100%;top:0}#onetrust-pc-sdk ul li p,#onetrust-pc-sdk .category-vendors-list-handler,#onetrust-pc-sdk .category-vendors-list-handler+a,#onetrust-pc-sdk .category-host-list-handler{font-size:.6em}#onetrust-pc-sdk.ot-shw-fltr #ot-anchor{display:none !important}#onetrust-pc-sdk.ot-shw-fltr #ot-pc-lst{height:100% !important;overflow:hidden;top:0px}#onetrust-pc-sdk.ot-shw-fltr #ot-fltr-cnt{margin:0;height:100%;max-height:none;padding:10px;top:0;width:calc(100% - 20px);position:absolute;right:0;left:0;max-width:none}#onetrust-pc-sdk.ot-shw-fltr .ot-fltr-scrlcnt{max-height:calc(100% - 65px)}}
+            #onetrust-consent-sdk #onetrust-pc-sdk,
+                #onetrust-consent-sdk #ot-search-cntr,
+                #onetrust-consent-sdk #onetrust-pc-sdk .ot-switch.ot-toggle,
+                #onetrust-consent-sdk #onetrust-pc-sdk ot-grp-hdr1 .checkbox,
+                #onetrust-consent-sdk #onetrust-pc-sdk #ot-pc-title:after
+                ,#onetrust-consent-sdk #onetrust-pc-sdk #ot-sel-blk,
+                        #onetrust-consent-sdk #onetrust-pc-sdk #ot-fltr-cnt,
+                        #onetrust-consent-sdk #onetrust-pc-sdk #ot-anchor {
+                    background-color: #FFFFFF;
+                }
+               
+            #onetrust-consent-sdk #onetrust-pc-sdk h3,
+                #onetrust-consent-sdk #onetrust-pc-sdk h4,
+                #onetrust-consent-sdk #onetrust-pc-sdk h5,
+                #onetrust-consent-sdk #onetrust-pc-sdk h6,
+                #onetrust-consent-sdk #onetrust-pc-sdk p,
+                #onetrust-consent-sdk #onetrust-pc-sdk #ot-ven-lst .ot-ven-opts p,
+                #onetrust-consent-sdk #onetrust-pc-sdk #ot-pc-desc,
+                #onetrust-consent-sdk #onetrust-pc-sdk #ot-pc-title,
+                #onetrust-consent-sdk #onetrust-pc-sdk .ot-li-title,
+                #onetrust-consent-sdk #onetrust-pc-sdk .ot-sel-all-hdr span,
+                #onetrust-consent-sdk #onetrust-pc-sdk #ot-host-lst .ot-host-info,
+                #onetrust-consent-sdk #onetrust-pc-sdk #ot-fltr-modal #modal-header,
+                #onetrust-consent-sdk #onetrust-pc-sdk .ot-checkbox label span,
+                #onetrust-consent-sdk #onetrust-pc-sdk #ot-pc-lst #ot-sel-blk p,
+                #onetrust-consent-sdk #onetrust-pc-sdk #ot-pc-lst #ot-lst-title h3,
+                #onetrust-consent-sdk #onetrust-pc-sdk #ot-pc-lst .back-btn-handler p,
+                #onetrust-consent-sdk #onetrust-pc-sdk #ot-pc-lst .ot-ven-name,
+                #onetrust-consent-sdk #onetrust-pc-sdk #ot-pc-lst #ot-ven-lst .consent-category,
+                #onetrust-consent-sdk #onetrust-pc-sdk .ot-leg-btn-container .ot-inactive-leg-btn,
+                #onetrust-consent-sdk #onetrust-pc-sdk .ot-label-status,
+                #onetrust-consent-sdk #onetrust-pc-sdk .ot-chkbox label span,
+                #onetrust-consent-sdk #onetrust-pc-sdk #clear-filters-handler 
+                {
+                    color: #696969;
+                }
+             #onetrust-consent-sdk #onetrust-pc-sdk .privacy-notice-link,
+                    #onetrust-consent-sdk #onetrust-pc-sdk .category-vendors-list-handler,
+                    #onetrust-consent-sdk #onetrust-pc-sdk .category-vendors-list-handler + a,
+                    #onetrust-consent-sdk #onetrust-pc-sdk .category-host-list-handler,
+                    #onetrust-consent-sdk #onetrust-pc-sdk .ot-ven-link,
+                    #onetrust-consent-sdk #onetrust-pc-sdk #ot-host-lst .ot-host-name a,
+                    #onetrust-consent-sdk #onetrust-pc-sdk #ot-host-lst .ot-acc-hdr .ot-host-expand,
+                    #onetrust-consent-sdk #onetrust-pc-sdk #ot-host-lst .ot-host-info a
+                    {
+                        color: #3860BE;
+                    }
+            #onetrust-consent-sdk #onetrust-pc-sdk .category-vendors-list-handler:hover { opacity: .7;}
+            #onetrust-consent-sdk #onetrust-pc-sdk .ot-acc-grpcntr.ot-acc-txt,
+            #onetrust-consent-sdk #onetrust-pc-sdk .ot-acc-txt .ot-subgrp-tgl .ot-switch.ot-toggle
+             {
+                background-color: #E9E9E9;
+            }
+             #onetrust-consent-sdk #onetrust-pc-sdk #ot-host-lst .ot-host-info,
+                    #onetrust-consent-sdk #onetrust-pc-sdk .ot-acc-txt .ot-ven-dets
+                            {
+                                background-color: #E9E9E9;
+                            }
+        #onetrust-consent-sdk #onetrust-pc-sdk 
+            button:not(#clear-filters-handler):not(.ot-close-icon):not(#filter-btn-handler):not(.ot-remove-objection-handler):not(.ot-obj-leg-btn-handler):not([aria-expanded]):not(.ot-link-btn),
+            #onetrust-consent-sdk #onetrust-pc-sdk .ot-leg-btn-container .ot-active-leg-btn {
+                background-color: #1371C3;border-color: #1371C3;
+                color: #FFFFFF;
+            }
+            #onetrust-consent-sdk #onetrust-pc-sdk .ot-active-menu {
+                border-color: #1371C3;
+            }
+            
+            #onetrust-consent-sdk #onetrust-pc-sdk .ot-leg-btn-container .ot-remove-objection-handler{
+                background-color: transparent;
+                border: 1px solid transparent;
+            }
+            #onetrust-consent-sdk #onetrust-pc-sdk .ot-leg-btn-container .ot-inactive-leg-btn {
+                background-color: #FFFFFF;
+                color: #78808E; border-color: #78808E;
+            }
+            
+            #onetrust-consent-sdk #onetrust-pc-sdk .ot-tgl input:focus + .ot-switch, .ot-switch .ot-switch-nob, .ot-switch .ot-switch-nob:before,
+            #onetrust-pc-sdk .ot-checkbox input[type="checkbox"]:focus + label::before,
+            #onetrust-pc-sdk .ot-chkbox input[type="checkbox"]:focus + label::before {
+                outline-color: #000000;
+                outline-width: 1px;
+            }
+            #onetrust-pc-sdk .ot-host-item > button:focus, #onetrust-pc-sdk .ot-ven-item > button:focus {
+                border: 1px solid #000000;
+            }
+            #onetrust-consent-sdk #onetrust-pc-sdk *:focus,
+            #onetrust-consent-sdk #onetrust-pc-sdk .ot-vlst-cntr > a:focus {
+               outline: 1px solid #000000;
+            }.ot-sdk-cookie-policy{font-family:inherit;font-size:16px}.ot-sdk-cookie-policy.otRelFont{font-size:1rem}.ot-sdk-cookie-policy h3,.ot-sdk-cookie-policy h4,.ot-sdk-cookie-policy h6,.ot-sdk-cookie-policy p,.ot-sdk-cookie-policy li,.ot-sdk-cookie-policy a,.ot-sdk-cookie-policy th,.ot-sdk-cookie-policy #cookie-policy-description,.ot-sdk-cookie-policy .ot-sdk-cookie-policy-group,.ot-sdk-cookie-policy #cookie-policy-title{color:dimgray}.ot-sdk-cookie-policy #cookie-policy-description{margin-bottom:1em}.ot-sdk-cookie-policy h4{font-size:1.2em}.ot-sdk-cookie-policy h6{font-size:1em;margin-top:2em}.ot-sdk-cookie-policy th{min-width:75px}.ot-sdk-cookie-policy a,.ot-sdk-cookie-policy a:hover{background:#fff}.ot-sdk-cookie-policy thead{background-color:#f6f6f4;font-weight:bold}.ot-sdk-cookie-policy .ot-mobile-border{display:none}.ot-sdk-cookie-policy section{margin-bottom:2em}.ot-sdk-cookie-policy table{border-collapse:inherit}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy{font-family:inherit;font-size:1rem}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy h3,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy h4,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy h6,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy p,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy li,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy a,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy th,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy #cookie-policy-description,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy .ot-sdk-cookie-policy-group,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy #cookie-policy-title{color:dimgray}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy #cookie-policy-description{margin-bottom:1em}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy .ot-sdk-subgroup{margin-left:1.5em}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy #cookie-policy-description,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy .ot-sdk-cookie-policy-group-desc,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy .ot-table-header,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy a,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy span,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy td{font-size:.9em}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy td span,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy td a{font-size:inherit}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy .ot-sdk-cookie-policy-group{font-size:1em;margin-bottom:.6em}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy .ot-sdk-cookie-policy-title{margin-bottom:1.2em}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy>section{margin-bottom:1em}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy th{min-width:75px}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy a,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy a:hover{background:#fff}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy thead{background-color:#f6f6f4;font-weight:bold}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy .ot-mobile-border{display:none}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy section{margin-bottom:2em}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy .ot-sdk-subgroup ul li{list-style:disc;margin-left:1.5em}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy .ot-sdk-subgroup ul li h4{display:inline-block}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy table{border-collapse:inherit;margin:auto;border:1px solid #d7d7d7;border-radius:5px;border-spacing:initial;width:100%;overflow:hidden}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy table th,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy table td{border-bottom:1px solid #d7d7d7;border-right:1px solid #d7d7d7}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy table tr:last-child td{border-bottom:0px}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy table tr th:last-child,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy table tr td:last-child{border-right:0px}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy table .ot-host,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy table .ot-cookies-type{width:25%}.ot-sdk-cookie-policy[dir=rtl]{text-align:left}#ot-sdk-cookie-policy h3{font-size:1.5em}@media only screen and (max-width: 530px){.ot-sdk-cookie-policy:not(#ot-sdk-cookie-policy-v2) table,.ot-sdk-cookie-policy:not(#ot-sdk-cookie-policy-v2) thead,.ot-sdk-cookie-policy:not(#ot-sdk-cookie-policy-v2) tbody,.ot-sdk-cookie-policy:not(#ot-sdk-cookie-policy-v2) th,.ot-sdk-cookie-policy:not(#ot-sdk-cookie-policy-v2) td,.ot-sdk-cookie-policy:not(#ot-sdk-cookie-policy-v2) tr{display:block}.ot-sdk-cookie-policy:not(#ot-sdk-cookie-policy-v2) thead tr{position:absolute;top:-9999px;left:-9999px}.ot-sdk-cookie-policy:not(#ot-sdk-cookie-policy-v2) tr{margin:0 0 1em 0}.ot-sdk-cookie-policy:not(#ot-sdk-cookie-policy-v2) tr:nth-child(odd),.ot-sdk-cookie-policy:not(#ot-sdk-cookie-policy-v2) tr:nth-child(odd) a{background:#f6f6f4}.ot-sdk-cookie-policy:not(#ot-sdk-cookie-policy-v2) td{border:none;border-bottom:1px solid #eee;position:relative;padding-left:50%}.ot-sdk-cookie-policy:not(#ot-sdk-cookie-policy-v2) td:before{position:absolute;height:100%;left:6px;width:40%;padding-right:10px}.ot-sdk-cookie-policy:not(#ot-sdk-cookie-policy-v2) .ot-mobile-border{display:inline-block;background-color:#e4e4e4;position:absolute;height:100%;top:0;left:45%;width:2px}.ot-sdk-cookie-policy:not(#ot-sdk-cookie-policy-v2) td:before{content:attr(data-label);font-weight:bold}.ot-sdk-cookie-policy:not(#ot-sdk-cookie-policy-v2) li{word-break:break-word;word-wrap:break-word}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy table{overflow:hidden}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy table td{border:none;border-bottom:1px solid #d7d7d7}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy table,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy thead,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy tbody,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy th,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy td,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy tr{display:block}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy table .ot-host,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy table .ot-cookies-type{width:auto}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy tr{margin:0 0 1em 0}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy td:before{height:100%;width:40%;padding-right:10px}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy td:before{content:attr(data-label);font-weight:bold}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy li{word-break:break-word;word-wrap:break-word}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy thead tr{position:absolute;top:-9999px;left:-9999px;z-index:-9999}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy table tr:last-child td{border-bottom:1px solid #d7d7d7;border-right:0px}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy table tr:last-child td:last-child{border-bottom:0px}}
+                
+                    #ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy h5,
+                    #ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy h6,
+                    #ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy li,
+                    #ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy p,
+                    #ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy a,
+                    #ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy span,
+                    #ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy td,
+                    #ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy #cookie-policy-description {
+                        color: #696969;
+                    }
+                    #ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy th {
+                        color: #696969;
+                    }
+                    #ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy .ot-sdk-cookie-policy-group {
+                        color: #696969;
+                    }
+                    
+                    #ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy #cookie-policy-title {
+                            color: #696969;
+                        }
+                    
+            
+                    #ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy table th {
+                            background-color: #F8F8F8;
+                        }
+                    
+            .ot-floating-button__front{background-image:url('https://optanon.blob.core.windows.net/logos/static/ot_persistent_cookie.png')}</style><script async="" type="text/javascript" class="optanon-category-C0002" src="./eleonore __ michael - middlebury, vt_files/gtm.js" data-airgap-id="57"></script><script async="" type="text/javascript" class="optanon-category-C0002" src="./eleonore __ michael - middlebury, vt_files/f.txt" data-airgap-id="58"></script><meta http-equiv="origin-trial" content="A0VQgOQvA+kwCj319NCwgf8+syUgEQ8/LLpB8RxxlRC3AkJ9xx8IAvVuQ/dcwy0ok7sGKufLLu6WhsXbQR9/UwwAAACFeyJvcmlnaW4iOiJodHRwczovL2RvdWJsZWNsaWNrLm5ldDo0NDMiLCJmZWF0dXJlIjoiUHJpdmFjeVNhbmRib3hBZHNBUElzIiwiZXhwaXJ5IjoxNjg4MDgzMTk5LCJpc1N1YmRvbWFpbiI6dHJ1ZSwiaXNUaGlyZFBhcnR5Ijp0cnVlfQ=="><meta http-equiv="origin-trial" content="A6kRo9zXJhOvsR4D/VeZ9CiApPAxnOGzBkW88d8eIt9ex2oOzlX+AoUk/BS50Y9Ysy2jwyHR49Mb7XwP+l9yygIAAACLeyJvcmlnaW4iOiJodHRwczovL2dvb2dsZXN5bmRpY2F0aW9uLmNvbTo0NDMiLCJmZWF0dXJlIjoiUHJpdmFjeVNhbmRib3hBZHNBUElzIiwiZXhwaXJ5IjoxNjg4MDgzMTk5LCJpc1N1YmRvbWFpbiI6dHJ1ZSwiaXNUaGlyZFBhcnR5Ijp0cnVlfQ=="><meta http-equiv="origin-trial" content="A3mbHZoS4VJtJ8j1aE8+Z9vaGf/oMV1eTNIWMrvGqWgNnOmvaxnRGliqKIZU2eiTzCj5Qpz8B1/UTTLuony5bAAAAACLeyJvcmlnaW4iOiJodHRwczovL2dvb2dsZXRhZ3NlcnZpY2VzLmNvbTo0NDMiLCJmZWF0dXJlIjoiUHJpdmFjeVNhbmRib3hBZHNBUElzIiwiZXhwaXJ5IjoxNjg4MDgzMTk5LCJpc1N1YmRvbWFpbiI6dHJ1ZSwiaXNUaGlyZFBhcnR5Ijp0cnVlfQ=="><meta http-equiv="origin-trial" content="As0hBNJ8h++fNYlkq8cTye2qDLyom8NddByiVytXGGD0YVE+2CEuTCpqXMDxdhOMILKoaiaYifwEvCRlJ/9GcQ8AAAB8eyJvcmlnaW4iOiJodHRwczovL2RvdWJsZWNsaWNrLm5ldDo0NDMiLCJmZWF0dXJlIjoiV2ViVmlld1hSZXF1ZXN0ZWRXaXRoRGVwcmVjYXRpb24iLCJleHBpcnkiOjE3MTk1MzI3OTksImlzU3ViZG9tYWluIjp0cnVlfQ=="><meta http-equiv="origin-trial" content="AgRYsXo24ypxC89CJanC+JgEmraCCBebKl8ZmG7Tj5oJNx0cmH0NtNRZs3NB5ubhpbX/bIt7l2zJOSyO64NGmwMAAACCeyJvcmlnaW4iOiJodHRwczovL2dvb2dsZXN5bmRpY2F0aW9uLmNvbTo0NDMiLCJmZWF0dXJlIjoiV2ViVmlld1hSZXF1ZXN0ZWRXaXRoRGVwcmVjYXRpb24iLCJleHBpcnkiOjE3MTk1MzI3OTksImlzU3ViZG9tYWluIjp0cnVlfQ=="><script src="./eleonore __ michael - middlebury, vt_files/f(1).txt" async="" data-airgap-id="59"></script><script type="text/javascript" src="./eleonore __ michael - middlebury, vt_files/singular-sdk.js" data-airgap-id="60"></script><link rel="stylesheet" type="text/css" media="screen" href="./eleonore __ michael - middlebury, vt_files/player.css" data-airgap-id="85"><style type="text/css">.TranscriptCue_lazy_module_cueListItem__da7e05d9{position:absolute;width:100%;top:0;left:0;padding:0;list-style:none;margin-bottom:8px}.TranscriptCue_lazy_module_cueListItem__da7e05d9 .TranscriptCue_lazy_module_cue__da7e05d9{height:100%;display:block;margin-bottom:8px}.TranscriptCue_lazy_module_cueListItem__da7e05d9:hover{text-decoration:underline}</style><style type="text/css">.TranscriptList_lazy_module_container__8b125cfe{display:flex;padding:12px 30px;background-color:rgba(0,0,0,.9);overflow-y:scroll;height:calc(100% - 32px)}.TranscriptList_lazy_module_list__8b125cfe{width:100%;position:relative;font-size:1.5em;list-style:none}</style><style type="text/css">.Transcript_lazy_module_transcript__38bf48c3{pointer-events:all;width:100%;position:absolute;top:0;bottom:0;height:calc(100% - 32px)}.Transcript_lazy_module_transcript__38bf48c3 .Transcript_lazy_module_controls__38bf48c3{display:flex;width:100%}.Transcript_lazy_module_transcript__38bf48c3 .Transcript_lazy_module_controls__38bf48c3 form{flex:10}.Transcript_lazy_module_transcript__38bf48c3 .Transcript_lazy_module_controls__38bf48c3 select{flex:1;width:64px}</style><style data-player="3aaa644b-884d-4353-8ea3-ec56a80959f4"></style><script src="./eleonore __ michael - middlebury, vt_files/cast_sender.js" async="" defer=""></script><script src="./eleonore __ michael - middlebury, vt_files/cast_framework.js"></script><script src="./eleonore __ michael - middlebury, vt_files/cast_sender(1).js"></script></head><body class="showfocus"><div id="__next" data-reactroot=""><div style="width: 100%; top: 0px;"></div><div class="wrap_content"></div><div class="naniiu-0 hidfuh"><div class="sc-1bh5l0d-3 kWrgkE single-video-page-container"><div class="sc-1bh5l0d-0 sc-1bh5l0d-4 dkGhmf hCdIXa"><div class="anpl1c-3 sc-1ght6yx-0 eewfRr bBBFcD" id="header"><div class="anpl1c-4 eZhQaz"><a id="header-vimeo-logo" title="Go to Vimeo home page" href="https://vimeo.com/"><svg viewBox="0 0 109 31" class="sc-1ny5r14-1 idiBqh"><path d="M88.24 23.443a11.978 11.978 0 0 1-.054-.678c-.184-3.124.947-5.995 3.394-8.61 2.627-2.905 5.929-4.358 9.908-4.358 2.553 0 4.487.855 5.801 2.561 1.242 1.563 1.807 3.578 1.698 6.047-.147 3.342-1.387 6.23-3.723 8.663-2.335 2.434-5.237 3.65-8.704 3.65-2.882 0-5.072-.926-6.568-2.78a7.757 7.757 0 0 1-.871-1.372 34.1 34.1 0 0 1-1.235.727c-3.868 2.217-7.792 3.323-11.769 3.323-2.956 0-5.074-.982-6.35-2.945a7.353 7.353 0 0 1-.266-.422 21.55 21.55 0 0 1-.117.103c-2.446 2.108-4.89 3.162-7.335 3.162-2.374 0-3.522-1.307-3.45-3.926.036-1.164.265-2.562.684-4.198.42-1.636.648-2.909.685-3.818.037-1.38-.384-2.073-1.264-2.073-.952 0-2.086 1.13-3.404 3.384-1.392 2.365-2.144 4.656-2.252 6.874-.074 1.566.08 2.767.46 3.603-2.546.073-4.33-.346-5.348-1.256-.911-.8-1.33-2.126-1.255-3.983a14.67 14.67 0 0 1 .537-3.492c.321-1.164.5-2.2.537-3.11.074-1.347-.42-2.02-1.48-2.02-.915 0-1.902 1.038-2.96 3.111-1.06 2.073-1.645 4.239-1.754 6.494-.073 2.037.058 3.455.392 4.256-2.505.073-4.284-.454-5.337-1.58-.48-.518-.817-1.185-1.01-2.002-.205.194-.415.386-.631.574-2.446 2.108-4.89 3.162-7.335 3.162-1.133 0-2-.363-2.601-1.09-.602-.728-.885-1.672-.848-2.836.035-1.199.41-3.053 1.121-5.562.712-2.508 1.069-3.854 1.069-4.036 0-.944-.33-1.417-.985-1.417-.207 0-.77.34-1.69 1.016-.693 2.067-2.205 4.595-4.535 7.584-3.315 4.295-6.119 6.443-8.413 6.443-1.42 0-2.624-1.307-3.606-3.924L5.41 19.497c-.73-2.615-1.512-3.924-2.349-3.924-.182 0-.82.383-1.913 1.145L0 15.244a309.082 309.082 0 0 0 3.558-3.163c1.604-1.383 2.809-2.11 3.612-2.183 1.897-.182 3.065 1.111 3.503 3.88.474 2.986.802 4.844.986 5.57.547 2.479 1.148 3.716 1.806 3.716.51 0 1.276-.803 2.298-2.41 1.021-1.608 1.568-2.831 1.642-3.672.146-1.387-.401-2.082-1.642-2.082-.583 0-1.185.134-1.804.399 1.198-3.914 3.487-5.814 6.866-5.706 2.256.066 3.438 1.387 3.546 3.961L26 12.081c1.57-1.383 2.738-2.11 3.506-2.183 1.203-.109 2.088.244 2.654 1.06.564.816.774 1.875.63 3.18-.475 2.212-.987 5.02-1.534 8.425-.037 1.56.53 2.338 1.697 2.338.51 0 1.422-.537 2.737-1.615l.049-.04c.083-.76.218-1.662.405-2.708.3-1.687.468-3 .504-3.945.072-.652-.093-.979-.493-.979-.22 0-.84.369-1.862 1.104l-1.314-1.473c.183-.144 1.331-1.2 3.45-3.164 1.532-1.418 2.572-2.145 3.119-2.182.949-.073 1.715.318 2.299 1.172.584.855.876 1.847.876 2.974 0 .364-.036.71-.108 1.037a10.044 10.044 0 0 1 1.916-2.183c1.678-1.455 3.558-2.274 5.638-2.456 1.788-.145 3.064.273 3.833 1.255.619.8.91 1.947.875 3.438a73.7 73.7 0 0 0 .822-.71c.838-.982 1.659-1.763 2.462-2.345 1.35-.982 2.756-1.528 4.215-1.638 1.752-.145 3.01.271 3.777 1.25.656.798.949 1.94.877 3.424-.037 1.015-.284 2.492-.74 4.431-.457 1.94-.684 3.052-.684 3.342-.037.763.037 1.287.22 1.577.181.29.618.434 1.313.434.311 0 .773-.2 1.385-.602a9.877 9.877 0 0 1-.072-1.43c.035-2.945 1.35-5.745 3.942-8.401 2.845-2.909 6.203-4.365 10.072-4.365 3.576 0 5.474 1.453 5.693 4.355.145 1.85-.877 3.755-3.065 5.715-2.337 2.142-5.276 3.502-8.815 4.082.656.908 1.641 1.36 2.956 1.36 2.627 0 5.492-.664 8.596-1.997.138-.058.274-.117.408-.175zm14.56-5.244c.038-.984-.1-1.886-.41-2.706-.31-.82-.758-1.23-1.341-1.23-1.862 0-3.395 1.002-4.597 3.007-1.024 1.64-1.571 3.39-1.643 5.247-.037.912.128 1.714.492 2.406.4.803.966 1.203 1.697 1.203 1.642 0 3.048-.965 4.216-2.898.985-1.604 1.513-3.28 1.587-5.029zm-21.1-1.834c.035-.976-.365-1.465-1.203-1.465-1.094 0-2.204.751-3.334 2.253-1.13 1.502-1.713 2.94-1.748 4.315-.021 0-.021.236 0 .706a12.322 12.322 0 0 0 4.645-2.985c1.056-1.157 1.603-2.1 1.64-2.824zM34.651 2.714c-.036.906-.492 1.775-1.369 2.607-.985.941-2.153 1.412-3.503 1.412-2.08 0-3.084-.905-3.011-2.715.035-.94.592-1.846 1.669-2.715C29.513.435 30.708 0 32.023 0c.766 0 1.405.3 1.917.896.51.598.747 1.204.711 1.818z" fill="#1A2E3A" fill-rule="evenodd"></path></svg></a></div><div class="anpl1c-6 bnpiwY"><button iconposition="left" id="join-vimeo" class="sc-dkPtRN kkLRJS anpl1c-7 bvNBRF"><span class="sc-gsDKAQ erBbkF">Join Vimeo</span><div radius="10" class="sc-eCImPb dOSnGh"></div></button><div class="sc-1x20r9o-0 jcsaYF"><div class="sc-1x20r9o-1 gRQYO"></div><div class="sc-1x20r9o-2 bPCQLv"></div></div></div></div><div class="sc-1bh5l0d-2 sc-1bh5l0d-6 eOwmSF fQbSjm"><div class="sc-1bh5l0d-8 ljcHwr"><div class="sc-1bh5l0d-9 lhzWuc"><div class="a5pk4b-0 blMWUi"><div class="sc-1bh5l0d-16 iCggne"><div class="sc-1bh5l0d-14 czYaji"><div class="sc-1bh5l0d-15 czfISs"><div class="player js-player player-3aaa644b-884d-4353-8ea3-ec56a80959f4 js-player-fullscreen with-fullscreen touch-support player-normal player-lg app-lg" id="player3aaa644b-884d-4353-8ea3-ec56a80959f4"><div class="vp-video-wrapper transparent" data-content-area-sibling-eligible=""><div class="vp-video"><div class="vp-telecine invisible"><video preload="none" tabindex="-1" style="" src="blob:https://vimeo.com/f682c69e-da20-46b5-b1f2-f6ce6570ee83"></video></div></div><div class="vp-preview" data-thumb="https://i.vimeocdn.com/video/603496523-33935d2b2cbf32d39c4697fa5b03364507eb81dc03a0be84b9a9fe4ec7b89868-d?mw=2600&amp;mh=1105&amp;q=70" data-thumb-width="2600" style="background-image: url(&quot;https://i.vimeocdn.com/video/603496523-33935d2b2cbf32d39c4697fa5b03364507eb81dc03a0be84b9a9fe4ec7b89868-d?mw=2600&amp;mh=1105&amp;q=70&quot;);"></div></div><div class="vp-text-alert-wrapper hidden" data-content-area-sibling-eligible=""><div class="vp-alert-text"></div><div class="vp-alert-time"><div class="vp-live-start-time-title"></div><div class="vp-live-start-time-body"></div><div class="vp-live-start-time-footer"></div></div></div><div class="vp-target hidden" data-content-area-sibling-eligible="" hidden=""></div><div class="vp-captions hidden with-controls opacity-100 color-black" hidden="" aria-live="assertive" data-content-area-sibling-eligible="" style="font-size: 25px; font-variant: initial; font-family: &quot;Helvetica Neue&quot;, Helvetica, Arial, sans-serif; color: rgb(255, 255, 255); text-shadow: none;"><span class="vp-captions-window" style="background-color: rgba(0, 0, 0, 0);"></span></div><div class="vp-outro-wrapper hidden" hidden="" data-content-area-sibling-eligible=""><div class="vp-outro" role="dialog"></div></div><div class="vp-player-ui-container" data-content-area-sibling-eligible=""><style type="text/css" data-player-colors="3aaa644b-884d-4353-8ea3-ec56a80959f4">.player-3aaa644b-884d-4353-8ea3-ec56a80959f4 {
+                --color-one:#000000ff;
+--color-two:#00adefff;
+--color-three:#ffffffff;
+--color-four:#000000ff;
+--color-one-monochrome:#ffffffff;
+--color-two-monochrome:#000000ff;
+--color-one-opacity-ninety:#000000e6;
+--color-three-opacity-twenty:#ffffff33;
+--color-one-monochrome-opacity-twenty:#ffffff33;
+--color-two-monochrome-opacity-twenty:#00000033;
+--color-one-monochrome-opacity-sixty:#ffffff99;
+--color-one-monochrome-opacity-twenty-eighty:#ffffff33;
+--color-two-monochrome-opacity-twenty-eighty:#000000cc;
+            }.player-3aaa644b-884d-4353-8ea3-ec56a80959f4 {
+                background-color: transparent !important;
+            }.player-3aaa644b-884d-4353-8ea3-ec56a80959f4 .vp-video-wrapper {
+                background-color: transparent !important;
+            }</style><div class="NudgeNotification_module_nudge__c67757fb false" style="display: none;"><div class="NudgeNotification_module_nudgeInfo__c67757fb"><div class="NudgeNotification_module_nudgeIcon__c67757fb"><svg viewBox="0 0 64 64"><path fill-rule="evenodd" clip-rule="evenodd" d="M12.4506 12.0055L32.4643 30.0179C33.6413 31.0772 33.6413 32.9228 32.4643 33.9821L12.4506 51.9945C10.7345 53.5389 8 52.3211 8 50.0124V13.9876C8 11.6789 10.7345 10.4611 12.4506 12.0055ZM39.1172 12.0055L59.131 30.0179C60.308 31.0772 60.308 32.9228 59.131 33.9821L39.1172 51.9945C37.4012 53.5389 34.6667 52.3211 34.6667 50.0124V13.9876C34.6667 11.6789 37.4012 10.4611 39.1172 12.0055Z"></path></svg></div><div class="NudgeNotification_module_nudgeTime__c67757fb"></div></div></div><div class="vp-pip-overlay PipOverlay_module_overlay__78ecef16" style="display: none;"><svg viewBox="0 0 16 12"><polygon class="fill" points="6 8 1 8 1 1 14 1 14 6 15 6 15 0 0 0 0 9 6 9 6 8"></polygon><rect class="fill" x="7" y="7" width="9" height="5"></rect><polyline class="fill" transform="translate(4, 4) rotate(180) translate(-4, -4)" points="5.33 2 5.33 3 3.67 3 5.67 5 5 5.67 3 3.67 3 5.33 2 5.33 2 2"></polyline></svg><div class="PipOverlay_module_title__78ecef16">Playing in picture-in-picture</div></div></div><div class="vp-player-ui-overlays" data-content-area-sibling-eligible=""><div class="vp-wirewax-wrapper"></div><div class="vp-badge Badge_module_badge__c2d20905" style="display: none;"><div class="Badge_module_badgeLink__c2d20905 shared_module_focusable__ad188687"><img alt="undefined Badge"></div></div><div class="vp-title Title_module_title__c7915904"><header class="Title_module_header__c7915904"><div class="Title_module_portrait__c7915904" aria-hidden="true"><a href="https://vimeo.com/velare?embedded=false&amp;source=owner_portrait&amp;owner=7600516" class="Title_module_portraitLink__c7915904 shared_module_focusableCircle__ad188687 Link_module_link__2e122c45" variant="minimal"><img src="./eleonore __ michael - middlebury, vt_files/29067420_60x60" alt="Link to video owner&#39;s profile" width="60" height="60" data-trackclick="video-portrait" data-airgap-id="89"></a></div><div class="Title_module_headers__c7915904"><a href="https://vimeo.com/192207770/0faf1dd09d?embedded=false&amp;source=video_title&amp;owner=7600516" class="shared_module_focusable__ad188687 Link_module_link__2e122c45" data-track-click="video-title" variant="minimal"><span class="Text_module_text__9e457bd4 Text_module_bpxxs_fontmd__9e457bd4 Text_module_bpxs_fontlg__9e457bd4 Text_module_bpsm_fontxl__9e457bd4 Text_module_bold__9e457bd4 Title_module_headerText__c7915904 Title_module_mainTitle__c7915904">eleonore // michael - middlebury, vt<div class="TitleTags_module_tagsWrapper__2da69908" data-title-tags="true"></div></span></a><a href="https://vimeo.com/velare?embedded=false&amp;source=owner_name&amp;owner=7600516" class="Title_module_subtitleLink__c7915904 shared_module_focusable__ad188687 Link_module_link__2e122c45" variant="minimal"><span class="Text_module_text__9e457bd4 Text_module_sm__9e457bd4 Text_module_bold__9e457bd4 Title_module_headerText__c7915904 Title_module_subtitle__c7915904">Velare</span></a></div></header></div><div class="vp-sidedock SideDock_module_root__71905116  "><div class="LabeledButton_module_box__2bf466cb"><label class="LabeledButton_module_labeledButton__2bf466cb" role="presentation" style="display: none;"><span>Like</span></label><button class="Button_module_button__2ee75979 shared_module_focusable__ad188687 Button_module_primary__2ee75979 Button_module_sm__2ee75979 Button_module_icon__2ee75979 Button_module_iconSm__2ee75979 exclude-global-button-styles  like-button" aria-label="Like (this opens in a new window)" data-like-button="true"><svg viewBox="0 0 20 20" class="like-icon" focusable="false"><path d="M10 18a1 1 0 0 1-.81-.42 15.8 15.8 0 0 0-4.35-3.71C2.46 12.3 0 10.68 0 7.5a5.38 5.38 0 0 1 1.61-3.92A6 6 0 0 1 6 2a5.54 5.54 0 0 1 4.05 1.88A5.74 5.74 0 0 1 14 2c2.9 0 6 2.21 6 5.5s-2.46 4.8-4.84 6.37a15.8 15.8 0 0 0-4.35 3.71A1 1 0 0 1 10 18zM5.78 4A4 4 0 0 0 3 5a3.37 3.37 0 0 0-1 2.5c0 2 1.5 3.09 3.94 4.7A20.94 20.94 0 0 1 10 15.42a20.94 20.94 0 0 1 4.06-3.22C16.5 10.59 18 9.5 18 7.5 18 5.22 15.68 4 14 4c-1.44 0-2.78 1.49-3.17 2.06a1 1 0 0 1-.92.44 1 1 0 0 1-.82-.58A3.65 3.65 0 0 0 6 4z" fill="#1a2e3b"></path></svg></button></div><div class="LabeledButton_module_box__2bf466cb"><label class="LabeledButton_module_labeledButton__2bf466cb" role="presentation" style="display: none;"><span>Add to Watch Later</span></label><button class="Button_module_button__2ee75979 shared_module_focusable__ad188687 Button_module_primary__2ee75979 Button_module_sm__2ee75979 Button_module_icon__2ee75979 Button_module_iconSm__2ee75979 exclude-global-button-styles  watch-later-button" aria-label="Add to Watch Later (this opens in a new window)" data-watchlater-button="true"><svg viewBox="0 0 20 20" class="watch-later-icon" focusable="false"><path d="M10 20C4.477 20 0 15.523 0 10S4.477 0 10 0s10 4.477 10 10-4.477 10-10 10zm0-1.5a8.5 8.5 0 1 0 0-17 8.5 8.5 0 0 0 0 17zM10.75 5v4.69l3.075 3.075a.75.75 0 1 1-1.06 1.06L9.25 10.311V5a.75.75 0 0 1 1.5 0z"></path></svg></button></div></div><div class="Notification_module_root__d330bf09 "></div><div class="ControlBar_module_controlBarWrapper__036b51d7"><div class="PlayButton_module_playButtonWrapper__af9e9913"><button class="Button_module_button__2ee75979 shared_module_focusable__ad188687 Button_module_customColor__2ee75979 Button_module_md__2ee75979 Button_module_icon__2ee75979 Tooltip_module_tooltipContainer__79ddaacb exclude-global-button-styles PlayButton_module_playButton__af9e9913 shared_module_focusable__ad188687" aria-label="Play"><svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" class="PlayButton_module_playIcon__af9e9913" data-play-icon="true"><path d="M19 12C19 12.3557 18.8111 12.6846 18.5039 12.8638L6.50387 19.8638C6.19458 20.0442 5.81243 20.0455 5.50194 19.8671C5.19145 19.6888 5 19.3581 5 19L5 5C5 4.64193 5.19145 4.3112 5.50194 4.13286C5.81243 3.95452 6.19458 3.9558 6.50387 4.13622L18.5039 11.1362C18.8111 11.3154 19 11.6443 19 12Z" class="fill"></path></svg><span class="Button_module_buttonChildren__2ee75979"></span></button></div><div class="vp-controls ControlBar_module_controls__036b51d7"><div class="ControlBar_module_progressBarAndButtons__036b51d7"><div class="ProgressBar_module_progressBarContainer__e8cae6bf" role="presentation"><div class="vp-progress ProgressBar_module_progressBar__e8cae6bf"><div class="FocusTarget_module_focusTarget__f24ff6c3 shared_module_focusable__ad188687" role="slider" aria-label="Progress Bar" aria-valuemin="0" aria-valuemax="304" aria-valuenow="0" aria-valuetext="00:00 of 05:04" tabindex="0"></div><div class="ChapterSegments_module_chapterSegmentsWrapper__48da9e76"><div class="ChapterSegment_module_chapterWrapper__7be5e45f" style="width: calc(100% - 0px);"><div class="ChapterSegment_module_chapter__7be5e45f"><div class="ChapterSegment_module_loaded__7be5e45f " style="width: 0%;"></div><div class="ChapterSegment_module_played__7be5e45f" style="width: 0%;"></div></div></div></div><div class="thumb-preview ThumbnailPreview_module_thumbnailPreview__a45685d4" role="presentation" aria-hidden="true" style="left: 30.3%; max-width: 160px; display: none;"><div class="thumb ThumbnailPreview_module_thumbnailPreviewImage__a45685d4" style="width: 160px; height: 68.0851px; background-image: url(&quot;https://videoapi-sprites.vimeocdn.com/video-sprites/image/29fd0577-adcd-46a0-b051-54f8db0bfd15.0.jpeg?ClientID=player-backend-prod&amp;Expires=1680565040&amp;Signature=fa1acda89ad08c100e5a29b98bb885ef01f49365&quot;); background-size: 1600px 817.021px;"></div><div class="ThumbnailPreview_module_thumbnailPreviewText__a45685d4"><span class="ThumbnailPreview_module_time__a45685d4">01:32</span></div></div><div class="Timecode_module_timecodeContainer__86d38fc4" role="presentation" style="left: 0%;"><div class="Timecode_module_timecode__86d38fc4 ">05:04</div></div></div></div><div class="VolumeControl_module_volumeControlContainer__bb14c152"><button class="Button_module_button__2ee75979 shared_module_focusable__ad188687 Button_module_customColor__2ee75979 Button_module_xs__2ee75979 Button_module_icon__2ee75979 exclude-global-button-styles ControlBarButton_module_controlBarButton__e67d9867 shared_module_focusable__ad188687" aria-label="Volume (use up/down arrow keys to change)" data-volume-button="true"><svg viewBox="0 0 24 24" data-volume-icon="true"><path fill-rule="evenodd" clip-rule="evenodd" d="M20 12C20 15.7277 17.4505 18.8599 14 19.7479V21.7999C18.5645 20.8734 22 16.8379 22 12C22 7.16206 18.5645 3.12655 14 2.20001V4.25201C17.4505 5.1401 20 8.2723 20 12ZM18 12C18 9.38754 16.3304 7.16506 14 6.34139V8.53511C15.1956 9.22672 16 10.5194 16 12C16 13.4805 15.1956 14.7732 14 15.4648V17.6586C16.3304 16.8349 18 14.6124 18 12ZM6.58579 8.00396H4C2.89543 8.00396 2 8.89939 2 10.004V14.004C2 15.1085 2.89543 16.004 4 16.004H6.58579L10.2929 20.7111C10.9229 21.341 12 20.8949 12 20.004V4.00396C12 3.11305 10.9229 2.66689 10.2929 3.29685L6.58579 8.00396Z"></path></svg></button><div role="slider" class="VolumeControl_module_volumeControl__bb14c152 volume shared_module_focusable__ad188687" tabindex="0" aria-valuenow="1" aria-valuetext="100%" aria-label="Volume (use up/down arrow keys to change)" aria-valuemin="0" aria-valuemax="1" style="display: none;"><div class="VolumeControl_module_volumeBar__bb14c152"><div class="VolumeControl_module_volumeBarFill__bb14c152" style="height: 100%;"></div><div class="VolumeControl_module_sliderHandle__bb14c152" style="bottom: 100%;"></div></div></div></div><button class="Tooltip_module_tooltipContainer__79ddaacb exclude-global-button-styles ChromecastButton_module_chromecastButton__4cd36ef7 ControlBarButton_module_controlBarButton__e67d9867 shared_module_focusable__ad188687 vp-cast-button" aria-label="Cast" is="google-cast-button" data-chromecast-button="true" style="display: none;"><style>.cast_caf_state_c {fill: var(--connected-color, #4285f4);}.cast_caf_state_d {fill: var(--disconnected-color, #7d7d7d);}.cast_caf_state_h {opacity: 0;}</style><svg x="0px" y="0px" width="100%" height="100%" viewBox="0 0 24 24"><g><path id="cast_caf_icon_arch0" class="cast_caf_status_d" d="M1,18 L1,21 L4,21 C4,19.3 2.66,18 1,18 L1,18 Z"></path><path id="cast_caf_icon_arch1" class="cast_caf_status_d" d="M1,14 L1,16 C3.76,16 6,18.2 6,21 L8,21 C8,17.13 4.87,14 1,14 L1,14 Z"></path><path id="cast_caf_icon_arch2" class="cast_caf_status_d" d="M1,10 L1,12 C5.97,12 10,16.0 10,21 L12,21 C12,14.92 7.07,10 1,10 L1,10 Z"></path><path id="cast_caf_icon_box" class="cast_caf_status_d" d="M21,3 L3,3 C1.9,3 1,3.9 1,5 L1,8 L3,8 L3,5 L21,5 L21,19 L14,19 L14,21 L21,21 C22.1,21 23,20.1 23,19 L23,5 C23,3.9 22.1,3 21,3 L21,3 Z"></path><path id="cast_caf_icon_boxfill" class="cast_caf_state_h" d="M5,7 L5,8.63 C8,8.6 13.37,14 13.37,17 L19,17 L19,7 Z"></path></g></svg></button><button class="Button_module_button__2ee75979 shared_module_focusable__ad188687 Button_module_customColor__2ee75979 Button_module_xs__2ee75979 Button_module_icon__2ee75979 Tooltip_module_tooltipContainer__79ddaacb exclude-global-button-styles ControlBarButton_module_controlBarButton__e67d9867 shared_module_focusable__ad188687 vp-prefs PrefsButton_module_prefsButton__ee31fc86" aria-expanded="false" aria-label="Settings"><svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg" class="PrefsButton_module_gearIcon__ee31fc86"><path fill-rule="evenodd" clip-rule="evenodd" d="M9.16668 1.66699C8.2462 1.66699 7.50001 2.41318 7.50001 3.33366V4.72835C7.21484 4.86382 6.94241 5.02175 6.68499 5.19984L5.46953 4.4981C4.68103 4.04285 3.66009 4.31415 3.20034 5.11047L2.36526 6.55686C1.90707 7.35046 2.17605 8.3701 2.96953 8.82822L4.18535 9.53017C4.17298 9.68526 4.16668 9.84206 4.16668 10.0003C4.16668 10.1586 4.17298 10.3154 4.18535 10.4705L2.96953 11.1724C2.17605 11.6306 1.90707 12.6502 2.36526 13.4438L3.20034 14.8902C3.66009 15.6865 4.68103 15.9578 5.46953 15.5026L6.685 14.8008C6.94241 14.9789 7.21484 15.1368 7.50001 15.2723V16.667C7.50001 17.5875 8.2462 18.3337 9.16668 18.3337H10.8333C11.7538 18.3337 12.5 17.5875 12.5 16.667V15.2723C12.7851 15.1369 13.0574 14.979 13.3147 14.801L14.5298 15.5026C15.3183 15.9578 16.3393 15.6865 16.799 14.8902L17.6341 13.4438C18.0923 12.6502 17.8233 11.6306 17.0298 11.1724L15.8146 10.4708C15.827 10.3156 15.8333 10.1587 15.8333 10.0003C15.8333 9.84193 15.827 9.68501 15.8146 9.52981L17.0298 8.82822C17.8233 8.3701 18.0923 7.35046 17.6341 6.55686L16.799 5.11047C16.3393 4.31415 15.3183 4.04285 14.5298 4.4981L13.3147 5.19963C13.0574 5.02162 12.7851 4.86377 12.5 4.72835V3.33366C12.5 2.41318 11.7538 1.66699 10.8333 1.66699H9.16668ZM12.5 10.0003C12.5 11.381 11.3807 12.5003 10 12.5003C8.6193 12.5003 7.50001 11.381 7.50001 10.0003C7.50001 8.61961 8.6193 7.50033 10 7.50033C11.3807 7.50033 12.5 8.61961 12.5 10.0003Z"></path></svg><span class="Button_module_buttonChildren__2ee75979"></span></button><div class="vp-menu Menu_module_menu__18d51783 Menu_module_scroll__18d51783" style="display: none; height: auto; right: 13em;"><div></div><div class="Menu_module_menuBody__18d51783" style="height: 0px;"><div class="Menu_module_menuPanel__18d51783"><div class="MenuOption_module_option__918a804a MenuOption_module_styled__918a804a MenuOptionButton_module_optionButton__50331188  undefined" role="menuitemradio" tabindex="0"><span class="Text_module_text__9e457bd4 Text_module_md__9e457bd4 Text_module_bold__9e457bd4 MenuOptionButton_module_label__50331188">Quality</span><span class="Text_module_text__9e457bd4 Text_module_sm__9e457bd4 Text_module_normal__9e457bd4 MenuOptionButton_module_value__50331188">Auto</span><div class="MenuOptionButton_module_icon__50331188 "><svg viewBox="0 0 24 24"><path d="M9.71 17.71l-1.42-1.42 4.3-4.29-4.3-4.29 1.42-1.42 5 5a1 1 0 0 1 0 1.41z" fill="#1a2e3b"></path></svg></div></div><div class="MenuOption_module_option__918a804a MenuOption_module_styled__918a804a MenuOptionButton_module_optionButton__50331188  undefined" role="menuitemradio" tabindex="0"><span class="Text_module_text__9e457bd4 Text_module_md__9e457bd4 Text_module_bold__9e457bd4 MenuOptionButton_module_label__50331188">Speed</span><span class="Text_module_text__9e457bd4 Text_module_sm__9e457bd4 Text_module_normal__9e457bd4 MenuOptionButton_module_value__50331188">Normal</span><div class="MenuOptionButton_module_icon__50331188 "><svg viewBox="0 0 24 24"><path d="M9.71 17.71l-1.42-1.42 4.3-4.29-4.3-4.29 1.42-1.42 5 5a1 1 0 0 1 0 1.41z" fill="#1a2e3b"></path></svg></div></div><div class="Divider_module_divider__f4291f61 Divider_module_buffer__f4291f61"></div><button class="Button_module_button__2ee75979 shared_module_focusable__ad188687 Button_module_customColor__2ee75979 Button_module_md__2ee75979 Button_module_icon__2ee75979 Button_module_iconSm__2ee75979 vp-menu-info DebugPanelButton_module_debugPanelButton__e1eb3e16"><svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg" class="DebugPanelButton_module_debugPanelButtonIcon__e1eb3e16"><path fill-rule="evenodd" clip-rule="evenodd" d="M10.6667 6C10.6667 8.57733 8.57733 10.6667 6 10.6667C3.42267 10.6667 1.33333 8.57733 1.33333 6C1.33333 3.42267 3.42267 1.33333 6 1.33333C8.57733 1.33333 10.6667 3.42267 10.6667 6ZM12 6C12 9.31371 9.31371 12 6 12C2.68629 12 0 9.31371 0 6C0 2.68629 2.68629 0 6 0C9.31371 0 12 2.68629 12 6ZM6 4.66667C6.36819 4.66667 6.66667 4.36819 6.66667 4C6.66667 3.63181 6.36819 3.33333 6 3.33333C5.63181 3.33333 5.33333 3.63181 5.33333 4C5.33333 4.36819 5.63181 4.66667 6 4.66667ZM6 5.33333C6.36819 5.33333 6.66667 5.54653 6.66667 5.80952V8.19048C6.66667 8.45347 6.36819 8.66667 6 8.66667C5.63181 8.66667 5.33333 8.45347 5.33333 8.19048V5.80952C5.33333 5.54653 5.63181 5.33333 6 5.33333Z" fill="white"></path></svg><span class="Button_module_buttonChildren__2ee75979"><span class="DebugPanelButton_module_debugPanelButtonText__e1eb3e16">Debug log</span></span></button></div></div></div><button class="Button_module_button__2ee75979 shared_module_focusable__ad188687 Button_module_customColor__2ee75979 Button_module_xs__2ee75979 Button_module_icon__2ee75979 Tooltip_module_tooltipContainer__79ddaacb exclude-global-button-styles ControlBarButton_module_controlBarButton__e67d9867 shared_module_focusable__ad188687 pip" aria-label="Enter Picture-in-Picture"><svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg" class="" data-enter-pip="true"><path fill-rule="evenodd" clip-rule="evenodd" d="M3.33329 4.99992H16.6666V9.99992H18.3333V4.99992C18.3333 4.07944 17.5871 3.33325 16.6666 3.33325H3.33329C2.41282 3.33325 1.66663 4.07944 1.66663 4.99992V13.3333C1.66663 14.2537 2.41282 14.9999 3.33329 14.9999H8.33329V13.3333H3.33329V4.99992ZM9.99996 12.6666C9.99996 12.1143 10.4477 11.6666 11 11.6666H17.3333C17.8856 11.6666 18.3333 12.1143 18.3333 12.6666V17.3333C18.3333 17.8855 17.8856 18.3333 17.3333 18.3333H11C10.4477 18.3333 9.99996 17.8855 9.99996 17.3333V12.6666ZM7.91663 7.60408V8.59492L6.17079 6.84909C6.05829 6.73659 5.90163 6.66659 5.72913 6.66659C5.38413 6.66659 5.10413 6.94575 5.10413 7.29159C5.10413 7.46409 5.17413 7.61992 5.28746 7.73325L7.03246 9.47909H6.04163C5.69663 9.47909 5.41663 9.75825 5.41663 10.1041C5.41663 10.4491 5.69663 10.7291 6.04163 10.7291H8.54163C8.88663 10.7291 9.16663 10.4491 9.16663 10.1041V7.60408C9.16663 7.25825 8.88663 6.97909 8.54163 6.97909C8.19663 6.97909 7.91663 7.25825 7.91663 7.60408Z" fill="white"></path></svg><span class="Button_module_buttonChildren__2ee75979"></span></button><button class="Button_module_button__2ee75979 shared_module_focusable__ad188687 Button_module_customColor__2ee75979 Button_module_xs__2ee75979 Button_module_icon__2ee75979 Tooltip_module_tooltipContainer__79ddaacb exclude-global-button-styles ControlBarButton_module_controlBarButton__e67d9867 shared_module_focusable__ad188687 fullscreen FullscreenButton_module_fullscreen__ec6a4dee" aria-label="Enter full screen"><svg class="enter-fullscreen-icon" width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M16 5L17.5858 5L14.2929 8.29292C13.9024 8.68345 13.9024 9.31661 14.2929 9.70714C14.6834 10.0977 15.3166 10.0977 15.7071 9.70714L19 6.41426V8C19 8.55228 19.4477 9 20 9C20.5523 9 21 8.55228 21 8V4C21 3.73478 20.8946 3.48043 20.7071 3.29289C20.5196 3.10536 20.2652 3 20 3H16C15.4477 3 15 3.44772 15 4C15 4.55228 15.4477 5 16 5ZM5 8.00002V6.4142L8.29292 9.70712C8.68345 10.0976 9.31661 10.0976 9.70714 9.70712C10.0977 9.3166 10.0977 8.68343 9.70714 8.29291L6.41424 5.00001L8 5.00002C8.55228 5.00002 9 4.5523 9 4.00002C9 3.44773 8.55228 3.00002 8 3.00002H4C3.73478 3.00002 3.48043 3.10537 3.29289 3.29291C3.10536 3.48044 3 3.7348 3 4.00002V8.00002C3 8.5523 3.44772 9.00001 4 9.00001C4.55228 9.00001 5 8.5523 5 8.00002ZM8.00002 19H6.4142L9.70712 15.7071C10.0976 15.3166 10.0976 14.6834 9.70712 14.2929C9.3166 13.9024 8.68343 13.9024 8.29291 14.2929L5.00001 17.5858V16C5.00001 15.4477 4.5523 15 4.00001 15C3.44773 15 3.00002 15.4477 3.00002 16L3.00002 20C3.00002 20.2652 3.10537 20.5196 3.29291 20.7071C3.48044 20.8947 3.7348 21 4.00002 21H8.00002C8.5523 21 9.00001 20.5523 9.00001 20C9.00001 19.4477 8.5523 19 8.00002 19ZM19 17.5858V16C19 15.4477 19.4477 15 20 15C20.5523 15 21 15.4477 21 16V20C21 20.2652 20.8946 20.5196 20.7071 20.7071C20.5196 20.8947 20.2652 21 20 21H16C15.4477 21 15 20.5523 15 20C15 19.4477 15.4477 19 16 19H17.5858L14.2929 15.7071C13.9023 15.3166 13.9023 14.6834 14.2929 14.2929C14.6834 13.9024 15.3166 13.9024 15.7071 14.2929L19 17.5858Z"></path></svg><span class="Button_module_buttonChildren__2ee75979"></span></button><a href="https://vimeo.com/192207770/0faf1dd09d?embedded=false&amp;source=vimeo_logo&amp;owner=7600516" class="logo Link_module_link__2e122c45" target="_blank" rel="noreferrer" tabindex="-1" variant="minimal"><button class="Button_module_button__2ee75979 shared_module_focusable__ad188687 Button_module_customColor__2ee75979 Button_module_xs__2ee75979 Button_module_icon__2ee75979 exclude-global-button-styles ControlBarButton_module_controlBarButton__e67d9867 shared_module_focusable__ad188687 VimeoLogoButton_module_vimeoLogoButton__54aa8495" aria-label="Watch on vimeo.com"><svg width="54" height="18" viewBox="0 0 54 18" role="img" xmlns="http://www.w3.org/2000/svg" data-vimeo-icon="true"><path fill-rule="evenodd" clip-rule="evenodd" d="M17.1192 1.32529C17.1011 1.76753 16.8758 2.19197 16.4427 2.59836C15.9559 3.05781 15.3789 3.28759 14.7119 3.28759C13.6845 3.28759 13.1881 2.84607 13.2245 1.96218C13.2418 1.50286 13.5168 1.06061 14.0487 0.636176C14.5808 0.21258 15.1711 0 15.8207 0C16.1992 0 16.5146 0.146412 16.7675 0.437671C17.0197 0.729653 17.1367 1.02548 17.1192 1.32529ZM17.7011 13.0761C17.6 13.1708 17.4962 13.2641 17.3896 13.3562C16.181 14.3855 14.9735 14.9003 13.766 14.9003C13.2063 14.9003 12.778 14.7228 12.4809 14.3676C12.1837 14.0126 12.0438 13.5517 12.062 12.9831C12.0794 12.3977 12.2642 11.4922 12.6159 10.2672C12.9677 9.04241 13.1439 8.3853 13.1439 8.29652C13.1439 7.83551 12.981 7.60428 12.6571 7.60428C12.555 7.60428 12.2769 7.77023 11.8227 8.10073C11.4798 9.10988 10.7329 10.3442 9.58186 11.8036C7.94436 13.9012 6.5589 14.9501 5.42559 14.9501C4.72371 14.9501 4.1294 14.3115 3.64413 13.0338L2.67201 9.5206C2.31167 8.24356 1.92519 7.60426 1.51184 7.60426C1.42173 7.60426 1.10644 7.79121 0.566591 8.16344L0 7.44389C0.59431 6.92922 1.18068 6.41456 1.75765 5.89905C2.55027 5.22401 3.14543 4.86899 3.54217 4.83314C4.47949 4.74436 5.05646 5.37584 5.27308 6.72759C5.50692 8.18593 5.66896 9.09304 5.75981 9.44818C6.03016 10.6581 6.32726 11.2625 6.65219 11.2625C6.90423 11.2625 7.28277 10.87 7.78781 10.0852C8.29201 9.3002 8.56236 8.70301 8.59875 8.29265C8.67067 7.61521 8.40032 7.2757 7.78781 7.2757C7.49939 7.2757 7.20217 7.34115 6.89641 7.47036C7.48828 5.55955 8.61926 4.63151 10.2884 4.68432C11.403 4.71661 11.9869 5.3614 12.04 6.6187C12.3087 6.37895 12.5773 6.1391 12.846 5.89907C13.6213 5.22403 14.1982 4.86889 14.5776 4.83316C15.1719 4.78023 15.609 4.95226 15.8887 5.35096C16.1677 5.74953 16.2713 6.2666 16.2001 6.90362C15.9654 7.9836 15.7124 9.35472 15.4422 11.0178C15.424 11.7794 15.7037 12.1594 16.2807 12.1594C16.5328 12.1594 16.9833 11.897 17.6329 11.3707L17.6568 11.3514C17.6982 10.9804 17.7648 10.5395 17.8569 10.029C18.0055 9.20512 18.0884 8.56353 18.1059 8.10264C18.1414 7.78419 18.06 7.62455 17.8624 7.62455C17.7541 7.62455 17.4475 7.8044 16.9425 8.16339L16.2936 7.44397C16.3838 7.37383 16.9512 6.85832 17.9976 5.899C18.7546 5.20689 19.2684 4.85174 19.5387 4.83382C20.0074 4.79809 20.3859 4.98877 20.6745 5.40623C20.9629 5.82357 21.1075 6.3078 21.1075 6.85832C21.1075 7.03589 21.0894 7.2048 21.0539 7.36457C21.3241 6.95649 21.6394 6.60063 22.0006 6.29854C22.8296 5.58837 23.7584 5.18812 24.7858 5.09933C25.6694 5.02847 26.3001 5.23251 26.6795 5.71217C26.9852 6.10304 27.1291 6.66294 27.1117 7.39091C27.2382 7.28504 27.3733 7.16907 27.518 7.04443C27.9322 6.56489 28.3376 6.18329 28.7343 5.899C29.4013 5.41935 30.096 5.15311 30.8168 5.09933C31.6822 5.02847 32.3041 5.23179 32.6828 5.70988C33.0067 6.09919 33.1514 6.65669 33.1159 7.38165C33.0976 7.87755 32.976 8.59866 32.7508 9.54546C32.5246 10.4923 32.4124 11.0358 32.4124 11.1775C32.3943 11.5498 32.4307 11.8059 32.5207 11.9476C32.6108 12.0893 32.8266 12.1593 33.1696 12.1593C33.3237 12.1593 33.5517 12.0614 33.8539 11.8652C33.8254 11.6415 33.8136 11.4089 33.8184 11.1674C33.8359 9.72924 34.4855 8.36197 35.7659 7.06471C37.1718 5.64451 38.8307 4.9335 40.7418 4.9335C42.5089 4.9335 43.4462 5.64282 43.5545 7.06002C43.6264 7.96328 43.1214 8.89372 42.0402 9.85075C40.8856 10.8964 39.4338 11.5607 37.6855 11.844C38.0096 12.2871 38.4964 12.5083 39.146 12.5083C40.4438 12.5083 41.8593 12.1836 43.3925 11.5326C43.4607 11.5043 43.528 11.4758 43.5944 11.4474C43.5823 11.339 43.5733 11.2286 43.5673 11.1161C43.4765 9.5907 44.0351 8.18902 45.2443 6.9121C46.5421 5.49333 48.1733 4.78413 50.1388 4.78413C51.4003 4.78413 52.3559 5.20147 53.0054 6.03459C53.6187 6.79769 53.8977 7.78179 53.8439 8.98725C53.7714 10.6192 53.1587 12.0294 52.0049 13.2175C50.851 14.4058 49.4173 15 47.7047 15C46.2805 15 45.1985 14.5475 44.4596 13.6427C44.2931 13.4353 44.1496 13.2118 44.0292 12.9724C43.8357 13.0907 43.6324 13.209 43.4193 13.3273C41.5083 14.4097 39.5697 14.9501 37.605 14.9501C36.1444 14.9501 35.098 14.4704 34.4673 13.512C34.4211 13.4446 34.3774 13.3759 34.3361 13.3059L34.2784 13.3561C33.0701 14.3856 31.8623 14.9003 30.6549 14.9003C29.4819 14.9003 28.9146 14.2618 28.9507 12.9832C28.9682 12.4147 29.0813 11.7319 29.2882 10.9331C29.4953 10.1341 29.6084 9.51274 29.6266 9.06893C29.6448 8.39462 29.4368 8.05668 29.0021 8.05668C28.532 8.05668 27.9716 8.60792 27.3204 9.70896C26.6328 10.8637 26.2614 11.9826 26.2076 13.0657C26.1712 13.8304 26.2471 14.4168 26.4352 14.8247C25.177 14.8606 24.2956 14.6558 23.793 14.2119C23.3426 13.821 23.1363 13.1733 23.1727 12.2669C23.1901 11.6985 23.2786 11.13 23.4382 10.5617C23.597 9.99324 23.6856 9.48711 23.7038 9.04247C23.7402 8.38536 23.4959 8.05668 22.9727 8.05668C22.5206 8.05668 22.0329 8.56353 21.5098 9.57578C20.9866 10.588 20.6974 11.6455 20.6436 12.7466C20.6072 13.7416 20.672 14.4338 20.8372 14.8247C19.5995 14.8606 18.7207 14.6035 18.2006 14.0538C17.9631 13.8005 17.7966 13.4746 17.7011 13.0761ZM40.3632 7.9913C40.3807 7.51477 40.183 7.27573 39.7689 7.27573C39.2283 7.27573 38.6798 7.64254 38.1219 8.37592C37.5638 9.10942 37.2754 9.81177 37.2579 10.483C37.2477 10.483 37.2477 10.5982 37.2579 10.8279C38.1399 10.5101 38.9051 10.0243 39.5531 9.37024C40.0748 8.80505 40.345 8.34476 40.3632 7.9913ZM50.5847 7.56539C50.738 7.96564 50.8059 8.40644 50.7877 8.88682C50.7515 9.74099 50.4905 10.5593 50.0038 11.3426C49.4268 12.2864 48.7321 12.7574 47.9212 12.7574C47.56 12.7574 47.2802 12.562 47.0827 12.1703C46.9026 11.8324 46.8212 11.4408 46.8393 10.9953C46.8748 10.0882 47.1452 9.23414 47.6511 8.43291C48.2453 7.4541 49.0025 6.96434 49.9223 6.96434C50.2102 6.96434 50.4313 7.16513 50.5847 7.56539Z"></path></svg></button></a></div></div></div><div class="NudgeArea_module_nudgeArea__f7294a38 NudgeArea_module_nudgeBackwardArea__f7294a38"></div><div class="NudgeArea_module_nudgeArea__f7294a38 NudgeArea_module_nudgeForwardArea__f7294a38"></div><div class="BufferHandler_module_shade__0799a97e" data-shade="true" style="display: none;"></div><svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg" fill="none" data-spinner="true" class="Spinner_module_spinner__9c0ec6c3 vp-spin Spinner_module_lg__9c0ec6c3" style="display: none;"><circle data-spinner-trace="true" cx="24" cy="24" r="22" stroke="white"></circle><circle data-spinner-circle="true" cx="24" cy="24" r="22" stroke="white"></circle></svg></div><div class="vp-controls-wrapper" data-content-area-sibling-eligible=""></div><div class="vp-overlay-wrapper hidden" role="dialog" aria-modal="true" aria-labelledby="vp-overlay-labelledby" hidden="" data-content-area-sibling-eligible="" data-modal="false"><div class="vp-overlay-bg"></div><div class="vp-overlay-cell"><div class="vp-overlay"></div><div class="vp-overlay-icon-wrapper hidden"><div class="vp-overlay-icon"></div></div><div class="vp-overlay-logo logo"></div></div><nav><button type="button" class="vp-nav-prevButton js-back cloaked" aria-label="Back"><svg class="icon-prev" viewBox="0 0 27 48" preserveAspectRatio="xMidYMid" focusable="false"><path class="fill" d="M7.243,24L26.414,4.828c0.781-0.781,0.781-2.047,0-2.828L25,0.586 c-0.781-0.781-2.047-0.781-2.828,0L0.879,21.879c-1.172,1.172-1.172,3.071,0,4.243l21.293,21.293c0.781,0.781,2.047,0.781,2.828,0 L26.414,46c0.781-0.781,0.781-2.047,0-2.828L7.243,24z"></path></svg></button><button type="button" class="vp-nav-closeButton js-close" aria-label="Close overlay"><svg viewBox="0 0 20 20" class="icon-close"><path d="M11.06 10l4.597-4.596a.749.749 0 1 0-1.061-1.06L10 8.938 5.404 4.343a.749.749 0 1 0-1.06 1.061L8.938 10l-4.596 4.596a.749.749 0 1 0 1.061 1.06L10 11.062l4.596 4.596a.749.749 0 1 0 1.06-1.061L11.062 10z" fill="#fff" fill-rule="evenodd"></path></svg></button></nav></div><div class="vp-notification-wrapper hidden" hidden="" data-content-area-sibling-eligible=""><div class="vp-notification-cell"><div class="vp-notification" role="dialog" aria-live="assertive"></div></div></div><span id="new-window" hidden="">This opens in a new window.</span><div class="vp-alert hidden" role="alertdialog" aria-atomic="true" hidden=""><button data-close="" aria-label="Close alert" class="close"><svg viewBox="0 0 20 20" class="icon-close"><path d="M11.06 10l4.597-4.596a.749.749 0 1 0-1.061-1.06L10 8.938 5.404 4.343a.749.749 0 1 0-1.06 1.061L8.938 10l-4.596 4.596a.749.749 0 1 0 1.061 1.06L10 11.062l4.596 4.596a.749.749 0 1 0 1.06-1.061L11.062 10z" fill="#fff" fill-rule="evenodd"></path></svg></button></div></div></div></div></div><div class="r02w9v-2 r02w9v-3 jLnMlM eSdXSO"><div class="r02w9v-1 r02w9v-6 bnNcsS dvQIWd"><div class="r02w9v-4 jKuFpe"><div theme="[object Object]"><div format="adaptive" class="sc-hKwDye cjQnJY"></div></div></div></div></div></div><div class="sc-1bh5l0d-17 hJMzfV"><div class="sc-1bh5l0d-11 bzCGfF"><div class="sc-1bh5l0d-12 fpvarX"><span format="soft" size="300" class="sc-iqseJM fCTyoX h1vp7j-2 fZCuYF sc-1bh5l0d-13 kHYsa">eleonore // michael - middlebury, vt</span><div class="sc-1bh5l0d-18 jQquPj"></div></div></div></div></div><div class="sc-1bh5l0d-5 ijdkIA"></div></div><footer class="z8qfjy-0 eDVWVs single-video-footer"><div class="z8qfjy-1 bKuzWD"></div><div class="z8qfjy-1 bKuzWD"><div class="sc-1nznpbq-0 ehYomF"><button iconposition="left" id="essential-footer-legal-menu-button" title="Terms &amp; Privacy" class="sc-dkPtRN dBiYwT sc-1nznpbq-3 gJuryj"><span class="sc-gsDKAQ erBbkF"><span format="soft" size="300" class="sc-iqseJM fCTyoX sc-1nznpbq-2 lgWCnx">Terms &amp; Privacy</span></span><div radius="10" class="sc-eCImPb dOSnGh"></div></button></div><button icononly="[object Object]" iconposition="left" aria-label="Dark mode" id="essential-footer-theme-button" class="sc-dkPtRN hejgUs z8qfjy-2 gmsdwS"><svg viewBox="0 0 20 20" class="z8qfjy-3 ciNgpD"><path d="M10 1.81818C5.48818 1.81818 1.81818 5.48818 1.81818 10C1.81818 14.5118 5.48818 18.1818 10 18.1818C14.5118 18.1818 18.1818 14.5118 18.1818 10C18.1818 5.48818 14.5118 1.81818 10 1.81818ZM10 20C4.48636 20 0 15.5136 0 10C0 4.48636 4.48636 0 10 0C15.5136 0 20 4.48636 20 10C20 15.5136 15.5136 20 10 20Z"></path><path d="M5.51758 14.4869C7.97576 16.9442 11.9603 16.9442 14.4185 14.4869C16.8757 12.0296 16.8757 8.04418 14.4185 5.58691L5.51758 14.4869Z"></path></svg><div radius="50" class="sc-eCImPb jFqrYB"></div></button><button icononly="[object Object]" iconposition="left" aria-label="Language and content" id="essential-footer-main-menu-button" class="sc-dkPtRN hejgUs z8qfjy-2 lbxCED"><svg viewBox="0 0 20 20" class="z8qfjy-4 fJFMdY"><circle cx="3" cy="10" r="2" fill="#1a2e3b"></circle><circle cx="10" cy="10" r="2" fill="#1a2e3b"></circle><circle cx="17" cy="10" r="2" fill="#1a2e3b"></circle></svg><div radius="50" class="sc-eCImPb jFqrYB"></div></button></div></footer><div aria-orientation="vertical" role="tablist" class="sc-1x65v2q-0 bXHAZD"><a color="[object Object]" icononly="[object Object]" iconposition="left" id="review-sidebar-button" aria-label="Review" href="https://vimeo.com/velare/review/192207770/d57e4ab04e" class="sc-dkPtRN ktOpfk sc-1x65v2q-1 iHWlfG"><svg viewBox="0 0 20 21"><path d="M20 21l-5.83-5H2a2 2 0 0 1-2-2V2a2 2 0 0 1 2-2h16a2 2 0 0 1 2 2zM2 2v12h12.91L18 16.65V2z" fill="#1a2e3b"></path><path d="M14 7H6a1 1 0 1 1 0-2h8a1 1 0 0 1 0 2zm0 4H6a1 1 0 0 1 0-2h8a1 1 0 0 1 0 2z" fill="#1a2e3b"></path></svg><div radius="12" class="sc-eCImPb cQTIMS"></div></a></div></div></div></div></div></div><script id="__LOCALE__">window.__i18nLocale = "en";</script><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{}},"page":"/recipient-page/[clipId]/[clipHash]","query":{},"buildId":"-vJzz-5caBT5_bACX0zh-","assetPrefix":"https://f.vimeocdn.com/js_opt/app/vimeo-next","nextExport":true,"autoExport":true,"isFallback":false,"scriptLoader":[]}</script><next-route-announcer><p aria-live="assertive" id="__next-route-announcer__" role="alert" style="border: 0px; clip: rect(0px, 0px, 0px, 0px); height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px; white-space: nowrap; overflow-wrap: normal;"></p></next-route-announcer><script src="./eleonore __ michael - middlebury, vt_files/otSDKStub.js" type="text/javascript" charset="UTF-8" data-document-language="true" data-domain-script="d3270f1f-24f3-442a-b8ee-e66f42b3bb19" data-nscript="afterInteractive" data-airgap-id="86"></script><script type="text/javascript" data-nscript="afterInteractive">
+function OptanonWrapper() {
+  /**
+   * Sending location data for blocking GTM cookies
+   */
+  oneTrustTriggered = true;
+  var location = window.OneTrust ? window.OneTrust.getGeolocationData() : null;
+  if(window._gtm && location) {
+    window._gtm.push(location);
+  }
+
+  /**
+   * This is needed in case the scripts loads before the onetrust btn loads
+   */
+  if(location && location.country === 'FR' && document.head) {
+    var style = document.createElement('style');
+    document.head.appendChild(style);
+    var stylesheet = style.sheet;
+    if (stylesheet) {
+      stylesheet.insertRule('<?= $ot_btn_id ?> { display: inline-block !important; }');
+    }
+  }
+
+}
+      </script><div id="onetrust-consent-sdk"><div class="onetrust-pc-dark-filter ot-hide ot-fade-in"></div><div id="onetrust-pc-sdk" class="otPcCenter ot-hide ot-fade-in" aria-modal="true" role="alertdialog" lang="en" aria-label="Privacy Preference Center"><!-- Close Button --><div class="ot-pc-header"><!-- Logo Tag --><div class="ot-pc-logo" role="img" aria-label="Company Logo" style="background-image: url(&quot;https://cdn.cookielaw.org/logos/static/ot_logo.png&quot;);
+                    background-position: left;"></div><button id="close-pc-btn-handler" class="ot-close-icon" aria-label="Close"></button></div><!-- Close Button --><div id="ot-pc-content" class="ot-pc-scrollbar"><h2 id="ot-pc-title">Privacy Preference Center</h2><div id="ot-pc-desc">When you visit any website, it may store or retrieve information on your browser, mostly in the form of cookies. This information might be about you, your preferences or your device and is mostly used to make the site work as you expect it to. The information does not usually directly identify you, but it can give you a more personalized web experience. Because we respect your right to privacy, you can choose not to allow some types of cookies. Click on the different category headings to find out more and change our default settings. However, blocking some types of cookies may impact your experience of the site and the services we are able to offer.
+                <br><a href="https://cookiepedia.co.uk/giving-consent-to-cookies" class="privacy-notice-link" rel="noopener" target="_blank" aria-label="More information about your privacy, opens in a new tab">More information</a></div><button id="accept-recommended-btn-handler">Allow All</button><section class="ot-sdk-row ot-cat-grp"><h3 id="ot-category-title"> Manage Consent Preferences</h3><div class="ot-accordion-layout ot-cat-item" data-optanongroupid="C0001"><button aria-expanded="false" ot-accordion="true" aria-controls="ot-desc-id-C0001" aria-labelledby="ot-header-id-C0001"></button><!-- Accordion header --><div class="ot-acc-hdr ot-always-active-group"><div class="ot-plus-minus"><span></span><span></span></div><h4 class="ot-cat-header" id="ot-header-id-C0001">Strictly Necessary Cookies</h4><div class="ot-always-active">Always Active</div></div><!-- accordion detail --><div class="ot-acc-grpcntr ot-acc-txt"><p class="ot-acc-grpdesc ot-category-desc" id="ot-desc-id-C0001">These cookies are necessary for the website to function and cannot be disabled. You may be able to configure your Internet browser to block strictly necessary cookies. However, if you block cookies in this category, which do not collect or store any personal information, this could affect some parts of the website and cause it to function incorrectly.
+</p></div></div><div class="ot-accordion-layout ot-cat-item" data-optanongroupid="C0002"><button aria-expanded="false" ot-accordion="true" aria-controls="ot-desc-id-C0002" aria-labelledby="ot-header-id-C0002"></button><!-- Accordion header --><div class="ot-acc-hdr ot-always-active-group"><div class="ot-plus-minus"><span></span><span></span></div><h4 class="ot-cat-header" id="ot-header-id-C0002">Performance Cookies</h4><div class="ot-always-active">Always Active</div></div><!-- accordion detail --><div class="ot-acc-grpcntr ot-acc-txt"><p class="ot-acc-grpdesc ot-category-desc" id="ot-desc-id-C0002">These cookies allow us to count visits, identify traffic sources and understand how our services are used to measure and improve performance. If you do not allow these cookies, we will not know when you visited our site and we will not be able to monitor its performance.</p></div></div><div class="ot-accordion-layout ot-cat-item" data-optanongroupid="C0003"><button aria-expanded="false" ot-accordion="true" aria-controls="ot-desc-id-C0003" aria-labelledby="ot-header-id-C0003"></button><!-- Accordion header --><div class="ot-acc-hdr ot-always-active-group"><div class="ot-plus-minus"><span></span><span></span></div><h4 class="ot-cat-header" id="ot-header-id-C0003">Functional Cookies</h4><div class="ot-always-active">Always Active</div></div><!-- accordion detail --><div class="ot-acc-grpcntr ot-acc-txt"><p class="ot-acc-grpdesc ot-category-desc" id="ot-desc-id-C0003">These cookies improve functionality and personalization. They may be set by us or by other third-party providers whose services we add to our pages. If you do not allow these cookies, some or all of these additional functions may not work properly.</p></div></div><div class="ot-accordion-layout ot-cat-item" data-optanongroupid="C0004"><button aria-expanded="false" ot-accordion="true" aria-controls="ot-desc-id-C0004" aria-labelledby="ot-header-id-C0004"></button><!-- Accordion header --><div class="ot-acc-hdr ot-always-active-group"><div class="ot-plus-minus"><span></span><span></span></div><h4 class="ot-cat-header" id="ot-header-id-C0004">Targeting Cookies</h4><div class="ot-always-active">Always Active</div></div><!-- accordion detail --><div class="ot-acc-grpcntr ot-acc-txt"><p class="ot-acc-grpdesc ot-category-desc" id="ot-desc-id-C0004">Our advertising partners may set these cookies on our site. They can be used to show you our ads on third-party sites, measure the effectiveness of those ads, or prevent ads from being shown to you. They do not store personal information directly, but rather uniquely identify your browser and device. If you do not allow these cookies, you will not receive targeted advertising.</p></div></div><!-- Groups sections starts --><!-- Group section ends --><!-- Accordion Group section starts --><!-- Accordion Group section ends --></section></div><section id="ot-pc-lst" class="ot-hide ot-hosts-ui ot-pc-scrollbar"><div id="ot-pc-hdr"><div id="ot-lst-title"><button class="ot-link-btn back-btn-handler" aria-label="Back"><svg id="ot-back-arw" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 444.531 444.531" xml:space="preserve"><title>Back Button</title><g><path fill="#656565" d="M213.13,222.409L351.88,83.653c7.05-7.043,10.567-15.657,10.567-25.841c0-10.183-3.518-18.793-10.567-25.835
+                    l-21.409-21.416C323.432,3.521,314.817,0,304.637,0s-18.791,3.521-25.841,10.561L92.649,196.425
+                    c-7.044,7.043-10.566,15.656-10.566,25.841s3.521,18.791,10.566,25.837l186.146,185.864c7.05,7.043,15.66,10.564,25.841,10.564
+                    s18.795-3.521,25.834-10.564l21.409-21.412c7.05-7.039,10.567-15.604,10.567-25.697c0-10.085-3.518-18.746-10.567-25.978
+                    L213.13,222.409z"></path></g></svg></button><h3>Performance Cookies</h3></div><div class="ot-lst-subhdr"><div class="ot-search-cntr"><p role="status" class="ot-scrn-rdr"></p><label for="vendor-search-handler" class="ot-scrn-rdr"></label> <input id="vendor-search-handler" type="text" name="vendor-search-handler"> <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 -30 110 110" aria-hidden="true"><title>Search Icon</title><path fill="#2e3644" d="M55.146,51.887L41.588,37.786c3.486-4.144,5.396-9.358,5.396-14.786c0-12.682-10.318-23-23-23s-23,10.318-23,23
+            s10.318,23,23,23c4.761,0,9.298-1.436,13.177-4.162l13.661,14.208c0.571,0.593,1.339,0.92,2.162,0.92
+            c0.779,0,1.518-0.297,2.079-0.837C56.255,54.982,56.293,53.08,55.146,51.887z M23.984,6c9.374,0,17,7.626,17,17s-7.626,17-17,17
+            s-17-7.626-17-17S14.61,6,23.984,6z"></path></svg></div><div class="ot-fltr-cntr"><button id="filter-btn-handler" aria-label="Filter" aria-haspopup="true"><svg role="presentation" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 402.577 402.577" xml:space="preserve"><title>Filter Icon</title><g><path fill="#fff" d="M400.858,11.427c-3.241-7.421-8.85-11.132-16.854-11.136H18.564c-7.993,0-13.61,3.715-16.846,11.136
+      c-3.234,7.801-1.903,14.467,3.999,19.985l140.757,140.753v138.755c0,4.955,1.809,9.232,5.424,12.854l73.085,73.083
+      c3.429,3.614,7.71,5.428,12.851,5.428c2.282,0,4.66-0.479,7.135-1.43c7.426-3.238,11.14-8.851,11.14-16.845V172.166L396.861,31.413
+      C402.765,25.895,404.093,19.231,400.858,11.427z"></path></g></svg></button></div><div id="ot-anchor"></div><section id="ot-fltr-modal"><div id="ot-fltr-cnt"><button id="clear-filters-handler">Clear</button><div class="ot-fltr-scrlcnt ot-pc-scrollbar"><div class="ot-fltr-opts"><div class="ot-fltr-opt"><div class="ot-chkbox"><input id="chkbox-id" type="checkbox" aria-checked="false" class="category-filter-handler"> <label for="chkbox-id"><span class="ot-label-txt">checkbox label</span></label> <span class="ot-label-status">label</span></div></div></div><div class="ot-fltr-btns"><button id="filter-apply-handler">Apply</button> <button id="filter-cancel-handler">Cancel</button></div></div></div></section></div></div><section id="ot-lst-cnt" class="ot-host-cnt ot-pc-scrollbar"><div id="ot-sel-blk"><div class="ot-sel-all"><div class="ot-sel-all-hdr"><span class="ot-consent-hdr">Consent</span> <span class="ot-li-hdr">Leg.Interest</span></div><div class="ot-sel-all-chkbox"><div class="ot-chkbox" id="ot-selall-hostcntr"><input id="select-all-hosts-groups-handler" type="checkbox" aria-checked="false"> <label for="select-all-hosts-groups-handler"><span class="ot-label-txt">checkbox label</span></label> <span class="ot-label-status">label</span></div><div class="ot-chkbox" id="ot-selall-vencntr"><input id="select-all-vendor-groups-handler" type="checkbox" aria-checked="false"> <label for="select-all-vendor-groups-handler"><span class="ot-label-txt">checkbox label</span></label> <span class="ot-label-status">label</span></div><div class="ot-chkbox" id="ot-selall-licntr"><input id="select-all-vendor-leg-handler" type="checkbox" aria-checked="false"> <label for="select-all-vendor-leg-handler"><span class="ot-label-txt">checkbox label</span></label> <span class="ot-label-status">label</span></div></div></div></div><div class="ot-sdk-row"><div class="ot-sdk-column"></div></div></section></section><div class="ot-pc-footer"><div class="ot-btn-container"><button class="ot-pc-refuse-all-handler">Reject All</button> <button class="save-preference-btn-handler onetrust-close-btn-handler">Confirm My Choices</button></div><!-- Footer logo --><div class="ot-pc-footer-logo"><a href="https://www.onetrust.com/products/cookie-consent/" target="_blank" rel="noopener noreferrer" style="background-image: url(&quot;https://cdn.cookielaw.org/logos/static/poweredBy_ot_logo.svg&quot;);" aria-label="Powered by OneTrust Opens in a new Tab"></a></div></div><!-- Cookie subgroup container --><!-- Vendor list link --><!-- Cookie lost link --><!-- Toggle HTML element --><!-- Checkbox HTML --><!-- plus minus--><!-- Arrow SVG element --><!-- Accordion basic element --><span class="ot-scrn-rdr" aria-atomic="true" aria-live="polite"></span><iframe class="ot-text-resize" title="onetrust-text-resize" style="position: absolute; top: -50000px; width: 100em;" aria-hidden="true" src="./eleonore __ michael - middlebury, vt_files/saved_resource.html"></iframe></div></div><script type="text/javascript" id="">(function(){function c(){window.localStorage.setItem("__landing_page",JSON.stringify({p:window.location.href,t:(new Date).getTime()}))}function g(a){if(!a)return{};var b=a.indexOf("?");if(-1===b)return{};a=a.substring(b+1);a=a.split("\x26");b={};for(var d=0;d<a.length;d++){var e=a[d].split("\x3d");2===e.length&&(b[e[0]]=encodeURIComponent(e[1]))}return b}var f=window.localStorage.getItem("__landing_page");if(f)try{var h=JSON.parse(f),k=(new Date(h.t)).getTime(),l=(new Date).getTime();if(864E5<=l-
+k)c();else{var m=g(window.location.href);m.utm_campaign&&c()}}catch(a){c()}else c()})();</script><div id="iris-portals"></div><script type="text/javascript" data-nscript="afterInteractive">
+function OptanonWrapper() {
+  /**
+   * Sending location data for blocking GTM cookies
+   */
+  oneTrustTriggered = true;
+  var location = window.OneTrust ? window.OneTrust.getGeolocationData() : null;
+  if(window._gtm && location) {
+    window._gtm.push(location);
+  }
+
+  /**
+   * This is needed in case the scripts loads before the onetrust btn loads
+   */
+  if(location && location.country === 'FR' && document.head) {
+    var style = document.createElement('style');
+    document.head.appendChild(style);
+    var stylesheet = style.sheet;
+    if (stylesheet) {
+      stylesheet.insertRule('<?= $ot_btn_id ?> { display: inline-block !important; }');
+    }
+  }
+
+}
+      </script><script src="./eleonore __ michael - middlebury, vt_files/player.js" data-airgap-id="87"></script><iframe src="./eleonore __ michael - middlebury, vt_files/proxy.html" title="Vimeo LocalStorage Proxy" aria-hidden="true" hidden=""></iframe><script type="text/javascript" data-nscript="afterInteractive">
+function OptanonWrapper() {
+  /**
+   * Sending location data for blocking GTM cookies
+   */
+  oneTrustTriggered = true;
+  var location = window.OneTrust ? window.OneTrust.getGeolocationData() : null;
+  if(window._gtm && location) {
+    window._gtm.push(location);
+  }
+
+  /**
+   * This is needed in case the scripts loads before the onetrust btn loads
+   */
+  if(location && location.country === 'FR' && document.head) {
+    var style = document.createElement('style');
+    document.head.appendChild(style);
+    var stylesheet = style.sheet;
+    if (stylesheet) {
+      stylesheet.insertRule('<?= $ot_btn_id ?> { display: inline-block !important; }');
+    }
+  }
+
+}
+      </script></body><iframe height="0" width="0" src="./eleonore __ michael - middlebury, vt_files/31e97cbf-355c-4f0d-8bad-9cd945121508.html" style="display: none;" data-airgap-id="88"></iframe><div id="transcend-consent-manager" style="position: fixed; z-index: 2147483647;"></div></html>
\ No newline at end of file
diff --git a/plugins/discourse-lazy-videos/spec/fixtures/vimeo.response b/plugins/discourse-lazy-videos/spec/fixtures/vimeo.response
new file mode 100644
index 00000000000..01c2595cedd
--- /dev/null
+++ b/plugins/discourse-lazy-videos/spec/fixtures/vimeo.response
@@ -0,0 +1,2251 @@
+<!DOCTYPE html>
+<!-- saved from url=(0014)about:internet -->
+<html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        
+
+<meta property="fb:app_id" content="19884028963">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<link rel="preconnect" href="https://player.vimeo.com/" data-airgap-id="7">
+<link rel="preconnect" href="https://i.vimeocdn.com/" data-airgap-id="8">
+<link rel="preconnect" href="https://f.vimeocdn.com/" data-airgap-id="9">
+<link rel="search" type="application/opensearchdescription+xml" href="https://vimeo.com/search/opensearch.xml" title="Vimeo">
+<link rel="logo" type="image/svg" href="https://f.vimeocdn.com/logo.svg">
+
+
+            <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=5.0,user-scalable=yes">
+    
+                        <meta property="og:site_name" content="Vimeo">
+                                <meta property="og:url" content="https://vimeo.com/786646692">
+                                <meta property="og:type" content="video.other">
+                                <meta property="og:title" content="Dear Rich">
+                                <meta property="og:description" content="Accomplished endurance athlete, author and podcaster, Rich Roll has been a voice we have become familiar with over the years. In DEAR RICH, we hear the story behind…">
+                                <meta property="og:updated_time" content="2023-04-03T19:03:47-04:00">
+                                <meta property="og:image" content="https://i.vimeocdn.com/filter/overlay?src0=https%3A%2F%2Fi.vimeocdn.com%2Fvideo%2F1582157011-37115b15c717a168bf86e2f2855b6bbc23b1cbcee54ff99c8d7b808b459365d6-d_1280x720&amp;src1=https%3A%2F%2Ff.vimeocdn.com%2Fimages_v6%2Fshare%2Fplay_icon_overlay.png">
+                                <meta property="og:image:secure_url" content="https://i.vimeocdn.com/filter/overlay?src0=https%3A%2F%2Fi.vimeocdn.com%2Fvideo%2F1582157011-37115b15c717a168bf86e2f2855b6bbc23b1cbcee54ff99c8d7b808b459365d6-d_1280x720&amp;src1=https%3A%2F%2Ff.vimeocdn.com%2Fimages_v6%2Fshare%2Fplay_icon_overlay.png">
+                                <meta property="og:image:type" content="image/jpg">
+                                <meta property="og:image:width" content="1280">
+                                <meta property="og:image:height" content="720">
+                                <meta property="og:video:url" content="https://player.vimeo.com/video/786646692?autoplay=1&amp;h=f2ca1d6121">
+                                <meta property="og:video:secure_url" content="https://player.vimeo.com/video/786646692?autoplay=1&amp;h=f2ca1d6121">
+                                <meta property="og:video:type" content="text/html">
+                                <meta property="og:video:width" content="1280">
+                                <meta property="og:video:height" content="720">
+                                <meta property="al:ios:app_name" content="Vimeo">
+                                <meta property="al:ios:app_store_id" content="425194759">
+                                <meta property="al:ios:url" content="vimeo://app.vimeo.com/videos/786646692">
+                                <meta property="al:android:app_name" content="Vimeo">
+                                <meta property="al:android:package" content="com.vimeo.android.videoapp">
+                                <meta property="al:android:url" content="vimeo://app.vimeo.com/videos/786646692">
+                                <meta property="al:web:should_fallback" content="true">
+            
+        <meta name="description" content="Accomplished endurance athlete, author and podcaster, Rich Roll has been a voice we have become familiar with over the years. In DEAR RICH, we hear the story behind…">
+        <meta name="twitter:card" content="player">
+        <meta name="twitter:site" content="@vimeo">
+        <meta name="twitter:title" content="Dear Rich">
+        <meta name="twitter:description" content="Accomplished endurance athlete, author and podcaster, Rich Roll has been a voice we have become familiar with over the years. In DEAR RICH, we hear the story behind…">
+        <meta name="twitter:image" content="https://i.vimeocdn.com/filter/overlay?src0=https%3A%2F%2Fi.vimeocdn.com%2Fvideo%2F1582157011-37115b15c717a168bf86e2f2855b6bbc23b1cbcee54ff99c8d7b808b459365d6-d_1280x720&amp;src1=https%3A%2F%2Ff.vimeocdn.com%2Fimages_v6%2Fshare%2Fplay_icon_overlay.png">
+        <meta name="twitter:player" content="https://player.vimeo.com/video/786646692?h=f2ca1d6121">
+        <meta name="twitter:player:width" content="1280">
+        <meta name="twitter:player:height" content="720">
+        <meta name="twitter:site" content="@vimeo">
+        <meta name="twitter:app:name:iphone" content="Vimeo">
+        <meta name="twitter:app:id:iphone" content="425194759">
+        <meta name="twitter:app:url:iphone" content="vimeo://app.vimeo.com/videos/786646692">
+        <meta name="twitter:app:name:ipad" content="Vimeo">
+        <meta name="twitter:app:id:ipad" content="425194759">
+        <meta name="twitter:app:url:ipad" content="vimeo://app.vimeo.com/videos/786646692">
+        <meta name="twitter:app:name:googleplay" content="Vimeo">
+        <meta name="twitter:app:id:googleplay" content="com.vimeo.android.videoapp">
+        <meta name="twitter:app:url:googleplay" content="vimeo://app.vimeo.com/videos/786646692">
+
+
+
+
+                    <link rel="alternate" href="https://vimeo.com/api/oembed.json?url=https%3A%2F%2Fvimeo.com%2F786646692%3Fh%3Df2ca1d6121" type="application/json+oembed" title="Dear Rich" data-airgap-id="10">
+                <link rel="alternate" href="https://vimeo.com/api/oembed.xml?url=https%3A%2F%2Fvimeo.com%2F786646692%3Fh%3Df2ca1d6121" type="text/xml+oembed" title="Dear Rich" data-airgap-id="11">
+                <link rel="pingback" href="https://vimeo.com/_pingback" data-airgap-id="12">
+                <link rel="canonical" href="https://vimeo.com/786646692">
+        <link rel="apple-touch-icon-precomposed" href="https://i.vimeocdn.com/favicon/main-touch_180">
+
+<link rel="mask-icon" href="https://f.vimeocdn.com/svg/legacy_view_support/iris_icon_v_64.svg?fa494654d82fbd93f6bdc3a2306927cb52ebb523" color="#17272e">
+
+    <link rel="shortcut icon" href="https://f.vimeocdn.com/images_v6/favicon.ico?fa494654d82fbd93f6bdc3a2306927cb52ebb523" data-play="https://i.vimeocdn.com/favicon/play_32" data-pause="https://i.vimeocdn.com/favicon/pause_32" data-airgap-id="13">
+
+<meta name="msapplication-TileImage" content="https://i.vimeocdn.com/favicon/main-touch_144">
+<meta name="msapplication-TileColor" content="#00adef">
+        <title>Dear Rich on Vimeo</title>
+        
+<style>
+  #ot-sdk-btn {
+    display: none;
+  }
+</style>
+<script type="text/javascript" src="./Dear Rich on Vimeo_files/689d5b4562"></script><script src="./Dear Rich on Vimeo_files/nr-spa-1208.min.js"></script><script type="text/javascript" async="" src="./Dear Rich on Vimeo_files/singular-gtm-interface.js"></script><script type="text/javascript" async="" src="./Dear Rich on Vimeo_files/js"></script><script type="text/javascript" async="" src="./Dear Rich on Vimeo_files/singular-gtm-interface.js"></script><script type="text/javascript" async="" src="./Dear Rich on Vimeo_files/analytics.js"></script><script src="./Dear Rich on Vimeo_files/player.js" data-airgap-id="14"></script><link rel="stylesheet" href="./Dear Rich on Vimeo_files/player.css" data-airgap-id="15"><script type="text/javascript" src="./Dear Rich on Vimeo_files/otSDKStub.js" data-domain-script="d3270f1f-24f3-442a-b8ee-e66f42b3bb19" data-document-language="true" data-airgap-id="16"></script><script>
+  (function() {
+    function isCrawler() {
+      var crawlerUA = [
+        'adsbot-google',
+        'applebot',
+        'baiduspider',
+        'bingbot',
+        'blekkobot',
+        'Embedly',
+        'facebookexternalhit',
+        'Facebot',
+        'feedfetcher-google',
+        'feedly',
+        'FlipboardProxy',
+        'google web preview',
+        'googlebot',
+        'GrapeshotCrawler',
+        'linkedinbot',
+        'mail.ru_bot',
+        'mediapartners-google',
+        'msnbot_mobile',
+        'msnbot',
+        'msnbot',
+        'pinterest',
+        'Seznam',
+        'SkypeUriPreview',
+        'slurp',
+        'superfeedr bot',
+        'tumblr',
+        'twitterbot',
+        'yandex',
+        'prerender'
+      ];
+      const regEx = new RegExp(
+        `(${crawlerUA.join('|').replace('.', '\\.').replace('-', '\\-')})`,
+        'i',
+      );
+
+      return !!window.navigator.userAgent.match(regEx);
+    }
+
+    if (isCrawler()) return;
+
+    var scriptElement = document.createElement('script');
+    scriptElement.type = 'text/javascript';
+    scriptElement.src = 'https://cdn.cookielaw.org/scripttemplates/otSDKStub.js';
+
+    scriptElement.dataset['domainScript'] = 'd3270f1f-24f3-442a-b8ee-e66f42b3bb19';
+    scriptElement.dataset['documentLanguage'] = 'true';
+
+    var firstScript = document.getElementsByTagName('script')[0];
+    if (firstScript) {
+      firstScript.parentNode.insertBefore(scriptElement, firstScript);
+    }
+  })();
+
+  function OptanonWrapper() {
+    /**
+     * Sending location data for blocking GTM cookies
+     */
+    oneTrustTriggered = true;
+    var location = OneTrust.getGeolocationData();
+    if(window && window._gtm) {
+      window._gtm.push(location);
+    }
+    /**
+     * This is needed in case the scripts loads before the onetrust btn loads
+     */
+    if(location && location.country === 'FR' && document.head) {
+      var style = document.createElement('style');
+      document.head.appendChild(style);
+      var stylesheet = style.sheet;
+      if (stylesheet) {
+        stylesheet.insertRule('#ot-sdk-btn { display: inline-block !important; }');
+      }
+    }
+  }
+</script>
+        <script>
+            // First Input Delay tracking. High priority loading to not miss event
+            // https://github.com/GoogleChromeLabs/first-input-delay/blob/master/dist/first-input-delay.min.js
+            !function(n,e){var t,o,i,c=[],f={passive:!0,capture:!0},r=new Date,a="pointerup",u="pointercancel";function p(n,c){t||(t=c,o=n,i=new Date,w(e),s())}function s(){o>=0&&o<i-r&&(c.forEach(function(n){n(o,t)}),c=[])}function l(t){if(t.cancelable){var o=(t.timeStamp>1e12?new Date:performance.now())-t.timeStamp;"pointerdown"==t.type?function(t,o){function i(){p(t,o),r()}function c(){r()}function r(){e(a,i,f),e(u,c,f)}n(a,i,f),n(u,c,f)}(o,t):p(o,t)}}function w(n){["click","mousedown","keydown","touchstart","pointerdown"].forEach(function(e){n(e,l,f)})}w(n),self.perfMetrics=self.perfMetrics||{},self.perfMetrics.onFirstInputDelay=function(n){c.push(n),s()}}(addEventListener,removeEventListener);
+        </script>
+        <script>
+          // Create PerformanceObserver for tracking TTI
+          // https://github.com/GoogleChromeLabs/tti-polyfill
+          !function(){if('PerformanceLongTaskTiming' in window){var g=window.__tti={e:[]};
+          g.o=new PerformanceObserver(function(l){g.e=g.e.concat(l.getEntries())});
+          g.o.observe({entryTypes:['longtask']})}}();
+        </script>
+        <script type="text/javascript">
+if(window&&window.fetch&&-1===window.fetch.toString().indexOf("Profiling")&&-1!==document.cookie.indexOf("logs=1")){const e=window.fetch,n=["api.vimeo.com","vimeo.com"];window.fetch=(async(...t)=>{let[i,o]=t;const d=new URL(i,document.baseURI).host;return o&&o.headers&&n.includes(d)&&(o.headers.Profiling=1),await e(i,o)})}
+</script>
+        <script type="text/javascript">
+;window.NREUM||(NREUM={});NREUM.init={privacy:{cookies_enabled:true}};
+window.NREUM||(NREUM={}),__nr_require=function(t,e,n){function r(n){if(!e[n]){var o=e[n]={exports:{}};t[n][0].call(o.exports,function(e){var o=t[n][1][e];return r(o||e)},o,o.exports)}return e[n].exports}if("function"==typeof __nr_require)return __nr_require;for(var o=0;o<n.length;o++)r(n[o]);return r}({1:[function(t,e,n){function r(t){try{c.console&&console.log(t)}catch(e){}}var o,i=t("ee"),a=t(28),c={};try{o=localStorage.getItem("__nr_flags").split(","),console&&"function"==typeof console.log&&(c.console=!0,o.indexOf("dev")!==-1&&(c.dev=!0),o.indexOf("nr_dev")!==-1&&(c.nrDev=!0))}catch(s){}c.nrDev&&i.on("internal-error",function(t){r(t.stack)}),c.dev&&i.on("fn-err",function(t,e,n){r(n.stack)}),c.dev&&(r("NR AGENT IN DEVELOPMENT MODE"),r("flags: "+a(c,function(t,e){return t}).join(", ")))},{}],2:[function(t,e,n){function r(t,e,n,r,c){try{l?l-=1:o(c||new UncaughtException(t,e,n),!0)}catch(u){try{i("ierr",[u,s.now(),!0])}catch(d){}}return"function"==typeof f&&f.apply(this,a(arguments))}function UncaughtException(t,e,n){this.message=t||"Uncaught error with no additional information",this.sourceURL=e,this.line=n}function o(t,e){var n=e?null:s.now();i("err",[t,n])}var i=t("handle"),a=t(29),c=t("ee"),s=t("loader"),u=t("gos"),f=window.onerror,d=!1,p="nr@seenError",l=0;s.features.err=!0,t(1),window.onerror=r;try{throw new Error}catch(h){"stack"in h&&(t(13),t(12),"addEventListener"in window&&t(6),s.xhrWrappable&&t(14),d=!0)}c.on("fn-start",function(t,e,n){d&&(l+=1)}),c.on("fn-err",function(t,e,n){d&&!n[p]&&(u(n,p,function(){return!0}),this.thrown=!0,o(n))}),c.on("fn-end",function(){d&&!this.thrown&&l>0&&(l-=1)}),c.on("internal-error",function(t){i("ierr",[t,s.now(),!0])})},{}],3:[function(t,e,n){t("loader").features.ins=!0},{}],4:[function(t,e,n){function r(){L++,T=g.hash,this[f]=y.now()}function o(){L--,g.hash!==T&&i(0,!0);var t=y.now();this[h]=~~this[h]+t-this[f],this[d]=t}function i(t,e){E.emit("newURL",[""+g,e])}function a(t,e){t.on(e,function(){this[e]=y.now()})}var c="-start",s="-end",u="-body",f="fn"+c,d="fn"+s,p="cb"+c,l="cb"+s,h="jsTime",m="fetch",v="addEventListener",w=window,g=w.location,y=t("loader");if(w[v]&&y.xhrWrappable){var x=t(10),b=t(11),E=t(8),R=t(6),O=t(13),N=t(7),P=t(14),M=t(9),S=t("ee"),C=S.get("tracer");t(16),y.features.spa=!0;var T,L=0;S.on(f,r),b.on(p,r),M.on(p,r),S.on(d,o),b.on(l,o),M.on(l,o),S.buffer([f,d,"xhr-done","xhr-resolved"]),R.buffer([f]),O.buffer(["setTimeout"+s,"clearTimeout"+c,f]),P.buffer([f,"new-xhr","send-xhr"+c]),N.buffer([m+c,m+"-done",m+u+c,m+u+s]),E.buffer(["newURL"]),x.buffer([f]),b.buffer(["propagate",p,l,"executor-err","resolve"+c]),C.buffer([f,"no-"+f]),M.buffer(["new-jsonp","cb-start","jsonp-error","jsonp-end"]),a(P,"send-xhr"+c),a(S,"xhr-resolved"),a(S,"xhr-done"),a(N,m+c),a(N,m+"-done"),a(M,"new-jsonp"),a(M,"jsonp-end"),a(M,"cb-start"),E.on("pushState-end",i),E.on("replaceState-end",i),w[v]("hashchange",i,!0),w[v]("load",i,!0),w[v]("popstate",function(){i(0,L>1)},!0)}},{}],5:[function(t,e,n){function r(t){}if(window.performance&&window.performance.timing&&window.performance.getEntriesByType){var o=t("ee"),i=t("handle"),a=t(13),c=t(12),s="learResourceTimings",u="addEventListener",f="resourcetimingbufferfull",d="bstResource",p="resource",l="-start",h="-end",m="fn"+l,v="fn"+h,w="bstTimer",g="pushState",y=t("loader");y.features.stn=!0,t(8),"addEventListener"in window&&t(6);var x=NREUM.o.EV;o.on(m,function(t,e){var n=t[0];n instanceof x&&(this.bstStart=y.now())}),o.on(v,function(t,e){var n=t[0];n instanceof x&&i("bst",[n,e,this.bstStart,y.now()])}),a.on(m,function(t,e,n){this.bstStart=y.now(),this.bstType=n}),a.on(v,function(t,e){i(w,[e,this.bstStart,y.now(),this.bstType])}),c.on(m,function(){this.bstStart=y.now()}),c.on(v,function(t,e){i(w,[e,this.bstStart,y.now(),"requestAnimationFrame"])}),o.on(g+l,function(t){this.time=y.now(),this.startPath=location.pathname+location.hash}),o.on(g+h,function(t){i("bstHist",[location.pathname+location.hash,this.startPath,this.time])}),u in window.performance&&(window.performance["c"+s]?window.performance[u](f,function(t){i(d,[window.performance.getEntriesByType(p)]),window.performance["c"+s]()},!1):window.performance[u]("webkit"+f,function(t){i(d,[window.performance.getEntriesByType(p)]),window.performance["webkitC"+s]()},!1)),document[u]("scroll",r,{passive:!0}),document[u]("keypress",r,!1),document[u]("click",r,!1)}},{}],6:[function(t,e,n){function r(t){for(var e=t;e&&!e.hasOwnProperty(f);)e=Object.getPrototypeOf(e);e&&o(e)}function o(t){c.inPlace(t,[f,d],"-",i)}function i(t,e){return t[1]}var a=t("ee").get("events"),c=t("wrap-function")(a,!0),s=t("gos"),u=XMLHttpRequest,f="addEventListener",d="removeEventListener";e.exports=a,"getPrototypeOf"in Object?(r(document),r(window),r(u.prototype)):u.prototype.hasOwnProperty(f)&&(o(window),o(u.prototype)),a.on(f+"-start",function(t,e){var n=t[1],r=s(n,"nr@wrapped",function(){function t(){if("function"==typeof n.handleEvent)return n.handleEvent.apply(n,arguments)}var e={object:t,"function":n}[typeof n];return e?c(e,"fn-",null,e.name||"anonymous"):n});this.wrapped=t[1]=r}),a.on(d+"-start",function(t){t[1]=this.wrapped||t[1]})},{}],7:[function(t,e,n){function r(t,e,n){var r=t[e];"function"==typeof r&&(t[e]=function(){var t=i(arguments),e={};o.emit(n+"before-start",[t],e);var a;e[m]&&e[m].dt&&(a=e[m].dt);var c=r.apply(this,t);return o.emit(n+"start",[t,a],c),c.then(function(t){return o.emit(n+"end",[null,t],c),t},function(t){throw o.emit(n+"end",[t],c),t})})}var o=t("ee").get("fetch"),i=t(29),a=t(28);e.exports=o;var c=window,s="fetch-",u=s+"body-",f=["arrayBuffer","blob","json","text","formData"],d=c.Request,p=c.Response,l=c.fetch,h="prototype",m="nr@context";d&&p&&l&&(a(f,function(t,e){r(d[h],e,u),r(p[h],e,u)}),r(c,"fetch",s),o.on(s+"end",function(t,e){var n=this;if(e){var r=e.headers.get("content-length");null!==r&&(n.rxSize=r),o.emit(s+"done",[null,e],n)}else o.emit(s+"done",[t],n)}))},{}],8:[function(t,e,n){var r=t("ee").get("history"),o=t("wrap-function")(r);e.exports=r;var i=window.history&&window.history.constructor&&window.history.constructor.prototype,a=window.history;i&&i.pushState&&i.replaceState&&(a=i),o.inPlace(a,["pushState","replaceState"],"-")},{}],9:[function(t,e,n){function r(t){function e(){s.emit("jsonp-end",[],p),t.removeEventListener("load",e,!1),t.removeEventListener("error",n,!1)}function n(){s.emit("jsonp-error",[],p),s.emit("jsonp-end",[],p),t.removeEventListener("load",e,!1),t.removeEventListener("error",n,!1)}var r=t&&"string"==typeof t.nodeName&&"script"===t.nodeName.toLowerCase();if(r){var o="function"==typeof t.addEventListener;if(o){var a=i(t.src);if(a){var f=c(a),d="function"==typeof f.parent[f.key];if(d){var p={};u.inPlace(f.parent,[f.key],"cb-",p),t.addEventListener("load",e,!1),t.addEventListener("error",n,!1),s.emit("new-jsonp",[t.src],p)}}}}}function o(){return"addEventListener"in window}function i(t){var e=t.match(f);return e?e[1]:null}function a(t,e){var n=t.match(p),r=n[1],o=n[3];return o?a(o,e[r]):e[r]}function c(t){var e=t.match(d);return e&&e.length>=3?{key:e[2],parent:a(e[1],window)}:{key:t,parent:window}}var s=t("ee").get("jsonp"),u=t("wrap-function")(s);if(e.exports=s,o()){var f=/[?&](?:callback|cb)=([^&#]+)/,d=/(.*)\.([^.]+)/,p=/^(\w+)(\.|$)(.*)$/,l=["appendChild","insertBefore","replaceChild"];Node&&Node.prototype&&Node.prototype.appendChild?u.inPlace(Node.prototype,l,"dom-"):(u.inPlace(HTMLElement.prototype,l,"dom-"),u.inPlace(HTMLHeadElement.prototype,l,"dom-"),u.inPlace(HTMLBodyElement.prototype,l,"dom-")),s.on("dom-start",function(t){r(t[0])})}},{}],10:[function(t,e,n){var r=t("ee").get("mutation"),o=t("wrap-function")(r),i=NREUM.o.MO;e.exports=r,i&&(window.MutationObserver=function(t){return this instanceof i?new i(o(t,"fn-")):i.apply(this,arguments)},MutationObserver.prototype=i.prototype)},{}],11:[function(t,e,n){function r(t){var e=i.context(),n=c(t,"executor-",e,null,!1),r=new u(n);return i.context(r).getCtx=function(){return e},r}var o=t("wrap-function"),i=t("ee").get("promise"),a=t("ee").getOrSetContext,c=o(i),s=t(28),u=NREUM.o.PR;e.exports=i,u&&(window.Promise=r,["all","race"].forEach(function(t){var e=u[t];u[t]=function(n){function r(t){return function(){i.emit("propagate",[null,!o],a,!1,!1),o=o||!t}}var o=!1;s(n,function(e,n){Promise.resolve(n).then(r("all"===t),r(!1))});var a=e.apply(u,arguments),c=u.resolve(a);return c}}),["resolve","reject"].forEach(function(t){var e=u[t];u[t]=function(t){var n=e.apply(u,arguments);return t!==n&&i.emit("propagate",[t,!0],n,!1,!1),n}}),u.prototype["catch"]=function(t){return this.then(null,t)},u.prototype=Object.create(u.prototype,{constructor:{value:r}}),s(Object.getOwnPropertyNames(u),function(t,e){try{r[e]=u[e]}catch(n){}}),o.wrapInPlace(u.prototype,"then",function(t){return function(){var e=this,n=o.argsToArray.apply(this,arguments),r=a(e);r.promise=e,n[0]=c(n[0],"cb-",r,null,!1),n[1]=c(n[1],"cb-",r,null,!1);var s=t.apply(this,n);return r.nextPromise=s,i.emit("propagate",[e,!0],s,!1,!1),s}}),i.on("executor-start",function(t){t[0]=c(t[0],"resolve-",this,null,!1),t[1]=c(t[1],"resolve-",this,null,!1)}),i.on("executor-err",function(t,e,n){t[1](n)}),i.on("cb-end",function(t,e,n){i.emit("propagate",[n,!0],this.nextPromise,!1,!1)}),i.on("propagate",function(t,e,n){this.getCtx&&!e||(this.getCtx=function(){if(t instanceof Promise)var e=i.context(t);return e&&e.getCtx?e.getCtx():this})}),r.toString=function(){return""+u})},{}],12:[function(t,e,n){var r=t("ee").get("raf"),o=t("wrap-function")(r),i="equestAnimationFrame";e.exports=r,o.inPlace(window,["r"+i,"mozR"+i,"webkitR"+i,"msR"+i],"raf-"),r.on("raf-start",function(t){t[0]=o(t[0],"fn-")})},{}],13:[function(t,e,n){function r(t,e,n){t[0]=a(t[0],"fn-",null,n)}function o(t,e,n){this.method=n,this.timerDuration=isNaN(t[1])?0:+t[1],t[0]=a(t[0],"fn-",this,n)}var i=t("ee").get("timer"),a=t("wrap-function")(i),c="setTimeout",s="setInterval",u="clearTimeout",f="-start",d="-";e.exports=i,a.inPlace(window,[c,"setImmediate"],c+d),a.inPlace(window,[s],s+d),a.inPlace(window,[u,"clearImmediate"],u+d),i.on(s+f,r),i.on(c+f,o)},{}],14:[function(t,e,n){function r(t,e){d.inPlace(e,["onreadystatechange"],"fn-",c)}function o(){var t=this,e=f.context(t);t.readyState>3&&!e.resolved&&(e.resolved=!0,f.emit("xhr-resolved",[],t)),d.inPlace(t,g,"fn-",c)}function i(t){y.push(t),h&&(b?b.then(a):v?v(a):(E=-E,R.data=E))}function a(){for(var t=0;t<y.length;t++)r([],y[t]);y.length&&(y=[])}function c(t,e){return e}function s(t,e){for(var n in t)e[n]=t[n];return e}t(6);var u=t("ee"),f=u.get("xhr"),d=t("wrap-function")(f),p=NREUM.o,l=p.XHR,h=p.MO,m=p.PR,v=p.SI,w="readystatechange",g=["onload","onerror","onabort","onloadstart","onloadend","onprogress","ontimeout"],y=[];e.exports=f;var x=window.XMLHttpRequest=function(t){var e=new l(t);try{f.emit("new-xhr",[e],e),e.addEventListener(w,o,!1)}catch(n){try{f.emit("internal-error",[n])}catch(r){}}return e};if(s(l,x),x.prototype=l.prototype,d.inPlace(x.prototype,["open","send"],"-xhr-",c),f.on("send-xhr-start",function(t,e){r(t,e),i(e)}),f.on("open-xhr-start",r),h){var b=m&&m.resolve();if(!v&&!m){var E=1,R=document.createTextNode(E);new h(a).observe(R,{characterData:!0})}}else u.on("fn-end",function(t){t[0]&&t[0].type===w||a()})},{}],15:[function(t,e,n){function r(t){if(!c(t))return null;var e=window.NREUM;if(!e.loader_config)return null;var n=(e.loader_config.accountID||"").toString()||null,r=(e.loader_config.agentID||"").toString()||null,u=(e.loader_config.trustKey||"").toString()||null;if(!n||!r)return null;var h=l.generateSpanId(),m=l.generateTraceId(),v=Date.now(),w={spanId:h,traceId:m,timestamp:v};return(t.sameOrigin||s(t)&&p())&&(w.traceContextParentHeader=o(h,m),w.traceContextStateHeader=i(h,v,n,r,u)),(t.sameOrigin&&!f()||!t.sameOrigin&&s(t)&&d())&&(w.newrelicHeader=a(h,m,v,n,r,u)),w}function o(t,e){return"00-"+e+"-"+t+"-01"}function i(t,e,n,r,o){var i=0,a="",c=1,s="",u="";return o+"@nr="+i+"-"+c+"-"+n+"-"+r+"-"+t+"-"+a+"-"+s+"-"+u+"-"+e}function a(t,e,n,r,o,i){var a="btoa"in window&&"function"==typeof window.btoa;if(!a)return null;var c={v:[0,1],d:{ty:"Browser",ac:r,ap:o,id:t,tr:e,ti:n}};return i&&r!==i&&(c.d.tk=i),btoa(JSON.stringify(c))}function c(t){return u()&&s(t)}function s(t){var e=!1,n={};if("init"in NREUM&&"distributed_tracing"in NREUM.init&&(n=NREUM.init.distributed_tracing),t.sameOrigin)e=!0;else if(n.allowed_origins instanceof Array)for(var r=0;r<n.allowed_origins.length;r++){var o=h(n.allowed_origins[r]);if(t.hostname===o.hostname&&t.protocol===o.protocol&&t.port===o.port){e=!0;break}}return e}function u(){return"init"in NREUM&&"distributed_tracing"in NREUM.init&&!!NREUM.init.distributed_tracing.enabled}function f(){return"init"in NREUM&&"distributed_tracing"in NREUM.init&&!!NREUM.init.distributed_tracing.exclude_newrelic_header}function d(){return"init"in NREUM&&"distributed_tracing"in NREUM.init&&NREUM.init.distributed_tracing.cors_use_newrelic_header!==!1}function p(){return"init"in NREUM&&"distributed_tracing"in NREUM.init&&!!NREUM.init.distributed_tracing.cors_use_tracecontext_headers}var l=t(25),h=t(17);e.exports={generateTracePayload:r,shouldGenerateTrace:c}},{}],16:[function(t,e,n){function r(t){var e=this.params,n=this.metrics;if(!this.ended){this.ended=!0;for(var r=0;r<p;r++)t.removeEventListener(d[r],this.listener,!1);e.aborted||(n.duration=a.now()-this.startTime,this.loadCaptureCalled||4!==t.readyState?null==e.status&&(e.status=0):i(this,t),n.cbTime=this.cbTime,f.emit("xhr-done",[t],t),c("xhr",[e,n,this.startTime]))}}function o(t,e){var n=s(e),r=t.params;r.host=n.hostname+":"+n.port,r.pathname=n.pathname,t.parsedOrigin=s(e),t.sameOrigin=t.parsedOrigin.sameOrigin}function i(t,e){t.params.status=e.status;var n=v(e,t.lastSize);if(n&&(t.metrics.rxSize=n),t.sameOrigin){var r=e.getResponseHeader("X-NewRelic-App-Data");r&&(t.params.cat=r.split(", ").pop())}t.loadCaptureCalled=!0}var a=t("loader");if(a.xhrWrappable){var c=t("handle"),s=t(17),u=t(15).generateTracePayload,f=t("ee"),d=["load","error","abort","timeout"],p=d.length,l=t("id"),h=t(21),m=t(20),v=t(18),w=window.XMLHttpRequest;a.features.xhr=!0,t(14),t(7),f.on("new-xhr",function(t){var e=this;e.totalCbs=0,e.called=0,e.cbTime=0,e.end=r,e.ended=!1,e.xhrGuids={},e.lastSize=null,e.loadCaptureCalled=!1,t.addEventListener("load",function(n){i(e,t)},!1),h&&(h>34||h<10)||window.opera||t.addEventListener("progress",function(t){e.lastSize=t.loaded},!1)}),f.on("open-xhr-start",function(t){this.params={method:t[0]},o(this,t[1]),this.metrics={}}),f.on("open-xhr-end",function(t,e){"loader_config"in NREUM&&"xpid"in NREUM.loader_config&&this.sameOrigin&&e.setRequestHeader("X-NewRelic-ID",NREUM.loader_config.xpid);var n=u(this.parsedOrigin);if(n){var r=!1;n.newrelicHeader&&(e.setRequestHeader("newrelic",n.newrelicHeader),r=!0),n.traceContextParentHeader&&(e.setRequestHeader("traceparent",n.traceContextParentHeader),n.traceContextStateHeader&&e.setRequestHeader("tracestate",n.traceContextStateHeader),r=!0),r&&(this.dt=n)}}),f.on("send-xhr-start",function(t,e){var n=this.metrics,r=t[0],o=this;if(n&&r){var i=m(r);i&&(n.txSize=i)}this.startTime=a.now(),this.listener=function(t){try{"abort"!==t.type||o.loadCaptureCalled||(o.params.aborted=!0),("load"!==t.type||o.called===o.totalCbs&&(o.onloadCalled||"function"!=typeof e.onload))&&o.end(e)}catch(n){try{f.emit("internal-error",[n])}catch(r){}}};for(var c=0;c<p;c++)e.addEventListener(d[c],this.listener,!1)}),f.on("xhr-cb-time",function(t,e,n){this.cbTime+=t,e?this.onloadCalled=!0:this.called+=1,this.called!==this.totalCbs||!this.onloadCalled&&"function"==typeof n.onload||this.end(n)}),f.on("xhr-load-added",function(t,e){var n=""+l(t)+!!e;this.xhrGuids&&!this.xhrGuids[n]&&(this.xhrGuids[n]=!0,this.totalCbs+=1)}),f.on("xhr-load-removed",function(t,e){var n=""+l(t)+!!e;this.xhrGuids&&this.xhrGuids[n]&&(delete this.xhrGuids[n],this.totalCbs-=1)}),f.on("addEventListener-end",function(t,e){e instanceof w&&"load"===t[0]&&f.emit("xhr-load-added",[t[1],t[2]],e)}),f.on("removeEventListener-end",function(t,e){e instanceof w&&"load"===t[0]&&f.emit("xhr-load-removed",[t[1],t[2]],e)}),f.on("fn-start",function(t,e,n){e instanceof w&&("onload"===n&&(this.onload=!0),("load"===(t[0]&&t[0].type)||this.onload)&&(this.xhrCbStart=a.now()))}),f.on("fn-end",function(t,e){this.xhrCbStart&&f.emit("xhr-cb-time",[a.now()-this.xhrCbStart,this.onload,e],e)}),f.on("fetch-before-start",function(t){function e(t,e){var n=!1;return e.newrelicHeader&&(t.set("newrelic",e.newrelicHeader),n=!0),e.traceContextParentHeader&&(t.set("traceparent",e.traceContextParentHeader),e.traceContextStateHeader&&t.set("tracestate",e.traceContextStateHeader),n=!0),n}var n,r=t[1]||{};"string"==typeof t[0]?n=t[0]:t[0]&&t[0].url?n=t[0].url:window.URL&&t[0]&&t[0]instanceof URL&&(n=t[0].href),n&&(this.parsedOrigin=s(n),this.sameOrigin=this.parsedOrigin.sameOrigin);var o=u(this.parsedOrigin);if(o&&(o.newrelicHeader||o.traceContextParentHeader))if("string"==typeof t[0]||window.URL&&t[0]&&t[0]instanceof URL){var i={};for(var a in r)i[a]=r[a];i.headers=new Headers(r.headers||{}),e(i.headers,o)&&(this.dt=o),t.length>1?t[1]=i:t.push(i)}else t[0]&&t[0].headers&&e(t[0].headers,o)&&(this.dt=o)})}},{}],17:[function(t,e,n){var r={};e.exports=function(t){if(t in r)return r[t];var e=document.createElement("a"),n=window.location,o={};e.href=t,o.port=e.port;var i=e.href.split("://");!o.port&&i[1]&&(o.port=i[1].split("/")[0].split("@").pop().split(":")[1]),o.port&&"0"!==o.port||(o.port="https"===i[0]?"443":"80"),o.hostname=e.hostname||n.hostname,o.pathname=e.pathname,o.protocol=i[0],"/"!==o.pathname.charAt(0)&&(o.pathname="/"+o.pathname);var a=!e.protocol||":"===e.protocol||e.protocol===n.protocol,c=e.hostname===document.domain&&e.port===n.port;return o.sameOrigin=a&&(!e.hostname||c),"/"===o.pathname&&(r[t]=o),o}},{}],18:[function(t,e,n){function r(t,e){var n=t.responseType;return"json"===n&&null!==e?e:"arraybuffer"===n||"blob"===n||"json"===n?o(t.response):"text"===n||""===n||void 0===n?o(t.responseText):void 0}var o=t(20);e.exports=r},{}],19:[function(t,e,n){function r(){}function o(t,e,n){return function(){return i(t,[u.now()].concat(c(arguments)),e?null:this,n),e?void 0:this}}var i=t("handle"),a=t(28),c=t(29),s=t("ee").get("tracer"),u=t("loader"),f=NREUM;"undefined"==typeof window.newrelic&&(newrelic=f);var d=["setPageViewName","setCustomAttribute","setErrorHandler","finished","addToTrace","inlineHit","addRelease"],p="api-",l=p+"ixn-";a(d,function(t,e){f[e]=o(p+e,!0,"api")}),f.addPageAction=o(p+"addPageAction",!0),f.setCurrentRouteName=o(p+"routeName",!0),e.exports=newrelic,f.interaction=function(){return(new r).get()};var h=r.prototype={createTracer:function(t,e){var n={},r=this,o="function"==typeof e;return i(l+"tracer",[u.now(),t,n],r),function(){if(s.emit((o?"":"no-")+"fn-start",[u.now(),r,o],n),o)try{return e.apply(this,arguments)}catch(t){throw s.emit("fn-err",[arguments,this,t],n),t}finally{s.emit("fn-end",[u.now()],n)}}}};a("actionText,setName,setAttribute,save,ignore,onEnd,getContext,end,get".split(","),function(t,e){h[e]=o(l+e)}),newrelic.noticeError=function(t,e){"string"==typeof t&&(t=new Error(t)),i("err",[t,u.now(),!1,e])}},{}],20:[function(t,e,n){e.exports=function(t){if("string"==typeof t&&t.length)return t.length;if("object"==typeof t){if("undefined"!=typeof ArrayBuffer&&t instanceof ArrayBuffer&&t.byteLength)return t.byteLength;if("undefined"!=typeof Blob&&t instanceof Blob&&t.size)return t.size;if(!("undefined"!=typeof FormData&&t instanceof FormData))try{return JSON.stringify(t).length}catch(e){return}}}},{}],21:[function(t,e,n){var r=0,o=navigator.userAgent.match(/Firefox[\/\s](\d+\.\d+)/);o&&(r=+o[1]),e.exports=r},{}],22:[function(t,e,n){function r(){return c.exists&&performance.now?Math.round(performance.now()):(i=Math.max((new Date).getTime(),i))-a}function o(){return i}var i=(new Date).getTime(),a=i,c=t(30);e.exports=r,e.exports.offset=a,e.exports.getLastTimestamp=o},{}],23:[function(t,e,n){function r(t){return!(!t||!t.protocol||"file:"===t.protocol)}e.exports=r},{}],24:[function(t,e,n){function r(t,e){var n=t.getEntries();n.forEach(function(t){"first-paint"===t.name?d("timing",["fp",Math.floor(t.startTime)]):"first-contentful-paint"===t.name&&d("timing",["fcp",Math.floor(t.startTime)])})}function o(t,e){var n=t.getEntries();n.length>0&&d("lcp",[n[n.length-1]])}function i(t){t.getEntries().forEach(function(t){t.hadRecentInput||d("cls",[t])})}function a(t){if(t instanceof h&&!v){var e=Math.round(t.timeStamp),n={type:t.type};e<=p.now()?n.fid=p.now()-e:e>p.offset&&e<=Date.now()?(e-=p.offset,n.fid=p.now()-e):e=p.now(),v=!0,d("timing",["fi",e,n])}}function c(t){d("pageHide",[p.now(),t])}if(!("init"in NREUM&&"page_view_timing"in NREUM.init&&"enabled"in NREUM.init.page_view_timing&&NREUM.init.page_view_timing.enabled===!1)){var s,u,f,d=t("handle"),p=t("loader"),l=t(27),h=NREUM.o.EV;if("PerformanceObserver"in window&&"function"==typeof window.PerformanceObserver){s=new PerformanceObserver(r);try{s.observe({entryTypes:["paint"]})}catch(m){}u=new PerformanceObserver(o);try{u.observe({entryTypes:["largest-contentful-paint"]})}catch(m){}f=new PerformanceObserver(i);try{f.observe({type:"layout-shift",buffered:!0})}catch(m){}}if("addEventListener"in document){var v=!1,w=["click","keydown","mousedown","pointerdown","touchstart"];w.forEach(function(t){document.addEventListener(t,a,!1)})}l(c)}},{}],25:[function(t,e,n){function r(){function t(){return e?15&e[n++]:16*Math.random()|0}var e=null,n=0,r=window.crypto||window.msCrypto;r&&r.getRandomValues&&(e=r.getRandomValues(new Uint8Array(31)));for(var o,i="xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx",a="",c=0;c<i.length;c++)o=i[c],"x"===o?a+=t().toString(16):"y"===o?(o=3&t()|8,a+=o.toString(16)):a+=o;return a}function o(){return a(16)}function i(){return a(32)}function a(t){function e(){return n?15&n[r++]:16*Math.random()|0}var n=null,r=0,o=window.crypto||window.msCrypto;o&&o.getRandomValues&&Uint8Array&&(n=o.getRandomValues(new Uint8Array(31)));for(var i=[],a=0;a<t;a++)i.push(e().toString(16));return i.join("")}e.exports={generateUuid:r,generateSpanId:o,generateTraceId:i}},{}],26:[function(t,e,n){function r(t,e){if(!o)return!1;if(t!==o)return!1;if(!e)return!0;if(!i)return!1;for(var n=i.split("."),r=e.split("."),a=0;a<r.length;a++)if(r[a]!==n[a])return!1;return!0}var o=null,i=null,a=/Version\/(\S+)\s+Safari/;if(navigator.userAgent){var c=navigator.userAgent,s=c.match(a);s&&c.indexOf("Chrome")===-1&&c.indexOf("Chromium")===-1&&(o="Safari",i=s[1])}e.exports={agent:o,version:i,match:r}},{}],27:[function(t,e,n){function r(t){function e(){t(a&&document[a]?document[a]:document[o]?"hidden":"visible")}"addEventListener"in document&&i&&document.addEventListener(i,e,!1)}e.exports=r;var o,i,a;"undefined"!=typeof document.hidden?(o="hidden",i="visibilitychange",a="visibilityState"):"undefined"!=typeof document.msHidden?(o="msHidden",i="msvisibilitychange"):"undefined"!=typeof document.webkitHidden&&(o="webkitHidden",i="webkitvisibilitychange",a="webkitVisibilityState")},{}],28:[function(t,e,n){function r(t,e){var n=[],r="",i=0;for(r in t)o.call(t,r)&&(n[i]=e(r,t[r]),i+=1);return n}var o=Object.prototype.hasOwnProperty;e.exports=r},{}],29:[function(t,e,n){function r(t,e,n){e||(e=0),"undefined"==typeof n&&(n=t?t.length:0);for(var r=-1,o=n-e||0,i=Array(o<0?0:o);++r<o;)i[r]=t[e+r];return i}e.exports=r},{}],30:[function(t,e,n){e.exports={exists:"undefined"!=typeof window.performance&&window.performance.timing&&"undefined"!=typeof window.performance.timing.navigationStart}},{}],ee:[function(t,e,n){function r(){}function o(t){function e(t){return t&&t instanceof r?t:t?u(t,s,a):a()}function n(n,r,o,i,a){if(a!==!1&&(a=!0),!l.aborted||i){t&&a&&t(n,r,o);for(var c=e(o),s=m(n),u=s.length,f=0;f<u;f++)s[f].apply(c,r);var p=d[y[n]];return p&&p.push([x,n,r,c]),c}}function i(t,e){g[t]=m(t).concat(e)}function h(t,e){var n=g[t];if(n)for(var r=0;r<n.length;r++)n[r]===e&&n.splice(r,1)}function m(t){return g[t]||[]}function v(t){return p[t]=p[t]||o(n)}function w(t,e){f(t,function(t,n){e=e||"feature",y[n]=e,e in d||(d[e]=[])})}var g={},y={},x={on:i,addEventListener:i,removeEventListener:h,emit:n,get:v,listeners:m,context:e,buffer:w,abort:c,aborted:!1};return x}function i(t){return u(t,s,a)}function a(){return new r}function c(){(d.api||d.feature)&&(l.aborted=!0,d=l.backlog={})}var s="nr@context",u=t("gos"),f=t(28),d={},p={},l=e.exports=o();e.exports.getOrSetContext=i,l.backlog=d},{}],gos:[function(t,e,n){function r(t,e,n){if(o.call(t,e))return t[e];var r=n();if(Object.defineProperty&&Object.keys)try{return Object.defineProperty(t,e,{value:r,writable:!0,enumerable:!1}),r}catch(i){}return t[e]=r,r}var o=Object.prototype.hasOwnProperty;e.exports=r},{}],handle:[function(t,e,n){function r(t,e,n,r){o.buffer([t],r),o.emit(t,e,n)}var o=t("ee").get("handle");e.exports=r,r.ee=o},{}],id:[function(t,e,n){function r(t){var e=typeof t;return!t||"object"!==e&&"function"!==e?-1:t===window?0:a(t,i,function(){return o++})}var o=1,i="nr@id",a=t("gos");e.exports=r},{}],loader:[function(t,e,n){function r(){if(!E++){var t=b.info=NREUM.info,e=l.getElementsByTagName("script")[0];if(setTimeout(u.abort,3e4),!(t&&t.licenseKey&&t.applicationID&&e))return u.abort();s(y,function(e,n){t[e]||(t[e]=n)});var n=a();c("mark",["onload",n+b.offset],null,"api"),c("timing",["load",n]);var r=l.createElement("script");r.src="https://"+t.agent,e.parentNode.insertBefore(r,e)}}function o(){"complete"===l.readyState&&i()}function i(){c("mark",["domContent",a()+b.offset],null,"api")}var a=t(22),c=t("handle"),s=t(28),u=t("ee"),f=t(26),d=t(23),p=window,l=p.document,h="addEventListener",m="attachEvent",v=p.XMLHttpRequest,w=v&&v.prototype;if(d(p.location)){NREUM.o={ST:setTimeout,SI:p.setImmediate,CT:clearTimeout,XHR:v,REQ:p.Request,EV:p.Event,PR:p.Promise,MO:p.MutationObserver};var g=""+location,y={beacon:"bam.nr-data.net",errorBeacon:"bam.nr-data.net",agent:"js-agent.newrelic.com/nr-spa-1208.min.js"},x=v&&w&&w[h]&&!/CriOS/.test(navigator.userAgent),b=e.exports={offset:a.getLastTimestamp(),now:a,origin:g,features:{},xhrWrappable:x,userAgent:f};t(19),t(24),l[h]?(l[h]("DOMContentLoaded",i,!1),p[h]("load",r,!1)):(l[m]("onreadystatechange",o),p[m]("onload",r)),c("mark",["firstbyte",a.getLastTimestamp()],null,"api");var E=0}},{}],"wrap-function":[function(t,e,n){function r(t,e){function n(e,n,r,s,u){function nrWrapper(){var i,a,f,p;try{a=this,i=d(arguments),f="function"==typeof r?r(i,a):r||{}}catch(l){o([l,"",[i,a,s],f],t)}c(n+"start",[i,a,s],f,u);try{return p=e.apply(a,i)}catch(h){throw c(n+"err",[i,a,h],f,u),h}finally{c(n+"end",[i,a,p],f,u)}}return a(e)?e:(n||(n=""),nrWrapper[p]=e,i(e,nrWrapper,t),nrWrapper)}function r(t,e,r,o,i){r||(r="");var c,s,u,f="-"===r.charAt(0);for(u=0;u<e.length;u++)s=e[u],c=t[s],a(c)||(t[s]=n(c,f?s+r:r,o,s,i))}function c(n,r,i,a){if(!h||e){var c=h;h=!0;try{t.emit(n,r,i,e,a)}catch(s){o([s,n,r,i],t)}h=c}}return t||(t=f),n.inPlace=r,n.flag=p,n}function o(t,e){e||(e=f);try{e.emit("internal-error",t)}catch(n){}}function i(t,e,n){if(Object.defineProperty&&Object.keys)try{var r=Object.keys(t);return r.forEach(function(n){Object.defineProperty(e,n,{get:function(){return t[n]},set:function(e){return t[n]=e,e}})}),e}catch(i){o([i],n)}for(var a in t)l.call(t,a)&&(e[a]=t[a]);return e}function a(t){return!(t&&t instanceof Function&&t.apply&&!t[p])}function c(t,e){var n=e(t);return n[p]=t,i(t,n,f),n}function s(t,e,n){var r=t[e];t[e]=c(r,n)}function u(){for(var t=arguments.length,e=new Array(t),n=0;n<t;++n)e[n]=arguments[n];return e}var f=t("ee"),d=t(29),p="nr@original",l=Object.prototype.hasOwnProperty,h=!1;e.exports=r,e.exports.wrapFunction=c,e.exports.wrapInPlace=s,e.exports.argsToArray=u},{}]},{},["loader",2,16,5,3,4]);
+;NREUM.loader_config={accountID:"39284",trustKey:"39284",agentID:"7447468",licenseKey:"689d5b4562",applicationID:"2011224"}
+;NREUM.info={beacon:"bam-cell.nr-data.net",errorBeacon:"bam-cell.nr-data.net",licenseKey:"689d5b4562",applicationID:"2011224",sa:1}
+</script>
+        <script>
+  if(window.newrelic){window.newrelic.setCustomAttribute('controller_view', 'Vimeo\Controller\ClipController_main');window.newrelic.setCustomAttribute('userId', '0');window.newrelic.setCustomAttribute('accountType', 'UNKNOWN');window.newrelic.setCustomAttribute('teamOwnerId', '0');window.newrelic.setCustomAttribute('teamOwnerAccountType', 'UNKNOWN');};
+</script>
+                            <link rel="stylesheet" href="./Dear Rich on Vimeo_files/icon_fonts_68eff39472980630c5a0832a2d4396c6.min.css" data-airgap-id="17">
+
+    <link rel="stylesheet" href="./Dear Rich on Vimeo_files/clip_beta_combined_c96671e284a14f25677dc84d2df9ed41.min.css" data-airgap-id="18">
+    <link rel="stylesheet" href="./Dear Rich on Vimeo_files/topnav_cart_button_fdda5bef1a116f0878d8b21fda1d5815.min.css" data-airgap-id="19">
+
+
+
+        <script>
+        var date=new Date();date.setTime(date.getTime()+365*24*60*60*1000);document.cookie='vuid='+encodeURIComponent('1919991385.1905397534') + ';domain=.vimeo.com;path=/;secure;samesite=none;expires= ' + date.toGMTString();
+        var playerAssetUrls = {"barebone_js":"https:\/\/f.vimeocdn.com\/p\/4.23.4\/js\/barebone.js","chromeless_css":"https:\/\/f.vimeocdn.com\/p\/4.23.4\/css\/chromeless.css","chromeless_js":"https:\/\/f.vimeocdn.com\/p\/4.23.4\/js\/chromeless.js","js":"https:\/\/f.vimeocdn.com\/p\/4.23.4\/js\/player.js","css":"https:\/\/f.vimeocdn.com\/p\/4.23.4\/css\/player.css","player_url":"player.vimeo.com"};
+
+        var _extend = function(){for(var r=arguments[0],n=1,e=arguments.length;e>n;n++){var t=arguments[n];for(var a in t)t.hasOwnProperty(a)&&(r[a]=t[a])}return r};
+
+            window = _extend(window, {"vimeo_esi":{"config":{"route":"Vimeo\\Controller\\ClipController:main","controller":"Vimeo\\Controller\\ClipController","autocomplete_enabled":true,"onsite_referrer":false}},"ablincoln_config":{"user":{"account_type":null,"cuid":null,"is_free_trial":"0","is_mobile":"0","language":"en","location":"AR","logged_in":"0","vuid":"1919991385.1905397534"},"disabled":false},"vimeo":{"xsrft":"ed42bf329df26d2cd08c5f2ae942c3c1ba962ac3.cezbn90g6x.1680563095","qualifies_for_gdpr":false,"qualifies_for_casl":false,"qualifies_for_impressum":false,"qualifies_for_terminate_contract":false,"qualifies_for_ofcom":false,"qualifies_for_vimeo_one_tap":false,"qualifies_for_usa_terms":false,"config":{"cart":{"cart_content":{"stock":{"store":"stock","version":1,"quantities":[],"items":[],"attributes":[],"currency":"USD","items_sorted_by_index":[],"items_count":0}}}}}});
+</script>
+
+        
+    <script>
+        var ablincoln_config = ablincoln_config || {};
+        ablincoln_config.tests = {"JS.RecordExtension.OverlayVsInlineIntegrations":{"id":995,"name":"JS.RecordExtension.OverlayVsInlineIntegrations","buckets":1000,"input":"vuid","url":"\/","experiments":[{"id":2818,"name":"Record Extension Inline vs Overlay Integrations test","buckets":1000,"state":3,"published_on":"2023-02-27 07:51:25","paused_on":"0000-00-00 00:00:00","stopped_on":"2023-02-27 07:59:44","parameters":[{"id":4641,"name":"override_with_overlay","choice":"control","weight":1},{"id":4642,"name":"override_with_overlay","choice":"variant","weight":0}],"segments":[]},{"id":2819,"name":"* Record Extension Inline vs Overlay Integrations test","buckets":1000,"state":3,"published_on":"2023-02-27 08:00:03","paused_on":"0000-00-00 00:00:00","stopped_on":"2023-03-15 05:04:52","parameters":[{"id":4643,"name":"override_with_overlay","choice":"control","weight":0},{"id":4644,"name":"override_with_overlay","choice":"variant","weight":1}],"segments":[]},{"id":2853,"name":"* * Record Extension Inline vs Overlay Integrations test","buckets":1000,"state":1,"published_on":"2023-03-23 18:09:55","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4697,"name":"override_with_overlay","choice":"control","weight":1},{"id":4698,"name":"override_with_overlay","choice":"variant","weight":1}],"segments":[]}]},"JS.Create.ContentRating":{"id":994,"name":"JS.Create.ContentRating","buckets":1000,"input":"cuid","url":"\/upload\/videos","experiments":[{"id":2823,"name":"Rating modal 1%","buckets":10,"state":3,"published_on":"2023-03-14 06:20:46","paused_on":"0000-00-00 00:00:00","stopped_on":"2023-03-14 06:22:20","parameters":[{"id":4651,"name":"create_content_rating","choice":"control","weight":1},{"id":4652,"name":"create_content_rating","choice":"variant","weight":1}],"segments":[]},{"id":2834,"name":"content rating","buckets":1000,"state":3,"published_on":"2023-03-14 06:23:52","paused_on":"0000-00-00 00:00:00","stopped_on":"2023-03-14 06:29:44","parameters":[{"id":4666,"name":"create_content_rating","choice":"variant","weight":1},{"id":4667,"name":"create_content_rating","choice":"control","weight":1}],"segments":[]},{"id":2836,"name":"content rating2","buckets":1000,"state":3,"published_on":"2023-03-14 06:31:29","paused_on":"2023-03-14 06:33:44","stopped_on":"2023-03-14 10:39:32","parameters":[{"id":4668,"name":"create_content_rating","choice":"variant","weight":1}],"segments":[]},{"id":2837,"name":"Rating modal open for 1%","buckets":10,"state":1,"published_on":"2023-03-14 10:41:16","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4669,"name":"create_content_rating","choice":"control","weight":1},{"id":4670,"name":"create_content_rating","choice":"variant","weight":1}],"segments":[]}]},"JS.RecordExtension.PhotoAvatar":{"id":992,"name":"JS.RecordExtension.PhotoAvatar","buckets":1000,"input":"vuid","url":"\/","experiments":[{"id":2817,"name":"PA","buckets":1000,"state":3,"published_on":"2023-02-27 08:35:48","paused_on":"2023-02-27 08:36:54","stopped_on":"2023-02-27 08:37:28","parameters":[{"id":4639,"name":"photo_avatar","choice":"variant","weight":1},{"id":4640,"name":"photo_avatar","choice":"control","weight":1}],"segments":[]},{"id":2820,"name":"* PA","buckets":1000,"state":3,"published_on":"2023-02-27 09:09:31","paused_on":"0000-00-00 00:00:00","stopped_on":"2023-02-27 09:11:46","parameters":[{"id":4645,"name":"photo_avatar","choice":"variant","weight":1},{"id":4646,"name":"photo_avatar","choice":"control","weight":1}],"segments":[]},{"id":2821,"name":"* * PA","buckets":1000,"state":3,"published_on":"2023-03-06 09:08:08","paused_on":"0000-00-00 00:00:00","stopped_on":"2023-03-10 04:13:08","parameters":[{"id":4647,"name":"photo_avatar","choice":"variant","weight":1}],"segments":[]},{"id":2856,"name":"* * * PA","buckets":1000,"state":1,"published_on":"2023-03-23 18:11:33","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4699,"name":"photo_avatar","choice":"variant","weight":1},{"id":4700,"name":"photo_avatar","choice":"control","weight":1}],"segments":[]}]},"JS.Omnisearch.Actions":{"id":988,"name":"JS.Omnisearch.Actions","buckets":1000,"input":"cuid","url":"\/","experiments":[{"id":2810,"name":"50% roll - `copy link` in Omnisearch","buckets":500,"state":1,"published_on":"2023-02-27 11:46:42","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4625,"name":"copy_link","choice":"variant","weight":1},{"id":4626,"name":"copy_link","choice":"control","weight":1}],"segments":[]}]},"JS.RecordExtension.DesktopRollout":{"id":985,"name":"JS.RecordExtension.DesktopRollout","buckets":1000,"input":"vuid","url":"\/record\/auth-complete","experiments":[{"id":2802,"name":"DesktopRollout","buckets":1000,"state":1,"published_on":"2023-02-20 14:57:17","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4618,"name":"desktop_rollout","choice":"variant","weight":1},{"id":4619,"name":"desktop_rollout","choice":"control","weight":1}],"segments":[]}]},"JS.Editor.SmartCrop":{"id":982,"name":"JS.Editor.SmartCrop","buckets":1000,"input":"cuid","url":"\/create\/customize\/","experiments":[{"id":2798,"name":"smart_crop","buckets":200,"state":2,"published_on":"2023-02-16 02:34:38","paused_on":"2023-02-26 07:28:43","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4610,"name":"smart_crop","choice":"variant","weight":100},{"id":4611,"name":"smart_crop","choice":"control","weight":100}],"segments":[{"id":329,"type":"location","include":0,"values":["US"]}]}]},"JS.PurchaseSeatsOnboarding":{"id":981,"name":"JS.PurchaseSeatsOnboarding","buckets":1000,"input":"cuid","url":"\/store\/receipt\/seat_subscription","experiments":[{"id":2811,"name":"10 rollout","buckets":100,"state":1,"published_on":"2023-02-13 16:52:26","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4627,"name":"can_purchase_seats","choice":"control","weight":1},{"id":4628,"name":"can_purchase_seats","choice":"variant","weight":1}],"segments":[]},{"id":2840,"name":"50 rollout","buckets":400,"state":3,"published_on":"2023-03-15 16:08:59","paused_on":"0000-00-00 00:00:00","stopped_on":"2023-03-16 14:26:30","parameters":[{"id":4675,"name":"can_purchase_seats","choice":"control","weight":1},{"id":4676,"name":"can_purchase_seats","choice":"variant","weight":2}],"segments":[]},{"id":2844,"name":"100 rollout","buckets":900,"state":2,"published_on":"2023-03-16 14:27:15","paused_on":"2023-03-16 17:47:04","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4681,"name":"can_purchase_seats","choice":"control","weight":1},{"id":4682,"name":"can_purchase_seats","choice":"variant","weight":1}],"segments":[]}]},"JS.Editor.DisableTVE":{"id":976,"name":"JS.Editor.DisableTVE","buckets":1000,"input":"cuid","url":"\/manage\/videos","experiments":[{"id":2771,"name":"disable_tve","buckets":1,"state":1,"published_on":"2022-12-13 09:01:18","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4564,"name":"disable_tve","choice":"variant","weight":1},{"id":4565,"name":"disable_tve","choice":"control","weight":1000000000}],"segments":[]}]},"JS.Editor.AddTextSidePanel":{"id":973,"name":"JS.Editor.AddTextSidePanel","buckets":1000,"input":"cuid","url":"\/create\/customize\/","experiments":[{"id":2762,"name":"show_add_text_side_panel","buckets":1,"state":3,"published_on":"2022-12-11 10:19:34","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-12-12 03:04:13","parameters":[{"id":4548,"name":"show_add_text_side_panel","choice":"control","weight":1},{"id":4549,"name":"show_add_text_side_panel","choice":"variant","weight":0}],"segments":[]},{"id":2770,"name":"4 default text size 200","buckets":200,"state":3,"published_on":"2022-12-12 03:05:24","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-12-26 02:33:19","parameters":[{"id":4562,"name":"show_add_text_side_panel","choice":"control","weight":1},{"id":4563,"name":"show_add_text_side_panel","choice":"variant","weight":1}],"segments":[]},{"id":2779,"name":"4 default text size 1000","buckets":800,"state":3,"published_on":"2022-12-20 06:49:59","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-12-26 02:33:14","parameters":[{"id":4573,"name":"show_add_text_side_panel","choice":"control","weight":1},{"id":4574,"name":"show_add_text_side_panel","choice":"variant","weight":1}],"segments":[]},{"id":2784,"name":"4 default text size 1000 variant","buckets":1000,"state":1,"published_on":"2022-12-26 02:35:27","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4576,"name":"show_add_text_side_panel","choice":"variant","weight":1}],"segments":[]}]},"JS.Builderio.AbTest":{"id":971,"name":"JS.Builderio.AbTest","buckets":1000,"input":"vuid","url":"\/cms-abtest","experiments":[{"id":2759,"name":"Data flow CMS A\/B test","buckets":500,"state":1,"published_on":"2022-12-05 00:14:43","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4542,"name":"show_page","choice":"control","weight":1},{"id":4543,"name":"show_page","choice":"variant","weight":1}],"segments":[]}]},"JS.Editor.TemplatesInspector":{"id":966,"name":"JS.Editor.TemplatesInspector","buckets":1000,"input":"cuid","url":"\/create\/customize\/","experiments":[{"id":2720,"name":"show_templates_inspector","buckets":1000,"state":3,"published_on":"2022-11-13 06:39:11","paused_on":"0000-00-00 00:00:00","stopped_on":"2023-01-03 09:03:15","parameters":[{"id":4498,"name":"show_templates_inspector","choice":"control","weight":1},{"id":4499,"name":"show_templates_inspector","choice":"variant","weight":0}],"segments":[]},{"id":2786,"name":"show_templates_inspector_2","buckets":1000,"state":3,"published_on":"2023-01-03 09:07:22","paused_on":"0000-00-00 00:00:00","stopped_on":"2023-01-08 04:18:17","parameters":[{"id":4579,"name":"show_templates_inspector","choice":"variant","weight":0},{"id":4580,"name":"show_templates_inspector","choice":"control","weight":1}],"segments":[]},{"id":2787,"name":"show_templates_inspector_200","buckets":200,"state":3,"published_on":"2023-01-08 04:19:44","paused_on":"0000-00-00 00:00:00","stopped_on":"2023-02-13 02:17:42","parameters":[{"id":4581,"name":"show_templates_inspector","choice":"variant","weight":1},{"id":4582,"name":"show_templates_inspector","choice":"control","weight":1}],"segments":[]},{"id":2788,"name":"show_templates_inspector_400","buckets":200,"state":3,"published_on":"2023-01-10 05:29:49","paused_on":"0000-00-00 00:00:00","stopped_on":"2023-02-13 02:17:33","parameters":[{"id":4583,"name":"show_templates_inspector","choice":"variant","weight":1},{"id":4584,"name":"show_templates_inspector","choice":"control","weight":1}],"segments":[]},{"id":2789,"name":"show_templates_inspector_1000","buckets":600,"state":3,"published_on":"2023-01-11 03:31:21","paused_on":"0000-00-00 00:00:00","stopped_on":"2023-02-13 02:17:25","parameters":[{"id":4585,"name":"show_templates_inspector","choice":"variant","weight":1},{"id":4586,"name":"show_templates_inspector","choice":"control","weight":1}],"segments":[]},{"id":2813,"name":"show_templates_inspector_clode on variant ","buckets":1000,"state":1,"published_on":"2023-02-13 02:18:30","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4631,"name":"show_templates_inspector","choice":"variant","weight":1}],"segments":[]}]},"JS.Settings.MembershipPlan.DisableAutoRenewRedesign":{"id":955,"name":"JS.Settings.MembershipPlan.DisableAutoRenewRedesign","buckets":1000,"input":"cuid","url":"\/settings\/billing\/membership_plan","experiments":[{"id":2697,"name":"Show redesigned Disable auto renew modal","buckets":200,"state":2,"published_on":"2022-11-01 15:35:37","paused_on":"2023-02-17 13:15:10","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4460,"name":"disable_auto_renew_redesign","choice":"control","weight":1},{"id":4461,"name":"disable_auto_renew_redesign","choice":"variant","weight":1}],"segments":[{"id":307,"type":"location","include":0,"values":["DE"]}]}]},"JS.VM.InviteInEmptyState":{"id":943,"name":"JS.VM.InviteInEmptyState","buckets":1000,"input":"cuid","url":"\/manage\/videos","experiments":[{"id":2656,"name":"Invite in Empty State Rollout to 10%","buckets":100,"state":1,"published_on":"2022-10-20 12:40:52","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4391,"name":"invite_in_empty_state","choice":"control","weight":1},{"id":4392,"name":"invite_in_empty_state","choice":"variant1","weight":1}],"segments":[]},{"id":2700,"name":"Invite in Empty State Rollout to 100%","buckets":900,"state":3,"published_on":"2022-10-28 10:02:33","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-12-07 16:50:07","parameters":[{"id":4464,"name":"invite_in_empty_state","choice":"control","weight":1},{"id":4465,"name":"invite_in_empty_state","choice":"variant1","weight":1}],"segments":[]}]},"JS.Upload.ShowQuotaWarningToFreeUsers":{"id":939,"name":"JS.Upload.ShowQuotaWarningToFreeUsers","buckets":1000,"input":"cuid","url":"\/upload\/videos","experiments":[{"id":2649,"name":"* Show quota warning to Free users on upload page","buckets":100,"state":3,"published_on":"2022-09-30 12:28:32","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-10-05 16:23:41","parameters":[{"id":4381,"name":"quota_warning_free_users","choice":"control","weight":1},{"id":4382,"name":"quota_warning_free_users","choice":"variant","weight":1}],"segments":[]},{"id":2655,"name":"+40% - Show quota warning to Free users on upload page","buckets":400,"state":3,"published_on":"2022-10-03 11:45:40","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-10-05 16:23:47","parameters":[{"id":4389,"name":"quota_warning_free_users","choice":"control","weight":1},{"id":4390,"name":"quota_warning_free_users","choice":"variant","weight":1}],"segments":[]},{"id":2660,"name":"50% - Show quota warning to Free users on upload page","buckets":500,"state":1,"published_on":"2022-10-05 16:23:34","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4400,"name":"quota_warning_free_users","choice":"control","weight":1},{"id":4401,"name":"quota_warning_free_users","choice":"variant","weight":1}],"segments":[]},{"id":2703,"name":"+50% - Show quota warning to Free users on upload page","buckets":500,"state":1,"published_on":"2022-10-31 13:03:52","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4470,"name":"quota_warning_free_users","choice":"control","weight":1},{"id":4471,"name":"quota_warning_free_users","choice":"variant","weight":1}],"segments":[]}]},"JS.AVS.SunsetAVSPrivacy":{"id":932,"name":"JS.AVS.SunsetAVSPrivacy","buckets":1000,"input":"cuid","url":"\/manage\/:clipId\/advanced","experiments":[{"id":2644,"name":"AVS Privacy Migration","buckets":100,"state":3,"published_on":"2022-09-30 10:24:14","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-10-24 11:21:54","parameters":[{"id":4372,"name":"migrate_privacy_svv","choice":"control","weight":1},{"id":4373,"name":"migrate_privacy_svv","choice":"variant","weight":1}],"segments":[]},{"id":2692,"name":"100% ramp - AVS Privacy Migration","buckets":900,"state":1,"published_on":"2022-10-24 11:21:49","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4451,"name":"migrate_privacy_svv","choice":"control","weight":1},{"id":4452,"name":"migrate_privacy_svv","choice":"variant","weight":1}],"segments":[]}]},"JS.Editor.MediaInspector":{"id":928,"name":"JS.Editor.MediaInspector","buckets":1000,"input":"cuid","url":"\/create\/customize\/","experiments":[{"id":2622,"name":"show_media_inspector (100)","buckets":100,"state":3,"published_on":"2022-09-18 13:09:32","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-09-21 06:25:45","parameters":[{"id":4334,"name":"show_media_inspector","choice":"control","weight":1}],"segments":[]},{"id":2628,"name":"show_media_inspector (200)","buckets":200,"state":3,"published_on":"2022-09-21 06:26:40","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-09-29 03:17:57","parameters":[{"id":4345,"name":"show_media_inspector","choice":"control","weight":1},{"id":4346,"name":"show_media_inspector","choice":"variant","weight":1}],"segments":[]},{"id":2706,"name":"show_media_inspector (200)new","buckets":200,"state":3,"published_on":"2022-11-02 05:02:37","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-11-27 06:05:38","parameters":[{"id":4476,"name":"show_media_inspector","choice":"control","weight":1},{"id":4477,"name":"show_media_inspector","choice":"variant","weight":1}],"segments":[]},{"id":2718,"name":"show_media_inspector (800)new","buckets":800,"state":3,"published_on":"2022-11-10 07:42:49","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-11-27 06:05:32","parameters":[{"id":4493,"name":"show_media_inspector","choice":"control","weight":1},{"id":4494,"name":"show_media_inspector","choice":"variant","weight":1}],"segments":[]},{"id":2746,"name":"show_media_inspector (variant) ","buckets":1000,"state":1,"published_on":"2022-11-27 06:06:31","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4527,"name":"show_media_inspector","choice":"variant","weight":1}],"segments":[]},{"id":2785,"name":"show_media_inspector_new2","buckets":1000,"state":1,"published_on":"2022-12-28 04:31:36","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4577,"name":"show_media_inspector","choice":"control","weight":0},{"id":4578,"name":"show_media_inspector","choice":"variant","weight":1}],"segments":[]}]},"JS.RecordExtension.LandingPageNonChromeCallToSDK":{"id":923,"name":"JS.RecordExtension.LandingPageNonChromeCallToSDK","buckets":1000,"input":"vuid","url":"\/features\/screen-recorder","experiments":[{"id":2600,"name":"CallToSDK","buckets":1000,"state":3,"published_on":"2022-09-22 09:42:21","paused_on":"2022-10-03 09:47:11","stopped_on":"2022-10-03 09:50:56","parameters":[{"id":4295,"name":"landing_non_chrome_to_sdk","choice":"control","weight":0},{"id":4296,"name":"landing_non_chrome_to_sdk","choice":"variant","weight":1}],"segments":[]},{"id":2654,"name":"CallToSDK - prod","buckets":1000,"state":1,"published_on":"2022-10-03 09:52:09","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4387,"name":"landing_non_chrome_to_sdk","choice":"control","weight":1},{"id":4388,"name":"landing_non_chrome_to_sdk","choice":"variant","weight":1}],"segments":[]}]},"JS.RecordExtension.DirectToSVV":{"id":922,"name":"JS.RecordExtension.DirectToSVV","buckets":1000,"input":"vuid","url":"\/","experiments":[{"id":2599,"name":"DTS1","buckets":1000,"state":3,"published_on":"2022-09-09 04:37:29","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-09-16 02:41:37","parameters":[{"id":4294,"name":"should_direct_to_svv","choice":"variant","weight":1}],"segments":[]},{"id":2619,"name":"* DTS1_2","buckets":1000,"state":3,"published_on":"2022-09-16 02:43:05","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-09-16 02:52:55","parameters":[{"id":4328,"name":"should_direct_to_svv","choice":"variant","weight":0}],"segments":[]},{"id":2620,"name":"DTS2","buckets":1000,"state":3,"published_on":"2022-09-16 02:53:44","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-09-26 12:09:11","parameters":[{"id":4329,"name":"should_direct_to_svv","choice":"variant","weight":0},{"id":4330,"name":"should_direct_to_svv","choice":"control","weight":1}],"segments":[]},{"id":2640,"name":"Direct-to-SVV","buckets":1000,"state":3,"published_on":"2022-09-26 12:12:44","paused_on":"0000-00-00 00:00:00","stopped_on":"2023-02-08 13:44:23","parameters":[{"id":4364,"name":"should_direct_to_svv","choice":"variant","weight":1},{"id":4365,"name":"should_direct_to_svv","choice":"control","weight":1}],"segments":[]},{"id":2685,"name":"Dirtect_to_SVV","buckets":1000,"state":3,"published_on":"2022-10-19 07:33:44","paused_on":"0000-00-00 00:00:00","stopped_on":"2023-02-08 13:44:17","parameters":[{"id":4442,"name":"should_direct_to_svv","choice":"variant","weight":1},{"id":4443,"name":"should_direct_to_svv","choice":"control","weight":1}],"segments":[]},{"id":2806,"name":"DTS_6","buckets":1000,"state":1,"published_on":"2023-02-13 11:32:46","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4623,"name":"should_direct_to_svv","choice":"variant","weight":1},{"id":4624,"name":"should_direct_to_svv","choice":"control","weight":1}],"segments":[]}]},"JS.RecordExtension.OverlayIntegrationsSeptember":{"id":921,"name":"JS.RecordExtension.OverlayIntegrationsSeptember","buckets":1000,"input":"vuid","url":"\/","experiments":[{"id":2590,"name":"OIS1","buckets":1000,"state":3,"published_on":"2022-09-06 06:55:00","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-09-12 08:09:14","parameters":[{"id":4287,"name":"are_overlay_integrations_enabled","choice":"variant","weight":1}],"segments":[]},{"id":2634,"name":"Integrations set v3","buckets":1000,"state":1,"published_on":"2022-09-22 08:02:24","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4355,"name":"are_overlay_integrations_enabled","choice":"control","weight":1},{"id":4356,"name":"are_overlay_integrations_enabled","choice":"variant","weight":1}],"segments":[]}]},"JS.SVV.Chapters":{"id":920,"name":"JS.SVV.Chapters","buckets":1000,"input":"cuid","url":"\/manage\/videos","experiments":[{"id":2581,"name":"SVV Chapters Rollout 10%","buckets":100,"state":1,"published_on":"2022-10-12 11:36:45","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4277,"name":"svv_chapter_rollout","choice":"variant","weight":1}],"segments":[]},{"id":2674,"name":"SVV Chapters Rollout 40%","buckets":300,"state":1,"published_on":"2022-10-13 07:27:04","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4424,"name":"svv_chapter_rollout","choice":"variant","weight":1}],"segments":[]},{"id":2676,"name":"SVV Chapters Rollout 50%","buckets":100,"state":1,"published_on":"2022-10-14 11:58:13","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4427,"name":"svv_chapter_rollout","choice":"variant","weight":1}],"segments":[]},{"id":2680,"name":"SVV Chapters Rollout 75%","buckets":250,"state":1,"published_on":"2022-10-17 10:53:59","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4436,"name":"svv_chapter_rollout","choice":"variant","weight":1}],"segments":[]},{"id":2682,"name":"SVV Chapters Rollout 100%","buckets":250,"state":1,"published_on":"2022-10-17 12:14:23","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4437,"name":"svv_chapter_rollout","choice":"variant","weight":1}],"segments":[]},{"id":2691,"name":"SVV Chapters Rollout 100% (2nd)","buckets":250,"state":1,"published_on":"2022-10-21 12:22:45","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4450,"name":"svv_chapter_rollout","choice":"variant","weight":1}],"segments":[]}]},"JS.Settings.MembershipPlan.ShowContactSupportLink":{"id":918,"name":"JS.Settings.MembershipPlan.ShowContactSupportLink","buckets":1000,"input":"cuid","url":"\/settings\/billing\/membership_plan","experiments":[{"id":2621,"name":"Offer a downgrade option","buckets":1000,"state":3,"published_on":"2022-09-22 07:54:02","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-09-22 07:54:32","parameters":[{"id":4331,"name":"ab_show_contact_support_link","choice":"control","weight":1},{"id":4332,"name":"ab_show_contact_support_link","choice":"variant","weight":1}],"segments":[]},{"id":2633,"name":"* Offer a downgrade option","buckets":200,"state":3,"published_on":"2022-09-22 07:54:56","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-10-28 11:46:25","parameters":[{"id":4353,"name":"ab_show_contact_support_link","choice":"control","weight":1},{"id":4354,"name":"ab_show_contact_support_link","choice":"variant","weight":1}],"segments":[]},{"id":2701,"name":"Downgrade CTA","buckets":200,"state":1,"published_on":"2022-10-28 11:47:03","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4466,"name":"show_contact_support_link","choice":"control","weight":1},{"id":4467,"name":"show_contact_support_link","choice":"variant","weight":1}],"segments":[]}]},"JS.Editor.hideStyles":{"id":915,"name":"JS.Editor.hideStyles","buckets":1000,"input":"cuid","url":"\/create\/customize\/","experiments":[{"id":2560,"name":"hideStyles","buckets":100,"state":3,"published_on":"2022-08-14 02:50:11","paused_on":"0000-00-00 00:00:00","stopped_on":"2023-02-16 06:52:36","parameters":[{"id":4246,"name":"hide_styles","choice":"variant","weight":1},{"id":4247,"name":"hide_styles","choice":"control","weight":1}],"segments":[]},{"id":2563,"name":"hideStyles 200","buckets":100,"state":3,"published_on":"2022-08-14 13:02:46","paused_on":"0000-00-00 00:00:00","stopped_on":"2023-02-16 06:52:46","parameters":[{"id":4251,"name":"hide_styles","choice":"variant","weight":1},{"id":4252,"name":"hide_styles","choice":"control","weight":1}],"segments":[]},{"id":2564,"name":"hideStyles 500","buckets":300,"state":3,"published_on":"2022-09-06 03:06:41","paused_on":"0000-00-00 00:00:00","stopped_on":"2023-02-16 06:52:54","parameters":[{"id":4253,"name":"hide_styles","choice":"variant","weight":1},{"id":4254,"name":"hide_styles","choice":"control","weight":1}],"segments":[]},{"id":2572,"name":"hideStyles 1000","buckets":500,"state":1,"published_on":"2022-09-06 05:58:14","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4265,"name":"hide_styles","choice":"variant","weight":1},{"id":4266,"name":"hide_styles","choice":"control","weight":1}],"segments":[]}]},"JS.Editor.TranscriptionVideoEditor":{"id":911,"name":"JS.Editor.TranscriptionVideoEditor","buckets":1000,"input":"cuid","url":"\/manage\/videos","experiments":[{"id":2547,"name":"transcription_video_editor","buckets":1,"state":1,"published_on":"2022-09-28 07:00:56","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4220,"name":"transcription_video_editor","choice":"variant","weight":1},{"id":4221,"name":"transcription_video_editor","choice":"control","weight":1000000000}],"segments":[]},{"id":2778,"name":"transcription_video_editor_release","buckets":999,"state":1,"published_on":"2022-12-15 05:01:21","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4571,"name":"transcription_video_editor","choice":"variant","weight":1},{"id":4572,"name":"transcription_video_editor","choice":"control","weight":0}],"segments":[]}]},"JS.SVV.TagVideosOnDownload":{"id":910,"name":"JS.SVV.TagVideosOnDownload","buckets":1000,"input":"vuid","url":"*","experiments":[{"id":2536,"name":"Tag videos on download to 25%","buckets":500,"state":3,"published_on":"2022-07-25 09:49:55","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-10-11 04:52:39","parameters":[{"id":4204,"name":"tag_videos_on_download","choice":"true","weight":1},{"id":4205,"name":"tag_videos_on_download","choice":"false","weight":1}],"segments":[]},{"id":2669,"name":"Tag videos on download to 50%","buckets":1000,"state":3,"published_on":"2022-10-11 04:53:31","paused_on":"2022-10-31 08:56:58","stopped_on":"2022-10-31 08:57:08","parameters":[{"id":4415,"name":"tag_videos_on_download","choice":"true","weight":1},{"id":4416,"name":"tag_videos_on_download","choice":"false","weight":1}],"segments":[]},{"id":2702,"name":"Tag videos on download to 75%","buckets":1000,"state":3,"published_on":"2022-10-31 08:57:39","paused_on":"2023-01-19 09:37:22","stopped_on":"2023-01-19 09:37:31","parameters":[{"id":4468,"name":"tag_videos_on_download","choice":"true","weight":3},{"id":4469,"name":"tag_videos_on_download","choice":"false","weight":1}],"segments":[]},{"id":2793,"name":"* Tag videos on download to 100%","buckets":1000,"state":1,"published_on":"2023-01-19 09:37:58","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4595,"name":"tag_videos_on_download","choice":"true","weight":1},{"id":4596,"name":"tag_videos_on_download","choice":"false","weight":0}],"segments":[]}]},"JS.Editor.dragonfly":{"id":908,"name":"JS.Editor.dragonfly","buckets":1000,"input":"cuid","url":"\/manage\/videos\/create\/customize","experiments":[{"id":2532,"name":"show_dragonfly","buckets":1000,"state":3,"published_on":"2022-07-26 08:53:25","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-07-28 02:22:23","parameters":[{"id":4197,"name":"show_dragonfly","choice":"variant","weight":1},{"id":4198,"name":"show_dragonfly","choice":"control","weight":1}],"segments":[]},{"id":2544,"name":"show_dragonfly 100%","buckets":1000,"state":1,"published_on":"2022-07-28 02:24:08","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4215,"name":"show_dragonfly","choice":"variant","weight":1}],"segments":[]}]},"JS.Editor.showToolbar":{"id":897,"name":"JS.Editor.showToolbar","buckets":1000,"input":"cuid","url":"vimeo.com\/create\/customize","experiments":[{"id":2514,"name":"Show tool bar (10%)","buckets":100,"state":3,"published_on":"2022-07-11 15:16:45","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-07-24 03:58:18","parameters":[{"id":4167,"name":"show_toolbar","choice":"control","weight":1},{"id":4168,"name":"show_toolbar","choice":"variant","weight":1}],"segments":[]},{"id":2516,"name":"Show tool bar (90%)","buckets":900,"state":3,"published_on":"2022-07-13 04:19:20","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-07-24 03:58:28","parameters":[{"id":4171,"name":"show_toolbar","choice":"control","weight":1},{"id":4172,"name":"show_toolbar","choice":"variant","weight":1}],"segments":[]},{"id":2535,"name":"Show tool bar (close test)","buckets":1000,"state":1,"published_on":"2022-07-24 03:59:28","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4203,"name":"show_toolbar","choice":"variant","weight":1}],"segments":[]}]},"JS.Settings.Cancellation.Germany":{"id":895,"name":"JS.Settings.Cancellation.Germany","buckets":1000,"input":"cuid","url":"\/settings\/billing\/membership_plan","experiments":[{"id":2487,"name":"Germany Region","buckets":1000,"state":1,"published_on":"2022-07-01 09:38:18","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4129,"name":"cancel_in_survey","choice":"control","weight":0},{"id":4130,"name":"cancel_in_survey","choice":"variant","weight":1}],"segments":[{"id":286,"type":"location","include":1,"values":["DE"]}]}]},"JS.Create.Record":{"id":890,"name":"JS.Create.Record","buckets":1000,"input":"cuid","url":"\/create\/templates","experiments":[{"id":2474,"name":"CreateRecord","buckets":200,"state":3,"published_on":"2022-06-21 09:44:03","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-07-17 10:22:20","parameters":[{"id":4110,"name":"create_record_test","choice":"control","weight":1},{"id":4111,"name":"create_record_test","choice":"variant","weight":1}],"segments":[]},{"id":2481,"name":"CreateRecord 100%","buckets":800,"state":3,"published_on":"2022-06-27 05:26:22","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-07-17 10:22:28","parameters":[{"id":4120,"name":"create_record_test","choice":" control","weight":1},{"id":4121,"name":"create_record_test","choice":" variant","weight":1}],"segments":[]},{"id":2524,"name":"Create_Record 100%","buckets":1000,"state":1,"published_on":"2022-07-17 10:24:30","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4184,"name":"create_record_test","choice":"variant","weight":1}],"segments":[]}]},"JS.RecordExtension.Notifications":{"id":883,"name":"JS.RecordExtension.Notifications","buckets":1000,"input":"vuid","url":"\/","experiments":[{"id":2470,"name":"* * Notifications V1 3","buckets":1000,"state":3,"published_on":"2022-06-19 16:01:57","paused_on":"2022-06-19 16:03:30","stopped_on":"2022-06-19 16:03:55","parameters":[{"id":4102,"name":"show_notifications","choice":"variant","weight":1},{"id":4103,"name":"show_notifications","choice":"control","weight":0}],"segments":[]},{"id":2469,"name":"* Notifications V1 2","buckets":1000,"state":3,"published_on":"2022-06-19 16:04:06","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-06-19 16:10:54","parameters":[{"id":4100,"name":"show_notifications","choice":"variant","weight":0},{"id":4101,"name":"show_notifications","choice":"control","weight":1}],"segments":[]},{"id":2471,"name":"* * * Notifications V1 4","buckets":1000,"state":3,"published_on":"2022-06-19 16:11:36","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-06-23 04:29:15","parameters":[{"id":4104,"name":"show_notifications","choice":"variant","weight":1},{"id":4105,"name":"show_notifications","choice":"control","weight":0}],"segments":[]},{"id":2490,"name":"* * * * Notifications V1 5","buckets":1000,"state":3,"published_on":"2022-07-01 07:38:29","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-07-01 07:47:44","parameters":[{"id":4134,"name":"show_notifications","choice":"variant","weight":1},{"id":4135,"name":"show_notifications","choice":"control","weight":0}],"segments":[]},{"id":2459,"name":"Notifications V1","buckets":1000,"state":1,"published_on":"2022-07-06 10:22:48","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4090,"name":"show_notifications","choice":"variant","weight":1},{"id":4091,"name":"show_notifications","choice":"control","weight":1}],"segments":[]}]},"JS.LOHP.FullPageRedesign":{"id":882,"name":"JS.LOHP.FullPageRedesign","buckets":1000,"input":"vuid","url":"https:\/\/vimeo.com\/","experiments":[{"id":2456,"name":"Home page - New Version - All Users","buckets":1000,"state":3,"published_on":"2022-06-14 16:21:30","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-06-28 01:19:38","parameters":[{"id":4085,"name":"show_page","choice":"variant","weight":1}],"segments":[]},{"id":2483,"name":"Home page Mobile Test","buckets":1000,"state":3,"published_on":"2022-06-28 01:20:42","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-08-12 09:43:58","parameters":[{"id":4123,"name":"show_page","choice":"control","weight":1},{"id":4124,"name":"show_page","choice":"variant","weight":1}],"segments":[]},{"id":2561,"name":"Variant to 100% users","buckets":1000,"state":1,"published_on":"2022-08-12 09:45:07","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4248,"name":"show_page","choice":"variant","weight":1}],"segments":[]}]},"JS.RecordExtension.Checklist":{"id":868,"name":"JS.RecordExtension.Checklist","buckets":1000,"input":"vuid","url":"\/","experiments":[{"id":2393,"name":"CLS1","buckets":1000,"state":3,"published_on":"2022-05-24 06:11:07","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-05-24 06:18:08","parameters":[{"id":3998,"name":"show_checklist","choice":"variant","weight":1},{"id":3999,"name":"show_checklist","choice":"control","weight":1}],"segments":[]},{"id":2415,"name":"* CLS1","buckets":1000,"state":3,"published_on":"2022-05-24 06:18:57","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-05-24 06:52:27","parameters":[{"id":4028,"name":"show_checklist","choice":"variant","weight":1}],"segments":[]},{"id":2416,"name":"* * CLS1","buckets":1000,"state":3,"published_on":"2022-05-24 06:53:01","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-05-30 09:42:21","parameters":[{"id":4029,"name":"show_checklist","choice":"variant","weight":1}],"segments":[]},{"id":2436,"name":"* * * CLS1","buckets":1000,"state":3,"published_on":"2022-05-31 08:40:44","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-06-01 04:39:01","parameters":[{"id":4055,"name":"show_checklist","choice":"variant","weight":1}],"segments":[]},{"id":2442,"name":"Checklist v1","buckets":500,"state":3,"published_on":"2022-06-07 05:27:24","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-07-29 10:15:31","parameters":[{"id":4066,"name":"show_checklist","choice":"variant","weight":1},{"id":4067,"name":"show_checklist","choice":"control","weight":1}],"segments":[]},{"id":2546,"name":"Checklist v1 - rollout","buckets":1000,"state":1,"published_on":"2022-07-29 10:16:00","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4219,"name":"show_checklist","choice":"variant","weight":1}],"segments":[]}]},"JS.SVV.Omnisearch":{"id":864,"name":"JS.SVV.Omnisearch","buckets":1000,"input":"cuid","url":"\/manage\/videos\/:videoId, \/:videoId","experiments":[{"id":2384,"name":"Omnisearch in SVV","buckets":1000,"state":3,"published_on":"2022-05-24 13:45:47","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-12-14 17:10:32","parameters":[{"id":3983,"name":"show_omnisearch","choice":"variant","weight":1},{"id":3984,"name":"show_omnisearch","choice":"control","weight":1}],"segments":[]},{"id":2776,"name":"100% roll - Omnisearch in SVV","buckets":1000,"state":1,"published_on":"2022-12-14 17:11:00","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4570,"name":"show_omnisearch","choice":"variant","weight":1}],"segments":[]}]},"JS.RecordExtension.SignUpWall":{"id":849,"name":"JS.RecordExtension.SignUpWall","buckets":1000,"input":"vuid","url":"\/","experiments":[{"id":2325,"name":"Record Extension SignUp Wall","buckets":0,"state":3,"published_on":"2022-04-28 08:53:50","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-04-28 08:55:56","parameters":[{"id":3912,"name":"force_sign_up_wall","choice":"variant","weight":1},{"id":3913,"name":"force_sign_up_wall","choice":"control","weight":1}],"segments":[]},{"id":2352,"name":"* Record Extension SignUp Wall","buckets":1000,"state":3,"published_on":"2022-04-28 08:56:29","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-04-29 10:37:52","parameters":[{"id":3939,"name":"force_sign_up_wall","choice":"variant","weight":1},{"id":3940,"name":"force_sign_up_wall","choice":"control","weight":0}],"segments":[]},{"id":2439,"name":"Record Extension SignUp Wall - prod","buckets":500,"state":3,"published_on":"2022-06-07 05:20:10","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-06-29 11:03:57","parameters":[{"id":4060,"name":"force_sign_up_wall","choice":"variant","weight":1},{"id":4061,"name":"force_sign_up_wall","choice":"control","weight":1}],"segments":[]},{"id":2486,"name":"Record Extension SignUp Wall \u043c2 - prod","buckets":1000,"state":3,"published_on":"2022-06-29 11:06:04","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-07-04 11:45:47","parameters":[{"id":4127,"name":"force_sign_up_wall","choice":"variant","weight":1},{"id":4128,"name":"force_sign_up_wall","choice":"control","weight":1}],"segments":[]},{"id":2500,"name":"Record Extension SignUp Wall v2 - prod","buckets":1000,"state":3,"published_on":"2022-07-06 10:25:18","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-08-09 08:02:41","parameters":[{"id":4147,"name":"force_sign_up_wall","choice":"variant","weight":1},{"id":4148,"name":"force_sign_up_wall","choice":"control","weight":1}],"segments":[]},{"id":2556,"name":"Record Extension SignUp Wall v2 - prod (A\/A\/B\/B)","buckets":1000,"state":3,"published_on":"2022-08-09 08:03:46","paused_on":"2022-08-09 08:03:57","stopped_on":"2022-08-09 08:04:57","parameters":[{"id":4237,"name":"force_sign_up_wall","choice":"variant","weight":1},{"id":4238,"name":"force_sign_up_wall","choice":"control","weight":1}],"segments":[]},{"id":2557,"name":"Record Extension SignUp Wall v2 - prod (A\/A\/B\/B) I","buckets":500,"state":3,"published_on":"2022-08-09 08:51:06","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-09-22 07:49:32","parameters":[{"id":4240,"name":"force_sign_up_wall","choice":"variant","weight":1},{"id":4241,"name":"force_sign_up_wall","choice":"control","weight":1}],"segments":[]},{"id":2558,"name":"Record Extension SignUp Wall v2 - prod (A\/A\/B\/B) II","buckets":500,"state":3,"published_on":"2022-08-09 08:51:12","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-09-22 07:49:27","parameters":[{"id":4242,"name":"force_sign_up_wall","choice":"variant","weight":1},{"id":4243,"name":"force_sign_up_wall","choice":"control","weight":1}],"segments":[]},{"id":2632,"name":"Record Extension SignUp Wall - Rollout","buckets":1000,"state":3,"published_on":"2022-09-22 07:50:08","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-09-22 08:51:51","parameters":[],"segments":[]},{"id":2635,"name":"* Record Extension SignUp Wall - Rollout","buckets":1000,"state":1,"published_on":"2022-09-22 08:52:14","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4357,"name":"force_sign_up_wall","choice":"variant","weight":1}],"segments":[]}]},"JS.VideoManager.LeftNewVideo.SkipEventCreationModal":{"id":837,"name":"JS.VideoManager.LeftNewVideo.SkipEventCreationModal","buckets":1000,"input":"cuid","url":"\/","experiments":[{"id":2283,"name":"Show OLE Deprecation Modal","buckets":100,"state":1,"published_on":"2022-04-12 12:07:50","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":3858,"name":"vm_skip_event_creation_modal","choice":"variant","weight":1},{"id":3859,"name":"vm_skip_event_creation_modal","choice":"control","weight":1}],"segments":[]},{"id":2285,"name":"* Show OLE Deprecation Modal","buckets":100,"state":1,"published_on":"2022-04-13 14:14:30","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":3861,"name":"vm_skip_event_creation_modal","choice":"variant","weight":1},{"id":3862,"name":"vm_skip_event_creation_modal","choice":"control","weight":1}],"segments":[]},{"id":2323,"name":"* * Show OLE Deprecation Modal","buckets":800,"state":1,"published_on":"2022-04-18 17:27:53","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":3908,"name":"vm_skip_event_creation_modal","choice":"variant","weight":1},{"id":3909,"name":"vm_skip_event_creation_modal","choice":"control","weight":1}],"segments":[]}]},"JS.Webinar.RegistrantCapForPremium":{"id":820,"name":"JS.Webinar.RegistrantCapForPremium","buckets":1000,"input":"vuid","url":"upgrade, checkout and marketing pages","experiments":[{"id":2243,"name":"Rollout to 10% traffic","buckets":100,"state":2,"published_on":"2022-06-01 05:27:17","paused_on":"2022-07-01 14:31:45","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":3803,"name":"show_premium_registrant_cap","choice":"control","weight":1},{"id":3804,"name":"show_premium_registrant_cap","choice":"variant","weight":1}],"segments":[]},{"id":2438,"name":"* Rollout to 40% traffic","buckets":400,"state":2,"published_on":"2022-06-06 11:14:01","paused_on":"2022-07-01 14:31:58","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4058,"name":"show_premium_registrant_cap","choice":"control","weight":1},{"id":4059,"name":"show_premium_registrant_cap","choice":"variant","weight":1}],"segments":[]},{"id":2444,"name":"* * Rollout to 50% traffic","buckets":500,"state":2,"published_on":"2022-06-08 00:05:31","paused_on":"2022-07-01 14:32:04","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4069,"name":"show_premium_registrant_cap","choice":"control","weight":1},{"id":4070,"name":"show_premium_registrant_cap","choice":"variant","weight":1}],"segments":[]}]},"JS.Editor.BlankEditor":{"id":811,"name":"JS.Editor.BlankEditor","buckets":1000,"input":"cuid","url":"https:\/\/vimeo.com\/create\/customize","experiments":[{"id":2176,"name":"BlankEditor","buckets":100,"state":3,"published_on":"2022-04-27 04:31:24","paused_on":"2022-07-04 00:58:53","stopped_on":"2022-07-04 01:00:04","parameters":[{"id":3728,"name":"show_blank_editor","choice":"control","weight":1},{"id":3729,"name":"show_blank_editor","choice":"variant","weight":1}],"segments":[]},{"id":2346,"name":"BlankEditor (20%)","buckets":100,"state":3,"published_on":"2022-04-27 04:38:05","paused_on":"2022-07-04 00:58:48","stopped_on":"2022-07-04 00:59:58","parameters":[{"id":3931,"name":"show_blank_editor","choice":"control","weight":1},{"id":3932,"name":"show_blank_editor","choice":"variant","weight":1}],"segments":[]},{"id":2386,"name":"BlankEditor (100%)","buckets":800,"state":3,"published_on":"2022-05-12 05:31:09","paused_on":"2022-07-04 00:58:40","stopped_on":"2022-07-04 00:59:52","parameters":[{"id":3986,"name":"show_blank_editor","choice":"control","weight":1},{"id":3987,"name":"show_blank_editor","choice":"variant","weight":1}],"segments":[]},{"id":2491,"name":"BlankEditor (1000%)","buckets":1000,"state":1,"published_on":"2022-07-04 01:00:59","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4136,"name":"show_blank_editor","choice":"variant","weight":1}],"segments":[]}]},"JS.Editor.MasksGradualRelease":{"id":807,"name":"JS.Editor.MasksGradualRelease","buckets":1000,"input":"cuid","url":"https:\/\/vimeo.com\/create\/customize","experiments":[{"id":2164,"name":"MasksGradualRelease","buckets":200,"state":3,"published_on":"2022-03-30 02:29:07","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-04-26 08:08:43","parameters":[{"id":3707,"name":"support_masks","choice":"variant","weight":1},{"id":3708,"name":"support_masks","choice":"control","weight":1}],"segments":[]},{"id":2268,"name":"_MasksGradualRelease","buckets":800,"state":3,"published_on":"2022-04-05 08:41:27","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-04-26 08:08:33","parameters":[{"id":3833,"name":"support_masks","choice":"variant","weight":1},{"id":3834,"name":"support_masks","choice":"control","weight":1}],"segments":[]},{"id":2339,"name":"___MasksGradualRelease","buckets":1000,"state":1,"published_on":"2022-04-26 14:57:15","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":3928,"name":"support_masks","choice":"variant","weight":1}],"segments":[]}]},"JS.Editor.PreviewWithoutSave":{"id":787,"name":"JS.Editor.PreviewWithoutSave","buckets":1000,"input":"cuid","url":"vimeo.com\/create\/customize","experiments":[{"id":2137,"name":"Show preview modal","buckets":10,"state":3,"published_on":"2022-04-27 04:21:52","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-05-31 04:14:53","parameters":[{"id":3656,"name":"enable_preview_modal","choice":"control","weight":1},{"id":3657,"name":"enable_preview_modal","choice":"variant","weight":1}],"segments":[]},{"id":2347,"name":"Show preview modal (205)","buckets":190,"state":3,"published_on":"2022-04-27 04:39:52","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-05-31 04:15:00","parameters":[{"id":3933,"name":"enable_preview_modal","choice":"control","weight":1},{"id":3934,"name":"enable_preview_modal","choice":"variant","weight":1}],"segments":[]},{"id":2355,"name":"Show preview modal (40%)","buckets":200,"state":3,"published_on":"2022-05-02 07:05:49","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-05-31 04:15:08","parameters":[{"id":3944,"name":"enable_preview_modal","choice":"control","weight":1},{"id":3945,"name":"enable_preview_modal","choice":"variant","weight":1}],"segments":[]},{"id":2359,"name":"Show preview modal (100%)","buckets":600,"state":3,"published_on":"2022-05-03 11:22:59","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-05-31 04:15:40","parameters":[{"id":3952,"name":"enable_preview_modal","choice":"control","weight":1},{"id":3953,"name":"enable_preview_modal","choice":"variant","weight":1}],"segments":[]},{"id":2435,"name":"* Show preview modal (100%)","buckets":1000,"state":1,"published_on":"2022-05-31 04:21:58","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":4054,"name":"enable_preview_modal","choice":"variant","weight":1}],"segments":[]}]},"JS.ClipPageEUBlock":{"id":672,"name":"JS.ClipPageEUBlock","buckets":1000,"input":"vuid","url":"\/","experiments":[{"id":1810,"name":"Initial sampling of OFCOM population","buckets":100,"state":3,"published_on":"2021-07-07 15:18:39","paused_on":"0000-00-00 00:00:00","stopped_on":"2021-08-10 15:04:14","parameters":[{"id":3149,"name":"should_block","choice":"control","weight":1},{"id":3150,"name":"should_block","choice":"variant","weight":1}],"segments":[]},{"id":1866,"name":"90% of EU\/UK users see blocker","buckets":900,"state":1,"published_on":"2021-08-16 11:19:56","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":3227,"name":"should_block","choice":"control","weight":1}],"segments":[]},{"id":1867,"name":"10% Experiment","buckets":100,"state":3,"published_on":"2021-08-16 11:20:01","paused_on":"0000-00-00 00:00:00","stopped_on":"2022-04-06 16:39:46","parameters":[{"id":3228,"name":"should_block","choice":"control","weight":1},{"id":3229,"name":"should_block","choice":"variant","weight":1}],"segments":[]},{"id":2273,"name":"the remaining 10% of EU\/UK users see blocker","buckets":100,"state":1,"published_on":"2022-04-06 16:40:07","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":3841,"name":"should_block","choice":"control","weight":1}],"segments":[]}]},"JS.Checkout.ApplePayDefaultSelected":{"id":613,"name":"JS.Checkout.ApplePayDefaultSelected","buckets":1000,"input":"vuid","url":"pro, premium, plus, business checkout pages","experiments":[{"id":1618,"name":"Apple pay selected by default","buckets":100,"state":1,"published_on":"2021-03-30 11:15:26","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":2827,"name":"select_apple_pay_by_default","choice":"control","weight":1},{"id":2828,"name":"select_apple_pay_by_default","choice":"variant","weight":1}],"segments":[]},{"id":1699,"name":"+90% - Apple pay selected by default","buckets":900,"state":1,"published_on":"2021-04-05 17:38:05","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":2958,"name":"select_apple_pay_by_default","choice":"control","weight":1},{"id":2959,"name":"select_apple_pay_by_default","choice":"variant","weight":1}],"segments":[]}]},"JS.Review.RegisterToComment":{"id":601,"name":"JS.Review.RegisterToComment","buckets":1000,"input":"vuid","url":"\/:username\/review\/:clipId\/:clipHash","experiments":[{"id":1589,"name":"Register to Comment 10%","buckets":100,"state":3,"published_on":"2021-02-11 11:18:41","paused_on":"0000-00-00 00:00:00","stopped_on":"2021-03-01 11:51:10","parameters":[{"id":2787,"name":"require_registration","choice":"true","weight":1}],"segments":[]},{"id":1623,"name":"Register to Comment #2","buckets":100,"state":1,"published_on":"2021-03-01 11:53:55","paused_on":"0000-00-00 00:00:00","stopped_on":"0000-00-00 00:00:00","parameters":[{"id":2837,"name":"require_registration","choice":"true","weight":1},{"id":2838,"name":"require_registration","choice":"false","weight":1}],"segments":[]}]}};
+    </script>
+<script>
+(function() {
+    window._gtm = [{"clip_id":786646692,"page_path":"\/786646692","creator_id":15073876,"creator_user_type":"business","video_categories":"People,Documentary","privacy":"anybody","staff_pick":"yes","user_id":null,"page_type":"Video","language":"en","user_status":"logged_out","user_type":"none","ga_universal_id":"UA-76641-8","comscore_site_id":10348289}];
+
+        var gdprCookie = (document.cookie.match(/^(?:.*;)?\s*vimeo_gdpr_optin\s*=\s*([^;]+)(?:.*)?$/)||[,null])[1];
+    if (gdprCookie === '-1') {
+        return;
+    }
+
+        window._gtm.push({
+        'vuid': document.cookie.replace(/(?:(?:^|.*;\s*)vuid\s*\=\s*([^;]*).*$)|^.*$/, "$1"),
+        'gtm.start': new Date().getTime(),
+        'event': 'gtm.js'
+    });
+        
+    var activeGroups = window.OnetrustActiveGroups || '';
+    var gtms = document.createElement('script'),
+        node;
+    gtms.async = true;
+    gtms.type = activeGroups.indexOf("C0002") === -1 ? 'text/plain' : 'text/javascript';
+    gtms.className = "optanon-category-C0002";
+    gtms.src = '//www.googletagmanager.com/gtm.js?id=GTM-RBKK&l=_gtm';
+    node = document.head;
+    node.appendChild(gtms);
+})();
+</script>
+<script>
+    var googletag = googletag || {},
+        gptadslots = [],
+        language,
+        has_uploaded,
+        cohort;
+    googletag.cmd = googletag.cmd || [];
+
+    (function() {
+        var gdprCookie = (document.cookie.match(/^(?:.*;)?\s*vimeo_gdpr_optin\s*=\s*([^;]+)(?:.*)?$/)||[,null])[1];
+        if (gdprCookie === '-1') {
+            return;
+        }
+        var activeGroups = window.OnetrustActiveGroups || '';
+        var gads = document.createElement('script'),
+            useSSL = 'https:' == document.location.protocol,
+            node;
+        gads.async = true;
+        gads.type = activeGroups.indexOf("C0002") === -1 ? 'text/plain' : 'text/javascript';
+        gads.className = "optanon-category-C0002";
+        gads.src = (useSSL ? 'https:' : 'http:') + '//www.googletagservices.com/tag/js/gpt.js';
+        node = document.head;
+        node.appendChild(gads);
+    })();
+
+    googletag.cmd.push(function() {
+        
+                    language = document.cookie.replace(/(?:(?:^|.*;\s*)language\s*\=\s*([^;]*).*$)|^.*$/, "$1");
+            has_uploaded = (document.cookie.replace(/(?:(?:^|.*;\s*)has_uploaded\s*\=\s*([^;]*).*$)|^.*$/, "$1")) ? 'Y' : 'N';
+            consent = (document.cookie.replace(/(?:(?:^|.*;\s*)vimeo_gdpr_optin\s*\=\s*([^;]*).*$)|^.*$/, "$1")) === '-1' ? 1 : 0;
+            cohort = 'A';
+        
+        googletag.pubads().setTargeting('language', [language]);
+        googletag.pubads().setTargeting('is_uploader', [has_uploaded]);
+        googletag.pubads().setTargeting('cohort', [cohort]);
+        googletag.pubads().setTargeting('cohort_a', [(cohort === 'A') ? 'Y' : 'N']);
+        googletag.pubads().setTargeting('cohort_b', [(cohort === 'B') ? 'Y' : 'N']);
+        googletag.pubads().setTargeting('product', ['']);
+        googletag.pubads().setTargeting('storage', ['N']);
+
+                googletag.pubads().setTargeting('sec', ['false']);
+
+        googletag.pubads().setTargeting('logged_in', ['false']);
+
+                googletag.pubads().setTargeting('rpv', (Math.floor(Math.random()*100)+1).toString());
+
+        googletag.pubads().setRequestNonPersonalizedAds(consent);
+        googletag.pubads().enableAsyncRendering();
+        googletag.pubads().disableInitialLoad();
+        googletag.enableServices();
+    });
+</script>
+
+    <script src="./Dear Rich on Vimeo_files/ablincoln_combined_95af033794ec531f21f93af3906ab38e.min.js" data-airgap-id="22"></script>
+
+
+
+    <style data-styled-components=""></style><style type="text/css">.TranscriptCue_lazy_module_cueListItem__da7e05d9{position:absolute;width:100%;top:0;left:0;padding:0;list-style:none;margin-bottom:8px}.TranscriptCue_lazy_module_cueListItem__da7e05d9 .TranscriptCue_lazy_module_cue__da7e05d9{height:100%;display:block;margin-bottom:8px}.TranscriptCue_lazy_module_cueListItem__da7e05d9:hover{text-decoration:underline}</style><style type="text/css">.TranscriptList_lazy_module_container__8b125cfe{display:flex;padding:12px 30px;background-color:rgba(0,0,0,.9);overflow-y:scroll;height:calc(100% - 32px)}.TranscriptList_lazy_module_list__8b125cfe{width:100%;position:relative;font-size:1.5em;list-style:none}</style><style type="text/css">.Transcript_lazy_module_transcript__38bf48c3{pointer-events:all;width:100%;position:absolute;top:0;bottom:0;height:calc(100% - 32px)}.Transcript_lazy_module_transcript__38bf48c3 .Transcript_lazy_module_controls__38bf48c3{display:flex;width:100%}.Transcript_lazy_module_transcript__38bf48c3 .Transcript_lazy_module_controls__38bf48c3 form{flex:10}.Transcript_lazy_module_transcript__38bf48c3 .Transcript_lazy_module_controls__38bf48c3 select{flex:1;width:64px}</style><style data-player="e04291f1-152c-4651-94ab-23cfc4c451b7"></style><script src="./Dear Rich on Vimeo_files/cast_sender.js" async="" defer=""></script><link id="googleidentityservice" type="text/css" media="all" rel="stylesheet" href="./Dear Rich on Vimeo_files/style"><style id="googleidentityservice_button_styles">.qJTHM{-webkit-user-select:none;color:#202124;direction:ltr;-webkit-touch-callout:none;font-family:"Roboto-Regular",arial,sans-serif;-webkit-font-smoothing:antialiased;font-weight:400;margin:0;overflow:hidden;-webkit-text-size-adjust:100%}.ynRLnc{left:-9999px;position:absolute;top:-9999px}.L6cTce{display:none}.bltWBb{word-break:break-all}.hSRGPd{color:#1a73e8;cursor:pointer;font-weight:500;text-decoration:none}.Bz112c-W3lGp{height:16px;width:16px}.Bz112c-E3DyYd{height:20px;width:20px}.Bz112c-r9oPif{height:24px;width:24px}.Bz112c-uaxL4e{-webkit-border-radius:10px;border-radius:10px}.LgbsSe-Bz112c{display:block}.S9gUrf-YoZ4jf,.S9gUrf-YoZ4jf *{border:none;margin:0;padding:0}.fFW7wc-ibnC6b>.aZ2wEe>div{border-color:#4285f4}.P1ekSe-ZMv3u>div:nth-child(1){background-color:#1a73e8!important}.P1ekSe-ZMv3u>div:nth-child(2),.P1ekSe-ZMv3u>div:nth-child(3){background-image:linear-gradient(to right,rgba(255,255,255,.7),rgba(255,255,255,.7)),linear-gradient(to right,#1a73e8,#1a73e8)!important}.haAclf{display:inline-block}.nsm7Bb-HzV7m-LgbsSe{-webkit-border-radius:4px;border-radius:4px;-webkit-box-sizing:border-box;box-sizing:border-box;-webkit-transition:background-color .218s,border-color .218s;transition:background-color .218s,border-color .218s;-webkit-user-select:none;-webkit-appearance:none;background-color:#fff;background-image:none;border:1px solid #dadce0;color:#3c4043;cursor:pointer;font-family:"Google Sans",arial,sans-serif;font-size:14px;height:40px;letter-spacing:0.25px;outline:none;overflow:hidden;padding:0 12px;position:relative;text-align:center;vertical-align:middle;white-space:nowrap;width:auto}@media screen and (-ms-high-contrast:active){.nsm7Bb-HzV7m-LgbsSe{border:2px solid windowText;color:windowText}}.nsm7Bb-HzV7m-LgbsSe.pSzOP-SxQuSe{font-size:14px;height:32px;letter-spacing:0.25px;padding:0 10px}.nsm7Bb-HzV7m-LgbsSe.purZT-SxQuSe{font-size:11px;height:20px;letter-spacing:0.3px;padding:0 8px}.nsm7Bb-HzV7m-LgbsSe.Bz112c-LgbsSe{padding:0;width:40px}.nsm7Bb-HzV7m-LgbsSe.Bz112c-LgbsSe.pSzOP-SxQuSe{width:32px}.nsm7Bb-HzV7m-LgbsSe.Bz112c-LgbsSe.purZT-SxQuSe{width:20px}.nsm7Bb-HzV7m-LgbsSe.JGcpL-RbRzK{-webkit-border-radius:20px;border-radius:20px}.nsm7Bb-HzV7m-LgbsSe.JGcpL-RbRzK.pSzOP-SxQuSe{-webkit-border-radius:16px;border-radius:16px}.nsm7Bb-HzV7m-LgbsSe.JGcpL-RbRzK.purZT-SxQuSe{-webkit-border-radius:10px;border-radius:10px}.nsm7Bb-HzV7m-LgbsSe.MFS4be-Ia7Qfc{border:none;color:#fff}.nsm7Bb-HzV7m-LgbsSe.MFS4be-v3pZbf-Ia7Qfc{background-color:#1a73e8}.nsm7Bb-HzV7m-LgbsSe.MFS4be-JaPV2b-Ia7Qfc{background-color:#202124;color:#e8eaed}.nsm7Bb-HzV7m-LgbsSe .nsm7Bb-HzV7m-LgbsSe-Bz112c{height:18px;margin-right:8px;min-width:18px;width:18px}.nsm7Bb-HzV7m-LgbsSe.pSzOP-SxQuSe .nsm7Bb-HzV7m-LgbsSe-Bz112c{height:14px;min-width:14px;width:14px}.nsm7Bb-HzV7m-LgbsSe.purZT-SxQuSe .nsm7Bb-HzV7m-LgbsSe-Bz112c{height:10px;min-width:10px;width:10px}.nsm7Bb-HzV7m-LgbsSe.jVeSEe .nsm7Bb-HzV7m-LgbsSe-Bz112c{margin-left:8px;margin-right:-4px}.nsm7Bb-HzV7m-LgbsSe.Bz112c-LgbsSe .nsm7Bb-HzV7m-LgbsSe-Bz112c{margin:0;padding:10px}.nsm7Bb-HzV7m-LgbsSe.Bz112c-LgbsSe.pSzOP-SxQuSe .nsm7Bb-HzV7m-LgbsSe-Bz112c{padding:8px}.nsm7Bb-HzV7m-LgbsSe.Bz112c-LgbsSe.purZT-SxQuSe .nsm7Bb-HzV7m-LgbsSe-Bz112c{padding:4px}.nsm7Bb-HzV7m-LgbsSe .nsm7Bb-HzV7m-LgbsSe-Bz112c-haAclf{-webkit-border-top-left-radius:3px;border-top-left-radius:3px;-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;display:-webkit-box;display:-webkit-flex;display:flex;justify-content:center;-webkit-align-items:center;align-items:center;background-color:#fff;height:36px;margin-left:-10px;margin-right:12px;min-width:36px;width:36px}.nsm7Bb-HzV7m-LgbsSe .nsm7Bb-HzV7m-LgbsSe-Bz112c-haAclf .nsm7Bb-HzV7m-LgbsSe-Bz112c,.nsm7Bb-HzV7m-LgbsSe.Bz112c-LgbsSe .nsm7Bb-HzV7m-LgbsSe-Bz112c-haAclf .nsm7Bb-HzV7m-LgbsSe-Bz112c{margin:0;padding:0}.nsm7Bb-HzV7m-LgbsSe.pSzOP-SxQuSe .nsm7Bb-HzV7m-LgbsSe-Bz112c-haAclf{height:28px;margin-left:-8px;margin-right:10px;min-width:28px;width:28px}.nsm7Bb-HzV7m-LgbsSe.purZT-SxQuSe .nsm7Bb-HzV7m-LgbsSe-Bz112c-haAclf{height:16px;margin-left:-6px;margin-right:8px;min-width:16px;width:16px}.nsm7Bb-HzV7m-LgbsSe.Bz112c-LgbsSe .nsm7Bb-HzV7m-LgbsSe-Bz112c-haAclf{-webkit-border-radius:3px;border-radius:3px;margin-left:2px;margin-right:0;padding:0}.nsm7Bb-HzV7m-LgbsSe.JGcpL-RbRzK .nsm7Bb-HzV7m-LgbsSe-Bz112c-haAclf{-webkit-border-radius:18px;border-radius:18px}.nsm7Bb-HzV7m-LgbsSe.pSzOP-SxQuSe.JGcpL-RbRzK .nsm7Bb-HzV7m-LgbsSe-Bz112c-haAclf{-webkit-border-radius:14px;border-radius:14px}.nsm7Bb-HzV7m-LgbsSe.purZT-SxQuSe.JGcpL-RbRzK .nsm7Bb-HzV7m-LgbsSe-Bz112c-haAclf{-webkit-border-radius:8px;border-radius:8px}.nsm7Bb-HzV7m-LgbsSe .nsm7Bb-HzV7m-LgbsSe-bN97Pc-sM5MNb{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;-webkit-flex-direction:row;flex-direction:row;justify-content:space-between;-webkit-flex-wrap:nowrap;flex-wrap:nowrap;height:100%;position:relative;width:100%}.nsm7Bb-HzV7m-LgbsSe .oXtfBe-l4eHX{justify-content:center}.nsm7Bb-HzV7m-LgbsSe .nsm7Bb-HzV7m-LgbsSe-BPrWId{-webkit-flex-grow:1;flex-grow:1;font-family:"Google Sans",arial,sans-serif;font-weight:500;overflow:hidden;text-overflow:ellipsis;vertical-align:top}.nsm7Bb-HzV7m-LgbsSe.purZT-SxQuSe .nsm7Bb-HzV7m-LgbsSe-BPrWId{font-weight:300}.nsm7Bb-HzV7m-LgbsSe .oXtfBe-l4eHX .nsm7Bb-HzV7m-LgbsSe-BPrWId{-webkit-flex-grow:0;flex-grow:0}.nsm7Bb-HzV7m-LgbsSe .nsm7Bb-HzV7m-LgbsSe-MJoBVe{-webkit-transition:background-color .218s;transition:background-color .218s;bottom:0;left:0;position:absolute;right:0;top:0}.nsm7Bb-HzV7m-LgbsSe:hover,.nsm7Bb-HzV7m-LgbsSe:focus{-webkit-box-shadow:none;box-shadow:none;border-color:#d2e3fc;outline:none}.nsm7Bb-HzV7m-LgbsSe:hover .nsm7Bb-HzV7m-LgbsSe-MJoBVe,.nsm7Bb-HzV7m-LgbsSe:focus .nsm7Bb-HzV7m-LgbsSe-MJoBVe{background:rgba(66,133,244,.04)}.nsm7Bb-HzV7m-LgbsSe:active .nsm7Bb-HzV7m-LgbsSe-MJoBVe{background:rgba(66,133,244,.1)}.nsm7Bb-HzV7m-LgbsSe.MFS4be-Ia7Qfc:hover .nsm7Bb-HzV7m-LgbsSe-MJoBVe,.nsm7Bb-HzV7m-LgbsSe.MFS4be-Ia7Qfc:focus .nsm7Bb-HzV7m-LgbsSe-MJoBVe{background:rgba(255,255,255,.24)}.nsm7Bb-HzV7m-LgbsSe.MFS4be-Ia7Qfc:active .nsm7Bb-HzV7m-LgbsSe-MJoBVe{background:rgba(255,255,255,.32)}.nsm7Bb-HzV7m-LgbsSe .n1UuX-DkfjY{-webkit-border-radius:50%;border-radius:50%;display:-webkit-box;display:-webkit-flex;display:flex;height:20px;margin-left:-4px;margin-right:8px;min-width:20px;width:20px}.nsm7Bb-HzV7m-LgbsSe.jVeSEe .nsm7Bb-HzV7m-LgbsSe-BPrWId{font-family:"Roboto";font-size:12px;text-align:left}.nsm7Bb-HzV7m-LgbsSe.jVeSEe .nsm7Bb-HzV7m-LgbsSe-BPrWId .ssJRIf,.nsm7Bb-HzV7m-LgbsSe.jVeSEe .nsm7Bb-HzV7m-LgbsSe-BPrWId .K4efff .fmcmS{overflow:hidden;text-overflow:ellipsis}.nsm7Bb-HzV7m-LgbsSe.jVeSEe .nsm7Bb-HzV7m-LgbsSe-BPrWId .K4efff{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;color:#5f6368;fill:#5f6368;font-size:11px;font-weight:400}.nsm7Bb-HzV7m-LgbsSe.jVeSEe.MFS4be-Ia7Qfc .nsm7Bb-HzV7m-LgbsSe-BPrWId .K4efff{color:#e8eaed;fill:#e8eaed}.nsm7Bb-HzV7m-LgbsSe.jVeSEe .nsm7Bb-HzV7m-LgbsSe-BPrWId .K4efff .Bz112c{height:18px;margin:-3px -3px -3px 2px;min-width:18px;width:18px}.nsm7Bb-HzV7m-LgbsSe.jVeSEe .nsm7Bb-HzV7m-LgbsSe-Bz112c-haAclf{-webkit-border-top-left-radius:0;border-top-left-radius:0;-webkit-border-bottom-left-radius:0;border-bottom-left-radius:0;-webkit-border-top-right-radius:3px;border-top-right-radius:3px;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px;margin-left:12px;margin-right:-10px}.nsm7Bb-HzV7m-LgbsSe.jVeSEe.JGcpL-RbRzK .nsm7Bb-HzV7m-LgbsSe-Bz112c-haAclf{-webkit-border-radius:18px;border-radius:18px}.L5Fo6c-sM5MNb{border:0;display:block;left:0;position:relative;top:0}.L5Fo6c-bF1uUb{-webkit-border-radius:4px;border-radius:4px;bottom:0;cursor:pointer;left:0;position:absolute;right:0;top:0}.L5Fo6c-bF1uUb:focus{border:none;outline:none}sentinel{}</style><script src="./Dear Rich on Vimeo_files/otBannerSdk.js" async="" type="text/javascript"></script><script src="./Dear Rich on Vimeo_files/cast_framework.js"></script><script src="./Dear Rich on Vimeo_files/cast_sender(1).js"></script><style id="onetrust-style">#onetrust-banner-sdk{-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}#onetrust-banner-sdk .onetrust-vendors-list-handler{cursor:pointer;color:#1f96db;font-size:inherit;font-weight:bold;text-decoration:none;margin-left:5px}#onetrust-banner-sdk .onetrust-vendors-list-handler:hover{color:#1f96db}#onetrust-banner-sdk:focus{outline:2px solid #000;outline-offset:-2px}#onetrust-banner-sdk a:focus{outline:2px solid #000}#onetrust-banner-sdk #onetrust-accept-btn-handler,#onetrust-banner-sdk #onetrust-reject-all-handler,#onetrust-banner-sdk #onetrust-pc-btn-handler{outline-offset:1px}#onetrust-banner-sdk .ot-close-icon,#onetrust-pc-sdk .ot-close-icon,#ot-sync-ntfy .ot-close-icon{background-image:url("data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IiB3aWR0aD0iMzQ4LjMzM3B4IiBoZWlnaHQ9IjM0OC4zMzNweCIgdmlld0JveD0iMCAwIDM0OC4zMzMgMzQ4LjMzNCIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzQ4LjMzMyAzNDguMzM0OyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+PGc+PHBhdGggZmlsbD0iIzU2NTY1NiIgZD0iTTMzNi41NTksNjguNjExTDIzMS4wMTYsMTc0LjE2NWwxMDUuNTQzLDEwNS41NDljMTUuNjk5LDE1LjcwNSwxNS42OTksNDEuMTQ1LDAsNTYuODVjLTcuODQ0LDcuODQ0LTE4LjEyOCwxMS43NjktMjguNDA3LDExLjc2OWMtMTAuMjk2LDAtMjAuNTgxLTMuOTE5LTI4LjQxOS0xMS43NjlMMTc0LjE2NywyMzEuMDAzTDY4LjYwOSwzMzYuNTYzYy03Ljg0Myw3Ljg0NC0xOC4xMjgsMTEuNzY5LTI4LjQxNiwxMS43NjljLTEwLjI4NSwwLTIwLjU2My0zLjkxOS0yOC40MTMtMTEuNzY5Yy0xNS42OTktMTUuNjk4LTE1LjY5OS00MS4xMzksMC01Ni44NWwxMDUuNTQtMTA1LjU0OUwxMS43NzQsNjguNjExYy0xNS42OTktMTUuNjk5LTE1LjY5OS00MS4xNDUsMC01Ni44NDRjMTUuNjk2LTE1LjY4Nyw0MS4xMjctMTUuNjg3LDU2LjgyOSwwbDEwNS41NjMsMTA1LjU1NEwyNzkuNzIxLDExLjc2N2MxNS43MDUtMTUuNjg3LDQxLjEzOS0xNS42ODcsNTYuODMyLDBDMzUyLjI1OCwyNy40NjYsMzUyLjI1OCw1Mi45MTIsMzM2LjU1OSw2OC42MTF6Ii8+PC9nPjwvc3ZnPg==");background-size:contain;background-repeat:no-repeat;background-position:center;height:12px;width:12px}#onetrust-banner-sdk .powered-by-logo,#onetrust-banner-sdk .ot-pc-footer-logo a,#onetrust-pc-sdk .powered-by-logo,#onetrust-pc-sdk .ot-pc-footer-logo a,#ot-sync-ntfy .powered-by-logo,#ot-sync-ntfy .ot-pc-footer-logo a{background-size:contain;background-repeat:no-repeat;background-position:center;height:25px;width:152px;display:block}#onetrust-banner-sdk h3 *,#onetrust-banner-sdk h4 *,#onetrust-banner-sdk h6 *,#onetrust-banner-sdk button *,#onetrust-banner-sdk a[data-parent-id] *,#onetrust-pc-sdk h3 *,#onetrust-pc-sdk h4 *,#onetrust-pc-sdk h6 *,#onetrust-pc-sdk button *,#onetrust-pc-sdk a[data-parent-id] *,#ot-sync-ntfy h3 *,#ot-sync-ntfy h4 *,#ot-sync-ntfy h6 *,#ot-sync-ntfy button *,#ot-sync-ntfy a[data-parent-id] *{font-size:inherit;font-weight:inherit;color:inherit}#onetrust-banner-sdk .ot-hide,#onetrust-pc-sdk .ot-hide,#ot-sync-ntfy .ot-hide{display:none !important}#onetrust-pc-sdk .ot-sdk-row .ot-sdk-column{padding:0}#onetrust-pc-sdk .ot-sdk-container{padding-right:0}#onetrust-pc-sdk .ot-sdk-row{flex-direction:initial;width:100%}#onetrust-pc-sdk [type="checkbox"]:checked,#onetrust-pc-sdk [type="checkbox"]:not(:checked){pointer-events:initial}#onetrust-pc-sdk [type="checkbox"]:disabled+label::before,#onetrust-pc-sdk [type="checkbox"]:disabled+label:after,#onetrust-pc-sdk [type="checkbox"]:disabled+label{pointer-events:none;opacity:0.7}#onetrust-pc-sdk #vendor-list-content{transform:translate3d(0, 0, 0)}#onetrust-pc-sdk li input[type="checkbox"]{z-index:1}#onetrust-pc-sdk li .ot-checkbox label{z-index:2}#onetrust-pc-sdk li .ot-checkbox input[type="checkbox"]{height:auto;width:auto}#onetrust-pc-sdk li .host-title a,#onetrust-pc-sdk li .ot-host-name a,#onetrust-pc-sdk li .accordion-text,#onetrust-pc-sdk li .ot-acc-txt{z-index:2;position:relative}#onetrust-pc-sdk input{margin:3px 0.1ex}#onetrust-pc-sdk .pc-logo,#onetrust-pc-sdk .ot-pc-logo{height:60px;width:180px;background-position:center;background-size:contain;background-repeat:no-repeat}#onetrust-pc-sdk .screen-reader-only,#onetrust-pc-sdk .ot-scrn-rdr,.ot-sdk-cookie-policy .screen-reader-only,.ot-sdk-cookie-policy .ot-scrn-rdr{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}#onetrust-pc-sdk.ot-fade-in,.onetrust-pc-dark-filter.ot-fade-in,#onetrust-banner-sdk.ot-fade-in{animation-name:onetrust-fade-in;animation-duration:400ms;animation-timing-function:ease-in-out}#onetrust-pc-sdk.ot-hide{display:none !important}.onetrust-pc-dark-filter.ot-hide{display:none !important}#ot-sdk-btn.ot-sdk-show-settings,#ot-sdk-btn.optanon-show-settings{color:#68b631;border:1px solid #68b631;height:auto;white-space:normal;word-wrap:break-word;padding:0.8em 2em;font-size:0.8em;line-height:1.2;cursor:pointer;-moz-transition:0.1s ease;-o-transition:0.1s ease;-webkit-transition:1s ease;transition:0.1s ease}#ot-sdk-btn.ot-sdk-show-settings:hover,#ot-sdk-btn.optanon-show-settings:hover{color:#fff;background-color:#68b631}.onetrust-pc-dark-filter{background:rgba(0,0,0,0.5);z-index:2147483646;width:100%;height:100%;overflow:hidden;position:fixed;top:0;bottom:0;left:0}@keyframes onetrust-fade-in{0%{opacity:0}100%{opacity:1}}.ot-cookie-label{text-decoration:underline}@media only screen and (min-width: 426px) and (max-width: 896px) and (orientation: landscape){#onetrust-pc-sdk p{font-size:0.75em}}#onetrust-banner-sdk .banner-option-input:focus+label{outline:1px solid #000;outline-style:auto}.category-vendors-list-handler+a:focus,.category-vendors-list-handler+a:focus-visible{outline:2px solid #000}
+#onetrust-banner-sdk,#onetrust-pc-sdk,#ot-sdk-cookie-policy,#ot-sync-ntfy{font-size:16px}#onetrust-banner-sdk *,#onetrust-banner-sdk ::after,#onetrust-banner-sdk ::before,#onetrust-pc-sdk *,#onetrust-pc-sdk ::after,#onetrust-pc-sdk ::before,#ot-sdk-cookie-policy *,#ot-sdk-cookie-policy ::after,#ot-sdk-cookie-policy ::before,#ot-sync-ntfy *,#ot-sync-ntfy ::after,#ot-sync-ntfy ::before{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}#onetrust-banner-sdk div,#onetrust-banner-sdk span,#onetrust-banner-sdk h1,#onetrust-banner-sdk h2,#onetrust-banner-sdk h3,#onetrust-banner-sdk h4,#onetrust-banner-sdk h5,#onetrust-banner-sdk h6,#onetrust-banner-sdk p,#onetrust-banner-sdk img,#onetrust-banner-sdk svg,#onetrust-banner-sdk button,#onetrust-banner-sdk section,#onetrust-banner-sdk a,#onetrust-banner-sdk label,#onetrust-banner-sdk input,#onetrust-banner-sdk ul,#onetrust-banner-sdk li,#onetrust-banner-sdk nav,#onetrust-banner-sdk table,#onetrust-banner-sdk thead,#onetrust-banner-sdk tr,#onetrust-banner-sdk td,#onetrust-banner-sdk tbody,#onetrust-banner-sdk .ot-main-content,#onetrust-banner-sdk .ot-toggle,#onetrust-banner-sdk #ot-content,#onetrust-banner-sdk #ot-pc-content,#onetrust-banner-sdk .checkbox,#onetrust-pc-sdk div,#onetrust-pc-sdk span,#onetrust-pc-sdk h1,#onetrust-pc-sdk h2,#onetrust-pc-sdk h3,#onetrust-pc-sdk h4,#onetrust-pc-sdk h5,#onetrust-pc-sdk h6,#onetrust-pc-sdk p,#onetrust-pc-sdk img,#onetrust-pc-sdk svg,#onetrust-pc-sdk button,#onetrust-pc-sdk section,#onetrust-pc-sdk a,#onetrust-pc-sdk label,#onetrust-pc-sdk input,#onetrust-pc-sdk ul,#onetrust-pc-sdk li,#onetrust-pc-sdk nav,#onetrust-pc-sdk table,#onetrust-pc-sdk thead,#onetrust-pc-sdk tr,#onetrust-pc-sdk td,#onetrust-pc-sdk tbody,#onetrust-pc-sdk .ot-main-content,#onetrust-pc-sdk .ot-toggle,#onetrust-pc-sdk #ot-content,#onetrust-pc-sdk #ot-pc-content,#onetrust-pc-sdk .checkbox,#ot-sdk-cookie-policy div,#ot-sdk-cookie-policy span,#ot-sdk-cookie-policy h1,#ot-sdk-cookie-policy h2,#ot-sdk-cookie-policy h3,#ot-sdk-cookie-policy h4,#ot-sdk-cookie-policy h5,#ot-sdk-cookie-policy h6,#ot-sdk-cookie-policy p,#ot-sdk-cookie-policy img,#ot-sdk-cookie-policy svg,#ot-sdk-cookie-policy button,#ot-sdk-cookie-policy section,#ot-sdk-cookie-policy a,#ot-sdk-cookie-policy label,#ot-sdk-cookie-policy input,#ot-sdk-cookie-policy ul,#ot-sdk-cookie-policy li,#ot-sdk-cookie-policy nav,#ot-sdk-cookie-policy table,#ot-sdk-cookie-policy thead,#ot-sdk-cookie-policy tr,#ot-sdk-cookie-policy td,#ot-sdk-cookie-policy tbody,#ot-sdk-cookie-policy .ot-main-content,#ot-sdk-cookie-policy .ot-toggle,#ot-sdk-cookie-policy #ot-content,#ot-sdk-cookie-policy #ot-pc-content,#ot-sdk-cookie-policy .checkbox,#ot-sync-ntfy div,#ot-sync-ntfy span,#ot-sync-ntfy h1,#ot-sync-ntfy h2,#ot-sync-ntfy h3,#ot-sync-ntfy h4,#ot-sync-ntfy h5,#ot-sync-ntfy h6,#ot-sync-ntfy p,#ot-sync-ntfy img,#ot-sync-ntfy svg,#ot-sync-ntfy button,#ot-sync-ntfy section,#ot-sync-ntfy a,#ot-sync-ntfy label,#ot-sync-ntfy input,#ot-sync-ntfy ul,#ot-sync-ntfy li,#ot-sync-ntfy nav,#ot-sync-ntfy table,#ot-sync-ntfy thead,#ot-sync-ntfy tr,#ot-sync-ntfy td,#ot-sync-ntfy tbody,#ot-sync-ntfy .ot-main-content,#ot-sync-ntfy .ot-toggle,#ot-sync-ntfy #ot-content,#ot-sync-ntfy #ot-pc-content,#ot-sync-ntfy .checkbox{font-family:inherit;font-weight:normal;-webkit-font-smoothing:auto;letter-spacing:normal;line-height:normal;padding:0;margin:0;height:auto;min-height:0;max-height:none;width:auto;min-width:0;max-width:none;border-radius:0;border:none;clear:none;float:none;position:static;bottom:auto;left:auto;right:auto;top:auto;text-align:left;text-decoration:none;text-indent:0;text-shadow:none;text-transform:none;white-space:normal;background:none;overflow:visible;vertical-align:baseline;visibility:visible;z-index:auto;box-shadow:none}#onetrust-banner-sdk label:before,#onetrust-banner-sdk label:after,#onetrust-banner-sdk .checkbox:after,#onetrust-banner-sdk .checkbox:before,#onetrust-pc-sdk label:before,#onetrust-pc-sdk label:after,#onetrust-pc-sdk .checkbox:after,#onetrust-pc-sdk .checkbox:before,#ot-sdk-cookie-policy label:before,#ot-sdk-cookie-policy label:after,#ot-sdk-cookie-policy .checkbox:after,#ot-sdk-cookie-policy .checkbox:before,#ot-sync-ntfy label:before,#ot-sync-ntfy label:after,#ot-sync-ntfy .checkbox:after,#ot-sync-ntfy .checkbox:before{content:"";content:none}
+#onetrust-banner-sdk .ot-sdk-container,#onetrust-pc-sdk .ot-sdk-container,#ot-sdk-cookie-policy .ot-sdk-container{position:relative;width:100%;max-width:100%;margin:0 auto;padding:0 20px;box-sizing:border-box}#onetrust-banner-sdk .ot-sdk-column,#onetrust-banner-sdk .ot-sdk-columns,#onetrust-pc-sdk .ot-sdk-column,#onetrust-pc-sdk .ot-sdk-columns,#ot-sdk-cookie-policy .ot-sdk-column,#ot-sdk-cookie-policy .ot-sdk-columns{width:100%;float:left;box-sizing:border-box;padding:0;display:initial}@media (min-width: 400px){#onetrust-banner-sdk .ot-sdk-container,#onetrust-pc-sdk .ot-sdk-container,#ot-sdk-cookie-policy .ot-sdk-container{width:90%;padding:0}}@media (min-width: 550px){#onetrust-banner-sdk .ot-sdk-container,#onetrust-pc-sdk .ot-sdk-container,#ot-sdk-cookie-policy .ot-sdk-container{width:100%}#onetrust-banner-sdk .ot-sdk-column,#onetrust-banner-sdk .ot-sdk-columns,#onetrust-pc-sdk .ot-sdk-column,#onetrust-pc-sdk .ot-sdk-columns,#ot-sdk-cookie-policy .ot-sdk-column,#ot-sdk-cookie-policy .ot-sdk-columns{margin-left:4%}#onetrust-banner-sdk .ot-sdk-column:first-child,#onetrust-banner-sdk .ot-sdk-columns:first-child,#onetrust-pc-sdk .ot-sdk-column:first-child,#onetrust-pc-sdk .ot-sdk-columns:first-child,#ot-sdk-cookie-policy .ot-sdk-column:first-child,#ot-sdk-cookie-policy .ot-sdk-columns:first-child{margin-left:0}#onetrust-banner-sdk .ot-sdk-two.ot-sdk-columns,#onetrust-pc-sdk .ot-sdk-two.ot-sdk-columns,#ot-sdk-cookie-policy .ot-sdk-two.ot-sdk-columns{width:13.3333333333%}#onetrust-banner-sdk .ot-sdk-three.ot-sdk-columns,#onetrust-pc-sdk .ot-sdk-three.ot-sdk-columns,#ot-sdk-cookie-policy .ot-sdk-three.ot-sdk-columns{width:22%}#onetrust-banner-sdk .ot-sdk-four.ot-sdk-columns,#onetrust-pc-sdk .ot-sdk-four.ot-sdk-columns,#ot-sdk-cookie-policy .ot-sdk-four.ot-sdk-columns{width:30.6666666667%}#onetrust-banner-sdk .ot-sdk-eight.ot-sdk-columns,#onetrust-pc-sdk .ot-sdk-eight.ot-sdk-columns,#ot-sdk-cookie-policy .ot-sdk-eight.ot-sdk-columns{width:65.3333333333%}#onetrust-banner-sdk .ot-sdk-nine.ot-sdk-columns,#onetrust-pc-sdk .ot-sdk-nine.ot-sdk-columns,#ot-sdk-cookie-policy .ot-sdk-nine.ot-sdk-columns{width:74%}#onetrust-banner-sdk .ot-sdk-ten.ot-sdk-columns,#onetrust-pc-sdk .ot-sdk-ten.ot-sdk-columns,#ot-sdk-cookie-policy .ot-sdk-ten.ot-sdk-columns{width:82.6666666667%}#onetrust-banner-sdk .ot-sdk-eleven.ot-sdk-columns,#onetrust-pc-sdk .ot-sdk-eleven.ot-sdk-columns,#ot-sdk-cookie-policy .ot-sdk-eleven.ot-sdk-columns{width:91.3333333333%}#onetrust-banner-sdk .ot-sdk-twelve.ot-sdk-columns,#onetrust-pc-sdk .ot-sdk-twelve.ot-sdk-columns,#ot-sdk-cookie-policy .ot-sdk-twelve.ot-sdk-columns{width:100%;margin-left:0}}#onetrust-banner-sdk h1,#onetrust-banner-sdk h2,#onetrust-banner-sdk h3,#onetrust-banner-sdk h4,#onetrust-banner-sdk h5,#onetrust-banner-sdk h6,#onetrust-pc-sdk h1,#onetrust-pc-sdk h2,#onetrust-pc-sdk h3,#onetrust-pc-sdk h4,#onetrust-pc-sdk h5,#onetrust-pc-sdk h6,#ot-sdk-cookie-policy h1,#ot-sdk-cookie-policy h2,#ot-sdk-cookie-policy h3,#ot-sdk-cookie-policy h4,#ot-sdk-cookie-policy h5,#ot-sdk-cookie-policy h6{margin-top:0;font-weight:600;font-family:inherit}#onetrust-banner-sdk h1,#onetrust-pc-sdk h1,#ot-sdk-cookie-policy h1{font-size:1.5rem;line-height:1.2}#onetrust-banner-sdk h2,#onetrust-pc-sdk h2,#ot-sdk-cookie-policy h2{font-size:1.5rem;line-height:1.25}#onetrust-banner-sdk h3,#onetrust-pc-sdk h3,#ot-sdk-cookie-policy h3{font-size:1.5rem;line-height:1.3}#onetrust-banner-sdk h4,#onetrust-pc-sdk h4,#ot-sdk-cookie-policy h4{font-size:1.5rem;line-height:1.35}#onetrust-banner-sdk h5,#onetrust-pc-sdk h5,#ot-sdk-cookie-policy h5{font-size:1.5rem;line-height:1.5}#onetrust-banner-sdk h6,#onetrust-pc-sdk h6,#ot-sdk-cookie-policy h6{font-size:1.5rem;line-height:1.6}@media (min-width: 550px){#onetrust-banner-sdk h1,#onetrust-pc-sdk h1,#ot-sdk-cookie-policy h1{font-size:1.5rem}#onetrust-banner-sdk h2,#onetrust-pc-sdk h2,#ot-sdk-cookie-policy h2{font-size:1.5rem}#onetrust-banner-sdk h3,#onetrust-pc-sdk h3,#ot-sdk-cookie-policy h3{font-size:1.5rem}#onetrust-banner-sdk h4,#onetrust-pc-sdk h4,#ot-sdk-cookie-policy h4{font-size:1.5rem}#onetrust-banner-sdk h5,#onetrust-pc-sdk h5,#ot-sdk-cookie-policy h5{font-size:1.5rem}#onetrust-banner-sdk h6,#onetrust-pc-sdk h6,#ot-sdk-cookie-policy h6{font-size:1.5rem}}#onetrust-banner-sdk p,#onetrust-pc-sdk p,#ot-sdk-cookie-policy p{margin:0 0 1em 0;font-family:inherit;line-height:normal}#onetrust-banner-sdk a,#onetrust-pc-sdk a,#ot-sdk-cookie-policy a{color:#565656;text-decoration:underline}#onetrust-banner-sdk a:hover,#onetrust-pc-sdk a:hover,#ot-sdk-cookie-policy a:hover{color:#565656;text-decoration:none}#onetrust-banner-sdk .ot-sdk-button,#onetrust-banner-sdk button,#onetrust-pc-sdk .ot-sdk-button,#onetrust-pc-sdk button,#ot-sdk-cookie-policy .ot-sdk-button,#ot-sdk-cookie-policy button{margin-bottom:1rem;font-family:inherit}#onetrust-banner-sdk .ot-sdk-button,#onetrust-banner-sdk button,#onetrust-pc-sdk .ot-sdk-button,#onetrust-pc-sdk button,#ot-sdk-cookie-policy .ot-sdk-button,#ot-sdk-cookie-policy button{display:inline-block;height:38px;padding:0 30px;color:#555;text-align:center;font-size:0.9em;font-weight:400;line-height:38px;letter-spacing:0.01em;text-decoration:none;white-space:nowrap;background-color:transparent;border-radius:2px;border:1px solid #bbb;cursor:pointer;box-sizing:border-box}#onetrust-banner-sdk .ot-sdk-button:hover,#onetrust-banner-sdk :not(.ot-leg-btn-container)>button:hover,#onetrust-banner-sdk :not(.ot-leg-btn-container)>button:focus,#onetrust-pc-sdk .ot-sdk-button:hover,#onetrust-pc-sdk :not(.ot-leg-btn-container)>button:hover,#onetrust-pc-sdk :not(.ot-leg-btn-container)>button:focus,#ot-sdk-cookie-policy .ot-sdk-button:hover,#ot-sdk-cookie-policy :not(.ot-leg-btn-container)>button:hover,#ot-sdk-cookie-policy :not(.ot-leg-btn-container)>button:focus{color:#333;border-color:#888;opacity:0.7}#onetrust-banner-sdk .ot-sdk-button:focus,#onetrust-banner-sdk :not(.ot-leg-btn-container)>button:focus,#onetrust-pc-sdk .ot-sdk-button:focus,#onetrust-pc-sdk :not(.ot-leg-btn-container)>button:focus,#ot-sdk-cookie-policy .ot-sdk-button:focus,#ot-sdk-cookie-policy :not(.ot-leg-btn-container)>button:focus{outline:2px solid #000}#onetrust-banner-sdk .ot-sdk-button.ot-sdk-button-primary,#onetrust-banner-sdk button.ot-sdk-button-primary,#onetrust-banner-sdk input[type="submit"].ot-sdk-button-primary,#onetrust-banner-sdk input[type="reset"].ot-sdk-button-primary,#onetrust-banner-sdk input[type="button"].ot-sdk-button-primary,#onetrust-pc-sdk .ot-sdk-button.ot-sdk-button-primary,#onetrust-pc-sdk button.ot-sdk-button-primary,#onetrust-pc-sdk input[type="submit"].ot-sdk-button-primary,#onetrust-pc-sdk input[type="reset"].ot-sdk-button-primary,#onetrust-pc-sdk input[type="button"].ot-sdk-button-primary,#ot-sdk-cookie-policy .ot-sdk-button.ot-sdk-button-primary,#ot-sdk-cookie-policy button.ot-sdk-button-primary,#ot-sdk-cookie-policy input[type="submit"].ot-sdk-button-primary,#ot-sdk-cookie-policy input[type="reset"].ot-sdk-button-primary,#ot-sdk-cookie-policy input[type="button"].ot-sdk-button-primary{color:#fff;background-color:#33c3f0;border-color:#33c3f0}#onetrust-banner-sdk .ot-sdk-button.ot-sdk-button-primary:hover,#onetrust-banner-sdk button.ot-sdk-button-primary:hover,#onetrust-banner-sdk input[type="submit"].ot-sdk-button-primary:hover,#onetrust-banner-sdk input[type="reset"].ot-sdk-button-primary:hover,#onetrust-banner-sdk input[type="button"].ot-sdk-button-primary:hover,#onetrust-banner-sdk .ot-sdk-button.ot-sdk-button-primary:focus,#onetrust-banner-sdk button.ot-sdk-button-primary:focus,#onetrust-banner-sdk input[type="submit"].ot-sdk-button-primary:focus,#onetrust-banner-sdk input[type="reset"].ot-sdk-button-primary:focus,#onetrust-banner-sdk input[type="button"].ot-sdk-button-primary:focus,#onetrust-pc-sdk .ot-sdk-button.ot-sdk-button-primary:hover,#onetrust-pc-sdk button.ot-sdk-button-primary:hover,#onetrust-pc-sdk input[type="submit"].ot-sdk-button-primary:hover,#onetrust-pc-sdk input[type="reset"].ot-sdk-button-primary:hover,#onetrust-pc-sdk input[type="button"].ot-sdk-button-primary:hover,#onetrust-pc-sdk .ot-sdk-button.ot-sdk-button-primary:focus,#onetrust-pc-sdk button.ot-sdk-button-primary:focus,#onetrust-pc-sdk input[type="submit"].ot-sdk-button-primary:focus,#onetrust-pc-sdk input[type="reset"].ot-sdk-button-primary:focus,#onetrust-pc-sdk input[type="button"].ot-sdk-button-primary:focus,#ot-sdk-cookie-policy .ot-sdk-button.ot-sdk-button-primary:hover,#ot-sdk-cookie-policy button.ot-sdk-button-primary:hover,#ot-sdk-cookie-policy input[type="submit"].ot-sdk-button-primary:hover,#ot-sdk-cookie-policy input[type="reset"].ot-sdk-button-primary:hover,#ot-sdk-cookie-policy input[type="button"].ot-sdk-button-primary:hover,#ot-sdk-cookie-policy .ot-sdk-button.ot-sdk-button-primary:focus,#ot-sdk-cookie-policy button.ot-sdk-button-primary:focus,#ot-sdk-cookie-policy input[type="submit"].ot-sdk-button-primary:focus,#ot-sdk-cookie-policy input[type="reset"].ot-sdk-button-primary:focus,#ot-sdk-cookie-policy input[type="button"].ot-sdk-button-primary:focus{color:#fff;background-color:#1eaedb;border-color:#1eaedb}#onetrust-banner-sdk input[type="text"],#onetrust-pc-sdk input[type="text"],#ot-sdk-cookie-policy input[type="text"]{height:38px;padding:6px 10px;background-color:#fff;border:1px solid #d1d1d1;border-radius:4px;box-shadow:none;box-sizing:border-box}#onetrust-banner-sdk input[type="text"],#onetrust-pc-sdk input[type="text"],#ot-sdk-cookie-policy input[type="text"]{-webkit-appearance:none;-moz-appearance:none;appearance:none}#onetrust-banner-sdk input[type="text"]:focus,#onetrust-pc-sdk input[type="text"]:focus,#ot-sdk-cookie-policy input[type="text"]:focus{border:1px solid #000;outline:0}#onetrust-banner-sdk label,#onetrust-pc-sdk label,#ot-sdk-cookie-policy label{display:block;margin-bottom:0.5rem;font-weight:600}#onetrust-banner-sdk input[type="checkbox"],#onetrust-pc-sdk input[type="checkbox"],#ot-sdk-cookie-policy input[type="checkbox"]{display:inline}#onetrust-banner-sdk ul,#onetrust-pc-sdk ul,#ot-sdk-cookie-policy ul{list-style:circle inside}#onetrust-banner-sdk ul,#onetrust-pc-sdk ul,#ot-sdk-cookie-policy ul{padding-left:0;margin-top:0}#onetrust-banner-sdk ul ul,#onetrust-pc-sdk ul ul,#ot-sdk-cookie-policy ul ul{margin:1.5rem 0 1.5rem 3rem;font-size:90%}#onetrust-banner-sdk li,#onetrust-pc-sdk li,#ot-sdk-cookie-policy li{margin-bottom:1rem}#onetrust-banner-sdk th,#onetrust-banner-sdk td,#onetrust-pc-sdk th,#onetrust-pc-sdk td,#ot-sdk-cookie-policy th,#ot-sdk-cookie-policy td{padding:12px 15px;text-align:left;border-bottom:1px solid #e1e1e1}#onetrust-banner-sdk button,#onetrust-pc-sdk button,#ot-sdk-cookie-policy button{margin-bottom:1rem;font-family:inherit}#onetrust-banner-sdk .ot-sdk-container:after,#onetrust-banner-sdk .ot-sdk-row:after,#onetrust-pc-sdk .ot-sdk-container:after,#onetrust-pc-sdk .ot-sdk-row:after,#ot-sdk-cookie-policy .ot-sdk-container:after,#ot-sdk-cookie-policy .ot-sdk-row:after{content:"";display:table;clear:both}#onetrust-banner-sdk .ot-sdk-row,#onetrust-pc-sdk .ot-sdk-row,#ot-sdk-cookie-policy .ot-sdk-row{margin:0;max-width:none;display:block}
+#onetrust-banner-sdk{box-shadow:0 0 18px rgba(0,0,0,.2)}#onetrust-banner-sdk.otFlat{position:fixed;z-index:2147483645;bottom:0;right:0;left:0;background-color:#fff;max-height:90%;overflow-x:hidden;overflow-y:auto}#onetrust-banner-sdk.otFlat.top{top:0px;bottom:auto}#onetrust-banner-sdk.otRelFont{font-size:1rem}#onetrust-banner-sdk>.ot-sdk-container{overflow:hidden}#onetrust-banner-sdk::-webkit-scrollbar{width:11px}#onetrust-banner-sdk::-webkit-scrollbar-thumb{border-radius:10px;background:#c1c1c1}#onetrust-banner-sdk{scrollbar-arrow-color:#c1c1c1;scrollbar-darkshadow-color:#c1c1c1;scrollbar-face-color:#c1c1c1;scrollbar-shadow-color:#c1c1c1}#onetrust-banner-sdk #onetrust-policy{margin:1.25em 0 .625em 2em;overflow:hidden}#onetrust-banner-sdk #onetrust-policy .ot-gv-list-handler{float:left;font-size:.82em;padding:0;margin-bottom:0;border:0;line-height:normal;height:auto;width:auto}#onetrust-banner-sdk #onetrust-policy-title{font-size:1.2em;line-height:1.3;margin-bottom:10px}#onetrust-banner-sdk #onetrust-policy-text{clear:both;text-align:left;font-size:.88em;line-height:1.4}#onetrust-banner-sdk #onetrust-policy-text *{font-size:inherit;line-height:inherit}#onetrust-banner-sdk #onetrust-policy-text a{font-weight:bold;margin-left:5px}#onetrust-banner-sdk #onetrust-policy-title,#onetrust-banner-sdk #onetrust-policy-text{color:dimgray;float:left}#onetrust-banner-sdk #onetrust-button-group-parent{min-height:1px;text-align:center}#onetrust-banner-sdk #onetrust-button-group{display:inline-block}#onetrust-banner-sdk #onetrust-accept-btn-handler,#onetrust-banner-sdk #onetrust-reject-all-handler,#onetrust-banner-sdk #onetrust-pc-btn-handler{background-color:#68b631;color:#fff;border-color:#68b631;margin-right:1em;min-width:125px;height:auto;white-space:normal;word-break:break-word;word-wrap:break-word;padding:12px 10px;line-height:1.2;font-size:.813em;font-weight:600}#onetrust-banner-sdk #onetrust-pc-btn-handler.cookie-setting-link{background-color:#fff;border:none;color:#68b631;text-decoration:underline;padding-left:0;padding-right:0}#onetrust-banner-sdk .onetrust-close-btn-ui{width:44px;height:44px;background-size:12px;border:none;position:relative;margin:auto;padding:0}#onetrust-banner-sdk .banner_logo{display:none}#onetrust-banner-sdk .ot-b-addl-desc{clear:both;float:left;display:block}#onetrust-banner-sdk #banner-options{float:left;display:table;margin-right:0;margin-left:1em;width:calc(100% - 1em)}#onetrust-banner-sdk .banner-option-input{cursor:pointer;width:auto;height:auto;border:none;padding:0;padding-right:3px;margin:0 0 10px;font-size:.82em;line-height:1.4}#onetrust-banner-sdk .banner-option-input *{pointer-events:none;font-size:inherit;line-height:inherit}#onetrust-banner-sdk .banner-option-input[aria-expanded=true]~.banner-option-details{display:block;height:auto}#onetrust-banner-sdk .banner-option-input[aria-expanded=true] .ot-arrow-container{transform:rotate(90deg)}#onetrust-banner-sdk .banner-option{margin-bottom:12px;margin-left:0;border:none;float:left;padding:0}#onetrust-banner-sdk .banner-option:first-child{padding-left:2px}#onetrust-banner-sdk .banner-option:not(:first-child){padding:0;border:none}#onetrust-banner-sdk .banner-option-header{cursor:pointer;display:inline-block}#onetrust-banner-sdk .banner-option-header :first-child{color:dimgray;font-weight:bold;float:left}#onetrust-banner-sdk .banner-option-header .ot-arrow-container{display:inline-block;border-top:6px solid transparent;border-bottom:6px solid transparent;border-left:6px solid dimgray;margin-left:10px;vertical-align:middle}#onetrust-banner-sdk .banner-option-details{display:none;font-size:.83em;line-height:1.5;padding:10px 0px 5px 10px;margin-right:10px;height:0px}#onetrust-banner-sdk .banner-option-details *{font-size:inherit;line-height:inherit;color:dimgray}#onetrust-banner-sdk .ot-arrow-container,#onetrust-banner-sdk .banner-option-details{transition:all 300ms ease-in 0s;-webkit-transition:all 300ms ease-in 0s;-moz-transition:all 300ms ease-in 0s;-o-transition:all 300ms ease-in 0s}#onetrust-banner-sdk .ot-dpd-container{float:left}#onetrust-banner-sdk .ot-dpd-title{margin-bottom:10px}#onetrust-banner-sdk .ot-dpd-title,#onetrust-banner-sdk .ot-dpd-desc{font-size:.88em;line-height:1.4;color:dimgray}#onetrust-banner-sdk .ot-dpd-title *,#onetrust-banner-sdk .ot-dpd-desc *{font-size:inherit;line-height:inherit}#onetrust-banner-sdk.ot-iab-2 #onetrust-policy-text *{margin-bottom:0}#onetrust-banner-sdk.ot-iab-2 .onetrust-vendors-list-handler{display:block;margin-left:0;margin-top:5px;clear:both;margin-bottom:0;padding:0;border:0;height:auto;width:auto}#onetrust-banner-sdk.ot-iab-2 #onetrust-button-group button{display:block}#onetrust-banner-sdk.ot-close-btn-link{padding-top:25px}#onetrust-banner-sdk.ot-close-btn-link #onetrust-close-btn-container{top:15px;transform:none;right:15px}#onetrust-banner-sdk.ot-close-btn-link #onetrust-close-btn-container button{padding:0;white-space:pre-wrap;border:none;height:auto;line-height:1.5;text-decoration:underline;font-size:.69em}#onetrust-banner-sdk #onetrust-policy-text,#onetrust-banner-sdk .ot-dpd-desc,#onetrust-banner-sdk .ot-b-addl-desc{font-size:.813em;line-height:1.5}#onetrust-banner-sdk .ot-dpd-desc{margin-bottom:10px}#onetrust-banner-sdk .ot-dpd-desc>.ot-b-addl-desc{margin-top:10px;margin-bottom:10px;font-size:1em}@media only screen and (max-width: 425px){#onetrust-banner-sdk #onetrust-close-btn-container{position:absolute;top:6px;right:2px}#onetrust-banner-sdk #onetrust-policy{margin-left:0;margin-top:3em}#onetrust-banner-sdk #onetrust-button-group{display:block}#onetrust-banner-sdk #onetrust-accept-btn-handler,#onetrust-banner-sdk #onetrust-reject-all-handler,#onetrust-banner-sdk #onetrust-pc-btn-handler{width:100%}#onetrust-banner-sdk .onetrust-close-btn-ui{top:auto;transform:none}#onetrust-banner-sdk #onetrust-policy-title{display:inline;float:none}#onetrust-banner-sdk #banner-options{margin:0;padding:0;width:100%}}@media only screen and (min-width: 426px)and (max-width: 896px){#onetrust-banner-sdk #onetrust-close-btn-container{position:absolute;top:0;right:0}#onetrust-banner-sdk #onetrust-policy{margin-left:1em;margin-right:1em}#onetrust-banner-sdk .onetrust-close-btn-ui{top:10px;right:10px}#onetrust-banner-sdk:not(.ot-iab-2) #onetrust-group-container{width:95%}#onetrust-banner-sdk.ot-iab-2 #onetrust-group-container{width:100%}#onetrust-banner-sdk #onetrust-button-group-parent{width:100%;position:relative;margin-left:0}#onetrust-banner-sdk #onetrust-button-group button{display:inline-block}#onetrust-banner-sdk #onetrust-button-group{margin-right:0;text-align:center}#onetrust-banner-sdk .has-reject-all-button #onetrust-pc-btn-handler{float:left}#onetrust-banner-sdk .has-reject-all-button #onetrust-reject-all-handler,#onetrust-banner-sdk .has-reject-all-button #onetrust-accept-btn-handler{float:right}#onetrust-banner-sdk .has-reject-all-button #onetrust-button-group{width:calc(100% - 2em);margin-right:0}#onetrust-banner-sdk .has-reject-all-button #onetrust-pc-btn-handler.cookie-setting-link{padding-left:0px;text-align:left}#onetrust-banner-sdk.ot-buttons-fw .ot-sdk-three button{width:100%;text-align:center}#onetrust-banner-sdk.ot-buttons-fw #onetrust-button-group-parent button{float:none}#onetrust-banner-sdk.ot-buttons-fw #onetrust-pc-btn-handler.cookie-setting-link{text-align:center}}@media only screen and (min-width: 550px){#onetrust-banner-sdk .banner-option:not(:first-child){border-left:1px solid #d8d8d8;padding-left:25px}}@media only screen and (min-width: 425px)and (max-width: 550px){#onetrust-banner-sdk.ot-iab-2 #onetrust-button-group,#onetrust-banner-sdk.ot-iab-2 #onetrust-policy,#onetrust-banner-sdk.ot-iab-2 .banner-option{width:100%}}@media only screen and (min-width: 769px){#onetrust-banner-sdk #onetrust-button-group{margin-right:30%}#onetrust-banner-sdk #banner-options{margin-left:2em;margin-right:5em;margin-bottom:1.25em;width:calc(100% - 7em)}}@media only screen and (min-width: 897px)and (max-width: 1023px){#onetrust-banner-sdk.vertical-align-content #onetrust-button-group-parent{position:absolute;top:50%;left:75%;transform:translateY(-50%)}#onetrust-banner-sdk #onetrust-close-btn-container{top:50%;margin:auto;transform:translate(-50%, -50%);position:absolute;padding:0;right:0}#onetrust-banner-sdk #onetrust-close-btn-container button{position:relative;margin:0;right:-22px;top:2px}}@media only screen and (min-width: 1024px){#onetrust-banner-sdk #onetrust-close-btn-container{top:50%;margin:auto;transform:translate(-50%, -50%);position:absolute;right:0}#onetrust-banner-sdk #onetrust-close-btn-container button{right:-12px}#onetrust-banner-sdk #onetrust-policy{margin-left:2em}#onetrust-banner-sdk.vertical-align-content #onetrust-button-group-parent{position:absolute;top:50%;left:60%;transform:translateY(-50%)}#onetrust-banner-sdk.ot-iab-2 #onetrust-policy-title{width:50%}#onetrust-banner-sdk.ot-iab-2 #onetrust-policy-text,#onetrust-banner-sdk.ot-iab-2 :not(.ot-dpd-desc)>.ot-b-addl-desc{margin-bottom:1em;width:50%;border-right:1px solid #d8d8d8;padding-right:1rem}#onetrust-banner-sdk.ot-iab-2 #onetrust-policy-text{margin-bottom:0;padding-bottom:1em}#onetrust-banner-sdk.ot-iab-2 :not(.ot-dpd-desc)>.ot-b-addl-desc{margin-bottom:0;padding-bottom:1em}#onetrust-banner-sdk.ot-iab-2 .ot-dpd-container{width:45%;padding-left:1rem;display:inline-block;float:none}#onetrust-banner-sdk.ot-iab-2 .ot-dpd-title{line-height:1.7}#onetrust-banner-sdk.ot-iab-2 #onetrust-button-group-parent{left:auto;right:4%;margin-left:0}#onetrust-banner-sdk.ot-iab-2 #onetrust-button-group button{display:block}#onetrust-banner-sdk:not(.ot-iab-2) #onetrust-button-group-parent{margin:auto;width:30%}#onetrust-banner-sdk:not(.ot-iab-2) #onetrust-group-container{width:60%}#onetrust-banner-sdk #onetrust-button-group{margin-right:auto}#onetrust-banner-sdk #onetrust-accept-btn-handler,#onetrust-banner-sdk #onetrust-reject-all-handler,#onetrust-banner-sdk #onetrust-pc-btn-handler{margin-top:1em}}@media only screen and (min-width: 890px){#onetrust-banner-sdk.ot-buttons-fw:not(.ot-iab-2) #onetrust-button-group-parent{padding-left:3%;padding-right:4%;margin-left:0}#onetrust-banner-sdk.ot-buttons-fw:not(.ot-iab-2) #onetrust-button-group{margin-right:0;margin-top:1.25em;width:100%}#onetrust-banner-sdk.ot-buttons-fw:not(.ot-iab-2) #onetrust-button-group button{width:100%;margin-bottom:5px;margin-top:5px}#onetrust-banner-sdk.ot-buttons-fw:not(.ot-iab-2) #onetrust-button-group button:last-of-type{margin-bottom:20px}}@media only screen and (min-width: 1280px){#onetrust-banner-sdk:not(.ot-iab-2) #onetrust-group-container{width:55%}#onetrust-banner-sdk:not(.ot-iab-2) #onetrust-button-group-parent{width:44%;padding-left:2%;padding-right:2%}#onetrust-banner-sdk:not(.ot-iab-2).vertical-align-content #onetrust-button-group-parent{position:absolute;left:55%}}
+        #onetrust-consent-sdk #onetrust-banner-sdk {background-color: #FFFFFF;}
+            #onetrust-consent-sdk #onetrust-policy-title,
+                    #onetrust-consent-sdk #onetrust-policy-text,
+                    #onetrust-consent-sdk .ot-b-addl-desc,
+                    #onetrust-consent-sdk .ot-dpd-desc,
+                    #onetrust-consent-sdk .ot-dpd-title,
+                    #onetrust-consent-sdk #onetrust-policy-text *:not(.onetrust-vendors-list-handler),
+                    #onetrust-consent-sdk .ot-dpd-desc *:not(.onetrust-vendors-list-handler),
+                    #onetrust-consent-sdk #onetrust-banner-sdk #banner-options *,
+                    #onetrust-banner-sdk .ot-cat-header {
+                        color: #696969;
+                    }
+            #onetrust-consent-sdk #onetrust-banner-sdk .banner-option-details {
+                    background-color: #E9E9E9;}
+             #onetrust-consent-sdk #onetrust-banner-sdk a[href],
+                    #onetrust-consent-sdk #onetrust-banner-sdk a[href] font,
+                    #onetrust-consent-sdk #onetrust-banner-sdk .ot-link-btn
+                        {
+                            color: #3860BE;
+                        }#onetrust-consent-sdk #onetrust-accept-btn-handler,
+                         #onetrust-banner-sdk #onetrust-reject-all-handler {
+                            background-color: #1371C3;border-color: #1371C3;
+                color: #FFFFFF;
+            }
+            #onetrust-consent-sdk #onetrust-banner-sdk *:focus,
+            #onetrust-consent-sdk #onetrust-banner-sdk:focus {
+               outline-color: #000000;
+               outline-width: 1px;
+            }
+            #onetrust-consent-sdk #onetrust-pc-btn-handler,
+            #onetrust-consent-sdk #onetrust-pc-btn-handler.cookie-setting-link {
+                color: #1371C3; border-color: #1371C3;
+                background-color: 
+                #FFFFFF;
+            }#onetrust-pc-sdk.otPcCenter{overflow:hidden;position:fixed;margin:0 auto;top:5%;right:0;left:0;width:40%;max-width:575px;min-width:575px;border-radius:2.5px;z-index:2147483647;background-color:#fff;-webkit-box-shadow:0px 2px 10px -3px #999;-moz-box-shadow:0px 2px 10px -3px #999;box-shadow:0px 2px 10px -3px #999}#onetrust-pc-sdk.otPcCenter[dir=rtl]{right:0;left:0}#onetrust-pc-sdk.otRelFont{font-size:1rem}#onetrust-pc-sdk #ot-addtl-venlst .ot-arw-cntr,#onetrust-pc-sdk #ot-addtl-venlst .ot-plus-minus,#onetrust-pc-sdk .ot-hide-tgl{visibility:hidden}#onetrust-pc-sdk #ot-addtl-venlst .ot-arw-cntr *,#onetrust-pc-sdk #ot-addtl-venlst .ot-plus-minus *,#onetrust-pc-sdk .ot-hide-tgl *{visibility:hidden}#onetrust-pc-sdk #ot-gn-venlst .ot-ven-item .ot-acc-hdr{min-height:40px}#onetrust-pc-sdk .ot-pc-header{height:39px;padding:10px 0 10px 30px;border-bottom:1px solid #e9e9e9}#onetrust-pc-sdk #ot-pc-title,#onetrust-pc-sdk #ot-category-title,#onetrust-pc-sdk .ot-cat-header,#onetrust-pc-sdk #ot-lst-title,#onetrust-pc-sdk .ot-ven-hdr .ot-ven-name,#onetrust-pc-sdk .ot-always-active{font-weight:bold;color:dimgray}#onetrust-pc-sdk .ot-cat-header{float:left;font-weight:600;font-size:.875em;line-height:1.5;max-width:90%;vertical-align:middle}#onetrust-pc-sdk .ot-always-active-group .ot-cat-header{width:55%;font-weight:700}#onetrust-pc-sdk .ot-cat-item p{clear:both;float:left;margin-top:10px;margin-bottom:5px;line-height:1.5;font-size:.812em;color:dimgray}#onetrust-pc-sdk .ot-close-icon{height:44px;width:44px;background-size:10px}#onetrust-pc-sdk #ot-pc-title{float:left;font-size:1em;line-height:1.5;margin-bottom:10px;margin-top:10px;width:100%}#onetrust-pc-sdk #accept-recommended-btn-handler{margin-right:10px;margin-bottom:25px;outline-offset:-1px}#onetrust-pc-sdk #ot-pc-desc{clear:both;width:100%;font-size:.812em;line-height:1.5;margin-bottom:25px}#onetrust-pc-sdk #ot-pc-desc a{margin-left:5px}#onetrust-pc-sdk #ot-pc-desc *{font-size:inherit;line-height:inherit}#onetrust-pc-sdk #ot-pc-desc ul li{padding:10px 0px}#onetrust-pc-sdk a{color:#656565;cursor:pointer}#onetrust-pc-sdk a:hover{color:#3860be}#onetrust-pc-sdk label{margin-bottom:0}#onetrust-pc-sdk #vdr-lst-dsc{font-size:.812em;line-height:1.5;padding:10px 15px 5px 15px}#onetrust-pc-sdk button{max-width:394px;padding:12px 30px;line-height:1;word-break:break-word;word-wrap:break-word;white-space:normal;font-weight:bold;height:auto}#onetrust-pc-sdk .ot-link-btn{padding:0;margin-bottom:0;border:0;font-weight:normal;line-height:normal;width:auto;height:auto}#onetrust-pc-sdk #ot-pc-content{position:absolute;overflow-y:scroll;padding-left:0px;padding-right:30px;top:60px;bottom:110px;margin:1px 3px 0 30px;width:calc(100% - 63px)}#onetrust-pc-sdk .ot-cat-grp .ot-always-active{float:right;clear:none;color:#3860be;margin:0;font-size:.813em;line-height:1.3}#onetrust-pc-sdk .ot-pc-scrollbar::-webkit-scrollbar-track{margin-right:20px}#onetrust-pc-sdk .ot-pc-scrollbar::-webkit-scrollbar{width:11px}#onetrust-pc-sdk .ot-pc-scrollbar::-webkit-scrollbar-thumb{border-radius:10px;background:#d8d8d8}#onetrust-pc-sdk input[type=checkbox]:focus+.ot-acc-hdr{outline:#000 1px solid}#onetrust-pc-sdk .ot-pc-scrollbar{scrollbar-arrow-color:#d8d8d8;scrollbar-darkshadow-color:#d8d8d8;scrollbar-face-color:#d8d8d8;scrollbar-shadow-color:#d8d8d8}#onetrust-pc-sdk .save-preference-btn-handler{margin-right:20px}#onetrust-pc-sdk .ot-pc-refuse-all-handler{margin-right:10px}#onetrust-pc-sdk #ot-pc-desc .privacy-notice-link{margin-left:0}#onetrust-pc-sdk .ot-subgrp-cntr{display:inline-block;clear:both;width:100%;padding-top:15px}#onetrust-pc-sdk .ot-switch+.ot-subgrp-cntr{padding-top:10px}#onetrust-pc-sdk ul.ot-subgrps{margin:0;font-size:initial}#onetrust-pc-sdk ul.ot-subgrps li p,#onetrust-pc-sdk ul.ot-subgrps li h5{font-size:.813em;line-height:1.4;color:dimgray}#onetrust-pc-sdk ul.ot-subgrps .ot-switch{min-height:auto}#onetrust-pc-sdk ul.ot-subgrps .ot-switch-nob{top:0}#onetrust-pc-sdk ul.ot-subgrps .ot-acc-hdr{display:inline-block;width:100%}#onetrust-pc-sdk ul.ot-subgrps .ot-acc-txt{margin:0}#onetrust-pc-sdk ul.ot-subgrps li{padding:0;border:none}#onetrust-pc-sdk ul.ot-subgrps li h5{position:relative;top:5px;font-weight:bold;margin-bottom:0;float:left}#onetrust-pc-sdk li.ot-subgrp{margin-left:20px;overflow:auto}#onetrust-pc-sdk li.ot-subgrp>h5{width:calc(100% - 100px)}#onetrust-pc-sdk .ot-cat-item p>ul,#onetrust-pc-sdk li.ot-subgrp p>ul{margin:0px;list-style:disc;margin-left:15px;font-size:inherit}#onetrust-pc-sdk .ot-cat-item p>ul li,#onetrust-pc-sdk li.ot-subgrp p>ul li{font-size:inherit;padding-top:10px;padding-left:0px;padding-right:0px;border:none}#onetrust-pc-sdk .ot-cat-item p>ul li:last-child,#onetrust-pc-sdk li.ot-subgrp p>ul li:last-child{padding-bottom:10px}#onetrust-pc-sdk .ot-pc-logo{height:40px;width:120px;display:inline-block}#onetrust-pc-sdk .ot-pc-footer{position:absolute;bottom:0px;width:100%;max-height:160px;border-top:1px solid #d8d8d8}#onetrust-pc-sdk.ot-ftr-stacked .ot-pc-refuse-all-handler{margin-bottom:0px}#onetrust-pc-sdk.ot-ftr-stacked #ot-pc-content{bottom:160px}#onetrust-pc-sdk.ot-ftr-stacked .ot-pc-footer button{width:100%;max-width:none}#onetrust-pc-sdk.ot-ftr-stacked .ot-btn-container{margin:0 30px;width:calc(100% - 60px);padding-right:0}#onetrust-pc-sdk .ot-pc-footer-logo{height:30px;width:100%;text-align:right;background:#f4f4f4}#onetrust-pc-sdk .ot-pc-footer-logo a{display:inline-block;margin-top:5px;margin-right:10px}#onetrust-pc-sdk[dir=rtl] .ot-pc-footer-logo{direction:rtl}#onetrust-pc-sdk[dir=rtl] .ot-pc-footer-logo a{margin-right:25px}#onetrust-pc-sdk .ot-tgl{float:right;position:relative;z-index:1}#onetrust-pc-sdk .ot-tgl input:checked+.ot-switch .ot-switch-nob{background-color:#cddcf2;border:1px solid #3860be}#onetrust-pc-sdk .ot-tgl input:checked+.ot-switch .ot-switch-nob:before{-webkit-transform:translateX(20px);-ms-transform:translateX(20px);transform:translateX(20px);background-color:#3860be;border-color:#3860be}#onetrust-pc-sdk .ot-tgl input:focus+.ot-switch{outline:#000 solid 1px}#onetrust-pc-sdk .ot-switch{position:relative;display:inline-block;width:45px;height:25px}#onetrust-pc-sdk .ot-switch-nob{position:absolute;cursor:pointer;top:0;left:0;right:0;bottom:0;background-color:#f2f1f1;border:1px solid #ddd;transition:all .2s ease-in 0s;-moz-transition:all .2s ease-in 0s;-o-transition:all .2s ease-in 0s;-webkit-transition:all .2s ease-in 0s;border-radius:20px}#onetrust-pc-sdk .ot-switch-nob:before{position:absolute;content:"";height:21px;width:21px;bottom:1px;background-color:#7d7d7d;-webkit-transition:.4s;transition:.4s;border-radius:20px}#onetrust-pc-sdk .ot-chkbox input:checked~label::before{background-color:#3860be}#onetrust-pc-sdk .ot-chkbox input+label::after{content:none;color:#fff}#onetrust-pc-sdk .ot-chkbox input:checked+label::after{content:""}#onetrust-pc-sdk .ot-chkbox input:focus+label::before{outline-style:solid;outline-width:2px;outline-style:auto}#onetrust-pc-sdk .ot-chkbox label{position:relative;display:inline-block;padding-left:30px;cursor:pointer;font-weight:500}#onetrust-pc-sdk .ot-chkbox label::before,#onetrust-pc-sdk .ot-chkbox label::after{position:absolute;content:"";display:inline-block;border-radius:3px}#onetrust-pc-sdk .ot-chkbox label::before{height:18px;width:18px;border:1px solid #3860be;left:0px;top:auto}#onetrust-pc-sdk .ot-chkbox label::after{height:5px;width:9px;border-left:3px solid;border-bottom:3px solid;transform:rotate(-45deg);-o-transform:rotate(-45deg);-ms-transform:rotate(-45deg);-webkit-transform:rotate(-45deg);left:4px;top:5px}#onetrust-pc-sdk .ot-label-txt{display:none}#onetrust-pc-sdk .ot-chkbox input,#onetrust-pc-sdk .ot-tgl input{position:absolute;opacity:0;width:0;height:0}#onetrust-pc-sdk .ot-arw-cntr{float:right;position:relative;pointer-events:none}#onetrust-pc-sdk .ot-arw-cntr .ot-arw{width:16px;height:16px;margin-left:5px;color:dimgray;display:inline-block;vertical-align:middle;-webkit-transition:all 150ms ease-in 0s;-moz-transition:all 150ms ease-in 0s;-o-transition:all 150ms ease-in 0s;transition:all 150ms ease-in 0s}#onetrust-pc-sdk input:checked~.ot-acc-hdr .ot-arw,#onetrust-pc-sdk button[aria-expanded=true]~.ot-acc-hdr .ot-arw-cntr svg{transform:rotate(90deg);-o-transform:rotate(90deg);-ms-transform:rotate(90deg);-webkit-transform:rotate(90deg)}#onetrust-pc-sdk input[type=checkbox]:focus+.ot-acc-hdr{outline:#000 1px solid}#onetrust-pc-sdk .ot-tgl-cntr,#onetrust-pc-sdk .ot-arw-cntr{display:inline-block}#onetrust-pc-sdk .ot-tgl-cntr{width:45px;float:right;margin-top:2px}#onetrust-pc-sdk #ot-lst-cnt .ot-tgl-cntr{margin-top:10px}#onetrust-pc-sdk .ot-always-active-subgroup{width:auto;padding-left:0px !important;top:3px;position:relative}#onetrust-pc-sdk .ot-label-status{padding-left:5px;font-size:.75em;display:none}#onetrust-pc-sdk .ot-arw-cntr{margin-top:-1px}#onetrust-pc-sdk .ot-arw-cntr svg{-webkit-transition:all 300ms ease-in 0s;-moz-transition:all 300ms ease-in 0s;-o-transition:all 300ms ease-in 0s;transition:all 300ms ease-in 0s;height:10px;width:10px}#onetrust-pc-sdk input:checked~.ot-acc-hdr .ot-arw{transform:rotate(90deg);-o-transform:rotate(90deg);-ms-transform:rotate(90deg);-webkit-transform:rotate(90deg)}#onetrust-pc-sdk .ot-arw{width:10px;margin-left:15px;transition:all 300ms ease-in 0s;-webkit-transition:all 300ms ease-in 0s;-moz-transition:all 300ms ease-in 0s;-o-transition:all 300ms ease-in 0s}#onetrust-pc-sdk .ot-vlst-cntr{margin-bottom:0}#onetrust-pc-sdk .ot-hlst-cntr{margin-top:5px;display:inline-block;width:100%}#onetrust-pc-sdk .category-vendors-list-handler,#onetrust-pc-sdk .category-vendors-list-handler+a,#onetrust-pc-sdk .category-host-list-handler{clear:both;color:#3860be;margin-left:0;font-size:.813em;text-decoration:none;float:left;overflow:hidden}#onetrust-pc-sdk .category-vendors-list-handler:hover,#onetrust-pc-sdk .category-vendors-list-handler+a:hover,#onetrust-pc-sdk .category-host-list-handler:hover{color:#1883fd}#onetrust-pc-sdk .category-vendors-list-handler+a{clear:none}#onetrust-pc-sdk .category-vendors-list-handler+a::after{content:"";height:15px;width:15px;background-repeat:no-repeat;margin-left:5px;float:right;background-image:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 511.626 511.627'%3E%3Cg fill='%231276CE'%3E%3Cpath d='M392.857 292.354h-18.274c-2.669 0-4.859.855-6.563 2.573-1.718 1.708-2.573 3.897-2.573 6.563v91.361c0 12.563-4.47 23.315-13.415 32.262-8.945 8.945-19.701 13.414-32.264 13.414H82.224c-12.562 0-23.317-4.469-32.264-13.414-8.945-8.946-13.417-19.698-13.417-32.262V155.31c0-12.562 4.471-23.313 13.417-32.259 8.947-8.947 19.702-13.418 32.264-13.418h200.994c2.669 0 4.859-.859 6.57-2.57 1.711-1.713 2.566-3.9 2.566-6.567V82.221c0-2.662-.855-4.853-2.566-6.563-1.711-1.713-3.901-2.568-6.57-2.568H82.224c-22.648 0-42.016 8.042-58.102 24.125C8.042 113.297 0 132.665 0 155.313v237.542c0 22.647 8.042 42.018 24.123 58.095 16.086 16.084 35.454 24.13 58.102 24.13h237.543c22.647 0 42.017-8.046 58.101-24.13 16.085-16.077 24.127-35.447 24.127-58.095v-91.358c0-2.669-.856-4.859-2.574-6.57-1.713-1.718-3.903-2.573-6.565-2.573z'/%3E%3Cpath d='M506.199 41.971c-3.617-3.617-7.905-5.424-12.85-5.424H347.171c-4.948 0-9.233 1.807-12.847 5.424-3.617 3.615-5.428 7.898-5.428 12.847s1.811 9.233 5.428 12.85l50.247 50.248-186.147 186.151c-1.906 1.903-2.856 4.093-2.856 6.563 0 2.479.953 4.668 2.856 6.571l32.548 32.544c1.903 1.903 4.093 2.852 6.567 2.852s4.665-.948 6.567-2.852l186.148-186.148 50.251 50.248c3.614 3.617 7.898 5.426 12.847 5.426s9.233-1.809 12.851-5.426c3.617-3.616 5.424-7.898 5.424-12.847V54.818c-.001-4.952-1.814-9.232-5.428-12.847z'/%3E%3C/g%3E%3C/svg%3E")}#onetrust-pc-sdk .back-btn-handler{font-size:1em;text-decoration:none}#onetrust-pc-sdk .back-btn-handler:hover{opacity:.6}#onetrust-pc-sdk #ot-lst-title h3{display:inline-block;word-break:break-word;word-wrap:break-word;margin-bottom:0;color:#656565;font-size:1em;font-weight:bold;margin-left:15px}#onetrust-pc-sdk #ot-lst-title{margin:10px 0 10px 0px;font-size:1em;text-align:left}#onetrust-pc-sdk #ot-pc-hdr{margin:0 0 0 30px;height:auto;width:auto}#onetrust-pc-sdk #ot-pc-hdr input::placeholder{color:#d4d4d4;font-style:italic}#onetrust-pc-sdk #vendor-search-handler{height:31px;width:100%;border-radius:50px;font-size:.8em;padding-right:35px;padding-left:15px;float:left;margin-left:15px}#onetrust-pc-sdk .ot-ven-name{display:block;width:auto;padding-right:5px}#onetrust-pc-sdk #ot-lst-cnt{overflow-y:auto;margin-left:20px;margin-right:7px;width:calc(100% - 27px);max-height:calc(100% - 80px);height:100%;transform:translate3d(0, 0, 0)}#onetrust-pc-sdk #ot-pc-lst{width:100%;bottom:100px;position:absolute;top:60px}#onetrust-pc-sdk #ot-pc-lst:not(.ot-enbl-chr) .ot-tgl-cntr .ot-arw-cntr,#onetrust-pc-sdk #ot-pc-lst:not(.ot-enbl-chr) .ot-tgl-cntr .ot-arw-cntr *{visibility:hidden}#onetrust-pc-sdk #ot-pc-lst .ot-tgl-cntr{right:12px;position:absolute}#onetrust-pc-sdk #ot-pc-lst .ot-arw-cntr{float:right;position:relative}#onetrust-pc-sdk #ot-pc-lst .ot-arw{margin-left:10px}#onetrust-pc-sdk #ot-pc-lst .ot-acc-hdr{overflow:hidden;cursor:pointer}#onetrust-pc-sdk .ot-vlst-cntr{overflow:hidden}#onetrust-pc-sdk #ot-sel-blk{overflow:hidden;width:100%;position:sticky;position:-webkit-sticky;top:0;z-index:3}#onetrust-pc-sdk #ot-back-arw{height:12px;width:12px}#onetrust-pc-sdk .ot-lst-subhdr{width:100%;display:inline-block}#onetrust-pc-sdk .ot-search-cntr{float:left;width:78%;position:relative}#onetrust-pc-sdk .ot-search-cntr>svg{width:30px;height:30px;position:absolute;float:left;right:-15px}#onetrust-pc-sdk .ot-fltr-cntr{float:right;right:50px;position:relative}#onetrust-pc-sdk #filter-btn-handler{background-color:#3860be;border-radius:17px;display:inline-block;position:relative;width:32px;height:32px;-moz-transition:.1s ease;-o-transition:.1s ease;-webkit-transition:1s ease;transition:.1s ease;padding:0;margin:0}#onetrust-pc-sdk #filter-btn-handler:hover{background-color:#3860be}#onetrust-pc-sdk #filter-btn-handler svg{width:12px;height:12px;margin:3px 10px 0 10px;display:block;position:static;right:auto;top:auto}#onetrust-pc-sdk .ot-ven-link{color:#3860be;text-decoration:none;font-weight:100;display:inline-block;padding-top:10px;transform:translate(0, 1%);-o-transform:translate(0, 1%);-ms-transform:translate(0, 1%);-webkit-transform:translate(0, 1%);position:relative;z-index:2}#onetrust-pc-sdk .ot-ven-link *{font-size:inherit}#onetrust-pc-sdk .ot-ven-link:hover{text-decoration:underline}#onetrust-pc-sdk .ot-ven-hdr{width:calc(100% - 160px);height:auto;float:left;word-break:break-word;word-wrap:break-word;vertical-align:middle;padding-bottom:3px}#onetrust-pc-sdk .ot-ven-link{letter-spacing:.03em;font-size:.75em;font-weight:400}#onetrust-pc-sdk .ot-ven-dets{border-radius:2px;background-color:#f8f8f8}#onetrust-pc-sdk .ot-ven-dets li:first-child p:first-child{border-top:none}#onetrust-pc-sdk .ot-ven-dets .ot-ven-disc:not(:first-child){border-top:1px solid #e9e9e9}#onetrust-pc-sdk .ot-ven-dets .ot-ven-disc:nth-child(n+3) p{display:inline-block}#onetrust-pc-sdk .ot-ven-dets .ot-ven-disc:nth-child(n+3) p:nth-of-type(odd){width:30%}#onetrust-pc-sdk .ot-ven-dets .ot-ven-disc:nth-child(n+3) p:nth-of-type(even){width:50%;word-break:break-word;word-wrap:break-word}#onetrust-pc-sdk .ot-ven-dets .ot-ven-disc p,#onetrust-pc-sdk .ot-ven-dets .ot-ven-disc h4{padding-top:5px;padding-bottom:5px;display:block}#onetrust-pc-sdk .ot-ven-dets .ot-ven-disc h4{display:inline-block}#onetrust-pc-sdk .ot-ven-dets p,#onetrust-pc-sdk .ot-ven-dets h4,#onetrust-pc-sdk .ot-ven-dets span{font-size:.69em;text-align:left;vertical-align:middle;word-break:break-word;word-wrap:break-word;margin:0;padding-bottom:10px;padding-left:15px;color:#2e3644}#onetrust-pc-sdk .ot-ven-dets h4{padding-top:5px}#onetrust-pc-sdk .ot-ven-dets span{color:dimgray;padding:0;vertical-align:baseline}#onetrust-pc-sdk .ot-ven-dets .ot-ven-pur h4{border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;padding-bottom:5px;margin-bottom:5px;font-weight:bold}#onetrust-pc-sdk #ot-host-lst .ot-sel-all{float:right;position:relative;margin-right:42px;top:10px}#onetrust-pc-sdk #ot-host-lst .ot-sel-all input[type=checkbox]{width:auto;height:auto}#onetrust-pc-sdk #ot-host-lst .ot-sel-all label{height:20px;width:20px;padding-left:0px}#onetrust-pc-sdk #ot-host-lst .ot-acc-txt{overflow:hidden;width:95%}#onetrust-pc-sdk .ot-host-hdr{position:relative;z-index:1;pointer-events:none;width:calc(100% - 125px);float:left}#onetrust-pc-sdk .ot-host-name,#onetrust-pc-sdk .ot-host-desc{display:inline-block;width:90%}#onetrust-pc-sdk .ot-host-name{pointer-events:none}#onetrust-pc-sdk .ot-host-hdr>a{text-decoration:underline;font-size:.82em;position:relative;z-index:2;float:left;margin-bottom:5px;pointer-events:initial}#onetrust-pc-sdk .ot-host-name+a{margin-top:5px}#onetrust-pc-sdk .ot-host-name,#onetrust-pc-sdk .ot-host-name a,#onetrust-pc-sdk .ot-host-desc,#onetrust-pc-sdk .ot-host-info{color:dimgray;word-break:break-word;word-wrap:break-word}#onetrust-pc-sdk .ot-host-name,#onetrust-pc-sdk .ot-host-name a{font-weight:bold;font-size:.82em;line-height:1.3}#onetrust-pc-sdk .ot-host-name a{font-size:1em}#onetrust-pc-sdk .ot-host-expand{margin-top:3px;margin-bottom:3px;clear:both;display:block;color:#3860be;font-size:.72em;font-weight:normal}#onetrust-pc-sdk .ot-host-expand *{font-size:inherit}#onetrust-pc-sdk .ot-host-desc,#onetrust-pc-sdk .ot-host-info{font-size:.688em;line-height:1.4;font-weight:normal}#onetrust-pc-sdk .ot-host-desc{margin-top:10px}#onetrust-pc-sdk .ot-host-opt{margin:0;font-size:inherit;display:inline-block;width:100%}#onetrust-pc-sdk .ot-host-opt li>div div{font-size:.8em;padding:5px 0}#onetrust-pc-sdk .ot-host-opt li>div div:nth-child(1){width:30%;float:left}#onetrust-pc-sdk .ot-host-opt li>div div:nth-child(2){width:70%;float:left;word-break:break-word;word-wrap:break-word}#onetrust-pc-sdk .ot-host-info{border:none;display:inline-block;width:calc(100% - 10px);padding:10px;margin-bottom:10px;background-color:#f8f8f8}#onetrust-pc-sdk .ot-host-info>div{overflow:auto}#onetrust-pc-sdk #no-results{text-align:center;margin-top:30px}#onetrust-pc-sdk #no-results p{font-size:1em;color:#2e3644;word-break:break-word;word-wrap:break-word}#onetrust-pc-sdk #no-results p span{font-weight:bold}#onetrust-pc-sdk #ot-fltr-modal{width:100%;height:auto;display:none;-moz-transition:.2s ease;-o-transition:.2s ease;-webkit-transition:2s ease;transition:.2s ease;overflow:hidden;opacity:1;right:0}#onetrust-pc-sdk #ot-fltr-modal .ot-label-txt{display:inline-block;font-size:.85em;color:dimgray}#onetrust-pc-sdk #ot-fltr-cnt{z-index:2147483646;background-color:#fff;position:absolute;height:90%;max-height:300px;width:325px;left:210px;margin-top:10px;margin-bottom:20px;padding-right:10px;border-radius:3px;-webkit-box-shadow:0px 0px 12px 2px #c7c5c7;-moz-box-shadow:0px 0px 12px 2px #c7c5c7;box-shadow:0px 0px 12px 2px #c7c5c7}#onetrust-pc-sdk .ot-fltr-scrlcnt{overflow-y:auto;overflow-x:hidden;clear:both;max-height:calc(100% - 60px)}#onetrust-pc-sdk #ot-anchor{border:12px solid transparent;display:none;position:absolute;z-index:2147483647;right:55px;top:75px;transform:rotate(45deg);-o-transform:rotate(45deg);-ms-transform:rotate(45deg);-webkit-transform:rotate(45deg);background-color:#fff;-webkit-box-shadow:-3px -3px 5px -2px #c7c5c7;-moz-box-shadow:-3px -3px 5px -2px #c7c5c7;box-shadow:-3px -3px 5px -2px #c7c5c7}#onetrust-pc-sdk .ot-fltr-btns{margin-left:15px}#onetrust-pc-sdk #filter-apply-handler{margin-right:15px}#onetrust-pc-sdk .ot-fltr-opt{margin-bottom:25px;margin-left:15px;width:75%;position:relative}#onetrust-pc-sdk .ot-fltr-opt p{display:inline-block;margin:0;font-size:.9em;color:#2e3644}#onetrust-pc-sdk .ot-chkbox label span{font-size:.85em;color:dimgray}#onetrust-pc-sdk .ot-chkbox input[type=checkbox]+label::after{content:none;color:#fff}#onetrust-pc-sdk .ot-chkbox input[type=checkbox]:checked+label::after{content:""}#onetrust-pc-sdk .ot-chkbox input[type=checkbox]:focus+label::before{outline-style:solid;outline-width:2px;outline-style:auto}#onetrust-pc-sdk #ot-selall-vencntr,#onetrust-pc-sdk #ot-selall-adtlvencntr,#onetrust-pc-sdk #ot-selall-hostcntr,#onetrust-pc-sdk #ot-selall-licntr,#onetrust-pc-sdk #ot-selall-gnvencntr{right:15px;position:relative;width:20px;height:20px;float:right}#onetrust-pc-sdk #ot-selall-vencntr label,#onetrust-pc-sdk #ot-selall-adtlvencntr label,#onetrust-pc-sdk #ot-selall-hostcntr label,#onetrust-pc-sdk #ot-selall-licntr label,#onetrust-pc-sdk #ot-selall-gnvencntr label{float:left;padding-left:0}#onetrust-pc-sdk #ot-ven-lst:first-child{border-top:1px solid #e2e2e2}#onetrust-pc-sdk ul{list-style:none;padding:0}#onetrust-pc-sdk ul li{position:relative;margin:0;padding:15px 15px 15px 10px;border-bottom:1px solid #e2e2e2}#onetrust-pc-sdk ul li h3{font-size:.75em;color:#656565;margin:0;display:inline-block;width:70%;height:auto;word-break:break-word;word-wrap:break-word}#onetrust-pc-sdk ul li p{margin:0;font-size:.7em}#onetrust-pc-sdk ul li input[type=checkbox]{position:absolute;cursor:pointer;width:100%;height:100%;opacity:0;margin:0;top:0;left:0}#onetrust-pc-sdk .ot-cat-item>button:focus,#onetrust-pc-sdk .ot-acc-cntr>button:focus,#onetrust-pc-sdk li>button:focus{outline:#000 solid 2px}#onetrust-pc-sdk .ot-cat-item>button,#onetrust-pc-sdk .ot-acc-cntr>button,#onetrust-pc-sdk li>button{position:absolute;cursor:pointer;width:100%;height:100%;margin:0;top:0;left:0;z-index:1;max-width:none;border:none}#onetrust-pc-sdk .ot-cat-item>button[aria-expanded=false]~.ot-acc-txt,#onetrust-pc-sdk .ot-acc-cntr>button[aria-expanded=false]~.ot-acc-txt,#onetrust-pc-sdk li>button[aria-expanded=false]~.ot-acc-txt{margin-top:0;max-height:0;opacity:0;overflow:hidden;width:100%;transition:.25s ease-out;display:none}#onetrust-pc-sdk .ot-cat-item>button[aria-expanded=true]~.ot-acc-txt,#onetrust-pc-sdk .ot-acc-cntr>button[aria-expanded=true]~.ot-acc-txt,#onetrust-pc-sdk li>button[aria-expanded=true]~.ot-acc-txt{transition:.1s ease-in;margin-top:10px;width:100%;overflow:auto;display:block}#onetrust-pc-sdk .ot-cat-item>button[aria-expanded=true]~.ot-acc-grpcntr,#onetrust-pc-sdk .ot-acc-cntr>button[aria-expanded=true]~.ot-acc-grpcntr,#onetrust-pc-sdk li>button[aria-expanded=true]~.ot-acc-grpcntr{width:auto;margin-top:0px;padding-bottom:10px}#onetrust-pc-sdk .ot-host-item>button:focus,#onetrust-pc-sdk .ot-ven-item>button:focus{outline:0;border:2px solid #000}#onetrust-pc-sdk .ot-hide-acc>button{pointer-events:none}#onetrust-pc-sdk .ot-hide-acc .ot-plus-minus>*,#onetrust-pc-sdk .ot-hide-acc .ot-arw-cntr>*{visibility:hidden}#onetrust-pc-sdk .ot-hide-acc .ot-acc-hdr{min-height:30px}#onetrust-pc-sdk.ot-addtl-vendors #ot-lst-cnt:not(.ot-host-cnt){padding-right:10px;width:calc(100% - 37px);margin-top:10px;max-height:calc(100% - 90px)}#onetrust-pc-sdk.ot-addtl-vendors #ot-lst-cnt:not(.ot-host-cnt) #ot-sel-blk{background-color:#f9f9fc;border:1px solid #e2e2e2;width:calc(100% - 2px);padding-bottom:5px;padding-top:5px}#onetrust-pc-sdk.ot-addtl-vendors #ot-lst-cnt:not(.ot-host-cnt) .ot-sel-all{padding-right:34px}#onetrust-pc-sdk.ot-addtl-vendors #ot-lst-cnt:not(.ot-host-cnt) .ot-sel-all-chkbox{width:auto}#onetrust-pc-sdk.ot-addtl-vendors #ot-lst-cnt:not(.ot-host-cnt) ul li{border:1px solid #e2e2e2;margin-bottom:10px}#onetrust-pc-sdk.ot-addtl-vendors #ot-lst-cnt:not(.ot-host-cnt) .ot-acc-cntr>.ot-acc-hdr{padding:10px 0 10px 15px}#onetrust-pc-sdk.ot-addtl-vendors .ot-sel-all-chkbox{float:right}#onetrust-pc-sdk.ot-addtl-vendors .ot-plus-minus~.ot-sel-all-chkbox{right:34px}#onetrust-pc-sdk.ot-addtl-vendors #ot-ven-lst:first-child{border-top:none}#onetrust-pc-sdk .ot-acc-cntr{position:relative;border-left:1px solid #e2e2e2;border-right:1px solid #e2e2e2;border-bottom:1px solid #e2e2e2}#onetrust-pc-sdk .ot-acc-cntr input{z-index:1}#onetrust-pc-sdk .ot-acc-cntr>.ot-acc-hdr{background-color:#f9f9fc;padding:5px 0 5px 15px;width:auto}#onetrust-pc-sdk .ot-acc-cntr>.ot-acc-hdr .ot-plus-minus{vertical-align:middle;top:auto}#onetrust-pc-sdk .ot-acc-cntr>.ot-acc-hdr .ot-arw-cntr{right:10px}#onetrust-pc-sdk .ot-acc-cntr>.ot-acc-hdr input{z-index:2}#onetrust-pc-sdk .ot-acc-cntr>input[type=checkbox]:checked~.ot-acc-hdr{border-bottom:1px solid #e2e2e2}#onetrust-pc-sdk .ot-acc-cntr>.ot-acc-txt{padding-left:10px;padding-right:10px}#onetrust-pc-sdk .ot-acc-cntr button[aria-expanded=true]~.ot-acc-txt{width:auto}#onetrust-pc-sdk .ot-acc-cntr .ot-addtl-venbox{display:none}#onetrust-pc-sdk .ot-vlst-cntr{margin-bottom:0;width:100%}#onetrust-pc-sdk .ot-vensec-title{font-size:.813em;vertical-align:middle;display:inline-block}#onetrust-pc-sdk .category-vendors-list-handler,#onetrust-pc-sdk .category-vendors-list-handler+a{margin-left:0;margin-top:10px}#onetrust-pc-sdk #ot-selall-vencntr.line-through label::after,#onetrust-pc-sdk #ot-selall-adtlvencntr.line-through label::after,#onetrust-pc-sdk #ot-selall-licntr.line-through label::after,#onetrust-pc-sdk #ot-selall-hostcntr.line-through label::after,#onetrust-pc-sdk #ot-selall-gnvencntr.line-through label::after{height:auto;border-left:0;transform:none;-o-transform:none;-ms-transform:none;-webkit-transform:none;left:5px;top:9px}#onetrust-pc-sdk #ot-category-title{float:left;padding-bottom:10px;font-size:1em;width:100%}#onetrust-pc-sdk .ot-cat-grp{margin-top:10px}#onetrust-pc-sdk .ot-cat-item{line-height:1.1;margin-top:10px;display:inline-block;width:100%}#onetrust-pc-sdk .ot-btn-container{text-align:right}#onetrust-pc-sdk .ot-btn-container button{display:inline-block;font-size:.75em;letter-spacing:.08em;margin-top:19px}#onetrust-pc-sdk #close-pc-btn-handler.ot-close-icon{position:absolute;top:10px;right:0;z-index:1;padding:0;background-color:transparent;border:none}#onetrust-pc-sdk #close-pc-btn-handler.ot-close-icon:hover{opacity:.7}#onetrust-pc-sdk #close-pc-btn-handler.ot-close-icon svg{display:block;height:10px;width:10px}#onetrust-pc-sdk #clear-filters-handler{margin-top:20px;margin-bottom:10px;float:right;max-width:200px;text-decoration:none;color:#3860be;font-size:.9em;font-weight:bold;background-color:transparent;border-color:transparent;padding:1px}#onetrust-pc-sdk #clear-filters-handler:hover{color:#2285f7}#onetrust-pc-sdk #clear-filters-handler:focus{outline:#000 solid 1px}#onetrust-pc-sdk .ot-accordion-layout.ot-cat-item{position:relative;border-radius:2px;margin:0;padding:0;border:1px solid #d8d8d8;border-top:none;width:calc(100% - 2px);float:left}#onetrust-pc-sdk .ot-accordion-layout.ot-cat-item:first-of-type{margin-top:10px;border-top:1px solid #d8d8d8}#onetrust-pc-sdk .ot-accordion-layout .ot-acc-grpdesc{padding-left:20px;padding-right:20px;width:calc(100% - 40px);font-size:.812em;margin-bottom:10px;margin-top:15px}#onetrust-pc-sdk .ot-accordion-layout .ot-acc-grpdesc>ul{padding-top:10px}#onetrust-pc-sdk .ot-accordion-layout .ot-acc-grpdesc>ul li{padding-top:0;line-height:1.5;padding-bottom:10px}#onetrust-pc-sdk .ot-accordion-layout div+.ot-acc-grpdesc{margin-top:5px}#onetrust-pc-sdk .ot-accordion-layout .ot-vlst-cntr:first-child{margin-top:10px}#onetrust-pc-sdk .ot-accordion-layout .ot-vlst-cntr:last-child,#onetrust-pc-sdk .ot-accordion-layout .ot-hlst-cntr:last-child{margin-bottom:5px}#onetrust-pc-sdk .ot-accordion-layout .ot-acc-hdr{padding-top:11.5px;padding-bottom:11.5px;padding-left:20px;padding-right:20px;width:calc(100% - 40px);display:inline-block}#onetrust-pc-sdk .ot-accordion-layout .ot-acc-txt{width:100%;padding:0px}#onetrust-pc-sdk .ot-accordion-layout .ot-subgrp-cntr{padding-left:20px;padding-right:15px;padding-bottom:0;width:calc(100% - 35px)}#onetrust-pc-sdk .ot-accordion-layout .ot-subgrp{padding-right:5px}#onetrust-pc-sdk .ot-accordion-layout .ot-acc-grpcntr{z-index:1;position:relative}#onetrust-pc-sdk .ot-accordion-layout .ot-cat-header+.ot-arw-cntr{position:absolute;top:50%;transform:translateY(-50%);right:20px;margin-top:-2px}#onetrust-pc-sdk .ot-accordion-layout .ot-cat-header+.ot-arw-cntr .ot-arw{width:15px;height:20px;margin-left:5px;color:dimgray}#onetrust-pc-sdk .ot-accordion-layout .ot-cat-header{float:none;color:#2e3644;margin:0;display:inline-block;height:auto;word-wrap:break-word;min-height:inherit}#onetrust-pc-sdk .ot-accordion-layout .ot-vlst-cntr,#onetrust-pc-sdk .ot-accordion-layout .ot-hlst-cntr{padding-left:20px;width:calc(100% - 20px);display:inline-block;margin-top:0px;padding-bottom:2px}#onetrust-pc-sdk .ot-accordion-layout .ot-acc-hdr{position:relative;min-height:25px}#onetrust-pc-sdk .ot-accordion-layout h4~.ot-tgl,#onetrust-pc-sdk .ot-accordion-layout h4~.ot-always-active{position:absolute;top:50%;transform:translateY(-50%);right:20px}#onetrust-pc-sdk .ot-accordion-layout h4~.ot-tgl+.ot-tgl{right:95px}#onetrust-pc-sdk .ot-accordion-layout .category-vendors-list-handler,#onetrust-pc-sdk .ot-accordion-layout .category-vendors-list-handler+a{margin-top:5px}#onetrust-pc-sdk .ot-enbl-chr h4~.ot-tgl,#onetrust-pc-sdk .ot-enbl-chr h4~.ot-always-active{right:45px}#onetrust-pc-sdk .ot-enbl-chr h4~.ot-tgl+.ot-tgl{right:120px}#onetrust-pc-sdk .ot-enbl-chr .ot-pli-hdr.ot-leg-border-color span:first-child{width:90px}#onetrust-pc-sdk .ot-enbl-chr li.ot-subgrp>h5+.ot-tgl-cntr{padding-right:25px}#onetrust-pc-sdk .ot-plus-minus{width:20px;height:20px;font-size:1.5em;position:relative;display:inline-block;margin-right:5px;top:3px}#onetrust-pc-sdk .ot-plus-minus span{position:absolute;background:#27455c;border-radius:1px}#onetrust-pc-sdk .ot-plus-minus span:first-of-type{top:25%;bottom:25%;width:10%;left:45%}#onetrust-pc-sdk .ot-plus-minus span:last-of-type{left:25%;right:25%;height:10%;top:45%}#onetrust-pc-sdk button[aria-expanded=true]~.ot-acc-hdr .ot-arw,#onetrust-pc-sdk button[aria-expanded=true]~.ot-acc-hdr .ot-plus-minus span:first-of-type,#onetrust-pc-sdk button[aria-expanded=true]~.ot-acc-hdr .ot-plus-minus span:last-of-type{transform:rotate(90deg)}#onetrust-pc-sdk button[aria-expanded=true]~.ot-acc-hdr .ot-plus-minus span:last-of-type{left:50%;right:50%}#onetrust-pc-sdk #ot-selall-vencntr label,#onetrust-pc-sdk #ot-selall-adtlvencntr label,#onetrust-pc-sdk #ot-selall-hostcntr label,#onetrust-pc-sdk #ot-selall-licntr label{position:relative;display:inline-block;width:20px;height:20px}#onetrust-pc-sdk .ot-host-item .ot-plus-minus,#onetrust-pc-sdk .ot-ven-item .ot-plus-minus{float:left;margin-right:8px;top:10px}#onetrust-pc-sdk .ot-ven-item ul{list-style:none inside;font-size:100%;margin:0}#onetrust-pc-sdk .ot-ven-item ul li{margin:0 !important;padding:0;border:none !important}#onetrust-pc-sdk .ot-pli-hdr{color:#77808e;overflow:hidden;padding-top:7.5px;padding-bottom:7.5px;width:calc(100% - 2px);border-top-left-radius:3px;border-top-right-radius:3px}#onetrust-pc-sdk .ot-pli-hdr span:first-child{top:50%;transform:translateY(50%);max-width:90px}#onetrust-pc-sdk .ot-pli-hdr span:last-child{padding-right:10px;max-width:95px;text-align:center}#onetrust-pc-sdk .ot-li-title{float:right;font-size:.813em}#onetrust-pc-sdk .ot-pli-hdr.ot-leg-border-color{background-color:#f4f4f4;border:1px solid #d8d8d8}#onetrust-pc-sdk .ot-pli-hdr.ot-leg-border-color span:first-child{text-align:left;width:70px}#onetrust-pc-sdk li.ot-subgrp>h5,#onetrust-pc-sdk .ot-cat-header{width:calc(100% - 130px)}#onetrust-pc-sdk li.ot-subgrp>h5+.ot-tgl-cntr{padding-left:13px}#onetrust-pc-sdk .ot-acc-grpcntr .ot-acc-grpdesc{margin-bottom:5px}#onetrust-pc-sdk .ot-acc-grpcntr .ot-subgrp-cntr{border-top:1px solid #d8d8d8}#onetrust-pc-sdk .ot-acc-grpcntr .ot-vlst-cntr+.ot-subgrp-cntr{border-top:none}#onetrust-pc-sdk .ot-acc-hdr .ot-arw-cntr+.ot-tgl-cntr,#onetrust-pc-sdk .ot-acc-txt h4+.ot-tgl-cntr{padding-left:13px}#onetrust-pc-sdk .ot-pli-hdr~.ot-cat-item .ot-subgrp>h5,#onetrust-pc-sdk .ot-pli-hdr~.ot-cat-item .ot-cat-header{width:calc(100% - 145px)}#onetrust-pc-sdk .ot-pli-hdr~.ot-cat-item h5+.ot-tgl-cntr,#onetrust-pc-sdk .ot-pli-hdr~.ot-cat-item .ot-cat-header+.ot-tgl{padding-left:28px}#onetrust-pc-sdk .ot-sel-all-hdr,#onetrust-pc-sdk .ot-sel-all-chkbox{display:inline-block;width:100%;position:relative}#onetrust-pc-sdk .ot-sel-all-chkbox{z-index:1}#onetrust-pc-sdk .ot-sel-all{margin:0;position:relative;padding-right:23px;float:right}#onetrust-pc-sdk .ot-consent-hdr,#onetrust-pc-sdk .ot-li-hdr{float:right;font-size:.812em;line-height:normal;text-align:center;word-break:break-word;word-wrap:break-word}#onetrust-pc-sdk .ot-li-hdr{max-width:100px;padding-right:10px}#onetrust-pc-sdk .ot-consent-hdr{max-width:55px}#onetrust-pc-sdk #ot-selall-licntr{display:block;width:21px;height:auto;float:right;position:relative;right:80px}#onetrust-pc-sdk #ot-selall-licntr label{position:absolute}#onetrust-pc-sdk .ot-ven-ctgl{margin-left:66px}#onetrust-pc-sdk .ot-ven-litgl+.ot-arw-cntr{margin-left:81px}#onetrust-pc-sdk .ot-enbl-chr .ot-host-cnt .ot-tgl-cntr{width:auto}#onetrust-pc-sdk #ot-lst-cnt:not(.ot-host-cnt) .ot-tgl-cntr{width:auto;top:auto;height:20px}#onetrust-pc-sdk #ot-lst-cnt .ot-chkbox{position:relative;display:inline-block;width:20px;height:20px}#onetrust-pc-sdk #ot-lst-cnt .ot-chkbox label{position:absolute;padding:0;width:20px;height:20px}#onetrust-pc-sdk .ot-acc-grpdesc+.ot-leg-btn-container{padding-left:20px;padding-right:20px;width:calc(100% - 40px);margin-bottom:5px}#onetrust-pc-sdk .ot-subgrp .ot-leg-btn-container{margin-bottom:5px}#onetrust-pc-sdk #ot-ven-lst .ot-leg-btn-container{margin-top:10px}#onetrust-pc-sdk .ot-leg-btn-container{display:inline-block;width:100%;margin-bottom:10px}#onetrust-pc-sdk .ot-leg-btn-container button{height:auto;padding:6.5px 8px;margin-bottom:0;letter-spacing:0;font-size:.75em;line-height:normal}#onetrust-pc-sdk .ot-leg-btn-container svg{display:none;height:14px;width:14px;padding-right:5px;vertical-align:sub}#onetrust-pc-sdk .ot-active-leg-btn{cursor:default;pointer-events:none}#onetrust-pc-sdk .ot-active-leg-btn svg{display:inline-block}#onetrust-pc-sdk .ot-remove-objection-handler{text-decoration:underline;padding:0;font-size:.75em;font-weight:600;line-height:1;padding-left:10px}#onetrust-pc-sdk .ot-obj-leg-btn-handler span{font-weight:bold;text-align:center;font-size:inherit;line-height:1.5}#onetrust-pc-sdk.ot-close-btn-link #close-pc-btn-handler{border:none;height:auto;line-height:1.5;text-decoration:underline;font-size:.69em;background:none;right:15px;top:15px;width:auto;font-weight:normal}#onetrust-pc-sdk[dir=rtl] #ot-back-arw,#onetrust-pc-sdk[dir=rtl] input~.ot-acc-hdr .ot-arw{transform:rotate(180deg);-o-transform:rotate(180deg);-ms-transform:rotate(180deg);-webkit-transform:rotate(180deg)}#onetrust-pc-sdk[dir=rtl] input:checked~.ot-acc-hdr .ot-arw{transform:rotate(270deg);-o-transform:rotate(270deg);-ms-transform:rotate(270deg);-webkit-transform:rotate(270deg)}#onetrust-pc-sdk[dir=rtl] .ot-chkbox label::after{transform:rotate(45deg);-webkit-transform:rotate(45deg);-o-transform:rotate(45deg);-ms-transform:rotate(45deg);border-left:0;border-right:3px solid}#onetrust-pc-sdk[dir=rtl] .ot-search-cntr>svg{right:0}@media only screen and (max-width: 600px){#onetrust-pc-sdk.otPcCenter{left:0;min-width:100%;height:100%;top:0;border-radius:0}#onetrust-pc-sdk #ot-pc-content,#onetrust-pc-sdk.ot-ftr-stacked .ot-btn-container{margin:1px 3px 0 10px;padding-right:10px;width:calc(100% - 23px)}#onetrust-pc-sdk .ot-btn-container button{max-width:none;letter-spacing:.01em}#onetrust-pc-sdk #close-pc-btn-handler{top:10px;right:17px}#onetrust-pc-sdk p{font-size:.7em}#onetrust-pc-sdk #ot-pc-hdr{margin:10px 10px 0 5px;width:calc(100% - 15px)}#onetrust-pc-sdk .vendor-search-handler{font-size:1em}#onetrust-pc-sdk #ot-back-arw{margin-left:12px}#onetrust-pc-sdk #ot-lst-cnt{margin:0;padding:0 5px 0 10px;min-width:95%}#onetrust-pc-sdk .switch+p{max-width:80%}#onetrust-pc-sdk .ot-ftr-stacked button{width:100%}#onetrust-pc-sdk #ot-fltr-cnt{max-width:320px;width:90%;border-top-right-radius:0;border-bottom-right-radius:0;margin:0;margin-left:15px;left:auto;right:40px;top:85px}#onetrust-pc-sdk .ot-fltr-opt{margin-left:25px;margin-bottom:10px}#onetrust-pc-sdk .ot-pc-refuse-all-handler{margin-bottom:0}#onetrust-pc-sdk #ot-fltr-cnt{right:40px}}@media only screen and (max-width: 476px){#onetrust-pc-sdk .ot-fltr-cntr,#onetrust-pc-sdk #ot-fltr-cnt{right:10px}#onetrust-pc-sdk #ot-anchor{right:25px}#onetrust-pc-sdk button{width:100%}#onetrust-pc-sdk:not(.ot-addtl-vendors) #ot-pc-lst:not(.ot-enbl-chr) .ot-sel-all{padding-right:9px}#onetrust-pc-sdk:not(.ot-addtl-vendors) #ot-pc-lst:not(.ot-enbl-chr) .ot-tgl-cntr{right:0}}@media only screen and (max-width: 896px)and (max-height: 425px)and (orientation: landscape){#onetrust-pc-sdk.otPcCenter{left:0;top:0;min-width:100%;height:100%;border-radius:0}#onetrust-pc-sdk #ot-anchor{left:initial;right:50px}#onetrust-pc-sdk #ot-lst-title{margin-top:12px}#onetrust-pc-sdk #ot-lst-title *{font-size:inherit}#onetrust-pc-sdk #ot-pc-hdr input{margin-right:0;padding-right:45px}#onetrust-pc-sdk .switch+p{max-width:85%}#onetrust-pc-sdk #ot-sel-blk{position:static}#onetrust-pc-sdk #ot-pc-lst{overflow:auto}#onetrust-pc-sdk #ot-lst-cnt{max-height:none;overflow:initial}#onetrust-pc-sdk #ot-lst-cnt.no-results{height:auto}#onetrust-pc-sdk input{font-size:1em !important}#onetrust-pc-sdk p{font-size:.6em}#onetrust-pc-sdk #ot-fltr-modal{width:100%;top:0}#onetrust-pc-sdk ul li p,#onetrust-pc-sdk .category-vendors-list-handler,#onetrust-pc-sdk .category-vendors-list-handler+a,#onetrust-pc-sdk .category-host-list-handler{font-size:.6em}#onetrust-pc-sdk.ot-shw-fltr #ot-anchor{display:none !important}#onetrust-pc-sdk.ot-shw-fltr #ot-pc-lst{height:100% !important;overflow:hidden;top:0px}#onetrust-pc-sdk.ot-shw-fltr #ot-fltr-cnt{margin:0;height:100%;max-height:none;padding:10px;top:0;width:calc(100% - 20px);position:absolute;right:0;left:0;max-width:none}#onetrust-pc-sdk.ot-shw-fltr .ot-fltr-scrlcnt{max-height:calc(100% - 65px)}}
+            #onetrust-consent-sdk #onetrust-pc-sdk,
+                #onetrust-consent-sdk #ot-search-cntr,
+                #onetrust-consent-sdk #onetrust-pc-sdk .ot-switch.ot-toggle,
+                #onetrust-consent-sdk #onetrust-pc-sdk ot-grp-hdr1 .checkbox,
+                #onetrust-consent-sdk #onetrust-pc-sdk #ot-pc-title:after
+                ,#onetrust-consent-sdk #onetrust-pc-sdk #ot-sel-blk,
+                        #onetrust-consent-sdk #onetrust-pc-sdk #ot-fltr-cnt,
+                        #onetrust-consent-sdk #onetrust-pc-sdk #ot-anchor {
+                    background-color: #FFFFFF;
+                }
+               
+            #onetrust-consent-sdk #onetrust-pc-sdk h3,
+                #onetrust-consent-sdk #onetrust-pc-sdk h4,
+                #onetrust-consent-sdk #onetrust-pc-sdk h5,
+                #onetrust-consent-sdk #onetrust-pc-sdk h6,
+                #onetrust-consent-sdk #onetrust-pc-sdk p,
+                #onetrust-consent-sdk #onetrust-pc-sdk #ot-ven-lst .ot-ven-opts p,
+                #onetrust-consent-sdk #onetrust-pc-sdk #ot-pc-desc,
+                #onetrust-consent-sdk #onetrust-pc-sdk #ot-pc-title,
+                #onetrust-consent-sdk #onetrust-pc-sdk .ot-li-title,
+                #onetrust-consent-sdk #onetrust-pc-sdk .ot-sel-all-hdr span,
+                #onetrust-consent-sdk #onetrust-pc-sdk #ot-host-lst .ot-host-info,
+                #onetrust-consent-sdk #onetrust-pc-sdk #ot-fltr-modal #modal-header,
+                #onetrust-consent-sdk #onetrust-pc-sdk .ot-checkbox label span,
+                #onetrust-consent-sdk #onetrust-pc-sdk #ot-pc-lst #ot-sel-blk p,
+                #onetrust-consent-sdk #onetrust-pc-sdk #ot-pc-lst #ot-lst-title h3,
+                #onetrust-consent-sdk #onetrust-pc-sdk #ot-pc-lst .back-btn-handler p,
+                #onetrust-consent-sdk #onetrust-pc-sdk #ot-pc-lst .ot-ven-name,
+                #onetrust-consent-sdk #onetrust-pc-sdk #ot-pc-lst #ot-ven-lst .consent-category,
+                #onetrust-consent-sdk #onetrust-pc-sdk .ot-leg-btn-container .ot-inactive-leg-btn,
+                #onetrust-consent-sdk #onetrust-pc-sdk .ot-label-status,
+                #onetrust-consent-sdk #onetrust-pc-sdk .ot-chkbox label span,
+                #onetrust-consent-sdk #onetrust-pc-sdk #clear-filters-handler 
+                {
+                    color: #696969;
+                }
+             #onetrust-consent-sdk #onetrust-pc-sdk .privacy-notice-link,
+                    #onetrust-consent-sdk #onetrust-pc-sdk .category-vendors-list-handler,
+                    #onetrust-consent-sdk #onetrust-pc-sdk .category-vendors-list-handler + a,
+                    #onetrust-consent-sdk #onetrust-pc-sdk .category-host-list-handler,
+                    #onetrust-consent-sdk #onetrust-pc-sdk .ot-ven-link,
+                    #onetrust-consent-sdk #onetrust-pc-sdk #ot-host-lst .ot-host-name a,
+                    #onetrust-consent-sdk #onetrust-pc-sdk #ot-host-lst .ot-acc-hdr .ot-host-expand,
+                    #onetrust-consent-sdk #onetrust-pc-sdk #ot-host-lst .ot-host-info a
+                    {
+                        color: #3860BE;
+                    }
+            #onetrust-consent-sdk #onetrust-pc-sdk .category-vendors-list-handler:hover { opacity: .7;}
+            #onetrust-consent-sdk #onetrust-pc-sdk .ot-acc-grpcntr.ot-acc-txt,
+            #onetrust-consent-sdk #onetrust-pc-sdk .ot-acc-txt .ot-subgrp-tgl .ot-switch.ot-toggle
+             {
+                background-color: #E9E9E9;
+            }
+             #onetrust-consent-sdk #onetrust-pc-sdk #ot-host-lst .ot-host-info,
+                    #onetrust-consent-sdk #onetrust-pc-sdk .ot-acc-txt .ot-ven-dets
+                            {
+                                background-color: #E9E9E9;
+                            }
+        #onetrust-consent-sdk #onetrust-pc-sdk 
+            button:not(#clear-filters-handler):not(.ot-close-icon):not(#filter-btn-handler):not(.ot-remove-objection-handler):not(.ot-obj-leg-btn-handler):not([aria-expanded]):not(.ot-link-btn),
+            #onetrust-consent-sdk #onetrust-pc-sdk .ot-leg-btn-container .ot-active-leg-btn {
+                background-color: #1371C3;border-color: #1371C3;
+                color: #FFFFFF;
+            }
+            #onetrust-consent-sdk #onetrust-pc-sdk .ot-active-menu {
+                border-color: #1371C3;
+            }
+            
+            #onetrust-consent-sdk #onetrust-pc-sdk .ot-leg-btn-container .ot-remove-objection-handler{
+                background-color: transparent;
+                border: 1px solid transparent;
+            }
+            #onetrust-consent-sdk #onetrust-pc-sdk .ot-leg-btn-container .ot-inactive-leg-btn {
+                background-color: #FFFFFF;
+                color: #78808E; border-color: #78808E;
+            }
+            
+            #onetrust-consent-sdk #onetrust-pc-sdk .ot-tgl input:focus + .ot-switch, .ot-switch .ot-switch-nob, .ot-switch .ot-switch-nob:before,
+            #onetrust-pc-sdk .ot-checkbox input[type="checkbox"]:focus + label::before,
+            #onetrust-pc-sdk .ot-chkbox input[type="checkbox"]:focus + label::before {
+                outline-color: #000000;
+                outline-width: 1px;
+            }
+            #onetrust-pc-sdk .ot-host-item > button:focus, #onetrust-pc-sdk .ot-ven-item > button:focus {
+                border: 1px solid #000000;
+            }
+            #onetrust-consent-sdk #onetrust-pc-sdk *:focus,
+            #onetrust-consent-sdk #onetrust-pc-sdk .ot-vlst-cntr > a:focus {
+               outline: 1px solid #000000;
+            }.ot-sdk-cookie-policy{font-family:inherit;font-size:16px}.ot-sdk-cookie-policy.otRelFont{font-size:1rem}.ot-sdk-cookie-policy h3,.ot-sdk-cookie-policy h4,.ot-sdk-cookie-policy h6,.ot-sdk-cookie-policy p,.ot-sdk-cookie-policy li,.ot-sdk-cookie-policy a,.ot-sdk-cookie-policy th,.ot-sdk-cookie-policy #cookie-policy-description,.ot-sdk-cookie-policy .ot-sdk-cookie-policy-group,.ot-sdk-cookie-policy #cookie-policy-title{color:dimgray}.ot-sdk-cookie-policy #cookie-policy-description{margin-bottom:1em}.ot-sdk-cookie-policy h4{font-size:1.2em}.ot-sdk-cookie-policy h6{font-size:1em;margin-top:2em}.ot-sdk-cookie-policy th{min-width:75px}.ot-sdk-cookie-policy a,.ot-sdk-cookie-policy a:hover{background:#fff}.ot-sdk-cookie-policy thead{background-color:#f6f6f4;font-weight:bold}.ot-sdk-cookie-policy .ot-mobile-border{display:none}.ot-sdk-cookie-policy section{margin-bottom:2em}.ot-sdk-cookie-policy table{border-collapse:inherit}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy{font-family:inherit;font-size:1rem}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy h3,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy h4,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy h6,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy p,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy li,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy a,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy th,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy #cookie-policy-description,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy .ot-sdk-cookie-policy-group,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy #cookie-policy-title{color:dimgray}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy #cookie-policy-description{margin-bottom:1em}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy .ot-sdk-subgroup{margin-left:1.5em}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy #cookie-policy-description,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy .ot-sdk-cookie-policy-group-desc,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy .ot-table-header,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy a,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy span,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy td{font-size:.9em}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy td span,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy td a{font-size:inherit}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy .ot-sdk-cookie-policy-group{font-size:1em;margin-bottom:.6em}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy .ot-sdk-cookie-policy-title{margin-bottom:1.2em}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy>section{margin-bottom:1em}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy th{min-width:75px}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy a,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy a:hover{background:#fff}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy thead{background-color:#f6f6f4;font-weight:bold}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy .ot-mobile-border{display:none}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy section{margin-bottom:2em}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy .ot-sdk-subgroup ul li{list-style:disc;margin-left:1.5em}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy .ot-sdk-subgroup ul li h4{display:inline-block}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy table{border-collapse:inherit;margin:auto;border:1px solid #d7d7d7;border-radius:5px;border-spacing:initial;width:100%;overflow:hidden}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy table th,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy table td{border-bottom:1px solid #d7d7d7;border-right:1px solid #d7d7d7}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy table tr:last-child td{border-bottom:0px}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy table tr th:last-child,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy table tr td:last-child{border-right:0px}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy table .ot-host,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy table .ot-cookies-type{width:25%}.ot-sdk-cookie-policy[dir=rtl]{text-align:left}#ot-sdk-cookie-policy h3{font-size:1.5em}@media only screen and (max-width: 530px){.ot-sdk-cookie-policy:not(#ot-sdk-cookie-policy-v2) table,.ot-sdk-cookie-policy:not(#ot-sdk-cookie-policy-v2) thead,.ot-sdk-cookie-policy:not(#ot-sdk-cookie-policy-v2) tbody,.ot-sdk-cookie-policy:not(#ot-sdk-cookie-policy-v2) th,.ot-sdk-cookie-policy:not(#ot-sdk-cookie-policy-v2) td,.ot-sdk-cookie-policy:not(#ot-sdk-cookie-policy-v2) tr{display:block}.ot-sdk-cookie-policy:not(#ot-sdk-cookie-policy-v2) thead tr{position:absolute;top:-9999px;left:-9999px}.ot-sdk-cookie-policy:not(#ot-sdk-cookie-policy-v2) tr{margin:0 0 1em 0}.ot-sdk-cookie-policy:not(#ot-sdk-cookie-policy-v2) tr:nth-child(odd),.ot-sdk-cookie-policy:not(#ot-sdk-cookie-policy-v2) tr:nth-child(odd) a{background:#f6f6f4}.ot-sdk-cookie-policy:not(#ot-sdk-cookie-policy-v2) td{border:none;border-bottom:1px solid #eee;position:relative;padding-left:50%}.ot-sdk-cookie-policy:not(#ot-sdk-cookie-policy-v2) td:before{position:absolute;height:100%;left:6px;width:40%;padding-right:10px}.ot-sdk-cookie-policy:not(#ot-sdk-cookie-policy-v2) .ot-mobile-border{display:inline-block;background-color:#e4e4e4;position:absolute;height:100%;top:0;left:45%;width:2px}.ot-sdk-cookie-policy:not(#ot-sdk-cookie-policy-v2) td:before{content:attr(data-label);font-weight:bold}.ot-sdk-cookie-policy:not(#ot-sdk-cookie-policy-v2) li{word-break:break-word;word-wrap:break-word}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy table{overflow:hidden}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy table td{border:none;border-bottom:1px solid #d7d7d7}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy table,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy thead,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy tbody,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy th,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy td,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy tr{display:block}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy table .ot-host,#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy table .ot-cookies-type{width:auto}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy tr{margin:0 0 1em 0}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy td:before{height:100%;width:40%;padding-right:10px}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy td:before{content:attr(data-label);font-weight:bold}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy li{word-break:break-word;word-wrap:break-word}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy thead tr{position:absolute;top:-9999px;left:-9999px;z-index:-9999}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy table tr:last-child td{border-bottom:1px solid #d7d7d7;border-right:0px}#ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy table tr:last-child td:last-child{border-bottom:0px}}
+                
+                    #ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy h5,
+                    #ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy h6,
+                    #ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy li,
+                    #ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy p,
+                    #ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy a,
+                    #ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy span,
+                    #ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy td,
+                    #ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy #cookie-policy-description {
+                        color: #696969;
+                    }
+                    #ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy th {
+                        color: #696969;
+                    }
+                    #ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy .ot-sdk-cookie-policy-group {
+                        color: #696969;
+                    }
+                    
+                    #ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy #cookie-policy-title {
+                            color: #696969;
+                        }
+                    
+            
+                    #ot-sdk-cookie-policy-v2.ot-sdk-cookie-policy table th {
+                            background-color: #F8F8F8;
+                        }
+                    
+            .ot-floating-button__front{background-image:url('https://optanon.blob.core.windows.net/logos/static/ot_persistent_cookie.png')}</style><script async="" type="text/javascript" class="optanon-category-C0002" src="./Dear Rich on Vimeo_files/gtm.js" data-airgap-id="20"></script><script async="" type="text/javascript" class="optanon-category-C0002" src="./Dear Rich on Vimeo_files/f.txt" data-airgap-id="21"></script><meta http-equiv="origin-trial" content="A0VQgOQvA+kwCj319NCwgf8+syUgEQ8/LLpB8RxxlRC3AkJ9xx8IAvVuQ/dcwy0ok7sGKufLLu6WhsXbQR9/UwwAAACFeyJvcmlnaW4iOiJodHRwczovL2RvdWJsZWNsaWNrLm5ldDo0NDMiLCJmZWF0dXJlIjoiUHJpdmFjeVNhbmRib3hBZHNBUElzIiwiZXhwaXJ5IjoxNjg4MDgzMTk5LCJpc1N1YmRvbWFpbiI6dHJ1ZSwiaXNUaGlyZFBhcnR5Ijp0cnVlfQ=="><meta http-equiv="origin-trial" content="A6kRo9zXJhOvsR4D/VeZ9CiApPAxnOGzBkW88d8eIt9ex2oOzlX+AoUk/BS50Y9Ysy2jwyHR49Mb7XwP+l9yygIAAACLeyJvcmlnaW4iOiJodHRwczovL2dvb2dsZXN5bmRpY2F0aW9uLmNvbTo0NDMiLCJmZWF0dXJlIjoiUHJpdmFjeVNhbmRib3hBZHNBUElzIiwiZXhwaXJ5IjoxNjg4MDgzMTk5LCJpc1N1YmRvbWFpbiI6dHJ1ZSwiaXNUaGlyZFBhcnR5Ijp0cnVlfQ=="><meta http-equiv="origin-trial" content="A3mbHZoS4VJtJ8j1aE8+Z9vaGf/oMV1eTNIWMrvGqWgNnOmvaxnRGliqKIZU2eiTzCj5Qpz8B1/UTTLuony5bAAAAACLeyJvcmlnaW4iOiJodHRwczovL2dvb2dsZXRhZ3NlcnZpY2VzLmNvbTo0NDMiLCJmZWF0dXJlIjoiUHJpdmFjeVNhbmRib3hBZHNBUElzIiwiZXhwaXJ5IjoxNjg4MDgzMTk5LCJpc1N1YmRvbWFpbiI6dHJ1ZSwiaXNUaGlyZFBhcnR5Ijp0cnVlfQ=="><meta http-equiv="origin-trial" content="As0hBNJ8h++fNYlkq8cTye2qDLyom8NddByiVytXGGD0YVE+2CEuTCpqXMDxdhOMILKoaiaYifwEvCRlJ/9GcQ8AAAB8eyJvcmlnaW4iOiJodHRwczovL2RvdWJsZWNsaWNrLm5ldDo0NDMiLCJmZWF0dXJlIjoiV2ViVmlld1hSZXF1ZXN0ZWRXaXRoRGVwcmVjYXRpb24iLCJleHBpcnkiOjE3MTk1MzI3OTksImlzU3ViZG9tYWluIjp0cnVlfQ=="><meta http-equiv="origin-trial" content="AgRYsXo24ypxC89CJanC+JgEmraCCBebKl8ZmG7Tj5oJNx0cmH0NtNRZs3NB5ubhpbX/bIt7l2zJOSyO64NGmwMAAACCeyJvcmlnaW4iOiJodHRwczovL2dvb2dsZXN5bmRpY2F0aW9uLmNvbTo0NDMiLCJmZWF0dXJlIjoiV2ViVmlld1hSZXF1ZXN0ZWRXaXRoRGVwcmVjYXRpb24iLCJleHBpcnkiOjE3MTk1MzI3OTksImlzU3ViZG9tYWluIjp0cnVlfQ=="><script src="./Dear Rich on Vimeo_files/f(1).txt" async=""></script><script type="text/javascript" src="./Dear Rich on Vimeo_files/singular-sdk.js"></script></head>
+    <body class="onsite showfocus">
+        <div id="wrap" class="outer_wrap">
+            <div id="topnav_outer_wrap" class="topnav_sticky"><div><!-- react-empty: 1 --></div>
+                <div id="create-facebook-header"></div>
+                
+                <div class="VimeoBrand_ColorRibbon "></div>
+
+                
+                
+
+<style>
+    @-webkit-keyframes record_animation {
+        0%, 20%, 50%, 80%, 100% {
+            -webkit-transform: translateY(0);
+            transform: translateY(0);
+        }
+        40% {
+            -webkit-transform: translateY(2px);
+            transform: translateY(2px);
+        }
+        60% {
+            -webkit-transform: translateY(3px);
+            transform: translateY(3px);
+        }
+    }
+
+    @keyframes record_animation {
+        0%, 20%, 50%, 80%, 100% {
+            -webkit-transform: translateY(0);
+            transform: translateY(0);
+        }
+        40% {
+            -webkit-transform: translateY(2px);
+            transform: translateY(2px);
+        }
+        60% {
+            -webkit-transform: translateY(3px);
+            transform: translateY(3px);
+        }
+    }
+
+    .logged_out_record_animation {
+        animation: record_animation 1.5s .25s 5;
+    }
+
+    .logged_in_record_animation {
+        animation: record_animation 1.5s .25s infinite;
+    }
+
+    .new_label {
+        text-transform: uppercase;
+        color: #fff;
+        border-radius: 2px;
+        height: 20px;
+        line-height: 20px;
+        margin-left: 8px;
+        font-size: 10px;
+        font-weight: 700;
+        padding: 0 2px;
+        text-align: center;
+    }
+
+</style>
+
+<script>
+    window.vimeo = window.vimeo || {};
+</script>
+
+<div id="topnav_desktop" class="topnav_desktop " role="banner">
+    <div class="topnav_desktop_wrapper">
+
+                            <a class="topnav_desktop_logo" href="https://vimeo.com/" alt="Go to Vimeo home page" aria-label="Go to Vimeo home page" data-fatal-attraction="container:top_nav|component:vimeo_home" data-gtm-click="top_nav_home_click">
+                                    <svg alt="Vimeo" width="100" height="40"><path d="M22.448 14.575c-.104 2.17-1.618 5.146-4.544 8.912-3.03 3.942-5.59 5.912-7.686 5.912-1.297 0-2.397-1.204-3.3-3.6-.6-2.2-1.202-4.398-1.794-6.598-.664-2.396-1.38-3.6-2.147-3.6-.166 0-.747.354-1.753 1.05l-1.048-1.35c1.1-.965 2.19-1.93 3.257-2.905 1.463-1.265 2.573-1.94 3.3-2.002 1.732-.166 2.8 1.017 3.205 3.558.435 2.74.736 4.44.902 5.115.498 2.27 1.048 3.402 1.65 3.402.466 0 1.172-.737 2.105-2.21.934-1.473 1.432-2.593 1.504-3.37.133-1.277-.365-1.91-1.506-1.91-.53 0-1.08.125-1.65.364 1.1-3.59 3.186-5.333 6.277-5.23 2.273.073 3.35 1.556 3.227 4.46m13.755 7.034c-.933 1.764-2.22 3.37-3.86 4.803-2.24 1.93-4.47 2.905-6.7 2.905-1.037.002-1.826-.33-2.376-.994-.55-.663-.81-1.535-.777-2.603.03-1.1.372-2.8 1.025-5.104.654-2.303.976-3.537.976-3.703 0-.86-.3-1.297-.902-1.297-.198 0-.77.353-1.702 1.048l-1.152-1.35c1.07-.962 2.137-1.927 3.206-2.902 1.43-1.266 2.5-1.94 3.205-2.002 1.1-.103 1.91.23 2.428.976.518.747.705 1.722.58 2.915-.435 2.034-.902 4.607-1.4 7.73-.03 1.43.488 2.146 1.556 2.146.467 0 1.297-.498 2.5-1.483.996-.82 1.815-1.598 2.45-2.324l.942 1.244m-4.357-17.8c-.03.83-.446 1.628-1.255 2.395-.9.86-1.97 1.296-3.204 1.296-1.9 0-2.822-.83-2.75-2.49.032-.86.54-1.69 1.526-2.49.985-.797 2.074-1.19 3.278-1.19.705 0 1.286.27 1.753.82.467.54.684 1.1.653 1.66m35.612 17.8c-.933 1.763-2.22 3.37-3.86 4.802-2.24 1.93-4.47 2.904-6.7 2.904-2.168.002-3.216-1.202-3.153-3.598.03-1.07.238-2.355.622-3.85.384-1.503.59-2.665.623-3.505.03-1.265-.353-1.898-1.152-1.898-.87 0-1.91 1.036-3.112 3.1-1.276 2.168-1.96 4.274-2.064 6.308-.073 1.43.072 2.54.425 3.298-2.324.064-3.963-.32-4.886-1.15-.83-.737-1.212-1.95-1.15-3.652.03-1.068.198-2.137.488-3.205.29-1.07.457-2.023.488-2.853.062-1.234-.384-1.857-1.35-1.857-.84 0-1.74.955-2.706 2.853-.966 1.9-1.505 3.89-1.61 5.956-.06 1.867.053 3.174.364 3.9-2.293.062-3.92-.415-4.876-1.452-.798-.86-1.16-2.18-1.1-3.942.032-.86.188-2.075.457-3.62.28-1.546.425-2.75.457-3.62.062-.603-.083-.903-.446-.903-.197 0-.768.34-1.702 1.015l-1.203-1.348c.168-.135 1.216-1.1 3.156-2.905 1.4-1.297 2.354-1.97 2.852-2.002.872-.073 1.567.29 2.106 1.08.53.787.8 1.69.8 2.727 0 .332-.032.654-.105.954.497-.766 1.08-1.43 1.752-2 1.537-1.34 3.26-2.086 5.157-2.252 1.64-.135 2.8.25 3.505 1.152.57.736.83 1.784.8 3.153.237-.198.486-.416.746-.654.767-.903 1.514-1.62 2.25-2.148 1.235-.902 2.52-1.4 3.86-1.504 1.597-.135 2.75.25 3.454 1.152.602.726.87 1.774.8 3.143-.032.933-.26 2.28-.675 4.065-.416 1.773-.624 2.8-.624 3.07-.03.695.03 1.182.197 1.442.166.27.57.394 1.203.394.467 0 1.297-.497 2.5-1.482.996-.82 1.816-1.598 2.45-2.324l.963 1.254m18.765-.052c-.965 1.598-2.874 3.195-5.706 4.793-3.538 2.032-7.127 3.05-10.758 3.05-2.706 0-4.636-.904-5.808-2.7-.83-1.233-1.234-2.696-1.203-4.407.03-2.698 1.234-5.27 3.6-7.71 2.603-2.665 5.674-4.003 9.21-4.003 3.27 0 5 1.328 5.208 3.994.135 1.702-.798 3.445-2.8 5.24-2.137 1.96-4.824 3.215-8.06 3.744.6.83 1.504 1.245 2.707 1.245 2.396 0 5.02-.613 7.863-1.837 2.033-.86 3.63-1.753 4.803-2.676l.945 1.265m-11.36-5.228c.032-.892-.33-1.35-1.1-1.35-.994 0-2.01.686-3.048 2.066-1.038 1.38-1.567 2.697-1.598 3.962-.02 0-.02.218 0 .643 1.63-.6 3.05-1.514 4.242-2.738.966-1.058 1.463-1.92 1.505-2.583m24.946 1.868c-.135 3.072-1.265 5.717-3.402 7.947-2.135 2.23-4.79 3.35-7.955 3.35-2.635 0-4.637-.85-6.006-2.55-.997-1.267-1.557-2.854-1.65-4.752-.166-2.863.86-5.498 3.1-7.894 2.408-2.665 5.427-3.993 9.057-3.993 2.334 0 4.098.788 5.3 2.344 1.132 1.443 1.65 3.29 1.557 5.55m-5.664-.185c.03-.903-.094-1.733-.374-2.48-.28-.747-.695-1.13-1.224-1.13-1.702 0-3.102.923-4.202 2.76-.933 1.503-1.43 3.11-1.504 4.812-.03.84.114 1.577.446 2.21.364.736.882 1.1 1.556 1.1 1.505 0 2.79-.883 3.86-2.656.892-1.472 1.38-3.008 1.44-4.615h.002z" fill="#112233"></path></svg>
+                            </a>
+            <a class="topnav_stock_logo" href="https://vimeo.com/stock">
+                <svg alt="Vimeo" width="170" height="40" data-name="Layer 1" viewBox="0 0 780 120"><path d="M471.9 70.31c-12.14-2.74-24.28-3.9-24.28-12 0-6.5 8.82-7.66 13.59-7.66 7.22 0 13.73 2.17 15.17 10h17.2c-2-16.62-15.9-23-31.22-23-13.58 0-31.21 5.05-31.21 21.38 0 15.17 11.85 19.51 24 22.11s24 3.76 24.42 12.43c.43 8.52-10.4 9.82-16.62 9.82-8.81 0-16-3.46-16.9-13h-16.49c.29 17.63 14.31 26 33.09 26 15.46 0 33.38-6.5 33.38-24.28-.03-14.72-12.14-19.05-24.13-21.8zM525.66 17.28h-16.48v22.4h-12.42V52h12.42v44c.29 12.43 3.47 19.08 20.67 19.08 3.61 0 7.08-.58 10.69-.87v-12.68a28.52 28.52 0 0 1-6.94.57c-7.37 0-7.94-3.47-7.94-10.26V52h14.88V39.68h-14.88zM580.85 37.66c-24 0-37.71 16.47-37.71 39.3 0 23 13.73 39.45 37.71 39.45S618.57 99.94 618.57 77c0-22.87-13.73-39.34-37.72-39.34zm0 65.74c-14.73 0-21.24-13.4-21.24-26.4s6.51-26.3 21.24-26.3S602.1 64.1 602.1 77s-6.51 26.4-21.25 26.4zM662.79 50.66c9.1 0 15.75 4.91 17.05 14h16.47c-1.59-18.35-16.33-27-33.67-27-24.56 0-36.85 17.63-36.85 40.17 0 22 12.86 38.58 36.27 38.58 19.22 0 31.22-10.69 34.25-30.06h-16.47c-1.59 10.7-8.24 17.05-17.78 17.05-14.3 0-19.79-13.15-19.79-25.57 0-22.69 11.99-27.17 20.52-27.17zM742.26 67.13l28.61-27.45h-20.23l-29.76 30.2V11.21H704.4v103.18h16.48V87.65l9.82-9.53 22.83 36.27h20.09l-31.36-47.26z" fill="#fff"></path><path d="M117.25 26.72a18.37 18.37 0 0 0 13.14-5.31q4.92-4.69 5.13-9.8a9.62 9.62 0 0 0-2.67-6.84 9.08 9.08 0 0 0-7.18-3.37 20.91 20.91 0 0 0-13.45 4.9q-6.06 4.91-6.26 10.21-.4 10.22 11.29 10.21zM386.12 38.25q-22.38 0-37.15 16.39Q335.2 69.4 336.24 87c.05.86.12 1.7.22 2.53l-1.54.68q-17.46 7.52-32.23 7.51-7.4 0-11.09-5.12 19.9-3.27 33-15.35 12.4-11.03 11.54-21.47-1.23-16.37-21.34-16.38-21.8 0-37.8 16.42-14.56 15-14.77 31.6a37.57 37.57 0 0 0 .27 5.37c-2.29 1.51-4 2.27-5.2 2.27q-3.9 0-4.92-1.63c-.69-1.09-1-3.06-.83-5.93q0-1.64 2.57-12.57t2.77-16.67q.4-8.37-3.28-12.88-4.32-5.52-14.17-4.7a30.42 30.42 0 0 0-15.8 6.16 54.57 54.57 0 0 0-9.23 8.82c-1.1 1-2.12 1.86-3.08 2.67q.19-8.41-3.28-12.93-4.32-5.53-14.38-4.72a36.46 36.46 0 0 0-21.13 9.24 37.67 37.67 0 0 0-7.19 8.21 18.15 18.15 0 0 0 .41-3.9A19.42 19.42 0 0 0 162.5 43q-3.28-4.82-8.62-4.41-3.07.21-11.69 8.21-11.91 11.08-12.93 11.9l4.92 5.54c3.83-2.76 6.16-4.15 7-4.15q2.25 0 1.85 3.68a114.11 114.11 0 0 1-1.89 14.84c-.7 3.94-1.2 7.33-1.52 10.19l-.18.15q-7.39 6.08-10.26 6.07c-4.38 0-6.5-2.92-6.37-8.79q3.08-19.22 5.76-31.69.81-7.36-2.37-12t-10-4q-4.32.4-13.14 8.21L97 52.39c-.41-9.68-4.82-14.66-13.28-14.91q-19-.6-25.74 21.46a17.19 17.19 0 0 1 6.76-1.5q7 0 6.16 7.84-.46 4.72-6.2 13.81t-8.62 9.06q-3.69 0-6.77-14-1-4.11-3.69-21-2.47-15.54-13.14-14.52Q28 39 18.94 46.84q-6.57 6-13.34 11.9l4.3 5.54Q16.05 60 17.07 60q4.71 0 8.81 14.76l7.38 27.06q5.52 14.76 13.51 14.76 12.92 0 31.55-24.24 13.1-16.84 17-28.5c3.44-2.55 5.57-3.84 6.35-3.84q3.69 0 3.69 5.33 0 1-4 15.18t-4.2 20.92q-.21 6.57 3.18 10.66c2.25 2.74 5.51 4.11 9.75 4.11q13.75 0 27.5-11.9c.82-.71 1.61-1.44 2.39-2.18a16.51 16.51 0 0 0 3.77 7.56q5.93 6.34 20 5.93-1.89-4.52-1.47-16a59.7 59.7 0 0 1 6.57-24.43q6-11.68 11.1-11.7 6 0 5.55 7.59a53.13 53.13 0 0 1-2 11.71 55.23 55.23 0 0 0-2 13.13q-.41 10.47 4.71 15 5.73 5.13 20.05 4.72-2.13-4.71-1.72-13.54.6-12.52 8.44-25.86 7.41-12.72 12.76-12.73 5 0 4.74 7.8a74.94 74.94 0 0 1-2.56 14.36 74.61 74.61 0 0 0-2.57 15.79q-.41 14.78 12.94 14.77 13.74 0 27.5-11.9l.44-.4c.32.54.64 1.08 1 1.6q7.19 11.08 23.81 11.08 22.36 0 44.13-12.5c1.63-.92 3.17-1.83 4.65-2.75a29.43 29.43 0 0 0 3.24 5.18q8.42 10.45 24.63 10.45 19.5 0 32.64-13.73a48.79 48.79 0 0 0 14-32.58q.61-13.93-6.36-22.75-7.49-9.65-21.85-9.67zm-97.76 46.56a11.12 11.12 0 0 1 0-2.66q.19-7.75 6.55-16.23t12.5-8.48c3.15 0 4.65 1.85 4.51 5.52q-.19 4.08-6.14 10.62a46.25 46.25 0 0 1-17.42 11.23zM391 69.85a39 39 0 0 1-6 18.92q-6.57 10.91-15.81 10.9-4.11 0-6.36-4.52a17.66 17.66 0 0 1-1.85-9.05 39.81 39.81 0 0 1 6.16-19.74q6.86-11.31 17.33-11.31c2.19 0 3.86 1.54 5 4.63A25.82 25.82 0 0 1 391 69.85z" fill="#00adef"></path></svg>
+            </a>
+        
+                            <nav class="topnav_desktop_menu" role="navigation" aria-label="Main menu">
+                <ul class="topnav_menu_desktop_main" role="menubar">
+                                                                                            <li class="topnav_desktop_menu_items topnav_desktop_menu_items_left" data-menu-id="solutions" data-fatal-attraction-impression="container:top_nav|component:solutions_menu|keyword:solutions_hover">
+                            <a onclick="event.preventDefault();event.target.blur();" class="topnav_menu_no_link topnav_has_dropdown" href="https://vimeo.com/786646692#" rel="toggle" role="button" aria-owns="topnav_solutions">
+                                Solutions                                                                    <div class="topnav_dropdown_arrow">
+                                        <svg width="20px" height="20px" viewBox="0 0 24 24">
+                                            <path d="M12 15.5a1 1 0 0 1-.67-.26l-5-4.5 1.34-1.48L12 13.15l4.33-3.9 1.34 1.49-5 4.5a1 1 0 0 1-.67.26z" fill="#657987"></path>
+                                        </svg>
+                                    </div>
+                                                            </a>
+                                                                                        <div class="topnav_desktop_menu_items_dropdown row_flex" role="menu" aria-hidden="true" id="topnav_solutions">
+                                    <ul class="row_elements">
+                                                                                        <li class="topnav_desktop_menu_items_dropdown_item--multilevel solutions_menu" role="menuitem" tabindex="-1">
+                                                                                                        <a class="topnav_desktop_menu_items_dropdown_item solutions_menu" data-fatal-attraction="container:top_nav|component:solutions|keyword:video_marketing" data-gtm-click="top_nav_video_marketing" href="https://vimeo.com/solutions/marketing">
+                                                            <h2 data-fatal-attraction="container:top_nav|component:solutions|keyword:video_marketing" data-gtm-click="top_nav_video_marketing" class="solutions_menu" title="Video marketing">Video marketing</h2>
+                                                                                                                        <p class="topnav_desktop_menu_items_dropdown_item_option description">Power your marketing strategy with perfectly branded videos to drive better ROI.</p>
+                                                                                                                    </a>
+                                                                                                        <ul role="menu" aria-hidden="true">
+                                                                                                            </ul>
+                                                </li>
+                                                                                                                                    <li class="topnav_desktop_menu_items_dropdown_item--multilevel solutions_menu" role="menuitem" tabindex="-1">
+                                                                                                        <a class="topnav_desktop_menu_items_dropdown_item solutions_menu" data-fatal-attraction="container:top_nav|component:solutions|keyword:event_marketing" data-gtm-click="top_nav_event_marketing" href="https://vimeo.com/features/virtual-events">
+                                                            <h2 data-fatal-attraction="container:top_nav|component:solutions|keyword:event_marketing" data-gtm-click="top_nav_event_marketing" class="solutions_menu" title="Event marketing">Event marketing</h2>
+                                                                                                                        <p class="topnav_desktop_menu_items_dropdown_item_option description">Host virtual events and webinars to increase engagement and generate leads.</p>
+                                                                                                                    </a>
+                                                                                                        <ul role="menu" aria-hidden="true">
+                                                                                                            </ul>
+                                                </li>
+                                                                                                                                    <li class="topnav_desktop_menu_items_dropdown_item--multilevel solutions_menu" role="menuitem" tabindex="-1">
+                                                                                                        <a class="topnav_desktop_menu_items_dropdown_item solutions_menu" data-fatal-attraction="container:top_nav|component:solutions|keyword:employee_communications" data-gtm-click="top_nav_employee_communications" href="https://vimeo.com/solutions/communications">
+                                                            <h2 data-fatal-attraction="container:top_nav|component:solutions|keyword:employee_communications" data-gtm-click="top_nav_employee_communications" class="solutions_menu" title="Employee communication">Employee communication</h2>
+                                                                                                                        <p class="topnav_desktop_menu_items_dropdown_item_option description">Inspire employees with compelling live and on-demand video experiences.</p>
+                                                                                                                    </a>
+                                                                                                        <ul role="menu" aria-hidden="true">
+                                                                                                            </ul>
+                                                </li>
+                                                                                                                                    <li class="topnav_desktop_menu_items_dropdown_item--multilevel solutions_menu" role="menuitem" tabindex="-1">
+                                                                                                        <a class="topnav_desktop_menu_items_dropdown_item solutions_menu" data-fatal-attraction="container:top_nav|component:solutions|keyword:video_monetization" data-gtm-click="top_nav_video_monetization" href="https://vimeo.com/solutions/video-monetization">
+                                                            <h2 data-fatal-attraction="container:top_nav|component:solutions|keyword:video_monetization" data-gtm-click="top_nav_video_monetization" class="solutions_menu" title="Video monetization">Video monetization</h2>
+                                                                                                                        <p class="topnav_desktop_menu_items_dropdown_item_option description">Build a site and generate income from purchases, subscriptions, and courses.</p>
+                                                                                                                    </a>
+                                                                                                        <ul role="menu" aria-hidden="true">
+                                                                                                            </ul>
+                                                </li>
+                                                                                                                        </ul>
+                                                                                                        </div>
+                            
+                        </li>
+                                                                                            <li class="topnav_desktop_menu_items topnav_desktop_menu_items_left" data-menu-id="features" data-fatal-attraction-impression="container:top_nav|component:features_menu|keyword:livestream_highlight">
+                            <a onclick="event.preventDefault();event.target.blur();" class="topnav_menu_no_link topnav_has_dropdown" data-bp-hover="location:global_nav|name:expand_global_nav_option|copy:features|feature:features" href="https://vimeo.com/786646692#" rel="toggle" role="button" aria-owns="topnav_features">
+                                Features                                                                    <div class="topnav_dropdown_arrow">
+                                        <svg width="20px" height="20px" viewBox="0 0 24 24">
+                                            <path d="M12 15.5a1 1 0 0 1-.67-.26l-5-4.5 1.34-1.48L12 13.15l4.33-3.9 1.34 1.49-5 4.5a1 1 0 0 1-.67.26z" fill="#657987"></path>
+                                        </svg>
+                                    </div>
+                                                            </a>
+                                                                                        <div class="topnav_desktop_menu_items_dropdown row_flex" role="menu" aria-hidden="true" id="topnav_features">
+                                    <ul class="row_elements">
+                                                                                        <li class="topnav_desktop_menu_items_dropdown_item--multilevel " role="menuitem" tabindex="-1">
+                                                                                                        <h2>Create</h2>
+                                                                                                        <ul role="menu" aria-hidden="true">
+                                                                                                                    <li role="menuitem" tabindex="-1">
+                                                                <a data-fatal-attraction="container:top_nav|component:product|keyword:interactive_video" data-bp-click="location:global_nav_features|name:select_global_nav_option|target:/features/interactive-video|copy:Interactive video|feature:create_interactive|target_path:/features/interactive-video" href="https://vimeo.com/features/interactive-video">Interactive video</a>
+                                                            </li>
+                                                                                                                    <li role="menuitem" tabindex="-1">
+                                                                <a data-fatal-attraction="container:top_nav|component:product|keyword:live_streaming" data-bp-click="location:global_nav_features|name:select_global_nav_option|target:/features/livestreaming?mkc=368ip_fc_live|copy:Live stream|feature:create_live|target_path:/features/livestreaming?mkc=368ip_fc_live" href="https://vimeo.com/features/livestreaming?mkc=368ip_fc_live">Live stream</a>
+                                                            </li>
+                                                                                                                    <li role="menuitem" tabindex="-1">
+                                                                <a data-fatal-attraction="container:top_nav|component:product|keyword:screen_recorder" data-bp-click="location:global_nav_features|name:select_global_nav_option|target:/features/screen-recorder|copy:Screen recorder|feature:create_record|target_path:/features/screen-recorder" href="https://vimeo.com/features/screen-recorder">Screen recorder</a>
+                                                            </li>
+                                                                                                                    <li role="menuitem" tabindex="-1">
+                                                                <a data-fatal-attraction="container:top_nav|component:product|keyword:create" data-bp-click="location:global_nav_features|name:select_global_nav_option|target:/create|copy:Create video maker|feature:create_vimeo_create|target_path:/create" href="https://vimeo.com/create">Create video maker</a>
+                                                            </li>
+                                                                                                                    <li role="menuitem" tabindex="-1">
+                                                                <a data-fatal-attraction="container:top_nav|component:product|keyword:video_editor" data-bp-click="location:global_nav_features|name:select_global_nav_option|target:/video-editor|copy:Online video editor|feature:create_editor|target_path:/video-editor" href="https://vimeo.com/video-editor">Online video editor</a>
+                                                            </li>
+                                                                                                                    <li role="menuitem" tabindex="-1">
+                                                                <a data-fatal-attraction="container:top_nav|component:product|keyword:for_hire" data-bp-click="location:global_nav_features|name:select_global_nav_option|target:/for-hire|copy:Hire a video pro|feature:create_hire|target_path:/for-hire" href="https://vimeo.com/for-hire">Hire a video pro</a>
+                                                            </li>
+                                                                                                            </ul>
+                                                </li>
+                                                                                                                                    <li class="topnav_desktop_menu_items_dropdown_item--multilevel " role="menuitem" tabindex="-1">
+                                                                                                        <h2>Manage</h2>
+                                                                                                        <ul role="menu" aria-hidden="true">
+                                                                                                                    <li role="menuitem" tabindex="-1">
+                                                                <a data-fatal-attraction="container:top_nav|component:product|keyword:video_library" data-bp-click="location:global_nav_features|name:select_global_nav_option|target:/features/video-library?mkc=368ip_fm_vl|copy:Video library|feature:manage_library|target_path:/features/video-library?mkc=368ip_fm_vl" href="https://vimeo.com/features/video-library?mkc=368ip_fm_vl">Video library</a>
+                                                            </li>
+                                                                                                                    <li role="menuitem" tabindex="-1">
+                                                                <a data-fatal-attraction="container:top_nav|component:product|keyword:video_player" data-bp-click="location:global_nav_features|name:select_global_nav_option|target:/features/video-player?mkc=368ip_fm_adfree|copy:Ad-free player|feature:manage_add_free_player|target_path:/features/video-player?mkc=368ip_fm_adfree" href="https://vimeo.com/features/video-player?mkc=368ip_fm_adfree">Ad-free player</a>
+                                                            </li>
+                                                                                                                    <li role="menuitem" tabindex="-1">
+                                                                <a data-fatal-attraction="container:top_nav|component:product|keyword:hosting" data-bp-click="location:global_nav_features|name:select_global_nav_option|target:/features/online-video-hosting?mkc=368ip_fm_hosting|copy:Video hosting|feature:manage_video_hosting|target_path:/features/online-video-hosting?mkc=368ip_fm_hosting" href="https://vimeo.com/features/online-video-hosting?mkc=368ip_fm_hosting">Video hosting</a>
+                                                            </li>
+                                                                                                                    <li role="menuitem" tabindex="-1">
+                                                                <a data-fatal-attraction="container:top_nav|component:product|keyword:privacy" data-bp-click="location:global_nav_features|name:select_global_nav_option|target:/features/video-privacy?mkc=368ip_fm_privacy|copy:Privacy|feature:manage_privacy|target_path:/features/video-privacy?mkc=368ip_fm_privacy" href="https://vimeo.com/features/video-privacy?mkc=368ip_fm_privacy">Privacy</a>
+                                                            </li>
+                                                                                                            </ul>
+                                                </li>
+                                                                                                                                    <li class="topnav_desktop_menu_items_dropdown_item--multilevel " role="menuitem" tabindex="-1">
+                                                                                                        <h2>Grow</h2>
+                                                                                                        <ul role="menu" aria-hidden="true">
+                                                                                                                    <li role="menuitem" tabindex="-1">
+                                                                <a data-fatal-attraction="container:top_nav|component:product|keyword:small_business" data-bp-click="location:global_nav_features|name:select_global_nav_option|target:/solutions/small-business-solutions|copy:Small business|feature:grow_small_business|target_path:/solutions/small-business-solutions" href="https://vimeo.com/solutions/small-business-solutions">Small business</a>
+                                                            </li>
+                                                                                                                    <li role="menuitem" tabindex="-1">
+                                                                <a data-fatal-attraction="container:top_nav|component:product|keyword:enterprise" data-bp-click="location:global_nav_features|name:select_global_nav_option|target:/enterprise?mkc=368-menu-grow|copy:Enterprise|feature:grow_enterprise|target_path:/enterprise?mkc=368-menu-grow" href="https://vimeo.com/enterprise?mkc=368-menu-grow">Enterprise</a>
+                                                            </li>
+                                                                                                                    <li role="menuitem" tabindex="-1">
+                                                                <a data-fatal-attraction="container:top_nav|component:product|keyword:webinars" data-bp-click="location:global_nav_features|name:select_global_nav_option|target:/features/webinar|copy:Webinars|feature:grow_webinars|target_path:/features/webinar" href="https://vimeo.com/features/webinar">Webinars</a>
+                                                            </li>
+                                                                                                                    <li role="menuitem" tabindex="-1">
+                                                                <a data-fatal-attraction="container:top_nav|component:product|keyword:analytics" data-bp-click="location:global_nav_features|name:select_global_nav_option|target:/features/video-analytics?mkc=368ip_fg_analyze|copy:Video analytics|feature:grow_analytics|target_path:/features/video-analytics?mkc=368ip_fg_analyze" href="https://vimeo.com/features/video-analytics?mkc=368ip_fg_analyze">Video analytics</a>
+                                                            </li>
+                                                                                                                    <li role="menuitem" tabindex="-1">
+                                                                <a data-fatal-attraction="container:top_nav|component:product|keyword:monetization" data-bp-click="location:global_nav_features|name:select_global_nav_option|target:/ott?mkc=entprsb|copy:Video monetization|feature:grow_ott|target_path:/ott?mkc=entprsb" href="https://vimeo.com/ott?mkc=entprsb">Video monetization</a>
+                                                            </li>
+                                                                                                            </ul>
+                                                </li>
+                                                                                                                        </ul>
+                                                                                                                <div class="highlights_banner">
+                                            <h2 class="banner_heading">
+                                                DEMO VIDEOS                                            </h2>
+                                            <h3 class="banner_main_text">
+                                                Get to know everything Vimeo can do for your business.                                            </h3>
+                                            <a href="https://vimeo.com/enterprise/watch-demo?mkc=368-tv-wd" class="banner_button banner_button_text" data-fatal-attraction="container:top_nav|component:features_highlight|keyword:watch_demo">Watch now</a>
+                                        </div>
+                                                                    </div>
+                            
+                        </li>
+                                                                                            <li class="topnav_desktop_menu_items topnav_desktop_menu_items_left" data-menu-id="resources" data-fatal-attraction-impression="container:top_nav|component:resources_menu|keyword:resources_hover">
+                            <a onclick="event.preventDefault();event.target.blur();" class="topnav_menu_no_link topnav_has_dropdown" data-bp-hover="location:global_nav|name:expand_global_nav_option|copy:resources|feature:resources" href="https://vimeo.com/786646692#" rel="toggle" role="button" aria-owns="topnav_resources">
+                                Resources                                                                    <div class="topnav_dropdown_arrow">
+                                        <svg width="20px" height="20px" viewBox="0 0 24 24">
+                                            <path d="M12 15.5a1 1 0 0 1-.67-.26l-5-4.5 1.34-1.48L12 13.15l4.33-3.9 1.34 1.49-5 4.5a1 1 0 0 1-.67.26z" fill="#657987"></path>
+                                        </svg>
+                                    </div>
+                                                            </a>
+                                                                                        <div class="topnav_desktop_menu_items_dropdown row_flex" role="menu" aria-hidden="true" id="topnav_resources">
+                                    <ul class="row_elements">
+                                                                                        <li class="topnav_desktop_menu_items_dropdown_item--multilevel " role="menuitem" tabindex="-1">
+                                                                                                        <h2>Learn</h2>
+                                                                                                        <ul role="menu" aria-hidden="true">
+                                                                                                                    <li role="menuitem" tabindex="-1">
+                                                                <a data-fatal-attraction="container:top_nav|component:inspiration|keyword:blog" data-gtm-click="top_nav_inspiration_blog" data-bp-click="location:global_nav_resources|name:select_global_nav_option|target:/blog|copy:Vimeo blog|feature:learn_blog|target_path:/blog" href="https://vimeo.com/blog">Vimeo blog</a>
+                                                            </li>
+                                                                                                                    <li role="menuitem" tabindex="-1">
+                                                                <a data-fatal-attraction="container:top_nav|component:inspiration|keyword:video_school" data-gtm-click="top_nav_inspiration_video_school" data-bp-click="location:global_nav_resources|name:select_global_nav_option|target:/blog/category/video-school|copy:Video School|feature:learn_video_school|target_path:/blog/category/video-school" href="https://vimeo.com/blog/category/video-school">Video School</a>
+                                                            </li>
+                                                                                                                    <li role="menuitem" tabindex="-1">
+                                                                <a data-fatal-attraction="container:top_nav|component:resources_learn|keyword:customer_stories" data-bp-click="location:global_nav_resources|name:select_global_nav_option|target:/blog/category/case-study|copy:Customer stories|feature:learn_customer_stories|target_path:/blog/category/case-study" href="https://vimeo.com/blog/category/case-study">Customer stories</a>
+                                                            </li>
+                                                                                                                    <li role="menuitem" tabindex="-1">
+                                                                <a data-fatal-attraction="container:top_nav|component:resources_learn|keyword:investor_relations" data-bp-click="location:global_nav_resources|name:select_global_nav_option|target:https://investors.vimeo.com|copy:Investor Relations|feature:learn_investor_relations|target_path:https://investors.vimeo.com" href="https://investors.vimeo.com/">Investor Relations</a>
+                                                            </li>
+                                                                                                            </ul>
+                                                </li>
+                                                                                                                                    <li class="topnav_desktop_menu_items_dropdown_item--multilevel " role="menuitem" tabindex="-1">
+                                                                                                        <h2>Connect</h2>
+                                                                                                        <ul role="menu" aria-hidden="true">
+                                                                                                                    <li role="menuitem" tabindex="-1">
+                                                                <a data-fatal-attraction="container:top_nav|component:resources_connect|keyword:developer_tools" data-bp-click="location:global_nav_resources|name:select_global_nav_option|target:https://developer.vimeo.com/|copy:Developer tools|feature:connect_developer_tools|target_path:https://developer.vimeo.com/" href="https://developer.vimeo.com/">Developer tools</a>
+                                                            </li>
+                                                                                                                    <li role="menuitem" tabindex="-1">
+                                                                <a data-fatal-attraction="container:top_nav|component:resources_connect|keyword:partner_program" data-bp-click="location:global_nav_resources|name:select_global_nav_option|target:/partners|copy:Partner program|feature:connect_partner_program|target_path:/partners" href="https://vimeo.com/partners">Partner program</a>
+                                                            </li>
+                                                                                                                    <li role="menuitem" tabindex="-1">
+                                                                <a data-fatal-attraction="container:top_nav|component:resources_connect|keyword:creative_community" data-bp-click="location:global_nav_resources|name:select_global_nav_option|target:/experts|copy:Creative community|feature:connect_creative_community|target_path:/experts" href="https://vimeo.com/experts">Creative community</a>
+                                                            </li>
+                                                                                                                    <li role="menuitem" tabindex="-1">
+                                                                <a data-fatal-attraction="container:top_nav|component:resources_connect|keyword:help_center" data-bp-click="location:global_nav_resources|name:select_global_nav_option|target:https://vimeo.zendesk.com/hc/en-us|copy:Help center|feature:connect_help_center|target_path:https://vimeo.zendesk.com/hc/en-us" href="https://vimeo.zendesk.com/hc/en-us">Help center</a>
+                                                            </li>
+                                                                                                            </ul>
+                                                </li>
+                                                                                                                        </ul>
+                                                                                                        </div>
+                            
+                        </li>
+                                                                                            <li class="topnav_desktop_menu_items topnav_desktop_menu_items_left" data-menu-id="watch">
+                            <a class="topnav_has_dropdown" data-bp-hover="location:global_nav|name:expand_global_nav_option|copy:watch|feature:watch" href="https://vimeo.com/786646692#" rel="toggle" role="button" aria-owns="topnav_watch">
+                                Watch                                                                    <div class="topnav_dropdown_arrow">
+                                        <svg width="20px" height="20px" viewBox="0 0 24 24">
+                                            <path d="M12 15.5a1 1 0 0 1-.67-.26l-5-4.5 1.34-1.48L12 13.15l4.33-3.9 1.34 1.49-5 4.5a1 1 0 0 1-.67.26z" fill="#657987"></path>
+                                        </svg>
+                                    </div>
+                                                            </a>
+                                                                                        <div class="topnav_desktop_menu_items_dropdown column_flex" role="menu" aria-hidden="true" id="topnav_watch">
+                                    <ul class="column_elements">
+                                                                                        <li role="menuitem" tabindex="-1">
+                                                    <a data-fatal-attraction="container:top_nav|component:watch|keyword:boty" data-gtm-click="top_nav_watch_boty_click" data-bp-click="location:global_nav_watch|name:select_global_nav_option|target:/bestoftheyear|copy:Best of the Year|feature:best_of_the_year|target_path:/bestoftheyear" href="https://vimeo.com/bestoftheyear">Best of the Year</a>
+                                                </li>
+                                                                                                                                    <li role="menuitem" tabindex="-1">
+                                                    <a class="topnav_watch_item" data-fatal-attraction="container:top_nav|component:watch|keyword:browse_videos" data-gtm-click="top_nav_watch_browse_videos_click" data-bp-click="location:global_nav_watch|name:select_global_nav_option|target:/watch|copy:Browse Videos|feature:browse_videos|target_path:/watch" href="https://vimeo.com/watch">Browse Videos</a>
+                                                </li>
+                                                                                                                                    <li role="menuitem" tabindex="-1">
+                                                    <a class="topnav_watch_item" data-fatal-attraction="container:top_nav|component:watch|keyword:staff_picks" data-gtm-click="top_nav_watch_staff_picks_click" data-bp-click="location:global_nav_watch|name:select_global_nav_option|target:/channels/staffpicks|copy:Staff Picks|feature:staff_picks|target_path:/channels/staffpicks" href="https://vimeo.com/channels/staffpicks">Staff Picks</a>
+                                                </li>
+                                                                                                                                    <li role="menuitem" tabindex="-1">
+                                                    <a class="topnav_watch_item" data-fatal-attraction="container:top_nav|component:watch|keyword:categories" data-gtm-click="top_nav_watch_categories_click" data-bp-click="location:global_nav_watch|name:select_global_nav_option|target:/categories|copy:Categories|feature:categories|target_path:/categories" href="https://vimeo.com/categories">Categories</a>
+                                                </li>
+                                                                                                                                    <li role="menuitem" tabindex="-1">
+                                                    <a class="topnav_watch_item" data-fatal-attraction="container:top_nav|component:watch|keyword:channels" data-gtm-click="top_nav_watch_channels_click" data-bp-click="location:global_nav_watch|name:select_global_nav_option|target:/channels|copy:Channels|feature:channels|target_path:/channels" href="https://vimeo.com/channels">Channels</a>
+                                                </li>
+                                                                                                                                    <li role="menuitem" tabindex="-1">
+                                                    <a class="topnav_watch_item" data-fatal-attraction="container:top_nav|component:watch|keyword:on_demand" data-gtm-click="top_nav_ondemand_click" data-bp-click="location:global_nav_watch|name:select_global_nav_option|target:/ondemand|copy:On Demand|feature:on_demand|target_path:/ondemand" href="https://vimeo.com/ondemand">On Demand</a>
+                                                </li>
+                                                                                                                        </ul>
+                                                                                                        </div>
+                            
+                        </li>
+                                                                                            <li class="topnav_desktop_menu_items topnav_desktop_menu_items_left" data-menu-id="pricing">
+                            <a data-gtm-click="top_nav_pricing_click" data-fatal-attraction="container:top_nav|component:pricing" data-bp-click="location:global_nav|target:upgrade_page|name:select_global_nav_option|copy:upgrade|feature:upgrade|target_path:/upgrade" href="https://vimeo.com/upgrade" rel="toggle" role="button" aria-owns="topnav_pricing">
+                                Pricing                                                            </a>
+                                                        
+                        </li>
+                                                                                            <li class="topnav_desktop_menu_items topnav_desktop_menu_items_left" data-menu-id="contact_sales">
+                            <a data-gtm-click="top_nav_contact_sales_click" data-fatal-attraction="container:top_nav|component:contact_sales|keyword:contact_sales" href="https://vimeo.com/enterprise/contact-us?mkc=368tnc" rel="toggle" role="button" aria-owns="topnav_contact_sales">
+                                Contact Sales                                                            </a>
+                                                        
+                        </li>
+                                    </ul>
+            </nav><!-- /.topnav_desktop_menu -->
+        
+                                                                            <div id="topnav_menu_search_omnisearch" class="topnav_menu_search" data-query="" data-placeholder="Search videos, people, and more"><form data-reactroot="" class=" search-ui-test_form sc-fPEBxH chrbXh" id="topnav-search_search_form" action="https://vimeo.com/search" method="get" role="search" autocomplete="off"><div class="sc-cyQzhP bHZNbO"><div class="sc-lmrgJh fdrIwN"><div class="sc-eXsVQl dOisfP"><div class="sc-bpubUI iDATSd"><input type="text" class="sc-izUgoq jQDDlx sc-sVRsr kTRUlo" placeholder="Search videos, people, and more" value="" aria-invalid="false" format="neutral" id="topnav-search" data-bp-click="location:global_nav|target:open omnisearch|name:open_omnisearch|copy:Search videos, people, and more|feature:home"><div class="sc-gggouf kxfizT"><button class="sc-Ehqfj jDdkxV" format="subtle" aria-label="submit"><svg viewBox="0 0 24 24" class="search-ui-test_searchbtn"><path d="M19.71 18.29l-3.11-3.11a7 7 0 10-1.41 1.42l3.11 3.11a1 1 0 001.41-1.42zM6 11a5 5 0 115 5 5 5 0 01-5-5z" fill="#1a2e3b"></path></svg></button></div></div><div class=""><!-- react-empty: 13 --><!-- react-empty: 14 --></div></div></div><div class="sc-LAuEU ylWDd"></div></div></form></div>
+                                    
+                            <div class="topnav_menu_right">
+                                
+                                                        <ul class="topnav_menu_desktop_main" role="menu">
+                                                            <li class="topnav_desktop_menu_items topnav_desktop_menu_items_right" data-menu-id="login">
+                                    <a class="js-topnav_menu_auth" onclick="event.preventDefault();vimeo.Modal.create({size:&#39;xsmall&#39;,content:&#39;/log_in?modal=new&#39;}).then(completeUserLogin)" data-ga-event-click="top_nav|login" data-fatal-attraction="container:top_nav|component:login|target:/log_in" data-gtm-click="top_nav_login_click" href="https://vimeo.com/log_in" rel="toggle" role="button" aria-owns="topnav_login">
+                                        Log in                                    </a>
+                                </li>
+                                                            <li class="topnav_desktop_menu_items topnav_desktop_menu_items_right" data-menu-id="join">
+                                    <a class="topnav_menu_join js-topnav_menu_auth" onclick="event.preventDefault();vimeo.Modal.create({size:&#39;xsmall&#39;,content:&#39;/join?modal=new&#39;}).then(completeUserLogin)" data-ga-event-click="top_nav|join" data-fatal-attraction="container:top_nav|component:join|target:/join" data-gtm-click="top_nav_join_click" href="https://vimeo.com/join" rel="toggle" role="button" aria-owns="topnav_join">
+                                        Join                                    </a>
+                                </li>
+                                                    </ul>
+                                                                        <div id="record_tip_wrapper" class="topnav_desktop_video_popover" onmouseenter="trackNewVideoDropdownImpression(&#39;variant_screen&#39;)">
+    <button id="new_video_dropdown_button" class="topnav_desktop_video_popover_button iris_btn--primary" data-fatal-attraction="container:top_nav|component:new_video" data-bp-click="location:global_nav|target:upload_page|name:new_video|copy:new_video|feature:global_nav_new_video|target_path:/upload" data-bp-hover="location:global_nav|name:expand_new_video_option|copy:new_video|feature:new_video" onclick="handleNewVideoClick()">
+        <span class="topnav_desktop_video_popover_span_wrapper">
+            New video            <span id="record_animation_wrapper" class="topnav_desktop_video_popover_span_variant no_animation">
+                <svg viewBox="0 0 24 24" width="24px" height="24px">
+                    <path d="M12 15.5a1 1 0 0 1-.67-.26l-5-4.5 1.34-1.48L12 13.15l4.33-3.9 1.34 1.49-5 4.5a1 1 0 0 1-.67.26z" fill="#ffffff"></path>
+                </svg>
+            </span>
+        </span>
+    </button>
+    
+            <ul id="new_video_dropdown_variant" class="topnav_desktop_menu_items_dropdown column_elements topnav_desktop_video_popover_dropdown_variant" role="menu" aria-hidden="true" style="padding: unset;">
+                            
+                <li class="topnav_desktop_menu_items_dropdown_item_variant" role="menuitem" tabindex="-1">
+                    <a onclick="(function(event) { if (window.handleUploadButtonClick) { handleUploadButtonClick(event); }})(event)" data-fatal-attraction="container:top_nav|component:new_video|keyword:{&#39;action&#39;:&#39;upload&#39;}|target:/upload|type:click" data-bp-click="location:global_nav_new_video|name:select_new_video_option|target:upload_page|copy:Upload|feature:upload|target_path:/upload" id="topnav_desktop_upload_button" href="https://vimeo.com/upload">
+                        <div class="align_topnav_dropdown_icons">
+                            <svg viewBox="0 0 20 20" width="24px" height="24px">
+                            <path d="M18 8.48a7.16 7.16 0 0 0-1.84-4.76A5.81 5.81 0 0 0 6.92 5a5.24 5.24 0 0 0-4.69 3.85A4.91 4.91 0 0 0 0 13a5.13 5.13 0 0 0 5 5h10a5.1 5.1 0 0 0 5-4.94 5.89 5.89 0 0 0-2-4.58zM15 16h-4v-3.59l1.29 1.29 1.41-1.41-3.7-3.7-3.71 3.7L7.7 13.7 9 12.41V16H5a3.16 3.16 0 0 1-3-3 2.91 2.91 0 0 1 1.52-2.58l.4-.2.08-.44A3.38 3.38 0 0 1 7.59 7h.7l.24-.66A3.69 3.69 0 0 1 12 4a3.73 3.73 0 0 1 2.72 1.12A5.45 5.45 0 0 1 16 9v.54l.45.3A3.79 3.79 0 0 1 18 13.06 3.09 3.09 0 0 1 15 16z" fill="#1a2e3b"></path>
+                        </svg>                            <div class="topnav_dropdown_label_wrapper">
+                                <div class="topnav_dropdown_label">
+                                    Upload                                                                    </div>
+                                                            </div>
+                        </div>
+                    </a>
+                </li>
+                            
+                <li class="topnav_desktop_menu_items_dropdown_item_variant" role="menuitem" tabindex="-1">
+                    <a onclick="handleCreateVideoClick(event)" data-fatal-attraction="container:top_nav|component:new_video|keyword:{&#39;action&#39;:&#39;create&#39;}|target:/create/templates|type:click" data-bp-click="location:global_nav_new_video|name:select_new_video_option|target:create_homepage|copy:create_video|feature:vimeo_create|target_path:/create/templates" id="topnav_desktop_create_video_button" href="https://vimeo.com/create/templates">
+                        <div class="align_topnav_dropdown_icons">
+                            <svg viewBox="0 0 20 20" width="24px" height="24px">
+                        <path d="M3.2 16.8l3.8-1 10-10c.2-.2.2-.5 0-.7L14.9 3c-.2-.2-.5-.2-.7 0l-2.1 2.1 2.8 2.8L13.8 9 11 6.2 4.2 13l-1 3.8zm9.9-14.9c.8-.8 2-.8 2.8 0L18.1 4c.8.8.8 2 0 2.8L7.8 17.2l-5.6 1.5c-.5.1-.9-.2-.7-.7l1.4-5.7L13.1 1.9z" fill="#1a2e3b"></path>
+                    </svg>                            <div class="topnav_dropdown_label_wrapper">
+                                <div class="topnav_dropdown_label">
+                                    Create video                                                                    </div>
+                                                            </div>
+                        </div>
+                    </a>
+                </li>
+                            
+                <li class="topnav_desktop_menu_items_dropdown_item_variant" role="menuitem" tabindex="-1">
+                    <a data-fatal-attraction="container:top_nav|component:new_video|keyword:screen_record|type:click" data-bp-click="location:global_nav_new_video|name:select_new_video_option|target:vimeo_record|copy:record_screen|feature:record|target_path:/record/start-recording" id="topnav_desktop_record_screen_button" href="https://vimeo.com/record/start-recording">
+                        <div class="align_topnav_dropdown_icons">
+                            <svg width="24px" height="24px" viewBox="0 0 24 24">
+                    <g id="Icon-24px" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+                        <g id="Oval">
+                            <use fill="black" fill-opacity="1" filter="url(#filter-2)" xlink:href="#path-1"></use>
+                            <circle stroke="#1A2E3B" stroke-width="2" cx="12" cy="12" r="9"></circle>
+                        </g>
+                        <rect id="Rectangle" fill="#1A2E3B" x="8" y="8" width="8" height="8" rx="4"></rect>
+                    </g>
+                </svg>                            <div class="topnav_dropdown_label_wrapper">
+                                <div class="topnav_dropdown_label">
+                                    Record screen                                                                    </div>
+                                                            </div>
+                        </div>
+                    </a>
+                </li>
+                            
+                <li class="topnav_desktop_menu_items_dropdown_item_variant" role="menuitem" tabindex="-1">
+                    <a data-fatal-attraction="container:top_nav|component:new_video|keyword:live_unified_event_entry" data-bp-click="location:global_nav_new_video|name:select_new_video_option|target:live_event_settings|copy:Create Event|feature:live|target_path://vimeo.com/live/select?location=top_nav_classic_vm" id="top_nav_unified_create_event_button" href="https://vimeo.com/live/select?location=top_nav_classic_vm">
+                        <div class="align_topnav_dropdown_icons">
+                            <svg viewBox="0 0 20 14" width="24px" height="24px">
+                <path d="M19 1h-1.49a1 1 0 00-.72.3L14 4.18V2a2 2 0 00-2-2H2a2 2 0 00-2 2v10a2 2 0 002 2h10a2 2 0 002-2V9.82l2.8 2.87a1 1 0 00.72.3H19a1 1 0 001-1V2a1 1 0 00-1-1zm-7 11H2V2h10zm6-1h-.06L14 7l3.89-4H18z" fill="#1a2e3b" fill-rule="evenodd"></path>
+            </svg>                            <div class="topnav_dropdown_label_wrapper">
+                                <div class="topnav_dropdown_label">
+                                    Create event                                                                    </div>
+                                                            </div>
+                        </div>
+                    </a>
+                </li>
+                    </ul>
+    </div>
+                
+                <div id="cart_top_nav" class="topnav_cart_button"></div>
+
+            </div><!-- /.topnav_menu_right -->
+            </div><!-- /.topnav_desktop_wrapper -->
+</div>
+
+    <script>
+        var isMobile = /iphone|ipod|android|webos|blackberry|windows phone/i.test(navigator.userAgent.toLowerCase());
+
+        // DO NOT REMOVE. This is a callback for the login & join buttons in TopNavBuilder.
+        function completeUserLogin(response) {
+            if (response && !response.signup) {
+                window.location.reload();
+            }
+        }
+
+        function handleUploadButtonClick(event) {
+            // Opens the auth modal for logged out users
+            if (
+                window.vimeo
+                && window.vimeo.config
+                && window.vimeo.Modal
+                && !window.vimeo.cur_user
+            ){
+                event.preventDefault();
+                isMobile ? window.location.href="/upload" : vimeo.Modal.create({
+                    size: 'xsmall',
+                    content:'/join?modal=new&redirect=/upload',
+                });
+            }
+        }
+    </script>
+
+<script>
+
+    var isBrowserIE = (function(window) {
+        return /(MSIE|Trident|Edge)/.test(window.navigator.userAgent);
+    })(window);
+
+    // IE fix for Dropdown menu
+    (function() {
+        var dropDownSelector = '.topnav_desktop_menu_items_dropdown';
+        var dropDownEle = document.querySelector(dropDownSelector);
+        if(isBrowserIE) {
+            dropDownEle.classList.add('column_flex');
+        }
+    })();
+
+    function handleNewVideoClick() {
+        if (window.vimeo && window.vimeo.cur_user) {
+            if (window.location.pathname !== '/upload') {
+                window.location.href = '/upload';
+            }
+        } else {
+            window.vimeo.Modal.create({ size: 'xsmall', content: '/join?modal=new&redirect=/upload' })
+                .then(completeUserLogin);
+        }
+    }
+
+    function handleCreateVideoClick(e, isRecordScreen) {
+        if (window.vimeo && !window.vimeo.cur_user && !isRecordScreen) {
+            e.preventDefault();
+
+            window.vimeo.Modal.create({
+                size: 'xsmall',
+                content: '/join?modal=new&redirect=' + encodeURIComponent("/welcome-survey?type=segment&vimeoHref=" + encodeURIComponent('/create/templates'))
+            }).then(completeUserLogin);
+        }
+    }
+
+    function trackNewVideoDropdownImpression(recordOption) {
+        if (window.__fa) {
+            window.__fa.push(['trackEvent', {
+                type: 'impression',
+                container: 'top_nav',
+                component: 'new_video',
+            }]);
+
+            window.__fa.push(['trackEvent', {
+                type: 'impression',
+                container: 'top_nav',
+                component: 'go_live',
+                keyword: 'shown_owner',
+            }]);
+
+            if (recordOption) {
+                window.__fa.push(['trackEvent', {
+                    type: 'impression',
+                    container: 'top_nav',
+                    component: 'record',
+                    keyword: recordOption,
+                }]);
+            }
+        }
+    }
+
+    function handleLiveButtonClick(event) {
+        // Opens the auth modal for logged out users
+        if (
+            window.vimeo
+            && window.vimeo.config
+            && window.vimeo.Modal
+            && !window.vimeo.cur_user
+            && !isMobile
+        ){
+            event.preventDefault();
+            const liveHref = '/features/livestreaming/';
+            vimeo.Modal.create({
+                size: 'xsmall',
+                content: '/join?modal=new&redirect=' + encodeURIComponent(liveHref)
+            });
+        }
+    }
+</script>
+
+    <script>
+        var arrow = document.getElementById('record_animation_wrapper');
+        var newVideoBtn = document.getElementById('record_tip_wrapper');
+
+        if (arrow) {
+            arrow.classList.add('no_animation');
+        }
+
+        var isHovered = false;
+
+        if (newVideoBtn && false) {
+            newVideoBtn.addEventListener('mouseenter', function() {
+                if (isHovered) return;
+
+                isHovered = true;
+
+                if (arrow) {
+                    arrow.classList.remove('no_animation');
+                }
+
+                store_record_tip_settings(1);
+
+            }, false);
+        }
+
+        function store_record_tip_settings(value) {
+            var xhr = new XMLHttpRequest();
+
+            xhr.open('POST', '/settings/nav_recorder_tip');
+            xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
+            xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
+            xhr.send('record_screen_tip_state=' + value + '&token=' + vimeo.xsrft);
+
+            // Nothing to handle. We hope for the best in this case
+            xhr.onload = function () {};
+        };
+    </script>
+
+
+    
+<!-- /* Responsive Top Nav (Explore, LOHP, Watch, tc) *-->
+<nav id="topnav_mobile" class="topnav_mobile    nav_bar--li" role="banner">
+
+    <div class="topnav_mobile_bar">
+        
+                                <svg data-action="menu.open" class="navbar_hamburger nav_bar_icon topnav_mobile_button topnav_mobile_pull_left js-topnav_mobile_header_logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+                <title>Menu</title>
+                <path id="Rectangle-4" d="M7,8H25a1,1,0,0,1,1,1h0a1,1,0,0,1-1,1H7A1,1,0,0,1,6,9H6A1,1,0,0,1,7,8Z"></path>
+                <path d="M7,15H25a1,1,0,0,1,1,1h0a1,1,0,0,1-1,1H7a1,1,0,0,1-1-1H6A1,1,0,0,1,7,15Z"></path>
+                <path d="M7,22H25a1,1,0,0,1,1,1h0a1,1,0,0,1-1,1H7a1,1,0,0,1-1-1H6A1,1,0,0,1,7,22Z"></path>
+            </svg>
+
+                        <div class="topnav_action_buttons">
+                <a href="https://vimeo.com/search" class="topnav_mobile_button topnav_mobile_pull_right topnav_mobile_header_search">
+                    <svg class="nav_bar_search_icon nav_bar_icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+                        <title>Search</title>
+                        <path d="M26.74,25.32l-4.53-4.53a1,1,0,0,0-.21-.14A9,9,0,1,0,20.65,22a1,1,0,0,0,.14.21l4.53,4.53a1,1,0,0,0,1.41-1.41ZM15,22a7,7,0,1,1,7-7A7,7,0,0,1,15,22Z"></path>
+                    </svg>
+                </a>
+                                <div id="cart_top_nav_mobile" class="topnav_cart_button"></div>
+            </div>
+            <!-- Vimeo Logo -->
+            <div class="nav_bar_title js-nav_bar_title">
+                <a href="https://vimeo.com/" gtm-data-click="mobile_nav_home_logo_click">
+                    <svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 441 124.682" width="86px" height="27px">
+                        <g>
+                            <path d="M120.481,27.326c5.462,0,10.188-1.91,14.174-5.728c3.547-3.379,5.392-6.906,5.54-10.583c0.143-2.492-0.815-4.951-2.88-7.378C135.244,1.217,132.662,0,129.562,0c-5.32,0-10.155,1.767-14.511,5.288c-4.356,3.527-6.608,7.204-6.75,11.022C108.002,23.656,112.067,27.326,120.481,27.326z"></path>
+                            <path d="M434.079,50.16c-5.319-6.925-13.145-10.395-23.475-10.395c-16.097,0-29.455,5.896-40.083,17.688c-9.902,10.614-14.478,22.265-13.733,34.944c0.049,0.932,0.132,1.84,0.229,2.738c-0.554,0.241-1.093,0.483-1.662,0.724c-12.556,5.411-24.147,8.11-34.775,8.11c-5.32,0-9.307-1.839-11.96-5.521c14.316-2.355,26.206-7.876,35.662-16.568c8.854-7.955,12.989-15.689,12.4-23.197c-0.887-11.78-8.562-17.676-23.034-17.676c-15.65,0-29.235,5.909-40.75,17.714c-10.484,10.783-15.805,22.148-15.947,34.103c-0.04,2.005,0.066,3.932,0.3,5.789c-2.477,1.632-4.352,2.456-5.613,2.456c-2.81,0-4.576-0.582-5.314-1.76c-0.737-1.178-1.035-3.308-0.887-6.401c0-1.178,0.919-5.695,2.771-13.565c1.845-7.87,2.841-13.864,2.99-17.987c0.291-6.025-0.894-10.66-3.547-13.896c-3.101-3.974-8.194-5.663-15.281-5.074c-5.902,0.447-11.592,2.66-17.054,6.647c-3.249,2.363-6.569,5.534-9.961,9.521c-1.185,1.036-2.291,2-3.327,2.88c0.143-6.051-1.036-10.705-3.54-13.954c-3.107-3.987-8.272-5.683-15.508-5.094c-8.415,0.738-16.02,4.065-22.809,9.967c-2.958,2.511-5.54,5.469-7.753,8.861c0.291-1.327,0.44-2.731,0.44-4.207c0-4.576-1.185-8.602-3.547-12.071s-5.462-5.055-9.301-4.757c-2.213,0.149-6.42,3.101-12.621,8.854c-8.569,7.974-13.216,12.259-13.954,12.841l5.313,5.98c4.136-2.984,6.647-4.479,7.534-4.479c1.618,0,2.285,1.327,1.994,3.975c-0.143,3.831-0.822,9.164-2.039,16.012c-0.754,4.243-1.298,7.904-1.638,10.988c-0.066,0.055-0.129,0.109-0.196,0.164c-5.32,4.375-9.009,6.556-11.074,6.556c-4.725,0-7.016-3.158-6.867-9.488c2.213-13.824,4.285-25.222,6.207-34.199c0.583-5.294-0.266-9.592-2.55-12.906c-2.291-3.314-5.87-4.744-10.737-4.304c-3.107,0.298-7.832,3.249-14.181,8.86c-2.205,2-4.41,3.996-6.615,5.993c-0.437-10.447-5.204-15.822-14.329-16.09c-13.669-0.44-22.931,7.275-27.779,23.158c2.504-1.074,4.938-1.618,7.301-1.618c5.016,0,7.229,2.822,6.64,8.453c-0.297,3.411-2.511,8.375-6.64,14.899c-4.136,6.523-7.236,9.786-9.301,9.786c-2.66,0-5.094-5.023-7.307-15.081c-0.745-2.951-2.071-10.491-3.987-22.614c-1.773-11.236-6.499-16.485-14.174-15.747c-3.249,0.298-8.123,3.249-14.614,8.86C9.669,53.318,4.867,57.597,0,61.875l4.641,5.98c4.42-3.094,7.003-4.647,7.741-4.647c3.385,0,6.55,5.313,9.501,15.929c2.653,9.733,5.307,19.468,7.961,29.202c3.974,10.621,8.841,15.929,14.588,15.929c9.281,0,20.627-8.719,34.038-26.154C87.892,85.987,93.99,75.74,96.8,67.354c3.72-2.748,6.018-4.146,6.853-4.146c2.653,0,3.987,1.922,3.987,5.754c0,0.738-1.443,6.2-4.324,16.381c-2.88,10.182-4.395,17.709-4.537,22.575c-0.149,4.726,0.997,8.557,3.43,11.508c2.434,2.952,5.941,4.428,10.524,4.428c9.89,0,19.779-4.278,29.675-12.835c0.881-0.772,1.738-1.557,2.573-2.352c0.783,3.312,2.124,6.045,4.07,8.15c4.259,4.569,11.456,6.706,21.592,6.408c-1.353-3.249-1.884-9.003-1.586-17.274c0.44-9.152,2.809-17.941,7.094-26.355s8.278-12.627,11.98-12.627c4.285,0,6.285,2.731,5.987,8.193c-0.149,3.696-0.874,7.903-2.175,12.628c-1.307,4.725-2.032,9.449-2.174,14.174c-0.298,7.534,1.392,12.919,5.081,16.168c4.116,3.689,11.334,5.392,21.638,5.094c-1.541-3.392-2.162-8.266-1.864-14.621c0.44-9.003,3.482-18.304,9.113-27.902c5.333-9.151,9.922-13.733,13.772-13.733c3.56,0,5.263,2.809,5.113,8.414c-0.148,3.688-1.074,8.854-2.771,15.494c-1.695,6.641-2.621,12.316-2.764,17.041c-0.297,10.628,4.35,15.936,13.955,15.936c9.889,0,19.779-4.278,29.675-12.835c0.164-0.144,0.316-0.293,0.479-0.438c0.34,0.586,0.688,1.168,1.068,1.732c5.165,7.967,13.734,11.954,25.695,11.954c16.09,0,31.966-4.492,47.616-13.488c1.756-0.99,3.422-1.979,5.017-2.97c0.986,1.991,2.138,3.866,3.502,5.591c6.052,7.521,14.912,11.281,26.575,11.281c14.025,0,25.767-4.938,35.216-14.815c9.449-9.876,14.466-21.598,15.061-35.163C441.387,64.684,439.102,56.503,434.079,50.16z M305.118,90.003c-0.084-1.909-0.084-2.867,0-2.867c0.143-5.579,2.505-11.417,7.074-17.514s9.062-9.146,13.488-9.146c3.392,0,5.01,1.987,4.867,5.948c-0.149,2.938-2.362,6.764-6.634,11.462C318.606,83.324,312.341,87.362,305.118,90.003z M415.918,73.868c-0.297,7.1-2.434,13.902-6.42,20.413c-4.725,7.845-10.414,11.76-17.055,11.76c-2.958,0-5.249-1.624-6.867-4.88c-1.476-2.809-2.142-6.064-1.993-9.767c0.291-7.54,2.505-14.64,6.647-21.3c4.866-8.136,11.067-12.207,18.601-12.207c2.356,0,4.168,1.67,5.424,4.997S416.067,69.875,415.918,73.868z"></path>
+                        </g>
+                    </svg>
+                </a>
+            </div>
+            </div>
+
+        <div class="topnav_mobile_menu lohp_topnav_mobile_menu js-topnav_mobile_menu_main">
+        <div class="lohp-flex-wrapper">
+            <div>
+                <div class="topnav_mobile_bar">
+                                                                    <button data-action="menu.close" data-gtm-click="mobile_nav_menu_close_click" class="menu_close pull_left js-topnav_mobile_header_close">
+                            <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="22" height="17" viewBox="0 0 18 17">
+                                <g stroke-width="0.1" fill-rule="evenodd">
+                                    <path d="M1 16.218L16.627.59l.778.778L1.778 16.995z"></path>
+                                    <path d="M1.778.59l15.627 15.628-.778.777L1 1.368z"></path>
+                                </g>
+                            </svg>
+                        </button>
+
+                                                <a class="lohp_logo">
+                            <svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 441 124.682" width="86px" height="27px">
+                                <g>
+                                    <path d="M120.481,27.326c5.462,0,10.188-1.91,14.174-5.728c3.547-3.379,5.392-6.906,5.54-10.583c0.143-2.492-0.815-4.951-2.88-7.378C135.244,1.217,132.662,0,129.562,0c-5.32,0-10.155,1.767-14.511,5.288c-4.356,3.527-6.608,7.204-6.75,11.022C108.002,23.656,112.067,27.326,120.481,27.326z"></path>
+                                    <path d="M434.079,50.16c-5.319-6.925-13.145-10.395-23.475-10.395c-16.097,0-29.455,5.896-40.083,17.688c-9.902,10.614-14.478,22.265-13.733,34.944c0.049,0.932,0.132,1.84,0.229,2.738c-0.554,0.241-1.093,0.483-1.662,0.724c-12.556,5.411-24.147,8.11-34.775,8.11c-5.32,0-9.307-1.839-11.96-5.521c14.316-2.355,26.206-7.876,35.662-16.568c8.854-7.955,12.989-15.689,12.4-23.197c-0.887-11.78-8.562-17.676-23.034-17.676c-15.65,0-29.235,5.909-40.75,17.714c-10.484,10.783-15.805,22.148-15.947,34.103c-0.04,2.005,0.066,3.932,0.3,5.789c-2.477,1.632-4.352,2.456-5.613,2.456c-2.81,0-4.576-0.582-5.314-1.76c-0.737-1.178-1.035-3.308-0.887-6.401c0-1.178,0.919-5.695,2.771-13.565c1.845-7.87,2.841-13.864,2.99-17.987c0.291-6.025-0.894-10.66-3.547-13.896c-3.101-3.974-8.194-5.663-15.281-5.074c-5.902,0.447-11.592,2.66-17.054,6.647c-3.249,2.363-6.569,5.534-9.961,9.521c-1.185,1.036-2.291,2-3.327,2.88c0.143-6.051-1.036-10.705-3.54-13.954c-3.107-3.987-8.272-5.683-15.508-5.094c-8.415,0.738-16.02,4.065-22.809,9.967c-2.958,2.511-5.54,5.469-7.753,8.861c0.291-1.327,0.44-2.731,0.44-4.207c0-4.576-1.185-8.602-3.547-12.071s-5.462-5.055-9.301-4.757c-2.213,0.149-6.42,3.101-12.621,8.854c-8.569,7.974-13.216,12.259-13.954,12.841l5.313,5.98c4.136-2.984,6.647-4.479,7.534-4.479c1.618,0,2.285,1.327,1.994,3.975c-0.143,3.831-0.822,9.164-2.039,16.012c-0.754,4.243-1.298,7.904-1.638,10.988c-0.066,0.055-0.129,0.109-0.196,0.164c-5.32,4.375-9.009,6.556-11.074,6.556c-4.725,0-7.016-3.158-6.867-9.488c2.213-13.824,4.285-25.222,6.207-34.199c0.583-5.294-0.266-9.592-2.55-12.906c-2.291-3.314-5.87-4.744-10.737-4.304c-3.107,0.298-7.832,3.249-14.181,8.86c-2.205,2-4.41,3.996-6.615,5.993c-0.437-10.447-5.204-15.822-14.329-16.09c-13.669-0.44-22.931,7.275-27.779,23.158c2.504-1.074,4.938-1.618,7.301-1.618c5.016,0,7.229,2.822,6.64,8.453c-0.297,3.411-2.511,8.375-6.64,14.899c-4.136,6.523-7.236,9.786-9.301,9.786c-2.66,0-5.094-5.023-7.307-15.081c-0.745-2.951-2.071-10.491-3.987-22.614c-1.773-11.236-6.499-16.485-14.174-15.747c-3.249,0.298-8.123,3.249-14.614,8.86C9.669,53.318,4.867,57.597,0,61.875l4.641,5.98c4.42-3.094,7.003-4.647,7.741-4.647c3.385,0,6.55,5.313,9.501,15.929c2.653,9.733,5.307,19.468,7.961,29.202c3.974,10.621,8.841,15.929,14.588,15.929c9.281,0,20.627-8.719,34.038-26.154C87.892,85.987,93.99,75.74,96.8,67.354c3.72-2.748,6.018-4.146,6.853-4.146c2.653,0,3.987,1.922,3.987,5.754c0,0.738-1.443,6.2-4.324,16.381c-2.88,10.182-4.395,17.709-4.537,22.575c-0.149,4.726,0.997,8.557,3.43,11.508c2.434,2.952,5.941,4.428,10.524,4.428c9.89,0,19.779-4.278,29.675-12.835c0.881-0.772,1.738-1.557,2.573-2.352c0.783,3.312,2.124,6.045,4.07,8.15c4.259,4.569,11.456,6.706,21.592,6.408c-1.353-3.249-1.884-9.003-1.586-17.274c0.44-9.152,2.809-17.941,7.094-26.355s8.278-12.627,11.98-12.627c4.285,0,6.285,2.731,5.987,8.193c-0.149,3.696-0.874,7.903-2.175,12.628c-1.307,4.725-2.032,9.449-2.174,14.174c-0.298,7.534,1.392,12.919,5.081,16.168c4.116,3.689,11.334,5.392,21.638,5.094c-1.541-3.392-2.162-8.266-1.864-14.621c0.44-9.003,3.482-18.304,9.113-27.902c5.333-9.151,9.922-13.733,13.772-13.733c3.56,0,5.263,2.809,5.113,8.414c-0.148,3.688-1.074,8.854-2.771,15.494c-1.695,6.641-2.621,12.316-2.764,17.041c-0.297,10.628,4.35,15.936,13.955,15.936c9.889,0,19.779-4.278,29.675-12.835c0.164-0.144,0.316-0.293,0.479-0.438c0.34,0.586,0.688,1.168,1.068,1.732c5.165,7.967,13.734,11.954,25.695,11.954c16.09,0,31.966-4.492,47.616-13.488c1.756-0.99,3.422-1.979,5.017-2.97c0.986,1.991,2.138,3.866,3.502,5.591c6.052,7.521,14.912,11.281,26.575,11.281c14.025,0,25.767-4.938,35.216-14.815c9.449-9.876,14.466-21.598,15.061-35.163C441.387,64.684,439.102,56.503,434.079,50.16z M305.118,90.003c-0.084-1.909-0.084-2.867,0-2.867c0.143-5.579,2.505-11.417,7.074-17.514s9.062-9.146,13.488-9.146c3.392,0,5.01,1.987,4.867,5.948c-0.149,2.938-2.362,6.764-6.634,11.462C318.606,83.324,312.341,87.362,305.118,90.003z M415.918,73.868c-0.297,7.1-2.434,13.902-6.42,20.413c-4.725,7.845-10.414,11.76-17.055,11.76c-2.958,0-5.249-1.624-6.867-4.88c-1.476-2.809-2.142-6.064-1.993-9.767c0.291-7.54,2.505-14.64,6.647-21.3c4.866-8.136,11.067-12.207,18.601-12.207c2.356,0,4.168,1.67,5.424,4.997S416.067,69.875,415.918,73.868z"></path>
+                                </g>
+                            </svg>
+                        </a>
+
+                                                <button data-action="menu.settings.open" data-gtm-click="mobile_nav_settings_click" data-fatal-attraction="container:top_nav|component:settings" class="menu_settings pull_right js-topnav_mobile_header_settings">
+                            <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="18.86px" height="20px" viewBox="0 0 18.86 20" style="enable-background:new 0 0 18.86 20;" xml:space="preserve">
+                                <g id="gear_1_">
+                                    <g>
+                                        <g id="Icon_1_" transform="translate(5.000000, 5.000000)">
+                                            <g id="Group-10_1_">
+                                            </g>
+                                        </g>
+                                        <path id="Combined-Shape_1_" style="fill:none;stroke:#b1b1b1;stroke-width:2;" d="M12,4.58l-0.57-0.27V1.99c0-0.54-0.45-0.99-1-0.99h-2c-0.55,0-1,0.45-1,0.99v2.31
+                                            L6.86,4.58c-0.29,0.14-0.57,0.3-0.84,0.48L5.5,5.42L3.49,4.26C3.02,3.99,2.41,4.16,2.14,4.63l-1,1.74
+                                            C0.86,6.84,1.02,7.46,1.49,7.73L3.5,8.89L3.45,9.52C3.44,9.68,3.43,9.84,3.43,10s0.01,0.32,0.02,0.48l0.05,0.63l-2.01,1.16
+                                            c-0.47,0.27-0.63,0.88-0.36,1.36l1,1.74c0.27,0.48,0.89,0.64,1.36,0.37l2.01-1.16l0.52,0.36c0.27,0.18,0.55,0.35,0.84,0.48
+                                            l0.57,0.27v2.31c0,0.54,0.45,0.99,1,0.99h2c0.55,0,1-0.45,1-0.99v-2.31L12,15.42c0.29-0.14,0.57-0.3,0.84-0.48l0.52-0.36
+                                            l2.01,1.16c0.47,0.27,1.08,0.11,1.36-0.37l1-1.74c0.27-0.48,0.11-1.09-0.36-1.36l-2.01-1.16l0.05-0.63
+                                            c0.01-0.16,0.02-0.32,0.02-0.48s-0.01-0.32-0.02-0.48l-0.05-0.63l2.01-1.16c0.47-0.27,0.63-0.88,0.36-1.36l-1-1.74
+                                            c-0.27-0.48-0.89-0.64-1.36-0.37l-2.01,1.16l-0.52-0.36C12.57,4.88,12.29,4.72,12,4.58z"></path>
+                                        <circle id="Oval_1_" style="fill:none;stroke:#b1b1b1;stroke-width:2;" cx="9.43" cy="10" r="2"></circle>
+                                    </g>
+                                </g>
+                            </svg>
+                        </button>
+                                    </div>
+
+                <ul id="menu_list" class="menu_list_logged_out not-visible">
+                                                                        <li>
+                                <a class="main_item" data-breeze-ignore="" data-fatal-attraction="container:top_nav|component:join|target:/join" data-gtm-click="top_nav_join_click" id="js-join-link" href="https://vimeo.com/join">
+                                    Join                                </a>
+                            </li>
+                                                    <li>
+                                <a class="main_item" data-breeze-ignore="" data-fatal-attraction="container:top_nav|component:login|target:/log_in" data-gtm-click="top_nav_login_click" id="js-login-link" href="https://vimeo.com/log_in">
+                                    Login                                </a>
+                            </li>
+                                                                                                                <li>
+                                                    <div class="dropdown_list">
+    <button class="dropdown_toggle_button js-topnav_mobile_menu_toggle">
+        <span class="main_item">Solutions</span>
+        <span class="dropdown_arrow js-top_nav_toggle_arrow">
+            <svg width="12" height="8">
+                <path d="M11.45.914L5.914 6.45 4.473 5.008l-2.03-2.03L.378.914" stroke="#1A2E3A" stroke-width="1.2" fill="none"></path>
+            </svg>
+        </span>
+    </button>
+    <div aria-hidden="true" class="toggle_list js-top_nav_toggle_list">
+                                        <a data-fatal-attraction="container:top_nav|component:solutions|keyword:video_marketing" data-gtm-click="top_nav_video_marketing" class="solutions_menu" href="https://vimeo.com/solutions/marketing">
+                        <div class="submenu_header">
+                            Video marketing                        </div>
+                        <div class="submenu_description">Power your marketing strategy with perfectly branded videos to drive better ROI.</div>
+                    </a>  
+                                        <ul>
+                            </ul>
+                                        <a data-fatal-attraction="container:top_nav|component:solutions|keyword:event_marketing" data-gtm-click="top_nav_event_marketing" class="solutions_menu" href="https://vimeo.com/features/virtual-events">
+                        <div class="submenu_header">
+                            Event marketing                        </div>
+                        <div class="submenu_description">Host virtual events and webinars to increase engagement and generate leads.</div>
+                    </a>  
+                                        <ul>
+                            </ul>
+                                        <a data-fatal-attraction="container:top_nav|component:solutions|keyword:employee_communications" data-gtm-click="top_nav_employee_communications" class="solutions_menu" href="https://vimeo.com/solutions/communications">
+                        <div class="submenu_header">
+                            Employee communication                        </div>
+                        <div class="submenu_description">Inspire employees with compelling live and on-demand video experiences.</div>
+                    </a>  
+                                        <ul>
+                            </ul>
+                                        <a data-fatal-attraction="container:top_nav|component:solutions|keyword:video_monetization" data-gtm-click="top_nav_video_monetization" class="solutions_menu" href="https://vimeo.com/solutions/video-monetization">
+                        <div class="submenu_header">
+                            Video monetization                        </div>
+                        <div class="submenu_description">Build a site and generate income from purchases, subscriptions, and courses.</div>
+                    </a>  
+                                        <ul>
+                            </ul>
+            </div>
+</div>
+                                                </li>
+                                                                    <li>
+                                                    <div class="dropdown_list">
+    <button class="dropdown_toggle_button js-topnav_mobile_menu_toggle">
+        <span class="main_item">Features</span>
+        <span class="dropdown_arrow js-top_nav_toggle_arrow">
+            <svg width="12" height="8">
+                <path d="M11.45.914L5.914 6.45 4.473 5.008l-2.03-2.03L.378.914" stroke="#1A2E3A" stroke-width="1.2" fill="none"></path>
+            </svg>
+        </span>
+    </button>
+    <div aria-hidden="true" class="toggle_list js-top_nav_toggle_list">
+                                        <div class="submenu_header">Create</div>
+                                        <ul>
+                                    <li>
+                        <a data-fatal-attraction="container:top_nav|component:product|keyword:interactive_video" data-bp-click="location:global_nav_features|name:select_global_nav_option|target:/features/interactive-video|copy:Interactive video|feature:create_interactive|target_path:/features/interactive-video" href="https://vimeo.com/features/interactive-video">
+                            Interactive video                        </a>
+                    </li>
+                                    <li>
+                        <a data-fatal-attraction="container:top_nav|component:product|keyword:live_streaming" data-bp-click="location:global_nav_features|name:select_global_nav_option|target:/features/livestreaming?mkc=368ip_fc_live|copy:Live stream|feature:create_live|target_path:/features/livestreaming?mkc=368ip_fc_live" href="https://vimeo.com/features/livestreaming?mkc=368ip_fc_live">
+                            Live stream                        </a>
+                    </li>
+                                    <li>
+                        <a data-fatal-attraction="container:top_nav|component:product|keyword:screen_recorder" data-bp-click="location:global_nav_features|name:select_global_nav_option|target:/features/screen-recorder|copy:Screen recorder|feature:create_record|target_path:/features/screen-recorder" href="https://vimeo.com/features/screen-recorder">
+                            Screen recorder                        </a>
+                    </li>
+                                    <li>
+                        <a data-fatal-attraction="container:top_nav|component:product|keyword:create" data-bp-click="location:global_nav_features|name:select_global_nav_option|target:/create|copy:Create video maker|feature:create_vimeo_create|target_path:/create" href="https://vimeo.com/create">
+                            Create video maker                        </a>
+                    </li>
+                                    <li>
+                        <a data-fatal-attraction="container:top_nav|component:product|keyword:video_editor" data-bp-click="location:global_nav_features|name:select_global_nav_option|target:/video-editor|copy:Online video editor|feature:create_editor|target_path:/video-editor" href="https://vimeo.com/video-editor">
+                            Online video editor                        </a>
+                    </li>
+                                    <li>
+                        <a data-fatal-attraction="container:top_nav|component:product|keyword:for_hire" data-bp-click="location:global_nav_features|name:select_global_nav_option|target:/for-hire|copy:Hire a video pro|feature:create_hire|target_path:/for-hire" href="https://vimeo.com/for-hire">
+                            Hire a video pro                        </a>
+                    </li>
+                            </ul>
+                                        <div class="submenu_header">Manage</div>
+                                        <ul>
+                                    <li>
+                        <a data-fatal-attraction="container:top_nav|component:product|keyword:video_library" data-bp-click="location:global_nav_features|name:select_global_nav_option|target:/features/video-library?mkc=368ip_fm_vl|copy:Video library|feature:manage_library|target_path:/features/video-library?mkc=368ip_fm_vl" href="https://vimeo.com/features/video-library?mkc=368ip_fm_vl">
+                            Video library                        </a>
+                    </li>
+                                    <li>
+                        <a data-fatal-attraction="container:top_nav|component:product|keyword:video_player" data-bp-click="location:global_nav_features|name:select_global_nav_option|target:/features/video-player?mkc=368ip_fm_adfree|copy:Ad-free player|feature:manage_add_free_player|target_path:/features/video-player?mkc=368ip_fm_adfree" href="https://vimeo.com/features/video-player?mkc=368ip_fm_adfree">
+                            Ad-free player                        </a>
+                    </li>
+                                    <li>
+                        <a data-fatal-attraction="container:top_nav|component:product|keyword:hosting" data-bp-click="location:global_nav_features|name:select_global_nav_option|target:/features/online-video-hosting?mkc=368ip_fm_hosting|copy:Video hosting|feature:manage_video_hosting|target_path:/features/online-video-hosting?mkc=368ip_fm_hosting" href="https://vimeo.com/features/online-video-hosting?mkc=368ip_fm_hosting">
+                            Video hosting                        </a>
+                    </li>
+                                    <li>
+                        <a data-fatal-attraction="container:top_nav|component:product|keyword:privacy" data-bp-click="location:global_nav_features|name:select_global_nav_option|target:/features/video-privacy?mkc=368ip_fm_privacy|copy:Privacy|feature:manage_privacy|target_path:/features/video-privacy?mkc=368ip_fm_privacy" href="https://vimeo.com/features/video-privacy?mkc=368ip_fm_privacy">
+                            Privacy                        </a>
+                    </li>
+                            </ul>
+                                        <div class="submenu_header">Grow</div>
+                                        <ul>
+                                    <li>
+                        <a data-fatal-attraction="container:top_nav|component:product|keyword:small_business" data-bp-click="location:global_nav_features|name:select_global_nav_option|target:/solutions/small-business-solutions|copy:Small business|feature:grow_small_business|target_path:/solutions/small-business-solutions" href="https://vimeo.com/solutions/small-business-solutions">
+                            Small business                        </a>
+                    </li>
+                                    <li>
+                        <a data-fatal-attraction="container:top_nav|component:product|keyword:enterprise" data-bp-click="location:global_nav_features|name:select_global_nav_option|target:/enterprise?mkc=368-menu-grow|copy:Enterprise|feature:grow_enterprise|target_path:/enterprise?mkc=368-menu-grow" href="https://vimeo.com/enterprise?mkc=368-menu-grow">
+                            Enterprise                        </a>
+                    </li>
+                                    <li>
+                        <a data-fatal-attraction="container:top_nav|component:product|keyword:webinars" data-bp-click="location:global_nav_features|name:select_global_nav_option|target:/features/webinar|copy:Webinars|feature:grow_webinars|target_path:/features/webinar" href="https://vimeo.com/features/webinar">
+                            Webinars                        </a>
+                    </li>
+                                    <li>
+                        <a data-fatal-attraction="container:top_nav|component:product|keyword:analytics" data-bp-click="location:global_nav_features|name:select_global_nav_option|target:/features/video-analytics?mkc=368ip_fg_analyze|copy:Video analytics|feature:grow_analytics|target_path:/features/video-analytics?mkc=368ip_fg_analyze" href="https://vimeo.com/features/video-analytics?mkc=368ip_fg_analyze">
+                            Video analytics                        </a>
+                    </li>
+                                    <li>
+                        <a data-fatal-attraction="container:top_nav|component:product|keyword:monetization" data-bp-click="location:global_nav_features|name:select_global_nav_option|target:/ott?mkc=entprsb|copy:Video monetization|feature:grow_ott|target_path:/ott?mkc=entprsb" href="https://vimeo.com/ott?mkc=entprsb">
+                            Video monetization                        </a>
+                    </li>
+                            </ul>
+            </div>
+</div>
+                                                </li>
+                                                                    <li>
+                                                    <div class="dropdown_list">
+    <button class="dropdown_toggle_button js-topnav_mobile_menu_toggle">
+        <span class="main_item">Resources</span>
+        <span class="dropdown_arrow js-top_nav_toggle_arrow">
+            <svg width="12" height="8">
+                <path d="M11.45.914L5.914 6.45 4.473 5.008l-2.03-2.03L.378.914" stroke="#1A2E3A" stroke-width="1.2" fill="none"></path>
+            </svg>
+        </span>
+    </button>
+    <div aria-hidden="true" class="toggle_list js-top_nav_toggle_list">
+                                        <div class="submenu_header">Learn</div>
+                                        <ul>
+                                    <li>
+                        <a data-fatal-attraction="container:top_nav|component:inspiration|keyword:blog" data-gtm-click="top_nav_inspiration_blog" data-bp-click="location:global_nav_resources|name:select_global_nav_option|target:/blog|copy:Vimeo blog|feature:learn_blog|target_path:/blog" href="https://vimeo.com/blog">
+                            Vimeo blog                        </a>
+                    </li>
+                                    <li>
+                        <a data-fatal-attraction="container:top_nav|component:inspiration|keyword:video_school" data-gtm-click="top_nav_inspiration_video_school" data-bp-click="location:global_nav_resources|name:select_global_nav_option|target:/blog/category/video-school|copy:Video School|feature:learn_video_school|target_path:/blog/category/video-school" href="https://vimeo.com/blog/category/video-school">
+                            Video School                        </a>
+                    </li>
+                                    <li>
+                        <a data-fatal-attraction="container:top_nav|component:resources_learn|keyword:customer_stories" data-bp-click="location:global_nav_resources|name:select_global_nav_option|target:/blog/category/case-study|copy:Customer stories|feature:learn_customer_stories|target_path:/blog/category/case-study" href="https://vimeo.com/blog/category/case-study">
+                            Customer stories                        </a>
+                    </li>
+                                    <li>
+                        <a data-fatal-attraction="container:top_nav|component:resources_learn|keyword:investor_relations" data-bp-click="location:global_nav_resources|name:select_global_nav_option|target:https://investors.vimeo.com|copy:Investor Relations|feature:learn_investor_relations|target_path:https://investors.vimeo.com" href="https://investors.vimeo.com/">
+                            Investor Relations                        </a>
+                    </li>
+                            </ul>
+                                        <div class="submenu_header">Connect</div>
+                                        <ul>
+                                    <li>
+                        <a data-fatal-attraction="container:top_nav|component:resources_connect|keyword:developer_tools" data-bp-click="location:global_nav_resources|name:select_global_nav_option|target:https://developer.vimeo.com/|copy:Developer tools|feature:connect_developer_tools|target_path:https://developer.vimeo.com/" href="https://developer.vimeo.com/">
+                            Developer tools                        </a>
+                    </li>
+                                    <li>
+                        <a data-fatal-attraction="container:top_nav|component:resources_connect|keyword:partner_program" data-bp-click="location:global_nav_resources|name:select_global_nav_option|target:/partners|copy:Partner program|feature:connect_partner_program|target_path:/partners" href="https://vimeo.com/partners">
+                            Partner program                        </a>
+                    </li>
+                                    <li>
+                        <a data-fatal-attraction="container:top_nav|component:resources_connect|keyword:creative_community" data-bp-click="location:global_nav_resources|name:select_global_nav_option|target:/experts|copy:Creative community|feature:connect_creative_community|target_path:/experts" href="https://vimeo.com/experts">
+                            Creative community                        </a>
+                    </li>
+                                    <li>
+                        <a data-fatal-attraction="container:top_nav|component:resources_connect|keyword:help_center" data-bp-click="location:global_nav_resources|name:select_global_nav_option|target:https://vimeo.zendesk.com/hc/en-us|copy:Help center|feature:connect_help_center|target_path:https://vimeo.zendesk.com/hc/en-us" href="https://vimeo.zendesk.com/hc/en-us">
+                            Help center                        </a>
+                    </li>
+                            </ul>
+            </div>
+</div>
+                                                </li>
+                                                                    <li>
+                                                    <div class="dropdown_list">
+    <button class="dropdown_toggle_button js-topnav_mobile_menu_toggle">
+        <span class="main_item">Watch</span>
+        <span class="dropdown_arrow js-top_nav_toggle_arrow">
+            <svg width="12" height="8">
+                <path d="M11.45.914L5.914 6.45 4.473 5.008l-2.03-2.03L.378.914" stroke="#1A2E3A" stroke-width="1.2" fill="none"></path>
+            </svg>
+        </span>
+    </button>
+    <div aria-hidden="true" class="toggle_list js-top_nav_toggle_list">
+                                        <a data-fatal-attraction="container:top_nav|component:watch|keyword:boty" data-gtm-click="top_nav_watch_boty_click" data-bp-click="location:global_nav_watch|name:select_global_nav_option|target:/bestoftheyear|copy:Best of the Year|feature:best_of_the_year|target_path:/bestoftheyear" href="https://vimeo.com/bestoftheyear">
+                        <div class="submenu_header">
+                            Best of the Year                        </div>
+                        <div class="submenu_description"></div>
+                    </a>  
+                                        <ul>
+                            </ul>
+                                        <a class="topnav_watch_item" data-fatal-attraction="container:top_nav|component:watch|keyword:browse_videos" data-gtm-click="top_nav_watch_browse_videos_click" data-bp-click="location:global_nav_watch|name:select_global_nav_option|target:/watch|copy:Browse Videos|feature:browse_videos|target_path:/watch" href="https://vimeo.com/watch">
+                        <div class="submenu_header">
+                            Browse Videos                        </div>
+                        <div class="submenu_description"></div>
+                    </a>  
+                                        <ul>
+                            </ul>
+                                        <a class="topnav_watch_item" data-fatal-attraction="container:top_nav|component:watch|keyword:staff_picks" data-gtm-click="top_nav_watch_staff_picks_click" data-bp-click="location:global_nav_watch|name:select_global_nav_option|target:/channels/staffpicks|copy:Staff Picks|feature:staff_picks|target_path:/channels/staffpicks" href="https://vimeo.com/channels/staffpicks">
+                        <div class="submenu_header">
+                            Staff Picks                        </div>
+                        <div class="submenu_description"></div>
+                    </a>  
+                                        <ul>
+                            </ul>
+                                        <a class="topnav_watch_item" data-fatal-attraction="container:top_nav|component:watch|keyword:categories" data-gtm-click="top_nav_watch_categories_click" data-bp-click="location:global_nav_watch|name:select_global_nav_option|target:/categories|copy:Categories|feature:categories|target_path:/categories" href="https://vimeo.com/categories">
+                        <div class="submenu_header">
+                            Categories                        </div>
+                        <div class="submenu_description"></div>
+                    </a>  
+                                        <ul>
+                            </ul>
+                                        <a class="topnav_watch_item" data-fatal-attraction="container:top_nav|component:watch|keyword:channels" data-gtm-click="top_nav_watch_channels_click" data-bp-click="location:global_nav_watch|name:select_global_nav_option|target:/channels|copy:Channels|feature:channels|target_path:/channels" href="https://vimeo.com/channels">
+                        <div class="submenu_header">
+                            Channels                        </div>
+                        <div class="submenu_description"></div>
+                    </a>  
+                                        <ul>
+                            </ul>
+                                        <a class="topnav_watch_item" data-fatal-attraction="container:top_nav|component:watch|keyword:on_demand" data-gtm-click="top_nav_ondemand_click" data-bp-click="location:global_nav_watch|name:select_global_nav_option|target:/ondemand|copy:On Demand|feature:on_demand|target_path:/ondemand" href="https://vimeo.com/ondemand">
+                        <div class="submenu_header">
+                            On Demand                        </div>
+                        <div class="submenu_description"></div>
+                    </a>  
+                                        <ul>
+                            </ul>
+            </div>
+</div>
+                                                </li>
+                                                                    <li>
+                                                    <a class="main_item" data-gtm-click="top_nav_pricing_click" data-fatal-attraction="container:top_nav|component:pricing" data-bp-click="location:global_nav|target:upgrade_page|name:select_global_nav_option|copy:upgrade|feature:upgrade|target_path:/upgrade" href="https://vimeo.com/upgrade">
+                                                                Pricing                            </a>
+                                                </li>
+                                                                    <li>
+                                                    <a class="main_item" data-gtm-click="top_nav_contact_sales_click" data-fatal-attraction="container:top_nav|component:contact_sales|keyword:contact_sales" href="https://vimeo.com/enterprise/contact-us?mkc=368tnc">
+                                                                Contact Sales                            </a>
+                                                </li>
+                                                                <li>
+                            <a class="main_item" href="https://vimeo.com/search">
+                                <svg class="search_icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+                                    <title>Search</title>
+                                    <path d="M26.74,25.32l-4.53-4.53a1,1,0,0,0-.21-.14A9,9,0,1,0,20.65,22a1,1,0,0,0,.14.21l4.53,4.53a1,1,0,0,0,1.41-1.41ZM15,22a7,7,0,1,1,7-7A7,7,0,0,1,15,22Z"></path>
+                                </svg>
+                                Search                            </a>
+                        </li>
+                                    </ul>
+            </div>
+            <div class="bottom_buttons_container">
+                                    <div>
+                        <a href="https://vimeo.com/upload" class="dark_button" data-breeze-ignore="" data-fatal-attraction="container:top_nav|keyword:upload" data-gtm-click="top_nav_upload_click" id="js-upload-link">
+                            <span>
+                                <svg width="23" height="17" viewBox="0 0 30 22">
+                                    <path d="M9.583 4.923A8.2 8.2 0 0124.778 9.39 5.7 5.7 0 0122.7 20.4l-16-.001A5.7 5.7 0 116.7 9h1.682a8.162 8.162 0 011.2-4.077zm-3.636 5.34A4.501 4.501 0 006.7 19.2h16a4.5 4.5 0 00.799-8.93A7 7 0 109.65 10.2H6.7a4.53 4.53 0 00-.753.063zm9.633.859V19.2h-1v-8.093l-3.043 3.043-.707-.707L15.073 9.2l4.242 4.243-.707.707-3.028-3.028z" fill="#FFF" fill-rule="evenodd"></path>
+                                </svg>
+                            </span>
+                            <span>Upload</span>
+                        </a>
+                    </div>
+                            </div>
+        </div>
+    </div>
+
+        <section class="topnav_mobile_menu topnav_mobile_menu_settings lohp_mobile_menu_settings js-topnav_mobile_menu_settings">
+        <div class="topnav_mobile_bar submenu">
+            <button class="topnav_mobile_button topnav_mobile_pull_left js-topnav_mobile_header_settins_close topnav_icon_mobile_arrowleft_b"> </button>
+            <h1 class="topnav_mobile_header_title submenu">More stuff</h1>
+        </div>
+
+        <ul class="menu_list_settings_logged_out">
+                            <li>
+                                            <a data-action="menu.close" class=" " href="https://vimeo.com/terms">
+                            Terms of Service                        </a>
+                                                        </li>
+                            <li>
+                                            <a data-action="menu.close" class=" " href="https://vimeo.com/privacy">
+                            Privacy Policy                        </a>
+                                                        </li>
+                            <li>
+                                            <a data-action="menu.close" class=" " href="https://vimeo.com/dmca">
+                            Copyright                        </a>
+                                                        </li>
+                            <li>
+                                            <a data-action="menu.close" class=" " href="https://vimeo.com/cookie_policy">
+                            Cookies                        </a>
+                                                        </li>
+                            <li>
+                                            <a data-action="desktop" onclick="vimeo.mobile.desktop_shared._s2ds(); return false" href="javascript:void(0)">
+                            Desktop site                        </a>
+                                                        </li>
+                            <li>
+                                            <a language="" href="https://vimeo.com/786646692#">
+                            Language                        </a>
+                                                                <select onchange="vimeo.mobile.desktop_shared._s2l(this)" title="Choose a different language" class="topnav_mobile_menu_settings_language">
+                                                                                        <option class="selected" selected="" value="en" name="select_language">
+                                    English                                </option>
+                                                            <option value="es" name="select_language">
+                                    Español                                </option>
+                                                            <option value="de-DE" name="select_language">
+                                    Deutsch                                </option>
+                                                            <option value="fr-FR" name="select_language">
+                                    Français                                </option>
+                                                            <option value="ja-JP" name="select_language">
+                                    日本語                                </option>
+                                                            <option value="pt-BR" name="select_language">
+                                    Português                                </option>
+                                                            <option value="ko-KR" name="select_language">
+                                    한국어                                </option>
+                                                    </select>
+                                    </li>
+                            <li>
+                                            <a data-action="menu.close" class=" " href="https://vimeo.zendesk.com/hc/en-us">
+                            FAQ                        </a>
+                                                        </li>
+                            <li>
+                                            <a data-action="menu.close" class=" " href="https://vimeo.zendesk.com/hc/">
+                            Help                        </a>
+                                                        </li>
+                    </ul>
+
+
+        <div class="topnav_mobile_menu_copyright">TM + © 2023 Vimeo.com, Inc.</div>
+    </section>
+
+
+        </nav>
+
+<script>
+(function(window, document){
+
+    // Global values
+    window.vimeo = window.vimeo || {};
+    vimeo.mobile = vimeo.mobile || {};
+    Vimeo = vimeo.mobile || {};
+    Vimeo.desktop_shared = Vimeo.desktop_shared || {};
+
+    // DESKTOP HANDLERS
+
+    var desktop = document.getElementById('topnav_desktop');
+
+    // Prevent touch device to higtlight the area tapped
+    desktop.addEventListener('touchstart', function(e){
+        // Take into consideration avatar img
+        var target = (e.target.tagName.toLowerCase() === 'img') ? e.target.parentNode : e.target;
+
+        if (target.classList.contains('topnav_has_dropdown')) {
+            e.preventDefault();
+            e.stopPropagation();
+        }
+    }, false);
+
+    // Add last_page cookie
+    var listen = 'ontouchstart' in window ? 'touchstart' : window.PointerEvent ? 'pointerdown' : window.MSPointerEvent ? 'MSPointerDown' : 'click';
+    desktop.addEventListener(listen, function(e){
+        if (e.target.classList.contains('js-topnav_menu_auth')) {
+            document.cookie = 'last_page=' + encodeURIComponent(window.location.pathname) + ';path=\'/\';max-age=1800;';
+        }
+    }, false);
+
+    // MOBILE HANDLERS
+
+    // Trigger iOS Upload flow
+    Vimeo.desktop_shared._upload = function(e) {
+        // show iTunes only if we are in iOS world
+        if (/iPad|iPhone|iPod/.test(navigator.userAgent)){
+            var deeplink = 'vimeo://app.vimeo.com/upload?ref=mobileweb',
+                fallback = '/upload',
+                webkitHiddenCallback,
+                hitCallback;
+
+            // Callbacks
+            webkitHiddenCallback = function() {
+                // If the user is still here open the url page.
+                if (!document.webkitHidden) {
+                    window.location = fallback;
+                }
+            };
+
+            // Try to open the Vimeo App
+            hitCallback = function() {
+                window.location = deeplink;
+                setTimeout(webkitHiddenCallback, 25);
+            };
+
+            hitCallback();
+
+            return false;
+        }
+
+        window.location = e.href;
+
+    }
+
+
+// AFTER MOBILE NAV TEST RECONCILE WITH THE `mobile_menu_script.phtml`
+// ===================================================================
+    // Switch to desktop site
+    Vimeo.desktop_shared._s2ds = function() {
+        document.cookie='opt_out_mobile=1;expires=Fri, 31 Dec 9999 23:59:59 GMT;domain=' + vimeo.domain;
+        window.location.reload();
+    };
+
+    // Switch to language
+    Vimeo.desktop_shared._s2l = function(sel) {
+        var lang = sel.value,
+            xhr = new XMLHttpRequest();
+
+        xhr.open('POST', '/settings/locale');
+        xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
+        xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
+        xhr.send('locale=' + lang + '&token=' + vimeo.xsrft);
+        xhr.onload = function post() {
+            if (xhr.status === 200) {
+                window.location.reload();
+            }
+        };
+    };
+
+    var mobileMenuEle = document.querySelector('.js-topnav_mobile_header_logo');
+    if (mobileMenuEle) {
+        mobileMenuEle.addEventListener('click', function(e) {
+
+            e.stopPropagation();
+            e.preventDefault();
+            // Open Menu
+            var mobile_menu_main = document.querySelector('.js-topnav_mobile_menu_main');
+            mobile_menu_main.style.display = 'block';
+
+            // Close Menu
+            var mobile_header_close = document.querySelector('.js-topnav_mobile_header_close');
+            mobile_header_close.addEventListener('click', function(e) {
+                e.stopPropagation();
+                e.preventDefault();
+                var toggle_list = mobile_menu_main.querySelectorAll('.js-top_nav_toggle_list');
+                if(toggle_list.length) {
+                    toggle_list.forEach(function(el){
+                        if(el.classList.contains('expand')) {
+                            el.setAttribute('aria-hidden', true);
+                            el.classList.remove('expand');
+                        }
+                    })
+                }
+
+                var arrow_list = mobile_menu_main.querySelectorAll('.js-top_nav_toggle_arrow');
+                if(arrow_list.length) {
+                    arrow_list.forEach(function(el){
+                        if(el.classList.contains('rotate')) {
+                            el.classList.remove('rotate');
+                        }
+                    })
+                }
+                mobile_menu_main.style.display = 'none';
+            });
+
+            // Toggle Settings
+            var mobile_menu_settings = document.querySelector('.js-topnav_mobile_menu_settings');
+            var topnav2015_mobile_header_settings = document.querySelector('.js-topnav_mobile_header_settings');
+            topnav2015_mobile_header_settings.addEventListener('click', function(e) {
+                e.stopPropagation();
+                e.preventDefault();
+                mobile_menu_settings.style.display = 'block';
+                mobile_menu_main.style.display = 'none';
+                var topnav2015_mobile_header_settings_close = document.querySelector('.js-topnav_mobile_header_settins_close');
+                topnav2015_mobile_header_settings_close.addEventListener('click', function(e) {
+                    e.stopPropagation();
+                    e.preventDefault();
+                    mobile_menu_settings.style.display = 'none';
+                    mobile_menu_main.style.display = 'block';
+                });
+            });
+
+            //Dropdown
+            var mobile_dropdown_toggle = document.querySelectorAll('.js-topnav_mobile_menu_toggle');
+            mobile_dropdown_toggle.forEach(function(btn) {
+                btn.onclick = function(e) {
+                    e.stopPropagation();
+                    e.preventDefault();
+                    var button = e.target;
+                    var arrow = button.querySelector('.js-top_nav_toggle_arrow');
+                    if(arrow) {
+                        if(arrow.classList.contains('rotate')) {
+                            arrow.classList.remove('rotate');
+                        } else {
+                            arrow.classList.add('rotate');
+                        }
+                    }
+                    var parent = button.parentElement;
+                    if(parent) {
+                        var toggle_list = parent.querySelector('.js-top_nav_toggle_list');
+                        if(toggle_list) {
+                            if(toggle_list.classList.contains('expand')) {
+                                toggle_list.setAttribute('aria-hidden', true);
+                                toggle_list.classList.remove('expand');
+                            } else {
+                                toggle_list.setAttribute('aria-hidden', false);
+                                toggle_list.classList.add('expand');
+                            }
+                        }
+                        
+                    }
+                };
+            });
+        }, false);
+    };
+
+    var mobileAlbumsEle = document.querySelector('.js-topnav_mobile_header_albums');
+    if (mobileAlbumsEle) {
+        mobileAlbumsEle.addEventListener('click', function(e) {
+            e.stopPropagation();
+            e.preventDefault();
+            var mobile_menu_albums = document.querySelector('.js-topnav_mobile_album_list');
+            mobile_menu_albums.classList.add('open');
+
+            // Close
+            var mobile_albums_close = document.querySelector('.js-topnav_mobile_album_list_close');
+            if (mobile_albums_close) {
+                mobile_albums_close.addEventListener('click', function(e) {
+                    e.stopPropagation();
+                    e.preventDefault();
+                    mobile_menu_albums.classList.remove('open');
+                });
+            }
+        }, false);
+    };
+})(window, document);
+
+// ^^^^^^^^^^^^^^^^^^^^
+// AFTER MOBILE NAV TEST RECONCILE WITH THE `mobile_menu_script.phtml`
+// ===================================================================
+</script>
+            <object tabindex="-1" style="display: block; position: absolute; top: 0; left: 0; height: 100%; width: 100%; overflow: hidden; pointer-events: none; z-index: -1; opacity: 0;" type="text/html" data="./Dear Rich on Vimeo_files/saved_resource.html" data-airgap-id="23"></object></div>
+
+            <div class="wrap_content variant-v2" style="padding-top: 64px;">
+                
+        <div class="app_banner_container">
+
+    <div class="app_banner hide js-app_banner">
+
+        <button class="app_banner_close js-app_banner_close">×</button>
+
+        <div class="app_banner_icon_wrapper">
+            <svg class="app_banner_icon" viewBox="0 0 24 24" width="24px" height="24px" xmlns="http://www.w3.org/2000/svg"><path d="M24 6.643C24 11.286 15 22 10.875 22 6 22 6 7.714 3.013 7.714c-.388 0-1.883 1.07-1.883 1.07L0 7.358s5.25-5 7.5-5c4.5 0 3 12.5 5.625 12.5 1.5 0 6.75-7.857 2.25-7.857-.75 0-1.5.357-1.5.357C15 3.787 17.25 2 20.625 2 22.875 2 24 3.786 24 6.643z"></path></svg>
+        </div>
+
+        <div class="app_banner_cta">
+            Watch in our app        </div>
+
+        <a class="app_banner_button js-app_banner_open_app" href="https://vimeo.onelink.me/nZ05?af_ad=vimeo_watch_in_our_app_blue&amp;af_adset=app_banner_small&amp;af_dp=vimeo%3A%2F%2Fvideos%2F786646692&amp;af_force_deeplink=true&amp;c=clip_page_app_banner&amp;pid=vimeo_mobile_web">
+            <span class="app_banner_button_text">Open in app</span>
+        </a>
+
+    </div>
+
+</div>
+
+
+<script>
+    window.vimeo = window.vimeo || {};
+
+    
+    window.vimeo.clip_page_config = {"clip":{"id":786646692,"title":"Dear Rich","description":"<p class=\"first\">Accomplished endurance athlete, author and podcaster, Rich Roll has been a voice we have become familiar with over the years. In DEAR RICH, we hear the story behind the voice. Rich shares a letter to himself, giving an intimate view into the struggles he&#039;s faced with addiction, how running has helped bring him back to the surface and something that he is still learning: that we must overcome our fear of change to find what we are truly capable of.<\/p>\n<p>Credits: <br>\nClient: SalomonTV<br>\nProduction Company: Stept Studios<br>\nPost Production: Lockt Editorial<\/p>\n<p>Director: Brandon Lavoie<br>\nDP: Jared Levy <br>\nEP: Jon Brogan <br>\nAccount Executive: Paul Muhlbach<br>\nProducer: Laura Mittelberg<br>\nSupervising Producer: Eric Cook <br>\n1st AC: Jake Coury<br>\nGaffer: Evan Cox<br>\nKey Grip: David Klassen <br>\nHMU: Luca Buzas<br>\nAudio Mixer: Bobby Vongham<br>\n35mm Photographer: Brian Chorski\t<br>\nPA: Anthony Cantu, John Maddock<\/p>\n<p>Post Production<br>\nHead of Post: Connor Scofield<br>\nPost EP: Eileen Miraglia<br>\nPost Producer: Erin Bates<br>\nEditor: Brandon Lavoie<br>\nOnline Editor: Ben Ivers<br>\nColorist: Sam Zook at Mom &amp; Pop<br>\nComposer: Jon Sigsworth<br>\nSound Design and Mix: Justin Enoch at Post Mambo<\/p>\n<p>SalomonTV<br>\nSenior Marketing Manager &ndash; Run &amp; Outdoor: Erin Cooper<br>\nMarketing Specialist: Louis Bertrand<\/p>","uploaded_on":"2023-01-05 12:01:55","uploaded_on_relative":"3 months ago","uploaded_on_full":"Thursday, January 5, 2023 at 12:01 PM EST","is_spatial":false,"is_hdr":false,"is_dolby_vision":false,"privacy":{"is_public":true,"type":"anybody","description":"Public"},"duration":{"raw":883,"formatted":"14:43"},"is_liked":false,"is_unavailable":false,"likes_url":"\/786646692\/likes","is_live":false,"unlisted_hash":null},"owner":{"id":15073876,"display_name":"Stept Studios","has_advanced_stats":true,"is_pro_lapsed":false,"is_paid":true,"badge":null,"portrait":{"src":"https:\/\/i.vimeocdn.com\/portrait\/26007498_75x75","src_2x":"https:\/\/i.vimeocdn.com\/portrait\/26007498_150x150"},"is_mod":false,"url":"\/steptstudios","verified":true,"is_following":false,"is_available_for_hire":true},"ondemand":null,"brand_channel":null,"api_url":"api.vimeo.com","jwt":"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2ODA2NDk1MDAsInVzZXJfaWQiOm51bGwsImFwcF9pZCI6NTg0NzksInNjb3BlcyI6InB1YmxpYyBzdGF0cyIsInRlYW1fdXNlcl9pZCI6bnVsbH0.LGTgtXvaK15f_8CHiL4GhNUaiRXoaZv216pXU62Xx1Y","chat":null,"cur_user":null,"status":{"state":"ready"},"copyright_status":{"is_blocked":false},"content_block_status":{"is_blocked":false,"message":null,"continuous_play_enabled":false,"allowBypass":true,"requireLogin":false,"possibleOfcomBlock":false},"player":{"config_url":"https:\/\/player.vimeo.com\/video\/786646692\/config?autopause=1&byline=0&collections=1&context=Vimeo%5CController%5CClipController.main&default_to_hd=1&h=f2ca1d6121&outro=nothing&portrait=0&share=1&speed=1&title=0&watch_trailer=0&s=a38f459af5ac8a7eac21d8996df46bed34a961e7_1680663879","player_url":"player.vimeo.com","dimensions":{"height":540,"width":960},"poster":{"url":"https:\/\/i.vimeocdn.com\/video\/1582157011-37115b15c717a168bf86e2f2855b6bbc23b1cbcee54ff99c8d7b808b459365d6-d?mw=2000&mh=1080&q=70"}},"share_enabled":true,"send_to_wipster_enabled":false,"thumbnail":{"src":"https:\/\/i.vimeocdn.com\/video\/1582157011-37115b15c717a168bf86e2f2855b6bbc23b1cbcee54ff99c8d7b808b459365d6-d_190x107","src_2x":"https:\/\/i.vimeocdn.com\/video\/1582157011-37115b15c717a168bf86e2f2855b6bbc23b1cbcee54ff99c8d7b808b459365d6-d_380x214","width":190,"height":107,"id":1582157011},"ads":{"house_ads_enabled":false,"third_party_ads_enabled":false},"content_rating":null,"content_advertisement_warning":null,"notifications":[],"categories_config":{"categories":[{"name":"People","url":"\/categories\/documentary\/people\/videos"},{"name":"Documentary","url":"\/categories\/documentary"}],"total_categories":2},"music_track":null,"cc_license":null,"google_app_id":"599168806697-1vailf0v6ai0j09va1hga0krnd0n3tlq.apps.googleusercontent.com","credits":{"total_credits":{"raw":0,"formatted":"0"},"displayed_credits":[]},"stream":{"id":null,"pos":0},"collection_adder":{"enabled":true},"recaptcha_site_key":"6LeRCLwSAAAAAOJ1ba_xqd3NBOlV5P_XRWJVEPdw","clip_stats":{"enabled":false},"download_config":null,"has_review_modes":false,"data_layer":{"clip_id":786646692,"page_path":"\/786646692","creator_id":15073876,"creator_user_type":"business","video_categories":"People,Documentary","privacy":"anybody","staff_pick":"yes","user_id":null,"page_type":"Video"},"pref_tips":{"file_transfer_tour_point":{"key":"vstpft","value":false}}};
+
+    // Autoplay test for onsite referrals to clip page
+    (function () {
+        var clip = window.vimeo.clip_page_config;
+        var isOwner = clip.cur_user ? clip.cur_user.id === clip.owner.id : false;
+        var hasAutoplayParam = /(\?|&)autoplay=1(&|$)/.test(window.location.href);
+        var hasOnsiteReferrer = window.vimeo_esi.config.onsite_referrer;
+
+        // We don't want to autoplay refreshes and history traversals
+        var isNewPage = window.performance.navigation.type === 0;
+
+        // If we pass all the conditions override player config with new one including autoplay param
+        if (isNewPage && hasOnsiteReferrer && !hasAutoplayParam && !isOwner) {
+            window.vimeo.clip_page_config.player = {"config_url":"https:\/\/player.vimeo.com\/video\/786646692\/config?autopause=1&autoplay=1&byline=0&collections=1&context=Vimeo%5CController%5CClipController.main&default_to_hd=1&h=f2ca1d6121&outro=nothing&portrait=0&share=1&speed=1&title=0&watch_trailer=0&s=8a3b8f002082898ba9d9ff4dd1cb4b7692e53286_1680663879","player_url":"player.vimeo.com","dimensions":{"height":540,"width":960},"poster":{"url":"https:\/\/i.vimeocdn.com\/video\/1582157011-37115b15c717a168bf86e2f2855b6bbc23b1cbcee54ff99c8d7b808b459365d6-d?mw=2000&mh=1080&q=70"}};
+        }
+    }());
+</script>
+
+    <script>
+        if (typeof window.vimeo === 'undefined' || typeof window.vimeo.clips === 'undefined') {
+            window.vimeo = window.vimeo || {};
+            window.vimeo.clips = window.vimeo.clips || {};
+            var xhr = new XMLHttpRequest();
+            xhr.open('GET', window.vimeo.clip_page_config.player.config_url , true);
+            xhr.onload = function() {
+                window.vimeo.clips['786646692'] = JSON.parse(xhr.responseText);
+            };
+            xhr.withCredentials = true;
+            xhr.send();
+        }
+    </script>
+
+<!--[if lte IE 9]>
+    <script>window.location = window.location + '?lite=1';</script>
+<![endif]-->
+
+<div id="onboarding_mount"></div>
+
+<main id="main" class=""><div data-reactroot="" class="_1Rzf5"><div class="_3F-IY"><div class="_2SUsW"><div class="__46v js-player_area-wrapper" style="height: 540px;"><div class="player_area js-player_area js-player-fullscreen" style="height: 540px;"><div class="player_outro_area"><div id="clip_786646692" class="player_container js-player_container_786646692" style="width: 960px; height: 540px;"><div id="786646692" class="player js-player player-e04291f1-152c-4651-94ab-23cfc4c451b7 js-player-fullscreen with-fullscreen with-sticky-custom-logo touch-support player-normal player-md app-md" data-config-url="https://player.vimeo.com/video/786646692/config?autopause=1&amp;byline=0&amp;collections=1&amp;context=Vimeo%5CController%5CClipController.main&amp;default_to_hd=1&amp;h=f2ca1d6121&amp;outro=nothing&amp;portrait=0&amp;share=1&amp;speed=1&amp;title=0&amp;watch_trailer=0&amp;s=a38f459af5ac8a7eac21d8996df46bed34a961e7_1680663879" data-fallback-url="//player.vimeo.com/video/786646692/fallback?js" data-embed="false" data-player="true"><div class="vp-video-wrapper" data-content-area-sibling-eligible=""><div class="vp-video"><div class="vp-telecine invisible"><video preload="none" tabindex="-1" style="" src="blob:https://vimeo.com/351e8229-f283-437b-85ae-4082d1a71dd6"><track kind="captions" src="/texttrack/64682683.vtt?token=642b69a8_0xb4962cd2a070db2edd5dc36b007a497e42458424" id="telecine-track-64682683" srclang="en-x-autogen" label="English (auto-generated)"></video></div></div><div class="vp-preview" data-thumb="https://i.vimeocdn.com/video/1582157011-37115b15c717a168bf86e2f2855b6bbc23b1cbcee54ff99c8d7b808b459365d6-d?mw=1920&amp;mh=1080&amp;q=70" data-thumb-width="1920" style="background-image: url(&quot;https://i.vimeocdn.com/video/1582157011-37115b15c717a168bf86e2f2855b6bbc23b1cbcee54ff99c8d7b808b459365d6-d?mw=1920&amp;mh=1080&amp;q=70&quot;);"></div></div><div class="vp-text-alert-wrapper hidden" data-content-area-sibling-eligible=""><div class="vp-alert-text"></div><div class="vp-alert-time"><div class="vp-live-start-time-title"></div><div class="vp-live-start-time-body"></div><div class="vp-live-start-time-footer"></div></div></div><div class="vp-target hidden" data-content-area-sibling-eligible="" hidden=""></div><div class="vp-captions hidden with-controls opacity-100 color-black" hidden="" aria-live="assertive" data-content-area-sibling-eligible="" style="font-size: 24px; font-variant: initial; font-family: &quot;Helvetica Neue&quot;, Helvetica, Arial, sans-serif; color: rgb(255, 255, 255); text-shadow: none;"><span class="vp-captions-window" style="background-color: rgba(0, 0, 0, 0);"></span></div><div class="vp-outro-wrapper hidden" hidden="" data-content-area-sibling-eligible=""><div class="vp-outro" role="dialog"></div></div><div class="vp-player-ui-container" data-content-area-sibling-eligible=""><style type="text/css" data-player-colors="e04291f1-152c-4651-94ab-23cfc4c451b7">.player-e04291f1-152c-4651-94ab-23cfc4c451b7 {
+                --color-one:#000000ff;
+--color-two:#00adefff;
+--color-three:#ffffffff;
+--color-four:#000000ff;
+--color-one-monochrome:#ffffffff;
+--color-two-monochrome:#000000ff;
+--color-one-opacity-ninety:#000000e6;
+--color-three-opacity-twenty:#ffffff33;
+--color-one-monochrome-opacity-twenty:#ffffff33;
+--color-two-monochrome-opacity-twenty:#00000033;
+--color-one-monochrome-opacity-sixty:#ffffff99;
+--color-one-monochrome-opacity-twenty-eighty:#ffffff33;
+--color-two-monochrome-opacity-twenty-eighty:#000000cc;
+            }.player-e04291f1-152c-4651-94ab-23cfc4c451b7 {
+                background-color: var(--color-four);
+            }.player-e04291f1-152c-4651-94ab-23cfc4c451b7 .vp-video-wrapper {
+                background-color: var(--color-four);
+            }</style><div class="NudgeNotification_module_nudge__c67757fb false" style="display: none;"><div class="NudgeNotification_module_nudgeInfo__c67757fb"><div class="NudgeNotification_module_nudgeIcon__c67757fb"><svg viewBox="0 0 64 64"><path fill-rule="evenodd" clip-rule="evenodd" d="M12.4506 12.0055L32.4643 30.0179C33.6413 31.0772 33.6413 32.9228 32.4643 33.9821L12.4506 51.9945C10.7345 53.5389 8 52.3211 8 50.0124V13.9876C8 11.6789 10.7345 10.4611 12.4506 12.0055ZM39.1172 12.0055L59.131 30.0179C60.308 31.0772 60.308 32.9228 59.131 33.9821L39.1172 51.9945C37.4012 53.5389 34.6667 52.3211 34.6667 50.0124V13.9876C34.6667 11.6789 37.4012 10.4611 39.1172 12.0055Z"></path></svg></div><div class="NudgeNotification_module_nudgeTime__c67757fb"></div></div></div><div class="vp-pip-overlay PipOverlay_module_overlay__78ecef16" style="display: none;"><svg viewBox="0 0 16 12"><polygon class="fill" points="6 8 1 8 1 1 14 1 14 6 15 6 15 0 0 0 0 9 6 9 6 8"></polygon><rect class="fill" x="7" y="7" width="9" height="5"></rect><polyline class="fill" transform="translate(4, 4) rotate(180) translate(-4, -4)" points="5.33 2 5.33 3 3.67 3 5.67 5 5 5.67 3 3.67 3 5.33 2 5.33 2 2"></polyline></svg><div class="PipOverlay_module_title__78ecef16">Playing in picture-in-picture</div></div></div><div class="vp-player-ui-overlays" data-content-area-sibling-eligible=""><div class="vp-wirewax-wrapper"></div><div class="vp-badge Badge_module_badge__c2d20905" style="margin: 10px 10px 0px;"><a href="https://vimeo.com/channels/staffpicks/" class="Badge_module_badgeLink__c2d20905 shared_module_focusable__ad188687 Link_module_link__2e122c45" target="_blank" rel="noreferrer"><img src="./Dear Rich on Vimeo_files/1.svg" width="100" height="100" alt="Vimeo Staff Pick Badge" data-airgap-id="32"></a></div><div class="vp-title Title_module_title__c7915904"><header class="Title_module_header__c7915904"><div class="Title_module_headers__c7915904"></div></header></div><div class="vp-sidedock SideDock_module_root__71905116  "><div class="LabeledButton_module_box__2bf466cb"><label class="LabeledButton_module_labeledButton__2bf466cb" role="presentation" style="display: none;"><span>Like</span></label><button class="Button_module_button__2ee75979 shared_module_focusable__ad188687 Button_module_primary__2ee75979 Button_module_sm__2ee75979 Button_module_icon__2ee75979 Button_module_iconSm__2ee75979 exclude-global-button-styles  like-button" aria-label="Like (this opens in a new window)" data-like-button="true"><svg viewBox="0 0 20 20" class="like-icon" focusable="false"><path d="M10 18a1 1 0 0 1-.81-.42 15.8 15.8 0 0 0-4.35-3.71C2.46 12.3 0 10.68 0 7.5a5.38 5.38 0 0 1 1.61-3.92A6 6 0 0 1 6 2a5.54 5.54 0 0 1 4.05 1.88A5.74 5.74 0 0 1 14 2c2.9 0 6 2.21 6 5.5s-2.46 4.8-4.84 6.37a15.8 15.8 0 0 0-4.35 3.71A1 1 0 0 1 10 18zM5.78 4A4 4 0 0 0 3 5a3.37 3.37 0 0 0-1 2.5c0 2 1.5 3.09 3.94 4.7A20.94 20.94 0 0 1 10 15.42a20.94 20.94 0 0 1 4.06-3.22C16.5 10.59 18 9.5 18 7.5 18 5.22 15.68 4 14 4c-1.44 0-2.78 1.49-3.17 2.06a1 1 0 0 1-.92.44 1 1 0 0 1-.82-.58A3.65 3.65 0 0 0 6 4z" fill="#1a2e3b"></path></svg></button></div><div class="LabeledButton_module_box__2bf466cb"><label class="LabeledButton_module_labeledButton__2bf466cb" role="presentation" style="display: none;"><span>Add to Watch Later</span></label><button class="Button_module_button__2ee75979 shared_module_focusable__ad188687 Button_module_primary__2ee75979 Button_module_sm__2ee75979 Button_module_icon__2ee75979 Button_module_iconSm__2ee75979 exclude-global-button-styles  watch-later-button" aria-label="Add to Watch Later (this opens in a new window)" data-watchlater-button="true"><svg viewBox="0 0 20 20" class="watch-later-icon" focusable="false"><path d="M10 20C4.477 20 0 15.523 0 10S4.477 0 10 0s10 4.477 10 10-4.477 10-10 10zm0-1.5a8.5 8.5 0 1 0 0-17 8.5 8.5 0 0 0 0 17zM10.75 5v4.69l3.075 3.075a.75.75 0 1 1-1.06 1.06L9.25 10.311V5a.75.75 0 0 1 1.5 0z"></path></svg></button></div><div class="LabeledButton_module_box__2bf466cb"><label class="LabeledButton_module_labeledButton__2bf466cb" role="presentation" style="display: none;"><span>Add to collections</span></label><button class="Button_module_button__2ee75979 shared_module_focusable__ad188687 Button_module_primary__2ee75979 Button_module_sm__2ee75979 Button_module_icon__2ee75979 Button_module_iconSm__2ee75979 exclude-global-button-styles  collections-button" aria-label="Add to collections"><svg viewBox="0 0 20 20" class="collections-icon" focusable="false"><path d="M20 10a1 1 0 0 0-.52-.88L17.44 8l2-1.13A1 1 0 0 0 20 6a1 1 0 0 0-.52-.87l-8-4.45a3 3 0 0 0-2.9 0l-8 4.45A1 1 0 0 0 0 6a1 1 0 0 0 .51.88L2.56 8l-2 1.13a1 1 0 0 0 0 1.75l2 1.13-2 1.12a1 1 0 0 0 0 1.75l8 4.46a3 3 0 0 0 2.92 0l8-4.46a1 1 0 0 0 0-1.75l-2-1.12 2-1.13A1 1 0 0 0 20 10zM9.52 2.41a1 1 0 0 1 1 0L16.94 6l-6.45 3.57a1 1 0 0 1-1 0L3.06 6zm-1 8.91a3 3 0 0 0 2.92 0l3.92-2.18 1.56.86-6.45 3.59a1.06 1.06 0 0 1-1 0L3.06 10l1.56-.86zM16.94 14l-6.45 3.59a1.06 1.06 0 0 1-1 0L3.06 14l1.54-.86 3.94 2.19a3 3 0 0 0 2.92 0l3.94-2.18z" fill="#1a2e3b"></path></svg></button></div><div class="LabeledButton_module_box__2bf466cb"><label class="LabeledButton_module_labeledButton__2bf466cb" role="presentation" style="display: none;"><span>Share</span></label><button class="Button_module_button__2ee75979 shared_module_focusable__ad188687 Button_module_primary__2ee75979 Button_module_sm__2ee75979 Button_module_icon__2ee75979 Button_module_iconSm__2ee75979 exclude-global-button-styles  " aria-label="Share" data-share-button="true"><svg viewBox="0 0 18.1 20.95" class="share-icon ShareButton_module_shareIcon__da819942" focusable="false"><path d="M18.11 0L-.01 12.07l8 4v4.88l2.26-3.75 6.65 3.32zm-3 17.37l-3.93-2 1.81-6.42-5 4.91-4-2.03 11.9-7.93z" fill="#1a2e3b"></path></svg></button></div></div><div class="Notification_module_root__d330bf09 "></div><div class="ControlBar_module_controlBarWrapper__036b51d7"><div class="PlayButton_module_playButtonWrapper__af9e9913"><button class="Button_module_button__2ee75979 shared_module_focusable__ad188687 Button_module_customColor__2ee75979 Button_module_md__2ee75979 Button_module_icon__2ee75979 Tooltip_module_tooltipContainer__79ddaacb exclude-global-button-styles PlayButton_module_playButton__af9e9913 shared_module_focusable__ad188687" aria-label="Play"><svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" class="PlayButton_module_playIcon__af9e9913" data-play-icon="true"><path d="M19 12C19 12.3557 18.8111 12.6846 18.5039 12.8638L6.50387 19.8638C6.19458 20.0442 5.81243 20.0455 5.50194 19.8671C5.19145 19.6888 5 19.3581 5 19L5 5C5 4.64193 5.19145 4.3112 5.50194 4.13286C5.81243 3.95452 6.19458 3.9558 6.50387 4.13622L18.5039 11.1362C18.8111 11.3154 19 11.6443 19 12Z" class="fill"></path></svg><span class="Button_module_buttonChildren__2ee75979"></span></button></div><div class="vp-controls ControlBar_module_controls__036b51d7"><div class="ControlBar_module_progressBarAndButtons__036b51d7"><div class="ProgressBar_module_progressBarContainer__e8cae6bf" role="presentation"><div class="vp-progress ProgressBar_module_progressBar__e8cae6bf"><div class="FocusTarget_module_focusTarget__f24ff6c3 shared_module_focusable__ad188687" role="slider" aria-label="Progress Bar" aria-valuemin="0" aria-valuemax="883.389" aria-valuenow="0" aria-valuetext="00:00 of 14:43" tabindex="0"></div><div class="ChapterSegments_module_chapterSegmentsWrapper__48da9e76"><div class="ChapterSegment_module_chapterWrapper__7be5e45f" style="width: calc(100% - 0px);"><div class="ChapterSegment_module_chapter__7be5e45f"><div class="ChapterSegment_module_loaded__7be5e45f " style="width: 0%;"></div><div class="ChapterSegment_module_played__7be5e45f" style="width: 0%;"></div></div></div></div><div class="thumb-preview ThumbnailPreview_module_thumbnailPreview__a45685d4" role="presentation" aria-hidden="true" style="left: 23.3%; max-width: 160px; display: none;"><div class="thumb ThumbnailPreview_module_thumbnailPreviewImage__a45685d4" style="width: 160px; height: 90.1408px; background-image: url(&quot;https://videoapi-sprites.vimeocdn.com/video-sprites/image/68d551fe-0c56-41e6-a0d7-c87e4b44d996.0.jpeg?ClientID=player-backend-prod&amp;Expires=1680563874&amp;Signature=bc6036704283f8d54f2b9ba7992dbb9f477bc259&quot;); background-size: 1760px 991.549px; background-position: -960px -180.282px;"></div><div class="ThumbnailPreview_module_thumbnailPreviewText__a45685d4"><span class="ThumbnailPreview_module_time__a45685d4">03:25</span></div></div><div class="Timecode_module_timecodeContainer__86d38fc4" role="presentation" style="left: 0%;"><div class="Timecode_module_timecode__86d38fc4 ">14:43</div></div></div></div><div class="VolumeControl_module_volumeControlContainer__bb14c152"><button class="Button_module_button__2ee75979 shared_module_focusable__ad188687 Button_module_customColor__2ee75979 Button_module_xs__2ee75979 Button_module_icon__2ee75979 exclude-global-button-styles ControlBarButton_module_controlBarButton__e67d9867 shared_module_focusable__ad188687" aria-label="Volume (use up/down arrow keys to change)" data-volume-button="true"><svg viewBox="0 0 24 24" data-volume-icon="true"><path fill-rule="evenodd" clip-rule="evenodd" d="M20 12C20 15.7277 17.4505 18.8599 14 19.7479V21.7999C18.5645 20.8734 22 16.8379 22 12C22 7.16206 18.5645 3.12655 14 2.20001V4.25201C17.4505 5.1401 20 8.2723 20 12ZM18 12C18 9.38754 16.3304 7.16506 14 6.34139V8.53511C15.1956 9.22672 16 10.5194 16 12C16 13.4805 15.1956 14.7732 14 15.4648V17.6586C16.3304 16.8349 18 14.6124 18 12ZM6.58579 8.00396H4C2.89543 8.00396 2 8.89939 2 10.004V14.004C2 15.1085 2.89543 16.004 4 16.004H6.58579L10.2929 20.7111C10.9229 21.341 12 20.8949 12 20.004V4.00396C12 3.11305 10.9229 2.66689 10.2929 3.29685L6.58579 8.00396Z"></path></svg></button><div role="slider" class="VolumeControl_module_volumeControl__bb14c152 volume shared_module_focusable__ad188687" tabindex="0" aria-valuenow="1" aria-valuetext="100%" aria-label="Volume (use up/down arrow keys to change)" aria-valuemin="0" aria-valuemax="1" style="display: none;"><div class="VolumeControl_module_volumeBar__bb14c152"><div class="VolumeControl_module_volumeBarFill__bb14c152" style="height: 100%;"></div><div class="VolumeControl_module_sliderHandle__bb14c152" style="bottom: 100%;"></div></div></div></div><button class="Tooltip_module_tooltipContainer__79ddaacb exclude-global-button-styles ChromecastButton_module_chromecastButton__4cd36ef7 ControlBarButton_module_controlBarButton__e67d9867 shared_module_focusable__ad188687 vp-cast-button" aria-label="Cast" is="google-cast-button" data-chromecast-button="true" style="display: none;"><style>.cast_caf_state_c {fill: var(--connected-color, #4285f4);}.cast_caf_state_d {fill: var(--disconnected-color, #7d7d7d);}.cast_caf_state_h {opacity: 0;}</style><svg x="0px" y="0px" width="100%" height="100%" viewBox="0 0 24 24"><g><path id="cast_caf_icon_arch0" class="cast_caf_status_d" d="M1,18 L1,21 L4,21 C4,19.3 2.66,18 1,18 L1,18 Z"></path><path id="cast_caf_icon_arch1" class="cast_caf_status_d" d="M1,14 L1,16 C3.76,16 6,18.2 6,21 L8,21 C8,17.13 4.87,14 1,14 L1,14 Z"></path><path id="cast_caf_icon_arch2" class="cast_caf_status_d" d="M1,10 L1,12 C5.97,12 10,16.0 10,21 L12,21 C12,14.92 7.07,10 1,10 L1,10 Z"></path><path id="cast_caf_icon_box" class="cast_caf_status_d" d="M21,3 L3,3 C1.9,3 1,3.9 1,5 L1,8 L3,8 L3,5 L21,5 L21,19 L14,19 L14,21 L21,21 C22.1,21 23,20.1 23,19 L23,5 C23,3.9 22.1,3 21,3 L21,3 Z"></path><path id="cast_caf_icon_boxfill" class="cast_caf_state_h" d="M5,7 L5,8.63 C8,8.6 13.37,14 13.37,17 L19,17 L19,7 Z"></path></g></svg></button><button class="Button_module_button__2ee75979 shared_module_focusable__ad188687 Button_module_customColor__2ee75979 Button_module_xs__2ee75979 Button_module_icon__2ee75979 Tooltip_module_tooltipContainer__79ddaacb exclude-global-button-styles ControlBarButton_module_controlBarButton__e67d9867 shared_module_focusable__ad188687 cc" aria-label="Choose captions" aria-haspopup="true"><svg viewBox="0 0 24 24" data-cc-icon="true"><path fill-rule="evenodd" clip-rule="evenodd" d="M20 6H4V18H20V6ZM4 4C2.89543 4 2 4.89543 2 6V18C2 19.1046 2.89543 20 4 20H20C21.1046 20 22 19.1046 22 18V6C22 4.89543 21.1046 4 20 4H4ZM11.486 12.8238C11.3743 13.5215 11.0859 14.0974 10.6307 14.5377C10.1676 14.9833 9.56909 15.2094 8.85284 15.2094C7.97089 15.2094 7.26496 14.9058 6.7557 14.3063C6.25372 13.7133 6 12.8972 6 11.8775C6 10.7761 6.28832 9.91206 6.85646 9.30664C7.36026 8.77164 8.00852 8.5 8.78364 8.5C9.81431 8.5 10.5828 8.86515 11.0677 9.58479C11.3306 9.98486 11.475 10.3944 11.4963 10.801L11.5054 10.9803H11.3215H10.1026H9.96788L9.93328 10.8536C9.86226 10.5844 9.77364 10.3826 9.66802 10.2535C9.48229 10.0281 9.21096 9.91857 8.83402 9.91857C8.46012 9.91857 8.17059 10.0766 7.95146 10.4027C7.7202 10.7465 7.60305 11.2484 7.60305 11.897C7.60305 12.5403 7.72445 13.0226 7.9636 13.3304C8.19547 13.6292 8.48015 13.7748 8.83342 13.7748C9.197 13.7748 9.46468 13.6541 9.65285 13.4038C9.75968 13.2659 9.85073 13.0475 9.92478 12.7569L9.95634 12.6285H10.0941H11.313H11.5169L11.486 12.8238ZM17.1137 14.5377C17.569 14.0974 17.8567 13.5215 17.9684 12.8238L17.9999 12.6285H17.796H16.5766H16.44L16.4078 12.7569C16.3344 13.0475 16.2427 13.2659 16.1353 13.4038C15.9477 13.6541 15.6794 13.7748 15.3158 13.7748C14.9632 13.7748 14.6791 13.6292 14.4472 13.3304C14.2081 13.0226 14.0855 12.5403 14.0855 11.897C14.0855 11.2484 14.2032 10.7465 14.4351 10.4027C14.653 10.0766 14.9425 9.91857 15.3171 9.91857C15.6934 9.91857 15.9659 10.0281 16.1504 10.2535C16.2561 10.3826 16.3459 10.5844 16.4169 10.8536L16.4503 10.9803H16.5863H17.8045H17.9878L17.9799 10.801C17.9574 10.3944 17.8136 9.98486 17.5502 9.58479C17.0652 8.86515 16.2979 8.5 15.2673 8.5C14.4909 8.5 13.8433 8.77164 13.3395 9.30664C12.7707 9.91206 12.483 10.7761 12.483 11.8775C12.483 12.8972 12.7368 13.7133 13.2381 14.3063C13.748 14.9058 14.4533 15.2094 15.3359 15.2094C16.0521 15.2094 16.65 14.9833 17.1137 14.5377Z"></path></svg><span class="Button_module_buttonChildren__2ee75979"></span></button><div class="vp-menu Menu_module_menu__18d51783 Menu_module_scroll__18d51783" style="display: none; height: auto; right: 9.2em;"><div><div class="MenuHeader_module_menuHeader__f39ecc6b"><header class="MenuHeader_module_header__f39ecc6b"><div class="MenuHeader_module_backButtonWrapper__f39ecc6b"><button class="Button_module_button__2ee75979 shared_module_focusable__ad188687 Button_module_alternative__2ee75979 Button_module_md__2ee75979 Button_module_icon__2ee75979 Button_module_iconMd__2ee75979 exclude-global-button-styles MenuHeader_module_backButton__f39ecc6b" aria-label="Back"><svg viewBox="0 0 24 24"><path d="M9.71 17.71l-1.42-1.42 4.3-4.29-4.3-4.29 1.42-1.42 5 5a1 1 0 0 1 0 1.41z" fill="#1a2e3b"></path></svg></button></div><span class="Text_module_text__9e457bd4 Text_module_md__9e457bd4 Text_module_bold__9e457bd4 MenuHeader_module_title__f39ecc6b">CC/Subtitles</span><div class="MenuHeader_module_closeButtonWrapper__f39ecc6b"><button class="Button_module_button__2ee75979 shared_module_focusable__ad188687 Button_module_alternative__2ee75979 Button_module_md__2ee75979 Button_module_icon__2ee75979 Button_module_iconMd__2ee75979 exclude-global-button-styles MenuHeader_module_closeButton__f39ecc6b" aria-label="Close menu"><svg viewBox="0 0 20 20"><path d="M11.06 10l4.597-4.596a.749.749 0 1 0-1.061-1.06L10 8.938 5.404 4.343a.749.749 0 1 0-1.06 1.061L8.938 10l-4.596 4.596a.749.749 0 1 0 1.061 1.06L10 11.062l4.596 4.596a.749.749 0 1 0 1.06-1.061L11.062 10z" fill="#1A2E3B" fill-rule="evenodd"></path></svg></button></div></header><div class="Divider_module_divider__f4291f61 "></div></div></div><div class="Menu_module_menuBody__18d51783" style="height: 0px;"><div class="Menu_module_menuPanel__18d51783"><ul class="MenuOptionList_module_list__a8666df7" role="group"><li class="MenuOption_module_option__918a804a MenuOption_module_withActive__918a804a MenuOption_module_styled__918a804a MenuOptionListItem_module_listItem__4f8d35ea MenuOptionListItem_module_active__4f8d35ea" role="menuitemradio" aria-checked="true" data-id="off" tabindex="0"><div class="MenuOptionListItem_module_check__4f8d35ea MenuOptionListItem_module_activeCheck__4f8d35ea"><svg width="12" height="8" viewBox="0 0 12 8" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M4.66668 6.39041L10.1953 0.861816L11.1381 1.80463L5.13808 7.80463C4.87773 8.06498 4.45562 8.06498 4.19527 7.80463L0.861938 4.47129L1.80475 3.52848L4.66668 6.39041Z" fill="white"></path></svg></div><span class="Text_module_text__9e457bd4 Text_module_md__9e457bd4 Text_module_normal__9e457bd4 MenuOptionListItem_module_text__4f8d35ea">Off</span></li><li class="MenuOption_module_option__918a804a MenuOption_module_withActive__918a804a MenuOption_module_styled__918a804a MenuOptionListItem_module_listItem__4f8d35ea" role="menuitemradio" aria-checked="false" data-id="64682683" tabindex="0"><div class="MenuOptionListItem_module_check__4f8d35ea "><svg width="12" height="8" viewBox="0 0 12 8" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M4.66668 6.39041L10.1953 0.861816L11.1381 1.80463L5.13808 7.80463C4.87773 8.06498 4.45562 8.06498 4.19527 7.80463L0.861938 4.47129L1.80475 3.52848L4.66668 6.39041Z" fill="white"></path></svg></div><span class="Text_module_text__9e457bd4 Text_module_md__9e457bd4 Text_module_normal__9e457bd4 MenuOptionListItem_module_text__4f8d35ea">English (auto-generated) CC</span></li></ul><div class="Divider_module_divider__f4291f61 Divider_module_buffer__f4291f61"></div><div class="MenuOption_module_option__918a804a MenuOption_module_styled__918a804a MenuOptionButton_module_optionButton__50331188  undefined" role="menuitemradio" tabindex="0"><span class="Text_module_text__9e457bd4 Text_module_md__9e457bd4 Text_module_bold__9e457bd4 MenuOptionButton_module_label__50331188">Customize</span><div class="MenuOptionButton_module_icon__50331188 "><svg viewBox="0 0 24 24"><path d="M9.71 17.71l-1.42-1.42 4.3-4.29-4.3-4.29 1.42-1.42 5 5a1 1 0 0 1 0 1.41z" fill="#1a2e3b"></path></svg></div></div></div></div></div><button class="Button_module_button__2ee75979 shared_module_focusable__ad188687 Button_module_customColor__2ee75979 Button_module_xs__2ee75979 Button_module_icon__2ee75979 Tooltip_module_tooltipContainer__79ddaacb exclude-global-button-styles ControlBarButton_module_controlBarButton__e67d9867 shared_module_focusable__ad188687 vp-prefs PrefsButton_module_prefsButton__ee31fc86" aria-expanded="false" aria-label="Settings"><svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg" class="PrefsButton_module_gearIcon__ee31fc86"><path fill-rule="evenodd" clip-rule="evenodd" d="M9.16668 1.66699C8.2462 1.66699 7.50001 2.41318 7.50001 3.33366V4.72835C7.21484 4.86382 6.94241 5.02175 6.68499 5.19984L5.46953 4.4981C4.68103 4.04285 3.66009 4.31415 3.20034 5.11047L2.36526 6.55686C1.90707 7.35046 2.17605 8.3701 2.96953 8.82822L4.18535 9.53017C4.17298 9.68526 4.16668 9.84206 4.16668 10.0003C4.16668 10.1586 4.17298 10.3154 4.18535 10.4705L2.96953 11.1724C2.17605 11.6306 1.90707 12.6502 2.36526 13.4438L3.20034 14.8902C3.66009 15.6865 4.68103 15.9578 5.46953 15.5026L6.685 14.8008C6.94241 14.9789 7.21484 15.1368 7.50001 15.2723V16.667C7.50001 17.5875 8.2462 18.3337 9.16668 18.3337H10.8333C11.7538 18.3337 12.5 17.5875 12.5 16.667V15.2723C12.7851 15.1369 13.0574 14.979 13.3147 14.801L14.5298 15.5026C15.3183 15.9578 16.3393 15.6865 16.799 14.8902L17.6341 13.4438C18.0923 12.6502 17.8233 11.6306 17.0298 11.1724L15.8146 10.4708C15.827 10.3156 15.8333 10.1587 15.8333 10.0003C15.8333 9.84193 15.827 9.68501 15.8146 9.52981L17.0298 8.82822C17.8233 8.3701 18.0923 7.35046 17.6341 6.55686L16.799 5.11047C16.3393 4.31415 15.3183 4.04285 14.5298 4.4981L13.3147 5.19963C13.0574 5.02162 12.7851 4.86377 12.5 4.72835V3.33366C12.5 2.41318 11.7538 1.66699 10.8333 1.66699H9.16668ZM12.5 10.0003C12.5 11.381 11.3807 12.5003 10 12.5003C8.6193 12.5003 7.50001 11.381 7.50001 10.0003C7.50001 8.61961 8.6193 7.50033 10 7.50033C11.3807 7.50033 12.5 8.61961 12.5 10.0003Z"></path></svg><span class="Button_module_buttonChildren__2ee75979"></span></button><div class="vp-menu Menu_module_menu__18d51783 Menu_module_scroll__18d51783" style="display: none; height: auto; right: 6.4em;"><div></div><div class="Menu_module_menuBody__18d51783" style="height: 0px;"><div class="Menu_module_menuPanel__18d51783"><div class="MenuOption_module_option__918a804a MenuOption_module_styled__918a804a MenuOptionButton_module_optionButton__50331188  undefined" role="menuitemradio" tabindex="0"><span class="Text_module_text__9e457bd4 Text_module_md__9e457bd4 Text_module_bold__9e457bd4 MenuOptionButton_module_label__50331188">Quality</span><span class="Text_module_text__9e457bd4 Text_module_sm__9e457bd4 Text_module_normal__9e457bd4 MenuOptionButton_module_value__50331188">1080p</span><div class="MenuOptionButton_module_icon__50331188 "><svg viewBox="0 0 24 24"><path d="M9.71 17.71l-1.42-1.42 4.3-4.29-4.3-4.29 1.42-1.42 5 5a1 1 0 0 1 0 1.41z" fill="#1a2e3b"></path></svg></div></div><div class="MenuOption_module_option__918a804a MenuOption_module_styled__918a804a MenuOptionButton_module_optionButton__50331188  undefined" role="menuitemradio" tabindex="0"><span class="Text_module_text__9e457bd4 Text_module_md__9e457bd4 Text_module_bold__9e457bd4 MenuOptionButton_module_label__50331188">Speed</span><span class="Text_module_text__9e457bd4 Text_module_sm__9e457bd4 Text_module_normal__9e457bd4 MenuOptionButton_module_value__50331188">Normal</span><div class="MenuOptionButton_module_icon__50331188 "><svg viewBox="0 0 24 24"><path d="M9.71 17.71l-1.42-1.42 4.3-4.29-4.3-4.29 1.42-1.42 5 5a1 1 0 0 1 0 1.41z" fill="#1a2e3b"></path></svg></div></div><div class="Divider_module_divider__f4291f61 Divider_module_buffer__f4291f61"></div><button class="Button_module_button__2ee75979 shared_module_focusable__ad188687 Button_module_customColor__2ee75979 Button_module_md__2ee75979 Button_module_icon__2ee75979 Button_module_iconSm__2ee75979 vp-menu-info DebugPanelButton_module_debugPanelButton__e1eb3e16"><svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg" class="DebugPanelButton_module_debugPanelButtonIcon__e1eb3e16"><path fill-rule="evenodd" clip-rule="evenodd" d="M10.6667 6C10.6667 8.57733 8.57733 10.6667 6 10.6667C3.42267 10.6667 1.33333 8.57733 1.33333 6C1.33333 3.42267 3.42267 1.33333 6 1.33333C8.57733 1.33333 10.6667 3.42267 10.6667 6ZM12 6C12 9.31371 9.31371 12 6 12C2.68629 12 0 9.31371 0 6C0 2.68629 2.68629 0 6 0C9.31371 0 12 2.68629 12 6ZM6 4.66667C6.36819 4.66667 6.66667 4.36819 6.66667 4C6.66667 3.63181 6.36819 3.33333 6 3.33333C5.63181 3.33333 5.33333 3.63181 5.33333 4C5.33333 4.36819 5.63181 4.66667 6 4.66667ZM6 5.33333C6.36819 5.33333 6.66667 5.54653 6.66667 5.80952V8.19048C6.66667 8.45347 6.36819 8.66667 6 8.66667C5.63181 8.66667 5.33333 8.45347 5.33333 8.19048V5.80952C5.33333 5.54653 5.63181 5.33333 6 5.33333Z" fill="white"></path></svg><span class="Button_module_buttonChildren__2ee75979"><span class="DebugPanelButton_module_debugPanelButtonText__e1eb3e16">Debug log</span></span></button></div></div></div><button class="Button_module_button__2ee75979 shared_module_focusable__ad188687 Button_module_customColor__2ee75979 Button_module_xs__2ee75979 Button_module_icon__2ee75979 Tooltip_module_tooltipContainer__79ddaacb exclude-global-button-styles ControlBarButton_module_controlBarButton__e67d9867 shared_module_focusable__ad188687 pip" aria-label="Enter Picture-in-Picture"><svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg" class="" data-enter-pip="true"><path fill-rule="evenodd" clip-rule="evenodd" d="M3.33329 4.99992H16.6666V9.99992H18.3333V4.99992C18.3333 4.07944 17.5871 3.33325 16.6666 3.33325H3.33329C2.41282 3.33325 1.66663 4.07944 1.66663 4.99992V13.3333C1.66663 14.2537 2.41282 14.9999 3.33329 14.9999H8.33329V13.3333H3.33329V4.99992ZM9.99996 12.6666C9.99996 12.1143 10.4477 11.6666 11 11.6666H17.3333C17.8856 11.6666 18.3333 12.1143 18.3333 12.6666V17.3333C18.3333 17.8855 17.8856 18.3333 17.3333 18.3333H11C10.4477 18.3333 9.99996 17.8855 9.99996 17.3333V12.6666ZM7.91663 7.60408V8.59492L6.17079 6.84909C6.05829 6.73659 5.90163 6.66659 5.72913 6.66659C5.38413 6.66659 5.10413 6.94575 5.10413 7.29159C5.10413 7.46409 5.17413 7.61992 5.28746 7.73325L7.03246 9.47909H6.04163C5.69663 9.47909 5.41663 9.75825 5.41663 10.1041C5.41663 10.4491 5.69663 10.7291 6.04163 10.7291H8.54163C8.88663 10.7291 9.16663 10.4491 9.16663 10.1041V7.60408C9.16663 7.25825 8.88663 6.97909 8.54163 6.97909C8.19663 6.97909 7.91663 7.25825 7.91663 7.60408Z" fill="white"></path></svg><span class="Button_module_buttonChildren__2ee75979"></span></button><button class="Button_module_button__2ee75979 shared_module_focusable__ad188687 Button_module_customColor__2ee75979 Button_module_xs__2ee75979 Button_module_icon__2ee75979 Tooltip_module_tooltipContainer__79ddaacb exclude-global-button-styles ControlBarButton_module_controlBarButton__e67d9867 shared_module_focusable__ad188687 fullscreen FullscreenButton_module_fullscreen__ec6a4dee" aria-label="Enter full screen"><svg class="enter-fullscreen-icon" width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M16 5L17.5858 5L14.2929 8.29292C13.9024 8.68345 13.9024 9.31661 14.2929 9.70714C14.6834 10.0977 15.3166 10.0977 15.7071 9.70714L19 6.41426V8C19 8.55228 19.4477 9 20 9C20.5523 9 21 8.55228 21 8V4C21 3.73478 20.8946 3.48043 20.7071 3.29289C20.5196 3.10536 20.2652 3 20 3H16C15.4477 3 15 3.44772 15 4C15 4.55228 15.4477 5 16 5ZM5 8.00002V6.4142L8.29292 9.70712C8.68345 10.0976 9.31661 10.0976 9.70714 9.70712C10.0977 9.3166 10.0977 8.68343 9.70714 8.29291L6.41424 5.00001L8 5.00002C8.55228 5.00002 9 4.5523 9 4.00002C9 3.44773 8.55228 3.00002 8 3.00002H4C3.73478 3.00002 3.48043 3.10537 3.29289 3.29291C3.10536 3.48044 3 3.7348 3 4.00002V8.00002C3 8.5523 3.44772 9.00001 4 9.00001C4.55228 9.00001 5 8.5523 5 8.00002ZM8.00002 19H6.4142L9.70712 15.7071C10.0976 15.3166 10.0976 14.6834 9.70712 14.2929C9.3166 13.9024 8.68343 13.9024 8.29291 14.2929L5.00001 17.5858V16C5.00001 15.4477 4.5523 15 4.00001 15C3.44773 15 3.00002 15.4477 3.00002 16L3.00002 20C3.00002 20.2652 3.10537 20.5196 3.29291 20.7071C3.48044 20.8947 3.7348 21 4.00002 21H8.00002C8.5523 21 9.00001 20.5523 9.00001 20C9.00001 19.4477 8.5523 19 8.00002 19ZM19 17.5858V16C19 15.4477 19.4477 15 20 15C20.5523 15 21 15.4477 21 16V20C21 20.2652 20.8946 20.5196 20.7071 20.7071C20.5196 20.8947 20.2652 21 20 21H16C15.4477 21 15 20.5523 15 20C15 19.4477 15.4477 19 16 19H17.5858L14.2929 15.7071C13.9023 15.3166 13.9023 14.6834 14.2929 14.2929C14.6834 13.9024 15.3166 13.9024 15.7071 14.2929L19 17.5858Z"></path></svg><span class="Button_module_buttonChildren__2ee75979"></span></button></div></div></div><div class="NudgeArea_module_nudgeArea__f7294a38 NudgeArea_module_nudgeBackwardArea__f7294a38"></div><div class="NudgeArea_module_nudgeArea__f7294a38 NudgeArea_module_nudgeForwardArea__f7294a38"></div><div class="BufferHandler_module_shade__0799a97e" data-shade="true" style="display: none;"></div><svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg" fill="none" data-spinner="true" class="Spinner_module_spinner__9c0ec6c3 vp-spin Spinner_module_lg__9c0ec6c3" style="display: none;"><circle data-spinner-trace="true" cx="24" cy="24" r="22" stroke="white"></circle><circle data-spinner-circle="true" cx="24" cy="24" r="22" stroke="white"></circle></svg></div><div class="vp-controls-wrapper" data-content-area-sibling-eligible=""></div><div class="vp-overlay-wrapper hidden" role="dialog" aria-modal="true" aria-labelledby="vp-overlay-labelledby" hidden="" data-content-area-sibling-eligible=""><div class="vp-overlay-bg"></div><div class="vp-overlay-cell"><div class="vp-overlay"></div><div class="vp-overlay-icon-wrapper hidden"><div class="vp-overlay-icon"></div></div><div class="vp-overlay-logo logo"></div></div><nav><button type="button" class="vp-nav-prevButton js-back cloaked" aria-label="Back"><svg class="icon-prev" viewBox="0 0 27 48" preserveAspectRatio="xMidYMid" focusable="false"><path class="fill" d="M7.243,24L26.414,4.828c0.781-0.781,0.781-2.047,0-2.828L25,0.586 c-0.781-0.781-2.047-0.781-2.828,0L0.879,21.879c-1.172,1.172-1.172,3.071,0,4.243l21.293,21.293c0.781,0.781,2.047,0.781,2.828,0 L26.414,46c0.781-0.781,0.781-2.047,0-2.828L7.243,24z"></path></svg></button><button type="button" class="vp-nav-closeButton js-close" aria-label="Close overlay"><svg viewBox="0 0 20 20" class="icon-close"><path d="M11.06 10l4.597-4.596a.749.749 0 1 0-1.061-1.06L10 8.938 5.404 4.343a.749.749 0 1 0-1.06 1.061L8.938 10l-4.596 4.596a.749.749 0 1 0 1.061 1.06L10 11.062l4.596 4.596a.749.749 0 1 0 1.06-1.061L11.062 10z" fill="#fff" fill-rule="evenodd"></path></svg></button></nav></div><div class="vp-notification-wrapper hidden" hidden="" data-content-area-sibling-eligible=""><div class="vp-notification-cell"><div class="vp-notification" role="dialog" aria-live="assertive"></div></div></div><span id="new-window" hidden="">This opens in a new window.</span><div class="vp-alert hidden" role="alertdialog" aria-atomic="true" hidden=""><button data-close="" aria-label="Close alert" class="close"><svg viewBox="0 0 20 20" class="icon-close"><path d="M11.06 10l4.597-4.596a.749.749 0 1 0-1.061-1.06L10 8.938 5.404 4.343a.749.749 0 1 0-1.06 1.061L8.938 10l-4.596 4.596a.749.749 0 1 0 1.061 1.06L10 11.062l4.596 4.596a.749.749 0 1 0 1.06-1.061L11.062 10z" fill="#fff" fill-rule="evenodd"></path></svg></button></div></div></div></div><div class="pagination_holder"><a role="button" title="Previous video" class="player_area-browse js-pagination--left" data-fatal-attraction="container:player|component:previous_video|keyword:786646692" href="https://vimeo.com/789086506" rel="prev"><svg viewBox="0 0 48 48"><path d="M17.743 24L36.914 4.828a2 2 0 000-2.828L35.5.586a2 2 0 00-2.828 0L11.379 21.879a3 3 0 000 4.243l21.293 21.293a2 2 0 002.828 0L36.914 46a2 2 0 000-2.828L17.743 24z"></path></svg></a><a role="button" title="Next video" class="player_area-browse player_area-browse--right js-pagination--right" data-fatal-attraction="container:player|component:next_video|keyword:786646692" style="" href="https://vimeo.com/786631209" rel="next"><svg viewBox="0 0 48 48"><path d="M17.743 24L36.914 4.828a2 2 0 000-2.828L35.5.586a2 2 0 00-2.828 0L11.379 21.879a3 3 0 000 4.243l21.293 21.293a2 2 0 002.828 0L36.914 46a2 2 0 000-2.828L17.743 24z"></path></svg></a></div></div></div></div><div class="RyjvF"><div class="gradient sc-krDsej jzlvCR"></div></div></div><main class="sc-eweMDZ fGJzIW"><div class="sc-kEmuub bmHlZQ"><div class="uvUyK sc-bbkauy fuzrVZ"><div><div><div class="_11FAg"><h1 class="_3vbdr sc-frDJqD fDQgcn" format="dark"><span class="-KXLs">Dear Rich</span><span class="video_attributes"><!-- react-empty: 28 --><!-- react-empty: 29 --></span></h1><p class="usuQa sc-frDJqD hktYBY" format="alternative"><time datetime="2023-01-05 12:01:55" title="Thursday, January 5, 2023 at 12:01 PM EST">3 months ago</time><a class="clip_info-more iris_link iris_link--gray-2" href="https://vimeo.com/786646692#more_info" aria-label="View more information about this video">More</a></p><div class="clip_info-subline--watch clip_info-subline--inline"><span><div class="_1D7gj"><div class="_1D7gj"><span><div class="_1Mv4b"><a href="https://vimeo.com/steptstudios" class="_1QfB-" aria-hidden="true" tabindex="-1"><img class="sc-AnqlK iYNWau" alt="" src="./Dear Rich on Vimeo_files/26007498_75x75" srcset="https://i.vimeocdn.com/portrait/26007498_150x150 2x" data-airgap-id="24"></a></div><div class="_1D7gj"><span class="_2Mgz2 l-ellipsis sc-frDJqD hktYBY" format="alternative"><span><a data-fatal-attraction="container:clip_page|component:user_profile_link|keyword:video_creator" href="https://vimeo.com/steptstudios" class="js-user_link jT_ky Y3PvY">Stept Studios</a></span></span></div></span></div></div></span><button class="sc-jqCOkK gtMnc" format="primary" data-fatal-attraction="container:clip_description|component:follow|keyword:15073876"><span class="sc-uJMKN lRRFE"><span class="sc-ktHwxA jNUOQX"><svg viewBox="0 0 24 24"><path d="M18 11h-5V6a1 1 0 10-2 0v5H6a1 1 0 000 2h5v5a1 1 0 002 0v-5h5a1 1 0 000-2z" fill="#1a2e3b"></path></svg></span><!-- react-text: 49 -->Follow<!-- /react-text --></span><div class="sc-hEsumM gaFUEa"></div></button></div></div><div class="clip-notification"></div></div><div class="_1cCXb sc-kEmuub bmHlZQ"><div class="_2H2a1 sc-bbkauy fmFDPY"><div class="_2qxn8"><div class="sc-gQNndl oadzA"><div class="sc-glUWqk bXkWlN"><div class="sc-bTiqRo jUyFkF"><span class="sc-bEufUU hRFJpJ" data-tooltip-trigger="true" aria-label="74K Views"><span class="sc-RmnOB iAKBCh"><span class="sc-MYvYT iJYvtq"><svg viewBox="0 0 20 20"><path d="M4 18a1 1 0 01-1-1V3a1 1 0 011.5-.86l12 7a1 1 0 010 1.72l-12 7A1 1 0 014 18zM5 4.74v10.52L14 10z" fill="#1a2e3b"></path></svg></span><span class="sc-frDJqD kzqFsC" format="dark">74K</span></span></span></div><div class="sc-fFTYTi bTWZfL" data-placement="top" style="position: absolute; will-change: transform; top: 0px; left: 0px; transform: translate3d(118px, 765px, 0px);"><!-- react-empty: 145 --></div></div></div><div class="sc-gQNndl oadzA"><div class="sc-glUWqk bXkWlN"><div class="sc-bTiqRo jUyFkF"><span class="sc-bEufUU hRFJpJ" href="/786646692/likes" data-tooltip-trigger="true" aria-label="871 Likes"><a href="https://vimeo.com/786646692/likes"><span class="sc-RmnOB iAKBCh"><span class="sc-MYvYT iJYvtq"><svg viewBox="0 0 20 20"><path d="M10 18a1 1 0 01-.81-.42 15.8 15.8 0 00-4.35-3.71C2.46 12.3 0 10.68 0 7.5a5.38 5.38 0 011.61-3.92A6 6 0 016 2a5.54 5.54 0 014.05 1.88A5.74 5.74 0 0114 2c2.9 0 6 2.21 6 5.5s-2.46 4.8-4.84 6.37a15.8 15.8 0 00-4.35 3.71A1 1 0 0110 18zM5.78 4A4 4 0 003 5a3.37 3.37 0 00-1 2.5c0 2 1.5 3.09 3.94 4.7A20.94 20.94 0 0110 15.42a20.94 20.94 0 014.06-3.22C16.5 10.59 18 9.5 18 7.5 18 5.22 15.68 4 14 4c-1.44 0-2.78 1.49-3.17 2.06a1 1 0 01-.92.44 1 1 0 01-.82-.58A3.65 3.65 0 006 4z" fill="#1a2e3b"></path></svg></span><span class="sc-frDJqD kzqFsC" format="dark">871</span></span></a></span></div><div class="sc-fFTYTi bTWZfL" data-placement="top" style="position: absolute; will-change: transform; top: 0px; left: 0px; transform: translate3d(190px, 765px, 0px);"><!-- react-empty: 157 --></div></div></div><div class="sc-gQNndl oadzA"><div class="sc-glUWqk bXkWlN"><div class="sc-bTiqRo jUyFkF"><span class="sc-bEufUU hRFJpJ" href="/786646692/collections" data-tooltip-trigger="true" aria-label="72 Collections"><a href="https://vimeo.com/786646692/collections"><span class="sc-RmnOB iAKBCh"><span class="sc-MYvYT iJYvtq"><svg viewBox="0 0 20 20"><path d="M20 10a1 1 0 00-.52-.88L17.44 8l2-1.13A1 1 0 0020 6a1 1 0 00-.52-.87l-8-4.45a3 3 0 00-2.9 0l-8 4.45A1 1 0 000 6a1 1 0 00.51.88L2.56 8l-2 1.13a1 1 0 000 1.75l2 1.13-2 1.12a1 1 0 000 1.75l8 4.46a3 3 0 002.92 0l8-4.46a1 1 0 000-1.75l-2-1.12 2-1.13A1 1 0 0020 10zM9.52 2.41a1 1 0 011 0L16.94 6l-6.45 3.57a1 1 0 01-1 0L3.06 6zm-1 8.91a3 3 0 002.92 0l3.92-2.18 1.56.86-6.45 3.59a1.06 1.06 0 01-1 0L3.06 10l1.56-.86zM16.94 14l-6.45 3.59a1.06 1.06 0 01-1 0L3.06 14l1.54-.86 3.94 2.19a3 3 0 002.92 0l3.94-2.18z" fill="#1a2e3b"></path></svg></span><span class="sc-frDJqD kzqFsC" format="dark">72</span></span></a></span></div><div class="sc-fFTYTi bTWZfL" data-placement="top" style="position: absolute; will-change: transform; top: 0px; left: 0px; transform: translate3d(257px, 765px, 0px);"><!-- react-empty: 169 --></div></div></div><div class="sc-gQNndl oadzA"><div class="sc-glUWqk bXkWlN"><div class="sc-bTiqRo jUyFkF"><span class="sc-bEufUU hRFJpJ" href="#comments" data-tooltip-trigger="true" aria-label="28 Comments"><a href="https://vimeo.com/786646692#comments"><span class="sc-RmnOB iAKBCh"><span class="sc-MYvYT iJYvtq"><svg viewBox="0 0 20 18"><path d="M6 18v-6h-.5A5.51 5.51 0 010 6.5v-1A5.51 5.51 0 015.5 0h9A5.51 5.51 0 0120 5.5v1a5.51 5.51 0 01-5.5 5.5H12zM5.5 2A3.5 3.5 0 002 5.5v1A3.5 3.5 0 005.5 10H8v3.17L11.17 10h3.33A3.5 3.5 0 0018 6.5v-1A3.5 3.5 0 0014.5 2z" fill="#1a2e3b"></path></svg></span><span class="sc-frDJqD kzqFsC" format="dark">28</span></span></a></span></div><div class="sc-fFTYTi bTWZfL" style="position: absolute; will-change: transform; top: 0px; left: 0px; transform: translate3d(319px, 765px, 0px);" data-placement="top"><!-- react-empty: 69 --></div></div></div></div></div><div class="_3oHHF sc-bbkauy fmFDPY"><div class="_2qxn8"><button class="sc-jqCOkK jivVNl" format="secondary" type="button" data-fatal-attraction="container:clip_description|component:share|keyword:786646692"><span class="sc-uJMKN lRRFE"><span class="sc-ktHwxA gFMRxF"><svg viewBox="0 0 18.1 20.95"><path d="M18.11 0L-.01 12.07l8 4v4.88l2.26-3.75 6.65 3.32zm-3 17.37l-3.93-2 1.81-6.42-5 4.91-4-2.03 11.9-7.93z" fill="#1a2e3b"></path></svg></span><!-- react-text: 77 -->Share<!-- /react-text --></span><div class="sc-hEsumM kPZgJn"></div></button></div></div><div class="_1DKxU sc-bbkauy jeWaOo"><div class="_wMel erXGS" dir="auto" data-description-content="true"><p class="first">Accomplished endurance athlete, author and podcaster, Rich Roll has been a voice we have become familiar with over the years. In DEAR RICH, we hear the story behind the voice. Rich shares a letter to himself, giving an intimate view into the struggles he's faced with addiction, how running has helped bring him back to the surface and something that he is still learning: that we must overcome our fear of change to find what we are truly capable of.</p>
+<p>Credits: <br>
+Client: SalomonTV<br>
+Production Company: Stept Studios<br>
+Post Production: Lockt Editorial</p>
+<p>Director: Brandon Lavoie<br>
+DP: Jared Levy <br>
+EP: Jon Brogan <br>
+Account Executive: Paul Muhlbach<br>
+Producer: Laura Mittelberg<br>
+Supervising Producer: Eric Cook <br>
+1st AC: Jake Coury<br>
+Gaffer: Evan Cox<br>
+Key Grip: David Klassen <br>
+HMU: Luca Buzas<br>
+Audio Mixer: Bobby Vongham<br>
+35mm Photographer: Brian Chorski	<br>
+PA: Anthony Cantu, John Maddock</p>
+<p>Post Production<br>
+Head of Post: Connor Scofield<br>
+Post EP: Eileen Miraglia<br>
+Post Producer: Erin Bates<br>
+Editor: Brandon Lavoie<br>
+Online Editor: Ben Ivers<br>
+Colorist: Sam Zook at Mom &amp; Pop<br>
+Composer: Jon Sigsworth<br>
+Sound Design and Mix: Justin Enoch at Post Mambo</p>
+<p>SalomonTV<br>
+Senior Marketing Manager – Run &amp; Outdoor: Erin Cooper<br>
+Marketing Specialist: Louis Bertrand</p></div><div class="_28HiI"><p class="sc-frDJqD bKNFtb" format="dark"><a class="sc-fihHvN fnypYr"><span class="sc-ghsgMZ gJmQrL" format="primary">Read more…</span></a></p></div></div></div><div class="_2svHt sc-kEmuub bmHlZQ"><div class="sc-bbkauy kyPPgR"><div class="_1HruR"><h3 class="_1hnuB sc-frDJqD epUyiG" format="dark">2 Categories</h3><div class="clip-categories"><a href="https://vimeo.com/categories/documentary/people/videos" class="_3b5R1">People</a><a href="https://vimeo.com/categories/documentary" class="_3b5R1">Documentary</a></div></div></div></div><div><section id="comments" class="_1GRzt"><h3 class="sc-frDJqD epUyiG" format="dark">28 Comments</h3><button class="iris_comment-more sc-jqCOkK jYxpga" format="secondaryOutline"><span class="sc-uJMKN lRRFE"><span class="sc-ktHwxA gFMRxF"><svg viewBox="0 0 24 24"><path d="M18 11h-5V6a1 1 0 10-2 0v5H6a1 1 0 000 2h5v5a1 1 0 002 0v-5h5a1 1 0 000-2z" fill="#1a2e3b"></path></svg></span><!-- react-text: 631 -->Load 17 previous comments<!-- /react-text --></span><div class="sc-hEsumM kPZgJn"></div></button><div class="iris_comments-list"><article id="comment_20097685" class="iris_comment-container l-clearfix"><div class="iris_comment"><div><div class="iris_comment-portrait undefined"><a data-fatal-attraction="container:clip_page|component:user_profile_link|keyword:comment" href="https://vimeo.com/user192495839" class="_1QfB-" aria-hidden="true" tabindex="-1"><img class="sc-AnqlK bwvBQb" alt="" src="./Dear Rich on Vimeo_files/defaults-blue_75x75" srcset="https://i.vimeocdn.com/portrait/defaults-blue_150x150 2x" data-airgap-id="55"></a></div></div><div class="iris_comment-body iris_span-22"><div class="iris_comment-content l-clearfix undefined"><span><a data-fatal-attraction="container:clip_page|component:user_profile_link|keyword:comment" href="https://vimeo.com/user192495839" class="js-user_link jT_ky Y3PvY">Fun Test</a></span><time datetime="2023-01-15 14:15:53" class="_3bOaL">2 months ago</time><div class="vod-magic-color _1DRAU"><p class="first">Nice</p></div></div></div></div><div class="iris_comment-actions is--hidden"><a class="iris_comment-permalink" href="https://vimeo.com/786646692#comment_20097685" title="Permalink to this comment"><svg viewBox="0 0 12 12" class="iris_ic is--12"><path d="M5 3H3a3 3 0 100 6 .5.5 0 000-1c-1.103 0-2-.897-2-2s.897-2 2-2h2c1.103 0 2 .897 2 2a.5.5 0 001 0 3 3 0 00-3-3z"></path><path d="M9 3a.5.5 0 000 1c1.103 0 2 .897 2 2s-.897 2-2 2H7c-1.103 0-2-.897-2-2a.5.5 0 00-1 0 3 3 0 003 3h2a3 3 0 100-6z"></path></svg></a></div><div class="iris_reply-wrapper iris_span-24 l-collapse-rts"><button class="js-comment_reply_link iris_comment-btn" type="button">Reply</button></div></article><article id="comment_20098857" class="iris_comment-container l-clearfix"><div class="iris_comment"><div><div class="iris_comment-portrait undefined"><a data-fatal-attraction="container:clip_page|component:user_profile_link|keyword:comment" href="https://vimeo.com/user30540055" class="_1QfB-" aria-hidden="true" tabindex="-1"><img class="sc-AnqlK bwvBQb" alt="" src="./Dear Rich on Vimeo_files/82139277_75x75" srcset="https://i.vimeocdn.com/portrait/82139277_150x150 2x" data-airgap-id="56"></a></div></div><div class="iris_comment-body iris_span-22"><div class="iris_comment-content l-clearfix undefined"><span><a data-fatal-attraction="container:clip_page|component:user_profile_link|keyword:comment" href="https://vimeo.com/user30540055" class="js-user_link jT_ky Y3PvY">Michael Wilmes</a></span><time datetime="2023-01-16 17:45:30" class="_3bOaL">2 months ago</time><div class="vod-magic-color _1DRAU"><p class="first">�� Thank You</p></div></div></div></div><div class="iris_comment-actions is--hidden"><a class="iris_comment-permalink" href="https://vimeo.com/786646692#comment_20098857" title="Permalink to this comment"><svg viewBox="0 0 12 12" class="iris_ic is--12"><path d="M5 3H3a3 3 0 100 6 .5.5 0 000-1c-1.103 0-2-.897-2-2s.897-2 2-2h2c1.103 0 2 .897 2 2a.5.5 0 001 0 3 3 0 00-3-3z"></path><path d="M9 3a.5.5 0 000 1c1.103 0 2 .897 2 2s-.897 2-2 2H7c-1.103 0-2-.897-2-2a.5.5 0 00-1 0 3 3 0 003 3h2a3 3 0 100-6z"></path></svg></a></div><div class="iris_reply-wrapper iris_span-24 l-collapse-rts"><button class="js-comment_reply_link iris_comment-btn" type="button">Reply</button></div></article><article id="comment_20100230" class="iris_comment-container l-clearfix"><div class="iris_comment"><div><div class="iris_comment-portrait undefined"><a data-fatal-attraction="container:clip_page|component:user_profile_link|keyword:comment" href="https://vimeo.com/user191732529" class="_1QfB-" aria-hidden="true" tabindex="-1"><img class="sc-AnqlK bwvBQb" alt="" src="./Dear Rich on Vimeo_files/81529800_75x75" srcset="https://i.vimeocdn.com/portrait/81529800_150x150 2x" data-airgap-id="57"></a></div></div><div class="iris_comment-body iris_span-22"><div class="iris_comment-content l-clearfix undefined"><span><a data-fatal-attraction="container:clip_page|component:user_profile_link|keyword:comment" href="https://vimeo.com/user191732529" class="js-user_link jT_ky Y3PvY">Boy Boy</a></span><time datetime="2023-01-18 00:04:45" class="_3bOaL">2 months ago</time><div class="vod-magic-color _1DRAU"><p class="first">good</p></div></div></div></div><div class="iris_comment-actions is--hidden"><a class="iris_comment-permalink" href="https://vimeo.com/786646692#comment_20100230" title="Permalink to this comment"><svg viewBox="0 0 12 12" class="iris_ic is--12"><path d="M5 3H3a3 3 0 100 6 .5.5 0 000-1c-1.103 0-2-.897-2-2s.897-2 2-2h2c1.103 0 2 .897 2 2a.5.5 0 001 0 3 3 0 00-3-3z"></path><path d="M9 3a.5.5 0 000 1c1.103 0 2 .897 2 2s-.897 2-2 2H7c-1.103 0-2-.897-2-2a.5.5 0 00-1 0 3 3 0 003 3h2a3 3 0 100-6z"></path></svg></a></div><div class="iris_reply-wrapper iris_span-24 l-collapse-rts"><button class="js-comment_reply_link iris_comment-btn" type="button">Reply</button></div></article><article id="comment_20100832" class="iris_comment-container l-clearfix"><div class="iris_comment"><div><div class="iris_comment-portrait undefined"><a data-fatal-attraction="container:clip_page|component:user_profile_link|keyword:comment" href="https://vimeo.com/user192798698" class="_1QfB-" aria-hidden="true" tabindex="-1"><img class="sc-AnqlK bwvBQb" alt="" src="./Dear Rich on Vimeo_files/82222657_75x75" srcset="https://i.vimeocdn.com/portrait/82222657_150x150 2x" data-airgap-id="58"></a></div></div><div class="iris_comment-body iris_span-22"><div class="iris_comment-content l-clearfix undefined"><span><a data-fatal-attraction="container:clip_page|component:user_profile_link|keyword:comment" href="https://vimeo.com/user192798698" class="js-user_link jT_ky Y3PvY">Susan Taylor</a></span><time datetime="2023-01-18 14:54:49" class="_3bOaL">2 months ago</time><div class="vod-magic-color _1DRAU"><p class="first">Thank you so much :)  I am so excited about getting started here :) I'm basically a retired dog groomer, but I am more interested in staying at home and doing all that I can with this new business :) Yea, I'm totally excited</p></div></div></div></div><div class="iris_comment-actions is--hidden"><a class="iris_comment-permalink" href="https://vimeo.com/786646692#comment_20100832" title="Permalink to this comment"><svg viewBox="0 0 12 12" class="iris_ic is--12"><path d="M5 3H3a3 3 0 100 6 .5.5 0 000-1c-1.103 0-2-.897-2-2s.897-2 2-2h2c1.103 0 2 .897 2 2a.5.5 0 001 0 3 3 0 00-3-3z"></path><path d="M9 3a.5.5 0 000 1c1.103 0 2 .897 2 2s-.897 2-2 2H7c-1.103 0-2-.897-2-2a.5.5 0 00-1 0 3 3 0 003 3h2a3 3 0 100-6z"></path></svg></a></div><div class="iris_reply-wrapper iris_span-24 l-collapse-rts"><button class="js-comment_reply_link iris_comment-btn" type="button">Reply</button></div></article><article id="comment_20101661" class="iris_comment-container l-clearfix"><div class="iris_comment"><div><div class="iris_comment-portrait undefined"><a data-fatal-attraction="container:clip_page|component:user_profile_link|keyword:comment" href="https://vimeo.com/user105427191" class="_1QfB-" aria-hidden="true" tabindex="-1"><img class="sc-AnqlK bwvBQb" alt="" src="./Dear Rich on Vimeo_files/35128933_75x75" srcset="https://i.vimeocdn.com/portrait/35128933_150x150 2x" data-airgap-id="59"></a></div></div><div class="iris_comment-body iris_span-22"><div class="iris_comment-content l-clearfix undefined"><span><a data-fatal-attraction="container:clip_page|component:user_profile_link|keyword:comment" href="https://vimeo.com/user105427191" class="js-user_link jT_ky Y3PvY">Tracy Corbett</a></span><time datetime="2023-01-19 11:01:59" class="_3bOaL">2 months ago</time><div class="vod-magic-color _1DRAU"><p class="first">Absolutely beautiful, thank you for sharing</p></div></div></div></div><div class="iris_comment-actions is--hidden"><a class="iris_comment-permalink" href="https://vimeo.com/786646692#comment_20101661" title="Permalink to this comment"><svg viewBox="0 0 12 12" class="iris_ic is--12"><path d="M5 3H3a3 3 0 100 6 .5.5 0 000-1c-1.103 0-2-.897-2-2s.897-2 2-2h2c1.103 0 2 .897 2 2a.5.5 0 001 0 3 3 0 00-3-3z"></path><path d="M9 3a.5.5 0 000 1c1.103 0 2 .897 2 2s-.897 2-2 2H7c-1.103 0-2-.897-2-2a.5.5 0 00-1 0 3 3 0 003 3h2a3 3 0 100-6z"></path></svg></a></div><div class="iris_reply-wrapper iris_span-24 l-collapse-rts"><button class="js-comment_reply_link iris_comment-btn" type="button">Reply</button></div></article><article id="comment_20105050" class="iris_comment-container l-clearfix"><div class="iris_comment"><div><div class="iris_comment-portrait undefined"><a data-fatal-attraction="container:clip_page|component:user_profile_link|keyword:comment" href="https://vimeo.com/user49244788" class="_1QfB-" aria-hidden="true" tabindex="-1"><img class="sc-AnqlK bwvBQb" alt="" src="./Dear Rich on Vimeo_files/16347591_75x75" srcset="https://i.vimeocdn.com/portrait/16347591_150x150 2x" data-airgap-id="60"></a></div></div><div class="iris_comment-body iris_span-22"><div class="iris_comment-content l-clearfix undefined"><span><a data-fatal-attraction="container:clip_page|component:user_profile_link|keyword:comment" href="https://vimeo.com/user49244788" class="js-user_link jT_ky Y3PvY">Mark Kutrovski</a></span><time datetime="2023-01-23 00:48:32" class="_3bOaL">2 months ago</time><div class="vod-magic-color _1DRAU"><p class="first">This was excellent and moving. It seemed like he looked familiar and then it clicked when I saw he was the host of the podcast. <br>
+Very well done!</p></div></div></div></div><div class="iris_comment-actions is--hidden"><a class="iris_comment-permalink" href="https://vimeo.com/786646692#comment_20105050" title="Permalink to this comment"><svg viewBox="0 0 12 12" class="iris_ic is--12"><path d="M5 3H3a3 3 0 100 6 .5.5 0 000-1c-1.103 0-2-.897-2-2s.897-2 2-2h2c1.103 0 2 .897 2 2a.5.5 0 001 0 3 3 0 00-3-3z"></path><path d="M9 3a.5.5 0 000 1c1.103 0 2 .897 2 2s-.897 2-2 2H7c-1.103 0-2-.897-2-2a.5.5 0 00-1 0 3 3 0 003 3h2a3 3 0 100-6z"></path></svg></a></div><div class="iris_reply-wrapper iris_span-24 l-collapse-rts"><button class="js-comment_reply_link iris_comment-btn" type="button">Reply</button></div></article><article id="comment_20108818" class="iris_comment-container l-clearfix"><div class="iris_comment"><div><div class="iris_comment-portrait undefined"><a data-fatal-attraction="container:clip_page|component:user_profile_link|keyword:comment" href="https://vimeo.com/user193282892" class="_1QfB-" aria-hidden="true" tabindex="-1"><img class="sc-AnqlK bwvBQb" alt="" src="./Dear Rich on Vimeo_files/defaults-blue_75x75" srcset="https://i.vimeocdn.com/portrait/defaults-blue_150x150 2x" data-airgap-id="61"></a></div></div><div class="iris_comment-body iris_span-22"><div class="iris_comment-content l-clearfix undefined"><span><a data-fatal-attraction="container:clip_page|component:user_profile_link|keyword:comment" href="https://vimeo.com/user193282892" class="js-user_link jT_ky Y3PvY">Quiin Home</a></span><time datetime="2023-01-26 09:47:21" class="_3bOaL">2 months ago</time><div class="vod-magic-color _1DRAU"><p class="first">nice</p></div></div></div></div><div class="iris_comment-actions is--hidden"><a class="iris_comment-permalink" href="https://vimeo.com/786646692#comment_20108818" title="Permalink to this comment"><svg viewBox="0 0 12 12" class="iris_ic is--12"><path d="M5 3H3a3 3 0 100 6 .5.5 0 000-1c-1.103 0-2-.897-2-2s.897-2 2-2h2c1.103 0 2 .897 2 2a.5.5 0 001 0 3 3 0 00-3-3z"></path><path d="M9 3a.5.5 0 000 1c1.103 0 2 .897 2 2s-.897 2-2 2H7c-1.103 0-2-.897-2-2a.5.5 0 00-1 0 3 3 0 003 3h2a3 3 0 100-6z"></path></svg></a></div><div class="iris_reply-wrapper iris_span-24 l-collapse-rts"><button class="js-comment_reply_link iris_comment-btn" type="button">Reply</button></div></article><article id="comment_20110207" class="iris_comment-container l-clearfix"><div class="iris_comment"><div><div class="iris_comment-portrait undefined"><a data-fatal-attraction="container:clip_page|component:user_profile_link|keyword:comment" href="https://vimeo.com/user100113882" class="_1QfB-" aria-hidden="true" tabindex="-1"><img class="sc-AnqlK bwvBQb" alt="" src="./Dear Rich on Vimeo_files/32592669_75x75" srcset="https://i.vimeocdn.com/portrait/32592669_150x150 2x" data-airgap-id="62"></a></div></div><div class="iris_comment-body iris_span-22"><div class="iris_comment-content l-clearfix undefined"><span><a data-fatal-attraction="container:clip_page|component:user_profile_link|keyword:comment" href="https://vimeo.com/user100113882" class="js-user_link jT_ky Y3PvY">James Johnson III</a></span><time datetime="2023-01-27 14:22:27" class="_3bOaL">2 months ago</time><div class="vod-magic-color _1DRAU"><p class="first">Beautifully captured. As a recovering alcoholic trying to find his way post trauma, I find these stories most helpful and uplifting.</p></div></div></div></div><div class="iris_comment-actions is--hidden"><a class="iris_comment-permalink" href="https://vimeo.com/786646692#comment_20110207" title="Permalink to this comment"><svg viewBox="0 0 12 12" class="iris_ic is--12"><path d="M5 3H3a3 3 0 100 6 .5.5 0 000-1c-1.103 0-2-.897-2-2s.897-2 2-2h2c1.103 0 2 .897 2 2a.5.5 0 001 0 3 3 0 00-3-3z"></path><path d="M9 3a.5.5 0 000 1c1.103 0 2 .897 2 2s-.897 2-2 2H7c-1.103 0-2-.897-2-2a.5.5 0 00-1 0 3 3 0 003 3h2a3 3 0 100-6z"></path></svg></a></div><div class="iris_reply-wrapper iris_span-24 l-collapse-rts"><button class="js-comment_reply_link iris_comment-btn" type="button">Reply</button></div></article><article id="comment_20115250" class="iris_comment-container l-clearfix"><div class="iris_comment"><div><div class="iris_comment-portrait undefined"><a data-fatal-attraction="container:clip_page|component:user_profile_link|keyword:comment" href="https://vimeo.com/user102784103" class="_1QfB-" aria-hidden="true" tabindex="-1"><img class="sc-AnqlK bwvBQb" alt="" src="./Dear Rich on Vimeo_files/80096137_75x75" srcset="https://i.vimeocdn.com/portrait/80096137_150x150 2x" data-airgap-id="63"></a></div></div><div class="iris_comment-body iris_span-22"><div class="iris_comment-content l-clearfix undefined"><span><a data-fatal-attraction="container:clip_page|component:user_profile_link|keyword:comment" href="https://vimeo.com/user102784103" class="js-user_link jT_ky Y3PvY">Kendra Jo</a></span><time datetime="2023-01-31 11:56:03" class="_3bOaL">2 months ago</time><div class="vod-magic-color _1DRAU"><p class="first">I love this.</p></div></div></div></div><div class="iris_comment-actions is--hidden"><a class="iris_comment-permalink" href="https://vimeo.com/786646692#comment_20115250" title="Permalink to this comment"><svg viewBox="0 0 12 12" class="iris_ic is--12"><path d="M5 3H3a3 3 0 100 6 .5.5 0 000-1c-1.103 0-2-.897-2-2s.897-2 2-2h2c1.103 0 2 .897 2 2a.5.5 0 001 0 3 3 0 00-3-3z"></path><path d="M9 3a.5.5 0 000 1c1.103 0 2 .897 2 2s-.897 2-2 2H7c-1.103 0-2-.897-2-2a.5.5 0 00-1 0 3 3 0 003 3h2a3 3 0 100-6z"></path></svg></a></div><div class="iris_reply-wrapper iris_span-24 l-collapse-rts"><div class="iris_comment-replies l-clearfix"><article id="comment_20115252" class="iris_comment-container l-clearfix is_reply clearfix"><div class="iris_comment"><div><div class="iris_comment-portrait undefined"><a href="https://vimeo.com/user102784103" class="_1QfB- _3vvb5" aria-hidden="true" tabindex="-1"><img class="sc-AnqlK iYNWau" alt="" src="./Dear Rich on Vimeo_files/80096137_75x75" srcset="https://i.vimeocdn.com/portrait/80096137_150x150 2x" data-airgap-id="64"></a></div></div><div class="iris_comment-body iris_span-22"><div class="iris_comment-content l-clearfix undefined"><span><a href="https://vimeo.com/user102784103" class="js-user_link jT_ky Y3PvY">Kendra Jo</a></span><time datetime="2023-01-31 11:57:23" class="_3bOaL">2 months ago</time><div class="vod-magic-color _1DRAU"><p class="first">Recovering opioid addict &amp; writer.</p></div></div></div></div><div class="iris_comment-actions is--hidden"><a class="iris_comment-permalink" href="https://vimeo.com/786646692#comment_20115252" title="Permalink to this comment"><svg viewBox="0 0 12 12" class="iris_ic is--12"><path d="M5 3H3a3 3 0 100 6 .5.5 0 000-1c-1.103 0-2-.897-2-2s.897-2 2-2h2c1.103 0 2 .897 2 2a.5.5 0 001 0 3 3 0 00-3-3z"></path><path d="M9 3a.5.5 0 000 1c1.103 0 2 .897 2 2s-.897 2-2 2H7c-1.103 0-2-.897-2-2a.5.5 0 00-1 0 3 3 0 003 3h2a3 3 0 100-6z"></path></svg></a></div></article></div><button class="js-comment_reply_link iris_comment-btn" type="button">Reply</button></div></article><article id="comment_20117426" class="iris_comment-container l-clearfix"><div class="iris_comment"><div><div class="iris_comment-portrait undefined"><a data-fatal-attraction="container:clip_page|component:user_profile_link|keyword:comment" href="https://vimeo.com/user193915545" class="_1QfB-" aria-hidden="true" tabindex="-1"><img class="sc-AnqlK bwvBQb" alt="" src="./Dear Rich on Vimeo_files/82956089_75x75" srcset="https://i.vimeocdn.com/portrait/82956089_150x150 2x" data-airgap-id="65"></a></div></div><div class="iris_comment-body iris_span-22"><div class="iris_comment-content l-clearfix undefined"><span><a data-fatal-attraction="container:clip_page|component:user_profile_link|keyword:comment" href="https://vimeo.com/user193915545" class="js-user_link jT_ky Y3PvY">Mandy Hulbert</a></span><time datetime="2023-02-02 00:22:43" class="_3bOaL">2 months ago</time><div class="vod-magic-color _1DRAU"><p class="first">Inspirational, moving and honest, what a guy!</p></div></div></div></div><div class="iris_comment-actions is--hidden"><a class="iris_comment-permalink" href="https://vimeo.com/786646692#comment_20117426" title="Permalink to this comment"><svg viewBox="0 0 12 12" class="iris_ic is--12"><path d="M5 3H3a3 3 0 100 6 .5.5 0 000-1c-1.103 0-2-.897-2-2s.897-2 2-2h2c1.103 0 2 .897 2 2a.5.5 0 001 0 3 3 0 00-3-3z"></path><path d="M9 3a.5.5 0 000 1c1.103 0 2 .897 2 2s-.897 2-2 2H7c-1.103 0-2-.897-2-2a.5.5 0 00-1 0 3 3 0 003 3h2a3 3 0 100-6z"></path></svg></a></div><div class="iris_reply-wrapper iris_span-24 l-collapse-rts"><button class="js-comment_reply_link iris_comment-btn" type="button">Reply</button></div></article></div><div><div class="iris_comment-form l-clearfix"><div class="iris_comment-portrait"><label class="iris_portrait is-circle" for="add_comment"><img class="sc-AnqlK iYNWau" src="./Dear Rich on Vimeo_files/default-blue_40x40" srcset="https://i.vimeocdn.com/portrait/default-blue_80x80 2x" data-airgap-id="33"></label></div><form class="iris_comment-body iris_span-22"><div><div class="sc-bIKvTM hDTrdX"><label class="sc-frDJqD bKNFtb" format="dark" for="add_comment"><span class="sc-jPPmml cvuKji"><!-- react-text: 183 -->Add a new comment<!-- /react-text --></span></label><div class="sc-igwadP dlVFGr"><div class="sc-ckYZGd hAGboV"><textarea id="add_comment" aria-invalid="false" placeholder="Add a comment" aria-required="true" class="_2E29v _2VZfa bGcg8"></textarea></div><div class=""><!-- react-empty: 188 --><!-- react-empty: 189 --></div></div></div></div></form></div></div></section></div></div></div><aside class="_2ob58 sc-bbkauy ehWnT"><div class="sc-kEmuub bmHlZQ"><div class="_22ARj sc-bbkauy jeWaOo"><div class="vWSmL"><p>Stept Studios is available</p></div><div class="_16Gq_"><div><button class="sc-jqCOkK iQpQVn" format="success"><span class="sc-uJMKN lRRFE"><span class="sc-ktHwxA gFMRxF"><svg viewBox="0 0 24 24" preserveAspectRatio="xMidYMid"><path d="M19 4H5C3.3 4 2 5.3 2 7v10c0 1.7 1.3 3 3 3h14c1.7 0 3-1.3 3-3V7c0-1.7-1.3-3-3-3zM5 6h14c.6 0 1 .4 1 1v.5l-8 6.2-8-6.2V7c0-.6.4-1 1-1zm14 12H5c-.6 0-1-.4-1-1v-7l7.4 5.7c.2.1.4.2.6.2s.4-.1.6-.2L20 10v7c0 .6-.4 1-1 1z"></path></svg></span><!-- react-text: 102 -->Hire<!-- /react-text --></span><div class="sc-hEsumM kPZgJn"></div></button></div></div><p class="sc-frDJqD hktYBY" format="alternative"><!-- react-text: 105 -->Looking for more video pros? <!-- /react-text --><a class="sc-fihHvN fnypYr" href="https://vimeo.com/for-hire#jobForm" target="_blank"><span class="sc-ghsgMZ kjiQXE" format="primary">Post a job</span></a><!-- react-text: 108 --><!-- /react-text --></p></div><div class="_39Z98 sc-bbkauy jeWaOo" role="complementary" aria-label="Related Clips"><div><div class="contextclip-wrapper iris_grid-sidebar"><div class="context-clip"><h4 class="sc-frDJqD epUyiG" format="dark">More from <a href="https://vimeo.com/steptstudios/videos">Stept Studios</a></h4><div class="_3QlT_"><div class="_16rrx"><div class="_3l6bd _1RQ62"><label class="_1jZ-U _2JNtZ sc-frDJqD ddAsOA" format="dark" for="continuous_play_toggle"><span><input type="checkbox" id="continuous_play_toggle" data-fatal-attraction="container:sidebar_videos|component:autoplay_disabled|keyword:786646692" name="demoToggleMd" value="1" class="_2To6V context_clip-toggle"><div class="_2hrJG _17OP4"></div><div class="_2NuPh _2ynM3 _3mjGU"></div><span class="">Autoplay next video</span></span></label></div><div class=""><!-- react-empty: 417 --><!-- react-empty: 418 --></div></div></div><div class="contextclip-items-wrapper"><div class="contextclip-items current_clip-786646692"><span><article class="_1BvkT _319pl" data-fatal-attraction="container:sidebar_videos|component:clips|keyword:Y2xpcHN8MTUwNzM4NzZ8aWQ6ZGVzY3xbXQ==|position:1|target:/786646692|promoted:0" data-position="1"><div class="_3PPdO"><a class="contextclip-img-thumb" href="https://vimeo.com/786646692" aria-hidden="true" tabindex="-1"><img src="./Dear Rich on Vimeo_files/1582157011-37115b15c717a168bf86e2f2855b6bbc23b1cbcee54ff99c8d7b808b459365d6-d_130x73" srcset="https://i.vimeocdn.com/video/1582157011-37115b15c717a168bf86e2f2855b6bbc23b1cbcee54ff99c8d7b808b459365d6-d_260x146 2x" alt="" width="130" height="73" data-airgap-id="45"></a></div><div class="_1N8SM"><div><div><!-- react-empty: 429 --><h3 class="_13NFb sc-frDJqD etvvTK" format="dark"><a href="https://vimeo.com/786646692" class="iris_link iris_link--gray-1" title="Dear Rich">Dear Rich</a></h3><div class="contextclip-subline"><div><span class="_2Mgz2 l-ellipsis sc-frDJqD hktYBY" format="alternative"><span><a href="https://vimeo.com/steptstudios" class="js-user_link jT_ky _1hBsq">Stept Studios</a></span></span></div></div></div></div></div></article><article class="_1BvkT" data-fatal-attraction="container:sidebar_videos|component:clips|keyword:Y2xpcHN8MTUwNzM4NzZ8aWQ6ZGVzY3xbXQ==|position:2|target:/786631209|promoted:0" data-position="2"><div class="_3PPdO"><a class="contextclip-img-thumb" href="https://vimeo.com/786631209" aria-hidden="true" tabindex="-1"><img src="./Dear Rich on Vimeo_files/1581360498-868b5ba88b5cd81cf194217bcd894e9db563a84d594132f5b0c45c34b33243f4-d_130x73" srcset="https://i.vimeocdn.com/video/1581360498-868b5ba88b5cd81cf194217bcd894e9db563a84d594132f5b0c45c34b33243f4-d_260x146 2x" alt="" width="130" height="73" data-airgap-id="46"></a></div><div class="_1N8SM"><div><div><!-- react-empty: 444 --><h3 class="_13NFb sc-frDJqD etvvTK" format="dark"><a href="https://vimeo.com/786631209" class="iris_link iris_link--gray-1" title="The North Face | Go All Out.">The North Face | Go All Out.</a></h3><div class="contextclip-subline"><div><span class="_2Mgz2 l-ellipsis sc-frDJqD hktYBY" format="alternative"><span><a href="https://vimeo.com/steptstudios" class="js-user_link jT_ky _1hBsq">Stept Studios</a></span></span></div></div></div></div></div></article><article class="_1BvkT" data-fatal-attraction="container:sidebar_videos|component:clips|keyword:Y2xpcHN8MTUwNzM4NzZ8aWQ6ZGVzY3xbXQ==|position:3|target:/782617049|promoted:0" data-position="3"><div class="_3PPdO"><a class="contextclip-img-thumb" href="https://vimeo.com/782617049" aria-hidden="true" tabindex="-1"><img src="./Dear Rich on Vimeo_files/1571285435-f3e08d0b3f0516ff31da5ef9165331567dbac32ed71651279b3d51f960d058b8-d_130x73" srcset="https://i.vimeocdn.com/video/1571285435-f3e08d0b3f0516ff31da5ef9165331567dbac32ed71651279b3d51f960d058b8-d_260x146 2x" alt="" width="130" height="73" data-airgap-id="47"></a></div><div class="_1N8SM"><div><div><!-- react-empty: 459 --><h3 class="_13NFb sc-frDJqD etvvTK" format="dark"><a href="https://vimeo.com/782617049" class="iris_link iris_link--gray-1" title="Läkare Utan Gränser | Det Enkla Valet :30">Läkare Utan Gränser | Det Enkla Valet :30</a></h3><div class="contextclip-subline"><div><span class="_2Mgz2 l-ellipsis sc-frDJqD hktYBY" format="alternative"><span><a href="https://vimeo.com/steptstudios" class="js-user_link jT_ky _1hBsq">Stept Studios</a></span></span></div></div></div></div></div></article><article class="_1BvkT" data-fatal-attraction="container:sidebar_videos|component:clips|keyword:Y2xpcHN8MTUwNzM4NzZ8aWQ6ZGVzY3xbXQ==|position:4|target:/781525690|promoted:0" data-position="4"><div class="_3PPdO"><a class="contextclip-img-thumb" href="https://vimeo.com/781525690" aria-hidden="true" tabindex="-1"><img src="./Dear Rich on Vimeo_files/1568820229-cf29a9e04d8ac26b914f0c7caebb7c9ed67fbf41954f3734f099e16971cc3d89-d_130x73" srcset="https://i.vimeocdn.com/video/1568820229-cf29a9e04d8ac26b914f0c7caebb7c9ed67fbf41954f3734f099e16971cc3d89-d_260x146 2x" alt="" width="130" height="73" data-airgap-id="48"></a></div><div class="_1N8SM"><div><div><!-- react-empty: 474 --><h3 class="_13NFb sc-frDJqD etvvTK" format="dark"><a href="https://vimeo.com/781525690" class="iris_link iris_link--gray-1" title="Eye Drop">Eye Drop</a></h3><div class="contextclip-subline"><div><span class="_2Mgz2 l-ellipsis sc-frDJqD hktYBY" format="alternative"><span><a href="https://vimeo.com/steptstudios" class="js-user_link jT_ky _1hBsq">Stept Studios</a></span></span></div></div></div></div></div></article><article class="_1BvkT" data-fatal-attraction="container:sidebar_videos|component:clips|keyword:Y2xpcHN8MTUwNzM4NzZ8aWQ6ZGVzY3xbXQ==|position:5|target:/777409143|promoted:0" data-position="5"><div class="_3PPdO"><a class="contextclip-img-thumb" href="https://vimeo.com/777409143" aria-hidden="true" tabindex="-1"><img src="./Dear Rich on Vimeo_files/1576329910-644ba98a9ea9a876b416b548e7c7351e19b3086703456b2d011d5f48641c797e-d_130x73" srcset="https://i.vimeocdn.com/video/1576329910-644ba98a9ea9a876b416b548e7c7351e19b3086703456b2d011d5f48641c797e-d_260x146 2x" alt="" width="130" height="73" data-airgap-id="49"></a></div><div class="_1N8SM"><div><div><!-- react-empty: 489 --><h3 class="_13NFb sc-frDJqD etvvTK" format="dark"><a href="https://vimeo.com/777409143" class="iris_link iris_link--gray-1" title="Smirnoff | The Sound of Bed-Stuy - Brooklyn (Director’s Cut)">Smirnoff | The Sound of Bed-Stuy - Brooklyn (Director’s Cut)</a></h3><div class="contextclip-subline"><div><span class="_2Mgz2 l-ellipsis sc-frDJqD hktYBY" format="alternative"><span><a href="https://vimeo.com/steptstudios" class="js-user_link jT_ky _1hBsq">Stept Studios</a></span></span></div></div></div></div></div></article><article class="_1BvkT" data-fatal-attraction="container:sidebar_videos|component:clips|keyword:Y2xpcHN8MTUwNzM4NzZ8aWQ6ZGVzY3xbXQ==|position:6|target:/769696732|promoted:0" data-position="6"><div class="_3PPdO"><a class="contextclip-img-thumb" href="https://vimeo.com/769696732" aria-hidden="true" tabindex="-1"><img src="./Dear Rich on Vimeo_files/1544889656-0205fe91f90874ba5fa3dd09abec39462d489541342fc69281002b017b39d3fa-d_130x73" srcset="https://i.vimeocdn.com/video/1544889656-0205fe91f90874ba5fa3dd09abec39462d489541342fc69281002b017b39d3fa-d_260x146 2x" alt="" width="130" height="73" data-airgap-id="50"></a></div><div class="_1N8SM"><div><div><!-- react-empty: 504 --><h3 class="_13NFb sc-frDJqD etvvTK" format="dark"><a href="https://vimeo.com/769696732" class="iris_link iris_link--gray-1" title="Nike | Runners Helping Runnings - Chella :30">Nike | Runners Helping Runnings - Chella :30</a></h3><div class="contextclip-subline"><div><span class="_2Mgz2 l-ellipsis sc-frDJqD hktYBY" format="alternative"><span><a href="https://vimeo.com/steptstudios" class="js-user_link jT_ky _1hBsq">Stept Studios</a></span></span></div></div></div></div></div></article><article class="_1BvkT" data-fatal-attraction="container:sidebar_videos|component:clips|keyword:Y2xpcHN8MTUwNzM4NzZ8aWQ6ZGVzY3xbXQ==|position:7|target:/769696703|promoted:0" data-position="7"><div class="_3PPdO"><a class="contextclip-img-thumb" href="https://vimeo.com/769696703" aria-hidden="true" tabindex="-1"><img src="./Dear Rich on Vimeo_files/1544889634-b048e66102752e03fe5d1927eca96fd80860c106f0934028638077b9307153d4-d_130x73" srcset="https://i.vimeocdn.com/video/1544889634-b048e66102752e03fe5d1927eca96fd80860c106f0934028638077b9307153d4-d_260x146 2x" alt="" width="130" height="73" data-airgap-id="51"></a></div><div class="_1N8SM"><div><div><!-- react-empty: 519 --><h3 class="_13NFb sc-frDJqD etvvTK" format="dark"><a href="https://vimeo.com/769696703" class="iris_link iris_link--gray-1" title="Nike | Runners Helping Runnings - Lenin :15">Nike | Runners Helping Runnings - Lenin :15</a></h3><div class="contextclip-subline"><div><span class="_2Mgz2 l-ellipsis sc-frDJqD hktYBY" format="alternative"><span><a href="https://vimeo.com/steptstudios" class="js-user_link jT_ky _1hBsq">Stept Studios</a></span></span></div></div></div></div></div></article><article class="_1BvkT" data-fatal-attraction="container:sidebar_videos|component:clips|keyword:Y2xpcHN8MTUwNzM4NzZ8aWQ6ZGVzY3xbXQ==|position:8|target:/769696614|promoted:0" data-position="8"><div class="_3PPdO"><a class="contextclip-img-thumb" href="https://vimeo.com/769696614" aria-hidden="true" tabindex="-1"><img src="./Dear Rich on Vimeo_files/1544889392-9a410a09bfc81636def2624cfe43203402efc4488ff8225cc5d1d0b533676c12-d_130x73" srcset="https://i.vimeocdn.com/video/1544889392-9a410a09bfc81636def2624cfe43203402efc4488ff8225cc5d1d0b533676c12-d_260x146 2x" alt="" width="130" height="73" data-airgap-id="52"></a></div><div class="_1N8SM"><div><div><!-- react-empty: 534 --><h3 class="_13NFb sc-frDJqD etvvTK" format="dark"><a href="https://vimeo.com/769696614" class="iris_link iris_link--gray-1" title="Nike | Runners Helping Runnings - David :30">Nike | Runners Helping Runnings - David :30</a></h3><div class="contextclip-subline"><div><span class="_2Mgz2 l-ellipsis sc-frDJqD hktYBY" format="alternative"><span><a href="https://vimeo.com/steptstudios" class="js-user_link jT_ky _1hBsq">Stept Studios</a></span></span></div></div></div></div></div></article><article class="_1BvkT" data-fatal-attraction="container:sidebar_videos|component:clips|keyword:Y2xpcHN8MTUwNzM4NzZ8aWQ6ZGVzY3xbXQ==|position:9|target:/769696572|promoted:0" data-position="9"><div class="_3PPdO"><a class="contextclip-img-thumb" href="https://vimeo.com/769696572" aria-hidden="true" tabindex="-1"><img src="./Dear Rich on Vimeo_files/1544889339-ce57dd09bca2bc262cdaab42ef5ef950435192bacb0d726650527aa84705b46f-d_130x73" srcset="https://i.vimeocdn.com/video/1544889339-ce57dd09bca2bc262cdaab42ef5ef950435192bacb0d726650527aa84705b46f-d_260x146 2x" alt="" width="130" height="73" data-airgap-id="53"></a></div><div class="_1N8SM"><div><div><!-- react-empty: 549 --><h3 class="_13NFb sc-frDJqD etvvTK" format="dark"><a href="https://vimeo.com/769696572" class="iris_link iris_link--gray-1" title="Nike | Runners Helping Runnings - Kristin :15">Nike | Runners Helping Runnings - Kristin :15</a></h3><div class="contextclip-subline"><div><span class="_2Mgz2 l-ellipsis sc-frDJqD hktYBY" format="alternative"><span><a href="https://vimeo.com/steptstudios" class="js-user_link jT_ky _1hBsq">Stept Studios</a></span></span></div></div></div></div></div></article><article class="_1BvkT" data-fatal-attraction="container:sidebar_videos|component:clips|keyword:Y2xpcHN8MTUwNzM4NzZ8aWQ6ZGVzY3xbXQ==|position:10|target:/769696538|promoted:0" data-position="10"><div class="_3PPdO"><a class="contextclip-img-thumb" href="https://vimeo.com/769696538" aria-hidden="true" tabindex="-1"><img src="./Dear Rich on Vimeo_files/1544889459-b892070bc5976ce9c8164f72d4d10caed4e71aa7163a0bc92e6b7ea13e9699e7-d_130x73" srcset="https://i.vimeocdn.com/video/1544889459-b892070bc5976ce9c8164f72d4d10caed4e71aa7163a0bc92e6b7ea13e9699e7-d_260x146 2x" alt="" width="130" height="73" data-airgap-id="54"></a></div><div class="_1N8SM"><div><div><!-- react-empty: 564 --><h3 class="_13NFb sc-frDJqD etvvTK" format="dark"><a href="https://vimeo.com/769696538" class="iris_link iris_link--gray-1" title="Nike | Runners Helping Runnings - Angela :30">Nike | Runners Helping Runnings - Angela :30</a></h3><div class="contextclip-subline"><div><span class="_2Mgz2 l-ellipsis sc-frDJqD hktYBY" format="alternative"><span><a href="https://vimeo.com/steptstudios" class="js-user_link jT_ky _1hBsq">Stept Studios</a></span></span></div></div></div></div></div></article></span></div></div><div class="J6P2H" data-fatal-attraction="container:sidebar_videos|component:show_more"><button class="sc-jqCOkK bHiWZD" format="secondaryOutline"><span class="sc-uJMKN lRRFE"><!-- react-text: 575 -->Show more…<!-- /react-text --></span><div class="sc-hEsumM kPZgJn"></div></button></div></div></div></div></div></div></aside></div></main><div class="sc-kafWEX huuWTP"><button class="sc-iELTvK jPLmBl sc-kvZOFW BMfHm" format="dark"><span class="sc-jbKcbu bXDjaH"><svg viewBox="0 0 20 20" class="sc-cmTdod kxlmNk" color="#969696"><path d="M11.06 10l4.597-4.596a.749.749 0 10-1.061-1.06L10 8.938 5.404 4.343a.749.749 0 10-1.06 1.061L8.938 10l-4.596 4.596a.749.749 0 101.061 1.06L10 11.062l4.596 4.596a.749.749 0 101.06-1.061L11.062 10z" fill="#1A2E3B" fill-rule="evenodd"></path></svg></span><div class="sc-dNLxif doNkiT"></div></button><p class="sc-feJyhm gQzwDY sc-frDJqD dkzzZQ" format="dark" color="inherit">Upload, livestream, and create your own videos, all in HD.</p><div class="sc-jwKygS eccvLY"><button class="sc-btzYZH jnufpz sc-jqCOkK leEcFK" format="alternative" id="bottom_banner_join"><span class="sc-uJMKN lRRFE"><!-- react-text: 123 -->Join Vimeo<!-- /react-text --></span><div class="sc-hEsumM kPZgJn"></div></button><button class="sc-btzYZH jnufpz sc-jqCOkK hHSdvu" format="secondary" id="bottom_banner_login"><span class="sc-uJMKN lRRFE"><!-- react-text: 127 -->Log in<!-- /react-text --></span><div class="sc-hEsumM kPZgJn"></div></button></div></div><div class="sc-cBXKeB htoRzd" style="position: fixed; right: 0px; top: 64px; z-index: 300;"><div class="sc-jrOYZv eDVYdd"><svg viewBox="0 0 16 16" class="sc-gIjDWZ gJpErT"><path d="M16 4.25C16 7.5 10 15 7.25 15 4 15 4 5 2.008 5c-.258 0-1.255.75-1.255.75L0 4.75s3.5-3.5 5-3.5C8 1.25 7 10 8.75 10c1 0 4.5-5.5 1.5-5.5-.5 0-1 .25-1 .25C10 2.25 11.5 1 13.75 1 15.25 1 16 2.25 16 4.25z"></path></svg><p class="sc-ddcOto crLMeK sc-frDJqD cKlhkN" size="3" format="dark">Join Free</p><button class="sc-kJdAmE cZNvKz sc-kvZOFW BMfHm" format="dark"><span class="sc-jbKcbu bXDjaH"><svg viewBox="0 0 20 20"><path d="M11.06 10l4.597-4.596a.749.749 0 10-1.061-1.06L10 8.938 5.404 4.343a.749.749 0 10-1.06 1.061L8.938 10l-4.596 4.596a.749.749 0 101.061 1.06L10 11.062l4.596 4.596a.749.749 0 101.06-1.061L11.062 10z" fill="#1A2E3B" fill-rule="evenodd"></path></svg></span><div class="sc-dNLxif doNkiT"></div></button></div><div class="sc-fQfKYo brmsnD"><button class="_26jJP sc-hzOKmB dtEXKo sc-grYksN jlHkUd" format="primary" type="submit"><span class="sc-frudsx bChoIW"><span class="sWT4G"><div class="bbYiF"><svg viewBox="0 0 20 20" class="sc-fjNYmT ehMXdl"><defs><path d="M18.908 8.14h-9.12v3.843h5.25c-.49 2.441-2.536 3.843-5.25 3.843-3.204 0-5.784-2.623-5.784-5.878 0-3.256 2.58-5.878 5.784-5.878 1.379 0 2.625.497 3.603 1.31l2.848-2.893C14.504.95 12.279 0 9.788 0 4.36 0 0 4.431 0 9.948c0 5.516 4.36 9.948 9.788 9.948 4.893 0 9.342-3.618 9.342-9.948a8.38 8.38 0 00-.222-1.809z" id="google_g_color_svg__google_g_color-a"></path><path d="M18.908 8.14h-9.12v3.843h5.25c-.49 2.441-2.536 3.843-5.25 3.843-3.204 0-5.784-2.623-5.784-5.878 0-3.256 2.58-5.878 5.784-5.878 1.379 0 2.625.497 3.603 1.31l2.848-2.893C14.504.95 12.279 0 9.788 0 4.36 0 0 4.431 0 9.948c0 5.516 4.36 9.948 9.788 9.948 4.893 0 9.342-3.618 9.342-9.948a8.38 8.38 0 00-.222-1.809z" id="google_g_color_svg__google_g_color-c"></path><path d="M18.908 8.14h-9.12v3.843h5.25c-.49 2.441-2.536 3.843-5.25 3.843-3.204 0-5.784-2.623-5.784-5.878 0-3.256 2.58-5.878 5.784-5.878 1.379 0 2.625.497 3.603 1.31l2.848-2.893C14.504.95 12.279 0 9.788 0 4.36 0 0 4.431 0 9.948c0 5.516 4.36 9.948 9.788 9.948 4.893 0 9.342-3.618 9.342-9.948a8.38 8.38 0 00-.222-1.809z" id="google_g_color_svg__google_g_color-e"></path><path d="M18.908 8.14h-9.12v3.843h5.25c-.49 2.441-2.536 3.843-5.25 3.843-3.204 0-5.784-2.623-5.784-5.878 0-3.256 2.58-5.878 5.784-5.878 1.379 0 2.625.497 3.603 1.31l2.848-2.893C14.504.95 12.279 0 9.788 0 4.36 0 0 4.431 0 9.948c0 5.516 4.36 9.948 9.788 9.948 4.893 0 9.342-3.618 9.342-9.948a8.38 8.38 0 00-.222-1.809z" id="google_g_color_svg__google_g_color-g"></path></defs><g fill="none" fill-rule="evenodd"><mask id="google_g_color_svg__google_g_color-b" fill="#fff"><use xlink:href="#google_g_color_svg__google_g_color-a"></use></mask><path fill="#FBBC05" fill-rule="nonzero" mask="url(#google_g_color_svg__google_g_color-b)" d="M-.89 15.826V4.07l7.563 5.878z"></path><mask id="google_g_color_svg__google_g_color-d" fill="#fff"><use xlink:href="#google_g_color_svg__google_g_color-c"></use></mask><path fill="#EA4335" fill-rule="nonzero" mask="url(#google_g_color_svg__google_g_color-d)" d="M-.89 4.07l7.563 5.878L9.788 7.19l10.677-1.764v-6.33H-.89z"></path><mask id="google_g_color_svg__google_g_color-f" fill="#fff"><use xlink:href="#google_g_color_svg__google_g_color-e"></use></mask><path fill="#34A853" fill-rule="nonzero" mask="url(#google_g_color_svg__google_g_color-f)" d="M-.89 15.826l13.347-10.4 3.515.452 4.493-6.782V20.8H-.89z"></path><g><mask id="google_g_color_svg__google_g_color-h" fill="#fff"><use xlink:href="#google_g_color_svg__google_g_color-g"></use></mask><path fill="#4285F4" fill-rule="nonzero" mask="url(#google_g_color_svg__google_g_color-h)" d="M20.465 20.8L6.673 9.948 4.893 8.59l15.573-4.52z"></path></g></g></svg></div><div class="_3_iB2">Log in with Google</div></span></span></button></div><div class="sc-dzVpKk hcCgwA"><p class="sc-ddcOto fLrSSp sc-frDJqD GRGEt" format="dark"><!-- react-text: 615 -->By joining Vimeo, you agree to the <!-- /react-text --><a class="sc-cOoQYZ izlMmh sc-fihHvN fnypYr" href="https://vimeo.com/terms" target="_blank"><span class="sc-ghsgMZ gJmQrL" format="primary">Terms of Service</span></a><!-- react-text: 618 -->, <!-- /react-text --><a class="sc-cOoQYZ izlMmh sc-fihHvN fnypYr" href="https://vimeo.com/privacy" target="_blank"><span class="sc-ghsgMZ gJmQrL" format="primary">Privacy Policy</span></a><!-- react-text: 621 --> and <!-- /react-text --><a class="sc-cOoQYZ izlMmh sc-fihHvN fnypYr" href="https://vimeo.com/cookie_policy" target="_blank"><span class="sc-ghsgMZ gJmQrL" format="primary">Cookie Policy</span></a><!-- react-text: 624 -->.<!-- /react-text --></p></div></div></div></main>
+
+<script>
+    window.can_preload = true;
+
+    </script>
+
+
+<script>
+console.log('%c \n\
+⎜       @@@&       @@@@@@\n\
+⎜    #@@@@@@@    &@@@@@@@@\n\
+⎜  #@@@@@@@@@.  %%&@@@@@@@\n\
+⎜      &@@@@@%     (@@@@@(\n\
+⎜       @@@@@@     @@@@@@\n\
+⎜       %@@@@@(  .@@@@@(\n\
+⎜        @@@@@@(@@@@@@\n\
+⎜        /@@@@@@@@@@%            Like playing with technology?\n\
+⎜         &@@@@@@@%              https://vimeo.com/jobs\n\
+⎜          @@@@@#\n\
+\n\
+', 'color: #00adef;');
+</script>
+            </div>
+
+                                                
+<footer class="footer_v2 footer_v2--responsive">
+                    <section class="footer_v2__sitemap">
+    <div class="footer_v2__logo">
+        <svg alt="Vimeo" width="100" height="40"><path d="M22.448 14.575c-.104 2.17-1.618 5.146-4.544 8.912-3.03 3.942-5.59 5.912-7.686 5.912-1.297 0-2.397-1.204-3.3-3.6-.6-2.2-1.202-4.398-1.794-6.598-.664-2.396-1.38-3.6-2.147-3.6-.166 0-.747.354-1.753 1.05l-1.048-1.35c1.1-.965 2.19-1.93 3.257-2.905 1.463-1.265 2.573-1.94 3.3-2.002 1.732-.166 2.8 1.017 3.205 3.558.435 2.74.736 4.44.902 5.115.498 2.27 1.048 3.402 1.65 3.402.466 0 1.172-.737 2.105-2.21.934-1.473 1.432-2.593 1.504-3.37.133-1.277-.365-1.91-1.506-1.91-.53 0-1.08.125-1.65.364 1.1-3.59 3.186-5.333 6.277-5.23 2.273.073 3.35 1.556 3.227 4.46m13.755 7.034c-.933 1.764-2.22 3.37-3.86 4.803-2.24 1.93-4.47 2.905-6.7 2.905-1.037.002-1.826-.33-2.376-.994-.55-.663-.81-1.535-.777-2.603.03-1.1.372-2.8 1.025-5.104.654-2.303.976-3.537.976-3.703 0-.86-.3-1.297-.902-1.297-.198 0-.77.353-1.702 1.048l-1.152-1.35c1.07-.962 2.137-1.927 3.206-2.902 1.43-1.266 2.5-1.94 3.205-2.002 1.1-.103 1.91.23 2.428.976.518.747.705 1.722.58 2.915-.435 2.034-.902 4.607-1.4 7.73-.03 1.43.488 2.146 1.556 2.146.467 0 1.297-.498 2.5-1.483.996-.82 1.815-1.598 2.45-2.324l.942 1.244m-4.357-17.8c-.03.83-.446 1.628-1.255 2.395-.9.86-1.97 1.296-3.204 1.296-1.9 0-2.822-.83-2.75-2.49.032-.86.54-1.69 1.526-2.49.985-.797 2.074-1.19 3.278-1.19.705 0 1.286.27 1.753.82.467.54.684 1.1.653 1.66m35.612 17.8c-.933 1.763-2.22 3.37-3.86 4.802-2.24 1.93-4.47 2.904-6.7 2.904-2.168.002-3.216-1.202-3.153-3.598.03-1.07.238-2.355.622-3.85.384-1.503.59-2.665.623-3.505.03-1.265-.353-1.898-1.152-1.898-.87 0-1.91 1.036-3.112 3.1-1.276 2.168-1.96 4.274-2.064 6.308-.073 1.43.072 2.54.425 3.298-2.324.064-3.963-.32-4.886-1.15-.83-.737-1.212-1.95-1.15-3.652.03-1.068.198-2.137.488-3.205.29-1.07.457-2.023.488-2.853.062-1.234-.384-1.857-1.35-1.857-.84 0-1.74.955-2.706 2.853-.966 1.9-1.505 3.89-1.61 5.956-.06 1.867.053 3.174.364 3.9-2.293.062-3.92-.415-4.876-1.452-.798-.86-1.16-2.18-1.1-3.942.032-.86.188-2.075.457-3.62.28-1.546.425-2.75.457-3.62.062-.603-.083-.903-.446-.903-.197 0-.768.34-1.702 1.015l-1.203-1.348c.168-.135 1.216-1.1 3.156-2.905 1.4-1.297 2.354-1.97 2.852-2.002.872-.073 1.567.29 2.106 1.08.53.787.8 1.69.8 2.727 0 .332-.032.654-.105.954.497-.766 1.08-1.43 1.752-2 1.537-1.34 3.26-2.086 5.157-2.252 1.64-.135 2.8.25 3.505 1.152.57.736.83 1.784.8 3.153.237-.198.486-.416.746-.654.767-.903 1.514-1.62 2.25-2.148 1.235-.902 2.52-1.4 3.86-1.504 1.597-.135 2.75.25 3.454 1.152.602.726.87 1.774.8 3.143-.032.933-.26 2.28-.675 4.065-.416 1.773-.624 2.8-.624 3.07-.03.695.03 1.182.197 1.442.166.27.57.394 1.203.394.467 0 1.297-.497 2.5-1.482.996-.82 1.816-1.598 2.45-2.324l.963 1.254m18.765-.052c-.965 1.598-2.874 3.195-5.706 4.793-3.538 2.032-7.127 3.05-10.758 3.05-2.706 0-4.636-.904-5.808-2.7-.83-1.233-1.234-2.696-1.203-4.407.03-2.698 1.234-5.27 3.6-7.71 2.603-2.665 5.674-4.003 9.21-4.003 3.27 0 5 1.328 5.208 3.994.135 1.702-.798 3.445-2.8 5.24-2.137 1.96-4.824 3.215-8.06 3.744.6.83 1.504 1.245 2.707 1.245 2.396 0 5.02-.613 7.863-1.837 2.033-.86 3.63-1.753 4.803-2.676l.945 1.265m-11.36-5.228c.032-.892-.33-1.35-1.1-1.35-.994 0-2.01.686-3.048 2.066-1.038 1.38-1.567 2.697-1.598 3.962-.02 0-.02.218 0 .643 1.63-.6 3.05-1.514 4.242-2.738.966-1.058 1.463-1.92 1.505-2.583m24.946 1.868c-.135 3.072-1.265 5.717-3.402 7.947-2.135 2.23-4.79 3.35-7.955 3.35-2.635 0-4.637-.85-6.006-2.55-.997-1.267-1.557-2.854-1.65-4.752-.166-2.863.86-5.498 3.1-7.894 2.408-2.665 5.427-3.993 9.057-3.993 2.334 0 4.098.788 5.3 2.344 1.132 1.443 1.65 3.29 1.557 5.55m-5.664-.185c.03-.903-.094-1.733-.374-2.48-.28-.747-.695-1.13-1.224-1.13-1.702 0-3.102.923-4.202 2.76-.933 1.503-1.43 3.11-1.504 4.812-.03.84.114 1.577.446 2.21.364.736.882 1.1 1.556 1.1 1.505 0 2.79-.883 3.86-2.656.892-1.472 1.38-3.008 1.44-4.615h.002z" fill="#112233"></path></svg>
+    </div>
+    <div class="footer_v2__links">
+        <section class="footer_v2__link footer_v2_accordion">
+            <input class="footer_v2_accordion__check" type="checkbox">
+            <h4 class="footer_v2__link-header">
+                <span class="footer_v2__link-header-text">Use cases</span>
+                <div class="footer_v2_accordion__reveal">
+                    <svg class="iris_ic is--12" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8"><path d="M7.707 2.293c-.39-.39-1.024-.39-1.414 0L4 4.586 1.707 2.293c-.39-.39-1.024-.39-1.414 0-.39.39-.39 1.024 0 1.414l3 3c.39.39 1.024.39 1.414 0l3-3c.39-.39.39-1.024 0-1.414z"></path></svg>
+                </div>
+            </h4>
+            <ul class="footer_v2__link-list footer_v2_accordion__menu">
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/enteprise" data-gtm-click="" data-fatal-attraction="container:footer|component:use_cases|keyword:enterprise">
+                            Enterprise                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/solutions/small-business-solutions" data-gtm-click="" data-fatal-attraction="container:footer|component:use_cases|keyword:small_business">
+                            Small business                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/solutions/creative-professionals-solutions" data-gtm-click="" data-fatal-attraction="container:footer|component:use_cases|keyword:creative_professionals">
+                            Creative professionals                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/solutions/fitness-solutions" data-gtm-click="" data-fatal-attraction="container:footer|component:use_cases|keyword:fitness">
+                            Fitness                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/solutions/faith-solutions" data-gtm-click="" data-fatal-attraction="container:footer|component:use_cases|keyword:faith">
+                            Faith                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/solutions/education-solutions" data-gtm-click="" data-fatal-attraction="container:footer|component:use_cases|keyword:education">
+                            Education                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/create/ecommerce" data-gtm-click="" data-fatal-attraction="container:footer|component:use_cases|keyword:ecommerce">
+                            Ecommerce                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/create/real-estate" data-gtm-click="" data-fatal-attraction="container:footer|component:use_cases|keyword:real_estate">
+                            Real estate                        </a>
+                    </li>
+                            </ul>
+        </section>
+        <section class="footer_v2__link footer_v2_accordion">
+            <input class="footer_v2_accordion__check" type="checkbox">
+            <h4 class="footer_v2__link-header">
+                <span class="footer_v2__link-header-text">Product</span>
+                <div class="footer_v2_accordion__reveal">
+                    <svg class="iris_ic is--12" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8"><path d="M7.707 2.293c-.39-.39-1.024-.39-1.414 0L4 4.586 1.707 2.293c-.39-.39-1.024-.39-1.414 0-.39.39-.39 1.024 0 1.414l3 3c.39.39 1.024.39 1.414 0l3-3c.39-.39.39-1.024 0-1.414z"></path></svg>
+                </div>
+            </h4>
+            <ul class="footer_v2__link-list footer_v2_accordion__menu">
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/features/interactive-video" data-gtm-click="" data-fatal-attraction="container:footer|component:features|keyword:interactive_video">
+                            Interactive Video                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/video-editor" data-gtm-click="" data-fatal-attraction="container:footer|component:video_editor|keyword:video_editor">
+                            Online Video Editor                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/features/auto-caption" data-gtm-click="footer_link_auto_caption" data-fatal-attraction="container:footer|component:features|keyword:auto_cc">
+                            Auto Captioning                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/features/webinar" data-gtm-click="footer_link_webinar" data-fatal-attraction="container:footer|component:features|keyword:webinar">
+                            Webinar Software                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/features/virtual-events" data-gtm-click="footer_link_virtual_events" data-fatal-attraction="container:footer|component:features|keyword:live_events">
+                            Virtual Events                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/features/video-player" data-gtm-click="footer_link_video_player" data-fatal-attraction="container:footer|component:features|keyword:video_player">
+                            Video Player                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/features/video-library" data-gtm-click="footer_link_video_library" data-fatal-attraction="container:footer|component:features|keyword:video_library">
+                            Video Library                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/create" data-gtm-click="footer_link_creation" data-fatal-attraction="container:footer|component:solutions|keyword:create">
+                            Create Video Maker                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/features/livestreaming" data-gtm-click="footer_link_live_streaming" data-fatal-attraction="container:footer|component:features|keyword:live_streaming">
+                            Live Streaming                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/features/screen-recorder" data-gtm-click="footer_link_screen_recorder" data-fatal-attraction="container:footer|component:features|keyword:screen_recorder">
+                            Screen Recorder                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/features/video-privacy" data-gtm-click="footer_link_privacy" data-fatal-attraction="container:footer|component:features|keyword:privacy">
+                            Video Privacy                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/features/video-collaboration" data-gtm-click="footer_link_collaboration" data-fatal-attraction="container:footer|component:features|keyword:collaboration">
+                            Video Collaboration                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/features/video-marketing" data-gtm-click="footer_link_distribution" data-fatal-attraction="container:footer|component:features|keyword:distribution">
+                            Video Marketing                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/ott?mkc=entprsb" data-gtm-click="footer_link_monetization" data-fatal-attraction="container:footer|component:features|keyword:monetization">
+                            Monetization                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/features/video-analytics" data-gtm-click="footer_link_analytics" data-fatal-attraction="container:footer|component:features|keyword:analytics">
+                            Video Analytics                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/features/online-video-hosting" data-gtm-click="footer_link_hosting" data-fatal-attraction="container:footer|component:features|keyword:hosting">
+                            Video Hosting                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/for-hire" data-gtm-click="footer_link_for_hire" data-fatal-attraction="container:footer|component:solutions|keyword:for_hire">
+                            Hire Video Pros                        </a>
+                    </li>
+                            </ul>
+        </section>
+
+        <section class="footer_v2__link footer_v2_accordion">
+            <input class="footer_v2_accordion__check" type="checkbox">
+            <h4 class="footer_v2__link-header">
+                <span class="footer_v2__link-header-text">Resources</span>
+                <div class="footer_v2_accordion__reveal">
+                    <svg class="iris_ic is--12" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8"><path d="M7.707 2.293c-.39-.39-1.024-.39-1.414 0L4 4.586 1.707 2.293c-.39-.39-1.024-.39-1.414 0-.39.39-.39 1.024 0 1.414l3 3c.39.39 1.024.39 1.414 0l3-3c.39-.39.39-1.024 0-1.414z"></path></svg>
+                </div>
+            </h4>
+            <ul class="footer_v2__link-list footer_v2_accordion__menu">
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.zendesk.com/hc/" data-gtm-click="footer_link_help_center_click" data-fatal-attraction="container:footer|component:resources|keyword:help_center">
+                            Help Center                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/blog/" data-gtm-click="footer_link_vimeo_blog_click" data-fatal-attraction="container:footer|component:resources|keyword:vimeo_blog">
+                            Blog                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/customers/enterprise" data-gtm-click="footer_link_our_customers_click" data-fatal-attraction="container:footer|component:resources|keyword:customer_logos">
+                            Our Customers                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/blog/category/video-school/" data-gtm-click="footer_link_video_school_click" data-fatal-attraction="container:footer|component:resources|keyword:video_school">
+                            Video School                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/ott/resources" data-gtm-click="footer_link_ott_resources" data-fatal-attraction="container:footer|component:resources|keyword:ott_resources">
+                            OTT Resources                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://developer.vimeo.com/" data-gtm-click="footer_link_developers_click" data-fatal-attraction="container:footer|component:resources|keyword:developers">
+                            Developers                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/students" data-gtm-click="footer_link_students" data-fatal-attraction="container:footer|component:resources|keyword:students">
+                            Students                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/partners" data-gtm-click="footer_link_partner" data-fatal-attraction="container:footer|component:resources|keyword:partner">
+                            Become a Partner                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/experts" data-gtm-click="footer_link_vimeo_experts" data-fatal-attraction="container:footer|component:resources|keyword:vimeo_experts">
+                            Join Vimeo Experts                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/help/guidelines" data-gtm-click="footer_link_vimeo_guidelines_click" data-fatal-attraction="container:footer|component:resources|keyword:vimeo_guidelines">
+                            Guidelines                        </a>
+                    </li>
+                            </ul>
+        </section>
+
+        <section class="footer_v2__link footer_v2_accordion">
+            <input class="footer_v2_accordion__check" type="checkbox">
+            <h4 class="footer_v2__link-header">
+                <span class="footer_v2__link-header-text">Apps</span>
+                <div class="footer_v2_accordion__reveal">
+                    <svg class="iris_ic is--12" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8"><path d="M7.707 2.293c-.39-.39-1.024-.39-1.414 0L4 4.586 1.707 2.293c-.39-.39-1.024-.39-1.414 0-.39.39-.39 1.024 0 1.414l3 3c.39.39 1.024.39 1.414 0l3-3c.39-.39.39-1.024 0-1.414z"></path></svg>
+                </div>
+            </h4>
+            <ul class="footer_v2__link-list footer_v2_accordion__menu">
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://apps.apple.com/app/apple-store/id1356686763?pt=417731&amp;ct=lohp&amp;mt=8" data-fatal-attraction="container:footer|component:apps|keyword:macos">
+                            Vimeo for macOS                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://itunes.apple.com/app/vimeo/id425194759?mt=8" data-fatal-attraction="container:footer|component:apps|keyword:ios">
+                            Vimeo for iOS                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://play.google.com/store/apps/details?id=com.vimeo.android.videoapp&amp;referrer=utm_source%3Dfooter%26utm_medium%3Dlohp" data-fatal-attraction="container:footer|component:apps|keyword:android">
+                            Vimeo for Android                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://apps.apple.com/us/app/vimeo-create/id1491791513" data-fatal-attraction="container:footer|component:apps|keyword:create_ios">
+                            Vimeo Create for iOS                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://play.google.com/store/apps/details?id=com.vimeocreate.videoeditor.moviemaker&amp;referrer=utm_source%3Dfooter%26utm_medium%3Dlohp" data-fatal-attraction="container:footer|component:apps|keyword:create_android">
+                            Vimeo Create for Android                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://www.magisto.com/" data-fatal-attraction="container:footer|component:apps|keyword:magisto">
+                            Magisto                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://apps.shopify.com/vimeo_product_video_maker" data-fatal-attraction="container:footer|component:apps|keyword:vimeo_shopify">
+                            Vimeo for Shopify                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/integrations/zoom" data-fatal-attraction="container:footer|component:apps|keyword:vimeo_for_zoom">
+                            Vimeo for Zoom                        </a>
+                    </li>
+                            </ul>
+        </section>
+
+        <section class="footer_v2__link footer_v2_accordion">
+            <input class="footer_v2_accordion__check" type="checkbox">
+            <h4 class="footer_v2__link-header">
+                <span class="footer_v2__link-header-text">Vimeo</span>
+                <div class="footer_v2_accordion__reveal">
+                    <svg class="iris_ic is--12" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8"><path d="M7.707 2.293c-.39-.39-1.024-.39-1.414 0L4 4.586 1.707 2.293c-.39-.39-1.024-.39-1.414 0-.39.39-.39 1.024 0 1.414l3 3c.39.39 1.024.39 1.414 0l3-3c.39-.39.39-1.024 0-1.414z"></path></svg>
+                </div>
+            </h4>
+            <ul class="footer_v2__link-list footer_v2_accordion__menu">
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/upgrade" data-gtm-click="footer_link_pricing" data-fatal-attraction="container:footer|component:vimeo|keyword:pricing">
+                        Pricing                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/upload" data-gtm-click="footer_link_upload_click" data-fatal-attraction="container:footer|component:vimeo|keyword:upload">
+                        Upload                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/channels/staffpicks" data-gtm-click="footer_link_staff_picks" data-fatal-attraction="container:footer|component:vimeo|keyword:staff_picks">
+                        Staff Picks                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/ondemand" data-gtm-click="footer_link_on_demand_click" data-fatal-attraction="container:footer|component:vimeo|keyword:on_demand">
+                        On Demand                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/ott" data-gtm-click="footer_link_vimeo_ott" data-fatal-attraction="container:footer|component:vimeo|keyword:ott">
+                        Vimeo OTT                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/site_map" data-gtm-click="footer_link_site_map_click" data-fatal-attraction="container:footer|component:vimeo|keyword:site_map">
+                        Site map                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/about" data-gtm-click="footer_link_about_click" data-fatal-attraction="container:footer|component:vimeo|keyword:about_vimeo">
+                        About                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://investors.vimeo.com/" data-gtm-click="footer_link_investor_relations" data-fatal-attraction="container:footer|component:vimeo|keyword:investor_relations">
+                        Investor Relations                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://press.vimeo.com/" data-gtm-click="footer_link_press" data-fatal-attraction="container:footer|component:vimeo|keyword:press">
+                        Press                        </a>
+                    </li>
+                                    <li class="footer_v2__link-item">
+                        <a class="iris_link iris_link--gray-0 iris_link--footer" href="https://vimeo.com/careers" data-gtm-click="footer_link_jobs" data-fatal-attraction="container:footer|component:vimeo|keyword:jobs">
+                        Jobs                        </a>
+                    </li>
+                            </ul>
+        </section>
+    </div>
+</section>
+<script>
+    const footerAccordion = document.getElementsByClassName('footer_v2_accordion__check');
+
+    if (footerAccordion) {
+        window.onunload = function() {
+            for (let i = 0; i < footerAccordion.length; i++) {
+                if (footerAccordion[i].type === 'checkbox') {
+                    footerAccordion[i].checked = false;
+                };
+            };
+        };
+    };
+</script>
+    
+        <section class="footer_v2__auxiliary ">
+
+    <div class="footer_v2__legal">
+        <div class="footer_v2__auxiliary-content">
+            <p>© 2023 Vimeo.com, Inc. All rights reserved.</p>
+        </div>
+        <ul class="footer_v2__legal-list">
+            <li class="footer_v2__legal-list-item">
+                <a class="iris_link iris_link--opaque" href="https://vimeo.com/terms" title="Terms &amp; Conditions">
+                    Terms                </a>
+            </li>
+            <li class="footer_v2__legal-list-item">
+                <a class="iris_link iris_link--opaque" href="https://vimeo.com/privacy" title="Privacy Policy">
+                    Privacy                </a>
+            </li>
+            <li id="do-not-sell-item" class="footer_v2__legal-list-item hidden">
+                <a id="do-not-sell" class="iris_link iris_link--opaque" title="Do Not Sell My Personal Information" data-fatal-attraction="container:footer|component:footer|keyword:do_not_sell_my_personal_information|target:transcend_dialogue_box">
+                    Do Not Sell My Personal Information                </a>
+            </li>
+            <li class="footer_v2__legal-list-item">
+                <a class="iris_link iris_link--opaque" href="https://vimeo.com/privacy/california-privacy" title="CA Privacy">
+                    CA Privacy                </a>
+            </li>
+                        <li class="footer_v2__legal-list-item">
+                <a class="iris_link iris_link--opaque" href="https://vimeo.com/dmca" title="Copyright Information">
+                    Copyright                </a>
+            </li>
+            <li class="footer_v2__legal-list-item">
+                <a class="iris_link iris_link--opaque" href="https://vimeo.com/cookie_policy" title="Learn more about how Vimeo uses cookies">
+                    Cookies                </a>
+            </li>
+        </ul>
+    </div>
+
+    <div class="footer_v2__filters footer_v2__auxiliary-content">
+        <span class="language">
+            Language:
+            <a class="iris_link iris_link--opaque" href="https://vimeo.com/786646692#language" onclick="vimeo.Modal.create({content: &#39;/settings/locale&#39;, size: &#39;small&#39;}); return false;" title="Choose a different language">English</a>
+        </span>
+
+                    <span class="footer_v2__filter">Mature content filter: </span><a class="iris_link iris_link--opaque footer_v2__filters__lang contentfilter js-footer_contentfilter_link" href="javascript:void(0)" onclick="vimeo.Modal.create({content: &#39;/settings/contentrating&#39;})" title="Change your mature content filter">None</a>
+            </div>
+
+</section>
+<!-- Do not sell link button for California users -->
+
+</footer>
+                                    </div>
+
+        
+        
+        
+            <script type="application/ld+json">
+        [{"url":"https://vimeo.com/786646692","thumbnailUrl":"https://i.vimeocdn.com/filter/overlay?src0=https%3A%2F%2Fi.vimeocdn.com%2Fvideo%2F1582157011-37115b15c717a168bf86e2f2855b6bbc23b1cbcee54ff99c8d7b808b459365d6-d_1280x720&src1=https%3A%2F%2Ff.vimeocdn.com%2Fimages_v6%2Fshare%2Fplay_icon_overlay.png","embedUrl":"https://player.vimeo.com/video/786646692?h=f2ca1d6121","name":"Dear Rich","description":"Accomplished endurance athlete, author and podcaster, Rich Roll has been a voice we have become familiar with over the years. In DEAR RICH, we hear the story behind&hellip;","height":1080,"width":1920,"playerType":"HTML5 Flash","videoQuality":"HD","uploadDate":"2023-01-05T12:01:55-05:00","dateModified":"2023-04-03T19:03:47-04:00","thumbnail":{"@type":"ImageObject","url":"https://i.vimeocdn.com/filter/overlay?src0=https%3A%2F%2Fi.vimeocdn.com%2Fvideo%2F1582157011-37115b15c717a168bf86e2f2855b6bbc23b1cbcee54ff99c8d7b808b459365d6-d_1280x720&src1=https%3A%2F%2Ff.vimeocdn.com%2Fimages_v6%2Fshare%2Fplay_icon_overlay.png","width":1280,"height":720},"author":{"@type":"Person","name":"Stept Studios","url":"https://vimeo.com/steptstudios"},"potentialAction":{"@type":"ViewAction","target":"vimeo://app.vimeo.com/videos/786646692"},"duration":"PT00H14M43S","interactionStatistic":[{"@type":"InteractionCounter","interactionType":"http://schema.org/CommentAction","userInteractionCount":61},{"@type":"InteractionCounter","interactionType":"http://schema.org/LikeAction","userInteractionCount":866},{"@type":"InteractionCounter","interactionType":"http://schema.org/WatchAction","userInteractionCount":73999}],"@type":"VideoObject","@context":"http://schema.org"},{"itemListElement":[{"@type":"ListItem","position":1,"item":{"@id":"https://vimeo.com/steptstudios","name":"Stept Studios"}},{"@type":"ListItem","position":2,"item":{"@id":"https://vimeo.com/steptstudios/videos","name":"Videos"}}],"@type":"BreadcrumbList","@context":"http://schema.org"}]    </script>
+
+<script>
+    var __fa = __fa || [];
+    /**
+     * Because single page applications such as the app shell will be tracking
+     * Fatal Attraction page views on React lifecycle hooks (componentDidMount)
+     * we want to avoid dispatching the pageview event from the PHP template
+     * and defer this sort of tracking logic to the front end.
+     *
+     * This check allows us to declare in a controller whether or not we
+     * want to dispatch that preliminary pageview.
+     *
+     * The property is additive only, as to not affect existing pageviews.
+     */
+            __fa.push(['trackPageview']);
+    
+    /**
+     * Add server side ABLincoln experiments to GTM data layer.
+     */
+    
+        var _extend = function(){for(var r=arguments[0],n=1,e=arguments.length;e>n;n++){var t=arguments[n];for(var a in t)t.hasOwnProperty(a)&&(r[a]=t[a])}return r};
+
+        var CSS_DIR = 'https://f.vimeocdn.com/styles/css_opt/',
+        JS_DIR = 'https://f.vimeocdn.com/js_opt/',
+        IMAGE_DIR = 'https://f.vimeocdn.com/images_v6/',
+        FONT_DIR = 'https://f.vimeocdn.com/fonts/',
+        SVG_DIR = 'https://f.vimeocdn.com/svg/',
+                BUILD_HASH = '30b53';
+
+    
+        var vimeo = _extend((window.vimeo || {}), {"app_version":"v6","domain":"vimeo.com","url":"vimeo.com","cur_user":false,"origin_user_id":null,"origin_user":false,"is_mobile":false,"is_record_tool_supported":true});
+    vimeo.config = _extend((vimeo.config || {}), {"sticky_topnav":{"excluded_pages":["Vimeo\\Controller\\AboutController:main","Vimeo\\Controller\\AboutController:professionals","Vimeo\\Controller\\HomeController:upgrade","Vimeo\\Controller\\StoreController:main","Vimeo\\Controller\\User\\Settings2Controller:main","Vimeo\\Controller\\User\\Settings2Controller:team_members","Vimeo\\Controller\\User\\Settings2Controller:password","Vimeo\\Controller\\ProfileController:main","Vimeo\\Controller\\ClipStatsController:main","Vimeo\\Controller\\Clip\\Settings\\EmbedController:embed","Vimeo\\Controller\\VideoManagerController","Vimeo\\Controller\\VideoReviewController","Vimeo\\Controller\\MessagesController","Vimeo\\Controller\\StatsController","Vimeo\\Controller\\UploadController","Vimeo\\Controller\\OnDemand\\SettingsController","Vimeo\\Controller\\Clip\\SettingsController"],"sticky_included_pages":["Vimeo\\Controller\\Stock\\StockHomePageController","Vimeo\\Controller\\Stock\\StockFootageController","Vimeo\\Controller\\Stock\\StockSearchController","Vimeo\\Controller\\Stock\\StockCollectionsController","Vimeo\\Controller\\AlbumController"],"topnav_wrap_selector":"#topnav_outer_wrap","content_wrap_selector":".wrap_content"},"locale":"en","omnisearch_jwt":"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2ODA1NjQwMDAsInVzZXJfaWQiOm51bGwsImFwcF9pZCI6NTg0NzksInNjb3BlcyI6InB1YmxpYyBwcml2YXRlIGRlbGV0ZSIsInRlYW1fdXNlcl9pZCI6bnVsbH0.vr0wTkR9AOszioo4ltGtA_HAqu6Tihzq_eqyexV6m4k","omnisearch_user":null,"api_url":"api.vimeo.com","has_video_library_search":false,"magisto_api_host":"vimeo.magisto.com","has_public_search_disabled":false,"has_no_vls_on_enter":false,"has_auto_closed_captions":false,"has_ocr_search":false});
+
+        var __i18nLocale = 'en';
+    var localeConfig = {
+        lang: 'en',
+        'Date': {
+            months: ["January","February","March","April","May","June","July","August","September","October","November","December"],
+            months_abbr: ["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],
+            days: ["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],
+            days_abbr: ["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],
+
+            // Culture's date order: MM/DD/YYYY
+            dateOrder: ['date', 'month', 'year'],
+            shortDate: '%d/%m/%Y',
+            shortTime: '%I:%M%p',
+            AM: 'AM',
+            PM: 'PM',
+            firstDayOfWeek: 0,
+
+            // Date.Extras
+            ordinal: function(dayOfMonth){
+                return dayOfMonth;
+            }
+        },
+        'DatePicker': {
+            select_a_time: "Select a time",
+            use_mouse_wheel: "Use the mouse wheel to quickly change value",
+            time_confirm_button: "OK",
+            apply_range: "Apply",
+            cancel: "Cancel",
+            week: "Wk"        },
+                'Number': {
+            decimal: '.',
+            group: ',',
+            currency: {
+                prefix: '$'
+            }
+        },
+        'FormValidator': {"required":"This field is required.","requiredChk":"This field is required."}    };
+
+    var fullLocale = '';
+
+    
+        var Copy = {translate:function(t,i,u){var e='object'!=typeof this.dict[t]?this.dict[t]:i?this.dict[t].plural:this.dict[t].singular;return'object'==typeof u&&(e=this.substitute(e,u)),e},substitute:function(t,i){return void 0!==t.substitute?t.substitute(i):t.replace(/\\?\{([^{}]+)\}/g,function(t,u){return'\\'==t.charAt(0)?t.slice(1):null!=i[u]?i[u]:''})},dict:{}};
+    Copy.dict = {"did_you_mean_email":"Did you mean <em>{SUGGEST}<\/em>?","email_password_mismatch":"Email and password do not match","oops_try_again":"Oops! Something went wrong. Please try again.","just_now":"just now","seconds_ago":{"singular":"{COUNT} second ago","plural":"{COUNT} seconds ago"},"minutes_ago":{"singular":"{COUNT} minute ago","plural":"{COUNT} minutes ago"},"hours_ago":{"singular":"{COUNT} hour ago","plural":"{COUNT} hours ago"},"open_comment_box":"Add new comment instead &raquo;","url_unavailable":"Sorry, this url is unavailable.","unsaved_changes_generic":"You have unsaved changes, are you sure you wish to leave?","add":"Add","remove":"Remove","select":"Select","no_followers_for_letter":"You don&rsquo;t follow anyone that begin with the letter &ldquo;{PAGE_LETTER}&rdquo;","share_limit_reached":"You have reached the maximum number of users to share with.","at_least_one":"There must be at least one user.","available":"Available","unavailable":"Unavailable","browse_error_generic":"Sorry, there was an error","browse_error_no_videos":"Sorry, no videos found","follow":"Follow","following":"Following","unfollow":"Unfollow","unfollowing":"Unfollowing","count_comments":{"singular":"{COUNT} comment","plural":"{COUNT} comments"},"first_comment":"Be the first to comment\u2026","no_comments_for_you":"Forbidden. You cannot post comments on this page.","oops":"Oops!","player_try_again":"That wasn't supposed to happen. Please try again in a few minutes.","duration_input_min_duration":"The duration cannot be less than {MIN_DURATION}.","duration_input_max_duration":"The duration cannot be greater than {MAX_DURATION}.","duration_input_invalid_characters":"0-9 and : are the only acceptable inputs.","close":"Close","expand":"Expand","loading":"Loading...","top":"top","advanced_search":"Advanced Search","no_suggestions":"No suggestions","recent_searches":"Recent Searches","search_all":"Search All of Vimeo","email_and_password":"Please enter your email and password","email_address":"Please enter a valid email address","name_email_and_password":"Please enter your name, email, and password","enter_valid_otp":"Please enter a valid code"};
+</script>
+
+    <script src="./Dear Rich on Vimeo_files/player_manager_7e67bd1504ed8db10b4496eeaf38dbf0.min.js" data-airgap-id="1"></script>
+    <script>
+        if (typeof playerAssetUrls !== 'undefined') {
+                            PlayerManager.run(playerAssetUrls);
+                    }
+    </script>
+
+    <script src="./Dear Rich on Vimeo_files/sticky_topnav_combined_901230d0a385db35fd5052fcb9922934.min.js" data-airgap-id="2"></script>
+    <script src="./Dear Rich on Vimeo_files/react_prod_combined_ccb7d5c4cff728ceadb9996f385b2d09.min.js" data-airgap-id="3"></script>
+    <script src="./Dear Rich on Vimeo_files/clip_combined_a909bcd0e2771b92ac6c3c6785994346.min.js" data-airgap-id="4"></script>
+    <script src="./Dear Rich on Vimeo_files/topnav_cart_button_9ac00361c1c33a234a16ae01cffc0b20.min.js" data-airgap-id="5"></script>
+    <script src="./Dear Rich on Vimeo_files/clip.583af6febf29959ea932.bundle.min.js" data-airgap-id="6"></script><script src="./Dear Rich on Vimeo_files/barebone.js" data-airgap-id="30"></script><script src="./Dear Rich on Vimeo_files/client" async="" defer="" data-airgap-id="31"></script>
+    <script src="./Dear Rich on Vimeo_files/topnav_desktop.c5cae80a198f03a7d764.bundle.min.js" data-airgap-id="25"></script>
+    <script src="./Dear Rich on Vimeo_files/bp_tracking.b193d262d7aff962e19c.bundle.min.js" data-airgap-id="26"></script>
+    <script src="./Dear Rich on Vimeo_files/do_not_sell_4ea61859c1cd1de7767778c8014d1f73.min.js" data-airgap-id="27"></script>
+
+    <script async="" src="./Dear Rich on Vimeo_files/clip_beta_libs_async_combined_1f3341b772642e282bc9c0e3f342ad6f.min.js" data-airgap-id="28"></script>
+    <script async="" src="./Dear Rich on Vimeo_files/create_facebook_header.d2acaa7a16f67aa2bc3d.bundle.min.js" data-airgap-id="29"></script>
+    <script>
+        function onVimeoDomReady(e) {
+            
+                                                if (!vimeo.bypass_player_responsive_delegates) {
+                        vimeo.player_responsive_delegates = vimeo.player_responsive_delegates || {};
+                        vimeo.player_responsive_delegates.willOpenShareOverlay = vimeo.player_responsive_delegates.willOpenShareOverlay || function(id) {
+                                PlayerManager.pauseAllPlayers();
+                                vimeo.share.Popup(id);
+                                return false;
+                            };
+
+                        vimeo.player_responsive_delegates.willOpenLoginForm = vimeo.player_responsive_delegates.willOpenLoginForm || function(id, context) {
+                            if (typeof vimeo.Modal !== 'undefined') {
+                                PlayerManager.pauseAllPlayers();
+
+                                if (context) {
+                                    vimeo.Session.create({ player: 1, clip_id: id, context: context });
+                                }
+                                else {
+                                    vimeo.Session.create();
+                                }
+
+                                return false;
+                            }
+                        };
+
+                        if (PlayerManager) {
+                            PlayerManager.setDefaultDelegate(vimeo.player_responsive_delegates);
+                        }
+                    }
+                
+                if (PlayerManager) {
+                    PlayerManager.dispatchReadySignals();
+                }
+            
+                    }
+
+                    $(document).ready(onVimeoDomReady);
+            </script>
+
+    
+
+<iframe src="./Dear Rich on Vimeo_files/proxy.html" title="Vimeo LocalStorage Proxy" aria-hidden="true" hidden=""></iframe><div id="onetrust-consent-sdk"><div class="onetrust-pc-dark-filter ot-hide ot-fade-in"></div><div id="onetrust-pc-sdk" class="otPcCenter ot-hide ot-fade-in" aria-modal="true" role="alertdialog" lang="en" aria-label="Privacy Preference Center"><!-- Close Button --><div class="ot-pc-header"><!-- Logo Tag --><div class="ot-pc-logo" role="img" aria-label="Company Logo" style="background-image: url(&quot;https://cdn.cookielaw.org/logos/static/ot_logo.png&quot;);
+                    background-position: left;"></div><button id="close-pc-btn-handler" class="ot-close-icon" aria-label="Close"></button></div><!-- Close Button --><div id="ot-pc-content" class="ot-pc-scrollbar"><h2 id="ot-pc-title">Privacy Preference Center</h2><div id="ot-pc-desc">When you visit any website, it may store or retrieve information on your browser, mostly in the form of cookies. This information might be about you, your preferences or your device and is mostly used to make the site work as you expect it to. The information does not usually directly identify you, but it can give you a more personalized web experience. Because we respect your right to privacy, you can choose not to allow some types of cookies. Click on the different category headings to find out more and change our default settings. However, blocking some types of cookies may impact your experience of the site and the services we are able to offer.
+                <br><a href="https://cookiepedia.co.uk/giving-consent-to-cookies" class="privacy-notice-link" rel="noopener" target="_blank" aria-label="More information about your privacy, opens in a new tab">More information</a></div><button id="accept-recommended-btn-handler">Allow All</button><section class="ot-sdk-row ot-cat-grp"><h3 id="ot-category-title"> Manage Consent Preferences</h3><div class="ot-accordion-layout ot-cat-item" data-optanongroupid="C0001"><button aria-expanded="false" ot-accordion="true" aria-controls="ot-desc-id-C0001" aria-labelledby="ot-header-id-C0001"></button><!-- Accordion header --><div class="ot-acc-hdr ot-always-active-group"><div class="ot-plus-minus"><span></span><span></span></div><h4 class="ot-cat-header" id="ot-header-id-C0001">Strictly Necessary Cookies</h4><div class="ot-always-active">Always Active</div></div><!-- accordion detail --><div class="ot-acc-grpcntr ot-acc-txt"><p class="ot-acc-grpdesc ot-category-desc" id="ot-desc-id-C0001">These cookies are necessary for the website to function and cannot be disabled. You may be able to configure your Internet browser to block strictly necessary cookies. However, if you block cookies in this category, which do not collect or store any personal information, this could affect some parts of the website and cause it to function incorrectly.
+</p></div></div><div class="ot-accordion-layout ot-cat-item" data-optanongroupid="C0002"><button aria-expanded="false" ot-accordion="true" aria-controls="ot-desc-id-C0002" aria-labelledby="ot-header-id-C0002"></button><!-- Accordion header --><div class="ot-acc-hdr ot-always-active-group"><div class="ot-plus-minus"><span></span><span></span></div><h4 class="ot-cat-header" id="ot-header-id-C0002">Performance Cookies</h4><div class="ot-always-active">Always Active</div></div><!-- accordion detail --><div class="ot-acc-grpcntr ot-acc-txt"><p class="ot-acc-grpdesc ot-category-desc" id="ot-desc-id-C0002">These cookies allow us to count visits, identify traffic sources and understand how our services are used to measure and improve performance. If you do not allow these cookies, we will not know when you visited our site and we will not be able to monitor its performance.</p></div></div><div class="ot-accordion-layout ot-cat-item" data-optanongroupid="C0003"><button aria-expanded="false" ot-accordion="true" aria-controls="ot-desc-id-C0003" aria-labelledby="ot-header-id-C0003"></button><!-- Accordion header --><div class="ot-acc-hdr ot-always-active-group"><div class="ot-plus-minus"><span></span><span></span></div><h4 class="ot-cat-header" id="ot-header-id-C0003">Functional Cookies</h4><div class="ot-always-active">Always Active</div></div><!-- accordion detail --><div class="ot-acc-grpcntr ot-acc-txt"><p class="ot-acc-grpdesc ot-category-desc" id="ot-desc-id-C0003">These cookies improve functionality and personalization. They may be set by us or by other third-party providers whose services we add to our pages. If you do not allow these cookies, some or all of these additional functions may not work properly.</p></div></div><div class="ot-accordion-layout ot-cat-item" data-optanongroupid="C0004"><button aria-expanded="false" ot-accordion="true" aria-controls="ot-desc-id-C0004" aria-labelledby="ot-header-id-C0004"></button><!-- Accordion header --><div class="ot-acc-hdr ot-always-active-group"><div class="ot-plus-minus"><span></span><span></span></div><h4 class="ot-cat-header" id="ot-header-id-C0004">Targeting Cookies</h4><div class="ot-always-active">Always Active</div></div><!-- accordion detail --><div class="ot-acc-grpcntr ot-acc-txt"><p class="ot-acc-grpdesc ot-category-desc" id="ot-desc-id-C0004">Our advertising partners may set these cookies on our site. They can be used to show you our ads on third-party sites, measure the effectiveness of those ads, or prevent ads from being shown to you. They do not store personal information directly, but rather uniquely identify your browser and device. If you do not allow these cookies, you will not receive targeted advertising.</p></div></div><!-- Groups sections starts --><!-- Group section ends --><!-- Accordion Group section starts --><!-- Accordion Group section ends --></section></div><section id="ot-pc-lst" class="ot-hide ot-hosts-ui ot-pc-scrollbar"><div id="ot-pc-hdr"><div id="ot-lst-title"><button class="ot-link-btn back-btn-handler" aria-label="Back"><svg id="ot-back-arw" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 444.531 444.531" xml:space="preserve"><title>Back Button</title><g><path fill="#656565" d="M213.13,222.409L351.88,83.653c7.05-7.043,10.567-15.657,10.567-25.841c0-10.183-3.518-18.793-10.567-25.835
+                    l-21.409-21.416C323.432,3.521,314.817,0,304.637,0s-18.791,3.521-25.841,10.561L92.649,196.425
+                    c-7.044,7.043-10.566,15.656-10.566,25.841s3.521,18.791,10.566,25.837l186.146,185.864c7.05,7.043,15.66,10.564,25.841,10.564
+                    s18.795-3.521,25.834-10.564l21.409-21.412c7.05-7.039,10.567-15.604,10.567-25.697c0-10.085-3.518-18.746-10.567-25.978
+                    L213.13,222.409z"></path></g></svg></button><h3>Performance Cookies</h3></div><div class="ot-lst-subhdr"><div class="ot-search-cntr"><p role="status" class="ot-scrn-rdr"></p><label for="vendor-search-handler" class="ot-scrn-rdr"></label> <input id="vendor-search-handler" type="text" name="vendor-search-handler"> <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 -30 110 110" aria-hidden="true"><title>Search Icon</title><path fill="#2e3644" d="M55.146,51.887L41.588,37.786c3.486-4.144,5.396-9.358,5.396-14.786c0-12.682-10.318-23-23-23s-23,10.318-23,23
+            s10.318,23,23,23c4.761,0,9.298-1.436,13.177-4.162l13.661,14.208c0.571,0.593,1.339,0.92,2.162,0.92
+            c0.779,0,1.518-0.297,2.079-0.837C56.255,54.982,56.293,53.08,55.146,51.887z M23.984,6c9.374,0,17,7.626,17,17s-7.626,17-17,17
+            s-17-7.626-17-17S14.61,6,23.984,6z"></path></svg></div><div class="ot-fltr-cntr"><button id="filter-btn-handler" aria-label="Filter" aria-haspopup="true"><svg role="presentation" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 402.577 402.577" xml:space="preserve"><title>Filter Icon</title><g><path fill="#fff" d="M400.858,11.427c-3.241-7.421-8.85-11.132-16.854-11.136H18.564c-7.993,0-13.61,3.715-16.846,11.136
+      c-3.234,7.801-1.903,14.467,3.999,19.985l140.757,140.753v138.755c0,4.955,1.809,9.232,5.424,12.854l73.085,73.083
+      c3.429,3.614,7.71,5.428,12.851,5.428c2.282,0,4.66-0.479,7.135-1.43c7.426-3.238,11.14-8.851,11.14-16.845V172.166L396.861,31.413
+      C402.765,25.895,404.093,19.231,400.858,11.427z"></path></g></svg></button></div><div id="ot-anchor"></div><section id="ot-fltr-modal"><div id="ot-fltr-cnt"><button id="clear-filters-handler">Clear</button><div class="ot-fltr-scrlcnt ot-pc-scrollbar"><div class="ot-fltr-opts"><div class="ot-fltr-opt"><div class="ot-chkbox"><input id="chkbox-id" type="checkbox" aria-checked="false" class="category-filter-handler"> <label for="chkbox-id"><span class="ot-label-txt">checkbox label</span></label> <span class="ot-label-status">label</span></div></div></div><div class="ot-fltr-btns"><button id="filter-apply-handler">Apply</button> <button id="filter-cancel-handler">Cancel</button></div></div></div></section></div></div><section id="ot-lst-cnt" class="ot-host-cnt ot-pc-scrollbar"><div id="ot-sel-blk"><div class="ot-sel-all"><div class="ot-sel-all-hdr"><span class="ot-consent-hdr">Consent</span> <span class="ot-li-hdr">Leg.Interest</span></div><div class="ot-sel-all-chkbox"><div class="ot-chkbox" id="ot-selall-hostcntr"><input id="select-all-hosts-groups-handler" type="checkbox" aria-checked="false"> <label for="select-all-hosts-groups-handler"><span class="ot-label-txt">checkbox label</span></label> <span class="ot-label-status">label</span></div><div class="ot-chkbox" id="ot-selall-vencntr"><input id="select-all-vendor-groups-handler" type="checkbox" aria-checked="false"> <label for="select-all-vendor-groups-handler"><span class="ot-label-txt">checkbox label</span></label> <span class="ot-label-status">label</span></div><div class="ot-chkbox" id="ot-selall-licntr"><input id="select-all-vendor-leg-handler" type="checkbox" aria-checked="false"> <label for="select-all-vendor-leg-handler"><span class="ot-label-txt">checkbox label</span></label> <span class="ot-label-status">label</span></div></div></div></div><div class="ot-sdk-row"><div class="ot-sdk-column"></div></div></section></section><div class="ot-pc-footer"><div class="ot-btn-container"><button class="ot-pc-refuse-all-handler">Reject All</button> <button class="save-preference-btn-handler onetrust-close-btn-handler">Confirm My Choices</button></div><!-- Footer logo --><div class="ot-pc-footer-logo"><a href="https://www.onetrust.com/products/cookie-consent/" target="_blank" rel="noopener noreferrer" style="background-image: url(&quot;https://cdn.cookielaw.org/logos/static/poweredBy_ot_logo.svg&quot;);" aria-label="Powered by OneTrust Opens in a new Tab"></a></div></div><!-- Cookie subgroup container --><!-- Vendor list link --><!-- Cookie lost link --><!-- Toggle HTML element --><!-- Checkbox HTML --><!-- plus minus--><!-- Arrow SVG element --><!-- Accordion basic element --><span class="ot-scrn-rdr" aria-atomic="true" aria-live="polite"></span><iframe class="ot-text-resize" title="onetrust-text-resize" style="position: absolute; top: -50000px; width: 100em;" aria-hidden="true" src="./Dear Rich on Vimeo_files/saved_resource(1).html"></iframe></div></div><script type="text/javascript" id="">(function(){function c(){window.localStorage.setItem("__landing_page",JSON.stringify({p:window.location.href,t:(new Date).getTime()}))}function g(a){if(!a)return{};var b=a.indexOf("?");if(-1===b)return{};a=a.substring(b+1);a=a.split("\x26");b={};for(var d=0;d<a.length;d++){var e=a[d].split("\x3d");2===e.length&&(b[e[0]]=encodeURIComponent(e[1]))}return b}var f=window.localStorage.getItem("__landing_page");if(f)try{var h=JSON.parse(f),k=(new Date(h.t)).getTime(),l=(new Date).getTime();if(864E5<=l-
+k)c();else{var m=g(window.location.href);m.utm_campaign&&c()}}catch(a){c()}else c()})();</script></body><div id="transcend-consent-manager" style="position: fixed; z-index: 2147483647;"></div><iframe height="0" width="0" src="./Dear Rich on Vimeo_files/31e97cbf-355c-4f0d-8bad-9cd945121508.html" style="display: none;"></iframe></html>
\ No newline at end of file
diff --git a/plugins/discourse-lazy-videos/spec/lib/lazy-videos/lazy_vimeo_spec.rb b/plugins/discourse-lazy-videos/spec/lib/lazy-videos/lazy_vimeo_spec.rb
new file mode 100644
index 00000000000..11f8a475b5c
--- /dev/null
+++ b/plugins/discourse-lazy-videos/spec/lib/lazy-videos/lazy_vimeo_spec.rb
@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+RSpec.describe Onebox::Engine::VimeoOnebox do
+  def get_response(filename)
+    file = "#{Rails.root}/plugins/discourse-lazy-videos/spec/fixtures/#{filename}.response"
+    File.read(file)
+  end
+
+  before do
+    stub_request(:get, "https://vimeo.com/786646692").to_return(
+      status: 200,
+      body: get_response("vimeo"),
+    )
+
+    stub_request(:get, "https://vimeo.com/192207770/0faf1dd09d").to_return(
+      status: 200,
+      body: get_response("vimeo-unlisted"),
+    )
+
+    stub_request(
+      :get,
+      "https://vimeo.com/api/oembed.json?url=https://vimeo.com/786646692",
+    ).to_return(
+      status: 200,
+      body:
+        JSON.dump(
+          type: "video",
+          version: "1.0",
+          provider_name: "Vimeo",
+          provider_url: "https://vimeo.com/",
+          title: "Dear Rich",
+          author_name: "Stept Studios",
+          author_url: "https://vimeo.com/steptstudios",
+          is_plus: "0",
+          account_type: "business",
+          html:
+            "<iframe src=\"https://player.vimeo.com/video/786646692?h=f2ca1d6121&amp;app_id=122963\" width=\"426\" height=\"240\" frameborder=\"0\" allow=\"autoplay; fullscreen; picture-in-picture\" allowfullscreen title=\"Dear Rich\"></iframe>",
+          width: 426,
+          height: 240,
+          duration: 883,
+          description:
+            "Accomplished endurance athlete, author and podcaster, Rich Roll has been a voice we have become familiar with over the years. In DEAR RICH, we hear the story behind the voice. Rich shares a letter to himself, giving an intimate view into the struggles he's faced with addiction, how running has helped bring him back to the surface and something that he is still learning: that we must overcome our fear of change to find what we are truly capable of.\n\n\n\n\nCredits: \nClient: SalomonTV\nProduction Company: Stept Studios\nPost Production: Lockt Editorial\n\n\nDirector: Brandon Lavoie\nDP: Jared Levy \nEP: Jon Brogan \nAccount Executive: Paul Muhlbach\nProducer: Laura Mittelberg\nSupervising Producer: Eric Cook \n1st AC: Jake Coury\nGaffer: Evan Cox\nKey Grip: David Klassen \nHMU: Luca Buzas\nAudio Mixer: Bobby Vongham\n35mm Photographer: Brian Chorski\t\nPA: Anthony Cantu, John Maddock\n\nPost Production\nHead of Post: Connor Scofield\nPost EP: Eileen Miraglia\nPost Producer: Erin Bates\nEditor: Brandon Lavoie\nOnline Editor: Ben Ivers\nColorist: Sam Zook at Mom & Pop\nComposer: Jon Sigsworth\nSound Design and Mix: Justin Enoch at Post Mambo\n\n\nSalomonTV\nSenior Marketing Manager – Run & Outdoor: Erin Cooper\nMarketing Specialist: Louis Bertrand",
+          thumbnail_url:
+            "https://i.vimeocdn.com/video/1582157011-37115b15c717a168bf86e2f2855b6bbc23b1cbcee54ff99c8d7b808b459365d6-d_295x166",
+          thumbnail_width: 295,
+          thumbnail_height: 166,
+          thumbnail_url_with_play_button:
+            "https://i.vimeocdn.com/filter/overlay?src0=https%3A%2F%2Fi.vimeocdn.com%2Fvideo%2F1582157011-37115b15c717a168bf86e2f2855b6bbc23b1cbcee54ff99c8d7b808b459365d6-d_295x166&src1=http%3A%2F%2Ff.vimeocdn.com%2Fp%2Fimages%2Fcrawler_play.png",
+          upload_date: "2023-01-05 12:01:55",
+          video_id: 786_646_692,
+          uri: "/videos/786646692",
+        ),
+    )
+
+    stub_request(
+      :get,
+      "https://vimeo.com/api/oembed.json?url=https://vimeo.com/192207770/0faf1dd09d",
+    ).to_return(
+      status: 200,
+      body:
+        JSON.dump(
+          type: "video",
+          version: "1.0",
+          provider_name: "Vimeo",
+          provider_url: "https://vimeo.com/",
+          html:
+            "<iframe src=\"https://player.vimeo.com/video/192207770?h=0faf1dd09d&amp;app_id=122963\" width=\"640\" height=\"272\" frameborder=\"0\" allow=\"autoplay; fullscreen; picture-in-picture\" allowfullscreen></iframe>",
+          width: 640,
+          height: 272,
+          video_id: 192_207_770,
+          uri: "/videos/192207770:0faf1dd09d",
+        ),
+    )
+  end
+
+  context "when public video" do
+    it "creates a lazy video container" do
+      expect(Onebox.preview("https://vimeo.com/786646692").to_s).to match(/lazy-video-container/)
+    end
+
+    it "uses the correct ids" do
+      expect(Onebox.preview("https://vimeo.com/786646692").to_s).to include(
+        'data-video-id="786646692"',
+      )
+      expect(Onebox.preview("https://vimeo.com/786646692").to_s).to include(
+        'src="https://i.vimeocdn.com/filter/overlay?src0=https%3A%2F%2Fi.vimeocdn.com%2Fvideo%2F1582157011-37115b15c717a168bf86e2f2855b6bbc23b1cbcee54ff99c8d7b808b459365d6-d_1280x720&amp;src1=https%3A%2F%2Ff.vimeocdn.com%2Fimages_v6%2Fshare%2Fplay_icon_overlay.png"',
+      )
+    end
+  end
+
+  context "when unlisted video" do
+    it "creates a lazy video container" do
+      expect(Onebox.preview("https://vimeo.com/192207770/0faf1dd09d").to_s).to match(
+        /lazy-video-container/,
+      )
+    end
+
+    it "uses the correct ids" do
+      expect(Onebox.preview("https://vimeo.com/192207770/0faf1dd09d").to_s).to include(
+        'data-video-id="192207770?h=0faf1dd09d&amp;app_id=122963"',
+      )
+      expect(Onebox.preview("https://vimeo.com/192207770/0faf1dd09d").to_s).to include(
+        'src="https://i.vimeocdn.com/filter/overlay?src0=https%3A%2F%2Fi.vimeocdn.com%2Fvideo%2F603496523-33935d2b2cbf32d39c4697fa5b03364507eb81dc03a0be84b9a9fe4ec7b89868-d_1280x544&amp;src1=https%3A%2F%2Ff.vimeocdn.com%2Fimages_v6%2Fshare%2Fplay_icon_overlay.png"',
+      )
+    end
+  end
+end
diff --git a/plugins/discourse-lazy-videos/test/javascripts/components/lazy-video-test.js b/plugins/discourse-lazy-videos/test/javascripts/components/lazy-video-test.js
new file mode 100644
index 00000000000..d0f12f9a0a7
--- /dev/null
+++ b/plugins/discourse-lazy-videos/test/javascripts/components/lazy-video-test.js
@@ -0,0 +1,65 @@
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import hbs from "htmlbars-inline-precompile";
+import { module, test } from "qunit";
+import { click, render } from "@ember/test-helpers";
+
+module("Discourse Lazy Videos | Component | lazy-video", function (hooks) {
+  setupRenderingTest(hooks);
+
+  this.attributes = {
+    url: "https://www.youtube.com/watch?v=kPRA0W1kECg",
+    thumbnail: "thumbnail.jpeg",
+    title: "15 Sorting Algorithms in 6 Minutes",
+    providerName: "youtube",
+    id: "kPRA0W1kECg",
+    dominantColor: "00ffff",
+    startTime: 234,
+  };
+
+  test("displays the correct video title", async function (assert) {
+    await render(hbs`<LazyVideo @videoAttributes={{this.attributes}} />`);
+
+    assert.dom(".title-link").hasText(this.attributes.title);
+  });
+
+  test("uses the correct video start time", async function (assert) {
+    await render(hbs`<LazyVideo @videoAttributes={{this.attributes}} />`);
+
+    assert.dom(".youtube-onebox").hasAttribute("data-video-start-time", "234");
+  });
+
+  test("displays the correct provider icon", async function (assert) {
+    await render(hbs`<LazyVideo @videoAttributes={{this.attributes}} />`);
+
+    assert.dom(".icon.youtube-icon").exists();
+  });
+
+  test("uses tthe dominant color from the dom", async function (assert) {
+    await render(hbs`<LazyVideo @videoAttributes={{this.attributes}} />`);
+
+    assert
+      .dom(".video-thumbnail")
+      .hasAttribute("style", "background-color: #00ffff;");
+  });
+
+  test("loads the iframe when clicked", async function (assert) {
+    await render(hbs`<LazyVideo @videoAttributes={{this.attributes}}/>`);
+    assert.dom(".lazy-video-container.video-loaded").doesNotExist();
+
+    await click(".video-thumbnail.youtube");
+    assert.dom(".lazy-video-container.video-loaded iframe").exists();
+  });
+
+  test("accepts an optional onLoadedVideo callback function", async function (assert) {
+    this.set("foo", 1);
+    this.set("onLoadedVideo", () => this.set("foo", 2));
+
+    await render(
+      hbs`<LazyVideo @videoAttributes={{this.attributes}} @onLoadedVideo={{this.onLoadedVideo}} />`
+    );
+    assert.strictEqual(this.foo, 1);
+
+    await click(".video-thumbnail.youtube");
+    assert.strictEqual(this.foo, 2);
+  });
+});
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js b/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js
index dfc52ccc7bc..48fc3f619e6 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js
@@ -61,6 +61,10 @@ export default Component.extend({
   },
 
   @observes("computedConfig.{from,to,options}", "options", "isValid", "isRange")
+  configChanged() {
+    this._renderPreview();
+  },
+
   @debounce(INPUT_DELAY)
   async _renderPreview() {
     if (this.markup) {
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
index 2f849ee6ea6..5b5aec0c706 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
@@ -133,6 +133,25 @@
           </div>
         {{/unless}}
 
+        <div class="control-group timezones">
+          <label>{{i18n
+              "discourse_local_dates.create.form.timezones_title"
+            }}</label>
+          <p>{{i18n
+              "discourse_local_dates.create.form.timezones_description"
+            }}</p>
+          <div class="controls">
+            <MultiSelect
+              @valueProperty={{null}}
+              @nameProperty={{null}}
+              @class="timezones-input"
+              @content={{this.allTimezones}}
+              @value={{this.timezones}}
+              @options={{hash allowAny=false maximum=5}}
+            />
+          </div>
+        </div>
+
         <div class="control-group format">
           <label>{{i18n
               "discourse_local_dates.create.form.format_title"
@@ -169,25 +188,6 @@
             {{/each}}
           </ul>
         </div>
-
-        <div class="control-group timezones">
-          <label>{{i18n
-              "discourse_local_dates.create.form.timezones_title"
-            }}</label>
-          <p>{{i18n
-              "discourse_local_dates.create.form.timezones_description"
-            }}</p>
-          <div class="controls">
-            <MultiSelect
-              @valueProperty={{null}}
-              @nameProperty={{null}}
-              @class="timezones-input"
-              @content={{this.allTimezones}}
-              @value={{this.timezones}}
-              @options={{hash allowAny=false maximum=5}}
-            />
-          </div>
-        </div>
       </div>
     {{/if}}
   </div>
diff --git a/plugins/discourse-local-dates/assets/stylesheets/common/discourse-local-dates.scss b/plugins/discourse-local-dates/assets/stylesheets/common/discourse-local-dates.scss
index 34fd4dabdc1..3f200f5ef8c 100644
--- a/plugins/discourse-local-dates/assets/stylesheets/common/discourse-local-dates.scss
+++ b/plugins/discourse-local-dates/assets/stylesheets/common/discourse-local-dates.scss
@@ -265,7 +265,7 @@ div[data-tippy-root] {
 
     .recurrence {
       .recurrence-input {
-        width: 300px;
+        width: 350px;
       }
     }
   }
@@ -298,7 +298,7 @@ div[data-tippy-root] {
   }
 
   .timezones-input {
-    width: 99%;
+    width: 350px;
   }
 }
 
diff --git a/plugins/discourse-local-dates/spec/system/local_dates_spec.rb b/plugins/discourse-local-dates/spec/system/local_dates_spec.rb
index 297485906de..ac8ad5080ad 100644
--- a/plugins/discourse-local-dates/spec/system/local_dates_spec.rb
+++ b/plugins/discourse-local-dates/spec/system/local_dates_spec.rb
@@ -1,20 +1,28 @@
 # frozen_string_literal: true
 
-describe "Local dates", type: :system, js: true do
+describe "Local dates", type: :system do
   fab!(:topic) { Fabricate(:topic) }
-  fab!(:user) { Fabricate(:user) }
+  fab!(:current_user) { Fabricate(:user) }
+  let(:year) { Time.zone.now.year + 1 }
+  let(:bookmark_modal) { PageObjects::Modals::Bookmark.new }
 
-  before { create_post(user: user, topic: topic, title: "Date range test post", raw: <<~RAW) }
-        First option: [date=2022-12-15 time=14:19:00 timezone="Asia/Singapore"]
-        Second option: [date=2022-12-15 time=01:20:00 timezone="Asia/Singapore"], or [date=2022-12-15 time=02:40:00 timezone="Asia/Singapore"]
-        Third option: [date-range from=2022-12-15T11:25:00 to=2022-12-16T00:26:00 timezone="Asia/Singapore"] or [date-range from=2022-12-22T11:57:00 to=2022-12-23T11:58:00 timezone="Asia/Singapore"]
+  before do
+    create_post(user: current_user, topic: topic, title: "Date range test post", raw: <<~RAW)
+        First option: [date=#{year}-12-15 time=14:19:00 timezone="Asia/Singapore"]
+        Second option: [date=#{year}-12-15 time=01:20:00 timezone="Asia/Singapore"], or [date=#{year}-12-15 time=02:40:00 timezone="Asia/Singapore"]
+        Third option: [date-range from=#{year}-12-15T11:25:00 to=#{year}-12-16T00:26:00 timezone="Asia/Singapore"] or [date-range from=#{year}-12-22T11:57:00 to=#{year}-12-23T11:58:00 timezone="Asia/Singapore"]
       RAW
+  end
 
   let(:topic_page) { PageObjects::Pages::Topic.new }
 
+  def formatted_date_for_year(month, day)
+    Date.parse("#{year}-#{month}-#{day}").strftime("%A, %B %-d, %Y")
+  end
+
   it "renders local dates and date ranges correctly" do
     using_browser_timezone("Asia/Singapore") do
-      sign_in user
+      sign_in current_user
 
       topic_page.visit_topic(topic)
 
@@ -27,19 +35,19 @@ describe "Local dates", type: :system, js: true do
       post_dates[0].click
       tippy_date = topic_page.find(".tippy-content .current .date-time")
 
-      expect(tippy_date).to have_text("Thursday, December 15, 2022\n2:19 PM", exact: true)
+      expect(tippy_date).to have_text("#{formatted_date_for_year(12, 15)}\n2:19 PM", exact: true)
 
       # Two single dates in the same paragraph.
       #
       post_dates[1].click
       tippy_date = topic_page.find(".tippy-content .current .date-time")
 
-      expect(tippy_date).to have_text("Thursday, December 15, 2022\n1:20 AM", exact: true)
+      expect(tippy_date).to have_text("#{formatted_date_for_year(12, 15)}\n1:20 AM", exact: true)
 
       post_dates[2].click
       tippy_date = topic_page.find(".tippy-content .current .date-time")
 
-      expect(tippy_date).to have_text("Thursday, December 15, 2022\n2:40 AM", exact: true)
+      expect(tippy_date).to have_text("#{formatted_date_for_year(12, 15)}\n2:40 AM", exact: true)
 
       # Two date ranges in the same paragraph.
       #
@@ -47,7 +55,7 @@ describe "Local dates", type: :system, js: true do
       tippy_date = topic_page.find(".tippy-content .current .date-time")
 
       expect(tippy_date).to have_text(
-        "Thursday, December 15, 2022\n11:25 AM → 12:26 AM",
+        "#{formatted_date_for_year(12, 15)}\n11:25 AM → 12:26 AM",
         exact: true,
       )
 
@@ -55,9 +63,38 @@ describe "Local dates", type: :system, js: true do
       tippy_date = topic_page.find(".tippy-content .current .date-time")
 
       expect(tippy_date).to have_text(
-        "Thursday, December 22, 2022 11:57 AM → Friday, December 23, 2022 11:58 AM",
+        "#{formatted_date_for_year(12, 22)} 11:57 AM → #{formatted_date_for_year(12, 23)} 11:58 AM",
         exact: true,
       )
     end
   end
+
+  describe "bookmarks" do
+    before do
+      current_user.user_option.update!(timezone: "Asia/Singapore")
+      sign_in(current_user)
+    end
+
+    it "can use the post local date for a bookmark preset" do
+      topic_page.visit_topic(topic)
+      topic_page.expand_post_actions(topic.first_post)
+      topic_page.click_post_action_button(topic.first_post, :bookmark)
+      bookmark_modal.select_preset_reminder(:post_local_date)
+      expect(topic_page).to have_post_bookmarked(topic.first_post)
+      bookmark = Bookmark.find_by(bookmarkable: topic.first_post, user: current_user)
+      expect(bookmark.reminder_at.to_s).to eq("#{year}-12-15 06:19:00 UTC")
+    end
+
+    it "does not allow using post dates in the past for a bookmark preset" do
+      topic.first_post.update!(
+        raw: 'First option: [date=1999-12-15 time=14:19:00 timezone="Asia/Singapore"]',
+      )
+      topic.first_post.rebake!
+      topic_page.visit_topic(topic)
+      topic_page.expand_post_actions(topic.first_post)
+      topic_page.click_post_action_button(topic.first_post, :bookmark)
+      expect(bookmark_modal).to be_open
+      expect(bookmark_modal).to have_no_preset(:post_local_date)
+    end
+  end
 end
diff --git a/plugins/discourse-local-dates/test/javascripts/acceptance/download-calendar-test.js b/plugins/discourse-local-dates/test/javascripts/acceptance/download-calendar-test.js
index 7f5588a7b6f..508a169e58e 100644
--- a/plugins/discourse-local-dates/test/javascripts/acceptance/download-calendar-test.js
+++ b/plugins/discourse-local-dates/test/javascripts/acceptance/download-calendar-test.js
@@ -1,8 +1,4 @@
-import {
-  acceptance,
-  exists,
-  query,
-} from "discourse/tests/helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { click, visit } from "@ember/test-helpers";
 import I18n from "I18n";
 import { test } from "qunit";
@@ -18,24 +14,25 @@ acceptance(
     needs.pretender((server, helper) => {
       const response = cloneJSON(fixturesByUrl["/t/281.json"]);
       const startDate = moment
-        .tz("Africa/Cairo")
+        .tz("America/Lima")
         .add(1, "days")
         .format("YYYY-MM-DD");
-      response.post_stream.posts[0].cooked = `<p><span data-date=\"${startDate}\" data-time=\"13:00:00\" class=\"discourse-local-date\" data-timezone=\"Africa/Cairo\" data-email-preview=\"${startDate}T11:00:00Z UTC\">${startDate}T11:00:00Z</span></p>`;
+      response.post_stream.posts[0].cooked = `<p><span data-date=\"${startDate}\" data-time=\"13:00:00\" class=\"discourse-local-date\" data-timezone=\"America/Lima\" data-email-preview=\"${startDate}T18:00:00Z UTC\">${startDate}T18:00:00Z</span></p>`;
 
       server.get("/t/281.json", () => helper.response(response));
     });
 
     test("Display pick calendar modal", async function (assert) {
       await visit("/t/local-dates/281");
-
       await click(".discourse-local-date");
-      await click(document.querySelector(".download-calendar"));
-      assert.strictEqual(
-        query("#discourse-modal-title").textContent.trim(),
-        I18n.t("download_calendar.title"),
-        "it should display modal to select calendar"
-      );
+      await click(".download-calendar");
+
+      assert
+        .dom("#discourse-modal-title")
+        .hasText(
+          I18n.t("download_calendar.title"),
+          "it should display modal to select calendar"
+        );
     });
   }
 );
@@ -48,20 +45,20 @@ acceptance(
     needs.pretender((server, helper) => {
       const response = cloneJSON(fixturesByUrl["/t/281.json"]);
       const startDate = moment
-        .tz("Africa/Cairo")
+        .tz("America/Lima")
         .subtract(1, "days")
         .format("YYYY-MM-DD");
 
-      response.post_stream.posts[0].cooked = `<p><span data-date=\"${startDate}\" data-time=\"13:00:00\" class=\"discourse-local-date\" data-timezone=\"Africa/Cairo\" data-email-preview=\"${startDate}T11:00:00Z UTC\">${startDate}T11:00:00Z</span></p>`;
+      response.post_stream.posts[0].cooked = `<p><span data-date=\"${startDate}\" data-time=\"13:00:00\" class=\"discourse-local-date\" data-timezone=\"America/Lima\" data-email-preview=\"${startDate}T18:00:00Z UTC\">${startDate}T18:00:00Z</span></p>`;
 
       server.get("/t/281.json", () => helper.response(response));
     });
 
     test("Does not show add to calendar button", async function (assert) {
       await visit("/t/local-dates/281");
-
       await click(".discourse-local-date");
-      assert.ok(!exists(document.querySelector(".download-calendar")));
+
+      assert.dom(".download-calendar").doesNotExist();
     });
   }
 );
@@ -74,38 +71,38 @@ acceptance(
     needs.pretender((server, helper) => {
       const response = cloneJSON(fixturesByUrl["/t/281.json"]);
       const startDate = moment
-        .tz("Africa/Cairo")
+        .tz("America/Lima")
         .add(1, "days")
         .format("YYYY-MM-DD");
-      response.post_stream.posts[0].cooked = `<p><span data-date=\"${startDate}\" data-time=\"13:00:00\" class=\"discourse-local-date\" data-timezone=\"Africa/Cairo\" data-email-preview=\"${startDate}T11:00:00Z UTC\">${startDate}T11:00:00Z</span></p>`;
+      response.post_stream.posts[0].cooked = `<p><span data-date=\"${startDate}\" data-time=\"13:00:00\" class=\"discourse-local-date\" data-timezone=\"America/Lima\" data-email-preview=\"${startDate}T18:00:00Z UTC\">${startDate}T18:00:00Z</span></p>`;
       response.title = "   title to trim   ";
       server.get("/t/281.json", () => helper.response(response));
     });
 
-    needs.hooks.beforeEach(function () {
-      let win = { focus: function () {} };
-      sinon.stub(window, "open").returns(win);
-      sinon.stub(win, "focus");
-    });
-
     test("saves into default calendar", async function (assert) {
       const startDate = moment
-        .tz("Africa/Cairo")
+        .tz("America/Lima")
         .add(1, "days")
         .format("YYYYMMDD");
       await visit("/t/local-dates/281");
 
+      sinon.stub(window, "open").callsFake(function () {
+        assert.deepEqual(
+          [...arguments],
+          [
+            `https://www.google.com/calendar/event?action=TEMPLATE&text=title%20to%20trim&dates=${startDate}T180000Z/${startDate}T190000Z`,
+            "_blank",
+            "noopener",
+            "noreferrer",
+          ]
+        );
+        return { focus() {} };
+      });
+
       await click(".discourse-local-date");
-      await click(document.querySelector(".download-calendar"));
-      assert.ok(!exists(document.querySelector("#discourse-modal-title")));
-      assert.ok(
-        window.open.calledWith(
-          `https://www.google.com/calendar/event?action=TEMPLATE&text=title%20to%20trim&dates=${startDate}T110000Z/${startDate}T120000Z`,
-          "_blank",
-          "noopener",
-          "noreferrer"
-        )
-      );
+      await click(".download-calendar");
+
+      assert.dom("#discourse-modal-title").doesNotExist();
     });
   }
 );
diff --git a/plugins/discourse-narrative-bot/assets/javascripts/initializers/new-user-narrative.js b/plugins/discourse-narrative-bot/assets/javascripts/initializers/new-user-narrative.js
index f6123499e76..2cf2361121b 100644
--- a/plugins/discourse-narrative-bot/assets/javascripts/initializers/new-user-narrative.js
+++ b/plugins/discourse-narrative-bot/assets/javascripts/initializers/new-user-narrative.js
@@ -15,9 +15,9 @@ export default {
     this.appEvents = container.lookup("service:app-events");
 
     withPluginApi("0.8.7", (api) => {
-      const currentUser = api.getCurrentUser();
+      this.currentUser = api.getCurrentUser();
 
-      if (!currentUser) {
+      if (!this.currentUser) {
         return;
       }
 
@@ -41,17 +41,19 @@ export default {
       );
 
       this.messageBus.subscribe(
-        "/new_user_narrative/tutorial_search",
+        `/new_user_narrative/tutorial_search/${this.currentUser.id}`,
         this.onMessage
       );
     });
   },
 
   teardown() {
-    this.messageBus?.unsubscribe(
-      "/new_user_narrative/tutorial_search",
-      this.onMessage
-    );
+    if (this.currentUser) {
+      this.messageBus?.unsubscribe(
+        `/new_user_narrative/tutorial_search/${this.currentUser.id}`,
+        this.onMessage
+      );
+    }
   },
 
   @bind
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ar.yml b/plugins/discourse-narrative-bot/config/locales/server.ar.yml
index 9ca36aac213..b366bd07b04 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ar.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ar.yml
@@ -45,13 +45,6 @@ ar:
       trigger: "رمي النرد"
       invalid: |-
         عذرًا، من المستحيل رياضيًا الحصول على هذه التركيبة في النرد. :confounded:
-      not_enough_dice:
-        zero: "لدي %{count} حجر نرد فقط. [هذا مخزٍ](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), اعرف!"
-        one: "لدي حجر نرد واحد (%{count}) فقط. [هذا مخزٍ](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), اعرف!"
-        two: "لدي حجرَي نرد (%{count}) فقط. [هذا مخزٍ](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), اعرف!"
-        few: "لدي %{count} أحجار نرد فقط. [هذا مخزٍ](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), اعرف!"
-        many: "لدي فقط %{count} حجر نرد. [هذا مخزٍ](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), اعرف!"
-        other: "لدي فقط %{count} حجر نرد. [هذا مخزٍ](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), اعرف!"
       out_of_range: |-
         هل تعلم أن [أقصى عدد من الجوانب](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) في نرد عادل رياضيًا هو 120؟
       results: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.cs.yml b/plugins/discourse-narrative-bot/config/locales/server.cs.yml
index 10ddb785044..69ca0d6dec8 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.cs.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.cs.yml
@@ -45,11 +45,6 @@ cs:
       trigger: "hodit"
       invalid: |-
         Omlouvám se, ale je matematicky nemožné hodit tuto kombinaci kostek. :confounded:
-      not_enough_dice:
-        one: "Mám jen %{count} kostku. Naprosto [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), já vím!"
-        few: "Mám jen %{count} kostek. Naprosto [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), já vím!"
-        many: "Mám jen %{count} kostek. Naprosto [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), já vím!"
-        other: "Mám jen %{count} kostky. Naprosto [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), já vím!"
       out_of_range: |-
         Víš, že [maximální počet stěn](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) pro matematicky férovou kostku je 120?
       results: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.da.yml b/plugins/discourse-narrative-bot/config/locales/server.da.yml
index 975dea1bc48..42271b5c2a0 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.da.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.da.yml
@@ -45,9 +45,6 @@ da:
       trigger: "Kast"
       invalid: |-
         Jeg beklager, det er matematisk umuligt at kaste den kombination af terninger. :confounded:
-      not_enough_dice:
-        one: "Jeg har kun %{count} terning. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), jeg ved det!"
-        other: "Jeg har kun %{count} terninger. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), jeg ved det!"
       out_of_range: |-
         Vidste du, at [det maksimale antal sider](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) for en matematisk retfærdig terning er 120?
       results: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.de.yml b/plugins/discourse-narrative-bot/config/locales/server.de.yml
index 5b95d9e008b..0045448a961 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.de.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.de.yml
@@ -46,8 +46,8 @@ de:
       invalid: |-
         Es tut mir leid, aber das Würfeln dieser Kombination ist mathematisch unmöglich. :confounded:
       not_enough_dice:
-        one: "Ich habe nur %{count} Würfel. [Beschämend](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), ich weiß!"
-        other: "Ich habe nur %{count} Würfel. [Beschämend](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), ich weiß!"
+        one: "Ich habe nur %{count} Würfel. Peinlich, ich weiß!"
+        other: "Ich habe nur %{count} Würfel. Peinlich, ich weiß!"
       out_of_range: |-
         Wusstest du, dass ein fairer Würfel aus [maximal 120 Seiten](http://www.spiegel.de/wissenschaft/mensch/d120-groesster-wuerfel-der-welt-hat-120-seiten-a-1099170.html) besteht?
       results: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.en.yml b/plugins/discourse-narrative-bot/config/locales/server.en.yml
index d1114d78f43..97ce26d80f3 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.en.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.en.yml
@@ -45,8 +45,8 @@ en:
       invalid: |-
         I’m sorry, it is mathematically impossible to roll that combination of dice. :confounded:
       not_enough_dice:
-        one: "I only have %{count} die. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), I know!"
-        other: "I only have %{count} dice. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), I know!"
+        one: "I only have %{count} dice. Shameful, I know!"
+        other: "I only have %{count} dice. Shameful, I know!"
       out_of_range: |-
         Did you know that [the maximum number of sides](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) for a mathematically fair dice is 120?
       results: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.es.yml b/plugins/discourse-narrative-bot/config/locales/server.es.yml
index d20e2ec7aed..791326e4dbe 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.es.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.es.yml
@@ -46,8 +46,8 @@ es:
       invalid: |-
         Lo siento, es matemáticamente imposible tirar esa combinación de dados. :confounded:
       not_enough_dice:
-        one: "Solo tengo %{count} dado. [Vergonzoso](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), ¡lo sé!"
-        other: "Solo tengo %{count} dados. [Vergonzoso](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), ¡lo sé!"
+        one: "Solo tengo %{count} dado. ¡Vergonzoso, lo sé!"
+        other: "Solo tengo %{count} dados. ¡Vergonzoso, lo sé!"
       out_of_range: |-
         ¿Sabías que [el número máximo de lados](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) que un dado matemáticamente correcto puede tener es 120?
       results: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.fi.yml b/plugins/discourse-narrative-bot/config/locales/server.fi.yml
index 23763833af9..683ec5472b0 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fi.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fi.yml
@@ -45,9 +45,6 @@ fi:
       trigger: "heitä"
       invalid: |-
         Pahoittelen, mutta on matemaattinen mahdottomuus heittää noppia pyytämälläsi tavalla. :confounded:
-      not_enough_dice:
-        one: "Minulla on vain %{count} noppa. [Häpeällistä](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), tiedän!"
-        other: "Minulla on vain %{count} noppaa. [Häpeällistä](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), tiedän!"
       out_of_range: |-
         Tiesitkö, että [suurin mahdollinen määrä sivuja](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) matemaattisesti tasapuolisessa nopassa on 120?
       results: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.fr.yml b/plugins/discourse-narrative-bot/config/locales/server.fr.yml
index 279badd12ef..929b05b38e7 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fr.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fr.yml
@@ -45,9 +45,6 @@ fr:
       trigger: "jet"
       invalid: |-
         Je regrette, c'est mathématiquement impossible d'obtenir cette combinaison de dés. :confounded:
-      not_enough_dice:
-        one: "Je n'ai que %{count} dé. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), Je sais !"
-        other: "Je n'ai que %{count} dés. [Honteux](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), Je sais !"
       out_of_range: |-
         Saviez-vous que [le nombre maximal de faces](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) d'un dé non truqué est de 120 ?
       results: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.gl.yml b/plugins/discourse-narrative-bot/config/locales/server.gl.yml
index f5486663cb3..eb4d7841947 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.gl.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.gl.yml
@@ -45,9 +45,6 @@ gl:
       trigger: "pregar"
       invalid: |-
         Laméntoo, é matematicamente imposíbel lograr esa combinación de dados :confounded:
-      not_enough_dice:
-        one: "Só teño %{count} dado. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), Seino!"
-        other: "Só teño %{count} dados. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), Seino!"
       out_of_range: |-
         Sabía que [o número máximo de lados] (https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) para un dado matematicamente equitativo é 120?
       results: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.he.yml b/plugins/discourse-narrative-bot/config/locales/server.he.yml
index 30efb9de53f..f38e88997e4 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.he.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.he.yml
@@ -46,10 +46,10 @@ he:
       invalid: |-
         עוד לא נוסח הכלל במתמטיקה שמאפשר שילוב כזה של קוביות, עמך הסליחה. :confounded:
       not_enough_dice:
-        one: "הוגבלתי לקובייה %{count}. [מביש](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), מסכים אתך!"
-        two: "הוגבלתי ל־%{count} קוביות. [מביש](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), מסכים אתך!"
-        many: "הוגבלתי ל־%{count} קוביות. [מביש](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), מסכים אתך!"
-        other: "הוגבלתי ל־%{count} קוביות. [מביש](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), מסכים אתך!"
+        one: "יש לי קובייה אחת בלבד. מביך, אני יודע!"
+        two: "יש לי %{count} קוביות בלבד. מביך, אני יודע!"
+        many: "יש לי %{count} קוביות בלבד. מביך, אני יודע!"
+        other: "יש לי %{count} קוביות בלבד. מביך, אני יודע!"
       out_of_range: |-
         ידעת ש[מספר הפאות המרבי](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) לקובייה הוגנת מתמטית הוא 120?
       results: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.hu.yml b/plugins/discourse-narrative-bot/config/locales/server.hu.yml
index 0c313d962d6..a6fedf7669f 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.hu.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.hu.yml
@@ -45,9 +45,6 @@ hu:
       trigger: "kockadobás"
       invalid: |-
         Sajnálom, matematikailag lehetetlen ezt a kockakombinációt dobni. :confounded:
-      not_enough_dice:
-        one: "Csak %{count} kockám van. [Szégyenletes](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), tudom!"
-        other: "Csak %{count} kockám van. [Szégyenletes](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), tudom!"
       out_of_range: |-
         Tudta, hogy a [legtöbb oldallal rendelkező](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) matematikailag fair kocka 120 oldalas?
       results: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.id.yml b/plugins/discourse-narrative-bot/config/locales/server.id.yml
index 51795c91b5b..bccfe8f7b99 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.id.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.id.yml
@@ -46,7 +46,7 @@ id:
       invalid: |-
         Maafkan saya, secara matematis tidak mungkin untuk memutar kombinasi dadu. :confounded:
       not_enough_dice:
-        other: "Saya hanya punya %{count} dadu. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), Saya tahu!"
+        other: "Saya hanya punya %{count} dadu. Memalukan, saya tahu!"
       out_of_range: |-
         Apakah Anda tahu [the maximum number of sides](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) untuk sebuah dadu seimbang matematis adalah 120?
       results: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.it.yml b/plugins/discourse-narrative-bot/config/locales/server.it.yml
index dcc68c77ba1..afe42e269ed 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.it.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.it.yml
@@ -46,8 +46,8 @@ it:
       invalid: |-
         Mi dispiace, è matematicamente impossibile lanciare quella combinazione di dadi. :confounded:
       not_enough_dice:
-        one: "Ho solo %{count} dado. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), lo so!"
-        other: "Ho solo %{count} dadi. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), lo so!"
+        one: "Ho solo %{count} tentativo. Purtroppo lo so!"
+        other: "Ho solo %{count} tentativi. Purtroppo lo so!"
       out_of_range: |-
         Lo sapevi che [il numero massimo di lati](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) per avere un dado matematicamente ben bilanciato è 120?
       results: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ja.yml b/plugins/discourse-narrative-bot/config/locales/server.ja.yml
index 04459fd45e1..1c94deafb8b 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ja.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ja.yml
@@ -45,8 +45,6 @@ ja:
       trigger: "サイコロを振る"
       invalid: |-
         ごめんなさい。このサイコロの組み合わせを出すのは数学的に無理です。:confounded:
-      not_enough_dice:
-        other: "サイコロは %{count} 個しかありません。[Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php)"
       out_of_range: |-
         数学的に公正なサイコロの[目の最大数](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice)は 120 であることを知っていますか？
       results: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ko.yml b/plugins/discourse-narrative-bot/config/locales/server.ko.yml
index 6b0bf7874cd..ef6f6ea8fe4 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ko.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ko.yml
@@ -45,8 +45,6 @@ ko:
       trigger: "굴리기"
       invalid: |-
         미안, 수학적으로 그 조합의 주사위는 돌릴 수 없어. :confounded:
-      not_enough_dice:
-        other: "난 주사위가 %{count}개 뿐입니다. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), 나도 알아요!"
       out_of_range: |-
         수학적으로 공평하면서도 [가장 큰 수](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice)를 가진 주사위의 면 수가 120이라는 거 아니?
       results: |-
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 1f7dfc2da3e..6dade03d2af 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml
@@ -45,9 +45,6 @@ nb_NO:
       trigger: "rull"
       invalid: |-
         Jeg beklager, det er matematisk umulig å rulle den kombinasjonen av terninger. :confounded:
-      not_enough_dice:
-        one: "Jeg har bare %{count} terninger. Jeg vet det er [Shameful] (https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php)!"
-        other: "Jeg har bare %{count} terninger. Jeg vet det er [flaut] (https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php)!"
       out_of_range: |-
         Visste du at [maksimalt antall sider](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) på en matematisk rettferdig terning er 120?
       results: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.nl.yml b/plugins/discourse-narrative-bot/config/locales/server.nl.yml
index a955ddfcb20..16403a97ea2 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.nl.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.nl.yml
@@ -45,9 +45,6 @@ nl:
       trigger: "gooien"
       invalid: |-
         Sorry, het is wiskundig onmogelijk om die combinatie te gooien. :confounded:
-      not_enough_dice:
-        one: "Ik heb maar %{count} dobbelsteen. [Beschamend](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), ik weet het!"
-        other: "Ik heb maar %{count} dobbelstenen. [Beschamend](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), ik weet het!"
       out_of_range: |-
         Wist je dat [het maximale aantal zijden](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-Sided-dice) voor een wiskundig eerlijke dobbelstenen 120 is?
       results: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml b/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml
index eddf3961cfa..7be18ed89e0 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml
@@ -45,11 +45,6 @@ pl_PL:
       trigger: "przewiń"
       invalid: |-
         Przykro mi, ale jest to matematycznie niemożliwe, aby rzucić taką kombinacją kostki. :confounded:
-      not_enough_dice:
-        one: "Mam tylko %{count} kość. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), Ja wiem!"
-        few: "Mam tylko %{count} kości. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), Ja wiem!"
-        many: "Mam tylko %{count} kości. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), Ja wiem!"
-        other: "Mam tylko %{count} kości. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), Ja wiem!"
       out_of_range: |-
         Czy wiesz, że [maksymalna ilość ścian](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) na sprawiedliwej kostce do gry to 120?
       results: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.pt.yml b/plugins/discourse-narrative-bot/config/locales/server.pt.yml
index aeec5548bc9..bf706b6f06d 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.pt.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.pt.yml
@@ -45,9 +45,6 @@ pt:
       trigger: "rolar"
       invalid: |-
         Sinto muito, é matematicamente impossível rolar essa combinação de dados. :confounded:
-      not_enough_dice:
-        one: "Eu só tenho %{count} dado. [Vergonhoso](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), eu sei!"
-        other: "Eu só tenho %{count} dados. [Vergonhoso](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), eu sei!"
       out_of_range: |-
         Você sabia que [o número máximo de lados] (https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) de um dado matematicamente justo é 120?
       results: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml b/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml
index d0b3b4eb6bc..bdb8be0049c 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml
@@ -46,8 +46,8 @@ pt_BR:
       invalid: |-
         Sinto muito, é matematicamente impossível rolar essa combinação de dados. :confounded:
       not_enough_dice:
-        one: "Eu só tenho %{count} dado. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), eu sei!"
-        other: "Eu só tenho %{count} dados. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), eu sei!"
+        one: "Só tenho %{count} dado. Vergonhoso, eu sei!"
+        other: "Só tenho %{count} dados. Vergonhoso, eu sei!"
       out_of_range: |-
         Você sabia que [a quantidade máxima de lados](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) para um dado matematicamente justo é 120?
       results: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ru.yml b/plugins/discourse-narrative-bot/config/locales/server.ru.yml
index 2393a7c43e9..be9a2ba5554 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ru.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ru.yml
@@ -45,11 +45,6 @@ ru:
       trigger: "кости"
       invalid: |-
         Даже математически невозможно выдать эту комбинацию костей. :confounded:
-      not_enough_dice:
-        one: "У меня только %{count} кость. [Посмотрите](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), что это такое!"
-        few: "У меня только %{count} кости. [Посмотрите](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), что это такое!"
-        many: "У меня только %{count} костей. [Посмотрите](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), что это такое!"
-        other: "У меня только %{count} костей. [Посмотрите](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), что это такое!"
       out_of_range: |-
         Знаете ли вы, что [максимальное количество сторон](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) в кубиках может быть 120?
       results: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.sl.yml b/plugins/discourse-narrative-bot/config/locales/server.sl.yml
index fe7de0b7b49..17c3fb2a9ae 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.sl.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.sl.yml
@@ -45,11 +45,6 @@ sl:
       trigger: "kocke"
       invalid: |-
         Oprostite, matematično ni mogoče vreči to kombinacijo kock. :confounded:
-      not_enough_dice:
-        one: "Imam samo %{count} kocko. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), vem!"
-        two: "Imam samo %{count} kocki. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), vem!"
-        few: "Imam samo %{count} kocke. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), vem!"
-        other: "Imam samo %{count} kock. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), vem!"
       out_of_range: |-
         Ali ste vedeli da je [največje število stranic](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) za matematično pravično kocko 120?
       results: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.sv.yml b/plugins/discourse-narrative-bot/config/locales/server.sv.yml
index 2b8ac8446e8..15c37771e2d 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.sv.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.sv.yml
@@ -46,8 +46,8 @@ sv:
       invalid: |-
         Förlåt, men det är inte matematiskt möjligt att kombinera tärningarna så. :confounded:
       not_enough_dice:
-        one: "Jag har bara %{count} tärning. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), jag vet!"
-        other: "Jag har bara %{count} tärningar. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), jag vet!"
+        one: "Jag har bara %{count} tärning. Skamligt, jag vet!"
+        other: "Jag har bara %{count} tärningar. Skamligt, jag vet!"
       out_of_range: |-
         Visste du att [maximalt antal sidor](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) på en matematiskt rättvis tärning är 120?
       results: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.tr_TR.yml b/plugins/discourse-narrative-bot/config/locales/server.tr_TR.yml
index 55a7fe4a018..398fa9fbd49 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.tr_TR.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.tr_TR.yml
@@ -46,8 +46,8 @@ tr_TR:
       invalid: |-
         Üzgünüm, bu zar kombinasyonunu tutturmak matematiksel olarak imkansız. :confounded:
       not_enough_dice:
-        one: "Sadece %{count} zarım var. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), biliyorum!"
-        other: "Sadece %{count} zarım var. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), biliyorum!"
+        one: "Sadece %{count} zarım var. Utanç verici, biliyorum!"
+        other: "Sadece %{count} zarım var. Utanç verici, biliyorum!"
       out_of_range: |-
         Matematiksel olarak adil bir zar için [maksimum kenar sayısının](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) 120 olduğunu biliyor muydunuz?
       results: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.uk.yml b/plugins/discourse-narrative-bot/config/locales/server.uk.yml
index 72fbf88a5b8..9b2abca0eb7 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.uk.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.uk.yml
@@ -45,6 +45,11 @@ uk:
       trigger: "крутити"
       invalid: |-
         Вибачте, комбінація кубиків математично неможлива. :confounded:
+      not_enough_dice:
+        one: "У мене тільки %{count} життя. Соромно, я знаю!"
+        few: "Мені залишилося тільки %{count} раз померти. Соромно, я знаю!"
+        many: "У мене тільки %{count} життів. Соромно, я знаю!"
+        other: "У мене тільки %{count} життів. Соромно, я знаю!"
       out_of_range: |-
         Чи знаєте ви, що [максимальна кількість сторін](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) в кубиках може бути 120?
       results: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ur.yml b/plugins/discourse-narrative-bot/config/locales/server.ur.yml
index e8fcf353f09..3722e3f21ac 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ur.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ur.yml
@@ -45,9 +45,6 @@ ur:
       trigger: "رول"
       invalid: |-
         معذرت، پانسہ کے اس مجموعہ کو چلانا ریاضی کے اصولوں کے حساب سے ناممکن ہے۔ :confounded:
-      not_enough_dice:
-        one: "میرے پاس صرف %{count} دانہ ہے۔ [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php)، میں جانتا ہوں!"
-        other: "میرے پاس صرف %{count} دانے ہیں۔ [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php)، میں جانتا ہوں!"
       out_of_range: |-
         کیا آپ جانتے تھے کہ ریاضی کے حساب سے منصفانہ پانسہ کیلئے [اطراف کی زیادہ سے زیادہ تعداد] (https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) 120 ہے؟
       results: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml b/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml
index e2e47baaa8a..d5aa3ec45f6 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml
@@ -46,7 +46,7 @@ zh_CN:
       invalid: |-
         抱歉，数学上无法掷出该骰子组合。:confounded:
       not_enough_dice:
-        other: "我只有 %{count} 个骰子。[Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php)，我知道！"
+        other: "我的骰子只有 %{count} 点。羞，我知道!"
       out_of_range: |-
         你知道数学上公平的骰子[最多有 120 个面](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice)吗？
       results: |-
diff --git a/plugins/discourse-narrative-bot/db/fixtures/002_badges.rb b/plugins/discourse-narrative-bot/db/fixtures/002_badges.rb
index a6c4b2dc282..5d32fa512b1 100644
--- a/plugins/discourse-narrative-bot/db/fixtures/002_badges.rb
+++ b/plugins/discourse-narrative-bot/db/fixtures/002_badges.rb
@@ -12,7 +12,11 @@ new_user_narrative_badge = Badge.find_by(name: DiscourseNarrativeBot::NewUserNar
 
 unless new_user_narrative_badge
   new_user_narrative_badge =
-    Badge.create!(name: DiscourseNarrativeBot::NewUserNarrative::BADGE_NAME, badge_type_id: 3)
+    Badge.create!(
+      name: DiscourseNarrativeBot::NewUserNarrative::BADGE_NAME,
+      badge_type_id: 3,
+      icon: "stamp",
+    )
 end
 
 advanced_user_narrative_badge =
@@ -20,7 +24,11 @@ advanced_user_narrative_badge =
 
 unless advanced_user_narrative_badge
   advanced_user_narrative_badge =
-    Badge.create!(name: DiscourseNarrativeBot::AdvancedUserNarrative::BADGE_NAME, badge_type_id: 2)
+    Badge.create!(
+      name: DiscourseNarrativeBot::AdvancedUserNarrative::BADGE_NAME,
+      badge_type_id: 2,
+      icon: "stamp",
+    )
 end
 
 badge_grouping = BadgeGrouping.find(1)
@@ -29,5 +37,10 @@ badge_grouping = BadgeGrouping.find(1)
   [new_user_narrative_badge, I18n.t("badges.certified.description")],
   [advanced_user_narrative_badge, I18n.t("badges.licensed.description")],
 ].each do |badge, description|
-  badge.update!(badge_grouping: badge_grouping, description: description, system: true)
+  badge.update!(
+    badge_grouping: badge_grouping,
+    description: description,
+    system: true,
+    icon: "stamp",
+  )
 end
diff --git a/plugins/discourse-narrative-bot/db/migrate/20230227050146_update_narrative_badge_icons.rb b/plugins/discourse-narrative-bot/db/migrate/20230227050146_update_narrative_badge_icons.rb
new file mode 100644
index 00000000000..5695cc65fb1
--- /dev/null
+++ b/plugins/discourse-narrative-bot/db/migrate/20230227050146_update_narrative_badge_icons.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class UpdateNarrativeBadgeIcons < ActiveRecord::Migration[7.0]
+  def change
+    execute <<~SQL
+      UPDATE badges
+      SET icon = 'stamp'
+      WHERE
+        name IN ('#{DiscourseNarrativeBot::NewUserNarrative::BADGE_NAME}', '#{DiscourseNarrativeBot::AdvancedUserNarrative::BADGE_NAME}')
+        AND icon = 'fa-certificate'
+    SQL
+  end
+end
diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/actions.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/actions.rb
index 803f31eb657..609099cf3a3 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/actions.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/actions.rb
@@ -49,7 +49,7 @@ module DiscourseNarrativeBot
           SiteSetting.rate_limit_create_post
         end
 
-      return unless duration > 0
+      return if duration <= 0
 
       data = DiscourseNarrativeBot::Store.get(user.id.to_s)
       return unless data
diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb
index 8b93776603b..6fa8e6b6766 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb
@@ -176,7 +176,7 @@ module DiscourseNarrativeBot
         opts[:delete_removed_posts_after] = 1
 
         result = PostActionCreator.notify_moderators(self.discobot_user, post)
-        result.reviewable.perform(self.discobot_user, :ignore)
+        result.reviewable.perform(self.discobot_user, :ignore_and_do_nothing)
       end
 
       PostDestroyer.new(@user, post, opts).destroy
diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
index 52db9b17d28..7ad317c77e4 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
@@ -173,7 +173,11 @@ module DiscourseNarrativeBot
       topic = @post.topic
       post = topic.first_post
 
-      MessageBus.publish("/new_user_narrative/tutorial_search", {}, user_ids: [@user.id])
+      MessageBus.publish(
+        "/new_user_narrative/tutorial_search/#{@user.id}",
+        {},
+        user_ids: [@user.id],
+      )
 
       raw = <<~MD
       #{post.raw}
@@ -634,7 +638,10 @@ module DiscourseNarrativeBot
     end
 
     def url_helpers(url, opts = {})
-      Rails.application.routes.url_helpers.public_send(url, opts.merge(host: Discourse.base_url))
+      Rails.application.routes.url_helpers.public_send(
+        url,
+        opts.merge(host: Discourse.base_url_no_prefix),
+      )
     end
   end
 end
diff --git a/plugins/discourse-narrative-bot/plugin.rb b/plugins/discourse-narrative-bot/plugin.rb
index 63d61a038e8..d1987d9a17a 100644
--- a/plugins/discourse-narrative-bot/plugin.rb
+++ b/plugins/discourse-narrative-bot/plugin.rb
@@ -292,8 +292,7 @@ after_initialize do
     next if !SiteSetting.discourse_narrative_bot_enabled
     next if args[:message_type] != "tl2_promotion_message"
 
-    recipient = args[:post].topic.topic_users.where.not(user_id: args[:post].user_id).last&.user
-    recipient ||= Discourse.site_contact_user if args[:post].user == Discourse.site_contact_user
+    recipient = args[:recipient]
     next if recipient.nil?
 
     I18n.with_locale(recipient.effective_locale) do
diff --git a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb
index 529ad5c67a1..f391a9c8d23 100644
--- a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb
@@ -831,6 +831,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
         :system_message_sent,
         post: Post.last,
         message_type: "tl2_promotion_message",
+        recipient: recipient,
       )
     }.to change { Topic.count }
     expect(Topic.last.title).to eq(
@@ -849,6 +850,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
         :system_message_sent,
         post: Post.last,
         message_type: "tl2_promotion_message",
+        recipient: recipient,
       )
     }.to change { Topic.count }
     expect(Topic.last.title).to eq(
@@ -879,6 +881,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
         :system_message_sent,
         post: Post.last,
         message_type: "tl2_promotion_message",
+        recipient: recipient,
       )
     }.to change { Topic.count }
 
@@ -886,4 +889,17 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
     expect(topic.title).to eq("german title")
     expect(topic.first_post.raw).to eq("german body")
   end
+
+  it "invites the correct user when users in site_contact_group_name are invited to the system message" do
+    recipient = Fabricate(:user)
+    group = Fabricate(:group)
+    group.add(Fabricate(:user))
+    SiteSetting.site_contact_group_name = "#{group.name}"
+
+    SystemMessage.new(recipient).create("tl2_promotion_message", {})
+
+    expect(Topic.last.topic_users.map(&:user_id).sort).to eq(
+      [DiscourseNarrativeBot::Base.new.discobot_user.id, recipient.id],
+    )
+  end
 end
diff --git a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb
index 500a0b68af0..37654e5886e 100644
--- a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb
@@ -286,22 +286,27 @@ RSpec.describe DiscourseNarrativeBot::NewUserNarrative do
         )
       end
 
-      it "should create the right reply when the bookmark is created" do
-        post.update!(user: discobot_user)
-        narrative.expects(:enqueue_timeout_job).with(user)
-
-        narrative.input(:bookmark, user, post: post)
-        new_post = Post.last
-        profile_page_url = "#{Discourse.base_url}/u/#{user.username}"
-
-        expected_raw = <<~RAW
+      context "when the bookmark is created" do
+        let(:profile_page_url) { "#{Discourse.base_url_no_prefix}/prefix/u/#{user.username}" }
+        let(:new_post) { Post.last }
+        let(:user_state) { narrative.get_data(user)[:state].to_sym }
+        let(:expected_raw) { <<~RAW }
           #{I18n.t("discourse_narrative_bot.new_user_narrative.bookmark.reply", bookmark_url: "#{profile_page_url}/activity/bookmarks", base_uri: "")}
 
           #{I18n.t("discourse_narrative_bot.new_user_narrative.onebox.instructions", base_uri: "")}
         RAW
 
-        expect(new_post.raw).to eq(expected_raw.chomp)
-        expect(narrative.get_data(user)[:state].to_sym).to eq(:tutorial_onebox)
+        before do
+          set_subfolder("/prefix")
+          post.update!(user: discobot_user)
+          narrative.stubs(:enqueue_timeout_job).with(user)
+        end
+
+        it "creates the right reply" do
+          narrative.input(:bookmark, user, post: post)
+          expect(new_post.raw).to eq(expected_raw.chomp)
+          expect(user_state).to eq(:tutorial_onebox)
+        end
       end
 
       it "should skip tutorials in SiteSetting.discourse_narrative_bot_skip_tutorials" do
diff --git a/plugins/discourse-presence/plugin.rb b/plugins/discourse-presence/plugin.rb
index ff8af8d663f..42919c143a6 100644
--- a/plugins/discourse-presence/plugin.rb
+++ b/plugins/discourse-presence/plugin.rb
@@ -57,8 +57,8 @@ after_initialize do
         ]
       end
 
-      if !topic.private_message? && SiteSetting.trusted_users_can_edit_others?
-        config.allowed_group_ids << Group::AUTO_GROUPS[:trust_level_4]
+      if !topic.private_message? && SiteSetting.edit_all_post_groups.present?
+        config.allowed_group_ids += SiteSetting.edit_all_post_groups.split("|").map(&:to_i)
       end
 
       if SiteSetting.enable_category_group_moderation? &&
diff --git a/plugins/discourse-presence/spec/integration/presence_spec.rb b/plugins/discourse-presence/spec/integration/presence_spec.rb
index c3a024c45f6..5a5acc14775 100644
--- a/plugins/discourse-presence/spec/integration/presence_spec.rb
+++ b/plugins/discourse-presence/spec/integration/presence_spec.rb
@@ -66,7 +66,7 @@ RSpec.describe "discourse-presence" do
     end
 
     it "handles category moderators for edit" do
-      SiteSetting.trusted_users_can_edit_others = false
+      SiteSetting.edit_all_post_groups = nil
       p = Fabricate(:post, topic: private_topic, user: private_topic.user)
 
       c = PresenceChannel.new("/discourse-presence/edit/#{p.id}")
@@ -79,6 +79,20 @@ RSpec.describe "discourse-presence" do
       expect(c.config.allowed_group_ids).to contain_exactly(Group::AUTO_GROUPS[:staff], group.id)
     end
 
+    it "adds edit_all_post_groups to the presence channel" do
+      p = Fabricate(:post, topic: public_topic, user: user)
+      g = Fabricate(:group)
+
+      SiteSetting.edit_all_post_groups = "#{Group::AUTO_GROUPS[:trust_level_1]}|#{g.id}"
+
+      c = PresenceChannel.new("/discourse-presence/edit/#{p.id}")
+      expect(c.config.allowed_group_ids).to contain_exactly(
+        Group::AUTO_GROUPS[:staff],
+        Group::AUTO_GROUPS[:trust_level_1],
+        g.id,
+      )
+    end
+
     it "handles permissions for a public topic" do
       c = PresenceChannel.new("/discourse-presence/reply/#{public_topic.id}")
       expect(c.config.public).to eq(false)
@@ -135,27 +149,13 @@ RSpec.describe "discourse-presence" do
       expect(c.config.allowed_user_ids).to contain_exactly(user.id)
     end
 
-    it "allows only author and staff when editing a public post with tl4 editing disabled" do
-      SiteSetting.trusted_users_can_edit_others = false
-
-      p = Fabricate(:post, topic: public_topic, user: user)
-      c = PresenceChannel.new("/discourse-presence/edit/#{p.id}")
-      expect(c.config.public).to eq(false)
-      expect(c.config.allowed_group_ids).to contain_exactly(Group::AUTO_GROUPS[:staff])
-      expect(c.config.allowed_user_ids).to contain_exactly(user.id)
-    end
-
     it "follows the wiki edit trust level site setting" do
       p = Fabricate(:post, topic: public_topic, user: user, wiki: true)
       SiteSetting.min_trust_to_edit_wiki_post = TrustLevel.levels[:basic]
-      SiteSetting.trusted_users_can_edit_others = false
 
       c = PresenceChannel.new("/discourse-presence/edit/#{p.id}")
       expect(c.config.public).to eq(false)
-      expect(c.config.allowed_group_ids).to contain_exactly(
-        Group::AUTO_GROUPS[:staff],
-        Group::AUTO_GROUPS[:trust_level_1],
-      )
+      expect(c.config.allowed_group_ids).to include(Group::AUTO_GROUPS[:trust_level_1])
       expect(c.config.allowed_user_ids).to contain_exactly(user.id)
     end
 
diff --git a/plugins/lazy-yt/README.md b/plugins/lazy-yt/README.md
deleted file mode 100644
index 5f0e7d7e0d1..00000000000
--- a/plugins/lazy-yt/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# lazy-yt
-
-Lazy load YouTube videos plugin for [Discourse](http://discourse.org), highly inspired by the [lazyYT](https://github.com/tylerpearson/lazyYT) jQuery plugin.
diff --git a/plugins/lazy-yt/assets/javascripts/initializers/lazyYT.js b/plugins/lazy-yt/assets/javascripts/initializers/lazyYT.js
deleted file mode 100644
index cbc4df3c684..00000000000
--- a/plugins/lazy-yt/assets/javascripts/initializers/lazyYT.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import { withPluginApi } from "discourse/lib/plugin-api";
-import initLazyYt from "../lib/lazyYT";
-
-export default {
-  name: "apply-lazyYT",
-  initialize() {
-    withPluginApi("0.1", (api) => {
-      initLazyYt($);
-      api.decorateCooked(
-        ($elem) => {
-          const iframes = $(".lazyYT", $elem);
-          if (iframes.length === 0) {
-            return;
-          }
-
-          $(".lazyYT", $elem).lazyYT({
-            onPlay(e, $el) {
-              // don't cloak posts that have playing videos in them
-              const postId = parseInt(
-                $el.closest("article").data("post-id"),
-                10
-              );
-              if (postId) {
-                api.preventCloak(postId);
-              }
-            },
-          });
-        },
-        { id: "discourse-lazyyt" }
-      );
-    });
-  },
-};
diff --git a/plugins/lazy-yt/assets/javascripts/lib/lazyYT.js b/plugins/lazy-yt/assets/javascripts/lib/lazyYT.js
deleted file mode 100644
index 467515e4ee2..00000000000
--- a/plugins/lazy-yt/assets/javascripts/lib/lazyYT.js
+++ /dev/null
@@ -1,179 +0,0 @@
-/*!
- * lazyYT (lazy load YouTube videos)
- * v1.0.1 - 2014-12-30
- * (CC) This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License.
- * http://creativecommons.org/licenses/by-sa/4.0/
- * Contributors: https://github.com/tylerpearson/lazyYT/graphs/contributors || https://github.com/daugilas/lazyYT/graphs/contributors
- *
- * Usage: <div class="lazyYT" data-youtube-id="laknj093n" data-parameters="rel=0">loading...</div>
- *
- * Note: Discourse has forked this from the original, beware when updating the file.
- *
- */
-
-import escape from "discourse-common/lib/escape";
-
-export default function initLazyYt($) {
-  "use strict";
-
-  function setUp($el, settings) {
-    let width = $el.data("width"),
-      height = $el.data("height"),
-      ratio = $el.data("ratio") ? $el.data("ratio") : settings.default_ratio,
-      id = $el.data("youtube-id"),
-      title = $el.data("youtube-title"),
-      padding_bottom,
-      innerHtml = [],
-      $thumb,
-      thumb_img,
-      youtube_parameters = $el.data("parameters") || "";
-
-    ratio = ratio.split(":");
-
-    // width and height might override default_ratio value
-    if (typeof width === "number" && typeof height === "number") {
-      $el.width(width);
-      padding_bottom = height + "px";
-    } else if (typeof width === "number") {
-      $el.width(width);
-      padding_bottom = (width * ratio[1]) / ratio[0] + "px";
-    } else {
-      width = $el.width();
-
-      // no width means that container is fluid and will be the size of its parent
-      if (width === 0) {
-        width = $el.parent().width();
-      }
-
-      padding_bottom = (ratio[1] / ratio[0]) * 100 + "%";
-    }
-
-    //
-    // This HTML will be placed inside 'lazyYT' container
-
-    innerHtml.push('<div class="ytp-thumbnail" tabIndex="0">');
-
-    // Play button from YouTube (exactly as it is in YouTube)
-    innerHtml.push('<div class="ytp-large-play-button"');
-    if (width <= 640) {
-      innerHtml.push(' style="transform: scale(0.563888888888889);"');
-    }
-    innerHtml.push(">");
-    innerHtml.push("<svg>");
-    innerHtml.push(
-      '<path fill-rule="evenodd" clip-rule="evenodd" fill="#1F1F1F" class="ytp-large-play-button-svg" d="M84.15,26.4v6.35c0,2.833-0.15,5.967-0.45,9.4c-0.133,1.7-0.267,3.117-0.4,4.25l-0.15,0.95c-0.167,0.767-0.367,1.517-0.6,2.25c-0.667,2.367-1.533,4.083-2.6,5.15c-1.367,1.4-2.967,2.383-4.8,2.95c-0.633,0.2-1.316,0.333-2.05,0.4c-0.767,0.1-1.3,0.167-1.6,0.2c-4.9,0.367-11.283,0.617-19.15,0.75c-2.434,0.034-4.883,0.067-7.35,0.1h-2.95C38.417,59.117,34.5,59.067,30.3,59c-8.433-0.167-14.05-0.383-16.85-0.65c-0.067-0.033-0.667-0.117-1.8-0.25c-0.9-0.133-1.683-0.283-2.35-0.45c-2.066-0.533-3.783-1.5-5.15-2.9c-1.033-1.067-1.9-2.783-2.6-5.15C1.317,48.867,1.133,48.117,1,47.35L0.8,46.4c-0.133-1.133-0.267-2.55-0.4-4.25C0.133,38.717,0,35.583,0,32.75V26.4c0-2.833,0.133-5.95,0.4-9.35l0.4-4.25c0.167-0.966,0.417-2.05,0.75-3.25c0.7-2.333,1.567-4.033,2.6-5.1c1.367-1.434,2.967-2.434,4.8-3c0.633-0.167,1.333-0.3,2.1-0.4c0.4-0.066,0.917-0.133,1.55-0.2c4.9-0.333,11.283-0.567,19.15-0.7C35.65,0.05,39.083,0,42.05,0L45,0.05c2.467,0,4.933,0.034,7.4,0.1c7.833,0.133,14.2,0.367,19.1,0.7c0.3,0.033,0.833,0.1,1.6,0.2c0.733,0.1,1.417,0.233,2.05,0.4c1.833,0.566,3.434,1.566,4.8,3c1.066,1.066,1.933,2.767,2.6,5.1c0.367,1.2,0.617,2.284,0.75,3.25l0.4,4.25C84,20.45,84.15,23.567,84.15,26.4z M33.3,41.4L56,29.6L33.3,17.75V41.4z"></path>'
-    );
-    innerHtml.push(
-      '<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" points="33.3,41.4 33.3,17.75 56,29.6"></polygon>'
-    );
-    innerHtml.push("</svg>");
-    innerHtml.push("</div>"); // end of .ytp-large-play-button
-
-    innerHtml.push("</div>"); // end of .ytp-thumbnail
-
-    // Video title (info bar)
-    innerHtml.push('<div class="html5-info-bar">');
-    innerHtml.push('<div class="html5-title">');
-    innerHtml.push('<div class="html5-title-text-wrapper">');
-    innerHtml.push(
-      '<a class="html5-title-text" target="_blank" tabindex="3100" href="https://www.youtube.com/watch?v=',
-      escape(id),
-      '">'
-    );
-    if (title === undefined || title === null || title === "") {
-      innerHtml.push("youtube.com/watch?v=" + escape(id));
-    } else {
-      innerHtml.push(escape(title));
-    }
-    innerHtml.push("</a>");
-    innerHtml.push("</div>"); // .html5-title
-    innerHtml.push("</div>"); // .html5-title-text-wrapper
-    innerHtml.push("</div>"); // end of Video title .html5-info-bar
-
-    let prefetchedThumbnail = $el[0].querySelector(".ytp-thumbnail-image");
-
-    $el
-      .css({
-        "padding-bottom": padding_bottom,
-      })
-      .html(innerHtml.join(""));
-
-    if (width > 640) {
-      thumb_img = "maxresdefault.jpg";
-    } else if (width > 480) {
-      thumb_img = "sddefault.jpg";
-    } else if (width > 320) {
-      thumb_img = "hqdefault.jpg";
-    } else if (width > 120) {
-      thumb_img = "mqdefault.jpg";
-    } else if (width === 0) {
-      // sometimes it fails on fluid layout
-      thumb_img = "hqdefault.jpg";
-    } else {
-      thumb_img = "default.jpg";
-    }
-
-    if (prefetchedThumbnail) {
-      $el.find(".ytp-thumbnail").append(prefetchedThumbnail);
-    } else {
-      // Fallback for old posts which were baked before the lazy-yt onebox prefetched a thumbnail
-      $el
-        .find(".ytp-thumbnail")
-        .append(
-          $(
-            [
-              '<img class="ytp-thumbnail-image" src="https://img.youtube.com/vi/',
-              escape(id),
-              "/",
-              thumb_img,
-              '">',
-            ].join("")
-          )
-        );
-    }
-
-    $thumb = $el
-      .find(".ytp-thumbnail")
-      .addClass("lazyYT-image-loaded")
-      .on("keypress click", function (e) {
-        // Only support Enter for keypress
-        if (e.type === "keypress" && e.keyCode !== 13) {
-          return;
-        }
-        e.preventDefault();
-
-        if (
-          !$el.hasClass("lazyYT-video-loaded") &&
-          $thumb.hasClass("lazyYT-image-loaded")
-        ) {
-          $el
-            .html(
-              '<iframe src="//www.youtube.com/embed/' +
-                escape(id) +
-                "?autoplay=1&" +
-                youtube_parameters +
-                '" frameborder="0" allowfullscreen></iframe>'
-            )
-            .addClass("lazyYT-video-loaded");
-        }
-
-        if (settings.onPlay) {
-          settings.onPlay(e, $el);
-        }
-      });
-  }
-
-  $.fn.lazyYT = function (newSettings) {
-    let defaultSettings = {
-      default_ratio: "16:9",
-      callback: null, // TODO: execute callback if given
-      container_class: "lazyYT-container",
-    };
-    let settings = Object.assign(defaultSettings, newSettings);
-
-    return this.each(function () {
-      let $el = $(this).addClass(settings.container_class);
-      setUp($el, settings);
-    });
-  };
-}
diff --git a/plugins/lazy-yt/assets/stylesheets/lazyYT.css b/plugins/lazy-yt/assets/stylesheets/lazyYT.css
deleted file mode 100644
index 848b57a11bd..00000000000
--- a/plugins/lazy-yt/assets/stylesheets/lazyYT.css
+++ /dev/null
@@ -1,127 +0,0 @@
-/*!
-* lazyYT (lazy load YouTube videos)
-* v1.0.1 - 2014-12-30
-* (CC) This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License.
-* http://creativecommons.org/licenses/by-sa/4.0/
-* Contributors: https://github.com/tylerpearson/lazyYT/graphs/contributors || https://github.com/daugilas/lazyYT/graphs/contributors
-*/
-
-.lazyYT-container {
-  position: relative;
-  z-index: z("base");
-  display: block;
-  height: 0;
-  padding: 0 0 56.25% 0;
-  overflow: hidden;
-  background-color: #000000;
-  margin-bottom: 12px;
-}
-
-.lazyYT-container iframe {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  border: 0;
-}
-
-/*
-* Video Title (YouTube style)
-*/
-
-.lazyYT-container .html5-info-bar {
-  position: absolute;
-  top: 0;
-  z-index: 935;
-  width: 100%;
-  height: 30px;
-  overflow: hidden;
-  font-family: Arial, sans-serif;
-  font-size: 12px;
-  color: #fff;
-  background-color: rgba(0, 0, 0, 0.8);
-  -webkit-transition: opacity 0.25s cubic-bezier(0, 0, 0.2, 1);
-  -moz-transition: opacity 0.25s cubic-bezier(0, 0, 0.2, 1);
-  transition: opacity 0.25s cubic-bezier(0, 0, 0.2, 1);
-}
-
-.lazyYT-container .html5-title {
-  padding-right: 6px;
-  padding-left: 12px;
-}
-
-.lazyYT-container .html5-title-text-wrapper {
-  overflow: hidden;
-  -o-text-overflow: ellipsis;
-  text-overflow: ellipsis;
-  word-wrap: normal;
-  white-space: nowrap;
-}
-
-.lazyYT-container .html5-title-text {
-  width: 100%;
-  font-size: 13px;
-  line-height: 30px;
-  color: #ccc;
-  text-decoration: none;
-}
-
-.lazyYT-container .html5-title-text:hover {
-  color: #fff;
-  text-decoration: underline;
-}
-
-/*
-* Thumbnail
-*/
-
-.ytp-thumbnail {
-  padding-bottom: inherit;
-  cursor: pointer;
-  background-position: 50% 50%;
-  background-repeat: no-repeat;
-  -webkit-background-size: cover;
-  -moz-background-size: cover;
-  -o-background-size: cover;
-  background-size: cover;
-}
-
-/*
-* Play button (YouTube style)
-*/
-
-.ytp-large-play-button {
-  position: absolute;
-  top: 50% !important;
-  left: 50% !important;
-  width: 86px !important;
-  height: 60px !important;
-  padding: 0 !important;
-  margin: -29px 0 0 -42px !important;
-  font-size: normal !important;
-  font-weight: normal !important;
-  line-height: 1 !important;
-  opacity: 0.9;
-  z-index: 935;
-}
-
-.ytp-large-play-button-svg {
-  opacity: 0.9;
-  fill: #1f1f1f;
-}
-
-.lazyYT-image-loaded:hover .ytp-large-play-button-svg,
-.lazyYT-image-loaded:focus .ytp-large-play-button-svg,
-.ytp-large-play-button:focus .ytp-large-play-button-svg {
-  opacity: 1;
-  fill: #cc181e;
-}
-
-.ytp-thumbnail-image {
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  object-fit: cover;
-}
diff --git a/plugins/lazy-yt/assets/stylesheets/lazyYT_mobile.scss b/plugins/lazy-yt/assets/stylesheets/lazyYT_mobile.scss
deleted file mode 100644
index 149a8d9b84f..00000000000
--- a/plugins/lazy-yt/assets/stylesheets/lazyYT_mobile.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.lazyYT {
-  max-width: 100%;
-}
diff --git a/plugins/lazy-yt/config/locales/server.en.yml b/plugins/lazy-yt/config/locales/server.en.yml
deleted file mode 100644
index 1ac0bee45f9..00000000000
--- a/plugins/lazy-yt/config/locales/server.en.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-en:
-  site_settings:
-    lazy_yt_enabled: "Enable the LazyYT plugin"
diff --git a/plugins/lazy-yt/config/settings.yml b/plugins/lazy-yt/config/settings.yml
deleted file mode 100644
index cca346d5df1..00000000000
--- a/plugins/lazy-yt/config/settings.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-plugins:
-  lazy_yt_enabled:
-    default: true
-    client: false
-    hidden: true
diff --git a/plugins/lazy-yt/plugin.rb b/plugins/lazy-yt/plugin.rb
deleted file mode 100644
index 30beccd7fa5..00000000000
--- a/plugins/lazy-yt/plugin.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-# frozen_string_literal: true
-
-# name: lazy-yt
-# about: Uses the lazyYT plugin to lazy load Youtube videos
-# version: 1.0.1
-# authors: Arpit Jalan
-# url: https://github.com/discourse/discourse/tree/main/plugins/lazy-yt
-
-hide_plugin if self.respond_to?(:hide_plugin)
-enabled_site_setting :lazy_yt_enabled
-
-require "onebox"
-
-# stylesheet
-register_asset "stylesheets/lazyYT.css"
-register_asset "stylesheets/lazyYT_mobile.scss", :mobile
-
-# freedom patch YouTube Onebox
-class Onebox::Engine::YoutubeOnebox
-  include Onebox::Engine
-  alias_method :yt_onebox_to_html, :to_html
-
-  def to_html
-    if video_id && !params["list"]
-      size_restricted = [params["width"], params["height"]].any?
-      video_width = (params["width"] && params["width"].to_i <= 695) ? params["width"] : 690 # embed width
-      video_height = (params["height"] && params["height"].to_i <= 500) ? params["height"] : 388 # embed height
-      size_tags = ["width=\"#{video_width}\"", "height=\"#{video_height}\""]
-
-      result = parse_embed_response
-      result ||= get_opengraph.data
-
-      thumbnail_url = result[:image] || "https://img.youtube.com/vi/#{video_id}/hqdefault.jpg"
-
-      # Put in the LazyYT div instead of the iframe
-      escaped_title = ERB::Util.html_escape(video_title)
-
-      <<~HTML
-      <div class="onebox lazyYT lazyYT-container"
-           data-youtube-id="#{video_id}"
-           data-youtube-title="#{escaped_title}"
-           #{size_restricted ? size_tags.map { |t| "data-#{t}" }.join(" ") : ""}
-           data-parameters="#{embed_params}">
-        <a href="https://www.youtube.com/watch?v=#{video_id}" target="_blank">
-          <img class="ytp-thumbnail-image"
-               src="#{thumbnail_url}"
-               #{size_restricted ? size_tags.join(" ") : ""}
-               title="#{escaped_title}">
-        </a>
-      </div>
-      HTML
-    else
-      yt_onebox_to_html
-    end
-  end
-end
-
-after_initialize do
-  on(:reduce_cooked) do |fragment|
-    fragment
-      .css(".lazyYT")
-      .each do |yt|
-        begin
-          youtube_id = yt["data-youtube-id"]
-          parameters = yt["data-parameters"]
-          uri = URI("https://www.youtube.com/embed/#{youtube_id}?autoplay=1&#{parameters}")
-          yt.replace %{<p><a href="#{uri.to_s}">https://#{uri.host}#{uri.path}</a></p>}
-        rescue URI::InvalidURIError
-          # remove any invalid/weird URIs
-          yt.remove
-        end
-      end
-  end
-end
diff --git a/plugins/poll/assets/javascripts/discourse/components/modal/poll-breakdown.hbs b/plugins/poll/assets/javascripts/discourse/components/modal/poll-breakdown.hbs
new file mode 100644
index 00000000000..218405dd995
--- /dev/null
+++ b/plugins/poll/assets/javascripts/discourse/components/modal/poll-breakdown.hbs
@@ -0,0 +1,76 @@
+{{! template-lint-disable no-invalid-interactive }}
+<DModal @title={{i18n "poll.breakdown.title"}} class="has-tabs">
+  <:headerBelowTitle>
+    <ul class="modal-tabs">
+      <li
+        class={{concat-class
+          "modal-tab percentage"
+          (if (eq this.displayMode "percentage") "active")
+        }}
+        {{on "click" (fn (mut this.displayMode) "percentage")}}
+      >{{i18n "poll.breakdown.percentage"}}</li>
+      <li
+        class={{concat-class
+          "modal-tab count"
+          (if (eq this.displayMode "count") "active")
+        }}
+        {{on "click" (fn (mut this.displayMode) "count")}}
+      >{{i18n "poll.breakdown.count"}}</li>
+    </ul>
+  </:headerBelowTitle>
+  <:body>
+    <div class="poll-breakdown-sidebar">
+      <p class="poll-breakdown-title">
+        {{this.title}}
+      </p>
+
+      <div class="poll-breakdown-total-votes">{{i18n
+          "poll.breakdown.votes"
+          count=this.model.poll.voters
+        }}</div>
+
+      <ul class="poll-breakdown-options">
+        {{#each this.model.poll.options as |option index|}}
+          <PollBreakdownOption
+            @option={{option}}
+            @index={{index}}
+            @totalVotes={{this.totalVotes}}
+            @optionsCount={{this.model.poll.options.length}}
+            @displayMode={{this.displayMode}}
+            @highlightedOption={{this.highlightedOption}}
+            @onMouseOver={{fn (mut this.highlightedOption) index}}
+            @onMouseOut={{fn (mut this.highlightedOption) null}}
+          />
+        {{/each}}
+      </ul>
+    </div>
+
+    <div class="poll-breakdown-body">
+      <div class="poll-breakdown-body-header">
+        <label class="poll-breakdown-body-header-label">{{i18n
+            "poll.breakdown.breakdown"
+          }}</label>
+
+        <ComboBox
+          @content={{this.groupableUserFields}}
+          @value={{this.groupedBy}}
+          @nameProperty="label"
+          @class="poll-breakdown-dropdown"
+          @onChange={{action this.setGrouping}}
+        />
+      </div>
+
+      <div class="poll-breakdown-charts">
+        {{#each this.charts as |chart|}}
+          <PollBreakdownChart
+            @group={{get chart "group"}}
+            @options={{get chart "options"}}
+            @displayMode={{this.displayMode}}
+            @highlightedOption={{this.highlightedOption}}
+            @setHighlightedOption={{fn (mut this.highlightedOption)}}
+          />
+        {{/each}}
+      </div>
+    </div>
+  </:body>
+</DModal>
\ No newline at end of file
diff --git a/plugins/poll/assets/javascripts/controllers/poll-breakdown.js b/plugins/poll/assets/javascripts/discourse/components/modal/poll-breakdown.js
similarity index 83%
rename from plugins/poll/assets/javascripts/controllers/poll-breakdown.js
rename to plugins/poll/assets/javascripts/discourse/components/modal/poll-breakdown.js
index 1361dbd5673..0cd13fa67fa 100644
--- a/plugins/poll/assets/javascripts/controllers/poll-breakdown.js
+++ b/plugins/poll/assets/javascripts/discourse/components/modal/poll-breakdown.js
@@ -1,6 +1,6 @@
-import Controller from "@ember/controller";
+import { inject as service } from "@ember/service";
+import Component from "@ember/component";
 import I18n from "I18n";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { action } from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import { classify } from "@ember/string";
@@ -8,20 +8,30 @@ import discourseComputed from "discourse-common/utils/decorators";
 import { htmlSafe } from "@ember/template";
 import loadScript from "discourse/lib/load-script";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import { inject as service } from "@ember/service";
 
-export default Controller.extend(ModalFunctionality, {
-  dialog: service(),
-  model: null,
-  charts: null,
-  groupedBy: null,
-  highlightedOption: null,
-  displayMode: "percentage",
+export default class PollBreakdownModal extends Component {
+  @service dialog;
+
+  model = null;
+  charts = null;
+  groupedBy = null;
+  highlightedOption = null;
+  displayMode = "percentage";
+
+  init() {
+    this.set("groupedBy", this.model.groupableUserFields[0]);
+    loadScript("/javascripts/Chart.min.js")
+      .then(() => loadScript("/javascripts/chartjs-plugin-datalabels.min.js"))
+      .then(() => {
+        this.fetchGroupedPollData();
+      });
+    super.init(...arguments);
+  }
 
   @discourseComputed("model.poll.title", "model.post.topic.title")
   title(pollTitle, topicTitle) {
     return pollTitle ? htmlSafe(pollTitle) : topicTitle;
-  },
+  }
 
   @discourseComputed("model.groupableUserFields")
   groupableUserFields(fields) {
@@ -34,24 +44,12 @@ export default Controller.extend(ModalFunctionality, {
 
       return { id: field, label: transformed.join(" ") };
     });
-  },
+  }
 
   @discourseComputed("model.poll.options")
   totalVotes(options) {
     return options.reduce((sum, option) => sum + option.votes, 0);
-  },
-
-  onShow() {
-    this.set("charts", null);
-    this.set("displayMode", "percentage");
-    this.set("groupedBy", this.model.groupableUserFields[0]);
-
-    loadScript("/javascripts/Chart.min.js")
-      .then(() => loadScript("/javascripts/chartjs-plugin-datalabels.min.js"))
-      .then(() => {
-        this.fetchGroupedPollData();
-      });
-  },
+  }
 
   fetchGroupedPollData() {
     return ajax("/polls/grouped_poll_results.json", {
@@ -75,16 +73,16 @@ export default Controller.extend(ModalFunctionality, {
 
         this.set("charts", result.grouped_results);
       });
-  },
+  }
 
   @action
   setGrouping(value) {
     this.set("groupedBy", value);
     this.fetchGroupedPollData();
-  },
+  }
 
   @action
   onSelectPanel(panel) {
     this.set("displayMode", panel.id);
-  },
-});
+  }
+}
diff --git a/plugins/poll/assets/javascripts/discourse/components/modal/poll-ui-builder.hbs b/plugins/poll/assets/javascripts/discourse/components/modal/poll-ui-builder.hbs
new file mode 100644
index 00000000000..0955f70b3ff
--- /dev/null
+++ b/plugins/poll/assets/javascripts/discourse/components/modal/poll-ui-builder.hbs
@@ -0,0 +1,251 @@
+<DModal
+  @title={{i18n "poll.ui_builder.title"}}
+  @closeModal={{@closeModal}}
+  @inline={{@inline}}
+  class="poll-ui-builder"
+>
+  <:body>
+    <div class="input-group poll-type">
+      <a
+        href
+        {{on "click" (fn this.updatePollType "regular")}}
+        class="poll-type-value poll-type-value-regular
+          {{if this.isRegular 'active'}}"
+      >
+        {{i18n "poll.ui_builder.poll_type.regular"}}
+      </a>
+
+      <a
+        href
+        {{on "click" (fn this.updatePollType "multiple")}}
+        class="poll-type-value poll-type-value-multiple
+          {{if this.isMultiple 'active'}}"
+      >
+        {{i18n "poll.ui_builder.poll_type.multiple"}}
+      </a>
+
+      {{#if this.showNumber}}
+        <a
+          href
+          {{on "click" (fn this.updatePollType "number")}}
+          class="poll-type-value poll-type-value-number
+            {{if this.isNumber 'active'}}"
+        >
+          {{i18n "poll.ui_builder.poll_type.number"}}
+        </a>
+      {{/if}}
+    </div>
+
+    {{#if this.showAdvanced}}
+      <div class="input-group poll-title">
+        <label class="input-group-label">{{i18n
+            "poll.ui_builder.poll_title.label"
+          }}</label>
+        <Input @value={{this.pollTitle}} />
+      </div>
+    {{/if}}
+
+    {{#unless this.isNumber}}
+      <div class="poll-options">
+        {{#if this.showAdvanced}}
+          <label class="input-group-label">{{i18n
+              "poll.ui_builder.poll_options.label"
+            }}</label>
+          <Textarea
+            @value={{this.pollOptionsText}}
+            {{on "input" (action "onOptionsTextChange")}}
+          />
+          {{#if this.showMinNumOfOptionsValidation}}
+            {{#unless this.minNumOfOptionsValidation.ok}}
+              <InputTip @validation={{this.minNumOfOptionsValidation}} />
+            {{/unless}}
+          {{/if}}
+        {{else}}
+          {{#each this.pollOptions as |option|}}
+            <div class="input-group poll-option-value">
+              <Input
+                @value={{option.value}}
+                @enter={{action "addOption" option}}
+              />
+              {{#if this.canRemoveOption}}
+                <DButton
+                  @icon="trash-alt"
+                  @action={{action "removeOption" option}}
+                />
+              {{/if}}
+            </div>
+          {{/each}}
+
+          <div class="poll-option-controls">
+            <DButton
+              class="btn-default poll-option-add"
+              @icon="plus"
+              @label="poll.ui_builder.poll_options.add"
+              @action={{action "addOption" this.pollOptions.lastObject}}
+            />
+            {{#if
+              (and
+                this.showMinNumOfOptionsValidation
+                (not this.minNumOfOptionsValidation.ok)
+              )
+            }}
+              <InputTip @validation={{this.minNumOfOptionsValidation}} />
+            {{/if}}
+          </div>
+        {{/if}}
+      </div>
+    {{/unless}}
+
+    {{#unless this.isRegular}}
+      <div class="options">
+        <div class="input-group poll-number">
+          <label class="input-group-label">{{i18n
+              "poll.ui_builder.poll_config.min"
+            }}</label>
+          <Input
+            @type="number"
+            @value={{this.pollMin}}
+            class="poll-options-min"
+            min="1"
+          />
+        </div>
+
+        <div class="input-group poll-number">
+          <label class="input-group-label">{{i18n
+              "poll.ui_builder.poll_config.max"
+            }}</label>
+          <Input
+            @type="number"
+            @value={{this.pollMax}}
+            class="poll-options-max"
+            min="1"
+          />
+        </div>
+
+        {{#if this.isNumber}}
+          <div class="input-group poll-number">
+            <label class="input-group-label">{{i18n
+                "poll.ui_builder.poll_config.step"
+              }}</label>
+            <Input
+              @type="number"
+              @value={{this.pollStep}}
+              min="1"
+              class="poll-options-step"
+            />
+          </div>
+        {{/if}}
+      </div>
+
+      {{#unless this.minMaxValueValidation.ok}}
+        <InputTip @validation={{this.minMaxValueValidation}} />
+      {{/unless}}
+    {{/unless}}
+
+    {{#if this.showAdvanced}}
+      <div class="input-group poll-allowed-groups">
+        <label class="input-group-label">{{i18n
+            "poll.ui_builder.poll_groups.label"
+          }}</label>
+        <GroupChooser
+          @content={{this.siteGroups}}
+          @value={{this.pollGroups}}
+          @onChange={{action (mut this.pollGroups)}}
+          @labelProperty="name"
+          @valueProperty="name"
+        />
+      </div>
+
+      <div class="input-group poll-date">
+        <label class="input-group-label">{{i18n
+            "poll.ui_builder.automatic_close.label"
+          }}</label>
+        <DateTimeInput
+          @date={{this.pollAutoClose}}
+          @onChange={{action (mut this.pollAutoClose)}}
+          @clearable={{true}}
+          @useGlobalPickerContainer={{true}}
+        />
+      </div>
+
+      <div class="input-group poll-select">
+        <label class="input-group-label">{{i18n
+            "poll.ui_builder.poll_result.label"
+          }}</label>
+        <ComboBox
+          @content={{this.pollResults}}
+          @value={{this.pollResult}}
+          @class="poll-result"
+          @valueProperty="value"
+          @onChange={{action (mut this.pollResult)}}
+        />
+      </div>
+
+      {{#unless this.isNumber}}
+        <div class="input-group poll-select column">
+          <label class="input-group-label">{{i18n
+              "poll.ui_builder.poll_chart_type.label"
+            }}</label>
+
+          <div class="radio-group">
+            <RadioButton
+              @id="poll-chart-type-bar"
+              @name="poll-chart-type"
+              @value="bar"
+              @selection={{this.chartType}}
+            />
+            <label for="poll-chart-type-bar">{{d-icon "chart-bar"}}
+              {{i18n "poll.ui_builder.poll_chart_type.bar"}}</label>
+          </div>
+
+          <div class="radio-group">
+            <RadioButton
+              @id="poll-chart-type-pie"
+              @name="poll-chart-type"
+              @value="pie"
+              @selection={{this.chartType}}
+            />
+            <label for="poll-chart-type-pie">{{d-icon "chart-pie"}}
+              {{i18n "poll.ui_builder.poll_chart_type.pie"}}</label>
+          </div>
+        </div>
+      {{/unless}}
+
+      {{#unless this.isPie}}
+        <div class="input-group poll-checkbox column">
+          <label>
+            <Input
+              @type="checkbox"
+              @checked={{this.publicPoll}}
+              class="poll-toggle-public"
+            />
+            {{i18n "poll.ui_builder.poll_public.label"}}
+          </label>
+        </div>
+      {{/unless}}
+    {{/if}}
+  </:body>
+  <:footer>
+    <DButton
+      @action={{action "insertPoll"}}
+      @icon="chart-bar"
+      class="btn-primary insert-poll"
+      @label="poll.ui_builder.insert"
+      @disabled={{this.disableInsert}}
+    />
+
+    <DButton @label="cancel" @class="btn-flat" @action={{@closeModal}} />
+
+    <DButton
+      @action={{action "toggleAdvanced"}}
+      class="btn-default show-advanced"
+      @icon="cog"
+      @title={{if
+        this.showAdvanced
+        "poll.ui_builder.hide_advanced"
+        "poll.ui_builder.show_advanced"
+      }}
+    />
+
+  </:footer>
+</DModal>
\ No newline at end of file
diff --git a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js b/plugins/poll/assets/javascripts/discourse/components/modal/poll-ui-builder.js
similarity index 86%
rename from plugins/poll/assets/javascripts/controllers/poll-ui-builder.js
rename to plugins/poll/assets/javascripts/discourse/components/modal/poll-ui-builder.js
index ad199be1a3f..f05f3f5ece9 100644
--- a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js
+++ b/plugins/poll/assets/javascripts/discourse/components/modal/poll-ui-builder.js
@@ -1,9 +1,9 @@
-import Controller from "@ember/controller";
-import EmberObject, { action } from "@ember/object";
 import { gt, or } from "@ember/object/computed";
+import Component from "@ember/component";
+import EmberObject, { action } from "@ember/object";
 import { next } from "@ember/runloop";
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
+import discourseComputed from "discourse-common/utils/decorators";
+import { observes } from "@ember-decorators/object";
 import I18n from "I18n";
 
 export const BAR_CHART_TYPE = "bar";
@@ -18,42 +18,26 @@ const VOTE_POLL_RESULT = "on_vote";
 const CLOSED_POLL_RESULT = "on_close";
 const STAFF_POLL_RESULT = "staff_only";
 
-export default Controller.extend(ModalFunctionality, {
-  showAdvanced: false,
+export default class PollUiBuilderModal extends Component {
+  showAdvanced = false;
+  pollType = REGULAR_POLL_TYPE;
+  pollTitle;
+  pollOptions = [EmberObject.create({ value: "" })];
+  pollOptionsText = "";
+  pollMin = 1;
+  pollMax = 2;
+  pollStep = 1;
+  pollGroups;
+  pollAutoClose;
+  pollResult = ALWAYS_POLL_RESULT;
+  chartType = BAR_CHART_TYPE;
+  publicPoll = false;
 
-  pollType: REGULAR_POLL_TYPE,
-  pollTitle: "",
-  pollOptions: null,
-  pollOptionsText: null,
-  pollMin: 1,
-  pollMax: 2,
-  pollStep: 1,
-  pollGroups: null,
-  pollAutoClose: null,
-  pollResult: ALWAYS_POLL_RESULT,
-  chartType: BAR_CHART_TYPE,
-  publicPoll: null,
+  @or("showAdvanced", "isNumber") showNumber;
+  @gt("pollOptions.length", 1) canRemoveOption;
 
-  onShow() {
-    this.setProperties({
-      showAdvanced: false,
-      pollType: REGULAR_POLL_TYPE,
-      pollTitle: null,
-      pollOptions: [EmberObject.create({ value: "" })],
-      pollOptionsText: "",
-      pollMin: 1,
-      pollMax: 2,
-      pollStep: 1,
-      pollGroups: null,
-      pollAutoClose: null,
-      pollResult: ALWAYS_POLL_RESULT,
-      chartType: BAR_CHART_TYPE,
-      publicPoll: false,
-    });
-  },
-
-  @discourseComputed
-  pollResults() {
+  @discourseComputed("currentUser.staff")
+  pollResults(staff) {
     const options = [
       {
         name: I18n.t("poll.ui_builder.poll_result.always"),
@@ -69,7 +53,7 @@ export default Controller.extend(ModalFunctionality, {
       },
     ];
 
-    if (this.get("currentUser.staff")) {
+    if (staff) {
       options.push({
         name: I18n.t("poll.ui_builder.poll_result.staff"),
         value: STAFF_POLL_RESULT,
@@ -77,43 +61,39 @@ export default Controller.extend(ModalFunctionality, {
     }
 
     return options;
-  },
+  }
 
   @discourseComputed("pollType")
   isRegular(pollType) {
     return pollType === REGULAR_POLL_TYPE;
-  },
+  }
 
   @discourseComputed("pollType")
   isNumber(pollType) {
     return pollType === NUMBER_POLL_TYPE;
-  },
+  }
 
   @discourseComputed("pollType")
   isMultiple(pollType) {
     return pollType === MULTIPLE_POLL_TYPE;
-  },
-
-  showNumber: or("showAdvanced", "isNumber"),
+  }
 
   @discourseComputed("pollOptions.@each.value")
   pollOptionsCount(pollOptions) {
     return (pollOptions || []).filter((option) => option.value.length > 0)
       .length;
-  },
+  }
 
   @discourseComputed("site.groups")
   siteGroups(groups) {
     // prevents group "everyone" to be listed
     return groups.filter((g) => g.id !== 0);
-  },
+  }
 
   @discourseComputed("chartType", "pollType")
   isPie(chartType, pollType) {
     return pollType !== NUMBER_POLL_TYPE && chartType === PIE_CHART_TYPE;
-  },
-
-  canRemoveOption: gt("pollOptions.length", 1),
+  }
 
   @observes("pollType", "pollOptionsCount")
   _setPollMinMax() {
@@ -136,7 +116,7 @@ export default Controller.extend(ModalFunctionality, {
     } else if (this.isNumber) {
       this.set("pollMax", this.siteSettings.poll_maximum_options);
     }
-  },
+  }
 
   @discourseComputed(
     "pollType",
@@ -167,7 +147,7 @@ export default Controller.extend(ModalFunctionality, {
     let pollHeader = "[poll";
     let output = "";
 
-    const match = this.toolbarEvent
+    const match = this.model.toolbarEvent
       .getText()
       .match(/\[poll(\s+name=[^\s\]]+)*.*\]/gim);
 
@@ -225,7 +205,7 @@ export default Controller.extend(ModalFunctionality, {
 
     output += "[/poll]\n";
     return output;
-  },
+  }
 
   @discourseComputed("isNumber", "pollOptionsCount")
   minNumOfOptionsValidation(isNumber, pollOptionsCount) {
@@ -250,12 +230,12 @@ export default Controller.extend(ModalFunctionality, {
     }
 
     return EmberObject.create(options);
-  },
+  }
 
   @discourseComputed("pollOptions.@each.value")
   showMinNumOfOptionsValidation(pollOptions) {
     return pollOptions.length !== 1 || pollOptions[0].value !== "";
-  },
+  }
 
   @discourseComputed(
     "isMultiple",
@@ -326,19 +306,19 @@ export default Controller.extend(ModalFunctionality, {
     }
 
     return EmberObject.create({ ok: true });
-  },
+  }
 
   @discourseComputed("minMaxValueValidation", "minNumOfOptionsValidation")
   disableInsert(minMaxValueValidation, minNumOfOptionsValidation) {
     return !minMaxValueValidation.ok || !minNumOfOptionsValidation.ok;
-  },
+  }
 
   _comboboxOptions(startIndex, endIndex) {
     return [...Array(endIndex - startIndex).keys()].map((number) => ({
       value: number + startIndex,
       name: number + startIndex,
     }));
-  },
+  }
 
   @action
   onOptionsTextChange(e) {
@@ -349,13 +329,13 @@ export default Controller.extend(ModalFunctionality, {
         .split("\n")
         .map((value) => EmberObject.create({ idx: idx++, value }))
     );
-  },
+  }
 
   @action
   insertPoll() {
-    this.toolbarEvent.addText(this.pollOutput);
-    this.send("closeModal");
-  },
+    this.model.toolbarEvent.addText(this.pollOutput);
+    this.closeModal();
+  }
 
   @action
   toggleAdvanced() {
@@ -366,7 +346,7 @@ export default Controller.extend(ModalFunctionality, {
         this.pollOptions.map((x) => x.value).join("\n")
       );
     }
-  },
+  }
 
   @action
   addOption(beforeOption, value, e) {
@@ -392,16 +372,16 @@ export default Controller.extend(ModalFunctionality, {
     if (e) {
       e.preventDefault();
     }
-  },
+  }
 
   @action
   removeOption(option) {
     this.pollOptions.removeObject(option);
-  },
+  }
 
   @action
   updatePollType(pollType, event) {
     event?.preventDefault();
     this.set("pollType", pollType);
-  },
-});
+  }
+}
diff --git a/plugins/poll/assets/javascripts/discourse/templates/components/poll-breakdown-chart.hbs b/plugins/poll/assets/javascripts/discourse/components/poll-breakdown-chart.hbs
similarity index 100%
rename from plugins/poll/assets/javascripts/discourse/templates/components/poll-breakdown-chart.hbs
rename to plugins/poll/assets/javascripts/discourse/components/poll-breakdown-chart.hbs
diff --git a/plugins/poll/assets/javascripts/components/poll-breakdown-chart.js b/plugins/poll/assets/javascripts/discourse/components/poll-breakdown-chart.js
similarity index 87%
rename from plugins/poll/assets/javascripts/components/poll-breakdown-chart.js
rename to plugins/poll/assets/javascripts/discourse/components/poll-breakdown-chart.js
index 20ec3b22b07..17d0aa6932d 100644
--- a/plugins/poll/assets/javascripts/components/poll-breakdown-chart.js
+++ b/plugins/poll/assets/javascripts/discourse/components/poll-breakdown-chart.js
@@ -1,61 +1,61 @@
+import { classNames } from "@ember-decorators/component";
+import { mapBy } from "@ember/object/computed";
 import Component from "@ember/component";
 import I18n from "I18n";
-import { PIE_CHART_TYPE } from "discourse/plugins/poll/controllers/poll-ui-builder";
+import { PIE_CHART_TYPE } from "../components/modal/poll-ui-builder";
 import discourseComputed from "discourse-common/utils/decorators";
 import { getColors } from "discourse/plugins/poll/lib/chart-colors";
 import { htmlSafe } from "@ember/template";
-import { mapBy } from "@ember/object/computed";
 import { next } from "@ember/runloop";
 
-export default Component.extend({
+@classNames("poll-breakdown-chart-container")
+export default class PollBreakdownChart extends Component {
   // Arguments:
-  group: null,
-  options: null,
-  displayMode: null,
-  highlightedOption: null,
-  setHighlightedOption: null,
+  group = null;
+  options = null;
+  displayMode = null;
+  highlightedOption = null;
+  setHighlightedOption = null;
 
-  classNames: "poll-breakdown-chart-container",
+  @mapBy("options", "votes") data;
 
-  _optionToSlice: null,
-  _previousHighlightedSliceIndex: null,
-  _previousDisplayMode: null,
-
-  data: mapBy("options", "votes"),
+  _optionToSlice = null;
+  _previousHighlightedSliceIndex = null;
+  _previousDisplayMode = null;
 
   init() {
-    this._super(...arguments);
+    super.init(...arguments);
     this._optionToSlice = {};
-  },
+  }
 
   didInsertElement() {
-    this._super(...arguments);
+    super.didInsertElement(...arguments);
 
     const canvas = this.element.querySelector("canvas");
     this._chart = new window.Chart(canvas.getContext("2d"), this.chartConfig);
-  },
+  }
 
   didReceiveAttrs() {
-    this._super(...arguments);
+    super.didReceiveAttrs(...arguments);
 
     if (this._chart) {
       this._updateDisplayMode();
       this._updateHighlight();
     }
-  },
+  }
 
   willDestroy() {
-    this._super(...arguments);
+    super.willDestroy(...arguments);
 
     if (this._chart) {
       this._chart.destroy();
     }
-  },
+  }
 
   @discourseComputed("optionColors", "index")
   colorStyle(optionColors, index) {
     return htmlSafe(`background: ${optionColors[index]};`);
-  },
+  }
 
   @discourseComputed("data", "displayMode")
   chartConfig(data, displayMode) {
@@ -149,7 +149,7 @@ export default Component.extend({
         },
       },
     };
-  },
+  }
 
   _updateDisplayMode() {
     if (this.displayMode !== this._previousDisplayMode) {
@@ -160,7 +160,7 @@ export default Component.extend({
       this._chart.update();
       this._previousDisplayMode = this.displayMode;
     }
-  },
+  }
 
   _updateHighlight() {
     const meta = this._chart.getDatasetMeta(0);
@@ -186,5 +186,5 @@ export default Component.extend({
     this._previousHighlightedSliceIndex = sliceIndex;
     meta.controller.setHoverStyle(slice);
     this._chart.draw();
-  },
-});
+  }
+}
diff --git a/plugins/poll/assets/javascripts/discourse/templates/components/poll-breakdown-option.hbs b/plugins/poll/assets/javascripts/discourse/components/poll-breakdown-option.hbs
similarity index 100%
rename from plugins/poll/assets/javascripts/discourse/templates/components/poll-breakdown-option.hbs
rename to plugins/poll/assets/javascripts/discourse/components/poll-breakdown-option.hbs
diff --git a/plugins/poll/assets/javascripts/components/poll-breakdown-option.js b/plugins/poll/assets/javascripts/discourse/components/poll-breakdown-option.js
similarity index 74%
rename from plugins/poll/assets/javascripts/components/poll-breakdown-option.js
rename to plugins/poll/assets/javascripts/discourse/components/poll-breakdown-option.js
index c63d9f45c14..354e9c37327 100644
--- a/plugins/poll/assets/javascripts/components/poll-breakdown-option.js
+++ b/plugins/poll/assets/javascripts/discourse/components/poll-breakdown-option.js
@@ -1,37 +1,37 @@
+import { tagName } from "@ember-decorators/component";
+import { equal } from "@ember/object/computed";
 import Component from "@ember/component";
 import I18n from "I18n";
 import { action } from "@ember/object";
 import discourseComputed from "discourse-common/utils/decorators";
-import { equal } from "@ember/object/computed";
 import { getColors } from "discourse/plugins/poll/lib/chart-colors";
 import { htmlSafe } from "@ember/template";
 import { propertyEqual } from "discourse/lib/computed";
 
-export default Component.extend({
+@tagName("")
+export default class PollBreakdownOption extends Component {
   // Arguments:
-  option: null,
-  index: null,
-  totalVotes: null,
-  optionsCount: null,
-  displayMode: null,
-  highlightedOption: null,
-  onMouseOver: null,
-  onMouseOut: null,
+  option = null;
+  index = null;
+  totalVotes = null;
+  optionsCount = null;
+  displayMode = null;
+  highlightedOption = null;
+  onMouseOver = null;
+  onMouseOut = null;
 
-  tagName: "",
-
-  highlighted: propertyEqual("highlightedOption", "index"),
-  showPercentage: equal("displayMode", "percentage"),
+  @propertyEqual("highlightedOption", "index") highlighted;
+  @equal("displayMode", "percentage") showPercentage;
 
   @discourseComputed("option.votes", "totalVotes")
   percent(votes, total) {
     return I18n.toNumber((votes / total) * 100.0, { precision: 1 });
-  },
+  }
 
   @discourseComputed("optionsCount")
   optionColors(optionsCount) {
     return getColors(optionsCount);
-  },
+  }
 
   @discourseComputed("highlighted")
   colorBackgroundStyle(highlighted) {
@@ -39,7 +39,7 @@ export default Component.extend({
       // TODO: Use CSS variables (#10341)
       return htmlSafe("background: rgba(0, 0, 0, 0.1);");
     }
-  },
+  }
 
   @discourseComputed("highlighted", "optionColors", "index")
   colorPreviewStyle(highlighted, optionColors, index) {
@@ -48,7 +48,7 @@ export default Component.extend({
       : optionColors[index];
 
     return htmlSafe(`background: ${color};`);
-  },
+  }
 
   @action
   onHover(active) {
@@ -57,5 +57,5 @@ export default Component.extend({
     } else {
       this.onMouseOut();
     }
-  },
-});
+  }
+}
diff --git a/plugins/poll/assets/javascripts/initializers/add-poll-ui-builder.js b/plugins/poll/assets/javascripts/discourse/initializers/add-poll-ui-builder.js
similarity index 80%
rename from plugins/poll/assets/javascripts/initializers/add-poll-ui-builder.js
rename to plugins/poll/assets/javascripts/discourse/initializers/add-poll-ui-builder.js
index ab5c59cfeae..41dea414b41 100644
--- a/plugins/poll/assets/javascripts/initializers/add-poll-ui-builder.js
+++ b/plugins/poll/assets/javascripts/discourse/initializers/add-poll-ui-builder.js
@@ -1,6 +1,7 @@
 import discourseComputed from "discourse-common/utils/decorators";
-import showModal from "discourse/lib/show-modal";
 import { withPluginApi } from "discourse/lib/plugin-api";
+import PollUiBuilder from "../components/modal/poll-ui-builder";
+import { getOwner } from "@ember/application";
 
 function initializePollUIBuilder(api) {
   api.modifyClass("controller:composer", {
@@ -22,7 +23,11 @@ function initializePollUIBuilder(api) {
 
     actions: {
       showPollBuilder() {
-        showModal("poll-ui-builder").set("toolbarEvent", this.toolbarEvent);
+        getOwner(this)
+          .lookup("service:modal")
+          .show(PollUiBuilder, {
+            model: { toolbarEvent: this.toolbarEvent },
+          });
       },
     },
   });
diff --git a/plugins/poll/assets/javascripts/initializers/extend-for-poll.js b/plugins/poll/assets/javascripts/discourse/initializers/extend-for-poll.js
similarity index 96%
rename from plugins/poll/assets/javascripts/initializers/extend-for-poll.js
rename to plugins/poll/assets/javascripts/discourse/initializers/extend-for-poll.js
index a22b322130e..109fc1a081d 100644
--- a/plugins/poll/assets/javascripts/initializers/extend-for-poll.js
+++ b/plugins/poll/assets/javascripts/discourse/initializers/extend-for-poll.js
@@ -134,6 +134,11 @@ function initializePolls(api) {
     id: "discourse-poll",
   });
   api.cleanupStream(cleanUpPolls);
+
+  const siteSettings = api.container.lookup("site-settings:main");
+  if (siteSettings.poll_enabled) {
+    api.addSearchSuggestion("in:polls");
+  }
 }
 
 export default {
diff --git a/plugins/poll/assets/javascripts/discourse/templates/modal/poll-breakdown.hbs b/plugins/poll/assets/javascripts/discourse/templates/modal/poll-breakdown.hbs
deleted file mode 100644
index 4753fa89d56..00000000000
--- a/plugins/poll/assets/javascripts/discourse/templates/modal/poll-breakdown.hbs
+++ /dev/null
@@ -1,55 +0,0 @@
-<DModalBody @title="poll.breakdown.title">
-  <div class="poll-breakdown-sidebar">
-    <p class="poll-breakdown-title">
-      {{this.title}}
-    </p>
-
-    <div class="poll-breakdown-total-votes">{{i18n
-        "poll.breakdown.votes"
-        count=this.model.poll.voters
-      }}</div>
-
-    <ul class="poll-breakdown-options">
-      {{#each this.model.poll.options as |option index|}}
-        <PollBreakdownOption
-          @option={{option}}
-          @index={{index}}
-          @totalVotes={{this.totalVotes}}
-          @optionsCount={{this.model.poll.options.length}}
-          @displayMode={{this.displayMode}}
-          @highlightedOption={{this.highlightedOption}}
-          @onMouseOver={{fn (mut this.highlightedOption) index}}
-          @onMouseOut={{fn (mut this.highlightedOption) null}}
-        />
-      {{/each}}
-    </ul>
-  </div>
-
-  <div class="poll-breakdown-body">
-    <div class="poll-breakdown-body-header">
-      <label class="poll-breakdown-body-header-label">{{i18n
-          "poll.breakdown.breakdown"
-        }}</label>
-
-      <ComboBox
-        @content={{this.groupableUserFields}}
-        @value={{this.groupedBy}}
-        @nameProperty="label"
-        @class="poll-breakdown-dropdown"
-        @onChange={{action this.setGrouping}}
-      />
-    </div>
-
-    <div class="poll-breakdown-charts">
-      {{#each this.charts as |chart|}}
-        <PollBreakdownChart
-          @group={{get chart "group"}}
-          @options={{get chart "options"}}
-          @displayMode={{this.displayMode}}
-          @highlightedOption={{this.highlightedOption}}
-          @setHighlightedOption={{fn (mut this.highlightedOption)}}
-        />
-      {{/each}}
-    </div>
-  </div>
-</DModalBody>
\ No newline at end of file
diff --git a/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs b/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
deleted file mode 100644
index 41a2fff5d05..00000000000
--- a/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
+++ /dev/null
@@ -1,244 +0,0 @@
-<DModalBody @title="poll.ui_builder.title" @class="poll-ui-builder">
-  <div class="input-group poll-type">
-    <a
-      href
-      {{on "click" (fn this.updatePollType "regular")}}
-      class="poll-type-value poll-type-value-regular
-        {{if this.isRegular 'active'}}"
-    >
-      {{i18n "poll.ui_builder.poll_type.regular"}}
-    </a>
-
-    <a
-      href
-      {{on "click" (fn this.updatePollType "multiple")}}
-      class="poll-type-value poll-type-value-multiple
-        {{if this.isMultiple 'active'}}"
-    >
-      {{i18n "poll.ui_builder.poll_type.multiple"}}
-    </a>
-
-    {{#if this.showNumber}}
-      <a
-        href
-        {{on "click" (fn this.updatePollType "number")}}
-        class="poll-type-value poll-type-value-number
-          {{if this.isNumber 'active'}}"
-      >
-        {{i18n "poll.ui_builder.poll_type.number"}}
-      </a>
-    {{/if}}
-  </div>
-
-  {{#if this.showAdvanced}}
-    <div class="input-group poll-title">
-      <label class="input-group-label">{{i18n
-          "poll.ui_builder.poll_title.label"
-        }}</label>
-      <Input @value={{this.pollTitle}} />
-    </div>
-  {{/if}}
-
-  {{#unless this.isNumber}}
-    <div class="poll-options">
-      {{#if this.showAdvanced}}
-        <label class="input-group-label">{{i18n
-            "poll.ui_builder.poll_options.label"
-          }}</label>
-        <Textarea
-          @value={{this.pollOptionsText}}
-          {{on "input" (action "onOptionsTextChange")}}
-        />
-        {{#if this.showMinNumOfOptionsValidation}}
-          {{#unless this.minNumOfOptionsValidation.ok}}
-            <InputTip @validation={{this.minNumOfOptionsValidation}} />
-          {{/unless}}
-        {{/if}}
-      {{else}}
-        {{#each this.pollOptions as |option|}}
-          <div class="input-group poll-option-value">
-            <Input
-              @value={{option.value}}
-              @enter={{action "addOption" option}}
-            />
-            {{#if this.canRemoveOption}}
-              <DButton
-                @icon="trash-alt"
-                @action={{action "removeOption" option}}
-              />
-            {{/if}}
-          </div>
-        {{/each}}
-
-        <div class="poll-option-controls">
-          <DButton
-            @class="btn-default"
-            @icon="plus"
-            @label="poll.ui_builder.poll_options.add"
-            @action={{action "addOption" this.pollOptions.lastObject}}
-          />
-          {{#if
-            (and
-              this.showMinNumOfOptionsValidation
-              (not this.minNumOfOptionsValidation.ok)
-            )
-          }}
-            <InputTip @validation={{this.minNumOfOptionsValidation}} />
-          {{/if}}
-        </div>
-      {{/if}}
-    </div>
-  {{/unless}}
-
-  {{#unless this.isRegular}}
-    <div class="options">
-      <div class="input-group poll-number">
-        <label class="input-group-label">{{i18n
-            "poll.ui_builder.poll_config.min"
-          }}</label>
-        <Input
-          @type="number"
-          @value={{this.pollMin}}
-          class="poll-options-min"
-          min="1"
-        />
-      </div>
-
-      <div class="input-group poll-number">
-        <label class="input-group-label">{{i18n
-            "poll.ui_builder.poll_config.max"
-          }}</label>
-        <Input
-          @type="number"
-          @value={{this.pollMax}}
-          class="poll-options-max"
-          min="1"
-        />
-      </div>
-
-      {{#if this.isNumber}}
-        <div class="input-group poll-number">
-          <label class="input-group-label">{{i18n
-              "poll.ui_builder.poll_config.step"
-            }}</label>
-          <Input
-            @type="number"
-            @value={{this.pollStep}}
-            min="1"
-            class="poll-options-step"
-          />
-        </div>
-      {{/if}}
-    </div>
-
-    {{#unless this.minMaxValueValidation.ok}}
-      <InputTip @validation={{this.minMaxValueValidation}} />
-    {{/unless}}
-  {{/unless}}
-
-  {{#if this.showAdvanced}}
-    <div class="input-group poll-allowed-groups">
-      <label class="input-group-label">{{i18n
-          "poll.ui_builder.poll_groups.label"
-        }}</label>
-      <GroupChooser
-        @content={{this.siteGroups}}
-        @value={{this.pollGroups}}
-        @onChange={{action (mut this.pollGroups)}}
-        @labelProperty="name"
-        @valueProperty="name"
-      />
-    </div>
-
-    <div class="input-group poll-date">
-      <label class="input-group-label">{{i18n
-          "poll.ui_builder.automatic_close.label"
-        }}</label>
-      <DateTimeInput
-        @date={{this.pollAutoClose}}
-        @onChange={{action (mut this.pollAutoClose)}}
-        @clearable={{true}}
-        @useGlobalPickerContainer={{true}}
-      />
-    </div>
-
-    <div class="input-group poll-select">
-      <label class="input-group-label">{{i18n
-          "poll.ui_builder.poll_result.label"
-        }}</label>
-      <ComboBox
-        @content={{this.pollResults}}
-        @value={{this.pollResult}}
-        @class="poll-result"
-        @valueProperty="value"
-        @onChange={{action (mut this.pollResult)}}
-      />
-    </div>
-
-    {{#unless this.isNumber}}
-      <div class="input-group poll-select column">
-        <label class="input-group-label">{{i18n
-            "poll.ui_builder.poll_chart_type.label"
-          }}</label>
-
-        <div class="radio-group">
-          <RadioButton
-            @id="poll-chart-type-bar"
-            @name="poll-chart-type"
-            @value="bar"
-            @selection={{this.chartType}}
-          />
-          <label for="poll-chart-type-bar">{{d-icon "chart-bar"}}
-            {{i18n "poll.ui_builder.poll_chart_type.bar"}}</label>
-        </div>
-
-        <div class="radio-group">
-          <RadioButton
-            @id="poll-chart-type-pie"
-            @name="poll-chart-type"
-            @value="pie"
-            @selection={{this.chartType}}
-          />
-          <label for="poll-chart-type-pie">{{d-icon "chart-pie"}}
-            {{i18n "poll.ui_builder.poll_chart_type.pie"}}</label>
-        </div>
-      </div>
-    {{/unless}}
-
-    {{#unless this.isPie}}
-      <div class="input-group poll-checkbox column">
-        <label>
-          <Input @type="checkbox" @checked={{this.publicPoll}} />
-          {{i18n "poll.ui_builder.poll_public.label"}}
-        </label>
-      </div>
-    {{/unless}}
-  {{/if}}
-</DModalBody>
-
-<div class="modal-footer">
-  <DButton
-    @action={{action "insertPoll"}}
-    @icon="chart-bar"
-    @class="btn-primary"
-    @label="poll.ui_builder.insert"
-    @disabled={{this.disableInsert}}
-  />
-
-  <DButton
-    @label="cancel"
-    @class="btn-flat"
-    @action={{route-action "closeModal"}}
-  />
-
-  <DButton
-    @action={{action "toggleAdvanced"}}
-    @class="btn-default show-advanced"
-    @icon="cog"
-    @title={{if
-      this.showAdvanced
-      "poll.ui_builder.hide_advanced"
-      "poll.ui_builder.show_advanced"
-    }}
-  />
-</div>
\ No newline at end of file
diff --git a/plugins/poll/assets/javascripts/widgets/discourse-poll.js b/plugins/poll/assets/javascripts/discourse/widgets/discourse-poll.js
similarity index 81%
rename from plugins/poll/assets/javascripts/widgets/discourse-poll.js
rename to plugins/poll/assets/javascripts/discourse/widgets/discourse-poll.js
index a2972b84711..2fc41f9b937 100644
--- a/plugins/poll/assets/javascripts/widgets/discourse-poll.js
+++ b/plugins/poll/assets/javascripts/discourse/widgets/discourse-poll.js
@@ -1,5 +1,5 @@
 import I18n from "I18n";
-import { PIE_CHART_TYPE } from "discourse/plugins/poll/controllers/poll-ui-builder";
+import { PIE_CHART_TYPE } from "../components/modal/poll-ui-builder";
 import RawHtml from "discourse/widgets/raw-html";
 import { ajax } from "discourse/lib/ajax";
 import { avatarFor } from "discourse/widgets/post";
@@ -7,16 +7,48 @@ import { createWidget } from "discourse/widgets/widget";
 import evenRound from "discourse/plugins/poll/lib/even-round";
 import { getColors } from "discourse/plugins/poll/lib/chart-colors";
 import { h } from "virtual-dom";
-import { iconNode } from "discourse-common/lib/icon-library";
+import { iconHTML, iconNode } from "discourse-common/lib/icon-library";
 import loadScript from "discourse/lib/load-script";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { relativeAge } from "discourse/lib/formatter";
 import round from "discourse/lib/round";
-import showModal from "discourse/lib/show-modal";
 import { applyLocalDates } from "discourse/lib/local-dates";
+import hbs from "discourse/widgets/hbs-compiler";
+import PollBreakdownModal from "../components/modal/poll-breakdown";
+import { getOwner } from "@ember/application";
 
 const FETCH_VOTERS_COUNT = 25;
 
+const buttonOptionsMap = {
+  exportResults: {
+    className: "btn-default export-results",
+    label: "poll.export-results.label",
+    title: "poll.export-results.title",
+    icon: "download",
+    action: "exportResults",
+  },
+  showBreakdown: {
+    className: "btn-default show-breakdown",
+    label: "poll.breakdown.breakdown",
+    icon: "chart-pie",
+    action: "showBreakdown",
+  },
+  openPoll: {
+    className: "btn-default toggle-status",
+    label: "poll.open.label",
+    title: "poll.open.title",
+    icon: "unlock-alt",
+    action: "toggleStatus",
+  },
+  closePoll: {
+    className: "btn-default toggle-status",
+    label: "poll.close.label",
+    title: "poll.close.title",
+    icon: "lock",
+    action: "toggleStatus",
+  },
+};
+
 function optionHtml(option, siteSettings = {}) {
   const el = document.createElement("span");
   el.innerHTML = option.html;
@@ -24,12 +56,6 @@ function optionHtml(option, siteSettings = {}) {
   return new RawHtml({ html: `<span>${el.innerHTML}</span>` });
 }
 
-function infoTextHtml(text) {
-  return new RawHtml({
-    html: `<span class="info-text">${text}</span>`,
-  });
-}
-
 function checkUserGroups(user, poll) {
   const pollGroups =
     poll && poll.groups && poll.groups.split(",").map((g) => g.toLowerCase());
@@ -406,14 +432,18 @@ createWidget("discourse-poll-info", {
   },
 
   html(attrs) {
-    const { poll } = attrs;
+    const { poll, post } = attrs;
+    const closed = attrs.isClosed;
+    const isStaff = this.currentUser && this.currentUser.staff;
+    const isMe = this.currentUser && post.user_id === this.currentUser.id;
     const count = poll.voters;
     const contents = [
-      h("p", [
+      h("div.poll-info_counts-count", [
         h("span.info-number", count.toString()),
         h("span.info-label", I18n.t("poll.voters", { count })),
       ]),
     ];
+    const instructions = [];
 
     if (attrs.isMultiple) {
       if (attrs.showResults || attrs.isClosed) {
@@ -422,7 +452,7 @@ createWidget("discourse-poll-info", {
         }, 0);
 
         contents.push(
-          h("p", [
+          h("div.poll-info_counts-count", [
             h("span.info-number", totalVotes.toString()),
             h(
               "span.info-label",
@@ -437,21 +467,94 @@ createWidget("discourse-poll-info", {
           poll.options.length
         );
         if (help) {
-          contents.push(infoTextHtml(help));
+          instructions.push(
+            new RawHtml({
+              html: `<li>
+                      ${iconHTML("list-ul")}
+                      <span>${help}</span>
+                     </li>`,
+            })
+          );
         }
       }
     }
 
+    if (poll.close) {
+      const closeDate = moment.utc(poll.close, "YYYY-MM-DD HH:mm:ss Z");
+      if (closeDate.isValid()) {
+        const title = closeDate.format("LLL");
+        let label;
+        let icon;
+
+        if (attrs.isAutomaticallyClosed) {
+          const age = relativeAge(closeDate.toDate(), { addAgo: true });
+          label = I18n.t("poll.automatic_close.age", { age });
+          icon = "lock";
+        } else {
+          const timeLeft = moment().to(closeDate, true);
+          label = I18n.t("poll.automatic_close.closes_in", { timeLeft });
+          icon = "far-clock";
+        }
+
+        instructions.push(
+          new RawHtml({
+            html: `<li title="${title}">
+                    ${iconHTML(icon)}
+                    <span>${label}</span>
+                   </li>`,
+          })
+        );
+      }
+    }
+
+    let infoText;
+    if (poll.results === "on_vote" && !attrs.hasVoted && !isMe) {
+      infoText = new RawHtml({
+        html: `<li>
+                ${iconHTML("check")}
+                <span>${I18n.t("poll.results.vote.title")}</span>
+               </li>`,
+      });
+    } else if (poll.results === "on_close" && !closed) {
+      infoText = new RawHtml({
+        html: `<li>
+                ${iconHTML("lock")}
+                <span>${I18n.t("poll.results.closed.title")}</span>
+               </li>`,
+      });
+    } else if (poll.results === "staff_only" && !isStaff) {
+      infoText = new RawHtml({
+        html: `<li>
+                ${iconHTML("shield-alt")}
+                <span>${I18n.t("poll.results.staff.title")}</span>
+               </li>`,
+      });
+    }
+
+    if (infoText) {
+      instructions.push(infoText);
+    }
+
     if (
       !attrs.isClosed &&
       !attrs.showResults &&
       poll.public &&
       poll.results !== "staff_only"
     ) {
-      contents.push(infoTextHtml(I18n.t("poll.public.title")));
+      instructions.push(
+        new RawHtml({
+          html: `<li>
+                  ${iconHTML("far-eye")} 
+                  <span>${I18n.t("poll.public.title")}</span>
+                 </li>`,
+        })
+      );
     }
 
-    return contents;
+    return [
+      h("div.poll-info_counts", contents),
+      h("ul.poll-info_instructions", instructions),
+    ];
   },
 });
 
@@ -594,6 +697,82 @@ function stripHtml(html) {
   return doc.body.textContent || "";
 }
 
+createWidget("discourse-poll-buttons-dropdown", {
+  tagName: "div.poll-buttons-dropdown",
+
+  buildId(attrs) {
+    return `poll-buttons-dropdown-${attrs.id}`;
+  },
+
+  transform(attrs) {
+    return {
+      content: this._buildContent(attrs),
+      onChange: (item) => this.sendWidgetAction(item.id, item.param),
+    };
+  },
+
+  template: hbs`
+  {{attach
+    widget="widget-dropdown"
+    attrs=(hash
+      id=this.attrs.id
+      icon="cog"
+      label="poll.options.label"
+      content=this.transformed.content
+      onChange=this.transformed.onChange
+      options=this.transformed.options
+    )
+  }}
+`,
+
+  optionsCount(attrs) {
+    return this._buildContent(attrs).length;
+  },
+
+  _buildContent(attrs) {
+    const contents = [];
+    const isAdmin = this.currentUser && this.currentUser.admin;
+    const dataExplorerEnabled = this.siteSettings.data_explorer_enabled;
+    const exportQueryID = this.siteSettings.poll_export_data_explorer_query_id;
+    const { poll, post } = attrs;
+    const closed = attrs.isClosed;
+    const isStaff = this.currentUser && this.currentUser.staff;
+    const topicArchived = post.get("topic.archived");
+
+    if (attrs.groupableUserFields.length && poll.voters > 0) {
+      const option = { ...buttonOptionsMap.showBreakdown };
+      option.id = option.action;
+      contents.push(option);
+    }
+
+    if (isAdmin && dataExplorerEnabled && poll.voters > 0 && exportQueryID) {
+      const option = { ...buttonOptionsMap.exportResults };
+      option.id = option.action;
+      contents.push(option);
+    }
+
+    if (
+      this.currentUser &&
+      (this.currentUser.id === post.user_id || isStaff) &&
+      !topicArchived
+    ) {
+      if (closed) {
+        if (!attrs.isAutomaticallyClosed) {
+          const option = { ...buttonOptionsMap.openPoll };
+          option.id = option.action;
+          contents.push(option);
+        }
+      } else {
+        const option = { ...buttonOptionsMap.closePoll };
+        option.id = option.action;
+        contents.push(option);
+      }
+    }
+
+    return contents;
+  },
+});
+
 createWidget("discourse-poll-buttons", {
   tagName: "div.poll-buttons",
 
@@ -604,13 +783,12 @@ createWidget("discourse-poll-buttons", {
     const closed = attrs.isClosed;
     const staffOnly = poll.results === "staff_only";
     const isStaff = this.currentUser && this.currentUser.staff;
-    const isAdmin = this.currentUser && this.currentUser.admin;
     const isMe = this.currentUser && post.user_id === this.currentUser.id;
-    const dataExplorerEnabled = this.siteSettings.data_explorer_enabled;
     const hideResultsDisabled = !staffOnly && (closed || topicArchived);
-    const exportQueryID = this.siteSettings.poll_export_data_explorer_query_id;
+    const dropdown = this.attach("discourse-poll-buttons-dropdown", attrs);
+    const dropdownOptionsCount = dropdown.optionsCount(attrs);
 
-    if (attrs.isMultiple && !hideResultsDisabled) {
+    if (attrs.isMultiple && !hideResultsDisabled && !attrs.showResults) {
       const castVotesDisabled = !attrs.canCastVotes;
       contents.push(
         this.attach("button", {
@@ -619,144 +797,75 @@ createWidget("discourse-poll-buttons", {
           }`,
           label: "poll.cast-votes.label",
           title: "poll.cast-votes.title",
+          icon: castVotesDisabled ? "far-square" : "check",
           disabled: castVotesDisabled,
           action: "castVotes",
         })
       );
-      contents.push(" ");
     }
 
-    if (attrs.showResults || hideResultsDisabled) {
+    if (attrs.showResults && !hideResultsDisabled) {
       contents.push(
         this.attach("button", {
           className: "btn-default toggle-results",
           label: "poll.hide-results.label",
           title: "poll.hide-results.title",
-          icon: "far-eye-slash",
-          disabled: hideResultsDisabled,
+          icon: "chevron-left",
           action: "toggleResults",
         })
       );
-    } else {
-      let showResultsButton;
-      let infoText;
+    }
 
-      if (poll.results === "on_vote" && !attrs.hasVoted && !isMe) {
-        infoText = infoTextHtml(I18n.t("poll.results.vote.title"));
-      } else if (poll.results === "on_close" && !closed) {
-        infoText = infoTextHtml(I18n.t("poll.results.closed.title"));
-      } else if (poll.results === "staff_only" && !isStaff) {
-        infoText = infoTextHtml(I18n.t("poll.results.staff.title"));
-      } else {
+    if (!attrs.showResults && !hideResultsDisabled) {
+      let showResultsButton;
+
+      if (
+        !(poll.results === "on_vote" && !attrs.hasVoted && !isMe) &&
+        !(poll.results === "on_close" && !closed) &&
+        !(poll.results === "staff_only" && !isStaff) &&
+        poll.voters > 0
+      ) {
         showResultsButton = this.attach("button", {
           className: "btn-default toggle-results",
           label: "poll.show-results.label",
           title: "poll.show-results.title",
-          icon: "far-eye",
-          disabled: poll.voters === 0,
+          icon: "chart-bar",
           action: "toggleResults",
         });
       }
 
-      if (showResultsButton) {
-        contents.push(showResultsButton);
-      }
-
       if (attrs.hasSavedVote) {
         contents.push(
           this.attach("button", {
             className: "btn-default remove-vote",
             label: "poll.remove-vote.label",
             title: "poll.remove-vote.title",
-            icon: "trash-alt",
+            icon: "undo",
             action: "removeVote",
           })
         );
       }
 
-      if (infoText) {
-        contents.push(infoText);
+      if (showResultsButton) {
+        contents.push(showResultsButton);
       }
     }
 
-    if (attrs.groupableUserFields.length && poll.voters > 0) {
-      const button = this.attach("button", {
-        className: "btn-default poll-show-breakdown",
-        label: "poll.group-results.label",
-        title: "poll.group-results.title",
-        icon: "far-eye",
-        action: "showBreakdown",
-      });
-
-      contents.push(button);
-    }
-
-    if (isAdmin && dataExplorerEnabled && poll.voters > 0 && exportQueryID) {
-      contents.push(
-        this.attach("button", {
-          className: "btn btn-default export-results",
-          label: "poll.export-results.label",
-          title: "poll.export-results.title",
-          icon: "download",
-          disabled: poll.voters === 0,
-          action: "exportResults",
-        })
-      );
-    }
-
-    if (poll.close) {
-      const closeDate = moment(poll.close);
-      if (closeDate.isValid()) {
-        const title = closeDate.format("LLL");
-        let label;
-
-        if (attrs.isAutomaticallyClosed) {
-          const age = relativeAge(closeDate.toDate(), { addAgo: true });
-          label = I18n.t("poll.automatic_close.age", { age });
-        } else {
-          const timeLeft = moment().to(closeDate, true);
-          label = I18n.t("poll.automatic_close.closes_in", { timeLeft });
-        }
-
-        contents.push(
-          new RawHtml({
-            html: `<span class="info-text" title="${title}">${label}</span>`,
-          })
-        );
+    // only show the dropdown if there's more than 1 button
+    // otherwise just show the button
+    if (dropdownOptionsCount > 1) {
+      contents.push(dropdown);
+    } else if (dropdownOptionsCount === 1) {
+      const singleOptionId = dropdown._buildContent(attrs)[0].id;
+      let singleOption = buttonOptionsMap[singleOptionId];
+      if (singleOptionId === "toggleStatus") {
+        singleOption = closed
+          ? buttonOptionsMap.openPoll
+          : buttonOptionsMap.closePoll;
       }
+      contents.push(this.attach("button", singleOption));
     }
-
-    if (
-      this.currentUser &&
-      (this.currentUser.id === post.user_id || isStaff) &&
-      !topicArchived
-    ) {
-      if (closed) {
-        if (!attrs.isAutomaticallyClosed) {
-          contents.push(
-            this.attach("button", {
-              className: "btn-default toggle-status",
-              label: "poll.open.label",
-              title: "poll.open.title",
-              icon: "unlock-alt",
-              action: "toggleStatus",
-            })
-          );
-        }
-      } else {
-        contents.push(
-          this.attach("button", {
-            className: "toggle-status btn-danger",
-            label: "poll.close.label",
-            title: "poll.close.title",
-            icon: "lock",
-            action: "toggleStatus",
-          })
-        );
-      }
-    }
-
-    return contents;
+    return [contents];
   },
 });
 
@@ -805,11 +914,11 @@ export default createWidget("discourse-poll", {
       showResults,
     });
 
-    return h("div", [
+    return [
       this.attach("discourse-poll-container", newAttrs),
       this.attach("discourse-poll-info", newAttrs),
       this.attach("discourse-poll-buttons", newAttrs),
-    ]);
+    ];
   },
 
   min() {
@@ -832,7 +941,9 @@ export default createWidget("discourse-poll", {
 
   isAutomaticallyClosed() {
     const { poll } = this.attrs;
-    return poll.close && moment.utc(poll.close) <= moment();
+    return (
+      poll.close && moment.utc(poll.close, "YYYY-MM-DD HH:mm:ss Z") <= moment()
+    );
   },
 
   isClosed() {
@@ -1070,12 +1181,8 @@ export default createWidget("discourse-poll", {
   },
 
   showBreakdown() {
-    showModal("poll-breakdown", {
+    getOwner(this).lookup("service:modal").show(PollBreakdownModal, {
       model: this.attrs,
-      panels: [
-        { id: "percentage", title: "poll.breakdown.percentage" },
-        { id: "count", title: "poll.breakdown.count" },
-      ],
     });
   },
 });
diff --git a/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js b/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js
index 6238e32d574..972ac92f4bd 100644
--- a/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js
+++ b/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js
@@ -158,10 +158,6 @@ const rule = {
     token.attrs = attributes;
     header.push(token);
 
-    token = new state.Token("poll_open", "div", 1);
-    token.block = true;
-    header.push(token);
-
     token = new state.Token("poll_open", "div", 1);
     token.attrs = [["class", "poll-container"]];
     header.push(token);
@@ -236,7 +232,11 @@ const rule = {
     token = state.push("poll_open", "div", 1);
     token.attrs = [["class", "poll-info"]];
 
-    state.push("paragraph_open", "p", 1);
+    token = state.push("poll_open", "div", 1);
+    token.attrs = [["class", "poll-info_counts"]];
+
+    token = state.push("poll_open", "div", 1);
+    token.attrs = [["class", "poll-info_counts-count"]];
 
     token = state.push("span_open", "span", 1);
     token.block = false;
@@ -252,8 +252,7 @@ const rule = {
     token.content = I18n.t("poll.voters", { count: 0 });
     state.push("span_close", "span", -1);
 
-    state.push("paragraph_close", "p", -1);
-
+    state.push("poll_close", "div", -1);
     state.push("poll_close", "div", -1);
     state.push("poll_close", "div", -1);
     state.push("poll_close", "div", -1);
@@ -277,6 +276,8 @@ export function setup(helper) {
   helper.allowList([
     "div.poll",
     "div.poll-info",
+    "div.poll-info_counts",
+    "div.poll-info_counts-count",
     "div.poll-container",
     "div.poll-title",
     "div.poll-buttons",
diff --git a/plugins/poll/assets/stylesheets/common/poll.scss b/plugins/poll/assets/stylesheets/common/poll.scss
index c0db0f7a966..f92144a5d70 100644
--- a/plugins/poll/assets/stylesheets/common/poll.scss
+++ b/plugins/poll/assets/stylesheets/common/poll.scss
@@ -1,6 +1,15 @@
 div.poll {
+  > * {
+    box-sizing: border-box;
+  }
   margin: 1em 0;
   border: 1px solid var(--primary-low);
+  display: grid;
+  grid-template-areas: "poll" "info" "buttons";
+  @include breakpoint("mobile-extra-large", min-width) {
+    grid-template-columns: 1fr 10em;
+    grid-template-areas: "poll info" "buttons buttons";
+  }
 
   ul,
   ol {
@@ -11,11 +20,6 @@ div.poll {
     width: 100%;
   }
 
-  li {
-    cursor: pointer;
-    font-size: var(--font-up-1);
-  }
-
   li[data-poll-option-id] {
     color: var(--primary);
     padding: 0.5em 0;
@@ -34,38 +38,228 @@ div.poll {
   }
 
   .poll-info {
+    grid-area: info;
+    display: flex;
+    line-height: var(--line-height-medium);
     color: var(--primary-medium);
-    vertical-align: middle;
-    padding: 1em 0;
 
-    .info-label {
-      font-size: var(--font-up-4);
-      line-height: var(--line-height-medium);
+    @include breakpoint("mobile-extra-large") {
+      border-top: 1px solid var(--primary-low);
+      flex-direction: row-reverse;
+      &_counts,
+      &_instructions {
+        padding: 1em;
+      }
+    }
+
+    @include breakpoint("mobile-extra-large", min-width) {
+      gap: 0 1em;
+      padding: 1em;
+      border-left: 1px solid var(--primary-low);
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+    }
+
+    &_counts {
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      gap: 0.25em 0;
+
+      @include breakpoint("mobile-extra-large", min-width) {
+        justify-content: center;
+      }
+
+      @include breakpoint("mobile-extra-large") {
+        flex: 1 1 auto;
+      }
+
+      &-count {
+        gap: 0.25em;
+        line-height: 1;
+        white-space: nowrap;
+        text-align: left;
+
+        .info-label,
+        .info-number {
+          display: inline;
+          margin-right: 0.25em;
+          text-align: center;
+        }
+
+        @include breakpoint("mobile-extra-large") {
+          &:not(:last-child) {
+            margin-right: 0.75em;
+          }
+        }
+
+        @include breakpoint("mobile-extra-large", min-width) {
+          &:not(:last-child) {
+            margin-bottom: 0.25em;
+          }
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          + .poll-info_counts-count {
+            margin-top: 0.5em;
+            display: block;
+            .info-number {
+              margin-right: 0.33em;
+            }
+            .info-number,
+            .info-label {
+              font-size: var(--font-up-1);
+            }
+          }
+        }
+      }
+      @include breakpoint("mobile-extra-large", min-width) {
+        + .poll-info_instructions:not(:empty) {
+          margin-top: 1.25em;
+        }
+      }
+    }
+
+    &_instructions {
+      box-sizing: border-box;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-self: start;
+      &:empty {
+        display: none;
+      }
+
+      @include breakpoint("mobile-extra-large", min-width) {
+        padding-top: 1.25em;
+        &:not(:empty) {
+          border-top: 1px solid var(--primary-low);
+        }
+      }
+
+      @include breakpoint("mobile-extra-large") {
+        padding-right: 1em;
+        height: 100%;
+        flex: 1 1 auto;
+        &:not(:empty) {
+          border-right: 1px solid var(--primary-low);
+        }
+      }
+
+      li {
+        display: flex;
+        gap: 0.5em;
+        &:not(:last-child) {
+          margin-bottom: 0.5em;
+        }
+
+        @include breakpoint("mobile-extra-large", min-width) {
+          &:not(:last-child) {
+            margin-bottom: 1em;
+          }
+          &:not(:first-child:last-child) {
+            // only applied when there are multiple items
+            .d-icon {
+              width: 15%;
+            }
+            span {
+              width: 85%;
+            }
+          }
+          &:first-child:last-child {
+            // when there's a single item, it looks better centered
+            display: inline;
+            text-align: center;
+          }
+        }
+      }
+
+      .d-icon {
+        font-size: var(--font-down-1);
+        margin-top: 0.2em;
+      }
     }
 
     .info-text {
       margin: 0.25em 0;
       display: block;
     }
+
+    @include breakpoint("mobile-extra-large", min-width) {
+      .info-label {
+        font-size: var(--font-up-2);
+      }
+      .info-number {
+        font-size: var(--font-up-6);
+      }
+    }
   }
 
   .poll-container {
-    vertical-align: middle;
-    padding: 0.5em 1em;
+    grid-area: poll;
+    padding: 1em;
+    width: 100%;
+    overflow: hidden;
+    align-self: center;
+
+    li {
+      cursor: pointer;
+      font-size: var(--font-up-1);
+    }
 
     .poll-results-number-rating {
       font-size: var(--font-up-5);
     }
   }
 
+  .poll-title {
+    border-bottom: 1px solid var(--primary-low);
+    margin-bottom: 0.5em;
+    padding-bottom: 0.5em;
+  }
+
   .poll-buttons {
-    .info-text {
-      margin: 0.25em 0;
-      color: var(--primary-medium);
+    grid-area: buttons;
+    display: flex;
+    flex-wrap: wrap;
+    gap: 0.5em;
+    width: 100%;
+    padding: 1em;
+    border-top: 1px solid var(--primary-low);
+
+    button {
+      white-space: nowrap;
+      align-self: start;
+      .d-button-label {
+        @include ellipsis;
+      }
+
+      @include breakpoint("tablet") {
+        flex: 1 1 0;
+        &:first-child:last-child {
+          // if there's only one button,
+          // don't expand the width
+          flex: 0 1 auto;
+        }
+        &.toggle-results:first-child {
+          // don't expand the back button
+          flex: 0 1 auto;
+          margin-right: auto;
+        }
+      }
+
+      @include breakpoint("mobile-large") {
+        &:first-child:last-child,
+        &.cast-votes {
+          // ok to expand button width on smaller screens
+          flex: 1 1 100%;
+        }
+      }
     }
-    .info-text + .info-text,
-    button + .info-text {
-      margin-left: 0.5em;
+
+    &:empty {
+      display: none;
     }
   }
 
@@ -87,6 +281,33 @@ div.poll {
     }
   }
 
+  .poll-buttons-dropdown {
+    align-self: stretch;
+
+    .label {
+      display: none;
+    }
+    .widget-dropdown {
+      height: 100%;
+
+      &-header {
+        height: 100%;
+        .d-icon {
+          margin: 0;
+        }
+      }
+    }
+  }
+
+  .poll-buttons-dropdown,
+  .export-results,
+  .toggle-status,
+  .show-breakdown {
+    // we want these controls to be separated
+    // from voting controls
+    margin-left: auto;
+  }
+
   .results {
     > li {
       cursor: default;
@@ -160,19 +381,27 @@ div.poll {
     overflow-y: auto;
     overflow-x: hidden;
   }
-
-  .poll-show-breakdown {
-    margin-bottom: 0.25em;
-  }
 }
 
-div.poll.pie {
-  .poll-container {
-    display: inline-block;
-  }
-  .poll-info {
-    display: inline-block;
-    width: 150px;
+.d-editor-preview {
+  .poll {
+    li[data-poll-option-id]:before {
+      position: relative;
+      vertical-align: baseline;
+      border: 2px solid var(--primary);
+      border-radius: 50%;
+      display: inline-block;
+      margin-right: 0.5em;
+      width: 12px;
+      height: 12px;
+      content: "";
+    }
+
+    &[data-poll-type="multiple"] {
+      li[data-poll-option-id]:before {
+        border-radius: 3px;
+      }
+    }
   }
 }
 
diff --git a/plugins/poll/assets/stylesheets/desktop/poll.scss b/plugins/poll/assets/stylesheets/desktop/poll.scss
deleted file mode 100644
index ce9ad531ff7..00000000000
--- a/plugins/poll/assets/stylesheets/desktop/poll.scss
+++ /dev/null
@@ -1,94 +0,0 @@
-div.poll {
-  display: table;
-  width: 100%;
-  box-sizing: border-box;
-
-  .poll-info {
-    min-width: 150px;
-    width: 100%;
-    display: table-cell;
-    text-align: center;
-
-    .info-number {
-      font-size: 3.5em;
-    }
-
-    p {
-      margin: 0.5em 0;
-    }
-
-    .info-label {
-      display: block;
-    }
-  }
-
-  .poll-container {
-    display: table-cell;
-    width: 100%;
-    border-right: 1px solid var(--primary-low);
-  }
-
-  .poll-title {
-    border-bottom: 1px solid var(--primary-low);
-    margin-bottom: 0.5em;
-    padding: 0.5em 0;
-  }
-
-  .poll-buttons {
-    border-top: 1px solid var(--primary-low);
-    padding: 1em;
-    display: flex;
-    flex-direction: row;
-
-    .info-text {
-      line-height: 2em;
-    }
-
-    button:not(:first-child) {
-      margin-left: 0.5em;
-    }
-
-    .btn-danger.toggle-status {
-      margin-left: auto;
-    }
-  }
-}
-
-div.poll.pie {
-  .poll-container {
-    width: calc(100% - 190px);
-  }
-
-  .poll-info {
-    display: inline-block;
-    width: 150px;
-  }
-}
-
-.d-editor-preview {
-  .poll-buttons {
-    a:not(:first-child) {
-      margin-left: 0.25em;
-    }
-  }
-
-  .poll {
-    li[data-poll-option-id]:before {
-      position: relative;
-      vertical-align: baseline;
-      border: 2px solid var(--primary);
-      border-radius: 50%;
-      display: inline-block;
-      margin-right: 0.5em;
-      width: 12px;
-      height: 12px;
-      content: "";
-    }
-
-    &[data-poll-type="multiple"] {
-      li[data-poll-option-id]:before {
-        border-radius: 3px;
-      }
-    }
-  }
-}
diff --git a/plugins/poll/assets/stylesheets/mobile/poll.scss b/plugins/poll/assets/stylesheets/mobile/poll.scss
deleted file mode 100644
index 55399b98458..00000000000
--- a/plugins/poll/assets/stylesheets/mobile/poll.scss
+++ /dev/null
@@ -1,42 +0,0 @@
-div.poll {
-  .poll-buttons {
-    display: inline-flex;
-    flex-wrap: wrap;
-    padding: 0.5em 1em 0.5em 1em;
-
-    button {
-      margin: 0 0.5em 0.5em 0;
-    }
-  }
-
-  .poll-info {
-    padding: 0 1em;
-    display: flex;
-    flex-wrap: wrap;
-    flex-direction: column;
-    .info-text {
-      display: inline;
-    }
-    .info-number {
-      font-size: var(--font-up-6);
-    }
-    p {
-      margin: 0;
-      width: 100%;
-    }
-    .info-label {
-      margin-left: 0.25em;
-    }
-  }
-
-  .poll-show-breakdown {
-    display: none;
-  }
-}
-
-div.poll.pie {
-  .poll-container {
-    width: calc(100% - 30px);
-    border-bottom: 1px solid var(--primary-low);
-  }
-}
diff --git a/plugins/poll/config/locales/client.ar.yml b/plugins/poll/config/locales/client.ar.yml
index 9eae56b7b4f..34597cf3a4c 100644
--- a/plugins/poll/config/locales/client.ar.yml
+++ b/plugins/poll/config/locales/client.ar.yml
@@ -33,42 +33,16 @@ ar:
           title: "ستظهر النتائج بعد <strong>إغلاق الاستطلاع</strong>."
         staff:
           title: "تظهر النتائج لأعضاء <strong>فريق العمل</strong> فقط."
-      multiple:
-        help:
-          at_least_min_options:
-            zero: "حدِّد <strong>%{count} </strong> خيار على الأقل."
-            one: "حدِّد خيارًا واحدًا (<strong>%{count} </strong>) على الأقل."
-            two: "حدِّد خيارَين (<strong>%{count} </strong>) على الأقل."
-            few: "حدِّد <strong>%{count}</strong> خيارات على الأقل."
-            many: "حدِّد <strong>%{count}</strong> خيارًا على الأقل."
-            other: "حدِّد <strong>%{count}</strong> خيار على الأقل."
-          up_to_max_options:
-            zero: "حدِّد <strong>%{count}</strong> خيار كحد أقصى."
-            one: "حدِّد خيارًا واحدًا (<strong>%{count}</strong>) كحد أقصى."
-            two: "حدِّد خيارَين (<strong>%{count}</strong>) كحد أقصى."
-            few: "حدِّد <strong>%{count}</strong> خيارات كحد أقصى."
-            many: "حدِّد <strong>%{count}</strong> خيارًا كحد أقصى."
-            other: "حدِّد <strong>%{count}</strong> خيار كحد أقصى."
-          x_options:
-            zero: "حدِّد <strong>%{count}</strong> خيار."
-            one: "حدِّد خيارًا واحدًا (<strong>%{count}</strong>)."
-            two: "حدِّد خيارَين (<strong>%{count}</strong>)."
-            few: "حدِّد <strong>%{count}</strong> خيارات."
-            many: "حدِّد <strong>%{count}</strong> خيارًا."
-            other: "حدِّد <strong>%{count}</strong> خيار."
-          between_min_and_max_options: "حدِّد من بين <strong>%{min} </strong> إلى <strong>%{max} </strong> خيار."
       cast-votes:
         title: "الإدلاء بصوتك"
         label: "صوِّت اﻵن!"
       show-results:
         title: "عرض نتائج استطلاع الرأي"
-        label: "عرض النتائج"
+        label: "النتائج"
       remove-vote:
         title: "إزالة صوتك"
-        label: "إزالة التصويت"
       hide-results:
         title: "العودة إلى تصويتاتك"
-        label: "إظهار التصويت"
       group-results:
         title: "تجميع الأصوات حسب حقل المستخدم"
         label: "عرض التفاصيل"
@@ -92,6 +66,8 @@ ar:
         breakdown: "التفاصيل"
         percentage: "النسبة المئوية"
         count: "العدد"
+      options:
+        label: "الخيارات"
       error_while_toggling_status: "عذرًا، حدث خطأ أدى إلى تبديل حالة استطلاع الرأي هذا."
       error_while_casting_votes: "عذرًا، حدث خطأ في الإدلاء بأصواتك."
       error_while_fetching_voters: "عذرًا، حدث خطأ في عرض الناخبين."
diff --git a/plugins/poll/config/locales/client.be.yml b/plugins/poll/config/locales/client.be.yml
index f3b3af8a928..b6c27548d90 100644
--- a/plugins/poll/config/locales/client.be.yml
+++ b/plugins/poll/config/locales/client.be.yml
@@ -18,12 +18,16 @@ be:
         many: "галасоў"
         other: "галасоў"
       average_rating: "Сярэдні рэйтынг: <strong>%{average}strong>."
+      show-results:
+        label: "вынікі"
       export-results:
         label: "экспарт"
       close:
         label: "зачыніць"
       breakdown:
         count: "падлічваць"
+      options:
+        label: "Налады"
       ui_builder:
         poll_type:
           label: тып
diff --git a/plugins/poll/config/locales/client.bg.yml b/plugins/poll/config/locales/client.bg.yml
index 6ee3f84c8e7..443c7ba3180 100644
--- a/plugins/poll/config/locales/client.bg.yml
+++ b/plugins/poll/config/locales/client.bg.yml
@@ -25,30 +25,16 @@ bg:
           title: "Резултатите ще бъдат показани при <strong>затваряне</strong>."
         staff:
           title: "Резултатите се показват само на членове на <strong>екипа</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Изберете поне <strong>%{count}</strong> опция."
-            other: "Изберете поне <strong>%{count}</strong> опции."
-          up_to_max_options:
-            one: "Изберете <strong>%{count}</strong> опция."
-            other: "Изберете до <strong>%{count}</strong> опции."
-          x_options:
-            one: "Изберете <strong>%{count}</strong> опция."
-            other: "Изберете <strong>%{count}</strong> опции."
-          between_min_and_max_options: "Изберете между <strong>%{min}</strong> и <strong>%{max}</strong> опции."
       cast-votes:
         title: "Изчислете вашите гласове"
         label: "Гласувай сега!"
       show-results:
         title: "Покажи резултатите от гласуването"
-        label: "Покажи резултатите"
+        label: "Резултати"
       remove-vote:
         title: "Премахнете гласа си"
-        label: "Премахване на гласуването"
       hide-results:
         title: "Обратно към вашите гласове"
-        label: "Покажи гласуването"
       group-results:
         title: "Групиране на гласовете по потребител"
         label: "Показване на разбивка"
@@ -72,6 +58,8 @@ bg:
         breakdown: "Разбивка"
         percentage: "Процент"
         count: "Брой"
+      options:
+        label: "Опции"
       error_while_toggling_status: "Съжаляваме, получи се грешка при превключване статуса на тази анкета."
       error_while_casting_votes: "Получи се грешка при подаването на гласа ви."
       error_while_fetching_voters: "Получи се грешка при показването на гласовете."
diff --git a/plugins/poll/config/locales/client.bs_BA.yml b/plugins/poll/config/locales/client.bs_BA.yml
index 498c74bf7a6..7113894fb88 100644
--- a/plugins/poll/config/locales/client.bs_BA.yml
+++ b/plugins/poll/config/locales/client.bs_BA.yml
@@ -27,30 +27,14 @@ bs_BA:
           title: "Rezultati će biti prikazani onda kada glasanje bude <strong>završeno</strong>."
         staff:
           title: "Rezultati su prikazani samo <strong>uredništvu i admin</strong> korisnicima."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Odaberite najmanje <strong>%{count}</strong> opciju."
-            few: "Odaberite najmanje <strong>%{count}</strong> opcije."
-            other: "Odaberite najmanje <strong>%{count}</strong> opcija."
-          up_to_max_options:
-            one: "Odaberite najviše <strong>%{count}</strong> opciju."
-            few: "Odaberite najviše <strong>%{count}</strong> opcije."
-            other: "Odaberite najviše <strong>%{count}</strong> opcija."
-          x_options:
-            one: "Odaberite <strong>%{count}</strong> opciju."
-            few: "Odaberite <strong>%{count}</strong> opcije."
-            other: "Odaberite <strong>%{count}</strong> opcija."
-          between_min_and_max_options: "Odaberite između <strong>%{min}</strong> i <strong>%{max}</strong> mogućnosti."
       cast-votes:
         title: "ukupno glasova"
         label: "Glasaj"
       show-results:
         title: "Prikaži rezultate ankete"
-        label: "Prikaži rezultate"
+        label: "Rezultati"
       hide-results:
         title: "Nazad na glasove"
-        label: "Prikaži glasanje"
       group-results:
         title: "Grupiraj glasove po polju korisnika"
         label: "Prikaži raspodjelu"
@@ -74,6 +58,8 @@ bs_BA:
         breakdown: "Razloženo"
         percentage: "Procentualno"
         count: "Broj"
+      options:
+        label: "Opcije"
       error_while_toggling_status: "Izvinjavamo se, pojavio se problem u prebacivanju statutusa ove ankete"
       error_while_casting_votes: "Izvinjavamo se, pojavila se greška prikazivanja vaših glasova"
       error_while_fetching_voters: "Izvinjavamo se, pojavila se greška pri prikazivanju glasača"
diff --git a/plugins/poll/config/locales/client.ca.yml b/plugins/poll/config/locales/client.ca.yml
index f65bea35ae8..c35fbdfc1cb 100644
--- a/plugins/poll/config/locales/client.ca.yml
+++ b/plugins/poll/config/locales/client.ca.yml
@@ -23,27 +23,14 @@ ca:
           title: "Els resultats es mostraran una vegada <strong>tancada</strong> la votació."
         staff:
           title: "Els resultats només es mostren als membres de l'<strong>equip responsable</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Trieu almenys <strong>%{count}</strong> opció."
-            other: "Trieu almenys <strong>%{count}</strong> opcions."
-          up_to_max_options:
-            one: "Trieu fins a <strong>%{count}</strong> opció."
-            other: "Trieu fins a <strong>%{count}</strong> opcions."
-          x_options:
-            one: "Trieu <strong>%{count}</strong> opció."
-            other: "Trieu <strong>%{count}</strong> opcions."
-          between_min_and_max_options: "Trieu entre les opcions <strong>%{min}</strong> i <strong>%{max}</strong>."
       cast-votes:
         title: "Repartiu els vostres vots"
         label: "Voteu ara!"
       show-results:
         title: "Mostra els resultats de l'enquesta"
-        label: "Mostra els resultats"
+        label: "Resultats"
       hide-results:
         title: "Torna als vots"
-        label: "Mostra el vot"
       group-results:
         title: "Agrupa els vots per camp d'usuari"
       export-results:
@@ -62,6 +49,8 @@ ca:
         age: "Tancat <strong>%{age}</strong>"
       breakdown:
         count: "Recompte"
+      options:
+        label: "Opcions"
       error_while_toggling_status: "Ho sentim. S'ha produït un error en canviar l'estat d'aquesta enquesta."
       error_while_casting_votes: "Ho sentim. S'ha produït un error en l'emissió dels vostres vots."
       error_while_fetching_voters: "Hi ha hagut un error en mostrar els votants."
diff --git a/plugins/poll/config/locales/client.cs.yml b/plugins/poll/config/locales/client.cs.yml
index 34df66df072..c1efff0e3ec 100644
--- a/plugins/poll/config/locales/client.cs.yml
+++ b/plugins/poll/config/locales/client.cs.yml
@@ -23,7 +23,6 @@ cs:
         label: "Hlasovat nyní!"
       show-results:
         title: "Zobrazit výsledky hlasování"
-        label: "Ukaž výsledky"
       hide-results:
         title: "Zpět k hlasování"
       export-results:
@@ -36,6 +35,8 @@ cs:
         title: "Zavřít hlasování"
         label: "Zavřít"
         confirm: "Opravdu chcete uzavřít toto hlasování?"
+      options:
+        label: "Možnosti"
       error_while_toggling_status: "Došlo k chybě při změně statusu hlasování"
       error_while_casting_votes: "Došlo k chybě při odesílání vašeho hlasu."
       error_while_fetching_voters: "Došlo k chybě při zobrazování hlasujících."
diff --git a/plugins/poll/config/locales/client.da.yml b/plugins/poll/config/locales/client.da.yml
index 2fb993a5707..5c4ddd0c97c 100644
--- a/plugins/poll/config/locales/client.da.yml
+++ b/plugins/poll/config/locales/client.da.yml
@@ -25,30 +25,16 @@ da:
           title: "Resultaterne vil blive vist, når den er <strong>afsluttet</strong>."
         staff:
           title: "Resultaterne vises kun for <strong>personale</strong> medlemmer."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Vælg mindst <strong>%{count}</strong> mulighed."
-            other: "Vælg mindst <strong>%{count}</strong> muligheder."
-          up_to_max_options:
-            one: "Vælg op til <strong>%{count}</strong> mulighed."
-            other: "Vælg op til <strong>%{count}</strong> muligheder."
-          x_options:
-            one: "Vælg <strong>%{count}</strong> mulighed."
-            other: "Vælg <strong>%{count}</strong> muligheder."
-          between_min_and_max_options: "Vælg mellem <strong>%{min}</strong> og <strong>%{max}</strong> muligheder."
       cast-votes:
         title: "Afgiv dine stemmer"
         label: "Stem nu!"
       show-results:
         title: "Vis afstemningsresultat"
-        label: "Vis resultat"
+        label: "Resultater"
       remove-vote:
         title: "Fjern din stemme"
-        label: "Fjern stemme"
       hide-results:
         title: "Tilbage til dine stemmer"
-        label: "Vis afstemning"
       group-results:
         title: "Gruppér stemmer efter brugerfelt"
         label: "Vis fordeling"
@@ -72,6 +58,8 @@ da:
         breakdown: "Fordeling"
         percentage: "Procentdel"
         count: "Antal"
+      options:
+        label: "Indstillinger"
       error_while_toggling_status: "Beklager, der opstod en fejl under statusskifte for denne afstemning."
       error_while_casting_votes: "Beklager, der opstod en fejl under afgivelse af dine stemmer."
       error_while_fetching_voters: "Beklager, der opstod en fejl med at vise deltagerne."
diff --git a/plugins/poll/config/locales/client.de.yml b/plugins/poll/config/locales/client.de.yml
index 6a92b8b2e14..9c948e2107b 100644
--- a/plugins/poll/config/locales/client.de.yml
+++ b/plugins/poll/config/locales/client.de.yml
@@ -28,27 +28,27 @@ de:
       multiple:
         help:
           at_least_min_options:
-            one: "Wähle mindestens <strong>%{count}</strong> Option."
-            other: "Wähle mindestens <strong>%{count}</strong> Optionen."
+            one: "Wähle mindestens <strong>%{count} Option</strong> aus."
+            other: "Wähle mindestens <strong>%{count} Optionen</strong> aus."
           up_to_max_options:
-            one: "Wähle bis zu <strong>%{count}</strong> Option."
-            other: "Wähle bis zu <strong>%{count}</strong> Optionen."
+            one: "Wähle bis zu <strong>%{count} Option</strong> aus."
+            other: "Wähle bis zu <strong>%{count} Optionen</strong> aus."
           x_options:
-            one: "Wähle <strong>%{count}</strong> Option."
-            other: "Wähle <strong>%{count}</strong> Optionen."
-          between_min_and_max_options: "Wähle zwischen <strong>%{min}</strong> und <strong>%{max}</strong> Optionen."
+            one: "Wähle <strong>%{count} Option</strong> aus."
+            other: "Wähle <strong>%{count} Optionen</strong> aus."
+          between_min_and_max_options: "Wähle zwischen <strong>%{min} und %{max} Optionen</strong> aus."
       cast-votes:
         title: "Gib deine Stimmen ab"
         label: "Jetzt abstimmen!"
       show-results:
         title: "Das Ergebnis der Umfrage anzeigen"
-        label: "Ergebnisse anzeigen"
+        label: "Ergebnisse"
       remove-vote:
         title: "Entferne deine Stimme"
-        label: "Stimme entfernen"
+        label: "Abstimmung zurücknehmen"
       hide-results:
         title: "Zurück zur Umfrage"
-        label: "Umfrage anzeigen"
+        label: "Abstimmen"
       group-results:
         title: "Stimmen anhand von Benutzerfeld gruppieren"
         label: "Aufschlüsselung anzeigen"
@@ -72,6 +72,8 @@ de:
         breakdown: "Aufschlüsselung"
         percentage: "Prozentsatz"
         count: "Anzahl"
+      options:
+        label: "Optionen"
       error_while_toggling_status: "Leider ist beim Umschalten des Status dieser Umfrage ein Fehler aufgetreten."
       error_while_casting_votes: "Leider ist beim Abgeben deiner Stimmen ein Fehler aufgetreten."
       error_while_fetching_voters: "Leider ist beim Anzeigen der Teilnehmer ein Fehler aufgetreten."
diff --git a/plugins/poll/config/locales/client.el.yml b/plugins/poll/config/locales/client.el.yml
index c03334c44ff..fe8811a82f8 100644
--- a/plugins/poll/config/locales/client.el.yml
+++ b/plugins/poll/config/locales/client.el.yml
@@ -25,27 +25,14 @@ el:
           title: "Τα αποτελέσματα θα εμφανιστούν μόλις <strong>κλείσουν</strong>."
         staff:
           title: "Τα αποτελέσματα εμφανίζονται μόνο σε μέλη του <strong>προσωπικού</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Επιλέξτε τουλάχιστον <strong>%{count}</strong> επιλογή."
-            other: "Επιλέξτε τουλάχιστον <strong>%{count}</strong> επιλογές."
-          up_to_max_options:
-            one: "Επιλέξτε μέχρι <strong>%{count}</strong> επιλογή."
-            other: "Επιλέξτε μέχρι <strong>%{count}</strong> επιλογές."
-          x_options:
-            one: "Επιλέξτε <strong>%{count}</strong> επιλογή."
-            other: "Επιλέξτε <strong>%{count}</strong> επιλογές."
-          between_min_and_max_options: "Επιλέξτε μεταξύ <strong>%{min}</strong> και <strong>%{max}</strong> επιλογές."
       cast-votes:
         title: "Δώστε τις ψήφους σας"
         label: "Ψηφίστε τώρα!"
       show-results:
         title: "Εμφάνισε τα αποτελέσματα της ψηφοφορίας"
-        label: "Εμφάνισε τα αποτελέσματα"
+        label: "Αποτελέσματα"
       hide-results:
         title: "Πίσω στις ψήφους σας"
-        label: "Εμφάνιση ψήφων"
       group-results:
         title: "Ομαδοποίηση ψήφων ανά πεδίο χρήστη"
         label: "Εμφάνιση ανάλυσης"
@@ -69,6 +56,8 @@ el:
         breakdown: "Ανάλυση"
         percentage: "Ποσοστό"
         count: "Άθροισμα"
+      options:
+        label: "Επιλογές"
       error_while_toggling_status: "Λυπάμαι, παρουσιάστηκε σφάλμα κατά την εναλλαγή της κατάστασης αυτής της δημοσκόπησης."
       error_while_casting_votes: "Λυπάμαι, παρουσιάστηκε ένα σφάλμα κατά την ψηφοφορία."
       error_while_fetching_voters: "Συγνώμη, παρουσιάστηκε ένα σφάλμα κατά τη διαδικασία εμφάνισης των ψηφοφόρων."
diff --git a/plugins/poll/config/locales/client.en.yml b/plugins/poll/config/locales/client.en.yml
index c7fa3890414..73d4557478b 100644
--- a/plugins/poll/config/locales/client.en.yml
+++ b/plugins/poll/config/locales/client.en.yml
@@ -26,15 +26,15 @@ en:
       multiple:
         help:
           at_least_min_options:
-            one: "Choose at least <strong>%{count}</strong> option."
-            other: "Choose at least <strong>%{count}</strong> options."
+            one: "Choose at least <strong>%{count} option</strong>."
+            other: "Choose at least <strong>%{count} options</strong>."
           up_to_max_options:
-            one: "Choose up to <strong>%{count}</strong> option."
-            other: "Choose up to <strong>%{count}</strong> options."
+            one: "Choose up to <strong>%{count} option</strong>."
+            other: "Choose up to <strong>%{count} options</strong>."
           x_options:
-            one: "Choose <strong>%{count}</strong> option."
-            other: "Choose <strong>%{count}</strong> options."
-          between_min_and_max_options: "Choose between <strong>%{min}</strong> and <strong>%{max}</strong> options."
+            one: "Choose <strong>%{count} option</strong>."
+            other: "Choose <strong>%{count} options</strong>."
+          between_min_and_max_options: "Choose between <strong>%{min} and %{max} options</strong>."
 
       cast-votes:
         title: "Cast your votes"
@@ -42,15 +42,15 @@ en:
 
       show-results:
         title: "Display the poll results"
-        label: "Show results"
+        label: "Results"
 
       remove-vote:
         title: "Remove your vote"
-        label: "Remove vote"
+        label: "Undo vote"
 
       hide-results:
         title: "Back to your votes"
-        label: "Show vote"
+        label: "Vote"
 
       group-results:
         title: "Group votes by user field"
@@ -80,6 +80,9 @@ en:
         breakdown: "Breakdown"
         percentage: "Percentage"
         count: "Count"
+      
+      options:
+        label: "Options"
 
       error_while_toggling_status: "Sorry, there was an error toggling the status of this poll."
       error_while_casting_votes: "Sorry, there was an error casting your votes."
diff --git a/plugins/poll/config/locales/client.es.yml b/plugins/poll/config/locales/client.es.yml
index fb5b43cce8c..91ecd64a128 100644
--- a/plugins/poll/config/locales/client.es.yml
+++ b/plugins/poll/config/locales/client.es.yml
@@ -28,27 +28,27 @@ es:
       multiple:
         help:
           at_least_min_options:
-            one: "Selecciona al menos <strong>%{count}</strong> opción."
-            other: "Selecciona al menos <strong>%{count}</strong> opciones."
+            one: "Elige al menos <strong>%{count}</strong> opción."
+            other: "Elige al menos <strong>%{count} opciones</strong>."
           up_to_max_options:
-            one: "Selecciona como máximo <strong>%{count}</strong> opción."
-            other: "Selecciona como máximo <strong>%{count}</strong> opciones."
+            one: "Elige hasta <strong>%{count} opción</strong>."
+            other: "Elige hasta <strong>%{count} opciones</strong>."
           x_options:
-            one: "Selecciona <strong>%{count}</strong> opción."
-            other: "Selecciona <strong>%{count}</strong> opciones."
-          between_min_and_max_options: "Selecciona de <strong>%{min}</strong> a <strong>%{max}</strong> opciones."
+            one: "Elige <strong>%{count}</strong> opción."
+            other: "Elige <strong>%{count} opciones</strong>."
+          between_min_and_max_options: "Elige entre <strong>%{min} y %{max} opciones</strong>."
       cast-votes:
         title: "Emite tus votos"
         label: "Votar"
       show-results:
         title: "Mostrar los resultados de la encuesta"
-        label: "Mostrar resultados"
+        label: "Resultados"
       remove-vote:
         title: "Retirar tu voto"
-        label: "Retirar voto"
+        label: "Deshacer voto"
       hide-results:
         title: "Volver a tus votos"
-        label: "Mostrar votos"
+        label: "Votar"
       group-results:
         title: "Agrupar votos por campo de usuario"
         label: "Mostrar desglose"
@@ -72,6 +72,8 @@ es:
         breakdown: "Desglose"
         percentage: "Porcentaje"
         count: "Cantidad"
+      options:
+        label: "Opciones"
       error_while_toggling_status: "Lo sentimos, se ha producido un error al cambiar el estado de esta encuesta."
       error_while_casting_votes: "Lo sentimos, se ha producido un error al emitir tus votos."
       error_while_fetching_voters: "Lo sentimos, se produjo un error al mostrar los votantes."
diff --git a/plugins/poll/config/locales/client.et.yml b/plugins/poll/config/locales/client.et.yml
index 35a4d33ad5f..6d71c76706c 100644
--- a/plugins/poll/config/locales/client.et.yml
+++ b/plugins/poll/config/locales/client.et.yml
@@ -19,7 +19,6 @@ et:
         label: "Hääleta nüüd!"
       show-results:
         title: "Kuva hääletuse tulemused"
-        label: "Kuva tulemused"
       hide-results:
         title: "Tagasi sinu vastuse juurde"
       export-results:
@@ -34,6 +33,8 @@ et:
         confirm: "Kas sa oled kindel, et sa tahad antud hääletuse sulgeda?"
       breakdown:
         count: "Arv"
+      options:
+        label: "Suvandid"
       error_while_toggling_status: "Kahjuks tekkis postituse staatuse ümberlülitamisel tõrge."
       error_while_casting_votes: "Kahjuks tekkis hääletamise käigus tõrge."
       error_while_fetching_voters: "Kahjuks tekkis hääletajate näitamise käigus tõrge."
diff --git a/plugins/poll/config/locales/client.fa_IR.yml b/plugins/poll/config/locales/client.fa_IR.yml
index 27be5661415..045db307737 100644
--- a/plugins/poll/config/locales/client.fa_IR.yml
+++ b/plugins/poll/config/locales/client.fa_IR.yml
@@ -25,27 +25,14 @@ fa_IR:
           title: "نتایج بعد از <strong>پایان</strong> مدت نظرسنجی نمایش داده خواهند شد."
         staff:
           title: "فقط تیم <strong>مدیران</strong> می توانند نتایج نظرسنجی را مشاهده کنند."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "حداقل <strong>%{count}</strong> مورد را انتخاب کنید."
-            other: "حداقل <strong>%{count}</strong> مورد را انتخاب کنید."
-          up_to_max_options:
-            one: "تا <strong>%{count}</strong> گزینه را می توانید انتخاب کنید."
-            other: "تا <strong>%{count}</strong> گزینه را می توانید انتخاب کنید."
-          x_options:
-            one: "<strong>%{count}</strong> گزینه را انتخاب کنید."
-            other: "<strong>%{count}</strong> گزینه را انتخاب کنید."
-          between_min_and_max_options: "بین <strong>%{min}</strong> تا <strong>%{max}</strong> گزینه را انتخاب کنید."
       cast-votes:
         title: "انداختن رأی شما"
         label: "ثبت رای!"
       show-results:
         title: "نمایش نتایج"
-        label: "نمایش نتایج"
+        label: "نتایج"
       hide-results:
         title: "برگشتن به رای گیری "
-        label: "نمایش رأی"
       group-results:
         title: "آراء گروه با توجه به نام کاربر"
       export-results:
@@ -67,6 +54,8 @@ fa_IR:
         votes: "%{count} رای"
         percentage: "درصد"
         count: "تعداد"
+      options:
+        label: "تنظیمات"
       error_while_toggling_status: "متاسفانه در تغییر وضعیت این نظرسنجی، خطایی رخ داده است."
       error_while_casting_votes: "متاسفانه در ثبت رای شما خطایی رخ داده است."
       error_while_fetching_voters: "متاسفانه در نمایش رای دهندگان خطایی رخ داده است."
diff --git a/plugins/poll/config/locales/client.fi.yml b/plugins/poll/config/locales/client.fi.yml
index 5e4092e358e..2c6c429f90b 100644
--- a/plugins/poll/config/locales/client.fi.yml
+++ b/plugins/poll/config/locales/client.fi.yml
@@ -25,30 +25,16 @@ fi:
           title: "Tulokset näytetään kyselyn <strong>sulkeuduttua</strong>."
         staff:
           title: "Tulokset näytetään vain <strong>henkilökunnan</strong> jäsenille."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Valitse ainakin <strong>%{count}</strong> vaihtoehto."
-            other: "Valitse ainakin <strong>%{count}</strong> vaihtoehtoa."
-          up_to_max_options:
-            one: "Valitse enintään <strong>%{count}</strong> vaihtoehtoa."
-            other: "Valitse enintään <strong>%{count}</strong> vaihtoehtoa."
-          x_options:
-            one: "Valitse <strong>%{count}</strong> vaihtoehto."
-            other: "Valitse <strong>%{count}</strong> vaihtoehtoa."
-          between_min_and_max_options: "Valitse vähintään <strong>%{min}</strong> ja enintään <strong>%{max}</strong> vaihtoehtoa."
       cast-votes:
         title: "Antakaa äänenne"
         label: "Äänestä nyt!"
       show-results:
         title: "Näytä kyselyn tulos"
-        label: "Näytä tulokset"
+        label: "Tulokset"
       remove-vote:
         title: "Poista äänesi"
-        label: "Poista ääni"
       hide-results:
         title: "Palaa äänestysvalintaasi"
-        label: "Näytä äänestys"
       group-results:
         title: "Lajittele äänet käyttäjäkentän perusteella"
         label: "Näytä erittely"
@@ -72,6 +58,8 @@ fi:
         breakdown: "Erittely"
         percentage: "Prosenttiosuus"
         count: "Lukumäärä"
+      options:
+        label: "Asetukset"
       error_while_toggling_status: "Kyselyn tilaa muutettaessa tapahtui virhe."
       error_while_casting_votes: "Ääntä annettaessa tapahtui virhe."
       error_while_fetching_voters: "Äänestäneiden näyttämisessä tapahtui virhe."
diff --git a/plugins/poll/config/locales/client.fr.yml b/plugins/poll/config/locales/client.fr.yml
index a07378d2905..b9ac1e7fb82 100644
--- a/plugins/poll/config/locales/client.fr.yml
+++ b/plugins/poll/config/locales/client.fr.yml
@@ -25,30 +25,16 @@ fr:
           title: "Les résultats sont affichés après la <strong>fermeture</strong> du sondage."
         staff:
           title: "Les résultats ne sont montrés qu'aux <strong>responsables</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Choisissez au moins <strong>%{count}</strong> option."
-            other: "Choisissez au moins <strong>%{count}</strong> options."
-          up_to_max_options:
-            one: "Choisissez jusqu'à <strong>%{count}</strong> option."
-            other: "Choisissez jusqu'à <strong>%{count}</strong> options."
-          x_options:
-            one: "Choisissez <strong>%{count}</strong> option."
-            other: "Choisissez <strong>%{count}</strong> options."
-          between_min_and_max_options: "Choisissez entre <strong>%{min}</strong> et <strong>%{max}</strong> options."
       cast-votes:
         title: "Distribuez vos votes"
         label: "Votez maintenant !"
       show-results:
         title: "Afficher les résultats du sondage"
-        label: "Afficher les résultats"
+        label: "Résultats"
       remove-vote:
         title: "Supprimer votre vote"
-        label: "Supprimer le vote"
       hide-results:
         title: "Retourner au vote"
-        label: "Afficher le sondage"
       group-results:
         title: "Grouper les votes par champ utilisateur"
         label: "Afficher les détails"
@@ -72,6 +58,8 @@ fr:
         breakdown: "Détails"
         percentage: "Pourcentage"
         count: "Nombre"
+      options:
+        label: "Options"
       error_while_toggling_status: "Nous sommes désolés, une erreur s'est produite lors du changement de statut de ce sondage."
       error_while_casting_votes: "Nous sommes désolés, une erreur s'est produite lors de l'envoi de vos votes."
       error_while_fetching_voters: "Nous sommes désolés, une erreur s'est produite lors de l'affichage des votants."
diff --git a/plugins/poll/config/locales/client.gl.yml b/plugins/poll/config/locales/client.gl.yml
index 9166bf0af8b..d91a280d8ee 100644
--- a/plugins/poll/config/locales/client.gl.yml
+++ b/plugins/poll/config/locales/client.gl.yml
@@ -25,27 +25,14 @@ gl:
           title: "Os resultados amosaranse logo de <strong>pechada</strong>."
         staff:
           title: "Os resultados só se amosan a membros do <strong>equipo</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Escolla polo menos a opción <strong>%{count}</strong>."
-            other: "Escolla polo menos as opcións <strong>%{count}</strong>."
-          up_to_max_options:
-            one: "Escolla ata <strong>%{count}</strong> opción."
-            other: "Escolla ata <strong>%{count}</strong> opcións."
-          x_options:
-            one: "Escolla <strong>%{count}</strong> opción."
-            other: "Escolla <strong>%{count}</strong> opcións."
-          between_min_and_max_options: "Escolla entre as opcións <strong>%{min}</strong> e <strong>%{max}</strong>."
       cast-votes:
         title: "Vote"
         label: "Vote agora!"
       show-results:
         title: "Amosar os resultados da enquisa"
-        label: "Amosar os resultados"
+        label: "Resultados"
       hide-results:
         title: "Volver aos seus votos"
-        label: "Amosar o voto"
       group-results:
         title: "Agrupar votos por campo de usuario"
         label: "Amosar en detalle"
@@ -69,6 +56,8 @@ gl:
         breakdown: "Detalle"
         percentage: "Porcentaxe"
         count: "Conta"
+      options:
+        label: "Opcións"
       error_while_toggling_status: "Desculpe, produciuse un erro ao trocar o status desta enquisa."
       error_while_casting_votes: "Desculpe, produciuse un erro na emisión dos seus votos."
       error_while_fetching_voters: "Desculpe, produciuse un erro ao presentar os votantes."
diff --git a/plugins/poll/config/locales/client.he.yml b/plugins/poll/config/locales/client.he.yml
index 39da0cf047b..fc59efdd8ab 100644
--- a/plugins/poll/config/locales/client.he.yml
+++ b/plugins/poll/config/locales/client.he.yml
@@ -32,33 +32,33 @@ he:
       multiple:
         help:
           at_least_min_options:
-            one: "יש לבחור באפשרות <strong>%{count}</strong> לפחות."
-            two: "יש לבחור <strong>%{count}</strong> אפשרויות לפחות."
-            many: "יש לבחור <strong>%{count}</strong> אפשרויות לפחות."
-            other: "יש לבחור <strong>%{count}</strong> אפשרויות לפחות."
+            one: "נא לבחור לפחות ב<strong>אפשרות אחת</strong>."
+            two: "נא לבחור לפחות ב־<strong>%{count} אפשרויות</strong>."
+            many: "נא לבחור לפחות ב־<strong>%{count} אפשרויות</strong>."
+            other: "נא לבחור לפחות ב־<strong>%{count} אפשרויות</strong>."
           up_to_max_options:
-            one: "יש לבחור אפשרות <strong>%{count}</strong> לכל היותר."
-            two: "יש לבחור עד <strong>%{count}</strong> אפשרויות."
-            many: "יש לבחור עד <strong>%{count}</strong> אפשרויות."
-            other: "יש לבחור עד <strong>%{count}</strong> אפשרויות."
+            one: "נא לבחור עד <strong>אפשרות אחת</strong>."
+            two: "נא לבחור עד <strong>%{count} אפשרויות</strong>."
+            many: "נא לבחור עד <strong>%{count} אפשרויות</strong>."
+            other: "נא לבחור עד <strong>%{count} אפשרויות</strong>."
           x_options:
-            one: "יש לבחור באפשרות <strong>%{count}</strong>."
-            two: "יש לבחור <strong>%{count}</strong> אפשרויות."
-            many: "יש לבחור <strong>%{count}</strong> אפשרויות."
-            other: "יש לבחור <strong>%{count}</strong> אפשרויות."
-          between_min_and_max_options: "נא לבחור בין <strong>%{min}</strong> ל־<strong>%{max}</strong> אפשרויות."
+            one: "נא לבחור ב<strong>אפשרות אחת</strong>."
+            two: "נא לבחור ב־<strong>%{count} אפשרויות</strong>."
+            many: "נא לבחור ב־<strong>%{count} אפשרויות</strong>."
+            other: "נא לבחור ב־<strong>%{count} אפשרויות</strong>."
+          between_min_and_max_options: "נא לבחור בין <strong>%{min} ל־%{max} אפשרויות</strong>."
       cast-votes:
         title: "להצביע"
         label: "להצביע עכשיו!"
       show-results:
         title: "הצגת תוצאות הסקר"
-        label: "הצגת תוצאות"
+        label: "תוצאות"
       remove-vote:
         title: "הסרת הצבעתך"
-        label: "הסרת הצבעה"
+        label: "ביטול הצבעה"
       hide-results:
         title: "חזרה להצבעות שלך"
-        label: "הצגת הצבעה"
+        label: "הצבעה"
       group-results:
         title: "קיבוץ הצבעות לפי משתמש"
         label: "הצגת פילוח"
@@ -82,6 +82,8 @@ he:
         breakdown: "פילוח"
         percentage: "אחוזים"
         count: "ספירה"
+      options:
+        label: "אפשרויות"
       error_while_toggling_status: " חלה שגיאה בשינוי המצב של סקר זה, עמך הסליחה."
       error_while_casting_votes: "חלה שגיאה בהצבעתך, עמך הסליחה."
       error_while_fetching_voters: "חלה שגיאה בהצגת המצביעים, עמך הסליחה."
diff --git a/plugins/poll/config/locales/client.hr.yml b/plugins/poll/config/locales/client.hr.yml
index 184bb8bd9a1..ba40b057561 100644
--- a/plugins/poll/config/locales/client.hr.yml
+++ b/plugins/poll/config/locales/client.hr.yml
@@ -27,33 +27,16 @@ hr:
           title: "Rezultati će biti prikazani nakon <strong>zatvaranja</strong>."
         staff:
           title: "Rezultati se prikazuju samo članovima <strong>osoblja</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Odaberite najmanje <strong>%{count}</strong> opciju."
-            few: "Odaberite najmanje <strong>%{count}</strong> opcije."
-            other: "Odaberite najmanje <strong>%{count}</strong> opcija."
-          up_to_max_options:
-            one: "Odaberite najviše <strong>%{count}</strong> opciju."
-            few: "Odaberite najviše <strong>%{count}</strong> opcije."
-            other: "Odaberite najviše <strong>%{count}</strong> opcija."
-          x_options:
-            one: "Odaberite <strong>%{count}</strong> opciju."
-            few: "Odaberite <strong>%{count}</strong> opcije."
-            other: "Odaberite <strong>%{count}</strong> opcija."
-          between_min_and_max_options: "Odaberite između <strong>%{min}</strong> i <strong>%{max}</strong> mogućnosti."
       cast-votes:
         title: "Dajte svoj glas"
         label: "Glasaj sada!"
       show-results:
         title: "Prikaži resultate anketa"
-        label: "Pokaži rezultate"
+        label: "Rezultati"
       remove-vote:
         title: "Ukloni svoj glas"
-        label: "Ukloni glas"
       hide-results:
         title: "Nazad na vaše glasove"
-        label: "Prikaži glasovanje"
       group-results:
         title: "Grupiranje glasova prema korisničkom polju"
         label: "Prikaži detaljnu podjelu"
@@ -77,6 +60,8 @@ hr:
         breakdown: "Slom"
         percentage: "Postotak"
         count: "Količina"
+      options:
+        label: "Mogućnosti"
       error_while_toggling_status: "Nažalost, došlo je do pogreške prilikom izmjene statusa ove ankete."
       error_while_casting_votes: "Žao nam je, došlo je do pogreške prilikom vašeg glasanja."
       error_while_fetching_voters: "Žao nam je, došlo je do pogreške prilikom prikaza glasača."
diff --git a/plugins/poll/config/locales/client.hu.yml b/plugins/poll/config/locales/client.hu.yml
index b2055da3a99..1dfab7686c5 100644
--- a/plugins/poll/config/locales/client.hu.yml
+++ b/plugins/poll/config/locales/client.hu.yml
@@ -25,30 +25,16 @@ hu:
           title: "Az eredmények a <strong>szavazás lezárásakor</strong> lesznek megjelenítve."
         staff:
           title: "Az eredményeket csak a <strong>stábtagok</strong> láthatják."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Legalább <strong>%{count}</strong> lehetőséget válasszon."
-            other: "Legalább <strong>%{count}</strong> lehetőséget válasszon."
-          up_to_max_options:
-            one: "Legfeljebb <strong>%{count}</strong> lehetőséget válasszon."
-            other: "Legfeljebb <strong>%{count}</strong> lehetőséget válasszon."
-          x_options:
-            one: "Válasszon <strong>%{count}</strong> lehetőséget."
-            other: "Válasszon <strong>%{count}</strong> lehetőséget."
-          between_min_and_max_options: "Válasszon legalább <strong>%{min}</strong>, de legfeljebb <strong>%{max}</strong> lehetőséget."
       cast-votes:
         title: "Szavazat leadása"
         label: "Szavazzon most!"
       show-results:
         title: "Eredmények megjelenítése"
-        label: "Eredmények megjelenítése"
+        label: "Eredmények"
       remove-vote:
         title: "Saját szavazat eltávolítása"
-        label: "Szavazat eltávolítása"
       hide-results:
         title: "Vissza a szavazataihoz"
-        label: "Szavazás megjelenítése"
       group-results:
         title: "Szavazatok csoportosítása felhasználói mező szerint"
         label: "Bontás megjelenítése"
@@ -72,6 +58,8 @@ hu:
         breakdown: "Bontás"
         percentage: "Százalék"
         count: "Számláló"
+      options:
+        label: "Beállítások"
       error_while_toggling_status: "Sajnáljuk, hiba történt a szavazás állapotának átváltásakor."
       error_while_casting_votes: "Sajnáljuk, hiba történt a szavazata leadásakor."
       error_while_fetching_voters: "Sajnáljuk, hiba történt a szavazók megjelenítésekor."
diff --git a/plugins/poll/config/locales/client.hy.yml b/plugins/poll/config/locales/client.hy.yml
index 5ed8e58a578..673daf44552 100644
--- a/plugins/poll/config/locales/client.hy.yml
+++ b/plugins/poll/config/locales/client.hy.yml
@@ -26,7 +26,7 @@ hy:
         label: "Քվեարկեք հիմա !"
       show-results:
         title: "Ցուցադրել հարցման արդյունքները"
-        label: "Ցուցադրել արդյունքները"
+        label: "Արդյունքները"
       hide-results:
         title: "Վերադառնալ դեպի Ձեր քվեները"
       export-results:
@@ -44,6 +44,8 @@ hy:
         age: "Փակված է՝ <strong>%{age}</strong>"
       breakdown:
         count: "Քանակ"
+      options:
+        label: "Տարբերակներ"
       error_while_toggling_status: "Ներողություն, այս հարցման կարգավիճակը փոխելիս տեղի է ունեցել սխալ:"
       error_while_casting_votes: "Ներողություն, Ձեր քվեարկելիս տեղի է ունեցել սխալ:"
       error_while_fetching_voters: "Ներողություն, քվեարկողներին ցուցադրելիս տեղի է ունեցել սխալ:"
diff --git a/plugins/poll/config/locales/client.id.yml b/plugins/poll/config/locales/client.id.yml
index 6e20d92928c..6ae065f29e7 100644
--- a/plugins/poll/config/locales/client.id.yml
+++ b/plugins/poll/config/locales/client.id.yml
@@ -22,15 +22,23 @@ id:
       multiple:
         help:
           at_least_min_options:
-            other: "Pilih setidaknya <strong>%{count}</strong> opsi."
+            other: "Pilih setidaknya <strong>%{count} opsi</strong>."
+          up_to_max_options:
+            other: "Pilih hingga <strong>%{count} pilihan</strong>."
+          x_options:
+            other: "Pilih <strong>%{count} pilihan</strong>."
+          between_min_and_max_options: "Pilih antara <strong>%{min} dan %{max} opsi</strong>."
       cast-votes:
         title: "Gunakan suaramu"
         label: "Pilih sekarang!"
       show-results:
         title: "Lihat hasil polling"
-        label: "Lihat hasil"
+        label: "Hasil"
+      remove-vote:
+        label: "Batalkan pilihan"
       hide-results:
         title: "Kembali ke suaramu"
+        label: "Pilih"
       group-results:
         label: "Tampilkan rincian"
       export-results:
@@ -51,6 +59,8 @@ id:
         votes: "%{count} suara"
         percentage: "Persentase"
         count: "Jumlah"
+      options:
+        label: "Opsi"
       error_while_toggling_status: "Maaf, telah terjadi kesalahan pengalihan status dari pemilihan ini."
       ui_builder:
         insert: Masukkan Poll
diff --git a/plugins/poll/config/locales/client.it.yml b/plugins/poll/config/locales/client.it.yml
index 9cb69c8b8b8..b827bb090a3 100644
--- a/plugins/poll/config/locales/client.it.yml
+++ b/plugins/poll/config/locales/client.it.yml
@@ -36,19 +36,19 @@ it:
           x_options:
             one: "Scegli <strong>%{count}</strong> opzione."
             other: "Scegli <strong>%{count}</strong> opzioni."
-          between_min_and_max_options: "Scegli tra <strong>%{min}</strong> e <strong>%{max}</strong> opzioni."
+          between_min_and_max_options: "Scegli tra <strong>%{min} e %{max} opzioni</strong>."
       cast-votes:
         title: "Vota"
         label: "Vota ora!"
       show-results:
         title: "Visualizza i risultati del sondaggio"
-        label: "Mostra i risultati"
+        label: "Risultati"
       remove-vote:
         title: "Annulla il tuo voto"
-        label: "Annulla voto"
+        label: "Annulla il voto"
       hide-results:
         title: "Torna ai sondaggi"
-        label: "Mostra voto"
+        label: "Vota"
       group-results:
         title: "Voti raggruppati per campo utente"
         label: "Mostra la suddivisione"
@@ -72,6 +72,8 @@ it:
         breakdown: "Ripartizione"
         percentage: "Percentuale"
         count: "Conteggio"
+      options:
+        label: "Opzioni"
       error_while_toggling_status: "Spiacenti, si è verificato un errore nel cambiamento di stato di questo sondaggio."
       error_while_casting_votes: "Spiacenti, si è verificato un errore nella votazione."
       error_while_fetching_voters: "Spiacenti, si è verificato un errore nel visualizzare i votanti."
diff --git a/plugins/poll/config/locales/client.ja.yml b/plugins/poll/config/locales/client.ja.yml
index 51a7bc50dae..80d9d753ccb 100644
--- a/plugins/poll/config/locales/client.ja.yml
+++ b/plugins/poll/config/locales/client.ja.yml
@@ -23,27 +23,16 @@ ja:
           title: "結果は投票が<strong>クローズ</strong>になると表示されます。"
         staff:
           title: "結果は<strong>スタッフ</strong>メンバーにのみ表示されます。"
-      multiple:
-        help:
-          at_least_min_options:
-            other: "少なくともオプションを <strong>%{count}</strong> 個を選択してください。"
-          up_to_max_options:
-            other: "オプションを <strong>%{count}</strong> 個まで選択してください。"
-          x_options:
-            other: "オプションを <strong>%{count}</strong> 個選択してください。"
-          between_min_and_max_options: "<strong>%{min}</strong>～<strong>%{max}</strong> 個のオプションを選択してください。"
       cast-votes:
         title: "投票する"
         label: "今すぐ投票！"
       show-results:
         title: "投票結果を表示する"
-        label: "結果を表示する"
+        label: "結果"
       remove-vote:
         title: "投票の削除"
-        label: "投票を削除"
       hide-results:
         title: "自分の投票に戻る"
-        label: "投票を表示する"
       group-results:
         title: "ユーザーフィールド別に投票をグループ化"
         label: "内訳を表示する"
@@ -67,6 +56,8 @@ ja:
         breakdown: "内訳"
         percentage: "割合"
         count: "票数"
+      options:
+        label: "オプション"
       error_while_toggling_status: "この投票のステータスを切り替える際にエラーが発生しました。"
       error_while_casting_votes: "投票の際にエラーが発生しました。"
       error_while_fetching_voters: "投票者を表示する際にエラーが発生しました。"
diff --git a/plugins/poll/config/locales/client.ko.yml b/plugins/poll/config/locales/client.ko.yml
index 75c51a8e79d..2975422a1a3 100644
--- a/plugins/poll/config/locales/client.ko.yml
+++ b/plugins/poll/config/locales/client.ko.yml
@@ -23,27 +23,16 @@ ko:
           title: "결과가 <strong>닫히면 표시</strong> 됩니다."
         staff:
           title: "결과는 <strong>직원</strong> 에게만 표시됩니다."
-      multiple:
-        help:
-          at_least_min_options:
-            other: "최소 <strong>%{count}</strong>개의 옵션을 선택하십시오."
-          up_to_max_options:
-            other: "최대 <strong>%{count}</strong>개의 옵션을 선택하십시오."
-          x_options:
-            other: "<strong>%{count}</strong> 옵션 선택"
-          between_min_and_max_options: "<strong>%{min}</strong> 과 <strong>%{max}</strong> 중에서 옵션을 선택하십시오."
       cast-votes:
         title: "표 던지기"
         label: "지금 투표!"
       show-results:
         title: "투표 결과 표시"
-        label: "결과 보기"
+        label: "검색 결과"
       remove-vote:
         title: "내 투표 삭제"
-        label: "투표 삭제"
       hide-results:
         title: "투표로 돌아가기"
-        label: "투표 표시"
       group-results:
         title: "사용자 필드 별 그룹 투표"
         label: "고장 표시"
@@ -67,6 +56,8 @@ ko:
         breakdown: "분석"
         percentage: "백분율"
         count: "수"
+      options:
+        label: "옵션"
       error_while_toggling_status: "죄송합니다. 이 투표의 상태를 바꾸는 도중 에러가 발생하였습니다."
       error_while_casting_votes: "죄송합니다. 투표를 하는 도중 에러가 발생하였습니다."
       error_while_fetching_voters: "죄송합니다. 투표한 사람을 표시하는 도중 에러가 발생하였습니다."
diff --git a/plugins/poll/config/locales/client.lt.yml b/plugins/poll/config/locales/client.lt.yml
index d3350c1ac32..31cb6fce6ba 100644
--- a/plugins/poll/config/locales/client.lt.yml
+++ b/plugins/poll/config/locales/client.lt.yml
@@ -23,21 +23,16 @@ lt:
       results:
         groups:
           title: "Jūs turite būti %{groups} narys, norėdami balsuoti šioje apklausoje."
-      multiple:
-        help:
-          between_min_and_max_options: "Pasirinkite tarp <strong>%{min}</strong> ir <strong>%{max}</strong> parinkčių."
       cast-votes:
         title: "Apskaičiuoti tavo balsus"
         label: "Balsuoti dabar!"
       show-results:
         title: "Rodyti balsavimo rezultatus"
-        label: "Rodyti rezultatus"
+        label: "Rezultatai"
       remove-vote:
         title: "Pašalinti savo balsą"
-        label: "Pašalinti balsą"
       hide-results:
         title: "Grįžti į balsavimus"
-        label: "Rodyti balsavimą"
       group-results:
         title: "Grupuoti balsus pagal vartotojo lauką"
         label: "Rodyti suskirstymą"
@@ -60,6 +55,8 @@ lt:
         votes: "%{count} balsų"
         percentage: "Procentas"
         count: "Skaičiuoti"
+      options:
+        label: "Nustatymai"
       error_while_toggling_status: "Atsiprašome, perjungiant šios apklausos būseną įvyko klaida."
       error_while_casting_votes: "Atsiprašome, balsuojant įvyko klaida."
       error_while_fetching_voters: "Atsiprašome, rodant rinkėjus įvyko klaida."
diff --git a/plugins/poll/config/locales/client.lv.yml b/plugins/poll/config/locales/client.lv.yml
index 4c9cd0195bf..5913a2001ad 100644
--- a/plugins/poll/config/locales/client.lv.yml
+++ b/plugins/poll/config/locales/client.lv.yml
@@ -19,18 +19,13 @@ lv:
           title: "Rezultāti tiks parādīti <strong>balsojumu</strong>."
         staff:
           title: "Rezultāti tiek parādīti tikai <strong>darbiniekiem</strong> darbiniekiem."
-      multiple:
-        help:
-          between_min_and_max_options: "Izvēlieties starp <strong>%{min}</strong> un <strong>%{max}</strong> iespējām."
       cast-votes:
         title: "Atdod savas balsis"
         label: "Balso tagad!"
       show-results:
         title: "Parādīt aptaujas rezultātus"
-        label: "Rādīt rezultātus"
       hide-results:
         title: "Atpakaļ pie balsojumiem"
-        label: "Parādīt balsojumu"
       group-results:
         title: "Grupējiet balsojumus pēc lietotāja lauka"
         label: "Rādīt sadalījumu"
@@ -54,6 +49,8 @@ lv:
         breakdown: "Sadalījums"
         percentage: "Procentuāli"
         count: "Skaits"
+      options:
+        label: "Opcijas"
       error_while_toggling_status: "Diemžēl, mainot šīs aptaujas statusu, radās kļūda."
       error_while_casting_votes: "Atvainojiet, radās kļūda balsojot."
       error_while_fetching_voters: "Atvainojiet, parādot vēlētājus, radās kļūda."
diff --git a/plugins/poll/config/locales/client.nb_NO.yml b/plugins/poll/config/locales/client.nb_NO.yml
index 3676b2de090..a093067410b 100644
--- a/plugins/poll/config/locales/client.nb_NO.yml
+++ b/plugins/poll/config/locales/client.nb_NO.yml
@@ -25,27 +25,14 @@ nb_NO:
           title: "Resultatene vises når <strong>lukket</strong>."
         staff:
           title: "Resultatene vises bare til <strong>Moderatorer</strong> medlemmer."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Velg minst <strong>%{count}</strong> alternativ."
-            other: "Velg minst <strong>%{count}</strong> alternativ"
-          up_to_max_options:
-            one: "Velg opptil <strong>%{count}</strong> alternativ."
-            other: "Velg opptil <strong>%{count}</strong> alternativer."
-          x_options:
-            one: "Velg <strong>%{count}</strong> alternativ."
-            other: "Velg <strong>%{count}</strong> alternativer."
-          between_min_and_max_options: "Velg mellom <strong>%{min}</strong> og <strong>%{max}</strong> alternativer."
       cast-votes:
         title: "Stem nå"
         label: "Stem!"
       show-results:
         title: "Vis resultat"
-        label: "Vis resultat"
+        label: "Resultater"
       hide-results:
         title: "Tilbake til dine stemmer"
-        label: "Vis stemme"
       group-results:
         title: "Gruppere stemmer etter brukerfelt"
         label: "Vis Fordeling"
@@ -69,6 +56,8 @@ nb_NO:
         breakdown: "Fordeling"
         percentage: "Prosent"
         count: "Antall"
+      options:
+        label: "Alternativer"
       error_while_toggling_status: "Beklager, det oppstod en feil ved endring av status på denne avstemningen."
       error_while_casting_votes: "Beklager, det oppstod en feil da du ga din stemme."
       error_while_fetching_voters: "Beklager, det oppstod en feil når stemmegivere skulle vises."
diff --git a/plugins/poll/config/locales/client.nl.yml b/plugins/poll/config/locales/client.nl.yml
index 91045eb4aef..923d398b187 100644
--- a/plugins/poll/config/locales/client.nl.yml
+++ b/plugins/poll/config/locales/client.nl.yml
@@ -25,30 +25,16 @@ nl:
           title: "Resultaten worden weergegeven zodra <strong>gesloten</strong>."
         staff:
           title: "Resultaten worden alleen aan <strong>medewerkers</strong> weergegeven."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Kies minstens <strong>%{count}</strong> optie."
-            other: "Kies minstens <strong>%{count}</strong> opties."
-          up_to_max_options:
-            one: "Kies maximaal <strong>%{count}</strong> optie."
-            other: "Kies maximaal <strong>%{count}</strong> opties."
-          x_options:
-            one: "Kies <strong>%{count}</strong> optie."
-            other: "Kies <strong>%{count}</strong> opties."
-          between_min_and_max_options: "Kies <strong>%{min}</strong> tot <strong>%{max}</strong> opties."
       cast-votes:
         title: "Je stemmen uitbrengen"
         label: "Stem nu!"
       show-results:
         title: "De pollresultaten weergeven"
-        label: "Resultaten weergeven"
+        label: "Resultaten"
       remove-vote:
         title: "Verwijder je stem"
-        label: "Stem verwijderen"
       hide-results:
         title: "Terug naar je stemmen"
-        label: "Stem weergeven"
       group-results:
         title: "Stemmen groeperen op gebruikersveld"
         label: "Verdeling weergeven"
@@ -72,6 +58,8 @@ nl:
         breakdown: "Verdeling"
         percentage: "Percentage"
         count: "Aantal"
+      options:
+        label: "Opties"
       error_while_toggling_status: "Sorry, er is een fout opgetreden bij het omschakelen van de status van deze poll."
       error_while_casting_votes: "Sorry, er is een fout opgetreden bij het uitbrengen van je stemmen."
       error_while_fetching_voters: "Sorry, er is een fout opgetreden bij het weergeven van de stemmers."
diff --git a/plugins/poll/config/locales/client.pl_PL.yml b/plugins/poll/config/locales/client.pl_PL.yml
index 5516e0a2ba8..abd8aea82a4 100644
--- a/plugins/poll/config/locales/client.pl_PL.yml
+++ b/plugins/poll/config/locales/client.pl_PL.yml
@@ -32,33 +32,33 @@ pl_PL:
       multiple:
         help:
           at_least_min_options:
-            one: "Wybierz przynajmniej <strong>%{count}</strong> opcję."
-            few: "Wybierz przynajmniej <strong>%{count}</strong> opcje."
-            many: "Wybierz przynajmniej <strong>%{count}</strong> opcji."
-            other: "Wybierz co najmniej <strong>%{count}</strong> opcji."
+            one: "Wybierz co najmniej <strong>%{count} opcję</strong>."
+            few: "Wybierz co najmniej <strong>%{count} opcję</strong>."
+            many: "Wybierz co najmniej <strong>%{count} opcji</strong>."
+            other: "Wybierz co najmniej <strong>%{count} opcji</strong>."
           up_to_max_options:
-            one: "Wybierz przynajmniej <strong>%{count}</strong> opcję."
-            few: "Wybierz przynajmniej <strong>%{count}</strong> opcje."
-            many: "Wybierz przynajmniej <strong>%{count}</strong> opcji."
-            other: "Wybierz co najmniej <strong>%{count}</strong> opcji."
+            one: "Wybierz maksymalnie <strong>%{count} opcję</strong>."
+            few: "Wybierz maksymalnie <strong>%{count} opcję</strong>."
+            many: "Wybierz maksymalnie <strong>%{count} opcji</strong>."
+            other: "Wybierz maksymalnie <strong>%{count} opcji</strong>."
           x_options:
-            one: "Wybierz przynajmniej <strong>%{count}</strong> opcję."
-            few: "Wybierz przynajmniej <strong>%{count}</strong> opcje."
-            many: "Wybierz przynajmniej <strong>%{count}</strong> opcji."
-            other: "Wybierz co najmniej <strong>%{count}</strong> opcji."
-          between_min_and_max_options: "Wybierz między <strong>%{min}</strong> a <strong>%{max}</strong> opcji."
+            one: "Wybierz <strong>%{count} opcję</strong>."
+            few: "Wybierz <strong>%{count} opcję</strong>."
+            many: "Wybierz <strong>%{count} opcji</strong>."
+            other: "Wybierz <strong>%{count} opcji</strong>."
+          between_min_and_max_options: "Wybierz pomiędzy <strong>%{min} a %{max} opcjami</strong>."
       cast-votes:
         title: "Oddaj głos"
         label: "Oddaj głos!"
       show-results:
         title: "Wyświetl wyniki ankiety"
-        label: "Pokaż wyniki"
+        label: "Wyniki"
       remove-vote:
         title: "Usuń swój głos"
-        label: "Usuń głos"
+        label: "Cofnij głos"
       hide-results:
         title: "Wróć do oddanych głosów"
-        label: "Pokaż głos"
+        label: "Głosuj"
       group-results:
         title: "Grupuj głosy według pól użytkownika"
         label: "Pokaż podsumowanie"
@@ -82,6 +82,8 @@ pl_PL:
         breakdown: "Podział"
         percentage: "Procent"
         count: "Liczba"
+      options:
+        label: "Opcje"
       error_while_toggling_status: "Przepraszamy, wystąpił błąd podczas przełączania statusu w tej ankiecie."
       error_while_casting_votes: "Przepraszamy, wystąpił błąd podczas oddawania głosów."
       error_while_fetching_voters: "Przepraszamy, wystąpił błąd podczas wyświetlania głosujących."
diff --git a/plugins/poll/config/locales/client.pt.yml b/plugins/poll/config/locales/client.pt.yml
index ffb5c15e76e..a34b22ed66d 100644
--- a/plugins/poll/config/locales/client.pt.yml
+++ b/plugins/poll/config/locales/client.pt.yml
@@ -25,30 +25,16 @@ pt:
           title: "Os resultados serão mostrados após o <strong>fecho</strong>."
         staff:
           title: "Os resultados serão apenas mostrados aos membros do <strong>pessoal</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Escolha pelo menos <strong>%{count}</strong> opção."
-            other: "Escolha pelo menos <strong>%{count}</strong> opções."
-          up_to_max_options:
-            one: "Escolha até <strong>%{count}</strong> opção."
-            other: "Escolha até <strong>%{count}</strong> opções."
-          x_options:
-            one: "Escolha <strong>%{count}</strong> opção"
-            other: "Escolha <strong>%{count}</strong> opções"
-          between_min_and_max_options: "Escolha entre as opções <strong>%{min}</strong> e <strong>%{max}</strong>."
       cast-votes:
         title: "Vote"
         label: "Vote agora!"
       show-results:
         title: "Exibir os resultados da sondagem"
-        label: "Mostrar resultados"
+        label: "Resultados"
       remove-vote:
         title: "Remova o seu voto"
-        label: "Remover voto"
       hide-results:
         title: "Voltar para os seus votos"
-        label: "Mostrar voto"
       group-results:
         title: "Agrupar votos por campo de utilizador"
         label: "Mostrar detalhes"
@@ -72,6 +58,8 @@ pt:
         breakdown: "Detalhe"
         percentage: "Percentagem"
         count: "Soma"
+      options:
+        label: "Opções"
       error_while_toggling_status: "Lamentamos, mas ocorreu um erro ao alternar o estado desta sondagem."
       error_while_casting_votes: "Lamentamos, mas ocorreu um erro ao submeter os seus votos."
       error_while_fetching_voters: "Lamentamos, mas ocorreu um erro ao exibir os votantes."
diff --git a/plugins/poll/config/locales/client.pt_BR.yml b/plugins/poll/config/locales/client.pt_BR.yml
index 276aaf02bcd..c30f376adb0 100644
--- a/plugins/poll/config/locales/client.pt_BR.yml
+++ b/plugins/poll/config/locales/client.pt_BR.yml
@@ -25,30 +25,16 @@ pt_BR:
           title: "Resultados serão mostrados quando a votação <strong>terminar</strong>."
         staff:
           title: "Resultados são mostrados apenas para membros da <strong>equipe</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Escolha pelo menos <strong>%{count}</strong> opção."
-            other: "Escolha pelo menos <strong>%{count}</strong> opções."
-          up_to_max_options:
-            one: "Escolha até <strong>%{count}</strong> opção."
-            other: "Escolha até <strong>%{count}</strong> opções."
-          x_options:
-            one: "Escolha <strong>%{count}</strong> opção."
-            other: "Escolha <strong>%{count}</strong> opções."
-          between_min_and_max_options: "Escolha entre <strong>%{min}</strong> e <strong>%{max}</strong> opções."
       cast-votes:
         title: "Participe da enquete"
         label: "Votar agora!"
       show-results:
         title: "Mostrar o resultado da enquete"
-        label: "Mostrar resultados"
+        label: "Resultados"
       remove-vote:
         title: "Remover seu voto"
-        label: "Remover voto"
       hide-results:
         title: "Voltar para os seus votos"
-        label: "Mostrar voto"
       group-results:
         title: "Agrupar votos por campo de usuário(a)"
         label: "Mostrar divisão"
@@ -72,6 +58,8 @@ pt_BR:
         breakdown: "Divisão"
         percentage: "Porcentagem"
         count: "Contagem"
+      options:
+        label: "Opções"
       error_while_toggling_status: "Desculpe, houve um erro ao mudar o status desta enquete."
       error_while_casting_votes: "Desculpe, houve um erro ao registrar os seus votos."
       error_while_fetching_voters: "Desculpe, houve um erro ao exibir os votantes."
diff --git a/plugins/poll/config/locales/client.ro.yml b/plugins/poll/config/locales/client.ro.yml
index d347f5de777..affb5fac330 100644
--- a/plugins/poll/config/locales/client.ro.yml
+++ b/plugins/poll/config/locales/client.ro.yml
@@ -30,21 +30,25 @@ ro:
       multiple:
         help:
           at_least_min_options:
-            one: "Alegeți cel puțin <strong>%{count}</strong> opțiune."
+            one: "Alege cel puțin <strong>%{count} opțiune</strong>."
             few: "Alegeți cel puțin <strong>%{count}</strong> opțiuni."
-            other: "Alege cel puțin <strong>%{count}</strong> opțiuni."
-          between_min_and_max_options: "Alege între <strong>%{min}</strong> și <strong>%{max}</strong> opțiuni."
+            other: "Alege cel puțin <strong>%{count} opțiuni</strong>."
+          up_to_max_options:
+            one: "Alege până la <strong>%{count} </strong> opțiune."
+            few: "Alegeți până la <strong>%{count} </strong> opțiuni."
+            other: "Alege până la <strong>%{count} </strong> opțiuni."
+          between_min_and_max_options: "Alege între <strong>%{min} și %{max} opțiuni</strong>."
       cast-votes:
         title: "Exprimă-ți votul"
         label: "Votează acum!"
       show-results:
         title: "Afişează rezultatele sondajului"
-        label: "Afișează rezultate"
+        label: "Rezultate"
       remove-vote:
-        label: "Eliminați votul"
+        label: "Anulează votul"
       hide-results:
         title: "Înapoi la voturile tale"
-        label: "Arată votul"
+        label: "Votează"
       export-results:
         title: "Exportează rezultatele sondajului"
         label: "Exportă"
@@ -64,6 +68,8 @@ ro:
         votes: "%{count} voturi"
         percentage: "Procent"
         count: "Număr"
+      options:
+        label: "Opțiuni"
       error_while_toggling_status: "Ne pare rău, a apărut o eroare la schimbarea stării acestui sondaj."
       error_while_casting_votes: "Ne pare rău, a apărut o eroare la exercitarea voturilor tale."
       error_while_fetching_voters: "Ne pare rău, a apărut o eroare la afișarea votanților."
diff --git a/plugins/poll/config/locales/client.ru.yml b/plugins/poll/config/locales/client.ru.yml
index a1fd4b6a140..a6c5fbcf25c 100644
--- a/plugins/poll/config/locales/client.ru.yml
+++ b/plugins/poll/config/locales/client.ru.yml
@@ -29,36 +29,16 @@ ru:
           title: "Результаты будут показаны после <strong>завершения опроса</strong>."
         staff:
           title: "Результаты будут показаны только <strong>персоналу</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Выберите как минимум <strong>%{count}</strong> вариант ответа."
-            few: "Выберите как минимум <strong>%{count}</strong> варианта ответа."
-            many: "Выберите как минимум <strong>%{count}</strong> вариантов ответа."
-            other: "Выберите как минимум <strong>%{count}</strong> варианта ответа."
-          up_to_max_options:
-            one: "Выберите не более <strong>%{count}</strong> варианта ответа."
-            few: "Выберите не более <strong>%{count}</strong> вариантов ответа."
-            many: "Выберите не более <strong>%{count}</strong> вариантов ответа."
-            other: "Выберите не более <strong>%{count}</strong> варианта ответа."
-          x_options:
-            one: "Выберите <strong>%{count}</strong> вариант ответа."
-            few: "Выберите <strong>%{count}</strong> варианта ответа."
-            many: "Выберите <strong>%{count}</strong> вариантов ответа."
-            other: "Выберите <strong>%{count}</strong> варианта ответа."
-          between_min_and_max_options: "Выберите варианты ответов в диапазоне от <strong>%{min}</strong> до <strong>%{max}</strong>."
       cast-votes:
         title: "Проголосуйте"
         label: "Проголосовать!"
       show-results:
         title: "Показать результаты опроса"
-        label: "Показывать результаты"
+        label: "Результаты"
       remove-vote:
         title: "Удалить свой голос"
-        label: "Удалить голос"
       hide-results:
         title: "Вернуться к опросу"
-        label: "Скрыть результаты"
       group-results:
         title: "Группировать голоса по пользователям"
         label: "Показать распределение"
@@ -82,6 +62,8 @@ ru:
         breakdown: "Распределение"
         percentage: "Процент"
         count: "Количество"
+      options:
+        label: "Параметры"
       error_while_toggling_status: "Произошла ошибка при смене статуса опроса."
       error_while_casting_votes: "Произошла ошибка в процессе обработки вашего голоса."
       error_while_fetching_voters: "Произошла ошибка в процессе получения списка проголосовавших."
diff --git a/plugins/poll/config/locales/client.sk.yml b/plugins/poll/config/locales/client.sk.yml
index be8a0189d59..2e1d297a898 100644
--- a/plugins/poll/config/locales/client.sk.yml
+++ b/plugins/poll/config/locales/client.sk.yml
@@ -31,19 +31,19 @@ sk:
           title: "Výsledky sa zobrazujú len <strong>zamestnancom</strong>."
       multiple:
         help:
-          between_min_and_max_options: "Vyberte od <strong>%{min}</strong> do <strong>%{max}</strong> možností."
+          between_min_and_max_options: "Vyberte od <strong>%{min} do %{max} možností</strong>."
       cast-votes:
         title: "Hlasovať"
         label: "Hlasuj teraz!"
       show-results:
         title: "Zobraziť výsledky hlasovania"
-        label: "Zobraz výsledky"
+        label: "Výsledky"
       remove-vote:
         title: "Odstrániť hlas"
-        label: "Odstrániť hlas"
+        label: "Zrušiť hlas"
       hide-results:
         title: "Návrat na odovzdané hlasy"
-        label: "Zobraziť hlasovanie"
+        label: "Hlasovať"
       group-results:
         title: "Zoskupenie hlasov podľa poľa používateľa"
         label: "Zobraziť sumár"
@@ -67,6 +67,8 @@ sk:
         breakdown: "Sumár"
         percentage: "Percento"
         count: "Počet"
+      options:
+        label: "Možnosti"
       error_while_toggling_status: "Ľutujeme, nastala chyba pri prepínaní stavu tohto hlasovania."
       error_while_casting_votes: "Ľutujeme, nastala chyba pri prideľovaní Vašich hlasov."
       error_while_fetching_voters: "Ľutujeme, nastala chyba pri zobrazení účastníkov."
diff --git a/plugins/poll/config/locales/client.sl.yml b/plugins/poll/config/locales/client.sl.yml
index 98ebc99a4bd..95cacb8d065 100644
--- a/plugins/poll/config/locales/client.sl.yml
+++ b/plugins/poll/config/locales/client.sl.yml
@@ -29,33 +29,14 @@ sl:
           title: "Rezultati bodo prikazani, ko se glasovanje <strong>zapre</strong>."
         staff:
           title: "Rezultati so prikazani samo <strong>osebju</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Izberite vsaj <strong>%{count}</strong> možnost."
-            two: "Izberite vsaj <strong>%{count}</strong> možnosti."
-            few: "Izberite vsaj <strong>%{count}</strong> možnosti."
-            other: "Izberite vsaj <strong>%{count}</strong> možnosti."
-          up_to_max_options:
-            one: "Izberite največ <strong>%{count}</strong> možnost."
-            two: "Izberite največ <strong>%{count}</strong> možnosti."
-            few: "Izberite največ <strong>%{count}</strong> možnosti."
-            other: "Izberite največ <strong>%{count}</strong> možnosti."
-          x_options:
-            one: "Izberite <strong>%{count}</strong> možnost."
-            two: "Izberite <strong>%{count}</strong> možnosti."
-            few: "Izberite <strong>%{count}</strong> možnosti."
-            other: "Izberite <strong>%{count}</strong> možnosti."
-          between_min_and_max_options: "Izbirate lahko med <strong>%{min}</strong> in <strong>%{max}</strong> možnostmi."
       cast-votes:
         title: "Oddajte svoj glas"
         label: "Glasuj!"
       show-results:
         title: "Prikaži rezultate ankete"
-        label: "Prikaži rezultate"
+        label: "Rezultati"
       hide-results:
         title: "Nazaj na vašo glasovnico"
-        label: "Prikaži oddane glasove"
       group-results:
         title: "Zbiranje glasov po uporabniškem polju"
         label: "Pokaži razčlenitev"
@@ -79,6 +60,8 @@ sl:
         breakdown: "Razčlenitev"
         percentage: "Odstotki"
         count: "Število"
+      options:
+        label: "Možnosti"
       error_while_toggling_status: "Prišlo je do napake med spreminjanjem statusa te ankete."
       error_while_casting_votes: "Prišlo je do napake med oddajo vašega glasu."
       error_while_fetching_voters: "Prišlo je do napake med prikazom glasovalcev."
diff --git a/plugins/poll/config/locales/client.sq.yml b/plugins/poll/config/locales/client.sq.yml
index f19f236f128..98a55d8d8f9 100644
--- a/plugins/poll/config/locales/client.sq.yml
+++ b/plugins/poll/config/locales/client.sq.yml
@@ -19,7 +19,7 @@ sq:
         label: "Voto Tani"
       show-results:
         title: "Display the poll results"
-        label: "Shfaq rezultatet"
+        label: "Results"
       hide-results:
         title: "Back to your votes"
       export-results:
@@ -32,6 +32,8 @@ sq:
         title: "Mbyll sondazhin"
         label: "Mbyll"
         confirm: "Jeni të sigurt për të mbyllur këtë sondazh?"
+      options:
+        label: "Opsione"
       error_while_toggling_status: "Ndjesë, u has në një gabim kur u ndryshua gjendja e këtij sondazhi."
       error_while_casting_votes: "Ndjesë, u has në një gabim duke mbledhur votat tuaja."
       error_while_fetching_voters: "Ndjesë, u has në një gabim duke shfaqur votuesit."
diff --git a/plugins/poll/config/locales/client.sr.yml b/plugins/poll/config/locales/client.sr.yml
index f29c53b30a2..f72983fd837 100644
--- a/plugins/poll/config/locales/client.sr.yml
+++ b/plugins/poll/config/locales/client.sr.yml
@@ -27,30 +27,14 @@ sr:
           title: "Rezultati će biti prikazani nakon <strong>zatvaranja</strong>."
         staff:
           title: "Rezultati će biti prikazani samo članovima <strong>osoblja</strong> ."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Odaberite najmanje <strong>%{count}</strong> opciju."
-            few: "Odaberite najmanje <strong>%{count}</strong> opcije."
-            other: "Odaberite najmanje <strong>%{count}</strong> opcija."
-          up_to_max_options:
-            one: "Odaberite najviše <strong>%{count}</strong> opciju."
-            few: "Odaberite najviše <strong>%{count}</strong> opcije."
-            other: "Odaberite najviše <strong>%{count}</strong> opcija."
-          x_options:
-            one: "Odaberite <strong>%{count}</strong> opciju."
-            few: "Odaberite <strong>%{count}</strong> opcije."
-            other: "Odaberite <strong>%{count}</strong> opcija."
-          between_min_and_max_options: "Odaberite između <strong>%{min}</strong> i <strong>%{max}</strong> opcije."
       cast-votes:
         title: "Daj svoj glas"
         label: "Glasaj sada!"
       show-results:
         title: "Prikaži rezultate ankete"
-        label: "Prikaži rezultate"
+        label: "Rezultati"
       hide-results:
         title: "Nazad ka vašim glasovima"
-        label: "Prikaži glas"
       group-results:
         title: "Grupiraj glasove prema korisničkom polju"
         label: "Prikaži raspodelu"
@@ -74,6 +58,8 @@ sr:
         breakdown: "Detalji"
         percentage: "Procenat"
         count: "Broj"
+      options:
+        label: "Opcije"
       error_while_toggling_status: "Žao nam je, došlo je do greške pri prikazivanju statusa ove ankete."
       error_while_casting_votes: "Žao nam je, došlo je do greške prilikom glasanja."
       error_while_fetching_voters: "Žao nam je, došlo je do greške prilikom prikazivanja glasača."
diff --git a/plugins/poll/config/locales/client.sv.yml b/plugins/poll/config/locales/client.sv.yml
index e2ac7794027..f13392a442a 100644
--- a/plugins/poll/config/locales/client.sv.yml
+++ b/plugins/poll/config/locales/client.sv.yml
@@ -28,27 +28,27 @@ sv:
       multiple:
         help:
           at_least_min_options:
-            one: "Välj minst <strong>%{count}</strong> alternativ."
-            other: "Välj minst <strong>%{count}</strong> alternativ."
+            one: "Välj minst <strong>%{count} alternativ</strong>."
+            other: "Välj minst <strong>%{count} alternativ</strong>."
           up_to_max_options:
-            one: "Välj upp till <strong>%{count}</strong> alternativ."
-            other: "Välj upp till <strong>%{count}</strong> alternativ."
+            one: "Välj upp till <strong>%{count} alternativ</strong>."
+            other: "Välj upp till <strong>%{count} alternativ</strong>."
           x_options:
-            one: "Välj <strong>%{count}</strong> alternativ."
-            other: "Välj <strong>%{count}</strong> alternativ."
-          between_min_and_max_options: "Välj mellan <strong>%{min}</strong> och <strong>%{max}</strong> alternativ."
+            one: "Välj <strong>%{count} alternativ</strong>."
+            other: "Välj <strong>%{count} alternativ</strong>."
+          between_min_and_max_options: "Välj mellan <strong>%{min} och %{max} alternativ</strong>."
       cast-votes:
         title: "Lägg dina röster"
         label: "Rösta nu!"
       show-results:
         title: "Visa omröstningsresultatet"
-        label: "Visa resultat"
+        label: "Resultat"
       remove-vote:
         title: "Ta bort din röst"
-        label: "Ta bort röst"
+        label: "Ångra röst"
       hide-results:
         title: "Tillbaka till dina röster"
-        label: "Visa röst"
+        label: "Rösta"
       group-results:
         title: "Gruppera röster baserat på användarfält"
         label: "Visa uppdelning"
@@ -72,6 +72,8 @@ sv:
         breakdown: "Fördelning"
         percentage: "Procent"
         count: "Räkna"
+      options:
+        label: "Alternativ"
       error_while_toggling_status: "Tyvärr uppstod det ett fel vid ändring av status för den här omröstningen."
       error_while_casting_votes: "Tyvärr uppstod det ett fel vid röstningen."
       error_while_fetching_voters: "Tyvärr uppstod det ett fel vid visningen av röster."
diff --git a/plugins/poll/config/locales/client.sw.yml b/plugins/poll/config/locales/client.sw.yml
index fb58f182190..b4408e013b4 100644
--- a/plugins/poll/config/locales/client.sw.yml
+++ b/plugins/poll/config/locales/client.sw.yml
@@ -21,7 +21,7 @@ sw:
         label: "Piga kura sasa!"
       show-results:
         title: "Onyesha matokeo ya uchaguzi"
-        label: "Onyesha matokeo"
+        label: "Majibu"
       hide-results:
         title: "Rudi kwenye kura zako"
       export-results:
@@ -34,6 +34,8 @@ sw:
         title: "Funga uchaguzi"
         label: "Funga"
         confirm: "Unauhakika unataka kufunga uchaguzi huu?"
+      options:
+        label: "Machaguo"
       error_while_toggling_status: "Samahani kulikuwa na hitilafu kwenye kubadilisha hali ya uchaguzi huu."
       error_while_casting_votes: "Samahani kulikuwa na hitilafu kwenye kupiga kura."
       error_while_fetching_voters: "Samahani kulikuwa na hitilafu kwenye kuonyesha wapiga kura."
diff --git a/plugins/poll/config/locales/client.te.yml b/plugins/poll/config/locales/client.te.yml
index e2ab9eafb58..2e09dd00b50 100644
--- a/plugins/poll/config/locales/client.te.yml
+++ b/plugins/poll/config/locales/client.te.yml
@@ -7,10 +7,14 @@
 te:
   js:
     poll:
+      show-results:
+        label: "ఫలితాలు"
       export-results:
         label: "ఎగుమతి"
       close:
         label: "మూసివేయి"
+      options:
+        label: "ఎంపికలు"
       ui_builder:
         poll_type:
           label: రకం
diff --git a/plugins/poll/config/locales/client.th.yml b/plugins/poll/config/locales/client.th.yml
index 76fa740fa9a..6be39acc790 100644
--- a/plugins/poll/config/locales/client.th.yml
+++ b/plugins/poll/config/locales/client.th.yml
@@ -15,16 +15,11 @@ th:
       results:
         groups:
           title: "คุณต้องเป็นสมาชิกของ %{groups} จึงจะโหวตในแบบสำรวจนี้ได้"
-      multiple:
-        help:
-          at_least_min_options:
-            other: "เลือกอย่างน้อย <strong>%{count}</strong> ตัวเลือก"
       cast-votes:
         title: "โหวต"
         label: "โหวตเดี๋ยวนี้"
       show-results:
         title: "แสดงผลโหวต"
-        label: "แสดงผล"
       hide-results:
         title: "กลับสู่การโหวต"
       export-results:
@@ -37,6 +32,8 @@ th:
         title: "ปิดโพล"
         label: "ปิด"
         confirm: "คุณแน่ใจหรือไม่ที่จะปิดโพลนี้"
+      options:
+        label: "ตัวเลือก"
       error_while_toggling_status: "ขออภัย มีข้อผิดพลาดในการแสดงสถานะของโพล"
       error_while_casting_votes: "ขออภัย มีข้อผิดพลาดในการโหวต"
       error_while_fetching_voters: "ขออภัย มีข้อผิดพลาดในการแสดงผู้โหวต"
diff --git a/plugins/poll/config/locales/client.tr_TR.yml b/plugins/poll/config/locales/client.tr_TR.yml
index d6265195728..b0da762809b 100644
--- a/plugins/poll/config/locales/client.tr_TR.yml
+++ b/plugins/poll/config/locales/client.tr_TR.yml
@@ -28,27 +28,27 @@ tr_TR:
       multiple:
         help:
           at_least_min_options:
-            one: "En az <strong>%{count}</strong> seçeneği seçin."
-            other: "En az <strong>%{count}</strong> seçenek belirleyin."
+            one: "En az <strong>%{count} seçenek</strong> belirleyin."
+            other: "En az <strong>%{count} seçenek</strong> belirleyin."
           up_to_max_options:
-            one: "En fazla <strong>%{count}</strong> seçenek belirleyin."
-            other: "En fazla <strong>%{count}</strong> seçenek belirleyin."
+            one: "En fazla <strong>%{count} seçenek</strong> belirleyin."
+            other: "En fazla <strong>%{count} seçenek</strong> belirleyin."
           x_options:
-            one: "<strong>%{count}</strong> seçenek belirleyin."
-            other: "<strong>%{count}</strong> seçenek belirleyin."
-          between_min_and_max_options: "<strong>%{min}</strong> ila <strong>%{max}</strong> seçenek belirleyin."
+            one: "<strong>%{count} seçenek</strong> belirleyin."
+            other: "<strong>%{count} seçenek</strong> belirleyin."
+          between_min_and_max_options: "<strong>%{min} ila %{max} seçenek</strong> arasından seçim yapın."
       cast-votes:
         title: "Oylarınızı kullanın"
         label: "Hemen oy verin!"
       show-results:
         title: "Anket sonuçlarını göster"
-        label: "Sonuçları göster"
+        label: "Sonuçlar"
       remove-vote:
         title: "Oyunuzu kaldırın"
-        label: "Oyu kaldırın"
+        label: "Oyu geri al"
       hide-results:
         title: "Oylarınıza dönün"
-        label: "Oylamayı göster"
+        label: "Oy ver"
       group-results:
         title: "Kullanıcı alanına göre oyları gruplandır"
         label: "Dağılımı göster"
@@ -72,6 +72,8 @@ tr_TR:
         breakdown: "Dağılım"
         percentage: "Yüzde"
         count: "Sayı"
+      options:
+        label: "Seçenekler"
       error_while_toggling_status: "Üzgünüz, bu anketin durumunu değiştirirken bir hata oluştu."
       error_while_casting_votes: "Üzgünüm, oylarınızı kullanırken bir hata oluştu."
       error_while_fetching_voters: "Üzgünüz, oy verenler gösterilirken bir hata oluştu."
diff --git a/plugins/poll/config/locales/client.uk.yml b/plugins/poll/config/locales/client.uk.yml
index ef14ff55275..d3930d44e8d 100644
--- a/plugins/poll/config/locales/client.uk.yml
+++ b/plugins/poll/config/locales/client.uk.yml
@@ -29,36 +29,18 @@ uk:
           title: "Результати будуть показані після <strong>закриття</strong> ."
         staff:
           title: "Результати показуються лише <strong>членам команди обслуговування</strong> ."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Виберіть принаймні <strong>%{count}</strong> варіант."
-            few: "Виберіть принаймні <strong>%{count}</strong> варіанти."
-            many: "Виберіть принаймні <strong>%{count}</strong> варіантів."
-            other: "Виберіть принаймні <strong>%{count}</strong> варіанти."
-          up_to_max_options:
-            one: "Виберіть не більше як <strong>%{count}</strong> варіант."
-            few: "Виберіть не більше <strong>%{count}</strong> варіанти."
-            many: "Виберіть не більше <strong>%{count}</strong> варіантів."
-            other: "Виберіть не більше <strong>%{count}</strong> варіантів."
-          x_options:
-            one: "Виберіть <strong>%{count}</strong> варіант."
-            few: "Виберіть <strong>%{count}</strong> варіанти."
-            many: "Виберіть <strong>%{count}</strong> варіантів."
-            other: "Виберіть <strong>%{count}</strong> варіантів."
-          between_min_and_max_options: "Виберіть між <strong>%{min}</strong> і <strong>%{max}</strong> варіантами."
       cast-votes:
         title: "Проголосуйте"
         label: "Проголосувати!"
       show-results:
         title: "Показати результати опитування"
-        label: "Показати результати"
+        label: "Результати"
       remove-vote:
         title: "Видалити свій голос"
-        label: "Вилучити голос"
+        label: "Скасувати голосування"
       hide-results:
         title: "Назад до своїх голосів"
-        label: "Показати голосування"
+        label: "Голосувати"
       group-results:
         title: "Групувати голоси за полем користувача"
         label: "Показати відбивку"
@@ -82,6 +64,8 @@ uk:
         breakdown: "Розбивка"
         percentage: "Відсоток"
         count: "Кількість"
+      options:
+        label: "Параметри"
       error_while_toggling_status: "На жаль, виникла помилка зміни статусу цього опитування."
       error_while_casting_votes: "На жаль, сталася помилка під час голосування."
       error_while_fetching_voters: "На жаль, під час відображення тих, хто проголосував, сталася помилка."
diff --git a/plugins/poll/config/locales/client.ur.yml b/plugins/poll/config/locales/client.ur.yml
index 04bf45d6bf9..e9e9c0c82e5 100644
--- a/plugins/poll/config/locales/client.ur.yml
+++ b/plugins/poll/config/locales/client.ur.yml
@@ -25,30 +25,16 @@ ur:
           title: "نتائج <strong>بند ہونے</strong> پر دکھائے جائیں گے۔"
         staff:
           title: "نتائج صرف <strong>سٹاف</strong> ممبران کو دکھائے جاتے ہیں۔"
-      multiple:
-        help:
-          at_least_min_options:
-            one: "کم از کم <strong>%{count}</strong> آپشن منتخب کریں۔"
-            other: "کم از کم <strong>%{count}</strong> آپشنز کا انتخاب کریں۔"
-          up_to_max_options:
-            one: "<strong>%{count}</strong> تک کا آپشن منتخب کریں۔"
-            other: "<strong>%{count}</strong> تک کے آپشنز کا انتخاب کریں۔"
-          x_options:
-            one: "<strong>%{count}</strong> آپشن کا انتخاب کریں۔"
-            other: "<strong>%{count}</strong> آپشنز کا انتخاب کریں۔"
-          between_min_and_max_options: "<strong>%{min}</strong> اور <strong>%{max}</strong> آپشنز کے درمیان انتخاب کریں۔"
       cast-votes:
         title: "اپنے ووٹ دیں"
         label: "ابھی ووٹ دیں۔"
       show-results:
         title: "پول کے نتائج ظاہر کریں"
-        label: "نتائج دکھائیں"
+        label: "نتائج"
       remove-vote:
         title: "اپنا ووٹ ہٹا دیں"
-        label: "ووٹ ہٹا دیں"
       hide-results:
         title: "وآپس اپنے ووٹس پر"
-        label: "ووٹ دکھائیں"
       group-results:
         title: "صارف فیلڈ کے لحاظ سے ووٹوں کو گروپ کریں"
         label: "تجزیہ دکھائیں"
@@ -72,6 +58,8 @@ ur:
         breakdown: "تجزیہ"
         percentage: "فیصد"
         count: "شمار"
+      options:
+        label: "اختیارات"
       error_while_toggling_status: "معذرت، اِس پول کا سٹیٹس تبدیل کرتے وقت ایک تکنیکی خرابی کا سامنا کرنا پڑا۔"
       error_while_casting_votes: "معذرت، آپ کا ووٹ ڈالتے وقت ایک تکنیکی خرابی کا سامنا کرنا پڑا"
       error_while_fetching_voters: "معذرت، ووٹرز کو دکھاتے وقت ایک تکنیکی خرابی کا سامنا کرنا پڑا"
diff --git a/plugins/poll/config/locales/client.vi.yml b/plugins/poll/config/locales/client.vi.yml
index c8c0669d05c..5260113691b 100644
--- a/plugins/poll/config/locales/client.vi.yml
+++ b/plugins/poll/config/locales/client.vi.yml
@@ -14,20 +14,12 @@ vi:
       average_rating: "Trung bình: <strong>%{average}</strong>."
       public:
         title: "Bình chọn <strong>công khai</strong>"
-      multiple:
-        help:
-          at_least_min_options:
-            other: "Chọn ít nhất <strong>%{count}</strong> tùy chọn."
-          up_to_max_options:
-            other: "Chọn tối đa <strong>%{count}</strong> tùy chọn."
-          x_options:
-            other: "Chọn <strong>%{count}</strong> tùy chọn."
       cast-votes:
         title: "Thay đổi bình chọn của bạn"
         label: "Bình chọn ngay!"
       show-results:
         title: "Hiển thị kết quả thăm dò"
-        label: "Hiện kết quả"
+        label: "Kết quả"
       hide-results:
         title: "Trở lại bình chọn của bạn"
       export-results:
@@ -49,6 +41,8 @@ vi:
         votes: "%{count} phiếu bầu"
         percentage: "Phần trăm"
         count: "Đếm"
+      options:
+        label: "Tùy chọn"
       error_while_toggling_status: "Đã có lỗi xảy ra khi chuyển trạng thái của thăm dò."
       error_while_casting_votes: "Đã có lỗi xảy ra làm ảnh hưởng đến bình chọn của bạn."
       error_while_fetching_voters: "Đã có lỗi xảy ra khi hiển thị những người tham gia bình chọn."
diff --git a/plugins/poll/config/locales/client.zh_CN.yml b/plugins/poll/config/locales/client.zh_CN.yml
index ba3a77cf0d1..d985f6c2b45 100644
--- a/plugins/poll/config/locales/client.zh_CN.yml
+++ b/plugins/poll/config/locales/client.zh_CN.yml
@@ -26,24 +26,24 @@ zh_CN:
       multiple:
         help:
           at_least_min_options:
-            other: "至少选择 <strong>%{count}</strong> 个选项。"
+            other: "至少选择 <strong>%{count} 个选项</strong>。"
           up_to_max_options:
-            other: "最多选择 <strong>%{count}</strong> 个选项。"
+            other: "最多选择 <strong>%{count} 个选项</strong>。"
           x_options:
-            other: "选择 <strong>%{count}</strong> 个选项。"
-          between_min_and_max_options: "选择 <strong>%{min}</strong> 到 <strong>%{max}</strong> 个选项。"
+            other: "选择 <strong>%{count} 个选项</strong>。"
+          between_min_and_max_options: "选择 <strong>%{min} 到 %{max} 个选项</strong>。"
       cast-votes:
         title: "投票"
         label: "立即投票！"
       show-results:
         title: "显示投票结果"
-        label: "显示结果"
+        label: "结果"
       remove-vote:
         title: "移除您的投票"
-        label: "移除投票"
+        label: "撤消投票"
       hide-results:
         title: "回到您的投票"
-        label: "显示投票"
+        label: "投票"
       group-results:
         title: "按用户字段将投票分组"
         label: "显示细分"
@@ -67,6 +67,8 @@ zh_CN:
         breakdown: "细分"
         percentage: "百分比"
         count: "计数"
+      options:
+        label: "选项"
       error_while_toggling_status: "抱歉，切换此投票的状态时出错。"
       error_while_casting_votes: "抱歉，投票时出错。"
       error_while_fetching_voters: "抱歉，显示投票人时出错。"
diff --git a/plugins/poll/config/locales/client.zh_TW.yml b/plugins/poll/config/locales/client.zh_TW.yml
index ae2faaaabdd..454e70cce36 100644
--- a/plugins/poll/config/locales/client.zh_TW.yml
+++ b/plugins/poll/config/locales/client.zh_TW.yml
@@ -23,27 +23,16 @@ zh_TW:
           title: "結果將顯示一次之後<strong>關閉</strong>。"
         staff:
           title: "結果僅向 <strong>內部人員顯示</strong> 。"
-      multiple:
-        help:
-          at_least_min_options:
-            other: "至少選擇 <strong>%{count}</strong> 個選項。"
-          up_to_max_options:
-            other: "最多可選擇 <strong>%{count}</strong> 個選項。"
-          x_options:
-            other: "選擇 <strong>%{count}</strong> 個選項。"
-          between_min_and_max_options: "在 <strong>%{min}</strong> 和 <strong>%{max}</strong> 個選項之間進行選擇。"
       cast-votes:
         title: "投你的票"
         label: "現在投票！"
       show-results:
         title: "顯示投票結果"
-        label: "顯示結果"
+        label: "結果"
       remove-vote:
         title: "移除您的投票"
-        label: "移除投票"
       hide-results:
         title: "返回到你的投票"
-        label: "顯示投票"
       group-results:
         title: "按用戶字段分組投票"
         label: "顯示細分"
@@ -67,6 +56,8 @@ zh_TW:
         breakdown: "故障"
         percentage: "百分比"
         count: "次數"
+      options:
+        label: "選項"
       error_while_toggling_status: "對不起，改變投票狀態時出錯了。"
       error_while_casting_votes: "對不起，投票時出錯了。"
       error_while_fetching_voters: "對不起，顯示投票者時出錯了。"
diff --git a/plugins/poll/db/migrate/20230614041219_delete_duplicate_poll_votes.rb b/plugins/poll/db/migrate/20230614041219_delete_duplicate_poll_votes.rb
new file mode 100644
index 00000000000..e65e1b0fb37
--- /dev/null
+++ b/plugins/poll/db/migrate/20230614041219_delete_duplicate_poll_votes.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class DeleteDuplicatePollVotes < ActiveRecord::Migration[7.0]
+  def up
+    execute <<~SQL
+    DELETE FROM poll_votes
+    WHERE (poll_id, user_id, poll_option_id) IN (
+      SELECT pv.poll_id, pv.user_id, pv.poll_option_id
+      FROM poll_votes pv
+      JOIN polls p ON pv.poll_id = p.id
+      WHERE p.type = 0
+      AND EXISTS (
+        SELECT 1
+        FROM poll_votes pv2
+        WHERE pv.poll_id = pv2.poll_id
+        AND pv.user_id = pv2.user_id
+        AND pv.created_at < pv2.created_at
+      )
+    );
+    SQL
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/plugins/poll/db/post_migrate/20230612134421_remove_old_polls_data_from_custom_fields.rb b/plugins/poll/db/post_migrate/20230612134421_remove_old_polls_data_from_custom_fields.rb
new file mode 100644
index 00000000000..3df78a4bd67
--- /dev/null
+++ b/plugins/poll/db/post_migrate/20230612134421_remove_old_polls_data_from_custom_fields.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class RemoveOldPollsDataFromCustomFields < ActiveRecord::Migration[7.0]
+  def up
+    execute <<~SQL
+    DELETE FROM post_custom_fields
+    WHERE name LIKE 'polls%'
+    SQL
+  end
+
+  def down
+  end
+end
diff --git a/plugins/poll/plugin.rb b/plugins/poll/plugin.rb
index b6815930273..f79ab268934 100644
--- a/plugins/poll/plugin.rb
+++ b/plugins/poll/plugin.rb
@@ -7,8 +7,6 @@
 # url: https://github.com/discourse/discourse/tree/main/plugins/poll
 
 register_asset "stylesheets/common/poll.scss"
-register_asset "stylesheets/desktop/poll.scss", :desktop
-register_asset "stylesheets/mobile/poll.scss", :mobile
 register_asset "stylesheets/common/poll-ui-builder.scss"
 register_asset "stylesheets/desktop/poll-ui-builder.scss", :desktop
 register_asset "stylesheets/common/poll-breakdown.scss"
@@ -20,7 +18,7 @@ hide_plugin
 
 after_initialize do
   module ::DiscoursePoll
-    PLUGIN_NAME ||= "discourse_poll"
+    PLUGIN_NAME ||= "poll"
     DATA_PREFIX ||= "data-poll-"
     HAS_POLLS ||= "has_polls"
     DEFAULT_POLL_NAME ||= "poll"
@@ -169,7 +167,20 @@ after_initialize do
   end
 
   on(:merging_users) do |source_user, target_user|
-    PollVote.where(user_id: source_user.id).update_all(user_id: target_user.id)
+    DB.exec(<<-SQL, source_user_id: source_user.id, target_user_id: target_user.id)
+      DELETE FROM poll_votes
+      WHERE user_id = :source_user_id
+      AND EXISTS (
+        SELECT 1
+        FROM poll_votes
+        WHERE user_id = :target_user_id
+          AND poll_votes.poll_id = poll_votes.poll_id
+      );
+
+      UPDATE poll_votes
+      SET user_id = :target_user_id
+      WHERE user_id = :source_user_id;
+    SQL
   end
 
   add_to_class(:topic_view, :polls) do
@@ -195,7 +206,7 @@ after_initialize do
       end
   end
 
-  add_to_serializer(:post, :preloaded_polls, false) do
+  add_to_class(PostSerializer, :preloaded_polls) do
     @preloaded_polls ||=
       if @topic_view.present?
         @topic_view.polls[object.id]
@@ -204,15 +215,18 @@ after_initialize do
       end
   end
 
-  add_to_serializer(:post, :include_preloaded_polls?) { false }
-
-  add_to_serializer(:post, :polls, false) do
+  add_to_serializer(:post, :polls, include_condition: -> { preloaded_polls.present? }) do
     preloaded_polls.map { |p| PollSerializer.new(p, root: false, scope: self.scope) }
   end
 
-  add_to_serializer(:post, :include_polls?) { SiteSetting.poll_enabled && preloaded_polls.present? }
-
-  add_to_serializer(:post, :polls_votes, false) do
+  add_to_serializer(
+    :post,
+    :polls_votes,
+    include_condition: -> do
+      scope.user&.id.present? && preloaded_polls.present? &&
+        preloaded_polls.any? { |p| p.has_voted?(scope.user) }
+    end,
+  ) do
     preloaded_polls
       .map do |poll|
         user_poll_votes =
@@ -227,8 +241,11 @@ after_initialize do
       .to_h
   end
 
-  add_to_serializer(:post, :include_polls_votes?) do
-    SiteSetting.poll_enabled && scope.user&.id.present? && preloaded_polls.present? &&
-      preloaded_polls.any? { |p| p.has_voted?(scope.user) }
+  register_search_advanced_filter(/in:polls/) do |posts, match|
+    if SiteSetting.poll_enabled
+      posts.joins(:polls)
+    else
+      posts
+    end
   end
 end
diff --git a/plugins/poll/spec/controllers/posts_controller_spec.rb b/plugins/poll/spec/controllers/posts_controller_spec.rb
index fb80ff3a98b..bf5533bab57 100644
--- a/plugins/poll/spec/controllers/posts_controller_spec.rb
+++ b/plugins/poll/spec/controllers/posts_controller_spec.rb
@@ -129,8 +129,7 @@ RSpec.describe PostsController do
 
       expect(response.status).to eq(200)
       json = response.parsed_body
-      expect(json["cooked"]).to match("data-poll-")
-      expect(json["cooked"]).to include("&lt;script&gt;")
+      expect(json["cooked"]).to include("data-poll-name=\"<script>alert('xss')</script>\"")
       expect(Poll.find_by(post_id: json["id"]).name).to eq(
         "&lt;script&gt;alert(&#39;xss&#39;)&lt;/script&gt;",
       )
diff --git a/plugins/poll/spec/fabricators/poll_fabricator.rb b/plugins/poll/spec/fabricators/poll_fabricator.rb
new file mode 100644
index 00000000000..c78968d8a8d
--- /dev/null
+++ b/plugins/poll/spec/fabricators/poll_fabricator.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+Fabricator(:poll) do
+  post
+  name { sequence(:name) { |i| "Poll #{i}" } }
+end
+
+Fabricator(:poll_regular, from: :poll) { type "regular" }
+
+Fabricator(:poll_multiple, from: :poll) { type "multiple" }
+
+Fabricator(:poll_option) do
+  poll
+  html { sequence(:html) { |i| "Poll Option #{i}" } }
+  digest { sequence(:digest) { |i| "#{i}" } }
+end
+
+Fabricator(:poll_vote) do
+  poll
+  poll_option
+  user
+end
diff --git a/plugins/poll/spec/integration/user_merger_spec.rb b/plugins/poll/spec/integration/user_merger_spec.rb
new file mode 100644
index 00000000000..d644bdcc39b
--- /dev/null
+++ b/plugins/poll/spec/integration/user_merger_spec.rb
@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+RSpec.describe UserMerger do
+  fab!(:target_user) { Fabricate(:user, username: "galahad", email: "galahad@knights.com") }
+  fab!(:source_user) { Fabricate(:user, username: "lancelot", email: "lancelot@knights.com") }
+
+  fab!(:poll_regular) { Fabricate(:poll) }
+  fab!(:poll_regular_option1) { Fabricate(:poll_option, poll: poll_regular, html: "Option 1") }
+  fab!(:poll_regular_option2) { Fabricate(:poll_option, poll: poll_regular, html: "Option 2") }
+
+  fab!(:poll_multiple) { Fabricate(:poll) }
+  fab!(:poll_multiple_optionA) { Fabricate(:poll_option, poll: poll_multiple, html: "Option A") }
+  fab!(:poll_multiple_optionB) { Fabricate(:poll_option, poll: poll_multiple, html: "Option B") }
+  fab!(:poll_multiple_optionC) { Fabricate(:poll_option, poll: poll_multiple, html: "Option C") }
+
+  it "will end up with no votes from source user" do
+    Fabricate(:poll_vote, poll: poll_regular, user: source_user, poll_option: poll_regular_option2)
+    Fabricate(
+      :poll_vote,
+      poll: poll_multiple,
+      user: source_user,
+      poll_option: poll_multiple_optionB,
+    )
+
+    DiscourseEvent.trigger(:merging_users, source_user, target_user)
+
+    expect(PollVote.where(user: source_user).count).to eq(0)
+  end
+
+  it "will not use source user's vote if target_user already voted in the same poll" do
+    Fabricate(:poll_vote, poll: poll_regular, user: target_user, poll_option: poll_regular_option1)
+    Fabricate(:poll_vote, poll: poll_regular, user: source_user, poll_option: poll_regular_option2)
+
+    Fabricate(
+      :poll_vote,
+      poll: poll_multiple,
+      user: target_user,
+      poll_option: poll_multiple_optionA,
+    )
+    Fabricate(
+      :poll_vote,
+      poll: poll_multiple,
+      user: source_user,
+      poll_option: poll_multiple_optionB,
+    )
+    Fabricate(
+      :poll_vote,
+      poll: poll_multiple,
+      user: source_user,
+      poll_option: poll_multiple_optionC,
+    )
+
+    DiscourseEvent.trigger(:merging_users, source_user, target_user)
+
+    expect(PollVote.where(user: target_user).pluck(:poll_option_id)).to contain_exactly(
+      poll_multiple_optionA.id,
+      poll_regular_option1.id,
+    )
+  end
+
+  it "reassigns source_user vote to target_user if target user has never voted in the poll" do
+    Fabricate(:poll_vote, poll: poll_regular, user: source_user)
+
+    expect { DiscourseEvent.trigger(:merging_users, source_user, target_user) }.to change(
+      PollVote.where(user: target_user),
+      :count,
+    ).from(0).to(1)
+  end
+
+  it "keeps any existing target_user votes" do
+    Fabricate(:poll_vote, poll: poll_regular, user: target_user)
+
+    expect { DiscourseEvent.trigger(:merging_users, source_user, target_user) }.to not_change(
+      PollVote.where(user: target_user),
+      :count,
+    )
+  end
+end
diff --git a/plugins/poll/spec/lib/polls_validator_spec.rb b/plugins/poll/spec/lib/polls_validator_spec.rb
index 583a96c80e7..e337db78003 100644
--- a/plugins/poll/spec/lib/polls_validator_spec.rb
+++ b/plugins/poll/spec/lib/polls_validator_spec.rb
@@ -3,8 +3,9 @@
 require "rails_helper"
 
 RSpec.describe ::DiscoursePoll::PollsValidator do
+  subject(:validator) { described_class.new(post) }
+
   let(:post) { Fabricate(:post) }
-  subject { described_class.new(post) }
 
   describe "#validate_polls" do
     it "ensures that polls have valid arguments" do
diff --git a/plugins/poll/spec/lib/pretty_text_spec.rb b/plugins/poll/spec/lib/pretty_text_spec.rb
index 9f6b6763ddd..ac35be9f1c1 100644
--- a/plugins/poll/spec/lib/pretty_text_spec.rb
+++ b/plugins/poll/spec/lib/pretty_text_spec.rb
@@ -93,19 +93,17 @@ RSpec.describe PrettyText do
 
     expected = <<~HTML
       <div class="poll" data-poll-status="open" data-poll-type="multiple" data-poll-name="poll">
-      <div>
-      <div class="poll-container">
-      <ol>
-      <li data-poll-option-id="b6475cbf6acb8676b20c60582cfc487a">test 1 <img src="/images/emoji/twitter/slight_smile.png?v=#{Emoji::EMOJI_VERSION}" title=":slight_smile:" class="emoji" alt=":slight_smile:" loading="lazy" width="20" height="20"> <b>test</b>
-      </li>
+      <div class="poll-container"><ol>
+      <li data-poll-option-id="b6475cbf6acb8676b20c60582cfc487a">test 1 <img src="/images/emoji/twitter/slight_smile.png?v=#{Emoji::EMOJI_VERSION}" title=":slight_smile:" class="emoji" alt=":slight_smile:" loading="lazy" width="20" height="20"> <b>test</b></li>
       <li data-poll-option-id="7158af352698eb1443d709818df097d4">test 2</li>
       </ol>
       </div>
       <div class="poll-info">
-      <p>
+      <div class="poll-info_counts">
+      <div class="poll-info_counts-count">
       <span class="info-number">0</span>
       <span class="info-label">voters</span>
-      </p>
+      </div>
       </div>
       </div>
       </div>
@@ -159,10 +157,9 @@ RSpec.describe PrettyText do
       [/poll]
     MD
 
-    expect(cooked).to include(<<~HTML)
-      <div class="poll-title">What’s your favorite <em>berry</em>? <img src="/images/emoji/twitter/wink.png?v=#{Emoji::EMOJI_VERSION}" title=":wink:" class="emoji" alt=":wink:" loading="lazy" width="20" height="20"> <a href="https://google.com/" rel="noopener nofollow ugc">https://google.com/</a>
-      </div>
-    HTML
+    expect(cooked).to include(
+      "<div class=\"poll-title\">What’s your favorite <em>berry</em>? <img src=\"/images/emoji/twitter/wink.png?v=#{Emoji::EMOJI_VERSION}\" title=\":wink:\" class=\"emoji\" alt=\":wink:\" loading=\"lazy\" width=\"20\" height=\"20\"> <a href=\"https://google.com/\" rel=\"noopener nofollow ugc\">https://google.com/</a></div>",
+    )
   end
 
   it "does not break when there are headings before/after a poll with a title" do
@@ -179,16 +176,15 @@ RSpec.describe PrettyText do
       # Post-heading
     MD
 
-    expect(cooked).to include(<<~HTML)
-      <div class="poll-title">What’s your favorite <em>berry</em>? <img src="/images/emoji/twitter/wink.png?v=#{Emoji::EMOJI_VERSION}" title=":wink:" class="emoji" alt=":wink:" loading="lazy" width="20" height="20"> <a href="https://google.com/" rel="noopener nofollow ugc">https://google.com/</a>
-      </div>
-    HTML
+    expect(cooked).to include(
+      "<div class=\"poll-title\">What’s your favorite <em>berry</em>? <img src=\"/images/emoji/twitter/wink.png?v=#{Emoji::EMOJI_VERSION}\" title=\":wink:\" class=\"emoji\" alt=\":wink:\" loading=\"lazy\" width=\"20\" height=\"20\"> <a href=\"https://google.com/\" rel=\"noopener nofollow ugc\">https://google.com/</a></div>",
+    )
 
     expect(cooked).to include(
-      "<h1>\n<a name=\"pre-heading-1\" class=\"anchor\" href=\"#pre-heading-1\"></a>Pre-heading</h1>",
+      "<h1><a name=\"pre-heading-1\" class=\"anchor\" href=\"#pre-heading-1\"></a>Pre-heading</h1>",
     )
     expect(cooked).to include(
-      "<h1>\n<a name=\"post-heading-2\" class=\"anchor\" href=\"#post-heading-2\"></a>Post-heading</h1>",
+      "<h1><a name=\"post-heading-2\" class=\"anchor\" href=\"#post-heading-2\"></a>Post-heading</h1>",
     )
   end
 
@@ -211,10 +207,10 @@ RSpec.describe PrettyText do
     HTML
 
     expect(cooked).to include(
-      "<h1>\n<a name=\"pre-heading-1\" class=\"anchor\" href=\"#pre-heading-1\"></a>Pre-heading</h1>",
+      "<h1><a name=\"pre-heading-1\" class=\"anchor\" href=\"#pre-heading-1\"></a>Pre-heading</h1>",
     )
     expect(cooked).to include(
-      "<h1>\n<a name=\"post-heading-2\" class=\"anchor\" href=\"#post-heading-2\"></a>Post-heading</h1>",
+      "<h1><a name=\"post-heading-2\" class=\"anchor\" href=\"#post-heading-2\"></a>Post-heading</h1>",
     )
   end
 end
diff --git a/plugins/poll/spec/lib/search_spec.rb b/plugins/poll/spec/lib/search_spec.rb
new file mode 100644
index 00000000000..e102d9ff05f
--- /dev/null
+++ b/plugins/poll/spec/lib/search_spec.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+RSpec.describe Search do
+  fab!(:topic) { Fabricate(:topic) }
+  fab!(:topic2) { Fabricate(:topic) }
+  fab!(:regular_post) { Fabricate(:post, topic: topic, raw: <<~RAW) }
+      Somewhere over the rainbow but no poll.
+    RAW
+
+  fab!(:post_with_poll) { Fabricate(:post, topic: topic2, raw: <<~RAW) }
+      Somewhere over the rainbow with a poll.
+      [poll]
+      * Like
+      * Dislike
+      [/poll]
+    RAW
+
+  before do
+    SearchIndexer.enable
+    Jobs.run_immediately!
+
+    SearchIndexer.index(topic2, force: true)
+    SearchIndexer.index(topic, force: true)
+  end
+
+  after { SearchIndexer.disable }
+
+  context "when using in:polls" do
+    it "displays only posts containing polls" do
+      results = Search.execute("rainbow in:polls", guardian: Guardian.new)
+      expect(results.posts).to contain_exactly(post_with_poll)
+    end
+  end
+
+  context "when polls are disabled" do
+    it "ignores in:polls filter" do
+      SiteSetting.poll_enabled = false
+      results = Search.execute("rainbow in:polls", guardian: Guardian.new)
+      expect(results.posts).to contain_exactly(regular_post, post_with_poll)
+    end
+  end
+end
diff --git a/plugins/poll/test/javascripts/acceptance/poll-breakdown-test.js b/plugins/poll/test/javascripts/acceptance/poll-breakdown-test.js
index 750a0530782..23f36ef9681 100644
--- a/plugins/poll/test/javascripts/acceptance/poll-breakdown-test.js
+++ b/plugins/poll/test/javascripts/acceptance/poll-breakdown-test.js
@@ -66,13 +66,14 @@ acceptance("Poll breakdown", function (needs) {
 
   test("Displaying the poll breakdown modal", async function (assert) {
     await visit("/t/-/topic_with_pie_chart_poll");
+    await click(".widget-dropdown-header");
 
     assert.ok(
-      exists(".poll-show-breakdown"),
+      exists(".item-showBreakdown"),
       "shows the breakdown button when poll_groupable_user_fields is non-empty"
     );
 
-    await click(".poll-show-breakdown");
+    await click(".item-showBreakdown");
 
     assert.ok(exists(".poll-breakdown-total-votes"), "displays the vote count");
 
@@ -90,7 +91,8 @@ acceptance("Poll breakdown", function (needs) {
 
   test("Changing the display mode from percentage to count", async function (assert) {
     await visit("/t/-/topic_with_pie_chart_poll");
-    await click(".poll-show-breakdown");
+    await click(".widget-dropdown-header");
+    await click(".item-showBreakdown");
 
     assert.strictEqual(
       query(".poll-breakdown-option-count").textContent.trim(),
diff --git a/plugins/poll/test/javascripts/acceptance/poll-results-test.js b/plugins/poll/test/javascripts/acceptance/poll-results-test.js
index 3d23208bfec..b9188febf41 100644
--- a/plugins/poll/test/javascripts/acceptance/poll-results-test.js
+++ b/plugins/poll/test/javascripts/acceptance/poll-results-test.js
@@ -1,8 +1,8 @@
 import {
   acceptance,
   count,
+  exists,
   publishToMessageBus,
-  query,
 } from "discourse/tests/helpers/qunit-helpers";
 import { test } from "qunit";
 import { clearPopupMenuOptionsCallback } from "discourse/controllers/composer";
@@ -1156,8 +1156,9 @@ acceptance("Poll results - no voters", function (needs) {
     });
   });
 
-  test("disables show results button", async function (assert) {
+  test("does not show results button", async function (assert) {
     await visit("/t/-/load-more-poll-voters");
-    assert.ok(query(".toggle-results").disabled);
+
+    assert.ok(!exists(".toggle-results"));
   });
 });
diff --git a/plugins/poll/test/javascripts/component/poll-ui-builder-test.js b/plugins/poll/test/javascripts/component/poll-ui-builder-test.js
new file mode 100644
index 00000000000..79fa2681804
--- /dev/null
+++ b/plugins/poll/test/javascripts/component/poll-ui-builder-test.js
@@ -0,0 +1,214 @@
+import { module, test } from "qunit";
+import { click, fillIn, render } from "@ember/test-helpers";
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import hbs from "htmlbars-inline-precompile";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+
+async function setupBuilder(context) {
+  const results = [];
+  const model = {
+    toolbarEvent: { getText: () => "", addText: (t) => results.push(t) },
+  };
+  context.model = model;
+  await render(
+    hbs`<Modal::PollUiBuilder @inline={{true}} @model={{this.model}} @closeModal={{fn (mut this.closeCalled) true}} />`
+  );
+  return results;
+}
+
+module("Poll | Component | poll-ui-builder", function (hooks) {
+  setupRenderingTest(hooks);
+
+  test("Can switch poll type", async function (assert) {
+    await setupBuilder(this);
+
+    assert.dom(".poll-type-value-regular").hasClass("active");
+
+    await click(".poll-type-value-multiple");
+    assert
+      .dom(".poll-type-value-multiple")
+      .hasClass("active", "can switch to 'multiple' type");
+
+    assert
+      .dom(".poll-type-value-number")
+      .doesNotExist("number type is hidden by default");
+
+    await click(".show-advanced");
+    assert
+      .dom(".poll-type-value-number")
+      .exists("number type appears in advanced mode");
+
+    await click(".poll-type-value-number");
+    assert
+      .dom(".poll-type-value-number")
+      .hasClass("active", "can switch to 'number' type");
+  });
+
+  test("Automatically updates min/max when number of options change", async function (assert) {
+    await setupBuilder(this);
+
+    await click(".poll-type-value-multiple");
+    assert.dom(".poll-options-min").hasValue("0");
+    assert.dom(".poll-options-max").hasValue("0");
+
+    await fillIn(".poll-option-value input", "a");
+    assert.dom(".poll-options-min").hasValue("1");
+    assert.dom(".poll-options-max").hasValue("1");
+
+    await click(".poll-option-add");
+
+    await fillIn(".poll-option-value:nth-of-type(2) input", "b");
+    assert.dom(".poll-options-min").hasValue("1");
+    assert.dom(".poll-options-max").hasValue("2");
+  });
+
+  test("disables save button", async function (assert) {
+    this.siteSettings.poll_maximum_options = 3;
+
+    await setupBuilder(this);
+    assert
+      .dom(".insert-poll")
+      .isDisabled("Insert button disabled when no options specified");
+
+    await fillIn(".poll-option-value input", "a");
+    assert
+      .dom(".insert-poll")
+      .isEnabled("Insert button enabled once an option is specified");
+
+    await click(".poll-option-add");
+    await fillIn(".poll-option-value:nth-of-type(2) input", "b");
+    await click(".poll-option-add");
+    await fillIn(".poll-option-value:nth-of-type(3) input", "c");
+    await click(".poll-option-add");
+    await fillIn(".poll-option-value:nth-of-type(4) input", "d");
+
+    assert
+      .dom(".insert-poll")
+      .isDisabled("Insert button disabled when too many options");
+  });
+
+  test("number mode", async function (assert) {
+    const results = await setupBuilder(this);
+
+    await click(".show-advanced");
+    await click(".poll-type-value-number");
+
+    await click(".insert-poll");
+    assert.strictEqual(
+      results[results.length - 1],
+      "[poll type=number results=always min=1 max=20 step=1]\n[/poll]\n"
+    );
+
+    await fillIn(".poll-options-step", "2");
+    await click(".insert-poll");
+    assert.strictEqual(
+      results[results.length - 1],
+      "[poll type=number results=always min=1 max=20 step=2]\n[/poll]\n",
+      "includes step value"
+    );
+
+    await click(".poll-toggle-public");
+    await click(".insert-poll");
+    assert.strictEqual(
+      results[results.length - 1],
+      "[poll type=number results=always min=1 max=20 step=2 public=true]\n[/poll]\n",
+      "includes public boolean"
+    );
+
+    await fillIn(".poll-options-step", "0");
+    assert
+      .dom(".insert-poll")
+      .isDisabled("Insert button disabled when step is 0");
+  });
+
+  test("regular mode", async function (assert) {
+    const results = await setupBuilder(this);
+
+    await fillIn(".poll-option-value input", "a");
+    await click(".poll-option-add");
+    await fillIn(".poll-option-value:nth-of-type(2) input", "b");
+
+    await click(".insert-poll");
+    assert.strictEqual(
+      results[results.length - 1],
+      "[poll type=regular results=always chartType=bar]\n* a\n* b\n[/poll]\n",
+      "has correct output"
+    );
+
+    await click(".show-advanced");
+
+    await click(".poll-toggle-public");
+
+    await click(".insert-poll");
+    assert.strictEqual(
+      results[results.length - 1],
+      "[poll type=regular results=always public=true chartType=bar]\n* a\n* b\n[/poll]\n",
+      "has public boolean"
+    );
+
+    const groupChooser = selectKit(".group-chooser");
+    await groupChooser.expand();
+    await groupChooser.selectRowByName("custom_group");
+    await groupChooser.collapse();
+
+    await click(".insert-poll");
+    assert.strictEqual(
+      results[results.length - 1],
+      "[poll type=regular results=always public=true chartType=bar groups=custom_group]\n* a\n* b\n[/poll]\n",
+      "has groups"
+    );
+  });
+
+  test("multi-choice mode", async function (assert) {
+    const results = await setupBuilder(this);
+
+    await click(".poll-type-value-multiple");
+
+    await fillIn(".poll-option-value input", "a");
+    await click(".poll-option-add");
+    await fillIn(".poll-option-value:nth-of-type(2) input", "b");
+
+    await click(".insert-poll");
+    assert.strictEqual(
+      results[results.length - 1],
+      "[poll type=multiple results=always min=1 max=2 chartType=bar]\n* a\n* b\n[/poll]\n",
+      "has correct output"
+    );
+
+    await click(".show-advanced");
+
+    await click(".poll-toggle-public");
+
+    await click(".insert-poll");
+    assert.strictEqual(
+      results[results.length - 1],
+      "[poll type=multiple results=always min=1 max=2 public=true chartType=bar]\n* a\n* b\n[/poll]\n",
+      "has public boolean"
+    );
+  });
+
+  test("staff_only option is not present for non-staff", async function (assert) {
+    await setupBuilder(this);
+
+    await click(".show-advanced");
+    const resultVisibility = selectKit(".poll-result");
+
+    assert.strictEqual(resultVisibility.header().value(), "always");
+
+    await resultVisibility.expand();
+    assert.false(
+      resultVisibility.rowByValue("staff_only").exists(),
+      "staff_only is not visible to normal users"
+    );
+    await resultVisibility.collapse();
+
+    this.currentUser.setProperties({ admin: true });
+
+    await resultVisibility.expand();
+    assert.true(
+      resultVisibility.rowByValue("staff_only").exists(),
+      "staff_only is visible to staff"
+    );
+    await resultVisibility.collapse();
+  });
+});
diff --git a/plugins/poll/test/javascripts/unit/controllers/poll-ui-builder-test.js b/plugins/poll/test/javascripts/unit/controllers/poll-ui-builder-test.js
deleted file mode 100644
index 7da954e2733..00000000000
--- a/plugins/poll/test/javascripts/unit/controllers/poll-ui-builder-test.js
+++ /dev/null
@@ -1,205 +0,0 @@
-import { module, test } from "qunit";
-import { setupTest } from "ember-qunit";
-import {
-  MULTIPLE_POLL_TYPE,
-  NUMBER_POLL_TYPE,
-  REGULAR_POLL_TYPE,
-} from "discourse/plugins/poll/controllers/poll-ui-builder";
-import { settled } from "@ember/test-helpers";
-
-function setupController(ctx) {
-  const controller = ctx.owner.lookup("controller:poll-ui-builder");
-  controller.set("toolbarEvent", { getText: () => "" });
-  controller.onShow();
-  return controller;
-}
-
-module("Unit | Controller | poll-ui-builder", function (hooks) {
-  setupTest(hooks);
-
-  test("isMultiple", function (assert) {
-    const controller = setupController(this);
-
-    controller.setProperties({
-      pollType: MULTIPLE_POLL_TYPE,
-      pollOptions: [{ value: "a" }],
-    });
-    assert.strictEqual(controller.isMultiple, true, "it should be true");
-
-    controller.setProperties({
-      pollType: "random",
-      pollOptions: [{ value: "b" }],
-    });
-    assert.strictEqual(controller.isMultiple, false, "it should be false");
-  });
-
-  test("isNumber", function (assert) {
-    const controller = setupController(this);
-
-    controller.set("pollType", REGULAR_POLL_TYPE);
-    assert.strictEqual(controller.isNumber, false, "it should be false");
-
-    controller.set("pollType", NUMBER_POLL_TYPE);
-    assert.strictEqual(controller.isNumber, true, "it should be true");
-  });
-
-  test("pollOptionsCount", function (assert) {
-    const controller = setupController(this);
-
-    controller.set("pollOptions", [{ value: "1" }, { value: "2" }]);
-    assert.strictEqual(controller.pollOptionsCount, 2, "it should equal 2");
-
-    controller.set("pollOptions", []);
-    assert.strictEqual(controller.pollOptionsCount, 0, "it should equal 0");
-  });
-
-  test("disableInsert", function (assert) {
-    const controller = setupController(this);
-
-    controller.siteSettings.poll_maximum_options = 20;
-    assert.strictEqual(controller.disableInsert, true, "it should be true");
-
-    controller.set("pollOptions", [{ value: "a" }, { value: "b" }]);
-    assert.strictEqual(controller.disableInsert, false, "it should be false");
-
-    controller.set("pollType", NUMBER_POLL_TYPE);
-    assert.strictEqual(controller.disableInsert, false, "it should be false");
-
-    controller.setProperties({
-      pollType: REGULAR_POLL_TYPE,
-      pollOptions: [{ value: "a" }, { value: "b" }, { value: "c" }],
-    });
-    assert.strictEqual(controller.disableInsert, false, "it should be false");
-
-    controller.setProperties({
-      pollType: REGULAR_POLL_TYPE,
-      pollOptions: [],
-    });
-    assert.strictEqual(controller.disableInsert, true, "it should be true");
-
-    controller.setProperties({
-      pollType: REGULAR_POLL_TYPE,
-      pollOptions: [{ value: "w" }],
-    });
-    assert.strictEqual(controller.disableInsert, false, "it should be false");
-  });
-
-  test("number pollOutput", async function (assert) {
-    const controller = setupController(this);
-    controller.siteSettings.poll_maximum_options = 20;
-
-    controller.setProperties({
-      pollType: NUMBER_POLL_TYPE,
-      pollMin: 1,
-    });
-    await settled();
-    assert.strictEqual(
-      controller.pollOutput,
-      "[poll type=number results=always min=1 max=20 step=1]\n[/poll]\n",
-      "it should return the right output"
-    );
-
-    controller.set("pollStep", 2);
-    await settled();
-    assert.strictEqual(
-      controller.pollOutput,
-      "[poll type=number results=always min=1 max=20 step=2]\n[/poll]\n",
-      "it should return the right output"
-    );
-
-    controller.set("publicPoll", true);
-    assert.strictEqual(
-      controller.pollOutput,
-      "[poll type=number results=always min=1 max=20 step=2 public=true]\n[/poll]\n",
-      "it should return the right output"
-    );
-
-    controller.set("pollStep", 0);
-    assert.strictEqual(
-      controller.pollOutput,
-      "[poll type=number results=always min=1 max=20 step=1 public=true]\n[/poll]\n",
-      "it should return the right output"
-    );
-  });
-
-  test("regular pollOutput", function (assert) {
-    const controller = setupController(this);
-    controller.siteSettings.poll_maximum_options = 20;
-
-    controller.setProperties({
-      pollOptions: [{ value: "1" }, { value: "2" }],
-      pollType: REGULAR_POLL_TYPE,
-    });
-    assert.strictEqual(
-      controller.pollOutput,
-      "[poll type=regular results=always chartType=bar]\n* 1\n* 2\n[/poll]\n",
-      "it should return the right output"
-    );
-
-    controller.set("publicPoll", "true");
-    assert.strictEqual(
-      controller.pollOutput,
-      "[poll type=regular results=always public=true chartType=bar]\n* 1\n* 2\n[/poll]\n",
-      "it should return the right output"
-    );
-
-    controller.set("pollGroups", "test");
-    assert.strictEqual(
-      controller.get("pollOutput"),
-      "[poll type=regular results=always public=true chartType=bar groups=test]\n* 1\n* 2\n[/poll]\n",
-      "it should return the right output"
-    );
-  });
-
-  test("multiple pollOutput", function (assert) {
-    const controller = setupController(this);
-    controller.siteSettings.poll_maximum_options = 20;
-
-    controller.setProperties({
-      pollType: MULTIPLE_POLL_TYPE,
-      pollMin: 1,
-      pollOptions: [{ value: "1" }, { value: "2" }],
-    });
-    assert.strictEqual(
-      controller.pollOutput,
-      "[poll type=multiple results=always min=1 max=2 chartType=bar]\n* 1\n* 2\n[/poll]\n",
-      "it should return the right output"
-    );
-
-    controller.set("publicPoll", "true");
-    assert.strictEqual(
-      controller.pollOutput,
-      "[poll type=multiple results=always min=1 max=2 public=true chartType=bar]\n* 1\n* 2\n[/poll]\n",
-      "it should return the right output"
-    );
-  });
-
-  test("staff_only option is not present for non-staff", async function (assert) {
-    const controller = setupController(this);
-    controller.currentUser = { staff: false };
-    controller.notifyPropertyChange("pollResults");
-
-    assert.strictEqual(
-      controller.pollResults.filterBy("value", "staff_only").length,
-      0,
-      "staff_only is not present"
-    );
-  });
-
-  test("poll result is always by default", function (assert) {
-    const controller = setupController(this);
-    assert.strictEqual(controller.pollResult, "always");
-  });
-
-  test("staff_only option is present for staff", async function (assert) {
-    const controller = setupController(this);
-    controller.currentUser = { staff: true };
-    controller.notifyPropertyChange("pollResults");
-
-    assert.strictEqual(
-      controller.pollResults.filterBy("value", "staff_only").length,
-      1,
-      "staff_only is present"
-    );
-  });
-});
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/color-example.hbs b/plugins/styleguide/assets/javascripts/discourse/components/color-example.hbs
new file mode 100644
index 00000000000..b946fa36329
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/components/color-example.hbs
@@ -0,0 +1,4 @@
+<section class="color-example">
+  <div class="color-bg {{@color}}"></div>
+  <div class="color-name">var(--{{@color}})</div>
+</section>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/color-example.js b/plugins/styleguide/assets/javascripts/discourse/components/color-example.js
deleted file mode 100644
index 0648e5a3abd..00000000000
--- a/plugins/styleguide/assets/javascripts/discourse/components/color-example.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import Component from "@ember/component";
-
-export default Component.extend({
-  tagName: "section",
-  classNameBindings: [":color-example"],
-});
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/00-typography.gjs b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/00-typography.gjs
new file mode 100644
index 00000000000..6a5b0e8acc2
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/00-typography.gjs
@@ -0,0 +1,34 @@
+import StyleguideExample from "../../styleguide-example";
+import I18n from "I18n";
+
+const t = I18n.t.bind(I18n);
+
+<template>
+  <StyleguideExample @title="h1">
+    <h1>{{t "styleguide.sections.typography.example"}}</h1>
+  </StyleguideExample>
+
+  <StyleguideExample @title="h2">
+    <h2>{{t "styleguide.sections.typography.example"}}</h2>
+  </StyleguideExample>
+
+  <StyleguideExample @title="h3">
+    <h3>{{t "styleguide.sections.typography.example"}}</h3>
+  </StyleguideExample>
+
+  <StyleguideExample @title="h4">
+    <h4>{{t "styleguide.sections.typography.example"}}</h4>
+  </StyleguideExample>
+
+  <StyleguideExample @title="h5">
+    <h5>{{t "styleguide.sections.typography.example"}}</h5>
+  </StyleguideExample>
+
+  <StyleguideExample @title="h6">
+    <h6>{{t "styleguide.sections.typography.example"}}</h6>
+  </StyleguideExample>
+
+  <StyleguideExample @title="p">
+    <p>{{t "styleguide.sections.typography.paragraph"}}</p>
+  </StyleguideExample>
+</template>
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/01-font-scale.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/01-font-scale.hbs
similarity index 100%
rename from plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/01-font-scale.hbs
rename to plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/01-font-scale.hbs
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/02-buttons.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/02-buttons.hbs
similarity index 77%
rename from plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/02-buttons.hbs
rename to plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/02-buttons.hbs
index bfb9f2fbe90..9dc95bfb005 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/02-buttons.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/02-buttons.hbs
@@ -1,5 +1,5 @@
 <StyleguideExample @title=".btn-icon - sizes (large, default, small)">
-  {{#each this.dummy.buttonSizes as |bs|}}
+  {{#each @dummy.buttonSizes as |bs|}}
     <DButton
       @icon="times"
       @translatedTitle={{bs.text}}
@@ -10,7 +10,7 @@
 </StyleguideExample>
 
 <StyleguideExample @title=".btn-icon - states">
-  {{#each this.dummy.buttonStates as |bs|}}
+  {{#each @dummy.buttonStates as |bs|}}
     <DButton
       @icon="times"
       @translatedTitle={{bs.text}}
@@ -21,7 +21,7 @@
 </StyleguideExample>
 
 <StyleguideExample @title=".btn-text - sizes (large, default, small)">
-  {{#each this.dummy.buttonSizes as |bs|}}
+  {{#each @dummy.buttonSizes as |bs|}}
     <DButton
       @translatedLabel={{bs.text}}
       @class={{bs.class}}
@@ -31,7 +31,7 @@
 </StyleguideExample>
 
 <StyleguideExample @title=".btn-text - states">
-  {{#each this.dummy.buttonStates as |bs|}}
+  {{#each @dummy.buttonStates as |bs|}}
     <DButton
       @translatedLabel={{bs.text}}
       @class={{bs.class}}
@@ -43,7 +43,7 @@
 <StyleguideExample
   @title=".btn-default .btn-icon-text - sizes (large, default, small)"
 >
-  {{#each this.dummy.buttonSizes as |bs|}}
+  {{#each @dummy.buttonSizes as |bs|}}
     <DButton
       @icon="plus"
       @translatedLabel={{bs.text}}
@@ -54,7 +54,7 @@
 </StyleguideExample>
 
 <StyleguideExample @title=".btn-default .btn-icon-text - states">
-  {{#each this.dummy.buttonStates as |bs|}}
+  {{#each @dummy.buttonStates as |bs|}}
     <DButton
       @icon="plus"
       @translatedLabel={{bs.text}}
@@ -67,7 +67,7 @@
 <StyleguideExample
   @title=".btn-primary .btn-icon-text - sizes (large, default, small)"
 >
-  {{#each this.dummy.buttonSizes as |bs|}}
+  {{#each @dummy.buttonSizes as |bs|}}
     <DButton
       @class={{concat "btn-primary " bs.class}}
       @icon="plus"
@@ -78,7 +78,7 @@
 </StyleguideExample>
 
 <StyleguideExample @title=".btn-primary .btn-icon-text - states">
-  {{#each this.dummy.buttonStates as |bs|}}
+  {{#each @dummy.buttonStates as |bs|}}
     <DButton
       @class={{concat "btn-primary " bs.class}}
       @icon="plus"
@@ -91,7 +91,7 @@
 <StyleguideExample
   @title=".btn-danger .btn-icon-text - sizes (large, default, small)"
 >
-  {{#each this.dummy.buttonSizes as |bs|}}
+  {{#each @dummy.buttonSizes as |bs|}}
     <DButton
       @class={{concat "btn-danger " bs.class}}
       @icon="trash-alt"
@@ -102,7 +102,7 @@
 </StyleguideExample>
 
 <StyleguideExample @title=".btn-danger .btn-icon-text - states">
-  {{#each this.dummy.buttonStates as |bs|}}
+  {{#each @dummy.buttonStates as |bs|}}
     <DButton
       @class={{concat "btn-danger " bs.class}}
       @icon="trash-alt"
@@ -113,7 +113,7 @@
 </StyleguideExample>
 
 <StyleguideExample @title=".btn-flat - sizes (large, default, small)">
-  {{#each this.dummy.buttonSizes as |bs|}}
+  {{#each @dummy.buttonSizes as |bs|}}
     <FlatButton
       @icon="trash-alt"
       @disabled={{bs.disabled}}
@@ -123,7 +123,7 @@
 </StyleguideExample>
 
 <StyleguideExample @title=".btn-flat - states">
-  {{#each this.dummy.buttonStates as |bs|}}
+  {{#each @dummy.buttonStates as |bs|}}
     <FlatButton
       @icon="trash-alt"
       @disabled={{bs.disabled}}
@@ -133,9 +133,9 @@
 </StyleguideExample>
 
 <StyleguideExample
-  @title="dbutton btn-flat btn-text - sizes (large, default, small)"
+  @title="<DButton> btn-flat btn-text - sizes (large, default, small)"
 >
-  {{#each this.dummy.buttonSizes as |bs|}}
+  {{#each @dummy.buttonSizes as |bs|}}
     <DButton
       @class={{concat "btn-flat " bs.class}}
       @disabled={{bs.disabled}}
@@ -144,12 +144,22 @@
   {{/each}}
 </StyleguideExample>
 
-<StyleguideExample @title="dbutton btn-flat btn-text - states">
-  {{#each this.dummy.buttonStates as |bs|}}
+<StyleguideExample @title="<DButton> btn-flat btn-text - states">
+  {{#each @dummy.buttonStates as |bs|}}
     <DButton
       @class={{concat "btn-flat " bs.class}}
       @disabled={{bs.disabled}}
       @translatedLabel={{bs.text}}
     />
   {{/each}}
+</StyleguideExample>
+
+<StyleguideExample @title="<DToggleSwitch>">
+  <DToggleSwitch
+    @state={{@dummy.toggleSwitchState}}
+    {{on
+      "click"
+      (fn (mut @dummy.toggleSwitchState) (not @dummy.toggleSwitchState))
+    }}
+  />
 </StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/03-colors.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/03-colors.hbs
similarity index 95%
rename from plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/03-colors.hbs
rename to plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/03-colors.hbs
index 46095e82c07..e4b06cec732 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/03-colors.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/03-colors.hbs
@@ -74,10 +74,8 @@
 
 <StyleguideExample @title="highlight">
   <section class="color-row">
-    <ColorExample @color="highlight-low" />
-    <ColorExample @color="highlight-medium" />
+    <ColorExample @color="highlight-bg" />
     <ColorExample @color="highlight" />
-    <ColorExample @color="highlight-high" />
   </section>
 </StyleguideExample>
 
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/04-icons.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/04-icons.hbs
similarity index 100%
rename from plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/04-icons.hbs
rename to plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/04-icons.hbs
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/05-input-fields.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/05-input-fields.hbs
similarity index 80%
rename from plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/05-input-fields.hbs
rename to plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/05-input-fields.hbs
index d1298919375..7aeb551cdae 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/05-input-fields.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/05-input-fields.hbs
@@ -43,14 +43,14 @@
 </StyleguideExample>
 
 <StyleguideExample
-  @title="inline-form with combo-box"
-  @initialValue={{this.dummy.options.0.name}}
+  @title="inline-form with <ComboBox>"
+  @initialValue={{@dummy.options.0.name}}
   as |value|
 >
   <div class="inline-form">
     <TextField @placeholder="Placeholder" />
     <ComboBox
-      @content={{this.dummy.options}}
+      @content={{@dummy.options}}
       @value={{value}}
       @onChange={{fn (mut value)}}
     />
@@ -63,10 +63,10 @@
   </div>
 </StyleguideExample>
 
-<StyleguideExample @title="inline-form with multi-select">
+<StyleguideExample @title="inline-form with <MultiSelect>">
   <div class="inline-form">
     <TextField />
-    <MultiSelect @content={{this.dummy.options}} @onChange={{action "dummy"}} />
+    <MultiSelect @content={{@dummy.options}} @onChange={{@dummyAction}} />
     <DButton
       @class="btn-primary"
       @icon="search"
@@ -76,11 +76,11 @@
   </div>
 </StyleguideExample>
 
-<StyleguideExample @title="inline-form with multi-select and label">
+<StyleguideExample @title="inline-form with <MultiSelect> and label">
   <div class="inline-form">
     <label>Text:</label>
     <TextField />
-    <MultiSelect @content={{this.dummy.options}} @onChange={{action "dummy"}} />
+    <MultiSelect @content={{@dummy.options}} @onChange={{@dummyAction}} />
     <DButton
       @class="btn-primary"
       @icon="search"
@@ -96,12 +96,12 @@
   </div>
 </StyleguideExample>
 
-<StyleguideExample @title="category-notifications-button and regular button">
+<StyleguideExample @title="<CategoryNotificationsButton> and regular button">
   <div class="inline-form">
     <CategoryNotificationsButton
-      @category={{get this.dummy.categories 0}}
+      @category={{get @dummy.categories 0}}
       @value={{1}}
-      @onChange={{action "dummy"}}
+      @onChange={{@dummyAction}}
     />
     <DButton @icon="reply" @type="submit" @translatedLabel="Button" />
   </div>
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/06-spinners.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/06-spinners.hbs
similarity index 100%
rename from plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/06-spinners.hbs
rename to plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/06-spinners.hbs
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/date-time-inputs.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/date-time-inputs.hbs
similarity index 55%
rename from plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/date-time-inputs.hbs
rename to plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/date-time-inputs.hbs
index 2a58a7bb5f2..2e81a968ebb 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/date-time-inputs.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/date-time-inputs.hbs
@@ -1,27 +1,27 @@
-<StyleguideExample @title="time-input">
+<StyleguideExample @title="<TimeInput>">
   <TimeInput />
 </StyleguideExample>
 
-<StyleguideExample @title="date-input">
+<StyleguideExample @title="<DateInput>">
   <DateInput />
 </StyleguideExample>
 
-<StyleguideExample @title="date-time-input">
+<StyleguideExample @title="<DateTimeInput>">
   <DateTimeInput @clearable={{true}} />
 </StyleguideExample>
 
-<StyleguideExample @title="date-time-input-range">
+<StyleguideExample @title="<DateTimeInputRange>">
   <DateTimeInputRange />
 </StyleguideExample>
 
-<StyleguideExample @title="date-time-input-range">
+<StyleguideExample @title="<DateTimeInputRange>">
   <DateTimeInputRange @showFromTime={{false}} @showToTime={{false}} />
 </StyleguideExample>
 
-<StyleguideExample @title="future-date-input">
+<StyleguideExample @title="<FutureDateInput>">
   <FutureDateInput @displayLabelIcon="far-clock" @clearable={{true}} />
 </StyleguideExample>
 
-<StyleguideExample @title="date-picker">
+<StyleguideExample @title="<DatePicker>">
   <DatePicker @defaultDate="YYYY-MM-DD" />
 </StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/dropdowns.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/dropdowns.hbs
new file mode 100644
index 00000000000..ea750997bbe
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/dropdowns.hbs
@@ -0,0 +1,170 @@
+<StyleguideExample
+  @title="<ComboBox>"
+  @initialValue={{@dummy.options.0.name}}
+  as |value|
+>
+  <ComboBox
+    @content={{@dummy.options}}
+    @value={{value}}
+    @onChange={{fn (mut value)}}
+  />
+</StyleguideExample>
+
+<StyleguideExample
+  @title="filterable <ComboBox>"
+  @initialValue={{@dummy.categories.0.name}}
+  as |value|
+>
+  <ComboBox
+    @content={{@dummy.categories}}
+    @value={{value}}
+    @options={{hash filterable=true}}
+    @onChange={{fn (mut value)}}
+  />
+</StyleguideExample>
+
+<StyleguideExample
+  @title="<ComboBox> with a default state"
+  @initialValue={{@dummy.options.0.name}}
+  as |value|
+>
+  <ComboBox
+    @content={{@dummy.options}}
+    @value={{value}}
+    @options={{hash none="category.none"}}
+    @onChange={{fn (mut value)}}
+  />
+</StyleguideExample>
+
+<StyleguideExample
+  @title="<ComboBox> clearable"
+  @initialValue={{@dummy.options.0.name}}
+  as |value|
+>
+  <ComboBox
+    @content={{@dummy.options}}
+    @clearable={{true}}
+    @value={{value}}
+    @options={{hash none="category.none"}}
+    @onChange={{fn (mut value)}}
+  />
+</StyleguideExample>
+
+<StyleguideExample
+  @title="<TopicNotificationOptions>"
+  @initialValue={{1}}
+  as |value|
+>
+  <TopicNotificationsOptions
+    @topic={{@dummy.topic}}
+    @value={{value}}
+    @onChange={{fn (mut value)}}
+  />
+</StyleguideExample>
+
+<StyleguideExample @title="<TopicFooterMobileDropdown>">
+  <TopicFooterMobileDropdown @topic={{@dummy.topic}} />
+</StyleguideExample>
+
+<StyleguideExample
+  @title="<CategoryChooser>"
+  @initialValue={{@categories.0.name}}
+  as |value|
+>
+  <CategoryChooser @value={{value}} @onChange={{fn (mut value)}} />
+</StyleguideExample>
+
+<StyleguideExample @title="<PinnedButton>">
+  <PinnedButton @topic={{@dummy.pinnedTopic}} />
+</StyleguideExample>
+
+<StyleguideExample @title="<PinnedOptions>">
+  <PinnedOptions @topic={{@dummy.pinnedTopic}} />
+</StyleguideExample>
+
+<StyleguideExample @title="<CategoriesAdminDropdown>">
+  <CategoriesAdminDropdown @onChange={{@dummyAction}} />
+</StyleguideExample>
+
+<StyleguideExample @title="<CategoryNotificationsButton>">
+  <CategoryNotificationsButton
+    @category={{get @dummy.categories 0}}
+    @value={{1}}
+    @onChange={{@dummyAction}}
+  />
+</StyleguideExample>
+
+<StyleguideExample @title="<NotificationsButton>">
+  <NotificationsButton
+    @options={{hash i18nPrefix="groups.notifications"}}
+    @value={{2}}
+    @onChange={{@dummyAction}}
+  />
+</StyleguideExample>
+
+<StyleguideExample @title="<DropdownSelectBox>">
+  <DropdownSelectBox
+    @content={{@dummy.options}}
+    @onChange={{@dummyAction}}
+    @options={{hash translatedNone="Something"}}
+  />
+</StyleguideExample>
+
+<StyleguideExample @title="<FutureDateInputSelector>">
+  <FutureDateInputSelector
+    @input={{@dummy.topicTimerUpdateDate}}
+    @includeWeekend={{true}}
+    @includeForever={{true}}
+    @options={{hash none="time_shortcut.select_timeframe"}}
+  />
+</StyleguideExample>
+
+<StyleguideExample @title="<MultiSelect>">
+  <MultiSelect @content={{@dummy.options}} @onChange={{@dummyAction}} />
+</StyleguideExample>
+
+<StyleguideExample @title="<MiniTagChooser>">
+  <div class="inline-form">
+    <MiniTagChooser
+      @value={{@dummy.selectedTags}}
+      @options={{hash filterable=true}}
+    />
+  </div>
+</StyleguideExample>
+
+<StyleguideExample @title="<MiniTagChooser> with useHeaderFilter=true">
+  <div class="inline-form">
+    <MiniTagChooser
+      @value={{@dummy.selectedTags}}
+      @options={{hash
+        filterable=true
+        filterPlaceholder="tagging.choose_for_topic"
+        useHeaderFilter=true
+      }}
+    />
+  </div>
+</StyleguideExample>
+
+<StyleguideExample @title="admin <GroupChooser>">
+  <GroupChooser
+    @selected={{@dummy.selectedGroups}}
+    @content={{@dummy.groups}}
+    @onChange={{@dummyAction}}
+  />
+</StyleguideExample>
+
+<StyleguideExample @title="<ListSetting>">
+  <ListSetting @settingValue={{@dummy.settings}} @onChange={{@dummyAction}} />
+</StyleguideExample>
+
+<StyleguideExample @title="<ListSetting>">
+  <ListSetting
+    @settingValue={{@dummy.colors}}
+    @nameProperty="color"
+    @onChange={{@dummyAction}}
+  />
+</StyleguideExample>
+
+<StyleguideExample @title="<UserNotificationsDropdown>">
+  <UserNotificationsDropdown @user={{@currentUser}} @value="changeToNormal" />
+</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/topic-link.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/topic-link.hbs
new file mode 100644
index 00000000000..fc67fae23e1
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/topic-link.hbs
@@ -0,0 +1,3 @@
+<StyleguideExample @title="topic-link">
+  {{topic-link @dummy.topic}}
+</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/topic-statuses.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/topic-statuses.hbs
similarity index 50%
rename from plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/topic-statuses.hbs
rename to plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/topic-statuses.hbs
index 66ababb9af6..710aa905be8 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/topic-statuses.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/topic-statuses.hbs
@@ -1,27 +1,27 @@
 <StyleguideExample @title="invisible">
-  <TopicStatus @topic={{this.dummy.invisibleTopic}} />
+  <TopicStatus @topic={{@dummy.invisibleTopic}} />
 </StyleguideExample>
 
 <StyleguideExample @title="closed">
-  <TopicStatus @topic={{this.dummy.closedTopic}} />
+  <TopicStatus @topic={{@dummy.closedTopic}} />
 </StyleguideExample>
 
 <StyleguideExample @title="pinned">
-  <TopicStatus @topic={{this.dummy.pinnedTopic}} />
+  <TopicStatus @topic={{@dummy.pinnedTopic}} />
 </StyleguideExample>
 
 <StyleguideExample @title="unpinned">
-  <TopicStatus @topic={{this.dummy.unpinnedTopic}} />
+  <TopicStatus @topic={{@dummy.unpinnedTopic}} />
 </StyleguideExample>
 
 <StyleguideExample @title="archived">
-  <TopicStatus @topic={{this.dummy.archivedTopic}} />
+  <TopicStatus @topic={{@dummy.archivedTopic}} />
 </StyleguideExample>
 
 <StyleguideExample @title="warning">
-  <TopicStatus @topic={{this.dummy.warningTopic}} />
+  <TopicStatus @topic={{@dummy.warningTopic}} />
 </StyleguideExample>
 
 <StyleguideExample @title="no status">
-  <TopicStatus @topic={{this.dummy.topic}} />
+  <TopicStatus @topic={{@dummy.topic}} />
 </StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/bread-crumbs.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/bread-crumbs.hbs
new file mode 100644
index 00000000000..e6f09e495ce
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/bread-crumbs.hbs
@@ -0,0 +1,9 @@
+<StyleguideExample @title="category-breadcrumbs">
+  <BreadCrumbs @categories={{@dummy.categories}} @showTags={{false}} />
+</StyleguideExample>
+
+{{#if @siteSettings.tagging_enabled}}
+  <StyleguideExample @title="category-breadcrumbs - tags">
+    <BreadCrumbs @categories={{@dummy.categories}} @showTags={{true}} />
+  </StyleguideExample>
+{{/if}}
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/categories.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/categories.hbs
similarity index 73%
rename from plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/categories.hbs
rename to plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/categories.hbs
index 32955ec5fe6..413af982b77 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/categories.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/categories.hbs
@@ -1,23 +1,23 @@
 <StyleguideExample @title="category-badge - bullet">
-  {{#each this.dummy.categories as |c|}}
+  {{#each @dummy.categories as |c|}}
     {{category-badge c categoryStyle="bullet"}}
   {{/each}}
 </StyleguideExample>
 
 <StyleguideExample @title="category-badge - bar">
-  {{#each this.dummy.categories as |c|}}
+  {{#each @dummy.categories as |c|}}
     {{category-badge c categoryStyle="bar"}}
   {{/each}}
 </StyleguideExample>
 
 <StyleguideExample @title="category-badge - box">
-  {{#each this.dummy.categories as |c|}}
+  {{#each @dummy.categories as |c|}}
     {{category-badge c categoryStyle="box"}}
   {{/each}}
 </StyleguideExample>
 
 <StyleguideExample @title="category-badge - none">
-  {{#each this.dummy.categories as |c|}}
+  {{#each @dummy.categories as |c|}}
     {{category-badge c categoryStyle="none"}}
   {{/each}}
 </StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/char-counter.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/char-counter.hbs
new file mode 100644
index 00000000000..a03a141bb92
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/char-counter.hbs
@@ -0,0 +1,11 @@
+<StyleguideExample @title="<CharCounter>">
+  <CharCounter @max="50" @value={{@dummy.charCounterContent}}>
+    <textarea
+      {{on
+        "input"
+        (action (mut @dummy.charCounterContent) value="target.value")
+      }}
+      class="styleguide--char-counter"
+    ></textarea>
+  </CharCounter>
+</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/empty-state.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/empty-state.hbs
new file mode 100644
index 00000000000..6f0cea6debc
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/empty-state.hbs
@@ -0,0 +1,3 @@
+<StyleguideExample @title="<EmptyState>">
+  <EmptyState @title={{@dummy.sentence}} @body={{@dummy.short_sentence}} />
+</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/footer-message.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/footer-message.hbs
new file mode 100644
index 00000000000..2fdb4fc2676
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/footer-message.hbs
@@ -0,0 +1,25 @@
+<StyleguideExample @title="<FooterMessage> - default">
+  <FooterMessage
+    @education={{@dummy.sentence}}
+    @message={{@dummy.short_sentence}}
+  />
+</StyleguideExample>
+
+<StyleguideExample @title="<FooterMessage> - latest">
+  <FooterMessage
+    @education={{@dummy.sentence}}
+    @message={{@dummy.short_sentence}}
+    @latest={{true}}
+    @canCreateTopicOnCategory={{true}}
+    @createTopic={{@dummyAction}}
+  />
+</StyleguideExample>
+
+<StyleguideExample @title="<FooterMessage> - top">
+  <FooterMessage
+    @education={{@dummy.sentence}}
+    @message={{@dummy.short_sentence}}
+    @top={{true}}
+    @changePeriod={{@dummyAction}}
+  />
+</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/header-icons.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/header-icons.hbs
similarity index 63%
rename from plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/header-icons.hbs
rename to plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/header-icons.hbs
index 16153ec5e2a..03c7f625622 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/header-icons.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/header-icons.hbs
@@ -3,12 +3,12 @@
 </StyleguideExample>
 
 <StyleguideExample @title="header-icons - user">
-  <MountWidget @widget="header-icons" @args={{hash user=this.dummy.user}} />
+  <MountWidget @widget="header-icons" @args={{hash user=@dummy.user}} />
 </StyleguideExample>
 
 <StyleguideExample @title="header-icons - notifications">
   <MountWidget
     @widget="header-icons"
-    @args={{hash user=this.dummy.userWithUnread flagCount=5}}
+    @args={{hash user=@dummy.userWithUnread flagCount=5}}
   />
 </StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/navigation-bar.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/navigation-bar.hbs
new file mode 100644
index 00000000000..ce4dace836f
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/navigation-bar.hbs
@@ -0,0 +1,31 @@
+<StyleguideExample @title="<NavigationBar>">
+  <NavigationBar @navItems={{@dummy.navItems}} @filterMode="latest" />
+</StyleguideExample>
+
+<StyleguideExample @title=".user-main .nav-pills">
+  <MobileNav @class="main-nav" @desktopClass="nav nav-pills user-nav">
+    {{#each @dummy.navItems as |ni|}}
+      <li>
+        <a href={{ni.href}} class={{if ni.styleGuideActive "active"}}>
+          {{ni.displayName}}
+        </a>
+      </li>
+    {{/each}}
+  </MobileNav>
+</StyleguideExample>
+
+<StyleguideExample @title="group page <NavigationBar>">
+  <MobileNav @class="group-nav" @desktopClass="nav nav-pills">
+    <li class="group-dropdown">
+      <GroupDropdown @groups={{@dummy.groupNames}} @value="staff" />
+    </li>
+
+    {{#each @dummy.navItems as |ni|}}
+      <li>
+        <a href={{ni.href}} class={{if ni.styleGuideActive "active"}}>
+          {{ni.displayName}}
+        </a>
+      </li>
+    {{/each}}
+  </MobileNav>
+</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/navigation-stacked.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/navigation-stacked.hbs
similarity index 56%
rename from plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/navigation-stacked.hbs
rename to plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/navigation-stacked.hbs
index eb0d5e44f02..438cc58f341 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/navigation-stacked.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/navigation-stacked.hbs
@@ -3,11 +3,12 @@
     @class="preferences-nav"
     @desktopClass="preferences-list action-list nav-stacked"
   >
-    {{#each this.dummy.navItems as |ni|}}
-      <li><a
-          href={{ni.href}}
-          class={{if ni.styleGuideActive "active"}}
-        >{{ni.displayName}}</a></li>
+    {{#each @dummy.navItems as |ni|}}
+      <li>
+        <a href={{ni.href}} class={{if ni.styleGuideActive "active"}}>
+          {{ni.displayName}}
+        </a>
+      </li>
     {{/each}}
   </MobileNav>
 </StyleguideExample>
@@ -18,11 +19,12 @@
       @class="preferences-nav"
       @desktopClass="preferences-list action-list nav-stacked"
     >
-      {{#each this.dummy.navItems as |ni|}}
-        <li><a
-            href={{ni.href}}
-            class={{if ni.styleGuideActive "active"}}
-          >{{ni.displayName}}</a></li>
+      {{#each @dummy.navItems as |ni|}}
+        <li>
+          <a href={{ni.href}} class={{if ni.styleGuideActive "active"}}>
+            {{ni.displayName}}
+          </a>
+        </li>
       {{/each}}
     </MobileNav>
   </DSection>
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/post-menu.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/post-menu.hbs
new file mode 100644
index 00000000000..5ce85e47201
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/post-menu.hbs
@@ -0,0 +1,3 @@
+<StyleguideExample @title="post-menu">
+  <MountWidget @widget="post-menu" @args={{@dummy.transformedPost}} />
+</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/rich-tooltip.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/rich-tooltip.hbs
similarity index 79%
rename from plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/rich-tooltip.hbs
rename to plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/rich-tooltip.hbs
index 8d8c8fd8d43..1c767dabf4f 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/rich-tooltip.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/rich-tooltip.hbs
@@ -1,6 +1,7 @@
-<StyleguideExample @title="rich-tooltip">
+<StyleguideExample @title="<DTooltip>">
   <DButton>
     {{i18n "styleguide.sections.rich_tooltip.hover_to_see"}}
+
     <DTooltip>
       <h3>{{i18n "styleguide.sections.rich_tooltip.header"}}</h3>
       {{i18n "styleguide.sections.rich_tooltip.description"}}
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/signup-cta.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/signup-cta.hbs
new file mode 100644
index 00000000000..9a6055492db
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/signup-cta.hbs
@@ -0,0 +1,3 @@
+<StyleguideExample @title="<SignupCta>">
+  <SignupCta />
+</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/topic-list-item.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/topic-list-item.hbs
similarity index 50%
rename from plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/topic-list-item.hbs
rename to plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/topic-list-item.hbs
index de8a881f8eb..ad8207fab20 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/topic-list-item.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/topic-list-item.hbs
@@ -1,16 +1,16 @@
-<StyleguideExample @title="topic list item">
+<StyleguideExample @title="<TopicListItem>">
   <table class="topic-list">
     <tbody>
-      <TopicListItem @topic={{this.dummy.topic}} @showPosters={{true}} />
+      <TopicListItem @topic={{@dummy.topic}} @showPosters={{true}} />
     </tbody>
   </table>
 </StyleguideExample>
 
-<StyleguideExample @title="topic list item - hide category">
+<StyleguideExample @title="<TopicListItem> - hide category">
   <table class="topic-list">
     <tbody>
       <TopicListItem
-        @topic={{this.dummy.topic}}
+        @topic={{@dummy.topic}}
         @hideCategory={{true}}
         @showPosters={{true}}
       />
@@ -18,11 +18,11 @@
   </table>
 </StyleguideExample>
 
-<StyleguideExample @title="topic list item - show likes">
+<StyleguideExample @title="<TopicListItem> - show likes">
   <table class="topic-list">
     <tbody>
       <TopicListItem
-        @topic={{this.dummy.topic}}
+        @topic={{@dummy.topic}}
         @showLikes={{true}}
         @showPosters={{true}}
       />
@@ -30,6 +30,6 @@
   </table>
 </StyleguideExample>
 
-<StyleguideExample @title="topic list item - latest" class="half-size">
-  <LatestTopicListItem @topic={{this.dummy.topic}} />
+<StyleguideExample @title="<TopicListItem> - latest" class="half-size">
+  <LatestTopicListItem @topic={{@dummy.topic}} />
 </StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/topic-notifications.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/topic-notifications.hbs
new file mode 100644
index 00000000000..dfe67058db1
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/topic-notifications.hbs
@@ -0,0 +1,3 @@
+<StyleguideExample @title="<TopicNotificationsButton>">
+  <TopicNotificationsButton @topic={{@dummy.topic}} />
+</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/topic-timer-info.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/topic-timer-info.hbs
new file mode 100644
index 00000000000..580d47a4356
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/topic-timer-info.hbs
@@ -0,0 +1,3 @@
+<StyleguideExample @title="<TopicTimerInfo>">
+  <TopicTimerInfo @statusType="reminder" @executeAt={{@dummy.soon}} />
+</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/00-post.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/00-post.hbs
new file mode 100644
index 00000000000..cf0dcc9f1f0
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/00-post.hbs
@@ -0,0 +1,7 @@
+<StyleguideExample @title="post">
+  <MountWidget
+    @widget="post"
+    @model={{@dummy.postModel}}
+    @args={{@dummy.transformedPost}}
+  />
+</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/01-topic-map.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/01-topic-map.hbs
new file mode 100644
index 00000000000..8c28dc0a58a
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/01-topic-map.hbs
@@ -0,0 +1,3 @@
+<StyleguideExample @title="topic-map">
+  <MountWidget @widget="topic-map" @args={{@dummy.transformedPost}} />
+</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/03-topic-footer-buttons.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/03-topic-footer-buttons.hbs
new file mode 100644
index 00000000000..46a8c73cc3a
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/03-topic-footer-buttons.hbs
@@ -0,0 +1,13 @@
+<StyleguideExample @title="<TopicFooterButtons> - logged in">
+  <TopicFooterButtons @topic={{@dummy.topic}} />
+</StyleguideExample>
+
+<StyleguideExample @title="<TopicFooterButtons> - anonymous">
+  <div id="topic-footer-buttons">
+    <DButton
+      @icon="reply"
+      @class="btn-primary pull-right"
+      @label="topic.reply.title"
+    />
+  </div>
+</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/04-topic-list.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/04-topic-list.hbs
new file mode 100644
index 00000000000..d95a8c0dc9e
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/04-topic-list.hbs
@@ -0,0 +1,7 @@
+<StyleguideExample @title="<TopicList>">
+  <TopicList @topics={{@dummy.topics}} @showPosters={{true}} />
+</StyleguideExample>
+
+<StyleguideExample @title="<TopicList> - hide posters>">
+  <TopicList @topics={{@dummy.topics}} @showPosters={{false}} />
+</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/basic-topic-list.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/basic-topic-list.hbs
new file mode 100644
index 00000000000..71fe056ac6c
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/basic-topic-list.hbs
@@ -0,0 +1,3 @@
+<StyleguideExample @title="<BasicTopicList>" class="half-size">
+  <BasicTopicList @topics={{@dummy.topics}} />
+</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/categories-list.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/categories-list.hbs
new file mode 100644
index 00000000000..281aa4e30e2
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/categories-list.hbs
@@ -0,0 +1,3 @@
+<StyleguideExample @title="<CategoriesOnly>">
+  <CategoriesOnly @categories={{@dummy.categories}} />
+</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/modal.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/modal.hbs
new file mode 100644
index 00000000000..2da5d63612e
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/modal.hbs
@@ -0,0 +1,66 @@
+{{! template-lint-disable no-potential-path-strings}}
+
+<StyleguideExample @title="<DModal>">
+  <Styleguide::Component>
+    <DModal
+      @closeModal={{fn (mut this.inline) true}}
+      @inline={{this.inline}}
+      @title={{this.title}}
+      @subtitle={{this.subtitle}}
+      @flash={{this.flash}}
+      @flashType={{this.flashType}}
+      @errors={{this.errors}}
+      @dismissable={{this.dismissable}}
+    >
+      <:body>
+        {{this.body}}
+      </:body>
+
+      <:footer>
+        {{i18n "styleguide.sections.modal.footer"}}
+      </:footer>
+    </DModal>
+  </Styleguide::Component>
+
+  <Styleguide::Controls>
+    <Styleguide::Controls::Row @name="@inline">
+      <DToggleSwitch @state={{this.inline}} {{on "click" this.toggleInline}} />
+    </Styleguide::Controls::Row>
+    <Styleguide::Controls::Row @name="@dismissable">
+      <DToggleSwitch
+        @state={{this.dismissable}}
+        {{on "click" this.toggleDismissable}}
+      />
+    </Styleguide::Controls::Row>
+    <Styleguide::Controls::Row @name="@tagName">
+      <ComboBox
+        @value={{this.modalTagName}}
+        @content={{this.modalTagNames}}
+        @onChange={{fn (mut this.modalTagName)}}
+        @valueProperty={{null}}
+        @nameProperty={{null}}
+      />
+    </Styleguide::Controls::Row>
+    <Styleguide::Controls::Row @name="@title">
+      <Input @value={{this.title}} />
+    </Styleguide::Controls::Row>
+    <Styleguide::Controls::Row @name="@subtitle">
+      <Input @value={{this.subtitle}} />
+    </Styleguide::Controls::Row>
+    <Styleguide::Controls::Row @name="<:body>">
+      <Textarea @value={{this.body}} />
+    </Styleguide::Controls::Row>
+    <Styleguide::Controls::Row @name="@flash">
+      <Input @value={{this.flash}} />
+    </Styleguide::Controls::Row>
+    <Styleguide::Controls::Row @name="@flashType">
+      <ComboBox
+        @value={{this.flashType}}
+        @content={{this.flashTypes}}
+        @onChange={{fn (mut this.flashType)}}
+        @valueProperty={{null}}
+        @nameProperty={{null}}
+      />
+    </Styleguide::Controls::Row>
+  </Styleguide::Controls>
+</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/modal.js b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/modal.js
new file mode 100644
index 00000000000..05374113e4e
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/modal.js
@@ -0,0 +1,41 @@
+import { action } from "@ember/object";
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import I18n from "I18n";
+
+export default class extends Component {
+  @tracked inline = true;
+  @tracked dismissable = true;
+  @tracked modalTagName = "div";
+  @tracked title = I18n.t("styleguide.sections.modal.header");
+  @tracked body = this.args.dummy.shortLorem;
+  @tracked subtitle = "";
+  @tracked flash = "";
+  @tracked flashType = "success";
+
+  flashTypes = ["success", "info", "warning", "error"];
+  modalTagNames = ["div", "form"];
+
+  @action
+  toggleInline() {
+    this.inline = !this.inline;
+    if (!this.inline) {
+      // Make sure there is a way to dismiss the modal
+      this.dismissable = true;
+    }
+  }
+
+  @action
+  toggleDismissable() {
+    this.dismissable = !this.dismissable;
+    if (!this.dismissable) {
+      // Make sure there is a way to dismiss the modal
+      this.inline = true;
+    }
+  }
+
+  @action
+  toggleShowFooter() {
+    this.showFooter = !this.showFooter;
+  }
+}
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/navigation.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/navigation.hbs
similarity index 67%
rename from plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/navigation.hbs
rename to plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/navigation.hbs
index 05f240b07c2..25e9b740b20 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/navigation.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/navigation.hbs
@@ -2,8 +2,9 @@
   <div class="list-controls">
     <div class="container">
       <DSection @class="navigation-container">
-        <BreadCrumbs @categories={{this.dummy.categories}} />
-        <NavigationBar @navItems={{this.dummy.navItems}} @filterMode="latest" />
+        <BreadCrumbs @categories={{@dummy.categories}} />
+        <NavigationBar @navItems={{@dummy.navItems}} @filterMode="latest" />
+
         <div class="navigation-controls">
           <CategoriesAdminDropdown />
           <CreateTopicButton @canCreateTopic={{true}} />
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/site-header.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/site-header.hbs
similarity index 75%
rename from plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/site-header.hbs
rename to plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/site-header.hbs
index 2c4cdad51ad..6c6f1b75217 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/site-header.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/site-header.hbs
@@ -4,11 +4,12 @@
       <div class="wrap">
         <div class="contents">
           <MountWidget @widget="home-logo" @args={{hash minimized=true}} />
-          <MountWidget @widget="header-topic-info" @args={{this.dummy}} />
+          <MountWidget @widget="header-topic-info" @args={{@dummy}} />
+
           <div class="panel clearfix">
             <MountWidget
               @widget="header-icons"
-              @args={{hash user=this.dummy.user}}
+              @args={{hash user=@dummy.user}}
             />
           </div>
         </div>
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/suggested-topics.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/suggested-topics.hbs
new file mode 100644
index 00000000000..7ed102ae577
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/suggested-topics.hbs
@@ -0,0 +1,3 @@
+<StyleguideExample @title="<SuggestedTopics>">
+  <SuggestedTopics @topic={{@dummy.topic}} />
+</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/user-about.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/user-about.hbs
new file mode 100644
index 00000000000..f28074719ac
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/user-about.hbs
@@ -0,0 +1,403 @@
+<StyleguideExample @title=".user-main .about.collapsed-info.no-background">
+  <DSection @class="user-main">
+    <section class="collapsed-info about no-background">
+      <div class="profile-image"></div>
+
+      <div class="details">
+        <div class="primary">
+          {{bound-avatar @dummy.user "huge"}}
+          <section class="controls">
+            <ul>
+              <li>
+                <a class="btn btn-primary">
+                  {{d-icon "envelope"}}
+                  {{i18n "user.private_message"}}
+                </a>
+              </li>
+              <li>
+                <a href={{@dummy.user.adminPath}} class="btn">
+                  {{d-icon "wrench"}}
+                  {{i18n "admin.user.show_admin_profile"}}
+                </a>
+              </li>
+              <li>
+                <a href="#" class="btn">
+                  {{d-icon "angle-double-down"}}
+                  {{i18n "user.expand_profile"}}
+                </a>
+              </li>
+            </ul>
+          </section>
+
+          <div class="primary-textual">
+            <h1 class="username">
+              {{@dummy.user.username}}
+              {{d-icon "shield-alt"}}
+            </h1>
+            <h2 class="full-name">{{@dummy.user.name}}</h2>
+            <h3>{{@dummy.user.title}}</h3>
+          </div>
+        </div>
+        <div style="clear: both"></div>
+      </div>
+    </section>
+  </DSection>
+</StyleguideExample>
+
+<StyleguideExample @title=".user-main .about.collapsed-info.has-background">
+  <DSection @class="user-main">
+    <section
+      class="collapsed-info about has-background"
+      style={{@dummy.user.profileBackground}}
+    >
+      <div class="profile-image"></div>
+      <div class="details">
+        <div class="primary">
+          {{bound-avatar @dummy.user "huge"}}
+          <section class="controls">
+            <ul>
+              <li>
+                <a class="btn btn-primary">
+                  {{d-icon "envelope"}}
+                  {{i18n "user.private_message"}}
+                </a>
+              </li>
+              <li>
+                <a href={{@dummy.user.adminPath}} class="btn">
+                  {{d-icon "wrench"}}
+                  {{i18n "admin.user.show_admin_profile"}}
+                </a>
+              </li>
+              <li>
+                <a href="#" class="btn">
+                  {{d-icon "angle-double-down"}}
+                  {{i18n "user.expand_profile"}}
+                </a>
+              </li>
+            </ul>
+          </section>
+
+          <div class="primary-textual">
+            <h1 class="username">
+              {{@dummy.user.username}}
+              {{d-icon "shield-alt"}}
+            </h1>
+            <h2 class="full-name">{{@dummy.user.name}}</h2>
+            <h3>{{@dummy.user.title}}</h3>
+          </div>
+        </div>
+        <div style="clear: both"></div>
+      </div>
+    </section>
+  </DSection>
+</StyleguideExample>
+
+<StyleguideExample @title=".user-main .about.no-background">
+  <DSection @class="user-main">
+    <section class="about no-background">
+
+      <div class="staff-counters">
+        <div>
+          <span class="helpful-flags">
+            {{@dummy.user.number_of_flags_given}}
+          </span>&nbsp;{{i18n "user.staff_counters.flags_given"}}
+        </div>
+        <div>
+          <a href="#">
+            <span class="flagged-posts">
+              {{@dummy.user.number_of_flagged_posts}}
+            </span>&nbsp;{{i18n "user.staff_counters.flagged_posts"}}
+          </a>
+        </div>
+        <div>
+          <a href="#">
+            <span class="deleted-posts">
+              {{@dummy.user.number_of_deleted_posts}}
+            </span>&nbsp;{{i18n "user.staff_counters.deleted_posts"}}
+          </a>
+        </div>
+        <div>
+          <span class="suspensions">
+            {{@dummy.user.number_of_suspensions}}
+          </span>&nbsp;{{i18n "user.staff_counters.suspensions"}}
+        </div>
+        <div>
+          <span class="warnings-received">
+            {{@dummy.user.warnings_received_count}}
+          </span>&nbsp;{{i18n "user.staff_counters.warnings_received"}}
+        </div>
+      </div>
+
+      <div class="profile-image"></div>
+      <div class="details">
+        <div class="primary">
+          {{bound-avatar @dummy.user "huge"}}
+          <section class="controls">
+            <ul>
+              <li>
+                <a class="btn btn-primary">
+                  {{d-icon "envelope"}}
+                  {{i18n "user.private_message"}}
+                </a>
+              </li>
+              <li>
+                <a href={{@dummy.user.adminPath}} class="btn">
+                  {{d-icon "wrench"}}
+                  {{i18n "admin.user.show_admin_profile"}}
+                </a>
+              </li>
+            </ul>
+          </section>
+
+          <div class="primary-textual">
+            <h1 class="username">
+              {{@dummy.user.username}}
+              {{d-icon "shield-alt"}}
+            </h1>
+            <h2 class="full-name">{{@dummy.user.name}}</h2>
+            <h3>{{@dummy.user.title}}</h3>
+            <h3>
+              {{d-icon "map-marker-alt"}}
+              {{@dummy.user.location}}
+              {{d-icon "globe"}}
+              <a
+                href={{@dummy.user.website}}
+                rel="nofollow noopener noreferrer"
+                target="_blank"
+              >
+                {{@dummy.user.website_name}}
+              </a>
+            </h3>
+
+            <div class="bio">
+              <div class="suspended">
+                {{d-icon "ban"}}
+                <b>
+                  {{i18n
+                    "user.suspended_notice"
+                    date=@dummy.user.suspendedTillDate
+                  }}
+                </b>
+                <br />
+                <b>{{i18n "user.suspended_reason"}}</b>
+                {{@dummy.user.suspend_reason}}
+              </div>
+              {{html-safe @dummy.user.bio_cooked}}
+            </div>
+
+            <div class="public-user-fields">
+              {{#each @dummy.user.publicUserFields as |uf|}}
+                {{#if uf.value}}
+                  <div class="public-user-field {{uf.field.dasherized_name}}">
+                    <span class="user-field-name">{{uf.field.name}}
+                    </span>:
+                    <span class="user-field-value">{{uf.value}}
+                    </span>
+                  </div>
+                {{/if}}
+              {{/each}}
+            </div>
+          </div>
+        </div>
+        <div style="clear: both"></div>
+      </div>
+
+      <div class="secondary">
+        <dl>
+          <dt>{{i18n "user.created"}}</dt>
+          <dd>{{bound-date @dummy.user.created_at}}</dd>
+          <dt>{{i18n "user.last_posted"}}</dt>
+          <dd>{{bound-date @dummy.user.last_posted_at}}</dd>
+          <dt>{{i18n "user.last_seen"}}</dt>
+          <dd>{{bound-date @dummy.user.last_seen_at}}</dd>
+          <dt>{{i18n "views"}}</dt>
+          <dd>{{@dummy.user.profile_view_count}}</dd>
+          <dt class="invited-by">{{i18n "user.invited_by"}}</dt>
+          <dd class="invited-by">
+            <a href="#">{{@dummy.user.invited_by.username}}</a>
+          </dd>
+          <dt class="trust-level">{{i18n "user.trust_level"}}</dt>
+          <dd class="trust-level">{{@dummy.user.trustLevel.name}}</dd>
+          <dt>{{i18n "user.email.title"}}</dt>
+          <dd title={{@dummy.user.email}}>
+            <DButton
+              @icon="envelope"
+              @label="admin.users.check_email.text"
+              @class="btn-primary"
+            />
+          </dd>
+          <dt class="groups">
+            {{i18n "groups.title" count=@dummy.user.displayGroups.length}}
+          </dt>
+          <dd class="groups">
+            {{#each @dummy.user.displayGroups as |group|}}
+              <span>
+                <a href="#" class="group-link">{{group.name}}</a>
+              </span>
+            {{/each}}
+          </dd>
+          <DButton
+            @icon="exclamation-triangle"
+            @label="user.admin_delete"
+            @class="btn-danger"
+          />
+        </dl>
+      </div>
+    </section>
+  </DSection>
+</StyleguideExample>
+
+<StyleguideExample @title=".user-main .about.has-background">
+  <DSection @class="user-main">
+    <section
+      class="about has-background"
+      style={{@dummy.user.profileBackground}}
+    >
+      <div class="staff-counters">
+        <div>
+          <span class="helpful-flags">
+            {{@dummy.user.number_of_flags_given}}
+          </span>&nbsp;{{i18n "user.staff_counters.flags_given"}}
+        </div>
+        <div>
+          <a href="#">
+            <span class="flagged-posts">
+              {{@dummy.user.number_of_flagged_posts}}
+            </span>&nbsp;{{i18n "user.staff_counters.flagged_posts"}}
+          </a>
+        </div>
+        <div>
+          <a href="#">
+            <span class="deleted-posts">
+              {{@dummy.user.number_of_deleted_posts}}
+            </span>&nbsp;{{i18n "user.staff_counters.deleted_posts"}}
+          </a>
+        </div>
+        <div>
+          <span class="suspensions">
+            {{@dummy.user.number_of_suspensions}}
+          </span>&nbsp;{{i18n "user.staff_counters.suspensions"}}
+        </div>
+        <div>
+          <span class="warnings-received">
+            {{@dummy.user.warnings_received_count}}
+          </span>&nbsp;{{i18n "user.staff_counters.warnings_received"}}
+        </div>
+      </div>
+
+      <div class="profile-image"></div>
+      <div class="details">
+        <div class="primary">
+          {{bound-avatar @dummy.user "huge"}}
+          <section class="controls">
+            <ul>
+              <li>
+                <a class="btn btn-primary">
+                  {{d-icon "envelope"}}
+                  {{i18n "user.private_message"}}
+                </a>
+              </li>
+              <li>
+                <a href={{@dummy.user.adminPath}} class="btn">
+                  {{d-icon "wrench"}}
+                  {{i18n "admin.user.show_admin_profile"}}
+                </a>
+              </li>
+            </ul>
+          </section>
+
+          <div class="primary-textual">
+            <h1 class="username">
+              {{@dummy.user.username}}
+              {{d-icon "shield-alt"}}
+            </h1>
+            <h2 class="full-name">{{@dummy.user.name}}</h2>
+            <h3>{{@dummy.user.title}}</h3>
+            <h3>
+              {{d-icon "map-marker-alt"}}
+              {{@dummy.user.location}}
+              {{d-icon "globe"}}
+              <a
+                href={{@dummy.user.website}}
+                rel="nofollow noopener noreferrer"
+                target="_blank"
+              >
+                {{@dummy.user.website_name}}
+              </a>
+            </h3>
+
+            <div class="bio">
+              <div class="suspended">
+                {{d-icon "ban"}}
+                <b>
+                  {{i18n
+                    "user.suspended_notice"
+                    date=@dummy.user.suspendedTillDate
+                  }}
+                </b>
+                <br />
+                <b>{{i18n "user.suspended_reason"}}</b>
+                {{@dummy.user.suspend_reason}}
+              </div>
+              {{html-safe @dummy.user.bio_cooked}}
+            </div>
+
+            <div class="public-user-fields">
+              {{#each @dummy.user.publicUserFields as |uf|}}
+                {{#if uf.value}}
+                  <div class="public-user-field {{uf.field.dasherized_name}}">
+                    <span class="user-field-name">{{uf.field.name}}</span>:
+                    <span class="user-field-value">{{uf.value}}</span>
+                  </div>
+                {{/if}}
+              {{/each}}
+            </div>
+          </div>
+        </div>
+        <div style="clear: both"></div>
+      </div>
+
+      <div class="secondary">
+        <dl>
+          <dt>{{i18n "user.created"}}</dt>
+          <dd>{{bound-date @dummy.user.created_at}}</dd>
+          <dt>{{i18n "user.last_posted"}}</dt>
+          <dd>{{bound-date @dummy.user.last_posted_at}}</dd>
+          <dt>{{i18n "user.last_seen"}}</dt>
+          <dd>{{bound-date @dummy.user.last_seen_at}}</dd>
+          <dt>{{i18n "views"}}</dt>
+          <dd>{{@dummy.user.profile_view_count}}</dd>
+          <dt class="invited-by">{{i18n "user.invited_by"}}</dt>
+          <dd class="invited-by">
+            <a href="#">{{@dummy.user.invited_by.username}}</a>
+          </dd>
+          <dt class="trust-level">{{i18n "user.trust_level"}}</dt>
+          <dd class="trust-level">{{@dummy.user.trustLevel.name}}</dd>
+          <dt>{{i18n "user.email.title"}}</dt>
+          <dd title={{@dummy.user.email}}>
+            <DButton
+              @icon="envelope"
+              @label="admin.users.check_email.text"
+              @class="btn-primary"
+            />
+          </dd>
+          <dt class="groups">
+            {{i18n "groups.title" count=@dummy.user.displayGroups.length}}
+          </dt>
+          <dd class="groups">
+            {{#each @dummy.user.displayGroups as |group|}}
+              <span>
+                <a href="#" class="group-link">{{group.name}}</a>
+              </span>
+            {{/each}}
+          </dd>
+          <DButton
+            @icon="exclamation-triangle"
+            @label="user.admin_delete"
+            @class="btn-danger"
+          />
+        </dl>
+      </div>
+    </section>
+  </DSection>
+</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/styleguide-example.hbs b/plugins/styleguide/assets/javascripts/discourse/components/styleguide-example.hbs
new file mode 100644
index 00000000000..25f0cd276af
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/components/styleguide-example.hbs
@@ -0,0 +1,4 @@
+<section class="styleguide-example">
+  <div class="example-title">{{@title}}</div>
+  <section class="rendered">{{yield this.value}}</section>
+</section>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/styleguide-example.js b/plugins/styleguide/assets/javascripts/discourse/components/styleguide-example.js
index a01de1ca449..551b6d69036 100644
--- a/plugins/styleguide/assets/javascripts/discourse/components/styleguide-example.js
+++ b/plugins/styleguide/assets/javascripts/discourse/components/styleguide-example.js
@@ -1,12 +1,11 @@
-import Component from "@ember/component";
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
 
-export default Component.extend({
-  tagName: "section",
-  classNames: ["styleguide-example"],
-  value: null,
+export default class StyleguideExample extends Component {
+  @tracked value = null;
 
-  init() {
-    this._super(...arguments);
-    this.value = this.initialValue;
-  },
-});
+  constructor() {
+    super(...arguments);
+    this.value = this.args.initialValue;
+  }
+}
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/components/styleguide-icons.hbs b/plugins/styleguide/assets/javascripts/discourse/components/styleguide-icons.hbs
similarity index 100%
rename from plugins/styleguide/assets/javascripts/discourse/templates/components/styleguide-icons.hbs
rename to plugins/styleguide/assets/javascripts/discourse/components/styleguide-icons.hbs
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/styleguide-icons.js b/plugins/styleguide/assets/javascripts/discourse/components/styleguide-icons.js
index 55e1eacca94..8b409e0ec82 100644
--- a/plugins/styleguide/assets/javascripts/discourse/components/styleguide-icons.js
+++ b/plugins/styleguide/assets/javascripts/discourse/components/styleguide-icons.js
@@ -19,7 +19,7 @@ export default Component.extend({
     if (symbols.length > 0) {
       let ids = Array.from(symbols).mapBy("id");
       ids.push(...Object.keys(REPLACEMENTS));
-      this.set("iconIds", ids.sort());
+      this.set("iconIds", [...new Set(ids.sort())]);
     } else {
       // Let's try again a short time later if there are no svgs loaded yet
       discourseLater(this, this.setIconIds, 1500);
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/styleguide-link.hbs b/plugins/styleguide/assets/javascripts/discourse/components/styleguide-link.hbs
new file mode 100644
index 00000000000..2ac1c204bb3
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/components/styleguide-link.hbs
@@ -0,0 +1,6 @@
+<LinkTo
+  @route="styleguide.show"
+  @models={{array @section.category @section.id}}
+>
+  {{section-title @section.id}}
+</LinkTo>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/styleguide-link.js b/plugins/styleguide/assets/javascripts/discourse/components/styleguide-link.js
deleted file mode 100644
index 44494409ab5..00000000000
--- a/plugins/styleguide/assets/javascripts/discourse/components/styleguide-link.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import Component from "@ember/component";
-
-export default Component.extend({
-  tagName: "",
-});
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/components/styleguide-section.hbs b/plugins/styleguide/assets/javascripts/discourse/components/styleguide-section.hbs
similarity index 100%
rename from plugins/styleguide/assets/javascripts/discourse/templates/components/styleguide-section.hbs
rename to plugins/styleguide/assets/javascripts/discourse/components/styleguide-section.hbs
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/styleguide/component.hbs b/plugins/styleguide/assets/javascripts/discourse/components/styleguide/component.hbs
new file mode 100644
index 00000000000..87963a352ae
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/components/styleguide/component.hbs
@@ -0,0 +1,3 @@
+<div class="component">
+  {{yield}}
+</div>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/styleguide/component.js b/plugins/styleguide/assets/javascripts/discourse/components/styleguide/component.js
new file mode 100644
index 00000000000..d2571b9a083
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/components/styleguide/component.js
@@ -0,0 +1,3 @@
+import Component from "@glimmer/component";
+
+export default class StyleguideComponent extends Component {}
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/styleguide/controls.hbs b/plugins/styleguide/assets/javascripts/discourse/components/styleguide/controls.hbs
new file mode 100644
index 00000000000..42d3152a89c
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/components/styleguide/controls.hbs
@@ -0,0 +1,5 @@
+<table class="component-properties">
+  <tbody>
+    {{yield}}
+  </tbody>
+</table>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/styleguide/controls.js b/plugins/styleguide/assets/javascripts/discourse/components/styleguide/controls.js
new file mode 100644
index 00000000000..f7fc07ef4c8
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/components/styleguide/controls.js
@@ -0,0 +1,3 @@
+import Component from "@glimmer/component";
+
+export default class StyleguideControls extends Component {}
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/styleguide/controls/row.hbs b/plugins/styleguide/assets/javascripts/discourse/components/styleguide/controls/row.hbs
new file mode 100644
index 00000000000..20f1b586a6d
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/components/styleguide/controls/row.hbs
@@ -0,0 +1,8 @@
+<tr class="component-properties__row">
+  {{#if @name}}
+    <td class="component-properties__cell">{{@name}}</td>
+  {{/if}}
+  <td class="component-properties__cell">
+    {{yield}}
+  </td>
+</tr>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/styleguide/controls/toggle.hbs b/plugins/styleguide/assets/javascripts/discourse/components/styleguide/controls/toggle.hbs
new file mode 100644
index 00000000000..e4c7fc4720d
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/components/styleguide/controls/toggle.hbs
@@ -0,0 +1 @@
+<DToggleSwitch @state={{@enabled}} {{on "click" @action}} />
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/styleguide/controls/toggle.js b/plugins/styleguide/assets/javascripts/discourse/components/styleguide/controls/toggle.js
new file mode 100644
index 00000000000..5a3c13f4268
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/components/styleguide/controls/toggle.js
@@ -0,0 +1,3 @@
+import Component from "@glimmer/component";
+
+export default class StyleguideControlsToggle extends Component {}
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/toggle-color-mode.hbs b/plugins/styleguide/assets/javascripts/discourse/components/toggle-color-mode.hbs
new file mode 100644
index 00000000000..be380d583e4
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/components/toggle-color-mode.hbs
@@ -0,0 +1,3 @@
+{{#if this.shouldRender}}
+  <DButton @action={{this.toggle}} class="toggle-color-mode">Toggle color</DButton>
+{{/if}}
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/toggle-color-mode.js b/plugins/styleguide/assets/javascripts/discourse/components/toggle-color-mode.js
new file mode 100644
index 00000000000..c0165ed1c51
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/components/toggle-color-mode.js
@@ -0,0 +1,84 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+import { tracked } from "@glimmer/tracking";
+import { loadColorSchemeStylesheet } from "discourse/lib/color-scheme-picker";
+import { currentThemeId } from "discourse/lib/theme-selector";
+
+const DARK = "dark";
+const LIGHT = "light";
+
+function colorSchemeOverride(type) {
+  const lightScheme = document.querySelector("link.light-scheme");
+  const darkScheme =
+    document.querySelector("link.dark-scheme") ||
+    document.querySelector("link#cs-preview-dark");
+
+  if (!lightScheme && !darkScheme) {
+    return;
+  }
+
+  switch (type) {
+    case DARK:
+      lightScheme.origMedia = lightScheme.media;
+      lightScheme.media = "none";
+      darkScheme.origMedia = darkScheme.media;
+      darkScheme.media = "all";
+      break;
+    case LIGHT:
+      lightScheme.origMedia = lightScheme.media;
+      lightScheme.media = "all";
+      darkScheme.origMedia = darkScheme.media;
+      darkScheme.media = "none";
+      break;
+    default:
+      if (lightScheme.origMedia) {
+        lightScheme.media = lightScheme.origMedia;
+        lightScheme.removeAttribute("origMedia");
+      }
+      if (darkScheme.origMedia) {
+        darkScheme.media = darkScheme.origMedia;
+        darkScheme.removeAttribute("origMedia");
+      }
+      break;
+  }
+}
+
+export default class ToggleColorMode extends Component {
+  @service keyValueStore;
+  @service siteSettings;
+
+  @tracked colorSchemeOverride = this.default;
+  @tracked shouldRender = true;
+
+  constructor() {
+    super(...arguments);
+
+    // If site has a dark color scheme set but user doesn't auto switch in dark mode
+    // we need to load the stylesheet manually
+    if (!document.querySelector("link.dark-scheme")) {
+      if (this.siteSettings.default_dark_mode_color_scheme_id > 0) {
+        loadColorSchemeStylesheet(
+          this.siteSettings.default_dark_mode_color_scheme_id,
+          currentThemeId(),
+          true
+        );
+      } else {
+        // no dark color scheme available, hide button
+        this.shouldRender = false;
+      }
+    }
+  }
+
+  get default() {
+    return window.matchMedia("(prefers-color-scheme: dark)").matches
+      ? DARK
+      : LIGHT;
+  }
+
+  @action
+  toggle() {
+    this.colorSchemeOverride = this.colorSchemeOverride === DARK ? LIGHT : DARK;
+    colorSchemeOverride(this.colorSchemeOverride);
+  }
+}
diff --git a/plugins/styleguide/assets/javascripts/discourse/controllers/styleguide-show.js b/plugins/styleguide/assets/javascripts/discourse/controllers/styleguide-show.js
index ac5d206d4fe..bedefb4deae 100644
--- a/plugins/styleguide/assets/javascripts/discourse/controllers/styleguide-show.js
+++ b/plugins/styleguide/assets/javascripts/discourse/controllers/styleguide-show.js
@@ -1,7 +1,7 @@
 import Controller from "@ember/controller";
+import { action } from "@ember/object";
 
-export default Controller.extend({
-  actions: {
-    dummy() {},
-  },
-});
+export default class StyleguideShow extends Controller {
+  @action
+  dummyAction() {}
+}
diff --git a/plugins/styleguide/assets/javascripts/discourse/controllers/styleguide.js b/plugins/styleguide/assets/javascripts/discourse/controllers/styleguide.js
index 1626769068c..30d43970834 100644
--- a/plugins/styleguide/assets/javascripts/discourse/controllers/styleguide.js
+++ b/plugins/styleguide/assets/javascripts/discourse/controllers/styleguide.js
@@ -1,5 +1,5 @@
 import Controller from "@ember/controller";
 
-export default Controller.extend({
-  sections: null,
-});
+export default class Styleguide extends Controller {
+  sections = null;
+}
diff --git a/plugins/styleguide/assets/javascripts/discourse/lib/dummy-data.js b/plugins/styleguide/assets/javascripts/discourse/lib/dummy-data.js
index 29597f9e579..d1fece440cb 100644
--- a/plugins/styleguide/assets/javascripts/discourse/lib/dummy-data.js
+++ b/plugins/styleguide/assets/javascripts/discourse/lib/dummy-data.js
@@ -98,7 +98,7 @@ export function createData(store) {
           posts_count: ((topicId * 1234) % 100) + 1,
           views: ((topicId * 123) % 1000) + 1,
           like_count: topicId % 3,
-          created_at: `2017-03-${topicId}`,
+          created_at: `2017-03-${topicId % 30}T12:30:00.000Z`,
           visible: true,
           posters: [
             { extras: "latest", user },
@@ -157,9 +157,9 @@ export function createData(store) {
     id: 1234,
     cooked,
     created_at: moment().subtract(3, "days"),
-    user_id: user.get("id"),
-    username: user.get("username"),
-    avatar_template: user.get("avatar_template"),
+    user_id: user.id,
+    username: user.username,
+    avatar_template: user.avatar_template,
     showLike: true,
     canToggleLike: true,
     canFlag: true,
@@ -168,10 +168,10 @@ export function createData(store) {
     canBookmark: true,
     canManage: true,
     canDelete: true,
-    createdByUsername: user.get("username"),
-    createdByAvatarTemplate: user.get("avatar_template"),
-    lastPostUsername: user.get("username"),
-    lastPostAvatarTemplate: user.get("avatar_template"),
+    createdByUsername: user.username,
+    createdByAvatarTemplate: user.avatar_template,
+    lastPostUsername: user.username,
+    lastPostAvatarTemplate: user.avatar_template,
     topicReplyCount: 123,
     topicViews: 3456,
     participantCount: 10,
@@ -179,6 +179,7 @@ export function createData(store) {
     topicLinkLength: 5,
     topicPostsCount: 4,
     participants: [createUser(), createUser(), createUser(), createUser()],
+    post_number: 1,
     topicLinks: [
       {
         title: "Evil Trout",
@@ -195,6 +196,11 @@ export function createData(store) {
     ],
   };
 
+  const postModel = store.createRecord("post", {
+    ...transformedPost,
+    topic: createTopic(),
+  });
+
   _data = {
     options: [
       { id: 1, name: "Orange" },
@@ -217,6 +223,8 @@ export function createData(store) {
       { disabled: true, text: "disabled" },
     ],
 
+    toggleSwitchState: true,
+
     navItems: ["latest", "categories", "top"].map((name) => {
       let item = NavItem.fromText(name);
 
@@ -244,15 +252,18 @@ export function createData(store) {
     soon: moment().add(2, "days"),
 
     transformedPost,
+    postModel,
 
     user,
 
     userWithUnread: createUser({
       unread_notifications: 3,
-      unread_private_messages: 7,
+      unread_high_priority_notifications: 7,
     }),
 
     lorem: cooked,
+    shortLorem:
+      "Lorem ipsum dolor sit amet, et nec quis viderer prompta, ex omnium ponderum insolens eos, sed discere invenire principes in. Fuisset constituto per ad. Est no scripta propriae facilisis, viderer impedit deserunt in mel. Quot debet facilisis ne vix, nam in detracto tacimates. At quidam petentium vulputate pro. Alia iudico repudiandae ad vel, erat omnis epicuri eos id. Et illum dolor graeci vel, quo feugiat consulatu ei.",
 
     topicTimerUpdateDate: "2017-10-18 18:00",
 
@@ -269,6 +280,10 @@ export function createData(store) {
     settings: "bold|italic|strike|underline",
 
     colors: "f49|c89|564897",
+
+    charCounterContent: "",
+
+    selectedTags: ["apple", "orange", "potato"],
   };
 
   return _data;
diff --git a/plugins/styleguide/assets/javascripts/discourse/lib/styleguide.js b/plugins/styleguide/assets/javascripts/discourse/lib/styleguide.js
index aac2b772ef5..7239cf85326 100644
--- a/plugins/styleguide/assets/javascripts/discourse/lib/styleguide.js
+++ b/plugins/styleguide/assets/javascripts/discourse/lib/styleguide.js
@@ -1,10 +1,113 @@
-import DiscourseTemplateMap from "discourse-common/lib/discourse-template-map";
+import typography from "../components/sections/atoms/00-typography";
+import fontScale from "../components/sections/atoms/01-font-scale";
+import buttons from "../components/sections/atoms/02-buttons";
+import colors from "../components/sections/atoms/03-colors";
+import icons from "../components/sections/atoms/04-icons";
+import inputFields from "../components/sections/atoms/05-input-fields";
+import spinners from "../components/sections/atoms/06-spinners";
+import dateTimeInputs from "../components/sections/atoms/date-time-inputs";
+import dropdowns from "../components/sections/atoms/dropdowns";
+import topicLink from "../components/sections/atoms/topic-link";
+import topicStatuses from "../components/sections/atoms/topic-statuses";
+import breadCrumbs from "../components/sections/molecules/bread-crumbs";
+import categories from "../components/sections/molecules/categories";
+import charCounter from "../components/sections/molecules/char-counter";
+import emptyState from "../components/sections/molecules/empty-state";
+import footerMessage from "../components/sections/molecules/footer-message";
+import headerIcons from "../components/sections/molecules/header-icons";
+import navigationBar from "../components/sections/molecules/navigation-bar";
+import navigationStacked from "../components/sections/molecules/navigation-stacked";
+import postMenu from "../components/sections/molecules/post-menu";
+import richTooltip from "../components/sections/molecules/rich-tooltip";
+import signupCta from "../components/sections/molecules/signup-cta";
+import topicListItem from "../components/sections/molecules/topic-list-item";
+import topicNotifications from "../components/sections/molecules/topic-notifications";
+import topicTimerInfo from "../components/sections/molecules/topic-timer-info";
+import post from "../components/sections/organisms/00-post";
+import topicMap from "../components/sections/organisms/01-topic-map";
+import topicFooterButtons from "../components/sections/organisms/03-topic-footer-buttons";
+import topicList from "../components/sections/organisms/04-topic-list";
+import basicTopicList from "../components/sections/organisms/basic-topic-list";
+import categoriesList from "../components/sections/organisms/categories-list";
+import modal from "../components/sections/organisms/modal";
+import navigation from "../components/sections/organisms/navigation";
+import siteHeader from "../components/sections/organisms/site-header";
+import suggestedTopics from "../components/sections/organisms/suggested-topics";
+import userAbout from "../components/sections/organisms/user-about";
+
 let _allCategories = null;
 let _sectionsById = {};
-let _notes = {};
 
 export const CATEGORIES = ["atoms", "molecules", "organisms"];
 
+const SECTIONS = [
+  { component: typography, category: "atoms", id: "typography", priority: 0 },
+  { component: fontScale, category: "atoms", id: "font-scale", priority: 1 },
+  { component: buttons, category: "atoms", id: "buttons", priority: 2 },
+  { component: colors, category: "atoms", id: "colors", priority: 3 },
+  { component: icons, category: "atoms", id: "icons", priority: 4 },
+  {
+    component: inputFields,
+    category: "atoms",
+    id: "input-fields",
+    priority: 5,
+  },
+  { component: spinners, category: "atoms", id: "spinners", priority: 6 },
+  { component: dateTimeInputs, category: "atoms", id: "date-time-inputs" },
+  { component: dropdowns, category: "atoms", id: "dropdowns" },
+  { component: topicLink, category: "atoms", id: "topic-link" },
+  { component: topicStatuses, category: "atoms", id: "topic-statuses" },
+  { component: breadCrumbs, category: "molecules", id: "bread-crumbs" },
+  { component: categories, category: "molecules", id: "categories" },
+  { component: charCounter, category: "molecules", id: "char-counter" },
+  { component: emptyState, category: "molecules", id: "empty-state" },
+  { component: footerMessage, category: "molecules", id: "footer-message" },
+  { component: headerIcons, category: "molecules", id: "header-icons" },
+  { component: navigationBar, category: "molecules", id: "navigation-bar" },
+  {
+    component: navigationStacked,
+    category: "molecules",
+    id: "navigation-stacked",
+  },
+  { component: postMenu, category: "molecules", id: "post-menu" },
+  { component: richTooltip, category: "molecules", id: "rich-tooltip" },
+  { component: signupCta, category: "molecules", id: "signup-cta" },
+  { component: topicListItem, category: "molecules", id: "topic-list-item" },
+  {
+    component: topicNotifications,
+    category: "molecules",
+    id: "topic-notifications",
+  },
+  { component: topicTimerInfo, category: "molecules", id: "topic-timer-info" },
+  { component: post, category: "organisms", id: "post", priority: 0 },
+  { component: topicMap, category: "organisms", id: "topic-map", priority: 1 },
+  {
+    component: topicFooterButtons,
+    category: "organisms",
+    id: "topic-footer-buttons",
+    priority: 3,
+  },
+  {
+    component: topicList,
+    category: "organisms",
+    id: "topic-list",
+    priority: 4,
+  },
+  { component: basicTopicList, category: "organisms", id: "basic-topic-list" },
+  { component: categoriesList, category: "organisms", id: "categories-list" },
+  { component: modal, category: "organisms", id: "modal" },
+  { component: navigation, category: "organisms", id: "navigation" },
+  { component: siteHeader, category: "organisms", id: "site-header" },
+  { component: suggestedTopics, category: "organisms", id: "suggested-topics" },
+  { component: userAbout, category: "organisms", id: "user-about" },
+];
+
+export function addSection(section) {
+  if (!SECTIONS.some((s) => s.id === section.id)) {
+    SECTIONS.push(section);
+  }
+}
+
 export function sectionById(id) {
   // prime cache
   allCategories();
@@ -13,11 +116,13 @@ export function sectionById(id) {
 }
 
 function sortSections(a, b) {
-  let result = a.priority - b.priority;
-  if (result === 0) {
-    return a.id < b.id ? -1 : 1;
+  const result = a.priority - b.priority;
+
+  if (result !== 0) {
+    return result;
   }
-  return result;
+
+  return a.id < b.id ? -1 : 1;
 }
 
 export function allCategories() {
@@ -25,50 +130,26 @@ export function allCategories() {
     return _allCategories;
   }
 
-  let categories = {};
+  for (const section of SECTIONS) {
+    section.priority ??= 100;
 
-  let paths = CATEGORIES.join("|");
+    categories[section.category] ||= [];
+    categories[section.category].push(section);
 
-  // Find a list of sections based on what templates are available
-  // eslint-disable-next-line no-undef
-  DiscourseTemplateMap.keys().forEach((e) => {
-    let regexp = new RegExp(`styleguide\/(${paths})\/(\\d+)?\\-?([^\\/]+)$`);
-    let matches = e.match(regexp);
-    if (matches) {
-      let section = {
-        id: matches[3],
-        priority: parseInt(matches[2] || "100", 10),
-        category: matches[1],
-        templateName: e.replace(/^.*styleguide\//, ""),
-      };
-      if (!categories[section.category]) {
-        categories[section.category] = [];
-      }
-      categories[section.category].push(section);
-      _sectionsById[section.id] = section;
-    }
-
-    // Look for notes
-    regexp = new RegExp(`components\/notes\/(\\d+)?\\-?([^\\/]+)$`);
-    matches = e.match(regexp);
-    if (matches) {
-      _notes[matches[2]] = e.replace(/^.*notes\//, "");
-    }
-  });
+    _sectionsById[section.id] = section;
+  }
 
   _allCategories = [];
-  CATEGORIES.forEach((c) => {
-    let sections = categories[c];
+  for (const category of CATEGORIES) {
+    const sections = categories[category];
+
     if (sections) {
       _allCategories.push({
-        id: c,
+        id: category,
         sections: sections.sort(sortSections),
       });
     }
-  });
+  }
+
   return _allCategories;
 }
-
-export function findNote(section) {
-  return _notes[section.id];
-}
diff --git a/plugins/styleguide/assets/javascripts/discourse/pre-initializers/styleguide-plugin-api.js b/plugins/styleguide/assets/javascripts/discourse/pre-initializers/styleguide-plugin-api.js
new file mode 100644
index 00000000000..3873ab5e961
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/pre-initializers/styleguide-plugin-api.js
@@ -0,0 +1,42 @@
+import { withPluginApi } from "discourse/lib/plugin-api";
+import { addSection } from "../lib/styleguide";
+
+/**
+ * Add a section to the styleguide
+ *
+ * @function addStyleguideSection
+ * @param {Object} section
+ * @param {Component} section.component
+ * @param {string} options.id
+ * @param {string} options.category
+ * @param {number} [options.priority]
+ * @example
+ *
+ * import fidget from "../components/styleguide/molecules/fidget";
+ *
+ * api.addStyleguideSection({
+ *   component: fidget,
+ *   id: "fidget",
+ *   category: "molecules",
+ *   priority: 0,
+ * });
+ */
+
+export default {
+  name: "styleguide-plugin-api",
+  before: "inject-discourse-objects",
+
+  initialize() {
+    withPluginApi("1.2.0", (api) => {
+      const apiPrototype = Object.getPrototypeOf(api);
+
+      if (!apiPrototype.hasOwnProperty("addStyleguideSection")) {
+        Object.defineProperty(apiPrototype, "addStyleguideSection", {
+          value(section) {
+            addSection(section);
+          },
+        });
+      }
+    });
+  },
+};
diff --git a/plugins/styleguide/assets/javascripts/discourse/routes/styleguide-show.js b/plugins/styleguide/assets/javascripts/discourse/routes/styleguide-show.js
index 04ef4ba03d2..ad1d00f4185 100644
--- a/plugins/styleguide/assets/javascripts/discourse/routes/styleguide-show.js
+++ b/plugins/styleguide/assets/javascripts/discourse/routes/styleguide-show.js
@@ -1,29 +1,16 @@
 import Route from "@ember/routing/route";
-import {
-  findNote,
-  sectionById,
-} from "discourse/plugins/styleguide/discourse/lib/styleguide";
+import { sectionById } from "discourse/plugins/styleguide/discourse/lib/styleguide";
 import { createData } from "discourse/plugins/styleguide/discourse/lib/dummy-data";
 
-export default Route.extend({
+export default class StyleguideShow extends Route {
   model(params) {
     return sectionById(params.section);
-  },
+  }
 
   setupController(controller, section) {
-    let note = findNote(section);
-
     controller.setProperties({
       section,
-      note,
       dummy: createData(this.store),
     });
-  },
-
-  renderTemplate(controller, section) {
-    this.render("styleguide.show");
-    this.render(`styleguide/${section.templateName}`, {
-      into: "styleguide.show",
-    });
-  },
-});
+  }
+}
diff --git a/plugins/styleguide/assets/javascripts/discourse/routes/styleguide.js b/plugins/styleguide/assets/javascripts/discourse/routes/styleguide.js
index db58938962a..cdbd22d54bb 100644
--- a/plugins/styleguide/assets/javascripts/discourse/routes/styleguide.js
+++ b/plugins/styleguide/assets/javascripts/discourse/routes/styleguide.js
@@ -1,12 +1,12 @@
 import Route from "@ember/routing/route";
 import { allCategories } from "discourse/plugins/styleguide/discourse/lib/styleguide";
 
-export default Route.extend({
+export default class Styleguide extends Route {
   model() {
     return allCategories();
-  },
+  }
 
   setupController(controller, categories) {
     controller.set("categories", categories);
-  },
-});
+  }
+}
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/components/color-example.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/components/color-example.hbs
deleted file mode 100644
index 6f7866b73c6..00000000000
--- a/plugins/styleguide/assets/javascripts/discourse/templates/components/color-example.hbs
+++ /dev/null
@@ -1,2 +0,0 @@
-<div class="color-bg {{this.color}}"></div>
-<div class="color-name">var(--{{this.color}})</div>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/components/notes/.keep b/plugins/styleguide/assets/javascripts/discourse/templates/components/notes/.keep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/components/styleguide-example.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/components/styleguide-example.hbs
deleted file mode 100644
index a5824bf64cc..00000000000
--- a/plugins/styleguide/assets/javascripts/discourse/templates/components/styleguide-example.hbs
+++ /dev/null
@@ -1,2 +0,0 @@
-<div class="example-title">{{this.title}}</div>
-<section class="rendered">{{yield this.value}}</section>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/components/styleguide-link.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/components/styleguide-link.hbs
deleted file mode 100644
index 07640eb94e9..00000000000
--- a/plugins/styleguide/assets/javascripts/discourse/templates/components/styleguide-link.hbs
+++ /dev/null
@@ -1,6 +0,0 @@
-<LinkTo
-  @route="styleguide.show"
-  @models={{array this.section.category this.section.id}}
->
-  {{section-title this.section.id}}
-</LinkTo>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide.hbs
index 4961f46af16..ee4dd54db9e 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide.hbs
@@ -1,16 +1,19 @@
 <section class="styleguide">
   <section class="styleguide-menu">
+    <ToggleColorMode />
+
     {{#each this.categories as |c|}}
       <ul>
-        <li class="styleguide-heading">{{i18n
-            (concat "styleguide.categories." c.id)
-          }}</li>
+        <li class="styleguide-heading">
+          {{i18n (concat "styleguide.categories." c.id)}}
+        </li>
         {{#each c.sections as |s|}}
           <li><StyleguideLink @section={{s}} /></li>
         {{/each}}
       </ul>
     {{/each}}
   </section>
+
   <section class="styleguide-contents">
     {{outlet}}
   </section>
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/00-typography.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/00-typography.hbs
deleted file mode 100644
index a59354322fc..00000000000
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/00-typography.hbs
+++ /dev/null
@@ -1,27 +0,0 @@
-<StyleguideExample @title="h1">
-  <h1>{{i18n "styleguide.sections.typography.example"}}</h1>
-</StyleguideExample>
-
-<StyleguideExample @title="h2">
-  <h2>{{i18n "styleguide.sections.typography.example"}}</h2>
-</StyleguideExample>
-
-<StyleguideExample @title="h3">
-  <h3>{{i18n "styleguide.sections.typography.example"}}</h3>
-</StyleguideExample>
-
-<StyleguideExample @title="h4">
-  <h4>{{i18n "styleguide.sections.typography.example"}}</h4>
-</StyleguideExample>
-
-<StyleguideExample @title="h5">
-  <h5>{{i18n "styleguide.sections.typography.example"}}</h5>
-</StyleguideExample>
-
-<StyleguideExample @title="h6">
-  <h6>{{i18n "styleguide.sections.typography.example"}}</h6>
-</StyleguideExample>
-
-<StyleguideExample @title="p">
-  <p>{{i18n "styleguide.sections.typography.paragraph"}}</p>
-</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/dropdowns.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/dropdowns.hbs
deleted file mode 100644
index b417701d671..00000000000
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/dropdowns.hbs
+++ /dev/null
@@ -1,154 +0,0 @@
-<StyleguideExample
-  @title="combo-box"
-  @initialValue={{this.dummy.options.0.name}}
-  as |value|
->
-  <ComboBox
-    @content={{this.dummy.options}}
-    @value={{value}}
-    @onChange={{fn (mut value)}}
-  />
-</StyleguideExample>
-
-<StyleguideExample
-  @title="filterable combo-box"
-  @initialValue={{this.dummy.categories.0.name}}
-  as |value|
->
-  <ComboBox
-    @content={{this.dummy.categories}}
-    @value={{value}}
-    @options={{hash filterable=true}}
-    @onChange={{fn (mut value)}}
-  />
-</StyleguideExample>
-
-<StyleguideExample
-  @title="combo-box with a default state"
-  @initialValue={{this.dummy.options.0.name}}
-  as |value|
->
-  <ComboBox
-    @content={{this.dummy.options}}
-    @value={{value}}
-    @options={{hash none="category.none"}}
-    @onChange={{fn (mut value)}}
-  />
-</StyleguideExample>
-
-<StyleguideExample
-  @title="combo-box clearable"
-  @initialValue={{this.dummy.options.0.name}}
-  as |value|
->
-  <ComboBox
-    @content={{this.dummy.options}}
-    @clearable={{true}}
-    @value={{value}}
-    @options={{hash none="category.none"}}
-    @onChange={{fn (mut value)}}
-  />
-</StyleguideExample>
-
-<StyleguideExample
-  @title="topic-notifications-options"
-  @initialValue={{1}}
-  as |value|
->
-  <TopicNotificationsOptions
-    @topic={{this.dummy.topic}}
-    @value={{value}}
-    @onChange={{fn (mut value)}}
-  />
-</StyleguideExample>
-
-<StyleguideExample @title="topic-footer-mobile-dropdown">
-  <TopicFooterMobileDropdown @topic={{this.dummy.topic}} />
-</StyleguideExample>
-
-<StyleguideExample
-  @title="category-chooser"
-  @initialValue={{this.categories.0.name}}
-  as |value|
->
-  <CategoryChooser @value={{value}} @onChange={{fn (mut value)}} />
-</StyleguideExample>
-
-<StyleguideExample @title="pinned-button">
-  <PinnedButton @topic={{this.dummy.pinnedTopic}} />
-</StyleguideExample>
-
-<StyleguideExample @title="pinned-options">
-  <PinnedOptions @topic={{this.dummy.pinnedTopic}} />
-</StyleguideExample>
-
-<StyleguideExample @title="categories-admin-dropdown">
-  <CategoriesAdminDropdown @onChange={{action "dummy"}} />
-</StyleguideExample>
-
-<StyleguideExample @title="category-notifications-button">
-  <CategoryNotificationsButton
-    @category={{get this.dummy.categories 0}}
-    @value={{1}}
-    @onChange={{action "dummy"}}
-  />
-</StyleguideExample>
-
-<StyleguideExample @title="notifications-button">
-  <NotificationsButton
-    @options={{hash i18nPrefix="groups.notifications"}}
-    @value={{2}}
-    @onChange={{action "dummy"}}
-  />
-</StyleguideExample>
-
-<StyleguideExample @title="dropdown-select-box">
-  <DropdownSelectBox
-    @content={{this.dummy.options}}
-    @onChange={{action "dummy"}}
-    @options={{hash translatedNone="Something"}}
-  />
-</StyleguideExample>
-
-<StyleguideExample @title="future-date-input-selector">
-  <FutureDateInputSelector
-    @input={{this.dummy.topicTimerUpdateDate}}
-    @includeWeekend={{true}}
-    @includeForever={{true}}
-    @options={{hash none="time_shortcut.select_timeframe"}}
-  />
-</StyleguideExample>
-
-<StyleguideExample @title="multi-select">
-  <MultiSelect @content={{this.dummy.options}} @onChange={{action "dummy"}} />
-</StyleguideExample>
-
-<StyleguideExample @title="admin group-chooser">
-  <GroupChooser
-    @selected={{this.dummy.selectedGroups}}
-    @content={{this.dummy.groups}}
-    @onChange={{action "dummy"}}
-  />
-</StyleguideExample>
-
-<StyleguideExample @title="list-setting">
-  <ListSetting
-    @settingValue={{this.dummy.settings}}
-    @onChange={{action "dummy"}}
-  />
-</StyleguideExample>
-
-<StyleguideExample @title="list-setting with colors">
-  <ListSetting
-    @settingValue={{this.dummy.colors}}
-    @nameProperty="color"
-    @onChange={{action "dummy"}}
-  />
-</StyleguideExample>
-
-<StyleguideExample @title="user-notifications-dropdown">
-  <UserNotificationsDropdown
-    @user={{this.currentUser}}
-    @value="changeToNormal"
-  />
-</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/topic-link.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/topic-link.hbs
deleted file mode 100644
index fe8c6b5bb31..00000000000
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/topic-link.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-<StyleguideExample @title="topic-link">
-  {{topic-link this.dummy.topic}}
-</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/bread-crumbs.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/bread-crumbs.hbs
deleted file mode 100644
index c099c85df1c..00000000000
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/bread-crumbs.hbs
+++ /dev/null
@@ -1,9 +0,0 @@
-<StyleguideExample @title="category-breadcrumbs">
-  <BreadCrumbs @categories={{this.dummy.categories}} @showTags={{false}} />
-</StyleguideExample>
-
-{{#if this.siteSettings.tagging_enabled}}
-  <StyleguideExample @title="category-breadcrumbs - tags">
-    <BreadCrumbs @categories={{this.dummy.categories}} @showTags={{true}} />
-  </StyleguideExample>
-{{/if}}
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/empty-state.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/empty-state.hbs
deleted file mode 100644
index 0537d119866..00000000000
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/empty-state.hbs
+++ /dev/null
@@ -1,6 +0,0 @@
-<StyleguideExample @title="empty-state">
-  <EmptyState
-    @title={{this.dummy.sentence}}
-    @body={{this.dummy.short_sentence}}
-  />
-</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/footer-message.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/footer-message.hbs
deleted file mode 100644
index dfe74785c2a..00000000000
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/footer-message.hbs
+++ /dev/null
@@ -1,25 +0,0 @@
-<StyleguideExample @title="footer-message - default">
-  <FooterMessage
-    @education={{this.dummy.sentence}}
-    @message={{this.dummy.short_sentence}}
-  />
-</StyleguideExample>
-
-<StyleguideExample @title="footer-message - latest">
-  <FooterMessage
-    @education={{this.dummy.sentence}}
-    @message={{this.dummy.short_sentence}}
-    @latest={{true}}
-    @canCreateTopicOnCategory={{true}}
-    @createTopic={{action "dummy"}}
-  />
-</StyleguideExample>
-
-<StyleguideExample @title="footer-message - top">
-  <FooterMessage
-    @education={{this.dummy.sentence}}
-    @message={{this.dummy.short_sentence}}
-    @top={{true}}
-    @changePeriod={{action "dummy"}}
-  />
-</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/navigation-bar.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/navigation-bar.hbs
deleted file mode 100644
index 6e8c1bbf736..00000000000
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/navigation-bar.hbs
+++ /dev/null
@@ -1,29 +0,0 @@
-<StyleguideExample @title="navigation-bar">
-  <NavigationBar @navItems={{this.dummy.navItems}} @filterMode="latest" />
-</StyleguideExample>
-
-<StyleguideExample @title=".user-main .nav-pills">
-  <MobileNav @class="main-nav" @desktopClass="nav nav-pills user-nav">
-    {{#each this.dummy.navItems as |ni|}}
-      <li><a
-          href={{ni.href}}
-          class={{if ni.styleGuideActive "active"}}
-        >{{ni.displayName}}</a></li>
-    {{/each}}
-  </MobileNav>
-</StyleguideExample>
-
-<StyleguideExample @title="group page navigation-bar">
-  <MobileNav @class="group-nav" @desktopClass="nav nav-pills">
-    <li class="group-dropdown">
-      <GroupDropdown @groups={{this.dummy.groupNames}} @value="staff" />
-    </li>
-
-    {{#each this.dummy.navItems as |ni|}}
-      <li><a
-          href={{ni.href}}
-          class={{if ni.styleGuideActive "active"}}
-        >{{ni.displayName}}</a></li>
-    {{/each}}
-  </MobileNav>
-</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/post-menu.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/post-menu.hbs
deleted file mode 100644
index 47fa184f2da..00000000000
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/post-menu.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-<StyleguideExample @title="post-menu">
-  <MountWidget @widget="post-menu" @args={{this.dummy.transformedPost}} />
-</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/signup-cta.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/signup-cta.hbs
deleted file mode 100644
index 08abe9d8f5c..00000000000
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/signup-cta.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-<StyleguideExample @title="signup-cta">
-  <SignupCta />
-</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/topic-notifications.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/topic-notifications.hbs
deleted file mode 100644
index 9fcffa295e1..00000000000
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/topic-notifications.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-<StyleguideExample @title="topic-notifications-button">
-  <TopicNotificationsButton @topic={{this.dummy.topic}} />
-</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/topic-timer-info.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/topic-timer-info.hbs
deleted file mode 100644
index 0d183674c5d..00000000000
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/topic-timer-info.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-<StyleguideExample @title="topic-timer-info">
-  <TopicTimerInfo @statusType="reminder" @executeAt={{this.dummy.soon}} />
-</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/00-post.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/00-post.hbs
deleted file mode 100644
index 6383c187018..00000000000
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/00-post.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-<StyleguideExample @title="post">
-  <MountWidget @widget="post" @args={{this.dummy.transformedPost}} />
-</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/01-topic-map.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/01-topic-map.hbs
deleted file mode 100644
index 80e509f62ce..00000000000
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/01-topic-map.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-<StyleguideExample @title="topic-map">
-  <MountWidget @widget="topic-map" @args={{this.dummy.transformedPost}} />
-</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/03-topic-footer-buttons.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/03-topic-footer-buttons.hbs
deleted file mode 100644
index 2d2f8246633..00000000000
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/03-topic-footer-buttons.hbs
+++ /dev/null
@@ -1,13 +0,0 @@
-<StyleguideExample @title="topic-footer-buttons - logged in">
-  <TopicFooterButtons @topic={{this.dummy.topic}} />
-</StyleguideExample>
-
-<StyleguideExample @title="topic-footer-buttons - anonymous">
-  <div id="topic-footer-buttons">
-    <DButton
-      @icon="reply"
-      @class="btn-primary pull-right"
-      @label="topic.reply.title"
-    />
-  </div>
-</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/04-topic-list.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/04-topic-list.hbs
deleted file mode 100644
index 5bbd15730c0..00000000000
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/04-topic-list.hbs
+++ /dev/null
@@ -1,7 +0,0 @@
-<StyleguideExample @title="topic-list">
-  <TopicList @topics={{this.dummy.topics}} @showPosters={{true}} />
-</StyleguideExample>
-
-<StyleguideExample @title="topic-list - hide posters">
-  <TopicList @topics={{this.dummy.topics}} @showPosters={{false}} />
-</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/basic-topic-list.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/basic-topic-list.hbs
deleted file mode 100644
index 31637d60a84..00000000000
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/basic-topic-list.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-<StyleguideExample @title="basic-topic-list" class="half-size">
-  <BasicTopicList @topics={{this.dummy.topics}} />
-</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/categories-list.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/categories-list.hbs
deleted file mode 100644
index c2dfb2e869f..00000000000
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/categories-list.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-<StyleguideExample @title="categories-only">
-  <CategoriesOnly @categories={{this.dummy.categories}} />
-</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/modal.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/modal.hbs
deleted file mode 100644
index e8bfcbd5ff8..00000000000
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/modal.hbs
+++ /dev/null
@@ -1,14 +0,0 @@
-<StyleguideExample @title="d-modal">
-  <DModal
-    @closeModal={{action "dummy"}}
-    @modalStyle="inline-modal"
-    @title={{i18n "styleguide.sections.modal.header"}}
-  >
-    <DModalBody>
-      {{html-safe this.dummy.lorem}}
-    </DModalBody>
-    <div class="modal-footer">
-      {{i18n "styleguide.sections.modal.footer"}}
-    </div>
-  </DModal>
-</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/suggested-topics.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/suggested-topics.hbs
deleted file mode 100644
index 98941d26906..00000000000
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/suggested-topics.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-<StyleguideExample @title="suggested-topics">
-  <SuggestedTopics @topic={{this.dummy.topic}} />
-</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/user-about.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/user-about.hbs
deleted file mode 100644
index bbb294a2139..00000000000
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/user-about.hbs
+++ /dev/null
@@ -1,377 +0,0 @@
-<StyleguideExample @title=".user-main .about.collapsed-info.no-background">
-  <DSection @class="user-main">
-    <section class="collapsed-info about no-background">
-      <div class="profile-image"></div>
-      <div class="details">
-        <div class="primary">
-          {{bound-avatar this.dummy.user "huge"}}
-          <section class="controls">
-            <ul>
-              <li>
-                <a class="btn btn-primary">
-                  {{d-icon "envelope"}}
-                  {{i18n "user.private_message"}}
-                </a>
-              </li>
-              <li><a href={{this.dummy.user.adminPath}} class="btn">{{d-icon
-                    "wrench"
-                  }}{{i18n "admin.user.show_admin_profile"}}</a></li>
-              <li><a href="#" class="btn">{{d-icon "angle-double-down"}}{{i18n
-                    "user.expand_profile"
-                  }}</a></li>
-            </ul>
-          </section>
-
-          <div class="primary-textual">
-            <h1 class="username">{{this.dummy.user.username}}
-              {{d-icon "shield-alt"}}</h1>
-            <h2 class="full-name">{{this.dummy.user.name}}</h2>
-            <h3>{{this.dummy.user.title}}</h3>
-          </div>
-        </div>
-        <div style="clear: both"></div>
-      </div>
-    </section>
-  </DSection>
-</StyleguideExample>
-
-<StyleguideExample @title=".user-main .about.collapsed-info.has-background">
-  <DSection @class="user-main">
-    <section
-      class="collapsed-info about has-background"
-      style={{this.dummy.user.profileBackground}}
-    >
-      <div class="profile-image"></div>
-      <div class="details">
-        <div class="primary">
-          {{bound-avatar this.dummy.user "huge"}}
-          <section class="controls">
-            <ul>
-              <li>
-                <a class="btn btn-primary">
-                  {{d-icon "envelope"}}
-                  {{i18n "user.private_message"}}
-                </a>
-              </li>
-              <li><a href={{this.dummy.user.adminPath}} class="btn">{{d-icon
-                    "wrench"
-                  }}{{i18n "admin.user.show_admin_profile"}}</a></li>
-              <li><a href="#" class="btn">{{d-icon "angle-double-down"}}{{i18n
-                    "user.expand_profile"
-                  }}</a></li>
-            </ul>
-          </section>
-
-          <div class="primary-textual">
-            <h1 class="username">{{this.dummy.user.username}}
-              {{d-icon "shield-alt"}}</h1>
-            <h2 class="full-name">{{this.dummy.user.name}}</h2>
-            <h3>{{this.dummy.user.title}}</h3>
-          </div>
-        </div>
-        <div style="clear: both"></div>
-      </div>
-    </section>
-  </DSection>
-</StyleguideExample>
-
-<StyleguideExample @title=".user-main .about.no-background">
-  <DSection @class="user-main">
-    <section class="about no-background">
-
-      <div class="staff-counters">
-        <div><span
-            class="helpful-flags"
-          >{{this.dummy.user.number_of_flags_given}}</span>&nbsp;{{i18n
-            "user.staff_counters.flags_given"
-          }}</div>
-        <div>
-          <a href="#">
-            <span
-              class="flagged-posts"
-            >{{this.dummy.user.number_of_flagged_posts}}</span>&nbsp;{{i18n
-              "user.staff_counters.flagged_posts"
-            }}
-          </a>
-        </div>
-        <div>
-          <a href="#">
-            <span
-              class="deleted-posts"
-            >{{this.dummy.user.number_of_deleted_posts}}</span>&nbsp;{{i18n
-              "user.staff_counters.deleted_posts"
-            }}
-          </a>
-        </div>
-        <div><span
-            class="suspensions"
-          >{{this.dummy.user.number_of_suspensions}}</span>&nbsp;{{i18n
-            "user.staff_counters.suspensions"
-          }}</div>
-        <div><span
-            class="warnings-received"
-          >{{this.dummy.user.warnings_received_count}}</span>&nbsp;{{i18n
-            "user.staff_counters.warnings_received"
-          }}</div>
-      </div>
-
-      <div class="profile-image"></div>
-      <div class="details">
-        <div class="primary">
-          {{bound-avatar this.dummy.user "huge"}}
-          <section class="controls">
-            <ul>
-              <li>
-                <a class="btn btn-primary">
-                  {{d-icon "envelope"}}
-                  {{i18n "user.private_message"}}
-                </a>
-              </li>
-              <li><a href={{this.dummy.user.adminPath}} class="btn">{{d-icon
-                    "wrench"
-                  }}{{i18n "admin.user.show_admin_profile"}}</a></li>
-            </ul>
-          </section>
-
-          <div class="primary-textual">
-            <h1 class="username">{{this.dummy.user.username}}
-              {{d-icon "shield-alt"}}</h1>
-            <h2 class="full-name">{{this.dummy.user.name}}</h2>
-            <h3>{{this.dummy.user.title}}</h3>
-            <h3>
-              {{d-icon "map-marker-alt"}}
-              {{this.dummy.user.location}}
-              {{d-icon "globe"}}
-              <a
-                href={{this.dummy.user.website}}
-                rel="nofollow noopener noreferrer"
-                target="_blank"
-              >{{this.dummy.user.website_name}}</a>
-            </h3>
-
-            <div class="bio">
-              <div class="suspended">
-                {{d-icon "ban"}}
-                <b>{{i18n
-                    "user.suspended_notice"
-                    date=this.dummy.user.suspendedTillDate
-                  }}</b><br />
-                <b>{{i18n "user.suspended_reason"}}</b>
-                {{this.dummy.user.suspend_reason}}
-              </div>
-              {{html-safe this.dummy.user.bio_cooked}}
-            </div>
-
-            <div class="public-user-fields">
-              {{#each this.dummy.user.publicUserFields as |uf|}}
-                {{#if uf.value}}
-                  <div class="public-user-field {{uf.field.dasherized_name}}">
-                    <span class="user-field-name">{{uf.field.name}}</span>:
-                    <span class="user-field-value">{{uf.value}}</span>
-                  </div>
-                {{/if}}
-              {{/each}}
-            </div>
-          </div>
-        </div>
-        <div style="clear: both"></div>
-      </div>
-
-      <div class="secondary">
-        <dl>
-          <dt>{{i18n "user.created"}}</dt><dd>{{bound-date
-              this.dummy.user.created_at
-            }}</dd>
-          <dt>{{i18n "user.last_posted"}}</dt><dd>{{bound-date
-              this.dummy.user.last_posted_at
-            }}</dd>
-          <dt>{{i18n "user.last_seen"}}</dt><dd>{{bound-date
-              this.dummy.user.last_seen_at
-            }}</dd>
-          <dt>{{i18n "views"}}</dt><dd
-          >{{this.dummy.user.profile_view_count}}</dd>
-          <dt class="invited-by">{{i18n "user.invited_by"}}</dt><dd
-            class="invited-by"
-          ><a href="#">{{this.dummy.user.invited_by.username}}</a></dd>
-          <dt class="trust-level">{{i18n "user.trust_level"}}</dt><dd
-            class="trust-level"
-          >{{this.dummy.user.trustLevel.name}}</dd>
-          <dt>{{i18n "user.email.title"}}</dt>
-          <dd title={{this.dummy.user.email}}>
-            <DButton
-              @icon="envelope"
-              @label="admin.users.check_email.text"
-              @class="btn-primary"
-            />
-          </dd>
-          <dt class="groups">{{i18n
-              "groups.title"
-              count=this.dummy.user.displayGroups.length
-            }}</dt>
-          <dd class="groups">
-            {{#each this.dummy.user.displayGroups as |group|}}
-              <span><a href="#" class="group-link">{{group.name}}</a></span>
-            {{/each}}
-          </dd>
-          <DButton
-            @icon="exclamation-triangle"
-            @label="user.admin_delete"
-            @class="btn-danger"
-          />
-        </dl>
-      </div>
-    </section>
-  </DSection>
-</StyleguideExample>
-
-<StyleguideExample @title=".user-main .about.has-background">
-  <DSection @class="user-main">
-    <section
-      class="about has-background"
-      style={{this.dummy.user.profileBackground}}
-    >
-      <div class="staff-counters">
-        <div><span
-            class="helpful-flags"
-          >{{this.dummy.user.number_of_flags_given}}</span>&nbsp;{{i18n
-            "user.staff_counters.flags_given"
-          }}</div>
-        <div>
-          <a href="#">
-            <span
-              class="flagged-posts"
-            >{{this.dummy.user.number_of_flagged_posts}}</span>&nbsp;{{i18n
-              "user.staff_counters.flagged_posts"
-            }}
-          </a>
-        </div>
-        <div>
-          <a href="#">
-            <span
-              class="deleted-posts"
-            >{{this.dummy.user.number_of_deleted_posts}}</span>&nbsp;{{i18n
-              "user.staff_counters.deleted_posts"
-            }}
-          </a>
-        </div>
-        <div><span
-            class="suspensions"
-          >{{this.dummy.user.number_of_suspensions}}</span>&nbsp;{{i18n
-            "user.staff_counters.suspensions"
-          }}</div>
-        <div><span
-            class="warnings-received"
-          >{{this.dummy.user.warnings_received_count}}</span>&nbsp;{{i18n
-            "user.staff_counters.warnings_received"
-          }}</div>
-      </div>
-
-      <div class="profile-image"></div>
-      <div class="details">
-        <div class="primary">
-          {{bound-avatar this.dummy.user "huge"}}
-          <section class="controls">
-            <ul>
-              <li>
-                <a class="btn btn-primary">
-                  {{d-icon "envelope"}}
-                  {{i18n "user.private_message"}}
-                </a>
-              </li>
-              <li><a href={{this.dummy.user.adminPath}} class="btn">{{d-icon
-                    "wrench"
-                  }}{{i18n "admin.user.show_admin_profile"}}</a></li>
-            </ul>
-          </section>
-
-          <div class="primary-textual">
-            <h1 class="username">{{this.dummy.user.username}}
-              {{d-icon "shield-alt"}}</h1>
-            <h2 class="full-name">{{this.dummy.user.name}}</h2>
-            <h3>{{this.dummy.user.title}}</h3>
-            <h3>
-              {{d-icon "map-marker-alt"}}
-              {{this.dummy.user.location}}
-              {{d-icon "globe"}}
-              <a
-                href={{this.dummy.user.website}}
-                rel="nofollow noopener noreferrer"
-                target="_blank"
-              >{{this.dummy.user.website_name}}</a>
-            </h3>
-
-            <div class="bio">
-              <div class="suspended">
-                {{d-icon "ban"}}
-                <b>{{i18n
-                    "user.suspended_notice"
-                    date=this.dummy.user.suspendedTillDate
-                  }}</b><br />
-                <b>{{i18n "user.suspended_reason"}}</b>
-                {{this.dummy.user.suspend_reason}}
-              </div>
-              {{html-safe this.dummy.user.bio_cooked}}
-            </div>
-
-            <div class="public-user-fields">
-              {{#each this.dummy.user.publicUserFields as |uf|}}
-                {{#if uf.value}}
-                  <div class="public-user-field {{uf.field.dasherized_name}}">
-                    <span class="user-field-name">{{uf.field.name}}</span>:
-                    <span class="user-field-value">{{uf.value}}</span>
-                  </div>
-                {{/if}}
-              {{/each}}
-            </div>
-
-          </div>
-        </div>
-        <div style="clear: both"></div>
-      </div>
-
-      <div class="secondary">
-        <dl>
-          <dt>{{i18n "user.created"}}</dt><dd>{{bound-date
-              this.dummy.user.created_at
-            }}</dd>
-          <dt>{{i18n "user.last_posted"}}</dt><dd>{{bound-date
-              this.dummy.user.last_posted_at
-            }}</dd>
-          <dt>{{i18n "user.last_seen"}}</dt><dd>{{bound-date
-              this.dummy.user.last_seen_at
-            }}</dd>
-          <dt>{{i18n "views"}}</dt><dd
-          >{{this.dummy.user.profile_view_count}}</dd>
-          <dt class="invited-by">{{i18n "user.invited_by"}}</dt><dd
-            class="invited-by"
-          ><a href="#">{{this.dummy.user.invited_by.username}}</a></dd>
-          <dt class="trust-level">{{i18n "user.trust_level"}}</dt><dd
-            class="trust-level"
-          >{{this.dummy.user.trustLevel.name}}</dd>
-          <dt>{{i18n "user.email.title"}}</dt>
-          <dd title={{this.dummy.user.email}}>
-            <DButton
-              @icon="envelope"
-              @label="admin.users.check_email.text"
-              @class="btn-primary"
-            />
-          </dd>
-          <dt class="groups">{{i18n
-              "groups.title"
-              count=this.dummy.user.displayGroups.length
-            }}</dt>
-          <dd class="groups">
-            {{#each this.dummy.user.displayGroups as |group|}}
-              <span><a href="#" class="group-link">{{group.name}}</a></span>
-            {{/each}}
-          </dd>
-          <DButton
-            @icon="exclamation-triangle"
-            @label="user.admin_delete"
-            @class="btn-danger"
-          />
-        </dl>
-      </div>
-    </section>
-  </DSection>
-</StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/show.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/show.hbs
index 3fd5ab9bb74..00a3b9961d3 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/show.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/show.hbs
@@ -1,9 +1,9 @@
 <StyleguideSection @section={{this.section}}>
-  {{#if this.note}}
-    <div class="styleguide-note">
-      {{component (concat "notes/" this.note)}}
-    </div>
-  {{/if}}
-
-  {{outlet}}
+  {{#let this.section.component as |SectionComponent|}}
+    <SectionComponent
+      @dummy={{this.dummy}}
+      @dummyAction={{this.dummyAction}}
+      @siteSettings={{this.siteSettings}}
+    />
+  {{/let}}
 </StyleguideSection>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/stylesheets/colors.scss b/plugins/styleguide/assets/stylesheets/colors.scss
index 21cc28923ea..e9c59595754 100644
--- a/plugins/styleguide/assets/stylesheets/colors.scss
+++ b/plugins/styleguide/assets/stylesheets/colors.scss
@@ -107,14 +107,8 @@
   .quaternary {
     background-color: var(--quaternary);
   }
-  .highlight-low {
-    background-color: var(--highlight-low);
-  }
-  .highlight-medium {
-    background-color: var(--highlight-medium);
-  }
-  .highlight-high {
-    background-color: var(--highlight-high);
+  .highlight-bg {
+    background-color: var(--highlight-bg);
   }
   .highlight {
     background-color: var(--highlight);
diff --git a/plugins/styleguide/assets/stylesheets/styleguide.scss b/plugins/styleguide/assets/stylesheets/styleguide.scss
index c9aa99c6d02..1d57edd61d6 100644
--- a/plugins/styleguide/assets/stylesheets/styleguide.scss
+++ b/plugins/styleguide/assets/stylesheets/styleguide.scss
@@ -73,6 +73,44 @@
 
       .rendered {
         width: 100%;
+        position: relative;
+
+        .component {
+          padding: 2rem;
+          border: 2px dotted var(--primary-low);
+          margin-bottom: 2rem;
+        }
+
+        .component-properties {
+          width: 100%;
+
+          &__row {
+            align-items: center;
+            display: flex;
+          }
+
+          &__cell {
+            padding: 0.5rem 0;
+            width: 70%;
+            box-sizing: border-box;
+
+            &:first-child {
+              width: 30%;
+              box-sizing: border-box;
+            }
+
+            textarea,
+            input {
+              box-sizing: border-box;
+              margin: 0;
+              width: 100%;
+            }
+
+            textarea {
+              height: 100px;
+            }
+          }
+        }
       }
 
       margin-bottom: 2em;
@@ -144,6 +182,12 @@
     color: var(--primary-medium);
     margin: 0 0 0 10px;
   }
+
+  &--char-counter {
+    display: block;
+    width: 100%;
+    margin-bottom: 0;
+  }
 }
 
 .buttons-examples {
diff --git a/plugins/styleguide/config/locales/client.be.yml b/plugins/styleguide/config/locales/client.be.yml
index 9f437eada7c..0e2c8f4deb7 100644
--- a/plugins/styleguide/config/locales/client.be.yml
+++ b/plugins/styleguide/config/locales/client.be.yml
@@ -27,3 +27,5 @@ be:
         rich_tooltip:
           description: "апісанне"
           header: "Header"
+        char_counter:
+          placeholder: "Увядзіце свой тэкст тут..."
diff --git a/plugins/styleguide/config/locales/client.de.yml b/plugins/styleguide/config/locales/client.de.yml
index a1389bb4833..1cd46d7f464 100644
--- a/plugins/styleguide/config/locales/client.de.yml
+++ b/plugins/styleguide/config/locales/client.de.yml
@@ -92,3 +92,6 @@ de:
           description: "Beschreibung"
           header: "Kopfzeile"
           hover_to_see: "Bewege den Mauszeiger darüber, um einen Tooltipp zu sehen"
+        char_counter:
+          title: "Zeichenzähler"
+          placeholder: "Gib deinen Text hier ein …"
diff --git a/plugins/styleguide/config/locales/client.en.yml b/plugins/styleguide/config/locales/client.en.yml
index f6f3506b691..6a2780abb09 100644
--- a/plugins/styleguide/config/locales/client.en.yml
+++ b/plugins/styleguide/config/locales/client.en.yml
@@ -88,3 +88,7 @@ en:
           description: "Description"
           header: "Header"
           hover_to_see: "Hover to see a tooltip"
+        char_counter:
+          title: "Character Counter"
+          placeholder: "Enter your text here..."
+          
diff --git a/plugins/styleguide/config/locales/client.es.yml b/plugins/styleguide/config/locales/client.es.yml
index be7a0c6f7ab..bf1a8d42bd6 100644
--- a/plugins/styleguide/config/locales/client.es.yml
+++ b/plugins/styleguide/config/locales/client.es.yml
@@ -92,3 +92,6 @@ es:
           description: "Descripción"
           header: "Encabezado"
           hover_to_see: "Pase el cursor para ver una información sobre herramientas"
+        char_counter:
+          title: "Contador de caracteres"
+          placeholder: "Introduce aquí tu texto..."
diff --git a/plugins/styleguide/config/locales/client.fa_IR.yml b/plugins/styleguide/config/locales/client.fa_IR.yml
index bbdae2edacc..af7392bf660 100644
--- a/plugins/styleguide/config/locales/client.fa_IR.yml
+++ b/plugins/styleguide/config/locales/client.fa_IR.yml
@@ -90,3 +90,5 @@ fa_IR:
         rich_tooltip:
           description: "توضیحات"
           header: "سربرگ"
+        char_counter:
+          placeholder: "متن خود را اینجا وارد کنید..."
diff --git a/plugins/styleguide/config/locales/client.fi.yml b/plugins/styleguide/config/locales/client.fi.yml
index 67b1f8e6907..462d746acb2 100644
--- a/plugins/styleguide/config/locales/client.fi.yml
+++ b/plugins/styleguide/config/locales/client.fi.yml
@@ -92,3 +92,5 @@ fi:
           description: "Kuvaus"
           header: "Yläpalkki"
           hover_to_see: "Katso työkaluvihje osoittamalla"
+        char_counter:
+          placeholder: "Kirjoita tekstisi tähän..."
diff --git a/plugins/styleguide/config/locales/client.he.yml b/plugins/styleguide/config/locales/client.he.yml
index 4b852729ccd..abec61476e3 100644
--- a/plugins/styleguide/config/locales/client.he.yml
+++ b/plugins/styleguide/config/locales/client.he.yml
@@ -92,3 +92,6 @@ he:
           description: "תיאור"
           header: "כותרת"
           hover_to_see: "יש לעבור מעל כדי לראות חלונית תיאור"
+        char_counter:
+          title: "מונה תווים"
+          placeholder: "נא להקליד כאן טקסט…"
diff --git a/plugins/styleguide/config/locales/client.hu.yml b/plugins/styleguide/config/locales/client.hu.yml
index 428d0e5e3a7..59b6fb8e9d5 100644
--- a/plugins/styleguide/config/locales/client.hu.yml
+++ b/plugins/styleguide/config/locales/client.hu.yml
@@ -91,3 +91,6 @@ hu:
           description: "Leírás"
           header: "Fejléc"
           hover_to_see: "Vigye az egérmutatót az eszköztipp megtekintéséhez"
+        char_counter:
+          title: "Karakterszámláló"
+          placeholder: "Írja be a szöveget ide..."
diff --git a/plugins/styleguide/config/locales/client.id.yml b/plugins/styleguide/config/locales/client.id.yml
index 1a7560d61df..517f89c5c5a 100644
--- a/plugins/styleguide/config/locales/client.id.yml
+++ b/plugins/styleguide/config/locales/client.id.yml
@@ -92,3 +92,6 @@ id:
           description: "Deskripsi"
           header: "Header"
           hover_to_see: "Arahkan kursor untuk melihat tooltip"
+        char_counter:
+          title: "Penghitung Karakter"
+          placeholder: "Masukkan teks Anda di sini..."
diff --git a/plugins/styleguide/config/locales/client.it.yml b/plugins/styleguide/config/locales/client.it.yml
index d52fab671f4..1d2b163ef01 100644
--- a/plugins/styleguide/config/locales/client.it.yml
+++ b/plugins/styleguide/config/locales/client.it.yml
@@ -92,3 +92,6 @@ it:
           description: "Descrizione"
           header: "Intestazione"
           hover_to_see: "Passa il mouse per vedere una descrizione"
+        char_counter:
+          title: "Contatore di caratteri"
+          placeholder: "Inserisci qui il tuo testo..."
diff --git a/plugins/styleguide/config/locales/client.pl_PL.yml b/plugins/styleguide/config/locales/client.pl_PL.yml
index 81cdfeee5d0..00fa5b94c3b 100644
--- a/plugins/styleguide/config/locales/client.pl_PL.yml
+++ b/plugins/styleguide/config/locales/client.pl_PL.yml
@@ -92,3 +92,6 @@ pl_PL:
           description: "Opis"
           header: "Nagłówek"
           hover_to_see: "Najedź kursorem, aby zobaczyć podpowiedź"
+        char_counter:
+          title: "Licznik znaków"
+          placeholder: "Tutaj wpisz swój tekst..."
diff --git a/plugins/styleguide/config/locales/client.pt_BR.yml b/plugins/styleguide/config/locales/client.pt_BR.yml
index a9ced1b5081..9421f6d6647 100644
--- a/plugins/styleguide/config/locales/client.pt_BR.yml
+++ b/plugins/styleguide/config/locales/client.pt_BR.yml
@@ -92,3 +92,6 @@ pt_BR:
           description: "Descrição"
           header: "Cabeçalho"
           hover_to_see: "Passe o mouse para ver uma dica"
+        char_counter:
+          title: "Contador de Caracteres"
+          placeholder: "Insira seu texto aqui..."
diff --git a/plugins/styleguide/config/locales/client.ro.yml b/plugins/styleguide/config/locales/client.ro.yml
index 4181e18deb6..a2808c7196e 100644
--- a/plugins/styleguide/config/locales/client.ro.yml
+++ b/plugins/styleguide/config/locales/client.ro.yml
@@ -84,3 +84,6 @@ ro:
         rich_tooltip:
           description: "Descriere"
           header: "Antet"
+        char_counter:
+          title: "Contor de caractere"
+          placeholder: "Introdu textul tău aici..."
diff --git a/plugins/styleguide/config/locales/client.sk.yml b/plugins/styleguide/config/locales/client.sk.yml
index 0a010ed9a1b..1dcd2dd0e46 100644
--- a/plugins/styleguide/config/locales/client.sk.yml
+++ b/plugins/styleguide/config/locales/client.sk.yml
@@ -92,3 +92,6 @@ sk:
           description: "Popis"
           header: "Hlavička"
           hover_to_see: "Ak chcete zobraziť nápovedu, prejdite myšou"
+        char_counter:
+          title: "Počítadlo znakov"
+          placeholder: "Tu zadajte svoj text..."
diff --git a/plugins/styleguide/config/locales/client.sv.yml b/plugins/styleguide/config/locales/client.sv.yml
index 9a02837e6b0..e3998624a76 100644
--- a/plugins/styleguide/config/locales/client.sv.yml
+++ b/plugins/styleguide/config/locales/client.sv.yml
@@ -92,3 +92,6 @@ sv:
           description: "Beskrivning"
           header: "Sidhuvud"
           hover_to_see: "Håll muspekaren kvar för att se en knappbeskrivning"
+        char_counter:
+          title: "Teckenräknare"
+          placeholder: "Skriv din text här..."
diff --git a/plugins/styleguide/config/locales/client.tr_TR.yml b/plugins/styleguide/config/locales/client.tr_TR.yml
index e7376ce4411..011c817024a 100644
--- a/plugins/styleguide/config/locales/client.tr_TR.yml
+++ b/plugins/styleguide/config/locales/client.tr_TR.yml
@@ -92,3 +92,6 @@ tr_TR:
           description: "Açıklama"
           header: "Başlık"
           hover_to_see: "Araç ipucunu görmek için üzerine gidin"
+        char_counter:
+          title: "Karakter Sayacı"
+          placeholder: "Metninizi buraya girin..."
diff --git a/plugins/styleguide/config/locales/client.uk.yml b/plugins/styleguide/config/locales/client.uk.yml
index 8d2b320caa9..28bee2497b8 100644
--- a/plugins/styleguide/config/locales/client.uk.yml
+++ b/plugins/styleguide/config/locales/client.uk.yml
@@ -92,3 +92,6 @@ uk:
           description: "Опис"
           header: "Header"
           hover_to_see: "Наведіть курсор, щоб побачити підказку"
+        char_counter:
+          title: "Лічильник символів"
+          placeholder: "Введіть свій текст тут..."
diff --git a/plugins/styleguide/config/locales/client.zh_CN.yml b/plugins/styleguide/config/locales/client.zh_CN.yml
index 0d25352e632..80c39354f8b 100644
--- a/plugins/styleguide/config/locales/client.zh_CN.yml
+++ b/plugins/styleguide/config/locales/client.zh_CN.yml
@@ -92,3 +92,6 @@ zh_CN:
           description: "描述"
           header: "标头"
           hover_to_see: "悬停以查看工具提示"
+        char_counter:
+          title: "字符计数器"
+          placeholder: "在这里输入你的文字..."
diff --git a/public/javascripts/@json-editor/json-editor/2.10.0/jsoneditor.js b/public/javascripts/@json-editor/json-editor/2.10.0/jsoneditor.js
new file mode 100644
index 00000000000..11b062bce3c
--- /dev/null
+++ b/public/javascripts/@json-editor/json-editor/2.10.0/jsoneditor.js
@@ -0,0 +1,2 @@
+/*! For license information please see jsoneditor.js.LICENSE.txt */
+!function(t,e){if("object"==typeof exports&&"object"==typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var r=e();for(var n in r)("object"==typeof exports?exports:t)[n]=r[n]}}(self,(()=>(()=>{var t={9662:(t,e,r)=>{var n=r(614),i=r(6330),o=TypeError;t.exports=function(t){if(n(t))return t;throw o(i(t)+" is not a function")}},9483:(t,e,r)=>{var n=r(4411),i=r(6330),o=TypeError;t.exports=function(t){if(n(t))return t;throw o(i(t)+" is not a constructor")}},6077:(t,e,r)=>{var n=r(614),i=String,o=TypeError;t.exports=function(t){if("object"==typeof t||n(t))return t;throw o("Can't set "+i(t)+" as a prototype")}},1223:(t,e,r)=>{var n=r(5112),i=r(30),o=r(3070).f,a=n("unscopables"),s=Array.prototype;null==s[a]&&o(s,a,{configurable:!0,value:i(null)}),t.exports=function(t){s[a][t]=!0}},1530:(t,e,r)=>{"use strict";var n=r(8710).charAt;t.exports=function(t,e,r){return e+(r?n(t,e).length:1)}},5787:(t,e,r)=>{var n=r(7976),i=TypeError;t.exports=function(t,e){if(n(e,t))return t;throw i("Incorrect invocation")}},9670:(t,e,r)=>{var n=r(111),i=String,o=TypeError;t.exports=function(t){if(n(t))return t;throw o(i(t)+" is not an object")}},8533:(t,e,r)=>{"use strict";var n=r(2092).forEach,i=r(9341)("forEach");t.exports=i?[].forEach:function(t){return n(this,t,arguments.length>1?arguments[1]:void 0)}},8457:(t,e,r)=>{"use strict";var n=r(9974),i=r(6916),o=r(7908),a=r(3411),s=r(7659),l=r(4411),c=r(6244),u=r(6135),h=r(4121),p=r(1246),d=Array;t.exports=function(t){var e=o(t),r=l(this),f=arguments.length,y=f>1?arguments[1]:void 0,m=void 0!==y;m&&(y=n(y,f>2?arguments[2]:void 0));var v,b,g,w,_,k,j=p(e),O=0;if(!j||this===d&&s(j))for(v=c(e),b=r?new this(v):d(v);v>O;O++)k=m?y(e[O],O):e[O],u(b,O,k);else for(_=(w=h(e,j)).next,b=r?new this:[];!(g=i(_,w)).done;O++)k=m?a(w,y,[g.value,O],!0):g.value,u(b,O,k);return b.length=O,b}},1318:(t,e,r)=>{var n=r(5656),i=r(1400),o=r(6244),a=function(t){return function(e,r,a){var s,l=n(e),c=o(l),u=i(a,c);if(t&&r!=r){for(;c>u;)if((s=l[u++])!=s)return!0}else for(;c>u;u++)if((t||u in l)&&l[u]===r)return t||u||0;return!t&&-1}};t.exports={includes:a(!0),indexOf:a(!1)}},2092:(t,e,r)=>{var n=r(9974),i=r(1702),o=r(8361),a=r(7908),s=r(6244),l=r(5417),c=i([].push),u=function(t){var e=1==t,r=2==t,i=3==t,u=4==t,h=6==t,p=7==t,d=5==t||h;return function(f,y,m,v){for(var b,g,w=a(f),_=o(w),k=n(y,m),j=s(_),O=0,x=v||l,C=e?x(f,j):r||p?x(f,0):void 0;j>O;O++)if((d||O in _)&&(g=k(b=_[O],O,w),t))if(e)C[O]=g;else if(g)switch(t){case 3:return!0;case 5:return b;case 6:return O;case 2:c(C,b)}else switch(t){case 4:return!1;case 7:c(C,b)}return h?-1:i||u?u:C}};t.exports={forEach:u(0),map:u(1),filter:u(2),some:u(3),every:u(4),find:u(5),findIndex:u(6),filterReject:u(7)}},1194:(t,e,r)=>{var n=r(7293),i=r(5112),o=r(7392),a=i("species");t.exports=function(t){return o>=51||!n((function(){var e=[];return(e.constructor={})[a]=function(){return{foo:1}},1!==e[t](Boolean).foo}))}},9341:(t,e,r)=>{"use strict";var n=r(7293);t.exports=function(t,e){var r=[][t];return!!r&&n((function(){r.call(null,e||function(){return 1},1)}))}},3671:(t,e,r)=>{var n=r(9662),i=r(7908),o=r(8361),a=r(6244),s=TypeError,l=function(t){return function(e,r,l,c){n(r);var u=i(e),h=o(u),p=a(u),d=t?p-1:0,f=t?-1:1;if(l<2)for(;;){if(d in h){c=h[d],d+=f;break}if(d+=f,t?d<0:p<=d)throw s("Reduce of empty array with no initial value")}for(;t?d>=0:p>d;d+=f)d in h&&(c=r(c,h[d],d,u));return c}};t.exports={left:l(!1),right:l(!0)}},3658:(t,e,r)=>{"use strict";var n=r(9781),i=r(3157),o=TypeError,a=Object.getOwnPropertyDescriptor,s=n&&!function(){if(void 0!==this)return!0;try{Object.defineProperty([],"length",{writable:!1}).length=1}catch(t){return t instanceof TypeError}}();t.exports=s?function(t,e){if(i(t)&&!a(t,"length").writable)throw o("Cannot set read only .length");return t.length=e}:function(t,e){return t.length=e}},1589:(t,e,r)=>{var n=r(1400),i=r(6244),o=r(6135),a=Array,s=Math.max;t.exports=function(t,e,r){for(var l=i(t),c=n(e,l),u=n(void 0===r?l:r,l),h=a(s(u-c,0)),p=0;c<u;c++,p++)o(h,p,t[c]);return h.length=p,h}},206:(t,e,r)=>{var n=r(1702);t.exports=n([].slice)},4362:(t,e,r)=>{var n=r(1589),i=Math.floor,o=function(t,e){var r=t.length,l=i(r/2);return r<8?a(t,e):s(t,o(n(t,0,l),e),o(n(t,l),e),e)},a=function(t,e){for(var r,n,i=t.length,o=1;o<i;){for(n=o,r=t[o];n&&e(t[n-1],r)>0;)t[n]=t[--n];n!==o++&&(t[n]=r)}return t},s=function(t,e,r,n){for(var i=e.length,o=r.length,a=0,s=0;a<i||s<o;)t[a+s]=a<i&&s<o?n(e[a],r[s])<=0?e[a++]:r[s++]:a<i?e[a++]:r[s++];return t};t.exports=o},7475:(t,e,r)=>{var n=r(3157),i=r(4411),o=r(111),a=r(5112)("species"),s=Array;t.exports=function(t){var e;return n(t)&&(e=t.constructor,(i(e)&&(e===s||n(e.prototype))||o(e)&&null===(e=e[a]))&&(e=void 0)),void 0===e?s:e}},5417:(t,e,r)=>{var n=r(7475);t.exports=function(t,e){return new(n(t))(0===e?0:e)}},3411:(t,e,r)=>{var n=r(9670),i=r(9212);t.exports=function(t,e,r,o){try{return o?e(n(r)[0],r[1]):e(r)}catch(e){i(t,"throw",e)}}},7072:(t,e,r)=>{var n=r(5112)("iterator"),i=!1;try{var o=0,a={next:function(){return{done:!!o++}},return:function(){i=!0}};a[n]=function(){return this},Array.from(a,(function(){throw 2}))}catch(t){}t.exports=function(t,e){if(!e&&!i)return!1;var r=!1;try{var o={};o[n]=function(){return{next:function(){return{done:r=!0}}}},t(o)}catch(t){}return r}},4326:(t,e,r)=>{var n=r(1702),i=n({}.toString),o=n("".slice);t.exports=function(t){return o(i(t),8,-1)}},648:(t,e,r)=>{var n=r(1694),i=r(614),o=r(4326),a=r(5112)("toStringTag"),s=Object,l="Arguments"==o(function(){return arguments}());t.exports=n?o:function(t){var e,r,n;return void 0===t?"Undefined":null===t?"Null":"string"==typeof(r=function(t,e){try{return t[e]}catch(t){}}(e=s(t),a))?r:l?o(e):"Object"==(n=o(e))&&i(e.callee)?"Arguments":n}},9920:(t,e,r)=>{var n=r(2597),i=r(3887),o=r(1236),a=r(3070);t.exports=function(t,e,r){for(var s=i(e),l=a.f,c=o.f,u=0;u<s.length;u++){var h=s[u];n(t,h)||r&&n(r,h)||l(t,h,c(e,h))}}},4964:(t,e,r)=>{var n=r(5112)("match");t.exports=function(t){var e=/./;try{"/./"[t](e)}catch(r){try{return e[n]=!1,"/./"[t](e)}catch(t){}}return!1}},8544:(t,e,r)=>{var n=r(7293);t.exports=!n((function(){function t(){}return t.prototype.constructor=null,Object.getPrototypeOf(new t)!==t.prototype}))},6178:t=>{t.exports=function(t,e){return{value:t,done:e}}},8880:(t,e,r)=>{var n=r(9781),i=r(3070),o=r(9114);t.exports=n?function(t,e,r){return i.f(t,e,o(1,r))}:function(t,e,r){return t[e]=r,t}},9114:t=>{t.exports=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}}},6135:(t,e,r)=>{"use strict";var n=r(4948),i=r(3070),o=r(9114);t.exports=function(t,e,r){var a=n(e);a in t?i.f(t,a,o(0,r)):t[a]=r}},5573:(t,e,r)=>{"use strict";var n=r(1702),i=r(7293),o=r(6650).start,a=RangeError,s=isFinite,l=Math.abs,c=Date.prototype,u=c.toISOString,h=n(c.getTime),p=n(c.getUTCDate),d=n(c.getUTCFullYear),f=n(c.getUTCHours),y=n(c.getUTCMilliseconds),m=n(c.getUTCMinutes),v=n(c.getUTCMonth),b=n(c.getUTCSeconds);t.exports=i((function(){return"0385-07-25T07:06:39.999Z"!=u.call(new Date(-50000000000001))}))||!i((function(){u.call(new Date(NaN))}))?function(){if(!s(h(this)))throw a("Invalid time value");var t=this,e=d(t),r=y(t),n=e<0?"-":e>9999?"+":"";return n+o(l(e),n?6:4,0)+"-"+o(v(t)+1,2,0)+"-"+o(p(t),2,0)+"T"+o(f(t),2,0)+":"+o(m(t),2,0)+":"+o(b(t),2,0)+"."+o(r,3,0)+"Z"}:u},8709:(t,e,r)=>{"use strict";var n=r(9670),i=r(2140),o=TypeError;t.exports=function(t){if(n(this),"string"===t||"default"===t)t="string";else if("number"!==t)throw o("Incorrect hint");return i(this,t)}},7045:(t,e,r)=>{var n=r(6339),i=r(3070);t.exports=function(t,e,r){return r.get&&n(r.get,e,{getter:!0}),r.set&&n(r.set,e,{setter:!0}),i.f(t,e,r)}},8052:(t,e,r)=>{var n=r(614),i=r(3070),o=r(6339),a=r(3072);t.exports=function(t,e,r,s){s||(s={});var l=s.enumerable,c=void 0!==s.name?s.name:e;if(n(r)&&o(r,c,s),s.global)l?t[e]=r:a(e,r);else{try{s.unsafe?t[e]&&(l=!0):delete t[e]}catch(t){}l?t[e]=r:i.f(t,e,{value:r,enumerable:!1,configurable:!s.nonConfigurable,writable:!s.nonWritable})}return t}},3072:(t,e,r)=>{var n=r(7854),i=Object.defineProperty;t.exports=function(t,e){try{i(n,t,{value:e,configurable:!0,writable:!0})}catch(r){n[t]=e}return e}},5117:(t,e,r)=>{"use strict";var n=r(6330),i=TypeError;t.exports=function(t,e){if(!delete t[e])throw i("Cannot delete property "+n(e)+" of "+n(t))}},9781:(t,e,r)=>{var n=r(7293);t.exports=!n((function(){return 7!=Object.defineProperty({},1,{get:function(){return 7}})[1]}))},4154:t=>{var e="object"==typeof document&&document.all,r=void 0===e&&void 0!==e;t.exports={all:e,IS_HTMLDDA:r}},317:(t,e,r)=>{var n=r(7854),i=r(111),o=n.document,a=i(o)&&i(o.createElement);t.exports=function(t){return a?o.createElement(t):{}}},7207:t=>{var e=TypeError;t.exports=function(t){if(t>9007199254740991)throw e("Maximum allowed index exceeded");return t}},8324:t=>{t.exports={CSSRuleList:0,CSSStyleDeclaration:0,CSSValueList:0,ClientRectList:0,DOMRectList:0,DOMStringList:0,DOMTokenList:1,DataTransferItemList:0,FileList:0,HTMLAllCollection:0,HTMLCollection:0,HTMLFormElement:0,HTMLSelectElement:0,MediaList:0,MimeTypeArray:0,NamedNodeMap:0,NodeList:1,PaintRequestList:0,Plugin:0,PluginArray:0,SVGLengthList:0,SVGNumberList:0,SVGPathSegList:0,SVGPointList:0,SVGStringList:0,SVGTransformList:0,SourceBufferList:0,StyleSheetList:0,TextTrackCueList:0,TextTrackList:0,TouchList:0}},8509:(t,e,r)=>{var n=r(317)("span").classList,i=n&&n.constructor&&n.constructor.prototype;t.exports=i===Object.prototype?void 0:i},8886:(t,e,r)=>{var n=r(8113).match(/firefox\/(\d+)/i);t.exports=!!n&&+n[1]},7871:(t,e,r)=>{var n=r(3823),i=r(5268);t.exports=!n&&!i&&"object"==typeof window&&"object"==typeof document},9363:t=>{t.exports="function"==typeof Bun&&Bun&&"string"==typeof Bun.version},3823:t=>{t.exports="object"==typeof Deno&&Deno&&"object"==typeof Deno.version},256:(t,e,r)=>{var n=r(8113);t.exports=/MSIE|Trident/.test(n)},1528:(t,e,r)=>{var n=r(8113);t.exports=/ipad|iphone|ipod/i.test(n)&&"undefined"!=typeof Pebble},8334:(t,e,r)=>{var n=r(8113);t.exports=/(?:ipad|iphone|ipod).*applewebkit/i.test(n)},5268:(t,e,r)=>{var n=r(4326);t.exports="undefined"!=typeof process&&"process"==n(process)},1036:(t,e,r)=>{var n=r(8113);t.exports=/web0s(?!.*chrome)/i.test(n)},8113:t=>{t.exports="undefined"!=typeof navigator&&String(navigator.userAgent)||""},7392:(t,e,r)=>{var n,i,o=r(7854),a=r(8113),s=o.process,l=o.Deno,c=s&&s.versions||l&&l.version,u=c&&c.v8;u&&(i=(n=u.split("."))[0]>0&&n[0]<4?1:+(n[0]+n[1])),!i&&a&&(!(n=a.match(/Edge\/(\d+)/))||n[1]>=74)&&(n=a.match(/Chrome\/(\d+)/))&&(i=+n[1]),t.exports=i},8008:(t,e,r)=>{var n=r(8113).match(/AppleWebKit\/(\d+)\./);t.exports=!!n&&+n[1]},748:t=>{t.exports=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"]},2109:(t,e,r)=>{var n=r(7854),i=r(1236).f,o=r(8880),a=r(8052),s=r(3072),l=r(9920),c=r(4705);t.exports=function(t,e){var r,u,h,p,d,f=t.target,y=t.global,m=t.stat;if(r=y?n:m?n[f]||s(f,{}):(n[f]||{}).prototype)for(u in e){if(p=e[u],h=t.dontCallGetSet?(d=i(r,u))&&d.value:r[u],!c(y?u:f+(m?".":"#")+u,t.forced)&&void 0!==h){if(typeof p==typeof h)continue;l(p,h)}(t.sham||h&&h.sham)&&o(p,"sham",!0),a(r,u,p,t)}}},7293:t=>{t.exports=function(t){try{return!!t()}catch(t){return!0}}},7007:(t,e,r)=>{"use strict";r(4916);var n=r(1470),i=r(8052),o=r(2261),a=r(7293),s=r(5112),l=r(8880),c=s("species"),u=RegExp.prototype;t.exports=function(t,e,r,h){var p=s(t),d=!a((function(){var e={};return e[p]=function(){return 7},7!=""[t](e)})),f=d&&!a((function(){var e=!1,r=/a/;return"split"===t&&((r={}).constructor={},r.constructor[c]=function(){return r},r.flags="",r[p]=/./[p]),r.exec=function(){return e=!0,null},r[p](""),!e}));if(!d||!f||r){var y=n(/./[p]),m=e(p,""[t],(function(t,e,r,i,a){var s=n(t),l=e.exec;return l===o||l===u.exec?d&&!a?{done:!0,value:y(e,r,i)}:{done:!0,value:s(r,e,i)}:{done:!1}}));i(String.prototype,t,m[0]),i(u,p,m[1])}h&&l(u[p],"sham",!0)}},2104:(t,e,r)=>{var n=r(4374),i=Function.prototype,o=i.apply,a=i.call;t.exports="object"==typeof Reflect&&Reflect.apply||(n?a.bind(o):function(){return a.apply(o,arguments)})},9974:(t,e,r)=>{var n=r(1470),i=r(9662),o=r(4374),a=n(n.bind);t.exports=function(t,e){return i(t),void 0===e?t:o?a(t,e):function(){return t.apply(e,arguments)}}},4374:(t,e,r)=>{var n=r(7293);t.exports=!n((function(){var t=function(){}.bind();return"function"!=typeof t||t.hasOwnProperty("prototype")}))},7065:(t,e,r)=>{"use strict";var n=r(1702),i=r(9662),o=r(111),a=r(2597),s=r(206),l=r(4374),c=Function,u=n([].concat),h=n([].join),p={},d=function(t,e,r){if(!a(p,e)){for(var n=[],i=0;i<e;i++)n[i]="a["+i+"]";p[e]=c("C,a","return new C("+h(n,",")+")")}return p[e](t,r)};t.exports=l?c.bind:function(t){var e=i(this),r=e.prototype,n=s(arguments,1),a=function(){var r=u(n,s(arguments));return this instanceof a?d(e,r.length,r):e.apply(t,r)};return o(r)&&(a.prototype=r),a}},6916:(t,e,r)=>{var n=r(4374),i=Function.prototype.call;t.exports=n?i.bind(i):function(){return i.apply(i,arguments)}},6530:(t,e,r)=>{var n=r(9781),i=r(2597),o=Function.prototype,a=n&&Object.getOwnPropertyDescriptor,s=i(o,"name"),l=s&&"something"===function(){}.name,c=s&&(!n||n&&a(o,"name").configurable);t.exports={EXISTS:s,PROPER:l,CONFIGURABLE:c}},5668:(t,e,r)=>{var n=r(1702),i=r(9662);t.exports=function(t,e,r){try{return n(i(Object.getOwnPropertyDescriptor(t,e)[r]))}catch(t){}}},1470:(t,e,r)=>{var n=r(4326),i=r(1702);t.exports=function(t){if("Function"===n(t))return i(t)}},1702:(t,e,r)=>{var n=r(4374),i=Function.prototype,o=i.call,a=n&&i.bind.bind(o,o);t.exports=n?a:function(t){return function(){return o.apply(t,arguments)}}},5005:(t,e,r)=>{var n=r(7854),i=r(614),o=function(t){return i(t)?t:void 0};t.exports=function(t,e){return arguments.length<2?o(n[t]):n[t]&&n[t][e]}},1246:(t,e,r)=>{var n=r(648),i=r(8173),o=r(8554),a=r(7497),s=r(5112)("iterator");t.exports=function(t){if(!o(t))return i(t,s)||i(t,"@@iterator")||a[n(t)]}},4121:(t,e,r)=>{var n=r(6916),i=r(9662),o=r(9670),a=r(6330),s=r(1246),l=TypeError;t.exports=function(t,e){var r=arguments.length<2?s(t):e;if(i(r))return o(n(r,t));throw l(a(t)+" is not iterable")}},8044:(t,e,r)=>{var n=r(1702),i=r(3157),o=r(614),a=r(4326),s=r(1340),l=n([].push);t.exports=function(t){if(o(t))return t;if(i(t)){for(var e=t.length,r=[],n=0;n<e;n++){var c=t[n];"string"==typeof c?l(r,c):"number"!=typeof c&&"Number"!=a(c)&&"String"!=a(c)||l(r,s(c))}var u=r.length,h=!0;return function(t,e){if(h)return h=!1,e;if(i(this))return e;for(var n=0;n<u;n++)if(r[n]===t)return e}}}},8173:(t,e,r)=>{var n=r(9662),i=r(8554);t.exports=function(t,e){var r=t[e];return i(r)?void 0:n(r)}},647:(t,e,r)=>{var n=r(1702),i=r(7908),o=Math.floor,a=n("".charAt),s=n("".replace),l=n("".slice),c=/\$([$&'`]|\d{1,2}|<[^>]*>)/g,u=/\$([$&'`]|\d{1,2})/g;t.exports=function(t,e,r,n,h,p){var d=r+t.length,f=n.length,y=u;return void 0!==h&&(h=i(h),y=c),s(p,y,(function(i,s){var c;switch(a(s,0)){case"$":return"$";case"&":return t;case"`":return l(e,0,r);case"'":return l(e,d);case"<":c=h[l(s,1,-1)];break;default:var u=+s;if(0===u)return i;if(u>f){var p=o(u/10);return 0===p?i:p<=f?void 0===n[p-1]?a(s,1):n[p-1]+a(s,1):i}c=n[u-1]}return void 0===c?"":c}))}},7854:(t,e,r)=>{var n=function(t){return t&&t.Math==Math&&t};t.exports=n("object"==typeof globalThis&&globalThis)||n("object"==typeof window&&window)||n("object"==typeof self&&self)||n("object"==typeof r.g&&r.g)||function(){return this}()||Function("return this")()},2597:(t,e,r)=>{var n=r(1702),i=r(7908),o=n({}.hasOwnProperty);t.exports=Object.hasOwn||function(t,e){return o(i(t),e)}},3501:t=>{t.exports={}},842:t=>{t.exports=function(t,e){try{1==arguments.length?console.error(t):console.error(t,e)}catch(t){}}},490:(t,e,r)=>{var n=r(5005);t.exports=n("document","documentElement")},4664:(t,e,r)=>{var n=r(9781),i=r(7293),o=r(317);t.exports=!n&&!i((function(){return 7!=Object.defineProperty(o("div"),"a",{get:function(){return 7}}).a}))},8361:(t,e,r)=>{var n=r(1702),i=r(7293),o=r(4326),a=Object,s=n("".split);t.exports=i((function(){return!a("z").propertyIsEnumerable(0)}))?function(t){return"String"==o(t)?s(t,""):a(t)}:a},9587:(t,e,r)=>{var n=r(614),i=r(111),o=r(7674);t.exports=function(t,e,r){var a,s;return o&&n(a=e.constructor)&&a!==r&&i(s=a.prototype)&&s!==r.prototype&&o(t,s),t}},2788:(t,e,r)=>{var n=r(1702),i=r(614),o=r(5465),a=n(Function.toString);i(o.inspectSource)||(o.inspectSource=function(t){return a(t)}),t.exports=o.inspectSource},9909:(t,e,r)=>{var n,i,o,a=r(4811),s=r(7854),l=r(111),c=r(8880),u=r(2597),h=r(5465),p=r(6200),d=r(3501),f="Object already initialized",y=s.TypeError,m=s.WeakMap;if(a||h.state){var v=h.state||(h.state=new m);v.get=v.get,v.has=v.has,v.set=v.set,n=function(t,e){if(v.has(t))throw y(f);return e.facade=t,v.set(t,e),e},i=function(t){return v.get(t)||{}},o=function(t){return v.has(t)}}else{var b=p("state");d[b]=!0,n=function(t,e){if(u(t,b))throw y(f);return e.facade=t,c(t,b,e),e},i=function(t){return u(t,b)?t[b]:{}},o=function(t){return u(t,b)}}t.exports={set:n,get:i,has:o,enforce:function(t){return o(t)?i(t):n(t,{})},getterFor:function(t){return function(e){var r;if(!l(e)||(r=i(e)).type!==t)throw y("Incompatible receiver, "+t+" required");return r}}}},7659:(t,e,r)=>{var n=r(5112),i=r(7497),o=n("iterator"),a=Array.prototype;t.exports=function(t){return void 0!==t&&(i.Array===t||a[o]===t)}},3157:(t,e,r)=>{var n=r(4326);t.exports=Array.isArray||function(t){return"Array"==n(t)}},614:(t,e,r)=>{var n=r(4154),i=n.all;t.exports=n.IS_HTMLDDA?function(t){return"function"==typeof t||t===i}:function(t){return"function"==typeof t}},4411:(t,e,r)=>{var n=r(1702),i=r(7293),o=r(614),a=r(648),s=r(5005),l=r(2788),c=function(){},u=[],h=s("Reflect","construct"),p=/^\s*(?:class|function)\b/,d=n(p.exec),f=!p.exec(c),y=function(t){if(!o(t))return!1;try{return h(c,u,t),!0}catch(t){return!1}},m=function(t){if(!o(t))return!1;switch(a(t)){case"AsyncFunction":case"GeneratorFunction":case"AsyncGeneratorFunction":return!1}try{return f||!!d(p,l(t))}catch(t){return!0}};m.sham=!0,t.exports=!h||i((function(){var t;return y(y.call)||!y(Object)||!y((function(){t=!0}))||t}))?m:y},5032:(t,e,r)=>{var n=r(2597);t.exports=function(t){return void 0!==t&&(n(t,"value")||n(t,"writable"))}},4705:(t,e,r)=>{var n=r(7293),i=r(614),o=/#|\.prototype\./,a=function(t,e){var r=l[s(t)];return r==u||r!=c&&(i(e)?n(e):!!e)},s=a.normalize=function(t){return String(t).replace(o,".").toLowerCase()},l=a.data={},c=a.NATIVE="N",u=a.POLYFILL="P";t.exports=a},8554:t=>{t.exports=function(t){return null==t}},111:(t,e,r)=>{var n=r(614),i=r(4154),o=i.all;t.exports=i.IS_HTMLDDA?function(t){return"object"==typeof t?null!==t:n(t)||t===o}:function(t){return"object"==typeof t?null!==t:n(t)}},1913:t=>{t.exports=!1},7850:(t,e,r)=>{var n=r(111),i=r(4326),o=r(5112)("match");t.exports=function(t){var e;return n(t)&&(void 0!==(e=t[o])?!!e:"RegExp"==i(t))}},2190:(t,e,r)=>{var n=r(5005),i=r(614),o=r(7976),a=r(3307),s=Object;t.exports=a?function(t){return"symbol"==typeof t}:function(t){var e=n("Symbol");return i(e)&&o(e.prototype,s(t))}},408:(t,e,r)=>{var n=r(9974),i=r(6916),o=r(9670),a=r(6330),s=r(7659),l=r(6244),c=r(7976),u=r(4121),h=r(1246),p=r(9212),d=TypeError,f=function(t,e){this.stopped=t,this.result=e},y=f.prototype;t.exports=function(t,e,r){var m,v,b,g,w,_,k,j=r&&r.that,O=!(!r||!r.AS_ENTRIES),x=!(!r||!r.IS_RECORD),C=!(!r||!r.IS_ITERATOR),E=!(!r||!r.INTERRUPTED),S=n(e,j),P=function(t){return m&&p(m,"normal",t),new f(!0,t)},T=function(t){return O?(o(t),E?S(t[0],t[1],P):S(t[0],t[1])):E?S(t,P):S(t)};if(x)m=t.iterator;else if(C)m=t;else{if(!(v=h(t)))throw d(a(t)+" is not iterable");if(s(v)){for(b=0,g=l(t);g>b;b++)if((w=T(t[b]))&&c(y,w))return w;return new f(!1)}m=u(t,v)}for(_=x?t.next:m.next;!(k=i(_,m)).done;){try{w=T(k.value)}catch(t){p(m,"throw",t)}if("object"==typeof w&&w&&c(y,w))return w}return new f(!1)}},9212:(t,e,r)=>{var n=r(6916),i=r(9670),o=r(8173);t.exports=function(t,e,r){var a,s;i(t);try{if(!(a=o(t,"return"))){if("throw"===e)throw r;return r}a=n(a,t)}catch(t){s=!0,a=t}if("throw"===e)throw r;if(s)throw a;return i(a),r}},3061:(t,e,r)=>{"use strict";var n=r(3383).IteratorPrototype,i=r(30),o=r(9114),a=r(8003),s=r(7497),l=function(){return this};t.exports=function(t,e,r,c){var u=e+" Iterator";return t.prototype=i(n,{next:o(+!c,r)}),a(t,u,!1,!0),s[u]=l,t}},1656:(t,e,r)=>{"use strict";var n=r(2109),i=r(6916),o=r(1913),a=r(6530),s=r(614),l=r(3061),c=r(9518),u=r(7674),h=r(8003),p=r(8880),d=r(8052),f=r(5112),y=r(7497),m=r(3383),v=a.PROPER,b=a.CONFIGURABLE,g=m.IteratorPrototype,w=m.BUGGY_SAFARI_ITERATORS,_=f("iterator"),k="keys",j="values",O="entries",x=function(){return this};t.exports=function(t,e,r,a,f,m,C){l(r,e,a);var E,S,P,T=function(t){if(t===f&&B)return B;if(!w&&t in A)return A[t];switch(t){case k:case j:case O:return function(){return new r(this,t)}}return function(){return new r(this)}},L=e+" Iterator",R=!1,A=t.prototype,I=A[_]||A["@@iterator"]||f&&A[f],B=!w&&I||T(f),N="Array"==e&&A.entries||I;if(N&&(E=c(N.call(new t)))!==Object.prototype&&E.next&&(o||c(E)===g||(u?u(E,g):s(E[_])||d(E,_,x)),h(E,L,!0,!0),o&&(y[L]=x)),v&&f==j&&I&&I.name!==j&&(!o&&b?p(A,"name",j):(R=!0,B=function(){return i(I,this)})),f)if(S={values:T(j),keys:m?B:T(k),entries:T(O)},C)for(P in S)(w||R||!(P in A))&&d(A,P,S[P]);else n({target:e,proto:!0,forced:w||R},S);return o&&!C||A[_]===B||d(A,_,B,{name:f}),y[e]=B,S}},3383:(t,e,r)=>{"use strict";var n,i,o,a=r(7293),s=r(614),l=r(111),c=r(30),u=r(9518),h=r(8052),p=r(5112),d=r(1913),f=p("iterator"),y=!1;[].keys&&("next"in(o=[].keys())?(i=u(u(o)))!==Object.prototype&&(n=i):y=!0),!l(n)||a((function(){var t={};return n[f].call(t)!==t}))?n={}:d&&(n=c(n)),s(n[f])||h(n,f,(function(){return this})),t.exports={IteratorPrototype:n,BUGGY_SAFARI_ITERATORS:y}},7497:t=>{t.exports={}},6244:(t,e,r)=>{var n=r(7466);t.exports=function(t){return n(t.length)}},6339:(t,e,r)=>{var n=r(1702),i=r(7293),o=r(614),a=r(2597),s=r(9781),l=r(6530).CONFIGURABLE,c=r(2788),u=r(9909),h=u.enforce,p=u.get,d=String,f=Object.defineProperty,y=n("".slice),m=n("".replace),v=n([].join),b=s&&!i((function(){return 8!==f((function(){}),"length",{value:8}).length})),g=String(String).split("String"),w=t.exports=function(t,e,r){"Symbol("===y(d(e),0,7)&&(e="["+m(d(e),/^Symbol\(([^)]*)\)/,"$1")+"]"),r&&r.getter&&(e="get "+e),r&&r.setter&&(e="set "+e),(!a(t,"name")||l&&t.name!==e)&&(s?f(t,"name",{value:e,configurable:!0}):t.name=e),b&&r&&a(r,"arity")&&t.length!==r.arity&&f(t,"length",{value:r.arity});try{r&&a(r,"constructor")&&r.constructor?s&&f(t,"prototype",{writable:!1}):t.prototype&&(t.prototype=void 0)}catch(t){}var n=h(t);return a(n,"source")||(n.source=v(g,"string"==typeof e?e:"")),t};Function.prototype.toString=w((function(){return o(this)&&p(this).source||c(this)}),"toString")},4758:t=>{var e=Math.ceil,r=Math.floor;t.exports=Math.trunc||function(t){var n=+t;return(n>0?r:e)(n)}},5948:(t,e,r)=>{var n,i,o,a,s,l=r(7854),c=r(9974),u=r(1236).f,h=r(261).set,p=r(8572),d=r(8334),f=r(1528),y=r(1036),m=r(5268),v=l.MutationObserver||l.WebKitMutationObserver,b=l.document,g=l.process,w=l.Promise,_=u(l,"queueMicrotask"),k=_&&_.value;if(!k){var j=new p,O=function(){var t,e;for(m&&(t=g.domain)&&t.exit();e=j.get();)try{e()}catch(t){throw j.head&&n(),t}t&&t.enter()};d||m||y||!v||!b?!f&&w&&w.resolve?((a=w.resolve(void 0)).constructor=w,s=c(a.then,a),n=function(){s(O)}):m?n=function(){g.nextTick(O)}:(h=c(h,l),n=function(){h(O)}):(i=!0,o=b.createTextNode(""),new v(O).observe(o,{characterData:!0}),n=function(){o.data=i=!i}),k=function(t){j.head||n(),j.add(t)}}t.exports=k},8523:(t,e,r)=>{"use strict";var n=r(9662),i=TypeError,o=function(t){var e,r;this.promise=new t((function(t,n){if(void 0!==e||void 0!==r)throw i("Bad Promise constructor");e=t,r=n})),this.resolve=n(e),this.reject=n(r)};t.exports.f=function(t){return new o(t)}},3929:(t,e,r)=>{var n=r(7850),i=TypeError;t.exports=function(t){if(n(t))throw i("The method doesn't accept regular expressions");return t}},2814:(t,e,r)=>{var n=r(7854),i=r(7293),o=r(1702),a=r(1340),s=r(3111).trim,l=r(1361),c=o("".charAt),u=n.parseFloat,h=n.Symbol,p=h&&h.iterator,d=1/u(l+"-0")!=-1/0||p&&!i((function(){u(Object(p))}));t.exports=d?function(t){var e=s(a(t)),r=u(e);return 0===r&&"-"==c(e,0)?-0:r}:u},3009:(t,e,r)=>{var n=r(7854),i=r(7293),o=r(1702),a=r(1340),s=r(3111).trim,l=r(1361),c=n.parseInt,u=n.Symbol,h=u&&u.iterator,p=/^[+-]?0x/i,d=o(p.exec),f=8!==c(l+"08")||22!==c(l+"0x16")||h&&!i((function(){c(Object(h))}));t.exports=f?function(t,e){var r=s(a(t));return c(r,e>>>0||(d(p,r)?16:10))}:c},1574:(t,e,r)=>{"use strict";var n=r(9781),i=r(1702),o=r(6916),a=r(7293),s=r(1956),l=r(5181),c=r(5296),u=r(7908),h=r(8361),p=Object.assign,d=Object.defineProperty,f=i([].concat);t.exports=!p||a((function(){if(n&&1!==p({b:1},p(d({},"a",{enumerable:!0,get:function(){d(this,"b",{value:3,enumerable:!1})}}),{b:2})).b)return!0;var t={},e={},r=Symbol(),i="abcdefghijklmnopqrst";return t[r]=7,i.split("").forEach((function(t){e[t]=t})),7!=p({},t)[r]||s(p({},e)).join("")!=i}))?function(t,e){for(var r=u(t),i=arguments.length,a=1,p=l.f,d=c.f;i>a;)for(var y,m=h(arguments[a++]),v=p?f(s(m),p(m)):s(m),b=v.length,g=0;b>g;)y=v[g++],n&&!o(d,m,y)||(r[y]=m[y]);return r}:p},30:(t,e,r)=>{var n,i=r(9670),o=r(6048),a=r(748),s=r(3501),l=r(490),c=r(317),u=r(6200),h="prototype",p="script",d=u("IE_PROTO"),f=function(){},y=function(t){return"<"+p+">"+t+"</"+p+">"},m=function(t){t.write(y("")),t.close();var e=t.parentWindow.Object;return t=null,e},v=function(){try{n=new ActiveXObject("htmlfile")}catch(t){}var t,e,r;v="undefined"!=typeof document?document.domain&&n?m(n):(e=c("iframe"),r="java"+p+":",e.style.display="none",l.appendChild(e),e.src=String(r),(t=e.contentWindow.document).open(),t.write(y("document.F=Object")),t.close(),t.F):m(n);for(var i=a.length;i--;)delete v[h][a[i]];return v()};s[d]=!0,t.exports=Object.create||function(t,e){var r;return null!==t?(f[h]=i(t),r=new f,f[h]=null,r[d]=t):r=v(),void 0===e?r:o.f(r,e)}},6048:(t,e,r)=>{var n=r(9781),i=r(3353),o=r(3070),a=r(9670),s=r(5656),l=r(1956);e.f=n&&!i?Object.defineProperties:function(t,e){a(t);for(var r,n=s(e),i=l(e),c=i.length,u=0;c>u;)o.f(t,r=i[u++],n[r]);return t}},3070:(t,e,r)=>{var n=r(9781),i=r(4664),o=r(3353),a=r(9670),s=r(4948),l=TypeError,c=Object.defineProperty,u=Object.getOwnPropertyDescriptor,h="enumerable",p="configurable",d="writable";e.f=n?o?function(t,e,r){if(a(t),e=s(e),a(r),"function"==typeof t&&"prototype"===e&&"value"in r&&d in r&&!r[d]){var n=u(t,e);n&&n[d]&&(t[e]=r.value,r={configurable:p in r?r[p]:n[p],enumerable:h in r?r[h]:n[h],writable:!1})}return c(t,e,r)}:c:function(t,e,r){if(a(t),e=s(e),a(r),i)try{return c(t,e,r)}catch(t){}if("get"in r||"set"in r)throw l("Accessors not supported");return"value"in r&&(t[e]=r.value),t}},1236:(t,e,r)=>{var n=r(9781),i=r(6916),o=r(5296),a=r(9114),s=r(5656),l=r(4948),c=r(2597),u=r(4664),h=Object.getOwnPropertyDescriptor;e.f=n?h:function(t,e){if(t=s(t),e=l(e),u)try{return h(t,e)}catch(t){}if(c(t,e))return a(!i(o.f,t,e),t[e])}},1156:(t,e,r)=>{var n=r(4326),i=r(5656),o=r(8006).f,a=r(1589),s="object"==typeof window&&window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[];t.exports.f=function(t){return s&&"Window"==n(t)?function(t){try{return o(t)}catch(t){return a(s)}}(t):o(i(t))}},8006:(t,e,r)=>{var n=r(6324),i=r(748).concat("length","prototype");e.f=Object.getOwnPropertyNames||function(t){return n(t,i)}},5181:(t,e)=>{e.f=Object.getOwnPropertySymbols},9518:(t,e,r)=>{var n=r(2597),i=r(614),o=r(7908),a=r(6200),s=r(8544),l=a("IE_PROTO"),c=Object,u=c.prototype;t.exports=s?c.getPrototypeOf:function(t){var e=o(t);if(n(e,l))return e[l];var r=e.constructor;return i(r)&&e instanceof r?r.prototype:e instanceof c?u:null}},7976:(t,e,r)=>{var n=r(1702);t.exports=n({}.isPrototypeOf)},6324:(t,e,r)=>{var n=r(1702),i=r(2597),o=r(5656),a=r(1318).indexOf,s=r(3501),l=n([].push);t.exports=function(t,e){var r,n=o(t),c=0,u=[];for(r in n)!i(s,r)&&i(n,r)&&l(u,r);for(;e.length>c;)i(n,r=e[c++])&&(~a(u,r)||l(u,r));return u}},1956:(t,e,r)=>{var n=r(6324),i=r(748);t.exports=Object.keys||function(t){return n(t,i)}},5296:(t,e)=>{"use strict";var r={}.propertyIsEnumerable,n=Object.getOwnPropertyDescriptor,i=n&&!r.call({1:2},1);e.f=i?function(t){var e=n(this,t);return!!e&&e.enumerable}:r},7674:(t,e,r)=>{var n=r(5668),i=r(9670),o=r(6077);t.exports=Object.setPrototypeOf||("__proto__"in{}?function(){var t,e=!1,r={};try{(t=n(Object.prototype,"__proto__","set"))(r,[]),e=r instanceof Array}catch(t){}return function(r,n){return i(r),o(n),e?t(r,n):r.__proto__=n,r}}():void 0)},4699:(t,e,r)=>{var n=r(9781),i=r(1702),o=r(1956),a=r(5656),s=i(r(5296).f),l=i([].push),c=function(t){return function(e){for(var r,i=a(e),c=o(i),u=c.length,h=0,p=[];u>h;)r=c[h++],n&&!s(i,r)||l(p,t?[r,i[r]]:i[r]);return p}};t.exports={entries:c(!0),values:c(!1)}},288:(t,e,r)=>{"use strict";var n=r(1694),i=r(648);t.exports=n?{}.toString:function(){return"[object "+i(this)+"]"}},2140:(t,e,r)=>{var n=r(6916),i=r(614),o=r(111),a=TypeError;t.exports=function(t,e){var r,s;if("string"===e&&i(r=t.toString)&&!o(s=n(r,t)))return s;if(i(r=t.valueOf)&&!o(s=n(r,t)))return s;if("string"!==e&&i(r=t.toString)&&!o(s=n(r,t)))return s;throw a("Can't convert object to primitive value")}},3887:(t,e,r)=>{var n=r(5005),i=r(1702),o=r(8006),a=r(5181),s=r(9670),l=i([].concat);t.exports=n("Reflect","ownKeys")||function(t){var e=o.f(s(t)),r=a.f;return r?l(e,r(t)):e}},857:(t,e,r)=>{var n=r(7854);t.exports=n},2534:t=>{t.exports=function(t){try{return{error:!1,value:t()}}catch(t){return{error:!0,value:t}}}},3702:(t,e,r)=>{var n=r(7854),i=r(2492),o=r(614),a=r(4705),s=r(2788),l=r(5112),c=r(7871),u=r(3823),h=r(1913),p=r(7392),d=i&&i.prototype,f=l("species"),y=!1,m=o(n.PromiseRejectionEvent),v=a("Promise",(function(){var t=s(i),e=t!==String(i);if(!e&&66===p)return!0;if(h&&(!d.catch||!d.finally))return!0;if(!p||p<51||!/native code/.test(t)){var r=new i((function(t){t(1)})),n=function(t){t((function(){}),(function(){}))};if((r.constructor={})[f]=n,!(y=r.then((function(){}))instanceof n))return!0}return!e&&(c||u)&&!m}));t.exports={CONSTRUCTOR:v,REJECTION_EVENT:m,SUBCLASSING:y}},2492:(t,e,r)=>{var n=r(7854);t.exports=n.Promise},9478:(t,e,r)=>{var n=r(9670),i=r(111),o=r(8523);t.exports=function(t,e){if(n(t),i(e)&&e.constructor===t)return e;var r=o.f(t);return(0,r.resolve)(e),r.promise}},612:(t,e,r)=>{var n=r(2492),i=r(7072),o=r(3702).CONSTRUCTOR;t.exports=o||!i((function(t){n.all(t).then(void 0,(function(){}))}))},2626:(t,e,r)=>{var n=r(3070).f;t.exports=function(t,e,r){r in t||n(t,r,{configurable:!0,get:function(){return e[r]},set:function(t){e[r]=t}})}},8572:t=>{var e=function(){this.head=null,this.tail=null};e.prototype={add:function(t){var e={item:t,next:null},r=this.tail;r?r.next=e:this.head=e,this.tail=e},get:function(){var t=this.head;if(t)return null===(this.head=t.next)&&(this.tail=null),t.item}},t.exports=e},7651:(t,e,r)=>{var n=r(6916),i=r(9670),o=r(614),a=r(4326),s=r(2261),l=TypeError;t.exports=function(t,e){var r=t.exec;if(o(r)){var c=n(r,t,e);return null!==c&&i(c),c}if("RegExp"===a(t))return n(s,t,e);throw l("RegExp#exec called on incompatible receiver")}},2261:(t,e,r)=>{"use strict";var n,i,o=r(6916),a=r(1702),s=r(1340),l=r(7066),c=r(2999),u=r(2309),h=r(30),p=r(9909).get,d=r(9441),f=r(7168),y=u("native-string-replace",String.prototype.replace),m=RegExp.prototype.exec,v=m,b=a("".charAt),g=a("".indexOf),w=a("".replace),_=a("".slice),k=(i=/b*/g,o(m,n=/a/,"a"),o(m,i,"a"),0!==n.lastIndex||0!==i.lastIndex),j=c.BROKEN_CARET,O=void 0!==/()??/.exec("")[1];(k||O||j||d||f)&&(v=function(t){var e,r,n,i,a,c,u,d=this,f=p(d),x=s(t),C=f.raw;if(C)return C.lastIndex=d.lastIndex,e=o(v,C,x),d.lastIndex=C.lastIndex,e;var E=f.groups,S=j&&d.sticky,P=o(l,d),T=d.source,L=0,R=x;if(S&&(P=w(P,"y",""),-1===g(P,"g")&&(P+="g"),R=_(x,d.lastIndex),d.lastIndex>0&&(!d.multiline||d.multiline&&"\n"!==b(x,d.lastIndex-1))&&(T="(?: "+T+")",R=" "+R,L++),r=new RegExp("^(?:"+T+")",P)),O&&(r=new RegExp("^"+T+"$(?!\\s)",P)),k&&(n=d.lastIndex),i=o(m,S?r:d,R),S?i?(i.input=_(i.input,L),i[0]=_(i[0],L),i.index=d.lastIndex,d.lastIndex+=i[0].length):d.lastIndex=0:k&&i&&(d.lastIndex=d.global?i.index+i[0].length:n),O&&i&&i.length>1&&o(y,i[0],r,(function(){for(a=1;a<arguments.length-2;a++)void 0===arguments[a]&&(i[a]=void 0)})),i&&E)for(i.groups=c=h(null),a=0;a<E.length;a++)c[(u=E[a])[0]]=i[u[1]];return i}),t.exports=v},7066:(t,e,r)=>{"use strict";var n=r(9670);t.exports=function(){var t=n(this),e="";return t.hasIndices&&(e+="d"),t.global&&(e+="g"),t.ignoreCase&&(e+="i"),t.multiline&&(e+="m"),t.dotAll&&(e+="s"),t.unicode&&(e+="u"),t.unicodeSets&&(e+="v"),t.sticky&&(e+="y"),e}},4706:(t,e,r)=>{var n=r(6916),i=r(2597),o=r(7976),a=r(7066),s=RegExp.prototype;t.exports=function(t){var e=t.flags;return void 0!==e||"flags"in s||i(t,"flags")||!o(s,t)?e:n(a,t)}},2999:(t,e,r)=>{var n=r(7293),i=r(7854).RegExp,o=n((function(){var t=i("a","y");return t.lastIndex=2,null!=t.exec("abcd")})),a=o||n((function(){return!i("a","y").sticky})),s=o||n((function(){var t=i("^r","gy");return t.lastIndex=2,null!=t.exec("str")}));t.exports={BROKEN_CARET:s,MISSED_STICKY:a,UNSUPPORTED_Y:o}},9441:(t,e,r)=>{var n=r(7293),i=r(7854).RegExp;t.exports=n((function(){var t=i(".","s");return!(t.dotAll&&t.exec("\n")&&"s"===t.flags)}))},7168:(t,e,r)=>{var n=r(7293),i=r(7854).RegExp;t.exports=n((function(){var t=i("(?<a>b)","g");return"b"!==t.exec("b").groups.a||"bc"!=="b".replace(t,"$<a>c")}))},4488:(t,e,r)=>{var n=r(8554),i=TypeError;t.exports=function(t){if(n(t))throw i("Can't call method on "+t);return t}},7152:(t,e,r)=>{"use strict";var n,i=r(7854),o=r(2104),a=r(614),s=r(9363),l=r(8113),c=r(206),u=r(8053),h=i.Function,p=/MSIE .\./.test(l)||s&&((n=i.Bun.version.split(".")).length<3||0==n[0]&&(n[1]<3||3==n[1]&&0==n[2]));t.exports=function(t,e){var r=e?2:1;return p?function(n,i){var s=u(arguments.length,1)>r,l=a(n)?n:h(n),p=s?c(arguments,r):[],d=s?function(){o(l,this,p)}:l;return e?t(d,i):t(d)}:t}},6340:(t,e,r)=>{"use strict";var n=r(5005),i=r(7045),o=r(5112),a=r(9781),s=o("species");t.exports=function(t){var e=n(t);a&&e&&!e[s]&&i(e,s,{configurable:!0,get:function(){return this}})}},8003:(t,e,r)=>{var n=r(3070).f,i=r(2597),o=r(5112)("toStringTag");t.exports=function(t,e,r){t&&!r&&(t=t.prototype),t&&!i(t,o)&&n(t,o,{configurable:!0,value:e})}},6200:(t,e,r)=>{var n=r(2309),i=r(9711),o=n("keys");t.exports=function(t){return o[t]||(o[t]=i(t))}},5465:(t,e,r)=>{var n=r(7854),i=r(3072),o="__core-js_shared__",a=n[o]||i(o,{});t.exports=a},2309:(t,e,r)=>{var n=r(1913),i=r(5465);(t.exports=function(t,e){return i[t]||(i[t]=void 0!==e?e:{})})("versions",[]).push({version:"3.29.0",mode:n?"pure":"global",copyright:"© 2014-2023 Denis Pushkarev (zloirock.ru)",license:"https://github.com/zloirock/core-js/blob/v3.29.0/LICENSE",source:"https://github.com/zloirock/core-js"})},6707:(t,e,r)=>{var n=r(9670),i=r(9483),o=r(8554),a=r(5112)("species");t.exports=function(t,e){var r,s=n(t).constructor;return void 0===s||o(r=n(s)[a])?e:i(r)}},8710:(t,e,r)=>{var n=r(1702),i=r(9303),o=r(1340),a=r(4488),s=n("".charAt),l=n("".charCodeAt),c=n("".slice),u=function(t){return function(e,r){var n,u,h=o(a(e)),p=i(r),d=h.length;return p<0||p>=d?t?"":void 0:(n=l(h,p))<55296||n>56319||p+1===d||(u=l(h,p+1))<56320||u>57343?t?s(h,p):n:t?c(h,p,p+2):u-56320+(n-55296<<10)+65536}};t.exports={codeAt:u(!1),charAt:u(!0)}},6650:(t,e,r)=>{var n=r(1702),i=r(7466),o=r(1340),a=r(8415),s=r(4488),l=n(a),c=n("".slice),u=Math.ceil,h=function(t){return function(e,r,n){var a,h,p=o(s(e)),d=i(r),f=p.length,y=void 0===n?" ":o(n);return d<=f||""==y?p:((h=l(y,u((a=d-f)/y.length))).length>a&&(h=c(h,0,a)),t?p+h:h+p)}};t.exports={start:h(!1),end:h(!0)}},8415:(t,e,r)=>{"use strict";var n=r(9303),i=r(1340),o=r(4488),a=RangeError;t.exports=function(t){var e=i(o(this)),r="",s=n(t);if(s<0||s==1/0)throw a("Wrong number of repetitions");for(;s>0;(s>>>=1)&&(e+=e))1&s&&(r+=e);return r}},6091:(t,e,r)=>{var n=r(6530).PROPER,i=r(7293),o=r(1361);t.exports=function(t){return i((function(){return!!o[t]()||"​…᠎"!=="​…᠎"[t]()||n&&o[t].name!==t}))}},3111:(t,e,r)=>{var n=r(1702),i=r(4488),o=r(1340),a=r(1361),s=n("".replace),l=RegExp("^["+a+"]+"),c=RegExp("(^|[^"+a+"])["+a+"]+$"),u=function(t){return function(e){var r=o(i(e));return 1&t&&(r=s(r,l,"")),2&t&&(r=s(r,c,"$1")),r}};t.exports={start:u(1),end:u(2),trim:u(3)}},6293:(t,e,r)=>{var n=r(7392),i=r(7293);t.exports=!!Object.getOwnPropertySymbols&&!i((function(){var t=Symbol();return!String(t)||!(Object(t)instanceof Symbol)||!Symbol.sham&&n&&n<41}))},6532:(t,e,r)=>{var n=r(6916),i=r(5005),o=r(5112),a=r(8052);t.exports=function(){var t=i("Symbol"),e=t&&t.prototype,r=e&&e.valueOf,s=o("toPrimitive");e&&!e[s]&&a(e,s,(function(t){return n(r,this)}),{arity:1})}},2015:(t,e,r)=>{var n=r(6293);t.exports=n&&!!Symbol.for&&!!Symbol.keyFor},261:(t,e,r)=>{var n,i,o,a,s=r(7854),l=r(2104),c=r(9974),u=r(614),h=r(2597),p=r(7293),d=r(490),f=r(206),y=r(317),m=r(8053),v=r(8334),b=r(5268),g=s.setImmediate,w=s.clearImmediate,_=s.process,k=s.Dispatch,j=s.Function,O=s.MessageChannel,x=s.String,C=0,E={},S="onreadystatechange";p((function(){n=s.location}));var P=function(t){if(h(E,t)){var e=E[t];delete E[t],e()}},T=function(t){return function(){P(t)}},L=function(t){P(t.data)},R=function(t){s.postMessage(x(t),n.protocol+"//"+n.host)};g&&w||(g=function(t){m(arguments.length,1);var e=u(t)?t:j(t),r=f(arguments,1);return E[++C]=function(){l(e,void 0,r)},i(C),C},w=function(t){delete E[t]},b?i=function(t){_.nextTick(T(t))}:k&&k.now?i=function(t){k.now(T(t))}:O&&!v?(a=(o=new O).port2,o.port1.onmessage=L,i=c(a.postMessage,a)):s.addEventListener&&u(s.postMessage)&&!s.importScripts&&n&&"file:"!==n.protocol&&!p(R)?(i=R,s.addEventListener("message",L,!1)):i=S in y("script")?function(t){d.appendChild(y("script"))[S]=function(){d.removeChild(this),P(t)}}:function(t){setTimeout(T(t),0)}),t.exports={set:g,clear:w}},863:(t,e,r)=>{var n=r(1702);t.exports=n(1..valueOf)},1400:(t,e,r)=>{var n=r(9303),i=Math.max,o=Math.min;t.exports=function(t,e){var r=n(t);return r<0?i(r+e,0):o(r,e)}},5656:(t,e,r)=>{var n=r(8361),i=r(4488);t.exports=function(t){return n(i(t))}},9303:(t,e,r)=>{var n=r(4758);t.exports=function(t){var e=+t;return e!=e||0===e?0:n(e)}},7466:(t,e,r)=>{var n=r(9303),i=Math.min;t.exports=function(t){return t>0?i(n(t),9007199254740991):0}},7908:(t,e,r)=>{var n=r(4488),i=Object;t.exports=function(t){return i(n(t))}},7593:(t,e,r)=>{var n=r(6916),i=r(111),o=r(2190),a=r(8173),s=r(2140),l=r(5112),c=TypeError,u=l("toPrimitive");t.exports=function(t,e){if(!i(t)||o(t))return t;var r,l=a(t,u);if(l){if(void 0===e&&(e="default"),r=n(l,t,e),!i(r)||o(r))return r;throw c("Can't convert object to primitive value")}return void 0===e&&(e="number"),s(t,e)}},4948:(t,e,r)=>{var n=r(7593),i=r(2190);t.exports=function(t){var e=n(t,"string");return i(e)?e:e+""}},1694:(t,e,r)=>{var n={};n[r(5112)("toStringTag")]="z",t.exports="[object z]"===String(n)},1340:(t,e,r)=>{var n=r(648),i=String;t.exports=function(t){if("Symbol"===n(t))throw TypeError("Cannot convert a Symbol value to a string");return i(t)}},6330:t=>{var e=String;t.exports=function(t){try{return e(t)}catch(t){return"Object"}}},9711:(t,e,r)=>{var n=r(1702),i=0,o=Math.random(),a=n(1..toString);t.exports=function(t){return"Symbol("+(void 0===t?"":t)+")_"+a(++i+o,36)}},3307:(t,e,r)=>{var n=r(6293);t.exports=n&&!Symbol.sham&&"symbol"==typeof Symbol.iterator},3353:(t,e,r)=>{var n=r(9781),i=r(7293);t.exports=n&&i((function(){return 42!=Object.defineProperty((function(){}),"prototype",{value:42,writable:!1}).prototype}))},8053:t=>{var e=TypeError;t.exports=function(t,r){if(t<r)throw e("Not enough arguments");return t}},4811:(t,e,r)=>{var n=r(7854),i=r(614),o=n.WeakMap;t.exports=i(o)&&/native code/.test(String(o))},6800:(t,e,r)=>{var n=r(857),i=r(2597),o=r(6061),a=r(3070).f;t.exports=function(t){var e=n.Symbol||(n.Symbol={});i(e,t)||a(e,t,{value:o.f(t)})}},6061:(t,e,r)=>{var n=r(5112);e.f=n},5112:(t,e,r)=>{var n=r(7854),i=r(2309),o=r(2597),a=r(9711),s=r(6293),l=r(3307),c=n.Symbol,u=i("wks"),h=l?c.for||c:c&&c.withoutSetter||a;t.exports=function(t){return o(u,t)||(u[t]=s&&o(c,t)?c[t]:h("Symbol."+t)),u[t]}},1361:t=>{t.exports="\t\n\v\f\r                　\u2028\u2029\ufeff"},2222:(t,e,r)=>{"use strict";var n=r(2109),i=r(7293),o=r(3157),a=r(111),s=r(7908),l=r(6244),c=r(7207),u=r(6135),h=r(5417),p=r(1194),d=r(5112),f=r(7392),y=d("isConcatSpreadable"),m=f>=51||!i((function(){var t=[];return t[y]=!1,t.concat()[0]!==t})),v=function(t){if(!a(t))return!1;var e=t[y];return void 0!==e?!!e:o(t)};n({target:"Array",proto:!0,arity:1,forced:!m||!p("concat")},{concat:function(t){var e,r,n,i,o,a=s(this),p=h(a,0),d=0;for(e=-1,n=arguments.length;e<n;e++)if(v(o=-1===e?a:arguments[e]))for(i=l(o),c(d+i),r=0;r<i;r++,d++)r in o&&u(p,d,o[r]);else c(d+1),u(p,d++,o);return p.length=d,p}})},6541:(t,e,r)=>{"use strict";var n=r(2109),i=r(2092).every;n({target:"Array",proto:!0,forced:!r(9341)("every")},{every:function(t){return i(this,t,arguments.length>1?arguments[1]:void 0)}})},7327:(t,e,r)=>{"use strict";var n=r(2109),i=r(2092).filter;n({target:"Array",proto:!0,forced:!r(1194)("filter")},{filter:function(t){return i(this,t,arguments.length>1?arguments[1]:void 0)}})},9826:(t,e,r)=>{"use strict";var n=r(2109),i=r(2092).find,o=r(1223),a="find",s=!0;a in[]&&Array(1)[a]((function(){s=!1})),n({target:"Array",proto:!0,forced:s},{find:function(t){return i(this,t,arguments.length>1?arguments[1]:void 0)}}),o(a)},9554:(t,e,r)=>{"use strict";var n=r(2109),i=r(8533);n({target:"Array",proto:!0,forced:[].forEach!=i},{forEach:i})},1038:(t,e,r)=>{var n=r(2109),i=r(8457);n({target:"Array",stat:!0,forced:!r(7072)((function(t){Array.from(t)}))},{from:i})},6699:(t,e,r)=>{"use strict";var n=r(2109),i=r(1318).includes,o=r(7293),a=r(1223);n({target:"Array",proto:!0,forced:o((function(){return!Array(1).includes()}))},{includes:function(t){return i(this,t,arguments.length>1?arguments[1]:void 0)}}),a("includes")},2772:(t,e,r)=>{"use strict";var n=r(2109),i=r(1470),o=r(1318).indexOf,a=r(9341),s=i([].indexOf),l=!!s&&1/s([1],1,-0)<0;n({target:"Array",proto:!0,forced:l||!a("indexOf")},{indexOf:function(t){var e=arguments.length>1?arguments[1]:void 0;return l?s(this,t,e)||0:o(this,t,e)}})},9753:(t,e,r)=>{r(2109)({target:"Array",stat:!0},{isArray:r(3157)})},6992:(t,e,r)=>{"use strict";var n=r(5656),i=r(1223),o=r(7497),a=r(9909),s=r(3070).f,l=r(1656),c=r(6178),u=r(1913),h=r(9781),p="Array Iterator",d=a.set,f=a.getterFor(p);t.exports=l(Array,"Array",(function(t,e){d(this,{type:p,target:n(t),index:0,kind:e})}),(function(){var t=f(this),e=t.target,r=t.kind,n=t.index++;return!e||n>=e.length?(t.target=void 0,c(void 0,!0)):c("keys"==r?n:"values"==r?e[n]:[n,e[n]],!1)}),"values");var y=o.Arguments=o.Array;if(i("keys"),i("values"),i("entries"),!u&&h&&"values"!==y.name)try{s(y,"name",{value:"values"})}catch(t){}},9600:(t,e,r)=>{"use strict";var n=r(2109),i=r(1702),o=r(8361),a=r(5656),s=r(9341),l=i([].join);n({target:"Array",proto:!0,forced:o!=Object||!s("join",",")},{join:function(t){return l(a(this),void 0===t?",":t)}})},1249:(t,e,r)=>{"use strict";var n=r(2109),i=r(2092).map;n({target:"Array",proto:!0,forced:!r(1194)("map")},{map:function(t){return i(this,t,arguments.length>1?arguments[1]:void 0)}})},5827:(t,e,r)=>{"use strict";var n=r(2109),i=r(3671).left,o=r(9341),a=r(7392);n({target:"Array",proto:!0,forced:!r(5268)&&a>79&&a<83||!o("reduce")},{reduce:function(t){var e=arguments.length;return i(this,t,e,e>1?arguments[1]:void 0)}})},5069:(t,e,r)=>{"use strict";var n=r(2109),i=r(1702),o=r(3157),a=i([].reverse),s=[1,2];n({target:"Array",proto:!0,forced:String(s)===String(s.reverse())},{reverse:function(){return o(this)&&(this.length=this.length),a(this)}})},7042:(t,e,r)=>{"use strict";var n=r(2109),i=r(3157),o=r(4411),a=r(111),s=r(1400),l=r(6244),c=r(5656),u=r(6135),h=r(5112),p=r(1194),d=r(206),f=p("slice"),y=h("species"),m=Array,v=Math.max;n({target:"Array",proto:!0,forced:!f},{slice:function(t,e){var r,n,h,p=c(this),f=l(p),b=s(t,f),g=s(void 0===e?f:e,f);if(i(p)&&(r=p.constructor,(o(r)&&(r===m||i(r.prototype))||a(r)&&null===(r=r[y]))&&(r=void 0),r===m||void 0===r))return d(p,b,g);for(n=new(void 0===r?m:r)(v(g-b,0)),h=0;b<g;b++,h++)b in p&&u(n,h,p[b]);return n.length=h,n}})},5212:(t,e,r)=>{"use strict";var n=r(2109),i=r(2092).some;n({target:"Array",proto:!0,forced:!r(9341)("some")},{some:function(t){return i(this,t,arguments.length>1?arguments[1]:void 0)}})},2707:(t,e,r)=>{"use strict";var n=r(2109),i=r(1702),o=r(9662),a=r(7908),s=r(6244),l=r(5117),c=r(1340),u=r(7293),h=r(4362),p=r(9341),d=r(8886),f=r(256),y=r(7392),m=r(8008),v=[],b=i(v.sort),g=i(v.push),w=u((function(){v.sort(void 0)})),_=u((function(){v.sort(null)})),k=p("sort"),j=!u((function(){if(y)return y<70;if(!(d&&d>3)){if(f)return!0;if(m)return m<603;var t,e,r,n,i="";for(t=65;t<76;t++){switch(e=String.fromCharCode(t),t){case 66:case 69:case 70:case 72:r=3;break;case 68:case 71:r=4;break;default:r=2}for(n=0;n<47;n++)v.push({k:e+n,v:r})}for(v.sort((function(t,e){return e.v-t.v})),n=0;n<v.length;n++)e=v[n].k.charAt(0),i.charAt(i.length-1)!==e&&(i+=e);return"DGBEFHACIJK"!==i}}));n({target:"Array",proto:!0,forced:w||!_||!k||!j},{sort:function(t){void 0!==t&&o(t);var e=a(this);if(j)return void 0===t?b(e):b(e,t);var r,n,i=[],u=s(e);for(n=0;n<u;n++)n in e&&g(i,e[n]);for(h(i,function(t){return function(e,r){return void 0===r?-1:void 0===e?1:void 0!==t?+t(e,r)||0:c(e)>c(r)?1:-1}}(t)),r=s(i),n=0;n<r;)e[n]=i[n++];for(;n<u;)l(e,n++);return e}})},561:(t,e,r)=>{"use strict";var n=r(2109),i=r(7908),o=r(1400),a=r(9303),s=r(6244),l=r(3658),c=r(7207),u=r(5417),h=r(6135),p=r(5117),d=r(1194)("splice"),f=Math.max,y=Math.min;n({target:"Array",proto:!0,forced:!d},{splice:function(t,e){var r,n,d,m,v,b,g=i(this),w=s(g),_=o(t,w),k=arguments.length;for(0===k?r=n=0:1===k?(r=0,n=w-_):(r=k-2,n=y(f(a(e),0),w-_)),c(w+r-n),d=u(g,n),m=0;m<n;m++)(v=_+m)in g&&h(d,m,g[v]);if(d.length=n,r<n){for(m=_;m<w-n;m++)b=m+r,(v=m+n)in g?g[b]=g[v]:p(g,b);for(m=w;m>w-n+r;m--)p(g,m-1)}else if(r>n)for(m=w-n;m>_;m--)b=m+r-1,(v=m+n-1)in g?g[b]=g[v]:p(g,b);for(m=0;m<r;m++)g[m+_]=arguments[m+2];return l(g,w-n+r),d}})},3843:(t,e,r)=>{var n=r(2109),i=r(1702),o=Date,a=i(o.prototype.getTime);n({target:"Date",stat:!0},{now:function(){return a(new o)}})},8733:(t,e,r)=>{var n=r(2109),i=r(5573);n({target:"Date",proto:!0,forced:Date.prototype.toISOString!==i},{toISOString:i})},6078:(t,e,r)=>{var n=r(2597),i=r(8052),o=r(8709),a=r(5112)("toPrimitive"),s=Date.prototype;n(s,a)||i(s,a,o)},3710:(t,e,r)=>{var n=r(1702),i=r(8052),o=Date.prototype,a="Invalid Date",s="toString",l=n(o[s]),c=n(o.getTime);String(new Date(NaN))!=a&&i(o,s,(function(){var t=c(this);return t==t?l(this):a}))},4812:(t,e,r)=>{var n=r(2109),i=r(7065);n({target:"Function",proto:!0,forced:Function.bind!==i},{bind:i})},8309:(t,e,r)=>{var n=r(9781),i=r(6530).EXISTS,o=r(1702),a=r(7045),s=Function.prototype,l=o(s.toString),c=/function\b(?:\s|\/\*[\S\s]*?\*\/|\/\/[^\n\r]*[\n\r]+)*([^\s(/]*)/,u=o(c.exec);n&&!i&&a(s,"name",{configurable:!0,get:function(){try{return u(c,l(this))[1]}catch(t){return""}}})},8862:(t,e,r)=>{var n=r(2109),i=r(5005),o=r(2104),a=r(6916),s=r(1702),l=r(7293),c=r(614),u=r(2190),h=r(206),p=r(8044),d=r(6293),f=String,y=i("JSON","stringify"),m=s(/./.exec),v=s("".charAt),b=s("".charCodeAt),g=s("".replace),w=s(1..toString),_=/[\uD800-\uDFFF]/g,k=/^[\uD800-\uDBFF]$/,j=/^[\uDC00-\uDFFF]$/,O=!d||l((function(){var t=i("Symbol")();return"[null]"!=y([t])||"{}"!=y({a:t})||"{}"!=y(Object(t))})),x=l((function(){return'"\\udf06\\ud834"'!==y("\udf06\ud834")||'"\\udead"'!==y("\udead")})),C=function(t,e){var r=h(arguments),n=p(e);if(c(n)||void 0!==t&&!u(t))return r[1]=function(t,e){if(c(n)&&(e=a(n,this,f(t),e)),!u(e))return e},o(y,null,r)},E=function(t,e,r){var n=v(r,e-1),i=v(r,e+1);return m(k,t)&&!m(j,i)||m(j,t)&&!m(k,n)?"\\u"+w(b(t,0),16):t};y&&n({target:"JSON",stat:!0,arity:3,forced:O||x},{stringify:function(t,e,r){var n=h(arguments),i=o(O?C:y,null,n);return x&&"string"==typeof i?g(i,_,E):i}})},3706:(t,e,r)=>{var n=r(7854);r(8003)(n.JSON,"JSON",!0)},2703:(t,e,r)=>{r(8003)(Math,"Math",!0)},9653:(t,e,r)=>{"use strict";var n=r(2109),i=r(1913),o=r(9781),a=r(7854),s=r(857),l=r(1702),c=r(4705),u=r(2597),h=r(9587),p=r(7976),d=r(2190),f=r(7593),y=r(7293),m=r(8006).f,v=r(1236).f,b=r(3070).f,g=r(863),w=r(3111).trim,_="Number",k=a[_],j=s[_],O=k.prototype,x=a.TypeError,C=l("".slice),E=l("".charCodeAt),S=function(t){var e=f(t,"number");return"bigint"==typeof e?e:P(e)},P=function(t){var e,r,n,i,o,a,s,l,c=f(t,"number");if(d(c))throw x("Cannot convert a Symbol value to a number");if("string"==typeof c&&c.length>2)if(c=w(c),43===(e=E(c,0))||45===e){if(88===(r=E(c,2))||120===r)return NaN}else if(48===e){switch(E(c,1)){case 66:case 98:n=2,i=49;break;case 79:case 111:n=8,i=55;break;default:return+c}for(a=(o=C(c,2)).length,s=0;s<a;s++)if((l=E(o,s))<48||l>i)return NaN;return parseInt(o,n)}return+c},T=c(_,!k(" 0o1")||!k("0b1")||k("+0x1")),L=function(t){return p(O,t)&&y((function(){g(t)}))},R=function(t){var e=arguments.length<1?0:k(S(t));return L(this)?h(Object(e),this,R):e};R.prototype=O,T&&!i&&(O.constructor=R),n({global:!0,constructor:!0,wrap:!0,forced:T},{Number:R});var A=function(t,e){for(var r,n=o?m(e):"MAX_VALUE,MIN_VALUE,NaN,NEGATIVE_INFINITY,POSITIVE_INFINITY,EPSILON,MAX_SAFE_INTEGER,MIN_SAFE_INTEGER,isFinite,isInteger,isNaN,isSafeInteger,parseFloat,parseInt,fromString,range".split(","),i=0;n.length>i;i++)u(e,r=n[i])&&!u(t,r)&&b(t,r,v(e,r))};i&&j&&A(s[_],j),(T||i)&&A(s[_],k)},6977:(t,e,r)=>{"use strict";var n=r(2109),i=r(1702),o=r(9303),a=r(863),s=r(8415),l=r(7293),c=RangeError,u=String,h=Math.floor,p=i(s),d=i("".slice),f=i(1..toFixed),y=function(t,e,r){return 0===e?r:e%2==1?y(t,e-1,r*t):y(t*t,e/2,r)},m=function(t,e,r){for(var n=-1,i=r;++n<6;)i+=e*t[n],t[n]=i%1e7,i=h(i/1e7)},v=function(t,e){for(var r=6,n=0;--r>=0;)n+=t[r],t[r]=h(n/e),n=n%e*1e7},b=function(t){for(var e=6,r="";--e>=0;)if(""!==r||0===e||0!==t[e]){var n=u(t[e]);r=""===r?n:r+p("0",7-n.length)+n}return r};n({target:"Number",proto:!0,forced:l((function(){return"0.000"!==f(8e-5,3)||"1"!==f(.9,0)||"1.25"!==f(1.255,2)||"1000000000000000128"!==f(0xde0b6b3a7640080,0)}))||!l((function(){f({})}))},{toFixed:function(t){var e,r,n,i,s=a(this),l=o(t),h=[0,0,0,0,0,0],f="",g="0";if(l<0||l>20)throw c("Incorrect fraction digits");if(s!=s)return"NaN";if(s<=-1e21||s>=1e21)return u(s);if(s<0&&(f="-",s=-s),s>1e-21)if(r=(e=function(t){for(var e=0,r=t;r>=4096;)e+=12,r/=4096;for(;r>=2;)e+=1,r/=2;return e}(s*y(2,69,1))-69)<0?s*y(2,-e,1):s/y(2,e,1),r*=4503599627370496,(e=52-e)>0){for(m(h,0,r),n=l;n>=7;)m(h,1e7,0),n-=7;for(m(h,y(10,n,1),0),n=e-1;n>=23;)v(h,1<<23),n-=23;v(h,1<<n),m(h,1,1),v(h,2),g=b(h)}else m(h,0,r),m(h,1<<-e,0),g=b(h)+p("0",l);return l>0?f+((i=g.length)<=l?"0."+p("0",l-i)+g:d(g,0,i-l)+"."+d(g,i-l)):f+g}})},9601:(t,e,r)=>{var n=r(2109),i=r(1574);n({target:"Object",stat:!0,arity:2,forced:Object.assign!==i},{assign:i})},8011:(t,e,r)=>{r(2109)({target:"Object",stat:!0,sham:!r(9781)},{create:r(30)})},3321:(t,e,r)=>{var n=r(2109),i=r(9781),o=r(6048).f;n({target:"Object",stat:!0,forced:Object.defineProperties!==o,sham:!i},{defineProperties:o})},9070:(t,e,r)=>{var n=r(2109),i=r(9781),o=r(3070).f;n({target:"Object",stat:!0,forced:Object.defineProperty!==o,sham:!i},{defineProperty:o})},9720:(t,e,r)=>{var n=r(2109),i=r(4699).entries;n({target:"Object",stat:!0},{entries:function(t){return i(t)}})},5003:(t,e,r)=>{var n=r(2109),i=r(7293),o=r(5656),a=r(1236).f,s=r(9781);n({target:"Object",stat:!0,forced:!s||i((function(){a(1)})),sham:!s},{getOwnPropertyDescriptor:function(t,e){return a(o(t),e)}})},9337:(t,e,r)=>{var n=r(2109),i=r(9781),o=r(3887),a=r(5656),s=r(1236),l=r(6135);n({target:"Object",stat:!0,sham:!i},{getOwnPropertyDescriptors:function(t){for(var e,r,n=a(t),i=s.f,c=o(n),u={},h=0;c.length>h;)void 0!==(r=i(n,e=c[h++]))&&l(u,e,r);return u}})},9660:(t,e,r)=>{var n=r(2109),i=r(6293),o=r(7293),a=r(5181),s=r(7908);n({target:"Object",stat:!0,forced:!i||o((function(){a.f(1)}))},{getOwnPropertySymbols:function(t){var e=a.f;return e?e(s(t)):[]}})},489:(t,e,r)=>{var n=r(2109),i=r(7293),o=r(7908),a=r(9518),s=r(8544);n({target:"Object",stat:!0,forced:i((function(){a(1)})),sham:!s},{getPrototypeOf:function(t){return a(o(t))}})},7941:(t,e,r)=>{var n=r(2109),i=r(7908),o=r(1956);n({target:"Object",stat:!0,forced:r(7293)((function(){o(1)}))},{keys:function(t){return o(i(t))}})},8304:(t,e,r)=>{r(2109)({target:"Object",stat:!0},{setPrototypeOf:r(7674)})},1539:(t,e,r)=>{var n=r(1694),i=r(8052),o=r(288);n||i(Object.prototype,"toString",o,{unsafe:!0})},6833:(t,e,r)=>{var n=r(2109),i=r(4699).values;n({target:"Object",stat:!0},{values:function(t){return i(t)}})},4678:(t,e,r)=>{var n=r(2109),i=r(2814);n({global:!0,forced:parseFloat!=i},{parseFloat:i})},1058:(t,e,r)=>{var n=r(2109),i=r(3009);n({global:!0,forced:parseInt!=i},{parseInt:i})},821:(t,e,r)=>{"use strict";var n=r(2109),i=r(6916),o=r(9662),a=r(8523),s=r(2534),l=r(408);n({target:"Promise",stat:!0,forced:r(612)},{all:function(t){var e=this,r=a.f(e),n=r.resolve,c=r.reject,u=s((function(){var r=o(e.resolve),a=[],s=0,u=1;l(t,(function(t){var o=s++,l=!1;u++,i(r,e,t).then((function(t){l||(l=!0,a[o]=t,--u||n(a))}),c)})),--u||n(a)}));return u.error&&c(u.value),r.promise}})},4164:(t,e,r)=>{"use strict";var n=r(2109),i=r(1913),o=r(3702).CONSTRUCTOR,a=r(2492),s=r(5005),l=r(614),c=r(8052),u=a&&a.prototype;if(n({target:"Promise",proto:!0,forced:o,real:!0},{catch:function(t){return this.then(void 0,t)}}),!i&&l(a)){var h=s("Promise").prototype.catch;u.catch!==h&&c(u,"catch",h,{unsafe:!0})}},3401:(t,e,r)=>{"use strict";var n,i,o,a=r(2109),s=r(1913),l=r(5268),c=r(7854),u=r(6916),h=r(8052),p=r(7674),d=r(8003),f=r(6340),y=r(9662),m=r(614),v=r(111),b=r(5787),g=r(6707),w=r(261).set,_=r(5948),k=r(842),j=r(2534),O=r(8572),x=r(9909),C=r(2492),E=r(3702),S=r(8523),P="Promise",T=E.CONSTRUCTOR,L=E.REJECTION_EVENT,R=E.SUBCLASSING,A=x.getterFor(P),I=x.set,B=C&&C.prototype,N=C,D=B,F=c.TypeError,V=c.document,z=c.process,H=S.f,M=H,q=!!(V&&V.createEvent&&c.dispatchEvent),G="unhandledrejection",U=function(t){var e;return!(!v(t)||!m(e=t.then))&&e},$=function(t,e){var r,n,i,o=e.value,a=1==e.state,s=a?t.ok:t.fail,l=t.resolve,c=t.reject,h=t.domain;try{s?(a||(2===e.rejection&&Q(e),e.rejection=1),!0===s?r=o:(h&&h.enter(),r=s(o),h&&(h.exit(),i=!0)),r===t.promise?c(F("Promise-chain cycle")):(n=U(r))?u(n,r,l,c):l(r)):c(o)}catch(t){h&&!i&&h.exit(),c(t)}},J=function(t,e){t.notified||(t.notified=!0,_((function(){for(var r,n=t.reactions;r=n.get();)$(r,t);t.notified=!1,e&&!t.rejection&&Z(t)})))},W=function(t,e,r){var n,i;q?((n=V.createEvent("Event")).promise=e,n.reason=r,n.initEvent(t,!1,!0),c.dispatchEvent(n)):n={promise:e,reason:r},!L&&(i=c["on"+t])?i(n):t===G&&k("Unhandled promise rejection",r)},Z=function(t){u(w,c,(function(){var e,r=t.facade,n=t.value;if(Y(t)&&(e=j((function(){l?z.emit("unhandledRejection",n,r):W(G,r,n)})),t.rejection=l||Y(t)?2:1,e.error))throw e.value}))},Y=function(t){return 1!==t.rejection&&!t.parent},Q=function(t){u(w,c,(function(){var e=t.facade;l?z.emit("rejectionHandled",e):W("rejectionhandled",e,t.value)}))},K=function(t,e,r){return function(n){t(e,n,r)}},X=function(t,e,r){t.done||(t.done=!0,r&&(t=r),t.value=e,t.state=2,J(t,!0))},tt=function(t,e,r){if(!t.done){t.done=!0,r&&(t=r);try{if(t.facade===e)throw F("Promise can't be resolved itself");var n=U(e);n?_((function(){var r={done:!1};try{u(n,e,K(tt,r,t),K(X,r,t))}catch(e){X(r,e,t)}})):(t.value=e,t.state=1,J(t,!1))}catch(e){X({done:!1},e,t)}}};if(T&&(D=(N=function(t){b(this,D),y(t),u(n,this);var e=A(this);try{t(K(tt,e),K(X,e))}catch(t){X(e,t)}}).prototype,(n=function(t){I(this,{type:P,done:!1,notified:!1,parent:!1,reactions:new O,rejection:!1,state:0,value:void 0})}).prototype=h(D,"then",(function(t,e){var r=A(this),n=H(g(this,N));return r.parent=!0,n.ok=!m(t)||t,n.fail=m(e)&&e,n.domain=l?z.domain:void 0,0==r.state?r.reactions.add(n):_((function(){$(n,r)})),n.promise})),i=function(){var t=new n,e=A(t);this.promise=t,this.resolve=K(tt,e),this.reject=K(X,e)},S.f=H=function(t){return t===N||void 0===t?new i(t):M(t)},!s&&m(C)&&B!==Object.prototype)){o=B.then,R||h(B,"then",(function(t,e){var r=this;return new N((function(t,e){u(o,r,t,e)})).then(t,e)}),{unsafe:!0});try{delete B.constructor}catch(t){}p&&p(B,D)}a({global:!0,constructor:!0,wrap:!0,forced:T},{Promise:N}),d(N,P,!1,!0),f(P)},8674:(t,e,r)=>{r(3401),r(821),r(4164),r(6027),r(683),r(6294)},6027:(t,e,r)=>{"use strict";var n=r(2109),i=r(6916),o=r(9662),a=r(8523),s=r(2534),l=r(408);n({target:"Promise",stat:!0,forced:r(612)},{race:function(t){var e=this,r=a.f(e),n=r.reject,c=s((function(){var a=o(e.resolve);l(t,(function(t){i(a,e,t).then(r.resolve,n)}))}));return c.error&&n(c.value),r.promise}})},683:(t,e,r)=>{"use strict";var n=r(2109),i=r(6916),o=r(8523);n({target:"Promise",stat:!0,forced:r(3702).CONSTRUCTOR},{reject:function(t){var e=o.f(this);return i(e.reject,void 0,t),e.promise}})},6294:(t,e,r)=>{"use strict";var n=r(2109),i=r(5005),o=r(1913),a=r(2492),s=r(3702).CONSTRUCTOR,l=r(9478),c=i("Promise"),u=o&&!s;n({target:"Promise",stat:!0,forced:o||s},{resolve:function(t){return l(u&&this===c?a:this,t)}})},2419:(t,e,r)=>{var n=r(2109),i=r(5005),o=r(2104),a=r(7065),s=r(9483),l=r(9670),c=r(111),u=r(30),h=r(7293),p=i("Reflect","construct"),d=Object.prototype,f=[].push,y=h((function(){function t(){}return!(p((function(){}),[],t)instanceof t)})),m=!h((function(){p((function(){}))})),v=y||m;n({target:"Reflect",stat:!0,forced:v,sham:v},{construct:function(t,e){s(t),l(e);var r=arguments.length<3?t:s(arguments[2]);if(m&&!y)return p(t,e,r);if(t==r){switch(e.length){case 0:return new t;case 1:return new t(e[0]);case 2:return new t(e[0],e[1]);case 3:return new t(e[0],e[1],e[2]);case 4:return new t(e[0],e[1],e[2],e[3])}var n=[null];return o(f,n,e),new(o(a,t,n))}var i=r.prototype,h=u(c(i)?i:d),v=o(t,h,e);return c(v)?v:h}})},4819:(t,e,r)=>{var n=r(2109),i=r(6916),o=r(111),a=r(9670),s=r(5032),l=r(1236),c=r(9518);n({target:"Reflect",stat:!0},{get:function t(e,r){var n,u,h=arguments.length<3?e:arguments[2];return a(e)===h?e[r]:(n=l.f(e,r))?s(n)?n.value:void 0===n.get?void 0:i(n.get,h):o(u=c(e))?t(u,r,h):void 0}})},4603:(t,e,r)=>{var n=r(9781),i=r(7854),o=r(1702),a=r(4705),s=r(9587),l=r(8880),c=r(8006).f,u=r(7976),h=r(7850),p=r(1340),d=r(4706),f=r(2999),y=r(2626),m=r(8052),v=r(7293),b=r(2597),g=r(9909).enforce,w=r(6340),_=r(5112),k=r(9441),j=r(7168),O=_("match"),x=i.RegExp,C=x.prototype,E=i.SyntaxError,S=o(C.exec),P=o("".charAt),T=o("".replace),L=o("".indexOf),R=o("".slice),A=/^\?<[^\s\d!#%&*+<=>@^][^\s!#%&*+<=>@^]*>/,I=/a/g,B=/a/g,N=new x(I)!==I,D=f.MISSED_STICKY,F=f.UNSUPPORTED_Y;if(a("RegExp",n&&(!N||D||k||j||v((function(){return B[O]=!1,x(I)!=I||x(B)==B||"/a/i"!=x(I,"i")}))))){for(var V=function(t,e){var r,n,i,o,a,c,f=u(C,this),y=h(t),m=void 0===e,v=[],w=t;if(!f&&y&&m&&t.constructor===V)return t;if((y||u(C,t))&&(t=t.source,m&&(e=d(w))),t=void 0===t?"":p(t),e=void 0===e?"":p(e),w=t,k&&"dotAll"in I&&(n=!!e&&L(e,"s")>-1)&&(e=T(e,/s/g,"")),r=e,D&&"sticky"in I&&(i=!!e&&L(e,"y")>-1)&&F&&(e=T(e,/y/g,"")),j&&(o=function(t){for(var e,r=t.length,n=0,i="",o=[],a={},s=!1,l=!1,c=0,u="";n<=r;n++){if("\\"===(e=P(t,n)))e+=P(t,++n);else if("]"===e)s=!1;else if(!s)switch(!0){case"["===e:s=!0;break;case"("===e:S(A,R(t,n+1))&&(n+=2,l=!0),i+=e,c++;continue;case">"===e&&l:if(""===u||b(a,u))throw new E("Invalid capture group name");a[u]=!0,o[o.length]=[u,c],l=!1,u="";continue}l?u+=e:i+=e}return[i,o]}(t),t=o[0],v=o[1]),a=s(x(t,e),f?this:C,V),(n||i||v.length)&&(c=g(a),n&&(c.dotAll=!0,c.raw=V(function(t){for(var e,r=t.length,n=0,i="",o=!1;n<=r;n++)"\\"!==(e=P(t,n))?o||"."!==e?("["===e?o=!0:"]"===e&&(o=!1),i+=e):i+="[\\s\\S]":i+=e+P(t,++n);return i}(t),r)),i&&(c.sticky=!0),v.length&&(c.groups=v)),t!==w)try{l(a,"source",""===w?"(?:)":w)}catch(t){}return a},z=c(x),H=0;z.length>H;)y(V,x,z[H++]);C.constructor=V,V.prototype=C,m(i,"RegExp",V,{constructor:!0})}w("RegExp")},4916:(t,e,r)=>{"use strict";var n=r(2109),i=r(2261);n({target:"RegExp",proto:!0,forced:/./.exec!==i},{exec:i})},9714:(t,e,r)=>{"use strict";var n=r(6530).PROPER,i=r(8052),o=r(9670),a=r(1340),s=r(7293),l=r(4706),c="toString",u=RegExp.prototype[c],h=s((function(){return"/a/b"!=u.call({source:"a",flags:"b"})})),p=n&&u.name!=c;(h||p)&&i(RegExp.prototype,c,(function(){var t=o(this);return"/"+a(t.source)+"/"+a(l(t))}),{unsafe:!0})},2023:(t,e,r)=>{"use strict";var n=r(2109),i=r(1702),o=r(3929),a=r(4488),s=r(1340),l=r(4964),c=i("".indexOf);n({target:"String",proto:!0,forced:!l("includes")},{includes:function(t){return!!~c(s(a(this)),s(o(t)),arguments.length>1?arguments[1]:void 0)}})},8783:(t,e,r)=>{"use strict";var n=r(8710).charAt,i=r(1340),o=r(9909),a=r(1656),s=r(6178),l="String Iterator",c=o.set,u=o.getterFor(l);a(String,"String",(function(t){c(this,{type:l,string:i(t),index:0})}),(function(){var t,e=u(this),r=e.string,i=e.index;return i>=r.length?s(void 0,!0):(t=n(r,i),e.index+=t.length,s(t,!1))}))},4723:(t,e,r)=>{"use strict";var n=r(6916),i=r(7007),o=r(9670),a=r(8554),s=r(7466),l=r(1340),c=r(4488),u=r(8173),h=r(1530),p=r(7651);i("match",(function(t,e,r){return[function(e){var r=c(this),i=a(e)?void 0:u(e,t);return i?n(i,e,r):new RegExp(e)[t](l(r))},function(t){var n=o(this),i=l(t),a=r(e,n,i);if(a.done)return a.value;if(!n.global)return p(n,i);var c=n.unicode;n.lastIndex=0;for(var u,d=[],f=0;null!==(u=p(n,i));){var y=l(u[0]);d[f]=y,""===y&&(n.lastIndex=h(i,s(n.lastIndex),c)),f++}return 0===f?null:d}]}))},5306:(t,e,r)=>{"use strict";var n=r(2104),i=r(6916),o=r(1702),a=r(7007),s=r(7293),l=r(9670),c=r(614),u=r(8554),h=r(9303),p=r(7466),d=r(1340),f=r(4488),y=r(1530),m=r(8173),v=r(647),b=r(7651),g=r(5112)("replace"),w=Math.max,_=Math.min,k=o([].concat),j=o([].push),O=o("".indexOf),x=o("".slice),C="$0"==="a".replace(/./,"$0"),E=!!/./[g]&&""===/./[g]("a","$0");a("replace",(function(t,e,r){var o=E?"$":"$0";return[function(t,r){var n=f(this),o=u(t)?void 0:m(t,g);return o?i(o,t,n,r):i(e,d(n),t,r)},function(t,i){var a=l(this),s=d(t);if("string"==typeof i&&-1===O(i,o)&&-1===O(i,"$<")){var u=r(e,a,s,i);if(u.done)return u.value}var f=c(i);f||(i=d(i));var m=a.global;if(m){var g=a.unicode;a.lastIndex=0}for(var C=[];;){var E=b(a,s);if(null===E)break;if(j(C,E),!m)break;""===d(E[0])&&(a.lastIndex=y(s,p(a.lastIndex),g))}for(var S,P="",T=0,L=0;L<C.length;L++){for(var R=d((E=C[L])[0]),A=w(_(h(E.index),s.length),0),I=[],B=1;B<E.length;B++)j(I,void 0===(S=E[B])?S:String(S));var N=E.groups;if(f){var D=k([R],I,A,s);void 0!==N&&j(D,N);var F=d(n(i,void 0,D))}else F=v(R,s,A,I,N,i);A>=T&&(P+=x(s,T,A)+F,T=A+R.length)}return P+x(s,T)}]}),!!s((function(){var t=/./;return t.exec=function(){var t=[];return t.groups={a:"7"},t},"7"!=="".replace(t,"$<a>")}))||!C||E)},6755:(t,e,r)=>{"use strict";var n,i=r(2109),o=r(1470),a=r(1236).f,s=r(7466),l=r(1340),c=r(3929),u=r(4488),h=r(4964),p=r(1913),d=o("".startsWith),f=o("".slice),y=Math.min,m=h("startsWith");i({target:"String",proto:!0,forced:!(!p&&!m&&(n=a(String.prototype,"startsWith"),n&&!n.writable)||m)},{startsWith:function(t){var e=l(u(this));c(t);var r=s(y(arguments.length>1?arguments[1]:void 0,e.length)),n=l(t);return d?d(e,n,r):f(e,r,r+n.length)===n}})},3210:(t,e,r)=>{"use strict";var n=r(2109),i=r(3111).trim;n({target:"String",proto:!0,forced:r(6091)("trim")},{trim:function(){return i(this)}})},2443:(t,e,r)=>{r(6800)("asyncIterator")},4032:(t,e,r)=>{"use strict";var n=r(2109),i=r(7854),o=r(6916),a=r(1702),s=r(1913),l=r(9781),c=r(6293),u=r(7293),h=r(2597),p=r(7976),d=r(9670),f=r(5656),y=r(4948),m=r(1340),v=r(9114),b=r(30),g=r(1956),w=r(8006),_=r(1156),k=r(5181),j=r(1236),O=r(3070),x=r(6048),C=r(5296),E=r(8052),S=r(7045),P=r(2309),T=r(6200),L=r(3501),R=r(9711),A=r(5112),I=r(6061),B=r(6800),N=r(6532),D=r(8003),F=r(9909),V=r(2092).forEach,z=T("hidden"),H="Symbol",M="prototype",q=F.set,G=F.getterFor(H),U=Object[M],$=i.Symbol,J=$&&$[M],W=i.TypeError,Z=i.QObject,Y=j.f,Q=O.f,K=_.f,X=C.f,tt=a([].push),et=P("symbols"),rt=P("op-symbols"),nt=P("wks"),it=!Z||!Z[M]||!Z[M].findChild,ot=l&&u((function(){return 7!=b(Q({},"a",{get:function(){return Q(this,"a",{value:7}).a}})).a}))?function(t,e,r){var n=Y(U,e);n&&delete U[e],Q(t,e,r),n&&t!==U&&Q(U,e,n)}:Q,at=function(t,e){var r=et[t]=b(J);return q(r,{type:H,tag:t,description:e}),l||(r.description=e),r},st=function(t,e,r){t===U&&st(rt,e,r),d(t);var n=y(e);return d(r),h(et,n)?(r.enumerable?(h(t,z)&&t[z][n]&&(t[z][n]=!1),r=b(r,{enumerable:v(0,!1)})):(h(t,z)||Q(t,z,v(1,{})),t[z][n]=!0),ot(t,n,r)):Q(t,n,r)},lt=function(t,e){d(t);var r=f(e),n=g(r).concat(pt(r));return V(n,(function(e){l&&!o(ct,r,e)||st(t,e,r[e])})),t},ct=function(t){var e=y(t),r=o(X,this,e);return!(this===U&&h(et,e)&&!h(rt,e))&&(!(r||!h(this,e)||!h(et,e)||h(this,z)&&this[z][e])||r)},ut=function(t,e){var r=f(t),n=y(e);if(r!==U||!h(et,n)||h(rt,n)){var i=Y(r,n);return!i||!h(et,n)||h(r,z)&&r[z][n]||(i.enumerable=!0),i}},ht=function(t){var e=K(f(t)),r=[];return V(e,(function(t){h(et,t)||h(L,t)||tt(r,t)})),r},pt=function(t){var e=t===U,r=K(e?rt:f(t)),n=[];return V(r,(function(t){!h(et,t)||e&&!h(U,t)||tt(n,et[t])})),n};c||(E(J=($=function(){if(p(J,this))throw W("Symbol is not a constructor");var t=arguments.length&&void 0!==arguments[0]?m(arguments[0]):void 0,e=R(t),r=function(t){this===U&&o(r,rt,t),h(this,z)&&h(this[z],e)&&(this[z][e]=!1),ot(this,e,v(1,t))};return l&&it&&ot(U,e,{configurable:!0,set:r}),at(e,t)})[M],"toString",(function(){return G(this).tag})),E($,"withoutSetter",(function(t){return at(R(t),t)})),C.f=ct,O.f=st,x.f=lt,j.f=ut,w.f=_.f=ht,k.f=pt,I.f=function(t){return at(A(t),t)},l&&(S(J,"description",{configurable:!0,get:function(){return G(this).description}}),s||E(U,"propertyIsEnumerable",ct,{unsafe:!0}))),n({global:!0,constructor:!0,wrap:!0,forced:!c,sham:!c},{Symbol:$}),V(g(nt),(function(t){B(t)})),n({target:H,stat:!0,forced:!c},{useSetter:function(){it=!0},useSimple:function(){it=!1}}),n({target:"Object",stat:!0,forced:!c,sham:!l},{create:function(t,e){return void 0===e?b(t):lt(b(t),e)},defineProperty:st,defineProperties:lt,getOwnPropertyDescriptor:ut}),n({target:"Object",stat:!0,forced:!c},{getOwnPropertyNames:ht}),N(),D($,H),L[z]=!0},1817:(t,e,r)=>{"use strict";var n=r(2109),i=r(9781),o=r(7854),a=r(1702),s=r(2597),l=r(614),c=r(7976),u=r(1340),h=r(7045),p=r(9920),d=o.Symbol,f=d&&d.prototype;if(i&&l(d)&&(!("description"in f)||void 0!==d().description)){var y={},m=function(){var t=arguments.length<1||void 0===arguments[0]?void 0:u(arguments[0]),e=c(f,this)?new d(t):void 0===t?d():d(t);return""===t&&(y[e]=!0),e};p(m,d),m.prototype=f,f.constructor=m;var v="Symbol(test)"==String(d("test")),b=a(f.valueOf),g=a(f.toString),w=/^Symbol\((.*)\)[^)]+$/,_=a("".replace),k=a("".slice);h(f,"description",{configurable:!0,get:function(){var t=b(this);if(s(y,t))return"";var e=g(t),r=v?k(e,7,-1):_(e,w,"$1");return""===r?void 0:r}}),n({global:!0,constructor:!0,forced:!0},{Symbol:m})}},763:(t,e,r)=>{var n=r(2109),i=r(5005),o=r(2597),a=r(1340),s=r(2309),l=r(2015),c=s("string-to-symbol-registry"),u=s("symbol-to-string-registry");n({target:"Symbol",stat:!0,forced:!l},{for:function(t){var e=a(t);if(o(c,e))return c[e];var r=i("Symbol")(e);return c[e]=r,u[r]=e,r}})},2165:(t,e,r)=>{r(6800)("iterator")},2526:(t,e,r)=>{r(4032),r(763),r(6620),r(8862),r(9660)},6620:(t,e,r)=>{var n=r(2109),i=r(2597),o=r(2190),a=r(6330),s=r(2309),l=r(2015),c=s("symbol-to-string-registry");n({target:"Symbol",stat:!0,forced:!l},{keyFor:function(t){if(!o(t))throw TypeError(a(t)+" is not a symbol");if(i(c,t))return c[t]}})},6649:(t,e,r)=>{var n=r(6800),i=r(6532);n("toPrimitive"),i()},3680:(t,e,r)=>{var n=r(5005),i=r(6800),o=r(8003);i("toStringTag"),o(n("Symbol"),"Symbol")},4747:(t,e,r)=>{var n=r(7854),i=r(8324),o=r(8509),a=r(8533),s=r(8880),l=function(t){if(t&&t.forEach!==a)try{s(t,"forEach",a)}catch(e){t.forEach=a}};for(var c in i)i[c]&&l(n[c]&&n[c].prototype);l(o)},3948:(t,e,r)=>{var n=r(7854),i=r(8324),o=r(8509),a=r(6992),s=r(8880),l=r(5112),c=l("iterator"),u=l("toStringTag"),h=a.values,p=function(t,e){if(t){if(t[c]!==h)try{s(t,c,h)}catch(e){t[c]=h}if(t[u]||s(t,u,e),i[e])for(var r in a)if(t[r]!==a[r])try{s(t,r,a[r])}catch(e){t[r]=a[r]}}};for(var d in i)p(n[d]&&n[d].prototype,d);p(o,"DOMTokenList")},6815:(t,e,r)=>{var n=r(2109),i=r(7854),o=r(7152)(i.setInterval,!0);n({global:!0,bind:!0,forced:i.setInterval!==o},{setInterval:o})},8417:(t,e,r)=>{var n=r(2109),i=r(7854),o=r(7152)(i.setTimeout,!0);n({global:!0,bind:!0,forced:i.setTimeout!==o},{setTimeout:o})},2564:(t,e,r)=>{r(6815),r(8417)}},e={};function r(n){var i=e[n];if(void 0!==i)return i.exports;var o=e[n]={exports:{}};return t[n](o,o.exports,r),o.exports}r.d=(t,e)=>{for(var n in e)r.o(e,n)&&!r.o(t,n)&&Object.defineProperty(t,n,{enumerable:!0,get:e[n]})},r.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(t){if("object"==typeof window)return window}}(),r.o=(t,e)=>Object.prototype.hasOwnProperty.call(t,e),r.r=t=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})};var n={};return(()=>{"use strict";r.r(n),r.d(n,{JSONEditor:()=>ha}),r(3710),r(1539),r(9714),r(5827),r(6833),r(9826),r(9554),r(4747),r(7941),r(2222),r(9601),r(6649),r(6078),r(2526),r(1817),r(9653),r(9070),r(8674),r(2165),r(6992),r(8783),r(3948),r(2443),r(3680),r(3706),r(2703),r(8011),r(489),r(8309),r(8304),r(5069),r(7042),r(9753),r(1038),r(4916),r(9720),r(5306),r(4603),r(6699);var t=["actionscript","batchfile","c","c++","cpp","coffee","csharp","css","dart","django","ejs","erlang","golang","groovy","handlebars","haskell","haxe","html","ini","jade","java","javascript","json","less","lisp","lua","makefile","matlab","mysql","objectivec","pascal","perl","pgsql","php","python","r","ruby","sass","scala","scss","sh","smarty","sql","sqlserver","stylus","svg","twig","vbscript","xml","yaml"],e=[function(t){return"string"===t.type&&"color"===t.format&&"colorpicker"},function(t){return"string"===t.type&&["ip","ipv4","ipv6","hostname"].includes(t.format)&&"ip"},function(e){return"string"===e.type&&t.includes(e.format)&&"ace"},function(t){return"string"===t.type&&["xhtml","bbcode"].includes(t.format)&&"sceditor"},function(t){return"string"===t.type&&"markdown"===t.format&&"simplemde"},function(t){return"string"===t.type&&"jodit"===t.format&&"jodit"},function(t){return"string"===t.type&&"autocomplete"===t.format&&"autocomplete"},function(t){return"string"===t.type&&"uuid"===t.format&&"uuid"},function(t){return"info"===t.format&&"info"},function(t){return"button"===t.format&&"button"},function(t){if(("integer"===t.type||"number"===t.type)&&"stepper"===t.format)return"stepper"},function(t){if(t.links)for(var e=0;e<t.links.length;e++)if(t.links[e].rel&&"describedby"===t.links[e].rel.toLowerCase())return"describedBy"},function(t){return["string","integer"].includes(t.type)&&["starrating","rating"].includes(t.format)&&"starrating"},function(t){return["string","integer"].includes(t.type)&&["date","time","datetime-local"].includes(t.format)&&"datetime"},function(t){return(t.oneOf||t.anyOf)&&"multiple"},function(t){return t.if&&"multiple"},function(t){if("array"===t.type&&t.items&&!Array.isArray(t.items)&&["string","number","integer"].includes(t.items.type)){if("choices"===t.format)return"arrayChoices";if(t.uniqueItems){if("selectize"===t.format)return"arraySelectize";if("select2"===t.format)return"arraySelect2";if(t.items.enum)return"multiselect"}}},function(t){if(t.enum){if("array"===t.type||"object"===t.type)return"enum";if("number"===t.type||"integer"===t.type||"string"===t.type)return"radio"===t.format?"radio":"select2"===t.format?"select2":"selectize"===t.format?"selectize":"choices"===t.format?"choices":"select"}},function(t){if(t.enumSource)return"radio"===t.format?"radio":"select2"===t.format?"select2":"selectize"===t.format?"selectize":"choices"===t.format?"choices":"select"},function(t){return"array"===t.type&&"table"===t.format&&"table"},function(t){return"string"===t.type&&"url"===t.format&&window.FileReader&&t.options&&t.options.upload===Object(t.options.upload)&&"upload"},function(t){return"string"===t.type&&t.media&&"base64"===t.media.binaryEncoding&&"base64"},function(t){return"any"===t.type&&"multiple"},function(t){if("boolean"===t.type)return"checkbox"===t.format||t.options&&t.options.checkbox?"checkbox":"select2"===t.format?"select2":"selectize"===t.format?"selectize":"choices"===t.format?"choices":"select"},function(t){return"string"===t.type&&"signature"===t.format&&"signature"},function(t){return"string"==typeof t.type&&t.type},function(t){return!t.type&&t.properties&&"object"},function(t){return"string"!=typeof t.type&&"multiple"}];function i(t,e,r){return(e=function(t){var e=function(t,e){if("object"!==o(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==o(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(t);return"symbol"===o(e)?e:String(e)}(e))in t?Object.defineProperty(t,e,{value:r,enumerable:!0,configurable:!0,writable:!0}):t[e]=r,t}function o(t){return o="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},o(t)}function a(t){return!(null===t||"object"!==o(t)||t.nodeType||t===t.window||t.constructor&&!h(t.constructor.prototype,"isPrototypeOf"))}function s(t){return a(t)?l({},t):Array.isArray(t)?t.map(s):t}function l(t){for(var e=arguments.length,r=new Array(e>1?e-1:0),n=1;n<e;n++)r[n-1]=arguments[n];return r.forEach((function(e){e&&Object.keys(e).forEach((function(r){e[r]&&a(e[r])?(h(t,r)||(t[r]={}),l(t[r],e[r])):Array.isArray(e[r])?t[r]=s(e[r]):t[r]=e[r]}))})),t}function c(t,e){var r=document.createEvent("HTMLEvents");r.initEvent(e,!0,!0),t.dispatchEvent(r)}function u(t){return t&&("[object ShadowRoot]"===t.toString()?t:u(t.parentNode))}function h(t,e){return t&&Object.prototype.hasOwnProperty.call(t,e)}r(4812),r(2419),r(4819),r(5003),r(4723),r(2023),r(9600),r(6755),r(5212),r(1249),r(4678),r(1058);var p=/^\s*(-|\+)?(\d+|(\d*(\.\d*)))([eE][+-]?\d+)?\s*$/,d=/^\s*(-|\+)?(\d+)\s*$/;function f(){var t=(new Date).getTime();return"undefined"!=typeof performance&&"function"==typeof performance.now&&(t+=performance.now()),"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,(function(e){var r=(t+16*Math.random())%16|0;return t=Math.floor(t/16),("x"===e?r:3&r|8).toString(16)}))}function y(t){return t&&"object"===o(t)&&!Array.isArray(t)}function m(t){for(var e=arguments.length,r=new Array(e>1?e-1:0),n=1;n<e;n++)r[n-1]=arguments[n];if(!r.length)return t;var o=r.shift();if(y(t)&&y(o))for(var a in o)y(o[a])?(t[a]||Object.assign(t,i({},a,{})),m(t[a],o[a])):Object.assign(t,i({},a,o[a]));return m.apply(void 0,[t].concat(r))}function v(t,e){(null==e||e>t.length)&&(e=t.length);for(var r=0,n=new Array(e);r<e;r++)n[r]=t[r];return n}function b(t){return b="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},b(t)}function g(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==b(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==b(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===b(i)?i:String(i)),n)}var i}var w=function(){function t(e,r){!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,t),this.defaults=r,this.jsoneditor=e.jsoneditor,this.theme=this.jsoneditor.theme,this.template_engine=this.jsoneditor.template,this.iconlib=this.jsoneditor.iconlib,this.translate=this.jsoneditor.translate||this.defaults.translate,this.translateProperty=this.jsoneditor.translateProperty||this.defaults.translateProperty,this.original_schema=e.schema,this.schema=this.jsoneditor.expandSchema(this.original_schema),this.active=!0,this.options=l({},this.options||{},this.schema.options||{},e.schema.options||{},e),this.formname=this.jsoneditor.options.form_name_root||"root",e.path||this.schema.id||(this.schema.id=this.formname),this.path=e.path||this.formname,this.formname=e.formname||this.path.replace(/\.([^.]+)/g,"[$1]"),this.parent=e.parent,this.key=void 0!==this.parent?this.path.split(".").slice(this.parent.path.split(".").length).join("."):this.path,this.link_watchers=[],this.watchLoop=!1,e.container&&this.setContainer(e.container),this.registerDependencies()}var e,r;return e=t,r=[{key:"onChildEditorChange",value:function(t){this.onChange(!0)}},{key:"notify",value:function(){this.path&&this.jsoneditor.notifyWatchers(this.path)}},{key:"change",value:function(){this.parent?this.parent.onChildEditorChange(this):this.jsoneditor&&this.jsoneditor.onChange()}},{key:"onChange",value:function(t){this.notify(),this.watch_listener&&this.watch_listener(),t&&this.change()}},{key:"register",value:function(){this.jsoneditor.registerEditor(this),this.onChange()}},{key:"unregister",value:function(){this.jsoneditor&&this.jsoneditor.unregisterEditor(this)}},{key:"getNumColumns",value:function(){return 12}},{key:"isActive",value:function(){return this.active}},{key:"activate",value:function(){this.active=!0,this.optInCheckbox.checked=!0,this.enable(),this.change()}},{key:"deactivate",value:function(){this.isRequired()||(this.active=!1,this.optInCheckbox.checked=!1,this.disable(),this.change())}},{key:"registerDependencies",value:function(){var t=this;this.dependenciesFulfilled=!0;var e=this.options.dependencies;e&&Object.keys(e).forEach((function(e){var r;e.startsWith(t.jsoneditor.root.path)?r=e:((r=t.path.split("."))[r.length-1]=e,r=r.join(".")),t.jsoneditor.watch(r,(function(){t.evaluateDependencies()}))}))}},{key:"evaluateDependencies",value:function(){var t=this,e=this.container||this.control;if(e&&null!==this.jsoneditor){var r=this.options.dependencies;if(r){var n=this.dependenciesFulfilled;this.dependenciesFulfilled=!0,Object.keys(r).forEach((function(e){var n;e.startsWith(t.jsoneditor.root.path)?n=e:((n=t.path.split("."))[n.length-1]=e,n=n.join("."));var i=r[e];t.checkDependency(n,i)})),this.dependenciesFulfilled!==n&&this.notify();var i=this.dependenciesFulfilled?"block":"none";this.options.hidden&&(i="none"),"TD"===e.tagName?Object.keys(e.childNodes).forEach((function(t){return e.childNodes[t].style.display=i})):e.style.display=i}}}},{key:"checkDependency",value:function(t,e){var r=this;if(this.path!==t&&null!==this.jsoneditor){var n=this.jsoneditor.getEditor(t),i=n?n.getValue():void 0;n&&n.dependenciesFulfilled?Array.isArray(e)?this.dependenciesFulfilled=e.some((function(t){if(JSON.stringify(i)===JSON.stringify(t))return!0})):"object"===b(e)?"object"!==b(i)?this.dependenciesFulfilled=e===i:Object.keys(e).some((function(t){return!!h(e,t)&&(h(i,t)&&e[t]===i[t]?void 0:(r.dependenciesFulfilled=!1,!0))})):"string"==typeof e||"number"==typeof e?this.dependenciesFulfilled=this.dependenciesFulfilled&&i===e:"boolean"==typeof e&&(this.dependenciesFulfilled=e?this.dependenciesFulfilled&&(i||i.length>0):this.dependenciesFulfilled&&(!i||0===i.length)):this.dependenciesFulfilled=!1}}},{key:"setContainer",value:function(t){this.container=t,this.setContainerAttributes(),this.schema.id&&this.container.setAttribute("data-schemaid",this.schema.id),this.schema.type&&"string"==typeof this.schema.type&&this.container.setAttribute("data-schematype",this.schema.type),this.container.setAttribute("data-schemapath",this.path)}},{key:"setOptInCheckbox",value:function(t){var e=this;this.optInCheckbox=document.createElement("input"),this.optInCheckbox.setAttribute("type","checkbox"),this.optInCheckbox.setAttribute("style","margin: 0 10px 0 0;"),this.optInCheckbox.classList.add("json-editor-opt-in"),this.optInCheckbox.addEventListener("click",(function(){e.isActive()?e.deactivate():e.activate()}));var r=this.jsoneditor.options.show_opt_in,n=void 0!==this.parent.options.show_opt_in,i=n&&!0===this.parent.options.show_opt_in,o=n&&!1===this.parent.options.show_opt_in;(i||!o&&r||!n&&r)&&this.parent&&"object"===this.parent.schema.type&&!this.isRequired()&&this.header&&(this.header.appendChild(this.optInCheckbox),this.header.insertBefore(this.optInCheckbox,this.header.firstChild))}},{key:"preBuild",value:function(){}},{key:"build",value:function(){}},{key:"postBuild",value:function(){this.setupWatchListeners(),this.addLinks(),this.setValue(this.getDefault(),!0),this.updateHeaderText(),this.register(),this.onWatchedFieldChange()}},{key:"setupWatchListeners",value:function(){var t=this;if(this.watched={},this.schema.vars&&(this.schema.watch=this.schema.vars),this.watched_values={},this.watch_listener=function(){t.refreshWatchedFieldValues()&&t.onWatchedFieldChange()},h(this.schema,"watch")){var e,r,n,i,o,a=this.container.getAttribute("data-schemapath");Object.keys(this.schema.watch).forEach((function(s){if(e=t.schema.watch[s],Array.isArray(e)){if(e.length<2)return;r=[e[0]].concat(e[1].split("."))}else r=e.split("."),t.theme.closest(t.container,'[data-schemaid="'.concat(r[0],'"]'))||r.unshift("#");if("#"===(n=r.shift())&&(n=t.jsoneditor.schema.id||t.jsoneditor.root.formname),!(i=t.theme.closest(t.container,'[data-schemaid="'.concat(n,'"]'))))throw new Error("Could not find ancestor node with id ".concat(n));o="".concat(i.getAttribute("data-schemapath"),".").concat(r.join(".")),a.startsWith(o)&&(t.watchLoop=!0),t.jsoneditor.watch(o,t.watch_listener),t.watched[s]=o}))}this.schema.headerTemplate&&(this.header_template=this.jsoneditor.compileTemplate(this.schema.headerTemplate,this.template_engine))}},{key:"addLinks",value:function(){if(!this.no_link_holder&&(this.link_holder=this.theme.getLinksHolder(),void 0!==this.description?this.description.parentNode.insertBefore(this.link_holder,this.description):this.container.appendChild(this.link_holder),this.schema.links))for(var t=0;t<this.schema.links.length;t++)this.addLink(this.getLink(this.schema.links[t]))}},{key:"onMove",value:function(){}},{key:"getButton",value:function(t,e,r){var n=arguments.length>3&&void 0!==arguments[3]?arguments[3]:[],i="json-editor-btn-".concat(e);e=this.iconlib?this.iconlib.getIcon(e):null,t=this.translate(t,n),r=this.translate(r,n),!e&&r&&(t=r,r=null);var o=this.theme.getButton(t,e,r);return o.classList.add(i),o}},{key:"setButtonText",value:function(t,e,r,n){var i=arguments.length>4&&void 0!==arguments[4]?arguments[4]:[];return r=this.iconlib?this.iconlib.getIcon(r):null,e=this.translate(e,i),n=this.translate(n,i),!r&&n&&(e=n,n=null),this.theme.setButtonText(t,e,r,n)}},{key:"addLink",value:function(t){this.link_holder&&this.link_holder.appendChild(t)}},{key:"getLink",value:function(t){var e,r,n=(t.mediaType||"application/javascript").split("/")[0],i=this.jsoneditor.compileTemplate(t.href,this.template_engine),o=this.jsoneditor.compileTemplate(t.rel?t.rel:t.href,this.template_engine),a=null;if(t.download&&(a=t.download),a&&!0!==a&&(a=this.jsoneditor.compileTemplate(a,this.template_engine)),"image"===n){e=this.theme.getBlockLinkHolder(),(r=document.createElement("a")).setAttribute("target","_blank");var s=document.createElement("img");this.theme.createImageLink(e,r,s),this.link_watchers.push((function(t){var e=i(t),n=o(t);r.setAttribute("href",e),r.setAttribute("title",n||e),s.setAttribute("src",e)}))}else if(["audio","video"].includes(n)){e=this.theme.getBlockLinkHolder(),(r=this.theme.getBlockLink()).setAttribute("target","_blank");var l=document.createElement(n);l.setAttribute("controls","controls"),this.theme.createMediaLink(e,r,l),this.link_watchers.push((function(t){var e=i(t),n=o(t);r.setAttribute("href",e),r.textContent=n||e,l.setAttribute("src",e)}))}else r=e=this.theme.getBlockLink(),e.setAttribute("target","_blank"),e.textContent=t.rel,e.style.display="none",this.link_watchers.push((function(t){var r=i(t),n=o(t);r&&(e.style.display=""),e.setAttribute("href",r),e.textContent=n||r}));return a&&r&&(!0===a?r.setAttribute("download",""):this.link_watchers.push((function(t){r.setAttribute("download",a(t))}))),t.class&&r.classList.add(t.class),e}},{key:"refreshWatchedFieldValues",value:function(){var t=this;if(this.watched_values){var e={},r=!1;return this.watched&&Object.keys(this.watched).forEach((function(n){var i=t.jsoneditor.getEditor(t.watched[n]),o=i?i.getValue():null;t.watched_values[n]!==o&&(r=!0),e[n]=o})),e.self=this.getValue(),this.watched_values.self!==e.self&&(r=!0),this.watched_values=e,r}}},{key:"getWatchedFieldValues",value:function(){return this.watched_values}},{key:"updateHeaderText",value:function(){if(this.header){var t=this.getHeaderText();if(this.header.children.length){for(var e=0;e<this.header.childNodes.length;e++)if(3===this.header.childNodes[e].nodeType){this.header.childNodes[e].nodeValue=this.cleanText(t);break}}else window.DOMPurify?this.header.innerHTML=window.DOMPurify.sanitize(t):this.header.textContent=this.cleanText(t)}}},{key:"getHeaderText",value:function(t){return this.header_text?this.header_text:t?this.translateProperty(this.schema.title):this.getTitle()}},{key:"getPathDepth",value:function(){return this.path.split(".").length}},{key:"cleanText",value:function(t){var e=document.createElement("div");return e.innerHTML=t,e.textContent||e.innerText}},{key:"onWatchedFieldChange",value:function(){var t;if(this.header_template){t=l(this.getWatchedFieldValues(),{key:this.key,i:this.key,i0:1*this.key,i1:1*this.key+1,title:this.getTitle()});var e=this.header_template(t);e!==this.header_text&&(this.header_text=e,this.updateHeaderText(),this.notify())}if(this.link_watchers.length){t=this.getWatchedFieldValues();for(var r=0;r<this.link_watchers.length;r++)this.link_watchers[r](t)}}},{key:"setValue",value:function(t){this.value=t}},{key:"getValue",value:function(){if(this.dependenciesFulfilled)return this.value}},{key:"refreshValue",value:function(){}},{key:"getChildEditors",value:function(){return!1}},{key:"destroy",value:function(){var t=this;this.unregister(this),this.watched&&Object.values(this.watched).forEach((function(e){return t.jsoneditor.unwatch(e,t.watch_listener)})),this.watched=null,this.watched_values=null,this.watch_listener=null,this.header_text=null,this.header_template=null,this.value=null,this.container&&this.container.parentNode&&this.container.parentNode.removeChild(this.container),this.container=null,this.jsoneditor=null,this.schema=null,this.path=null,this.key=null,this.parent=null}},{key:"isDefaultRequired",value:function(){return this.isRequired()||!!this.jsoneditor.options.use_default_values}},{key:"getDefault",value:function(){if(void 0!==this.schema.default)return this.schema.default;if(void 0!==this.schema.enum)return this.schema.enum[0];var t=this.schema.type||this.schema.oneOf;if(t&&Array.isArray(t)&&(t=t[0]),t&&"object"===b(t)&&(t=t.type),t&&Array.isArray(t)&&(t=t[0]),"string"==typeof t){if("number"===t)return this.isDefaultRequired()?0:void 0;if("boolean"===t)return!this.isDefaultRequired()&&void 0;if("integer"===t)return this.isDefaultRequired()?0:void 0;if("string"===t)return this.isDefaultRequired()?"":void 0;if("null"===t)return null;if("object"===t)return{};if("array"===t)return[]}}},{key:"getTitle",value:function(){return this.translateProperty(this.schema.title||this.key)}},{key:"enable",value:function(){this.disabled=!1}},{key:"disable",value:function(){this.disabled=!0}},{key:"isEnabled",value:function(){return!this.disabled}},{key:"isRequired",value:function(){return"boolean"==typeof this.schema.required?this.schema.required:this.parent&&this.parent.schema&&Array.isArray(this.parent.schema.required)?this.parent.schema.required.includes(this.key):!!this.jsoneditor.options.required_by_default}},{key:"getDisplayText",value:function(t){var e=[],r={};t.forEach((function(t){t.title&&(r[t.title]=r[t.title]||0,r[t.title]++),t.description&&(r[t.description]=r[t.description]||0,r[t.description]++),t.format&&(r[t.format]=r[t.format]||0,r[t.format]++),t.type&&(r[t.type]=r[t.type]||0,r[t.type]++)})),t.forEach((function(t){var n;n="string"==typeof t?t:t.title&&r[t.title]<=1?t.title:t.format&&r[t.format]<=1?t.format:t.type&&r[t.type]<=1?t.type:t.description&&r[t.description]<=1?t.description:t.title?t.title:t.format?t.format:t.type?t.type:t.description?t.description:JSON.stringify(t).length<500?JSON.stringify(t):"type",e.push(n)}));var n={};return e.forEach((function(t,i){n[t]=n[t]||0,n[t]++,r[t]>1&&(e[i]="".concat(t," ").concat(n[t]))})),e}},{key:"getValidId",value:function(t){return(t=void 0===t?"":t.toString()).replace(/\s+/g,"-")}},{key:"setInputAttributes",value:function(t){var e=this;if(this.schema.options&&this.schema.options.inputAttributes){var r=this.schema.options.inputAttributes,n=["name","type"].concat(t);Object.keys(r).forEach((function(t){n.includes(t.toLowerCase())||e.input.setAttribute(t,r[t])}))}}},{key:"setContainerAttributes",value:function(){var t=this;if(this.schema.options&&this.schema.options.containerAttributes){var e=this.schema.options.containerAttributes,r=["data-schemapath","data-schematype","data-schemaid"];Object.keys(e).forEach((function(n){r.includes(n.toLowerCase())||t.container.setAttribute(n,e[n])}))}}},{key:"expandCallbacks",value:function(t,e){var r=this,n=this.defaults.callbacks[t];return Object.entries(e).forEach((function(i){var o,a,s=(a=2,function(t){if(Array.isArray(t))return t}(o=i)||function(t,e){var r=null==t?null:"undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(null!=r){var n,i,o,a,s=[],l=!0,c=!1;try{if(o=(r=r.call(t)).next,0===e){if(Object(r)!==r)return;l=!1}else for(;!(l=(n=o.call(r)).done)&&(s.push(n.value),s.length!==e);l=!0);}catch(t){c=!0,i=t}finally{try{if(!l&&null!=r.return&&(a=r.return(),Object(a)!==a))return}finally{if(c)throw i}}return s}}(o,a)||function(t,e){if(t){if("string"==typeof t)return v(t,e);var r=Object.prototype.toString.call(t).slice(8,-1);return"Object"===r&&t.constructor&&(r=t.constructor.name),"Map"===r||"Set"===r?Array.from(t):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?v(t,e):void 0}}(o,a)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()),l=s[0],c=s[1];c===Object(c)?e[l]=r.expandCallbacks(t,c):"string"==typeof c&&"object"===b(n)&&"function"==typeof n[c]&&(e[l]=n[c].bind(null,r))})),e}},{key:"showValidationErrors",value:function(t){}}],r&&g(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),t}();function _(t){return _="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},_(t)}function k(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==_(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==_(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===_(i)?i:String(i)),n)}var i}function j(){return j="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=x(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},j.apply(this,arguments)}function O(t,e){return O=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},O(t,e)}function x(t){return x=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},x(t)}var C=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&O(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=x(n);if(i){var r=x(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===_(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,(r=[{key:"register",value:function(){j(x(a.prototype),"register",this).call(this),this.input&&(this.jsoneditor.options.use_name_attributes&&this.input.setAttribute("name",this.formname),this.input.setAttribute("aria-label",this.formname))}},{key:"unregister",value:function(){j(x(a.prototype),"unregister",this).call(this),this.input&&(this.input.removeAttribute("name"),this.input.removeAttribute("aria-label"))}},{key:"setValue",value:function(t,e,r){if((!this.template||r)&&(this.shouldBeUnset()||null!=t?"object"===_(t)?t=JSON.stringify(t):this.shouldBeUnset()||"string"==typeof t||(t="".concat(t)):t="",t!==this.serialized)){var n=this.sanitize(t);if(this.input.value!==n){if(this.setValueToInputField(n),"range"===this.format){var i=this.control.querySelector("output");i&&(i.value=n)}var o=r||this.getValue()!==t;return this.refreshValue(),e?this.is_dirty=!1:"change"===this.jsoneditor.options.show_errors&&(this.is_dirty=!0),this.adjust_height&&this.adjust_height(this.input),this.onChange(o),{changed:o,value:n}}}}},{key:"setValueToInputField",value:function(t){this.input.value=void 0===t?"":t}},{key:"getNumColumns",value:function(){var t,e=Math.ceil(Math.max(this.getTitle().length,this.schema.maxLength||0,this.schema.minLength||0)/5);return t="textarea"===this.input_type?6:["text","email"].includes(this.input_type)?4:2,Math.min(12,Math.max(e,t))}},{key:"build",value:function(){var t=this;if(this.options.compact||(this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired())),this.schema.description&&(this.description=this.theme.getFormInputDescription(this.translateProperty(this.schema.description))),this.options.infoText&&(this.infoButton=this.theme.getInfoButton(this.translateProperty(this.options.infoText))),this.format=this.schema.format,!this.format&&this.schema.media&&this.schema.media.type&&(this.format=this.schema.media.type.replace(/(^(application|text)\/(x-)?(script\.)?)|(-source$)/g,"")),!this.format&&this.options.default_format&&(this.format=this.options.default_format),this.options.format&&(this.format=this.options.format),this.format)if("textarea"===this.format)this.input_type="textarea",this.input=this.theme.getTextareaInput();else if("range"===this.format){this.input_type="range";var e=this.schema.minimum||0,r=this.schema.maximum||Math.max(100,e+1),n=1;this.schema.multipleOf&&(e%this.schema.multipleOf&&(e=Math.ceil(e/this.schema.multipleOf)*this.schema.multipleOf),r%this.schema.multipleOf&&(r=Math.floor(r/this.schema.multipleOf)*this.schema.multipleOf),n=this.schema.multipleOf),this.input=this.theme.getRangeInput(e,r,n)}else this.input_type="text",["button","checkbox","color","date","datetime-local","email","file","hidden","image","month","number","password","radio","reset","search","submit","tel","text","time","url","week"].includes(this.format)&&(this.input_type=this.format),this.input=this.theme.getFormInputField(this.input_type);else this.input_type="text",this.input=this.theme.getFormInputField(this.input_type);void 0!==this.schema.maxLength&&this.input.setAttribute("maxlength",this.schema.maxLength),void 0!==this.schema.pattern?this.input.setAttribute("pattern",this.schema.pattern):void 0!==this.schema.minLength&&this.input.setAttribute("pattern",".{".concat(this.schema.minLength,",}")),this.options.compact?this.container.classList.add("compact"):this.options.input_width&&(this.input.style.width=this.options.input_width),(this.schema.readOnly||this.schema.readonly||this.schema.template)&&(this.disable(!0),this.input.setAttribute("readonly","true")),this.setInputAttributes(["maxlength","pattern","readonly","min","max","step"]),this.input.addEventListener("change",(function(e){if(e.preventDefault(),e.stopPropagation(),t.schema.template)e.currentTarget.value=t.value;else{var r=e.currentTarget.value,n=t.sanitize(r);r!==n&&(e.currentTarget.value=n),t.is_dirty=!0,t.refreshValue(),t.onChange(!0)}})),this.options.input_height&&(this.input.style.height=this.options.input_height),this.options.expand_height&&(this.adjust_height=function(t){if(t){var e,r=t.offsetHeight;if(t.offsetHeight<t.scrollHeight)for(e=0;t.offsetHeight<t.scrollHeight+3&&!(e>100);)e++,r++,t.style.height="".concat(r,"px");else{for(e=0;t.offsetHeight>=t.scrollHeight+3&&!(e>100);)e++,r--,t.style.height="".concat(r,"px");t.style.height="".concat(r+1,"px")}}},this.input.addEventListener("keyup",(function(e){t.adjust_height(e.currentTarget)})),this.input.addEventListener("change",(function(e){t.adjust_height(e.currentTarget)})),this.adjust_height()),this.format&&this.input.setAttribute("data-schemaformat",this.format);var i=this.input;if("range"===this.format&&(i=this.theme.getRangeControl(this.input,this.theme.getRangeOutput(this.input,this.schema.default||Math.max(this.schema.minimum||0,0)))),this.control=this.theme.getFormControl(this.label,i,this.description,this.infoButton,this.formname),this.container.appendChild(this.control),window.requestAnimationFrame((function(){t.input.parentNode&&t.afterInputReady(),t.adjust_height&&t.adjust_height(t.input),"range"===t.format&&(t.control.querySelector("output").value=t.input.value)})),this.schema.template){var o=this.expandCallbacks("template",{template:this.schema.template});"function"==typeof o.template?this.template=o.template:this.template=this.jsoneditor.compileTemplate(this.schema.template,this.template_engine),this.refreshValue()}else this.refreshValue()}},{key:"setupCleave",value:function(t){var e=this.expandCallbacks("cleave",l({},this.defaults.options.cleave||{},this.options.cleave||{}));"object"===_(e)&&Object.keys(e).length>0&&(this.cleave_instance=new window.Cleave(t,e))}},{key:"setupImask",value:function(t){var e=this.expandCallbacks("imask",l({},this.defaults.options.imask||{},this.options.imask||{}));"object"===_(e)&&Object.keys(e).length>0&&(this.imask_instance=window.IMask(t,this.ajustIMaskOptions(e)))}},{key:"ajustIMaskOptions",value:function(t){var e=this;return Object.keys(t).forEach((function(r){if(t[r]===Object(t[r]))t[r]=e.ajustIMaskOptions(t[r]);else if("mask"===r)if("regex:"===t[r].substr(0,6)){var n=t[r].match(/^regex:\/(.*)\/([gimsuy]*)$/);if(null!==n)try{t[r]=new RegExp(n[1],n[2])}catch(t){}}else t[r]=e.getGlobalPropertyFromString(t[r])})),t}},{key:"getGlobalPropertyFromString",value:function(t){if(t.includes(".")){var e=t.split("."),r=e[0],n=e[1];if(void 0!==window[r]&&void 0!==window[r][n])return window[r][n]}else if(void 0!==window[t])return window[t];return t}},{key:"shouldBeUnset",value:function(){return!this.jsoneditor.options.use_default_values&&!this.is_dirty}},{key:"getValue",value:function(){var t=!(!this.input||!this.input.value);if(!this.shouldBeUnset()||t)return this.imask_instance&&this.dependenciesFulfilled&&this.options.imask.returnUnmasked?this.imask_instance.unmaskedValue:j(x(a.prototype),"getValue",this).call(this)}},{key:"enable",value:function(){this.always_disabled||(this.input.disabled=!1,j(x(a.prototype),"enable",this).call(this))}},{key:"disable",value:function(t){t&&(this.always_disabled=!0),this.input.disabled=!0,j(x(a.prototype),"disable",this).call(this)}},{key:"afterInputReady",value:function(){this.theme.afterInputReady(this.input),window.Cleave&&!this.cleave_instance?this.setupCleave(this.input):window.IMask&&!this.imask_instance&&this.setupImask(this.input)}},{key:"refreshValue",value:function(){this.value=this.input.value,"string"==typeof this.value||this.shouldBeUnset()||(this.value=""),this.serialized=this.value}},{key:"destroy",value:function(){this.cleave_instance&&this.cleave_instance.destroy(),this.imask_instance&&this.imask_instance.destroy(),this.template=null,this.input&&this.input.parentNode&&this.input.parentNode.removeChild(this.input),this.label&&this.label.parentNode&&this.label.parentNode.removeChild(this.label),this.description&&this.description.parentNode&&this.description.parentNode.removeChild(this.description),j(x(a.prototype),"destroy",this).call(this)}},{key:"sanitize",value:function(t){return t}},{key:"onWatchedFieldChange",value:function(){var t;this.template&&(t=this.getWatchedFieldValues(),this.setValue(this.template(t),!1,!0)),j(x(a.prototype),"onWatchedFieldChange",this).call(this)}},{key:"showValidationErrors",value:function(t){var e=this;if("always"===this.jsoneditor.options.show_errors);else if(!this.is_dirty&&this.previous_error_setting===this.jsoneditor.options.show_errors)return;this.previous_error_setting=this.jsoneditor.options.show_errors;var r=t.reduce((function(t,r){return r.path===e.path&&t.push(r.message),t}),[]);r.length?this.theme.addInputError(this.input,"".concat(r.join(". "),".")):this.theme.removeInputError(this.input)}}])&&k(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(w);function E(t){return E="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},E(t)}function S(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==E(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==E(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===E(i)?i:String(i)),n)}var i}function P(){return P="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=L(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},P.apply(this,arguments)}function T(t,e){return T=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},T(t,e)}function L(t){return L=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},L(t)}var R=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&T(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=L(n);if(i){var r=L(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===E(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,(r=[{key:"setValue",value:function(t,e,r){var n=P(L(a.prototype),"setValue",this).call(this,t,e,r);void 0!==n&&n.changed&&this.ace_editor_instance&&(this.ace_editor_instance.setValue(n.value),this.ace_editor_instance.session.getSelection().clearSelection(),this.ace_editor_instance.resize())}},{key:"build",value:function(){this.options.format="textarea",P(L(a.prototype),"build",this).call(this),this.input_type=this.schema.format,this.input.setAttribute("data-schemaformat",this.input_type)}},{key:"afterInputReady",value:function(){var t,e=this;if(window.ace){var r=this.input_type;"cpp"!==r&&"c++"!==r&&"c"!==r||(r="c_cpp"),t=this.expandCallbacks("ace",l({},{selectionStyle:"text",minLines:30,maxLines:30},this.defaults.options.ace||{},this.options.ace||{},{mode:"ace/mode/".concat(r)})),this.ace_container=document.createElement("div"),this.ace_container.style.width="100%",this.ace_container.style.position="relative",this.input.parentNode.insertBefore(this.ace_container,this.input),this.input.style.display="none",this.ace_editor_instance=window.ace.edit(this.ace_container,t),this.ace_editor_instance.setValue(this.getValue()),this.ace_editor_instance.session.getSelection().clearSelection(),this.ace_editor_instance.resize(),(this.schema.readOnly||this.schema.readonly||this.schema.template)&&this.ace_editor_instance.setReadOnly(!0),this.ace_editor_instance.on("change",(function(){e.input.value=e.ace_editor_instance.getValue(),e.refreshValue(),e.is_dirty=!0,e.onChange(!0)})),this.theme.afterInputReady(this.input)}else P(L(a.prototype),"afterInputReady",this).call(this)}},{key:"getNumColumns",value:function(){return 6}},{key:"enable",value:function(){!this.always_disabled&&this.ace_editor_instance&&this.ace_editor_instance.setReadOnly(!1),P(L(a.prototype),"enable",this).call(this)}},{key:"disable",value:function(t){this.ace_editor_instance&&this.ace_editor_instance.setReadOnly(!0),P(L(a.prototype),"disable",this).call(this,t)}},{key:"destroy",value:function(){this.ace_editor_instance&&(this.ace_editor_instance.destroy(),this.ace_editor_instance=null),P(L(a.prototype),"destroy",this).call(this)}}])&&S(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(C);function A(t){return A="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},A(t)}function I(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==A(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==A(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===A(i)?i:String(i)),n)}var i}function B(){return B="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=D(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},B.apply(this,arguments)}function N(t,e){return N=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},N(t,e)}function D(t){return D=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},D(t)}r(7327);var F=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&N(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=D(n);if(i){var r=D(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===A(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,r=[{key:"askConfirmation",value:function(){return!0!==this.jsoneditor.options.prompt_before_delete||!1!==window.confirm(this.translate("button_delete_node_warning"))}},{key:"getDefault",value:function(){return this.schema.default||[]}},{key:"register",value:function(){B(D(a.prototype),"register",this).call(this),this.rows&&this.rows.forEach((function(t){return t.register()}))}},{key:"unregister",value:function(){B(D(a.prototype),"unregister",this).call(this),this.rows&&this.rows.forEach((function(t){return t.unregister()}))}},{key:"getNumColumns",value:function(){var t=this.getItemInfo(0);return this.tabs_holder&&"tabs-top"!==this.schema.format?Math.max(Math.min(12,t.width+2),4):t.width}},{key:"enable",value:function(){var t=this;this.always_disabled||(this.setAvailability(this,!1),this.rows&&this.rows.forEach((function(e){e.enable(),t.setAvailability(e,!1)})),B(D(a.prototype),"enable",this).call(this))}},{key:"disable",value:function(t){var e=this;t&&(this.always_disabled=!0),this.setAvailability(this,!0),this.rows&&this.rows.forEach((function(r){r.disable(t),e.setAvailability(r,!0)})),B(D(a.prototype),"disable",this).call(this)}},{key:"setAvailability",value:function(t,e){t.add_row_button&&(t.add_row_button.disabled=e),t.remove_all_rows_button&&(t.remove_all_rows_button.disabled=e),t.delete_last_row_button&&(t.delete_last_row_button.disabled=e),t.copy_button&&(t.copy_button.disabled=e),t.delete_button&&(t.delete_button.disabled=e),t.moveup_button&&(t.moveup_button.disabled=e),t.movedown_button&&(t.movedown_button.disabled=e)}},{key:"preBuild",value:function(){B(D(a.prototype),"preBuild",this).call(this),this.rows=[],this.row_cache=[],this.hide_delete_buttons=this.options.disable_array_delete||this.jsoneditor.options.disable_array_delete,this.hide_delete_all_rows_buttons=this.hide_delete_buttons||this.options.disable_array_delete_all_rows||this.jsoneditor.options.disable_array_delete_all_rows,this.hide_delete_last_row_buttons=this.hide_delete_buttons||this.options.disable_array_delete_last_row||this.jsoneditor.options.disable_array_delete_last_row,this.hide_move_buttons=this.options.disable_array_reorder||this.jsoneditor.options.disable_array_reorder,this.hide_add_button=this.options.disable_array_add||this.jsoneditor.options.disable_array_add,this.show_copy_button=this.options.enable_array_copy||this.jsoneditor.options.enable_array_copy,this.array_controls_top=this.options.array_controls_top||this.jsoneditor.options.array_controls_top}},{key:"build",value:function(){this.options.compact?(this.title=this.theme.getHeader("",this.getPathDepth()),this.container.appendChild(this.title),this.panel=this.theme.getIndentedPanel(),this.container.appendChild(this.panel),this.title_controls=this.theme.getHeaderButtonHolder(),this.title.appendChild(this.title_controls),this.controls=this.theme.getHeaderButtonHolder(),this.title.appendChild(this.controls),this.row_holder=document.createElement("div"),this.panel.appendChild(this.row_holder)):(this.header=document.createElement("label"),this.header.textContent=this.getTitle(),this.title=this.theme.getHeader(this.header,this.getPathDepth()),this.container.appendChild(this.title),this.options.infoText&&(this.infoButton=this.theme.getInfoButton(this.translateProperty(this.options.infoText)),this.container.appendChild(this.infoButton)),this.title_controls=this.theme.getHeaderButtonHolder(),this.title.appendChild(this.title_controls),this.schema.description&&(this.description=this.theme.getDescription(this.translateProperty(this.schema.description)),this.container.appendChild(this.description)),this.error_holder=document.createElement("div"),this.container.appendChild(this.error_holder),"tabs-top"===this.schema.format?(this.controls=this.theme.getHeaderButtonHolder(),this.title.appendChild(this.controls),this.tabs_holder=this.theme.getTopTabHolder(this.getValidId(this.getItemTitle())),this.container.appendChild(this.tabs_holder),this.row_holder=this.theme.getTopTabContentHolder(this.tabs_holder),this.active_tab=null):"tabs"===this.schema.format?(this.controls=this.theme.getHeaderButtonHolder(),this.title.appendChild(this.controls),this.tabs_holder=this.theme.getTabHolder(this.getValidId(this.getItemTitle())),this.container.appendChild(this.tabs_holder),this.row_holder=this.theme.getTabContentHolder(this.tabs_holder),this.active_tab=null):(this.panel=this.theme.getIndentedPanel(),this.container.appendChild(this.panel),this.row_holder=document.createElement("div"),this.panel.appendChild(this.row_holder),this.controls=this.theme.getButtonHolder(),this.array_controls_top?this.title.appendChild(this.controls):this.panel.appendChild(this.controls))),this.addControls()}},{key:"onChildEditorChange",value:function(t){this.refreshValue(),this.refreshTabs(!0),B(D(a.prototype),"onChildEditorChange",this).call(this,t)}},{key:"getItemTitle",value:function(){if(!this.item_title)if(this.schema.items&&!Array.isArray(this.schema.items)){var t=this.jsoneditor.expandRefs(this.schema.items);this.item_title=this.translateProperty(t.title)||this.translate("default_array_item_title")}else this.item_title=this.translate("default_array_item_title");return this.cleanText(this.item_title)}},{key:"getItemSchema",value:function(t){return Array.isArray(this.schema.items)?t>=this.schema.items.length?!0===this.schema.additionalItems?{}:this.schema.additionalItems?l({},this.schema.additionalItems):void 0:l({},this.schema.items[t]):this.schema.items?l({},this.schema.items):{}}},{key:"getItemInfo",value:function(t){var e=this.getItemSchema(t);this.item_info=this.item_info||{};var r=JSON.stringify(e);return void 0!==this.item_info[r]||(e=this.jsoneditor.expandRefs(e),this.item_info[r]={title:this.translateProperty(e.title)||this.translate("default_array_item_title"),default:e.default,width:12,child_editors:e.properties||e.items}),this.item_info[r]}},{key:"getElementEditor",value:function(t){var e=this.getItemInfo(t),r=this.getItemSchema(t);(r=this.jsoneditor.expandRefs(r)).title="".concat(e.title," ").concat(t+1);var n,i=this.jsoneditor.getEditorClass(r);this.tabs_holder?(n="tabs-top"===this.schema.format?this.theme.getTopTabContent():this.theme.getTabContent()).id="".concat(this.path,".").concat(t):n=e.child_editors?this.theme.getChildEditorHolder():this.theme.getIndentedPanel(),this.row_holder.appendChild(n);var o=this.jsoneditor.createEditor(i,{jsoneditor:this.jsoneditor,schema:r,container:n,path:"".concat(this.path,".").concat(t),parent:this,required:!0});return o.preBuild(),o.build(),o.postBuild(),o.title_controls||(o.array_controls=this.theme.getButtonHolder(),n.appendChild(o.array_controls)),o}},{key:"checkParent",value:function(t){return t&&t.parentNode}},{key:"destroy",value:function(){this.empty(!0),this.checkParent(this.title)&&this.title.parentNode.removeChild(this.title),this.checkParent(this.description)&&this.description.parentNode.removeChild(this.description),this.checkParent(this.row_holder)&&this.row_holder.parentNode.removeChild(this.row_holder),this.checkParent(this.controls)&&this.controls.parentNode.removeChild(this.controls),this.checkParent(this.panel)&&this.panel.parentNode.removeChild(this.panel),this.rows=this.row_cache=this.title=this.description=this.row_holder=this.panel=this.controls=null,B(D(a.prototype),"destroy",this).call(this)}},{key:"empty",value:function(t){var e=this;this.rows&&(this.rows.forEach((function(r,n){t&&(e.checkParent(r.tab)&&r.tab.parentNode.removeChild(r.tab),e.destroyRow(r,!0),e.row_cache[n]=null),e.rows[n]=null})),this.rows=[],t&&(this.row_cache=[]))}},{key:"destroyRow",value:function(t,e){var r=t.container;e?(t.destroy(),r.parentNode&&r.parentNode.removeChild(r),this.checkParent(t.tab)&&t.tab.parentNode.removeChild(t.tab)):(t.tab&&(t.tab.style.display="none"),r.style.display="none",t.unregister())}},{key:"getMax",value:function(){return Array.isArray(this.schema.items)&&!1===this.schema.additionalItems?Math.min(this.schema.items.length,this.schema.maxItems||1/0):this.schema.maxItems||1/0}},{key:"refreshTabs",value:function(t){var e=this;this.rows.forEach((function(r){r.tab&&(t?r.tab_text.textContent=r.getHeaderText():r.tab===e.active_tab?e.theme.markTabActive(r):e.theme.markTabInactive(r))}))}},{key:"ensureArraySize",value:function(t){if(Array.isArray(t)||(t=[t]),this.schema.minItems)for(;t.length<this.schema.minItems;)t.push(this.getItemInfo(t.length).default);return this.getMax()&&t.length>this.getMax()&&(t=t.slice(0,this.getMax())),t}},{key:"setValue",value:function(){var t=this,e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[],r=arguments.length>1?arguments[1]:void 0;if(e=this.ensureArraySize(e),JSON.stringify(e)!==this.serialized){e.forEach((function(e,n){if(t.rows[n])t.rows[n].setValue(e,r);else if(t.row_cache[n])t.rows[n]=t.row_cache[n],t.rows[n].setValue(e,r),t.rows[n].container.style.display="",t.rows[n].tab&&(t.rows[n].tab.style.display=""),t.rows[n].register(),t.jsoneditor.trigger("addRow",t.rows[n]);else{var i=t.addRow(e,r);t.jsoneditor.trigger("addRow",i)}}));for(var n=e.length;n<this.rows.length;n++)this.destroyRow(this.rows[n]),this.rows[n]=null;this.rows=this.rows.slice(0,e.length);var i=this.rows.find((function(e){return e.tab===t.active_tab})),o=void 0!==i?i.tab:null;!o&&this.rows.length&&(o=this.rows[0].tab),this.active_tab=o,this.refreshValue(r),this.refreshTabs(!0),this.refreshTabs(),this.onChange()}}},{key:"setVisibility",value:function(t,e){t.style.display=e?"":"none"}},{key:"setupButtons",value:function(t){var e=[];if(this.value.length)if(1===this.value.length){this.remove_all_rows_button.style.display="none";var r=!(t||this.hide_delete_last_row_buttons);this.setVisibility(this.delete_last_row_button,r),e.push(r)}else{var n=!(t||this.hide_delete_last_row_buttons);this.setVisibility(this.delete_last_row_button,n),e.push(n);var i=!(t||this.hide_delete_all_rows_buttons);this.setVisibility(this.remove_all_rows_button,i),e.push(i)}else this.delete_last_row_button.style.display="none",this.remove_all_rows_button.style.display="none";var o=!(this.getMax()&&this.getMax()<=this.rows.length||this.hide_add_button);return this.setVisibility(this.add_row_button,o),e.push(o),e.some((function(t){return t}))}},{key:"refreshValue",value:function(t){var e=this,r=this.value?this.value.length:0;if(this.value=this.rows.map((function(t){return t.getValue()})),r!==this.value.length||t){var n=this.schema.minItems&&this.schema.minItems>=this.rows.length;this.rows.forEach((function(t,r){if(t.movedown_button){var i=r!==e.rows.length-1;e.setVisibility(t.movedown_button,i)}t.delete_button&&e.setVisibility(t.delete_button,!n),e.value[r]=t.getValue()})),!this.collapsed&&this.setupButtons(n)?this.controls.style.display="inline-block":this.controls.style.display="none"}this.serialized=JSON.stringify(this.value)}},{key:"addRow",value:function(t,e){var r=this,n=this.rows.length;this.rows[n]=this.getElementEditor(n),this.row_cache[n]=this.rows[n],this.tabs_holder&&(this.rows[n].tab_text=document.createElement("span"),this.rows[n].tab_text.textContent=this.rows[n].getHeaderText(),"tabs-top"===this.schema.format?(this.rows[n].tab=this.theme.getTopTab(this.rows[n].tab_text,this.getValidId(this.rows[n].path)),this.theme.addTopTab(this.tabs_holder,this.rows[n].tab)):(this.rows[n].tab=this.theme.getTab(this.rows[n].tab_text,this.getValidId(this.rows[n].path)),this.theme.addTab(this.tabs_holder,this.rows[n].tab)),this.rows[n].tab.addEventListener("click",(function(t){r.active_tab=r.rows[n].tab,r.refreshTabs(),t.preventDefault(),t.stopPropagation()})));var i=this.rows[n].title_controls||this.rows[n].array_controls;return this.hide_delete_buttons||(this.rows[n].delete_button=this._createDeleteButton(n,i)),this.show_copy_button&&(this.rows[n].copy_button=this._createCopyButton(n,i)),n&&!this.hide_move_buttons&&(this.rows[n].moveup_button=this._createMoveUpButton(n,i)),this.hide_move_buttons||(this.rows[n].movedown_button=this._createMoveDownButton(n,i)),void 0!==t&&this.rows[n].setValue(t,e),this.refreshTabs(),this.rows[n]}},{key:"_createDeleteButton",value:function(t,e){var r=this,n=this.getButton(this.getItemTitle(),"delete","button_delete_row_title",[this.getItemTitle()]);return n.classList.add("delete","json-editor-btntype-delete"),n.setAttribute("data-i",t),n.addEventListener("click",(function(t){if(t.preventDefault(),t.stopPropagation(),!r.askConfirmation())return!1;var e=1*t.currentTarget.getAttribute("data-i"),n=r.getValue().filter((function(t,r){return r!==e})),i=null,o=r.rows[e].getValue();r.setValue(n),r.rows[e]?i=r.rows[e].tab:r.rows[e-1]&&(i=r.rows[e-1].tab),i&&(r.active_tab=i,r.refreshTabs()),r.onChange(!0),r.jsoneditor.trigger("deleteRow",o)})),e&&e.appendChild(n),n}},{key:"_createCopyButton",value:function(t,e){var r=this,n=this.getButton(this.getItemTitle(),"copy","button_copy_row_title",[this.getItemTitle()]),i=this.schema;return n.classList.add("copy","json-editor-btntype-copy"),n.setAttribute("data-i",t),n.addEventListener("click",(function(t){var e=r.getValue();t.preventDefault(),t.stopPropagation();var n=1*t.currentTarget.getAttribute("data-i");e.forEach((function(t,r){if(r===n){if("string"===i.items.type&&"uuid"===i.items.format)t=f();else if("object"===i.items.type&&i.items.properties)for(var o=0,a=Object.keys(t);o<a.length;o++){var s=a[o];i.items.properties&&i.items.properties[s]&&"uuid"===i.items.properties[s].format&&(t[s]=f())}e.push(t)}})),r.setValue(e),r.refreshValue(!0),r.onChange(!0)})),e.appendChild(n),n}},{key:"_createMoveUpButton",value:function(t,e){var r=this,n=this.getButton("","tabs-top"===this.schema.format?"moveleft":"moveup","button_move_up_title");return n.classList.add("moveup","json-editor-btntype-move"),n.setAttribute("data-i",t),n.addEventListener("click",(function(t){t.preventDefault(),t.stopPropagation();var e=1*t.currentTarget.getAttribute("data-i");if(!(e<=0)){var n=r.getValue(),i=n[e-1];n[e-1]=n[e],n[e]=i,r.setValue(n),r.active_tab=r.rows[e-1].tab,r.refreshTabs(),r.onChange(!0),r.jsoneditor.trigger("moveRow",r.rows[e-1])}})),e&&e.appendChild(n),n}},{key:"_createMoveDownButton",value:function(t,e){var r=this,n=this.getButton("","tabs-top"===this.schema.format?"moveright":"movedown","button_move_down_title");return n.classList.add("movedown","json-editor-btntype-move"),n.setAttribute("data-i",t),n.addEventListener("click",(function(t){t.preventDefault(),t.stopPropagation();var e=1*t.currentTarget.getAttribute("data-i"),n=r.getValue();if(!(e>=n.length-1)){var i=n[e+1];n[e+1]=n[e],n[e]=i,r.setValue(n),r.active_tab=r.rows[e+1].tab,r.refreshTabs(),r.onChange(!0),r.jsoneditor.trigger("moveRow",r.rows[e+1])}})),e&&e.appendChild(n),n}},{key:"addControls",value:function(){this.collapsed=!1,this.toggle_button=this._createToggleButton(),this.options.collapsed&&c(this.toggle_button,"click"),this.schema.options&&void 0!==this.schema.options.disable_collapse?this.schema.options.disable_collapse&&(this.toggle_button.style.display="none"):this.jsoneditor.options.disable_collapse&&(this.toggle_button.style.display="none"),this.add_row_button=this._createAddRowButton(),this.delete_last_row_button=this._createDeleteLastRowButton(),this.remove_all_rows_button=this._createRemoveAllRowsButton(),this.tabs&&(this.add_row_button.classList.add("je-array-control-btn"),this.delete_last_row_button.classList.add("je-array-control-btn"),this.remove_all_rows_button.classList.add("je-array-control-btn"))}},{key:"_createToggleButton",value:function(){var t=this,e=this.getButton("","collapse","button_collapse");e.classList.add("json-editor-btntype-toggle"),this.title.insertBefore(e,this.title.childNodes[0]);var r=this.row_holder.style.display,n=this.controls.style.display;return e.addEventListener("click",(function(e){e.preventDefault(),e.stopPropagation(),t.panel&&t.setVisibility(t.panel,t.collapsed),t.tabs_holder&&t.setVisibility(t.tabs_holder,t.collapsed),t.collapsed?(t.collapsed=!1,t.row_holder.style.display=r,t.controls.style.display=n,t.setButtonText(e.currentTarget,"","collapse","button_collapse")):(t.collapsed=!0,t.row_holder.style.display="none",t.controls.style.display="none",t.setButtonText(e.currentTarget,"","expand","button_expand"))})),e}},{key:"_createAddRowButton",value:function(){var t=this,e=this.getButton(this.getItemTitle(),"add","button_add_row_title",[this.getItemTitle()]);return e.classList.add("json-editor-btntype-add"),e.addEventListener("click",(function(e){e.preventDefault(),e.stopPropagation();var r,n=t.rows.length;t.row_cache[n]?(r=t.rows[n]=t.row_cache[n],t.rows[n].setValue(t.rows[n].getDefault(),!0),t.rows[n].container.style.display="",t.rows[n].tab&&(t.rows[n].tab.style.display=""),t.rows[n].register()):r=t.addRow(),t.active_tab=t.rows[n].tab,t.refreshTabs(),t.refreshValue(),t.onChange(!0),t.jsoneditor.trigger("addRow",r)})),this.controls.appendChild(e),e}},{key:"_createDeleteLastRowButton",value:function(){var t=this,e=this.getButton("button_delete_last","subtract","button_delete_last_title",[this.getItemTitle()]);return e.classList.add("json-editor-btntype-deletelast"),e.addEventListener("click",(function(e){if(e.preventDefault(),e.stopPropagation(),!t.askConfirmation())return!1;var r=t.getValue(),n=null,i=r.pop();t.setValue(r),t.rows[t.rows.length-1]&&(n=t.rows[t.rows.length-1].tab),n&&(t.active_tab=n,t.refreshTabs()),t.onChange(!0),t.jsoneditor.trigger("deleteRow",i)})),this.controls.appendChild(e),e}},{key:"_createRemoveAllRowsButton",value:function(){var t=this,e=this.getButton("button_delete_all","delete","button_delete_all_title");return e.classList.add("json-editor-btntype-deleteall"),e.addEventListener("click",(function(e){if(e.preventDefault(),e.stopPropagation(),!t.askConfirmation())return!1;var r=t.getValue();t.empty(!0),t.setValue([]),t.onChange(!0),t.jsoneditor.trigger("deleteAllRows",r)})),this.controls.appendChild(e),e}},{key:"showValidationErrors",value:function(t){var e=this,r=[],n=[];t.forEach((function(t){t.path===e.path?r.push(t):n.push(t)})),this.error_holder&&(r.length?(this.error_holder.innerHTML="",this.error_holder.style.display="",r.forEach((function(t){e.error_holder.appendChild(e.theme.getErrorMessage(t.message))}))):this.error_holder.style.display="none"),this.rows.forEach((function(t){return t.showValidationErrors(n)}))}}],r&&I(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(w);function V(t){return V="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},V(t)}function z(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==V(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==V(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===V(i)?i:String(i)),n)}var i}function H(){return H="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=q(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},H.apply(this,arguments)}function M(t,e){return M=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},M(t,e)}function q(t){return q=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},q(t)}F.rules={".json-editor-btntype-toggle":"margin:0%2010px%200%200",".je-array-control-btn":"width:100%25;text-align:left;margin-bottom:3px"};var G=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&M(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=q(n);if(i){var r=q(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===V(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,(r=[{key:"onInputChange",value:function(){this.value=this.input.value,this.onChange(!0)}},{key:"register",value:function(){H(q(a.prototype),"register",this).call(this),this.input&&this.jsoneditor.options.use_name_attributes&&this.input.setAttribute("name",this.formname)}},{key:"unregister",value:function(){H(q(a.prototype),"unregister",this).call(this),this.input&&this.input.removeAttribute("name")}},{key:"getNumColumns",value:function(){var t=this,e=this.getTitle().length;return Object.keys(this.select_values).forEach((function(r){return e=Math.max(e,"".concat(t.select_values[r]).length+4)})),Math.min(12,Math.max(e/7,2))}},{key:"preBuild",value:function(){var t;H(q(a.prototype),"preBuild",this).call(this),this.select_options={},this.select_values={},this.option_titles=[],this.option_keys=[],this.option_enum=[];var e=this.jsoneditor.expandRefs(this.schema.items||{}),r=e.enum||[],n=e.options&&e.options.enum||[],i=e.options&&e.options.enum_titles||[];for(t=0;t<r.length;t++)if(this.sanitize(r[t])===r[t]){var o=n[t]||{};"title"in o||(o.title="".concat(i[t]||r[t])),this.option_keys.push("".concat(r[t])),this.option_enum.push(o),this.select_values["".concat(r[t])]=r[t]}}},{key:"build",value:function(){var t,e=this;if(this.options.compact||(this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired())),this.schema.description&&(this.description=this.theme.getFormInputDescription(this.translateProperty(this.schema.description))),this.options.infoText&&(this.infoButton=this.theme.getInfoButton(this.translateProperty(this.options.infoText))),this.options.compact&&this.container.classList.add("compact"),!this.schema.format&&this.option_keys.length<8||"checkbox"===this.schema.format){for(this.input_type="checkboxes",this.inputs={},this.controls={},t=0;t<this.option_keys.length;t++){var r=this.formname+t.toString();this.inputs[this.option_keys[t]]=this.theme.getCheckbox(),this.inputs[this.option_keys[t]].id=r,this.select_options[this.option_keys[t]]=this.inputs[this.option_keys[t]];var n=this.theme.getCheckboxLabel(this.option_enum[t].title);if(n.htmlFor=r,this.option_enum[t].infoText){var i=this.theme.getInfoButton(this.translateProperty(this.option_enum[t].infoText));n.appendChild(i)}this.controls["_"+this.option_keys[t]]=this.theme.getFormControl(n,this.inputs[this.option_keys[t]])}this.control=this.theme.getMultiCheckboxHolder(this.controls,this.label,this.description,this.infoButton),this.inputs.controlgroup=this.inputs.controls=this.control}else{for(this.input_type="select",this.input=this.theme.getSelectInput(this.option_keys,!0),this.theme.setSelectOptions(this.input,this.option_keys,this.option_enum.map((function(t){return t.title}))),this.input.setAttribute("multiple","multiple"),this.input.size=Math.min(10,this.option_keys.length),t=0;t<this.option_keys.length;t++)this.select_options[this.option_keys[t]]=this.input.children[t];this.control=this.theme.getFormControl(this.label,this.input,this.description,this.infoButton)}(this.schema.readOnly||this.schema.readonly)&&this.disable(!0),this.container.appendChild(this.control),this.multiselectChangeHandler=function(r){var n=[];for(t=0;t<e.option_keys.length;t++)e.select_options[e.option_keys[t]]&&(e.select_options[e.option_keys[t]].selected||e.select_options[e.option_keys[t]].checked)&&n.push(e.select_values[e.option_keys[t]]);e.updateValue(n),e.onChange(!0)},this.control.addEventListener("change",this.multiselectChangeHandler,!1),window.requestAnimationFrame((function(){e.afterInputReady()}))}},{key:"postBuild",value:function(){H(q(a.prototype),"postBuild",this).call(this)}},{key:"afterInputReady",value:function(){this.theme.afterInputReady(this.input||this.inputs)}},{key:"setValue",value:function(t,e){var r=this;t=t||[],Array.isArray(t)||(t=[t]),t=t.map((function(t){return"".concat(t)})),Object.keys(this.select_options).forEach((function(e){r.select_options[e]["select"===r.input_type?"selected":"checked"]=t.includes(e)})),this.updateValue(t),this.onChange(!0)}},{key:"removeValue",value:function(t){t=[].concat(t),this.setValue(this.getValue().filter((function(e){return!t.includes(e)})))}},{key:"addValue",value:function(t){this.setValue(this.getValue().concat(t))}},{key:"updateValue",value:function(t){for(var e=!1,r=[],n=0;n<t.length;n++)if(this.select_options["".concat(t[n])]){var i=this.sanitize(this.select_values[t[n]]);r.push(i),i!==t[n]&&(e=!0)}else e=!0;return this.value=r,e}},{key:"sanitize",value:function(t){return"boolean"===this.schema.items.type?!!t:"number"===this.schema.items.type?1*t||0:"integer"===this.schema.items.type?Math.floor(1*t||0):"".concat(t)}},{key:"enable",value:function(){var t=this;this.always_disabled||(this.input?this.input.disabled=!1:this.inputs&&Object.keys(this.inputs).forEach((function(e){return t.inputs[e].disabled=!1})),H(q(a.prototype),"enable",this).call(this))}},{key:"disable",value:function(t){var e=this;t&&(this.always_disabled=!0),this.input?this.input.disabled=!0:this.inputs&&Object.keys(this.inputs).forEach((function(t){return e.inputs[t].disabled=!0})),H(q(a.prototype),"disable",this).call(this)}},{key:"destroy",value:function(){H(q(a.prototype),"destroy",this).call(this)}},{key:"escapeRegExp",value:function(t){return t.replace(/[.*+?^${}()|[\]\\]/g,"\\$&")}},{key:"showValidationErrors",value:function(t){var e=new RegExp("^".concat(this.escapeRegExp(this.path),"(\\.\\d+)?$")),r=t.reduce((function(t,r){return r.path.match(e)&&t.push(r.message),t}),[]);r.length?this.theme.addInputError(this.input||this.inputs,"".concat(r.join(". "),".")):this.theme.removeInputError(this.input||this.inputs)}}])&&z(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(w);function U(t){return U="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},U(t)}function $(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==U(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==U(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===U(i)?i:String(i)),n)}var i}function J(){return J="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Z(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},J.apply(this,arguments)}function W(t,e){return W=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},W(t,e)}function Z(t){return Z=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},Z(t)}var Y=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&W(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=Z(n);if(i){var r=Z(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===U(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,(r=[{key:"setValue",value:function(t,e){this.choices_instance?(t=[].concat(t).map((function(t){return"".concat(t)})),this.updateValue(t),this.choices_instance.removeActiveItems(),this.choices_instance.setChoiceByValue(this.value),this.onChange(!0)):J(Z(a.prototype),"setValue",this).call(this,t,e)}},{key:"afterInputReady",value:function(){var t=this;if(window.Choices&&!this.choices_instance){var e=this.expandCallbacks("choices",l({},{removeItems:!0,removeItemButton:!0},this.defaults.options.choices||{},this.options.choices||{},{addItems:!0,editItems:!1,duplicateItemsAllowed:!1}));this.newEnumAllowed=!1,this.choices_instance=new window.Choices(this.input,e),this.control.removeEventListener("change",this.multiselectChangeHandler),this.multiselectChangeHandler=function(e){var r=t.choices_instance.getValue(!0);t.updateValue(r),t.onChange(!0)},this.control.addEventListener("change",this.multiselectChangeHandler,!1)}J(Z(a.prototype),"afterInputReady",this).call(this)}},{key:"updateValue",value:function(t){t=[].concat(t);for(var e=!1,r=[],n=0;n<t.length;n++){if(!this.select_values["".concat(t[n])]){if(e=!0,!this.newEnumAllowed)continue;if(!this.addNewOption(t[n]))continue}var i=this.sanitize(this.select_values[t[n]]);r.push(i),i!==t[n]&&(e=!0)}return this.value=r,e}},{key:"addNewOption",value:function(t){return this.option_keys.push("".concat(t)),this.option_titles.push("".concat(t)),this.select_values["".concat(t)]=t,this.schema.items.enum.push(t),this.choices_instance.setChoices([{value:"".concat(t),label:"".concat(t)}],"value","label",!1),!0}},{key:"enable",value:function(){!this.always_disabled&&this.choices_instance&&this.choices_instance.enable(),J(Z(a.prototype),"enable",this).call(this)}},{key:"disable",value:function(t){this.choices_instance&&this.choices_instance.disable(),J(Z(a.prototype),"disable",this).call(this,t)}},{key:"destroy",value:function(){this.choices_instance&&(this.choices_instance.destroy(),this.choices_instance=null),J(Z(a.prototype),"destroy",this).call(this)}}])&&$(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(G);function Q(t){return Q="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},Q(t)}function K(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==Q(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==Q(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===Q(i)?i:String(i)),n)}var i}function X(){return X="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=et(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},X.apply(this,arguments)}function tt(t,e){return tt=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},tt(t,e)}function et(t){return et=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},et(t)}var rt=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&tt(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=et(n);if(i){var r=et(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===Q(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,(r=[{key:"setValue",value:function(t,e){this.select2_instance?(t=[].concat(t).map((function(t){return"".concat(t)})),this.updateValue(t),this.select2v4?this.select2_instance.val(this.value).change():this.select2_instance.select2("val",this.value),this.onChange(!0)):X(et(a.prototype),"setValue",this).call(this,t,e)}},{key:"afterInputReady",value:function(){var t,e=this;window.jQuery&&window.jQuery.fn&&window.jQuery.fn.select2&&!this.select2_instance&&(t=this.expandCallbacks("select2",l({},{tags:!0,width:"100%"},this.defaults.options.select2||{},this.options.select2||{})),this.newEnumAllowed=t.tags=!!t.tags&&this.schema.items&&"string"===this.schema.items.type,this.select2_instance=window.jQuery(this.input).select2(t),this.select2v4=h(this.select2_instance.select2,"amd"),this.selectChangeHandler=function(){var t=e.select2v4?e.select2_instance.val():e.select2_instance.select2("val");e.updateValue(t),e.onChange(!0)},this.select2_instance.on("select2-blur",this.selectChangeHandler),this.select2_instance.on("change",this.selectChangeHandler)),X(et(a.prototype),"afterInputReady",this).call(this)}},{key:"updateValue",value:function(t){t=[].concat(t);for(var e=!1,r=[],n=0;n<t.length;n++){if(!this.select_values["".concat(t[n])]){if(e=!0,!this.newEnumAllowed)continue;if(!this.addNewOption(t[n]))continue}var i=this.sanitize(this.select_values[t[n]]);r.push(i),i!==t[n]&&(e=!0)}return this.value=r,e}},{key:"addNewOption",value:function(t){this.option_keys.push("".concat(t)),this.option_titles.push("".concat(t)),this.select_values["".concat(t)]=t,this.schema.items.enum.push(t);var e=this.input.querySelector('option[value="'.concat(t,'"]'));return e?e.removeAttribute("data-select2-tag"):this.input.appendChild(new Option(t,t,!1,!1)).trigger("change"),!0}},{key:"enable",value:function(){!this.always_disabled&&this.select2_instance&&(this.select2v4?this.select2_instance.prop("disabled",!1):this.select2_instance.select2("enable",!0)),X(et(a.prototype),"enable",this).call(this)}},{key:"disable",value:function(t){this.select2_instance&&(this.select2v4?this.select2_instance.prop("disabled",!0):this.select2_instance.select2("enable",!1)),X(et(a.prototype),"disable",this).call(this)}},{key:"destroy",value:function(){this.select2_instance&&(this.select2_instance.select2("destroy"),this.select2_instance=null),X(et(a.prototype),"destroy",this).call(this)}}])&&K(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(G);function nt(t){return nt="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},nt(t)}function it(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==nt(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==nt(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===nt(i)?i:String(i)),n)}var i}function ot(){return ot="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=st(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},ot.apply(this,arguments)}function at(t,e){return at=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},at(t,e)}function st(t){return st=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},st(t)}var lt=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&at(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=st(n);if(i){var r=st(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===nt(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,(r=[{key:"setValue",value:function(t,e){this.selectize_instance?(t=[].concat(t).map((function(t){return"".concat(t)})),this.updateValue(t),this.selectize_instance.setValue(this.value),this.onChange(!0)):ot(st(a.prototype),"setValue",this).call(this,t,e)}},{key:"afterInputReady",value:function(){var t,e=this;window.jQuery&&window.jQuery.fn&&window.jQuery.fn.selectize&&!this.selectize_instance&&(t=this.expandCallbacks("selectize",l({},{plugins:["remove_button"],delimiter:!1,createOnBlur:!0,create:!0},this.defaults.options.selectize||{},this.options.selectize||{})),this.newEnumAllowed=t.create=!!t.create&&this.schema.items&&"string"===this.schema.items.type,this.selectize_instance=window.jQuery(this.input).selectize(t)[0].selectize,this.control.removeEventListener("change",this.multiselectChangeHandler),this.multiselectChangeHandler=function(t){var r=e.selectize_instance.getValue();e.updateValue(r),e.onChange(!0)},this.selectize_instance.on("change",this.multiselectChangeHandler)),ot(st(a.prototype),"afterInputReady",this).call(this)}},{key:"updateValue",value:function(t){t=[].concat(t);for(var e=!1,r=[],n=0;n<t.length;n++){if(!this.select_values["".concat(t[n])]){if(e=!0,!this.newEnumAllowed)continue;if(!this.addNewOption(t[n]))continue}var i=this.sanitize(this.select_values[t[n]]);r.push(i),i!==t[n]&&(e=!0)}return this.value=r,e}},{key:"addNewOption",value:function(t){return this.option_keys.push("".concat(t)),this.option_titles.push("".concat(t)),this.select_values["".concat(t)]=t,this.schema.items.enum.push(t),this.selectize_instance.addOption({text:t,value:t}),!0}},{key:"enable",value:function(){!this.always_disabled&&this.selectize_instance&&this.selectize_instance.unlock(),ot(st(a.prototype),"enable",this).call(this)}},{key:"disable",value:function(t){this.selectize_instance&&this.selectize_instance.lock(),ot(st(a.prototype),"disable",this).call(this,t)}},{key:"destroy",value:function(){this.selectize_instance&&(this.selectize_instance.destroy(),this.selectize_instance=null),ot(st(a.prototype),"destroy",this).call(this)}}])&&it(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(G);function ct(t){return ct="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},ct(t)}function ut(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==ct(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==ct(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===ct(i)?i:String(i)),n)}var i}function ht(){return ht="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=dt(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},ht.apply(this,arguments)}function pt(t,e){return pt=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},pt(t,e)}function dt(t){return dt=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},dt(t)}var ft=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&pt(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=dt(n);if(i){var r=dt(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===ct(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,(r=[{key:"postBuild",value:function(){window.Autocomplete&&(this.autocomplete_wrapper=document.createElement("div"),this.input.parentNode.insertBefore(this.autocomplete_wrapper,this.input.nextSibling),this.autocomplete_wrapper.appendChild(this.input),this.autocomplete_dropdown=document.createElement("ul"),this.input.parentNode.insertBefore(this.autocomplete_dropdown,this.input.nextSibling)),ht(dt(a.prototype),"postBuild",this).call(this)}},{key:"afterInputReady",value:function(){var t,e=this;window.Autocomplete&&!this.autocomplete_instance&&(t=this.expandCallbacks("autocomplete",l({},{search:function(t){return console.log('No "search" callback defined for autocomplete in property "'.concat(t.key,'"')),[]},onSubmit:function(){e.input.blur()},baseClass:"autocomplete"},this.defaults.options.autocomplete||{},this.options.autocomplete||{})),this.autocomplete_wrapper.classList.add(t.baseClass),this.autocomplete_dropdown.classList.add("".concat(t.baseClass,"-result-list")),this.autocomplete_instance=new window.Autocomplete(this.autocomplete_wrapper,t)),ht(dt(a.prototype),"afterInputReady",this).call(this)}},{key:"destroy",value:function(){this.autocomplete_instance&&(this.input&&this.input.parentNode&&this.input.parentNode.removeChild(this.input),this.autocomplete_dropdown&&this.autocomplete_dropdown.parentNode&&this.autocomplete_dropdown.parentNode.removeChild(this.autocomplete_dropdown),this.autocomplete_wrapper&&this.autocomplete_wrapper.parentNode&&this.autocomplete_wrapper.parentNode.removeChild(this.autocomplete_wrapper),this.autocomplete_instance=null),ht(dt(a.prototype),"destroy",this).call(this)}}])&&ut(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(C);function yt(t){return yt="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},yt(t)}function mt(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==yt(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==yt(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===yt(i)?i:String(i)),n)}var i}function vt(){return vt="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=gt(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},vt.apply(this,arguments)}function bt(t,e){return bt=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},bt(t,e)}function gt(t){return gt=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},gt(t)}r(561);var wt=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&bt(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=gt(n);if(i){var r=gt(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===yt(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,(r=[{key:"getNumColumns",value:function(){return 4}},{key:"setFileReaderListener",value:function(t){var e=this;t.addEventListener("load",(function(t){if(e.count===e.current_item_index)e.value[e.count][e.key]=t.target.result;else{var r={};for(var n in e.parent.schema.properties)r[n]="";r[e.key]=t.target.result,e.value.splice(e.count,0,r)}e.count+=1,e.count===e.total+e.current_item_index&&e.arrayEditor.setValue(e.value)}))}},{key:"build",value:function(){var t=this;if(this.options.compact||(this.title=this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired())),this.options.infoText&&(this.infoButton=this.theme.getInfoButton(this.translateProperty(this.options.infoText))),this.input=this.theme.getFormInputField("hidden"),this.container.appendChild(this.input),!this.schema.readOnly&&!this.schema.readonly){if(!window.FileReader)throw new Error("FileReader required for base64 editor");this.uploader=this.theme.getFormInputField("file"),this.schema.options&&this.schema.options.multiple&&!0===this.schema.options.multiple&&this.parent&&"object"===this.parent.schema.type&&this.parent.parent&&"array"===this.parent.parent.schema.type&&this.uploader.setAttribute("multiple",""),this.uploader.addEventListener("change",(function(e){if(e.preventDefault(),e.stopPropagation(),e.currentTarget.files&&e.currentTarget.files.length)if(e.currentTarget.files.length>1&&t.schema.options&&t.schema.options.multiple&&!0===t.schema.options.multiple&&t.parent&&"object"===t.parent.schema.type&&t.parent.parent&&"array"===t.parent.parent.schema.type){t.arrayEditor=t.jsoneditor.getEditor(t.parent.parent.path),t.value=t.arrayEditor.getValue(),t.total=e.currentTarget.files.length,t.current_item_index=parseInt(t.parent.key),t.count=t.current_item_index;for(var r=0;r<t.total;r++){var n=new FileReader;t.setFileReaderListener(n),n.readAsDataURL(e.currentTarget.files[r])}}else{var i=new FileReader;i.onload=function(e){t.value=e.target.result,t.refreshPreview(),t.onChange(!0),i=null},i.readAsDataURL(e.currentTarget.files[0])}}))}this.preview=this.theme.getFormInputDescription(this.translateProperty(this.schema.description)),this.container.appendChild(this.preview),this.control=this.theme.getFormControl(this.label,this.uploader||this.input,this.preview,this.infoButton),this.container.appendChild(this.control)}},{key:"refreshPreview",value:function(){if(this.last_preview!==this.value&&(this.last_preview=this.value,this.preview.innerHTML="",this.value)){var t=this.value.match(/^data:([^;,]+)[;,]/);if(t&&(t=t[1]),t){if(this.preview.innerHTML="<strong>Type:</strong> ".concat(t,", <strong>Size:</strong> ").concat(Math.floor((this.value.length-this.value.split(",")[0].length-1)/1.33333)," bytes"),"image"===t.substr(0,5)){this.preview.innerHTML+="<br>";var e=document.createElement("img");e.style.maxWidth="100%",e.style.maxHeight="100px",e.src=this.value,this.preview.appendChild(e)}}else this.preview.innerHTML="<em>Invalid data URI</em>"}}},{key:"enable",value:function(){this.always_disabled||(this.uploader&&(this.uploader.disabled=!1),vt(gt(a.prototype),"enable",this).call(this))}},{key:"disable",value:function(t){t&&(this.always_disabled=!0),this.uploader&&(this.uploader.disabled=!0),vt(gt(a.prototype),"disable",this).call(this)}},{key:"setValue",value:function(t){this.value!==t&&(this.schema.readOnly&&this.schema.enum&&!this.schema.enum.includes(t)?this.value=this.schema.enum[0]:this.value=t,this.input.value=this.value,this.refreshPreview(),this.onChange())}},{key:"destroy",value:function(){this.preview&&this.preview.parentNode&&this.preview.parentNode.removeChild(this.preview),this.title&&this.title.parentNode&&this.title.parentNode.removeChild(this.title),this.input&&this.input.parentNode&&this.input.parentNode.removeChild(this.input),this.uploader&&this.uploader.parentNode&&this.uploader.parentNode.removeChild(this.uploader),vt(gt(a.prototype),"destroy",this).call(this)}}])&&mt(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(w);function _t(t){return _t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},_t(t)}function kt(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==_t(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==_t(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===_t(i)?i:String(i)),n)}var i}function jt(){return jt="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=xt(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},jt.apply(this,arguments)}function Ot(t,e){return Ot=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},Ot(t,e)}function xt(t){return xt=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},xt(t)}var Ct=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&Ot(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=xt(n);if(i){var r=xt(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===_t(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(t,e){var r;return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),(r=o.call(this,t,e)).active=!1,r.parent&&r.parent.schema&&(Array.isArray(r.parent.schema.required)?r.parent.schema.required.includes(r.key)||r.parent.schema.required.push(r.key):r.parent.schema.required=[r.key]),r}return e=a,(r=[{key:"build",value:function(){var t=this;this.options.compact=!0;var e=this.translateProperty(this.schema.title)||this.key,r=this.expandCallbacks("button",l({},{icon:"",validated:!1,align:"left",action:function(t,e){window.alert('No button action defined for "'.concat(t.path,'"'))}},this.defaults.options.button||{},this.options.button||{}));this.input=this.getButton(e,r.icon,e),this.input.addEventListener("click",r.action,!1),(this.schema.readOnly||this.schema.readonly||this.schema.template)&&(this.disable(!0),this.input.setAttribute("readonly","true")),this.setInputAttributes(["readonly"]),this.control=this.theme.getFormButtonHolder(r.align),this.control.appendChild(this.input),this.container.appendChild(this.control),this.changeHandler=function(){t.jsoneditor.validate(t.jsoneditor.getValue()).length>0?t.disable():t.enable()},r.validated&&this.jsoneditor.on("change",this.changeHandler)}},{key:"enable",value:function(){this.always_disabled||(this.input.disabled=!1,jt(xt(a.prototype),"enable",this).call(this))}},{key:"disable",value:function(t){t&&(this.always_disabled=!0),this.input.disabled=!0,jt(xt(a.prototype),"disable",this).call(this)}},{key:"getNumColumns",value:function(){return 2}},{key:"activate",value:function(){this.active=!1,this.enable()}},{key:"deactivate",value:function(){this.isRequired()||(this.active=!1,this.disable())}},{key:"destroy",value:function(){this.jsoneditor.off("change",this.changeHandler),this.changeHandler=null,jt(xt(a.prototype),"destroy",this).call(this)}}])&&kt(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(w);function Et(t){return Et="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},Et(t)}function St(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==Et(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==Et(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===Et(i)?i:String(i)),n)}var i}function Pt(){return Pt="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Lt(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},Pt.apply(this,arguments)}function Tt(t,e){return Tt=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},Tt(t,e)}function Lt(t){return Lt=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},Lt(t)}var Rt=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&Tt(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=Lt(n);if(i){var r=Lt(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===Et(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,(r=[{key:"setValue",value:function(t,e){t=!!t;var r=this.getValue()!==t;this.value=t,this.input.checked=this.value,this.onChange(r)}},{key:"register",value:function(){Pt(Lt(a.prototype),"register",this).call(this),this.input&&this.jsoneditor.options.use_name_attributes&&this.input.setAttribute("name",this.formname)}},{key:"unregister",value:function(){Pt(Lt(a.prototype),"unregister",this).call(this),this.input&&this.input.removeAttribute("name")}},{key:"getNumColumns",value:function(){return Math.min(12,Math.max(this.getTitle().length/7,2))}},{key:"build",value:function(){var t=this;this.parent.options.table_row||(this.label=this.header=this.theme.getCheckboxLabel(this.getTitle(),this.isRequired()),this.label.htmlFor=this.formname),this.schema.description&&(this.description=this.theme.getFormInputDescription(this.translateProperty(this.schema.description))),this.options.infoText&&!this.options.compact&&(this.infoButton=this.theme.getInfoButton(this.translateProperty(this.options.infoText))),this.options.compact&&this.container.classList.add("compact"),this.input=this.theme.getCheckbox(),this.input.id=this.formname,this.control=this.theme.getFormControl(this.label,this.input,this.description,this.infoButton),(this.schema.readOnly||this.schema.readonly)&&(this.disable(!0),this.input.disabled=!0),this.input.addEventListener("change",(function(e){e.preventDefault(),e.stopPropagation(),t.value=e.currentTarget.checked,t.onChange(!0)})),this.container.appendChild(this.control)}},{key:"enable",value:function(){this.always_disabled||(this.input.disabled=!1,Pt(Lt(a.prototype),"enable",this).call(this))}},{key:"disable",value:function(t){t&&(this.always_disabled=!0),this.input.disabled=!0,Pt(Lt(a.prototype),"disable",this).call(this)}},{key:"destroy",value:function(){this.label&&this.label.parentNode&&this.label.parentNode.removeChild(this.label),this.description&&this.description.parentNode&&this.description.parentNode.removeChild(this.description),this.input&&this.input.parentNode&&this.input.parentNode.removeChild(this.input),Pt(Lt(a.prototype),"destroy",this).call(this)}},{key:"showValidationErrors",value:function(t){var e=this;this.previous_error_setting=this.jsoneditor.options.show_errors;var r=t.reduce((function(t,r){return r.path===e.path&&t.push(r.message),t}),[]);this.input.controlgroup=this.control,r.length?this.theme.addInputError(this.input,"".concat(r.join(". "),".")):this.theme.removeInputError(this.input)}}])&&St(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(w);function At(t){return At="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},At(t)}function It(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==At(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==At(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===At(i)?i:String(i)),n)}var i}function Bt(){return Bt="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Dt(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},Bt.apply(this,arguments)}function Nt(t,e){return Nt=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},Nt(t,e)}function Dt(t){return Dt=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},Dt(t)}r(2772),r(2707);var Ft=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&Nt(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=Dt(n);if(i){var r=Dt(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===At(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,(r=[{key:"setValue",value:function(t,e){var r=this.typecast(t),n=!!this.jsoneditor.options.use_default_values||void 0!==this.schema.default;(this.enum_options.length>0&&!this.enum_values.includes(r)||e&&!this.isRequired()&&!n)&&(r=this.enum_values[0]),this.value!==r&&(e?this.is_dirty=!1:"change"===this.jsoneditor.options.show_errors&&(this.is_dirty=!0),this.input.value=this.enum_options[this.enum_values.indexOf(r)],this.value=r,this.onChange(),this.change())}},{key:"register",value:function(){Bt(Dt(a.prototype),"register",this).call(this),this.input&&this.jsoneditor.options.use_name_attributes&&this.input.setAttribute("name",this.formname)}},{key:"unregister",value:function(){Bt(Dt(a.prototype),"unregister",this).call(this),this.input&&this.input.removeAttribute("name")}},{key:"getNumColumns",value:function(){if(!this.enum_options)return 3;for(var t=this.getTitle().length,e=0;e<this.enum_options.length;e++)t=Math.max(t,this.enum_options[e].length+4);return Math.min(12,Math.max(t/7,2))}},{key:"typecast",value:function(t){return"boolean"===this.schema.type?"undefined"===t||void 0===t?void 0:!!t:"number"===this.schema.type?1*t||0:"integer"===this.schema.type?Math.floor(1*t||0):this.schema.enum&&void 0===t?void 0:"".concat(t)}},{key:"getValue",value:function(){if(this.dependenciesFulfilled)return this.typecast(this.value)}},{key:"preBuild",value:function(){var t,e,r=this;if(this.input_type="select",this.enum_options=[],this.enum_values=[],this.enum_display=[],this.schema.enum){var n=this.schema.options&&this.schema.options.enum_titles||[];this.schema.enum.forEach((function(t,e){r.enum_options[e]="".concat(t),r.enum_display[e]="".concat(r.translateProperty(n[e])||t),r.enum_values[e]=r.typecast(t)}))}else if("boolean"===this.schema.type)this.enum_display=this.schema.options&&this.schema.options.enum_titles||["true","false"],this.enum_options=["1",""],this.enum_values=[!0,!1],this.isRequired()||(this.enum_display.unshift(" "),this.enum_options.unshift("undefined"),this.enum_values.unshift(void 0));else{if(!this.schema.enumSource)throw new Error("'select' editor requires the enum property to be set.");if(this.enumSource=[],this.enum_display=[],this.enum_options=[],this.enum_values=[],Array.isArray(this.schema.enumSource))for(t=0;t<this.schema.enumSource.length;t++)"string"==typeof this.schema.enumSource[t]?this.enumSource[t]={source:this.schema.enumSource[t]}:Array.isArray(this.schema.enumSource[t])?this.enumSource[t]=this.schema.enumSource[t]:this.enumSource[t]=l({},this.schema.enumSource[t]);else this.schema.enumValue?this.enumSource=[{source:this.schema.enumSource,value:this.schema.enumValue}]:this.enumSource=[{source:this.schema.enumSource}];for(t=0;t<this.enumSource.length;t++)this.enumSource[t].value&&("function"==typeof(e=this.expandCallbacks("template",{template:this.enumSource[t].value})).template?this.enumSource[t].value=e.template:this.enumSource[t].value=this.jsoneditor.compileTemplate(this.enumSource[t].value,this.template_engine)),this.enumSource[t].title&&("function"==typeof(e=this.expandCallbacks("template",{template:this.enumSource[t].title})).template?this.enumSource[t].title=e.template:this.enumSource[t].title=this.jsoneditor.compileTemplate(this.enumSource[t].title,this.template_engine)),this.enumSource[t].filter&&this.enumSource[t].value&&("function"==typeof(e=this.expandCallbacks("template",{template:this.enumSource[t].filter})).template?this.enumSource[t].filter=e.template:this.enumSource[t].filter=this.jsoneditor.compileTemplate(this.enumSource[t].filter,this.template_engine))}}},{key:"build",value:function(){var t=this;this.options.compact||(this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired())),this.schema.description&&(this.description=this.theme.getFormInputDescription(this.translateProperty(this.schema.description))),this.options.infoText&&(this.infoButton=this.theme.getInfoButton(this.translateProperty(this.options.infoText))),this.options.compact&&this.container.classList.add("compact"),this.input=this.theme.getSelectInput(this.enum_options,!1),this.theme.setSelectOptions(this.input,this.enum_options,this.enum_display),(this.schema.readOnly||this.schema.readonly)&&(this.disable(!0),this.input.disabled=!0),this.setInputAttributes([]),this.input.addEventListener("change",(function(e){e.preventDefault(),e.stopPropagation(),t.onInputChange()})),this.control=this.theme.getFormControl(this.label,this.input,this.description,this.infoButton),this.container.appendChild(this.control),this.value=this.enum_values[0],window.requestAnimationFrame((function(){t.input.parentNode&&t.afterInputReady()}))}},{key:"afterInputReady",value:function(){this.theme.afterInputReady(this.input)}},{key:"onInputChange",value:function(){var t,e=this.typecast(this.input.value);(t=this.enum_values.includes(e)?this.enum_values[this.enum_values.indexOf(e)]:this.enum_values[0])!==this.value&&(this.is_dirty=!0,this.value=t,this.onChange(!0))}},{key:"onWatchedFieldChange",value:function(){var t,e,r=[],n=[];if(this.enumSource){t=this.getWatchedFieldValues();for(var i=0;i<this.enumSource.length;i++)if(Array.isArray(this.enumSource[i]))r=r.concat(this.enumSource[i]),n=n.concat(this.enumSource[i]);else{var o=[];if(o=Array.isArray(this.enumSource[i].source)?this.enumSource[i].source:t[this.enumSource[i].source]){if(this.enumSource[i].slice&&(o=Array.prototype.slice.apply(o,this.enumSource[i].slice)),this.enumSource[i].filter){var s=[];for(e=0;e<o.length;e++)this.enumSource[i].filter({i:e,item:o[e],watched:t})&&s.push(o[e]);o=s}var l=[],c=[];for(e=0;e<o.length;e++){var u=o[e];this.enumSource[i].value?c[e]=this.typecast(this.enumSource[i].value({i:e,item:u})):c[e]=o[e],this.enumSource[i].title?l[e]=this.enumSource[i].title({i:e,item:u}):l[e]=c[e]}this.enumSource[i].sort&&function(t,e,r){t.map((function(t,r){return{v:t,t:e[r]}})).sort((function(t,e){return t.v<e.v?-r:t.v===e.v?0:r})).forEach((function(r,n){t[n]=r.v,e[n]=r.t}))}.bind(null,c,l,"desc"===this.enumSource[i].sort?1:-1)(),r=r.concat(c),n=n.concat(l)}}var h=this.value;this.theme.setSelectOptions(this.input,r,n),this.enum_options=r,this.enum_display=n,this.enum_values=r,r.includes(h)||!1!==this.jsoneditor.options.enum_source_value_auto_select?(this.input.value=h,this.value=h):(this.input.value=r[0],this.value=this.typecast(r[0]||""),this.parent&&!this.watchLoop?this.parent.onChildEditorChange(this):this.jsoneditor.onChange(),this.jsoneditor.notifyWatchers(this.path))}Bt(Dt(a.prototype),"onWatchedFieldChange",this).call(this)}},{key:"enable",value:function(){this.always_disabled||(this.input.disabled=!1,Bt(Dt(a.prototype),"enable",this).call(this))}},{key:"disable",value:function(t){t&&(this.always_disabled=!0),this.input.disabled=!0,Bt(Dt(a.prototype),"disable",this).call(this,t)}},{key:"destroy",value:function(){this.label&&this.label.parentNode&&this.label.parentNode.removeChild(this.label),this.description&&this.description.parentNode&&this.description.parentNode.removeChild(this.description),this.input&&this.input.parentNode&&this.input.parentNode.removeChild(this.input),Bt(Dt(a.prototype),"destroy",this).call(this)}},{key:"showValidationErrors",value:function(t){var e=this;this.previous_error_setting=this.jsoneditor.options.show_errors;var r=t.reduce((function(t,r){return r.path===e.path&&t.push(r.message),t}),[]);r.length?this.theme.addInputError(this.input,"".concat(r.join(". "),".")):this.theme.removeInputError(this.input)}}])&&It(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(w);function Vt(t){return Vt="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},Vt(t)}function zt(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==Vt(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==Vt(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===Vt(i)?i:String(i)),n)}var i}function Ht(){return Ht="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=qt(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},Ht.apply(this,arguments)}function Mt(t,e){return Mt=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},Mt(t,e)}function qt(t){return qt=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},qt(t)}var Gt=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&Mt(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=qt(n);if(i){var r=qt(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===Vt(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,(r=[{key:"setValue",value:function(t,e){if(this.choices_instance){var r=this.typecast(t||"");if(this.enum_values.includes(r)||(r=this.enum_values[0]),this.value===r)return;e?this.is_dirty=!1:"change"===this.jsoneditor.options.show_errors&&(this.is_dirty=!0),this.input.value=this.enum_options[this.enum_values.indexOf(r)],this.choices_instance.setChoiceByValue(this.input.value),this.value=r,this.onChange()}else Ht(qt(a.prototype),"setValue",this).call(this,t,e)}},{key:"afterInputReady",value:function(){if(window.Choices&&!this.choices_instance){var t=this.expandCallbacks("choices",l({},this.defaults.options.choices||{},this.options.choices||{}));this.choices_instance=new window.Choices(this.input,t)}Ht(qt(a.prototype),"afterInputReady",this).call(this)}},{key:"onWatchedFieldChange",value:function(){var t=this;if(Ht(qt(a.prototype),"onWatchedFieldChange",this).call(this),this.choices_instance){var e=this.enum_options.map((function(e,r){return{value:e,label:t.enum_display[r]}}));this.choices_instance.setChoices(e,"value","label",!0),this.choices_instance.setChoiceByValue("".concat(this.value))}}},{key:"enable",value:function(){!this.always_disabled&&this.choices_instance&&this.choices_instance.enable(),Ht(qt(a.prototype),"enable",this).call(this)}},{key:"disable",value:function(t){this.choices_instance&&this.choices_instance.disable(),Ht(qt(a.prototype),"disable",this).call(this,t)}},{key:"destroy",value:function(){this.choices_instance&&(this.choices_instance.destroy(),this.choices_instance=null),Ht(qt(a.prototype),"destroy",this).call(this)}}])&&zt(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(Ft);function Ut(t){return Ut="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},Ut(t)}function $t(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==Ut(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==Ut(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===Ut(i)?i:String(i)),n)}var i}function Jt(){return Jt="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Zt(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},Jt.apply(this,arguments)}function Wt(t,e){return Wt=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},Wt(t,e)}function Zt(t){return Zt=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},Zt(t)}Gt.rules={".choices > *":"box-sizing:border-box"};var Yt=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&Wt(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=Zt(n);if(i){var r=Zt(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===Ut(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,(r=[{key:"build",value:function(){if(Jt(Zt(a.prototype),"build",this).call(this),this.input&&(this.schema.max&&"string"==typeof this.schema.max&&this.input.setAttribute("max",this.schema.max),this.schema.min&&"string"==typeof this.schema.max&&this.input.setAttribute("min",this.schema.min),window.flatpickr&&"object"===Ut(this.options.flatpickr))){this.options.flatpickr.enableTime="date"!==this.schema.format,this.options.flatpickr.noCalendar="time"===this.schema.format,"integer"===this.schema.type&&(this.options.flatpickr.mode="single"),this.input.setAttribute("data-input","");var t=this.input;if(!0===this.options.flatpickr.wrap){var e=[];if(!1!==this.options.flatpickr.showToggleButton){var r=this.getButton("","time"===this.schema.format?"time":"calendar","flatpickr_toggle_button");r.setAttribute("data-toggle",""),e.push(r)}if(!1!==this.options.flatpickr.showClearButton){var n=this.getButton("","clear","flatpickr_clear_button");n.setAttribute("data-clear",""),e.push(n)}var i=this.input.parentNode,o=this.input.nextSibling,s=this.theme.getInputGroup(this.input,e);void 0!==s?(this.options.flatpickr.inline=!1,i.insertBefore(s,o),t=s):this.options.flatpickr.wrap=!1}this.flatpickr=window.flatpickr(t,this.options.flatpickr),!0===this.options.flatpickr.inline&&!0===this.options.flatpickr.inlineHideInput&&this.input.setAttribute("type","hidden")}}},{key:"getValue",value:function(){if(this.dependenciesFulfilled){if("string"===this.schema.type)return this.value;if(""!==this.value&&void 0!==this.value){var t="time"===this.schema.format?"1970-01-01 ".concat(this.value):this.value;return parseInt(new Date(t).getTime()/1e3)}}}},{key:"setValue",value:function(t,e,r){if("string"===this.schema.type)Jt(Zt(a.prototype),"setValue",this).call(this,t,e,r),this.flatpickr&&this.flatpickr.setDate(t);else if(t>0){var n=new Date(1e3*t),i=n.getFullYear(),o=this.zeroPad(n.getMonth()+1),s=this.zeroPad(n.getDate()),l=this.zeroPad(n.getHours()),c=this.zeroPad(n.getMinutes()),u=this.zeroPad(n.getSeconds()),h=[i,o,s].join("-"),p=[l,c,u].join(":"),d="".concat(h,"T").concat(p);"date"===this.schema.format?d=h:"time"===this.schema.format&&(d=p),this.input.value=d,this.refreshValue(),this.flatpickr&&this.flatpickr.setDate(d)}}},{key:"destroy",value:function(){this.flatpickr&&this.flatpickr.destroy(),this.flatpickr=null,Jt(Zt(a.prototype),"destroy",this).call(this)}},{key:"zeroPad",value:function(t){return"0".concat(t).slice(-2)}}])&&$t(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(C);function Qt(t){return Qt="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},Qt(t)}function Kt(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==Qt(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==Qt(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===Qt(i)?i:String(i)),n)}var i}function Xt(){return Xt="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=ee(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},Xt.apply(this,arguments)}function te(t,e){return te=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},te(t,e)}function ee(t){return ee=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},ee(t)}var re=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&te(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=ee(n);if(i){var r=ee(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===Qt(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,(r=[{key:"register",value:function(){if(this.editors){for(var t=0;t<this.editors.length;t++)this.editors[t]&&this.editors[t].unregister();this.editors[this.currentEditor]&&this.editors[this.currentEditor].register()}Xt(ee(a.prototype),"register",this).call(this)}},{key:"unregister",value:function(){if(Xt(ee(a.prototype),"unregister",this).call(this),this.editors)for(var t=0;t<this.editors.length;t++)this.editors[t]&&this.editors[t].unregister()}},{key:"getNumColumns",value:function(){return this.editors[this.currentEditor]?Math.max(this.editors[this.currentEditor].getNumColumns(),4):4}},{key:"enable",value:function(){if(this.editors)for(var t=0;t<this.editors.length;t++)this.editors[t]&&this.editors[t].enable();Xt(ee(a.prototype),"enable",this).call(this)}},{key:"disable",value:function(){if(this.editors)for(var t=0;t<this.editors.length;t++)this.editors[t]&&this.editors[t].disable();Xt(ee(a.prototype),"disable",this).call(this)}},{key:"switchEditor",value:function(){var t=this,e=this.getWatchedFieldValues();if(e){var r=document.location.origin+document.location.pathname+this.template(e);this.editors[this.refs[r]]||this.buildChildEditor(r),this.currentEditor=this.refs[r],this.register(),this.editors.forEach((function(e,r){e&&(t.currentEditor===r?e.container.style.display="":e.container.style.display="none")})),this.refreshValue(),this.onChange(!0)}}},{key:"buildChildEditor",value:function(t){this.refs[t]=this.editors.length;var e=this.theme.getChildEditorHolder();this.editor_holder.appendChild(e);var r=l({},this.schema,this.jsoneditor.refs[t]),n=this.jsoneditor.getEditorClass(r,this.jsoneditor),i=this.jsoneditor.createEditor(n,{jsoneditor:this.jsoneditor,schema:r,container:e,path:this.path,parent:this,required:!0});this.editors.push(i),i.preBuild(),i.build(),i.postBuild()}},{key:"preBuild",value:function(){var t;for(this.refs={},this.editors=[],this.currentEditor="",t=0;t<this.schema.links.length;t++)if("describedby"===this.schema.links[t].rel.toLowerCase()){this.template=this.jsoneditor.compileTemplate(this.schema.links[t].href,this.template_engine);break}this.schema.links=this.schema.links.slice(0,t).concat(this.schema.links.slice(t+1)),0===this.schema.links.length&&delete this.schema.links,this.baseSchema=l({},this.schema)}},{key:"build",value:function(){this.editor_holder=document.createElement("div"),this.container.appendChild(this.editor_holder),this.switchEditor()}},{key:"onWatchedFieldChange",value:function(){this.switchEditor()}},{key:"onChildEditorChange",value:function(t){this.editors[this.currentEditor]&&this.refreshValue(),Xt(ee(a.prototype),"onChildEditorChange",this).call(this,t)}},{key:"refreshValue",value:function(){this.editors[this.currentEditor]&&(this.value=this.editors[this.currentEditor].getValue())}},{key:"setValue",value:function(t,e){this.editors[this.currentEditor]&&(this.editors[this.currentEditor].setValue(t,e),this.refreshValue(),this.onChange())}},{key:"destroy",value:function(){this.editors.forEach((function(t){t&&t.destroy()})),this.editor_holder&&this.editor_holder.parentNode&&this.editor_holder.parentNode.removeChild(this.editor_holder),Xt(ee(a.prototype),"destroy",this).call(this)}},{key:"showValidationErrors",value:function(t){this.editors.forEach((function(e){e&&e.showValidationErrors(t)}))}}])&&Kt(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(w);function ne(t){return ne="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},ne(t)}function ie(t,e){(null==e||e>t.length)&&(e=t.length);for(var r=0,n=new Array(e);r<e;r++)n[r]=t[r];return n}function oe(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==ne(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==ne(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===ne(i)?i:String(i)),n)}var i}function ae(){return ae="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=le(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},ae.apply(this,arguments)}function se(t,e){return se=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},se(t,e)}function le(t){return le=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},le(t)}var ce=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&se(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=le(n);if(i){var r=le(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===ne(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,(r=[{key:"getNumColumns",value:function(){return 4}},{key:"build",value:function(){var t=this;this.title=this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired()),this.container.appendChild(this.title),this.options.enum_titles=this.options.enum_titles||[],this.enum=this.schema.enum,this.selected=0,this.select_options=[],this.html_values=[];for(var e=0;e<this.enum.length;e++)this.select_options[e]=this.options.enum_titles[e]||"Value ".concat(e+1),this.html_values[e]=this.getHTML(this.enum[e]);this.switcher=this.theme.getSwitcher(this.select_options),this.container.appendChild(this.switcher),this.display_area=this.theme.getIndentedPanel(),this.container.appendChild(this.display_area),this.options.hide_display&&(this.display_area.style.display="none"),this.switcher.addEventListener("change",(function(e){t.selected=t.select_options.indexOf(e.currentTarget.value),t.value=t.enum[t.selected],t.refreshValue(),t.onChange(!0)})),this.value=this.enum[0],this.refreshValue(),1===this.enum.length&&(this.switcher.style.display="none")}},{key:"refreshValue",value:function(){var t=this;this.selected=-1;var e=JSON.stringify(this.value);this.enum.forEach((function(r,n){if(e===JSON.stringify(r))return t.selected=n,!1})),this.selected<0?this.setValue(this.enum[0]):(this.switcher.value=this.select_options[this.selected],this.display_area.innerHTML=this.html_values[this.selected])}},{key:"enable",value:function(){this.always_disabled||(this.switcher.disabled=!1,ae(le(a.prototype),"enable",this).call(this))}},{key:"disable",value:function(t){t&&(this.always_disabled=!0),this.switcher.disabled=!0,ae(le(a.prototype),"disable",this).call(this)}},{key:"getHTML",value:function(t){var e,r,n=this;if(null===t)return"<em>null</em>";if("object"===ne(t)){var i="";return e=t,r=function(e,r){var o=n.getHTML(r);Array.isArray(t)||(o="<div><em>".concat(e,"</em>: ").concat(o,"</div>")),i+="<li>".concat(o,"</li>")},Array.isArray(e)||"number"==typeof e.length&&e.length>0&&e.length-1 in e?Array.from(e).forEach((function(t,e){return r(e,t)})):Object.entries(e).forEach((function(t){var e,n,i=(n=2,function(t){if(Array.isArray(t))return t}(e=t)||function(t,e){var r=null==t?null:"undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(null!=r){var n,i,o,a,s=[],l=!0,c=!1;try{if(o=(r=r.call(t)).next,0===e){if(Object(r)!==r)return;l=!1}else for(;!(l=(n=o.call(r)).done)&&(s.push(n.value),s.length!==e);l=!0);}catch(t){c=!0,i=t}finally{try{if(!l&&null!=r.return&&(a=r.return(),Object(a)!==a))return}finally{if(c)throw i}}return s}}(e,n)||function(t,e){if(t){if("string"==typeof t)return ie(t,e);var r=Object.prototype.toString.call(t).slice(8,-1);return"Object"===r&&t.constructor&&(r=t.constructor.name),"Map"===r||"Set"===r?Array.from(t):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?ie(t,e):void 0}}(e,n)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()),o=i[0],a=i[1];return r(o,a)})),i=Array.isArray(t)?"<ol>".concat(i,"</ol>"):"<ul style='margin-top:0;margin-bottom:0;padding-top:0;padding-bottom:0;'>".concat(i,"</ul>")}return"boolean"==typeof t?t?"true":"false":"string"==typeof t?t.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;"):t}},{key:"setValue",value:function(t){this.value!==t&&(this.value=t,this.refreshValue(),this.onChange())}},{key:"destroy",value:function(){this.display_area&&this.display_area.parentNode&&this.display_area.parentNode.removeChild(this.display_area),this.title&&this.title.parentNode&&this.title.parentNode.removeChild(this.title),this.switcher&&this.switcher.parentNode&&this.switcher.parentNode.removeChild(this.switcher),ae(le(a.prototype),"destroy",this).call(this)}}])&&oe(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(w);function ue(t){return ue="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},ue(t)}function he(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==ue(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==ue(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===ue(i)?i:String(i)),n)}var i}function pe(){return pe="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=fe(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},pe.apply(this,arguments)}function de(t,e){return de=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},de(t,e)}function fe(t){return fe=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},fe(t)}var ye=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&de(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=fe(n);if(i){var r=fe(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===ue(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,(r=[{key:"register",value:function(){pe(fe(a.prototype),"register",this).call(this),this.input&&this.jsoneditor.options.use_name_attributes&&this.input.setAttribute("name",this.formname)}},{key:"unregister",value:function(){pe(fe(a.prototype),"unregister",this).call(this),this.input&&this.input.removeAttribute("name")}},{key:"setValue",value:function(t,e,r){if((!this.template||r)&&(null==t?t="":"object"===ue(t)?t=JSON.stringify(t):"string"!=typeof t&&(t="".concat(t)),t!==this.serialized)){var n=this.sanitize(t);if(this.input.value!==n){this.input.value=n;var i=r||this.getValue()!==t;this.refreshValue(),e?this.is_dirty=!1:"change"===this.jsoneditor.options.show_errors&&(this.is_dirty=!0),this.adjust_height&&this.adjust_height(this.input),this.onChange(i)}}}},{key:"getNumColumns",value:function(){return 2}},{key:"enable",value:function(){pe(fe(a.prototype),"enable",this).call(this)}},{key:"disable",value:function(){pe(fe(a.prototype),"disable",this).call(this)}},{key:"refreshValue",value:function(){this.value=this.input.value,"string"!=typeof this.value&&(this.value=""),this.serialized=this.value}},{key:"destroy",value:function(){this.template=null,this.input&&this.input.parentNode&&this.input.parentNode.removeChild(this.input),this.label&&this.label.parentNode&&this.label.parentNode.removeChild(this.label),this.description&&this.description.parentNode&&this.description.parentNode.removeChild(this.description),pe(fe(a.prototype),"destroy",this).call(this)}},{key:"sanitize",value:function(t){return t}},{key:"onWatchedFieldChange",value:function(){var t;this.template&&(t=this.getWatchedFieldValues(),this.setValue(this.template(t),!1,!0)),pe(fe(a.prototype),"onWatchedFieldChange",this).call(this)}},{key:"build",value:function(){if(this.format=this.schema.format,!this.format&&this.options.default_format&&(this.format=this.options.default_format),this.options.format&&(this.format=this.options.format),this.input_type="hidden",this.input=this.theme.getFormInputField(this.input_type),this.format&&this.input.setAttribute("data-schemaformat",this.format),this.container.appendChild(this.input),this.schema.template){var t=this.expandCallbacks("template",{template:this.schema.template});"function"==typeof t.template?this.template=t.template:this.template=this.jsoneditor.compileTemplate(this.schema.template,this.template_engine),this.refreshValue()}else this.refreshValue()}}])&&he(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(w);function me(t){return me="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},me(t)}function ve(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==me(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==me(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===me(i)?i:String(i)),n)}var i}function be(t,e){return be=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},be(t,e)}function ge(t){return ge=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},ge(t)}var we=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&be(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=ge(n);if(i){var r=ge(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===me(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,(r=[{key:"build",value:function(){this.options.compact=!1,this.header=this.label=this.theme.getFormInputLabel(this.getTitle()),this.description=this.theme.getDescription(this.schema.description||""),this.control=this.theme.getFormControl(this.label,this.description,null),this.container.appendChild(this.control)}},{key:"getTitle",value:function(){return this.translateProperty(this.schema.title)}},{key:"getNumColumns",value:function(){return 12}}])&&ve(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(Ct);function _e(t){return _e="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},_e(t)}function ke(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==_e(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==_e(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===_e(i)?i:String(i)),n)}var i}function je(){return je="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=xe(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},je.apply(this,arguments)}function Oe(t,e){return Oe=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},Oe(t,e)}function xe(t){return xe=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},xe(t)}var Ce=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&Oe(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=xe(n);if(i){var r=xe(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===_e(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,(r=[{key:"build",value:function(){if(je(xe(a.prototype),"build",this).call(this),void 0!==this.schema.minimum){var t=this.schema.minimum;void 0!==this.schema.exclusiveMinimum&&(t+=1),this.input.setAttribute("min",t)}if(void 0!==this.schema.maximum){var e=this.schema.maximum;void 0!==this.schema.exclusiveMaximum&&(e-=1),this.input.setAttribute("max",e)}if(void 0!==this.schema.step){var r=this.schema.step||1;this.input.setAttribute("step",r)}this.setInputAttributes(["maxlength","pattern","readonly","min","max","step"])}},{key:"getNumColumns",value:function(){return 2}},{key:"getValue",value:function(){if(this.dependenciesFulfilled)return this.schema.default||this.jsoneditor.options.use_default_values||""!==this.value?function(t){if(null==t)return!1;var e=t.match(p),r=parseFloat(t);return null!==e&&!isNaN(r)&&isFinite(r)}(this.value)?parseFloat(this.value):this.value:void(this.input.value="")}}])&&ke(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(C);function Ee(t){return Ee="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},Ee(t)}function Se(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==Ee(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==Ee(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===Ee(i)?i:String(i)),n)}var i}function Pe(t,e){return Pe=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},Pe(t,e)}function Te(t){return Te=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},Te(t)}var Le=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&Pe(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=Te(n);if(i){var r=Te(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===Ee(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,(r=[{key:"getNumColumns",value:function(){return 2}},{key:"getValue",value:function(){if(this.dependenciesFulfilled)return this.schema.default||this.jsoneditor.options.use_default_values||""!==this.value?function(t){if(null==t)return!1;var e=t.match(d),r=parseInt(t);return null!==e&&!isNaN(r)&&isFinite(r)}(this.value)?parseInt(this.value):this.value:void(this.input.value="")}}])&&Se(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(Ce);function Re(t){return Re="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},Re(t)}function Ae(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==Re(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==Re(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===Re(i)?i:String(i)),n)}var i}function Ie(){return Ie="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Ne(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},Ie.apply(this,arguments)}function Be(t,e){return Be=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},Be(t,e)}function Ne(t){return Ne=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},Ne(t)}var De=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&Be(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=Ne(n);if(i){var r=Ne(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===Re(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,(r=[{key:"preBuild",value:function(){if(Ie(Ne(a.prototype),"preBuild",this).call(this),this.schema.options||(this.schema.options={}),!this.schema.options.cleave)switch(this.format){case"ipv6":this.schema.options.cleave={delimiters:[":"],blocks:[4,4,4,4,4,4,4,4],uppercase:!0};break;case"ipv4":this.schema.options.cleave={delimiters:["."],blocks:[3,3,3,3],numericOnly:!0}}this.options=l(this.options,this.schema.options||{})}}])&&Ae(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(C);function Fe(t){return Fe="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},Fe(t)}function Ve(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==Fe(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==Fe(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===Fe(i)?i:String(i)),n)}var i}function ze(){return ze="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Me(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},ze.apply(this,arguments)}function He(t,e){return He=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},He(t,e)}function Me(t){return Me=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},Me(t)}var qe=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&He(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=Me(n);if(i){var r=Me(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===Fe(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,(r=[{key:"setValue",value:function(t,e,r){var n=ze(Me(a.prototype),"setValue",this).call(this,t,e,r);void 0!==n&&n.changed&&this.jodit_instance&&this.jodit_instance.setEditorValue(n.value)}},{key:"build",value:function(){this.options.format="textarea",ze(Me(a.prototype),"build",this).call(this),this.input_type=this.schema.format,this.input.setAttribute("data-schemaformat",this.input_type)}},{key:"afterInputReady",value:function(){var t,e=this;window.Jodit?(t=this.expandCallbacks("jodit",l({},{height:300},this.defaults.options.jodit||{},this.options.jodit||{})),this.jodit_instance=new window.Jodit(this.input,t),(this.schema.readOnly||this.schema.readonly||this.schema.template)&&this.jodit_instance.setReadOnly(!0),this.jodit_instance.events.on("change",(function(){e.value=e.jodit_instance.getEditorValue(),e.is_dirty=!0,e.onChange(!0)})),this.theme.afterInputReady(this.input)):ze(Me(a.prototype),"afterInputReady",this).call(this)}},{key:"getNumColumns",value:function(){return 6}},{key:"enable",value:function(){!this.always_disabled&&this.jodit_instance&&this.jodit_instance.setReadOnly(!1),ze(Me(a.prototype),"enable",this).call(this)}},{key:"disable",value:function(t){this.jodit_instance&&this.jodit_instance.setReadOnly(!0),ze(Me(a.prototype),"disable",this).call(this,t)}},{key:"destroy",value:function(){this.jodit_instance&&(this.jodit_instance.destruct(),this.jodit_instance=null),ze(Me(a.prototype),"destroy",this).call(this)}}])&&Ve(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(C),Ge=(r(6541),r(9337),r(3321),function(t){var e=t.split(".");if(4!==e.length)throw new Error("error_ipv4");e.forEach((function(t){if(isNaN(+t)||+t<0||+t>255)throw new Error("error_ipv4")}))}),Ue=function(t){if(!t.match("^(?:(?:(?:[a-fA-F0-9]{1,4}:){6}|(?=(?:[a-fA-F0-9]{0,4}:){2,6}(?:[0-9]{1,3}.){3}[0-9]{1,3}$)(([0-9a-fA-F]{1,4}:){1,5}|:)((:[0-9a-fA-F]{1,4}){1,5}:|:)|::(?:[a-fA-F0-9]{1,4}:){5})(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9]).){3}(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])|(?:[a-fA-F0-9]{1,4}:){7}[a-fA-F0-9]{1,4}|(?=(?:[a-fA-F0-9]{0,4}:){0,7}[a-fA-F0-9]{0,4}$)(([0-9a-fA-F]{1,4}:){1,7}|:)((:[0-9a-fA-F]{1,4}){1,7}|:)|(?:[a-fA-F0-9]{1,4}:){7}:|:(:[a-fA-F0-9]{1,4}){7})$"))throw new Error("error_ipv6")},$e=function(t){if(!t.match("(?=^.{4,253}$)(^((?!-)[a-zA-Z0-9-]{0,62}[a-zA-Z0-9].)+[a-zA-Z]{2,63}$)"))throw new Error("error_hostname")};function Je(t,e,r,n){try{switch(t.format){case"ipv4":Ge(e);break;case"ipv6":Ue(e);break;case"hostname":$e(e)}return[]}catch(t){return[{path:r,property:"format",message:n(t.message)}]}}function We(t,e){var r=Object.keys(t);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(t);e&&(n=n.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),r.push.apply(r,n)}return r}function Ze(t,e,r){return(e=rr(e))in t?Object.defineProperty(t,e,{value:r,enumerable:!0,configurable:!0,writable:!0}):t[e]=r,t}function Ye(t,e){return function(t){if(Array.isArray(t))return t}(t)||function(t,e){var r=null==t?null:"undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(null!=r){var n,i,o,a,s=[],l=!0,c=!1;try{if(o=(r=r.call(t)).next,0===e){if(Object(r)!==r)return;l=!1}else for(;!(l=(n=o.call(r)).done)&&(s.push(n.value),s.length!==e);l=!0);}catch(t){c=!0,i=t}finally{try{if(!l&&null!=r.return&&(a=r.return(),Object(a)!==a))return}finally{if(c)throw i}}return s}}(t,e)||Xe(t,e)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function Qe(t){return Qe="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},Qe(t)}function Ke(t){return function(t){if(Array.isArray(t))return tr(t)}(t)||function(t){if("undefined"!=typeof Symbol&&null!=t[Symbol.iterator]||null!=t["@@iterator"])return Array.from(t)}(t)||Xe(t)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function Xe(t,e){if(t){if("string"==typeof t)return tr(t,e);var r=Object.prototype.toString.call(t).slice(8,-1);return"Object"===r&&t.constructor&&(r=t.constructor.name),"Map"===r||"Set"===r?Array.from(t):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?tr(t,e):void 0}}function tr(t,e){(null==e||e>t.length)&&(e=t.length);for(var r=0,n=new Array(e);r<e;r++)n[r]=t[r];return n}function er(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,rr(n.key),n)}}function rr(t){var e=function(t,e){if("object"!==Qe(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==Qe(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(t);return"symbol"===Qe(e)?e:String(e)}var nr=function(){function t(e,r,n,i){!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,t),this.jsoneditor=e,this.schema=r||this.jsoneditor.schema,this.options=n||{},this.translate=this.jsoneditor.translate||i.translate,this.translateProperty=this.jsoneditor.translateProperty||i.translateProperty,this.defaults=i,this._validateSubSchema={dependentSchemas:function(t,e,r){var n=this,i=[];return Object.keys(t.dependentSchemas).forEach((function(o){if(void 0!==e[o]){var a=t.dependentSchemas[o],s=n._validateSchema(a,e,r);i=[].concat(Ke(i),Ke(s))}})),i},contains:function(t,e,r){var n=this,i=[],o=0;e.forEach((function(e){0===n._validateSchema(t.contains,e,r).length&&o++}));var a=0===o;return void 0!==t.minContains?o<t.minContains&&i.push({message:this.translate("error_minContains",[o,t.minContains],t),path:r}):a&&i.push({message:this.translate("error_contains",null,t),path:r}),void 0!==t.maxContains&&o>t.maxContains&&i.push({message:this.translate("error_maxContains",[o,t.maxContains],t),path:r}),i},if:function(t,e,r){if(void 0===t.then&&void 0===t.else)return[];var n=this._validateSchema(t.if,e,r),i=[],o=[];return void 0!==t.then&&(i=this._validateSchema(t.then,e,r)),void 0!==t.else&&(o=this._validateSchema(t.else,e,r)),!0===t.if?i:!1===t.if?o:0===n.length?i:n.length>0?o:[]},const:function(t,e,r){return JSON.stringify(t.const)!==JSON.stringify(e)||Array.isArray(e)||"object"===Qe(e)?[{path:r,property:"const",message:this.translate("error_const",null,t)}]:[]},enum:function(t,e,r){var n=JSON.stringify(e);return t.enum.some((function(t){return n===JSON.stringify(t)}))?[]:[{path:r,property:"enum",message:this.translate("error_enum",null,t)}]},extends:function(t,e,r){var n=this;return t.extends.reduce((function(t,i){return t.push.apply(t,Ke(n._validateSchema(i,e,r))),t}),[])},allOf:function(t,e,r){var n=this;return t.allOf.reduce((function(t,i){return t.push.apply(t,Ke(n._validateSchema(i,e,r))),t}),[])},anyOf:function(t,e,r){var n=this;return t.anyOf.some((function(t){return!n._validateSchema(t,e,r).length}))?[]:[{path:r,property:"anyOf",message:this.translate("error_anyOf",null,t)}]},oneOf:function(t,e,r){var n=this,i=0,o=[];t.oneOf.forEach((function(t,a){var s=n._validateSchema(t,e,r);s.length||i++,s.forEach((function(t){t.path="".concat(r,".oneOf[").concat(a,"]").concat(t.path.substr(r.length))})),o.push.apply(o,Ke(s))}));var a=[];return 1!==i&&(a.push({path:r,property:"oneOf",message:this.translate("error_oneOf",[i],t)}),a.push.apply(a,o)),a},not:function(t,e,r){return this._validateSchema(t.not,e,r).length?[]:[{path:r,property:"not",message:this.translate("error_not",null,t)}]},type:function(t,e,r){var n=this;if(Array.isArray(t.type)){if(!t.type.some((function(t){return n._checkType(t,e)})))return[{path:r,property:"type",message:this.translate("error_type_union",null,t)}]}else if(["date","time","datetime-local"].includes(t.format)&&"integer"===t.type){if(!this._checkType("string","".concat(e)))return[{path:r,property:"type",message:this.translate("error_type",[t.format],t)}]}else if(!this._checkType(t.type,e))return[{path:r,property:"type",message:this.translate("error_type",[t.type],t)}];return[]},disallow:function(t,e,r){var n=this;if(Array.isArray(t.disallow)){if(t.disallow.some((function(t){return n._checkType(t,e)})))return[{path:r,property:"disallow",message:this.translate("error_disallow_union",null,t)}]}else if(this._checkType(t.disallow,e))return[{path:r,property:"disallow",message:this.translate("error_disallow",[t.disallow],t)}];return[]}},this._validateNumberSubSchema={multipleOf:function(t,e,r){return this._validateNumberSubSchemaMultipleDivisible(t,e,r)},divisibleBy:function(t,e,r){return this._validateNumberSubSchemaMultipleDivisible(t,e,r)},maximum:function(t,e,r){var n=t.exclusiveMaximum?e<t.maximum:e<=t.maximum;return window.math?n=window.math[t.exclusiveMaximum?"smaller":"smallerEq"](window.math.bignumber(e),window.math.bignumber(t.maximum)):window.Decimal&&(n=new window.Decimal(e)[t.exclusiveMaximum?"lt":"lte"](new window.Decimal(t.maximum))),n?[]:[{path:r,property:"maximum",message:this.translate(t.exclusiveMaximum?"error_maximum_excl":"error_maximum_incl",[t.maximum],t)}]},minimum:function(t,e,r){var n=t.exclusiveMinimum?e>t.minimum:e>=t.minimum;return window.math?n=window.math[t.exclusiveMinimum?"larger":"largerEq"](window.math.bignumber(e),window.math.bignumber(t.minimum)):window.Decimal&&(n=new window.Decimal(e)[t.exclusiveMinimum?"gt":"gte"](new window.Decimal(t.minimum))),n?[]:[{path:r,property:"minimum",message:this.translate(t.exclusiveMinimum?"error_minimum_excl":"error_minimum_incl",[t.minimum],t)}]}},this._validateStringSubSchema={maxLength:function(t,e,r){var n=[];return"".concat(e).length>t.maxLength&&n.push({path:r,property:"maxLength",message:this.translate("error_maxLength",[t.maxLength],t)}),n},minLength:function(t,e,r){return"".concat(e).length<t.minLength?[{path:r,property:"minLength",message:this.translate(1===t.minLength?"error_notempty":"error_minLength",[t.minLength],t)}]:[]},pattern:function(t,e,r){return new RegExp(t.pattern).test(e)?[]:[{path:r,property:"pattern",message:t.options&&t.options.patternmessage?t.options.patternmessage:this.translate("error_pattern",[t.pattern],t)}]}},this._validateArraySubSchema={items:function(t,e,r){var n=this,i=[];if(Array.isArray(t.items))for(var o=0;o<e.length;o++)if(t.items[o])i.push.apply(i,Ke(this._validateSchema(t.items[o],e[o],"".concat(r,".").concat(o))));else{if(!0===t.additionalItems)break;if(!t.additionalItems){if(!1===t.additionalItems){i.push({path:r,property:"additionalItems",message:this.translate("error_additionalItems",null,t)});break}break}i.push.apply(i,Ke(this._validateSchema(t.additionalItems,e[o],"".concat(r,".").concat(o))))}else e.forEach((function(e,o){i.push.apply(i,Ke(n._validateSchema(t.items,e,"".concat(r,".").concat(o))))}));return i},maxItems:function(t,e,r){return e.length>t.maxItems?[{path:r,property:"maxItems",message:this.translate("error_maxItems",[t.maxItems],t)}]:[]},minItems:function(t,e,r){return e.length<t.minItems?[{path:r,property:"minItems",message:this.translate("error_minItems",[t.minItems],t)}]:[]},uniqueItems:function(t,e,r){for(var n={},i=0;i<e.length;i++){var o=JSON.stringify(e[i]);if(n[o])return[{path:r,property:"uniqueItems",message:this.translate("error_uniqueItems",null,t)}];n[o]=!0}return[]}},this._validateObjectSubSchema={maxProperties:function(t,e,r){return Object.keys(e).length>t.maxProperties?[{path:r,property:"maxProperties",message:this.translate("error_maxProperties",[t.maxProperties],t)}]:[]},minProperties:function(t,e,r){return Object.keys(e).length<t.minProperties?[{path:r,property:"minProperties",message:this.translate("error_minProperties",[t.minProperties],t)}]:[]},required:function(t,e,r){var n=this,i=[];return Array.isArray(t.required)&&t.required.forEach((function(o){if(void 0===e[o]){var a=n.jsoneditor.getEditor("".concat(r,".").concat(o));a&&!1===a.dependenciesFulfilled||a&&["button","info"].includes(a.schema.format||a.schema.type)||i.push({path:r,property:"required",message:n.translate("error_required",[t&&t.properties&&t.properties[o]&&t.properties[o].title?t.properties[o].title:o],t)})}})),i},properties:function(t,e,r,n){var i=this,o=[];return Object.entries(t.properties).forEach((function(t){var a=Ye(t,2),s=a[0],l=a[1];n[s]=!0,o.push.apply(o,Ke(i._validateSchema(l,e[s],"".concat(r,".").concat(s))))})),o},patternProperties:function(t,e,r,n){var i=this,o=[];return Object.entries(t.patternProperties).forEach((function(t){var a=Ye(t,2),s=a[0],l=a[1],c=new RegExp(s);Object.entries(e).forEach((function(t){var e=Ye(t,2),a=e[0],s=e[1];c.test(a)&&(n[a]=!0,o.push.apply(o,Ke(i._validateSchema(l,s,"".concat(r,".").concat(a)))))}))})),o}},this._validateObjectSubSchema2={propertyNames:function(t,e,r,n){for(var i=this,o=[],a=Object.keys(e),s=null,l=function(){var e="";return s=a[c],"boolean"==typeof t.propertyNames?!0===t.propertyNames?"continue":(o.push({path:r,property:"propertyNames",message:i.translate("error_property_names_false",[s],t)}),"break"):Object.entries(t.propertyNames).every((function(n){var a=Ye(n,2),l=a[0],c=a[1],u=!1;switch(l){case"maxLength":if("number"!=typeof c){e="error_property_names_maxlength";break}if(s.length>c){e="error_property_names_exceeds_maxlength";break}return!0;case"const":if(c!==s){e="error_property_names_const_mismatch";break}return!0;case"enum":if(!Array.isArray(c)){e="error_property_names_enum";break}if(c.forEach((function(t){t===s&&(u=!0)})),!u){e="error_property_names_enum_mismatch";break}return!0;case"pattern":if("string"!=typeof c){e="error_property_names_pattern";break}if(!new RegExp(c).test(s)){e="error_property_names_pattern_mismatch";break}return!0;default:return o.push({path:r,property:"propertyNames",message:i.translate("error_property_names_unsupported",[l],t)}),!1}return o.push({path:r,property:"propertyNames",message:i.translate(e,[s],t)}),!1}))?void 0:"break"},c=0;c<a.length;c++){var u=l();if("continue"!==u&&"break"===u)break}return o},additionalProperties:function(t,e,r,n){for(var i=[],o=Object.keys(e),a=0;a<o.length;a++){var s=o[a];if(!n[s]){if(!t.additionalProperties){i.push({path:r,property:"additionalProperties",message:this.translate("error_additional_properties",[s],t)});break}if(!0===t.additionalProperties)break;i.push.apply(i,Ke(this._validateSchema(t.additionalProperties,e[s],"".concat(r,".").concat(s))))}}return i},dependencies:function(t,e,r){var n=this,i=[];return Object.entries(t.dependencies).forEach((function(o){var a=Ye(o,2),s=a[0],l=a[1];void 0!==e[s]&&(Array.isArray(l)?l.forEach((function(o){void 0===e[o]&&i.push({path:r,property:"dependencies",message:n.translate("error_dependency",[o],t)})})):i.push.apply(i,Ke(n._validateSchema(l,e,r))))})),i}}}var e,r;return e=t,r=[{key:"fitTest",value:function(t,e){var r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:1e7,n={match:0,extra:0};if("object"===Qe(t)&&null!==t){var i=this._getSchema(e);if(i.anyOf){var o,a=function(t){for(var e=1;e<arguments.length;e++){var r=null!=arguments[e]?arguments[e]:{};e%2?We(Object(r),!0).forEach((function(e){Ze(t,e,r[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(r)):We(Object(r)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(r,e))}))}return t}({},n),s=function(t,e){var r="undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(!r){if(Array.isArray(t)||(r=Xe(t))){r&&(t=r);var n=0,i=function(){};return{s:i,n:function(){return n>=t.length?{done:!0}:{done:!1,value:t[n++]}},e:function(t){throw t},f:i}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var o,a=!0,s=!1;return{s:function(){r=r.call(t)},n:function(){var t=r.next();return a=t.done,t},e:function(t){s=!0,o=t},f:function(){try{a||null==r.return||r.return()}finally{if(s)throw o}}}}(i.anyOf);try{for(s.s();!(o=s.n()).done;){var l=o.value,c=this.fitTest(t,l,r);(c.match>a.match||c.match===a.match&&c.extra<a.extra)&&(a=c)}}catch(t){s.e(t)}finally{s.f()}return a}var u=this._getSchema(e).properties;for(var p in u)if(h(u,p)){if("object"===Qe(t[p])&&"object"===Qe(u[p])&&"object"===Qe(u[p].properties)){var d=this.fitTest(t[p],u[p],r/100);n.match+=d.match,n.extra+=d.extra}void 0!==t[p]&&(n.match+=r)}else n.extra+=r}return n}},{key:"_getSchema",value:function(t){return void 0===t?l({},this.jsoneditor.expandRefs(this.schema)):t}},{key:"validate",value:function(t){return this._validateSchema(this.schema,t)}},{key:"_validateSchema",value:function(t,e,r){var n=this,i=[];return r=r||this.jsoneditor.root.formname,t=l({},this.jsoneditor.expandRefs(t)),void 0===e?this._validateV3Required(t,e,r):(Object.keys(t).forEach((function(o){n._validateSubSchema[o]&&i.push.apply(i,Ke(n._validateSubSchema[o].call(n,t,e,r)))})),i.push.apply(i,Ke(this._validateByValueType(t,e,r))),t.links&&t.links.forEach((function(o,a){o.rel&&"describedby"===o.rel.toLowerCase()&&(t=n._expandSchemaLink(t,a),i.push.apply(i,Ke(n._validateSchema(t,e,r,n.translate))))})),["date","time","datetime-local"].includes(t.format)&&i.push.apply(i,Ke(this._validateDateTimeSubSchema(t,e,r))),["uuid"].includes(t.format)&&i.push.apply(i,Ke(this._validateUUIDSchema(t,e,r))),i.push.apply(i,Ke(this._validateCustomValidator(t,e,r))),this._removeDuplicateErrors(i))}},{key:"_expandSchemaLink",value:function(t,e){var r=t.links[e].href,n=this.jsoneditor.root.getValue(),i=this.jsoneditor.compileTemplate(r,this.jsoneditor.template),o=document.location.origin+document.location.pathname+i(n);return t.links=t.links.slice(0,e).concat(t.links.slice(e+1)),l({},t,this.jsoneditor.refs[o])}},{key:"_validateV3Required",value:function(t,e,r){return(void 0!==t.required&&!0===t.required||void 0===t.required&&!0===this.jsoneditor.options.required_by_default)&&"info"!==t.type?[{path:r,property:"required",message:this.translate("error_notset",null,t)}]:[]}},{key:"_validateByValueType",value:function(t,e,r){var n=this,i=[];if(null===e)return i;if("number"==typeof e)Object.keys(t).forEach((function(o){n._validateNumberSubSchema[o]&&i.push.apply(i,Ke(n._validateNumberSubSchema[o].call(n,t,e,r)))}));else if("string"==typeof e)Object.keys(t).forEach((function(o){n._validateStringSubSchema[o]&&i.push.apply(i,Ke(n._validateStringSubSchema[o].call(n,t,e,r)))}));else if(Array.isArray(e))Object.keys(t).forEach((function(o){n._validateArraySubSchema[o]&&i.push.apply(i,Ke(n._validateArraySubSchema[o].call(n,t,e,r)))}));else if("object"===Qe(e)){var o={};Object.keys(t).forEach((function(a){n._validateObjectSubSchema[a]&&i.push.apply(i,Ke(n._validateObjectSubSchema[a].call(n,t,e,r,o)))})),void 0!==t.additionalProperties||!this.jsoneditor.options.no_additional_properties||t.oneOf||t.anyOf||t.allOf||(t.additionalProperties=!1),Object.keys(t).forEach((function(a){void 0!==n._validateObjectSubSchema2[a]&&i.push.apply(i,Ke(n._validateObjectSubSchema2[a].call(n,t,e,r,o)))}))}return i}},{key:"_validateUUIDSchema",value:function(t,e,r){return/^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(e)?[]:[{path:r,property:"format",message:this.translate("error_pattern",["^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$"],t)}]}},{key:"_validateNumberSubSchemaMultipleDivisible",value:function(t,e,r){var n=t.multipleOf||t.divisibleBy,i=e/n===Math.floor(e/n);return window.math?i=window.math.mod(window.math.bignumber(e),window.math.bignumber(n)).equals(0):window.Decimal&&(i=new window.Decimal(e).mod(new window.Decimal(n)).equals(0)),i?[]:[{path:r,property:t.multipleOf?"multipleOf":"divisibleBy",message:this.translate("error_multipleOf",[n],t)}]}},{key:"_validateDateTimeSubSchema",value:function(t,e,r){var n=this,i=this.jsoneditor.getEditor(r),o=i&&i.flatpickr?i.flatpickr.config.dateFormat:{date:'"YYYY-MM-DD"',time:'"HH:MM"',"datetime-local":'"YYYY-MM-DD HH:MM"'}[t.format];if("integer"===t.type)return function(t,e,r){return 1*e<1?[{path:r,property:"format",message:n.translate("error_invalid_epoch",null,t)}]:e!==Math.abs(parseInt(e))?[{path:r,property:"format",message:n.translate("error_".concat(t.format.replace(/-/g,"_")),[o],t)}]:[]}(t,e,r);if(i&&i.flatpickr){if(i)return function(t,e,r,i){if(""!==e){var o;if("single"!==i.flatpickr.config.mode){var a="range"===i.flatpickr.config.mode?i.flatpickr.l10n.rangeSeparator:", ";o=i.flatpickr.selectedDates.map((function(t){return i.flatpickr.formatDate(t,i.flatpickr.config.dateFormat)})).join(a)}try{if(o){if(o!==e)throw new Error("".concat(i.flatpickr.config.mode," mismatch"))}else if(i.flatpickr.formatDate(i.flatpickr.parseDate(e,i.flatpickr.config.dateFormat),i.flatpickr.config.dateFormat)!==e)throw new Error("mismatch")}catch(e){var s=void 0!==i.flatpickr.config.errorDateFormat?i.flatpickr.config.errorDateFormat:i.flatpickr.config.dateFormat;return[{path:r,property:"format",message:n.translate("error_".concat(i.format.replace(/-/g,"_")),[s],t)}]}}return[]}(t,e,r,i)}else if(!{date:/^(\d{4}\D\d{2}\D\d{2})?$/,time:/^(\d{2}:\d{2}(?::\d{2})?)?$/,"datetime-local":/^(\d{4}\D\d{2}\D\d{2}[ T]\d{2}:\d{2}(?::\d{2})?)?$/}[t.format].test(e))return[{path:r,property:"format",message:this.translate("error_".concat(t.format.replace(/-/g,"_")),[o],t)}];return[]}},{key:"_validateCustomValidator",value:function(t,e,r){var n=this,i=[];i.push.apply(i,Ke(Je.call(this,t,e,r,this.translate)));var o=function(o){i.push.apply(i,Ke(o.call(n,t,e,r)))};return this.defaults.custom_validators.forEach(o),this.options.custom_validators&&this.options.custom_validators.forEach(o),i}},{key:"_removeDuplicateErrors",value:function(t){return t.reduce((function(t,e){var r=!0;return t||(t=[]),t.forEach((function(t){t.message===e.message&&t.path===e.path&&t.property===e.property&&(t.errorcount++,r=!1)})),r&&(e.errorcount=1,t.push(e)),t}),[])}},{key:"_checkType",value:function(t,e){var r={string:function(t){return"string"==typeof t},number:function(t){return"number"==typeof t},integer:function(t){return"number"==typeof t&&t===Math.floor(t)},boolean:function(t){return"boolean"==typeof t},array:function(t){return Array.isArray(t)},object:function(t){return null!==t&&!Array.isArray(t)&&"object"===Qe(t)},null:function(t){return null===t}};return"string"==typeof t?!r[t]||r[t](e):!this._validateSchema(t,e).length}}],r&&er(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),t}();function ir(t){return ir="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},ir(t)}function or(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==ir(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==ir(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===ir(i)?i:String(i)),n)}var i}function ar(){return ar="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=lr(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},ar.apply(this,arguments)}function sr(t,e){return sr=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},sr(t,e)}function lr(t){return lr=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},lr(t)}var cr=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&sr(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=lr(n);if(i){var r=lr(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===ir(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,(r=[{key:"register",value:function(){if(this.editors){for(var t=0;t<this.editors.length;t++)this.editors[t]&&this.editors[t].unregister();this.editors[this.type]&&this.editors[this.type].register()}ar(lr(a.prototype),"register",this).call(this)}},{key:"unregister",value:function(){if(ar(lr(a.prototype),"unregister",this).call(this),this.editors)for(var t=0;t<this.editors.length;t++)this.editors[t]&&this.editors[t].unregister()}},{key:"getNumColumns",value:function(){return this.editors[this.type]?Math.max(this.editors[this.type].getNumColumns(),4):4}},{key:"enable",value:function(){if(!this.always_disabled){if(this.editors)for(var t=0;t<this.editors.length;t++)this.editors[t]&&this.editors[t].enable();this.switcher.disabled=!1,ar(lr(a.prototype),"enable",this).call(this)}}},{key:"disable",value:function(t){if(t&&(this.always_disabled=!0),this.editors)for(var e=0;e<this.editors.length;e++)this.editors[e]&&this.editors[e].disable(t);this.switcher.disabled=!0,ar(lr(a.prototype),"disable",this).call(this)}},{key:"switchEditor",value:function(t){var e=this;this.lastType=this.type,this.editors[t]||this.buildChildEditor(t);var r=this.getValue();this.type=t,this.register(),this.editors.forEach((function(t,n){t&&(e.type===n?((e.keep_values||e.if)&&t.setValue(r,!0),t.container.style.display=""):t.container.style.display="none")})),this.refreshValue(),this.refreshHeaderText()}},{key:"buildChildEditor",value:function(t){var e,r=this,n=this.types[t],i=this.theme.getChildEditorHolder();this.editor_holder.appendChild(i),"string"==typeof n?(e=l({},this.schema)).type=n:(e=l({},this.schema,n),e=this.jsoneditor.expandRefs(e),n&&n.required&&Array.isArray(n.required)&&this.schema.required&&Array.isArray(this.schema.required)&&(e.required=this.schema.required.concat(n.required)));var o=this.jsoneditor.getEditorClass(e);this.editors[t]=this.jsoneditor.createEditor(o,{jsoneditor:this.jsoneditor,schema:e,container:i,path:this.path,parent:this,required:!0}),this.editors[t].preBuild(),this.editors[t].build(),this.editors[t].postBuild(),this.editors[t].header&&(this.editors[t].header.style.display="none"),this.editors[t].option=this.switcher_options[t],i.addEventListener("change_header_text",(function(){r.refreshHeaderText()})),t!==this.type&&(i.style.display="none")}},{key:"preBuild",value:function(){if(this.types=[],this.type=0,this.editors=[],this.validators=[],this.keep_values=!0,void 0!==this.jsoneditor.options.keep_oneof_values&&(this.keep_values=this.jsoneditor.options.keep_oneof_values),void 0!==this.options.keep_oneof_values&&(this.keep_values=this.options.keep_oneof_values),this.schema.oneOf)this.oneOf=!0,this.types=this.schema.oneOf,delete this.schema.oneOf;else if(this.schema.anyOf)this.anyOf=!0,this.types=this.schema.anyOf,delete this.schema.anyOf;else if(this.schema.if)this.if=!0,this.ifSchema=JSON.parse(JSON.stringify(this.schema.if)),this.thenSchema={title:"then"},this.elseSchema={title:"else"},this.types=[],this.schema.then&&m(this.thenSchema,this.schema,this.schema.then),this.schema.else&&m(this.elseSchema,this.schema,this.schema.else),this.types.push(this.thenSchema),this.types.push(this.elseSchema),this.types.forEach((function(t){delete t.if,delete t.then,delete t.else})),delete this.schema.if;else{if(this.schema.type&&"any"!==this.schema.type)Array.isArray(this.schema.type)?this.types=this.schema.type:this.types=[this.schema.type];else if(this.types=["string","number","integer","boolean","object","array","null"],this.schema.disallow){var t=this.schema.disallow;"object"===ir(t)&&Array.isArray(t)||(t=[t]);var e=[];this.types.forEach((function(r){t.includes(r)||e.push(r)})),this.types=e}delete this.schema.type}this.display_text=this.getDisplayText(this.types)}},{key:"build",value:function(){var t=this,e=this.container;this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired()),this.switcher=this.theme.getSwitcher(this.display_text),this.if||(this.container.appendChild(this.header),e.appendChild(this.switcher)),this.switcher.addEventListener("change",(function(e){e.preventDefault(),e.stopPropagation(),t.switchEditor(t.display_text.indexOf(e.currentTarget.value)),t.onChange(!0)})),this.editor_holder=document.createElement("div"),e.appendChild(this.editor_holder);var r={};this.jsoneditor.options.custom_validators&&(r.custom_validators=this.jsoneditor.options.custom_validators),this.switcher_options=this.theme.getSwitcherOptions(this.switcher),this.types.forEach((function(e,n){var i;t.editors[n]=!1,"string"==typeof e?(i=l({},t.schema)).type=e:(i=l({},t.schema,e),e.required&&Array.isArray(e.required)&&t.schema.required&&Array.isArray(t.schema.required)&&(i.required=t.schema.required.concat(e.required))),t.validators[n]=new nr(t.jsoneditor,i,r,t.defaults)})),this.switchEditor(0)}},{key:"onChildEditorChange",value:function(t){this.editors[this.type]&&(this.refreshValue(),this.refreshHeaderText()),this.switchIf(),ar(lr(a.prototype),"onChildEditorChange",this).call(this)}},{key:"refreshHeaderText",value:function(){var t=this.getDisplayText(this.types);Array.from(this.switcher_options).forEach((function(e,r){e.textContent=t[r]}))}},{key:"refreshValue",value:function(){this.value=this.editors[this.type].getValue()}},{key:"switchIf",value:function(){if(this.ifSchema&&this.value){var t=this.getIfType(this.value);this.lastType!==t&&(this.switchEditor(t),this.editors[this.type].setValue(this.value,!0)),this.switcher.value=this.display_text[this.type]}}},{key:"getIfType",value:function(t){return 0===this.jsoneditor.validator._validateSchema(this.ifSchema,t).length?0:1}},{key:"setValue",value:function(t,e){var r=this,n=this.type,i={match:0,extra:0,i:this.type},o={match:0,i:null};this.validators.forEach((function(e,n){var a=null;void 0!==r.anyOf&&r.anyOf&&(a=e.fitTest(t),(i.match<a.match||i.match===a.match&&i.extra>a.extra)&&((i=a).i=n)),e.validate(t).length||null!==o.i?i=o:(o.i=n,null!==a&&(o.match=a.match))}));var a=o.i;void 0!==this.anyOf&&this.anyOf&&o.match<i.match&&(a=i.i),this.if&&(a=this.getIfType(t)),null===a&&(a=this.type),this.type=a,this.switcher.value=this.display_text[a];var s=this.type!==n;s&&(this.switchEditor(this.type),this.editors[this.type].setValue(t,e)),void 0!==t&&this.editors[this.type].setValue(t,e),this.refreshValue(),this.onChange(s)}},{key:"destroy",value:function(){this.editors.forEach((function(t){t&&t.destroy()})),this.editor_holder&&this.editor_holder.parentNode&&this.editor_holder.parentNode.removeChild(this.editor_holder),this.switcher&&this.switcher.parentNode&&this.switcher.parentNode.removeChild(this.switcher),ar(lr(a.prototype),"destroy",this).call(this)}},{key:"showValidationErrors",value:function(t){var e=this;if(this.oneOf||this.anyOf){var r=this.oneOf?"oneOf":"anyOf";this.editors.forEach((function(n,i){if(n){var o="".concat(e.path,".").concat(r,"[").concat(i,"]");n.showValidationErrors(t.reduce((function(t,r){if(r.path.startsWith(o)||r.path===o.substr(0,r.path.length)){var n=l({},r);r.path.startsWith(o)&&(n.path=e.path+n.path.substr(o.length)),t.push(n)}return t}),[]))}}))}else this.editors.forEach((function(e){e&&e.showValidationErrors(t)}))}},{key:"addLinks",value:function(){}}])&&or(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(w);function ur(t){return ur="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},ur(t)}function hr(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==ur(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==ur(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===ur(i)?i:String(i)),n)}var i}function pr(t,e){return pr=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},pr(t,e)}function dr(t){return dr=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},dr(t)}var fr=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&pr(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=dr(n);if(i){var r=dr(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===ur(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,(r=[{key:"getValue",value:function(){if(this.dependenciesFulfilled)return null}},{key:"setValue",value:function(){this.onChange()}},{key:"getNumColumns",value:function(){return 2}}])&&hr(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(w);function yr(t,e){var r=Object.keys(t);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(t);e&&(n=n.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),r.push.apply(r,n)}return r}function mr(t){for(var e=1;e<arguments.length;e++){var r=null!=arguments[e]?arguments[e]:{};e%2?yr(Object(r),!0).forEach((function(e){vr(t,e,r[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(r)):yr(Object(r)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(r,e))}))}return t}function vr(t,e,r){return(e=kr(e))in t?Object.defineProperty(t,e,{value:r,enumerable:!0,configurable:!0,writable:!0}):t[e]=r,t}function br(t,e){return function(t){if(Array.isArray(t))return t}(t)||function(t,e){var r=null==t?null:"undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(null!=r){var n,i,o,a,s=[],l=!0,c=!1;try{if(o=(r=r.call(t)).next,0===e){if(Object(r)!==r)return;l=!1}else for(;!(l=(n=o.call(r)).done)&&(s.push(n.value),s.length!==e);l=!0);}catch(t){c=!0,i=t}finally{try{if(!l&&null!=r.return&&(a=r.return(),Object(a)!==a))return}finally{if(c)throw i}}return s}}(t,e)||function(t,e){if(t){if("string"==typeof t)return gr(t,e);var r=Object.prototype.toString.call(t).slice(8,-1);return"Object"===r&&t.constructor&&(r=t.constructor.name),"Map"===r||"Set"===r?Array.from(t):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?gr(t,e):void 0}}(t,e)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function gr(t,e){(null==e||e>t.length)&&(e=t.length);for(var r=0,n=new Array(e);r<e;r++)n[r]=t[r];return n}function wr(t){return wr="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},wr(t)}function _r(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,kr(n.key),n)}}function kr(t){var e=function(t,e){if("object"!==wr(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==wr(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(t);return"symbol"===wr(e)?e:String(e)}function jr(){return jr="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=xr(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},jr.apply(this,arguments)}function Or(t,e){return Or=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},Or(t,e)}function xr(t){return xr=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},xr(t)}var Cr=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&Or(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=xr(n);if(i){var r=xr(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===wr(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(t,e,r){var n;return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),(n=o.call(this,t,e)).currentDepth=r,n}return e=a,(r=[{key:"getDefault",value:function(){return l({},this.schema.default||{})}},{key:"getChildEditors",value:function(){return this.editors}},{key:"register",value:function(){jr(xr(a.prototype),"register",this).call(this),this.editors&&Object.values(this.editors).forEach((function(t){return t.register()}))}},{key:"unregister",value:function(){jr(xr(a.prototype),"unregister",this).call(this),this.editors&&Object.values(this.editors).forEach((function(t){return t.unregister()}))}},{key:"getNumColumns",value:function(){return Math.max(Math.min(12,this.maxwidth),3)}},{key:"enable",value:function(){this.always_disabled||(this.editjson_control&&(this.editjson_control.disabled=!1),this.addproperty_button&&(this.addproperty_button.disabled=!1),jr(xr(a.prototype),"enable",this).call(this),this.editors&&Object.values(this.editors).forEach((function(t){t.isActive()&&t.enable(),t.optInCheckbox.disabled=!1})))}},{key:"disable",value:function(t){t&&(this.always_disabled=!0),this.editjson_control&&(this.editjson_control.disabled=!0),this.addproperty_button&&(this.addproperty_button.disabled=!0),this.hideEditJSON(),jr(xr(a.prototype),"disable",this).call(this),this.editors&&Object.values(this.editors).forEach((function(e){e.isActive()&&e.disable(t),e.optInCheckbox.disabled=!0}))}},{key:"layoutEditors",value:function(){var t,e,r=this;if(this.row_container){var n;this.property_order=Object.keys(this.editors),this.property_order=this.property_order.sort((function(t,e){var n=r.editors[t].schema.propertyOrder,i=r.editors[e].schema.propertyOrder;return"number"!=typeof n&&(n=1e3),"number"!=typeof i&&(i=1e3),n-i}));var i,o="categories"===this.format,a=[],s=null,l=null;if("grid-strict"===this.format){var u=0;if(i=[],this.property_order.forEach((function(t){var e=r.editors[t];if(!e.property_removed){var n=e.options.hidden?0:e.options.grid_columns||e.getNumColumns(),o=e.options.hidden?0:e.options.grid_offset||0,s=!e.options.hidden&&(e.options.grid_break||!1),l={key:t,width:n,offset:o,height:e.options.hidden?0:e.container.offsetHeight};i.push(l),a[u]=i,s&&(u++,i=[])}})),this.layout===JSON.stringify(a))return!1;for(this.layout=JSON.stringify(a),n=document.createElement("div"),t=0;t<a.length;t++)for(i=this.theme.getGridRow(),n.appendChild(i),e=0;e<a[t].length;e++)s=a[t][e].key,(l=this.editors[s]).options.hidden?l.container.style.display="none":this.theme.setGridColumnSize(l.container,a[t][e].width,a[t][e].offset),i.appendChild(l.container)}else if("grid"===this.format){for(this.property_order.forEach((function(t){var e=r.editors[t];if(!e.property_removed){for(var n=!1,i=e.options.hidden?0:e.options.grid_columns||e.getNumColumns(),o=e.options.hidden?0:e.container.offsetHeight,s=0;s<a.length;s++)a[s].width+i<=12&&(!o||.5*a[s].minh<o&&2*a[s].maxh>o)&&(n=s);!1===n&&(a.push({width:0,minh:999999,maxh:0,editors:[]}),n=a.length-1),a[n].editors.push({key:t,width:i,height:o}),a[n].width+=i,a[n].minh=Math.min(a[n].minh,o),a[n].maxh=Math.max(a[n].maxh,o)}})),t=0;t<a.length;t++)if(a[t].width<12){var h=!1,p=0;for(e=0;e<a[t].editors.length;e++)(!1===h||a[t].editors[e].width>a[t].editors[h].width)&&(h=e),a[t].editors[e].width*=12/a[t].width,a[t].editors[e].width=Math.floor(a[t].editors[e].width),p+=a[t].editors[e].width;p<12&&(a[t].editors[h].width+=12-p),a[t].width=12}if(this.layout===JSON.stringify(a))return!1;for(this.layout=JSON.stringify(a),n=document.createElement("div"),t=0;t<a.length;t++)for(i=this.theme.getGridRow(),n.appendChild(i),e=0;e<a[t].editors.length;e++)s=a[t].editors[e].key,(l=this.editors[s]).options.hidden?l.container.style.display="none":this.theme.setGridColumnSize(l.container,a[t].editors[e].width),i.appendChild(l.container)}else{if(n=document.createElement("div"),o){var d=document.createElement("div"),f=this.theme.getTopTabHolder(this.translateProperty(this.schema.title)),y=this.theme.getTopTabContentHolder(f);for(this.property_order.forEach((function(t){var e=r.editors[t];if(!e.property_removed){var n=r.theme.getTabContent(),i=e.schema&&("object"===e.schema.type||"array"===e.schema.type);n.isObjOrArray=i;var o=r.theme.getGridRow();e.tab||(void 0===r.basicPane?r.addRow(e,f,n):r.addRow(e,f,r.basicPane)),n.id=r.getValidId(e.tab_text.textContent),i?(n.appendChild(o),y.appendChild(n),r.theme.addTopTab(f,e.tab)):(d.appendChild(o),y.childElementCount>0?y.firstChild.isObjOrArray&&(n.appendChild(d),y.insertBefore(n,y.firstChild),r.theme.insertBasicTopTab(e.tab,f),e.basicPane=n):(n.appendChild(d),y.appendChild(n),r.theme.addTopTab(f,e.tab),e.basicPane=n)),e.options.hidden?e.container.style.display="none":r.theme.setGridColumnSize(e.container,12),o.appendChild(e.container),e.rowPane=n}}));this.tabPanesContainer.firstChild;)this.tabPanesContainer.removeChild(this.tabPanesContainer.firstChild);var m=this.tabs_holder.parentNode;m.removeChild(m.firstChild),m.appendChild(f),this.tabPanesContainer=y,this.tabs_holder=f;var v=this.theme.getFirstTab(this.tabs_holder);return void(v&&c(v,"click"))}this.property_order.forEach((function(t){var e=r.editors[t];e.property_removed||(i=r.theme.getGridRow(),n.appendChild(i),e.options.hidden?e.container.style.display="none":r.theme.setGridColumnSize(e.container,12),i.appendChild(e.container))}))}for(;this.row_container.firstChild;)this.row_container.removeChild(this.row_container.firstChild);this.row_container.appendChild(n)}}},{key:"getPropertySchema",value:function(t){var e=this,r=this.schema.properties[t]||{};r=l({},r);var n=!!this.schema.properties[t];return this.schema.patternProperties&&Object.keys(this.schema.patternProperties).forEach((function(i){new RegExp(i).test(t)&&(r.allOf=r.allOf||[],r.allOf.push(e.schema.patternProperties[i]),n=!0)})),!n&&this.schema.additionalProperties&&"object"===wr(this.schema.additionalProperties)&&(r=l({},this.schema.additionalProperties)),r}},{key:"preBuild",value:function(){var t=this;if(jr(xr(a.prototype),"preBuild",this).call(this),this.editors={},this.cached_editors={},this.format=this.options.layout||this.options.object_layout||this.schema.format||this.jsoneditor.options.object_layout||"normal",this.schema.properties=this.schema.properties||{},this.minwidth=0,this.maxwidth=0,this.options.table_row)Object.entries(this.schema.properties).forEach((function(e){var r=br(e,2),n=r[0],i=r[1],o=t.jsoneditor.getEditorClass(i);t.editors[n]=t.jsoneditor.createEditor(o,{jsoneditor:t.jsoneditor,schema:i,path:"".concat(t.path,".").concat(n),parent:t,compact:!0,required:!0},t.currentDepth+1),t.editors[n].preBuild();var a=t.editors[n].options.hidden?0:t.editors[n].options.grid_columns||t.editors[n].getNumColumns();t.minwidth+=a,t.maxwidth+=a})),this.no_link_holder=!0;else{if(this.options.table)throw new Error("Not supported yet");this.schema.defaultProperties||(this.jsoneditor.options.display_required_only||this.options.display_required_only?this.schema.defaultProperties=Object.keys(this.schema.properties).filter((function(e){return t.isRequiredObject({key:e,schema:t.schema.properties[e]})})):this.schema.defaultProperties=Object.keys(this.schema.properties)),this.maxwidth+=1,Array.isArray(this.schema.defaultProperties)&&this.schema.defaultProperties.forEach((function(e){t.addObjectProperty(e,!0),t.editors[e]&&(t.minwidth=Math.max(t.minwidth,t.editors[e].options.grid_columns||t.editors[e].getNumColumns()),t.maxwidth+=t.editors[e].options.grid_columns||t.editors[e].getNumColumns())}))}this.property_order=Object.keys(this.editors),this.property_order=this.property_order.sort((function(e,r){var n=t.editors[e].schema.propertyOrder,i=t.editors[r].schema.propertyOrder;return"number"!=typeof n&&(n=1e3),"number"!=typeof i&&(i=1e3),n-i}))}},{key:"addTab",value:function(t){var e=this,r=this.rows[t].schema&&("object"===this.rows[t].schema.type||"array"===this.rows[t].schema.type);this.tabs_holder&&(this.rows[t].tab_text=document.createElement("span"),this.rows[t].tab_text.textContent=r?this.rows[t].getHeaderText():void 0===this.schema.basicCategoryTitle?"Basic":this.schema.basicCategoryTitle,this.rows[t].tab=this.theme.getTopTab(this.rows[t].tab_text,this.getValidId(this.rows[t].tab_text.textContent)),this.rows[t].tab.addEventListener("click",(function(r){e.active_tab=e.rows[t].tab,e.refreshTabs(),r.preventDefault(),r.stopPropagation()})))}},{key:"addRow",value:function(t,e,r){var n=this.rows.length,i="object"===t.schema.type||"array"===t.schema.type;this.rows[n]=t,this.rows[n].rowPane=r,i?(this.addTab(n),this.theme.addTopTab(e,this.rows[n].tab)):void 0===this.basicTab?(this.addTab(n),this.basicTab=n,this.basicPane=r,this.theme.addTopTab(e,this.rows[n].tab)):(this.rows[n].tab=this.rows[this.basicTab].tab,this.rows[n].tab_text=this.rows[this.basicTab].tab_text,this.rows[n].rowPane=this.rows[this.basicTab].rowPane)}},{key:"refreshTabs",value:function(t){var e=this,r=void 0!==this.basicTab,n=!1;this.rows.forEach((function(i){i.tab&&i.rowPane&&i.rowPane.parentNode&&(r&&i.tab===e.rows[e.basicTab].tab&&n||(t?i.tab_text.textContent=i.getHeaderText():(r&&i.tab===e.rows[e.basicTab].tab&&(n=!0),i.tab===e.active_tab?e.theme.markTabActive(i):e.theme.markTabInactive(i))))}))}},{key:"build",value:function(){var t=this,e="categories"===this.format;if(this.rows=[],this.active_tab=null,this.options.table_row)this.editor_holder=this.container,Object.entries(this.editors).forEach((function(e){var r=br(e,2),n=r[0],i=r[1],o=t.theme.getTableCell();t.editor_holder.appendChild(o),i.setContainer(o),i.build(),i.postBuild(),i.setOptInCheckbox(i.header),i.setValue(i.getDefault(),!0),t.editors[n].options.hidden&&(o.style.display="none"),t.editors[n].options.input_width&&(o.style.width=t.editors[n].options.input_width)}));else{if(this.options.table)throw new Error("Not supported yet");this.header="",this.options.compact||(this.header=document.createElement("label"),this.header.textContent=this.getTitle()),this.title=this.theme.getHeader(this.header,this.getPathDepth()),this.title.classList.add("je-object__title"),this.controls=this.theme.getButtonHolder(),this.controls.classList.add("je-object__controls"),this.container.appendChild(this.title),this.container.appendChild(this.controls),this.container.classList.add("je-object__container"),this.editjson_holder=this.theme.getModal(),this.editjson_textarea=this.theme.getTextareaInput(),this.editjson_textarea.classList.add("je-edit-json--textarea"),this.editjson_save=this.getButton("button_save","save","button_save"),this.editjson_save.classList.add("json-editor-btntype-save"),this.editjson_save.addEventListener("click",(function(e){e.preventDefault(),e.stopPropagation(),t.saveJSON()})),this.editjson_copy=this.getButton("button_copy","copy","button_copy"),this.editjson_copy.classList.add("json-editor-btntype-copy"),this.editjson_copy.addEventListener("click",(function(e){e.preventDefault(),e.stopPropagation(),t.copyJSON()})),this.editjson_cancel=this.getButton("button_cancel","cancel","button_cancel"),this.editjson_cancel.classList.add("json-editor-btntype-cancel"),this.editjson_cancel.addEventListener("click",(function(e){e.preventDefault(),e.stopPropagation(),t.hideEditJSON()})),this.editjson_holder.appendChild(this.editjson_textarea),this.editjson_holder.appendChild(this.editjson_save),this.editjson_holder.appendChild(this.editjson_copy),this.editjson_holder.appendChild(this.editjson_cancel),this.addproperty_holder=this.theme.getModal(),this.addproperty_list=document.createElement("div"),this.addproperty_list.classList.add("property-selector"),this.addproperty_add=this.getButton("button_add","add","button_add"),this.addproperty_add.classList.add("json-editor-btntype-add"),this.addproperty_input=this.theme.getFormInputField("text"),this.addproperty_input.setAttribute("placeholder","Property name..."),this.addproperty_input.classList.add("property-selector-input"),this.addproperty_add.addEventListener("click",(function(e){if(e.preventDefault(),e.stopPropagation(),t.addproperty_input.value){if(t.editors[t.addproperty_input.value])return void window.alert("there is already a property with that name");t.addObjectProperty(t.addproperty_input.value),t.editors[t.addproperty_input.value]&&t.editors[t.addproperty_input.value].disable(),t.onChange(!0)}})),this.addproperty_input.addEventListener("input",(function(t){t.target.previousSibling.childNodes.forEach((function(e){e.innerText.includes(t.target.value)?e.style.display="":e.style.display="none"}))})),this.addproperty_holder.appendChild(this.addproperty_list),this.addproperty_holder.appendChild(this.addproperty_input),this.addproperty_holder.appendChild(this.addproperty_add);var r=document.createElement("div");r.style.clear="both",this.addproperty_holder.appendChild(r),this.onOutsideModalClickListener=this.onOutsideModalClick.bind(this),document.addEventListener("click",this.onOutsideModalClickListener,!0),this.schema.description&&(this.description=this.theme.getDescription(this.translateProperty(this.schema.description)),this.container.appendChild(this.description)),this.error_holder=document.createElement("div"),this.container.appendChild(this.error_holder),this.editor_holder=this.theme.getIndentedPanel(),this.container.appendChild(this.editor_holder),this.row_container=this.theme.getGridContainer(),e?(this.tabs_holder=this.theme.getTopTabHolder(this.getValidId(this.translateProperty(this.schema.title))),this.tabPanesContainer=this.theme.getTopTabContentHolder(this.tabs_holder),this.editor_holder.appendChild(this.tabs_holder)):(this.tabs_holder=this.theme.getTabHolder(this.getValidId(this.translateProperty(this.schema.title))),this.tabPanesContainer=this.theme.getTabContentHolder(this.tabs_holder),this.editor_holder.appendChild(this.row_container)),Object.values(this.editors).forEach((function(r){var n=t.theme.getTabContent(),i=t.theme.getGridColumn(),o=!(!r.schema||"object"!==r.schema.type&&"array"!==r.schema.type);if(n.isObjOrArray=o,e){if(o){var a=t.theme.getGridContainer();a.appendChild(i),n.appendChild(a),t.tabPanesContainer.appendChild(n),t.row_container=a}else void 0===t.row_container_basic&&(t.row_container_basic=t.theme.getGridContainer(),n.appendChild(t.row_container_basic),0===t.tabPanesContainer.childElementCount?t.tabPanesContainer.appendChild(n):t.tabPanesContainer.insertBefore(n,t.tabPanesContainer.childNodes[1])),t.row_container_basic.appendChild(i);t.addRow(r,t.tabs_holder,n),n.id=t.getValidId(r.schema.title)}else t.row_container.appendChild(i);r.setContainer(i),r.build(),r.postBuild(),r.setOptInCheckbox(r.header)})),this.rows[0]&&c(this.rows[0].tab,"click"),this.collapsed=!1,this.collapse_control=this.getButton("","collapse","button_collapse"),this.collapse_control.classList.add("json-editor-btntype-toggle"),this.title.insertBefore(this.collapse_control,this.title.childNodes[0]),this.collapse_control.addEventListener("click",(function(e){e.preventDefault(),e.stopPropagation(),t.collapsed?(t.editor_holder.style.display="",t.collapsed=!1,t.setButtonText(t.collapse_control,"","collapse","button_collapse")):(t.editor_holder.style.display="none",t.collapsed=!0,t.setButtonText(t.collapse_control,"","expand","button_expand"))})),this.options.collapsed&&c(this.collapse_control,"click"),this.schema.options&&void 0!==this.schema.options.disable_collapse?this.schema.options.disable_collapse&&(this.collapse_control.style.display="none"):this.jsoneditor.options.disable_collapse&&(this.collapse_control.style.display="none"),this.editjson_control=this.getButton("JSON","edit","button_edit_json"),this.editjson_control.classList.add("json-editor-btntype-editjson"),this.editjson_control.addEventListener("click",(function(e){e.preventDefault(),e.stopPropagation(),t.toggleEditJSON()})),this.controls.appendChild(this.editjson_control),this.controls.insertBefore(this.editjson_holder,this.controls.childNodes[0]),this.schema.options&&void 0!==this.schema.options.disable_edit_json?this.schema.options.disable_edit_json&&(this.editjson_control.style.display="none"):this.jsoneditor.options.disable_edit_json&&(this.editjson_control.style.display="none"),this.addproperty_button=this.getButton("properties","edit_properties","button_object_properties"),this.addproperty_button.classList.add("json-editor-btntype-properties"),this.addproperty_button.addEventListener("click",(function(e){e.preventDefault(),e.stopPropagation(),t.toggleAddProperty()})),this.controls.appendChild(this.addproperty_button),this.controls.insertBefore(this.addproperty_holder,this.controls.childNodes[1]),this.refreshAddProperties(),this.deactivateNonRequiredProperties()}this.options.table_row?(this.editor_holder=this.container,this.property_order.forEach((function(e){t.editor_holder.appendChild(t.editors[e].container)}))):(this.layoutEditors(),this.layoutEditors())}},{key:"deactivateNonRequiredProperties",value:function(){var t=this,e=this.jsoneditor.options.show_opt_in,r=void 0!==this.options.show_opt_in,n=r&&!0===this.options.show_opt_in,i=r&&!1===this.options.show_opt_in;(n||!i&&e||!r&&e)&&Object.entries(this.editors).forEach((function(e){var r=br(e,2),n=r[0],i=r[1];t.isRequiredObject(i)||t.editors[n].deactivate()}))}},{key:"showEditJSON",value:function(){this.editjson_holder&&(this.hideAddProperty(),this.editjson_holder.style.left="".concat(this.editjson_control.offsetLeft,"px"),this.editjson_holder.style.top="".concat(this.editjson_control.offsetTop+this.editjson_control.offsetHeight,"px"),this.editjson_textarea.value=JSON.stringify(this.getValue(),null,2),this.disable(),this.editjson_holder.style.display="",this.editjson_control.disabled=!1,this.editing_json=!0)}},{key:"hideEditJSON",value:function(){this.editjson_holder&&this.editing_json&&(this.editjson_holder.style.display="none",this.enable(),this.editing_json=!1)}},{key:"copyJSON",value:function(){if(this.editjson_holder){var t=document.createElement("textarea");t.value=this.editjson_textarea.value,t.setAttribute("readonly",""),t.style.position="absolute",t.style.left="-9999px",document.body.appendChild(t),t.select(),document.execCommand("copy"),document.body.removeChild(t)}}},{key:"saveJSON",value:function(){if(this.editjson_holder)try{var t=JSON.parse(this.editjson_textarea.value);this.setValue(t),this.hideEditJSON(),this.onChange(!0)}catch(t){throw window.alert("invalid JSON"),t}}},{key:"toggleEditJSON",value:function(){this.editing_json?this.hideEditJSON():this.showEditJSON()}},{key:"insertPropertyControlUsingPropertyOrder",value:function(t,e,r){var n;this.schema.properties[t]&&(n=this.schema.properties[t].propertyOrder),"number"!=typeof n&&(n=1e3),e.propertyOrder=n;for(var i=0;i<r.childNodes.length;i++){var o=r.childNodes[i];if(e.propertyOrder<o.propertyOrder){this.addproperty_list.insertBefore(e,o),e=null;break}}e&&this.addproperty_list.appendChild(e)}},{key:"addPropertyCheckbox",value:function(t){var e,r=this,n=this.theme.getCheckbox();e=this.schema.properties[t]&&this.schema.properties[t].title?this.schema.properties[t].title:t;var i=this.theme.getCheckboxLabel(e),o=this.theme.getFormControl(i,n);return o.style.paddingBottom=o.style.marginBottom=o.style.paddingTop=o.style.marginTop=0,o.style.height="auto",this.insertPropertyControlUsingPropertyOrder(t,o,this.addproperty_list),n.checked=t in this.editors,n.addEventListener("change",(function(){n.checked?r.addObjectProperty(t):r.removeObjectProperty(t),r.onChange(!0)})),this.addproperty_checkboxes[t]=n,n}},{key:"showAddProperty",value:function(){this.addproperty_holder&&(this.hideEditJSON(),this.addproperty_holder.style.left="".concat(this.addproperty_button.offsetLeft,"px"),this.addproperty_holder.style.top="".concat(this.addproperty_button.offsetTop+this.addproperty_button.offsetHeight,"px"),this.disable(),this.adding_property=!0,this.addproperty_button.disabled=!1,this.addproperty_holder.style.display="",this.refreshAddProperties())}},{key:"hideAddProperty",value:function(){this.addproperty_holder&&this.adding_property&&(this.addproperty_holder.style.display="none",this.enable(),this.adding_property=!1)}},{key:"toggleAddProperty",value:function(){this.adding_property?this.hideAddProperty():this.showAddProperty()}},{key:"removeObjectProperty",value:function(t){this.editors[t]&&(this.editors[t].unregister(),delete this.editors[t],this.refreshValue(),this.layoutEditors())}},{key:"getSchemaOnMaxDepth",value:function(t){return Object.keys(t).reduce((function(e,r){switch(r){case"$ref":return e;case"properties":case"items":return mr(mr({},e),{},vr({},r,{}));case"additionalProperties":case"propertyNames":return mr(mr({},e),{},vr({},r,!0));default:return mr(mr({},e),{},vr({},r,t[r]))}}),{})}},{key:"addObjectProperty",value:function(t,e){if(!this.editors[t]){if(this.cached_editors[t]){if(this.editors[t]=this.cached_editors[t],e)return;this.editors[t].register()}else{if(!(this.canHaveAdditionalProperties()||this.schema.properties&&this.schema.properties[t]||this.schema.patternProperties&&Object.keys(this.schema.patternProperties).find((function(e){return new RegExp(e).test(t)}))))return;var r=this.getPropertySchema(t);"number"!=typeof r.propertyOrder&&(r.propertyOrder=Object.keys(this.editors).length+1e3);var n=this.jsoneditor.getEditorClass(r),i=this.jsoneditor.options.max_depth;if(this.editors[t]=this.jsoneditor.createEditor(n,{jsoneditor:this.jsoneditor,schema:i&&this.currentDepth>=i?this.getSchemaOnMaxDepth(r):r,path:"".concat(this.path,".").concat(t),parent:this},this.currentDepth+1),this.editors[t].preBuild(),!e){var o=this.theme.getChildEditorHolder();this.editor_holder.appendChild(o),this.editors[t].setContainer(o),this.editors[t].build(),this.editors[t].postBuild(),this.editors[t].setOptInCheckbox(n.header),this.editors[t].activate()}this.cached_editors[t]=this.editors[t]}e||(this.refreshValue(),this.layoutEditors())}}},{key:"onOutsideModalClick",value:function(t){var e=t.path||t.composedPath&&t.composedPath();this.addproperty_holder&&!this.addproperty_holder.contains(e[0])&&this.adding_property&&(t.preventDefault(),t.stopPropagation(),this.toggleAddProperty())}},{key:"onChildEditorChange",value:function(t){this.refreshValue(),jr(xr(a.prototype),"onChildEditorChange",this).call(this,t)}},{key:"canHaveAdditionalProperties",value:function(){return"boolean"==typeof this.schema.additionalProperties?this.schema.additionalProperties:!this.jsoneditor.options.no_additional_properties}},{key:"destroy",value:function(){Object.values(this.cached_editors).forEach((function(t){return t.destroy()})),this.editor_holder&&(this.editor_holder.innerHTML=""),this.title&&this.title.parentNode&&this.title.parentNode.removeChild(this.title),this.error_holder&&this.error_holder.parentNode&&this.error_holder.parentNode.removeChild(this.error_holder),this.editors=null,this.cached_editors=null,this.editor_holder&&this.editor_holder.parentNode&&this.editor_holder.parentNode.removeChild(this.editor_holder),this.editor_holder=null,document.removeEventListener("click",this.onOutsideModalClickListener,!0),jr(xr(a.prototype),"destroy",this).call(this)}},{key:"getValue",value:function(){if(this.dependenciesFulfilled){var t=jr(xr(a.prototype),"getValue",this).call(this);return t&&(this.jsoneditor.options.remove_empty_properties||this.options.remove_empty_properties)&&Object.keys(t).forEach((function(e){var r;(void 0===(r=t[e])||""===r||r===Object(r)&&0===Object.keys(r).length&&r.constructor===Object)&&delete t[e]})),t}}},{key:"refreshValue",value:function(){var t=this;this.value={},this.editors&&(Object.keys(this.editors).forEach((function(e){t.editors[e].isActive()&&(t.value[e]=t.editors[e].getValue())})),this.adding_property&&this.refreshAddProperties())}},{key:"refreshAddProperties",value:function(){var t=this;if(this.options.disable_properties||!1!==this.options.disable_properties&&this.jsoneditor.options.disable_properties)this.addproperty_button.style.display="none";else{var e,r=0,n=!1;Object.keys(this.editors).forEach((function(t){return r++})),e=this.canHaveAdditionalProperties()&&!(void 0!==this.schema.maxProperties&&r>=this.schema.maxProperties),this.addproperty_checkboxes&&(this.addproperty_list.innerHTML=""),this.addproperty_checkboxes={},Object.keys(this.cached_editors).forEach((function(i){t.addPropertyCheckbox(i),t.isRequiredObject(t.cached_editors[i])&&i in t.editors&&(t.addproperty_checkboxes[i].disabled=!0),void 0!==t.schema.minProperties&&r<=t.schema.minProperties?(t.addproperty_checkboxes[i].disabled=t.addproperty_checkboxes[i].checked,t.addproperty_checkboxes[i].checked||(n=!0)):i in t.editors?n=!0:e||h(t.schema.properties,i)?(t.addproperty_checkboxes[i].disabled=!1,n=!0):t.addproperty_checkboxes[i].disabled=!0})),this.canHaveAdditionalProperties()&&(n=!0),Object.keys(this.schema.properties).forEach((function(e){t.cached_editors[e]||(n=!0,t.addPropertyCheckbox(e))})),n?this.canHaveAdditionalProperties()?this.addproperty_add.disabled=!e:(this.addproperty_add.style.display="none",this.addproperty_input.style.display="none"):(this.hideAddProperty(),this.addproperty_button.style.display="none")}}},{key:"isRequiredObject",value:function(t){if(t)return"boolean"==typeof t.schema.required?t.schema.required:Array.isArray(this.schema.required)?this.schema.required.includes(t.key):!!this.jsoneditor.options.required_by_default}},{key:"setValue",value:function(t,e){var r=this;("object"!==wr(t=t||{})||Array.isArray(t))&&(t={}),Object.entries(this.cached_editors).forEach((function(n){var i=br(n,2),o=i[0],a=i[1];void 0!==t[o]?(r.addObjectProperty(o),a.setValue(t[o],e),a.activate()):e||r.isRequiredObject(a)?a.setValue(a.getDefault(),e):r.jsoneditor.options.show_opt_in||r.options.show_opt_in?a.deactivate():r.removeObjectProperty(o)})),Object.entries(t).forEach((function(t){var n=br(t,2),i=n[0],o=n[1];r.cached_editors[i]||(r.addObjectProperty(i),r.editors[i]&&r.editors[i].setValue(o,e,!!r.editors[i].template))})),this.refreshValue(),this.layoutEditors(),this.onChange()}},{key:"showValidationErrors",value:function(t){var e=this,r=[],n=[];t.forEach((function(t){t.path===e.path?r.push(t):n.push(t)})),this.error_holder&&(r.length?(this.error_holder.innerHTML="",this.error_holder.style.display="",r.forEach((function(t){t.errorcount&&t.errorcount>1&&(t.message+=" (".concat(t.errorcount," errors)")),e.error_holder.appendChild(e.theme.getErrorMessage(t.message))}))):this.error_holder.style.display="none"),this.options.table_row&&(r.length?this.theme.addTableRowError(this.container):this.theme.removeTableRowError(this.container)),Object.values(this.editors).forEach((function(t){t.showValidationErrors(n)}))}}])&&_r(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(w);function Er(t){return Er="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},Er(t)}function Sr(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==Er(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==Er(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===Er(i)?i:String(i)),n)}var i}function Pr(){return Pr="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Lr(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},Pr.apply(this,arguments)}function Tr(t,e){return Tr=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},Tr(t,e)}function Lr(t){return Lr=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},Lr(t)}Cr.rules={".je-object__title":"display:inline-block",".je-object__controls":"margin:0%200%200%2010px",".je-object__container":"position:relative",".je-object__property-checkbox":"margin:0;height:auto",".property-selector":"width:295px;max-height:160px;padding:5px%200;overflow-y:auto;overflow-x:hidden;padding-left:5px",".property-selector-input":"width:220px;margin-bottom:0;display:inline-block",".json-editor-btntype-toggle":"margin:0%2010px%200%200",".je-edit-json--textarea":"height:170px;width:300px;display:block"};var Rr=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&Tr(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=Lr(n);if(i){var r=Lr(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===Er(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,(r=[{key:"preBuild",value:function(){Pr(Lr(a.prototype),"preBuild",this).call(this)}},{key:"build",value:function(){var t=this;this.label="",this.options.compact||(this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired())),this.schema.description&&(this.description=this.theme.getFormInputDescription(this.translateProperty(this.schema.description))),this.options.infoText&&(this.infoButton=this.theme.getInfoButton(this.translateProperty(this.options.infoText))),this.options.compact&&this.container.classList.add("compact"),this.radioContainer=document.createElement("div"),this.radioGroup=[];for(var e=function(e){t.setValue(e.currentTarget.value),t.onChange(!0)},r=0;r<this.enum_values.length;r++){var n={id:"".concat(this.formname,"[").concat(r,"]"),value:this.enum_values[r]};this.jsoneditor.options.use_name_attributes&&(n.name=this.formname),this.input=this.theme.getFormRadio(n),this.setInputAttributes(["id","value","name"]),this.input.addEventListener("change",e,!1),this.radioGroup.push(this.input);var i=this.theme.getFormRadioLabel(this.enum_display[r]);i.htmlFor=this.input.id;var o=this.theme.getFormRadioControl(i,this.input,!("horizontal"!==this.options.layout&&!this.options.compact));this.radioContainer.appendChild(o)}if(this.schema.readOnly||this.schema.readonly){this.disable(!0);for(var a=0;a<this.radioGroup.length;a++)this.radioGroup[a].disabled=!0;this.radioContainer.classList.add("readonly")}var s=this.theme.getContainer();s.appendChild(this.radioContainer),s.dataset.containerFor="radio",this.input=s,this.control=this.theme.getFormControl(this.label,s,this.description,this.infoButton),this.container.appendChild(this.control),window.requestAnimationFrame((function(){t.input.parentNode&&t.afterInputReady()}))}},{key:"enable",value:function(){if(!this.always_disabled){for(var t=0;t<this.radioGroup.length;t++)this.radioGroup[t].disabled=!1;this.radioContainer.classList.remove("readonly"),Pr(Lr(a.prototype),"enable",this).call(this)}}},{key:"disable",value:function(t){t&&(this.always_disabled=!0);for(var e=0;e<this.radioGroup.length;e++)this.radioGroup[e].disabled=!0;this.radioContainer.classList.add("readonly"),Pr(Lr(a.prototype),"disable",this).call(this)}},{key:"destroy",value:function(){this.radioContainer.parentNode&&this.radioContainer.parentNode.parentNode&&this.radioContainer.parentNode.parentNode.removeChild(this.radioContainer.parentNode),this.label&&this.label.parentNode&&this.label.parentNode.removeChild(this.label),this.description&&this.description.parentNode&&this.description.parentNode.removeChild(this.description),Pr(Lr(a.prototype),"destroy",this).call(this)}},{key:"getNumColumns",value:function(){return 2}},{key:"setValue",value:function(t){"string"!=typeof t&&(t=String(t));for(var e=0;e<this.radioGroup.length;e++)if(this.radioGroup[e].value===t){this.radioGroup[e].checked=!0,this.value=t,this.onChange();break}}}])&&Sr(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(Ft);function Ar(t){return Ar="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},Ar(t)}function Ir(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==Ar(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==Ar(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===Ar(i)?i:String(i)),n)}var i}function Br(){return Br="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Dr(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},Br.apply(this,arguments)}function Nr(t,e){return Nr=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},Nr(t,e)}function Dr(t){return Dr=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},Dr(t)}var Fr=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&Nr(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=Dr(n);if(i){var r=Dr(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===Ar(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,(r=[{key:"setValue",value:function(t,e,r){var n=Br(Dr(a.prototype),"setValue",this).call(this,t,e,r);void 0!==n&&n.changed&&this.sceditor_instance&&this.sceditor_instance.val(n.value)}},{key:"build",value:function(){this.options.format="textarea",Br(Dr(a.prototype),"build",this).call(this),this.input_type=this.schema.format,this.input.setAttribute("data-schemaformat",this.input_type)}},{key:"afterInputReady",value:function(){var t=this;if(window.sceditor){var e=this.expandCallbacks("sceditor",l({},{format:this.input_type,emoticonsEnabled:!1,width:"100%",height:300,readOnly:this.schema.readOnly||this.schema.readonly||this.schema.template},this.defaults.options.sceditor||{},this.options.sceditor||{},{element:this.input})),r=window.sceditor.instance(this.input);void 0===r&&window.sceditor.create(this.input,e),this.sceditor_instance=r||window.sceditor.instance(this.input),this.sceditor_instance.blur((function(){t.value=t.sceditor_instance.val(),t.sceditor_instance.updateOriginal(),t.is_dirty=!0,t.onChange(!0)})),this.theme.afterInputReady(this.input)}else Br(Dr(a.prototype),"afterInputReady",this).call(this)}},{key:"getNumColumns",value:function(){return 6}},{key:"enable",value:function(){!this.always_disabled&&this.sceditor_instance&&this.sceditor_instance.readOnly(!1),Br(Dr(a.prototype),"enable",this).call(this)}},{key:"disable",value:function(t){this.sceditor_instance&&this.sceditor_instance.readOnly(!0),Br(Dr(a.prototype),"disable",this).call(this,t)}},{key:"destroy",value:function(){this.sceditor_instance&&(this.sceditor_instance.destroy(),this.sceditor_instance=null),Br(Dr(a.prototype),"destroy",this).call(this)}}])&&Ir(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(C);function Vr(t){return Vr="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},Vr(t)}function zr(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==Vr(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==Vr(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===Vr(i)?i:String(i)),n)}var i}function Hr(){return Hr="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=qr(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},Hr.apply(this,arguments)}function Mr(t,e){return Mr=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},Mr(t,e)}function qr(t){return qr=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},qr(t)}var Gr=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&Mr(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=qr(n);if(i){var r=qr(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===Vr(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,(r=[{key:"setValue",value:function(t,e){if(this.select2_instance){e?this.is_dirty=!1:"change"===this.jsoneditor.options.show_errors&&(this.is_dirty=!0);var r=this.updateValue(t);this.input.value=r,this.select2v4?this.select2_instance.val(r).trigger("change"):this.select2_instance.select2("val",r),this.onChange(!0)}else Hr(qr(a.prototype),"setValue",this).call(this,t,e)}},{key:"afterInputReady",value:function(){var t=this;if(window.jQuery&&window.jQuery.fn&&window.jQuery.fn.select2&&!this.select2_instance){var e=this.expandCallbacks("select2",l({},this.defaults.options.select2||{},this.options.select2||{}));this.newEnumAllowed=e.tags=!!e.tags&&"string"===this.schema.type,this.select2_instance=window.jQuery(this.input).select2(e),this.select2v4=h(this.select2_instance.select2,"amd"),this.selectChangeHandler=function(){var e=t.select2v4?t.select2_instance.val():t.select2_instance.select2("val");t.updateValue(e),t.onChange(!0)},this.select2_instance.on("change",this.selectChangeHandler),this.select2_instance.on("select2-blur",this.selectChangeHandler)}Hr(qr(a.prototype),"afterInputReady",this).call(this)}},{key:"updateValue",value:function(t){var e=this.enum_values[0];return t=this.typecast(t||""),this.enum_values.includes(t)?e=t:this.newEnumAllowed&&(e=this.addNewOption(t)?t:e),this.value=e,e}},{key:"addNewOption",value:function(t){var e,r=this.typecast(t),n=!1;return this.enum_values.includes(r)||""===r||(this.enum_options.push("".concat(r)),this.enum_display.push("".concat(r)),this.enum_values.push(r),this.schema.enum.push(r),(e=this.input.querySelector('option[value="'.concat(r,'"]')))?e.removeAttribute("data-select2-tag"):this.input.appendChild(new Option(r,r,!1,!1)).trigger("change"),n=!0),n}},{key:"enable",value:function(){this.always_disabled||this.select2_instance&&(this.select2v4?this.select2_instance.prop("disabled",!1):this.select2_instance.select2("enable",!0)),Hr(qr(a.prototype),"enable",this).call(this)}},{key:"disable",value:function(t){this.select2_instance&&(this.select2v4?this.select2_instance.prop("disabled",!0):this.select2_instance.select2("enable",!1)),Hr(qr(a.prototype),"disable",this).call(this,t)}},{key:"destroy",value:function(){this.select2_instance&&(this.select2_instance.select2("destroy"),this.select2_instance=null),Hr(qr(a.prototype),"destroy",this).call(this)}}])&&zr(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(Ft);function Ur(t){return Ur="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},Ur(t)}function $r(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==Ur(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==Ur(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===Ur(i)?i:String(i)),n)}var i}function Jr(){return Jr="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Zr(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},Jr.apply(this,arguments)}function Wr(t,e){return Wr=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},Wr(t,e)}function Zr(t){return Zr=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},Zr(t)}var Yr=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&Wr(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=Zr(n);if(i){var r=Zr(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===Ur(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,(r=[{key:"setValue",value:function(t,e){if(this.selectize_instance){e?this.is_dirty=!1:"change"===this.jsoneditor.options.show_errors&&(this.is_dirty=!0);var r=this.updateValue(t);this.input.value=r,this.selectize_instance.clear(!0),this.selectize_instance.setValue(r),this.onChange(!0)}else Jr(Zr(a.prototype),"setValue",this).call(this,t,e)}},{key:"afterInputReady",value:function(){var t=this;if(window.jQuery&&window.jQuery.fn&&window.jQuery.fn.selectize&&!this.selectize_instance){var e=this.expandCallbacks("selectize",l({},this.defaults.options.selectize||{},this.options.selectize||{}));this.newEnumAllowed=e.create=!!e.create&&"string"===this.schema.type,this.selectize_instance=window.jQuery(this.input).selectize(e)[0].selectize,this.control.removeEventListener("change",this.multiselectChangeHandler),this.multiselectChangeHandler=function(e){t.updateValue(e),t.onChange(!0)},this.selectize_instance.on("change",this.multiselectChangeHandler)}Jr(Zr(a.prototype),"afterInputReady",this).call(this)}},{key:"updateValue",value:function(t){var e=this.enum_values[0];return t=this.typecast(t||""),this.enum_values.includes(t)?e=t:this.newEnumAllowed&&(e=this.addNewOption(t)?t:e),this.value=e,e}},{key:"addNewOption",value:function(t){var e=this.typecast(t),r=!1;return this.enum_values.includes(e)||""===e||(this.enum_options.push("".concat(e)),this.enum_display.push("".concat(e)),this.enum_values.push(e),this.schema.enum.push(e),this.selectize_instance.addItem(e),this.selectize_instance.refreshOptions(!1),r=!0),r}},{key:"onWatchedFieldChange",value:function(){var t=this;Jr(Zr(a.prototype),"onWatchedFieldChange",this).call(this),this.selectize_instance&&(this.selectize_instance.clear(!0),this.selectize_instance.clearOptions(!0),this.enum_options.forEach((function(e,r){t.selectize_instance.addOption({value:e,text:t.enum_display[r]})})),this.selectize_instance.addItem("".concat(this.value),!0))}},{key:"enable",value:function(){!this.always_disabled&&this.selectize_instance&&this.selectize_instance.unlock(),Jr(Zr(a.prototype),"enable",this).call(this)}},{key:"disable",value:function(t){this.selectize_instance&&this.selectize_instance.lock(),Jr(Zr(a.prototype),"disable",this).call(this,t)}},{key:"destroy",value:function(){this.selectize_instance&&(this.selectize_instance.destroy(),this.selectize_instance=null),Jr(Zr(a.prototype),"destroy",this).call(this)}}])&&$r(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(Ft);function Qr(t){return Qr="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},Qr(t)}function Kr(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==Qr(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==Qr(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===Qr(i)?i:String(i)),n)}var i}function Xr(t,e){return Xr=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},Xr(t,e)}function tn(t){return tn=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},tn(t)}var en=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&Xr(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=tn(n);if(i){var r=tn(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===Qr(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,(r=[{key:"build",value:function(){var t=this;this.options.compact||(this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired())),this.schema.description&&(this.description=this.theme.getFormInputDescription(this.translateProperty(this.schema.description)));var e=this.formname.replace(/\W/g,"");if("function"==typeof SignaturePad){this.input=this.theme.getFormInputField("hidden"),this.container.appendChild(this.input);var r=document.createElement("div");r.classList.add("signature-container");var n=document.createElement("canvas");this.jsoneditor.options.use_name_attributes&&n.setAttribute("name",e),n.classList.add("signature"),r.appendChild(n),this.signaturePad=new window.SignaturePad(n,{onEnd:function(){this.signaturePad.isEmpty()?this.input.value="":this.input.value=this.signaturePad.toDataURL(),this.is_dirty=!0,this.refreshValue(),this.watch_listener(),this.jsoneditor.notifyWatchers(this.path),this.parent?this.parent.onChildEditorChange(this):this.jsoneditor.onChange()}});var i=document.createElement("div"),o=document.createElement("button");o.classList.add("tiny","button"),o.innerHTML="Clear signature",i.appendChild(o),r.appendChild(i),this.options.compact&&this.container.setAttribute("class","".concat(this.container.getAttribute("class")," compact")),(this.schema.readOnly||this.schema.readonly)&&(this.disable(!0),Array.from(this.inputs).forEach((function(t){n.setAttribute("readOnly","readOnly"),t.disabled=!0}))),o.addEventListener("click",(function(e){e.preventDefault(),e.stopPropagation(),t.signaturePad.clear(),t.signaturePad.strokeEnd()})),this.control=this.theme.getFormControl(this.label,r,this.description),this.container.appendChild(this.control),this.refreshValue(),n.width=r.offsetWidth,this.options&&this.options.canvas_height?n.height=this.options.canvas_height:n.height="300"}else{var a=document.createElement("p");a.innerHTML="Signature pad is not available, please include SignaturePad from https://github.com/szimek/signature_pad",this.container.appendChild(a)}}},{key:"setValue",value:function(t){if("function"==typeof SignaturePad){var e=this.sanitize(t);if(this.value===e)return;return this.value=e,this.input.value=this.value,this.signaturePad.clear(),t&&""!==t&&this.signaturePad.fromDataURL(t),this.watch_listener(),this.jsoneditor.notifyWatchers(this.path),!1}}},{key:"destroy",value:function(){this.signaturePad.off(),delete this.signaturePad}}])&&Kr(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(C);function rn(t){return rn="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},rn(t)}function nn(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==rn(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==rn(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===rn(i)?i:String(i)),n)}var i}function on(){return on="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=sn(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},on.apply(this,arguments)}function an(t,e){return an=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},an(t,e)}function sn(t){return sn=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},sn(t)}r(2564);var ln=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&an(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=sn(n);if(i){var r=sn(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===rn(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,(r=[{key:"setValue",value:function(t,e,r){var n=on(sn(a.prototype),"setValue",this).call(this,t,e,r);void 0!==n&&n.changed&&this.simplemde_instance&&this.simplemde_instance.value(n.value)}},{key:"build",value:function(){this.options.format="textarea",on(sn(a.prototype),"build",this).call(this),this.input_type=this.schema.format,this.input.setAttribute("data-schemaformat",this.input_type)}},{key:"afterInputReady",value:function(){var t,e=this;window.SimpleMDE?(t=this.expandCallbacks("simplemde",l({},{height:300},this.defaults.options.simplemde||{},this.options.simplemde||{},{element:this.input})),this.simplemde_instance=new window.SimpleMDE(t),(this.schema.readOnly||this.schema.readonly||this.schema.template)&&(this.simplemde_instance.codemirror.options.readOnly=!0),this.simplemde_instance.codemirror.on("change",(function(){e.value=e.simplemde_instance.value(),e.is_dirty=!0,e.onChange(!0)})),t.autorefresh&&this.startListening(this.simplemde_instance.codemirror,this.simplemde_instance.codemirror.state.autoRefresh={delay:250}),this.theme.afterInputReady(this.input)):on(sn(a.prototype),"afterInputReady",this).call(this)}},{key:"getNumColumns",value:function(){return 6}},{key:"enable",value:function(){!this.always_disabled&&this.simplemde_instance&&(this.simplemde_instance.codemirror.options.readOnly=!1),on(sn(a.prototype),"enable",this).call(this)}},{key:"disable",value:function(t){this.simplemde_instance&&(this.simplemde_instance.codemirror.options.readOnly=!0),on(sn(a.prototype),"disable",this).call(this,t)}},{key:"destroy",value:function(){this.simplemde_instance&&(this.simplemde_instance.toTextArea(),this.simplemde_instance=null),on(sn(a.prototype),"destroy",this).call(this)}},{key:"startListening",value:function(t,e){function r(){t.display.wrapper.offsetHeight?(this.stopListening(t,e),t.display.lastWrapHeight!==t.display.wrapper.clientHeight&&t.refresh()):e.timeout=window.setTimeout(r,e.delay)}e.timeout=window.setTimeout(r,e.delay),e.hurry=function(){window.clearTimeout(e.timeout),e.timeout=window.setTimeout(r,50)},t.on(window,"mouseup",e.hurry),t.on(window,"keyup",e.hurry)}},{key:"stopListening",value:function(t,e){window.clearTimeout(e.timeout),t.off(window,"mouseup",e.hurry),t.off(window,"keyup",e.hurry)}}])&&nn(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(C);function cn(t){return cn="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},cn(t)}function un(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==cn(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==cn(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===cn(i)?i:String(i)),n)}var i}function hn(){return hn="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=dn(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},hn.apply(this,arguments)}function pn(t,e){return pn=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},pn(t,e)}function dn(t){return dn=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},dn(t)}var fn=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&pn(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=dn(n);if(i){var r=dn(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===cn(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,(r=[{key:"build",value:function(){var t=this;if(this.options.compact||(this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired())),this.schema.description&&(this.description=this.theme.getFormInputDescription(this.translateProperty(this.schema.description))),this.options.infoText&&(this.infoButton=this.theme.getInfoButton(this.translateProperty(this.options.infoText))),this.options.compact&&this.container.classList.add("compact"),this.ratingContainer=document.createElement("div"),this.ratingContainer.classList.add("starrating"),void 0===this.schema.enum){var e=this.schema.maximum?this.schema.maximum:5;this.schema.exclusiveMaximum&&e--,this.enum_values=[];for(var r=0;r<e;r++)this.enum_values.push(r+1)}else this.enum_values=this.schema.enum;this.radioGroup=[];for(var n=function(e){e.preventDefault(),e.stopPropagation(),t.setValue(e.currentTarget.value),t.onChange(!0)},i=this.enum_values.length-1;i>-1;i--){var o=this.formname+(i+1),a=this.theme.getFormInputField("radio");a.name="".concat(this.formname,"[starrating]"),a.value=this.enum_values[i],a.id=o,a.addEventListener("change",n,!1),this.radioGroup.push(a);var s=document.createElement("label");s.htmlFor=o,s.title=this.enum_values[i],this.options.displayValue&&s.classList.add("starrating-display-enabled"),this.ratingContainer.appendChild(a),this.ratingContainer.appendChild(s)}if(this.options.displayValue&&(this.displayRating=document.createElement("div"),this.displayRating.classList.add("starrating-display"),this.displayRating.innerText=this.enum_values[0],this.ratingContainer.appendChild(this.displayRating)),this.schema.readOnly||this.schema.readonly){this.disable(!0);for(var l=0;l<this.radioGroup.length;l++)this.radioGroup[l].disabled=!0;this.ratingContainer.classList.add("readonly")}var c=this.theme.getContainer();c.appendChild(this.ratingContainer),this.input=c,this.control=this.theme.getFormControl(this.label,c,this.description,this.infoButton),this.container.appendChild(this.control),this.refreshValue()}},{key:"enable",value:function(){if(!this.always_disabled){for(var t=0;t<this.radioGroup.length;t++)this.radioGroup[t].disabled=!1;this.ratingContainer.classList.remove("readonly"),this.disabled=!1}}},{key:"disable",value:function(t){t&&(this.always_disabled=!0);for(var e=0;e<this.radioGroup.length;e++)this.radioGroup[e].disabled=!0;this.ratingContainer.classList.add("readonly"),this.disabled=!0}},{key:"destroy",value:function(){this.ratingContainer.parentNode&&this.ratingContainer.parentNode.parentNode&&this.ratingContainer.parentNode.parentNode.removeChild(this.ratingContainer.parentNode),this.label&&this.label.parentNode&&this.label.parentNode.removeChild(this.label),this.description&&this.description.parentNode&&this.description.parentNode.removeChild(this.description),hn(dn(a.prototype),"destroy",this).call(this)}},{key:"getNumColumns",value:function(){return 2}},{key:"getValue",value:function(){if(this.dependenciesFulfilled)return"integer"===this.schema.type?""===this.value?void 0:1*this.value:this.value}},{key:"setValue",value:function(t){for(var e=0;e<this.radioGroup.length;e++)if(this.radioGroup[e].value==="".concat(t)){this.radioGroup[e].checked=!0,this.value=t,this.options.displayValue&&(this.displayRating.innerHTML=this.value),this.onChange(!0);break}}}])&&un(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(C);function yn(t){return yn="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},yn(t)}function mn(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==yn(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==yn(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===yn(i)?i:String(i)),n)}var i}function vn(){return vn="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=gn(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},vn.apply(this,arguments)}function bn(t,e){return bn=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},bn(t,e)}function gn(t){return gn=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},gn(t)}fn.rules={".starrating":"direction:rtl;display:inline-block;white-space:nowrap",".starrating > input":"display:none",".starrating > label:before":"content:'%5C2606';margin:1px;font-size:18px;font-style:normal;font-weight:400;line-height:1;font-family:'Arial';display:inline-block",".starrating > label":"color:%23888;cursor:pointer;margin:8px%200%202px%200",".starrating > label.starrating-display-enabled":"margin:1px%200%200%200",".starrating > input:checked ~ label":"color:%23ffca08",".starrating:not(.readonly) > input:hover ~ label":"color:%23ffca08",".starrating > input:checked ~ label:before":"content:'%5C2605';text-shadow:0%200%201px%20rgba(0%2C20%2C20%2C1)",".starrating:not(.readonly) > input:hover ~ label:before":"content:'%5C2605';text-shadow:0%200%201px%20rgba(0%2C20%2C20%2C1)",".starrating .starrating-display":"position:relative;direction:rtl;text-align:center;font-size:10px;line-height:0px"};var wn=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&bn(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=gn(n);if(i){var r=gn(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===yn(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,(r=[{key:"build",value:function(){vn(gn(a.prototype),"build",this).call(this),this.input.setAttribute("type","number"),this.input.getAttribute("step")||this.input.setAttribute("step","1");var t=this.theme.getStepperButtons(this.input);this.control.appendChild(t),this.stepperDown=this.control.querySelector(".stepper-down"),this.stepperUp=this.control.querySelector(".stepper-up")}},{key:"enable",value:function(){vn(gn(a.prototype),"enable",this).call(this),this.stepperDown.removeAttribute("disabled"),this.stepperUp.removeAttribute("disabled")}},{key:"disable",value:function(){vn(gn(a.prototype),"disable",this).call(this),this.stepperDown.setAttribute("disabled",!0),this.stepperUp.setAttribute("disabled",!0)}}])&&mn(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(Le);function _n(t){return _n="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},_n(t)}function kn(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==_n(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==_n(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===_n(i)?i:String(i)),n)}var i}function jn(){return jn="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=xn(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},jn.apply(this,arguments)}function On(t,e){return On=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},On(t,e)}function xn(t){return xn=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},xn(t)}var Cn=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&On(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=xn(n);if(i){var r=xn(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===_n(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,r=[{key:"register",value:function(){if(jn(xn(a.prototype),"register",this).call(this),this.rows)for(var t=0;t<this.rows.length;t++)this.rows[t].register()}},{key:"unregister",value:function(){if(jn(xn(a.prototype),"unregister",this).call(this),this.rows)for(var t=0;t<this.rows.length;t++)this.rows[t].unregister()}},{key:"getNumColumns",value:function(){return Math.max(Math.min(12,this.width),3)}},{key:"preBuild",value:function(){var t=this.jsoneditor.expandRefs(this.schema.items||{});this.item_title=t.title||"row",this.item_default=t.default||null,this.item_has_child_editors=t.properties||t.items,this.width=12,this.array_controls_top=this.options.array_controls_top||this.jsoneditor.options.array_controls_top,jn(xn(a.prototype),"preBuild",this).call(this)}},{key:"build",value:function(){this.table=this.theme.getTable(),this.container.appendChild(this.table),this.thead=this.theme.getTableHead(),this.table.appendChild(this.thead),this.header_row=this.theme.getTableRow(),this.thead.appendChild(this.header_row),this.row_holder=this.theme.getTableBody(),this.table.appendChild(this.row_holder);var t=this.getElementEditor(0,!0);if(this.item_default=t.getDefault(),this.width=t.getNumColumns()+2,this.options.compact?(this.panel=document.createElement("div"),this.container.appendChild(this.panel)):(this.header=document.createElement("label"),this.header.textContent=this.getTitle(),this.title=this.theme.getHeader(this.header,this.getPathDepth()),this.container.appendChild(this.title),this.options.infoText&&(this.infoButton=this.theme.getInfoButton(this.translateProperty(this.options.infoText)),this.container.appendChild(this.infoButton)),this.title_controls=this.theme.getHeaderButtonHolder(),this.title.appendChild(this.title_controls),this.schema.description&&(this.description=this.theme.getDescription(this.translateProperty(this.schema.description)),this.container.appendChild(this.description)),this.panel=this.theme.getIndentedPanel(),this.container.appendChild(this.panel),this.error_holder=document.createElement("div"),this.panel.appendChild(this.error_holder)),this.panel.appendChild(this.table),this.controls=this.theme.getButtonHolder(),this.array_controls_top?this.title.appendChild(this.controls):this.panel.appendChild(this.controls),this.item_has_child_editors)for(var e=t.getChildEditors(),r=t.property_order||Object.keys(e),n=0;n<r.length;n++){var i=this.theme.getTableHeaderCell(e[r[n]].getTitle());e[r[n]].options.hidden&&(i.style.display="none"),this.header_row.appendChild(i)}else this.header_row.appendChild(this.theme.getTableHeaderCell(this.item_title));t.destroy(),this.row_holder.innerHTML="",this.controls_header_cell=this.theme.getTableHeaderCell(" "),this.controls_header_cell.setAttribute("aria-hidden","true"),this.header_row.appendChild(this.controls_header_cell),this.addControls()}},{key:"onChildEditorChange",value:function(t){this.refreshValue(),jn(xn(a.prototype),"onChildEditorChange",this).call(this)}},{key:"getItemDefault",value:function(){return l({},{default:this.item_default}).default}},{key:"getItemTitle",value:function(){return this.item_title}},{key:"getElementEditor",value:function(t,e){var r=l({},this.schema.items),n=this.jsoneditor.getEditorClass(r,this.jsoneditor),i=this.row_holder.appendChild(this.theme.getTableRow()),o=i;this.item_has_child_editors||(o=this.theme.getTableCell(),i.appendChild(o));var a=this.jsoneditor.createEditor(n,{jsoneditor:this.jsoneditor,schema:r,container:o,path:"".concat(this.path,".").concat(t),parent:this,compact:!0,table_row:!0});return a.preBuild(),e||(a.build(),a.postBuild(),a.controls_cell=i.appendChild(this.theme.getTableCell()),a.row=i,a.table_controls=this.theme.getButtonHolder(),a.controls_cell.appendChild(a.table_controls),a.table_controls.style.margin=0,a.table_controls.style.padding=0),a}},{key:"destroy",value:function(){this.innerHTML="",this.checkParent(this.title)&&this.title.parentNode.removeChild(this.title),this.checkParent(this.description)&&this.description.parentNode.removeChild(this.description),this.checkParent(this.row_holder)&&this.row_holder.parentNode.removeChild(this.row_holder),this.checkParent(this.table)&&this.table.parentNode.removeChild(this.table),this.checkParent(this.panel)&&this.panel.parentNode.removeChild(this.panel),this.rows=this.title=this.description=this.row_holder=this.table=this.panel=null,jn(xn(a.prototype),"destroy",this).call(this)}},{key:"ensureArraySize",value:function(t){if(Array.isArray(t)||(t=[t]),this.schema.minItems)for(;t.length<this.schema.minItems;)t.push(this.getItemDefault());return this.schema.maxItems&&t.length>this.schema.maxItems&&(t=t.slice(0,this.schema.maxItems)),t}},{key:"setValue",value:function(){var t=this,e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[],r=arguments.length>1?arguments[1]:void 0;if(e=this.ensureArraySize(e),JSON.stringify(e)!==this.serialized){var n=!1;e.forEach((function(e,r){t.rows[r]?t.rows[r].setValue(e):(t.addRow(e),n=!0)}));for(var i=e.length;i<this.rows.length;i++){var o=this.rows[i].container;this.item_has_child_editors||this.rows[i].row.parentNode.removeChild(this.rows[i].row),this.rows[i].destroy(),o.parentNode&&o.parentNode.removeChild(o),this.rows[i]=null,n=!0}this.rows=this.rows.slice(0,e.length),this.refreshValue(),(n||r)&&this.refreshRowButtons(),this.onChange()}}},{key:"refreshRowButtons",value:function(){var t=this,e=this.schema.minItems&&this.schema.minItems>=this.rows.length,r=this.schema.maxItems&&this.schema.maxItems<=this.rows.length,n=[];this.rows.forEach((function(i,o){if(i.delete_button){var a=!e;t.setVisibility(i.delete_button,a),n.push(a)}if(i.copy_button){var s=!r;t.setVisibility(i.copy_button,s),n.push(s)}if(i.moveup_button){var l=0!==o;t.setVisibility(i.moveup_button,l),n.push(l)}if(i.movedown_button){var c=o!==t.rows.length-1;t.setVisibility(i.movedown_button,c),n.push(c)}}));var i=n.some((function(t){return t}));this.rows.forEach((function(e){return t.setVisibility(e.controls_cell,i)})),this.setVisibility(this.controls_header_cell,i),this.setVisibility(this.table,this.value.length);var o=!(r||this.hide_add_button);this.setVisibility(this.add_row_button,o);var a=!(!this.value.length||e||this.hide_delete_last_row_buttons);this.setVisibility(this.delete_last_row_button,a);var s=!(this.value.length<=1||e||this.hide_delete_all_rows_buttons);this.setVisibility(this.remove_all_rows_button,s);var l=o||a||s;this.setVisibility(this.controls,l)}},{key:"refreshValue",value:function(){var t=this;this.value=[],this.rows.forEach((function(e,r){t.value[r]=e.getValue()})),this.serialized=JSON.stringify(this.value)}},{key:"addRow",value:function(t){var e=this.rows.length;this.rows[e]=this.getElementEditor(e);var r=this.rows[e].table_controls;return this.hide_delete_buttons||(this.rows[e].delete_button=this._createDeleteButton(e,r)),this.show_copy_button&&(this.rows[e].copy_button=this._createCopyButton(e,r)),this.hide_move_buttons||(this.rows[e].moveup_button=this._createMoveUpButton(e,r)),this.hide_move_buttons||(this.rows[e].movedown_button=this._createMoveDownButton(e,r)),void 0!==t&&this.rows[e].setValue(t),this.rows[e]}},{key:"_createDeleteButton",value:function(t,e){var r=this,n=this.getButton("","delete","button_delete_row_title_short");return n.classList.add("delete","json-editor-btntype-delete"),n.setAttribute("data-i",t),n.addEventListener("click",(function(t){if(t.preventDefault(),t.stopPropagation(),!r.askConfirmation())return!1;var e=1*t.currentTarget.getAttribute("data-i"),n=r.getValue(),i=r.getValue()[e];n.splice(e,1),r.setValue(n),r.onChange(!0),r.jsoneditor.trigger("deleteRow",i)})),e.appendChild(n),n}},{key:"_createCopyButton",value:function(t,e){var r=this,n=this.getButton("","copy","button_copy_row_title_short"),i=this.schema;return n.classList.add("copy","json-editor-btntype-copy"),n.setAttribute("data-i",t),n.addEventListener("click",(function(t){t.preventDefault(),t.stopPropagation();var e=1*t.currentTarget.getAttribute("data-i"),n=r.getValue(),o=n[e];"string"===i.items.type&&"uuid"===i.items.format?o=f():"object"===i.items.type&&i.items.properties&&n.forEach((function(t,r){if(e===r)for(var a=0,s=Object.keys(t);a<s.length;a++){var l=s[a];i.items.properties&&i.items.properties[l]&&"uuid"===i.items.properties[l].format&&((o=Object.assign({},n[e]))[l]=f())}})),n.splice(e+1,0,o),r.setValue(n),r.onChange(!0),r.jsoneditor.trigger("copyRow",r.rows[e+1])})),e.appendChild(n),n}},{key:"_createMoveUpButton",value:function(t,e){var r=this,n=this.getButton("","moveup","button_move_up_title");return n.classList.add("moveup","json-editor-btntype-move"),n.setAttribute("data-i",t),n.addEventListener("click",(function(t){t.preventDefault(),t.stopPropagation();var e=1*t.currentTarget.getAttribute("data-i"),n=r.getValue();n.splice(e-1,0,n.splice(e,1)[0]),r.setValue(n),r.onChange(!0),r.jsoneditor.trigger("moveRow",r.rows[e-1])})),e.appendChild(n),n}},{key:"_createMoveDownButton",value:function(t,e){var r=this,n=this.getButton("","movedown","button_move_down_title");return n.classList.add("movedown","json-editor-btntype-move"),n.setAttribute("data-i",t),n.addEventListener("click",(function(t){t.preventDefault(),t.stopPropagation();var e=1*t.currentTarget.getAttribute("data-i"),n=r.getValue();n.splice(e+1,0,n.splice(e,1)[0]),r.setValue(n),r.onChange(!0),r.jsoneditor.trigger("moveRow",r.rows[e+1])})),e.appendChild(n),n}},{key:"addControls",value:function(){var t=this;this.collapsed=!1,this.toggle_button=this._createToggleButton(),this.title_controls&&(this.title.insertBefore(this.toggle_button,this.title.childNodes[0]),this.toggle_button.addEventListener("click",(function(e){e.preventDefault(),e.stopPropagation(),t.setVisibility(t.panel,t.collapsed),t.collapsed?(t.collapsed=!1,t.setButtonText(e.currentTarget,"","collapse","button_collapse")):(t.collapsed=!0,t.setButtonText(e.currentTarget,"","expand","button_expand"))})),this.options.collapsed&&c(this.toggle_button,"click"),this.schema.options&&void 0!==this.schema.options.disable_collapse?this.schema.options.disable_collapse&&(this.toggle_button.style.display="none"):this.jsoneditor.options.disable_collapse&&(this.toggle_button.style.display="none")),this.add_row_button=this._createAddRowButton(),this.delete_last_row_button=this._createDeleteLastRowButton(),this.remove_all_rows_button=this._createRemoveAllRowsButton()}},{key:"_createToggleButton",value:function(){var t=this.getButton("","collapse","button_collapse");return t.classList.add("json-editor-btntype-toggle"),t}},{key:"_createAddRowButton",value:function(){var t=this,e=this.getButton(this.getItemTitle(),"add","button_add_row_title",[this.getItemTitle()]);return e.classList.add("json-editor-btntype-add"),e.addEventListener("click",(function(e){e.preventDefault(),e.stopPropagation();var r=t.addRow();t.refreshValue(),t.refreshRowButtons(),t.onChange(!0),t.jsoneditor.trigger("addRow",r)})),this.controls.appendChild(e),e}},{key:"_createDeleteLastRowButton",value:function(){var t=this,e=this.getButton("button_delete_last","subtract","button_delete_last_title",[this.getItemTitle()]);return e.classList.add("json-editor-btntype-deletelast"),e.addEventListener("click",(function(e){if(e.preventDefault(),e.stopPropagation(),!t.askConfirmation())return!1;var r=t.getValue(),n=r.pop();t.setValue(r),t.onChange(!0),t.jsoneditor.trigger("deleteRow",n)})),this.controls.appendChild(e),e}},{key:"_createRemoveAllRowsButton",value:function(){var t=this,e=this.getButton("button_delete_all","delete","button_delete_all_title");return e.classList.add("json-editor-btntype-deleteall"),e.addEventListener("click",(function(e){if(e.preventDefault(),e.stopPropagation(),!t.askConfirmation())return!1;var r=t.getValue();t.setValue([]),t.onChange(!0),t.jsoneditor.trigger("deleteAllRows",r)})),this.controls.appendChild(e),e}}],r&&kn(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(F);function En(t){return En="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},En(t)}function Sn(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==En(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==En(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===En(i)?i:String(i)),n)}var i}function Pn(){return Pn="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Ln(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},Pn.apply(this,arguments)}function Tn(t,e){return Tn=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},Tn(t,e)}function Ln(t){return Ln=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},Ln(t)}function Rn(t){return Rn="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},Rn(t)}function An(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==Rn(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==Rn(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===Rn(i)?i:String(i)),n)}var i}function In(){return In="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Nn(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},In.apply(this,arguments)}function Bn(t,e){return Bn=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},Bn(t,e)}function Nn(t){return Nn=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},Nn(t)}function Dn(t){return Dn="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},Dn(t)}function Fn(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==Dn(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==Dn(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===Dn(i)?i:String(i)),n)}var i}function Vn(){return Vn="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Hn(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},Vn.apply(this,arguments)}function zn(t,e){return zn=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},zn(t,e)}function Hn(t){return Hn=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},Hn(t)}r(6977);var Mn={ace:R,array:F,arrayChoices:Y,arraySelect2:rt,arraySelectize:lt,autocomplete:ft,base64:wt,button:Ct,checkbox:Rt,choices:Gt,datetime:Yt,describedBy:re,enum:ce,hidden:ye,info:we,integer:Le,ip:De,jodit:qe,multiple:cr,multiselect:G,null:fr,number:Ce,object:Cr,radio:Rr,sceditor:Fr,select:Ft,select2:Gr,selectize:Yr,signature:en,simplemde:ln,starrating:fn,stepper:wn,string:C,table:Cn,upload:function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&Tn(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=Ln(n);if(i){var r=Ln(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===En(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,(r=[{key:"getNumColumns",value:function(){return 4}},{key:"build",value:function(){var t=this;if(this.options.compact||(this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired())),this.schema.description&&(this.description=this.theme.getFormInputDescription(this.translateProperty(this.schema.description))),this.options.infoText&&(this.infoButton=this.theme.getInfoButton(this.translateProperty(this.options.infoText))),this.options.hidden&&(this.container.style.display="none"),this.options=this.expandCallbacks("upload",l({},{title:"Browse",icon:"",auto_upload:!1,hide_input:!1,enable_drag_drop:!1,drop_zone_text:"Drag & Drop file here",drop_zone_top:!1,alt_drop_zone:"",mime_type:"",max_upload_size:0,upload_handler:function(t,e,r,n){window.alert('No upload_handler defined for "'.concat(t.path,'". You must create your own handler to enable upload to server'))}},this.defaults.options.upload||{},this.options.upload||{})),this.options.mime_type=this.options.mime_type?[].concat(this.options.mime_type):[],this.input=this.theme.getFormInputField("hidden"),this.container.appendChild(this.input),!this.schema.readOnly&&!this.schema.readonly){if("function"!=typeof this.options.upload_handler)throw new Error("Upload handler required for upload editor");if(this.uploader=this.theme.getFormInputField("file"),this.uploader.style.display="none",this.options.mime_type.length&&this.uploader.setAttribute("accept",this.options.mime_type),!0===this.options.enable_drag_drop&&!0===this.options.hide_input||(this.clickHandler=function(e){t.uploader.dispatchEvent(new window.MouseEvent("click",{view:window,bubbles:!0,cancelable:!1}))},this.browseButton=this.getButton(this.options.title,this.options.icon,this.options.title),this.browseButton.addEventListener("click",this.clickHandler),this.fileDisplay=this.theme.getFormInputField("input"),this.fileDisplay.setAttribute("readonly",!0),this.fileDisplay.value="No file selected.",this.fileDisplay.addEventListener("dblclick",this.clickHandler),this.fileUploadGroup=this.theme.getInputGroup(this.fileDisplay,[this.browseButton]),this.fileUploadGroup||(this.fileUploadGroup=document.createElement("div"),this.fileUploadGroup.appendChild(this.fileDisplay),this.fileUploadGroup.appendChild(this.browseButton))),!0===this.options.enable_drag_drop){if(""!==this.options.alt_drop_zone){if(this.altDropZone=document.querySelector(this.options.alt_drop_zone),!this.altDropZone)throw new Error('Error: alt_drop_zone selector "'.concat(this.options.alt_drop_zone,'" not found!'));this.dropZone=this.altDropZone}else this.dropZone=this.theme.getDropZone(this.options.drop_zone_text);this.dropZone&&(this.dropZone.classList.add("upload-dropzone"),this.dropZone.addEventListener("dblclick",this.clickHandler))}this.uploadHandler=function(e){e.preventDefault(),e.stopPropagation();var r=e.target.files||e.dataTransfer.files;if(r&&r.length)if(0!==t.options.max_upload_size&&r[0].size>t.options.max_upload_size)t.theme.addInputError(t.uploader,"".concat(t.translate("upload_max_size")," ").concat(t.options.max_upload_size));else if(0===t.options.mime_type.length||t.isValidMimeType(r[0].type,t.options.mime_type)){t.fileDisplay&&(t.fileDisplay.value=r[0].name);var n=new window.FileReader;n.onload=function(e){t.preview_value=e.target.result,t.refreshPreview(r),t.onChange(!0),n=null},n.readAsDataURL(r[0])}else t.theme.addInputError(t.uploader,"".concat(t.translate("upload_wrong_file_format")," ").concat(t.options.mime_type.toString()))},this.uploader.addEventListener("change",this.uploadHandler),this.dragHandler=function(e){var r=e.dataTransfer.items||e.dataTransfer.files,n=r&&r.length&&(0===t.options.mime_type.length||t.isValidMimeType(r[0].type,t.options.mime_type)),i=e.currentTarget.classList&&e.currentTarget.classList.contains("upload-dropzone")&&n;switch((e.currentTarget===window?"w_":"e_")+e.type){case"w_drop":case"w_dragover":i||(e.dataTransfer.dropEffect="none");break;case"e_dragenter":i?(t.dropZone.classList.add("valid-dropzone"),e.dataTransfer.dropEffect="copy"):t.dropZone.classList.add("invalid-dropzone");break;case"e_dragover":i&&(e.dataTransfer.dropEffect="copy");break;case"e_dragleave":t.dropZone.classList.remove("valid-dropzone","invalid-dropzone");break;case"e_drop":t.dropZone.classList.remove("valid-dropzone","invalid-dropzone"),i&&t.uploadHandler(e)}i||e.preventDefault()},!0===this.options.enable_drag_drop&&(["dragover","drop"].forEach((function(e){window.addEventListener(e,t.dragHandler,!0)})),["dragenter","dragover","dragleave","drop"].forEach((function(e){t.dropZone.addEventListener(e,t.dragHandler,!0)})))}this.preview=document.createElement("div"),this.control=this.input.controlgroup=this.theme.getFormControl(this.label,this.uploader||this.input,this.description,this.infoButton),this.uploader&&(this.uploader.controlgroup=this.control);var e=this.uploader||this.input,r=document.createElement("div");this.dropZone&&!this.altDropZone&&!0===this.options.drop_zone_top&&r.appendChild(this.dropZone),this.fileUploadGroup&&r.appendChild(this.fileUploadGroup),this.dropZone&&!this.altDropZone&&!0!==this.options.drop_zone_top&&r.appendChild(this.dropZone),r.appendChild(this.preview),e.parentNode.insertBefore(r,e.nextSibling),this.container.appendChild(this.control),window.requestAnimationFrame((function(){t.afterInputReady()}))}},{key:"afterInputReady",value:function(){var t=this;if(this.value){var e=document.createElement("img");e.style.maxWidth="100%",e.style.maxHeight="100px",e.onload=function(r){t.preview.appendChild(e)},e.onerror=function(t){console.error("upload error",t,t.currentTarget)},e.src=this.container.querySelector("a").href}this.theme.afterInputReady(this.input)}},{key:"refreshPreview",value:function(t){var e=this;if(this.last_preview!==this.preview_value&&(this.last_preview=this.preview_value,this.preview.innerHTML="",this.preview_value)){var r=t[0],n=this.preview_value.match(/^data:([^;,]+)[;,]/);if(r.mimeType=n?n[1]:"unknown",r.size>0){var i=Math.floor(Math.log(r.size)/Math.log(1024));r.formattedSize="".concat(parseFloat((r.size/Math.pow(1024,i)).toFixed(2))," ").concat(["Bytes","KB","MB","GB","TB","PB","EB","ZB","YB"][i])}else r.formattedSize="0 Bytes";var o=this.getButton("button_upload","upload","button_upload");o.addEventListener("click",(function(t){t.preventDefault(),o.setAttribute("disabled","disabled"),e.theme.removeInputError(e.uploader),e.theme.getProgressBar&&(e.progressBar=e.theme.getProgressBar(),e.preview.appendChild(e.progressBar)),e.options.upload_handler(e.path,r,{success:function(t){e.setValue(t),e.parent?e.parent.onChildEditorChange(e):e.jsoneditor.onChange(),e.progressBar&&e.preview.removeChild(e.progressBar),o.removeAttribute("disabled")},failure:function(t){e.theme.addInputError(e.uploader,t),e.progressBar&&e.preview.removeChild(e.progressBar),o.removeAttribute("disabled")},updateProgress:function(t){e.progressBar&&(t?e.theme.updateProgressBar(e.progressBar,t):e.theme.updateProgressBarUnknown(e.progressBar))}})})),this.preview.appendChild(this.theme.getUploadPreview(r,o,this.preview_value)),this.options.auto_upload&&(o.dispatchEvent(new window.MouseEvent("click")),o.parentNode.removeChild(o))}}},{key:"enable",value:function(){this.always_disabled||(this.uploader&&(this.uploader.disabled=!1),Pn(Ln(a.prototype),"enable",this).call(this))}},{key:"disable",value:function(t){t&&(this.always_disabled=!0),this.uploader&&(this.uploader.disabled=!0),Pn(Ln(a.prototype),"disable",this).call(this)}},{key:"setValue",value:function(t){this.value!==t&&(this.value=t,this.input.value=this.value,this.onChange())}},{key:"destroy",value:function(){var t=this;!0===this.options.enable_drag_drop&&(["dragover","drop"].forEach((function(e){window.removeEventListener(e,t.dragHandler,!0)})),["dragenter","dragover","dragleave","drop"].forEach((function(e){t.dropZone.removeEventListener(e,t.dragHandler,!0)})),this.dropZone.removeEventListener("dblclick",this.clickHandler),this.dropZone&&this.dropZone.parentNode&&this.dropZone.parentNode.removeChild(this.dropZone)),this.uploader&&this.uploader.parentNode&&(this.uploader.removeEventListener("change",this.uploadHandler),this.uploader.parentNode.removeChild(this.uploader)),this.browseButton&&this.browseButton.parentNode&&(this.browseButton.removeEventListener("click",this.clickHandler),this.browseButton.parentNode.removeChild(this.browseButton)),this.fileDisplay&&this.fileDisplay.parentNode&&(this.fileDisplay.removeEventListener("dblclick",this.clickHandler),this.fileDisplay.parentNode.removeChild(this.fileDisplay)),this.fileUploadGroup&&this.fileUploadGroup.parentNode&&this.fileUploadGroup.parentNode.removeChild(this.fileUploadGroup),this.preview&&this.preview.parentNode&&this.preview.parentNode.removeChild(this.preview),this.header&&this.header.parentNode&&this.header.parentNode.removeChild(this.header),this.input&&this.input.parentNode&&this.input.parentNode.removeChild(this.input),Pn(Ln(a.prototype),"destroy",this).call(this)}},{key:"isValidMimeType",value:function(t,e){return e.reduce((function(e,r){return e||new RegExp(r.replace(/\*/g,".*"),"gi").test(t)}),!1)}}])&&Sn(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(w),uuid:function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&Bn(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=Nn(n);if(i){var r=Nn(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===Rn(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,(r=[{key:"preBuild",value:function(){In(Nn(a.prototype),"preBuild",this).call(this),this.schema.default=this.uuid=this.getUuid(),this.schema.options||(this.schema.options={}),this.schema.options.cleave||(this.schema.options.cleave={delimiters:["-"],blocks:[8,4,4,4,12]})}},{key:"build",value:function(){In(Nn(a.prototype),"build",this).call(this),this.disable(!0),this.input.setAttribute("readonly","true")}},{key:"sanitize",value:function(t){return this.testUuid(t)||(t=this.uuid),t}},{key:"setValue",value:function(t,e,r){this.testUuid(t)||(t=this.uuid),this.uuid=t,In(Nn(a.prototype),"setValue",this).call(this,t,e,r)}},{key:"getUuid",value:function(){return f()}},{key:"testUuid",value:function(t){return/^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(t)}}])&&An(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(C),colorpicker:function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&zn(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=Hn(n);if(i){var r=Hn(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===Dn(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,(r=[{key:"postBuild",value:function(){window.Picker&&(this.input.type="text"),this.input.style.padding="3px"}},{key:"setValue",value:function(t,e,r){var n=Vn(Hn(a.prototype),"setValue",this).call(this,t,e,r);return this.picker_instance&&this.picker_instance.domElement&&n&&n.changed&&this.picker_instance.setColor(n.value,!0),n}},{key:"getNumColumns",value:function(){return 2}},{key:"afterInputReady",value:function(){Vn(Hn(a.prototype),"afterInputReady",this).call(this),this.createPicker(!0)}},{key:"disable",value:function(){if(Vn(Hn(a.prototype),"disable",this).call(this),this.picker_instance&&this.picker_instance.domElement){this.picker_instance.domElement.style.pointerEvents="none";for(var t=this.picker_instance.domElement.querySelectorAll("button"),e=0;e<t.length;e++)t[e].disabled=!0}}},{key:"enable",value:function(){if(Vn(Hn(a.prototype),"enable",this).call(this),this.picker_instance&&this.picker_instance.domElement){this.picker_instance.domElement.style.pointerEvents="auto";for(var t=this.picker_instance.domElement.querySelectorAll("button"),e=0;e<t.length;e++)t[e].disabled=!1}}},{key:"destroy",value:function(){this.createPicker(!1),Vn(Hn(a.prototype),"destroy",this).call(this)}},{key:"createPicker",value:function(t){var e=this;if(t){if(window.Picker&&!this.picker_instance){var r=this.expandCallbacks("colorpicker",l({},{editor:!1,alpha:!1,color:this.value,popup:"bottom"},this.defaults.options.colorpicker||{},this.options.colorpicker||{},{parent:this.container})),n=function(t){var r=e.picker_instance.settings.editorFormat,n=e.picker_instance.settings.alpha;e.setValue("hex"===r?n?t.hex:t.hex.slice(0,7):t["".concat(r+(n?"a":""),"String")])};r.popup||"function"==typeof r.onChange?r.popup&&"function"!=typeof r.onDone&&(r.onDone=n):r.onChange=n,this.picker_instance=new window.Picker(r),r.popup||(this.input.style.display="none",this.theme.afterInputReady(this.picker_instance.domElement))}}else this.picker_instance&&(this.picker_instance.destroy(),this.picker_instance=null,this.input.style.display="")}}])&&Fn(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(C)};function qn(t,e){(null==e||e>t.length)&&(e=t.length);for(var r=0,n=new Array(e);r<e;r++)n[r]=t[r];return n}var Gn={},Un="en",$n=Un;Gn.en={error_notset:"Property must be set",error_notempty:"Value required",error_enum:"Value must be one of the enumerated values",error_const:"Value must be the constant value",error_anyOf:"Value must validate against at least one of the provided schemas",error_oneOf:"Value must validate against exactly one of the provided schemas. It currently validates against {{0}} of the schemas.",error_not:"Value must not validate against the provided schema",error_type_union:"Value must be one of the provided types",error_type:"Value must be of type {{0}}",error_disallow_union:"Value must not be one of the provided disallowed types",error_disallow:"Value must not be of type {{0}}",error_multipleOf:"Value must be a multiple of {{0}}",error_maximum_excl:"Value must be less than {{0}}",error_maximum_incl:"Value must be at most {{0}}",error_minimum_excl:"Value must be greater than {{0}}",error_minimum_incl:"Value must be at least {{0}}",error_maxLength:"Value must be at most {{0}} characters long",error_contains:"No items match contains",error_minContains:"Contains match count {{0}} is less than minimum contains count of {{1}}",error_maxContains:"Contains match count {{0}} exceeds maximum contains count of {{1}}",error_minLength:"Value must be at least {{0}} characters long",error_pattern:"Value must match the pattern {{0}}",error_additionalItems:"No additional items allowed in this array",error_maxItems:"Value must have at most {{0}} items",error_minItems:"Value must have at least {{0}} items",error_uniqueItems:"Array must have unique items",error_maxProperties:"Object must have at most {{0}} properties",error_minProperties:"Object must have at least {{0}} properties",error_required:"Object is missing the required property '{{0}}'",error_additional_properties:"No additional properties allowed, but property {{0}} is set",error_property_names_exceeds_maxlength:"Property name {{0}} exceeds maxLength",error_property_names_enum_mismatch:"Property name {{0}} does not match any enum values",error_property_names_const_mismatch:"Property name {{0}} does not match the const value",error_property_names_pattern_mismatch:"Property name {{0}} does not match pattern",error_property_names_false:"Property name {{0}} fails when propertyName is false",error_property_names_maxlength:"Property name {{0}} cannot match invalid maxLength",error_property_names_enum:"Property name {{0}} cannot match invalid enum",error_property_names_pattern:"Property name {{0}} cannot match invalid pattern",error_property_names_unsupported:"Unsupported propertyName {{0}}",error_dependency:"Must have property {{0}}",error_date:"Date must be in the format {{0}}",error_time:"Time must be in the format {{0}}",error_datetime_local:"Datetime must be in the format {{0}}",error_invalid_epoch:"Date must be greater than 1 January 1970",error_ipv4:"Value must be a valid IPv4 address in the form of 4 numbers between 0 and 255, separated by dots",error_ipv6:"Value must be a valid IPv6 address",error_hostname:"The hostname has the wrong format",upload_max_size:"Filesize too large. Max size is ",upload_wrong_file_format:"Wrong file format. Allowed format(s): ",button_save:"Save",button_copy:"Copy",button_cancel:"Cancel",button_add:"Add",button_delete_all:"All",button_delete_all_title:"Delete All",button_delete_last:"Last {{0}}",button_delete_last_title:"Delete Last {{0}}",button_add_row_title:"Add {{0}}",button_move_down_title:"Move down",button_move_up_title:"Move up",button_properties:"Properties",button_object_properties:"Object Properties",button_copy_row_title:"Copy {{0}}",button_delete_row_title:"Delete {{0}}",button_delete_row_title_short:"Delete",button_copy_row_title_short:"Copy",button_collapse:"Collapse",button_expand:"Expand",button_edit_json:"Edit JSON",button_upload:"Upload",flatpickr_toggle_button:"Toggle",flatpickr_clear_button:"Clear",choices_placeholder_text:"Start typing to add value",default_array_item_title:"item",button_delete_node_warning:"Are you sure you want to remove this item?"},Object.entries(Mn).forEach((function(t){var e=function(t,e){return function(t){if(Array.isArray(t))return t}(t)||function(t,e){var r=null==t?null:"undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(null!=r){var n,i,o,a,s=[],l=!0,c=!1;try{if(o=(r=r.call(t)).next,0===e){if(Object(r)!==r)return;l=!1}else for(;!(l=(n=o.call(r)).done)&&(s.push(n.value),s.length!==e);l=!0);}catch(t){c=!0,i=t}finally{try{if(!l&&null!=r.return&&(a=r.return(),Object(a)!==a))return}finally{if(c)throw i}}return s}}(t,e)||function(t,e){if(t){if("string"==typeof t)return qn(t,e);var r=Object.prototype.toString.call(t).slice(8,-1);return"Object"===r&&t.constructor&&(r=t.constructor.name),"Map"===r||"Set"===r?Array.from(t):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?qn(t,e):void 0}}(t,e)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}(t,2),r=e[0],n=e[1];Mn[r].options=n.options||{}}));var Jn={options:{upload:function(t,e,r){console.log("Upload handler required for upload editor")},use_name_attributes:!0,prompt_before_delete:!0,use_default_values:!0,max_depth:0},theme:"html",template:"default",themes:{},callbacks:{},templates:{},iconlibs:{},editors:Mn,languages:Gn,resolvers:e,custom_validators:[],default_language:Un,language:$n,translate:function(t,e,r){var n={};r&&r.options&&r.options.error_messages&&r.options.error_messages[Jn.language]&&(n=r.options.error_messages[Jn.language]);var i=Jn.languages[Jn.language];if(!i)throw new Error("Unknown language ".concat(Jn.language));var o=n[t]||i[t]||Jn.languages[Un][t]||t;if(e)for(var a=0;a<e.length;a++)o=o.replace(new RegExp("\\{\\{".concat(a,"}}"),"g"),e[a]);return o},translateProperty:function(t,e){return t}};function Wn(){Wn=function(){return t};var t={},e=Object.prototype,r=e.hasOwnProperty,n=Object.defineProperty||function(t,e,r){t[e]=r.value},i="function"==typeof Symbol?Symbol:{},o=i.iterator||"@@iterator",a=i.asyncIterator||"@@asyncIterator",s=i.toStringTag||"@@toStringTag";function l(t,e,r){return Object.defineProperty(t,e,{value:r,enumerable:!0,configurable:!0,writable:!0}),t[e]}try{l({},"")}catch(t){l=function(t,e,r){return t[e]=r}}function c(t,e,r,i){var o=e&&e.prototype instanceof p?e:p,a=Object.create(o.prototype),s=new x(i||[]);return n(a,"_invoke",{value:_(t,r,s)}),a}function u(t,e,r){try{return{type:"normal",arg:t.call(e,r)}}catch(t){return{type:"throw",arg:t}}}t.wrap=c;var h={};function p(){}function d(){}function f(){}var y={};l(y,o,(function(){return this}));var m=Object.getPrototypeOf,v=m&&m(m(C([])));v&&v!==e&&r.call(v,o)&&(y=v);var b=f.prototype=p.prototype=Object.create(y);function g(t){["next","throw","return"].forEach((function(e){l(t,e,(function(t){return this._invoke(e,t)}))}))}function w(t,e){function i(n,o,a,s){var l=u(t[n],t,o);if("throw"!==l.type){var c=l.arg,h=c.value;return h&&"object"==Xn(h)&&r.call(h,"__await")?e.resolve(h.__await).then((function(t){i("next",t,a,s)}),(function(t){i("throw",t,a,s)})):e.resolve(h).then((function(t){c.value=t,a(c)}),(function(t){return i("throw",t,a,s)}))}s(l.arg)}var o;n(this,"_invoke",{value:function(t,r){function n(){return new e((function(e,n){i(t,r,e,n)}))}return o=o?o.then(n,n):n()}})}function _(t,e,r){var n="suspendedStart";return function(i,o){if("executing"===n)throw new Error("Generator is already running");if("completed"===n){if("throw"===i)throw o;return{value:void 0,done:!0}}for(r.method=i,r.arg=o;;){var a=r.delegate;if(a){var s=k(a,r);if(s){if(s===h)continue;return s}}if("next"===r.method)r.sent=r._sent=r.arg;else if("throw"===r.method){if("suspendedStart"===n)throw n="completed",r.arg;r.dispatchException(r.arg)}else"return"===r.method&&r.abrupt("return",r.arg);n="executing";var l=u(t,e,r);if("normal"===l.type){if(n=r.done?"completed":"suspendedYield",l.arg===h)continue;return{value:l.arg,done:r.done}}"throw"===l.type&&(n="completed",r.method="throw",r.arg=l.arg)}}}function k(t,e){var r=e.method,n=t.iterator[r];if(void 0===n)return e.delegate=null,"throw"===r&&t.iterator.return&&(e.method="return",e.arg=void 0,k(t,e),"throw"===e.method)||"return"!==r&&(e.method="throw",e.arg=new TypeError("The iterator does not provide a '"+r+"' method")),h;var i=u(n,t.iterator,e.arg);if("throw"===i.type)return e.method="throw",e.arg=i.arg,e.delegate=null,h;var o=i.arg;return o?o.done?(e[t.resultName]=o.value,e.next=t.nextLoc,"return"!==e.method&&(e.method="next",e.arg=void 0),e.delegate=null,h):o:(e.method="throw",e.arg=new TypeError("iterator result is not an object"),e.delegate=null,h)}function j(t){var e={tryLoc:t[0]};1 in t&&(e.catchLoc=t[1]),2 in t&&(e.finallyLoc=t[2],e.afterLoc=t[3]),this.tryEntries.push(e)}function O(t){var e=t.completion||{};e.type="normal",delete e.arg,t.completion=e}function x(t){this.tryEntries=[{tryLoc:"root"}],t.forEach(j,this),this.reset(!0)}function C(t){if(t){var e=t[o];if(e)return e.call(t);if("function"==typeof t.next)return t;if(!isNaN(t.length)){var n=-1,i=function e(){for(;++n<t.length;)if(r.call(t,n))return e.value=t[n],e.done=!1,e;return e.value=void 0,e.done=!0,e};return i.next=i}}return{next:E}}function E(){return{value:void 0,done:!0}}return d.prototype=f,n(b,"constructor",{value:f,configurable:!0}),n(f,"constructor",{value:d,configurable:!0}),d.displayName=l(f,s,"GeneratorFunction"),t.isGeneratorFunction=function(t){var e="function"==typeof t&&t.constructor;return!!e&&(e===d||"GeneratorFunction"===(e.displayName||e.name))},t.mark=function(t){return Object.setPrototypeOf?Object.setPrototypeOf(t,f):(t.__proto__=f,l(t,s,"GeneratorFunction")),t.prototype=Object.create(b),t},t.awrap=function(t){return{__await:t}},g(w.prototype),l(w.prototype,a,(function(){return this})),t.AsyncIterator=w,t.async=function(e,r,n,i,o){void 0===o&&(o=Promise);var a=new w(c(e,r,n,i),o);return t.isGeneratorFunction(r)?a:a.next().then((function(t){return t.done?t.value:a.next()}))},g(b),l(b,s,"Generator"),l(b,o,(function(){return this})),l(b,"toString",(function(){return"[object Generator]"})),t.keys=function(t){var e=Object(t),r=[];for(var n in e)r.push(n);return r.reverse(),function t(){for(;r.length;){var n=r.pop();if(n in e)return t.value=n,t.done=!1,t}return t.done=!0,t}},t.values=C,x.prototype={constructor:x,reset:function(t){if(this.prev=0,this.next=0,this.sent=this._sent=void 0,this.done=!1,this.delegate=null,this.method="next",this.arg=void 0,this.tryEntries.forEach(O),!t)for(var e in this)"t"===e.charAt(0)&&r.call(this,e)&&!isNaN(+e.slice(1))&&(this[e]=void 0)},stop:function(){this.done=!0;var t=this.tryEntries[0].completion;if("throw"===t.type)throw t.arg;return this.rval},dispatchException:function(t){if(this.done)throw t;var e=this;function n(r,n){return a.type="throw",a.arg=t,e.next=r,n&&(e.method="next",e.arg=void 0),!!n}for(var i=this.tryEntries.length-1;i>=0;--i){var o=this.tryEntries[i],a=o.completion;if("root"===o.tryLoc)return n("end");if(o.tryLoc<=this.prev){var s=r.call(o,"catchLoc"),l=r.call(o,"finallyLoc");if(s&&l){if(this.prev<o.catchLoc)return n(o.catchLoc,!0);if(this.prev<o.finallyLoc)return n(o.finallyLoc)}else if(s){if(this.prev<o.catchLoc)return n(o.catchLoc,!0)}else{if(!l)throw new Error("try statement without catch or finally");if(this.prev<o.finallyLoc)return n(o.finallyLoc)}}}},abrupt:function(t,e){for(var n=this.tryEntries.length-1;n>=0;--n){var i=this.tryEntries[n];if(i.tryLoc<=this.prev&&r.call(i,"finallyLoc")&&this.prev<i.finallyLoc){var o=i;break}}o&&("break"===t||"continue"===t)&&o.tryLoc<=e&&e<=o.finallyLoc&&(o=null);var a=o?o.completion:{};return a.type=t,a.arg=e,o?(this.method="next",this.next=o.finallyLoc,h):this.complete(a)},complete:function(t,e){if("throw"===t.type)throw t.arg;return"break"===t.type||"continue"===t.type?this.next=t.arg:"return"===t.type?(this.rval=this.arg=t.arg,this.method="return",this.next="end"):"normal"===t.type&&e&&(this.next=e),h},finish:function(t){for(var e=this.tryEntries.length-1;e>=0;--e){var r=this.tryEntries[e];if(r.finallyLoc===t)return this.complete(r.completion,r.afterLoc),O(r),h}},catch:function(t){for(var e=this.tryEntries.length-1;e>=0;--e){var r=this.tryEntries[e];if(r.tryLoc===t){var n=r.completion;if("throw"===n.type){var i=n.arg;O(r)}return i}}throw new Error("illegal catch attempt")},delegateYield:function(t,e,r){return this.delegate={iterator:C(t),resultName:e,nextLoc:r},"next"===this.method&&(this.arg=void 0),h}},t}function Zn(t,e,r,n,i,o,a){try{var s=t[o](a),l=s.value}catch(t){return void r(t)}s.done?e(l):Promise.resolve(l).then(n,i)}function Yn(t){return function(){var e=this,r=arguments;return new Promise((function(n,i){var o=t.apply(e,r);function a(t){Zn(o,n,i,a,s,"next",t)}function s(t){Zn(o,n,i,a,s,"throw",t)}a(void 0)}))}}function Qn(t,e){return function(t){if(Array.isArray(t))return t}(t)||function(t,e){var r=null==t?null:"undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(null!=r){var n,i,o,a,s=[],l=!0,c=!1;try{if(o=(r=r.call(t)).next,0===e){if(Object(r)!==r)return;l=!1}else for(;!(l=(n=o.call(r)).done)&&(s.push(n.value),s.length!==e);l=!0);}catch(t){c=!0,i=t}finally{try{if(!l&&null!=r.return&&(a=r.return(),Object(a)!==a))return}finally{if(c)throw i}}return s}}(t,e)||function(t,e){if(t){if("string"==typeof t)return Kn(t,e);var r=Object.prototype.toString.call(t).slice(8,-1);return"Object"===r&&t.constructor&&(r=t.constructor.name),"Map"===r||"Set"===r?Array.from(t):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?Kn(t,e):void 0}}(t,e)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function Kn(t,e){(null==e||e>t.length)&&(e=t.length);for(var r=0,n=new Array(e);r<e;r++)n[r]=t[r];return n}function Xn(t){return Xn="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},Xn(t)}function ti(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==Xn(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==Xn(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===Xn(i)?i:String(i)),n)}var i}r(8733);var ei=function(){function t(e){!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,t),this.options=e||{},this.schema={},this.refs=this.options.refs||{},this.refs_with_info={},this.refs_prefix="#/counter/",this.refs_counter=1,this._subSchema1={type:function(t){"object"===Xn(t.type)&&(t.type=this._expandSubSchema(t.type))},disallow:function(t){"object"===Xn(t.disallow)&&(t.disallow=this._expandSubSchema(t.disallow))},anyOf:function(t){var e=this;Object.entries(t.anyOf).forEach((function(r){var n=Qn(r,2),i=n[0],o=n[1];t.anyOf[i]=e.expandSchema(o)}))},dependencies:function(t){var e=this;Object.entries(t.dependencies).forEach((function(r){var n=Qn(r,2),i=n[0],o=n[1];"object"!==Xn(o)||Array.isArray(o)||(t.dependencies[i]=e.expandSchema(o))}))},not:function(t){t.not=this.expandSchema(t.not)}},this._subSchema2={allOf:function(t,e){var r=this,n=l({},e);return Object.entries(t.allOf).forEach((function(e){var i=Qn(e,2),o=i[0],a=i[1];t.allOf[o]=r.expandRefs(a,!0),n=r.extendSchemas(n,r.expandSchema(a))})),delete n.allOf,n},extends:function(t,e){var r,n=this;return delete(r=Array.isArray(t.extends)?t.extends.reduce((function(t,e,r){return n.extendSchemas(t,n.expandSchema(e))}),e):this.extendSchemas(e,this.expandSchema(t.extends))).extends,r},oneOf:function(t,e){var r=this,n=l({},e);return delete n.oneOf,t.oneOf.reduce((function(t,e,i){return t.oneOf[i]=r.extendSchemas(r.expandSchema(e),n),t}),e),e}}}var e,r,n,i;return e=t,r=[{key:"load",value:(i=Yn(Wn().mark((function t(e,r,n){return Wn().wrap((function(t){for(;;)switch(t.prev=t.next){case 0:return this.schema=e,t.next=3,this._asyncloadExternalRefs(e,r,this._getFileBase(n),!0);case 3:return t.abrupt("return",this.expandRefs(e));case 4:case"end":return t.stop()}}),t,this)}))),function(t,e,r){return i.apply(this,arguments)})},{key:"expandRefs",value:function(t,e){var r=this,n=l({},t);if(!n.$ref)return n;var i=n.$ref.split("#");if(2===i.length&&!this.refs_with_info[n.$ref]){var o=this.expandRecursivePointer(this.schema,i[1]),a=this.extendSchemas(n,this.expandSchema(o));return delete a.$ref,a}var s=i.length>2?this.refs_with_info["#"+i[1]]:this.refs_with_info[n.$ref];delete n.$ref;var c=s.$ref.startsWith("#")?s.fetchUrl:"",u=this._getRef(c,s);if(this.refs[u]){if(e&&h(this.refs[u],"allOf")){var p=this.refs[u].allOf;Object.keys(p).forEach((function(t){p[t]=r.expandRefs(p[t],!0)}))}}else console.warn("reference:'".concat(u,"' not found!"));return i.length>2?this.extendSchemas(n,this.expandSchema(this.expandRecursivePointer(this.refs[u],i[2]))):this.extendSchemas(n,this.expandSchema(this.refs[u]))}},{key:"expandRecursivePointer",value:function(t,e){var r=t;return e.split("/").slice(1).forEach((function(t){r[t]&&(r=r[t])})),r.$refs&&r.$refs.startsWith("#")?this.expandRecursivePointer(t,r.$refs):r}},{key:"expandSchema",value:function(t){var e=this;Object.entries(this._subSchema1).forEach((function(r){var n=Qn(r,2),i=n[0],o=n[1];t[i]&&o.call(e,t)}));var r=l({},t);return Object.entries(this._subSchema2).forEach((function(n){var i=Qn(n,2),o=i[0],a=i[1];t[o]&&(r=a.call(e,t,r))})),this.expandRefs(r)}},{key:"_getRef",value:function(t,e){var r=t+e;return this.refs[r]?r:t+decodeURIComponent(e.$ref)}},{key:"_expandSubSchema",value:function(t){var e=this;return Array.isArray(t)?t.map((function(t){return"object"===Xn(t)?e.expandSchema(t):t})):this.expandSchema(t)}},{key:"_manageRecursivePointer",value:function(t,e){Object.keys(t).forEach((function(r){t[r].$ref&&0===t[r].$ref.indexOf("#")&&(t[r].$ref=e+t[r].$ref)}))}},{key:"_getExternalRefs",value:function(t,e){var r=this,n=arguments.length>2&&void 0!==arguments[2]&&arguments[2];n||this._manageRecursivePointer(t,e);var i={},o=function(t){return Object.keys(t).forEach((function(t){i[t]=!0}))};if(t.$ref&&"object"!==Xn(t.$ref)&&(0!==t.$ref.indexOf("#")||!n)){var a=t.$ref,s="";a.indexOf("#")>0&&(a=a.substr(0,a.indexOf("#"))),a!==t.$ref&&(s=t.$ref.substr(t.$ref.indexOf("#")));var l=this.refs_prefix+this.refs_counter++,c=l+s;"#"===t.$ref.substr(0,1)||this.refs[t.$ref]||(i[a]=!0),this.refs_with_info[l]={fetchUrl:e,$ref:a},t.$ref=c}return Object.values(t).forEach((function(t){t&&"object"===Xn(t)&&(Array.isArray(t)?Object.values(t).forEach((function(t){t&&"object"===Xn(t)&&o(r._getExternalRefs(t,e,n))})):t.$ref&&"string"==typeof t.$ref&&t.$ref.startsWith("#")||o(r._getExternalRefs(t,e,n)))})),t.id&&"string"==typeof t.id&&"urn:"===t.id.substr(0,4)?this.refs[t.id]=t:t.$id&&"string"==typeof t.$id&&"urn:"===t.$id.substr(0,4)&&(this.refs[t.$id]=t),i}},{key:"_getFileBase",value:function(t){if(!t)return"/";var e=this.options.ajaxBase;return void 0===e?this._getFileBaseFromFileLocation(t):e}},{key:"_getFileBaseFromFileLocation",value:function(t){var e=t.split("/");return e.pop(),"".concat(e.join("/"),"/")}},{key:"_joinUrl",value:function(t,e){var r=t;return"http://"!==t.substr(0,7)&&"https://"!==t.substr(0,8)&&"blob:"!==t.substr(0,5)&&"data:"!==t.substr(0,5)&&"#"!==t.substr(0,1)&&"/"!==t.substr(0,1)&&(r=e+t),r.indexOf("#")>0&&(r=r.substr(0,r.indexOf("#"))),r}},{key:"_isUniformResourceName",value:function(t){return"urn:"===t.substr(0,4)}},{key:"_asyncloadExternalRefs",value:(n=Yn(Wn().mark((function t(e,r,n){var i,o,a,s,l,c,u=this,h=arguments;return Wn().wrap((function(t){for(;;)switch(t.prev=t.next){case 0:i=h.length>3&&void 0!==h[3]&&h[3],o=this._getExternalRefs(e,r,i),a=0,s=Wn().mark((function t(){var e,r,i,o,s,h,p,d,f,y,m;return Wn().wrap((function(t){for(;;)switch(t.prev=t.next){case 0:if(void 0!==(e=c[l])){t.next=3;break}return t.abrupt("return","continue");case 3:if(!u.refs[e]){t.next=5;break}return t.abrupt("return","continue");case 5:if(!u._isUniformResourceName(e)){t.next=40;break}if(u.refs[e]="loading",a++,r=u.options.urn_resolver,i=e,"function"==typeof r){t.next=13;break}throw console.log('No "urn_resolver" callback defined to resolve "'.concat(i,'"')),new Error("Must set urn_resolver option to a callback to resolve ".concat(i));case 13:return i.indexOf("#")>0&&(i=i.substr(0,i.indexOf("#"))),t.prev=14,t.next=17,r(i);case 17:o=t.sent,t.prev=18,s=JSON.parse(o),t.next=26;break;case 22:throw t.prev=22,t.t0=t.catch(18),console.log(t.t0),new Error("Failed to parse external ref ".concat(i));case 26:if(!("boolean"!=typeof s&&"object"!==Xn(s)||null===s||Array.isArray(s))){t.next=28;break}throw new Error("External ref does not contain a valid schema - ".concat(i));case 28:return u.refs[e]=s,t.next=31,u._asyncloadExternalRefs(s,e,n);case 31:t.next=37;break;case 33:throw t.prev=33,t.t1=t.catch(14),console.log(t.t1),new Error("Failed to parse external ref ".concat(i));case 37:if("boolean"!=typeof o){t.next=39;break}throw new Error("External ref does not contain a valid schema - ".concat(i));case 39:return t.abrupt("return","continue");case 40:if(u.options.ajax){t.next=42;break}throw new Error("Must set ajax option to true to load external ref ".concat(e));case 42:if(a++,h=u._joinUrl(e,n),u.options.ajax_cache_responses&&(d=u.cacheGet(h))&&(p=d),p){t.next=60;break}return t.next=48,new Promise((function(t){var e=new XMLHttpRequest;u.options.ajaxCredentials&&(e.withCredentials=u.options.ajaxCredentials),e.overrideMimeType("application/json"),e.open("GET",h,!0),e.onload=function(){t(e)},e.onerror=function(e){t(void 0)},e.send()}));case 48:if(void 0!==(f=t.sent)){t.next=51;break}throw new Error("Failed to fetch ref via ajax - ".concat(e));case 51:t.prev=51,p=JSON.parse(f.responseText),u.options.ajax_cache_responses&&u.cacheSet(h,p),t.next=60;break;case 56:throw t.prev=56,t.t2=t.catch(51),console.log(t.t2),new Error("Failed to parse external ref ".concat(h));case 60:if(!("boolean"!=typeof p&&"object"!==Xn(p)||null===p||Array.isArray(p))){t.next=62;break}throw new Error("External ref does not contain a valid schema - ".concat(h));case 62:return u.refs[e]=p,y=u._getFileBaseFromFileLocation(h),h!==e&&(m=h.split("/"),h=("/"===e.substr(0,1)?"/":"")+m.pop()),t.next=67,u._asyncloadExternalRefs(p,h,y);case 67:case"end":return t.stop()}}),t,null,[[14,33],[18,22],[51,56]])})),l=0,c=Object.keys(o);case 5:if(!(l<c.length)){t.next=13;break}return t.delegateYield(s(),"t0",7);case 7:if("continue"!==t.t0){t.next=10;break}return t.abrupt("continue",10);case 10:l++,t.next=5;break;case 13:if(a){t.next=15;break}return t.abrupt("return",!0);case 15:case"end":return t.stop()}}),t,this)}))),function(t,e,r){return n.apply(this,arguments)})},{key:"extendSchemas",value:function(t,e){var r=this;t=l({},t),e=l({},e);var n={},i=function(t){"string"==typeof t&&(t=[t]),"string"==typeof e.type&&(e.type=[e.type]),e.type&&e.type.length?n.type=t.filter((function(t){return e.type.includes(t)})):n.type=t,1===n.type.length&&"string"==typeof n.type[0]?n.type=n.type[0]:0===n.type.length&&delete n.type};return Object.entries(t).forEach((function(t){var o=Qn(t,2),a=o[0],s=o[1];void 0!==e[a]?function(t,o){!function(t,e){return("required"===t||"defaultProperties"===t)&&"object"===Xn(e)&&Array.isArray(e)}(t,o)?"type"!==t||"string"!=typeof o&&!Array.isArray(o)?"object"!==Xn(o)||Array.isArray(o)||null===o?n[t]=o:n[t]=r.extendSchemas(o,e[t]):i(o):n[t]=o.concat(e[t]).reduce((function(t,e){return t.includes(e)||t.push(e),t}),[])}(a,s):n[a]=s})),Object.entries(e).forEach((function(e){var r=Qn(e,2),i=r[0],o=r[1];void 0===t[i]&&(n[i]=o)})),n}},{key:"getCacheKey",value:function(t){return["je-cache",t].join("::")}},{key:"getCacheBuster",value:function(){return this.options.ajax_cache_buster||(new Date).toISOString().slice(0,10)}},{key:"cacheSet",value:function(t,e){try{window.localStorage.setItem(this.getCacheKey(t),JSON.stringify({cacheBuster:this.getCacheBuster(),schema:e}))}catch(t){console.error(t)}}},{key:"cacheGet",value:function(t){try{var e=window.localStorage.getItem(this.getCacheKey(t));if(e){var r=JSON.parse(e);if(r.cacheBuster&&r.schema&&r.cacheBuster===this.getCacheBuster())return r.schema;this.cacheDelete(t)}}catch(t){console.error(t)}}},{key:"cacheDelete",value:function(t){window.localStorage.removeItem(this.getCacheKey(t))}}],r&&ti(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),t}(),ri=(r(3210),{default:function(){return{compile:function(t){var e=t.match(/{{\s*([a-zA-Z0-9\-_ .]+)\s*}}/g),r=e&&e.length;if(!r)return function(){return t};for(var n=[],i=function(t){var r,i,o=e[t].replace(/[{}]+/g,"").trim().split("."),a=o.length;a>1?r=function(e){for(i=e,t=0;t<a&&(i=i[o[t]]);t++);return i}:(o=o[0],r=function(t){return t[o]}),n.push({s:e[t],r})},o=0;o<r;o++)i(o);return function(e){var i,a="".concat(t);for(o=0;o<r;o++)i=n[o],a=a.replace(i.s,i.r(e));return a}}}},ejs:function(){return!!window.EJS&&{compile:function(t){var e=new window.EJS({text:t});return function(t){return e.render(t)}}}},handlebars:function(){return window.Handlebars},hogan:function(){return!!window.Hogan&&{compile:function(t){var e=window.Hogan.compile(t);return function(t){return e.render(t)}}}},lodash:function(){return!!window._&&{compile:function(t){return function(e){return window._.template(t)(e)}}}},markup:function(){return!(!window.Mark||!window.Mark.up)&&{compile:function(t){return function(e){return window.Mark.up(t,e)}}}},mustache:function(){return!!window.Mustache&&{compile:function(t){return function(e){return window.Mustache.render(t,e)}}}},swig:function(){return window.swig},underscore:function(){return!!window._&&{compile:function(t){return function(e){return window._.template(t)(e)}}}}});function ni(t){return ni="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},ni(t)}function ii(t,e){(null==e||e>t.length)&&(e=t.length);for(var r=0,n=new Array(e);r<e;r++)n[r]=t[r];return n}function oi(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==ni(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==ni(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===ni(i)?i:String(i)),n)}var i}var ai={collapse:"",expand:"",delete:"",edit:"",add:"",cancel:"",save:"",moveup:"",movedown:""},si=function(){function t(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:ai;!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,t),this.mapping=r,this.icon_prefix=e}var e,r;return e=t,(r=[{key:"getIconClass",value:function(t){return this.mapping[t]?this.icon_prefix+this.mapping[t]:this.icon_prefix+t}},{key:"getIcon",value:function(t){var e,r=this.getIconClass(t);if(!r)return null;var n,i=document.createElement("i");return(e=i.classList).add.apply(e,function(t){if(Array.isArray(t))return ii(t)}(n=r.split(" "))||function(t){if("undefined"!=typeof Symbol&&null!=t[Symbol.iterator]||null!=t["@@iterator"])return Array.from(t)}(n)||function(t,e){if(t){if("string"==typeof t)return ii(t,e);var r=Object.prototype.toString.call(t).slice(8,-1);return"Object"===r&&t.constructor&&(r=t.constructor.name),"Map"===r||"Set"===r?Array.from(t):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?ii(t,e):void 0}}(n)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()),i}}])&&oi(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),t}();function li(t){return li="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},li(t)}function ci(t,e){return ci=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},ci(t,e)}function ui(t){return ui=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},ui(t)}var hi="glyphicon glyphicon-",pi={collapse:"chevron-down",expand:"chevron-right",delete:"trash",edit:"pencil",add:"plus",subtract:"minus",cancel:"floppy-remove",save:"floppy-saved",moveup:"arrow-up",moveright:"arrow-right",movedown:"arrow-down",moveleft:"arrow-left",copy:"copy",clear:"remove-circle",time:"time",calendar:"calendar",edit_properties:"list"},di=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&ci(t,e)}(o,t);var e,r,n,i=(r=o,n=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=ui(r);if(n){var i=ui(this).constructor;t=Reflect.construct(e,arguments,i)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===li(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function o(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,o),i.call(this,hi,pi)}return e=o,Object.defineProperty(e,"prototype",{writable:!1}),e}(si);function fi(t){return fi="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},fi(t)}function yi(t,e){return yi=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},yi(t,e)}function mi(t){return mi=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},mi(t)}var vi="icon-",bi={collapse:"chevron-down",expand:"chevron-right",delete:"trash",edit:"pencil",add:"plus",subtract:"minus",cancel:"ban-circle",save:"save",moveup:"arrow-up",moveright:"arrow-right",movedown:"arrow-down",moveleft:"arrow-left",copy:"copy",clear:"remove-circle",time:"time",calendar:"calendar",edit_properties:"list"},gi=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&yi(t,e)}(o,t);var e,r,n,i=(r=o,n=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=mi(r);if(n){var i=mi(this).constructor;t=Reflect.construct(e,arguments,i)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===fi(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function o(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,o),i.call(this,vi,bi)}return e=o,Object.defineProperty(e,"prototype",{writable:!1}),e}(si);function wi(t){return wi="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},wi(t)}function _i(t,e){return _i=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},_i(t,e)}function ki(t){return ki=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},ki(t)}var ji="fa fa-",Oi={collapse:"caret-square-o-down",expand:"caret-square-o-right",delete:"times",edit:"pencil",add:"plus",subtract:"minus",cancel:"ban",save:"save",moveup:"arrow-up",moveright:"arrow-right",movedown:"arrow-down",moveleft:"arrow-left",copy:"files-o",clear:"times-circle-o",time:"clock-o",calendar:"calendar",edit_properties:"list"},xi=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&_i(t,e)}(o,t);var e,r,n,i=(r=o,n=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=ki(r);if(n){var i=ki(this).constructor;t=Reflect.construct(e,arguments,i)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===wi(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function o(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,o),i.call(this,ji,Oi)}return e=o,Object.defineProperty(e,"prototype",{writable:!1}),e}(si);function Ci(t){return Ci="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},Ci(t)}function Ei(t,e){return Ei=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},Ei(t,e)}function Si(t){return Si=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},Si(t)}var Pi="fas fa-",Ti={collapse:"caret-down",expand:"caret-right",delete:"trash",edit:"pen",add:"plus",subtract:"minus",cancel:"ban",save:"save",moveup:"arrow-up",moveright:"arrow-right",movedown:"arrow-down",moveleft:"arrow-left",copy:"copy",clear:"times-circle",time:"clock",calendar:"calendar",edit_properties:"list"},Li=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&Ei(t,e)}(o,t);var e,r,n,i=(r=o,n=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=Si(r);if(n){var i=Si(this).constructor;t=Reflect.construct(e,arguments,i)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===Ci(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function o(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,o),i.call(this,Pi,Ti)}return e=o,Object.defineProperty(e,"prototype",{writable:!1}),e}(si);function Ri(t){return Ri="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},Ri(t)}function Ai(t,e){return Ai=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},Ai(t,e)}function Ii(t){return Ii=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},Ii(t)}var Bi="ui-icon ui-icon-",Ni={collapse:"triangle-1-s",expand:"triangle-1-e",delete:"trash",edit:"pencil",add:"plusthick",subtract:"minusthick",cancel:"closethick",save:"disk",moveup:"arrowthick-1-n",moveright:"arrowthick-1-e",movedown:"arrowthick-1-s",moveleft:"arrowthick-1-w",copy:"copy",clear:"circle-close",time:"time",calendar:"calendar",edit_properties:"note"},Di=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&Ai(t,e)}(o,t);var e,r,n,i=(r=o,n=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=Ii(r);if(n){var i=Ii(this).constructor;t=Reflect.construct(e,arguments,i)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===Ri(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function o(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,o),i.call(this,Bi,Ni)}return e=o,Object.defineProperty(e,"prototype",{writable:!1}),e}(si);function Fi(t){return Fi="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},Fi(t)}function Vi(t,e){return Vi=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},Vi(t,e)}function zi(t){return zi=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},zi(t)}var Hi="oi oi-",Mi={collapse:"collapse-down",expand:"expand-right",delete:"trash",edit:"pencil",add:"plus",subtract:"minus",cancel:"ban",save:"file",moveup:"arrow-thick-top",moveright:"arrow-thick-right",movedown:"arrow-thick-bottom",moveleft:"arrow-thick-left",copy:"clipboard",clear:"circle-x",time:"clock",calendar:"calendar",edit_properties:"list"},qi=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&Vi(t,e)}(o,t);var e,r,n,i=(r=o,n=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=zi(r);if(n){var i=zi(this).constructor;t=Reflect.construct(e,arguments,i)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===Fi(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function o(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,o),i.call(this,Hi,Mi)}return e=o,Object.defineProperty(e,"prototype",{writable:!1}),e}(si);function Gi(t){return Gi="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},Gi(t)}function Ui(t,e){return Ui=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},Ui(t,e)}function $i(t){return $i=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},$i(t)}var Ji="icon icon-",Wi={collapse:"arrow-down",expand:"arrow-right",delete:"delete",edit:"edit",add:"plus",subtract:"minus",cancel:"cross",save:"check",moveup:"upward",moveright:"forward",movedown:"downward",moveleft:"back",copy:"copy",clear:"close",time:"time",calendar:"bookmark",edit_properties:"menu"},Zi=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&Ui(t,e)}(o,t);var e,r,n,i=(r=o,n=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=$i(r);if(n){var i=$i(this).constructor;t=Reflect.construct(e,arguments,i)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===Gi(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function o(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,o),i.call(this,Ji,Wi)}return e=o,Object.defineProperty(e,"prototype",{writable:!1}),e}(si);function Yi(t){return Yi="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},Yi(t)}function Qi(t,e){return Qi=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},Qi(t,e)}function Ki(t){return Ki=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},Ki(t)}var Xi="bi bi-",to={collapse:"chevron-down",expand:"chevron-right",delete:"trash",edit:"pencil",add:"plus",subtract:"dash",cancel:"x-circle",save:"save",moveup:"arrow-up",moveright:"arrow-right",movedown:"arrow-down",moveleft:"arrow-left",copy:"clipboard",clear:"x-circle",time:"clock",calendar:"calendar",edit_properties:"list-ul"},eo={bootstrap:function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&Qi(t,e)}(o,t);var e,r,n,i=(r=o,n=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=Ki(r);if(n){var i=Ki(this).constructor;t=Reflect.construct(e,arguments,i)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===Yi(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function o(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,o),i.call(this,Xi,to)}return e=o,Object.defineProperty(e,"prototype",{writable:!1}),e}(si),bootstrap3:di,fontawesome3:gi,fontawesome4:xi,fontawesome5:Li,jqueryui:Di,openiconic:qi,spectre:Zi};function ro(t){return ro="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},ro(t)}function no(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==ro(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==ro(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===ro(i)?i:String(i)),n)}var i}var io=["matches","webkitMatchesSelector","mozMatchesSelector","msMatchesSelector","oMatchesSelector"].find((function(t){return t in document.documentElement})),oo=function(){function t(e){var r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{disable_theme_rules:!1};!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,t),this.jsoneditor=e,Object.keys(r).forEach((function(t){void 0!==e.options[t]&&(r[t]=e.options[t])})),this.options=r}var e,r;return e=t,r=[{key:"getContainer",value:function(){return document.createElement("div")}},{key:"getFloatRightLinkHolder",value:function(){var t=document.createElement("div");return t.classList.add("je-float-right-linkholder"),t}},{key:"getModal",value:function(){var t=document.createElement("div");return t.style.display="none",t.classList.add("je-modal"),t}},{key:"getGridContainer",value:function(){return document.createElement("div")}},{key:"getGridRow",value:function(){var t=document.createElement("div");return t.classList.add("row"),t}},{key:"getGridColumn",value:function(){return document.createElement("div")}},{key:"setGridColumnSize",value:function(t,e){}},{key:"getLink",value:function(t){var e=document.createElement("a");return e.setAttribute("href","#"),e.appendChild(document.createTextNode(t)),e}},{key:"disableHeader",value:function(t){t.style.color="#ccc"}},{key:"disableLabel",value:function(t){t.style.color="#ccc"}},{key:"enableHeader",value:function(t){t.style.color=""}},{key:"enableLabel",value:function(t){t.style.color=""}},{key:"getInfoButton",value:function(t){var e=document.createElement("span");e.innerText="ⓘ",e.classList.add("je-infobutton-icon");var r=document.createElement("span");return r.classList.add("je-infobutton-tooltip"),r.innerText=t,e.onmouseover=function(){r.style.visibility="visible"},e.onmouseleave=function(){r.style.visibility="hidden"},e.appendChild(r),e}},{key:"getFormInputLabel",value:function(t,e){var r=document.createElement("label");return r.appendChild(document.createTextNode(t)),e&&r.classList.add("required"),r}},{key:"getHeader",value:function(t,e){var r=document.createElement("h3");return"string"==typeof t?r.textContent=t:r.appendChild(t),r.classList.add("je-header"),r}},{key:"getCheckbox",value:function(){var t=this.getFormInputField("checkbox");return t.classList.add("je-checkbox"),t}},{key:"getCheckboxLabel",value:function(t,e){var r=document.createElement("label");return r.appendChild(document.createTextNode(" ".concat(t))),e&&r.classList.add("required"),r}},{key:"getMultiCheckboxHolder",value:function(t,e,r,n){var i=document.createElement("div");return i.classList.add("control-group"),e&&(e.style.display="block",i.appendChild(e),n&&e.appendChild(n)),Object.values(t).forEach((function(t){t.style.display="inline-block",t.style.marginRight="20px",i.appendChild(t)})),r&&i.appendChild(r),i}},{key:"getFormCheckboxControl",value:function(t,e,r){var n=document.createElement("div");return n.appendChild(t),e.style.width="auto",t.insertBefore(e,t.firstChild),r&&n.classList.add("je-checkbox-control--compact"),n}},{key:"getFormRadio",value:function(t){var e=this.getFormInputField("radio");return Object.keys(t).forEach((function(r){return e.setAttribute(r,t[r])})),e.classList.add("je-radio"),e}},{key:"getFormRadioLabel",value:function(t,e){var r=document.createElement("label");return r.appendChild(document.createTextNode(" ".concat(t))),e&&r.classList.add("required"),r}},{key:"getFormRadioControl",value:function(t,e,r){var n=document.createElement("div");return n.appendChild(t),e.style.width="auto",t.insertBefore(e,t.firstChild),r&&n.classList.add("je-radio-control--compact"),n}},{key:"getSelectInput",value:function(t,e){var r=document.createElement("select");return t&&this.setSelectOptions(r,t),r}},{key:"getSwitcher",value:function(t){var e=this.getSelectInput(t,!1);return e.classList.add("je-switcher"),e}},{key:"getSwitcherOptions",value:function(t){return t.getElementsByTagName("option")}},{key:"setSwitcherOptions",value:function(t,e,r){this.setSelectOptions(t,e,r)}},{key:"setSelectOptions",value:function(t,e){var r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:[];t.innerHTML="";for(var n=0;n<e.length;n++){var i=document.createElement("option");i.setAttribute("value",e[n]),i.textContent=r[n]||e[n],t.appendChild(i)}}},{key:"getTextareaInput",value:function(){var t=document.createElement("textarea");return t.classList.add("je-textarea"),t}},{key:"getRangeInput",value:function(t,e,r){var n=this.getFormInputField("range");return n.setAttribute("min",t),n.setAttribute("max",e),n.setAttribute("step",r),n}},{key:"getStepperButtons",value:function(t){var e=document.createElement("div"),r=document.createElement("button");r.setAttribute("type","button"),r.classList.add("stepper-down");var n=document.createElement("button");n.setAttribute("type","button"),n.classList.add("stepper-up"),t.getAttribute("readonly")&&(r.setAttribute("disabled",!0),n.setAttribute("disabled",!0)),r.textContent="-",n.textContent="+";var i=function(t,e){t.value=Number(e||t.value),t.setAttribute("initialized","1")},o=t.getAttribute("min"),a=t.getAttribute("max");return r.addEventListener("click",(function(){t.getAttribute("initialized")?o?Number(t.value)>Number(o)&&t.stepDown():t.stepDown():i(t,o),c(t,"change")})),n.addEventListener("click",(function(){t.getAttribute("initialized")?a?Number(t.value)<Number(a)&&t.stepUp():t.stepUp():i(t,o),c(t,"change")})),e.appendChild(r),e.appendChild(n),e}},{key:"getRangeOutput",value:function(t,e){var r=document.createElement("output"),n=function(t){r.value=t.currentTarget.value};return t.addEventListener("change",n,!1),t.addEventListener("input",n,!1),r}},{key:"getRangeControl",value:function(t,e){var r=document.createElement("div");return r.classList.add("je-range-control"),e&&r.appendChild(e),r.appendChild(t),r}},{key:"getFormInputField",value:function(t){var e=document.createElement("input");return e.setAttribute("type",t),e}},{key:"afterInputReady",value:function(t){}},{key:"getFormControl",value:function(t,e,r,n,i){var o=document.createElement("div");return o.classList.add("form-control"),t&&(o.appendChild(t),i&&t.setAttribute("for",i)),"checkbox"!==e.type&&"radio"!==e.type||!t?(n&&t&&t.appendChild(n),o.appendChild(e)):(e.style.width="auto",t.insertBefore(e,t.firstChild),n&&t.appendChild(n)),r&&o.appendChild(r),o}},{key:"getIndentedPanel",value:function(){var t=document.createElement("div");return t.classList.add("je-indented-panel"),t}},{key:"getTopIndentedPanel",value:function(){var t=document.createElement("div");return t.classList.add("je-indented-panel--top"),t}},{key:"getChildEditorHolder",value:function(){return document.createElement("div")}},{key:"getDescription",value:function(t){var e=document.createElement("p");return window.DOMPurify?e.innerHTML=window.DOMPurify.sanitize(t):e.textContent=this.cleanText(t),e}},{key:"getCheckboxDescription",value:function(t){return this.getDescription(t)}},{key:"getFormInputDescription",value:function(t){return this.getDescription(t)}},{key:"getButtonHolder",value:function(){return document.createElement("span")}},{key:"getHeaderButtonHolder",value:function(){return this.getButtonHolder()}},{key:"getFormButtonHolder",value:function(t){return this.getButtonHolder()}},{key:"getButton",value:function(t,e,r){var n=document.createElement("button");return n.type="button",this.setButtonText(n,t,e,r),n}},{key:"getFormButton",value:function(t,e,r){return this.getButton(t,e,r)}},{key:"setButtonText",value:function(t,e,r,n){for(;t.firstChild;)t.removeChild(t.firstChild);if(r&&(t.appendChild(r),e=" ".concat(e)),!this.jsoneditor.options.iconlib||!this.jsoneditor.options.remove_button_labels||!r){var i=document.createElement("span");i.appendChild(document.createTextNode(e)),t.appendChild(i)}n&&t.setAttribute("title",n)}},{key:"getTable",value:function(){return document.createElement("table")}},{key:"getTableRow",value:function(){return document.createElement("tr")}},{key:"getTableHead",value:function(){return document.createElement("thead")}},{key:"getTableBody",value:function(){return document.createElement("tbody")}},{key:"getTableHeaderCell",value:function(t){var e=document.createElement("th");return e.textContent=t,e}},{key:"getTableCell",value:function(){return document.createElement("td")}},{key:"getErrorMessage",value:function(t){var e=document.createElement("p");return e.style=e.style||{},e.style.color="red",e.appendChild(document.createTextNode(t)),e}},{key:"addInputError",value:function(t,e){}},{key:"removeInputError",value:function(t){}},{key:"addTableRowError",value:function(t){}},{key:"removeTableRowError",value:function(t){}},{key:"getTabHolder",value:function(t){var e=void 0===t?"":t,r=document.createElement("div");return r.innerHTML="<div class='je-tabholder tabs'></div><div class='content' id='".concat(e,"'></div><div class='je-tabholder--clear'></div>"),r}},{key:"getTopTabHolder",value:function(t){var e=void 0===t?"":t,r=document.createElement("div");return r.innerHTML="<div class='tabs je-tabholder--top'></div><div class='je-tabholder--clear'></div><div class='content' id='".concat(e,"'></div>"),r}},{key:"applyStyles",value:function(t,e){Object.keys(e).forEach((function(r){return t.style[r]=e[r]}))}},{key:"closest",value:function(t,e){for(;t&&t!==document;){if(!t[io])return!1;if(t[io](e))return t;t=t.parentNode}return!1}},{key:"insertBasicTopTab",value:function(t,e){e.firstChild.insertBefore(t,e.firstChild.firstChild)}},{key:"getTab",value:function(t,e){var r=document.createElement("div");return r.appendChild(t),r.id=e,r.classList.add("je-tab"),r}},{key:"getTopTab",value:function(t,e){var r=document.createElement("div");return r.appendChild(t),r.id=e,r.classList.add("je-tab--top"),r}},{key:"getTabContentHolder",value:function(t){return t.children[1]}},{key:"getTopTabContentHolder",value:function(t){return t.children[1]}},{key:"getTabContent",value:function(){return this.getIndentedPanel()}},{key:"getTopTabContent",value:function(){return this.getTopIndentedPanel()}},{key:"markTabActive",value:function(t){this.applyStyles(t.tab,{opacity:1,background:"white"}),void 0!==t.rowPane?t.rowPane.style.display="":t.container.style.display=""}},{key:"markTabInactive",value:function(t){this.applyStyles(t.tab,{opacity:.5,background:""}),void 0!==t.rowPane?t.rowPane.style.display="none":t.container.style.display="none"}},{key:"addTab",value:function(t,e){t.children[0].appendChild(e)}},{key:"addTopTab",value:function(t,e){t.children[0].appendChild(e)}},{key:"getBlockLink",value:function(){var t=document.createElement("a");return t.classList.add("je-block-link"),t}},{key:"getBlockLinkHolder",value:function(){return document.createElement("div")}},{key:"getLinksHolder",value:function(){return document.createElement("div")}},{key:"createMediaLink",value:function(t,e,r){t.appendChild(e),r.classList.add("je-media"),t.appendChild(r)}},{key:"createImageLink",value:function(t,e,r){t.appendChild(e),e.appendChild(r)}},{key:"getFirstTab",value:function(t){return t.firstChild.firstChild}},{key:"getInputGroup",value:function(t,e){}},{key:"cleanText",value:function(t){var e=document.createElement("div");return e.innerHTML=t,e.textContent||e.innerText}},{key:"getDropZone",value:function(t){var e=document.createElement("div");return e.setAttribute("data-text",t),e.classList.add("je-dropzone"),e}},{key:"getUploadPreview",value:function(t,e,r){var n=document.createElement("div");if(n.classList.add("je-upload-preview"),"image"===t.mimeType.substr(0,5)){var i=document.createElement("img");i.src=r,n.appendChild(i)}var o=document.createElement("div");o.innerHTML+="<strong>Name:</strong> ".concat(t.name,"<br><strong>Type:</strong> ").concat(t.type,"<br><strong>Size:</strong> ").concat(t.formattedSize),n.appendChild(o),n.appendChild(e);var a=document.createElement("div");return a.style.clear="left",n.appendChild(a),n}},{key:"getProgressBar",value:function(){var t=document.createElement("progress");return t.setAttribute("max",100),t.setAttribute("value",0),t}},{key:"updateProgressBar",value:function(t,e){t&&t.setAttribute("value",e)}},{key:"updateProgressBarUnknown",value:function(t){t&&t.removeAttribute("value")}}],r&&no(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),t}();function ao(t){return ao="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},ao(t)}function so(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==ao(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==ao(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===ao(i)?i:String(i)),n)}var i}function lo(){return lo="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=uo(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},lo.apply(this,arguments)}function co(t,e){return co=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},co(t,e)}function uo(t){return uo=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},uo(t)}var ho=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&co(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=uo(n);if(i){var r=uo(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===ao(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,(r=[{key:"getFormInputLabel",value:function(t,e){var r=lo(uo(a.prototype),"getFormInputLabel",this).call(this,t,e);return r.classList.add("je-form-input-label"),r}},{key:"getFormInputDescription",value:function(t){var e=lo(uo(a.prototype),"getFormInputDescription",this).call(this,t);return e.classList.add("je-form-input-label"),e}},{key:"getIndentedPanel",value:function(){var t=lo(uo(a.prototype),"getIndentedPanel",this).call(this);return t.classList.add("je-indented-panel"),t}},{key:"getTopIndentedPanel",value:function(){return this.getIndentedPanel()}},{key:"getChildEditorHolder",value:function(){var t=lo(uo(a.prototype),"getChildEditorHolder",this).call(this);return t.classList.add("je-child-editor-holder"),t}},{key:"getHeaderButtonHolder",value:function(){var t=this.getButtonHolder();return t.classList.add("je-header-button-holder"),t}},{key:"getTable",value:function(){var t=lo(uo(a.prototype),"getTable",this).call(this);return t.classList.add("je-table"),t}},{key:"addInputError",value:function(t,e){var r=this.closest(t,".form-control")||t.controlgroup;t.errmsg?t.errmsg.style.display="block":(t.errmsg=document.createElement("div"),t.errmsg.setAttribute("class","errmsg"),t.errmsg.style=t.errmsg.style||{},t.errmsg.style.color="red",r.appendChild(t.errmsg)),t.errmsg.innerHTML="",t.errmsg.appendChild(document.createTextNode(e))}},{key:"removeInputError",value:function(t){t.style&&(t.style.borderColor=""),t.errmsg&&(t.errmsg.style.display="none")}}])&&so(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(oo);function po(t){return po="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},po(t)}function fo(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==po(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==po(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===po(i)?i:String(i)),n)}var i}function yo(){return yo="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=vo(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},yo.apply(this,arguments)}function mo(t,e){return mo=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},mo(t,e)}function vo(t){return vo=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},vo(t)}ho.rules={".je-form-input-label":"display:block;margin-bottom:3px;font-weight:bold",".je-form-input-description":"display:inline-block;margin:0;font-size:0.8em;font-style:italic",".je-indented-panel":"padding:5px;margin:10px;border-radius:3px;border:1px%20solid%20%23ddd",".je-child-editor-holder":"margin-bottom:8px",".je-header-button-holder":"display:inline-block;margin-left:10px;font-size:0.8em;vertical-align:middle",".je-table":"margin-bottom:5px;border-bottom:1px%20solid%20%23ccc",".je-upload-preview img":"float:left;margin:0%200.5rem%200.5rem%200;max-width:100%25;max-height:5rem",".je-dropzone":"position:relative;margin:0.5rem%200;border:2px%20dashed%20black;width:100%25;height:60px;background:teal;transition:all%200.5s",".je-dropzone:before":"position:absolute;content:attr(data-text);color:rgba(0%2C%200%2C%200%2C%200.6);left:50%25;top:50%25;transform:translate(-50%25%2C%20-50%25)",".je-dropzone.valid-dropzone":"background:green",".je-dropzone.invalid-dropzone":"background:red"};var bo=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&mo(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=vo(n);if(i){var r=vo(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===po(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,(r=[{key:"getSelectInput",value:function(t,e){var r=yo(vo(a.prototype),"getSelectInput",this).call(this,t);return r.classList.add("form-control"),r}},{key:"setGridColumnSize",value:function(t,e,r){t.classList.add("col-md-".concat(e)),r&&t.classList.add("col-md-offset-".concat(r))}},{key:"afterInputReady",value:function(t){if(!t.controlgroup&&(t.controlgroup=this.closest(t,".form-group"),this.closest(t,".compact")&&(t.controlgroup.style.marginBottom=0),this.queuedInputErrorText)){var e=this.queuedInputErrorText;delete this.queuedInputErrorText,this.addInputError(t,e)}}},{key:"getTextareaInput",value:function(){var t=document.createElement("textarea");return t.classList.add("form-control"),t}},{key:"getRangeInput",value:function(t,e,r){return yo(vo(a.prototype),"getRangeInput",this).call(this,t,e,r)}},{key:"getFormInputField",value:function(t){var e=yo(vo(a.prototype),"getFormInputField",this).call(this,t);return"checkbox"!==t&&"radio"!==t&&e.classList.add("form-control"),e}},{key:"getFormControl",value:function(t,e,r,n){var i=document.createElement("div");return!t||"checkbox"!==e.type&&"radio"!==e.type?(i.classList.add("form-group"),t&&(t.classList.add("control-label"),i.appendChild(t),n&&t.appendChild(n)),i.appendChild(e)):(i.classList.add(e.type),n&&t.appendChild(n),t.insertBefore(e,t.firstChild),i.appendChild(t)),r&&i.appendChild(r),i}},{key:"getIndentedPanel",value:function(){var t=document.createElement("div");return t.classList.add("well","well-sm"),t.style.paddingBottom=0,t}},{key:"getInfoButton",value:function(t){var e=document.createElement("span");e.classList.add("glyphicon","glyphicon-info-sign","pull-right"),e.style.padding=".25rem",e.style.position="relative",e.style.display="inline-block";var r=document.createElement("span");return r.style["font-family"]="sans-serif",r.style.visibility="hidden",r.style["background-color"]="rgba(50, 50, 50, .75)",r.style.margin="0 .25rem",r.style.color="#FAFAFA",r.style.padding=".5rem 1rem",r.style["border-radius"]=".25rem",r.style.width="25rem",r.style.position="absolute",r.innerText=t,e.onmouseover=function(){r.style.visibility="visible"},e.onmouseleave=function(){r.style.visibility="hidden"},e.appendChild(r),e}},{key:"getFormInputDescription",value:function(t){var e=document.createElement("p");return e.classList.add("help-block"),window.DOMPurify?e.innerHTML=window.DOMPurify.sanitize(t):e.textContent=this.cleanText(t),e}},{key:"getHeaderButtonHolder",value:function(){var t=this.getButtonHolder();return t.style.marginLeft="10px",t}},{key:"getButtonHolder",value:function(){var t=document.createElement("span");return t.classList.add("btn-group"),t}},{key:"getButton",value:function(t,e,r){var n=yo(vo(a.prototype),"getButton",this).call(this,t,e,r);return n.classList.add("btn","btn-default"),n}},{key:"getTable",value:function(){var t=document.createElement("table");return t.classList.add("table","table-bordered"),t.style.width="auto",t.style.maxWidth="none",t}},{key:"addInputError",value:function(t,e){t.controlgroup?(t.controlgroup.classList.add("has-error"),t.errmsg?t.errmsg.style.display="":(t.errmsg=document.createElement("p"),t.errmsg.classList.add("help-block","errormsg"),t.controlgroup.appendChild(t.errmsg)),t.errmsg.textContent=e):this.queuedInputErrorText=e}},{key:"removeInputError",value:function(t){t.controlgroup||delete this.queuedInputErrorText,t.errmsg&&(t.errmsg.style.display="none",t.controlgroup.classList.remove("has-error"))}},{key:"getTabHolder",value:function(t){var e=void 0===t?"":t,r=document.createElement("div");return r.innerHTML="<ul class='col-md-2 nav nav-pills nav-stacked' id='".concat(e,"' role='tablist'></ul><div class='col-md-10 tab-content active well well-small'  id='").concat(e,"'></div>"),r}},{key:"getTopTabHolder",value:function(t){var e=void 0===t?"":t,r=document.createElement("div");return r.innerHTML="<ul class='nav nav-tabs' id='".concat(e,"' role='tablist'></ul><div class='tab-content active well well-small'  id='").concat(e,"'></div>"),r}},{key:"getTab",value:function(t,e){var r=document.createElement("li");r.setAttribute("role","presentation");var n=document.createElement("a");return n.setAttribute("href","#".concat(e)),n.appendChild(t),n.setAttribute("aria-controls",e),n.setAttribute("role","tab"),n.setAttribute("data-toggle","tab"),r.appendChild(n),r}},{key:"getTopTab",value:function(t,e){var r=document.createElement("li");r.setAttribute("role","presentation");var n=document.createElement("a");return n.setAttribute("href","#".concat(e)),n.appendChild(t),n.setAttribute("aria-controls",e),n.setAttribute("role","tab"),n.setAttribute("data-toggle","tab"),r.appendChild(n),r}},{key:"getTabContent",value:function(){var t=document.createElement("div");return t.classList.add("tab-pane"),t.setAttribute("role","tabpanel"),t}},{key:"getTopTabContent",value:function(){var t=document.createElement("div");return t.classList.add("tab-pane"),t.setAttribute("role","tabpanel"),t}},{key:"markTabActive",value:function(t){t.tab.classList.add("active"),void 0!==t.rowPane?t.rowPane.classList.add("active"):t.container.classList.add("active")}},{key:"markTabInactive",value:function(t){t.tab.classList.remove("active"),void 0!==t.rowPane?t.rowPane.classList.remove("active"):t.container.classList.remove("active")}},{key:"getProgressBar",value:function(){var t=document.createElement("div");t.classList.add("progress");var e=document.createElement("div");return e.classList.add("progress-bar"),e.setAttribute("role","progressbar"),e.setAttribute("aria-valuenow",0),e.setAttribute("aria-valuemin",0),e.setAttribute("aria-valuenax",100),e.innerHTML="".concat(0,"%"),t.appendChild(e),t}},{key:"updateProgressBar",value:function(t,e){if(t){var r=t.firstChild,n="".concat(e,"%");r.setAttribute("aria-valuenow",e),r.style.width=n,r.innerHTML=n}}},{key:"updateProgressBarUnknown",value:function(t){if(t){var e=t.firstChild;t.classList.add("progress","progress-striped","active"),e.removeAttribute("aria-valuenow"),e.style.width="100%",e.innerHTML=""}}},{key:"getInputGroup",value:function(t,e){if(t){var r=document.createElement("div");r.classList.add("input-group"),r.appendChild(t);var n=document.createElement("div");n.classList.add("input-group-btn"),r.appendChild(n);for(var i=0;i<e.length;i++)n.appendChild(e[i]);return r}}}])&&fo(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(oo);function go(t){return go="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},go(t)}function wo(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==go(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==go(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===go(i)?i:String(i)),n)}var i}function _o(){return _o="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=jo(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},_o.apply(this,arguments)}function ko(t,e){return ko=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},ko(t,e)}function jo(t){return jo=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},jo(t)}bo.rules={},r(3843);var Oo={disable_theme_rules:!1,input_size:"normal",custom_forms:!1,object_indent:!0,object_background:"bg-light",object_text:"",table_border:!1,table_zebrastyle:!1,tooltip:"bootstrap"},xo=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&ko(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=jo(n);if(i){var r=jo(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===go(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(t){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.call(this,t,Oo)}return e=a,(r=[{key:"getSelectInput",value:function(t,e){var r=_o(jo(a.prototype),"getSelectInput",this).call(this,t);return r.classList.add("form-control"),!1===this.options.custom_forms?("small"===this.options.input_size&&r.classList.add("form-control-sm"),"large"===this.options.input_size&&r.classList.add("form-control-lg")):(r.classList.remove("form-control"),r.classList.add("custom-select"),"small"===this.options.input_size&&r.classList.add("custom-select-sm"),"large"===this.options.input_size&&r.classList.add("custom-select-lg")),r}},{key:"getContainer",value:function(){var t=document.createElement("div");return this.options.object_indent||t.classList.add("je-noindent"),t}},{key:"setGridColumnSize",value:function(t,e,r){t.classList.add("col-md-".concat(e)),r&&t.classList.add("offset-md-".concat(r))}},{key:"afterInputReady",value:function(t){if(!t.controlgroup){var e=t.name;t.id=e;var r=t.parentNode.parentNode.getElementsByTagName("label")[0];r&&(r.htmlFor=e),t.controlgroup=this.closest(t,".form-group")}}},{key:"getTextareaInput",value:function(){var t=document.createElement("textarea");return t.classList.add("form-control"),"small"===this.options.input_size&&t.classList.add("form-control-sm"),"large"===this.options.input_size&&t.classList.add("form-control-lg"),t}},{key:"getRangeInput",value:function(t,e,r){var n=_o(jo(a.prototype),"getRangeInput",this).call(this,t,e,r);return!0===this.options.custom_forms&&(n.classList.remove("form-control"),n.classList.add("custom-range")),n}},{key:"getStepperButtons",value:function(t){var e=document.createElement("div"),r=document.createElement("div"),n=document.createElement("div"),i=document.createElement("button");i.setAttribute("type","button");var o=document.createElement("button");o.setAttribute("type","button"),e.appendChild(r),e.appendChild(t),e.appendChild(n),r.appendChild(i),n.appendChild(o),e.classList.add("input-group"),r.classList.add("input-group-prepend"),n.classList.add("input-group-append"),i.classList.add("btn"),i.classList.add("btn-secondary"),i.classList.add("stepper-down"),o.classList.add("btn"),o.classList.add("btn-secondary"),o.classList.add("stepper-up"),t.getAttribute("readonly")&&(i.setAttribute("disabled",!0),o.setAttribute("disabled",!0)),i.textContent="-",o.textContent="+";var a=function(t,e){t.value=Number(e||t.value),t.setAttribute("initialized","1")},s=t.getAttribute("min"),l=t.getAttribute("max");return t.addEventListener("change",(function(){t.getAttribute("initialized")||t.setAttribute("initialized","1")})),i.addEventListener("click",(function(){t.getAttribute("initialized")?s?Number(t.value)>Number(s)&&t.stepDown():t.stepDown():a(t,s),c(t,"change")})),o.addEventListener("click",(function(){t.getAttribute("initialized")?l?Number(t.value)<Number(l)&&t.stepUp():t.stepUp():a(t,s),c(t,"change")})),e}},{key:"getFormInputField",value:function(t){var e=_o(jo(a.prototype),"getFormInputField",this).call(this,t);return"checkbox"!==t&&"radio"!==t&&"file"!==t&&(e.classList.add("form-control"),"small"===this.options.input_size&&e.classList.add("form-control-sm"),"large"===this.options.input_size&&e.classList.add("form-control-lg")),"file"===t&&e.classList.add("form-control-file"),e}},{key:"getFormControl",value:function(t,e,r,n){var i=document.createElement("div");if(i.classList.add("form-group"),!t||"checkbox"!==e.type&&"radio"!==e.type)t&&(i.appendChild(t),n&&i.appendChild(n)),i.appendChild(e);else{var o=document.createElement("div");!1===this.options.custom_forms?(o.classList.add("form-check"),e.classList.add("form-check-input"),t.classList.add("form-check-label")):(o.classList.add("custom-control"),e.classList.add("custom-control-input"),t.classList.add("custom-control-label"),"checkbox"===e.type?o.classList.add("custom-checkbox"):o.classList.add("custom-radio"));var a=(Date.now()*Math.random()).toFixed(0);e.setAttribute("id",a),t.setAttribute("for",a),o.appendChild(e),o.appendChild(t),n&&o.appendChild(n),i.appendChild(o)}return r&&i.appendChild(r),i}},{key:"getInfoButton",value:function(t){var e=document.createElement("button");e.type="button",e.classList.add("ml-3","jsoneditor-twbs4-text-button"),e.setAttribute("data-toggle","tooltip"),e.setAttribute("data-placement","auto"),e.title=t;var r=document.createTextNode("ⓘ");return e.appendChild(r),"bootstrap"===this.options.tooltip?window.jQuery&&window.jQuery().tooltip?window.jQuery(e).tooltip():console.warn("Could not find popper jQuery plugin of Bootstrap."):"css"===this.options.tooltip&&e.classList.add("je-tooltip"),e}},{key:"getCheckbox",value:function(){return this.getFormInputField("checkbox")}},{key:"getMultiCheckboxHolder",value:function(t,e,r,n){var i=document.createElement("div");i.classList.add("form-group"),e&&(i.appendChild(e),n&&e.appendChild(n));var o=document.createElement("div");return Object.values(t).forEach((function(t){var e=t.firstChild;o.appendChild(e)})),i.appendChild(o),r&&i.appendChild(r),i}},{key:"getFormRadio",value:function(t){var e=this.getFormInputField("radio");for(var r in t)e.setAttribute(r,t[r]);return!1===this.options.custom_forms?e.classList.add("form-check-input"):e.classList.add("custom-control-input"),e}},{key:"getFormRadioLabel",value:function(t,e){var r=document.createElement("label");return!1===this.options.custom_forms?r.classList.add("form-check-label"):r.classList.add("custom-control-label"),r.appendChild(document.createTextNode(t)),r}},{key:"getFormRadioControl",value:function(t,e,r){var n=document.createElement("div");return!1===this.options.custom_forms?n.classList.add("form-check"):n.classList.add("custom-control","custom-radio"),n.appendChild(e),n.appendChild(t),r&&(!1===this.options.custom_forms?n.classList.add("form-check-inline"):n.classList.add("custom-control-inline")),n}},{key:"getIndentedPanel",value:function(){var t=document.createElement("div");return t.classList.add("card","card-body","mb-3"),this.options.object_background&&t.classList.add(this.options.object_background),this.options.object_text&&t.classList.add(this.options.object_text),t}},{key:"getFormInputDescription",value:function(t){var e=document.createElement("small");return e.classList.add("form-text"),window.DOMPurify?e.innerHTML=window.DOMPurify.sanitize(t):e.textContent=this.cleanText(t),e}},{key:"getHeader",value:function(t,e){var r=document.createElement("h3");return r.classList.add("card-title"),r.classList.add("level-"+e),"string"==typeof t?r.textContent=t:r.appendChild(t),r.style.display="inline-block",r}},{key:"getHeaderButtonHolder",value:function(){return this.getButtonHolder()}},{key:"getButtonHolder",value:function(){var t=document.createElement("span");return t.classList.add("btn-group"),t}},{key:"getFormButtonHolder",value:function(t){var e=this.getButtonHolder();return e.classList.add("d-block"),"center"===t?e.classList.add("text-center"):"right"===t&&e.classList.add("text-right"),e}},{key:"getButton",value:function(t,e,r){var n=_o(jo(a.prototype),"getButton",this).call(this,t,e,r);return n.classList.add("btn","btn-secondary","btn-sm"),n}},{key:"getTable",value:function(){var t=document.createElement("table");return t.classList.add("table","table-sm"),this.options.table_border&&t.classList.add("table-bordered"),this.options.table_zebrastyle&&t.classList.add("table-striped"),t}},{key:"getErrorMessage",value:function(t){var e=document.createElement("div");return e.classList.add("alert","alert-danger"),e.setAttribute("role","alert"),e.appendChild(document.createTextNode(t)),e}},{key:"addInputError",value:function(t,e){t.controlgroup&&(t.controlgroup.classList.add("is-invalid"),t.errmsg||(t.errmsg=document.createElement("p"),t.errmsg.classList.add("invalid-feedback"),t.controlgroup.appendChild(t.errmsg),t.errmsg.style.display="block"),t.errmsg.style.display="block",t.errmsg.textContent=e)}},{key:"removeInputError",value:function(t){t.errmsg&&(t.errmsg.style.display="none",t.controlgroup.classList.remove("is-invalid"))}},{key:"getTabHolder",value:function(t){var e=document.createElement("div"),r=void 0===t?"":t;return e.innerHTML="<div class='col-md-2' id='".concat(r,"'><ul class='nav flex-column nav-pills'></ul></div><div class='col-md-10'><div class='tab-content' id='").concat(r,"'></div></div>"),e.classList.add("row"),e}},{key:"addTab",value:function(t,e){t.children[0].children[0].appendChild(e)}},{key:"getTabContentHolder",value:function(t){return t.children[1].children[0]}},{key:"getTopTabHolder",value:function(t){var e=void 0===t?"":t,r=document.createElement("div");return r.classList.add("card"),r.innerHTML="<div class='card-header'><ul class='nav nav-tabs card-header-tabs' id='".concat(e,"'></ul></div><div class='card-body'><div class='tab-content' id='").concat(e,"'></div></div>"),r}},{key:"getTab",value:function(t,e){var r=document.createElement("li");r.classList.add("nav-item");var n=document.createElement("a");return n.classList.add("nav-link"),n.setAttribute("href","#".concat(e)),n.setAttribute("data-toggle","tab"),n.appendChild(t),r.appendChild(n),r}},{key:"getTopTab",value:function(t,e){var r=document.createElement("li");r.classList.add("nav-item");var n=document.createElement("a");return n.classList.add("nav-link"),n.setAttribute("href","#".concat(e)),n.setAttribute("data-toggle","tab"),n.appendChild(t),r.appendChild(n),r}},{key:"getTabContent",value:function(){var t=document.createElement("div");return t.classList.add("tab-pane"),t.setAttribute("role","tabpanel"),t}},{key:"getTopTabContent",value:function(){var t=document.createElement("div");return t.classList.add("tab-pane"),t.setAttribute("role","tabpanel"),t}},{key:"markTabActive",value:function(t){t.tab.firstChild.classList.add("active"),void 0!==t.rowPane?t.rowPane.classList.add("active"):t.container.classList.add("active")}},{key:"markTabInactive",value:function(t){t.tab.firstChild.classList.remove("active"),void 0!==t.rowPane?t.rowPane.classList.remove("active"):t.container.classList.remove("active")}},{key:"insertBasicTopTab",value:function(t,e){e.children[0].children[0].insertBefore(t,e.children[0].children[0].firstChild)}},{key:"addTopTab",value:function(t,e){t.children[0].children[0].appendChild(e)}},{key:"getTopTabContentHolder",value:function(t){return t.children[1].children[0]}},{key:"getFirstTab",value:function(t){return t.firstChild.firstChild.firstChild}},{key:"getProgressBar",value:function(){var t=document.createElement("div");t.classList.add("progress");var e=document.createElement("div");return e.classList.add("progress-bar"),e.setAttribute("role","progressbar"),e.setAttribute("aria-valuenow",0),e.setAttribute("aria-valuemin",0),e.setAttribute("aria-valuenax",100),e.innerHTML="".concat(0,"%"),t.appendChild(e),t}},{key:"updateProgressBar",value:function(t,e){if(t){var r=t.firstChild,n="".concat(e,"%");r.setAttribute("aria-valuenow",e),r.style.width=n,r.innerHTML=n}}},{key:"updateProgressBarUnknown",value:function(t){if(t){var e=t.firstChild;t.classList.add("progress","progress-striped","active"),e.removeAttribute("aria-valuenow"),e.style.width="100%",e.innerHTML=""}}},{key:"getBlockLink",value:function(){var t=document.createElement("a");return t.classList.add("mb-3","d-inline-block"),t}},{key:"getLinksHolder",value:function(){return document.createElement("div")}},{key:"getInputGroup",value:function(t,e){if(t){var r=document.createElement("div");r.classList.add("input-group"),r.appendChild(t);var n=document.createElement("div");n.classList.add("input-group-append"),r.appendChild(n);for(var i=0;i<e.length;i++)e[i].classList.remove("mr-2","btn-secondary"),e[i].classList.add("btn-outline-secondary"),n.appendChild(e[i]);return r}}}])&&wo(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(oo);function Co(t){return Co="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},Co(t)}function Eo(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==Co(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==Co(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===Co(i)?i:String(i)),n)}var i}function So(){return So="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=To(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},So.apply(this,arguments)}function Po(t,e){return Po=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},Po(t,e)}function To(t){return To=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},To(t)}xo.rules={".jsoneditor-twbs4-text-button":"background:none;padding:0;border:0;color:currentColor","td > .form-group":"margin-bottom:0",".json-editor-btn-upload":"margin-top:1rem",".je-noindent .card":"padding:0;border:0",".je-tooltip:hover::before":"display:block;position:absolute;font-size:0.8em;color:%23fff;border-radius:0.2em;content:attr(title);background-color:%23000;margin-top:-2.5em;padding:0.3em",".je-tooltip:hover::after":"display:block;position:absolute;font-size:0.8em;color:%23fff",".select2-container--default .select2-selection--single":"height:calc(1.5em%20%2B%200.75rem%20%2B%202px)",".select2-container--default   .select2-selection--single   .select2-selection__arrow":"height:calc(1.5em%20%2B%200.75rem%20%2B%202px)",".select2-container--default   .select2-selection--single   .select2-selection__rendered":"line-height:calc(1.5em%20%2B%200.75rem%20%2B%202px)",".selectize-control.form-control":"padding:0",".selectize-dropdown.form-control":"padding:0;height:auto",".je-upload-preview img":"float:left;margin:0%200.5rem%200.5rem%200;max-width:100%25;max-height:5rem",".je-dropzone":"position:relative;margin:0.5rem%200;border:2px%20dashed%20black;width:100%25;height:60px;background:teal;transition:all%200.5s",".je-dropzone:before":"position:absolute;content:attr(data-text);color:rgba(0%2C%200%2C%200%2C%200.6);left:50%25;top:50%25;transform:translate(-50%25%2C%20-50%25)",".je-dropzone.valid-dropzone":"background:green",".je-dropzone.invalid-dropzone":"background:red"};var Lo={disable_theme_rules:!1,input_size:"normal",object_indent:!0,object_background:"bg-light",object_text:"",table_border:!1,table_zebrastyle:!1,tooltip:"bootstrap"},Ro=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&Po(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=To(n);if(i){var r=To(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===Co(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(t){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.call(this,t,Lo)}return e=a,(r=[{key:"getSelectInput",value:function(t,e){var r=So(To(a.prototype),"getSelectInput",this).call(this,t);return r.classList.add("form-control"),r.classList.add("form-select"),"small"===this.options.input_size&&r.classList.add("form-control-sm"),"large"===this.options.input_size&&r.classList.add("form-control-lg"),r}},{key:"getContainer",value:function(){var t=document.createElement("div");return this.options.object_indent||t.classList.add("je-noindent"),t}},{key:"setGridColumnSize",value:function(t,e,r){t.classList.add("col-md-".concat(e)),r&&t.classList.add("offset-md-".concat(r))}},{key:"afterInputReady",value:function(t){if(!t.controlgroup){var e=t.name;t.id=e;var r=t.parentNode.parentNode.getElementsByTagName("label")[0];r&&(r.classList.add("form-label"),r.htmlFor=e),t.controlgroup=this.closest(t,".form-group")}}},{key:"getTextareaInput",value:function(){var t=document.createElement("textarea");return t.classList.add("form-control"),"small"===this.options.input_size&&t.classList.add("form-control-sm"),"large"===this.options.input_size&&t.classList.add("form-control-lg"),t}},{key:"getRangeInput",value:function(t,e,r){var n=So(To(a.prototype),"getRangeInput",this).call(this,t,e,r);return n.classList.remove("form-control"),n.classList.add("form-range"),n}},{key:"getStepperButtons",value:function(t){var e=document.createElement("div"),r=document.createElement("button");r.setAttribute("type","button");var n=document.createElement("button");n.setAttribute("type","button"),e.appendChild(r),e.appendChild(t),e.appendChild(n),e.classList.add("input-group"),r.classList.add("btn"),r.classList.add("btn-secondary"),r.classList.add("stepper-down"),n.classList.add("btn"),n.classList.add("btn-secondary"),n.classList.add("stepper-up"),t.getAttribute("readonly")&&(r.setAttribute("disabled",!0),n.setAttribute("disabled",!0)),r.textContent="-",n.textContent="+";var i=function(t,e){t.value=Number(e||t.value),t.setAttribute("initialized","1")},o=t.getAttribute("min"),a=t.getAttribute("max");return t.addEventListener("change",(function(){t.getAttribute("initialized")||t.setAttribute("initialized","1")})),r.addEventListener("click",(function(){t.getAttribute("initialized")?o?Number(t.value)>Number(o)&&t.stepDown():t.stepDown():i(t,o),c(t,"change")})),n.addEventListener("click",(function(){t.getAttribute("initialized")?a?Number(t.value)<Number(a)&&t.stepUp():t.stepUp():i(t,o),c(t,"change")})),e}},{key:"getFormInputField",value:function(t){var e=So(To(a.prototype),"getFormInputField",this).call(this,t);return"checkbox"!==t&&"radio"!==t&&(e.classList.add("form-control"),"small"===this.options.input_size&&e.classList.add("form-control-sm"),"large"===this.options.input_size&&e.classList.add("form-control-lg")),e}},{key:"getFormControl",value:function(t,e,r,n){var i=document.createElement("div");if(i.classList.add("form-group"),!t||"checkbox"!==e.type&&"radio"!==e.type)t&&(t.classList.add("form-label"),i.appendChild(t),n&&i.appendChild(n)),i.appendChild(e);else{var o=document.createElement("div");o.classList.add("form-check"),e.classList.add("form-check-input"),t.classList.add("form-check-label");var a=(Date.now()*Math.random()).toFixed(0);e.setAttribute("id",a),t.setAttribute("for",a),o.appendChild(e),o.appendChild(t),n&&o.appendChild(n),i.appendChild(o)}return r&&i.appendChild(r),i}},{key:"getInfoButton",value:function(t){var e=document.createElement("button");e.type="button",e.classList.add("ms-3","jsoneditor-twbs5-text-button"),e.setAttribute("data-toggle","tooltip"),e.setAttribute("data-placement","auto"),e.title=t;var r=document.createTextNode("ⓘ");return e.appendChild(r),"bootstrap"===this.options.tooltip?window.jQuery&&window.jQuery().tooltip?window.jQuery(e).tooltip():console.warn("Could not find popper jQuery plugin of Bootstrap."):"css"===this.options.tooltip&&e.classList.add("je-tooltip"),e}},{key:"getCheckbox",value:function(){return this.getFormInputField("checkbox")}},{key:"getMultiCheckboxHolder",value:function(t,e,r,n){var i=document.createElement("div");i.classList.add("form-group"),e&&(i.appendChild(e),n&&e.appendChild(n));var o=document.createElement("div");return Object.values(t).forEach((function(t){var e=t.firstChild;o.appendChild(e)})),i.appendChild(o),r&&i.appendChild(r),i}},{key:"getFormRadio",value:function(t){var e=this.getFormInputField("radio");for(var r in t)e.setAttribute(r,t[r]);return e.classList.add("form-check-input"),e}},{key:"getFormRadioLabel",value:function(t,e){var r=document.createElement("label");return r.classList.add("form-check-label"),r.appendChild(document.createTextNode(t)),r}},{key:"getFormRadioControl",value:function(t,e,r){var n=document.createElement("div");return n.classList.add("form-check"),n.appendChild(e),n.appendChild(t),r&&n.classList.add("form-check-inline"),n}},{key:"getIndentedPanel",value:function(){var t=document.createElement("div");return t.classList.add("card","card-body","my-3"),this.options.object_background&&t.classList.add(this.options.object_background),this.options.object_text&&t.classList.add(this.options.object_text),t}},{key:"getFormInputDescription",value:function(t){var e=document.createElement("small");return e.classList.add("form-text"),e.classList.add("d-block"),window.DOMPurify?e.innerHTML=window.DOMPurify.sanitize(t):e.textContent=this.cleanText(t),e}},{key:"getHeader",value:function(t,e){var r=document.createElement("h3");return r.classList.add("card-title"),r.classList.add("level-"+e),"string"==typeof t?r.textContent=t:r.appendChild(t),r.style.display="inline-block",r}},{key:"getHeaderButtonHolder",value:function(){return this.getButtonHolder()}},{key:"getButtonHolder",value:function(){var t=document.createElement("span");return t.classList.add("btn-group"),t}},{key:"getFormButtonHolder",value:function(t){var e=this.getButtonHolder();return e.classList.add("d-block"),"center"===t?e.classList.add("text-center"):"right"===t&&e.classList.add("text-end"),e}},{key:"getButton",value:function(t,e,r){var n=So(To(a.prototype),"getButton",this).call(this,t,e,r);return n.classList.add("btn","btn-secondary","btn-sm"),n}},{key:"getTable",value:function(){var t=document.createElement("table");return t.classList.add("table","table-sm"),this.options.table_border&&t.classList.add("table-bordered"),this.options.table_zebrastyle&&t.classList.add("table-striped"),t}},{key:"getErrorMessage",value:function(t){var e=document.createElement("div");return e.classList.add("alert","alert-danger"),e.setAttribute("role","alert"),e.appendChild(document.createTextNode(t)),e}},{key:"addInputError",value:function(t,e){t.controlgroup&&(t.controlgroup.classList.add("is-invalid"),t.errmsg||(t.errmsg=document.createElement("p"),t.errmsg.classList.add("invalid-feedback"),t.controlgroup.appendChild(t.errmsg),t.errmsg.style.display="block"),t.errmsg.style.display="block",t.errmsg.textContent=e)}},{key:"removeInputError",value:function(t){t.errmsg&&(t.errmsg.style.display="none",t.controlgroup.classList.remove("is-invalid"))}},{key:"getTabHolder",value:function(t){var e=document.createElement("div"),r=void 0===t?"":t;return e.innerHTML="<div class='col-md-2' id='".concat(r,"'><ul class='nav flex-column nav-pills'></ul></div><div class='col-md-10'><div class='tab-content' id='").concat(r,"'></div></div>"),e.classList.add("row"),e}},{key:"addTab",value:function(t,e){t.children[0].children[0].appendChild(e)}},{key:"getTabContentHolder",value:function(t){return t.children[1].children[0]}},{key:"getTopTabHolder",value:function(t){var e=void 0===t?"":t,r=document.createElement("div");return r.classList.add("card"),r.innerHTML="<div class='card-header'><ul class='nav nav-tabs card-header-tabs' id='".concat(e,"'></ul></div><div class='card-body'><div class='tab-content' id='").concat(e,"'></div></div>"),r}},{key:"getTab",value:function(t,e){var r=document.createElement("li");r.classList.add("nav-item");var n=document.createElement("a");return n.classList.add("nav-link"),n.setAttribute("href","#".concat(e)),n.setAttribute("data-toggle","tab"),n.appendChild(t),r.appendChild(n),r}},{key:"getTopTab",value:function(t,e){var r=document.createElement("li");r.classList.add("nav-item");var n=document.createElement("a");return n.classList.add("nav-link"),n.setAttribute("href","#".concat(e)),n.setAttribute("data-toggle","tab"),n.appendChild(t),r.appendChild(n),r}},{key:"getTabContent",value:function(){var t=document.createElement("div");return t.classList.add("tab-pane"),t.setAttribute("role","tabpanel"),t}},{key:"getTopTabContent",value:function(){var t=document.createElement("div");return t.classList.add("tab-pane"),t.setAttribute("role","tabpanel"),t}},{key:"markTabActive",value:function(t){t.tab.firstChild.classList.add("active"),void 0!==t.rowPane?t.rowPane.classList.add("active"):t.container.classList.add("active")}},{key:"markTabInactive",value:function(t){t.tab.firstChild.classList.remove("active"),void 0!==t.rowPane?t.rowPane.classList.remove("active"):t.container.classList.remove("active")}},{key:"insertBasicTopTab",value:function(t,e){e.children[0].children[0].insertBefore(t,e.children[0].children[0].firstChild)}},{key:"addTopTab",value:function(t,e){t.children[0].children[0].appendChild(e)}},{key:"getTopTabContentHolder",value:function(t){return t.children[1].children[0]}},{key:"getFirstTab",value:function(t){return t.firstChild.firstChild.firstChild}},{key:"getProgressBar",value:function(){var t=document.createElement("div");t.classList.add("progress");var e=document.createElement("div");return e.classList.add("progress-bar"),e.setAttribute("role","progressbar"),e.setAttribute("aria-valuenow",0),e.setAttribute("aria-valuemin",0),e.setAttribute("aria-valuenax",100),e.innerHTML="".concat(0,"%"),t.appendChild(e),t}},{key:"updateProgressBar",value:function(t,e){if(t){var r=t.firstChild,n="".concat(e,"%");r.setAttribute("aria-valuenow",e),r.style.width=n,r.innerHTML=n}}},{key:"updateProgressBarUnknown",value:function(t){if(t){var e=t.firstChild;t.classList.add("progress","progress-striped","active"),e.removeAttribute("aria-valuenow"),e.style.width="100%",e.innerHTML=""}}},{key:"getBlockLink",value:function(){var t=document.createElement("a");return t.classList.add("mb-3","d-inline-block"),t}},{key:"getLinksHolder",value:function(){return document.createElement("div")}},{key:"getInputGroup",value:function(t,e){if(t){var r=document.createElement("div");r.classList.add("input-group"),r.appendChild(t);for(var n=0;n<e.length;n++)e[n].classList.remove("me-2","btn-secondary"),e[n].classList.add("btn-outline-secondary"),r.appendChild(e[n]);return r}}}])&&Eo(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(oo);function Ao(t){return Ao="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},Ao(t)}function Io(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==Ao(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==Ao(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===Ao(i)?i:String(i)),n)}var i}function Bo(){return Bo="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Do(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},Bo.apply(this,arguments)}function No(t,e){return No=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},No(t,e)}function Do(t){return Do=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},Do(t)}Ro.rules={".form-group":"margin-bottom:1rem",".form-text":"display:block",".jsoneditor-twbs5-text-button":"background:none;padding:0;border:0;color:currentColor","td > .form-group":"margin-bottom:0",".json-editor-btn-upload":"margin-top:1rem",".je-noindent .card":"padding:0;border:0",".je-tooltip:hover::before":"display:block;position:absolute;font-size:0.8em;color:%23fff;border-radius:0.2em;content:attr(title);background-color:%23000;margin-top:-2.5em;padding:0.3em",".je-tooltip:hover::after":"display:block;position:absolute;font-size:0.8em;color:%23fff",".select2-container--default .select2-selection--single":"height:calc(1.5em%20%2B%200.75rem%20%2B%202px)",".select2-container--default   .select2-selection--single   .select2-selection__arrow":"height:calc(1.5em%20%2B%200.75rem%20%2B%202px)",".select2-container--default   .select2-selection--single   .select2-selection__rendered":"line-height:calc(1.5em%20%2B%200.75rem%20%2B%202px)",".selectize-control.form-control":"padding:0",".selectize-dropdown.form-control":"padding:0;height:auto",".je-upload-preview img":"float:left;margin:0%200.5rem%200.5rem%200;max-width:100%25;max-height:5rem",".je-dropzone":"position:relative;margin:0.5rem%200;border:2px%20dashed%20black;width:100%25;height:60px;background:teal;transition:all%200.5s",".je-dropzone:before":"position:absolute;content:attr(data-text);color:rgba(0%2C%200%2C%200%2C%200.6);left:50%25;top:50%25;transform:translate(-50%25%2C%20-50%25)",".je-dropzone.valid-dropzone":"background:green",".je-dropzone.invalid-dropzone":"background:red"};var Fo=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&No(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=Do(n);if(i){var r=Do(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===Ao(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,(r=[{key:"getTable",value:function(){var t=Bo(Do(a.prototype),"getTable",this).call(this);return t.setAttribute("cellpadding",5),t.setAttribute("cellspacing",0),t}},{key:"getTableHeaderCell",value:function(t){var e=Bo(Do(a.prototype),"getTableHeaderCell",this).call(this,t);return e.classList.add("ui-state-active"),e.style.fontWeight="bold",e}},{key:"getTableCell",value:function(){var t=Bo(Do(a.prototype),"getTableCell",this).call(this);return t.classList.add("ui-widget-content"),t}},{key:"getHeaderButtonHolder",value:function(){var t=this.getButtonHolder();return t.style.marginLeft="10px",t.style.fontSize=".6em",t.style.display="inline-block",t}},{key:"getFormInputDescription",value:function(t){var e=this.getDescription(t);return e.style.marginLeft="10px",e.style.display="inline-block",e}},{key:"getFormControl",value:function(t,e,r,n){var i=Bo(Do(a.prototype),"getFormControl",this).call(this,t,e,r,n);return"checkbox"===e.type?(i.style.lineHeight="25px",i.style.padding="3px 0"):i.style.padding="4px 0 8px 0",i}},{key:"getDescription",value:function(t){var e=document.createElement("span");return e.style.fontSize=".8em",e.style.fontStyle="italic",window.DOMPurify?e.innerHTML=window.DOMPurify.sanitize(t):e.textContent=this.cleanText(t),e}},{key:"getButtonHolder",value:function(){var t=document.createElement("div");return t.classList.add("ui-buttonset"),t.style.fontSize=".7em",t}},{key:"getFormInputLabel",value:function(t,e){var r=document.createElement("label");return r.style.fontWeight="bold",r.style.display="block",r.textContent=t,e&&r.classList.add("required"),r}},{key:"getButton",value:function(t,e,r){var n=document.createElement("button");n.classList.add("ui-button","ui-widget","ui-state-default","ui-corner-all"),e&&!t?(n.classList.add("ui-button-icon-only"),e.classList.add("ui-button-icon-primary","ui-icon-primary"),n.appendChild(e)):e?(n.classList.add("ui-button-text-icon-primary"),e.classList.add("ui-button-icon-primary","ui-icon-primary"),n.appendChild(e)):n.classList.add("ui-button-text-only");var i=document.createElement("span");return i.classList.add("ui-button-text"),i.textContent=t||r||".",n.appendChild(i),n.setAttribute("title",r),n}},{key:"setButtonText",value:function(t,e,r,n){t.innerHTML="",t.classList.add("ui-button","ui-widget","ui-state-default","ui-corner-all"),r&&!e?(t.classList.add("ui-button-icon-only"),r.classList.add("ui-button-icon-primary","ui-icon-primary"),t.appendChild(r)):r?(t.classList.add("ui-button-text-icon-primary"),r.classList.add("ui-button-icon-primary","ui-icon-primary"),t.appendChild(r)):t.classList.add("ui-button-text-only");var i=document.createElement("span");i.classList.add("ui-button-text"),i.textContent=e||n||".",t.appendChild(i),t.setAttribute("title",n)}},{key:"getIndentedPanel",value:function(){var t=document.createElement("div");return t.classList.add("ui-widget-content","ui-corner-all"),t.style.padding="1em 1.4em",t.style.marginBottom="20px",t}},{key:"afterInputReady",value:function(t){if(!t.controls&&(t.controls=this.closest(t,".form-control"),this.queuedInputErrorText)){var e=this.queuedInputErrorText;delete this.queuedInputErrorText,this.addInputError(t,e)}}},{key:"addInputError",value:function(t,e){t.controls?(t.errmsg?t.errmsg.style.display="":(t.errmsg=document.createElement("div"),t.errmsg.classList.add("ui-state-error"),t.controls.appendChild(t.errmsg)),t.errmsg.textContent=e):this.queuedInputErrorText=e}},{key:"removeInputError",value:function(t){t.controls||delete this.queuedInputErrorText,t.errmsg&&(t.errmsg.style.display="none")}},{key:"markTabActive",value:function(t){t.tab.classList.remove("ui-widget-header"),t.tab.classList.add("ui-state-active"),void 0!==t.rowPane?t.rowPane.style.display="":t.container.style.display=""}},{key:"markTabInactive",value:function(t){t.tab.classList.add("ui-widget-header"),t.tab.classList.remove("ui-state-active"),void 0!==t.rowPane?t.rowPane.style.display="none":t.container.style.display="none"}}])&&Io(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(oo);function Vo(t){return Vo="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},Vo(t)}function zo(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==Vo(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==Vo(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===Vo(i)?i:String(i)),n)}var i}function Ho(t,e){return Ho=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},Ho(t,e)}function Mo(t){return Mo=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},Mo(t)}Fo.rules={'div[data-schemaid="root"]:after':'position:relative;color:red;margin:10px 0;font-weight:600;display:block;width:100%;text-align:center;content:"This is an old JSON-Editor 1.x Theme and might not display elements correctly when used with the 2.x version"'};var qo=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&Ho(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=Mo(n);if(i){var r=Mo(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===Vo(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.apply(this,arguments)}return e=a,(r=[{key:"addInputError",value:function(t,e){if(t.errmsg)t.errmsg.style.display="block";else{var r=this.closest(t,".form-control");t.errmsg=document.createElement("div"),t.errmsg.setAttribute("class","errmsg"),r.nodeName&&r.appendChild(t.errmsg)}t.errmsg.innerHTML="",t.errmsg.appendChild(document.createTextNode(e))}},{key:"removeInputError",value:function(t){t.style&&(t.style.borderColor=""),t.errmsg&&(t.errmsg.style.display="none")}}])&&zo(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(oo);function Go(t){return Go="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},Go(t)}function Uo(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==Go(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==Go(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===Go(i)?i:String(i)),n)}var i}function $o(){return $o="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Wo(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},$o.apply(this,arguments)}function Jo(t,e){return Jo=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},Jo(t,e)}function Wo(t){return Wo=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},Wo(t)}qo.rules={".je-upload-preview img":"float:left;margin:0%200.5rem%200.5rem%200;max-width:100%25;max-height:5rem",".je-dropzone":"position:relative;margin:0.5rem%200;border:2px%20dashed%20black;width:100%25;height:60px;background:teal;transition:all%200.5s",".je-dropzone:before":"position:absolute;content:attr(data-text);color:rgba(0%2C%200%2C%200%2C%200.6);left:50%25;top:50%25;transform:translate(-50%25%2C%20-50%25)",".je-dropzone.valid-dropzone":"background:green",".je-dropzone.invalid-dropzone":"background:red"};var Zo={disable_theme_rules:!1,label_bold:!0,align_bottom:!1,object_indent:!1,object_border:!1,table_border:!1,table_zebrastyle:!1,input_size:"normal"},Yo=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&Jo(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=Wo(n);if(i){var r=Wo(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===Go(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(t){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.call(this,t,Zo)}return e=a,(r=[{key:"setGridColumnSize",value:function(t,e,r){t.classList.add("col-".concat(e)),r&&t.classList.add("col-mx-auto")}},{key:"getGridContainer",value:function(){var t=document.createElement("div");return t.classList.add("container"),this.options.object_indent||t.classList.add("je-noindent"),t}},{key:"getGridRow",value:function(){var t=document.createElement("div");return t.classList.add("columns"),t}},{key:"getGridColumn",value:function(){var t=document.createElement("div");return t.classList.add("column"),this.options.align_bottom&&t.classList.add("je-align-bottom"),t}},{key:"getIndentedPanel",value:function(){var t=document.createElement("div");return t.classList.add("je-panel"),this.options.object_border&&t.classList.add("je-border"),t}},{key:"getTopIndentedPanel",value:function(){var t=document.createElement("div");return t.classList.add("je-panel-top"),this.options.object_border&&t.classList.add("je-border"),t}},{key:"getHeaderButtonHolder",value:function(){return this.getButtonHolder()}},{key:"getButtonHolder",value:function(){var t=$o(Wo(a.prototype),"getButtonHolder",this).call(this);return t.classList.add("btn-group"),t}},{key:"getFormButtonHolder",value:function(t){var e=$o(Wo(a.prototype),"getFormButtonHolder",this).call(this);return e.classList.remove("btn-group"),e.classList.add("d-block"),"center"===t?e.classList.add("text-center"):"right"===t?e.classList.add("text-right"):e.classList.add("text-left"),e}},{key:"getFormButton",value:function(t,e,r){var n=$o(Wo(a.prototype),"getFormButton",this).call(this,t,e,r);return n.classList.add("btn","btn-primary","mx-2","my-1"),"small"!==this.options.input_size&&n.classList.remove("btn-sm"),"large"===this.options.input_size&&n.classList.add("btn-lg"),n}},{key:"getButton",value:function(t,e,r){var n=$o(Wo(a.prototype),"getButton",this).call(this,t,e,r);return n.classList.add("btn","btn-sm","btn-primary","mr-2","my-1"),n}},{key:"getHeader",value:function(t,e){var r=document.createElement("h4");return"string"==typeof t?r.textContent=t:r.appendChild(t),r.style.display="inline-block",r}},{key:"getFormInputDescription",value:function(t){var e=$o(Wo(a.prototype),"getFormInputDescription",this).call(this,t);return e.classList.add("je-desc","hide-sm"),e}},{key:"getFormInputLabel",value:function(t,e){var r=$o(Wo(a.prototype),"getFormInputLabel",this).call(this,t,e);return this.options.label_bold&&r.classList.add("je-label"),r}},{key:"getCheckbox",value:function(){return this.getFormInputField("checkbox")}},{key:"getCheckboxLabel",value:function(t,e){var r=$o(Wo(a.prototype),"getCheckboxLabel",this).call(this,t,e),n=document.createElement("i");return n.classList.add("form-icon"),r.classList.add("form-checkbox","pr-0"),r.insertBefore(n,r.firstChild),r}},{key:"getFormCheckboxControl",value:function(t,e,r){return t.insertBefore(e,t.firstChild),r&&t.classList.add("form-inline"),t}},{key:"getMultiCheckboxHolder",value:function(t,e,r,n){return $o(Wo(a.prototype),"getMultiCheckboxHolder",this).call(this,t,e,r,n)}},{key:"getFormRadio",value:function(t){var e=this.getFormInputField("radio");for(var r in t)e.setAttribute(r,t[r]);return e}},{key:"getFormRadioLabel",value:function(t,e){var r=$o(Wo(a.prototype),"getFormRadioLabel",this).call(this,t,e),n=document.createElement("i");return n.classList.add("form-icon"),r.classList.add("form-radio"),r.insertBefore(n,r.firstChild),r}},{key:"getFormRadioControl",value:function(t,e,r){return t.insertBefore(e,t.firstChild),r&&t.classList.add("form-inline"),t}},{key:"getFormInputField",value:function(t){var e=$o(Wo(a.prototype),"getFormInputField",this).call(this,t);return["checkbox","radio"].includes(t)||e.classList.add("form-input"),e}},{key:"getRangeInput",value:function(t,e,r){var n=this.getFormInputField("range");return n.classList.add("slider"),n.classList.remove("form-input"),n.setAttribute("oninput",'this.setAttribute("value", this.value)'),n.setAttribute("min",t),n.setAttribute("max",e),n.setAttribute("step",r),n}},{key:"getRangeControl",value:function(t,e){var r=$o(Wo(a.prototype),"getRangeControl",this).call(this,t,e);return r.classList.add("text-center"),r}},{key:"getSelectInput",value:function(t,e){var r=$o(Wo(a.prototype),"getSelectInput",this).call(this,t);return r.classList.add("form-select"),r}},{key:"getTextareaInput",value:function(){var t=document.createElement("textarea");return t.classList.add("form-input"),t}},{key:"getFormControl",value:function(t,e,r,n){var i=document.createElement("div");return i.classList.add("form-group"),!t||"checkbox"!==e.type&&"radio"!==e.type?(t&&(t.classList.add("form-label"),i.appendChild(t),n&&t.appendChild(n)),i.appendChild(e)):(i.classList.add(e.type),n&&t.appendChild(n),t.insertBefore(e,t.firstChild),i.appendChild(t)),"small"===this.options.input_size?e.classList.add("input-sm","select-sm"):"large"===this.options.input_size&&e.classList.add("input-lg","select-lg"),"checkbox"!==e.type&&i.appendChild(e),r&&i.appendChild(r),i}},{key:"getInputGroup",value:function(t,e){if(t){var r=document.createElement("div");r.classList.add("input-group"),r.appendChild(t);for(var n=0;n<e.length;n++)e[n].classList.add("input-group-btn"),e[n].classList.remove("btn-sm","mr-2","my-1"),r.appendChild(e[n]);return r}}},{key:"getInfoButton",value:function(t){var e=document.createElement("div");e.classList.add("popover","popover-left","float-right");var r=document.createElement("button");r.classList.add("btn","btn-secondary","btn-info","btn-action","s-circle"),r.setAttribute("tabindex","-1"),e.appendChild(r);var n=document.createTextNode("I");r.appendChild(n);var i=document.createElement("div");i.classList.add("popover-container"),e.appendChild(i);var o=document.createElement("div");o.classList.add("card"),i.appendChild(o);var a=document.createElement("div");return a.classList.add("card-body"),a.innerHTML=t,o.appendChild(a),e}},{key:"getTable",value:function(){var t=$o(Wo(a.prototype),"getTable",this).call(this);return t.classList.add("table","table-scroll"),this.options.table_border&&t.classList.add("je-table-border"),this.options.table_zebrastyle&&t.classList.add("table-striped"),t}},{key:"getProgressBar",value:function(){var t=$o(Wo(a.prototype),"getProgressBar",this).call(this);return t.classList.add("progress"),t}},{key:"getTabHolder",value:function(t){var e=void 0===t?"":t,r=document.createElement("div");return r.classList.add("columns"),r.innerHTML='<div class="column col-2"></div><div class="column col-10 content" id="'.concat(e,'"></div>'),r}},{key:"getTopTabHolder",value:function(t){var e=void 0===t?"":t,r=document.createElement("div");return r.innerHTML='<ul class="tab"></ul><div class="content" id="'.concat(e,'"></div>'),r}},{key:"getTab",value:function(t,e){var r=document.createElement("a");return r.classList.add("btn","btn-secondary","btn-block"),r.setAttribute("href","#".concat(e)),r.appendChild(t),r}},{key:"getTopTab",value:function(t,e){var r=document.createElement("li");r.id=e,r.classList.add("tab-item");var n=document.createElement("a");return n.setAttribute("href","#".concat(e)),n.appendChild(t),r.appendChild(n),r}},{key:"markTabActive",value:function(t){t.tab.classList.add("active"),void 0!==t.rowPane?t.rowPane.style.display="":t.container.style.display=""}},{key:"markTabInactive",value:function(t){t.tab.classList.remove("active"),void 0!==t.rowPane?t.rowPane.style.display="none":t.container.style.display="none"}},{key:"afterInputReady",value:function(t){if("select"===t.localName)if(t.classList.contains("selectized")){var e=t.nextSibling;e&&(e.classList.remove("form-select"),Array.from(e.querySelectorAll(".form-select")).forEach((function(t){t.classList.remove("form-select")})))}else if(t.classList.contains("select2-hidden-accessible")){var r=t.nextSibling;r&&r.querySelector(".select2-selection--single")&&r.classList.add("form-select")}t.controlgroup||(t.controlgroup=this.closest(t,".form-group"),this.closest(t,".compact")&&(t.controlgroup.style.marginBottom=0))}},{key:"addInputError",value:function(t,e){t.controlgroup&&(t.controlgroup.classList.add("has-error"),t.errmsg||(t.errmsg=document.createElement("p"),t.errmsg.classList.add("form-input-hint"),t.controlgroup.appendChild(t.errmsg)),t.errmsg.classList.remove("d-hide"),t.errmsg.textContent=e)}},{key:"removeInputError",value:function(t){t.errmsg&&(t.errmsg.classList.add("d-hide"),t.controlgroup.classList.remove("has-error"))}}])&&Uo(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(oo);function Qo(t){return Qo="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},Qo(t)}function Ko(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==Qo(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==Qo(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===Qo(i)?i:String(i)),n)}var i}function Xo(){return Xo="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,r){var n=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=ea(t)););return t}(t,e);if(n){var i=Object.getOwnPropertyDescriptor(n,e);return i.get?i.get.call(arguments.length<3?t:r):i.value}},Xo.apply(this,arguments)}function ta(t,e){return ta=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},ta(t,e)}function ea(t){return ea=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},ea(t)}Yo.rules={"*":"--primary-color:%235755d9;--gray-color:%23bcc3ce;--light-color:%23fff",".slider:focus":"box-shadow:none","h4 > label + .btn-group":"margin-left:1rem",".text-right > button":"margin-right:0%20!important",".text-left > button":"margin-left:0%20!important",".property-selector":"font-size:0.7rem;font-weight:normal;max-height:260px%20!important;width:395px%20!important",".property-selector .form-checkbox":"margin:0",textarea:"width:100%25;min-height:2rem;resize:vertical",table:"border-collapse:collapse",".table td":"padding:0.4rem%200.4rem",".mr-5":"margin-right:1rem%20!important","div[data-schematype]:not([data-schematype='object'])":"transition:0.5s","div[data-schematype]:not([data-schematype='object']):hover":"background-color:%23eee",".je-table-border td":"border:0.05rem%20solid%20%23dadee4%20!important",".btn-info":"font-size:0.5rem;font-weight:bold;height:0.8rem;padding:0.15rem%200;line-height:0.8;margin:0.3rem%200%200.3rem%200.1rem",".je-label + select":"min-width:5rem",".je-label":"font-weight:600",".btn-action.btn-info":"width:0.8rem",".je-border":"border:0.05rem%20solid%20%23dadee4",".je-panel":"padding:0.2rem;margin:0.2rem;background-color:rgba(218%2C%20222%2C%20228%2C%200.1)",".je-panel-top":"padding:0.2rem;margin:0.2rem;background-color:rgba(218%2C%20222%2C%20228%2C%200.1)",".required:after":"content:%22%20*%22;color:red;font:inherit",".je-align-bottom":"margin-top:auto",".je-desc":"font-size:smaller;margin:0.2rem%200",".je-upload-preview img":"float:left;margin:0%200.5rem%200.5rem%200;max-width:100%25;max-height:5rem;border:3px%20solid%20white;box-shadow:0px%200px%208px%20rgba(0%2C%200%2C%200%2C%200.3);box-sizing:border-box",".je-dropzone":"position:relative;margin:0.5rem%200;border:2px%20dashed%20black;width:100%25;height:60px;background:teal;transition:all%200.5s",".je-dropzone:before":"position:absolute;content:attr(data-text);color:rgba(0%2C%200%2C%200%2C%200.6);left:50%25;top:50%25;transform:translate(-50%25%2C%20-50%25)",".je-dropzone.valid-dropzone":"background:green",".je-dropzone.invalid-dropzone":"background:red",".columns .container.je-noindent":"padding-left:0;padding-right:0",".selectize-control.multi .item":"background:var(--primary-color)%20!important",".select2-container--default   .select2-selection--single   .select2-selection__arrow":"display:none",".select2-container--default .select2-selection--single":"border:none",".select2-container .select2-selection--single .select2-selection__rendered":"padding:0",".select2-container .select2-search--inline .select2-search__field":"margin-top:0",".select2-container--default.select2-container--focus   .select2-selection--multiple":"border:0.05rem%20solid%20var(--gray-color)",".select2-container--default   .select2-selection--multiple   .select2-selection__choice":"margin:0.4rem%200.2rem%200.2rem%200;padding:2px%205px;background-color:var(--primary-color);color:var(--light-color)",".select2-container--default .select2-search--inline .select2-search__field":"line-height:normal",".choices":"margin-bottom:auto",".choices__list--multiple .choices__item":"border:none;background-color:var(--primary-color);color:var(--light-color)",".choices[data-type*='select-multiple'] .choices__button":"border-left:0.05rem%20solid%20%232826a6",".choices__inner":"font-size:inherit;min-height:20px;padding:4px%207.5px%204px%203.75px",".choices[data-type*='select-one'] .choices__inner":"padding-bottom:4px",".choices__list--dropdown .choices__item":"font-size:inherit"};var ra={disable_theme_rules:!1,label_bold:!1,object_panel_default:!0,object_indent:!0,object_border:!1,table_border:!1,table_hdiv:!1,table_zebrastyle:!1,input_size:"small",enable_compact:!1},na=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&ta(t,e)}(a,t);var e,r,n,i,o=(n=a,i=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=ea(n);if(i){var r=ea(this).constructor;t=Reflect.construct(e,arguments,r)}else t=e.apply(this,arguments);return function(t,e){if(e&&("object"===Qo(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(this,t)});function a(t){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,a),o.call(this,t,ra)}return e=a,(r=[{key:"getGridContainer",value:function(){var t=document.createElement("div");return t.classList.add("flex","flex-col","w-full"),this.options.object_indent||t.classList.add("je-noindent"),t}},{key:"getGridRow",value:function(){var t=document.createElement("div");return t.classList.add("flex","flex-wrap","w-full"),t}},{key:"getGridColumn",value:function(){var t=document.createElement("div");return t.classList.add("flex","flex-col"),t}},{key:"setGridColumnSize",value:function(t,e,r){e>0&&e<12?t.classList.add("w-".concat(e,"/12"),"px-1"):t.classList.add("w-full","px-1"),r&&(t.style.marginLeft="".concat(100/12*r,"%"))}},{key:"getIndentedPanel",value:function(){var t=document.createElement("div");return this.options.object_panel_default?t.classList.add("w-full","p-1"):t.classList.add("relative","flex","flex-col","rounded","break-words","border","bg-white","border-0","border-blue-400","p-1","shadow-md"),this.options.object_border&&t.classList.add("je-border"),t}},{key:"getTopIndentedPanel",value:function(){var t=document.createElement("div");return this.options.object_panel_default?t.classList.add("w-full","m-2"):t.classList.add("relative","flex","flex-col","rounded","break-words","border","bg-white","border-0","border-blue-400","p-1","shadow-md"),this.options.object_border&&t.classList.add("je-border"),t}},{key:"getTitle",value:function(){return this.translateProperty(this.schema.title)}},{key:"getSelectInput",value:function(t,e){var r=Xo(ea(a.prototype),"getSelectInput",this).call(this,t);return e?r.classList.add("form-multiselect","block","py-0","h-auto","w-full","px-1","text-sm","text-black","leading-normal","bg-white","border","border-grey","rounded"):r.classList.add("form-select","block","py-0","h-6","w-full","px-1","text-sm","text-black","leading-normal","bg-white","border","border-grey","rounded"),this.options.enable_compact&&r.classList.add("compact"),r}},{key:"afterInputReady",value:function(t){t.controlgroup||(t.controlgroup=this.closest(t,".form-group"),this.closest(t,".compact")&&(t.controlgroup.style.marginBottom=0))}},{key:"getTextareaInput",value:function(){var t=Xo(ea(a.prototype),"getTextareaInput",this).call(this);return t.classList.add("block","w-full","px-1","text-sm","leading-normal","bg-white","text-black","border","border-grey","rounded"),this.options.enable_compact&&t.classList.add("compact"),t.style.height=0,t}},{key:"getRangeInput",value:function(t,e,r){var n=this.getFormInputField("range");return n.classList.add("slider"),this.options.enable_compact&&n.classList.add("compact"),n.setAttribute("oninput",'this.setAttribute("value", this.value)'),n.setAttribute("min",t),n.setAttribute("max",e),n.setAttribute("step",r),n}},{key:"getRangeControl",value:function(t,e){var r=Xo(ea(a.prototype),"getRangeControl",this).call(this,t,e);return r.classList.add("text-center","text-black"),r}},{key:"getCheckbox",value:function(){var t=this.getFormInputField("checkbox");return t.classList.add("form-checkbox","text-red-600"),t}},{key:"getCheckboxLabel",value:function(t,e){var r=Xo(ea(a.prototype),"getCheckboxLabel",this).call(this,t,e);return r.classList.add("inline-flex","items-center"),r}},{key:"getFormCheckboxControl",value:function(t,e,r){return t.insertBefore(e,t.firstChild),r&&t.classList.add("inline-flex flex-row"),t}},{key:"getMultiCheckboxHolder",value:function(t,e,r,n){var i=Xo(ea(a.prototype),"getMultiCheckboxHolder",this).call(this,t,e,r,n);return i.classList.add("inline-flex","flex-col"),i}},{key:"getFormRadio",value:function(t){var e=this.getFormInputField("radio");for(var r in e.classList.add("form-radio","text-red-600"),t)e.setAttribute(r,t[r]);return e}},{key:"getFormRadioLabel",value:function(t,e){var r=Xo(ea(a.prototype),"getFormRadioLabel",this).call(this,t,e);return r.classList.add("inline-flex","items-center","mr-2"),r}},{key:"getFormRadioControl",value:function(t,e,r){return t.insertBefore(e,t.firstChild),r&&t.classList.add("form-radio"),t}},{key:"getRadioHolder",value:function(t,e,r,n,i){var o=Xo(ea(a.prototype),"getRadioHolder",this).call(this,e,r,n,i);return"h"===t.options.layout?o.classList.add("inline-flex","flex-row"):o.classList.add("inline-flex","flex-col"),o}},{key:"getFormInputLabel",value:function(t,e){var r=Xo(ea(a.prototype),"getFormInputLabel",this).call(this,t,e);return this.options.label_bold?r.classList.add("font-bold"):r.classList.add("required"),r}},{key:"getFormInputField",value:function(t){var e=Xo(ea(a.prototype),"getFormInputField",this).call(this,t);return["checkbox","radio"].includes(t)||e.classList.add("block","w-full","px-1","text-black","text-sm","leading-normal","bg-white","border","border-grey","rounded"),this.options.enable_compact&&e.classList.add("compact"),e}},{key:"getFormInputDescription",value:function(t){var e=document.createElement("p");return e.classList.add("block","mt-1","text-xs"),window.DOMPurify?e.innerHTML=window.DOMPurify.sanitize(t):e.textContent=this.cleanText(t),e}},{key:"getFormControl",value:function(t,e,r,n){var i=document.createElement("div");return i.classList.add("form-group","mb-1","w-full"),t&&(t.classList.add("text-xs"),"checkbox"===e.type&&(e.classList.add("form-checkbox","text-xs","text-red-600","mr-1"),t.classList.add("items-center","flex"),t=this.getFormCheckboxControl(t,e,!1,n)),"radio"===e.type&&(e.classList.add("form-radio","text-red-600","mr-1"),t.classList.add("items-center","flex"),t=this.getFormRadioControl(t,e,!1,n)),i.appendChild(t),!["checkbox","radio"].includes(e.type)&&n&&i.appendChild(n)),["checkbox","radio"].includes(e.type)||("small"===this.options.input_size?e.classList.add("text-xs"):"normal"===this.options.input_size?e.classList.add("text-base"):"large"===this.options.input_size&&e.classList.add("text-xl"),i.appendChild(e)),r&&i.appendChild(r),i}},{key:"getHeaderButtonHolder",value:function(){var t=this.getButtonHolder();return t.classList.add("text-sm"),t}},{key:"getButtonHolder",value:function(){var t=document.createElement("div");return t.classList.add("flex","relative","inline-flex","align-middle"),t}},{key:"getButton",value:function(t,e,r){var n=Xo(ea(a.prototype),"getButton",this).call(this,t,e,r);return n.classList.add("inline-block","align-middle","text-center","text-sm","bg-blue-700","text-white","py-1","pr-1","m-2","shadow","select-none","whitespace-no-wrap","rounded"),n}},{key:"getInfoButton",value:function(t){var e=document.createElement("a");e.classList.add("tooltips","float-right"),e.innerHTML="ⓘ";var r=document.createElement("span");return r.innerHTML=t,e.appendChild(r),e}},{key:"getTable",value:function(){var t=Xo(ea(a.prototype),"getTable",this).call(this);return this.options.table_border?t.classList.add("je-table-border"):t.classList.add("table","border","p-0"),t}},{key:"getTableRow",value:function(){var t=Xo(ea(a.prototype),"getTableRow",this).call(this);return this.options.table_border&&t.classList.add("je-table-border"),this.options.table_zebrastyle&&t.classList.add("je-table-zebra"),t}},{key:"getTableHeaderCell",value:function(t){var e=Xo(ea(a.prototype),"getTableHeaderCell",this).call(this,t);return this.options.table_border?e.classList.add("je-table-border"):this.options.table_hdiv?e.classList.add("je-table-hdiv"):e.classList.add("text-xs","border","p-0","m-0"),e}},{key:"getTableCell",value:function(){var t=Xo(ea(a.prototype),"getTableCell",this).call(this);return this.options.table_border?t.classList.add("je-table-border"):this.options.table_hdiv?t.classList.add("je-table-hdiv"):t.classList.add("border-0","p-0","m-0"),t}},{key:"addInputError",value:function(t,e){t.controlgroup&&(t.controlgroup.classList.add("has-error"),t.controlgroup.classList.add("text-red-600"),t.errmsg?t.errmsg.style.display="":(t.errmsg=document.createElement("p"),t.errmsg.classList.add("block","mt-1","text-xs","text-red"),t.controlgroup.appendChild(t.errmsg)),t.errmsg.textContent=e)}},{key:"removeInputError",value:function(t){t.errmsg&&(t.errmsg.style.display="none",t.controlgroup.classList.remove("text-red-600"),t.controlgroup.classList.remove("has-error"))}},{key:"getTabHolder",value:function(t){var e=document.createElement("div"),r=void 0===t?"":t;return e.innerHTML="<div class='w-2/12' id='".concat(r,"'><ul class='list-reset pl-0 mb-0'></ul></div><div class='w-10/12' id='").concat(r,"'></div>"),e.classList.add("flex"),e}},{key:"addTab",value:function(t,e){t.children[0].children[0].appendChild(e)}},{key:"getTopTabHolder",value:function(t){var e=void 0===t?"":t,r=document.createElement("div");return r.innerHTML="<ul class='nav-tabs flex list-reset pl-0 mb-0 border-b border-grey-light' id='".concat(e,"'></ul><div class='p-6 block' id='").concat(e,"'></div>"),r}},{key:"getTab",value:function(t,e){var r=document.createElement("li");r.classList.add("nav-item","flex-col","text-center","text-white","bg-blue-500","shadow-md","border","p-2","mb-2","mr-2","hover:bg-blue-400","rounded");var n=document.createElement("a");return n.classList.add("nav-link","text-center"),n.setAttribute("href","#".concat(e)),n.setAttribute("data-toggle","tab"),n.appendChild(t),r.appendChild(n),r}},{key:"getTopTab",value:function(t,e){var r=document.createElement("li");r.classList.add("nav-item","flex","border-l","border-t","border-r");var n=document.createElement("a");return n.classList.add("nav-link","-mb-px","flex-row","text-center","bg-white","p-2","hover:bg-blue-400","rounded-t"),n.setAttribute("href","#".concat(e)),n.setAttribute("data-toggle","tab"),n.appendChild(t),r.appendChild(n),r}},{key:"getTabContent",value:function(){var t=document.createElement("div");return t.setAttribute("role","tabpanel"),t}},{key:"getTopTabContent",value:function(){var t=document.createElement("div");return t.setAttribute("role","tabpanel"),t}},{key:"markTabActive",value:function(t){t.tab.firstChild.classList.add("block"),!0===t.tab.firstChild.classList.contains("border-b")?(t.tab.firstChild.classList.add("border-b-0"),t.tab.firstChild.classList.remove("border-b")):t.tab.firstChild.classList.add("border-b-0"),!0===t.container.classList.contains("hidden")?(t.container.classList.remove("hidden"),t.container.classList.add("block")):t.container.classList.add("block")}},{key:"markTabInactive",value:function(t){!0===t.tab.firstChild.classList.contains("border-b-0")?(t.tab.firstChild.classList.add("border-b"),t.tab.firstChild.classList.remove("border-b-0")):t.tab.firstChild.classList.add("border-b"),!0===t.container.classList.contains("block")&&(t.container.classList.remove("block"),t.container.classList.add("hidden"))}},{key:"getProgressBar",value:function(){var t=document.createElement("div");t.classList.add("progress");var e=document.createElement("div");return e.classList.add("bg-blue","leading-none","py-1","text-xs","text-center","text-white"),e.setAttribute("role","progressbar"),e.setAttribute("aria-valuenow",0),e.setAttribute("aria-valuemin",0),e.setAttribute("aria-valuenax",100),e.innerHTML="".concat(0,"%"),t.appendChild(e),t}},{key:"updateProgressBar",value:function(t,e){if(t){var r=t.firstChild,n="".concat(e,"%");r.setAttribute("aria-valuenow",e),r.style.width=n,r.innerHTML=n}}},{key:"updateProgressBarUnknown",value:function(t){if(t){var e=t.firstChild;t.classList.add("progress","bg-blue","leading-none","py-1","text-xs","text-center","text-white","block"),e.removeAttribute("aria-valuenow"),e.classList.add("w-full"),e.innerHTML=""}}},{key:"getInputGroup",value:function(t,e){if(t){var r=document.createElement("div");r.classList.add("relative","items-stretch","w-full"),r.appendChild(t);var n=document.createElement("div");n.classList.add("-mr-1"),r.appendChild(n);for(var i=0;i<e.length;i++)n.appendChild(e[i]);return r}}}])&&Ko(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),a}(oo);na.rules={".slider":"-webkit-appearance:none;-moz-appearance:none;appearance:none;background:transparent;display:block;border:none;height:1.2rem;width:100%25",".slider:focus":"box-shadow:0%200%200%200%20rgba(87%2C%2085%2C%20217%2C%200.2);outline:none",".slider.tooltip:not([data-tooltip])::after":"content:attr(value)",".slider::-webkit-slider-thumb":"-webkit-appearance:none;background:%23f17405;border-radius:100%25;height:0.6rem;margin-top:-0.25rem;transition:transform%200.2s;width:0.6rem",".slider:active::-webkit-slider-thumb":"transform:scale(1.25);outline:none",".slider::-webkit-slider-runnable-track":"background:%23b2b4b6;border-radius:0.1rem;height:0.1rem;width:100%25","a.tooltips":"position:relative;display:inline","a.tooltips span":"position:absolute;white-space:nowrap;width:auto;padding-left:1rem;padding-right:1rem;color:%23ffffff;background:rgba(56%2C%2056%2C%2056%2C%200.85);height:1.5rem;line-height:1.5rem;text-align:center;visibility:hidden;border-radius:3px","a.tooltips span:after":"content:%22%22;position:absolute;top:50%25;left:100%25;margin-top:-5px;width:0;height:0;border-left:5px%20solid%20rgba(56%2C%2056%2C%2056%2C%200.85);border-top:5px%20solid%20transparent;border-bottom:5px%20solid%20transparent","a:hover.tooltips span":"visibility:visible;opacity:0.9;font-size:0.8rem;right:100%25;top:50%25;margin-top:-12px;margin-right:10px;z-index:999",".json-editor-btntype-properties + div":"font-size:0.8rem;font-weight:normal",textarea:"width:100%25;min-height:2rem;resize:vertical",table:"width:100%25;border-collapse:collapse",".table td":"padding:0rem%200rem","div[data-schematype]:not([data-schematype='object'])":"transition:0.5s","div[data-schematype]:not([data-schematype='object']):hover":"background-color:%23e6f4fe","div[data-schemaid='root']":"position:relative;width:inherit;display:inherit;overflow-x:hidden;z-index:10","select[multiple]":"height:auto","select[multiple].from-select":"height:auto",".je-table-zebra:nth-child(even)":"background-color:%23f2f2f2",".je-table-border":"border:0.5px%20solid%20black",".je-table-hdiv":"border-bottom:1px%20solid%20black",".je-border":"border:0.05rem%20solid%20%233182ce",".je-panel":"width:inherit;padding:0.2rem;margin:0.2rem;background-color:rgba(218%2C%20222%2C%20228%2C%200.1)",".je-panel-top":"width:100%25;padding:0.2rem;margin:0.2rem;background-color:rgba(218%2C%20222%2C%20228%2C%200.1)",".required:after":"content:%22%20*%22;color:red;font:inherit;font-weight:bold",".je-desc":"font-size:smaller;margin:0.2rem%200",".container-xl.je-noindent":"padding-left:0;padding-right:0",".json-editor-btntype-add":"color:white;margin:0.3rem;padding:0.3rem%200.8rem;background-color:%234299e1;box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2);-webkit-box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2);-moz-box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2)",".json-editor-btntype-deletelast":"color:white;margin:0.3rem;padding:0.3rem%200.8rem;background-color:%23e53e3e;box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2);-webkit-box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2);-moz-box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2)",".json-editor-btntype-deleteall":"color:white;margin:0.3rem;padding:0.3rem%200.8rem;background-color:%23000000;box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2);-webkit-box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2);-moz-box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2)",".json-editor-btn-save":"float:right;color:white;margin:0.3rem;padding:0.3rem%200.8rem;background-color:%232b6cb0;box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2);-webkit-box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2);-moz-box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2)",".json-editor-btn-back":"color:white;margin:0.3rem;padding:0.3rem%200.8rem;background-color:%232b6cb0;box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2);-webkit-box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2);-moz-box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2)",".json-editor-btntype-delete":"color:%23e53e3e;background-color:rgba(218%2C%20222%2C%20228%2C%200.1);margin:0.03rem;padding:0.1rem",".json-editor-btntype-move":"color:%23000000;background-color:rgba(218%2C%20222%2C%20228%2C%200.1);margin:0.03rem;padding:0.1rem",".json-editor-btn-collapse":"padding:0em%200.8rem;font-size:1.3rem;color:%23e53e3e;background-color:rgba(218%2C%20222%2C%20228%2C%200.1)",".je-upload-preview img":"float:left;margin:0%200.5rem%200.5rem%200;max-width:100%25;max-height:5rem",".je-dropzone":"position:relative;margin:0.5rem%200;border:2px%20dashed%20black;width:100%25;height:60px;background:teal;transition:all%200.5s",".je-dropzone:before":"position:absolute;content:attr(data-text);color:rgba(0%2C%200%2C%200%2C%200.6);left:50%25;top:50%25;transform:translate(-50%25%2C%20-50%25)",".je-dropzone.valid-dropzone":"background:green",".je-dropzone.invalid-dropzone":"background:red"};var ia={html:ho,bootstrap3:bo,bootstrap4:xo,bootstrap5:Ro,jqueryui:Fo,barebones:qo,spectre:Yo,tailwind:na};const oa={".je-float-right-linkholder":"float:right;margin-left:10px",".je-modal":"background-color:white;border:1px%20solid%20black;box-shadow:3px%203px%20black;position:absolute;z-index:10",".je-infobutton-icon":"font-size:16px;font-weight:bold;padding:0.25rem;position:relative;display:inline-block",".je-infobutton-tooltip":"font-size:12px;font-weight:normal;font-family:sans-serif;visibility:hidden;background-color:rgba(50%2C%2050%2C%2050%2C%200.75);margin:0%200.25rem;color:%23fafafa;padding:0.5rem%201rem;border-radius:0.25rem;width:20rem;position:absolute",".je-not-loaded":"pointer-events:none",".je-header":"display:inline-block",".je-upload-preview img":"float:left;margin:0%200.5rem%200.5rem%200;max-width:100%25;max-height:5rem",".je-checkbox":"display:inline-block;width:auto",".je-checkbox-control--compact":"display:inline-block;margin-right:1rem",".je-radio":"display:inline-block;width:auto",".je-radio-control--compact":"display:inline-block;margin-right:1rem",".je-switcher":"background-color:transparent;display:inline-block;font-style:italic;font-weight:normal;height:auto;width:auto;margin-bottom:0;margin-left:5px;padding:0%200%200%203px",".je-textarea":"width:100%25;height:300px;box-sizing:border-box",".je-range-control":"text-align:center",".je-indented-panel":"padding-left:10px;margin-left:10px;border-left:1px%20solid%20%23ccc",".je-indented-panel--top":"padding-left:10px;margin-left:10px",".je-tabholder":"float:left;width:130px",".je-tabholder .content":"margin-left:120px",".je-tabholder--top":"margin-left:10px",".je-tabholder--clear":"clear:both",".je-tab":"border:1px%20solid%20%23ccc;border-width:1px%200%201px%201px;text-align:center;line-height:30px;border-radius:5px;border-bottom-right-radius:0;border-top-right-radius:0;font-weight:bold;cursor:pointer",".je-tab--top":"float:left;border:1px%20solid%20%23ccc;border-width:1px%201px%200px%201px;text-align:center;line-height:30px;border-radius:5px;padding-left:5px;padding-right:5px;border-bottom-right-radius:0;border-bottom-left-radius:0;font-weight:bold;cursor:pointer",".je-block-link":"display:block",".je-media":"width:100%25"};function aa(t){return aa="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},aa(t)}function sa(t,e){(null==e||e>t.length)&&(e=t.length);for(var r=0,n=new Array(e);r<e;r++)n[r]=t[r];return n}function la(){la=function(){return t};var t={},e=Object.prototype,r=e.hasOwnProperty,n=Object.defineProperty||function(t,e,r){t[e]=r.value},i="function"==typeof Symbol?Symbol:{},o=i.iterator||"@@iterator",a=i.asyncIterator||"@@asyncIterator",s=i.toStringTag||"@@toStringTag";function l(t,e,r){return Object.defineProperty(t,e,{value:r,enumerable:!0,configurable:!0,writable:!0}),t[e]}try{l({},"")}catch(t){l=function(t,e,r){return t[e]=r}}function c(t,e,r,i){var o=e&&e.prototype instanceof p?e:p,a=Object.create(o.prototype),s=new x(i||[]);return n(a,"_invoke",{value:_(t,r,s)}),a}function u(t,e,r){try{return{type:"normal",arg:t.call(e,r)}}catch(t){return{type:"throw",arg:t}}}t.wrap=c;var h={};function p(){}function d(){}function f(){}var y={};l(y,o,(function(){return this}));var m=Object.getPrototypeOf,v=m&&m(m(C([])));v&&v!==e&&r.call(v,o)&&(y=v);var b=f.prototype=p.prototype=Object.create(y);function g(t){["next","throw","return"].forEach((function(e){l(t,e,(function(t){return this._invoke(e,t)}))}))}function w(t,e){function i(n,o,a,s){var l=u(t[n],t,o);if("throw"!==l.type){var c=l.arg,h=c.value;return h&&"object"==aa(h)&&r.call(h,"__await")?e.resolve(h.__await).then((function(t){i("next",t,a,s)}),(function(t){i("throw",t,a,s)})):e.resolve(h).then((function(t){c.value=t,a(c)}),(function(t){return i("throw",t,a,s)}))}s(l.arg)}var o;n(this,"_invoke",{value:function(t,r){function n(){return new e((function(e,n){i(t,r,e,n)}))}return o=o?o.then(n,n):n()}})}function _(t,e,r){var n="suspendedStart";return function(i,o){if("executing"===n)throw new Error("Generator is already running");if("completed"===n){if("throw"===i)throw o;return{value:void 0,done:!0}}for(r.method=i,r.arg=o;;){var a=r.delegate;if(a){var s=k(a,r);if(s){if(s===h)continue;return s}}if("next"===r.method)r.sent=r._sent=r.arg;else if("throw"===r.method){if("suspendedStart"===n)throw n="completed",r.arg;r.dispatchException(r.arg)}else"return"===r.method&&r.abrupt("return",r.arg);n="executing";var l=u(t,e,r);if("normal"===l.type){if(n=r.done?"completed":"suspendedYield",l.arg===h)continue;return{value:l.arg,done:r.done}}"throw"===l.type&&(n="completed",r.method="throw",r.arg=l.arg)}}}function k(t,e){var r=e.method,n=t.iterator[r];if(void 0===n)return e.delegate=null,"throw"===r&&t.iterator.return&&(e.method="return",e.arg=void 0,k(t,e),"throw"===e.method)||"return"!==r&&(e.method="throw",e.arg=new TypeError("The iterator does not provide a '"+r+"' method")),h;var i=u(n,t.iterator,e.arg);if("throw"===i.type)return e.method="throw",e.arg=i.arg,e.delegate=null,h;var o=i.arg;return o?o.done?(e[t.resultName]=o.value,e.next=t.nextLoc,"return"!==e.method&&(e.method="next",e.arg=void 0),e.delegate=null,h):o:(e.method="throw",e.arg=new TypeError("iterator result is not an object"),e.delegate=null,h)}function j(t){var e={tryLoc:t[0]};1 in t&&(e.catchLoc=t[1]),2 in t&&(e.finallyLoc=t[2],e.afterLoc=t[3]),this.tryEntries.push(e)}function O(t){var e=t.completion||{};e.type="normal",delete e.arg,t.completion=e}function x(t){this.tryEntries=[{tryLoc:"root"}],t.forEach(j,this),this.reset(!0)}function C(t){if(t){var e=t[o];if(e)return e.call(t);if("function"==typeof t.next)return t;if(!isNaN(t.length)){var n=-1,i=function e(){for(;++n<t.length;)if(r.call(t,n))return e.value=t[n],e.done=!1,e;return e.value=void 0,e.done=!0,e};return i.next=i}}return{next:E}}function E(){return{value:void 0,done:!0}}return d.prototype=f,n(b,"constructor",{value:f,configurable:!0}),n(f,"constructor",{value:d,configurable:!0}),d.displayName=l(f,s,"GeneratorFunction"),t.isGeneratorFunction=function(t){var e="function"==typeof t&&t.constructor;return!!e&&(e===d||"GeneratorFunction"===(e.displayName||e.name))},t.mark=function(t){return Object.setPrototypeOf?Object.setPrototypeOf(t,f):(t.__proto__=f,l(t,s,"GeneratorFunction")),t.prototype=Object.create(b),t},t.awrap=function(t){return{__await:t}},g(w.prototype),l(w.prototype,a,(function(){return this})),t.AsyncIterator=w,t.async=function(e,r,n,i,o){void 0===o&&(o=Promise);var a=new w(c(e,r,n,i),o);return t.isGeneratorFunction(r)?a:a.next().then((function(t){return t.done?t.value:a.next()}))},g(b),l(b,s,"Generator"),l(b,o,(function(){return this})),l(b,"toString",(function(){return"[object Generator]"})),t.keys=function(t){var e=Object(t),r=[];for(var n in e)r.push(n);return r.reverse(),function t(){for(;r.length;){var n=r.pop();if(n in e)return t.value=n,t.done=!1,t}return t.done=!0,t}},t.values=C,x.prototype={constructor:x,reset:function(t){if(this.prev=0,this.next=0,this.sent=this._sent=void 0,this.done=!1,this.delegate=null,this.method="next",this.arg=void 0,this.tryEntries.forEach(O),!t)for(var e in this)"t"===e.charAt(0)&&r.call(this,e)&&!isNaN(+e.slice(1))&&(this[e]=void 0)},stop:function(){this.done=!0;var t=this.tryEntries[0].completion;if("throw"===t.type)throw t.arg;return this.rval},dispatchException:function(t){if(this.done)throw t;var e=this;function n(r,n){return a.type="throw",a.arg=t,e.next=r,n&&(e.method="next",e.arg=void 0),!!n}for(var i=this.tryEntries.length-1;i>=0;--i){var o=this.tryEntries[i],a=o.completion;if("root"===o.tryLoc)return n("end");if(o.tryLoc<=this.prev){var s=r.call(o,"catchLoc"),l=r.call(o,"finallyLoc");if(s&&l){if(this.prev<o.catchLoc)return n(o.catchLoc,!0);if(this.prev<o.finallyLoc)return n(o.finallyLoc)}else if(s){if(this.prev<o.catchLoc)return n(o.catchLoc,!0)}else{if(!l)throw new Error("try statement without catch or finally");if(this.prev<o.finallyLoc)return n(o.finallyLoc)}}}},abrupt:function(t,e){for(var n=this.tryEntries.length-1;n>=0;--n){var i=this.tryEntries[n];if(i.tryLoc<=this.prev&&r.call(i,"finallyLoc")&&this.prev<i.finallyLoc){var o=i;break}}o&&("break"===t||"continue"===t)&&o.tryLoc<=e&&e<=o.finallyLoc&&(o=null);var a=o?o.completion:{};return a.type=t,a.arg=e,o?(this.method="next",this.next=o.finallyLoc,h):this.complete(a)},complete:function(t,e){if("throw"===t.type)throw t.arg;return"break"===t.type||"continue"===t.type?this.next=t.arg:"return"===t.type?(this.rval=this.arg=t.arg,this.method="return",this.next="end"):"normal"===t.type&&e&&(this.next=e),h},finish:function(t){for(var e=this.tryEntries.length-1;e>=0;--e){var r=this.tryEntries[e];if(r.finallyLoc===t)return this.complete(r.completion,r.afterLoc),O(r),h}},catch:function(t){for(var e=this.tryEntries.length-1;e>=0;--e){var r=this.tryEntries[e];if(r.tryLoc===t){var n=r.completion;if("throw"===n.type){var i=n.arg;O(r)}return i}}throw new Error("illegal catch attempt")},delegateYield:function(t,e,r){return this.delegate={iterator:C(t),resultName:e,nextLoc:r},"next"===this.method&&(this.arg=void 0),h}},t}function ca(t,e,r,n,i,o,a){try{var s=t[o](a),l=s.value}catch(t){return void r(t)}s.done?e(l):Promise.resolve(l).then(n,i)}function ua(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==aa(t)||null===t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var n=r.call(t,"string");if("object"!==aa(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(n.key),"symbol"===aa(i)?i:String(i)),n)}var i}var ha=function(){function t(e){var r=this,n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};if(function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,t),!(e instanceof Element))throw new Error("element should be an instance of Element");this.element=e,this.options=l({},t.defaults.options,n),this.ready=!1,this.copyClipboard=null,this.schema=this.options.schema,this.template=this.options.template,this.translate=this.options.translate||t.defaults.translate,this.translateProperty=this.options.translateProperty||t.defaults.translateProperty,this.uuid=0,this.__data={};var i=this.options.theme||t.defaults.theme,o=t.defaults.themes[i];if(!o)throw new Error("Unknown theme ".concat(i));this.element.setAttribute("data-theme",i),this.element.classList.add("je-not-loaded"),this.element.classList.remove("je-ready"),this.theme=new o(this);var a=l(oa,this.getEditorsRules()),s=function(t,e,n){return n?r.addNewStyleRulesToShadowRoot(t,e,n):r.addNewStyleRules(t,e)};if(!this.theme.options.disable_theme_rules){var c=u(this.element);s("default",a,c),void 0!==o.rules&&s(i,o.rules,c)}var h=t.defaults.iconlibs[this.options.iconlib||t.defaults.iconlib];h&&(this.iconlib=new h),this.root_container=this.theme.getContainer(),this.element.appendChild(this.root_container),this.promise=this.load()}var e,r,n,i;return e=t,r=[{key:"load",value:(n=la().mark((function e(){var r,n,i,o,a,s,l=this;return la().wrap((function(e){for(;;)switch(e.prev=e.next){case 0:return r=document.location.origin+document.location.pathname.toString(),n=new ei(this.options),this.expandSchema=function(t){return n.expandSchema(t)},this.expandRefs=function(t,e){return n.expandRefs(t,e)},i=document.location.toString(),e.next=7,n.load(this.schema,r,i);case 7:o=e.sent,a=this.options.custom_validators?{custom_validators:this.options.custom_validators}:{},this.validator=new nr(this,null,a,t.defaults),s=this.getEditorClass(o),this.root=this.createEditor(s,{jsoneditor:this,schema:o,required:!0,container:this.root_container}),this.root.preBuild(),this.root.build(),this.root.postBuild(),h(this.options,"startval")&&this.root.setValue(this.options.startval),this.validation_results=this.validator.validate(this.root.getValue()),this.root.showValidationErrors(this.validation_results),this.ready=!0,this.element.classList.remove("je-not-loaded"),this.element.classList.add("je-ready"),window.requestAnimationFrame((function(){l.ready&&(l.validation_results=l.validator.validate(l.root.getValue()),l.root.showValidationErrors(l.validation_results),l.trigger("ready"),l.trigger("change"))}));case 22:case"end":return e.stop()}}),e,this)})),i=function(){var t=this,e=arguments;return new Promise((function(r,i){var o=n.apply(t,e);function a(t){ca(o,r,i,a,s,"next",t)}function s(t){ca(o,r,i,a,s,"throw",t)}a(void 0)}))},function(){return i.apply(this,arguments)})},{key:"getValue",value:function(){if(!this.ready)throw new Error("JSON Editor not ready yet. Make sure the load method is complete");return this.root.getValue()}},{key:"setValue",value:function(t){if(!this.ready)throw new Error("JSON Editor not ready yet. Make sure the load method is complete");return this.root.setValue(t),this}},{key:"validate",value:function(t){if(!this.ready)throw new Error("JSON Editor not ready yet. Make sure the load method is complete");return 1===arguments.length?this.validator.validate(t):this.validation_results}},{key:"destroy",value:function(){this.destroyed||this.ready&&(this.schema=null,this.options=null,this.root.destroy(),this.root=null,this.root_container=null,this.validator=null,this.validation_results=null,this.theme=null,this.iconlib=null,this.template=null,this.__data=null,this.ready=!1,this.element.innerHTML="",this.element.removeAttribute("data-theme"),this.destroyed=!0)}},{key:"on",value:function(t,e){return this.callbacks=this.callbacks||{},this.callbacks[t]=this.callbacks[t]||[],this.callbacks[t].push(e),this}},{key:"off",value:function(t,e){if(t&&e){this.callbacks=this.callbacks||{},this.callbacks[t]=this.callbacks[t]||[];for(var r=[],n=0;n<this.callbacks[t].length;n++)this.callbacks[t][n]!==e&&r.push(this.callbacks[t][n]);this.callbacks[t]=r}else t?(this.callbacks=this.callbacks||{},this.callbacks[t]=[]):this.callbacks={};return this}},{key:"trigger",value:function(t,e){if(this.callbacks&&this.callbacks[t]&&this.callbacks[t].length)for(var r=0;r<this.callbacks[t].length;r++)this.callbacks[t][r].apply(this,[e]);return this}},{key:"setOption",value:function(t,e){if("show_errors"!==t)throw new Error("Option ".concat(t," must be set during instantiation and cannot be changed later"));return this.options.show_errors=e,this.onChange(),this}},{key:"getEditorsRules",value:function(){return Object.values(t.defaults.editors).reduce((function(t,e){return e.rules?l(t,e.rules):t}),{})}},{key:"getEditorClass",value:function(e){var r;if(e=this.expandSchema(e),t.defaults.resolvers.find((function(n){return(r=n(e))&&t.defaults.editors[r]})),!r)throw new Error("Unknown editor for schema ".concat(JSON.stringify(e)));if(!t.defaults.editors[r])throw new Error("Unknown editor ".concat(r));return t.defaults.editors[r]}},{key:"createEditor",value:function(e,r){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:1;return new e(r=l({},e.options||{},r),t.defaults,n)}},{key:"onChange",value:function(){var t=this;if(this.ready&&!this.firing_change)return this.firing_change=!0,window.requestAnimationFrame((function(){t.firing_change=!1,t.ready&&(t.validation_results=t.validator.validate(t.root.getValue()),"never"!==t.options.show_errors?t.root.showValidationErrors(t.validation_results):t.root.showValidationErrors([]),t.trigger("change"))})),this}},{key:"compileTemplate",value:function(e){var r,n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:t.defaults.template;if("string"==typeof n){if(!t.defaults.templates[n])throw new Error("Unknown template engine ".concat(n));if(!(r=t.defaults.templates[n]()))throw new Error("Template engine ".concat(n," missing required library."))}else r=n;if(!r)throw new Error("No template engine set");if(!r.compile)throw new Error("Invalid template engine set");return r.compile(e)}},{key:"_data",value:function(t,e,r){if(3!==arguments.length)return t.hasAttribute("data-jsoneditor-".concat(e))?this.__data[t.getAttribute("data-jsoneditor-".concat(e))]:null;var n;t.hasAttribute("data-jsoneditor-".concat(e))?n=t.getAttribute("data-jsoneditor-".concat(e)):(n=this.uuid++,t.setAttribute("data-jsoneditor-".concat(e),n)),this.__data[n]=r}},{key:"registerEditor",value:function(t){return this.editors=this.editors||{},this.editors[t.path]=t,this}},{key:"unregisterEditor",value:function(t){return this.editors=this.editors||{},this.editors[t.path]=null,this}},{key:"getEditor",value:function(t){if(this.editors)return this.editors[t]}},{key:"watch",value:function(t,e){return this.watchlist=this.watchlist||{},this.watchlist[t]=this.watchlist[t]||[],this.watchlist[t].push(e),this}},{key:"unwatch",value:function(t,e){if(!this.watchlist||!this.watchlist[t])return this;if(!e)return this.watchlist[t]=null,this;for(var r=[],n=0;n<this.watchlist[t].length;n++)this.watchlist[t][n]!==e&&r.push(this.watchlist[t][n]);return this.watchlist[t]=r.length?r:null,this}},{key:"notifyWatchers",value:function(t){if(!this.watchlist||!this.watchlist[t])return this;for(var e=0;e<this.watchlist[t].length;e++)this.watchlist[t][e]()}},{key:"isEnabled",value:function(){return!this.root||this.root.isEnabled()}},{key:"enable",value:function(){this.root.enable()}},{key:"disable",value:function(){this.root.disable()}},{key:"setCopyClipboardContents",value:function(t){this.copyClipboard=t}},{key:"getCopyClipboardContents",value:function(){return this.copyClipboard}},{key:"addNewStyleRules",value:function(t,e){var r=document.querySelector("#theme-".concat(t));r||((r=document.createElement("style")).setAttribute("id","theme-".concat(t)),r.appendChild(document.createTextNode("")),document.head.appendChild(r));for(var n=r.sheet?r.sheet:r.styleSheet,i=this.element.nodeName.toLowerCase();n.cssRules.length>0;)n.deleteRule(0);Object.keys(e).forEach((function(r){var o="default"===t?r:"".concat(i,'[data-theme="').concat(t,'"] ').concat(r);n.insertRule?n.insertRule(o+" {"+decodeURIComponent(e[r])+"}",0):n.addRule&&n.addRule(o,decodeURIComponent(e[r]),0)}))}},{key:"addNewStyleRulesToShadowRoot",value:function(t,e,r){var n=this.element.nodeName.toLowerCase(),i="";Object.keys(e).forEach((function(r){var o="default"===t?r:"".concat(n,'[data-theme="').concat(t,'"] ').concat(r);i+=o+" {"+decodeURIComponent(e[r])+"}\n"}));var o,a=new CSSStyleSheet;a.replaceSync(i),r.adoptedStyleSheets=[].concat(function(t){if(Array.isArray(t))return sa(t)}(o=r.adoptedStyleSheets)||function(t){if("undefined"!=typeof Symbol&&null!=t[Symbol.iterator]||null!=t["@@iterator"])return Array.from(t)}(o)||function(t,e){if(t){if("string"==typeof t)return sa(t,e);var r=Object.prototype.toString.call(t).slice(8,-1);return"Object"===r&&t.constructor&&(r=t.constructor.name),"Map"===r||"Set"===r?Array.from(t):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?sa(t,e):void 0}}(o)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}(),[a])}}],r&&ua(e.prototype,r),Object.defineProperty(e,"prototype",{writable:!1}),t}();ha.defaults=Jn,ha.AbstractEditor=w,ha.AbstractTheme=oo,ha.AbstractIconLib=si,Object.assign(ha.defaults.themes,ia),Object.assign(ha.defaults.editors,Mn),Object.assign(ha.defaults.templates,ri),Object.assign(ha.defaults.iconlibs,eo)})(),n})()));
\ No newline at end of file
diff --git a/public/javascripts/@json-editor/json-editor/2.6.1/jsoneditor.js b/public/javascripts/@json-editor/json-editor/2.6.1/jsoneditor.js
deleted file mode 100644
index 0356beae888..00000000000
--- a/public/javascripts/@json-editor/json-editor/2.6.1/jsoneditor.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/*!
- * /**
- * * @name JSON Editor
- * * @description JSON Schema Based Editor
- * * This library is the continuation of jdorn's great work (see also https://github.com/jdorn/json-editor/issues/800)
- * * @version "2.6.1"
- * * @author Jeremy Dorn
- * * @see https://github.com/jdorn/json-editor/
- * * @see https://github.com/json-editor/json-editor
- * * @license MIT
- * * @example see README.md and docs/ for requirements, examples and usage info
- * * /
- */
-!function(t,e){if("object"==typeof exports&&"object"==typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var n=e();for(var r in n)("object"==typeof exports?exports:t)[r]=n[r]}}(window,(function(){return function(t){var e={};function n(r){if(e[r])return e[r].exports;var i=e[r]={i:r,l:!1,exports:{}};return t[r].call(i.exports,i,i.exports,n),i.l=!0,i.exports}return n.m=t,n.c=e,n.d=function(t,e,r){n.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:r})},n.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},n.t=function(t,e){if(1&e&&(t=n(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var i in t)n.d(r,i,function(e){return t[e]}.bind(null,i));return r},n.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(e,"a",e),e},n.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},n.p="/dist/",n(n.s=168)}([function(t,e,n){var r=n(33),i=n(96),o=n(70),a=n(62),s=n(124),l=a.set,c=a.getterFor("Array Iterator");t.exports=s(Array,"Array",(function(t,e){l(this,{type:"Array Iterator",target:r(t),index:0,kind:e})}),(function(){var t=c(this),e=t.target,n=t.kind,r=t.index++;return!e||r>=e.length?(t.target=void 0,{value:void 0,done:!0}):"keys"==n?{value:r,done:!1}:"values"==n?{value:e[r],done:!1}:{value:[r,e[r]],done:!1}}),"values"),o.Arguments=o.Array,i("keys"),i("values"),i("entries")},function(t,e,n){var r=n(87),i=n(43),o=n(141);r||i(Object.prototype,"toString",o,{unsafe:!0})},function(t,e,n){var r=n(12),i=n(19),o=n(53),a=n(63),s=n(21),l=n(88),c=n(112),u=n(15),h=n(28),p=n(67),d=n(26),f=n(23),y=n(30),m=n(33),v=n(60),b=n(61),g=n(56),_=n(66),w=n(65),k=n(147),x=n(93),j=n(47),O=n(27),C=n(77),E=n(36),S=n(43),P=n(74),R=n(73),L=n(75),T=n(86),A=n(17),I=n(122),B=n(123),N=n(97),F=n(62),V=n(51).forEach,D=R("hidden"),H=A("toPrimitive"),z=F.set,M=F.getterFor("Symbol"),q=Object.prototype,U=i.Symbol,G=o("JSON","stringify"),$=j.f,J=O.f,W=k.f,Z=C.f,Q=P("symbols"),Y=P("op-symbols"),X=P("string-to-symbol-registry"),K=P("symbol-to-string-registry"),tt=P("wks"),et=i.QObject,nt=!et||!et.prototype||!et.prototype.findChild,rt=s&&u((function(){return 7!=g(J({},"a",{get:function(){return J(this,"a",{value:7}).a}})).a}))?function(t,e,n){var r=$(q,e);r&&delete q[e],J(t,e,n),r&&t!==q&&J(q,e,r)}:J,it=function(t,e){var n=Q[t]=g(U.prototype);return z(n,{type:"Symbol",tag:t,description:e}),s||(n.description=e),n},ot=c?function(t){return"symbol"==typeof t}:function(t){return Object(t)instanceof U},at=function(t,e,n){t===q&&at(Y,e,n),f(t);var r=v(e,!0);return f(n),h(Q,r)?(n.enumerable?(h(t,D)&&t[D][r]&&(t[D][r]=!1),n=g(n,{enumerable:b(0,!1)})):(h(t,D)||J(t,D,b(1,{})),t[D][r]=!0),rt(t,r,n)):J(t,r,n)},st=function(t,e){f(t);var n=m(e),r=_(n).concat(ht(n));return V(r,(function(e){s&&!lt.call(n,e)||at(t,e,n[e])})),t},lt=function(t){var e=v(t,!0),n=Z.call(this,e);return!(this===q&&h(Q,e)&&!h(Y,e))&&(!(n||!h(this,e)||!h(Q,e)||h(this,D)&&this[D][e])||n)},ct=function(t,e){var n=m(t),r=v(e,!0);if(n!==q||!h(Q,r)||h(Y,r)){var i=$(n,r);return!i||!h(Q,r)||h(n,D)&&n[D][r]||(i.enumerable=!0),i}},ut=function(t){var e=W(m(t)),n=[];return V(e,(function(t){h(Q,t)||h(L,t)||n.push(t)})),n},ht=function(t){var e=t===q,n=W(e?Y:m(t)),r=[];return V(n,(function(t){!h(Q,t)||e&&!h(q,t)||r.push(Q[t])})),r};(l||(S((U=function(){if(this instanceof U)throw TypeError("Symbol is not a constructor");var t=arguments.length&&void 0!==arguments[0]?String(arguments[0]):void 0,e=T(t),n=function(t){this===q&&n.call(Y,t),h(this,D)&&h(this[D],e)&&(this[D][e]=!1),rt(this,e,b(1,t))};return s&&nt&&rt(q,e,{configurable:!0,set:n}),it(e,t)}).prototype,"toString",(function(){return M(this).tag})),S(U,"withoutSetter",(function(t){return it(T(t),t)})),C.f=lt,O.f=at,j.f=ct,w.f=k.f=ut,x.f=ht,I.f=function(t){return it(A(t),t)},s&&(J(U.prototype,"description",{configurable:!0,get:function(){return M(this).description}}),a||S(q,"propertyIsEnumerable",lt,{unsafe:!0}))),r({global:!0,wrap:!0,forced:!l,sham:!l},{Symbol:U}),V(_(tt),(function(t){B(t)})),r({target:"Symbol",stat:!0,forced:!l},{for:function(t){var e=String(t);if(h(X,e))return X[e];var n=U(e);return X[e]=n,K[n]=e,n},keyFor:function(t){if(!ot(t))throw TypeError(t+" is not a symbol");if(h(K,t))return K[t]},useSetter:function(){nt=!0},useSimple:function(){nt=!1}}),r({target:"Object",stat:!0,forced:!l,sham:!s},{create:function(t,e){return void 0===e?g(t):st(g(t),e)},defineProperty:at,defineProperties:st,getOwnPropertyDescriptor:ct}),r({target:"Object",stat:!0,forced:!l},{getOwnPropertyNames:ut,getOwnPropertySymbols:ht}),r({target:"Object",stat:!0,forced:u((function(){x.f(1)}))},{getOwnPropertySymbols:function(t){return x.f(y(t))}}),G)&&r({target:"JSON",stat:!0,forced:!l||u((function(){var t=U();return"[null]"!=G([t])||"{}"!=G({a:t})||"{}"!=G(Object(t))}))},{stringify:function(t,e,n){for(var r,i=[t],o=1;arguments.length>o;)i.push(arguments[o++]);if(r=e,(d(e)||void 0!==t)&&!ot(t))return p(e)||(e=function(t,e){if("function"==typeof r&&(e=r.call(this,t,e)),!ot(e))return e}),i[1]=e,G.apply(null,i)}});U.prototype[H]||E(U.prototype,H,U.prototype.valueOf),N(U,"Symbol"),L[D]=!0},function(t,e,n){var r=n(12),i=n(21),o=n(19),a=n(28),s=n(26),l=n(27).f,c=n(114),u=o.Symbol;if(i&&"function"==typeof u&&(!("description"in u.prototype)||void 0!==u().description)){var h={},p=function(){var t=arguments.length<1||void 0===arguments[0]?void 0:String(arguments[0]),e=this instanceof p?new u(t):void 0===t?u():u(t);return""===t&&(h[e]=!0),e};c(p,u);var d=p.prototype=u.prototype;d.constructor=p;var f=d.toString,y="Symbol(test)"==String(u("test")),m=/^Symbol\((.*)\)[^)]+$/;l(d,"description",{configurable:!0,get:function(){var t=s(this)?this.valueOf():this,e=f.call(t);if(a(h,t))return"";var n=y?e.slice(7,-1):e.replace(m,"$1");return""===n?void 0:n}}),r({global:!0,forced:!0},{Symbol:p})}},function(t,e,n){n(123)("iterator")},function(t,e,n){var r=n(127).charAt,i=n(62),o=n(124),a=i.set,s=i.getterFor("String Iterator");o(String,"String",(function(t){a(this,{type:"String Iterator",string:String(t),index:0})}),(function(){var t,e=s(this),n=e.string,i=e.index;return i>=n.length?{value:void 0,done:!0}:(t=r(n,i),e.index+=t.length,{value:t,done:!1})}))},function(t,e,n){var r=n(19),i=n(121),o=n(0),a=n(36),s=n(17),l=s("iterator"),c=s("toStringTag"),u=o.values;for(var h in i){var p=r[h],d=p&&p.prototype;if(d){if(d[l]!==u)try{a(d,l,u)}catch(t){d[l]=u}if(d[c]||a(d,c,h),i[h])for(var f in o)if(d[f]!==o[f])try{a(d,f,o[f])}catch(t){d[f]=o[f]}}}},function(t,e,n){n(12)({target:"Object",stat:!0},{setPrototypeOf:n(98)})},function(t,e,n){var r=n(12),i=n(15),o=n(30),a=n(79),s=n(126);r({target:"Object",stat:!0,forced:i((function(){a(1)})),sham:!s},{getPrototypeOf:function(t){return a(o(t))}})},function(t,e,n){var r=n(12),i=n(53),o=n(54),a=n(23),s=n(26),l=n(56),c=n(133),u=n(15),h=i("Reflect","construct"),p=u((function(){function t(){}return!(h((function(){}),[],t)instanceof t)})),d=!u((function(){h((function(){}))})),f=p||d;r({target:"Reflect",stat:!0,forced:f,sham:f},{construct:function(t,e){o(t),a(e);var n=arguments.length<3?t:o(arguments[2]);if(d&&!p)return h(t,e,n);if(t==n){switch(e.length){case 0:return new t;case 1:return new t(e[0]);case 2:return new t(e[0],e[1]);case 3:return new t(e[0],e[1],e[2]);case 4:return new t(e[0],e[1],e[2],e[3])}var r=[null];return r.push.apply(r,e),new(c.apply(t,r))}var i=n.prototype,u=l(s(i)?i:Object.prototype),f=Function.apply.call(t,u,e);return s(f)?f:u}})},function(t,e,n){n(12)({target:"Object",stat:!0,sham:!n(21)},{create:n(56)})},function(t,e,n){var r=n(12),i=n(21);r({target:"Object",stat:!0,forced:!i,sham:!i},{defineProperty:n(27).f})},function(t,e,n){var r=n(19),i=n(47).f,o=n(36),a=n(43),s=n(84),l=n(114),c=n(94);t.exports=function(t,e){var n,u,h,p,d,f=t.target,y=t.global,m=t.stat;if(n=y?r:m?r[f]||s(f,{}):(r[f]||{}).prototype)for(u in e){if(p=e[u],h=t.noTargetGet?(d=i(n,u))&&d.value:n[u],!c(y?u:f+(m?".":"#")+u,t.forced)&&void 0!==h){if(typeof p==typeof h)continue;l(p,h)}(t.sham||h&&h.sham)&&o(p,"sham",!0),a(n,u,p,t)}}},function(t,e,n){var r=n(12),i=n(15),o=n(33),a=n(47).f,s=n(21),l=i((function(){a(1)}));r({target:"Object",stat:!0,forced:!s||l,sham:!s},{getOwnPropertyDescriptor:function(t,e){return a(o(t),e)}})},function(t,e,n){var r=n(12),i=n(26),o=n(23),a=n(28),s=n(47),l=n(79);r({target:"Reflect",stat:!0},{get:function t(e,n){var r,c,u=arguments.length<3?e:arguments[2];return o(e)===u?e[n]:(r=s.f(e,n))?a(r,"value")?r.value:void 0===r.get?void 0:r.get.call(u):i(c=l(e))?t(c,n,u):void 0}})},function(t,e){t.exports=function(t){try{return!!t()}catch(t){return!0}}},function(t,e,n){var r=n(12),i=n(15),o=n(67),a=n(26),s=n(30),l=n(34),c=n(68),u=n(95),h=n(69),p=n(17),d=n(76),f=p("isConcatSpreadable"),y=d>=51||!i((function(){var t=[];return t[f]=!1,t.concat()[0]!==t})),m=h("concat"),v=function(t){if(!a(t))return!1;var e=t[f];return void 0!==e?!!e:o(t)};r({target:"Array",proto:!0,forced:!y||!m},{concat:function(t){var e,n,r,i,o,a=s(this),h=u(a,0),p=0;for(e=-1,r=arguments.length;e<r;e++)if(v(o=-1===e?a:arguments[e])){if(p+(i=l(o.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(n=0;n<i;n++,p++)n in o&&c(h,p,o[n])}else{if(p>=9007199254740991)throw TypeError("Maximum allowed index exceeded");c(h,p++,o)}return h.length=p,h}})},function(t,e,n){var r=n(19),i=n(74),o=n(28),a=n(86),s=n(88),l=n(112),c=i("wks"),u=r.Symbol,h=l?u:u&&u.withoutSetter||a;t.exports=function(t){return o(c,t)&&(s||"string"==typeof c[t])||(s&&o(u,t)?c[t]=u[t]:c[t]=h("Symbol."+t)),c[t]}},function(t,e,n){var r=n(12),i=n(120);r({target:"Array",proto:!0,forced:[].forEach!=i},{forEach:i})},function(t,e,n){(function(e){var n=function(t){return t&&t.Math==Math&&t};t.exports=n("object"==typeof globalThis&&globalThis)||n("object"==typeof window&&window)||n("object"==typeof self&&self)||n("object"==typeof e&&e)||function(){return this}()||Function("return this")()}).call(this,n(139))},function(t,e,n){var r=n(19),i=n(121),o=n(120),a=n(36);for(var s in i){var l=r[s],c=l&&l.prototype;if(c&&c.forEach!==o)try{a(c,"forEach",o)}catch(t){c.forEach=o}}},function(t,e,n){var r=n(15);t.exports=!r((function(){return 7!=Object.defineProperty({},1,{get:function(){return 7}})[1]}))},function(t,e,n){var r=n(12),i=n(80);r({target:"RegExp",proto:!0,forced:/./.exec!==i},{exec:i})},function(t,e,n){var r=n(26);t.exports=function(t){if(!r(t))throw TypeError(String(t)+" is not an object");return t}},function(t,e,n){n(12)({target:"Array",stat:!0},{isArray:n(67)})},function(t,e,n){var r=n(12),i=n(90).includes,o=n(96);r({target:"Array",proto:!0},{includes:function(t){return i(this,t,arguments.length>1?arguments[1]:void 0)}}),o("includes")},function(t,e){t.exports=function(t){return"object"==typeof t?null!==t:"function"==typeof t}},function(t,e,n){var r=n(21),i=n(107),o=n(23),a=n(60),s=Object.defineProperty;e.f=r?s:function(t,e,n){if(o(t),e=a(e,!0),o(n),i)try{return s(t,e,n)}catch(t){}if("get"in n||"set"in n)throw TypeError("Accessors not supported");return"value"in n&&(t[e]=n.value),t}},function(t,e,n){var r=n(30),i={}.hasOwnProperty;t.exports=function(t,e){return i.call(r(t),e)}},function(t,e,n){var r=n(12),i=n(26),o=n(67),a=n(91),s=n(34),l=n(33),c=n(68),u=n(17),h=n(69)("slice"),p=u("species"),d=[].slice,f=Math.max;r({target:"Array",proto:!0,forced:!h},{slice:function(t,e){var n,r,u,h=l(this),y=s(h.length),m=a(t,y),v=a(void 0===e?y:e,y);if(o(h)&&("function"!=typeof(n=h.constructor)||n!==Array&&!o(n.prototype)?i(n)&&null===(n=n[p])&&(n=void 0):n=void 0,n===Array||void 0===n))return d.call(h,m,v);for(r=new(void 0===n?Array:n)(f(v-m,0)),u=0;m<v;m++,u++)m in h&&c(r,u,h[m]);return r.length=u,r}})},function(t,e,n){var r=n(37);t.exports=function(t){return Object(r(t))}},function(t,e,n){var r=n(21),i=n(27).f,o=Function.prototype,a=o.toString,s=/^\s*function ([^ (]*)/;r&&!("name"in o)&&i(o,"name",{configurable:!0,get:function(){try{return a.call(this).match(s)[1]}catch(t){return""}}})},function(t,e,n){var r=n(12),i=n(131),o=n(37);r({target:"String",proto:!0,forced:!n(132)("includes")},{includes:function(t){return!!~String(o(this)).indexOf(i(t),arguments.length>1?arguments[1]:void 0)}})},function(t,e,n){var r=n(64),i=n(37);t.exports=function(t){return r(i(t))}},function(t,e,n){var r=n(49),i=Math.min;t.exports=function(t){return t>0?i(r(t),9007199254740991):0}},function(t,e,n){var r=n(12),i=n(150);r({target:"Array",stat:!0,forced:!n(155)((function(t){Array.from(t)}))},{from:i})},function(t,e,n){var r=n(21),i=n(27),o=n(61);t.exports=r?function(t,e,n){return i.f(t,e,o(1,n))}:function(t,e,n){return t[e]=n,t}},function(t,e){t.exports=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t}},function(t,e,n){var r=n(43),i=n(23),o=n(15),a=n(89),s=RegExp.prototype,l=s.toString,c=o((function(){return"/a/b"!=l.call({source:"a",flags:"b"})})),u="toString"!=l.name;(c||u)&&r(RegExp.prototype,"toString",(function(){var t=i(this),e=String(t.source),n=t.flags;return"/"+e+"/"+String(void 0===n&&t instanceof RegExp&&!("flags"in s)?a.call(t):n)}),{unsafe:!0})},function(t,e,n){var r=n(12),i=n(142).left,o=n(50),a=n(76),s=n(143);r({target:"Array",proto:!0,forced:!o("reduce")||!s&&a>79&&a<83},{reduce:function(t){return i(this,t,arguments.length,arguments.length>1?arguments[1]:void 0)}})},function(t,e,n){var r=n(12),i=n(30),o=n(66);r({target:"Object",stat:!0,forced:n(15)((function(){o(1)}))},{keys:function(t){return o(i(t))}})},function(t,e,n){var r=n(100),i=n(23),o=n(34),a=n(49),s=n(37),l=n(101),c=n(156),u=n(102),h=Math.max,p=Math.min;r("replace",2,(function(t,e,n,r){var d=r.REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE,f=r.REPLACE_KEEPS_$0,y=d?"$":"$0";return[function(n,r){var i=s(this),o=null==n?void 0:n[t];return void 0!==o?o.call(n,i,r):e.call(String(i),n,r)},function(t,r){if(!d&&f||"string"==typeof r&&-1===r.indexOf(y)){var s=n(e,t,this,r);if(s.done)return s.value}var m=i(t),v=String(this),b="function"==typeof r;b||(r=String(r));var g=m.global;if(g){var _=m.unicode;m.lastIndex=0}for(var w=[];;){var k=u(m,v);if(null===k)break;if(w.push(k),!g)break;""===String(k[0])&&(m.lastIndex=l(v,o(m.lastIndex),_))}for(var x,j="",O=0,C=0;C<w.length;C++){k=w[C];for(var E=String(k[0]),S=h(p(a(k.index),v.length),0),P=[],R=1;R<k.length;R++)P.push(void 0===(x=k[R])?x:String(x));var L=k.groups;if(b){var T=[E].concat(P,S,v);void 0!==L&&T.push(L);var A=String(r.apply(void 0,T))}else A=c(E,v,S,P,L,r);S>=O&&(j+=v.slice(O,S)+A,O=S+E.length)}return j+v.slice(O)}]}))},function(t,e,n){var r=n(12),i=n(51).map;r({target:"Array",proto:!0,forced:!n(69)("map")},{map:function(t){return i(this,t,arguments.length>1?arguments[1]:void 0)}})},function(t,e,n){var r=n(19),i=n(36),o=n(28),a=n(84),s=n(109),l=n(62),c=l.get,u=l.enforce,h=String(String).split("String");(t.exports=function(t,e,n,s){var l,c=!!s&&!!s.unsafe,p=!!s&&!!s.enumerable,d=!!s&&!!s.noTargetGet;"function"==typeof n&&("string"!=typeof e||o(n,"name")||i(n,"name",e),(l=u(n)).source||(l.source=h.join("string"==typeof e?e:""))),t!==r?(c?!d&&t[e]&&(p=!0):delete t[e],p?t[e]=n:i(t,e,n)):p?t[e]=n:a(e,n)})(Function.prototype,"toString",(function(){return"function"==typeof this&&c(this).source||s(this)}))},function(t,e,n){var r=n(100),i=n(23),o=n(34),a=n(37),s=n(101),l=n(102);r("match",1,(function(t,e,n){return[function(e){var n=a(this),r=null==e?void 0:e[t];return void 0!==r?r.call(e,n):new RegExp(e)[t](String(n))},function(t){var r=n(e,t,this);if(r.done)return r.value;var a=i(t),c=String(this);if(!a.global)return l(a,c);var u=a.unicode;a.lastIndex=0;for(var h,p=[],d=0;null!==(h=l(a,c));){var f=String(h[0]);p[d]=f,""===f&&(a.lastIndex=s(c,o(a.lastIndex),u)),d++}return 0===d?null:p}]}))},function(t,e,n){var r=n(43),i=Date.prototype,o=i.toString,a=i.getTime;new Date(NaN)+""!="Invalid Date"&&r(i,"toString",(function(){var t=a.call(this);return t==t?o.call(this):"Invalid Date"}))},function(t,e){var n={}.toString;t.exports=function(t){return n.call(t).slice(8,-1)}},function(t,e,n){var r=n(21),i=n(77),o=n(61),a=n(33),s=n(60),l=n(28),c=n(107),u=Object.getOwnPropertyDescriptor;e.f=r?u:function(t,e){if(t=a(t),e=s(e,!0),c)try{return u(t,e)}catch(t){}if(l(t,e))return o(!i.f.call(t,e),t[e])}},function(t,e,n){var r=n(12),i=n(64),o=n(33),a=n(50),s=[].join,l=i!=Object,c=a("join",",");r({target:"Array",proto:!0,forced:l||!c},{join:function(t){return s.call(o(this),void 0===t?",":t)}})},function(t,e){var n=Math.ceil,r=Math.floor;t.exports=function(t){return isNaN(t=+t)?0:(t>0?r:n)(t)}},function(t,e,n){var r=n(15);t.exports=function(t,e){var n=[][t];return!!n&&r((function(){n.call(null,e||function(){throw 1},1)}))}},function(t,e,n){var r=n(118),i=n(64),o=n(30),a=n(34),s=n(95),l=[].push,c=function(t){var e=1==t,n=2==t,c=3==t,u=4==t,h=6==t,p=7==t,d=5==t||h;return function(f,y,m,v){for(var b,g,_=o(f),w=i(_),k=r(y,m,3),x=a(w.length),j=0,O=v||s,C=e?O(f,x):n||p?O(f,0):void 0;x>j;j++)if((d||j in w)&&(g=k(b=w[j],j,_),t))if(e)C[j]=g;else if(g)switch(t){case 3:return!0;case 5:return b;case 6:return j;case 2:l.call(C,b)}else switch(t){case 4:return!1;case 7:l.call(C,b)}return h?-1:c||u?u:C}};t.exports={forEach:c(0),map:c(1),filter:c(2),some:c(3),every:c(4),find:c(5),findIndex:c(6),filterOut:c(7)}},function(t,e,n){var r=n(100),i=n(103),o=n(23),a=n(37),s=n(160),l=n(101),c=n(34),u=n(102),h=n(80),p=n(99).UNSUPPORTED_Y,d=[].push,f=Math.min;r("split",2,(function(t,e,n){var r;return r="c"=="abbc".split(/(b)*/)[1]||4!="test".split(/(?:)/,-1).length||2!="ab".split(/(?:ab)*/).length||4!=".".split(/(.?)(.?)/).length||".".split(/()()/).length>1||"".split(/.?/).length?function(t,n){var r=String(a(this)),o=void 0===n?4294967295:n>>>0;if(0===o)return[];if(void 0===t)return[r];if(!i(t))return e.call(r,t,o);for(var s,l,c,u=[],p=(t.ignoreCase?"i":"")+(t.multiline?"m":"")+(t.unicode?"u":"")+(t.sticky?"y":""),f=0,y=new RegExp(t.source,p+"g");(s=h.call(y,r))&&!((l=y.lastIndex)>f&&(u.push(r.slice(f,s.index)),s.length>1&&s.index<r.length&&d.apply(u,s.slice(1)),c=s[0].length,f=l,u.length>=o));)y.lastIndex===s.index&&y.lastIndex++;return f===r.length?!c&&y.test("")||u.push(""):u.push(r.slice(f)),u.length>o?u.slice(0,o):u}:"0".split(void 0,0).length?function(t,n){return void 0===t&&0===n?[]:e.call(this,t,n)}:e,[function(e,n){var i=a(this),o=null==e?void 0:e[t];return void 0!==o?o.call(e,i,n):r.call(String(i),e,n)},function(t,i){var a=n(r,t,this,i,r!==e);if(a.done)return a.value;var h=o(t),d=String(this),y=s(h,RegExp),m=h.unicode,v=(h.ignoreCase?"i":"")+(h.multiline?"m":"")+(h.unicode?"u":"")+(p?"g":"y"),b=new y(p?"^(?:"+h.source+")":h,v),g=void 0===i?4294967295:i>>>0;if(0===g)return[];if(0===d.length)return null===u(b,d)?[d]:[];for(var _=0,w=0,k=[];w<d.length;){b.lastIndex=p?0:w;var x,j=u(b,p?d.slice(w):d);if(null===j||(x=f(c(b.lastIndex+(p?w:0)),d.length))===_)w=l(d,w,m);else{if(k.push(d.slice(_,w)),k.length===g)return k;for(var O=1;O<=j.length-1;O++)if(k.push(j[O]),k.length===g)return k;w=_=x}}return k.push(d.slice(_)),k}]}),p)},function(t,e,n){var r=n(111),i=n(19),o=function(t){return"function"==typeof t?t:void 0};t.exports=function(t,e){return arguments.length<2?o(r[t])||o(i[t]):r[t]&&r[t][e]||i[t]&&i[t][e]}},function(t,e){t.exports=function(t){if("function"!=typeof t)throw TypeError(String(t)+" is not a function");return t}},function(t,e,n){var r=n(12),i=n(117).values;r({target:"Object",stat:!0},{values:function(t){return i(t)}})},function(t,e,n){var r,i=n(23),o=n(119),a=n(92),s=n(75),l=n(144),c=n(108),u=n(73),h=u("IE_PROTO"),p=function(){},d=function(t){return"<script>"+t+"<\/script>"},f=function(){try{r=document.domain&&new ActiveXObject("htmlfile")}catch(t){}var t,e;f=r?function(t){t.write(d("")),t.close();var e=t.parentWindow.Object;return t=null,e}(r):((e=c("iframe")).style.display="none",l.appendChild(e),e.src=String("javascript:"),(t=e.contentWindow.document).open(),t.write(d("document.F=Object")),t.close(),t.F);for(var n=a.length;n--;)delete f.prototype[a[n]];return f()};s[h]=!0,t.exports=Object.create||function(t,e){var n;return null!==t?(p.prototype=i(t),n=new p,p.prototype=null,n[h]=t):n=f(),void 0===e?n:o(n,e)}},function(t,e,n){var r=n(12),i=n(117).entries;r({target:"Object",stat:!0},{entries:function(t){return i(t)}})},function(t,e,n){var r=n(21),i=n(19),o=n(94),a=n(128),s=n(27).f,l=n(65).f,c=n(103),u=n(89),h=n(99),p=n(43),d=n(15),f=n(62).enforce,y=n(157),m=n(17)("match"),v=i.RegExp,b=v.prototype,g=/a/g,_=/a/g,w=new v(g)!==g,k=h.UNSUPPORTED_Y;if(r&&o("RegExp",!w||k||d((function(){return _[m]=!1,v(g)!=g||v(_)==_||"/a/i"!=v(g,"i")})))){for(var x=function(t,e){var n,r=this instanceof x,i=c(t),o=void 0===e;if(!r&&i&&t.constructor===x&&o)return t;w?i&&!o&&(t=t.source):t instanceof x&&(o&&(e=u.call(t)),t=t.source),k&&(n=!!e&&e.indexOf("y")>-1)&&(e=e.replace(/y/g,""));var s=a(w?new v(t,e):v(t,e),r?this:b,x);k&&n&&(f(s).sticky=!0);return s},j=function(t){t in x||s(x,t,{configurable:!0,get:function(){return v[t]},set:function(e){v[t]=e}})},O=l(v),C=0;O.length>C;)j(O[C++]);b.constructor=x,x.prototype=b,p(i,"RegExp",x)}y("RegExp")},function(t,e,n){var r=n(12),i=n(51).filter;r({target:"Array",proto:!0,forced:!n(69)("filter")},{filter:function(t){return i(this,t,arguments.length>1?arguments[1]:void 0)}})},function(t,e,n){var r=n(26);t.exports=function(t,e){if(!r(t))return t;var n,i;if(e&&"function"==typeof(n=t.toString)&&!r(i=n.call(t)))return i;if("function"==typeof(n=t.valueOf)&&!r(i=n.call(t)))return i;if(!e&&"function"==typeof(n=t.toString)&&!r(i=n.call(t)))return i;throw TypeError("Can't convert object to primitive value")}},function(t,e){t.exports=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}}},function(t,e,n){var r,i,o,a=n(140),s=n(19),l=n(26),c=n(36),u=n(28),h=n(85),p=n(73),d=n(75),f=s.WeakMap;if(a||h.state){var y=h.state||(h.state=new f),m=y.get,v=y.has,b=y.set;r=function(t,e){if(v.call(y,t))throw new TypeError("Object already initialized");return e.facade=t,b.call(y,t,e),e},i=function(t){return m.call(y,t)||{}},o=function(t){return v.call(y,t)}}else{var g=p("state");d[g]=!0,r=function(t,e){if(u(t,g))throw new TypeError("Object already initialized");return e.facade=t,c(t,g,e),e},i=function(t){return u(t,g)?t[g]:{}},o=function(t){return u(t,g)}}t.exports={set:r,get:i,has:o,enforce:function(t){return o(t)?i(t):r(t,{})},getterFor:function(t){return function(e){var n;if(!l(e)||(n=i(e)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return n}}}},function(t,e){t.exports=!1},function(t,e,n){var r=n(15),i=n(46),o="".split;t.exports=r((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==i(t)?o.call(t,""):Object(t)}:Object},function(t,e,n){var r=n(116),i=n(92).concat("length","prototype");e.f=Object.getOwnPropertyNames||function(t){return r(t,i)}},function(t,e,n){var r=n(116),i=n(92);t.exports=Object.keys||function(t){return r(t,i)}},function(t,e,n){var r=n(46);t.exports=Array.isArray||function(t){return"Array"==r(t)}},function(t,e,n){var r=n(60),i=n(27),o=n(61);t.exports=function(t,e,n){var a=r(e);a in t?i.f(t,a,o(0,n)):t[a]=n}},function(t,e,n){var r=n(15),i=n(17),o=n(76),a=i("species");t.exports=function(t){return o>=51||!r((function(){var e=[];return(e.constructor={})[a]=function(){return{foo:1}},1!==e[t](Boolean).foo}))}},function(t,e){t.exports={}},function(t,e,n){var r=n(12),i=n(159);r({global:!0,forced:parseInt!=i},{parseInt:i})},function(t,e,n){var r=n(12),i=n(90).indexOf,o=n(50),a=[].indexOf,s=!!a&&1/[1].indexOf(1,-0)<0,l=o("indexOf");r({target:"Array",proto:!0,forced:s||!l},{indexOf:function(t){return s?a.apply(this,arguments)||0:i(this,t,arguments.length>1?arguments[1]:void 0)}})},function(t,e,n){var r=n(74),i=n(86),o=r("keys");t.exports=function(t){return o[t]||(o[t]=i(t))}},function(t,e,n){var r=n(63),i=n(85);(t.exports=function(t,e){return i[t]||(i[t]=void 0!==e?e:{})})("versions",[]).push({version:"3.12.1",mode:r?"pure":"global",copyright:"© 2021 Denis Pushkarev (zloirock.ru)"})},function(t,e){t.exports={}},function(t,e,n){var r,i,o=n(19),a=n(110),s=o.process,l=s&&s.versions,c=l&&l.v8;c?i=(r=c.split("."))[0]<4?1:r[0]+r[1]:a&&(!(r=a.match(/Edge\/(\d+)/))||r[1]>=74)&&(r=a.match(/Chrome\/(\d+)/))&&(i=r[1]),t.exports=i&&+i},function(t,e,n){var r={}.propertyIsEnumerable,i=Object.getOwnPropertyDescriptor,o=i&&!r.call({1:2},1);e.f=o?function(t){var e=i(this,t);return!!e&&e.enumerable}:r},function(t,e,n){var r=n(12),i=n(51).find,o=n(96),a=!0;"find"in[]&&Array(1).find((function(){a=!1})),r({target:"Array",proto:!0,forced:a},{find:function(t){return i(this,t,arguments.length>1?arguments[1]:void 0)}}),o("find")},function(t,e,n){var r=n(28),i=n(30),o=n(73),a=n(126),s=o("IE_PROTO"),l=Object.prototype;t.exports=a?Object.getPrototypeOf:function(t){return t=i(t),r(t,s)?t[s]:"function"==typeof t.constructor&&t instanceof t.constructor?t.constructor.prototype:t instanceof Object?l:null}},function(t,e,n){var r,i,o=n(89),a=n(99),s=n(74),l=RegExp.prototype.exec,c=s("native-string-replace",String.prototype.replace),u=l,h=(r=/a/,i=/b*/g,l.call(r,"a"),l.call(i,"a"),0!==r.lastIndex||0!==i.lastIndex),p=a.UNSUPPORTED_Y||a.BROKEN_CARET,d=void 0!==/()??/.exec("")[1];(h||d||p)&&(u=function(t){var e,n,r,i,a=this,s=p&&a.sticky,u=o.call(a),f=a.source,y=0,m=t;return s&&(-1===(u=u.replace("y","")).indexOf("g")&&(u+="g"),m=String(t).slice(a.lastIndex),a.lastIndex>0&&(!a.multiline||a.multiline&&"\n"!==t[a.lastIndex-1])&&(f="(?: "+f+")",m=" "+m,y++),n=new RegExp("^(?:"+f+")",u)),d&&(n=new RegExp("^"+f+"$(?!\\s)",u)),h&&(e=a.lastIndex),r=l.call(s?n:a,m),s?r?(r.input=r.input.slice(y),r[0]=r[0].slice(y),r.index=a.lastIndex,a.lastIndex+=r[0].length):a.lastIndex=0:h&&r&&(a.lastIndex=a.global?r.index+r[0].length:e),d&&r&&r.length>1&&c.call(r[0],n,(function(){for(i=1;i<arguments.length-2;i++)void 0===arguments[i]&&(r[i]=void 0)})),r}),t.exports=u},function(t,e,n){var r=n(12),i=n(51).some;r({target:"Array",proto:!0,forced:!n(50)("some")},{some:function(t){return i(this,t,arguments.length>1?arguments[1]:void 0)}})},function(t,e,n){var r=n(37),i="["+n(83)+"]",o=RegExp("^"+i+i+"*"),a=RegExp(i+i+"*$"),s=function(t){return function(e){var n=String(r(e));return 1&t&&(n=n.replace(o,"")),2&t&&(n=n.replace(a,"")),n}};t.exports={start:s(1),end:s(2),trim:s(3)}},function(t,e){t.exports="\t\n\v\f\r                　\u2028\u2029\ufeff"},function(t,e,n){var r=n(19),i=n(36);t.exports=function(t,e){try{i(r,t,e)}catch(n){r[t]=e}return e}},function(t,e,n){var r=n(19),i=n(84),o=r["__core-js_shared__"]||i("__core-js_shared__",{});t.exports=o},function(t,e){var n=0,r=Math.random();t.exports=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++n+r).toString(36)}},function(t,e,n){var r={};r[n(17)("toStringTag")]="z",t.exports="[object z]"===String(r)},function(t,e,n){var r=n(76),i=n(15);t.exports=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())||!Symbol.sham&&r&&r<41}))},function(t,e,n){var r=n(23);t.exports=function(){var t=r(this),e="";return t.global&&(e+="g"),t.ignoreCase&&(e+="i"),t.multiline&&(e+="m"),t.dotAll&&(e+="s"),t.unicode&&(e+="u"),t.sticky&&(e+="y"),e}},function(t,e,n){var r=n(33),i=n(34),o=n(91),a=function(t){return function(e,n,a){var s,l=r(e),c=i(l.length),u=o(a,c);if(t&&n!=n){for(;c>u;)if((s=l[u++])!=s)return!0}else for(;c>u;u++)if((t||u in l)&&l[u]===n)return t||u||0;return!t&&-1}};t.exports={includes:a(!0),indexOf:a(!1)}},function(t,e,n){var r=n(49),i=Math.max,o=Math.min;t.exports=function(t,e){var n=r(t);return n<0?i(n+e,0):o(n,e)}},function(t,e){t.exports=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"]},function(t,e){e.f=Object.getOwnPropertySymbols},function(t,e,n){var r=n(15),i=/#|\.prototype\./,o=function(t,e){var n=s[a(t)];return n==c||n!=l&&("function"==typeof e?r(e):!!e)},a=o.normalize=function(t){return String(t).replace(i,".").toLowerCase()},s=o.data={},l=o.NATIVE="N",c=o.POLYFILL="P";t.exports=o},function(t,e,n){var r=n(26),i=n(67),o=n(17)("species");t.exports=function(t,e){var n;return i(t)&&("function"!=typeof(n=t.constructor)||n!==Array&&!i(n.prototype)?r(n)&&null===(n=n[o])&&(n=void 0):n=void 0),new(void 0===n?Array:n)(0===e?0:e)}},function(t,e,n){var r=n(17),i=n(56),o=n(27),a=r("unscopables"),s=Array.prototype;null==s[a]&&o.f(s,a,{configurable:!0,value:i(null)}),t.exports=function(t){s[a][t]=!0}},function(t,e,n){var r=n(27).f,i=n(28),o=n(17)("toStringTag");t.exports=function(t,e,n){t&&!i(t=n?t:t.prototype,o)&&r(t,o,{configurable:!0,value:e})}},function(t,e,n){var r=n(23),i=n(149);t.exports=Object.setPrototypeOf||("__proto__"in{}?function(){var t,e=!1,n={};try{(t=Object.getOwnPropertyDescriptor(Object.prototype,"__proto__").set).call(n,[]),e=n instanceof Array}catch(t){}return function(n,o){return r(n),i(o),e?t.call(n,o):n.__proto__=o,n}}():void 0)},function(t,e,n){var r=n(15);function i(t,e){return RegExp(t,e)}e.UNSUPPORTED_Y=r((function(){var t=i("a","y");return t.lastIndex=2,null!=t.exec("abcd")})),e.BROKEN_CARET=r((function(){var t=i("^r","gy");return t.lastIndex=2,null!=t.exec("str")}))},function(t,e,n){n(22);var r=n(43),i=n(80),o=n(15),a=n(17),s=n(36),l=a("species"),c=RegExp.prototype,u=!o((function(){var t=/./;return t.exec=function(){var t=[];return t.groups={a:"7"},t},"7"!=="".replace(t,"$<a>")})),h="$0"==="a".replace(/./,"$0"),p=a("replace"),d=!!/./[p]&&""===/./[p]("a","$0"),f=!o((function(){var t=/(?:)/,e=t.exec;t.exec=function(){return e.apply(this,arguments)};var n="ab".split(t);return 2!==n.length||"a"!==n[0]||"b"!==n[1]}));t.exports=function(t,e,n,p){var y=a(t),m=!o((function(){var e={};return e[y]=function(){return 7},7!=""[t](e)})),v=m&&!o((function(){var e=!1,n=/a/;return"split"===t&&((n={}).constructor={},n.constructor[l]=function(){return n},n.flags="",n[y]=/./[y]),n.exec=function(){return e=!0,null},n[y](""),!e}));if(!m||!v||"replace"===t&&(!u||!h||d)||"split"===t&&!f){var b=/./[y],g=n(y,""[t],(function(t,e,n,r,o){var a=e.exec;return a===i||a===c.exec?m&&!o?{done:!0,value:b.call(e,n,r)}:{done:!0,value:t.call(n,e,r)}:{done:!1}}),{REPLACE_KEEPS_$0:h,REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE:d}),_=g[0],w=g[1];r(String.prototype,t,_),r(c,y,2==e?function(t,e){return w.call(t,this,e)}:function(t){return w.call(t,this)})}p&&s(c[y],"sham",!0)}},function(t,e,n){var r=n(127).charAt;t.exports=function(t,e,n){return e+(n?r(t,e).length:1)}},function(t,e,n){var r=n(46),i=n(80);t.exports=function(t,e){var n=t.exec;if("function"==typeof n){var o=n.call(t,e);if("object"!=typeof o)throw TypeError("RegExp exec method returned something other than an Object or null");return o}if("RegExp"!==r(t))throw TypeError("RegExp#exec called on incompatible receiver");return i.call(t,e)}},function(t,e,n){var r=n(26),i=n(46),o=n(17)("match");t.exports=function(t){var e;return r(t)&&(void 0!==(e=t[o])?!!e:"RegExp"==i(t))}},function(t,e,n){var r=n(12),i=n(161);r({global:!0,forced:parseFloat!=i},{parseFloat:i})},function(t,e,n){var r,i=n(12),o=n(47).f,a=n(34),s=n(131),l=n(37),c=n(132),u=n(63),h="".startsWith,p=Math.min,d=c("startsWith");i({target:"String",proto:!0,forced:!!(u||d||(r=o(String.prototype,"startsWith"),!r||r.writable))&&!d},{startsWith:function(t){var e=String(l(this));s(t);var n=a(p(arguments.length>1?arguments[1]:void 0,e.length)),r=String(t);return h?h.call(e,r,n):e.slice(n,n+r.length)===r}})},function(t,e,n){n(12)({target:"Function",proto:!0},{bind:n(133)})},function(t,e,n){var r=n(21),i=n(15),o=n(108);t.exports=!r&&!i((function(){return 7!=Object.defineProperty(o("div"),"a",{get:function(){return 7}}).a}))},function(t,e,n){var r=n(19),i=n(26),o=r.document,a=i(o)&&i(o.createElement);t.exports=function(t){return a?o.createElement(t):{}}},function(t,e,n){var r=n(85),i=Function.toString;"function"!=typeof r.inspectSource&&(r.inspectSource=function(t){return i.call(t)}),t.exports=r.inspectSource},function(t,e,n){var r=n(53);t.exports=r("navigator","userAgent")||""},function(t,e,n){var r=n(19);t.exports=r},function(t,e,n){var r=n(88);t.exports=r&&!Symbol.sham&&"symbol"==typeof Symbol.iterator},function(t,e,n){var r=n(87),i=n(46),o=n(17)("toStringTag"),a="Arguments"==i(function(){return arguments}());t.exports=r?i:function(t){var e,n,r;return void 0===t?"Undefined":null===t?"Null":"string"==typeof(n=function(t,e){try{return t[e]}catch(t){}}(e=Object(t),o))?n:a?i(e):"Object"==(r=i(e))&&"function"==typeof e.callee?"Arguments":r}},function(t,e,n){var r=n(28),i=n(115),o=n(47),a=n(27);t.exports=function(t,e){for(var n=i(e),s=a.f,l=o.f,c=0;c<n.length;c++){var u=n[c];r(t,u)||s(t,u,l(e,u))}}},function(t,e,n){var r=n(53),i=n(65),o=n(93),a=n(23);t.exports=r("Reflect","ownKeys")||function(t){var e=i.f(a(t)),n=o.f;return n?e.concat(n(t)):e}},function(t,e,n){var r=n(28),i=n(33),o=n(90).indexOf,a=n(75);t.exports=function(t,e){var n,s=i(t),l=0,c=[];for(n in s)!r(a,n)&&r(s,n)&&c.push(n);for(;e.length>l;)r(s,n=e[l++])&&(~o(c,n)||c.push(n));return c}},function(t,e,n){var r=n(21),i=n(66),o=n(33),a=n(77).f,s=function(t){return function(e){for(var n,s=o(e),l=i(s),c=l.length,u=0,h=[];c>u;)n=l[u++],r&&!a.call(s,n)||h.push(t?[n,s[n]]:s[n]);return h}};t.exports={entries:s(!0),values:s(!1)}},function(t,e,n){var r=n(54);t.exports=function(t,e,n){if(r(t),void 0===e)return t;switch(n){case 0:return function(){return t.call(e)};case 1:return function(n){return t.call(e,n)};case 2:return function(n,r){return t.call(e,n,r)};case 3:return function(n,r,i){return t.call(e,n,r,i)}}return function(){return t.apply(e,arguments)}}},function(t,e,n){var r=n(21),i=n(27),o=n(23),a=n(66);t.exports=r?Object.defineProperties:function(t,e){o(t);for(var n,r=a(e),s=r.length,l=0;s>l;)i.f(t,n=r[l++],e[n]);return t}},function(t,e,n){var r=n(51).forEach,i=n(50)("forEach");t.exports=i?[].forEach:function(t){return r(this,t,arguments.length>1?arguments[1]:void 0)}},function(t,e){t.exports={CSSRuleList:0,CSSStyleDeclaration:0,CSSValueList:0,ClientRectList:0,DOMRectList:0,DOMStringList:0,DOMTokenList:1,DataTransferItemList:0,FileList:0,HTMLAllCollection:0,HTMLCollection:0,HTMLFormElement:0,HTMLSelectElement:0,MediaList:0,MimeTypeArray:0,NamedNodeMap:0,NodeList:1,PaintRequestList:0,Plugin:0,PluginArray:0,SVGLengthList:0,SVGNumberList:0,SVGPathSegList:0,SVGPointList:0,SVGStringList:0,SVGTransformList:0,SourceBufferList:0,StyleSheetList:0,TextTrackCueList:0,TextTrackList:0,TouchList:0}},function(t,e,n){var r=n(17);e.f=r},function(t,e,n){var r=n(111),i=n(28),o=n(122),a=n(27).f;t.exports=function(t){var e=r.Symbol||(r.Symbol={});i(e,t)||a(e,t,{value:o.f(t)})}},function(t,e,n){var r=n(12),i=n(148),o=n(79),a=n(98),s=n(97),l=n(36),c=n(43),u=n(17),h=n(63),p=n(70),d=n(125),f=d.IteratorPrototype,y=d.BUGGY_SAFARI_ITERATORS,m=u("iterator"),v=function(){return this};t.exports=function(t,e,n,u,d,b,g){i(n,e,u);var _,w,k,x=function(t){if(t===d&&S)return S;if(!y&&t in C)return C[t];switch(t){case"keys":case"values":case"entries":return function(){return new n(this,t)}}return function(){return new n(this)}},j=e+" Iterator",O=!1,C=t.prototype,E=C[m]||C["@@iterator"]||d&&C[d],S=!y&&E||x(d),P="Array"==e&&C.entries||E;if(P&&(_=o(P.call(new t)),f!==Object.prototype&&_.next&&(h||o(_)===f||(a?a(_,f):"function"!=typeof _[m]&&l(_,m,v)),s(_,j,!0,!0),h&&(p[j]=v))),"values"==d&&E&&"values"!==E.name&&(O=!0,S=function(){return E.call(this)}),h&&!g||C[m]===S||l(C,m,S),p[e]=S,d)if(w={values:x("values"),keys:b?S:x("keys"),entries:x("entries")},g)for(k in w)(y||O||!(k in C))&&c(C,k,w[k]);else r({target:e,proto:!0,forced:y||O},w);return w}},function(t,e,n){var r,i,o,a=n(15),s=n(79),l=n(36),c=n(28),u=n(17),h=n(63),p=u("iterator"),d=!1;[].keys&&("next"in(o=[].keys())?(i=s(s(o)))!==Object.prototype&&(r=i):d=!0);var f=null==r||a((function(){var t={};return r[p].call(t)!==t}));f&&(r={}),h&&!f||c(r,p)||l(r,p,(function(){return this})),t.exports={IteratorPrototype:r,BUGGY_SAFARI_ITERATORS:d}},function(t,e,n){var r=n(15);t.exports=!r((function(){function t(){}return t.prototype.constructor=null,Object.getPrototypeOf(new t)!==t.prototype}))},function(t,e,n){var r=n(49),i=n(37),o=function(t){return function(e,n){var o,a,s=String(i(e)),l=r(n),c=s.length;return l<0||l>=c?t?"":void 0:(o=s.charCodeAt(l))<55296||o>56319||l+1===c||(a=s.charCodeAt(l+1))<56320||a>57343?t?s.charAt(l):o:t?s.slice(l,l+2):a-56320+(o-55296<<10)+65536}};t.exports={codeAt:o(!1),charAt:o(!0)}},function(t,e,n){var r=n(26),i=n(98);t.exports=function(t,e,n){var o,a;return i&&"function"==typeof(o=e.constructor)&&o!==n&&r(a=o.prototype)&&a!==n.prototype&&i(t,a),t}},function(t,e,n){var r=n(12),i=n(21),o=n(115),a=n(33),s=n(47),l=n(68);r({target:"Object",stat:!0,sham:!i},{getOwnPropertyDescriptors:function(t){for(var e,n,r=a(t),i=s.f,c=o(r),u={},h=0;c.length>h;)void 0!==(n=i(r,e=c[h++]))&&l(u,e,n);return u}})},function(t,e,n){var r=n(12),i=n(21);r({target:"Object",stat:!0,forced:!i,sham:!i},{defineProperties:n(119)})},function(t,e,n){var r=n(103);t.exports=function(t){if(r(t))throw TypeError("The method doesn't accept regular expressions");return t}},function(t,e,n){var r=n(17)("match");t.exports=function(t){var e=/./;try{"/./"[t](e)}catch(n){try{return e[r]=!1,"/./"[t](e)}catch(t){}}return!1}},function(t,e,n){var r=n(54),i=n(26),o=[].slice,a={},s=function(t,e,n){if(!(e in a)){for(var r=[],i=0;i<e;i++)r[i]="a["+i+"]";a[e]=Function("C,a","return new C("+r.join(",")+")")}return a[e](t,n)};t.exports=Function.bind||function(t){var e=r(this),n=o.call(arguments,1),a=function(){var r=n.concat(o.call(arguments));return this instanceof a?s(e,r.length,r):e.apply(t,r)};return i(e.prototype)&&(a.prototype=e.prototype),a}},function(t,e,n){var r=n(12),i=n(91),o=n(49),a=n(34),s=n(30),l=n(95),c=n(68),u=n(69)("splice"),h=Math.max,p=Math.min;r({target:"Array",proto:!0,forced:!u},{splice:function(t,e){var n,r,u,d,f,y,m=s(this),v=a(m.length),b=i(t,v),g=arguments.length;if(0===g?n=r=0:1===g?(n=0,r=v-b):(n=g-2,r=p(h(o(e),0),v-b)),v+n-r>9007199254740991)throw TypeError("Maximum allowed length exceeded");for(u=l(m,r),d=0;d<r;d++)(f=b+d)in m&&c(u,d,m[f]);if(u.length=r,n<r){for(d=b;d<v-r;d++)y=d+n,(f=d+r)in m?m[y]=m[f]:delete m[y];for(d=v;d>v-r+n;d--)delete m[d-1]}else if(n>r)for(d=v-r;d>b;d--)y=d+n-1,(f=d+r-1)in m?m[y]=m[f]:delete m[y];for(d=0;d<n;d++)m[d+b]=arguments[d+2];return m.length=v-r+n,u}})},function(t,e,n){var r=n(12),i=n(54),o=n(30),a=n(15),s=n(50),l=[],c=l.sort,u=a((function(){l.sort(void 0)})),h=a((function(){l.sort(null)})),p=s("sort");r({target:"Array",proto:!0,forced:u||!h||!p},{sort:function(t){return void 0===t?c.call(o(this)):c.call(o(this),i(t))}})},function(t,e,n){var r=n(12),i=n(49),o=n(163),a=n(164),s=n(15),l=1..toFixed,c=Math.floor,u=function(t,e,n){return 0===e?n:e%2==1?u(t,e-1,n*t):u(t*t,e/2,n)},h=function(t,e,n){for(var r=-1,i=n;++r<6;)i+=e*t[r],t[r]=i%1e7,i=c(i/1e7)},p=function(t,e){for(var n=6,r=0;--n>=0;)r+=t[n],t[n]=c(r/e),r=r%e*1e7},d=function(t){for(var e=6,n="";--e>=0;)if(""!==n||0===e||0!==t[e]){var r=String(t[e]);n=""===n?r:n+a.call("0",7-r.length)+r}return n};r({target:"Number",proto:!0,forced:l&&("0.000"!==8e-5.toFixed(3)||"1"!==.9.toFixed(0)||"1.25"!==1.255.toFixed(2)||"1000000000000000128"!==(0xde0b6b3a7640080).toFixed(0))||!s((function(){l.call({})}))},{toFixed:function(t){var e,n,r,s,l=o(this),c=i(t),f=[0,0,0,0,0,0],y="",m="0";if(c<0||c>20)throw RangeError("Incorrect fraction digits");if(l!=l)return"NaN";if(l<=-1e21||l>=1e21)return String(l);if(l<0&&(y="-",l=-l),l>1e-21)if(n=(e=function(t){for(var e=0,n=t;n>=4096;)e+=12,n/=4096;for(;n>=2;)e+=1,n/=2;return e}(l*u(2,69,1))-69)<0?l*u(2,-e,1):l/u(2,e,1),n*=4503599627370496,(e=52-e)>0){for(h(f,0,n),r=c;r>=7;)h(f,1e7,0),r-=7;for(h(f,u(10,r,1),0),r=e-1;r>=23;)p(f,1<<23),r-=23;p(f,1<<r),h(f,1,1),p(f,2),m=d(f)}else h(f,0,n),h(f,1<<-e,0),m=d(f)+a.call("0",c);return m=c>0?y+((s=m.length)<=c?"0."+a.call("0",c-s)+m:m.slice(0,s-c)+"."+m.slice(s-c)):y+m}})},function(t,e,n){var r=n(21),i=n(19),o=n(94),a=n(43),s=n(28),l=n(46),c=n(128),u=n(60),h=n(15),p=n(56),d=n(65).f,f=n(47).f,y=n(27).f,m=n(82).trim,v=i.Number,b=v.prototype,g="Number"==l(p(b)),_=function(t){var e,n,r,i,o,a,s,l,c=u(t,!1);if("string"==typeof c&&c.length>2)if(43===(e=(c=m(c)).charCodeAt(0))||45===e){if(88===(n=c.charCodeAt(2))||120===n)return NaN}else if(48===e){switch(c.charCodeAt(1)){case 66:case 98:r=2,i=49;break;case 79:case 111:r=8,i=55;break;default:return+c}for(a=(o=c.slice(2)).length,s=0;s<a;s++)if((l=o.charCodeAt(s))<48||l>i)return NaN;return parseInt(o,r)}return+c};if(o("Number",!v(" 0o1")||!v("0b1")||v("+0x1"))){for(var w,k=function(t){var e=arguments.length<1?0:t,n=this;return n instanceof k&&(g?h((function(){b.valueOf.call(n)})):"Number"!=l(n))?c(new v(_(e)),n,k):_(e)},x=r?d(v):"MAX_VALUE,MIN_VALUE,NaN,NEGATIVE_INFINITY,POSITIVE_INFINITY,EPSILON,isFinite,isInteger,isNaN,isSafeInteger,MAX_SAFE_INTEGER,MIN_SAFE_INTEGER,parseFloat,parseInt,isInteger,fromString,range".split(","),j=0;x.length>j;j++)s(v,w=x[j])&&!s(k,w)&&y(k,w,f(v,w));k.prototype=b,b.constructor=k,a(i,"Number",k)}},function(t,e){},function(t,e){var n;n=function(){return this}();try{n=n||new Function("return this")()}catch(t){"object"==typeof window&&(n=window)}t.exports=n},function(t,e,n){var r=n(19),i=n(109),o=r.WeakMap;t.exports="function"==typeof o&&/native code/.test(i(o))},function(t,e,n){var r=n(87),i=n(113);t.exports=r?{}.toString:function(){return"[object "+i(this)+"]"}},function(t,e,n){var r=n(54),i=n(30),o=n(64),a=n(34),s=function(t){return function(e,n,s,l){r(n);var c=i(e),u=o(c),h=a(c.length),p=t?h-1:0,d=t?-1:1;if(s<2)for(;;){if(p in u){l=u[p],p+=d;break}if(p+=d,t?p<0:h<=p)throw TypeError("Reduce of empty array with no initial value")}for(;t?p>=0:h>p;p+=d)p in u&&(l=n(l,u[p],p,c));return l}};t.exports={left:s(!1),right:s(!0)}},function(t,e,n){var r=n(46),i=n(19);t.exports="process"==r(i.process)},function(t,e,n){var r=n(53);t.exports=r("document","documentElement")},function(t,e,n){var r=n(12),i=n(146);r({target:"Object",stat:!0,forced:Object.assign!==i},{assign:i})},function(t,e,n){var r=n(21),i=n(15),o=n(66),a=n(93),s=n(77),l=n(30),c=n(64),u=Object.assign,h=Object.defineProperty;t.exports=!u||i((function(){if(r&&1!==u({b:1},u(h({},"a",{enumerable:!0,get:function(){h(this,"b",{value:3,enumerable:!1})}}),{b:2})).b)return!0;var t={},e={},n=Symbol();return t[n]=7,"abcdefghijklmnopqrst".split("").forEach((function(t){e[t]=t})),7!=u({},t)[n]||"abcdefghijklmnopqrst"!=o(u({},e)).join("")}))?function(t,e){for(var n=l(t),i=arguments.length,u=1,h=a.f,p=s.f;i>u;)for(var d,f=c(arguments[u++]),y=h?o(f).concat(h(f)):o(f),m=y.length,v=0;m>v;)d=y[v++],r&&!p.call(f,d)||(n[d]=f[d]);return n}:u},function(t,e,n){var r=n(33),i=n(65).f,o={}.toString,a="object"==typeof window&&window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[];t.exports.f=function(t){return a&&"[object Window]"==o.call(t)?function(t){try{return i(t)}catch(t){return a.slice()}}(t):i(r(t))}},function(t,e,n){var r=n(125).IteratorPrototype,i=n(56),o=n(61),a=n(97),s=n(70),l=function(){return this};t.exports=function(t,e,n){var c=e+" Iterator";return t.prototype=i(r,{next:o(1,n)}),a(t,c,!1,!0),s[c]=l,t}},function(t,e,n){var r=n(26);t.exports=function(t){if(!r(t)&&null!==t)throw TypeError("Can't set "+String(t)+" as a prototype");return t}},function(t,e,n){var r=n(118),i=n(30),o=n(151),a=n(153),s=n(34),l=n(68),c=n(154);t.exports=function(t){var e,n,u,h,p,d,f=i(t),y="function"==typeof this?this:Array,m=arguments.length,v=m>1?arguments[1]:void 0,b=void 0!==v,g=c(f),_=0;if(b&&(v=r(v,m>2?arguments[2]:void 0,2)),null==g||y==Array&&a(g))for(n=new y(e=s(f.length));e>_;_++)d=b?v(f[_],_):f[_],l(n,_,d);else for(p=(h=g.call(f)).next,n=new y;!(u=p.call(h)).done;_++)d=b?o(h,v,[u.value,_],!0):u.value,l(n,_,d);return n.length=_,n}},function(t,e,n){var r=n(23),i=n(152);t.exports=function(t,e,n,o){try{return o?e(r(n)[0],n[1]):e(n)}catch(e){throw i(t),e}}},function(t,e,n){var r=n(23);t.exports=function(t){var e=t.return;if(void 0!==e)return r(e.call(t)).value}},function(t,e,n){var r=n(17),i=n(70),o=r("iterator"),a=Array.prototype;t.exports=function(t){return void 0!==t&&(i.Array===t||a[o]===t)}},function(t,e,n){var r=n(113),i=n(70),o=n(17)("iterator");t.exports=function(t){if(null!=t)return t[o]||t["@@iterator"]||i[r(t)]}},function(t,e,n){var r=n(17)("iterator"),i=!1;try{var o=0,a={next:function(){return{done:!!o++}},return:function(){i=!0}};a[r]=function(){return this},Array.from(a,(function(){throw 2}))}catch(t){}t.exports=function(t,e){if(!e&&!i)return!1;var n=!1;try{var o={};o[r]=function(){return{next:function(){return{done:n=!0}}}},t(o)}catch(t){}return n}},function(t,e,n){var r=n(30),i=Math.floor,o="".replace,a=/\$([$&'`]|\d{1,2}|<[^>]*>)/g,s=/\$([$&'`]|\d{1,2})/g;t.exports=function(t,e,n,l,c,u){var h=n+t.length,p=l.length,d=s;return void 0!==c&&(c=r(c),d=a),o.call(u,d,(function(r,o){var a;switch(o.charAt(0)){case"$":return"$";case"&":return t;case"`":return e.slice(0,n);case"'":return e.slice(h);case"<":a=c[o.slice(1,-1)];break;default:var s=+o;if(0===s)return r;if(s>p){var u=i(s/10);return 0===u?r:u<=p?void 0===l[u-1]?o.charAt(1):l[u-1]+o.charAt(1):r}a=l[s-1]}return void 0===a?"":a}))}},function(t,e,n){var r=n(53),i=n(27),o=n(17),a=n(21),s=o("species");t.exports=function(t){var e=r(t),n=i.f;a&&e&&!e[s]&&n(e,s,{configurable:!0,get:function(){return this}})}},function(t,e,n){var r=n(12),i=n(51).every;r({target:"Array",proto:!0,forced:!n(50)("every")},{every:function(t){return i(this,t,arguments.length>1?arguments[1]:void 0)}})},function(t,e,n){var r=n(19),i=n(82).trim,o=n(83),a=r.parseInt,s=/^[+-]?0[Xx]/,l=8!==a(o+"08")||22!==a(o+"0x16");t.exports=l?function(t,e){var n=i(String(t));return a(n,e>>>0||(s.test(n)?16:10))}:a},function(t,e,n){var r=n(23),i=n(54),o=n(17)("species");t.exports=function(t,e){var n,a=r(t).constructor;return void 0===a||null==(n=r(a)[o])?e:i(n)}},function(t,e,n){var r=n(19),i=n(82).trim,o=n(83),a=r.parseFloat,s=1/a(o+"-0")!=-1/0;t.exports=s?function(t){var e=i(String(t)),n=a(e);return 0===n&&"-"==e.charAt(0)?-0:n}:a},function(t,e,n){var r=n(12),i=n(19),o=n(110),a=[].slice,s=function(t){return function(e,n){var r=arguments.length>2,i=r?a.call(arguments,2):void 0;return t(r?function(){("function"==typeof e?e:Function(e)).apply(this,i)}:e,n)}};r({global:!0,bind:!0,forced:/MSIE .\./.test(o)},{setTimeout:s(i.setTimeout),setInterval:s(i.setInterval)})},function(t,e,n){var r=n(46);t.exports=function(t){if("number"!=typeof t&&"Number"!=r(t))throw TypeError("Incorrect invocation");return+t}},function(t,e,n){var r=n(49),i=n(37);t.exports=function(t){var e=String(i(this)),n="",o=r(t);if(o<0||o==1/0)throw RangeError("Wrong number of repetitions");for(;o>0;(o>>>=1)&&(e+=e))1&o&&(n+=e);return n}},function(t,e,n){var r=n(12),i=n(82).trim;r({target:"String",proto:!0,forced:n(166)("trim")},{trim:function(){return i(this)}})},function(t,e,n){var r=n(15),i=n(83);t.exports=function(t){return r((function(){return!!i[t]()||"​…᠎"!="​…᠎"[t]()||i[t].name!==t}))}},function(t,e,n){n(12)({target:"Date",stat:!0},{now:function(){return(new Date).getTime()}})},function(t,e,n){n.r(e),n.d(e,"JSONEditor",(function(){return dl}));n(45),n(1),n(38),n(39),n(55),n(78),n(18),n(20),n(40),n(16),n(145),n(11),n(24),n(2),n(3),n(4),n(0),n(5),n(6),n(35),n(29),n(31),n(57),n(22),n(41),n(58),n(25);var r=["actionscript","batchfile","c","c++","cpp","coffee","csharp","css","dart","django","ejs","erlang","golang","groovy","handlebars","haskell","haxe","html","ini","jade","java","javascript","json","less","lisp","lua","makefile","matlab","mysql","objectivec","pascal","perl","pgsql","php","python","r","ruby","sass","scala","scss","smarty","sql","sqlserver","stylus","svg","twig","vbscript","xml","yaml"],i=[function(t){return"string"===t.type&&"color"===t.format&&"colorpicker"},function(t){return"string"===t.type&&["ip","ipv4","ipv6","hostname"].includes(t.format)&&"ip"},function(t){return"string"===t.type&&r.includes(t.format)&&"ace"},function(t){return"string"===t.type&&["xhtml","bbcode"].includes(t.format)&&"sceditor"},function(t){return"string"===t.type&&"markdown"===t.format&&"simplemde"},function(t){return"string"===t.type&&"jodit"===t.format&&"jodit"},function(t){return"string"===t.type&&"autocomplete"===t.format&&"autocomplete"},function(t){return"string"===t.type&&"uuid"===t.format&&"uuid"},function(t){return"info"===t.format&&"info"},function(t){return"button"===t.format&&"button"},function(t){if(("integer"===t.type||"number"===t.type)&&"stepper"===t.format)return"stepper"},function(t){if(t.links)for(var e=0;e<t.links.length;e++)if(t.links[e].rel&&"describedby"===t.links[e].rel.toLowerCase())return"describedBy"},function(t){return["string","integer"].includes(t.type)&&["starrating","rating"].includes(t.format)&&"starrating"},function(t){return["string","integer"].includes(t.type)&&["date","time","datetime-local"].includes(t.format)&&"datetime"},function(t){return(t.oneOf||t.anyOf)&&"multiple"},function(t){if("array"===t.type&&t.items&&!Array.isArray(t.items)&&["string","number","integer"].includes(t.items.type)){if("choices"===t.format)return"arrayChoices";if(t.uniqueItems){if("selectize"===t.format)return"arraySelectize";if("select2"===t.format)return"arraySelect2";if(t.items.enum)return"multiselect"}}},function(t){if(t.enum){if("array"===t.type||"object"===t.type)return"enum";if("number"===t.type||"integer"===t.type||"string"===t.type)return"radio"===t.format?"radio":"select2"===t.format?"select2":"selectize"===t.format?"selectize":"choices"===t.format?"choices":"select"}},function(t){if(t.enumSource)return"radio"===t.format?"radio":"select2"===t.format?"select2":"selectize"===t.format?"selectize":"choices"===t.format?"choices":"select"},function(t){return"array"===t.type&&"table"===t.format&&"table"},function(t){return"string"===t.type&&"url"===t.format&&window.FileReader&&t.options&&t.options.upload===Object(t.options.upload)&&"upload"},function(t){return"string"===t.type&&t.media&&"base64"===t.media.binaryEncoding&&"base64"},function(t){return"any"===t.type&&"multiple"},function(t){if("boolean"===t.type)return"checkbox"===t.format||t.options&&t.options.checkbox?"checkbox":"select2"===t.format?"select2":"selectize"===t.format?"selectize":"choices"===t.format?"choices":"select"},function(t){return"string"===t.type&&"signature"===t.format&&"signature"},function(t){return"string"==typeof t.type&&t.type},function(t){return!t.type&&t.properties&&"object"},function(t){return"string"!=typeof t.type&&"multiple"}];function o(t,e){return function(t){if(Array.isArray(t))return t}(t)||function(t,e){var n=t&&("undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"]);if(null==n)return;var r,i,o=[],a=!0,s=!1;try{for(n=n.call(t);!(a=(r=n.next()).done)&&(o.push(r.value),!e||o.length!==e);a=!0);}catch(t){s=!0,i=t}finally{try{a||null==n.return||n.return()}finally{if(s)throw i}}return o}(t,e)||function(t,e){if(!t)return;if("string"==typeof t)return a(t,e);var n=Object.prototype.toString.call(t).slice(8,-1);"Object"===n&&t.constructor&&(n=t.constructor.name);if("Map"===n||"Set"===n)return Array.from(t);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return a(t,e)}(t,e)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function a(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,r=new Array(e);n<e;n++)r[n]=t[n];return r}var s={},l={};l.en={error_notset:"Property must be set",error_notempty:"Value required",error_enum:"Value must be one of the enumerated values",error_const:"Value must be the constant value",error_anyOf:"Value must validate against at least one of the provided schemas",error_oneOf:"Value must validate against exactly one of the provided schemas. It currently validates against {{0}} of the schemas.",error_not:"Value must not validate against the provided schema",error_type_union:"Value must be one of the provided types",error_type:"Value must be of type {{0}}",error_disallow_union:"Value must not be one of the provided disallowed types",error_disallow:"Value must not be of type {{0}}",error_multipleOf:"Value must be a multiple of {{0}}",error_maximum_excl:"Value must be less than {{0}}",error_maximum_incl:"Value must be at most {{0}}",error_minimum_excl:"Value must be greater than {{0}}",error_minimum_incl:"Value must be at least {{0}}",error_maxLength:"Value must be at most {{0}} characters long",error_minLength:"Value must be at least {{0}} characters long",error_pattern:"Value must match the pattern {{0}}",error_additionalItems:"No additional items allowed in this array",error_maxItems:"Value must have at most {{0}} items",error_minItems:"Value must have at least {{0}} items",error_uniqueItems:"Array must have unique items",error_maxProperties:"Object must have at most {{0}} properties",error_minProperties:"Object must have at least {{0}} properties",error_required:"Object is missing the required property '{{0}}'",error_additional_properties:"No additional properties allowed, but property {{0}} is set",error_property_names_exceeds_maxlength:"Property name {{0}} exceeds maxLength",error_property_names_enum_mismatch:"Property name {{0}} does not match any enum values",error_property_names_const_mismatch:"Property name {{0}} does not match the const value",error_property_names_pattern_mismatch:"Property name {{0}} does not match pattern",error_property_names_false:"Property name {{0}} fails when propertyName is false",error_property_names_maxlength:"Property name {{0}} cannot match invalid maxLength",error_property_names_enum:"Property name {{0}} cannot match invalid enum",error_property_names_pattern:"Property name {{0}} cannot match invalid pattern",error_property_names_unsupported:"Unsupported propertyName {{0}}",error_dependency:"Must have property {{0}}",error_date:"Date must be in the format {{0}}",error_time:"Time must be in the format {{0}}",error_datetime_local:"Datetime must be in the format {{0}}",error_invalid_epoch:"Date must be greater than 1 January 1970",error_ipv4:"Value must be a valid IPv4 address in the form of 4 numbers between 0 and 255, separated by dots",error_ipv6:"Value must be a valid IPv6 address",error_hostname:"The hostname has the wrong format",button_save:"Save",button_copy:"Copy",button_cancel:"Cancel",button_add:"Add",button_delete_all:"All",button_delete_all_title:"Delete All",button_delete_last:"Last {{0}}",button_delete_last_title:"Delete Last {{0}}",button_add_row_title:"Add {{0}}",button_move_down_title:"Move down",button_move_up_title:"Move up",button_properties:"Properties",button_object_properties:"Object Properties",button_copy_row_title:"Copy {{0}}",button_delete_row_title:"Delete {{0}}",button_delete_row_title_short:"Delete",button_copy_row_title_short:"Copy",button_collapse:"Collapse",button_expand:"Expand",button_edit_json:"Edit JSON",button_upload:"Upload",flatpickr_toggle_button:"Toggle",flatpickr_clear_button:"Clear",choices_placeholder_text:"Start typing to add value",default_array_item_title:"item",button_delete_node_warning:"Are you sure you want to remove this node?"},Object.entries(s).forEach((function(t){var e=o(t,2),n=e[0],r=e[1];s[n].options=r.options||{}}));var c={options:{upload:function(t,e,n){console.log("Upload handler required for upload editor")},prompt_before_delete:!0,use_default_values:!0,max_depth:0},theme:"html",template:"default",themes:{},callbacks:{},templates:{},iconlibs:{},editors:s,languages:l,resolvers:i,custom_validators:[],default_language:"en",language:"en",translate:function(t,e){var n=c.languages[c.language];if(!n)throw new Error("Unknown language ".concat(c.language));var r=n[t]||c.languages.en[t]||t;if(e)for(var i=0;i<e.length;i++)r=r.replace(new RegExp("\\{\\{".concat(i,"}}"),"g"),e[i]);return r},translateProperty:function(t,e){return t}};n(81),n(158),n(44),n(71),n(42),n(48),n(59),n(13),n(129),n(130),n(52);function u(t,e,n,r){try{switch(t.format){case"ipv4":!function(t){var e=t.split(".");if(4!==e.length)throw new Error("error_ipv4");e.forEach((function(t){if(isNaN(+t)||+t<0||+t>255)throw new Error("error_ipv4")}))}(e);break;case"ipv6":!function(t){if(!t.match("^(?:(?:(?:[a-fA-F0-9]{1,4}:){6}|(?=(?:[a-fA-F0-9]{0,4}:){2,6}(?:[0-9]{1,3}.){3}[0-9]{1,3}$)(([0-9a-fA-F]{1,4}:){1,5}|:)((:[0-9a-fA-F]{1,4}){1,5}:|:)|::(?:[a-fA-F0-9]{1,4}:){5})(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9]).){3}(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])|(?:[a-fA-F0-9]{1,4}:){7}[a-fA-F0-9]{1,4}|(?=(?:[a-fA-F0-9]{0,4}:){0,7}[a-fA-F0-9]{0,4}$)(([0-9a-fA-F]{1,4}:){1,7}|:)((:[0-9a-fA-F]{1,4}){1,7}|:)|(?:[a-fA-F0-9]{1,4}:){7}:|:(:[a-fA-F0-9]{1,4}){7})$"))throw new Error("error_ipv6")}(e);break;case"hostname":!function(t){if(!t.match("(?=^.{4,253}$)(^((?!-)[a-zA-Z0-9-]{0,62}[a-zA-Z0-9].)+[a-zA-Z]{2,63}$)"))throw new Error("error_hostname")}(e)}return[]}catch(t){return[{path:n,property:"format",message:r(t.message)}]}}n(104);function h(t){return(h="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function p(t){return null!==t&&("object"===h(t)&&!t.nodeType&&t!==t.window&&!(t.constructor&&!v(t.constructor.prototype,"isPrototypeOf")))}function d(t){return p(t)?f({},t):Array.isArray(t)?t.map(d):t}function f(t){for(var e=arguments.length,n=new Array(e>1?e-1:0),r=1;r<e;r++)n[r-1]=arguments[r];return n.forEach((function(e){e&&Object.keys(e).forEach((function(n){e[n]&&p(e[n])?(v(t,n)||(t[n]={}),f(t[n],e[n])):Array.isArray(e[n])?t[n]=d(e[n]):t[n]=e[n]}))})),t}function y(t,e){var n=document.createEvent("HTMLEvents");n.initEvent(e,!0,!0),t.dispatchEvent(n)}function m(t){return t&&("[object ShadowRoot]"===t.toString()?t:m(t.parentNode))}function v(t,e){return t&&Object.prototype.hasOwnProperty.call(t,e)}var b=/^\s*(-|\+)?(\d+|(\d*(\.\d*)))([eE][+-]?\d+)?\s*$/;var g=/^\s*(-|\+)?(\d+)\s*$/;function _(t,e){var n="undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(!n){if(Array.isArray(t)||(n=C(t))||e&&t&&"number"==typeof t.length){n&&(t=n);var r=0,i=function(){};return{s:i,n:function(){return r>=t.length?{done:!0}:{done:!1,value:t[r++]}},e:function(t){throw t},f:i}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var o,a=!0,s=!1;return{s:function(){n=n.call(t)},n:function(){var t=n.next();return a=t.done,t},e:function(t){s=!0,o=t},f:function(){try{a||null==n.return||n.return()}finally{if(s)throw o}}}}function w(t,e){var n=Object.keys(t);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(t);e&&(r=r.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),n.push.apply(n,r)}return n}function k(t){for(var e=1;e<arguments.length;e++){var n=null!=arguments[e]?arguments[e]:{};e%2?w(Object(n),!0).forEach((function(e){x(t,e,n[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(n)):w(Object(n)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(n,e))}))}return t}function x(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}function j(t,e){return function(t){if(Array.isArray(t))return t}(t)||function(t,e){var n=t&&("undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"]);if(null==n)return;var r,i,o=[],a=!0,s=!1;try{for(n=n.call(t);!(a=(r=n.next()).done)&&(o.push(r.value),!e||o.length!==e);a=!0);}catch(t){s=!0,i=t}finally{try{a||null==n.return||n.return()}finally{if(s)throw i}}return o}(t,e)||C(t,e)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function O(t){return function(t){if(Array.isArray(t))return E(t)}(t)||function(t){if("undefined"!=typeof Symbol&&null!=t[Symbol.iterator]||null!=t["@@iterator"])return Array.from(t)}(t)||C(t)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function C(t,e){if(t){if("string"==typeof t)return E(t,e);var n=Object.prototype.toString.call(t).slice(8,-1);return"Object"===n&&t.constructor&&(n=t.constructor.name),"Map"===n||"Set"===n?Array.from(t):"Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)?E(t,e):void 0}}function E(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,r=new Array(e);n<e;n++)r[n]=t[n];return r}function S(t){return(S="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function P(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}var R=function(){function t(e,n,r,i){!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,t),this.jsoneditor=e,this.schema=n||this.jsoneditor.schema,this.options=r||{},this.translate=this.jsoneditor.translate||i.translate,this.translateProperty=this.jsoneditor.translateProperty||i.translateProperty,this.defaults=i,this._validateSubSchema={const:function(t,e,n){return JSON.stringify(t.const)===JSON.stringify(e)&&!(Array.isArray(e)||"object"===S(e))?[]:[{path:n,property:"const",message:this.translate("error_const")}]},enum:function(t,e,n){var r=JSON.stringify(e);return t.enum.some((function(t){return r===JSON.stringify(t)}))?[]:[{path:n,property:"enum",message:this.translate("error_enum")}]},extends:function(t,e,n){var r=this;return t.extends.reduce((function(t,i){return t.push.apply(t,O(r._validateSchema(i,e,n))),t}),[])},allOf:function(t,e,n){var r=this;return t.allOf.reduce((function(t,i){return t.push.apply(t,O(r._validateSchema(i,e,n))),t}),[])},anyOf:function(t,e,n){var r=this;return t.anyOf.some((function(t){return!r._validateSchema(t,e,n).length}))?[]:[{path:n,property:"anyOf",message:this.translate("error_anyOf")}]},oneOf:function(t,e,n){var r=this,i=0,o=[];t.oneOf.forEach((function(t,a){var s=r._validateSchema(t,e,n);s.length||i++,s.forEach((function(t){t.path="".concat(n,".oneOf[").concat(a,"]").concat(t.path.substr(n.length))})),o.push.apply(o,O(s))}));var a=[];return 1!==i&&(a.push({path:n,property:"oneOf",message:this.translate("error_oneOf",[i])}),a.push.apply(a,o)),a},not:function(t,e,n){return this._validateSchema(t.not,e,n).length?[]:[{path:n,property:"not",message:this.translate("error_not")}]},type:function(t,e,n){var r=this;if(Array.isArray(t.type)){if(!t.type.some((function(t){return r._checkType(t,e)})))return[{path:n,property:"type",message:this.translate("error_type_union")}]}else if(["date","time","datetime-local"].includes(t.format)&&"integer"===t.type){if(!this._checkType("string","".concat(e)))return[{path:n,property:"type",message:this.translate("error_type",[t.format])}]}else if(!this._checkType(t.type,e))return[{path:n,property:"type",message:this.translate("error_type",[t.type])}];return[]},disallow:function(t,e,n){var r=this;if(Array.isArray(t.disallow)){if(t.disallow.some((function(t){return r._checkType(t,e)})))return[{path:n,property:"disallow",message:this.translate("error_disallow_union")}]}else if(this._checkType(t.disallow,e))return[{path:n,property:"disallow",message:this.translate("error_disallow",[t.disallow])}];return[]}},this._validateNumberSubSchema={multipleOf:function(t,e,n){return this._validateNumberSubSchemaMultipleDivisible(t,e,n)},divisibleBy:function(t,e,n){return this._validateNumberSubSchemaMultipleDivisible(t,e,n)},maximum:function(t,e,n){var r=t.exclusiveMaximum?e<t.maximum:e<=t.maximum;return window.math?r=window.math[t.exclusiveMaximum?"smaller":"smallerEq"](window.math.bignumber(e),window.math.bignumber(t.maximum)):window.Decimal&&(r=new window.Decimal(e)[t.exclusiveMaximum?"lt":"lte"](new window.Decimal(t.maximum))),r?[]:[{path:n,property:"maximum",message:this.translate(t.exclusiveMaximum?"error_maximum_excl":"error_maximum_incl",[t.maximum])}]},minimum:function(t,e,n){var r=t.exclusiveMinimum?e>t.minimum:e>=t.minimum;return window.math?r=window.math[t.exclusiveMinimum?"larger":"largerEq"](window.math.bignumber(e),window.math.bignumber(t.minimum)):window.Decimal&&(r=new window.Decimal(e)[t.exclusiveMinimum?"gt":"gte"](new window.Decimal(t.minimum))),r?[]:[{path:n,property:"minimum",message:this.translate(t.exclusiveMinimum?"error_minimum_excl":"error_minimum_incl",[t.minimum])}]}},this._validateStringSubSchema={maxLength:function(t,e,n){var r=[];return"".concat(e).length>t.maxLength&&r.push({path:n,property:"maxLength",message:this.translate("error_maxLength",[t.maxLength])}),r},minLength:function(t,e,n){return"".concat(e).length<t.minLength?[{path:n,property:"minLength",message:this.translate(1===t.minLength?"error_notempty":"error_minLength",[t.minLength])}]:[]},pattern:function(t,e,n){return new RegExp(t.pattern).test(e)?[]:[{path:n,property:"pattern",message:t.options&&t.options.patternmessage?t.options.patternmessage:this.translate("error_pattern",[t.pattern])}]}},this._validateArraySubSchema={items:function(t,e,n){var r=this,i=[];if(Array.isArray(t.items))for(var o=0;o<e.length;o++)if(t.items[o])i.push.apply(i,O(this._validateSchema(t.items[o],e[o],"".concat(n,".").concat(o))));else{if(!0===t.additionalItems)break;if(!t.additionalItems){if(!1===t.additionalItems){i.push({path:n,property:"additionalItems",message:this.translate("error_additionalItems")});break}break}i.push.apply(i,O(this._validateSchema(t.additionalItems,e[o],"".concat(n,".").concat(o))))}else e.forEach((function(e,o){i.push.apply(i,O(r._validateSchema(t.items,e,"".concat(n,".").concat(o))))}));return i},maxItems:function(t,e,n){return e.length>t.maxItems?[{path:n,property:"maxItems",message:this.translate("error_maxItems",[t.maxItems])}]:[]},minItems:function(t,e,n){return e.length<t.minItems?[{path:n,property:"minItems",message:this.translate("error_minItems",[t.minItems])}]:[]},uniqueItems:function(t,e,n){for(var r={},i=0;i<e.length;i++){var o=JSON.stringify(e[i]);if(r[o])return[{path:n,property:"uniqueItems",message:this.translate("error_uniqueItems")}];r[o]=!0}return[]}},this._validateObjectSubSchema={maxProperties:function(t,e,n){return Object.keys(e).length>t.maxProperties?[{path:n,property:"maxProperties",message:this.translate("error_maxProperties",[t.maxProperties])}]:[]},minProperties:function(t,e,n){return Object.keys(e).length<t.minProperties?[{path:n,property:"minProperties",message:this.translate("error_minProperties",[t.minProperties])}]:[]},required:function(t,e,n){var r=this,i=[];return Array.isArray(t.required)&&t.required.forEach((function(o){if(void 0===e[o]){var a=r.jsoneditor.getEditor("".concat(n,".").concat(o));a&&!1===a.dependenciesFulfilled||a&&["button","info"].includes(a.schema.format||a.schema.type)||i.push({path:n,property:"required",message:r.translate("error_required",[t&&t.properties&&t.properties[o]&&t.properties[o].title?t.properties[o].title:o])})}})),i},properties:function(t,e,n,r){var i=this,o=[];return Object.entries(t.properties).forEach((function(t){var a=j(t,2),s=a[0],l=a[1];r[s]=!0,o.push.apply(o,O(i._validateSchema(l,e[s],"".concat(n,".").concat(s))))})),o},patternProperties:function(t,e,n,r){var i=this,o=[];return Object.entries(t.patternProperties).forEach((function(t){var a=j(t,2),s=a[0],l=a[1],c=new RegExp(s);Object.entries(e).forEach((function(t){var e=j(t,2),a=e[0],s=e[1];c.test(a)&&(r[a]=!0,o.push.apply(o,O(i._validateSchema(l,s,"".concat(n,".").concat(a)))))}))})),o}},this._validateObjectSubSchema2={propertyNames:function(t,e,n,r){for(var i=this,o=[],a=Object.keys(e),s=null,l=function(e){var r="";return s=a[e],"boolean"==typeof t.propertyNames?!0===t.propertyNames?"continue":(o.push({path:n,property:"propertyNames",message:i.translate("error_property_names_false",[s])}),"break"):Object.entries(t.propertyNames).every((function(t){var e=j(t,2),a=e[0],l=e[1],c=!1;switch(a){case"maxLength":if("number"!=typeof l){r="error_property_names_maxlength";break}if(s.length>l){r="error_property_names_exceeds_maxlength";break}return!0;case"const":if(l!==s){r="error_property_names_const_mismatch";break}return!0;case"enum":if(!Array.isArray(l)){r="error_property_names_enum";break}if(l.forEach((function(t){t===s&&(c=!0)})),!c){r="error_property_names_enum_mismatch";break}return!0;case"pattern":if("string"!=typeof l){r="error_property_names_pattern";break}if(!new RegExp(l).test(s)){r="error_property_names_pattern_mismatch";break}return!0;default:return o.push({path:n,property:"propertyNames",message:i.translate("error_property_names_unsupported",[a])}),!1}return o.push({path:n,property:"propertyNames",message:i.translate(r,[s])}),!1}))?void 0:"break"},c=0;c<a.length;c++){var u=l(c);if("continue"!==u&&"break"===u)break}return o},additionalProperties:function(t,e,n,r){for(var i=[],o=Object.keys(e),a=0;a<o.length;a++){var s=o[a];if(!r[s]){if(!t.additionalProperties){i.push({path:n,property:"additionalProperties",message:this.translate("error_additional_properties",[s])});break}if(!0===t.additionalProperties)break;i.push.apply(i,O(this._validateSchema(t.additionalProperties,e[s],"".concat(n,".").concat(s))))}}return i},dependencies:function(t,e,n){var r=this,i=[];return Object.entries(t.dependencies).forEach((function(t){var o=j(t,2),a=o[0],s=o[1];void 0!==e[a]&&(Array.isArray(s)?s.forEach((function(t){void 0===e[t]&&i.push({path:n,property:"dependencies",message:r.translate("error_dependency",[t])})})):i.push.apply(i,O(r._validateSchema(s,e,n))))})),i}}}var e,n,r;return e=t,(n=[{key:"fitTest",value:function(t,e){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:1e7,r={match:0,extra:0};if("object"===S(t)&&null!==t){var i=this._getSchema(e);if(i.anyOf){var o,a=k({},r),s=_(i.anyOf);try{for(s.s();!(o=s.n()).done;){var l=o.value,c=this.fitTest(t,l,n);(c.match>a.match||c.match===a.match&&c.extra<a.extra)&&(a=c)}}catch(t){s.e(t)}finally{s.f()}return a}var u=this._getSchema(e).properties;for(var h in u)if(v(u,h)){if("object"===S(t[h])&&"object"===S(u[h])&&"object"===S(u[h].properties)){var p=this.fitTest(t[h],u[h],n/100);r.match+=p.match,r.extra+=p.extra}void 0!==t[h]&&(r.match+=n)}else r.extra+=n}return r}},{key:"_getSchema",value:function(t){return void 0===t?f({},this.jsoneditor.expandRefs(this.schema)):t}},{key:"validate",value:function(t){return this._validateSchema(this.schema,t)}},{key:"_validateSchema",value:function(t,e,n){var r=this,i=[];return n=n||this.jsoneditor.root.formname,t=f({},this.jsoneditor.expandRefs(t)),void 0===e?this._validateV3Required(t,e,n):(Object.keys(t).forEach((function(o){r._validateSubSchema[o]&&i.push.apply(i,O(r._validateSubSchema[o].call(r,t,e,n)))})),i.push.apply(i,O(this._validateByValueType(t,e,n))),t.links&&t.links.forEach((function(o,a){o.rel&&"describedby"===o.rel.toLowerCase()&&(t=r._expandSchemaLink(t,a),i.push.apply(i,O(r._validateSchema(t,e,n,r.translate))))})),["date","time","datetime-local"].includes(t.format)&&i.push.apply(i,O(this._validateDateTimeSubSchema(t,e,n))),["uuid"].includes(t.format)&&i.push.apply(i,O(this._validateUUIDSchema(t,e,n))),i.push.apply(i,O(this._validateCustomValidator(t,e,n))),this._removeDuplicateErrors(i))}},{key:"_expandSchemaLink",value:function(t,e){var n=t.links[e].href,r=this.jsoneditor.root.getValue(),i=this.jsoneditor.compileTemplate(n,this.jsoneditor.template),o=document.location.origin+document.location.pathname+i(r);return t.links=t.links.slice(0,e).concat(t.links.slice(e+1)),f({},t,this.jsoneditor.refs[o])}},{key:"_validateV3Required",value:function(t,e,n){return(void 0!==t.required&&!0===t.required||void 0===t.required&&!0===this.jsoneditor.options.required_by_default)&&"info"!==t.type?[{path:n,property:"required",message:this.translate("error_notset")}]:[]}},{key:"_validateByValueType",value:function(t,e,n){var r=this,i=[];if(null===e)return i;if("number"==typeof e)Object.keys(t).forEach((function(o){r._validateNumberSubSchema[o]&&i.push.apply(i,O(r._validateNumberSubSchema[o].call(r,t,e,n)))}));else if("string"==typeof e)Object.keys(t).forEach((function(o){r._validateStringSubSchema[o]&&i.push.apply(i,O(r._validateStringSubSchema[o].call(r,t,e,n)))}));else if(Array.isArray(e))Object.keys(t).forEach((function(o){r._validateArraySubSchema[o]&&i.push.apply(i,O(r._validateArraySubSchema[o].call(r,t,e,n)))}));else if("object"===S(e)){var o={};Object.keys(t).forEach((function(a){r._validateObjectSubSchema[a]&&i.push.apply(i,O(r._validateObjectSubSchema[a].call(r,t,e,n,o)))})),void 0!==t.additionalProperties||!this.jsoneditor.options.no_additional_properties||t.oneOf||t.anyOf||t.allOf||(t.additionalProperties=!1),Object.keys(t).forEach((function(a){void 0!==r._validateObjectSubSchema2[a]&&i.push.apply(i,O(r._validateObjectSubSchema2[a].call(r,t,e,n,o)))}))}return i}},{key:"_validateUUIDSchema",value:function(t,e,n){return/^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(e)?[]:[{path:n,property:"format",message:this.translate("error_pattern",["^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$"])}]}},{key:"_validateNumberSubSchemaMultipleDivisible",value:function(t,e,n){var r=t.multipleOf||t.divisibleBy,i=e/r===Math.floor(e/r);return window.math?i=window.math.mod(window.math.bignumber(e),window.math.bignumber(r)).equals(0):window.Decimal&&(i=new window.Decimal(e).mod(new window.Decimal(r)).equals(0)),i?[]:[{path:n,property:t.multipleOf?"multipleOf":"divisibleBy",message:this.translate("error_multipleOf",[r])}]}},{key:"_validateDateTimeSubSchema",value:function(t,e,n){var r=this,i=this.jsoneditor.getEditor(n),o=i&&i.flatpickr?i.flatpickr.config.dateFormat:{date:'"YYYY-MM-DD"',time:'"HH:MM"',"datetime-local":'"YYYY-MM-DD HH:MM"'}[t.format];if("integer"===t.type)return function(t,e,n){return 1*e<1?[{path:n,property:"format",message:r.translate("error_invalid_epoch")}]:e!==Math.abs(parseInt(e))?[{path:n,property:"format",message:r.translate("error_".concat(t.format.replace(/-/g,"_")),[o])}]:[]}(t,e,n);if(i&&i.flatpickr){if(i)return function(t,e,n,i){if(""!==e){var o;if("single"!==i.flatpickr.config.mode){var a="range"===i.flatpickr.config.mode?i.flatpickr.l10n.rangeSeparator:", ";o=i.flatpickr.selectedDates.map((function(t){return i.flatpickr.formatDate(t,i.flatpickr.config.dateFormat)})).join(a)}try{if(o){if(o!==e)throw new Error("".concat(i.flatpickr.config.mode," mismatch"))}else if(i.flatpickr.formatDate(i.flatpickr.parseDate(e,i.flatpickr.config.dateFormat),i.flatpickr.config.dateFormat)!==e)throw new Error("mismatch")}catch(t){var s=void 0!==i.flatpickr.config.errorDateFormat?i.flatpickr.config.errorDateFormat:i.flatpickr.config.dateFormat;return[{path:n,property:"format",message:r.translate("error_".concat(i.format.replace(/-/g,"_")),[s])}]}}return[]}(0,e,n,i)}else if(!{date:/^(\d{4}\D\d{2}\D\d{2})?$/,time:/^(\d{2}:\d{2}(?::\d{2})?)?$/,"datetime-local":/^(\d{4}\D\d{2}\D\d{2}[ T]\d{2}:\d{2}(?::\d{2})?)?$/}[t.format].test(e))return[{path:n,property:"format",message:this.translate("error_".concat(t.format.replace(/-/g,"_")),[o])}];return[]}},{key:"_validateCustomValidator",value:function(t,e,n){var r=this,i=[];i.push.apply(i,O(u.call(this,t,e,n,this.translate)));var o=function(o){i.push.apply(i,O(o.call(r,t,e,n)))};return this.defaults.custom_validators.forEach(o),this.options.custom_validators&&this.options.custom_validators.forEach(o),i}},{key:"_removeDuplicateErrors",value:function(t){return t.reduce((function(t,e){var n=!0;return t||(t=[]),t.forEach((function(t){t.message===e.message&&t.path===e.path&&t.property===e.property&&(t.errorcount++,n=!1)})),n&&(e.errorcount=1,t.push(e)),t}),[])}},{key:"_checkType",value:function(t,e){var n={string:function(t){return"string"==typeof t},number:function(t){return"number"==typeof t},integer:function(t){return"number"==typeof t&&t===Math.floor(t)},boolean:function(t){return"boolean"==typeof t},array:function(t){return Array.isArray(t)},object:function(t){return null!==t&&!Array.isArray(t)&&"object"===S(t)},null:function(t){return null===t}};return"string"==typeof t?!n[t]||n[t](e):!this._validateSchema(t,e).length}}])&&P(e.prototype,n),r&&P(e,r),t}();n(105),n(72),n(32);function L(t,e){return function(t){if(Array.isArray(t))return t}(t)||function(t,e){var n=t&&("undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"]);if(null==n)return;var r,i,o=[],a=!0,s=!1;try{for(n=n.call(t);!(a=(r=n.next()).done)&&(o.push(r.value),!e||o.length!==e);a=!0);}catch(t){s=!0,i=t}finally{try{a||null==n.return||n.return()}finally{if(s)throw i}}return o}(t,e)||function(t,e){if(!t)return;if("string"==typeof t)return T(t,e);var n=Object.prototype.toString.call(t).slice(8,-1);"Object"===n&&t.constructor&&(n=t.constructor.name);if("Map"===n||"Set"===n)return Array.from(t);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return T(t,e)}(t,e)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function T(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,r=new Array(e);n<e;n++)r[n]=t[n];return r}function A(t){return(A="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function I(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}var B=function(){function t(e){!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,t),this.options=e||{},this.refs=this.options.refs||{},this.refs_with_info={},this.refs_prefix="#/counter/",this.refs_counter=1,this._subSchema1={type:function(t){"object"===A(t.type)&&(t.type=this._expandSubSchema(t.type))},disallow:function(t){"object"===A(t.disallow)&&(t.disallow=this._expandSubSchema(t.disallow))},anyOf:function(t){var e=this;Object.entries(t.anyOf).forEach((function(n){var r=L(n,2),i=r[0],o=r[1];t.anyOf[i]=e.expandSchema(o)}))},dependencies:function(t){var e=this;Object.entries(t.dependencies).forEach((function(n){var r=L(n,2),i=r[0],o=r[1];"object"!==A(o)||Array.isArray(o)||(t.dependencies[i]=e.expandSchema(o))}))},not:function(t){t.not=this.expandSchema(t.not)}},this._subSchema2={allOf:function(t,e){var n=this,r=f({},e);return Object.entries(t.allOf).forEach((function(e){var i=L(e,2),o=i[0],a=i[1];t.allOf[o]=n.expandRefs(a,!0),r=n.extendSchemas(r,n.expandSchema(a))})),delete r.allOf,r},extends:function(t,e){var n,r=this;return delete(n=Array.isArray(t.extends)?t.extends.reduce((function(t,e,n){return r.extendSchemas(t,r.expandSchema(e))}),e):this.extendSchemas(e,this.expandSchema(t.extends))).extends,n},oneOf:function(t,e){var n=this,r=f({},e);return delete r.oneOf,t.oneOf.reduce((function(t,e,i){return t.oneOf[i]=n.extendSchemas(n.expandSchema(e),r),t}),e),e}}}var e,n,r;return e=t,(n=[{key:"load",value:function(t,e,n,r){var i=this;this._loadExternalRefs(t,(function(){i._getDefinitions(t,"".concat(n,"#/definitions/")),e(i.expandRefs(t))}),n,this._getFileBase(r))}},{key:"expandRefs",value:function(t,e){var n=this,r=f({},t);if(!r.$ref)return r;var i=this.refs_with_info[r.$ref];delete r.$ref;var o=i.$ref.startsWith("#")?i.fetchUrl:"",a=this._getRef(o,i);if(this.refs[a]){if(e&&v(this.refs[a],"allOf")){var s=this.refs[a].allOf;Object.keys(s).forEach((function(t){s[t]=n.expandRefs(s[t],!0)}))}}else console.warn("reference:'".concat(a,"' not found!"));return this.extendSchemas(r,this.expandSchema(this.refs[a]))}},{key:"expandSchema",value:function(t,e){var n=this;Object.entries(this._subSchema1).forEach((function(e){var r=L(e,2),i=r[0],o=r[1];t[i]&&o.call(n,t)}));var r=f({},t);return Object.entries(this._subSchema2).forEach((function(e){var i=L(e,2),o=i[0],a=i[1];t[o]&&(r=a.call(n,t,r))})),this.expandRefs(r)}},{key:"_getRef",value:function(t,e){var n=t+e;return this.refs[n]?n:t+decodeURIComponent(e.$ref)}},{key:"_expandSubSchema",value:function(t){var e=this;return Array.isArray(t)?t.map((function(t){return"object"===A(t)?e.expandSchema(t):t})):this.expandSchema(t)}},{key:"_getDefinitions",value:function(t,e){var n=this;t.definitions&&Object.keys(t.definitions).forEach((function(r){n.refs[e+r]=t.definitions[r],t.definitions[r].definitions&&n._getDefinitions(t.definitions[r],"".concat(e+r,"/definitions/"))}))}},{key:"_getExternalRefs",value:function(t,e){var n=this,r={},i=function(t){return Object.keys(t).forEach((function(t){r[t]=!0}))};if(t.$ref&&"object"!==A(t.$ref)){var o=this.refs_prefix+this.refs_counter++;"#"===t.$ref.substr(0,1)||this.refs[t.$ref]||(r[t.$ref]=!0),this.refs_with_info[o]={fetchUrl:e,$ref:t.$ref},t.$ref=o}return Object.values(t).forEach((function(t){t&&"object"===A(t)&&(Array.isArray(t)?Object.values(t).forEach((function(t){t&&"object"===A(t)&&i(n._getExternalRefs(t,e))})):i(n._getExternalRefs(t,e)))})),t.id&&"string"==typeof t.id&&"urn:"===t.id.substr(0,4)?this.refs[t.id]=t:t.$id&&"string"==typeof t.$id&&"urn:"===t.$id.substr(0,4)&&(this.refs[t.$id]=t),r}},{key:"_getFileBase",value:function(t){if(!t)return"/";var e=this.options.ajaxBase;return void 0===e?this._getFileBaseFromFileLocation(t):e}},{key:"_getFileBaseFromFileLocation",value:function(t){var e=t.split("/");return e.pop(),"".concat(e.join("/"),"/")}},{key:"_joinUrl",value:function(t,e){var n=t;return"http://"!==t.substr(0,7)&&"https://"!==t.substr(0,8)&&"blob:"!==t.substr(0,5)&&"data:"!==t.substr(0,5)&&"#"!==t.substr(0,1)&&"/"!==t.substr(0,1)&&(n=e+t),n.indexOf("#")>0&&(n=n.substr(0,n.indexOf("#"))),n}},{key:"_isUniformResourceName",value:function(t){return"urn:"===t.substr(0,4)}},{key:"_loadExternalRefs",value:function(t,e,n,r){var i=this,o=this._getExternalRefs(t,n),a=!1,s=0;Object.keys(o).forEach((function(n){if(!i.refs[n])if(i._isUniformResourceName(n)){i.refs[n]="loading",s++;var o,l=i.options.urn_resolver,c=n;if("function"!=typeof l)throw console.log('No "urn_resolver" callback defined to resolve "'.concat(c,'"')),new Error("Must set urn_resolver option to a callback to resolve ".concat(c));c.indexOf("#")>0&&(c=c.substr(0,c.indexOf("#")));try{o=l(c,(function(r){try{t=JSON.parse(r)}catch(t){throw console.log(t),new Error("Failed to parse external ref ".concat(c))}if("boolean"!=typeof t&&"object"!==A(t)||null===t||Array.isArray(t))throw new Error("External ref does not contain a valid schema - ".concat(c));i.refs[n]=t,i._getDefinitions(t,"".concat(c,"#/definitions/")),i._loadExternalRefs(t,(function(){s--,a&&!s&&e()}),n,"/")}))}catch(t){throw console.log(t),new Error("Failed to parse external ref ".concat(c))}if("boolean"!=typeof o)throw new Error("External ref does not contain a valid schema - ".concat(c));if(!0!==o)throw new Error("External ref did not resolve - ".concat(c))}else{if(!i.options.ajax)throw new Error("Must set ajax option to true to load external ref ".concat(n));i.refs[n]="loading",s++;var u=i._joinUrl(n,r),h=new XMLHttpRequest;h.overrideMimeType("application/json"),h.open("GET",u,!0),i.options.ajaxCredentials&&(h.withCredentials=i.options.ajaxCredentials),h.onreadystatechange=function(){if(4===h.readyState){if(200!==h.status)throw console.log(h),new Error("Failed to fetch ref via ajax - ".concat(n));var t;try{t=JSON.parse(h.responseText)}catch(t){throw console.log(t),new Error("Failed to parse external ref ".concat(u))}if("boolean"!=typeof t&&"object"!==A(t)||null===t||Array.isArray(t))throw new Error("External ref does not contain a valid schema - ".concat(u));i.refs[n]=t;var r=i._getFileBaseFromFileLocation(u);if(u!==n){var o=u.split("/");u=("/"===n.substr(0,1)?"/":"")+o.pop()}i._getDefinitions(t,"".concat(u,"#/definitions/")),i._loadExternalRefs(t,(function(){s--,a&&!s&&e()}),u,r)}},h.send()}})),a=!0,s||e()}},{key:"extendSchemas",value:function(t,e){var n=this;t=f({},t),e=f({},e);var r={},i=function(t,i){!function(t,e){return("required"===t||"defaultProperties"===t)&&"object"===A(e)&&Array.isArray(e)}(t,i)?"type"!==t||"string"!=typeof i&&!Array.isArray(i)?"object"!==A(i)||Array.isArray(i)||null===i?r[t]=i:r[t]=n.extendSchemas(i,e[t]):o(i):r[t]=i.concat(e[t]).reduce((function(t,e){return t.includes(e)||t.push(e),t}),[])},o=function(t){"string"==typeof t&&(t=[t]),"string"==typeof e.type&&(e.type=[e.type]),e.type&&e.type.length?r.type=t.filter((function(t){return e.type.includes(t)})):r.type=t,1===r.type.length&&"string"==typeof r.type[0]?r.type=r.type[0]:0===r.type.length&&delete r.type};return Object.entries(t).forEach((function(t){var n=L(t,2),o=n[0],a=n[1];void 0!==e[o]?i(o,a):r[o]=a})),Object.entries(e).forEach((function(e){var n=L(e,2),i=n[0],o=n[1];void 0===t[i]&&(r[i]=o)})),r}}])&&I(e.prototype,n),r&&I(e,r),t}();n(7),n(8),n(9),n(10),n(14),n(106);function N(t,e){return function(t){if(Array.isArray(t))return t}(t)||function(t,e){var n=t&&("undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"]);if(null==n)return;var r,i,o=[],a=!0,s=!1;try{for(n=n.call(t);!(a=(r=n.next()).done)&&(o.push(r.value),!e||o.length!==e);a=!0);}catch(t){s=!0,i=t}finally{try{a||null==n.return||n.return()}finally{if(s)throw i}}return o}(t,e)||function(t,e){if(!t)return;if("string"==typeof t)return F(t,e);var n=Object.prototype.toString.call(t).slice(8,-1);"Object"===n&&t.constructor&&(n=t.constructor.name);if("Map"===n||"Set"===n)return Array.from(t);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return F(t,e)}(t,e)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function F(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,r=new Array(e);n<e;n++)r[n]=t[n];return r}function V(t){return(V="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function D(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}var H=function(){function t(e,n){!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,t),this.defaults=n,this.jsoneditor=e.jsoneditor,this.theme=this.jsoneditor.theme,this.template_engine=this.jsoneditor.template,this.iconlib=this.jsoneditor.iconlib,this.translate=this.jsoneditor.translate||this.defaults.translate,this.translateProperty=this.jsoneditor.translateProperty||this.defaults.translateProperty,this.original_schema=e.schema,this.schema=this.jsoneditor.expandSchema(this.original_schema),this.active=!0,this.options=f({},this.options||{},this.schema.options||{},e.schema.options||{},e),this.formname=this.jsoneditor.options.form_name_root||"root",e.path||this.schema.id||(this.schema.id=this.formname),this.path=e.path||this.formname,this.formname=e.formname||this.path.replace(/\.([^.]+)/g,"[$1]"),this.parent=e.parent,this.key=void 0!==this.parent?this.path.split(".").slice(this.parent.path.split(".").length).join("."):this.path,this.link_watchers=[],this.watchLoop=!1,e.container&&this.setContainer(e.container),this.registerDependencies()}var e,n,r;return e=t,(n=[{key:"onChildEditorChange",value:function(t){this.onChange(!0)}},{key:"notify",value:function(){this.path&&this.jsoneditor.notifyWatchers(this.path)}},{key:"change",value:function(){this.parent?this.parent.onChildEditorChange(this):this.jsoneditor&&this.jsoneditor.onChange()}},{key:"onChange",value:function(t){this.notify(),this.watch_listener&&this.watch_listener(),t&&this.change()}},{key:"register",value:function(){this.jsoneditor.registerEditor(this),this.onChange()}},{key:"unregister",value:function(){this.jsoneditor&&this.jsoneditor.unregisterEditor(this)}},{key:"getNumColumns",value:function(){return 12}},{key:"isActive",value:function(){return this.active}},{key:"activate",value:function(){this.active=!0,this.optInCheckbox.checked=!0,this.enable(),this.change()}},{key:"deactivate",value:function(){this.isRequired()||(this.active=!1,this.optInCheckbox.checked=!1,this.disable(),this.change())}},{key:"registerDependencies",value:function(){var t=this;this.dependenciesFulfilled=!0;var e=this.options.dependencies;e&&Object.keys(e).forEach((function(e){var n=t.path.split(".");n[n.length-1]=e,n=n.join("."),t.jsoneditor.watch(n,(function(){t.evaluateDependencies()}))}))}},{key:"evaluateDependencies",value:function(){var t=this,e=this.container||this.control;if(e&&null!==this.jsoneditor){var n=this.options.dependencies;if(n){var r=this.dependenciesFulfilled;this.dependenciesFulfilled=!0,Object.keys(n).forEach((function(e){var r=t.path.split(".");r[r.length-1]=e,r=r.join(".");var i=n[e];t.checkDependency(r,i)})),this.dependenciesFulfilled!==r&&this.notify();var i=this.dependenciesFulfilled?"block":"none";this.options.hidden&&(i="none"),"TD"===e.tagName?Object.keys(e.childNodes).forEach((function(t){return e.childNodes[t].style.display=i})):e.style.display=i}}}},{key:"checkDependency",value:function(t,e){var n=this;if(this.path!==t&&null!==this.jsoneditor){var r=this.jsoneditor.getEditor(t),i=r?r.getValue():void 0;r&&r.dependenciesFulfilled?Array.isArray(e)?this.dependenciesFulfilled=e.some((function(t){if(JSON.stringify(i)===JSON.stringify(t))return!0})):"object"===V(e)?"object"!==V(i)?this.dependenciesFulfilled=e===i:Object.keys(e).some((function(t){return!!v(e,t)&&(v(i,t)&&e[t]===i[t]?void 0:(n.dependenciesFulfilled=!1,!0))})):"string"==typeof e||"number"==typeof e?this.dependenciesFulfilled=this.dependenciesFulfilled&&i===e:"boolean"==typeof e&&(this.dependenciesFulfilled=e?this.dependenciesFulfilled&&(i||i.length>0):this.dependenciesFulfilled&&(!i||0===i.length)):this.dependenciesFulfilled=!1}}},{key:"setContainer",value:function(t){this.container=t,this.schema.id&&this.container.setAttribute("data-schemaid",this.schema.id),this.schema.type&&"string"==typeof this.schema.type&&this.container.setAttribute("data-schematype",this.schema.type),this.container.setAttribute("data-schemapath",this.path)}},{key:"setOptInCheckbox",value:function(t){var e=this;this.optInCheckbox=document.createElement("input"),this.optInCheckbox.setAttribute("type","checkbox"),this.optInCheckbox.setAttribute("style","margin: 0 10px 0 0;"),this.optInCheckbox.classList.add("json-editor-opt-in"),this.optInCheckbox.addEventListener("click",(function(){e.isActive()?e.deactivate():e.activate()}));var n=this.jsoneditor.options.show_opt_in,r=void 0!==this.parent.options.show_opt_in,i=r&&!0===this.parent.options.show_opt_in,o=r&&!1===this.parent.options.show_opt_in;(i||!o&&n||!r&&n)&&this.parent&&"object"===this.parent.schema.type&&!this.isRequired()&&this.header&&(this.header.appendChild(this.optInCheckbox),this.header.insertBefore(this.optInCheckbox,this.header.firstChild))}},{key:"preBuild",value:function(){}},{key:"build",value:function(){}},{key:"postBuild",value:function(){this.setupWatchListeners(),this.addLinks(),this.setValue(this.getDefault(),!0),this.updateHeaderText(),this.register(),this.onWatchedFieldChange()}},{key:"setupWatchListeners",value:function(){var t=this;if(this.watched={},this.schema.vars&&(this.schema.watch=this.schema.vars),this.watched_values={},this.watch_listener=function(){t.refreshWatchedFieldValues()&&t.onWatchedFieldChange()},v(this.schema,"watch")){var e,n,r,i,o,a=this.container.getAttribute("data-schemapath");Object.keys(this.schema.watch).forEach((function(s){if(e=t.schema.watch[s],Array.isArray(e)){if(e.length<2)return;n=[e[0]].concat(e[1].split("."))}else n=e.split("."),t.theme.closest(t.container,'[data-schemaid="'.concat(n[0],'"]'))||n.unshift("#");if("#"===(r=n.shift())&&(r=t.jsoneditor.schema.id||t.jsoneditor.root.formname),!(i=t.theme.closest(t.container,'[data-schemaid="'.concat(r,'"]'))))throw new Error("Could not find ancestor node with id ".concat(r));o="".concat(i.getAttribute("data-schemapath"),".").concat(n.join(".")),a.startsWith(o)&&(t.watchLoop=!0),t.jsoneditor.watch(o,t.watch_listener),t.watched[s]=o}))}this.schema.headerTemplate&&(this.header_template=this.jsoneditor.compileTemplate(this.schema.headerTemplate,this.template_engine))}},{key:"addLinks",value:function(){if(!this.no_link_holder&&(this.link_holder=this.theme.getLinksHolder(),void 0!==this.description?this.description.parentNode.insertBefore(this.link_holder,this.description):this.container.appendChild(this.link_holder),this.schema.links))for(var t=0;t<this.schema.links.length;t++)this.addLink(this.getLink(this.schema.links[t]))}},{key:"onMove",value:function(){}},{key:"getButton",value:function(t,e,n){var r=arguments.length>3&&void 0!==arguments[3]?arguments[3]:[],i="json-editor-btn-".concat(e);e=this.iconlib?this.iconlib.getIcon(e):null,t=this.translate(t,r),n=this.translate(n,r),!e&&n&&(t=n,n=null);var o=this.theme.getButton(t,e,n);return o.classList.add(i),o}},{key:"setButtonText",value:function(t,e,n,r){var i=arguments.length>4&&void 0!==arguments[4]?arguments[4]:[];return n=this.iconlib?this.iconlib.getIcon(n):null,e=this.translate(e,i),r=this.translate(r,i),!n&&r&&(e=r,r=null),this.theme.setButtonText(t,e,n,r)}},{key:"addLink",value:function(t){this.link_holder&&this.link_holder.appendChild(t)}},{key:"getLink",value:function(t){var e,n,r=(t.mediaType||"application/javascript").split("/")[0],i=this.jsoneditor.compileTemplate(t.href,this.template_engine),o=this.jsoneditor.compileTemplate(t.rel?t.rel:t.href,this.template_engine),a=null;if(t.download&&(a=t.download),a&&!0!==a&&(a=this.jsoneditor.compileTemplate(a,this.template_engine)),"image"===r){e=this.theme.getBlockLinkHolder(),(n=document.createElement("a")).setAttribute("target","_blank");var s=document.createElement("img");this.theme.createImageLink(e,n,s),this.link_watchers.push((function(t){var e=i(t),r=o(t);n.setAttribute("href",e),n.setAttribute("title",r||e),s.setAttribute("src",e)}))}else if(["audio","video"].includes(r)){e=this.theme.getBlockLinkHolder(),(n=this.theme.getBlockLink()).setAttribute("target","_blank");var l=document.createElement(r);l.setAttribute("controls","controls"),this.theme.createMediaLink(e,n,l),this.link_watchers.push((function(t){var e=i(t),r=o(t);n.setAttribute("href",e),n.textContent=r||e,l.setAttribute("src",e)}))}else n=e=this.theme.getBlockLink(),e.setAttribute("target","_blank"),e.textContent=t.rel,e.style.display="none",this.link_watchers.push((function(t){var n=i(t),r=o(t);n&&(e.style.display=""),e.setAttribute("href",n),e.textContent=r||n}));return a&&n&&(!0===a?n.setAttribute("download",""):this.link_watchers.push((function(t){n.setAttribute("download",a(t))}))),t.class&&n.classList.add(t.class),e}},{key:"refreshWatchedFieldValues",value:function(){var t=this;if(this.watched_values){var e={},n=!1;return this.watched&&Object.keys(this.watched).forEach((function(r){var i=t.jsoneditor.getEditor(t.watched[r]),o=i?i.getValue():null;t.watched_values[r]!==o&&(n=!0),e[r]=o})),e.self=this.getValue(),this.watched_values.self!==e.self&&(n=!0),this.watched_values=e,n}}},{key:"getWatchedFieldValues",value:function(){return this.watched_values}},{key:"updateHeaderText",value:function(){if(this.header){var t=this.getHeaderText();if(this.header.children.length){for(var e=0;e<this.header.childNodes.length;e++)if(3===this.header.childNodes[e].nodeType){this.header.childNodes[e].nodeValue=this.cleanText(t);break}}else window.DOMPurify?this.header.innerHTML=window.DOMPurify.sanitize(t):this.header.textContent=this.cleanText(t)}}},{key:"getHeaderText",value:function(t){return this.header_text?this.header_text:t?this.translateProperty(this.schema.title):this.getTitle()}},{key:"getPathDepth",value:function(){return this.path.split(".").length}},{key:"cleanText",value:function(t){var e=document.createElement("div");return e.innerHTML=t,e.textContent||e.innerText}},{key:"onWatchedFieldChange",value:function(){var t;if(this.header_template){t=f(this.getWatchedFieldValues(),{key:this.key,i:this.key,i0:1*this.key,i1:1*this.key+1,title:this.getTitle()});var e=this.header_template(t);e!==this.header_text&&(this.header_text=e,this.updateHeaderText(),this.notify())}if(this.link_watchers.length){t=this.getWatchedFieldValues();for(var n=0;n<this.link_watchers.length;n++)this.link_watchers[n](t)}}},{key:"setValue",value:function(t){this.value=t}},{key:"getValue",value:function(){if(this.dependenciesFulfilled)return this.value}},{key:"refreshValue",value:function(){}},{key:"getChildEditors",value:function(){return!1}},{key:"destroy",value:function(){var t=this;this.unregister(this),this.watched&&Object.values(this.watched).forEach((function(e){return t.jsoneditor.unwatch(e,t.watch_listener)})),this.watched=null,this.watched_values=null,this.watch_listener=null,this.header_text=null,this.header_template=null,this.value=null,this.container&&this.container.parentNode&&this.container.parentNode.removeChild(this.container),this.container=null,this.jsoneditor=null,this.schema=null,this.path=null,this.key=null,this.parent=null}},{key:"isDefaultRequired",value:function(){return this.isRequired()||!!this.jsoneditor.options.use_default_values}},{key:"getDefault",value:function(){if(void 0!==this.schema.default)return this.schema.default;if(void 0!==this.schema.enum)return this.schema.enum[0];var t=this.schema.type||this.schema.oneOf;if(t&&Array.isArray(t)&&(t=t[0]),t&&"object"===V(t)&&(t=t.type),t&&Array.isArray(t)&&(t=t[0]),"string"==typeof t){if("number"===t)return this.isDefaultRequired()?0:void 0;if("boolean"===t)return!this.isDefaultRequired()&&void 0;if("integer"===t)return this.isDefaultRequired()?0:void 0;if("string"===t)return"";if("object"===t)return{};if("array"===t)return[]}return null}},{key:"getTitle",value:function(){return this.translateProperty(this.schema.title||this.key)}},{key:"enable",value:function(){this.disabled=!1}},{key:"disable",value:function(){this.disabled=!0}},{key:"isEnabled",value:function(){return!this.disabled}},{key:"isRequired",value:function(){return"boolean"==typeof this.schema.required?this.schema.required:this.parent&&this.parent.schema&&Array.isArray(this.parent.schema.required)?this.parent.schema.required.includes(this.key):!!this.jsoneditor.options.required_by_default}},{key:"getDisplayText",value:function(t){var e=[],n={};t.forEach((function(t){t.title&&(n[t.title]=n[t.title]||0,n[t.title]++),t.description&&(n[t.description]=n[t.description]||0,n[t.description]++),t.format&&(n[t.format]=n[t.format]||0,n[t.format]++),t.type&&(n[t.type]=n[t.type]||0,n[t.type]++)})),t.forEach((function(t){var r;r="string"==typeof t?t:t.title&&n[t.title]<=1?t.title:t.format&&n[t.format]<=1?t.format:t.type&&n[t.type]<=1?t.type:t.description&&n[t.description]<=1?t.descripton:t.title?t.title:t.format?t.format:t.type?t.type:t.description?t.description:JSON.stringify(t).length<500?JSON.stringify(t):"type",e.push(r)}));var r={};return e.forEach((function(t,i){r[t]=r[t]||0,r[t]++,n[t]>1&&(e[i]="".concat(t," ").concat(r[t]))})),e}},{key:"getValidId",value:function(t){return(t=void 0===t?"":t.toString()).replace(/\s+/g,"-")}},{key:"setInputAttributes",value:function(t){var e=this;if(this.schema.options&&this.schema.options.inputAttributes){var n=this.schema.options.inputAttributes,r=["name","type"].concat(t);Object.keys(n).forEach((function(t){r.includes(t.toLowerCase())||e.input.setAttribute(t,n[t])}))}}},{key:"expandCallbacks",value:function(t,e){var n=this,r=this.defaults.callbacks[t];return Object.entries(e).forEach((function(i){var o=N(i,2),a=o[0],s=o[1];s===Object(s)?e[a]=n.expandCallbacks(t,s):"string"==typeof s&&"object"===V(r)&&"function"==typeof r[s]&&(e[a]=r[s].bind(null,n))})),e}},{key:"showValidationErrors",value:function(t){}}])&&D(e.prototype,n),r&&D(e,r),t}();function z(t){return(z="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function M(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function q(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function U(t,e,n){return(U="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=W(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function G(t,e){return(G=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function $(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=W(t);if(e){var i=W(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return J(this,n)}}function J(t,e){return!e||"object"!==z(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function W(t){return(W=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Z=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&G(t,e)}(o,t);var e,n,r,i=$(o);function o(){return M(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"register",value:function(){U(W(o.prototype),"register",this).call(this),this.input&&(this.input.setAttribute("name",this.formname),this.input.setAttribute("aria-label",this.formname))}},{key:"unregister",value:function(){U(W(o.prototype),"unregister",this).call(this),this.input&&(this.input.removeAttribute("name"),this.input.removeAttribute("aria-label"))}},{key:"setValue",value:function(t,e,n){if((!this.template||n)&&(this.shouldBeUnset()||null!=t?"object"===z(t)?t=JSON.stringify(t):this.shouldBeUnset()||"string"==typeof t||(t="".concat(t)):t="",t!==this.serialized)){var r=this.sanitize(t);if(this.input.value!==r){if(this.setValueToInputField(r),"range"===this.format){var i=this.control.querySelector("output");i&&(i.value=r)}var o=n||this.getValue()!==t;return this.refreshValue(),e?this.is_dirty=!1:"change"===this.jsoneditor.options.show_errors&&(this.is_dirty=!0),this.adjust_height&&this.adjust_height(this.input),this.onChange(o),{changed:o,value:r}}}}},{key:"setValueToInputField",value:function(t){this.input.value=void 0===t?"":t}},{key:"getNumColumns",value:function(){var t,e=Math.ceil(Math.max(this.getTitle().length,this.schema.maxLength||0,this.schema.minLength||0)/5);return t="textarea"===this.input_type?6:["text","email"].includes(this.input_type)?4:2,Math.min(12,Math.max(e,t))}},{key:"build",value:function(){var t=this;if(this.options.compact||(this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired())),this.schema.description&&(this.description=this.theme.getFormInputDescription(this.translateProperty(this.schema.description))),this.options.infoText&&(this.infoButton=this.theme.getInfoButton(this.translateProperty(this.options.infoText))),this.format=this.schema.format,!this.format&&this.schema.media&&this.schema.media.type&&(this.format=this.schema.media.type.replace(/(^(application|text)\/(x-)?(script\.)?)|(-source$)/g,"")),!this.format&&this.options.default_format&&(this.format=this.options.default_format),this.options.format&&(this.format=this.options.format),this.format)if("textarea"===this.format)this.input_type="textarea",this.input=this.theme.getTextareaInput();else if("range"===this.format){this.input_type="range";var e=this.schema.minimum||0,n=this.schema.maximum||Math.max(100,e+1),r=1;this.schema.multipleOf&&(e%this.schema.multipleOf&&(e=Math.ceil(e/this.schema.multipleOf)*this.schema.multipleOf),n%this.schema.multipleOf&&(n=Math.floor(n/this.schema.multipleOf)*this.schema.multipleOf),r=this.schema.multipleOf),this.input=this.theme.getRangeInput(e,n,r)}else this.input_type="text",["button","checkbox","color","date","datetime-local","email","file","hidden","image","month","number","password","radio","reset","search","submit","tel","text","time","url","week"].includes(this.format)&&(this.input_type=this.format),this.input=this.theme.getFormInputField(this.input_type);else this.input_type="text",this.input=this.theme.getFormInputField(this.input_type);void 0!==this.schema.maxLength&&this.input.setAttribute("maxlength",this.schema.maxLength),void 0!==this.schema.pattern?this.input.setAttribute("pattern",this.schema.pattern):void 0!==this.schema.minLength&&this.input.setAttribute("pattern",".{".concat(this.schema.minLength,",}")),this.options.compact?this.container.classList.add("compact"):this.options.input_width&&(this.input.style.width=this.options.input_width),(this.schema.readOnly||this.schema.readonly||this.schema.template)&&(this.disable(!0),this.input.setAttribute("readonly","true")),this.setInputAttributes(["maxlength","pattern","readonly","min","max","step"]),this.input.addEventListener("change",(function(e){if(e.preventDefault(),e.stopPropagation(),t.schema.template)e.currentTarget.value=t.value;else{var n=e.currentTarget.value,r=t.sanitize(n);n!==r&&(e.currentTarget.value=r),t.is_dirty=!0,t.refreshValue(),t.onChange(!0)}})),this.options.input_height&&(this.input.style.height=this.options.input_height),this.options.expand_height&&(this.adjust_height=function(t){if(t){var e,n=t.offsetHeight;if(t.offsetHeight<t.scrollHeight)for(e=0;t.offsetHeight<t.scrollHeight+3&&!(e>100);)e++,n++,t.style.height="".concat(n,"px");else{for(e=0;t.offsetHeight>=t.scrollHeight+3&&!(e>100);)e++,n--,t.style.height="".concat(n,"px");t.style.height="".concat(n+1,"px")}}},this.input.addEventListener("keyup",(function(e){t.adjust_height(e.currentTarget)})),this.input.addEventListener("change",(function(e){t.adjust_height(e.currentTarget)})),this.adjust_height()),this.format&&this.input.setAttribute("data-schemaformat",this.format);var i=this.input;if("range"===this.format&&(i=this.theme.getRangeControl(this.input,this.theme.getRangeOutput(this.input,this.schema.default||Math.max(this.schema.minimum||0,0)))),this.control=this.theme.getFormControl(this.label,i,this.description,this.infoButton,this.formname),this.container.appendChild(this.control),window.requestAnimationFrame((function(){t.input.parentNode&&t.afterInputReady(),t.adjust_height&&t.adjust_height(t.input)})),this.schema.template){var o=this.expandCallbacks("template",{template:this.schema.template});"function"==typeof o.template?this.template=o.template:this.template=this.jsoneditor.compileTemplate(this.schema.template,this.template_engine),this.refreshValue()}else this.refreshValue()}},{key:"setupCleave",value:function(t){var e=this.expandCallbacks("cleave",f({},this.defaults.options.cleave||{},this.options.cleave||{}));"object"===z(e)&&Object.keys(e).length>0&&(this.cleave_instance=new window.Cleave(t,e))}},{key:"setupImask",value:function(t){var e=this.expandCallbacks("imask",f({},this.defaults.options.imask||{},this.options.imask||{}));"object"===z(e)&&Object.keys(e).length>0&&(this.imask_instance=window.IMask(t,this.ajustIMaskOptions(e)))}},{key:"ajustIMaskOptions",value:function(t){var e=this;return Object.keys(t).forEach((function(n){if(t[n]===Object(t[n]))t[n]=e.ajustIMaskOptions(t[n]);else if("mask"===n)if("regex:"===t[n].substr(0,6)){var r=t[n].match(/^regex:\/(.*)\/([gimsuy]*)$/);if(null!==r)try{t[n]=new RegExp(r[1],r[2])}catch(t){}}else t[n]=e.getGlobalPropertyFromString(t[n])})),t}},{key:"getGlobalPropertyFromString",value:function(t){if(t.includes(".")){var e=t.split("."),n=e[0],r=e[1];if(void 0!==window[n]&&void 0!==window[n][r])return window[n][r]}else if(void 0!==window[t])return window[t];return t}},{key:"shouldBeUnset",value:function(){return!this.jsoneditor.options.use_default_values&&!this.is_dirty}},{key:"getValue",value:function(){var t=!(!this.input||!this.input.value);if(!this.shouldBeUnset()||t)return this.imask_instance&&this.dependenciesFulfilled&&this.options.imask.returnUnmasked?this.imask_instance.unmaskedValue:U(W(o.prototype),"getValue",this).call(this)}},{key:"enable",value:function(){this.always_disabled||(this.input.disabled=!1,U(W(o.prototype),"enable",this).call(this))}},{key:"disable",value:function(t){t&&(this.always_disabled=!0),this.input.disabled=!0,U(W(o.prototype),"disable",this).call(this)}},{key:"afterInputReady",value:function(){this.theme.afterInputReady(this.input),window.Cleave&&!this.cleave_instance?this.setupCleave(this.input):window.IMask&&!this.imask_instance&&this.setupImask(this.input)}},{key:"refreshValue",value:function(){this.value=this.input.value,"string"==typeof this.value||this.shouldBeUnset()||(this.value=""),this.serialized=this.value}},{key:"destroy",value:function(){this.cleave_instance&&this.cleave_instance.destroy(),this.imask_instance&&this.imask_instance.destroy(),this.template=null,this.input&&this.input.parentNode&&this.input.parentNode.removeChild(this.input),this.label&&this.label.parentNode&&this.label.parentNode.removeChild(this.label),this.description&&this.description.parentNode&&this.description.parentNode.removeChild(this.description),U(W(o.prototype),"destroy",this).call(this)}},{key:"sanitize",value:function(t){return t}},{key:"onWatchedFieldChange",value:function(){var t;this.template&&(t=this.getWatchedFieldValues(),this.setValue(this.template(t),!1,!0)),U(W(o.prototype),"onWatchedFieldChange",this).call(this)}},{key:"showValidationErrors",value:function(t){var e=this;if("always"===this.jsoneditor.options.show_errors);else if(!this.is_dirty&&this.previous_error_setting===this.jsoneditor.options.show_errors)return;this.previous_error_setting=this.jsoneditor.options.show_errors;var n=t.reduce((function(t,n){return n.path===e.path&&t.push(n.message),t}),[]);n.length?this.theme.addInputError(this.input,"".concat(n.join(". "),".")):this.theme.removeInputError(this.input)}}])&&q(e.prototype,n),r&&q(e,r),o}(H);function Q(t){return(Q="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Y(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function X(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function K(t,e,n){return(K="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=rt(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function tt(t,e){return(tt=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function et(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=rt(t);if(e){var i=rt(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return nt(this,n)}}function nt(t,e){return!e||"object"!==Q(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function rt(t){return(rt=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var it=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&tt(t,e)}(o,t);var e,n,r,i=et(o);function o(){return Y(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"setValue",value:function(t,e,n){var r=K(rt(o.prototype),"setValue",this).call(this,t,e,n);void 0!==r&&r.changed&&this.ace_editor_instance&&(this.ace_editor_instance.setValue(r.value),this.ace_editor_instance.session.getSelection().clearSelection(),this.ace_editor_instance.resize())}},{key:"build",value:function(){this.options.format="textarea",K(rt(o.prototype),"build",this).call(this),this.input_type=this.schema.format,this.input.setAttribute("data-schemaformat",this.input_type)}},{key:"afterInputReady",value:function(){var t,e=this;if(window.ace){var n=this.input_type;"cpp"!==n&&"c++"!==n&&"c"!==n||(n="c_cpp"),t=this.expandCallbacks("ace",f({},{selectionStyle:"text",minLines:30,maxLines:30},this.defaults.options.ace||{},this.options.ace||{},{mode:"ace/mode/".concat(n)})),this.ace_container=document.createElement("div"),this.ace_container.style.width="100%",this.ace_container.style.position="relative",this.input.parentNode.insertBefore(this.ace_container,this.input),this.input.style.display="none",this.ace_editor_instance=window.ace.edit(this.ace_container,t),this.ace_editor_instance.setValue(this.getValue()),this.ace_editor_instance.session.getSelection().clearSelection(),this.ace_editor_instance.resize(),(this.schema.readOnly||this.schema.readonly||this.schema.template)&&this.ace_editor_instance.setReadOnly(!0),this.ace_editor_instance.on("change",(function(){e.input.value=e.ace_editor_instance.getValue(),e.refreshValue(),e.is_dirty=!0,e.onChange(!0)})),this.theme.afterInputReady(this.input)}else K(rt(o.prototype),"afterInputReady",this).call(this)}},{key:"getNumColumns",value:function(){return 6}},{key:"enable",value:function(){!this.always_disabled&&this.ace_editor_instance&&this.ace_editor_instance.setReadOnly(!1),K(rt(o.prototype),"enable",this).call(this)}},{key:"disable",value:function(t){this.ace_editor_instance&&this.ace_editor_instance.setReadOnly(!0),K(rt(o.prototype),"disable",this).call(this,t)}},{key:"destroy",value:function(){this.ace_editor_instance&&(this.ace_editor_instance.destroy(),this.ace_editor_instance=null),K(rt(o.prototype),"destroy",this).call(this)}}])&&X(e.prototype,n),r&&X(e,r),o}(Z);function ot(t){return(ot="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function at(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function st(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function lt(t,e,n){return(lt="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=pt(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function ct(t,e){return(ct=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function ut(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=pt(t);if(e){var i=pt(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return ht(this,n)}}function ht(t,e){return!e||"object"!==ot(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function pt(t){return(pt=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var dt=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&ct(t,e)}(o,t);var e,n,r,i=ut(o);function o(){return at(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"askConfirmation",value:function(){return!0!==this.jsoneditor.options.prompt_before_delete||!1!==window.confirm(this.translate("button_delete_node_warning"))}},{key:"getDefault",value:function(){return this.schema.default||[]}},{key:"register",value:function(){lt(pt(o.prototype),"register",this).call(this),this.rows&&this.rows.forEach((function(t){return t.register()}))}},{key:"unregister",value:function(){lt(pt(o.prototype),"unregister",this).call(this),this.rows&&this.rows.forEach((function(t){return t.unregister()}))}},{key:"getNumColumns",value:function(){var t=this.getItemInfo(0);return this.tabs_holder&&"tabs-top"!==this.schema.format?Math.max(Math.min(12,t.width+2),4):t.width}},{key:"enable",value:function(){var t=this;this.always_disabled||(this.setAvailability(this,!1),this.rows&&this.rows.forEach((function(e){e.enable(),t.setAvailability(e,!1)})),lt(pt(o.prototype),"enable",this).call(this))}},{key:"disable",value:function(t){var e=this;t&&(this.always_disabled=!0),this.setAvailability(this,!0),this.rows&&this.rows.forEach((function(n){n.disable(t),e.setAvailability(n,!0)})),lt(pt(o.prototype),"disable",this).call(this)}},{key:"setAvailability",value:function(t,e){t.add_row_button&&(t.add_row_button.disabled=e),t.remove_all_rows_button&&(t.remove_all_rows_button.disabled=e),t.delete_last_row_button&&(t.delete_last_row_button.disabled=e),t.copy_button&&(t.copy_button.disabled=e),t.delete_button&&(t.delete_button.disabled=e),t.moveup_button&&(t.moveup_button.disabled=e),t.movedown_button&&(t.movedown_button.disabled=e)}},{key:"preBuild",value:function(){lt(pt(o.prototype),"preBuild",this).call(this),this.rows=[],this.row_cache=[],this.hide_delete_buttons=this.options.disable_array_delete||this.jsoneditor.options.disable_array_delete,this.hide_delete_all_rows_buttons=this.hide_delete_buttons||this.options.disable_array_delete_all_rows||this.jsoneditor.options.disable_array_delete_all_rows,this.hide_delete_last_row_buttons=this.hide_delete_buttons||this.options.disable_array_delete_last_row||this.jsoneditor.options.disable_array_delete_last_row,this.hide_move_buttons=this.options.disable_array_reorder||this.jsoneditor.options.disable_array_reorder,this.hide_add_button=this.options.disable_array_add||this.jsoneditor.options.disable_array_add,this.show_copy_button=this.options.enable_array_copy||this.jsoneditor.options.enable_array_copy,this.array_controls_top=this.options.array_controls_top||this.jsoneditor.options.array_controls_top}},{key:"build",value:function(){this.options.compact?(this.title=this.theme.getHeader("",this.getPathDepth()),this.container.appendChild(this.title),this.panel=this.theme.getIndentedPanel(),this.container.appendChild(this.panel),this.title_controls=this.theme.getHeaderButtonHolder(),this.title.appendChild(this.title_controls),this.controls=this.theme.getHeaderButtonHolder(),this.title.appendChild(this.controls),this.row_holder=document.createElement("div"),this.panel.appendChild(this.row_holder)):(this.header=document.createElement("label"),this.header.textContent=this.getTitle(),this.title=this.theme.getHeader(this.header,this.getPathDepth()),this.container.appendChild(this.title),this.options.infoText&&(this.infoButton=this.theme.getInfoButton(this.translateProperty(this.options.infoText)),this.container.appendChild(this.infoButton)),this.title_controls=this.theme.getHeaderButtonHolder(),this.title.appendChild(this.title_controls),this.schema.description&&(this.description=this.theme.getDescription(this.translateProperty(this.schema.description)),this.container.appendChild(this.description)),this.error_holder=document.createElement("div"),this.container.appendChild(this.error_holder),"tabs-top"===this.schema.format?(this.controls=this.theme.getHeaderButtonHolder(),this.title.appendChild(this.controls),this.tabs_holder=this.theme.getTopTabHolder(this.getValidId(this.getItemTitle())),this.container.appendChild(this.tabs_holder),this.row_holder=this.theme.getTopTabContentHolder(this.tabs_holder),this.active_tab=null):"tabs"===this.schema.format?(this.controls=this.theme.getHeaderButtonHolder(),this.title.appendChild(this.controls),this.tabs_holder=this.theme.getTabHolder(this.getValidId(this.getItemTitle())),this.container.appendChild(this.tabs_holder),this.row_holder=this.theme.getTabContentHolder(this.tabs_holder),this.active_tab=null):(this.panel=this.theme.getIndentedPanel(),this.container.appendChild(this.panel),this.row_holder=document.createElement("div"),this.panel.appendChild(this.row_holder),this.controls=this.theme.getButtonHolder(),this.array_controls_top?this.title.appendChild(this.controls):this.panel.appendChild(this.controls))),this.addControls()}},{key:"onChildEditorChange",value:function(t){this.refreshValue(),this.refreshTabs(!0),lt(pt(o.prototype),"onChildEditorChange",this).call(this,t)}},{key:"getItemTitle",value:function(){if(!this.item_title)if(this.schema.items&&!Array.isArray(this.schema.items)){var t=this.jsoneditor.expandRefs(this.schema.items);this.item_title=this.translateProperty(t.title)||this.translate("default_array_item_title")}else this.item_title=this.translate("default_array_item_title");return this.cleanText(this.item_title)}},{key:"getItemSchema",value:function(t){return Array.isArray(this.schema.items)?t>=this.schema.items.length?!0===this.schema.additionalItems?{}:this.schema.additionalItems?f({},this.schema.additionalItems):void 0:f({},this.schema.items[t]):this.schema.items?f({},this.schema.items):{}}},{key:"getItemInfo",value:function(t){var e=this.getItemSchema(t);this.item_info=this.item_info||{};var n=JSON.stringify(e);return void 0!==this.item_info[n]||(e=this.jsoneditor.expandRefs(e),this.item_info[n]={title:this.translateProperty(e.title)||this.translate("default_array_item_title"),default:e.default,width:12,child_editors:e.properties||e.items}),this.item_info[n]}},{key:"getElementEditor",value:function(t){var e=this.getItemInfo(t),n=this.getItemSchema(t);(n=this.jsoneditor.expandRefs(n)).title="".concat(e.title," ").concat(t+1);var r,i=this.jsoneditor.getEditorClass(n);this.tabs_holder?(r="tabs-top"===this.schema.format?this.theme.getTopTabContent():this.theme.getTabContent()).id="".concat(this.path,".").concat(t):r=e.child_editors?this.theme.getChildEditorHolder():this.theme.getIndentedPanel(),this.row_holder.appendChild(r);var o=this.jsoneditor.createEditor(i,{jsoneditor:this.jsoneditor,schema:n,container:r,path:"".concat(this.path,".").concat(t),parent:this,required:!0});return o.preBuild(),o.build(),o.postBuild(),o.title_controls||(o.array_controls=this.theme.getButtonHolder(),r.appendChild(o.array_controls)),o}},{key:"checkParent",value:function(t){return t&&t.parentNode}},{key:"destroy",value:function(){this.empty(!0),this.checkParent(this.title)&&this.title.parentNode.removeChild(this.title),this.checkParent(this.description)&&this.description.parentNode.removeChild(this.description),this.checkParent(this.row_holder)&&this.row_holder.parentNode.removeChild(this.row_holder),this.checkParent(this.controls)&&this.controls.parentNode.removeChild(this.controls),this.checkParent(this.panel)&&this.panel.parentNode.removeChild(this.panel),this.rows=this.row_cache=this.title=this.description=this.row_holder=this.panel=this.controls=null,lt(pt(o.prototype),"destroy",this).call(this)}},{key:"empty",value:function(t){var e=this;this.rows&&(this.rows.forEach((function(n,r){t&&(e.checkParent(n.tab)&&n.tab.parentNode.removeChild(n.tab),e.destroyRow(n,!0),e.row_cache[r]=null),e.rows[r]=null})),this.rows=[],t&&(this.row_cache=[]))}},{key:"destroyRow",value:function(t,e){var n=t.container;e?(t.destroy(),n.parentNode&&n.parentNode.removeChild(n),this.checkParent(t.tab)&&t.tab.parentNode.removeChild(t.tab)):(t.tab&&(t.tab.style.display="none"),n.style.display="none",t.unregister())}},{key:"getMax",value:function(){return Array.isArray(this.schema.items)&&!1===this.schema.additionalItems?Math.min(this.schema.items.length,this.schema.maxItems||1/0):this.schema.maxItems||1/0}},{key:"refreshTabs",value:function(t){var e=this;this.rows.forEach((function(n){n.tab&&(t?n.tab_text.textContent=n.getHeaderText():n.tab===e.active_tab?e.theme.markTabActive(n):e.theme.markTabInactive(n))}))}},{key:"ensureArraySize",value:function(t){if(Array.isArray(t)||(t=[t]),this.schema.minItems)for(;t.length<this.schema.minItems;)t.push(this.getItemInfo(t.length).default);return this.getMax()&&t.length>this.getMax()&&(t=t.slice(0,this.getMax())),t}},{key:"setValue",value:function(){var t=this,e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[],n=arguments.length>1?arguments[1]:void 0;e=this.ensureArraySize(e);var r=JSON.stringify(e);if(r!==this.serialized){e.forEach((function(e,r){if(t.rows[r])t.rows[r].setValue(e,n);else if(t.row_cache[r])t.rows[r]=t.row_cache[r],t.rows[r].setValue(e,n),t.rows[r].container.style.display="",t.rows[r].tab&&(t.rows[r].tab.style.display=""),t.rows[r].register(),t.jsoneditor.trigger("addRow",t.rows[r]);else{var i=t.addRow(e,n);t.jsoneditor.trigger("addRow",i)}}));for(var i=e.length;i<this.rows.length;i++)this.destroyRow(this.rows[i]),this.rows[i]=null;this.rows=this.rows.slice(0,e.length);var o=this.rows.find((function(e){return e.tab===t.active_tab})),a=void 0!==o?o.tab:null;!a&&this.rows.length&&(a=this.rows[0].tab),this.active_tab=a,this.refreshValue(n),this.refreshTabs(!0),this.refreshTabs(),this.onChange()}}},{key:"setVisibility",value:function(t,e){t.style.display=e?"":"none"}},{key:"setupButtons",value:function(t){var e=[];if(this.value.length)if(1===this.value.length){this.remove_all_rows_button.style.display="none";var n=!(t||this.hide_delete_last_row_buttons);this.setVisibility(this.delete_last_row_button,n),e.push(n)}else{var r=!(t||this.hide_delete_last_row_buttons);this.setVisibility(this.delete_last_row_button,r),e.push(r);var i=!(t||this.hide_delete_all_rows_buttons);this.setVisibility(this.remove_all_rows_button,i),e.push(i)}else this.delete_last_row_button.style.display="none",this.remove_all_rows_button.style.display="none";var o=!(this.getMax()&&this.getMax()<=this.rows.length||this.hide_add_button);return this.setVisibility(this.add_row_button,o),e.push(o),e.some((function(t){return t}))}},{key:"refreshValue",value:function(t){var e=this,n=this.value?this.value.length:0;if(this.value=this.rows.map((function(t){return t.getValue()})),n!==this.value.length||t){var r=this.schema.minItems&&this.schema.minItems>=this.rows.length;this.rows.forEach((function(t,n){if(t.movedown_button){var i=n!==e.rows.length-1;e.setVisibility(t.movedown_button,i)}t.delete_button&&e.setVisibility(t.delete_button,!r),e.value[n]=t.getValue()})),!this.collapsed&&this.setupButtons(r)?this.controls.style.display="inline-block":this.controls.style.display="none"}this.serialized=JSON.stringify(this.value)}},{key:"addRow",value:function(t,e){var n=this,r=this.rows.length;this.rows[r]=this.getElementEditor(r),this.row_cache[r]=this.rows[r],this.tabs_holder&&(this.rows[r].tab_text=document.createElement("span"),this.rows[r].tab_text.textContent=this.rows[r].getHeaderText(),"tabs-top"===this.schema.format?(this.rows[r].tab=this.theme.getTopTab(this.rows[r].tab_text,this.getValidId(this.rows[r].path)),this.theme.addTopTab(this.tabs_holder,this.rows[r].tab)):(this.rows[r].tab=this.theme.getTab(this.rows[r].tab_text,this.getValidId(this.rows[r].path)),this.theme.addTab(this.tabs_holder,this.rows[r].tab)),this.rows[r].tab.addEventListener("click",(function(t){n.active_tab=n.rows[r].tab,n.refreshTabs(),t.preventDefault(),t.stopPropagation()})));var i=this.rows[r].title_controls||this.rows[r].array_controls;return this.hide_delete_buttons||(this.rows[r].delete_button=this._createDeleteButton(r,i)),this.show_copy_button&&(this.rows[r].copy_button=this._createCopyButton(r,i)),r&&!this.hide_move_buttons&&(this.rows[r].moveup_button=this._createMoveUpButton(r,i)),this.hide_move_buttons||(this.rows[r].movedown_button=this._createMoveDownButton(r,i)),void 0!==t&&this.rows[r].setValue(t,e),this.refreshTabs(),this.rows[r]}},{key:"_createDeleteButton",value:function(t,e){var n=this,r=this.getButton(this.getItemTitle(),"delete","button_delete_row_title",[this.getItemTitle()]);return r.classList.add("delete","json-editor-btntype-delete"),r.setAttribute("data-i",t),r.addEventListener("click",(function(t){if(t.preventDefault(),t.stopPropagation(),!n.askConfirmation())return!1;var e=1*t.currentTarget.getAttribute("data-i"),r=n.getValue().filter((function(t,n){return n!==e})),i=null,o=n.rows[e];n.setValue(r),n.rows[e]?i=n.rows[e].tab:n.rows[e-1]&&(i=n.rows[e-1].tab),i&&(n.active_tab=i,n.refreshTabs()),n.onChange(!0),n.jsoneditor.trigger("deleteRow",o)})),e&&e.appendChild(r),r}},{key:"_createCopyButton",value:function(t,e){var n=this,r=this.getButton(this.getItemTitle(),"copy","button_copy_row_title",[this.getItemTitle()]);return r.classList.add("copy","json-editor-btntype-copy"),r.setAttribute("data-i",t),r.addEventListener("click",(function(t){var e=n.getValue();t.preventDefault(),t.stopPropagation();var r=1*t.currentTarget.getAttribute("data-i");e.forEach((function(t,n){n===r&&e.push(t)})),n.setValue(e),n.refreshValue(!0),n.onChange(!0)})),e.appendChild(r),r}},{key:"_createMoveUpButton",value:function(t,e){var n=this,r=this.getButton("","tabs-top"===this.schema.format?"moveleft":"moveup","button_move_up_title");return r.classList.add("moveup","json-editor-btntype-move"),r.setAttribute("data-i",t),r.addEventListener("click",(function(t){t.preventDefault(),t.stopPropagation();var e=1*t.currentTarget.getAttribute("data-i");if(!(e<=0)){var r=n.getValue(),i=r[e-1];r[e-1]=r[e],r[e]=i,n.setValue(r),n.active_tab=n.rows[e-1].tab,n.refreshTabs(),n.onChange(!0),n.jsoneditor.trigger("moveRow",n.rows[e-1])}})),e&&e.appendChild(r),r}},{key:"_createMoveDownButton",value:function(t,e){var n=this,r=this.getButton("","tabs-top"===this.schema.format?"moveright":"movedown","button_move_down_title");return r.classList.add("movedown","json-editor-btntype-move"),r.setAttribute("data-i",t),r.addEventListener("click",(function(t){t.preventDefault(),t.stopPropagation();var e=1*t.currentTarget.getAttribute("data-i"),r=n.getValue();if(!(e>=r.length-1)){var i=r[e+1];r[e+1]=r[e],r[e]=i,n.setValue(r),n.active_tab=n.rows[e+1].tab,n.refreshTabs(),n.onChange(!0),n.jsoneditor.trigger("moveRow",n.rows[e+1])}})),e&&e.appendChild(r),r}},{key:"addControls",value:function(){this.collapsed=!1,this.toggle_button=this._createToggleButton(),this.options.collapsed&&y(this.toggle_button,"click"),this.schema.options&&void 0!==this.schema.options.disable_collapse?this.schema.options.disable_collapse&&(this.toggle_button.style.display="none"):this.jsoneditor.options.disable_collapse&&(this.toggle_button.style.display="none"),this.add_row_button=this._createAddRowButton(),this.delete_last_row_button=this._createDeleteLastRowButton(),this.remove_all_rows_button=this._createRemoveAllRowsButton(),this.tabs&&(this.add_row_button.classList.add("je-array-control-btn"),this.delete_last_row_button.classList.add("je-array-control-btn"),this.remove_all_rows_button.classList.add("je-array-control-btn"))}},{key:"_createToggleButton",value:function(){var t=this,e=this.getButton("","collapse","button_collapse");e.classList.add("json-editor-btntype-toggle"),this.title.insertBefore(e,this.title.childNodes[0]);var n=this.row_holder.style.display,r=this.controls.style.display;return e.addEventListener("click",(function(e){e.preventDefault(),e.stopPropagation(),t.panel&&t.setVisibility(t.panel,t.collapsed),t.tabs_holder&&t.setVisibility(t.tabs_holder,t.collapsed),t.collapsed?(t.collapsed=!1,t.row_holder.style.display=n,t.controls.style.display=r,t.setButtonText(e.currentTarget,"","collapse","button_collapse")):(t.collapsed=!0,t.row_holder.style.display="none",t.controls.style.display="none",t.setButtonText(e.currentTarget,"","expand","button_expand"))})),e}},{key:"_createAddRowButton",value:function(){var t=this,e=this.getButton(this.getItemTitle(),"add","button_add_row_title",[this.getItemTitle()]);return e.classList.add("json-editor-btntype-add"),e.addEventListener("click",(function(e){e.preventDefault(),e.stopPropagation();var n,r=t.rows.length;t.row_cache[r]?(n=t.rows[r]=t.row_cache[r],t.rows[r].setValue(t.rows[r].getDefault(),!0),t.rows[r].container.style.display="",t.rows[r].tab&&(t.rows[r].tab.style.display=""),t.rows[r].register()):n=t.addRow(),t.active_tab=t.rows[r].tab,t.refreshTabs(),t.refreshValue(),t.onChange(!0),t.jsoneditor.trigger("addRow",n)})),this.controls.appendChild(e),e}},{key:"_createDeleteLastRowButton",value:function(){var t=this,e=this.getButton("button_delete_last","subtract","button_delete_last_title",[this.getItemTitle()]);return e.classList.add("json-editor-btntype-deletelast"),e.addEventListener("click",(function(e){if(e.preventDefault(),e.stopPropagation(),!t.askConfirmation())return!1;var n=t.getValue(),r=null,i=n.pop();t.setValue(n),t.rows[t.rows.length-1]&&(r=t.rows[t.rows.length-1].tab),r&&(t.active_tab=r,t.refreshTabs()),t.onChange(!0),t.jsoneditor.trigger("deleteRow",i)})),this.controls.appendChild(e),e}},{key:"_createRemoveAllRowsButton",value:function(){var t=this,e=this.getButton("button_delete_all","delete","button_delete_all_title");return e.classList.add("json-editor-btntype-deleteall"),e.addEventListener("click",(function(e){if(e.preventDefault(),e.stopPropagation(),!t.askConfirmation())return!1;t.empty(!0),t.setValue([]),t.onChange(!0),t.jsoneditor.trigger("deleteAllRows")})),this.controls.appendChild(e),e}},{key:"showValidationErrors",value:function(t){var e=this,n=[],r=[];t.forEach((function(t){t.path===e.path?n.push(t):r.push(t)})),this.error_holder&&(n.length?(this.error_holder.innerHTML="",this.error_holder.style.display="",n.forEach((function(t){e.error_holder.appendChild(e.theme.getErrorMessage(t.message))}))):this.error_holder.style.display="none"),this.rows.forEach((function(t){return t.showValidationErrors(r)}))}}])&&st(e.prototype,n),r&&st(e,r),o}(H);function ft(t){return(ft="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function yt(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function mt(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function vt(t,e,n){return(vt="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=wt(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function bt(t,e){return(bt=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function gt(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=wt(t);if(e){var i=wt(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return _t(this,n)}}function _t(t,e){return!e||"object"!==ft(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function wt(t){return(wt=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}dt.rules={".json-editor-btntype-toggle":"margin:0%2010px%200%200",".je-array-control-btn":"width:100%25;text-align:left;margin-bottom:3px"};var kt=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&bt(t,e)}(o,t);var e,n,r,i=gt(o);function o(){return yt(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"onInputChange",value:function(){this.value=this.input.value,this.onChange(!0)}},{key:"register",value:function(){vt(wt(o.prototype),"register",this).call(this),this.input&&this.input.setAttribute("name",this.formname)}},{key:"unregister",value:function(){vt(wt(o.prototype),"unregister",this).call(this),this.input&&this.input.removeAttribute("name")}},{key:"getNumColumns",value:function(){var t=this,e=this.getTitle().length;return Object.keys(this.select_values).forEach((function(n){return e=Math.max(e,"".concat(t.select_values[n]).length+4)})),Math.min(12,Math.max(e/7,2))}},{key:"preBuild",value:function(){var t;vt(wt(o.prototype),"preBuild",this).call(this),this.select_options={},this.select_values={},this.option_keys=[],this.option_titles=[];var e=this.jsoneditor.expandRefs(this.schema.items||{}),n=e.enum||[],r=e.options&&e.options.enum_titles||[];for(t=0;t<n.length;t++)this.sanitize(n[t])===n[t]&&(this.option_keys.push("".concat(n[t])),this.option_titles.push("".concat(r[t]||n[t])),this.select_values["".concat(n[t])]=n[t])}},{key:"build",value:function(){var t,e=this;if(this.options.compact||(this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired())),this.schema.description&&(this.description=this.theme.getFormInputDescription(this.translateProperty(this.schema.description))),this.options.infoText&&(this.infoButton=this.theme.getInfoButton(this.translateProperty(this.options.infoText))),this.options.compact&&this.container.classList.add("compact"),!this.schema.format&&this.option_keys.length<8||"checkbox"===this.schema.format){for(this.input_type="checkboxes",this.inputs={},this.controls={},t=0;t<this.option_keys.length;t++){var n=this.formname+t.toString();this.inputs[this.option_keys[t]]=this.theme.getCheckbox(),this.inputs[this.option_keys[t]].id=n,this.select_options[this.option_keys[t]]=this.inputs[this.option_keys[t]];var r=this.theme.getCheckboxLabel(this.option_titles[t]);r.htmlFor=n,this.controls[this.option_keys[t]]=this.theme.getFormControl(r,this.inputs[this.option_keys[t]])}this.control=this.theme.getMultiCheckboxHolder(this.controls,this.label,this.description,this.infoButton),this.inputs.controlgroup=this.inputs.controls=this.control}else{for(this.input_type="select",this.input=this.theme.getSelectInput(this.option_keys,!0),this.theme.setSelectOptions(this.input,this.option_keys,this.option_titles),this.input.setAttribute("multiple","multiple"),this.input.size=Math.min(10,this.option_keys.length),t=0;t<this.option_keys.length;t++)this.select_options[this.option_keys[t]]=this.input.children[t];this.control=this.theme.getFormControl(this.label,this.input,this.description,this.infoButton)}(this.schema.readOnly||this.schema.readonly)&&this.disable(!0),this.container.appendChild(this.control),this.multiselectChangeHandler=function(n){var r=[];for(t=0;t<e.option_keys.length;t++)e.select_options[e.option_keys[t]]&&(e.select_options[e.option_keys[t]].selected||e.select_options[e.option_keys[t]].checked)&&r.push(e.select_values[e.option_keys[t]]);e.updateValue(r),e.onChange(!0)},this.control.addEventListener("change",this.multiselectChangeHandler,!1),window.requestAnimationFrame((function(){e.afterInputReady()}))}},{key:"postBuild",value:function(){vt(wt(o.prototype),"postBuild",this).call(this)}},{key:"afterInputReady",value:function(){this.theme.afterInputReady(this.input||this.inputs)}},{key:"setValue",value:function(t,e){var n=this;t=t||[],Array.isArray(t)||(t=[t]),t=t.map((function(t){return"".concat(t)})),Object.keys(this.select_options).forEach((function(e){n.select_options[e]["select"===n.input_type?"selected":"checked"]=t.includes(e)})),this.updateValue(t),this.onChange(!0)}},{key:"removeValue",value:function(t){t=[].concat(t),this.setValue(this.getValue().filter((function(e){return!t.includes(e)})))}},{key:"addValue",value:function(t){this.setValue(this.getValue().concat(t))}},{key:"updateValue",value:function(t){for(var e=!1,n=[],r=0;r<t.length;r++)if(this.select_options["".concat(t[r])]){var i=this.sanitize(this.select_values[t[r]]);n.push(i),i!==t[r]&&(e=!0)}else e=!0;return this.value=n,e}},{key:"sanitize",value:function(t){return"boolean"===this.schema.items.type?!!t:"number"===this.schema.items.type?1*t||0:"integer"===this.schema.items.type?Math.floor(1*t||0):"".concat(t)}},{key:"enable",value:function(){var t=this;this.always_disabled||(this.input?this.input.disabled=!1:this.inputs&&Object.keys(this.inputs).forEach((function(e){return t.inputs[e].disabled=!1})),vt(wt(o.prototype),"enable",this).call(this))}},{key:"disable",value:function(t){var e=this;t&&(this.always_disabled=!0),this.input?this.input.disabled=!0:this.inputs&&Object.keys(this.inputs).forEach((function(t){return e.inputs[t].disabled=!0})),vt(wt(o.prototype),"disable",this).call(this)}},{key:"destroy",value:function(){vt(wt(o.prototype),"destroy",this).call(this)}},{key:"escapeRegExp",value:function(t){return t.replace(/[.*+?^${}()|[\]\\]/g,"\\$&")}},{key:"showValidationErrors",value:function(t){var e=new RegExp("^".concat(this.escapeRegExp(this.path),"(\\.\\d+)?$")),n=t.reduce((function(t,n){return n.path.match(e)&&t.push(n.message),t}),[]);n.length?this.theme.addInputError(this.input||this.inputs,"".concat(n.join(". "),".")):this.theme.removeInputError(this.input||this.inputs)}}])&&mt(e.prototype,n),r&&mt(e,r),o}(H);function xt(t){return(xt="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function jt(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Ot(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Ct(t,e,n){return(Ct="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Rt(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function Et(t,e){return(Et=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function St(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Rt(t);if(e){var i=Rt(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Pt(this,n)}}function Pt(t,e){return!e||"object"!==xt(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Rt(t){return(Rt=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Lt=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Et(t,e)}(o,t);var e,n,r,i=St(o);function o(){return jt(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"setValue",value:function(t,e){this.choices_instance?(t=[].concat(t).map((function(t){return"".concat(t)})),this.updateValue(t),this.choices_instance.removeActiveItems(),this.choices_instance.setChoiceByValue(this.value),this.onChange(!0)):Ct(Rt(o.prototype),"setValue",this).call(this,t,e)}},{key:"afterInputReady",value:function(){var t=this;if(window.Choices&&!this.choices_instance){var e=this.expandCallbacks("choices",f({},{removeItems:!0,removeItemButton:!0},this.defaults.options.choices||{},this.options.choices||{},{addItems:!0,editItems:!1,duplicateItemsAllowed:!1}));this.newEnumAllowed=!1,this.choices_instance=new window.Choices(this.input,e),this.control.removeEventListener("change",this.multiselectChangeHandler),this.multiselectChangeHandler=function(e){var n=t.choices_instance.getValue(!0);t.updateValue(n),t.onChange(!0)},this.control.addEventListener("change",this.multiselectChangeHandler,!1)}Ct(Rt(o.prototype),"afterInputReady",this).call(this)}},{key:"updateValue",value:function(t){t=[].concat(t);for(var e=!1,n=[],r=0;r<t.length;r++){if(!this.select_values["".concat(t[r])]){if(e=!0,!this.newEnumAllowed)continue;if(!this.addNewOption(t[r]))continue}var i=this.sanitize(this.select_values[t[r]]);n.push(i),i!==t[r]&&(e=!0)}return this.value=n,e}},{key:"addNewOption",value:function(t){return this.option_keys.push("".concat(t)),this.option_titles.push("".concat(t)),this.select_values["".concat(t)]=t,this.schema.items.enum.push(t),this.choices_instance.setChoices([{value:"".concat(t),label:"".concat(t)}],"value","label",!1),!0}},{key:"enable",value:function(){!this.always_disabled&&this.choices_instance&&this.choices_instance.enable(),Ct(Rt(o.prototype),"enable",this).call(this)}},{key:"disable",value:function(t){this.choices_instance&&this.choices_instance.disable(),Ct(Rt(o.prototype),"disable",this).call(this,t)}},{key:"destroy",value:function(){this.choices_instance&&(this.choices_instance.destroy(),this.choices_instance=null),Ct(Rt(o.prototype),"destroy",this).call(this)}}])&&Ot(e.prototype,n),r&&Ot(e,r),o}(kt);function Tt(t){return(Tt="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function At(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function It(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Bt(t,e,n){return(Bt="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Dt(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function Nt(t,e){return(Nt=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Ft(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Dt(t);if(e){var i=Dt(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Vt(this,n)}}function Vt(t,e){return!e||"object"!==Tt(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Dt(t){return(Dt=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Ht=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Nt(t,e)}(o,t);var e,n,r,i=Ft(o);function o(){return At(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"setValue",value:function(t,e){this.select2_instance?(t=[].concat(t).map((function(t){return"".concat(t)})),this.updateValue(t),this.select2v4?this.select2_instance.val(this.value).change():this.select2_instance.select2("val",this.value),this.onChange(!0)):Bt(Dt(o.prototype),"setValue",this).call(this,t,e)}},{key:"afterInputReady",value:function(){var t,e=this;window.jQuery&&window.jQuery.fn&&window.jQuery.fn.select2&&!this.select2_instance&&(t=this.expandCallbacks("select2",f({},{tags:!0,width:"100%"},this.defaults.options.select2||{},this.options.select2||{})),this.newEnumAllowed=t.tags=!!t.tags&&this.schema.items&&"string"===this.schema.items.type,this.select2_instance=window.jQuery(this.input).select2(t),this.select2v4=v(this.select2_instance.select2,"amd"),this.selectChangeHandler=function(){var t=e.select2v4?e.select2_instance.val():e.select2_instance.select2("val");e.updateValue(t),e.onChange(!0)},this.select2_instance.on("select2-blur",this.selectChangeHandler),this.select2_instance.on("change",this.selectChangeHandler)),Bt(Dt(o.prototype),"afterInputReady",this).call(this)}},{key:"updateValue",value:function(t){t=[].concat(t);for(var e=!1,n=[],r=0;r<t.length;r++){if(!this.select_values["".concat(t[r])]){if(e=!0,!this.newEnumAllowed)continue;if(!this.addNewOption(t[r]))continue}var i=this.sanitize(this.select_values[t[r]]);n.push(i),i!==t[r]&&(e=!0)}return this.value=n,e}},{key:"addNewOption",value:function(t){this.option_keys.push("".concat(t)),this.option_titles.push("".concat(t)),this.select_values["".concat(t)]=t,this.schema.items.enum.push(t);var e=this.input.querySelector('option[value="'.concat(t,'"]'));return e?e.removeAttribute("data-select2-tag"):this.input.appendChild(new Option(t,t,!1,!1)).trigger("change"),!0}},{key:"enable",value:function(){!this.always_disabled&&this.select2_instance&&(this.select2v4?this.select2_instance.prop("disabled",!1):this.select2_instance.select2("enable",!0)),Bt(Dt(o.prototype),"enable",this).call(this)}},{key:"disable",value:function(t){this.select2_instance&&(this.select2v4?this.select2_instance.prop("disabled",!0):this.select2_instance.select2("enable",!1)),Bt(Dt(o.prototype),"disable",this).call(this)}},{key:"destroy",value:function(){this.select2_instance&&(this.select2_instance.select2("destroy"),this.select2_instance=null),Bt(Dt(o.prototype),"destroy",this).call(this)}}])&&It(e.prototype,n),r&&It(e,r),o}(kt);function zt(t){return(zt="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Mt(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function qt(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Ut(t,e,n){return(Ut="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Wt(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function Gt(t,e){return(Gt=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function $t(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Wt(t);if(e){var i=Wt(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Jt(this,n)}}function Jt(t,e){return!e||"object"!==zt(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Wt(t){return(Wt=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Zt=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Gt(t,e)}(o,t);var e,n,r,i=$t(o);function o(){return Mt(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"setValue",value:function(t,e){this.selectize_instance?(t=[].concat(t).map((function(t){return"".concat(t)})),this.updateValue(t),this.selectize_instance.setValue(this.value),this.onChange(!0)):Ut(Wt(o.prototype),"setValue",this).call(this,t,e)}},{key:"afterInputReady",value:function(){var t,e=this;window.jQuery&&window.jQuery.fn&&window.jQuery.fn.selectize&&!this.selectize_instance&&(t=this.expandCallbacks("selectize",f({},{plugins:["remove_button"],delimiter:!1,createOnBlur:!0,create:!0},this.defaults.options.selectize||{},this.options.selectize||{})),this.newEnumAllowed=t.create=!!t.create&&this.schema.items&&"string"===this.schema.items.type,this.selectize_instance=window.jQuery(this.input).selectize(t)[0].selectize,this.control.removeEventListener("change",this.multiselectChangeHandler),this.multiselectChangeHandler=function(t){var n=e.selectize_instance.getValue();e.updateValue(n),e.onChange(!0)},this.selectize_instance.on("change",this.multiselectChangeHandler)),Ut(Wt(o.prototype),"afterInputReady",this).call(this)}},{key:"updateValue",value:function(t){t=[].concat(t);for(var e=!1,n=[],r=0;r<t.length;r++){if(!this.select_values["".concat(t[r])]){if(e=!0,!this.newEnumAllowed)continue;if(!this.addNewOption(t[r]))continue}var i=this.sanitize(this.select_values[t[r]]);n.push(i),i!==t[r]&&(e=!0)}return this.value=n,e}},{key:"addNewOption",value:function(t){return this.option_keys.push("".concat(t)),this.option_titles.push("".concat(t)),this.select_values["".concat(t)]=t,this.schema.items.enum.push(t),this.selectize_instance.addOption({text:t,value:t}),!0}},{key:"enable",value:function(){!this.always_disabled&&this.selectize_instance&&this.selectize_instance.unlock(),Ut(Wt(o.prototype),"enable",this).call(this)}},{key:"disable",value:function(t){this.selectize_instance&&this.selectize_instance.lock(),Ut(Wt(o.prototype),"disable",this).call(this,t)}},{key:"destroy",value:function(){this.selectize_instance&&(this.selectize_instance.destroy(),this.selectize_instance=null),Ut(Wt(o.prototype),"destroy",this).call(this)}}])&&qt(e.prototype,n),r&&qt(e,r),o}(kt);function Qt(t){return(Qt="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Yt(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Xt(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Kt(t,e,n){return(Kt="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=re(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function te(t,e){return(te=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function ee(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=re(t);if(e){var i=re(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return ne(this,n)}}function ne(t,e){return!e||"object"!==Qt(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function re(t){return(re=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var ie=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&te(t,e)}(o,t);var e,n,r,i=ee(o);function o(){return Yt(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"postBuild",value:function(){window.Autocomplete&&(this.autocomplete_wrapper=document.createElement("div"),this.input.parentNode.insertBefore(this.autocomplete_wrapper,this.input.nextSibling),this.autocomplete_wrapper.appendChild(this.input),this.autocomplete_dropdown=document.createElement("ul"),this.input.parentNode.insertBefore(this.autocomplete_dropdown,this.input.nextSibling)),Kt(re(o.prototype),"postBuild",this).call(this)}},{key:"afterInputReady",value:function(){var t;window.Autocomplete&&!this.autocomplete_instance&&(t=this.expandCallbacks("autocomplete",f({},{search:function(t,e){return console.log('No "search" callback defined for autocomplete in property "'.concat(t.key,'"')),[]},baseClass:"autocomplete"},this.defaults.options.autocomplete||{},this.options.autocomplete||{})),this.autocomplete_wrapper.classList.add(t.baseClass),this.autocomplete_dropdown.classList.add("".concat(t.baseClass,"-result-list")),this.autocomplete_instance=new window.Autocomplete(this.autocomplete_wrapper,t)),Kt(re(o.prototype),"afterInputReady",this).call(this)}},{key:"destroy",value:function(){this.autocomplete_instance&&(this.input&&this.input.parentNode&&this.input.parentNode.removeChild(this.input),this.autocomplete_dropdown&&this.autocomplete_dropdown.parentNode&&this.autocomplete_dropdown.parentNode.removeChild(this.autocomplete_dropdown),this.autocomplete_wrapper&&this.autocomplete_wrapper.parentNode&&this.autocomplete_wrapper.parentNode.removeChild(this.autocomplete_wrapper),this.autocomplete_instance=null),Kt(re(o.prototype),"destroy",this).call(this)}}])&&Xt(e.prototype,n),r&&Xt(e,r),o}(Z);n(134);function oe(t){return(oe="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function ae(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function se(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function le(t,e,n){return(le="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=pe(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function ce(t,e){return(ce=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function ue(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=pe(t);if(e){var i=pe(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return he(this,n)}}function he(t,e){return!e||"object"!==oe(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function pe(t){return(pe=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var de=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&ce(t,e)}(o,t);var e,n,r,i=ue(o);function o(){return ae(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"getNumColumns",value:function(){return 4}},{key:"setFileReaderListener",value:function(t){var e=this;t.addEventListener("load",(function(t){if(e.count===e.current_item_index)e.value[e.count][e.key]=t.target.result;else{var n={};for(var r in e.parent.schema.properties)n[r]="";n[e.key]=t.target.result,e.value.splice(e.count,0,n)}e.count+=1,e.count===e.total+e.current_item_index&&e.arrayEditor.setValue(e.value)}))}},{key:"build",value:function(){var t=this;if(this.options.compact||(this.title=this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired())),this.options.infoText&&(this.infoButton=this.theme.getInfoButton(this.translateProperty(this.options.infoText))),this.input=this.theme.getFormInputField("hidden"),this.container.appendChild(this.input),!this.schema.readOnly&&!this.schema.readonly){if(!window.FileReader)throw new Error("FileReader required for base64 editor");this.uploader=this.theme.getFormInputField("file"),this.schema.options&&this.schema.options.multiple&&!0===this.schema.options.multiple&&this.parent&&"object"===this.parent.schema.type&&this.parent.parent&&"array"===this.parent.parent.schema.type&&this.uploader.setAttribute("multiple",""),this.uploader.addEventListener("change",(function(e){if(e.preventDefault(),e.stopPropagation(),e.currentTarget.files&&e.currentTarget.files.length)if(e.currentTarget.files.length>1&&t.schema.options&&t.schema.options.multiple&&!0===t.schema.options.multiple&&t.parent&&"object"===t.parent.schema.type&&t.parent.parent&&"array"===t.parent.parent.schema.type){t.arrayEditor=t.jsoneditor.getEditor(t.parent.parent.path),t.value=t.arrayEditor.getValue(),t.total=e.currentTarget.files.length,t.current_item_index=parseInt(t.parent.key),t.count=t.current_item_index;for(var n=0;n<t.total;n++){var r=new FileReader;t.setFileReaderListener(r),r.readAsDataURL(e.currentTarget.files[n])}}else{var i=new FileReader;i.onload=function(e){t.value=e.target.result,t.refreshPreview(),t.onChange(!0),i=null},i.readAsDataURL(e.currentTarget.files[0])}}))}this.preview=this.theme.getFormInputDescription(this.translateProperty(this.schema.description)),this.container.appendChild(this.preview),this.control=this.theme.getFormControl(this.label,this.uploader||this.input,this.preview,this.infoButton),this.container.appendChild(this.control)}},{key:"refreshPreview",value:function(){if(this.last_preview!==this.value&&(this.last_preview=this.value,this.preview.innerHTML="",this.value)){var t=this.value.match(/^data:([^;,]+)[;,]/);if(t&&(t=t[1]),t){if(this.preview.innerHTML="<strong>Type:</strong> ".concat(t,", <strong>Size:</strong> ").concat(Math.floor((this.value.length-this.value.split(",")[0].length-1)/1.33333)," bytes"),"image"===t.substr(0,5)){this.preview.innerHTML+="<br>";var e=document.createElement("img");e.style.maxWidth="100%",e.style.maxHeight="100px",e.src=this.value,this.preview.appendChild(e)}}else this.preview.innerHTML="<em>Invalid data URI</em>"}}},{key:"enable",value:function(){this.always_disabled||(this.uploader&&(this.uploader.disabled=!1),le(pe(o.prototype),"enable",this).call(this))}},{key:"disable",value:function(t){t&&(this.always_disabled=!0),this.uploader&&(this.uploader.disabled=!0),le(pe(o.prototype),"disable",this).call(this)}},{key:"setValue",value:function(t){this.value!==t&&(this.schema.readOnly&&this.schema.enum&&!this.schema.enum.includes(t)?this.value=this.schema.enum[0]:this.value=t,this.input.value=this.value,this.refreshPreview(),this.onChange())}},{key:"destroy",value:function(){this.preview&&this.preview.parentNode&&this.preview.parentNode.removeChild(this.preview),this.title&&this.title.parentNode&&this.title.parentNode.removeChild(this.title),this.input&&this.input.parentNode&&this.input.parentNode.removeChild(this.input),this.uploader&&this.uploader.parentNode&&this.uploader.parentNode.removeChild(this.uploader),le(pe(o.prototype),"destroy",this).call(this)}}])&&se(e.prototype,n),r&&se(e,r),o}(H);function fe(t){return(fe="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function ye(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function me(t,e,n){return(me="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=_e(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function ve(t,e){return(ve=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function be(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=_e(t);if(e){var i=_e(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return ge(this,n)}}function ge(t,e){return!e||"object"!==fe(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function _e(t){return(_e=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var we=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&ve(t,e)}(o,t);var e,n,r,i=be(o);function o(t,e){var n;return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,o),(n=i.call(this,t,e)).active=!1,n.parent&&n.parent.schema&&(Array.isArray(n.parent.schema.required)?n.parent.schema.required.includes(n.key)||n.parent.schema.required.push(n.key):n.parent.schema.required=[n.key]),n}return e=o,(n=[{key:"build",value:function(){var t=this;this.options.compact=!0;var e=this.translateProperty(this.schema.title)||this.key,n=this.expandCallbacks("button",f({},{icon:"",validated:!1,align:"left",action:function(t,e){window.alert('No button action defined for "'.concat(t.path,'"'))}},this.defaults.options.button||{},this.options.button||{}));this.input=this.theme.getFormButton(e,n.icon,e),this.input.addEventListener("click",n.action,!1),(this.schema.readOnly||this.schema.readonly||this.schema.template)&&(this.disable(!0),this.input.setAttribute("readonly","true")),this.setInputAttributes(["readonly"]),this.control=this.theme.getFormButtonHolder(n.align),this.control.appendChild(this.input),this.container.appendChild(this.control),this.changeHandler=function(){t.jsoneditor.validate(t.jsoneditor.getValue()).length>0?t.disable():t.enable()},n.validated&&this.jsoneditor.on("change",this.changeHandler)}},{key:"enable",value:function(){this.always_disabled||(this.input.disabled=!1,me(_e(o.prototype),"enable",this).call(this))}},{key:"disable",value:function(t){t&&(this.always_disabled=!0),this.input.disabled=!0,me(_e(o.prototype),"disable",this).call(this)}},{key:"getNumColumns",value:function(){return 2}},{key:"activate",value:function(){this.active=!1,this.enable()}},{key:"deactivate",value:function(){this.isRequired()||(this.active=!1,this.disable())}},{key:"destroy",value:function(){this.jsoneditor.off("change",this.changeHandler),this.changeHandler=null,me(_e(o.prototype),"destroy",this).call(this)}}])&&ye(e.prototype,n),r&&ye(e,r),o}(H);function ke(t){return(ke="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function xe(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function je(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Oe(t,e,n){return(Oe="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Pe(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function Ce(t,e){return(Ce=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Ee(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Pe(t);if(e){var i=Pe(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Se(this,n)}}function Se(t,e){return!e||"object"!==ke(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Pe(t){return(Pe=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Re=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Ce(t,e)}(o,t);var e,n,r,i=Ee(o);function o(){return xe(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"setValue",value:function(t,e){t=!!t;var n=this.getValue()!==t;this.value=t,this.input.checked=this.value,this.onChange(n)}},{key:"register",value:function(){Oe(Pe(o.prototype),"register",this).call(this),this.input&&this.input.setAttribute("name",this.formname)}},{key:"unregister",value:function(){Oe(Pe(o.prototype),"unregister",this).call(this),this.input&&this.input.removeAttribute("name")}},{key:"getNumColumns",value:function(){return Math.min(12,Math.max(this.getTitle().length/7,2))}},{key:"build",value:function(){var t=this;this.parent.options.table_row||(this.label=this.header=this.theme.getCheckboxLabel(this.getTitle(),this.isRequired()),this.label.htmlFor=this.formname),this.schema.description&&(this.description=this.theme.getFormInputDescription(this.translateProperty(this.schema.description))),this.options.infoText&&!this.options.compact&&(this.infoButton=this.theme.getInfoButton(this.translateProperty(this.options.infoText))),this.options.compact&&this.container.classList.add("compact"),this.input=this.theme.getCheckbox(),this.input.id=this.formname,this.control=this.theme.getFormControl(this.label,this.input,this.description,this.infoButton),(this.schema.readOnly||this.schema.readonly)&&(this.disable(!0),this.input.disabled=!0),this.input.addEventListener("change",(function(e){e.preventDefault(),e.stopPropagation(),t.value=e.currentTarget.checked,t.onChange(!0)})),this.container.appendChild(this.control)}},{key:"enable",value:function(){this.always_disabled||(this.input.disabled=!1,Oe(Pe(o.prototype),"enable",this).call(this))}},{key:"disable",value:function(t){t&&(this.always_disabled=!0),this.input.disabled=!0,Oe(Pe(o.prototype),"disable",this).call(this)}},{key:"destroy",value:function(){this.label&&this.label.parentNode&&this.label.parentNode.removeChild(this.label),this.description&&this.description.parentNode&&this.description.parentNode.removeChild(this.description),this.input&&this.input.parentNode&&this.input.parentNode.removeChild(this.input),Oe(Pe(o.prototype),"destroy",this).call(this)}},{key:"showValidationErrors",value:function(t){var e=this;this.previous_error_setting=this.jsoneditor.options.show_errors;var n=t.reduce((function(t,n){return n.path===e.path&&t.push(n.message),t}),[]);this.input.controlgroup=this.control,n.length?this.theme.addInputError(this.input,"".concat(n.join(". "),".")):this.theme.removeInputError(this.input)}}])&&je(e.prototype,n),r&&je(e,r),o}(H);n(135);function Le(t){return(Le="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Te(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Ae(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Ie(t,e,n){return(Ie="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Ve(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function Be(t,e){return(Be=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Ne(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Ve(t);if(e){var i=Ve(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Fe(this,n)}}function Fe(t,e){return!e||"object"!==Le(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Ve(t){return(Ve=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var De=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Be(t,e)}(o,t);var e,n,r,i=Ne(o);function o(){return Te(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"setValue",value:function(t,e){var n=this.typecast(t),r=!!this.jsoneditor.options.use_default_values||void 0!==this.schema.default;(this.enum_options.length>0&&!this.enum_values.includes(n)||e&&!this.isRequired()&&!r)&&(n=this.enum_values[0]),this.value!==n&&(e?this.is_dirty=!1:"change"===this.jsoneditor.options.show_errors&&(this.is_dirty=!0),this.input.value=this.enum_options[this.enum_values.indexOf(n)],this.value=n,this.onChange(),this.change())}},{key:"register",value:function(){Ie(Ve(o.prototype),"register",this).call(this),this.input&&this.input.setAttribute("name",this.formname)}},{key:"unregister",value:function(){Ie(Ve(o.prototype),"unregister",this).call(this),this.input&&this.input.removeAttribute("name")}},{key:"getNumColumns",value:function(){if(!this.enum_options)return 3;for(var t=this.getTitle().length,e=0;e<this.enum_options.length;e++)t=Math.max(t,this.enum_options[e].length+4);return Math.min(12,Math.max(t/7,2))}},{key:"typecast",value:function(t){return"boolean"===this.schema.type?"undefined"===t||void 0===t?void 0:!!t:"number"===this.schema.type?1*t||0:"integer"===this.schema.type?Math.floor(1*t||0):this.schema.enum&&void 0===t?void 0:"".concat(t)}},{key:"getValue",value:function(){if(this.dependenciesFulfilled)return this.typecast(this.value)}},{key:"preBuild",value:function(){var t,e,n=this;if(this.input_type="select",this.enum_options=[],this.enum_values=[],this.enum_display=[],this.schema.enum){var r=this.schema.options&&this.schema.options.enum_titles||[];this.schema.enum.forEach((function(t,e){n.enum_options[e]="".concat(t),n.enum_display[e]="".concat(n.translateProperty(r[e])||t),n.enum_values[e]=n.typecast(t)})),this.isRequired()||(this.enum_display.unshift(" "),this.enum_options.unshift("undefined"),this.enum_values.unshift(void 0))}else if("boolean"===this.schema.type)this.enum_display=this.schema.options&&this.schema.options.enum_titles||["true","false"],this.enum_options=["1",""],this.enum_values=[!0,!1],this.isRequired()||(this.enum_display.unshift(" "),this.enum_options.unshift("undefined"),this.enum_values.unshift(void 0));else{if(!this.schema.enumSource)throw new Error("'select' editor requires the enum property to be set.");if(this.enumSource=[],this.enum_display=[],this.enum_options=[],this.enum_values=[],Array.isArray(this.schema.enumSource))for(t=0;t<this.schema.enumSource.length;t++)"string"==typeof this.schema.enumSource[t]?this.enumSource[t]={source:this.schema.enumSource[t]}:Array.isArray(this.schema.enumSource[t])?this.enumSource[t]=this.schema.enumSource[t]:this.enumSource[t]=f({},this.schema.enumSource[t]);else this.schema.enumValue?this.enumSource=[{source:this.schema.enumSource,value:this.schema.enumValue}]:this.enumSource=[{source:this.schema.enumSource}];for(t=0;t<this.enumSource.length;t++)this.enumSource[t].value&&("function"==typeof(e=this.expandCallbacks("template",{template:this.enumSource[t].value})).template?this.enumSource[t].value=e.template:this.enumSource[t].value=this.jsoneditor.compileTemplate(this.enumSource[t].value,this.template_engine)),this.enumSource[t].title&&("function"==typeof(e=this.expandCallbacks("template",{template:this.enumSource[t].title})).template?this.enumSource[t].title=e.template:this.enumSource[t].title=this.jsoneditor.compileTemplate(this.enumSource[t].title,this.template_engine)),this.enumSource[t].filter&&this.enumSource[t].value&&("function"==typeof(e=this.expandCallbacks("template",{template:this.enumSource[t].filter})).template?this.enumSource[t].filter=e.template:this.enumSource[t].filter=this.jsoneditor.compileTemplate(this.enumSource[t].filter,this.template_engine))}}},{key:"build",value:function(){var t=this;this.options.compact||(this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired())),this.schema.description&&(this.description=this.theme.getFormInputDescription(this.translateProperty(this.schema.description))),this.options.infoText&&(this.infoButton=this.theme.getInfoButton(this.translateProperty(this.options.infoText))),this.options.compact&&this.container.classList.add("compact"),this.input=this.theme.getSelectInput(this.enum_options,!1),this.theme.setSelectOptions(this.input,this.enum_options,this.enum_display),(this.schema.readOnly||this.schema.readonly)&&(this.disable(!0),this.input.disabled=!0),this.setInputAttributes([]),this.input.addEventListener("change",(function(e){e.preventDefault(),e.stopPropagation(),t.onInputChange()})),this.control=this.theme.getFormControl(this.label,this.input,this.description,this.infoButton),this.container.appendChild(this.control),this.value=this.enum_values[0],window.requestAnimationFrame((function(){t.input.parentNode&&t.afterInputReady()}))}},{key:"afterInputReady",value:function(){this.theme.afterInputReady(this.input)}},{key:"onInputChange",value:function(){var t,e=this.typecast(this.input.value);(t=this.enum_values.includes(e)?this.enum_values[this.enum_values.indexOf(e)]:this.enum_values[0])!==this.value&&(this.is_dirty=!0,this.value=t,this.onChange(!0))}},{key:"onWatchedFieldChange",value:function(){var t,e,n=[],r=[];if(this.enumSource){t=this.getWatchedFieldValues();for(var i=0;i<this.enumSource.length;i++)if(Array.isArray(this.enumSource[i]))n=n.concat(this.enumSource[i]),r=r.concat(this.enumSource[i]);else{var a=[];if(a=Array.isArray(this.enumSource[i].source)?this.enumSource[i].source:t[this.enumSource[i].source]){if(this.enumSource[i].slice&&(a=Array.prototype.slice.apply(a,this.enumSource[i].slice)),this.enumSource[i].filter){var s=[];for(e=0;e<a.length;e++)this.enumSource[i].filter({i:e,item:a[e],watched:t})&&s.push(a[e]);a=s}var l=[],c=[];for(e=0;e<a.length;e++){var u=a[e];this.enumSource[i].value?c[e]=this.typecast(this.enumSource[i].value({i:e,item:u})):c[e]=a[e],this.enumSource[i].title?l[e]=this.enumSource[i].title({i:e,item:u}):l[e]=c[e]}this.enumSource[i].sort&&function(t,e,n){t.map((function(t,n){return{v:t,t:e[n]}})).sort((function(t,e){return t.v<e.v?-n:t.v===e.v?0:n})).forEach((function(n,r){t[r]=n.v,e[r]=n.t}))}.bind(null,c,l,"desc"===this.enumSource[i].sort?1:-1)(),n=n.concat(c),r=r.concat(l)}}var h=this.value;this.theme.setSelectOptions(this.input,n,r),this.enum_options=n,this.enum_display=r,this.enum_values=n,n.includes(h)||!1!==this.jsoneditor.options.enum_source_value_auto_select?(this.input.value=h,this.value=h):(this.input.value=n[0],this.value=this.typecast(n[0]||""),this.parent&&!this.watchLoop?this.parent.onChildEditorChange(this):this.jsoneditor.onChange(),this.jsoneditor.notifyWatchers(this.path))}Ie(Ve(o.prototype),"onWatchedFieldChange",this).call(this)}},{key:"enable",value:function(){this.always_disabled||(this.input.disabled=!1,Ie(Ve(o.prototype),"enable",this).call(this))}},{key:"disable",value:function(t){t&&(this.always_disabled=!0),this.input.disabled=!0,Ie(Ve(o.prototype),"disable",this).call(this,t)}},{key:"destroy",value:function(){this.label&&this.label.parentNode&&this.label.parentNode.removeChild(this.label),this.description&&this.description.parentNode&&this.description.parentNode.removeChild(this.description),this.input&&this.input.parentNode&&this.input.parentNode.removeChild(this.input),Ie(Ve(o.prototype),"destroy",this).call(this)}},{key:"showValidationErrors",value:function(t){var e=this;this.previous_error_setting=this.jsoneditor.options.show_errors;var n=t.reduce((function(t,n){return n.path===e.path&&t.push(n.message),t}),[]);n.length?this.theme.addInputError(this.input,"".concat(n.join(". "),".")):this.theme.removeInputError(this.input)}}])&&Ae(e.prototype,n),r&&Ae(e,r),o}(H);function He(t){return(He="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function ze(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Me(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function qe(t,e,n){return(qe="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Je(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function Ue(t,e){return(Ue=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Ge(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Je(t);if(e){var i=Je(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return $e(this,n)}}function $e(t,e){return!e||"object"!==He(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Je(t){return(Je=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var We=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Ue(t,e)}(o,t);var e,n,r,i=Ge(o);function o(){return ze(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"setValue",value:function(t,e){if(this.choices_instance){var n=this.typecast(t||"");if(this.enum_values.includes(n)||(n=this.enum_values[0]),this.value===n)return;e?this.is_dirty=!1:"change"===this.jsoneditor.options.show_errors&&(this.is_dirty=!0),this.input.value=this.enum_options[this.enum_values.indexOf(n)],this.choices_instance.setChoiceByValue(this.input.value),this.value=n,this.onChange()}else qe(Je(o.prototype),"setValue",this).call(this,t,e)}},{key:"afterInputReady",value:function(){if(window.Choices&&!this.choices_instance){var t=this.expandCallbacks("choices",f({},this.defaults.options.choices||{},this.options.choices||{}));this.choices_instance=new window.Choices(this.input,t)}qe(Je(o.prototype),"afterInputReady",this).call(this)}},{key:"onWatchedFieldChange",value:function(){var t=this;if(qe(Je(o.prototype),"onWatchedFieldChange",this).call(this),this.choices_instance){var e=this.enum_options.map((function(e,n){return{value:e,label:t.enum_display[n]}}));this.choices_instance.setChoices(e,"value","label",!0),this.choices_instance.setChoiceByValue("".concat(this.value))}}},{key:"enable",value:function(){!this.always_disabled&&this.choices_instance&&this.choices_instance.enable(),qe(Je(o.prototype),"enable",this).call(this)}},{key:"disable",value:function(t){this.choices_instance&&this.choices_instance.disable(),qe(Je(o.prototype),"disable",this).call(this,t)}},{key:"destroy",value:function(){this.choices_instance&&(this.choices_instance.destroy(),this.choices_instance=null),qe(Je(o.prototype),"destroy",this).call(this)}}])&&Me(e.prototype,n),r&&Me(e,r),o}(De);function Ze(t){return(Ze="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Qe(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Ye(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Xe(t,e,n){return(Xe="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=nn(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function Ke(t,e){return(Ke=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function tn(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=nn(t);if(e){var i=nn(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return en(this,n)}}function en(t,e){return!e||"object"!==Ze(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function nn(t){return(nn=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}We.rules={".choices > *":"box-sizing:border-box"};var rn=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Ke(t,e)}(o,t);var e,n,r,i=tn(o);function o(){return Qe(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"build",value:function(){if(Xe(nn(o.prototype),"build",this).call(this),this.input&&(this.schema.max&&"string"==typeof this.schema.max&&this.input.setAttribute("max",this.schema.max),this.schema.min&&"string"==typeof this.schema.max&&this.input.setAttribute("min",this.schema.min),window.flatpickr&&"object"===Ze(this.options.flatpickr))){this.options.flatpickr.enableTime="date"!==this.schema.format,this.options.flatpickr.noCalendar="time"===this.schema.format,"integer"===this.schema.type&&(this.options.flatpickr.mode="single"),this.input.setAttribute("data-input","");var t=this.input;if(!0===this.options.flatpickr.wrap){var e=[];if(!1!==this.options.flatpickr.showToggleButton){var n=this.getButton("","time"===this.schema.format?"time":"calendar","flatpickr_toggle_button");n.setAttribute("data-toggle",""),e.push(n)}if(!1!==this.options.flatpickr.showClearButton){var r=this.getButton("","clear","flatpickr_clear_button");r.setAttribute("data-clear",""),e.push(r)}var i=this.input.parentNode,a=this.input.nextSibling,s=this.theme.getInputGroup(this.input,e);void 0!==s?(this.options.flatpickr.inline=!1,i.insertBefore(s,a),t=s):this.options.flatpickr.wrap=!1}this.flatpickr=window.flatpickr(t,this.options.flatpickr),!0===this.options.flatpickr.inline&&!0===this.options.flatpickr.inlineHideInput&&this.input.setAttribute("type","hidden")}}},{key:"getValue",value:function(){if(this.dependenciesFulfilled){if("string"===this.schema.type)return this.value;if(""!==this.value&&void 0!==this.value){var t="time"===this.schema.format?"1970-01-01 ".concat(this.value):this.value;return parseInt(new Date(t).getTime()/1e3)}}}},{key:"setValue",value:function(t,e,n){if("string"===this.schema.type)Xe(nn(o.prototype),"setValue",this).call(this,t,e,n),this.flatpickr&&this.flatpickr.setDate(t);else if(t>0){var r=new Date(1e3*t),i=r.getFullYear(),a=this.zeroPad(r.getMonth()+1),s=this.zeroPad(r.getDate()),l=this.zeroPad(r.getHours()),c=this.zeroPad(r.getMinutes()),u=this.zeroPad(r.getSeconds()),h=[i,a,s].join("-"),p=[l,c,u].join(":"),d="".concat(h,"T").concat(p);"date"===this.schema.format?d=h:"time"===this.schema.format&&(d=p),this.input.value=d,this.refreshValue(),this.flatpickr&&this.flatpickr.setDate(d)}}},{key:"destroy",value:function(){this.flatpickr&&this.flatpickr.destroy(),this.flatpickr=null,Xe(nn(o.prototype),"destroy",this).call(this)}},{key:"zeroPad",value:function(t){return"0".concat(t).slice(-2)}}])&&Ye(e.prototype,n),r&&Ye(e,r),o}(Z);function on(t){return(on="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function an(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function sn(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function ln(t,e,n){return(ln="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=pn(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function cn(t,e){return(cn=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function un(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=pn(t);if(e){var i=pn(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return hn(this,n)}}function hn(t,e){return!e||"object"!==on(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function pn(t){return(pn=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var dn=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&cn(t,e)}(o,t);var e,n,r,i=un(o);function o(){return an(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"register",value:function(){if(this.editors){for(var t=0;t<this.editors.length;t++)this.editors[t]&&this.editors[t].unregister();this.editors[this.currentEditor]&&this.editors[this.currentEditor].register()}ln(pn(o.prototype),"register",this).call(this)}},{key:"unregister",value:function(){if(ln(pn(o.prototype),"unregister",this).call(this),this.editors)for(var t=0;t<this.editors.length;t++)this.editors[t]&&this.editors[t].unregister()}},{key:"getNumColumns",value:function(){return this.editors[this.currentEditor]?Math.max(this.editors[this.currentEditor].getNumColumns(),4):4}},{key:"enable",value:function(){if(this.editors)for(var t=0;t<this.editors.length;t++)this.editors[t]&&this.editors[t].enable();ln(pn(o.prototype),"enable",this).call(this)}},{key:"disable",value:function(){if(this.editors)for(var t=0;t<this.editors.length;t++)this.editors[t]&&this.editors[t].disable();ln(pn(o.prototype),"disable",this).call(this)}},{key:"switchEditor",value:function(){var t=this,e=this.getWatchedFieldValues();if(e){var n=document.location.origin+document.location.pathname+this.template(e);this.editors[this.refs[n]]||this.buildChildEditor(n),this.currentEditor=this.refs[n],this.register(),this.editors.forEach((function(e,n){e&&(t.currentEditor===n?e.container.style.display="":e.container.style.display="none")})),this.refreshValue(),this.onChange(!0)}}},{key:"buildChildEditor",value:function(t){this.refs[t]=this.editors.length;var e=this.theme.getChildEditorHolder();this.editor_holder.appendChild(e);var n=f({},this.schema,this.jsoneditor.refs[t]),r=this.jsoneditor.getEditorClass(n,this.jsoneditor),i=this.jsoneditor.createEditor(r,{jsoneditor:this.jsoneditor,schema:n,container:e,path:this.path,parent:this,required:!0});this.editors.push(i),i.preBuild(),i.build(),i.postBuild()}},{key:"preBuild",value:function(){var t;for(this.refs={},this.editors=[],this.currentEditor="",t=0;t<this.schema.links.length;t++)if("describedby"===this.schema.links[t].rel.toLowerCase()){this.template=this.jsoneditor.compileTemplate(this.schema.links[t].href,this.template_engine);break}this.schema.links=this.schema.links.slice(0,t).concat(this.schema.links.slice(t+1)),0===this.schema.links.length&&delete this.schema.links,this.baseSchema=f({},this.schema)}},{key:"build",value:function(){this.editor_holder=document.createElement("div"),this.container.appendChild(this.editor_holder),this.switchEditor()}},{key:"onWatchedFieldChange",value:function(){this.switchEditor()}},{key:"onChildEditorChange",value:function(t){this.editors[this.currentEditor]&&this.refreshValue(),ln(pn(o.prototype),"onChildEditorChange",this).call(this,t)}},{key:"refreshValue",value:function(){this.editors[this.currentEditor]&&(this.value=this.editors[this.currentEditor].getValue())}},{key:"setValue",value:function(t,e){this.editors[this.currentEditor]&&(this.editors[this.currentEditor].setValue(t,e),this.refreshValue(),this.onChange())}},{key:"destroy",value:function(){this.editors.forEach((function(t){t&&t.destroy()})),this.editor_holder&&this.editor_holder.parentNode&&this.editor_holder.parentNode.removeChild(this.editor_holder),ln(pn(o.prototype),"destroy",this).call(this)}},{key:"showValidationErrors",value:function(t){this.editors.forEach((function(e){e&&e.showValidationErrors(t)}))}}])&&sn(e.prototype,n),r&&sn(e,r),o}(H);function fn(t){return(fn="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function yn(t,e){return function(t){if(Array.isArray(t))return t}(t)||function(t,e){var n=t&&("undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"]);if(null==n)return;var r,i,o=[],a=!0,s=!1;try{for(n=n.call(t);!(a=(r=n.next()).done)&&(o.push(r.value),!e||o.length!==e);a=!0);}catch(t){s=!0,i=t}finally{try{a||null==n.return||n.return()}finally{if(s)throw i}}return o}(t,e)||function(t,e){if(!t)return;if("string"==typeof t)return mn(t,e);var n=Object.prototype.toString.call(t).slice(8,-1);"Object"===n&&t.constructor&&(n=t.constructor.name);if("Map"===n||"Set"===n)return Array.from(t);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return mn(t,e)}(t,e)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function mn(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,r=new Array(e);n<e;n++)r[n]=t[n];return r}function vn(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function bn(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function gn(t,e,n){return(gn="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=xn(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function _n(t,e){return(_n=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function wn(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=xn(t);if(e){var i=xn(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return kn(this,n)}}function kn(t,e){return!e||"object"!==fn(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function xn(t){return(xn=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var jn=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&_n(t,e)}(o,t);var e,n,r,i=wn(o);function o(){return vn(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"getNumColumns",value:function(){return 4}},{key:"build",value:function(){var t=this;this.title=this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired()),this.container.appendChild(this.title),this.options.enum_titles=this.options.enum_titles||[],this.enum=this.schema.enum,this.selected=0,this.select_options=[],this.html_values=[];for(var e=0;e<this.enum.length;e++)this.select_options[e]=this.options.enum_titles[e]||"Value ".concat(e+1),this.html_values[e]=this.getHTML(this.enum[e]);this.switcher=this.theme.getSwitcher(this.select_options),this.container.appendChild(this.switcher),this.display_area=this.theme.getIndentedPanel(),this.container.appendChild(this.display_area),this.options.hide_display&&(this.display_area.style.display="none"),this.switcher.addEventListener("change",(function(e){t.selected=t.select_options.indexOf(e.currentTarget.value),t.value=t.enum[t.selected],t.refreshValue(),t.onChange(!0)})),this.value=this.enum[0],this.refreshValue(),1===this.enum.length&&(this.switcher.style.display="none")}},{key:"refreshValue",value:function(){var t=this;this.selected=-1;var e=JSON.stringify(this.value);this.enum.forEach((function(n,r){if(e===JSON.stringify(n))return t.selected=r,!1})),this.selected<0?this.setValue(this.enum[0]):(this.switcher.value=this.select_options[this.selected],this.display_area.innerHTML=this.html_values[this.selected])}},{key:"enable",value:function(){this.always_disabled||(this.switcher.disabled=!1,gn(xn(o.prototype),"enable",this).call(this))}},{key:"disable",value:function(t){t&&(this.always_disabled=!0),this.switcher.disabled=!0,gn(xn(o.prototype),"disable",this).call(this)}},{key:"getHTML",value:function(t){var e=this;if(null===t)return"<em>null</em>";if("object"===fn(t)){var n="";return function(t,e){Array.isArray(t)||"number"==typeof t.length&&t.length>0&&t.length-1 in t?Array.from(t).forEach((function(t,n){return e(n,t)})):Object.entries(t).forEach((function(t){var n=yn(t,2),r=n[0],i=n[1];return e(r,i)}))}(t,(function(r,i){var o=e.getHTML(i);Array.isArray(t)||(o="<div><em>".concat(r,"</em>: ").concat(o,"</div>")),n+="<li>".concat(o,"</li>")})),n=Array.isArray(t)?"<ol>".concat(n,"</ol>"):"<ul style='margin-top:0;margin-bottom:0;padding-top:0;padding-bottom:0;'>".concat(n,"</ul>")}return"boolean"==typeof t?t?"true":"false":"string"==typeof t?t.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;"):t}},{key:"setValue",value:function(t){this.value!==t&&(this.value=t,this.refreshValue(),this.onChange())}},{key:"destroy",value:function(){this.display_area&&this.display_area.parentNode&&this.display_area.parentNode.removeChild(this.display_area),this.title&&this.title.parentNode&&this.title.parentNode.removeChild(this.title),this.switcher&&this.switcher.parentNode&&this.switcher.parentNode.removeChild(this.switcher),gn(xn(o.prototype),"destroy",this).call(this)}}])&&bn(e.prototype,n),r&&bn(e,r),o}(H);function On(t){return(On="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Cn(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function En(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Sn(t,e,n){return(Sn="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Tn(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function Pn(t,e){return(Pn=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Rn(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Tn(t);if(e){var i=Tn(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Ln(this,n)}}function Ln(t,e){return!e||"object"!==On(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Tn(t){return(Tn=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var An=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Pn(t,e)}(o,t);var e,n,r,i=Rn(o);function o(){return Cn(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"register",value:function(){Sn(Tn(o.prototype),"register",this).call(this),this.input&&this.input.setAttribute("name",this.formname)}},{key:"unregister",value:function(){Sn(Tn(o.prototype),"unregister",this).call(this),this.input&&this.input.removeAttribute("name")}},{key:"setValue",value:function(t,e,n){if((!this.template||n)&&(null==t?t="":"object"===On(t)?t=JSON.stringify(t):"string"!=typeof t&&(t="".concat(t)),t!==this.serialized)){var r=this.sanitize(t);if(this.input.value!==r){this.input.value=r;var i=n||this.getValue()!==t;this.refreshValue(),e?this.is_dirty=!1:"change"===this.jsoneditor.options.show_errors&&(this.is_dirty=!0),this.adjust_height&&this.adjust_height(this.input),this.onChange(i)}}}},{key:"getNumColumns",value:function(){return 2}},{key:"enable",value:function(){Sn(Tn(o.prototype),"enable",this).call(this)}},{key:"disable",value:function(){Sn(Tn(o.prototype),"disable",this).call(this)}},{key:"refreshValue",value:function(){this.value=this.input.value,"string"!=typeof this.value&&(this.value=""),this.serialized=this.value}},{key:"destroy",value:function(){this.template=null,this.input&&this.input.parentNode&&this.input.parentNode.removeChild(this.input),this.label&&this.label.parentNode&&this.label.parentNode.removeChild(this.label),this.description&&this.description.parentNode&&this.description.parentNode.removeChild(this.description),Sn(Tn(o.prototype),"destroy",this).call(this)}},{key:"sanitize",value:function(t){return t}},{key:"onWatchedFieldChange",value:function(){var t;this.template&&(t=this.getWatchedFieldValues(),this.setValue(this.template(t),!1,!0)),Sn(Tn(o.prototype),"onWatchedFieldChange",this).call(this)}},{key:"build",value:function(){if(this.format=this.schema.format,!this.format&&this.options.default_format&&(this.format=this.options.default_format),this.options.format&&(this.format=this.options.format),this.input_type="hidden",this.input=this.theme.getFormInputField(this.input_type),this.format&&this.input.setAttribute("data-schemaformat",this.format),this.container.appendChild(this.input),this.schema.template){var t=this.expandCallbacks("template",{template:this.schema.template});"function"==typeof t.template?this.template=t.template:this.template=this.jsoneditor.compileTemplate(this.schema.template,this.template_engine),this.refreshValue()}else this.refreshValue()}}])&&En(e.prototype,n),r&&En(e,r),o}(H);function In(t){return(In="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Bn(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Nn(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Fn(t,e){return(Fn=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Vn(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Hn(t);if(e){var i=Hn(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Dn(this,n)}}function Dn(t,e){return!e||"object"!==In(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Hn(t){return(Hn=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var zn=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Fn(t,e)}(o,t);var e,n,r,i=Vn(o);function o(){return Bn(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"build",value:function(){this.options.compact=!1,this.header=this.label=this.theme.getFormInputLabel(this.getTitle()),this.description=this.theme.getDescription(this.schema.description||""),this.control=this.theme.getFormControl(this.label,this.description,null),this.container.appendChild(this.control)}},{key:"getTitle",value:function(){return this.translateProperty(this.schema.title)}},{key:"getNumColumns",value:function(){return 12}}])&&Nn(e.prototype,n),r&&Nn(e,r),o}(we);function Mn(t){return(Mn="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function qn(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Un(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Gn(t,e,n){return(Gn="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Zn(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function $n(t,e){return($n=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Jn(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Zn(t);if(e){var i=Zn(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Wn(this,n)}}function Wn(t,e){return!e||"object"!==Mn(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Zn(t){return(Zn=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Qn=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&$n(t,e)}(o,t);var e,n,r,i=Jn(o);function o(){return qn(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"build",value:function(){if(Gn(Zn(o.prototype),"build",this).call(this),void 0!==this.schema.minimum){var t=this.schema.minimum;void 0!==this.schema.exclusiveMinimum&&(t+=1),this.input.setAttribute("min",t)}if(void 0!==this.schema.maximum){var e=this.schema.maximum;void 0!==this.schema.exclusiveMaximum&&(e-=1),this.input.setAttribute("max",e)}if(void 0!==this.schema.step){var n=this.schema.step||1;this.input.setAttribute("step",n)}this.setInputAttributes(["maxlength","pattern","readonly","min","max","step"])}},{key:"getNumColumns",value:function(){return 2}},{key:"getValue",value:function(){if(this.dependenciesFulfilled){var t=function(t){if(null==t)return!1;var e=t.match(b),n=parseFloat(t);return null!==e&&!isNaN(n)&&isFinite(n)}(this.value)?parseFloat(this.value):this.value;if(this.jsoneditor.options.use_default_values||""!==t)return t}}}])&&Un(e.prototype,n),r&&Un(e,r),o}(Z);function Yn(t){return(Yn="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Xn(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Kn(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function tr(t,e){return(tr=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function er(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=rr(t);if(e){var i=rr(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return nr(this,n)}}function nr(t,e){return!e||"object"!==Yn(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function rr(t){return(rr=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var ir=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&tr(t,e)}(o,t);var e,n,r,i=er(o);function o(){return Xn(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"getNumColumns",value:function(){return 2}},{key:"getValue",value:function(){if(this.dependenciesFulfilled){var t=function(t){if(null==t)return!1;var e=t.match(g),n=parseInt(t);return null!==e&&!isNaN(n)&&isFinite(n)}(this.value)?parseInt(this.value):this.value;if(this.jsoneditor.options.use_default_values||""!==t)return t}}}])&&Kn(e.prototype,n),r&&Kn(e,r),o}(Qn);function or(t){return(or="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function ar(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function sr(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function lr(t,e,n){return(lr="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=pr(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function cr(t,e){return(cr=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function ur(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=pr(t);if(e){var i=pr(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return hr(this,n)}}function hr(t,e){return!e||"object"!==or(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function pr(t){return(pr=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var dr=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&cr(t,e)}(o,t);var e,n,r,i=ur(o);function o(){return ar(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"preBuild",value:function(){if(lr(pr(o.prototype),"preBuild",this).call(this),this.schema.options||(this.schema.options={}),!this.schema.options.cleave)switch(this.format){case"ipv6":this.schema.options.cleave={delimiters:[":"],blocks:[4,4,4,4,4,4,4,4],uppercase:!0};break;case"ipv4":this.schema.options.cleave={delimiters:["."],blocks:[3,3,3,3],numericOnly:!0}}this.options=f(this.options,this.schema.options||{})}}])&&sr(e.prototype,n),r&&sr(e,r),o}(Z);function fr(t){return(fr="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function yr(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function mr(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function vr(t,e,n){return(vr="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=wr(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function br(t,e){return(br=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function gr(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=wr(t);if(e){var i=wr(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return _r(this,n)}}function _r(t,e){return!e||"object"!==fr(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function wr(t){return(wr=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var kr=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&br(t,e)}(o,t);var e,n,r,i=gr(o);function o(){return yr(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"setValue",value:function(t,e,n){var r=vr(wr(o.prototype),"setValue",this).call(this,t,e,n);void 0!==r&&r.changed&&this.jodit_instance&&this.jodit_instance.setEditorValue(r.value)}},{key:"build",value:function(){this.options.format="textarea",vr(wr(o.prototype),"build",this).call(this),this.input_type=this.schema.format,this.input.setAttribute("data-schemaformat",this.input_type)}},{key:"afterInputReady",value:function(){var t,e=this;window.Jodit?(t=this.expandCallbacks("jodit",f({},{height:300},this.defaults.options.jodit||{},this.options.jodit||{})),this.jodit_instance=new window.Jodit(this.input,t),(this.schema.readOnly||this.schema.readonly||this.schema.template)&&this.jodit_instance.setReadOnly(!0),this.jodit_instance.events.on("change",(function(){e.value=e.jodit_instance.getEditorValue(),e.is_dirty=!0,e.onChange(!0)})),this.theme.afterInputReady(this.input)):vr(wr(o.prototype),"afterInputReady",this).call(this)}},{key:"getNumColumns",value:function(){return 6}},{key:"enable",value:function(){!this.always_disabled&&this.jodit_instance&&this.jodit_instance.setReadOnly(!1),vr(wr(o.prototype),"enable",this).call(this)}},{key:"disable",value:function(t){this.jodit_instance&&this.jodit_instance.setReadOnly(!0),vr(wr(o.prototype),"disable",this).call(this,t)}},{key:"destroy",value:function(){this.jodit_instance&&(this.jodit_instance.destruct(),this.jodit_instance=null),vr(wr(o.prototype),"destroy",this).call(this)}}])&&mr(e.prototype,n),r&&mr(e,r),o}(Z);function xr(t){return(xr="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function jr(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Or(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Cr(t,e,n){return(Cr="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Rr(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function Er(t,e){return(Er=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Sr(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Rr(t);if(e){var i=Rr(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Pr(this,n)}}function Pr(t,e){return!e||"object"!==xr(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Rr(t){return(Rr=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Lr=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Er(t,e)}(o,t);var e,n,r,i=Sr(o);function o(){return jr(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"register",value:function(){if(this.editors){for(var t=0;t<this.editors.length;t++)this.editors[t]&&this.editors[t].unregister();this.editors[this.type]&&this.editors[this.type].register()}Cr(Rr(o.prototype),"register",this).call(this)}},{key:"unregister",value:function(){if(Cr(Rr(o.prototype),"unregister",this).call(this),this.editors)for(var t=0;t<this.editors.length;t++)this.editors[t]&&this.editors[t].unregister()}},{key:"getNumColumns",value:function(){return this.editors[this.type]?Math.max(this.editors[this.type].getNumColumns(),4):4}},{key:"enable",value:function(){if(!this.always_disabled){if(this.editors)for(var t=0;t<this.editors.length;t++)this.editors[t]&&this.editors[t].enable();this.switcher.disabled=!1,Cr(Rr(o.prototype),"enable",this).call(this)}}},{key:"disable",value:function(t){if(t&&(this.always_disabled=!0),this.editors)for(var e=0;e<this.editors.length;e++)this.editors[e]&&this.editors[e].disable(t);this.switcher.disabled=!0,Cr(Rr(o.prototype),"disable",this).call(this)}},{key:"switchEditor",value:function(t){var e=this;this.editors[t]||this.buildChildEditor(t);var n=this.getValue();this.type=t,this.register(),this.editors.forEach((function(t,r){t&&(e.type===r?(e.keep_values&&t.setValue(n,!0),t.container.style.display=""):t.container.style.display="none")})),this.refreshValue(),this.refreshHeaderText()}},{key:"buildChildEditor",value:function(t){var e,n=this,r=this.types[t],i=this.theme.getChildEditorHolder();this.editor_holder.appendChild(i),"string"==typeof r?(e=f({},this.schema)).type=r:(e=f({},this.schema,r),e=this.jsoneditor.expandRefs(e),r&&r.required&&Array.isArray(r.required)&&this.schema.required&&Array.isArray(this.schema.required)&&(e.required=this.schema.required.concat(r.required)));var o=this.jsoneditor.getEditorClass(e);this.editors[t]=this.jsoneditor.createEditor(o,{jsoneditor:this.jsoneditor,schema:e,container:i,path:this.path,parent:this,required:!0}),this.editors[t].preBuild(),this.editors[t].build(),this.editors[t].postBuild(),this.editors[t].header&&(this.editors[t].header.style.display="none"),this.editors[t].option=this.switcher_options[t],i.addEventListener("change_header_text",(function(){n.refreshHeaderText()})),t!==this.type&&(i.style.display="none")}},{key:"preBuild",value:function(){if(this.types=[],this.type=0,this.editors=[],this.validators=[],this.keep_values=!0,void 0!==this.jsoneditor.options.keep_oneof_values&&(this.keep_values=this.jsoneditor.options.keep_oneof_values),void 0!==this.options.keep_oneof_values&&(this.keep_values=this.options.keep_oneof_values),this.schema.oneOf)this.oneOf=!0,this.types=this.schema.oneOf,delete this.schema.oneOf;else if(this.schema.anyOf)this.anyOf=!0,this.types=this.schema.anyOf,delete this.schema.anyOf;else{if(this.schema.type&&"any"!==this.schema.type)Array.isArray(this.schema.type)?this.types=this.schema.type:this.types=[this.schema.type];else if(this.types=["string","number","integer","boolean","object","array","null"],this.schema.disallow){var t=this.schema.disallow;"object"===xr(t)&&Array.isArray(t)||(t=[t]);var e=[];this.types.forEach((function(n){t.includes(n)||e.push(n)})),this.types=e}delete this.schema.type}this.display_text=this.getDisplayText(this.types)}},{key:"build",value:function(){var t=this,e=this.container;this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired()),this.container.appendChild(this.header),this.switcher=this.theme.getSwitcher(this.display_text),e.appendChild(this.switcher),this.switcher.addEventListener("change",(function(e){e.preventDefault(),e.stopPropagation(),t.switchEditor(t.display_text.indexOf(e.currentTarget.value)),t.onChange(!0)})),this.editor_holder=document.createElement("div"),e.appendChild(this.editor_holder);var n={};this.jsoneditor.options.custom_validators&&(n.custom_validators=this.jsoneditor.options.custom_validators),this.switcher_options=this.theme.getSwitcherOptions(this.switcher),this.types.forEach((function(e,r){var i;t.editors[r]=!1,"string"==typeof e?(i=f({},t.schema)).type=e:(i=f({},t.schema,e),e.required&&Array.isArray(e.required)&&t.schema.required&&Array.isArray(t.schema.required)&&(i.required=t.schema.required.concat(e.required))),t.validators[r]=new R(t.jsoneditor,i,n,t.defaults)})),this.switchEditor(0)}},{key:"onChildEditorChange",value:function(t){this.editors[this.type]&&(this.refreshValue(),this.refreshHeaderText()),Cr(Rr(o.prototype),"onChildEditorChange",this).call(this)}},{key:"refreshHeaderText",value:function(){var t=this.getDisplayText(this.types);Array.from(this.switcher_options).forEach((function(e,n){e.textContent=t[n]}))}},{key:"refreshValue",value:function(){this.value=this.editors[this.type].getValue()}},{key:"setValue",value:function(t,e){var n=this,r=this.type,i={match:0,extra:0,i:this.type},o={match:0,i:null};this.validators.forEach((function(e,r){var a=null;void 0!==n.anyOf&&n.anyOf&&(a=e.fitTest(t),(i.match<a.match||i.match===a.match&&i.extra>a.extra)&&((i=a).i=r)),e.validate(t).length||null!==o.i?i=o:(o.i=r,null!==a&&(o.match=a.match))}));var a=o.i;void 0!==this.anyOf&&this.anyOf&&o.match<i.match&&(a=i.i),null===a&&(a=this.type),this.type=a,this.switcher.value=this.display_text[a];var s=this.type!==r;s&&this.switchEditor(this.type),this.editors[this.type].setValue(t,e),this.refreshValue(),this.onChange(s)}},{key:"destroy",value:function(){this.editors.forEach((function(t){t&&t.destroy()})),this.editor_holder&&this.editor_holder.parentNode&&this.editor_holder.parentNode.removeChild(this.editor_holder),this.switcher&&this.switcher.parentNode&&this.switcher.parentNode.removeChild(this.switcher),Cr(Rr(o.prototype),"destroy",this).call(this)}},{key:"showValidationErrors",value:function(t){var e=this;if(this.oneOf||this.anyOf){var n=this.oneOf?"oneOf":"anyOf";this.editors.forEach((function(r,i){if(r){var o="".concat(e.path,".").concat(n,"[").concat(i,"]");r.showValidationErrors(t.reduce((function(t,n){if(n.path.startsWith(o)||n.path===o.substr(0,n.path.length)){var r=f({},n);n.path.startsWith(o)&&(r.path=e.path+r.path.substr(o.length)),t.push(r)}return t}),[]))}}))}else this.editors.forEach((function(e){e&&e.showValidationErrors(t)}))}},{key:"addLinks",value:function(){}}])&&Or(e.prototype,n),r&&Or(e,r),o}(H);function Tr(t){return(Tr="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Ar(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Ir(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Br(t,e){return(Br=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Nr(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Vr(t);if(e){var i=Vr(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Fr(this,n)}}function Fr(t,e){return!e||"object"!==Tr(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Vr(t){return(Vr=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Dr=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Br(t,e)}(o,t);var e,n,r,i=Nr(o);function o(){return Ar(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"getValue",value:function(){if(this.dependenciesFulfilled)return null}},{key:"setValue",value:function(){this.onChange()}},{key:"getNumColumns",value:function(){return 2}}])&&Ir(e.prototype,n),r&&Ir(e,r),o}(H);function Hr(t,e){var n=Object.keys(t);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(t);e&&(r=r.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),n.push.apply(n,r)}return n}function zr(t){for(var e=1;e<arguments.length;e++){var n=null!=arguments[e]?arguments[e]:{};e%2?Hr(Object(n),!0).forEach((function(e){Mr(t,e,n[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(n)):Hr(Object(n)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(n,e))}))}return t}function Mr(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}function qr(t,e){return function(t){if(Array.isArray(t))return t}(t)||function(t,e){var n=t&&("undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"]);if(null==n)return;var r,i,o=[],a=!0,s=!1;try{for(n=n.call(t);!(a=(r=n.next()).done)&&(o.push(r.value),!e||o.length!==e);a=!0);}catch(t){s=!0,i=t}finally{try{a||null==n.return||n.return()}finally{if(s)throw i}}return o}(t,e)||function(t,e){if(!t)return;if("string"==typeof t)return Ur(t,e);var n=Object.prototype.toString.call(t).slice(8,-1);"Object"===n&&t.constructor&&(n=t.constructor.name);if("Map"===n||"Set"===n)return Array.from(t);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return Ur(t,e)}(t,e)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function Ur(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,r=new Array(e);n<e;n++)r[n]=t[n];return r}function Gr(t){return(Gr="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function $r(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Jr(t,e,n){return(Jr="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Yr(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function Wr(t,e){return(Wr=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Zr(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Yr(t);if(e){var i=Yr(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Qr(this,n)}}function Qr(t,e){return!e||"object"!==Gr(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Yr(t){return(Yr=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Xr=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Wr(t,e)}(o,t);var e,n,r,i=Zr(o);function o(t,e,n){var r;return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,o),(r=i.call(this,t,e)).currentDepth=n,r}return e=o,(n=[{key:"getDefault",value:function(){return f({},this.schema.default||{})}},{key:"getChildEditors",value:function(){return this.editors}},{key:"register",value:function(){Jr(Yr(o.prototype),"register",this).call(this),this.editors&&Object.values(this.editors).forEach((function(t){return t.register()}))}},{key:"unregister",value:function(){Jr(Yr(o.prototype),"unregister",this).call(this),this.editors&&Object.values(this.editors).forEach((function(t){return t.unregister()}))}},{key:"getNumColumns",value:function(){return Math.max(Math.min(12,this.maxwidth),3)}},{key:"enable",value:function(){this.always_disabled||(this.editjson_control&&(this.editjson_control.disabled=!1),this.addproperty_button&&(this.addproperty_button.disabled=!1),Jr(Yr(o.prototype),"enable",this).call(this),this.editors&&Object.values(this.editors).forEach((function(t){t.isActive()&&t.enable(),t.optInCheckbox.disabled=!1})))}},{key:"disable",value:function(t){t&&(this.always_disabled=!0),this.editjson_control&&(this.editjson_control.disabled=!0),this.addproperty_button&&(this.addproperty_button.disabled=!0),this.hideEditJSON(),Jr(Yr(o.prototype),"disable",this).call(this),this.editors&&Object.values(this.editors).forEach((function(e){e.isActive()&&e.disable(t),e.optInCheckbox.disabled=!0}))}},{key:"layoutEditors",value:function(){var t,e,n=this;if(this.row_container){var r;this.property_order=Object.keys(this.editors),this.property_order=this.property_order.sort((function(t,e){var r=n.editors[t].schema.propertyOrder,i=n.editors[e].schema.propertyOrder;return"number"!=typeof r&&(r=1e3),"number"!=typeof i&&(i=1e3),r-i}));var i,o="categories"===this.format,a=[],s=null,l=null;if("grid-strict"===this.format){var c=0;if(i=[],this.property_order.forEach((function(t){var e=n.editors[t];if(!e.property_removed){var r=e.options.hidden?0:e.options.grid_columns||e.getNumColumns(),o=e.options.hidden?0:e.options.grid_offset||0,s=!e.options.hidden&&(e.options.grid_break||!1),l={key:t,width:r,offset:o,height:e.options.hidden?0:e.container.offsetHeight};i.push(l),a[c]=i,s&&(c++,i=[])}})),this.layout===JSON.stringify(a))return!1;for(this.layout=JSON.stringify(a),r=document.createElement("div"),t=0;t<a.length;t++)for(i=this.theme.getGridRow(),r.appendChild(i),e=0;e<a[t].length;e++)s=a[t][e].key,(l=this.editors[s]).options.hidden?l.container.style.display="none":this.theme.setGridColumnSize(l.container,a[t][e].width,a[t][e].offset),i.appendChild(l.container)}else if("grid"===this.format){for(this.property_order.forEach((function(t){var e=n.editors[t];if(!e.property_removed){for(var r=!1,i=e.options.hidden?0:e.options.grid_columns||e.getNumColumns(),o=e.options.hidden?0:e.container.offsetHeight,s=0;s<a.length;s++)a[s].width+i<=12&&(!o||.5*a[s].minh<o&&2*a[s].maxh>o)&&(r=s);!1===r&&(a.push({width:0,minh:999999,maxh:0,editors:[]}),r=a.length-1),a[r].editors.push({key:t,width:i,height:o}),a[r].width+=i,a[r].minh=Math.min(a[r].minh,o),a[r].maxh=Math.max(a[r].maxh,o)}})),t=0;t<a.length;t++)if(a[t].width<12){var u=!1,h=0;for(e=0;e<a[t].editors.length;e++)(!1===u||a[t].editors[e].width>a[t].editors[u].width)&&(u=e),a[t].editors[e].width*=12/a[t].width,a[t].editors[e].width=Math.floor(a[t].editors[e].width),h+=a[t].editors[e].width;h<12&&(a[t].editors[u].width+=12-h),a[t].width=12}if(this.layout===JSON.stringify(a))return!1;for(this.layout=JSON.stringify(a),r=document.createElement("div"),t=0;t<a.length;t++)for(i=this.theme.getGridRow(),r.appendChild(i),e=0;e<a[t].editors.length;e++)s=a[t].editors[e].key,(l=this.editors[s]).options.hidden?l.container.style.display="none":this.theme.setGridColumnSize(l.container,a[t].editors[e].width),i.appendChild(l.container)}else{if(r=document.createElement("div"),o){var p=document.createElement("div"),d=this.theme.getTopTabHolder(this.translateProperty(this.schema.title)),f=this.theme.getTopTabContentHolder(d);for(this.property_order.forEach((function(t){var e=n.editors[t];if(!e.property_removed){var r=n.theme.getTabContent(),i=e.schema&&("object"===e.schema.type||"array"===e.schema.type);r.isObjOrArray=i;var o=n.theme.getGridRow();e.tab||(void 0===n.basicPane?n.addRow(e,d,r):n.addRow(e,d,n.basicPane)),r.id=n.getValidId(e.tab_text.textContent),i?(r.appendChild(o),f.appendChild(r),n.theme.addTopTab(d,e.tab)):(p.appendChild(o),f.childElementCount>0?f.firstChild.isObjOrArray&&(r.appendChild(p),f.insertBefore(r,f.firstChild),n.theme.insertBasicTopTab(e.tab,d),e.basicPane=r):(r.appendChild(p),f.appendChild(r),n.theme.addTopTab(d,e.tab),e.basicPane=r)),e.options.hidden?e.container.style.display="none":n.theme.setGridColumnSize(e.container,12),o.appendChild(e.container),e.rowPane=r}}));this.tabPanesContainer.firstChild;)this.tabPanesContainer.removeChild(this.tabPanesContainer.firstChild);var m=this.tabs_holder.parentNode;m.removeChild(m.firstChild),m.appendChild(d),this.tabPanesContainer=f,this.tabs_holder=d;var v=this.theme.getFirstTab(this.tabs_holder);return void(v&&y(v,"click"))}this.property_order.forEach((function(t){var e=n.editors[t];e.property_removed||(i=n.theme.getGridRow(),r.appendChild(i),e.options.hidden?e.container.style.display="none":n.theme.setGridColumnSize(e.container,12),i.appendChild(e.container))}))}for(;this.row_container.firstChild;)this.row_container.removeChild(this.row_container.firstChild);this.row_container.appendChild(r)}}},{key:"getPropertySchema",value:function(t){var e=this,n=this.schema.properties[t]||{};n=f({},n);var r=!!this.schema.properties[t];return this.schema.patternProperties&&Object.keys(this.schema.patternProperties).forEach((function(i){new RegExp(i).test(t)&&(n.allOf=n.allOf||[],n.allOf.push(e.schema.patternProperties[i]),r=!0)})),!r&&this.schema.additionalProperties&&"object"===Gr(this.schema.additionalProperties)&&(n=f({},this.schema.additionalProperties)),n}},{key:"preBuild",value:function(){var t=this;if(Jr(Yr(o.prototype),"preBuild",this).call(this),this.editors={},this.cached_editors={},this.format=this.options.layout||this.options.object_layout||this.schema.format||this.jsoneditor.options.object_layout||"normal",this.schema.properties=this.schema.properties||{},this.minwidth=0,this.maxwidth=0,this.options.table_row)Object.entries(this.schema.properties).forEach((function(e){var n=qr(e,2),r=n[0],i=n[1],o=t.jsoneditor.getEditorClass(i);t.editors[r]=t.jsoneditor.createEditor(o,{jsoneditor:t.jsoneditor,schema:i,path:"".concat(t.path,".").concat(r),parent:t,compact:!0,required:!0},t.currentDepth+1),t.editors[r].preBuild();var a=t.editors[r].options.hidden?0:t.editors[r].options.grid_columns||t.editors[r].getNumColumns();t.minwidth+=a,t.maxwidth+=a})),this.no_link_holder=!0;else{if(this.options.table)throw new Error("Not supported yet");this.schema.defaultProperties||(this.jsoneditor.options.display_required_only||this.options.display_required_only?this.schema.defaultProperties=Object.keys(this.schema.properties).filter((function(e){return t.isRequiredObject({key:e,schema:t.schema.properties[e]})})):this.schema.defaultProperties=Object.keys(this.schema.properties)),this.maxwidth+=1,Array.isArray(this.schema.defaultProperties)&&this.schema.defaultProperties.forEach((function(e){t.addObjectProperty(e,!0),t.editors[e]&&(t.minwidth=Math.max(t.minwidth,t.editors[e].options.grid_columns||t.editors[e].getNumColumns()),t.maxwidth+=t.editors[e].options.grid_columns||t.editors[e].getNumColumns())}))}this.property_order=Object.keys(this.editors),this.property_order=this.property_order.sort((function(e,n){var r=t.editors[e].schema.propertyOrder,i=t.editors[n].schema.propertyOrder;return"number"!=typeof r&&(r=1e3),"number"!=typeof i&&(i=1e3),r-i}))}},{key:"addTab",value:function(t){var e=this,n=this.rows[t].schema&&("object"===this.rows[t].schema.type||"array"===this.rows[t].schema.type);this.tabs_holder&&(this.rows[t].tab_text=document.createElement("span"),this.rows[t].tab_text.textContent=n?this.rows[t].getHeaderText():void 0===this.schema.basicCategoryTitle?"Basic":this.schema.basicCategoryTitle,this.rows[t].tab=this.theme.getTopTab(this.rows[t].tab_text,this.getValidId(this.rows[t].tab_text.textContent)),this.rows[t].tab.addEventListener("click",(function(n){e.active_tab=e.rows[t].tab,e.refreshTabs(),n.preventDefault(),n.stopPropagation()})))}},{key:"addRow",value:function(t,e,n){var r=this.rows.length,i="object"===t.schema.type||"array"===t.schema.type;this.rows[r]=t,this.rows[r].rowPane=n,i?(this.addTab(r),this.theme.addTopTab(e,this.rows[r].tab)):void 0===this.basicTab?(this.addTab(r),this.basicTab=r,this.basicPane=n,this.theme.addTopTab(e,this.rows[r].tab)):(this.rows[r].tab=this.rows[this.basicTab].tab,this.rows[r].tab_text=this.rows[this.basicTab].tab_text,this.rows[r].rowPane=this.rows[this.basicTab].rowPane)}},{key:"refreshTabs",value:function(t){var e=this,n=void 0!==this.basicTab,r=!1;this.rows.forEach((function(i){i.tab&&i.rowPane&&i.rowPane.parentNode&&(n&&i.tab===e.rows[e.basicTab].tab&&r||(t?i.tab_text.textContent=i.getHeaderText():(n&&i.tab===e.rows[e.basicTab].tab&&(r=!0),i.tab===e.active_tab?e.theme.markTabActive(i):e.theme.markTabInactive(i))))}))}},{key:"build",value:function(){var t=this,e="categories"===this.format;if(this.rows=[],this.active_tab=null,this.options.table_row)this.editor_holder=this.container,Object.entries(this.editors).forEach((function(e){var n=qr(e,2),r=n[0],i=n[1],o=t.theme.getTableCell();t.editor_holder.appendChild(o),i.setContainer(o),i.build(),i.postBuild(),i.setOptInCheckbox(i.header),t.editors[r].options.hidden&&(o.style.display="none"),t.editors[r].options.input_width&&(o.style.width=t.editors[r].options.input_width)}));else{if(this.options.table)throw new Error("Not supported yet");this.header="",this.options.compact||(this.header=document.createElement("label"),this.header.textContent=this.getTitle()),this.title=this.theme.getHeader(this.header,this.getPathDepth()),this.title.classList.add("je-object__title"),this.controls=this.theme.getButtonHolder(),this.controls.classList.add("je-object__controls"),this.container.appendChild(this.title),this.container.appendChild(this.controls),this.container.classList.add("je-object__container"),this.editjson_holder=this.theme.getModal(),this.editjson_textarea=this.theme.getTextareaInput(),this.editjson_textarea.classList.add("je-edit-json--textarea"),this.editjson_save=this.getButton("button_save","save","button_save"),this.editjson_save.classList.add("json-editor-btntype-save"),this.editjson_save.addEventListener("click",(function(e){e.preventDefault(),e.stopPropagation(),t.saveJSON()})),this.editjson_copy=this.getButton("button_copy","copy","button_copy"),this.editjson_copy.classList.add("json-editor-btntype-copy"),this.editjson_copy.addEventListener("click",(function(e){e.preventDefault(),e.stopPropagation(),t.copyJSON()})),this.editjson_cancel=this.getButton("button_cancel","cancel","button_cancel"),this.editjson_cancel.classList.add("json-editor-btntype-cancel"),this.editjson_cancel.addEventListener("click",(function(e){e.preventDefault(),e.stopPropagation(),t.hideEditJSON()})),this.editjson_holder.appendChild(this.editjson_textarea),this.editjson_holder.appendChild(this.editjson_save),this.editjson_holder.appendChild(this.editjson_copy),this.editjson_holder.appendChild(this.editjson_cancel),this.addproperty_holder=this.theme.getModal(),this.addproperty_list=document.createElement("div"),this.addproperty_list.classList.add("property-selector"),this.addproperty_add=this.getButton("button_add","add","button_add"),this.addproperty_add.classList.add("json-editor-btntype-add"),this.addproperty_input=this.theme.getFormInputField("text"),this.addproperty_input.setAttribute("placeholder","Property name..."),this.addproperty_input.classList.add("property-selector-input"),this.addproperty_add.addEventListener("click",(function(e){if(e.preventDefault(),e.stopPropagation(),t.addproperty_input.value){if(t.editors[t.addproperty_input.value])return void window.alert("there is already a property with that name");t.addObjectProperty(t.addproperty_input.value),t.editors[t.addproperty_input.value]&&t.editors[t.addproperty_input.value].disable(),t.onChange(!0)}})),this.addproperty_input.addEventListener("input",(function(t){t.target.previousSibling.childNodes.forEach((function(e){e.innerText.includes(t.target.value)?e.style.display="":e.style.display="none"}))})),this.addproperty_holder.appendChild(this.addproperty_list),this.addproperty_holder.appendChild(this.addproperty_input),this.addproperty_holder.appendChild(this.addproperty_add);var n=document.createElement("div");n.style.clear="both",this.addproperty_holder.appendChild(n),document.addEventListener("click",this.onOutsideModalClick.bind(this)),this.schema.description&&(this.description=this.theme.getDescription(this.translateProperty(this.schema.description)),this.container.appendChild(this.description)),this.error_holder=document.createElement("div"),this.container.appendChild(this.error_holder),this.editor_holder=this.theme.getIndentedPanel(),this.container.appendChild(this.editor_holder),this.row_container=this.theme.getGridContainer(),e?(this.tabs_holder=this.theme.getTopTabHolder(this.getValidId(this.translateProperty(this.schema.title))),this.tabPanesContainer=this.theme.getTopTabContentHolder(this.tabs_holder),this.editor_holder.appendChild(this.tabs_holder)):(this.tabs_holder=this.theme.getTabHolder(this.getValidId(this.translateProperty(this.schema.title))),this.tabPanesContainer=this.theme.getTabContentHolder(this.tabs_holder),this.editor_holder.appendChild(this.row_container)),Object.values(this.editors).forEach((function(n){var r=t.theme.getTabContent(),i=t.theme.getGridColumn(),o=!(!n.schema||"object"!==n.schema.type&&"array"!==n.schema.type);if(r.isObjOrArray=o,e){if(o){var a=t.theme.getGridContainer();a.appendChild(i),r.appendChild(a),t.tabPanesContainer.appendChild(r),t.row_container=a}else void 0===t.row_container_basic&&(t.row_container_basic=t.theme.getGridContainer(),r.appendChild(t.row_container_basic),0===t.tabPanesContainer.childElementCount?t.tabPanesContainer.appendChild(r):t.tabPanesContainer.insertBefore(r,t.tabPanesContainer.childNodes[1])),t.row_container_basic.appendChild(i);t.addRow(n,t.tabs_holder,r),r.id=t.getValidId(n.schema.title)}else t.row_container.appendChild(i);n.setContainer(i),n.build(),n.postBuild(),n.setOptInCheckbox(n.header)})),this.rows[0]&&y(this.rows[0].tab,"click"),this.collapsed=!1,this.collapse_control=this.getButton("","collapse","button_collapse"),this.collapse_control.classList.add("json-editor-btntype-toggle"),this.title.insertBefore(this.collapse_control,this.title.childNodes[0]),this.collapse_control.addEventListener("click",(function(e){e.preventDefault(),e.stopPropagation(),t.collapsed?(t.editor_holder.style.display="",t.collapsed=!1,t.setButtonText(t.collapse_control,"","collapse","button_collapse")):(t.editor_holder.style.display="none",t.collapsed=!0,t.setButtonText(t.collapse_control,"","expand","button_expand"))})),this.options.collapsed&&y(this.collapse_control,"click"),this.schema.options&&void 0!==this.schema.options.disable_collapse?this.schema.options.disable_collapse&&(this.collapse_control.style.display="none"):this.jsoneditor.options.disable_collapse&&(this.collapse_control.style.display="none"),this.editjson_control=this.getButton("JSON","edit","button_edit_json"),this.editjson_control.classList.add("json-editor-btntype-editjson"),this.editjson_control.addEventListener("click",(function(e){e.preventDefault(),e.stopPropagation(),t.toggleEditJSON()})),this.controls.appendChild(this.editjson_control),this.controls.insertBefore(this.editjson_holder,this.controls.childNodes[0]),this.schema.options&&void 0!==this.schema.options.disable_edit_json?this.schema.options.disable_edit_json&&(this.editjson_control.style.display="none"):this.jsoneditor.options.disable_edit_json&&(this.editjson_control.style.display="none"),this.addproperty_button=this.getButton("properties","edit_properties","button_object_properties"),this.addproperty_button.classList.add("json-editor-btntype-properties"),this.addproperty_button.addEventListener("click",(function(e){e.preventDefault(),e.stopPropagation(),t.toggleAddProperty()})),this.controls.appendChild(this.addproperty_button),this.controls.insertBefore(this.addproperty_holder,this.controls.childNodes[1]),this.refreshAddProperties(),this.deactivateNonRequiredProperties()}this.options.table_row?(this.editor_holder=this.container,this.property_order.forEach((function(e){t.editor_holder.appendChild(t.editors[e].container)}))):(this.layoutEditors(),this.layoutEditors())}},{key:"deactivateNonRequiredProperties",value:function(){var t=this,e=this.jsoneditor.options.show_opt_in,n=void 0!==this.options.show_opt_in,r=n&&!0===this.options.show_opt_in,i=n&&!1===this.options.show_opt_in;(r||!i&&e||!n&&e)&&Object.entries(this.editors).forEach((function(e){var n=qr(e,2),r=n[0],i=n[1];t.isRequiredObject(i)||t.editors[r].deactivate()}))}},{key:"showEditJSON",value:function(){this.editjson_holder&&(this.hideAddProperty(),this.editjson_holder.style.left="".concat(this.editjson_control.offsetLeft,"px"),this.editjson_holder.style.top="".concat(this.editjson_control.offsetTop+this.editjson_control.offsetHeight,"px"),this.editjson_textarea.value=JSON.stringify(this.getValue(),null,2),this.disable(),this.editjson_holder.style.display="",this.editjson_control.disabled=!1,this.editing_json=!0)}},{key:"hideEditJSON",value:function(){this.editjson_holder&&this.editing_json&&(this.editjson_holder.style.display="none",this.enable(),this.editing_json=!1)}},{key:"copyJSON",value:function(){if(this.editjson_holder){var t=document.createElement("textarea");t.value=this.editjson_textarea.value,t.setAttribute("readonly",""),t.style.position="absolute",t.style.left="-9999px",document.body.appendChild(t),t.select(),document.execCommand("copy"),document.body.removeChild(t)}}},{key:"saveJSON",value:function(){if(this.editjson_holder)try{var t=JSON.parse(this.editjson_textarea.value);this.setValue(t),this.hideEditJSON(),this.onChange(!0)}catch(t){throw window.alert("invalid JSON"),t}}},{key:"toggleEditJSON",value:function(){this.editing_json?this.hideEditJSON():this.showEditJSON()}},{key:"insertPropertyControlUsingPropertyOrder",value:function(t,e,n){var r;this.schema.properties[t]&&(r=this.schema.properties[t].propertyOrder),"number"!=typeof r&&(r=1e3),e.propertyOrder=r;for(var i=0;i<n.childNodes.length;i++){var o=n.childNodes[i];if(e.propertyOrder<o.propertyOrder){this.addproperty_list.insertBefore(e,o),e=null;break}}e&&this.addproperty_list.appendChild(e)}},{key:"addPropertyCheckbox",value:function(t){var e,n=this,r=this.theme.getCheckbox();r.style.width="auto",e=this.schema.properties[t]&&this.schema.properties[t].title?this.schema.properties[t].title:t;var i=this.theme.getCheckboxLabel(e),o=this.theme.getFormControl(i,r);return o.style.paddingBottom=o.style.marginBottom=o.style.paddingTop=o.style.marginTop=0,o.style.height="auto",this.insertPropertyControlUsingPropertyOrder(t,o,this.addproperty_list),r.checked=t in this.editors,r.addEventListener("change",(function(){r.checked?n.addObjectProperty(t):n.removeObjectProperty(t),n.onChange(!0)})),this.addproperty_checkboxes[t]=r,r}},{key:"showAddProperty",value:function(){this.addproperty_holder&&(this.hideEditJSON(),this.addproperty_holder.style.left="".concat(this.addproperty_button.offsetLeft,"px"),this.addproperty_holder.style.top="".concat(this.addproperty_button.offsetTop+this.addproperty_button.offsetHeight,"px"),this.disable(),this.adding_property=!0,this.addproperty_button.disabled=!1,this.addproperty_holder.style.display="",this.refreshAddProperties())}},{key:"hideAddProperty",value:function(){this.addproperty_holder&&this.adding_property&&(this.addproperty_holder.style.display="none",this.enable(),this.adding_property=!1)}},{key:"toggleAddProperty",value:function(){this.adding_property?this.hideAddProperty():this.showAddProperty()}},{key:"removeObjectProperty",value:function(t){this.editors[t]&&(this.editors[t].unregister(),delete this.editors[t],this.refreshValue(),this.layoutEditors())}},{key:"getSchemaOnMaxDepth",value:function(t){return Object.keys(t).reduce((function(e,n){switch(n){case"$ref":return e;case"properties":case"items":return zr(zr({},e),{},Mr({},n,{}));case"additionalProperties":case"propertyNames":return zr(zr({},e),{},Mr({},n,!0));default:return zr(zr({},e),{},Mr({},n,t[n]))}}),{})}},{key:"addObjectProperty",value:function(t,e){if(!this.editors[t]){if(this.cached_editors[t]){if(this.editors[t]=this.cached_editors[t],e)return;this.editors[t].register()}else{if(!(this.canHaveAdditionalProperties()||this.schema.properties&&this.schema.properties[t]||this.schema.patternProperties&&Object.keys(this.schema.patternProperties).find((function(e){return new RegExp(e).test(t)}))))return;var n=this.getPropertySchema(t);"number"!=typeof n.propertyOrder&&(n.propertyOrder=Object.keys(this.editors).length+1e3);var r=this.jsoneditor.getEditorClass(n),i=this.jsoneditor.options.max_depth;if(this.editors[t]=this.jsoneditor.createEditor(r,{jsoneditor:this.jsoneditor,schema:i&&this.currentDepth>=i?this.getSchemaOnMaxDepth(n):n,path:"".concat(this.path,".").concat(t),parent:this},this.currentDepth+1),this.editors[t].preBuild(),!e){var o=this.theme.getChildEditorHolder();this.editor_holder.appendChild(o),this.editors[t].setContainer(o),this.editors[t].build(),this.editors[t].postBuild(),this.editors[t].setOptInCheckbox(r.header),this.editors[t].activate()}this.cached_editors[t]=this.editors[t]}e||(this.refreshValue(),this.layoutEditors())}}},{key:"onOutsideModalClick",value:function(t){var e=t.path||t.composedPath&&t.composedPath();this.addproperty_holder&&!this.addproperty_holder.contains(e[0])&&this.adding_property&&(t.preventDefault(),t.stopPropagation(),this.toggleAddProperty())}},{key:"onChildEditorChange",value:function(t){this.refreshValue(),Jr(Yr(o.prototype),"onChildEditorChange",this).call(this,t)}},{key:"canHaveAdditionalProperties",value:function(){return"boolean"==typeof this.schema.additionalProperties?this.schema.additionalProperties:!this.jsoneditor.options.no_additional_properties}},{key:"destroy",value:function(){Object.values(this.cached_editors).forEach((function(t){return t.destroy()})),this.editor_holder&&(this.editor_holder.innerHTML=""),this.title&&this.title.parentNode&&this.title.parentNode.removeChild(this.title),this.error_holder&&this.error_holder.parentNode&&this.error_holder.parentNode.removeChild(this.error_holder),this.editors=null,this.cached_editors=null,this.editor_holder&&this.editor_holder.parentNode&&this.editor_holder.parentNode.removeChild(this.editor_holder),this.editor_holder=null,document.removeEventListener("click",this.onOutsideModalClick),Jr(Yr(o.prototype),"destroy",this).call(this)}},{key:"getValue",value:function(){if(this.dependenciesFulfilled){var t=Jr(Yr(o.prototype),"getValue",this).call(this);return t&&(this.jsoneditor.options.remove_empty_properties||this.options.remove_empty_properties)&&Object.keys(t).forEach((function(e){var n;(void 0===(n=t[e])||""===n||n===Object(n)&&0===Object.keys(n).length&&n.constructor===Object)&&delete t[e]})),t}}},{key:"refreshValue",value:function(){var t=this;this.value={},this.editors&&(Object.keys(this.editors).forEach((function(e){t.editors[e].isActive()&&(t.value[e]=t.editors[e].getValue())})),this.adding_property&&this.refreshAddProperties())}},{key:"refreshAddProperties",value:function(){var t=this;if(this.options.disable_properties||!1!==this.options.disable_properties&&this.jsoneditor.options.disable_properties)this.addproperty_button.style.display="none";else{var e,n=0,r=!1;Object.keys(this.editors).forEach((function(t){return n++})),e=this.canHaveAdditionalProperties()&&!(void 0!==this.schema.maxProperties&&n>=this.schema.maxProperties),this.addproperty_checkboxes&&(this.addproperty_list.innerHTML=""),this.addproperty_checkboxes={},Object.keys(this.cached_editors).forEach((function(i){t.addPropertyCheckbox(i),t.isRequiredObject(t.cached_editors[i])&&i in t.editors&&(t.addproperty_checkboxes[i].disabled=!0),void 0!==t.schema.minProperties&&n<=t.schema.minProperties?(t.addproperty_checkboxes[i].disabled=t.addproperty_checkboxes[i].checked,t.addproperty_checkboxes[i].checked||(r=!0)):i in t.editors?r=!0:e||v(t.schema.properties,i)?(t.addproperty_checkboxes[i].disabled=!1,r=!0):t.addproperty_checkboxes[i].disabled=!0})),this.canHaveAdditionalProperties()&&(r=!0),Object.keys(this.schema.properties).forEach((function(e){t.cached_editors[e]||(r=!0,t.addPropertyCheckbox(e))})),r?this.canHaveAdditionalProperties()?this.addproperty_add.disabled=!e:(this.addproperty_add.style.display="none",this.addproperty_input.style.display="none"):(this.hideAddProperty(),this.addproperty_button.style.display="none")}}},{key:"isRequiredObject",value:function(t){if(t)return"boolean"==typeof t.schema.required?t.schema.required:Array.isArray(this.schema.required)?this.schema.required.includes(t.key):!!this.jsoneditor.options.required_by_default}},{key:"setValue",value:function(t,e){var n=this;("object"!==Gr(t=t||{})||Array.isArray(t))&&(t={}),Object.entries(this.cached_editors).forEach((function(r){var i=qr(r,2),o=i[0],a=i[1];void 0!==t[o]?(n.addObjectProperty(o),a.setValue(t[o],e),a.activate()):e||n.isRequiredObject(a)?a.setValue(a.getDefault(),e):n.jsoneditor.options.show_opt_in||n.options.show_opt_in?a.deactivate():n.removeObjectProperty(o)})),Object.entries(t).forEach((function(t){var r=qr(t,2),i=r[0],o=r[1];n.cached_editors[i]||(n.addObjectProperty(i),n.editors[i]&&n.editors[i].setValue(o,e,!!n.editors[i].template))})),this.refreshValue(),this.layoutEditors(),this.onChange()}},{key:"showValidationErrors",value:function(t){var e=this,n=[],r=[];t.forEach((function(t){t.path===e.path?n.push(t):r.push(t)})),this.error_holder&&(n.length?(this.error_holder.innerHTML="",this.error_holder.style.display="",n.forEach((function(t){t.errorcount&&t.errorcount>1&&(t.message+=" (".concat(t.errorcount," errors)")),e.error_holder.appendChild(e.theme.getErrorMessage(t.message))}))):this.error_holder.style.display="none"),this.options.table_row&&(n.length?this.theme.addTableRowError(this.container):this.theme.removeTableRowError(this.container)),Object.values(this.editors).forEach((function(t){t.showValidationErrors(r)}))}}])&&$r(e.prototype,n),r&&$r(e,r),o}(H);function Kr(t){return(Kr="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function ti(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function ei(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function ni(t,e,n){return(ni="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=ai(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function ri(t,e){return(ri=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function ii(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=ai(t);if(e){var i=ai(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return oi(this,n)}}function oi(t,e){return!e||"object"!==Kr(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function ai(t){return(ai=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}Xr.rules={".je-object__title":"display:inline-block",".je-object__controls":"margin:0%200%200%2010px",".je-object__container":"position:relative",".je-object__property-checkbox":"margin:0;height:auto",".property-selector":"width:295px;max-height:160px;padding:5px%200;overflow-y:auto;overflow-x:hidden;padding-left:5px",".property-selector-input":"width:220px;margin-bottom:0;display:inline-block",".json-editor-btntype-toggle":"margin:0%2010px%200%200",".je-edit-json--textarea":"height:170px%20!important;width:300px%20!important;display:block"};var si=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&ri(t,e)}(o,t);var e,n,r,i=ii(o);function o(){return ti(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"preBuild",value:function(){ni(ai(o.prototype),"preBuild",this).call(this)}},{key:"build",value:function(){var t=this;this.label="",this.options.compact||(this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired())),this.schema.description&&(this.description=this.theme.getFormInputDescription(this.translateProperty(this.schema.description))),this.options.infoText&&(this.infoButton=this.theme.getInfoButton(this.translateProperty(this.options.infoText))),this.options.compact&&this.container.classList.add("compact"),this.radioContainer=document.createElement("div"),this.radioGroup=[];var e=function(e){t.setValue(e.currentTarget.value),t.onChange(!0)};this.isRequired()||(this.enum_display.shift(),this.enum_options.shift(),this.enum_values.shift());for(var n=0;n<this.enum_values.length;n++){this.input=this.theme.getFormRadio({name:this.formname,id:"".concat(this.formname,"[").concat(n,"]"),value:this.enum_values[n]}),this.setInputAttributes(["id","value","name"]),this.input.addEventListener("change",e,!1),this.radioGroup.push(this.input);var r=this.theme.getFormRadioLabel(this.enum_display[n]);r.htmlFor=this.input.id;var i=this.theme.getFormRadioControl(r,this.input,!("horizontal"!==this.options.layout&&!this.options.compact));this.radioContainer.appendChild(i)}if(this.schema.readOnly||this.schema.readonly){this.disable(!0);for(var o=0;o<this.radioGroup.length;o++)this.radioGroup[o].disabled=!0;this.radioContainer.classList.add("readonly")}var a=this.theme.getContainer();a.appendChild(this.radioContainer),a.dataset.containerFor="radio",this.input=a,this.control=this.theme.getFormControl(this.label,a,this.description,this.infoButton),this.container.appendChild(this.control),window.requestAnimationFrame((function(){t.input.parentNode&&t.afterInputReady()}))}},{key:"enable",value:function(){if(!this.always_disabled){for(var t=0;t<this.radioGroup.length;t++)this.radioGroup[t].disabled=!1;this.radioContainer.classList.remove("readonly"),ni(ai(o.prototype),"enable",this).call(this)}}},{key:"disable",value:function(t){t&&(this.always_disabled=!0);for(var e=0;e<this.radioGroup.length;e++)this.radioGroup[e].disabled=!0;this.radioContainer.classList.add("readonly"),ni(ai(o.prototype),"disable",this).call(this)}},{key:"destroy",value:function(){this.radioContainer.parentNode&&this.radioContainer.parentNode.parentNode&&this.radioContainer.parentNode.parentNode.removeChild(this.radioContainer.parentNode),this.label&&this.label.parentNode&&this.label.parentNode.removeChild(this.label),this.description&&this.description.parentNode&&this.description.parentNode.removeChild(this.description),ni(ai(o.prototype),"destroy",this).call(this)}},{key:"getNumColumns",value:function(){return 2}},{key:"setValue",value:function(t){for(var e=0;e<this.radioGroup.length;e++)if(this.radioGroup[e].value===t){this.radioGroup[e].checked=!0,this.value=t,this.onChange();break}}}])&&ei(e.prototype,n),r&&ei(e,r),o}(De);function li(t){return(li="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function ci(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function ui(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function hi(t,e,n){return(hi="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=yi(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function pi(t,e){return(pi=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function di(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=yi(t);if(e){var i=yi(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return fi(this,n)}}function fi(t,e){return!e||"object"!==li(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function yi(t){return(yi=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var mi=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&pi(t,e)}(o,t);var e,n,r,i=di(o);function o(){return ci(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"setValue",value:function(t,e,n){var r=hi(yi(o.prototype),"setValue",this).call(this,t,e,n);void 0!==r&&r.changed&&this.sceditor_instance&&this.sceditor_instance.val(r.value)}},{key:"build",value:function(){this.options.format="textarea",hi(yi(o.prototype),"build",this).call(this),this.input_type=this.schema.format,this.input.setAttribute("data-schemaformat",this.input_type)}},{key:"afterInputReady",value:function(){var t=this;if(window.sceditor){var e=this.expandCallbacks("sceditor",f({},{format:this.input_type,emoticonsEnabled:!1,width:"100%",height:300,readOnly:this.schema.readOnly||this.schema.readonly||this.schema.template},this.defaults.options.sceditor||{},this.options.sceditor||{},{element:this.input})),n=window.sceditor.instance(this.input);void 0===n&&window.sceditor.create(this.input,e),this.sceditor_instance=n||window.sceditor.instance(this.input),this.sceditor_instance.blur((function(){t.value=t.sceditor_instance.val(),t.sceditor_instance.updateOriginal(),t.is_dirty=!0,t.onChange(!0)})),this.theme.afterInputReady(this.input)}else hi(yi(o.prototype),"afterInputReady",this).call(this)}},{key:"getNumColumns",value:function(){return 6}},{key:"enable",value:function(){!this.always_disabled&&this.sceditor_instance&&this.sceditor_instance.readOnly(!1),hi(yi(o.prototype),"enable",this).call(this)}},{key:"disable",value:function(t){this.sceditor_instance&&this.sceditor_instance.readOnly(!0),hi(yi(o.prototype),"disable",this).call(this,t)}},{key:"destroy",value:function(){this.sceditor_instance&&(this.sceditor_instance.destroy(),this.sceditor_instance=null),hi(yi(o.prototype),"destroy",this).call(this)}}])&&ui(e.prototype,n),r&&ui(e,r),o}(Z);function vi(t){return(vi="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function bi(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function gi(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function _i(t,e,n){return(_i="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=ji(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function wi(t,e){return(wi=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function ki(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=ji(t);if(e){var i=ji(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return xi(this,n)}}function xi(t,e){return!e||"object"!==vi(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function ji(t){return(ji=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Oi=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&wi(t,e)}(o,t);var e,n,r,i=ki(o);function o(){return bi(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"setValue",value:function(t,e){if(this.select2_instance){e?this.is_dirty=!1:"change"===this.jsoneditor.options.show_errors&&(this.is_dirty=!0);var n=this.updateValue(t);this.input.value=n,this.select2v4?this.select2_instance.val(n).trigger("change"):this.select2_instance.select2("val",n),this.onChange(!0)}else _i(ji(o.prototype),"setValue",this).call(this,t,e)}},{key:"afterInputReady",value:function(){var t=this;if(window.jQuery&&window.jQuery.fn&&window.jQuery.fn.select2&&!this.select2_instance){var e=this.expandCallbacks("select2",f({},this.defaults.options.select2||{},this.options.select2||{}));this.newEnumAllowed=e.tags=!!e.tags&&"string"===this.schema.type,this.select2_instance=window.jQuery(this.input).select2(e),this.select2v4=v(this.select2_instance.select2,"amd"),this.selectChangeHandler=function(){var e=t.select2v4?t.select2_instance.val():t.select2_instance.select2("val");t.updateValue(e),t.onChange(!0)},this.select2_instance.on("change",this.selectChangeHandler),this.select2_instance.on("select2-blur",this.selectChangeHandler)}_i(ji(o.prototype),"afterInputReady",this).call(this)}},{key:"updateValue",value:function(t){var e=this.enum_values[0];return t=this.typecast(t||""),this.enum_values.includes(t)?e=t:this.newEnumAllowed&&(e=this.addNewOption(t)?t:e),this.value=e,e}},{key:"addNewOption",value:function(t){var e,n=this.typecast(t),r=!1;return this.enum_values.includes(n)||""===n||(this.enum_options.push("".concat(n)),this.enum_display.push("".concat(n)),this.enum_values.push(n),this.schema.enum.push(n),(e=this.input.querySelector('option[value="'.concat(n,'"]')))?e.removeAttribute("data-select2-tag"):this.input.appendChild(new Option(n,n,!1,!1)).trigger("change"),r=!0),r}},{key:"enable",value:function(){this.always_disabled||this.select2_instance&&(this.select2v4?this.select2_instance.prop("disabled",!1):this.select2_instance.select2("enable",!0)),_i(ji(o.prototype),"enable",this).call(this)}},{key:"disable",value:function(t){this.select2_instance&&(this.select2v4?this.select2_instance.prop("disabled",!0):this.select2_instance.select2("enable",!1)),_i(ji(o.prototype),"disable",this).call(this,t)}},{key:"destroy",value:function(){this.select2_instance&&(this.select2_instance.select2("destroy"),this.select2_instance=null),_i(ji(o.prototype),"destroy",this).call(this)}}])&&gi(e.prototype,n),r&&gi(e,r),o}(De);function Ci(t){return(Ci="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Ei(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Si(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Pi(t,e,n){return(Pi="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Ai(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function Ri(t,e){return(Ri=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Li(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Ai(t);if(e){var i=Ai(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Ti(this,n)}}function Ti(t,e){return!e||"object"!==Ci(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Ai(t){return(Ai=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Ii=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Ri(t,e)}(o,t);var e,n,r,i=Li(o);function o(){return Ei(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"setValue",value:function(t,e){if(this.selectize_instance){e?this.is_dirty=!1:"change"===this.jsoneditor.options.show_errors&&(this.is_dirty=!0);var n=this.updateValue(t);this.input.value=n,this.selectize_instance.clear(!0),this.selectize_instance.setValue(n),this.onChange(!0)}else Pi(Ai(o.prototype),"setValue",this).call(this,t,e)}},{key:"afterInputReady",value:function(){var t=this;if(window.jQuery&&window.jQuery.fn&&window.jQuery.fn.selectize&&!this.selectize_instance){var e=this.expandCallbacks("selectize",f({},this.defaults.options.selectize||{},this.options.selectize||{}));this.newEnumAllowed=e.create=!!e.create&&"string"===this.schema.type,this.selectize_instance=window.jQuery(this.input).selectize(e)[0].selectize,this.control.removeEventListener("change",this.multiselectChangeHandler),this.multiselectChangeHandler=function(e){t.updateValue(e),t.onChange(!0)},this.selectize_instance.on("change",this.multiselectChangeHandler)}Pi(Ai(o.prototype),"afterInputReady",this).call(this)}},{key:"updateValue",value:function(t){var e=this.enum_values[0];return t=this.typecast(t||""),this.enum_values.includes(t)?e=t:this.newEnumAllowed&&(e=this.addNewOption(t)?t:e),this.value=e,e}},{key:"addNewOption",value:function(t){var e=this.typecast(t),n=!1;return this.enum_values.includes(e)||""===e||(this.enum_options.push("".concat(e)),this.enum_display.push("".concat(e)),this.enum_values.push(e),this.schema.enum.push(e),this.selectize_instance.addItem(e),this.selectize_instance.refreshOptions(!1),n=!0),n}},{key:"onWatchedFieldChange",value:function(){var t=this;Pi(Ai(o.prototype),"onWatchedFieldChange",this).call(this),this.selectize_instance&&(this.selectize_instance.clear(!0),this.selectize_instance.clearOptions(!0),this.enum_options.forEach((function(e,n){t.selectize_instance.addOption({value:e,text:t.enum_display[n]})})),this.selectize_instance.addItem("".concat(this.value),!0))}},{key:"enable",value:function(){!this.always_disabled&&this.selectize_instance&&this.selectize_instance.unlock(),Pi(Ai(o.prototype),"enable",this).call(this)}},{key:"disable",value:function(t){this.selectize_instance&&this.selectize_instance.lock(),Pi(Ai(o.prototype),"disable",this).call(this,t)}},{key:"destroy",value:function(){this.selectize_instance&&(this.selectize_instance.destroy(),this.selectize_instance=null),Pi(Ai(o.prototype),"destroy",this).call(this)}}])&&Si(e.prototype,n),r&&Si(e,r),o}(De);function Bi(t){return(Bi="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Ni(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Fi(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Vi(t,e){return(Vi=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Di(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=zi(t);if(e){var i=zi(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Hi(this,n)}}function Hi(t,e){return!e||"object"!==Bi(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function zi(t){return(zi=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Mi=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Vi(t,e)}(o,t);var e,n,r,i=Di(o);function o(){return Ni(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"build",value:function(){var t=this;this.options.compact||(this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired())),this.schema.description&&(this.description=this.theme.getFormInputDescription(this.translateProperty(this.schema.description)));var e=this.formname.replace(/\W/g,"");if("function"==typeof SignaturePad){this.input=this.theme.getFormInputField("hidden"),this.container.appendChild(this.input);var n=document.createElement("div");n.classList.add("signature-container");var r=document.createElement("canvas");r.setAttribute("name",e),r.classList.add("signature"),n.appendChild(r),this.signaturePad=new window.SignaturePad(r,{onEnd:function(){this.signaturePad.isEmpty()?this.input.value="":this.input.value=this.signaturePad.toDataURL(),this.is_dirty=!0,this.refreshValue(),this.watch_listener(),this.jsoneditor.notifyWatchers(this.path),this.parent?this.parent.onChildEditorChange(this):this.jsoneditor.onChange()}});var i=document.createElement("div"),o=document.createElement("button");o.classList.add("tiny","button"),o.innerHTML="Clear signature",i.appendChild(o),n.appendChild(i),this.options.compact&&this.container.setAttribute("class","".concat(this.container.getAttribute("class")," compact")),(this.schema.readOnly||this.schema.readonly)&&(this.disable(!0),Array.from(this.inputs).forEach((function(t){r.setAttribute("readOnly","readOnly"),t.disabled=!0}))),o.addEventListener("click",(function(e){e.preventDefault(),e.stopPropagation(),t.signaturePad.clear(),t.signaturePad.strokeEnd()})),this.control=this.theme.getFormControl(this.label,n,this.description),this.container.appendChild(this.control),this.refreshValue(),r.width=n.offsetWidth,this.options&&this.options.canvas_height?r.height=this.options.canvas_height:r.height="300"}else{var a=document.createElement("p");a.innerHTML="Signature pad is not available, please include SignaturePad from https://github.com/szimek/signature_pad",this.container.appendChild(a)}}},{key:"setValue",value:function(t){if("function"==typeof SignaturePad){var e=this.sanitize(t);if(this.value===e)return;return this.value=e,this.input.value=this.value,this.signaturePad.clear(),t&&""!==t&&this.signaturePad.fromDataURL(t),this.watch_listener(),this.jsoneditor.notifyWatchers(this.path),!1}}},{key:"destroy",value:function(){this.signaturePad.off(),delete this.signaturePad}}])&&Fi(e.prototype,n),r&&Fi(e,r),o}(Z);n(162);function qi(t){return(qi="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Ui(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Gi(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function $i(t,e,n){return($i="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Qi(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function Ji(t,e){return(Ji=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Wi(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Qi(t);if(e){var i=Qi(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Zi(this,n)}}function Zi(t,e){return!e||"object"!==qi(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Qi(t){return(Qi=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Yi=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Ji(t,e)}(o,t);var e,n,r,i=Wi(o);function o(){return Ui(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"setValue",value:function(t,e,n){var r=$i(Qi(o.prototype),"setValue",this).call(this,t,e,n);void 0!==r&&r.changed&&this.simplemde_instance&&this.simplemde_instance.value(r.value)}},{key:"build",value:function(){this.options.format="textarea",$i(Qi(o.prototype),"build",this).call(this),this.input_type=this.schema.format,this.input.setAttribute("data-schemaformat",this.input_type)}},{key:"afterInputReady",value:function(){var t,e=this;window.SimpleMDE?(t=this.expandCallbacks("simplemde",f({},{height:300},this.defaults.options.simplemde||{},this.options.simplemde||{},{element:this.input})),this.simplemde_instance=new window.SimpleMDE(t),(this.schema.readOnly||this.schema.readonly||this.schema.template)&&(this.simplemde_instance.codemirror.options.readOnly=!0),this.simplemde_instance.codemirror.on("change",(function(){e.value=e.simplemde_instance.value(),e.is_dirty=!0,e.onChange(!0)})),t.autorefresh&&this.startListening(this.simplemde_instance.codemirror,this.simplemde_instance.codemirror.state.autoRefresh={delay:250}),this.theme.afterInputReady(this.input)):$i(Qi(o.prototype),"afterInputReady",this).call(this)}},{key:"getNumColumns",value:function(){return 6}},{key:"enable",value:function(){!this.always_disabled&&this.simplemde_instance&&(this.simplemde_instance.codemirror.options.readOnly=!1),$i(Qi(o.prototype),"enable",this).call(this)}},{key:"disable",value:function(t){this.simplemde_instance&&(this.simplemde_instance.codemirror.options.readOnly=!0),$i(Qi(o.prototype),"disable",this).call(this,t)}},{key:"destroy",value:function(){this.simplemde_instance&&(this.simplemde_instance.toTextArea(),this.simplemde_instance=null),$i(Qi(o.prototype),"destroy",this).call(this)}},{key:"startListening",value:function(t,e){function n(){t.display.wrapper.offsetHeight?(this.stopListening(t,e),t.display.lastWrapHeight!==t.display.wrapper.clientHeight&&t.refresh()):e.timeout=window.setTimeout(n,e.delay)}e.timeout=window.setTimeout(n,e.delay),e.hurry=function(){window.clearTimeout(e.timeout),e.timeout=window.setTimeout(n,50)},t.on(window,"mouseup",e.hurry),t.on(window,"keyup",e.hurry)}},{key:"stopListening",value:function(t,e){window.clearTimeout(e.timeout),t.off(window,"mouseup",e.hurry),t.off(window,"keyup",e.hurry)}}])&&Gi(e.prototype,n),r&&Gi(e,r),o}(Z);function Xi(t){return(Xi="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Ki(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function to(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function eo(t,e,n){return(eo="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=oo(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function no(t,e){return(no=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function ro(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=oo(t);if(e){var i=oo(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return io(this,n)}}function io(t,e){return!e||"object"!==Xi(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function oo(t){return(oo=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var ao=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&no(t,e)}(o,t);var e,n,r,i=ro(o);function o(){return Ki(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"build",value:function(){var t=this;if(this.options.compact||(this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired())),this.schema.description&&(this.description=this.theme.getFormInputDescription(this.translateProperty(this.schema.description))),this.options.infoText&&(this.infoButton=this.theme.getInfoButton(this.translateProperty(this.options.infoText))),this.options.compact&&this.container.classList.add("compact"),this.ratingContainer=document.createElement("div"),this.ratingContainer.classList.add("starrating"),void 0===this.schema.enum){var e=this.schema.maximum?this.schema.maximum:5;this.schema.exclusiveMaximum&&e--,this.enum_values=[];for(var n=0;n<e;n++)this.enum_values.push(n+1)}else this.enum_values=this.schema.enum;this.radioGroup=[];for(var r=function(e){e.preventDefault(),e.stopPropagation(),t.setValue(e.currentTarget.value),t.onChange(!0)},i=this.enum_values.length-1;i>-1;i--){var o=this.formname+(i+1),a=this.theme.getFormInputField("radio");a.name="".concat(this.formname,"[starrating]"),a.value=this.enum_values[i],a.id=o,a.addEventListener("change",r,!1),this.radioGroup.push(a);var s=document.createElement("label");s.htmlFor=o,s.title=this.enum_values[i],this.options.displayValue&&s.classList.add("starrating-display-enabled"),this.ratingContainer.appendChild(a),this.ratingContainer.appendChild(s)}if(this.options.displayValue&&(this.displayRating=document.createElement("div"),this.displayRating.classList.add("starrating-display"),this.displayRating.innerText=this.enum_values[0],this.ratingContainer.appendChild(this.displayRating)),this.schema.readOnly||this.schema.readonly){this.disable(!0);for(var l=0;l<this.radioGroup.length;l++)this.radioGroup[l].disabled=!0;this.ratingContainer.classList.add("readonly")}var c=this.theme.getContainer();c.appendChild(this.ratingContainer),this.input=c,this.control=this.theme.getFormControl(this.label,c,this.description,this.infoButton),this.container.appendChild(this.control),this.refreshValue()}},{key:"enable",value:function(){if(!this.always_disabled){for(var t=0;t<this.radioGroup.length;t++)this.radioGroup[t].disabled=!1;this.ratingContainer.classList.remove("readonly"),this.disabled=!1}}},{key:"disable",value:function(t){t&&(this.always_disabled=!0);for(var e=0;e<this.radioGroup.length;e++)this.radioGroup[e].disabled=!0;this.ratingContainer.classList.add("readonly"),this.disabled=!0}},{key:"destroy",value:function(){this.ratingContainer.parentNode&&this.ratingContainer.parentNode.parentNode&&this.ratingContainer.parentNode.parentNode.removeChild(this.ratingContainer.parentNode),this.label&&this.label.parentNode&&this.label.parentNode.removeChild(this.label),this.description&&this.description.parentNode&&this.description.parentNode.removeChild(this.description),eo(oo(o.prototype),"destroy",this).call(this)}},{key:"getNumColumns",value:function(){return 2}},{key:"getValue",value:function(){if(this.dependenciesFulfilled)return"integer"===this.schema.type?""===this.value?void 0:1*this.value:this.value}},{key:"setValue",value:function(t){for(var e=0;e<this.radioGroup.length;e++)if(this.radioGroup[e].value==="".concat(t)){this.radioGroup[e].checked=!0,this.value=t,this.options.displayValue&&(this.displayRating.innerHTML=this.value),this.onChange(!0);break}}}])&&to(e.prototype,n),r&&to(e,r),o}(Z);function so(t){return(so="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function lo(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function co(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function uo(t,e,n){return(uo="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=yo(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function ho(t,e){return(ho=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function po(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=yo(t);if(e){var i=yo(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return fo(this,n)}}function fo(t,e){return!e||"object"!==so(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function yo(t){return(yo=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}ao.rules={".starrating":"direction:rtl;display:inline-block;white-space:nowrap",".starrating > input":"display:none",".starrating > label:before":"content:'%5C2606';margin:1px;font-size:18px;font-style:normal;font-weight:400;line-height:1;font-family:'Arial';display:inline-block",".starrating > label":"color:%23888;cursor:pointer;margin:8px%200%202px%200",".starrating > label.starrating-display-enabled":"margin:1px%200%200%200",".starrating > input:checked ~ label":"color:%23ffca08",".starrating:not(.readonly) > input:hover ~ label":"color:%23ffca08",".starrating > input:checked ~ label:before":"content:'%5C2605';text-shadow:0%200%201px%20rgba(0%2C20%2C20%2C1)",".starrating:not(.readonly) > input:hover ~ label:before":"content:'%5C2605';text-shadow:0%200%201px%20rgba(0%2C20%2C20%2C1)",".starrating .starrating-display":"position:relative;direction:rtl;text-align:center;font-size:10px;line-height:0px"};var mo=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&ho(t,e)}(o,t);var e,n,r,i=po(o);function o(){return lo(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"build",value:function(){uo(yo(o.prototype),"build",this).call(this),this.input.setAttribute("type","number"),this.input.getAttribute("step")||this.input.setAttribute("step","1");var t=this.theme.getStepperButtons(this.input);this.control.appendChild(t),this.stepperDown=this.control.querySelector(".stepper-down"),this.stepperUp=this.control.querySelector(".stepper-up")}},{key:"enable",value:function(){uo(yo(o.prototype),"enable",this).call(this),this.stepperDown.removeAttribute("disabled"),this.stepperUp.removeAttribute("disabled")}},{key:"disable",value:function(){uo(yo(o.prototype),"disable",this).call(this),this.stepperDown.setAttribute("disabled",!0),this.stepperUp.setAttribute("disabled",!0)}}])&&co(e.prototype,n),r&&co(e,r),o}(ir);function vo(t){return(vo="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function bo(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function go(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function _o(t,e,n){return(_o="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=jo(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function wo(t,e){return(wo=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function ko(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=jo(t);if(e){var i=jo(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return xo(this,n)}}function xo(t,e){return!e||"object"!==vo(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function jo(t){return(jo=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Oo=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&wo(t,e)}(o,t);var e,n,r,i=ko(o);function o(){return bo(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"register",value:function(){if(_o(jo(o.prototype),"register",this).call(this),this.rows)for(var t=0;t<this.rows.length;t++)this.rows[t].register()}},{key:"unregister",value:function(){if(_o(jo(o.prototype),"unregister",this).call(this),this.rows)for(var t=0;t<this.rows.length;t++)this.rows[t].unregister()}},{key:"getNumColumns",value:function(){return Math.max(Math.min(12,this.width),3)}},{key:"preBuild",value:function(){var t=this.jsoneditor.expandRefs(this.schema.items||{});this.item_title=t.title||"row",this.item_default=t.default||null,this.item_has_child_editors=t.properties||t.items,this.width=12,this.array_controls_top=this.options.array_controls_top||this.jsoneditor.options.array_controls_top,_o(jo(o.prototype),"preBuild",this).call(this)}},{key:"build",value:function(){this.table=this.theme.getTable(),this.container.appendChild(this.table),this.thead=this.theme.getTableHead(),this.table.appendChild(this.thead),this.header_row=this.theme.getTableRow(),this.thead.appendChild(this.header_row),this.row_holder=this.theme.getTableBody(),this.table.appendChild(this.row_holder);var t=this.getElementEditor(0,!0);if(this.item_default=t.getDefault(),this.width=t.getNumColumns()+2,this.options.compact?(this.panel=document.createElement("div"),this.container.appendChild(this.panel)):(this.header=document.createElement("label"),this.header.textContent=this.getTitle(),this.title=this.theme.getHeader(this.header,this.getPathDepth()),this.container.appendChild(this.title),this.options.infoText&&(this.infoButton=this.theme.getInfoButton(this.translateProperty(this.options.infoText)),this.container.appendChild(this.infoButton)),this.title_controls=this.theme.getHeaderButtonHolder(),this.title.appendChild(this.title_controls),this.schema.description&&(this.description=this.theme.getDescription(this.translateProperty(this.schema.description)),this.container.appendChild(this.description)),this.panel=this.theme.getIndentedPanel(),this.container.appendChild(this.panel),this.error_holder=document.createElement("div"),this.panel.appendChild(this.error_holder)),this.panel.appendChild(this.table),this.controls=this.theme.getButtonHolder(),this.array_controls_top?this.title.appendChild(this.controls):this.panel.appendChild(this.controls),this.item_has_child_editors)for(var e=t.getChildEditors(),n=t.property_order||Object.keys(e),r=0;r<n.length;r++){var i=this.theme.getTableHeaderCell(e[n[r]].getTitle());e[n[r]].options.hidden&&(i.style.display="none"),this.header_row.appendChild(i)}else this.header_row.appendChild(this.theme.getTableHeaderCell(this.item_title));t.destroy(),this.row_holder.innerHTML="",this.controls_header_cell=this.theme.getTableHeaderCell(" "),this.controls_header_cell.setAttribute("aria-hidden","true"),this.header_row.appendChild(this.controls_header_cell),this.addControls()}},{key:"onChildEditorChange",value:function(t){this.refreshValue(),_o(jo(o.prototype),"onChildEditorChange",this).call(this)}},{key:"getItemDefault",value:function(){return f({},{default:this.item_default}).default}},{key:"getItemTitle",value:function(){return this.item_title}},{key:"getElementEditor",value:function(t,e){var n=f({},this.schema.items),r=this.jsoneditor.getEditorClass(n,this.jsoneditor),i=this.row_holder.appendChild(this.theme.getTableRow()),o=i;this.item_has_child_editors||(o=this.theme.getTableCell(),i.appendChild(o));var a=this.jsoneditor.createEditor(r,{jsoneditor:this.jsoneditor,schema:n,container:o,path:"".concat(this.path,".").concat(t),parent:this,compact:!0,table_row:!0});return a.preBuild(),e||(a.build(),a.postBuild(),a.controls_cell=i.appendChild(this.theme.getTableCell()),a.row=i,a.table_controls=this.theme.getButtonHolder(),a.controls_cell.appendChild(a.table_controls),a.table_controls.style.margin=0,a.table_controls.style.padding=0),a}},{key:"destroy",value:function(){this.innerHTML="",this.checkParent(this.title)&&this.title.parentNode.removeChild(this.title),this.checkParent(this.description)&&this.description.parentNode.removeChild(this.description),this.checkParent(this.row_holder)&&this.row_holder.parentNode.removeChild(this.row_holder),this.checkParent(this.table)&&this.table.parentNode.removeChild(this.table),this.checkParent(this.panel)&&this.panel.parentNode.removeChild(this.panel),this.rows=this.title=this.description=this.row_holder=this.table=this.panel=null,_o(jo(o.prototype),"destroy",this).call(this)}},{key:"ensureArraySize",value:function(t){if(Array.isArray(t)||(t=[t]),this.schema.minItems)for(;t.length<this.schema.minItems;)t.push(this.getItemDefault());return this.schema.maxItems&&t.length>this.schema.maxItems&&(t=t.slice(0,this.schema.maxItems)),t}},{key:"setValue",value:function(){var t=this,e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[],n=arguments.length>1?arguments[1]:void 0;e=this.ensureArraySize(e);var r=JSON.stringify(e);if(r!==this.serialized){var i=!1;e.forEach((function(e,n){t.rows[n]?t.rows[n].setValue(e):(t.addRow(e),i=!0)}));for(var o=e.length;o<this.rows.length;o++){var a=this.rows[o].container;this.item_has_child_editors||this.rows[o].row.parentNode.removeChild(this.rows[o].row),this.rows[o].destroy(),a.parentNode&&a.parentNode.removeChild(a),this.rows[o]=null,i=!0}this.rows=this.rows.slice(0,e.length),this.refreshValue(),(i||n)&&this.refreshRowButtons(),this.onChange()}}},{key:"refreshRowButtons",value:function(){var t=this,e=this.schema.minItems&&this.schema.minItems>=this.rows.length,n=this.schema.maxItems&&this.schema.maxItems<=this.rows.length,r=[];this.rows.forEach((function(i,o){if(i.delete_button){var a=!e;t.setVisibility(i.delete_button,a),r.push(a)}if(i.copy_button){var s=!n;t.setVisibility(i.copy_button,s),r.push(s)}if(i.moveup_button){var l=0!==o;t.setVisibility(i.moveup_button,l),r.push(l)}if(i.movedown_button){var c=o!==t.rows.length-1;t.setVisibility(i.movedown_button,c),r.push(c)}}));var i=r.some((function(t){return t}));this.rows.forEach((function(e){return t.setVisibility(e.controls_cell,i)})),this.setVisibility(this.controls_header_cell,i),this.setVisibility(this.table,this.value.length);var o=!(n||this.hide_add_button);this.setVisibility(this.add_row_button,o);var a=!(!this.value.length||e||this.hide_delete_last_row_buttons);this.setVisibility(this.delete_last_row_button,a);var s=!(this.value.length<=1||e||this.hide_delete_all_rows_buttons);this.setVisibility(this.remove_all_rows_button,s);var l=o||a||s;this.setVisibility(this.controls,l)}},{key:"refreshValue",value:function(){var t=this;this.value=[],this.rows.forEach((function(e,n){t.value[n]=e.getValue()})),this.serialized=JSON.stringify(this.value)}},{key:"addRow",value:function(t){var e=this.rows.length;this.rows[e]=this.getElementEditor(e);var n=this.rows[e].table_controls;this.hide_delete_buttons||(this.rows[e].delete_button=this._createDeleteButton(e,n)),this.show_copy_button&&(this.rows[e].copy_button=this._createCopyButton(e,n)),this.hide_move_buttons||(this.rows[e].moveup_button=this._createMoveUpButton(e,n)),this.hide_move_buttons||(this.rows[e].movedown_button=this._createMoveDownButton(e,n)),void 0!==t&&this.rows[e].setValue(t)}},{key:"_createDeleteButton",value:function(t,e){var n=this,r=this.getButton("","delete","button_delete_row_title_short");return r.classList.add("delete","json-editor-btntype-delete"),r.setAttribute("data-i",t),r.addEventListener("click",(function(t){if(t.preventDefault(),t.stopPropagation(),!n.askConfirmation())return!1;var e=1*t.currentTarget.getAttribute("data-i"),r=n.getValue();r.splice(e,1),n.setValue(r),n.onChange(!0),n.jsoneditor.trigger("deleteRow",n.rows[e])})),e.appendChild(r),r}},{key:"_createCopyButton",value:function(t,e){var n=this,r=this.getButton("","copy","button_copy_row_title_short");return r.classList.add("copy","json-editor-btntype-copy"),r.setAttribute("data-i",t),r.addEventListener("click",(function(t){t.preventDefault(),t.stopPropagation();var e=1*t.currentTarget.getAttribute("data-i"),r=n.getValue();r.splice(e+1,0,r[e]),n.setValue(r),n.onChange(!0),n.jsoneditor.trigger("copyRow",n.rows[e+1])})),e.appendChild(r),r}},{key:"_createMoveUpButton",value:function(t,e){var n=this,r=this.getButton("","moveup","button_move_up_title");return r.classList.add("moveup","json-editor-btntype-move"),r.setAttribute("data-i",t),r.addEventListener("click",(function(t){t.preventDefault(),t.stopPropagation();var e=1*t.currentTarget.getAttribute("data-i"),r=n.getValue();r.splice(e-1,0,r.splice(e,1)[0]),n.setValue(r),n.onChange(!0),n.jsoneditor.trigger("moveRow",n.rows[e-1])})),e.appendChild(r),r}},{key:"_createMoveDownButton",value:function(t,e){var n=this,r=this.getButton("","movedown","button_move_down_title");return r.classList.add("movedown","json-editor-btntype-move"),r.setAttribute("data-i",t),r.addEventListener("click",(function(t){t.preventDefault(),t.stopPropagation();var e=1*t.currentTarget.getAttribute("data-i"),r=n.getValue();r.splice(e+1,0,r.splice(e,1)[0]),n.setValue(r),n.onChange(!0),n.jsoneditor.trigger("moveRow",n.rows[e+1])})),e.appendChild(r),r}},{key:"addControls",value:function(){var t=this;this.collapsed=!1,this.toggle_button=this._createToggleButton(),this.title_controls&&(this.title.insertBefore(this.toggle_button,this.title.childNodes[0]),this.toggle_button.addEventListener("click",(function(e){e.preventDefault(),e.stopPropagation(),t.setVisibility(t.panel,t.collapsed),t.collapsed?(t.collapsed=!1,t.setButtonText(e.currentTarget,"","collapse","button_collapse")):(t.collapsed=!0,t.setButtonText(e.currentTarget,"","expand","button_expand"))})),this.options.collapsed&&y(this.toggle_button,"click"),this.schema.options&&void 0!==this.schema.options.disable_collapse?this.schema.options.disable_collapse&&(this.toggle_button.style.display="none"):this.jsoneditor.options.disable_collapse&&(this.toggle_button.style.display="none")),this.add_row_button=this._createAddRowButton(),this.delete_last_row_button=this._createDeleteLastRowButton(),this.remove_all_rows_button=this._createRemoveAllRowsButton()}},{key:"_createToggleButton",value:function(){var t=this.getButton("","collapse","button_collapse");return t.classList.add("json-editor-btntype-toggle"),t}},{key:"_createAddRowButton",value:function(){var t=this,e=this.getButton(this.getItemTitle(),"add","button_add_row_title",[this.getItemTitle()]);return e.classList.add("json-editor-btntype-add"),e.addEventListener("click",(function(e){e.preventDefault(),e.stopPropagation();var n=t.addRow();t.refreshValue(),t.refreshRowButtons(),t.onChange(!0),t.jsoneditor.trigger("addRow",n)})),this.controls.appendChild(e),e}},{key:"_createDeleteLastRowButton",value:function(){var t=this,e=this.getButton("button_delete_last","subtract","button_delete_last_title",[this.getItemTitle()]);return e.classList.add("json-editor-btntype-deletelast"),e.addEventListener("click",(function(e){if(e.preventDefault(),e.stopPropagation(),!t.askConfirmation())return!1;var n=t.getValue(),r=n.pop();t.setValue(n),t.onChange(!0),t.jsoneditor.trigger("deleteRow",r)})),this.controls.appendChild(e),e}},{key:"_createRemoveAllRowsButton",value:function(){var t=this,e=this.getButton("button_delete_all","delete","button_delete_all_title");return e.classList.add("json-editor-btntype-deleteall"),e.addEventListener("click",(function(e){if(e.preventDefault(),e.stopPropagation(),!t.askConfirmation())return!1;t.setValue([]),t.onChange(!0),t.jsoneditor.trigger("deleteAllRows")})),this.controls.appendChild(e),e}}])&&go(e.prototype,n),r&&go(e,r),o}(dt);n(136);function Co(t){return(Co="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Eo(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function So(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Po(t,e,n){return(Po="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Ao(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function Ro(t,e){return(Ro=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Lo(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Ao(t);if(e){var i=Ao(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return To(this,n)}}function To(t,e){return!e||"object"!==Co(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Ao(t){return(Ao=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}function Io(t){return(Io="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Bo(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function No(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Fo(t,e,n){return(Fo="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=zo(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function Vo(t,e){return(Vo=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Do(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=zo(t);if(e){var i=zo(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Ho(this,n)}}function Ho(t,e){return!e||"object"!==Io(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function zo(t){return(zo=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}function Mo(t){return(Mo="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function qo(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Uo(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Go(t,e,n){return(Go="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Zo(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function $o(t,e){return($o=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Jo(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Zo(t);if(e){var i=Zo(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Wo(this,n)}}function Wo(t,e){return!e||"object"!==Mo(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Zo(t){return(Zo=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Qo={ace:it,array:dt,arrayChoices:Lt,arraySelect2:Ht,arraySelectize:Zt,autocomplete:ie,base64:de,button:we,checkbox:Re,choices:We,datetime:rn,describedBy:dn,enum:jn,hidden:An,info:zn,integer:ir,ip:dr,jodit:kr,multiple:Lr,multiselect:kt,null:Dr,number:Qn,object:Xr,radio:si,sceditor:mi,select:De,select2:Oi,selectize:Ii,signature:Mi,simplemde:Yi,starrating:ao,stepper:mo,string:Z,table:Oo,upload:function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Ro(t,e)}(o,t);var e,n,r,i=Lo(o);function o(){return Eo(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"getNumColumns",value:function(){return 4}},{key:"build",value:function(){var t=this;if(this.options.compact||(this.header=this.label=this.theme.getFormInputLabel(this.getTitle(),this.isRequired())),this.schema.description&&(this.description=this.theme.getFormInputDescription(this.translateProperty(this.schema.description))),this.options.infoText&&(this.infoButton=this.theme.getInfoButton(this.translateProperty(this.options.infoText))),this.options=this.expandCallbacks("upload",f({},{title:"Browse",icon:"",auto_upload:!1,hide_input:!1,enable_drag_drop:!1,drop_zone_text:"Drag & Drop file here",drop_zone_top:!1,alt_drop_zone:"",mime_type:"",max_upload_size:0,upload_handler:function(t,e,n,r){window.alert('No upload_handler defined for "'.concat(t.path,'". You must create your own handler to enable upload to server'))}},this.defaults.options.upload||{},this.options.upload||{})),this.options.mime_type=this.options.mime_type?[].concat(this.options.mime_type):[],this.input=this.theme.getFormInputField("hidden"),this.container.appendChild(this.input),!this.schema.readOnly&&!this.schema.readonly){if("function"!=typeof this.options.upload_handler)throw new Error("Upload handler required for upload editor");if(this.uploader=this.theme.getFormInputField("file"),this.uploader.style.display="none",this.options.mime_type.length&&this.uploader.setAttribute("accept",this.options.mime_type),!0===this.options.enable_drag_drop&&!0===this.options.hide_input||(this.clickHandler=function(e){t.uploader.dispatchEvent(new window.MouseEvent("click",{view:window,bubbles:!0,cancelable:!1}))},this.browseButton=this.getButton(this.options.title,this.options.icon,this.options.title),this.browseButton.addEventListener("click",this.clickHandler),this.fileDisplay=this.theme.getFormInputField("input"),this.fileDisplay.setAttribute("readonly",!0),this.fileDisplay.value="No file selected.",this.fileDisplay.addEventListener("dblclick",this.clickHandler),this.fileUploadGroup=this.theme.getInputGroup(this.fileDisplay,[this.browseButton]),this.fileUploadGroup||(this.fileUploadGroup=document.createElement("div"),this.fileUploadGroup.appendChild(this.fileDisplay),this.fileUploadGroup.appendChild(this.browseButton))),!0===this.options.enable_drag_drop){if(""!==this.options.alt_drop_zone){if(this.altDropZone=document.querySelector(this.options.alt_drop_zone),!this.altDropZone)throw new Error('Error: alt_drop_zone selector "'.concat(this.options.alt_drop_zone,'" not found!'));this.dropZone=this.altDropZone}else this.dropZone=this.theme.getDropZone(this.options.drop_zone_text);this.dropZone&&(this.dropZone.classList.add("upload-dropzone"),this.dropZone.addEventListener("dblclick",this.clickHandler))}this.uploadHandler=function(e){e.preventDefault(),e.stopPropagation();var n=e.target.files||e.dataTransfer.files;if(n&&n.length)if(0!==t.options.max_upload_size&&n[0].size>t.options.max_upload_size)t.theme.addInputError(t.uploader,"Filesize too large. Max size is ".concat(t.options.max_upload_size));else if(0===t.options.mime_type.length||t.isValidMimeType(n[0].type,t.options.mime_type)){t.fileDisplay&&(t.fileDisplay.value=n[0].name);var r=new window.FileReader;r.onload=function(e){t.preview_value=e.target.result,t.refreshPreview(n),t.onChange(!0),r=null},r.readAsDataURL(n[0])}else t.theme.addInputError(t.uploader,"Wrong file format. Allowed format(s): ".concat(t.options.mime_type.toString()))},this.uploader.addEventListener("change",this.uploadHandler),this.dragHandler=function(e){var n=e.dataTransfer.items||e.dataTransfer.files,r=n&&n.length&&(0===t.options.mime_type.length||t.isValidMimeType(n[0].type,t.options.mime_type)),i=e.currentTarget.classList&&e.currentTarget.classList.contains("upload-dropzone")&&r;switch((e.currentTarget===window?"w_":"e_")+e.type){case"w_drop":case"w_dragover":i||(e.dataTransfer.dropEffect="none");break;case"e_dragenter":i?(t.dropZone.classList.add("valid-dropzone"),e.dataTransfer.dropEffect="copy"):t.dropZone.classList.add("invalid-dropzone");break;case"e_dragover":i&&(e.dataTransfer.dropEffect="copy");break;case"e_dragleave":t.dropZone.classList.remove("valid-dropzone","invalid-dropzone");break;case"e_drop":t.dropZone.classList.remove("valid-dropzone","invalid-dropzone"),i&&t.uploadHandler(e)}i||e.preventDefault()},!0===this.options.enable_drag_drop&&(["dragover","drop"].forEach((function(e){window.addEventListener(e,t.dragHandler,!0)})),["dragenter","dragover","dragleave","drop"].forEach((function(e){t.dropZone.addEventListener(e,t.dragHandler,!0)})))}this.preview=document.createElement("div"),this.control=this.input.controlgroup=this.theme.getFormControl(this.label,this.uploader||this.input,this.description,this.infoButton),this.uploader&&(this.uploader.controlgroup=this.control);var e=this.uploader||this.input,n=document.createElement("div");this.dropZone&&!this.altDropZone&&!0===this.options.drop_zone_top&&n.appendChild(this.dropZone),this.fileUploadGroup&&n.appendChild(this.fileUploadGroup),this.dropZone&&!this.altDropZone&&!0!==this.options.drop_zone_top&&n.appendChild(this.dropZone),n.appendChild(this.preview),e.parentNode.insertBefore(n,e.nextSibling),this.container.appendChild(this.control),window.requestAnimationFrame((function(){t.afterInputReady()}))}},{key:"afterInputReady",value:function(){var t=this;if(this.value){var e=document.createElement("img");e.style.maxWidth="100%",e.style.maxHeight="100px",e.onload=function(n){t.preview.appendChild(e)},e.onerror=function(t){console.error("upload error",t,t.currentTarget)},e.src=this.container.querySelector("a").href}this.theme.afterInputReady(this.input)}},{key:"refreshPreview",value:function(t){var e=this;if(this.last_preview!==this.preview_value&&(this.last_preview=this.preview_value,this.preview.innerHTML="",this.preview_value)){var n=t[0],r=this.preview_value.match(/^data:([^;,]+)[;,]/);if(n.mimeType=r?r[1]:"unknown",n.size>0){var i=Math.floor(Math.log(n.size)/Math.log(1024));n.formattedSize="".concat(parseFloat((n.size/Math.pow(1024,i)).toFixed(2))," ").concat(["Bytes","KB","MB","GB","TB","PB","EB","ZB","YB"][i])}else n.formattedSize="0 Bytes";var o=this.getButton("button_upload","upload","button_upload");o.addEventListener("click",(function(t){t.preventDefault(),o.setAttribute("disabled","disabled"),e.theme.removeInputError(e.uploader),e.theme.getProgressBar&&(e.progressBar=e.theme.getProgressBar(),e.preview.appendChild(e.progressBar)),e.options.upload_handler(e.path,n,{success:function(t){e.setValue(t),e.parent?e.parent.onChildEditorChange(e):e.jsoneditor.onChange(),e.progressBar&&e.preview.removeChild(e.progressBar),o.removeAttribute("disabled")},failure:function(t){e.theme.addInputError(e.uploader,t),e.progressBar&&e.preview.removeChild(e.progressBar),o.removeAttribute("disabled")},updateProgress:function(t){e.progressBar&&(t?e.theme.updateProgressBar(e.progressBar,t):e.theme.updateProgressBarUnknown(e.progressBar))}})})),this.preview.appendChild(this.theme.getUploadPreview(n,o,this.preview_value)),this.options.auto_upload&&(o.dispatchEvent(new window.MouseEvent("click")),this.preview.removeChild(o))}}},{key:"enable",value:function(){this.always_disabled||(this.uploader&&(this.uploader.disabled=!1),Po(Ao(o.prototype),"enable",this).call(this))}},{key:"disable",value:function(t){t&&(this.always_disabled=!0),this.uploader&&(this.uploader.disabled=!0),Po(Ao(o.prototype),"disable",this).call(this)}},{key:"setValue",value:function(t){this.value!==t&&(this.value=t,this.input.value=this.value,this.onChange())}},{key:"destroy",value:function(){var t=this;!0===this.options.enable_drag_drop&&(["dragover","drop"].forEach((function(e){window.removeEventListener(e,t.dragHandler,!0)})),["dragenter","dragover","dragleave","drop"].forEach((function(e){t.dropZone.removeEventListener(e,t.dragHandler,!0)})),this.dropZone.removeEventListener("dblclick",this.clickHandler),this.dropZone&&this.dropZone.parentNode&&this.dropZone.parentNode.removeChild(this.dropZone)),this.uploader&&this.uploader.parentNode&&(this.uploader.removeEventListener("change",this.uploadHandler),this.uploader.parentNode.removeChild(this.uploader)),this.browseButton&&this.browseButton.parentNode&&(this.browseButton.removeEventListener("click",this.clickHandler),this.browseButton.parentNode.removeChild(this.browseButton)),this.fileDisplay&&this.fileDisplay.parentNode&&(this.fileDisplay.removeEventListener("dblclick",this.clickHandler),this.fileDisplay.parentNode.removeChild(this.fileDisplay)),this.fileUploadGroup&&this.fileUploadGroup.parentNode&&this.fileUploadGroup.parentNode.removeChild(this.fileUploadGroup),this.preview&&this.preview.parentNode&&this.preview.parentNode.removeChild(this.preview),this.header&&this.header.parentNode&&this.header.parentNode.removeChild(this.header),this.input&&this.input.parentNode&&this.input.parentNode.removeChild(this.input),Po(Ao(o.prototype),"destroy",this).call(this)}},{key:"isValidMimeType",value:function(t,e){return e.reduce((function(e,n){return e||new RegExp(n.replace(/\*/g,".*"),"gi").test(t)}),!1)}}])&&So(e.prototype,n),r&&So(e,r),o}(H),uuid:function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Vo(t,e)}(o,t);var e,n,r,i=Do(o);function o(){return Bo(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"preBuild",value:function(){Fo(zo(o.prototype),"preBuild",this).call(this),this.schema.default=this.uuid=this.getUuid(),this.schema.options||(this.schema.options={}),this.schema.options.cleave||(this.schema.options.cleave={delimiters:["-"],blocks:[8,4,4,4,12]})}},{key:"build",value:function(){Fo(zo(o.prototype),"build",this).call(this),this.disable(!0),this.input.setAttribute("readonly","true")}},{key:"sanitize",value:function(t){return this.testUuid(t)||(t=this.uuid),t}},{key:"setValue",value:function(t,e,n){this.testUuid(t)||(t=this.uuid),this.uuid=t,Fo(zo(o.prototype),"setValue",this).call(this,t,e,n)}},{key:"getUuid",value:function(){var t=(new Date).getTime();return"undefined"!=typeof performance&&"function"==typeof performance.now&&(t+=performance.now()),"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,(function(e){var n=(t+16*Math.random())%16|0;return t=Math.floor(t/16),("x"===e?n:3&n|8).toString(16)}))}},{key:"testUuid",value:function(t){return/^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(t)}}])&&No(e.prototype,n),r&&No(e,r),o}(Z),colorpicker:function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&$o(t,e)}(o,t);var e,n,r,i=Jo(o);function o(){return qo(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"postBuild",value:function(){window.Picker&&(this.input.type="text"),this.input.style.padding="3px"}},{key:"setValue",value:function(t,e,n){var r=Go(Zo(o.prototype),"setValue",this).call(this,t,e,n);return this.picker_instance&&this.picker_instance.domElement&&r&&r.changed&&this.picker_instance.setColor(r.value,!0),r}},{key:"getNumColumns",value:function(){return 2}},{key:"afterInputReady",value:function(){Go(Zo(o.prototype),"afterInputReady",this).call(this),this.createPicker(!0)}},{key:"disable",value:function(){if(Go(Zo(o.prototype),"disable",this).call(this),this.picker_instance&&this.picker_instance.domElement){this.picker_instance.domElement.style.pointerEvents="none";for(var t=this.picker_instance.domElement.querySelectorAll("button"),e=0;e<t.length;e++)t[e].disabled=!0}}},{key:"enable",value:function(){if(Go(Zo(o.prototype),"enable",this).call(this),this.picker_instance&&this.picker_instance.domElement){this.picker_instance.domElement.style.pointerEvents="auto";for(var t=this.picker_instance.domElement.querySelectorAll("button"),e=0;e<t.length;e++)t[e].disabled=!1}}},{key:"destroy",value:function(){this.createPicker(!1),Go(Zo(o.prototype),"destroy",this).call(this)}},{key:"createPicker",value:function(t){var e=this;if(t){if(window.Picker&&!this.picker_instance){var n=this.expandCallbacks("colorpicker",f({},{editor:!1,alpha:!1,color:this.value,popup:"bottom"},this.defaults.options.colorpicker||{},this.options.colorpicker||{},{parent:this.container})),r=function(t){var n=e.picker_instance.settings.editorFormat,r=e.picker_instance.settings.alpha;e.setValue("hex"===n?r?t.hex:t.hex.slice(0,7):t["".concat(n+(r?"a":""),"String")])};n.popup||"function"==typeof n.onChange?n.popup&&"function"!=typeof n.onDone&&(n.onDone=r):n.onChange=r,this.picker_instance=new window.Picker(n),n.popup||(this.input.style.display="none",this.theme.afterInputReady(this.picker_instance.domElement))}}else this.picker_instance&&(this.picker_instance.destroy(),this.picker_instance=null,this.input.style.display="")}}])&&Uo(e.prototype,n),r&&Uo(e,r),o}(Z)},Yo=(n(165),{default:function(){return{compile:function(t){var e=t.match(/{{\s*([a-zA-Z0-9\-_ .]+)\s*}}/g),n=e&&e.length;if(!n)return function(){return t};for(var r=[],i=function(t){var n,i,o=e[t].replace(/[{}]+/g,"").trim().split("."),a=o.length;a>1?n=function(e){for(i=e,t=0;t<a&&(i=i[o[t]]);t++);return i}:(o=o[0],n=function(t){return t[o]});r.push({s:e[t],r:n})},o=0;o<n;o++)i(o);return function(e){var i,a="".concat(t);for(o=0;o<n;o++)i=r[o],a=a.replace(i.s,i.r(e));return a}}}},ejs:function(){return!!window.EJS&&{compile:function(t){var e=new window.EJS({text:t});return function(t){return e.render(t)}}}},handlebars:function(){return window.Handlebars},hogan:function(){return!!window.Hogan&&{compile:function(t){var e=window.Hogan.compile(t);return function(t){return e.render(t)}}}},lodash:function(){return!!window._&&{compile:function(t){return function(e){return window._.template(t)(e)}}}},markup:function(){return!(!window.Mark||!window.Mark.up)&&{compile:function(t){return function(e){return window.Mark.up(t,e)}}}},mustache:function(){return!!window.Mustache&&{compile:function(t){return function(e){return window.Mustache.render(t,e)}}}},swig:function(){return window.swig},underscore:function(){return!!window._&&{compile:function(t){return function(e){return window._.template(t)(e)}}}}});function Xo(t){return function(t){if(Array.isArray(t))return Ko(t)}(t)||function(t){if("undefined"!=typeof Symbol&&null!=t[Symbol.iterator]||null!=t["@@iterator"])return Array.from(t)}(t)||function(t,e){if(!t)return;if("string"==typeof t)return Ko(t,e);var n=Object.prototype.toString.call(t).slice(8,-1);"Object"===n&&t.constructor&&(n=t.constructor.name);if("Map"===n||"Set"===n)return Array.from(t);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return Ko(t,e)}(t)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function Ko(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,r=new Array(e);n<e;n++)r[n]=t[n];return r}function ta(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function ea(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}var na={collapse:"",expand:"",delete:"",edit:"",add:"",cancel:"",save:"",moveup:"",movedown:""},ra=function(){function t(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:na;ta(this,t),this.mapping=n,this.icon_prefix=e}var e,n,r;return e=t,(n=[{key:"getIconClass",value:function(t){return this.mapping[t]?this.icon_prefix+this.mapping[t]:null}},{key:"getIcon",value:function(t){var e,n=this.getIconClass(t);if(!n)return null;var r=document.createElement("i");return(e=r.classList).add.apply(e,Xo(n.split(" "))),r}}])&&ea(e.prototype,n),r&&ea(e,r),t}();function ia(t){return(ia="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function oa(t,e){return(oa=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function aa(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=la(t);if(e){var i=la(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return sa(this,n)}}function sa(t,e){return!e||"object"!==ia(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function la(t){return(la=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var ca={collapse:"chevron-down",expand:"chevron-right",delete:"trash",edit:"pencil",add:"plus",subtract:"minus",cancel:"floppy-remove",save:"floppy-saved",moveup:"arrow-up",moveright:"arrow-right",movedown:"arrow-down",moveleft:"arrow-left",copy:"copy",clear:"remove-circle",time:"time",calendar:"calendar",edit_properties:"list"};function ua(t){return(ua="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function ha(t,e){return(ha=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function pa(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=fa(t);if(e){var i=fa(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return da(this,n)}}function da(t,e){return!e||"object"!==ua(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function fa(t){return(fa=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var ya={collapse:"chevron-down",expand:"chevron-right",delete:"trash",edit:"pencil",add:"plus",subtract:"minus",cancel:"ban-circle",save:"save",moveup:"arrow-up",moveright:"arrow-right",movedown:"arrow-down",moveleft:"arrow-left",copy:"copy",clear:"remove-circle",time:"time",calendar:"calendar",edit_properties:"list"};function ma(t){return(ma="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function va(t,e){return(va=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function ba(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=_a(t);if(e){var i=_a(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return ga(this,n)}}function ga(t,e){return!e||"object"!==ma(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function _a(t){return(_a=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var wa={collapse:"caret-square-o-down",expand:"caret-square-o-right",delete:"times",edit:"pencil",add:"plus",subtract:"minus",cancel:"ban",save:"save",moveup:"arrow-up",moveright:"arrow-right",movedown:"arrow-down",moveleft:"arrow-left",copy:"files-o",clear:"times-circle-o",time:"clock-o",calendar:"calendar",edit_properties:"list"};function ka(t){return(ka="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function xa(t,e){return(xa=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function ja(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Ca(t);if(e){var i=Ca(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Oa(this,n)}}function Oa(t,e){return!e||"object"!==ka(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Ca(t){return(Ca=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Ea={collapse:"caret-down",expand:"caret-right",delete:"trash",edit:"pen",add:"plus",subtract:"minus",cancel:"ban",save:"save",moveup:"arrow-up",moveright:"arrow-right",movedown:"arrow-down",moveleft:"arrow-left",copy:"copy",clear:"times-circle",time:"clock",calendar:"calendar",edit_properties:"list"};function Sa(t){return(Sa="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Pa(t,e){return(Pa=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Ra(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Ta(t);if(e){var i=Ta(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return La(this,n)}}function La(t,e){return!e||"object"!==Sa(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Ta(t){return(Ta=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Aa={collapse:"triangle-1-s",expand:"triangle-1-e",delete:"trash",edit:"pencil",add:"plusthick",subtract:"minusthick",cancel:"closethick",save:"disk",moveup:"arrowthick-1-n",moveright:"arrowthick-1-e",movedown:"arrowthick-1-s",moveleft:"arrowthick-1-w",copy:"copy",clear:"circle-close",time:"time",calendar:"calendar",edit_properties:"note"};function Ia(t){return(Ia="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Ba(t,e){return(Ba=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Na(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Va(t);if(e){var i=Va(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Fa(this,n)}}function Fa(t,e){return!e||"object"!==Ia(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Va(t){return(Va=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Da={collapse:"collapse-down",expand:"expand-right",delete:"trash",edit:"pencil",add:"plus",subtract:"minus",cancel:"ban",save:"file",moveup:"arrow-thick-top",moveright:"arrow-thick-right",movedown:"arrow-thick-bottom",moveleft:"arrow-thick-left",copy:"clipboard",clear:"circle-x",time:"clock",calendar:"calendar",edit_properties:"list"};function Ha(t){return(Ha="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function za(t,e){return(za=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Ma(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Ua(t);if(e){var i=Ua(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return qa(this,n)}}function qa(t,e){return!e||"object"!==Ha(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Ua(t){return(Ua=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Ga={collapse:"arrow-down",expand:"arrow-right",delete:"delete",edit:"edit",add:"plus",subtract:"minus",cancel:"cross",save:"check",moveup:"upward",moveright:"forward",movedown:"downward",moveleft:"back",copy:"copy",clear:"close",time:"time",calendar:"bookmark",edit_properties:"menu"},$a={bootstrap3:function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&oa(t,e)}(n,t);var e=aa(n);function n(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,n),e.call(this,"glyphicon glyphicon-",ca)}return n}(ra),fontawesome3:function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&ha(t,e)}(n,t);var e=pa(n);function n(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,n),e.call(this,"icon-",ya)}return n}(ra),fontawesome4:function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&va(t,e)}(n,t);var e=ba(n);function n(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,n),e.call(this,"fa fa-",wa)}return n}(ra),fontawesome5:function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&xa(t,e)}(n,t);var e=ja(n);function n(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,n),e.call(this,"fas fa-",Ea)}return n}(ra),jqueryui:function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Pa(t,e)}(n,t);var e=Ra(n);function n(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,n),e.call(this,"ui-icon ui-icon-",Aa)}return n}(ra),openiconic:function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Ba(t,e)}(n,t);var e=Na(n);function n(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,n),e.call(this,"oi oi-",Da)}return n}(ra),spectre:function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&za(t,e)}(n,t);var e=Ma(n);function n(){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,n),e.call(this,"icon icon-",Ga)}return n}(ra)};n(137);function Ja(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Wa(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}var Za=["matches","webkitMatchesSelector","mozMatchesSelector","msMatchesSelector","oMatchesSelector"].find((function(t){return t in document.documentElement})),Qa=function(){function t(e){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{disable_theme_rules:!1};Ja(this,t),this.jsoneditor=e,Object.keys(n).forEach((function(t){void 0!==e.options[t]&&(n[t]=e.options[t])})),this.options=n}var e,n,r;return e=t,(n=[{key:"getContainer",value:function(){return document.createElement("div")}},{key:"getFloatRightLinkHolder",value:function(){var t=document.createElement("div");return t.classList.add("je-float-right-linkholder"),t}},{key:"getModal",value:function(){var t=document.createElement("div");return t.style.display="none",t.classList.add("je-modal"),t}},{key:"getGridContainer",value:function(){return document.createElement("div")}},{key:"getGridRow",value:function(){var t=document.createElement("div");return t.classList.add("row"),t}},{key:"getGridColumn",value:function(){return document.createElement("div")}},{key:"setGridColumnSize",value:function(t,e){}},{key:"getLink",value:function(t){var e=document.createElement("a");return e.setAttribute("href","#"),e.appendChild(document.createTextNode(t)),e}},{key:"disableHeader",value:function(t){t.style.color="#ccc"}},{key:"disableLabel",value:function(t){t.style.color="#ccc"}},{key:"enableHeader",value:function(t){t.style.color=""}},{key:"enableLabel",value:function(t){t.style.color=""}},{key:"getInfoButton",value:function(t){var e=document.createElement("span");e.innerText="ⓘ",e.classList.add("je-infobutton-icon");var n=document.createElement("span");return n.classList.add("je-infobutton-tooltip"),n.innerText=t,e.onmouseover=function(){n.style.visibility="visible"},e.onmouseleave=function(){n.style.visibility="hidden"},e.appendChild(n),e}},{key:"getFormInputLabel",value:function(t,e){var n=document.createElement("label");return n.appendChild(document.createTextNode(t)),e&&n.classList.add("required"),n}},{key:"getHeader",value:function(t,e){var n=document.createElement("h3");return"string"==typeof t?n.textContent=t:n.appendChild(t),n.classList.add("je-header"),n}},{key:"getCheckbox",value:function(){var t=this.getFormInputField("checkbox");return t.classList.add("je-checkbox"),t}},{key:"getCheckboxLabel",value:function(t,e){var n=document.createElement("label");return n.appendChild(document.createTextNode(" ".concat(t))),e&&n.classList.add("required"),n}},{key:"getMultiCheckboxHolder",value:function(t,e,n,r){var i=document.createElement("div");return i.classList.add("control-group"),e&&(e.style.display="block",i.appendChild(e),r&&e.appendChild(r)),Object.values(t).forEach((function(t){t.style.display="inline-block",t.style.marginRight="20px",i.appendChild(t)})),n&&i.appendChild(n),i}},{key:"getFormCheckboxControl",value:function(t,e,n){var r=document.createElement("div");return r.appendChild(t),e.style.width="auto",t.insertBefore(e,t.firstChild),n&&r.classList.add("je-checkbox-control--compact"),r}},{key:"getFormRadio",value:function(t){var e=this.getFormInputField("radio");return Object.keys(t).forEach((function(n){return e.setAttribute(n,t[n])})),e.classList.add("je-radio"),e}},{key:"getFormRadioLabel",value:function(t,e){var n=document.createElement("label");return n.appendChild(document.createTextNode(" ".concat(t))),e&&n.classList.add("required"),n}},{key:"getFormRadioControl",value:function(t,e,n){var r=document.createElement("div");return r.appendChild(t),e.style.width="auto",t.insertBefore(e,t.firstChild),n&&r.classList.add("je-radio-control--compact"),r}},{key:"getSelectInput",value:function(t,e){var n=document.createElement("select");return t&&this.setSelectOptions(n,t),n}},{key:"getSwitcher",value:function(t){var e=this.getSelectInput(t,!1);return e.classList.add("je-switcher"),e}},{key:"getSwitcherOptions",value:function(t){return t.getElementsByTagName("option")}},{key:"setSwitcherOptions",value:function(t,e,n){this.setSelectOptions(t,e,n)}},{key:"setSelectOptions",value:function(t,e){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:[];t.innerHTML="";for(var r=0;r<e.length;r++){var i=document.createElement("option");i.setAttribute("value",e[r]),i.textContent=n[r]||e[r],t.appendChild(i)}}},{key:"getTextareaInput",value:function(){var t=document.createElement("textarea");return t.classList.add("je-textarea"),t}},{key:"getRangeInput",value:function(t,e,n){var r=this.getFormInputField("range");return r.setAttribute("min",t),r.setAttribute("max",e),r.setAttribute("step",n),r}},{key:"getStepperButtons",value:function(t){var e=document.createElement("div"),n=document.createElement("button");n.setAttribute("type","button"),n.classList.add("stepper-down");var r=document.createElement("button");r.setAttribute("type","button"),r.classList.add("stepper-up"),t.getAttribute("readonly")&&(n.setAttribute("disabled",!0),r.setAttribute("disabled",!0)),n.textContent="-",r.textContent="+";var i=function(t,e){t.value=Number(e||t.value),t.setAttribute("initialized","1")},o=t.getAttribute("min"),a=t.getAttribute("max");return n.addEventListener("click",(function(){t.getAttribute("initialized")?o?Number(t.value)>Number(o)&&t.stepDown():t.stepDown():i(t,o),y(t,"change")})),r.addEventListener("click",(function(){t.getAttribute("initialized")?a?Number(t.value)<Number(a)&&t.stepUp():t.stepUp():i(t,o),y(t,"change")})),e.appendChild(n),e.appendChild(r),e}},{key:"getRangeOutput",value:function(t,e){var n=document.createElement("output");n.value=e||0;var r=function(t){n.value=t.currentTarget.value};return t.addEventListener("change",r,!1),t.addEventListener("input",r,!1),n}},{key:"getRangeControl",value:function(t,e){var n=document.createElement("div");return n.classList.add("je-range-control"),e&&n.appendChild(e),n.appendChild(t),n}},{key:"getFormInputField",value:function(t){var e=document.createElement("input");return e.setAttribute("type",t),e}},{key:"afterInputReady",value:function(t){}},{key:"getFormControl",value:function(t,e,n,r,i){var o=document.createElement("div");return o.classList.add("form-control"),t&&(o.appendChild(t),i&&t.setAttribute("for",i)),"checkbox"!==e.type&&"radio"!==e.type||!t?(r&&t&&t.appendChild(r),o.appendChild(e)):(e.style.width="auto",t.insertBefore(e,t.firstChild),r&&t.appendChild(r)),n&&o.appendChild(n),o}},{key:"getIndentedPanel",value:function(){var t=document.createElement("div");return t.classList.add("je-indented-panel"),t}},{key:"getTopIndentedPanel",value:function(){var t=document.createElement("div");return t.classList.add("je-indented-panel--top"),t}},{key:"getChildEditorHolder",value:function(){return document.createElement("div")}},{key:"getDescription",value:function(t){var e=document.createElement("p");return window.DOMPurify?e.innerHTML=window.DOMPurify.sanitize(t):e.textContent=this.cleanText(t),e}},{key:"getCheckboxDescription",value:function(t){return this.getDescription(t)}},{key:"getFormInputDescription",value:function(t){return this.getDescription(t)}},{key:"getButtonHolder",value:function(){return document.createElement("span")}},{key:"getHeaderButtonHolder",value:function(){return this.getButtonHolder()}},{key:"getFormButtonHolder",value:function(t){return this.getButtonHolder()}},{key:"getButton",value:function(t,e,n){var r=document.createElement("button");return r.type="button",this.setButtonText(r,t,e,n),r}},{key:"getFormButton",value:function(t,e,n){return this.getButton(t,e,n)}},{key:"setButtonText",value:function(t,e,n,r){for(;t.firstChild;)t.removeChild(t.firstChild);if(n&&(t.appendChild(n),e=" ".concat(e)),!this.jsoneditor.options.iconlib||!this.jsoneditor.options.remove_button_labels||!n){var i=document.createElement("span");i.appendChild(document.createTextNode(e)),t.appendChild(i)}r&&t.setAttribute("title",r)}},{key:"getTable",value:function(){return document.createElement("table")}},{key:"getTableRow",value:function(){return document.createElement("tr")}},{key:"getTableHead",value:function(){return document.createElement("thead")}},{key:"getTableBody",value:function(){return document.createElement("tbody")}},{key:"getTableHeaderCell",value:function(t){var e=document.createElement("th");return e.textContent=t,e}},{key:"getTableCell",value:function(){return document.createElement("td")}},{key:"getErrorMessage",value:function(t){var e=document.createElement("p");return e.style=e.style||{},e.style.color="red",e.appendChild(document.createTextNode(t)),e}},{key:"addInputError",value:function(t,e){}},{key:"removeInputError",value:function(t){}},{key:"addTableRowError",value:function(t){}},{key:"removeTableRowError",value:function(t){}},{key:"getTabHolder",value:function(t){var e=void 0===t?"":t,n=document.createElement("div");return n.innerHTML="<div class='je-tabholder tabs'></div><div class='content' id='".concat(e,"'></div><div class='je-tabholder--clear'></div>"),n}},{key:"getTopTabHolder",value:function(t){var e=void 0===t?"":t,n=document.createElement("div");return n.innerHTML="<div class='tabs je-tabholder--top'></div><div class='je-tabholder--clear'></div><div class='content' id='".concat(e,"'></div>"),n}},{key:"applyStyles",value:function(t,e){Object.keys(e).forEach((function(n){return t.style[n]=e[n]}))}},{key:"closest",value:function(t,e){for(;t&&t!==document;){if(!t[Za])return!1;if(t[Za](e))return t;t=t.parentNode}return!1}},{key:"insertBasicTopTab",value:function(t,e){e.firstChild.insertBefore(t,e.firstChild.firstChild)}},{key:"getTab",value:function(t,e){var n=document.createElement("div");return n.appendChild(t),n.id=e,n.classList.add("je-tab"),n}},{key:"getTopTab",value:function(t,e){var n=document.createElement("div");return n.appendChild(t),n.id=e,n.classList.add("je-tab--top"),n}},{key:"getTabContentHolder",value:function(t){return t.children[1]}},{key:"getTopTabContentHolder",value:function(t){return t.children[1]}},{key:"getTabContent",value:function(){return this.getIndentedPanel()}},{key:"getTopTabContent",value:function(){return this.getTopIndentedPanel()}},{key:"markTabActive",value:function(t){this.applyStyles(t.tab,{opacity:1,background:"white"}),void 0!==t.rowPane?t.rowPane.style.display="":t.container.style.display=""}},{key:"markTabInactive",value:function(t){this.applyStyles(t.tab,{opacity:.5,background:""}),void 0!==t.rowPane?t.rowPane.style.display="none":t.container.style.display="none"}},{key:"addTab",value:function(t,e){t.children[0].appendChild(e)}},{key:"addTopTab",value:function(t,e){t.children[0].appendChild(e)}},{key:"getBlockLink",value:function(){var t=document.createElement("a");return t.classList.add("je-block-link"),t}},{key:"getBlockLinkHolder",value:function(){return document.createElement("div")}},{key:"getLinksHolder",value:function(){return document.createElement("div")}},{key:"createMediaLink",value:function(t,e,n){t.appendChild(e),n.classList.add("je-media"),t.appendChild(n)}},{key:"createImageLink",value:function(t,e,n){t.appendChild(e),e.appendChild(n)}},{key:"getFirstTab",value:function(t){return t.firstChild.firstChild}},{key:"getInputGroup",value:function(t,e){}},{key:"cleanText",value:function(t){var e=document.createElement("div");return e.innerHTML=t,e.textContent||e.innerText}},{key:"getDropZone",value:function(t){var e=document.createElement("div");return e.setAttribute("data-text",t),e.classList.add("je-dropzone"),e}},{key:"getUploadPreview",value:function(t,e,n){var r=document.createElement("div");if(r.classList.add("je-upload-preview"),"image"===t.mimeType.substr(0,5)){var i=document.createElement("img");i.src=n,r.appendChild(i)}var o=document.createElement("div");o.innerHTML+="<strong>Name:</strong> ".concat(t.name,"<br><strong>Type:</strong> ").concat(t.type,"<br><strong>Size:</strong> ").concat(t.formattedSize),r.appendChild(o),r.appendChild(e);var a=document.createElement("div");return a.style.clear="left",r.appendChild(a),r}},{key:"getProgressBar",value:function(){var t=document.createElement("progress");return t.setAttribute("max",100),t.setAttribute("value",0),t}},{key:"updateProgressBar",value:function(t,e){t&&t.setAttribute("value",e)}},{key:"updateProgressBarUnknown",value:function(t){t&&t.removeAttribute("value")}}])&&Wa(e.prototype,n),r&&Wa(e,r),t}();function Ya(t){return(Ya="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Xa(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Ka(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function ts(t,e,n){return(ts="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=is(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function es(t,e){return(es=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function ns(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=is(t);if(e){var i=is(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return rs(this,n)}}function rs(t,e){return!e||"object"!==Ya(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function is(t){return(is=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var os=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&es(t,e)}(o,t);var e,n,r,i=ns(o);function o(){return Xa(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"getFormInputLabel",value:function(t,e){var n=ts(is(o.prototype),"getFormInputLabel",this).call(this,t,e);return n.classList.add("je-form-input-label"),n}},{key:"getFormInputDescription",value:function(t){var e=ts(is(o.prototype),"getFormInputDescription",this).call(this,t);return e.classList.add("je-form-input-label"),e}},{key:"getIndentedPanel",value:function(){var t=ts(is(o.prototype),"getIndentedPanel",this).call(this);return t.classList.add("je-indented-panel"),t}},{key:"getTopIndentedPanel",value:function(){return this.getIndentedPanel()}},{key:"getChildEditorHolder",value:function(){var t=ts(is(o.prototype),"getChildEditorHolder",this).call(this);return t.classList.add("je-child-editor-holder"),t}},{key:"getHeaderButtonHolder",value:function(){var t=this.getButtonHolder();return t.classList.add("je-header-button-holder"),t}},{key:"getTable",value:function(){var t=ts(is(o.prototype),"getTable",this).call(this);return t.classList.add("je-table"),t}},{key:"addInputError",value:function(t,e){var n=this.closest(t,".form-control")||t.controlgroup;t.errmsg?t.errmsg.style.display="block":(t.errmsg=document.createElement("div"),t.errmsg.setAttribute("class","errmsg"),t.errmsg.style=t.errmsg.style||{},t.errmsg.style.color="red",n.appendChild(t.errmsg)),t.errmsg.innerHTML="",t.errmsg.appendChild(document.createTextNode(e))}},{key:"removeInputError",value:function(t){t.style&&(t.style.borderColor=""),t.errmsg&&(t.errmsg.style.display="none")}}])&&Ka(e.prototype,n),r&&Ka(e,r),o}(Qa);os.rules={".je-form-input-label":"display:block;margin-bottom:3px;font-weight:bold",".je-form-input-description":"display:inline-block;margin:0;font-size:0.8em;font-style:italic",".je-indented-panel":"padding:5px;margin:10px;border-radius:3px;border:1px%20solid%20%23ddd",".je-child-editor-holder":"margin-bottom:8px",".je-header-button-holder":"display:inline-block;margin-left:10px;font-size:0.8em;vertical-align:middle",".je-table":"margin-bottom:5px;border-bottom:1px%20solid%20%23ccc",".je-upload-preview img":"float:left;margin:0%200.5rem%200.5rem%200;max-width:100%25;max-height:5rem",".je-dropzone":"position:relative;margin:0.5rem%200;border:2px%20dashed%20black;width:100%25;height:60px;background:teal;transition:all%200.5s",".je-dropzone:before":"position:absolute;content:attr(data-text);color:rgba(0%2C%200%2C%200%2C%200.6);left:50%25;top:50%25;transform:translate(-50%25%2C%20-50%25)",".je-dropzone.valid-dropzone":"background:green",".je-dropzone.invalid-dropzone":"background:red"};var as=n(138),ss=n.n(as);function ls(t){return(ls="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function cs(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function us(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function hs(t,e,n){return(hs="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=ys(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function ps(t,e){return(ps=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function ds(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=ys(t);if(e){var i=ys(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return fs(this,n)}}function fs(t,e){return!e||"object"!==ls(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function ys(t){return(ys=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var ms=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&ps(t,e)}(o,t);var e,n,r,i=ds(o);function o(){return cs(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"getSelectInput",value:function(t,e){var n=hs(ys(o.prototype),"getSelectInput",this).call(this,t);return n.classList.add("form-control"),n}},{key:"setGridColumnSize",value:function(t,e,n){t.classList.add("col-md-".concat(e)),n&&t.classList.add("col-md-offset-".concat(n))}},{key:"afterInputReady",value:function(t){if(!t.controlgroup&&(t.controlgroup=this.closest(t,".form-group"),this.closest(t,".compact")&&(t.controlgroup.style.marginBottom=0),this.queuedInputErrorText)){var e=this.queuedInputErrorText;delete this.queuedInputErrorText,this.addInputError(t,e)}}},{key:"getTextareaInput",value:function(){var t=document.createElement("textarea");return t.classList.add("form-control"),t}},{key:"getRangeInput",value:function(t,e,n){return hs(ys(o.prototype),"getRangeInput",this).call(this,t,e,n)}},{key:"getFormInputField",value:function(t){var e=hs(ys(o.prototype),"getFormInputField",this).call(this,t);return"checkbox"!==t&&"radio"!==t&&e.classList.add("form-control"),e}},{key:"getFormControl",value:function(t,e,n,r){var i=document.createElement("div");return!t||"checkbox"!==e.type&&"radio"!==e.type?(i.classList.add("form-group"),t&&(t.classList.add("control-label"),i.appendChild(t),r&&t.appendChild(r)),i.appendChild(e)):(i.classList.add(e.type),t.insertBefore(e,t.firstChild),i.appendChild(t)),n&&i.appendChild(n),i}},{key:"getIndentedPanel",value:function(){var t=document.createElement("div");return t.classList.add("well","well-sm"),t.style.paddingBottom=0,t}},{key:"getInfoButton",value:function(t){var e=document.createElement("span");e.classList.add("glyphicon","glyphicon-info-sign","pull-right"),e.style.padding=".25rem",e.style.position="relative",e.style.display="inline-block";var n=document.createElement("span");return n.style["font-family"]="sans-serif",n.style.visibility="hidden",n.style["background-color"]="rgba(50, 50, 50, .75)",n.style.margin="0 .25rem",n.style.color="#FAFAFA",n.style.padding=".5rem 1rem",n.style["border-radius"]=".25rem",n.style.width="25rem",n.style.position="absolute",n.innerText=t,e.onmouseover=function(){n.style.visibility="visible"},e.onmouseleave=function(){n.style.visibility="hidden"},e.appendChild(n),e}},{key:"getFormInputDescription",value:function(t){var e=document.createElement("p");return e.classList.add("help-block"),window.DOMPurify?e.innerHTML=window.DOMPurify.sanitize(t):e.textContent=this.cleanText(t),e}},{key:"getHeaderButtonHolder",value:function(){var t=this.getButtonHolder();return t.style.marginLeft="10px",t}},{key:"getButtonHolder",value:function(){var t=document.createElement("span");return t.classList.add("btn-group"),t}},{key:"getButton",value:function(t,e,n){var r=hs(ys(o.prototype),"getButton",this).call(this,t,e,n);return r.classList.add("btn","btn-default"),r}},{key:"getTable",value:function(){var t=document.createElement("table");return t.classList.add("table","table-bordered"),t.style.width="auto",t.style.maxWidth="none",t}},{key:"addInputError",value:function(t,e){t.controlgroup?(t.controlgroup.classList.add("has-error"),t.errmsg?t.errmsg.style.display="":(t.errmsg=document.createElement("p"),t.errmsg.classList.add("help-block","errormsg"),t.controlgroup.appendChild(t.errmsg)),t.errmsg.textContent=e):this.queuedInputErrorText=e}},{key:"removeInputError",value:function(t){t.controlgroup||delete this.queuedInputErrorText,t.errmsg&&(t.errmsg.style.display="none",t.controlgroup.classList.remove("has-error"))}},{key:"getTabHolder",value:function(t){var e=void 0===t?"":t,n=document.createElement("div");return n.innerHTML="<ul class='col-md-2 nav nav-pills nav-stacked' id='".concat(e,"' role='tablist'></ul><div class='col-md-10 tab-content active well well-small'  id='").concat(e,"'></div>"),n}},{key:"getTopTabHolder",value:function(t){var e=void 0===t?"":t,n=document.createElement("div");return n.innerHTML="<ul class='nav nav-tabs' id='".concat(e,"' role='tablist'></ul><div class='tab-content active well well-small'  id='").concat(e,"'></div>"),n}},{key:"getTab",value:function(t,e){var n=document.createElement("li");n.setAttribute("role","presentation");var r=document.createElement("a");return r.setAttribute("href","#".concat(e)),r.appendChild(t),r.setAttribute("aria-controls",e),r.setAttribute("role","tab"),r.setAttribute("data-toggle","tab"),n.appendChild(r),n}},{key:"getTopTab",value:function(t,e){var n=document.createElement("li");n.setAttribute("role","presentation");var r=document.createElement("a");return r.setAttribute("href","#".concat(e)),r.appendChild(t),r.setAttribute("aria-controls",e),r.setAttribute("role","tab"),r.setAttribute("data-toggle","tab"),n.appendChild(r),n}},{key:"getTabContent",value:function(){var t=document.createElement("div");return t.classList.add("tab-pane"),t.setAttribute("role","tabpanel"),t}},{key:"getTopTabContent",value:function(){var t=document.createElement("div");return t.classList.add("tab-pane"),t.setAttribute("role","tabpanel"),t}},{key:"markTabActive",value:function(t){t.tab.classList.add("active"),void 0!==t.rowPane?t.rowPane.classList.add("active"):t.container.classList.add("active")}},{key:"markTabInactive",value:function(t){t.tab.classList.remove("active"),void 0!==t.rowPane?t.rowPane.classList.remove("active"):t.container.classList.remove("active")}},{key:"getProgressBar",value:function(){var t=document.createElement("div");t.classList.add("progress");var e=document.createElement("div");return e.classList.add("progress-bar"),e.setAttribute("role","progressbar"),e.setAttribute("aria-valuenow",0),e.setAttribute("aria-valuemin",0),e.setAttribute("aria-valuenax",100),e.innerHTML="".concat(0,"%"),t.appendChild(e),t}},{key:"updateProgressBar",value:function(t,e){if(t){var n=t.firstChild,r="".concat(e,"%");n.setAttribute("aria-valuenow",e),n.style.width=r,n.innerHTML=r}}},{key:"updateProgressBarUnknown",value:function(t){if(t){var e=t.firstChild;t.classList.add("progress","progress-striped","active"),e.removeAttribute("aria-valuenow"),e.style.width="100%",e.innerHTML=""}}},{key:"getInputGroup",value:function(t,e){if(t){var n=document.createElement("div");n.classList.add("input-group"),n.appendChild(t);var r=document.createElement("div");r.classList.add("input-group-btn"),n.appendChild(r);for(var i=0;i<e.length;i++)r.appendChild(e[i]);return n}}}])&&us(e.prototype,n),r&&us(e,r),o}(Qa);ms.rules=ss.a;n(167);function vs(t){return(vs="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function bs(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function gs(t,e,n){return(gs="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=xs(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function _s(t,e){return(_s=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function ws(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=xs(t);if(e){var i=xs(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return ks(this,n)}}function ks(t,e){return!e||"object"!==vs(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function xs(t){return(xs=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var js={disable_theme_rules:!1,input_size:"normal",custom_forms:!1,object_indent:!0,object_background:"bg-light",object_text:"",table_border:!1,table_zebrastyle:!1,tooltip:"bootstrap"},Os=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&_s(t,e)}(o,t);var e,n,r,i=ws(o);function o(t){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,o),i.call(this,t,js)}return e=o,(n=[{key:"getSelectInput",value:function(t,e){var n=gs(xs(o.prototype),"getSelectInput",this).call(this,t);return n.classList.add("form-control"),!1===this.options.custom_forms?("small"===this.options.input_size&&n.classList.add("form-control-sm"),"large"===this.options.input_size&&n.classList.add("form-control-lg")):(n.classList.remove("form-control"),n.classList.add("custom-select"),"small"===this.options.input_size&&n.classList.add("custom-select-sm"),"large"===this.options.input_size&&n.classList.add("custom-select-lg")),n}},{key:"getContainer",value:function(){var t=document.createElement("div");return this.options.object_indent||t.classList.add("je-noindent"),t}},{key:"setGridColumnSize",value:function(t,e,n){t.classList.add("col-md-".concat(e)),n&&t.classList.add("offset-md-".concat(n))}},{key:"afterInputReady",value:function(t){if(!t.controlgroup){var e=t.name;t.id=e;var n=t.parentNode.parentNode.getElementsByTagName("label")[0];n&&(n.htmlFor=e),t.controlgroup=this.closest(t,".form-group")}}},{key:"getTextareaInput",value:function(){var t=document.createElement("textarea");return t.classList.add("form-control"),"small"===this.options.input_size&&t.classList.add("form-control-sm"),"large"===this.options.input_size&&t.classList.add("form-control-lg"),t}},{key:"getRangeInput",value:function(t,e,n){var r=gs(xs(o.prototype),"getRangeInput",this).call(this,t,e,n);return!0===this.options.custom_forms&&(r.classList.remove("form-control"),r.classList.add("custom-range")),r}},{key:"getStepperButtons",value:function(t){var e=document.createElement("div"),n=document.createElement("div"),r=document.createElement("div"),i=document.createElement("button");i.setAttribute("type","button");var o=document.createElement("button");o.setAttribute("type","button"),e.appendChild(n),e.appendChild(t),e.appendChild(r),n.appendChild(i),r.appendChild(o),e.classList.add("input-group"),n.classList.add("input-group-prepend"),r.classList.add("input-group-append"),i.classList.add("btn"),i.classList.add("btn-secondary"),i.classList.add("stepper-down"),o.classList.add("btn"),o.classList.add("btn-secondary"),o.classList.add("stepper-up"),t.getAttribute("readonly")&&(i.setAttribute("disabled",!0),o.setAttribute("disabled",!0)),i.textContent="-",o.textContent="+";var a=function(t,e){t.value=Number(e||t.value),t.setAttribute("initialized","1")},s=t.getAttribute("min"),l=t.getAttribute("max");return t.addEventListener("change",(function(){t.getAttribute("initialized")||t.setAttribute("initialized","1")})),i.addEventListener("click",(function(){t.getAttribute("initialized")?s?Number(t.value)>Number(s)&&t.stepDown():t.stepDown():a(t,s),y(t,"change")})),o.addEventListener("click",(function(){t.getAttribute("initialized")?l?Number(t.value)<Number(l)&&t.stepUp():t.stepUp():a(t,s),y(t,"change")})),e}},{key:"getFormInputField",value:function(t){var e=gs(xs(o.prototype),"getFormInputField",this).call(this,t);return"checkbox"!==t&&"radio"!==t&&"file"!==t&&(e.classList.add("form-control"),"small"===this.options.input_size&&e.classList.add("form-control-sm"),"large"===this.options.input_size&&e.classList.add("form-control-lg")),"file"===t&&e.classList.add("form-control-file"),e}},{key:"getFormControl",value:function(t,e,n,r){var i=document.createElement("div");if(i.classList.add("form-group"),!t||"checkbox"!==e.type&&"radio"!==e.type)t&&(i.appendChild(t),r&&i.appendChild(r)),i.appendChild(e);else{var o=document.createElement("div");!1===this.options.custom_forms?(o.classList.add("form-check"),e.classList.add("form-check-input"),t.classList.add("form-check-label")):(o.classList.add("custom-control"),e.classList.add("custom-control-input"),t.classList.add("custom-control-label"),"checkbox"===e.type?o.classList.add("custom-checkbox"):o.classList.add("custom-radio"));var a=(Date.now()*Math.random()).toFixed(0);e.setAttribute("id",a),t.setAttribute("for",a),o.appendChild(e),o.appendChild(t),r&&o.appendChild(r),i.appendChild(o)}return n&&i.appendChild(n),i}},{key:"getInfoButton",value:function(t){var e=document.createElement("button");e.type="button",e.classList.add("ml-3","jsoneditor-twbs4-text-button"),e.setAttribute("data-toggle","tooltip"),e.setAttribute("data-placement","auto"),e.title=t;var n=document.createTextNode("ⓘ");return e.appendChild(n),"bootstrap"===this.options.tooltip?window.jQuery&&window.jQuery().tooltip?window.jQuery(e).tooltip():console.warn("Could not find popper jQuery plugin of Bootstrap."):"css"===this.options.tooltip&&e.classList.add("je-tooltip"),e}},{key:"getCheckbox",value:function(){return this.getFormInputField("checkbox")}},{key:"getMultiCheckboxHolder",value:function(t,e,n,r){var i=document.createElement("div");i.classList.add("form-group"),e&&(i.appendChild(e),r&&e.appendChild(r));var o=document.createElement("div");return Object.values(t).forEach((function(t){var e=t.firstChild;o.appendChild(e)})),i.appendChild(o),n&&i.appendChild(n),i}},{key:"getFormRadio",value:function(t){var e=this.getFormInputField("radio");for(var n in t)e.setAttribute(n,t[n]);return!1===this.options.custom_forms?e.classList.add("form-check-input"):e.classList.add("custom-control-input"),e}},{key:"getFormRadioLabel",value:function(t,e){var n=document.createElement("label");return!1===this.options.custom_forms?n.classList.add("form-check-label"):n.classList.add("custom-control-label"),n.appendChild(document.createTextNode(t)),n}},{key:"getFormRadioControl",value:function(t,e,n){var r=document.createElement("div");return!1===this.options.custom_forms?r.classList.add("form-check"):r.classList.add("custom-control","custom-radio"),r.appendChild(e),r.appendChild(t),n&&(!1===this.options.custom_forms?r.classList.add("form-check-inline"):r.classList.add("custom-control-inline")),r}},{key:"getIndentedPanel",value:function(){var t=document.createElement("div");return t.classList.add("card","card-body","mb-3"),this.options.object_background&&t.classList.add(this.options.object_background),this.options.object_text&&t.classList.add(this.options.object_text),t}},{key:"getFormInputDescription",value:function(t){var e=document.createElement("small");return e.classList.add("form-text"),window.DOMPurify?e.innerHTML=window.DOMPurify.sanitize(t):e.textContent=this.cleanText(t),e}},{key:"getHeader",value:function(t,e){var n=document.createElement("h3");return n.classList.add("card-title"),n.classList.add("level-"+e),"string"==typeof t?n.textContent=t:n.appendChild(t),n.style.display="inline-block",n}},{key:"getHeaderButtonHolder",value:function(){return this.getButtonHolder()}},{key:"getButtonHolder",value:function(){var t=document.createElement("span");return t.classList.add("btn-group"),t}},{key:"getFormButtonHolder",value:function(t){var e=this.getButtonHolder();return e.classList.add("d-block"),"center"===t?e.classList.add("text-center"):"right"===t&&e.classList.add("text-right"),e}},{key:"getButton",value:function(t,e,n){var r=gs(xs(o.prototype),"getButton",this).call(this,t,e,n);return r.classList.add("btn","btn-secondary","btn-sm"),r}},{key:"getTable",value:function(){var t=document.createElement("table");return t.classList.add("table","table-sm"),this.options.table_border&&t.classList.add("table-bordered"),this.options.table_zebrastyle&&t.classList.add("table-striped"),t}},{key:"getErrorMessage",value:function(t){var e=document.createElement("div");return e.classList.add("alert","alert-danger"),e.setAttribute("role","alert"),e.appendChild(document.createTextNode(t)),e}},{key:"addInputError",value:function(t,e){t.controlgroup&&(t.controlgroup.classList.add("is-invalid"),t.errmsg||(t.errmsg=document.createElement("p"),t.errmsg.classList.add("invalid-feedback"),t.controlgroup.appendChild(t.errmsg),t.errmsg.style.display="block"),t.errmsg.style.display="block",t.errmsg.textContent=e)}},{key:"removeInputError",value:function(t){t.errmsg&&(t.errmsg.style.display="none",t.controlgroup.classList.remove("is-invalid"))}},{key:"getTabHolder",value:function(t){var e=document.createElement("div"),n=void 0===t?"":t;return e.innerHTML="<div class='col-md-2' id='".concat(n,"'><ul class='nav flex-column nav-pills'></ul></div><div class='col-md-10'><div class='tab-content' id='").concat(n,"'></div></div>"),e.classList.add("row"),e}},{key:"addTab",value:function(t,e){t.children[0].children[0].appendChild(e)}},{key:"getTabContentHolder",value:function(t){return t.children[1].children[0]}},{key:"getTopTabHolder",value:function(t){var e=void 0===t?"":t,n=document.createElement("div");return n.classList.add("card"),n.innerHTML="<div class='card-header'><ul class='nav nav-tabs card-header-tabs' id='".concat(e,"'></ul></div><div class='card-body'><div class='tab-content' id='").concat(e,"'></div></div>"),n}},{key:"getTab",value:function(t,e){var n=document.createElement("li");n.classList.add("nav-item");var r=document.createElement("a");return r.classList.add("nav-link"),r.setAttribute("href","#".concat(e)),r.setAttribute("data-toggle","tab"),r.appendChild(t),n.appendChild(r),n}},{key:"getTopTab",value:function(t,e){var n=document.createElement("li");n.classList.add("nav-item");var r=document.createElement("a");return r.classList.add("nav-link"),r.setAttribute("href","#".concat(e)),r.setAttribute("data-toggle","tab"),r.appendChild(t),n.appendChild(r),n}},{key:"getTabContent",value:function(){var t=document.createElement("div");return t.classList.add("tab-pane"),t.setAttribute("role","tabpanel"),t}},{key:"getTopTabContent",value:function(){var t=document.createElement("div");return t.classList.add("tab-pane"),t.setAttribute("role","tabpanel"),t}},{key:"markTabActive",value:function(t){t.tab.firstChild.classList.add("active"),void 0!==t.rowPane?t.rowPane.classList.add("active"):t.container.classList.add("active")}},{key:"markTabInactive",value:function(t){t.tab.firstChild.classList.remove("active"),void 0!==t.rowPane?t.rowPane.classList.remove("active"):t.container.classList.remove("active")}},{key:"insertBasicTopTab",value:function(t,e){e.children[0].children[0].insertBefore(t,e.children[0].children[0].firstChild)}},{key:"addTopTab",value:function(t,e){t.children[0].children[0].appendChild(e)}},{key:"getTopTabContentHolder",value:function(t){return t.children[1].children[0]}},{key:"getFirstTab",value:function(t){return t.firstChild.firstChild.firstChild}},{key:"getProgressBar",value:function(){var t=document.createElement("div");t.classList.add("progress");var e=document.createElement("div");return e.classList.add("progress-bar"),e.setAttribute("role","progressbar"),e.setAttribute("aria-valuenow",0),e.setAttribute("aria-valuemin",0),e.setAttribute("aria-valuenax",100),e.innerHTML="".concat(0,"%"),t.appendChild(e),t}},{key:"updateProgressBar",value:function(t,e){if(t){var n=t.firstChild,r="".concat(e,"%");n.setAttribute("aria-valuenow",e),n.style.width=r,n.innerHTML=r}}},{key:"updateProgressBarUnknown",value:function(t){if(t){var e=t.firstChild;t.classList.add("progress","progress-striped","active"),e.removeAttribute("aria-valuenow"),e.style.width="100%",e.innerHTML=""}}},{key:"getBlockLink",value:function(){var t=document.createElement("a");return t.classList.add("mb-3","d-inline-block"),t}},{key:"getLinksHolder",value:function(){return document.createElement("div")}},{key:"getInputGroup",value:function(t,e){if(t){var n=document.createElement("div");n.classList.add("input-group"),n.appendChild(t);var r=document.createElement("div");r.classList.add("input-group-append"),n.appendChild(r);for(var i=0;i<e.length;i++)e[i].classList.remove("mr-2","btn-secondary"),e[i].classList.add("btn-outline-secondary"),r.appendChild(e[i]);return n}}}])&&bs(e.prototype,n),r&&bs(e,r),o}(Qa);function Cs(t){return(Cs="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Es(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Ss(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Ps(t,e,n){return(Ps="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=As(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function Rs(t,e){return(Rs=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Ls(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=As(t);if(e){var i=As(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Ts(this,n)}}function Ts(t,e){return!e||"object"!==Cs(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function As(t){return(As=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}Os.rules={".jsoneditor-twbs4-text-button":"background:none;padding:0;border:0;color:currentColor","td > .form-group":"margin-bottom:0",".json-editor-btn-upload":"margin-top:1rem",".je-noindent .card":"padding:0;border:0",".je-tooltip:hover::before":"display:block;position:absolute;font-size:0.8em;color:%23fff;border-radius:0.2em;content:attr(title);background-color:%23000;margin-top:-2.5em;padding:0.3em",".je-tooltip:hover::after":"display:block;position:absolute;font-size:0.8em;color:%23fff",".select2-container--default .select2-selection--single":"height:calc(1.5em%20%2B%200.75rem%20%2B%202px)",".select2-container--default   .select2-selection--single   .select2-selection__arrow":"height:calc(1.5em%20%2B%200.75rem%20%2B%202px)",".select2-container--default   .select2-selection--single   .select2-selection__rendered":"line-height:calc(1.5em%20%2B%200.75rem%20%2B%202px)",".selectize-control.form-control":"padding:0",".selectize-dropdown.form-control":"padding:0;height:auto",".je-upload-preview img":"float:left;margin:0%200.5rem%200.5rem%200;max-width:100%25;max-height:5rem",".je-dropzone":"position:relative;margin:0.5rem%200;border:2px%20dashed%20black;width:100%25;height:60px;background:teal;transition:all%200.5s",".je-dropzone:before":"position:absolute;content:attr(data-text);color:rgba(0%2C%200%2C%200%2C%200.6);left:50%25;top:50%25;transform:translate(-50%25%2C%20-50%25)",".je-dropzone.valid-dropzone":"background:green",".je-dropzone.invalid-dropzone":"background:red"};var Is=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Rs(t,e)}(o,t);var e,n,r,i=Ls(o);function o(){return Es(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"getTable",value:function(){var t=Ps(As(o.prototype),"getTable",this).call(this);return t.setAttribute("cellpadding",5),t.setAttribute("cellspacing",0),t}},{key:"getTableHeaderCell",value:function(t){var e=Ps(As(o.prototype),"getTableHeaderCell",this).call(this,t);return e.classList.add("ui-state-active"),e.style.fontWeight="bold",e}},{key:"getTableCell",value:function(){var t=Ps(As(o.prototype),"getTableCell",this).call(this);return t.classList.add("ui-widget-content"),t}},{key:"getHeaderButtonHolder",value:function(){var t=this.getButtonHolder();return t.style.marginLeft="10px",t.style.fontSize=".6em",t.style.display="inline-block",t}},{key:"getFormInputDescription",value:function(t){var e=this.getDescription(t);return e.style.marginLeft="10px",e.style.display="inline-block",e}},{key:"getFormControl",value:function(t,e,n,r){var i=Ps(As(o.prototype),"getFormControl",this).call(this,t,e,n,r);return"checkbox"===e.type?(i.style.lineHeight="25px",i.style.padding="3px 0"):i.style.padding="4px 0 8px 0",i}},{key:"getDescription",value:function(t){var e=document.createElement("span");return e.style.fontSize=".8em",e.style.fontStyle="italic",window.DOMPurify?e.innerHTML=window.DOMPurify.sanitize(t):e.textContent=this.cleanText(t),e}},{key:"getButtonHolder",value:function(){var t=document.createElement("div");return t.classList.add("ui-buttonset"),t.style.fontSize=".7em",t}},{key:"getFormInputLabel",value:function(t,e){var n=document.createElement("label");return n.style.fontWeight="bold",n.style.display="block",n.textContent=t,e&&n.classList.add("required"),n}},{key:"getButton",value:function(t,e,n){var r=document.createElement("button");r.classList.add("ui-button","ui-widget","ui-state-default","ui-corner-all"),e&&!t?(r.classList.add("ui-button-icon-only"),e.classList.add("ui-button-icon-primary","ui-icon-primary"),r.appendChild(e)):e?(r.classList.add("ui-button-text-icon-primary"),e.classList.add("ui-button-icon-primary","ui-icon-primary"),r.appendChild(e)):r.classList.add("ui-button-text-only");var i=document.createElement("span");return i.classList.add("ui-button-text"),i.textContent=t||n||".",r.appendChild(i),r.setAttribute("title",n),r}},{key:"setButtonText",value:function(t,e,n,r){t.innerHTML="",t.classList.add("ui-button","ui-widget","ui-state-default","ui-corner-all"),n&&!e?(t.classList.add("ui-button-icon-only"),n.classList.add("ui-button-icon-primary","ui-icon-primary"),t.appendChild(n)):n?(t.classList.add("ui-button-text-icon-primary"),n.classList.add("ui-button-icon-primary","ui-icon-primary"),t.appendChild(n)):t.classList.add("ui-button-text-only");var i=document.createElement("span");i.classList.add("ui-button-text"),i.textContent=e||r||".",t.appendChild(i),t.setAttribute("title",r)}},{key:"getIndentedPanel",value:function(){var t=document.createElement("div");return t.classList.add("ui-widget-content","ui-corner-all"),t.style.padding="1em 1.4em",t.style.marginBottom="20px",t}},{key:"afterInputReady",value:function(t){if(!t.controls&&(t.controls=this.closest(t,".form-control"),this.queuedInputErrorText)){var e=this.queuedInputErrorText;delete this.queuedInputErrorText,this.addInputError(t,e)}}},{key:"addInputError",value:function(t,e){t.controls?(t.errmsg?t.errmsg.style.display="":(t.errmsg=document.createElement("div"),t.errmsg.classList.add("ui-state-error"),t.controls.appendChild(t.errmsg)),t.errmsg.textContent=e):this.queuedInputErrorText=e}},{key:"removeInputError",value:function(t){t.controls||delete this.queuedInputErrorText,t.errmsg&&(t.errmsg.style.display="none")}},{key:"markTabActive",value:function(t){t.tab.classList.remove("ui-widget-header"),t.tab.classList.add("ui-state-active"),void 0!==t.rowPane?t.rowPane.style.display="":t.container.style.display=""}},{key:"markTabInactive",value:function(t){t.tab.classList.add("ui-widget-header"),t.tab.classList.remove("ui-state-active"),void 0!==t.rowPane?t.rowPane.style.display="none":t.container.style.display="none"}}])&&Ss(e.prototype,n),r&&Ss(e,r),o}(Qa);Is.rules={'div[data-schemaid="root"]:after':'position:relative;color:red;margin:10px 0;font-weight:600;display:block;width:100%;text-align:center;content:"This is an old JSON-Editor 1.x Theme and might not display elements correctly when used with the 2.x version"'};function Bs(t){return(Bs="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Ns(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Fs(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Vs(t,e){return(Vs=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Ds(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=zs(t);if(e){var i=zs(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Hs(this,n)}}function Hs(t,e){return!e||"object"!==Bs(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function zs(t){return(zs=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Ms=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Vs(t,e)}(o,t);var e,n,r,i=Ds(o);function o(){return Ns(this,o),i.apply(this,arguments)}return e=o,(n=[{key:"addInputError",value:function(t,e){if(t.errmsg)t.errmsg.style.display="block";else{var n=this.closest(t,".form-control");t.errmsg=document.createElement("div"),t.errmsg.setAttribute("class","errmsg"),n.appendChild(t.errmsg)}t.errmsg.innerHTML="",t.errmsg.appendChild(document.createTextNode(e))}},{key:"removeInputError",value:function(t){t.style&&(t.style.borderColor=""),t.errmsg&&(t.errmsg.style.display="none")}}])&&Fs(e.prototype,n),r&&Fs(e,r),o}(Qa);Ms.rules={".je-upload-preview img":"float:left;margin:0%200.5rem%200.5rem%200;max-width:100%25;max-height:5rem",".je-dropzone":"position:relative;margin:0.5rem%200;border:2px%20dashed%20black;width:100%25;height:60px;background:teal;transition:all%200.5s",".je-dropzone:before":"position:absolute;content:attr(data-text);color:rgba(0%2C%200%2C%200%2C%200.6);left:50%25;top:50%25;transform:translate(-50%25%2C%20-50%25)",".je-dropzone.valid-dropzone":"background:green",".je-dropzone.invalid-dropzone":"background:red"};function qs(t){return(qs="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Us(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Gs(t,e,n){return(Gs="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Zs(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function $s(t,e){return($s=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Js(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=Zs(t);if(e){var i=Zs(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return Ws(this,n)}}function Ws(t,e){return!e||"object"!==qs(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Zs(t){return(Zs=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var Qs={disable_theme_rules:!1,label_bold:!0,align_bottom:!1,object_indent:!1,object_border:!1,table_border:!1,table_zebrastyle:!1,input_size:"normal"},Ys=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&$s(t,e)}(o,t);var e,n,r,i=Js(o);function o(t){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,o),i.call(this,t,Qs)}return e=o,(n=[{key:"setGridColumnSize",value:function(t,e,n){t.classList.add("col-".concat(e)),n&&t.classList.add("col-mx-auto")}},{key:"getGridContainer",value:function(){var t=document.createElement("div");return t.classList.add("container"),this.options.object_indent||t.classList.add("je-noindent"),t}},{key:"getGridRow",value:function(){var t=document.createElement("div");return t.classList.add("columns"),t}},{key:"getGridColumn",value:function(){var t=document.createElement("div");return t.classList.add("column"),this.options.align_bottom&&t.classList.add("je-align-bottom"),t}},{key:"getIndentedPanel",value:function(){var t=document.createElement("div");return t.classList.add("je-panel"),this.options.object_border&&t.classList.add("je-border"),t}},{key:"getTopIndentedPanel",value:function(){var t=document.createElement("div");return t.classList.add("je-panel-top"),this.options.object_border&&t.classList.add("je-border"),t}},{key:"getHeaderButtonHolder",value:function(){return this.getButtonHolder()}},{key:"getButtonHolder",value:function(){var t=Gs(Zs(o.prototype),"getButtonHolder",this).call(this);return t.classList.add("btn-group"),t}},{key:"getFormButtonHolder",value:function(t){var e=Gs(Zs(o.prototype),"getFormButtonHolder",this).call(this);return e.classList.remove("btn-group"),e.classList.add("d-block"),"center"===t?e.classList.add("text-center"):"right"===t?e.classList.add("text-right"):e.classList.add("text-left"),e}},{key:"getFormButton",value:function(t,e,n){var r=Gs(Zs(o.prototype),"getFormButton",this).call(this,t,e,n);return r.classList.add("btn","btn-primary","mx-2","my-1"),"small"!==this.options.input_size&&r.classList.remove("btn-sm"),"large"===this.options.input_size&&r.classList.add("btn-lg"),r}},{key:"getButton",value:function(t,e,n){var r=Gs(Zs(o.prototype),"getButton",this).call(this,t,e,n);return r.classList.add("btn","btn-sm","btn-primary","mr-2","my-1"),r}},{key:"getHeader",value:function(t,e){var n=document.createElement("h4");return"string"==typeof t?n.textContent=t:n.appendChild(t),n.style.display="inline-block",n}},{key:"getFormInputDescription",value:function(t){var e=Gs(Zs(o.prototype),"getFormInputDescription",this).call(this,t);return e.classList.add("je-desc","hide-sm"),e}},{key:"getFormInputLabel",value:function(t,e){var n=Gs(Zs(o.prototype),"getFormInputLabel",this).call(this,t,e);return this.options.label_bold&&n.classList.add("je-label"),n}},{key:"getCheckbox",value:function(){return this.getFormInputField("checkbox")}},{key:"getCheckboxLabel",value:function(t,e){var n=Gs(Zs(o.prototype),"getCheckboxLabel",this).call(this,t,e),r=document.createElement("i");return r.classList.add("form-icon"),n.classList.add("form-checkbox","mr-5"),n.insertBefore(r,n.firstChild),n}},{key:"getFormCheckboxControl",value:function(t,e,n){return t.insertBefore(e,t.firstChild),n&&t.classList.add("form-inline"),t}},{key:"getMultiCheckboxHolder",value:function(t,e,n,r){return Gs(Zs(o.prototype),"getMultiCheckboxHolder",this).call(this,t,e,n,r)}},{key:"getFormRadio",value:function(t){var e=this.getFormInputField("radio");for(var n in t)e.setAttribute(n,t[n]);return e}},{key:"getFormRadioLabel",value:function(t,e){var n=Gs(Zs(o.prototype),"getFormRadioLabel",this).call(this,t,e),r=document.createElement("i");return r.classList.add("form-icon"),n.classList.add("form-radio"),n.insertBefore(r,n.firstChild),n}},{key:"getFormRadioControl",value:function(t,e,n){return t.insertBefore(e,t.firstChild),n&&t.classList.add("form-inline"),t}},{key:"getFormInputField",value:function(t){var e=Gs(Zs(o.prototype),"getFormInputField",this).call(this,t);return["checkbox","radio"].includes(t)||e.classList.add("form-input"),e}},{key:"getRangeInput",value:function(t,e,n){var r=this.getFormInputField("range");return r.classList.add("slider"),r.classList.remove("form-input"),r.setAttribute("oninput",'this.setAttribute("value", this.value)'),r.setAttribute("min",t),r.setAttribute("max",e),r.setAttribute("step",n),r}},{key:"getRangeControl",value:function(t,e){var n=Gs(Zs(o.prototype),"getRangeControl",this).call(this,t,e);return n.classList.add("text-center"),n}},{key:"getSelectInput",value:function(t,e){var n=Gs(Zs(o.prototype),"getSelectInput",this).call(this,t);return n.classList.add("form-select"),n}},{key:"getTextareaInput",value:function(){var t=document.createElement("textarea");return t.classList.add("form-input"),t}},{key:"getFormControl",value:function(t,e,n,r){var i=document.createElement("div");return i.classList.add("form-group"),!t||"checkbox"!==e.type&&"radio"!==e.type?(t&&(t.classList.add("form-label"),i.appendChild(t),r&&t.appendChild(r)),i.appendChild(e)):(i.classList.add(e.type),t.insertBefore(e,t.firstChild),i.appendChild(t)),"small"===this.options.input_size?e.classList.add("input-sm","select-sm"):"large"===this.options.input_size&&e.classList.add("input-lg","select-lg"),"checkbox"!==e.type&&i.appendChild(e),n&&i.appendChild(n),i}},{key:"getInputGroup",value:function(t,e){if(t){var n=document.createElement("div");n.classList.add("input-group"),n.appendChild(t);for(var r=0;r<e.length;r++)e[r].classList.add("input-group-btn"),e[r].classList.remove("btn-sm","mr-2","my-1"),n.appendChild(e[r]);return n}}},{key:"getInfoButton",value:function(t){var e=document.createElement("div");e.classList.add("popover","popover-left","float-right");var n=document.createElement("button");n.classList.add("btn","btn-secondary","btn-info","btn-action","s-circle"),n.setAttribute("tabindex","-1"),e.appendChild(n);var r=document.createTextNode("I");n.appendChild(r);var i=document.createElement("div");i.classList.add("popover-container"),e.appendChild(i);var o=document.createElement("div");o.classList.add("card"),i.appendChild(o);var a=document.createElement("div");return a.classList.add("card-body"),a.innerHTML=t,o.appendChild(a),e}},{key:"getTable",value:function(){var t=Gs(Zs(o.prototype),"getTable",this).call(this);return t.classList.add("table","table-scroll"),this.options.table_border&&t.classList.add("je-table-border"),this.options.table_zebrastyle&&t.classList.add("table-striped"),t}},{key:"getProgressBar",value:function(){var t=Gs(Zs(o.prototype),"getProgressBar",this).call(this);return t.classList.add("progress"),t}},{key:"getTabHolder",value:function(t){var e=void 0===t?"":t,n=document.createElement("div");return n.classList.add("columns"),n.innerHTML='<div class="column col-2"></div><div class="column col-10 content" id="'.concat(e,'"></div>'),n}},{key:"getTopTabHolder",value:function(t){var e=void 0===t?"":t,n=document.createElement("div");return n.innerHTML='<ul class="tab"></ul><div class="content" id="'.concat(e,'"></div>'),n}},{key:"getTab",value:function(t,e){var n=document.createElement("a");return n.classList.add("btn","btn-secondary","btn-block"),n.setAttribute("href","#".concat(e)),n.appendChild(t),n}},{key:"getTopTab",value:function(t,e){var n=document.createElement("li");n.id=e,n.classList.add("tab-item");var r=document.createElement("a");return r.setAttribute("href","#".concat(e)),r.appendChild(t),n.appendChild(r),n}},{key:"markTabActive",value:function(t){t.tab.classList.add("active"),void 0!==t.rowPane?t.rowPane.style.display="":t.container.style.display=""}},{key:"markTabInactive",value:function(t){t.tab.classList.remove("active"),void 0!==t.rowPane?t.rowPane.style.display="none":t.container.style.display="none"}},{key:"afterInputReady",value:function(t){if("select"===t.localName)if(t.classList.contains("selectized")){var e=t.nextSibling;e&&(e.classList.remove("form-select"),Array.from(e.querySelectorAll(".form-select")).forEach((function(t){t.classList.remove("form-select")})))}else if(t.classList.contains("select2-hidden-accessible")){var n=t.nextSibling;n&&n.querySelector(".select2-selection--single")&&n.classList.add("form-select")}t.controlgroup||(t.controlgroup=this.closest(t,".form-group"),this.closest(t,".compact")&&(t.controlgroup.style.marginBottom=0))}},{key:"addInputError",value:function(t,e){t.controlgroup&&(t.controlgroup.classList.add("has-error"),t.errmsg||(t.errmsg=document.createElement("p"),t.errmsg.classList.add("form-input-hint"),t.controlgroup.appendChild(t.errmsg)),t.errmsg.classList.remove("d-hide"),t.errmsg.textContent=e)}},{key:"removeInputError",value:function(t){t.errmsg&&(t.errmsg.classList.add("d-hide"),t.controlgroup.classList.remove("has-error"))}}])&&Us(e.prototype,n),r&&Us(e,r),o}(Qa);Ys.rules={"*":"--primary-color:%235755d9;--gray-color:%23bcc3ce;--light-color:%23fff",".slider:focus":"box-shadow:none","h4 > label + .btn-group":"margin-left:1rem",".text-right > button":"margin-right:0%20!important",".text-left > button":"margin-left:0%20!important",".property-selector":"font-size:0.7rem;font-weight:normal;max-height:260px%20!important;width:395px%20!important",".property-selector .form-checkbox":"margin:0",textarea:"width:100%25;min-height:2rem;resize:vertical",table:"border-collapse:collapse",".table td":"padding:0.4rem%200.4rem",".mr-5":"margin-right:1rem%20!important","div[data-schematype]:not([data-schematype='object'])":"transition:0.5s","div[data-schematype]:not([data-schematype='object']):hover":"background-color:%23eee",".je-table-border td":"border:0.05rem%20solid%20%23dadee4%20!important",".btn-info":"font-size:0.5rem;font-weight:bold;height:0.8rem;padding:0.15rem%200;line-height:0.8;margin:0.3rem%200%200.3rem%200.1rem",".je-label + select":"min-width:5rem",".je-label":"font-weight:600",".btn-action.btn-info":"width:0.8rem",".je-border":"border:0.05rem%20solid%20%23dadee4",".je-panel":"padding:0.2rem;margin:0.2rem;background-color:rgba(218%2C%20222%2C%20228%2C%200.1)",".je-panel-top":"padding:0.2rem;margin:0.2rem;background-color:rgba(218%2C%20222%2C%20228%2C%200.1)",".required:after":"content:%22%20*%22;color:red;font:inherit",".je-align-bottom":"margin-top:auto",".je-desc":"font-size:smaller;margin:0.2rem%200",".je-upload-preview img":"float:left;margin:0%200.5rem%200.5rem%200;max-width:100%25;max-height:5rem;border:3px%20solid%20white;box-shadow:0px%200px%208px%20rgba(0%2C%200%2C%200%2C%200.3);box-sizing:border-box",".je-dropzone":"position:relative;margin:0.5rem%200;border:2px%20dashed%20black;width:100%25;height:60px;background:teal;transition:all%200.5s",".je-dropzone:before":"position:absolute;content:attr(data-text);color:rgba(0%2C%200%2C%200%2C%200.6);left:50%25;top:50%25;transform:translate(-50%25%2C%20-50%25)",".je-dropzone.valid-dropzone":"background:green",".je-dropzone.invalid-dropzone":"background:red",".columns .container.je-noindent":"padding-left:0;padding-right:0",".selectize-control.multi .item":"background:var(--primary-color)%20!important",".select2-container--default   .select2-selection--single   .select2-selection__arrow":"display:none",".select2-container--default .select2-selection--single":"border:none",".select2-container .select2-selection--single .select2-selection__rendered":"padding:0",".select2-container .select2-search--inline .select2-search__field":"margin-top:0",".select2-container--default.select2-container--focus   .select2-selection--multiple":"border:0.05rem%20solid%20var(--gray-color)",".select2-container--default   .select2-selection--multiple   .select2-selection__choice":"margin:0.4rem%200.2rem%200.2rem%200;padding:2px%205px;background-color:var(--primary-color);color:var(--light-color)",".select2-container--default .select2-search--inline .select2-search__field":"line-height:normal",".choices":"margin-bottom:auto",".choices__list--multiple .choices__item":"border:none;background-color:var(--primary-color);color:var(--light-color)",".choices[data-type*='select-multiple'] .choices__button":"border-left:0.05rem%20solid%20%232826a6",".choices__inner":"font-size:inherit;min-height:20px;padding:4px%207.5px%204px%203.75px",".choices[data-type*='select-one'] .choices__inner":"padding-bottom:4px",".choices__list--dropdown .choices__item":"font-size:inherit"};function Xs(t){return(Xs="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Ks(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function tl(t,e,n){return(tl="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=il(t)););return t}(t,e);if(r){var i=Object.getOwnPropertyDescriptor(r,e);return i.get?i.get.call(n):i.value}})(t,e,n||t)}function el(t,e){return(el=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function nl(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=il(t);if(e){var i=il(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return rl(this,n)}}function rl(t,e){return!e||"object"!==Xs(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function il(t){return(il=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}var ol={disable_theme_rules:!1,label_bold:!1,object_panel_default:!0,object_indent:!0,object_border:!1,table_border:!1,table_hdiv:!1,table_zebrastyle:!1,input_size:"small",enable_compact:!1},al=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&el(t,e)}(o,t);var e,n,r,i=nl(o);function o(t){return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,o),i.call(this,t,ol)}return e=o,(n=[{key:"getGridContainer",value:function(){var t=document.createElement("div");return t.classList.add("flex","flex-col","w-full"),this.options.object_indent||t.classList.add("je-noindent"),t}},{key:"getGridRow",value:function(){var t=document.createElement("div");return t.classList.add("flex","flex-wrap","w-full"),t}},{key:"getGridColumn",value:function(){var t=document.createElement("div");return t.classList.add("flex","flex-col"),t}},{key:"setGridColumnSize",value:function(t,e,n){e>0&&e<12?t.classList.add("w-".concat(e,"/12"),"px-1"):t.classList.add("w-full","px-1"),n&&(t.style.marginLeft="".concat(100/12*n,"%"))}},{key:"getIndentedPanel",value:function(){var t=document.createElement("div");return this.options.object_panel_default?t.classList.add("w-full","p-1"):t.classList.add("relative","flex","flex-col","rounded","break-words","border","bg-white","border-0","border-blue-400","p-1","shadow-md"),this.options.object_border&&t.classList.add("je-border"),t}},{key:"getTopIndentedPanel",value:function(){var t=document.createElement("div");return this.options.object_panel_default?t.classList.add("w-full","m-2"):t.classList.add("relative","flex","flex-col","rounded","break-words","border","bg-white","border-0","border-blue-400","p-1","shadow-md"),this.options.object_border&&t.classList.add("je-border"),t}},{key:"getTitle",value:function(){return this.translateProperty(this.schema.title)}},{key:"getSelectInput",value:function(t,e){var n=tl(il(o.prototype),"getSelectInput",this).call(this,t);return e?n.classList.add("form-multiselect","block","py-0","h-auto","w-full","px-1","text-sm","text-black","leading-normal","bg-white","border","border-grey","rounded"):n.classList.add("form-select","block","py-0","h-6","w-full","px-1","text-sm","text-black","leading-normal","bg-white","border","border-grey","rounded"),this.options.enable_compact&&n.classList.add("compact"),n}},{key:"afterInputReady",value:function(t){t.controlgroup||(t.controlgroup=this.closest(t,".form-group"),this.closest(t,".compact")&&(t.controlgroup.style.marginBottom=0))}},{key:"getTextareaInput",value:function(){var t=tl(il(o.prototype),"getTextareaInput",this).call(this);return t.classList.add("block","w-full","px-1","text-sm","leading-normal","bg-white","text-black","border","border-grey","rounded"),this.options.enable_compact&&t.classList.add("compact"),t.style.height=0,t}},{key:"getRangeInput",value:function(t,e,n){var r=this.getFormInputField("range");return r.classList.add("slider"),this.options.enable_compact&&r.classList.add("compact"),r.setAttribute("oninput",'this.setAttribute("value", this.value)'),r.setAttribute("min",t),r.setAttribute("max",e),r.setAttribute("step",n),r}},{key:"getRangeControl",value:function(t,e){var n=tl(il(o.prototype),"getRangeControl",this).call(this,t,e);return n.classList.add("text-center","text-black"),n}},{key:"getCheckbox",value:function(){var t=this.getFormInputField("checkbox");return t.classList.add("form-checkbox","text-red-600"),t}},{key:"getCheckboxLabel",value:function(t,e){var n=tl(il(o.prototype),"getCheckboxLabel",this).call(this,t,e);return n.classList.add("inline-flex","items-center"),n}},{key:"getFormCheckboxControl",value:function(t,e,n){return t.insertBefore(e,t.firstChild),n&&t.classList.add("inline-flex flex-row"),t}},{key:"getMultiCheckboxHolder",value:function(t,e,n,r){var i=tl(il(o.prototype),"getMultiCheckboxHolder",this).call(this,t,e,n,r);return i.classList.add("inline-flex","flex-col"),i}},{key:"getFormRadio",value:function(t){var e=this.getFormInputField("radio");for(var n in e.classList.add("form-radio","text-red-600"),t)e.setAttribute(n,t[n]);return e}},{key:"getFormRadioLabel",value:function(t,e){var n=tl(il(o.prototype),"getFormRadioLabel",this).call(this,t,e);return n.classList.add("inline-flex","items-center","mr-2"),n}},{key:"getFormRadioControl",value:function(t,e,n){return t.insertBefore(e,t.firstChild),n&&t.classList.add("form-radio"),t}},{key:"getRadioHolder",value:function(t,e,n,r,i){var a=tl(il(o.prototype),"getRadioHolder",this).call(this,e,n,r,i);return"h"===t.options.layout?a.classList.add("inline-flex","flex-row"):a.classList.add("inline-flex","flex-col"),a}},{key:"getFormInputLabel",value:function(t,e){var n=tl(il(o.prototype),"getFormInputLabel",this).call(this,t,e);return this.options.label_bold?n.classList.add("font-bold"):n.classList.add("required"),n}},{key:"getFormInputField",value:function(t){var e=tl(il(o.prototype),"getFormInputField",this).call(this,t);return["checkbox","radio"].includes(t)||e.classList.add("block","w-full","px-1","text-black","text-sm","leading-normal","bg-white","border","border-grey","rounded"),this.options.enable_compact&&e.classList.add("compact"),e}},{key:"getFormInputDescription",value:function(t){var e=document.createElement("p");return e.classList.add("block","mt-1","text-xs"),window.DOMPurify?e.innerHTML=window.DOMPurify.sanitize(t):e.textContent=this.cleanText(t),e}},{key:"getFormControl",value:function(t,e,n,r){var i=document.createElement("div");return i.classList.add("form-group","mb-1","w-full"),t&&(t.classList.add("text-xs"),"checkbox"===e.type&&(e.classList.add("form-checkbox","text-xs","text-red-600","mr-1"),t.classList.add("items-center","flex"),t=this.getFormCheckboxControl(t,e,!1,r)),"radio"===e.type&&(e.classList.add("form-radio","text-red-600","mr-1"),t.classList.add("items-center","flex"),t=this.getFormRadioControl(t,e,!1,r)),i.appendChild(t),!["checkbox","radio"].includes(e.type)&&r&&i.appendChild(r)),["checkbox","radio"].includes(e.type)||("small"===this.options.input_size?e.classList.add("text-xs"):"normal"===this.options.input_size?e.classList.add("text-base"):"large"===this.options.input_size&&e.classList.add("text-xl"),i.appendChild(e)),n&&i.appendChild(n),i}},{key:"getHeaderButtonHolder",value:function(){var t=this.getButtonHolder();return t.classList.add("text-sm"),t}},{key:"getButtonHolder",value:function(){var t=document.createElement("div");return t.classList.add("flex","relative","inline-flex","align-middle"),t}},{key:"getButton",value:function(t,e,n){var r=tl(il(o.prototype),"getButton",this).call(this,t,e,n);return r.classList.add("inline-block","align-middle","text-center","text-sm","bg-blue-700","text-white","py-1","pr-1","m-2","shadow","select-none","whitespace-no-wrap","rounded"),r}},{key:"getInfoButton",value:function(t){var e=document.createElement("a");e.classList.add("tooltips","float-right"),e.innerHTML="ⓘ";var n=document.createElement("span");return n.innerHTML=t,e.appendChild(n),e}},{key:"getTable",value:function(){var t=tl(il(o.prototype),"getTable",this).call(this);return this.options.table_border?t.classList.add("je-table-border"):t.classList.add("table","border","p-0"),t}},{key:"getTableRow",value:function(){var t=tl(il(o.prototype),"getTableRow",this).call(this);return this.options.table_border&&t.classList.add("je-table-border"),this.options.table_zebrastyle&&t.classList.add("je-table-zebra"),t}},{key:"getTableHeaderCell",value:function(t){var e=tl(il(o.prototype),"getTableHeaderCell",this).call(this,t);return this.options.table_border?e.classList.add("je-table-border"):this.options.table_hdiv?e.classList.add("je-table-hdiv"):e.classList.add("text-xs","border","p-0","m-0"),e}},{key:"getTableCell",value:function(){var t=tl(il(o.prototype),"getTableCell",this).call(this);return this.options.table_border?t.classList.add("je-table-border"):this.options.table_hdiv?t.classList.add("je-table-hdiv"):t.classList.add("border-0","p-0","m-0"),t}},{key:"addInputError",value:function(t,e){t.controlgroup&&(t.controlgroup.classList.add("has-error"),t.classList.add("bg-red-600"),t.errmsg?t.errmsg.style.display="":(t.errmsg=document.createElement("p"),t.errmsg.classList.add("block","mt-1","text-xs","text-red"),t.controlgroup.appendChild(t.errmsg)),t.errmsg.textContent=e)}},{key:"removeInputError",value:function(t){t.errmsg&&(t.errmsg.style.display="none",t.classList.remove("bg-red-600"),t.controlgroup.classList.remove("has-error"))}},{key:"getTabHolder",value:function(t){var e=document.createElement("div"),n=void 0===t?"":t;return e.innerHTML="<div class='w-2/12' id='".concat(n,"'><ul class='list-reset pl-0 mb-0'></ul></div><div class='w-10/12' id='").concat(n,"'></div>"),e.classList.add("flex"),e}},{key:"addTab",value:function(t,e){t.children[0].children[0].appendChild(e)}},{key:"getTopTabHolder",value:function(t){var e=void 0===t?"":t,n=document.createElement("div");return n.innerHTML="<ul class='nav-tabs flex list-reset pl-0 mb-0 border-b border-grey-light' id='".concat(e,"'></ul><div class='p-6 block' id='").concat(e,"'></div>"),n}},{key:"getTab",value:function(t,e){var n=document.createElement("li");n.classList.add("nav-item","flex-col","text-center","text-white","bg-blue-500","shadow-md","border","p-2","mb-2","mr-2","hover:bg-blue-400","rounded");var r=document.createElement("a");return r.classList.add("nav-link","text-center"),r.setAttribute("href","#".concat(e)),r.setAttribute("data-toggle","tab"),r.appendChild(t),n.appendChild(r),n}},{key:"getTopTab",value:function(t,e){var n=document.createElement("li");n.classList.add("nav-item","flex","border-l","border-t","border-r");var r=document.createElement("a");return r.classList.add("nav-link","-mb-px","flex-row","text-center","bg-white","p-2","hover:bg-blue-400","rounded-t"),r.setAttribute("href","#".concat(e)),r.setAttribute("data-toggle","tab"),r.appendChild(t),n.appendChild(r),n}},{key:"getTabContent",value:function(){var t=document.createElement("div");return t.setAttribute("role","tabpanel"),t}},{key:"getTopTabContent",value:function(){var t=document.createElement("div");return t.setAttribute("role","tabpanel"),t}},{key:"markTabActive",value:function(t){t.tab.firstChild.classList.add("block"),!0===t.tab.firstChild.classList.contains("border-b")?(t.tab.firstChild.classList.add("border-b-0"),t.tab.firstChild.classList.remove("border-b")):t.tab.firstChild.classList.add("border-b-0"),!0===t.container.classList.contains("hidden")?(t.container.classList.remove("hidden"),t.container.classList.add("block")):t.container.classList.add("block")}},{key:"markTabInactive",value:function(t){!0===t.tab.firstChild.classList.contains("border-b-0")?(t.tab.firstChild.classList.add("border-b"),t.tab.firstChild.classList.remove("border-b-0")):t.tab.firstChild.classList.add("border-b"),!0===t.container.classList.contains("block")&&(t.container.classList.remove("block"),t.container.classList.add("hidden"))}},{key:"getProgressBar",value:function(){var t=document.createElement("div");t.classList.add("progress");var e=document.createElement("div");return e.classList.add("bg-blue","leading-none","py-1","text-xs","text-center","text-white"),e.setAttribute("role","progressbar"),e.setAttribute("aria-valuenow",0),e.setAttribute("aria-valuemin",0),e.setAttribute("aria-valuenax",100),e.innerHTML="".concat(0,"%"),t.appendChild(e),t}},{key:"updateProgressBar",value:function(t,e){if(t){var n=t.firstChild,r="".concat(e,"%");n.setAttribute("aria-valuenow",e),n.style.width=r,n.innerHTML=r}}},{key:"updateProgressBarUnknown",value:function(t){if(t){var e=t.firstChild;t.classList.add("progress","bg-blue","leading-none","py-1","text-xs","text-center","text-white","block"),e.removeAttribute("aria-valuenow"),e.classList.add("w-full"),e.innerHTML=""}}},{key:"getInputGroup",value:function(t,e){if(t){var n=document.createElement("div");n.classList.add("relative","items-stretch","w-full"),n.appendChild(t);var r=document.createElement("div");r.classList.add("-mr-1"),n.appendChild(r);for(var i=0;i<e.length;i++)r.appendChild(e[i]);return n}}}])&&Ks(e.prototype,n),r&&Ks(e,r),o}(Qa);al.rules={".slider":"-webkit-appearance:none;-moz-appearance:none;appearance:none;background:transparent;display:block;border:none;height:1.2rem;width:100%25",".slider:focus":"box-shadow:0%200%200%200%20rgba(87%2C%2085%2C%20217%2C%200.2);outline:none",".slider.tooltip:not([data-tooltip])::after":"content:attr(value)",".slider::-webkit-slider-thumb":"-webkit-appearance:none;background:%23f17405;border-radius:100%25;height:0.6rem;margin-top:-0.25rem;transition:transform%200.2s;width:0.6rem",".slider:active::-webkit-slider-thumb":"transform:scale(1.25);outline:none",".slider::-webkit-slider-runnable-track":"background:%23b2b4b6;border-radius:0.1rem;height:0.1rem;width:100%25","a.tooltips":"position:relative;display:inline","a.tooltips span":"position:absolute;white-space:nowrap;width:auto;padding-left:1rem;padding-right:1rem;color:%23ffffff;background:rgba(56%2C%2056%2C%2056%2C%200.85);height:1.5rem;line-height:1.5rem;text-align:center;visibility:hidden;border-radius:3px","a.tooltips span:after":"content:%22%22;position:absolute;top:50%25;left:100%25;margin-top:-5px;width:0;height:0;border-left:5px%20solid%20rgba(56%2C%2056%2C%2056%2C%200.85);border-top:5px%20solid%20transparent;border-bottom:5px%20solid%20transparent","a:hover.tooltips span":"visibility:visible;opacity:0.9;font-size:0.8rem;right:100%25;top:50%25;margin-top:-12px;margin-right:10px;z-index:999",".json-editor-btntype-properties + div":"font-size:0.8rem;font-weight:normal",textarea:"width:100%25;min-height:2rem;resize:vertical",table:"width:100%25;border-collapse:collapse",".table td":"padding:0rem%200rem","div[data-schematype]:not([data-schematype='object'])":"transition:0.5s","div[data-schematype]:not([data-schematype='object']):hover":"background-color:%23e6f4fe","div[data-schemaid='root']":"position:relative;width:inherit;display:inherit;overflow-x:hidden;z-index:10","select[multiple]":"height:auto","select[multiple].from-select":"height:auto",".je-table-zebra:nth-child(even)":"background-color:%23f2f2f2",".je-table-border":"border:0.5px%20solid%20black",".je-table-hdiv":"border-bottom:1px%20solid%20black",".je-border":"border:0.05rem%20solid%20%233182ce",".je-panel":"width:inherit;padding:0.2rem;margin:0.2rem;background-color:rgba(218%2C%20222%2C%20228%2C%200.1)",".je-panel-top":"width:100%25;padding:0.2rem;margin:0.2rem;background-color:rgba(218%2C%20222%2C%20228%2C%200.1)",".required:after":"content:%22%20*%22;color:red;font:inherit;font-weight:bold",".je-desc":"font-size:smaller;margin:0.2rem%200",".container-xl.je-noindent":"padding-left:0;padding-right:0",".json-editor-btntype-add":"color:white;margin:0.3rem;padding:0.3rem%200.8rem;background-color:%234299e1;box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2);-webkit-box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2);-moz-box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2)",".json-editor-btntype-deletelast":"color:white;margin:0.3rem;padding:0.3rem%200.8rem;background-color:%23e53e3e;box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2);-webkit-box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2);-moz-box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2)",".json-editor-btntype-deleteall":"color:white;margin:0.3rem;padding:0.3rem%200.8rem;background-color:%23000000;box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2);-webkit-box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2);-moz-box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2)",".json-editor-btn-save":"float:right;color:white;margin:0.3rem;padding:0.3rem%200.8rem;background-color:%232b6cb0;box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2);-webkit-box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2);-moz-box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2)",".json-editor-btn-back":"color:white;margin:0.3rem;padding:0.3rem%200.8rem;background-color:%232b6cb0;box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2);-webkit-box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2);-moz-box-shadow:3px%203px%205px%201px%20rgba(4%2C%204%2C%204%2C%200.2)",".json-editor-btntype-delete":"color:%23e53e3e;background-color:rgba(218%2C%20222%2C%20228%2C%200.1);margin:0.03rem;padding:0.1rem",".json-editor-btntype-move":"color:%23000000;background-color:rgba(218%2C%20222%2C%20228%2C%200.1);margin:0.03rem;padding:0.1rem",".json-editor-btn-collapse":"padding:0em%200.8rem;font-size:1.3rem;color:%23e53e3e;background-color:rgba(218%2C%20222%2C%20228%2C%200.1)",".je-upload-preview img":"float:left;margin:0%200.5rem%200.5rem%200;max-width:100%25;max-height:5rem",".je-dropzone":"position:relative;margin:0.5rem%200;border:2px%20dashed%20black;width:100%25;height:60px;background:teal;transition:all%200.5s",".je-dropzone:before":"position:absolute;content:attr(data-text);color:rgba(0%2C%200%2C%200%2C%200.6);left:50%25;top:50%25;transform:translate(-50%25%2C%20-50%25)",".je-dropzone.valid-dropzone":"background:green",".je-dropzone.invalid-dropzone":"background:red"};var sl={html:os,bootstrap3:ms,bootstrap4:Os,jqueryui:Is,barebones:Ms,spectre:Ys,tailwind:al},ll={".je-float-right-linkholder":"float:right;margin-left:10px",".je-modal":"background-color:white;border:1px%20solid%20black;box-shadow:3px%203px%20black;position:absolute;z-index:10",".je-infobutton-icon":"font-size:16px;font-weight:bold;padding:0.25rem;position:relative;display:inline-block",".je-infobutton-tooltip":"font-size:12px;font-weight:normal;font-family:sans-serif;visibility:hidden;background-color:rgba(50%2C%2050%2C%2050%2C%200.75);margin:0%200.25rem;color:%23fafafa;padding:0.5rem%201rem;border-radius:0.25rem;width:20rem;position:absolute",".je-header":"display:inline-block",".je-upload-preview img":"float:left;margin:0%200.5rem%200.5rem%200;max-width:100%25;max-height:5rem",".je-checkbox":"display:inline-block;width:auto",".je-checkbox-control--compact":"display:inline-block;margin-right:1rem",".je-radio":"display:inline-block;width:auto",".je-radio-control--compact":"display:inline-block;margin-right:1rem",".je-switcher":"background-color:transparent;display:inline-block;font-style:italic;font-weight:normal;height:auto;width:auto;margin-bottom:0;margin-left:5px;padding:0%200%200%203px",".je-textarea":"width:100%25;height:300px;box-sizing:border-box",".je-range-control":"text-align:center",".je-indented-panel":"padding-left:10px;margin-left:10px;border-left:1px%20solid%20%23ccc",".je-indented-panel--top":"padding-left:10px;margin-left:10px",".je-tabholder":"float:left;width:130px",".je-tabholder .content":"margin-left:120px",".je-tabholder--top":"margin-left:10px",".je-tabholder--clear":"clear:both",".je-tab":"border:1px%20solid%20%23ccc;border-width:1px%200%201px%201px;text-align:center;line-height:30px;border-radius:5px;border-bottom-right-radius:0;border-top-right-radius:0;font-weight:bold;cursor:pointer",".je-tab--top":"float:left;border:1px%20solid%20%23ccc;border-width:1px%201px%200px%201px;text-align:center;line-height:30px;border-radius:5px;padding-left:5px;padding-right:5px;border-bottom-right-radius:0;border-bottom-left-radius:0;font-weight:bold;cursor:pointer",".je-block-link":"display:block",".je-media":"width:100%25"};function cl(t){return function(t){if(Array.isArray(t))return ul(t)}(t)||function(t){if("undefined"!=typeof Symbol&&null!=t[Symbol.iterator]||null!=t["@@iterator"])return Array.from(t)}(t)||function(t,e){if(!t)return;if("string"==typeof t)return ul(t,e);var n=Object.prototype.toString.call(t).slice(8,-1);"Object"===n&&t.constructor&&(n=t.constructor.name);if("Map"===n||"Set"===n)return Array.from(t);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return ul(t,e)}(t)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function ul(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,r=new Array(e);n<e;n++)r[n]=t[n];return r}function hl(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function pl(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}var dl=function(){function t(e){var n=this,r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};if(hl(this,t),!(e instanceof Element))throw new Error("element should be an instance of Element");this.element=e,this.options=f({},t.defaults.options,r),this.ready=!1,this.copyClipboard=null,this.schema=this.options.schema,this.template=this.options.template,this.translate=this.options.translate||t.defaults.translate,this.translateProperty=this.options.translateProperty||t.defaults.translateProperty,this.uuid=0,this.__data={};var i=this.options.theme||t.defaults.theme,o=t.defaults.themes[i];if(!o)throw new Error("Unknown theme ".concat(i));this.element.setAttribute("data-theme",i),this.theme=new o(this);var a=f(ll,this.getEditorsRules()),s=function(t,e,r){return r?n.addNewStyleRulesToShadowRoot(t,e,r):n.addNewStyleRules(t,e)};if(!this.theme.options.disable_theme_rules){var l=m(this.element);s("default",a,l),void 0!==o.rules&&s(i,o.rules,l)}var c=t.defaults.iconlibs[this.options.iconlib||t.defaults.iconlib];c&&(this.iconlib=new c),this.root_container=this.theme.getContainer(),this.element.appendChild(this.root_container);var u=document.location.origin+document.location.pathname.toString(),h=new B(this.options),p=document.location.toString();this.expandSchema=function(t,e){return h.expandSchema(t,e)},this.expandRefs=function(t,e){return h.expandRefs(t,e)},this.refs=h.refs,h.load(this.schema,(function(e){var r=n.options.custom_validators?{custom_validators:n.options.custom_validators}:{};n.validator=new R(n,null,r,t.defaults);var i=n.getEditorClass(e);n.root=n.createEditor(i,{jsoneditor:n,schema:e,required:!0,container:n.root_container}),n.root.preBuild(),n.root.build(),n.root.postBuild(),v(n.options,"startval")&&n.root.setValue(n.options.startval),n.validation_results=n.validator.validate(n.root.getValue()),n.root.showValidationErrors(n.validation_results),n.ready=!0,window.requestAnimationFrame((function(){n.ready&&(n.validation_results=n.validator.validate(n.root.getValue()),n.root.showValidationErrors(n.validation_results),n.trigger("ready"),n.trigger("change"))}))}),u,p)}var e,n,r;return e=t,(n=[{key:"getValue",value:function(){if(!this.ready)throw new Error("JSON Editor not ready yet.  Listen for 'ready' event before getting the value");return this.root.getValue()}},{key:"setValue",value:function(t){if(!this.ready)throw new Error("JSON Editor not ready yet.  Listen for 'ready' event before setting the value");return this.root.setValue(t),this}},{key:"validate",value:function(t){if(!this.ready)throw new Error("JSON Editor not ready yet.  Listen for 'ready' event before validating");return 1===arguments.length?this.validator.validate(t):this.validation_results}},{key:"destroy",value:function(){this.destroyed||this.ready&&(this.schema=null,this.options=null,this.root.destroy(),this.root=null,this.root_container=null,this.validator=null,this.validation_results=null,this.theme=null,this.iconlib=null,this.template=null,this.__data=null,this.ready=!1,this.element.innerHTML="",this.element.removeAttribute("data-theme"),this.destroyed=!0)}},{key:"on",value:function(t,e){return this.callbacks=this.callbacks||{},this.callbacks[t]=this.callbacks[t]||[],this.callbacks[t].push(e),this}},{key:"off",value:function(t,e){if(t&&e){this.callbacks=this.callbacks||{},this.callbacks[t]=this.callbacks[t]||[];for(var n=[],r=0;r<this.callbacks[t].length;r++)this.callbacks[t][r]!==e&&n.push(this.callbacks[t][r]);this.callbacks[t]=n}else t?(this.callbacks=this.callbacks||{},this.callbacks[t]=[]):this.callbacks={};return this}},{key:"trigger",value:function(t,e){if(this.callbacks&&this.callbacks[t]&&this.callbacks[t].length)for(var n=0;n<this.callbacks[t].length;n++)this.callbacks[t][n].apply(this,[e]);return this}},{key:"setOption",value:function(t,e){if("show_errors"!==t)throw new Error("Option ".concat(t," must be set during instantiation and cannot be changed later"));return this.options.show_errors=e,this.onChange(),this}},{key:"getEditorsRules",value:function(){return Object.values(t.defaults.editors).reduce((function(t,e){return e.rules?f(t,e.rules):t}),{})}},{key:"getEditorClass",value:function(e){var n;if(e=this.expandSchema(e),t.defaults.resolvers.find((function(r){return(n=r(e))&&t.defaults.editors[n]})),!n)throw new Error("Unknown editor for schema ".concat(JSON.stringify(e)));if(!t.defaults.editors[n])throw new Error("Unknown editor ".concat(n));return t.defaults.editors[n]}},{key:"createEditor",value:function(e,n){var r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:1;return new e(n=f({},e.options||{},n),t.defaults,r)}},{key:"onChange",value:function(){var t=this;if(this.ready&&!this.firing_change)return this.firing_change=!0,window.requestAnimationFrame((function(){t.firing_change=!1,t.ready&&(t.validation_results=t.validator.validate(t.root.getValue()),"never"!==t.options.show_errors?t.root.showValidationErrors(t.validation_results):t.root.showValidationErrors([]),t.trigger("change"))})),this}},{key:"compileTemplate",value:function(e){var n,r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:t.defaults.template;if("string"==typeof r){if(!t.defaults.templates[r])throw new Error("Unknown template engine ".concat(r));if(!(n=t.defaults.templates[r]()))throw new Error("Template engine ".concat(r," missing required library."))}else n=r;if(!n)throw new Error("No template engine set");if(!n.compile)throw new Error("Invalid template engine set");return n.compile(e)}},{key:"_data",value:function(t,e,n){if(3!==arguments.length)return t.hasAttribute("data-jsoneditor-".concat(e))?this.__data[t.getAttribute("data-jsoneditor-".concat(e))]:null;var r;t.hasAttribute("data-jsoneditor-".concat(e))?r=t.getAttribute("data-jsoneditor-".concat(e)):(r=this.uuid++,t.setAttribute("data-jsoneditor-".concat(e),r)),this.__data[r]=n}},{key:"registerEditor",value:function(t){return this.editors=this.editors||{},this.editors[t.path]=t,this}},{key:"unregisterEditor",value:function(t){return this.editors=this.editors||{},this.editors[t.path]=null,this}},{key:"getEditor",value:function(t){if(this.editors)return this.editors[t]}},{key:"watch",value:function(t,e){return this.watchlist=this.watchlist||{},this.watchlist[t]=this.watchlist[t]||[],this.watchlist[t].push(e),this}},{key:"unwatch",value:function(t,e){if(!this.watchlist||!this.watchlist[t])return this;if(!e)return this.watchlist[t]=null,this;for(var n=[],r=0;r<this.watchlist[t].length;r++)this.watchlist[t][r]!==e&&n.push(this.watchlist[t][r]);return this.watchlist[t]=n.length?n:null,this}},{key:"notifyWatchers",value:function(t){if(!this.watchlist||!this.watchlist[t])return this;for(var e=0;e<this.watchlist[t].length;e++)this.watchlist[t][e]()}},{key:"isEnabled",value:function(){return!this.root||this.root.isEnabled()}},{key:"enable",value:function(){this.root.enable()}},{key:"disable",value:function(){this.root.disable()}},{key:"setCopyClipboardContents",value:function(t){this.copyClipboard=t}},{key:"getCopyClipboardContents",value:function(){return this.copyClipboard}},{key:"addNewStyleRules",value:function(t,e){var n=document.querySelector("#theme-".concat(t));n||((n=document.createElement("style")).setAttribute("id","theme-".concat(t)),n.appendChild(document.createTextNode("")),document.head.appendChild(n));for(var r=n.sheet?n.sheet:n.styleSheet,i=this.element.nodeName.toLowerCase();r.cssRules.length>0;)r.deleteRule(0);Object.keys(e).forEach((function(n){var o="default"===t?n:"".concat(i,'[data-theme="').concat(t,'"] ').concat(n);r.insertRule?r.insertRule(o+" {"+decodeURIComponent(e[n])+"}",0):r.addRule&&r.addRule(o,decodeURIComponent(e[n]),0)}))}},{key:"addNewStyleRulesToShadowRoot",value:function(t,e,n){var r=this.element.nodeName.toLowerCase(),i="";Object.keys(e).forEach((function(n){var o="default"===t?n:"".concat(r,'[data-theme="').concat(t,'"] ').concat(n);i+=o+" {"+decodeURIComponent(e[n])+"}\n"}));var o=new CSSStyleSheet;o.replaceSync(i),n.adoptedStyleSheets=[].concat(cl(n.adoptedStyleSheets),[o])}}])&&pl(e.prototype,n),r&&pl(e,r),t}();dl.defaults=c,dl.AbstractEditor=H,dl.AbstractTheme=Qa,dl.AbstractIconLib=ra,Object.assign(dl.defaults.themes,sl),Object.assign(dl.defaults.editors,Qo),Object.assign(dl.defaults.templates,Yo),Object.assign(dl.defaults.iconlibs,$a)}])}));
\ No newline at end of file
diff --git a/public/javascripts/ace.js/1.4.13/mode-yaml.js b/public/javascripts/ace.js/1.4.13/mode-yaml.js
new file mode 100644
index 00000000000..55299edd07a
--- /dev/null
+++ b/public/javascripts/ace.js/1.4.13/mode-yaml.js
@@ -0,0 +1,8 @@
+ace.define("ace/mode/yaml_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text_highlight_rules").TextHighlightRules,s=function(){this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"list.markup",regex:/^(?:-{3}|\.{3})\s*(?=#|$)/},{token:"list.markup",regex:/^\s*[\-?](?:$|\s)/},{token:"constant",regex:"!![\\w//]+"},{token:"constant.language",regex:"[&\\*][a-zA-Z0-9-_]+"},{token:["meta.tag","keyword"],regex:/^(\s*\w.*?)(:(?=\s|$))/},{token:["meta.tag","keyword"],regex:/(\w+?)(\s*:(?=\s|$))/},{token:"keyword.operator",regex:"<<\\w*:\\w*"},{token:"keyword.operator",regex:"-\\s*(?=[{])"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:/[|>][-+\d]*(?:$|\s+(?:$|#))/,onMatch:function(e,t,n,r){r=r.replace(/ #.*/,"");var i=/^ *((:\s*)?-(\s*[^|>])?)?/.exec(r)[0].replace(/\S\s*$/,"").length,s=parseInt(/\d+[\s+-]*$/.exec(r));return s?(i+=s-1,this.next="mlString"):this.next="mlStringPre",n.length?(n[0]=this.next,n[1]=i):(n.push(this.next),n.push(i)),this.token},next:"mlString"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"constant.numeric",regex:/(\b|[+\-\.])[\d_]+(?:(?:\.[\d_]*)?(?:[eE][+\-]?[\d_]+)?)(?=[^\d-\w]|$)/},{token:"constant.numeric",regex:/[+\-]?\.inf\b|NaN\b|0x[\dA-Fa-f_]+|0b[10_]+/},{token:"constant.language.boolean",regex:"\\b(?:true|false|TRUE|FALSE|True|False|yes|no)\\b"},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:/[^\s,:\[\]\{\}]+/}],mlStringPre:[{token:"indent",regex:/^ *$/},{token:"indent",regex:/^ */,onMatch:function(e,t,n){var r=n[1];return r>=e.length?(this.next="start",n.shift(),n.shift()):(n[1]=e.length-1,this.next=n[0]="mlString"),this.token},next:"mlString"},{defaultToken:"string"}],mlString:[{token:"indent",regex:/^ *$/},{token:"indent",regex:/^ */,onMatch:function(e,t,n){var r=n[1];return r>=e.length?(this.next="start",n.splice(0)):this.next="mlString",this.token},next:"mlString"},{token:"string",regex:".+"}]},this.normalizeRules()};r.inherits(s,i),t.YamlHighlightRules=s}),ace.define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(e,t,n){"use strict";var r=e("../range").Range,i=function(){};(function(){this.checkOutdent=function(e,t){return/^\s+$/.test(e)?/^\s*\}/.test(t):!1},this.autoOutdent=function(e,t){var n=e.getLine(t),i=n.match(/^(\s*\})/);if(!i)return 0;var s=i[1].length,o=e.findMatchingBracket({row:t,column:s});if(!o||o.row==t)return 0;var u=this.$getIndent(e.getLine(o.row));e.replace(new r(t,0,t,s-1),u)},this.$getIndent=function(e){return e.match(/^\s*/)[0]}}).call(i.prototype),t.MatchingBraceOutdent=i}),ace.define("ace/mode/folding/coffee",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode","ace/range"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("./fold_mode").FoldMode,s=e("../../range").Range,o=t.FoldMode=function(){};r.inherits(o,i),function(){this.getFoldWidgetRange=function(e,t,n){var r=this.indentationBlock(e,n);if(r)return r;var i=/\S/,o=e.getLine(n),u=o.search(i);if(u==-1||o[u]!="#")return;var a=o.length,f=e.getLength(),l=n,c=n;while(++n<f){o=e.getLine(n);var h=o.search(i);if(h==-1)continue;if(o[h]!="#")break;c=n}if(c>l){var p=e.getLine(c).length;return new s(l,a,c,p)}},this.getFoldWidget=function(e,t,n){var r=e.getLine(n),i=r.search(/\S/),s=e.getLine(n+1),o=e.getLine(n-1),u=o.search(/\S/),a=s.search(/\S/);if(i==-1)return e.foldWidgets[n-1]=u!=-1&&u<a?"start":"","";if(u==-1){if(i==a&&r[i]=="#"&&s[i]=="#")return e.foldWidgets[n-1]="",e.foldWidgets[n+1]="","start"}else if(u==i&&r[i]=="#"&&o[i]=="#"&&e.getLine(n-2).search(/\S/)==-1)return e.foldWidgets[n-1]="start",e.foldWidgets[n+1]="","";return u!=-1&&u<i?e.foldWidgets[n-1]="start":e.foldWidgets[n-1]="",i<a?"start":""}}.call(o.prototype)}),ace.define("ace/mode/yaml",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/yaml_highlight_rules","ace/mode/matching_brace_outdent","ace/mode/folding/coffee"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text").Mode,s=e("./yaml_highlight_rules").YamlHighlightRules,o=e("./matching_brace_outdent").MatchingBraceOutdent,u=e("./folding/coffee").FoldMode,a=function(){this.HighlightRules=s,this.$outdent=new o,this.foldingRules=new u,this.$behaviour=this.$defaultBehaviour};r.inherits(a,i),function(){this.lineCommentStart=["#"],this.getNextLineIndent=function(e,t,n){var r=this.$getIndent(t);if(e=="start"){var i=t.match(/^.*[\{\(\[]\s*$/);i&&(r+=n)}return r},this.checkOutdent=function(e,t,n){return this.$outdent.checkOutdent(t,n)},this.autoOutdent=function(e,t,n){this.$outdent.autoOutdent(t,n)},this.$id="ace/mode/yaml"}.call(a.prototype),t.Mode=a});                (function() {
+                    ace.require(["ace/mode/yaml"], function(m) {
+                        if (typeof module == "object" && typeof exports == "object" && module) {
+                            module.exports = m;
+                        }
+                    });
+                })();
+            
\ No newline at end of file
diff --git a/public/javascripts/ace/mode-yaml.js b/public/javascripts/ace/mode-yaml.js
new file mode 100644
index 00000000000..55299edd07a
--- /dev/null
+++ b/public/javascripts/ace/mode-yaml.js
@@ -0,0 +1,8 @@
+ace.define("ace/mode/yaml_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text_highlight_rules").TextHighlightRules,s=function(){this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"list.markup",regex:/^(?:-{3}|\.{3})\s*(?=#|$)/},{token:"list.markup",regex:/^\s*[\-?](?:$|\s)/},{token:"constant",regex:"!![\\w//]+"},{token:"constant.language",regex:"[&\\*][a-zA-Z0-9-_]+"},{token:["meta.tag","keyword"],regex:/^(\s*\w.*?)(:(?=\s|$))/},{token:["meta.tag","keyword"],regex:/(\w+?)(\s*:(?=\s|$))/},{token:"keyword.operator",regex:"<<\\w*:\\w*"},{token:"keyword.operator",regex:"-\\s*(?=[{])"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:/[|>][-+\d]*(?:$|\s+(?:$|#))/,onMatch:function(e,t,n,r){r=r.replace(/ #.*/,"");var i=/^ *((:\s*)?-(\s*[^|>])?)?/.exec(r)[0].replace(/\S\s*$/,"").length,s=parseInt(/\d+[\s+-]*$/.exec(r));return s?(i+=s-1,this.next="mlString"):this.next="mlStringPre",n.length?(n[0]=this.next,n[1]=i):(n.push(this.next),n.push(i)),this.token},next:"mlString"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"constant.numeric",regex:/(\b|[+\-\.])[\d_]+(?:(?:\.[\d_]*)?(?:[eE][+\-]?[\d_]+)?)(?=[^\d-\w]|$)/},{token:"constant.numeric",regex:/[+\-]?\.inf\b|NaN\b|0x[\dA-Fa-f_]+|0b[10_]+/},{token:"constant.language.boolean",regex:"\\b(?:true|false|TRUE|FALSE|True|False|yes|no)\\b"},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:/[^\s,:\[\]\{\}]+/}],mlStringPre:[{token:"indent",regex:/^ *$/},{token:"indent",regex:/^ */,onMatch:function(e,t,n){var r=n[1];return r>=e.length?(this.next="start",n.shift(),n.shift()):(n[1]=e.length-1,this.next=n[0]="mlString"),this.token},next:"mlString"},{defaultToken:"string"}],mlString:[{token:"indent",regex:/^ *$/},{token:"indent",regex:/^ */,onMatch:function(e,t,n){var r=n[1];return r>=e.length?(this.next="start",n.splice(0)):this.next="mlString",this.token},next:"mlString"},{token:"string",regex:".+"}]},this.normalizeRules()};r.inherits(s,i),t.YamlHighlightRules=s}),ace.define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(e,t,n){"use strict";var r=e("../range").Range,i=function(){};(function(){this.checkOutdent=function(e,t){return/^\s+$/.test(e)?/^\s*\}/.test(t):!1},this.autoOutdent=function(e,t){var n=e.getLine(t),i=n.match(/^(\s*\})/);if(!i)return 0;var s=i[1].length,o=e.findMatchingBracket({row:t,column:s});if(!o||o.row==t)return 0;var u=this.$getIndent(e.getLine(o.row));e.replace(new r(t,0,t,s-1),u)},this.$getIndent=function(e){return e.match(/^\s*/)[0]}}).call(i.prototype),t.MatchingBraceOutdent=i}),ace.define("ace/mode/folding/coffee",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode","ace/range"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("./fold_mode").FoldMode,s=e("../../range").Range,o=t.FoldMode=function(){};r.inherits(o,i),function(){this.getFoldWidgetRange=function(e,t,n){var r=this.indentationBlock(e,n);if(r)return r;var i=/\S/,o=e.getLine(n),u=o.search(i);if(u==-1||o[u]!="#")return;var a=o.length,f=e.getLength(),l=n,c=n;while(++n<f){o=e.getLine(n);var h=o.search(i);if(h==-1)continue;if(o[h]!="#")break;c=n}if(c>l){var p=e.getLine(c).length;return new s(l,a,c,p)}},this.getFoldWidget=function(e,t,n){var r=e.getLine(n),i=r.search(/\S/),s=e.getLine(n+1),o=e.getLine(n-1),u=o.search(/\S/),a=s.search(/\S/);if(i==-1)return e.foldWidgets[n-1]=u!=-1&&u<a?"start":"","";if(u==-1){if(i==a&&r[i]=="#"&&s[i]=="#")return e.foldWidgets[n-1]="",e.foldWidgets[n+1]="","start"}else if(u==i&&r[i]=="#"&&o[i]=="#"&&e.getLine(n-2).search(/\S/)==-1)return e.foldWidgets[n-1]="start",e.foldWidgets[n+1]="","";return u!=-1&&u<i?e.foldWidgets[n-1]="start":e.foldWidgets[n-1]="",i<a?"start":""}}.call(o.prototype)}),ace.define("ace/mode/yaml",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/yaml_highlight_rules","ace/mode/matching_brace_outdent","ace/mode/folding/coffee"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text").Mode,s=e("./yaml_highlight_rules").YamlHighlightRules,o=e("./matching_brace_outdent").MatchingBraceOutdent,u=e("./folding/coffee").FoldMode,a=function(){this.HighlightRules=s,this.$outdent=new o,this.foldingRules=new u,this.$behaviour=this.$defaultBehaviour};r.inherits(a,i),function(){this.lineCommentStart=["#"],this.getNextLineIndent=function(e,t,n){var r=this.$getIndent(t);if(e=="start"){var i=t.match(/^.*[\{\(\[]\s*$/);i&&(r+=n)}return r},this.checkOutdent=function(e,t,n){return this.$outdent.checkOutdent(t,n)},this.autoOutdent=function(e,t,n){this.$outdent.autoOutdent(t,n)},this.$id="ace/mode/yaml"}.call(a.prototype),t.Mode=a});                (function() {
+                    ace.require(["ace/mode/yaml"], function(m) {
+                        if (typeof module == "object" && typeof exports == "object" && module) {
+                            module.exports = m;
+                        }
+                    });
+                })();
+            
\ No newline at end of file
diff --git a/public/javascripts/chartjs-plugin-datalabels/2.0.0/chartjs-plugin-datalabels.min.js b/public/javascripts/chartjs-plugin-datalabels/2.0.0/chartjs-plugin-datalabels.min.js
deleted file mode 100644
index c662fcfab24..00000000000
--- a/public/javascripts/chartjs-plugin-datalabels/2.0.0/chartjs-plugin-datalabels.min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
- * chartjs-plugin-datalabels v2.0.0
- * https://chartjs-plugin-datalabels.netlify.app
- * (c) 2017-2021 chartjs-plugin-datalabels contributors
- * Released under the MIT license
- */
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("chart.js/helpers"),require("chart.js")):"function"==typeof define&&define.amd?define(["chart.js/helpers","chart.js"],e):(t="undefined"!=typeof globalThis?globalThis:t||self).ChartDataLabels=e(t.Chart.helpers,t.Chart)}(this,(function(t,e){"use strict";var r=function(){if("undefined"!=typeof window){if(window.devicePixelRatio)return window.devicePixelRatio;var t=window.screen;if(t)return(t.deviceXDPI||1)/(t.logicalXDPI||1)}return 1}(),a=function(e){var r,a=[];for(e=[].concat(e);e.length;)"string"==typeof(r=e.pop())?a.unshift.apply(a,r.split("\n")):Array.isArray(r)?e.push.apply(e,r):t.isNullOrUndef(e)||a.unshift(""+r);return a},o=function(t,e,r){var a,o=[].concat(e),n=o.length,i=t.font,l=0;for(t.font=r.string,a=0;a<n;++a)l=Math.max(t.measureText(o[a]).width,l);return t.font=i,{height:n*r.lineHeight,width:l}},n=function(t,e,r){return Math.max(t,Math.min(e,r))},i=function(t,e){var r,a,o,n,i=t.slice(),l=[];for(r=0,o=e.length;r<o;++r)n=e[r],-1===(a=i.indexOf(n))?l.push([n,1]):i.splice(a,1);for(r=0,o=i.length;r<o;++r)l.push([i[r],-1]);return l};function l(t,e){var r=e.x,a=e.y;if(null===r)return{x:0,y:-1};if(null===a)return{x:1,y:0};var o=t.x-r,n=t.y-a,i=Math.sqrt(o*o+n*n);return{x:i?o/i:0,y:i?n/i:-1}}function s(t,e,r){var a=0;return t<r.left?a|=1:t>r.right&&(a|=2),e<r.top?a|=8:e>r.bottom&&(a|=4),a}function u(t,e){var r,a,o=e.anchor,n=t;return e.clamp&&(n=function(t,e){for(var r,a,o,n=t.x0,i=t.y0,l=t.x1,u=t.y1,d=s(n,i,e),c=s(l,u,e);d|c&&!(d&c);)8&(r=d||c)?(a=n+(l-n)*(e.top-i)/(u-i),o=e.top):4&r?(a=n+(l-n)*(e.bottom-i)/(u-i),o=e.bottom):2&r?(o=i+(u-i)*(e.right-n)/(l-n),a=e.right):1&r&&(o=i+(u-i)*(e.left-n)/(l-n),a=e.left),r===d?d=s(n=a,i=o,e):c=s(l=a,u=o,e);return{x0:n,x1:l,y0:i,y1:u}}(n,e.area)),"start"===o?(r=n.x0,a=n.y0):"end"===o?(r=n.x1,a=n.y1):(r=(n.x0+n.x1)/2,a=(n.y0+n.y1)/2),function(t,e,r,a,o){switch(o){case"center":r=a=0;break;case"bottom":r=0,a=1;break;case"right":r=1,a=0;break;case"left":r=-1,a=0;break;case"top":r=0,a=-1;break;case"start":r=-r,a=-a;break;case"end":break;default:o*=Math.PI/180,r=Math.cos(o),a=Math.sin(o)}return{x:t,y:e,vx:r,vy:a}}(r,a,t.vx,t.vy,e.align)}var d=function(t,e){var r=(t.startAngle+t.endAngle)/2,a=Math.cos(r),o=Math.sin(r),n=t.innerRadius,i=t.outerRadius;return u({x0:t.x+a*n,y0:t.y+o*n,x1:t.x+a*i,y1:t.y+o*i,vx:a,vy:o},e)},c=function(t,e){var r=l(t,e.origin),a=r.x*t.options.radius,o=r.y*t.options.radius;return u({x0:t.x-a,y0:t.y-o,x1:t.x+a,y1:t.y+o,vx:r.x,vy:r.y},e)},h=function(t,e){var r=l(t,e.origin),a=t.x,o=t.y,n=0,i=0;return t.horizontal?(a=Math.min(t.x,t.base),n=Math.abs(t.base-t.x)):(o=Math.min(t.y,t.base),i=Math.abs(t.base-t.y)),u({x0:a,y0:o+i,x1:a+n,y1:o,vx:r.x,vy:r.y},e)},f=function(t,e){var r=l(t,e.origin);return u({x0:t.x,y0:t.y,x1:t.x,y1:t.y,vx:r.x,vy:r.y},e)},x=function(t){return Math.round(t*r)/r};function y(t,e){var r=e.chart.getDatasetMeta(e.datasetIndex).vScale;if(!r)return null;if(void 0!==r.xCenter&&void 0!==r.yCenter)return{x:r.xCenter,y:r.yCenter};var a=r.getBasePixel();return t.horizontal?{x:a,y:null}:{x:null,y:a}}function v(t,e,r){var a=r.backgroundColor,o=r.borderColor,n=r.borderWidth;(a||o&&n)&&(t.beginPath(),function(t,e,r,a,o,n){var i=Math.PI/2;if(n){var l=Math.min(n,o/2,a/2),s=e+l,u=r+l,d=e+a-l,c=r+o-l;t.moveTo(e,u),s<d&&u<c?(t.arc(s,u,l,-Math.PI,-i),t.arc(d,u,l,-i,0),t.arc(d,c,l,0,i),t.arc(s,c,l,i,Math.PI)):s<d?(t.moveTo(s,r),t.arc(d,u,l,-i,i),t.arc(s,u,l,i,Math.PI+i)):u<c?(t.arc(s,u,l,-Math.PI,0),t.arc(s,c,l,0,Math.PI)):t.arc(s,u,l,-Math.PI,Math.PI),t.closePath(),t.moveTo(e,r)}else t.rect(e,r,a,o)}(t,x(e.x)+n/2,x(e.y)+n/2,x(e.w)-n,x(e.h)-n,r.borderRadius),t.closePath(),a&&(t.fillStyle=a,t.fill()),o&&n&&(t.strokeStyle=o,t.lineWidth=n,t.lineJoin="miter",t.stroke()))}function b(t,e,r){var a=t.shadowBlur,o=r.stroked,n=x(r.x),i=x(r.y),l=x(r.w);o&&t.strokeText(e,n,i,l),r.filled&&(a&&o&&(t.shadowBlur=0),t.fillText(e,n,i,l),a&&o&&(t.shadowBlur=a))}var _=function(t,e,r,a){var o=this;o._config=t,o._index=a,o._model=null,o._rects=null,o._ctx=e,o._el=r};t.merge(_.prototype,{_modelize:function(r,a,n,i){var l,s=this,u=s._index,x=t.toFont(t.resolve([n.font,{}],i,u)),v=t.resolve([n.color,e.defaults.color],i,u);return{align:t.resolve([n.align,"center"],i,u),anchor:t.resolve([n.anchor,"center"],i,u),area:i.chart.chartArea,backgroundColor:t.resolve([n.backgroundColor,null],i,u),borderColor:t.resolve([n.borderColor,null],i,u),borderRadius:t.resolve([n.borderRadius,0],i,u),borderWidth:t.resolve([n.borderWidth,0],i,u),clamp:t.resolve([n.clamp,!1],i,u),clip:t.resolve([n.clip,!1],i,u),color:v,display:r,font:x,lines:a,offset:t.resolve([n.offset,0],i,u),opacity:t.resolve([n.opacity,1],i,u),origin:y(s._el,i),padding:t.toPadding(t.resolve([n.padding,0],i,u)),positioner:(l=s._el,l instanceof e.ArcElement?d:l instanceof e.PointElement?c:l instanceof e.BarElement?h:f),rotation:t.resolve([n.rotation,0],i,u)*(Math.PI/180),size:o(s._ctx,a,x),textAlign:t.resolve([n.textAlign,"start"],i,u),textShadowBlur:t.resolve([n.textShadowBlur,0],i,u),textShadowColor:t.resolve([n.textShadowColor,v],i,u),textStrokeColor:t.resolve([n.textStrokeColor,v],i,u),textStrokeWidth:t.resolve([n.textStrokeWidth,0],i,u)}},update:function(e){var r,o,n,i=this,l=null,s=null,u=i._index,d=i._config,c=t.resolve([d.display,!0],e,u);c&&(r=e.dataset.data[u],o=t.valueOrDefault(t.callback(d.formatter,[r,e]),r),(n=t.isNullOrUndef(o)?[]:a(o)).length&&(s=function(t){var e=t.borderWidth||0,r=t.padding,a=t.size.height,o=t.size.width,n=-o/2,i=-a/2;return{frame:{x:n-r.left-e,y:i-r.top-e,w:o+r.width+2*e,h:a+r.height+2*e},text:{x:n,y:i,w:o,h:a}}}(l=i._modelize(c,n,d,e)))),i._model=l,i._rects=s},geometry:function(){return this._rects?this._rects.frame:{}},rotation:function(){return this._model?this._model.rotation:0},visible:function(){return this._model&&this._model.opacity},model:function(){return this._model},draw:function(t,e){var r,a=t.ctx,o=this._model,i=this._rects;this.visible()&&(a.save(),o.clip&&(r=o.area,a.beginPath(),a.rect(r.left,r.top,r.right-r.left,r.bottom-r.top),a.clip()),a.globalAlpha=n(0,o.opacity,1),a.translate(x(e.x),x(e.y)),a.rotate(o.rotation),v(a,i.frame,o),function(t,e,r,a){var o,n=a.textAlign,i=a.color,l=!!i,s=a.font,u=e.length,d=a.textStrokeColor,c=a.textStrokeWidth,h=d&&c;if(u&&(l||h))for(r=function(t,e,r){var a=r.lineHeight,o=t.w,n=t.x;return"center"===e?n+=o/2:"end"!==e&&"right"!==e||(n+=o),{h:a,w:o,x:n,y:t.y+a/2}}(r,n,s),t.font=s.string,t.textAlign=n,t.textBaseline="middle",t.shadowBlur=a.textShadowBlur,t.shadowColor=a.textShadowColor,l&&(t.fillStyle=i),h&&(t.lineJoin="round",t.lineWidth=c,t.strokeStyle=d),o=0,u=e.length;o<u;++o)b(t,e[o],{stroked:h,filled:l,w:r.w,x:r.x,y:r.y+r.h*o})}(a,o.lines,i.text,o),a.restore())}});var p=Number.MIN_SAFE_INTEGER||-9007199254740991,g=Number.MAX_SAFE_INTEGER||9007199254740991;function m(t,e,r){var a=Math.cos(r),o=Math.sin(r),n=e.x,i=e.y;return{x:n+a*(t.x-n)-o*(t.y-i),y:i+o*(t.x-n)+a*(t.y-i)}}function w(t,e){var r,a,o,n,i,l=g,s=p,u=e.origin;for(r=0;r<t.length;++r)o=(a=t[r]).x-u.x,n=a.y-u.y,i=e.vx*o+e.vy*n,l=Math.min(l,i),s=Math.max(s,i);return{min:l,max:s}}function M(t,e){var r=e.x-t.x,a=e.y-t.y,o=Math.sqrt(r*r+a*a);return{vx:(e.x-t.x)/o,vy:(e.y-t.y)/o,origin:t,ln:o}}var k=function(){this._rotation=0,this._rect={x:0,y:0,w:0,h:0}};function $(t,e,r){var a=e.positioner(t,e),o=a.vx,n=a.vy;if(!o&&!n)return{x:a.x,y:a.y};var i=r.w,l=r.h,s=e.rotation,u=Math.abs(i/2*Math.cos(s))+Math.abs(l/2*Math.sin(s)),d=Math.abs(i/2*Math.sin(s))+Math.abs(l/2*Math.cos(s)),c=1/Math.max(Math.abs(o),Math.abs(n));return u*=o*c,d*=n*c,u+=e.offset*o,d+=e.offset*n,{x:a.x+u,y:a.y+d}}t.merge(k.prototype,{center:function(){var t=this._rect;return{x:t.x+t.w/2,y:t.y+t.h/2}},update:function(t,e,r){this._rotation=r,this._rect={x:e.x+t.x,y:e.y+t.y,w:e.w,h:e.h}},contains:function(t){var e=this,r=e._rect;return!((t=m(t,e.center(),-e._rotation)).x<r.x-1||t.y<r.y-1||t.x>r.x+r.w+2||t.y>r.y+r.h+2)},intersects:function(t){var e,r,a,o=this._points(),n=t._points(),i=[M(o[0],o[1]),M(o[0],o[3])];for(this._rotation!==t._rotation&&i.push(M(n[0],n[1]),M(n[0],n[3])),e=0;e<i.length;++e)if(r=w(o,i[e]),a=w(n,i[e]),r.max<a.min||a.max<r.min)return!1;return!0},_points:function(){var t=this,e=t._rect,r=t._rotation,a=t.center();return[m({x:e.x,y:e.y},a,r),m({x:e.x+e.w,y:e.y},a,r),m({x:e.x+e.w,y:e.y+e.h},a,r),m({x:e.x,y:e.y+e.h},a,r)]}});var C={prepare:function(t){var e,r,a,o,n,i=[];for(e=0,a=t.length;e<a;++e)for(r=0,o=t[e].length;r<o;++r)n=t[e][r],i.push(n),n.$layout={_box:new k,_hidable:!1,_visible:!0,_set:e,_idx:r};return i.sort((function(t,e){var r=t.$layout,a=e.$layout;return r._idx===a._idx?a._set-r._set:a._idx-r._idx})),this.update(i),i},update:function(t){var e,r,a,o,n,i=!1;for(e=0,r=t.length;e<r;++e)o=(a=t[e]).model(),(n=a.$layout)._hidable=o&&"auto"===o.display,n._visible=a.visible(),i|=n._hidable;i&&function(t){var e,r,a,o,n,i,l;for(e=0,r=t.length;e<r;++e)(o=(a=t[e]).$layout)._visible&&(l=new Proxy(a._el,{get:(t,e)=>t.getProps([e],!0)[e]}),n=a.geometry(),i=$(l,a.model(),n),o._box.update(i,n,a.rotation()));(function(t,e){var r,a,o,n;for(r=t.length-1;r>=0;--r)for(o=t[r].$layout,a=r-1;a>=0&&o._visible;--a)(n=t[a].$layout)._visible&&o._box.intersects(n._box)&&e(o,n)})(t,(function(t,e){var r=t._hidable,a=e._hidable;r&&a||a?e._visible=!1:r&&(t._visible=!1)}))}(t)},lookup:function(t,e){var r,a;for(r=t.length-1;r>=0;--r)if((a=t[r].$layout)&&a._visible&&a._box.contains(e))return t[r];return null},draw:function(t,e){var r,a,o,n,i,l;for(r=0,a=e.length;r<a;++r)(n=(o=e[r]).$layout)._visible&&(i=o.geometry(),l=$(o._el,o.model(),i),n._box.update(l,i,o.rotation()),o.draw(t,l))}},P="$default";function S(e,r,a){if(r){var o,n=a.$context,i=a.$groups;r[i._set]&&(o=r[i._set][i._key])&&!0===t.callback(o,[n])&&(e.$datalabels._dirty=!0,a.update(n))}}function I(t,e){var r,a,o=t.$datalabels,n=o._listeners;if(n.enter||n.leave){if("mousemove"===e.type)a=C.lookup(o._labels,e);else if("mouseout"!==e.type)return;r=o._hovered,o._hovered=a,function(t,e,r,a){var o,n;(r||a)&&(r?a?r!==a&&(n=o=!0):n=!0:o=!0,n&&S(t,e.leave,r),o&&S(t,e.enter,a))}(t,n,r,a)}}return{id:"datalabels",defaults:{align:"center",anchor:"center",backgroundColor:null,borderColor:null,borderRadius:0,borderWidth:0,clamp:!1,clip:!1,color:void 0,display:!0,font:{family:void 0,lineHeight:1.2,size:void 0,style:void 0,weight:null},formatter:function(e){if(t.isNullOrUndef(e))return null;var r,a,o,n=e;if(t.isObject(e))if(t.isNullOrUndef(e.label))if(t.isNullOrUndef(e.r))for(n="",o=0,a=(r=Object.keys(e)).length;o<a;++o)n+=(0!==o?", ":"")+r[o]+": "+e[r[o]];else n=e.r;else n=e.label;return""+n},labels:void 0,listeners:{},offset:4,opacity:1,padding:{top:4,right:4,bottom:4,left:4},rotation:0,textAlign:"start",textStrokeColor:void 0,textStrokeWidth:0,textShadowBlur:0,textShadowColor:void 0},beforeInit:function(t){t.$datalabels={_actives:[]}},beforeUpdate:function(t){var e=t.$datalabels;e._listened=!1,e._listeners={},e._datasets=[],e._labels=[]},afterDatasetUpdate:function(e,r,a){var o,n,i,l,s,u,d,c,h=r.index,f=e.$datalabels,x=f._datasets[h]=[],y=e.isDatasetVisible(h),v=e.data.datasets[h],b=function(e,r){var a,o,n,i=e.datalabels,l=[];return!1===i?null:(!0===i&&(i={}),r=t.merge({},[r,i]),o=r.labels||{},n=Object.keys(o),delete r.labels,n.length?n.forEach((function(e){o[e]&&l.push(t.merge({},[r,o[e],{_key:e}]))})):l.push(r),a=l.reduce((function(e,r){return t.each(r.listeners||{},(function(t,a){e[a]=e[a]||{},e[a][r._key||P]=t})),delete r.listeners,e}),{}),{labels:l,listeners:a})}(v,a),p=r.meta.data||[],g=e.ctx;for(g.save(),o=0,i=p.length;o<i;++o)if((d=p[o]).$datalabels=[],y&&d&&e.getDataVisibility(o)&&!d.skip)for(n=0,l=b.labels.length;n<l;++n)u=(s=b.labels[n])._key,(c=new _(s,g,d,o)).$groups={_set:h,_key:u||P},c.$context={active:!1,chart:e,dataIndex:o,dataset:v,datasetIndex:h},c.update(c.$context),d.$datalabels.push(c),x.push(c);g.restore(),t.merge(f._listeners,b.listeners,{merger:function(t,e,a){e[t]=e[t]||{},e[t][r.index]=a[t],f._listened=!0}})},afterUpdate:function(t,e){t.$datalabels._labels=C.prepare(t.$datalabels._datasets,e)},afterDatasetsDraw:function(t){C.draw(t,t.$datalabels._labels)},beforeEvent:function(t,e){if(t.$datalabels._listened){var r=e.event;switch(r.type){case"mousemove":case"mouseout":I(t,r);break;case"click":!function(t,e){var r=t.$datalabels,a=r._listeners.click,o=a&&C.lookup(r._labels,e);o&&S(t,a,o)}(t,r)}}},afterEvent:function(t){var e,r,a,o,n,l,s,u=t.$datalabels,d=u._actives,c=u._actives=t.getActiveElements(),h=i(d,c);for(e=0,r=h.length;e<r;++e)if((n=h[e])[1])for(a=0,o=(s=n[0].element.$datalabels||[]).length;a<o;++a)(l=s[a]).$context.active=1===n[1],l.update(l.$context);(u._dirty||h.length)&&(C.update(u._labels),t.render()),delete u._dirty}}}));
diff --git a/public/javascripts/chartjs-plugin-datalabels/2.2.0/chartjs-plugin-datalabels.min.js b/public/javascripts/chartjs-plugin-datalabels/2.2.0/chartjs-plugin-datalabels.min.js
new file mode 100644
index 00000000000..e84e6ff057d
--- /dev/null
+++ b/public/javascripts/chartjs-plugin-datalabels/2.2.0/chartjs-plugin-datalabels.min.js
@@ -0,0 +1,7 @@
+/*!
+ * chartjs-plugin-datalabels v2.2.0
+ * https://chartjs-plugin-datalabels.netlify.app
+ * (c) 2017-2022 chartjs-plugin-datalabels contributors
+ * Released under the MIT license
+ */
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("chart.js/helpers"),require("chart.js")):"function"==typeof define&&define.amd?define(["chart.js/helpers","chart.js"],e):(t="undefined"!=typeof globalThis?globalThis:t||self).ChartDataLabels=e(t.Chart.helpers,t.Chart)}(this,(function(t,e){"use strict";var r=function(){if("undefined"!=typeof window){if(window.devicePixelRatio)return window.devicePixelRatio;var t=window.screen;if(t)return(t.deviceXDPI||1)/(t.logicalXDPI||1)}return 1}(),a=function(e){var r,a=[];for(e=[].concat(e);e.length;)"string"==typeof(r=e.pop())?a.unshift.apply(a,r.split("\n")):Array.isArray(r)?e.push.apply(e,r):t.isNullOrUndef(e)||a.unshift(""+r);return a},o=function(t,e,r){var a,o=[].concat(e),n=o.length,i=t.font,l=0;for(t.font=r.string,a=0;a<n;++a)l=Math.max(t.measureText(o[a]).width,l);return t.font=i,{height:n*r.lineHeight,width:l}},n=function(t,e,r){return Math.max(t,Math.min(e,r))},i=function(t,e){var r,a,o,n,i=t.slice(),l=[];for(r=0,o=e.length;r<o;++r)n=e[r],-1===(a=i.indexOf(n))?l.push([n,1]):i.splice(a,1);for(r=0,o=i.length;r<o;++r)l.push([i[r],-1]);return l};function l(t,e){var r=e.x,a=e.y;if(null===r)return{x:0,y:-1};if(null===a)return{x:1,y:0};var o=t.x-r,n=t.y-a,i=Math.sqrt(o*o+n*n);return{x:i?o/i:0,y:i?n/i:-1}}function s(t,e,r){var a=0;return t<r.left?a|=1:t>r.right&&(a|=2),e<r.top?a|=8:e>r.bottom&&(a|=4),a}function u(t,e){var r,a,o=e.anchor,n=t;return e.clamp&&(n=function(t,e){for(var r,a,o,n=t.x0,i=t.y0,l=t.x1,u=t.y1,d=s(n,i,e),c=s(l,u,e);d|c&&!(d&c);)8&(r=d||c)?(a=n+(l-n)*(e.top-i)/(u-i),o=e.top):4&r?(a=n+(l-n)*(e.bottom-i)/(u-i),o=e.bottom):2&r?(o=i+(u-i)*(e.right-n)/(l-n),a=e.right):1&r&&(o=i+(u-i)*(e.left-n)/(l-n),a=e.left),r===d?d=s(n=a,i=o,e):c=s(l=a,u=o,e);return{x0:n,x1:l,y0:i,y1:u}}(n,e.area)),"start"===o?(r=n.x0,a=n.y0):"end"===o?(r=n.x1,a=n.y1):(r=(n.x0+n.x1)/2,a=(n.y0+n.y1)/2),function(t,e,r,a,o){switch(o){case"center":r=a=0;break;case"bottom":r=0,a=1;break;case"right":r=1,a=0;break;case"left":r=-1,a=0;break;case"top":r=0,a=-1;break;case"start":r=-r,a=-a;break;case"end":break;default:o*=Math.PI/180,r=Math.cos(o),a=Math.sin(o)}return{x:t,y:e,vx:r,vy:a}}(r,a,t.vx,t.vy,e.align)}var d=function(t,e){var r=(t.startAngle+t.endAngle)/2,a=Math.cos(r),o=Math.sin(r),n=t.innerRadius,i=t.outerRadius;return u({x0:t.x+a*n,y0:t.y+o*n,x1:t.x+a*i,y1:t.y+o*i,vx:a,vy:o},e)},c=function(t,e){var r=l(t,e.origin),a=r.x*t.options.radius,o=r.y*t.options.radius;return u({x0:t.x-a,y0:t.y-o,x1:t.x+a,y1:t.y+o,vx:r.x,vy:r.y},e)},h=function(t,e){var r=l(t,e.origin),a=t.x,o=t.y,n=0,i=0;return t.horizontal?(a=Math.min(t.x,t.base),n=Math.abs(t.base-t.x)):(o=Math.min(t.y,t.base),i=Math.abs(t.base-t.y)),u({x0:a,y0:o+i,x1:a+n,y1:o,vx:r.x,vy:r.y},e)},f=function(t,e){var r=l(t,e.origin);return u({x0:t.x,y0:t.y,x1:t.x+(t.width||0),y1:t.y+(t.height||0),vx:r.x,vy:r.y},e)},x=function(t){return Math.round(t*r)/r};function y(t,e){var r=e.chart.getDatasetMeta(e.datasetIndex).vScale;if(!r)return null;if(void 0!==r.xCenter&&void 0!==r.yCenter)return{x:r.xCenter,y:r.yCenter};var a=r.getBasePixel();return t.horizontal?{x:a,y:null}:{x:null,y:a}}function v(t,e,r){var a=r.backgroundColor,o=r.borderColor,n=r.borderWidth;(a||o&&n)&&(t.beginPath(),function(t,e,r,a,o,n){var i=Math.PI/2;if(n){var l=Math.min(n,o/2,a/2),s=e+l,u=r+l,d=e+a-l,c=r+o-l;t.moveTo(e,u),s<d&&u<c?(t.arc(s,u,l,-Math.PI,-i),t.arc(d,u,l,-i,0),t.arc(d,c,l,0,i),t.arc(s,c,l,i,Math.PI)):s<d?(t.moveTo(s,r),t.arc(d,u,l,-i,i),t.arc(s,u,l,i,Math.PI+i)):u<c?(t.arc(s,u,l,-Math.PI,0),t.arc(s,c,l,0,Math.PI)):t.arc(s,u,l,-Math.PI,Math.PI),t.closePath(),t.moveTo(e,r)}else t.rect(e,r,a,o)}(t,x(e.x)+n/2,x(e.y)+n/2,x(e.w)-n,x(e.h)-n,r.borderRadius),t.closePath(),a&&(t.fillStyle=a,t.fill()),o&&n&&(t.strokeStyle=o,t.lineWidth=n,t.lineJoin="miter",t.stroke()))}function b(t,e,r){var a=t.shadowBlur,o=r.stroked,n=x(r.x),i=x(r.y),l=x(r.w);o&&t.strokeText(e,n,i,l),r.filled&&(a&&o&&(t.shadowBlur=0),t.fillText(e,n,i,l),a&&o&&(t.shadowBlur=a))}var _=function(t,e,r,a){var o=this;o._config=t,o._index=a,o._model=null,o._rects=null,o._ctx=e,o._el=r};t.merge(_.prototype,{_modelize:function(r,a,n,i){var l,s=this,u=s._index,x=t.toFont(t.resolve([n.font,{}],i,u)),v=t.resolve([n.color,e.defaults.color],i,u);return{align:t.resolve([n.align,"center"],i,u),anchor:t.resolve([n.anchor,"center"],i,u),area:i.chart.chartArea,backgroundColor:t.resolve([n.backgroundColor,null],i,u),borderColor:t.resolve([n.borderColor,null],i,u),borderRadius:t.resolve([n.borderRadius,0],i,u),borderWidth:t.resolve([n.borderWidth,0],i,u),clamp:t.resolve([n.clamp,!1],i,u),clip:t.resolve([n.clip,!1],i,u),color:v,display:r,font:x,lines:a,offset:t.resolve([n.offset,4],i,u),opacity:t.resolve([n.opacity,1],i,u),origin:y(s._el,i),padding:t.toPadding(t.resolve([n.padding,4],i,u)),positioner:(l=s._el,l instanceof e.ArcElement?d:l instanceof e.PointElement?c:l instanceof e.BarElement?h:f),rotation:t.resolve([n.rotation,0],i,u)*(Math.PI/180),size:o(s._ctx,a,x),textAlign:t.resolve([n.textAlign,"start"],i,u),textShadowBlur:t.resolve([n.textShadowBlur,0],i,u),textShadowColor:t.resolve([n.textShadowColor,v],i,u),textStrokeColor:t.resolve([n.textStrokeColor,v],i,u),textStrokeWidth:t.resolve([n.textStrokeWidth,0],i,u)}},update:function(e){var r,o,n,i=this,l=null,s=null,u=i._index,d=i._config,c=t.resolve([d.display,!0],e,u);c&&(r=e.dataset.data[u],o=t.valueOrDefault(t.callback(d.formatter,[r,e]),r),(n=t.isNullOrUndef(o)?[]:a(o)).length&&(s=function(t){var e=t.borderWidth||0,r=t.padding,a=t.size.height,o=t.size.width,n=-o/2,i=-a/2;return{frame:{x:n-r.left-e,y:i-r.top-e,w:o+r.width+2*e,h:a+r.height+2*e},text:{x:n,y:i,w:o,h:a}}}(l=i._modelize(c,n,d,e)))),i._model=l,i._rects=s},geometry:function(){return this._rects?this._rects.frame:{}},rotation:function(){return this._model?this._model.rotation:0},visible:function(){return this._model&&this._model.opacity},model:function(){return this._model},draw:function(t,e){var r,a=t.ctx,o=this._model,i=this._rects;this.visible()&&(a.save(),o.clip&&(r=o.area,a.beginPath(),a.rect(r.left,r.top,r.right-r.left,r.bottom-r.top),a.clip()),a.globalAlpha=n(0,o.opacity,1),a.translate(x(e.x),x(e.y)),a.rotate(o.rotation),v(a,i.frame,o),function(t,e,r,a){var o,n=a.textAlign,i=a.color,l=!!i,s=a.font,u=e.length,d=a.textStrokeColor,c=a.textStrokeWidth,h=d&&c;if(u&&(l||h))for(r=function(t,e,r){var a=r.lineHeight,o=t.w,n=t.x;return"center"===e?n+=o/2:"end"!==e&&"right"!==e||(n+=o),{h:a,w:o,x:n,y:t.y+a/2}}(r,n,s),t.font=s.string,t.textAlign=n,t.textBaseline="middle",t.shadowBlur=a.textShadowBlur,t.shadowColor=a.textShadowColor,l&&(t.fillStyle=i),h&&(t.lineJoin="round",t.lineWidth=c,t.strokeStyle=d),o=0,u=e.length;o<u;++o)b(t,e[o],{stroked:h,filled:l,w:r.w,x:r.x,y:r.y+r.h*o})}(a,o.lines,i.text,o),a.restore())}});var p=Number.MIN_SAFE_INTEGER||-9007199254740991,g=Number.MAX_SAFE_INTEGER||9007199254740991;function m(t,e,r){var a=Math.cos(r),o=Math.sin(r),n=e.x,i=e.y;return{x:n+a*(t.x-n)-o*(t.y-i),y:i+o*(t.x-n)+a*(t.y-i)}}function w(t,e){var r,a,o,n,i,l=g,s=p,u=e.origin;for(r=0;r<t.length;++r)o=(a=t[r]).x-u.x,n=a.y-u.y,i=e.vx*o+e.vy*n,l=Math.min(l,i),s=Math.max(s,i);return{min:l,max:s}}function M(t,e){var r=e.x-t.x,a=e.y-t.y,o=Math.sqrt(r*r+a*a);return{vx:(e.x-t.x)/o,vy:(e.y-t.y)/o,origin:t,ln:o}}var k=function(){this._rotation=0,this._rect={x:0,y:0,w:0,h:0}};function $(t,e,r){var a=e.positioner(t,e),o=a.vx,n=a.vy;if(!o&&!n)return{x:a.x,y:a.y};var i=r.w,l=r.h,s=e.rotation,u=Math.abs(i/2*Math.cos(s))+Math.abs(l/2*Math.sin(s)),d=Math.abs(i/2*Math.sin(s))+Math.abs(l/2*Math.cos(s)),c=1/Math.max(Math.abs(o),Math.abs(n));return u*=o*c,d*=n*c,u+=e.offset*o,d+=e.offset*n,{x:a.x+u,y:a.y+d}}t.merge(k.prototype,{center:function(){var t=this._rect;return{x:t.x+t.w/2,y:t.y+t.h/2}},update:function(t,e,r){this._rotation=r,this._rect={x:e.x+t.x,y:e.y+t.y,w:e.w,h:e.h}},contains:function(t){var e=this,r=e._rect;return!((t=m(t,e.center(),-e._rotation)).x<r.x-1||t.y<r.y-1||t.x>r.x+r.w+2||t.y>r.y+r.h+2)},intersects:function(t){var e,r,a,o=this._points(),n=t._points(),i=[M(o[0],o[1]),M(o[0],o[3])];for(this._rotation!==t._rotation&&i.push(M(n[0],n[1]),M(n[0],n[3])),e=0;e<i.length;++e)if(r=w(o,i[e]),a=w(n,i[e]),r.max<a.min||a.max<r.min)return!1;return!0},_points:function(){var t=this,e=t._rect,r=t._rotation,a=t.center();return[m({x:e.x,y:e.y},a,r),m({x:e.x+e.w,y:e.y},a,r),m({x:e.x+e.w,y:e.y+e.h},a,r),m({x:e.x,y:e.y+e.h},a,r)]}});var C={prepare:function(t){var e,r,a,o,n,i=[];for(e=0,a=t.length;e<a;++e)for(r=0,o=t[e].length;r<o;++r)n=t[e][r],i.push(n),n.$layout={_box:new k,_hidable:!1,_visible:!0,_set:e,_idx:n._index};return i.sort((function(t,e){var r=t.$layout,a=e.$layout;return r._idx===a._idx?a._set-r._set:a._idx-r._idx})),this.update(i),i},update:function(t){var e,r,a,o,n,i=!1;for(e=0,r=t.length;e<r;++e)o=(a=t[e]).model(),(n=a.$layout)._hidable=o&&"auto"===o.display,n._visible=a.visible(),i|=n._hidable;i&&function(t){var e,r,a,o,n,i,l;for(e=0,r=t.length;e<r;++e)(o=(a=t[e]).$layout)._visible&&(l=new Proxy(a._el,{get:(t,e)=>t.getProps([e],!0)[e]}),n=a.geometry(),i=$(l,a.model(),n),o._box.update(i,n,a.rotation()));(function(t,e){var r,a,o,n;for(r=t.length-1;r>=0;--r)for(o=t[r].$layout,a=r-1;a>=0&&o._visible;--a)(n=t[a].$layout)._visible&&o._box.intersects(n._box)&&e(o,n)})(t,(function(t,e){var r=t._hidable,a=e._hidable;r&&a||a?e._visible=!1:r&&(t._visible=!1)}))}(t)},lookup:function(t,e){var r,a;for(r=t.length-1;r>=0;--r)if((a=t[r].$layout)&&a._visible&&a._box.contains(e))return t[r];return null},draw:function(t,e){var r,a,o,n,i,l;for(r=0,a=e.length;r<a;++r)(n=(o=e[r]).$layout)._visible&&(i=o.geometry(),l=$(o._el,o.model(),i),n._box.update(l,i,o.rotation()),o.draw(t,l))}},P="$default";function S(e,r,a,o){if(r){var n,i=a.$context,l=a.$groups;r[l._set]&&(n=r[l._set][l._key])&&!0===t.callback(n,[i,o])&&(e.$datalabels._dirty=!0,a.update(i))}}function I(t,e){var r,a,o=t.$datalabels,n=o._listeners;if(n.enter||n.leave){if("mousemove"===e.type)a=C.lookup(o._labels,e);else if("mouseout"!==e.type)return;r=o._hovered,o._hovered=a,function(t,e,r,a,o){var n,i;(r||a)&&(r?a?r!==a&&(i=n=!0):i=!0:n=!0,i&&S(t,e.leave,r,o),n&&S(t,e.enter,a,o))}(t,n,r,a,e)}}return{id:"datalabels",defaults:{align:"center",anchor:"center",backgroundColor:null,borderColor:null,borderRadius:0,borderWidth:0,clamp:!1,clip:!1,color:void 0,display:!0,font:{family:void 0,lineHeight:1.2,size:void 0,style:void 0,weight:null},formatter:function(e){if(t.isNullOrUndef(e))return null;var r,a,o,n=e;if(t.isObject(e))if(t.isNullOrUndef(e.label))if(t.isNullOrUndef(e.r))for(n="",o=0,a=(r=Object.keys(e)).length;o<a;++o)n+=(0!==o?", ":"")+r[o]+": "+e[r[o]];else n=e.r;else n=e.label;return""+n},labels:void 0,listeners:{},offset:4,opacity:1,padding:{top:4,right:4,bottom:4,left:4},rotation:0,textAlign:"start",textStrokeColor:void 0,textStrokeWidth:0,textShadowBlur:0,textShadowColor:void 0},beforeInit:function(t){t.$datalabels={_actives:[]}},beforeUpdate:function(t){var e=t.$datalabels;e._listened=!1,e._listeners={},e._datasets=[],e._labels=[]},afterDatasetUpdate:function(e,r,a){var o,n,i,l,s,u,d,c,h=r.index,f=e.$datalabels,x=f._datasets[h]=[],y=e.isDatasetVisible(h),v=e.data.datasets[h],b=function(e,r){var a,o,n,i=e.datalabels,l=[];return!1===i?null:(!0===i&&(i={}),r=t.merge({},[r,i]),o=r.labels||{},n=Object.keys(o),delete r.labels,n.length?n.forEach((function(e){o[e]&&l.push(t.merge({},[r,o[e],{_key:e}]))})):l.push(r),a=l.reduce((function(e,r){return t.each(r.listeners||{},(function(t,a){e[a]=e[a]||{},e[a][r._key||P]=t})),delete r.listeners,e}),{}),{labels:l,listeners:a})}(v,a),p=r.meta.data||[],g=e.ctx;for(g.save(),o=0,i=p.length;o<i;++o)if((d=p[o]).$datalabels=[],y&&d&&e.getDataVisibility(o)&&!d.skip)for(n=0,l=b.labels.length;n<l;++n)u=(s=b.labels[n])._key,(c=new _(s,g,d,o)).$groups={_set:h,_key:u||P},c.$context={active:!1,chart:e,dataIndex:o,dataset:v,datasetIndex:h},c.update(c.$context),d.$datalabels.push(c),x.push(c);g.restore(),t.merge(f._listeners,b.listeners,{merger:function(t,e,a){e[t]=e[t]||{},e[t][r.index]=a[t],f._listened=!0}})},afterUpdate:function(t){t.$datalabels._labels=C.prepare(t.$datalabels._datasets)},afterDatasetsDraw:function(t){C.draw(t,t.$datalabels._labels)},beforeEvent:function(t,e){if(t.$datalabels._listened){var r=e.event;switch(r.type){case"mousemove":case"mouseout":I(t,r);break;case"click":!function(t,e){var r=t.$datalabels,a=r._listeners.click,o=a&&C.lookup(r._labels,e);o&&S(t,a,o,e)}(t,r)}}},afterEvent:function(t){var e,r,a,o,n,l,s,u=t.$datalabels,d=u._actives,c=u._actives=t.getActiveElements(),h=i(d,c);for(e=0,r=h.length;e<r;++e)if((n=h[e])[1])for(a=0,o=(s=n[0].element.$datalabels||[]).length;a<o;++a)(l=s[a]).$context.active=1===n[1],l.update(l.$context);(u._dirty||h.length)&&(C.update(u._labels),t.render()),delete u._dirty}}}));
diff --git a/public/javascripts/diffhtml/1.0.0-beta.20/diffhtml.min.js b/public/javascripts/diffhtml/1.0.0-beta.20/diffhtml.min.js
deleted file mode 100644
index d81e24a0881..00000000000
--- a/public/javascripts/diffhtml/1.0.0-beta.20/diffhtml.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):(e=e||self,t(e.diff={}))}(this,function(e){"use strict";function t(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),r.push.apply(r,n)}return r}function r(e){for(var r=1;r<arguments.length;r++){var n=null!=arguments[r]?arguments[r]:{};r%2?t(Object(n),!0).forEach(function(t){i(e,t,n[t])}):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):t(Object(n)).forEach(function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))})}return e}function n(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function a(e,t){for(var r=0;r<t.length;r++){var n=t[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}function o(e,t,r){return t&&a(e.prototype,t),r&&a(e,r),e}function i(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function s(e){return c(e)||d(e)||l(e)||f()}function c(e){if(Array.isArray(e))return u(e)}function d(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function l(e,t){if(e){if("string"==typeof e)return u(e,t);var r=Object.prototype.toString.call(e).slice(8,-1);return"Object"===r&&e.constructor&&(r=e.constructor.name),"Map"===r||"Set"===r?Array.from(e):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?u(e,t):void 0}}function u(e,t){(null==t||t>e.length)&&(t=e.length);for(var r=0,n=new Array(t);r<t;r++)n[r]=e[r];return n}function f(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function h(e,t){var r=String(e);switch(t){case"boolean":return"false"!==r;case"string":return r;case"number":return ie(r,10);case"array":return r.split(",");case"object":return se(r)}}function p(e,t){var r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:typeof t,n=arguments.length>3?arguments[3]:void 0;if(n&&e in n)return n[e];var a="DIFF_".concat(e.replace(/[^a-zA-Z0-9]/,"")).toLowerCase();if(fe){var o=new de(ce.search);if(o.has(a))return h(decodeURIComponent(String(o.get(a))),r)}return he&&a in ae.env?h(ae.env[a],r):t}function v(e,t,n){var a=null;if(Se.protected.has(e)||Se.allocated.has(e))a=e;else if(!e||we(e)){var o=e?e.length:0;n=[];for(var i=0;i<o;i++)e&&n.push(e[i]);a=v(ke,null,n)}if(a)return a;var c="object"==typeof e,d=e;if(e&&c&&"ownerDocument"in d){if(d.nodeType===G.TEXT){var l=v(Re,d.nodeValue);return K.set(l,d),l}t={},n=[];var u=d.attributes;if(d.nodeType===G.ELEMENT&&u&&u.length)for(var f=0;f<u.length;f++){var h=u[f],p=h.name,m=h.value;m===X.STR&&p in d?t[p]=e[p]:t[p]=m}if(d.nodeType===G.ELEMENT||d.nodeType===G.FRAGMENT){n=[];for(var g=0;g<d.childNodes.length;g++){var N=d.childNodes[g];n.push(v(N))}}return K.forEach(function(t,r){t===e&&(a=r)}),a=a||v(d.nodeName,t,n),a.attributes=r(r({},a.attributes),t),a.childNodes=n,K.set(a,d),a}if(c){var b=e.rawNodeName,y=e.nodeName,T=e.nodeValue,E=e.attributes,w=e.childNodes,S=e.children,k=b||y,R=v(k,E||null,S||w);return T&&(R.nodeValue=T),R}for(var O=arguments.length,M=new Array(O>3?O-3:0),x=3;x<O;x++)M[x-3]=arguments[x];M.length&&(n=[n].concat(M)),a=Ee.get();var A=e===Re;"string"==typeof e?(a.rawNodeName=e,a.nodeName=a.rawNodeName.toLowerCase()):(a.rawNodeName=e,a.nodeName=ke),a.nodeValue=X.STR,a.key=X.STR,a.childNodes.length=0,a.attributes={};var C=we(t)||"object"!=typeof t,_=C?t:n,L=we(_)?_:[_];if(A){var I=L.join(X.STR);return a.nodeType=G.TEXT,a.nodeValue=String(I),a}if(a.nodeName===ke?a.nodeType=G.FRAGMENT:a.nodeType="#comment"===e?G.COMMENT:G.ELEMENT,_&&L.length&&(!t||!t.childNodes))for(var D=0;D<L.length;D++){var j=L[D];if(we(j)){var V;(V=a.childNodes).push.apply(V,s(j))}else{if(!j)continue;if(j.nodeType===G.FRAGMENT&&"string"==typeof j.rawNodeName){var P;(P=a.childNodes).push.apply(P,s(j.childNodes))}else j&&"object"==typeof j?a.childNodes.push(v(j)):a.childNodes.push(v(Re,null,j))}}if(t&&"object"==typeof t&&!we(t)&&(a.attributes=r({},t),t.childNodes)){var H="object"==typeof t.childNodes;a.childNodes.push(H?v(t.childNodes):v("#text",t.childNodes))}return"script"===a.nodeName&&a.attributes.src&&(a.key=String(a.attributes.src)),a.attributes&&"key"in a.attributes&&(a.key=String(a.attributes.key)),W.size&&W.forEach(function(e,t){(t=e(a))&&(a=v(t))}),a}function m(e,t){var r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};r.parser||(r.parser={}),t||(t=Ae);var n=new Set(p("rawElements",Le,"array",r.parser)),a=new Set(p("selfClosingElements",Ie,"array",r.parser)),o=/<!--[^]*?(?=-->)-->|<(\/?)([a-z\-\_][a-z0-9\-\_]*)\s*([^>]*?)(\/?)>/gi,i=v("#document-fragment",null,[]),s=[i],c=i,d=-1;if(!e.includes("<")&&e)return Ve(c,e,t),i;for(var l,u,f=0;l=o.exec(e);f++){d>-1&&d+l[0].length<o.lastIndex&&(u=e.slice(d,o.lastIndex-l[0].length))&&Ve(c,u,t);var h=o.lastIndex-l[0].length;if(-1===d&&h>0){var m=e.slice(0,h);m&&!Me.exec(m)&&Ve(c,m,t)}if(d=o.lastIndex,"!"!==l[0][1]){var g=xe.exec(l[2]),N=g&&t.tags[g[1]],b=N?N.name||N:l[2];if(!l[1]&&(!l[4]&&De[c.rawNodeName]&&De[c.rawNodeName][b]&&(s.pop(),c=s[s.length-1]),c=c.childNodes[c.childNodes.push(Pe(l[2],l[3],t))-1],s.push(c),r.parser.strict||n.has(b))){var y="</".concat(b,">"),T=e.indexOf(y,o.lastIndex);if(n.has(b)){-1===T?d=o.lastIndex=e.length+1:(d=T+y.length,o.lastIndex=d,l[1]=" ");var E=e.slice(l.index+l[0].length,T);Ve(c,E,t)}}if(l[1]||l[4]||a.has(b))for(;c;){if("/"===l[4]&&g){s.pop(),c=s[s.length-1];break}if(N&&c.rawNodeName===b){s.pop(),c=s[s.length-1];break}if(c.rawNodeName===b){s.pop(),c=s[s.length-1];break}var w=je[c.rawNodeName];{if(!w||!w[b])break;s.pop(),c=s[s.length-1]}}}}var S=e.slice(-1===d?0:d);if(S&&Ve(c,S,t),i.childNodes.length&&"html"===i.childNodes[0].nodeName){var k={before:[],after:[]},R={after:[]},O=i.childNodes[0],M=!0,x=!0;if(O.childNodes=O.childNodes.filter(function(e){if("body"===e.nodeName||"head"===e.nodeName)return"head"===e.nodeName&&(M=!1),"body"===e.nodeName&&(x=!1),!0;e.nodeType===G.ELEMENT&&(M&&x?k.before.push(e):!M&&x?k.after.push(e):x||R.after.push(e))}),O.childNodes[0]&&"head"===O.childNodes[0].nodeName){var A=O.childNodes[0].childNodes;A.unshift.apply(A,k.before),A.push.apply(A,k.after)}else{var C=v("head",null,[]);if(C){var _=C.childNodes;_.unshift.apply(_,k.before),_.push.apply(_,k.after),O.childNodes.unshift(C)}}if(O.childNodes[1]&&"body"===O.childNodes[1].nodeName){var L=O.childNodes[1].childNodes;L.push.apply(L,R.after)}else{var I=v("body",null,[]);if(I){var D=I.childNodes;D.push.apply(D,R.after),O.childNodes.push(I)}}}return i}function g(e){if(He(e),e.childNodes.length)for(var t=0;t<e.childNodes.length;t++)g(e.childNodes[t])}function N(e){if(Fe(e),e.childNodes.length)for(var t=0;t<e.childNodes.length;t++)N(e.childNodes[t]);K.delete(e)}function b(){Be.allocated.forEach(function(e){Be.free.add(e),Be.allocated.delete(e),K.delete(e)})}function y(e){var t=e.mount,r=e.input,n=r,a=Xe++;return p("collectMetrics",!1)?function(e){e="[".concat(a,"] ").concat(e);var r=t.host;t&&r?e="".concat(r.constructor.name," ").concat(e):n&&"function"==typeof n.rawNodeName&&(e="".concat(n.rawNodeName.name," ").concat(e));var o="".concat(e,"-end");if(Je.has(e)){var i=Je.get(e)||0,s=(performance.now()-i).toFixed(3);Je.delete(e),performance.mark(o),performance.measure("".concat(Ue," ").concat(e," (").concat(s,"ms)"),e,o)}else Je.set(e,performance.now()),performance.mark(e)}:Ge}function T(e){var t=e.state,r=e.state.isRendering;t.measure("schedule"),q.forEach(function(n){var a=n.activeTransaction&&n.activeTransaction.mount,o=e.mount;a&&o&&n.isRendering&&(a.contains&&a.contains(o)||o.contains&&o.contains(a)?(t=n,r=!0):a===o&&(t=n,r=!0))});var n=t,a=n.activeTransaction,o=n.nextTransaction;if(r){var i=e.tasks;t.nextTransaction=e,e.abort();var s=o&&o.promise||a.promise||Promise.resolve();return e.promise=s.then(function(){return e.aborted=!1,e.state.isRendering=!0,e.state.activeTransaction=e,t.measure("schedule"),st.flow(e,i.slice(1))})}t.isRendering=!0,t.activeTransaction=e,t.measure("schedule")}function E(e){var t=e.mount,r=e.input,n=e.state.measure,a=e.config,o=a.inner?"innerHTML":"outerHTML";n("should update");var i=t;if("string"==typeof r&&i[o]===r)return e.abort(!0);n("should update")}function w(e){if(q.has(e)){var t=q.get(e),r=t.mutationObserver,n=t.oldTree;r&&r.disconnect(),q.delete(e),n&&!K.has(n)&&(re.forEach(function(e){return e(n)}),N(n))}if(e){var a=e;if(a.childNodes&&a.childNodes.length)for(var o=0;o<a.childNodes.length;o++)w(a.childNodes[o]);a.shadowRoot&&w(a.shadowRoot),K.forEach(function(e,t){e===a&&(re.forEach(function(e){return e(t)}),N(t))})}}function S(e){var t=e.state,r=e.mount,n=e.input,a=e.config,o=a.inner,i=r,s=i.outerHTML;t.mutationObserver&&!t.isDirty&&(t.isDirty=Boolean(t.mutationObserver.takeRecords().length)),t.previousMarkup!==s&&(t.isDirty=!0),!t.isDirty&&t.oldTree&&s||(w(r),t.oldTree=v(i),g(t.oldTree),q.set(r,t));var c=t.oldTree,d=c.nodeName,l=c.attributes,u=n;if(!o&&u.nodeType===G.FRAGMENT&&t.oldTree.nodeType!==G.FRAGMENT){var f=[];u.childNodes.forEach(function(e){e.nodeType===G.TEXT&&!e.nodeValue.trim()||f.push(e)}),1===f.length?e.newTree=f[0]:f.length>1&&(e.newTree=v(u.childNodes))}e.newTree||(e.newTree=v(n)),e.oldTree=t.oldTree;var h=e.oldTree,p=e.newTree;if(o&&h&&p){var m="string"!=typeof p.rawNodeName,N=p.nodeType===G.FRAGMENT,b=N&&!m?p.childNodes:p;e.newTree=v(d,l,b)}}function k(e,t){var r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:[],n=arguments.length>3&&void 0!==arguments[3]?arguments[3]:{},a=arguments.length>4&&void 0!==arguments[4]&&arguments[4];e||(e=X.OBJ),t||(t=X.OBJ);var o=n.svgElements,i=void 0===o?new Set:o,s=e.nodeName,c=t.nodeName,d=e===X.OBJ||a,l="svg"===c||i.has(t),u=null;if(te.size&&te.forEach(function(n){var a=n(e,t);a&&a===e?u=r:!1===a?u=!1:a&&(t=a)}),null!==u||!t)return u;if(c===Ze){if(s===Ze&&e.nodeValue!==t.nodeValue)return r.push(Y.NODE_VALUE,e,t.nodeValue,e.nodeValue),e.nodeValue=t.nodeValue,r;if(d)return r.push(Y.NODE_VALUE,t,t.nodeValue,null),r}var f=t.childNodes||[];if(t.nodeType===G.ELEMENT){var h=d?X.OBJ:e.attributes,p=t.attributes||{};for(var v in p){var m=p[v];v in h&&h[v]===p[v]||(d||(h[v]=m),(e&&"script"===e.nodeName||"script"!==t.nodeName||"type"!==v)&&r.push(Y.SET_ATTRIBUTE,d?t:e,v,m))}if(!d)for(var g in h)g in p||(r.push(Y.REMOVE_ATTRIBUTE,e,g),delete h[g])}if(a){for(var N=0;N<f.length;N++)l&&i.add(f[N]),k(null,f[N],r,n,!0);return r}for(var b={old:new Map,new:new Map},y=0;y<$e.length;y++){var T=$e[y],E=b[T],w=arguments[y],S=w&&w.childNodes;if(S&&S.length)for(var R=0;R<S.length;R++){var O=S[R];O.key&&E.set(O.key,O)}}for(var M=e.childNodes,x=Ye(f.length,M.length),A=0;A<x;A++){var C=M&&M[A],_=f[A];if((l||_&&"svg"===_.nodeName)&&i.add(_),_)if(C){var L=_.key,I=C.key,D=b.new.has(I),j=b.old.has(L);if(I||L){if(!D&&!j){M.splice(M.indexOf(C),1,_),k(null,_,r,n,!0),r.push(Y.REPLACE_CHILD,_,C),A-=1;continue}if(!D){r.push(Y.REMOVE_CHILD,C),M.splice(M.indexOf(C),1),A-=1;continue}if(L!==I){var V=_;L&&j?(V=b.old.get(L),M.splice(M.indexOf(V),1)):V=_,k(null,V,r,n,!0),r.push(Y.INSERT_BEFORE,e,V,C),M.splice(A,0,V);continue}}var P=C.nodeName===_.nodeName,H=k(C,_,r,n,!P);if(!1!==H){if(!P){M[A]=_;var F=M.lastIndexOf(_);F>A&&M.splice(F,1),r.push(Y.REPLACE_CHILD,_,C)}}else f.splice(A,0,C),x+=1}else M.push(_),k(null,_,r,n,!0),r.push(Y.INSERT_BEFORE,e,_,null);else!1===k(C,null,r,n,!0)&&f.splice(A,0,C)}if(M.length!==f.length){for(var B=f.length;B<M.length;B++)r.push(Y.REMOVE_CHILD,M[B]);M.length=f.length}return r}function R(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:oe.document,r=arguments.length>2?arguments[2]:void 0,n=v(e),a=K.get(n);if(a)return a;var o=n.nodeName,i=n.rawNodeName,s=void 0===i?o:i,c=n.childNodes,d=void 0===c?[]:c;r=r||"svg"===o;var l=null,u=null;if(ee.forEach(function(e){(u=e(n))&&(l=u)}),!t)return l;null===l&&(l="#text"===o?t.createTextNode(n.nodeValue||X.STR):"#document-fragment"===o?t.createDocumentFragment():r?t.createElementNS(qe,s):t.createElement(s),"script"===o&&(l.type="no-execute"));var f=l;K.set(n,f);for(var h=0;h<d.length;h++){var p=R(d[h],t,r);f.appendChild(p)}return f}function O(e){var t=e.state,r=e.state.measure,n=e.oldTree,a=e.newTree,o=e.mount;if(r("sync trees"),n&&a&&n.nodeName!==a.nodeName&&a.nodeType!==G.FRAGMENT){e.patches=[Y.REPLACE_CHILD,a,n],e.oldTree=t.oldTree=a;var i=R(a);q.delete(o),q.set(i,t),e.mount=i,"script"===a.nodeName&&t.scriptsToExecute.set(a,a.attributes.type||X.STR)}else e.patches=k(n||null,a||null,[],t);r("sync trees")}function M(e,t){var r;null===(r=Z.get(e))||void 0===r||r.add(t)}function x(e,t){if(!t&&e){var r;null===(r=Z.get(e))||void 0===r||r.clear()}else if(e&&t){var n;null===(n=Z.get(e))||void 0===n||n.delete(t)}else for(var a=0;a<$.length;a++){var o;null===(o=Z.get($[a]))||void 0===o||o.clear()}}function A(e){for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++)r[n-1]=arguments[n];var a=Z.get(e),o=[];if(!a)return o;var i=r[0],c=i.nodeType===G.ELEMENT;return!a.size||"textChanged"!==e&&!c?o:(a.forEach(function(e){var t=r.map(function(e){return K.get(e)||e}),n=e.apply(void 0,s(t));"object"==typeof n&&n.then&&o.push(n)}),"attached"!==e&&"detached"!==e||i.childNodes.forEach(function(t){o.push.apply(o,s(A.apply(void 0,[e,t].concat(s(r.slice(1))))))}),o)}function C(e){return Ke&&e&&e.indexOf&&e.includes("&")?(Ke.innerHTML=e,Ke.textContent||X.STR):e}function _(e){for(var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:X.OBJ,r=[],n=t.ownerDocument,a=t.svgElements,o=void 0===a?new Set:a,i=e.length,c=0;;){var d=e[c];if(c===i)break;switch(d){case Y.SET_ATTRIBUTE:if("break"===function(){var t=e[c+1],a=e[c+2],i=C(e[c+3]);c+=4;var d=o.has(t),l=R(t,n,d);if(!l)return"break";var u=l.getAttribute(a),f=A("attributeChanged",t,a,u,i);return g(t),f.length?(Promise.all(f).then(function(){return rt(t,l,a,i)}),r.push.apply(r,s(f))):rt(t,l,a,i),"break"}())break;case Y.REMOVE_ATTRIBUTE:if("break"===function(){var t=e[c+1],a=e[c+2];c+=3;var i=o.has(t),d=R(t,n,i);if(!d)return"break";var l=d.getAttribute(a),u=A("attributeChanged",t,a,l,null);return g(t),u.length?(Promise.all(u).then(function(){return nt(d,a)}),r.push.apply(r,s(u))):nt(d,a),"break"}())break;case Y.NODE_VALUE:if("break"===function(){var t=e[c+1],a=e[c+2],i=e[c+3],d=o.has(t);c+=4;var l=R(t,n,d);if(!l)return"break";g(t);var u=A("textChanged",t,i,a);return u.length?(Promise.all(u).then(function(){return at(l,a)}),r.push.apply(r,s(u))):at(l,a),"break"}())break;case Y.INSERT_BEFORE:var l=e[c+1],u=e[c+2],f=e[c+3];c+=4;var h=K.get(l);if(!h)break;var p=o.has(u);g(u);var v=f&&R(f,n,p),m=R(u,n,p);h.insertBefore(m,v||null),r.push.apply(r,s(A("attached",u)));break;case Y.REPLACE_CHILD:if("break"===function(){var t,a,i,d=e[c+1],l=e[c+2];c+=3;var u=o.has(d),f=K.get(l),h=R(d,n,u);if(!f||!f.parentNode)return"break";g(d);var p=null===(t=Z.get("attached"))||void 0===t?void 0:t.size,v=null===(a=Z.get("detached"))||void 0===a?void 0:a.size,m=null===(i=Z.get("replaced"))||void 0===i?void 0:i.size;if(!p&&!v&&!m)return f.parentNode&&(f.parentNode.replaceChild(h,f),N(l)),"break";f.parentNode&&f.parentNode.insertBefore(h,f);var b=[].concat(s(p&&A("attached",d)||X.ARR),s(v&&A("detached",l)||X.ARR),s(m&&A("replaced",l,d)||X.ARR));return b.length?(Promise.all(b).then(function(){f.parentNode&&f.parentNode.removeChild(f),N(l)}),r.push.apply(r,s(b))):(f.parentNode&&f.parentNode.removeChild(f),N(l)),"break"}())break;case Y.REMOVE_CHILD:if("break"===function(){var t=e[c+1];c+=2;var n=K.get(t);if(!n||!n.parentNode)return"break";var a=A("detached",t);return a.length?(Promise.all(a).then(function(){n.parentNode&&n.parentNode.removeChild(n),N(t)}),r.push.apply(r,s(a))):(n.parentNode&&n.parentNode.removeChild(n),N(t)),"break"}())break}}return r}function L(e){var t=e.mount,r=e.state,n=e.patches,a=r.mutationObserver,o=r.measure,i=r.scriptsToExecute;o("patch node");var c=t.ownerDocument,d=e.promises||[];r.ownerDocument=c||oe.document,a&&a.disconnect();var l=function(e){"script"===e.nodeName&&i.set(e,e.attributes.type)};ee.add(l),r.ownerDocument&&d.push.apply(d,s(_(n,r))),ee.delete(l),e.promises=d,o("patch node")}function I(e){var t=e.promises;return t&&t.length?e.promise=Promise.all(t).then(function(){return e.end()}):e.promise=Promise.resolve(e.end())}function D(e){var t=e.state,r=e.input,n=e.config,a=t.measure,o=n.inner;if("string"==typeof r){a("parsing input for new tree");var i,s=m(r,void 0,n),c=s.childNodes;i=v(o?c:c[0]||c),i&&(e.newTree=i),a("parsing input for new tree")}}function j(e){return e.replace(/[&<>]/g,function(e){return"&#".concat(e.charCodeAt(0),";")})}function V(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:X.STR,r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};return r.inner=!0,r.executeScripts=!("executeScripts"in r)||r.executeScripts,r.tasks=r.tasks||ot,st.create(e,t,r).start()}function P(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:X.STR,r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};return r.inner=!1,r.executeScripts=!("executeScripts"in r)||r.executeScripts,r.tasks=r.tasks||ot,st.create(e,t,r).start()}function H(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},r=v(),n=new Set(t.tasks||ot);n.delete(it.endAsPromise),n.add(function(e){return B(e.oldTree)}),t.tasks=s(n),t.inner=!0;var a="";try{a=st.create(r,e,t).start()}catch(e){throw w(r),e}return w(r),a}function F(e){var t=ft(e);return t.length?" "+t.map(function(t){var r=e[t],n=!r,a="object"==typeof r||"function"==typeof r;return"".concat(t).concat(n||a?"":'="'.concat(String(r),'"'))}).join(" "):""}function B(e){var t="";if(!e)return t;var r=e.childNodes,n=e.nodeType,a=e.nodeName,o=e.nodeValue,i=e.attributes;if(11===n)for(var s=0;s<r.length;s++)t+=B(r[s]);else if(r.length||1!==n){if(3===n)t+=o;else if(r.length){var c=r.map(function(e){return"".concat(B(e))}).join("");t+="<".concat(a).concat(F(i),">").concat(c,"</").concat(a,">")}}else t+="<".concat(a).concat(F(i),"></").concat(a,">");return t}function z(e){for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++)r[n-1]=arguments[n];var a=v("#text",X.STR);if(!e)return a;if("string"==typeof e&&(e=[e]),1===e.length&&!r.length){if(!e[0])return a;var o=p("strict",!1,"boolean",{strict:z[ut]});delete z[ut];var i=m(e[0],void 0,{parser:{strict:o}}),s=i.childNodes;return v(1===s.length?s[0]:s)}var c=X.STR,d={attributes:{},children:{},tags:{}};e.forEach(function(e,t){if(c+=e,r.length){var n=vt(r),a=c.trim().slice(-1),o=c.lastIndexOf(">")<c.lastIndexOf("<"),i=Boolean(a.match(pt)),s="object"==typeof n,l="".concat(Oe).concat(t,"__");i?(d.tags[t]=n,c+=l):o?(d.attributes[t]=n,c+=l):ht(n)||s?(d.children[t]=v(n),c+=l):n&&(c+=n)}});var l=p("strict",!1,"boolean",{strict:z[ut]}),u=m(c,d,{parser:{strict:l}}),f=u.childNodes;return v(1===f.length?f[0]:f)}function U(e){z[ut]=!0;for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++)r[n-1]=arguments[n];return z.apply(void 0,[e].concat(r))}function J(e){var t="function"==typeof e,r=e.subscribe,n=e.unsubscribe,a=e.createTreeHook,o=e.createNodeHook,i=e.syncTreeHook,s=e.releaseHook,c=e.parseHook;return t&&Q.add(e),r&&r(dt),a&&W.add(a),o&&ee.add(o),i&&te.add(i),s&&re.add(s),c&&ne.add(c),function(){t&&Q.delete(e),n&&n(dt),a&&W.delete(a),o&&ee.delete(o),i&&te.delete(i),s&&re.delete(s),c&&ne.delete(c)}}var G={ELEMENT:1,ATTR:2,TEXT:3,COMMENT:8,FRAGMENT:11},X={STR:"",NUM:1,OBJ:{},ARR:[],MAP:new Map,SET:new Set,DOM:{}},Y={SET_ATTRIBUTE:0,REMOVE_ATTRIBUTE:1,NODE_VALUE:2,INSERT_BEFORE:3,REPLACE_CHILD:4,REMOVE_CHILD:5},$=["attached","detached","replaced","attributeChanged","textChanged"],Z=new Map([["attached",new Set],["detached",new Set],["replaced",new Set],["attributeChanged",new Set],["textChanged",new Set]]),q=new Map,K=new Map,Q=new Set,W=new Set,ee=new Set,te=new Set,re=new Set,ne=new Set,ae="undefined"!=typeof process?process:{env:{NODE_ENV:"development"},argv:[]},oe="object"==typeof global?global:window||{},ie=Number.parseInt,se=JSON.parse,ce=oe.location,de=oe.URLSearchParams,le=void 0!==de,ue=void 0!==ce,fe=le&&ue,he=ae.env,pe={collectMetrics:!0,executeScripts:!0},ve=p("initialPoolSize",5e3),me=new Set,ge=new Set,Ne=new Set,be=function(){return{rawNodeName:X.STR,nodeName:X.STR,nodeValue:X.STR,nodeType:G.ELEMENT,key:X.STR,childNodes:[],attributes:{}}},ye={free:me,allocated:ge,protected:Ne},Te=me.values(),Ee={size:ve,memory:ye,fill:function(){for(var e=this,t=me.size;t<this.size;t++)me.add(be());this.size<me.size&&me.forEach(function(t){me.size!==e.size&&me.delete(t)})},get:function(){var e=Te.next(),t=e.value,r=void 0===t?be():t;return e.done&&(Te=me.values()),me.delete(r),ge.add(r),r},protect:function(e){ge.delete(e),Ne.add(e)},unprotect:function(e){Ne.has(e)?(Ne.delete(e),me.add(e)):ge.has(e)&&(ge.delete(e),me.add(e))}};Ee.fill();var we=Array.isArray,Se=Ee.memory,ke="#document-fragment",Re="#text",Oe="__DIFFHTML__",Me=/<!DOCTYPE.*>/i,xe=new RegExp("".concat(Oe,"([^_]*)__")),Ae={tags:[],attributes:{},children:{}},Ce=Object.assign,_e=Array.isArray,Le=["script","noscript","style","template"],Ie=["meta","img","link","input","area","br","hr","area","base","br","col","embed","hr","img","input","link","meta","param","source","track","wbr"],De={li:{li:!0},p:{p:!0,div:!0},td:{td:!0,th:!0},th:{td:!0,th:!0}},je={li:{ul:!0,ol:!0},a:{div:!0},b:{div:!0},i:{div:!0},p:{div:!0},td:{tr:!0,table:!0},th:{tr:!0,table:!0}},Ve=function(e,t,r){var n;if(!("childNodes"in e.attributes)){if(t&&!Me.test(t)&&!xe.test(t))return e.childNodes.push(v("#text",t));for(var a=[],o=t.split(xe),i=0;i<o.length;i++){var c=o[i];if(c)if(i%2==1){var d=r.children[c],l=c in r.children?d:v("#text","".concat(Oe).concat(c,"__"));if(!l)continue;var u=l.nodeType===G.FRAGMENT;"string"==typeof l.rawNodeName&&u?a.push.apply(a,s(l.childNodes)):a.push(l)}else Me.test(c)||a.push(v("#text",c))}(n=e.childNodes).push.apply(n,a)}},Pe=function(e,t,r,n){var a=null,o=/([_@$#a-z][^\s\x00-\x1F"'>\/=\uFDD0-\uFDEF\uFFFE\uFFFF]*)\s*(=\s*("([^"]+)"|'([^']+)'|(\S+)))?/gi;if(a=xe.exec(e))return Pe(r.tags[a[1]],t,r);for(var i,s={};i=o.exec(t||X.STR);){var c="string"==typeof e,d=i[1],l=void 0;if(""===d){var u=t.match(xe);l=u?u[0]:""}var f=i[6]||i[5]||i[4],h=l||f||(c?i[1]:f||!0),p=String(h).match(xe);if(p&&p.length)for(var m=String(h).split(xe),g=xe.exec(d),N=g?r.attributes[g[1]]:d,b=0;b<m.length;b++){var y=m[b];if(y)if(b%2==1){var T="object"==typeof N,E=r.attributes[y],w="".concat(Oe).concat(y,"__");s[N]?s[N]+=y in r.attributes?E:w:T?N&&!_e(N)&&Ce(s,N):N&&(s[N]=y in r.attributes?E:w)}else s[N]?s[N]+=y:s[N]=y}else if(p=xe.exec(d)){var S=r.attributes[p[1]];"object"!=typeof S||_e(S)?s[S]=X.STR:Ce(s,S)}else s[d]="''"===h||'""'===h?X.STR:h}return v(e,s,s.childNodes||[])},He=Ee.protect,Fe=Ee.unprotect,Be=Ee.memory,ze=Object.freeze({__proto__:null,protectVTree:g,unprotectVTree:N,gc:b}),Ue="diffHTML",Je=new Map,Ge=function(){},Xe=0,Ye=Math.max,$e=["old","new"],Ze="#text",qe="http://www.w3.org/2000/svg",Ke=oe.document?document.createElement("div"):null,Qe=Object.keys,We=new Set,et=new Set,tt=["class","checked","disabled","selected"],rt=function(e,t,r,n){var a="object"==typeof n&&n,o="function"==typeof n,i="symbol"==typeof n,s=0===r.indexOf("on"),c=s?r.toLowerCase():r,d=e.nodeName+"-"+c,l=t;if(et.has(d))t[c]=n;else if(!We.has(d))try{t[c]=n,et.add(d)}catch(e){We.add(d)}if(a||o||i){if(a&&"style"===c)for(var u=Qe(n),f=0;f<u.length;f++)l.style[u[f]]=n[u[f]]}else{var h=null===n||void 0===n;c&&l.setAttribute(c,h?X.STR:n)}},nt=function(e,t){var r=0===t.indexOf("on");e.removeAttribute(t);var n=e.nodeName+"-"+t;if(et.has(n)){var a=e;r?a[t]=void 0:delete a[t],tt.includes(t)&&(e[t]=!1)}else if(!We.has(n))try{var o=e;r?o[t]=void 0:delete o[t],tt.includes(t)&&(e[t]=!1),et.add(n)}catch(e){We.add(n)}},at=function(e,t){var r=e;t.includes("&")?r.nodeValue=C(t):r.nodeValue=t},ot=[T,E,S,O,L,I],it={schedule:T,shouldUpdate:E,reconcileTrees:S,syncTrees:O,patchNode:L,endAsPromise:I},st=function(){function e(t,r,a){var o=this;n(this,e),i(this,"state",X.OBJ),i(this,"mount",X.OBJ),i(this,"input",X.OBJ),i(this,"oldTree",void 0),i(this,"newTree",void 0),i(this,"promise",void 0),i(this,"promises",void 0),i(this,"tasks",[]),i(this,"patches",[]),this.mount=t,this.input=r,this.config=a;var s=function(){return o.state.isDirty=!0},c="MutationObserver"in(oe.window||X.OBJ);this.state=q.get(t)||{measure:y(this),svgElements:new Set,scriptsToExecute:new Map,activeTransaction:this,mutationObserver:c&&new oe.window.MutationObserver(s)},this.tasks=p("tasks",ot,void 0,a).slice(),this.endedCallbacks=new Set,q.set(t,this.state)}return o(e,[{key:"start",value:function(){var t=this.state.measure,r=this.tasks,n=r.pop();return t("render"),this.aborted=!1,e.invokeMiddleware(this),n&&r.push(n),e.flow(this,r)}},{key:"abort",value:function(e){if(this.aborted=!0,e)return this.tasks[this.tasks.length-1](this)}},{key:"end",value:function(){var e=this,t=this.state,r=this.config,n=this.mount,a=t.mutationObserver,o=t.measure,i=t.svgElements,s=t.scriptsToExecute,c=n;return o("finalize"),this.completed=!0,i.clear(),t.isRendering=!1,t.isDirty=!1,c.ownerDocument&&a?a.observe(c,{subtree:!0,childList:!0,attributes:!0,characterData:!0}):t.isDirty=!0,s.forEach(function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:X.STR,t=arguments.length>1?arguments[1]:void 0,r=K.get(t);e?r.setAttribute("type",e):r.removeAttribute("type")}),t.previousMarkup="outerHTML"in c?c.outerHTML:X.STR,r.executeScripts&&s.forEach(function(e,r){var n=K.get(r),a=n.cloneNode(!0);n&&(q.has(n)&&(w(n),q.set(a,t)),K.set(r,a),n.parentNode&&n.parentNode.replaceChild(a,n))}),s.clear(),Ee.memory.free.size<2*Ee.memory.allocated.size&&b(),this.endedCallbacks.forEach(function(t){return t(e)}),this.endedCallbacks.clear(),o("finalize"),o("render"),this}},{key:"onceEnded",value:function(e){this.endedCallbacks.add(e)}}],[{key:"create",value:function(t,r,n){return new e(t,r,n)}},{key:"flow",value:function(e,t){for(var r=e,n=0;n<t.length;n++){if(e.aborted)return r;if(void 0!==(r=t[n](e))&&r!==e)return r}return r}},{key:"assert",value:function(e){}},{key:"invokeMiddleware",value:function(e){var t=e.state.measure,r=e.tasks;Q.forEach(function(n){var a="invoke ".concat(n.name||"anon");t(a);var o=n(e);o&&r.push(o),t(a)})}}]),e}(),ct={StateCache:q,NodeCache:K,TransitionCache:Z,MiddlewareCache:Q,CreateTreeHookCache:W,CreateNodeHookCache:ee,SyncTreeHookCache:te,ReleaseHookCache:re,ParseHookCache:ne},dt=r({decodeEntities:C,escape:j,makeMeasure:y,memory:ze,Pool:Ee,process:ae,PATCH_TYPE:Y,globalConfig:pe,createNode:R,syncTree:k,Transaction:st,defaultTasks:ot,tasks:it},ct),lt=Symbol.for("diffHTML"),ut=Symbol.for("diff.strict"),ft=Object.keys,ht=Array.isArray,pt=/(<|\/)/,vt=function(e){var t=e.shift();return"string"==typeof t?j(C(t)):t};delete z[ut],z.strict=U;ot.splice(ot.indexOf(S),0,D),dt.parse=m,dt.VERSION="1.0.0-beta.20";var mt={};mt.VERSION="1.0.0-beta.20",mt.addTransitionState=M,mt.removeTransitionState=x,mt.release=w,mt.createTree=v,mt.use=J,mt.outerHTML=P,mt.innerHTML=V,mt.toString=H,mt.html=z,mt.Internals=dt;var gt=oe;if(lt in oe){var Nt=gt[lt];"1.0.0-beta.20"!==Nt.VERSION&&console.log("Loaded ".concat("1.0.0-beta.20"," after ").concat(Nt.VERSION))}gt[lt]=mt,gt.devTools&&(gt.unsubscribeDevTools=J(gt.devTools(dt))),e.Internals=dt,e.VERSION="1.0.0-beta.20",e.addTransitionState=M,e.createTree=v,e.default=mt,e.html=z,e.innerHTML=V,e.outerHTML=P,e.release=w,e.removeTransitionState=x,e.toString=H,e.use=J,Object.defineProperty(e,"__esModule",{value:!0})});
\ No newline at end of file
diff --git a/public/javascripts/diffhtml/1.0.0-beta.29/diffhtml.min.js b/public/javascripts/diffhtml/1.0.0-beta.29/diffhtml.min.js
new file mode 100644
index 00000000000..327295e7eaa
--- /dev/null
+++ b/public/javascripts/diffhtml/1.0.0-beta.29/diffhtml.min.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):(e="undefined"!=typeof globalThis?globalThis:e||self,t(e.diff={}))}(this,function(e){"use strict";function t(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),r.push.apply(r,n)}return r}function r(e){for(var r=1;r<arguments.length;r++){var n=null!=arguments[r]?arguments[r]:{};r%2?t(Object(n),!0).forEach(function(t){i(e,t,n[t])}):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):t(Object(n)).forEach(function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))})}return e}function n(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function a(e,t){for(var r=0;r<t.length;r++){var n=t[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}function o(e,t,r){return t&&a(e.prototype,t),r&&a(e,r),Object.defineProperty(e,"prototype",{writable:!1}),e}function i(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function s(e,t){return d(e)||f(e,t)||h(e,t)||m()}function c(e){return l(e)||u(e)||h(e)||v()}function l(e){if(Array.isArray(e))return p(e)}function d(e){if(Array.isArray(e))return e}function u(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function f(e,t){var r=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=r){var n,a,o=[],i=!0,s=!1;try{for(r=r.call(e);!(i=(n=r.next()).done)&&(o.push(n.value),!t||o.length!==t);i=!0);}catch(e){s=!0,a=e}finally{try{i||null==r.return||r.return()}finally{if(s)throw a}}return o}}function h(e,t){if(e){if("string"==typeof e)return p(e,t);var r=Object.prototype.toString.call(e).slice(8,-1);return"Object"===r&&e.constructor&&(r=e.constructor.name),"Map"===r||"Set"===r?Array.from(e):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?p(e,t):void 0}}function p(e,t){(null==t||t>e.length)&&(t=e.length);for(var r=0,n=new Array(t);r<t;r++)n[r]=e[r];return n}function v(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function m(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function g(e,t){var r=String(e);switch(t){case"boolean":return"false"!==r;case"string":return r;case"number":return fe(r,10);case"object":return he(r)}}function b(e,t){var r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:typeof t,n=arguments.length>3?arguments[3]:void 0,a=ue.location,o=ue.URLSearchParams,i=void 0!==o,s=void 0!==a,c=i&&s,l=de.env;if(n&&e in n)return n[e];var d="DIFF_".concat(e.replace(/[^a-zA-Z0-9]/,""));if(c){var u=new o(a.search),f=d.toLowerCase();if(u.has(f))return g(decodeURIComponent(String(u.get(f))),r)}var h=d.toUpperCase();return l&&h in de.env?g(de.env[h.toUpperCase()],r):t}function N(e){for(var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:[],r=0;r<e.length;r++){var n=e[r];n&&n.rawNodeName===Oe?N(n.childNodes,t):n&&t.push(n)}return t}function y(e,t,n){var a=null;if(Se.protected.has(e)||Se.allocated.has(e))a=e;else if(!e||we(e)){var o=e?e.length:0;n=[];for(var i=0;i<o;i++){var s=e&&!e[i];s||e&&n.push(e[i])}a=y(Oe,null,n)}if(a)return a;var l="object"==typeof e,d=e;if(e&&l&&"ownerDocument"in d){if(d.nodeType===K.TEXT){var u=y(ke,d.nodeValue);return ne.set(u,d),u}t={},n=[];var f=d.attributes;if(d.nodeType===K.ELEMENT&&f&&f.length)for(var h=0;h<f.length;h++){var p=f[h],v=p.name,m=p.value;m===Q.STR&&v in d?t[v]=e[v]:t[v]=m}if(d.nodeType===K.ELEMENT||d.nodeType===K.FRAGMENT){n=[];for(var g=0;g<d.childNodes.length;g++){var b=d.childNodes[g];n.push(y(b))}}return ne.forEach(function(t,r){t===e&&(a=r)}),a=a||y(d.nodeName,t,n),a.attributes=r(r({},a.attributes),t),a.childNodes=n,ne.set(a,d),a}if(l){var T=e.rawNodeName,E=e.nodeName,w=e.nodeValue,S=e.attributes,O=e.childNodes,k=e.children,R=T||E,x=y(R,S||null,k||O);return w&&(x.nodeValue=w),x}for(var C=arguments.length,M=new Array(C>3?C-3:0),A=3;A<C;A++)M[A-3]=arguments[A];M.length&&(n=[n].concat(M)),a=Ee.get();var I=e===ke;"string"==typeof e?(a.rawNodeName=e,a.nodeName=a.rawNodeName.toLowerCase()):(a.rawNodeName=e,a.nodeName=Oe),a.nodeValue=Q.STR,a.key=Q.STR,a.childNodes.length=0,a.attributes={};var _=we(t)||"object"!=typeof t,D=_?t:n,L=N(we(D)?D:[D]);if(I){var j=L.join(Q.STR);return a.nodeType=K.TEXT,a.nodeValue=String(j),a}if(a.nodeName===Oe?a.nodeType=K.FRAGMENT:a.nodeType="#comment"===e?K.COMMENT:K.ELEMENT,D&&L.length&&(!t||!t.childNodes))for(var V=0;V<L.length;V++){var P=L[V];if(we(P)){var F;(F=a.childNodes).push.apply(F,c(P))}else{if(!P)continue;if(P.nodeType===K.FRAGMENT&&"string"==typeof P.rawNodeName){var H;(H=a.childNodes).push.apply(H,c(P.childNodes))}else P&&"object"==typeof P?a.childNodes.push(y(P)):a.childNodes.push(y(ke,null,P))}}if(t&&"object"==typeof t&&!we(t)&&(a.attributes=r({},t),t.childNodes)){var B="object"==typeof t.childNodes;a.childNodes.push(B?y(t.childNodes):y("#text",t.childNodes))}return"script"===a.nodeName&&a.attributes.src&&(a.key=String(a.attributes.src)),a.attributes&&"key"in a.attributes&&(a.key=String(a.attributes.key)),oe.size&&oe.forEach(function(e,t){(t=e(a))&&(a=y(t))}),a}function T(e,t){var r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};r.parser||(r.parser={}),t||(t=Me);var n=new Set(b("rawElements",_e,"array",r.parser)),a=new Set(b("selfClosingElements",De,"array",r.parser)),o=/<!--[^]*?(?=-->)-->|<(\/?)([a-z\-\_][a-z0-9\-\_]*)\s*([^>]*?)(".*?"|'.*?')?(\/?)>/gi,i=y("#document-fragment",null,[]),c=[i],l=i,d=-1;if(!e.includes("<")&&e)return Ve(l,e,t),i;for(var u,f,h=0;u=o.exec(e);h++){var p=u,v=s(p,6),m=v[0],g=v[1],N=v[2],T=v[3],E=v[4],w=v[5];d>-1&&d+m.length<o.lastIndex&&(f=e.slice(d,o.lastIndex-m.length))&&Ve(l,f,t);var S=o.lastIndex-m.length;if(-1===d&&S>0){var O=e.slice(0,S);O&&!xe.exec(O)&&Ve(l,O,t)}if(d=o.lastIndex,"!"!==u[0][1]){var k=Ce.exec(N),R=k&&t.tags[k[1]],x=R?R.name||R:N,C=void 0;if(!g){!u[4]&&Le[l.rawNodeName]&&Le[l.rawNodeName][x]&&(c.pop(),l=c[c.length-1]);var M=T+(E||"");if(l=l.childNodes[l.childNodes.push(Pe(N,M,t))-1],c.push(l),r.parser.strict||n.has(x)){var A="</".concat(x,">"),I=e.indexOf(A,o.lastIndex);if(n.has(x)){-1===I?d=o.lastIndex=e.length+1:(d=I+A.length,o.lastIndex=d,C=!0);var _=e.slice(u.index+m.length,I);Ve(l,_,t)}}}if(C||g||w||a.has(x))for(;l;){if("/"===w&&k){c.pop(),l=c[c.length-1];break}if(R&&l.rawNodeName===x){c.pop(),l=c[c.length-1];break}if(l.rawNodeName===x){c.pop(),l=c[c.length-1];break}var D=je[l.rawNodeName];{if(!D||!D[x])break;c.pop(),l=c[c.length-1]}}}}var L=e.slice(-1===d?0:d);if(L&&Ve(l,L,t),i.childNodes.length&&"html"===i.childNodes[0].nodeName){var j={before:[],after:[]},V={after:[]},P=i.childNodes[0],F=!0,H=!0;if(P.childNodes=P.childNodes.filter(function(e){if("body"===e.nodeName||"head"===e.nodeName)return"head"===e.nodeName&&(F=!1),"body"===e.nodeName&&(H=!1),!0;e.nodeType===K.ELEMENT&&(F&&H?j.before.push(e):!F&&H?j.after.push(e):H||V.after.push(e))}),P.childNodes[0]&&"head"===P.childNodes[0].nodeName){var B=P.childNodes[0].childNodes;B.unshift.apply(B,j.before),B.push.apply(B,j.after)}else{var z=y("head",null,[]);if(z){var U=z.childNodes;U.unshift.apply(U,j.before),U.push.apply(U,j.after),P.childNodes.unshift(z)}}if(P.childNodes[1]&&"body"===P.childNodes[1].nodeName){var J=P.childNodes[1].childNodes;J.push.apply(J,V.after)}else{var G=y("body",null,[]);if(G){var X=G.childNodes;X.push.apply(X,V.after),P.childNodes.push(G)}}}return i}function E(e){var t=e.mount,r=e.input,n=r,a=Be++;return b("collectMetrics",!1)?function(e){e="[".concat(a,"] ").concat(e);var r=t.host;t&&r?e="".concat(r.constructor.name," ").concat(e):n&&"function"==typeof n.rawNodeName&&(e="".concat(n.rawNodeName.name," ").concat(e));var o="".concat(e,"-end");if(He.has(e)){var i=He.get(e)||0,s=(performance.now()-i).toFixed(3);He.delete(e),performance.mark(o),performance.measure("".concat(Fe," ").concat(e," (").concat(s,"ms)"),e,o)}else He.set(e,performance.now()),performance.mark(e)}:Q.FUN}function w(e){if(ze(e),e.childNodes.length)for(var t=0;t<e.childNodes.length;t++)w(e.childNodes[t])}function S(e){if(e.childNodes.length)for(var t=0;t<e.childNodes.length;t++)S(e.childNodes[t]);ne.delete(e),Ue(e)}function O(){Je.allocated.forEach(function(e){e.attributes={},e.childNodes.length=0,Je.free.add(e),Je.allocated.delete(e),ne.delete(e)})}function k(e){var t=e.state,r=e.state.isRendering;t.measure("schedule"),re.forEach(function(n){var a=n.activeTransaction&&n.activeTransaction.mount,o=e.mount;a&&o&&n.isRendering&&(a.contains&&a.contains(o)||o.contains&&o.contains(a)?(t=n,r=!0):a===o&&(t=n,r=!0))});var n=t,a=n.activeTransaction,o=n.nextTransaction;if(r){var i=e.tasks;t.nextTransaction=e,e.abort();var s=o&&o.promise||a.promise||Promise.resolve();return e.promise=s.then(function(){return e.aborted=!1,e.state.isRendering=!0,e.state.activeTransaction=e,t.measure("schedule"),pt.flow(e,i.slice(1))})}t.isRendering=!0,t.activeTransaction=e,t.measure("schedule")}function R(e){var t=e.mount,r=e.input,n=e.state.measure,a=e.config,o=a.inner?"innerHTML":"outerHTML";n("should update");var i=t;if("string"==typeof r&&i[o]===r)return e.abort(!0);n("should update")}function x(e){if(re.has(e)){var t=re.get(e),r=t.mutationObserver,n=t.oldTree;r&&r.disconnect(),n&&!ne.has(n)&&(ce.forEach(function(e){return e(n)}),S(n)),re.delete(e)}if(e){var a=e;if(a.childNodes&&a.childNodes.length)for(var o=0;o<a.childNodes.length;o++)x(a.childNodes[o]);a.shadowRoot&&x(a.shadowRoot),ne.forEach(function(e,t){e===a&&(ce.forEach(function(e){return e(t)}),S(t))}),$e(qe),qe=Ye(O)}}function C(e){var t=e.state,r=e.mount,n=e.input,a=e.config,o=a.inner,i=r;t.mutationObserver&&!t.isDirty?t.isDirty=Boolean(t.mutationObserver.takeRecords().length):t.mutationObserver||(t.isDirty=!1),!t.isDirty&&t.oldTree||(x(i),i.ownerDocument&&t.mutationObserver&&t.mutationObserver.observe(i,{subtree:!0,childList:!0,attributes:!0,characterData:!0}),t.oldTree=y(i),w(t.oldTree),re.set(r,t));var s=t.oldTree,c=s.nodeName,l=s.attributes;e.newTree||(e.newTree=y(n));var d=e.newTree;if(!o&&d.nodeType===K.FRAGMENT&&t.oldTree.nodeType!==K.FRAGMENT){for(var u=[],f=0;f<d.childNodes.length;f++){var h=d.childNodes[f];h.nodeType===K.TEXT&&!h.nodeValue.trim()||u.push(h)}1===u.length?e.newTree=u[0]:u.length>1&&(e.newTree=y(d.childNodes))}e.oldTree=t.oldTree;var p=e.oldTree,v=e.newTree;if(o&&p&&v){var m="string"!=typeof v.rawNodeName,g=v.nodeType===K.FRAGMENT,b=g&&!m?v.childNodes:v;e.newTree=y(c,l,b)}}function M(e,t){var r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:[],n=arguments.length>3&&void 0!==arguments[3]?arguments[3]:{},a=arguments.length>4&&void 0!==arguments[4]?arguments[4]:Q.OBJ,o=arguments.length>5?arguments[5]:void 0;e||(e=Q.OBJ),t||(t=Q.OBJ);var i=n.svgElements,s=void 0===i?new Set:i,c=e.nodeName,l=t.nodeName,d=e===Q.OBJ||o,u="svg"===l||s.has(t),f=null;if(se.size&&se.forEach(function(n){var o=n(e,t,a);o&&o===e?f=r:!1===o?f=!1:o&&(t=o)}),null!==f||!t)return f;if(l===Qe){if(c===Qe&&e.nodeValue!==t.nodeValue)return r.push(W.NODE_VALUE,e,t.nodeValue,e.nodeValue),e.nodeValue=t.nodeValue,r;if(d)return r.push(W.NODE_VALUE,t,t.nodeValue,null),r}var h=t.childNodes||[];if(t.nodeType===K.ELEMENT){var p=d?Q.OBJ:e.attributes,v=t.attributes||{};for(var m in v){var g=v[m];m in p&&p[m]===v[m]||(d||(p[m]=g),(e&&"script"===e.nodeName||"script"!==t.nodeName||"type"!==m)&&r.push(W.SET_ATTRIBUTE,d?t:e,m,g))}if(!d)for(var b in p)b in v||(r.push(W.REMOVE_ATTRIBUTE,e,b),delete p[b])}if(o){for(var N=0;N<h.length;N++)u&&s.add(h[N]),M(null,h[N],r,n,a,!0);return r}for(var y={old:new Map,new:new Map},T=0;T<Ke.length;T++){var E=Ke[T],w=y[E],S=arguments[T],O=S&&S.childNodes;if(O&&O.length)for(var k=0;k<O.length;k++){var R=O[k];R.key&&w.set(R.key,R)}}for(var x=e.childNodes||[],C=Ze(h.length,x.length),A=0;A<C;A++){var I=x&&x[A],_=h[A];if((u||_&&"svg"===_.nodeName)&&s.add(_),_)if(I){var D=_.key,L=I.key,j=y.new.has(L),V=y.old.has(D);if(L||D){if(!j&&!V){x.splice(x.indexOf(I),1,_),M(null,_,r,n,a,!0),r.push(W.REPLACE_CHILD,_,I),A-=1;continue}if(!j){r.push(W.REMOVE_CHILD,I),x.splice(x.indexOf(I),1),A-=1;continue}if(D!==L){var P=_;D&&V?(P=y.old.get(D),x.splice(x.indexOf(P),1)):P=_,M(null,P,r,n,a,!0),r.push(W.INSERT_BEFORE,e,P,I),x.splice(A,0,P);continue}}var F=I.nodeName===_.nodeName,H=M(I,_,r,n,a,!F);if(!1!==H){if(!F){x[A]=_;var B=x.lastIndexOf(_);B>A&&x.splice(B,1),r.push(W.REPLACE_CHILD,_,I)}}else h.splice(A,0,I),C+=1}else x.push(_),M(null,_,r,n,a,!0),r.push(W.INSERT_BEFORE,e,_,null);else!1===M(I,null,r,n,a,!0)&&h.splice(A,0,I)}if(x.length!==h.length){for(var z=h.length;z<x.length;z++)r.push(W.REMOVE_CHILD,x[z]);x.length=h.length}return r}function A(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:ue.document,r=arguments.length>2?arguments[2]:void 0,n=y(e),a=ne.get(n);if(a)return a;var o=n.nodeName,i=n.rawNodeName,s=void 0===i?o:i,c=n.childNodes,l=void 0===c?[]:c;r=r||"svg"===o;var d=null,u=null;if(ie.forEach(function(e){(u=e(n))&&(d=u)}),!t)return d;var f=d;f||(f="#text"===o?t.createTextNode(n.nodeValue||Q.STR):"#document-fragment"===o?t.createDocumentFragment():r?t.createElementNS(We,s):t.createElement(s),"script"===o&&(f.type="no-execute")),ne.set(n,f);for(var h=0;h<l.length;h++){var p=A(l[h],t,r);f&&p&&f.appendChild(p)}return f}function I(e){var t=e.state,r=e.state.measure,n=e.oldTree,a=e.newTree,o=e.mount;if(r("sync trees"),n&&a&&n.nodeName!==a.nodeName&&a.nodeType!==K.FRAGMENT){e.patches=[W.REPLACE_CHILD,a,n],e.oldTree=t.oldTree=a;var i=A(a);re.delete(o),re.set(i,t),e.mount=i,"script"===a.nodeName&&t.scriptsToExecute.set(a,a.attributes.type||Q.STR)}else e.patches=M(n||null,a||null,[],t,e);r("sync trees")}function _(e,t){var r;null===(r=te.get(e))||void 0===r||r.add(t)}function D(e,t){if(!t&&e){var r;null===(r=te.get(e))||void 0===r||r.clear()}else if(e&&t){var n;null===(n=te.get(e))||void 0===n||n.delete(t)}else for(var a=0;a<ee.length;a++){var o;null===(o=te.get(ee[a]))||void 0===o||o.clear()}}function L(e){for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++)r[n-1]=arguments[n];var a=te.get(e),o=[];if(!a)return o;var i=r[0],s=i.nodeType===K.ELEMENT;return!a.size||"textChanged"!==e&&!s?o:(a.forEach(function(e){var t=r.map(function(e){return ne.get(e)||e}),n=e.apply(void 0,c(t));"object"==typeof n&&n.then&&o.push(n)}),"attached"!==e&&"detached"!==e||i.childNodes.forEach(function(t){o.push.apply(o,c(L.apply(void 0,[e,t].concat(c(r.slice(1))))))}),o)}function j(e){return et&&e&&e.indexOf&&e.includes("&")?(et.innerHTML=e,et.textContent||Q.STR):e}function V(e){for(var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:Q.OBJ,r=[],n=t.ownerDocument,a=t.svgElements,o=void 0===a?new Set:a,i=e.length,s=0;;){var l=e[s];if(s===i)break;switch(l){case W.REMOVE_ATTRIBUTE:case W.SET_ATTRIBUTE:if("break"===function(){var t=l===W.SET_ATTRIBUTE,a=e[s+1],i=e[s+2],d=t?j(e[s+3]):null;s+=t?4:3;var u=o.has(a),f=A(a,n,u),h=f.getAttribute(i),p=L("attributeChanged",a,i,h,d);w(a);var v=t?st:ct;return p.length?(Promise.all(p).then(function(){return v(a,f,i,d)}),r.push.apply(r,c(p))):v(a,f,i,d),"break"}())break;case W.NODE_VALUE:if("break"===function(){var t=e[s+1],a=e[s+2],i=e[s+3],l=o.has(t);s+=4;var d=A(t,n,l);w(t);var u=L("textChanged",t,i,a);return u.length?(Promise.all(u).then(function(){return lt(d,a)}),r.push.apply(r,c(u))):lt(d,a),"break"}())break;case W.INSERT_BEFORE:var d=e[s+1],u=e[s+2],f=e[s+3];if(s+=4,!ne.has(d)&&d!==rt)continue;var h=ne.get(d);if(d===rt){var p=ne.get(f);p&&(h=p.parentNode,f=p.nextSibling?p.nextSibling:null)}var v=o.has(u);w(u);var m=f&&A(f,n,v),g=A(u,n,v);h.insertBefore(g,m||null),r.push.apply(r,c(L("attached",u)));break;case W.REPLACE_CHILD:if("break"===function(){var t,a,i,l=e[s+1],d=e[s+2];s+=3;var u=o.has(l),f=ne.get(d),h=A(l,n,u);if(!f||!f.parentNode)return"break";w(l);var p=null===(t=te.get("attached"))||void 0===t?void 0:t.size,v=null===(a=te.get("detached"))||void 0===a?void 0:a.size,m=null===(i=te.get("replaced"))||void 0===i?void 0:i.size;if(!p&&!v&&!m)return f.parentNode.replaceChild(h,f),S(d),"break";f.parentNode.insertBefore(h,f);var g=[].concat(c(p&&L("attached",l)||Q.ARR),c(v&&L("detached",d)||Q.ARR),c(m&&L("replaced",d,l)||Q.ARR));return g.length?(Promise.all(g).then(function(){f.parentNode&&f.parentNode.removeChild(f),S(d)}),r.push.apply(r,c(g))):(f.parentNode.removeChild(f),S(d)),"break"}())break;case W.REMOVE_CHILD:if("break"===function(){var t=e[s+1];s+=2;var n=ne.get(t);if(!n||!n.parentNode)return"break";var a=L("detached",t);return a.length?(Promise.all(a).then(function(){n.parentNode&&n.parentNode.removeChild(n),S(t)}),r.push.apply(r,c(a))):(n.parentNode.removeChild(n),S(t)),"break"}())break}}return r}function P(e){var t=e.mount,r=e.state,n=e.patches,a=r.mutationObserver,o=r.measure,i=r.scriptsToExecute;o("patch node");var s=t.ownerDocument,l=e.promises||[];r.ownerDocument=s||ue.document,a&&a.disconnect();var d=function(e){"script"===e.nodeName&&i.set(e,e.attributes.type)};ie.add(d),r.ownerDocument&&l.push.apply(l,c(V(n,r))),ie.delete(d),e.promises=l,o("patch node")}function F(e){var t=e.promises;return t&&t.length?e.promise=Promise.all(t).then(function(){return e.end()}):e.promise=Promise.resolve(e.end())}function H(){return Boolean(dt&&"noModule"in dt)}function B(e){var t=e.state,r=e.input,n=e.config,a=t.measure;if("string"==typeof r){a("parsing input for new tree");var o=T(r,void 0,n),i=o.childNodes,s=y(i);s&&(e.newTree=s),a("parsing input for new tree")}}function z(e){return e.replace(/[&<>]/g,function(e){return"&#".concat(e.charCodeAt(0),";")})}function U(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:Q.STR,r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};return r.inner=!0,r.executeScripts=!("executeScripts"in r)||r.executeScripts,r.tasks=r.tasks||ft,pt.create(e,t,r).start()}function J(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:Q.STR,r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};return r.inner=!1,r.executeScripts=!("executeScripts"in r)||r.executeScripts,r.tasks=r.tasks||ft,pt.create(e,t,r).start()}function G(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},r=y(),n=new Set(t.tasks||ft);n.delete(ht.patchNode),n.delete(ht.endAsPromise),n.add(function(e){return q(e.oldTree)}),t.tasks=c(n),t.inner=!0;var a="";try{a=pt.create(r,e,t).start()}catch(e){throw x(r),e}return x(r),a}function X(e){var t=gt(e);return t.length?" "+t.map(function(t){var r=e[t],n=!r,a="object"==typeof r||"function"==typeof r;return!0===r?t:"".concat(t).concat(n||a?"":'="'.concat(String(r),'"'))}).join(" "):""}function q(e){var t="";if(!e)return t;var r=e.childNodes,n=e.nodeType,a=e.nodeName,o=e.nodeValue,i=e.attributes;if(11===n)for(var s=0;s<r.length;s++)t+=q(r[s]);else if(r.length||1!==n){if(3===n)t+=o;else if(r.length){var c=r.map(function(e){return"".concat(q(e))}).join("");t+="<".concat(a).concat(X(i),">").concat(c,"</").concat(a,">")}}else t+="<".concat(a).concat(X(i),"></").concat(a,">");return t}function Y(e){for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++)r[n-1]=arguments[n];var a=y("#text",Q.STR);if(!e)return a;if("string"==typeof e&&(e=[e]),1===e.length&&!r.length){if(!e[0])return a;var o=b("strict",!1,"boolean",{strict:Y[tt]});delete Y[tt];var i=T(e[0],void 0,{parser:{strict:o}}),s=i.childNodes;return y(1===s.length?s[0]:s)}var c=Q.STR,l={attributes:{},children:{},tags:{}};e.forEach(function(e,t){if(c+=e,r.length){var n=yt(r),a=c.trim().slice(-1),o=c.lastIndexOf(">")<c.lastIndexOf("<"),i=Boolean(a.match(Nt)),s="object"==typeof n,d="".concat(Re).concat(t,"__");i?(l.tags[t]=n,c+=d):o?(l.attributes[t]=n,c+=d):bt(n)||s?(l.children[t]=y(n),c+=d):n&&(c+=n)}});var d=b("strict",!1,"boolean",{strict:Y[tt]}),u=T(c,l,{parser:{strict:d}}),f=u.childNodes;return y(1===f.length?f[0]:f)}function $(e){Y[tt]=!0;try{for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++)r[n-1]=arguments[n];return Y.apply(void 0,[e].concat(r))}catch(e){throw Y[tt]=!1,e}}function Z(e){var t="function"==typeof e,r=e.subscribe,n=e.unsubscribe,a=e.createTreeHook,o=e.createNodeHook,i=e.syncTreeHook,s=e.releaseHook,c=e.parseHook;return t&&ae.add(e),r&&r(mt),a&&oe.add(a),o&&ie.add(o),i&&se.add(i),s&&ce.add(s),c&&le.add(c),function(){t&&ae.delete(e),n&&n(mt),a&&oe.delete(a),o&&ie.delete(o),i&&se.delete(i),s&&ce.delete(s),c&&le.delete(c)}}var K={ELEMENT:1,ATTR:2,TEXT:3,COMMENT:8,FRAGMENT:11},Q={STR:"",NUM:1,OBJ:{},ARR:[],MAP:new Map,SET:new Set,DOM:{},FUN:function(){}},W={SET_ATTRIBUTE:0,REMOVE_ATTRIBUTE:1,NODE_VALUE:2,INSERT_BEFORE:3,REPLACE_CHILD:4,REMOVE_CHILD:5},ee=["attached","detached","replaced","attributeChanged","textChanged"],te=new Map([["attached",new Set],["detached",new Set],["replaced",new Set],["attributeChanged",new Set],["textChanged",new Set]]),re=new Map,ne=new Map,ae=new Set,oe=new Set,ie=new Set,se=new Set,ce=new Set,le=new Set,de="undefined"!=typeof process?process:{env:{NODE_ENV:"development"},argv:[]},ue="object"==typeof global?global:("object"==typeof window?window:self)||{},fe=Number.parseInt,he=JSON.parse,pe={collectMetrics:!0,executeScripts:!0},ve=b("initialPoolSize",5e3),me=new Set,ge=new Set,be=new Set,Ne=function(){return{rawNodeName:Q.STR,nodeName:Q.STR,nodeValue:Q.STR,nodeType:K.ELEMENT,key:Q.STR,childNodes:[],attributes:{}}},ye={free:me,allocated:ge,protected:be},Te=me.values(),Ee={size:ve,memory:ye,fill:function(){for(var e=this,t=me.size;t<this.size;t++)me.add(Ne());this.size<me.size&&me.forEach(function(t){me.size!==e.size&&me.delete(t)})},get:function(){var e=Te.next(),t=e.value,r=void 0===t?Ne():t;return e.done&&(Te=me.values()),me.delete(r),ge.add(r),r},protect:function(e){ge.delete(e),be.add(e)},unprotect:function(e){(be.has(e)||ge.has(e))&&(be.delete(e),ge.delete(e),me.add(e))}};Ee.fill();var we=Array.isArray,Se=Ee.memory,Oe="#document-fragment",ke="#text",Re="__DIFFHTML__",xe=/<!DOCTYPE.*>/i,Ce=new RegExp("".concat(Re,"([^_]*)__")),Me={tags:[],attributes:{},children:{}},Ae=Object.assign,Ie=Array.isArray,_e=["script","noscript","style","template"],De=["source","embed","param","track","input","meta","link","area","base","col","wbr","img","br","hr"],Le={li:{li:!0},p:{p:!0,div:!0},td:{td:!0,th:!0},th:{td:!0,th:!0}},je={li:{ul:!0,ol:!0},a:{div:!0},b:{div:!0},i:{div:!0},p:{div:!0},td:{tr:!0,table:!0},th:{tr:!0,table:!0}},Ve=function(e,t,r){var n;if(!("childNodes"in e.attributes)){if(t&&!xe.test(t)&&!Ce.test(t))return e.childNodes.push(y("#text",t));for(var a=[],o=t.split(Ce),i=0;i<o.length;i++){var s=o[i];if(s)if(i%2==1){var l=r.children[s],d=s in r.children?l:y("#text","".concat(Re).concat(s,"__"));if(!d)continue;var u=d.nodeType===K.FRAGMENT;"string"==typeof d.rawNodeName&&u?a.push.apply(a,c(d.childNodes)):a.push(d)}else xe.test(s)||a.push(y("#text",s))}(n=e.childNodes).push.apply(n,a)}},Pe=function(e,t,r,n){var a=null,o=/([_@$#a-z][^\s\x00-\x1F"'>\/=\uFDD0-\uFDEF\uFFFE\uFFFF]*)\s*(=\s*("([^"]+)"|'([^']+)'|(\S+)))?/gi;if(a=Ce.exec(e))return Pe(r.tags[a[1]],t,r);for(var i,s={};i=o.exec(t||Q.STR);){var c="string"==typeof e,l=i[1],d=void 0;if(""===l){var u=t.match(Ce);d=u?u[0]:""}var f=i[6]||i[5]||i[4],h=d||f||(c?i[1]:f||!0),p="''"===h||'""'===h?Q.STR:h,v=String(p).match(Ce);if(v&&v.length)for(var m=String(p).split(Ce),g=Ce.exec(l),b=g?r.attributes[g[1]]:l,N=0;N<m.length;N++){var T=m[N];if(T)if(N%2==1){var E="object"==typeof b,w=T in r.attributes,S=r.attributes[T],O="".concat(Re).concat(T,"__");if(s[b])s[b]+=w?S:O;else if(E)b&&!Ie(b)&&Ae(s,b);else if(b){var k=w?S:O;s[b]=!f||k}}else s[b]?s[b]+=T:s[b]=T}else if(v=Ce.exec(l)){var R=r.attributes[v[1]];"object"!=typeof R||Ie(R)?s[R]=p:Ae(s,R)}else s[l]=void 0===f||p}return y(e,s,s.childNodes||[])},Fe="diffHTML",He=new Map,Be=0,ze=Ee.protect,Ue=Ee.unprotect,Je=Ee.memory,Ge=Object.freeze({__proto__:null,protectVTree:w,unprotectVTree:S,gc:O}),Xe="undefined"!=typeof requestIdleCallback,qe=-1,Ye=function(e){return(Xe?requestIdleCallback:setTimeout)(e)},$e=function(e){return(Xe?cancelIdleCallback:clearTimeout)(e)},Ze=Math.max,Ke=["old","new"],Qe="#text",We="http://www.w3.org/2000/svg",et=ue.document?document.createElement("div"):null,tt=Symbol.for("diff.strict"),rt=Symbol.for("diff.after"),nt=Symbol.for("diffHTML"),at=Object.keys,ot=new Set,it=new Set,st=function(e,t,r,n){var a="object"==typeof n&&n,o="function"==typeof n,i="symbol"==typeof n,s=0===r.indexOf("on"),c=t,l=s?r.toLowerCase():r,d="s-"+e.nodeName+"-"+l,u=t;if(it.has(d))c[l]=n;else if(!ot.has(d))try{c[l]=n,it.add(d)}catch(e){ot.add(d)}if(a||o||i){if(a&&"style"===l)for(var f=at(n),h=0;h<f.length;h++)u.style[f[h]]=n[f[h]]}else{var p=null===n||void 0===n||!0===n;u.setAttribute(l,p?Q.STR:n)}},ct=function(e,t,r){var n="r-"+e.nodeName+"-"+r,a=t;if(it.has(n))a[r]=void 0,delete a[r];else if(!ot.has(n))try{a[r]=void 0,delete a[r],it.add(n)}catch(e){ot.add(n)}t.removeAttribute(r)},lt=function(e,t){var r=e;t.includes("&")?r.nodeValue=j(t):r.nodeValue=t},dt=ue.document?document.createElement("script"):null,ut=Object.assign,ft=[k,R,C,I,P,F],ht={schedule:k,shouldUpdate:R,reconcileTrees:C,syncTrees:I,patchNode:P,endAsPromise:F},pt=function(){function e(t,r,a){n(this,e),i(this,"state",Q.OBJ),i(this,"mount",Q.OBJ),i(this,"input",Q.OBJ),i(this,"oldTree",void 0),i(this,"newTree",void 0),i(this,"promise",void 0),i(this,"promises",void 0),i(this,"tasks",[]),i(this,"patches",[]),this.mount=t,this.input=r,this.config=a;var o=!a.disableMutationObserver&&"MutationObserver"in(ue.window||Q.OBJ);this.state=re.get(t)||{measure:E(this),svgElements:new Set,scriptsToExecute:new Map,activeTransaction:this,mutationObserver:o&&new ue.window.MutationObserver(Q.FUN)},this.tasks=b("tasks",ft,void 0,a).slice(),this.endedCallbacks=new Set,re.set(t,this.state)}return o(e,[{key:"start",value:function(){var t=this.state.measure,r=this.tasks,n=r.pop();return t("render"),this.aborted=!1,e.invokeMiddleware(this),n&&r.push(n),e.flow(this,r)}},{key:"abort",value:function(e){if(this.aborted=!0,e)return this.tasks[this.tasks.length-1](this)}},{key:"end",value:function(){var e=this,t=this.state,r=this.config,n=this.mount,a=t.mutationObserver,o=t.measure,i=t.svgElements,s=t.scriptsToExecute,c=n;return o("finalize"),this.completed=!0,i.clear(),t.isRendering=!1,t.isDirty=!1,c.ownerDocument&&a?a.observe(c,{subtree:!0,childList:!0,attributes:!0,characterData:!0}):t.isDirty=!0,s.forEach(function(e,n){var a=ne.get(n);if(a.type=e,r.executeScripts&&(!H()||"nomodule"!==e)){var o=ut(a.ownerDocument.createElement("script"),a);for(var i in n.attributes){var s=n.attributes[i];o.setAttribute(i,s)}o.textContent=a.textContent,re.has(a)&&(x(a),re.set(o,t)),ne.set(n,o),a.parentNode&&a.parentNode.replaceChild(o,a)}}),s.clear(),this.endedCallbacks.forEach(function(t){return t(e)}),this.endedCallbacks.clear(),o("finalize"),o("render"),t.oldTree&&w(t.oldTree),this}},{key:"onceEnded",value:function(e){this.endedCallbacks.add(e)}}],[{key:"create",value:function(t,r,n){return new e(t,r,n)}},{key:"flow",value:function(e,t){for(var r=e,n=0;n<t.length;n++){if(e.aborted)return r;if(void 0!==(r=t[n](e))&&r!==e)return r}return r}},{key:"assert",value:function(e){}},{key:"invokeMiddleware",value:function(e){var t=e.state.measure,r=e.tasks;ae.forEach(function(n){var a="invoke ".concat(n.name||"anon");t(a);var o=n(e);o&&r.push(o),t(a)})}}]),e}(),vt={StateCache:re,NodeCache:ne,TransitionCache:te,MiddlewareCache:ae,CreateTreeHookCache:oe,CreateNodeHookCache:ie,SyncTreeHookCache:se,ReleaseHookCache:ce,ParseHookCache:le},mt=r({decodeEntities:j,escape:z,makeMeasure:E,memory:Ge,Pool:Ee,process:de,PATCH_TYPE:W,globalConfig:pe,createNode:A,syncTree:M,Transaction:pt,defaultTasks:ft,tasks:ht},vt),gt=Object.keys,bt=Array.isArray,Nt=/(<|\/)/,yt=function(e){var t=e.shift();return"string"==typeof t?z(j(t)):t};delete Y[tt],Y.strict=$;ft.splice(ft.indexOf(C),0,B),mt.parse=T,mt.VERSION="1.0.0-beta.29";var Tt={};Tt.VERSION="1.0.0-beta.29",Tt.addTransitionState=_,Tt.removeTransitionState=D,Tt.release=x,Tt.createTree=y,Tt.use=Z,Tt.outerHTML=J,Tt.innerHTML=U,Tt.toString=G,Tt.html=Y,Tt.Internals=mt;var Et=ue;if(nt in ue){var wt=Et[nt];"1.0.0-beta.29"!==wt.VERSION&&console.log("Loaded ".concat("1.0.0-beta.29"," after ").concat(wt.VERSION))}Et[nt]=Tt,Et.devTools&&(Et.unsubscribeDevTools=Z(Et.devTools(mt))),e.Internals=mt,e.VERSION="1.0.0-beta.29",e.addTransitionState=_,e.createTree=y,e.default=Tt,e.html=Y,e.innerHTML=U,e.outerHTML=J,e.release=x,e.removeTransitionState=D,e.toString=G,e.use=Z,Object.defineProperty(e,"__esModule",{value:!0})});
\ No newline at end of file
diff --git a/public/javascripts/embed.js b/public/javascripts/embed.js
index f72c96a54e7..96ab0ef4af9 100644
--- a/public/javascripts/embed.js
+++ b/public/javascripts/embed.js
@@ -34,6 +34,10 @@
     queryParams.topic_id = DE.topicId;
   }
 
+  if (DE.className) {
+    queryParams.class_name = DE.className;
+  }
+
   var src = DE.discourseUrl + "embed/comments";
   var keys = Object.keys(queryParams);
   if (keys.length > 0) {
diff --git a/public/javascripts/workbox/workbox-cacheable-response.dev.js b/public/javascripts/workbox/workbox-cacheable-response.dev.js
deleted file mode 100644
index 54a2e499975..00000000000
--- a/public/javascripts/workbox/workbox-cacheable-response.dev.js
+++ /dev/null
@@ -1,200 +0,0 @@
-this.workbox = this.workbox || {};
-this.workbox.cacheableResponse = (function (exports, WorkboxError_mjs, assert_mjs, getFriendlyURL_mjs, logger_mjs) {
-  'use strict';
-
-  try {
-    self['workbox:cacheable-response:4.3.1'] && _();
-  } catch (e) {} // eslint-disable-line
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  /**
-   * This class allows you to set up rules determining what
-   * status codes and/or headers need to be present in order for a
-   * [`Response`](https://developer.mozilla.org/en-US/docs/Web/API/Response)
-   * to be considered cacheable.
-   *
-   * @memberof workbox.cacheableResponse
-   */
-
-  class CacheableResponse {
-    /**
-     * To construct a new CacheableResponse instance you must provide at least
-     * one of the `config` properties.
-     *
-     * If both `statuses` and `headers` are specified, then both conditions must
-     * be met for the `Response` to be considered cacheable.
-     *
-     * @param {Object} config
-     * @param {Array<number>} [config.statuses] One or more status codes that a
-     * `Response` can have and be considered cacheable.
-     * @param {Object<string,string>} [config.headers] A mapping of header names
-     * and expected values that a `Response` can have and be considered cacheable.
-     * If multiple headers are provided, only one needs to be present.
-     */
-    constructor(config = {}) {
-      {
-        if (!(config.statuses || config.headers)) {
-          throw new WorkboxError_mjs.WorkboxError('statuses-or-headers-required', {
-            moduleName: 'workbox-cacheable-response',
-            className: 'CacheableResponse',
-            funcName: 'constructor'
-          });
-        }
-
-        if (config.statuses) {
-          assert_mjs.assert.isArray(config.statuses, {
-            moduleName: 'workbox-cacheable-response',
-            className: 'CacheableResponse',
-            funcName: 'constructor',
-            paramName: 'config.statuses'
-          });
-        }
-
-        if (config.headers) {
-          assert_mjs.assert.isType(config.headers, 'object', {
-            moduleName: 'workbox-cacheable-response',
-            className: 'CacheableResponse',
-            funcName: 'constructor',
-            paramName: 'config.headers'
-          });
-        }
-      }
-
-      this._statuses = config.statuses;
-      this._headers = config.headers;
-    }
-    /**
-     * Checks a response to see whether it's cacheable or not, based on this
-     * object's configuration.
-     *
-     * @param {Response} response The response whose cacheability is being
-     * checked.
-     * @return {boolean} `true` if the `Response` is cacheable, and `false`
-     * otherwise.
-     */
-
-
-    isResponseCacheable(response) {
-      {
-        assert_mjs.assert.isInstance(response, Response, {
-          moduleName: 'workbox-cacheable-response',
-          className: 'CacheableResponse',
-          funcName: 'isResponseCacheable',
-          paramName: 'response'
-        });
-      }
-
-      let cacheable = true;
-
-      if (this._statuses) {
-        cacheable = this._statuses.includes(response.status);
-      }
-
-      if (this._headers && cacheable) {
-        cacheable = Object.keys(this._headers).some(headerName => {
-          return response.headers.get(headerName) === this._headers[headerName];
-        });
-      }
-
-      {
-        if (!cacheable) {
-          logger_mjs.logger.groupCollapsed(`The request for ` + `'${getFriendlyURL_mjs.getFriendlyURL(response.url)}' returned a response that does ` + `not meet the criteria for being cached.`);
-          logger_mjs.logger.groupCollapsed(`View cacheability criteria here.`);
-          logger_mjs.logger.log(`Cacheable statuses: ` + JSON.stringify(this._statuses));
-          logger_mjs.logger.log(`Cacheable headers: ` + JSON.stringify(this._headers, null, 2));
-          logger_mjs.logger.groupEnd();
-          const logFriendlyHeaders = {};
-          response.headers.forEach((value, key) => {
-            logFriendlyHeaders[key] = value;
-          });
-          logger_mjs.logger.groupCollapsed(`View response status and headers here.`);
-          logger_mjs.logger.log(`Response status: ` + response.status);
-          logger_mjs.logger.log(`Response headers: ` + JSON.stringify(logFriendlyHeaders, null, 2));
-          logger_mjs.logger.groupEnd();
-          logger_mjs.logger.groupCollapsed(`View full response details here.`);
-          logger_mjs.logger.log(response.headers);
-          logger_mjs.logger.log(response);
-          logger_mjs.logger.groupEnd();
-          logger_mjs.logger.groupEnd();
-        }
-      }
-
-      return cacheable;
-    }
-
-  }
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  /**
-   * A class implementing the `cacheWillUpdate` lifecycle callback. This makes it
-   * easier to add in cacheability checks to requests made via Workbox's built-in
-   * strategies.
-   *
-   * @memberof workbox.cacheableResponse
-   */
-
-  class Plugin {
-    /**
-     * To construct a new cacheable response Plugin instance you must provide at
-     * least one of the `config` properties.
-     *
-     * If both `statuses` and `headers` are specified, then both conditions must
-     * be met for the `Response` to be considered cacheable.
-     *
-     * @param {Object} config
-     * @param {Array<number>} [config.statuses] One or more status codes that a
-     * `Response` can have and be considered cacheable.
-     * @param {Object<string,string>} [config.headers] A mapping of header names
-     * and expected values that a `Response` can have and be considered cacheable.
-     * If multiple headers are provided, only one needs to be present.
-     */
-    constructor(config) {
-      this._cacheableResponse = new CacheableResponse(config);
-    }
-    /**
-     * @param {Object} options
-     * @param {Response} options.response
-     * @return {boolean}
-     * @private
-     */
-
-
-    cacheWillUpdate({
-      response
-    }) {
-      if (this._cacheableResponse.isResponseCacheable(response)) {
-        return response;
-      }
-
-      return null;
-    }
-
-  }
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-
-  exports.CacheableResponse = CacheableResponse;
-  exports.Plugin = Plugin;
-
-  return exports;
-
-}({}, workbox.core._private, workbox.core._private, workbox.core._private, workbox.core._private));
-//# sourceMappingURL=workbox-cacheable-response.dev.js.map
diff --git a/public/javascripts/workbox/workbox-cacheable-response.dev.js.map b/public/javascripts/workbox/workbox-cacheable-response.dev.js.map
deleted file mode 100644
index 86bc689049e..00000000000
--- a/public/javascripts/workbox/workbox-cacheable-response.dev.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"workbox-cacheable-response.dev.js","sources":["../_version.mjs","../CacheableResponse.mjs","../Plugin.mjs","../index.mjs"],"sourcesContent":["try{self['workbox:cacheable-response:4.3.1']&&_()}catch(e){}// eslint-disable-line","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {WorkboxError} from 'workbox-core/_private/WorkboxError.mjs';\nimport {assert} from 'workbox-core/_private/assert.mjs';\nimport {getFriendlyURL} from 'workbox-core/_private/getFriendlyURL.mjs';\nimport {logger} from 'workbox-core/_private/logger.mjs';\nimport './_version.mjs';\n\n/**\n * This class allows you to set up rules determining what\n * status codes and/or headers need to be present in order for a\n * [`Response`](https://developer.mozilla.org/en-US/docs/Web/API/Response)\n * to be considered cacheable.\n *\n * @memberof workbox.cacheableResponse\n */\nclass CacheableResponse {\n  /**\n   * To construct a new CacheableResponse instance you must provide at least\n   * one of the `config` properties.\n   *\n   * If both `statuses` and `headers` are specified, then both conditions must\n   * be met for the `Response` to be considered cacheable.\n   *\n   * @param {Object} config\n   * @param {Array<number>} [config.statuses] One or more status codes that a\n   * `Response` can have and be considered cacheable.\n   * @param {Object<string,string>} [config.headers] A mapping of header names\n   * and expected values that a `Response` can have and be considered cacheable.\n   * If multiple headers are provided, only one needs to be present.\n   */\n  constructor(config = {}) {\n    if (process.env.NODE_ENV !== 'production') {\n      if (!(config.statuses || config.headers)) {\n        throw new WorkboxError('statuses-or-headers-required', {\n          moduleName: 'workbox-cacheable-response',\n          className: 'CacheableResponse',\n          funcName: 'constructor',\n        });\n      }\n\n      if (config.statuses) {\n        assert.isArray(config.statuses, {\n          moduleName: 'workbox-cacheable-response',\n          className: 'CacheableResponse',\n          funcName: 'constructor',\n          paramName: 'config.statuses',\n        });\n      }\n\n      if (config.headers) {\n        assert.isType(config.headers, 'object', {\n          moduleName: 'workbox-cacheable-response',\n          className: 'CacheableResponse',\n          funcName: 'constructor',\n          paramName: 'config.headers',\n        });\n      }\n    }\n\n    this._statuses = config.statuses;\n    this._headers = config.headers;\n  }\n\n  /**\n   * Checks a response to see whether it's cacheable or not, based on this\n   * object's configuration.\n   *\n   * @param {Response} response The response whose cacheability is being\n   * checked.\n   * @return {boolean} `true` if the `Response` is cacheable, and `false`\n   * otherwise.\n   */\n  isResponseCacheable(response) {\n    if (process.env.NODE_ENV !== 'production') {\n      assert.isInstance(response, Response, {\n        moduleName: 'workbox-cacheable-response',\n        className: 'CacheableResponse',\n        funcName: 'isResponseCacheable',\n        paramName: 'response',\n      });\n    }\n\n    let cacheable = true;\n\n    if (this._statuses) {\n      cacheable = this._statuses.includes(response.status);\n    }\n\n    if (this._headers && cacheable) {\n      cacheable = Object.keys(this._headers).some((headerName) => {\n        return response.headers.get(headerName) === this._headers[headerName];\n      });\n    }\n\n    if (process.env.NODE_ENV !== 'production') {\n      if (!cacheable) {\n        logger.groupCollapsed(`The request for ` +\n          `'${getFriendlyURL(response.url)}' returned a response that does ` +\n          `not meet the criteria for being cached.`);\n\n        logger.groupCollapsed(`View cacheability criteria here.`);\n        logger.log(`Cacheable statuses: ` +\n          JSON.stringify(this._statuses));\n        logger.log(`Cacheable headers: ` +\n          JSON.stringify(this._headers, null, 2));\n        logger.groupEnd();\n\n        const logFriendlyHeaders = {};\n        response.headers.forEach((value, key) => {\n          logFriendlyHeaders[key] = value;\n        });\n\n        logger.groupCollapsed(`View response status and headers here.`);\n        logger.log(`Response status: ` + response.status);\n        logger.log(`Response headers: ` +\n          JSON.stringify(logFriendlyHeaders, null, 2));\n        logger.groupEnd();\n\n        logger.groupCollapsed(`View full response details here.`);\n        logger.log(response.headers);\n        logger.log(response);\n        logger.groupEnd();\n\n        logger.groupEnd();\n      }\n    }\n\n    return cacheable;\n  }\n}\n\nexport {CacheableResponse};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {CacheableResponse} from './CacheableResponse.mjs';\nimport './_version.mjs';\n\n/**\n * A class implementing the `cacheWillUpdate` lifecycle callback. This makes it\n * easier to add in cacheability checks to requests made via Workbox's built-in\n * strategies.\n *\n * @memberof workbox.cacheableResponse\n */\nclass Plugin {\n  /**\n   * To construct a new cacheable response Plugin instance you must provide at\n   * least one of the `config` properties.\n   *\n   * If both `statuses` and `headers` are specified, then both conditions must\n   * be met for the `Response` to be considered cacheable.\n   *\n   * @param {Object} config\n   * @param {Array<number>} [config.statuses] One or more status codes that a\n   * `Response` can have and be considered cacheable.\n   * @param {Object<string,string>} [config.headers] A mapping of header names\n   * and expected values that a `Response` can have and be considered cacheable.\n   * If multiple headers are provided, only one needs to be present.\n   */\n  constructor(config) {\n    this._cacheableResponse = new CacheableResponse(config);\n  }\n\n  /**\n   * @param {Object} options\n   * @param {Response} options.response\n   * @return {boolean}\n   * @private\n   */\n  cacheWillUpdate({response}) {\n    if (this._cacheableResponse.isResponseCacheable(response)) {\n      return response;\n    }\n    return null;\n  }\n}\n\nexport {Plugin};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {CacheableResponse} from './CacheableResponse.mjs';\nimport {Plugin} from './Plugin.mjs';\nimport './_version.mjs';\n\n\n/**\n * @namespace workbox.cacheableResponse\n */\n\nexport {\n  CacheableResponse,\n  Plugin,\n};\n"],"names":["self","_","e","CacheableResponse","constructor","config","statuses","headers","WorkboxError","moduleName","className","funcName","assert","isArray","paramName","isType","_statuses","_headers","isResponseCacheable","response","isInstance","Response","cacheable","includes","status","Object","keys","some","headerName","get","logger","groupCollapsed","getFriendlyURL","url","log","JSON","stringify","groupEnd","logFriendlyHeaders","forEach","value","key","Plugin","_cacheableResponse","cacheWillUpdate"],"mappings":";;;;EAAA,IAAG;EAACA,EAAAA,IAAI,CAAC,kCAAD,CAAJ,IAA0CC,CAAC,EAA3C;EAA8C,CAAlD,CAAkD,OAAMC,CAAN,EAAQ;;ECA1D;;;;;;;AAQA,EAMA;;;;;;;;;EAQA,MAAMC,iBAAN,CAAwB;EACtB;;;;;;;;;;;;;;EAcAC,EAAAA,WAAW,CAACC,MAAM,GAAG,EAAV,EAAc;EACvB,IAA2C;EACzC,UAAI,EAAEA,MAAM,CAACC,QAAP,IAAmBD,MAAM,CAACE,OAA5B,CAAJ,EAA0C;EACxC,cAAM,IAAIC,6BAAJ,CAAiB,8BAAjB,EAAiD;EACrDC,UAAAA,UAAU,EAAE,4BADyC;EAErDC,UAAAA,SAAS,EAAE,mBAF0C;EAGrDC,UAAAA,QAAQ,EAAE;EAH2C,SAAjD,CAAN;EAKD;;EAED,UAAIN,MAAM,CAACC,QAAX,EAAqB;EACnBM,QAAAA,iBAAM,CAACC,OAAP,CAAeR,MAAM,CAACC,QAAtB,EAAgC;EAC9BG,UAAAA,UAAU,EAAE,4BADkB;EAE9BC,UAAAA,SAAS,EAAE,mBAFmB;EAG9BC,UAAAA,QAAQ,EAAE,aAHoB;EAI9BG,UAAAA,SAAS,EAAE;EAJmB,SAAhC;EAMD;;EAED,UAAIT,MAAM,CAACE,OAAX,EAAoB;EAClBK,QAAAA,iBAAM,CAACG,MAAP,CAAcV,MAAM,CAACE,OAArB,EAA8B,QAA9B,EAAwC;EACtCE,UAAAA,UAAU,EAAE,4BAD0B;EAEtCC,UAAAA,SAAS,EAAE,mBAF2B;EAGtCC,UAAAA,QAAQ,EAAE,aAH4B;EAItCG,UAAAA,SAAS,EAAE;EAJ2B,SAAxC;EAMD;EACF;;EAED,SAAKE,SAAL,GAAiBX,MAAM,CAACC,QAAxB;EACA,SAAKW,QAAL,GAAgBZ,MAAM,CAACE,OAAvB;EACD;EAED;;;;;;;;;;;EASAW,EAAAA,mBAAmB,CAACC,QAAD,EAAW;EAC5B,IAA2C;EACzCP,MAAAA,iBAAM,CAACQ,UAAP,CAAkBD,QAAlB,EAA4BE,QAA5B,EAAsC;EACpCZ,QAAAA,UAAU,EAAE,4BADwB;EAEpCC,QAAAA,SAAS,EAAE,mBAFyB;EAGpCC,QAAAA,QAAQ,EAAE,qBAH0B;EAIpCG,QAAAA,SAAS,EAAE;EAJyB,OAAtC;EAMD;;EAED,QAAIQ,SAAS,GAAG,IAAhB;;EAEA,QAAI,KAAKN,SAAT,EAAoB;EAClBM,MAAAA,SAAS,GAAG,KAAKN,SAAL,CAAeO,QAAf,CAAwBJ,QAAQ,CAACK,MAAjC,CAAZ;EACD;;EAED,QAAI,KAAKP,QAAL,IAAiBK,SAArB,EAAgC;EAC9BA,MAAAA,SAAS,GAAGG,MAAM,CAACC,IAAP,CAAY,KAAKT,QAAjB,EAA2BU,IAA3B,CAAiCC,UAAD,IAAgB;EAC1D,eAAOT,QAAQ,CAACZ,OAAT,CAAiBsB,GAAjB,CAAqBD,UAArB,MAAqC,KAAKX,QAAL,CAAcW,UAAd,CAA5C;EACD,OAFW,CAAZ;EAGD;;EAED,IAA2C;EACzC,UAAI,CAACN,SAAL,EAAgB;EACdQ,QAAAA,iBAAM,CAACC,cAAP,CAAuB,kBAAD,GACnB,IAAGC,iCAAc,CAACb,QAAQ,CAACc,GAAV,CAAe,kCADb,GAEnB,yCAFH;EAIAH,QAAAA,iBAAM,CAACC,cAAP,CAAuB,kCAAvB;EACAD,QAAAA,iBAAM,CAACI,GAAP,CAAY,sBAAD,GACTC,IAAI,CAACC,SAAL,CAAe,KAAKpB,SAApB,CADF;EAEAc,QAAAA,iBAAM,CAACI,GAAP,CAAY,qBAAD,GACTC,IAAI,CAACC,SAAL,CAAe,KAAKnB,QAApB,EAA8B,IAA9B,EAAoC,CAApC,CADF;EAEAa,QAAAA,iBAAM,CAACO,QAAP;EAEA,cAAMC,kBAAkB,GAAG,EAA3B;EACAnB,QAAAA,QAAQ,CAACZ,OAAT,CAAiBgC,OAAjB,CAAyB,CAACC,KAAD,EAAQC,GAAR,KAAgB;EACvCH,UAAAA,kBAAkB,CAACG,GAAD,CAAlB,GAA0BD,KAA1B;EACD,SAFD;EAIAV,QAAAA,iBAAM,CAACC,cAAP,CAAuB,wCAAvB;EACAD,QAAAA,iBAAM,CAACI,GAAP,CAAY,mBAAD,GAAsBf,QAAQ,CAACK,MAA1C;EACAM,QAAAA,iBAAM,CAACI,GAAP,CAAY,oBAAD,GACTC,IAAI,CAACC,SAAL,CAAeE,kBAAf,EAAmC,IAAnC,EAAyC,CAAzC,CADF;EAEAR,QAAAA,iBAAM,CAACO,QAAP;EAEAP,QAAAA,iBAAM,CAACC,cAAP,CAAuB,kCAAvB;EACAD,QAAAA,iBAAM,CAACI,GAAP,CAAWf,QAAQ,CAACZ,OAApB;EACAuB,QAAAA,iBAAM,CAACI,GAAP,CAAWf,QAAX;EACAW,QAAAA,iBAAM,CAACO,QAAP;EAEAP,QAAAA,iBAAM,CAACO,QAAP;EACD;EACF;;EAED,WAAOf,SAAP;EACD;;EAjHqB;;ECtBxB;;;;;;;AAQA,EAGA;;;;;;;;EAOA,MAAMoB,MAAN,CAAa;EACX;;;;;;;;;;;;;;EAcAtC,EAAAA,WAAW,CAACC,MAAD,EAAS;EAClB,SAAKsC,kBAAL,GAA0B,IAAIxC,iBAAJ,CAAsBE,MAAtB,CAA1B;EACD;EAED;;;;;;;;EAMAuC,EAAAA,eAAe,CAAC;EAACzB,IAAAA;EAAD,GAAD,EAAa;EAC1B,QAAI,KAAKwB,kBAAL,CAAwBzB,mBAAxB,CAA4CC,QAA5C,CAAJ,EAA2D;EACzD,aAAOA,QAAP;EACD;;EACD,WAAO,IAAP;EACD;;EA9BU;;EClBb;;;;;;;;;;;;;;;;;"}
\ No newline at end of file
diff --git a/public/javascripts/workbox/workbox-cacheable-response.prod.js b/public/javascripts/workbox/workbox-cacheable-response.prod.js
deleted file mode 100644
index a7e42f263a8..00000000000
--- a/public/javascripts/workbox/workbox-cacheable-response.prod.js
+++ /dev/null
@@ -1,2 +0,0 @@
-this.workbox=this.workbox||{},this.workbox.cacheableResponse=function(t){"use strict";try{self["workbox:cacheable-response:4.3.1"]&&_()}catch(t){}class s{constructor(t={}){this.t=t.statuses,this.s=t.headers}isResponseCacheable(t){let s=!0;return this.t&&(s=this.t.includes(t.status)),this.s&&s&&(s=Object.keys(this.s).some(s=>t.headers.get(s)===this.s[s])),s}}return t.CacheableResponse=s,t.Plugin=class{constructor(t){this.i=new s(t)}cacheWillUpdate({response:t}){return this.i.isResponseCacheable(t)?t:null}},t}({});
-//# sourceMappingURL=workbox-cacheable-response.prod.js.map
diff --git a/public/javascripts/workbox/workbox-cacheable-response.prod.js.map b/public/javascripts/workbox/workbox-cacheable-response.prod.js.map
deleted file mode 100644
index b1a0d1d2b79..00000000000
--- a/public/javascripts/workbox/workbox-cacheable-response.prod.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"workbox-cacheable-response.prod.js","sources":["../_version.mjs","../CacheableResponse.mjs","../Plugin.mjs"],"sourcesContent":["try{self['workbox:cacheable-response:4.3.1']&&_()}catch(e){}// eslint-disable-line","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {WorkboxError} from 'workbox-core/_private/WorkboxError.mjs';\nimport {assert} from 'workbox-core/_private/assert.mjs';\nimport {getFriendlyURL} from 'workbox-core/_private/getFriendlyURL.mjs';\nimport {logger} from 'workbox-core/_private/logger.mjs';\nimport './_version.mjs';\n\n/**\n * This class allows you to set up rules determining what\n * status codes and/or headers need to be present in order for a\n * [`Response`](https://developer.mozilla.org/en-US/docs/Web/API/Response)\n * to be considered cacheable.\n *\n * @memberof workbox.cacheableResponse\n */\nclass CacheableResponse {\n  /**\n   * To construct a new CacheableResponse instance you must provide at least\n   * one of the `config` properties.\n   *\n   * If both `statuses` and `headers` are specified, then both conditions must\n   * be met for the `Response` to be considered cacheable.\n   *\n   * @param {Object} config\n   * @param {Array<number>} [config.statuses] One or more status codes that a\n   * `Response` can have and be considered cacheable.\n   * @param {Object<string,string>} [config.headers] A mapping of header names\n   * and expected values that a `Response` can have and be considered cacheable.\n   * If multiple headers are provided, only one needs to be present.\n   */\n  constructor(config = {}) {\n    if (process.env.NODE_ENV !== 'production') {\n      if (!(config.statuses || config.headers)) {\n        throw new WorkboxError('statuses-or-headers-required', {\n          moduleName: 'workbox-cacheable-response',\n          className: 'CacheableResponse',\n          funcName: 'constructor',\n        });\n      }\n\n      if (config.statuses) {\n        assert.isArray(config.statuses, {\n          moduleName: 'workbox-cacheable-response',\n          className: 'CacheableResponse',\n          funcName: 'constructor',\n          paramName: 'config.statuses',\n        });\n      }\n\n      if (config.headers) {\n        assert.isType(config.headers, 'object', {\n          moduleName: 'workbox-cacheable-response',\n          className: 'CacheableResponse',\n          funcName: 'constructor',\n          paramName: 'config.headers',\n        });\n      }\n    }\n\n    this._statuses = config.statuses;\n    this._headers = config.headers;\n  }\n\n  /**\n   * Checks a response to see whether it's cacheable or not, based on this\n   * object's configuration.\n   *\n   * @param {Response} response The response whose cacheability is being\n   * checked.\n   * @return {boolean} `true` if the `Response` is cacheable, and `false`\n   * otherwise.\n   */\n  isResponseCacheable(response) {\n    if (process.env.NODE_ENV !== 'production') {\n      assert.isInstance(response, Response, {\n        moduleName: 'workbox-cacheable-response',\n        className: 'CacheableResponse',\n        funcName: 'isResponseCacheable',\n        paramName: 'response',\n      });\n    }\n\n    let cacheable = true;\n\n    if (this._statuses) {\n      cacheable = this._statuses.includes(response.status);\n    }\n\n    if (this._headers && cacheable) {\n      cacheable = Object.keys(this._headers).some((headerName) => {\n        return response.headers.get(headerName) === this._headers[headerName];\n      });\n    }\n\n    if (process.env.NODE_ENV !== 'production') {\n      if (!cacheable) {\n        logger.groupCollapsed(`The request for ` +\n          `'${getFriendlyURL(response.url)}' returned a response that does ` +\n          `not meet the criteria for being cached.`);\n\n        logger.groupCollapsed(`View cacheability criteria here.`);\n        logger.log(`Cacheable statuses: ` +\n          JSON.stringify(this._statuses));\n        logger.log(`Cacheable headers: ` +\n          JSON.stringify(this._headers, null, 2));\n        logger.groupEnd();\n\n        const logFriendlyHeaders = {};\n        response.headers.forEach((value, key) => {\n          logFriendlyHeaders[key] = value;\n        });\n\n        logger.groupCollapsed(`View response status and headers here.`);\n        logger.log(`Response status: ` + response.status);\n        logger.log(`Response headers: ` +\n          JSON.stringify(logFriendlyHeaders, null, 2));\n        logger.groupEnd();\n\n        logger.groupCollapsed(`View full response details here.`);\n        logger.log(response.headers);\n        logger.log(response);\n        logger.groupEnd();\n\n        logger.groupEnd();\n      }\n    }\n\n    return cacheable;\n  }\n}\n\nexport {CacheableResponse};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {CacheableResponse} from './CacheableResponse.mjs';\nimport './_version.mjs';\n\n/**\n * A class implementing the `cacheWillUpdate` lifecycle callback. This makes it\n * easier to add in cacheability checks to requests made via Workbox's built-in\n * strategies.\n *\n * @memberof workbox.cacheableResponse\n */\nclass Plugin {\n  /**\n   * To construct a new cacheable response Plugin instance you must provide at\n   * least one of the `config` properties.\n   *\n   * If both `statuses` and `headers` are specified, then both conditions must\n   * be met for the `Response` to be considered cacheable.\n   *\n   * @param {Object} config\n   * @param {Array<number>} [config.statuses] One or more status codes that a\n   * `Response` can have and be considered cacheable.\n   * @param {Object<string,string>} [config.headers] A mapping of header names\n   * and expected values that a `Response` can have and be considered cacheable.\n   * If multiple headers are provided, only one needs to be present.\n   */\n  constructor(config) {\n    this._cacheableResponse = new CacheableResponse(config);\n  }\n\n  /**\n   * @param {Object} options\n   * @param {Response} options.response\n   * @return {boolean}\n   * @private\n   */\n  cacheWillUpdate({response}) {\n    if (this._cacheableResponse.isResponseCacheable(response)) {\n      return response;\n    }\n    return null;\n  }\n}\n\nexport {Plugin};\n"],"names":["self","_","e","CacheableResponse","constructor","config","_statuses","statuses","_headers","headers","isResponseCacheable","response","cacheable","this","includes","status","Object","keys","some","headerName","get","_cacheableResponse","cacheWillUpdate"],"mappings":"sFAAA,IAAIA,KAAK,qCAAqCC,IAAI,MAAMC,ICsBxD,MAAMC,EAeJC,YAAYC,EAAS,SA6BdC,EAAYD,EAAOE,cACnBC,EAAWH,EAAOI,QAYzBC,oBAAoBC,OAUdC,GAAY,SAEZC,KAAKP,IACPM,EAAYC,KAAKP,EAAUQ,SAASH,EAASI,SAG3CF,KAAKL,GAAYI,IACnBA,EAAYI,OAAOC,KAAKJ,KAAKL,GAAUU,KAAMC,GACpCR,EAASF,QAAQW,IAAID,KAAgBN,KAAKL,EAASW,KAqCvDP,yCCpHX,MAeER,YAAYC,QACLgB,EAAqB,IAAIlB,EAAkBE,GASlDiB,iBAAgBX,SAACA,WACXE,KAAKQ,EAAmBX,oBAAoBC,GACvCA,EAEF"}
\ No newline at end of file
diff --git a/public/javascripts/workbox/workbox-core.dev.js b/public/javascripts/workbox/workbox-core.dev.js
deleted file mode 100644
index 18b8b85f19e..00000000000
--- a/public/javascripts/workbox/workbox-core.dev.js
+++ /dev/null
@@ -1,1712 +0,0 @@
-this.workbox = this.workbox || {};
-this.workbox.core = (function (exports) {
-  'use strict';
-
-  try {
-    self['workbox:core:4.3.1'] && _();
-  } catch (e) {} // eslint-disable-line
-
-  /*
-    Copyright 2019 Google LLC
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  const logger = (() => {
-    let inGroup = false;
-    const methodToColorMap = {
-      debug: `#7f8c8d`,
-      // Gray
-      log: `#2ecc71`,
-      // Green
-      warn: `#f39c12`,
-      // Yellow
-      error: `#c0392b`,
-      // Red
-      groupCollapsed: `#3498db`,
-      // Blue
-      groupEnd: null // No colored prefix on groupEnd
-
-    };
-
-    const print = function (method, args) {
-      if (method === 'groupCollapsed') {
-        // Safari doesn't print all console.groupCollapsed() arguments:
-        // https://bugs.webkit.org/show_bug.cgi?id=182754
-        if (/^((?!chrome|android).)*safari/i.test(navigator.userAgent)) {
-          console[method](...args);
-          return;
-        }
-      }
-
-      const styles = [`background: ${methodToColorMap[method]}`, `border-radius: 0.5em`, `color: white`, `font-weight: bold`, `padding: 2px 0.5em`]; // When in a group, the workbox prefix is not displayed.
-
-      const logPrefix = inGroup ? [] : ['%cworkbox', styles.join(';')];
-      console[method](...logPrefix, ...args);
-
-      if (method === 'groupCollapsed') {
-        inGroup = true;
-      }
-
-      if (method === 'groupEnd') {
-        inGroup = false;
-      }
-    };
-
-    const api = {};
-
-    for (const method of Object.keys(methodToColorMap)) {
-      api[method] = (...args) => {
-        print(method, args);
-      };
-    }
-
-    return api;
-  })();
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  const messages = {
-    'invalid-value': ({
-      paramName,
-      validValueDescription,
-      value
-    }) => {
-      if (!paramName || !validValueDescription) {
-        throw new Error(`Unexpected input to 'invalid-value' error.`);
-      }
-
-      return `The '${paramName}' parameter was given a value with an ` + `unexpected value. ${validValueDescription} Received a value of ` + `${JSON.stringify(value)}.`;
-    },
-    'not-in-sw': ({
-      moduleName
-    }) => {
-      if (!moduleName) {
-        throw new Error(`Unexpected input to 'not-in-sw' error.`);
-      }
-
-      return `The '${moduleName}' must be used in a service worker.`;
-    },
-    'not-an-array': ({
-      moduleName,
-      className,
-      funcName,
-      paramName
-    }) => {
-      if (!moduleName || !className || !funcName || !paramName) {
-        throw new Error(`Unexpected input to 'not-an-array' error.`);
-      }
-
-      return `The parameter '${paramName}' passed into ` + `'${moduleName}.${className}.${funcName}()' must be an array.`;
-    },
-    'incorrect-type': ({
-      expectedType,
-      paramName,
-      moduleName,
-      className,
-      funcName
-    }) => {
-      if (!expectedType || !paramName || !moduleName || !funcName) {
-        throw new Error(`Unexpected input to 'incorrect-type' error.`);
-      }
-
-      return `The parameter '${paramName}' passed into ` + `'${moduleName}.${className ? className + '.' : ''}` + `${funcName}()' must be of type ${expectedType}.`;
-    },
-    'incorrect-class': ({
-      expectedClass,
-      paramName,
-      moduleName,
-      className,
-      funcName,
-      isReturnValueProblem
-    }) => {
-      if (!expectedClass || !moduleName || !funcName) {
-        throw new Error(`Unexpected input to 'incorrect-class' error.`);
-      }
-
-      if (isReturnValueProblem) {
-        return `The return value from ` + `'${moduleName}.${className ? className + '.' : ''}${funcName}()' ` + `must be an instance of class ${expectedClass.name}.`;
-      }
-
-      return `The parameter '${paramName}' passed into ` + `'${moduleName}.${className ? className + '.' : ''}${funcName}()' ` + `must be an instance of class ${expectedClass.name}.`;
-    },
-    'missing-a-method': ({
-      expectedMethod,
-      paramName,
-      moduleName,
-      className,
-      funcName
-    }) => {
-      if (!expectedMethod || !paramName || !moduleName || !className || !funcName) {
-        throw new Error(`Unexpected input to 'missing-a-method' error.`);
-      }
-
-      return `${moduleName}.${className}.${funcName}() expected the ` + `'${paramName}' parameter to expose a '${expectedMethod}' method.`;
-    },
-    'add-to-cache-list-unexpected-type': ({
-      entry
-    }) => {
-      return `An unexpected entry was passed to ` + `'workbox-precaching.PrecacheController.addToCacheList()' The entry ` + `'${JSON.stringify(entry)}' isn't supported. You must supply an array of ` + `strings with one or more characters, objects with a url property or ` + `Request objects.`;
-    },
-    'add-to-cache-list-conflicting-entries': ({
-      firstEntry,
-      secondEntry
-    }) => {
-      if (!firstEntry || !secondEntry) {
-        throw new Error(`Unexpected input to ` + `'add-to-cache-list-duplicate-entries' error.`);
-      }
-
-      return `Two of the entries passed to ` + `'workbox-precaching.PrecacheController.addToCacheList()' had the URL ` + `${firstEntry._entryId} but different revision details. Workbox is ` + `is unable to cache and version the asset correctly. Please remove one ` + `of the entries.`;
-    },
-    'plugin-error-request-will-fetch': ({
-      thrownError
-    }) => {
-      if (!thrownError) {
-        throw new Error(`Unexpected input to ` + `'plugin-error-request-will-fetch', error.`);
-      }
-
-      return `An error was thrown by a plugins 'requestWillFetch()' method. ` + `The thrown error message was: '${thrownError.message}'.`;
-    },
-    'invalid-cache-name': ({
-      cacheNameId,
-      value
-    }) => {
-      if (!cacheNameId) {
-        throw new Error(`Expected a 'cacheNameId' for error 'invalid-cache-name'`);
-      }
-
-      return `You must provide a name containing at least one character for ` + `setCacheDeatils({${cacheNameId}: '...'}). Received a value of ` + `'${JSON.stringify(value)}'`;
-    },
-    'unregister-route-but-not-found-with-method': ({
-      method
-    }) => {
-      if (!method) {
-        throw new Error(`Unexpected input to ` + `'unregister-route-but-not-found-with-method' error.`);
-      }
-
-      return `The route you're trying to unregister was not  previously ` + `registered for the method type '${method}'.`;
-    },
-    'unregister-route-route-not-registered': () => {
-      return `The route you're trying to unregister was not previously ` + `registered.`;
-    },
-    'queue-replay-failed': ({
-      name
-    }) => {
-      return `Replaying the background sync queue '${name}' failed.`;
-    },
-    'duplicate-queue-name': ({
-      name
-    }) => {
-      return `The Queue name '${name}' is already being used. ` + `All instances of backgroundSync.Queue must be given unique names.`;
-    },
-    'expired-test-without-max-age': ({
-      methodName,
-      paramName
-    }) => {
-      return `The '${methodName}()' method can only be used when the ` + `'${paramName}' is used in the constructor.`;
-    },
-    'unsupported-route-type': ({
-      moduleName,
-      className,
-      funcName,
-      paramName
-    }) => {
-      return `The supplied '${paramName}' parameter was an unsupported type. ` + `Please check the docs for ${moduleName}.${className}.${funcName} for ` + `valid input types.`;
-    },
-    'not-array-of-class': ({
-      value,
-      expectedClass,
-      moduleName,
-      className,
-      funcName,
-      paramName
-    }) => {
-      return `The supplied '${paramName}' parameter must be an array of ` + `'${expectedClass}' objects. Received '${JSON.stringify(value)},'. ` + `Please check the call to ${moduleName}.${className}.${funcName}() ` + `to fix the issue.`;
-    },
-    'max-entries-or-age-required': ({
-      moduleName,
-      className,
-      funcName
-    }) => {
-      return `You must define either config.maxEntries or config.maxAgeSeconds` + `in ${moduleName}.${className}.${funcName}`;
-    },
-    'statuses-or-headers-required': ({
-      moduleName,
-      className,
-      funcName
-    }) => {
-      return `You must define either config.statuses or config.headers` + `in ${moduleName}.${className}.${funcName}`;
-    },
-    'invalid-string': ({
-      moduleName,
-      className,
-      funcName,
-      paramName
-    }) => {
-      if (!paramName || !moduleName || !funcName) {
-        throw new Error(`Unexpected input to 'invalid-string' error.`);
-      }
-
-      return `When using strings, the '${paramName}' parameter must start with ` + `'http' (for cross-origin matches) or '/' (for same-origin matches). ` + `Please see the docs for ${moduleName}.${funcName}() for ` + `more info.`;
-    },
-    'channel-name-required': () => {
-      return `You must provide a channelName to construct a ` + `BroadcastCacheUpdate instance.`;
-    },
-    'invalid-responses-are-same-args': () => {
-      return `The arguments passed into responsesAreSame() appear to be ` + `invalid. Please ensure valid Responses are used.`;
-    },
-    'expire-custom-caches-only': () => {
-      return `You must provide a 'cacheName' property when using the ` + `expiration plugin with a runtime caching strategy.`;
-    },
-    'unit-must-be-bytes': ({
-      normalizedRangeHeader
-    }) => {
-      if (!normalizedRangeHeader) {
-        throw new Error(`Unexpected input to 'unit-must-be-bytes' error.`);
-      }
-
-      return `The 'unit' portion of the Range header must be set to 'bytes'. ` + `The Range header provided was "${normalizedRangeHeader}"`;
-    },
-    'single-range-only': ({
-      normalizedRangeHeader
-    }) => {
-      if (!normalizedRangeHeader) {
-        throw new Error(`Unexpected input to 'single-range-only' error.`);
-      }
-
-      return `Multiple ranges are not supported. Please use a  single start ` + `value, and optional end value. The Range header provided was ` + `"${normalizedRangeHeader}"`;
-    },
-    'invalid-range-values': ({
-      normalizedRangeHeader
-    }) => {
-      if (!normalizedRangeHeader) {
-        throw new Error(`Unexpected input to 'invalid-range-values' error.`);
-      }
-
-      return `The Range header is missing both start and end values. At least ` + `one of those values is needed. The Range header provided was ` + `"${normalizedRangeHeader}"`;
-    },
-    'no-range-header': () => {
-      return `No Range header was found in the Request provided.`;
-    },
-    'range-not-satisfiable': ({
-      size,
-      start,
-      end
-    }) => {
-      return `The start (${start}) and end (${end}) values in the Range are ` + `not satisfiable by the cached response, which is ${size} bytes.`;
-    },
-    'attempt-to-cache-non-get-request': ({
-      url,
-      method
-    }) => {
-      return `Unable to cache '${url}' because it is a '${method}' request and ` + `only 'GET' requests can be cached.`;
-    },
-    'cache-put-with-no-response': ({
-      url
-    }) => {
-      return `There was an attempt to cache '${url}' but the response was not ` + `defined.`;
-    },
-    'no-response': ({
-      url,
-      error
-    }) => {
-      let message = `The strategy could not generate a response for '${url}'.`;
-
-      if (error) {
-        message += ` The underlying error is ${error}.`;
-      }
-
-      return message;
-    },
-    'bad-precaching-response': ({
-      url,
-      status
-    }) => {
-      return `The precaching request for '${url}' failed with an HTTP ` + `status of ${status}.`;
-    }
-  };
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-
-  const generatorFunction = (code, ...args) => {
-    const message = messages[code];
-
-    if (!message) {
-      throw new Error(`Unable to find message for code '${code}'.`);
-    }
-
-    return message(...args);
-  };
-
-  const messageGenerator = generatorFunction;
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  /**
-   * Workbox errors should be thrown with this class.
-   * This allows use to ensure the type easily in tests,
-   * helps developers identify errors from workbox
-   * easily and allows use to optimise error
-   * messages correctly.
-   *
-   * @private
-   */
-
-  class WorkboxError extends Error {
-    /**
-     *
-     * @param {string} errorCode The error code that
-     * identifies this particular error.
-     * @param {Object=} details Any relevant arguments
-     * that will help developers identify issues should
-     * be added as a key on the context object.
-     */
-    constructor(errorCode, details) {
-      let message = messageGenerator(errorCode, details);
-      super(message);
-      this.name = errorCode;
-      this.details = details;
-    }
-
-  }
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  /*
-   * This method returns true if the current context is a service worker.
-   */
-
-  const isSWEnv = moduleName => {
-    if (!('ServiceWorkerGlobalScope' in self)) {
-      throw new WorkboxError('not-in-sw', {
-        moduleName
-      });
-    }
-  };
-  /*
-   * This method throws if the supplied value is not an array.
-   * The destructed values are required to produce a meaningful error for users.
-   * The destructed and restructured object is so it's clear what is
-   * needed.
-   */
-
-
-  const isArray = (value, {
-    moduleName,
-    className,
-    funcName,
-    paramName
-  }) => {
-    if (!Array.isArray(value)) {
-      throw new WorkboxError('not-an-array', {
-        moduleName,
-        className,
-        funcName,
-        paramName
-      });
-    }
-  };
-
-  const hasMethod = (object, expectedMethod, {
-    moduleName,
-    className,
-    funcName,
-    paramName
-  }) => {
-    const type = typeof object[expectedMethod];
-
-    if (type !== 'function') {
-      throw new WorkboxError('missing-a-method', {
-        paramName,
-        expectedMethod,
-        moduleName,
-        className,
-        funcName
-      });
-    }
-  };
-
-  const isType = (object, expectedType, {
-    moduleName,
-    className,
-    funcName,
-    paramName
-  }) => {
-    if (typeof object !== expectedType) {
-      throw new WorkboxError('incorrect-type', {
-        paramName,
-        expectedType,
-        moduleName,
-        className,
-        funcName
-      });
-    }
-  };
-
-  const isInstance = (object, expectedClass, {
-    moduleName,
-    className,
-    funcName,
-    paramName,
-    isReturnValueProblem
-  }) => {
-    if (!(object instanceof expectedClass)) {
-      throw new WorkboxError('incorrect-class', {
-        paramName,
-        expectedClass,
-        moduleName,
-        className,
-        funcName,
-        isReturnValueProblem
-      });
-    }
-  };
-
-  const isOneOf = (value, validValues, {
-    paramName
-  }) => {
-    if (!validValues.includes(value)) {
-      throw new WorkboxError('invalid-value', {
-        paramName,
-        value,
-        validValueDescription: `Valid values are ${JSON.stringify(validValues)}.`
-      });
-    }
-  };
-
-  const isArrayOfClass = (value, expectedClass, {
-    moduleName,
-    className,
-    funcName,
-    paramName
-  }) => {
-    const error = new WorkboxError('not-array-of-class', {
-      value,
-      expectedClass,
-      moduleName,
-      className,
-      funcName,
-      paramName
-    });
-
-    if (!Array.isArray(value)) {
-      throw error;
-    }
-
-    for (let item of value) {
-      if (!(item instanceof expectedClass)) {
-        throw error;
-      }
-    }
-  };
-
-  const finalAssertExports = {
-    hasMethod,
-    isArray,
-    isInstance,
-    isOneOf,
-    isSWEnv,
-    isType,
-    isArrayOfClass
-  };
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-
-  const quotaErrorCallbacks = new Set();
-
-  /*
-    Copyright 2019 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  /**
-   * Adds a function to the set of quotaErrorCallbacks that will be executed if
-   * there's a quota error.
-   *
-   * @param {Function} callback
-   * @memberof workbox.core
-   */
-
-  function registerQuotaErrorCallback(callback) {
-    {
-      finalAssertExports.isType(callback, 'function', {
-        moduleName: 'workbox-core',
-        funcName: 'register',
-        paramName: 'callback'
-      });
-    }
-
-    quotaErrorCallbacks.add(callback);
-
-    {
-      logger.log('Registered a callback to respond to quota errors.', callback);
-    }
-  }
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  const _cacheNameDetails = {
-    googleAnalytics: 'googleAnalytics',
-    precache: 'precache-v2',
-    prefix: 'workbox',
-    runtime: 'runtime',
-    suffix: self.registration.scope
-  };
-
-  const _createCacheName = cacheName => {
-    return [_cacheNameDetails.prefix, cacheName, _cacheNameDetails.suffix].filter(value => value.length > 0).join('-');
-  };
-
-  const cacheNames = {
-    updateDetails: details => {
-      Object.keys(_cacheNameDetails).forEach(key => {
-        if (typeof details[key] !== 'undefined') {
-          _cacheNameDetails[key] = details[key];
-        }
-      });
-    },
-    getGoogleAnalyticsName: userCacheName => {
-      return userCacheName || _createCacheName(_cacheNameDetails.googleAnalytics);
-    },
-    getPrecacheName: userCacheName => {
-      return userCacheName || _createCacheName(_cacheNameDetails.precache);
-    },
-    getPrefix: () => {
-      return _cacheNameDetails.prefix;
-    },
-    getRuntimeName: userCacheName => {
-      return userCacheName || _createCacheName(_cacheNameDetails.runtime);
-    },
-    getSuffix: () => {
-      return _cacheNameDetails.suffix;
-    }
-  };
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-
-  const getFriendlyURL = url => {
-    const urlObj = new URL(url, location);
-
-    if (urlObj.origin === location.origin) {
-      return urlObj.pathname;
-    }
-
-    return urlObj.href;
-  };
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  /**
-   * Runs all of the callback functions, one at a time sequentially, in the order
-   * in which they were registered.
-   *
-   * @memberof workbox.core
-   * @private
-   */
-
-  async function executeQuotaErrorCallbacks() {
-    {
-      logger.log(`About to run ${quotaErrorCallbacks.size} ` + `callbacks to clean up caches.`);
-    }
-
-    for (const callback of quotaErrorCallbacks) {
-      await callback();
-
-      {
-        logger.log(callback, 'is complete.');
-      }
-    }
-
-    {
-      logger.log('Finished running callbacks.');
-    }
-  }
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  const pluginEvents = {
-    CACHE_DID_UPDATE: 'cacheDidUpdate',
-    CACHE_KEY_WILL_BE_USED: 'cacheKeyWillBeUsed',
-    CACHE_WILL_UPDATE: 'cacheWillUpdate',
-    CACHED_RESPONSE_WILL_BE_USED: 'cachedResponseWillBeUsed',
-    FETCH_DID_FAIL: 'fetchDidFail',
-    FETCH_DID_SUCCEED: 'fetchDidSucceed',
-    REQUEST_WILL_FETCH: 'requestWillFetch'
-  };
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  const pluginUtils = {
-    filter: (plugins, callbackName) => {
-      return plugins.filter(plugin => callbackName in plugin);
-    }
-  };
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  /**
-   * Wrapper around cache.put().
-   *
-   * Will call `cacheDidUpdate` on plugins if the cache was updated, using
-   * `matchOptions` when determining what the old entry is.
-   *
-   * @param {Object} options
-   * @param {string} options.cacheName
-   * @param {Request} options.request
-   * @param {Response} options.response
-   * @param {Event} [options.event]
-   * @param {Array<Object>} [options.plugins=[]]
-   * @param {Object} [options.matchOptions]
-   *
-   * @private
-   * @memberof module:workbox-core
-   */
-
-  const putWrapper = async ({
-    cacheName,
-    request,
-    response,
-    event,
-    plugins = [],
-    matchOptions
-  } = {}) => {
-    {
-      if (request.method && request.method !== 'GET') {
-        throw new WorkboxError('attempt-to-cache-non-get-request', {
-          url: getFriendlyURL(request.url),
-          method: request.method
-        });
-      }
-    }
-
-    const effectiveRequest = await _getEffectiveRequest({
-      plugins,
-      request,
-      mode: 'write'
-    });
-
-    if (!response) {
-      {
-        logger.error(`Cannot cache non-existent response for ` + `'${getFriendlyURL(effectiveRequest.url)}'.`);
-      }
-
-      throw new WorkboxError('cache-put-with-no-response', {
-        url: getFriendlyURL(effectiveRequest.url)
-      });
-    }
-
-    let responseToCache = await _isResponseSafeToCache({
-      event,
-      plugins,
-      response,
-      request: effectiveRequest
-    });
-
-    if (!responseToCache) {
-      {
-        logger.debug(`Response '${getFriendlyURL(effectiveRequest.url)}' will ` + `not be cached.`, responseToCache);
-      }
-
-      return;
-    }
-
-    const cache = await caches.open(cacheName);
-    const updatePlugins = pluginUtils.filter(plugins, pluginEvents.CACHE_DID_UPDATE);
-    let oldResponse = updatePlugins.length > 0 ? await matchWrapper({
-      cacheName,
-      matchOptions,
-      request: effectiveRequest
-    }) : null;
-
-    {
-      logger.debug(`Updating the '${cacheName}' cache with a new Response for ` + `${getFriendlyURL(effectiveRequest.url)}.`);
-    }
-
-    try {
-      await cache.put(effectiveRequest, responseToCache);
-    } catch (error) {
-      // See https://developer.mozilla.org/en-US/docs/Web/API/DOMException#exception-QuotaExceededError
-      if (error.name === 'QuotaExceededError') {
-        await executeQuotaErrorCallbacks();
-      }
-
-      throw error;
-    }
-
-    for (let plugin of updatePlugins) {
-      await plugin[pluginEvents.CACHE_DID_UPDATE].call(plugin, {
-        cacheName,
-        event,
-        oldResponse,
-        newResponse: responseToCache,
-        request: effectiveRequest
-      });
-    }
-  };
-  /**
-   * This is a wrapper around cache.match().
-   *
-   * @param {Object} options
-   * @param {string} options.cacheName Name of the cache to match against.
-   * @param {Request} options.request The Request that will be used to look up
-   *     cache entries.
-   * @param {Event} [options.event] The event that propted the action.
-   * @param {Object} [options.matchOptions] Options passed to cache.match().
-   * @param {Array<Object>} [options.plugins=[]] Array of plugins.
-   * @return {Response} A cached response if available.
-   *
-   * @private
-   * @memberof module:workbox-core
-   */
-
-
-  const matchWrapper = async ({
-    cacheName,
-    request,
-    event,
-    matchOptions,
-    plugins = []
-  }) => {
-    const cache = await caches.open(cacheName);
-    const effectiveRequest = await _getEffectiveRequest({
-      plugins,
-      request,
-      mode: 'read'
-    });
-    let cachedResponse = await cache.match(effectiveRequest, matchOptions);
-
-    {
-      if (cachedResponse) {
-        logger.debug(`Found a cached response in '${cacheName}'.`);
-      } else {
-        logger.debug(`No cached response found in '${cacheName}'.`);
-      }
-    }
-
-    for (const plugin of plugins) {
-      if (pluginEvents.CACHED_RESPONSE_WILL_BE_USED in plugin) {
-        cachedResponse = await plugin[pluginEvents.CACHED_RESPONSE_WILL_BE_USED].call(plugin, {
-          cacheName,
-          event,
-          matchOptions,
-          cachedResponse,
-          request: effectiveRequest
-        });
-
-        {
-          if (cachedResponse) {
-            finalAssertExports.isInstance(cachedResponse, Response, {
-              moduleName: 'Plugin',
-              funcName: pluginEvents.CACHED_RESPONSE_WILL_BE_USED,
-              isReturnValueProblem: true
-            });
-          }
-        }
-      }
-    }
-
-    return cachedResponse;
-  };
-  /**
-   * This method will call cacheWillUpdate on the available plugins (or use
-   * status === 200) to determine if the Response is safe and valid to cache.
-   *
-   * @param {Object} options
-   * @param {Request} options.request
-   * @param {Response} options.response
-   * @param {Event} [options.event]
-   * @param {Array<Object>} [options.plugins=[]]
-   * @return {Promise<Response>}
-   *
-   * @private
-   * @memberof module:workbox-core
-   */
-
-
-  const _isResponseSafeToCache = async ({
-    request,
-    response,
-    event,
-    plugins
-  }) => {
-    let responseToCache = response;
-    let pluginsUsed = false;
-
-    for (let plugin of plugins) {
-      if (pluginEvents.CACHE_WILL_UPDATE in plugin) {
-        pluginsUsed = true;
-        responseToCache = await plugin[pluginEvents.CACHE_WILL_UPDATE].call(plugin, {
-          request,
-          response: responseToCache,
-          event
-        });
-
-        {
-          if (responseToCache) {
-            finalAssertExports.isInstance(responseToCache, Response, {
-              moduleName: 'Plugin',
-              funcName: pluginEvents.CACHE_WILL_UPDATE,
-              isReturnValueProblem: true
-            });
-          }
-        }
-
-        if (!responseToCache) {
-          break;
-        }
-      }
-    }
-
-    if (!pluginsUsed) {
-      {
-        if (!responseToCache.status === 200) {
-          if (responseToCache.status === 0) {
-            logger.warn(`The response for '${request.url}' is an opaque ` + `response. The caching strategy that you're using will not ` + `cache opaque responses by default.`);
-          } else {
-            logger.debug(`The response for '${request.url}' returned ` + `a status code of '${response.status}' and won't be cached as a ` + `result.`);
-          }
-        }
-      }
-
-      responseToCache = responseToCache.status === 200 ? responseToCache : null;
-    }
-
-    return responseToCache ? responseToCache : null;
-  };
-  /**
-   * Checks the list of plugins for the cacheKeyWillBeUsed callback, and
-   * executes any of those callbacks found in sequence. The final `Request` object
-   * returned by the last plugin is treated as the cache key for cache reads
-   * and/or writes.
-   *
-   * @param {Object} options
-   * @param {Request} options.request
-   * @param {string} options.mode
-   * @param {Array<Object>} [options.plugins=[]]
-   * @return {Promise<Request>}
-   *
-   * @private
-   * @memberof module:workbox-core
-   */
-
-
-  const _getEffectiveRequest = async ({
-    request,
-    mode,
-    plugins
-  }) => {
-    const cacheKeyWillBeUsedPlugins = pluginUtils.filter(plugins, pluginEvents.CACHE_KEY_WILL_BE_USED);
-    let effectiveRequest = request;
-
-    for (const plugin of cacheKeyWillBeUsedPlugins) {
-      effectiveRequest = await plugin[pluginEvents.CACHE_KEY_WILL_BE_USED].call(plugin, {
-        mode,
-        request: effectiveRequest
-      });
-
-      if (typeof effectiveRequest === 'string') {
-        effectiveRequest = new Request(effectiveRequest);
-      }
-
-      {
-        finalAssertExports.isInstance(effectiveRequest, Request, {
-          moduleName: 'Plugin',
-          funcName: pluginEvents.CACHE_KEY_WILL_BE_USED,
-          isReturnValueProblem: true
-        });
-      }
-    }
-
-    return effectiveRequest;
-  };
-
-  const cacheWrapper = {
-    put: putWrapper,
-    match: matchWrapper
-  };
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  /**
-   * A class that wraps common IndexedDB functionality in a promise-based API.
-   * It exposes all the underlying power and functionality of IndexedDB, but
-   * wraps the most commonly used features in a way that's much simpler to use.
-   *
-   * @private
-   */
-
-  class DBWrapper {
-    /**
-     * @param {string} name
-     * @param {number} version
-     * @param {Object=} [callback]
-     * @param {!Function} [callbacks.onupgradeneeded]
-     * @param {!Function} [callbacks.onversionchange] Defaults to
-     *     DBWrapper.prototype._onversionchange when not specified.
-     * @private
-     */
-    constructor(name, version, {
-      onupgradeneeded,
-      onversionchange = this._onversionchange
-    } = {}) {
-      this._name = name;
-      this._version = version;
-      this._onupgradeneeded = onupgradeneeded;
-      this._onversionchange = onversionchange; // If this is null, it means the database isn't open.
-
-      this._db = null;
-    }
-    /**
-     * Returns the IDBDatabase instance (not normally needed).
-     *
-     * @private
-     */
-
-
-    get db() {
-      return this._db;
-    }
-    /**
-     * Opens a connected to an IDBDatabase, invokes any onupgradedneeded
-     * callback, and added an onversionchange callback to the database.
-     *
-     * @return {IDBDatabase}
-     * @private
-     */
-
-
-    async open() {
-      if (this._db) return;
-      this._db = await new Promise((resolve, reject) => {
-        // This flag is flipped to true if the timeout callback runs prior
-        // to the request failing or succeeding. Note: we use a timeout instead
-        // of an onblocked handler since there are cases where onblocked will
-        // never never run. A timeout better handles all possible scenarios:
-        // https://github.com/w3c/IndexedDB/issues/223
-        let openRequestTimedOut = false;
-        setTimeout(() => {
-          openRequestTimedOut = true;
-          reject(new Error('The open request was blocked and timed out'));
-        }, this.OPEN_TIMEOUT);
-        const openRequest = indexedDB.open(this._name, this._version);
-
-        openRequest.onerror = () => reject(openRequest.error);
-
-        openRequest.onupgradeneeded = evt => {
-          if (openRequestTimedOut) {
-            openRequest.transaction.abort();
-            evt.target.result.close();
-          } else if (this._onupgradeneeded) {
-            this._onupgradeneeded(evt);
-          }
-        };
-
-        openRequest.onsuccess = ({
-          target
-        }) => {
-          const db = target.result;
-
-          if (openRequestTimedOut) {
-            db.close();
-          } else {
-            db.onversionchange = this._onversionchange.bind(this);
-            resolve(db);
-          }
-        };
-      });
-      return this;
-    }
-    /**
-     * Polyfills the native `getKey()` method. Note, this is overridden at
-     * runtime if the browser supports the native method.
-     *
-     * @param {string} storeName
-     * @param {*} query
-     * @return {Array}
-     * @private
-     */
-
-
-    async getKey(storeName, query) {
-      return (await this.getAllKeys(storeName, query, 1))[0];
-    }
-    /**
-     * Polyfills the native `getAll()` method. Note, this is overridden at
-     * runtime if the browser supports the native method.
-     *
-     * @param {string} storeName
-     * @param {*} query
-     * @param {number} count
-     * @return {Array}
-     * @private
-     */
-
-
-    async getAll(storeName, query, count) {
-      return await this.getAllMatching(storeName, {
-        query,
-        count
-      });
-    }
-    /**
-     * Polyfills the native `getAllKeys()` method. Note, this is overridden at
-     * runtime if the browser supports the native method.
-     *
-     * @param {string} storeName
-     * @param {*} query
-     * @param {number} count
-     * @return {Array}
-     * @private
-     */
-
-
-    async getAllKeys(storeName, query, count) {
-      return (await this.getAllMatching(storeName, {
-        query,
-        count,
-        includeKeys: true
-      })).map(({
-        key
-      }) => key);
-    }
-    /**
-     * Supports flexible lookup in an object store by specifying an index,
-     * query, direction, and count. This method returns an array of objects
-     * with the signature .
-     *
-     * @param {string} storeName
-     * @param {Object} [opts]
-     * @param {string} [opts.index] The index to use (if specified).
-     * @param {*} [opts.query]
-     * @param {IDBCursorDirection} [opts.direction]
-     * @param {number} [opts.count] The max number of results to return.
-     * @param {boolean} [opts.includeKeys] When true, the structure of the
-     *     returned objects is changed from an array of values to an array of
-     *     objects in the form {key, primaryKey, value}.
-     * @return {Array}
-     * @private
-     */
-
-
-    async getAllMatching(storeName, {
-      index,
-      query = null,
-      // IE errors if query === `undefined`.
-      direction = 'next',
-      count,
-      includeKeys
-    } = {}) {
-      return await this.transaction([storeName], 'readonly', (txn, done) => {
-        const store = txn.objectStore(storeName);
-        const target = index ? store.index(index) : store;
-        const results = [];
-
-        target.openCursor(query, direction).onsuccess = ({
-          target
-        }) => {
-          const cursor = target.result;
-
-          if (cursor) {
-            const {
-              primaryKey,
-              key,
-              value
-            } = cursor;
-            results.push(includeKeys ? {
-              primaryKey,
-              key,
-              value
-            } : value);
-
-            if (count && results.length >= count) {
-              done(results);
-            } else {
-              cursor.continue();
-            }
-          } else {
-            done(results);
-          }
-        };
-      });
-    }
-    /**
-     * Accepts a list of stores, a transaction type, and a callback and
-     * performs a transaction. A promise is returned that resolves to whatever
-     * value the callback chooses. The callback holds all the transaction logic
-     * and is invoked with two arguments:
-     *   1. The IDBTransaction object
-     *   2. A `done` function, that's used to resolve the promise when
-     *      when the transaction is done, if passed a value, the promise is
-     *      resolved to that value.
-     *
-     * @param {Array<string>} storeNames An array of object store names
-     *     involved in the transaction.
-     * @param {string} type Can be `readonly` or `readwrite`.
-     * @param {!Function} callback
-     * @return {*} The result of the transaction ran by the callback.
-     * @private
-     */
-
-
-    async transaction(storeNames, type, callback) {
-      await this.open();
-      return await new Promise((resolve, reject) => {
-        const txn = this._db.transaction(storeNames, type);
-
-        txn.onabort = ({
-          target
-        }) => reject(target.error);
-
-        txn.oncomplete = () => resolve();
-
-        callback(txn, value => resolve(value));
-      });
-    }
-    /**
-     * Delegates async to a native IDBObjectStore method.
-     *
-     * @param {string} method The method name.
-     * @param {string} storeName The object store name.
-     * @param {string} type Can be `readonly` or `readwrite`.
-     * @param {...*} args The list of args to pass to the native method.
-     * @return {*} The result of the transaction.
-     * @private
-     */
-
-
-    async _call(method, storeName, type, ...args) {
-      const callback = (txn, done) => {
-        txn.objectStore(storeName)[method](...args).onsuccess = ({
-          target
-        }) => {
-          done(target.result);
-        };
-      };
-
-      return await this.transaction([storeName], type, callback);
-    }
-    /**
-     * The default onversionchange handler, which closes the database so other
-     * connections can open without being blocked.
-     *
-     * @private
-     */
-
-
-    _onversionchange() {
-      this.close();
-    }
-    /**
-     * Closes the connection opened by `DBWrapper.open()`. Generally this method
-     * doesn't need to be called since:
-     *   1. It's usually better to keep a connection open since opening
-     *      a new connection is somewhat slow.
-     *   2. Connections are automatically closed when the reference is
-     *      garbage collected.
-     * The primary use case for needing to close a connection is when another
-     * reference (typically in another tab) needs to upgrade it and would be
-     * blocked by the current, open connection.
-     *
-     * @private
-     */
-
-
-    close() {
-      if (this._db) {
-        this._db.close();
-
-        this._db = null;
-      }
-    }
-
-  } // Exposed to let users modify the default timeout on a per-instance
-  // or global basis.
-
-  DBWrapper.prototype.OPEN_TIMEOUT = 2000; // Wrap native IDBObjectStore methods according to their mode.
-
-  const methodsToWrap = {
-    'readonly': ['get', 'count', 'getKey', 'getAll', 'getAllKeys'],
-    'readwrite': ['add', 'put', 'clear', 'delete']
-  };
-
-  for (const [mode, methods] of Object.entries(methodsToWrap)) {
-    for (const method of methods) {
-      if (method in IDBObjectStore.prototype) {
-        // Don't use arrow functions here since we're outside of the class.
-        DBWrapper.prototype[method] = async function (storeName, ...args) {
-          return await this._call(method, storeName, mode, ...args);
-        };
-      }
-    }
-  }
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  /**
-   * The Deferred class composes Promises in a way that allows for them to be
-   * resolved or rejected from outside the constructor. In most cases promises
-   * should be used directly, but Deferreds can be necessary when the logic to
-   * resolve a promise must be separate.
-   *
-   * @private
-   */
-
-  class Deferred {
-    /**
-     * Creates a promise and exposes its resolve and reject functions as methods.
-     */
-    constructor() {
-      this.promise = new Promise((resolve, reject) => {
-        this.resolve = resolve;
-        this.reject = reject;
-      });
-    }
-
-  }
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  /**
-   * Deletes the database.
-   * Note: this is exported separately from the DBWrapper module because most
-   * usages of IndexedDB in workbox dont need deleting, and this way it can be
-   * reused in tests to delete databases without creating DBWrapper instances.
-   *
-   * @param {string} name The database name.
-   * @private
-   */
-
-  const deleteDatabase = async name => {
-    await new Promise((resolve, reject) => {
-      const request = indexedDB.deleteDatabase(name);
-
-      request.onerror = ({
-        target
-      }) => {
-        reject(target.error);
-      };
-
-      request.onblocked = () => {
-        reject(new Error('Delete blocked'));
-      };
-
-      request.onsuccess = () => {
-        resolve();
-      };
-    });
-  };
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  /**
-   * Wrapper around the fetch API.
-   *
-   * Will call requestWillFetch on available plugins.
-   *
-   * @param {Object} options
-   * @param {Request|string} options.request
-   * @param {Object} [options.fetchOptions]
-   * @param {Event} [options.event]
-   * @param {Array<Object>} [options.plugins=[]]
-   * @return {Promise<Response>}
-   *
-   * @private
-   * @memberof module:workbox-core
-   */
-
-  const wrappedFetch = async ({
-    request,
-    fetchOptions,
-    event,
-    plugins = []
-  }) => {
-    // We *should* be able to call `await event.preloadResponse` even if it's
-    // undefined, but for some reason, doing so leads to errors in our Node unit
-    // tests. To work around that, explicitly check preloadResponse's value first.
-    if (event && event.preloadResponse) {
-      const possiblePreloadResponse = await event.preloadResponse;
-
-      if (possiblePreloadResponse) {
-        {
-          logger.log(`Using a preloaded navigation response for ` + `'${getFriendlyURL(request.url)}'`);
-        }
-
-        return possiblePreloadResponse;
-      }
-    }
-
-    if (typeof request === 'string') {
-      request = new Request(request);
-    }
-
-    {
-      finalAssertExports.isInstance(request, Request, {
-        paramName: request,
-        expectedClass: 'Request',
-        moduleName: 'workbox-core',
-        className: 'fetchWrapper',
-        funcName: 'wrappedFetch'
-      });
-    }
-
-    const failedFetchPlugins = pluginUtils.filter(plugins, pluginEvents.FETCH_DID_FAIL); // If there is a fetchDidFail plugin, we need to save a clone of the
-    // original request before it's either modified by a requestWillFetch
-    // plugin or before the original request's body is consumed via fetch().
-
-    const originalRequest = failedFetchPlugins.length > 0 ? request.clone() : null;
-
-    try {
-      for (let plugin of plugins) {
-        if (pluginEvents.REQUEST_WILL_FETCH in plugin) {
-          request = await plugin[pluginEvents.REQUEST_WILL_FETCH].call(plugin, {
-            request: request.clone(),
-            event
-          });
-
-          {
-            if (request) {
-              finalAssertExports.isInstance(request, Request, {
-                moduleName: 'Plugin',
-                funcName: pluginEvents.CACHED_RESPONSE_WILL_BE_USED,
-                isReturnValueProblem: true
-              });
-            }
-          }
-        }
-      }
-    } catch (err) {
-      throw new WorkboxError('plugin-error-request-will-fetch', {
-        thrownError: err
-      });
-    } // The request can be altered by plugins with `requestWillFetch` making
-    // the original request (Most likely from a `fetch` event) to be different
-    // to the Request we make. Pass both to `fetchDidFail` to aid debugging.
-
-
-    let pluginFilteredRequest = request.clone();
-
-    try {
-      let fetchResponse; // See https://github.com/GoogleChrome/workbox/issues/1796
-
-      if (request.mode === 'navigate') {
-        fetchResponse = await fetch(request);
-      } else {
-        fetchResponse = await fetch(request, fetchOptions);
-      }
-
-      {
-        logger.debug(`Network request for ` + `'${getFriendlyURL(request.url)}' returned a response with ` + `status '${fetchResponse.status}'.`);
-      }
-
-      for (const plugin of plugins) {
-        if (pluginEvents.FETCH_DID_SUCCEED in plugin) {
-          fetchResponse = await plugin[pluginEvents.FETCH_DID_SUCCEED].call(plugin, {
-            event,
-            request: pluginFilteredRequest,
-            response: fetchResponse
-          });
-
-          {
-            if (fetchResponse) {
-              finalAssertExports.isInstance(fetchResponse, Response, {
-                moduleName: 'Plugin',
-                funcName: pluginEvents.FETCH_DID_SUCCEED,
-                isReturnValueProblem: true
-              });
-            }
-          }
-        }
-      }
-
-      return fetchResponse;
-    } catch (error) {
-      {
-        logger.error(`Network request for ` + `'${getFriendlyURL(request.url)}' threw an error.`, error);
-      }
-
-      for (const plugin of failedFetchPlugins) {
-        await plugin[pluginEvents.FETCH_DID_FAIL].call(plugin, {
-          error,
-          event,
-          originalRequest: originalRequest.clone(),
-          request: pluginFilteredRequest.clone()
-        });
-      }
-
-      throw error;
-    }
-  };
-
-  const fetchWrapper = {
-    fetch: wrappedFetch
-  };
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-
-  var _private = /*#__PURE__*/Object.freeze({
-    assert: finalAssertExports,
-    cacheNames: cacheNames,
-    cacheWrapper: cacheWrapper,
-    DBWrapper: DBWrapper,
-    Deferred: Deferred,
-    deleteDatabase: deleteDatabase,
-    executeQuotaErrorCallbacks: executeQuotaErrorCallbacks,
-    fetchWrapper: fetchWrapper,
-    getFriendlyURL: getFriendlyURL,
-    logger: logger,
-    WorkboxError: WorkboxError
-  });
-
-  /*
-    Copyright 2019 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  /**
-   * Claim any currently available clients once the service worker
-   * becomes active. This is normally used in conjunction with `skipWaiting()`.
-   *
-   * @alias workbox.core.clientsClaim
-   */
-
-  const clientsClaim = () => {
-    addEventListener('activate', () => clients.claim());
-  };
-
-  /*
-    Copyright 2019 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  /**
-   * Get the current cache names and prefix/suffix used by Workbox.
-   *
-   * `cacheNames.precache` is used for precached assets,
-   * `cacheNames.googleAnalytics` is used by `workbox-google-analytics` to
-   * store `analytics.js`, and `cacheNames.runtime` is used for everything else.
-   *
-   * `cacheNames.prefix` can be used to retrieve just the current prefix value.
-   * `cacheNames.suffix` can be used to retrieve just the current suffix value.
-   *
-   * @return {Object} An object with `precache`, `runtime`, `prefix`, and
-   *     `googleAnalytics` properties.
-   *
-   * @alias workbox.core.cacheNames
-   */
-
-  const cacheNames$1 = {
-    get googleAnalytics() {
-      return cacheNames.getGoogleAnalyticsName();
-    },
-
-    get precache() {
-      return cacheNames.getPrecacheName();
-    },
-
-    get prefix() {
-      return cacheNames.getPrefix();
-    },
-
-    get runtime() {
-      return cacheNames.getRuntimeName();
-    },
-
-    get suffix() {
-      return cacheNames.getSuffix();
-    }
-
-  };
-
-  /*
-    Copyright 2019 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  /**
-   * Modifies the default cache names used by the Workbox packages.
-   * Cache names are generated as `<prefix>-<Cache Name>-<suffix>`.
-   *
-   * @param {Object} details
-   * @param {Object} [details.prefix] The string to add to the beginning of
-   *     the precache and runtime cache names.
-   * @param {Object} [details.suffix] The string to add to the end of
-   *     the precache and runtime cache names.
-   * @param {Object} [details.precache] The cache name to use for precache
-   *     caching.
-   * @param {Object} [details.runtime] The cache name to use for runtime caching.
-   * @param {Object} [details.googleAnalytics] The cache name to use for
-   *     `workbox-google-analytics` caching.
-   *
-   * @alias workbox.core.setCacheNameDetails
-   */
-
-  const setCacheNameDetails = details => {
-    {
-      Object.keys(details).forEach(key => {
-        finalAssertExports.isType(details[key], 'string', {
-          moduleName: 'workbox-core',
-          funcName: 'setCacheNameDetails',
-          paramName: `details.${key}`
-        });
-      });
-
-      if ('precache' in details && details.precache.length === 0) {
-        throw new WorkboxError('invalid-cache-name', {
-          cacheNameId: 'precache',
-          value: details.precache
-        });
-      }
-
-      if ('runtime' in details && details.runtime.length === 0) {
-        throw new WorkboxError('invalid-cache-name', {
-          cacheNameId: 'runtime',
-          value: details.runtime
-        });
-      }
-
-      if ('googleAnalytics' in details && details.googleAnalytics.length === 0) {
-        throw new WorkboxError('invalid-cache-name', {
-          cacheNameId: 'googleAnalytics',
-          value: details.googleAnalytics
-        });
-      }
-    }
-
-    cacheNames.updateDetails(details);
-  };
-
-  /*
-    Copyright 2019 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  /**
-   * Force a service worker to become active, instead of waiting. This is
-   * normally used in conjunction with `clientsClaim()`.
-   *
-   * @alias workbox.core.skipWaiting
-   */
-
-  const skipWaiting = () => {
-    // We need to explicitly call `self.skipWaiting()` here because we're
-    // shadowing `skipWaiting` with this local function.
-    addEventListener('install', () => self.skipWaiting());
-  };
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-
-  try {
-    self.workbox.v = self.workbox.v || {};
-  } catch (errer) {} // NOOP
-
-  exports._private = _private;
-  exports.clientsClaim = clientsClaim;
-  exports.cacheNames = cacheNames$1;
-  exports.registerQuotaErrorCallback = registerQuotaErrorCallback;
-  exports.setCacheNameDetails = setCacheNameDetails;
-  exports.skipWaiting = skipWaiting;
-
-  return exports;
-
-}({}));
-//# sourceMappingURL=workbox-core.dev.js.map
diff --git a/public/javascripts/workbox/workbox-core.dev.js.map b/public/javascripts/workbox/workbox-core.dev.js.map
deleted file mode 100644
index 879a7658d3d..00000000000
--- a/public/javascripts/workbox/workbox-core.dev.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"workbox-core.dev.js","sources":["../_version.mjs","../_private/logger.mjs","../models/messages/messages.mjs","../models/messages/messageGenerator.mjs","../_private/WorkboxError.mjs","../_private/assert.mjs","../models/quotaErrorCallbacks.mjs","../registerQuotaErrorCallback.mjs","../_private/cacheNames.mjs","../_private/getFriendlyURL.mjs","../_private/executeQuotaErrorCallbacks.mjs","../models/pluginEvents.mjs","../utils/pluginUtils.mjs","../_private/cacheWrapper.mjs","../_private/DBWrapper.mjs","../_private/Deferred.mjs","../_private/deleteDatabase.mjs","../_private/fetchWrapper.mjs","../_private.mjs","../clientsClaim.mjs","../cacheNames.mjs","../setCacheNameDetails.mjs","../skipWaiting.mjs","../index.mjs"],"sourcesContent":["try{self['workbox:core:4.3.1']&&_()}catch(e){}// eslint-disable-line","/*\n  Copyright 2019 Google LLC\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport '../_version.mjs';\n\n\nconst logger = process.env.NODE_ENV === 'production' ? null : (() => {\n  let inGroup = false;\n\n  const methodToColorMap = {\n    debug: `#7f8c8d`, // Gray\n    log: `#2ecc71`, // Green\n    warn: `#f39c12`, // Yellow\n    error: `#c0392b`, // Red\n    groupCollapsed: `#3498db`, // Blue\n    groupEnd: null, // No colored prefix on groupEnd\n  };\n\n  const print = function(method, args) {\n    if (method === 'groupCollapsed') {\n      // Safari doesn't print all console.groupCollapsed() arguments:\n      // https://bugs.webkit.org/show_bug.cgi?id=182754\n      if (/^((?!chrome|android).)*safari/i.test(navigator.userAgent)) {\n        console[method](...args);\n        return;\n      }\n    }\n\n    const styles = [\n      `background: ${methodToColorMap[method]}`,\n      `border-radius: 0.5em`,\n      `color: white`,\n      `font-weight: bold`,\n      `padding: 2px 0.5em`,\n    ];\n\n    // When in a group, the workbox prefix is not displayed.\n    const logPrefix = inGroup ? [] : ['%cworkbox', styles.join(';')];\n\n    console[method](...logPrefix, ...args);\n\n    if (method === 'groupCollapsed') {\n      inGroup = true;\n    }\n    if (method === 'groupEnd') {\n      inGroup = false;\n    }\n  };\n\n  const api = {};\n  for (const method of Object.keys(methodToColorMap)) {\n    api[method] = (...args) => {\n      print(method, args);\n    };\n  }\n\n  return api;\n})();\n\nexport {logger};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport '../../_version.mjs';\n\n\nexport const messages = {\n  'invalid-value': ({paramName, validValueDescription, value}) => {\n    if (!paramName || !validValueDescription) {\n      throw new Error(`Unexpected input to 'invalid-value' error.`);\n    }\n    return `The '${paramName}' parameter was given a value with an ` +\n      `unexpected value. ${validValueDescription} Received a value of ` +\n      `${JSON.stringify(value)}.`;\n  },\n\n  'not-in-sw': ({moduleName}) => {\n    if (!moduleName) {\n      throw new Error(`Unexpected input to 'not-in-sw' error.`);\n    }\n    return `The '${moduleName}' must be used in a service worker.`;\n  },\n\n  'not-an-array': ({moduleName, className, funcName, paramName}) => {\n    if (!moduleName || !className || !funcName || !paramName) {\n      throw new Error(`Unexpected input to 'not-an-array' error.`);\n    }\n    return `The parameter '${paramName}' passed into ` +\n      `'${moduleName}.${className}.${funcName}()' must be an array.`;\n  },\n\n  'incorrect-type': ({expectedType, paramName, moduleName, className,\n    funcName}) => {\n    if (!expectedType || !paramName || !moduleName || !funcName) {\n      throw new Error(`Unexpected input to 'incorrect-type' error.`);\n    }\n    return `The parameter '${paramName}' passed into ` +\n      `'${moduleName}.${className ? (className + '.') : ''}` +\n      `${funcName}()' must be of type ${expectedType}.`;\n  },\n\n  'incorrect-class': ({expectedClass, paramName, moduleName, className,\n    funcName, isReturnValueProblem}) => {\n    if (!expectedClass || !moduleName || !funcName) {\n      throw new Error(`Unexpected input to 'incorrect-class' error.`);\n    }\n\n    if (isReturnValueProblem) {\n      return `The return value from ` +\n        `'${moduleName}.${className ? (className + '.') : ''}${funcName}()' ` +\n        `must be an instance of class ${expectedClass.name}.`;\n    }\n\n    return `The parameter '${paramName}' passed into ` +\n      `'${moduleName}.${className ? (className + '.') : ''}${funcName}()' ` +\n      `must be an instance of class ${expectedClass.name}.`;\n  },\n\n  'missing-a-method': ({expectedMethod, paramName, moduleName, className,\n    funcName}) => {\n    if (!expectedMethod || !paramName || !moduleName || !className\n        || !funcName) {\n      throw new Error(`Unexpected input to 'missing-a-method' error.`);\n    }\n    return `${moduleName}.${className}.${funcName}() expected the ` +\n      `'${paramName}' parameter to expose a '${expectedMethod}' method.`;\n  },\n\n  'add-to-cache-list-unexpected-type': ({entry}) => {\n    return `An unexpected entry was passed to ` +\n    `'workbox-precaching.PrecacheController.addToCacheList()' The entry ` +\n    `'${JSON.stringify(entry)}' isn't supported. You must supply an array of ` +\n    `strings with one or more characters, objects with a url property or ` +\n    `Request objects.`;\n  },\n\n  'add-to-cache-list-conflicting-entries': ({firstEntry, secondEntry}) => {\n    if (!firstEntry || !secondEntry) {\n      throw new Error(`Unexpected input to ` +\n        `'add-to-cache-list-duplicate-entries' error.`);\n    }\n\n    return `Two of the entries passed to ` +\n      `'workbox-precaching.PrecacheController.addToCacheList()' had the URL ` +\n      `${firstEntry._entryId} but different revision details. Workbox is ` +\n      `is unable to cache and version the asset correctly. Please remove one ` +\n      `of the entries.`;\n  },\n\n  'plugin-error-request-will-fetch': ({thrownError}) => {\n    if (!thrownError) {\n      throw new Error(`Unexpected input to ` +\n        `'plugin-error-request-will-fetch', error.`);\n    }\n\n    return `An error was thrown by a plugins 'requestWillFetch()' method. ` +\n      `The thrown error message was: '${thrownError.message}'.`;\n  },\n\n  'invalid-cache-name': ({cacheNameId, value}) => {\n    if (!cacheNameId) {\n      throw new Error(\n          `Expected a 'cacheNameId' for error 'invalid-cache-name'`);\n    }\n\n    return `You must provide a name containing at least one character for ` +\n      `setCacheDeatils({${cacheNameId}: '...'}). Received a value of ` +\n      `'${JSON.stringify(value)}'`;\n  },\n\n  'unregister-route-but-not-found-with-method': ({method}) => {\n    if (!method) {\n      throw new Error(`Unexpected input to ` +\n        `'unregister-route-but-not-found-with-method' error.`);\n    }\n\n    return `The route you're trying to unregister was not  previously ` +\n      `registered for the method type '${method}'.`;\n  },\n\n  'unregister-route-route-not-registered': () => {\n    return `The route you're trying to unregister was not previously ` +\n      `registered.`;\n  },\n\n  'queue-replay-failed': ({name}) => {\n    return `Replaying the background sync queue '${name}' failed.`;\n  },\n\n  'duplicate-queue-name': ({name}) => {\n    return `The Queue name '${name}' is already being used. ` +\n        `All instances of backgroundSync.Queue must be given unique names.`;\n  },\n\n  'expired-test-without-max-age': ({methodName, paramName}) => {\n    return `The '${methodName}()' method can only be used when the ` +\n      `'${paramName}' is used in the constructor.`;\n  },\n\n  'unsupported-route-type': ({moduleName, className, funcName, paramName}) => {\n    return `The supplied '${paramName}' parameter was an unsupported type. ` +\n      `Please check the docs for ${moduleName}.${className}.${funcName} for ` +\n      `valid input types.`;\n  },\n\n  'not-array-of-class': ({value, expectedClass,\n    moduleName, className, funcName, paramName}) => {\n    return `The supplied '${paramName}' parameter must be an array of ` +\n      `'${expectedClass}' objects. Received '${JSON.stringify(value)},'. ` +\n      `Please check the call to ${moduleName}.${className}.${funcName}() ` +\n      `to fix the issue.`;\n  },\n\n  'max-entries-or-age-required': ({moduleName, className, funcName}) => {\n    return `You must define either config.maxEntries or config.maxAgeSeconds` +\n      `in ${moduleName}.${className}.${funcName}`;\n  },\n\n  'statuses-or-headers-required': ({moduleName, className, funcName}) => {\n    return `You must define either config.statuses or config.headers` +\n      `in ${moduleName}.${className}.${funcName}`;\n  },\n\n  'invalid-string': ({moduleName, className, funcName, paramName}) => {\n    if (!paramName || !moduleName || !funcName) {\n      throw new Error(`Unexpected input to 'invalid-string' error.`);\n    }\n    return `When using strings, the '${paramName}' parameter must start with ` +\n      `'http' (for cross-origin matches) or '/' (for same-origin matches). ` +\n      `Please see the docs for ${moduleName}.${funcName}() for ` +\n      `more info.`;\n  },\n\n  'channel-name-required': () => {\n    return `You must provide a channelName to construct a ` +\n    `BroadcastCacheUpdate instance.`;\n  },\n\n  'invalid-responses-are-same-args': () => {\n    return `The arguments passed into responsesAreSame() appear to be ` +\n      `invalid. Please ensure valid Responses are used.`;\n  },\n\n  'expire-custom-caches-only': () => {\n    return `You must provide a 'cacheName' property when using the ` +\n      `expiration plugin with a runtime caching strategy.`;\n  },\n\n  'unit-must-be-bytes': ({normalizedRangeHeader}) => {\n    if (!normalizedRangeHeader) {\n      throw new Error(`Unexpected input to 'unit-must-be-bytes' error.`);\n    }\n    return `The 'unit' portion of the Range header must be set to 'bytes'. ` +\n      `The Range header provided was \"${normalizedRangeHeader}\"`;\n  },\n\n  'single-range-only': ({normalizedRangeHeader}) => {\n    if (!normalizedRangeHeader) {\n      throw new Error(`Unexpected input to 'single-range-only' error.`);\n    }\n    return `Multiple ranges are not supported. Please use a  single start ` +\n      `value, and optional end value. The Range header provided was ` +\n      `\"${normalizedRangeHeader}\"`;\n  },\n\n  'invalid-range-values': ({normalizedRangeHeader}) => {\n    if (!normalizedRangeHeader) {\n      throw new Error(`Unexpected input to 'invalid-range-values' error.`);\n    }\n    return `The Range header is missing both start and end values. At least ` +\n      `one of those values is needed. The Range header provided was ` +\n      `\"${normalizedRangeHeader}\"`;\n  },\n\n  'no-range-header': () => {\n    return `No Range header was found in the Request provided.`;\n  },\n\n  'range-not-satisfiable': ({size, start, end}) => {\n    return `The start (${start}) and end (${end}) values in the Range are ` +\n      `not satisfiable by the cached response, which is ${size} bytes.`;\n  },\n\n  'attempt-to-cache-non-get-request': ({url, method}) => {\n    return `Unable to cache '${url}' because it is a '${method}' request and ` +\n      `only 'GET' requests can be cached.`;\n  },\n\n  'cache-put-with-no-response': ({url}) => {\n    return `There was an attempt to cache '${url}' but the response was not ` +\n      `defined.`;\n  },\n\n  'no-response': ({url, error}) => {\n    let message = `The strategy could not generate a response for '${url}'.`;\n    if (error) {\n      message += ` The underlying error is ${error}.`;\n    }\n    return message;\n  },\n\n  'bad-precaching-response': ({url, status}) => {\n    return `The precaching request for '${url}' failed with an HTTP ` +\n      `status of ${status}.`;\n  },\n};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {messages} from './messages.mjs';\nimport '../../_version.mjs';\n\nconst fallback = (code, ...args) => {\n  let msg = code;\n  if (args.length > 0) {\n    msg += ` :: ${JSON.stringify(args)}`;\n  }\n  return msg;\n};\n\nconst generatorFunction = (code, ...args) => {\n  const message = messages[code];\n  if (!message) {\n    throw new Error(`Unable to find message for code '${code}'.`);\n  }\n\n  return message(...args);\n};\n\nexport const messageGenerator = (process.env.NODE_ENV === 'production') ?\n    fallback : generatorFunction;\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {messageGenerator} from '../models/messages/messageGenerator.mjs';\nimport '../_version.mjs';\n\n/**\n * Workbox errors should be thrown with this class.\n * This allows use to ensure the type easily in tests,\n * helps developers identify errors from workbox\n * easily and allows use to optimise error\n * messages correctly.\n *\n * @private\n */\nclass WorkboxError extends Error {\n  /**\n   *\n   * @param {string} errorCode The error code that\n   * identifies this particular error.\n   * @param {Object=} details Any relevant arguments\n   * that will help developers identify issues should\n   * be added as a key on the context object.\n   */\n  constructor(errorCode, details) {\n    let message = messageGenerator(errorCode, details);\n\n    super(message);\n\n    this.name = errorCode;\n    this.details = details;\n  }\n}\n\nexport {WorkboxError};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {WorkboxError} from '../_private/WorkboxError.mjs';\nimport '../_version.mjs';\n\n/*\n * This method returns true if the current context is a service worker.\n */\nconst isSWEnv = (moduleName) => {\n  if (!('ServiceWorkerGlobalScope' in self)) {\n    throw new WorkboxError('not-in-sw', {moduleName});\n  }\n};\n\n/*\n * This method throws if the supplied value is not an array.\n * The destructed values are required to produce a meaningful error for users.\n * The destructed and restructured object is so it's clear what is\n * needed.\n */\nconst isArray = (value, {moduleName, className, funcName, paramName}) => {\n  if (!Array.isArray(value)) {\n    throw new WorkboxError('not-an-array', {\n      moduleName,\n      className,\n      funcName,\n      paramName,\n    });\n  }\n};\n\nconst hasMethod = (object, expectedMethod,\n    {moduleName, className, funcName, paramName}) => {\n  const type = typeof object[expectedMethod];\n  if (type !== 'function') {\n    throw new WorkboxError('missing-a-method', {paramName, expectedMethod,\n      moduleName, className, funcName});\n  }\n};\n\nconst isType = (object, expectedType,\n    {moduleName, className, funcName, paramName}) => {\n  if (typeof object !== expectedType) {\n    throw new WorkboxError('incorrect-type', {paramName, expectedType,\n      moduleName, className, funcName});\n  }\n};\n\nconst isInstance = (object, expectedClass,\n    {moduleName, className, funcName,\n      paramName, isReturnValueProblem}) => {\n  if (!(object instanceof expectedClass)) {\n    throw new WorkboxError('incorrect-class', {paramName, expectedClass,\n      moduleName, className, funcName, isReturnValueProblem});\n  }\n};\n\nconst isOneOf = (value, validValues, {paramName}) => {\n  if (!validValues.includes(value)) {\n    throw new WorkboxError('invalid-value', {\n      paramName,\n      value,\n      validValueDescription: `Valid values are ${JSON.stringify(validValues)}.`,\n    });\n  }\n};\n\nconst isArrayOfClass = (value, expectedClass,\n    {moduleName, className, funcName, paramName}) => {\n  const error = new WorkboxError('not-array-of-class', {\n    value, expectedClass,\n    moduleName, className, funcName, paramName,\n  });\n  if (!Array.isArray(value)) {\n    throw error;\n  }\n\n  for (let item of value) {\n    if (!(item instanceof expectedClass)) {\n      throw error;\n    }\n  }\n};\n\nconst finalAssertExports = process.env.NODE_ENV === 'production' ? null : {\n  hasMethod,\n  isArray,\n  isInstance,\n  isOneOf,\n  isSWEnv,\n  isType,\n  isArrayOfClass,\n};\n\nexport {finalAssertExports as assert};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport '../_version.mjs';\n\n\n// Callbacks to be executed whenever there's a quota error.\nconst quotaErrorCallbacks = new Set();\n\nexport {quotaErrorCallbacks};\n","/*\n  Copyright 2019 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {logger} from './_private/logger.mjs';\nimport {assert} from './_private/assert.mjs';\nimport {quotaErrorCallbacks} from './models/quotaErrorCallbacks.mjs';\nimport './_version.mjs';\n\n\n/**\n * Adds a function to the set of quotaErrorCallbacks that will be executed if\n * there's a quota error.\n *\n * @param {Function} callback\n * @memberof workbox.core\n */\nfunction registerQuotaErrorCallback(callback) {\n  if (process.env.NODE_ENV !== 'production') {\n    assert.isType(callback, 'function', {\n      moduleName: 'workbox-core',\n      funcName: 'register',\n      paramName: 'callback',\n    });\n  }\n\n  quotaErrorCallbacks.add(callback);\n\n  if (process.env.NODE_ENV !== 'production') {\n    logger.log('Registered a callback to respond to quota errors.', callback);\n  }\n}\n\nexport {registerQuotaErrorCallback};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport '../_version.mjs';\n\n\nconst _cacheNameDetails = {\n  googleAnalytics: 'googleAnalytics',\n  precache: 'precache-v2',\n  prefix: 'workbox',\n  runtime: 'runtime',\n  suffix: self.registration.scope,\n};\n\nconst _createCacheName = (cacheName) => {\n  return [_cacheNameDetails.prefix, cacheName, _cacheNameDetails.suffix]\n      .filter((value) => value.length > 0)\n      .join('-');\n};\n\nexport const cacheNames = {\n  updateDetails: (details) => {\n    Object.keys(_cacheNameDetails).forEach((key) => {\n      if (typeof details[key] !== 'undefined') {\n        _cacheNameDetails[key] = details[key];\n      }\n    });\n  },\n  getGoogleAnalyticsName: (userCacheName) => {\n    return userCacheName || _createCacheName(_cacheNameDetails.googleAnalytics);\n  },\n  getPrecacheName: (userCacheName) => {\n    return userCacheName || _createCacheName(_cacheNameDetails.precache);\n  },\n  getPrefix: () => {\n    return _cacheNameDetails.prefix;\n  },\n  getRuntimeName: (userCacheName) => {\n    return userCacheName || _createCacheName(_cacheNameDetails.runtime);\n  },\n  getSuffix: () => {\n    return _cacheNameDetails.suffix;\n  },\n};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport '../_version.mjs';\n\nconst getFriendlyURL = (url) => {\n  const urlObj = new URL(url, location);\n  if (urlObj.origin === location.origin) {\n    return urlObj.pathname;\n  }\n  return urlObj.href;\n};\n\nexport {getFriendlyURL};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {logger} from '../_private/logger.mjs';\nimport {quotaErrorCallbacks} from '../models/quotaErrorCallbacks.mjs';\nimport '../_version.mjs';\n\n\n/**\n * Runs all of the callback functions, one at a time sequentially, in the order\n * in which they were registered.\n *\n * @memberof workbox.core\n * @private\n */\nasync function executeQuotaErrorCallbacks() {\n  if (process.env.NODE_ENV !== 'production') {\n    logger.log(`About to run ${quotaErrorCallbacks.size} ` +\n        `callbacks to clean up caches.`);\n  }\n\n  for (const callback of quotaErrorCallbacks) {\n    await callback();\n    if (process.env.NODE_ENV !== 'production') {\n      logger.log(callback, 'is complete.');\n    }\n  }\n\n  if (process.env.NODE_ENV !== 'production') {\n    logger.log('Finished running callbacks.');\n  }\n}\n\nexport {executeQuotaErrorCallbacks};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport '../_version.mjs';\n\n\nexport const pluginEvents = {\n  CACHE_DID_UPDATE: 'cacheDidUpdate',\n  CACHE_KEY_WILL_BE_USED: 'cacheKeyWillBeUsed',\n  CACHE_WILL_UPDATE: 'cacheWillUpdate',\n  CACHED_RESPONSE_WILL_BE_USED: 'cachedResponseWillBeUsed',\n  FETCH_DID_FAIL: 'fetchDidFail',\n  FETCH_DID_SUCCEED: 'fetchDidSucceed',\n  REQUEST_WILL_FETCH: 'requestWillFetch',\n};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport '../_version.mjs';\n\nexport const pluginUtils = {\n  filter: (plugins, callbackName) => {\n    return plugins.filter((plugin) => callbackName in plugin);\n  },\n};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {WorkboxError} from './WorkboxError.mjs';\nimport {assert} from './assert.mjs';\nimport {getFriendlyURL} from './getFriendlyURL.mjs';\nimport {logger} from './logger.mjs';\nimport {executeQuotaErrorCallbacks} from './executeQuotaErrorCallbacks.mjs';\nimport {pluginEvents} from '../models/pluginEvents.mjs';\nimport {pluginUtils} from '../utils/pluginUtils.mjs';\nimport '../_version.mjs';\n\n\n/**\n * Wrapper around cache.put().\n *\n * Will call `cacheDidUpdate` on plugins if the cache was updated, using\n * `matchOptions` when determining what the old entry is.\n *\n * @param {Object} options\n * @param {string} options.cacheName\n * @param {Request} options.request\n * @param {Response} options.response\n * @param {Event} [options.event]\n * @param {Array<Object>} [options.plugins=[]]\n * @param {Object} [options.matchOptions]\n *\n * @private\n * @memberof module:workbox-core\n */\nconst putWrapper = async ({\n  cacheName,\n  request,\n  response,\n  event,\n  plugins = [],\n  matchOptions,\n} = {}) => {\n  if (process.env.NODE_ENV !== 'production') {\n    if (request.method && request.method !== 'GET') {\n      throw new WorkboxError('attempt-to-cache-non-get-request', {\n        url: getFriendlyURL(request.url),\n        method: request.method,\n      });\n    }\n  }\n\n  const effectiveRequest = await _getEffectiveRequest({\n    plugins, request, mode: 'write'});\n\n  if (!response) {\n    if (process.env.NODE_ENV !== 'production') {\n      logger.error(`Cannot cache non-existent response for ` +\n        `'${getFriendlyURL(effectiveRequest.url)}'.`);\n    }\n\n    throw new WorkboxError('cache-put-with-no-response', {\n      url: getFriendlyURL(effectiveRequest.url),\n    });\n  }\n\n  let responseToCache = await _isResponseSafeToCache({\n    event,\n    plugins,\n    response,\n    request: effectiveRequest,\n  });\n\n  if (!responseToCache) {\n    if (process.env.NODE_ENV !== 'production') {\n      logger.debug(`Response '${getFriendlyURL(effectiveRequest.url)}' will ` +\n      `not be cached.`, responseToCache);\n    }\n    return;\n  }\n\n  const cache = await caches.open(cacheName);\n\n  const updatePlugins = pluginUtils.filter(\n      plugins, pluginEvents.CACHE_DID_UPDATE);\n\n  let oldResponse = updatePlugins.length > 0 ?\n      await matchWrapper({cacheName, matchOptions, request: effectiveRequest}) :\n      null;\n\n  if (process.env.NODE_ENV !== 'production') {\n    logger.debug(`Updating the '${cacheName}' cache with a new Response for ` +\n      `${getFriendlyURL(effectiveRequest.url)}.`);\n  }\n\n  try {\n    await cache.put(effectiveRequest, responseToCache);\n  } catch (error) {\n    // See https://developer.mozilla.org/en-US/docs/Web/API/DOMException#exception-QuotaExceededError\n    if (error.name === 'QuotaExceededError') {\n      await executeQuotaErrorCallbacks();\n    }\n    throw error;\n  }\n\n  for (let plugin of updatePlugins) {\n    await plugin[pluginEvents.CACHE_DID_UPDATE].call(plugin, {\n      cacheName,\n      event,\n      oldResponse,\n      newResponse: responseToCache,\n      request: effectiveRequest,\n    });\n  }\n};\n\n/**\n * This is a wrapper around cache.match().\n *\n * @param {Object} options\n * @param {string} options.cacheName Name of the cache to match against.\n * @param {Request} options.request The Request that will be used to look up\n *     cache entries.\n * @param {Event} [options.event] The event that propted the action.\n * @param {Object} [options.matchOptions] Options passed to cache.match().\n * @param {Array<Object>} [options.plugins=[]] Array of plugins.\n * @return {Response} A cached response if available.\n *\n * @private\n * @memberof module:workbox-core\n */\nconst matchWrapper = async ({\n  cacheName,\n  request,\n  event,\n  matchOptions,\n  plugins = [],\n}) => {\n  const cache = await caches.open(cacheName);\n\n  const effectiveRequest = await _getEffectiveRequest({\n    plugins, request, mode: 'read'});\n\n  let cachedResponse = await cache.match(effectiveRequest, matchOptions);\n  if (process.env.NODE_ENV !== 'production') {\n    if (cachedResponse) {\n      logger.debug(`Found a cached response in '${cacheName}'.`);\n    } else {\n      logger.debug(`No cached response found in '${cacheName}'.`);\n    }\n  }\n\n  for (const plugin of plugins) {\n    if (pluginEvents.CACHED_RESPONSE_WILL_BE_USED in plugin) {\n      cachedResponse = await plugin[pluginEvents.CACHED_RESPONSE_WILL_BE_USED]\n          .call(plugin, {\n            cacheName,\n            event,\n            matchOptions,\n            cachedResponse,\n            request: effectiveRequest,\n          });\n      if (process.env.NODE_ENV !== 'production') {\n        if (cachedResponse) {\n          assert.isInstance(cachedResponse, Response, {\n            moduleName: 'Plugin',\n            funcName: pluginEvents.CACHED_RESPONSE_WILL_BE_USED,\n            isReturnValueProblem: true,\n          });\n        }\n      }\n    }\n  }\n\n  return cachedResponse;\n};\n\n/**\n * This method will call cacheWillUpdate on the available plugins (or use\n * status === 200) to determine if the Response is safe and valid to cache.\n *\n * @param {Object} options\n * @param {Request} options.request\n * @param {Response} options.response\n * @param {Event} [options.event]\n * @param {Array<Object>} [options.plugins=[]]\n * @return {Promise<Response>}\n *\n * @private\n * @memberof module:workbox-core\n */\nconst _isResponseSafeToCache = async ({request, response, event, plugins}) => {\n  let responseToCache = response;\n  let pluginsUsed = false;\n  for (let plugin of plugins) {\n    if (pluginEvents.CACHE_WILL_UPDATE in plugin) {\n      pluginsUsed = true;\n      responseToCache = await plugin[pluginEvents.CACHE_WILL_UPDATE]\n          .call(plugin, {\n            request,\n            response: responseToCache,\n            event,\n          });\n\n      if (process.env.NODE_ENV !== 'production') {\n        if (responseToCache) {\n          assert.isInstance(responseToCache, Response, {\n            moduleName: 'Plugin',\n            funcName: pluginEvents.CACHE_WILL_UPDATE,\n            isReturnValueProblem: true,\n          });\n        }\n      }\n\n      if (!responseToCache) {\n        break;\n      }\n    }\n  }\n\n  if (!pluginsUsed) {\n    if (process.env.NODE_ENV !== 'production') {\n      if (!responseToCache.status === 200) {\n        if (responseToCache.status === 0) {\n          logger.warn(`The response for '${request.url}' is an opaque ` +\n            `response. The caching strategy that you're using will not ` +\n            `cache opaque responses by default.`);\n        } else {\n          logger.debug(`The response for '${request.url}' returned ` +\n          `a status code of '${response.status}' and won't be cached as a ` +\n          `result.`);\n        }\n      }\n    }\n    responseToCache = responseToCache.status === 200 ? responseToCache : null;\n  }\n\n  return responseToCache ? responseToCache : null;\n};\n\n/**\n * Checks the list of plugins for the cacheKeyWillBeUsed callback, and\n * executes any of those callbacks found in sequence. The final `Request` object\n * returned by the last plugin is treated as the cache key for cache reads\n * and/or writes.\n *\n * @param {Object} options\n * @param {Request} options.request\n * @param {string} options.mode\n * @param {Array<Object>} [options.plugins=[]]\n * @return {Promise<Request>}\n *\n * @private\n * @memberof module:workbox-core\n */\nconst _getEffectiveRequest = async ({request, mode, plugins}) => {\n  const cacheKeyWillBeUsedPlugins = pluginUtils.filter(\n      plugins, pluginEvents.CACHE_KEY_WILL_BE_USED);\n\n  let effectiveRequest = request;\n  for (const plugin of cacheKeyWillBeUsedPlugins) {\n    effectiveRequest = await plugin[pluginEvents.CACHE_KEY_WILL_BE_USED].call(\n        plugin, {mode, request: effectiveRequest});\n\n    if (typeof effectiveRequest === 'string') {\n      effectiveRequest = new Request(effectiveRequest);\n    }\n\n    if (process.env.NODE_ENV !== 'production') {\n      assert.isInstance(effectiveRequest, Request, {\n        moduleName: 'Plugin',\n        funcName: pluginEvents.CACHE_KEY_WILL_BE_USED,\n        isReturnValueProblem: true,\n      });\n    }\n  }\n\n  return effectiveRequest;\n};\n\nexport const cacheWrapper = {\n  put: putWrapper,\n  match: matchWrapper,\n};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport '../_version.mjs';\n\n\n/**\n * A class that wraps common IndexedDB functionality in a promise-based API.\n * It exposes all the underlying power and functionality of IndexedDB, but\n * wraps the most commonly used features in a way that's much simpler to use.\n *\n * @private\n */\nexport class DBWrapper {\n  /**\n   * @param {string} name\n   * @param {number} version\n   * @param {Object=} [callback]\n   * @param {!Function} [callbacks.onupgradeneeded]\n   * @param {!Function} [callbacks.onversionchange] Defaults to\n   *     DBWrapper.prototype._onversionchange when not specified.\n   * @private\n   */\n  constructor(name, version, {\n    onupgradeneeded,\n    onversionchange = this._onversionchange,\n  } = {}) {\n    this._name = name;\n    this._version = version;\n    this._onupgradeneeded = onupgradeneeded;\n    this._onversionchange = onversionchange;\n\n    // If this is null, it means the database isn't open.\n    this._db = null;\n  }\n\n  /**\n   * Returns the IDBDatabase instance (not normally needed).\n   *\n   * @private\n   */\n  get db() {\n    return this._db;\n  }\n\n  /**\n   * Opens a connected to an IDBDatabase, invokes any onupgradedneeded\n   * callback, and added an onversionchange callback to the database.\n   *\n   * @return {IDBDatabase}\n   * @private\n   */\n  async open() {\n    if (this._db) return;\n\n    this._db = await new Promise((resolve, reject) => {\n      // This flag is flipped to true if the timeout callback runs prior\n      // to the request failing or succeeding. Note: we use a timeout instead\n      // of an onblocked handler since there are cases where onblocked will\n      // never never run. A timeout better handles all possible scenarios:\n      // https://github.com/w3c/IndexedDB/issues/223\n      let openRequestTimedOut = false;\n      setTimeout(() => {\n        openRequestTimedOut = true;\n        reject(new Error('The open request was blocked and timed out'));\n      }, this.OPEN_TIMEOUT);\n\n      const openRequest = indexedDB.open(this._name, this._version);\n      openRequest.onerror = () => reject(openRequest.error);\n      openRequest.onupgradeneeded = (evt) => {\n        if (openRequestTimedOut) {\n          openRequest.transaction.abort();\n          evt.target.result.close();\n        } else if (this._onupgradeneeded) {\n          this._onupgradeneeded(evt);\n        }\n      };\n      openRequest.onsuccess = ({target}) => {\n        const db = target.result;\n        if (openRequestTimedOut) {\n          db.close();\n        } else {\n          db.onversionchange = this._onversionchange.bind(this);\n          resolve(db);\n        }\n      };\n    });\n\n    return this;\n  }\n\n  /**\n   * Polyfills the native `getKey()` method. Note, this is overridden at\n   * runtime if the browser supports the native method.\n   *\n   * @param {string} storeName\n   * @param {*} query\n   * @return {Array}\n   * @private\n   */\n  async getKey(storeName, query) {\n    return (await this.getAllKeys(storeName, query, 1))[0];\n  }\n\n  /**\n   * Polyfills the native `getAll()` method. Note, this is overridden at\n   * runtime if the browser supports the native method.\n   *\n   * @param {string} storeName\n   * @param {*} query\n   * @param {number} count\n   * @return {Array}\n   * @private\n   */\n  async getAll(storeName, query, count) {\n    return await this.getAllMatching(storeName, {query, count});\n  }\n\n\n  /**\n   * Polyfills the native `getAllKeys()` method. Note, this is overridden at\n   * runtime if the browser supports the native method.\n   *\n   * @param {string} storeName\n   * @param {*} query\n   * @param {number} count\n   * @return {Array}\n   * @private\n   */\n  async getAllKeys(storeName, query, count) {\n    return (await this.getAllMatching(\n        storeName, {query, count, includeKeys: true})).map(({key}) => key);\n  }\n\n  /**\n   * Supports flexible lookup in an object store by specifying an index,\n   * query, direction, and count. This method returns an array of objects\n   * with the signature .\n   *\n   * @param {string} storeName\n   * @param {Object} [opts]\n   * @param {string} [opts.index] The index to use (if specified).\n   * @param {*} [opts.query]\n   * @param {IDBCursorDirection} [opts.direction]\n   * @param {number} [opts.count] The max number of results to return.\n   * @param {boolean} [opts.includeKeys] When true, the structure of the\n   *     returned objects is changed from an array of values to an array of\n   *     objects in the form {key, primaryKey, value}.\n   * @return {Array}\n   * @private\n   */\n  async getAllMatching(storeName, {\n    index,\n    query = null, // IE errors if query === `undefined`.\n    direction = 'next',\n    count,\n    includeKeys,\n  } = {}) {\n    return await this.transaction([storeName], 'readonly', (txn, done) => {\n      const store = txn.objectStore(storeName);\n      const target = index ? store.index(index) : store;\n      const results = [];\n\n      target.openCursor(query, direction).onsuccess = ({target}) => {\n        const cursor = target.result;\n        if (cursor) {\n          const {primaryKey, key, value} = cursor;\n          results.push(includeKeys ? {primaryKey, key, value} : value);\n          if (count && results.length >= count) {\n            done(results);\n          } else {\n            cursor.continue();\n          }\n        } else {\n          done(results);\n        }\n      };\n    });\n  }\n\n  /**\n   * Accepts a list of stores, a transaction type, and a callback and\n   * performs a transaction. A promise is returned that resolves to whatever\n   * value the callback chooses. The callback holds all the transaction logic\n   * and is invoked with two arguments:\n   *   1. The IDBTransaction object\n   *   2. A `done` function, that's used to resolve the promise when\n   *      when the transaction is done, if passed a value, the promise is\n   *      resolved to that value.\n   *\n   * @param {Array<string>} storeNames An array of object store names\n   *     involved in the transaction.\n   * @param {string} type Can be `readonly` or `readwrite`.\n   * @param {!Function} callback\n   * @return {*} The result of the transaction ran by the callback.\n   * @private\n   */\n  async transaction(storeNames, type, callback) {\n    await this.open();\n    return await new Promise((resolve, reject) => {\n      const txn = this._db.transaction(storeNames, type);\n      txn.onabort = ({target}) => reject(target.error);\n      txn.oncomplete = () => resolve();\n\n      callback(txn, (value) => resolve(value));\n    });\n  }\n\n  /**\n   * Delegates async to a native IDBObjectStore method.\n   *\n   * @param {string} method The method name.\n   * @param {string} storeName The object store name.\n   * @param {string} type Can be `readonly` or `readwrite`.\n   * @param {...*} args The list of args to pass to the native method.\n   * @return {*} The result of the transaction.\n   * @private\n   */\n  async _call(method, storeName, type, ...args) {\n    const callback = (txn, done) => {\n      txn.objectStore(storeName)[method](...args).onsuccess = ({target}) => {\n        done(target.result);\n      };\n    };\n\n    return await this.transaction([storeName], type, callback);\n  }\n\n  /**\n   * The default onversionchange handler, which closes the database so other\n   * connections can open without being blocked.\n   *\n   * @private\n   */\n  _onversionchange() {\n    this.close();\n  }\n\n  /**\n   * Closes the connection opened by `DBWrapper.open()`. Generally this method\n   * doesn't need to be called since:\n   *   1. It's usually better to keep a connection open since opening\n   *      a new connection is somewhat slow.\n   *   2. Connections are automatically closed when the reference is\n   *      garbage collected.\n   * The primary use case for needing to close a connection is when another\n   * reference (typically in another tab) needs to upgrade it and would be\n   * blocked by the current, open connection.\n   *\n   * @private\n   */\n  close() {\n    if (this._db) {\n      this._db.close();\n      this._db = null;\n    }\n  }\n}\n\n// Exposed to let users modify the default timeout on a per-instance\n// or global basis.\nDBWrapper.prototype.OPEN_TIMEOUT = 2000;\n\n// Wrap native IDBObjectStore methods according to their mode.\nconst methodsToWrap = {\n  'readonly': ['get', 'count', 'getKey', 'getAll', 'getAllKeys'],\n  'readwrite': ['add', 'put', 'clear', 'delete'],\n};\nfor (const [mode, methods] of Object.entries(methodsToWrap)) {\n  for (const method of methods) {\n    if (method in IDBObjectStore.prototype) {\n      // Don't use arrow functions here since we're outside of the class.\n      DBWrapper.prototype[method] = async function(storeName, ...args) {\n        return await this._call(method, storeName, mode, ...args);\n      };\n    }\n  }\n}\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport '../_version.mjs';\n\n\n/**\n * The Deferred class composes Promises in a way that allows for them to be\n * resolved or rejected from outside the constructor. In most cases promises\n * should be used directly, but Deferreds can be necessary when the logic to\n * resolve a promise must be separate.\n *\n * @private\n */\nexport class Deferred {\n  /**\n   * Creates a promise and exposes its resolve and reject functions as methods.\n   */\n  constructor() {\n    this.promise = new Promise((resolve, reject) => {\n      this.resolve = resolve;\n      this.reject = reject;\n    });\n  }\n}\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport '../_version.mjs';\n\n\n/**\n * Deletes the database.\n * Note: this is exported separately from the DBWrapper module because most\n * usages of IndexedDB in workbox dont need deleting, and this way it can be\n * reused in tests to delete databases without creating DBWrapper instances.\n *\n * @param {string} name The database name.\n * @private\n */\nexport const deleteDatabase = async (name) => {\n  await new Promise((resolve, reject) => {\n    const request = indexedDB.deleteDatabase(name);\n    request.onerror = ({target}) => {\n      reject(target.error);\n    };\n    request.onblocked = () => {\n      reject(new Error('Delete blocked'));\n    };\n    request.onsuccess = () => {\n      resolve();\n    };\n  });\n};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {WorkboxError} from './WorkboxError.mjs';\nimport {logger} from './logger.mjs';\nimport {assert} from './assert.mjs';\nimport {getFriendlyURL} from '../_private/getFriendlyURL.mjs';\nimport {pluginEvents} from '../models/pluginEvents.mjs';\nimport {pluginUtils} from '../utils/pluginUtils.mjs';\nimport '../_version.mjs';\n\n/**\n * Wrapper around the fetch API.\n *\n * Will call requestWillFetch on available plugins.\n *\n * @param {Object} options\n * @param {Request|string} options.request\n * @param {Object} [options.fetchOptions]\n * @param {Event} [options.event]\n * @param {Array<Object>} [options.plugins=[]]\n * @return {Promise<Response>}\n *\n * @private\n * @memberof module:workbox-core\n */\nconst wrappedFetch = async ({\n  request,\n  fetchOptions,\n  event,\n  plugins = []}) => {\n  // We *should* be able to call `await event.preloadResponse` even if it's\n  // undefined, but for some reason, doing so leads to errors in our Node unit\n  // tests. To work around that, explicitly check preloadResponse's value first.\n  if (event && event.preloadResponse) {\n    const possiblePreloadResponse = await event.preloadResponse;\n    if (possiblePreloadResponse) {\n      if (process.env.NODE_ENV !== 'production') {\n        logger.log(`Using a preloaded navigation response for ` +\n          `'${getFriendlyURL(request.url)}'`);\n      }\n      return possiblePreloadResponse;\n    }\n  }\n\n  if (typeof request === 'string') {\n    request = new Request(request);\n  }\n\n  if (process.env.NODE_ENV !== 'production') {\n    assert.isInstance(request, Request, {\n      paramName: request,\n      expectedClass: 'Request',\n      moduleName: 'workbox-core',\n      className: 'fetchWrapper',\n      funcName: 'wrappedFetch',\n    });\n  }\n\n  const failedFetchPlugins = pluginUtils.filter(\n      plugins, pluginEvents.FETCH_DID_FAIL);\n\n  // If there is a fetchDidFail plugin, we need to save a clone of the\n  // original request before it's either modified by a requestWillFetch\n  // plugin or before the original request's body is consumed via fetch().\n  const originalRequest = failedFetchPlugins.length > 0 ?\n    request.clone() : null;\n\n  try {\n    for (let plugin of plugins) {\n      if (pluginEvents.REQUEST_WILL_FETCH in plugin) {\n        request = await plugin[pluginEvents.REQUEST_WILL_FETCH].call(plugin, {\n          request: request.clone(),\n          event,\n        });\n\n        if (process.env.NODE_ENV !== 'production') {\n          if (request) {\n            assert.isInstance(request, Request, {\n              moduleName: 'Plugin',\n              funcName: pluginEvents.CACHED_RESPONSE_WILL_BE_USED,\n              isReturnValueProblem: true,\n            });\n          }\n        }\n      }\n    }\n  } catch (err) {\n    throw new WorkboxError('plugin-error-request-will-fetch', {\n      thrownError: err,\n    });\n  }\n\n  // The request can be altered by plugins with `requestWillFetch` making\n  // the original request (Most likely from a `fetch` event) to be different\n  // to the Request we make. Pass both to `fetchDidFail` to aid debugging.\n  let pluginFilteredRequest = request.clone();\n\n  try {\n    let fetchResponse;\n\n    // See https://github.com/GoogleChrome/workbox/issues/1796\n    if (request.mode === 'navigate') {\n      fetchResponse = await fetch(request);\n    } else {\n      fetchResponse = await fetch(request, fetchOptions);\n    }\n\n    if (process.env.NODE_ENV !== 'production') {\n      logger.debug(`Network request for `+\n      `'${getFriendlyURL(request.url)}' returned a response with ` +\n      `status '${fetchResponse.status}'.`);\n    }\n\n    for (const plugin of plugins) {\n      if (pluginEvents.FETCH_DID_SUCCEED in plugin) {\n        fetchResponse = await plugin[pluginEvents.FETCH_DID_SUCCEED]\n            .call(plugin, {\n              event,\n              request: pluginFilteredRequest,\n              response: fetchResponse,\n            });\n\n        if (process.env.NODE_ENV !== 'production') {\n          if (fetchResponse) {\n            assert.isInstance(fetchResponse, Response, {\n              moduleName: 'Plugin',\n              funcName: pluginEvents.FETCH_DID_SUCCEED,\n              isReturnValueProblem: true,\n            });\n          }\n        }\n      }\n    }\n\n    return fetchResponse;\n  } catch (error) {\n    if (process.env.NODE_ENV !== 'production') {\n      logger.error(`Network request for `+\n      `'${getFriendlyURL(request.url)}' threw an error.`, error);\n    }\n\n    for (const plugin of failedFetchPlugins) {\n      await plugin[pluginEvents.FETCH_DID_FAIL].call(plugin, {\n        error,\n        event,\n        originalRequest: originalRequest.clone(),\n        request: pluginFilteredRequest.clone(),\n      });\n    }\n\n    throw error;\n  }\n};\n\nconst fetchWrapper = {\n  fetch: wrappedFetch,\n};\n\nexport {fetchWrapper};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\n// We either expose defaults or we expose every named export.\nimport {assert} from './_private/assert.mjs';\nimport {cacheNames} from './_private/cacheNames.mjs';\nimport {cacheWrapper} from './_private/cacheWrapper.mjs';\nimport {DBWrapper} from './_private/DBWrapper.mjs';\nimport {Deferred} from './_private/Deferred.mjs';\nimport {deleteDatabase} from './_private/deleteDatabase.mjs';\nimport {executeQuotaErrorCallbacks} from './_private/executeQuotaErrorCallbacks.mjs';\nimport {fetchWrapper} from './_private/fetchWrapper.mjs';\nimport {getFriendlyURL} from './_private/getFriendlyURL.mjs';\nimport {logger} from './_private/logger.mjs';\nimport {WorkboxError} from './_private/WorkboxError.mjs';\n\nimport './_version.mjs';\n\nexport {\n  assert,\n  cacheNames,\n  cacheWrapper,\n  DBWrapper,\n  Deferred,\n  deleteDatabase,\n  executeQuotaErrorCallbacks,\n  fetchWrapper,\n  getFriendlyURL,\n  logger,\n  WorkboxError,\n};\n","/*\n  Copyright 2019 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport './_version.mjs';\n\n\n/**\n * Claim any currently available clients once the service worker\n * becomes active. This is normally used in conjunction with `skipWaiting()`.\n *\n * @alias workbox.core.clientsClaim\n */\nexport const clientsClaim = () => {\n  addEventListener('activate', () => clients.claim());\n};\n","/*\n  Copyright 2019 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {cacheNames as _cacheNames} from './_private/cacheNames.mjs';\nimport './_version.mjs';\n\n\n/**\n * Get the current cache names and prefix/suffix used by Workbox.\n *\n * `cacheNames.precache` is used for precached assets,\n * `cacheNames.googleAnalytics` is used by `workbox-google-analytics` to\n * store `analytics.js`, and `cacheNames.runtime` is used for everything else.\n *\n * `cacheNames.prefix` can be used to retrieve just the current prefix value.\n * `cacheNames.suffix` can be used to retrieve just the current suffix value.\n *\n * @return {Object} An object with `precache`, `runtime`, `prefix`, and\n *     `googleAnalytics` properties.\n *\n * @alias workbox.core.cacheNames\n */\nexport const cacheNames = {\n  get googleAnalytics() {\n    return _cacheNames.getGoogleAnalyticsName();\n  },\n  get precache() {\n    return _cacheNames.getPrecacheName();\n  },\n  get prefix() {\n    return _cacheNames.getPrefix();\n  },\n  get runtime() {\n    return _cacheNames.getRuntimeName();\n  },\n  get suffix() {\n    return _cacheNames.getSuffix();\n  },\n};\n","/*\n  Copyright 2019 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {assert} from './_private/assert.mjs';\nimport {cacheNames} from './_private/cacheNames.mjs';\nimport {WorkboxError} from './_private/WorkboxError.mjs';\nimport './_version.mjs';\n\n\n/**\n * Modifies the default cache names used by the Workbox packages.\n * Cache names are generated as `<prefix>-<Cache Name>-<suffix>`.\n *\n * @param {Object} details\n * @param {Object} [details.prefix] The string to add to the beginning of\n *     the precache and runtime cache names.\n * @param {Object} [details.suffix] The string to add to the end of\n *     the precache and runtime cache names.\n * @param {Object} [details.precache] The cache name to use for precache\n *     caching.\n * @param {Object} [details.runtime] The cache name to use for runtime caching.\n * @param {Object} [details.googleAnalytics] The cache name to use for\n *     `workbox-google-analytics` caching.\n *\n * @alias workbox.core.setCacheNameDetails\n */\nexport const setCacheNameDetails = (details) => {\n  if (process.env.NODE_ENV !== 'production') {\n    Object.keys(details).forEach((key) => {\n      assert.isType(details[key], 'string', {\n        moduleName: 'workbox-core',\n        funcName: 'setCacheNameDetails',\n        paramName: `details.${key}`,\n      });\n    });\n\n    if ('precache' in details && details.precache.length === 0) {\n      throw new WorkboxError('invalid-cache-name', {\n        cacheNameId: 'precache',\n        value: details.precache,\n      });\n    }\n\n    if ('runtime' in details && details.runtime.length === 0) {\n      throw new WorkboxError('invalid-cache-name', {\n        cacheNameId: 'runtime',\n        value: details.runtime,\n      });\n    }\n\n    if ('googleAnalytics' in details && details.googleAnalytics.length === 0) {\n      throw new WorkboxError('invalid-cache-name', {\n        cacheNameId: 'googleAnalytics',\n        value: details.googleAnalytics,\n      });\n    }\n  }\n\n  cacheNames.updateDetails(details);\n};\n","/*\n  Copyright 2019 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport './_version.mjs';\n\n\n/**\n * Force a service worker to become active, instead of waiting. This is\n * normally used in conjunction with `clientsClaim()`.\n *\n * @alias workbox.core.skipWaiting\n */\nexport const skipWaiting = () => {\n  // We need to explicitly call `self.skipWaiting()` here because we're\n  // shadowing `skipWaiting` with this local function.\n  addEventListener('install', () => self.skipWaiting());\n};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {registerQuotaErrorCallback} from './registerQuotaErrorCallback.mjs';\nimport * as _private from './_private.mjs';\nimport {clientsClaim} from './clientsClaim.mjs';\nimport {cacheNames} from './cacheNames.mjs';\nimport {setCacheNameDetails} from './setCacheNameDetails.mjs';\nimport {skipWaiting} from './skipWaiting.mjs';\nimport './_version.mjs';\n\n\n// Give our version strings something to hang off of.\ntry {\n  self.workbox.v = self.workbox.v || {};\n} catch (errer) {\n  // NOOP\n}\n\n/**\n * All of the Workbox service worker libraries use workbox-core for shared\n * code as well as setting default values that need to be shared (like cache\n * names).\n *\n * @namespace workbox.core\n */\n\nexport {\n  _private,\n  clientsClaim,\n  cacheNames,\n  registerQuotaErrorCallback,\n  setCacheNameDetails,\n  skipWaiting,\n};\n"],"names":["self","_","e","logger","process","inGroup","methodToColorMap","debug","log","warn","error","groupCollapsed","groupEnd","print","method","args","test","navigator","userAgent","console","styles","logPrefix","join","api","Object","keys","messages","paramName","validValueDescription","value","Error","JSON","stringify","moduleName","className","funcName","expectedType","expectedClass","isReturnValueProblem","name","expectedMethod","entry","firstEntry","secondEntry","_entryId","thrownError","message","cacheNameId","methodName","normalizedRangeHeader","size","start","end","url","status","generatorFunction","code","messageGenerator","WorkboxError","constructor","errorCode","details","isSWEnv","isArray","Array","hasMethod","object","type","isType","isInstance","isOneOf","validValues","includes","isArrayOfClass","item","finalAssertExports","quotaErrorCallbacks","Set","registerQuotaErrorCallback","callback","assert","add","_cacheNameDetails","googleAnalytics","precache","prefix","runtime","suffix","registration","scope","_createCacheName","cacheName","filter","length","cacheNames","updateDetails","forEach","key","getGoogleAnalyticsName","userCacheName","getPrecacheName","getPrefix","getRuntimeName","getSuffix","getFriendlyURL","urlObj","URL","location","origin","pathname","href","executeQuotaErrorCallbacks","pluginEvents","CACHE_DID_UPDATE","CACHE_KEY_WILL_BE_USED","CACHE_WILL_UPDATE","CACHED_RESPONSE_WILL_BE_USED","FETCH_DID_FAIL","FETCH_DID_SUCCEED","REQUEST_WILL_FETCH","pluginUtils","plugins","callbackName","plugin","putWrapper","request","response","event","matchOptions","effectiveRequest","_getEffectiveRequest","mode","responseToCache","_isResponseSafeToCache","cache","caches","open","updatePlugins","oldResponse","matchWrapper","put","call","newResponse","cachedResponse","match","Response","pluginsUsed","cacheKeyWillBeUsedPlugins","Request","cacheWrapper","DBWrapper","version","onupgradeneeded","onversionchange","_onversionchange","_name","_version","_onupgradeneeded","_db","db","Promise","resolve","reject","openRequestTimedOut","setTimeout","OPEN_TIMEOUT","openRequest","indexedDB","onerror","evt","transaction","abort","target","result","close","onsuccess","bind","getKey","storeName","query","getAllKeys","getAll","count","getAllMatching","includeKeys","map","index","direction","txn","done","store","objectStore","results","openCursor","cursor","primaryKey","push","continue","storeNames","onabort","oncomplete","_call","prototype","methodsToWrap","methods","entries","IDBObjectStore","Deferred","promise","deleteDatabase","onblocked","wrappedFetch","fetchOptions","preloadResponse","possiblePreloadResponse","failedFetchPlugins","originalRequest","clone","err","pluginFilteredRequest","fetchResponse","fetch","fetchWrapper","clientsClaim","addEventListener","clients","claim","_cacheNames","setCacheNameDetails","skipWaiting","workbox","v","errer"],"mappings":";;;;EAAA,IAAG;EAACA,EAAAA,IAAI,CAAC,oBAAD,CAAJ,IAA4BC,CAAC,EAA7B;EAAgC,CAApC,CAAoC,OAAMC,CAAN,EAAQ;;ECA5C;;;;;;AAOA,EAGA,MAAMC,MAAM,GAAGC,AAA+C,CAAC,MAAM;EACnE,MAAIC,OAAO,GAAG,KAAd;EAEA,QAAMC,gBAAgB,GAAG;EACvBC,IAAAA,KAAK,EAAG,SADe;EACL;EAClBC,IAAAA,GAAG,EAAG,SAFiB;EAEP;EAChBC,IAAAA,IAAI,EAAG,SAHgB;EAGN;EACjBC,IAAAA,KAAK,EAAG,SAJe;EAIL;EAClBC,IAAAA,cAAc,EAAG,SALM;EAKI;EAC3BC,IAAAA,QAAQ,EAAE,IANa;;EAAA,GAAzB;;EASA,QAAMC,KAAK,GAAG,UAASC,MAAT,EAAiBC,IAAjB,EAAuB;EACnC,QAAID,MAAM,KAAK,gBAAf,EAAiC;EAC/B;EACA;EACA,UAAI,iCAAiCE,IAAjC,CAAsCC,SAAS,CAACC,SAAhD,CAAJ,EAAgE;EAC9DC,QAAAA,OAAO,CAACL,MAAD,CAAP,CAAgB,GAAGC,IAAnB;EACA;EACD;EACF;;EAED,UAAMK,MAAM,GAAG,CACZ,eAAcd,gBAAgB,CAACQ,MAAD,CAAS,EAD3B,EAEZ,sBAFY,EAGZ,cAHY,EAIZ,mBAJY,EAKZ,oBALY,CAAf,CAVmC;;EAmBnC,UAAMO,SAAS,GAAGhB,OAAO,GAAG,EAAH,GAAQ,CAAC,WAAD,EAAce,MAAM,CAACE,IAAP,CAAY,GAAZ,CAAd,CAAjC;EAEAH,IAAAA,OAAO,CAACL,MAAD,CAAP,CAAgB,GAAGO,SAAnB,EAA8B,GAAGN,IAAjC;;EAEA,QAAID,MAAM,KAAK,gBAAf,EAAiC;EAC/BT,MAAAA,OAAO,GAAG,IAAV;EACD;;EACD,QAAIS,MAAM,KAAK,UAAf,EAA2B;EACzBT,MAAAA,OAAO,GAAG,KAAV;EACD;EACF,GA7BD;;EA+BA,QAAMkB,GAAG,GAAG,EAAZ;;EACA,OAAK,MAAMT,MAAX,IAAqBU,MAAM,CAACC,IAAP,CAAYnB,gBAAZ,CAArB,EAAoD;EAClDiB,IAAAA,GAAG,CAACT,MAAD,CAAH,GAAc,CAAC,GAAGC,IAAJ,KAAa;EACzBF,MAAAA,KAAK,CAACC,MAAD,EAASC,IAAT,CAAL;EACD,KAFD;EAGD;;EAED,SAAOQ,GAAP;EACD,CAnD6D,GAA9D;;ECVA;;;;;;;AAQA,EAGO,MAAMG,QAAQ,GAAG;EACtB,mBAAiB,CAAC;EAACC,IAAAA,SAAD;EAAYC,IAAAA,qBAAZ;EAAmCC,IAAAA;EAAnC,GAAD,KAA+C;EAC9D,QAAI,CAACF,SAAD,IAAc,CAACC,qBAAnB,EAA0C;EACxC,YAAM,IAAIE,KAAJ,CAAW,4CAAX,CAAN;EACD;;EACD,WAAQ,QAAOH,SAAU,wCAAlB,GACJ,qBAAoBC,qBAAsB,uBADtC,GAEJ,GAAEG,IAAI,CAACC,SAAL,CAAeH,KAAf,CAAsB,GAF3B;EAGD,GARqB;EAUtB,eAAa,CAAC;EAACI,IAAAA;EAAD,GAAD,KAAkB;EAC7B,QAAI,CAACA,UAAL,EAAiB;EACf,YAAM,IAAIH,KAAJ,CAAW,wCAAX,CAAN;EACD;;EACD,WAAQ,QAAOG,UAAW,qCAA1B;EACD,GAfqB;EAiBtB,kBAAgB,CAAC;EAACA,IAAAA,UAAD;EAAaC,IAAAA,SAAb;EAAwBC,IAAAA,QAAxB;EAAkCR,IAAAA;EAAlC,GAAD,KAAkD;EAChE,QAAI,CAACM,UAAD,IAAe,CAACC,SAAhB,IAA6B,CAACC,QAA9B,IAA0C,CAACR,SAA/C,EAA0D;EACxD,YAAM,IAAIG,KAAJ,CAAW,2CAAX,CAAN;EACD;;EACD,WAAQ,kBAAiBH,SAAU,gBAA5B,GACJ,IAAGM,UAAW,IAAGC,SAAU,IAAGC,QAAS,uBAD1C;EAED,GAvBqB;EAyBtB,oBAAkB,CAAC;EAACC,IAAAA,YAAD;EAAeT,IAAAA,SAAf;EAA0BM,IAAAA,UAA1B;EAAsCC,IAAAA,SAAtC;EACjBC,IAAAA;EADiB,GAAD,KACF;EACd,QAAI,CAACC,YAAD,IAAiB,CAACT,SAAlB,IAA+B,CAACM,UAAhC,IAA8C,CAACE,QAAnD,EAA6D;EAC3D,YAAM,IAAIL,KAAJ,CAAW,6CAAX,CAAN;EACD;;EACD,WAAQ,kBAAiBH,SAAU,gBAA5B,GACJ,IAAGM,UAAW,IAAGC,SAAS,GAAIA,SAAS,GAAG,GAAhB,GAAuB,EAAG,EADhD,GAEJ,GAAEC,QAAS,uBAAsBC,YAAa,GAFjD;EAGD,GAjCqB;EAmCtB,qBAAmB,CAAC;EAACC,IAAAA,aAAD;EAAgBV,IAAAA,SAAhB;EAA2BM,IAAAA,UAA3B;EAAuCC,IAAAA,SAAvC;EAClBC,IAAAA,QADkB;EACRG,IAAAA;EADQ,GAAD,KACmB;EACpC,QAAI,CAACD,aAAD,IAAkB,CAACJ,UAAnB,IAAiC,CAACE,QAAtC,EAAgD;EAC9C,YAAM,IAAIL,KAAJ,CAAW,8CAAX,CAAN;EACD;;EAED,QAAIQ,oBAAJ,EAA0B;EACxB,aAAQ,wBAAD,GACJ,IAAGL,UAAW,IAAGC,SAAS,GAAIA,SAAS,GAAG,GAAhB,GAAuB,EAAG,GAAEC,QAAS,MAD3D,GAEJ,gCAA+BE,aAAa,CAACE,IAAK,GAFrD;EAGD;;EAED,WAAQ,kBAAiBZ,SAAU,gBAA5B,GACJ,IAAGM,UAAW,IAAGC,SAAS,GAAIA,SAAS,GAAG,GAAhB,GAAuB,EAAG,GAAEC,QAAS,MAD3D,GAEJ,gCAA+BE,aAAa,CAACE,IAAK,GAFrD;EAGD,GAlDqB;EAoDtB,sBAAoB,CAAC;EAACC,IAAAA,cAAD;EAAiBb,IAAAA,SAAjB;EAA4BM,IAAAA,UAA5B;EAAwCC,IAAAA,SAAxC;EACnBC,IAAAA;EADmB,GAAD,KACJ;EACd,QAAI,CAACK,cAAD,IAAmB,CAACb,SAApB,IAAiC,CAACM,UAAlC,IAAgD,CAACC,SAAjD,IACG,CAACC,QADR,EACkB;EAChB,YAAM,IAAIL,KAAJ,CAAW,+CAAX,CAAN;EACD;;EACD,WAAQ,GAAEG,UAAW,IAAGC,SAAU,IAAGC,QAAS,kBAAvC,GACJ,IAAGR,SAAU,4BAA2Ba,cAAe,WAD1D;EAED,GA5DqB;EA8DtB,uCAAqC,CAAC;EAACC,IAAAA;EAAD,GAAD,KAAa;EAChD,WAAQ,oCAAD,GACN,qEADM,GAEN,IAAGV,IAAI,CAACC,SAAL,CAAeS,KAAf,CAAsB,iDAFnB,GAGN,sEAHM,GAIN,kBAJD;EAKD,GApEqB;EAsEtB,2CAAyC,CAAC;EAACC,IAAAA,UAAD;EAAaC,IAAAA;EAAb,GAAD,KAA+B;EACtE,QAAI,CAACD,UAAD,IAAe,CAACC,WAApB,EAAiC;EAC/B,YAAM,IAAIb,KAAJ,CAAW,sBAAD,GACb,8CADG,CAAN;EAED;;EAED,WAAQ,+BAAD,GACJ,uEADI,GAEJ,GAAEY,UAAU,CAACE,QAAS,8CAFlB,GAGJ,wEAHI,GAIJ,iBAJH;EAKD,GAjFqB;EAmFtB,qCAAmC,CAAC;EAACC,IAAAA;EAAD,GAAD,KAAmB;EACpD,QAAI,CAACA,WAAL,EAAkB;EAChB,YAAM,IAAIf,KAAJ,CAAW,sBAAD,GACb,2CADG,CAAN;EAED;;EAED,WAAQ,gEAAD,GACJ,kCAAiCe,WAAW,CAACC,OAAQ,IADxD;EAED,GA3FqB;EA6FtB,wBAAsB,CAAC;EAACC,IAAAA,WAAD;EAAclB,IAAAA;EAAd,GAAD,KAA0B;EAC9C,QAAI,CAACkB,WAAL,EAAkB;EAChB,YAAM,IAAIjB,KAAJ,CACD,yDADC,CAAN;EAED;;EAED,WAAQ,gEAAD,GACJ,oBAAmBiB,WAAY,iCAD3B,GAEJ,IAAGhB,IAAI,CAACC,SAAL,CAAeH,KAAf,CAAsB,GAF5B;EAGD,GAtGqB;EAwGtB,gDAA8C,CAAC;EAACf,IAAAA;EAAD,GAAD,KAAc;EAC1D,QAAI,CAACA,MAAL,EAAa;EACX,YAAM,IAAIgB,KAAJ,CAAW,sBAAD,GACb,qDADG,CAAN;EAED;;EAED,WAAQ,4DAAD,GACJ,mCAAkChB,MAAO,IAD5C;EAED,GAhHqB;EAkHtB,2CAAyC,MAAM;EAC7C,WAAQ,2DAAD,GACJ,aADH;EAED,GArHqB;EAuHtB,yBAAuB,CAAC;EAACyB,IAAAA;EAAD,GAAD,KAAY;EACjC,WAAQ,wCAAuCA,IAAK,WAApD;EACD,GAzHqB;EA2HtB,0BAAwB,CAAC;EAACA,IAAAA;EAAD,GAAD,KAAY;EAClC,WAAQ,mBAAkBA,IAAK,2BAAxB,GACF,mEADL;EAED,GA9HqB;EAgItB,kCAAgC,CAAC;EAACS,IAAAA,UAAD;EAAarB,IAAAA;EAAb,GAAD,KAA6B;EAC3D,WAAQ,QAAOqB,UAAW,uCAAnB,GACJ,IAAGrB,SAAU,+BADhB;EAED,GAnIqB;EAqItB,4BAA0B,CAAC;EAACM,IAAAA,UAAD;EAAaC,IAAAA,SAAb;EAAwBC,IAAAA,QAAxB;EAAkCR,IAAAA;EAAlC,GAAD,KAAkD;EAC1E,WAAQ,iBAAgBA,SAAU,uCAA3B,GACJ,6BAA4BM,UAAW,IAAGC,SAAU,IAAGC,QAAS,OAD5D,GAEJ,oBAFH;EAGD,GAzIqB;EA2ItB,wBAAsB,CAAC;EAACN,IAAAA,KAAD;EAAQQ,IAAAA,aAAR;EACrBJ,IAAAA,UADqB;EACTC,IAAAA,SADS;EACEC,IAAAA,QADF;EACYR,IAAAA;EADZ,GAAD,KAC4B;EAChD,WAAQ,iBAAgBA,SAAU,kCAA3B,GACJ,IAAGU,aAAc,wBAAuBN,IAAI,CAACC,SAAL,CAAeH,KAAf,CAAsB,MAD1D,GAEJ,4BAA2BI,UAAW,IAAGC,SAAU,IAAGC,QAAS,KAF3D,GAGJ,mBAHH;EAID,GAjJqB;EAmJtB,iCAA+B,CAAC;EAACF,IAAAA,UAAD;EAAaC,IAAAA,SAAb;EAAwBC,IAAAA;EAAxB,GAAD,KAAuC;EACpE,WAAQ,kEAAD,GACJ,MAAKF,UAAW,IAAGC,SAAU,IAAGC,QAAS,EAD5C;EAED,GAtJqB;EAwJtB,kCAAgC,CAAC;EAACF,IAAAA,UAAD;EAAaC,IAAAA,SAAb;EAAwBC,IAAAA;EAAxB,GAAD,KAAuC;EACrE,WAAQ,0DAAD,GACJ,MAAKF,UAAW,IAAGC,SAAU,IAAGC,QAAS,EAD5C;EAED,GA3JqB;EA6JtB,oBAAkB,CAAC;EAACF,IAAAA,UAAD;EAAaC,IAAAA,SAAb;EAAwBC,IAAAA,QAAxB;EAAkCR,IAAAA;EAAlC,GAAD,KAAkD;EAClE,QAAI,CAACA,SAAD,IAAc,CAACM,UAAf,IAA6B,CAACE,QAAlC,EAA4C;EAC1C,YAAM,IAAIL,KAAJ,CAAW,6CAAX,CAAN;EACD;;EACD,WAAQ,4BAA2BH,SAAU,8BAAtC,GACJ,sEADI,GAEJ,2BAA0BM,UAAW,IAAGE,QAAS,SAF7C,GAGJ,YAHH;EAID,GArKqB;EAuKtB,2BAAyB,MAAM;EAC7B,WAAQ,gDAAD,GACN,gCADD;EAED,GA1KqB;EA4KtB,qCAAmC,MAAM;EACvC,WAAQ,4DAAD,GACJ,kDADH;EAED,GA/KqB;EAiLtB,+BAA6B,MAAM;EACjC,WAAQ,yDAAD,GACJ,oDADH;EAED,GApLqB;EAsLtB,wBAAsB,CAAC;EAACc,IAAAA;EAAD,GAAD,KAA6B;EACjD,QAAI,CAACA,qBAAL,EAA4B;EAC1B,YAAM,IAAInB,KAAJ,CAAW,iDAAX,CAAN;EACD;;EACD,WAAQ,iEAAD,GACJ,kCAAiCmB,qBAAsB,GAD1D;EAED,GA5LqB;EA8LtB,uBAAqB,CAAC;EAACA,IAAAA;EAAD,GAAD,KAA6B;EAChD,QAAI,CAACA,qBAAL,EAA4B;EAC1B,YAAM,IAAInB,KAAJ,CAAW,gDAAX,CAAN;EACD;;EACD,WAAQ,gEAAD,GACJ,+DADI,GAEJ,IAAGmB,qBAAsB,GAF5B;EAGD,GArMqB;EAuMtB,0BAAwB,CAAC;EAACA,IAAAA;EAAD,GAAD,KAA6B;EACnD,QAAI,CAACA,qBAAL,EAA4B;EAC1B,YAAM,IAAInB,KAAJ,CAAW,mDAAX,CAAN;EACD;;EACD,WAAQ,kEAAD,GACJ,+DADI,GAEJ,IAAGmB,qBAAsB,GAF5B;EAGD,GA9MqB;EAgNtB,qBAAmB,MAAM;EACvB,WAAQ,oDAAR;EACD,GAlNqB;EAoNtB,2BAAyB,CAAC;EAACC,IAAAA,IAAD;EAAOC,IAAAA,KAAP;EAAcC,IAAAA;EAAd,GAAD,KAAwB;EAC/C,WAAQ,cAAaD,KAAM,cAAaC,GAAI,4BAArC,GACJ,oDAAmDF,IAAK,SAD3D;EAED,GAvNqB;EAyNtB,sCAAoC,CAAC;EAACG,IAAAA,GAAD;EAAMvC,IAAAA;EAAN,GAAD,KAAmB;EACrD,WAAQ,oBAAmBuC,GAAI,sBAAqBvC,MAAO,gBAApD,GACJ,oCADH;EAED,GA5NqB;EA8NtB,gCAA8B,CAAC;EAACuC,IAAAA;EAAD,GAAD,KAAW;EACvC,WAAQ,kCAAiCA,GAAI,6BAAtC,GACJ,UADH;EAED,GAjOqB;EAmOtB,iBAAe,CAAC;EAACA,IAAAA,GAAD;EAAM3C,IAAAA;EAAN,GAAD,KAAkB;EAC/B,QAAIoC,OAAO,GAAI,mDAAkDO,GAAI,IAArE;;EACA,QAAI3C,KAAJ,EAAW;EACToC,MAAAA,OAAO,IAAK,4BAA2BpC,KAAM,GAA7C;EACD;;EACD,WAAOoC,OAAP;EACD,GAzOqB;EA2OtB,6BAA2B,CAAC;EAACO,IAAAA,GAAD;EAAMC,IAAAA;EAAN,GAAD,KAAmB;EAC5C,WAAQ,+BAA8BD,GAAI,wBAAnC,GACJ,aAAYC,MAAO,GADtB;EAED;EA9OqB,CAAjB;;ECXP;;;;;;;AAQA;EAWA,MAAMC,iBAAiB,GAAG,CAACC,IAAD,EAAO,GAAGzC,IAAV,KAAmB;EAC3C,QAAM+B,OAAO,GAAGpB,QAAQ,CAAC8B,IAAD,CAAxB;;EACA,MAAI,CAACV,OAAL,EAAc;EACZ,UAAM,IAAIhB,KAAJ,CAAW,oCAAmC0B,IAAK,IAAnD,CAAN;EACD;;EAED,SAAOV,OAAO,CAAC,GAAG/B,IAAJ,CAAd;EACD,CAPD;;AASA,EAAO,MAAM0C,gBAAgB,GAAIrD,AAClBmD,iBADR;;EC5BP;;;;;;;AAQA,EAGA;;;;;;;;;;EASA,MAAMG,YAAN,SAA2B5B,KAA3B,CAAiC;EAC/B;;;;;;;;EAQA6B,EAAAA,WAAW,CAACC,SAAD,EAAYC,OAAZ,EAAqB;EAC9B,QAAIf,OAAO,GAAGW,gBAAgB,CAACG,SAAD,EAAYC,OAAZ,CAA9B;EAEA,UAAMf,OAAN;EAEA,SAAKP,IAAL,GAAYqB,SAAZ;EACA,SAAKC,OAAL,GAAeA,OAAf;EACD;;EAhB8B;;ECpBjC;;;;;;;AAQA,EAGA;;;;EAGA,MAAMC,OAAO,GAAI7B,UAAD,IAAgB;EAC9B,MAAI,EAAE,8BAA8BjC,IAAhC,CAAJ,EAA2C;EACzC,UAAM,IAAI0D,YAAJ,CAAiB,WAAjB,EAA8B;EAACzB,MAAAA;EAAD,KAA9B,CAAN;EACD;EACF,CAJD;EAMA;;;;;;;;EAMA,MAAM8B,OAAO,GAAG,CAAClC,KAAD,EAAQ;EAACI,EAAAA,UAAD;EAAaC,EAAAA,SAAb;EAAwBC,EAAAA,QAAxB;EAAkCR,EAAAA;EAAlC,CAAR,KAAyD;EACvE,MAAI,CAACqC,KAAK,CAACD,OAAN,CAAclC,KAAd,CAAL,EAA2B;EACzB,UAAM,IAAI6B,YAAJ,CAAiB,cAAjB,EAAiC;EACrCzB,MAAAA,UADqC;EAErCC,MAAAA,SAFqC;EAGrCC,MAAAA,QAHqC;EAIrCR,MAAAA;EAJqC,KAAjC,CAAN;EAMD;EACF,CATD;;EAWA,MAAMsC,SAAS,GAAG,CAACC,MAAD,EAAS1B,cAAT,EACd;EAACP,EAAAA,UAAD;EAAaC,EAAAA,SAAb;EAAwBC,EAAAA,QAAxB;EAAkCR,EAAAA;EAAlC,CADc,KACmC;EACnD,QAAMwC,IAAI,GAAG,OAAOD,MAAM,CAAC1B,cAAD,CAA1B;;EACA,MAAI2B,IAAI,KAAK,UAAb,EAAyB;EACvB,UAAM,IAAIT,YAAJ,CAAiB,kBAAjB,EAAqC;EAAC/B,MAAAA,SAAD;EAAYa,MAAAA,cAAZ;EACzCP,MAAAA,UADyC;EAC7BC,MAAAA,SAD6B;EAClBC,MAAAA;EADkB,KAArC,CAAN;EAED;EACF,CAPD;;EASA,MAAMiC,MAAM,GAAG,CAACF,MAAD,EAAS9B,YAAT,EACX;EAACH,EAAAA,UAAD;EAAaC,EAAAA,SAAb;EAAwBC,EAAAA,QAAxB;EAAkCR,EAAAA;EAAlC,CADW,KACsC;EACnD,MAAI,OAAOuC,MAAP,KAAkB9B,YAAtB,EAAoC;EAClC,UAAM,IAAIsB,YAAJ,CAAiB,gBAAjB,EAAmC;EAAC/B,MAAAA,SAAD;EAAYS,MAAAA,YAAZ;EACvCH,MAAAA,UADuC;EAC3BC,MAAAA,SAD2B;EAChBC,MAAAA;EADgB,KAAnC,CAAN;EAED;EACF,CAND;;EAQA,MAAMkC,UAAU,GAAG,CAACH,MAAD,EAAS7B,aAAT,EACf;EAACJ,EAAAA,UAAD;EAAaC,EAAAA,SAAb;EAAwBC,EAAAA,QAAxB;EACER,EAAAA,SADF;EACaW,EAAAA;EADb,CADe,KAEwB;EACzC,MAAI,EAAE4B,MAAM,YAAY7B,aAApB,CAAJ,EAAwC;EACtC,UAAM,IAAIqB,YAAJ,CAAiB,iBAAjB,EAAoC;EAAC/B,MAAAA,SAAD;EAAYU,MAAAA,aAAZ;EACxCJ,MAAAA,UADwC;EAC5BC,MAAAA,SAD4B;EACjBC,MAAAA,QADiB;EACPG,MAAAA;EADO,KAApC,CAAN;EAED;EACF,CAPD;;EASA,MAAMgC,OAAO,GAAG,CAACzC,KAAD,EAAQ0C,WAAR,EAAqB;EAAC5C,EAAAA;EAAD,CAArB,KAAqC;EACnD,MAAI,CAAC4C,WAAW,CAACC,QAAZ,CAAqB3C,KAArB,CAAL,EAAkC;EAChC,UAAM,IAAI6B,YAAJ,CAAiB,eAAjB,EAAkC;EACtC/B,MAAAA,SADsC;EAEtCE,MAAAA,KAFsC;EAGtCD,MAAAA,qBAAqB,EAAG,oBAAmBG,IAAI,CAACC,SAAL,CAAeuC,WAAf,CAA4B;EAHjC,KAAlC,CAAN;EAKD;EACF,CARD;;EAUA,MAAME,cAAc,GAAG,CAAC5C,KAAD,EAAQQ,aAAR,EACnB;EAACJ,EAAAA,UAAD;EAAaC,EAAAA,SAAb;EAAwBC,EAAAA,QAAxB;EAAkCR,EAAAA;EAAlC,CADmB,KAC8B;EACnD,QAAMjB,KAAK,GAAG,IAAIgD,YAAJ,CAAiB,oBAAjB,EAAuC;EACnD7B,IAAAA,KADmD;EAC5CQ,IAAAA,aAD4C;EAEnDJ,IAAAA,UAFmD;EAEvCC,IAAAA,SAFuC;EAE5BC,IAAAA,QAF4B;EAElBR,IAAAA;EAFkB,GAAvC,CAAd;;EAIA,MAAI,CAACqC,KAAK,CAACD,OAAN,CAAclC,KAAd,CAAL,EAA2B;EACzB,UAAMnB,KAAN;EACD;;EAED,OAAK,IAAIgE,IAAT,IAAiB7C,KAAjB,EAAwB;EACtB,QAAI,EAAE6C,IAAI,YAAYrC,aAAlB,CAAJ,EAAsC;EACpC,YAAM3B,KAAN;EACD;EACF;EACF,CAfD;;EAiBA,MAAMiE,kBAAkB,GAAGvE,AAA+C;EACxE6D,EAAAA,SADwE;EAExEF,EAAAA,OAFwE;EAGxEM,EAAAA,UAHwE;EAIxEC,EAAAA,OAJwE;EAKxER,EAAAA,OALwE;EAMxEM,EAAAA,MANwE;EAOxEK,EAAAA;EAPwE,CAA1E;;EC1FA;;;;;;;AAQA;EAIA,MAAMG,mBAAmB,GAAG,IAAIC,GAAJ,EAA5B;;ECZA;;;;;;;AAQA,EAMA;;;;;;;;EAOA,SAASC,0BAAT,CAAoCC,QAApC,EAA8C;EAC5C,EAA2C;EACzCC,IAAAA,kBAAM,CAACZ,MAAP,CAAcW,QAAd,EAAwB,UAAxB,EAAoC;EAClC9C,MAAAA,UAAU,EAAE,cADsB;EAElCE,MAAAA,QAAQ,EAAE,UAFwB;EAGlCR,MAAAA,SAAS,EAAE;EAHuB,KAApC;EAKD;;EAEDiD,EAAAA,mBAAmB,CAACK,GAApB,CAAwBF,QAAxB;;EAEA,EAA2C;EACzC5E,IAAAA,MAAM,CAACK,GAAP,CAAW,mDAAX,EAAgEuE,QAAhE;EACD;EACF;;ECnCD;;;;;;;AAQA,EAGA,MAAMG,iBAAiB,GAAG;EACxBC,EAAAA,eAAe,EAAE,iBADO;EAExBC,EAAAA,QAAQ,EAAE,aAFc;EAGxBC,EAAAA,MAAM,EAAE,SAHgB;EAIxBC,EAAAA,OAAO,EAAE,SAJe;EAKxBC,EAAAA,MAAM,EAAEvF,IAAI,CAACwF,YAAL,CAAkBC;EALF,CAA1B;;EAQA,MAAMC,gBAAgB,GAAIC,SAAD,IAAe;EACtC,SAAO,CAACT,iBAAiB,CAACG,MAAnB,EAA2BM,SAA3B,EAAsCT,iBAAiB,CAACK,MAAxD,EACFK,MADE,CACM/D,KAAD,IAAWA,KAAK,CAACgE,MAAN,GAAe,CAD/B,EAEFvE,IAFE,CAEG,GAFH,CAAP;EAGD,CAJD;;AAMA,EAAO,MAAMwE,UAAU,GAAG;EACxBC,EAAAA,aAAa,EAAGlC,OAAD,IAAa;EAC1BrC,IAAAA,MAAM,CAACC,IAAP,CAAYyD,iBAAZ,EAA+Bc,OAA/B,CAAwCC,GAAD,IAAS;EAC9C,UAAI,OAAOpC,OAAO,CAACoC,GAAD,CAAd,KAAwB,WAA5B,EAAyC;EACvCf,QAAAA,iBAAiB,CAACe,GAAD,CAAjB,GAAyBpC,OAAO,CAACoC,GAAD,CAAhC;EACD;EACF,KAJD;EAKD,GAPuB;EAQxBC,EAAAA,sBAAsB,EAAGC,aAAD,IAAmB;EACzC,WAAOA,aAAa,IAAIT,gBAAgB,CAACR,iBAAiB,CAACC,eAAnB,CAAxC;EACD,GAVuB;EAWxBiB,EAAAA,eAAe,EAAGD,aAAD,IAAmB;EAClC,WAAOA,aAAa,IAAIT,gBAAgB,CAACR,iBAAiB,CAACE,QAAnB,CAAxC;EACD,GAbuB;EAcxBiB,EAAAA,SAAS,EAAE,MAAM;EACf,WAAOnB,iBAAiB,CAACG,MAAzB;EACD,GAhBuB;EAiBxBiB,EAAAA,cAAc,EAAGH,aAAD,IAAmB;EACjC,WAAOA,aAAa,IAAIT,gBAAgB,CAACR,iBAAiB,CAACI,OAAnB,CAAxC;EACD,GAnBuB;EAoBxBiB,EAAAA,SAAS,EAAE,MAAM;EACf,WAAOrB,iBAAiB,CAACK,MAAzB;EACD;EAtBuB,CAAnB;;ECzBP;;;;;;;AAQA;EAEA,MAAMiB,cAAc,GAAInD,GAAD,IAAS;EAC9B,QAAMoD,MAAM,GAAG,IAAIC,GAAJ,CAAQrD,GAAR,EAAasD,QAAb,CAAf;;EACA,MAAIF,MAAM,CAACG,MAAP,KAAkBD,QAAQ,CAACC,MAA/B,EAAuC;EACrC,WAAOH,MAAM,CAACI,QAAd;EACD;;EACD,SAAOJ,MAAM,CAACK,IAAd;EACD,CAND;;ECVA;;;;;;;AAQA,EAKA;;;;;;;;EAOA,eAAeC,0BAAf,GAA4C;EAC1C,EAA2C;EACzC5G,IAAAA,MAAM,CAACK,GAAP,CAAY,gBAAeoE,mBAAmB,CAAC1B,IAAK,GAAzC,GACN,+BADL;EAED;;EAED,OAAK,MAAM6B,QAAX,IAAuBH,mBAAvB,EAA4C;EAC1C,UAAMG,QAAQ,EAAd;;EACA,IAA2C;EACzC5E,MAAAA,MAAM,CAACK,GAAP,CAAWuE,QAAX,EAAqB,cAArB;EACD;EACF;;EAED,EAA2C;EACzC5E,IAAAA,MAAM,CAACK,GAAP,CAAW,6BAAX;EACD;EACF;;ECpCD;;;;;;;AAQA,EAGO,MAAMwG,YAAY,GAAG;EAC1BC,EAAAA,gBAAgB,EAAE,gBADQ;EAE1BC,EAAAA,sBAAsB,EAAE,oBAFE;EAG1BC,EAAAA,iBAAiB,EAAE,iBAHO;EAI1BC,EAAAA,4BAA4B,EAAE,0BAJJ;EAK1BC,EAAAA,cAAc,EAAE,cALU;EAM1BC,EAAAA,iBAAiB,EAAE,iBANO;EAO1BC,EAAAA,kBAAkB,EAAE;EAPM,CAArB;;ECXP;;;;;;;AAQA,EAEO,MAAMC,WAAW,GAAG;EACzB5B,EAAAA,MAAM,EAAE,CAAC6B,OAAD,EAAUC,YAAV,KAA2B;EACjC,WAAOD,OAAO,CAAC7B,MAAR,CAAgB+B,MAAD,IAAYD,YAAY,IAAIC,MAA3C,CAAP;EACD;EAHwB,CAApB;;ECVP;;;;;;;AAQA,EAUA;;;;;;;;;;;;;;;;;;EAiBA,MAAMC,UAAU,GAAG,OAAO;EACxBjC,EAAAA,SADwB;EAExBkC,EAAAA,OAFwB;EAGxBC,EAAAA,QAHwB;EAIxBC,EAAAA,KAJwB;EAKxBN,EAAAA,OAAO,GAAG,EALc;EAMxBO,EAAAA;EANwB,IAOtB,EAPe,KAOR;EACT,EAA2C;EACzC,QAAIH,OAAO,CAAC/G,MAAR,IAAkB+G,OAAO,CAAC/G,MAAR,KAAmB,KAAzC,EAAgD;EAC9C,YAAM,IAAI4C,YAAJ,CAAiB,kCAAjB,EAAqD;EACzDL,QAAAA,GAAG,EAAEmD,cAAc,CAACqB,OAAO,CAACxE,GAAT,CADsC;EAEzDvC,QAAAA,MAAM,EAAE+G,OAAO,CAAC/G;EAFyC,OAArD,CAAN;EAID;EACF;;EAED,QAAMmH,gBAAgB,GAAG,MAAMC,oBAAoB,CAAC;EAClDT,IAAAA,OADkD;EACzCI,IAAAA,OADyC;EAChCM,IAAAA,IAAI,EAAE;EAD0B,GAAD,CAAnD;;EAGA,MAAI,CAACL,QAAL,EAAe;EACb,IAA2C;EACzC3H,MAAAA,MAAM,CAACO,KAAP,CAAc,yCAAD,GACV,IAAG8F,cAAc,CAACyB,gBAAgB,CAAC5E,GAAlB,CAAuB,IAD3C;EAED;;EAED,UAAM,IAAIK,YAAJ,CAAiB,4BAAjB,EAA+C;EACnDL,MAAAA,GAAG,EAAEmD,cAAc,CAACyB,gBAAgB,CAAC5E,GAAlB;EADgC,KAA/C,CAAN;EAGD;;EAED,MAAI+E,eAAe,GAAG,MAAMC,sBAAsB,CAAC;EACjDN,IAAAA,KADiD;EAEjDN,IAAAA,OAFiD;EAGjDK,IAAAA,QAHiD;EAIjDD,IAAAA,OAAO,EAAEI;EAJwC,GAAD,CAAlD;;EAOA,MAAI,CAACG,eAAL,EAAsB;EACpB,IAA2C;EACzCjI,MAAAA,MAAM,CAACI,KAAP,CAAc,aAAYiG,cAAc,CAACyB,gBAAgB,CAAC5E,GAAlB,CAAuB,SAAlD,GACZ,gBADD,EACkB+E,eADlB;EAED;;EACD;EACD;;EAED,QAAME,KAAK,GAAG,MAAMC,MAAM,CAACC,IAAP,CAAY7C,SAAZ,CAApB;EAEA,QAAM8C,aAAa,GAAGjB,WAAW,CAAC5B,MAAZ,CAClB6B,OADkB,EACTT,YAAY,CAACC,gBADJ,CAAtB;EAGA,MAAIyB,WAAW,GAAGD,aAAa,CAAC5C,MAAd,GAAuB,CAAvB,GACd,MAAM8C,YAAY,CAAC;EAAChD,IAAAA,SAAD;EAAYqC,IAAAA,YAAZ;EAA0BH,IAAAA,OAAO,EAAEI;EAAnC,GAAD,CADJ,GAEd,IAFJ;;EAIA,EAA2C;EACzC9H,IAAAA,MAAM,CAACI,KAAP,CAAc,iBAAgBoF,SAAU,kCAA3B,GACV,GAAEa,cAAc,CAACyB,gBAAgB,CAAC5E,GAAlB,CAAuB,GAD1C;EAED;;EAED,MAAI;EACF,UAAMiF,KAAK,CAACM,GAAN,CAAUX,gBAAV,EAA4BG,eAA5B,CAAN;EACD,GAFD,CAEE,OAAO1H,KAAP,EAAc;EACd;EACA,QAAIA,KAAK,CAAC6B,IAAN,KAAe,oBAAnB,EAAyC;EACvC,YAAMwE,0BAA0B,EAAhC;EACD;;EACD,UAAMrG,KAAN;EACD;;EAED,OAAK,IAAIiH,MAAT,IAAmBc,aAAnB,EAAkC;EAChC,UAAMd,MAAM,CAACX,YAAY,CAACC,gBAAd,CAAN,CAAsC4B,IAAtC,CAA2ClB,MAA3C,EAAmD;EACvDhC,MAAAA,SADuD;EAEvDoC,MAAAA,KAFuD;EAGvDW,MAAAA,WAHuD;EAIvDI,MAAAA,WAAW,EAAEV,eAJ0C;EAKvDP,MAAAA,OAAO,EAAEI;EAL8C,KAAnD,CAAN;EAOD;EACF,CA/ED;EAiFA;;;;;;;;;;;;;;;;;EAeA,MAAMU,YAAY,GAAG,OAAO;EAC1BhD,EAAAA,SAD0B;EAE1BkC,EAAAA,OAF0B;EAG1BE,EAAAA,KAH0B;EAI1BC,EAAAA,YAJ0B;EAK1BP,EAAAA,OAAO,GAAG;EALgB,CAAP,KAMf;EACJ,QAAMa,KAAK,GAAG,MAAMC,MAAM,CAACC,IAAP,CAAY7C,SAAZ,CAApB;EAEA,QAAMsC,gBAAgB,GAAG,MAAMC,oBAAoB,CAAC;EAClDT,IAAAA,OADkD;EACzCI,IAAAA,OADyC;EAChCM,IAAAA,IAAI,EAAE;EAD0B,GAAD,CAAnD;EAGA,MAAIY,cAAc,GAAG,MAAMT,KAAK,CAACU,KAAN,CAAYf,gBAAZ,EAA8BD,YAA9B,CAA3B;;EACA,EAA2C;EACzC,QAAIe,cAAJ,EAAoB;EAClB5I,MAAAA,MAAM,CAACI,KAAP,CAAc,+BAA8BoF,SAAU,IAAtD;EACD,KAFD,MAEO;EACLxF,MAAAA,MAAM,CAACI,KAAP,CAAc,gCAA+BoF,SAAU,IAAvD;EACD;EACF;;EAED,OAAK,MAAMgC,MAAX,IAAqBF,OAArB,EAA8B;EAC5B,QAAIT,YAAY,CAACI,4BAAb,IAA6CO,MAAjD,EAAyD;EACvDoB,MAAAA,cAAc,GAAG,MAAMpB,MAAM,CAACX,YAAY,CAACI,4BAAd,CAAN,CAClByB,IADkB,CACblB,MADa,EACL;EACZhC,QAAAA,SADY;EAEZoC,QAAAA,KAFY;EAGZC,QAAAA,YAHY;EAIZe,QAAAA,cAJY;EAKZlB,QAAAA,OAAO,EAAEI;EALG,OADK,CAAvB;;EAQA,MAA2C;EACzC,YAAIc,cAAJ,EAAoB;EAClB/D,UAAAA,kBAAM,CAACX,UAAP,CAAkB0E,cAAlB,EAAkCE,QAAlC,EAA4C;EAC1ChH,YAAAA,UAAU,EAAE,QAD8B;EAE1CE,YAAAA,QAAQ,EAAE6E,YAAY,CAACI,4BAFmB;EAG1C9E,YAAAA,oBAAoB,EAAE;EAHoB,WAA5C;EAKD;EACF;EACF;EACF;;EAED,SAAOyG,cAAP;EACD,CA5CD;EA8CA;;;;;;;;;;;;;;;;EAcA,MAAMV,sBAAsB,GAAG,OAAO;EAACR,EAAAA,OAAD;EAAUC,EAAAA,QAAV;EAAoBC,EAAAA,KAApB;EAA2BN,EAAAA;EAA3B,CAAP,KAA+C;EAC5E,MAAIW,eAAe,GAAGN,QAAtB;EACA,MAAIoB,WAAW,GAAG,KAAlB;;EACA,OAAK,IAAIvB,MAAT,IAAmBF,OAAnB,EAA4B;EAC1B,QAAIT,YAAY,CAACG,iBAAb,IAAkCQ,MAAtC,EAA8C;EAC5CuB,MAAAA,WAAW,GAAG,IAAd;EACAd,MAAAA,eAAe,GAAG,MAAMT,MAAM,CAACX,YAAY,CAACG,iBAAd,CAAN,CACnB0B,IADmB,CACdlB,MADc,EACN;EACZE,QAAAA,OADY;EAEZC,QAAAA,QAAQ,EAAEM,eAFE;EAGZL,QAAAA;EAHY,OADM,CAAxB;;EAOA,MAA2C;EACzC,YAAIK,eAAJ,EAAqB;EACnBpD,UAAAA,kBAAM,CAACX,UAAP,CAAkB+D,eAAlB,EAAmCa,QAAnC,EAA6C;EAC3ChH,YAAAA,UAAU,EAAE,QAD+B;EAE3CE,YAAAA,QAAQ,EAAE6E,YAAY,CAACG,iBAFoB;EAG3C7E,YAAAA,oBAAoB,EAAE;EAHqB,WAA7C;EAKD;EACF;;EAED,UAAI,CAAC8F,eAAL,EAAsB;EACpB;EACD;EACF;EACF;;EAED,MAAI,CAACc,WAAL,EAAkB;EAChB,IAA2C;EACzC,UAAI,CAACd,eAAe,CAAC9E,MAAjB,KAA4B,GAAhC,EAAqC;EACnC,YAAI8E,eAAe,CAAC9E,MAAhB,KAA2B,CAA/B,EAAkC;EAChCnD,UAAAA,MAAM,CAACM,IAAP,CAAa,qBAAoBoH,OAAO,CAACxE,GAAI,iBAAjC,GACT,4DADS,GAET,oCAFH;EAGD,SAJD,MAIO;EACLlD,UAAAA,MAAM,CAACI,KAAP,CAAc,qBAAoBsH,OAAO,CAACxE,GAAI,aAAjC,GACZ,qBAAoByE,QAAQ,CAACxE,MAAO,6BADxB,GAEZ,SAFD;EAGD;EACF;EACF;;EACD8E,IAAAA,eAAe,GAAGA,eAAe,CAAC9E,MAAhB,KAA2B,GAA3B,GAAiC8E,eAAjC,GAAmD,IAArE;EACD;;EAED,SAAOA,eAAe,GAAGA,eAAH,GAAqB,IAA3C;EACD,CA/CD;EAiDA;;;;;;;;;;;;;;;;;EAeA,MAAMF,oBAAoB,GAAG,OAAO;EAACL,EAAAA,OAAD;EAAUM,EAAAA,IAAV;EAAgBV,EAAAA;EAAhB,CAAP,KAAoC;EAC/D,QAAM0B,yBAAyB,GAAG3B,WAAW,CAAC5B,MAAZ,CAC9B6B,OAD8B,EACrBT,YAAY,CAACE,sBADQ,CAAlC;EAGA,MAAIe,gBAAgB,GAAGJ,OAAvB;;EACA,OAAK,MAAMF,MAAX,IAAqBwB,yBAArB,EAAgD;EAC9ClB,IAAAA,gBAAgB,GAAG,MAAMN,MAAM,CAACX,YAAY,CAACE,sBAAd,CAAN,CAA4C2B,IAA5C,CACrBlB,MADqB,EACb;EAACQ,MAAAA,IAAD;EAAON,MAAAA,OAAO,EAAEI;EAAhB,KADa,CAAzB;;EAGA,QAAI,OAAOA,gBAAP,KAA4B,QAAhC,EAA0C;EACxCA,MAAAA,gBAAgB,GAAG,IAAImB,OAAJ,CAAYnB,gBAAZ,CAAnB;EACD;;EAED,IAA2C;EACzCjD,MAAAA,kBAAM,CAACX,UAAP,CAAkB4D,gBAAlB,EAAoCmB,OAApC,EAA6C;EAC3CnH,QAAAA,UAAU,EAAE,QAD+B;EAE3CE,QAAAA,QAAQ,EAAE6E,YAAY,CAACE,sBAFoB;EAG3C5E,QAAAA,oBAAoB,EAAE;EAHqB,OAA7C;EAKD;EACF;;EAED,SAAO2F,gBAAP;EACD,CAvBD;;AAyBA,EAAO,MAAMoB,YAAY,GAAG;EAC1BT,EAAAA,GAAG,EAAEhB,UADqB;EAE1BoB,EAAAA,KAAK,EAAEL;EAFmB,CAArB;;ECxRP;;;;;;;AAQA,EAGA;;;;;;;;AAOA,EAAO,MAAMW,SAAN,CAAgB;EACrB;;;;;;;;;EASA3F,EAAAA,WAAW,CAACpB,IAAD,EAAOgH,OAAP,EAAgB;EACzBC,IAAAA,eADyB;EAEzBC,IAAAA,eAAe,GAAG,KAAKC;EAFE,MAGvB,EAHO,EAGH;EACN,SAAKC,KAAL,GAAapH,IAAb;EACA,SAAKqH,QAAL,GAAgBL,OAAhB;EACA,SAAKM,gBAAL,GAAwBL,eAAxB;EACA,SAAKE,gBAAL,GAAwBD,eAAxB,CAJM;;EAON,SAAKK,GAAL,GAAW,IAAX;EACD;EAED;;;;;;;EAKA,MAAIC,EAAJ,GAAS;EACP,WAAO,KAAKD,GAAZ;EACD;EAED;;;;;;;;;EAOA,QAAMtB,IAAN,GAAa;EACX,QAAI,KAAKsB,GAAT,EAAc;EAEd,SAAKA,GAAL,GAAW,MAAM,IAAIE,OAAJ,CAAY,CAACC,OAAD,EAAUC,MAAV,KAAqB;EAChD;EACA;EACA;EACA;EACA;EACA,UAAIC,mBAAmB,GAAG,KAA1B;EACAC,MAAAA,UAAU,CAAC,MAAM;EACfD,QAAAA,mBAAmB,GAAG,IAAtB;EACAD,QAAAA,MAAM,CAAC,IAAIpI,KAAJ,CAAU,4CAAV,CAAD,CAAN;EACD,OAHS,EAGP,KAAKuI,YAHE,CAAV;EAKA,YAAMC,WAAW,GAAGC,SAAS,CAAC/B,IAAV,CAAe,KAAKmB,KAApB,EAA2B,KAAKC,QAAhC,CAApB;;EACAU,MAAAA,WAAW,CAACE,OAAZ,GAAsB,MAAMN,MAAM,CAACI,WAAW,CAAC5J,KAAb,CAAlC;;EACA4J,MAAAA,WAAW,CAACd,eAAZ,GAA+BiB,GAAD,IAAS;EACrC,YAAIN,mBAAJ,EAAyB;EACvBG,UAAAA,WAAW,CAACI,WAAZ,CAAwBC,KAAxB;EACAF,UAAAA,GAAG,CAACG,MAAJ,CAAWC,MAAX,CAAkBC,KAAlB;EACD,SAHD,MAGO,IAAI,KAAKjB,gBAAT,EAA2B;EAChC,eAAKA,gBAAL,CAAsBY,GAAtB;EACD;EACF,OAPD;;EAQAH,MAAAA,WAAW,CAACS,SAAZ,GAAwB,CAAC;EAACH,QAAAA;EAAD,OAAD,KAAc;EACpC,cAAMb,EAAE,GAAGa,MAAM,CAACC,MAAlB;;EACA,YAAIV,mBAAJ,EAAyB;EACvBJ,UAAAA,EAAE,CAACe,KAAH;EACD,SAFD,MAEO;EACLf,UAAAA,EAAE,CAACN,eAAH,GAAqB,KAAKC,gBAAL,CAAsBsB,IAAtB,CAA2B,IAA3B,CAArB;EACAf,UAAAA,OAAO,CAACF,EAAD,CAAP;EACD;EACF,OARD;EASD,KA/BgB,CAAjB;EAiCA,WAAO,IAAP;EACD;EAED;;;;;;;;;;;EASA,QAAMkB,MAAN,CAAaC,SAAb,EAAwBC,KAAxB,EAA+B;EAC7B,WAAO,CAAC,MAAM,KAAKC,UAAL,CAAgBF,SAAhB,EAA2BC,KAA3B,EAAkC,CAAlC,CAAP,EAA6C,CAA7C,CAAP;EACD;EAED;;;;;;;;;;;;EAUA,QAAME,MAAN,CAAaH,SAAb,EAAwBC,KAAxB,EAA+BG,KAA/B,EAAsC;EACpC,WAAO,MAAM,KAAKC,cAAL,CAAoBL,SAApB,EAA+B;EAACC,MAAAA,KAAD;EAAQG,MAAAA;EAAR,KAA/B,CAAb;EACD;EAGD;;;;;;;;;;;;EAUA,QAAMF,UAAN,CAAiBF,SAAjB,EAA4BC,KAA5B,EAAmCG,KAAnC,EAA0C;EACxC,WAAO,CAAC,MAAM,KAAKC,cAAL,CACVL,SADU,EACC;EAACC,MAAAA,KAAD;EAAQG,MAAAA,KAAR;EAAeE,MAAAA,WAAW,EAAE;EAA5B,KADD,CAAP,EAC4CC,GAD5C,CACgD,CAAC;EAACxF,MAAAA;EAAD,KAAD,KAAWA,GAD3D,CAAP;EAED;EAED;;;;;;;;;;;;;;;;;;;EAiBA,QAAMsF,cAAN,CAAqBL,SAArB,EAAgC;EAC9BQ,IAAAA,KAD8B;EAE9BP,IAAAA,KAAK,GAAG,IAFsB;EAEhB;EACdQ,IAAAA,SAAS,GAAG,MAHkB;EAI9BL,IAAAA,KAJ8B;EAK9BE,IAAAA;EAL8B,MAM5B,EANJ,EAMQ;EACN,WAAO,MAAM,KAAKd,WAAL,CAAiB,CAACQ,SAAD,CAAjB,EAA8B,UAA9B,EAA0C,CAACU,GAAD,EAAMC,IAAN,KAAe;EACpE,YAAMC,KAAK,GAAGF,GAAG,CAACG,WAAJ,CAAgBb,SAAhB,CAAd;EACA,YAAMN,MAAM,GAAGc,KAAK,GAAGI,KAAK,CAACJ,KAAN,CAAYA,KAAZ,CAAH,GAAwBI,KAA5C;EACA,YAAME,OAAO,GAAG,EAAhB;;EAEApB,MAAAA,MAAM,CAACqB,UAAP,CAAkBd,KAAlB,EAAyBQ,SAAzB,EAAoCZ,SAApC,GAAgD,CAAC;EAACH,QAAAA;EAAD,OAAD,KAAc;EAC5D,cAAMsB,MAAM,GAAGtB,MAAM,CAACC,MAAtB;;EACA,YAAIqB,MAAJ,EAAY;EACV,gBAAM;EAACC,YAAAA,UAAD;EAAalG,YAAAA,GAAb;EAAkBpE,YAAAA;EAAlB,cAA2BqK,MAAjC;EACAF,UAAAA,OAAO,CAACI,IAAR,CAAaZ,WAAW,GAAG;EAACW,YAAAA,UAAD;EAAalG,YAAAA,GAAb;EAAkBpE,YAAAA;EAAlB,WAAH,GAA8BA,KAAtD;;EACA,cAAIyJ,KAAK,IAAIU,OAAO,CAACnG,MAAR,IAAkByF,KAA/B,EAAsC;EACpCO,YAAAA,IAAI,CAACG,OAAD,CAAJ;EACD,WAFD,MAEO;EACLE,YAAAA,MAAM,CAACG,QAAP;EACD;EACF,SARD,MAQO;EACLR,UAAAA,IAAI,CAACG,OAAD,CAAJ;EACD;EACF,OAbD;EAcD,KAnBY,CAAb;EAoBD;EAED;;;;;;;;;;;;;;;;;;;EAiBA,QAAMtB,WAAN,CAAkB4B,UAAlB,EAA8BnI,IAA9B,EAAoCY,QAApC,EAA8C;EAC5C,UAAM,KAAKyD,IAAL,EAAN;EACA,WAAO,MAAM,IAAIwB,OAAJ,CAAY,CAACC,OAAD,EAAUC,MAAV,KAAqB;EAC5C,YAAM0B,GAAG,GAAG,KAAK9B,GAAL,CAASY,WAAT,CAAqB4B,UAArB,EAAiCnI,IAAjC,CAAZ;;EACAyH,MAAAA,GAAG,CAACW,OAAJ,GAAc,CAAC;EAAC3B,QAAAA;EAAD,OAAD,KAAcV,MAAM,CAACU,MAAM,CAAClK,KAAR,CAAlC;;EACAkL,MAAAA,GAAG,CAACY,UAAJ,GAAiB,MAAMvC,OAAO,EAA9B;;EAEAlF,MAAAA,QAAQ,CAAC6G,GAAD,EAAO/J,KAAD,IAAWoI,OAAO,CAACpI,KAAD,CAAxB,CAAR;EACD,KANY,CAAb;EAOD;EAED;;;;;;;;;;;;EAUA,QAAM4K,KAAN,CAAY3L,MAAZ,EAAoBoK,SAApB,EAA+B/G,IAA/B,EAAqC,GAAGpD,IAAxC,EAA8C;EAC5C,UAAMgE,QAAQ,GAAG,CAAC6G,GAAD,EAAMC,IAAN,KAAe;EAC9BD,MAAAA,GAAG,CAACG,WAAJ,CAAgBb,SAAhB,EAA2BpK,MAA3B,EAAmC,GAAGC,IAAtC,EAA4CgK,SAA5C,GAAwD,CAAC;EAACH,QAAAA;EAAD,OAAD,KAAc;EACpEiB,QAAAA,IAAI,CAACjB,MAAM,CAACC,MAAR,CAAJ;EACD,OAFD;EAGD,KAJD;;EAMA,WAAO,MAAM,KAAKH,WAAL,CAAiB,CAACQ,SAAD,CAAjB,EAA8B/G,IAA9B,EAAoCY,QAApC,CAAb;EACD;EAED;;;;;;;;EAMA2E,EAAAA,gBAAgB,GAAG;EACjB,SAAKoB,KAAL;EACD;EAED;;;;;;;;;;;;;;;EAaAA,EAAAA,KAAK,GAAG;EACN,QAAI,KAAKhB,GAAT,EAAc;EACZ,WAAKA,GAAL,CAASgB,KAAT;;EACA,WAAKhB,GAAL,GAAW,IAAX;EACD;EACF;;EAnPoB;EAuPvB;;EACAR,SAAS,CAACoD,SAAV,CAAoBrC,YAApB,GAAmC,IAAnC;;EAGA,MAAMsC,aAAa,GAAG;EACpB,cAAY,CAAC,KAAD,EAAQ,OAAR,EAAiB,QAAjB,EAA2B,QAA3B,EAAqC,YAArC,CADQ;EAEpB,eAAa,CAAC,KAAD,EAAQ,KAAR,EAAe,OAAf,EAAwB,QAAxB;EAFO,CAAtB;;EAIA,KAAK,MAAM,CAACxE,IAAD,EAAOyE,OAAP,CAAX,IAA8BpL,MAAM,CAACqL,OAAP,CAAeF,aAAf,CAA9B,EAA6D;EAC3D,OAAK,MAAM7L,MAAX,IAAqB8L,OAArB,EAA8B;EAC5B,QAAI9L,MAAM,IAAIgM,cAAc,CAACJ,SAA7B,EAAwC;EACtC;EACApD,MAAAA,SAAS,CAACoD,SAAV,CAAoB5L,MAApB,IAA8B,gBAAeoK,SAAf,EAA0B,GAAGnK,IAA7B,EAAmC;EAC/D,eAAO,MAAM,KAAK0L,KAAL,CAAW3L,MAAX,EAAmBoK,SAAnB,EAA8B/C,IAA9B,EAAoC,GAAGpH,IAAvC,CAAb;EACD,OAFD;EAGD;EACF;EACF;;EC1RD;;;;;;;AAQA,EAGA;;;;;;;;;AAQA,EAAO,MAAMgM,QAAN,CAAe;EACpB;;;EAGApJ,EAAAA,WAAW,GAAG;EACZ,SAAKqJ,OAAL,GAAe,IAAIhD,OAAJ,CAAY,CAACC,OAAD,EAAUC,MAAV,KAAqB;EAC9C,WAAKD,OAAL,GAAeA,OAAf;EACA,WAAKC,MAAL,GAAcA,MAAd;EACD,KAHc,CAAf;EAID;;EATmB;;ECnBtB;;;;;;;AAQA,EAGA;;;;;;;;;;AASA,EAAO,MAAM+C,cAAc,GAAG,MAAO1K,IAAP,IAAgB;EAC5C,QAAM,IAAIyH,OAAJ,CAAY,CAACC,OAAD,EAAUC,MAAV,KAAqB;EACrC,UAAMrC,OAAO,GAAG0C,SAAS,CAAC0C,cAAV,CAAyB1K,IAAzB,CAAhB;;EACAsF,IAAAA,OAAO,CAAC2C,OAAR,GAAkB,CAAC;EAACI,MAAAA;EAAD,KAAD,KAAc;EAC9BV,MAAAA,MAAM,CAACU,MAAM,CAAClK,KAAR,CAAN;EACD,KAFD;;EAGAmH,IAAAA,OAAO,CAACqF,SAAR,GAAoB,MAAM;EACxBhD,MAAAA,MAAM,CAAC,IAAIpI,KAAJ,CAAU,gBAAV,CAAD,CAAN;EACD,KAFD;;EAGA+F,IAAAA,OAAO,CAACkD,SAAR,GAAoB,MAAM;EACxBd,MAAAA,OAAO;EACR,KAFD;EAGD,GAXK,CAAN;EAYD,CAbM;;ECpBP;;;;;;;AAQA,EAQA;;;;;;;;;;;;;;;;EAeA,MAAMkD,YAAY,GAAG,OAAO;EAC1BtF,EAAAA,OAD0B;EAE1BuF,EAAAA,YAF0B;EAG1BrF,EAAAA,KAH0B;EAI1BN,EAAAA,OAAO,GAAG;EAJgB,CAAP,KAID;EAClB;EACA;EACA;EACA,MAAIM,KAAK,IAAIA,KAAK,CAACsF,eAAnB,EAAoC;EAClC,UAAMC,uBAAuB,GAAG,MAAMvF,KAAK,CAACsF,eAA5C;;EACA,QAAIC,uBAAJ,EAA6B;EAC3B,MAA2C;EACzCnN,QAAAA,MAAM,CAACK,GAAP,CAAY,4CAAD,GACR,IAAGgG,cAAc,CAACqB,OAAO,CAACxE,GAAT,CAAc,GADlC;EAED;;EACD,aAAOiK,uBAAP;EACD;EACF;;EAED,MAAI,OAAOzF,OAAP,KAAmB,QAAvB,EAAiC;EAC/BA,IAAAA,OAAO,GAAG,IAAIuB,OAAJ,CAAYvB,OAAZ,CAAV;EACD;;EAED,EAA2C;EACzC7C,IAAAA,kBAAM,CAACX,UAAP,CAAkBwD,OAAlB,EAA2BuB,OAA3B,EAAoC;EAClCzH,MAAAA,SAAS,EAAEkG,OADuB;EAElCxF,MAAAA,aAAa,EAAE,SAFmB;EAGlCJ,MAAAA,UAAU,EAAE,cAHsB;EAIlCC,MAAAA,SAAS,EAAE,cAJuB;EAKlCC,MAAAA,QAAQ,EAAE;EALwB,KAApC;EAOD;;EAED,QAAMoL,kBAAkB,GAAG/F,WAAW,CAAC5B,MAAZ,CACvB6B,OADuB,EACdT,YAAY,CAACK,cADC,CAA3B,CA7BkB;EAiClB;EACA;;EACA,QAAMmG,eAAe,GAAGD,kBAAkB,CAAC1H,MAAnB,GAA4B,CAA5B,GACtBgC,OAAO,CAAC4F,KAAR,EADsB,GACJ,IADpB;;EAGA,MAAI;EACF,SAAK,IAAI9F,MAAT,IAAmBF,OAAnB,EAA4B;EAC1B,UAAIT,YAAY,CAACO,kBAAb,IAAmCI,MAAvC,EAA+C;EAC7CE,QAAAA,OAAO,GAAG,MAAMF,MAAM,CAACX,YAAY,CAACO,kBAAd,CAAN,CAAwCsB,IAAxC,CAA6ClB,MAA7C,EAAqD;EACnEE,UAAAA,OAAO,EAAEA,OAAO,CAAC4F,KAAR,EAD0D;EAEnE1F,UAAAA;EAFmE,SAArD,CAAhB;;EAKA,QAA2C;EACzC,cAAIF,OAAJ,EAAa;EACX7C,YAAAA,kBAAM,CAACX,UAAP,CAAkBwD,OAAlB,EAA2BuB,OAA3B,EAAoC;EAClCnH,cAAAA,UAAU,EAAE,QADsB;EAElCE,cAAAA,QAAQ,EAAE6E,YAAY,CAACI,4BAFW;EAGlC9E,cAAAA,oBAAoB,EAAE;EAHY,aAApC;EAKD;EACF;EACF;EACF;EACF,GAnBD,CAmBE,OAAOoL,GAAP,EAAY;EACZ,UAAM,IAAIhK,YAAJ,CAAiB,iCAAjB,EAAoD;EACxDb,MAAAA,WAAW,EAAE6K;EAD2C,KAApD,CAAN;EAGD,GA7DiB;EAgElB;EACA;;;EACA,MAAIC,qBAAqB,GAAG9F,OAAO,CAAC4F,KAAR,EAA5B;;EAEA,MAAI;EACF,QAAIG,aAAJ,CADE;;EAIF,QAAI/F,OAAO,CAACM,IAAR,KAAiB,UAArB,EAAiC;EAC/ByF,MAAAA,aAAa,GAAG,MAAMC,KAAK,CAAChG,OAAD,CAA3B;EACD,KAFD,MAEO;EACL+F,MAAAA,aAAa,GAAG,MAAMC,KAAK,CAAChG,OAAD,EAAUuF,YAAV,CAA3B;EACD;;EAED,IAA2C;EACzCjN,MAAAA,MAAM,CAACI,KAAP,CAAc,sBAAD,GACZ,IAAGiG,cAAc,CAACqB,OAAO,CAACxE,GAAT,CAAc,6BADnB,GAEZ,WAAUuK,aAAa,CAACtK,MAAO,IAFhC;EAGD;;EAED,SAAK,MAAMqE,MAAX,IAAqBF,OAArB,EAA8B;EAC5B,UAAIT,YAAY,CAACM,iBAAb,IAAkCK,MAAtC,EAA8C;EAC5CiG,QAAAA,aAAa,GAAG,MAAMjG,MAAM,CAACX,YAAY,CAACM,iBAAd,CAAN,CACjBuB,IADiB,CACZlB,MADY,EACJ;EACZI,UAAAA,KADY;EAEZF,UAAAA,OAAO,EAAE8F,qBAFG;EAGZ7F,UAAAA,QAAQ,EAAE8F;EAHE,SADI,CAAtB;;EAOA,QAA2C;EACzC,cAAIA,aAAJ,EAAmB;EACjB5I,YAAAA,kBAAM,CAACX,UAAP,CAAkBuJ,aAAlB,EAAiC3E,QAAjC,EAA2C;EACzChH,cAAAA,UAAU,EAAE,QAD6B;EAEzCE,cAAAA,QAAQ,EAAE6E,YAAY,CAACM,iBAFkB;EAGzChF,cAAAA,oBAAoB,EAAE;EAHmB,aAA3C;EAKD;EACF;EACF;EACF;;EAED,WAAOsL,aAAP;EACD,GAtCD,CAsCE,OAAOlN,KAAP,EAAc;EACd,IAA2C;EACzCP,MAAAA,MAAM,CAACO,KAAP,CAAc,sBAAD,GACZ,IAAG8F,cAAc,CAACqB,OAAO,CAACxE,GAAT,CAAc,mBADhC,EACoD3C,KADpD;EAED;;EAED,SAAK,MAAMiH,MAAX,IAAqB4F,kBAArB,EAAyC;EACvC,YAAM5F,MAAM,CAACX,YAAY,CAACK,cAAd,CAAN,CAAoCwB,IAApC,CAAyClB,MAAzC,EAAiD;EACrDjH,QAAAA,KADqD;EAErDqH,QAAAA,KAFqD;EAGrDyF,QAAAA,eAAe,EAAEA,eAAe,CAACC,KAAhB,EAHoC;EAIrD5F,QAAAA,OAAO,EAAE8F,qBAAqB,CAACF,KAAtB;EAJ4C,OAAjD,CAAN;EAMD;;EAED,UAAM/M,KAAN;EACD;EACF,CA/HD;;EAiIA,MAAMoN,YAAY,GAAG;EACnBD,EAAAA,KAAK,EAAEV;EADY,CAArB;;EChKA;;;;;;;;;;;;;;;;;;;;;;ECAA;;;;;;;AAQA,EAGA;;;;;;;AAMA,QAAaY,YAAY,GAAG,MAAM;EAChCC,EAAAA,gBAAgB,CAAC,UAAD,EAAa,MAAMC,OAAO,CAACC,KAAR,EAAnB,CAAhB;EACD,CAFM;;ECjBP;;;;;;;AAQA,EAIA;;;;;;;;;;;;;;;;AAeA,QAAapI,YAAU,GAAG;EACxB,MAAIX,eAAJ,GAAsB;EACpB,WAAOgJ,UAAW,CAACjI,sBAAZ,EAAP;EACD,GAHuB;;EAIxB,MAAId,QAAJ,GAAe;EACb,WAAO+I,UAAW,CAAC/H,eAAZ,EAAP;EACD,GANuB;;EAOxB,MAAIf,MAAJ,GAAa;EACX,WAAO8I,UAAW,CAAC9H,SAAZ,EAAP;EACD,GATuB;;EAUxB,MAAIf,OAAJ,GAAc;EACZ,WAAO6I,UAAW,CAAC7H,cAAZ,EAAP;EACD,GAZuB;;EAaxB,MAAIf,MAAJ,GAAa;EACX,WAAO4I,UAAW,CAAC5H,SAAZ,EAAP;EACD;;EAfuB,CAAnB;;EC3BP;;;;;;;AAQA,EAMA;;;;;;;;;;;;;;;;;;AAiBA,QAAa6H,mBAAmB,GAAIvK,OAAD,IAAa;EAC9C,EAA2C;EACzCrC,IAAAA,MAAM,CAACC,IAAP,CAAYoC,OAAZ,EAAqBmC,OAArB,CAA8BC,GAAD,IAAS;EACpCjB,MAAAA,kBAAM,CAACZ,MAAP,CAAcP,OAAO,CAACoC,GAAD,CAArB,EAA4B,QAA5B,EAAsC;EACpChE,QAAAA,UAAU,EAAE,cADwB;EAEpCE,QAAAA,QAAQ,EAAE,qBAF0B;EAGpCR,QAAAA,SAAS,EAAG,WAAUsE,GAAI;EAHU,OAAtC;EAKD,KAND;;EAQA,QAAI,cAAcpC,OAAd,IAAyBA,OAAO,CAACuB,QAAR,CAAiBS,MAAjB,KAA4B,CAAzD,EAA4D;EAC1D,YAAM,IAAInC,YAAJ,CAAiB,oBAAjB,EAAuC;EAC3CX,QAAAA,WAAW,EAAE,UAD8B;EAE3ClB,QAAAA,KAAK,EAAEgC,OAAO,CAACuB;EAF4B,OAAvC,CAAN;EAID;;EAED,QAAI,aAAavB,OAAb,IAAwBA,OAAO,CAACyB,OAAR,CAAgBO,MAAhB,KAA2B,CAAvD,EAA0D;EACxD,YAAM,IAAInC,YAAJ,CAAiB,oBAAjB,EAAuC;EAC3CX,QAAAA,WAAW,EAAE,SAD8B;EAE3ClB,QAAAA,KAAK,EAAEgC,OAAO,CAACyB;EAF4B,OAAvC,CAAN;EAID;;EAED,QAAI,qBAAqBzB,OAArB,IAAgCA,OAAO,CAACsB,eAAR,CAAwBU,MAAxB,KAAmC,CAAvE,EAA0E;EACxE,YAAM,IAAInC,YAAJ,CAAiB,oBAAjB,EAAuC;EAC3CX,QAAAA,WAAW,EAAE,iBAD8B;EAE3ClB,QAAAA,KAAK,EAAEgC,OAAO,CAACsB;EAF4B,OAAvC,CAAN;EAID;EACF;;EAEDW,EAAAA,UAAU,CAACC,aAAX,CAAyBlC,OAAzB;EACD,CAjCM;;EC/BP;;;;;;;AAQA,EAGA;;;;;;;AAMA,QAAawK,WAAW,GAAG,MAAM;EAC/B;EACA;EACAL,EAAAA,gBAAgB,CAAC,SAAD,EAAY,MAAMhO,IAAI,CAACqO,WAAL,EAAlB,CAAhB;EACD,CAJM;;ECjBP;;;;;;;AAQA;EAUA,IAAI;EACFrO,EAAAA,IAAI,CAACsO,OAAL,CAAaC,CAAb,GAAiBvO,IAAI,CAACsO,OAAL,CAAaC,CAAb,IAAkB,EAAnC;EACD,CAFD,CAEE,OAAOC,KAAP,EAAc,EAAd;;;;;;;;;;;;;;;"}
\ No newline at end of file
diff --git a/public/javascripts/workbox/workbox-core.prod.js b/public/javascripts/workbox/workbox-core.prod.js
deleted file mode 100644
index 526e32b1d48..00000000000
--- a/public/javascripts/workbox/workbox-core.prod.js
+++ /dev/null
@@ -1,2 +0,0 @@
-this.workbox=this.workbox||{},this.workbox.core=function(e){"use strict";try{self["workbox:core:4.3.1"]&&_()}catch(e){}const t=(e,...t)=>{let n=e;return t.length>0&&(n+=` :: ${JSON.stringify(t)}`),n};class n extends Error{constructor(e,n){super(t(e,n)),this.name=e,this.details=n}}const s=new Set;const r={googleAnalytics:"googleAnalytics",precache:"precache-v2",prefix:"workbox",runtime:"runtime",suffix:self.registration.scope},a=e=>[r.prefix,e,r.suffix].filter(e=>e.length>0).join("-"),i={updateDetails:e=>{Object.keys(r).forEach(t=>{void 0!==e[t]&&(r[t]=e[t])})},getGoogleAnalyticsName:e=>e||a(r.googleAnalytics),getPrecacheName:e=>e||a(r.precache),getPrefix:()=>r.prefix,getRuntimeName:e=>e||a(r.runtime),getSuffix:()=>r.suffix},c=e=>{const t=new URL(e,location);return t.origin===location.origin?t.pathname:t.href};async function o(){for(const e of s)await e()}const l="cacheDidUpdate",u="cacheKeyWillBeUsed",h="cacheWillUpdate",f="cachedResponseWillBeUsed",w="fetchDidFail",g="fetchDidSucceed",d="requestWillFetch",p=(e,t)=>e.filter(e=>t in e),y=async({cacheName:e,request:t,event:n,matchOptions:s,plugins:r=[]})=>{const a=await caches.open(e),i=await q({plugins:r,request:t,mode:"read"});let c=await a.match(i,s);for(const t of r)f in t&&(c=await t[f].call(t,{cacheName:e,event:n,matchOptions:s,cachedResponse:c,request:i}));return c},m=async({request:e,response:t,event:n,plugins:s})=>{let r=t,a=!1;for(let t of s)if(h in t&&(a=!0,!(r=await t[h].call(t,{request:e,response:r,event:n}))))break;return a||(r=200===r.status?r:null),r||null},q=async({request:e,mode:t,plugins:n})=>{const s=p(n,u);let r=e;for(const e of s)"string"==typeof(r=await e[u].call(e,{mode:t,request:r}))&&(r=new Request(r));return r},v={put:async({cacheName:e,request:t,response:s,event:r,plugins:a=[],matchOptions:i}={})=>{const u=await q({plugins:a,request:t,mode:"write"});if(!s)throw new n("cache-put-with-no-response",{url:c(u.url)});let h=await m({event:r,plugins:a,response:s,request:u});if(!h)return;const f=await caches.open(e),w=p(a,l);let g=w.length>0?await y({cacheName:e,matchOptions:i,request:u}):null;try{await f.put(u,h)}catch(e){throw"QuotaExceededError"===e.name&&await o(),e}for(let t of w)await t[l].call(t,{cacheName:e,event:r,oldResponse:g,newResponse:h,request:u})},match:y};class x{constructor(e,t,{onupgradeneeded:n,onversionchange:s=this.t}={}){this.s=e,this.i=t,this.o=n,this.t=s,this.l=null}get db(){return this.l}async open(){if(!this.l)return this.l=await new Promise((e,t)=>{let n=!1;setTimeout(()=>{n=!0,t(new Error("The open request was blocked and timed out"))},this.OPEN_TIMEOUT);const s=indexedDB.open(this.s,this.i);s.onerror=(()=>t(s.error)),s.onupgradeneeded=(e=>{n?(s.transaction.abort(),e.target.result.close()):this.o&&this.o(e)}),s.onsuccess=(({target:t})=>{const s=t.result;n?s.close():(s.onversionchange=this.t.bind(this),e(s))})}),this}async getKey(e,t){return(await this.getAllKeys(e,t,1))[0]}async getAll(e,t,n){return await this.getAllMatching(e,{query:t,count:n})}async getAllKeys(e,t,n){return(await this.getAllMatching(e,{query:t,count:n,includeKeys:!0})).map(({key:e})=>e)}async getAllMatching(e,{index:t,query:n=null,direction:s="next",count:r,includeKeys:a}={}){return await this.transaction([e],"readonly",(i,c)=>{const o=i.objectStore(e),l=t?o.index(t):o,u=[];l.openCursor(n,s).onsuccess=(({target:e})=>{const t=e.result;if(t){const{primaryKey:e,key:n,value:s}=t;u.push(a?{primaryKey:e,key:n,value:s}:s),r&&u.length>=r?c(u):t.continue()}else c(u)})})}async transaction(e,t,n){return await this.open(),await new Promise((s,r)=>{const a=this.l.transaction(e,t);a.onabort=(({target:e})=>r(e.error)),a.oncomplete=(()=>s()),n(a,e=>s(e))})}async u(e,t,n,...s){return await this.transaction([t],n,(n,r)=>{n.objectStore(t)[e](...s).onsuccess=(({target:e})=>{r(e.result)})})}t(){this.close()}close(){this.l&&(this.l.close(),this.l=null)}}x.prototype.OPEN_TIMEOUT=2e3;const b={readonly:["get","count","getKey","getAll","getAllKeys"],readwrite:["add","put","clear","delete"]};for(const[e,t]of Object.entries(b))for(const n of t)n in IDBObjectStore.prototype&&(x.prototype[n]=async function(t,...s){return await this.u(n,t,e,...s)});const D={fetch:async({request:e,fetchOptions:t,event:s,plugins:r=[]})=>{if(s&&s.preloadResponse){const e=await s.preloadResponse;if(e)return e}"string"==typeof e&&(e=new Request(e));const a=p(r,w),i=a.length>0?e.clone():null;try{for(let t of r)d in t&&(e=await t[d].call(t,{request:e.clone(),event:s}))}catch(e){throw new n("plugin-error-request-will-fetch",{thrownError:e})}let c=e.clone();try{let n;n="navigate"===e.mode?await fetch(e):await fetch(e,t);for(const e of r)g in e&&(n=await e[g].call(e,{event:s,request:c,response:n}));return n}catch(e){for(const t of a)await t[w].call(t,{error:e,event:s,originalRequest:i.clone(),request:c.clone()});throw e}}};var E=Object.freeze({assert:null,cacheNames:i,cacheWrapper:v,DBWrapper:x,Deferred:class{constructor(){this.promise=new Promise((e,t)=>{this.resolve=e,this.reject=t})}},deleteDatabase:async e=>{await new Promise((t,n)=>{const s=indexedDB.deleteDatabase(e);s.onerror=(({target:e})=>{n(e.error)}),s.onblocked=(()=>{n(new Error("Delete blocked"))}),s.onsuccess=(()=>{t()})})},executeQuotaErrorCallbacks:o,fetchWrapper:D,getFriendlyURL:c,logger:null,WorkboxError:n});const N={get googleAnalytics(){return i.getGoogleAnalyticsName()},get precache(){return i.getPrecacheName()},get prefix(){return i.getPrefix()},get runtime(){return i.getRuntimeName()},get suffix(){return i.getSuffix()}};try{self.workbox.v=self.workbox.v||{}}catch(e){}return e._private=E,e.clientsClaim=(()=>{addEventListener("activate",()=>clients.claim())}),e.cacheNames=N,e.registerQuotaErrorCallback=function(e){s.add(e)},e.setCacheNameDetails=(e=>{i.updateDetails(e)}),e.skipWaiting=(()=>{addEventListener("install",()=>self.skipWaiting())}),e}({});
-//# sourceMappingURL=workbox-core.prod.js.map
diff --git a/public/javascripts/workbox/workbox-core.prod.js.map b/public/javascripts/workbox/workbox-core.prod.js.map
deleted file mode 100644
index 71b89fb5a7a..00000000000
--- a/public/javascripts/workbox/workbox-core.prod.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"workbox-core.prod.js","sources":["../_version.mjs","../_private/logger.mjs","../models/messages/messageGenerator.mjs","../_private/WorkboxError.mjs","../_private/assert.mjs","../models/quotaErrorCallbacks.mjs","../_private/cacheNames.mjs","../_private/getFriendlyURL.mjs","../_private/executeQuotaErrorCallbacks.mjs","../models/pluginEvents.mjs","../utils/pluginUtils.mjs","../_private/cacheWrapper.mjs","../_private/DBWrapper.mjs","../_private/deleteDatabase.mjs","../_private/fetchWrapper.mjs","../_private/Deferred.mjs","../cacheNames.mjs","../index.mjs","../clientsClaim.mjs","../registerQuotaErrorCallback.mjs","../setCacheNameDetails.mjs","../skipWaiting.mjs"],"sourcesContent":["try{self['workbox:core:4.3.1']&&_()}catch(e){}// eslint-disable-line","/*\n  Copyright 2019 Google LLC\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport '../_version.mjs';\n\n\nconst logger = process.env.NODE_ENV === 'production' ? null : (() => {\n  let inGroup = false;\n\n  const methodToColorMap = {\n    debug: `#7f8c8d`, // Gray\n    log: `#2ecc71`, // Green\n    warn: `#f39c12`, // Yellow\n    error: `#c0392b`, // Red\n    groupCollapsed: `#3498db`, // Blue\n    groupEnd: null, // No colored prefix on groupEnd\n  };\n\n  const print = function(method, args) {\n    if (method === 'groupCollapsed') {\n      // Safari doesn't print all console.groupCollapsed() arguments:\n      // https://bugs.webkit.org/show_bug.cgi?id=182754\n      if (/^((?!chrome|android).)*safari/i.test(navigator.userAgent)) {\n        console[method](...args);\n        return;\n      }\n    }\n\n    const styles = [\n      `background: ${methodToColorMap[method]}`,\n      `border-radius: 0.5em`,\n      `color: white`,\n      `font-weight: bold`,\n      `padding: 2px 0.5em`,\n    ];\n\n    // When in a group, the workbox prefix is not displayed.\n    const logPrefix = inGroup ? [] : ['%cworkbox', styles.join(';')];\n\n    console[method](...logPrefix, ...args);\n\n    if (method === 'groupCollapsed') {\n      inGroup = true;\n    }\n    if (method === 'groupEnd') {\n      inGroup = false;\n    }\n  };\n\n  const api = {};\n  for (const method of Object.keys(methodToColorMap)) {\n    api[method] = (...args) => {\n      print(method, args);\n    };\n  }\n\n  return api;\n})();\n\nexport {logger};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {messages} from './messages.mjs';\nimport '../../_version.mjs';\n\nconst fallback = (code, ...args) => {\n  let msg = code;\n  if (args.length > 0) {\n    msg += ` :: ${JSON.stringify(args)}`;\n  }\n  return msg;\n};\n\nconst generatorFunction = (code, ...args) => {\n  const message = messages[code];\n  if (!message) {\n    throw new Error(`Unable to find message for code '${code}'.`);\n  }\n\n  return message(...args);\n};\n\nexport const messageGenerator = (process.env.NODE_ENV === 'production') ?\n    fallback : generatorFunction;\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {messageGenerator} from '../models/messages/messageGenerator.mjs';\nimport '../_version.mjs';\n\n/**\n * Workbox errors should be thrown with this class.\n * This allows use to ensure the type easily in tests,\n * helps developers identify errors from workbox\n * easily and allows use to optimise error\n * messages correctly.\n *\n * @private\n */\nclass WorkboxError extends Error {\n  /**\n   *\n   * @param {string} errorCode The error code that\n   * identifies this particular error.\n   * @param {Object=} details Any relevant arguments\n   * that will help developers identify issues should\n   * be added as a key on the context object.\n   */\n  constructor(errorCode, details) {\n    let message = messageGenerator(errorCode, details);\n\n    super(message);\n\n    this.name = errorCode;\n    this.details = details;\n  }\n}\n\nexport {WorkboxError};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {WorkboxError} from '../_private/WorkboxError.mjs';\nimport '../_version.mjs';\n\n/*\n * This method returns true if the current context is a service worker.\n */\nconst isSWEnv = (moduleName) => {\n  if (!('ServiceWorkerGlobalScope' in self)) {\n    throw new WorkboxError('not-in-sw', {moduleName});\n  }\n};\n\n/*\n * This method throws if the supplied value is not an array.\n * The destructed values are required to produce a meaningful error for users.\n * The destructed and restructured object is so it's clear what is\n * needed.\n */\nconst isArray = (value, {moduleName, className, funcName, paramName}) => {\n  if (!Array.isArray(value)) {\n    throw new WorkboxError('not-an-array', {\n      moduleName,\n      className,\n      funcName,\n      paramName,\n    });\n  }\n};\n\nconst hasMethod = (object, expectedMethod,\n    {moduleName, className, funcName, paramName}) => {\n  const type = typeof object[expectedMethod];\n  if (type !== 'function') {\n    throw new WorkboxError('missing-a-method', {paramName, expectedMethod,\n      moduleName, className, funcName});\n  }\n};\n\nconst isType = (object, expectedType,\n    {moduleName, className, funcName, paramName}) => {\n  if (typeof object !== expectedType) {\n    throw new WorkboxError('incorrect-type', {paramName, expectedType,\n      moduleName, className, funcName});\n  }\n};\n\nconst isInstance = (object, expectedClass,\n    {moduleName, className, funcName,\n      paramName, isReturnValueProblem}) => {\n  if (!(object instanceof expectedClass)) {\n    throw new WorkboxError('incorrect-class', {paramName, expectedClass,\n      moduleName, className, funcName, isReturnValueProblem});\n  }\n};\n\nconst isOneOf = (value, validValues, {paramName}) => {\n  if (!validValues.includes(value)) {\n    throw new WorkboxError('invalid-value', {\n      paramName,\n      value,\n      validValueDescription: `Valid values are ${JSON.stringify(validValues)}.`,\n    });\n  }\n};\n\nconst isArrayOfClass = (value, expectedClass,\n    {moduleName, className, funcName, paramName}) => {\n  const error = new WorkboxError('not-array-of-class', {\n    value, expectedClass,\n    moduleName, className, funcName, paramName,\n  });\n  if (!Array.isArray(value)) {\n    throw error;\n  }\n\n  for (let item of value) {\n    if (!(item instanceof expectedClass)) {\n      throw error;\n    }\n  }\n};\n\nconst finalAssertExports = process.env.NODE_ENV === 'production' ? null : {\n  hasMethod,\n  isArray,\n  isInstance,\n  isOneOf,\n  isSWEnv,\n  isType,\n  isArrayOfClass,\n};\n\nexport {finalAssertExports as assert};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport '../_version.mjs';\n\n\n// Callbacks to be executed whenever there's a quota error.\nconst quotaErrorCallbacks = new Set();\n\nexport {quotaErrorCallbacks};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport '../_version.mjs';\n\n\nconst _cacheNameDetails = {\n  googleAnalytics: 'googleAnalytics',\n  precache: 'precache-v2',\n  prefix: 'workbox',\n  runtime: 'runtime',\n  suffix: self.registration.scope,\n};\n\nconst _createCacheName = (cacheName) => {\n  return [_cacheNameDetails.prefix, cacheName, _cacheNameDetails.suffix]\n      .filter((value) => value.length > 0)\n      .join('-');\n};\n\nexport const cacheNames = {\n  updateDetails: (details) => {\n    Object.keys(_cacheNameDetails).forEach((key) => {\n      if (typeof details[key] !== 'undefined') {\n        _cacheNameDetails[key] = details[key];\n      }\n    });\n  },\n  getGoogleAnalyticsName: (userCacheName) => {\n    return userCacheName || _createCacheName(_cacheNameDetails.googleAnalytics);\n  },\n  getPrecacheName: (userCacheName) => {\n    return userCacheName || _createCacheName(_cacheNameDetails.precache);\n  },\n  getPrefix: () => {\n    return _cacheNameDetails.prefix;\n  },\n  getRuntimeName: (userCacheName) => {\n    return userCacheName || _createCacheName(_cacheNameDetails.runtime);\n  },\n  getSuffix: () => {\n    return _cacheNameDetails.suffix;\n  },\n};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport '../_version.mjs';\n\nconst getFriendlyURL = (url) => {\n  const urlObj = new URL(url, location);\n  if (urlObj.origin === location.origin) {\n    return urlObj.pathname;\n  }\n  return urlObj.href;\n};\n\nexport {getFriendlyURL};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {logger} from '../_private/logger.mjs';\nimport {quotaErrorCallbacks} from '../models/quotaErrorCallbacks.mjs';\nimport '../_version.mjs';\n\n\n/**\n * Runs all of the callback functions, one at a time sequentially, in the order\n * in which they were registered.\n *\n * @memberof workbox.core\n * @private\n */\nasync function executeQuotaErrorCallbacks() {\n  if (process.env.NODE_ENV !== 'production') {\n    logger.log(`About to run ${quotaErrorCallbacks.size} ` +\n        `callbacks to clean up caches.`);\n  }\n\n  for (const callback of quotaErrorCallbacks) {\n    await callback();\n    if (process.env.NODE_ENV !== 'production') {\n      logger.log(callback, 'is complete.');\n    }\n  }\n\n  if (process.env.NODE_ENV !== 'production') {\n    logger.log('Finished running callbacks.');\n  }\n}\n\nexport {executeQuotaErrorCallbacks};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport '../_version.mjs';\n\n\nexport const pluginEvents = {\n  CACHE_DID_UPDATE: 'cacheDidUpdate',\n  CACHE_KEY_WILL_BE_USED: 'cacheKeyWillBeUsed',\n  CACHE_WILL_UPDATE: 'cacheWillUpdate',\n  CACHED_RESPONSE_WILL_BE_USED: 'cachedResponseWillBeUsed',\n  FETCH_DID_FAIL: 'fetchDidFail',\n  FETCH_DID_SUCCEED: 'fetchDidSucceed',\n  REQUEST_WILL_FETCH: 'requestWillFetch',\n};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport '../_version.mjs';\n\nexport const pluginUtils = {\n  filter: (plugins, callbackName) => {\n    return plugins.filter((plugin) => callbackName in plugin);\n  },\n};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {WorkboxError} from './WorkboxError.mjs';\nimport {assert} from './assert.mjs';\nimport {getFriendlyURL} from './getFriendlyURL.mjs';\nimport {logger} from './logger.mjs';\nimport {executeQuotaErrorCallbacks} from './executeQuotaErrorCallbacks.mjs';\nimport {pluginEvents} from '../models/pluginEvents.mjs';\nimport {pluginUtils} from '../utils/pluginUtils.mjs';\nimport '../_version.mjs';\n\n\n/**\n * Wrapper around cache.put().\n *\n * Will call `cacheDidUpdate` on plugins if the cache was updated, using\n * `matchOptions` when determining what the old entry is.\n *\n * @param {Object} options\n * @param {string} options.cacheName\n * @param {Request} options.request\n * @param {Response} options.response\n * @param {Event} [options.event]\n * @param {Array<Object>} [options.plugins=[]]\n * @param {Object} [options.matchOptions]\n *\n * @private\n * @memberof module:workbox-core\n */\nconst putWrapper = async ({\n  cacheName,\n  request,\n  response,\n  event,\n  plugins = [],\n  matchOptions,\n} = {}) => {\n  if (process.env.NODE_ENV !== 'production') {\n    if (request.method && request.method !== 'GET') {\n      throw new WorkboxError('attempt-to-cache-non-get-request', {\n        url: getFriendlyURL(request.url),\n        method: request.method,\n      });\n    }\n  }\n\n  const effectiveRequest = await _getEffectiveRequest({\n    plugins, request, mode: 'write'});\n\n  if (!response) {\n    if (process.env.NODE_ENV !== 'production') {\n      logger.error(`Cannot cache non-existent response for ` +\n        `'${getFriendlyURL(effectiveRequest.url)}'.`);\n    }\n\n    throw new WorkboxError('cache-put-with-no-response', {\n      url: getFriendlyURL(effectiveRequest.url),\n    });\n  }\n\n  let responseToCache = await _isResponseSafeToCache({\n    event,\n    plugins,\n    response,\n    request: effectiveRequest,\n  });\n\n  if (!responseToCache) {\n    if (process.env.NODE_ENV !== 'production') {\n      logger.debug(`Response '${getFriendlyURL(effectiveRequest.url)}' will ` +\n      `not be cached.`, responseToCache);\n    }\n    return;\n  }\n\n  const cache = await caches.open(cacheName);\n\n  const updatePlugins = pluginUtils.filter(\n      plugins, pluginEvents.CACHE_DID_UPDATE);\n\n  let oldResponse = updatePlugins.length > 0 ?\n      await matchWrapper({cacheName, matchOptions, request: effectiveRequest}) :\n      null;\n\n  if (process.env.NODE_ENV !== 'production') {\n    logger.debug(`Updating the '${cacheName}' cache with a new Response for ` +\n      `${getFriendlyURL(effectiveRequest.url)}.`);\n  }\n\n  try {\n    await cache.put(effectiveRequest, responseToCache);\n  } catch (error) {\n    // See https://developer.mozilla.org/en-US/docs/Web/API/DOMException#exception-QuotaExceededError\n    if (error.name === 'QuotaExceededError') {\n      await executeQuotaErrorCallbacks();\n    }\n    throw error;\n  }\n\n  for (let plugin of updatePlugins) {\n    await plugin[pluginEvents.CACHE_DID_UPDATE].call(plugin, {\n      cacheName,\n      event,\n      oldResponse,\n      newResponse: responseToCache,\n      request: effectiveRequest,\n    });\n  }\n};\n\n/**\n * This is a wrapper around cache.match().\n *\n * @param {Object} options\n * @param {string} options.cacheName Name of the cache to match against.\n * @param {Request} options.request The Request that will be used to look up\n *     cache entries.\n * @param {Event} [options.event] The event that propted the action.\n * @param {Object} [options.matchOptions] Options passed to cache.match().\n * @param {Array<Object>} [options.plugins=[]] Array of plugins.\n * @return {Response} A cached response if available.\n *\n * @private\n * @memberof module:workbox-core\n */\nconst matchWrapper = async ({\n  cacheName,\n  request,\n  event,\n  matchOptions,\n  plugins = [],\n}) => {\n  const cache = await caches.open(cacheName);\n\n  const effectiveRequest = await _getEffectiveRequest({\n    plugins, request, mode: 'read'});\n\n  let cachedResponse = await cache.match(effectiveRequest, matchOptions);\n  if (process.env.NODE_ENV !== 'production') {\n    if (cachedResponse) {\n      logger.debug(`Found a cached response in '${cacheName}'.`);\n    } else {\n      logger.debug(`No cached response found in '${cacheName}'.`);\n    }\n  }\n\n  for (const plugin of plugins) {\n    if (pluginEvents.CACHED_RESPONSE_WILL_BE_USED in plugin) {\n      cachedResponse = await plugin[pluginEvents.CACHED_RESPONSE_WILL_BE_USED]\n          .call(plugin, {\n            cacheName,\n            event,\n            matchOptions,\n            cachedResponse,\n            request: effectiveRequest,\n          });\n      if (process.env.NODE_ENV !== 'production') {\n        if (cachedResponse) {\n          assert.isInstance(cachedResponse, Response, {\n            moduleName: 'Plugin',\n            funcName: pluginEvents.CACHED_RESPONSE_WILL_BE_USED,\n            isReturnValueProblem: true,\n          });\n        }\n      }\n    }\n  }\n\n  return cachedResponse;\n};\n\n/**\n * This method will call cacheWillUpdate on the available plugins (or use\n * status === 200) to determine if the Response is safe and valid to cache.\n *\n * @param {Object} options\n * @param {Request} options.request\n * @param {Response} options.response\n * @param {Event} [options.event]\n * @param {Array<Object>} [options.plugins=[]]\n * @return {Promise<Response>}\n *\n * @private\n * @memberof module:workbox-core\n */\nconst _isResponseSafeToCache = async ({request, response, event, plugins}) => {\n  let responseToCache = response;\n  let pluginsUsed = false;\n  for (let plugin of plugins) {\n    if (pluginEvents.CACHE_WILL_UPDATE in plugin) {\n      pluginsUsed = true;\n      responseToCache = await plugin[pluginEvents.CACHE_WILL_UPDATE]\n          .call(plugin, {\n            request,\n            response: responseToCache,\n            event,\n          });\n\n      if (process.env.NODE_ENV !== 'production') {\n        if (responseToCache) {\n          assert.isInstance(responseToCache, Response, {\n            moduleName: 'Plugin',\n            funcName: pluginEvents.CACHE_WILL_UPDATE,\n            isReturnValueProblem: true,\n          });\n        }\n      }\n\n      if (!responseToCache) {\n        break;\n      }\n    }\n  }\n\n  if (!pluginsUsed) {\n    if (process.env.NODE_ENV !== 'production') {\n      if (!responseToCache.status === 200) {\n        if (responseToCache.status === 0) {\n          logger.warn(`The response for '${request.url}' is an opaque ` +\n            `response. The caching strategy that you're using will not ` +\n            `cache opaque responses by default.`);\n        } else {\n          logger.debug(`The response for '${request.url}' returned ` +\n          `a status code of '${response.status}' and won't be cached as a ` +\n          `result.`);\n        }\n      }\n    }\n    responseToCache = responseToCache.status === 200 ? responseToCache : null;\n  }\n\n  return responseToCache ? responseToCache : null;\n};\n\n/**\n * Checks the list of plugins for the cacheKeyWillBeUsed callback, and\n * executes any of those callbacks found in sequence. The final `Request` object\n * returned by the last plugin is treated as the cache key for cache reads\n * and/or writes.\n *\n * @param {Object} options\n * @param {Request} options.request\n * @param {string} options.mode\n * @param {Array<Object>} [options.plugins=[]]\n * @return {Promise<Request>}\n *\n * @private\n * @memberof module:workbox-core\n */\nconst _getEffectiveRequest = async ({request, mode, plugins}) => {\n  const cacheKeyWillBeUsedPlugins = pluginUtils.filter(\n      plugins, pluginEvents.CACHE_KEY_WILL_BE_USED);\n\n  let effectiveRequest = request;\n  for (const plugin of cacheKeyWillBeUsedPlugins) {\n    effectiveRequest = await plugin[pluginEvents.CACHE_KEY_WILL_BE_USED].call(\n        plugin, {mode, request: effectiveRequest});\n\n    if (typeof effectiveRequest === 'string') {\n      effectiveRequest = new Request(effectiveRequest);\n    }\n\n    if (process.env.NODE_ENV !== 'production') {\n      assert.isInstance(effectiveRequest, Request, {\n        moduleName: 'Plugin',\n        funcName: pluginEvents.CACHE_KEY_WILL_BE_USED,\n        isReturnValueProblem: true,\n      });\n    }\n  }\n\n  return effectiveRequest;\n};\n\nexport const cacheWrapper = {\n  put: putWrapper,\n  match: matchWrapper,\n};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport '../_version.mjs';\n\n\n/**\n * A class that wraps common IndexedDB functionality in a promise-based API.\n * It exposes all the underlying power and functionality of IndexedDB, but\n * wraps the most commonly used features in a way that's much simpler to use.\n *\n * @private\n */\nexport class DBWrapper {\n  /**\n   * @param {string} name\n   * @param {number} version\n   * @param {Object=} [callback]\n   * @param {!Function} [callbacks.onupgradeneeded]\n   * @param {!Function} [callbacks.onversionchange] Defaults to\n   *     DBWrapper.prototype._onversionchange when not specified.\n   * @private\n   */\n  constructor(name, version, {\n    onupgradeneeded,\n    onversionchange = this._onversionchange,\n  } = {}) {\n    this._name = name;\n    this._version = version;\n    this._onupgradeneeded = onupgradeneeded;\n    this._onversionchange = onversionchange;\n\n    // If this is null, it means the database isn't open.\n    this._db = null;\n  }\n\n  /**\n   * Returns the IDBDatabase instance (not normally needed).\n   *\n   * @private\n   */\n  get db() {\n    return this._db;\n  }\n\n  /**\n   * Opens a connected to an IDBDatabase, invokes any onupgradedneeded\n   * callback, and added an onversionchange callback to the database.\n   *\n   * @return {IDBDatabase}\n   * @private\n   */\n  async open() {\n    if (this._db) return;\n\n    this._db = await new Promise((resolve, reject) => {\n      // This flag is flipped to true if the timeout callback runs prior\n      // to the request failing or succeeding. Note: we use a timeout instead\n      // of an onblocked handler since there are cases where onblocked will\n      // never never run. A timeout better handles all possible scenarios:\n      // https://github.com/w3c/IndexedDB/issues/223\n      let openRequestTimedOut = false;\n      setTimeout(() => {\n        openRequestTimedOut = true;\n        reject(new Error('The open request was blocked and timed out'));\n      }, this.OPEN_TIMEOUT);\n\n      const openRequest = indexedDB.open(this._name, this._version);\n      openRequest.onerror = () => reject(openRequest.error);\n      openRequest.onupgradeneeded = (evt) => {\n        if (openRequestTimedOut) {\n          openRequest.transaction.abort();\n          evt.target.result.close();\n        } else if (this._onupgradeneeded) {\n          this._onupgradeneeded(evt);\n        }\n      };\n      openRequest.onsuccess = ({target}) => {\n        const db = target.result;\n        if (openRequestTimedOut) {\n          db.close();\n        } else {\n          db.onversionchange = this._onversionchange.bind(this);\n          resolve(db);\n        }\n      };\n    });\n\n    return this;\n  }\n\n  /**\n   * Polyfills the native `getKey()` method. Note, this is overridden at\n   * runtime if the browser supports the native method.\n   *\n   * @param {string} storeName\n   * @param {*} query\n   * @return {Array}\n   * @private\n   */\n  async getKey(storeName, query) {\n    return (await this.getAllKeys(storeName, query, 1))[0];\n  }\n\n  /**\n   * Polyfills the native `getAll()` method. Note, this is overridden at\n   * runtime if the browser supports the native method.\n   *\n   * @param {string} storeName\n   * @param {*} query\n   * @param {number} count\n   * @return {Array}\n   * @private\n   */\n  async getAll(storeName, query, count) {\n    return await this.getAllMatching(storeName, {query, count});\n  }\n\n\n  /**\n   * Polyfills the native `getAllKeys()` method. Note, this is overridden at\n   * runtime if the browser supports the native method.\n   *\n   * @param {string} storeName\n   * @param {*} query\n   * @param {number} count\n   * @return {Array}\n   * @private\n   */\n  async getAllKeys(storeName, query, count) {\n    return (await this.getAllMatching(\n        storeName, {query, count, includeKeys: true})).map(({key}) => key);\n  }\n\n  /**\n   * Supports flexible lookup in an object store by specifying an index,\n   * query, direction, and count. This method returns an array of objects\n   * with the signature .\n   *\n   * @param {string} storeName\n   * @param {Object} [opts]\n   * @param {string} [opts.index] The index to use (if specified).\n   * @param {*} [opts.query]\n   * @param {IDBCursorDirection} [opts.direction]\n   * @param {number} [opts.count] The max number of results to return.\n   * @param {boolean} [opts.includeKeys] When true, the structure of the\n   *     returned objects is changed from an array of values to an array of\n   *     objects in the form {key, primaryKey, value}.\n   * @return {Array}\n   * @private\n   */\n  async getAllMatching(storeName, {\n    index,\n    query = null, // IE errors if query === `undefined`.\n    direction = 'next',\n    count,\n    includeKeys,\n  } = {}) {\n    return await this.transaction([storeName], 'readonly', (txn, done) => {\n      const store = txn.objectStore(storeName);\n      const target = index ? store.index(index) : store;\n      const results = [];\n\n      target.openCursor(query, direction).onsuccess = ({target}) => {\n        const cursor = target.result;\n        if (cursor) {\n          const {primaryKey, key, value} = cursor;\n          results.push(includeKeys ? {primaryKey, key, value} : value);\n          if (count && results.length >= count) {\n            done(results);\n          } else {\n            cursor.continue();\n          }\n        } else {\n          done(results);\n        }\n      };\n    });\n  }\n\n  /**\n   * Accepts a list of stores, a transaction type, and a callback and\n   * performs a transaction. A promise is returned that resolves to whatever\n   * value the callback chooses. The callback holds all the transaction logic\n   * and is invoked with two arguments:\n   *   1. The IDBTransaction object\n   *   2. A `done` function, that's used to resolve the promise when\n   *      when the transaction is done, if passed a value, the promise is\n   *      resolved to that value.\n   *\n   * @param {Array<string>} storeNames An array of object store names\n   *     involved in the transaction.\n   * @param {string} type Can be `readonly` or `readwrite`.\n   * @param {!Function} callback\n   * @return {*} The result of the transaction ran by the callback.\n   * @private\n   */\n  async transaction(storeNames, type, callback) {\n    await this.open();\n    return await new Promise((resolve, reject) => {\n      const txn = this._db.transaction(storeNames, type);\n      txn.onabort = ({target}) => reject(target.error);\n      txn.oncomplete = () => resolve();\n\n      callback(txn, (value) => resolve(value));\n    });\n  }\n\n  /**\n   * Delegates async to a native IDBObjectStore method.\n   *\n   * @param {string} method The method name.\n   * @param {string} storeName The object store name.\n   * @param {string} type Can be `readonly` or `readwrite`.\n   * @param {...*} args The list of args to pass to the native method.\n   * @return {*} The result of the transaction.\n   * @private\n   */\n  async _call(method, storeName, type, ...args) {\n    const callback = (txn, done) => {\n      txn.objectStore(storeName)[method](...args).onsuccess = ({target}) => {\n        done(target.result);\n      };\n    };\n\n    return await this.transaction([storeName], type, callback);\n  }\n\n  /**\n   * The default onversionchange handler, which closes the database so other\n   * connections can open without being blocked.\n   *\n   * @private\n   */\n  _onversionchange() {\n    this.close();\n  }\n\n  /**\n   * Closes the connection opened by `DBWrapper.open()`. Generally this method\n   * doesn't need to be called since:\n   *   1. It's usually better to keep a connection open since opening\n   *      a new connection is somewhat slow.\n   *   2. Connections are automatically closed when the reference is\n   *      garbage collected.\n   * The primary use case for needing to close a connection is when another\n   * reference (typically in another tab) needs to upgrade it and would be\n   * blocked by the current, open connection.\n   *\n   * @private\n   */\n  close() {\n    if (this._db) {\n      this._db.close();\n      this._db = null;\n    }\n  }\n}\n\n// Exposed to let users modify the default timeout on a per-instance\n// or global basis.\nDBWrapper.prototype.OPEN_TIMEOUT = 2000;\n\n// Wrap native IDBObjectStore methods according to their mode.\nconst methodsToWrap = {\n  'readonly': ['get', 'count', 'getKey', 'getAll', 'getAllKeys'],\n  'readwrite': ['add', 'put', 'clear', 'delete'],\n};\nfor (const [mode, methods] of Object.entries(methodsToWrap)) {\n  for (const method of methods) {\n    if (method in IDBObjectStore.prototype) {\n      // Don't use arrow functions here since we're outside of the class.\n      DBWrapper.prototype[method] = async function(storeName, ...args) {\n        return await this._call(method, storeName, mode, ...args);\n      };\n    }\n  }\n}\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport '../_version.mjs';\n\n\n/**\n * Deletes the database.\n * Note: this is exported separately from the DBWrapper module because most\n * usages of IndexedDB in workbox dont need deleting, and this way it can be\n * reused in tests to delete databases without creating DBWrapper instances.\n *\n * @param {string} name The database name.\n * @private\n */\nexport const deleteDatabase = async (name) => {\n  await new Promise((resolve, reject) => {\n    const request = indexedDB.deleteDatabase(name);\n    request.onerror = ({target}) => {\n      reject(target.error);\n    };\n    request.onblocked = () => {\n      reject(new Error('Delete blocked'));\n    };\n    request.onsuccess = () => {\n      resolve();\n    };\n  });\n};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {WorkboxError} from './WorkboxError.mjs';\nimport {logger} from './logger.mjs';\nimport {assert} from './assert.mjs';\nimport {getFriendlyURL} from '../_private/getFriendlyURL.mjs';\nimport {pluginEvents} from '../models/pluginEvents.mjs';\nimport {pluginUtils} from '../utils/pluginUtils.mjs';\nimport '../_version.mjs';\n\n/**\n * Wrapper around the fetch API.\n *\n * Will call requestWillFetch on available plugins.\n *\n * @param {Object} options\n * @param {Request|string} options.request\n * @param {Object} [options.fetchOptions]\n * @param {Event} [options.event]\n * @param {Array<Object>} [options.plugins=[]]\n * @return {Promise<Response>}\n *\n * @private\n * @memberof module:workbox-core\n */\nconst wrappedFetch = async ({\n  request,\n  fetchOptions,\n  event,\n  plugins = []}) => {\n  // We *should* be able to call `await event.preloadResponse` even if it's\n  // undefined, but for some reason, doing so leads to errors in our Node unit\n  // tests. To work around that, explicitly check preloadResponse's value first.\n  if (event && event.preloadResponse) {\n    const possiblePreloadResponse = await event.preloadResponse;\n    if (possiblePreloadResponse) {\n      if (process.env.NODE_ENV !== 'production') {\n        logger.log(`Using a preloaded navigation response for ` +\n          `'${getFriendlyURL(request.url)}'`);\n      }\n      return possiblePreloadResponse;\n    }\n  }\n\n  if (typeof request === 'string') {\n    request = new Request(request);\n  }\n\n  if (process.env.NODE_ENV !== 'production') {\n    assert.isInstance(request, Request, {\n      paramName: request,\n      expectedClass: 'Request',\n      moduleName: 'workbox-core',\n      className: 'fetchWrapper',\n      funcName: 'wrappedFetch',\n    });\n  }\n\n  const failedFetchPlugins = pluginUtils.filter(\n      plugins, pluginEvents.FETCH_DID_FAIL);\n\n  // If there is a fetchDidFail plugin, we need to save a clone of the\n  // original request before it's either modified by a requestWillFetch\n  // plugin or before the original request's body is consumed via fetch().\n  const originalRequest = failedFetchPlugins.length > 0 ?\n    request.clone() : null;\n\n  try {\n    for (let plugin of plugins) {\n      if (pluginEvents.REQUEST_WILL_FETCH in plugin) {\n        request = await plugin[pluginEvents.REQUEST_WILL_FETCH].call(plugin, {\n          request: request.clone(),\n          event,\n        });\n\n        if (process.env.NODE_ENV !== 'production') {\n          if (request) {\n            assert.isInstance(request, Request, {\n              moduleName: 'Plugin',\n              funcName: pluginEvents.CACHED_RESPONSE_WILL_BE_USED,\n              isReturnValueProblem: true,\n            });\n          }\n        }\n      }\n    }\n  } catch (err) {\n    throw new WorkboxError('plugin-error-request-will-fetch', {\n      thrownError: err,\n    });\n  }\n\n  // The request can be altered by plugins with `requestWillFetch` making\n  // the original request (Most likely from a `fetch` event) to be different\n  // to the Request we make. Pass both to `fetchDidFail` to aid debugging.\n  let pluginFilteredRequest = request.clone();\n\n  try {\n    let fetchResponse;\n\n    // See https://github.com/GoogleChrome/workbox/issues/1796\n    if (request.mode === 'navigate') {\n      fetchResponse = await fetch(request);\n    } else {\n      fetchResponse = await fetch(request, fetchOptions);\n    }\n\n    if (process.env.NODE_ENV !== 'production') {\n      logger.debug(`Network request for `+\n      `'${getFriendlyURL(request.url)}' returned a response with ` +\n      `status '${fetchResponse.status}'.`);\n    }\n\n    for (const plugin of plugins) {\n      if (pluginEvents.FETCH_DID_SUCCEED in plugin) {\n        fetchResponse = await plugin[pluginEvents.FETCH_DID_SUCCEED]\n            .call(plugin, {\n              event,\n              request: pluginFilteredRequest,\n              response: fetchResponse,\n            });\n\n        if (process.env.NODE_ENV !== 'production') {\n          if (fetchResponse) {\n            assert.isInstance(fetchResponse, Response, {\n              moduleName: 'Plugin',\n              funcName: pluginEvents.FETCH_DID_SUCCEED,\n              isReturnValueProblem: true,\n            });\n          }\n        }\n      }\n    }\n\n    return fetchResponse;\n  } catch (error) {\n    if (process.env.NODE_ENV !== 'production') {\n      logger.error(`Network request for `+\n      `'${getFriendlyURL(request.url)}' threw an error.`, error);\n    }\n\n    for (const plugin of failedFetchPlugins) {\n      await plugin[pluginEvents.FETCH_DID_FAIL].call(plugin, {\n        error,\n        event,\n        originalRequest: originalRequest.clone(),\n        request: pluginFilteredRequest.clone(),\n      });\n    }\n\n    throw error;\n  }\n};\n\nconst fetchWrapper = {\n  fetch: wrappedFetch,\n};\n\nexport {fetchWrapper};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport '../_version.mjs';\n\n\n/**\n * The Deferred class composes Promises in a way that allows for them to be\n * resolved or rejected from outside the constructor. In most cases promises\n * should be used directly, but Deferreds can be necessary when the logic to\n * resolve a promise must be separate.\n *\n * @private\n */\nexport class Deferred {\n  /**\n   * Creates a promise and exposes its resolve and reject functions as methods.\n   */\n  constructor() {\n    this.promise = new Promise((resolve, reject) => {\n      this.resolve = resolve;\n      this.reject = reject;\n    });\n  }\n}\n","/*\n  Copyright 2019 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {cacheNames as _cacheNames} from './_private/cacheNames.mjs';\nimport './_version.mjs';\n\n\n/**\n * Get the current cache names and prefix/suffix used by Workbox.\n *\n * `cacheNames.precache` is used for precached assets,\n * `cacheNames.googleAnalytics` is used by `workbox-google-analytics` to\n * store `analytics.js`, and `cacheNames.runtime` is used for everything else.\n *\n * `cacheNames.prefix` can be used to retrieve just the current prefix value.\n * `cacheNames.suffix` can be used to retrieve just the current suffix value.\n *\n * @return {Object} An object with `precache`, `runtime`, `prefix`, and\n *     `googleAnalytics` properties.\n *\n * @alias workbox.core.cacheNames\n */\nexport const cacheNames = {\n  get googleAnalytics() {\n    return _cacheNames.getGoogleAnalyticsName();\n  },\n  get precache() {\n    return _cacheNames.getPrecacheName();\n  },\n  get prefix() {\n    return _cacheNames.getPrefix();\n  },\n  get runtime() {\n    return _cacheNames.getRuntimeName();\n  },\n  get suffix() {\n    return _cacheNames.getSuffix();\n  },\n};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {registerQuotaErrorCallback} from './registerQuotaErrorCallback.mjs';\nimport * as _private from './_private.mjs';\nimport {clientsClaim} from './clientsClaim.mjs';\nimport {cacheNames} from './cacheNames.mjs';\nimport {setCacheNameDetails} from './setCacheNameDetails.mjs';\nimport {skipWaiting} from './skipWaiting.mjs';\nimport './_version.mjs';\n\n\n// Give our version strings something to hang off of.\ntry {\n  self.workbox.v = self.workbox.v || {};\n} catch (errer) {\n  // NOOP\n}\n\n/**\n * All of the Workbox service worker libraries use workbox-core for shared\n * code as well as setting default values that need to be shared (like cache\n * names).\n *\n * @namespace workbox.core\n */\n\nexport {\n  _private,\n  clientsClaim,\n  cacheNames,\n  registerQuotaErrorCallback,\n  setCacheNameDetails,\n  skipWaiting,\n};\n","/*\n  Copyright 2019 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport './_version.mjs';\n\n\n/**\n * Claim any currently available clients once the service worker\n * becomes active. This is normally used in conjunction with `skipWaiting()`.\n *\n * @alias workbox.core.clientsClaim\n */\nexport const clientsClaim = () => {\n  addEventListener('activate', () => clients.claim());\n};\n","/*\n  Copyright 2019 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {logger} from './_private/logger.mjs';\nimport {assert} from './_private/assert.mjs';\nimport {quotaErrorCallbacks} from './models/quotaErrorCallbacks.mjs';\nimport './_version.mjs';\n\n\n/**\n * Adds a function to the set of quotaErrorCallbacks that will be executed if\n * there's a quota error.\n *\n * @param {Function} callback\n * @memberof workbox.core\n */\nfunction registerQuotaErrorCallback(callback) {\n  if (process.env.NODE_ENV !== 'production') {\n    assert.isType(callback, 'function', {\n      moduleName: 'workbox-core',\n      funcName: 'register',\n      paramName: 'callback',\n    });\n  }\n\n  quotaErrorCallbacks.add(callback);\n\n  if (process.env.NODE_ENV !== 'production') {\n    logger.log('Registered a callback to respond to quota errors.', callback);\n  }\n}\n\nexport {registerQuotaErrorCallback};\n","/*\n  Copyright 2019 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {assert} from './_private/assert.mjs';\nimport {cacheNames} from './_private/cacheNames.mjs';\nimport {WorkboxError} from './_private/WorkboxError.mjs';\nimport './_version.mjs';\n\n\n/**\n * Modifies the default cache names used by the Workbox packages.\n * Cache names are generated as `<prefix>-<Cache Name>-<suffix>`.\n *\n * @param {Object} details\n * @param {Object} [details.prefix] The string to add to the beginning of\n *     the precache and runtime cache names.\n * @param {Object} [details.suffix] The string to add to the end of\n *     the precache and runtime cache names.\n * @param {Object} [details.precache] The cache name to use for precache\n *     caching.\n * @param {Object} [details.runtime] The cache name to use for runtime caching.\n * @param {Object} [details.googleAnalytics] The cache name to use for\n *     `workbox-google-analytics` caching.\n *\n * @alias workbox.core.setCacheNameDetails\n */\nexport const setCacheNameDetails = (details) => {\n  if (process.env.NODE_ENV !== 'production') {\n    Object.keys(details).forEach((key) => {\n      assert.isType(details[key], 'string', {\n        moduleName: 'workbox-core',\n        funcName: 'setCacheNameDetails',\n        paramName: `details.${key}`,\n      });\n    });\n\n    if ('precache' in details && details.precache.length === 0) {\n      throw new WorkboxError('invalid-cache-name', {\n        cacheNameId: 'precache',\n        value: details.precache,\n      });\n    }\n\n    if ('runtime' in details && details.runtime.length === 0) {\n      throw new WorkboxError('invalid-cache-name', {\n        cacheNameId: 'runtime',\n        value: details.runtime,\n      });\n    }\n\n    if ('googleAnalytics' in details && details.googleAnalytics.length === 0) {\n      throw new WorkboxError('invalid-cache-name', {\n        cacheNameId: 'googleAnalytics',\n        value: details.googleAnalytics,\n      });\n    }\n  }\n\n  cacheNames.updateDetails(details);\n};\n","/*\n  Copyright 2019 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport './_version.mjs';\n\n\n/**\n * Force a service worker to become active, instead of waiting. This is\n * normally used in conjunction with `clientsClaim()`.\n *\n * @alias workbox.core.skipWaiting\n */\nexport const skipWaiting = () => {\n  // We need to explicitly call `self.skipWaiting()` here because we're\n  // shadowing `skipWaiting` with this local function.\n  addEventListener('install', () => self.skipWaiting());\n};\n"],"names":["self","_","e","messageGenerator","code","args","msg","length","JSON","stringify","WorkboxError","Error","constructor","errorCode","details","name","quotaErrorCallbacks","Set","_cacheNameDetails","googleAnalytics","precache","prefix","runtime","suffix","registration","scope","_createCacheName","cacheName","filter","value","join","cacheNames","updateDetails","Object","keys","forEach","key","getGoogleAnalyticsName","userCacheName","getPrecacheName","getPrefix","getRuntimeName","getSuffix","getFriendlyURL","url","urlObj","URL","location","origin","pathname","href","async","executeQuotaErrorCallbacks","callback","pluginEvents","pluginUtils","plugins","callbackName","plugin","matchWrapper","request","event","matchOptions","cache","caches","open","effectiveRequest","_getEffectiveRequest","mode","cachedResponse","match","call","_isResponseSafeToCache","response","responseToCache","pluginsUsed","status","cacheKeyWillBeUsedPlugins","Request","cacheWrapper","put","updatePlugins","oldResponse","error","newResponse","DBWrapper","version","onupgradeneeded","onversionchange","this","_onversionchange","_name","_version","_onupgradeneeded","_db","Promise","resolve","reject","openRequestTimedOut","setTimeout","OPEN_TIMEOUT","openRequest","indexedDB","onerror","evt","transaction","abort","target","result","close","onsuccess","db","bind","storeName","query","getAllKeys","count","getAllMatching","includeKeys","map","index","direction","txn","done","store","objectStore","results","openCursor","cursor","primaryKey","push","continue","storeNames","type","onabort","oncomplete","method","prototype","methodsToWrap","methods","entries","IDBObjectStore","_call","fetchWrapper","fetch","fetchOptions","preloadResponse","possiblePreloadResponse","failedFetchPlugins","originalRequest","clone","err","thrownError","pluginFilteredRequest","fetchResponse","process","promise","deleteDatabase","onblocked","_cacheNames","workbox","v","errer","addEventListener","clients","claim","add","skipWaiting"],"mappings":"yEAAA,IAAIA,KAAK,uBAAuBC,IAAI,MAAMC,ICU1C,MCkBaC,EAjBI,CAACC,KAASC,SACrBC,EAAMF,SACNC,EAAKE,OAAS,IAChBD,UAAcE,KAAKC,UAAUJ,MAExBC,GCIT,MAAMI,UAAqBC,MASzBC,YAAYC,EAAWC,SACPX,EAAiBU,EAAWC,SAIrCC,KAAOF,OACPC,QAAUA,GCuDnB,MC9EME,EAAsB,IAAIC,ICDhC,MAAMC,EAAoB,CACxBC,gBAAiB,kBACjBC,SAAU,cACVC,OAAQ,UACRC,QAAS,UACTC,OAAQvB,KAAKwB,aAAaC,OAGtBC,EAAoBC,GACjB,CAACT,EAAkBG,OAAQM,EAAWT,EAAkBK,QAC1DK,OAAQC,GAAUA,EAAMtB,OAAS,GACjCuB,KAAK,KAGCC,EAAa,CACxBC,cAAgBlB,IACdmB,OAAOC,KAAKhB,GAAmBiB,QAASC,SACV,IAAjBtB,EAAQsB,KACjBlB,EAAkBkB,GAAOtB,EAAQsB,OAIvCC,uBAAyBC,GAChBA,GAAiBZ,EAAiBR,EAAkBC,iBAE7DoB,gBAAkBD,GACTA,GAAiBZ,EAAiBR,EAAkBE,UAE7DoB,UAAW,IACFtB,EAAkBG,OAE3BoB,eAAiBH,GACRA,GAAiBZ,EAAiBR,EAAkBI,SAE7DoB,UAAW,IACFxB,EAAkBK,QCpCvBoB,EAAkBC,UAChBC,EAAS,IAAIC,IAAIF,EAAKG,iBACxBF,EAAOG,SAAWD,SAASC,OACtBH,EAAOI,SAETJ,EAAOK,MCKhBC,eAAeC,QAMR,MAAMC,KAAYrC,QACfqC,IChBH,MAAMC,EACO,iBADPA,EAEa,qBAFbA,EAGQ,kBAHRA,EAImB,2BAJnBA,EAKK,eALLA,EAMQ,kBANRA,EAOS,mBCRTC,EACH,CAACC,EAASC,IACTD,EAAQ5B,OAAQ8B,GAAWD,KAAgBC,GCuHhDC,EAAeR,OACnBxB,UAAAA,EACAiC,QAAAA,EACAC,MAAAA,EACAC,aAAAA,EACAN,QAAAA,EAAU,aAEJO,QAAcC,OAAOC,KAAKtC,GAE1BuC,QAAyBC,EAAqB,CAClDX,QAAAA,EAASI,QAAAA,EAASQ,KAAM,aAEtBC,QAAuBN,EAAMO,MAAMJ,EAAkBJ,OASpD,MAAMJ,KAAUF,EACfF,KAA6CI,IAC/CW,QAAuBX,EAAOJ,GACzBiB,KAAKb,EAAQ,CACZ/B,UAAAA,EACAkC,MAAAA,EACAC,aAAAA,EACAO,eAAAA,EACAT,QAASM,YAcZG,GAiBHG,EAAyBrB,OAAQS,QAAAA,EAASa,SAAAA,EAAUZ,MAAAA,EAAOL,QAAAA,UAC3DkB,EAAkBD,EAClBE,GAAc,MACb,IAAIjB,KAAUF,KACbF,KAAkCI,IACpCiB,GAAc,IACdD,QAAwBhB,EAAOJ,GAC1BiB,KAAKb,EAAQ,CACZE,QAAAA,EACAa,SAAUC,EACVb,MAAAA,mBAmBLc,IAcHD,EAA6C,MAA3BA,EAAgBE,OAAiBF,EAAkB,MAGhEA,GAAoC,MAkBvCP,EAAuBhB,OAAQS,QAAAA,EAASQ,KAAAA,EAAMZ,QAAAA,YAC5CqB,EAA4BtB,EAC9BC,EAASF,OAETY,EAAmBN,MAClB,MAAMF,KAAUmB,EAIa,iBAHhCX,QAAyBR,EAAOJ,GAAqCiB,KACjEb,EAAQ,CAACU,KAAAA,EAAMR,QAASM,OAG1BA,EAAmB,IAAIY,QAAQZ,WAY5BA,GAGIa,EAAe,CAC1BC,IAtPiB7B,OACjBxB,UAAAA,EACAiC,QAAAA,EACAa,SAAAA,EACAZ,MAAAA,EACAL,QAAAA,EAAU,GACVM,aAAAA,GACE,YAUII,QAAyBC,EAAqB,CAClDX,QAAAA,EAASI,QAAAA,EAASQ,KAAM,cAErBK,QAMG,IAAI/D,EAAa,6BAA8B,CACnDkC,IAAKD,EAAeuB,EAAiBtB,WAIrC8B,QAAwBF,EAAuB,CACjDX,MAAAA,EACAL,QAAAA,EACAiB,SAAAA,EACAb,QAASM,QAGNQ,eAQCX,QAAcC,OAAOC,KAAKtC,GAE1BsD,EAAgB1B,EAClBC,EAASF,OAET4B,EAAcD,EAAc1E,OAAS,QAC/BoD,EAAa,CAAChC,UAAAA,EAAWmC,aAAAA,EAAcF,QAASM,IACtD,eAQIH,EAAMiB,IAAId,EAAkBQ,GAClC,MAAOS,QAEY,uBAAfA,EAAMpE,YACFqC,IAEF+B,MAGH,IAAIzB,KAAUuB,QACXvB,EAAOJ,GAA+BiB,KAAKb,EAAQ,CACvD/B,UAAAA,EACAkC,MAAAA,EACAqB,YAAAA,EACAE,YAAaV,EACbd,QAASM,KA2KbI,MAAOX,GCxQF,MAAM0B,EAUXzE,YAAYG,EAAMuE,GAASC,gBACzBA,EADyBC,gBAEzBA,EAAkBC,KAAKC,GACrB,SACGC,EAAQ5E,OACR6E,EAAWN,OACXO,EAAmBN,OACnBG,EAAmBF,OAGnBM,EAAM,qBASJL,KAAKK,mBAWRL,KAAKK,cAEJA,QAAY,IAAIC,QAAQ,CAACC,EAASC,SAMjCC,GAAsB,EAC1BC,WAAW,KACTD,GAAsB,EACtBD,EAAO,IAAItF,MAAM,gDAChB8E,KAAKW,oBAEFC,EAAcC,UAAUrC,KAAKwB,KAAKE,EAAOF,KAAKG,GACpDS,EAAYE,QAAU,KAAMN,EAAOI,EAAYlB,QAC/CkB,EAAYd,gBAAmBiB,CAAAA,IACzBN,GACFG,EAAYI,YAAYC,QACxBF,EAAIG,OAAOC,OAAOC,SACTpB,KAAKI,QACTA,EAAiBW,KAG1BH,EAAYS,UAAY,GAAEH,OAAAA,YAClBI,EAAKJ,EAAOC,OACdV,EACFa,EAAGF,SAEHE,EAAGvB,gBAAkBC,KAAKC,EAAiBsB,KAAKvB,MAChDO,EAAQe,QAKPtB,kBAYIwB,EAAWC,gBACRzB,KAAK0B,WAAWF,EAAWC,EAAO,IAAI,gBAazCD,EAAWC,EAAOE,gBAChB3B,KAAK4B,eAAeJ,EAAW,CAACC,MAAAA,EAAOE,MAAAA,qBAcrCH,EAAWC,EAAOE,gBACnB3B,KAAK4B,eACfJ,EAAW,CAACC,MAAAA,EAAOE,MAAAA,EAAOE,aAAa,KAAQC,IAAI,EAAEnF,IAAAA,KAASA,wBAoB/C6E,GAAWO,MAC9BA,EAD8BN,MAE9BA,EAAQ,KAFsBO,UAG9BA,EAAY,OAHkBL,MAI9BA,EAJ8BE,YAK9BA,GACE,iBACW7B,KAAKgB,YAAY,CAACQ,GAAY,WAAY,CAACS,EAAKC,WACrDC,EAAQF,EAAIG,YAAYZ,GACxBN,EAASa,EAAQI,EAAMJ,MAAMA,GAASI,EACtCE,EAAU,GAEhBnB,EAAOoB,WAAWb,EAAOO,GAAWX,UAAY,GAAEH,OAAAA,YAC1CqB,EAASrB,EAAOC,UAClBoB,EAAQ,OACJC,WAACA,EAAD7F,IAAaA,EAAbP,MAAkBA,GAASmG,EACjCF,EAAQI,KAAKZ,EAAc,CAACW,WAAAA,EAAY7F,IAAAA,EAAKP,MAAAA,GAASA,GAClDuF,GAASU,EAAQvH,QAAU6G,EAC7BO,EAAKG,GAELE,EAAOG,gBAGTR,EAAKG,yBAuBKM,EAAYC,EAAMhF,gBAC5BoC,KAAKxB,aACE,IAAI8B,QAAQ,CAACC,EAASC,WAC3ByB,EAAMjC,KAAKK,EAAIW,YAAY2B,EAAYC,GAC7CX,EAAIY,QAAU,GAAE3B,OAAAA,KAAYV,EAAOU,EAAOxB,QAC1CuC,EAAIa,WAAa,KAAMvC,KAEvB3C,EAASqE,EAAM7F,GAAUmE,EAAQnE,cAczB2G,EAAQvB,EAAWoB,KAAShI,gBAOzBoF,KAAKgB,YAAY,CAACQ,GAAYoB,EAN1B,CAACX,EAAKC,KACrBD,EAAIG,YAAYZ,GAAWuB,MAAWnI,GAAMyG,UAAY,GAAEH,OAAAA,MACxDgB,EAAKhB,EAAOC,YAalBlB,SACOmB,QAgBPA,QACMpB,KAAKK,SACFA,EAAIe,aACJf,EAAM,OAOjBT,EAAUoD,UAAUrC,aAAe,IAGnC,MAAMsC,EAAgB,UACR,CAAC,MAAO,QAAS,SAAU,SAAU,wBACpC,CAAC,MAAO,MAAO,QAAS,WAEvC,IAAK,MAAOtE,EAAMuE,KAAY1G,OAAO2G,QAAQF,OACtC,MAAMF,KAAUG,EACfH,KAAUK,eAAeJ,YAE3BpD,EAAUoD,UAAUD,GAAUrF,eAAe8D,KAAc5G,gBAC5CoF,KAAKqD,EAAMN,EAAQvB,EAAW7C,KAAS/D,KClQrD,MC4ID0I,EAAe,CACnBC,MAlImB7F,OACnBS,QAAAA,EACAqF,aAAAA,EACApF,MAAAA,EACAL,QAAAA,EAAU,UAINK,GAASA,EAAMqF,gBAAiB,OAC5BC,QAAgCtF,EAAMqF,mBACxCC,SAKKA,EAIY,iBAAZvF,IACTA,EAAU,IAAIkB,QAAQlB,UAalBwF,EAAqB7F,EACvBC,EAASF,GAKP+F,EAAkBD,EAAmB7I,OAAS,EAClDqD,EAAQ0F,QAAU,aAGb,IAAI5F,KAAUF,EACbF,KAAmCI,IACrCE,QAAgBF,EAAOJ,GAAiCiB,KAAKb,EAAQ,CACnEE,QAASA,EAAQ0F,QACjBzF,MAAAA,KAcN,MAAO0F,SACD,IAAI7I,EAAa,kCAAmC,CACxD8I,YAAaD,QAObE,EAAwB7F,EAAQ0F,gBAG9BI,EAIFA,EADmB,aAAjB9F,EAAQQ,WACY4E,MAAMpF,SAENoF,MAAMpF,EAASqF,OASlC,MAAMvF,KAAUF,EACfF,KAAkCI,IACpCgG,QAAsBhG,EAAOJ,GACxBiB,KAAKb,EAAQ,CACZG,MAAAA,EACAD,QAAS6F,EACThF,SAAUiF,YAebA,EACP,MAAOvE,OAMF,MAAMzB,KAAU0F,QACb1F,EAAOJ,GAA6BiB,KAAKb,EAAQ,CACrDyB,MAAAA,EACAtB,MAAAA,EACAwF,gBAAiBA,EAAgBC,QACjC1F,QAAS6F,EAAsBH,gBAI7BnE,iCVlEiBwE,sDWvEpB,MAIL/I,mBACOgJ,QAAU,IAAI7D,QAAQ,CAACC,EAASC,UAC9BD,QAAUA,OACVC,OAASA,qBFNU9C,MAAAA,UACtB,IAAI4C,QAAQ,CAACC,EAASC,WACpBrC,EAAU0C,UAAUuD,eAAe9I,GACzC6C,EAAQ2C,QAAU,GAAEI,OAAAA,MAClBV,EAAOU,EAAOxB,SAEhBvB,EAAQkG,UAAY,MAClB7D,EAAO,IAAItF,MAAM,qBAEnBiD,EAAQkD,UAAY,MAClBd,6EZpBS2D,4BeiBF5H,EAAa,8BAEfgI,EAAY1H,gDAGZ0H,EAAYxH,uCAGZwH,EAAYvH,kCAGZuH,EAAYtH,sCAGZsH,EAAYrH,cCvBvB,IACE1C,KAAKgK,QAAQC,EAAIjK,KAAKgK,QAAQC,GAAK,GACnC,MAAOC,uCCHmB,MAC1BC,iBAAiB,WAAY,IAAMC,QAAQC,uDCG7C,SAAoChH,GASlCrC,EAAoBsJ,IAAIjH,0BCCUvC,CAAAA,IAgClCiB,EAAWC,cAAclB,mBC9CA,MAGzBqJ,iBAAiB,UAAW,IAAMnK,KAAKuK"}
\ No newline at end of file
diff --git a/public/javascripts/workbox/workbox-expiration.dev.js b/public/javascripts/workbox/workbox-expiration.dev.js
deleted file mode 100644
index cbd068b4f09..00000000000
--- a/public/javascripts/workbox/workbox-expiration.dev.js
+++ /dev/null
@@ -1,652 +0,0 @@
-this.workbox = this.workbox || {};
-this.workbox.expiration = (function (exports, DBWrapper_mjs, deleteDatabase_mjs, WorkboxError_mjs, assert_mjs, logger_mjs, cacheNames_mjs, getFriendlyURL_mjs, registerQuotaErrorCallback_mjs) {
-  'use strict';
-
-  try {
-    self['workbox:expiration:4.3.1'] && _();
-  } catch (e) {} // eslint-disable-line
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  const DB_NAME = 'workbox-expiration';
-  const OBJECT_STORE_NAME = 'cache-entries';
-
-  const normalizeURL = unNormalizedUrl => {
-    const url = new URL(unNormalizedUrl, location);
-    url.hash = '';
-    return url.href;
-  };
-  /**
-   * Returns the timestamp model.
-   *
-   * @private
-   */
-
-
-  class CacheTimestampsModel {
-    /**
-     *
-     * @param {string} cacheName
-     *
-     * @private
-     */
-    constructor(cacheName) {
-      this._cacheName = cacheName;
-      this._db = new DBWrapper_mjs.DBWrapper(DB_NAME, 1, {
-        onupgradeneeded: event => this._handleUpgrade(event)
-      });
-    }
-    /**
-     * Should perform an upgrade of indexedDB.
-     *
-     * @param {Event} event
-     *
-     * @private
-     */
-
-
-    _handleUpgrade(event) {
-      const db = event.target.result; // TODO(philipwalton): EdgeHTML doesn't support arrays as a keyPath, so we
-      // have to use the `id` keyPath here and create our own values (a
-      // concatenation of `url + cacheName`) instead of simply using
-      // `keyPath: ['url', 'cacheName']`, which is supported in other browsers.
-
-      const objStore = db.createObjectStore(OBJECT_STORE_NAME, {
-        keyPath: 'id'
-      }); // TODO(philipwalton): once we don't have to support EdgeHTML, we can
-      // create a single index with the keyPath `['cacheName', 'timestamp']`
-      // instead of doing both these indexes.
-
-      objStore.createIndex('cacheName', 'cacheName', {
-        unique: false
-      });
-      objStore.createIndex('timestamp', 'timestamp', {
-        unique: false
-      }); // Previous versions of `workbox-expiration` used `this._cacheName`
-      // as the IDBDatabase name.
-
-      deleteDatabase_mjs.deleteDatabase(this._cacheName);
-    }
-    /**
-     * @param {string} url
-     * @param {number} timestamp
-     *
-     * @private
-     */
-
-
-    async setTimestamp(url, timestamp) {
-      url = normalizeURL(url);
-      await this._db.put(OBJECT_STORE_NAME, {
-        url,
-        timestamp,
-        cacheName: this._cacheName,
-        // Creating an ID from the URL and cache name won't be necessary once
-        // Edge switches to Chromium and all browsers we support work with
-        // array keyPaths.
-        id: this._getId(url)
-      });
-    }
-    /**
-     * Returns the timestamp stored for a given URL.
-     *
-     * @param {string} url
-     * @return {number}
-     *
-     * @private
-     */
-
-
-    async getTimestamp(url) {
-      const entry = await this._db.get(OBJECT_STORE_NAME, this._getId(url));
-      return entry.timestamp;
-    }
-    /**
-     * Iterates through all the entries in the object store (from newest to
-     * oldest) and removes entries once either `maxCount` is reached or the
-     * entry's timestamp is less than `minTimestamp`.
-     *
-     * @param {number} minTimestamp
-     * @param {number} maxCount
-     *
-     * @private
-     */
-
-
-    async expireEntries(minTimestamp, maxCount) {
-      const entriesToDelete = await this._db.transaction(OBJECT_STORE_NAME, 'readwrite', (txn, done) => {
-        const store = txn.objectStore(OBJECT_STORE_NAME);
-        const entriesToDelete = [];
-        let entriesNotDeletedCount = 0;
-
-        store.index('timestamp').openCursor(null, 'prev').onsuccess = ({
-          target
-        }) => {
-          const cursor = target.result;
-
-          if (cursor) {
-            const result = cursor.value; // TODO(philipwalton): once we can use a multi-key index, we
-            // won't have to check `cacheName` here.
-
-            if (result.cacheName === this._cacheName) {
-              // Delete an entry if it's older than the max age or
-              // if we already have the max number allowed.
-              if (minTimestamp && result.timestamp < minTimestamp || maxCount && entriesNotDeletedCount >= maxCount) {
-                // TODO(philipwalton): we should be able to delete the
-                // entry right here, but doing so causes an iteration
-                // bug in Safari stable (fixed in TP). Instead we can
-                // store the keys of the entries to delete, and then
-                // delete the separate transactions.
-                // https://github.com/GoogleChrome/workbox/issues/1978
-                // cursor.delete();
-                // We only need to return the URL, not the whole entry.
-                entriesToDelete.push(cursor.value);
-              } else {
-                entriesNotDeletedCount++;
-              }
-            }
-
-            cursor.continue();
-          } else {
-            done(entriesToDelete);
-          }
-        };
-      }); // TODO(philipwalton): once the Safari bug in the following issue is fixed,
-      // we should be able to remove this loop and do the entry deletion in the
-      // cursor loop above:
-      // https://github.com/GoogleChrome/workbox/issues/1978
-
-      const urlsDeleted = [];
-
-      for (const entry of entriesToDelete) {
-        await this._db.delete(OBJECT_STORE_NAME, entry.id);
-        urlsDeleted.push(entry.url);
-      }
-
-      return urlsDeleted;
-    }
-    /**
-     * Takes a URL and returns an ID that will be unique in the object store.
-     *
-     * @param {string} url
-     * @return {string}
-     *
-     * @private
-     */
-
-
-    _getId(url) {
-      // Creating an ID from the URL and cache name won't be necessary once
-      // Edge switches to Chromium and all browsers we support work with
-      // array keyPaths.
-      return this._cacheName + '|' + normalizeURL(url);
-    }
-
-  }
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  /**
-   * The `CacheExpiration` class allows you define an expiration and / or
-   * limit on the number of responses stored in a
-   * [`Cache`](https://developer.mozilla.org/en-US/docs/Web/API/Cache).
-   *
-   * @memberof workbox.expiration
-   */
-
-  class CacheExpiration {
-    /**
-     * To construct a new CacheExpiration instance you must provide at least
-     * one of the `config` properties.
-     *
-     * @param {string} cacheName Name of the cache to apply restrictions to.
-     * @param {Object} config
-     * @param {number} [config.maxEntries] The maximum number of entries to cache.
-     * Entries used the least will be removed as the maximum is reached.
-     * @param {number} [config.maxAgeSeconds] The maximum age of an entry before
-     * it's treated as stale and removed.
-     */
-    constructor(cacheName, config = {}) {
-      {
-        assert_mjs.assert.isType(cacheName, 'string', {
-          moduleName: 'workbox-expiration',
-          className: 'CacheExpiration',
-          funcName: 'constructor',
-          paramName: 'cacheName'
-        });
-
-        if (!(config.maxEntries || config.maxAgeSeconds)) {
-          throw new WorkboxError_mjs.WorkboxError('max-entries-or-age-required', {
-            moduleName: 'workbox-expiration',
-            className: 'CacheExpiration',
-            funcName: 'constructor'
-          });
-        }
-
-        if (config.maxEntries) {
-          assert_mjs.assert.isType(config.maxEntries, 'number', {
-            moduleName: 'workbox-expiration',
-            className: 'CacheExpiration',
-            funcName: 'constructor',
-            paramName: 'config.maxEntries'
-          }); // TODO: Assert is positive
-        }
-
-        if (config.maxAgeSeconds) {
-          assert_mjs.assert.isType(config.maxAgeSeconds, 'number', {
-            moduleName: 'workbox-expiration',
-            className: 'CacheExpiration',
-            funcName: 'constructor',
-            paramName: 'config.maxAgeSeconds'
-          }); // TODO: Assert is positive
-        }
-      }
-
-      this._isRunning = false;
-      this._rerunRequested = false;
-      this._maxEntries = config.maxEntries;
-      this._maxAgeSeconds = config.maxAgeSeconds;
-      this._cacheName = cacheName;
-      this._timestampModel = new CacheTimestampsModel(cacheName);
-    }
-    /**
-     * Expires entries for the given cache and given criteria.
-     */
-
-
-    async expireEntries() {
-      if (this._isRunning) {
-        this._rerunRequested = true;
-        return;
-      }
-
-      this._isRunning = true;
-      const minTimestamp = this._maxAgeSeconds ? Date.now() - this._maxAgeSeconds * 1000 : undefined;
-      const urlsExpired = await this._timestampModel.expireEntries(minTimestamp, this._maxEntries); // Delete URLs from the cache
-
-      const cache = await caches.open(this._cacheName);
-
-      for (const url of urlsExpired) {
-        await cache.delete(url);
-      }
-
-      {
-        if (urlsExpired.length > 0) {
-          logger_mjs.logger.groupCollapsed(`Expired ${urlsExpired.length} ` + `${urlsExpired.length === 1 ? 'entry' : 'entries'} and removed ` + `${urlsExpired.length === 1 ? 'it' : 'them'} from the ` + `'${this._cacheName}' cache.`);
-          logger_mjs.logger.log(`Expired the following ${urlsExpired.length === 1 ? 'URL' : 'URLs'}:`);
-          urlsExpired.forEach(url => logger_mjs.logger.log(`    ${url}`));
-          logger_mjs.logger.groupEnd();
-        } else {
-          logger_mjs.logger.debug(`Cache expiration ran and found no entries to remove.`);
-        }
-      }
-
-      this._isRunning = false;
-
-      if (this._rerunRequested) {
-        this._rerunRequested = false;
-        this.expireEntries();
-      }
-    }
-    /**
-     * Update the timestamp for the given URL. This ensures the when
-     * removing entries based on maximum entries, most recently used
-     * is accurate or when expiring, the timestamp is up-to-date.
-     *
-     * @param {string} url
-     */
-
-
-    async updateTimestamp(url) {
-      {
-        assert_mjs.assert.isType(url, 'string', {
-          moduleName: 'workbox-expiration',
-          className: 'CacheExpiration',
-          funcName: 'updateTimestamp',
-          paramName: 'url'
-        });
-      }
-
-      await this._timestampModel.setTimestamp(url, Date.now());
-    }
-    /**
-     * Can be used to check if a URL has expired or not before it's used.
-     *
-     * This requires a look up from IndexedDB, so can be slow.
-     *
-     * Note: This method will not remove the cached entry, call
-     * `expireEntries()` to remove indexedDB and Cache entries.
-     *
-     * @param {string} url
-     * @return {boolean}
-     */
-
-
-    async isURLExpired(url) {
-      {
-        if (!this._maxAgeSeconds) {
-          throw new WorkboxError_mjs.WorkboxError(`expired-test-without-max-age`, {
-            methodName: 'isURLExpired',
-            paramName: 'maxAgeSeconds'
-          });
-        }
-      }
-
-      const timestamp = await this._timestampModel.getTimestamp(url);
-      const expireOlderThan = Date.now() - this._maxAgeSeconds * 1000;
-      return timestamp < expireOlderThan;
-    }
-    /**
-     * Removes the IndexedDB object store used to keep track of cache expiration
-     * metadata.
-     */
-
-
-    async delete() {
-      // Make sure we don't attempt another rerun if we're called in the middle of
-      // a cache expiration.
-      this._rerunRequested = false;
-      await this._timestampModel.expireEntries(Infinity); // Expires all.
-    }
-
-  }
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  /**
-   * This plugin can be used in the Workbox APIs to regularly enforce a
-   * limit on the age and / or the number of cached requests.
-   *
-   * Whenever a cached request is used or updated, this plugin will look
-   * at the used Cache and remove any old or extra requests.
-   *
-   * When using `maxAgeSeconds`, requests may be used *once* after expiring
-   * because the expiration clean up will not have occurred until *after* the
-   * cached request has been used. If the request has a "Date" header, then
-   * a light weight expiration check is performed and the request will not be
-   * used immediately.
-   *
-   * When using `maxEntries`, the entry least-recently requested will be removed from the cache first.
-   *
-   * @memberof workbox.expiration
-   */
-
-  class Plugin {
-    /**
-     * @param {Object} config
-     * @param {number} [config.maxEntries] The maximum number of entries to cache.
-     * Entries used the least will be removed as the maximum is reached.
-     * @param {number} [config.maxAgeSeconds] The maximum age of an entry before
-     * it's treated as stale and removed.
-     * @param {boolean} [config.purgeOnQuotaError] Whether to opt this cache in to
-     * automatic deletion if the available storage quota has been exceeded.
-     */
-    constructor(config = {}) {
-      {
-        if (!(config.maxEntries || config.maxAgeSeconds)) {
-          throw new WorkboxError_mjs.WorkboxError('max-entries-or-age-required', {
-            moduleName: 'workbox-expiration',
-            className: 'Plugin',
-            funcName: 'constructor'
-          });
-        }
-
-        if (config.maxEntries) {
-          assert_mjs.assert.isType(config.maxEntries, 'number', {
-            moduleName: 'workbox-expiration',
-            className: 'Plugin',
-            funcName: 'constructor',
-            paramName: 'config.maxEntries'
-          });
-        }
-
-        if (config.maxAgeSeconds) {
-          assert_mjs.assert.isType(config.maxAgeSeconds, 'number', {
-            moduleName: 'workbox-expiration',
-            className: 'Plugin',
-            funcName: 'constructor',
-            paramName: 'config.maxAgeSeconds'
-          });
-        }
-      }
-
-      this._config = config;
-      this._maxAgeSeconds = config.maxAgeSeconds;
-      this._cacheExpirations = new Map();
-
-      if (config.purgeOnQuotaError) {
-        registerQuotaErrorCallback_mjs.registerQuotaErrorCallback(() => this.deleteCacheAndMetadata());
-      }
-    }
-    /**
-     * A simple helper method to return a CacheExpiration instance for a given
-     * cache name.
-     *
-     * @param {string} cacheName
-     * @return {CacheExpiration}
-     *
-     * @private
-     */
-
-
-    _getCacheExpiration(cacheName) {
-      if (cacheName === cacheNames_mjs.cacheNames.getRuntimeName()) {
-        throw new WorkboxError_mjs.WorkboxError('expire-custom-caches-only');
-      }
-
-      let cacheExpiration = this._cacheExpirations.get(cacheName);
-
-      if (!cacheExpiration) {
-        cacheExpiration = new CacheExpiration(cacheName, this._config);
-
-        this._cacheExpirations.set(cacheName, cacheExpiration);
-      }
-
-      return cacheExpiration;
-    }
-    /**
-     * A "lifecycle" callback that will be triggered automatically by the
-     * `workbox.strategies` handlers when a `Response` is about to be returned
-     * from a [Cache](https://developer.mozilla.org/en-US/docs/Web/API/Cache) to
-     * the handler. It allows the `Response` to be inspected for freshness and
-     * prevents it from being used if the `Response`'s `Date` header value is
-     * older than the configured `maxAgeSeconds`.
-     *
-     * @param {Object} options
-     * @param {string} options.cacheName Name of the cache the response is in.
-     * @param {Response} options.cachedResponse The `Response` object that's been
-     *     read from a cache and whose freshness should be checked.
-     * @return {Response} Either the `cachedResponse`, if it's
-     *     fresh, or `null` if the `Response` is older than `maxAgeSeconds`.
-     *
-     * @private
-     */
-
-
-    cachedResponseWillBeUsed({
-      event,
-      request,
-      cacheName,
-      cachedResponse
-    }) {
-      if (!cachedResponse) {
-        return null;
-      }
-
-      let isFresh = this._isResponseDateFresh(cachedResponse); // Expire entries to ensure that even if the expiration date has
-      // expired, it'll only be used once.
-
-
-      const cacheExpiration = this._getCacheExpiration(cacheName);
-
-      cacheExpiration.expireEntries(); // Update the metadata for the request URL to the current timestamp,
-      // but don't `await` it as we don't want to block the response.
-
-      const updateTimestampDone = cacheExpiration.updateTimestamp(request.url);
-
-      if (event) {
-        try {
-          event.waitUntil(updateTimestampDone);
-        } catch (error) {
-          {
-            logger_mjs.logger.warn(`Unable to ensure service worker stays alive when ` + `updating cache entry for '${getFriendlyURL_mjs.getFriendlyURL(event.request.url)}'.`);
-          }
-        }
-      }
-
-      return isFresh ? cachedResponse : null;
-    }
-    /**
-     * @param {Response} cachedResponse
-     * @return {boolean}
-     *
-     * @private
-     */
-
-
-    _isResponseDateFresh(cachedResponse) {
-      if (!this._maxAgeSeconds) {
-        // We aren't expiring by age, so return true, it's fresh
-        return true;
-      } // Check if the 'date' header will suffice a quick expiration check.
-      // See https://github.com/GoogleChromeLabs/sw-toolbox/issues/164 for
-      // discussion.
-
-
-      const dateHeaderTimestamp = this._getDateHeaderTimestamp(cachedResponse);
-
-      if (dateHeaderTimestamp === null) {
-        // Unable to parse date, so assume it's fresh.
-        return true;
-      } // If we have a valid headerTime, then our response is fresh iff the
-      // headerTime plus maxAgeSeconds is greater than the current time.
-
-
-      const now = Date.now();
-      return dateHeaderTimestamp >= now - this._maxAgeSeconds * 1000;
-    }
-    /**
-     * This method will extract the data header and parse it into a useful
-     * value.
-     *
-     * @param {Response} cachedResponse
-     * @return {number}
-     *
-     * @private
-     */
-
-
-    _getDateHeaderTimestamp(cachedResponse) {
-      if (!cachedResponse.headers.has('date')) {
-        return null;
-      }
-
-      const dateHeader = cachedResponse.headers.get('date');
-      const parsedDate = new Date(dateHeader);
-      const headerTime = parsedDate.getTime(); // If the Date header was invalid for some reason, parsedDate.getTime()
-      // will return NaN.
-
-      if (isNaN(headerTime)) {
-        return null;
-      }
-
-      return headerTime;
-    }
-    /**
-     * A "lifecycle" callback that will be triggered automatically by the
-     * `workbox.strategies` handlers when an entry is added to a cache.
-     *
-     * @param {Object} options
-     * @param {string} options.cacheName Name of the cache that was updated.
-     * @param {string} options.request The Request for the cached entry.
-     *
-     * @private
-     */
-
-
-    async cacheDidUpdate({
-      cacheName,
-      request
-    }) {
-      {
-        assert_mjs.assert.isType(cacheName, 'string', {
-          moduleName: 'workbox-expiration',
-          className: 'Plugin',
-          funcName: 'cacheDidUpdate',
-          paramName: 'cacheName'
-        });
-        assert_mjs.assert.isInstance(request, Request, {
-          moduleName: 'workbox-expiration',
-          className: 'Plugin',
-          funcName: 'cacheDidUpdate',
-          paramName: 'request'
-        });
-      }
-
-      const cacheExpiration = this._getCacheExpiration(cacheName);
-
-      await cacheExpiration.updateTimestamp(request.url);
-      await cacheExpiration.expireEntries();
-    }
-    /**
-     * This is a helper method that performs two operations:
-     *
-     * - Deletes *all* the underlying Cache instances associated with this plugin
-     * instance, by calling caches.delete() on your behalf.
-     * - Deletes the metadata from IndexedDB used to keep track of expiration
-     * details for each Cache instance.
-     *
-     * When using cache expiration, calling this method is preferable to calling
-     * `caches.delete()` directly, since this will ensure that the IndexedDB
-     * metadata is also cleanly removed and open IndexedDB instances are deleted.
-     *
-     * Note that if you're *not* using cache expiration for a given cache, calling
-     * `caches.delete()` and passing in the cache's name should be sufficient.
-     * There is no Workbox-specific method needed for cleanup in that case.
-     */
-
-
-    async deleteCacheAndMetadata() {
-      // Do this one at a time instead of all at once via `Promise.all()` to
-      // reduce the chance of inconsistency if a promise rejects.
-      for (const [cacheName, cacheExpiration] of this._cacheExpirations) {
-        await caches.delete(cacheName);
-        await cacheExpiration.delete();
-      } // Reset this._cacheExpirations to its initial state.
-
-
-      this._cacheExpirations = new Map();
-    }
-
-  }
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-
-  exports.CacheExpiration = CacheExpiration;
-  exports.Plugin = Plugin;
-
-  return exports;
-
-}({}, workbox.core._private, workbox.core._private, workbox.core._private, workbox.core._private, workbox.core._private, workbox.core._private, workbox.core._private, workbox.core));
-//# sourceMappingURL=workbox-expiration.dev.js.map
diff --git a/public/javascripts/workbox/workbox-expiration.dev.js.map b/public/javascripts/workbox/workbox-expiration.dev.js.map
deleted file mode 100644
index d0a03072a07..00000000000
--- a/public/javascripts/workbox/workbox-expiration.dev.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"workbox-expiration.dev.js","sources":["../_version.mjs","../models/CacheTimestampsModel.mjs","../CacheExpiration.mjs","../Plugin.mjs","../index.mjs"],"sourcesContent":["try{self['workbox:expiration:4.3.1']&&_()}catch(e){}// eslint-disable-line","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {DBWrapper} from 'workbox-core/_private/DBWrapper.mjs';\nimport {deleteDatabase} from 'workbox-core/_private/deleteDatabase.mjs';\nimport '../_version.mjs';\n\n\nconst DB_NAME = 'workbox-expiration';\nconst OBJECT_STORE_NAME = 'cache-entries';\n\nconst normalizeURL = (unNormalizedUrl) => {\n  const url = new URL(unNormalizedUrl, location);\n  url.hash = '';\n\n  return url.href;\n};\n\n\n/**\n * Returns the timestamp model.\n *\n * @private\n */\nclass CacheTimestampsModel {\n  /**\n   *\n   * @param {string} cacheName\n   *\n   * @private\n   */\n  constructor(cacheName) {\n    this._cacheName = cacheName;\n\n    this._db = new DBWrapper(DB_NAME, 1, {\n      onupgradeneeded: (event) => this._handleUpgrade(event),\n    });\n  }\n\n  /**\n   * Should perform an upgrade of indexedDB.\n   *\n   * @param {Event} event\n   *\n   * @private\n   */\n  _handleUpgrade(event) {\n    const db = event.target.result;\n\n    // TODO(philipwalton): EdgeHTML doesn't support arrays as a keyPath, so we\n    // have to use the `id` keyPath here and create our own values (a\n    // concatenation of `url + cacheName`) instead of simply using\n    // `keyPath: ['url', 'cacheName']`, which is supported in other browsers.\n    const objStore = db.createObjectStore(OBJECT_STORE_NAME, {keyPath: 'id'});\n\n    // TODO(philipwalton): once we don't have to support EdgeHTML, we can\n    // create a single index with the keyPath `['cacheName', 'timestamp']`\n    // instead of doing both these indexes.\n    objStore.createIndex('cacheName', 'cacheName', {unique: false});\n    objStore.createIndex('timestamp', 'timestamp', {unique: false});\n\n    // Previous versions of `workbox-expiration` used `this._cacheName`\n    // as the IDBDatabase name.\n    deleteDatabase(this._cacheName);\n  }\n\n  /**\n   * @param {string} url\n   * @param {number} timestamp\n   *\n   * @private\n   */\n  async setTimestamp(url, timestamp) {\n    url = normalizeURL(url);\n\n    await this._db.put(OBJECT_STORE_NAME, {\n      url,\n      timestamp,\n      cacheName: this._cacheName,\n      // Creating an ID from the URL and cache name won't be necessary once\n      // Edge switches to Chromium and all browsers we support work with\n      // array keyPaths.\n      id: this._getId(url),\n    });\n  }\n\n  /**\n   * Returns the timestamp stored for a given URL.\n   *\n   * @param {string} url\n   * @return {number}\n   *\n   * @private\n   */\n  async getTimestamp(url) {\n    const entry = await this._db.get(OBJECT_STORE_NAME, this._getId(url));\n    return entry.timestamp;\n  }\n\n  /**\n   * Iterates through all the entries in the object store (from newest to\n   * oldest) and removes entries once either `maxCount` is reached or the\n   * entry's timestamp is less than `minTimestamp`.\n   *\n   * @param {number} minTimestamp\n   * @param {number} maxCount\n   *\n   * @private\n   */\n  async expireEntries(minTimestamp, maxCount) {\n    const entriesToDelete = await this._db.transaction(\n        OBJECT_STORE_NAME, 'readwrite', (txn, done) => {\n          const store = txn.objectStore(OBJECT_STORE_NAME);\n          const entriesToDelete = [];\n          let entriesNotDeletedCount = 0;\n\n          store.index('timestamp')\n              .openCursor(null, 'prev')\n              .onsuccess = ({target}) => {\n                const cursor = target.result;\n                if (cursor) {\n                  const result = cursor.value;\n                  // TODO(philipwalton): once we can use a multi-key index, we\n                  // won't have to check `cacheName` here.\n                  if (result.cacheName === this._cacheName) {\n                    // Delete an entry if it's older than the max age or\n                    // if we already have the max number allowed.\n                    if ((minTimestamp && result.timestamp < minTimestamp) ||\n                        (maxCount && entriesNotDeletedCount >= maxCount)) {\n                      // TODO(philipwalton): we should be able to delete the\n                      // entry right here, but doing so causes an iteration\n                      // bug in Safari stable (fixed in TP). Instead we can\n                      // store the keys of the entries to delete, and then\n                      // delete the separate transactions.\n                      // https://github.com/GoogleChrome/workbox/issues/1978\n                      // cursor.delete();\n\n                      // We only need to return the URL, not the whole entry.\n                      entriesToDelete.push(cursor.value);\n                    } else {\n                      entriesNotDeletedCount++;\n                    }\n                  }\n                  cursor.continue();\n                } else {\n                  done(entriesToDelete);\n                }\n              };\n        });\n\n    // TODO(philipwalton): once the Safari bug in the following issue is fixed,\n    // we should be able to remove this loop and do the entry deletion in the\n    // cursor loop above:\n    // https://github.com/GoogleChrome/workbox/issues/1978\n    const urlsDeleted = [];\n    for (const entry of entriesToDelete) {\n      await this._db.delete(OBJECT_STORE_NAME, entry.id);\n      urlsDeleted.push(entry.url);\n    }\n\n    return urlsDeleted;\n  }\n\n  /**\n   * Takes a URL and returns an ID that will be unique in the object store.\n   *\n   * @param {string} url\n   * @return {string}\n   *\n   * @private\n   */\n  _getId(url) {\n    // Creating an ID from the URL and cache name won't be necessary once\n    // Edge switches to Chromium and all browsers we support work with\n    // array keyPaths.\n    return this._cacheName + '|' + normalizeURL(url);\n  }\n}\n\nexport {CacheTimestampsModel};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {CacheTimestampsModel} from './models/CacheTimestampsModel.mjs';\nimport {WorkboxError} from 'workbox-core/_private/WorkboxError.mjs';\nimport {assert} from 'workbox-core/_private/assert.mjs';\nimport {logger} from 'workbox-core/_private/logger.mjs';\n\nimport './_version.mjs';\n\n/**\n * The `CacheExpiration` class allows you define an expiration and / or\n * limit on the number of responses stored in a\n * [`Cache`](https://developer.mozilla.org/en-US/docs/Web/API/Cache).\n *\n * @memberof workbox.expiration\n */\nclass CacheExpiration {\n  /**\n   * To construct a new CacheExpiration instance you must provide at least\n   * one of the `config` properties.\n   *\n   * @param {string} cacheName Name of the cache to apply restrictions to.\n   * @param {Object} config\n   * @param {number} [config.maxEntries] The maximum number of entries to cache.\n   * Entries used the least will be removed as the maximum is reached.\n   * @param {number} [config.maxAgeSeconds] The maximum age of an entry before\n   * it's treated as stale and removed.\n   */\n  constructor(cacheName, config = {}) {\n    if (process.env.NODE_ENV !== 'production') {\n      assert.isType(cacheName, 'string', {\n        moduleName: 'workbox-expiration',\n        className: 'CacheExpiration',\n        funcName: 'constructor',\n        paramName: 'cacheName',\n      });\n\n      if (!(config.maxEntries || config.maxAgeSeconds)) {\n        throw new WorkboxError('max-entries-or-age-required', {\n          moduleName: 'workbox-expiration',\n          className: 'CacheExpiration',\n          funcName: 'constructor',\n        });\n      }\n\n      if (config.maxEntries) {\n        assert.isType(config.maxEntries, 'number', {\n          moduleName: 'workbox-expiration',\n          className: 'CacheExpiration',\n          funcName: 'constructor',\n          paramName: 'config.maxEntries',\n        });\n\n        // TODO: Assert is positive\n      }\n\n      if (config.maxAgeSeconds) {\n        assert.isType(config.maxAgeSeconds, 'number', {\n          moduleName: 'workbox-expiration',\n          className: 'CacheExpiration',\n          funcName: 'constructor',\n          paramName: 'config.maxAgeSeconds',\n        });\n\n        // TODO: Assert is positive\n      }\n    }\n\n    this._isRunning = false;\n    this._rerunRequested = false;\n    this._maxEntries = config.maxEntries;\n    this._maxAgeSeconds = config.maxAgeSeconds;\n    this._cacheName = cacheName;\n    this._timestampModel = new CacheTimestampsModel(cacheName);\n  }\n\n  /**\n   * Expires entries for the given cache and given criteria.\n   */\n  async expireEntries() {\n    if (this._isRunning) {\n      this._rerunRequested = true;\n      return;\n    }\n    this._isRunning = true;\n\n    const minTimestamp = this._maxAgeSeconds ?\n        Date.now() - (this._maxAgeSeconds * 1000) : undefined;\n\n    const urlsExpired = await this._timestampModel.expireEntries(\n        minTimestamp, this._maxEntries);\n\n    // Delete URLs from the cache\n    const cache = await caches.open(this._cacheName);\n    for (const url of urlsExpired) {\n      await cache.delete(url);\n    }\n\n    if (process.env.NODE_ENV !== 'production') {\n      if (urlsExpired.length > 0) {\n        logger.groupCollapsed(\n            `Expired ${urlsExpired.length} ` +\n          `${urlsExpired.length === 1 ? 'entry' : 'entries'} and removed ` +\n          `${urlsExpired.length === 1 ? 'it' : 'them'} from the ` +\n          `'${this._cacheName}' cache.`);\n        logger.log(`Expired the following ${urlsExpired.length === 1 ?\n            'URL' : 'URLs'}:`);\n        urlsExpired.forEach((url) => logger.log(`    ${url}`));\n        logger.groupEnd();\n      } else {\n        logger.debug(`Cache expiration ran and found no entries to remove.`);\n      }\n    }\n\n    this._isRunning = false;\n    if (this._rerunRequested) {\n      this._rerunRequested = false;\n      this.expireEntries();\n    }\n  }\n\n  /**\n   * Update the timestamp for the given URL. This ensures the when\n   * removing entries based on maximum entries, most recently used\n   * is accurate or when expiring, the timestamp is up-to-date.\n   *\n   * @param {string} url\n   */\n  async updateTimestamp(url) {\n    if (process.env.NODE_ENV !== 'production') {\n      assert.isType(url, 'string', {\n        moduleName: 'workbox-expiration',\n        className: 'CacheExpiration',\n        funcName: 'updateTimestamp',\n        paramName: 'url',\n      });\n    }\n\n    await this._timestampModel.setTimestamp(url, Date.now());\n  }\n\n  /**\n   * Can be used to check if a URL has expired or not before it's used.\n   *\n   * This requires a look up from IndexedDB, so can be slow.\n   *\n   * Note: This method will not remove the cached entry, call\n   * `expireEntries()` to remove indexedDB and Cache entries.\n   *\n   * @param {string} url\n   * @return {boolean}\n   */\n  async isURLExpired(url) {\n    if (process.env.NODE_ENV !== 'production') {\n      if (!this._maxAgeSeconds) {\n        throw new WorkboxError(`expired-test-without-max-age`, {\n          methodName: 'isURLExpired',\n          paramName: 'maxAgeSeconds',\n        });\n      }\n    }\n\n    const timestamp = await this._timestampModel.getTimestamp(url);\n    const expireOlderThan = Date.now() - (this._maxAgeSeconds * 1000);\n    return (timestamp < expireOlderThan);\n  }\n\n  /**\n   * Removes the IndexedDB object store used to keep track of cache expiration\n   * metadata.\n   */\n  async delete() {\n    // Make sure we don't attempt another rerun if we're called in the middle of\n    // a cache expiration.\n    this._rerunRequested = false;\n    await this._timestampModel.expireEntries(Infinity); // Expires all.\n  }\n}\n\nexport {CacheExpiration};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {assert} from 'workbox-core/_private/assert.mjs';\nimport {cacheNames} from 'workbox-core/_private/cacheNames.mjs';\nimport {getFriendlyURL} from 'workbox-core/_private/getFriendlyURL.mjs';\nimport {logger} from 'workbox-core/_private/logger.mjs';\nimport {WorkboxError} from 'workbox-core/_private/WorkboxError.mjs';\nimport {registerQuotaErrorCallback}\n  from 'workbox-core/registerQuotaErrorCallback.mjs';\n\nimport {CacheExpiration} from './CacheExpiration.mjs';\nimport './_version.mjs';\n\n/**\n * This plugin can be used in the Workbox APIs to regularly enforce a\n * limit on the age and / or the number of cached requests.\n *\n * Whenever a cached request is used or updated, this plugin will look\n * at the used Cache and remove any old or extra requests.\n *\n * When using `maxAgeSeconds`, requests may be used *once* after expiring\n * because the expiration clean up will not have occurred until *after* the\n * cached request has been used. If the request has a \"Date\" header, then\n * a light weight expiration check is performed and the request will not be\n * used immediately.\n *\n * When using `maxEntries`, the entry least-recently requested will be removed from the cache first.\n *\n * @memberof workbox.expiration\n */\nclass Plugin {\n  /**\n   * @param {Object} config\n   * @param {number} [config.maxEntries] The maximum number of entries to cache.\n   * Entries used the least will be removed as the maximum is reached.\n   * @param {number} [config.maxAgeSeconds] The maximum age of an entry before\n   * it's treated as stale and removed.\n   * @param {boolean} [config.purgeOnQuotaError] Whether to opt this cache in to\n   * automatic deletion if the available storage quota has been exceeded.\n   */\n  constructor(config = {}) {\n    if (process.env.NODE_ENV !== 'production') {\n      if (!(config.maxEntries || config.maxAgeSeconds)) {\n        throw new WorkboxError('max-entries-or-age-required', {\n          moduleName: 'workbox-expiration',\n          className: 'Plugin',\n          funcName: 'constructor',\n        });\n      }\n\n      if (config.maxEntries) {\n        assert.isType(config.maxEntries, 'number', {\n          moduleName: 'workbox-expiration',\n          className: 'Plugin',\n          funcName: 'constructor',\n          paramName: 'config.maxEntries',\n        });\n      }\n\n      if (config.maxAgeSeconds) {\n        assert.isType(config.maxAgeSeconds, 'number', {\n          moduleName: 'workbox-expiration',\n          className: 'Plugin',\n          funcName: 'constructor',\n          paramName: 'config.maxAgeSeconds',\n        });\n      }\n    }\n\n    this._config = config;\n    this._maxAgeSeconds = config.maxAgeSeconds;\n    this._cacheExpirations = new Map();\n\n    if (config.purgeOnQuotaError) {\n      registerQuotaErrorCallback(() => this.deleteCacheAndMetadata());\n    }\n  }\n\n  /**\n   * A simple helper method to return a CacheExpiration instance for a given\n   * cache name.\n   *\n   * @param {string} cacheName\n   * @return {CacheExpiration}\n   *\n   * @private\n   */\n  _getCacheExpiration(cacheName) {\n    if (cacheName === cacheNames.getRuntimeName()) {\n      throw new WorkboxError('expire-custom-caches-only');\n    }\n\n    let cacheExpiration = this._cacheExpirations.get(cacheName);\n    if (!cacheExpiration) {\n      cacheExpiration = new CacheExpiration(cacheName, this._config);\n      this._cacheExpirations.set(cacheName, cacheExpiration);\n    }\n    return cacheExpiration;\n  }\n\n  /**\n   * A \"lifecycle\" callback that will be triggered automatically by the\n   * `workbox.strategies` handlers when a `Response` is about to be returned\n   * from a [Cache](https://developer.mozilla.org/en-US/docs/Web/API/Cache) to\n   * the handler. It allows the `Response` to be inspected for freshness and\n   * prevents it from being used if the `Response`'s `Date` header value is\n   * older than the configured `maxAgeSeconds`.\n   *\n   * @param {Object} options\n   * @param {string} options.cacheName Name of the cache the response is in.\n   * @param {Response} options.cachedResponse The `Response` object that's been\n   *     read from a cache and whose freshness should be checked.\n   * @return {Response} Either the `cachedResponse`, if it's\n   *     fresh, or `null` if the `Response` is older than `maxAgeSeconds`.\n   *\n   * @private\n   */\n  cachedResponseWillBeUsed({event, request, cacheName, cachedResponse}) {\n    if (!cachedResponse) {\n      return null;\n    }\n\n    let isFresh = this._isResponseDateFresh(cachedResponse);\n\n    // Expire entries to ensure that even if the expiration date has\n    // expired, it'll only be used once.\n    const cacheExpiration = this._getCacheExpiration(cacheName);\n    cacheExpiration.expireEntries();\n\n    // Update the metadata for the request URL to the current timestamp,\n    // but don't `await` it as we don't want to block the response.\n    const updateTimestampDone = cacheExpiration.updateTimestamp(request.url);\n    if (event) {\n      try {\n        event.waitUntil(updateTimestampDone);\n      } catch (error) {\n        if (process.env.NODE_ENV !== 'production') {\n          logger.warn(`Unable to ensure service worker stays alive when ` +\n            `updating cache entry for '${getFriendlyURL(event.request.url)}'.`);\n        }\n      }\n    }\n\n    return isFresh ? cachedResponse : null;\n  }\n\n  /**\n   * @param {Response} cachedResponse\n   * @return {boolean}\n   *\n   * @private\n   */\n  _isResponseDateFresh(cachedResponse) {\n    if (!this._maxAgeSeconds) {\n      // We aren't expiring by age, so return true, it's fresh\n      return true;\n    }\n\n    // Check if the 'date' header will suffice a quick expiration check.\n    // See https://github.com/GoogleChromeLabs/sw-toolbox/issues/164 for\n    // discussion.\n    const dateHeaderTimestamp = this._getDateHeaderTimestamp(cachedResponse);\n    if (dateHeaderTimestamp === null) {\n      // Unable to parse date, so assume it's fresh.\n      return true;\n    }\n\n    // If we have a valid headerTime, then our response is fresh iff the\n    // headerTime plus maxAgeSeconds is greater than the current time.\n    const now = Date.now();\n    return dateHeaderTimestamp >= now - (this._maxAgeSeconds * 1000);\n  }\n\n  /**\n   * This method will extract the data header and parse it into a useful\n   * value.\n   *\n   * @param {Response} cachedResponse\n   * @return {number}\n   *\n   * @private\n   */\n  _getDateHeaderTimestamp(cachedResponse) {\n    if (!cachedResponse.headers.has('date')) {\n      return null;\n    }\n\n    const dateHeader = cachedResponse.headers.get('date');\n    const parsedDate = new Date(dateHeader);\n    const headerTime = parsedDate.getTime();\n\n    // If the Date header was invalid for some reason, parsedDate.getTime()\n    // will return NaN.\n    if (isNaN(headerTime)) {\n      return null;\n    }\n\n    return headerTime;\n  }\n\n  /**\n   * A \"lifecycle\" callback that will be triggered automatically by the\n   * `workbox.strategies` handlers when an entry is added to a cache.\n   *\n   * @param {Object} options\n   * @param {string} options.cacheName Name of the cache that was updated.\n   * @param {string} options.request The Request for the cached entry.\n   *\n   * @private\n   */\n  async cacheDidUpdate({cacheName, request}) {\n    if (process.env.NODE_ENV !== 'production') {\n      assert.isType(cacheName, 'string', {\n        moduleName: 'workbox-expiration',\n        className: 'Plugin',\n        funcName: 'cacheDidUpdate',\n        paramName: 'cacheName',\n      });\n      assert.isInstance(request, Request, {\n        moduleName: 'workbox-expiration',\n        className: 'Plugin',\n        funcName: 'cacheDidUpdate',\n        paramName: 'request',\n      });\n    }\n\n    const cacheExpiration = this._getCacheExpiration(cacheName);\n    await cacheExpiration.updateTimestamp(request.url);\n    await cacheExpiration.expireEntries();\n  }\n\n\n  /**\n   * This is a helper method that performs two operations:\n   *\n   * - Deletes *all* the underlying Cache instances associated with this plugin\n   * instance, by calling caches.delete() on your behalf.\n   * - Deletes the metadata from IndexedDB used to keep track of expiration\n   * details for each Cache instance.\n   *\n   * When using cache expiration, calling this method is preferable to calling\n   * `caches.delete()` directly, since this will ensure that the IndexedDB\n   * metadata is also cleanly removed and open IndexedDB instances are deleted.\n   *\n   * Note that if you're *not* using cache expiration for a given cache, calling\n   * `caches.delete()` and passing in the cache's name should be sufficient.\n   * There is no Workbox-specific method needed for cleanup in that case.\n   */\n  async deleteCacheAndMetadata() {\n    // Do this one at a time instead of all at once via `Promise.all()` to\n    // reduce the chance of inconsistency if a promise rejects.\n    for (const [cacheName, cacheExpiration] of this._cacheExpirations) {\n      await caches.delete(cacheName);\n      await cacheExpiration.delete();\n    }\n\n    // Reset this._cacheExpirations to its initial state.\n    this._cacheExpirations = new Map();\n  }\n}\n\nexport {Plugin};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {CacheExpiration} from './CacheExpiration.mjs';\nimport {Plugin} from './Plugin.mjs';\nimport './_version.mjs';\n\n\n/**\n * @namespace workbox.expiration\n */\n\nexport {\n  CacheExpiration,\n  Plugin,\n};\n"],"names":["self","_","e","DB_NAME","OBJECT_STORE_NAME","normalizeURL","unNormalizedUrl","url","URL","location","hash","href","CacheTimestampsModel","constructor","cacheName","_cacheName","_db","DBWrapper","onupgradeneeded","event","_handleUpgrade","db","target","result","objStore","createObjectStore","keyPath","createIndex","unique","deleteDatabase","setTimestamp","timestamp","put","id","_getId","getTimestamp","entry","get","expireEntries","minTimestamp","maxCount","entriesToDelete","transaction","txn","done","store","objectStore","entriesNotDeletedCount","index","openCursor","onsuccess","cursor","value","push","continue","urlsDeleted","delete","CacheExpiration","config","assert","isType","moduleName","className","funcName","paramName","maxEntries","maxAgeSeconds","WorkboxError","_isRunning","_rerunRequested","_maxEntries","_maxAgeSeconds","_timestampModel","Date","now","undefined","urlsExpired","cache","caches","open","length","logger","groupCollapsed","log","forEach","groupEnd","debug","updateTimestamp","isURLExpired","methodName","expireOlderThan","Infinity","Plugin","_config","_cacheExpirations","Map","purgeOnQuotaError","registerQuotaErrorCallback","deleteCacheAndMetadata","_getCacheExpiration","cacheNames","getRuntimeName","cacheExpiration","set","cachedResponseWillBeUsed","request","cachedResponse","isFresh","_isResponseDateFresh","updateTimestampDone","waitUntil","error","warn","getFriendlyURL","dateHeaderTimestamp","_getDateHeaderTimestamp","headers","has","dateHeader","parsedDate","headerTime","getTime","isNaN","cacheDidUpdate","isInstance","Request"],"mappings":";;;;EAAA,IAAG;EAACA,EAAAA,IAAI,CAAC,0BAAD,CAAJ,IAAkCC,CAAC,EAAnC;EAAsC,CAA1C,CAA0C,OAAMC,CAAN,EAAQ;;ECAlD;;;;;;;AAQA,EAKA,MAAMC,OAAO,GAAG,oBAAhB;EACA,MAAMC,iBAAiB,GAAG,eAA1B;;EAEA,MAAMC,YAAY,GAAIC,eAAD,IAAqB;EACxC,QAAMC,GAAG,GAAG,IAAIC,GAAJ,CAAQF,eAAR,EAAyBG,QAAzB,CAAZ;EACAF,EAAAA,GAAG,CAACG,IAAJ,GAAW,EAAX;EAEA,SAAOH,GAAG,CAACI,IAAX;EACD,CALD;EAQA;;;;;;;EAKA,MAAMC,oBAAN,CAA2B;EACzB;;;;;;EAMAC,EAAAA,WAAW,CAACC,SAAD,EAAY;EACrB,SAAKC,UAAL,GAAkBD,SAAlB;EAEA,SAAKE,GAAL,GAAW,IAAIC,uBAAJ,CAAcd,OAAd,EAAuB,CAAvB,EAA0B;EACnCe,MAAAA,eAAe,EAAGC,KAAD,IAAW,KAAKC,cAAL,CAAoBD,KAApB;EADO,KAA1B,CAAX;EAGD;EAED;;;;;;;;;EAOAC,EAAAA,cAAc,CAACD,KAAD,EAAQ;EACpB,UAAME,EAAE,GAAGF,KAAK,CAACG,MAAN,CAAaC,MAAxB,CADoB;EAIpB;EACA;EACA;;EACA,UAAMC,QAAQ,GAAGH,EAAE,CAACI,iBAAH,CAAqBrB,iBAArB,EAAwC;EAACsB,MAAAA,OAAO,EAAE;EAAV,KAAxC,CAAjB,CAPoB;EAUpB;EACA;;EACAF,IAAAA,QAAQ,CAACG,WAAT,CAAqB,WAArB,EAAkC,WAAlC,EAA+C;EAACC,MAAAA,MAAM,EAAE;EAAT,KAA/C;EACAJ,IAAAA,QAAQ,CAACG,WAAT,CAAqB,WAArB,EAAkC,WAAlC,EAA+C;EAACC,MAAAA,MAAM,EAAE;EAAT,KAA/C,EAboB;EAgBpB;;EACAC,IAAAA,iCAAc,CAAC,KAAKd,UAAN,CAAd;EACD;EAED;;;;;;;;EAMA,QAAMe,YAAN,CAAmBvB,GAAnB,EAAwBwB,SAAxB,EAAmC;EACjCxB,IAAAA,GAAG,GAAGF,YAAY,CAACE,GAAD,CAAlB;EAEA,UAAM,KAAKS,GAAL,CAASgB,GAAT,CAAa5B,iBAAb,EAAgC;EACpCG,MAAAA,GADoC;EAEpCwB,MAAAA,SAFoC;EAGpCjB,MAAAA,SAAS,EAAE,KAAKC,UAHoB;EAIpC;EACA;EACA;EACAkB,MAAAA,EAAE,EAAE,KAAKC,MAAL,CAAY3B,GAAZ;EAPgC,KAAhC,CAAN;EASD;EAED;;;;;;;;;;EAQA,QAAM4B,YAAN,CAAmB5B,GAAnB,EAAwB;EACtB,UAAM6B,KAAK,GAAG,MAAM,KAAKpB,GAAL,CAASqB,GAAT,CAAajC,iBAAb,EAAgC,KAAK8B,MAAL,CAAY3B,GAAZ,CAAhC,CAApB;EACA,WAAO6B,KAAK,CAACL,SAAb;EACD;EAED;;;;;;;;;;;;EAUA,QAAMO,aAAN,CAAoBC,YAApB,EAAkCC,QAAlC,EAA4C;EAC1C,UAAMC,eAAe,GAAG,MAAM,KAAKzB,GAAL,CAAS0B,WAAT,CAC1BtC,iBAD0B,EACP,WADO,EACM,CAACuC,GAAD,EAAMC,IAAN,KAAe;EAC7C,YAAMC,KAAK,GAAGF,GAAG,CAACG,WAAJ,CAAgB1C,iBAAhB,CAAd;EACA,YAAMqC,eAAe,GAAG,EAAxB;EACA,UAAIM,sBAAsB,GAAG,CAA7B;;EAEAF,MAAAA,KAAK,CAACG,KAAN,CAAY,WAAZ,EACKC,UADL,CACgB,IADhB,EACsB,MADtB,EAEKC,SAFL,GAEiB,CAAC;EAAC5B,QAAAA;EAAD,OAAD,KAAc;EACzB,cAAM6B,MAAM,GAAG7B,MAAM,CAACC,MAAtB;;EACA,YAAI4B,MAAJ,EAAY;EACV,gBAAM5B,MAAM,GAAG4B,MAAM,CAACC,KAAtB,CADU;EAGV;;EACA,cAAI7B,MAAM,CAACT,SAAP,KAAqB,KAAKC,UAA9B,EAA0C;EACxC;EACA;EACA,gBAAKwB,YAAY,IAAIhB,MAAM,CAACQ,SAAP,GAAmBQ,YAApC,IACCC,QAAQ,IAAIO,sBAAsB,IAAIP,QAD3C,EACsD;EACpD;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACAC,cAAAA,eAAe,CAACY,IAAhB,CAAqBF,MAAM,CAACC,KAA5B;EACD,aAZD,MAYO;EACLL,cAAAA,sBAAsB;EACvB;EACF;;EACDI,UAAAA,MAAM,CAACG,QAAP;EACD,SAxBD,MAwBO;EACLV,UAAAA,IAAI,CAACH,eAAD,CAAJ;EACD;EACF,OA/BL;EAgCD,KAtCyB,CAA9B,CAD0C;EA0C1C;EACA;EACA;;EACA,UAAMc,WAAW,GAAG,EAApB;;EACA,SAAK,MAAMnB,KAAX,IAAoBK,eAApB,EAAqC;EACnC,YAAM,KAAKzB,GAAL,CAASwC,MAAT,CAAgBpD,iBAAhB,EAAmCgC,KAAK,CAACH,EAAzC,CAAN;EACAsB,MAAAA,WAAW,CAACF,IAAZ,CAAiBjB,KAAK,CAAC7B,GAAvB;EACD;;EAED,WAAOgD,WAAP;EACD;EAED;;;;;;;;;;EAQArB,EAAAA,MAAM,CAAC3B,GAAD,EAAM;EACV;EACA;EACA;EACA,WAAO,KAAKQ,UAAL,GAAkB,GAAlB,GAAwBV,YAAY,CAACE,GAAD,CAA3C;EACD;;EAxJwB;;EC7B3B;;;;;;;AAQA,EAOA;;;;;;;;EAOA,MAAMkD,eAAN,CAAsB;EACpB;;;;;;;;;;;EAWA5C,EAAAA,WAAW,CAACC,SAAD,EAAY4C,MAAM,GAAG,EAArB,EAAyB;EAClC,IAA2C;EACzCC,MAAAA,iBAAM,CAACC,MAAP,CAAc9C,SAAd,EAAyB,QAAzB,EAAmC;EACjC+C,QAAAA,UAAU,EAAE,oBADqB;EAEjCC,QAAAA,SAAS,EAAE,iBAFsB;EAGjCC,QAAAA,QAAQ,EAAE,aAHuB;EAIjCC,QAAAA,SAAS,EAAE;EAJsB,OAAnC;;EAOA,UAAI,EAAEN,MAAM,CAACO,UAAP,IAAqBP,MAAM,CAACQ,aAA9B,CAAJ,EAAkD;EAChD,cAAM,IAAIC,6BAAJ,CAAiB,6BAAjB,EAAgD;EACpDN,UAAAA,UAAU,EAAE,oBADwC;EAEpDC,UAAAA,SAAS,EAAE,iBAFyC;EAGpDC,UAAAA,QAAQ,EAAE;EAH0C,SAAhD,CAAN;EAKD;;EAED,UAAIL,MAAM,CAACO,UAAX,EAAuB;EACrBN,QAAAA,iBAAM,CAACC,MAAP,CAAcF,MAAM,CAACO,UAArB,EAAiC,QAAjC,EAA2C;EACzCJ,UAAAA,UAAU,EAAE,oBAD6B;EAEzCC,UAAAA,SAAS,EAAE,iBAF8B;EAGzCC,UAAAA,QAAQ,EAAE,aAH+B;EAIzCC,UAAAA,SAAS,EAAE;EAJ8B,SAA3C,EADqB;EAStB;;EAED,UAAIN,MAAM,CAACQ,aAAX,EAA0B;EACxBP,QAAAA,iBAAM,CAACC,MAAP,CAAcF,MAAM,CAACQ,aAArB,EAAoC,QAApC,EAA8C;EAC5CL,UAAAA,UAAU,EAAE,oBADgC;EAE5CC,UAAAA,SAAS,EAAE,iBAFiC;EAG5CC,UAAAA,QAAQ,EAAE,aAHkC;EAI5CC,UAAAA,SAAS,EAAE;EAJiC,SAA9C,EADwB;EASzB;EACF;;EAED,SAAKI,UAAL,GAAkB,KAAlB;EACA,SAAKC,eAAL,GAAuB,KAAvB;EACA,SAAKC,WAAL,GAAmBZ,MAAM,CAACO,UAA1B;EACA,SAAKM,cAAL,GAAsBb,MAAM,CAACQ,aAA7B;EACA,SAAKnD,UAAL,GAAkBD,SAAlB;EACA,SAAK0D,eAAL,GAAuB,IAAI5D,oBAAJ,CAAyBE,SAAzB,CAAvB;EACD;EAED;;;;;EAGA,QAAMwB,aAAN,GAAsB;EACpB,QAAI,KAAK8B,UAAT,EAAqB;EACnB,WAAKC,eAAL,GAAuB,IAAvB;EACA;EACD;;EACD,SAAKD,UAAL,GAAkB,IAAlB;EAEA,UAAM7B,YAAY,GAAG,KAAKgC,cAAL,GACjBE,IAAI,CAACC,GAAL,KAAc,KAAKH,cAAL,GAAsB,IADnB,GAC2BI,SADhD;EAGA,UAAMC,WAAW,GAAG,MAAM,KAAKJ,eAAL,CAAqBlC,aAArB,CACtBC,YADsB,EACR,KAAK+B,WADG,CAA1B,CAVoB;;EAcpB,UAAMO,KAAK,GAAG,MAAMC,MAAM,CAACC,IAAP,CAAY,KAAKhE,UAAjB,CAApB;;EACA,SAAK,MAAMR,GAAX,IAAkBqE,WAAlB,EAA+B;EAC7B,YAAMC,KAAK,CAACrB,MAAN,CAAajD,GAAb,CAAN;EACD;;EAED,IAA2C;EACzC,UAAIqE,WAAW,CAACI,MAAZ,GAAqB,CAAzB,EAA4B;EAC1BC,QAAAA,iBAAM,CAACC,cAAP,CACK,WAAUN,WAAW,CAACI,MAAO,GAA9B,GACD,GAAEJ,WAAW,CAACI,MAAZ,KAAuB,CAAvB,GAA2B,OAA3B,GAAqC,SAAU,eADhD,GAED,GAAEJ,WAAW,CAACI,MAAZ,KAAuB,CAAvB,GAA2B,IAA3B,GAAkC,MAAO,YAF1C,GAGD,IAAG,KAAKjE,UAAW,UAJtB;EAKAkE,QAAAA,iBAAM,CAACE,GAAP,CAAY,yBAAwBP,WAAW,CAACI,MAAZ,KAAuB,CAAvB,GAChC,KADgC,GACxB,MAAO,GADnB;EAEAJ,QAAAA,WAAW,CAACQ,OAAZ,CAAqB7E,GAAD,IAAS0E,iBAAM,CAACE,GAAP,CAAY,OAAM5E,GAAI,EAAtB,CAA7B;EACA0E,QAAAA,iBAAM,CAACI,QAAP;EACD,OAVD,MAUO;EACLJ,QAAAA,iBAAM,CAACK,KAAP,CAAc,sDAAd;EACD;EACF;;EAED,SAAKlB,UAAL,GAAkB,KAAlB;;EACA,QAAI,KAAKC,eAAT,EAA0B;EACxB,WAAKA,eAAL,GAAuB,KAAvB;EACA,WAAK/B,aAAL;EACD;EACF;EAED;;;;;;;;;EAOA,QAAMiD,eAAN,CAAsBhF,GAAtB,EAA2B;EACzB,IAA2C;EACzCoD,MAAAA,iBAAM,CAACC,MAAP,CAAcrD,GAAd,EAAmB,QAAnB,EAA6B;EAC3BsD,QAAAA,UAAU,EAAE,oBADe;EAE3BC,QAAAA,SAAS,EAAE,iBAFgB;EAG3BC,QAAAA,QAAQ,EAAE,iBAHiB;EAI3BC,QAAAA,SAAS,EAAE;EAJgB,OAA7B;EAMD;;EAED,UAAM,KAAKQ,eAAL,CAAqB1C,YAArB,CAAkCvB,GAAlC,EAAuCkE,IAAI,CAACC,GAAL,EAAvC,CAAN;EACD;EAED;;;;;;;;;;;;;EAWA,QAAMc,YAAN,CAAmBjF,GAAnB,EAAwB;EACtB,IAA2C;EACzC,UAAI,CAAC,KAAKgE,cAAV,EAA0B;EACxB,cAAM,IAAIJ,6BAAJ,CAAkB,8BAAlB,EAAiD;EACrDsB,UAAAA,UAAU,EAAE,cADyC;EAErDzB,UAAAA,SAAS,EAAE;EAF0C,SAAjD,CAAN;EAID;EACF;;EAED,UAAMjC,SAAS,GAAG,MAAM,KAAKyC,eAAL,CAAqBrC,YAArB,CAAkC5B,GAAlC,CAAxB;EACA,UAAMmF,eAAe,GAAGjB,IAAI,CAACC,GAAL,KAAc,KAAKH,cAAL,GAAsB,IAA5D;EACA,WAAQxC,SAAS,GAAG2D,eAApB;EACD;EAED;;;;;;EAIA,QAAMlC,MAAN,GAAe;EACb;EACA;EACA,SAAKa,eAAL,GAAuB,KAAvB;EACA,UAAM,KAAKG,eAAL,CAAqBlC,aAArB,CAAmCqD,QAAnC,CAAN,CAJa;EAKd;;EAhKmB;;ECtBtB;;;;;;;AAQA,EAWA;;;;;;;;;;;;;;;;;;EAiBA,MAAMC,MAAN,CAAa;EACX;;;;;;;;;EASA/E,EAAAA,WAAW,CAAC6C,MAAM,GAAG,EAAV,EAAc;EACvB,IAA2C;EACzC,UAAI,EAAEA,MAAM,CAACO,UAAP,IAAqBP,MAAM,CAACQ,aAA9B,CAAJ,EAAkD;EAChD,cAAM,IAAIC,6BAAJ,CAAiB,6BAAjB,EAAgD;EACpDN,UAAAA,UAAU,EAAE,oBADwC;EAEpDC,UAAAA,SAAS,EAAE,QAFyC;EAGpDC,UAAAA,QAAQ,EAAE;EAH0C,SAAhD,CAAN;EAKD;;EAED,UAAIL,MAAM,CAACO,UAAX,EAAuB;EACrBN,QAAAA,iBAAM,CAACC,MAAP,CAAcF,MAAM,CAACO,UAArB,EAAiC,QAAjC,EAA2C;EACzCJ,UAAAA,UAAU,EAAE,oBAD6B;EAEzCC,UAAAA,SAAS,EAAE,QAF8B;EAGzCC,UAAAA,QAAQ,EAAE,aAH+B;EAIzCC,UAAAA,SAAS,EAAE;EAJ8B,SAA3C;EAMD;;EAED,UAAIN,MAAM,CAACQ,aAAX,EAA0B;EACxBP,QAAAA,iBAAM,CAACC,MAAP,CAAcF,MAAM,CAACQ,aAArB,EAAoC,QAApC,EAA8C;EAC5CL,UAAAA,UAAU,EAAE,oBADgC;EAE5CC,UAAAA,SAAS,EAAE,QAFiC;EAG5CC,UAAAA,QAAQ,EAAE,aAHkC;EAI5CC,UAAAA,SAAS,EAAE;EAJiC,SAA9C;EAMD;EACF;;EAED,SAAK6B,OAAL,GAAenC,MAAf;EACA,SAAKa,cAAL,GAAsBb,MAAM,CAACQ,aAA7B;EACA,SAAK4B,iBAAL,GAAyB,IAAIC,GAAJ,EAAzB;;EAEA,QAAIrC,MAAM,CAACsC,iBAAX,EAA8B;EAC5BC,MAAAA,yDAA0B,CAAC,MAAM,KAAKC,sBAAL,EAAP,CAA1B;EACD;EACF;EAED;;;;;;;;;;;EASAC,EAAAA,mBAAmB,CAACrF,SAAD,EAAY;EAC7B,QAAIA,SAAS,KAAKsF,yBAAU,CAACC,cAAX,EAAlB,EAA+C;EAC7C,YAAM,IAAIlC,6BAAJ,CAAiB,2BAAjB,CAAN;EACD;;EAED,QAAImC,eAAe,GAAG,KAAKR,iBAAL,CAAuBzD,GAAvB,CAA2BvB,SAA3B,CAAtB;;EACA,QAAI,CAACwF,eAAL,EAAsB;EACpBA,MAAAA,eAAe,GAAG,IAAI7C,eAAJ,CAAoB3C,SAApB,EAA+B,KAAK+E,OAApC,CAAlB;;EACA,WAAKC,iBAAL,CAAuBS,GAAvB,CAA2BzF,SAA3B,EAAsCwF,eAAtC;EACD;;EACD,WAAOA,eAAP;EACD;EAED;;;;;;;;;;;;;;;;;;;EAiBAE,EAAAA,wBAAwB,CAAC;EAACrF,IAAAA,KAAD;EAAQsF,IAAAA,OAAR;EAAiB3F,IAAAA,SAAjB;EAA4B4F,IAAAA;EAA5B,GAAD,EAA8C;EACpE,QAAI,CAACA,cAAL,EAAqB;EACnB,aAAO,IAAP;EACD;;EAED,QAAIC,OAAO,GAAG,KAAKC,oBAAL,CAA0BF,cAA1B,CAAd,CALoE;EAQpE;;;EACA,UAAMJ,eAAe,GAAG,KAAKH,mBAAL,CAAyBrF,SAAzB,CAAxB;;EACAwF,IAAAA,eAAe,CAAChE,aAAhB,GAVoE;EAapE;;EACA,UAAMuE,mBAAmB,GAAGP,eAAe,CAACf,eAAhB,CAAgCkB,OAAO,CAAClG,GAAxC,CAA5B;;EACA,QAAIY,KAAJ,EAAW;EACT,UAAI;EACFA,QAAAA,KAAK,CAAC2F,SAAN,CAAgBD,mBAAhB;EACD,OAFD,CAEE,OAAOE,KAAP,EAAc;EACd,QAA2C;EACzC9B,UAAAA,iBAAM,CAAC+B,IAAP,CAAa,mDAAD,GACT,6BAA4BC,iCAAc,CAAC9F,KAAK,CAACsF,OAAN,CAAclG,GAAf,CAAoB,IADjE;EAED;EACF;EACF;;EAED,WAAOoG,OAAO,GAAGD,cAAH,GAAoB,IAAlC;EACD;EAED;;;;;;;;EAMAE,EAAAA,oBAAoB,CAACF,cAAD,EAAiB;EACnC,QAAI,CAAC,KAAKnC,cAAV,EAA0B;EACxB;EACA,aAAO,IAAP;EACD,KAJkC;EAOnC;EACA;;;EACA,UAAM2C,mBAAmB,GAAG,KAAKC,uBAAL,CAA6BT,cAA7B,CAA5B;;EACA,QAAIQ,mBAAmB,KAAK,IAA5B,EAAkC;EAChC;EACA,aAAO,IAAP;EACD,KAbkC;EAgBnC;;;EACA,UAAMxC,GAAG,GAAGD,IAAI,CAACC,GAAL,EAAZ;EACA,WAAOwC,mBAAmB,IAAIxC,GAAG,GAAI,KAAKH,cAAL,GAAsB,IAA3D;EACD;EAED;;;;;;;;;;;EASA4C,EAAAA,uBAAuB,CAACT,cAAD,EAAiB;EACtC,QAAI,CAACA,cAAc,CAACU,OAAf,CAAuBC,GAAvB,CAA2B,MAA3B,CAAL,EAAyC;EACvC,aAAO,IAAP;EACD;;EAED,UAAMC,UAAU,GAAGZ,cAAc,CAACU,OAAf,CAAuB/E,GAAvB,CAA2B,MAA3B,CAAnB;EACA,UAAMkF,UAAU,GAAG,IAAI9C,IAAJ,CAAS6C,UAAT,CAAnB;EACA,UAAME,UAAU,GAAGD,UAAU,CAACE,OAAX,EAAnB,CAPsC;EAUtC;;EACA,QAAIC,KAAK,CAACF,UAAD,CAAT,EAAuB;EACrB,aAAO,IAAP;EACD;;EAED,WAAOA,UAAP;EACD;EAED;;;;;;;;;;;;EAUA,QAAMG,cAAN,CAAqB;EAAC7G,IAAAA,SAAD;EAAY2F,IAAAA;EAAZ,GAArB,EAA2C;EACzC,IAA2C;EACzC9C,MAAAA,iBAAM,CAACC,MAAP,CAAc9C,SAAd,EAAyB,QAAzB,EAAmC;EACjC+C,QAAAA,UAAU,EAAE,oBADqB;EAEjCC,QAAAA,SAAS,EAAE,QAFsB;EAGjCC,QAAAA,QAAQ,EAAE,gBAHuB;EAIjCC,QAAAA,SAAS,EAAE;EAJsB,OAAnC;EAMAL,MAAAA,iBAAM,CAACiE,UAAP,CAAkBnB,OAAlB,EAA2BoB,OAA3B,EAAoC;EAClChE,QAAAA,UAAU,EAAE,oBADsB;EAElCC,QAAAA,SAAS,EAAE,QAFuB;EAGlCC,QAAAA,QAAQ,EAAE,gBAHwB;EAIlCC,QAAAA,SAAS,EAAE;EAJuB,OAApC;EAMD;;EAED,UAAMsC,eAAe,GAAG,KAAKH,mBAAL,CAAyBrF,SAAzB,CAAxB;;EACA,UAAMwF,eAAe,CAACf,eAAhB,CAAgCkB,OAAO,CAAClG,GAAxC,CAAN;EACA,UAAM+F,eAAe,CAAChE,aAAhB,EAAN;EACD;EAGD;;;;;;;;;;;;;;;;;;EAgBA,QAAM4D,sBAAN,GAA+B;EAC7B;EACA;EACA,SAAK,MAAM,CAACpF,SAAD,EAAYwF,eAAZ,CAAX,IAA2C,KAAKR,iBAAhD,EAAmE;EACjE,YAAMhB,MAAM,CAACtB,MAAP,CAAc1C,SAAd,CAAN;EACA,YAAMwF,eAAe,CAAC9C,MAAhB,EAAN;EACD,KAN4B;;;EAS7B,SAAKsC,iBAAL,GAAyB,IAAIC,GAAJ,EAAzB;EACD;;EApOU;;ECpCb;;;;;;;;;;;;;;;;;"}
\ No newline at end of file
diff --git a/public/javascripts/workbox/workbox-expiration.prod.js b/public/javascripts/workbox/workbox-expiration.prod.js
deleted file mode 100644
index 7c8f84040ed..00000000000
--- a/public/javascripts/workbox/workbox-expiration.prod.js
+++ /dev/null
@@ -1,2 +0,0 @@
-this.workbox=this.workbox||{},this.workbox.expiration=function(t,e,s,i,a,n){"use strict";try{self["workbox:expiration:4.3.1"]&&_()}catch(t){}const h="workbox-expiration",c="cache-entries",r=t=>{const e=new URL(t,location);return e.hash="",e.href};class o{constructor(t){this.t=t,this.s=new e.DBWrapper(h,1,{onupgradeneeded:t=>this.i(t)})}i(t){const e=t.target.result.createObjectStore(c,{keyPath:"id"});e.createIndex("cacheName","cacheName",{unique:!1}),e.createIndex("timestamp","timestamp",{unique:!1}),s.deleteDatabase(this.t)}async setTimestamp(t,e){t=r(t),await this.s.put(c,{url:t,timestamp:e,cacheName:this.t,id:this.h(t)})}async getTimestamp(t){return(await this.s.get(c,this.h(t))).timestamp}async expireEntries(t,e){const s=await this.s.transaction(c,"readwrite",(s,i)=>{const a=s.objectStore(c),n=[];let h=0;a.index("timestamp").openCursor(null,"prev").onsuccess=(({target:s})=>{const a=s.result;if(a){const s=a.value;s.cacheName===this.t&&(t&&s.timestamp<t||e&&h>=e?n.push(a.value):h++),a.continue()}else i(n)})}),i=[];for(const t of s)await this.s.delete(c,t.id),i.push(t.url);return i}h(t){return this.t+"|"+r(t)}}class u{constructor(t,e={}){this.o=!1,this.u=!1,this.l=e.maxEntries,this.p=e.maxAgeSeconds,this.t=t,this.m=new o(t)}async expireEntries(){if(this.o)return void(this.u=!0);this.o=!0;const t=this.p?Date.now()-1e3*this.p:void 0,e=await this.m.expireEntries(t,this.l),s=await caches.open(this.t);for(const t of e)await s.delete(t);this.o=!1,this.u&&(this.u=!1,this.expireEntries())}async updateTimestamp(t){await this.m.setTimestamp(t,Date.now())}async isURLExpired(t){return await this.m.getTimestamp(t)<Date.now()-1e3*this.p}async delete(){this.u=!1,await this.m.expireEntries(1/0)}}return t.CacheExpiration=u,t.Plugin=class{constructor(t={}){this.D=t,this.p=t.maxAgeSeconds,this.g=new Map,t.purgeOnQuotaError&&n.registerQuotaErrorCallback(()=>this.deleteCacheAndMetadata())}k(t){if(t===a.cacheNames.getRuntimeName())throw new i.WorkboxError("expire-custom-caches-only");let e=this.g.get(t);return e||(e=new u(t,this.D),this.g.set(t,e)),e}cachedResponseWillBeUsed({event:t,request:e,cacheName:s,cachedResponse:i}){if(!i)return null;let a=this.N(i);const n=this.k(s);n.expireEntries();const h=n.updateTimestamp(e.url);if(t)try{t.waitUntil(h)}catch(t){}return a?i:null}N(t){if(!this.p)return!0;const e=this._(t);return null===e||e>=Date.now()-1e3*this.p}_(t){if(!t.headers.has("date"))return null;const e=t.headers.get("date"),s=new Date(e).getTime();return isNaN(s)?null:s}async cacheDidUpdate({cacheName:t,request:e}){const s=this.k(t);await s.updateTimestamp(e.url),await s.expireEntries()}async deleteCacheAndMetadata(){for(const[t,e]of this.g)await caches.delete(t),await e.delete();this.g=new Map}},t}({},workbox.core._private,workbox.core._private,workbox.core._private,workbox.core._private,workbox.core);
-//# sourceMappingURL=workbox-expiration.prod.js.map
diff --git a/public/javascripts/workbox/workbox-expiration.prod.js.map b/public/javascripts/workbox/workbox-expiration.prod.js.map
deleted file mode 100644
index 6cb8ede7ba3..00000000000
--- a/public/javascripts/workbox/workbox-expiration.prod.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"workbox-expiration.prod.js","sources":["../_version.mjs","../models/CacheTimestampsModel.mjs","../CacheExpiration.mjs","../Plugin.mjs"],"sourcesContent":["try{self['workbox:expiration:4.3.1']&&_()}catch(e){}// eslint-disable-line","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {DBWrapper} from 'workbox-core/_private/DBWrapper.mjs';\nimport {deleteDatabase} from 'workbox-core/_private/deleteDatabase.mjs';\nimport '../_version.mjs';\n\n\nconst DB_NAME = 'workbox-expiration';\nconst OBJECT_STORE_NAME = 'cache-entries';\n\nconst normalizeURL = (unNormalizedUrl) => {\n  const url = new URL(unNormalizedUrl, location);\n  url.hash = '';\n\n  return url.href;\n};\n\n\n/**\n * Returns the timestamp model.\n *\n * @private\n */\nclass CacheTimestampsModel {\n  /**\n   *\n   * @param {string} cacheName\n   *\n   * @private\n   */\n  constructor(cacheName) {\n    this._cacheName = cacheName;\n\n    this._db = new DBWrapper(DB_NAME, 1, {\n      onupgradeneeded: (event) => this._handleUpgrade(event),\n    });\n  }\n\n  /**\n   * Should perform an upgrade of indexedDB.\n   *\n   * @param {Event} event\n   *\n   * @private\n   */\n  _handleUpgrade(event) {\n    const db = event.target.result;\n\n    // TODO(philipwalton): EdgeHTML doesn't support arrays as a keyPath, so we\n    // have to use the `id` keyPath here and create our own values (a\n    // concatenation of `url + cacheName`) instead of simply using\n    // `keyPath: ['url', 'cacheName']`, which is supported in other browsers.\n    const objStore = db.createObjectStore(OBJECT_STORE_NAME, {keyPath: 'id'});\n\n    // TODO(philipwalton): once we don't have to support EdgeHTML, we can\n    // create a single index with the keyPath `['cacheName', 'timestamp']`\n    // instead of doing both these indexes.\n    objStore.createIndex('cacheName', 'cacheName', {unique: false});\n    objStore.createIndex('timestamp', 'timestamp', {unique: false});\n\n    // Previous versions of `workbox-expiration` used `this._cacheName`\n    // as the IDBDatabase name.\n    deleteDatabase(this._cacheName);\n  }\n\n  /**\n   * @param {string} url\n   * @param {number} timestamp\n   *\n   * @private\n   */\n  async setTimestamp(url, timestamp) {\n    url = normalizeURL(url);\n\n    await this._db.put(OBJECT_STORE_NAME, {\n      url,\n      timestamp,\n      cacheName: this._cacheName,\n      // Creating an ID from the URL and cache name won't be necessary once\n      // Edge switches to Chromium and all browsers we support work with\n      // array keyPaths.\n      id: this._getId(url),\n    });\n  }\n\n  /**\n   * Returns the timestamp stored for a given URL.\n   *\n   * @param {string} url\n   * @return {number}\n   *\n   * @private\n   */\n  async getTimestamp(url) {\n    const entry = await this._db.get(OBJECT_STORE_NAME, this._getId(url));\n    return entry.timestamp;\n  }\n\n  /**\n   * Iterates through all the entries in the object store (from newest to\n   * oldest) and removes entries once either `maxCount` is reached or the\n   * entry's timestamp is less than `minTimestamp`.\n   *\n   * @param {number} minTimestamp\n   * @param {number} maxCount\n   *\n   * @private\n   */\n  async expireEntries(minTimestamp, maxCount) {\n    const entriesToDelete = await this._db.transaction(\n        OBJECT_STORE_NAME, 'readwrite', (txn, done) => {\n          const store = txn.objectStore(OBJECT_STORE_NAME);\n          const entriesToDelete = [];\n          let entriesNotDeletedCount = 0;\n\n          store.index('timestamp')\n              .openCursor(null, 'prev')\n              .onsuccess = ({target}) => {\n                const cursor = target.result;\n                if (cursor) {\n                  const result = cursor.value;\n                  // TODO(philipwalton): once we can use a multi-key index, we\n                  // won't have to check `cacheName` here.\n                  if (result.cacheName === this._cacheName) {\n                    // Delete an entry if it's older than the max age or\n                    // if we already have the max number allowed.\n                    if ((minTimestamp && result.timestamp < minTimestamp) ||\n                        (maxCount && entriesNotDeletedCount >= maxCount)) {\n                      // TODO(philipwalton): we should be able to delete the\n                      // entry right here, but doing so causes an iteration\n                      // bug in Safari stable (fixed in TP). Instead we can\n                      // store the keys of the entries to delete, and then\n                      // delete the separate transactions.\n                      // https://github.com/GoogleChrome/workbox/issues/1978\n                      // cursor.delete();\n\n                      // We only need to return the URL, not the whole entry.\n                      entriesToDelete.push(cursor.value);\n                    } else {\n                      entriesNotDeletedCount++;\n                    }\n                  }\n                  cursor.continue();\n                } else {\n                  done(entriesToDelete);\n                }\n              };\n        });\n\n    // TODO(philipwalton): once the Safari bug in the following issue is fixed,\n    // we should be able to remove this loop and do the entry deletion in the\n    // cursor loop above:\n    // https://github.com/GoogleChrome/workbox/issues/1978\n    const urlsDeleted = [];\n    for (const entry of entriesToDelete) {\n      await this._db.delete(OBJECT_STORE_NAME, entry.id);\n      urlsDeleted.push(entry.url);\n    }\n\n    return urlsDeleted;\n  }\n\n  /**\n   * Takes a URL and returns an ID that will be unique in the object store.\n   *\n   * @param {string} url\n   * @return {string}\n   *\n   * @private\n   */\n  _getId(url) {\n    // Creating an ID from the URL and cache name won't be necessary once\n    // Edge switches to Chromium and all browsers we support work with\n    // array keyPaths.\n    return this._cacheName + '|' + normalizeURL(url);\n  }\n}\n\nexport {CacheTimestampsModel};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {CacheTimestampsModel} from './models/CacheTimestampsModel.mjs';\nimport {WorkboxError} from 'workbox-core/_private/WorkboxError.mjs';\nimport {assert} from 'workbox-core/_private/assert.mjs';\nimport {logger} from 'workbox-core/_private/logger.mjs';\n\nimport './_version.mjs';\n\n/**\n * The `CacheExpiration` class allows you define an expiration and / or\n * limit on the number of responses stored in a\n * [`Cache`](https://developer.mozilla.org/en-US/docs/Web/API/Cache).\n *\n * @memberof workbox.expiration\n */\nclass CacheExpiration {\n  /**\n   * To construct a new CacheExpiration instance you must provide at least\n   * one of the `config` properties.\n   *\n   * @param {string} cacheName Name of the cache to apply restrictions to.\n   * @param {Object} config\n   * @param {number} [config.maxEntries] The maximum number of entries to cache.\n   * Entries used the least will be removed as the maximum is reached.\n   * @param {number} [config.maxAgeSeconds] The maximum age of an entry before\n   * it's treated as stale and removed.\n   */\n  constructor(cacheName, config = {}) {\n    if (process.env.NODE_ENV !== 'production') {\n      assert.isType(cacheName, 'string', {\n        moduleName: 'workbox-expiration',\n        className: 'CacheExpiration',\n        funcName: 'constructor',\n        paramName: 'cacheName',\n      });\n\n      if (!(config.maxEntries || config.maxAgeSeconds)) {\n        throw new WorkboxError('max-entries-or-age-required', {\n          moduleName: 'workbox-expiration',\n          className: 'CacheExpiration',\n          funcName: 'constructor',\n        });\n      }\n\n      if (config.maxEntries) {\n        assert.isType(config.maxEntries, 'number', {\n          moduleName: 'workbox-expiration',\n          className: 'CacheExpiration',\n          funcName: 'constructor',\n          paramName: 'config.maxEntries',\n        });\n\n        // TODO: Assert is positive\n      }\n\n      if (config.maxAgeSeconds) {\n        assert.isType(config.maxAgeSeconds, 'number', {\n          moduleName: 'workbox-expiration',\n          className: 'CacheExpiration',\n          funcName: 'constructor',\n          paramName: 'config.maxAgeSeconds',\n        });\n\n        // TODO: Assert is positive\n      }\n    }\n\n    this._isRunning = false;\n    this._rerunRequested = false;\n    this._maxEntries = config.maxEntries;\n    this._maxAgeSeconds = config.maxAgeSeconds;\n    this._cacheName = cacheName;\n    this._timestampModel = new CacheTimestampsModel(cacheName);\n  }\n\n  /**\n   * Expires entries for the given cache and given criteria.\n   */\n  async expireEntries() {\n    if (this._isRunning) {\n      this._rerunRequested = true;\n      return;\n    }\n    this._isRunning = true;\n\n    const minTimestamp = this._maxAgeSeconds ?\n        Date.now() - (this._maxAgeSeconds * 1000) : undefined;\n\n    const urlsExpired = await this._timestampModel.expireEntries(\n        minTimestamp, this._maxEntries);\n\n    // Delete URLs from the cache\n    const cache = await caches.open(this._cacheName);\n    for (const url of urlsExpired) {\n      await cache.delete(url);\n    }\n\n    if (process.env.NODE_ENV !== 'production') {\n      if (urlsExpired.length > 0) {\n        logger.groupCollapsed(\n            `Expired ${urlsExpired.length} ` +\n          `${urlsExpired.length === 1 ? 'entry' : 'entries'} and removed ` +\n          `${urlsExpired.length === 1 ? 'it' : 'them'} from the ` +\n          `'${this._cacheName}' cache.`);\n        logger.log(`Expired the following ${urlsExpired.length === 1 ?\n            'URL' : 'URLs'}:`);\n        urlsExpired.forEach((url) => logger.log(`    ${url}`));\n        logger.groupEnd();\n      } else {\n        logger.debug(`Cache expiration ran and found no entries to remove.`);\n      }\n    }\n\n    this._isRunning = false;\n    if (this._rerunRequested) {\n      this._rerunRequested = false;\n      this.expireEntries();\n    }\n  }\n\n  /**\n   * Update the timestamp for the given URL. This ensures the when\n   * removing entries based on maximum entries, most recently used\n   * is accurate or when expiring, the timestamp is up-to-date.\n   *\n   * @param {string} url\n   */\n  async updateTimestamp(url) {\n    if (process.env.NODE_ENV !== 'production') {\n      assert.isType(url, 'string', {\n        moduleName: 'workbox-expiration',\n        className: 'CacheExpiration',\n        funcName: 'updateTimestamp',\n        paramName: 'url',\n      });\n    }\n\n    await this._timestampModel.setTimestamp(url, Date.now());\n  }\n\n  /**\n   * Can be used to check if a URL has expired or not before it's used.\n   *\n   * This requires a look up from IndexedDB, so can be slow.\n   *\n   * Note: This method will not remove the cached entry, call\n   * `expireEntries()` to remove indexedDB and Cache entries.\n   *\n   * @param {string} url\n   * @return {boolean}\n   */\n  async isURLExpired(url) {\n    if (process.env.NODE_ENV !== 'production') {\n      if (!this._maxAgeSeconds) {\n        throw new WorkboxError(`expired-test-without-max-age`, {\n          methodName: 'isURLExpired',\n          paramName: 'maxAgeSeconds',\n        });\n      }\n    }\n\n    const timestamp = await this._timestampModel.getTimestamp(url);\n    const expireOlderThan = Date.now() - (this._maxAgeSeconds * 1000);\n    return (timestamp < expireOlderThan);\n  }\n\n  /**\n   * Removes the IndexedDB object store used to keep track of cache expiration\n   * metadata.\n   */\n  async delete() {\n    // Make sure we don't attempt another rerun if we're called in the middle of\n    // a cache expiration.\n    this._rerunRequested = false;\n    await this._timestampModel.expireEntries(Infinity); // Expires all.\n  }\n}\n\nexport {CacheExpiration};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {assert} from 'workbox-core/_private/assert.mjs';\nimport {cacheNames} from 'workbox-core/_private/cacheNames.mjs';\nimport {getFriendlyURL} from 'workbox-core/_private/getFriendlyURL.mjs';\nimport {logger} from 'workbox-core/_private/logger.mjs';\nimport {WorkboxError} from 'workbox-core/_private/WorkboxError.mjs';\nimport {registerQuotaErrorCallback}\n  from 'workbox-core/registerQuotaErrorCallback.mjs';\n\nimport {CacheExpiration} from './CacheExpiration.mjs';\nimport './_version.mjs';\n\n/**\n * This plugin can be used in the Workbox APIs to regularly enforce a\n * limit on the age and / or the number of cached requests.\n *\n * Whenever a cached request is used or updated, this plugin will look\n * at the used Cache and remove any old or extra requests.\n *\n * When using `maxAgeSeconds`, requests may be used *once* after expiring\n * because the expiration clean up will not have occurred until *after* the\n * cached request has been used. If the request has a \"Date\" header, then\n * a light weight expiration check is performed and the request will not be\n * used immediately.\n *\n * When using `maxEntries`, the entry least-recently requested will be removed from the cache first.\n *\n * @memberof workbox.expiration\n */\nclass Plugin {\n  /**\n   * @param {Object} config\n   * @param {number} [config.maxEntries] The maximum number of entries to cache.\n   * Entries used the least will be removed as the maximum is reached.\n   * @param {number} [config.maxAgeSeconds] The maximum age of an entry before\n   * it's treated as stale and removed.\n   * @param {boolean} [config.purgeOnQuotaError] Whether to opt this cache in to\n   * automatic deletion if the available storage quota has been exceeded.\n   */\n  constructor(config = {}) {\n    if (process.env.NODE_ENV !== 'production') {\n      if (!(config.maxEntries || config.maxAgeSeconds)) {\n        throw new WorkboxError('max-entries-or-age-required', {\n          moduleName: 'workbox-expiration',\n          className: 'Plugin',\n          funcName: 'constructor',\n        });\n      }\n\n      if (config.maxEntries) {\n        assert.isType(config.maxEntries, 'number', {\n          moduleName: 'workbox-expiration',\n          className: 'Plugin',\n          funcName: 'constructor',\n          paramName: 'config.maxEntries',\n        });\n      }\n\n      if (config.maxAgeSeconds) {\n        assert.isType(config.maxAgeSeconds, 'number', {\n          moduleName: 'workbox-expiration',\n          className: 'Plugin',\n          funcName: 'constructor',\n          paramName: 'config.maxAgeSeconds',\n        });\n      }\n    }\n\n    this._config = config;\n    this._maxAgeSeconds = config.maxAgeSeconds;\n    this._cacheExpirations = new Map();\n\n    if (config.purgeOnQuotaError) {\n      registerQuotaErrorCallback(() => this.deleteCacheAndMetadata());\n    }\n  }\n\n  /**\n   * A simple helper method to return a CacheExpiration instance for a given\n   * cache name.\n   *\n   * @param {string} cacheName\n   * @return {CacheExpiration}\n   *\n   * @private\n   */\n  _getCacheExpiration(cacheName) {\n    if (cacheName === cacheNames.getRuntimeName()) {\n      throw new WorkboxError('expire-custom-caches-only');\n    }\n\n    let cacheExpiration = this._cacheExpirations.get(cacheName);\n    if (!cacheExpiration) {\n      cacheExpiration = new CacheExpiration(cacheName, this._config);\n      this._cacheExpirations.set(cacheName, cacheExpiration);\n    }\n    return cacheExpiration;\n  }\n\n  /**\n   * A \"lifecycle\" callback that will be triggered automatically by the\n   * `workbox.strategies` handlers when a `Response` is about to be returned\n   * from a [Cache](https://developer.mozilla.org/en-US/docs/Web/API/Cache) to\n   * the handler. It allows the `Response` to be inspected for freshness and\n   * prevents it from being used if the `Response`'s `Date` header value is\n   * older than the configured `maxAgeSeconds`.\n   *\n   * @param {Object} options\n   * @param {string} options.cacheName Name of the cache the response is in.\n   * @param {Response} options.cachedResponse The `Response` object that's been\n   *     read from a cache and whose freshness should be checked.\n   * @return {Response} Either the `cachedResponse`, if it's\n   *     fresh, or `null` if the `Response` is older than `maxAgeSeconds`.\n   *\n   * @private\n   */\n  cachedResponseWillBeUsed({event, request, cacheName, cachedResponse}) {\n    if (!cachedResponse) {\n      return null;\n    }\n\n    let isFresh = this._isResponseDateFresh(cachedResponse);\n\n    // Expire entries to ensure that even if the expiration date has\n    // expired, it'll only be used once.\n    const cacheExpiration = this._getCacheExpiration(cacheName);\n    cacheExpiration.expireEntries();\n\n    // Update the metadata for the request URL to the current timestamp,\n    // but don't `await` it as we don't want to block the response.\n    const updateTimestampDone = cacheExpiration.updateTimestamp(request.url);\n    if (event) {\n      try {\n        event.waitUntil(updateTimestampDone);\n      } catch (error) {\n        if (process.env.NODE_ENV !== 'production') {\n          logger.warn(`Unable to ensure service worker stays alive when ` +\n            `updating cache entry for '${getFriendlyURL(event.request.url)}'.`);\n        }\n      }\n    }\n\n    return isFresh ? cachedResponse : null;\n  }\n\n  /**\n   * @param {Response} cachedResponse\n   * @return {boolean}\n   *\n   * @private\n   */\n  _isResponseDateFresh(cachedResponse) {\n    if (!this._maxAgeSeconds) {\n      // We aren't expiring by age, so return true, it's fresh\n      return true;\n    }\n\n    // Check if the 'date' header will suffice a quick expiration check.\n    // See https://github.com/GoogleChromeLabs/sw-toolbox/issues/164 for\n    // discussion.\n    const dateHeaderTimestamp = this._getDateHeaderTimestamp(cachedResponse);\n    if (dateHeaderTimestamp === null) {\n      // Unable to parse date, so assume it's fresh.\n      return true;\n    }\n\n    // If we have a valid headerTime, then our response is fresh iff the\n    // headerTime plus maxAgeSeconds is greater than the current time.\n    const now = Date.now();\n    return dateHeaderTimestamp >= now - (this._maxAgeSeconds * 1000);\n  }\n\n  /**\n   * This method will extract the data header and parse it into a useful\n   * value.\n   *\n   * @param {Response} cachedResponse\n   * @return {number}\n   *\n   * @private\n   */\n  _getDateHeaderTimestamp(cachedResponse) {\n    if (!cachedResponse.headers.has('date')) {\n      return null;\n    }\n\n    const dateHeader = cachedResponse.headers.get('date');\n    const parsedDate = new Date(dateHeader);\n    const headerTime = parsedDate.getTime();\n\n    // If the Date header was invalid for some reason, parsedDate.getTime()\n    // will return NaN.\n    if (isNaN(headerTime)) {\n      return null;\n    }\n\n    return headerTime;\n  }\n\n  /**\n   * A \"lifecycle\" callback that will be triggered automatically by the\n   * `workbox.strategies` handlers when an entry is added to a cache.\n   *\n   * @param {Object} options\n   * @param {string} options.cacheName Name of the cache that was updated.\n   * @param {string} options.request The Request for the cached entry.\n   *\n   * @private\n   */\n  async cacheDidUpdate({cacheName, request}) {\n    if (process.env.NODE_ENV !== 'production') {\n      assert.isType(cacheName, 'string', {\n        moduleName: 'workbox-expiration',\n        className: 'Plugin',\n        funcName: 'cacheDidUpdate',\n        paramName: 'cacheName',\n      });\n      assert.isInstance(request, Request, {\n        moduleName: 'workbox-expiration',\n        className: 'Plugin',\n        funcName: 'cacheDidUpdate',\n        paramName: 'request',\n      });\n    }\n\n    const cacheExpiration = this._getCacheExpiration(cacheName);\n    await cacheExpiration.updateTimestamp(request.url);\n    await cacheExpiration.expireEntries();\n  }\n\n\n  /**\n   * This is a helper method that performs two operations:\n   *\n   * - Deletes *all* the underlying Cache instances associated with this plugin\n   * instance, by calling caches.delete() on your behalf.\n   * - Deletes the metadata from IndexedDB used to keep track of expiration\n   * details for each Cache instance.\n   *\n   * When using cache expiration, calling this method is preferable to calling\n   * `caches.delete()` directly, since this will ensure that the IndexedDB\n   * metadata is also cleanly removed and open IndexedDB instances are deleted.\n   *\n   * Note that if you're *not* using cache expiration for a given cache, calling\n   * `caches.delete()` and passing in the cache's name should be sufficient.\n   * There is no Workbox-specific method needed for cleanup in that case.\n   */\n  async deleteCacheAndMetadata() {\n    // Do this one at a time instead of all at once via `Promise.all()` to\n    // reduce the chance of inconsistency if a promise rejects.\n    for (const [cacheName, cacheExpiration] of this._cacheExpirations) {\n      await caches.delete(cacheName);\n      await cacheExpiration.delete();\n    }\n\n    // Reset this._cacheExpirations to its initial state.\n    this._cacheExpirations = new Map();\n  }\n}\n\nexport {Plugin};\n"],"names":["self","_","e","DB_NAME","OBJECT_STORE_NAME","normalizeURL","unNormalizedUrl","url","URL","location","hash","href","CacheTimestampsModel","constructor","cacheName","_cacheName","_db","DBWrapper","onupgradeneeded","event","this","_handleUpgrade","objStore","target","result","createObjectStore","keyPath","createIndex","unique","deleteDatabase","timestamp","put","id","_getId","get","minTimestamp","maxCount","entriesToDelete","transaction","txn","done","store","objectStore","entriesNotDeletedCount","index","openCursor","onsuccess","cursor","value","push","continue","urlsDeleted","entry","delete","CacheExpiration","config","_isRunning","_rerunRequested","_maxEntries","maxEntries","_maxAgeSeconds","maxAgeSeconds","_timestampModel","Date","now","undefined","urlsExpired","expireEntries","cache","caches","open","setTimestamp","getTimestamp","Infinity","_config","_cacheExpirations","Map","purgeOnQuotaError","registerQuotaErrorCallback","deleteCacheAndMetadata","_getCacheExpiration","cacheNames","getRuntimeName","WorkboxError","cacheExpiration","set","cachedResponseWillBeUsed","request","cachedResponse","isFresh","_isResponseDateFresh","updateTimestampDone","updateTimestamp","waitUntil","error","dateHeaderTimestamp","_getDateHeaderTimestamp","headers","has","dateHeader","headerTime","getTime","isNaN"],"mappings":"yFAAA,IAAIA,KAAK,6BAA6BC,IAAI,MAAMC,ICahD,MAAMC,EAAU,qBACVC,EAAoB,gBAEpBC,EAAgBC,UACdC,EAAM,IAAIC,IAAIF,EAAiBG,iBACrCF,EAAIG,KAAO,GAEJH,EAAII,MASb,MAAMC,EAOJC,YAAYC,QACLC,EAAaD,OAEbE,EAAM,IAAIC,YAAUd,EAAS,EAAG,CACnCe,gBAAkBC,GAAUC,KAAKC,EAAeF,KAWpDE,EAAeF,SAOPG,EANKH,EAAMI,OAAOC,OAMJC,kBAAkBrB,EAAmB,CAACsB,QAAS,OAKnEJ,EAASK,YAAY,YAAa,YAAa,CAACC,QAAQ,IACxDN,EAASK,YAAY,YAAa,YAAa,CAACC,QAAQ,IAIxDC,iBAAeT,KAAKL,sBASHR,EAAKuB,GACtBvB,EAAMF,EAAaE,SAEba,KAAKJ,EAAIe,IAAI3B,EAAmB,CACpCG,IAAAA,EACAuB,UAAAA,EACAhB,UAAWM,KAAKL,EAIhBiB,GAAIZ,KAAKa,EAAO1B,wBAYDA,gBACGa,KAAKJ,EAAIkB,IAAI9B,EAAmBgB,KAAKa,EAAO1B,KACnDuB,8BAaKK,EAAcC,SAC1BC,QAAwBjB,KAAKJ,EAAIsB,YACnClC,EAAmB,YAAa,CAACmC,EAAKC,WAC9BC,EAAQF,EAAIG,YAAYtC,GACxBiC,EAAkB,OACpBM,EAAyB,EAE7BF,EAAMG,MAAM,aACPC,WAAW,KAAM,QACjBC,UAAY,GAAEvB,OAAAA,YACPwB,EAASxB,EAAOC,UAClBuB,EAAQ,OACJvB,EAASuB,EAAOC,MAGlBxB,EAAOV,YAAcM,KAAKL,IAGvBoB,GAAgBX,EAAOM,UAAYK,GACnCC,GAAYO,GAA0BP,EAUzCC,EAAgBY,KAAKF,EAAOC,OAE5BL,KAGJI,EAAOG,gBAEPV,EAAKH,OASbc,EAAc,OACf,MAAMC,KAASf,QACZjB,KAAKJ,EAAIqC,OAAOjD,EAAmBgD,EAAMpB,IAC/CmB,EAAYF,KAAKG,EAAM7C,YAGlB4C,EAWTlB,EAAO1B,UAIEa,KAAKL,EAAa,IAAMV,EAAaE,IC9JhD,MAAM+C,EAYJzC,YAAYC,EAAWyC,EAAS,SAwCzBC,GAAa,OACbC,GAAkB,OAClBC,EAAcH,EAAOI,gBACrBC,EAAiBL,EAAOM,mBACxB9C,EAAaD,OACbgD,EAAkB,IAAIlD,EAAqBE,4BAO5CM,KAAKoC,mBACFC,GAAkB,QAGpBD,GAAa,QAEZrB,EAAef,KAAKwC,EACtBG,KAAKC,MAA+B,IAAtB5C,KAAKwC,OAAyBK,EAE1CC,QAAoB9C,KAAK0C,EAAgBK,cAC3ChC,EAAcf,KAAKsC,GAGjBU,QAAcC,OAAOC,KAAKlD,KAAKL,OAChC,MAAMR,KAAO2D,QACVE,EAAMf,OAAO9C,QAmBhBiD,GAAa,EACdpC,KAAKqC,SACFA,GAAkB,OAClBU,uCAWa5D,SAUda,KAAK0C,EAAgBS,aAAahE,EAAKwD,KAAKC,0BAcjCzD,gBAUOa,KAAK0C,EAAgBU,aAAajE,GAClCwD,KAAKC,MAA+B,IAAtB5C,KAAKwC,sBAWtCH,GAAkB,QACjBrC,KAAK0C,EAAgBK,cAAcM,EAAAA,wCCjJ7C,MAUE5D,YAAY0C,EAAS,SA6BdmB,EAAUnB,OACVK,EAAiBL,EAAOM,mBACxBc,EAAoB,IAAIC,IAEzBrB,EAAOsB,mBACTC,6BAA2B,IAAM1D,KAAK2D,0BAa1CC,EAAoBlE,MACdA,IAAcmE,aAAWC,uBACrB,IAAIC,eAAa,iCAGrBC,EAAkBhE,KAAKuD,EAAkBzC,IAAIpB,UAC5CsE,IACHA,EAAkB,IAAI9B,EAAgBxC,EAAWM,KAAKsD,QACjDC,EAAkBU,IAAIvE,EAAWsE,IAEjCA,EAoBTE,0BAAyBnE,MAACA,EAADoE,QAAQA,EAARzE,UAAiBA,EAAjB0E,eAA4BA,QAC9CA,SACI,SAGLC,EAAUrE,KAAKsE,EAAqBF,SAIlCJ,EAAkBhE,KAAK4D,EAAoBlE,GACjDsE,EAAgBjB,sBAIVwB,EAAsBP,EAAgBQ,gBAAgBL,EAAQhF,QAChEY,MAEAA,EAAM0E,UAAUF,GAChB,MAAOG,WAQJL,EAAUD,EAAiB,KASpCE,EAAqBF,OACdpE,KAAKwC,SAED,QAMHmC,EAAsB3E,KAAK4E,EAAwBR,UAC7B,OAAxBO,GAQGA,GADKhC,KAAKC,MAC0C,IAAtB5C,KAAKwC,EAY5CoC,EAAwBR,OACjBA,EAAeS,QAAQC,IAAI,eACvB,WAGHC,EAAaX,EAAeS,QAAQ/D,IAAI,QAExCkE,EADa,IAAIrC,KAAKoC,GACEE,iBAI1BC,MAAMF,GACD,KAGFA,wBAaYtF,UAACA,EAADyE,QAAYA,UAgBzBH,EAAkBhE,KAAK4D,EAAoBlE,SAC3CsE,EAAgBQ,gBAAgBL,EAAQhF,WACxC6E,EAAgBjB,mDAuBjB,MAAOrD,EAAWsE,KAAoBhE,KAAKuD,QACxCN,OAAOhB,OAAOvC,SACdsE,EAAgB/B,cAInBsB,EAAoB,IAAIC"}
\ No newline at end of file
diff --git a/public/javascripts/workbox/workbox-routing.dev.js b/public/javascripts/workbox/workbox-routing.dev.js
deleted file mode 100644
index b3acf069a4d..00000000000
--- a/public/javascripts/workbox/workbox-routing.dev.js
+++ /dev/null
@@ -1,1020 +0,0 @@
-this.workbox = this.workbox || {};
-this.workbox.routing = (function (exports, assert_mjs, logger_mjs, cacheNames_mjs, WorkboxError_mjs, getFriendlyURL_mjs) {
-  'use strict';
-
-  try {
-    self['workbox:routing:4.3.1'] && _();
-  } catch (e) {} // eslint-disable-line
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  /**
-   * The default HTTP method, 'GET', used when there's no specific method
-   * configured for a route.
-   *
-   * @type {string}
-   *
-   * @private
-   */
-
-  const defaultMethod = 'GET';
-  /**
-   * The list of valid HTTP methods associated with requests that could be routed.
-   *
-   * @type {Array<string>}
-   *
-   * @private
-   */
-
-  const validMethods = ['DELETE', 'GET', 'HEAD', 'PATCH', 'POST', 'PUT'];
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  /**
-   * @param {function()|Object} handler Either a function, or an object with a
-   * 'handle' method.
-   * @return {Object} An object with a handle method.
-   *
-   * @private
-   */
-
-  const normalizeHandler = handler => {
-    if (handler && typeof handler === 'object') {
-      {
-        assert_mjs.assert.hasMethod(handler, 'handle', {
-          moduleName: 'workbox-routing',
-          className: 'Route',
-          funcName: 'constructor',
-          paramName: 'handler'
-        });
-      }
-
-      return handler;
-    } else {
-      {
-        assert_mjs.assert.isType(handler, 'function', {
-          moduleName: 'workbox-routing',
-          className: 'Route',
-          funcName: 'constructor',
-          paramName: 'handler'
-        });
-      }
-
-      return {
-        handle: handler
-      };
-    }
-  };
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  /**
-   * A `Route` consists of a pair of callback functions, "match" and "handler".
-   * The "match" callback determine if a route should be used to "handle" a
-   * request by returning a non-falsy value if it can. The "handler" callback
-   * is called when there is a match and should return a Promise that resolves
-   * to a `Response`.
-   *
-   * @memberof workbox.routing
-   */
-
-  class Route {
-    /**
-     * Constructor for Route class.
-     *
-     * @param {workbox.routing.Route~matchCallback} match
-     * A callback function that determines whether the route matches a given
-     * `fetch` event by returning a non-falsy value.
-     * @param {workbox.routing.Route~handlerCallback} handler A callback
-     * function that returns a Promise resolving to a Response.
-     * @param {string} [method='GET'] The HTTP method to match the Route
-     * against.
-     */
-    constructor(match, handler, method) {
-      {
-        assert_mjs.assert.isType(match, 'function', {
-          moduleName: 'workbox-routing',
-          className: 'Route',
-          funcName: 'constructor',
-          paramName: 'match'
-        });
-
-        if (method) {
-          assert_mjs.assert.isOneOf(method, validMethods, {
-            paramName: 'method'
-          });
-        }
-      } // These values are referenced directly by Router so cannot be
-      // altered by minifification.
-
-
-      this.handler = normalizeHandler(handler);
-      this.match = match;
-      this.method = method || defaultMethod;
-    }
-
-  }
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  /**
-   * NavigationRoute makes it easy to create a [Route]{@link
-   * workbox.routing.Route} that matches for browser
-   * [navigation requests]{@link https://developers.google.com/web/fundamentals/primers/service-workers/high-performance-loading#first_what_are_navigation_requests}.
-   *
-   * It will only match incoming Requests whose
-   * [`mode`]{@link https://fetch.spec.whatwg.org/#concept-request-mode}
-   * is set to `navigate`.
-   *
-   * You can optionally only apply this route to a subset of navigation requests
-   * by using one or both of the `blacklist` and `whitelist` parameters.
-   *
-   * @memberof workbox.routing
-   * @extends workbox.routing.Route
-   */
-
-  class NavigationRoute extends Route {
-    /**
-     * If both `blacklist` and `whiltelist` are provided, the `blacklist` will
-     * take precedence and the request will not match this route.
-     *
-     * The regular expressions in `whitelist` and `blacklist`
-     * are matched against the concatenated
-     * [`pathname`]{@link https://developer.mozilla.org/en-US/docs/Web/API/HTMLHyperlinkElementUtils/pathname}
-     * and [`search`]{@link https://developer.mozilla.org/en-US/docs/Web/API/HTMLHyperlinkElementUtils/search}
-     * portions of the requested URL.
-     *
-     * @param {workbox.routing.Route~handlerCallback} handler A callback
-     * function that returns a Promise resulting in a Response.
-     * @param {Object} options
-     * @param {Array<RegExp>} [options.blacklist] If any of these patterns match,
-     * the route will not handle the request (even if a whitelist RegExp matches).
-     * @param {Array<RegExp>} [options.whitelist=[/./]] If any of these patterns
-     * match the URL's pathname and search parameter, the route will handle the
-     * request (assuming the blacklist doesn't match).
-     */
-    constructor(handler, {
-      whitelist = [/./],
-      blacklist = []
-    } = {}) {
-      {
-        assert_mjs.assert.isArrayOfClass(whitelist, RegExp, {
-          moduleName: 'workbox-routing',
-          className: 'NavigationRoute',
-          funcName: 'constructor',
-          paramName: 'options.whitelist'
-        });
-        assert_mjs.assert.isArrayOfClass(blacklist, RegExp, {
-          moduleName: 'workbox-routing',
-          className: 'NavigationRoute',
-          funcName: 'constructor',
-          paramName: 'options.blacklist'
-        });
-      }
-
-      super(options => this._match(options), handler);
-      this._whitelist = whitelist;
-      this._blacklist = blacklist;
-    }
-    /**
-     * Routes match handler.
-     *
-     * @param {Object} options
-     * @param {URL} options.url
-     * @param {Request} options.request
-     * @return {boolean}
-     *
-     * @private
-     */
-
-
-    _match({
-      url,
-      request
-    }) {
-      if (request.mode !== 'navigate') {
-        return false;
-      }
-
-      const pathnameAndSearch = url.pathname + url.search;
-
-      for (const regExp of this._blacklist) {
-        if (regExp.test(pathnameAndSearch)) {
-          {
-            logger_mjs.logger.log(`The navigation route is not being used, since the ` + `URL matches this blacklist pattern: ${regExp}`);
-          }
-
-          return false;
-        }
-      }
-
-      if (this._whitelist.some(regExp => regExp.test(pathnameAndSearch))) {
-        {
-          logger_mjs.logger.debug(`The navigation route is being used.`);
-        }
-
-        return true;
-      }
-
-      {
-        logger_mjs.logger.log(`The navigation route is not being used, since the URL ` + `being navigated to doesn't match the whitelist.`);
-      }
-
-      return false;
-    }
-
-  }
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  /**
-   * RegExpRoute makes it easy to create a regular expression based
-   * [Route]{@link workbox.routing.Route}.
-   *
-   * For same-origin requests the RegExp only needs to match part of the URL. For
-   * requests against third-party servers, you must define a RegExp that matches
-   * the start of the URL.
-   *
-   * [See the module docs for info.]{@link https://developers.google.com/web/tools/workbox/modules/workbox-routing}
-   *
-   * @memberof workbox.routing
-   * @extends workbox.routing.Route
-   */
-
-  class RegExpRoute extends Route {
-    /**
-     * If the regulard expression contains
-     * [capture groups]{@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp#grouping-back-references},
-     * th ecaptured values will be passed to the
-     * [handler's]{@link workbox.routing.Route~handlerCallback} `params`
-     * argument.
-     *
-     * @param {RegExp} regExp The regular expression to match against URLs.
-     * @param {workbox.routing.Route~handlerCallback} handler A callback
-     * function that returns a Promise resulting in a Response.
-     * @param {string} [method='GET'] The HTTP method to match the Route
-     * against.
-     */
-    constructor(regExp, handler, method) {
-      {
-        assert_mjs.assert.isInstance(regExp, RegExp, {
-          moduleName: 'workbox-routing',
-          className: 'RegExpRoute',
-          funcName: 'constructor',
-          paramName: 'pattern'
-        });
-      }
-
-      const match = ({
-        url
-      }) => {
-        const result = regExp.exec(url.href); // Return null immediately if there's no match.
-
-        if (!result) {
-          return null;
-        } // Require that the match start at the first character in the URL string
-        // if it's a cross-origin request.
-        // See https://github.com/GoogleChrome/workbox/issues/281 for the context
-        // behind this behavior.
-
-
-        if (url.origin !== location.origin && result.index !== 0) {
-          {
-            logger_mjs.logger.debug(`The regular expression '${regExp}' only partially matched ` + `against the cross-origin URL '${url}'. RegExpRoute's will only ` + `handle cross-origin requests if they match the entire URL.`);
-          }
-
-          return null;
-        } // If the route matches, but there aren't any capture groups defined, then
-        // this will return [], which is truthy and therefore sufficient to
-        // indicate a match.
-        // If there are capture groups, then it will return their values.
-
-
-        return result.slice(1);
-      };
-
-      super(match, handler, method);
-    }
-
-  }
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  /**
-   * The Router can be used to process a FetchEvent through one or more
-   * [Routes]{@link workbox.routing.Route} responding  with a Request if
-   * a matching route exists.
-   *
-   * If no route matches a given a request, the Router will use a "default"
-   * handler if one is defined.
-   *
-   * Should the matching Route throw an error, the Router will use a "catch"
-   * handler if one is defined to gracefully deal with issues and respond with a
-   * Request.
-   *
-   * If a request matches multiple routes, the **earliest** registered route will
-   * be used to respond to the request.
-   *
-   * @memberof workbox.routing
-   */
-
-  class Router {
-    /**
-     * Initializes a new Router.
-     */
-    constructor() {
-      this._routes = new Map();
-    }
-    /**
-     * @return {Map<string, Array<workbox.routing.Route>>} routes A `Map` of HTTP
-     * method name ('GET', etc.) to an array of all the corresponding `Route`
-     * instances that are registered.
-     */
-
-
-    get routes() {
-      return this._routes;
-    }
-    /**
-     * Adds a fetch event listener to respond to events when a route matches
-     * the event's request.
-     */
-
-
-    addFetchListener() {
-      self.addEventListener('fetch', event => {
-        const {
-          request
-        } = event;
-        const responsePromise = this.handleRequest({
-          request,
-          event
-        });
-
-        if (responsePromise) {
-          event.respondWith(responsePromise);
-        }
-      });
-    }
-    /**
-     * Adds a message event listener for URLs to cache from the window.
-     * This is useful to cache resources loaded on the page prior to when the
-     * service worker started controlling it.
-     *
-     * The format of the message data sent from the window should be as follows.
-     * Where the `urlsToCache` array may consist of URL strings or an array of
-     * URL string + `requestInit` object (the same as you'd pass to `fetch()`).
-     *
-     * ```
-     * {
-     *   type: 'CACHE_URLS',
-     *   payload: {
-     *     urlsToCache: [
-     *       './script1.js',
-     *       './script2.js',
-     *       ['./script3.js', {mode: 'no-cors'}],
-     *     ],
-     *   },
-     * }
-     * ```
-     */
-
-
-    addCacheListener() {
-      self.addEventListener('message', async event => {
-        if (event.data && event.data.type === 'CACHE_URLS') {
-          const {
-            payload
-          } = event.data;
-
-          {
-            logger_mjs.logger.debug(`Caching URLs from the window`, payload.urlsToCache);
-          }
-
-          const requestPromises = Promise.all(payload.urlsToCache.map(entry => {
-            if (typeof entry === 'string') {
-              entry = [entry];
-            }
-
-            const request = new Request(...entry);
-            return this.handleRequest({
-              request
-            });
-          }));
-          event.waitUntil(requestPromises); // If a MessageChannel was used, reply to the message on success.
-
-          if (event.ports && event.ports[0]) {
-            await requestPromises;
-            event.ports[0].postMessage(true);
-          }
-        }
-      });
-    }
-    /**
-     * Apply the routing rules to a FetchEvent object to get a Response from an
-     * appropriate Route's handler.
-     *
-     * @param {Object} options
-     * @param {Request} options.request The request to handle (this is usually
-     *     from a fetch event, but it does not have to be).
-     * @param {FetchEvent} [options.event] The event that triggered the request,
-     *     if applicable.
-     * @return {Promise<Response>|undefined} A promise is returned if a
-     *     registered route can handle the request. If there is no matching
-     *     route and there's no `defaultHandler`, `undefined` is returned.
-     */
-
-
-    handleRequest({
-      request,
-      event
-    }) {
-      {
-        assert_mjs.assert.isInstance(request, Request, {
-          moduleName: 'workbox-routing',
-          className: 'Router',
-          funcName: 'handleRequest',
-          paramName: 'options.request'
-        });
-      }
-
-      const url = new URL(request.url, location);
-
-      if (!url.protocol.startsWith('http')) {
-        {
-          logger_mjs.logger.debug(`Workbox Router only supports URLs that start with 'http'.`);
-        }
-
-        return;
-      }
-
-      let {
-        params,
-        route
-      } = this.findMatchingRoute({
-        url,
-        request,
-        event
-      });
-      let handler = route && route.handler;
-      let debugMessages = [];
-
-      {
-        if (handler) {
-          debugMessages.push([`Found a route to handle this request:`, route]);
-
-          if (params) {
-            debugMessages.push([`Passing the following params to the route's handler:`, params]);
-          }
-        }
-      } // If we don't have a handler because there was no matching route, then
-      // fall back to defaultHandler if that's defined.
-
-
-      if (!handler && this._defaultHandler) {
-        {
-          debugMessages.push(`Failed to find a matching route. Falling ` + `back to the default handler.`); // This is used for debugging in logs in the case of an error.
-
-          route = '[Default Handler]';
-        }
-
-        handler = this._defaultHandler;
-      }
-
-      if (!handler) {
-        {
-          // No handler so Workbox will do nothing. If logs is set of debug
-          // i.e. verbose, we should print out this information.
-          logger_mjs.logger.debug(`No route found for: ${getFriendlyURL_mjs.getFriendlyURL(url)}`);
-        }
-
-        return;
-      }
-
-      {
-        // We have a handler, meaning Workbox is going to handle the route.
-        // print the routing details to the console.
-        logger_mjs.logger.groupCollapsed(`Router is responding to: ${getFriendlyURL_mjs.getFriendlyURL(url)}`);
-        debugMessages.forEach(msg => {
-          if (Array.isArray(msg)) {
-            logger_mjs.logger.log(...msg);
-          } else {
-            logger_mjs.logger.log(msg);
-          }
-        }); // The Request and Response objects contains a great deal of information,
-        // hide it under a group in case developers want to see it.
-
-        logger_mjs.logger.groupCollapsed(`View request details here.`);
-        logger_mjs.logger.log(request);
-        logger_mjs.logger.groupEnd();
-        logger_mjs.logger.groupEnd();
-      } // Wrap in try and catch in case the handle method throws a synchronous
-      // error. It should still callback to the catch handler.
-
-
-      let responsePromise;
-
-      try {
-        responsePromise = handler.handle({
-          url,
-          request,
-          event,
-          params
-        });
-      } catch (err) {
-        responsePromise = Promise.reject(err);
-      }
-
-      if (responsePromise && this._catchHandler) {
-        responsePromise = responsePromise.catch(err => {
-          {
-            // Still include URL here as it will be async from the console group
-            // and may not make sense without the URL
-            logger_mjs.logger.groupCollapsed(`Error thrown when responding to: ` + ` ${getFriendlyURL_mjs.getFriendlyURL(url)}. Falling back to Catch Handler.`);
-            logger_mjs.logger.error(`Error thrown by:`, route);
-            logger_mjs.logger.error(err);
-            logger_mjs.logger.groupEnd();
-          }
-
-          return this._catchHandler.handle({
-            url,
-            event,
-            err
-          });
-        });
-      }
-
-      return responsePromise;
-    }
-    /**
-     * Checks a request and URL (and optionally an event) against the list of
-     * registered routes, and if there's a match, returns the corresponding
-     * route along with any params generated by the match.
-     *
-     * @param {Object} options
-     * @param {URL} options.url
-     * @param {Request} options.request The request to match.
-     * @param {FetchEvent} [options.event] The corresponding event (unless N/A).
-     * @return {Object} An object with `route` and `params` properties.
-     *     They are populated if a matching route was found or `undefined`
-     *     otherwise.
-     */
-
-
-    findMatchingRoute({
-      url,
-      request,
-      event
-    }) {
-      {
-        assert_mjs.assert.isInstance(url, URL, {
-          moduleName: 'workbox-routing',
-          className: 'Router',
-          funcName: 'findMatchingRoute',
-          paramName: 'options.url'
-        });
-        assert_mjs.assert.isInstance(request, Request, {
-          moduleName: 'workbox-routing',
-          className: 'Router',
-          funcName: 'findMatchingRoute',
-          paramName: 'options.request'
-        });
-      }
-
-      const routes = this._routes.get(request.method) || [];
-
-      for (const route of routes) {
-        let params;
-        let matchResult = route.match({
-          url,
-          request,
-          event
-        });
-
-        if (matchResult) {
-          if (Array.isArray(matchResult) && matchResult.length > 0) {
-            // Instead of passing an empty array in as params, use undefined.
-            params = matchResult;
-          } else if (matchResult.constructor === Object && Object.keys(matchResult).length > 0) {
-            // Instead of passing an empty object in as params, use undefined.
-            params = matchResult;
-          } // Return early if have a match.
-
-
-          return {
-            route,
-            params
-          };
-        }
-      } // If no match was found above, return and empty object.
-
-
-      return {};
-    }
-    /**
-     * Define a default `handler` that's called when no routes explicitly
-     * match the incoming request.
-     *
-     * Without a default handler, unmatched requests will go against the
-     * network as if there were no service worker present.
-     *
-     * @param {workbox.routing.Route~handlerCallback} handler A callback
-     * function that returns a Promise resulting in a Response.
-     */
-
-
-    setDefaultHandler(handler) {
-      this._defaultHandler = normalizeHandler(handler);
-    }
-    /**
-     * If a Route throws an error while handling a request, this `handler`
-     * will be called and given a chance to provide a response.
-     *
-     * @param {workbox.routing.Route~handlerCallback} handler A callback
-     * function that returns a Promise resulting in a Response.
-     */
-
-
-    setCatchHandler(handler) {
-      this._catchHandler = normalizeHandler(handler);
-    }
-    /**
-     * Registers a route with the router.
-     *
-     * @param {workbox.routing.Route} route The route to register.
-     */
-
-
-    registerRoute(route) {
-      {
-        assert_mjs.assert.isType(route, 'object', {
-          moduleName: 'workbox-routing',
-          className: 'Router',
-          funcName: 'registerRoute',
-          paramName: 'route'
-        });
-        assert_mjs.assert.hasMethod(route, 'match', {
-          moduleName: 'workbox-routing',
-          className: 'Router',
-          funcName: 'registerRoute',
-          paramName: 'route'
-        });
-        assert_mjs.assert.isType(route.handler, 'object', {
-          moduleName: 'workbox-routing',
-          className: 'Router',
-          funcName: 'registerRoute',
-          paramName: 'route'
-        });
-        assert_mjs.assert.hasMethod(route.handler, 'handle', {
-          moduleName: 'workbox-routing',
-          className: 'Router',
-          funcName: 'registerRoute',
-          paramName: 'route.handler'
-        });
-        assert_mjs.assert.isType(route.method, 'string', {
-          moduleName: 'workbox-routing',
-          className: 'Router',
-          funcName: 'registerRoute',
-          paramName: 'route.method'
-        });
-      }
-
-      if (!this._routes.has(route.method)) {
-        this._routes.set(route.method, []);
-      } // Give precedence to all of the earlier routes by adding this additional
-      // route to the end of the array.
-
-
-      this._routes.get(route.method).push(route);
-    }
-    /**
-     * Unregisters a route with the router.
-     *
-     * @param {workbox.routing.Route} route The route to unregister.
-     */
-
-
-    unregisterRoute(route) {
-      if (!this._routes.has(route.method)) {
-        throw new WorkboxError_mjs.WorkboxError('unregister-route-but-not-found-with-method', {
-          method: route.method
-        });
-      }
-
-      const routeIndex = this._routes.get(route.method).indexOf(route);
-
-      if (routeIndex > -1) {
-        this._routes.get(route.method).splice(routeIndex, 1);
-      } else {
-        throw new WorkboxError_mjs.WorkboxError('unregister-route-route-not-registered');
-      }
-    }
-
-  }
-
-  /*
-    Copyright 2019 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  let defaultRouter;
-  /**
-   * Creates a new, singleton Router instance if one does not exist. If one
-   * does already exist, that instance is returned.
-   *
-   * @private
-   * @return {Router}
-   */
-
-  const getOrCreateDefaultRouter = () => {
-    if (!defaultRouter) {
-      defaultRouter = new Router(); // The helpers that use the default Router assume these listeners exist.
-
-      defaultRouter.addFetchListener();
-      defaultRouter.addCacheListener();
-    }
-
-    return defaultRouter;
-  };
-
-  /*
-    Copyright 2019 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  /**
-   * Registers a route that will return a precached file for a navigation
-   * request. This is useful for the
-   * [application shell pattern]{@link https://developers.google.com/web/fundamentals/architecture/app-shell}.
-   *
-   * When determining the URL of the precached HTML document, you will likely need
-   * to call `workbox.precaching.getCacheKeyForURL(originalUrl)`, to account for
-   * the fact that Workbox's precaching naming conventions often results in URL
-   * cache keys that contain extra revisioning info.
-   *
-   * This method will generate a
-   * [NavigationRoute]{@link workbox.routing.NavigationRoute}
-   * and call
-   * [Router.registerRoute()]{@link workbox.routing.Router#registerRoute} on a
-   * singleton Router instance.
-   *
-   * @param {string} cachedAssetUrl The cache key to use for the HTML file.
-   * @param {Object} [options]
-   * @param {string} [options.cacheName] Cache name to store and retrieve
-   * requests. Defaults to precache cache name provided by
-   * [workbox-core.cacheNames]{@link workbox.core.cacheNames}.
-   * @param {Array<RegExp>} [options.blacklist=[]] If any of these patterns
-   * match, the route will not handle the request (even if a whitelist entry
-   * matches).
-   * @param {Array<RegExp>} [options.whitelist=[/./]] If any of these patterns
-   * match the URL's pathname and search parameter, the route will handle the
-   * request (assuming the blacklist doesn't match).
-   * @return {workbox.routing.NavigationRoute} Returns the generated
-   * Route.
-   *
-   * @alias workbox.routing.registerNavigationRoute
-   */
-
-  const registerNavigationRoute = (cachedAssetUrl, options = {}) => {
-    {
-      assert_mjs.assert.isType(cachedAssetUrl, 'string', {
-        moduleName: 'workbox-routing',
-        funcName: 'registerNavigationRoute',
-        paramName: 'cachedAssetUrl'
-      });
-    }
-
-    const cacheName = cacheNames_mjs.cacheNames.getPrecacheName(options.cacheName);
-
-    const handler = async () => {
-      try {
-        const response = await caches.match(cachedAssetUrl, {
-          cacheName
-        });
-
-        if (response) {
-          return response;
-        } // This shouldn't normally happen, but there are edge cases:
-        // https://github.com/GoogleChrome/workbox/issues/1441
-
-
-        throw new Error(`The cache ${cacheName} did not have an entry for ` + `${cachedAssetUrl}.`);
-      } catch (error) {
-        // If there's either a cache miss, or the caches.match() call threw
-        // an exception, then attempt to fulfill the navigation request with
-        // a response from the network rather than leaving the user with a
-        // failed navigation.
-        {
-          logger_mjs.logger.debug(`Unable to respond to navigation request with ` + `cached response. Falling back to network.`, error);
-        } // This might still fail if the browser is offline...
-
-
-        return fetch(cachedAssetUrl);
-      }
-    };
-
-    const route = new NavigationRoute(handler, {
-      whitelist: options.whitelist,
-      blacklist: options.blacklist
-    });
-    const defaultRouter = getOrCreateDefaultRouter();
-    defaultRouter.registerRoute(route);
-    return route;
-  };
-
-  /*
-    Copyright 2019 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  /**
-   * Easily register a RegExp, string, or function with a caching
-   * strategy to a singleton Router instance.
-   *
-   * This method will generate a Route for you if needed and
-   * call [Router.registerRoute()]{@link
-   * workbox.routing.Router#registerRoute}.
-   *
-   * @param {
-   * RegExp|
-   * string|
-   * workbox.routing.Route~matchCallback|
-   * workbox.routing.Route
-   * } capture
-   * If the capture param is a `Route`, all other arguments will be ignored.
-   * @param {workbox.routing.Route~handlerCallback} handler A callback
-   * function that returns a Promise resulting in a Response.
-   * @param {string} [method='GET'] The HTTP method to match the Route
-   * against.
-   * @return {workbox.routing.Route} The generated `Route`(Useful for
-   * unregistering).
-   *
-   * @alias workbox.routing.registerRoute
-   */
-
-  const registerRoute = (capture, handler, method = 'GET') => {
-    let route;
-
-    if (typeof capture === 'string') {
-      const captureUrl = new URL(capture, location);
-
-      {
-        if (!(capture.startsWith('/') || capture.startsWith('http'))) {
-          throw new WorkboxError_mjs.WorkboxError('invalid-string', {
-            moduleName: 'workbox-routing',
-            funcName: 'registerRoute',
-            paramName: 'capture'
-          });
-        } // We want to check if Express-style wildcards are in the pathname only.
-        // TODO: Remove this log message in v4.
-
-
-        const valueToCheck = capture.startsWith('http') ? captureUrl.pathname : capture; // See https://github.com/pillarjs/path-to-regexp#parameters
-
-        const wildcards = '[*:?+]';
-
-        if (valueToCheck.match(new RegExp(`${wildcards}`))) {
-          logger_mjs.logger.debug(`The '$capture' parameter contains an Express-style wildcard ` + `character (${wildcards}). Strings are now always interpreted as ` + `exact matches; use a RegExp for partial or wildcard matches.`);
-        }
-      }
-
-      const matchCallback = ({
-        url
-      }) => {
-        {
-          if (url.pathname === captureUrl.pathname && url.origin !== captureUrl.origin) {
-            logger_mjs.logger.debug(`${capture} only partially matches the cross-origin URL ` + `${url}. This route will only handle cross-origin requests ` + `if they match the entire URL.`);
-          }
-        }
-
-        return url.href === captureUrl.href;
-      };
-
-      route = new Route(matchCallback, handler, method);
-    } else if (capture instanceof RegExp) {
-      route = new RegExpRoute(capture, handler, method);
-    } else if (typeof capture === 'function') {
-      route = new Route(capture, handler, method);
-    } else if (capture instanceof Route) {
-      route = capture;
-    } else {
-      throw new WorkboxError_mjs.WorkboxError('unsupported-route-type', {
-        moduleName: 'workbox-routing',
-        funcName: 'registerRoute',
-        paramName: 'capture'
-      });
-    }
-
-    const defaultRouter = getOrCreateDefaultRouter();
-    defaultRouter.registerRoute(route);
-    return route;
-  };
-
-  /*
-    Copyright 2019 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  /**
-   * If a Route throws an error while handling a request, this `handler`
-   * will be called and given a chance to provide a response.
-   *
-   * @param {workbox.routing.Route~handlerCallback} handler A callback
-   * function that returns a Promise resulting in a Response.
-   *
-   * @alias workbox.routing.setCatchHandler
-   */
-
-  const setCatchHandler = handler => {
-    const defaultRouter = getOrCreateDefaultRouter();
-    defaultRouter.setCatchHandler(handler);
-  };
-
-  /*
-    Copyright 2019 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  /**
-   * Define a default `handler` that's called when no routes explicitly
-   * match the incoming request.
-   *
-   * Without a default handler, unmatched requests will go against the
-   * network as if there were no service worker present.
-   *
-   * @param {workbox.routing.Route~handlerCallback} handler A callback
-   * function that returns a Promise resulting in a Response.
-   *
-   * @alias workbox.routing.setDefaultHandler
-   */
-
-  const setDefaultHandler = handler => {
-    const defaultRouter = getOrCreateDefaultRouter();
-    defaultRouter.setDefaultHandler(handler);
-  };
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-
-  {
-    assert_mjs.assert.isSWEnv('workbox-routing');
-  }
-
-  exports.NavigationRoute = NavigationRoute;
-  exports.RegExpRoute = RegExpRoute;
-  exports.registerNavigationRoute = registerNavigationRoute;
-  exports.registerRoute = registerRoute;
-  exports.Route = Route;
-  exports.Router = Router;
-  exports.setCatchHandler = setCatchHandler;
-  exports.setDefaultHandler = setDefaultHandler;
-
-  return exports;
-
-}({}, workbox.core._private, workbox.core._private, workbox.core._private, workbox.core._private, workbox.core._private));
-//# sourceMappingURL=workbox-routing.dev.js.map
diff --git a/public/javascripts/workbox/workbox-routing.dev.js.map b/public/javascripts/workbox/workbox-routing.dev.js.map
deleted file mode 100644
index 71071322411..00000000000
--- a/public/javascripts/workbox/workbox-routing.dev.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"workbox-routing.dev.js","sources":["../_version.mjs","../utils/constants.mjs","../utils/normalizeHandler.mjs","../Route.mjs","../NavigationRoute.mjs","../RegExpRoute.mjs","../Router.mjs","../utils/getOrCreateDefaultRouter.mjs","../registerNavigationRoute.mjs","../registerRoute.mjs","../setCatchHandler.mjs","../setDefaultHandler.mjs","../index.mjs"],"sourcesContent":["try{self['workbox:routing:4.3.1']&&_()}catch(e){}// eslint-disable-line","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport '../_version.mjs';\n\n/**\n * The default HTTP method, 'GET', used when there's no specific method\n * configured for a route.\n *\n * @type {string}\n *\n * @private\n */\nexport const defaultMethod = 'GET';\n\n/**\n * The list of valid HTTP methods associated with requests that could be routed.\n *\n * @type {Array<string>}\n *\n * @private\n */\nexport const validMethods = [\n  'DELETE',\n  'GET',\n  'HEAD',\n  'PATCH',\n  'POST',\n  'PUT',\n];\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {assert} from 'workbox-core/_private/assert.mjs';\nimport '../_version.mjs';\n\n/**\n * @param {function()|Object} handler Either a function, or an object with a\n * 'handle' method.\n * @return {Object} An object with a handle method.\n *\n * @private\n */\nexport const normalizeHandler = (handler) => {\n  if (handler && typeof handler === 'object') {\n    if (process.env.NODE_ENV !== 'production') {\n      assert.hasMethod(handler, 'handle', {\n        moduleName: 'workbox-routing',\n        className: 'Route',\n        funcName: 'constructor',\n        paramName: 'handler',\n      });\n    }\n    return handler;\n  } else {\n    if (process.env.NODE_ENV !== 'production') {\n      assert.isType(handler, 'function', {\n        moduleName: 'workbox-routing',\n        className: 'Route',\n        funcName: 'constructor',\n        paramName: 'handler',\n      });\n    }\n    return {handle: handler};\n  }\n};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {assert} from 'workbox-core/_private/assert.mjs';\n\nimport {defaultMethod, validMethods} from './utils/constants.mjs';\nimport {normalizeHandler} from './utils/normalizeHandler.mjs';\nimport './_version.mjs';\n\n/**\n * A `Route` consists of a pair of callback functions, \"match\" and \"handler\".\n * The \"match\" callback determine if a route should be used to \"handle\" a\n * request by returning a non-falsy value if it can. The \"handler\" callback\n * is called when there is a match and should return a Promise that resolves\n * to a `Response`.\n *\n * @memberof workbox.routing\n */\nclass Route {\n  /**\n   * Constructor for Route class.\n   *\n   * @param {workbox.routing.Route~matchCallback} match\n   * A callback function that determines whether the route matches a given\n   * `fetch` event by returning a non-falsy value.\n   * @param {workbox.routing.Route~handlerCallback} handler A callback\n   * function that returns a Promise resolving to a Response.\n   * @param {string} [method='GET'] The HTTP method to match the Route\n   * against.\n   */\n  constructor(match, handler, method) {\n    if (process.env.NODE_ENV !== 'production') {\n      assert.isType(match, 'function', {\n        moduleName: 'workbox-routing',\n        className: 'Route',\n        funcName: 'constructor',\n        paramName: 'match',\n      });\n\n      if (method) {\n        assert.isOneOf(method, validMethods, {paramName: 'method'});\n      }\n    }\n\n    // These values are referenced directly by Router so cannot be\n    // altered by minifification.\n    this.handler = normalizeHandler(handler);\n    this.match = match;\n    this.method = method || defaultMethod;\n  }\n}\n\nexport {Route};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {assert} from 'workbox-core/_private/assert.mjs';\nimport {logger} from 'workbox-core/_private/logger.mjs';\nimport {Route} from './Route.mjs';\nimport './_version.mjs';\n\n/**\n * NavigationRoute makes it easy to create a [Route]{@link\n * workbox.routing.Route} that matches for browser\n * [navigation requests]{@link https://developers.google.com/web/fundamentals/primers/service-workers/high-performance-loading#first_what_are_navigation_requests}.\n *\n * It will only match incoming Requests whose\n * [`mode`]{@link https://fetch.spec.whatwg.org/#concept-request-mode}\n * is set to `navigate`.\n *\n * You can optionally only apply this route to a subset of navigation requests\n * by using one or both of the `blacklist` and `whitelist` parameters.\n *\n * @memberof workbox.routing\n * @extends workbox.routing.Route\n */\nclass NavigationRoute extends Route {\n  /**\n   * If both `blacklist` and `whiltelist` are provided, the `blacklist` will\n   * take precedence and the request will not match this route.\n   *\n   * The regular expressions in `whitelist` and `blacklist`\n   * are matched against the concatenated\n   * [`pathname`]{@link https://developer.mozilla.org/en-US/docs/Web/API/HTMLHyperlinkElementUtils/pathname}\n   * and [`search`]{@link https://developer.mozilla.org/en-US/docs/Web/API/HTMLHyperlinkElementUtils/search}\n   * portions of the requested URL.\n   *\n   * @param {workbox.routing.Route~handlerCallback} handler A callback\n   * function that returns a Promise resulting in a Response.\n   * @param {Object} options\n   * @param {Array<RegExp>} [options.blacklist] If any of these patterns match,\n   * the route will not handle the request (even if a whitelist RegExp matches).\n   * @param {Array<RegExp>} [options.whitelist=[/./]] If any of these patterns\n   * match the URL's pathname and search parameter, the route will handle the\n   * request (assuming the blacklist doesn't match).\n   */\n  constructor(handler, {whitelist = [/./], blacklist = []} = {}) {\n    if (process.env.NODE_ENV !== 'production') {\n      assert.isArrayOfClass(whitelist, RegExp, {\n        moduleName: 'workbox-routing',\n        className: 'NavigationRoute',\n        funcName: 'constructor',\n        paramName: 'options.whitelist',\n      });\n      assert.isArrayOfClass(blacklist, RegExp, {\n        moduleName: 'workbox-routing',\n        className: 'NavigationRoute',\n        funcName: 'constructor',\n        paramName: 'options.blacklist',\n      });\n    }\n\n    super((options) => this._match(options), handler);\n\n    this._whitelist = whitelist;\n    this._blacklist = blacklist;\n  }\n\n  /**\n   * Routes match handler.\n   *\n   * @param {Object} options\n   * @param {URL} options.url\n   * @param {Request} options.request\n   * @return {boolean}\n   *\n   * @private\n   */\n  _match({url, request}) {\n    if (request.mode !== 'navigate') {\n      return false;\n    }\n\n    const pathnameAndSearch = url.pathname + url.search;\n\n    for (const regExp of this._blacklist) {\n      if (regExp.test(pathnameAndSearch)) {\n        if (process.env.NODE_ENV !== 'production') {\n          logger.log(`The navigation route is not being used, since the ` +\n              `URL matches this blacklist pattern: ${regExp}`);\n        }\n        return false;\n      }\n    }\n\n    if (this._whitelist.some((regExp) => regExp.test(pathnameAndSearch))) {\n      if (process.env.NODE_ENV !== 'production') {\n        logger.debug(`The navigation route is being used.`);\n      }\n      return true;\n    }\n\n    if (process.env.NODE_ENV !== 'production') {\n      logger.log(`The navigation route is not being used, since the URL ` +\n          `being navigated to doesn't match the whitelist.`);\n    }\n    return false;\n  }\n}\n\nexport {NavigationRoute};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {assert} from 'workbox-core/_private/assert.mjs';\nimport {logger} from 'workbox-core/_private/logger.mjs';\nimport {Route} from './Route.mjs';\nimport './_version.mjs';\n\n/**\n * RegExpRoute makes it easy to create a regular expression based\n * [Route]{@link workbox.routing.Route}.\n *\n * For same-origin requests the RegExp only needs to match part of the URL. For\n * requests against third-party servers, you must define a RegExp that matches\n * the start of the URL.\n *\n * [See the module docs for info.]{@link https://developers.google.com/web/tools/workbox/modules/workbox-routing}\n *\n * @memberof workbox.routing\n * @extends workbox.routing.Route\n */\nclass RegExpRoute extends Route {\n  /**\n   * If the regulard expression contains\n   * [capture groups]{@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp#grouping-back-references},\n   * th ecaptured values will be passed to the\n   * [handler's]{@link workbox.routing.Route~handlerCallback} `params`\n   * argument.\n   *\n   * @param {RegExp} regExp The regular expression to match against URLs.\n   * @param {workbox.routing.Route~handlerCallback} handler A callback\n   * function that returns a Promise resulting in a Response.\n   * @param {string} [method='GET'] The HTTP method to match the Route\n   * against.\n   */\n  constructor(regExp, handler, method) {\n    if (process.env.NODE_ENV !== 'production') {\n      assert.isInstance(regExp, RegExp, {\n        moduleName: 'workbox-routing',\n        className: 'RegExpRoute',\n        funcName: 'constructor',\n        paramName: 'pattern',\n      });\n    }\n\n    const match = ({url}) => {\n      const result = regExp.exec(url.href);\n\n      // Return null immediately if there's no match.\n      if (!result) {\n        return null;\n      }\n\n      // Require that the match start at the first character in the URL string\n      // if it's a cross-origin request.\n      // See https://github.com/GoogleChrome/workbox/issues/281 for the context\n      // behind this behavior.\n      if ((url.origin !== location.origin) && (result.index !== 0)) {\n        if (process.env.NODE_ENV !== 'production') {\n          logger.debug(\n              `The regular expression '${regExp}' only partially matched ` +\n            `against the cross-origin URL '${url}'. RegExpRoute's will only ` +\n            `handle cross-origin requests if they match the entire URL.`\n          );\n        }\n\n        return null;\n      }\n\n      // If the route matches, but there aren't any capture groups defined, then\n      // this will return [], which is truthy and therefore sufficient to\n      // indicate a match.\n      // If there are capture groups, then it will return their values.\n      return result.slice(1);\n    };\n\n    super(match, handler, method);\n  }\n}\n\nexport {RegExpRoute};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {assert} from 'workbox-core/_private/assert.mjs';\nimport {logger} from 'workbox-core/_private/logger.mjs';\nimport {WorkboxError} from 'workbox-core/_private/WorkboxError.mjs';\nimport {getFriendlyURL} from 'workbox-core/_private/getFriendlyURL.mjs';\n\nimport {normalizeHandler} from './utils/normalizeHandler.mjs';\nimport './_version.mjs';\n\n/**\n * The Router can be used to process a FetchEvent through one or more\n * [Routes]{@link workbox.routing.Route} responding  with a Request if\n * a matching route exists.\n *\n * If no route matches a given a request, the Router will use a \"default\"\n * handler if one is defined.\n *\n * Should the matching Route throw an error, the Router will use a \"catch\"\n * handler if one is defined to gracefully deal with issues and respond with a\n * Request.\n *\n * If a request matches multiple routes, the **earliest** registered route will\n * be used to respond to the request.\n *\n * @memberof workbox.routing\n */\nclass Router {\n  /**\n   * Initializes a new Router.\n   */\n  constructor() {\n    this._routes = new Map();\n  }\n\n  /**\n   * @return {Map<string, Array<workbox.routing.Route>>} routes A `Map` of HTTP\n   * method name ('GET', etc.) to an array of all the corresponding `Route`\n   * instances that are registered.\n   */\n  get routes() {\n    return this._routes;\n  }\n\n  /**\n   * Adds a fetch event listener to respond to events when a route matches\n   * the event's request.\n   */\n  addFetchListener() {\n    self.addEventListener('fetch', (event) => {\n      const {request} = event;\n      const responsePromise = this.handleRequest({request, event});\n      if (responsePromise) {\n        event.respondWith(responsePromise);\n      }\n    });\n  }\n\n  /**\n   * Adds a message event listener for URLs to cache from the window.\n   * This is useful to cache resources loaded on the page prior to when the\n   * service worker started controlling it.\n   *\n   * The format of the message data sent from the window should be as follows.\n   * Where the `urlsToCache` array may consist of URL strings or an array of\n   * URL string + `requestInit` object (the same as you'd pass to `fetch()`).\n   *\n   * ```\n   * {\n   *   type: 'CACHE_URLS',\n   *   payload: {\n   *     urlsToCache: [\n   *       './script1.js',\n   *       './script2.js',\n   *       ['./script3.js', {mode: 'no-cors'}],\n   *     ],\n   *   },\n   * }\n   * ```\n   */\n  addCacheListener() {\n    self.addEventListener('message', async (event) => {\n      if (event.data && event.data.type === 'CACHE_URLS') {\n        const {payload} = event.data;\n\n        if (process.env.NODE_ENV !== 'production') {\n          logger.debug(`Caching URLs from the window`, payload.urlsToCache);\n        }\n\n        const requestPromises = Promise.all(payload.urlsToCache.map((entry) => {\n          if (typeof entry === 'string') {\n            entry = [entry];\n          }\n\n          const request = new Request(...entry);\n          return this.handleRequest({request});\n        }));\n\n        event.waitUntil(requestPromises);\n\n        // If a MessageChannel was used, reply to the message on success.\n        if (event.ports && event.ports[0]) {\n          await requestPromises;\n          event.ports[0].postMessage(true);\n        }\n      }\n    });\n  }\n\n  /**\n   * Apply the routing rules to a FetchEvent object to get a Response from an\n   * appropriate Route's handler.\n   *\n   * @param {Object} options\n   * @param {Request} options.request The request to handle (this is usually\n   *     from a fetch event, but it does not have to be).\n   * @param {FetchEvent} [options.event] The event that triggered the request,\n   *     if applicable.\n   * @return {Promise<Response>|undefined} A promise is returned if a\n   *     registered route can handle the request. If there is no matching\n   *     route and there's no `defaultHandler`, `undefined` is returned.\n   */\n  handleRequest({request, event}) {\n    if (process.env.NODE_ENV !== 'production') {\n      assert.isInstance(request, Request, {\n        moduleName: 'workbox-routing',\n        className: 'Router',\n        funcName: 'handleRequest',\n        paramName: 'options.request',\n      });\n    }\n\n    const url = new URL(request.url, location);\n    if (!url.protocol.startsWith('http')) {\n      if (process.env.NODE_ENV !== 'production') {\n        logger.debug(\n            `Workbox Router only supports URLs that start with 'http'.`);\n      }\n      return;\n    }\n\n    let {params, route} = this.findMatchingRoute({url, request, event});\n    let handler = route && route.handler;\n\n    let debugMessages = [];\n    if (process.env.NODE_ENV !== 'production') {\n      if (handler) {\n        debugMessages.push([\n          `Found a route to handle this request:`, route,\n        ]);\n\n        if (params) {\n          debugMessages.push([\n            `Passing the following params to the route's handler:`, params,\n          ]);\n        }\n      }\n    }\n\n    // If we don't have a handler because there was no matching route, then\n    // fall back to defaultHandler if that's defined.\n    if (!handler && this._defaultHandler) {\n      if (process.env.NODE_ENV !== 'production') {\n        debugMessages.push(`Failed to find a matching route. Falling ` +\n          `back to the default handler.`);\n\n        // This is used for debugging in logs in the case of an error.\n        route = '[Default Handler]';\n      }\n      handler = this._defaultHandler;\n    }\n\n    if (!handler) {\n      if (process.env.NODE_ENV !== 'production') {\n        // No handler so Workbox will do nothing. If logs is set of debug\n        // i.e. verbose, we should print out this information.\n        logger.debug(`No route found for: ${getFriendlyURL(url)}`);\n      }\n      return;\n    }\n\n    if (process.env.NODE_ENV !== 'production') {\n      // We have a handler, meaning Workbox is going to handle the route.\n      // print the routing details to the console.\n      logger.groupCollapsed(`Router is responding to: ${getFriendlyURL(url)}`);\n      debugMessages.forEach((msg) => {\n        if (Array.isArray(msg)) {\n          logger.log(...msg);\n        } else {\n          logger.log(msg);\n        }\n      });\n\n      // The Request and Response objects contains a great deal of information,\n      // hide it under a group in case developers want to see it.\n      logger.groupCollapsed(`View request details here.`);\n      logger.log(request);\n      logger.groupEnd();\n\n      logger.groupEnd();\n    }\n\n    // Wrap in try and catch in case the handle method throws a synchronous\n    // error. It should still callback to the catch handler.\n    let responsePromise;\n    try {\n      responsePromise = handler.handle({url, request, event, params});\n    } catch (err) {\n      responsePromise = Promise.reject(err);\n    }\n\n    if (responsePromise && this._catchHandler) {\n      responsePromise = responsePromise.catch((err) => {\n        if (process.env.NODE_ENV !== 'production') {\n          // Still include URL here as it will be async from the console group\n          // and may not make sense without the URL\n          logger.groupCollapsed(`Error thrown when responding to: ` +\n            ` ${getFriendlyURL(url)}. Falling back to Catch Handler.`);\n          logger.error(`Error thrown by:`, route);\n          logger.error(err);\n          logger.groupEnd();\n        }\n        return this._catchHandler.handle({url, event, err});\n      });\n    }\n\n    return responsePromise;\n  }\n\n  /**\n   * Checks a request and URL (and optionally an event) against the list of\n   * registered routes, and if there's a match, returns the corresponding\n   * route along with any params generated by the match.\n   *\n   * @param {Object} options\n   * @param {URL} options.url\n   * @param {Request} options.request The request to match.\n   * @param {FetchEvent} [options.event] The corresponding event (unless N/A).\n   * @return {Object} An object with `route` and `params` properties.\n   *     They are populated if a matching route was found or `undefined`\n   *     otherwise.\n   */\n  findMatchingRoute({url, request, event}) {\n    if (process.env.NODE_ENV !== 'production') {\n      assert.isInstance(url, URL, {\n        moduleName: 'workbox-routing',\n        className: 'Router',\n        funcName: 'findMatchingRoute',\n        paramName: 'options.url',\n      });\n      assert.isInstance(request, Request, {\n        moduleName: 'workbox-routing',\n        className: 'Router',\n        funcName: 'findMatchingRoute',\n        paramName: 'options.request',\n      });\n    }\n\n    const routes = this._routes.get(request.method) || [];\n    for (const route of routes) {\n      let params;\n      let matchResult = route.match({url, request, event});\n      if (matchResult) {\n        if (Array.isArray(matchResult) && matchResult.length > 0) {\n          // Instead of passing an empty array in as params, use undefined.\n          params = matchResult;\n        } else if ((matchResult.constructor === Object &&\n            Object.keys(matchResult).length > 0)) {\n          // Instead of passing an empty object in as params, use undefined.\n          params = matchResult;\n        }\n\n        // Return early if have a match.\n        return {route, params};\n      }\n    }\n    // If no match was found above, return and empty object.\n    return {};\n  }\n\n  /**\n   * Define a default `handler` that's called when no routes explicitly\n   * match the incoming request.\n   *\n   * Without a default handler, unmatched requests will go against the\n   * network as if there were no service worker present.\n   *\n   * @param {workbox.routing.Route~handlerCallback} handler A callback\n   * function that returns a Promise resulting in a Response.\n   */\n  setDefaultHandler(handler) {\n    this._defaultHandler = normalizeHandler(handler);\n  }\n\n  /**\n   * If a Route throws an error while handling a request, this `handler`\n   * will be called and given a chance to provide a response.\n   *\n   * @param {workbox.routing.Route~handlerCallback} handler A callback\n   * function that returns a Promise resulting in a Response.\n   */\n  setCatchHandler(handler) {\n    this._catchHandler = normalizeHandler(handler);\n  }\n\n  /**\n   * Registers a route with the router.\n   *\n   * @param {workbox.routing.Route} route The route to register.\n   */\n  registerRoute(route) {\n    if (process.env.NODE_ENV !== 'production') {\n      assert.isType(route, 'object', {\n        moduleName: 'workbox-routing',\n        className: 'Router',\n        funcName: 'registerRoute',\n        paramName: 'route',\n      });\n\n      assert.hasMethod(route, 'match', {\n        moduleName: 'workbox-routing',\n        className: 'Router',\n        funcName: 'registerRoute',\n        paramName: 'route',\n      });\n\n      assert.isType(route.handler, 'object', {\n        moduleName: 'workbox-routing',\n        className: 'Router',\n        funcName: 'registerRoute',\n        paramName: 'route',\n      });\n\n      assert.hasMethod(route.handler, 'handle', {\n        moduleName: 'workbox-routing',\n        className: 'Router',\n        funcName: 'registerRoute',\n        paramName: 'route.handler',\n      });\n\n      assert.isType(route.method, 'string', {\n        moduleName: 'workbox-routing',\n        className: 'Router',\n        funcName: 'registerRoute',\n        paramName: 'route.method',\n      });\n    }\n\n    if (!this._routes.has(route.method)) {\n      this._routes.set(route.method, []);\n    }\n\n    // Give precedence to all of the earlier routes by adding this additional\n    // route to the end of the array.\n    this._routes.get(route.method).push(route);\n  }\n\n  /**\n   * Unregisters a route with the router.\n   *\n   * @param {workbox.routing.Route} route The route to unregister.\n   */\n  unregisterRoute(route) {\n    if (!this._routes.has(route.method)) {\n      throw new WorkboxError(\n          'unregister-route-but-not-found-with-method', {\n            method: route.method,\n          }\n      );\n    }\n\n    const routeIndex = this._routes.get(route.method).indexOf(route);\n    if (routeIndex > -1) {\n      this._routes.get(route.method).splice(routeIndex, 1);\n    } else {\n      throw new WorkboxError('unregister-route-route-not-registered');\n    }\n  }\n}\n\nexport {Router};\n","/*\n  Copyright 2019 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {Router} from '../Router.mjs';\nimport '../_version.mjs';\n\nlet defaultRouter;\n\n/**\n * Creates a new, singleton Router instance if one does not exist. If one\n * does already exist, that instance is returned.\n *\n * @private\n * @return {Router}\n */\nexport const getOrCreateDefaultRouter = () => {\n  if (!defaultRouter) {\n    defaultRouter = new Router();\n\n    // The helpers that use the default Router assume these listeners exist.\n    defaultRouter.addFetchListener();\n    defaultRouter.addCacheListener();\n  }\n  return defaultRouter;\n};\n","/*\n  Copyright 2019 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {assert} from 'workbox-core/_private/assert.mjs';\nimport {cacheNames} from 'workbox-core/_private/cacheNames.mjs';\nimport {logger} from 'workbox-core/_private/logger.mjs';\nimport {NavigationRoute} from './NavigationRoute.mjs';\nimport {getOrCreateDefaultRouter} from './utils/getOrCreateDefaultRouter.mjs';\nimport './_version.mjs';\n\n\n/**\n * Registers a route that will return a precached file for a navigation\n * request. This is useful for the\n * [application shell pattern]{@link https://developers.google.com/web/fundamentals/architecture/app-shell}.\n *\n * When determining the URL of the precached HTML document, you will likely need\n * to call `workbox.precaching.getCacheKeyForURL(originalUrl)`, to account for\n * the fact that Workbox's precaching naming conventions often results in URL\n * cache keys that contain extra revisioning info.\n *\n * This method will generate a\n * [NavigationRoute]{@link workbox.routing.NavigationRoute}\n * and call\n * [Router.registerRoute()]{@link workbox.routing.Router#registerRoute} on a\n * singleton Router instance.\n *\n * @param {string} cachedAssetUrl The cache key to use for the HTML file.\n * @param {Object} [options]\n * @param {string} [options.cacheName] Cache name to store and retrieve\n * requests. Defaults to precache cache name provided by\n * [workbox-core.cacheNames]{@link workbox.core.cacheNames}.\n * @param {Array<RegExp>} [options.blacklist=[]] If any of these patterns\n * match, the route will not handle the request (even if a whitelist entry\n * matches).\n * @param {Array<RegExp>} [options.whitelist=[/./]] If any of these patterns\n * match the URL's pathname and search parameter, the route will handle the\n * request (assuming the blacklist doesn't match).\n * @return {workbox.routing.NavigationRoute} Returns the generated\n * Route.\n *\n * @alias workbox.routing.registerNavigationRoute\n */\nexport const registerNavigationRoute = (cachedAssetUrl, options = {}) => {\n  if (process.env.NODE_ENV !== 'production') {\n    assert.isType(cachedAssetUrl, 'string', {\n      moduleName: 'workbox-routing',\n      funcName: 'registerNavigationRoute',\n      paramName: 'cachedAssetUrl',\n    });\n  }\n\n  const cacheName = cacheNames.getPrecacheName(options.cacheName);\n  const handler = async () => {\n    try {\n      const response = await caches.match(cachedAssetUrl, {cacheName});\n\n      if (response) {\n        return response;\n      }\n\n      // This shouldn't normally happen, but there are edge cases:\n      // https://github.com/GoogleChrome/workbox/issues/1441\n      throw new Error(`The cache ${cacheName} did not have an entry for ` +\n          `${cachedAssetUrl}.`);\n    } catch (error) {\n      // If there's either a cache miss, or the caches.match() call threw\n      // an exception, then attempt to fulfill the navigation request with\n      // a response from the network rather than leaving the user with a\n      // failed navigation.\n      if (process.env.NODE_ENV !== 'production') {\n        logger.debug(`Unable to respond to navigation request with ` +\n            `cached response. Falling back to network.`, error);\n      }\n\n      // This might still fail if the browser is offline...\n      return fetch(cachedAssetUrl);\n    }\n  };\n\n  const route = new NavigationRoute(handler, {\n    whitelist: options.whitelist,\n    blacklist: options.blacklist,\n  });\n\n  const defaultRouter = getOrCreateDefaultRouter();\n  defaultRouter.registerRoute(route);\n\n  return route;\n};\n","/*\n  Copyright 2019 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {logger} from 'workbox-core/_private/logger.mjs';\nimport {WorkboxError} from 'workbox-core/_private/WorkboxError.mjs';\nimport {Route} from './Route.mjs';\nimport {RegExpRoute} from './RegExpRoute.mjs';\nimport {getOrCreateDefaultRouter} from './utils/getOrCreateDefaultRouter.mjs';\nimport './_version.mjs';\n\n\n/**\n * Easily register a RegExp, string, or function with a caching\n * strategy to a singleton Router instance.\n *\n * This method will generate a Route for you if needed and\n * call [Router.registerRoute()]{@link\n * workbox.routing.Router#registerRoute}.\n *\n * @param {\n * RegExp|\n * string|\n * workbox.routing.Route~matchCallback|\n * workbox.routing.Route\n * } capture\n * If the capture param is a `Route`, all other arguments will be ignored.\n * @param {workbox.routing.Route~handlerCallback} handler A callback\n * function that returns a Promise resulting in a Response.\n * @param {string} [method='GET'] The HTTP method to match the Route\n * against.\n * @return {workbox.routing.Route} The generated `Route`(Useful for\n * unregistering).\n *\n * @alias workbox.routing.registerRoute\n */\nexport const registerRoute = (capture, handler, method = 'GET') => {\n  let route;\n\n  if (typeof capture === 'string') {\n    const captureUrl = new URL(capture, location);\n\n    if (process.env.NODE_ENV !== 'production') {\n      if (!(capture.startsWith('/') || capture.startsWith('http'))) {\n        throw new WorkboxError('invalid-string', {\n          moduleName: 'workbox-routing',\n          funcName: 'registerRoute',\n          paramName: 'capture',\n        });\n      }\n\n      // We want to check if Express-style wildcards are in the pathname only.\n      // TODO: Remove this log message in v4.\n      const valueToCheck = capture.startsWith('http') ?\n          captureUrl.pathname : capture;\n\n      // See https://github.com/pillarjs/path-to-regexp#parameters\n      const wildcards = '[*:?+]';\n      if (valueToCheck.match(new RegExp(`${wildcards}`))) {\n        logger.debug(\n            `The '$capture' parameter contains an Express-style wildcard ` +\n          `character (${wildcards}). Strings are now always interpreted as ` +\n          `exact matches; use a RegExp for partial or wildcard matches.`\n        );\n      }\n    }\n\n    const matchCallback = ({url}) => {\n      if (process.env.NODE_ENV !== 'production') {\n        if ((url.pathname === captureUrl.pathname) &&\n            (url.origin !== captureUrl.origin)) {\n          logger.debug(\n              `${capture} only partially matches the cross-origin URL ` +\n              `${url}. This route will only handle cross-origin requests ` +\n              `if they match the entire URL.`);\n        }\n      }\n\n      return url.href === captureUrl.href;\n    };\n\n    route = new Route(matchCallback, handler, method);\n  } else if (capture instanceof RegExp) {\n    route = new RegExpRoute(capture, handler, method);\n  } else if (typeof capture === 'function') {\n    route = new Route(capture, handler, method);\n  } else if (capture instanceof Route) {\n    route = capture;\n  } else {\n    throw new WorkboxError('unsupported-route-type', {\n      moduleName: 'workbox-routing',\n      funcName: 'registerRoute',\n      paramName: 'capture',\n    });\n  }\n\n  const defaultRouter = getOrCreateDefaultRouter();\n  defaultRouter.registerRoute(route);\n\n  return route;\n};\n","/*\n  Copyright 2019 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {getOrCreateDefaultRouter} from './utils/getOrCreateDefaultRouter.mjs';\n\nimport './_version.mjs';\n\n/**\n * If a Route throws an error while handling a request, this `handler`\n * will be called and given a chance to provide a response.\n *\n * @param {workbox.routing.Route~handlerCallback} handler A callback\n * function that returns a Promise resulting in a Response.\n *\n * @alias workbox.routing.setCatchHandler\n */\nexport const setCatchHandler = (handler) => {\n  const defaultRouter = getOrCreateDefaultRouter();\n  defaultRouter.setCatchHandler(handler);\n};\n","/*\n  Copyright 2019 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {getOrCreateDefaultRouter} from './utils/getOrCreateDefaultRouter.mjs';\n\nimport './_version.mjs';\n\n/**\n * Define a default `handler` that's called when no routes explicitly\n * match the incoming request.\n *\n * Without a default handler, unmatched requests will go against the\n * network as if there were no service worker present.\n *\n * @param {workbox.routing.Route~handlerCallback} handler A callback\n * function that returns a Promise resulting in a Response.\n *\n * @alias workbox.routing.setDefaultHandler\n */\nexport const setDefaultHandler = (handler) => {\n  const defaultRouter = getOrCreateDefaultRouter();\n  defaultRouter.setDefaultHandler(handler);\n};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {assert} from 'workbox-core/_private/assert.mjs';\n\nimport {NavigationRoute} from './NavigationRoute.mjs';\nimport {RegExpRoute} from './RegExpRoute.mjs';\nimport {registerNavigationRoute} from './registerNavigationRoute.mjs';\nimport {registerRoute} from './registerRoute.mjs';\nimport {Route} from './Route.mjs';\nimport {Router} from './Router.mjs';\nimport {setCatchHandler} from './setCatchHandler.mjs';\nimport {setDefaultHandler} from './setDefaultHandler.mjs';\n\nimport './_version.mjs';\n\nif (process.env.NODE_ENV !== 'production') {\n  assert.isSWEnv('workbox-routing');\n}\n\n/**\n * @namespace workbox.routing\n */\n\nexport {\n  NavigationRoute,\n  RegExpRoute,\n  registerNavigationRoute,\n  registerRoute,\n  Route,\n  Router,\n  setCatchHandler,\n  setDefaultHandler,\n};\n"],"names":["self","_","e","defaultMethod","validMethods","normalizeHandler","handler","assert","hasMethod","moduleName","className","funcName","paramName","isType","handle","Route","constructor","match","method","isOneOf","NavigationRoute","whitelist","blacklist","isArrayOfClass","RegExp","options","_match","_whitelist","_blacklist","url","request","mode","pathnameAndSearch","pathname","search","regExp","test","logger","log","some","debug","RegExpRoute","isInstance","result","exec","href","origin","location","index","slice","Router","_routes","Map","routes","addFetchListener","addEventListener","event","responsePromise","handleRequest","respondWith","addCacheListener","data","type","payload","urlsToCache","requestPromises","Promise","all","map","entry","Request","waitUntil","ports","postMessage","URL","protocol","startsWith","params","route","findMatchingRoute","debugMessages","push","_defaultHandler","getFriendlyURL","groupCollapsed","forEach","msg","Array","isArray","groupEnd","err","reject","_catchHandler","catch","error","get","matchResult","length","Object","keys","setDefaultHandler","setCatchHandler","registerRoute","has","set","unregisterRoute","WorkboxError","routeIndex","indexOf","splice","defaultRouter","getOrCreateDefaultRouter","registerNavigationRoute","cachedAssetUrl","cacheName","cacheNames","getPrecacheName","response","caches","Error","fetch","capture","captureUrl","valueToCheck","wildcards","matchCallback","isSWEnv"],"mappings":";;;;EAAA,IAAG;EAACA,EAAAA,IAAI,CAAC,uBAAD,CAAJ,IAA+BC,CAAC,EAAhC;EAAmC,CAAvC,CAAuC,OAAMC,CAAN,EAAQ;;ECA/C;;;;;;;AAQA,EAEA;;;;;;;;;AAQA,EAAO,MAAMC,aAAa,GAAG,KAAtB;EAEP;;;;;;;;AAOA,EAAO,MAAMC,YAAY,GAAG,CAC1B,QAD0B,EAE1B,KAF0B,EAG1B,MAH0B,EAI1B,OAJ0B,EAK1B,MAL0B,EAM1B,KAN0B,CAArB;;EC3BP;;;;;;;AAQA,EAGA;;;;;;;;AAOA,EAAO,MAAMC,gBAAgB,GAAIC,OAAD,IAAa;EAC3C,MAAIA,OAAO,IAAI,OAAOA,OAAP,KAAmB,QAAlC,EAA4C;EAC1C,IAA2C;EACzCC,MAAAA,iBAAM,CAACC,SAAP,CAAiBF,OAAjB,EAA0B,QAA1B,EAAoC;EAClCG,QAAAA,UAAU,EAAE,iBADsB;EAElCC,QAAAA,SAAS,EAAE,OAFuB;EAGlCC,QAAAA,QAAQ,EAAE,aAHwB;EAIlCC,QAAAA,SAAS,EAAE;EAJuB,OAApC;EAMD;;EACD,WAAON,OAAP;EACD,GAVD,MAUO;EACL,IAA2C;EACzCC,MAAAA,iBAAM,CAACM,MAAP,CAAcP,OAAd,EAAuB,UAAvB,EAAmC;EACjCG,QAAAA,UAAU,EAAE,iBADqB;EAEjCC,QAAAA,SAAS,EAAE,OAFsB;EAGjCC,QAAAA,QAAQ,EAAE,aAHuB;EAIjCC,QAAAA,SAAS,EAAE;EAJsB,OAAnC;EAMD;;EACD,WAAO;EAACE,MAAAA,MAAM,EAAER;EAAT,KAAP;EACD;EACF,CAtBM;;EClBP;;;;;;;AAQA,EAMA;;;;;;;;;;EASA,MAAMS,KAAN,CAAY;EACV;;;;;;;;;;;EAWAC,EAAAA,WAAW,CAACC,KAAD,EAAQX,OAAR,EAAiBY,MAAjB,EAAyB;EAClC,IAA2C;EACzCX,MAAAA,iBAAM,CAACM,MAAP,CAAcI,KAAd,EAAqB,UAArB,EAAiC;EAC/BR,QAAAA,UAAU,EAAE,iBADmB;EAE/BC,QAAAA,SAAS,EAAE,OAFoB;EAG/BC,QAAAA,QAAQ,EAAE,aAHqB;EAI/BC,QAAAA,SAAS,EAAE;EAJoB,OAAjC;;EAOA,UAAIM,MAAJ,EAAY;EACVX,QAAAA,iBAAM,CAACY,OAAP,CAAeD,MAAf,EAAuBd,YAAvB,EAAqC;EAACQ,UAAAA,SAAS,EAAE;EAAZ,SAArC;EACD;EACF,KAZiC;EAelC;;;EACA,SAAKN,OAAL,GAAeD,gBAAgB,CAACC,OAAD,CAA/B;EACA,SAAKW,KAAL,GAAaA,KAAb;EACA,SAAKC,MAAL,GAAcA,MAAM,IAAIf,aAAxB;EACD;;EA/BS;;ECvBZ;;;;;;;AAQA,EAKA;;;;;;;;;;;;;;;;EAeA,MAAMiB,eAAN,SAA8BL,KAA9B,CAAoC;EAClC;;;;;;;;;;;;;;;;;;;EAmBAC,EAAAA,WAAW,CAACV,OAAD,EAAU;EAACe,IAAAA,SAAS,GAAG,CAAC,GAAD,CAAb;EAAoBC,IAAAA,SAAS,GAAG;EAAhC,MAAsC,EAAhD,EAAoD;EAC7D,IAA2C;EACzCf,MAAAA,iBAAM,CAACgB,cAAP,CAAsBF,SAAtB,EAAiCG,MAAjC,EAAyC;EACvCf,QAAAA,UAAU,EAAE,iBAD2B;EAEvCC,QAAAA,SAAS,EAAE,iBAF4B;EAGvCC,QAAAA,QAAQ,EAAE,aAH6B;EAIvCC,QAAAA,SAAS,EAAE;EAJ4B,OAAzC;EAMAL,MAAAA,iBAAM,CAACgB,cAAP,CAAsBD,SAAtB,EAAiCE,MAAjC,EAAyC;EACvCf,QAAAA,UAAU,EAAE,iBAD2B;EAEvCC,QAAAA,SAAS,EAAE,iBAF4B;EAGvCC,QAAAA,QAAQ,EAAE,aAH6B;EAIvCC,QAAAA,SAAS,EAAE;EAJ4B,OAAzC;EAMD;;EAED,UAAOa,OAAD,IAAa,KAAKC,MAAL,CAAYD,OAAZ,CAAnB,EAAyCnB,OAAzC;EAEA,SAAKqB,UAAL,GAAkBN,SAAlB;EACA,SAAKO,UAAL,GAAkBN,SAAlB;EACD;EAED;;;;;;;;;;;;EAUAI,EAAAA,MAAM,CAAC;EAACG,IAAAA,GAAD;EAAMC,IAAAA;EAAN,GAAD,EAAiB;EACrB,QAAIA,OAAO,CAACC,IAAR,KAAiB,UAArB,EAAiC;EAC/B,aAAO,KAAP;EACD;;EAED,UAAMC,iBAAiB,GAAGH,GAAG,CAACI,QAAJ,GAAeJ,GAAG,CAACK,MAA7C;;EAEA,SAAK,MAAMC,MAAX,IAAqB,KAAKP,UAA1B,EAAsC;EACpC,UAAIO,MAAM,CAACC,IAAP,CAAYJ,iBAAZ,CAAJ,EAAoC;EAClC,QAA2C;EACzCK,UAAAA,iBAAM,CAACC,GAAP,CAAY,oDAAD,GACN,uCAAsCH,MAAO,EADlD;EAED;;EACD,eAAO,KAAP;EACD;EACF;;EAED,QAAI,KAAKR,UAAL,CAAgBY,IAAhB,CAAsBJ,MAAD,IAAYA,MAAM,CAACC,IAAP,CAAYJ,iBAAZ,CAAjC,CAAJ,EAAsE;EACpE,MAA2C;EACzCK,QAAAA,iBAAM,CAACG,KAAP,CAAc,qCAAd;EACD;;EACD,aAAO,IAAP;EACD;;EAED,IAA2C;EACzCH,MAAAA,iBAAM,CAACC,GAAP,CAAY,wDAAD,GACN,iDADL;EAED;;EACD,WAAO,KAAP;EACD;;EAjFiC;;EC5BpC;;;;;;;AAQA,EAKA;;;;;;;;;;;;;;EAaA,MAAMG,WAAN,SAA0B1B,KAA1B,CAAgC;EAC9B;;;;;;;;;;;;;EAaAC,EAAAA,WAAW,CAACmB,MAAD,EAAS7B,OAAT,EAAkBY,MAAlB,EAA0B;EACnC,IAA2C;EACzCX,MAAAA,iBAAM,CAACmC,UAAP,CAAkBP,MAAlB,EAA0BX,MAA1B,EAAkC;EAChCf,QAAAA,UAAU,EAAE,iBADoB;EAEhCC,QAAAA,SAAS,EAAE,aAFqB;EAGhCC,QAAAA,QAAQ,EAAE,aAHsB;EAIhCC,QAAAA,SAAS,EAAE;EAJqB,OAAlC;EAMD;;EAED,UAAMK,KAAK,GAAG,CAAC;EAACY,MAAAA;EAAD,KAAD,KAAW;EACvB,YAAMc,MAAM,GAAGR,MAAM,CAACS,IAAP,CAAYf,GAAG,CAACgB,IAAhB,CAAf,CADuB;;EAIvB,UAAI,CAACF,MAAL,EAAa;EACX,eAAO,IAAP;EACD,OANsB;EASvB;EACA;EACA;;;EACA,UAAKd,GAAG,CAACiB,MAAJ,KAAeC,QAAQ,CAACD,MAAzB,IAAqCH,MAAM,CAACK,KAAP,KAAiB,CAA1D,EAA8D;EAC5D,QAA2C;EACzCX,UAAAA,iBAAM,CAACG,KAAP,CACK,2BAA0BL,MAAO,2BAAlC,GACD,iCAAgCN,GAAI,6BADnC,GAED,4DAHH;EAKD;;EAED,eAAO,IAAP;EACD,OAtBsB;EAyBvB;EACA;EACA;;;EACA,aAAOc,MAAM,CAACM,KAAP,CAAa,CAAb,CAAP;EACD,KA7BD;;EA+BA,UAAMhC,KAAN,EAAaX,OAAb,EAAsBY,MAAtB;EACD;;EAxD6B;;EC1BhC;;;;;;;AAQA,EAQA;;;;;;;;;;;;;;;;;;EAiBA,MAAMgC,MAAN,CAAa;EACX;;;EAGAlC,EAAAA,WAAW,GAAG;EACZ,SAAKmC,OAAL,GAAe,IAAIC,GAAJ,EAAf;EACD;EAED;;;;;;;EAKA,MAAIC,MAAJ,GAAa;EACX,WAAO,KAAKF,OAAZ;EACD;EAED;;;;;;EAIAG,EAAAA,gBAAgB,GAAG;EACjBtD,IAAAA,IAAI,CAACuD,gBAAL,CAAsB,OAAtB,EAAgCC,KAAD,IAAW;EACxC,YAAM;EAAC1B,QAAAA;EAAD,UAAY0B,KAAlB;EACA,YAAMC,eAAe,GAAG,KAAKC,aAAL,CAAmB;EAAC5B,QAAAA,OAAD;EAAU0B,QAAAA;EAAV,OAAnB,CAAxB;;EACA,UAAIC,eAAJ,EAAqB;EACnBD,QAAAA,KAAK,CAACG,WAAN,CAAkBF,eAAlB;EACD;EACF,KAND;EAOD;EAED;;;;;;;;;;;;;;;;;;;;;;;;EAsBAG,EAAAA,gBAAgB,GAAG;EACjB5D,IAAAA,IAAI,CAACuD,gBAAL,CAAsB,SAAtB,EAAiC,MAAOC,KAAP,IAAiB;EAChD,UAAIA,KAAK,CAACK,IAAN,IAAcL,KAAK,CAACK,IAAN,CAAWC,IAAX,KAAoB,YAAtC,EAAoD;EAClD,cAAM;EAACC,UAAAA;EAAD,YAAYP,KAAK,CAACK,IAAxB;;EAEA,QAA2C;EACzCxB,UAAAA,iBAAM,CAACG,KAAP,CAAc,8BAAd,EAA6CuB,OAAO,CAACC,WAArD;EACD;;EAED,cAAMC,eAAe,GAAGC,OAAO,CAACC,GAAR,CAAYJ,OAAO,CAACC,WAAR,CAAoBI,GAApB,CAAyBC,KAAD,IAAW;EACrE,cAAI,OAAOA,KAAP,KAAiB,QAArB,EAA+B;EAC7BA,YAAAA,KAAK,GAAG,CAACA,KAAD,CAAR;EACD;;EAED,gBAAMvC,OAAO,GAAG,IAAIwC,OAAJ,CAAY,GAAGD,KAAf,CAAhB;EACA,iBAAO,KAAKX,aAAL,CAAmB;EAAC5B,YAAAA;EAAD,WAAnB,CAAP;EACD,SAPmC,CAAZ,CAAxB;EASA0B,QAAAA,KAAK,CAACe,SAAN,CAAgBN,eAAhB,EAhBkD;;EAmBlD,YAAIT,KAAK,CAACgB,KAAN,IAAehB,KAAK,CAACgB,KAAN,CAAY,CAAZ,CAAnB,EAAmC;EACjC,gBAAMP,eAAN;EACAT,UAAAA,KAAK,CAACgB,KAAN,CAAY,CAAZ,EAAeC,WAAf,CAA2B,IAA3B;EACD;EACF;EACF,KAzBD;EA0BD;EAED;;;;;;;;;;;;;;;EAaAf,EAAAA,aAAa,CAAC;EAAC5B,IAAAA,OAAD;EAAU0B,IAAAA;EAAV,GAAD,EAAmB;EAC9B,IAA2C;EACzCjD,MAAAA,iBAAM,CAACmC,UAAP,CAAkBZ,OAAlB,EAA2BwC,OAA3B,EAAoC;EAClC7D,QAAAA,UAAU,EAAE,iBADsB;EAElCC,QAAAA,SAAS,EAAE,QAFuB;EAGlCC,QAAAA,QAAQ,EAAE,eAHwB;EAIlCC,QAAAA,SAAS,EAAE;EAJuB,OAApC;EAMD;;EAED,UAAMiB,GAAG,GAAG,IAAI6C,GAAJ,CAAQ5C,OAAO,CAACD,GAAhB,EAAqBkB,QAArB,CAAZ;;EACA,QAAI,CAAClB,GAAG,CAAC8C,QAAJ,CAAaC,UAAb,CAAwB,MAAxB,CAAL,EAAsC;EACpC,MAA2C;EACzCvC,QAAAA,iBAAM,CAACG,KAAP,CACK,2DADL;EAED;;EACD;EACD;;EAED,QAAI;EAACqC,MAAAA,MAAD;EAASC,MAAAA;EAAT,QAAkB,KAAKC,iBAAL,CAAuB;EAAClD,MAAAA,GAAD;EAAMC,MAAAA,OAAN;EAAe0B,MAAAA;EAAf,KAAvB,CAAtB;EACA,QAAIlD,OAAO,GAAGwE,KAAK,IAAIA,KAAK,CAACxE,OAA7B;EAEA,QAAI0E,aAAa,GAAG,EAApB;;EACA,IAA2C;EACzC,UAAI1E,OAAJ,EAAa;EACX0E,QAAAA,aAAa,CAACC,IAAd,CAAmB,CAChB,uCADgB,EACwBH,KADxB,CAAnB;;EAIA,YAAID,MAAJ,EAAY;EACVG,UAAAA,aAAa,CAACC,IAAd,CAAmB,CAChB,sDADgB,EACuCJ,MADvC,CAAnB;EAGD;EACF;EACF,KAnC6B;EAsC9B;;;EACA,QAAI,CAACvE,OAAD,IAAY,KAAK4E,eAArB,EAAsC;EACpC,MAA2C;EACzCF,QAAAA,aAAa,CAACC,IAAd,CAAoB,2CAAD,GAChB,8BADH,EADyC;;EAKzCH,QAAAA,KAAK,GAAG,mBAAR;EACD;;EACDxE,MAAAA,OAAO,GAAG,KAAK4E,eAAf;EACD;;EAED,QAAI,CAAC5E,OAAL,EAAc;EACZ,MAA2C;EACzC;EACA;EACA+B,QAAAA,iBAAM,CAACG,KAAP,CAAc,uBAAsB2C,iCAAc,CAACtD,GAAD,CAAM,EAAxD;EACD;;EACD;EACD;;EAED,IAA2C;EACzC;EACA;EACAQ,MAAAA,iBAAM,CAAC+C,cAAP,CAAuB,4BAA2BD,iCAAc,CAACtD,GAAD,CAAM,EAAtE;EACAmD,MAAAA,aAAa,CAACK,OAAd,CAAuBC,GAAD,IAAS;EAC7B,YAAIC,KAAK,CAACC,OAAN,CAAcF,GAAd,CAAJ,EAAwB;EACtBjD,UAAAA,iBAAM,CAACC,GAAP,CAAW,GAAGgD,GAAd;EACD,SAFD,MAEO;EACLjD,UAAAA,iBAAM,CAACC,GAAP,CAAWgD,GAAX;EACD;EACF,OAND,EAJyC;EAazC;;EACAjD,MAAAA,iBAAM,CAAC+C,cAAP,CAAuB,4BAAvB;EACA/C,MAAAA,iBAAM,CAACC,GAAP,CAAWR,OAAX;EACAO,MAAAA,iBAAM,CAACoD,QAAP;EAEApD,MAAAA,iBAAM,CAACoD,QAAP;EACD,KA9E6B;EAiF9B;;;EACA,QAAIhC,eAAJ;;EACA,QAAI;EACFA,MAAAA,eAAe,GAAGnD,OAAO,CAACQ,MAAR,CAAe;EAACe,QAAAA,GAAD;EAAMC,QAAAA,OAAN;EAAe0B,QAAAA,KAAf;EAAsBqB,QAAAA;EAAtB,OAAf,CAAlB;EACD,KAFD,CAEE,OAAOa,GAAP,EAAY;EACZjC,MAAAA,eAAe,GAAGS,OAAO,CAACyB,MAAR,CAAeD,GAAf,CAAlB;EACD;;EAED,QAAIjC,eAAe,IAAI,KAAKmC,aAA5B,EAA2C;EACzCnC,MAAAA,eAAe,GAAGA,eAAe,CAACoC,KAAhB,CAAuBH,GAAD,IAAS;EAC/C,QAA2C;EACzC;EACA;EACArD,UAAAA,iBAAM,CAAC+C,cAAP,CAAuB,mCAAD,GACnB,IAAGD,iCAAc,CAACtD,GAAD,CAAM,kCAD1B;EAEAQ,UAAAA,iBAAM,CAACyD,KAAP,CAAc,kBAAd,EAAiChB,KAAjC;EACAzC,UAAAA,iBAAM,CAACyD,KAAP,CAAaJ,GAAb;EACArD,UAAAA,iBAAM,CAACoD,QAAP;EACD;;EACD,eAAO,KAAKG,aAAL,CAAmB9E,MAAnB,CAA0B;EAACe,UAAAA,GAAD;EAAM2B,UAAAA,KAAN;EAAakC,UAAAA;EAAb,SAA1B,CAAP;EACD,OAXiB,CAAlB;EAYD;;EAED,WAAOjC,eAAP;EACD;EAED;;;;;;;;;;;;;;;EAaAsB,EAAAA,iBAAiB,CAAC;EAAClD,IAAAA,GAAD;EAAMC,IAAAA,OAAN;EAAe0B,IAAAA;EAAf,GAAD,EAAwB;EACvC,IAA2C;EACzCjD,MAAAA,iBAAM,CAACmC,UAAP,CAAkBb,GAAlB,EAAuB6C,GAAvB,EAA4B;EAC1BjE,QAAAA,UAAU,EAAE,iBADc;EAE1BC,QAAAA,SAAS,EAAE,QAFe;EAG1BC,QAAAA,QAAQ,EAAE,mBAHgB;EAI1BC,QAAAA,SAAS,EAAE;EAJe,OAA5B;EAMAL,MAAAA,iBAAM,CAACmC,UAAP,CAAkBZ,OAAlB,EAA2BwC,OAA3B,EAAoC;EAClC7D,QAAAA,UAAU,EAAE,iBADsB;EAElCC,QAAAA,SAAS,EAAE,QAFuB;EAGlCC,QAAAA,QAAQ,EAAE,mBAHwB;EAIlCC,QAAAA,SAAS,EAAE;EAJuB,OAApC;EAMD;;EAED,UAAMyC,MAAM,GAAG,KAAKF,OAAL,CAAa4C,GAAb,CAAiBjE,OAAO,CAACZ,MAAzB,KAAoC,EAAnD;;EACA,SAAK,MAAM4D,KAAX,IAAoBzB,MAApB,EAA4B;EAC1B,UAAIwB,MAAJ;EACA,UAAImB,WAAW,GAAGlB,KAAK,CAAC7D,KAAN,CAAY;EAACY,QAAAA,GAAD;EAAMC,QAAAA,OAAN;EAAe0B,QAAAA;EAAf,OAAZ,CAAlB;;EACA,UAAIwC,WAAJ,EAAiB;EACf,YAAIT,KAAK,CAACC,OAAN,CAAcQ,WAAd,KAA8BA,WAAW,CAACC,MAAZ,GAAqB,CAAvD,EAA0D;EACxD;EACApB,UAAAA,MAAM,GAAGmB,WAAT;EACD,SAHD,MAGO,IAAKA,WAAW,CAAChF,WAAZ,KAA4BkF,MAA5B,IACRA,MAAM,CAACC,IAAP,CAAYH,WAAZ,EAAyBC,MAAzB,GAAkC,CAD/B,EACmC;EACxC;EACApB,UAAAA,MAAM,GAAGmB,WAAT;EACD,SARc;;;EAWf,eAAO;EAAClB,UAAAA,KAAD;EAAQD,UAAAA;EAAR,SAAP;EACD;EACF,KAjCsC;;;EAmCvC,WAAO,EAAP;EACD;EAED;;;;;;;;;;;;EAUAuB,EAAAA,iBAAiB,CAAC9F,OAAD,EAAU;EACzB,SAAK4E,eAAL,GAAuB7E,gBAAgB,CAACC,OAAD,CAAvC;EACD;EAED;;;;;;;;;EAOA+F,EAAAA,eAAe,CAAC/F,OAAD,EAAU;EACvB,SAAKsF,aAAL,GAAqBvF,gBAAgB,CAACC,OAAD,CAArC;EACD;EAED;;;;;;;EAKAgG,EAAAA,aAAa,CAACxB,KAAD,EAAQ;EACnB,IAA2C;EACzCvE,MAAAA,iBAAM,CAACM,MAAP,CAAciE,KAAd,EAAqB,QAArB,EAA+B;EAC7BrE,QAAAA,UAAU,EAAE,iBADiB;EAE7BC,QAAAA,SAAS,EAAE,QAFkB;EAG7BC,QAAAA,QAAQ,EAAE,eAHmB;EAI7BC,QAAAA,SAAS,EAAE;EAJkB,OAA/B;EAOAL,MAAAA,iBAAM,CAACC,SAAP,CAAiBsE,KAAjB,EAAwB,OAAxB,EAAiC;EAC/BrE,QAAAA,UAAU,EAAE,iBADmB;EAE/BC,QAAAA,SAAS,EAAE,QAFoB;EAG/BC,QAAAA,QAAQ,EAAE,eAHqB;EAI/BC,QAAAA,SAAS,EAAE;EAJoB,OAAjC;EAOAL,MAAAA,iBAAM,CAACM,MAAP,CAAciE,KAAK,CAACxE,OAApB,EAA6B,QAA7B,EAAuC;EACrCG,QAAAA,UAAU,EAAE,iBADyB;EAErCC,QAAAA,SAAS,EAAE,QAF0B;EAGrCC,QAAAA,QAAQ,EAAE,eAH2B;EAIrCC,QAAAA,SAAS,EAAE;EAJ0B,OAAvC;EAOAL,MAAAA,iBAAM,CAACC,SAAP,CAAiBsE,KAAK,CAACxE,OAAvB,EAAgC,QAAhC,EAA0C;EACxCG,QAAAA,UAAU,EAAE,iBAD4B;EAExCC,QAAAA,SAAS,EAAE,QAF6B;EAGxCC,QAAAA,QAAQ,EAAE,eAH8B;EAIxCC,QAAAA,SAAS,EAAE;EAJ6B,OAA1C;EAOAL,MAAAA,iBAAM,CAACM,MAAP,CAAciE,KAAK,CAAC5D,MAApB,EAA4B,QAA5B,EAAsC;EACpCT,QAAAA,UAAU,EAAE,iBADwB;EAEpCC,QAAAA,SAAS,EAAE,QAFyB;EAGpCC,QAAAA,QAAQ,EAAE,eAH0B;EAIpCC,QAAAA,SAAS,EAAE;EAJyB,OAAtC;EAMD;;EAED,QAAI,CAAC,KAAKuC,OAAL,CAAaoD,GAAb,CAAiBzB,KAAK,CAAC5D,MAAvB,CAAL,EAAqC;EACnC,WAAKiC,OAAL,CAAaqD,GAAb,CAAiB1B,KAAK,CAAC5D,MAAvB,EAA+B,EAA/B;EACD,KAxCkB;EA2CnB;;;EACA,SAAKiC,OAAL,CAAa4C,GAAb,CAAiBjB,KAAK,CAAC5D,MAAvB,EAA+B+D,IAA/B,CAAoCH,KAApC;EACD;EAED;;;;;;;EAKA2B,EAAAA,eAAe,CAAC3B,KAAD,EAAQ;EACrB,QAAI,CAAC,KAAK3B,OAAL,CAAaoD,GAAb,CAAiBzB,KAAK,CAAC5D,MAAvB,CAAL,EAAqC;EACnC,YAAM,IAAIwF,6BAAJ,CACF,4CADE,EAC4C;EAC5CxF,QAAAA,MAAM,EAAE4D,KAAK,CAAC5D;EAD8B,OAD5C,CAAN;EAKD;;EAED,UAAMyF,UAAU,GAAG,KAAKxD,OAAL,CAAa4C,GAAb,CAAiBjB,KAAK,CAAC5D,MAAvB,EAA+B0F,OAA/B,CAAuC9B,KAAvC,CAAnB;;EACA,QAAI6B,UAAU,GAAG,CAAC,CAAlB,EAAqB;EACnB,WAAKxD,OAAL,CAAa4C,GAAb,CAAiBjB,KAAK,CAAC5D,MAAvB,EAA+B2F,MAA/B,CAAsCF,UAAtC,EAAkD,CAAlD;EACD,KAFD,MAEO;EACL,YAAM,IAAID,6BAAJ,CAAiB,uCAAjB,CAAN;EACD;EACF;;EA9VU;;ECjCb;;;;;;;AAQA,EAGA,IAAII,aAAJ;EAEA;;;;;;;;AAOA,EAAO,MAAMC,wBAAwB,GAAG,MAAM;EAC5C,MAAI,CAACD,aAAL,EAAoB;EAClBA,IAAAA,aAAa,GAAG,IAAI5D,MAAJ,EAAhB,CADkB;;EAIlB4D,IAAAA,aAAa,CAACxD,gBAAd;EACAwD,IAAAA,aAAa,CAAClD,gBAAd;EACD;;EACD,SAAOkD,aAAP;EACD,CATM;;ECpBP;;;;;;;AAQA,EAQA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgCA,QAAaE,uBAAuB,GAAG,CAACC,cAAD,EAAiBxF,OAAO,GAAG,EAA3B,KAAkC;EACvE,EAA2C;EACzClB,IAAAA,iBAAM,CAACM,MAAP,CAAcoG,cAAd,EAA8B,QAA9B,EAAwC;EACtCxG,MAAAA,UAAU,EAAE,iBAD0B;EAEtCE,MAAAA,QAAQ,EAAE,yBAF4B;EAGtCC,MAAAA,SAAS,EAAE;EAH2B,KAAxC;EAKD;;EAED,QAAMsG,SAAS,GAAGC,yBAAU,CAACC,eAAX,CAA2B3F,OAAO,CAACyF,SAAnC,CAAlB;;EACA,QAAM5G,OAAO,GAAG,YAAY;EAC1B,QAAI;EACF,YAAM+G,QAAQ,GAAG,MAAMC,MAAM,CAACrG,KAAP,CAAagG,cAAb,EAA6B;EAACC,QAAAA;EAAD,OAA7B,CAAvB;;EAEA,UAAIG,QAAJ,EAAc;EACZ,eAAOA,QAAP;EACD,OALC;EAQF;;;EACA,YAAM,IAAIE,KAAJ,CAAW,aAAYL,SAAU,6BAAvB,GACX,GAAED,cAAe,GADhB,CAAN;EAED,KAXD,CAWE,OAAOnB,KAAP,EAAc;EACd;EACA;EACA;EACA;EACA,MAA2C;EACzCzD,QAAAA,iBAAM,CAACG,KAAP,CAAc,+CAAD,GACR,2CADL,EACiDsD,KADjD;EAED,OARa;;;EAWd,aAAO0B,KAAK,CAACP,cAAD,CAAZ;EACD;EACF,GAzBD;;EA2BA,QAAMnC,KAAK,GAAG,IAAI1D,eAAJ,CAAoBd,OAApB,EAA6B;EACzCe,IAAAA,SAAS,EAAEI,OAAO,CAACJ,SADsB;EAEzCC,IAAAA,SAAS,EAAEG,OAAO,CAACH;EAFsB,GAA7B,CAAd;EAKA,QAAMwF,aAAa,GAAGC,wBAAwB,EAA9C;EACAD,EAAAA,aAAa,CAACR,aAAd,CAA4BxB,KAA5B;EAEA,SAAOA,KAAP;EACD,CA9CM;;EChDP;;;;;;;AAQA,EAQA;;;;;;;;;;;;;;;;;;;;;;;;;AAwBA,QAAawB,aAAa,GAAG,CAACmB,OAAD,EAAUnH,OAAV,EAAmBY,MAAM,GAAG,KAA5B,KAAsC;EACjE,MAAI4D,KAAJ;;EAEA,MAAI,OAAO2C,OAAP,KAAmB,QAAvB,EAAiC;EAC/B,UAAMC,UAAU,GAAG,IAAIhD,GAAJ,CAAQ+C,OAAR,EAAiB1E,QAAjB,CAAnB;;EAEA,IAA2C;EACzC,UAAI,EAAE0E,OAAO,CAAC7C,UAAR,CAAmB,GAAnB,KAA2B6C,OAAO,CAAC7C,UAAR,CAAmB,MAAnB,CAA7B,CAAJ,EAA8D;EAC5D,cAAM,IAAI8B,6BAAJ,CAAiB,gBAAjB,EAAmC;EACvCjG,UAAAA,UAAU,EAAE,iBAD2B;EAEvCE,UAAAA,QAAQ,EAAE,eAF6B;EAGvCC,UAAAA,SAAS,EAAE;EAH4B,SAAnC,CAAN;EAKD,OAPwC;EAUzC;;;EACA,YAAM+G,YAAY,GAAGF,OAAO,CAAC7C,UAAR,CAAmB,MAAnB,IACjB8C,UAAU,CAACzF,QADM,GACKwF,OAD1B,CAXyC;;EAezC,YAAMG,SAAS,GAAG,QAAlB;;EACA,UAAID,YAAY,CAAC1G,KAAb,CAAmB,IAAIO,MAAJ,CAAY,GAAEoG,SAAU,EAAxB,CAAnB,CAAJ,EAAoD;EAClDvF,QAAAA,iBAAM,CAACG,KAAP,CACK,8DAAD,GACD,cAAaoF,SAAU,2CADtB,GAED,8DAHH;EAKD;EACF;;EAED,UAAMC,aAAa,GAAG,CAAC;EAAChG,MAAAA;EAAD,KAAD,KAAW;EAC/B,MAA2C;EACzC,YAAKA,GAAG,CAACI,QAAJ,KAAiByF,UAAU,CAACzF,QAA7B,IACCJ,GAAG,CAACiB,MAAJ,KAAe4E,UAAU,CAAC5E,MAD/B,EACwC;EACtCT,UAAAA,iBAAM,CAACG,KAAP,CACK,GAAEiF,OAAQ,+CAAX,GACC,GAAE5F,GAAI,sDADP,GAEC,+BAHL;EAID;EACF;;EAED,aAAOA,GAAG,CAACgB,IAAJ,KAAa6E,UAAU,CAAC7E,IAA/B;EACD,KAZD;;EAcAiC,IAAAA,KAAK,GAAG,IAAI/D,KAAJ,CAAU8G,aAAV,EAAyBvH,OAAzB,EAAkCY,MAAlC,CAAR;EACD,GA3CD,MA2CO,IAAIuG,OAAO,YAAYjG,MAAvB,EAA+B;EACpCsD,IAAAA,KAAK,GAAG,IAAIrC,WAAJ,CAAgBgF,OAAhB,EAAyBnH,OAAzB,EAAkCY,MAAlC,CAAR;EACD,GAFM,MAEA,IAAI,OAAOuG,OAAP,KAAmB,UAAvB,EAAmC;EACxC3C,IAAAA,KAAK,GAAG,IAAI/D,KAAJ,CAAU0G,OAAV,EAAmBnH,OAAnB,EAA4BY,MAA5B,CAAR;EACD,GAFM,MAEA,IAAIuG,OAAO,YAAY1G,KAAvB,EAA8B;EACnC+D,IAAAA,KAAK,GAAG2C,OAAR;EACD,GAFM,MAEA;EACL,UAAM,IAAIf,6BAAJ,CAAiB,wBAAjB,EAA2C;EAC/CjG,MAAAA,UAAU,EAAE,iBADmC;EAE/CE,MAAAA,QAAQ,EAAE,eAFqC;EAG/CC,MAAAA,SAAS,EAAE;EAHoC,KAA3C,CAAN;EAKD;;EAED,QAAMkG,aAAa,GAAGC,wBAAwB,EAA9C;EACAD,EAAAA,aAAa,CAACR,aAAd,CAA4BxB,KAA5B;EAEA,SAAOA,KAAP;EACD,CAhEM;;ECxCP;;;;;;;AAQA,EAIA;;;;;;;;;;AASA,QAAauB,eAAe,GAAI/F,OAAD,IAAa;EAC1C,QAAMwG,aAAa,GAAGC,wBAAwB,EAA9C;EACAD,EAAAA,aAAa,CAACT,eAAd,CAA8B/F,OAA9B;EACD,CAHM;;ECrBP;;;;;;;AAQA,EAIA;;;;;;;;;;;;;AAYA,QAAa8F,iBAAiB,GAAI9F,OAAD,IAAa;EAC5C,QAAMwG,aAAa,GAAGC,wBAAwB,EAA9C;EACAD,EAAAA,aAAa,CAACV,iBAAd,CAAgC9F,OAAhC;EACD,CAHM;;ECxBP;;;;;;;AAQA;AAaA,EAA2C;EACzCC,EAAAA,iBAAM,CAACuH,OAAP,CAAe,iBAAf;EACD;;;;;;;;;;;;;;;;;"}
\ No newline at end of file
diff --git a/public/javascripts/workbox/workbox-routing.prod.js b/public/javascripts/workbox/workbox-routing.prod.js
deleted file mode 100644
index ed87f9d1419..00000000000
--- a/public/javascripts/workbox/workbox-routing.prod.js
+++ /dev/null
@@ -1,2 +0,0 @@
-this.workbox=this.workbox||{},this.workbox.routing=function(t,e,r){"use strict";try{self["workbox:routing:4.3.1"]&&_()}catch(t){}const s="GET",n=t=>t&&"object"==typeof t?t:{handle:t};class o{constructor(t,e,r){this.handler=n(e),this.match=t,this.method=r||s}}class i extends o{constructor(t,{whitelist:e=[/./],blacklist:r=[]}={}){super(t=>this.t(t),t),this.s=e,this.o=r}t({url:t,request:e}){if("navigate"!==e.mode)return!1;const r=t.pathname+t.search;for(const t of this.o)if(t.test(r))return!1;return!!this.s.some(t=>t.test(r))}}class u extends o{constructor(t,e,r){super(({url:e})=>{const r=t.exec(e.href);return r?e.origin!==location.origin&&0!==r.index?null:r.slice(1):null},e,r)}}class c{constructor(){this.i=new Map}get routes(){return this.i}addFetchListener(){self.addEventListener("fetch",t=>{const{request:e}=t,r=this.handleRequest({request:e,event:t});r&&t.respondWith(r)})}addCacheListener(){self.addEventListener("message",async t=>{if(t.data&&"CACHE_URLS"===t.data.type){const{payload:e}=t.data,r=Promise.all(e.urlsToCache.map(t=>{"string"==typeof t&&(t=[t]);const e=new Request(...t);return this.handleRequest({request:e})}));t.waitUntil(r),t.ports&&t.ports[0]&&(await r,t.ports[0].postMessage(!0))}})}handleRequest({request:t,event:e}){const r=new URL(t.url,location);if(!r.protocol.startsWith("http"))return;let s,{params:n,route:o}=this.findMatchingRoute({url:r,request:t,event:e}),i=o&&o.handler;if(!i&&this.u&&(i=this.u),i){try{s=i.handle({url:r,request:t,event:e,params:n})}catch(t){s=Promise.reject(t)}return s&&this.h&&(s=s.catch(t=>this.h.handle({url:r,event:e,err:t}))),s}}findMatchingRoute({url:t,request:e,event:r}){const s=this.i.get(e.method)||[];for(const n of s){let s,o=n.match({url:t,request:e,event:r});if(o)return Array.isArray(o)&&o.length>0?s=o:o.constructor===Object&&Object.keys(o).length>0&&(s=o),{route:n,params:s}}return{}}setDefaultHandler(t){this.u=n(t)}setCatchHandler(t){this.h=n(t)}registerRoute(t){this.i.has(t.method)||this.i.set(t.method,[]),this.i.get(t.method).push(t)}unregisterRoute(t){if(!this.i.has(t.method))throw new r.WorkboxError("unregister-route-but-not-found-with-method",{method:t.method});const e=this.i.get(t.method).indexOf(t);if(!(e>-1))throw new r.WorkboxError("unregister-route-route-not-registered");this.i.get(t.method).splice(e,1)}}let a;const h=()=>(a||((a=new c).addFetchListener(),a.addCacheListener()),a);return t.NavigationRoute=i,t.RegExpRoute=u,t.registerNavigationRoute=((t,r={})=>{const s=e.cacheNames.getPrecacheName(r.cacheName),n=new i(async()=>{try{const e=await caches.match(t,{cacheName:s});if(e)return e;throw new Error(`The cache ${s} did not have an entry for `+`${t}.`)}catch(e){return fetch(t)}},{whitelist:r.whitelist,blacklist:r.blacklist});return h().registerRoute(n),n}),t.registerRoute=((t,e,s="GET")=>{let n;if("string"==typeof t){const r=new URL(t,location);n=new o(({url:t})=>t.href===r.href,e,s)}else if(t instanceof RegExp)n=new u(t,e,s);else if("function"==typeof t)n=new o(t,e,s);else{if(!(t instanceof o))throw new r.WorkboxError("unsupported-route-type",{moduleName:"workbox-routing",funcName:"registerRoute",paramName:"capture"});n=t}return h().registerRoute(n),n}),t.Route=o,t.Router=c,t.setCatchHandler=(t=>{h().setCatchHandler(t)}),t.setDefaultHandler=(t=>{h().setDefaultHandler(t)}),t}({},workbox.core._private,workbox.core._private);
-//# sourceMappingURL=workbox-routing.prod.js.map
diff --git a/public/javascripts/workbox/workbox-routing.prod.js.map b/public/javascripts/workbox/workbox-routing.prod.js.map
deleted file mode 100644
index 56e5c0eee45..00000000000
--- a/public/javascripts/workbox/workbox-routing.prod.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"workbox-routing.prod.js","sources":["../_version.mjs","../utils/constants.mjs","../utils/normalizeHandler.mjs","../Route.mjs","../NavigationRoute.mjs","../RegExpRoute.mjs","../Router.mjs","../utils/getOrCreateDefaultRouter.mjs","../registerNavigationRoute.mjs","../registerRoute.mjs","../setCatchHandler.mjs","../setDefaultHandler.mjs"],"sourcesContent":["try{self['workbox:routing:4.3.1']&&_()}catch(e){}// eslint-disable-line","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport '../_version.mjs';\n\n/**\n * The default HTTP method, 'GET', used when there's no specific method\n * configured for a route.\n *\n * @type {string}\n *\n * @private\n */\nexport const defaultMethod = 'GET';\n\n/**\n * The list of valid HTTP methods associated with requests that could be routed.\n *\n * @type {Array<string>}\n *\n * @private\n */\nexport const validMethods = [\n  'DELETE',\n  'GET',\n  'HEAD',\n  'PATCH',\n  'POST',\n  'PUT',\n];\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {assert} from 'workbox-core/_private/assert.mjs';\nimport '../_version.mjs';\n\n/**\n * @param {function()|Object} handler Either a function, or an object with a\n * 'handle' method.\n * @return {Object} An object with a handle method.\n *\n * @private\n */\nexport const normalizeHandler = (handler) => {\n  if (handler && typeof handler === 'object') {\n    if (process.env.NODE_ENV !== 'production') {\n      assert.hasMethod(handler, 'handle', {\n        moduleName: 'workbox-routing',\n        className: 'Route',\n        funcName: 'constructor',\n        paramName: 'handler',\n      });\n    }\n    return handler;\n  } else {\n    if (process.env.NODE_ENV !== 'production') {\n      assert.isType(handler, 'function', {\n        moduleName: 'workbox-routing',\n        className: 'Route',\n        funcName: 'constructor',\n        paramName: 'handler',\n      });\n    }\n    return {handle: handler};\n  }\n};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {assert} from 'workbox-core/_private/assert.mjs';\n\nimport {defaultMethod, validMethods} from './utils/constants.mjs';\nimport {normalizeHandler} from './utils/normalizeHandler.mjs';\nimport './_version.mjs';\n\n/**\n * A `Route` consists of a pair of callback functions, \"match\" and \"handler\".\n * The \"match\" callback determine if a route should be used to \"handle\" a\n * request by returning a non-falsy value if it can. The \"handler\" callback\n * is called when there is a match and should return a Promise that resolves\n * to a `Response`.\n *\n * @memberof workbox.routing\n */\nclass Route {\n  /**\n   * Constructor for Route class.\n   *\n   * @param {workbox.routing.Route~matchCallback} match\n   * A callback function that determines whether the route matches a given\n   * `fetch` event by returning a non-falsy value.\n   * @param {workbox.routing.Route~handlerCallback} handler A callback\n   * function that returns a Promise resolving to a Response.\n   * @param {string} [method='GET'] The HTTP method to match the Route\n   * against.\n   */\n  constructor(match, handler, method) {\n    if (process.env.NODE_ENV !== 'production') {\n      assert.isType(match, 'function', {\n        moduleName: 'workbox-routing',\n        className: 'Route',\n        funcName: 'constructor',\n        paramName: 'match',\n      });\n\n      if (method) {\n        assert.isOneOf(method, validMethods, {paramName: 'method'});\n      }\n    }\n\n    // These values are referenced directly by Router so cannot be\n    // altered by minifification.\n    this.handler = normalizeHandler(handler);\n    this.match = match;\n    this.method = method || defaultMethod;\n  }\n}\n\nexport {Route};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {assert} from 'workbox-core/_private/assert.mjs';\nimport {logger} from 'workbox-core/_private/logger.mjs';\nimport {Route} from './Route.mjs';\nimport './_version.mjs';\n\n/**\n * NavigationRoute makes it easy to create a [Route]{@link\n * workbox.routing.Route} that matches for browser\n * [navigation requests]{@link https://developers.google.com/web/fundamentals/primers/service-workers/high-performance-loading#first_what_are_navigation_requests}.\n *\n * It will only match incoming Requests whose\n * [`mode`]{@link https://fetch.spec.whatwg.org/#concept-request-mode}\n * is set to `navigate`.\n *\n * You can optionally only apply this route to a subset of navigation requests\n * by using one or both of the `blacklist` and `whitelist` parameters.\n *\n * @memberof workbox.routing\n * @extends workbox.routing.Route\n */\nclass NavigationRoute extends Route {\n  /**\n   * If both `blacklist` and `whiltelist` are provided, the `blacklist` will\n   * take precedence and the request will not match this route.\n   *\n   * The regular expressions in `whitelist` and `blacklist`\n   * are matched against the concatenated\n   * [`pathname`]{@link https://developer.mozilla.org/en-US/docs/Web/API/HTMLHyperlinkElementUtils/pathname}\n   * and [`search`]{@link https://developer.mozilla.org/en-US/docs/Web/API/HTMLHyperlinkElementUtils/search}\n   * portions of the requested URL.\n   *\n   * @param {workbox.routing.Route~handlerCallback} handler A callback\n   * function that returns a Promise resulting in a Response.\n   * @param {Object} options\n   * @param {Array<RegExp>} [options.blacklist] If any of these patterns match,\n   * the route will not handle the request (even if a whitelist RegExp matches).\n   * @param {Array<RegExp>} [options.whitelist=[/./]] If any of these patterns\n   * match the URL's pathname and search parameter, the route will handle the\n   * request (assuming the blacklist doesn't match).\n   */\n  constructor(handler, {whitelist = [/./], blacklist = []} = {}) {\n    if (process.env.NODE_ENV !== 'production') {\n      assert.isArrayOfClass(whitelist, RegExp, {\n        moduleName: 'workbox-routing',\n        className: 'NavigationRoute',\n        funcName: 'constructor',\n        paramName: 'options.whitelist',\n      });\n      assert.isArrayOfClass(blacklist, RegExp, {\n        moduleName: 'workbox-routing',\n        className: 'NavigationRoute',\n        funcName: 'constructor',\n        paramName: 'options.blacklist',\n      });\n    }\n\n    super((options) => this._match(options), handler);\n\n    this._whitelist = whitelist;\n    this._blacklist = blacklist;\n  }\n\n  /**\n   * Routes match handler.\n   *\n   * @param {Object} options\n   * @param {URL} options.url\n   * @param {Request} options.request\n   * @return {boolean}\n   *\n   * @private\n   */\n  _match({url, request}) {\n    if (request.mode !== 'navigate') {\n      return false;\n    }\n\n    const pathnameAndSearch = url.pathname + url.search;\n\n    for (const regExp of this._blacklist) {\n      if (regExp.test(pathnameAndSearch)) {\n        if (process.env.NODE_ENV !== 'production') {\n          logger.log(`The navigation route is not being used, since the ` +\n              `URL matches this blacklist pattern: ${regExp}`);\n        }\n        return false;\n      }\n    }\n\n    if (this._whitelist.some((regExp) => regExp.test(pathnameAndSearch))) {\n      if (process.env.NODE_ENV !== 'production') {\n        logger.debug(`The navigation route is being used.`);\n      }\n      return true;\n    }\n\n    if (process.env.NODE_ENV !== 'production') {\n      logger.log(`The navigation route is not being used, since the URL ` +\n          `being navigated to doesn't match the whitelist.`);\n    }\n    return false;\n  }\n}\n\nexport {NavigationRoute};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {assert} from 'workbox-core/_private/assert.mjs';\nimport {logger} from 'workbox-core/_private/logger.mjs';\nimport {Route} from './Route.mjs';\nimport './_version.mjs';\n\n/**\n * RegExpRoute makes it easy to create a regular expression based\n * [Route]{@link workbox.routing.Route}.\n *\n * For same-origin requests the RegExp only needs to match part of the URL. For\n * requests against third-party servers, you must define a RegExp that matches\n * the start of the URL.\n *\n * [See the module docs for info.]{@link https://developers.google.com/web/tools/workbox/modules/workbox-routing}\n *\n * @memberof workbox.routing\n * @extends workbox.routing.Route\n */\nclass RegExpRoute extends Route {\n  /**\n   * If the regulard expression contains\n   * [capture groups]{@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp#grouping-back-references},\n   * th ecaptured values will be passed to the\n   * [handler's]{@link workbox.routing.Route~handlerCallback} `params`\n   * argument.\n   *\n   * @param {RegExp} regExp The regular expression to match against URLs.\n   * @param {workbox.routing.Route~handlerCallback} handler A callback\n   * function that returns a Promise resulting in a Response.\n   * @param {string} [method='GET'] The HTTP method to match the Route\n   * against.\n   */\n  constructor(regExp, handler, method) {\n    if (process.env.NODE_ENV !== 'production') {\n      assert.isInstance(regExp, RegExp, {\n        moduleName: 'workbox-routing',\n        className: 'RegExpRoute',\n        funcName: 'constructor',\n        paramName: 'pattern',\n      });\n    }\n\n    const match = ({url}) => {\n      const result = regExp.exec(url.href);\n\n      // Return null immediately if there's no match.\n      if (!result) {\n        return null;\n      }\n\n      // Require that the match start at the first character in the URL string\n      // if it's a cross-origin request.\n      // See https://github.com/GoogleChrome/workbox/issues/281 for the context\n      // behind this behavior.\n      if ((url.origin !== location.origin) && (result.index !== 0)) {\n        if (process.env.NODE_ENV !== 'production') {\n          logger.debug(\n              `The regular expression '${regExp}' only partially matched ` +\n            `against the cross-origin URL '${url}'. RegExpRoute's will only ` +\n            `handle cross-origin requests if they match the entire URL.`\n          );\n        }\n\n        return null;\n      }\n\n      // If the route matches, but there aren't any capture groups defined, then\n      // this will return [], which is truthy and therefore sufficient to\n      // indicate a match.\n      // If there are capture groups, then it will return their values.\n      return result.slice(1);\n    };\n\n    super(match, handler, method);\n  }\n}\n\nexport {RegExpRoute};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {assert} from 'workbox-core/_private/assert.mjs';\nimport {logger} from 'workbox-core/_private/logger.mjs';\nimport {WorkboxError} from 'workbox-core/_private/WorkboxError.mjs';\nimport {getFriendlyURL} from 'workbox-core/_private/getFriendlyURL.mjs';\n\nimport {normalizeHandler} from './utils/normalizeHandler.mjs';\nimport './_version.mjs';\n\n/**\n * The Router can be used to process a FetchEvent through one or more\n * [Routes]{@link workbox.routing.Route} responding  with a Request if\n * a matching route exists.\n *\n * If no route matches a given a request, the Router will use a \"default\"\n * handler if one is defined.\n *\n * Should the matching Route throw an error, the Router will use a \"catch\"\n * handler if one is defined to gracefully deal with issues and respond with a\n * Request.\n *\n * If a request matches multiple routes, the **earliest** registered route will\n * be used to respond to the request.\n *\n * @memberof workbox.routing\n */\nclass Router {\n  /**\n   * Initializes a new Router.\n   */\n  constructor() {\n    this._routes = new Map();\n  }\n\n  /**\n   * @return {Map<string, Array<workbox.routing.Route>>} routes A `Map` of HTTP\n   * method name ('GET', etc.) to an array of all the corresponding `Route`\n   * instances that are registered.\n   */\n  get routes() {\n    return this._routes;\n  }\n\n  /**\n   * Adds a fetch event listener to respond to events when a route matches\n   * the event's request.\n   */\n  addFetchListener() {\n    self.addEventListener('fetch', (event) => {\n      const {request} = event;\n      const responsePromise = this.handleRequest({request, event});\n      if (responsePromise) {\n        event.respondWith(responsePromise);\n      }\n    });\n  }\n\n  /**\n   * Adds a message event listener for URLs to cache from the window.\n   * This is useful to cache resources loaded on the page prior to when the\n   * service worker started controlling it.\n   *\n   * The format of the message data sent from the window should be as follows.\n   * Where the `urlsToCache` array may consist of URL strings or an array of\n   * URL string + `requestInit` object (the same as you'd pass to `fetch()`).\n   *\n   * ```\n   * {\n   *   type: 'CACHE_URLS',\n   *   payload: {\n   *     urlsToCache: [\n   *       './script1.js',\n   *       './script2.js',\n   *       ['./script3.js', {mode: 'no-cors'}],\n   *     ],\n   *   },\n   * }\n   * ```\n   */\n  addCacheListener() {\n    self.addEventListener('message', async (event) => {\n      if (event.data && event.data.type === 'CACHE_URLS') {\n        const {payload} = event.data;\n\n        if (process.env.NODE_ENV !== 'production') {\n          logger.debug(`Caching URLs from the window`, payload.urlsToCache);\n        }\n\n        const requestPromises = Promise.all(payload.urlsToCache.map((entry) => {\n          if (typeof entry === 'string') {\n            entry = [entry];\n          }\n\n          const request = new Request(...entry);\n          return this.handleRequest({request});\n        }));\n\n        event.waitUntil(requestPromises);\n\n        // If a MessageChannel was used, reply to the message on success.\n        if (event.ports && event.ports[0]) {\n          await requestPromises;\n          event.ports[0].postMessage(true);\n        }\n      }\n    });\n  }\n\n  /**\n   * Apply the routing rules to a FetchEvent object to get a Response from an\n   * appropriate Route's handler.\n   *\n   * @param {Object} options\n   * @param {Request} options.request The request to handle (this is usually\n   *     from a fetch event, but it does not have to be).\n   * @param {FetchEvent} [options.event] The event that triggered the request,\n   *     if applicable.\n   * @return {Promise<Response>|undefined} A promise is returned if a\n   *     registered route can handle the request. If there is no matching\n   *     route and there's no `defaultHandler`, `undefined` is returned.\n   */\n  handleRequest({request, event}) {\n    if (process.env.NODE_ENV !== 'production') {\n      assert.isInstance(request, Request, {\n        moduleName: 'workbox-routing',\n        className: 'Router',\n        funcName: 'handleRequest',\n        paramName: 'options.request',\n      });\n    }\n\n    const url = new URL(request.url, location);\n    if (!url.protocol.startsWith('http')) {\n      if (process.env.NODE_ENV !== 'production') {\n        logger.debug(\n            `Workbox Router only supports URLs that start with 'http'.`);\n      }\n      return;\n    }\n\n    let {params, route} = this.findMatchingRoute({url, request, event});\n    let handler = route && route.handler;\n\n    let debugMessages = [];\n    if (process.env.NODE_ENV !== 'production') {\n      if (handler) {\n        debugMessages.push([\n          `Found a route to handle this request:`, route,\n        ]);\n\n        if (params) {\n          debugMessages.push([\n            `Passing the following params to the route's handler:`, params,\n          ]);\n        }\n      }\n    }\n\n    // If we don't have a handler because there was no matching route, then\n    // fall back to defaultHandler if that's defined.\n    if (!handler && this._defaultHandler) {\n      if (process.env.NODE_ENV !== 'production') {\n        debugMessages.push(`Failed to find a matching route. Falling ` +\n          `back to the default handler.`);\n\n        // This is used for debugging in logs in the case of an error.\n        route = '[Default Handler]';\n      }\n      handler = this._defaultHandler;\n    }\n\n    if (!handler) {\n      if (process.env.NODE_ENV !== 'production') {\n        // No handler so Workbox will do nothing. If logs is set of debug\n        // i.e. verbose, we should print out this information.\n        logger.debug(`No route found for: ${getFriendlyURL(url)}`);\n      }\n      return;\n    }\n\n    if (process.env.NODE_ENV !== 'production') {\n      // We have a handler, meaning Workbox is going to handle the route.\n      // print the routing details to the console.\n      logger.groupCollapsed(`Router is responding to: ${getFriendlyURL(url)}`);\n      debugMessages.forEach((msg) => {\n        if (Array.isArray(msg)) {\n          logger.log(...msg);\n        } else {\n          logger.log(msg);\n        }\n      });\n\n      // The Request and Response objects contains a great deal of information,\n      // hide it under a group in case developers want to see it.\n      logger.groupCollapsed(`View request details here.`);\n      logger.log(request);\n      logger.groupEnd();\n\n      logger.groupEnd();\n    }\n\n    // Wrap in try and catch in case the handle method throws a synchronous\n    // error. It should still callback to the catch handler.\n    let responsePromise;\n    try {\n      responsePromise = handler.handle({url, request, event, params});\n    } catch (err) {\n      responsePromise = Promise.reject(err);\n    }\n\n    if (responsePromise && this._catchHandler) {\n      responsePromise = responsePromise.catch((err) => {\n        if (process.env.NODE_ENV !== 'production') {\n          // Still include URL here as it will be async from the console group\n          // and may not make sense without the URL\n          logger.groupCollapsed(`Error thrown when responding to: ` +\n            ` ${getFriendlyURL(url)}. Falling back to Catch Handler.`);\n          logger.error(`Error thrown by:`, route);\n          logger.error(err);\n          logger.groupEnd();\n        }\n        return this._catchHandler.handle({url, event, err});\n      });\n    }\n\n    return responsePromise;\n  }\n\n  /**\n   * Checks a request and URL (and optionally an event) against the list of\n   * registered routes, and if there's a match, returns the corresponding\n   * route along with any params generated by the match.\n   *\n   * @param {Object} options\n   * @param {URL} options.url\n   * @param {Request} options.request The request to match.\n   * @param {FetchEvent} [options.event] The corresponding event (unless N/A).\n   * @return {Object} An object with `route` and `params` properties.\n   *     They are populated if a matching route was found or `undefined`\n   *     otherwise.\n   */\n  findMatchingRoute({url, request, event}) {\n    if (process.env.NODE_ENV !== 'production') {\n      assert.isInstance(url, URL, {\n        moduleName: 'workbox-routing',\n        className: 'Router',\n        funcName: 'findMatchingRoute',\n        paramName: 'options.url',\n      });\n      assert.isInstance(request, Request, {\n        moduleName: 'workbox-routing',\n        className: 'Router',\n        funcName: 'findMatchingRoute',\n        paramName: 'options.request',\n      });\n    }\n\n    const routes = this._routes.get(request.method) || [];\n    for (const route of routes) {\n      let params;\n      let matchResult = route.match({url, request, event});\n      if (matchResult) {\n        if (Array.isArray(matchResult) && matchResult.length > 0) {\n          // Instead of passing an empty array in as params, use undefined.\n          params = matchResult;\n        } else if ((matchResult.constructor === Object &&\n            Object.keys(matchResult).length > 0)) {\n          // Instead of passing an empty object in as params, use undefined.\n          params = matchResult;\n        }\n\n        // Return early if have a match.\n        return {route, params};\n      }\n    }\n    // If no match was found above, return and empty object.\n    return {};\n  }\n\n  /**\n   * Define a default `handler` that's called when no routes explicitly\n   * match the incoming request.\n   *\n   * Without a default handler, unmatched requests will go against the\n   * network as if there were no service worker present.\n   *\n   * @param {workbox.routing.Route~handlerCallback} handler A callback\n   * function that returns a Promise resulting in a Response.\n   */\n  setDefaultHandler(handler) {\n    this._defaultHandler = normalizeHandler(handler);\n  }\n\n  /**\n   * If a Route throws an error while handling a request, this `handler`\n   * will be called and given a chance to provide a response.\n   *\n   * @param {workbox.routing.Route~handlerCallback} handler A callback\n   * function that returns a Promise resulting in a Response.\n   */\n  setCatchHandler(handler) {\n    this._catchHandler = normalizeHandler(handler);\n  }\n\n  /**\n   * Registers a route with the router.\n   *\n   * @param {workbox.routing.Route} route The route to register.\n   */\n  registerRoute(route) {\n    if (process.env.NODE_ENV !== 'production') {\n      assert.isType(route, 'object', {\n        moduleName: 'workbox-routing',\n        className: 'Router',\n        funcName: 'registerRoute',\n        paramName: 'route',\n      });\n\n      assert.hasMethod(route, 'match', {\n        moduleName: 'workbox-routing',\n        className: 'Router',\n        funcName: 'registerRoute',\n        paramName: 'route',\n      });\n\n      assert.isType(route.handler, 'object', {\n        moduleName: 'workbox-routing',\n        className: 'Router',\n        funcName: 'registerRoute',\n        paramName: 'route',\n      });\n\n      assert.hasMethod(route.handler, 'handle', {\n        moduleName: 'workbox-routing',\n        className: 'Router',\n        funcName: 'registerRoute',\n        paramName: 'route.handler',\n      });\n\n      assert.isType(route.method, 'string', {\n        moduleName: 'workbox-routing',\n        className: 'Router',\n        funcName: 'registerRoute',\n        paramName: 'route.method',\n      });\n    }\n\n    if (!this._routes.has(route.method)) {\n      this._routes.set(route.method, []);\n    }\n\n    // Give precedence to all of the earlier routes by adding this additional\n    // route to the end of the array.\n    this._routes.get(route.method).push(route);\n  }\n\n  /**\n   * Unregisters a route with the router.\n   *\n   * @param {workbox.routing.Route} route The route to unregister.\n   */\n  unregisterRoute(route) {\n    if (!this._routes.has(route.method)) {\n      throw new WorkboxError(\n          'unregister-route-but-not-found-with-method', {\n            method: route.method,\n          }\n      );\n    }\n\n    const routeIndex = this._routes.get(route.method).indexOf(route);\n    if (routeIndex > -1) {\n      this._routes.get(route.method).splice(routeIndex, 1);\n    } else {\n      throw new WorkboxError('unregister-route-route-not-registered');\n    }\n  }\n}\n\nexport {Router};\n","/*\n  Copyright 2019 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {Router} from '../Router.mjs';\nimport '../_version.mjs';\n\nlet defaultRouter;\n\n/**\n * Creates a new, singleton Router instance if one does not exist. If one\n * does already exist, that instance is returned.\n *\n * @private\n * @return {Router}\n */\nexport const getOrCreateDefaultRouter = () => {\n  if (!defaultRouter) {\n    defaultRouter = new Router();\n\n    // The helpers that use the default Router assume these listeners exist.\n    defaultRouter.addFetchListener();\n    defaultRouter.addCacheListener();\n  }\n  return defaultRouter;\n};\n","/*\n  Copyright 2019 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {assert} from 'workbox-core/_private/assert.mjs';\nimport {cacheNames} from 'workbox-core/_private/cacheNames.mjs';\nimport {logger} from 'workbox-core/_private/logger.mjs';\nimport {NavigationRoute} from './NavigationRoute.mjs';\nimport {getOrCreateDefaultRouter} from './utils/getOrCreateDefaultRouter.mjs';\nimport './_version.mjs';\n\n\n/**\n * Registers a route that will return a precached file for a navigation\n * request. This is useful for the\n * [application shell pattern]{@link https://developers.google.com/web/fundamentals/architecture/app-shell}.\n *\n * When determining the URL of the precached HTML document, you will likely need\n * to call `workbox.precaching.getCacheKeyForURL(originalUrl)`, to account for\n * the fact that Workbox's precaching naming conventions often results in URL\n * cache keys that contain extra revisioning info.\n *\n * This method will generate a\n * [NavigationRoute]{@link workbox.routing.NavigationRoute}\n * and call\n * [Router.registerRoute()]{@link workbox.routing.Router#registerRoute} on a\n * singleton Router instance.\n *\n * @param {string} cachedAssetUrl The cache key to use for the HTML file.\n * @param {Object} [options]\n * @param {string} [options.cacheName] Cache name to store and retrieve\n * requests. Defaults to precache cache name provided by\n * [workbox-core.cacheNames]{@link workbox.core.cacheNames}.\n * @param {Array<RegExp>} [options.blacklist=[]] If any of these patterns\n * match, the route will not handle the request (even if a whitelist entry\n * matches).\n * @param {Array<RegExp>} [options.whitelist=[/./]] If any of these patterns\n * match the URL's pathname and search parameter, the route will handle the\n * request (assuming the blacklist doesn't match).\n * @return {workbox.routing.NavigationRoute} Returns the generated\n * Route.\n *\n * @alias workbox.routing.registerNavigationRoute\n */\nexport const registerNavigationRoute = (cachedAssetUrl, options = {}) => {\n  if (process.env.NODE_ENV !== 'production') {\n    assert.isType(cachedAssetUrl, 'string', {\n      moduleName: 'workbox-routing',\n      funcName: 'registerNavigationRoute',\n      paramName: 'cachedAssetUrl',\n    });\n  }\n\n  const cacheName = cacheNames.getPrecacheName(options.cacheName);\n  const handler = async () => {\n    try {\n      const response = await caches.match(cachedAssetUrl, {cacheName});\n\n      if (response) {\n        return response;\n      }\n\n      // This shouldn't normally happen, but there are edge cases:\n      // https://github.com/GoogleChrome/workbox/issues/1441\n      throw new Error(`The cache ${cacheName} did not have an entry for ` +\n          `${cachedAssetUrl}.`);\n    } catch (error) {\n      // If there's either a cache miss, or the caches.match() call threw\n      // an exception, then attempt to fulfill the navigation request with\n      // a response from the network rather than leaving the user with a\n      // failed navigation.\n      if (process.env.NODE_ENV !== 'production') {\n        logger.debug(`Unable to respond to navigation request with ` +\n            `cached response. Falling back to network.`, error);\n      }\n\n      // This might still fail if the browser is offline...\n      return fetch(cachedAssetUrl);\n    }\n  };\n\n  const route = new NavigationRoute(handler, {\n    whitelist: options.whitelist,\n    blacklist: options.blacklist,\n  });\n\n  const defaultRouter = getOrCreateDefaultRouter();\n  defaultRouter.registerRoute(route);\n\n  return route;\n};\n","/*\n  Copyright 2019 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {logger} from 'workbox-core/_private/logger.mjs';\nimport {WorkboxError} from 'workbox-core/_private/WorkboxError.mjs';\nimport {Route} from './Route.mjs';\nimport {RegExpRoute} from './RegExpRoute.mjs';\nimport {getOrCreateDefaultRouter} from './utils/getOrCreateDefaultRouter.mjs';\nimport './_version.mjs';\n\n\n/**\n * Easily register a RegExp, string, or function with a caching\n * strategy to a singleton Router instance.\n *\n * This method will generate a Route for you if needed and\n * call [Router.registerRoute()]{@link\n * workbox.routing.Router#registerRoute}.\n *\n * @param {\n * RegExp|\n * string|\n * workbox.routing.Route~matchCallback|\n * workbox.routing.Route\n * } capture\n * If the capture param is a `Route`, all other arguments will be ignored.\n * @param {workbox.routing.Route~handlerCallback} handler A callback\n * function that returns a Promise resulting in a Response.\n * @param {string} [method='GET'] The HTTP method to match the Route\n * against.\n * @return {workbox.routing.Route} The generated `Route`(Useful for\n * unregistering).\n *\n * @alias workbox.routing.registerRoute\n */\nexport const registerRoute = (capture, handler, method = 'GET') => {\n  let route;\n\n  if (typeof capture === 'string') {\n    const captureUrl = new URL(capture, location);\n\n    if (process.env.NODE_ENV !== 'production') {\n      if (!(capture.startsWith('/') || capture.startsWith('http'))) {\n        throw new WorkboxError('invalid-string', {\n          moduleName: 'workbox-routing',\n          funcName: 'registerRoute',\n          paramName: 'capture',\n        });\n      }\n\n      // We want to check if Express-style wildcards are in the pathname only.\n      // TODO: Remove this log message in v4.\n      const valueToCheck = capture.startsWith('http') ?\n          captureUrl.pathname : capture;\n\n      // See https://github.com/pillarjs/path-to-regexp#parameters\n      const wildcards = '[*:?+]';\n      if (valueToCheck.match(new RegExp(`${wildcards}`))) {\n        logger.debug(\n            `The '$capture' parameter contains an Express-style wildcard ` +\n          `character (${wildcards}). Strings are now always interpreted as ` +\n          `exact matches; use a RegExp for partial or wildcard matches.`\n        );\n      }\n    }\n\n    const matchCallback = ({url}) => {\n      if (process.env.NODE_ENV !== 'production') {\n        if ((url.pathname === captureUrl.pathname) &&\n            (url.origin !== captureUrl.origin)) {\n          logger.debug(\n              `${capture} only partially matches the cross-origin URL ` +\n              `${url}. This route will only handle cross-origin requests ` +\n              `if they match the entire URL.`);\n        }\n      }\n\n      return url.href === captureUrl.href;\n    };\n\n    route = new Route(matchCallback, handler, method);\n  } else if (capture instanceof RegExp) {\n    route = new RegExpRoute(capture, handler, method);\n  } else if (typeof capture === 'function') {\n    route = new Route(capture, handler, method);\n  } else if (capture instanceof Route) {\n    route = capture;\n  } else {\n    throw new WorkboxError('unsupported-route-type', {\n      moduleName: 'workbox-routing',\n      funcName: 'registerRoute',\n      paramName: 'capture',\n    });\n  }\n\n  const defaultRouter = getOrCreateDefaultRouter();\n  defaultRouter.registerRoute(route);\n\n  return route;\n};\n","/*\n  Copyright 2019 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {getOrCreateDefaultRouter} from './utils/getOrCreateDefaultRouter.mjs';\n\nimport './_version.mjs';\n\n/**\n * If a Route throws an error while handling a request, this `handler`\n * will be called and given a chance to provide a response.\n *\n * @param {workbox.routing.Route~handlerCallback} handler A callback\n * function that returns a Promise resulting in a Response.\n *\n * @alias workbox.routing.setCatchHandler\n */\nexport const setCatchHandler = (handler) => {\n  const defaultRouter = getOrCreateDefaultRouter();\n  defaultRouter.setCatchHandler(handler);\n};\n","/*\n  Copyright 2019 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {getOrCreateDefaultRouter} from './utils/getOrCreateDefaultRouter.mjs';\n\nimport './_version.mjs';\n\n/**\n * Define a default `handler` that's called when no routes explicitly\n * match the incoming request.\n *\n * Without a default handler, unmatched requests will go against the\n * network as if there were no service worker present.\n *\n * @param {workbox.routing.Route~handlerCallback} handler A callback\n * function that returns a Promise resulting in a Response.\n *\n * @alias workbox.routing.setDefaultHandler\n */\nexport const setDefaultHandler = (handler) => {\n  const defaultRouter = getOrCreateDefaultRouter();\n  defaultRouter.setDefaultHandler(handler);\n};\n"],"names":["self","_","e","defaultMethod","normalizeHandler","handler","handle","Route","constructor","match","method","NavigationRoute","whitelist","blacklist","options","this","_match","_whitelist","_blacklist","url","request","mode","pathnameAndSearch","pathname","search","regExp","test","some","RegExpRoute","result","exec","href","origin","location","index","slice","Router","_routes","Map","addFetchListener","addEventListener","event","responsePromise","handleRequest","respondWith","addCacheListener","async","data","type","payload","requestPromises","Promise","all","urlsToCache","map","entry","Request","waitUntil","ports","postMessage","URL","protocol","startsWith","params","route","findMatchingRoute","_defaultHandler","err","reject","_catchHandler","catch","routes","get","matchResult","Array","isArray","length","Object","keys","setDefaultHandler","setCatchHandler","registerRoute","has","set","push","unregisterRoute","WorkboxError","routeIndex","indexOf","splice","defaultRouter","getOrCreateDefaultRouter","cachedAssetUrl","cacheName","cacheNames","getPrecacheName","response","caches","Error","error","fetch","capture","captureUrl","RegExp","moduleName","funcName","paramName"],"mappings":"gFAAA,IAAIA,KAAK,0BAA0BC,IAAI,MAAMC,ICkBtC,MAAMC,EAAgB,MCAhBC,EAAoBC,GAC3BA,GAA8B,iBAAZA,EASbA,EAUA,CAACC,OAAQD,GCfpB,MAAME,EAYJC,YAAYC,EAAOJ,EAASK,QAgBrBL,QAAUD,EAAiBC,QAC3BI,MAAQA,OACRC,OAASA,GAAUP,GCzB5B,MAAMQ,UAAwBJ,EAoB5BC,YAAYH,GAASO,UAACA,EAAY,CAAC,KAAdC,UAAoBA,EAAY,IAAM,UAgBlDC,GAAYC,KAAKC,EAAOF,GAAUT,QAEpCY,EAAaL,OACbM,EAAaL,EAapBG,GAAOG,IAACA,EAADC,QAAMA,OACU,aAAjBA,EAAQC,YACH,QAGHC,EAAoBH,EAAII,SAAWJ,EAAIK,WAExC,MAAMC,KAAUV,KAAKG,KACpBO,EAAOC,KAAKJ,UAKP,UAIPP,KAAKE,EAAWU,KAAMF,GAAWA,EAAOC,KAAKJ,KCvErD,MAAMM,UAAoBrB,EAcxBC,YAAYiB,EAAQpB,EAASK,SAUb,EAAES,IAAAA,YACRU,EAASJ,EAAOK,KAAKX,EAAIY,aAG1BF,EAQAV,EAAIa,SAAWC,SAASD,QAA6B,IAAjBH,EAAOK,MASvC,KAOFL,EAAOM,MAAM,GAvBX,MA0BE9B,EAASK,IChD1B,MAAM0B,EAIJ5B,mBACO6B,EAAU,IAAIC,wBASZvB,KAAKsB,EAOdE,mBACEvC,KAAKwC,iBAAiB,QAAUC,UACxBrB,QAACA,GAAWqB,EACZC,EAAkB3B,KAAK4B,cAAc,CAACvB,QAAAA,EAASqB,MAAAA,IACjDC,GACFD,EAAMG,YAAYF,KA2BxBG,mBACE7C,KAAKwC,iBAAiB,UAAWM,MAAAA,OAC3BL,EAAMM,MAA4B,eAApBN,EAAMM,KAAKC,KAAuB,OAC5CC,QAACA,GAAWR,EAAMM,KAMlBG,EAAkBC,QAAQC,IAAIH,EAAQI,YAAYC,IAAKC,IACtC,iBAAVA,IACTA,EAAQ,CAACA,UAGLnC,EAAU,IAAIoC,WAAWD,UACxBxC,KAAK4B,cAAc,CAACvB,QAAAA,OAG7BqB,EAAMgB,UAAUP,GAGZT,EAAMiB,OAASjB,EAAMiB,MAAM,WACvBR,EACNT,EAAMiB,MAAM,GAAGC,aAAY,OAmBnChB,eAAcvB,QAACA,EAADqB,MAAUA,UAUhBtB,EAAM,IAAIyC,IAAIxC,EAAQD,IAAKc,cAC5Bd,EAAI0C,SAASC,WAAW,mBAuEzBpB,GA/DAqB,OAACA,EAADC,MAASA,GAASjD,KAAKkD,kBAAkB,CAAC9C,IAAAA,EAAKC,QAAAA,EAASqB,MAAAA,IACxDpC,EAAU2D,GAASA,EAAM3D,YAmBxBA,GAAWU,KAAKmD,IAQnB7D,EAAUU,KAAKmD,GAGZ7D,OAkCHqC,EAAkBrC,EAAQC,OAAO,CAACa,IAAAA,EAAKC,QAAAA,EAASqB,MAAAA,EAAOsB,OAAAA,IACvD,MAAOI,GACPzB,EAAkBS,QAAQiB,OAAOD,UAG/BzB,GAAmB3B,KAAKsD,IAC1B3B,EAAkBA,EAAgB4B,MAAOH,GAUhCpD,KAAKsD,EAAc/D,OAAO,CAACa,IAAAA,EAAKsB,MAAAA,EAAO0B,IAAAA,MAI3CzB,GAgBTuB,mBAAkB9C,IAACA,EAADC,QAAMA,EAANqB,MAAeA,UAgBzB8B,EAASxD,KAAKsB,EAAQmC,IAAIpD,EAAQV,SAAW,OAC9C,MAAMsD,KAASO,EAAQ,KACtBR,EACAU,EAAcT,EAAMvD,MAAM,CAACU,IAAAA,EAAKC,QAAAA,EAASqB,MAAAA,OACzCgC,SACEC,MAAMC,QAAQF,IAAgBA,EAAYG,OAAS,EAErDb,EAASU,EACCA,EAAYjE,cAAgBqE,QACpCA,OAAOC,KAAKL,GAAaG,OAAS,IAEpCb,EAASU,GAIJ,CAACT,MAAAA,EAAOD,OAAAA,SAIZ,GAaTgB,kBAAkB1E,QACX6D,EAAkB9D,EAAiBC,GAU1C2E,gBAAgB3E,QACTgE,EAAgBjE,EAAiBC,GAQxC4E,cAAcjB,GAsCPjD,KAAKsB,EAAQ6C,IAAIlB,EAAMtD,cACrB2B,EAAQ8C,IAAInB,EAAMtD,OAAQ,SAK5B2B,EAAQmC,IAAIR,EAAMtD,QAAQ0E,KAAKpB,GAQtCqB,gBAAgBrB,OACTjD,KAAKsB,EAAQ6C,IAAIlB,EAAMtD,cACpB,IAAI4E,eACN,6CAA8C,CAC5C5E,OAAQsD,EAAMtD,eAKhB6E,EAAaxE,KAAKsB,EAAQmC,IAAIR,EAAMtD,QAAQ8E,QAAQxB,QACtDuB,GAAc,SAGV,IAAID,eAAa,8CAFlBjD,EAAQmC,IAAIR,EAAMtD,QAAQ+E,OAAOF,EAAY,IChXxD,IAAIG,EASG,MAAMC,EAA2B,KACjCD,KACHA,EAAgB,IAAItD,GAGNG,mBACdmD,EAAc7C,oBAET6C,wECoB8B,EAACE,EAAgB9E,EAAU,YAS1D+E,EAAYC,aAAWC,gBAAgBjF,EAAQ+E,WA4B/C7B,EAAQ,IAAIrD,EA3BFmC,oBAENkD,QAAiBC,OAAOxF,MAAMmF,EAAgB,CAACC,UAAAA,OAEjDG,SACKA,QAKH,IAAIE,mBAAmBL,kCACtBD,MACP,MAAOO,UAWAC,MAAMR,KAI0B,CACzChF,UAAWE,EAAQF,UACnBC,UAAWC,EAAQD,mBAGC8E,IACRV,cAAcjB,GAErBA,oBCrDoB,EAACqC,EAAShG,EAASK,EAAS,aACnDsD,KAEmB,iBAAZqC,EAAsB,OACzBC,EAAa,IAAI1C,IAAIyC,EAASpE,UAyCpC+B,EAAQ,IAAIzD,EAdU,EAAEY,IAAAA,KAWfA,EAAIY,OAASuE,EAAWvE,KAGA1B,EAASK,QACrC,GAAI2F,aAAmBE,OAC5BvC,EAAQ,IAAIpC,EAAYyE,EAAShG,EAASK,QACrC,GAAuB,mBAAZ2F,EAChBrC,EAAQ,IAAIzD,EAAM8F,EAAShG,EAASK,OAC/B,CAAA,KAAI2F,aAAmB9F,SAGtB,IAAI+E,eAAa,yBAA0B,CAC/CkB,WAAY,kBACZC,SAAU,gBACVC,UAAW,YALb1C,EAAQqC,SASYV,IACRV,cAAcjB,GAErBA,2CClFuB3D,CAAAA,IACRsF,IACRX,gBAAgB3E,yBCCEA,CAAAA,IACVsF,IACRZ,kBAAkB1E"}
\ No newline at end of file
diff --git a/public/javascripts/workbox/workbox-strategies.dev.js b/public/javascripts/workbox/workbox-strategies.dev.js
deleted file mode 100644
index e88a65d8b76..00000000000
--- a/public/javascripts/workbox/workbox-strategies.dev.js
+++ /dev/null
@@ -1,1138 +0,0 @@
-this.workbox = this.workbox || {};
-this.workbox.strategies = (function (exports, logger_mjs, assert_mjs, cacheNames_mjs, cacheWrapper_mjs, fetchWrapper_mjs, getFriendlyURL_mjs, WorkboxError_mjs) {
-  'use strict';
-
-  try {
-    self['workbox:strategies:4.3.1'] && _();
-  } catch (e) {} // eslint-disable-line
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-
-  const getFriendlyURL = url => {
-    const urlObj = new URL(url, location);
-
-    if (urlObj.origin === location.origin) {
-      return urlObj.pathname;
-    }
-
-    return urlObj.href;
-  };
-
-  const messages = {
-    strategyStart: (strategyName, request) => `Using ${strategyName} to ` + `respond to '${getFriendlyURL(request.url)}'`,
-    printFinalResponse: response => {
-      if (response) {
-        logger_mjs.logger.groupCollapsed(`View the final response here.`);
-        logger_mjs.logger.log(response);
-        logger_mjs.logger.groupEnd();
-      }
-    }
-  };
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  /**
-   * An implementation of a [cache-first]{@link https://developers.google.com/web/fundamentals/instant-and-offline/offline-cookbook/#cache-falling-back-to-network}
-   * request strategy.
-   *
-   * A cache first strategy is useful for assets that have been revisioned,
-   * such as URLs like `/styles/example.a8f5f1.css`, since they
-   * can be cached for long periods of time.
-   *
-   * If the network request fails, and there is no cache match, this will throw
-   * a `WorkboxError` exception.
-   *
-   * @memberof workbox.strategies
-   */
-
-  class CacheFirst {
-    /**
-     * @param {Object} options
-     * @param {string} options.cacheName Cache name to store and retrieve
-     * requests. Defaults to cache names provided by
-     * [workbox-core]{@link workbox.core.cacheNames}.
-     * @param {Array<Object>} options.plugins [Plugins]{@link https://developers.google.com/web/tools/workbox/guides/using-plugins}
-     * to use in conjunction with this caching strategy.
-     * @param {Object} options.fetchOptions Values passed along to the
-     * [`init`](https://developer.mozilla.org/en-US/docs/Web/API/WindowOrWorkerGlobalScope/fetch#Parameters)
-     * of all fetch() requests made by this strategy.
-     * @param {Object} options.matchOptions [`CacheQueryOptions`](https://w3c.github.io/ServiceWorker/#dictdef-cachequeryoptions)
-     */
-    constructor(options = {}) {
-      this._cacheName = cacheNames_mjs.cacheNames.getRuntimeName(options.cacheName);
-      this._plugins = options.plugins || [];
-      this._fetchOptions = options.fetchOptions || null;
-      this._matchOptions = options.matchOptions || null;
-    }
-    /**
-     * This method will perform a request strategy and follows an API that
-     * will work with the
-     * [Workbox Router]{@link workbox.routing.Router}.
-     *
-     * @param {Object} options
-     * @param {Request} options.request The request to run this strategy for.
-     * @param {Event} [options.event] The event that triggered the request.
-     * @return {Promise<Response>}
-     */
-
-
-    async handle({
-      event,
-      request
-    }) {
-      return this.makeRequest({
-        event,
-        request: request || event.request
-      });
-    }
-    /**
-     * This method can be used to perform a make a standalone request outside the
-     * context of the [Workbox Router]{@link workbox.routing.Router}.
-     *
-     * See "[Advanced Recipes](https://developers.google.com/web/tools/workbox/guides/advanced-recipes#make-requests)"
-     * for more usage information.
-     *
-     * @param {Object} options
-     * @param {Request|string} options.request Either a
-     *     [`Request`]{@link https://developer.mozilla.org/en-US/docs/Web/API/Request}
-     *     object, or a string URL, corresponding to the request to be made.
-     * @param {FetchEvent} [options.event] If provided, `event.waitUntil()` will
-           be called automatically to extend the service worker's lifetime.
-     * @return {Promise<Response>}
-     */
-
-
-    async makeRequest({
-      event,
-      request
-    }) {
-      const logs = [];
-
-      if (typeof request === 'string') {
-        request = new Request(request);
-      }
-
-      {
-        assert_mjs.assert.isInstance(request, Request, {
-          moduleName: 'workbox-strategies',
-          className: 'CacheFirst',
-          funcName: 'makeRequest',
-          paramName: 'request'
-        });
-      }
-
-      let response = await cacheWrapper_mjs.cacheWrapper.match({
-        cacheName: this._cacheName,
-        request,
-        event,
-        matchOptions: this._matchOptions,
-        plugins: this._plugins
-      });
-      let error;
-
-      if (!response) {
-        {
-          logs.push(`No response found in the '${this._cacheName}' cache. ` + `Will respond with a network request.`);
-        }
-
-        try {
-          response = await this._getFromNetwork(request, event);
-        } catch (err) {
-          error = err;
-        }
-
-        {
-          if (response) {
-            logs.push(`Got response from network.`);
-          } else {
-            logs.push(`Unable to get a response from the network.`);
-          }
-        }
-      } else {
-        {
-          logs.push(`Found a cached response in the '${this._cacheName}' cache.`);
-        }
-      }
-
-      {
-        logger_mjs.logger.groupCollapsed(messages.strategyStart('CacheFirst', request));
-
-        for (let log of logs) {
-          logger_mjs.logger.log(log);
-        }
-
-        messages.printFinalResponse(response);
-        logger_mjs.logger.groupEnd();
-      }
-
-      if (!response) {
-        throw new WorkboxError_mjs.WorkboxError('no-response', {
-          url: request.url,
-          error
-        });
-      }
-
-      return response;
-    }
-    /**
-     * Handles the network and cache part of CacheFirst.
-     *
-     * @param {Request} request
-     * @param {FetchEvent} [event]
-     * @return {Promise<Response>}
-     *
-     * @private
-     */
-
-
-    async _getFromNetwork(request, event) {
-      const response = await fetchWrapper_mjs.fetchWrapper.fetch({
-        request,
-        event,
-        fetchOptions: this._fetchOptions,
-        plugins: this._plugins
-      }); // Keep the service worker while we put the request to the cache
-
-      const responseClone = response.clone();
-      const cachePutPromise = cacheWrapper_mjs.cacheWrapper.put({
-        cacheName: this._cacheName,
-        request,
-        response: responseClone,
-        event,
-        plugins: this._plugins
-      });
-
-      if (event) {
-        try {
-          event.waitUntil(cachePutPromise);
-        } catch (error) {
-          {
-            logger_mjs.logger.warn(`Unable to ensure service worker stays alive when ` + `updating cache for '${getFriendlyURL_mjs.getFriendlyURL(request.url)}'.`);
-          }
-        }
-      }
-
-      return response;
-    }
-
-  }
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  /**
-   * An implementation of a
-   * [cache-only]{@link https://developers.google.com/web/fundamentals/instant-and-offline/offline-cookbook/#cache-only}
-   * request strategy.
-   *
-   * This class is useful if you want to take advantage of any
-   * [Workbox plugins]{@link https://developers.google.com/web/tools/workbox/guides/using-plugins}.
-   *
-   * If there is no cache match, this will throw a `WorkboxError` exception.
-   *
-   * @memberof workbox.strategies
-   */
-
-  class CacheOnly {
-    /**
-     * @param {Object} options
-     * @param {string} options.cacheName Cache name to store and retrieve
-     * requests. Defaults to cache names provided by
-     * [workbox-core]{@link workbox.core.cacheNames}.
-     * @param {Array<Object>} options.plugins [Plugins]{@link https://developers.google.com/web/tools/workbox/guides/using-plugins}
-     * to use in conjunction with this caching strategy.
-     * @param {Object} options.matchOptions [`CacheQueryOptions`](https://w3c.github.io/ServiceWorker/#dictdef-cachequeryoptions)
-     */
-    constructor(options = {}) {
-      this._cacheName = cacheNames_mjs.cacheNames.getRuntimeName(options.cacheName);
-      this._plugins = options.plugins || [];
-      this._matchOptions = options.matchOptions || null;
-    }
-    /**
-     * This method will perform a request strategy and follows an API that
-     * will work with the
-     * [Workbox Router]{@link workbox.routing.Router}.
-     *
-     * @param {Object} options
-     * @param {Request} options.request The request to run this strategy for.
-     * @param {Event} [options.event] The event that triggered the request.
-     * @return {Promise<Response>}
-     */
-
-
-    async handle({
-      event,
-      request
-    }) {
-      return this.makeRequest({
-        event,
-        request: request || event.request
-      });
-    }
-    /**
-     * This method can be used to perform a make a standalone request outside the
-     * context of the [Workbox Router]{@link workbox.routing.Router}.
-     *
-     * See "[Advanced Recipes](https://developers.google.com/web/tools/workbox/guides/advanced-recipes#make-requests)"
-     * for more usage information.
-     *
-     * @param {Object} options
-     * @param {Request|string} options.request Either a
-     *     [`Request`]{@link https://developer.mozilla.org/en-US/docs/Web/API/Request}
-     *     object, or a string URL, corresponding to the request to be made.
-     * @param {FetchEvent} [options.event] If provided, `event.waitUntil()` will
-     *     be called automatically to extend the service worker's lifetime.
-     * @return {Promise<Response>}
-     */
-
-
-    async makeRequest({
-      event,
-      request
-    }) {
-      if (typeof request === 'string') {
-        request = new Request(request);
-      }
-
-      {
-        assert_mjs.assert.isInstance(request, Request, {
-          moduleName: 'workbox-strategies',
-          className: 'CacheOnly',
-          funcName: 'makeRequest',
-          paramName: 'request'
-        });
-      }
-
-      const response = await cacheWrapper_mjs.cacheWrapper.match({
-        cacheName: this._cacheName,
-        request,
-        event,
-        matchOptions: this._matchOptions,
-        plugins: this._plugins
-      });
-
-      {
-        logger_mjs.logger.groupCollapsed(messages.strategyStart('CacheOnly', request));
-
-        if (response) {
-          logger_mjs.logger.log(`Found a cached response in the '${this._cacheName}'` + ` cache.`);
-          messages.printFinalResponse(response);
-        } else {
-          logger_mjs.logger.log(`No response found in the '${this._cacheName}' cache.`);
-        }
-
-        logger_mjs.logger.groupEnd();
-      }
-
-      if (!response) {
-        throw new WorkboxError_mjs.WorkboxError('no-response', {
-          url: request.url
-        });
-      }
-
-      return response;
-    }
-
-  }
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  const cacheOkAndOpaquePlugin = {
-    /**
-     * Returns a valid response (to allow caching) if the status is 200 (OK) or
-     * 0 (opaque).
-     *
-     * @param {Object} options
-     * @param {Response} options.response
-     * @return {Response|null}
-     *
-     * @private
-     */
-    cacheWillUpdate: ({
-      response
-    }) => {
-      if (response.status === 200 || response.status === 0) {
-        return response;
-      }
-
-      return null;
-    }
-  };
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  /**
-   * An implementation of a
-   * [network first]{@link https://developers.google.com/web/fundamentals/instant-and-offline/offline-cookbook/#network-falling-back-to-cache}
-   * request strategy.
-   *
-   * By default, this strategy will cache responses with a 200 status code as
-   * well as [opaque responses]{@link https://developers.google.com/web/tools/workbox/guides/handle-third-party-requests}.
-   * Opaque responses are are cross-origin requests where the response doesn't
-   * support [CORS]{@link https://enable-cors.org/}.
-   *
-   * If the network request fails, and there is no cache match, this will throw
-   * a `WorkboxError` exception.
-   *
-   * @memberof workbox.strategies
-   */
-
-  class NetworkFirst {
-    /**
-     * @param {Object} options
-     * @param {string} options.cacheName Cache name to store and retrieve
-     * requests. Defaults to cache names provided by
-     * [workbox-core]{@link workbox.core.cacheNames}.
-     * @param {Array<Object>} options.plugins [Plugins]{@link https://developers.google.com/web/tools/workbox/guides/using-plugins}
-     * to use in conjunction with this caching strategy.
-     * @param {Object} options.fetchOptions Values passed along to the
-     * [`init`](https://developer.mozilla.org/en-US/docs/Web/API/WindowOrWorkerGlobalScope/fetch#Parameters)
-     * of all fetch() requests made by this strategy.
-     * @param {Object} options.matchOptions [`CacheQueryOptions`](https://w3c.github.io/ServiceWorker/#dictdef-cachequeryoptions)
-     * @param {number} options.networkTimeoutSeconds If set, any network requests
-     * that fail to respond within the timeout will fallback to the cache.
-     *
-     * This option can be used to combat
-     * "[lie-fi]{@link https://developers.google.com/web/fundamentals/performance/poor-connectivity/#lie-fi}"
-     * scenarios.
-     */
-    constructor(options = {}) {
-      this._cacheName = cacheNames_mjs.cacheNames.getRuntimeName(options.cacheName);
-
-      if (options.plugins) {
-        let isUsingCacheWillUpdate = options.plugins.some(plugin => !!plugin.cacheWillUpdate);
-        this._plugins = isUsingCacheWillUpdate ? options.plugins : [cacheOkAndOpaquePlugin, ...options.plugins];
-      } else {
-        // No plugins passed in, use the default plugin.
-        this._plugins = [cacheOkAndOpaquePlugin];
-      }
-
-      this._networkTimeoutSeconds = options.networkTimeoutSeconds;
-
-      {
-        if (this._networkTimeoutSeconds) {
-          assert_mjs.assert.isType(this._networkTimeoutSeconds, 'number', {
-            moduleName: 'workbox-strategies',
-            className: 'NetworkFirst',
-            funcName: 'constructor',
-            paramName: 'networkTimeoutSeconds'
-          });
-        }
-      }
-
-      this._fetchOptions = options.fetchOptions || null;
-      this._matchOptions = options.matchOptions || null;
-    }
-    /**
-     * This method will perform a request strategy and follows an API that
-     * will work with the
-     * [Workbox Router]{@link workbox.routing.Router}.
-     *
-     * @param {Object} options
-     * @param {Request} options.request The request to run this strategy for.
-     * @param {Event} [options.event] The event that triggered the request.
-     * @return {Promise<Response>}
-     */
-
-
-    async handle({
-      event,
-      request
-    }) {
-      return this.makeRequest({
-        event,
-        request: request || event.request
-      });
-    }
-    /**
-     * This method can be used to perform a make a standalone request outside the
-     * context of the [Workbox Router]{@link workbox.routing.Router}.
-     *
-     * See "[Advanced Recipes](https://developers.google.com/web/tools/workbox/guides/advanced-recipes#make-requests)"
-     * for more usage information.
-     *
-     * @param {Object} options
-     * @param {Request|string} options.request Either a
-     *     [`Request`]{@link https://developer.mozilla.org/en-US/docs/Web/API/Request}
-     *     object, or a string URL, corresponding to the request to be made.
-     * @param {FetchEvent} [options.event] If provided, `event.waitUntil()` will
-     *     be called automatically to extend the service worker's lifetime.
-     * @return {Promise<Response>}
-     */
-
-
-    async makeRequest({
-      event,
-      request
-    }) {
-      const logs = [];
-
-      if (typeof request === 'string') {
-        request = new Request(request);
-      }
-
-      {
-        assert_mjs.assert.isInstance(request, Request, {
-          moduleName: 'workbox-strategies',
-          className: 'NetworkFirst',
-          funcName: 'handle',
-          paramName: 'makeRequest'
-        });
-      }
-
-      const promises = [];
-      let timeoutId;
-
-      if (this._networkTimeoutSeconds) {
-        const {
-          id,
-          promise
-        } = this._getTimeoutPromise({
-          request,
-          event,
-          logs
-        });
-
-        timeoutId = id;
-        promises.push(promise);
-      }
-
-      const networkPromise = this._getNetworkPromise({
-        timeoutId,
-        request,
-        event,
-        logs
-      });
-
-      promises.push(networkPromise); // Promise.race() will resolve as soon as the first promise resolves.
-
-      let response = await Promise.race(promises); // If Promise.race() resolved with null, it might be due to a network
-      // timeout + a cache miss. If that were to happen, we'd rather wait until
-      // the networkPromise resolves instead of returning null.
-      // Note that it's fine to await an already-resolved promise, so we don't
-      // have to check to see if it's still "in flight".
-
-      if (!response) {
-        response = await networkPromise;
-      }
-
-      {
-        logger_mjs.logger.groupCollapsed(messages.strategyStart('NetworkFirst', request));
-
-        for (let log of logs) {
-          logger_mjs.logger.log(log);
-        }
-
-        messages.printFinalResponse(response);
-        logger_mjs.logger.groupEnd();
-      }
-
-      if (!response) {
-        throw new WorkboxError_mjs.WorkboxError('no-response', {
-          url: request.url
-        });
-      }
-
-      return response;
-    }
-    /**
-     * @param {Object} options
-     * @param {Request} options.request
-     * @param {Array} options.logs A reference to the logs array
-     * @param {Event} [options.event]
-     * @return {Promise<Response>}
-     *
-     * @private
-     */
-
-
-    _getTimeoutPromise({
-      request,
-      logs,
-      event
-    }) {
-      let timeoutId;
-      const timeoutPromise = new Promise(resolve => {
-        const onNetworkTimeout = async () => {
-          {
-            logs.push(`Timing out the network response at ` + `${this._networkTimeoutSeconds} seconds.`);
-          }
-
-          resolve((await this._respondFromCache({
-            request,
-            event
-          })));
-        };
-
-        timeoutId = setTimeout(onNetworkTimeout, this._networkTimeoutSeconds * 1000);
-      });
-      return {
-        promise: timeoutPromise,
-        id: timeoutId
-      };
-    }
-    /**
-     * @param {Object} options
-     * @param {number|undefined} options.timeoutId
-     * @param {Request} options.request
-     * @param {Array} options.logs A reference to the logs Array.
-     * @param {Event} [options.event]
-     * @return {Promise<Response>}
-     *
-     * @private
-     */
-
-
-    async _getNetworkPromise({
-      timeoutId,
-      request,
-      logs,
-      event
-    }) {
-      let error;
-      let response;
-
-      try {
-        response = await fetchWrapper_mjs.fetchWrapper.fetch({
-          request,
-          event,
-          fetchOptions: this._fetchOptions,
-          plugins: this._plugins
-        });
-      } catch (err) {
-        error = err;
-      }
-
-      if (timeoutId) {
-        clearTimeout(timeoutId);
-      }
-
-      {
-        if (response) {
-          logs.push(`Got response from network.`);
-        } else {
-          logs.push(`Unable to get a response from the network. Will respond ` + `with a cached response.`);
-        }
-      }
-
-      if (error || !response) {
-        response = await this._respondFromCache({
-          request,
-          event
-        });
-
-        {
-          if (response) {
-            logs.push(`Found a cached response in the '${this._cacheName}'` + ` cache.`);
-          } else {
-            logs.push(`No response found in the '${this._cacheName}' cache.`);
-          }
-        }
-      } else {
-        // Keep the service worker alive while we put the request in the cache
-        const responseClone = response.clone();
-        const cachePut = cacheWrapper_mjs.cacheWrapper.put({
-          cacheName: this._cacheName,
-          request,
-          response: responseClone,
-          event,
-          plugins: this._plugins
-        });
-
-        if (event) {
-          try {
-            // The event has been responded to so we can keep the SW alive to
-            // respond to the request
-            event.waitUntil(cachePut);
-          } catch (err) {
-            {
-              logger_mjs.logger.warn(`Unable to ensure service worker stays alive when ` + `updating cache for '${getFriendlyURL_mjs.getFriendlyURL(request.url)}'.`);
-            }
-          }
-        }
-      }
-
-      return response;
-    }
-    /**
-     * Used if the network timeouts or fails to make the request.
-     *
-     * @param {Object} options
-     * @param {Request} request The request to match in the cache
-     * @param {Event} [options.event]
-     * @return {Promise<Object>}
-     *
-     * @private
-     */
-
-
-    _respondFromCache({
-      event,
-      request
-    }) {
-      return cacheWrapper_mjs.cacheWrapper.match({
-        cacheName: this._cacheName,
-        request,
-        event,
-        matchOptions: this._matchOptions,
-        plugins: this._plugins
-      });
-    }
-
-  }
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  /**
-   * An implementation of a
-   * [network-only]{@link https://developers.google.com/web/fundamentals/instant-and-offline/offline-cookbook/#network-only}
-   * request strategy.
-   *
-   * This class is useful if you want to take advantage of any
-   * [Workbox plugins]{@link https://developers.google.com/web/tools/workbox/guides/using-plugins}.
-   *
-   * If the network request fails, this will throw a `WorkboxError` exception.
-   *
-   * @memberof workbox.strategies
-   */
-
-  class NetworkOnly {
-    /**
-     * @param {Object} options
-     * @param {string} options.cacheName Cache name to store and retrieve
-     * requests. Defaults to cache names provided by
-     * [workbox-core]{@link workbox.core.cacheNames}.
-     * @param {Array<Object>} options.plugins [Plugins]{@link https://developers.google.com/web/tools/workbox/guides/using-plugins}
-     * to use in conjunction with this caching strategy.
-     * @param {Object} options.fetchOptions Values passed along to the
-     * [`init`](https://developer.mozilla.org/en-US/docs/Web/API/WindowOrWorkerGlobalScope/fetch#Parameters)
-     * of all fetch() requests made by this strategy.
-     */
-    constructor(options = {}) {
-      this._cacheName = cacheNames_mjs.cacheNames.getRuntimeName(options.cacheName);
-      this._plugins = options.plugins || [];
-      this._fetchOptions = options.fetchOptions || null;
-    }
-    /**
-     * This method will perform a request strategy and follows an API that
-     * will work with the
-     * [Workbox Router]{@link workbox.routing.Router}.
-     *
-     * @param {Object} options
-     * @param {Request} options.request The request to run this strategy for.
-     * @param {Event} [options.event] The event that triggered the request.
-     * @return {Promise<Response>}
-     */
-
-
-    async handle({
-      event,
-      request
-    }) {
-      return this.makeRequest({
-        event,
-        request: request || event.request
-      });
-    }
-    /**
-     * This method can be used to perform a make a standalone request outside the
-     * context of the [Workbox Router]{@link workbox.routing.Router}.
-     *
-     * See "[Advanced Recipes](https://developers.google.com/web/tools/workbox/guides/advanced-recipes#make-requests)"
-     * for more usage information.
-     *
-     * @param {Object} options
-     * @param {Request|string} options.request Either a
-     *     [`Request`]{@link https://developer.mozilla.org/en-US/docs/Web/API/Request}
-     *     object, or a string URL, corresponding to the request to be made.
-     * @param {FetchEvent} [options.event] If provided, `event.waitUntil()` will
-     *     be called automatically to extend the service worker's lifetime.
-     * @return {Promise<Response>}
-     */
-
-
-    async makeRequest({
-      event,
-      request
-    }) {
-      if (typeof request === 'string') {
-        request = new Request(request);
-      }
-
-      {
-        assert_mjs.assert.isInstance(request, Request, {
-          moduleName: 'workbox-strategies',
-          className: 'NetworkOnly',
-          funcName: 'handle',
-          paramName: 'request'
-        });
-      }
-
-      let error;
-      let response;
-
-      try {
-        response = await fetchWrapper_mjs.fetchWrapper.fetch({
-          request,
-          event,
-          fetchOptions: this._fetchOptions,
-          plugins: this._plugins
-        });
-      } catch (err) {
-        error = err;
-      }
-
-      {
-        logger_mjs.logger.groupCollapsed(messages.strategyStart('NetworkOnly', request));
-
-        if (response) {
-          logger_mjs.logger.log(`Got response from network.`);
-        } else {
-          logger_mjs.logger.log(`Unable to get a response from the network.`);
-        }
-
-        messages.printFinalResponse(response);
-        logger_mjs.logger.groupEnd();
-      }
-
-      if (!response) {
-        throw new WorkboxError_mjs.WorkboxError('no-response', {
-          url: request.url,
-          error
-        });
-      }
-
-      return response;
-    }
-
-  }
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  /**
-   * An implementation of a
-   * [stale-while-revalidate]{@link https://developers.google.com/web/fundamentals/instant-and-offline/offline-cookbook/#stale-while-revalidate}
-   * request strategy.
-   *
-   * Resources are requested from both the cache and the network in parallel.
-   * The strategy will respond with the cached version if available, otherwise
-   * wait for the network response. The cache is updated with the network response
-   * with each successful request.
-   *
-   * By default, this strategy will cache responses with a 200 status code as
-   * well as [opaque responses]{@link https://developers.google.com/web/tools/workbox/guides/handle-third-party-requests}.
-   * Opaque responses are are cross-origin requests where the response doesn't
-   * support [CORS]{@link https://enable-cors.org/}.
-   *
-   * If the network request fails, and there is no cache match, this will throw
-   * a `WorkboxError` exception.
-   *
-   * @memberof workbox.strategies
-   */
-
-  class StaleWhileRevalidate {
-    /**
-     * @param {Object} options
-     * @param {string} options.cacheName Cache name to store and retrieve
-     * requests. Defaults to cache names provided by
-     * [workbox-core]{@link workbox.core.cacheNames}.
-     * @param {Array<Object>} options.plugins [Plugins]{@link https://developers.google.com/web/tools/workbox/guides/using-plugins}
-     * to use in conjunction with this caching strategy.
-     * @param {Object} options.fetchOptions Values passed along to the
-     * [`init`](https://developer.mozilla.org/en-US/docs/Web/API/WindowOrWorkerGlobalScope/fetch#Parameters)
-     * of all fetch() requests made by this strategy.
-     * @param {Object} options.matchOptions [`CacheQueryOptions`](https://w3c.github.io/ServiceWorker/#dictdef-cachequeryoptions)
-     */
-    constructor(options = {}) {
-      this._cacheName = cacheNames_mjs.cacheNames.getRuntimeName(options.cacheName);
-      this._plugins = options.plugins || [];
-
-      if (options.plugins) {
-        let isUsingCacheWillUpdate = options.plugins.some(plugin => !!plugin.cacheWillUpdate);
-        this._plugins = isUsingCacheWillUpdate ? options.plugins : [cacheOkAndOpaquePlugin, ...options.plugins];
-      } else {
-        // No plugins passed in, use the default plugin.
-        this._plugins = [cacheOkAndOpaquePlugin];
-      }
-
-      this._fetchOptions = options.fetchOptions || null;
-      this._matchOptions = options.matchOptions || null;
-    }
-    /**
-     * This method will perform a request strategy and follows an API that
-     * will work with the
-     * [Workbox Router]{@link workbox.routing.Router}.
-     *
-     * @param {Object} options
-     * @param {Request} options.request The request to run this strategy for.
-     * @param {Event} [options.event] The event that triggered the request.
-     * @return {Promise<Response>}
-     */
-
-
-    async handle({
-      event,
-      request
-    }) {
-      return this.makeRequest({
-        event,
-        request: request || event.request
-      });
-    }
-    /**
-     * This method can be used to perform a make a standalone request outside the
-     * context of the [Workbox Router]{@link workbox.routing.Router}.
-     *
-     * See "[Advanced Recipes](https://developers.google.com/web/tools/workbox/guides/advanced-recipes#make-requests)"
-     * for more usage information.
-     *
-     * @param {Object} options
-     * @param {Request|string} options.request Either a
-     *     [`Request`]{@link https://developer.mozilla.org/en-US/docs/Web/API/Request}
-     *     object, or a string URL, corresponding to the request to be made.
-     * @param {FetchEvent} [options.event] If provided, `event.waitUntil()` will
-     *     be called automatically to extend the service worker's lifetime.
-     * @return {Promise<Response>}
-     */
-
-
-    async makeRequest({
-      event,
-      request
-    }) {
-      const logs = [];
-
-      if (typeof request === 'string') {
-        request = new Request(request);
-      }
-
-      {
-        assert_mjs.assert.isInstance(request, Request, {
-          moduleName: 'workbox-strategies',
-          className: 'StaleWhileRevalidate',
-          funcName: 'handle',
-          paramName: 'request'
-        });
-      }
-
-      const fetchAndCachePromise = this._getFromNetwork({
-        request,
-        event
-      });
-
-      let response = await cacheWrapper_mjs.cacheWrapper.match({
-        cacheName: this._cacheName,
-        request,
-        event,
-        matchOptions: this._matchOptions,
-        plugins: this._plugins
-      });
-      let error;
-
-      if (response) {
-        {
-          logs.push(`Found a cached response in the '${this._cacheName}'` + ` cache. Will update with the network response in the background.`);
-        }
-
-        if (event) {
-          try {
-            event.waitUntil(fetchAndCachePromise);
-          } catch (error) {
-            {
-              logger_mjs.logger.warn(`Unable to ensure service worker stays alive when ` + `updating cache for '${getFriendlyURL_mjs.getFriendlyURL(request.url)}'.`);
-            }
-          }
-        }
-      } else {
-        {
-          logs.push(`No response found in the '${this._cacheName}' cache. ` + `Will wait for the network response.`);
-        }
-
-        try {
-          response = await fetchAndCachePromise;
-        } catch (err) {
-          error = err;
-        }
-      }
-
-      {
-        logger_mjs.logger.groupCollapsed(messages.strategyStart('StaleWhileRevalidate', request));
-
-        for (let log of logs) {
-          logger_mjs.logger.log(log);
-        }
-
-        messages.printFinalResponse(response);
-        logger_mjs.logger.groupEnd();
-      }
-
-      if (!response) {
-        throw new WorkboxError_mjs.WorkboxError('no-response', {
-          url: request.url,
-          error
-        });
-      }
-
-      return response;
-    }
-    /**
-     * @param {Object} options
-     * @param {Request} options.request
-     * @param {Event} [options.event]
-     * @return {Promise<Response>}
-     *
-     * @private
-     */
-
-
-    async _getFromNetwork({
-      request,
-      event
-    }) {
-      const response = await fetchWrapper_mjs.fetchWrapper.fetch({
-        request,
-        event,
-        fetchOptions: this._fetchOptions,
-        plugins: this._plugins
-      });
-      const cachePutPromise = cacheWrapper_mjs.cacheWrapper.put({
-        cacheName: this._cacheName,
-        request,
-        response: response.clone(),
-        event,
-        plugins: this._plugins
-      });
-
-      if (event) {
-        try {
-          event.waitUntil(cachePutPromise);
-        } catch (error) {
-          {
-            logger_mjs.logger.warn(`Unable to ensure service worker stays alive when ` + `updating cache for '${getFriendlyURL_mjs.getFriendlyURL(request.url)}'.`);
-          }
-        }
-      }
-
-      return response;
-    }
-
-  }
-
-  /*
-    Copyright 2018 Google LLC
-
-    Use of this source code is governed by an MIT-style
-    license that can be found in the LICENSE file or at
-    https://opensource.org/licenses/MIT.
-  */
-  const mapping = {
-    cacheFirst: CacheFirst,
-    cacheOnly: CacheOnly,
-    networkFirst: NetworkFirst,
-    networkOnly: NetworkOnly,
-    staleWhileRevalidate: StaleWhileRevalidate
-  };
-
-  const deprecate = strategy => {
-    const StrategyCtr = mapping[strategy];
-    return options => {
-      {
-        const strategyCtrName = strategy[0].toUpperCase() + strategy.slice(1);
-        logger_mjs.logger.warn(`The 'workbox.strategies.${strategy}()' function has been ` + `deprecated and will be removed in a future version of Workbox.\n` + `Please use 'new workbox.strategies.${strategyCtrName}()' instead.`);
-      }
-
-      return new StrategyCtr(options);
-    };
-  };
-  /**
-   * @function workbox.strategies.cacheFirst
-   * @param {Object} options See the {@link workbox.strategies.CacheFirst}
-   * constructor for more info.
-   * @deprecated since v4.0.0
-   */
-
-
-  const cacheFirst = deprecate('cacheFirst');
-  /**
-   * @function workbox.strategies.cacheOnly
-   * @param {Object} options See the {@link workbox.strategies.CacheOnly}
-   * constructor for more info.
-   * @deprecated since v4.0.0
-   */
-
-  const cacheOnly = deprecate('cacheOnly');
-  /**
-   * @function workbox.strategies.networkFirst
-   * @param {Object} options See the {@link workbox.strategies.NetworkFirst}
-   * constructor for more info.
-   * @deprecated since v4.0.0
-   */
-
-  const networkFirst = deprecate('networkFirst');
-  /**
-   * @function workbox.strategies.networkOnly
-   * @param {Object} options See the {@link workbox.strategies.NetworkOnly}
-   * constructor for more info.
-   * @deprecated since v4.0.0
-   */
-
-  const networkOnly = deprecate('networkOnly');
-  /**
-   * @function workbox.strategies.staleWhileRevalidate
-   * @param {Object} options See the
-   * {@link workbox.strategies.StaleWhileRevalidate} constructor for more info.
-   * @deprecated since v4.0.0
-   */
-
-  const staleWhileRevalidate = deprecate('staleWhileRevalidate');
-
-  exports.CacheFirst = CacheFirst;
-  exports.CacheOnly = CacheOnly;
-  exports.NetworkFirst = NetworkFirst;
-  exports.NetworkOnly = NetworkOnly;
-  exports.StaleWhileRevalidate = StaleWhileRevalidate;
-  exports.cacheFirst = cacheFirst;
-  exports.cacheOnly = cacheOnly;
-  exports.networkFirst = networkFirst;
-  exports.networkOnly = networkOnly;
-  exports.staleWhileRevalidate = staleWhileRevalidate;
-
-  return exports;
-
-}({}, workbox.core._private, workbox.core._private, workbox.core._private, workbox.core._private, workbox.core._private, workbox.core._private, workbox.core._private));
-//# sourceMappingURL=workbox-strategies.dev.js.map
diff --git a/public/javascripts/workbox/workbox-strategies.dev.js.map b/public/javascripts/workbox/workbox-strategies.dev.js.map
deleted file mode 100644
index 12df5e64982..00000000000
--- a/public/javascripts/workbox/workbox-strategies.dev.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"workbox-strategies.dev.js","sources":["../_version.mjs","../utils/messages.mjs","../CacheFirst.mjs","../CacheOnly.mjs","../plugins/cacheOkAndOpaquePlugin.mjs","../NetworkFirst.mjs","../NetworkOnly.mjs","../StaleWhileRevalidate.mjs","../index.mjs"],"sourcesContent":["try{self['workbox:strategies:4.3.1']&&_()}catch(e){}// eslint-disable-line","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {logger} from 'workbox-core/_private/logger.mjs';\nimport '../_version.mjs';\n\nconst getFriendlyURL = (url) => {\n  const urlObj = new URL(url, location);\n  if (urlObj.origin === location.origin) {\n    return urlObj.pathname;\n  }\n  return urlObj.href;\n};\n\nexport const messages = {\n  strategyStart: (strategyName, request) => `Using ${strategyName} to ` +\n    `respond to '${getFriendlyURL(request.url)}'`,\n  printFinalResponse: (response) => {\n    if (response) {\n      logger.groupCollapsed(`View the final response here.`);\n      logger.log(response);\n      logger.groupEnd();\n    }\n  },\n};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {assert} from 'workbox-core/_private/assert.mjs';\nimport {cacheNames} from 'workbox-core/_private/cacheNames.mjs';\nimport {cacheWrapper} from 'workbox-core/_private/cacheWrapper.mjs';\nimport {fetchWrapper} from 'workbox-core/_private/fetchWrapper.mjs';\nimport {getFriendlyURL} from 'workbox-core/_private/getFriendlyURL.mjs';\nimport {logger} from 'workbox-core/_private/logger.mjs';\nimport {WorkboxError} from 'workbox-core/_private/WorkboxError.mjs';\n\nimport {messages} from './utils/messages.mjs';\nimport './_version.mjs';\n\n/**\n * An implementation of a [cache-first]{@link https://developers.google.com/web/fundamentals/instant-and-offline/offline-cookbook/#cache-falling-back-to-network}\n * request strategy.\n *\n * A cache first strategy is useful for assets that have been revisioned,\n * such as URLs like `/styles/example.a8f5f1.css`, since they\n * can be cached for long periods of time.\n *\n * If the network request fails, and there is no cache match, this will throw\n * a `WorkboxError` exception.\n *\n * @memberof workbox.strategies\n */\nclass CacheFirst {\n  /**\n   * @param {Object} options\n   * @param {string} options.cacheName Cache name to store and retrieve\n   * requests. Defaults to cache names provided by\n   * [workbox-core]{@link workbox.core.cacheNames}.\n   * @param {Array<Object>} options.plugins [Plugins]{@link https://developers.google.com/web/tools/workbox/guides/using-plugins}\n   * to use in conjunction with this caching strategy.\n   * @param {Object} options.fetchOptions Values passed along to the\n   * [`init`](https://developer.mozilla.org/en-US/docs/Web/API/WindowOrWorkerGlobalScope/fetch#Parameters)\n   * of all fetch() requests made by this strategy.\n   * @param {Object} options.matchOptions [`CacheQueryOptions`](https://w3c.github.io/ServiceWorker/#dictdef-cachequeryoptions)\n   */\n  constructor(options = {}) {\n    this._cacheName = cacheNames.getRuntimeName(options.cacheName);\n    this._plugins = options.plugins || [];\n    this._fetchOptions = options.fetchOptions || null;\n    this._matchOptions = options.matchOptions || null;\n  }\n\n  /**\n   * This method will perform a request strategy and follows an API that\n   * will work with the\n   * [Workbox Router]{@link workbox.routing.Router}.\n   *\n   * @param {Object} options\n   * @param {Request} options.request The request to run this strategy for.\n   * @param {Event} [options.event] The event that triggered the request.\n   * @return {Promise<Response>}\n   */\n  async handle({event, request}) {\n    return this.makeRequest({\n      event,\n      request: request || event.request,\n    });\n  }\n\n  /**\n   * This method can be used to perform a make a standalone request outside the\n   * context of the [Workbox Router]{@link workbox.routing.Router}.\n   *\n   * See \"[Advanced Recipes](https://developers.google.com/web/tools/workbox/guides/advanced-recipes#make-requests)\"\n   * for more usage information.\n   *\n   * @param {Object} options\n   * @param {Request|string} options.request Either a\n   *     [`Request`]{@link https://developer.mozilla.org/en-US/docs/Web/API/Request}\n   *     object, or a string URL, corresponding to the request to be made.\n   * @param {FetchEvent} [options.event] If provided, `event.waitUntil()` will\n         be called automatically to extend the service worker's lifetime.\n   * @return {Promise<Response>}\n   */\n  async makeRequest({event, request}) {\n    const logs = [];\n\n    if (typeof request === 'string') {\n      request = new Request(request);\n    }\n\n    if (process.env.NODE_ENV !== 'production') {\n      assert.isInstance(request, Request, {\n        moduleName: 'workbox-strategies',\n        className: 'CacheFirst',\n        funcName: 'makeRequest',\n        paramName: 'request',\n      });\n    }\n\n    let response = await cacheWrapper.match({\n      cacheName: this._cacheName,\n      request,\n      event,\n      matchOptions: this._matchOptions,\n      plugins: this._plugins,\n    });\n\n    let error;\n    if (!response) {\n      if (process.env.NODE_ENV !== 'production') {\n        logs.push(\n            `No response found in the '${this._cacheName}' cache. ` +\n          `Will respond with a network request.`);\n      }\n      try {\n        response = await this._getFromNetwork(request, event);\n      } catch (err) {\n        error = err;\n      }\n\n      if (process.env.NODE_ENV !== 'production') {\n        if (response) {\n          logs.push(`Got response from network.`);\n        } else {\n          logs.push(`Unable to get a response from the network.`);\n        }\n      }\n    } else {\n      if (process.env.NODE_ENV !== 'production') {\n        logs.push(\n            `Found a cached response in the '${this._cacheName}' cache.`);\n      }\n    }\n\n    if (process.env.NODE_ENV !== 'production') {\n      logger.groupCollapsed(\n          messages.strategyStart('CacheFirst', request));\n      for (let log of logs) {\n        logger.log(log);\n      }\n      messages.printFinalResponse(response);\n      logger.groupEnd();\n    }\n\n    if (!response) {\n      throw new WorkboxError('no-response', {url: request.url, error});\n    }\n    return response;\n  }\n\n  /**\n   * Handles the network and cache part of CacheFirst.\n   *\n   * @param {Request} request\n   * @param {FetchEvent} [event]\n   * @return {Promise<Response>}\n   *\n   * @private\n   */\n  async _getFromNetwork(request, event) {\n    const response = await fetchWrapper.fetch({\n      request,\n      event,\n      fetchOptions: this._fetchOptions,\n      plugins: this._plugins,\n    });\n\n    // Keep the service worker while we put the request to the cache\n    const responseClone = response.clone();\n    const cachePutPromise = cacheWrapper.put({\n      cacheName: this._cacheName,\n      request,\n      response: responseClone,\n      event,\n      plugins: this._plugins,\n    });\n\n    if (event) {\n      try {\n        event.waitUntil(cachePutPromise);\n      } catch (error) {\n        if (process.env.NODE_ENV !== 'production') {\n          logger.warn(`Unable to ensure service worker stays alive when ` +\n            `updating cache for '${getFriendlyURL(request.url)}'.`);\n        }\n      }\n    }\n\n    return response;\n  }\n}\n\nexport {CacheFirst};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {assert} from 'workbox-core/_private/assert.mjs';\nimport {cacheNames} from 'workbox-core/_private/cacheNames.mjs';\nimport {cacheWrapper} from 'workbox-core/_private/cacheWrapper.mjs';\nimport {logger} from 'workbox-core/_private/logger.mjs';\nimport {WorkboxError} from 'workbox-core/_private/WorkboxError.mjs';\n\nimport {messages} from './utils/messages.mjs';\nimport './_version.mjs';\n\n\n/**\n * An implementation of a\n * [cache-only]{@link https://developers.google.com/web/fundamentals/instant-and-offline/offline-cookbook/#cache-only}\n * request strategy.\n *\n * This class is useful if you want to take advantage of any\n * [Workbox plugins]{@link https://developers.google.com/web/tools/workbox/guides/using-plugins}.\n *\n * If there is no cache match, this will throw a `WorkboxError` exception.\n *\n * @memberof workbox.strategies\n */\nclass CacheOnly {\n  /**\n   * @param {Object} options\n   * @param {string} options.cacheName Cache name to store and retrieve\n   * requests. Defaults to cache names provided by\n   * [workbox-core]{@link workbox.core.cacheNames}.\n   * @param {Array<Object>} options.plugins [Plugins]{@link https://developers.google.com/web/tools/workbox/guides/using-plugins}\n   * to use in conjunction with this caching strategy.\n   * @param {Object} options.matchOptions [`CacheQueryOptions`](https://w3c.github.io/ServiceWorker/#dictdef-cachequeryoptions)\n   */\n  constructor(options = {}) {\n    this._cacheName = cacheNames.getRuntimeName(options.cacheName);\n    this._plugins = options.plugins || [];\n    this._matchOptions = options.matchOptions || null;\n  }\n\n  /**\n   * This method will perform a request strategy and follows an API that\n   * will work with the\n   * [Workbox Router]{@link workbox.routing.Router}.\n   *\n   * @param {Object} options\n   * @param {Request} options.request The request to run this strategy for.\n   * @param {Event} [options.event] The event that triggered the request.\n   * @return {Promise<Response>}\n   */\n  async handle({event, request}) {\n    return this.makeRequest({\n      event,\n      request: request || event.request,\n    });\n  }\n\n  /**\n   * This method can be used to perform a make a standalone request outside the\n   * context of the [Workbox Router]{@link workbox.routing.Router}.\n   *\n   * See \"[Advanced Recipes](https://developers.google.com/web/tools/workbox/guides/advanced-recipes#make-requests)\"\n   * for more usage information.\n   *\n   * @param {Object} options\n   * @param {Request|string} options.request Either a\n   *     [`Request`]{@link https://developer.mozilla.org/en-US/docs/Web/API/Request}\n   *     object, or a string URL, corresponding to the request to be made.\n   * @param {FetchEvent} [options.event] If provided, `event.waitUntil()` will\n   *     be called automatically to extend the service worker's lifetime.\n   * @return {Promise<Response>}\n   */\n  async makeRequest({event, request}) {\n    if (typeof request === 'string') {\n      request = new Request(request);\n    }\n\n    if (process.env.NODE_ENV !== 'production') {\n      assert.isInstance(request, Request, {\n        moduleName: 'workbox-strategies',\n        className: 'CacheOnly',\n        funcName: 'makeRequest',\n        paramName: 'request',\n      });\n    }\n\n    const response = await cacheWrapper.match({\n      cacheName: this._cacheName,\n      request,\n      event,\n      matchOptions: this._matchOptions,\n      plugins: this._plugins,\n    });\n\n    if (process.env.NODE_ENV !== 'production') {\n      logger.groupCollapsed(\n          messages.strategyStart('CacheOnly', request));\n      if (response) {\n        logger.log(`Found a cached response in the '${this._cacheName}'` +\n          ` cache.`);\n        messages.printFinalResponse(response);\n      } else {\n        logger.log(`No response found in the '${this._cacheName}' cache.`);\n      }\n      logger.groupEnd();\n    }\n\n    if (!response) {\n      throw new WorkboxError('no-response', {url: request.url});\n    }\n    return response;\n  }\n}\n\nexport {CacheOnly};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport '../_version.mjs';\n\nexport const cacheOkAndOpaquePlugin = {\n  /**\n   * Returns a valid response (to allow caching) if the status is 200 (OK) or\n   * 0 (opaque).\n   *\n   * @param {Object} options\n   * @param {Response} options.response\n   * @return {Response|null}\n   *\n   * @private\n   */\n  cacheWillUpdate: ({response}) => {\n    if (response.status === 200 || response.status === 0) {\n      return response;\n    }\n    return null;\n  },\n};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {assert} from 'workbox-core/_private/assert.mjs';\nimport {cacheNames} from 'workbox-core/_private/cacheNames.mjs';\nimport {cacheWrapper} from 'workbox-core/_private/cacheWrapper.mjs';\nimport {fetchWrapper} from 'workbox-core/_private/fetchWrapper.mjs';\nimport {getFriendlyURL} from 'workbox-core/_private/getFriendlyURL.mjs';\nimport {logger} from 'workbox-core/_private/logger.mjs';\nimport {WorkboxError} from 'workbox-core/_private/WorkboxError.mjs';\n\nimport {messages} from './utils/messages.mjs';\nimport {cacheOkAndOpaquePlugin} from './plugins/cacheOkAndOpaquePlugin.mjs';\nimport './_version.mjs';\n\n/**\n * An implementation of a\n * [network first]{@link https://developers.google.com/web/fundamentals/instant-and-offline/offline-cookbook/#network-falling-back-to-cache}\n * request strategy.\n *\n * By default, this strategy will cache responses with a 200 status code as\n * well as [opaque responses]{@link https://developers.google.com/web/tools/workbox/guides/handle-third-party-requests}.\n * Opaque responses are are cross-origin requests where the response doesn't\n * support [CORS]{@link https://enable-cors.org/}.\n *\n * If the network request fails, and there is no cache match, this will throw\n * a `WorkboxError` exception.\n *\n * @memberof workbox.strategies\n */\nclass NetworkFirst {\n  /**\n   * @param {Object} options\n   * @param {string} options.cacheName Cache name to store and retrieve\n   * requests. Defaults to cache names provided by\n   * [workbox-core]{@link workbox.core.cacheNames}.\n   * @param {Array<Object>} options.plugins [Plugins]{@link https://developers.google.com/web/tools/workbox/guides/using-plugins}\n   * to use in conjunction with this caching strategy.\n   * @param {Object} options.fetchOptions Values passed along to the\n   * [`init`](https://developer.mozilla.org/en-US/docs/Web/API/WindowOrWorkerGlobalScope/fetch#Parameters)\n   * of all fetch() requests made by this strategy.\n   * @param {Object} options.matchOptions [`CacheQueryOptions`](https://w3c.github.io/ServiceWorker/#dictdef-cachequeryoptions)\n   * @param {number} options.networkTimeoutSeconds If set, any network requests\n   * that fail to respond within the timeout will fallback to the cache.\n   *\n   * This option can be used to combat\n   * \"[lie-fi]{@link https://developers.google.com/web/fundamentals/performance/poor-connectivity/#lie-fi}\"\n   * scenarios.\n   */\n  constructor(options = {}) {\n    this._cacheName = cacheNames.getRuntimeName(options.cacheName);\n\n    if (options.plugins) {\n      let isUsingCacheWillUpdate =\n        options.plugins.some((plugin) => !!plugin.cacheWillUpdate);\n      this._plugins = isUsingCacheWillUpdate ?\n        options.plugins : [cacheOkAndOpaquePlugin, ...options.plugins];\n    } else {\n      // No plugins passed in, use the default plugin.\n      this._plugins = [cacheOkAndOpaquePlugin];\n    }\n\n    this._networkTimeoutSeconds = options.networkTimeoutSeconds;\n    if (process.env.NODE_ENV !== 'production') {\n      if (this._networkTimeoutSeconds) {\n        assert.isType(this._networkTimeoutSeconds, 'number', {\n          moduleName: 'workbox-strategies',\n          className: 'NetworkFirst',\n          funcName: 'constructor',\n          paramName: 'networkTimeoutSeconds',\n        });\n      }\n    }\n\n    this._fetchOptions = options.fetchOptions || null;\n    this._matchOptions = options.matchOptions || null;\n  }\n\n  /**\n   * This method will perform a request strategy and follows an API that\n   * will work with the\n   * [Workbox Router]{@link workbox.routing.Router}.\n   *\n   * @param {Object} options\n   * @param {Request} options.request The request to run this strategy for.\n   * @param {Event} [options.event] The event that triggered the request.\n   * @return {Promise<Response>}\n   */\n  async handle({event, request}) {\n    return this.makeRequest({\n      event,\n      request: request || event.request,\n    });\n  }\n\n  /**\n   * This method can be used to perform a make a standalone request outside the\n   * context of the [Workbox Router]{@link workbox.routing.Router}.\n   *\n   * See \"[Advanced Recipes](https://developers.google.com/web/tools/workbox/guides/advanced-recipes#make-requests)\"\n   * for more usage information.\n   *\n   * @param {Object} options\n   * @param {Request|string} options.request Either a\n   *     [`Request`]{@link https://developer.mozilla.org/en-US/docs/Web/API/Request}\n   *     object, or a string URL, corresponding to the request to be made.\n   * @param {FetchEvent} [options.event] If provided, `event.waitUntil()` will\n   *     be called automatically to extend the service worker's lifetime.\n   * @return {Promise<Response>}\n   */\n  async makeRequest({event, request}) {\n    const logs = [];\n\n    if (typeof request === 'string') {\n      request = new Request(request);\n    }\n\n    if (process.env.NODE_ENV !== 'production') {\n      assert.isInstance(request, Request, {\n        moduleName: 'workbox-strategies',\n        className: 'NetworkFirst',\n        funcName: 'handle',\n        paramName: 'makeRequest',\n      });\n    }\n\n    const promises = [];\n    let timeoutId;\n\n    if (this._networkTimeoutSeconds) {\n      const {id, promise} = this._getTimeoutPromise({request, event, logs});\n      timeoutId = id;\n      promises.push(promise);\n    }\n\n    const networkPromise =\n        this._getNetworkPromise({timeoutId, request, event, logs});\n    promises.push(networkPromise);\n\n    // Promise.race() will resolve as soon as the first promise resolves.\n    let response = await Promise.race(promises);\n    // If Promise.race() resolved with null, it might be due to a network\n    // timeout + a cache miss. If that were to happen, we'd rather wait until\n    // the networkPromise resolves instead of returning null.\n    // Note that it's fine to await an already-resolved promise, so we don't\n    // have to check to see if it's still \"in flight\".\n    if (!response) {\n      response = await networkPromise;\n    }\n\n    if (process.env.NODE_ENV !== 'production') {\n      logger.groupCollapsed(\n          messages.strategyStart('NetworkFirst', request));\n      for (let log of logs) {\n        logger.log(log);\n      }\n      messages.printFinalResponse(response);\n      logger.groupEnd();\n    }\n\n    if (!response) {\n      throw new WorkboxError('no-response', {url: request.url});\n    }\n    return response;\n  }\n\n  /**\n   * @param {Object} options\n   * @param {Request} options.request\n   * @param {Array} options.logs A reference to the logs array\n   * @param {Event} [options.event]\n   * @return {Promise<Response>}\n   *\n   * @private\n   */\n  _getTimeoutPromise({request, logs, event}) {\n    let timeoutId;\n    const timeoutPromise = new Promise((resolve) => {\n      const onNetworkTimeout = async () => {\n        if (process.env.NODE_ENV !== 'production') {\n          logs.push(`Timing out the network response at ` +\n            `${this._networkTimeoutSeconds} seconds.`);\n        }\n\n        resolve(await this._respondFromCache({request, event}));\n      };\n\n      timeoutId = setTimeout(\n          onNetworkTimeout,\n          this._networkTimeoutSeconds * 1000,\n      );\n    });\n\n    return {\n      promise: timeoutPromise,\n      id: timeoutId,\n    };\n  }\n\n  /**\n   * @param {Object} options\n   * @param {number|undefined} options.timeoutId\n   * @param {Request} options.request\n   * @param {Array} options.logs A reference to the logs Array.\n   * @param {Event} [options.event]\n   * @return {Promise<Response>}\n   *\n   * @private\n   */\n  async _getNetworkPromise({timeoutId, request, logs, event}) {\n    let error;\n    let response;\n    try {\n      response = await fetchWrapper.fetch({\n        request,\n        event,\n        fetchOptions: this._fetchOptions,\n        plugins: this._plugins,\n      });\n    } catch (err) {\n      error = err;\n    }\n\n    if (timeoutId) {\n      clearTimeout(timeoutId);\n    }\n\n    if (process.env.NODE_ENV !== 'production') {\n      if (response) {\n        logs.push(`Got response from network.`);\n      } else {\n        logs.push(`Unable to get a response from the network. Will respond ` +\n          `with a cached response.`);\n      }\n    }\n\n    if (error || !response) {\n      response = await this._respondFromCache({request, event});\n      if (process.env.NODE_ENV !== 'production') {\n        if (response) {\n          logs.push(`Found a cached response in the '${this._cacheName}'` +\n            ` cache.`);\n        } else {\n          logs.push(`No response found in the '${this._cacheName}' cache.`);\n        }\n      }\n    } else {\n      // Keep the service worker alive while we put the request in the cache\n      const responseClone = response.clone();\n      const cachePut = cacheWrapper.put({\n        cacheName: this._cacheName,\n        request,\n        response: responseClone,\n        event,\n        plugins: this._plugins,\n      });\n\n      if (event) {\n        try {\n          // The event has been responded to so we can keep the SW alive to\n          // respond to the request\n          event.waitUntil(cachePut);\n        } catch (err) {\n          if (process.env.NODE_ENV !== 'production') {\n            logger.warn(`Unable to ensure service worker stays alive when ` +\n              `updating cache for '${getFriendlyURL(request.url)}'.`);\n          }\n        }\n      }\n    }\n\n    return response;\n  }\n\n  /**\n   * Used if the network timeouts or fails to make the request.\n   *\n   * @param {Object} options\n   * @param {Request} request The request to match in the cache\n   * @param {Event} [options.event]\n   * @return {Promise<Object>}\n   *\n   * @private\n   */\n  _respondFromCache({event, request}) {\n    return cacheWrapper.match({\n      cacheName: this._cacheName,\n      request,\n      event,\n      matchOptions: this._matchOptions,\n      plugins: this._plugins,\n    });\n  }\n}\n\nexport {NetworkFirst};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {assert} from 'workbox-core/_private/assert.mjs';\nimport {cacheNames} from 'workbox-core/_private/cacheNames.mjs';\nimport {fetchWrapper} from 'workbox-core/_private/fetchWrapper.mjs';\nimport {logger} from 'workbox-core/_private/logger.mjs';\nimport {WorkboxError} from 'workbox-core/_private/WorkboxError.mjs';\n\nimport {messages} from './utils/messages.mjs';\nimport './_version.mjs';\n\n/**\n * An implementation of a\n * [network-only]{@link https://developers.google.com/web/fundamentals/instant-and-offline/offline-cookbook/#network-only}\n * request strategy.\n *\n * This class is useful if you want to take advantage of any\n * [Workbox plugins]{@link https://developers.google.com/web/tools/workbox/guides/using-plugins}.\n *\n * If the network request fails, this will throw a `WorkboxError` exception.\n *\n * @memberof workbox.strategies\n */\nclass NetworkOnly {\n  /**\n   * @param {Object} options\n   * @param {string} options.cacheName Cache name to store and retrieve\n   * requests. Defaults to cache names provided by\n   * [workbox-core]{@link workbox.core.cacheNames}.\n   * @param {Array<Object>} options.plugins [Plugins]{@link https://developers.google.com/web/tools/workbox/guides/using-plugins}\n   * to use in conjunction with this caching strategy.\n   * @param {Object} options.fetchOptions Values passed along to the\n   * [`init`](https://developer.mozilla.org/en-US/docs/Web/API/WindowOrWorkerGlobalScope/fetch#Parameters)\n   * of all fetch() requests made by this strategy.\n   */\n  constructor(options = {}) {\n    this._cacheName = cacheNames.getRuntimeName(options.cacheName);\n    this._plugins = options.plugins || [];\n    this._fetchOptions = options.fetchOptions || null;\n  }\n\n  /**\n   * This method will perform a request strategy and follows an API that\n   * will work with the\n   * [Workbox Router]{@link workbox.routing.Router}.\n   *\n   * @param {Object} options\n   * @param {Request} options.request The request to run this strategy for.\n   * @param {Event} [options.event] The event that triggered the request.\n   * @return {Promise<Response>}\n   */\n  async handle({event, request}) {\n    return this.makeRequest({\n      event,\n      request: request || event.request,\n    });\n  }\n\n  /**\n   * This method can be used to perform a make a standalone request outside the\n   * context of the [Workbox Router]{@link workbox.routing.Router}.\n   *\n   * See \"[Advanced Recipes](https://developers.google.com/web/tools/workbox/guides/advanced-recipes#make-requests)\"\n   * for more usage information.\n   *\n   * @param {Object} options\n   * @param {Request|string} options.request Either a\n   *     [`Request`]{@link https://developer.mozilla.org/en-US/docs/Web/API/Request}\n   *     object, or a string URL, corresponding to the request to be made.\n   * @param {FetchEvent} [options.event] If provided, `event.waitUntil()` will\n   *     be called automatically to extend the service worker's lifetime.\n   * @return {Promise<Response>}\n   */\n  async makeRequest({event, request}) {\n    if (typeof request === 'string') {\n      request = new Request(request);\n    }\n\n    if (process.env.NODE_ENV !== 'production') {\n      assert.isInstance(request, Request, {\n        moduleName: 'workbox-strategies',\n        className: 'NetworkOnly',\n        funcName: 'handle',\n        paramName: 'request',\n      });\n    }\n\n    let error;\n    let response;\n    try {\n      response = await fetchWrapper.fetch({\n        request,\n        event,\n        fetchOptions: this._fetchOptions,\n        plugins: this._plugins,\n      });\n    } catch (err) {\n      error = err;\n    }\n\n    if (process.env.NODE_ENV !== 'production') {\n      logger.groupCollapsed(\n          messages.strategyStart('NetworkOnly', request));\n      if (response) {\n        logger.log(`Got response from network.`);\n      } else {\n        logger.log(`Unable to get a response from the network.`);\n      }\n      messages.printFinalResponse(response);\n      logger.groupEnd();\n    }\n\n    if (!response) {\n      throw new WorkboxError('no-response', {url: request.url, error});\n    }\n    return response;\n  }\n}\n\nexport {NetworkOnly};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {assert} from 'workbox-core/_private/assert.mjs';\nimport {cacheNames} from 'workbox-core/_private/cacheNames.mjs';\nimport {cacheWrapper} from 'workbox-core/_private/cacheWrapper.mjs';\nimport {fetchWrapper} from 'workbox-core/_private/fetchWrapper.mjs';\nimport {getFriendlyURL} from 'workbox-core/_private/getFriendlyURL.mjs';\nimport {logger} from 'workbox-core/_private/logger.mjs';\nimport {WorkboxError} from 'workbox-core/_private/WorkboxError.mjs';\n\nimport {messages} from './utils/messages.mjs';\nimport {cacheOkAndOpaquePlugin} from './plugins/cacheOkAndOpaquePlugin.mjs';\nimport './_version.mjs';\n\n/**\n * An implementation of a\n * [stale-while-revalidate]{@link https://developers.google.com/web/fundamentals/instant-and-offline/offline-cookbook/#stale-while-revalidate}\n * request strategy.\n *\n * Resources are requested from both the cache and the network in parallel.\n * The strategy will respond with the cached version if available, otherwise\n * wait for the network response. The cache is updated with the network response\n * with each successful request.\n *\n * By default, this strategy will cache responses with a 200 status code as\n * well as [opaque responses]{@link https://developers.google.com/web/tools/workbox/guides/handle-third-party-requests}.\n * Opaque responses are are cross-origin requests where the response doesn't\n * support [CORS]{@link https://enable-cors.org/}.\n *\n * If the network request fails, and there is no cache match, this will throw\n * a `WorkboxError` exception.\n *\n * @memberof workbox.strategies\n */\nclass StaleWhileRevalidate {\n  /**\n   * @param {Object} options\n   * @param {string} options.cacheName Cache name to store and retrieve\n   * requests. Defaults to cache names provided by\n   * [workbox-core]{@link workbox.core.cacheNames}.\n   * @param {Array<Object>} options.plugins [Plugins]{@link https://developers.google.com/web/tools/workbox/guides/using-plugins}\n   * to use in conjunction with this caching strategy.\n   * @param {Object} options.fetchOptions Values passed along to the\n   * [`init`](https://developer.mozilla.org/en-US/docs/Web/API/WindowOrWorkerGlobalScope/fetch#Parameters)\n   * of all fetch() requests made by this strategy.\n   * @param {Object} options.matchOptions [`CacheQueryOptions`](https://w3c.github.io/ServiceWorker/#dictdef-cachequeryoptions)\n   */\n  constructor(options = {}) {\n    this._cacheName = cacheNames.getRuntimeName(options.cacheName);\n    this._plugins = options.plugins || [];\n\n    if (options.plugins) {\n      let isUsingCacheWillUpdate =\n        options.plugins.some((plugin) => !!plugin.cacheWillUpdate);\n      this._plugins = isUsingCacheWillUpdate ?\n        options.plugins : [cacheOkAndOpaquePlugin, ...options.plugins];\n    } else {\n      // No plugins passed in, use the default plugin.\n      this._plugins = [cacheOkAndOpaquePlugin];\n    }\n\n    this._fetchOptions = options.fetchOptions || null;\n    this._matchOptions = options.matchOptions || null;\n  }\n\n  /**\n   * This method will perform a request strategy and follows an API that\n   * will work with the\n   * [Workbox Router]{@link workbox.routing.Router}.\n   *\n   * @param {Object} options\n   * @param {Request} options.request The request to run this strategy for.\n   * @param {Event} [options.event] The event that triggered the request.\n   * @return {Promise<Response>}\n   */\n  async handle({event, request}) {\n    return this.makeRequest({\n      event,\n      request: request || event.request,\n    });\n  }\n  /**\n   * This method can be used to perform a make a standalone request outside the\n   * context of the [Workbox Router]{@link workbox.routing.Router}.\n   *\n   * See \"[Advanced Recipes](https://developers.google.com/web/tools/workbox/guides/advanced-recipes#make-requests)\"\n   * for more usage information.\n   *\n   * @param {Object} options\n   * @param {Request|string} options.request Either a\n   *     [`Request`]{@link https://developer.mozilla.org/en-US/docs/Web/API/Request}\n   *     object, or a string URL, corresponding to the request to be made.\n   * @param {FetchEvent} [options.event] If provided, `event.waitUntil()` will\n   *     be called automatically to extend the service worker's lifetime.\n   * @return {Promise<Response>}\n   */\n  async makeRequest({event, request}) {\n    const logs = [];\n\n    if (typeof request === 'string') {\n      request = new Request(request);\n    }\n\n    if (process.env.NODE_ENV !== 'production') {\n      assert.isInstance(request, Request, {\n        moduleName: 'workbox-strategies',\n        className: 'StaleWhileRevalidate',\n        funcName: 'handle',\n        paramName: 'request',\n      });\n    }\n\n    const fetchAndCachePromise = this._getFromNetwork({request, event});\n\n    let response = await cacheWrapper.match({\n      cacheName: this._cacheName,\n      request,\n      event,\n      matchOptions: this._matchOptions,\n      plugins: this._plugins,\n    });\n    let error;\n    if (response) {\n      if (process.env.NODE_ENV !== 'production') {\n        logs.push(`Found a cached response in the '${this._cacheName}'` +\n          ` cache. Will update with the network response in the background.`);\n      }\n\n      if (event) {\n        try {\n          event.waitUntil(fetchAndCachePromise);\n        } catch (error) {\n          if (process.env.NODE_ENV !== 'production') {\n            logger.warn(`Unable to ensure service worker stays alive when ` +\n              `updating cache for '${getFriendlyURL(request.url)}'.`);\n          }\n        }\n      }\n    } else {\n      if (process.env.NODE_ENV !== 'production') {\n        logs.push(`No response found in the '${this._cacheName}' cache. ` +\n          `Will wait for the network response.`);\n      }\n      try {\n        response = await fetchAndCachePromise;\n      } catch (err) {\n        error = err;\n      }\n    }\n\n    if (process.env.NODE_ENV !== 'production') {\n      logger.groupCollapsed(\n          messages.strategyStart('StaleWhileRevalidate', request));\n      for (let log of logs) {\n        logger.log(log);\n      }\n      messages.printFinalResponse(response);\n      logger.groupEnd();\n    }\n\n    if (!response) {\n      throw new WorkboxError('no-response', {url: request.url, error});\n    }\n    return response;\n  }\n\n  /**\n   * @param {Object} options\n   * @param {Request} options.request\n   * @param {Event} [options.event]\n   * @return {Promise<Response>}\n   *\n   * @private\n   */\n  async _getFromNetwork({request, event}) {\n    const response = await fetchWrapper.fetch({\n      request,\n      event,\n      fetchOptions: this._fetchOptions,\n      plugins: this._plugins,\n    });\n\n    const cachePutPromise = cacheWrapper.put({\n      cacheName: this._cacheName,\n      request,\n      response: response.clone(),\n      event,\n      plugins: this._plugins,\n    });\n\n    if (event) {\n      try {\n        event.waitUntil(cachePutPromise);\n      } catch (error) {\n        if (process.env.NODE_ENV !== 'production') {\n          logger.warn(`Unable to ensure service worker stays alive when ` +\n            `updating cache for '${getFriendlyURL(request.url)}'.`);\n        }\n      }\n    }\n\n    return response;\n  }\n}\n\nexport {StaleWhileRevalidate};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {logger} from 'workbox-core/_private/logger.mjs';\nimport {CacheFirst} from './CacheFirst.mjs';\nimport {CacheOnly} from './CacheOnly.mjs';\nimport {NetworkFirst} from './NetworkFirst.mjs';\nimport {NetworkOnly} from './NetworkOnly.mjs';\nimport {StaleWhileRevalidate} from './StaleWhileRevalidate.mjs';\nimport './_version.mjs';\n\n\nconst mapping = {\n  cacheFirst: CacheFirst,\n  cacheOnly: CacheOnly,\n  networkFirst: NetworkFirst,\n  networkOnly: NetworkOnly,\n  staleWhileRevalidate: StaleWhileRevalidate,\n};\n\nconst deprecate = (strategy) => {\n  const StrategyCtr = mapping[strategy];\n\n  return (options) => {\n    if (process.env.NODE_ENV !== 'production') {\n      const strategyCtrName = strategy[0].toUpperCase() + strategy.slice(1);\n      logger.warn(`The 'workbox.strategies.${strategy}()' function has been ` +\n          `deprecated and will be removed in a future version of Workbox.\\n` +\n          `Please use 'new workbox.strategies.${strategyCtrName}()' instead.`);\n    }\n    return new StrategyCtr(options);\n  };\n};\n\n/**\n * @function workbox.strategies.cacheFirst\n * @param {Object} options See the {@link workbox.strategies.CacheFirst}\n * constructor for more info.\n * @deprecated since v4.0.0\n */\nconst cacheFirst = deprecate('cacheFirst');\n\n/**\n * @function workbox.strategies.cacheOnly\n * @param {Object} options See the {@link workbox.strategies.CacheOnly}\n * constructor for more info.\n * @deprecated since v4.0.0\n */\nconst cacheOnly = deprecate('cacheOnly');\n\n/**\n * @function workbox.strategies.networkFirst\n * @param {Object} options See the {@link workbox.strategies.NetworkFirst}\n * constructor for more info.\n * @deprecated since v4.0.0\n */\nconst networkFirst = deprecate('networkFirst');\n\n/**\n * @function workbox.strategies.networkOnly\n * @param {Object} options See the {@link workbox.strategies.NetworkOnly}\n * constructor for more info.\n * @deprecated since v4.0.0\n */\nconst networkOnly = deprecate('networkOnly');\n\n/**\n * @function workbox.strategies.staleWhileRevalidate\n * @param {Object} options See the\n * {@link workbox.strategies.StaleWhileRevalidate} constructor for more info.\n * @deprecated since v4.0.0\n */\nconst staleWhileRevalidate = deprecate('staleWhileRevalidate');\n\n/**\n * There are common caching strategies that most service workers will need\n * and use. This module provides simple implementations of these strategies.\n *\n * @namespace workbox.strategies\n */\n\nexport {\n  CacheFirst,\n  CacheOnly,\n  NetworkFirst,\n  NetworkOnly,\n  StaleWhileRevalidate,\n\n  // Deprecated...\n  cacheFirst,\n  cacheOnly,\n  networkFirst,\n  networkOnly,\n  staleWhileRevalidate,\n};\n\n"],"names":["self","_","e","getFriendlyURL","url","urlObj","URL","location","origin","pathname","href","messages","strategyStart","strategyName","request","printFinalResponse","response","logger","groupCollapsed","log","groupEnd","CacheFirst","constructor","options","_cacheName","cacheNames","getRuntimeName","cacheName","_plugins","plugins","_fetchOptions","fetchOptions","_matchOptions","matchOptions","handle","event","makeRequest","logs","Request","assert","isInstance","moduleName","className","funcName","paramName","cacheWrapper","match","error","push","_getFromNetwork","err","WorkboxError","fetchWrapper","fetch","responseClone","clone","cachePutPromise","put","waitUntil","warn","CacheOnly","cacheOkAndOpaquePlugin","cacheWillUpdate","status","NetworkFirst","isUsingCacheWillUpdate","some","plugin","_networkTimeoutSeconds","networkTimeoutSeconds","isType","promises","timeoutId","id","promise","_getTimeoutPromise","networkPromise","_getNetworkPromise","Promise","race","timeoutPromise","resolve","onNetworkTimeout","_respondFromCache","setTimeout","clearTimeout","cachePut","NetworkOnly","StaleWhileRevalidate","fetchAndCachePromise","mapping","cacheFirst","cacheOnly","networkFirst","networkOnly","staleWhileRevalidate","deprecate","strategy","StrategyCtr","strategyCtrName","toUpperCase","slice"],"mappings":";;;;EAAA,IAAG;EAACA,EAAAA,IAAI,CAAC,0BAAD,CAAJ,IAAkCC,CAAC,EAAnC;EAAsC,CAA1C,CAA0C,OAAMC,CAAN,EAAQ;;ECAlD;;;;;;;AAQA;EAGA,MAAMC,cAAc,GAAIC,GAAD,IAAS;EAC9B,QAAMC,MAAM,GAAG,IAAIC,GAAJ,CAAQF,GAAR,EAAaG,QAAb,CAAf;;EACA,MAAIF,MAAM,CAACG,MAAP,KAAkBD,QAAQ,CAACC,MAA/B,EAAuC;EACrC,WAAOH,MAAM,CAACI,QAAd;EACD;;EACD,SAAOJ,MAAM,CAACK,IAAd;EACD,CAND;;AAQA,EAAO,MAAMC,QAAQ,GAAG;EACtBC,EAAAA,aAAa,EAAE,CAACC,YAAD,EAAeC,OAAf,KAA4B,SAAQD,YAAa,MAAtB,GACvC,eAAcV,cAAc,CAACW,OAAO,CAACV,GAAT,CAAc,GAFvB;EAGtBW,EAAAA,kBAAkB,EAAGC,QAAD,IAAc;EAChC,QAAIA,QAAJ,EAAc;EACZC,MAAAA,iBAAM,CAACC,cAAP,CAAuB,+BAAvB;EACAD,MAAAA,iBAAM,CAACE,GAAP,CAAWH,QAAX;EACAC,MAAAA,iBAAM,CAACG,QAAP;EACD;EACF;EATqB,CAAjB;;ECnBP;;;;;;;AAQA,EAWA;;;;;;;;;;;;;;EAaA,MAAMC,UAAN,CAAiB;EACf;;;;;;;;;;;;EAYAC,EAAAA,WAAW,CAACC,OAAO,GAAG,EAAX,EAAe;EACxB,SAAKC,UAAL,GAAkBC,yBAAU,CAACC,cAAX,CAA0BH,OAAO,CAACI,SAAlC,CAAlB;EACA,SAAKC,QAAL,GAAgBL,OAAO,CAACM,OAAR,IAAmB,EAAnC;EACA,SAAKC,aAAL,GAAqBP,OAAO,CAACQ,YAAR,IAAwB,IAA7C;EACA,SAAKC,aAAL,GAAqBT,OAAO,CAACU,YAAR,IAAwB,IAA7C;EACD;EAED;;;;;;;;;;;;EAUA,QAAMC,MAAN,CAAa;EAACC,IAAAA,KAAD;EAAQrB,IAAAA;EAAR,GAAb,EAA+B;EAC7B,WAAO,KAAKsB,WAAL,CAAiB;EACtBD,MAAAA,KADsB;EAEtBrB,MAAAA,OAAO,EAAEA,OAAO,IAAIqB,KAAK,CAACrB;EAFJ,KAAjB,CAAP;EAID;EAED;;;;;;;;;;;;;;;;;EAeA,QAAMsB,WAAN,CAAkB;EAACD,IAAAA,KAAD;EAAQrB,IAAAA;EAAR,GAAlB,EAAoC;EAClC,UAAMuB,IAAI,GAAG,EAAb;;EAEA,QAAI,OAAOvB,OAAP,KAAmB,QAAvB,EAAiC;EAC/BA,MAAAA,OAAO,GAAG,IAAIwB,OAAJ,CAAYxB,OAAZ,CAAV;EACD;;EAED,IAA2C;EACzCyB,MAAAA,iBAAM,CAACC,UAAP,CAAkB1B,OAAlB,EAA2BwB,OAA3B,EAAoC;EAClCG,QAAAA,UAAU,EAAE,oBADsB;EAElCC,QAAAA,SAAS,EAAE,YAFuB;EAGlCC,QAAAA,QAAQ,EAAE,aAHwB;EAIlCC,QAAAA,SAAS,EAAE;EAJuB,OAApC;EAMD;;EAED,QAAI5B,QAAQ,GAAG,MAAM6B,6BAAY,CAACC,KAAb,CAAmB;EACtCnB,MAAAA,SAAS,EAAE,KAAKH,UADsB;EAEtCV,MAAAA,OAFsC;EAGtCqB,MAAAA,KAHsC;EAItCF,MAAAA,YAAY,EAAE,KAAKD,aAJmB;EAKtCH,MAAAA,OAAO,EAAE,KAAKD;EALwB,KAAnB,CAArB;EAQA,QAAImB,KAAJ;;EACA,QAAI,CAAC/B,QAAL,EAAe;EACb,MAA2C;EACzCqB,QAAAA,IAAI,CAACW,IAAL,CACK,6BAA4B,KAAKxB,UAAW,WAA7C,GACD,sCAFH;EAGD;;EACD,UAAI;EACFR,QAAAA,QAAQ,GAAG,MAAM,KAAKiC,eAAL,CAAqBnC,OAArB,EAA8BqB,KAA9B,CAAjB;EACD,OAFD,CAEE,OAAOe,GAAP,EAAY;EACZH,QAAAA,KAAK,GAAGG,GAAR;EACD;;EAED,MAA2C;EACzC,YAAIlC,QAAJ,EAAc;EACZqB,UAAAA,IAAI,CAACW,IAAL,CAAW,4BAAX;EACD,SAFD,MAEO;EACLX,UAAAA,IAAI,CAACW,IAAL,CAAW,4CAAX;EACD;EACF;EACF,KAnBD,MAmBO;EACL,MAA2C;EACzCX,QAAAA,IAAI,CAACW,IAAL,CACK,mCAAkC,KAAKxB,UAAW,UADvD;EAED;EACF;;EAED,IAA2C;EACzCP,MAAAA,iBAAM,CAACC,cAAP,CACIP,QAAQ,CAACC,aAAT,CAAuB,YAAvB,EAAqCE,OAArC,CADJ;;EAEA,WAAK,IAAIK,GAAT,IAAgBkB,IAAhB,EAAsB;EACpBpB,QAAAA,iBAAM,CAACE,GAAP,CAAWA,GAAX;EACD;;EACDR,MAAAA,QAAQ,CAACI,kBAAT,CAA4BC,QAA5B;EACAC,MAAAA,iBAAM,CAACG,QAAP;EACD;;EAED,QAAI,CAACJ,QAAL,EAAe;EACb,YAAM,IAAImC,6BAAJ,CAAiB,aAAjB,EAAgC;EAAC/C,QAAAA,GAAG,EAAEU,OAAO,CAACV,GAAd;EAAmB2C,QAAAA;EAAnB,OAAhC,CAAN;EACD;;EACD,WAAO/B,QAAP;EACD;EAED;;;;;;;;;;;EASA,QAAMiC,eAAN,CAAsBnC,OAAtB,EAA+BqB,KAA/B,EAAsC;EACpC,UAAMnB,QAAQ,GAAG,MAAMoC,6BAAY,CAACC,KAAb,CAAmB;EACxCvC,MAAAA,OADwC;EAExCqB,MAAAA,KAFwC;EAGxCJ,MAAAA,YAAY,EAAE,KAAKD,aAHqB;EAIxCD,MAAAA,OAAO,EAAE,KAAKD;EAJ0B,KAAnB,CAAvB,CADoC;;EASpC,UAAM0B,aAAa,GAAGtC,QAAQ,CAACuC,KAAT,EAAtB;EACA,UAAMC,eAAe,GAAGX,6BAAY,CAACY,GAAb,CAAiB;EACvC9B,MAAAA,SAAS,EAAE,KAAKH,UADuB;EAEvCV,MAAAA,OAFuC;EAGvCE,MAAAA,QAAQ,EAAEsC,aAH6B;EAIvCnB,MAAAA,KAJuC;EAKvCN,MAAAA,OAAO,EAAE,KAAKD;EALyB,KAAjB,CAAxB;;EAQA,QAAIO,KAAJ,EAAW;EACT,UAAI;EACFA,QAAAA,KAAK,CAACuB,SAAN,CAAgBF,eAAhB;EACD,OAFD,CAEE,OAAOT,KAAP,EAAc;EACd,QAA2C;EACzC9B,UAAAA,iBAAM,CAAC0C,IAAP,CAAa,mDAAD,GACT,uBAAsBxD,iCAAc,CAACW,OAAO,CAACV,GAAT,CAAc,IADrD;EAED;EACF;EACF;;EAED,WAAOY,QAAP;EACD;;EA9Jc;;EChCjB;;;;;;;AAQA,EAUA;;;;;;;;;;;;;EAYA,MAAM4C,SAAN,CAAgB;EACd;;;;;;;;;EASAtC,EAAAA,WAAW,CAACC,OAAO,GAAG,EAAX,EAAe;EACxB,SAAKC,UAAL,GAAkBC,yBAAU,CAACC,cAAX,CAA0BH,OAAO,CAACI,SAAlC,CAAlB;EACA,SAAKC,QAAL,GAAgBL,OAAO,CAACM,OAAR,IAAmB,EAAnC;EACA,SAAKG,aAAL,GAAqBT,OAAO,CAACU,YAAR,IAAwB,IAA7C;EACD;EAED;;;;;;;;;;;;EAUA,QAAMC,MAAN,CAAa;EAACC,IAAAA,KAAD;EAAQrB,IAAAA;EAAR,GAAb,EAA+B;EAC7B,WAAO,KAAKsB,WAAL,CAAiB;EACtBD,MAAAA,KADsB;EAEtBrB,MAAAA,OAAO,EAAEA,OAAO,IAAIqB,KAAK,CAACrB;EAFJ,KAAjB,CAAP;EAID;EAED;;;;;;;;;;;;;;;;;EAeA,QAAMsB,WAAN,CAAkB;EAACD,IAAAA,KAAD;EAAQrB,IAAAA;EAAR,GAAlB,EAAoC;EAClC,QAAI,OAAOA,OAAP,KAAmB,QAAvB,EAAiC;EAC/BA,MAAAA,OAAO,GAAG,IAAIwB,OAAJ,CAAYxB,OAAZ,CAAV;EACD;;EAED,IAA2C;EACzCyB,MAAAA,iBAAM,CAACC,UAAP,CAAkB1B,OAAlB,EAA2BwB,OAA3B,EAAoC;EAClCG,QAAAA,UAAU,EAAE,oBADsB;EAElCC,QAAAA,SAAS,EAAE,WAFuB;EAGlCC,QAAAA,QAAQ,EAAE,aAHwB;EAIlCC,QAAAA,SAAS,EAAE;EAJuB,OAApC;EAMD;;EAED,UAAM5B,QAAQ,GAAG,MAAM6B,6BAAY,CAACC,KAAb,CAAmB;EACxCnB,MAAAA,SAAS,EAAE,KAAKH,UADwB;EAExCV,MAAAA,OAFwC;EAGxCqB,MAAAA,KAHwC;EAIxCF,MAAAA,YAAY,EAAE,KAAKD,aAJqB;EAKxCH,MAAAA,OAAO,EAAE,KAAKD;EAL0B,KAAnB,CAAvB;;EAQA,IAA2C;EACzCX,MAAAA,iBAAM,CAACC,cAAP,CACIP,QAAQ,CAACC,aAAT,CAAuB,WAAvB,EAAoCE,OAApC,CADJ;;EAEA,UAAIE,QAAJ,EAAc;EACZC,QAAAA,iBAAM,CAACE,GAAP,CAAY,mCAAkC,KAAKK,UAAW,GAAnD,GACR,SADH;EAEAb,QAAAA,QAAQ,CAACI,kBAAT,CAA4BC,QAA5B;EACD,OAJD,MAIO;EACLC,QAAAA,iBAAM,CAACE,GAAP,CAAY,6BAA4B,KAAKK,UAAW,UAAxD;EACD;;EACDP,MAAAA,iBAAM,CAACG,QAAP;EACD;;EAED,QAAI,CAACJ,QAAL,EAAe;EACb,YAAM,IAAImC,6BAAJ,CAAiB,aAAjB,EAAgC;EAAC/C,QAAAA,GAAG,EAAEU,OAAO,CAACV;EAAd,OAAhC,CAAN;EACD;;EACD,WAAOY,QAAP;EACD;;EAvFa;;EC9BhB;;;;;;;AAQA,EAEO,MAAM6C,sBAAsB,GAAG;EACpC;;;;;;;;;;EAUAC,EAAAA,eAAe,EAAE,CAAC;EAAC9C,IAAAA;EAAD,GAAD,KAAgB;EAC/B,QAAIA,QAAQ,CAAC+C,MAAT,KAAoB,GAApB,IAA2B/C,QAAQ,CAAC+C,MAAT,KAAoB,CAAnD,EAAsD;EACpD,aAAO/C,QAAP;EACD;;EACD,WAAO,IAAP;EACD;EAhBmC,CAA/B;;ECVP;;;;;;;AAQA,EAYA;;;;;;;;;;;;;;;;EAeA,MAAMgD,YAAN,CAAmB;EACjB;;;;;;;;;;;;;;;;;;EAkBA1C,EAAAA,WAAW,CAACC,OAAO,GAAG,EAAX,EAAe;EACxB,SAAKC,UAAL,GAAkBC,yBAAU,CAACC,cAAX,CAA0BH,OAAO,CAACI,SAAlC,CAAlB;;EAEA,QAAIJ,OAAO,CAACM,OAAZ,EAAqB;EACnB,UAAIoC,sBAAsB,GACxB1C,OAAO,CAACM,OAAR,CAAgBqC,IAAhB,CAAsBC,MAAD,IAAY,CAAC,CAACA,MAAM,CAACL,eAA1C,CADF;EAEA,WAAKlC,QAAL,GAAgBqC,sBAAsB,GACpC1C,OAAO,CAACM,OAD4B,GAClB,CAACgC,sBAAD,EAAyB,GAAGtC,OAAO,CAACM,OAApC,CADpB;EAED,KALD,MAKO;EACL;EACA,WAAKD,QAAL,GAAgB,CAACiC,sBAAD,CAAhB;EACD;;EAED,SAAKO,sBAAL,GAA8B7C,OAAO,CAAC8C,qBAAtC;;EACA,IAA2C;EACzC,UAAI,KAAKD,sBAAT,EAAiC;EAC/B7B,QAAAA,iBAAM,CAAC+B,MAAP,CAAc,KAAKF,sBAAnB,EAA2C,QAA3C,EAAqD;EACnD3B,UAAAA,UAAU,EAAE,oBADuC;EAEnDC,UAAAA,SAAS,EAAE,cAFwC;EAGnDC,UAAAA,QAAQ,EAAE,aAHyC;EAInDC,UAAAA,SAAS,EAAE;EAJwC,SAArD;EAMD;EACF;;EAED,SAAKd,aAAL,GAAqBP,OAAO,CAACQ,YAAR,IAAwB,IAA7C;EACA,SAAKC,aAAL,GAAqBT,OAAO,CAACU,YAAR,IAAwB,IAA7C;EACD;EAED;;;;;;;;;;;;EAUA,QAAMC,MAAN,CAAa;EAACC,IAAAA,KAAD;EAAQrB,IAAAA;EAAR,GAAb,EAA+B;EAC7B,WAAO,KAAKsB,WAAL,CAAiB;EACtBD,MAAAA,KADsB;EAEtBrB,MAAAA,OAAO,EAAEA,OAAO,IAAIqB,KAAK,CAACrB;EAFJ,KAAjB,CAAP;EAID;EAED;;;;;;;;;;;;;;;;;EAeA,QAAMsB,WAAN,CAAkB;EAACD,IAAAA,KAAD;EAAQrB,IAAAA;EAAR,GAAlB,EAAoC;EAClC,UAAMuB,IAAI,GAAG,EAAb;;EAEA,QAAI,OAAOvB,OAAP,KAAmB,QAAvB,EAAiC;EAC/BA,MAAAA,OAAO,GAAG,IAAIwB,OAAJ,CAAYxB,OAAZ,CAAV;EACD;;EAED,IAA2C;EACzCyB,MAAAA,iBAAM,CAACC,UAAP,CAAkB1B,OAAlB,EAA2BwB,OAA3B,EAAoC;EAClCG,QAAAA,UAAU,EAAE,oBADsB;EAElCC,QAAAA,SAAS,EAAE,cAFuB;EAGlCC,QAAAA,QAAQ,EAAE,QAHwB;EAIlCC,QAAAA,SAAS,EAAE;EAJuB,OAApC;EAMD;;EAED,UAAM2B,QAAQ,GAAG,EAAjB;EACA,QAAIC,SAAJ;;EAEA,QAAI,KAAKJ,sBAAT,EAAiC;EAC/B,YAAM;EAACK,QAAAA,EAAD;EAAKC,QAAAA;EAAL,UAAgB,KAAKC,kBAAL,CAAwB;EAAC7D,QAAAA,OAAD;EAAUqB,QAAAA,KAAV;EAAiBE,QAAAA;EAAjB,OAAxB,CAAtB;;EACAmC,MAAAA,SAAS,GAAGC,EAAZ;EACAF,MAAAA,QAAQ,CAACvB,IAAT,CAAc0B,OAAd;EACD;;EAED,UAAME,cAAc,GAChB,KAAKC,kBAAL,CAAwB;EAACL,MAAAA,SAAD;EAAY1D,MAAAA,OAAZ;EAAqBqB,MAAAA,KAArB;EAA4BE,MAAAA;EAA5B,KAAxB,CADJ;;EAEAkC,IAAAA,QAAQ,CAACvB,IAAT,CAAc4B,cAAd,EA3BkC;;EA8BlC,QAAI5D,QAAQ,GAAG,MAAM8D,OAAO,CAACC,IAAR,CAAaR,QAAb,CAArB,CA9BkC;EAgClC;EACA;EACA;EACA;;EACA,QAAI,CAACvD,QAAL,EAAe;EACbA,MAAAA,QAAQ,GAAG,MAAM4D,cAAjB;EACD;;EAED,IAA2C;EACzC3D,MAAAA,iBAAM,CAACC,cAAP,CACIP,QAAQ,CAACC,aAAT,CAAuB,cAAvB,EAAuCE,OAAvC,CADJ;;EAEA,WAAK,IAAIK,GAAT,IAAgBkB,IAAhB,EAAsB;EACpBpB,QAAAA,iBAAM,CAACE,GAAP,CAAWA,GAAX;EACD;;EACDR,MAAAA,QAAQ,CAACI,kBAAT,CAA4BC,QAA5B;EACAC,MAAAA,iBAAM,CAACG,QAAP;EACD;;EAED,QAAI,CAACJ,QAAL,EAAe;EACb,YAAM,IAAImC,6BAAJ,CAAiB,aAAjB,EAAgC;EAAC/C,QAAAA,GAAG,EAAEU,OAAO,CAACV;EAAd,OAAhC,CAAN;EACD;;EACD,WAAOY,QAAP;EACD;EAED;;;;;;;;;;;EASA2D,EAAAA,kBAAkB,CAAC;EAAC7D,IAAAA,OAAD;EAAUuB,IAAAA,IAAV;EAAgBF,IAAAA;EAAhB,GAAD,EAAyB;EACzC,QAAIqC,SAAJ;EACA,UAAMQ,cAAc,GAAG,IAAIF,OAAJ,CAAaG,OAAD,IAAa;EAC9C,YAAMC,gBAAgB,GAAG,YAAY;EACnC,QAA2C;EACzC7C,UAAAA,IAAI,CAACW,IAAL,CAAW,qCAAD,GACP,GAAE,KAAKoB,sBAAuB,WADjC;EAED;;EAEDa,QAAAA,OAAO,EAAC,MAAM,KAAKE,iBAAL,CAAuB;EAACrE,UAAAA,OAAD;EAAUqB,UAAAA;EAAV,SAAvB,CAAP,EAAP;EACD,OAPD;;EASAqC,MAAAA,SAAS,GAAGY,UAAU,CAClBF,gBADkB,EAElB,KAAKd,sBAAL,GAA8B,IAFZ,CAAtB;EAID,KAdsB,CAAvB;EAgBA,WAAO;EACLM,MAAAA,OAAO,EAAEM,cADJ;EAELP,MAAAA,EAAE,EAAED;EAFC,KAAP;EAID;EAED;;;;;;;;;;;;EAUA,QAAMK,kBAAN,CAAyB;EAACL,IAAAA,SAAD;EAAY1D,IAAAA,OAAZ;EAAqBuB,IAAAA,IAArB;EAA2BF,IAAAA;EAA3B,GAAzB,EAA4D;EAC1D,QAAIY,KAAJ;EACA,QAAI/B,QAAJ;;EACA,QAAI;EACFA,MAAAA,QAAQ,GAAG,MAAMoC,6BAAY,CAACC,KAAb,CAAmB;EAClCvC,QAAAA,OADkC;EAElCqB,QAAAA,KAFkC;EAGlCJ,QAAAA,YAAY,EAAE,KAAKD,aAHe;EAIlCD,QAAAA,OAAO,EAAE,KAAKD;EAJoB,OAAnB,CAAjB;EAMD,KAPD,CAOE,OAAOsB,GAAP,EAAY;EACZH,MAAAA,KAAK,GAAGG,GAAR;EACD;;EAED,QAAIsB,SAAJ,EAAe;EACba,MAAAA,YAAY,CAACb,SAAD,CAAZ;EACD;;EAED,IAA2C;EACzC,UAAIxD,QAAJ,EAAc;EACZqB,QAAAA,IAAI,CAACW,IAAL,CAAW,4BAAX;EACD,OAFD,MAEO;EACLX,QAAAA,IAAI,CAACW,IAAL,CAAW,0DAAD,GACP,yBADH;EAED;EACF;;EAED,QAAID,KAAK,IAAI,CAAC/B,QAAd,EAAwB;EACtBA,MAAAA,QAAQ,GAAG,MAAM,KAAKmE,iBAAL,CAAuB;EAACrE,QAAAA,OAAD;EAAUqB,QAAAA;EAAV,OAAvB,CAAjB;;EACA,MAA2C;EACzC,YAAInB,QAAJ,EAAc;EACZqB,UAAAA,IAAI,CAACW,IAAL,CAAW,mCAAkC,KAAKxB,UAAW,GAAnD,GACP,SADH;EAED,SAHD,MAGO;EACLa,UAAAA,IAAI,CAACW,IAAL,CAAW,6BAA4B,KAAKxB,UAAW,UAAvD;EACD;EACF;EACF,KAVD,MAUO;EACL;EACA,YAAM8B,aAAa,GAAGtC,QAAQ,CAACuC,KAAT,EAAtB;EACA,YAAM+B,QAAQ,GAAGzC,6BAAY,CAACY,GAAb,CAAiB;EAChC9B,QAAAA,SAAS,EAAE,KAAKH,UADgB;EAEhCV,QAAAA,OAFgC;EAGhCE,QAAAA,QAAQ,EAAEsC,aAHsB;EAIhCnB,QAAAA,KAJgC;EAKhCN,QAAAA,OAAO,EAAE,KAAKD;EALkB,OAAjB,CAAjB;;EAQA,UAAIO,KAAJ,EAAW;EACT,YAAI;EACF;EACA;EACAA,UAAAA,KAAK,CAACuB,SAAN,CAAgB4B,QAAhB;EACD,SAJD,CAIE,OAAOpC,GAAP,EAAY;EACZ,UAA2C;EACzCjC,YAAAA,iBAAM,CAAC0C,IAAP,CAAa,mDAAD,GACT,uBAAsBxD,iCAAc,CAACW,OAAO,CAACV,GAAT,CAAc,IADrD;EAED;EACF;EACF;EACF;;EAED,WAAOY,QAAP;EACD;EAED;;;;;;;;;;;;EAUAmE,EAAAA,iBAAiB,CAAC;EAAChD,IAAAA,KAAD;EAAQrB,IAAAA;EAAR,GAAD,EAAmB;EAClC,WAAO+B,6BAAY,CAACC,KAAb,CAAmB;EACxBnB,MAAAA,SAAS,EAAE,KAAKH,UADQ;EAExBV,MAAAA,OAFwB;EAGxBqB,MAAAA,KAHwB;EAIxBF,MAAAA,YAAY,EAAE,KAAKD,aAJK;EAKxBH,MAAAA,OAAO,EAAE,KAAKD;EALU,KAAnB,CAAP;EAOD;;EAtQgB;;ECnCnB;;;;;;;AAQA,EASA;;;;;;;;;;;;;EAYA,MAAM2D,WAAN,CAAkB;EAChB;;;;;;;;;;;EAWAjE,EAAAA,WAAW,CAACC,OAAO,GAAG,EAAX,EAAe;EACxB,SAAKC,UAAL,GAAkBC,yBAAU,CAACC,cAAX,CAA0BH,OAAO,CAACI,SAAlC,CAAlB;EACA,SAAKC,QAAL,GAAgBL,OAAO,CAACM,OAAR,IAAmB,EAAnC;EACA,SAAKC,aAAL,GAAqBP,OAAO,CAACQ,YAAR,IAAwB,IAA7C;EACD;EAED;;;;;;;;;;;;EAUA,QAAMG,MAAN,CAAa;EAACC,IAAAA,KAAD;EAAQrB,IAAAA;EAAR,GAAb,EAA+B;EAC7B,WAAO,KAAKsB,WAAL,CAAiB;EACtBD,MAAAA,KADsB;EAEtBrB,MAAAA,OAAO,EAAEA,OAAO,IAAIqB,KAAK,CAACrB;EAFJ,KAAjB,CAAP;EAID;EAED;;;;;;;;;;;;;;;;;EAeA,QAAMsB,WAAN,CAAkB;EAACD,IAAAA,KAAD;EAAQrB,IAAAA;EAAR,GAAlB,EAAoC;EAClC,QAAI,OAAOA,OAAP,KAAmB,QAAvB,EAAiC;EAC/BA,MAAAA,OAAO,GAAG,IAAIwB,OAAJ,CAAYxB,OAAZ,CAAV;EACD;;EAED,IAA2C;EACzCyB,MAAAA,iBAAM,CAACC,UAAP,CAAkB1B,OAAlB,EAA2BwB,OAA3B,EAAoC;EAClCG,QAAAA,UAAU,EAAE,oBADsB;EAElCC,QAAAA,SAAS,EAAE,aAFuB;EAGlCC,QAAAA,QAAQ,EAAE,QAHwB;EAIlCC,QAAAA,SAAS,EAAE;EAJuB,OAApC;EAMD;;EAED,QAAIG,KAAJ;EACA,QAAI/B,QAAJ;;EACA,QAAI;EACFA,MAAAA,QAAQ,GAAG,MAAMoC,6BAAY,CAACC,KAAb,CAAmB;EAClCvC,QAAAA,OADkC;EAElCqB,QAAAA,KAFkC;EAGlCJ,QAAAA,YAAY,EAAE,KAAKD,aAHe;EAIlCD,QAAAA,OAAO,EAAE,KAAKD;EAJoB,OAAnB,CAAjB;EAMD,KAPD,CAOE,OAAOsB,GAAP,EAAY;EACZH,MAAAA,KAAK,GAAGG,GAAR;EACD;;EAED,IAA2C;EACzCjC,MAAAA,iBAAM,CAACC,cAAP,CACIP,QAAQ,CAACC,aAAT,CAAuB,aAAvB,EAAsCE,OAAtC,CADJ;;EAEA,UAAIE,QAAJ,EAAc;EACZC,QAAAA,iBAAM,CAACE,GAAP,CAAY,4BAAZ;EACD,OAFD,MAEO;EACLF,QAAAA,iBAAM,CAACE,GAAP,CAAY,4CAAZ;EACD;;EACDR,MAAAA,QAAQ,CAACI,kBAAT,CAA4BC,QAA5B;EACAC,MAAAA,iBAAM,CAACG,QAAP;EACD;;EAED,QAAI,CAACJ,QAAL,EAAe;EACb,YAAM,IAAImC,6BAAJ,CAAiB,aAAjB,EAAgC;EAAC/C,QAAAA,GAAG,EAAEU,OAAO,CAACV,GAAd;EAAmB2C,QAAAA;EAAnB,OAAhC,CAAN;EACD;;EACD,WAAO/B,QAAP;EACD;;EA7Fe;;EC7BlB;;;;;;;AAQA,EAYA;;;;;;;;;;;;;;;;;;;;;EAoBA,MAAMwE,oBAAN,CAA2B;EACzB;;;;;;;;;;;;EAYAlE,EAAAA,WAAW,CAACC,OAAO,GAAG,EAAX,EAAe;EACxB,SAAKC,UAAL,GAAkBC,yBAAU,CAACC,cAAX,CAA0BH,OAAO,CAACI,SAAlC,CAAlB;EACA,SAAKC,QAAL,GAAgBL,OAAO,CAACM,OAAR,IAAmB,EAAnC;;EAEA,QAAIN,OAAO,CAACM,OAAZ,EAAqB;EACnB,UAAIoC,sBAAsB,GACxB1C,OAAO,CAACM,OAAR,CAAgBqC,IAAhB,CAAsBC,MAAD,IAAY,CAAC,CAACA,MAAM,CAACL,eAA1C,CADF;EAEA,WAAKlC,QAAL,GAAgBqC,sBAAsB,GACpC1C,OAAO,CAACM,OAD4B,GAClB,CAACgC,sBAAD,EAAyB,GAAGtC,OAAO,CAACM,OAApC,CADpB;EAED,KALD,MAKO;EACL;EACA,WAAKD,QAAL,GAAgB,CAACiC,sBAAD,CAAhB;EACD;;EAED,SAAK/B,aAAL,GAAqBP,OAAO,CAACQ,YAAR,IAAwB,IAA7C;EACA,SAAKC,aAAL,GAAqBT,OAAO,CAACU,YAAR,IAAwB,IAA7C;EACD;EAED;;;;;;;;;;;;EAUA,QAAMC,MAAN,CAAa;EAACC,IAAAA,KAAD;EAAQrB,IAAAA;EAAR,GAAb,EAA+B;EAC7B,WAAO,KAAKsB,WAAL,CAAiB;EACtBD,MAAAA,KADsB;EAEtBrB,MAAAA,OAAO,EAAEA,OAAO,IAAIqB,KAAK,CAACrB;EAFJ,KAAjB,CAAP;EAID;EACD;;;;;;;;;;;;;;;;;EAeA,QAAMsB,WAAN,CAAkB;EAACD,IAAAA,KAAD;EAAQrB,IAAAA;EAAR,GAAlB,EAAoC;EAClC,UAAMuB,IAAI,GAAG,EAAb;;EAEA,QAAI,OAAOvB,OAAP,KAAmB,QAAvB,EAAiC;EAC/BA,MAAAA,OAAO,GAAG,IAAIwB,OAAJ,CAAYxB,OAAZ,CAAV;EACD;;EAED,IAA2C;EACzCyB,MAAAA,iBAAM,CAACC,UAAP,CAAkB1B,OAAlB,EAA2BwB,OAA3B,EAAoC;EAClCG,QAAAA,UAAU,EAAE,oBADsB;EAElCC,QAAAA,SAAS,EAAE,sBAFuB;EAGlCC,QAAAA,QAAQ,EAAE,QAHwB;EAIlCC,QAAAA,SAAS,EAAE;EAJuB,OAApC;EAMD;;EAED,UAAM6C,oBAAoB,GAAG,KAAKxC,eAAL,CAAqB;EAACnC,MAAAA,OAAD;EAAUqB,MAAAA;EAAV,KAArB,CAA7B;;EAEA,QAAInB,QAAQ,GAAG,MAAM6B,6BAAY,CAACC,KAAb,CAAmB;EACtCnB,MAAAA,SAAS,EAAE,KAAKH,UADsB;EAEtCV,MAAAA,OAFsC;EAGtCqB,MAAAA,KAHsC;EAItCF,MAAAA,YAAY,EAAE,KAAKD,aAJmB;EAKtCH,MAAAA,OAAO,EAAE,KAAKD;EALwB,KAAnB,CAArB;EAOA,QAAImB,KAAJ;;EACA,QAAI/B,QAAJ,EAAc;EACZ,MAA2C;EACzCqB,QAAAA,IAAI,CAACW,IAAL,CAAW,mCAAkC,KAAKxB,UAAW,GAAnD,GACP,kEADH;EAED;;EAED,UAAIW,KAAJ,EAAW;EACT,YAAI;EACFA,UAAAA,KAAK,CAACuB,SAAN,CAAgB+B,oBAAhB;EACD,SAFD,CAEE,OAAO1C,KAAP,EAAc;EACd,UAA2C;EACzC9B,YAAAA,iBAAM,CAAC0C,IAAP,CAAa,mDAAD,GACT,uBAAsBxD,iCAAc,CAACW,OAAO,CAACV,GAAT,CAAc,IADrD;EAED;EACF;EACF;EACF,KAhBD,MAgBO;EACL,MAA2C;EACzCiC,QAAAA,IAAI,CAACW,IAAL,CAAW,6BAA4B,KAAKxB,UAAW,WAA7C,GACP,qCADH;EAED;;EACD,UAAI;EACFR,QAAAA,QAAQ,GAAG,MAAMyE,oBAAjB;EACD,OAFD,CAEE,OAAOvC,GAAP,EAAY;EACZH,QAAAA,KAAK,GAAGG,GAAR;EACD;EACF;;EAED,IAA2C;EACzCjC,MAAAA,iBAAM,CAACC,cAAP,CACIP,QAAQ,CAACC,aAAT,CAAuB,sBAAvB,EAA+CE,OAA/C,CADJ;;EAEA,WAAK,IAAIK,GAAT,IAAgBkB,IAAhB,EAAsB;EACpBpB,QAAAA,iBAAM,CAACE,GAAP,CAAWA,GAAX;EACD;;EACDR,MAAAA,QAAQ,CAACI,kBAAT,CAA4BC,QAA5B;EACAC,MAAAA,iBAAM,CAACG,QAAP;EACD;;EAED,QAAI,CAACJ,QAAL,EAAe;EACb,YAAM,IAAImC,6BAAJ,CAAiB,aAAjB,EAAgC;EAAC/C,QAAAA,GAAG,EAAEU,OAAO,CAACV,GAAd;EAAmB2C,QAAAA;EAAnB,OAAhC,CAAN;EACD;;EACD,WAAO/B,QAAP;EACD;EAED;;;;;;;;;;EAQA,QAAMiC,eAAN,CAAsB;EAACnC,IAAAA,OAAD;EAAUqB,IAAAA;EAAV,GAAtB,EAAwC;EACtC,UAAMnB,QAAQ,GAAG,MAAMoC,6BAAY,CAACC,KAAb,CAAmB;EACxCvC,MAAAA,OADwC;EAExCqB,MAAAA,KAFwC;EAGxCJ,MAAAA,YAAY,EAAE,KAAKD,aAHqB;EAIxCD,MAAAA,OAAO,EAAE,KAAKD;EAJ0B,KAAnB,CAAvB;EAOA,UAAM4B,eAAe,GAAGX,6BAAY,CAACY,GAAb,CAAiB;EACvC9B,MAAAA,SAAS,EAAE,KAAKH,UADuB;EAEvCV,MAAAA,OAFuC;EAGvCE,MAAAA,QAAQ,EAAEA,QAAQ,CAACuC,KAAT,EAH6B;EAIvCpB,MAAAA,KAJuC;EAKvCN,MAAAA,OAAO,EAAE,KAAKD;EALyB,KAAjB,CAAxB;;EAQA,QAAIO,KAAJ,EAAW;EACT,UAAI;EACFA,QAAAA,KAAK,CAACuB,SAAN,CAAgBF,eAAhB;EACD,OAFD,CAEE,OAAOT,KAAP,EAAc;EACd,QAA2C;EACzC9B,UAAAA,iBAAM,CAAC0C,IAAP,CAAa,mDAAD,GACT,uBAAsBxD,iCAAc,CAACW,OAAO,CAACV,GAAT,CAAc,IADrD;EAED;EACF;EACF;;EAED,WAAOY,QAAP;EACD;;EAxKwB;;ECxC3B;;;;;;;AAQA,EASA,MAAM0E,OAAO,GAAG;EACdC,EAAAA,UAAU,EAAEtE,UADE;EAEduE,EAAAA,SAAS,EAAEhC,SAFG;EAGdiC,EAAAA,YAAY,EAAE7B,YAHA;EAId8B,EAAAA,WAAW,EAAEP,WAJC;EAKdQ,EAAAA,oBAAoB,EAAEP;EALR,CAAhB;;EAQA,MAAMQ,SAAS,GAAIC,QAAD,IAAc;EAC9B,QAAMC,WAAW,GAAGR,OAAO,CAACO,QAAD,CAA3B;EAEA,SAAQ1E,OAAD,IAAa;EAClB,IAA2C;EACzC,YAAM4E,eAAe,GAAGF,QAAQ,CAAC,CAAD,CAAR,CAAYG,WAAZ,KAA4BH,QAAQ,CAACI,KAAT,CAAe,CAAf,CAApD;EACApF,MAAAA,iBAAM,CAAC0C,IAAP,CAAa,2BAA0BsC,QAAS,wBAApC,GACP,kEADO,GAEP,sCAAqCE,eAAgB,cAF1D;EAGD;;EACD,WAAO,IAAID,WAAJ,CAAgB3E,OAAhB,CAAP;EACD,GARD;EASD,CAZD;EAcA;;;;;;;;AAMA,QAAMoE,UAAU,GAAGK,SAAS,CAAC,YAAD,CAA5B;EAEA;;;;;;;AAMA,QAAMJ,SAAS,GAAGI,SAAS,CAAC,WAAD,CAA3B;EAEA;;;;;;;AAMA,QAAMH,YAAY,GAAGG,SAAS,CAAC,cAAD,CAA9B;EAEA;;;;;;;AAMA,QAAMF,WAAW,GAAGE,SAAS,CAAC,aAAD,CAA7B;EAEA;;;;;;;AAMA,QAAMD,oBAAoB,GAAGC,SAAS,CAAC,sBAAD,CAAtC;;;;;;;;;;;;;;;;;;;"}
\ No newline at end of file
diff --git a/public/javascripts/workbox/workbox-strategies.prod.js b/public/javascripts/workbox/workbox-strategies.prod.js
deleted file mode 100644
index 29909af3024..00000000000
--- a/public/javascripts/workbox/workbox-strategies.prod.js
+++ /dev/null
@@ -1,2 +0,0 @@
-this.workbox=this.workbox||{},this.workbox.strategies=function(e,t,s,n,r){"use strict";try{self["workbox:strategies:4.3.1"]&&_()}catch(e){}class i{constructor(e={}){this.t=t.cacheNames.getRuntimeName(e.cacheName),this.s=e.plugins||[],this.i=e.fetchOptions||null,this.h=e.matchOptions||null}async handle({event:e,request:t}){return this.makeRequest({event:e,request:t||e.request})}async makeRequest({event:e,request:t}){"string"==typeof t&&(t=new Request(t));let n,i=await s.cacheWrapper.match({cacheName:this.t,request:t,event:e,matchOptions:this.h,plugins:this.s});if(!i)try{i=await this.u(t,e)}catch(e){n=e}if(!i)throw new r.WorkboxError("no-response",{url:t.url,error:n});return i}async u(e,t){const r=await n.fetchWrapper.fetch({request:e,event:t,fetchOptions:this.i,plugins:this.s}),i=r.clone(),h=s.cacheWrapper.put({cacheName:this.t,request:e,response:i,event:t,plugins:this.s});if(t)try{t.waitUntil(h)}catch(e){}return r}}class h{constructor(e={}){this.t=t.cacheNames.getRuntimeName(e.cacheName),this.s=e.plugins||[],this.h=e.matchOptions||null}async handle({event:e,request:t}){return this.makeRequest({event:e,request:t||e.request})}async makeRequest({event:e,request:t}){"string"==typeof t&&(t=new Request(t));const n=await s.cacheWrapper.match({cacheName:this.t,request:t,event:e,matchOptions:this.h,plugins:this.s});if(!n)throw new r.WorkboxError("no-response",{url:t.url});return n}}const u={cacheWillUpdate:({response:e})=>200===e.status||0===e.status?e:null};class a{constructor(e={}){if(this.t=t.cacheNames.getRuntimeName(e.cacheName),e.plugins){let t=e.plugins.some(e=>!!e.cacheWillUpdate);this.s=t?e.plugins:[u,...e.plugins]}else this.s=[u];this.o=e.networkTimeoutSeconds,this.i=e.fetchOptions||null,this.h=e.matchOptions||null}async handle({event:e,request:t}){return this.makeRequest({event:e,request:t||e.request})}async makeRequest({event:e,request:t}){const s=[];"string"==typeof t&&(t=new Request(t));const n=[];let i;if(this.o){const{id:r,promise:h}=this.l({request:t,event:e,logs:s});i=r,n.push(h)}const h=this.q({timeoutId:i,request:t,event:e,logs:s});n.push(h);let u=await Promise.race(n);if(u||(u=await h),!u)throw new r.WorkboxError("no-response",{url:t.url});return u}l({request:e,logs:t,event:s}){let n;return{promise:new Promise(t=>{n=setTimeout(async()=>{t(await this.p({request:e,event:s}))},1e3*this.o)}),id:n}}async q({timeoutId:e,request:t,logs:r,event:i}){let h,u;try{u=await n.fetchWrapper.fetch({request:t,event:i,fetchOptions:this.i,plugins:this.s})}catch(e){h=e}if(e&&clearTimeout(e),h||!u)u=await this.p({request:t,event:i});else{const e=u.clone(),n=s.cacheWrapper.put({cacheName:this.t,request:t,response:e,event:i,plugins:this.s});if(i)try{i.waitUntil(n)}catch(e){}}return u}p({event:e,request:t}){return s.cacheWrapper.match({cacheName:this.t,request:t,event:e,matchOptions:this.h,plugins:this.s})}}class c{constructor(e={}){this.t=t.cacheNames.getRuntimeName(e.cacheName),this.s=e.plugins||[],this.i=e.fetchOptions||null}async handle({event:e,request:t}){return this.makeRequest({event:e,request:t||e.request})}async makeRequest({event:e,request:t}){let s,i;"string"==typeof t&&(t=new Request(t));try{i=await n.fetchWrapper.fetch({request:t,event:e,fetchOptions:this.i,plugins:this.s})}catch(e){s=e}if(!i)throw new r.WorkboxError("no-response",{url:t.url,error:s});return i}}class o{constructor(e={}){if(this.t=t.cacheNames.getRuntimeName(e.cacheName),this.s=e.plugins||[],e.plugins){let t=e.plugins.some(e=>!!e.cacheWillUpdate);this.s=t?e.plugins:[u,...e.plugins]}else this.s=[u];this.i=e.fetchOptions||null,this.h=e.matchOptions||null}async handle({event:e,request:t}){return this.makeRequest({event:e,request:t||e.request})}async makeRequest({event:e,request:t}){"string"==typeof t&&(t=new Request(t));const n=this.u({request:t,event:e});let i,h=await s.cacheWrapper.match({cacheName:this.t,request:t,event:e,matchOptions:this.h,plugins:this.s});if(h){if(e)try{e.waitUntil(n)}catch(i){}}else try{h=await n}catch(e){i=e}if(!h)throw new r.WorkboxError("no-response",{url:t.url,error:i});return h}async u({request:e,event:t}){const r=await n.fetchWrapper.fetch({request:e,event:t,fetchOptions:this.i,plugins:this.s}),i=s.cacheWrapper.put({cacheName:this.t,request:e,response:r.clone(),event:t,plugins:this.s});if(t)try{t.waitUntil(i)}catch(e){}return r}}const l={cacheFirst:i,cacheOnly:h,networkFirst:a,networkOnly:c,staleWhileRevalidate:o},q=e=>{const t=l[e];return e=>new t(e)},w=q("cacheFirst"),p=q("cacheOnly"),v=q("networkFirst"),y=q("networkOnly"),m=q("staleWhileRevalidate");return e.CacheFirst=i,e.CacheOnly=h,e.NetworkFirst=a,e.NetworkOnly=c,e.StaleWhileRevalidate=o,e.cacheFirst=w,e.cacheOnly=p,e.networkFirst=v,e.networkOnly=y,e.staleWhileRevalidate=m,e}({},workbox.core._private,workbox.core._private,workbox.core._private,workbox.core._private);
-//# sourceMappingURL=workbox-strategies.prod.js.map
diff --git a/public/javascripts/workbox/workbox-strategies.prod.js.map b/public/javascripts/workbox/workbox-strategies.prod.js.map
deleted file mode 100644
index 6ad0b3e3776..00000000000
--- a/public/javascripts/workbox/workbox-strategies.prod.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"workbox-strategies.prod.js","sources":["../_version.mjs","../CacheFirst.mjs","../CacheOnly.mjs","../plugins/cacheOkAndOpaquePlugin.mjs","../NetworkFirst.mjs","../NetworkOnly.mjs","../StaleWhileRevalidate.mjs","../index.mjs"],"sourcesContent":["try{self['workbox:strategies:4.3.1']&&_()}catch(e){}// eslint-disable-line","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {assert} from 'workbox-core/_private/assert.mjs';\nimport {cacheNames} from 'workbox-core/_private/cacheNames.mjs';\nimport {cacheWrapper} from 'workbox-core/_private/cacheWrapper.mjs';\nimport {fetchWrapper} from 'workbox-core/_private/fetchWrapper.mjs';\nimport {getFriendlyURL} from 'workbox-core/_private/getFriendlyURL.mjs';\nimport {logger} from 'workbox-core/_private/logger.mjs';\nimport {WorkboxError} from 'workbox-core/_private/WorkboxError.mjs';\n\nimport {messages} from './utils/messages.mjs';\nimport './_version.mjs';\n\n/**\n * An implementation of a [cache-first]{@link https://developers.google.com/web/fundamentals/instant-and-offline/offline-cookbook/#cache-falling-back-to-network}\n * request strategy.\n *\n * A cache first strategy is useful for assets that have been revisioned,\n * such as URLs like `/styles/example.a8f5f1.css`, since they\n * can be cached for long periods of time.\n *\n * If the network request fails, and there is no cache match, this will throw\n * a `WorkboxError` exception.\n *\n * @memberof workbox.strategies\n */\nclass CacheFirst {\n  /**\n   * @param {Object} options\n   * @param {string} options.cacheName Cache name to store and retrieve\n   * requests. Defaults to cache names provided by\n   * [workbox-core]{@link workbox.core.cacheNames}.\n   * @param {Array<Object>} options.plugins [Plugins]{@link https://developers.google.com/web/tools/workbox/guides/using-plugins}\n   * to use in conjunction with this caching strategy.\n   * @param {Object} options.fetchOptions Values passed along to the\n   * [`init`](https://developer.mozilla.org/en-US/docs/Web/API/WindowOrWorkerGlobalScope/fetch#Parameters)\n   * of all fetch() requests made by this strategy.\n   * @param {Object} options.matchOptions [`CacheQueryOptions`](https://w3c.github.io/ServiceWorker/#dictdef-cachequeryoptions)\n   */\n  constructor(options = {}) {\n    this._cacheName = cacheNames.getRuntimeName(options.cacheName);\n    this._plugins = options.plugins || [];\n    this._fetchOptions = options.fetchOptions || null;\n    this._matchOptions = options.matchOptions || null;\n  }\n\n  /**\n   * This method will perform a request strategy and follows an API that\n   * will work with the\n   * [Workbox Router]{@link workbox.routing.Router}.\n   *\n   * @param {Object} options\n   * @param {Request} options.request The request to run this strategy for.\n   * @param {Event} [options.event] The event that triggered the request.\n   * @return {Promise<Response>}\n   */\n  async handle({event, request}) {\n    return this.makeRequest({\n      event,\n      request: request || event.request,\n    });\n  }\n\n  /**\n   * This method can be used to perform a make a standalone request outside the\n   * context of the [Workbox Router]{@link workbox.routing.Router}.\n   *\n   * See \"[Advanced Recipes](https://developers.google.com/web/tools/workbox/guides/advanced-recipes#make-requests)\"\n   * for more usage information.\n   *\n   * @param {Object} options\n   * @param {Request|string} options.request Either a\n   *     [`Request`]{@link https://developer.mozilla.org/en-US/docs/Web/API/Request}\n   *     object, or a string URL, corresponding to the request to be made.\n   * @param {FetchEvent} [options.event] If provided, `event.waitUntil()` will\n         be called automatically to extend the service worker's lifetime.\n   * @return {Promise<Response>}\n   */\n  async makeRequest({event, request}) {\n    const logs = [];\n\n    if (typeof request === 'string') {\n      request = new Request(request);\n    }\n\n    if (process.env.NODE_ENV !== 'production') {\n      assert.isInstance(request, Request, {\n        moduleName: 'workbox-strategies',\n        className: 'CacheFirst',\n        funcName: 'makeRequest',\n        paramName: 'request',\n      });\n    }\n\n    let response = await cacheWrapper.match({\n      cacheName: this._cacheName,\n      request,\n      event,\n      matchOptions: this._matchOptions,\n      plugins: this._plugins,\n    });\n\n    let error;\n    if (!response) {\n      if (process.env.NODE_ENV !== 'production') {\n        logs.push(\n            `No response found in the '${this._cacheName}' cache. ` +\n          `Will respond with a network request.`);\n      }\n      try {\n        response = await this._getFromNetwork(request, event);\n      } catch (err) {\n        error = err;\n      }\n\n      if (process.env.NODE_ENV !== 'production') {\n        if (response) {\n          logs.push(`Got response from network.`);\n        } else {\n          logs.push(`Unable to get a response from the network.`);\n        }\n      }\n    } else {\n      if (process.env.NODE_ENV !== 'production') {\n        logs.push(\n            `Found a cached response in the '${this._cacheName}' cache.`);\n      }\n    }\n\n    if (process.env.NODE_ENV !== 'production') {\n      logger.groupCollapsed(\n          messages.strategyStart('CacheFirst', request));\n      for (let log of logs) {\n        logger.log(log);\n      }\n      messages.printFinalResponse(response);\n      logger.groupEnd();\n    }\n\n    if (!response) {\n      throw new WorkboxError('no-response', {url: request.url, error});\n    }\n    return response;\n  }\n\n  /**\n   * Handles the network and cache part of CacheFirst.\n   *\n   * @param {Request} request\n   * @param {FetchEvent} [event]\n   * @return {Promise<Response>}\n   *\n   * @private\n   */\n  async _getFromNetwork(request, event) {\n    const response = await fetchWrapper.fetch({\n      request,\n      event,\n      fetchOptions: this._fetchOptions,\n      plugins: this._plugins,\n    });\n\n    // Keep the service worker while we put the request to the cache\n    const responseClone = response.clone();\n    const cachePutPromise = cacheWrapper.put({\n      cacheName: this._cacheName,\n      request,\n      response: responseClone,\n      event,\n      plugins: this._plugins,\n    });\n\n    if (event) {\n      try {\n        event.waitUntil(cachePutPromise);\n      } catch (error) {\n        if (process.env.NODE_ENV !== 'production') {\n          logger.warn(`Unable to ensure service worker stays alive when ` +\n            `updating cache for '${getFriendlyURL(request.url)}'.`);\n        }\n      }\n    }\n\n    return response;\n  }\n}\n\nexport {CacheFirst};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {assert} from 'workbox-core/_private/assert.mjs';\nimport {cacheNames} from 'workbox-core/_private/cacheNames.mjs';\nimport {cacheWrapper} from 'workbox-core/_private/cacheWrapper.mjs';\nimport {logger} from 'workbox-core/_private/logger.mjs';\nimport {WorkboxError} from 'workbox-core/_private/WorkboxError.mjs';\n\nimport {messages} from './utils/messages.mjs';\nimport './_version.mjs';\n\n\n/**\n * An implementation of a\n * [cache-only]{@link https://developers.google.com/web/fundamentals/instant-and-offline/offline-cookbook/#cache-only}\n * request strategy.\n *\n * This class is useful if you want to take advantage of any\n * [Workbox plugins]{@link https://developers.google.com/web/tools/workbox/guides/using-plugins}.\n *\n * If there is no cache match, this will throw a `WorkboxError` exception.\n *\n * @memberof workbox.strategies\n */\nclass CacheOnly {\n  /**\n   * @param {Object} options\n   * @param {string} options.cacheName Cache name to store and retrieve\n   * requests. Defaults to cache names provided by\n   * [workbox-core]{@link workbox.core.cacheNames}.\n   * @param {Array<Object>} options.plugins [Plugins]{@link https://developers.google.com/web/tools/workbox/guides/using-plugins}\n   * to use in conjunction with this caching strategy.\n   * @param {Object} options.matchOptions [`CacheQueryOptions`](https://w3c.github.io/ServiceWorker/#dictdef-cachequeryoptions)\n   */\n  constructor(options = {}) {\n    this._cacheName = cacheNames.getRuntimeName(options.cacheName);\n    this._plugins = options.plugins || [];\n    this._matchOptions = options.matchOptions || null;\n  }\n\n  /**\n   * This method will perform a request strategy and follows an API that\n   * will work with the\n   * [Workbox Router]{@link workbox.routing.Router}.\n   *\n   * @param {Object} options\n   * @param {Request} options.request The request to run this strategy for.\n   * @param {Event} [options.event] The event that triggered the request.\n   * @return {Promise<Response>}\n   */\n  async handle({event, request}) {\n    return this.makeRequest({\n      event,\n      request: request || event.request,\n    });\n  }\n\n  /**\n   * This method can be used to perform a make a standalone request outside the\n   * context of the [Workbox Router]{@link workbox.routing.Router}.\n   *\n   * See \"[Advanced Recipes](https://developers.google.com/web/tools/workbox/guides/advanced-recipes#make-requests)\"\n   * for more usage information.\n   *\n   * @param {Object} options\n   * @param {Request|string} options.request Either a\n   *     [`Request`]{@link https://developer.mozilla.org/en-US/docs/Web/API/Request}\n   *     object, or a string URL, corresponding to the request to be made.\n   * @param {FetchEvent} [options.event] If provided, `event.waitUntil()` will\n   *     be called automatically to extend the service worker's lifetime.\n   * @return {Promise<Response>}\n   */\n  async makeRequest({event, request}) {\n    if (typeof request === 'string') {\n      request = new Request(request);\n    }\n\n    if (process.env.NODE_ENV !== 'production') {\n      assert.isInstance(request, Request, {\n        moduleName: 'workbox-strategies',\n        className: 'CacheOnly',\n        funcName: 'makeRequest',\n        paramName: 'request',\n      });\n    }\n\n    const response = await cacheWrapper.match({\n      cacheName: this._cacheName,\n      request,\n      event,\n      matchOptions: this._matchOptions,\n      plugins: this._plugins,\n    });\n\n    if (process.env.NODE_ENV !== 'production') {\n      logger.groupCollapsed(\n          messages.strategyStart('CacheOnly', request));\n      if (response) {\n        logger.log(`Found a cached response in the '${this._cacheName}'` +\n          ` cache.`);\n        messages.printFinalResponse(response);\n      } else {\n        logger.log(`No response found in the '${this._cacheName}' cache.`);\n      }\n      logger.groupEnd();\n    }\n\n    if (!response) {\n      throw new WorkboxError('no-response', {url: request.url});\n    }\n    return response;\n  }\n}\n\nexport {CacheOnly};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport '../_version.mjs';\n\nexport const cacheOkAndOpaquePlugin = {\n  /**\n   * Returns a valid response (to allow caching) if the status is 200 (OK) or\n   * 0 (opaque).\n   *\n   * @param {Object} options\n   * @param {Response} options.response\n   * @return {Response|null}\n   *\n   * @private\n   */\n  cacheWillUpdate: ({response}) => {\n    if (response.status === 200 || response.status === 0) {\n      return response;\n    }\n    return null;\n  },\n};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {assert} from 'workbox-core/_private/assert.mjs';\nimport {cacheNames} from 'workbox-core/_private/cacheNames.mjs';\nimport {cacheWrapper} from 'workbox-core/_private/cacheWrapper.mjs';\nimport {fetchWrapper} from 'workbox-core/_private/fetchWrapper.mjs';\nimport {getFriendlyURL} from 'workbox-core/_private/getFriendlyURL.mjs';\nimport {logger} from 'workbox-core/_private/logger.mjs';\nimport {WorkboxError} from 'workbox-core/_private/WorkboxError.mjs';\n\nimport {messages} from './utils/messages.mjs';\nimport {cacheOkAndOpaquePlugin} from './plugins/cacheOkAndOpaquePlugin.mjs';\nimport './_version.mjs';\n\n/**\n * An implementation of a\n * [network first]{@link https://developers.google.com/web/fundamentals/instant-and-offline/offline-cookbook/#network-falling-back-to-cache}\n * request strategy.\n *\n * By default, this strategy will cache responses with a 200 status code as\n * well as [opaque responses]{@link https://developers.google.com/web/tools/workbox/guides/handle-third-party-requests}.\n * Opaque responses are are cross-origin requests where the response doesn't\n * support [CORS]{@link https://enable-cors.org/}.\n *\n * If the network request fails, and there is no cache match, this will throw\n * a `WorkboxError` exception.\n *\n * @memberof workbox.strategies\n */\nclass NetworkFirst {\n  /**\n   * @param {Object} options\n   * @param {string} options.cacheName Cache name to store and retrieve\n   * requests. Defaults to cache names provided by\n   * [workbox-core]{@link workbox.core.cacheNames}.\n   * @param {Array<Object>} options.plugins [Plugins]{@link https://developers.google.com/web/tools/workbox/guides/using-plugins}\n   * to use in conjunction with this caching strategy.\n   * @param {Object} options.fetchOptions Values passed along to the\n   * [`init`](https://developer.mozilla.org/en-US/docs/Web/API/WindowOrWorkerGlobalScope/fetch#Parameters)\n   * of all fetch() requests made by this strategy.\n   * @param {Object} options.matchOptions [`CacheQueryOptions`](https://w3c.github.io/ServiceWorker/#dictdef-cachequeryoptions)\n   * @param {number} options.networkTimeoutSeconds If set, any network requests\n   * that fail to respond within the timeout will fallback to the cache.\n   *\n   * This option can be used to combat\n   * \"[lie-fi]{@link https://developers.google.com/web/fundamentals/performance/poor-connectivity/#lie-fi}\"\n   * scenarios.\n   */\n  constructor(options = {}) {\n    this._cacheName = cacheNames.getRuntimeName(options.cacheName);\n\n    if (options.plugins) {\n      let isUsingCacheWillUpdate =\n        options.plugins.some((plugin) => !!plugin.cacheWillUpdate);\n      this._plugins = isUsingCacheWillUpdate ?\n        options.plugins : [cacheOkAndOpaquePlugin, ...options.plugins];\n    } else {\n      // No plugins passed in, use the default plugin.\n      this._plugins = [cacheOkAndOpaquePlugin];\n    }\n\n    this._networkTimeoutSeconds = options.networkTimeoutSeconds;\n    if (process.env.NODE_ENV !== 'production') {\n      if (this._networkTimeoutSeconds) {\n        assert.isType(this._networkTimeoutSeconds, 'number', {\n          moduleName: 'workbox-strategies',\n          className: 'NetworkFirst',\n          funcName: 'constructor',\n          paramName: 'networkTimeoutSeconds',\n        });\n      }\n    }\n\n    this._fetchOptions = options.fetchOptions || null;\n    this._matchOptions = options.matchOptions || null;\n  }\n\n  /**\n   * This method will perform a request strategy and follows an API that\n   * will work with the\n   * [Workbox Router]{@link workbox.routing.Router}.\n   *\n   * @param {Object} options\n   * @param {Request} options.request The request to run this strategy for.\n   * @param {Event} [options.event] The event that triggered the request.\n   * @return {Promise<Response>}\n   */\n  async handle({event, request}) {\n    return this.makeRequest({\n      event,\n      request: request || event.request,\n    });\n  }\n\n  /**\n   * This method can be used to perform a make a standalone request outside the\n   * context of the [Workbox Router]{@link workbox.routing.Router}.\n   *\n   * See \"[Advanced Recipes](https://developers.google.com/web/tools/workbox/guides/advanced-recipes#make-requests)\"\n   * for more usage information.\n   *\n   * @param {Object} options\n   * @param {Request|string} options.request Either a\n   *     [`Request`]{@link https://developer.mozilla.org/en-US/docs/Web/API/Request}\n   *     object, or a string URL, corresponding to the request to be made.\n   * @param {FetchEvent} [options.event] If provided, `event.waitUntil()` will\n   *     be called automatically to extend the service worker's lifetime.\n   * @return {Promise<Response>}\n   */\n  async makeRequest({event, request}) {\n    const logs = [];\n\n    if (typeof request === 'string') {\n      request = new Request(request);\n    }\n\n    if (process.env.NODE_ENV !== 'production') {\n      assert.isInstance(request, Request, {\n        moduleName: 'workbox-strategies',\n        className: 'NetworkFirst',\n        funcName: 'handle',\n        paramName: 'makeRequest',\n      });\n    }\n\n    const promises = [];\n    let timeoutId;\n\n    if (this._networkTimeoutSeconds) {\n      const {id, promise} = this._getTimeoutPromise({request, event, logs});\n      timeoutId = id;\n      promises.push(promise);\n    }\n\n    const networkPromise =\n        this._getNetworkPromise({timeoutId, request, event, logs});\n    promises.push(networkPromise);\n\n    // Promise.race() will resolve as soon as the first promise resolves.\n    let response = await Promise.race(promises);\n    // If Promise.race() resolved with null, it might be due to a network\n    // timeout + a cache miss. If that were to happen, we'd rather wait until\n    // the networkPromise resolves instead of returning null.\n    // Note that it's fine to await an already-resolved promise, so we don't\n    // have to check to see if it's still \"in flight\".\n    if (!response) {\n      response = await networkPromise;\n    }\n\n    if (process.env.NODE_ENV !== 'production') {\n      logger.groupCollapsed(\n          messages.strategyStart('NetworkFirst', request));\n      for (let log of logs) {\n        logger.log(log);\n      }\n      messages.printFinalResponse(response);\n      logger.groupEnd();\n    }\n\n    if (!response) {\n      throw new WorkboxError('no-response', {url: request.url});\n    }\n    return response;\n  }\n\n  /**\n   * @param {Object} options\n   * @param {Request} options.request\n   * @param {Array} options.logs A reference to the logs array\n   * @param {Event} [options.event]\n   * @return {Promise<Response>}\n   *\n   * @private\n   */\n  _getTimeoutPromise({request, logs, event}) {\n    let timeoutId;\n    const timeoutPromise = new Promise((resolve) => {\n      const onNetworkTimeout = async () => {\n        if (process.env.NODE_ENV !== 'production') {\n          logs.push(`Timing out the network response at ` +\n            `${this._networkTimeoutSeconds} seconds.`);\n        }\n\n        resolve(await this._respondFromCache({request, event}));\n      };\n\n      timeoutId = setTimeout(\n          onNetworkTimeout,\n          this._networkTimeoutSeconds * 1000,\n      );\n    });\n\n    return {\n      promise: timeoutPromise,\n      id: timeoutId,\n    };\n  }\n\n  /**\n   * @param {Object} options\n   * @param {number|undefined} options.timeoutId\n   * @param {Request} options.request\n   * @param {Array} options.logs A reference to the logs Array.\n   * @param {Event} [options.event]\n   * @return {Promise<Response>}\n   *\n   * @private\n   */\n  async _getNetworkPromise({timeoutId, request, logs, event}) {\n    let error;\n    let response;\n    try {\n      response = await fetchWrapper.fetch({\n        request,\n        event,\n        fetchOptions: this._fetchOptions,\n        plugins: this._plugins,\n      });\n    } catch (err) {\n      error = err;\n    }\n\n    if (timeoutId) {\n      clearTimeout(timeoutId);\n    }\n\n    if (process.env.NODE_ENV !== 'production') {\n      if (response) {\n        logs.push(`Got response from network.`);\n      } else {\n        logs.push(`Unable to get a response from the network. Will respond ` +\n          `with a cached response.`);\n      }\n    }\n\n    if (error || !response) {\n      response = await this._respondFromCache({request, event});\n      if (process.env.NODE_ENV !== 'production') {\n        if (response) {\n          logs.push(`Found a cached response in the '${this._cacheName}'` +\n            ` cache.`);\n        } else {\n          logs.push(`No response found in the '${this._cacheName}' cache.`);\n        }\n      }\n    } else {\n      // Keep the service worker alive while we put the request in the cache\n      const responseClone = response.clone();\n      const cachePut = cacheWrapper.put({\n        cacheName: this._cacheName,\n        request,\n        response: responseClone,\n        event,\n        plugins: this._plugins,\n      });\n\n      if (event) {\n        try {\n          // The event has been responded to so we can keep the SW alive to\n          // respond to the request\n          event.waitUntil(cachePut);\n        } catch (err) {\n          if (process.env.NODE_ENV !== 'production') {\n            logger.warn(`Unable to ensure service worker stays alive when ` +\n              `updating cache for '${getFriendlyURL(request.url)}'.`);\n          }\n        }\n      }\n    }\n\n    return response;\n  }\n\n  /**\n   * Used if the network timeouts or fails to make the request.\n   *\n   * @param {Object} options\n   * @param {Request} request The request to match in the cache\n   * @param {Event} [options.event]\n   * @return {Promise<Object>}\n   *\n   * @private\n   */\n  _respondFromCache({event, request}) {\n    return cacheWrapper.match({\n      cacheName: this._cacheName,\n      request,\n      event,\n      matchOptions: this._matchOptions,\n      plugins: this._plugins,\n    });\n  }\n}\n\nexport {NetworkFirst};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {assert} from 'workbox-core/_private/assert.mjs';\nimport {cacheNames} from 'workbox-core/_private/cacheNames.mjs';\nimport {fetchWrapper} from 'workbox-core/_private/fetchWrapper.mjs';\nimport {logger} from 'workbox-core/_private/logger.mjs';\nimport {WorkboxError} from 'workbox-core/_private/WorkboxError.mjs';\n\nimport {messages} from './utils/messages.mjs';\nimport './_version.mjs';\n\n/**\n * An implementation of a\n * [network-only]{@link https://developers.google.com/web/fundamentals/instant-and-offline/offline-cookbook/#network-only}\n * request strategy.\n *\n * This class is useful if you want to take advantage of any\n * [Workbox plugins]{@link https://developers.google.com/web/tools/workbox/guides/using-plugins}.\n *\n * If the network request fails, this will throw a `WorkboxError` exception.\n *\n * @memberof workbox.strategies\n */\nclass NetworkOnly {\n  /**\n   * @param {Object} options\n   * @param {string} options.cacheName Cache name to store and retrieve\n   * requests. Defaults to cache names provided by\n   * [workbox-core]{@link workbox.core.cacheNames}.\n   * @param {Array<Object>} options.plugins [Plugins]{@link https://developers.google.com/web/tools/workbox/guides/using-plugins}\n   * to use in conjunction with this caching strategy.\n   * @param {Object} options.fetchOptions Values passed along to the\n   * [`init`](https://developer.mozilla.org/en-US/docs/Web/API/WindowOrWorkerGlobalScope/fetch#Parameters)\n   * of all fetch() requests made by this strategy.\n   */\n  constructor(options = {}) {\n    this._cacheName = cacheNames.getRuntimeName(options.cacheName);\n    this._plugins = options.plugins || [];\n    this._fetchOptions = options.fetchOptions || null;\n  }\n\n  /**\n   * This method will perform a request strategy and follows an API that\n   * will work with the\n   * [Workbox Router]{@link workbox.routing.Router}.\n   *\n   * @param {Object} options\n   * @param {Request} options.request The request to run this strategy for.\n   * @param {Event} [options.event] The event that triggered the request.\n   * @return {Promise<Response>}\n   */\n  async handle({event, request}) {\n    return this.makeRequest({\n      event,\n      request: request || event.request,\n    });\n  }\n\n  /**\n   * This method can be used to perform a make a standalone request outside the\n   * context of the [Workbox Router]{@link workbox.routing.Router}.\n   *\n   * See \"[Advanced Recipes](https://developers.google.com/web/tools/workbox/guides/advanced-recipes#make-requests)\"\n   * for more usage information.\n   *\n   * @param {Object} options\n   * @param {Request|string} options.request Either a\n   *     [`Request`]{@link https://developer.mozilla.org/en-US/docs/Web/API/Request}\n   *     object, or a string URL, corresponding to the request to be made.\n   * @param {FetchEvent} [options.event] If provided, `event.waitUntil()` will\n   *     be called automatically to extend the service worker's lifetime.\n   * @return {Promise<Response>}\n   */\n  async makeRequest({event, request}) {\n    if (typeof request === 'string') {\n      request = new Request(request);\n    }\n\n    if (process.env.NODE_ENV !== 'production') {\n      assert.isInstance(request, Request, {\n        moduleName: 'workbox-strategies',\n        className: 'NetworkOnly',\n        funcName: 'handle',\n        paramName: 'request',\n      });\n    }\n\n    let error;\n    let response;\n    try {\n      response = await fetchWrapper.fetch({\n        request,\n        event,\n        fetchOptions: this._fetchOptions,\n        plugins: this._plugins,\n      });\n    } catch (err) {\n      error = err;\n    }\n\n    if (process.env.NODE_ENV !== 'production') {\n      logger.groupCollapsed(\n          messages.strategyStart('NetworkOnly', request));\n      if (response) {\n        logger.log(`Got response from network.`);\n      } else {\n        logger.log(`Unable to get a response from the network.`);\n      }\n      messages.printFinalResponse(response);\n      logger.groupEnd();\n    }\n\n    if (!response) {\n      throw new WorkboxError('no-response', {url: request.url, error});\n    }\n    return response;\n  }\n}\n\nexport {NetworkOnly};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {assert} from 'workbox-core/_private/assert.mjs';\nimport {cacheNames} from 'workbox-core/_private/cacheNames.mjs';\nimport {cacheWrapper} from 'workbox-core/_private/cacheWrapper.mjs';\nimport {fetchWrapper} from 'workbox-core/_private/fetchWrapper.mjs';\nimport {getFriendlyURL} from 'workbox-core/_private/getFriendlyURL.mjs';\nimport {logger} from 'workbox-core/_private/logger.mjs';\nimport {WorkboxError} from 'workbox-core/_private/WorkboxError.mjs';\n\nimport {messages} from './utils/messages.mjs';\nimport {cacheOkAndOpaquePlugin} from './plugins/cacheOkAndOpaquePlugin.mjs';\nimport './_version.mjs';\n\n/**\n * An implementation of a\n * [stale-while-revalidate]{@link https://developers.google.com/web/fundamentals/instant-and-offline/offline-cookbook/#stale-while-revalidate}\n * request strategy.\n *\n * Resources are requested from both the cache and the network in parallel.\n * The strategy will respond with the cached version if available, otherwise\n * wait for the network response. The cache is updated with the network response\n * with each successful request.\n *\n * By default, this strategy will cache responses with a 200 status code as\n * well as [opaque responses]{@link https://developers.google.com/web/tools/workbox/guides/handle-third-party-requests}.\n * Opaque responses are are cross-origin requests where the response doesn't\n * support [CORS]{@link https://enable-cors.org/}.\n *\n * If the network request fails, and there is no cache match, this will throw\n * a `WorkboxError` exception.\n *\n * @memberof workbox.strategies\n */\nclass StaleWhileRevalidate {\n  /**\n   * @param {Object} options\n   * @param {string} options.cacheName Cache name to store and retrieve\n   * requests. Defaults to cache names provided by\n   * [workbox-core]{@link workbox.core.cacheNames}.\n   * @param {Array<Object>} options.plugins [Plugins]{@link https://developers.google.com/web/tools/workbox/guides/using-plugins}\n   * to use in conjunction with this caching strategy.\n   * @param {Object} options.fetchOptions Values passed along to the\n   * [`init`](https://developer.mozilla.org/en-US/docs/Web/API/WindowOrWorkerGlobalScope/fetch#Parameters)\n   * of all fetch() requests made by this strategy.\n   * @param {Object} options.matchOptions [`CacheQueryOptions`](https://w3c.github.io/ServiceWorker/#dictdef-cachequeryoptions)\n   */\n  constructor(options = {}) {\n    this._cacheName = cacheNames.getRuntimeName(options.cacheName);\n    this._plugins = options.plugins || [];\n\n    if (options.plugins) {\n      let isUsingCacheWillUpdate =\n        options.plugins.some((plugin) => !!plugin.cacheWillUpdate);\n      this._plugins = isUsingCacheWillUpdate ?\n        options.plugins : [cacheOkAndOpaquePlugin, ...options.plugins];\n    } else {\n      // No plugins passed in, use the default plugin.\n      this._plugins = [cacheOkAndOpaquePlugin];\n    }\n\n    this._fetchOptions = options.fetchOptions || null;\n    this._matchOptions = options.matchOptions || null;\n  }\n\n  /**\n   * This method will perform a request strategy and follows an API that\n   * will work with the\n   * [Workbox Router]{@link workbox.routing.Router}.\n   *\n   * @param {Object} options\n   * @param {Request} options.request The request to run this strategy for.\n   * @param {Event} [options.event] The event that triggered the request.\n   * @return {Promise<Response>}\n   */\n  async handle({event, request}) {\n    return this.makeRequest({\n      event,\n      request: request || event.request,\n    });\n  }\n  /**\n   * This method can be used to perform a make a standalone request outside the\n   * context of the [Workbox Router]{@link workbox.routing.Router}.\n   *\n   * See \"[Advanced Recipes](https://developers.google.com/web/tools/workbox/guides/advanced-recipes#make-requests)\"\n   * for more usage information.\n   *\n   * @param {Object} options\n   * @param {Request|string} options.request Either a\n   *     [`Request`]{@link https://developer.mozilla.org/en-US/docs/Web/API/Request}\n   *     object, or a string URL, corresponding to the request to be made.\n   * @param {FetchEvent} [options.event] If provided, `event.waitUntil()` will\n   *     be called automatically to extend the service worker's lifetime.\n   * @return {Promise<Response>}\n   */\n  async makeRequest({event, request}) {\n    const logs = [];\n\n    if (typeof request === 'string') {\n      request = new Request(request);\n    }\n\n    if (process.env.NODE_ENV !== 'production') {\n      assert.isInstance(request, Request, {\n        moduleName: 'workbox-strategies',\n        className: 'StaleWhileRevalidate',\n        funcName: 'handle',\n        paramName: 'request',\n      });\n    }\n\n    const fetchAndCachePromise = this._getFromNetwork({request, event});\n\n    let response = await cacheWrapper.match({\n      cacheName: this._cacheName,\n      request,\n      event,\n      matchOptions: this._matchOptions,\n      plugins: this._plugins,\n    });\n    let error;\n    if (response) {\n      if (process.env.NODE_ENV !== 'production') {\n        logs.push(`Found a cached response in the '${this._cacheName}'` +\n          ` cache. Will update with the network response in the background.`);\n      }\n\n      if (event) {\n        try {\n          event.waitUntil(fetchAndCachePromise);\n        } catch (error) {\n          if (process.env.NODE_ENV !== 'production') {\n            logger.warn(`Unable to ensure service worker stays alive when ` +\n              `updating cache for '${getFriendlyURL(request.url)}'.`);\n          }\n        }\n      }\n    } else {\n      if (process.env.NODE_ENV !== 'production') {\n        logs.push(`No response found in the '${this._cacheName}' cache. ` +\n          `Will wait for the network response.`);\n      }\n      try {\n        response = await fetchAndCachePromise;\n      } catch (err) {\n        error = err;\n      }\n    }\n\n    if (process.env.NODE_ENV !== 'production') {\n      logger.groupCollapsed(\n          messages.strategyStart('StaleWhileRevalidate', request));\n      for (let log of logs) {\n        logger.log(log);\n      }\n      messages.printFinalResponse(response);\n      logger.groupEnd();\n    }\n\n    if (!response) {\n      throw new WorkboxError('no-response', {url: request.url, error});\n    }\n    return response;\n  }\n\n  /**\n   * @param {Object} options\n   * @param {Request} options.request\n   * @param {Event} [options.event]\n   * @return {Promise<Response>}\n   *\n   * @private\n   */\n  async _getFromNetwork({request, event}) {\n    const response = await fetchWrapper.fetch({\n      request,\n      event,\n      fetchOptions: this._fetchOptions,\n      plugins: this._plugins,\n    });\n\n    const cachePutPromise = cacheWrapper.put({\n      cacheName: this._cacheName,\n      request,\n      response: response.clone(),\n      event,\n      plugins: this._plugins,\n    });\n\n    if (event) {\n      try {\n        event.waitUntil(cachePutPromise);\n      } catch (error) {\n        if (process.env.NODE_ENV !== 'production') {\n          logger.warn(`Unable to ensure service worker stays alive when ` +\n            `updating cache for '${getFriendlyURL(request.url)}'.`);\n        }\n      }\n    }\n\n    return response;\n  }\n}\n\nexport {StaleWhileRevalidate};\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {logger} from 'workbox-core/_private/logger.mjs';\nimport {CacheFirst} from './CacheFirst.mjs';\nimport {CacheOnly} from './CacheOnly.mjs';\nimport {NetworkFirst} from './NetworkFirst.mjs';\nimport {NetworkOnly} from './NetworkOnly.mjs';\nimport {StaleWhileRevalidate} from './StaleWhileRevalidate.mjs';\nimport './_version.mjs';\n\n\nconst mapping = {\n  cacheFirst: CacheFirst,\n  cacheOnly: CacheOnly,\n  networkFirst: NetworkFirst,\n  networkOnly: NetworkOnly,\n  staleWhileRevalidate: StaleWhileRevalidate,\n};\n\nconst deprecate = (strategy) => {\n  const StrategyCtr = mapping[strategy];\n\n  return (options) => {\n    if (process.env.NODE_ENV !== 'production') {\n      const strategyCtrName = strategy[0].toUpperCase() + strategy.slice(1);\n      logger.warn(`The 'workbox.strategies.${strategy}()' function has been ` +\n          `deprecated and will be removed in a future version of Workbox.\\n` +\n          `Please use 'new workbox.strategies.${strategyCtrName}()' instead.`);\n    }\n    return new StrategyCtr(options);\n  };\n};\n\n/**\n * @function workbox.strategies.cacheFirst\n * @param {Object} options See the {@link workbox.strategies.CacheFirst}\n * constructor for more info.\n * @deprecated since v4.0.0\n */\nconst cacheFirst = deprecate('cacheFirst');\n\n/**\n * @function workbox.strategies.cacheOnly\n * @param {Object} options See the {@link workbox.strategies.CacheOnly}\n * constructor for more info.\n * @deprecated since v4.0.0\n */\nconst cacheOnly = deprecate('cacheOnly');\n\n/**\n * @function workbox.strategies.networkFirst\n * @param {Object} options See the {@link workbox.strategies.NetworkFirst}\n * constructor for more info.\n * @deprecated since v4.0.0\n */\nconst networkFirst = deprecate('networkFirst');\n\n/**\n * @function workbox.strategies.networkOnly\n * @param {Object} options See the {@link workbox.strategies.NetworkOnly}\n * constructor for more info.\n * @deprecated since v4.0.0\n */\nconst networkOnly = deprecate('networkOnly');\n\n/**\n * @function workbox.strategies.staleWhileRevalidate\n * @param {Object} options See the\n * {@link workbox.strategies.StaleWhileRevalidate} constructor for more info.\n * @deprecated since v4.0.0\n */\nconst staleWhileRevalidate = deprecate('staleWhileRevalidate');\n\n/**\n * There are common caching strategies that most service workers will need\n * and use. This module provides simple implementations of these strategies.\n *\n * @namespace workbox.strategies\n */\n\nexport {\n  CacheFirst,\n  CacheOnly,\n  NetworkFirst,\n  NetworkOnly,\n  StaleWhileRevalidate,\n\n  // Deprecated...\n  cacheFirst,\n  cacheOnly,\n  networkFirst,\n  networkOnly,\n  staleWhileRevalidate,\n};\n\n"],"names":["self","_","e","CacheFirst","constructor","options","_cacheName","cacheNames","getRuntimeName","cacheName","_plugins","plugins","_fetchOptions","fetchOptions","_matchOptions","matchOptions","event","request","this","makeRequest","Request","error","response","cacheWrapper","match","_getFromNetwork","err","WorkboxError","url","fetchWrapper","fetch","responseClone","clone","cachePutPromise","put","waitUntil","CacheOnly","cacheOkAndOpaquePlugin","cacheWillUpdate","status","NetworkFirst","isUsingCacheWillUpdate","some","plugin","_networkTimeoutSeconds","networkTimeoutSeconds","logs","promises","timeoutId","id","promise","_getTimeoutPromise","push","networkPromise","_getNetworkPromise","Promise","race","resolve","setTimeout","async","_respondFromCache","clearTimeout","cachePut","NetworkOnly","StaleWhileRevalidate","fetchAndCachePromise","mapping","cacheFirst","cacheOnly","networkFirst","networkOnly","staleWhileRevalidate","deprecate","strategy","StrategyCtr"],"mappings":"uFAAA,IAAIA,KAAK,6BAA6BC,IAAI,MAAMC,ICgChD,MAAMC,EAaJC,YAAYC,EAAU,SACfC,EAAaC,aAAWC,eAAeH,EAAQI,gBAC/CC,EAAWL,EAAQM,SAAW,QAC9BC,EAAgBP,EAAQQ,cAAgB,UACxCC,EAAgBT,EAAQU,cAAgB,mBAalCC,MAACA,EAADC,QAAQA,WACZC,KAAKC,YAAY,CACtBH,MAAAA,EACAC,QAASA,GAAWD,EAAMC,6BAmBZD,MAACA,EAADC,QAAQA,IAGD,iBAAZA,IACTA,EAAU,IAAIG,QAAQH,QAoBpBI,EARAC,QAAiBC,eAAaC,MAAM,CACtCf,UAAWS,KAAKZ,EAChBW,QAAAA,EACAD,MAAAA,EACAD,aAAcG,KAAKJ,EACnBH,QAASO,KAAKR,QAIXY,MAODA,QAAiBJ,KAAKO,EAAgBR,EAASD,GAC/C,MAAOU,GACPL,EAAQK,MA2BPJ,QACG,IAAIK,eAAa,cAAe,CAACC,IAAKX,EAAQW,IAAKP,MAAAA,WAEpDC,UAYaL,EAASD,SACvBM,QAAiBO,eAAaC,MAAM,CACxCb,QAAAA,EACAD,MAAAA,EACAH,aAAcK,KAAKN,EACnBD,QAASO,KAAKR,IAIVqB,EAAgBT,EAASU,QACzBC,EAAkBV,eAAaW,IAAI,CACvCzB,UAAWS,KAAKZ,EAChBW,QAAAA,EACAK,SAAUS,EACVf,MAAAA,EACAL,QAASO,KAAKR,OAGZM,MAEAA,EAAMmB,UAAUF,GAChB,MAAOZ,WAQJC,GC/JX,MAAMc,EAUJhC,YAAYC,EAAU,SACfC,EAAaC,aAAWC,eAAeH,EAAQI,gBAC/CC,EAAWL,EAAQM,SAAW,QAC9BG,EAAgBT,EAAQU,cAAgB,mBAalCC,MAACA,EAADC,QAAQA,WACZC,KAAKC,YAAY,CACtBH,MAAAA,EACAC,QAASA,GAAWD,EAAMC,6BAmBZD,MAACA,EAADC,QAAQA,IACD,iBAAZA,IACTA,EAAU,IAAIG,QAAQH,UAYlBK,QAAiBC,eAAaC,MAAM,CACxCf,UAAWS,KAAKZ,EAChBW,QAAAA,EACAD,MAAAA,EACAD,aAAcG,KAAKJ,EACnBH,QAASO,KAAKR,QAgBXY,QACG,IAAIK,eAAa,cAAe,CAACC,IAAKX,EAAQW,aAE/CN,GC1GJ,MAAMe,EAAyB,CAWpCC,gBAAiB,EAAEhB,SAAAA,KACO,MAApBA,EAASiB,QAAsC,IAApBjB,EAASiB,OAC/BjB,EAEF,MCUX,MAAMkB,EAmBJpC,YAAYC,EAAU,YACfC,EAAaC,aAAWC,eAAeH,EAAQI,WAEhDJ,EAAQM,QAAS,KACf8B,EACFpC,EAAQM,QAAQ+B,KAAMC,KAAaA,EAAOL,sBACvC5B,EAAW+B,EACdpC,EAAQM,QAAU,CAAC0B,KAA2BhC,EAAQM,mBAGnDD,EAAW,CAAC2B,QAGdO,EAAyBvC,EAAQwC,2BAYjCjC,EAAgBP,EAAQQ,cAAgB,UACxCC,EAAgBT,EAAQU,cAAgB,mBAalCC,MAACA,EAADC,QAAQA,WACZC,KAAKC,YAAY,CACtBH,MAAAA,EACAC,QAASA,GAAWD,EAAMC,6BAmBZD,MAACA,EAADC,QAAQA,UAClB6B,EAAO,GAEU,iBAAZ7B,IACTA,EAAU,IAAIG,QAAQH,UAYlB8B,EAAW,OACbC,KAEA9B,KAAK0B,EAAwB,OACzBK,GAACA,EAADC,QAAKA,GAAWhC,KAAKiC,EAAmB,CAAClC,QAAAA,EAASD,MAAAA,EAAO8B,KAAAA,IAC/DE,EAAYC,EACZF,EAASK,KAAKF,SAGVG,EACFnC,KAAKoC,EAAmB,CAACN,UAAAA,EAAW/B,QAAAA,EAASD,MAAAA,EAAO8B,KAAAA,IACxDC,EAASK,KAAKC,OAGV/B,QAAiBiC,QAAQC,KAAKT,MAM7BzB,IACHA,QAAiB+B,IAad/B,QACG,IAAIK,eAAa,cAAe,CAACC,IAAKX,EAAQW,aAE/CN,EAYT6B,GAAmBlC,QAACA,EAAD6B,KAAUA,EAAV9B,MAAgBA,QAC7BgC,QAiBG,CACLE,QAjBqB,IAAIK,QAASE,IAUlCT,EAAYU,WATaC,UAMvBF,QAAcvC,KAAK0C,EAAkB,CAAC3C,QAAAA,EAASD,MAAAA,MAKf,IAA9BE,KAAK0B,KAMTK,GAAID,YAciBA,UAACA,EAAD/B,QAAYA,EAAZ6B,KAAqBA,EAArB9B,MAA2BA,QAC9CK,EACAC,MAEFA,QAAiBO,eAAaC,MAAM,CAClCb,QAAAA,EACAD,MAAAA,EACAH,aAAcK,KAAKN,EACnBD,QAASO,KAAKR,IAEhB,MAAOgB,GACPL,EAAQK,KAGNsB,GACFa,aAAab,GAYX3B,IAAUC,EACZA,QAAiBJ,KAAK0C,EAAkB,CAAC3C,QAAAA,EAASD,MAAAA,QAS7C,OAECe,EAAgBT,EAASU,QACzB8B,EAAWvC,eAAaW,IAAI,CAChCzB,UAAWS,KAAKZ,EAChBW,QAAAA,EACAK,SAAUS,EACVf,MAAAA,EACAL,QAASO,KAAKR,OAGZM,MAIAA,EAAMmB,UAAU2B,GAChB,MAAOpC,YASNJ,EAaTsC,GAAkB5C,MAACA,EAADC,QAAQA,WACjBM,eAAaC,MAAM,CACxBf,UAAWS,KAAKZ,EAChBW,QAAAA,EACAD,MAAAA,EACAD,aAAcG,KAAKJ,EACnBH,QAASO,KAAKR,KC1QpB,MAAMqD,EAYJ3D,YAAYC,EAAU,SACfC,EAAaC,aAAWC,eAAeH,EAAQI,gBAC/CC,EAAWL,EAAQM,SAAW,QAC9BC,EAAgBP,EAAQQ,cAAgB,mBAalCG,MAACA,EAADC,QAAQA,WACZC,KAAKC,YAAY,CACtBH,MAAAA,EACAC,QAASA,GAAWD,EAAMC,6BAmBZD,MAACA,EAADC,QAAQA,QAcpBI,EACAC,EAdmB,iBAAZL,IACTA,EAAU,IAAIG,QAAQH,QAetBK,QAAiBO,eAAaC,MAAM,CAClCb,QAAAA,EACAD,MAAAA,EACAH,aAAcK,KAAKN,EACnBD,QAASO,KAAKR,IAEhB,MAAOgB,GACPL,EAAQK,MAeLJ,QACG,IAAIK,eAAa,cAAe,CAACC,IAAKX,EAAQW,IAAKP,MAAAA,WAEpDC,GCjFX,MAAM0C,EAaJ5D,YAAYC,EAAU,YACfC,EAAaC,aAAWC,eAAeH,EAAQI,gBAC/CC,EAAWL,EAAQM,SAAW,GAE/BN,EAAQM,QAAS,KACf8B,EACFpC,EAAQM,QAAQ+B,KAAMC,KAAaA,EAAOL,sBACvC5B,EAAW+B,EACdpC,EAAQM,QAAU,CAAC0B,KAA2BhC,EAAQM,mBAGnDD,EAAW,CAAC2B,QAGdzB,EAAgBP,EAAQQ,cAAgB,UACxCC,EAAgBT,EAAQU,cAAgB,mBAalCC,MAACA,EAADC,QAAQA,WACZC,KAAKC,YAAY,CACtBH,MAAAA,EACAC,QAASA,GAAWD,EAAMC,6BAkBZD,MAACA,EAADC,QAAQA,IAGD,iBAAZA,IACTA,EAAU,IAAIG,QAAQH,UAYlBgD,EAAuB/C,KAAKO,EAAgB,CAACR,QAAAA,EAASD,MAAAA,QASxDK,EAPAC,QAAiBC,eAAaC,MAAM,CACtCf,UAAWS,KAAKZ,EAChBW,QAAAA,EACAD,MAAAA,EACAD,aAAcG,KAAKJ,EACnBH,QAASO,KAAKR,OAGZY,MAMEN,MAEAA,EAAMmB,UAAU8B,GAChB,MAAO5C,cAaTC,QAAiB2C,EACjB,MAAOvC,GACPL,EAAQK,MAcPJ,QACG,IAAIK,eAAa,cAAe,CAACC,IAAKX,EAAQW,IAAKP,MAAAA,WAEpDC,WAWaL,QAACA,EAADD,MAAUA,UACxBM,QAAiBO,eAAaC,MAAM,CACxCb,QAAAA,EACAD,MAAAA,EACAH,aAAcK,KAAKN,EACnBD,QAASO,KAAKR,IAGVuB,EAAkBV,eAAaW,IAAI,CACvCzB,UAAWS,KAAKZ,EAChBW,QAAAA,EACAK,SAAUA,EAASU,QACnBhB,MAAAA,EACAL,QAASO,KAAKR,OAGZM,MAEAA,EAAMmB,UAAUF,GAChB,MAAOZ,WAQJC,GC9LX,MAAM4C,EAAU,CACdC,WAAYhE,EACZiE,UAAWhC,EACXiC,aAAc7B,EACd8B,YAAaP,EACbQ,qBAAsBP,GAGlBQ,EAAaC,UACXC,EAAcR,EAAQO,UAEpBpE,GAOC,IAAIqE,EAAYrE,IAUrB8D,EAAaK,EAAU,cAQvBJ,EAAYI,EAAU,aAQtBH,EAAeG,EAAU,gBAQzBF,EAAcE,EAAU,eAQxBD,EAAuBC,EAAU"}
\ No newline at end of file
diff --git a/public/javascripts/workbox/workbox-sw.js b/public/javascripts/workbox/workbox-sw.js
deleted file mode 100644
index 61b3289a81a..00000000000
--- a/public/javascripts/workbox/workbox-sw.js
+++ /dev/null
@@ -1,2 +0,0 @@
-!function(){"use strict";try{self["workbox:sw:4.3.1"]&&_()}catch(t){}const t="https://storage.googleapis.com/workbox-cdn/releases/4.3.1",e={backgroundSync:"background-sync",broadcastUpdate:"broadcast-update",cacheableResponse:"cacheable-response",core:"core",expiration:"expiration",googleAnalytics:"offline-ga",navigationPreload:"navigation-preload",precaching:"precaching",rangeRequests:"range-requests",routing:"routing",strategies:"strategies",streams:"streams"};self.workbox=new class{constructor(){return this.v={},this.t={debug:"localhost"===self.location.hostname,modulePathPrefix:null,modulePathCb:null},this.s=this.t.debug?"dev":"prod",this.o=!1,new Proxy(this,{get(t,s){if(t[s])return t[s];const o=e[s];return o&&t.loadModule(`workbox-${o}`),t[s]}})}setConfig(t={}){if(this.o)throw new Error("Config must be set before accessing workbox.* modules");Object.assign(this.t,t),this.s=this.t.debug?"dev":"prod"}loadModule(t){const e=this.i(t);try{importScripts(e),this.o=!0}catch(s){throw console.error(`Unable to import module '${t}' from '${e}'.`),s}}i(e){if(this.t.modulePathCb)return this.t.modulePathCb(e,this.t.debug);let s=[t];const o=`${e}.${this.s}.js`,r=this.t.modulePathPrefix;return r&&""===(s=r.split("/"))[s.length-1]&&s.splice(s.length-1,1),s.push(o),s.join("/")}}}();
-//# sourceMappingURL=workbox-sw.js.map
diff --git a/public/javascripts/workbox/workbox-sw.js.map b/public/javascripts/workbox/workbox-sw.js.map
deleted file mode 100644
index efb3c3655ed..00000000000
--- a/public/javascripts/workbox/workbox-sw.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"workbox-sw.js","sources":["../_version.mjs","../controllers/WorkboxSW.mjs","../index.mjs"],"sourcesContent":["try{self['workbox:sw:4.3.1']&&_()}catch(e){}// eslint-disable-line","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport '../_version.mjs';\n\nconst CDN_PATH = `WORKBOX_CDN_ROOT_URL`;\n\nconst MODULE_KEY_TO_NAME_MAPPING = {\n  // TODO(philipwalton): add jsdoc tags to associate these with their module.\n  // @name backgroundSync\n  // @memberof workbox\n  // @see module:workbox-background-sync\n  backgroundSync: 'background-sync',\n  broadcastUpdate: 'broadcast-update',\n  cacheableResponse: 'cacheable-response',\n  core: 'core',\n  expiration: 'expiration',\n  googleAnalytics: 'offline-ga',\n  navigationPreload: 'navigation-preload',\n  precaching: 'precaching',\n  rangeRequests: 'range-requests',\n  routing: 'routing',\n  strategies: 'strategies',\n  streams: 'streams',\n};\n\n/**\n * This class can be used to make it easy to use the various parts of\n * Workbox.\n *\n * @private\n */\nexport class WorkboxSW {\n  /**\n   * Creates a proxy that automatically loads workbox namespaces on demand.\n   *\n   * @private\n   */\n  constructor() {\n    this.v = {};\n    this._options = {\n      debug: self.location.hostname === 'localhost',\n      modulePathPrefix: null,\n      modulePathCb: null,\n    };\n\n    this._env = this._options.debug ? 'dev' : 'prod';\n    this._modulesLoaded = false;\n\n    return new Proxy(this, {\n      get(target, key) {\n        if (target[key]) {\n          return target[key];\n        }\n\n        const moduleName = MODULE_KEY_TO_NAME_MAPPING[key];\n        if (moduleName) {\n          target.loadModule(`workbox-${moduleName}`);\n        }\n\n        return target[key];\n      },\n    });\n  }\n\n  /**\n   * Updates the configuration options. You can specify whether to treat as a\n   * debug build and whether to use a CDN or a specific path when importing\n   * other workbox-modules\n   *\n   * @param {Object} [options]\n   * @param {boolean} [options.debug] If true, `dev` builds are using, otherwise\n   * `prod` builds are used. By default, `prod` is used unless on localhost.\n   * @param {Function} [options.modulePathPrefix] To avoid using the CDN with\n   * `workbox-sw` set the path prefix of where modules should be loaded from.\n   * For example `modulePathPrefix: '/third_party/workbox/v3.0.0/'`.\n   * @param {workbox~ModulePathCallback} [options.modulePathCb] If defined,\n   * this callback will be responsible for determining the path of each\n   * workbox module.\n   *\n   * @alias workbox.setConfig\n   */\n  setConfig(options = {}) {\n    if (!this._modulesLoaded) {\n      Object.assign(this._options, options);\n      this._env = this._options.debug ? 'dev' : 'prod';\n    } else {\n      throw new Error('Config must be set before accessing workbox.* modules');\n    }\n  }\n\n  /**\n   * Load a Workbox module by passing in the appropriate module name.\n   *\n   * This is not generally needed unless you know there are modules that are\n   * dynamically used and you want to safe guard use of the module while the\n   * user may be offline.\n   *\n   * @param {string} moduleName\n   *\n   * @alias workbox.loadModule\n   */\n  loadModule(moduleName) {\n    const modulePath = this._getImportPath(moduleName);\n    try {\n      importScripts(modulePath);\n      this._modulesLoaded = true;\n    } catch (err) {\n      // TODO Add context of this error if using the CDN vs the local file.\n\n      // We can't rely on workbox-core being loaded so using console\n      // eslint-disable-next-line\n      console.error(\n          `Unable to import module '${moduleName}' from '${modulePath}'.`);\n      throw err;\n    }\n  }\n\n  /**\n   * This method will get the path / CDN URL to be used for importScript calls.\n   *\n   * @param {string} moduleName\n   * @return {string} URL to the desired module.\n   *\n   * @private\n   */\n  _getImportPath(moduleName) {\n    if (this._options.modulePathCb) {\n      return this._options.modulePathCb(moduleName, this._options.debug);\n    }\n\n    // TODO: This needs to be dynamic some how.\n    let pathParts = [CDN_PATH];\n\n    const fileName = `${moduleName}.${this._env}.js`;\n\n    const pathPrefix = this._options.modulePathPrefix;\n    if (pathPrefix) {\n      // Split to avoid issues with developers ending / not ending with slash\n      pathParts = pathPrefix.split('/');\n\n      // We don't need a slash at the end as we will be adding\n      // a filename regardless\n      if (pathParts[pathParts.length - 1] === '') {\n        pathParts.splice(pathParts.length - 1, 1);\n      }\n    }\n\n    pathParts.push(fileName);\n\n    return pathParts.join('/');\n  }\n}\n","/*\n  Copyright 2018 Google LLC\n\n  Use of this source code is governed by an MIT-style\n  license that can be found in the LICENSE file or at\n  https://opensource.org/licenses/MIT.\n*/\n\nimport {WorkboxSW} from './controllers/WorkboxSW.mjs';\nimport './_version.mjs';\n\n/**\n * @namespace workbox\n */\n\n// Don't export anything, just expose a global.\nself.workbox = new WorkboxSW();\n"],"names":["self","_","e","CDN_PATH","MODULE_KEY_TO_NAME_MAPPING","backgroundSync","broadcastUpdate","cacheableResponse","core","expiration","googleAnalytics","navigationPreload","precaching","rangeRequests","routing","strategies","streams","workbox","constructor","v","_options","debug","location","hostname","modulePathPrefix","modulePathCb","_env","this","_modulesLoaded","Proxy","get","target","key","moduleName","loadModule","setConfig","options","Error","Object","assign","modulePath","_getImportPath","importScripts","err","console","error","pathParts","fileName","pathPrefix","split","length","splice","push","join"],"mappings":"yBAAA,IAAIA,KAAK,qBAAqBC,IAAI,MAAMC,ICUxC,MAAMC,EAAY,4DAEZC,EAA6B,CAKjCC,eAAgB,kBAChBC,gBAAiB,mBACjBC,kBAAmB,qBACnBC,KAAM,OACNC,WAAY,aACZC,gBAAiB,aACjBC,kBAAmB,qBACnBC,WAAY,aACZC,cAAe,iBACfC,QAAS,UACTC,WAAY,aACZC,QAAS,WCZXhB,KAAKiB,QAAU,IDqBR,MAMLC,0BACOC,EAAI,QACJC,EAAW,CACdC,MAAkC,cAA3BrB,KAAKsB,SAASC,SACrBC,iBAAkB,KAClBC,aAAc,WAGXC,EAAOC,KAAKP,EAASC,MAAQ,MAAQ,YACrCO,GAAiB,EAEf,IAAIC,MAAMF,KAAM,CACrBG,IAAIC,EAAQC,MACND,EAAOC,UACFD,EAAOC,SAGVC,EAAa7B,EAA2B4B,UAC1CC,GACFF,EAAOG,sBAAsBD,KAGxBF,EAAOC,MAsBpBG,UAAUC,EAAU,OACbT,KAAKC,QAIF,IAAIS,MAAM,yDAHhBC,OAAOC,OAAOZ,KAAKP,EAAUgB,QACxBV,EAAOC,KAAKP,EAASC,MAAQ,MAAQ,OAiB9Ca,WAAWD,SACHO,EAAab,KAAKc,EAAeR,OAErCS,cAAcF,QACTZ,GAAiB,EACtB,MAAOe,SAKPC,QAAQC,kCACwBZ,YAAqBO,OAC/CG,GAYVF,EAAeR,MACTN,KAAKP,EAASK,oBACTE,KAAKP,EAASK,aAAaQ,EAAYN,KAAKP,EAASC,WAI1DyB,EAAY,CAAC3C,SAEX4C,KAAcd,KAAcN,KAAKD,OAEjCsB,EAAarB,KAAKP,EAASI,wBAC7BwB,GAMsC,MAJxCF,EAAYE,EAAWC,MAAM,MAIfH,EAAUI,OAAS,IAC/BJ,EAAUK,OAAOL,EAAUI,OAAS,EAAG,GAI3CJ,EAAUM,KAAKL,GAERD,EAAUO,KAAK"}
\ No newline at end of file
diff --git a/script/bench.rb b/script/bench.rb
index 6e10dcd1125..ba0c5abcd14 100644
--- a/script/bench.rb
+++ b/script/bench.rb
@@ -135,7 +135,6 @@ discourse_env_vars = %w[
   RUBY_GC_MALLOC_LIMIT_GROWTH_FACTOR
   RUBY_GC_OLDMALLOC_LIMIT_GROWTH_FACTOR
   RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR
-  RUBY_GLOBAL_METHOD_CACHE_SIZE
   LD_PRELOAD
 ]
 
@@ -143,7 +142,6 @@ if @include_env
   puts "Running with tuned environment"
   discourse_env_vars.each { |v| ENV.delete v }
 
-  ENV["RUBY_GLOBAL_METHOD_CACHE_SIZE"] = "131072"
   ENV["RUBY_GC_HEAP_GROWTH_MAX_SLOTS"] = "40000"
   ENV["RUBY_GC_HEAP_INIT_SLOTS"] = "400000"
   ENV["RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR"] = "1.5"
diff --git a/script/cache_critical_dns b/script/cache_critical_dns
index 929770b4a47..803b0216e6f 100755
--- a/script/cache_critical_dns
+++ b/script/cache_critical_dns
@@ -15,6 +15,18 @@ require 'optparse'
 # service in the process environment. Any hosts that fail the healthcheck will
 # never be cached.
 #
+# The list of environment variables that cache_critical_dns will read for
+# critical service hostnames can be extended at process execution time by
+# specifying environment variable names within the
+# DISCOURSE_DNS_CACHE_ADDITIONAL_SERVICE_NAMES environment variable. This is a
+# comma-delimited string of extra environment variables to be added to the list
+# defined in the static CRITICAL_HOST_ENV_VARS hash.
+#
+# DISCOURSE_DNS_CACHE_ADDITIONAL_SERVICE_NAMES serves as a kind of lookup table
+# for extra services for caching. Any environment variable names within this
+# list are treated with the same rules as the DISCOURSE_DB_HOST (and co.)
+# variables, as described below.
+#
 # This is as far as you need to read if you are using CNAME or A records for
 # your services.
 #
@@ -88,9 +100,14 @@ CRITICAL_HOST_ENV_VARS = %w{
   DISCOURSE_REDIS_REPLICA_HOST
   DISCOURSE_MESSAGE_BUS_REDIS_HOST
   DISCOURSE_MESSAGE_BUS_REDIS_REPLICA_HOST
-}
+}.union(
+  ENV.fetch('DISCOURSE_DNS_CACHE_ADDITIONAL_SERVICE_NAMES', '')
+    .split(',')
+    .map(&:strip)
+)
 
 DEFAULT_DB_NAME = "discourse"
+DEFAULT_DB_PORT = 5432
 DEFAULT_REDIS_PORT = 6379
 
 HOST_RESOLVER_CACHE = {}
@@ -161,6 +178,8 @@ end
 
 CacheMeta = Struct.new(:first_seen, :last_seen)
 
+class EmptyCacheError < StandardError; end
+
 class ResolverCache
   def initialize(name)
     # instance of Name|SRVName
@@ -170,22 +189,29 @@ class ResolverCache
     @cached = {}
   end
 
-  # resolve returns a list of resolved addresses ordered by the time first seen,
-  # most recently seen at the head of the list.
-  # Addresses last seen more than 30 minutes ago are evicted from the cache on
-  # a call to resolve().
-  # If an exception occurs during DNS resolution we return whatever addresses are
-  # cached.
+  # Returns a list of resolved addresses ordered by first seen time.  Most
+  # recently seen address is first.
+  # If an exception occurs during DNS resolution we return whatever addresses
+  # are cached.
+  # Addresses last seen more than 30 minutes ago are evicted from the cache.
+  # Raises EmptyCacheError if the cache is empty after DNS resolution and cache
+  # eviction is performed.
   def resolve
-    @name.resolve.each do |address|
-      if @cached[address]
-        @cached[address].last_seen = Time.now.utc
-      else
-        @cached[address] = CacheMeta.new(Time.now.utc, Time.now.utc)
+    begin
+      @name.resolve.each do |address|
+        if @cached[address]
+          @cached[address].last_seen = Time.now.utc
+        else
+          @cached[address] = CacheMeta.new(Time.now.utc, Time.now.utc)
+        end
       end
+    rescue Resolv::ResolvError, Resolv::ResolvTimeout
     end
-  ensure
+
     @cached = @cached.delete_if { |_, meta| Time.now.utc - 30 * 60 > meta.last_seen }
+    if @cached.empty?
+      raise EmptyCacheError, "DNS resolver found no usable addresses"
+    end
     @cached.sort_by { |_, meta| meta.first_seen }.reverse.map(&:first)
   end
 end
@@ -197,11 +223,25 @@ class HealthyCache
     @cached = nil  # a single IP address that was most recently found to be healthy
   end
 
+  # Returns the first healthy server found in the list of resolved addresses.
+  # Returns the last known healthy server if all servers disappear from the
+  # DNS.
+  # Raises EmptyCacheError if no healthy servers have been cached.
   def first_healthy
-    address = @resolver_cache.resolve.lazy.select { |addr| @check.call(addr) }.first
-    if !nilempty(address).nil?
+    begin
+      addresses = @resolver_cache.resolve
+    rescue EmptyCacheError
+      return @cached if @cached
+      raise
+    end
+
+    if (address = addresses.lazy.select { |addr| @check.call(addr) }.first)
       @cached = address
     end
+    if @cached.nil?
+      raise EmptyCacheError, "no healthy servers found amongst #{addresses}"
+    end
+
     @cached
   end
 end
@@ -228,12 +268,13 @@ ensure
   client.close if client
 end
 
-def postgres_healthcheck(host:, user:, password:, dbname:)
+def postgres_healthcheck(host:, user:, password:, dbname:, port: DEFAULT_DB_PORT)
   client = PG::Connection.new(
     host: host,
     user: user,
     password: password,
     dbname: dbname,
+    port: port,
     connect_timeout: 2,  # minimum
   )
   client.exec(';').none?
@@ -243,18 +284,23 @@ ensure
   client.close if client
 end
 
-HEALTH_CHECKS = {
+HEALTH_CHECKS = Hash.new(
+  # unknown keys (like services defined at runtime) are assumed to be healthy
+  lambda { |addr| true }
+).merge!({
   "DISCOURSE_DB_HOST": lambda { |addr|
     postgres_healthcheck(
       host: addr,
       user: ENV["DISCOURSE_DB_USERNAME"] || DEFAULT_DB_NAME,
       dbname: ENV["DISCOURSE_DB_NAME"] || DEFAULT_DB_NAME,
+      port: ENV["DISCOURSE_DB_PORT"] || DEFAULT_DB_PORT,
       password: ENV["DISCOURSE_DB_PASSWORD"])},
   "DISCOURSE_DB_REPLICA_HOST": lambda { |addr|
     postgres_healthcheck(
       host: addr,
       user: ENV["DISCOURSE_DB_USERNAME"] || DEFAULT_DB_NAME,
       dbname: ENV["DISCOURSE_DB_NAME"] || DEFAULT_DB_NAME,
+      port: ENV["DISCOURSE_DB_REPLICA_PORT"] || DEFAULT_DB_PORT,
       password: ENV["DISCOURSE_DB_PASSWORD"])},
   "DISCOURSE_REDIS_HOST": lambda { |addr|
     redis_healthcheck(
@@ -274,7 +320,7 @@ HEALTH_CHECKS = {
       host: addr,
       port: env_as_int("DISCOURSE_MESSAGE_BUS_REDIS_REPLICA_PORT", DEFAULT_REDIS_PORT),
       password: ENV["DISCOURSE_MESSAGE_BUS_REDIS_PASSWORD"])},
-}
+})
 
 def log(msg)
   STDERR.puts "#{Time.now.utc.iso8601}: #{msg}"
@@ -394,8 +440,6 @@ def run_and_report(hostname_vars)
 end
 
 def run(hostname_vars)
-  # HOSTNAME: [IP_ADDRESS, ...]
-  # this will usually be a single address
   resolved = {}
   errors = Hash.new(0)
 
@@ -412,13 +456,9 @@ def run(hostname_vars)
     HOST_HEALTHY_CACHE[var] ||= HealthyCache.new(HOST_RESOLVER_CACHE[var], HEALTH_CHECKS[var.to_sym])
 
     begin
-      if (address = HOST_HEALTHY_CACHE[var].first_healthy)
-        resolved[name] = [address]
-      else
-        error("#{var}: #{name}: no address")
-        errors[name] += 1
-      end
-    rescue => e
+      address = HOST_HEALTHY_CACHE[var].first_healthy
+      resolved[name] = [address]
+    rescue EmptyCacheError => e
       error("#{var}: #{name}: #{e}")
       errors[name] += 1
     end
@@ -439,9 +479,8 @@ def run(hostname_vars)
   if changed
     File.write(HOSTS_PATH, hosts_content)
   end
-
 rescue => e
-  error("DNS lookup failed: #{e}")
+  error("unhandled exception during run: #{e}")
   errors[nil] = 1
 ensure
   return errors
diff --git a/script/db_timestamps_mover.rb b/script/db_timestamps_mover.rb
index 248f1893871..fc92d54b19b 100644
--- a/script/db_timestamps_mover.rb
+++ b/script/db_timestamps_mover.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require "pg"
+require "date"
 
 usage = <<-TEXT
 Commands:
diff --git a/script/docker_test.rb b/script/docker_test.rb
index d51b63b5c57..1c50dd7cf55 100644
--- a/script/docker_test.rb
+++ b/script/docker_test.rb
@@ -23,7 +23,7 @@ unless ENV["NO_UPDATE"]
   run_or_fail("git reset --hard")
   run_or_fail("git fetch")
 
-  checkout = ENV["COMMIT_HASH"] || "FETCH_HEAD"
+  checkout = ENV["COMMIT_HASH"] || "origin/tests-passed"
   run_or_fail("LEFTHOOK=0 git checkout #{checkout}")
 
   run_or_fail("bundle")
diff --git a/script/i18n_lint.rb b/script/i18n_lint.rb
index f3f96abf87d..794b07b34ae 100755
--- a/script/i18n_lint.rb
+++ b/script/i18n_lint.rb
@@ -37,8 +37,6 @@ class LocaleFileValidator
       "Pluralized strings must have only the sub-keys 'one' and 'other'.\nThe following keys have missing or additional keys:",
     invalid_one_keys:
       "The following keys contain the number 1 instead of the interpolation key %{count}:",
-    invalid_message_format_one_key:
-      "The following keys use 'one {1 foo}' instead of the generic 'one {# foo}':",
   }
 
   PLURALIZATION_KEYS = %w[zero one two few many other]
@@ -88,7 +86,6 @@ class LocaleFileValidator
     @errors[:invalid_relative_links] = []
     @errors[:invalid_relative_image_sources] = []
     @errors[:invalid_interpolation_key_format] = []
-    @errors[:invalid_message_format_one_key] = []
 
     each_translation(yaml) do |key, value|
       @errors[:invalid_relative_links] << key if value.match?(%r{href\s*=\s*["']/[^/]|\]\(/[^/]}i)
@@ -98,10 +95,6 @@ class LocaleFileValidator
       if value.match?(/{{.+?}}/) && !key.end_with?("_MF")
         @errors[:invalid_interpolation_key_format] << key
       end
-
-      if key.end_with?("_MF") && value.match?(/one {.*?1.*?}/)
-        @errors[:invalid_message_format_one_key] << key
-      end
     end
   end
 
diff --git a/script/import_scripts/base.rb b/script/import_scripts/base.rb
index 7dbca7d3532..a3df09e2f90 100644
--- a/script/import_scripts/base.rb
+++ b/script/import_scripts/base.rb
@@ -116,7 +116,7 @@ class ImportScripts::Base
   def reset_site_settings
     @old_site_settings.each do |key, value|
       current_value = SiteSetting.get(key)
-      SiteSetting.set(key, value) unless current_value != @site_settings_during_import[key]
+      SiteSetting.set(key, value) if current_value == @site_settings_during_import[key]
     end
 
     RateLimiter.enable
diff --git a/script/import_scripts/base/generic_database.rb b/script/import_scripts/base/generic_database.rb
index dafea94199e..2a6f2e2e841 100644
--- a/script/import_scripts/base/generic_database.rb
+++ b/script/import_scripts/base/generic_database.rb
@@ -4,7 +4,7 @@ require "sqlite3"
 
 module ImportScripts
   class GenericDatabase
-    def initialize(directory, batch_size:, recreate: false, numeric_keys: false)
+    def initialize(directory, batch_size: 1000, recreate: false, numeric_keys: false)
       filename = "#{directory}/index.db"
       File.delete(filename) if recreate && File.exist?(filename)
 
@@ -14,10 +14,13 @@ module ImportScripts
 
       configure_database
       create_category_table
+      create_upload_table
       create_like_table
       create_user_table
       create_topic_table
       create_post_table
+      create_pm_topic_table
+      create_pm_post_table
     end
 
     def insert_category(category)
@@ -27,11 +30,20 @@ module ImportScripts
       SQL
     end
 
+    def insert_upload(upload)
+      @db.execute(<<-SQL, prepare(upload))
+        INSERT OR REPLACE INTO upload (id, user_id, original_filename,
+        filename, description, url)
+        VALUES (:id, :user_id, :original_filename,
+        :filename, :description, :url)
+      SQL
+    end
+
     def insert_user(user)
       @db.execute(<<-SQL, prepare(user))
         INSERT OR REPLACE
-        INTO user (id, email, username, name, bio, avatar_path, created_at, last_seen_at, active)
-        VALUES (:id, :email, :username, :name, :bio, :avatar_path, :created_at, :last_seen_at, :active)
+        INTO user (id, email, username, name, bio, avatar_path, created_at, last_seen_at, active, staged, admin)
+        VALUES (:id, :email, :username, :name, :bio, :avatar_path, :created_at, :last_seen_at, :active, :staged, :admin)
       SQL
     end
 
@@ -49,8 +61,8 @@ module ImportScripts
 
       @db.transaction do
         @db.execute(<<-SQL, prepare(topic))
-          INSERT OR REPLACE INTO topic (id, title, raw, category_id, closed, user_id, created_at, url, upload_count)
-          VALUES (:id, :title, :raw, :category_id, :closed, :user_id, :created_at, :url, :upload_count)
+          INSERT OR REPLACE INTO topic (id, title, raw, category_id, closed, user_id, created_at, url, upload_count, tags)
+          VALUES (:id, :title, :raw, :category_id, :closed, :user_id, :created_at, :url, :upload_count, :tags)
         SQL
 
         attachments&.each do |attachment|
@@ -69,6 +81,16 @@ module ImportScripts
       end
     end
 
+    def insert_pm_topic(topic)
+      attachments = topic.delete(:attachments)
+      topic[:upload_count] = attachments&.size || 0
+
+      @db.execute(<<-SQL, prepare(topic))
+        INSERT OR REPLACE INTO pm_topic (id, title, raw, category_id, closed, user_id, created_at, url, upload_count, target_users)
+        VALUES (:id, :title, :raw, :category_id, :closed, :user_id, :created_at, :url, :upload_count, :target_users)
+      SQL
+    end
+
     def insert_post(post)
       like_user_ids = post.delete(:like_user_ids)
       attachments = post.delete(:attachments)
@@ -92,6 +114,16 @@ module ImportScripts
       end
     end
 
+    def insert_pm_post(post)
+      attachments = post.delete(:attachments)
+      post[:upload_count] = attachments&.size || 0
+
+      @db.execute(<<-SQL, prepare(post))
+        INSERT OR REPLACE INTO pm_post (id, raw, topic_id, user_id, created_at, reply_to_post_id, url, upload_count)
+        VALUES (:id, :raw, :topic_id, :user_id, :created_at, :reply_to_post_id, :url, :upload_count)
+      SQL
+    end
+
     def sort_posts_by_created_at
       @db.execute "DELETE FROM post_order"
 
@@ -118,6 +150,28 @@ module ImportScripts
       SQL
     end
 
+    def calculate_user_last_seen_at_dates
+      @db.execute <<~SQL
+        UPDATE user
+        SET last_seen_at = (
+          SELECT MAX(created_at)
+          FROM post
+          WHERE post.user_id = user.id
+        )
+      SQL
+    end
+
+    def calculate_user_created_at_dates
+      @db.execute <<~SQL
+        UPDATE user
+        SET created_at = (
+          SELECT MIN(created_at)
+          FROM post
+          WHERE post.user_id = user.id
+        )
+      SQL
+    end
+
     def fetch_categories
       @db.execute(<<-SQL)
         SELECT *
@@ -160,6 +214,13 @@ module ImportScripts
       SQL
     end
 
+    def count_pm_topics
+      @db.get_first_value(<<-SQL)
+        SELECT COUNT(*)
+        FROM pm_topic
+      SQL
+    end
+
     def fetch_topics(last_id)
       rows = @db.execute(<<-SQL, last_id)
         SELECT *
@@ -172,6 +233,18 @@ module ImportScripts
       add_last_column_value(rows, "id")
     end
 
+    def fetch_pm_topics(last_id)
+      rows = @db.execute(<<-SQL, last_id)
+        SELECT *
+        FROM pm_topic
+        WHERE id > :last_id
+        ORDER BY id
+        LIMIT #{@batch_size}
+      SQL
+
+      add_last_column_value(rows, "id")
+    end
+
     def fetch_topic_attachments(topic_id)
       @db.execute(<<-SQL, topic_id)
         SELECT path
@@ -187,6 +260,21 @@ module ImportScripts
       SQL
     end
 
+    def count_pm_posts
+      @db.get_first_value(<<-SQL)
+        SELECT COUNT(*)
+        FROM pm_post
+      SQL
+    end
+
+    def fetch_upload(id)
+      @db.execute(<<-SQL, id)
+        SELECT *
+        FROM upload
+        WHERE id = :id
+      SQL
+    end
+
     def fetch_posts(last_row_id)
       rows = @db.execute(<<-SQL, last_row_id)
         SELECT ROWID AS rowid, *
@@ -199,6 +287,18 @@ module ImportScripts
       add_last_column_value(rows, "rowid")
     end
 
+    def fetch_pm_posts(last_row_id)
+      rows = @db.execute(<<-SQL, last_row_id)
+        SELECT ROWID AS rowid, *
+        FROM pm_post
+        WHERE ROWID > :last_row_id
+        ORDER BY ROWID
+        LIMIT #{@batch_size}
+      SQL
+
+      add_last_column_value(rows, "rowid")
+    end
+
     def fetch_sorted_posts(last_row_id)
       rows = @db.execute(<<-SQL, last_row_id)
         SELECT o.ROWID AS rowid, p.*
@@ -247,6 +347,48 @@ module ImportScripts
       @db.get_first_value(sql)
     end
 
+    def create_missing_topics
+      posts = @db.execute(<<~SQL)
+          WITH missing_topics AS (SELECT *, RANK() OVER ( PARTITION BY topic_id ORDER BY created_at ) AS post_number
+                                    FROM post p
+                                   WHERE NOT EXISTS (SELECT 1 FROM topic t WHERE t.id = p.topic_id))
+        SELECT *
+          FROM missing_topics
+         WHERE post_number = 1
+      SQL
+
+      posts.each do |post|
+        @db.execute("DELETE FROM post WHERE id = ?", post["id"])
+
+        topic = post.except("post_number", "reply_to_post_id")
+        topic["id"] = topic.delete("topic_id")
+        topic = yield(topic)
+
+        @db.execute(<<-SQL, prepare(topic))
+          INSERT OR REPLACE INTO topic (id, title, raw, category_id, closed, user_id, created_at, url, upload_count, tags)
+          VALUES (:id, :title, :raw, :category_id, :closed, :user_id, :created_at, :url, :upload_count, :tags)
+        SQL
+
+        @db.execute("DELETE FROM post WHERE id = ?", post["id"])
+
+        @db.execute(<<-SQL, topic_id: topic["id"], post_id: post["id"])
+          INSERT OR REPLACE INTO topic_upload (topic_id, path)
+          SELECT :topic_id, path
+          FROM post_upload
+          WHERE post_id = :post_id
+        SQL
+
+        @db.execute("DELETE FROM post_upload WHERE post_id = ?", post["id"])
+
+        @db.execute(<<-SQL, topic_id: topic["id"], post_id: post["id"])
+          UPDATE like
+          SET topic_id = :topic_id,
+              post_id = NULL
+          WHERE post_id = :post_id
+        SQL
+      end
+    end
+
     private
 
     def configure_database
@@ -270,6 +412,19 @@ module ImportScripts
       SQL
     end
 
+    def create_upload_table
+      @db.execute <<-SQL
+        CREATE TABLE IF NOT EXISTS upload (
+          id #{key_data_type} NOT NULL PRIMARY KEY,
+          user_id INTEGER,
+          original_filename TEXT,
+          filename TEXT,
+          description TEXT,
+          url TEXT
+        )
+      SQL
+    end
+
     def create_like_table
       @db.execute <<-SQL
         CREATE TABLE IF NOT EXISTS like (
@@ -291,7 +446,9 @@ module ImportScripts
           avatar_path TEXT,
           created_at DATETIME,
           last_seen_at DATETIME,
-          active BOOLEAN NOT NULL DEFAULT true
+          active BOOLEAN NOT NULL DEFAULT true,
+          staged BOOLEAN NOT NULL DEFAULT false,
+          admin BOOLEAN NOT NULL DEFAULT false
         )
       SQL
 
@@ -309,7 +466,8 @@ module ImportScripts
           user_id #{key_data_type} NOT NULL,
           created_at DATETIME,
           url TEXT,
-          upload_count INTEGER DEFAULT 0
+          upload_count INTEGER DEFAULT 0,
+          tags JSON
         )
       SQL
 
@@ -325,6 +483,23 @@ module ImportScripts
       @db.execute "CREATE UNIQUE INDEX IF NOT EXISTS topic_upload_unique ON topic_upload(topic_id, path)"
     end
 
+    def create_pm_topic_table
+      @db.execute <<-SQL
+        CREATE TABLE IF NOT EXISTS pm_topic (
+          id #{key_data_type} NOT NULL PRIMARY KEY,
+          title TEXT,
+          raw TEXT,
+          category_id #{key_data_type},
+          closed BOOLEAN NOT NULL DEFAULT false,
+          user_id #{key_data_type} NOT NULL,
+          target_users TEXT,
+          created_at DATETIME,
+          url TEXT,
+          upload_count INTEGER DEFAULT 0
+        )
+      SQL
+    end
+
     def create_post_table
       @db.execute <<-SQL
         CREATE TABLE IF NOT EXISTS post (
@@ -357,12 +532,29 @@ module ImportScripts
       @db.execute "CREATE UNIQUE INDEX IF NOT EXISTS post_upload_unique ON post_upload(post_id, path)"
     end
 
+    def create_pm_post_table
+      @db.execute <<-SQL
+        CREATE TABLE IF NOT EXISTS pm_post (
+          id #{key_data_type} NOT NULL PRIMARY KEY,
+          raw TEXT,
+          topic_id #{key_data_type} NOT NULL,
+          user_id #{key_data_type} NOT NULL,
+          created_at DATETIME,
+          reply_to_post_id #{key_data_type},
+          url TEXT,
+          upload_count INTEGER DEFAULT 0
+        )
+      SQL
+    end
+
     def prepare(hash)
       hash.each do |key, value|
         if value.is_a?(TrueClass) || value.is_a?(FalseClass)
           hash[key] = value ? 1 : 0
         elsif value.is_a?(Date)
           hash[key] = value.to_s
+        elsif value.is_a?(Time)
+          hash[key] = value.utc.iso8601
         end
       end
     end
diff --git a/script/import_scripts/base/lookup_container.rb b/script/import_scripts/base/lookup_container.rb
index 4147daf43f4..ab0fb3c6123 100644
--- a/script/import_scripts/base/lookup_container.rb
+++ b/script/import_scripts/base/lookup_container.rb
@@ -58,7 +58,7 @@ module ImportScripts
 
     def find_username_by_import_id(import_id)
       user_id = user_id_from_imported_user_id(import_id)
-      User.where(id: user_id).pluck_first(:username) if user_id.present?
+      User.where(id: user_id).pick(:username) if user_id.present?
     end
 
     # Get the Discourse Category id based on the id of the source category
diff --git a/script/import_scripts/bespoke_1.rb b/script/import_scripts/bespoke_1.rb
index 833f7723500..dd4290fbcbc 100644
--- a/script/import_scripts/bespoke_1.rb
+++ b/script/import_scripts/bespoke_1.rb
@@ -160,6 +160,8 @@ class ImportScripts::Bespoke < ImportScripts::Base
   end
 
   def normalize_raw!(raw)
+    return "<missing>" if raw.blank?
+
     # purple and #1223f3
     raw.gsub!(/\[color=[#a-z0-9]+\]/i, "")
     raw.gsub!(%r{\[/color\]}i, "")
@@ -178,11 +180,7 @@ class ImportScripts::Bespoke < ImportScripts::Base
 
       topic = topics[post[:topic_id]]
 
-      unless topic[:post_id]
-        mapped[:category] = category_id_from_imported_category_id(topic[:category_id])
-        mapped[:title] = post[:title]
-        topic[:post_id] = post[:id]
-      else
+      if topic[:post_id]
         parent = topic_lookup_from_imported_post_id(topic[:post_id])
         next unless parent
 
@@ -195,6 +193,10 @@ class ImportScripts::Bespoke < ImportScripts::Base
             mapped[:reply_to_post_number] = reply_to_post_number
           end
         end
+      else
+        mapped[:category] = category_id_from_imported_category_id(topic[:category_id])
+        mapped[:title] = post[:title]
+        topic[:post_id] = post[:id]
       end
 
       next if topic[:deleted] || post[:deleted]
diff --git a/script/import_scripts/discuz_x.rb b/script/import_scripts/discuz_x.rb
index df6a28c2af1..17a6698adaa 100644
--- a/script/import_scripts/discuz_x.rb
+++ b/script/import_scripts/discuz_x.rb
@@ -429,7 +429,6 @@ class ImportScripts::DiscuzX < ImportScripts::Base
               FROM #{posts_table} p
               JOIN #{posts_table} p2 ON p2.first AND p2.tid = p.tid
               JOIN #{topics_table} t ON t.tid = p.tid
-              where t.tid < 10000
              ORDER BY id ASC, topic_id ASC
              LIMIT #{BATCH_SIZE}
             OFFSET #{offset};
@@ -887,7 +886,7 @@ class ImportScripts::DiscuzX < ImportScripts::Base
                               LIMIT 1",
         )
 
-      return discuzx_link unless results.size > 0
+      return discuzx_link if results.size.zero?
 
       linked_post_id = results.first["pid"]
       lookup = topic_lookup_from_imported_post_id(linked_post_id)
diff --git a/script/import_scripts/disqus.rb b/script/import_scripts/disqus.rb
index 1b6f4185a5f..f865420bfdd 100644
--- a/script/import_scripts/disqus.rb
+++ b/script/import_scripts/disqus.rb
@@ -64,7 +64,7 @@ class ImportScripts::Disqus < ImportScripts::Base
 
       topic_user = find_existing_user(t[:author_email], t[:author_username])
       begin
-        post = TopicEmbed.import_remote(topic_user, t[:link], title: title)
+        post = TopicEmbed.import_remote(t[:link], title: title, user: topic_user)
         post.topic.update_column(:category_id, @category.id)
       rescue OpenURI::HTTPError
         post = nil
diff --git a/script/import_scripts/drupal.rb b/script/import_scripts/drupal.rb
index ac01a2daa40..15bc3d8b008 100644
--- a/script/import_scripts/drupal.rb
+++ b/script/import_scripts/drupal.rb
@@ -223,6 +223,7 @@ class ImportScripts::Drupal < ImportScripts::Base
            AND c.status = 1
            AND n.type IN ('blog', 'forum')
            AND n.status = 1
+         ORDER BY c.cid ASC
          LIMIT #{BATCH_SIZE}
         OFFSET #{offset}
       SQL
diff --git a/script/import_scripts/jive.rb b/script/import_scripts/jive.rb
index 9361ba28e33..3d5d2a5d82e 100644
--- a/script/import_scripts/jive.rb
+++ b/script/import_scripts/jive.rb
@@ -196,6 +196,8 @@ class ImportScripts::Jive < ImportScripts::Base
   end
 
   def normalize_raw!(raw)
+    return "<missing>" if raw.blank?
+
     raw = raw.dup
     raw = raw[5..-6]
 
@@ -225,11 +227,7 @@ class ImportScripts::Jive < ImportScripts::Base
         next
       end
 
-      unless topic[:post_id]
-        mapped[:category] = category_id_from_imported_category_id(topic[:category_id])
-        mapped[:title] = post[:title]
-        topic[:post_id] = post[:id]
-      else
+      if topic[:post_id]
         parent = topic_lookup_from_imported_post_id(topic[:post_id])
         next unless parent
 
@@ -242,6 +240,10 @@ class ImportScripts::Jive < ImportScripts::Base
             mapped[:reply_to_post_number] = reply_to_post_number
           end
         end
+      else
+        mapped[:category] = category_id_from_imported_category_id(topic[:category_id])
+        mapped[:title] = post[:title]
+        topic[:post_id] = post[:id]
       end
 
       next if topic[:deleted] || post[:deleted]
diff --git a/script/import_scripts/kunena.rb b/script/import_scripts/kunena.rb
index 5f8ac7256f9..37371f2716e 100644
--- a/script/import_scripts/kunena.rb
+++ b/script/import_scripts/kunena.rb
@@ -95,7 +95,7 @@ class ImportScripts::Kunena < ImportScripts::Base
         cache_rows: false,
       )
     results.each do |u|
-      next unless u["userid"].to_i > 0
+      next if u["userid"].to_i <= 0
       user = @users[u["userid"].to_i]
       if user
         user[:bio] = u["signature"]
diff --git a/script/import_scripts/kunena3.rb b/script/import_scripts/kunena3.rb
index 3744eed575f..e20864da4d5 100644
--- a/script/import_scripts/kunena3.rb
+++ b/script/import_scripts/kunena3.rb
@@ -114,7 +114,7 @@ class ImportScripts::Kunena < ImportScripts::Base
         cache_rows: false,
       )
     results.each do |u|
-      next unless u["userid"].to_i > 0
+      next if u["userid"].to_i <= 0
       user = @users[u["userid"].to_i]
       if user
         user[:bio] = u["signature"]
diff --git a/script/import_scripts/lithium.rb b/script/import_scripts/lithium.rb
index 1e81e084806..35c6785c21c 100644
--- a/script/import_scripts/lithium.rb
+++ b/script/import_scripts/lithium.rb
@@ -803,12 +803,12 @@ class ImportScripts::Lithium < ImportScripts::Base
             import_mode: true,
           }
 
-          unless topic_id
+          if topic_id
+            msg[:topic_id] = topic_id
+          else
             msg[:title] = @htmlentities.decode(topic["subject"]).strip[0...255]
             msg[:archetype] = Archetype.private_message
             msg[:target_usernames] = usernames.join(",")
-          else
-            msg[:topic_id] = topic_id
           end
 
           msg
@@ -994,11 +994,7 @@ SQL
                 end
 
               if l["href"]
-                if permalink && permalink.target_url
-                  l["href"] = permalink.target_url
-                elsif l["href"] =~ %r{^/gartner/attachments/gartner/([^.]*).(\w*)}
-                  linked_upload = "#{$1}.#{$2}"
-                end
+                l["href"] = permalink.target_url if permalink && permalink.target_url
               end
             elsif l["src"]
               # we need an upload here
diff --git a/script/import_scripts/mbox/settings.yml b/script/import_scripts/mbox/settings.yml
index 639ee0fea33..28a77aeb3d9 100644
--- a/script/import_scripts/mbox/settings.yml
+++ b/script/import_scripts/mbox/settings.yml
@@ -55,7 +55,7 @@ remove_subject_prefixes:
 # attempt to get the actual sender's address from other available headers like Reply-To or the /^From / line
 fix_mailman_via_addresses: false
 
-# Elide up to last occurence of = in addresses (BATV, etc)
+# Elide up to last occurrence of = in addresses (BATV, etc)
 # ie. normalize these:
 #     prvs=00377ab9a2=someone@somewhere.com
 #     bounces+840901-dbd9-flang-dev=someone@somewhere.com
diff --git a/script/import_scripts/modx.rb b/script/import_scripts/modx.rb
index a24586279ff..b60467d04c3 100644
--- a/script/import_scripts/modx.rb
+++ b/script/import_scripts/modx.rb
@@ -382,7 +382,9 @@ FROM #{TABLE_PREFIX}discuss_users
           title_username_of_pm_first_post[[title, participants]] ||= m["pmtextid"]
         end
 
-        unless topic_id
+        if topic_id
+          mapped[:topic_id] = topic_id
+        else
           mapped[:title] = title
           mapped[:archetype] = Archetype.private_message
           mapped[:target_usernames] = target_usernames.join(",")
@@ -392,8 +394,6 @@ FROM #{TABLE_PREFIX}discuss_users
             mapped[:target_usernames] = "system"
             puts "pm-#{m["pmtextid"]} has no target (#{m["touserarray"]})"
           end
-        else
-          mapped[:topic_id] = topic_id
         end
 
         skip ? nil : mapped
diff --git a/script/import_scripts/phpbb3/importers/poll_importer.rb b/script/import_scripts/phpbb3/importers/poll_importer.rb
index df4696201c3..5f86247bb4a 100644
--- a/script/import_scripts/phpbb3/importers/poll_importer.rb
+++ b/script/import_scripts/phpbb3/importers/poll_importer.rb
@@ -74,7 +74,8 @@ module ImportScripts::PhpBB3
       arguments << "close=#{poll_data.close_time.iso8601}" if poll_data.close_time
 
       if poll_data.max_options > 1
-        arguments << "type=multiple" << "max=#{[poll_data.max_options, poll_data.options.count].min}"
+        arguments << "type=multiple" <<
+          "max=#{[poll_data.max_options, poll_data.options.count].min}"
       else
         arguments << "type=regular"
       end
diff --git a/script/import_scripts/phpbb3/support/text_processor.rb b/script/import_scripts/phpbb3/support/text_processor.rb
index fb788bf5370..8e7330bfa26 100644
--- a/script/import_scripts/phpbb3/support/text_processor.rb
+++ b/script/import_scripts/phpbb3/support/text_processor.rb
@@ -33,7 +33,11 @@ module ImportScripts::PhpBB3
             username_from_user_id: lambda { |user_id| @lookup.find_username_by_import_id(user_id) },
             smilie_to_emoji: lambda { |smilie| @smiley_processor.emoji(smilie).dup },
             quoted_post_from_post_id:
-              lambda { |post_id| @lookup.topic_lookup_from_imported_post_id(post_id) },
+              lambda do |post_id|
+                post_metadata = @lookup.topic_lookup_from_imported_post_id(post_id)
+                post_metadata[:username] ||= Post.joins(:user).where(id: post_id).pick(:username)
+                post_metadata
+              end,
             upload_md_from_file:
               (
                 lambda do |filename, index|
diff --git a/script/import_scripts/slack.rb b/script/import_scripts/slack.rb
new file mode 100644
index 00000000000..f9559804988
--- /dev/null
+++ b/script/import_scripts/slack.rb
@@ -0,0 +1,299 @@
+# frozen_string_literal: true
+
+require "colored2"
+require_relative "base"
+require_relative "base/generic_database"
+
+# Minimal Slack importer
+# It imports users and messages into Discourse topics/posts
+
+# Call it like this:
+# IMPORT=1 bundle install
+# IMPORT=1 bundle exec ruby script/import_scripts/slack.rb "PATH_TO_SLACK_EXPORT"
+#
+# You will need to create a channels-mapping.json file in order to map Slack channels to Discourse categories and tags.
+# The import script will create a template for you if you don't have one.
+
+class ImportScripts::Slack < ImportScripts::Base
+  TITLE_TIMEZONE = "America/Los_Angeles"
+
+  def initialize(base_path)
+    super()
+    @base_path = base_path
+    @db = ImportScripts::GenericDatabase.new(@base_path, recreate: true)
+  end
+
+  def execute
+    @channel_mapping = load_channel_mapping
+    read_json_files
+
+    import_users
+    import_categories
+    import_topics
+    import_posts
+  end
+
+  private
+
+  def read_json_files
+    puts "", "Reading JSON files..."
+
+    json_from_file("users.json").each do |user|
+      next if user[:deleted]
+
+      @db.insert_user(
+        id: user[:id],
+        email: user[:profile][:email],
+        name: user[:real_name],
+        staged: !user[:is_email_confirmed],
+        admin: user[:is_admin],
+        avatar_path: user[:profile][:image_original],
+      )
+    end
+
+    @channel_mapping.each do |mapping|
+      @db.insert_category(id: mapping[:slack_channel], name: mapping[:discourse_category])
+
+      json_from_directory(mapping[:slack_channel]).each do |message|
+        raise "Unknown type: #{message[:type]}" if message[:type] != "message"
+
+        topic_id = message[:thread_ts] || message[:ts]
+        created_at = Time.at(message[:ts].to_f).in_time_zone(TITLE_TIMEZONE)
+        attachments = message[:files]&.map { |file| file[:url_private_download] }
+
+        if message[:ts] == topic_id
+          @db.insert_topic(
+            id: topic_id,
+            title: "Thread starting at #{created_at.iso8601}",
+            raw: message[:text].presence || "No text",
+            category_id: mapping[:slack_channel],
+            created_at: message[:ts],
+            user_id: message[:user],
+            tags: Oj.dump(mapping[:discourse_tags]),
+            attachments: attachments,
+          )
+        else
+          @db.insert_post(
+            id: message[:client_msg_id],
+            raw: message[:text].presence || "No text",
+            topic_id: topic_id,
+            created_at: message[:ts],
+            user_id: message[:user],
+            attachments: attachments,
+          )
+        end
+      end
+
+      @db.create_missing_topics do |topic|
+        created_at = Time.at(topic["created_at"].to_f).in_time_zone(TITLE_TIMEZONE)
+        topic[:title] = "Thread starting at #{created_at.iso8601}"
+        topic[:category_id] = mapping[:slack_channel]
+        topic[:tags] = Oj.dump(mapping[:discourse_tags])
+        topic
+      end
+    end
+
+    @db.calculate_user_created_at_dates
+    @db.calculate_user_last_seen_at_dates
+    @db.sort_posts_by_created_at
+  end
+
+  def import_categories
+    puts "", "Creating categories..."
+    rows = @db.fetch_categories
+
+    create_categories(rows) { |row| { id: row["id"], name: row["name"] } }
+  end
+
+  def import_users
+    puts "", "Creating users..."
+    total_count = @db.count_users
+    last_id = ""
+
+    batches do |offset|
+      rows, last_id = @db.fetch_users(last_id)
+      break if rows.empty?
+
+      next if all_records_exist?(:users, rows.map { |row| row["id"] })
+
+      create_users(rows, total: total_count, offset: offset) do |row|
+        {
+          id: row["id"],
+          email: row["email"].presence || fake_email,
+          name: row["name"],
+          created_at: row["created_at"],
+          last_seen_at: row["last_seen_at"],
+          active: row["active"] == 1,
+          staged: row["staged"] == 1,
+          admin: row["admin"] == 1,
+          merge: true,
+          post_create_action:
+            proc do |user|
+              if row["avatar_path"].present?
+                begin
+                  UserAvatar.import_url_for_user(row["avatar_path"], user)
+                rescue StandardError
+                  nil
+                end
+              end
+            end,
+        }
+      end
+    end
+  end
+
+  def import_topics
+    puts "", "Creating topics..."
+    total_count = @db.count_topics
+    last_id = ""
+
+    batches do |offset|
+      rows, last_id = @db.fetch_topics(last_id)
+      break if rows.empty?
+
+      next if all_records_exist?(:posts, rows.map { |row| row["id"] })
+
+      create_posts(rows, total: total_count, offset: offset) do |row|
+        user_id = user_id_from_imported_user_id(row["user_id"]) || Discourse.system_user.id
+        attachments = @db.fetch_topic_attachments(row["id"]) if row["upload_count"] > 0
+
+        {
+          id: row["id"],
+          title: row["title"].present? ? row["title"].strip[0...255] : "Topic title missing",
+          raw: to_markdown(row["raw"], attachments, user_id),
+          category: category_id_from_imported_category_id(row["category_id"]),
+          user_id: user_id,
+          created_at: Time.at(row["created_at"].to_f),
+          tags: Oj.load(row["tags"]),
+        }
+      end
+    end
+  end
+
+  def import_posts
+    puts "", "creating posts"
+    total_count = @db.count_posts
+    last_row_id = 0
+
+    batches do |offset|
+      rows, last_row_id = @db.fetch_sorted_posts(last_row_id)
+      break if rows.empty?
+
+      next if all_records_exist?(:posts, rows.map { |row| row["id"] })
+
+      create_posts(rows, total: total_count, offset: offset) do |row|
+        topic = topic_lookup_from_imported_post_id(row["topic_id"])
+        user_id = user_id_from_imported_user_id(row["user_id"]) || Discourse.system_user.id
+        attachments = @db.fetch_post_attachments(row["id"]) if row["upload_count"] > 0
+
+        {
+          id: row["id"],
+          raw: to_markdown(row["raw"], attachments, user_id),
+          user_id: user_id,
+          topic_id: topic[:topic_id],
+          created_at: Time.at(row["created_at"].to_f),
+        }
+      end
+    end
+  end
+
+  def json_from_file(relative_path)
+    absolute_path = File.join(@base_path, relative_path)
+    load_json(absolute_path)
+  end
+
+  def json_from_directory(directory)
+    base_path = File.join(@base_path, directory)
+    raise "Directory #{base_path} does not exist" unless File.directory?(base_path)
+
+    Enumerator.new do |y|
+      # Don't use Dir[] because it allocates an array with the path of every file it finds
+      # which can use a huge amount of memory!
+      IO.popen(["find", base_path, "-name", "*.json"]) do |io|
+        io.each_line do |path|
+          path.chomp!
+          load_json(path).each { |item| y.yield(item) }
+        end
+      end
+    end
+  end
+
+  def load_json(path)
+    raise "File #{path} does not exist" unless File.exist?(path)
+    Oj.load(File.read(path), { mode: :strict, symbol_keys: true })
+  end
+
+  def load_channel_mapping
+    path = File.join(@base_path, "channel-mapping.json")
+
+    if !File.exist?(path)
+      create_channel_mapping_file(path)
+      puts "", "ERROR: channel-mapping.json is missing".red
+      puts "An example file has been created at #{path}".red, "Please edit it and try again.".red
+      exit 1
+    end
+
+    load_json(path)
+  end
+
+  def create_channel_mapping_file(mapping_file_path)
+    mapping =
+      Dir[File.join(@base_path, "/*/")].map do |path|
+        channel = File.basename(path)
+        { slack_channel: channel, discourse_category: channel, discourse_tags: [] }
+      end
+
+    File.write(mapping_file_path, Oj.dump(mapping, indent: 4))
+  end
+
+  def to_markdown(text, attachments, user_id)
+    # Emoji skin tones
+    text.gsub!(/::skin-tone-(\d):/, ':t\1:')
+
+    # Mentions
+    text.gsub!(/<@(\w+)>/) do
+      mentioned_user_id = $1
+      username = @lookup.find_username_by_import_id(mentioned_user_id)
+      username ? "@#{username}" : "`@#{mentioned_user_id}`"
+    end
+
+    # Links
+    text.gsub!(%r{<(https?://[^|]+?)\|([^>]+?)>}, '[\2](\1)')
+    text.gsub!(%r{<(https?://[^>]+?)>}, '\1')
+
+    # Code blocks
+    text.gsub!(/```(.+?)```/m, "```\n\\1\n```")
+
+    # Images and files
+    if attachments
+      attachments.each do |attachment|
+        upload_markdown = download_file(attachment["path"], user_id)
+        text << "\n#{upload_markdown}"
+      end
+    end
+
+    text
+  end
+
+  def download_file(url, user_id)
+    uri = URI.parse(url)
+    filename = File.basename(uri.path)
+
+    tempfile =
+      FileHelper.download(
+        url,
+        max_file_size: SiteSetting.max_image_size_kb.kilobytes,
+        tmp_file_name: "sso-avatar",
+        follow_redirect: true,
+      )
+
+    return unless tempfile
+
+    upload = UploadCreator.new(tempfile, filename, origin: url).create_for(user_id)
+    html_for_upload(upload, filename)
+  ensure
+    tempfile.close! if tempfile && tempfile.respond_to?(:close!)
+  end
+end
+
+ImportScripts::Slack.new(ARGV[0]).perform
diff --git a/script/import_scripts/smf2.rb b/script/import_scripts/smf2.rb
index 97eb20a92ba..287b5a8af0d 100644
--- a/script/import_scripts/smf2.rb
+++ b/script/import_scripts/smf2.rb
@@ -378,7 +378,7 @@ class ImportScripts::Smf2 < ImportScripts::Base
       AttachmentPatterns.each do |p|
         pattern, emitter = *p
         body.gsub!(pattern) do |s|
-          next s unless (num = $~[:num].to_i - 1) >= 0
+          next s if (num = $~[:num].to_i - 1) < 0
           next s unless (upload = attachments[num]).present?
           use_count[num] += 1
           instance_exec(upload, &emitter)
diff --git a/script/import_scripts/vbulletin.rb b/script/import_scripts/vbulletin.rb
index f534b43848d..ac283d0243d 100644
--- a/script/import_scripts/vbulletin.rb
+++ b/script/import_scripts/vbulletin.rb
@@ -586,7 +586,9 @@ class ImportScripts::VBulletin < ImportScripts::Base
           title_username_of_pm_first_post[[title, participants]] ||= m["pmtextid"]
         end
 
-        unless topic_id
+        if topic_id
+          mapped[:topic_id] = topic_id
+        else
           mapped[:title] = title
           mapped[:archetype] = Archetype.private_message
           mapped[:target_usernames] = target_usernames.join(",")
@@ -596,8 +598,6 @@ class ImportScripts::VBulletin < ImportScripts::Base
             mapped[:target_usernames] = "system"
             puts "pm-#{m["pmtextid"]} has no target (#{m["touserarray"]})"
           end
-        else
-          mapped[:topic_id] = topic_id
         end
 
         skip ? nil : mapped
diff --git a/script/import_scripts/xenforo.rb b/script/import_scripts/xenforo.rb
index 1c9aaaeb774..d8eb3968429 100755
--- a/script/import_scripts/xenforo.rb
+++ b/script/import_scripts/xenforo.rb
@@ -335,7 +335,15 @@ class ImportScripts::XenForo < ImportScripts::Base
             created_at: Time.zone.at(post["message_date"].to_i),
             import_mode: true,
           }
-          unless post["topic_id"] > 0
+          if post["topic_id"] <= 0
+            topic_id = post["topic_id"]
+            if t = topic_lookup_from_imported_post_id("pm_#{topic_id}")
+              msg[:topic_id] = t[:topic_id]
+            else
+              puts "Topic ID #{topic_id} not found, skipping post #{post["message_id"]} from #{post["user_id"]}"
+              next
+            end
+          else
             msg[:title] = post["title"]
             msg[:archetype] = Archetype.private_message
             to_user_array = PHP.unserialize(post["recipients"])
@@ -344,14 +352,6 @@ class ImportScripts::XenForo < ImportScripts::Base
               usernames = User.where(id: [discourse_user_ids]).pluck(:username)
               msg[:target_usernames] = usernames.join(",")
             end
-          else
-            topic_id = post["topic_id"]
-            if t = topic_lookup_from_imported_post_id("pm_#{topic_id}")
-              msg[:topic_id] = t[:topic_id]
-            else
-              puts "Topic ID #{topic_id} not found, skipping post #{post["message_id"]} from #{post["user_id"]}"
-              next
-            end
           end
           msg
         else
diff --git a/script/import_scripts/yammer.rb b/script/import_scripts/yammer.rb
new file mode 100644
index 00000000000..f367a73cbfd
--- /dev/null
+++ b/script/import_scripts/yammer.rb
@@ -0,0 +1,507 @@
+# frozen_string_literal: true
+
+# Yammer importer
+#  https://docs.microsoft.com/en-us/yammer/manage-security-and-compliance/export-yammer-enterprise-data#export-yammer-network-data-by-date-range-and-network
+#
+# You will need a bunch of CSV files:
+#
+# - Users.csv Groups.csv Topics.csv Groups.csv Files.csv Messages.csv
+# (Others included in Yammer export are ignored)
+
+require "csv"
+require_relative "base"
+require_relative "base/generic_database"
+
+# Call it like this:
+#   RAILS_ENV=production bundle exec ruby script/import_scripts/yammer.rb DIRNAME
+
+class ImportScripts::Yammer < ImportScripts::Base
+  BATCH_SIZE = 1000
+  NUM_WORDS_IN_TITLE = ENV["NUM_WORDS_IN_TITLE"].to_i || 20
+  SKIP_EMPTY_EMAIL = true
+  SKIP_INACTIVE_USERS = false
+  PARENT_CATEGORY_NAME = ENV["PARENT_CATEGORY_NAME"] || "Yammer Import"
+  IMPORT_GROUPS_AS_TAGS = true
+  MERGE_USERS = true
+  # import groups as tags rather than as categories
+  SiteSetting.tagging_enabled = true if IMPORT_GROUPS_AS_TAGS
+  PM_TAG = ENV["PM_TAG"] || "eht"
+
+  def initialize(path)
+    super()
+
+    @path = path
+    @db = ImportScripts::GenericDatabase.new(@path, batch_size: BATCH_SIZE, recreate: true)
+  end
+
+  def execute
+    create_developer_users
+    read_csv_files
+
+    import_categories
+    import_users
+    import_topics
+    import_pm_topics
+    import_posts
+    import_pm_posts
+  end
+
+  def create_developer_users
+    GlobalSetting
+      .developer_emails
+      .split(",")
+      .each { |e| User.create(email: e, active: true, username: e.split("@")[0]) }
+  end
+
+  def read_csv_files
+    puts "", "reading CSV files"
+
+    # consider csv_parse Tags.csv
+    # consider Admins.csv that has admins
+
+    u_count = 0
+    csv_parse("Users") do |row|
+      next if SKIP_INACTIVE_USERS && row[:state] != "active"
+      u_count += 1
+      @db.insert_user(
+        id: row[:id],
+        email: row[:email],
+        name: row[:name],
+        username: row[:name],
+        bio: "",
+        # job_title: row[:job_title],
+        # location: row[:location],
+        # department: row[:department],
+        created_at: parse_datetime(row[:joined_at]),
+        # deleted_at: parse_datetime(row[:deleted_at]),
+        # suspended_at: parse_datetime(row[:suspended_at]),
+        # guid: row[:guid],
+        # state: row[:state],
+        avatar_path: row[:user_cover_image_url],
+        # last_seen_at: ,
+        active: row[:state] == "active" ? 1 : 0,
+      )
+    end
+
+    category_position = 0
+    csv_parse("Groups") do |row|
+      @db.insert_category(
+        id: row[:id],
+        name: row[:name],
+        description: row[:description],
+        position: category_position += 1,
+      )
+    end
+
+    csv_parse("Files") do |row|
+      @db.insert_upload(
+        id: row[:file_id],
+        user_id: row[:uploader_id],
+        original_filename: row[:name],
+        filename: row[:path],
+        description: row[:description],
+      )
+    end
+
+    # get topics from messages
+    csv_parse("Messages") do |row|
+      next unless row[:thread_id] == row[:id]
+      next if row[:in_private_conversation] == "true"
+      next unless row[:deleted_at].blank?
+      # next if row[:message_type] == 'system'
+      title = ""
+      url = ""
+      description = ""
+      raw = row[:body]
+      reg = /opengraphobject:\[(\d*?) : (.*?) : title="(.*?)" : description="(.*?)"\]/
+      if row[:attachments]
+        row[:attachments].match(reg) do
+          url = Regexp.last_match(2)
+          title = Regexp.last_match(3) if Regexp.last_match(3)
+          description = Regexp.last_match(4)
+          raw += "\n***\n#{description}\n#{url}\n" unless raw.include?(url)
+        end
+        row[:attachments].match(/uploadedfile:(\d*)$/) do
+          file_id = Regexp.last_match(1).to_i
+          up = @db.fetch_upload(file_id).first
+          path = File.join(@path, up["filename"])
+          filename = up["original_filename"]
+          user_id = user_id_from_imported_user_id(row["user_id"]) || Discourse.system_user.id
+          if File.exist?(path)
+            upload = create_upload(user_id, path, filename)
+            raw += html_for_upload(upload, filename) if upload&.persisted?
+          end
+        end
+      end
+      @db.insert_topic(
+        id: row[:id],
+        title: title,
+        raw: raw,
+        category_id: row[:group_id],
+        closed: row[:closed] == "TRUE" ? 1 : 0,
+        user_id: row[:sender_id],
+        created_at: parse_datetime(row[:created_at]),
+      )
+    end
+
+    # get pm topics
+    csv_parse("Messages") do |row|
+      next unless row[:thread_id] == row[:id]
+      next unless row[:in_private_conversation] == "true"
+      next unless row[:deleted_at].blank?
+      # next if row[:message_type] == 'system'
+      title = ""
+      url = ""
+      description = ""
+      raw = row[:body]
+      reg = /opengraphobject:\[(\d*?) : (.*?) : title="(.*?)" : description="(.*?)"\]/
+      if row[:attachments]
+        row[:attachments].match(reg) do
+          url = Regexp.last_match(2)
+          title = Regexp.last_match(3) if Regexp.last_match(3)
+          description = Regexp.last_match(4)
+          raw += "\n***\n#{description}\n#{url}\n" unless raw.include?(url)
+        end
+        row[:attachments].match(/uploadedfile:(\d*)$/) do
+          file_id = Regexp.last_match(1).to_i
+          up = @db.fetch_upload(file_id).first
+          path = File.join(@path, up["filename"])
+          filename = up["original_filename"]
+          user_id = user_id_from_imported_user_id(row["user_id"]) || Discourse.system_user.id
+          if File.exist?(path)
+            upload = create_upload(user_id, path, filename)
+            raw += html_for_upload(upload, filename) if upload&.persisted?
+          end
+        end
+      end
+      @db.insert_pm_topic(
+        id: row[:id],
+        title: title,
+        raw: raw,
+        category_id: row[:group_id],
+        closed: row[:closed] == "TRUE" ? 1 : 0,
+        target_users: row[:participants].gsub("user:", ""),
+        user_id: row[:sender_id],
+        created_at: parse_datetime(row[:created_at]),
+      )
+    end
+
+    # get posts from messages
+    csv_parse("Messages") do |row|
+      next if row[:thread_id] == row[:id]
+      next unless row[:deleted_at].blank?
+      next if row[:in_private_conversation] == "true"
+      @db.insert_post(
+        id: row[:id],
+        raw: row[:body] + "\n" + row[:attachments],
+        topic_id: row[:thread_id],
+        reply_to_post_id: row[:replied_to_id],
+        user_id: row[:sender_id],
+        created_at: parse_datetime(row[:created_at]),
+      )
+    end
+
+    # get pm posts from messages
+    csv_parse("Messages") do |row|
+      next if row[:thread_id] == row[:id]
+      next unless row[:deleted_at].blank?
+      next unless row[:in_private_conversation] == "false"
+      @db.insert_pm_post(
+        id: row[:id],
+        raw: row[:body] + "\n" + row[:attachments],
+        topic_id: row[:thread_id],
+        reply_to_post_id: row[:replied_to_id],
+        user_id: row[:sender_id],
+        created_at: parse_datetime(row[:created_at]),
+      )
+    end
+
+    #@db.delete_unused_users
+    @db.sort_posts_by_created_at
+  end
+
+  def parse_datetime(text)
+    return nil if text.blank? || text == "null"
+    DateTime.parse(text)
+  end
+
+  def import_categories
+    puts "", "creating categories"
+    parent_category = nil
+    if !PARENT_CATEGORY_NAME.blank?
+      parent_category = Category.find_by(name: PARENT_CATEGORY_NAME)
+      parent_category =
+        Category.create(
+          name: PARENT_CATEGORY_NAME,
+          user_id: Discourse.system_user.id,
+        ) unless parent_category
+    end
+
+    if IMPORT_GROUPS_AS_TAGS
+      @tag_map = {}
+      rows = @db.fetch_categories
+      rows.each { |row| @tag_map[row["id"]] = row["name"] }
+    else
+      rows = @db.fetch_categories
+      create_categories(rows) do |row|
+        {
+          id: row["id"],
+          name: row["name"],
+          description: row["description"],
+          position: row["position"],
+          parent_category_id: parent_category,
+        }
+      end
+    end
+  end
+
+  def batches
+    super(BATCH_SIZE)
+  end
+
+  def import_users
+    puts "", "creating users"
+    total_count = @db.count_users
+    puts "", "Got #{total_count} users!"
+    last_id = ""
+
+    batches do |offset|
+      rows, last_id = @db.fetch_users(last_id)
+      break if rows.empty?
+
+      next if all_records_exist?(:users, rows.map { |row| row["id"] })
+
+      create_users(rows, total: total_count, offset: offset) do |row|
+        user = User.find_by_email(row["email"].downcase)
+        if user
+          user.custom_fields["import_id"] = row["id"]
+          user.custom_fields["matched_existing"] = "yes"
+          user.save
+          add_user(row["id"].to_s, user)
+          next
+        end
+        {
+          id: row["id"],
+          email: row["email"],
+          name: row["name"],
+          created_at: row["created_at"],
+          last_seen_at: row["last_seen_at"],
+          active: row["active"] == 1,
+        }
+      end
+    end
+  end
+
+  def import_topics
+    puts "", "creating topics"
+    staff_guardian = Guardian.new(Discourse.system_user)
+
+    total_count = @db.count_topics
+    last_id = ""
+
+    batches do |offset|
+      rows, last_id = @db.fetch_topics(last_id)
+      base_category = Category.find_by(name: PARENT_CATEGORY_NAME)
+      break if rows.empty?
+
+      next if all_records_exist?(:posts, rows.map { |row| import_topic_id(row["id"]) })
+
+      create_posts(rows, total: total_count, offset: offset) do |row|
+        {
+          id: import_topic_id(row["id"]),
+          title:
+            (
+              if row["title"].present?
+                row["title"]
+              else
+                row["raw"].split(/\W/)[0..(NUM_WORDS_IN_TITLE - 1)].join(" ")
+              end
+            ),
+          raw: normalize_raw(row["raw"]),
+          category:
+            (
+              if IMPORT_GROUPS_AS_TAGS
+                base_category.id
+              else
+                category_id_from_imported_category_id(row["category_id"])
+              end
+            ),
+          user_id: user_id_from_imported_user_id(row["user_id"]) || Discourse.system_user.id,
+          created_at: row["created_at"],
+          closed: row["closed"] == 1,
+          post_create_action:
+            proc do |post|
+              if IMPORT_GROUPS_AS_TAGS
+                topic = Topic.find(post.topic_id)
+                tag_names = [@tag_map[row["category_id"]]]
+                DiscourseTagging.tag_topic_by_names(topic, staff_guardian, tag_names)
+              end
+            end,
+        }
+      end
+    end
+  end
+
+  def import_pm_topics
+    puts "", "creating pm topics"
+    staff_guardian = Guardian.new(Discourse.system_user)
+
+    total_count = @db.count_pm_topics
+    last_id = ""
+
+    batches do |offset|
+      rows, last_id = @db.fetch_pm_topics(last_id)
+      base_category = Category.find_by(name: PARENT_CATEGORY_NAME)
+      break if rows.empty?
+
+      next if all_records_exist?(:posts, rows.map { |row| import_topic_id(row["id"]) })
+      create_posts(rows, total: total_count, offset: offset) do |row|
+        target_users = []
+        row["target_users"]
+          .split(",")
+          .each do |u|
+            user_id = user_id_from_imported_user_id(u)
+            next unless user_id
+            user = User.find(user_id)
+            target_users.append(user.username)
+          end
+        target_usernames = target_users.join(",")
+        {
+          id: import_topic_id(row["id"]),
+          title:
+            (
+              if row["title"].present?
+                row["title"]
+              else
+                row["raw"].split(/\W/)[0..(NUM_WORDS_IN_TITLE - 1)].join(" ")
+              end
+            ),
+          raw: normalize_raw(row["raw"]),
+          category:
+            (
+              if IMPORT_GROUPS_AS_TAGS
+                base_category.id
+              else
+                category_id_from_imported_category_id(row["category_id"])
+              end
+            ),
+          user_id: user_id_from_imported_user_id(row["user_id"]) || Discourse.system_user.id,
+          created_at: row["created_at"],
+          closed: row["closed"] == 1,
+          archetype: Archetype.private_message,
+          target_usernames: target_usernames,
+          post_create_action:
+            proc do |post|
+              if PM_TAG
+                topic = Topic.find(post.topic_id)
+                tag_names = [PM_TAG]
+                DiscourseTagging.tag_topic_by_names(topic, staff_guardian, tag_names)
+              end
+            end,
+        }
+      end
+    end
+  end
+
+  def import_topic_id(topic_id)
+    "T#{topic_id}"
+  end
+
+  def import_posts
+    puts "", "creating posts"
+    total_count = @db.count_posts
+    last_row_id = 0
+
+    batches do |offset|
+      rows, last_row_id = @db.fetch_sorted_posts(last_row_id)
+      break if rows.empty?
+
+      next if all_records_exist?(:posts, rows.map { |row| row["id"] })
+
+      create_posts(rows, total: total_count, offset: offset) do |row|
+        topic = topic_lookup_from_imported_post_id(import_topic_id(row["topic_id"]))
+        if topic.nil?
+          p "MISSING TOPIC #{row["topic_id"]}"
+          p row
+          next
+        end
+        {
+          id: row["id"],
+          raw: normalize_raw(row["raw"]),
+          user_id: user_id_from_imported_user_id(row["user_id"]) || Discourse.system_user.id,
+          topic_id: topic[:topic_id],
+          created_at: row["created_at"],
+        }
+      end
+    end
+  end
+
+  def import_pm_posts
+    puts "", "creating pm posts"
+    total_count = @db.count_pm_posts
+    last_row_id = 0
+
+    batches do |offset|
+      rows, last_row_id = @db.fetch_pm_posts(last_row_id)
+      break if rows.empty?
+
+      next if all_records_exist?(:posts, rows.map { |row| row["id"] })
+
+      create_posts(rows, total: total_count, offset: offset) do |row|
+        topic = topic_lookup_from_imported_post_id(import_topic_id(row["topic_id"]))
+
+        if topic.nil?
+          p "MISSING TOPIC #{row["topic_id"]}"
+          p row
+          next
+        end
+
+        {
+          id: row["id"],
+          raw: normalize_raw(row["raw"]),
+          user_id: user_id_from_imported_user_id(row["user_id"]) || Discourse.system_user.id,
+          topic_id: topic[:topic_id],
+          created_at: row["created_at"],
+        }
+      end
+    end
+  end
+
+  def normalize_raw(raw)
+    return "<missing>" if raw.blank?
+
+    raw = raw.gsub('\n', "")
+    raw.gsub!(/\[\[user:(\d+)\]\]/) do
+      u = Regexp.last_match(1)
+      user_id = user_id_from_imported_user_id(u) || Discourse.system_user.id
+      if user_id
+        user = User.find(user_id)
+        "@#{user.username}"
+      else
+        u
+      end
+    end
+    raw
+  end
+
+  def permalink_exists?(url)
+    Permalink.find_by(url: url)
+  end
+
+  def csv_parse(table_name)
+    CSV.foreach(
+      File.join(@path, "#{table_name}.csv"),
+      headers: true,
+      header_converters: :symbol,
+      skip_blanks: true,
+      encoding: "bom|utf-8",
+    ) { |row| yield row }
+  end
+end
+
+unless ARGV[0] && Dir.exist?(ARGV[0])
+  puts "", "Usage:", "", "bundle exec ruby script/import_scripts/yammer.rb DIRNAME", ""
+  exit 1
+end
+
+ImportScripts::Yammer.new(ARGV[0]).perform
diff --git a/script/import_scripts/zendesk.rb b/script/import_scripts/zendesk.rb
index a8b5ef59ac5..4eb010aef62 100644
--- a/script/import_scripts/zendesk.rb
+++ b/script/import_scripts/zendesk.rb
@@ -211,6 +211,8 @@ class ImportScripts::Zendesk < ImportScripts::Base
   end
 
   def normalize_raw(raw)
+    return "<missing>" if raw.blank?
+
     raw = raw.gsub('\n', "")
     raw = ReverseMarkdown.convert(raw)
     raw
diff --git a/script/import_scripts/zendesk_api.rb b/script/import_scripts/zendesk_api.rb
index d76ff1652dc..ae9d948413d 100644
--- a/script/import_scripts/zendesk_api.rb
+++ b/script/import_scripts/zendesk_api.rb
@@ -345,6 +345,8 @@ class ImportScripts::ZendeskApi < ImportScripts::Base
   end
 
   def normalize_raw(raw, user_id)
+    return "<missing>" if raw.blank?
+
     raw = raw.gsub('\n', "")
     raw = ReverseMarkdown.convert(raw)
 
diff --git a/script/micro_bench.rb b/script/micro_bench.rb
index 7ba5dceffe8..18aa85b019b 100644
--- a/script/micro_bench.rb
+++ b/script/micro_bench.rb
@@ -14,7 +14,7 @@ Benchmark.ips do |b|
 
   b.report("pluck with limit") { User.limit(1).pluck(:name).first }
 
-  b.report("pluck with pluck_first") { User.pluck_first(:name) }
+  b.report("pluck with pick") { User.pick(:name) }
 
   b.report("raw") { conn.exec("SELECT name FROM users LIMIT 1").getvalue(0, 0) }
 end
diff --git a/spec/fabricators/category_fabricator.rb b/spec/fabricators/category_fabricator.rb
index eb6dbcbd0cf..ee5c5ca961b 100644
--- a/spec/fabricators/category_fabricator.rb
+++ b/spec/fabricators/category_fabricator.rb
@@ -3,12 +3,13 @@
 Fabricator(:category) do
   name { sequence(:name) { |n| "Amazing Category #{n}" } }
   skip_category_definition true
+  color { SecureRandom.hex(3) }
   user
 end
 
 Fabricator(:category_with_definition, from: :category) { skip_category_definition false }
 
-Fabricator(:private_category, from: :category) do
+Fabricator(:category_with_group_and_permission, from: :category) do
   transient :group
   transient :permission_type
 
@@ -17,7 +18,6 @@ Fabricator(:private_category, from: :category) do
   user
 
   after_build do |cat, transients|
-    cat.update!(read_restricted: true)
     cat.category_groups.build(
       group_id: transients[:group].id,
       permission_type: transients[:permission_type] || CategoryGroup.permission_types[:full],
@@ -25,6 +25,10 @@ Fabricator(:private_category, from: :category) do
   end
 end
 
+Fabricator(:private_category, from: :category_with_group_and_permission) do
+  after_build { |cat, transients| cat.update!(read_restricted: true) }
+end
+
 Fabricator(:private_category_with_definition, from: :private_category) do
   skip_category_definition false
 end
diff --git a/spec/fabricators/form_template_fabricator.rb b/spec/fabricators/form_template_fabricator.rb
new file mode 100644
index 00000000000..3ec5684a807
--- /dev/null
+++ b/spec/fabricators/form_template_fabricator.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+Fabricator(:form_template) do
+  name { sequence(:name) { |i| "template_#{i}" } }
+  template "- type: input"
+end
diff --git a/spec/fabricators/post_fabricator.rb b/spec/fabricators/post_fabricator.rb
index 07e8a734482..cbfbc1b35b3 100644
--- a/spec/fabricators/post_fabricator.rb
+++ b/spec/fabricators/post_fabricator.rb
@@ -16,6 +16,23 @@ Fabricator(:post_with_long_raw_content, from: :post) do
       than the typical test post raw content. It really is some long content, folks."
 end
 
+Fabricator(:post_with_very_long_raw_content, from: :post) do
+  raw "This is a sample post with very long raw content. The raw content is actually so long
+      that there is no way it could be longer. It is adding so many characters to the post content
+      so that we can use it in testing for scenarios where a post is very long and might cause issues.
+      The post is so long in fact, that the text is split into various paragraphs. Some people are not
+      very concise in their words. They tend to ramble and ramble on about certain information. This
+      is why we need to make sure that we are going about testing in certain ways so that when people
+      such as those that ramble on, are making posts, we can be sure that the posts are not causing
+      any issues. When issues happen it can cause lots of problems. For example, if a post is too long,
+      it affects the way it can be viewed by others.
+      Depending on the screen size, it may cause a lot of scrolling to take place. This is not good.
+      In certain cases, we want to truncate the content of the post when its too long so that it does
+      not cause issues. This is why we need to make sure that we are testing for these scenarios. I think
+      this post has gotten very long, however, I would like to make sure that it is a bit longer, so I
+      will add one final sentence. This is my final sentence, thank you for reading, goodbye."
+end
+
 Fabricator(:post_with_youtube, from: :post) do
   raw "http://www.youtube.com/watch?v=9bZkp7q19f0"
   cooked '<p><a href="http://www.youtube.com/watch?v=9bZkp7q19f0" class="onebox" target="_blank">http://www.youtube.com/watch?v=9bZkp7q19f0</a></p>'
diff --git a/spec/fabricators/reviewable_fabricator.rb b/spec/fabricators/reviewable_fabricator.rb
index 2606a99c291..c99634b7b9e 100644
--- a/spec/fabricators/reviewable_fabricator.rb
+++ b/spec/fabricators/reviewable_fabricator.rb
@@ -16,6 +16,7 @@ Fabricator(:reviewable_queued_post_topic, class_name: :reviewable_queued_post) d
   reviewable_by_moderator true
   type "ReviewableQueuedPost"
   created_by { Fabricate(:user) }
+  target_created_by { Fabricate(:user) }
   category
   payload do
     {
@@ -32,6 +33,7 @@ Fabricator(:reviewable_queued_post) do
   reviewable_by_moderator true
   type "ReviewableQueuedPost"
   created_by { Fabricate(:user) }
+  target_created_by { Fabricate(:user) }
   topic
   payload do
     {
diff --git a/spec/fabricators/sidebar_section_fabricator.rb b/spec/fabricators/sidebar_section_fabricator.rb
new file mode 100644
index 00000000000..16e9b2e133d
--- /dev/null
+++ b/spec/fabricators/sidebar_section_fabricator.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+Fabricator(:sidebar_section) do
+  title "Sidebar section"
+  user
+end
diff --git a/spec/fabricators/sidebar_section_link_fabricator.rb b/spec/fabricators/sidebar_section_link_fabricator.rb
index 569de894fe0..7da90f86e3a 100644
--- a/spec/fabricators/sidebar_section_link_fabricator.rb
+++ b/spec/fabricators/sidebar_section_link_fabricator.rb
@@ -7,3 +7,8 @@ Fabricator(:category_sidebar_section_link, from: :sidebar_section_link) do
 end
 
 Fabricator(:tag_sidebar_section_link, from: :sidebar_section_link) { linkable(fabricator: :tag) }
+
+Fabricator(:custom_sidebar_section_link, from: :sidebar_section_link) do
+  linkable(fabricator: :sidebar_url)
+  sidebar_section(fabricator: :sidebar_section)
+end
diff --git a/spec/fabricators/sidebar_url_fabricator.rb b/spec/fabricators/sidebar_url_fabricator.rb
new file mode 100644
index 00000000000..003e3b5554a
--- /dev/null
+++ b/spec/fabricators/sidebar_url_fabricator.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+Fabricator(:sidebar_url) do
+  icon "link"
+  name "tags"
+  value "/tags"
+end
diff --git a/spec/fabricators/translation_override_fabricator.rb b/spec/fabricators/translation_override_fabricator.rb
new file mode 100644
index 00000000000..4e329fbc72c
--- /dev/null
+++ b/spec/fabricators/translation_override_fabricator.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+Fabricator(:translation_override) do
+  translation_key "title"
+  value "Discourse"
+  locale "en"
+end
diff --git a/spec/fabricators/upload_fabricator.rb b/spec/fabricators/upload_fabricator.rb
index aec9a20721d..d5c9b88846f 100644
--- a/spec/fabricators/upload_fabricator.rb
+++ b/spec/fabricators/upload_fabricator.rb
@@ -31,10 +31,11 @@ end
 
 Fabricator(:image_upload, from: :upload) do
   transient color: "white"
+  transient color_depth: 8
 
   after_create do |upload, transients|
     file = Tempfile.new(%w[fabricated .png])
-    `convert -size #{upload.width}x#{upload.height} xc:#{transients[:color]} "#{file.path}"`
+    `convert -size #{upload.width}x#{upload.height} -depth #{transients[:color_depth]} xc:#{transients[:color]} "#{file.path}"`
 
     upload.url = Discourse.store.store_upload(file, upload)
     upload.sha1 = Upload.generate_digest(file.path)
@@ -97,3 +98,8 @@ Fabricator(:secure_upload_s3, from: :upload_s3) do
   sha1 { SecureRandom.hex(20) }
   original_sha1 { sequence(:sha1) { |n| Digest::SHA1.hexdigest(n.to_s) } }
 end
+
+Fabricator(:upload_reference) do
+  target
+  upload
+end
diff --git a/spec/fabricators/user_fabricator.rb b/spec/fabricators/user_fabricator.rb
index 1a0fcca19a6..ffbc5a9f4d3 100644
--- a/spec/fabricators/user_fabricator.rb
+++ b/spec/fabricators/user_fabricator.rb
@@ -100,6 +100,8 @@ Fabricator(:trust_level_0, from: :user) { trust_level TrustLevel[0] }
 
 Fabricator(:trust_level_1, from: :user) { trust_level TrustLevel[1] }
 
+Fabricator(:trust_level_3, from: :user) { trust_level TrustLevel[3] }
+
 Fabricator(:trust_level_4, from: :user) do
   name "Leader McElderson"
   username { sequence(:username) { |i| "tl4#{i}" } }
diff --git a/spec/fixtures/db/migrate/drop_not_null/20990309014015_drop_not_null.rb b/spec/fixtures/db/migrate/drop_not_null/20990309014015_drop_not_null.rb
new file mode 100644
index 00000000000..e6f845b94c4
--- /dev/null
+++ b/spec/fixtures/db/migrate/drop_not_null/20990309014015_drop_not_null.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class DropNotNull < ActiveRecord::Migration[5.1]
+  def up
+    change_column_null :users, :username, true
+  end
+
+  def down
+    raise "not tested"
+  end
+end
diff --git a/spec/fixtures/emails/mailman_1.eml b/spec/fixtures/emails/mailman_1.eml
new file mode 100644
index 00000000000..cdfd5bb891d
Binary files /dev/null and b/spec/fixtures/emails/mailman_1.eml differ
diff --git a/spec/fixtures/emails/mailman_2.eml b/spec/fixtures/emails/mailman_2.eml
new file mode 100644
index 00000000000..907aaf131c2
Binary files /dev/null and b/spec/fixtures/emails/mailman_2.eml differ
diff --git a/spec/fixtures/emails/mailman_3.eml b/spec/fixtures/emails/mailman_3.eml
new file mode 100644
index 00000000000..60d0f7e7b6a
Binary files /dev/null and b/spec/fixtures/emails/mailman_3.eml differ
diff --git a/spec/fixtures/emails/mailman_4.eml b/spec/fixtures/emails/mailman_4.eml
new file mode 100644
index 00000000000..7875ed71f1b
Binary files /dev/null and b/spec/fixtures/emails/mailman_4.eml differ
diff --git a/spec/fixtures/emails/quirks_exchange_xars.eml b/spec/fixtures/emails/quirks_exchange_xars.eml
new file mode 100644
index 00000000000..16bd2d60e34
Binary files /dev/null and b/spec/fixtures/emails/quirks_exchange_xars.eml differ
diff --git a/spec/fixtures/emails/reply_to_different_to_from_quoted_display_name.eml b/spec/fixtures/emails/reply_to_different_to_from_quoted_display_name.eml
index f74499707c5..4b6cefecda9 100644
Binary files a/spec/fixtures/emails/reply_to_different_to_from_quoted_display_name.eml and b/spec/fixtures/emails/reply_to_different_to_from_quoted_display_name.eml differ
diff --git a/spec/fixtures/json/vanilla-rich-posts.json b/spec/fixtures/json/vanilla-rich-posts.json
index e539e1d3728..850572348a1 100644
--- a/spec/fixtures/json/vanilla-rich-posts.json
+++ b/spec/fixtures/json/vanilla-rich-posts.json
@@ -3,7 +3,7 @@
     "insert": "This is a message.\nAnd a second line.\n"
   }],
   "mention": [
-    { "insert": { "mention": { "name": "Gandalf The Grey", "userID": 666 } } },
+    { "insert": { "mention": { "name": "Gandalf The Grey", "userID": 999999999 } } },
     {
       "insert": ", what do you think?\n"
     }
diff --git a/spec/fixtures/onebox/discourse_topic.response b/spec/fixtures/onebox/discourse_topic.response
index 8c078f31644..6520ba22f61 100644
--- a/spec/fixtures/onebox/discourse_topic.response
+++ b/spec/fixtures/onebox/discourse_topic.response
@@ -194,6 +194,10 @@ And that too in just over an year, way to go! [boom]">
 <meta name="twitter:data2" value="9 ❤" />
 <meta property="article:published_time" content="2014-02-06T04:55:19+00:00" />
 <meta property="og:ignore_canonical" content="true" />
+<meta property="og:article:section" content="praise" />
+<meta property="og:article:section:color" content="9EB83B" />
+<meta property="og:article:tag" content="how-to" />
+<meta property="og:article:tag" content="sso" />
 
 
 
@@ -253,7 +257,7 @@ And that too in just over an year, way to go! [boom]">
               <time itemprop='dateModified' datetime='2015-06-19T06:45:49Z' class='post-time'>
                 June 19, 2015,  6:45am
               </time>
-          <span itemprop='position'>#1</span>
+          <span itemprop='position'>1</span>
           </span>
         </div>
         <div class='post' itemprop='articleBody'>
@@ -292,7 +296,7 @@ And that too in just over an year, way to go! [boom]">
               <time itemprop='datePublished' datetime='2014-02-06T05:27:06Z' class='post-time'>
                 February 6, 2014,  5:27am
               </time>
-          <span itemprop='position'>#2</span>
+          <span itemprop='position'>2</span>
           </span>
         </div>
         <div class='post' itemprop='articleBody'>
@@ -351,23 +355,5 @@ And that too in just over an year, way to go! [boom]">
     <section id='main'>
     </section>
 
-    <div id='offscreen-content'>
-    </div>
-
-
-    <div class="hidden" id="data-preloaded" data-preloaded="{&quot;site&quot;:&quot;{\&quot;default_archetype\&quot;:\&quot;regular\&quot;,\&quot;notification_types\&quot;:{\&quot;mentioned\&quot;:1,\&quot;replied\&quot;:2,\&quot;quoted\&quot;:3,\&quot;edited\&quot;:4,\&quot;liked\&quot;:5,\&quot;private_message\&quot;:6,\&quot;invited_to_private_message\&quot;:7,\&quot;invitee_accepted\&quot;:8,\&quot;posted\&quot;:9,\&quot;moved_post\&quot;:10,\&quot;linked\&quot;:11,\&quot;granted_badge\&quot;:12,\&quot;invited_to_topic\&quot;:13,\&quot;custom\&quot;:14,\&quot;group_mentioned\&quot;:15,\&quot;group_message_summary\&quot;:16,\&quot;watching_first_post\&quot;:17,\&quot;topic_reminder\&quot;:18,\&quot;liked_consolidated\&quot;:19,\&quot;post_approved\&quot;:20,\&quot;code_review_commit_approved\&quot;:21,\&quot;membership_request_accepted\&quot;:22,\&quot;membership_request_consolidated\&quot;:23},\&quot;post_types\&quot;:{\&quot;regular\&quot;:1,\&quot;moderator_action\&quot;:2,\&quot;small_action\&quot;:3,\&quot;whisper\&quot;:4},\&quot;groups\&quot;:[{\&quot;id\&quot;:1,\&quot;name\&quot;:\&quot;admins\&quot;},{\&quot;id\&quot;:92,\&quot;name\&quot;:\&quot;Amazon\&quot;},{\&quot;id\&quot;:91,\&quot;name\&quot;:\&quot;aws_emails\&quot;},{\&quot;id\&quot;:62,\&quot;name\&quot;:\&quot;codecademy\&quot;},{\&quot;id\&quot;:58,\&quot;name\&quot;:\&quot;coinbase\&quot;},{\&quot;id\&quot;:86,\&quot;name\&quot;:\&quot;community\&quot;},{\&quot;id\&quot;:97,\&quot;name\&quot;:\&quot;dev-managers\&quot;},{\&quot;id\&quot;:71,\&quot;name\&quot;:\&quot;Discoursehosting\&quot;},{\&quot;id\&quot;:90,\&quot;name\&quot;:\&quot;encrypt-users\&quot;},{\&quot;id\&quot;:55,\&quot;name\&quot;:\&quot;envato\&quot;},{\&quot;id\&quot;:0,\&quot;name\&quot;:\&quot;everyone\&quot;},{\&quot;id\&quot;:79,\&quot;name\&quot;:\&quot;ford\&quot;},{\&quot;id\&quot;:99,\&quot;name\&quot;:\&quot;freertos\&quot;},{\&quot;id\&quot;:89,\&quot;name\&quot;:\&quot;free-signups\&quot;},{\&quot;id\&quot;:87,\&quot;name\&quot;:\&quot;free-support\&quot;},{\&quot;id\&quot;:81,\&quot;name\&quot;:\&quot;gartner\&quot;},{\&quot;id\&quot;:59,\&quot;name\&quot;:\&quot;gaspedal\&quot;},{\&quot;id\&quot;:94,\&quot;name\&quot;:\&quot;global_communities\&quot;},{\&quot;id\&quot;:88,\&quot;name\&quot;:\&quot;infinite_flight\&quot;},{\&quot;id\&quot;:69,\&quot;name\&quot;:\&quot;laruchequiditoui\&quot;},{\&quot;id\&quot;:49,\&quot;name\&quot;:\&quot;mcneel\&quot;},{\&quot;id\&quot;:75,\&quot;name\&quot;:\&quot;migrators\&quot;},{\&quot;id\&quot;:2,\&quot;name\&quot;:\&quot;moderators\&quot;},{\&quot;id\&quot;:46,\&quot;name\&quot;:\&quot;newrelic\&quot;},{\&quot;id\&quot;:85,\&quot;name\&quot;:\&quot;ops\&quot;},{\&quot;id\&quot;:78,\&quot;name\&quot;:\&quot;outreachy\&quot;},{\&quot;id\&quot;:76,\&quot;name\&quot;:\&quot;pivotal\&quot;},{\&quot;id\&quot;:48,\&quot;name\&quot;:\&quot;plugin_authors\&quot;},{\&quot;id\&quot;:83,\&quot;name\&quot;:\&quot;ProCourse\&quot;},{\&quot;id\&quot;:63,\&quot;name\&quot;:\&quot;rails\&quot;},{\&quot;id\&quot;:98,\&quot;name\&quot;:\&quot;RedHat\&quot;},{\&quot;id\&quot;:65,\&quot;name\&quot;:\&quot;rgsoc2016\&quot;},{\&quot;id\&quot;:52,\&quot;name\&quot;:\&quot;sitepoint\&quot;},{\&quot;id\&quot;:56,\&quot;name\&quot;:\&quot;sketchup\&quot;},{\&quot;id\&quot;:3,\&quot;name\&quot;:\&quot;staff\&quot;},{\&quot;id\&quot;:74,\&quot;name\&quot;:\&quot;summer_of_code\&quot;},{\&quot;id\&quot;:77,\&quot;name\&quot;:\&quot;support\&quot;},{\&quot;id\&quot;:47,\&quot;name\&quot;:\&quot;team\&quot;},{\&quot;id\&quot;:95,\&quot;name\&quot;:\&quot;tech_advocates\&quot;},{\&quot;id\&quot;:73,\&quot;name\&quot;:\&quot;theme_authors\&quot;},{\&quot;id\&quot;:84,\&quot;name\&quot;:\&quot;theme_creator\&quot;},{\&quot;id\&quot;:50,\&quot;name\&quot;:\&quot;translators\&quot;},{\&quot;id\&quot;:10,\&quot;name\&quot;:\&quot;trust_level_0\&quot;},{\&quot;id\&quot;:11,\&quot;name\&quot;:\&quot;trust_level_1\&quot;},{\&quot;id\&quot;:12,\&quot;name\&quot;:\&quot;trust_level_2\&quot;},{\&quot;id\&quot;:13,\&quot;name\&quot;:\&quot;trust_level_3\&quot;},{\&quot;id\&quot;:14,\&quot;name\&quot;:\&quot;trust_level_4\&quot;},{\&quot;id\&quot;:57,\&quot;name\&quot;:\&quot;tudiabetes\&quot;},{\&quot;id\&quot;:61,\&quot;name\&quot;:\&quot;twitter\&quot;},{\&quot;id\&quot;:80,\&quot;name\&quot;:\&quot;udacity\&quot;},{\&quot;id\&quot;:96,\&quot;name\&quot;:\&quot;warner\&quot;},{\&quot;id\&quot;:53,\&quot;name\&quot;:\&quot;western_digital\&quot;},{\&quot;id\&quot;:82,\&quot;name\&quot;:\&quot;woot\&quot;}],\&quot;filters\&quot;:[\&quot;latest\&quot;,\&quot;unread\&quot;,\&quot;new\&quot;,\&quot;read\&quot;,\&quot;posted\&quot;,\&quot;bookmarks\&quot;,\&quot;votes\&quot;],\&quot;periods\&quot;:[\&quot;all\&quot;,\&quot;yearly\&quot;,\&quot;quarterly\&quot;,\&quot;monthly\&quot;,\&quot;weekly\&quot;,\&quot;daily\&quot;],\&quot;top_menu_items\&quot;:[\&quot;latest\&quot;,\&quot;unread\&quot;,\&quot;new\&quot;,\&quot;read\&quot;,\&quot;posted\&quot;,\&quot;bookmarks\&quot;,\&quot;categories\&quot;,\&quot;top\&quot;,\&quot;votes\&quot;],\&quot;anonymous_top_menu_items\&quot;:[\&quot;latest\&quot;,\&quot;top\&quot;,\&quot;categories\&quot;,\&quot;categories\&quot;,\&quot;top\&quot;,\&quot;votes\&quot;],\&quot;uncategorized_category_id\&quot;:17,\&quot;is_readonly\&quot;:false,\&quot;disabled_plugins\&quot;:[\&quot;discourse-patreon\&quot;],\&quot;user_field_max_length\&quot;:2048,\&quot;post_action_types\&quot;:[{\&quot;id\&quot;:1,\&quot;name_key\&quot;:\&quot;bookmark\&quot;,\&quot;name\&quot;:\&quot;Bookmark\&quot;,\&quot;description\&quot;:\&quot;Bookmark this post\&quot;,\&quot;short_description\&quot;:\&quot;Bookmark this post\&quot;,\&quot;long_form\&quot;:\&quot;bookmarked this post\&quot;,\&quot;is_flag\&quot;:false,\&quot;is_custom_flag\&quot;:false},{\&quot;id\&quot;:2,\&quot;name_key\&quot;:\&quot;like\&quot;,\&quot;name\&quot;:\&quot;Like\&quot;,\&quot;description\&quot;:\&quot;Like this post\&quot;,\&quot;short_description\&quot;:\&quot;Like this post\&quot;,\&quot;long_form\&quot;:\&quot;liked this\&quot;,\&quot;is_flag\&quot;:false,\&quot;is_custom_flag\&quot;:false},{\&quot;id\&quot;:3,\&quot;name_key\&quot;:\&quot;off_topic\&quot;,\&quot;name\&quot;:\&quot;Off-Topic\&quot;,\&quot;description\&quot;:\&quot;This post is not relevant to the current discussion as defined by the title and first post, and should probably be moved elsewhere.\&quot;,\&quot;short_description\&quot;:\&quot;Not relevant to the discussion\&quot;,\&quot;long_form\&quot;:\&quot;flagged this as off-topic\&quot;,\&quot;is_flag\&quot;:true,\&quot;is_custom_flag\&quot;:false},{\&quot;id\&quot;:4,\&quot;name_key\&quot;:\&quot;inappropriate\&quot;,\&quot;name\&quot;:\&quot;Inappropriate\&quot;,\&quot;description\&quot;:\&quot;This post contains content that a reasonable person would consider offensive, abusive, or a violation of \\u003ca href=\\\&quot;/guidelines\\\&quot;\\u003eour community guidelines\\u003c/a\\u003e.\&quot;,\&quot;short_description\&quot;:\&quot;A violation of \\u003ca href=\\\&quot;/guidelines\\\&quot;\\u003eour community guidelines\\u003c/a\\u003e\&quot;,\&quot;long_form\&quot;:\&quot;flagged this as inappropriate\&quot;,\&quot;is_flag\&quot;:true,\&quot;is_custom_flag\&quot;:false},{\&quot;id\&quot;:8,\&quot;name_key\&quot;:\&quot;spam\&quot;,\&quot;name\&quot;:\&quot;Spam\&quot;,\&quot;description\&quot;:\&quot;This post is an advertisement, or vandalism. It is not useful or relevant to the current topic.\&quot;,\&quot;short_description\&quot;:\&quot;This is an advertisement or vandalism\&quot;,\&quot;long_form\&quot;:\&quot;flagged this as spam\&quot;,\&quot;is_flag\&quot;:true,\&quot;is_custom_flag\&quot;:false},{\&quot;id\&quot;:6,\&quot;name_key\&quot;:\&quot;notify_user\&quot;,\&quot;name\&quot;:\&quot;Send @{{username}} a message\&quot;,\&quot;description\&quot;:\&quot;I want to talk to this person directly and personally about their post.\&quot;,\&quot;short_description\&quot;:\&quot;I want to talk to this person directly and personally about their post.\&quot;,\&quot;long_form\&quot;:\&quot;messaged user\&quot;,\&quot;is_flag\&quot;:true,\&quot;is_custom_flag\&quot;:true},{\&quot;id\&quot;:null,\&quot;name_key\&quot;:null,\&quot;name\&quot;:\&quot;translation missing: en_US.post_action_types..title\&quot;,\&quot;description\&quot;:\&quot;translation missing: en_US.post_action_types.description\&quot;,\&quot;short_description\&quot;:\&quot;translation missing: en_US.post_action_types.short_description\&quot;,\&quot;long_form\&quot;:\&quot;translation missing: en_US.post_action_types..long_form\&quot;,\&quot;is_flag\&quot;:false,\&quot;is_custom_flag\&quot;:false},{\&quot;id\&quot;:7,\&quot;name_key\&quot;:\&quot;notify_moderators\&quot;,\&quot;name\&quot;:\&quot;Something Else\&quot;,\&quot;description\&quot;:\&quot;This post requires staff attention for another reason not listed above.\&quot;,\&quot;short_description\&quot;:\&quot;Requires staff attention for another reason\&quot;,\&quot;long_form\&quot;:\&quot;flagged this for staff attention\&quot;,\&quot;is_flag\&quot;:true,\&quot;is_custom_flag\&quot;:true}],\&quot;topic_flag_types\&quot;:[{\&quot;id\&quot;:4,\&quot;name_key\&quot;:\&quot;inappropriate\&quot;,\&quot;name\&quot;:\&quot;Inappropriate\&quot;,\&quot;description\&quot;:\&quot;This topic contains content that a reasonable person would consider offensive, abusive, or a violation of \\u003ca href=\\\&quot;/guidelines\\\&quot;\\u003eour community guidelines\\u003c/a\\u003e.\&quot;,\&quot;short_description\&quot;:\&quot;A violation of \\u003ca href=\\\&quot;/guidelines\\\&quot;\\u003eour community guidelines\\u003c/a\\u003e\&quot;,\&quot;long_form\&quot;:\&quot;flagged this as inappropriate\&quot;,\&quot;is_flag\&quot;:true,\&quot;is_custom_flag\&quot;:false},{\&quot;id\&quot;:8,\&quot;name_key\&quot;:\&quot;spam\&quot;,\&quot;name\&quot;:\&quot;Spam\&quot;,\&quot;description\&quot;:\&quot;This topic is an advertisement. It is not useful or relevant to this site, but promotional in nature.\&quot;,\&quot;short_description\&quot;:\&quot;This is an advertisement\&quot;,\&quot;long_form\&quot;:\&quot;flagged this as spam\&quot;,\&quot;is_flag\&quot;:true,\&quot;is_custom_flag\&quot;:false},{\&quot;id\&quot;:null,\&quot;name_key\&quot;:null,\&quot;name\&quot;:\&quot;translation missing: en_US.topic_flag_types..title\&quot;,\&quot;description\&quot;:\&quot;translation missing: en_US.topic_flag_types.description\&quot;,\&quot;short_description\&quot;:\&quot;translation missing: en_US.topic_flag_types.short_description\&quot;,\&quot;long_form\&quot;:\&quot;translation missing: en_US.topic_flag_types..long_form\&quot;,\&quot;is_flag\&quot;:false,\&quot;is_custom_flag\&quot;:false},{\&quot;id\&quot;:7,\&quot;name_key\&quot;:\&quot;notify_moderators\&quot;,\&quot;name\&quot;:\&quot;Something Else\&quot;,\&quot;description\&quot;:\&quot;This topic requires general staff attention based on the \\u003ca href=\\\&quot;/guidelines\\\&quot;\\u003eguidelines\\u003c/a\\u003e, \\u003ca href=\\\&quot;/tos\\\&quot;\\u003eTOS\\u003c/a\\u003e, or for another reason not listed above.\&quot;,\&quot;short_description\&quot;:\&quot;Requires staff attention for another reason\&quot;,\&quot;long_form\&quot;:\&quot;flagged this for moderator attention\&quot;,\&quot;is_flag\&quot;:true,\&quot;is_custom_flag\&quot;:true}],\&quot;can_create_tag\&quot;:true,\&quot;can_tag_topics\&quot;:true,\&quot;can_tag_pms\&quot;:true,\&quot;tags_filter_regexp\&quot;:\&quot;[/\\\\?#\\\\[\\\\]@!\\\\$\\u0026&#39;\\\\(\\\\)\\\\*\\\\+,;=\\\\.%\\\\\\\\`^\\\\s|\\\\{\\\\}\\\&quot;\\u003c\\u003e]+\&quot;,\&quot;top_tags\&quot;:[\&quot;unsupported-install\&quot;,\&quot;pr-welcome\&quot;,\&quot;theme-component\&quot;,\&quot;faq-material\&quot;,\&quot;faq-material-review\&quot;,\&quot;email\&quot;,\&quot;docker\&quot;,\&quot;css\&quot;,\&quot;markdown-it-review\&quot;,\&quot;rfc\&quot;,\&quot;import\&quot;,\&quot;official\&quot;,\&quot;release-notes\&quot;,\&quot;feature\&quot;,\&quot;plugins\&quot;,\&quot;wordpress\&quot;,\&quot;sso\&quot;,\&quot;badge\&quot;,\&quot;tagging\&quot;,\&quot;spec\&quot;,\&quot;feedback\&quot;,\&quot;themes\&quot;,\&quot;admin\&quot;,\&quot;api\&quot;,\&quot;javascript\&quot;,\&quot;planned\&quot;,\&quot;translation\&quot;,\&quot;ui\&quot;,\&quot;onebox\&quot;,\&quot;groups\&quot;],\&quot;topic_featured_link_allowed_category_ids\&quot;:[9,63,30,66,68,1,62,65,83,59,48,78,35,34,4,89,61,82,27,7,31,60,22,14,25,24,53,84,58,8,13,90,69,56,2,73,74,6,77,10,45,75,67,17,55,21,20,3,5,76],\&quot;user_themes\&quot;:[{\&quot;theme_id\&quot;:31,\&quot;name\&quot;:\&quot;Dark Theme\&quot;,\&quot;default\&quot;:false},{\&quot;theme_id\&quot;:51,\&quot;name\&quot;:\&quot;Discourse-classic\&quot;,\&quot;default\&quot;:false},{\&quot;theme_id\&quot;:123,\&quot;name\&quot;:\&quot;Fakebook\&quot;,\&quot;default\&quot;:false},{\&quot;theme_id\&quot;:166,\&quot;name\&quot;:\&quot;Focused Sidebar\&quot;,\&quot;default\&quot;:false},{\&quot;theme_id\&quot;:167,\&quot;name\&quot;:\&quot;Focused Sidebar (dark)\&quot;,\&quot;default\&quot;:false},{\&quot;theme_id\&quot;:131,\&quot;name\&quot;:\&quot;Ghost\&quot;,\&quot;default\&quot;:false},{\&quot;theme_id\&quot;:80,\&quot;name\&quot;:\&quot;Graceful\&quot;,\&quot;default\&quot;:false},{\&quot;theme_id\&quot;:83,\&quot;name\&quot;:\&quot;Grey Amber\&quot;,\&quot;default\&quot;:false},{\&quot;theme_id\&quot;:148,\&quot;name\&quot;:\&quot;Hidden Whispers\&quot;,\&quot;default\&quot;:false},{\&quot;theme_id\&quot;:28,\&quot;name\&quot;:\&quot;Light Theme\&quot;,\&quot;default\&quot;:true},{\&quot;theme_id\&quot;:34,\&quot;name\&quot;:\&quot;Material Design\&quot;,\&quot;default\&quot;:false},{\&quot;theme_id\&quot;:119,\&quot;name\&quot;:\&quot;Minima\&quot;,\&quot;default\&quot;:false},{\&quot;theme_id\&quot;:125,\&quot;name\&quot;:\&quot;Minima Dark\&quot;,\&quot;default\&quot;:false},{\&quot;theme_id\&quot;:30,\&quot;name\&quot;:\&quot;Sam&#39;s Simple Theme\&quot;,\&quot;default\&quot;:false}],\&quot;censored_regexp\&quot;:null,\&quot;shared_drafts_category_id\&quot;:25,\&quot;group_list_use_ids\&quot;:true,\&quot;house_creatives\&quot;:{\&quot;settings\&quot;:{\&quot;topic_list_top\&quot;:\&quot;\&quot;,\&quot;topic_above_post_stream\&quot;:\&quot;\&quot;,\&quot;topic_above_suggested\&quot;:\&quot;\&quot;,\&quot;post_bottom\&quot;:\&quot;\&quot;,\&quot;after_nth_post\&quot;:10,\&quot;house_ads_frequency\&quot;:100},\&quot;creatives\&quot;:{}},\&quot;hosting_tier\&quot;:\&quot;enterprise\&quot;,\&quot;categories\&quot;:[{\&quot;id\&quot;:10,\&quot;name\&quot;:\&quot;howto\&quot;,\&quot;color\&quot;:\&quot;76923C\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;howto\&quot;,\&quot;topic_count\&quot;:27,\&quot;post_count\&quot;:249,\&quot;position\&quot;:0,\&quot;description\&quot;:\&quot;Tutorial topics that describe how to set up, configure, or install Discourse using a specific platform or environment. Topics in this category may only be created by trust level 2 and up. \&quot;,\&quot;description_text\&quot;:\&quot;Tutorial topics that describe how to set up, configure, or install Discourse using a specific platform or environment. Topics in this category may only be created by trust level 2 and up.\&quot;,\&quot;description_excerpt\&quot;:\&quot;Tutorial topics that describe how to set up, configure, or install Discourse using a specific platform or environment. Topics in this category may only be created by trust level 2 and up.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/category-definition-for-howto/2629\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:4,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:true,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;top\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;boxes_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:true,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:1,\&quot;name\&quot;:\&quot;bug\&quot;,\&quot;color\&quot;:\&quot;e9dd00\&quot;,\&quot;text_color\&quot;:\&quot;000000\&quot;,\&quot;slug\&quot;:\&quot;bug\&quot;,\&quot;topic_count\&quot;:3188,\&quot;post_count\&quot;:22709,\&quot;position\&quot;:1,\&quot;description\&quot;:\&quot;A bug report means \\u003cstrong\\u003esomething is broken, preventing normal/typical use of Discourse\\u003c/strong\\u003e. Do be sure to search prior to submitting bugs. Include repro steps, and only describe one bug per topic please.\&quot;,\&quot;description_text\&quot;:\&quot;A bug report means something is broken, preventing normal\\u0026#x2F;typical use of Discourse. Do be sure to search prior to submitting bugs. Include repro steps, and only describe one bug per topic please.\&quot;,\&quot;description_excerpt\&quot;:\&quot;A bug report means something is broken, preventing normal/typical use of Discourse. Do be sure to search prior to submitting bugs. Include repro steps, and only describe one bug per topic please.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/category-definition-for-bug/2\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:2,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:2,\&quot;name\&quot;:\&quot;feature\&quot;,\&quot;color\&quot;:\&quot;0E76BD\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;feature\&quot;,\&quot;topic_count\&quot;:4625,\&quot;post_count\&quot;:41274,\&quot;position\&quot;:2,\&quot;description\&quot;:\&quot;Discussion about existing Discourse features, how they can be improved or enhanced, and how proposed new features could work.\&quot;,\&quot;description_text\&quot;:\&quot;Discussion about existing Discourse features, how they can be improved or enhanced, and how proposed new features could work.\&quot;,\&quot;description_excerpt\&quot;:\&quot;Discussion about existing Discourse features, how they can be improved or enhanced, and how proposed new features could work.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/category-definition-for-feature/11\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:true,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:9,\&quot;name\&quot;:\&quot;ux\&quot;,\&quot;color\&quot;:\&quot;5F497A\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;ux\&quot;,\&quot;topic_count\&quot;:1396,\&quot;post_count\&quot;:10529,\&quot;position\&quot;:3,\&quot;description\&quot;:\&quot;Discussion about the user interface of Discourse, how features are presented to the user in the client, including language and UI elements.\&quot;,\&quot;description_text\&quot;:\&quot;Discussion about the user interface of Discourse, how features are presented to the user in the client, including language and UI elements.\&quot;,\&quot;description_excerpt\&quot;:\&quot;Discussion about the user interface of Discourse, how features are presented to the user in the client, including language and UI elements.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/category-definition-for-ux/2628\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:null,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:null,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:null,\&quot;subcategory_list_style\&quot;:\&quot;rows\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:65,\&quot;name\&quot;:\&quot;community\&quot;,\&quot;color\&quot;:\&quot;12A89D\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;community\&quot;,\&quot;topic_count\&quot;:421,\&quot;post_count\&quot;:4011,\&quot;position\&quot;:4,\&quot;description\&quot;:\&quot;A great platform doesn’t guarantee success. Community building is a science. This category is for discussions about launching, building, growing and managing a thriving community.\&quot;,\&quot;description_text\&quot;:\&quot;A great platform doesn’t guarantee success. Community building is a science. This category is for discussions about launching, building, growing and managing a thriving community.\&quot;,\&quot;description_excerpt\&quot;:\&quot;A great platform doesn’t guarantee success. Community building is a science. This category is for discussions about launching, building, growing and managing a thriving community.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-community-category/67750\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:7,\&quot;name\&quot;:\&quot;dev\&quot;,\&quot;color\&quot;:\&quot;292929\&quot;,\&quot;text_color\&quot;:\&quot;fff\&quot;,\&quot;slug\&quot;:\&quot;dev\&quot;,\&quot;topic_count\&quot;:1572,\&quot;post_count\&quot;:9342,\&quot;position\&quot;:5,\&quot;description\&quot;:\&quot;Anything related to hacking on Discourse: submitting pull requests, configuring development environments, coding conventions, and so forth.\&quot;,\&quot;description_text\&quot;:\&quot;Anything related to hacking on Discourse: submitting pull requests, configuring development environments, coding conventions, and so forth.\&quot;,\&quot;description_excerpt\&quot;:\&quot;Anything related to hacking on Discourse: submitting pull requests, configuring development environments, coding conventions, and so forth.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/category-definition-for-dev/1026\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:true,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;boxes\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:3,\&quot;name\&quot;:\&quot;Site Feedback\&quot;,\&quot;color\&quot;:\&quot;aaa\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;site-feedback\&quot;,\&quot;topic_count\&quot;:275,\&quot;post_count\&quot;:2272,\&quot;position\&quot;:6,\&quot;description\&quot;:\&quot;Discussion about meta.discourse.org itself, the organization of this forum about Discourse, how it works, and how we can improve this site.\&quot;,\&quot;description_text\&quot;:\&quot;Discussion about meta.discourse.org itself, the organization of this forum about Discourse, how it works, and how we can improve this site.\&quot;,\&quot;description_excerpt\&quot;:\&quot;Discussion about meta.discourse.org itself, the organization of this forum about Discourse, how it works, and how we can improve this site.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/category-definition-for-meta/24\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:true,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:\&quot;\&quot;},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:5,\&quot;name\&quot;:\&quot;extras\&quot;,\&quot;color\&quot;:\&quot;25AAE2\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;extras\&quot;,\&quot;topic_count\&quot;:36,\&quot;post_count\&quot;:471,\&quot;position\&quot;:7,\&quot;description\&quot;:\&quot;A directory of all extensions \\u0026amp; integrations for Discourse which are \\u003cem\\u003enot\\u003c/em\\u003e Discourse plugins, i.e. a CMS plugin, a browser extension or a native application.\&quot;,\&quot;description_text\&quot;:\&quot;A directory of all extensions \\u0026amp; integrations for Discourse which are not Discourse plugins, i.e. a CMS plugin, a browser extension or a native application.\&quot;,\&quot;description_excerpt\&quot;:\&quot;A directory of all extensions \\u0026amp; integrations for Discourse which are not Discourse plugins, i.e. a CMS plugin, a browser extension or a native application.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-extras-category/28\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:22,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:null,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:null,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:6,\&quot;name\&quot;:\&quot;support\&quot;,\&quot;color\&quot;:\&quot;CEA9A9\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;support\&quot;,\&quot;topic_count\&quot;:10156,\&quot;post_count\&quot;:71668,\&quot;position\&quot;:8,\&quot;description\&quot;:\&quot;Support on configuring and using Discourse after it is up and running. For installation questions, use the install category.\&quot;,\&quot;description_text\&quot;:\&quot;Support on configuring and using Discourse after it is up and running. For installation questions, use the install category.\&quot;,\&quot;description_excerpt\&quot;:\&quot;Support on configuring and using Discourse after it is up and running. For installation questions, use the install category.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/category-definition-for-support/389\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:true,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:\&quot;true\&quot;},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:24,\&quot;name\&quot;:\&quot;sso\&quot;,\&quot;color\&quot;:\&quot;d47711\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;sso\&quot;,\&quot;topic_count\&quot;:165,\&quot;post_count\&quot;:793,\&quot;position\&quot;:9,\&quot;description\&quot;:\&quot;For queries specifically about SSO (single sign on) and and login using third party providers (Google, Facebook, GitHub etc). See the \\u003ca href=\\\&quot;https://meta.discourse.org/t/official-single-sign-on-for-discourse/13045\\\&quot;\\u003eofficial documentation on Discourse&#39;s SSO support\\u003c/a\\u003e.\&quot;,\&quot;description_text\&quot;:\&quot;For queries specifically about SSO (single sign on) and and login using third party providers (Google, Facebook, GitHub etc). See the official documentation on Discourse\\u0026#x27;s SSO support.\&quot;,\&quot;description_excerpt\&quot;:\&quot;For queries specifically about SSO (single sign on) and and login using third party providers (Google, Facebook, GitHub etc). See the \\u003ca href=\\\&quot;https://meta.discourse.org/t/official-single-sign-on-for-discourse/13045\\\&quot;\\u003eofficial documentation on Discourse\\u0026#39;s SSO support\\u003c/a\\u003e.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-sso-category/13110\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:7,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:null,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:null,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:27,\&quot;name\&quot;:\&quot;translations\&quot;,\&quot;color\&quot;:\&quot;808281\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;translations\&quot;,\&quot;topic_count\&quot;:214,\&quot;post_count\&quot;:1286,\&quot;position\&quot;:10,\&quot;description\&quot;:\&quot;This category is for discussion about localizing Discourse.\&quot;,\&quot;description_text\&quot;:\&quot;This category is for discussion about localizing Discourse.\&quot;,\&quot;description_excerpt\&quot;:\&quot;This category is for discussion about localizing Discourse.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-translations-category/14549\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:7,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:8,\&quot;name\&quot;:\&quot;hosting\&quot;,\&quot;color\&quot;:\&quot;74CCED\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;hosting\&quot;,\&quot;topic_count\&quot;:352,\&quot;post_count\&quot;:3017,\&quot;position\&quot;:12,\&quot;description\&quot;:\&quot;Topics about hosting Discourse, either on your own servers, in the cloud, or with specific hosting services.\&quot;,\&quot;description_text\&quot;:\&quot;Topics about hosting Discourse, either on your own servers, in the cloud, or with specific hosting services.\&quot;,\&quot;description_excerpt\&quot;:\&quot;Topics about hosting Discourse, either on your own servers, in the cloud, or with specific hosting services.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/category-definition-for-hosting/2626\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:null,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:null,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:null,\&quot;subcategory_list_style\&quot;:\&quot;rows\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:21,\&quot;name\&quot;:\&quot;wordpress\&quot;,\&quot;color\&quot;:\&quot;F9CFCF\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;wordpress\&quot;,\&quot;topic_count\&quot;:491,\&quot;post_count\&quot;:3445,\&quot;position\&quot;:14,\&quot;description\&quot;:\&quot;Support for the official Discourse WordPress plugin at \\u003ca href=\\\&quot;https://github.com/discourse/wp-discourse\\\&quot;\\u003ehttps://github.com/discourse/wp-discourse\\u003c/a\\u003e\&quot;,\&quot;description_text\&quot;:\&quot;Support for the official Discourse WordPress plugin at https:\\u0026#x2F;\\u0026#x2F;github.com\\u0026#x2F;discourse\\u0026#x2F;wp-discourse\&quot;,\&quot;description_excerpt\&quot;:\&quot;Support for the official Discourse WordPress plugin at \\u003ca href=\\\&quot;https://github.com/discourse/wp-discourse\\\&quot;\\u003ehttps://github.com/discourse/wp-discourse\\u003c/a\\u003e\&quot;,\&quot;topic_url\&quot;:\&quot;/t/category-definition-for-wordpress/12282\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:6,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:\&quot;true\&quot;},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:20,\&quot;name\&quot;:\&quot;Lounge\&quot;,\&quot;color\&quot;:\&quot;EEEEEE\&quot;,\&quot;text_color\&quot;:\&quot;652D90\&quot;,\&quot;slug\&quot;:\&quot;lounge\&quot;,\&quot;topic_count\&quot;:78,\&quot;post_count\&quot;:935,\&quot;position\&quot;:15,\&quot;description\&quot;:\&quot;A category exclusive to members with trust level 3 and higher.\&quot;,\&quot;description_text\&quot;:\&quot;A category exclusive to members with trust level 3 and higher.\&quot;,\&quot;description_excerpt\&quot;:\&quot;A category exclusive to members with trust level 3 and higher.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/category-definition-for-lounge/12104\&quot;,\&quot;read_restricted\&quot;:true,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:null,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:null,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:null,\&quot;subcategory_list_style\&quot;:\&quot;rows\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:17,\&quot;name\&quot;:\&quot;Uncategorized\&quot;,\&quot;color\&quot;:\&quot;AB9364\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;uncategorized\&quot;,\&quot;topic_count\&quot;:14,\&quot;post_count\&quot;:362,\&quot;position\&quot;:16,\&quot;description\&quot;:\&quot;Topics that don&#39;t need a category, or don&#39;t fit into any other existing category.\&quot;,\&quot;description_text\&quot;:\&quot;Topics that don&#39;t need a category, or don&#39;t fit into any other existing category.\&quot;,\&quot;description_excerpt\&quot;:\&quot;Topics that don&#39;t need a category, or don&#39;t fit into any other existing category.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:null,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:null,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:null,\&quot;subcategory_list_style\&quot;:\&quot;rows\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:13,\&quot;name\&quot;:\&quot;blog\&quot;,\&quot;color\&quot;:\&quot;ED207B\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;blog\&quot;,\&quot;topic_count\&quot;:86,\&quot;post_count\&quot;:868,\&quot;position\&quot;:17,\&quot;description\&quot;:\&quot;Discussion topics generated from the official Discourse Blog. These topics are linked from the bottom of each blog entry where the blog comments would normally be.\&quot;,\&quot;description_text\&quot;:\&quot;Discussion topics generated from the official Discourse Blog. These topics are linked from the bottom of each blog entry where the blog comments would normally be.\&quot;,\&quot;description_excerpt\&quot;:\&quot;Discussion topics generated from the official Discourse Blog. These topics are linked from the bottom of each blog entry where the blog comments would normally be.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/category-definition-for-blog/5250\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:3,\&quot;notification_level\&quot;:4,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:14,\&quot;name\&quot;:\&quot;marketplace\&quot;,\&quot;color\&quot;:\&quot;8C6238\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;marketplace\&quot;,\&quot;topic_count\&quot;:651,\&quot;post_count\&quot;:3651,\&quot;position\&quot;:18,\&quot;description\&quot;:\&quot;About commercial Discourse related stuff: jobs or paid gigs, plugins, themes, hosting, etc. All soliciting must be in this public category, private solicitations are not permitted here.\&quot;,\&quot;description_text\&quot;:\&quot;About commercial Discourse related stuff: jobs or paid gigs, plugins, themes, hosting, etc. All soliciting must be in this public category, private solicitations are not permitted here.\&quot;,\&quot;description_excerpt\&quot;:\&quot;About commercial Discourse related stuff: jobs or paid gigs, plugins, themes, hosting, etc. All soliciting must be in this public category, private solicitations are not permitted here.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/category-definition-for-marketplace/5425\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;What would you like done?\\n\\nWhen do you need it done?\\n\\nWhat is your budget, in $ USD that you can offer for this task?\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:null,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:null,\&quot;subcategory_list_style\&quot;:\&quot;rows\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:22,\&quot;name\&quot;:\&quot;plugin\&quot;,\&quot;color\&quot;:\&quot;F7941D\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;plugin\&quot;,\&quot;topic_count\&quot;:186,\&quot;post_count\&quot;:7242,\&quot;position\&quot;:19,\&quot;description\&quot;:\&quot;Plugin directory. To post here, use the \\u003ca href=\\\&quot;https://meta.discourse.org/groups/plugin_authors\\\&quot;\\u003e\\u003ckbd\\u003eRequest Access\\u003c/kbd\\u003e button on the group page\\u003c/a\\u003e \\u003cstrong\\u003ewith a link\\u003c/strong\\u003e to your plugin.\&quot;,\&quot;description_text\&quot;:\&quot;Plugin directory. To post here, use the Request Access button on the group page with a link to your plugin.\&quot;,\&quot;description_excerpt\&quot;:\&quot;Plugin directory. To post here, use the \\u003ca href=\\\&quot;https://meta.discourse.org/groups/plugin_authors\\\&quot;\\u003eRequest Access button on the group page\\u003c/a\\u003e with a link to your plugin.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-plugin-category/12648\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:true,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;boxes\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:25,\&quot;name\&quot;:\&quot;staff\&quot;,\&quot;color\&quot;:\&quot;283890\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;staff\&quot;,\&quot;topic_count\&quot;:44,\&quot;post_count\&quot;:252,\&quot;position\&quot;:20,\&quot;description\&quot;:\&quot;Private category for staff discussions. Topics are only visible to admins and moderators.\&quot;,\&quot;description_text\&quot;:\&quot;Private category for staff discussions. Topics are only visible to admins and moderators.\&quot;,\&quot;description_excerpt\&quot;:\&quot;Private category for staff discussions. Topics are only visible to admins and moderators.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-staff-category/13189\&quot;,\&quot;read_restricted\&quot;:true,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:4,\&quot;name\&quot;:\&quot;faq\&quot;,\&quot;color\&quot;:\&quot;3333bb\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;faq\&quot;,\&quot;topic_count\&quot;:72,\&quot;post_count\&quot;:826,\&quot;position\&quot;:21,\&quot;description\&quot;:\&quot;Frequently Asked Questions\&quot;,\&quot;description_text\&quot;:\&quot;Frequently Asked Questions\&quot;,\&quot;description_excerpt\&quot;:\&quot;Frequently Asked Questions\&quot;,\&quot;topic_url\&quot;:\&quot;/t/category-definition-for-faq/25\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:10,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:true,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:{\&quot;id\&quot;:69168,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/1/b/1bede4c05cb08eae4adcd994d7b02042c97864ee.png\&quot;,\&quot;width\&quot;:80,\&quot;height\&quot;:80},\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:30,\&quot;name\&quot;:\&quot;releases\&quot;,\&quot;color\&quot;:\&quot;BF1E2E\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;releases\&quot;,\&quot;topic_count\&quot;:17,\&quot;post_count\&quot;:74,\&quot;position\&quot;:22,\&quot;description\&quot;:\&quot;Outlining each official release of Discourse, and plans for future releases.\&quot;,\&quot;description_text\&quot;:\&quot;Outlining each official release of Discourse, and plans for future releases.\&quot;,\&quot;description_excerpt\&quot;:\&quot;Outlining each official release of Discourse, and plans for future releases.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-releases-category/20857\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;created\&quot;,\&quot;sort_ascending\&quot;:false,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:null,\&quot;subcategory_list_style\&quot;:\&quot;rows\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:31,\&quot;name\&quot;:\&quot;installation\&quot;,\&quot;color\&quot;:\&quot;997E7E\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;installation\&quot;,\&quot;topic_count\&quot;:974,\&quot;post_count\&quot;:7231,\&quot;position\&quot;:24,\&quot;description\&quot;:\&quot;Getting Discourse up and running for the first time, and anything you need for installation.\&quot;,\&quot;description_text\&quot;:\&quot;Getting Discourse up and running for the first time, and anything you need for installation.\&quot;,\&quot;description_excerpt\&quot;:\&quot;Getting Discourse up and running for the first time, and anything you need for installation.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-installation-category/21019\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:null,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:null,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:null,\&quot;subcategory_list_style\&quot;:\&quot;rows\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:\&quot;true\&quot;},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:34,\&quot;name\&quot;:\&quot;broken-plugin\&quot;,\&quot;color\&quot;:\&quot;231F20\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;broken-plugin\&quot;,\&quot;topic_count\&quot;:27,\&quot;post_count\&quot;:735,\&quot;position\&quot;:26,\&quot;description\&quot;:\&quot;Unmaintained and/or broken plugins\&quot;,\&quot;description_text\&quot;:\&quot;Unmaintained and\\u0026#x2F;or broken plugins\&quot;,\&quot;description_excerpt\&quot;:\&quot;Unmaintained and/or broken plugins\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-broken-plugin-category/30009\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:22,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:35,\&quot;name\&quot;:\&quot;praise\&quot;,\&quot;color\&quot;:\&quot;9EB83B\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;praise\&quot;,\&quot;topic_count\&quot;:200,\&quot;post_count\&quot;:759,\&quot;position\&quot;:27,\&quot;description\&quot;:\&quot;Got something nice to say about Discourse?\&quot;,\&quot;description_text\&quot;:\&quot;Got something nice to say about Discourse?\&quot;,\&quot;description_excerpt\&quot;:\&quot;Got something nice to say about Discourse?\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-praise-category/30010\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:4,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:null,\&quot;has_children\&quot;:true,\&quot;sort_order\&quot;:null,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:null,\&quot;subcategory_list_style\&quot;:\&quot;rows\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:53,\&quot;name\&quot;:\&quot;admins\&quot;,\&quot;color\&quot;:\&quot;3333bb\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;admins\&quot;,\&quot;topic_count\&quot;:106,\&quot;post_count\&quot;:1733,\&quot;position\&quot;:29,\&quot;description\&quot;:\&quot;Forum administrator tutorials\&quot;,\&quot;description_text\&quot;:\&quot;Forum administrator tutorials\&quot;,\&quot;description_excerpt\&quot;:\&quot;Forum administrator tutorials\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-admins-category/56207\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:10,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:true,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:{\&quot;id\&quot;:69231,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/7/2/727194c83a8d1b6795333e210390c6cf14543b9c.png\&quot;,\&quot;width\&quot;:80,\&quot;height\&quot;:80},\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:55,\&quot;name\&quot;:\&quot;sysadmin\&quot;,\&quot;color\&quot;:\&quot;3333bb\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;sysadmin\&quot;,\&quot;topic_count\&quot;:70,\&quot;post_count\&quot;:1516,\&quot;position\&quot;:30,\&quot;description\&quot;:\&quot;System administrator tutorials\&quot;,\&quot;description_text\&quot;:\&quot;System administrator tutorials\&quot;,\&quot;description_excerpt\&quot;:\&quot;System administrator tutorials\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-sysadmin-category/56209\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:10,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:true,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:{\&quot;id\&quot;:69232,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/8/5/856c5a7c6a4abd4415a83cd6b8134f1e0d002e2d.png\&quot;,\&quot;width\&quot;:80,\&quot;height\&quot;:80},\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:56,\&quot;name\&quot;:\&quot;developers\&quot;,\&quot;color\&quot;:\&quot;3333bb\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;devs\&quot;,\&quot;topic_count\&quot;:93,\&quot;post_count\&quot;:2239,\&quot;position\&quot;:31,\&quot;description\&quot;:\&quot;Developer tutorials\&quot;,\&quot;description_text\&quot;:\&quot;Developer tutorials\&quot;,\&quot;description_excerpt\&quot;:\&quot;Developer tutorials\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-developers-category/56210\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:10,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:true,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:{\&quot;id\&quot;:69234,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/b/1/b1658608f641b6fbcb1b3e511ec1fdd852e0b43d.png\&quot;,\&quot;width\&quot;:80,\&quot;height\&quot;:80},\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:45,\&quot;name\&quot;:\&quot;tips \\u0026 tricks\&quot;,\&quot;color\&quot;:\&quot;74CCED\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;tips-and-tricks\&quot;,\&quot;topic_count\&quot;:97,\&quot;post_count\&quot;:1281,\&quot;position\&quot;:33,\&quot;description\&quot;:\&quot;CSS tweaks \\u0026amp; JavaScript hacks.  \\u003cstrong\\u003eNot for questions\\u003c/strong\\u003e.\&quot;,\&quot;description_text\&quot;:\&quot;CSS tweaks \\u0026amp; JavaScript hacks.  Not for questions.\&quot;,\&quot;description_excerpt\&quot;:\&quot;CSS tweaks \\u0026amp; JavaScript hacks.  Not for questions.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-tips-tricks-category/37387\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:10,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:true,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:{\&quot;id\&quot;:69233,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/e/2/e284f9b066ca82e6a0eb5a3dfdf6d1a5a56708c3.png\&quot;,\&quot;width\&quot;:80,\&quot;height\&quot;:80},\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:48,\&quot;name\&quot;:\&quot;Summer of Code\&quot;,\&quot;color\&quot;:\&quot;33B0B0\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;soc\&quot;,\&quot;topic_count\&quot;:11,\&quot;post_count\&quot;:129,\&quot;position\&quot;:35,\&quot;description\&quot;:\&quot;This is where we&#39;ll discuss all student projects for this summer. This is a shared communication channel for \\u003ca href=\\\&quot;https://developers.google.com/open-source/gsoc/\\\&quot;\\u003eGSoC\\u003c/a\\u003e participants as well as \\u003ca href=\\\&quot;http://railsgirlssummerofcode.org/\\\&quot;\\u003eRails Girls SoC\\u003c/a\\u003e participants.\&quot;,\&quot;description_text\&quot;:\&quot;This is where we\\u0026#x27;ll discuss all student projects for this summer. This is a shared communication channel for GSoC participants as well as Rails Girls SoC participants.\&quot;,\&quot;description_excerpt\&quot;:\&quot;This is where we\\u0026#39;ll discuss all student projects for this summer. This is a shared communication channel for \\u003ca href=\\\&quot;https://developers.google.com/open-source/gsoc/\\\&quot;\\u003eGSoC\\u003c/a\\u003e participants as well as \\u003ca href=\\\&quot;http://railsgirlssummerofcode.org/\\\&quot;\\u003eRails Girls SoC\\u003c/a\\u003e participants.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-summer-of-code-category/43171\&quot;,\&quot;read_restricted\&quot;:true,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:true,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:58,\&quot;name\&quot;:\&quot;solved\&quot;,\&quot;color\&quot;:\&quot;945811\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;solved\&quot;,\&quot;topic_count\&quot;:91,\&quot;post_count\&quot;:629,\&quot;position\&quot;:36,\&quot;description\&quot;:\&quot;Bugs, Feature requests, support and so on relating to the \\u003ca href=\\\&quot;https://meta.discourse.org/t/discourse-solved-accepted-answer-plugin/30155\\\&quot;\\u003eDiscourse solved plugin\\u003c/a\\u003e.\&quot;,\&quot;description_text\&quot;:\&quot;Bugs, Feature requests, support and so on relating to the Discourse solved plugin.\&quot;,\&quot;description_excerpt\&quot;:\&quot;Bugs, Feature requests, support and so on relating to the \\u003ca href=\\\&quot;https://meta.discourse.org/t/discourse-solved-accepted-answer-plugin/30155\\\&quot;\\u003eDiscourse solved plugin\\u003c/a\\u003e.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-solved-category/58372\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:22,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:59,\&quot;name\&quot;:\&quot;voting\&quot;,\&quot;color\&quot;:\&quot;945811\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;voting\&quot;,\&quot;topic_count\&quot;:82,\&quot;post_count\&quot;:453,\&quot;position\&quot;:37,\&quot;description\&quot;:\&quot;Bugs, Feature requests, support and so on relating to the official \\u003ca href=\\\&quot;https://meta.discourse.org/t/discourse-feature-voting/40121\\\&quot;\\u003eDiscourse feature voting plugin\\u003c/a\\u003e\&quot;,\&quot;description_text\&quot;:\&quot;Bugs, Feature requests, support and so on relating to the official Discourse feature voting plugin\&quot;,\&quot;description_excerpt\&quot;:\&quot;Bugs, Feature requests, support and so on relating to the official \\u003ca href=\\\&quot;https://meta.discourse.org/t/discourse-feature-voting/40121\\\&quot;\\u003eDiscourse feature voting plugin\\u003c/a\\u003e\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-voting-category/58473\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:22,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:\&quot;\&quot;},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:60,\&quot;name\&quot;:\&quot;chat-integration\&quot;,\&quot;color\&quot;:\&quot;945811\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;chat-integration\&quot;,\&quot;topic_count\&quot;:39,\&quot;post_count\&quot;:198,\&quot;position\&quot;:39,\&quot;description\&quot;:\&quot;For discussion regarding the \\u003ca href=\\\&quot;https://meta.discourse.org/t/chatroom-integration-plugin-discourse-chat-integration/66522\\\&quot;\\u003eofficial chat integration plugin\\u003c/a\\u003e\&quot;,\&quot;description_text\&quot;:\&quot;For discussion regarding the official chat integration plugin\&quot;,\&quot;description_excerpt\&quot;:\&quot;For discussion regarding the \\u003ca href=\\\&quot;https://meta.discourse.org/t/chatroom-integration-plugin-discourse-chat-integration/66522\\\&quot;\\u003eofficial chat integration plugin\\u003c/a\\u003e\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-chat-integration-category/60499\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:22,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:61,\&quot;name\&quot;:\&quot;theme\&quot;,\&quot;color\&quot;:\&quot;BF1E2E\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;theme\&quot;,\&quot;topic_count\&quot;:130,\&quot;post_count\&quot;:3564,\&quot;position\&quot;:40,\&quot;description\&quot;:\&quot;Themes are reusable CSS/HTML blocks you can use on your site.\&quot;,\&quot;description_text\&quot;:\&quot;Themes are reusable CSS\\u0026#x2F;HTML blocks you can use on your site.\&quot;,\&quot;description_excerpt\&quot;:\&quot;Themes are reusable CSS/HTML blocks you can use on your site.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-theme-category/60925\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:true,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:1,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[\&quot;theme-component\&quot;,\&quot;theme-full\&quot;,\&quot;theme-scheme\&quot;,\&quot;color-palette\&quot;],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:62,\&quot;name\&quot;:\&quot;SoC 2016 Archive\&quot;,\&quot;color\&quot;:\&quot;AB9364\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;soc-2016-archive\&quot;,\&quot;topic_count\&quot;:11,\&quot;post_count\&quot;:123,\&quot;position\&quot;:41,\&quot;description\&quot;:null,\&quot;description_text\&quot;:null,\&quot;description_excerpt\&quot;:null,\&quot;topic_url\&quot;:\&quot;/t/about-the-soc-2016-archive-category/62449\&quot;,\&quot;read_restricted\&quot;:true,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:48,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:null,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:63,\&quot;name\&quot;:\&quot;comparison\&quot;,\&quot;color\&quot;:\&quot;F1592A\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;comparison\&quot;,\&quot;topic_count\&quot;:7,\&quot;post_count\&quot;:19,\&quot;position\&quot;:42,\&quot;description\&quot;:\&quot;Topics comparing Discourse to other platforms.\&quot;,\&quot;description_text\&quot;:\&quot;Topics comparing Discourse to other platforms.\&quot;,\&quot;description_excerpt\&quot;:\&quot;Topics comparing Discourse to other platforms.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-comparison-category/65736\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:35,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;### About PLATFORM_NAME\\n\\nA blurb about the platform being compared to Discourse. \\n\\nhttp://link.to.website\\n\\n ### Previous discussions:\\n\\nlinks to previous discussions related\\n\\n### Importer status\\n\\nIs there an official Discourse importer? Where is it? \&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:66,\&quot;name\&quot;:\&quot;cmgrs\&quot;,\&quot;color\&quot;:\&quot;3333bb\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;cmgrs\&quot;,\&quot;topic_count\&quot;:2,\&quot;post_count\&quot;:11,\&quot;position\&quot;:44,\&quot;description\&quot;:\&quot;Resources and guides for community managers and builders who want to build successful communities that go the distance.\&quot;,\&quot;description_text\&quot;:\&quot;Resources and guides for community managers and builders who want to build successful communities that go the distance.\&quot;,\&quot;description_excerpt\&quot;:\&quot;Resources and guides for community managers and builders who want to build successful communities that go the distance.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-cmgrs-category/68503\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:10,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:true,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:{\&quot;id\&quot;:110097,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/f/7/f7d070b65b657f1fdf70b21d639f9a5651d0f950.png\&quot;,\&quot;width\&quot;:1024,\&quot;height\&quot;:1024},\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:67,\&quot;name\&quot;:\&quot;announcements\&quot;,\&quot;color\&quot;:\&quot;ED207B\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;announcements\&quot;,\&quot;topic_count\&quot;:113,\&quot;post_count\&quot;:1204,\&quot;position\&quot;:45,\&quot;description\&quot;:\&quot;For completed features, currently or soon to be run in production.\&quot;,\&quot;description_text\&quot;:\&quot;For completed features, currently or soon to be run in production.\&quot;,\&quot;description_excerpt\&quot;:\&quot;For completed features, currently or soon to be run in production.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-announcements-category/68629\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:2,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:true,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:68,\&quot;name\&quot;:\&quot;Outreachy\&quot;,\&quot;color\&quot;:\&quot;AB9364\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;outreachy\&quot;,\&quot;topic_count\&quot;:5,\&quot;post_count\&quot;:133,\&quot;position\&quot;:46,\&quot;description\&quot;:\&quot;Category for \\u003ca class=\\\&quot;mention\\\&quot; href=\\\&quot;/u/misaka4e21\\\&quot;\\u003e@misaka4e21\\u003c/a\\u003e our Outreachy intern!\&quot;,\&quot;description_text\&quot;:\&quot;Category for @misaka4e21 our Outreachy intern!\&quot;,\&quot;description_excerpt\&quot;:\&quot;Category for \\u003ca class=\\\&quot;mention\\\&quot; href=\\\&quot;/u/misaka4e21\\\&quot;\\u003e@misaka4e21\\u003c/a\\u003e our Outreachy intern!\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-outreachy-category/74983\&quot;,\&quot;read_restricted\&quot;:true,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:69,\&quot;name\&quot;:\&quot;ford\&quot;,\&quot;color\&quot;:\&quot;F9CFCF\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;ford\&quot;,\&quot;topic_count\&quot;:107,\&quot;post_count\&quot;:1448,\&quot;position\&quot;:47,\&quot;description\&quot;:\&quot;Support category for ford\&quot;,\&quot;description_text\&quot;:\&quot;Support category for ford\&quot;,\&quot;description_excerpt\&quot;:\&quot;Support category for ford\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-ford-category/75061\&quot;,\&quot;read_restricted\&quot;:true,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:83,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:\&quot;true\&quot;},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:73,\&quot;name\&quot;:\&quot;patreon\&quot;,\&quot;color\&quot;:\&quot;945811\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;patreon\&quot;,\&quot;topic_count\&quot;:31,\&quot;post_count\&quot;:183,\&quot;position\&quot;:50,\&quot;description\&quot;:\&quot;For discussion regarding the official Discourse \\u003ca href=\\\&quot;https://meta.discourse.org/t/discourse-patreon-integration/44366\\\&quot;\\u003ePatreon integration\\u003c/a\\u003e.\&quot;,\&quot;description_text\&quot;:\&quot;For discussion regarding the official Discourse Patreon integration.\&quot;,\&quot;description_excerpt\&quot;:\&quot;For discussion regarding the official Discourse \\u003ca href=\\\&quot;https://meta.discourse.org/t/discourse-patreon-integration/44366\\\&quot;\\u003ePatreon integration\\u003c/a\\u003e.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-patreon-category/90595\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:22,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:74,\&quot;name\&quot;:\&quot;oauth2-basic\&quot;,\&quot;color\&quot;:\&quot;945811\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;oauth2-basic\&quot;,\&quot;topic_count\&quot;:16,\&quot;post_count\&quot;:103,\&quot;position\&quot;:51,\&quot;description\&quot;:\&quot;Discussion for \\u003ca href=\\\&quot;https://meta.discourse.org/t/oauth2-basic-support/33879\\\&quot;\\u003eOAuth2 Basic Support\\u003c/a\\u003e\&quot;,\&quot;description_text\&quot;:\&quot;Discussion for OAuth2 Basic Support\&quot;,\&quot;description_excerpt\&quot;:\&quot;Discussion for \\u003ca href=\\\&quot;https://meta.discourse.org/t/oauth2-basic-support/33879\\\&quot;\\u003eOAuth2 Basic Support\\u003c/a\\u003e\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-oauth2-basic-category/90601\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:22,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:90,\&quot;name\&quot;:\&quot;redhat\&quot;,\&quot;color\&quot;:\&quot;F9CFCF\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;redhat\&quot;,\&quot;topic_count\&quot;:20,\&quot;post_count\&quot;:141,\&quot;position\&quot;:52,\&quot;description\&quot;:\&quot;A private support category for discussions about Red Hat’s consultancy projects.\&quot;,\&quot;description_text\&quot;:\&quot;A private support category for discussions about Red Hat’s consultancy projects.\&quot;,\&quot;description_excerpt\&quot;:\&quot;A private support category for discussions about Red Hat’s consultancy projects.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-redhat-category/132687\&quot;,\&quot;read_restricted\&quot;:true,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:83,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[\&quot;status tags\&quot;],\&quot;allow_global_tags\&quot;:true,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:83,\&quot;name\&quot;:\&quot;Enterprise Support\&quot;,\&quot;color\&quot;:\&quot;CEA9A9\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;enterprise-support\&quot;,\&quot;topic_count\&quot;:0,\&quot;post_count\&quot;:0,\&quot;position\&quot;:53,\&quot;description\&quot;:\&quot;Private Support Categories for our customers.\&quot;,\&quot;description_text\&quot;:\&quot;Private Support Categories for our customers.\&quot;,\&quot;description_excerpt\&quot;:\&quot;Private Support Categories for our customers.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-enterprise-support-category/101861\&quot;,\&quot;read_restricted\&quot;:true,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:true,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:87,\&quot;name\&quot;:\&quot;amazon\&quot;,\&quot;color\&quot;:\&quot;F9CFCF\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;amazon\&quot;,\&quot;topic_count\&quot;:53,\&quot;post_count\&quot;:893,\&quot;position\&quot;:54,\&quot;description\&quot;:\&quot;A private support category for Amazon Games (currently New World and Lumberyard).\&quot;,\&quot;description_text\&quot;:\&quot;A private support category for Amazon Games (currently New World and Lumberyard).\&quot;,\&quot;description_excerpt\&quot;:\&quot;A private support category for Amazon Games (currently New World and Lumberyard).\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-amazon-category/116320\&quot;,\&quot;read_restricted\&quot;:true,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:83,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quoquot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:\&quot;true\&quot;},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:88,\&quot;name\&quot;:\&quot;global communities\&quot;,\&quot;color\&quot;:\&quot;F9CFCF\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;global-communities\&quot;,\&quot;topic_count\&quot;:100,\&quot;post_count\&quot;:2841,\&quot;position\&quot;:55,\&quot;description\&quot;:\&quot;A private support category for members of the Amazon Global Communities project.\&quot;,\&quot;description_text\&quot;:\&quot;A private support category for members of the Amazon Global Communities project.\&quot;,\&quot;description_excerpt\&quot;:\&quot;A private support category for members of the Amazon Global Communities project.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-global-communities-category/121554\&quot;,\&quot;read_restricted\&quot;:true,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:83,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:\&quot;false\&quot;},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[\&quot;status tags\&quot;],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:75,\&quot;name\&quot;:\&quot;data-explorer\&quot;,\&quot;color\&quot;:\&quot;945811\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;data-explorer\&quot;,\&quot;topic_count\&quot;:25,\&quot;post_count\&quot;:141,\&quot;position\&quot;:56,\&quot;description\&quot;:\&quot;Discussion for \\u003ca href=\\\&quot;https://meta.discourse.org/t/data-explorer-plugin/32566\\\&quot;\\u003eData Explorer Plugin\\u003c/a\\u003e\&quot;,\&quot;description_text\&quot;:\&quot;Discussion for Data Explorer Plugin\&quot;,\&quot;description_excerpt\&quot;:\&quot;Discussion for \\u003ca href=\\\&quot;https://meta.discourse.org/t/data-explorer-plugin/32566\\\&quot;\\u003eData Explorer Plugin\\u003c/a\\u003e\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-data-explorer-category/90611\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:22,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:89,\&quot;name\&quot;:\&quot;warner\&quot;,\&quot;color\&quot;:\&quot;F9CFCF\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;warner\&quot;,\&quot;topic_count\&quot;:104,\&quot;post_count\&quot;:1495,\&quot;position\&quot;:56,\&quot;description\&quot;:\&quot;A private support category for members of the Warner Brothers / DC Universe project.\&quot;,\&quot;description_text\&quot;:\&quot;A private support category for members of the Warner Brothers \\u0026#x2F; DC Universe project.\&quot;,\&quot;description_excerpt\&quot;:\&quot;A private support category for members of the Warner Brothers / DC Universe project.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-warner-category/122595\&quot;,\&quot;read_restricted\&quot;:true,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:83,\&quot;notification_level\&quot;:2,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:76,\&quot;name\&quot;:\&quot;user-notes\&quot;,\&quot;color\&quot;:\&quot;945811\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;staff-notes\&quot;,\&quot;topic_count\&quot;:7,\&quot;post_count\&quot;:46,\&quot;position\&quot;:57,\&quot;description\&quot;:\&quot;Discussion for \\u003ca href=\\\&quot;https://meta.discourse.org/t/user-notes-plugin/41026\\\&quot; class=\\\&quot;inline-onebox-loading\\\&quot;\\u003ehttps://meta.discourse.org/t/user-notes-plugin/41026\\u003c/a\\u003e\&quot;,\&quot;description_text\&quot;:\&quot;Discussion for https:\\u0026#x2F;\\u0026#x2F;meta.discourse.org\\u0026#x2F;t\\u0026#x2F;user-notes-plugin\\u0026#x2F;41026\&quot;,\&quot;description_excerpt\&quot;:\&quot;Discussion for \\u003ca href=\\\&quot;https://meta.discourse.org/t/user-notes-plugin/41026\\\&quot; class=\\\&quot;inline-onebox-loading\\\&quot;\\u003ehttps://meta.discourse.org/t/user-notes-plugin/41026\\u003c/a\\u003e\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-user-notes-category/90620\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:22,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:77,\&quot;name\&quot;:\&quot;advertising\&quot;,\&quot;color\&quot;:\&quot;945811\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;advertising\&quot;,\&quot;topic_count\&quot;:50,\&quot;post_count\&quot;:503,\&quot;position\&quot;:58,\&quot;description\&quot;:\&quot;Discussion for the \\u003ca href=\\\&quot;https://meta.discourse.org/t/advertising-plugin-for-discourse-serve-ads-on-your-discourse-forum/33734\\\&quot;\\u003eadvertising plugin\\u003c/a\\u003e. Note that YOU MUST DISABLE ADBLOCK to see advertising configuration or features!\&quot;,\&quot;description_text\&quot;:\&quot;Discussion for the advertising plugin. Note that YOU MUST DISABLE ADBLOCK to see advertising configuration or features!\&quot;,\&quot;description_excerpt\&quot;:\&quot;Discussion for the \\u003ca href=\\\&quot;https://meta.discourse.org/t/advertising-plugin-for-discourse-serve-ads-on-your-discourse-forum/33734\\\&quot;\\u003eadvertising plugin\\u003c/a\\u003e. Note that YOU MUST DISABLE ADBLOCK to see advertising configuration or features!\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-advertising-category/90629\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:22,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:78,\&quot;name\&quot;:\&quot;translator\&quot;,\&quot;color\&quot;:\&quot;945811\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;translator\&quot;,\&quot;topic_count\&quot;:15,\&quot;post_count\&quot;:77,\&quot;position\&quot;:59,\&quot;description\&quot;:\&quot;Discussion for \\u003ca href=\\\&quot;https://meta.discourse.org/t/discourse-translator/32630\\\&quot;\\u003eDiscourse-Translator++\\u003c/a\\u003e\&quot;,\&quot;description_text\&quot;:\&quot;Discussion for Discourse-Translator++\&quot;,\&quot;description_excerpt\&quot;:\&quot;Discussion for \\u003ca href=\\\&quot;https://meta.discourse.org/t/discourse-translator/32630\\\&quot;\\u003eDiscourse-Translator++\\u003c/a\\u003e\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-translator-category/90631\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:22,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:82,\&quot;name\&quot;:\&quot;broken-theme\&quot;,\&quot;color\&quot;:\&quot;231F20\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;broken-theme\&quot;,\&quot;topic_count\&quot;:4,\&quot;post_count\&quot;:48,\&quot;position\&quot;:62,\&quot;description\&quot;:\&quot;Unmaintained and/or broken themes\&quot;,\&quot;description_text\&quot;:\&quot;Unmaintained and\\u0026#x2F;or broken themes\&quot;,\&quot;description_excerpt\&quot;:\&quot;Unmaintained and/or broken themes\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-broken-theme-category/98538\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:61,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:84,\&quot;name\&quot;:\&quot;assign\&quot;,\&quot;color\&quot;:\&quot;945811\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;assign\&quot;,\&quot;topic_count\&quot;:26,\&quot;post_count\&quot;:136,\&quot;position\&quot;:63,\&quot;description\&quot;:\&quot;Discussion for \\u003ca href=\\\&quot;https://meta.discourse.org/t/discourse-assign/58044\\\&quot; class=\\\&quot;inline-onebox\\\&quot;\\u003eDiscourse Assign\\u003c/a\\u003e\&quot;,\&quot;description_text\&quot;:\&quot;Discussion for Discourse Assign\&quot;,\&quot;description_excerpt\&quot;:\&quot;Discussion for \\u003ca href=\\\&quot;https://meta.discourse.org/t/discourse-assign/58044\\\&quot; class=\\\&quot;inline-onebox\\\&quot;\\u003eDiscourse Assign\\u003c/a\\u003e\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-assign-category/103409\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:22,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null}],\&quot;trust_levels\&quot;:[{\&quot;id\&quot;:0,\&quot;name\&quot;:\&quot;new user\&quot;},{\&quot;id\&quot;:1,\&quot;name\&quot;:\&quot;basic user\&quot;},{\&quot;id\&quot;:2,\&quot;name\&quot;:\&quot;member\&quot;},{\&quot;id\&quot;:3,\&quot;name\&quot;:\&quot;regular\&quot;},{\&quot;id\&quot;:4,\&quot;name\&quot;:\&quot;leader\&quot;}],\&quot;archetypes\&quot;:[{\&quot;id\&quot;:\&quot;regular\&quot;,\&quot;name\&quot;:\&quot;Regular Topic\&quot;,\&quot;options\&quot;:[]},{\&quot;id\&quot;:\&quot;banner\&quot;,\&quot;name\&quot;:\&quot;Banner Topic\&quot;,\&quot;options\&quot;:[]}],\&quot;user_fields\&quot;:[],\&quot;auth_providers\&quot;:[{\&quot;name\&quot;:\&quot;facebook\&quot;,\&quot;custom_url\&quot;:null,\&quot;pretty_name_override\&quot;:null,\&quot;title_override\&quot;:null,\&quot;message_override\&quot;:null,\&quot;frame_width\&quot;:580,\&quot;frame_height\&quot;:400,\&quot;can_connect\&quot;:true,\&quot;can_revoke\&quot;:true,\&quot;icon\&quot;:\&quot;fab-facebook\&quot;},{\&quot;name\&quot;:\&quot;google_oauth2\&quot;,\&quot;custom_url\&quot;:null,\&quot;pretty_name_override\&quot;:null,\&quot;title_override\&quot;:null,\&quot;message_override\&quot;:null,\&quot;frame_width\&quot;:850,\&quot;frame_height\&quot;:500,\&quot;can_connect\&quot;:true,\&quot;can_revoke\&quot;:true,\&quot;icon\&quot;:null},{\&quot;name\&quot;:\&quot;github\&quot;,\&quot;custom_url\&quot;:null,\&quot;pretty_name_override\&quot;:null,\&quot;title_override\&quot;:null,\&quot;message_override\&quot;:null,\&quot;frame_width\&quot;:null,\&quot;frame_height\&quot;:null,\&quot;can_connect\&quot;:true,\&quot;can_revoke\&quot;:true,\&quot;icon\&quot;:\&quot;fab-github\&quot;},{\&quot;name\&quot;:\&quot;twitter\&quot;,\&quot;custom_url\&quot;:null,\&quot;pretty_name_override\&quot;:null,\&quot;title_override\&quot;:null,\&quot;message_override\&quot;:null,\&quot;frame_width\&quot;:null,\&quot;frame_height\&quot;:null,\&quot;can_connect\&quot;:true,\&quot;can_revoke\&quot;:true,\&quot;icon\&quot;:\&quot;fab-twitter\&quot;},{\&quot;name\&quot;:\&quot;discord\&quot;,\&quot;custom_url\&quot;:null,\&quot;pretty_name_override\&quot;:null,\&quot;title_override\&quot;:null,\&quot;message_override\&quot;:null,\&quot;frame_width\&quot;:null,\&quot;frame_height\&quot;:null,\&quot;can_connect\&quot;:true,\&quot;can_revoke\&quot;:true,\&quot;icon\&quot;:\&quot;fab-discord\&quot;}]}&quot;,&quot;siteSettings&quot;:&quot;{\&quot;default_locale\&quot;:\&quot;en_US\&quot;,\&quot;title\&quot;:\&quot;Discourse Meta\&quot;,\&quot;short_site_description\&quot;:\&quot;The Official Support Forum for Discourse\&quot;,\&quot;contact_email\&quot;:\&quot;team@discourse.org\&quot;,\&quot;contact_url\&quot;:\&quot;\&quot;,\&quot;logo\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/1/0/101f03af29f12ea30e1226eb96a02c3ed2f6d2ef.png\&quot;,\&quot;logo_small\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/b/3/b33be9538df3547fcf9d1a51a4637d77392ac6f9.png\&quot;,\&quot;digest_logo\&quot;:\&quot;\&quot;,\&quot;mobile_logo\&quot;:\&quot;\&quot;,\&quot;large_icon\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/e/c/ecc92a52ee7353e03d5c0d1ea6521ce4541d9c25.png\&quot;,\&quot;favicon\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/b/3/b33be9538df3547fcf9d1a51a4637d77392ac6f9.png\&quot;,\&quot;apple_touch_icon\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/a/c/ac166452701ce353fa6c8865e99879e8cacfb960.png\&quot;,\&quot;allow_user_locale\&quot;:true,\&quot;support_mixed_text_direction\&quot;:false,\&quot;suggested_topics\&quot;:7,\&quot;ga_universal_tracking_code\&quot;:\&quot;UA-33736483-2\&quot;,\&quot;ga_universal_domain_name\&quot;:\&quot;auto\&quot;,\&quot;gtm_container_id\&quot;:\&quot;\&quot;,\&quot;top_menu\&quot;:\&quot;latest|new|unread|top|categories\&quot;,\&quot;post_menu\&quot;:\&quot;read|like|share|flag|edit|bookmark|delete|admin|reply\&quot;,\&quot;post_menu_hidden_items\&quot;:\&quot;bookmark|edit|wiki|delete|admin|flag\&quot;,\&quot;share_links\&quot;:\&quot;twitter|facebook|email\&quot;,\&quot;desktop_category_page_style\&quot;:\&quot;categories_with_featured_topics\&quot;,\&quot;category_colors\&quot;:\&quot;BF1E2E|F1592A|F7941D|9EB83B|3AB54A|12A89D|25AAE2|0E76BD|652D90|92278F|ED207B|8C6238|808281|B3B5B4|283890|292929\&quot;,\&quot;category_style\&quot;:\&quot;bullet\&quot;,\&quot;max_category_nesting\&quot;:2,\&quot;enable_mobile_theme\&quot;:true,\&quot;relative_date_duration\&quot;:30,\&quot;fixed_category_positions\&quot;:false,\&quot;fixed_category_positions_on_create\&quot;:false,\&quot;enable_badges\&quot;:true,\&quot;enable_badge_sql\&quot;:true,\&quot;enable_whispers\&quot;:true,\&quot;enable_bookmarks_with_reminders\&quot;:false,\&quot;push_notifications_prompt\&quot;:true,\&quot;vapid_public_key_bytes\&quot;:\&quot;4|20|187|211|120|43|61|57|61|175|187|22|50|207|91|186|68|202|249|1|237|47|31|138|154|38|205|111|252|115|183|106|169|29|43|41|241|222|212|253|1|217|21|23|210|43|194|128|114|32|220|80|150|235|173|164|199|168|105|191|139|90|186|253|199\&quot;,\&quot;invite_only\&quot;:false,\&quot;login_required\&quot;:false,\&quot;must_approve_users\&quot;:false,\&quot;enable_local_logins\&quot;:true,\&quot;enable_local_logins_via_email\&quot;:true,\&quot;allow_new_registrations\&quot;:true,\&quot;enable_signup_cta\&quot;:true,\&quot;enable_sso\&quot;:false,\&quot;sso_overrides_email\&quot;:false,\&quot;sso_overrides_avatar\&quot;:false,\&quot;min_username_length\&quot;:3,\&quot;max_username_length\&quot;:20,\&quot;unicode_usernames\&quot;:true,\&quot;min_password_length\&quot;:10,\&quot;min_admin_password_length\&quot;:15,\&quot;logout_redirect\&quot;:\&quot;\&quot;,\&quot;full_name_required\&quot;:false,\&quot;enable_names\&quot;:true,\&quot;invites_per_page\&quot;:40,\&quot;delete_user_max_post_age\&quot;:365,\&quot;delete_all_posts_max\&quot;:15,\&quot;prioritize_username_in_ux\&quot;:false,\&quot;enable_user_directory\&quot;:true,\&quot;allow_anonymous_posting\&quot;:false,\&quot;anonymous_posting_min_trust_level\&quot;:4,\&quot;hide_user_profiles_from_public\&quot;:false,\&quot;allow_featured_topic_on_user_profiles\&quot;:true,\&quot;hide_suspension_reasons\&quot;:false,\&quot;ignored_users_count_message_threshold\&quot;:5,\&quot;ignored_users_message_gap_days\&quot;:365,\&quot;user_selected_primary_groups\&quot;:false,\&quot;enable_group_directory\&quot;:true,\&quot;enable_category_group_review\&quot;:true,\&quot;min_post_length\&quot;:20,\&quot;min_first_post_length\&quot;:20,\&quot;min_personal_message_post_length\&quot;:10,\&quot;max_post_length\&quot;:85000,\&quot;topic_featured_link_enabled\&quot;:true,\&quot;min_topic_title_length\&quot;:15,\&quot;max_topic_title_length\&quot;:140,\&quot;min_personal_message_title_length\&quot;:2,\&quot;allow_uncategorized_topics\&quot;:true,\&quot;min_title_similar_length\&quot;:10,\&quot;enable_personal_messages\&quot;:true,\&quot;enable_personal_email_messages\&quot;:false,\&quot;edit_history_visible_to_public\&quot;:true,\&quot;delete_removed_posts_after\&quot;:24,\&quot;traditional_markdown_linebreaks\&quot;:false,\&quot;enable_markdown_typographer\&quot;:true,\&quot;enable_markdown_linkify\&quot;:true,\&quot;markdown_linkify_tlds\&quot;:\&quot;com|net|org|co|tv|ru|cn|us|uk|me|de|fr|fi|gov|io\&quot;,\&quot;markdown_typographer_quotation_marks\&quot;:\&quot;“|”|‘|’\&quot;,\&quot;enable_rich_text_paste\&quot;:true,\&quot;suppress_reply_directly_below\&quot;:true,\&quot;suppress_reply_directly_above\&quot;:true,\&quot;max_reply_history\&quot;:1,\&quot;enable_mentions\&quot;:true,\&quot;newuser_max_images\&quot;:1,\&quot;newuser_max_attachments\&quot;:0,\&quot;show_pinned_excerpt_mobile\&quot;:true,\&quot;show_pinned_excerpt_desktop\&quot;:true,\&quot;display_name_on_posts\&quot;:true,\&quot;show_time_gap_days\&quot;:7,\&quot;short_progress_text_threshold\&quot;:10000,\&quot;default_code_lang\&quot;:\&quot;text\&quot;,\&quot;autohighlight_all_code\&quot;:false,\&quot;highlighted_languages\&quot;:\&quot;apache|bash|cs|cpp|css|coffeescript|diff|xml|http|ini|json|java|javascript|makefile|markdown|nginx|objectivec|ruby|perl|php|python|sql|handlebars|scss|js|c++|yaml|xquery\&quot;,\&quot;enable_emoji\&quot;:true,\&quot;enable_emoji_shortcuts\&quot;:true,\&quot;emoji_set\&quot;:\&quot;twitter\&quot;,\&quot;emoji_autocomplete_min_chars\&quot;:0,\&quot;enable_inline_emoji_translation\&quot;:false,\&quot;code_formatting_style\&quot;:\&quot;4-spaces-indent\&quot;,\&quot;allowed_href_schemes\&quot;:\&quot;steam|keybase\&quot;,\&quot;watched_words_regular_expressions\&quot;:false,\&quot;enable_advanced_editor_preview_sync\&quot;:false,\&quot;old_post_notice_days\&quot;:5,\&quot;email_time_window_mins\&quot;:10,\&quot;disable_digest_emails\&quot;:false,\&quot;email_in\&quot;:true,\&quot;disable_emails\&quot;:\&quot;no\&quot;,\&quot;bounce_score_threshold\&quot;:4,\&quot;max_image_size_kb\&quot;:4096,\&quot;max_attachment_size_kb\&quot;:10000,\&quot;authorized_extensions\&quot;:\&quot;jpg|jpeg|png|gif|pdf|csv|gz|json|svg|mp4|txt|docx|mov|tex|zip|webm\&quot;,\&quot;authorized_extensions_for_staff\&quot;:\&quot;\&quot;,\&quot;max_image_width\&quot;:690,\&quot;max_image_height\&quot;:500,\&quot;prevent_anons_from_downloading_files\&quot;:false,\&quot;secure_media\&quot;:false,\&quot;enable_s3_uploads\&quot;:false,\&quot;allow_profile_backgrounds\&quot;:true,\&quot;allow_uploaded_avatars\&quot;:true,\&quot;allow_animated_avatars\&quot;:false,\&quot;default_avatars\&quot;:\&quot;\&quot;,\&quot;external_system_avatars_enabled\&quot;:true,\&quot;external_system_avatars_url\&quot;:\&quot;https://avatars.discourse.org/v4/letter/{first_letter}/{color}/{size}.png\&quot;,\&quot;selectable_avatars_enabled\&quot;:false,\&quot;allow_staff_to_upload_any_file_in_pm\&quot;:true,\&quot;simultaneous_uploads\&quot;:5,\&quot;tl1_requires_read_posts\&quot;:30,\&quot;tl3_links_no_follow\&quot;:false,\&quot;enforce_second_factor\&quot;:\&quot;staff\&quot;,\&quot;moderators_view_emails\&quot;:false,\&quot;use_admin_ip_allowlist\&quot;:false,\&quot;allowed_iframes\&quot;:\&quot;https://www.google.com/maps/embed?|https://www.openstreetmap.org/export/embed.html?|https://calendar.google.com/calendar/embed?|https://codepen.io|https://player.vimeo.com/video/|https://runkit.com/\&quot;,\&quot;max_oneboxes_per_post\&quot;:50,\&quot;reviewable_claiming\&quot;:\&quot;disabled\&quot;,\&quot;reviewable_default_topics\&quot;:false,\&quot;reviewable_default_visibility\&quot;:\&quot;low\&quot;,\&quot;alert_admins_if_errors_per_minute\&quot;:100,\&quot;alert_admins_if_errors_per_hour\&quot;:500,\&quot;max_prints_per_hour_per_user\&quot;:5,\&quot;enable_long_polling\&quot;:true,\&quot;long_polling_base_url\&quot;:\&quot;/\&quot;,\&quot;background_polling_interval\&quot;:60000,\&quot;polling_interval\&quot;:3000,\&quot;anon_polling_interval\&quot;:30000,\&quot;flush_timings_secs\&quot;:60,\&quot;verbose_localization\&quot;:false,\&quot;max_new_topics\&quot;:500,\&quot;enable_safe_mode\&quot;:true,\&quot;tos_url\&quot;:\&quot;\&quot;,\&quot;privacy_policy_url\&quot;:\&quot;https://www.discourse.org/privacy\&quot;,\&quot;faq_url\&quot;:\&quot;\&quot;,\&quot;enable_backups\&quot;:true,\&quot;backup_location\&quot;:\&quot;s3\&quot;,\&quot;maximum_backups\&quot;:3,\&quot;min_search_term_length\&quot;:3,\&quot;log_search_queries\&quot;:true,\&quot;version_checks\&quot;:false,\&quot;suppress_uncategorized_badge\&quot;:true,\&quot;header_dropdown_category_count\&quot;:12,\&quot;slug_generation_method\&quot;:\&quot;ascii\&quot;,\&quot;topic_views_heat_low\&quot;:1000,\&quot;topic_views_heat_medium\&quot;:2000,\&quot;topic_views_heat_high\&quot;:3500,\&quot;topic_post_like_heat_low\&quot;:1.73,\&quot;topic_post_like_heat_medium\&quot;:2.53,\&quot;topic_post_like_heat_high\&quot;:3.67,\&quot;history_hours_low\&quot;:12,\&quot;history_hours_medium\&quot;:24,\&quot;history_hours_high\&quot;:48,\&quot;cold_age_days_low\&quot;:14,\&quot;cold_age_days_medium\&quot;:90,\&quot;cold_age_days_high\&quot;:180,\&quot;global_notice\&quot;:\&quot;\&quot;,\&quot;show_create_topics_notice\&quot;:true,\&quot;bootstrap_mode_min_users\&quot;:50,\&quot;bootstrap_mode_enabled\&quot;:false,\&quot;automatically_unpin_topics\&quot;:true,\&quot;read_time_word_count\&quot;:500,\&quot;topic_page_title_includes_category\&quot;:true,\&quot;svg_icon_subset\&quot;:\&quot;\&quot;,\&quot;enable_new_user_card_route\&quot;:true,\&quot;disable_mailing_list_mode\&quot;:false,\&quot;default_topics_automatic_unpin\&quot;:true,\&quot;mute_all_categories_by_default\&quot;:false,\&quot;tagging_enabled\&quot;:true,\&quot;tag_style\&quot;:\&quot;simple\&quot;,\&quot;max_tags_per_topic\&quot;:5,\&quot;max_tag_length\&quot;:20,\&quot;min_trust_level_to_tag_topics\&quot;:\&quot;3\&quot;,\&quot;max_tag_search_results\&quot;:5,\&quot;show_filter_by_tag\&quot;:true,\&quot;max_tags_in_filter_list\&quot;:30,\&quot;tags_sort_alphabetically\&quot;:false,\&quot;tags_listed_by_group\&quot;:false,\&quot;suppress_overlapping_tags_in_list\&quot;:false,\&quot;remove_muted_tags_from_latest\&quot;:\&quot;always\&quot;,\&quot;force_lowercase_tags\&quot;:true,\&quot;dashboard_general_tab_activity_metrics\&quot;:\&quot;page_view_total_reqs|visits|time_to_first_response|likes|flags|user_to_user_private_messages_with_replies\&quot;,\&quot;cakeday_enabled\&quot;:true,\&quot;cakeday_emoji\&quot;:\&quot;cake\&quot;,\&quot;cakeday_birthday_enabled\&quot;:true,\&quot;cakeday_birthday_emoji\&quot;:\&quot;birthday\&quot;,\&quot;patreon_enabled\&quot;:false,\&quot;patreon_login_enabled\&quot;:false,\&quot;patreon_donation_prompt_enabled\&quot;:false,\&quot;patreon_donation_prompt_show_after_topics\&quot;:20,\&quot;patreon_donation_prompt_campaign_url\&quot;:\&quot;\&quot;,\&quot;discourse_internet_explorer_deprecation_warning\&quot;:true,\&quot;affiliate_enabled\&quot;:true,\&quot;affiliate_amazon_ca\&quot;:\&quot;\&quot;,\&quot;affiliate_amazon_cn\&quot;:\&quot;\&quot;,\&quot;affiliate_amazon_co_jp\&quot;:\&quot;\&quot;,\&quot;affiliate_amazon_co_uk\&quot;:\&quot;\&quot;,\&quot;affiliate_amazon_com\&quot;:\&quot;\&quot;,\&quot;affiliate_amazon_com_au\&quot;:\&quot;\&quot;,\&quot;affiliate_amazon_com_br\&quot;:\&quot;\&quot;,\&quot;affiliate_amazon_com_mx\&quot;:\&quot;\&quot;,\&quot;affiliate_amazon_de\&quot;:\&quot;\&quot;,\&quot;affiliate_amazon_es\&quot;:\&quot;\&quot;,\&quot;affiliate_amazon_fr\&quot;:\&quot;\&quot;,\&quot;affiliate_amazon_in\&quot;:\&quot;\&quot;,\&quot;affiliate_amazon_it\&quot;:\&quot;\&quot;,\&quot;affiliate_amazon_nl\&quot;:\&quot;\&quot;,\&quot;affiliate_ldlc_com\&quot;:\&quot;\&quot;,\&quot;checklist_enabled\&quot;:true,\&quot;data_explorer_enabled\&quot;:true,\&quot;discourse_local_dates_email_format\&quot;:\&quot;YYYY-MM-DDTHH:mm:ss[Z]\&quot;,\&quot;discourse_local_dates_enabled\&quot;:true,\&quot;discourse_local_dates_default_formats\&quot;:\&quot;LLL|LTS|LL|LLLL\&quot;,\&quot;discourse_local_dates_default_timezones\&quot;:\&quot;Europe/Paris|America/Los_Angeles\&quot;,\&quot;assign_enabled\&quot;:true,\&quot;assigns_user_url_path\&quot;:\&quot;/latest?assigned={username}\u0026status=open\&quot;,\&quot;remind_assigns_frequency\&quot;:43200,\&quot;max_assigned_topics\&quot;:20,\&quot;assign_allowed_on_groups\&quot;:\&quot;3\&quot;,\&quot;details_enabled\&quot;:true,\&quot;desktop_push_notifications_enabled\&quot;:true,\&quot;discourse_narrative_bot_enabled\&quot;:true,\&quot;spoiler_enabled\&quot;:true,\&quot;knowledge_explorer_enabled\&quot;:true,\&quot;knowledge_explorer_categories\&quot;:\&quot;10|55|53|56|66|45|4\&quot;,\&quot;knowledge_explorer_tags\&quot;:\&quot;\&quot;,\&quot;voting_enabled\&quot;:true,\&quot;voting_show_who_voted\&quot;:true,\&quot;voting_show_votes_on_profile\&quot;:true,\&quot;no_ads_for_personal_messages\&quot;:true,\&quot;no_ads_for_restricted_categories\&quot;:true,\&quot;no_ads_for_groups\&quot;:\&quot;\&quot;,\&quot;no_ads_for_categories\&quot;:\&quot;30|67\&quot;,\&quot;no_ads_for_tags\&quot;:\&quot;standard|business|enterprise|trial|free|enterprise-lead|job-application\&quot;,\&quot;house_ads_after_nth_post\&quot;:10,\&quot;house_ads_frequency\&quot;:100,\&quot;adsense_publisher_code\&quot;:\&quot;\&quot;,\&quot;adsense_through_trust_level\&quot;:2,\&quot;adsense_topic_list_top_code\&quot;:\&quot;\&quot;,\&quot;adsense_topic_list_top_ad_sizes\&quot;:\&quot;728*90 - leaderboard\&quot;,\&quot;adsense_mobile_topic_list_top_code\&quot;:\&quot;\&quot;,\&quot;adsense_mobile_topic_list_top_ad_size\&quot;:\&quot;responsive\&quot;,\&quot;adsense_topic_above_post_stream_code\&quot;:\&quot;\&quot;,\&quot;adsense_topic_above_post_stream_ad_sizes\&quot;:\&quot;728*90 - leaderboard\&quot;,\&quot;adsense_mobile_topic_above_post_stream_code\&quot;:\&quot;\&quot;,\&quot;adsense_mobile_topic_above_post_stream_ad_size\&quot;:\&quot;responsive\&quot;,\&quot;adsense_topic_above_suggested_code\&quot;:\&quot;\&quot;,\&quot;adsense_topic_above_suggested_ad_sizes\&quot;:\&quot;728*90 - leaderboard\&quot;,\&quot;adsense_mobile_topic_above_suggested_code\&quot;:\&quot;\&quot;,\&quot;adsense_mobile_topic_above_suggested_ad_size\&quot;:\&quot;responsive\&quot;,\&quot;adsense_post_bottom_code\&quot;:\&quot;\&quot;,\&quot;adsense_post_bottom_ad_sizes\&quot;:\&quot;728*90 - leaderboard\&quot;,\&quot;adsense_mobile_post_bottom_code\&quot;:\&quot;\&quot;,\&quot;adsense_mobile_post_bottom_ad_size\&quot;:\&quot;responsive\&quot;,\&quot;adsense_nth_post_code\&quot;:\&quot;\&quot;,\&quot;dfp_publisher_id\&quot;:\&quot;\&quot;,\&quot;dfp_publisher_id_mobile\&quot;:\&quot;\&quot;,\&quot;dfp_through_trust_level\&quot;:2,\&quot;dfp_topic_list_top_code\&quot;:\&quot;\&quot;,\&quot;dfp_topic_list_top_ad_sizes\&quot;:\&quot;728*90 - leaderboard\&quot;,\&quot;dfp_mobile_topic_list_top_code\&quot;:\&quot;\&quot;,\&quot;dfp_mobile_topic_list_top_ad_sizes\&quot;:\&quot;320*50 - mobile leaderboard\&quot;,\&quot;dfp_target_topic_list_top_key_code\&quot;:\&quot;\&quot;,\&quot;dfp_target_topic_list_top_value_code\&quot;:\&quot;\&quot;,\&quot;dfp_topic_above_post_stream_code\&quot;:\&quot;\&quot;,\&quot;dfp_topic_above_post_stream_ad_sizes\&quot;:\&quot;728*90 - leaderboard\&quot;,\&quot;dfp_mobile_topic_above_post_stream_code\&quot;:\&quot;\&quot;,\&quot;dfp_mobile_topic_above_post_stream_ad_sizes\&quot;:\&quot;320*50 - mobile leaderboard\&quot;,\&quot;dfp_target_topic_above_post_stream_key_code\&quot;:\&quot;\&quot;,\&quot;dfp_target_topic_above_post_stream_value_code\&quot;:\&quot;\&quot;,\&quot;dfp_topic_above_suggested_code\&quot;:\&quot;\&quot;,\&quot;dfp_topic_above_suggested_ad_sizes\&quot;:\&quot;728*90 - leaderboard\&quot;,\&quot;dfp_mobile_topic_above_suggested_code\&quot;:\&quot;\&quot;,\&quot;dfp_mobile_topic_above_suggested_ad_sizes\&quot;:\&quot;320*50 - mobile leaderboard\&quot;,\&quot;dfp_target_topic_above_suggested_key_code\&quot;:\&quot;\&quot;,\&quot;dfp_target_topic_above_suggested_value_code\&quot;:\&quot;\&quot;,\&quot;dfp_nth_post_code\&quot;:\&quot;\&quot;,\&quot;dfp_post_bottom_code\&quot;:\&quot;\&quot;,\&quot;dfp_post_bottom_ad_sizes\&quot;:\&quot;728*90 - leaderboard\&quot;,\&quot;dfp_mobile_post_bottom_code\&quot;:\&quot;\&quot;,\&quot;dfp_mobile_post_bottom_ad_sizes\&quot;:\&quot;320*50 - mobile leaderboard\&quot;,\&quot;dfp_target_post_bottom_key_code\&quot;:\&quot;\&quot;,\&quot;dfp_target_post_bottom_value_code\&quot;:\&quot;\&quot;,\&quot;amazon_through_trust_level\&quot;:2,\&quot;amazon_topic_list_top_src_code\&quot;:\&quot;\&quot;,\&quot;amazon_topic_list_top_ad_width_code\&quot;:\&quot;\&quot;,\&quot;amazon_topic_list_top_ad_height_code\&quot;:\&quot;\&quot;,\&quot;amazon_mobile_topic_list_top_src_code\&quot;:\&quot;\&quot;,\&quot;amazon_mobile_topic_list_top_ad_width_code\&quot;:\&quot;\&quot;,\&quot;amazon_mobile_topic_list_top_ad_height_code\&quot;:\&quot;\&quot;,\&quot;amazon_topic_above_post_stream_src_code\&quot;:\&quot;\&quot;,\&quot;amazon_topic_above_post_stream_ad_width_code\&quot;:\&quot;\&quot;,\&quot;amazon_topic_above_post_stream_ad_height_code\&quot;:\&quot;\&quot;,\&quot;amazon_mobile_topic_above_post_stream_src_code\&quot;:\&quot;\&quot;,\&quot;amazon_mobile_topic_above_post_stream_ad_width_code\&quot;:\&quot;\&quot;,\&quot;amazon_mobile_topic_above_post_stream_ad_height_code\&quot;:\&quot;\&quot;,\&quot;amazon_topic_above_suggested_src_code\&quot;:\&quot;\&quot;,\&quot;amazon_topic_above_suggested_ad_width_code\&quot;:\&quot;\&quot;,\&quot;amazon_topic_above_suggested_ad_height_code\&quot;:\&quot;\&quot;,\&quot;amazon_mobile_topic_above_suggested_src_code\&quot;:\&quot;\&quot;,\&quot;amazon_mobile_topic_above_suggested_ad_width_code\&quot;:\&quot;\&quot;,\&quot;amazon_mobile_topic_above_suggested_ad_height_code\&quot;:\&quot;\&quot;,\&quot;amazon_post_bottom_src_code\&quot;:\&quot;\&quot;,\&quot;amazon_nth_post_code\&quot;:\&quot;\&quot;,\&quot;amazon_post_bottom_ad_width_code\&quot;:\&quot;\&quot;,\&quot;amazon_post_bottom_ad_height_code\&quot;:\&quot;\&quot;,\&quot;amazon_mobile_post_bottom_src_code\&quot;:\&quot;\&quot;,\&quot;amazon_mobile_post_bottom_ad_width_code\&quot;:\&quot;\&quot;,\&quot;amazon_mobile_post_bottom_ad_height_code\&quot;:\&quot;\&quot;,\&quot;codefund_property_id\&quot;:\&quot;353\&quot;,\&quot;codefund_advertiser_label\&quot;:\&quot;Advertiser\&quot;,\&quot;codefund_advertiser_short_label\&quot;:\&quot;Ad\&quot;,\&quot;codefund_through_trust_level\&quot;:4,\&quot;codefund_nth_post\&quot;:20,\&quot;codefund_display_advertiser_labels\&quot;:true,\&quot;codefund_below_post_enabled\&quot;:true,\&quot;codefund_above_post_stream_enabled\&quot;:false,\&quot;codefund_above_suggested_enabled\&quot;:false,\&quot;codefund_top_of_topic_list_enabled\&quot;:false,\&quot;carbonads_serve_id\&quot;:\&quot;\&quot;,\&quot;carbonads_placement\&quot;:\&quot;\&quot;,\&quot;carbonads_through_trust_level\&quot;:2,\&quot;carbonads_topic_list_top_enabled\&quot;:false,\&quot;carbonads_above_post_stream_enabled\&quot;:false,\&quot;adbutler_publisher_id\&quot;:\&quot;\&quot;,\&quot;adbutler_through_trust_level\&quot;:2,\&quot;adbutler_topic_list_top_zone_id\&quot;:\&quot;\&quot;,\&quot;adbutler_mobile_topic_list_top_zone_id\&quot;:\&quot;\&quot;,\&quot;adbutler_topic_above_post_stream_zone_id\&quot;:\&quot;\&quot;,\&quot;adbutler_mobile_topic_above_post_stream_zone_id\&quot;:\&quot;\&quot;,\&quot;adbutler_topic_above_suggested_zone_id\&quot;:\&quot;\&quot;,\&quot;adbutler_mobile_topic_above_suggested_zone_id\&quot;:\&quot;\&quot;,\&quot;adbutler_post_bottom_zone_id\&quot;:\&quot;\&quot;,\&quot;adbutler_mobile_post_bottom_zone_id\&quot;:\&quot;\&quot;,\&quot;adbutler_nth_post\&quot;:4,\&quot;adbutler_adserver_hostname\&quot;:\&quot;servedbyadbutler.com\&quot;,\&quot;user_notes_enabled\&quot;:true,\&quot;canned_replies_enabled\&quot;:true,\&quot;yearly_review_enabled\&quot;:true,\&quot;presence_enabled\&quot;:true,\&quot;poll_enabled\&quot;:true,\&quot;poll_maximum_options\&quot;:30,\&quot;poll_minimum_trust_level_to_create\&quot;:1,\&quot;poll_groupable_user_fields\&quot;:\&quot;\&quot;,\&quot;poll_export_data_explorer_query_id\&quot;:-16,\&quot;saved_searches_enabled\&quot;:true,\&quot;saved_searches_min_trust_level\&quot;:2,\&quot;solved_enabled\&quot;:true,\&quot;allow_solved_on_all_topics\&quot;:false,\&quot;accept_all_solutions_trust_level\&quot;:4,\&quot;empty_box_on_unsolved\&quot;:false,\&quot;show_filter_by_solved_status\&quot;:false,\&quot;discourse_teams_enabled\&quot;:true,\&quot;available_locales\&quot;:\&quot;[{\\\&quot;name\\\&quot;:\\\&quot;اللغة العربية\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;ar\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;беларуская мова\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;be\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;български език\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;bg\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;bosanski jezik\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;bs_BA\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;català\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;ca\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;čeština\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;cs\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;dansk\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;da\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;Deutsch\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;de\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;ελληνικά\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;el\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;English\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;en\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;English (United States)\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;en_US\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;Español\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;es\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;eesti\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;et\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;فارسی\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;fa_IR\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;suomi\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;fi\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;Français\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;fr\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;galego\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;gl\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;עברית\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;he\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;magyar\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;hu\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;Հայերեն\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;hy\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;Indonesian\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;id\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;Italiano\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;it\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;日本語\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;ja\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;한국어\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;ko\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;lietuvių kalba\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;lt\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;latviešu valoda\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;lv\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;Norsk bokmål\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;nb_NO\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;Nederlands\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;nl\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;język polski\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;pl_PL\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;Português\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;pt\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;Português (BR)\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;pt_BR\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;limba română\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;ro\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;Русский\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;ru\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;slovenčina\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;sk\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;slovenščina\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;sl\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;Shqip\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;sq\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;српски језик\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;sr\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;svenska\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;sv\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;Kiswahili\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;sw\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;తెలుగు\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;te\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;ไทย\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;th\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;Türkçe\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;tr_TR\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;українська мова\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;uk\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;اردو\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;ur\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;Việt Nam\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;vi\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;中文\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;zh_CN\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;中文 (TW)\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;zh_TW\\\&quot;}]\&quot;,\&quot;site_logo_url\&quot;:\&quot;https://d11a6trkgmumsb.cloudfront.net/original/3X/1/0/101f03af29f12ea30e1226eb96a02c3ed2f6d2ef.png\&quot;,\&quot;site_logo_small_url\&quot;:\&quot;https://d11a6trkgmumsb.cloudfront.net/original/3X/b/3/b33be9538df3547fcf9d1a51a4637d77392ac6f9.png\&quot;,\&quot;site_mobile_logo_url\&quot;:\&quot;https://d11a6trkgmumsb.cloudfront.net/original/3X/1/0/101f03af29f12ea30e1226eb96a02c3ed2f6d2ef.png\&quot;,\&quot;site_favicon_url\&quot;:\&quot;https://d11a6trkgmumsb.cloudfront.net/optimized/3X/b/3/b33be9538df3547fcf9d1a51a4637d77392ac6f9_2_32x32.png\&quot;}&quot;,&quot;customHTML&quot;:&quot;{\&quot;top\&quot;:\&quot;\&quot;,\&quot;footer\&quot;:\&quot;\&quot;}&quot;,&quot;banner&quot;:&quot;{}&quot;,&quot;customEmoji&quot;:&quot;[{\&quot;name\&quot;:\&quot;allthethings\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/6/1/61e481320406f0f82ed780db3f04056128191613.png\&quot;},{\&quot;name\&quot;:\&quot;areyoukiddingme\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/a/4/a419f9bfc1d7be37c8566c64d1bedca9e9173e06.png\&quot;},{\&quot;name\&quot;:\&quot;awthanks\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/2/5/25c3f8e8c8ae13b6dfa6e94169410d6203d7d2f1.png\&quot;},{\&quot;name\&quot;:\&quot;badpokerface\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/4/4/44800bd49b02615e39f799622233dac089f6c0bf.png\&quot;},{\&quot;name\&quot;:\&quot;challengeaccepted\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/9/0/9043c341c0f460897b81ce05d6117293cb3b8677.png\&quot;},{\&quot;name\&quot;:\&quot;content\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/2/7/2794a1e36765e009c2ec99b4a181800f8bf41036.png\&quot;},{\&quot;name\&quot;:\&quot;dealwithit\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/3/a/3aa0aa7da8337d27f11d82242c04216185b248cf.gif\&quot;},{\&quot;name\&quot;:\&quot;derp\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/f/9/f91b2da50374ccba12a6ab85d532da1bc7d1c4c4.png\&quot;},{\&quot;name\&quot;:\&quot;disapproval\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/d/a/da6fa762bab11b4307bbca85a589a969a375f776.png\&quot;},{\&quot;name\&quot;:\&quot;discourse\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/b/1/b19ba793155a785bbd9707bc0cabbd3a987fa126.png\&quot;},{\&quot;name\&quot;:\&quot;dosequis\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/6/e/6e07135e8aa0eec5a289f257ce6bb88104bd7ee1.png\&quot;},{\&quot;name\&quot;:\&quot;drevil\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/9/c/9cf4d1ca21f3bf2286388f8d7a0ba74b5c3cb81c.png\&quot;},{\&quot;name\&quot;:\&quot;facepalm\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/d/6/d65d677aed3d7f9883930292407e3f9a4dc86972.png\&quot;},{\&quot;name\&quot;:\&quot;firstworldproblem\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/c/0/c0013cffee52a2ab93fec470cbefcf17a56d08d8.png\&quot;},{\&quot;name\&quot;:\&quot;fonzie\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/7/1/714b126599c1a962873e1779bd06cebef9cef23c.png\&quot;},{\&quot;name\&quot;:\&quot;garbage\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/c/8/c8b4c24e2a65a910febbd150fc442124cf27c177.png\&quot;},{\&quot;name\&quot;:\&quot;gates\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/2/d/2d064953a5e0fcb98c1d10bdb85abc37da9adde5.png\&quot;},{\&quot;name\&quot;:\&quot;goodnews\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/7/5/7527903f8aa1087e26aec6011dd05277e5f35f21.png\&quot;},{\&quot;name\&quot;:\&quot;grumpycat\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/6/b/6b11bb2fe092fdc93c5c94438b379840b512776d.png\&quot;},{\&quot;name\&quot;:\&quot;hipster\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/b/1/b1e783d7f94294754db2bb1680eb0e4d632ba02e.png\&quot;},{\&quot;name\&quot;:\&quot;jobs\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/4/0/407047bc725cbc7fb39430d9523a53ab36e97c52.png\&quot;},{\&quot;name\&quot;:\&quot;liquorice\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/2/e/2e522c184eb38561e8853c8b9a2d15c0768f6f25.png\&quot;},{\&quot;name\&quot;:\&quot;lol\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/4/8/48ba946a44b6750f4fe3bafb8016a088f4a47ff7.png\&quot;},{\&quot;name\&quot;:\&quot;mdr\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/8/3/83e437fd1fb1b94357703172dd48ce34232c84d3.gif\&quot;},{\&quot;name\&quot;:\&quot;notsureif\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/f/c/fcb887a1c0f907c4eda23693b2d4ffebde8bffc1.png\&quot;},{\&quot;name\&quot;:\&quot;okay\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/f/d/fdeaafa1675d6944d8240aec5d22e31d1978645e.png\&quot;},{\&quot;name\&quot;:\&quot;orly\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/d/d/dd2b3b630cb5efeb3f56483377c32b0fc5271d80.png\&quot;},{\&quot;name\&quot;:\&quot;philosoraptor\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/c/b/cbe4239749d2fd4af6e0bb5f8181e5fb3bd8eedb.png\&quot;},{\&quot;name\&quot;:\&quot;pokeball\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/6/c/6c26517d3bb3fac008a6352fc66ce4e94d7a2291.png\&quot;},{\&quot;name\&quot;:\&quot;pokerface\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/1/5/15c7b01487e28720b5c32d5ee9a5db4dd92c16bd.png\&quot;},{\&quot;name\&quot;:\&quot;rageguy\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/a/c/ace6844484cb0cb36cf4f19e23025f5df15ee510.png\&quot;},{\&quot;name\&quot;:\&quot;sadpanda\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/7/c/7c2bd5eecf04b788b6ee2028c65a90868c979e53.png\&quot;},{\&quot;name\&quot;:\&quot;shoryuken\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/1/d/1de8f76096f76cf393640bdcff387ec9ae33dd3e.gif\&quot;},{\&quot;name\&quot;:\&quot;success\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/b/1/b1bef2034df1f097426a56b6220c2c2d189e2e25.png\&quot;},{\&quot;name\&quot;:\&quot;test\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/9/3/933febd589714f24481a7d8b123119e05a2a0156.png\&quot;},{\&quot;name\&quot;:\&quot;troll\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/e/f/efe45f803a9f93e8f678f919328a03fa8c91342f.png\&quot;},{\&quot;name\&quot;:\&quot;unicorn\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/9/c/9c93812afa2ccb9df7f352ea994333af50f599fc.png\&quot;},{\&quot;name\&quot;:\&quot;wat\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/e/1/e189953dabc6bf7e53956f4faf4f86bf2ad9bea2.png\&quot;},{\&quot;name\&quot;:\&quot;yey\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/e/0/e03415a0f89e32ccb06dddd475a82d7c43b350f9.png\&quot;},{\&quot;name\&quot;:\&quot;yuno\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/a/5/a5274cbf539569182b9dd9c74272cedf3710db25.png\&quot;},{\&quot;name\&quot;:\&quot;zogstrip\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/e/3/e3d395c2acddc5aa8348944fa5f1057091bde0d0.png\&quot;}]&quot;,&quot;currentUser&quot;:&quot;{\&quot;id\&quot;:8222,\&quot;username\&quot;:\&quot;techAPJ\&quot;,\&quot;name\&quot;:\&quot;Arpit Jalan\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/techapj/{size}/152320_2.png\&quot;,\&quot;unread_notifications\&quot;:1,\&quot;unread_private_messages\&quot;:0,\&quot;read_first_notification\&quot;:true,\&quot;admin\&quot;:true,\&quot;notification_channel_position\&quot;:11210,\&quot;moderator\&quot;:false,\&quot;staff\&quot;:true,\&quot;title\&quot;:\&quot;team\&quot;,\&quot;reply_count\&quot;:1485,\&quot;topic_count\&quot;:61,\&quot;enable_quoting\&quot;:true,\&quot;enable_defer\&quot;:false,\&quot;external_links_in_new_tab\&quot;:true,\&quot;dynamic_favicon\&quot;:true,\&quot;trust_level\&quot;:4,\&quot;can_send_private_email_messages\&quot;:true,\&quot;can_edit\&quot;:true,\&quot;can_invite_to_forum\&quot;:true,\&quot;should_be_redirected_to_top\&quot;:false,\&quot;custom_fields\&quot;:{},\&quot;muted_category_ids\&quot;:[],\&quot;muted_tag_ids\&quot;:[],\&quot;dismissed_banner_key\&quot;:null,\&quot;is_anonymous\&quot;:false,\&quot;reviewable_count\&quot;:0,\&quot;read_faq\&quot;:true,\&quot;automatically_unpin_topics\&quot;:true,\&quot;mailing_list_mode\&quot;:false,\&quot;previous_visit_at\&quot;:\&quot;2020-01-30T01:18:37.467Z\&quot;,\&quot;seen_notification_id\&quot;:6793103,\&quot;primary_group_id\&quot;:47,\&quot;can_create_topic\&quot;:true,\&quot;link_posting_access\&quot;:\&quot;full\&quot;,\&quot;top_category_ids\&quot;:[89,1,13,10,35],\&quot;hide_profile_and_presence\&quot;:false,\&quot;groups\&quot;:[{\&quot;id\&quot;:1,\&quot;name\&quot;:\&quot;admins\&quot;,\&quot;has_messages\&quot;:false},{\&quot;id\&quot;:3,\&quot;name\&quot;:\&quot;staff\&quot;,\&quot;has_messages\&quot;:false},{\&quot;id\&quot;:77,\&quot;name\&quot;:\&quot;support\&quot;,\&quot;has_messages\&quot;:true},{\&quot;id\&quot;:47,\&quot;name\&quot;:\&quot;team\&quot;,\&quot;has_messages\&quot;:true},{\&quot;id\&quot;:10,\&quot;name\&quot;:\&quot;trust_level_0\&quot;,\&quot;has_messages\&quot;:false},{\&quot;id\&quot;:11,\&quot;name\&quot;:\&quot;trust_level_1\&quot;,\&quot;has_messages\&quot;:false},{\&quot;id\&quot;:12,\&quot;name\&quot;:\&quot;trust_level_2\&quot;,\&quot;has_messages\&quot;:false},{\&quot;id\&quot;:13,\&quot;name\&quot;:\&quot;trust_level_3\&quot;,\&quot;has_messages\&quot;:false},{\&quot;id\&quot;:14,\&quot;name\&quot;:\&quot;trust_level_4\&quot;,\&quot;has_messages\&quot;:false}],\&quot;second_factor_enabled\&quot;:true,\&quot;ignored_users\&quot;:[],\&quot;title_count_mode\&quot;:\&quot;notifications\&quot;,\&quot;timezone\&quot;:\&quot;Asia/Calcutta\&quot;,\&quot;featured_topic\&quot;:null,\&quot;can_assign\&quot;:true,\&quot;can_use_canned_replies\&quot;:true,\&quot;user_tags\&quot;:[],\&quot;votes_exceeded\&quot;:false,\&quot;vote_count\&quot;:0}&quot;,&quot;topicTrackingStates&quot;:&quot;[{\&quot;topic_id\&quot;:139910,\&quot;highest_post_number\&quot;:1,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T07:06:52.483Z\&quot;,\&quot;category_id\&quot;:2,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139930,\&quot;highest_post_number\&quot;:7,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T11:55:45.950Z\&quot;,\&quot;category_id\&quot;:84,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139931,\&quot;highest_post_number\&quot;:6,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T12:03:55.327Z\&quot;,\&quot;category_id\&quot;:6,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139937,\&quot;highest_post_number\&quot;:7,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T13:41:34.279Z\&quot;,\&quot;category_id\&quot;:2,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139940,\&quot;highest_post_number\&quot;:3,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T14:35:01.824Z\&quot;,\&quot;category_id\&quot;:6,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139941,\&quot;highest_post_number\&quot;:1,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T14:35:09.722Z\&quot;,\&quot;category_id\&quot;:7,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139950,\&quot;highest_post_number\&quot;:3,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T15:53:07.335Z\&quot;,\&quot;category_id\&quot;:2,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139951,\&quot;highest_post_number\&quot;:3,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T15:57:48.131Z\&quot;,\&quot;category_id\&quot;:7,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139954,\&quot;highest_post_number\&quot;:2,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T16:06:21.893Z\&quot;,\&quot;category_id\&quot;:31,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139957,\&quot;highest_post_number\&quot;:3,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T16:26:29.028Z\&quot;,\&quot;category_id\&quot;:75,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139959,\&quot;highest_post_number\&quot;:4,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T16:37:40.432Z\&quot;,\&quot;category_id\&quot;:6,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139961,\&quot;highest_post_number\&quot;:2,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T16:59:59.417Z\&quot;,\&quot;category_id\&quot;:9,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139963,\&quot;highest_post_number\&quot;:3,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T17:03:58.481Z\&quot;,\&quot;category_id\&quot;:6,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139965,\&quot;highest_post_number\&quot;:3,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T17:23:41.118Z\&quot;,\&quot;category_id\&quot;:6,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139966,\&quot;highest_post_number\&quot;:2,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T17:31:35.502Z\&quot;,\&quot;category_id\&quot;:6,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139971,\&quot;highest_post_number\&quot;:3,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T18:33:36.907Z\&quot;,\&quot;category_id\&quot;:1,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139974,\&quot;highest_post_number\&quot;:6,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T18:50:33.862Z\&quot;,\&quot;category_id\&quot;:1,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139979,\&quot;highest_post_number\&quot;:3,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T20:13:48.182Z\&quot;,\&quot;category_id\&quot;:6,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139988,\&quot;highest_post_number\&quot;:1,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T22:42:43.295Z\&quot;,\&quot;category_id\&quot;:67,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139992,\&quot;highest_post_number\&quot;:2,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T23:15:55.511Z\&quot;,\&quot;category_id\&quot;:9,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139996,\&quot;highest_post_number\&quot;:8,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T00:29:46.552Z\&quot;,\&quot;category_id\&quot;:6,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140005,\&quot;highest_post_number\&quot;:4,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T02:08:48.196Z\&quot;,\&quot;category_id\&quot;:6,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140015,\&quot;highest_post_number\&quot;:6,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T04:27:46.593Z\&quot;,\&quot;category_id\&quot;:31,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140016,\&quot;highest_post_number\&quot;:5,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T04:51:25.625Z\&quot;,\&quot;category_id\&quot;:6,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140017,\&quot;highest_post_number\&quot;:16,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T05:14:56.816Z\&quot;,\&quot;category_id\&quot;:67,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140028,\&quot;highest_post_number\&quot;:6,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T07:51:19.392Z\&quot;,\&quot;category_id\&quot;:2,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140041,\&quot;highest_post_number\&quot;:1,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T10:42:13.428Z\&quot;,\&quot;category_id\&quot;:6,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140043,\&quot;highest_post_number\&quot;:2,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T11:00:44.754Z\&quot;,\&quot;category_id\&quot;:14,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140065,\&quot;highest_post_number\&quot;:4,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T14:26:39.718Z\&quot;,\&quot;category_id\&quot;:88,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140067,\&quot;highest_post_number\&quot;:2,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T14:36:23.543Z\&quot;,\&quot;category_id\&quot;:2,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140079,\&quot;highest_post_number\&quot;:4,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T16:11:36.524Z\&quot;,\&quot;category_id\&quot;:2,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140083,\&quot;highest_post_number\&quot;:4,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T16:48:38.993Z\&quot;,\&quot;category_id\&quot;:24,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140087,\&quot;highest_post_number\&quot;:4,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T17:41:22.978Z\&quot;,\&quot;category_id\&quot;:6,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140096,\&quot;highest_post_number\&quot;:6,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T18:40:48.647Z\&quot;,\&quot;category_id\&quot;:1,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140104,\&quot;highest_post_number\&quot;:3,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T19:44:39.003Z\&quot;,\&quot;category_id\&quot;:90,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140109,\&quot;highest_post_number\&quot;:6,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T20:40:28.069Z\&quot;,\&quot;category_id\&quot;:77,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140112,\&quot;highest_post_number\&quot;:2,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T21:01:23.534Z\&quot;,\&quot;category_id\&quot;:31,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140124,\&quot;highest_post_number\&quot;:6,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T22:44:53.454Z\&quot;,\&quot;category_id\&quot;:2,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140125,\&quot;highest_post_number\&quot;:1,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T23:40:16.753Z\&quot;,\&quot;category_id\&quot;:89,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140127,\&quot;highest_post_number\&quot;:2,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-30T00:18:08.997Z\&quot;,\&quot;category_id\&quot;:1,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140133,\&quot;highest_post_number\&quot;:1,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-30T04:51:43.425Z\&quot;,\&quot;category_id\&quot;:77,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:60305,\&quot;highest_post_number\&quot;:10,\&quot;last_read_post_number\&quot;:9,\&quot;created_at\&quot;:\&quot;2017-04-02T01:19:41.407Z\&quot;,\&quot;category_id\&quot;:1,\&quot;notification_level\&quot;:2},{\&quot;topic_id\&quot;:139335,\&quot;highest_post_number\&quot;:17,\&quot;last_read_post_number\&quot;:15,\&quot;created_at\&quot;:\&quot;2020-01-21T20:17:13.836Z\&quot;,\&quot;category_id\&quot;:1,\&quot;notification_level\&quot;:2},{\&quot;topic_id\&quot;:132695,\&quot;highest_post_number\&quot;:51,\&quot;last_read_post_number\&quot;:50,\&quot;created_at\&quot;:\&quot;2019-11-05T21:01:27.834Z\&quot;,\&quot;category_id\&quot;:89,\&quot;notification_level\&quot;:2}]&quot;,&quot;topic_12483&quot;:&quot;{\&quot;post_stream\&quot;:{\&quot;posts\&quot;:[{\&quot;id\&quot;:39739,\&quot;name\&quot;:\&quot;Arpit Jalan\&quot;,\&quot;username\&quot;:\&quot;techAPJ\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/techapj/{size}/152320_2.png\&quot;,\&quot;created_at\&quot;:\&quot;2014-02-06T04:55:19.372Z\&quot;,\&quot;cooked\&quot;:\&quot;\\u003cp\\u003eCongratulations Discourse for qualifying \\u003cstrong\\u003eRepositories with the most stars\\u003c/strong\\u003e on \\u003ca href=\\\&quot;http://octoverse.github.com/\\\&quot; rel=\\\&quot;nofollow noopener\\\&quot;\\u003eGitHub Octoverse\\u003c/a\\u003e.\\u003c/p\\u003e\\n\\u003cp\\u003e\\u003cdiv class=\\\&quot;lightbox-wrapper\\\&quot;\\u003e\\u003ca class=\\\&quot;lightbox\\\&quot; href=\\\&quot;https://d11a6trkgmumsb.cloudfront.net/original/2X/d/d063b3b0807377d98695ee08042a9ba0a8c593bd.png\\\&quot; data-download-href=\\\&quot;/uploads/short-url/tJuViGduTW0q554XGvz7IKrqawR.png?dl=1\\\&quot; title=\\\&quot;github_octoverse.png\\\&quot; rel=\\\&quot;nofollow noopener\\\&quot;\\u003e\\u003cimg src=\\\&quot;https://d11a6trkgmumsb.cloudfront.net/optimized/2X/d/d063b3b0807377d98695ee08042a9ba0a8c593bd_2_690x362.png\\\&quot; width=\\\&quot;690\\\&quot; height=\\\&quot;362\\\&quot; srcset=\\\&quot;https://d11a6trkgmumsb.cloudfront.net/optimized/2X/d/d063b3b0807377d98695ee08042a9ba0a8c593bd_2_690x362.png, https://d11a6trkgmumsb.cloudfront.net/optimized/2X/d/d063b3b0807377d98695ee08042a9ba0a8c593bd_2_1035x543.png 1.5x, https://d11a6trkgmumsb.cloudfront.net/original/2X/d/d063b3b0807377d98695ee08042a9ba0a8c593bd.png 2x\\\&quot; data-small-upload=\\\&quot;https://d11a6trkgmumsb.cloudfront.net/optimized/2X/d/d063b3b0807377d98695ee08042a9ba0a8c593bd_2_10x10.png\\\&quot;\\u003e\\u003cdiv class=\\\&quot;meta\\\&quot;\\u003e\\n\\u003csvg class=\\\&quot;fa d-icon d-icon-far-image svg-icon\\\&quot; aria-hidden=\\\&quot;true\\\&quot;\\u003e\\u003cuse xlink:href=\\\&quot;#far-image\\\&quot;\\u003e\\u003c/use\\u003e\\u003c/svg\\u003e\\u003cspan class=\\\&quot;filename\\\&quot;\\u003egithub_octoverse.png\\u003c/span\\u003e\\u003cspan class=\\\&quot;informations\\\&quot;\\u003e1365×718 217 KB\\u003c/span\\u003e\\u003csvg class=\\\&quot;fa d-icon d-icon-discourse-expand svg-icon\\\&quot; aria-hidden=\\\&quot;true\\\&quot;\\u003e\\u003cuse xlink:href=\\\&quot;#discourse-expand\\\&quot;\\u003e\\u003c/use\\u003e\\u003c/svg\\u003e\\n\\u003c/div\\u003e\\u003c/a\\u003e\\u003c/div\\u003e \\u003c/p\\u003e\\n\\u003cp\\u003eAnd that too in just over an year, way to go! \\u003cimg src=\\\&quot;https://d3bpeqsaub0i6y.cloudfront.net/images/emoji/twitter/boom.png?v=9\\\&quot; title=\\\&quot;:boom:\\\&quot; class=\\\&quot;emoji\\\&quot; alt=\\\&quot;:boom:\\\&quot;\\u003e\\u003c/p\\u003e\&quot;,\&quot;post_number\&quot;:1,\&quot;post_type\&quot;:1,\&quot;updated_at\&quot;:\&quot;2015-06-19T06:45:49.951Z\&quot;,\&quot;reply_count\&quot;:0,\&quot;reply_to_post_number\&quot;:null,\&quot;quote_count\&quot;:0,\&quot;incoming_link_count\&quot;:799,\&quot;reads\&quot;:64,\&quot;readers_count\&quot;:63,\&quot;score\&quot;:4237.8,\&quot;yours\&quot;:true,\&quot;topic_id\&quot;:12483,\&quot;topic_slug\&quot;:\&quot;congratulations-most-stars-in-2013-github-octoverse\&quot;,\&quot;display_username\&quot;:\&quot;Arpit Jalan\&quot;,\&quot;primary_group_name\&quot;:\&quot;team\&quot;,\&quot;flair_url\&quot;:\&quot;https://aws1.discourse-cdn.com/dev/original/2X/e/ebee30bd98aef20357e4a177a5a1e45b877ce088.svg\&quot;,\&quot;flair_bg_color\&quot;:\&quot;\&quot;,\&quot;flair_color\&quot;:\&quot;111\&quot;,\&quot;version\&quot;:5,\&quot;can_edit\&quot;:true,\&quot;can_delete\&quot;:false,\&quot;can_recover\&quot;:null,\&quot;can_wiki\&quot;:true,\&quot;link_counts\&quot;:[{\&quot;url\&quot;:\&quot;http://octoverse.github.com/\&quot;,\&quot;internal\&quot;:false,\&quot;reflection\&quot;:false,\&quot;title\&quot;:\&quot;GitHub Octoverse 2013\&quot;,\&quot;clicks\&quot;:57},{\&quot;url\&quot;:\&quot;https://d11a6trkgmumsb.cloudfront.net/original/2X/d/d063b3b0807377d98695ee08042a9ba0a8c593bd.png\&quot;,\&quot;internal\&quot;:false,\&quot;reflection\&quot;:false,\&quot;title\&quot;:\&quot;d063b3b0807377d98695ee08042a9ba0a8c593bd.png\&quot;,\&quot;clicks\&quot;:0}],\&quot;read\&quot;:true,\&quot;user_title\&quot;:\&quot;team\&quot;,\&quot;actions_summary\&quot;:[{\&quot;id\&quot;:2,\&quot;count\&quot;:8},{\&quot;id\&quot;:3,\&quot;can_act\&quot;:true},{\&quot;id\&quot;:4,\&quot;can_act\&quot;:true},{\&quot;id\&quot;:8,\&quot;can_act\&quot;:true},{\&quot;id\&quot;:7,\&quot;can_act\&quot;:true}],\&quot;moderator\&quot;:false,\&quot;admin\&quot;:true,\&quot;staff\&quot;:true,\&quot;user_id\&quot;:8222,\&quot;hidden\&quot;:false,\&quot;trust_level\&quot;:4,\&quot;deleted_at\&quot;:null,\&quot;user_deleted\&quot;:false,\&quot;edit_reason\&quot;:null,\&quot;can_view_edit_history\&quot;:true,\&quot;wiki\&quot;:false,\&quot;reviewable_id\&quot;:0,\&quot;reviewable_score_count\&quot;:0,\&quot;reviewable_score_pending_count\&quot;:0,\&quot;user_created_at\&quot;:\&quot;2014-01-16T08:46:15.457Z\&quot;,\&quot;user_date_of_birth\&quot;:\&quot;1904-12-15\&quot;,\&quot;can_accept_answer\&quot;:false,\&quot;can_unaccept_answer\&quot;:false,\&quot;accepted_answer\&quot;:false},{\&quot;id\&quot;:39741,\&quot;name\&quot;:\&quot;Jeff Atwood\&quot;,\&quot;username\&quot;:\&quot;codinghorror\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/codinghorror/{size}/110067_2.png\&quot;,\&quot;created_at\&quot;:\&quot;2014-02-06T05:27:06.860Z\&quot;,\&quot;cooked\&quot;:\&quot;\\u003cp\\u003eAh, cool. I was not sure how to see that since GitHub changed around the way project top stats looked. Thanks for that link and thank you – and everyone else who is contributing to the project!\\u003c/p\\u003e\&quot;,\&quot;post_number\&quot;:2,\&quot;post_type\&quot;:1,\&quot;updated_at\&quot;:\&quot;2014-02-06T05:27:06.860Z\&quot;,\&quot;reply_count\&quot;:0,\&quot;reply_to_post_number\&quot;:null,\&quot;quote_count\&quot;:0,\&quot;incoming_link_count\&quot;:0,\&quot;reads\&quot;:61,\&quot;readers_count\&quot;:60,\&quot;score\&quot;:27.2,\&quot;yours\&quot;:false,\&quot;topic_id\&quot;:12483,\&quot;topic_slug\&quot;:\&quot;congratulations-most-stars-in-2013-github-octoverse\&quot;,\&quot;display_username\&quot;:\&quot;Jeff Atwood\&quot;,\&quot;primary_group_name\&quot;:\&quot;team\&quot;,\&quot;flair_url\&quot;:\&quot;https://aws1.discourse-cdn.com/dev/original/2X/e/ebee30bd98aef20357e4a177a5a1e45b877ce088.svg\&quot;,\&quot;flair_bg_color\&quot;:\&quot;\&quot;,\&quot;flair_color\&quot;:\&quot;111\&quot;,\&quot;version\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;can_delete\&quot;:true,\&quot;can_recover\&quot;:null,\&quot;can_wiki\&quot;:true,\&quot;read\&quot;:true,\&quot;user_title\&quot;:\&quot;co-founder\&quot;,\&quot;actions_summary\&quot;:[{\&quot;id\&quot;:2,\&quot;count\&quot;:1,\&quot;acted\&quot;:true},{\&quot;id\&quot;:3,\&quot;can_act\&quot;:true},{\&quot;id\&quot;:4,\&quot;can_act\&quot;:true},{\&quot;id\&quot;:8,\&quot;can_act\&quot;:true},{\&quot;id\&quot;:6,\&quot;can_act\&quot;:true},{\&quot;id\&quot;:7,\&quot;can_act\&quot;:true}],\&quot;moderator\&quot;:false,\&quot;admin\&quot;:true,\&quot;staff\&quot;:true,\&quot;user_id\&quot;:32,\&quot;hidden\&quot;:false,\&quot;trust_level\&quot;:4,\&quot;deleted_at\&quot;:null,\&quot;user_deleted\&quot;:false,\&quot;edit_reason\&quot;:null,\&quot;can_view_edit_history\&quot;:true,\&quot;wiki\&quot;:false,\&quot;reviewable_id\&quot;:0,\&quot;reviewable_score_count\&quot;:0,\&quot;reviewable_score_pending_count\&quot;:0,\&quot;user_created_at\&quot;:\&quot;2013-02-05T04:44:25.476Z\&quot;,\&quot;user_date_of_birth\&quot;:null,\&quot;can_accept_answer\&quot;:false,\&quot;can_unaccept_answer\&quot;:false,\&quot;accepted_answer\&quot;:false}],\&quot;stream\&quot;:[39739,39741]},\&quot;timeline_lookup\&quot;:[[1,2184],[2,2183]],\&quot;suggested_topics\&quot;:[{\&quot;id\&quot;:132695,\&quot;title\&quot;:\&quot;Data Explorer Query Requests, Plus More Custom Data Requests\&quot;,\&quot;fancy_title\&quot;:\&quot;Data Explorer Query Requests, Plus More Custom Data Requests\&quot;,\&quot;slug\&quot;:\&quot;data-explorer-query-requests-plus-more-custom-data-requests\&quot;,\&quot;posts_count\&quot;:36,\&quot;reply_count\&quot;:32,\&quot;highest_post_number\&quot;:51,\&quot;image_url\&quot;:\&quot;https://d11a6trkgmumsb.cloudfront.net/optimized/3X/e/c/ecf9c2c5c6432ec93dcf6b56f5c209db98d60016_2_690x82.png\&quot;,\&quot;created_at\&quot;:\&quot;2019-11-05T21:01:27.834Z\&quot;,\&quot;last_posted_at\&quot;:\&quot;2020-01-29T22:53:33.021Z\&quot;,\&quot;bumped\&quot;:true,\&quot;bumped_at\&quot;:\&quot;2020-01-29T22:53:33.021Z\&quot;,\&quot;unseen\&quot;:false,\&quot;last_read_post_number\&quot;:50,\&quot;unread\&quot;:0,\&quot;new_posts\&quot;:1,\&quot;pinned\&quot;:false,\&quot;unpinned\&quot;:null,\&quot;visible\&quot;:true,\&quot;closed\&quot;:false,\&quot;archived\&quot;:false,\&quot;notification_level\&quot;:2,\&quot;bookmarked\&quot;:false,\&quot;liked\&quot;:true,\&quot;tags\&quot;:[],\&quot;archetype\&quot;:\&quot;regular\&quot;,\&quot;like_count\&quot;:149,\&quot;views\&quot;:189,\&quot;category_id\&quot;:89,\&quot;featured_link\&quot;:null,\&quot;has_accepted_answer\&quot;:false,\&quot;posters\&quot;:[{\&quot;extras\&quot;:null,\&quot;description\&quot;:\&quot;Original Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:67214,\&quot;username\&quot;:\&quot;Applejack\&quot;,\&quot;name\&quot;:\&quot;Jackie Cole\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/applejack/{size}/149065_2.png\&quot;}},{\&quot;extras\&quot;:null,\&quot;description\&quot;:\&quot;Frequent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:19,\&quot;username\&quot;:\&quot;eviltrout\&quot;,\&quot;name\&quot;:\&quot;Robin Ward\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/eviltrout/{size}/5275_2.png\&quot;}},{\&quot;extras\&quot;:\&quot;latest\&quot;,\&quot;description\&quot;:\&quot;Most Recent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:24222,\&quot;username\&quot;:\&quot;tshenry\&quot;,\&quot;name\&quot;:\&quot;Taylor\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/tshenry/{size}/119495_2.png\&quot;}}]},{\&quot;id\&quot;:139335,\&quot;title\&quot;:\&quot;Publication of Timed Topics don&#39;t trigger new topic notifications\&quot;,\&quot;fancy_title\&quot;:\&quot;Publication of Timed Topics don\\u0026rsquo;t trigger new topic notifications\&quot;,\&quot;slug\&quot;:\&quot;publication-of-timed-topics-dont-trigger-new-topic-notifications\&quot;,\&quot;posts_count\&quot;:17,\&quot;reply_count\&quot;:12,\&quot;highest_post_number\&quot;:17,\&quot;image_url\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-21T20:17:13.836Z\&quot;,\&quot;last_posted_at\&quot;:\&quot;2020-01-29T21:12:10.845Z\&quot;,\&quot;bumped\&quot;:true,\&quot;bumped_at\&quot;:\&quot;2020-01-29T21:12:10.845Z\&quot;,\&quot;unseen\&quot;:false,\&quot;last_read_post_number\&quot;:15,\&quot;unread\&quot;:0,\&quot;new_posts\&quot;:2,\&quot;pinned\&quot;:false,\&quot;unpinned\&quot;:null,\&quot;visible\&quot;:true,\&quot;closed\&quot;:false,\&quot;archived\&quot;:false,\&quot;notification_level\&quot;:2,\&quot;bookmarked\&quot;:false,\&quot;liked\&quot;:true,\&quot;tags\&quot;:[],\&quot;archetype\&quot;:\&quot;regular\&quot;,\&quot;like_count\&quot;:38,\&quot;views\&quot;:323,\&quot;category_id\&quot;:1,\&quot;featured_link\&quot;:null,\&quot;has_accepted_answer\&quot;:false,\&quot;posters\&quot;:[{\&quot;extras\&quot;:null,\&quot;description\&quot;:\&quot;Original Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:5559,\&quot;username\&quot;:\&quot;downey\&quot;,\&quot;name\&quot;:\&quot;Michael Downey\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/downey/{size}/166878_2.png\&quot;}},{\&quot;extras\&quot;:null,\&quot;description\&quot;:\&quot;Frequent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:32,\&quot;username\&quot;:\&quot;codinghorror\&quot;,\&quot;name\&quot;:\&quot;Jeff Atwood\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/codinghorror/{size}/110067_2.png\&quot;}},{\&quot;extras\&quot;:null,\&quot;description\&quot;:\&quot;Frequent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:12801,\&quot;username\&quot;:\&quot;bartv\&quot;,\&quot;name\&quot;:\&quot;Bart \&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/bartv/{size}/130052_2.png\&quot;}},{\&quot;extras\&quot;:null,\&quot;description\&quot;:\&quot;Frequent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:14353,\&quot;username\&quot;:\&quot;Simon_Cossar\&quot;,\&quot;name\&quot;:\&quot;Simon Cossar\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/simon_cossar/{size}/86411_2.png\&quot;}},{\&quot;extras\&quot;:\&quot;latest\&quot;,\&quot;description\&quot;:\&quot;Most Recent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:68722,\&quot;username\&quot;:\&quot;kris.kotlarek\&quot;,\&quot;name\&quot;:\&quot;Kris\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/kris.kotlarek/{size}/155603_2.png\&quot;}}]},{\&quot;id\&quot;:60305,\&quot;title\&quot;:\&quot;Bug: changing the email subject for some templates is ignored\&quot;,\&quot;fancy_title\&quot;:\&quot;Bug: changing the email subject for some templates is ignored\&quot;,\&quot;slug\&quot;:\&quot;bug-changing-the-email-subject-for-some-templates-is-ignored\&quot;,\&quot;posts_count\&quot;:9,\&quot;reply_count\&quot;:2,\&quot;highest_post_number\&quot;:10,\&quot;image_url\&quot;:null,\&quot;created_at\&quot;:\&quot;2017-04-02T01:19:41.407Z\&quot;,\&quot;last_posted_at\&quot;:\&quot;2020-01-29T20:21:48.901Z\&quot;,\&quot;bumped\&quot;:true,\&quot;bumped_at\&quot;:\&quot;2020-01-29T20:21:48.901Z\&quot;,\&quot;unseen\&quot;:false,\&quot;last_read_post_number\&quot;:9,\&quot;unread\&quot;:0,\&quot;new_posts\&quot;:1,\&quot;pinned\&quot;:false,\&quot;unpinned\&quot;:null,\&quot;visible\&quot;:true,\&quot;closed\&quot;:false,\&quot;archived\&quot;:false,\&quot;notification_level\&quot;:2,\&quot;bookmarked\&quot;:false,\&quot;liked\&quot;:false,\&quot;tags\&quot;:[],\&quot;archetype\&quot;:\&quot;regular\&quot;,\&quot;like_count\&quot;:13,\&quot;views\&quot;:698,\&quot;category_id\&quot;:1,\&quot;featured_link\&quot;:null,\&quot;has_accepted_answer\&quot;:false,\&quot;posters\&quot;:[{\&quot;extras\&quot;:null,\&quot;description\&quot;:\&quot;Original Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:27946,\&quot;username\&quot;:\&quot;nordize\&quot;,\&quot;name\&quot;:\&quot;Nordize\&quot;,\&quot;avatar_template\&quot;:\&quot;https://avatars.discourse.org/v4/letter/n/c68b51/{size}.png\&quot;}},{\&quot;extras\&quot;:null,\&quot;description\&quot;:\&quot;Frequent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:8617,\&quot;username\&quot;:\&quot;Mittineague\&quot;,\&quot;name\&quot;:\&quot;Mittineague\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/mittineague/{size}/114259_2.png\&quot;}},{\&quot;extras\&quot;:null,\&quot;description\&quot;:\&quot;Frequent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:25282,\&quot;username\&quot;:\&quot;hnaseri\&quot;,\&quot;name\&quot;:\&quot;Hosein Naseri\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/hnaseri/{size}/120660_2.png\&quot;}},{\&quot;extras\&quot;:null,\&quot;description\&quot;:\&quot;Frequent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:32,\&quot;username\&quot;:\&quot;codinghorror\&quot;,\&quot;name\&quot;:\&quot;Jeff Atwood\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/codinghorror/{size}/110067_2.png\&quot;}},{\&quot;extras\&quot;:\&quot;latest\&quot;,\&quot;description\&quot;:\&quot;Most Recent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:2,\&quot;username\&quot;:\&quot;neil\&quot;,\&quot;name\&quot;:\&quot;Neil Lalonde\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/neil/{size}/102150_2.png\&quot;}}]},{\&quot;id\&quot;:140124,\&quot;title\&quot;:\&quot;PII leak: Signup flow says email is \\\&quot;Never shown to the public\\\&quot;, then uses it for Gravatar\&quot;,\&quot;fancy_title\&quot;:\&quot;PII leak: Signup flow says email is \\u0026ldquo;Never shown to the public\\u0026rdquo;, then uses it for Gravatar\&quot;,\&quot;slug\&quot;:\&quot;pii-leak-signup-flow-says-email-is-never-shown-to-the-public-then-uses-it-for-gravatar\&quot;,\&quot;posts_count\&quot;:6,\&quot;reply_count\&quot;:3,\&quot;highest_post_number\&quot;:6,\&quot;image_url\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T22:44:53.454Z\&quot;,\&quot;last_posted_at\&quot;:\&quot;2020-01-30T05:00:05.087Z\&quot;,\&quot;bumped\&quot;:true,\&quot;bumped_at\&quot;:\&quot;2020-01-30T05:00:05.087Z\&quot;,\&quot;unseen\&quot;:true,\&quot;pinned\&quot;:false,\&quot;unpinned\&quot;:null,\&quot;visible\&quot;:true,\&quot;closed\&quot;:false,\&quot;archived\&quot;:false,\&quot;bookmarked\&quot;:null,\&quot;liked\&quot;:null,\&quot;tags\&quot;:[],\&quot;archetype\&quot;:\&quot;regular\&quot;,\&quot;like_count\&quot;:12,\&quot;views\&quot;:49,\&quot;category_id\&quot;:2,\&quot;featured_link\&quot;:null,\&quot;has_accepted_answer\&quot;:false,\&quot;posters\&quot;:[{\&quot;extras\&quot;:null,\&quot;description\&quot;:\&quot;Original Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:74463,\&quot;username\&quot;:\&quot;mcc\&quot;,\&quot;name\&quot;:\&quot;Andi McClure\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/mcc/{size}/168180_2.png\&quot;}},{\&quot;extras\&quot;:null,\&quot;description\&quot;:\&quot;Frequent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:32,\&quot;username\&quot;:\&quot;codinghorror\&quot;,\&quot;name\&quot;:\&quot;Jeff Atwood\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/codinghorror/{size}/110067_2.png\&quot;}},{\&quot;extras\&quot;:null,\&quot;description\&quot;:\&quot;Frequent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:8722,\&quot;username\&quot;:\&quot;Falco\&quot;,\&quot;name\&quot;:\&quot;Rafael dos Santos Silva\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/falco/{size}/87757_2.png\&quot;}},{\&quot;extras\&quot;:null,\&quot;description\&quot;:\&quot;Frequent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:5559,\&quot;username\&quot;:\&quot;downey\&quot;,\&quot;name\&quot;:\&quot;Michael Downey\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/downey/{size}/166878_2.png\&quot;}},{\&quot;extras\&quot;:\&quot;latest\&quot;,\&quot;description\&quot;:\&quot;Most Recent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:13042,\&quot;username\&quot;:\&quot;Stephen\&quot;,\&quot;name\&quot;:\&quot;Stephen\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/stephen/{size}/95011_2.png\&quot;}}]},{\&quot;id\&quot;:140109,\&quot;title\&quot;:\&quot;How to add ads on side?\&quot;,\&quot;fancy_title\&quot;:\&quot;How to add ads on side?\&quot;,\&quot;slug\&quot;:\&quot;how-to-add-ads-on-side\&quot;,\&quot;posts_count\&quot;:6,\&quot;reply_count\&quot;:2,\&quot;highest_post_number\&quot;:6,\&quot;image_url\&quot;:\&quot;https://d11a6trkgmumsb.cloudfront.net/optimized/3X/6/3/63531296124975f6b9211a4568aae4c198eaa95b_2_690x398.jpeg\&quot;,\&quot;created_at\&quot;:\&quot;2020-01-29T20:40:28.069Z\&quot;,\&quot;last_posted_at\&quot;:\&quot;2020-01-30T04:57:29.321Z\&quot;,\&quot;bumped\&quot;:true,\&quot;bumped_at\&quot;:\&quot;2020-01-30T04:57:29.321Z\&quot;,\&quot;unseen\&quot;:true,\&quot;pinned\&quot;:false,\&quot;unpinned\&quot;:null,\&quot;visible\&quot;:true,\&quot;closed\&quot;:false,\&quot;archived\&quot;:false,\&quot;bookmarked\&quot;:null,\&quot;liked\&quot;:null,\&quot;tags\&quot;:[],\&quot;archetype\&quot;:\&quot;regular\&quot;,\&quot;like_count\&quot;:3,\&quot;views\&quot;:55,\&quot;category_id\&quot;:77,\&quot;featured_link\&quot;:null,\&quot;has_accepted_answer\&quot;:false,\&quot;posters\&quot;:[{\&quot;extras\&quot;:null,\&quot;description\&quot;:\&quot;Original Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:72682,\&quot;username\&quot;:\&quot;Motadaol\&quot;,\&quot;name\&quot;:\&quot;fy1\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/motadaol/{size}/137238_2.png\&quot;}},{\&quot;extras\&quot;:null,\&quot;description\&quot;:\&quot;Frequent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:63814,\&quot;username\&quot;:\&quot;ondrejj\&quot;,\&quot;name\&quot;:\&quot;\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/ondrejj/{size}/153611_2.png\&quot;}},{\&quot;extras\&quot;:\&quot;latest\&quot;,\&quot;description\&quot;:\&quot;Most Recent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:32,\&quot;username\&quot;:\&quot;codinghorror\&quot;,\&quot;name\&quot;:\&quot;Jeff Atwood\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/codinghorror/{size}/110067_2.png\&quot;}}]},{\&quot;id\&quot;:139963,\&quot;title\&quot;:\&quot;Category Remains Muted after Category is available to Everyone\&quot;,\&quot;fancy_title\&quot;:\&quot;Category Remains Muted after Category is available to Everyone\&quot;,\&quot;slug\&quot;:\&quot;category-remains-muted-after-category-is-available-to-everyone\&quot;,\&quot;posts_count\&quot;:3,\&quot;reply_count\&quot;:0,\&quot;highest_post_number\&quot;:3,\&quot;image_url\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T17:03:58.481Z\&quot;,\&quot;last_posted_at\&quot;:\&quot;2020-01-30T04:55:28.257Z\&quot;,\&quot;bumped\&quot;:true,\&quot;bumped_at\&quot;:\&quot;2020-01-30T04:55:28.257Z\&quot;,\&quot;unseen\&quot;:true,\&quot;pinned\&quot;:false,\&quot;unpinned\&quot;:null,\&quot;visible\&quot;:true,\&quot;closed\&quot;:false,\&quot;archived\&quot;:false,\&quot;bookmarked\&quot;:null,\&quot;liked\&quot;:null,\&quot;tags\&quot;:[\&quot;data-explorer\&quot;],\&quot;archetype\&quot;:\&quot;regular\&quot;,\&quot;like_count\&quot;:3,\&quot;views\&quot;:43,\&quot;category_id\&quot;:6,\&quot;featured_link\&quot;:null,\&quot;has_accepted_answer\&quot;:false,\&quot;posters\&quot;:[{\&quot;extras\&quot;:null,\&quot;description\&quot;:\&quot;Original Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:73751,\&quot;username\&quot;:\&quot;Craig_Oates\&quot;,\&quot;name\&quot;:\&quot;Craig Oates\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/craig_oates/{size}/166411_2.png\&quot;}},{\&quot;extras\&quot;:null,\&quot;description\&quot;:\&quot;Frequent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:14353,\&quot;username\&quot;:\&quot;Simon_Cossar\&quot;,\&quot;name\&quot;:\&quot;Simon Cossar\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/simon_cossar/{size}/86411_2.png\&quot;}},{\&quot;extras\&quot;:\&quot;latest\&quot;,\&quot;description\&quot;:\&quot;Most Recent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:32,\&quot;username\&quot;:\&quot;codinghorror\&quot;,\&quot;name\&quot;:\&quot;Jeff Atwood\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/codinghorror/{size}/110067_2.png\&quot;}}]},{\&quot;id\&quot;:140133,\&quot;title\&quot;:\&quot;Ad not displayed within comments\&quot;,\&quot;fancy_title\&quot;:\&quot;Ad not displayed within comments\&quot;,\&quot;slug\&quot;:\&quot;ad-not-displayed-within-comments\&quot;,\&quot;posts_count\&quot;:1,\&quot;reply_count\&quot;:0,\&quot;highest_post_number\&quot;:1,\&quot;image_url\&quot;:\&quot;https://d11a6trkgmumsb.cloudfront.net/optimized/3X/4/9/4934694cefd1564e7182518cb41f0d7ac542de24_2_690x306.png\&quot;,\&quot;created_at\&quot;:\&quot;2020-01-30T04:51:43.425Z\&quot;,\&quot;last_posted_at\&quot;:\&quot;2020-01-30T04:51:43.567Z\&quot;,\&quot;bumped\&quot;:true,\&quot;bumped_at\&quot;:\&quot;2020-01-30T04:51:43.567Z\&quot;,\&quot;unseen\&quot;:true,\&quot;pinned\&quot;:false,\&quot;unpinned\&quot;:null,\&quot;visible\&quot;:true,\&quot;closed\&quot;:false,\&quot;archived\&quot;:false,\&quot;bookmarked\&quot;:null,\&quot;liked\&quot;:null,\&quot;tags\&quot;:[],\&quot;archetype\&quot;:\&quot;regular\&quot;,\&quot;like_count\&quot;:0,\&quot;views\&quot;:9,\&quot;category_id\&quot;:77,\&quot;featured_link\&quot;:null,\&quot;has_accepted_answer\&quot;:false,\&quot;posters\&quot;:[{\&quot;extras\&quot;:\&quot;latest single\&quot;,\&quot;description\&quot;:\&quot;Original Poster, Most Recent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:44821,\&quot;username\&quot;:\&quot;Eduardo_Braga\&quot;,\&quot;name\&quot;:\&quot;Eduardo\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/eduardo_braga/{size}/110348_2.png\&qquot;}}]}],\&quot;tags\&quot;:[],\&quot;id\&quot;:12483,\&quot;title\&quot;:\&quot;Congratulations, most stars in 2013 GitHub Octoverse!\&quot;,\&quot;fancy_title\&quot;:\&quot;Congratulations, most stars in 2013 GitHub Octoverse!\&quot;,\&quot;posts_count\&quot;:2,\&quot;created_at\&quot;:\&quot;2014-02-06T04:55:19.217Z\&quot;,\&quot;views\&quot;:1828,\&quot;reply_count\&quot;:0,\&quot;like_count\&quot;:9,\&quot;last_posted_at\&quot;:\&quot;2014-02-06T05:27:06.860Z\&quot;,\&quot;visible\&quot;:true,\&quot;closed\&quot;:false,\&quot;archived\&quot;:false,\&quot;has_summary\&quot;:false,\&quot;archetype\&quot;:\&quot;regular\&quot;,\&quot;slug\&quot;:\&quot;congratulations-most-stars-in-2013-github-octoverse\&quot;,\&quot;category_id\&quot;:35,\&quot;word_count\&quot;:77,\&quot;deleted_at\&quot;:null,\&quot;user_id\&quot;:8222,\&quot;featured_link\&quot;:null,\&quot;pinned_globally\&quot;:false,\&quot;pinned_at\&quot;:null,\&quot;pinned_until\&quot;:null,\&quot;image_url\&quot;:\&quot;https://d11a6trkgmumsb.cloudfront.net/optimized/2X/d/d063b3b0807377d98695ee08042a9ba0a8c593bd_2_690x362.png\&quot;,\&quot;draft\&quot;:null,\&quot;draft_key\&quot;:\&quot;topic_12483\&quot;,\&quot;draft_sequence\&quot;:3,\&quot;posted\&quot;:true,\&quot;unpinned\&quot;:null,\&quot;pinned\&quot;:false,\&quot;current_post_number\&quot;:1,\&quot;highest_post_number\&quot;:2,\&quot;last_read_post_number\&quot;:2,\&quot;last_read_post_id\&quot;:39741,\&quot;deleted_by\&quot;:null,\&quot;has_deleted\&quot;:false,\&quot;actions_summary\&quot;:[{\&quot;id\&quot;:4,\&quot;count\&quot;:0,\&quot;hidden\&quot;:false,\&quot;can_act\&quot;:true},{\&quot;id\&quot;:8,\&quot;count\&quot;:0,\&quot;hidden\&quot;:false,\&quot;can_act\&quot;:true},{\&quot;id\&quot;:7,\&quot;count\&quot;:0,\&quot;hidden\&quot;:false,\&quot;can_act\&quot;:true}],\&quot;chunk_size\&quot;:20,\&quot;bookmarked\&quot;:false,\&quot;topic_timer\&quot;:null,\&quot;private_topic_timer\&quot;:null,\&quot;message_bus_last_id\&quot;:0,\&quot;participant_count\&quot;:2,\&quot;show_read_indicator\&quot;:false,\&quot;tags_disable_ads\&quot;:false,\&quot;can_vote\&quot;:false,\&quot;vote_count\&quot;:null,\&quot;user_voted\&quot;:false,\&quot;details\&quot;:{\&quot;notification_level\&quot;:3,\&quot;notifications_reason_id\&quot;:1,\&quot;can_move_posts\&quot;:true,\&quot;can_edit\&quot;:true,\&quot;can_delete\&quot;:true,\&quot;can_remove_allowed_users\&quot;:true,\&quot;can_invite_to\&quot;:true,\&quot;can_invite_via_email\&quot;:true,\&quot;can_create_post\&quot;:true,\&quot;can_reply_as_new_topic\&quot;:true,\&quot;can_flag_topic\&quot;:true,\&quot;can_convert_topic\&quot;:true,\&quot;can_review_topic\&quot;:true,\&quot;can_remove_self_id\&quot;:8222,\&quot;participants\&quot;:[{\&quot;id\&quot;:32,\&quot;username\&quot;:\&quot;codinghorror\&quot;,\&quot;name\&quot;:\&quot;Jeff Atwood\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/codinghorror/{size}/110067_2.png\&quot;,\&quot;post_count\&quot;:1,\&quot;primary_group_name\&quot;:\&quot;team\&quot;,\&quot;flair_url\&quot;:\&quot;https://aws1.discourse-cdn.com/dev/original/2X/e/ebee30bd98aef20357e4a177a5a1e45b877ce088.svg\&quot;,\&quot;flair_color\&quot;:\&quot;111\&quot;,\&quot;flair_bg_color\&quot;:\&quot;\&quot;},{\&quot;id\&quot;:8222,\&quot;username\&quot;:\&quot;techAPJ\&quot;,\&quot;name\&quot;:\&quot;Arpit Jalan\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/techapj/{size}/152320_2.png\&quot;,\&quot;post_count\&quot;:1,\&quot;primary_group_name\&quot;:\&quot;team\&quot;,\&quot;flair_url\&quot;:\&quot;https://aws1.discourse-cdn.com/dev/original/2X/e/ebee30bd98aef20357e4a177a5a1e45b877ce088.svg\&quot;,\&quot;flair_color\&quot;:\&quot;111\&quot;,\&quot;flair_bg_color\&quot;:\&quot;\&quot;}],\&quot;created_by\&quot;:{\&quot;id\&quot;:8222,\&quot;username\&quot;:\&quot;techAPJ\&quot;,\&quot;name\&quot;:\&quot;Arpit Jalan\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/techapj/{size}/152320_2.png\&quot;},\&quot;last_poster\&quot;:{\&quot;id\&quot;:32,\&quot;username\&quot;:\&quot;codinghorror\&quot;,\&quot;name\&quot;:\&quot;Jeff Atwood\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/codinghorror/{size}/110067_2.png\&quot;},\&quot;links\&quot;:[{\&quot;url\&quot;:\&quot;http://octoverse.github.com/\&quot;,\&quot;title\&quot;:\&quot;GitHub Octoverse 2013\&quot;,\&quot;internal\&quot;:false,\&quot;attachment\&quot;:null,\&quot;reflection\&quot;:false,\&quot;clicks\&quot;:57,\&quot;user_id\&quot;:8222,\&quot;domain\&quot;:\&quot;octoverse.github.com\&quot;,\&quot;root_domain\&quot;:\&quot;github.com\&quot;}]}}&quot;}"></div>
-    <link rel="preload" href="https://d11a6trkgmumsb.cloudfront.net/assets/preload-application-data-9cd6a7a2a8ad52cfc915d1666732ca9372606dd922cd5793c1358e9924c0103a.br.js" as="script">
-<script src="https://d11a6trkgmumsb.cloudfront.net/assets/preload-application-data-9cd6a7a2a8ad52cfc915d1666732ca9372606dd922cd5793c1358e9924c0103a.br.js"></script>
-
-
-
-
-    <link rel="preload" href="https://d11a6trkgmumsb.cloudfront.net/assets/browser-update-1741a2ed67a367faeb0a582af064457e8b1b1354e52e6efcf8bf26301166dec8.br.js" as="script">
-<script src="https://d11a6trkgmumsb.cloudfront.net/assets/browser-update-1741a2ed67a367faeb0a582af064457e8b1b1354e52e6efcf8bf26301166dec8.br.js"></script>
-
-
-
-
-  <script async type="text/javascript" id="mini-profiler" src="/mini-profiler-resources/includes.js?v=2ed167b8bd3b0bc4e43c9ba3d0c679e4" data-version="2ed167b8bd3b0bc4e43c9ba3d0c679e4" data-path="/mini-profiler-resources/" data-current-id="ux63q9n52151a6psgpu0" data-ids="ux63q9n52151a6psgpu0" data-horizontal-position="left" data-vertical-position="top" data-trivial="false" data-children="false" data-max-traces="20" data-controls="false" data-total-sql-count="false" data-authorized="true" data-toggle-shortcut="alt+p" data-start-hidden="false" data-collapse-results="true" data-html-container="body"></script>
 </body>
 </html>
diff --git a/spec/fixtures/onebox/discourse_topic_reply.response b/spec/fixtures/onebox/discourse_topic_reply.response
index 2412540fbec..acd3b06b6f2 100644
--- a/spec/fixtures/onebox/discourse_topic_reply.response
+++ b/spec/fixtures/onebox/discourse_topic_reply.response
@@ -249,7 +249,7 @@ And that too in just over an year, way to go! [boom]">
               <time itemprop='dateModified' datetime='2015-06-19T06:45:49Z' class='post-time'>
                 June 19, 2015,  6:45am
               </time>
-          <span itemprop='position'>#1</span>
+          <span itemprop='position'>1</span>
           </span>
         </div>
         <div class='post' itemprop='articleBody'>
@@ -288,7 +288,7 @@ And that too in just over an year, way to go! [boom]">
               <time itemprop='datePublished' datetime='2014-02-06T05:27:06Z' class='post-time'>
                 February 6, 2014,  5:27am
               </time>
-          <span itemprop='position'>#2</span>
+          <span itemprop='position'>2</span>
           </span>
         </div>
         <div class='post' itemprop='articleBody'>
@@ -350,8 +350,6 @@ And that too in just over an year, way to go! [boom]">
     <div id='offscreen-content'>
     </div>
 
-
-    <div class="hidden" id="data-preloaded" data-preloaded="{&quot;site&quot;:&quot;{\&quot;default_archetype\&quot;:\&quot;regular\&quot;,\&quot;notification_types\&quot;:{\&quot;mentioned\&quot;:1,\&quot;replied\&quot;:2,\&quot;quoted\&quot;:3,\&quot;edited\&quot;:4,\&quot;liked\&quot;:5,\&quot;private_message\&quot;:6,\&quot;invited_to_private_message\&quot;:7,\&quot;invitee_accepted\&quot;:8,\&quot;posted\&quot;:9,\&quot;moved_post\&quot;:10,\&quot;linked\&quot;:11,\&quot;granted_badge\&quot;:12,\&quot;invited_to_topic\&quot;:13,\&quot;custom\&quot;:14,\&quot;group_mentioned\&quot;:15,\&quot;group_message_summary\&quot;:16,\&quot;watching_first_post\&quot;:17,\&quot;topic_reminder\&quot;:18,\&quot;liked_consolidated\&quot;:19,\&quot;post_approved\&quot;:20,\&quot;code_review_commit_approved\&quot;:21,\&quot;membership_request_accepted\&quot;:22,\&quot;membership_request_consolidated\&quot;:23},\&quot;post_types\&quot;:{\&quot;regular\&quot;:1,\&quot;moderator_action\&quot;:2,\&quot;small_action\&quot;:3,\&quot;whisper\&quot;:4},\&quot;groups\&quot;:[{\&quot;id\&quot;:1,\&quot;name\&quot;:\&quot;admins\&quot;},{\&quot;id\&quot;:92,\&quot;name\&quot;:\&quot;Amazon\&quot;},{\&quot;id\&quot;:91,\&quot;name\&quot;:\&quot;aws_emails\&quot;},{\&quot;id\&quot;:62,\&quot;name\&quot;:\&quot;codecademy\&quot;},{\&quot;id\&quot;:58,\&quot;name\&quot;:\&quot;coinbase\&quot;},{\&quot;id\&quot;:86,\&quot;name\&quot;:\&quot;community\&quot;},{\&quot;id\&quot;:97,\&quot;name\&quot;:\&quot;dev-managers\&quot;},{\&quot;id\&quot;:71,\&quot;name\&quot;:\&quot;Discoursehosting\&quot;},{\&quot;id\&quot;:90,\&quot;name\&quot;:\&quot;encrypt-users\&quot;},{\&quot;id\&quot;:55,\&quot;name\&quot;:\&quot;envato\&quot;},{\&quot;id\&quot;:0,\&quot;name\&quot;:\&quot;everyone\&quot;},{\&quot;id\&quot;:79,\&quot;name\&quot;:\&quot;ford\&quot;},{\&quot;id\&quot;:99,\&quot;name\&quot;:\&quot;freertos\&quot;},{\&quot;id\&quot;:89,\&quot;name\&quot;:\&quot;free-signups\&quot;},{\&quot;id\&quot;:87,\&quot;name\&quot;:\&quot;free-support\&quot;},{\&quot;id\&quot;:81,\&quot;name\&quot;:\&quot;gartner\&quot;},{\&quot;id\&quot;:59,\&quot;name\&quot;:\&quot;gaspedal\&quot;},{\&quot;id\&quot;:94,\&quot;name\&quot;:\&quot;global_communities\&quot;},{\&quot;id\&quot;:88,\&quot;name\&quot;:\&quot;infinite_flight\&quot;},{\&quot;id\&quot;:69,\&quot;name\&quot;:\&quot;laruchequiditoui\&quot;},{\&quot;id\&quot;:49,\&quot;name\&quot;:\&quot;mcneel\&quot;},{\&quot;id\&quot;:75,\&quot;name\&quot;:\&quot;migrators\&quot;},{\&quot;id\&quot;:2,\&quot;name\&quot;:\&quot;moderators\&quot;},{\&quot;id\&quot;:46,\&quot;name\&quot;:\&quot;newrelic\&quot;},{\&quot;id\&quot;:85,\&quot;name\&quot;:\&quot;ops\&quot;},{\&quot;id\&quot;:78,\&quot;name\&quot;:\&quot;outreachy\&quot;},{\&quot;id\&quot;:76,\&quot;name\&quot;:\&quot;pivotal\&quot;},{\&quot;id\&quot;:48,\&quot;name\&quot;:\&quot;plugin_authors\&quot;},{\&quot;id\&quot;:83,\&quot;name\&quot;:\&quot;ProCourse\&quot;},{\&quot;id\&quot;:63,\&quot;name\&quot;:\&quot;rails\&quot;},{\&quot;id\&quot;:98,\&quot;name\&quot;:\&quot;RedHat\&quot;},{\&quot;id\&quot;:65,\&quot;name\&quot;:\&quot;rgsoc2016\&quot;},{\&quot;id\&quot;:52,\&quot;name\&quot;:\&quot;sitepoint\&quot;},{\&quot;id\&quot;:56,\&quot;name\&quot;:\&quot;sketchup\&quot;},{\&quot;id\&quot;:3,\&quot;name\&quot;:\&quot;staff\&quot;},{\&quot;id\&quot;:74,\&quot;name\&quot;:\&quot;summer_of_code\&quot;},{\&quot;id\&quot;:77,\&quot;name\&quot;:\&quot;support\&quot;},{\&quot;id\&quot;:47,\&quot;name\&quot;:\&quot;team\&quot;},{\&quot;id\&quot;:95,\&quot;name\&quot;:\&quot;tech_advocates\&quot;},{\&quot;id\&quot;:73,\&quot;name\&quot;:\&quot;theme_authors\&quot;},{\&quot;id\&quot;:84,\&quot;name\&quot;:\&quot;theme_creator\&quot;},{\&quot;id\&quot;:50,\&quot;name\&quot;:\&quot;translators\&quot;},{\&quot;id\&quot;:10,\&quot;name\&quot;:\&quot;trust_level_0\&quot;},{\&quot;id\&quot;:11,\&quot;name\&quot;:\&quot;trust_level_1\&quot;},{\&quot;id\&quot;:12,\&quot;name\&quot;:\&quot;trust_level_2\&quot;},{\&quot;id\&quot;:13,\&quot;name\&quot;:\&quot;trust_level_3\&quot;},{\&quot;id\&quot;:14,\&quot;name\&quot;:\&quot;trust_level_4\&quot;},{\&quot;id\&quot;:57,\&quot;name\&quot;:\&quot;tudiabetes\&quot;},{\&quot;id\&quot;:61,\&quot;name\&quot;:\&quot;twitter\&quot;},{\&quot;id\&quot;:80,\&quot;name\&quot;:\&quot;udacity\&quot;},{\&quot;id\&quot;:96,\&quot;name\&quot;:\&quot;warner\&quot;},{\&quot;id\&quot;:53,\&quot;name\&quot;:\&quot;western_digital\&quot;},{\&quot;id\&quot;:82,\&quot;name\&quot;:\&quot;woot\&quot;}],\&quot;filters\&quot;:[\&quot;latest\&quot;,\&quot;unread\&quot;,\&quot;new\&quot;,\&quot;read\&quot;,\&quot;posted\&quot;,\&quot;bookmarks\&quot;,\&quot;votes\&quot;],\&quot;periods\&quot;:[\&quot;all\&quot;,\&quot;yearly\&quot;,\&quot;quarterly\&quot;,\&quot;monthly\&quot;,\&quot;weekly\&quot;,\&quot;daily\&quot;],\&quot;top_menu_items\&quot;:[\&quot;latest\&quot;,\&quot;unread\&quot;,\&quot;new\&quot;,\&quot;read\&quot;,\&quot;posted\&quot;,\&quot;bookmarks\&quot;,\&quot;categories\&quot;,\&quot;top\&quot;,\&quot;votes\&quot;],\&quot;anonymous_top_menu_items\&quot;:[\&quot;latest\&quot;,\&quot;top\&quot;,\&quot;categories\&quot;,\&quot;categories\&quot;,\&quot;top\&quot;,\&quot;votes\&quot;],\&quot;uncategorized_category_id\&quot;:17,\&quot;is_readonly\&quot;:false,\&quot;disabled_plugins\&quot;:[\&quot;discourse-patreon\&quot;],\&quot;user_field_max_length\&quot;:2048,\&quot;post_action_types\&quot;:[{\&quot;id\&quot;:1,\&quot;name_key\&quot;:\&quot;bookmark\&quot;,\&quot;name\&quot;:\&quot;Bookmark\&quot;,\&quot;description\&quot;:\&quot;Bookmark this post\&quot;,\&quot;short_description\&quot;:\&quot;Bookmark this post\&quot;,\&quot;long_form\&quot;:\&quot;bookmarked this post\&quot;,\&quot;is_flag\&quot;:false,\&quot;is_custom_flag\&quot;:false},{\&quot;id\&quot;:2,\&quot;name_key\&quot;:\&quot;like\&quot;,\&quot;name\&quot;:\&quot;Like\&quot;,\&quot;description\&quot;:\&quot;Like this post\&quot;,\&quot;short_description\&quot;:\&quot;Like this post\&quot;,\&quot;long_form\&quot;:\&quot;liked this\&quot;,\&quot;is_flag\&quot;:false,\&quot;is_custom_flag\&quot;:false},{\&quot;id\&quot;:3,\&quot;name_key\&quot;:\&quot;off_topic\&quot;,\&quot;name\&quot;:\&quot;Off-Topic\&quot;,\&quot;description\&quot;:\&quot;This post is not relevant to the current discussion as defined by the title and first post, and should probably be moved elsewhere.\&quot;,\&quot;short_description\&quot;:\&quot;Not relevant to the discussion\&quot;,\&quot;long_form\&quot;:\&quot;flagged this as off-topic\&quot;,\&quot;is_flag\&quot;:true,\&quot;is_custom_flag\&quot;:false},{\&quot;id\&quot;:4,\&quot;name_key\&quot;:\&quot;inappropriate\&quot;,\&quot;name\&quot;:\&quot;Inappropriate\&quot;,\&quot;description\&quot;:\&quot;This post contains content that a reasonable person would consider offensive, abusive, or a violation of \\u003ca href=\\\&quot;/guidelines\\\&quot;\\u003eour community guidelines\\u003c/a\\u003e.\&quot;,\&quot;short_description\&quot;:\&quot;A violation of \\u003ca href=\\\&quot;/guidelines\\\&quot;\\u003eour community guidelines\\u003c/a\\u003e\&quot;,\&quot;long_form\&quot;:\&quot;flagged this as inappropriate\&quot;,\&quot;is_flag\&quot;:true,\&quot;is_custom_flag\&quot;:false},{\&quot;id\&quot;:8,\&quot;name_key\&quot;:\&quot;spam\&quot;,\&quot;name\&quot;:\&quot;Spam\&quot;,\&quot;description\&quot;:\&quot;This post is an advertisement, or vandalism. It is not useful or relevant to the current topic.\&quot;,\&quot;short_description\&quot;:\&quot;This is an advertisement or vandalism\&quot;,\&quot;long_form\&quot;:\&quot;flagged this as spam\&quot;,\&quot;is_flag\&quot;:true,\&quot;is_custom_flag\&quot;:false},{\&quot;id\&quot;:6,\&quot;name_key\&quot;:\&quot;notify_user\&quot;,\&quot;name\&quot;:\&quot;Send @{{username}} a message\&quot;,\&quot;description\&quot;:\&quot;I want to talk to this person directly and personally about their post.\&quot;,\&quot;short_description\&quot;:\&quot;I want to talk to this person directly and personally about their post.\&quot;,\&quot;long_form\&quot;:\&quot;messaged user\&quot;,\&quot;is_flag\&quot;:true,\&quot;is_custom_flag\&quot;:true},{\&quot;id\&quot;:null,\&quot;name_key\&quot;:null,\&quot;name\&quot;:\&quot;translation missing: en_US.post_action_types..title\&quot;,\&quot;description\&quot;:\&quot;translation missing: en_US.post_action_types.description\&quot;,\&quot;short_description\&quot;:\&quot;translation missing: en_US.post_action_types.short_description\&quot;,\&quot;long_form\&quot;:\&quot;translation missing: en_US.post_action_types..long_form\&quot;,\&quot;is_flag\&quot;:false,\&quot;is_custom_flag\&quot;:false},{\&quot;id\&quot;:7,\&quot;name_key\&quot;:\&quot;notify_moderators\&quot;,\&quot;name\&quot;:\&quot;Something Else\&quot;,\&quot;description\&quot;:\&quot;This post requires staff attention for another reason not listed above.\&quot;,\&quot;short_description\&quot;:\&quot;Requires staff attention for another reason\&quot;,\&quot;long_form\&quot;:\&quot;flagged this for staff attention\&quot;,\&quot;is_flag\&quot;:true,\&quot;is_custom_flag\&quot;:true}],\&quot;topic_flag_types\&quot;:[{\&quot;id\&quot;:4,\&quot;name_key\&quot;:\&quot;inappropriate\&quot;,\&quot;name\&quot;:\&quot;Inappropriate\&quot;,\&quot;description\&quot;:\&quot;This topic contains content that a reasonable person would consider offensive, abusive, or a violation of \\u003ca href=\\\&quot;/guidelines\\\&quot;\\u003eour community guidelines\\u003c/a\\u003e.\&quot;,\&quot;short_description\&quot;:\&quot;A violation of \\u003ca href=\\\&quot;/guidelines\\\&quot;\\u003eour community guidelines\\u003c/a\\u003e\&quot;,\&quot;long_form\&quot;:\&quot;flagged this as inappropriate\&quot;,\&quot;is_flag\&quot;:true,\&quot;is_custom_flag\&quot;:false},{\&quot;id\&quot;:8,\&quot;name_key\&quot;:\&quot;spam\&quot;,\&quot;name\&quot;:\&quot;Spam\&quot;,\&quot;description\&quot;:\&quot;This topic is an advertisement. It is not useful or relevant to this site, but promotional in nature.\&quot;,\&quot;short_description\&quot;:\&quot;This is an advertisement\&quot;,\&quot;long_form\&quot;:\&quot;flagged this as spam\&quot;,\&quot;is_flag\&quot;:true,\&quot;is_custom_flag\&quot;:false},{\&quot;id\&quot;:null,\&quot;name_key\&quot;:null,\&quot;name\&quot;:\&quot;translation missing: en_US.topic_flag_types..title\&quot;,\&quot;description\&quot;:\&quot;translation missing: en_US.topic_flag_types.description\&quot;,\&quot;short_description\&quot;:\&quot;translation missing: en_US.topic_flag_types.short_description\&quot;,\&quot;long_form\&quot;:\&quot;translation missing: en_US.topic_flag_types..long_form\&quot;,\&quot;is_flag\&quot;:false,\&quot;is_custom_flag\&quot;:false},{\&quot;id\&quot;:7,\&quot;name_key\&quot;:\&quot;notify_moderators\&quot;,\&quot;name\&quot;:\&quot;Something Else\&quot;,\&quot;description\&quot;:\&quot;This topic requires general staff attention based on the \\u003ca href=\\\&quot;/guidelines\\\&quot;\\u003eguidelines\\u003c/a\\u003e, \\u003ca href=\\\&quot;/tos\\\&quot;\\u003eTOS\\u003c/a\\u003e, or for another reason not listed above.\&quot;,\&quot;short_description\&quot;:\&quot;Requires staff attention for another reason\&quot;,\&quot;long_form\&quot;:\&quot;flagged this for moderator attention\&quot;,\&quot;is_flag\&quot;:true,\&quot;is_custom_flag\&quot;:true}],\&quot;can_create_tag\&quot;:true,\&quot;can_tag_topics\&quot;:true,\&quot;can_tag_pms\&quot;:true,\&quot;tags_filter_regexp\&quot;:\&quot;[/\\\\?#\\\\[\\\\]@!\\\\$\\u0026&#39;\\\\(\\\\)\\\\*\\\\+,;=\\\\.%\\\\\\\\`^\\\\s|\\\\{\\\\}\\\&quot;\\u003c\\u003e]+\&quot;,\&quot;top_tags\&quot;:[\&quot;unsupported-install\&quot;,\&quot;pr-welcome\&quot;,\&quot;theme-component\&quot;,\&quot;faq-material\&quot;,\&quot;faq-material-review\&quot;,\&quot;email\&quot;,\&quot;docker\&quot;,\&quot;css\&quot;,\&quot;markdown-it-review\&quot;,\&quot;rfc\&quot;,\&quot;import\&quot;,\&quot;official\&quot;,\&quot;release-notes\&quot;,\&quot;feature\&quot;,\&quot;plugins\&quot;,\&quot;wordpress\&quot;,\&quot;sso\&quot;,\&quot;badge\&quot;,\&quot;tagging\&quot;,\&quot;spec\&quot;,\&quot;feedback\&quot;,\&quot;themes\&quot;,\&quot;admin\&quot;,\&quot;api\&quot;,\&quot;javascript\&quot;,\&quot;planned\&quot;,\&quot;translation\&quot;,\&quot;ui\&quot;,\&quot;onebox\&quot;,\&quot;groups\&quot;],\&quot;topic_featured_link_allowed_category_ids\&quot;:[9,63,30,66,68,1,62,65,83,59,48,78,35,34,4,89,61,82,27,7,31,60,22,14,25,24,53,84,58,8,13,90,69,56,2,73,74,6,77,10,45,75,67,17,55,21,20,3,5,76],\&quot;user_themes\&quot;:[{\&quot;theme_id\&quot;:31,\&quot;name\&quot;:\&quot;Dark Theme\&quot;,\&quot;default\&quot;:false},{\&quot;theme_id\&quot;:51,\&quot;name\&quot;:\&quot;Discourse-classic\&quot;,\&quot;default\&quot;:false},{\&quot;theme_id\&quot;:123,\&quot;name\&quot;:\&quot;Fakebook\&quot;,\&quot;default\&quot;:false},{\&quot;theme_id\&quot;:166,\&quot;name\&quot;:\&quot;Focused Sidebar\&quot;,\&quot;default\&quot;:false},{\&quot;theme_id\&quot;:167,\&quot;name\&quot;:\&quot;Focused Sidebar (dark)\&quot;,\&quot;default\&quot;:false},{\&quot;theme_id\&quot;:131,\&quot;name\&quot;:\&quot;Ghost\&quot;,\&quot;default\&quot;:false},{\&quot;theme_id\&quot;:80,\&quot;name\&quot;:\&quot;Graceful\&quot;,\&quot;default\&quot;:false},{\&quot;theme_id\&quot;:83,\&quot;name\&quot;:\&quot;Grey Amber\&quot;,\&quot;default\&quot;:false},{\&quot;theme_id\&quot;:148,\&quot;name\&quot;:\&quot;Hidden Whispers\&quot;,\&quot;default\&quot;:false},{\&quot;theme_id\&quot;:28,\&quot;name\&quot;:\&quot;Light Theme\&quot;,\&quot;default\&quot;:true},{\&quot;theme_id\&quot;:34,\&quot;name\&quot;:\&quot;Material Design\&quot;,\&quot;default\&quot;:false},{\&quot;theme_id\&quot;:119,\&quot;name\&quot;:\&quot;Minima\&quot;,\&quot;default\&quot;:false},{\&quot;theme_id\&quot;:125,\&quot;name\&quot;:\&quot;Minima Dark\&quot;,\&quot;default\&quot;:false},{\&quot;theme_id\&quot;:30,\&quot;name\&quot;:\&quot;Sam&#39;s Simple Theme\&quot;,\&quot;default\&quot;:false}],\&quot;censored_regexp\&quot;:null,\&quot;shared_drafts_category_id\&quot;:25,\&quot;group_list_use_ids\&quot;:true,\&quot;house_creatives\&quot;:{\&quot;settings\&quot;:{\&quot;topic_list_top\&quot;:\&quot;\&quot;,\&quot;topic_above_post_stream\&quot;:\&quot;\&quot;,\&quot;topic_above_suggested\&quot;:\&quot;\&quot;,\&quot;post_bottom\&quot;:\&quot;\&quot;,\&quot;after_nth_post\&quot;:10,\&quot;house_ads_frequency\&quot;:100},\&quot;creatives\&quot;:{}},\&quot;hosting_tier\&quot;:\&quot;enterprise\&quot;,\&quot;categories\&quot;:[{\&quot;id\&quot;:10,\&quot;name\&quot;:\&quot;howto\&quot;,\&quot;color\&quot;:\&quot;76923C\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;howto\&quot;,\&quot;topic_count\&quot;:27,\&quot;post_count\&quot;:249,\&quot;position\&quot;:0,\&quot;description\&quot;:\&quot;Tutorial topics that describe how to set up, configure, or install Discourse using a specific platform or environment. Topics in this category may only be created by trust level 2 and up. \&quot;,\&quot;description_text\&quot;:\&quot;Tutorial topics that describe how to set up, configure, or install Discourse using a specific platform or environment. Topics in this category may only be created by trust level 2 and up.\&quot;,\&quot;description_excerpt\&quot;:\&quot;Tutorial topics that describe how to set up, configure, or install Discourse using a specific platform or environment. Topics in this category may only be created by trust level 2 and up.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/category-definition-for-howto/2629\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:4,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:true,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;top\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;boxes_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:true,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:1,\&quot;name\&quot;:\&quot;bug\&quot;,\&quot;color\&quot;:\&quot;e9dd00\&quot;,\&quot;text_color\&quot;:\&quot;000000\&quot;,\&quot;slug\&quot;:\&quot;bug\&quot;,\&quot;topic_count\&quot;:3188,\&quot;post_count\&quot;:22709,\&quot;position\&quot;:1,\&quot;description\&quot;:\&quot;A bug report means \\u003cstrong\\u003esomething is broken, preventing normal/typical use of Discourse\\u003c/strong\\u003e. Do be sure to search prior to submitting bugs. Include repro steps, and only describe one bug per topic please.\&quot;,\&quot;description_text\&quot;:\&quot;A bug report means something is broken, preventing normal\\u0026#x2F;typical use of Discourse. Do be sure to search prior to submitting bugs. Include repro steps, and only describe one bug per topic please.\&quot;,\&quot;description_excerpt\&quot;:\&quot;A bug report means something is broken, preventing normal/typical use of Discourse. Do be sure to search prior to submitting bugs. Include repro steps, and only describe one bug per topic please.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/category-definition-for-bug/2\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:2,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:2,\&quot;name\&quot;:\&quot;feature\&quot;,\&quot;color\&quot;:\&quot;0E76BD\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;feature\&quot;,\&quot;topic_count\&quot;:4625,\&quot;post_count\&quot;:41274,\&quot;position\&quot;:2,\&quot;description\&quot;:\&quot;Discussion about existing Discourse features, how they can be improved or enhanced, and how proposed new features could work.\&quot;,\&quot;description_text\&quot;:\&quot;Discussion about existing Discourse features, how they can be improved or enhanced, and how proposed new features could work.\&quot;,\&quot;description_excerpt\&quot;:\&quot;Discussion about existing Discourse features, how they can be improved or enhanced, and how proposed new features could work.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/category-definition-for-feature/11\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:true,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:9,\&quot;name\&quot;:\&quot;ux\&quot;,\&quot;color\&quot;:\&quot;5F497A\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;ux\&quot;,\&quot;topic_count\&quot;:1396,\&quot;post_count\&quot;:10529,\&quot;position\&quot;:3,\&quot;description\&quot;:\&quot;Discussion about the user interface of Discourse, how features are presented to the user in the client, including language and UI elements.\&quot;,\&quot;description_text\&quot;:\&quot;Discussion about the user interface of Discourse, how features are presented to the user in the client, including language and UI elements.\&quot;,\&quot;description_excerpt\&quot;:\&quot;Discussion about the user interface of Discourse, how features are presented to the user in the client, including language and UI elements.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/category-definition-for-ux/2628\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:null,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:null,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:null,\&quot;subcategory_list_style\&quot;:\&quot;rows\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:65,\&quot;name\&quot;:\&quot;community\&quot;,\&quot;color\&quot;:\&quot;12A89D\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;community\&quot;,\&quot;topic_count\&quot;:421,\&quot;post_count\&quot;:4011,\&quot;position\&quot;:4,\&quot;description\&quot;:\&quot;A great platform doesn’t guarantee success. Community building is a science. This category is for discussions about launching, building, growing and managing a thriving community.\&quot;,\&quot;description_text\&quot;:\&quot;A great platform doesn’t guarantee success. Community building is a science. This category is for discussions about launching, building, growing and managing a thriving community.\&quot;,\&quot;description_excerpt\&quot;:\&quot;A great platform doesn’t guarantee success. Community building is a science. This category is for discussions about launching, building, growing and managing a thriving community.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-community-category/67750\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:7,\&quot;name\&quot;:\&quot;dev\&quot;,\&quot;color\&quot;:\&quot;292929\&quot;,\&quot;text_color\&quot;:\&quot;fff\&quot;,\&quot;slug\&quot;:\&quot;dev\&quot;,\&quot;topic_count\&quot;:1572,\&quot;post_count\&quot;:9342,\&quot;position\&quot;:5,\&quot;description\&quot;:\&quot;Anything related to hacking on Discourse: submitting pull requests, configuring development environments, coding conventions, and so forth.\&quot;,\&quot;description_text\&quot;:\&quot;Anything related to hacking on Discourse: submitting pull requests, configuring development environments, coding conventions, and so forth.\&quot;,\&quot;description_excerpt\&quot;:\&quot;Anything related to hacking on Discourse: submitting pull requests, configuring development environments, coding conventions, and so forth.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/category-definition-for-dev/1026\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:true,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;boxes\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:3,\&quot;name\&quot;:\&quot;Site Feedback\&quot;,\&quot;color\&quot;:\&quot;aaa\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;site-feedback\&quot;,\&quot;topic_count\&quot;:275,\&quot;post_count\&quot;:2272,\&quot;position\&quot;:6,\&quot;description\&quot;:\&quot;Discussion about meta.discourse.org itself, the organization of this forum about Discourse, how it works, and how we can improve this site.\&quot;,\&quot;description_text\&quot;:\&quot;Discussion about meta.discourse.org itself, the organization of this forum about Discourse, how it works, and how we can improve this site.\&quot;,\&quot;description_excerpt\&quot;:\&quot;Discussion about meta.discourse.org itself, the organization of this forum about Discourse, how it works, and how we can improve this site.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/category-definition-for-meta/24\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:true,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:\&quot;\&quot;},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:5,\&quot;name\&quot;:\&quot;extras\&quot;,\&quot;color\&quot;:\&quot;25AAE2\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;extras\&quot;,\&quot;topic_count\&quot;:36,\&quot;post_count\&quot;:471,\&quot;position\&quot;:7,\&quot;description\&quot;:\&quot;A directory of all extensions \\u0026amp; integrations for Discourse which are \\u003cem\\u003enot\\u003c/em\\u003e Discourse plugins, i.e. a CMS plugin, a browser extension or a native application.\&quot;,\&quot;description_text\&quot;:\&quot;A directory of all extensions \\u0026amp; integrations for Discourse which are not Discourse plugins, i.e. a CMS plugin, a browser extension or a native application.\&quot;,\&quot;description_excerpt\&quot;:\&quot;A directory of all extensions \\u0026amp; integrations for Discourse which are not Discourse plugins, i.e. a CMS plugin, a browser extension or a native application.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-extras-category/28\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:22,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:null,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:null,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:6,\&quot;name\&quot;:\&quot;support\&quot;,\&quot;color\&quot;:\&quot;CEA9A9\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;support\&quot;,\&quot;topic_count\&quot;:10156,\&quot;post_count\&quot;:71668,\&quot;position\&quot;:8,\&quot;description\&quot;:\&quot;Support on configuring and using Discourse after it is up and running. For installation questions, use the install category.\&quot;,\&quot;description_text\&quot;:\&quot;Support on configuring and using Discourse after it is up and running. For installation questions, use the install category.\&quot;,\&quot;description_excerpt\&quot;:\&quot;Support on configuring and using Discourse after it is up and running. For installation questions, use the install category.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/category-definition-for-support/389\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:true,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:\&quot;true\&quot;},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:24,\&quot;name\&quot;:\&quot;sso\&quot;,\&quot;color\&quot;:\&quot;d47711\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;sso\&quot;,\&quot;topic_count\&quot;:165,\&quot;post_count\&quot;:793,\&quot;position\&quot;:9,\&quot;description\&quot;:\&quot;For queries specifically about SSO (single sign on) and and login using third party providers (Google, Facebook, GitHub etc). See the \\u003ca href=\\\&quot;https://meta.discourse.org/t/official-single-sign-on-for-discourse/13045\\\&quot;\\u003eofficial documentation on Discourse&#39;s SSO support\\u003c/a\\u003e.\&quot;,\&quot;description_text\&quot;:\&quot;For queries specifically about SSO (single sign on) and and login using third party providers (Google, Facebook, GitHub etc). See the official documentation on Discourse\\u0026#x27;s SSO support.\&quot;,\&quot;description_excerpt\&quot;:\&quot;For queries specifically about SSO (single sign on) and and login using third party providers (Google, Facebook, GitHub etc). See the \\u003ca href=\\\&quot;https://meta.discourse.org/t/official-single-sign-on-for-discourse/13045\\\&quot;\\u003eofficial documentation on Discourse\\u0026#39;s SSO support\\u003c/a\\u003e.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-sso-category/13110\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:7,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quotquot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:null,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:null,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:27,\&quot;name\&quot;:\&quot;translations\&quot;,\&quot;color\&quot;:\&quot;808281\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;translations\&quot;,\&quot;topic_count\&quot;:214,\&quot;post_count\&quot;:1286,\&quot;position\&quot;:10,\&quot;description\&quot;:\&quot;This category is for discussion about localizing Discourse.\&quot;,\&quot;description_text\&quot;:\&quot;This category is for discussion about localizing Discourse.\&quot;,\&quot;description_excerpt\&quot;:\&quot;This category is for discussion about localizing Discourse.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-translations-category/14549\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:7,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:8,\&quot;name\&quot;:\&quot;hosting\&quot;,\&quot;color\&quot;:\&quot;74CCED\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;hosting\&quot;,\&quot;topic_count\&quot;:352,\&quot;post_count\&quot;:3017,\&quot;position\&quot;:12,\&quot;description\&quot;:\&quot;Topics about hosting Discourse, either on your own servers, in the cloud, or with specific hosting services.\&quot;,\&quot;description_text\&quot;:\&quot;Topics about hosting Discourse, either on your own servers, in the cloud, or with specific hosting services.\&quot;,\&quot;description_excerpt\&quot;:\&quot;Topics about hosting Discourse, either on your own servers, in the cloud, or with specific hosting services.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/category-definition-for-hosting/2626\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:null,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:null,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:null,\&quot;subcategory_list_style\&quot;:\&quot;rows\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:21,\&quot;name\&quot;:\&quot;wordpress\&quot;,\&quot;color\&quot;:\&quot;F9CFCF\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;wordpress\&quot;,\&quot;topic_count\&quot;:491,\&quot;post_count\&quot;:3445,\&quot;position\&quot;:14,\&quot;description\&quot;:\&quot;Support for the official Discourse WordPress plugin at \\u003ca href=\\\&quot;https://github.com/discourse/wp-discourse\\\&quot;\\u003ehttps://github.com/discourse/wp-discourse\\u003c/a\\u003e\&quot;,\&quot;description_text\&quot;:\&quot;Support for the official Discourse WordPress plugin at https:\\u0026#x2F;\\u0026#x2F;github.com\\u0026#x2F;discourse\\u0026#x2F;wp-discourse\&quot;,\&quot;description_excerpt\&quot;:\&quot;Support for the official Discourse WordPress plugin at \\u003ca href=\\\&quot;https://github.com/discourse/wp-discourse\\\&quot;\\u003ehttps://github.com/discourse/wp-discourse\\u003c/a\\u003e\&quot;,\&quot;topic_url\&quot;:\&quot;/t/category-definition-for-wordpress/12282\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:6,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:\&quot;true\&quot;},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:20,\&quot;name\&quot;:\&quot;Lounge\&quot;,\&quot;color\&quot;:\&quot;EEEEEE\&quot;,\&quot;text_color\&quot;:\&quot;652D90\&quot;,\&quot;slug\&quot;:\&quot;lounge\&quot;,\&quot;topic_count\&quot;:78,\&quot;post_count\&quot;:935,\&quot;position\&quot;:15,\&quot;description\&quot;:\&quot;A category exclusive to members with trust level 3 and higher.\&quot;,\&quot;description_text\&quot;:\&quot;A category exclusive to members with trust level 3 and higher.\&quot;,\&quot;description_excerpt\&quot;:\&quot;A category exclusive to members with trust level 3 and higher.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/category-definition-for-lounge/12104\&quot;,\&quot;read_restricted\&quot;:true,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:null,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:null,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:null,\&quot;subcategory_list_style\&quot;:\&quot;rows\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:17,\&quot;name\&quot;:\&quot;Uncategorized\&quot;,\&quot;color\&quot;:\&quot;AB9364\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;uncategorized\&quot;,\&quot;topic_count\&quot;:14,\&quot;post_count\&quot;:362,\&quot;position\&quot;:16,\&quot;description\&quot;:\&quot;Topics that don&#39;t need a category, or don&#39;t fit into any other existing category.\&quot;,\&quot;description_text\&quot;:\&quot;Topics that don&#39;t need a category, or don&#39;t fit into any other existing category.\&quot;,\&quot;description_excerpt\&quot;:\&quot;Topics that don&#39;t need a category, or don&#39;t fit into any other existing category.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:null,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:null,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:null,\&quot;subcategory_list_style\&quot;:\&quot;rows\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:13,\&quot;name\&quot;:\&quot;blog\&quot;,\&quot;color\&quot;:\&quot;ED207B\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;blog\&quot;,\&quot;topic_count\&quot;:86,\&quot;post_count\&quot;:868,\&quot;position\&quot;:17,\&quot;description\&quot;:\&quot;Discussion topics generated from the official Discourse Blog. These topics are linked from the bottom of each blog entry where the blog comments would normally be.\&quot;,\&quot;description_text\&quot;:\&quot;Discussion topics generated from the official Discourse Blog. These topics are linked from the bottom of each blog entry where the blog comments would normally be.\&quot;,\&quot;description_excerpt\&quot;:\&quot;Discussion topics generated from the official Discourse Blog. These topics are linked from the bottom of each blog entry where the blog comments would normally be.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/category-definition-for-blog/5250\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:3,\&quot;notification_level\&quot;:4,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:14,\&quot;name\&quot;:\&quot;marketplace\&quot;,\&quot;color\&quot;:\&quot;8C6238\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;marketplace\&quot;,\&quot;topic_count\&quot;:651,\&quot;post_count\&quot;:3651,\&quot;position\&quot;:18,\&quot;description\&quot;:\&quot;About commercial Discourse related stuff: jobs or paid gigs, plugins, themes, hosting, etc. All soliciting must be in this public category, private solicitations are not permitted here.\&quot;,\&quot;description_text\&quot;:\&quot;About commercial Discourse related stuff: jobs or paid gigs, plugins, themes, hosting, etc. All soliciting must be in this public category, private solicitations are not permitted here.\&quot;,\&quot;description_excerpt\&quot;:\&quot;About commercial Discourse related stuff: jobs or paid gigs, plugins, themes, hosting, etc. All soliciting must be in this public category, private solicitations are not permitted here.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/category-definition-for-marketplace/5425\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;What would you like done?\\n\\nWhen do you need it done?\\n\\nWhat is your budget, in $ USD that you can offer for this task?\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:null,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:null,\&quot;subcategory_list_style\&quot;:\&quot;rows\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:22,\&quot;name\&quot;:\&quot;plugin\&quot;,\&quot;color\&quot;:\&quot;F7941D\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;plugin\&quot;,\&quot;topic_count\&quot;:186,\&quot;post_count\&quot;:7242,\&quot;position\&quot;:19,\&quot;description\&quot;:\&quot;Plugin directory. To post here, use the \\u003ca href=\\\&quot;https://meta.discourse.org/groups/plugin_authors\\\&quot;\\u003e\\u003ckbd\\u003eRequest Access\\u003c/kbd\\u003e button on the group page\\u003c/a\\u003e \\u003cstrong\\u003ewith a link\\u003c/strong\\u003e to your plugin.\&quot;,\&quot;description_text\&quot;:\&quot;Plugin directory. To post here, use the Request Access button on the group page with a link to your plugin.\&quot;,\&quot;description_excerpt\&quot;:\&quot;Plugin directory. To post here, use the \\u003ca href=\\\&quot;https://meta.discourse.org/groups/plugin_authors\\\&quot;\\u003eRequest Access button on the group page\\u003c/a\\u003e with a link to your plugin.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-plugin-category/12648\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:true,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;boxes\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:25,\&quot;name\&quot;:\&quot;staff\&quot;,\&quot;color\&quot;:\&quot;283890\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;staff\&quot;,\&quot;topic_count\&quot;:44,\&quot;post_count\&quot;:252,\&quot;position\&quot;:20,\&quot;description\&quot;:\&quot;Private category for staff discussions. Topics are only visible to admins and moderators.\&quot;,\&quot;description_text\&quot;:\&quot;Private category for staff discussions. Topics are only visible to admins and moderators.\&quot;,\&quot;description_excerpt\&quot;:\&quot;Private category for staff discussions. Topics are only visible to admins and moderators.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-staff-category/13189\&quot;,\&quot;read_restricted\&quot;:true,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:4,\&quot;name\&quot;:\&quot;faq\&quot;,\&quot;color\&quot;:\&quot;3333bb\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;faq\&quot;,\&quot;topic_count\&quot;:72,\&quot;post_count\&quot;:826,\&quot;position\&quot;:21,\&quot;description\&quot;:\&quot;Frequently Asked Questions\&quot;,\&quot;description_text\&quot;:\&quot;Frequently Asked Questions\&quot;,\&quot;description_excerpt\&quot;:\&quot;Frequently Asked Questions\&quot;,\&quot;topic_url\&quot;:\&quot;/t/category-definition-for-faq/25\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:10,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:true,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:{\&quot;id\&quot;:69168,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/1/b/1bede4c05cb08eae4adcd994d7b02042c97864ee.png\&quot;,\&quot;width\&quot;:80,\&quot;height\&quot;:80},\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:30,\&quot;name\&quot;:\&quot;releases\&quot;,\&quot;color\&quot;:\&quot;BF1E2E\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;releases\&quot;,\&quot;topic_count\&quot;:17,\&quot;post_count\&quot;:74,\&quot;position\&quot;:22,\&quot;description\&quot;:\&quot;Outlining each official release of Discourse, and plans for future releases.\&quot;,\&quot;description_text\&quot;:\&quot;Outlining each official release of Discourse, and plans for future releases.\&quot;,\&quot;description_excerpt\&quot;:\&quot;Outlining each official release of Discourse, and plans for future releases.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-releases-category/20857\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;created\&quot;,\&quot;sort_ascending\&quot;:false,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:null,\&quot;subcategory_list_style\&quot;:\&quot;rows\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:31,\&quot;name\&quot;:\&quot;installation\&quot;,\&quot;color\&quot;:\&quot;997E7E\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;installation\&quot;,\&quot;topic_count\&quot;:974,\&quot;post_count\&quot;:7231,\&quot;position\&quot;:24,\&quot;description\&quot;:\&quot;Getting Discourse up and running for the first time, and anything you need for installation.\&quot;,\&quot;description_text\&quot;:\&quot;Getting Discourse up and running for the first time, and anything you need for installation.\&quot;,\&quot;description_excerpt\&quot;:\&quot;Getting Discourse up and running for the first time, and anything you need for installation.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-installation-category/21019\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:null,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:null,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:null,\&quot;subcategory_list_style\&quot;:\&quot;rows\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:\&quot;true\&quot;},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:34,\&quot;name\&quot;:\&quot;broken-plugin\&quot;,\&quot;color\&quot;:\&quot;231F20\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;broken-plugin\&quot;,\&quot;topic_count\&quot;:27,\&quot;post_count\&quot;:735,\&quot;position\&quot;:26,\&quot;description\&quot;:\&quot;Unmaintained and/or broken plugins\&quot;,\&quot;description_text\&quot;:\&quot;Unmaintained and\\u0026#x2F;or broken plugins\&quot;,\&quot;description_excerpt\&quot;:\&quot;Unmaintained and/or broken plugins\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-broken-plugin-category/30009\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:22,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:35,\&quot;name\&quot;:\&quot;praise\&quot;,\&quot;color\&quot;:\&quot;9EB83B\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;praise\&quot;,\&quot;topic_count\&quot;:200,\&quot;post_count\&quot;:759,\&quot;position\&quot;:27,\&quot;description\&quot;:\&quot;Got something nice to say about Discourse?\&quot;,\&quot;description_text\&quot;:\&quot;Got something nice to say about Discourse?\&quot;,\&quot;description_excerpt\&quot;:\&quot;Got something nice to say about Discourse?\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-praise-category/30010\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:4,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:null,\&quot;has_children\&quot;:true,\&quot;sort_order\&quot;:null,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:null,\&quot;subcategory_list_style\&quot;:\&quot;rows\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:53,\&quot;name\&quot;:\&quot;admins\&quot;,\&quot;color\&quot;:\&quot;3333bb\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;admins\&quot;,\&quot;topic_count\&quot;:106,\&quot;post_count\&quot;:1733,\&quot;position\&quot;:29,\&quot;description\&quot;:\&quot;Forum administrator tutorials\&quot;,\&quot;description_text\&quot;:\&quot;Forum administrator tutorials\&quot;,\&quot;description_excerpt\&quot;:\&quot;Forum administrator tutorials\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-admins-category/56207\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:10,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:true,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:{\&quot;id\&quot;:69231,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/7/2/727194c83a8d1b6795333e210390c6cf14543b9c.png\&quot;,\&quot;width\&quot;:80,\&quot;height\&quot;:80},\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:55,\&quot;name\&quot;:\&quot;sysadmin\&quot;,\&quot;color\&quot;:\&quot;3333bb\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;sysadmin\&quot;,\&quot;topic_count\&quot;:70,\&quot;post_count\&quot;:1516,\&quot;position\&quot;:30,\&quot;description\&quot;:\&quot;System administrator tutorials\&quot;,\&quot;description_text\&quot;:\&quot;System administrator tutorials\&quot;,\&quot;description_excerpt\&quot;:\&quot;System administrator tutorials\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-sysadmin-category/56209\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:10,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:true,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:{\&quot;id\&quot;:69232,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/8/5/856c5a7c6a4abd4415a83cd6b8134f1e0d002e2d.png\&quot;,\&quot;width\&quot;:80,\&quot;height\&quot;:80},\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:56,\&quot;name\&quot;:\&quot;developers\&quot;,\&quot;color\&quot;:\&quot;3333bb\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;devs\&quot;,\&quot;topic_count\&quot;:93,\&quot;post_count\&quot;:2239,\&quot;position\&quot;:31,\&quot;description\&quot;:\&quot;Developer tutorials\&quot;,\&quot;description_text\&quot;:\&quot;Developer tutorials\&quot;,\&quot;description_excerpt\&quot;:\&quot;Developer tutorials\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-developers-category/56210\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:10,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:true,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:{\&quot;id\&quot;:69234,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/b/1/b1658608f641b6fbcb1b3e511ec1fdd852e0b43d.png\&quot;,\&quot;width\&quot;:80,\&quot;height\&quot;:80},\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:45,\&quot;name\&quot;:\&quot;tips \\u0026 tricks\&quot;,\&quot;color\&quot;:\&quot;74CCED\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;tips-and-tricks\&quot;,\&quot;topic_count\&quot;:97,\&quot;post_count\&quot;:1281,\&quot;position\&quot;:33,\&quot;description\&quot;:\&quot;CSS tweaks \\u0026amp; JavaScript hacks.  \\u003cstrong\\u003eNot for questions\\u003c/strong\\u003e.\&quot;,\&quot;description_text\&quot;:\&quot;CSS tweaks \\u0026amp; JavaScript hacks.  Not for questions.\&quot;,\&quot;description_excerpt\&quot;:\&quot;CSS tweaks \\u0026amp; JavaScript hacks.  Not for questions.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-tips-tricks-category/37387\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:10,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:true,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:{\&quot;id\&quot;:69233,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/e/2/e284f9b066ca82e6a0eb5a3dfdf6d1a5a56708c3.png\&quot;,\&quot;width\&quot;:80,\&quot;height\&quot;:80},\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:48,\&quot;name\&quot;:\&quot;Summer of Code\&quot;,\&quot;color\&quot;:\&quot;33B0B0\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;soc\&quot;,\&quot;topic_count\&quot;:11,\&quot;post_count\&quot;:129,\&quot;position\&quot;:35,\&quot;description\&quot;:\&quot;This is where we&#39;ll discuss all student projects for this summer. This is a shared communication channel for \\u003ca href=\\\&quot;https://developers.google.com/open-source/gsoc/\\\&quot;\\u003eGSoC\\u003c/a\\u003e participants as well as \\u003ca href=\\\&quot;http://railsgirlssummerofcode.org/\\\&quot;\\u003eRails Girls SoC\\u003c/a\\u003e participants.\&quot;,\&quot;description_text\&quot;:\&quot;This is where we\\u0026#x27;ll discuss all student projects for this summer. This is a shared communication channel for GSoC participants as well as Rails Girls SoC participants.\&quot;,\&quot;description_excerpt\&quot;:\&quot;This is where we\\u0026#39;ll discuss all student projects for this summer. This is a shared communication channel for \\u003ca href=\\\&quot;https://developers.google.com/open-source/gsoc/\\\&quot;\\u003eGSoC\\u003c/a\\u003e participants as well as \\u003ca href=\\\&quot;http://railsgirlssummerofcode.org/\\\&quot;\\u003eRails Girls SoC\\u003c/a\\u003e participants.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-summer-of-code-category/43171\&quot;,\&quot;read_restricted\&quot;:true,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:true,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:58,\&quot;name\&quot;:\&quot;solved\&quot;,\&quot;color\&quot;:\&quot;945811\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;solved\&quot;,\&quot;topic_count\&quot;:91,\&quot;post_count\&quot;:629,\&quot;position\&quot;:36,\&quot;description\&quot;:\&quot;Bugs, Feature requests, support and so on relating to the \\u003ca href=\\\&quot;https://meta.discourse.org/t/discourse-solved-accepted-answer-plugin/30155\\\&quot;\\u003eDiscourse solved plugin\\u003c/a\\u003e.\&quot;,\&quot;description_text\&quot;:\&quot;Bugs, Feature requests, support and so on relating to the Discourse solved plugin.\&quot;,\&quot;description_excerpt\&quot;:\&quot;Bugs, Feature requests, support and so on relating to the \\u003ca href=\\\&quot;https://meta.discourse.org/t/discourse-solved-accepted-answer-plugin/30155\\\&quot;\\u003eDiscourse solved plugin\\u003c/a\\u003e.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-solved-category/58372\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:22,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:59,\&quot;name\&quot;:\&quot;voting\&quot;,\&quot;color\&quot;:\&quot;945811\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;voting\&quot;,\&quot;topic_count\&quot;:82,\&quot;post_count\&quot;:453,\&quot;position\&quot;:37,\&quot;description\&quot;:\&quot;Bugs, Feature requests, support and so on relating to the official \\u003ca href=\\\&quot;https://meta.discourse.org/t/discourse-feature-voting/40121\\\&quot;\\u003eDiscourse feature voting plugin\\u003c/a\\u003e\&quot;,\&quot;description_text\&quot;:\&quot;Bugs, Feature requests, support and so on relating to the official Discourse feature voting plugin\&quot;,\&quot;description_excerpt\&quot;:\&quot;Bugs, Feature requests, support and so on relating to the official \\u003ca href=\\\&quot;https://meta.discourse.org/t/discourse-feature-voting/40121\\\&quot;\\u003eDiscourse feature voting plugin\\u003c/a\\u003e\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-voting-category/58473\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:22,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:\&quot;\&quot;},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:60,\&quot;name\&quot;:\&quot;chat-integration\&quot;,\&quot;color\&quot;:\&quot;945811\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;chat-integration\&quot;,\&quot;topic_count\&quot;:39,\&quot;post_count\&quot;:198,\&quot;position\&quot;:39,\&quot;description\&quot;:\&quot;For discussion regarding the \\u003ca href=\\\&quot;https://meta.discourse.org/t/chatroom-integration-plugin-discourse-chat-integration/66522\\\&quot;\\u003eofficial chat integration plugin\\u003c/a\\u003e\&quot;,\&quot;description_text\&quot;:\&quot;For discussion regarding the official chat integration plugin\&quot;,\&quot;description_excerpt\&quot;:\&quot;For discussion regarding the \\u003ca href=\\\&quot;https://meta.discourse.org/t/chatroom-integration-plugin-discourse-chat-integration/66522\\\&quot;\\u003eofficial chat integration plugin\\u003c/a\\u003e\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-chat-integration-category/60499\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:22,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:61,\&quot;name\&quot;:\&quot;theme\&quot;,\&quot;color\&quot;:\&quot;BF1E2E\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;theme\&quot;,\&quot;topic_count\&quot;:130,\&quot;post_count\&quot;:3564,\&quot;position\&quot;:40,\&quot;description\&quot;:\&quot;Themes are reusable CSS/HTML blocks you can use on your site.\&quot;,\&quot;description_text\&quot;:\&quot;Themes are reusable CSS\\u0026#x2F;HTML blocks you can use on your site.\&quot;,\&quot;description_excerpt\&quot;:\&quot;Themes are reusable CSS/HTML blocks you can use on your site.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-theme-category/60925\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:true,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:1,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[\&quot;theme-component\&quot;,\&quot;theme-full\&quot;,\&quot;theme-scheme\&quot;,\&quot;color-palette\&quot;],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:62,\&quot;name\&quot;:\&quot;SoC 2016 Archive\&quot;,\&quot;color\&quot;:\&quot;AB9364\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;soc-2016-archive\&quot;,\&quot;topic_count\&quot;:11,\&quot;post_count\&quot;:123,\&quot;position\&quot;:41,\&quot;description\&quot;:null,\&quot;description_text\&quot;:null,\&quot;description_excerpt\&quot;:null,\&quot;topic_url\&quot;:\&quot;/t/about-the-soc-2016-archive-category/62449\&quot;,\&quot;read_restricted\&quot;:true,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:48,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:null,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:63,\&quot;name\&quot;:\&quot;comparison\&quot;,\&quot;color\&quot;:\&quot;F1592A\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;comparison\&quot;,\&quot;topic_count\&quot;:7,\&quot;post_count\&quot;:19,\&quot;position\&quot;:42,\&quot;description\&quot;:\&quot;Topics comparing Discourse to other platforms.\&quot;,\&quot;description_text\&quot;:\&quot;Topics comparing Discourse to other platforms.\&quot;,\&quot;description_excerpt\&quot;:\&quot;Topics comparing Discourse to other platforms.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-comparison-category/65736\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:35,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;### About PLATFORM_NAME\\n\\nA blurb about the platform being compared to Discourse. \\n\\nhttp://link.to.website\\n\\n ### Previous discussions:\\n\\nlinks to previous discussions related\\n\\n### Importer status\\n\\nIs there an official Discourse importer? Where is it? \&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:66,\&quot;name\&quot;:\&quot;cmgrs\&quot;,\&quot;color\&quot;:\&quot;3333bb\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;cmgrs\&quot;,\&quot;topic_count\&quot;:2,\&quot;post_count\&quot;:11,\&quot;position\&quot;:44,\&quot;description\&quot;:\&quot;Resources and guides for community managers and builders who want to build successful communities that go the distance.\&quot;,\&quot;description_text\&quot;:\&quot;Resources and guides for community managers and builders who want to build successful communities that go the distance.\&quot;,\&quot;description_excerpt\&quot;:\&quot;Resources and guides for community managers and builders who want to build successful communities that go the distance.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-cmgrs-category/68503\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:10,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:true,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:{\&quot;id\&quot;:110097,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/f/7/f7d070b65b657f1fdf70b21d639f9a5651d0f950.png\&quot;,\&quot;width\&quot;:1024,\&quot;height\&quot;:1024},\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:67,\&quot;name\&quot;:\&quot;announcements\&quot;,\&quot;color\&quot;:\&quot;ED207B\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;announcements\&quot;,\&quot;topic_count\&quot;:113,\&quot;post_count\&quot;:1204,\&quot;position\&quot;:45,\&quot;description\&quot;:\&quot;For completed features, currently or soon to be run in production.\&quot;,\&quot;description_text\&quot;:\&quot;For completed features, currently or soon to be run in production.\&quot;,\&quot;description_excerpt\&quot;:\&quot;For completed features, currently or soon to be run in production.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-announcements-category/68629\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:2,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;latest\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:true,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:68,\&quot;name\&quot;:\&quot;Outreachy\&quot;,\&quot;color\&quot;:\&quot;AB9364\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;outreachy\&quot;,\&quot;topic_count\&quot;:5,\&quot;post_count\&quot;:133,\&quot;position\&quot;:46,\&quot;description\&quot;:\&quot;Category for \\u003ca class=\\\&quot;mention\\\&quot; href=\\\&quot;/u/misaka4e21\\\&quot;\\u003e@misaka4e21\\u003c/a\\u003e our Outreachy intern!\&quot;,\&quot;description_text\&quot;:\&quot;Category for @misaka4e21 our Outreachy intern!\&quot;,\&quot;description_excerpt\&quot;:\&quot;Category for \\u003ca class=\\\&quot;mention\\\&quot; href=\\\&quot;/u/misaka4e21\\\&quot;\\u003e@misaka4e21\\u003c/a\\u003e our Outreachy intern!\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-outreachy-category/74983\&quot;,\&quot;read_restricted\&quot;:true,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:69,\&quot;name\&quot;:\&quot;ford\&quot;,\&quot;color\&quot;:\&quot;F9CFCF\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;ford\&quot;,\&quot;topic_count\&quot;:107,\&quot;post_count\&quot;:1448,\&quot;position\&quot;:47,\&quot;description\&quot;:\&quot;Support category for ford\&quot;,\&quot;description_text\&quot;:\&quot;Support category for ford\&quot;,\&quot;description_excerpt\&quot;:\&quot;Support category for ford\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-ford-category/75061\&quot;,\&quot;read_restricted\&quot;:true,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:83,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:\&quot;true\&quot;},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:73,\&quot;name\&quot;:\&quot;patreon\&quot;,\&quot;color\&quot;:\&quot;945811\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;patreon\&quot;,\&quot;topic_count\&quot;:31,\&quot;post_count\&quot;:183,\&quot;position\&quot;:50,\&quot;description\&quot;:\&quot;For discussion regarding the official Discourse \\u003ca href=\\\&quot;https://meta.discourse.org/t/discourse-patreon-integration/44366\\\&quot;\\u003ePatreon integration\\u003c/a\\u003e.\&quot;,\&quot;description_text\&quot;:\&quot;For discussion regarding the official Discourse Patreon integration.\&quot;,\&quot;description_excerpt\&quot;:\&quot;For discussion regarding the official Discourse \\u003ca href=\\\&quot;https://meta.discourse.org/t/discourse-patreon-integration/44366\\\&quot;\\u003ePatreon integration\\u003c/a\\u003e.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-patreon-category/90595\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:22,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:74,\&quot;name\&quot;:\&quot;oauth2-basic\&quot;,\&quot;color\&quot;:\&quot;945811\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;oauth2-basic\&quot;,\&quot;topic_count\&quot;:16,\&quot;post_count\&quot;:103,\&quot;position\&quot;:51,\&quot;description\&quot;:\&quot;Discussion for \\u003ca href=\\\&quot;https://meta.discourse.org/t/oauth2-basic-support/33879\\\&quot;\\u003eOAuth2 Basic Support\\u003c/a\\u003e\&quot;,\&quot;description_text\&quot;:\&quot;Discussion for OAuth2 Basic Support\&quot;,\&quot;description_excerpt\&quot;:\&quot;Discussion for \\u003ca href=\\\&quot;https://meta.discourse.org/t/oauth2-basic-support/33879\\\&quot;\\u003eOAuth2 Basic Support\\u003c/a\\u003e\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-oauth2-basic-category/90601\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:22,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:90,\&quot;name\&quot;:\&quot;redhat\&quot;,\&quot;color\&quot;:\&quot;F9CFCF\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;redhat\&quot;,\&quot;topic_count\&quot;:20,\&quot;post_count\&quot;:141,\&quot;position\&quot;:52,\&quot;description\&quot;:\&quot;A private support category for discussions about Red Hat’s consultancy projects.\&quot;,\&quot;description_text\&quot;:\&quot;A private support category for discussions about Red Hat’s consultancy projects.\&quot;,\&quot;description_excerpt\&quot;:\&quot;A private support category for discussions about Red Hat’s consultancy projects.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-redhat-category/132687\&quot;,\&quot;read_restricted\&quot;:true,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:83,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[\&quot;status tags\&quot;],\&quot;allow_global_tags\&quot;:true,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:83,\&quot;name\&quot;:\&quot;Enterprise Support\&quot;,\&quot;color\&quot;:\&quot;CEA9A9\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;enterprise-support\&quot;,\&quot;topic_count\&quot;:0,\&quot;post_count\&quot;:0,\&quot;position\&quot;:53,\&quot;description\&quot;:\&quot;Private Support Categories for our customers.\&quot;,\&quot;description_text\&quot;:\&quot;Private Support Categories for our customers.\&quot;,\&quot;description_excerpt\&quot;:\&quot;Private Support Categories for our customers.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-enterprise-support-category/101861\&quot;,\&quot;read_restricted\&quot;:true,\&quot;permission\&quot;:1,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:true,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:true,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:87,\&quot;name\&quot;:\&quot;amazon\&quot;,\&quot;color\&quot;:\&quot;F9CFCF\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;amazon\&quot;,\&quot;topic_count\&quot;:53,\&quot;post_count\&quot;:893,\&quot;position\&quot;:54,\&quot;description\&quot;:\&quot;A private support category for Amazon Games (currently New World and Lumberyard).\&quot;,\&quot;description_text\&quot;:\&quot;A private support category for Amazon Games (currently New World and Lumberyard).\&quot;,\&quot;description_excerpt\&quot;:\&quot;A private support category for Amazon Games (currently New World and Lumberyard).\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-amazon-category/116320\&quot;,\&quot;read_restricted\&quot;:true,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:83,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:\&quot;true\&quot;},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:88,\&quot;name\&quot;:\&quot;global communities\&quot;,\&quot;color\&quot;:\&quot;F9CFCF\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;global-communities\&quot;,\&quot;topic_count\&quot;:100,\&quot;post_count\&quot;:2841,\&quot;position\&quot;:55,\&quot;description\&quot;:\&quot;A private support category for members of the Amazon Global Communities project.\&quot;,\&quot;description_text\&quot;:\&quot;A private support category for members of the Amazon Global Communities project.\&quot;,\&quot;description_excerpt\&quot;:\&quot;A private support category for members of the Amazon Global Communities project.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-global-communities-category/121554\&quot;,\&quot;read_restricted\&quot;:true,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:83,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:\&quot;false\&quot;},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[\&quot;status tags\&quot;],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:75,\&quot;name\&quot;:\&quot;data-explorer\&quot;,\&quot;color\&quot;:\&quot;945811\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;data-explorer\&quot;,\&quot;topic_count\&quot;:25,\&quot;post_count\&quot;:141,\&quot;position\&quot;:56,\&quot;description\&quot;:\&quot;Discussion for \\u003ca href=\\\&quot;https://meta.discourse.org/t/data-explorer-plugin/32566\\\&quot;\\u003eData Explorer Plugin\\u003c/a\\u003e\&quot;,\&quot;description_text\&quot;:\&quot;Discussion for Data Explorer Plugin\&quot;,\&quot;description_excerpt\&quot;:\&quot;Discussion for \\u003ca href=\\\&quot;https://meta.discourse.org/t/data-explorer-plugin/32566\\\&quot;\\u003eData Explorer Plugin\\u003c/a\\u003e\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-data-explorer-category/90611\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:22,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:89,\&quot;name\&quot;:\&quot;warner\&quot;,\&quot;color\&quot;:\&quot;F9CFCF\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;warner\&quot;,\&quot;topic_count\&quot;:104,\&quot;post_count\&quot;:1495,\&quot;position\&quot;:56,\&quot;description\&quot;:\&quot;A private support category for members of the Warner Brothers / DC Universe project.\&quot;,\&quot;description_text\&quot;:\&quot;A private support category for members of the Warner Brothers \\u0026#x2F; DC Universe project.\&quot;,\&quot;description_excerpt\&quot;:\&quot;A private support category for members of the Warner Brothers / DC Universe project.\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-warner-category/122595\&quot;,\&quot;read_restricted\&quot;:true,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:83,\&quot;notification_level\&quot;:2,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:76,\&quot;name\&quot;:\&quot;user-notes\&quot;,\&quot;color\&quot;:\&quot;945811\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;staff-notes\&quot;,\&quot;topic_count\&quot;:7,\&quot;post_count\&quot;:46,\&quot;position\&quot;:57,\&quot;description\&quot;:\&quot;Discussion for \\u003ca href=\\\&quot;https://meta.discourse.org/t/user-notes-plugin/41026\\\&quot; class=\\\&quot;inline-onebox-loading\\\&quot;\\u003ehttps://meta.discourse.org/t/user-notes-plugin/41026\\u003c/a\\u003e\&quot;,\&quot;description_text\&quot;:\&quot;Discussion for https:\\u0026#x2F;\\u0026#x2F;meta.discourse.org\\u0026#x2F;t\\u0026#x2F;user-notes-plugin\\u0026#x2F;41026\&quot;,\&quot;description_excerpt\&quot;:\&quot;Discussion for \\u003ca href=\\\&quot;https://meta.discourse.org/t/user-notes-plugin/41026\\\&quot; class=\\\&quot;inline-onebox-loading\\\&quot;\\u003ehttps://meta.discourse.org/t/user-notes-plugin/41026\\u003c/a\\u003e\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-user-notes-category/90620\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:22,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:77,\&quot;name\&quot;:\&quot;advertising\&quot;,\&quot;color\&quot;:\&quot;945811\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;advertising\&quot;,\&quot;topic_count\&quot;:50,\&quot;post_count\&quot;:503,\&quot;position\&quot;:58,\&quot;description\&quot;:\&quot;Discussion for the \\u003ca href=\\\&quot;https://meta.discourse.org/t/advertising-plugin-for-discourse-serve-ads-on-your-discourse-forum/33734\\\&quot;\\u003eadvertising plugin\\u003c/a\\u003e. Note that YOU MUST DISABLE ADBLOCK to see advertising configuration or features!\&quot;,\&quot;description_text\&quot;:\&quot;Discussion for the advertising plugin. Note that YOU MUST DISABLE ADBLOCK to see advertising configuration or features!\&quot;,\&quot;description_excerpt\&quot;:\&quot;Discussion for the \\u003ca href=\\\&quot;https://meta.discourse.org/t/advertising-plugin-for-discourse-serve-ads-on-your-discourse-forum/33734\\\&quot;\\u003eadvertising plugin\\u003c/a\\u003e. Note that YOU MUST DISABLE ADBLOCK to see advertising configuration or features!\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-advertising-category/90629\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:22,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:78,\&quot;name\&quot;:\&quot;translator\&quot;,\&quot;color\&quot;:\&quot;945811\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;translator\&quot;,\&quot;topic_count\&quot;:15,\&quot;post_count\&quot;:77,\&quot;position\&quot;:59,\&quot;description\&quot;:\&quot;Discussion for \\u003ca href=\\\&quot;https://meta.discourse.org/t/discourse-translator/32630\\\&quot;\\u003eDiscourse-Translator++\\u003c/a\\u003e\&quot;,\&quot;description_text\&quot;:\&quot;Discussion for Discourse-Translator++\&quot;,\&quot;description_excerpt\&quot;:\&quot;Discussion for \\u003ca href=\\\&quot;https://meta.discourse.org/t/discourse-translator/32630\\\&quot;\\u003eDiscourse-Translator++\\u003c/a\\u003e\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-translator-category/90631\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:22,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:82,\&quot;name\&quot;:\&quot;broken-theme\&quot;,\&quot;color\&quot;:\&quot;231F20\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;broken-theme\&quot;,\&quot;topic_count\&quot;:4,\&quot;post_count\&quot;:48,\&quot;position\&quot;:62,\&quot;description\&quot;:\&quot;Unmaintained and/or broken themes\&quot;,\&quot;description_text\&quot;:\&quot;Unmaintained and\\u0026#x2F;or broken themes\&quot;,\&quot;description_excerpt\&quot;:\&quot;Unmaintained and/or broken themes\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-broken-theme-category/98538\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:61,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null},{\&quot;id\&quot;:84,\&quot;name\&quot;:\&quot;assign\&quot;,\&quot;color\&quot;:\&quot;945811\&quot;,\&quot;text_color\&quot;:\&quot;FFFFFF\&quot;,\&quot;slug\&quot;:\&quot;assign\&quot;,\&quot;topic_count\&quot;:26,\&quot;post_count\&quot;:136,\&quot;position\&quot;:63,\&quot;description\&quot;:\&quot;Discussion for \\u003ca href=\\\&quot;https://meta.discourse.org/t/discourse-assign/58044\\\&quot; class=\\\&quot;inline-onebox\\\&quot;\\u003eDiscourse Assign\\u003c/a\\u003e\&quot;,\&quot;description_text\&quot;:\&quot;Discussion for Discourse Assign\&quot;,\&quot;description_excerpt\&quot;:\&quot;Discussion for \\u003ca href=\\\&quot;https://meta.discourse.org/t/discourse-assign/58044\\\&quot; class=\\\&quot;inline-onebox\\\&quot;\\u003eDiscourse Assign\\u003c/a\\u003e\&quot;,\&quot;topic_url\&quot;:\&quot;/t/about-the-assign-category/103409\&quot;,\&quot;read_restricted\&quot;:false,\&quot;permission\&quot;:1,\&quot;parent_category_id\&quot;:22,\&quot;notification_level\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;topic_template\&quot;:\&quot;\&quot;,\&quot;has_children\&quot;:false,\&quot;sort_order\&quot;:\&quot;\&quot;,\&quot;sort_ascending\&quot;:null,\&quot;show_subcategory_list\&quot;:false,\&quot;num_featured_topics\&quot;:3,\&quot;default_view\&quot;:\&quot;\&quot;,\&quot;subcategory_list_style\&quot;:\&quot;rows_with_featured_topics\&quot;,\&quot;default_top_period\&quot;:\&quot;all\&quot;,\&quot;minimum_required_tags\&quot;:0,\&quot;navigate_to_first_post_after_read\&quot;:false,\&quot;custom_fields\&quot;:{\&quot;enable_unassigned_filter\&quot;:null,\&quot;enable_accepted_answers\&quot;:null,\&quot;enable_open_filter\&quot;:null,\&quot;prioritize_open_filter\&quot;:null},\&quot;allowed_tags\&quot;:[],\&quot;allowed_tag_groups\&quot;:[],\&quot;allow_global_tags\&quot;:false,\&quot;min_tags_from_required_group\&quot;:1,\&quot;required_tag_group_name\&quot;:null,\&quot;uploaded_logo\&quot;:null,\&quot;uploaded_background\&quot;:null}],\&quot;trust_levels\&quot;:[{\&quot;id\&quot;:0,\&quot;name\&quot;:\&quot;new user\&quot;},{\&quot;id\&quot;:1,\&quot;name\&quot;:\&quot;basic user\&quot;},{\&quot;id\&quot;:2,\&quot;name\&quot;:\&quot;member\&quot;},{\&quot;id\&quot;:3,\&quot;name\&quot;:\&quot;regular\&quot;},{\&quot;id\&quot;:4,\&quot;name\&quot;:\&quot;leader\&quot;}],\&quot;archetypes\&quot;:[{\&quot;id\&quot;:\&quot;regular\&quot;,\&quot;name\&quot;:\&quot;Regular Topic\&quot;,\&quot;options\&quot;:[]},{\&quot;id\&quot;:\&quot;banner\&quot;,\&quot;name\&quot;:\&quot;Banner Topic\&quot;,\&quot;options\&quot;:[]}],\&quot;user_fields\&quot;:[],\&quot;auth_providers\&quot;:[{\&quot;name\&quot;:\&quot;facebook\&quot;,\&quot;custom_url\&quot;:null,\&quot;pretty_name_override\&quot;:null,\&quot;title_override\&quot;:null,\&quot;message_override\&quot;:null,\&quot;frame_width\&quot;:580,\&quot;frame_height\&quot;:400,\&quot;can_connect\&quot;:true,\&quot;can_revoke\&quot;:true,\&quot;icon\&quot;:\&quot;fab-facebook\&quot;},{\&quot;name\&quot;:\&quot;google_oauth2\&quot;,\&quot;custom_url\&quot;:null,\&quot;pretty_name_override\&quot;:null,\&quot;title_override\&quot;:null,\&quot;message_override\&quot;:null,\&quot;frame_width\&quot;:850,\&quot;frame_height\&quot;:500,\&quot;can_connect\&quot;:true,\&quot;can_revoke\&quot;:true,\&quot;icon\&quot;:null},{\&quot;name\&quot;:\&quot;github\&quot;,\&quot;custom_url\&quot;:null,\&quot;pretty_name_override\&quot;:null,\&quot;title_override\&quot;:null,\&quot;message_override\&quot;:null,\&quot;frame_width\&quot;:null,\&quot;frame_height\&quot;:null,\&quot;can_connect\&quot;:true,\&quot;can_revoke\&quot;:true,\&quot;icon\&quot;:\&quot;fab-github\&quot;},{\&quot;name\&quot;:\&quot;twitter\&quot;,\&quot;custom_url\&quot;:null,\&quot;pretty_name_override\&quot;:null,\&quot;title_override\&quot;:null,\&quot;message_override\&quot;:null,\&quot;frame_width\&quot;:null,\&quot;frame_height\&quot;:null,\&quot;can_connect\&quot;:true,\&quot;can_revoke\&quot;:true,\&quot;icon\&quot;:\&quot;fab-twitter\&quot;},{\&quot;name\&quot;:\&quot;discord\&quot;,\&quot;custom_url\&quot;:null,\&quot;pretty_name_override\&quot;:null,\&quot;title_override\&quot;:null,\&quot;message_override\&quot;:null,\&quot;frame_width\&quot;:null,\&quot;frame_height\&quot;:null,\&quot;can_connect\&quot;:true,\&quot;can_revoke\&quot;:true,\&quot;icon\&quot;:\&quot;fab-discord\&quot;}]}&quot;,&quot;siteSettings&quot;:&quot;{\&quot;default_locale\&quot;:\&quot;en_US\&quot;,\&quot;title\&quot;:\&quot;Discourse Meta\&quot;,\&quot;short_site_description\&quot;:\&quot;The Official Support Forum for Discourse\&quot;,\&quot;contact_email\&quot;:\&quot;team@discourse.org\&quot;,\&quot;contact_url\&quot;:\&quot;\&quot;,\&quot;logo\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/1/0/101f03af29f12ea30e1226eb96a02c3ed2f6d2ef.png\&quot;,\&quot;logo_small\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/b/3/b33be9538df3547fcf9d1a51a4637d77392ac6f9.png\&quot;,\&quot;digest_logo\&quot;:\&quot;\&quot;,\&quot;mobile_logo\&quot;:\&quot;\&quot;,\&quot;large_icon\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/e/c/ecc92a52ee7353e03d5c0d1ea6521ce4541d9c25.png\&quot;,\&quot;favicon\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/b/3/b33be9538df3547fcf9d1a51a4637d77392ac6f9.png\&quot;,\&quot;apple_touch_icon\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/a/c/ac166452701ce353fa6c8865e99879e8cacfb960.png\&quot;,\&quot;allow_user_locale\&quot;:true,\&quot;support_mixed_text_direction\&quot;:false,\&quot;suggested_topics\&quot;:7,\&quot;ga_universal_tracking_code\&quot;:\&quot;UA-33736483-2\&quot;,\&quot;ga_universal_domain_name\&quot;:\&quot;auto\&quot;,\&quot;gtm_container_id\&quot;:\&quot;\&quot;,\&quot;top_menu\&quot;:\&quot;latest|new|unread|top|categories\&quot;,\&quot;post_menu\&quot;:\&quot;read|like|share|flag|edit|bookmark|delete|admin|reply\&quot;,\&quot;post_menu_hidden_items\&quot;:\&quot;bookmark|edit|wiki|delete|admin|flag\&quot;,\&quot;share_links\&quot;:\&quot;twitter|facebook|email\&quot;,\&quot;desktop_category_page_style\&quot;:\&quot;categories_with_featured_topics\&quot;,\&quot;category_colors\&quot;:\&quot;BF1E2E|F1592A|F7941D|9EB83B|3AB54A|12A89D|25AAE2|0E76BD|652D90|92278F|ED207B|8C6238|808281|B3B5B4|283890|292929\&quot;,\&quot;category_style\&quot;:\&quot;bullet\&quot;,\&quot;max_category_nesting\&quot;:2,\&quot;enable_mobile_theme\&quot;:true,\&quot;relative_date_duration\&quot;:30,\&quot;fixed_category_positions\&quot;:false,\&quot;fixed_category_positions_on_create\&quot;:false,\&quot;enable_badges\&quot;:true,\&quot;enable_badge_sql\&quot;:true,\&quot;enable_whispers\&quot;:true,\&quot;enable_bookmarks_with_reminders\&quot;:false,\&quot;push_notifications_prompt\&quot;:true,\&quot;vapid_public_key_bytes\&quot;:\&quot;4|20|187|211|120|43|61|57|61|175|187|22|50|207|91|186|68|202|249|1|237|47|31|138|154|38|205|111|252|115|183|106|169|29|43|41|241|222|212|253|1|217|21|23|210|43|194|128|114|32|220|80|150|235|173|164|199|168|105|191|139|90|186|253|199\&quot;,\&quot;invite_only\&quot;:false,\&quot;login_required\&quot;:false,\&quot;must_approve_users\&quot;:false,\&quot;enable_local_logins\&quot;:true,\&quot;enable_local_logins_via_email\&quot;:true,\&quot;allow_new_registrations\&quot;:true,\&quot;enable_signup_cta\&quot;:true,\&quot;enable_sso\&quot;:false,\&quot;sso_overrides_email\&quot;:false,\&quot;sso_overrides_avatar\&quot;:false,\&quot;min_username_length\&quot;:3,\&quot;max_username_length\&quot;:20,\&quot;unicode_usernames\&quot;:true,\&quot;min_password_length\&quot;:10,\&quot;min_admin_password_length\&quot;:15,\&quot;logout_redirect\&quot;:\&quot;\&quot;,\&quot;full_name_required\&quot;:false,\&quot;enable_names\&quot;:true,\&quot;invites_per_page\&quot;:40,\&quot;delete_user_max_post_age\&quot;:365,\&quot;delete_all_posts_max\&quot;:15,\&quot;prioritize_username_in_ux\&quot;:false,\&quot;enable_user_directory\&quot;:true,\&quot;allow_anonymous_posting\&quot;:false,\&quot;anonymous_posting_min_trust_level\&quot;:4,\&quot;hide_user_profiles_from_public\&quot;:false,\&quot;allow_featured_topic_on_user_profiles\&quot;:true,\&quot;hide_suspension_reasons\&quot;:false,\&quot;ignored_users_count_message_threshold\&quot;:5,\&quot;ignored_users_message_gap_days\&quot;:365,\&quot;user_selected_primary_groups\&quot;:false,\&quot;enable_group_directory\&quot;:true,\&quot;enable_category_group_review\&quot;:true,\&quot;min_post_length\&quot;:20,\&quot;min_first_post_length\&quot;:20,\&quot;min_personal_message_post_length\&quot;:10,\&quot;max_post_length\&quot;:85000,\&quot;topic_featured_link_enabled\&quot;:true,\&quot;min_topic_title_length\&quot;:15,\&quot;max_topic_title_length\&quot;:140,\&quot;min_personal_message_title_length\&quot;:2,\&quot;allow_uncategorized_topics\&quot;:true,\&quot;min_title_similar_length\&quot;:10,\&quot;enable_personal_messages\&quot;:true,\&quot;enable_personal_email_messages\&quot;:false,\&quot;edit_history_visible_to_public\&quot;:true,\&quot;delete_removed_posts_after\&quot;:24,\&quot;traditional_markdown_linebreaks\&quot;:false,\&quot;enable_markdown_typographer\&quot;:true,\&quot;enable_markdown_linkify\&quot;:true,\&quot;markdown_linkify_tlds\&quot;:\&quot;com|net|org|co|tv|ru|cn|us|uk|me|de|fr|fi|gov|io\&quot;,\&quot;markdown_typographer_quotation_marks\&quot;:\&quot;“|”|‘|’\&quot;,\&quot;enable_rich_text_paste\&quot;:true,\&quot;suppress_reply_directly_below\&quot;:true,\&quot;suppress_reply_directly_above\&quot;:true,\&quot;max_reply_history\&quot;:1,\&quot;enable_mentions\&quot;:true,\&quot;newuser_max_images\&quot;:1,\&quot;newuser_max_attachments\&quot;:0,\&quot;show_pinned_excerpt_mobile\&quot;:true,\&quot;show_pinned_excerpt_desktop\&quot;:true,\&quot;display_name_on_posts\&quot;:true,\&quot;show_time_gap_days\&quot;:7,\&quot;short_progress_text_threshold\&quot;:10000,\&quot;default_code_lang\&quot;:\&quot;text\&quot;,\&quot;autohighlight_all_code\&quot;:false,\&quot;highlighted_languages\&quot;:\&quot;apache|bash|cs|cpp|css|coffeescript|diff|xml|http|ini|json|java|javascript|makefile|markdown|nginx|objectivec|ruby|perl|php|python|sql|handlebars|scss|js|c++|yaml|xquery\&quot;,\&quot;enable_emoji\&quot;:true,\&quot;enable_emoji_shortcuts\&quot;:true,\&quot;emoji_set\&quot;:\&quot;twitter\&quot;,\&quot;emoji_autocomplete_min_chars\&quot;:0,\&quot;enable_inline_emoji_translation\&quot;:false,\&quot;code_formatting_style\&quot;:\&quot;4-spaces-indent\&quot;,\&quot;allowed_href_schemes\&quot;:\&quot;steam|keybase\&quot;,\&quot;watched_words_regular_expressions\&quot;:false,\&quot;enable_advanced_editor_preview_sync\&quot;:false,\&quot;old_post_notice_days\&quot;:5,\&quot;email_time_window_mins\&quot;:10,\&quot;disable_digest_emails\&quot;:false,\&quot;email_in\&quot;:true,\&quot;disable_emails\&quot;:\&quot;no\&quot;,\&quot;bounce_score_threshold\&quot;:4,\&quot;max_image_size_kb\&quot;:4096,\&quot;max_attachment_size_kb\&quot;:10000,\&quot;authorized_extensions\&quot;:\&quot;jpg|jpeg|png|gif|pdf|csv|gz|json|svg|mp4|txt|docx|mov|tex|zip|webm\&quot;,\&quot;authorized_extensions_for_staff\&quot;:\&quot;\&quot;,\&quot;max_image_width\&quot;:690,\&quot;max_image_height\&quot;:500,\&quot;prevent_anons_from_downloading_files\&quot;:false,\&quot;secure_media\&quot;:false,\&quot;enable_s3_uploads\&quot;:false,\&quot;allow_profile_backgrounds\&quot;:true,\&quot;allow_uploaded_avatars\&quot;:true,\&quot;allow_animated_avatars\&quot;:false,\&quot;default_avatars\&quot;:\&quot;\&quot;,\&quot;external_system_avatars_enabled\&quot;:true,\&quot;external_system_avatars_url\&quot;:\&quot;https://avatars.discourse.org/v4/letter/{first_letter}/{color}/{size}.png\&quot;,\&quot;selectable_avatars_enabled\&quot;:false,\&quot;allow_staff_to_upload_any_file_in_pm\&quot;:true,\&quot;simultaneous_uploads\&quot;:5,\&quot;tl1_requires_read_posts\&quot;:30,\&quot;tl3_links_no_follow\&quot;:false,\&quot;enforce_second_factor\&quot;:\&quot;staff\&quot;,\&quot;moderators_view_emails\&quot;:false,\&quot;use_admin_ip_allowlist\&quot;:false,\&quot;allowed_iframes\&quot;:\&quot;https://www.google.com/maps/embed?|https://www.openstreetmap.org/export/embed.html?|https://calendar.google.com/calendar/embed?|https://codepen.io|https://player.vimeo.com/video/|https://runkit.com/\&quot;,\&quot;max_oneboxes_per_post\&quot;:50,\&quot;reviewable_claiming\&quot;:\&quot;disabled\&quot;,\&quot;reviewable_default_topics\&quot;:false,\&quot;reviewable_default_visibility\&quot;:\&quot;low\&quot;,\&quot;alert_admins_if_errors_per_minute\&quot;:100,\&quot;alert_admins_if_errors_per_hour\&quot;:500,\&quot;max_prints_per_hour_per_user\&quot;:5,\&quot;enable_long_polling\&quot;:true,\&quot;long_polling_base_url\&quot;:\&quot;/\&quot;,\&quot;background_polling_interval\&quot;:60000,\&quot;polling_interval\&quot;:3000,\&quot;anon_polling_interval\&quot;:30000,\&quot;flush_timings_secs\&quot;:60,\&quot;verbose_localization\&quot;:false,\&quot;max_new_topics\&quot;:500,\&quot;enable_safe_mode\&quot;:true,\&quot;tos_url\&quot;:\&quot;\&quot;,\&quot;privacy_policy_url\&quot;:\&quot;https://www.discourse.org/privacy\&quot;,\&quot;faq_url\&quot;:\&quot;\&quot;,\&quot;enable_backups\&quot;:true,\&quot;backup_location\&quot;:\&quot;s3\&quot;,\&quot;maximum_backups\&quot;:3,\&quot;min_search_term_length\&quot;:3,\&quot;log_search_queries\&quot;:true,\&quot;version_checks\&quot;:false,\&quot;suppress_uncategorized_badge\&quot;:true,\&quot;header_dropdown_category_count\&quot;:12,\&quot;slug_generation_method\&quot;:\&quot;ascii\&quot;,\&quot;topic_views_heat_low\&quot;:1000,\&quot;topic_views_heat_medium\&quot;:2000,\&quot;topic_views_heat_high\&quot;:3500,\&quot;topic_post_like_heat_low\&quot;:1.73,\&quot;topic_post_like_heat_medium\&quot;:2.53,\&quot;topic_post_like_heat_high\&quot;:3.67,\&quot;history_hours_low\&quot;:12,\&quot;history_hours_medium\&quot;:24,\&quot;history_hours_high\&quot;:48,\&quot;cold_age_days_low\&quot;:14,\&quot;cold_age_days_medium\&quot;:90,\&quot;cold_age_days_high\&quot;:180,\&quot;global_notice\&quot;:\&quot;\&quot;,\&quot;show_create_topics_notice\&quot;:true,\&quot;bootstrap_mode_min_users\&quot;:50,\&quot;bootstrap_mode_enabled\&quot;:false,\&quot;automatically_unpin_topics\&quot;:true,\&quot;read_time_word_count\&quot;:500,\&quot;topic_page_title_includes_category\&quot;:true,\&quot;svg_icon_subset\&quot;:\&quot;\&quot;,\&quot;enable_new_user_card_route\&quot;:true,\&quot;disable_mailing_list_mode\&quot;:false,\&quot;default_topics_automatic_unpin\&quot;:true,\&quot;mute_all_categories_by_default\&quot;:false,\&quot;tagging_enabled\&quot;:true,\&quot;tag_style\&quot;:\&quot;simple\&quot;,\&quot;max_tags_per_topic\&quot;:5,\&quot;max_tag_length\&quot;:20,\&quot;min_trust_level_to_tag_topics\&quot;:\&quot;3\&quot;,\&quot;max_tag_search_results\&quot;:5,\&quot;show_filter_by_tag\&quot;:true,\&quot;max_tags_in_filter_list\&quot;:30,\&quot;tags_sort_alphabetically\&quot;:false,\&quot;tags_listed_by_group\&quot;:false,\&quot;suppress_overlapping_tags_in_list\&quot;:false,\&quot;remove_muted_tags_from_latest\&quot;:\&quot;always\&quot;,\&quot;force_lowercase_tags\&quot;:true,\&quot;dashboard_general_tab_activity_metrics\&quot;:\&quot;page_view_total_reqs|visits|time_to_first_response|likes|flags|user_to_user_private_messages_with_replies\&quot;,\&quot;cakeday_enabled\&quot;:true,\&quot;cakeday_emoji\&quot;:\&quot;cake\&quot;,\&quot;cakeday_birthday_enabled\&quot;:true,\&quot;cakeday_birthday_emoji\&quot;:\&quot;birthday\&quot;,\&quot;patreon_enabled\&quot;:false,\&quot;patreon_login_enabled\&quot;:false,\&quot;patreon_donation_prompt_enabled\&quot;:false,\&quot;patreon_donation_prompt_show_after_topics\&quot;:20,\&quot;patreon_donation_prompt_campaign_url\&quot;:\&quot;\&quot;,\&quot;discourse_internet_explorer_deprecation_warning\&quot;:true,\&quot;affiliate_enabled\&quot;:true,\&quot;affiliate_amazon_ca\&quot;:\&quot;\&quot;,\&quot;affiliate_amazon_cn\&quot;:\&quot;\&quot;,\&quot;affiliate_amazon_co_jp\&quot;:\&quot;\&quot;,\&quot;affiliate_amazon_co_uk\&quot;:\&quot;\&quot;,\&quot;affiliate_amazon_com\&quot;:\&quot;\&quot;,\&quot;affiliate_amazon_com_au\&quot;:\&quot;\&quot;,\&quot;affiliate_amazon_com_br\&quot;:\&quot;\&quot;,\&quot;affiliate_amazon_com_mx\&quot;:\&quot;\&quot;,\&quot;affiliate_amazon_de\&quot;:\&quot;\&quot;,\&quot;affiliate_amazon_es\&quot;:\&quot;\&quot;,\&quot;affiliate_amazon_fr\&quot;:\&quot;\&quot;,\&quot;affiliate_amazon_in\&quot;:\&quot;\&quot;,\&quot;affiliate_amazon_it\&quot;:\&quot;\&quot;,\&quot;affiliate_amazon_nl\&quot;:\&quot;\&quot;,\&quot;affiliate_ldlc_com\&quot;:\&quot;\&quot;,\&quot;checklist_enabled\&quot;:true,\&quot;data_explorer_enabled\&quot;:true,\&quot;discourse_local_dates_email_format\&quot;:\&quot;YYYY-MM-DDTHH:mm:ss[Z]\&quot;,\&quot;discourse_local_dates_enabled\&quot;:true,\&quot;discourse_local_dates_default_formats\&quot;:\&quot;LLL|LTS|LL|LLLL\&quot;,\&quot;discourse_local_dates_default_timezones\&quot;:\&quot;Europe/Paris|America/Los_Angeles\&quot;,\&quot;assign_enabled\&quot;:true,\&quot;assigns_user_url_path\&quot;:\&quot;/latest?assigned={username}\u0026status=open\&quot;,\&quot;remind_assigns_frequency\&quot;:43200,\&quot;max_assigned_topics\&quot;:20,\&quot;assign_allowed_on_groups\&quot;:\&quot;3\&quot;,\&quot;details_enabled\&quot;:true,\&quot;desktop_push_notifications_enabled\&quot;:true,\&quot;discourse_narrative_bot_enabled\&quot;:true,\&quot;spoiler_enabled\&quot;:true,\&quot;knowledge_explorer_enabled\&quot;:true,\&quot;knowledge_explorer_categories\&quot;:\&quot;10|55|53|56|66|45|4\&quot;,\&quot;knowledge_explorer_tags\&quot;:\&quot;\&quot;,\&quot;voting_enabled\&quot;:true,\&quot;voting_show_who_voted\&quot;:true,\&quot;voting_show_votes_on_profile\&quot;:true,\&quot;no_ads_for_personal_messages\&quot;:true,\&quot;no_ads_for_restricted_categories\&quot;:true,\&quot;no_ads_for_groups\&quot;:\&quot;\&quot;,\&quot;no_ads_for_categories\&quot;:\&quot;30|67\&quot;,\&quot;no_ads_for_tags\&quot;:\&quot;standard|business|enterprise|trial|free|enterprise-lead|job-application\&quot;,\&quot;house_ads_after_nth_post\&quot;:10,\&quot;house_ads_frequency\&quot;:100,\&quot;adsense_publisher_code\&quot;:\&quot;\&quot;,\&quot;adsense_through_trust_level\&quot;:2,\&quot;adsense_topic_list_top_code\&quot;:\&quot;\&quot;,\&quot;adsense_topic_list_top_ad_sizes\&quot;:\&quot;728*90 - leaderboard\&quot;,\&quot;adsense_mobile_topic_list_top_code\&quot;:\&quot;\&quot;,\&quot;adsense_mobile_topic_list_top_ad_size\&quot;:\&quot;responsive\&quot;,\&quot;adsense_topic_above_post_stream_code\&quot;:\&quot;\&quot;,\&quot;adsense_topic_above_post_stream_ad_sizes\&quot;:\&quot;728*90 - leaderboard\&quot;,\&quot;adsense_mobile_topic_above_post_stream_code\&quot;:\&quot;\&quot;,\&quot;adsense_mobile_topic_above_post_stream_ad_size\&quot;:\&quot;responsive\&quot;,\&quot;adsense_topic_above_suggested_code\&quot;:\&quot;\&quot;,\&quot;adsense_topic_above_suggested_ad_sizes\&quot;:\&quot;728*90 - leaderboard\&quot;,\&quot;adsense_mobile_topic_above_suggested_code\&quot;:\&quot;\&quot;,\&quot;adsense_mobile_topic_above_suggested_ad_size\&quot;:\&quot;responsive\&quot;,\&quot;adsense_post_bottom_code\&quot;:\&quot;\&quot;,\&quot;adsense_post_bottom_ad_sizes\&quot;:\&quot;728*90 - leaderboard\&quot;,\&quot;adsense_mobile_post_bottom_code\&quot;:\&quot;\&quot;,\&quot;adsense_mobile_post_bottom_ad_size\&quot;:\&quot;responsive\&quot;,\&quot;adsense_nth_post_code\&quot;:\&quot;\&quot;,\&quot;dfp_publisher_id\&quot;:\&quot;\&quot;,\&quot;dfp_publisher_id_mobile\&quot;:\&quot;\&quot;,\&quot;dfp_through_trust_level\&quot;:2,\&quot;dfp_topic_list_top_code\&quot;:\&quot;\&quot;,\&quot;dfp_topic_list_top_ad_sizes\&quot;:\&quot;728*90 - leaderboard\&quot;,\&quot;dfp_mobile_topic_list_top_code\&quot;:\&quot;\&quot;,\&quot;dfp_mobile_topic_list_top_ad_sizes\&quot;:\&quot;320*50 - mobile leaderboard\&quot;,\&quot;dfp_target_topic_list_top_key_code\&quot;:\&quot;\&quot;,\&quot;dfp_target_topic_list_top_value_code\&quot;:\&quot;\&quot;,\&quot;dfp_topic_above_post_stream_code\&quot;:\&quot;\&quot;,\&quot;dfp_topic_above_post_stream_ad_sizes\&quot;:\&quot;728*90 - leaderboard\&quot;,\&quot;dfp_mobile_topic_above_post_stream_code\&quot;:\&quot;\&quot;,\&quot;dfp_mobile_topic_above_post_stream_ad_sizes\&quot;:\&quot;320*50 - mobile leaderboard\&quot;,\&quot;dfp_target_topic_above_post_stream_key_code\&quot;:\&quot;\&quot;,\&quot;dfp_target_topic_above_post_stream_value_code\&quot;:\&quot;\&quot;,\&quot;dfp_topic_above_suggested_code\&quot;:\&quot;\&quot;,\&quot;dfp_topic_above_suggested_ad_sizes\&quot;:\&quot;728*90 - leaderboard\&quot;,\&quot;dfp_mobile_topic_above_suggested_code\&quot;:\&quot;\&quot;,\&quot;dfp_mobile_topic_above_suggested_ad_sizes\&quot;:\&quot;320*50 - mobile leaderboard\&quot;,\&quot;dfp_target_topic_above_suggested_key_code\&quot;:\&quot;\&quot;,\&quot;dfp_target_topic_above_suggested_value_code\&quot;:\&quot;\&quot;,\&quot;dfp_nth_post_code\&quot;:\&quot;\&quot;,\&quot;dfp_post_bottom_code\&quot;:\&quot;\&quot;,\&quot;dfp_post_bottom_ad_sizes\&quot;:\&quot;728*90 - leaderboard\&quot;,\&quot;dfp_mobile_post_bottom_code\&quot;:\&quot;\&quot;,\&quot;dfp_mobile_post_bottom_ad_sizes\&quot;:\&quot;320*50 - mobile leaderboard\&quot;,\&quot;dfp_target_post_bottom_key_code\&quot;:\&quot;\&quot;,\&quot;dfp_target_post_bottom_value_code\&quot;:\&quot;\&quot;,\&quot;amazon_through_trust_level\&quot;:2,\&quot;amazon_topic_list_top_src_code\&quot;:\&quot;\&quot;,\&quot;amazon_topic_list_top_ad_width_code\&quot;:\&quot;\&quot;,\&quot;amazon_topic_list_top_ad_height_code\&quot;:\&quot;\&quot;,\&quot;amazon_mobile_topic_list_top_src_code\&quot;:\&quot;\&quot;,\&quot;amazon_mobile_topic_list_top_ad_width_code\&quot;:\&quot;\&quot;,\&quot;amazon_mobile_topic_list_top_ad_height_code\&quot;:\&quot;\&quot;,\&quot;amazon_topic_above_post_stream_src_code\&quot;:\&quot;\&quot;,\&quot;amazon_topic_above_post_stream_ad_width_code\&quot;:\&quot;\&quot;,\&quot;amazon_topic_above_post_stream_ad_height_code\&quot;:\&quot;\&quot;,\&quot;amazon_mobile_topic_above_post_stream_src_code\&quot;:\&quot;\&quot;,\&quot;amazon_mobile_topic_above_post_stream_ad_width_code\&quot;:\&quot;\&quot;,\&quot;amazon_mobile_topic_above_post_stream_ad_height_code\&quot;:\&quot;\&quot;,\&quot;amazon_topic_above_suggested_src_code\&quot;:\&quot;\&quot;,\&quot;amazon_topic_above_suggested_ad_width_code\&quot;:\&quot;\&quot;,\&quot;amazon_topic_above_suggested_ad_height_code\&quot;:\&quot;\&quot;,\&quot;amazon_mobile_topic_above_suggested_src_code\&quot;:\&quot;\&quot;,\&quot;amazon_mobile_topic_above_suggested_ad_width_code\&quot;:\&quot;\&quot;,\&quot;amazon_mobile_topic_above_suggested_ad_height_code\&quot;:\&quot;\&quot;,\&quot;amazon_post_bottom_src_code\&quot;:\&quot;\&quot;,\&quot;amazon_nth_post_code\&quot;:\&quot;\&quot;,\&quot;amazon_post_bottom_ad_width_code\&quot;:\&quot;\&quot;,\&quot;amazon_post_bottom_ad_height_code\&quot;:\&quot;\&quot;,\&quot;amazon_mobile_post_bottom_src_code\&quot;:\&quot;\&quot;,\&quot;amazon_mobile_post_bottom_ad_width_code\&quot;:\&quot;\&quot;,\&quot;amazon_mobile_post_bottom_ad_height_code\&quot;:\&quot;\&quot;,\&quot;codefund_property_id\&quot;:\&quot;353\&quot;,\&quot;codefund_advertiser_label\&quot;:\&quot;Advertiser\&quot;,\&quot;codefund_advertiser_short_label\&quot;:\&quot;Ad\&quot;,\&quot;codefund_through_trust_level\&quot;:4,\&quot;codefund_nth_post\&quot;:20,\&quot;codefund_display_advertiser_labels\&quot;:true,\&quot;codefund_below_post_enabled\&quot;:true,\&quot;codefund_above_post_stream_enabled\&quot;:false,\&quot;codefund_above_suggested_enabled\&quot;:false,\&quot;codefund_top_of_topic_list_enabled\&quot;:false,\&quot;carbonads_serve_id\&quot;:\&quot;\&quot;,\&quot;carbonads_placement\&quot;:\&quot;\&quot;,\&quot;carbonads_through_trust_level\&quot;:2,\&quot;carbonads_topic_list_top_enabled\&quot;:false,\&quot;carbonads_above_post_stream_enabled\&quot;:false,\&quot;adbutler_publisher_id\&quot;:\&quot;\&quot;,\&quot;adbutler_through_trust_level\&quot;:2,\&quot;adbutler_topic_list_top_zone_id\&quot;:\&quot;\&quot;,\&quot;adbutler_mobile_topic_list_top_zone_id\&quot;:\&quot;\&quot;,\&quot;adbutler_topic_above_post_stream_zone_id\&quot;:\&quot;\&quot;,\&quot;adbutler_mobile_topic_above_post_stream_zone_id\&quot;:\&quot;\&quot;,\&quot;adbutler_topic_above_suggested_zone_id\&quot;:\&quot;\&quot;,\&quot;adbutler_mobile_topic_above_suggested_zone_id\&quot;:\&quot;\&quot;,\&quot;adbutler_post_bottom_zone_id\&quot;:\&quot;\&quot;,\&quot;adbutler_mobile_post_bottom_zone_id\&quot;:\&quot;\&quot;,\&quot;adbutler_nth_post\&quot;:4,\&quot;adbutler_adserver_hostname\&quot;:\&quot;servedbyadbutler.com\&quot;,\&quot;user_notes_enabled\&quot;:true,\&quot;canned_replies_enabled\&quot;:true,\&quot;yearly_review_enabled\&quot;:true,\&quot;presence_enabled\&quot;:true,\&quot;poll_enabled\&quot;:true,\&quot;poll_maximum_options\&quot;:30,\&quot;poll_minimum_trust_level_to_create\&quot;:1,\&quot;poll_groupable_user_fields\&quot;:\&quot;\&quot;,\&quot;poll_export_data_explorer_query_id\&quot;:-16,\&quot;saved_searches_enabled\&quot;:true,\&quot;saved_searches_min_trust_level\&quot;:2,\&quot;solved_enabled\&quot;:true,\&quot;allow_solved_on_all_topics\&quot;:false,\&quot;accept_all_solutions_trust_level\&quot;:4,\&quot;empty_box_on_unsolved\&quot;:false,\&quot;show_filter_by_solved_status\&quot;:false,\&quot;discourse_teams_enabled\&quot;:true,\&quot;available_locales\&quot;:\&quot;[{\\\&quot;name\\\&quot;:\\\&quot;اللغة العربية\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;ar\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;беларуская мова\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;be\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;български език\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;bg\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;bosanski jezik\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;bs_BA\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;català\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;ca\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;čeština\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;cs\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;dansk\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;da\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;Deutsch\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;de\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;ελληνικά\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;el\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;English\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;en\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;English (United States)\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;en_US\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;Español\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;es\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;eesti\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;et\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;فارسی\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;fa_IR\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;suomi\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;fi\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;Français\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;fr\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;galego\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;gl\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;עברית\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;he\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;magyar\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;hu\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;Հայերեն\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;hy\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;Indonesian\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;id\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;Italiano\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;it\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;日本語\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;ja\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;한국어\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;ko\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;lietuvių kalba\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;lt\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;latviešu valoda\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;lv\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;Norsk bokmål\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;nb_NO\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;Nederlands\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;nl\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;język polski\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;pl_PL\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;Português\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;pt\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;Português (BR)\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;pt_BR\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;limba română\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;ro\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;Русский\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;ru\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;slovenčina\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;sk\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;slovenščina\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;sl\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;Shqip\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;sq\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;српски језик\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;sr\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;svenska\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;sv\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;Kiswahili\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;sw\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;తెలుగు\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;te\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;ไทย\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;th\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;Türkçe\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;tr_TR\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;українська мова\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;uk\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;اردو\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;ur\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;Việt Nam\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;vi\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;中文\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;zh_CN\\\&quot;},{\\\&quot;name\\\&quot;:\\\&quot;中文 (TW)\\\&quot;,\\\&quot;value\\\&quot;:\\\&quot;zh_TW\\\&quot;}]\&quot;,\&quot;site_logo_url\&quot;:\&quot;https://d11a6trkgmumsb.cloudfront.net/original/3X/1/0/101f03af29f12ea30e1226eb96a02c3ed2f6d2ef.png\&quot;,\&quot;site_logo_small_url\&quot;:\&quot;https://d11a6trkgmumsb.cloudfront.net/original/3X/b/3/b33be9538df3547fcf9d1a51a4637d77392ac6f9.png\&quot;,\&quot;site_mobile_logo_url\&quot;:\&quot;https://d11a6trkgmumsb.cloudfront.net/original/3X/1/0/101f03af29f12ea30e1226eb96a02c3ed2f6d2ef.png\&quot;,\&quot;site_favicon_url\&quot;:\&quot;https://d11a6trkgmumsb.cloudfront.net/optimized/3X/b/3/b33be9538df3547fcf9d1a51a4637d77392ac6f9_2_32x32.png\&quot;}&quot;,&quot;customHTML&quot;:&quot;{\&quot;top\&quot;:\&quot;\&quot;,\&quot;footer\&quot;:\&quot;\&quot;}&quot;,&quot;banner&quot;:&quot;{}&quot;,&quot;customEmoji&quot;:&quot;[{\&quot;name\&quot;:\&quot;allthethings\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/6/1/61e481320406f0f82ed780db3f04056128191613.png\&quot;},{\&quot;name\&quot;:\&quot;areyoukiddingme\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/a/4/a419f9bfc1d7be37c8566c64d1bedca9e9173e06.png\&quot;},{\&quot;name\&quot;:\&quot;awthanks\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/2/5/25c3f8e8c8ae13b6dfa6e94169410d6203d7d2f1.png\&quot;},{\&quot;name\&quot;:\&quot;badpokerface\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/4/4/44800bd49b02615e39f799622233dac089f6c0bf.png\&quot;},{\&quot;name\&quot;:\&quot;challengeaccepted\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/9/0/9043c341c0f460897b81ce05d6117293cb3b8677.png\&quot;},{\&quot;name\&quot;:\&quot;content\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/2/7/2794a1e36765e009c2ec99b4a181800f8bf41036.png\&quot;},{\&quot;name\&quot;:\&quot;dealwithit\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/3/a/3aa0aa7da8337d27f11d82242c04216185b248cf.gif\&quot;},{\&quot;name\&quot;:\&quot;derp\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/f/9/f91b2da50374ccba12a6ab85d532da1bc7d1c4c4.png\&quot;},{\&quot;name\&quot;:\&quot;disapproval\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/d/a/da6fa762bab11b4307bbca85a589a969a375f776.png\&quot;},{\&quot;name\&quot;:\&quot;discourse\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/b/1/b19ba793155a785bbd9707bc0cabbd3a987fa126.png\&quot;},{\&quot;name\&quot;:\&quot;dosequis\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/6/e/6e07135e8aa0eec5a289f257ce6bb88104bd7ee1.png\&quot;},{\&quot;name\&quot;:\&quot;drevil\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/9/c/9cf4d1ca21f3bf2286388f8d7a0ba74b5c3cb81c.png\&quot;},{\&quot;name\&quot;:\&quot;facepalm\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/d/6/d65d677aed3d7f9883930292407e3f9a4dc86972.png\&quot;},{\&quot;name\&quot;:\&quot;firstworldproblem\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/c/0/c0013cffee52a2ab93fec470cbefcf17a56d08d8.png\&quot;},{\&quot;name\&quot;:\&quot;fonzie\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/7/1/714b126599c1a962873e1779bd06cebef9cef23c.png\&quot;},{\&quot;name\&quot;:\&quot;garbage\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/c/8/c8b4c24e2a65a910febbd150fc442124cf27c177.png\&quot;},{\&quot;name\&quot;:\&quot;gates\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/2/d/2d064953a5e0fcb98c1d10bdb85abc37da9adde5.png\&quot;},{\&quot;name\&quot;:\&quot;goodnews\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/7/5/7527903f8aa1087e26aec6011dd05277e5f35f21.png\&quot;},{\&quot;name\&quot;:\&quot;grumpycat\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/6/b/6b11bb2fe092fdc93c5c94438b379840b512776d.png\&quot;},{\&quot;name\&quot;:\&quot;hipster\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/b/1/b1e783d7f94294754db2bb1680eb0e4d632ba02e.png\&quot;},{\&quot;name\&quot;:\&quot;jobs\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/4/0/407047bc725cbc7fb39430d9523a53ab36e97c52.png\&quot;},{\&quot;name\&quot;:\&quot;liquorice\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/2/e/2e522c184eb38561e8853c8b9a2d15c0768f6f25.png\&quot;},{\&quot;name\&quot;:\&quot;lol\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/4/8/48ba946a44b6750f4fe3bafb8016a088f4a47ff7.png\&quot;},{\&quot;name\&quot;:\&quot;mdr\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/8/3/83e437fd1fb1b94357703172dd48ce34232c84d3.gif\&quot;},{\&quot;name\&quot;:\&quot;notsureif\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/f/c/fcb887a1c0f907c4eda23693b2d4ffebde8bffc1.png\&quot;},{\&quot;name\&quot;:\&quot;okay\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/f/d/fdeaafa1675d6944d8240aec5d22e31d1978645e.png\&quot;},{\&quot;name\&quot;:\&quot;orly\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/d/d/dd2b3b630cb5efeb3f56483377c32b0fc5271d80.png\&quot;},{\&quot;name\&quot;:\&quot;philosoraptor\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/c/b/cbe4239749d2fd4af6e0bb5f8181e5fb3bd8eedb.png\&quot;},{\&quot;name\&quot;:\&quot;pokeball\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/6/c/6c26517d3bb3fac008a6352fc66ce4e94d7a2291.png\&quot;},{\&quot;name\&quot;:\&quot;pokerface\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/1/5/15c7b01487e28720b5c32d5ee9a5db4dd92c16bd.png\&quot;},{\&quot;name\&quot;:\&quot;rageguy\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/a/c/ace6844484cb0cb36cf4f19e23025f5df15ee510.png\&quot;},{\&quot;name\&quot;:\&quot;sadpanda\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/7/c/7c2bd5eecf04b788b6ee2028c65a90868c979e53.png\&quot;},{\&quot;name\&quot;:\&quot;shoryuken\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/1/d/1de8f76096f76cf393640bdcff387ec9ae33dd3e.gif\&quot;},{\&quot;name\&quot;:\&quot;success\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/b/1/b1bef2034df1f097426a56b6220c2c2d189e2e25.png\&quot;},{\&quot;name\&quot;:\&quot;test\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/9/3/933febd589714f24481a7d8b123119e05a2a0156.png\&quot;},{\&quot;name\&quot;:\&quot;troll\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/e/f/efe45f803a9f93e8f678f919328a03fa8c91342f.png\&quot;},{\&quot;name\&quot;:\&quot;unicorn\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/9/c/9c93812afa2ccb9df7f352ea994333af50f599fc.png\&quot;},{\&quot;name\&quot;:\&quot;wat\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/e/1/e189953dabc6bf7e53956f4faf4f86bf2ad9bea2.png\&quot;},{\&quot;name\&quot;:\&quot;yey\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/e/0/e03415a0f89e32ccb06dddd475a82d7c43b350f9.png\&quot;},{\&quot;name\&quot;:\&quot;yuno\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/a/5/a5274cbf539569182b9dd9c74272cedf3710db25.png\&quot;},{\&quot;name\&quot;:\&quot;zogstrip\&quot;,\&quot;url\&quot;:\&quot;//assets-meta-cdck-prod-meta.s3.dualstack.us-west-1.amazonaws.com/original/3X/e/3/e3d395c2acddc5aa8348944fa5f1057091bde0d0.png\&quot;}]&quot;,&quot;currentUser&quot;:&quot;{\&quot;id\&quot;:8222,\&quot;username\&quot;:\&quot;techAPJ\&quot;,\&quot;name\&quot;:\&quot;Arpit Jalan\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/techapj/{size}/152320_2.png\&quot;,\&quot;unread_notifications\&quot;:1,\&quot;unread_private_messages\&quot;:0,\&quot;read_first_notification\&quot;:true,\&quot;admin\&quot;:true,\&quot;notification_channel_position\&quot;:11210,\&quot;moderator\&quot;:false,\&quot;staff\&quot;:true,\&quot;title\&quot;:\&quot;team\&quot;,\&quot;reply_count\&quot;:1485,\&quot;topic_count\&quot;:61,\&quot;enable_quoting\&quot;:true,\&quot;enable_defer\&quot;:false,\&quot;external_links_in_new_tab\&quot;:true,\&quot;dynamic_favicon\&quot;:true,\&quot;trust_level\&quot;:4,\&quot;can_send_private_email_messages\&quot;:true,\&quot;can_edit\&quot;:true,\&quot;can_invite_to_forum\&quot;:true,\&quot;should_be_redirected_to_top\&quot;:false,\&quot;custom_fields\&quot;:{},\&quot;muted_category_ids\&quot;:[],\&quot;muted_tag_ids\&quot;:[],\&quot;dismissed_banner_key\&quot;:null,\&quot;is_anonymous\&quot;:false,\&quot;reviewable_count\&quot;:0,\&quot;read_faq\&quot;:true,\&quot;automatically_unpin_topics\&quot;:true,\&quot;mailing_list_mode\&quot;:false,\&quot;previous_visit_at\&quot;:\&quot;2020-01-30T01:18:37.467Z\&quot;,\&quot;seen_notification_id\&quot;:6793103,\&quot;primary_group_id\&quot;:47,\&quot;can_create_topic\&quot;:true,\&quot;link_posting_access\&quot;:\&quot;full\&quot;,\&quot;top_category_ids\&quot;:[89,1,13,10,35],\&quot;hide_profile_and_presence\&quot;:false,\&quot;groups\&quot;:[{\&quot;id\&quot;:1,\&quot;name\&quot;:\&quot;admins\&quot;,\&quot;has_messages\&quot;:false},{\&quot;id\&quot;:3,\&quot;name\&quot;:\&quot;staff\&quot;,\&quot;has_messages\&quot;:false},{\&quot;id\&quot;:77,\&quot;name\&quot;:\&quot;support\&quot;,\&quot;has_messages\&quot;:true},{\&quot;id\&quot;:47,\&quot;name\&quot;:\&quot;team\&quot;,\&quot;has_messages\&quot;:true},{\&quot;id\&quot;:10,\&quot;name\&quot;:\&quot;trust_level_0\&quot;,\&quot;has_messages\&quot;:false},{\&quot;id\&quot;:11,\&quot;name\&quot;:\&quot;trust_level_1\&quot;,\&quot;has_messages\&quot;:false},{\&quot;id\&quot;:12,\&quot;name\&quot;:\&quot;trust_level_2\&quot;,\&quot;has_messages\&quot;:false},{\&quot;id\&quot;:13,\&quot;name\&quot;:\&quot;trust_level_3\&quot;,\&quot;has_messages\&quot;:false},{\&quot;id\&quot;:14,\&quot;name\&quot;:\&quot;trust_level_4\&quot;,\&quot;has_messages\&quot;:false}],\&quot;second_factor_enabled\&quot;:true,\&quot;ignored_users\&quot;:[],\&quot;title_count_mode\&quot;:\&quot;notifications\&quot;,\&quot;timezone\&quot;:\&quot;Asia/Calcutta\&quot;,\&quot;featured_topic\&quot;:null,\&quot;can_assign\&quot;:true,\&quot;can_use_canned_replies\&quot;:true,\&quot;user_tags\&quot;:[],\&quot;votes_exceeded\&quot;:false,\&quot;vote_count\&quot;:0}&quot;,&quot;topicTrackingStates&quot;:&quot;[{\&quot;topic_id\&quot;:139910,\&quot;highest_post_number\&quot;:1,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T07:06:52.483Z\&quot;,\&quot;category_id\&quot;:2,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139930,\&quot;highest_post_number\&quot;:7,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T11:55:45.950Z\&quot;,\&quot;category_id\&quot;:84,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139931,\&quot;highest_post_number\&quot;:6,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T12:03:55.327Z\&quot;,\&quot;category_id\&quot;:6,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139937,\&quot;highest_post_number\&quot;:7,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T13:41:34.279Z\&quot;,\&quot;category_id\&quot;:2,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139940,\&quot;highest_post_number\&quot;:3,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T14:35:01.824Z\&quot;,\&quot;category_id\&quot;:6,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139941,\&quot;highest_post_number\&quot;:1,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T14:35:09.722Z\&quot;,\&quot;category_id\&quot;:7,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139950,\&quot;highest_post_number\&quot;:3,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T15:53:07.335Z\&quot;,\&quot;category_id\&quot;:2,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139951,\&quot;highest_post_number\&quot;:3,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T15:57:48.131Z\&quot;,\&quot;category_id\&quot;:7,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139954,\&quot;highest_post_number\&quot;:2,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T16:06:21.893Z\&quot;,\&quot;category_id\&quot;:31,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139957,\&quot;highest_post_number\&quot;:3,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T16:26:29.028Z\&quot;,\&quot;category_id\&quot;:75,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139959,\&quot;highest_post_number\&quot;:4,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T16:37:40.432Z\&quot;,\&quot;category_id\&quot;:6,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139961,\&quot;highest_post_number\&quot;:2,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T16:59:59.417Z\&quot;,\&quot;category_id\&quot;:9,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139963,\&quot;highest_post_number\&quot;:3,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T17:03:58.481Z\&quot;,\&quot;category_id\&quot;:6,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139965,\&quot;highest_post_number\&quot;:3,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T17:23:41.118Z\&quot;,\&quot;category_id\&quot;:6,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139966,\&quot;highest_post_number\&quot;:2,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T17:31:35.502Z\&quot;,\&quot;category_id\&quot;:6,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139971,\&quot;highest_post_number\&quot;:3,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T18:33:36.907Z\&quot;,\&quot;category_id\&quot;:1,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139974,\&quot;highest_post_number\&quot;:6,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T18:50:33.862Z\&quot;,\&quot;category_id\&quot;:1,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139979,\&quot;highest_post_number\&quot;:3,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T20:13:48.182Z\&quot;,\&quot;category_id\&quot;:6,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139988,\&quot;highest_post_number\&quot;:1,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T22:42:43.295Z\&quot;,\&quot;category_id\&quot;:67,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139992,\&quot;highest_post_number\&quot;:2,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T23:15:55.511Z\&quot;,\&quot;category_id\&quot;:9,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:139996,\&quot;highest_post_number\&quot;:8,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T00:29:46.552Z\&quot;,\&quot;category_id\&quot;:6,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140005,\&quot;highest_post_number\&quot;:4,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T02:08:48.196Z\&quot;,\&quot;category_id\&quot;:6,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140015,\&quot;highest_post_number\&quot;:6,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T04:27:46.593Z\&quot;,\&quot;category_id\&quot;:31,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140016,\&quot;highest_post_number\&quot;:5,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T04:51:25.625Z\&quot;,\&quot;category_id\&quot;:6,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140017,\&quot;highest_post_number\&quot;:16,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T05:14:56.816Z\&quot;,\&quot;category_id\&quot;:67,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140028,\&quot;highest_post_number\&quot;:6,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T07:51:19.392Z\&quot;,\&quot;category_id\&quot;:2,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140041,\&quot;highest_post_number\&quot;:1,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T10:42:13.428Z\&quot;,\&quot;category_id\&quot;:6,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140043,\&quot;highest_post_number\&quot;:2,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T11:00:44.754Z\&quot;,\&quot;category_id\&quot;:14,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140065,\&quot;highest_post_number\&quot;:4,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T14:26:39.718Z\&quot;,\&quot;category_id\&quot;:88,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140067,\&quot;highest_post_number\&quot;:2,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T14:36:23.543Z\&quot;,\&quot;category_id\&quot;:2,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140079,\&quot;highest_post_number\&quot;:4,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T16:11:36.524Z\&quot;,\&quot;category_id\&quot;:2,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140083,\&quot;highest_post_number\&quot;:4,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T16:48:38.993Z\&quot;,\&quot;category_id\&quot;:24,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140087,\&quot;highest_post_number\&quot;:4,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T17:41:22.978Z\&quot;,\&quot;category_id\&quot;:6,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140096,\&quot;highest_post_number\&quot;:6,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T18:40:48.647Z\&quot;,\&quot;category_id\&quot;:1,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140104,\&quot;highest_post_number\&quot;:3,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T19:44:39.003Z\&quot;,\&quot;category_id\&quot;:90,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140109,\&quot;highest_post_number\&quot;:6,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T20:40:28.069Z\&quot;,\&quot;category_id\&quot;:77,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140112,\&quot;highest_post_number\&quot;:2,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T21:01:23.534Z\&quot;,\&quot;category_id\&quot;:31,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140124,\&quot;highest_post_number\&quot;:6,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T22:44:53.454Z\&quot;,\&quot;category_id\&quot;:2,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140125,\&quot;highest_post_number\&quot;:1,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T23:40:16.753Z\&quot;,\&quot;category_id\&quot;:89,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140127,\&quot;highest_post_number\&quot;:2,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-30T00:18:08.997Z\&quot;,\&quot;category_id\&quot;:1,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:140133,\&quot;highest_post_number\&quot;:1,\&quot;last_read_post_number\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-30T04:51:43.425Z\&quot;,\&quot;category_id\&quot;:77,\&quot;notification_level\&quot;:null},{\&quot;topic_id\&quot;:60305,\&quot;highest_post_number\&quot;:10,\&quot;last_read_post_number\&quot;:9,\&quot;created_at\&quot;:\&quot;2017-04-02T01:19:41.407Z\&quot;,\&quot;category_id\&quot;:1,\&quot;notification_level\&quot;:2},{\&quot;topic_id\&quot;:139335,\&quot;highest_post_number\&quot;:17,\&quot;last_read_post_number\&quot;:15,\&quot;created_at\&quot;:\&quot;2020-01-21T20:17:13.836Z\&quot;,\&quot;category_id\&quot;:1,\&quot;notification_level\&quot;:2},{\&quot;topic_id\&quot;:132695,\&quot;highest_post_number\&quot;:51,\&quot;last_read_post_number\&quot;:50,\&quot;created_at\&quot;:\&quot;2019-11-05T21:01:27.834Z\&quot;,\&quot;category_id\&quot;:89,\&quot;notification_level\&quot;:2}]&quot;,&quot;topic_12483&quot;:&quot;{\&quot;post_stream\&quot;:{\&quot;posts\&quot;:[{\&quot;id\&quot;:39739,\&quot;name\&quot;:\&quot;Arpit Jalan\&quot;,\&quot;username\&quot;:\&quot;techAPJ\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/techapj/{size}/152320_2.png\&quot;,\&quot;created_at\&quot;:\&quot;2014-02-06T04:55:19.372Z\&quot;,\&quot;cooked\&quot;:\&quot;\\u003cp\\u003eCongratulations Discourse for qualifying \\u003cstrong\\u003eRepositories with the most stars\\u003c/strong\\u003e on \\u003ca href=\\\&quot;http://octoverse.github.com/\\\&quot; rel=\\\&quot;nofollow noopener\\\&quot;\\u003eGitHub Octoverse\\u003c/a\\u003e.\\u003c/p\\u003e\\n\\u003cp\\u003e\\u003cdiv class=\\\&quot;lightbox-wrapper\\\&quot;\\u003e\\u003ca class=\\\&quot;lightbox\\\&quot; href=\\\&quot;https://d11a6trkgmumsb.cloudfront.net/original/2X/d/d063b3b0807377d98695ee08042a9ba0a8c593bd.png\\\&quot; data-download-href=\\\&quot;/uploads/short-url/tJuViGduTW0q554XGvz7IKrqawR.png?dl=1\\\&quot; title=\\\&quot;github_octoverse.png\\\&quot; rel=\\\&quot;nofollow noopener\\\&quot;\\u003e\\u003cimg src=\\\&quot;https://d11a6trkgmumsb.cloudfront.net/optimized/2X/d/d063b3b0807377d98695ee08042a9ba0a8c593bd_2_690x362.png\\\&quot; width=\\\&quot;690\\\&quot; height=\\\&quot;362\\\&quot; srcset=\\\&quot;https://d11a6trkgmumsb.cloudfront.net/optimized/2X/d/d063b3b0807377d98695ee08042a9ba0a8c593bd_2_690x362.png, https://d11a6trkgmumsb.cloudfront.net/optimized/2X/d/d063b3b0807377d98695ee08042a9ba0a8c593bd_2_1035x543.png 1.5x, https://d11a6trkgmumsb.cloudfront.net/original/2X/d/d063b3b0807377d98695ee08042a9ba0a8c593bd.png 2x\\\&quot; data-small-upload=\\\&quot;https://d11a6trkgmumsb.cloudfront.net/optimized/2X/d/d063b3b0807377d98695ee08042a9ba0a8c593bd_2_10x10.png\\\&quot;\\u003e\\u003cdiv class=\\\&quot;meta\\\&quot;\\u003e\\n\\u003csvg class=\\\&quot;fa d-icon d-icon-far-image svg-icon\\\&quot; aria-hidden=\\\&quot;true\\\&quot;\\u003e\\u003cuse xlink:href=\\\&quot;#far-image\\\&quot;\\u003e\\u003c/use\\u003e\\u003c/svg\\u003e\\u003cspan class=\\\&quot;filename\\\&quot;\\u003egithub_octoverse.png\\u003c/span\\u003e\\u003cspan class=\\\&quot;informations\\\&quot;\\u003e1365×718 217 KB\\u003c/span\\u003e\\u003csvg class=\\\&quot;fa d-icon d-icon-discourse-expand svg-icon\\\&quot; aria-hidden=\\\&quot;true\\\&quot;\\u003e\\u003cuse xlink:href=\\\&quot;#discourse-expand\\\&quot;\\u003e\\u003c/use\\u003e\\u003c/svg\\u003e\\n\\u003c/div\\u003e\\u003c/a\\u003e\\u003c/div\\u003e \\u003c/p\\u003e\\n\\u003cp\\u003eAnd that too in just over an year, way to go! \\u003cimg src=\\\&quot;https://d3bpeqsaub0i6y.cloudfront.net/images/emoji/twitter/boom.png?v=9\\\&quot; title=\\\&quot;:boom:\\\&quot; class=\\\&quot;emoji\\\&quot; alt=\\\&quot;:boom:\\\&quot;\\u003e\\u003c/p\\u003e\&quot;,\&quot;post_number\&quot;:1,\&quot;post_type\&quot;:1,\&quot;updated_at\&quot;:\&quot;2015-06-19T06:45:49.951Z\&quot;,\&quot;reply_count\&quot;:0,\&quot;reply_to_post_number\&quot;:null,\&quot;quote_count\&quot;:0,\&quot;incoming_link_count\&quot;:799,\&quot;reads\&quot;:64,\&quot;readers_count\&quot;:63,\&quot;score\&quot;:4237.8,\&quot;yours\&quot;:true,\&quot;topic_id\&quot;:12483,\&quot;topic_slug\&quot;:\&quot;congratulations-most-stars-in-2013-github-octoverse\&quot;,\&quot;display_username\&quot;:\&quot;Arpit Jalan\&quot;,\&quot;primary_group_name\&quot;:\&quot;team\&quot;,\&quot;flair_url\&quot;:\&quot;https://aws1.discourse-cdn.com/dev/original/2X/e/ebee30bd98aef20357e4a177a5a1e45b877ce088.svg\&quot;,\&quot;flair_bg_color\&quot;:\&quot;\&quot;,\&quot;flair_color\&quot;:\&quot;111\&quot;,\&quot;version\&quot;:5,\&quot;can_edit\&quot;:true,\&quot;can_delete\&quot;:false,\&quot;can_recover\&quot;:null,\&quot;can_wiki\&quot;:true,\&quot;link_counts\&quot;:[{\&quot;url\&quot;:\&quot;http://octoverse.github.com/\&quot;,\&quot;internal\&quot;:false,\&quot;reflection\&quot;:false,\&quot;title\&quot;:\&quot;GitHub Octoverse 2013\&quot;,\&quot;clicks\&quot;:57},{\&quot;url\&quot;:\&quot;https://d11a6trkgmumsb.cloudfront.net/original/2X/d/d063b3b0807377d98695ee08042a9ba0a8c593bd.png\&quot;,\&quot;internal\&quot;:false,\&quot;reflection\&quot;:false,\&quot;title\&quot;:\&quot;d063b3b0807377d98695ee08042a9ba0a8c593bd.png\&quot;,\&quot;clicks\&quot;:0}],\&quot;read\&quot;:true,\&quot;user_title\&quot;:\&quot;team\&quot;,\&quot;actions_summary\&quot;:[{\&quot;id\&quot;:2,\&quot;count\&quot;:8},{\&quot;id\&quot;:3,\&quot;can_act\&quot;:true},{\&quot;id\&quot;:4,\&quot;can_act\&quot;:true},{\&quot;id\&quot;:8,\&quot;can_act\&quot;:true},{\&quot;id\&quot;:7,\&quot;can_act\&quot;:true}],\&quot;moderator\&quot;:false,\&quot;admin\&quot;:true,\&quot;staff\&quot;:true,\&quot;user_id\&quot;:8222,\&quot;hidden\&quot;:false,\&quot;trust_level\&quot;:4,\&quot;deleted_at\&quot;:null,\&quot;user_deleted\&quot;:false,\&quot;edit_reason\&quot;:null,\&quot;can_view_edit_history\&quot;:true,\&quot;wiki\&quot;:false,\&quot;reviewable_id\&quot;:0,\&quot;reviewable_score_count\&quot;:0,\&quot;reviewable_score_pending_count\&quot;:0,\&quot;user_created_at\&quot;:\&quot;2014-01-16T08:46:15.457Z\&quot;,\&quot;user_date_of_birth\&quot;:\&quot;1904-12-15\&quot;,\&quot;can_accept_answer\&quot;:false,\&quot;can_unaccept_answer\&quot;:false,\&quot;accepted_answer\&quot;:false},{\&quot;id\&quot;:39741,\&quot;name\&quot;:\&quot;Jeff Atwood\&quot;,\&quot;username\&quot;:\&quot;codinghorror\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/codinghorror/{size}/110067_2.png\&quot;,\&quot;created_at\&quot;:\&quot;2014-02-06T05:27:06.860Z\&quot;,\&quot;cooked\&quot;:\&quot;\\u003cp\\u003eAh, cool. I was not sure how to see that since GitHub changed around the way project top stats looked. Thanks for that link and thank you – and everyone else who is contributing to the project!\\u003c/p\\u003e\&quot;,\&quot;post_number\&quot;:2,\&quot;post_type\&quot;:1,\&quot;updated_at\&quot;:\&quot;2014-02-06T05:27:06.860Z\&quot;,\&quot;reply_count\&quot;:0,\&quot;reply_to_post_number\&quot;:null,\&quot;quote_count\&quot;:0,\&quot;incoming_link_count\&quot;:0,\&quot;reads\&quot;:61,\&quot;readers_count\&quot;:60,\&quot;score\&quot;:27.2,\&quot;yours\&quot;:false,\&quot;topic_id\&quot;:12483,\&quot;topic_slug\&quot;:\&quot;congratulations-most-stars-in-2013-github-octoverse\&quot;,\&quot;display_username\&quot;:\&quot;Jeff Atwood\&quot;,\&quot;primary_group_name\&quot;:\&quot;team\&quot;,\&quot;flair_url\&quot;:\&quot;https://aws1.discourse-cdn.com/dev/original/2X/e/ebee30bd98aef20357e4a177a5a1e45b877ce088.svg\&quot;,\&quot;flair_bg_color\&quot;:\&quot;\&quot;,\&quot;flair_color\&quot;:\&quot;111\&quot;,\&quot;version\&quot;:1,\&quot;can_edit\&quot;:true,\&quot;can_delete\&quot;:true,\&quot;can_recover\&quot;:null,\&quot;can_wiki\&quot;:true,\&quot;read\&quot;:true,\&quot;user_title\&quot;:\&quot;co-founder\&quot;,\&quot;actions_summary\&quot;:[{\&quot;id\&quot;:2,\&quot;count\&quot;:1,\&quot;acted\&quot;:true},{\&quot;id\&quot;:3,\&quot;can_act\&quot;:true},{\&quot;id\&quot;:4,\&quot;can_act\&quot;:true},{\&quot;id\&quot;:8,\&quot;can_act\&quot;:true},{\&quot;id\&quot;:6,\&quot;can_act\&quot;:true},{\&quot;id\&quot;:7,\&quot;can_act\&quot;:true}],\&quot;moderator\&quot;:false,\&quot;admin\&quot;:true,\&quot;staff\&quot;:true,\&quot;user_id\&quot;:32,\&quot;hidden\&quot;:false,\&quot;trust_level\&quot;:4,\&quot;deleted_at\&quot;:null,\&quot;user_deleted\&quot;:false,\&quot;edit_reason\&quot;:null,\&quot;can_view_edit_history\&quot;:true,\&quot;wiki\&quot;:false,\&quot;reviewable_id\&quot;:0,\&quot;reviewable_score_count\&quot;:0,\&quot;reviewable_score_pending_count\&quot;:0,\&quot;user_created_at\&quot;:\&quot;2013-02-05T04:44:25.476Z\&quot;,\&quot;user_date_of_birth\&quot;:null,\&quot;can_accept_answer\&quot;:false,\&quot;can_unaccept_answer\&quot;:false,\&quot;accepted_answer\&quot;:false}],\&quot;stream\&quot;:[39739,39741]},\&quot;timeline_lookup\&quot;:[[1,2184],[2,2183]],\&quot;suggested_topics\&quot;:[{\&quot;id\&quot;:132695,\&quot;title\&quot;:\&quot;Data Explorer Query Requests, Plus More Custom Data Requests\&quot;,\&quot;fancy_title\&quot;:\&quot;Data Explorer Query Requests, Plus More Custom Data Requests\&quot;,\&quot;slug\&quot;:\&quot;data-explorer-query-requests-plus-more-custom-data-requests\&quot;,\&quot;posts_count\&quot;:36,\&quot;reply_count\&quot;:32,\&quot;highest_post_number\&quot;:51,\&quot;image_url\&quot;:\&quot;https://d11a6trkgmumsb.cloudfront.net/optimized/3X/e/c/ecf9c2c5c6432ec93dcf6b56f5c209db98d60016_2_690x82.png\&quot;,\&quot;created_at\&quot;:\&quot;2019-11-05T21:01:27.834Z\&quot;,\&quot;last_posted_at\&quot;:\&quot;2020-01-29T22:53:33.021Z\&quot;,\&quot;bumped\&quot;:true,\&quot;bumped_at\&quot;:\&quot;2020-01-29T22:53:33.021Z\&quot;,\&quot;unseen\&quot;:false,\&quot;last_read_post_number\&quot;:50,\&quot;unread\&quot;:0,\&quot;new_posts\&quot;:1,\&quot;pinned\&quot;:false,\&quot;unpinned\&quot;:null,\&quot;visible\&quot;:true,\&quot;closed\&quot;:false,\&quot;archived\&quot;:false,\&quot;notification_level\&quot;:2,\&quot;bookmarked\&quot;:false,\&quot;liked\&quot;:true,\&quot;tags\&quot;:[],\&quot;archetype\&quot;:\&quot;regular\&quot;,\&quot;like_count\&quot;:149,\&quot;views\&quot;:189,\&quot;category_id\&quot;:89,\&quot;featured_link\&quot;:null,\&quot;has_accepted_answer\&quot;:false,\&quot;posters\&quot;:[{\&quot;extras\&quot;:null,\&quot;description\&quot;:\&quot;Original Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:67214,\&quot;username\&quot;:\&quot;Applejack\&quot;,\&quot;name\&quot;:\&quot;Jackie Cole\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/applejack/{size}/149065_2.png\&quot;}},{\&quot;extras\&quot;:null,\&quot;description\&quot;:\&quot;Frequent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:19,\&quot;username\&quot;:\&quot;eviltrout\&quot;,\&quot;name\&quot;:\&quot;Robin Ward\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/eviltrout/{size}/5275_2.png\&quot;}},{\&quot;extras\&quot;:\&quot;latest\&quot;,\&quot;description\&quot;:\&quot;Most Recent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:24222,\&quot;username\&quot;:\&quot;tshenry\&quot;,\&quot;name\&quot;:\&quot;Taylor\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/tshenry/{size}/119495_2.png\&quot;}}]},{\&quot;id\&quot;:139335,\&quot;title\&quot;:\&quot;Publication of Timed Topics don&#39;t trigger new topic notifications\&quot;,\&quot;fancy_title\&quot;:\&quot;Publication of Timed Topics don\\u0026rsquo;t trigger new topic notifications\&quot;,\&quot;slug\&quot;:\&quot;publication-of-timed-topics-dont-trigger-new-topic-notifications\&quot;,\&quot;posts_count\&quot;:17,\&quot;reply_count\&quot;:12,\&quot;highest_post_number\&quot;:17,\&quot;image_url\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-21T20:17:13.836Z\&quot;,\&quot;last_posted_at\&quot;:\&quot;2020-01-29T21:12:10.845Z\&quot;,\&quot;bumped\&quot;:true,\&quot;bumped_at\&quot;:\&quot;2020-01-29T21:12:10.845Z\&quot;,\&quot;unseen\&quot;:false,\&quot;last_read_post_number\&quot;:15,\&quot;unread\&quot;:0,\&quot;new_posts\&quot;:2,\&quot;pinned\&quot;:false,\&quot;unpinned\&quot;:null,\&quot;visible\&quot;:true,\&quot;closed\&quot;:false,\&quot;archived\&quot;:false,\&quot;notification_level\&quot;:2,\&quot;bookmarked\&quot;:false,\&quot;liked\&quot;:true,\&quot;tags\&quot;:[],\&quot;archetype\&quot;:\&quot;regular\&quot;,\&quot;like_count\&quot;:38,\&quot;views\&quot;:323,\&quot;category_id\&quot;:1,\&quot;featured_link\&quot;:null,\&quot;has_accepted_answer\&quot;:false,\&quot;posters\&quot;:[{\&quot;extras\&quot;:null,\&quot;description\&quot;:\&quot;Original Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:5559,\&quot;username\&quot;:\&quot;downey\&quot;,\&quot;name\&quot;:\&quot;Michael Downey\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/downey/{size}/166878_2.png\&quot;}},{\&quot;extras\&quot;:null,\&quot;description\&quot;:\&quot;Frequent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:32,\&quot;username\&quot;:\&quot;codinghorror\&quot;,\&quot;name\&quot;:\&quot;Jeff Atwood\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/codinghorror/{size}/110067_2.png\&quot;}},{\&quot;extras\&quot;:null,\&quot;description\&quot;:\&quot;Frequent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:12801,\&quot;username\&quot;:\&quot;bartv\&quot;,\&quot;name\&quot;:\&quot;Bart \&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/bartv/{size}/130052_2.png\&quot;}},{\&quot;extras\&quot;:null,\&quot;description\&quot;:\&quot;Frequent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:14353,\&quot;username\&quot;:\&quot;Simon_Cossar\&quot;,\&quot;name\&quot;:\&quot;Simon Cossar\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/simon_cossar/{size}/86411_2.png\&quot;}},{\&quot;extras\&quot;:\&quot;latest\&quot;,\&quot;description\&quot;:\&quot;Most Recent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:68722,\&quot;username\&quot;:\&quot;kris.kotlarek\&quot;,\&quot;name\&quot;:\&quot;Kris\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/kris.kotlarek/{size}/155603_2.png\&quot;}}]},{\&quot;id\&quot;:60305,\&quot;title\&quot;:\&quot;Bug: changing the email subject for some templates is ignored\&quot;,\&quot;fancy_title\&quot;:\&quot;Bug: changing the email subject for some templates is ignored\&quot;,\&quot;slug\&quot;:\&quot;bug-changing-the-email-subject-for-some-templates-is-ignored\&quot;,\&quot;posts_count\&quot;:9,\&quot;reply_count\&quot;:2,\&quot;highest_post_number\&quot;:10,\&quot;image_url\&quot;:null,\&quot;created_at\&quot;:\&quot;2017-04-02T01:19:41.407Z\&quot;,\&quot;last_posted_at\&quot;:\&quot;2020-01-29T20:21:48.901Z\&quot;,\&quot;bumped\&quot;:true,\&quot;bumped_at\&quot;:\&quot;2020-01-29T20:21:48.901Z\&quot;,\&quot;unseen\&quot;:false,\&quot;last_read_post_number\&quot;:9,\&quot;unread\&quot;:0,\&quot;new_posts\&quot;:1,\&quot;pinned\&quot;:false,\&quot;unpinned\&quot;:null,\&quot;visible\&quot;:true,\&quot;closed\&quot;:false,\&quot;archived\&quot;:false,\&quot;notification_level\&quot;:2,\&quot;bookmarked\&quot;:false,\&quot;liked\&quot;:false,\&quot;tags\&quot;:[],\&quot;archetype\&quot;:\&quot;regular\&quot;,\&quot;like_count\&quot;:13,\&quot;views\&quot;:698,\&quot;category_id\&quot;:1,\&quot;featured_link\&quot;:null,\&quot;has_accepted_answer\&quot;:false,\&quot;posters\&quot;:[{\&quot;extras\&quot;:null,\&quot;description\&quot;:\&quot;Original Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:27946,\&quot;username\&quot;:\&quot;nordize\&quot;,\&quot;name\&quot;:\&quot;Nordize\&quot;,\&quot;avatar_template\&quot;:\&quot;https://avatars.discourse.org/v4/letter/n/c68b51/{size}.png\&quot;}},{\&quot;extras\&quot;:null,\&quot;description\&quot;:\&quot;Frequent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:8617,\&quot;username\&quot;:\&quot;Mittineague\&quot;,\&quot;name\&quot;:\&quot;Mittineague\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/mittineague/{size}/114259_2.png\&quot;}},{\&quot;extras\&quot;:null,\&quot;description\&quot;:\&quot;Frequent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:25282,\&quot;username\&quot;:\&quot;hnaseri\&quot;,\&quot;name\&quot;:\&quot;Hosein Naseri\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/hnaseri/{size}/120660_2.png\&quot;}},{\&quot;extras\&quot;:null,\&quot;description\&quot;:\&quot;Frequent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:32,\&quot;username\&quot;:\&quot;codinghorror\&quot;,\&quot;name\&quot;:\&quot;Jeff Atwood\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/codinghorror/{size}/110067_2.png\&quot;}},{\&quot;extras\&quot;:\&quot;latest\&quot;,\&quot;description\&quot;:\&quot;Most Recent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:2,\&quot;username\&quot;:\&quot;neil\&quot;,\&quot;name\&quot;:\&quot;Neil Lalonde\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/neil/{size}/102150_2.png\&quot;}}]},{\&quot;id\&quot;:140124,\&quot;title\&quot;:\&quot;PII leak: Signup flow says email is \\\&quot;Never shown to the public\\\&quot;, then uses it for Gravatar\&quot;,\&quot;fancy_title\&quot;:\&quot;PII leak: Signup flow says email is \\u0026ldquo;Never shown to the public\\u0026rdquo;, then uses it for Gravatar\&quot;,\&quot;slug\&quot;:\&quot;pii-leak-signup-flow-says-email-is-never-shown-to-the-public-then-uses-it-for-gravatar\&quot;,\&quot;posts_count\&quot;:6,\&quot;reply_count\&quot;:3,\&quot;highest_post_number\&quot;:6,\&quot;image_url\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-29T22:44:53.454Z\&quot;,\&quot;last_posted_at\&quot;:\&quot;2020-01-30T05:00:05.087Z\&quot;,\&quot;bumped\&quot;:true,\&quot;bumped_at\&quot;:\&quot;2020-01-30T05:00:05.087Z\&quot;,\&quot;unseen\&quot;:true,\&quot;pinned\&quot;:false,\&quot;unpinned\&quot;:null,\&quot;visible\&quot;:true,\&quot;closed\&quot;:false,\&quot;archived\&quot;:false,\&quot;bookmarked\&quot;:null,\&quot;liked\&quot;:null,\&quot;tags\&quot;:[],\&quot;archetype\&quot;:\&quot;regular\&quot;,\&quot;like_count\&quot;:12,\&quot;views\&quot;:49,\&quot;category_id\&quot;:2,\&quot;featured_link\&quot;:null,\&quot;has_accepted_answer\&quot;:false,\&quot;posters\&quot;:[{\&quot;extras\&quot;:null,\&quot;description\&quot;:\&quot;Original Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:74463,\&quot;username\&quot;:\&quot;mcc\&quot;,\&quot;name\&quot;:\&quot;Andi McClure\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/mcc/{size}/168180_2.png\&quot;}},{\&quot;extras\&quot;:null,\&quot;description\&quot;:\&quot;Frequent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:32,\&quot;username\&quot;:\&quot;codinghorror\&quot;,\&quot;name\&quot;:\&quot;Jeff Atwood\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/codinghorror/{size}/110067_2.png\&quot;}},{\&quot;extras\&quot;:null,\&quot;description\&quot;:\&quot;Frequent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:8722,\&quot;username\&quot;:\&quot;Falco\&quot;,\&quot;name\&quot;:\&quot;Rafael dos Santos Silva\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/falco/{size}/87757_2.png\&quot;}},{\&quot;extras\&quot;:null,\&quot;description\&quot;:\&quot;Frequent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:5559,\&quot;username\&quot;:\&quot;downey\&quot;,\&quot;name\&quot;:\&quot;Michael Downey\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/downey/{size}/166878_2.png\&quot;}},{\&quot;extras\&quot;:\&quot;latest\&quot;,\&quot;description\&quot;:\&quot;Most Recent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:13042,\&quot;username\&quot;:\&quot;Stephen\&quot;,\&quot;name\&quot;:\&quot;Stephen\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/stephen/{size}/95011_2.png\&quot;}}]},{\&quot;id\&quot;:140109,\&quot;title\&quot;:\&quot;How to add ads on side?\&quot;,\&quot;fancy_title\&quot;:\&quot;How to add ads on side?\&quot;,\&quot;slug\&quot;:\&quot;how-to-add-ads-on-side\&quot;,\&quot;posts_count\&quot;:6,\&quot;reply_count\&quot;:2,\&quot;highest_post_number\&quot;:6,\&quot;image_url\&quot;:\&quot;https://d11a6trkgmumsb.cloudfront.net/optimized/3X/6/3/63531296124975f6b9211a4568aae4c198eaa95b_2_690x398.jpeg\&quot;,\&quot;created_at\&quot;:\&quot;2020-01-29T20:40:28.069Z\&quot;,\&quot;last_posted_at\&quot;:\&quot;2020-01-30T04:57:29.321Z\&quot;,\&quot;bumped\&quot;:true,\&quot;bumped_at\&quot;:\&quot;2020-01-30T04:57:29.321Z\&quot;,\&quot;unseen\&quot;:true,\&quot;pinned\&quot;:false,\&quot;unpinned\&quot;:null,\&quot;visible\&quot;:true,\&quot;closed\&quot;:false,\&quot;archived\&quot;:false,\&quot;bookmarked\&quot;:null,\&quot;liked\&quot;:null,\&quot;tags\&quot;:[],\&quot;archetype\&quot;:\&quot;regular\&quot;,\&quot;like_count\&quot;:3,\&quot;views\&quot;:55,\&quot;category_id\&quot;:77,\&quot;featured_link\&quot;:null,\&quot;has_accepted_answer\&quot;:false,\&quot;posters\&quot;:[{\&quot;extras\&quot;:null,\&quot;description\&quot;:\&quot;Original Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:72682,\&quot;username\&quot;:\&quot;Motadaol\&quot;,\&quot;name\&quot;:\&quot;fy1\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/motadaol/{size}/137238_2.png\&quot;}},{\&quot;extras\&quot;:null,\&quot;description\&quot;:\&quot;Frequent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:63814,\&quot;username\&quot;:\&quot;ondrejj\&quot;,\&quot;name\&quot;:\&quot;\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/ondrejj/{size}/153611_2.png\&quot;}},{\&quot;extras\&quot;:\&quot;latest\&quot;,\&quot;description\&quot;:\&quot;Most Recent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:32,\&quot;username\&quot;:\&quot;codinghorror\&quot;,\&quot;name\&quot;:\&quot;Jeff Atwood\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/codinghorror/{size}/110067_2.png\&quot;}}]},{\&quot;id\&quot;:139963,\&quot;title\&quot;:\&quot;Category Remains Muted after Category is available to Everyone\&quot;,\&quot;fancy_title\&quot;:\&quot;Category Remains Muted after Category is available to Everyone\&quot;,\&quot;slug\&quot;:\&quot;category-remains-muted-after-category-is-available-to-everyone\&quot;,\&quot;posts_count\&quot;:3,\&quot;reply_count\&quot;:0,\&quot;highest_post_number\&quot;:3,\&quot;image_url\&quot;:null,\&quot;created_at\&quot;:\&quot;2020-01-28T17:03:58.481Z\&quot;,\&quot;last_posted_at\&quot;:\&quot;2020-01-30T04:55:28.257Z\&quot;,\&quot;bumped\&quot;:true,\&quot;bumped_at\&quot;:\&quot;2020-01-30T04:55:28.257Z\&quot;,\&quot;unseen\&quot;:true,\&quot;pinned\&quot;:false,\&quot;unpinned\&quot;:null,\&quot;visible\&quot;:true,\&quot;closed\&quot;:false,\&quot;archived\&quot;:false,\&quot;bookmarked\&quot;:null,\&quot;liked\&quot;:null,\&quot;tags\&quot;:[\&quot;data-explorer\&quot;],\&quot;archetype\&quot;:\&quot;regular\&quot;,\&quot;like_count\&quot;:3,\&quot;views\&quot;:43,\&quot;category_id\&quot;:6,\&quot;featured_link\&quot;:null,\&quot;has_accepted_answer\&quot;:false,\&quot;posters\&quot;:[{\&quot;extras\&quot;:null,\&quot;description\&quot;:\&quot;Original Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:73751,\&quot;username\&quot;:\&quot;Craig_Oates\&quot;,\&quot;name\&quot;:\&quot;Craig Oates\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/craig_oates/{size}/166411_2.png\&quot;}},{\&quot;extras\&quot;:null,\&quot;description\&quot;:\&quot;Frequent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:14353,\&quot;username\&quot;:\&quot;Simon_Cossar\&quot;,\&quot;name\&quot;:\&quot;Simon Cossar\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/simon_cossar/{size}/86411_2.png\&quot;}},{\&quot;extras\&quot;:\&quot;latest\&quot;,\&quot;description\&quot;:\&quot;Most Recent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:32,\&quot;username\&quot;:\&quot;codinghorror\&quot;,\&quot;name\&quot;:\&quot;Jeff Atwood\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/codinghorror/{size}/110067_2.png\&quot;}}]},{\&quot;id\&quot;:140133,\&quot;title\&quot;:\&quot;Ad not displayed within comments\&quot;,\&quot;fancy_title\&quot;:\&quot;Ad not displayed within comments\&quot;,\&quot;slug\&quot;:\&quot;ad-not-displayed-within-comments\&quot;,\&quot;posts_count\&quot;:1,\&quot;reply_count\&quot;:0,\&quot;highest_post_number\&quot;:1,\&quot;image_url\&quot;:\&quot;https://d11a6trkgmumsb.cloudfront.net/optimized/3X/4/9/4934694cefd1564e7182518cb41f0d7ac542de24_2_690x306.png\&quot;,\&quot;created_at\&quot;:\&quot;2020-01-30T04:51:43.425Z\&quot;,\&quot;last_posted_at\&quot;:\&quot;2020-01-30T04:51:43.567Z\&quot;,\&quot;bumped\&quot;:true,\&quot;bumped_at\&quot;:\&quot;2020-01-30T04:51:43.567Z\&quot;,\&quot;unseen\&quot;:true,\&quot;pinned\&quot;:false,\&quot;unpinned\&quot;:null,\&quot;visible\&quot;:true,\&quot;closed\&quot;:false,\&quot;archived\&quot;:false,\&quot;bookmarked\&quot;:null,\&quot;liked\&quot;:null,\&quot;tags\&quot;:[],\&quot;archetype\&quot;:\&quot;regular\&quot;,\&quot;like_count\&quot;:0,\&quot;views\&quot;:10,\&quot;category_id\&quot;:77,\&quot;featured_link\&quot;:null,\&quot;has_accepted_answer\&quot;:false,\&quot;posters\&quot;:[{\&quot;extras\&quot;:\&quot;latest single\&quot;,\&quot;description\&quot;:\&quot;Original Poster, Most Recent Poster\&quot;,\&quot;user\&quot;:{\&quot;id\&quot;:44821,\&quot;username\&quot;:\&quot;Eduardo_Braga\&quot;,\&quot;name\&quot;:\&quot;Eduardo\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/eduardo_braga/{size}/110348_2.png\&quot;}}]}],\&quot;tags\&quot;:[],\&quot;id\&quot;:12483,\&quot;title\&quot;:\&quot;Congratulations, most stars in 2013 GitHub Octoverse!\&quot;,\&quot;fancy_title\&quot;:\&quot;Congratulations, most stars in 2013 GitHub Octoverse!\&quot;,\&quot;posts_count\&quot;:2,\&quot;created_at\&quot;:\&quot;2014-02-06T04:55:19.217Z\&quot;,\&quot;views\&quot;:1828,\&quot;reply_count\&quot;:0,\&quot;like_count\&quot;:9,\&quot;last_posted_at\&quot;:\&quot;2014-02-06T05:27:06.860Z\&quot;,\&quot;visible\&quot;:true,\&quot;closed\&quot;:false,\&quot;archived\&quot;:false,\&quot;has_summary\&quot;:false,\&quot;archetype\&quot;:\&quot;regular\&quot;,\&quot;slug\&quot;:\&quot;congratulations-most-stars-in-2013-github-octoverse\&quot;,\&quot;category_id\&quot;:35,\&quot;word_count\&quot;:77,\&quot;deleted_at\&quot;:null,\&quot;user_id\&quot;:8222,\&quot;featured_link\&quot;:null,\&quot;pinned_globally\&quot;:false,\&quot;pinned_at\&quot;:null,\&quot;pinned_until\&quot;:null,\&quot;image_url\&quot;:\&quot;https://d11a6trkgmumsb.cloudfront.net/optimized/2X/d/d063b3b0807377d98695ee08042a9ba0a8c593bd_2_690x362.png\&quot;,\&quot;draft\&quot;:null,\&quot;draft_key\&quot;:\&quot;topic_12483\&quot;,\&quot;draft_sequence\&quot;:3,\&quot;posted\&quot;:true,\&quot;unpinned\&quot;:null,\&quot;pinned\&quot;:false,\&quot;current_post_number\&quot;:2,\&quot;highest_post_number\&quot;:2,\&quot;last_read_post_number\&quot;:2,\&quot;last_read_post_id\&quot;:39741,\&quot;deleted_by\&quot;:null,\&quot;has_deleted\&quot;:false,\&quot;actions_summary\&quot;:[{\&quot;id\&quot;:4,\&quot;count\&quot;:0,\&quot;hidden\&quot;:false,\&quot;can_act\&quot;:true},{\&quot;id\&quot;:8,\&quot;count\&quot;:0,\&quot;hidden\&quot;:false,\&quot;can_act\&quot;:true},{\&quot;id\&quot;:7,\&quot;count\&quot;:0,\&quot;hidden\&quot;:false,\&quot;can_act\&quot;:true}],\&quot;chunk_size\&quot;:20,\&quot;bookmarked\&quot;:false,\&quot;topic_timer\&quot;:null,\&quot;private_topic_timer\&quot;:null,\&quot;message_bus_last_id\&quot;:0,\&quot;participant_count\&quot;:2,\&quot;show_read_indicator\&quot;:false,\&quot;tags_disable_ads\&quot;:false,\&quot;can_vote\&quot;:false,\&quot;vote_count\&quot;:null,\&quot;user_voted\&quot;:false,\&quot;details\&quot;:{\&quot;notification_level\&quot;:3,\&quot;notifications_reason_id\&quot;:1,\&quot;can_move_posts\&quot;:true,\&quot;can_edit\&quot;:true,\&quot;can_delete\&quot;:true,\&quot;can_remove_allowed_users\&quot;:true,\&quot;can_invite_to\&quot;:true,\&quot;can_invite_via_email\&quot;:true,\&quot;can_create_post\&quot;:true,\&quot;can_reply_as_new_topic\&quot;:true,\&quot;can_flag_topic\&quot;:true,\&quot;can_convert_topic\&quot;:true,\&quot;can_review_topic\&quot;:true,\&quot;can_remove_self_id\&quot;:8222,\&quot;participants\&quot;:[{\&quot;id\&quot;:32,\&quot;username\&quot;:\&quot;codinghorror\&quot;,\&quot;name\&quot;:\&quot;Jeff Atwood\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/codinghorror/{size}/110067_2.png\&quot;,\&quot;post_count\&quot;:1,\&quot;primary_group_name\&quot;:\&quot;team\&quot;,\&quot;flair_url\&quot;:\&quot;https://aws1.discourse-cdn.com/dev/original/2X/e/ebee30bd98aef20357e4a177a5a1e45b877ce088.svg\&quot;,\&quot;flair_color\&quot;:\&quot;111\&quot;,\&quot;flair_bg_color\&quot;:\&quot;\&quot;},{\&quot;id\&quot;:8222,\&quot;username\&quot;:\&quot;techAPJ\&quot;,\&quot;name\&quot;:\&quot;Arpit Jalan\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/techapj/{size}/152320_2.png\&quot;,\&quot;post_count\&quot;:1,\&quot;primary_group_name\&quot;:\&quot;team\&quot;,\&quot;flair_url\&quot;:\&quot;https://aws1.discourse-cdn.com/dev/original/2X/e/ebee30bd98aef20357e4a177a5a1e45b877ce088.svg\&quot;,\&quot;flair_color\&quot;:\&quot;111\&quot;,\&quot;flair_bg_color\&quot;:\&quot;\&quot;}],\&quot;created_by\&quot;:{\&quot;id\&quot;:8222,\&quot;username\&quot;:\&quot;techAPJ\&quot;,\&quot;name\&quot;:\&quot;Arpit Jalan\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/techapj/{size}/152320_2.png\&quot;},\&quot;last_poster\&quot;:{\&quot;id\&quot;:32,\&quot;username\&quot;:\&quot;codinghorror\&quot;,\&quot;name\&quot;:\&quot;Jeff Atwood\&quot;,\&quot;avatar_template\&quot;:\&quot;/user_avatar/meta.discourse.org/codinghorror/{size}/110067_2.png\&quot;},\&quot;links\&quot;:[{\&quot;url\&quot;:\&quot;http://octoverse.github.com/\&quot;,\&quot;title\&quot;:\&quot;GitHub Octoverse 2013\&quot;,\&quot;internal\&quot;:false,\&quot;attachment\&quot;:null,\&quot;reflection\&quot;:false,\&quot;clicks\&quot;:57,\&quot;user_id\&quot;:8222,\&quot;domain\&quot;:\&quot;octoverse.github.com\&quot;,\&quot;root_domain\&quot;:\&quot;github.com\&quot;}]}}&quot;}"></div>
     <link rel="preload" href="https://d11a6trkgmumsb.cloudfront.net/assets/preload-application-data-9cd6a7a2a8ad52cfc915d1666732ca9372606dd922cd5793c1358e9924c0103a.br.js" as="script">
 <script src="https://d11a6trkgmumsb.cloudfront.net/assets/preload-application-data-9cd6a7a2a8ad52cfc915d1666732ca9372606dd922cd5793c1358e9924c0103a.br.js"></script>
 
diff --git a/spec/fixtures/onebox/threadsstatus_featured_image.response b/spec/fixtures/onebox/threadsstatus_featured_image.response
new file mode 100644
index 00000000000..0a35c498e6c
--- /dev/null
+++ b/spec/fixtures/onebox/threadsstatus_featured_image.response
@@ -0,0 +1,88 @@
+<!DOCTYPE html><html class="_9dls" lang="en" dir="ltr"><head><link data-default-icon="https://static.xx.fbcdn.net/rsrc.php/v3/y2/r/ZI3qMUkj5Tz.png" rel="icon" sizes="192x192" href="https://static.xx.fbcdn.net/rsrc.php/v3/y2/r/ZI3qMUkj5Tz.png" /><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=2,shrink-to-fit=no" /><meta property="og:site_name" content="Threads" /><meta property="og:type" content="article" /><link rel="canonical" href="https://www.threads.net/t/CuWRRrQuql9" /><meta name="description" content="5.8K likes, 449 replies. A long, long, LONG day and 10M users later&#x2026; P92 server signing off for the night &#x1fae1;
+&#064;zahanm &#064;christophersu &#064;0xjessel &#064;lvchaoshuai" /><meta property="og:title" content="Joy Qiu (&#064;joyqiuu) on Threads" /><meta property="og:description" content="5.8K likes, 449 replies. A long, long, LONG day and 10M users later&#x2026; P92 server signing off for the night &#x1fae1;
+&#064;zahanm &#064;christophersu &#064;0xjessel &#064;lvchaoshuai" /><meta property="og:url" content="https://www.threads.net/t/CuWRRrQuql9" /><meta property="og:image" content="https://scontent.cdninstagram.com/v/t51.2885-15/358170242_763117808845095_5019289229883911585_n.jpg?stp=dst-jpg_e35&amp;_nc_ht=scontent.cdninstagram.com&amp;_nc_cat=1&amp;_nc_ohc=y4Go3LYFqKEAX8c8uU1&amp;edm=APs17CUBAAAA&amp;ccb=7-5&amp;ig_cache_key=MzE0MDc3Mzc3MTYxMDg1OTkwMQ%3D%3D.2-ccb7-5&amp;oh=00_AfBgHI7frLFyx2vaGnvv9S905YBaoUIyToprngVFOW0_LA&amp;oe=64ABAADF&amp;_nc_sid=10d13b" /><meta name="referrer" content="default" id="meta_referrer" /><meta name="twitter:card" content="summary" /><meta name="twitter:title" content="Joy Qiu (&#064;joyqiuu) on Threads" /><meta name="twitter:description" content="5.8K likes, 449 replies. A long, long, LONG day and 10M users later&#x2026; P92 server signing off for the night &#x1fae1;
+&#064;zahanm &#064;christophersu &#064;0xjessel &#064;lvchaoshuai" /><meta name="twitter:image" content="https://scontent.cdninstagram.com/v/t51.2885-15/358170242_763117808845095_5019289229883911585_n.jpg?stp=dst-jpg_e35&amp;_nc_ht=scontent.cdninstagram.com&amp;_nc_cat=1&amp;_nc_ohc=y4Go3LYFqKEAX8c8uU1&amp;edm=APs17CUBAAAA&amp;ccb=7-5&amp;ig_cache_key=MzE0MDc3Mzc3MTYxMDg1OTkwMQ%3D%3D.2-ccb7-5&amp;oh=00_AfBgHI7frLFyx2vaGnvv9S905YBaoUIyToprngVFOW0_LA&amp;oe=64ABAADF&amp;_nc_sid=10d13b" /><style nonce="HLIQI2y8">:root{--fds-black:#000000;--fds-black-alpha-05:rgba(0, 0, 0, 0.05);--fds-black-alpha-10:rgba(0, 0, 0, 0.1);--fds-black-alpha-15:rgba(0, 0, 0, 0.15);--fds-black-alpha-20:rgba(0, 0, 0, 0.2);--fds-black-alpha-30:rgba(0, 0, 0, 0.3);--fds-black-alpha-40:rgba(0, 0, 0, 0.4);--fds-black-alpha-50:rgba(0, 0, 0, 0.5);--fds-black-alpha-60:rgba(0, 0, 0, 0.6);--fds-black-alpha-80:rgba(0, 0, 0, 0.8);--fds-blue-05:#ECF3FF;--fds-blue-30:#AAC9FF;--fds-blue-40:#77A7FF;--fds-blue-60:#1877F2;--fds-blue-70:#2851A3;--fds-blue-80:#1D3C78;--fds-button-text:#444950;--fds-comment-background:#F2F3F5;--fds-dark-mode-gray-35:#CCCCCC;--fds-dark-mode-gray-50:#828282;--fds-dark-mode-gray-70:#4A4A4A;--fds-dark-mode-gray-80:#373737;--fds-dark-mode-gray-90:#282828;--fds-dark-mode-gray-100:#1C1C1C;--fds-gray-00:#F5F6F7;--fds-gray-05:#F2F3F5;--fds-gray-10:#EBEDF0;--fds-gray-20:#DADDE1;--fds-gray-25:#CCD0D5;--fds-gray-30:#BEC3C9;--fds-gray-45:#8D949E;--fds-gray-70:#606770;--fds-gray-80:#444950;--fds-gray-90:#303338;--fds-gray-100:#1C1E21;--fds-green-55:#00A400;--fds-highlight:#3578E5;--fds-highlight-cell-background:#ECF3FF;--fds-primary-icon:#1C1E21;--fds-primary-text:#1C1E21;--fds-red-55:#FA383E;--fds-soft:cubic-bezier(.08,.52,.52,1);--fds-spectrum-aluminum-tint-70:#E4F0F6;--fds-spectrum-blue-gray-tint-70:#CFD1D5;--fds-spectrum-cherry:#F35369;--fds-spectrum-cherry-tint-70:#FBCCD2;--fds-spectrum-grape-tint-70:#DDD5F0;--fds-spectrum-grape-tint-90:#F4F1FA;--fds-spectrum-lemon-dark-1:#F5C33B;--fds-spectrum-lemon-tint-70:#FEF2D1;--fds-spectrum-lime:#A3CE71;--fds-spectrum-lime-tint-70:#E4F0D5;--fds-spectrum-orange-tint-70:#FCDEC5;--fds-spectrum-orange-tint-90:#FEF4EC;--fds-spectrum-seafoam-tint-70:#CAEEF9;--fds-spectrum-slate-dark-2:#89A1AC;--fds-spectrum-slate-tint-70:#EAEFF2;--fds-spectrum-teal:#6BCEBB;--fds-spectrum-teal-dark-1:#4DBBA6;--fds-spectrum-teal-dark-2:#31A38D;--fds-spectrum-teal-tint-70:#D2F0EA;--fds-spectrum-teal-tint-90:#F0FAF8;--fds-spectrum-tomato:#FB724B;--fds-spectrum-tomato-tint-30:#F38E7B;--fds-spectrum-tomato-tint-90:#FDEFED;--fds-strong:cubic-bezier(.12,.8,.32,1);--fds-white:#FFFFFF;--fds-white-alpha-05:rgba(255, 255, 255, 0.05);--fds-white-alpha-10:rgba(255, 255, 255, 0.1);--fds-white-alpha-20:rgba(255, 255, 255, 0.2);--fds-white-alpha-30:rgba(255, 255, 255, 0.3);--fds-white-alpha-40:rgba(255, 255, 255, 0.4);--fds-white-alpha-50:rgba(255, 255, 255, 0.5);--fds-white-alpha-60:rgba(255, 255, 255, 0.6);--fds-white-alpha-80:rgba(255, 255, 255, 0.8);--fds-yellow-20:#FFBA00;--accent:hsl(214, 89%, 52%);--always-white:#ffffff;--always-black:#000000;--always-dark-gradient:linear-gradient(rgba(0,0,0,0), rgba(0,0,0,0.6));--always-dark-overlay:rgba(0, 0, 0, 0.4);--always-light-overlay:rgba(255, 255, 255, 0.4);--always-gray-40:#65676B;--always-gray-75:#BCC0C4;--always-gray-95:#F0F2F5;--attachment-footer-background:#F0F2F5;--background-deemphasized:#F0F2F5;--base-blue:#1877F2;--base-cherry:#F3425F;--base-grape:#9360F7;--base-lemon:#F7B928;--base-lime:#45BD62;--base-pink:#FF66BF;--base-seafoam:#54C7EC;--base-teal:#2ABBA7;--base-tomato:#FB724B;--text-badge-info-background:hsl(214, 89%, 52%);--text-badge-success-background:#31A24C;--text-badge-attention-background:hsl(40, 89%, 52%);--text-badge-critical-background:#e41e3f;--blue-link:#216FDB;--border-focused:#65676B;--card-background:#FFFFFF;--card-background-flat:#F7F8FA;--comment-background:#F0F2F5;--comment-footer-background:#F6F9FA;--dataviz-primary-1:rgb(48,200,180);--disabled-button-background:#E4E6EB;--disabled-button-text:#BCC0C4;--disabled-icon:#BCC0C4;--disabled-text:#BCC0C4;--divider:#CED0D4;--event-date:#F3425F;--fb-wordmark:#1877F2;--filter-accent:invert(39%) sepia(57%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(147.75%) hue-rotate(202deg) brightness(97%) contrast(96%);--filter-always-white:invert(100%);--filter-disabled-icon:invert(80%) sepia(6%) saturate(200%) saturate(120%) hue-rotate(173deg) brightness(98%) contrast(89%);--filter-placeholder-icon:invert(59%) sepia(11%) saturate(200%) saturate(135%) hue-rotate(176deg) brightness(96%) contrast(94%);--filter-primary-icon:invert(8%) sepia(10%) saturate(200%) saturate(200%) saturate(166%) hue-rotate(177deg) brightness(104%) contrast(91%);--filter-secondary-icon:invert(39%) sepia(21%) saturate(200%) saturate(109.5%) hue-rotate(174deg) brightness(94%) contrast(86%);--filter-warning-icon:invert(77%) sepia(29%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(128%) hue-rotate(359deg) brightness(102%) contrast(107%);--filter-blue-link-icon:invert(30%) sepia(98%) saturate(200%) saturate(200%) saturate(200%) saturate(166.5%) hue-rotate(192deg) brightness(91%) contrast(101%);--filter-positive:invert(37%) sepia(61%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(115%) hue-rotate(91deg) brightness(97%) contrast(105%);--filter-negative:invert(25%) sepia(33%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(110%) hue-rotate(345deg) brightness(132%) contrast(96%);--glimmer-spinner-icon:#65676B;--hero-banner-background:#FFFFFF;--hosted-view-selected-state:rgba(45, 136, 255, 0.1);--highlight-bg:#E7F3FF;--hover-overlay:rgba(0, 0, 0, 0.05);--list-cell-chevron:#65676B;--media-hover:rgba(68, 73, 80, 0.15);--media-inner-border:rgba(0, 0, 0, 0.1);--media-outer-border:#FFFFFF;--media-pressed:rgba(68, 73, 80, 0.35);--messenger-card-background:#FFFFFF;--messenger-reply-background:#F0F2F5;--overlay-alpha-80:rgba(244, 244, 244, 0.8);--overlay-on-media:rgba(0, 0, 0, 0.6);--nav-bar-background:#FFFFFF;--nav-bar-background-gradient:linear-gradient(to top, #FFFFFF, rgba(255,255,255.9), rgba(255,255,255,.7), rgba(255,255,255,.4), rgba(255,255,255,0));--nav-bar-background-gradient-wash:linear-gradient(to top, #F0F2F5, rgba(240,242,245.9), rgba(240,242,245,.7), rgba(240,242,245,.4), rgba(240,242,245,0));--negative:hsl(350, 87%, 55%);--negative-background:hsl(350, 87%, 55%, 20%);--new-notification-background:#E7F3FF;--non-media-pressed:rgba(68, 73, 80, 0.15);--non-media-pressed-on-dark:rgba(255, 255, 255, 0.3);--notification-badge:#e41e3f;--placeholder-icon:#65676B;--placeholder-image:rgb(164, 167, 171);--placeholder-text:#65676B;--placeholder-text-on-media:rgba(255, 255, 255, 0.5);--popover-background:#FFFFFF;--positive:#31A24C;--positive-background:#DEEFE1;--press-overlay:rgba(0, 0, 0, 0.10);--primary-button-background:#1B74E4;--primary-button-icon:#FFFFFF;--primary-button-pressed:#77A7FF;--primary-button-text:#FFFFFF;--primary-deemphasized-button-background:#E7F3FF;--primary-deemphasized-button-pressed:rgba(0, 0, 0, 0.05);--primary-deemphasized-button-pressed-overlay:rgba(25, 110, 255, 0.15);--primary-deemphasized-button-text:#1877F2;--primary-icon:#050505;--primary-text:#050505;--primary-text-on-media:#FFFFFF;--primary-web-focus-indicator:#D24294;--progress-ring-neutral-background:rgba(0, 0, 0, 0.2);--progress-ring-neutral-foreground:#000000;--progress-ring-on-media-background:rgba(255, 255, 255, 0.2);--progress-ring-on-media-foreground:#FFFFFF;--progress-ring-blue-background:rgba(24, 119, 242, 0.2);--progress-ring-blue-foreground:hsl(214, 89%, 52%);--progress-ring-disabled-background:rgba(190,195,201, 0.2);--progress-ring-disabled-foreground:#BEC3C9;--rating-star-active:#EB660D;--scroll-thumb:#BCC0C4;--scroll-shadow:0 1px 2px rgba(0, 0, 0, 0.1), 0 -1px rgba(0, 0, 0, 0.1) inset;--secondary-button-background:#E4E6EB;--secondary-button-background-floating:#ffffff;--secondary-button-background-on-dark:rgba(0, 0, 0, 0.4);--secondary-button-pressed:rgba(0, 0, 0, 0.05);--secondary-button-stroke:transparent;--secondary-button-text:#050505;--secondary-icon:#65676B;--secondary-text:#65676B;--secondary-text-on-media:rgba(255, 255, 255, 0.9);--section-header-text:#4B4C4F;--shadow-1:rgba(0, 0, 0, 0.1);--shadow-2:rgba(0, 0, 0, 0.2);--shadow-5:rgba(0, 0, 0, 0.5);--shadow-8:rgba(0, 0, 0, 0.8);--shadow-inset:rgba(255, 255, 255, 0.5);--shadow-elevated:0 8px 20px 0 rgba(0, 0, 0, 0.2), 0 2px 4px 0 rgba(0, 0, 0, 0.1);--shadow-persistent:0px 0px 12px rgba(52, 72, 84, 0.05);--shadow-primary:0px 5px 12px rgba(52, 72, 84, 0.2);--surface-background:#FFFFFF;--switch-active:hsl(214, 89%, 52%);--text-highlight:rgba(24, 119, 242, 0.2);--input-background:#FFFFFF;--input-background-disabled:#F0F2F5;--input-border-color:#CED0D4;--input-border-color-hover:var(--placeholder-text);--input-label-color-highlighted:hsl(214, 89%, 52%);--text-input-outside-label:#000000;--toast-background:rgba(255, 255, 255, 0.85);--toast-text:#1C2B33;--toast-text-link:#216FDB;--toggle-active-background:#E7F3FF;--toggle-active-icon:rgb(24, 119, 242);--toggle-active-text:rgb(24, 119, 242);--toggle-button-active-background:#E7F3FF;--tooltip-background:rgba(244, 244, 244, 0.8);--tooltip-box-shadow:0 2px 4px 0 var(--shadow-5);--wash:#E4E6EB;--web-wash:#F0F2F5;--warning:hsl(40, 89%, 52%);--fb-logo-color:#2D88FF;--dialog-anchor-vertical-padding:56px;--header-height:0px;--global-panel-width:0px;--global-panel-width-expanded:0px;--alert-banner-corner-radius:8px;--button-corner-radius:6px;--button-corner-radius-medium:10px;--button-corner-radius-large:12px;--button-height-large:40px;--button-height-medium:36px;--button-padding-horizontal-large:16px;--button-padding-horizontal-medium:16px;--button-icon-padding-large:16px;--button-icon-padding-medium:16px;--button-inner-icon-spacing-large:3px;--button-inner-icon-spacing-medium:3px;--blueprint-button-height-medium:40px;--blueprint-button-height-large:48px;--card-corner-radius:8px;--card-box-shadow:0 12px 28px 0 var(--shadow-2), 0 2px 4px 0 var(--shadow-1);--card-padding-horizontal:10px;--card-padding-vertical:20px;--chip-corner-radius:6px;--dialog-corner-radius:8px;--glimmer-corner-radius:8px;--image-corner-radius:4px;--input-corner-radius:6px;--input-border-width:1px;--nav-list-cell-corner-radius:8px;--list-cell-corner-radius:8px;--list-cell-min-height:52px;--list-cell-padding-vertical:20px;--list-cell-padding-vertical-with-addon:14px;--menu-item-base-margin-horizontal:8px;--menu-item-base-padding-horizontal:8px;--nav-list-cell-min-height:0px;--nav-list-cell-padding-vertical:16px;--nav-list-cell-padding-vertical-with-addon:16px;--page-footer-padding-vertical:16px;--section-header-addOnEnd-margin-horizontal:8px;--section-header-addOnStart-margin-horizontal:12px;--section-header-addOnEnd-button-padding-horizontal:0px;--section-header-addOnEnd-button-padding-vertical:0px;--section-header-padding-vertical:16px;--section-header-subtitle-margin-vertical:14px;--section-header-subtitle-with-addOnEnd-margin-vertical:6px;--text-badge-corner-radius:4px;--text-badge-padding-horizontal:6px;--text-badge-padding-vertical:6px;--text-input-multi-padding-between-text-scrollbar:20px;--text-input-multi-padding-scrollbar:16px;--text-input-caption-margin-top:10px;--text-input-label-top:22px;--text-input-min-height:64px;--text-input-padding-vertical:12px;--toast-addon-padding-horizontal:6px;--toast-addon-padding-vertical:6px;--toast-container-max-width:100%;--toast-container-min-width:0px;--toast-container-padding-horizontal:14px;--toast-container-padding-vertical:10px;--toast-corner-radius:8px;--typeahead-list-outer-padding-vertical:2px;--fds-animation-enter-exit-in:cubic-bezier(0.14, 1, 0.34, 1);--fds-animation-enter-exit-out:cubic-bezier(0.45, 0.1, 0.2, 1);--fds-animation-swap-shuffle-in:cubic-bezier(0.14, 1, 0.34, 1);--fds-animation-swap-shuffle-out:cubic-bezier(0.45, 0.1, 0.2, 1);--fds-animation-move-in:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-move-out:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-expand-collapse-in:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-expand-collapse-out:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-passive-move-in:cubic-bezier(0.5, 0, 0.1, 1);--fds-animation-passive-move-out:cubic-bezier(0.5, 0, 0.1, 1);--fds-animation-quick-move-in:cubic-bezier(0.1, 0.9, 0.2, 1);--fds-animation-quick-move-out:cubic-bezier(0.1, 0.9, 0.2, 1);--fds-animation-fade-in:cubic-bezier(0, 0, 1, 1);--fds-animation-fade-out:cubic-bezier(0, 0, 1, 1);--fds-duration-extra-extra-short-in:100ms;--fds-duration-extra-extra-short-out:100ms;--fds-duration-extra-short-in:200ms;--fds-duration-extra-short-out:150ms;--fds-duration-short-in:280ms;--fds-duration-short-out:200ms;--fds-duration-medium-in:400ms;--fds-duration-medium-out:350ms;--fds-duration-long-in:500ms;--fds-duration-long-out:350ms;--fds-duration-extra-long-in:1000ms;--fds-duration-extra-long-out:1000ms;--fds-duration-none:0ms;--fds-fast:200ms;--fds-slow:400ms;--font-family-apple:system-ui, -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', sans-serif;--font-family-code:ui-monospace, Menlo, Consolas, Monaco, monospace;--font-family-default:Helvetica, Arial, sans-serif;--font-family-segoe:Segoe UI Historic, Segoe UI, Helvetica, Arial, sans-serif;--body-font-family:Placeholder Font;--body-font-size:0.9375rem;--body-font-weight:400;--body-line-height:1.3333;--body-emphasized-font-family:Placeholder Font;--body-emphasized-font-size:0.9375rem;--body-emphasized-font-weight:600;--body-emphasized-line-height:1.3333;--headline1-font-family:Optimistic Display Bold, system-ui, sans-serif;--headline1-font-size:1.75rem;--headline1-font-weight:700;--headline1-line-height:1.2143;--headline2-font-family:Optimistic Display Bold, system-ui, sans-serif;--headline2-font-size:1.5rem;--headline2-font-weight:700;--headline2-line-height:1.25;--headline3-font-family:Optimistic Display Bold, system-ui, sans-serif;--headline3-font-size:1.0625rem;--headline3-font-weight:700;--headline3-line-height:1.2941;--meta-font-family:Placeholder Font;--meta-font-size:0.8125rem;--meta-font-weight:400;--meta-line-height:1.3846;--meta-emphasized-font-family:Placeholder Font;--meta-emphasized-font-size:0.8125rem;--meta-emphasized-font-weight:600;--meta-emphasized-line-height:1.3846;--primary-label-font-family:Optimistic Display Medium, system-ui, sans-serif;--primary-label-font-size:1.0625rem;--primary-label-font-weight:500;--primary-label-line-height:1.2941;--secondary-label-font-family:Placeholder Font;--secondary-label-font-size:0.9375rem;--secondary-label-font-weight:500;--secondary-label-line-height:1.3333;--tertiary-label-font-family:Placeholder Font;--tertiary-label-font-size:0.6875rem;--tertiary-label-font-weight:500;--tertiary-label-line-height:1.4545;--text-input-field-font-family:Placeholder Font;--text-input-field-font-size:1rem;--text-input-field-font-weight:500;--text-input-field-line-height:1.2941;--text-input-label-font-family:Placeholder Font;--text-input-label-font-size:17px;--text-input-label-font-size-scale-multiplier:0.75;--text-input-label-font-weight:400;--text-input-label-line-height:1.2941;--tooltip-border-radius:8px;--dialog-size-medium-max-width:700px;--dialog-size-medium-width:100%;--dialog-size-small-max-width:548px;--dialog-size-small-width:100%;--dataviz-primary-2:rgb(134,218,255);--dataviz-primary-3:rgb(95,170,255);--dataviz-secondary-1:rgb(118,62,230);--dataviz-secondary-2:rgb(147,96,247);--dataviz-secondary-3:rgb(219,26,139);--dataviz-supplementary-1:rgb(255,122,105);--dataviz-supplementary-2:rgb(241,168,23);--dataviz-supplementary-3:rgb(49,162,76);--dataviz-supplementary-4:rgb(50,52,54);--base-unit:4px;--blue-0:245, 251, 255;--blue-1:224, 241, 255;--blue-2:179, 219, 255;--blue-3:112, 188, 255;--blue-4:71, 175, 255;--blue-5:0, 149, 246;--blue-6:0, 116, 204;--blue-7:0, 87, 163;--blue-8:0, 55, 107;--blue-9:0, 41, 82;--cyan-5:39, 196, 245;--font-family-system:-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;--font-weight-system-bold:700;--font-weight-system-extra-bold:800;--font-weight-system-extra-light:200;--font-weight-system-light:300;--font-weight-system-medium:500;--font-weight-system-regular:400;--font-weight-system-semibold:600;--green-4:120, 222, 69;--green-5:88, 195, 34;--green-6:55, 166, 0;--grey-0:245, 245, 245;--grey-1:239, 239, 239;--grey-2:219, 219, 219;--grey-3:199, 199, 199;--grey-4:168, 168, 168;--grey-5:142, 142, 142;--grey-6:115, 115, 115;--grey-7:85, 85, 85;--grey-8:54, 54, 54;--grey-9:38, 38, 38;--grey-10:26, 26, 26;--orange-5:253, 141, 50;--pink-5:209, 8, 105;--purple-5:163, 7, 186;--red-4:255, 104, 116;--red-5:237, 73, 86;--red-6:198, 35, 48;--red-7:167, 3, 17;--system-10-font-size:10px;--system-10-line-height:12px;--system-11-font-size:11px;--system-11-line-height:13px;--system-12-font-size:12px;--system-13-font-size:13px;--system-12-line-height:16px;--system-15-font-size:15px;--system-14-font-size:14px;--system-14-line-height:18px;--system-16-font-size:16px;--system-16-line-height:20px;--system-18-font-size:18px;--system-18-line-height:24px;--system-20-font-size:20px;--system-20-line-height:25px;--system-22-font-size:22px;--system-22-line-height:26px;--system-24-font-size:24px;--system-24-line-height:27px;--system-26-font-size:26px;--system-26-line-height:28px;--system-28-font-size:28px;--system-28-line-height:32px;--system-30-font-size:30px;--system-30-line-height:36px;--system-32-font-size:32px;--system-32-line-height:40px;--yellow-5:253, 203, 92;--barcelona-large-screen-breakpoint:748px;--barcelona-large-screen-max-width:620px;--barcelona-large-screen-padding:344px;--barcelona-threadline-column-width:48px;--barcelona-post-horizontal-padding:12px;--barcelona-quoted-post-horizontal-padding:16px;--barcelona-carousel-gap:6px;--barcelona-lightbox-horizontal-padding:92px;--barcelona-primary-text:rgb(0, 0, 0);--barcelona-secondary-text:rgb(153, 153, 153);--barcelona-primary-button:rgb(0, 0, 0);--barcelona-secondary-button:rgb(255, 255, 255);--barcelona-link-text:rgb(0, 149, 246);--barcelona-error-text:rgb(255, 48, 64);--barcelona-primary-background:rgb(255, 255, 255);--barcelona-elevated-background:rgb(255, 255, 255);--barcelona-secondary-background:rgb(250, 250, 250);--barcelona-tertiary-background:rgb(245, 245, 245);--barcelona-navigation-background:rgba(255, 255, 255);--barcelona-dialog-backdrop-background:rgba(255, 255, 255, 0.85);--barcelona-primary-outline:rgba(0, 0, 0, 0.15);--barcelona-media-outline:rgba(0, 0, 0, 0.15);--barcelona-threadline:rgb(229, 229, 229);}@media (prefers-color-scheme: dark){:root{--fds-black:black;--fds-black-alpha-05:rgba(0, 0, 0, 0.05);--fds-black-alpha-10:rgba(0, 0, 0, 0.1);--fds-black-alpha-15:rgba(0, 0, 0, 0.15);--fds-black-alpha-20:rgba(0, 0, 0, 0.2);--fds-black-alpha-30:rgba(0, 0, 0, 0.3);--fds-black-alpha-40:rgba(0, 0, 0, 0.4);--fds-black-alpha-50:rgba(0, 0, 0, 0.5);--fds-black-alpha-60:rgba(0, 0, 0, 0.6);--fds-black-alpha-80:rgba(0, 0, 0, 0.8);--fds-blue-05:black;--fds-blue-30:black;--fds-blue-40:black;--fds-blue-60:black;--fds-blue-70:black;--fds-blue-80:black;--fds-button-text:black;--fds-comment-background:black;--fds-dark-mode-gray-35:black;--fds-dark-mode-gray-50:black;--fds-dark-mode-gray-70:black;--fds-dark-mode-gray-80:black;--fds-dark-mode-gray-90:black;--fds-dark-mode-gray-100:black;--fds-gray-00:black;--fds-gray-05:black;--fds-gray-10:black;--fds-gray-20:black;--fds-gray-25:black;--fds-gray-30:black;--fds-gray-45:black;--fds-gray-70:black;--fds-gray-80:black;--fds-gray-90:black;--fds-gray-100:black;--fds-green-55:black;--fds-highlight:black;--fds-highlight-cell-background:black;--fds-primary-icon:white;--fds-primary-text:white;--fds-red-55:black;--fds-soft:cubic-bezier(.08,.52,.52,1);--fds-spectrum-aluminum-tint-70:black;--fds-spectrum-blue-gray-tint-70:black;--fds-spectrum-cherry:black;--fds-spectrum-cherry-tint-70:black;--fds-spectrum-grape-tint-70:black;--fds-spectrum-grape-tint-90:black;--fds-spectrum-lemon-dark-1:black;--fds-spectrum-lemon-tint-70:black;--fds-spectrum-lime:black;--fds-spectrum-lime-tint-70:black;--fds-spectrum-orange-tint-70:black;--fds-spectrum-orange-tint-90:black;--fds-spectrum-seafoam-tint-70:black;--fds-spectrum-slate-dark-2:black;--fds-spectrum-slate-tint-70:black;--fds-spectrum-teal:black;--fds-spectrum-teal-dark-1:black;--fds-spectrum-teal-dark-2:black;--fds-spectrum-teal-tint-70:black;--fds-spectrum-teal-tint-90:black;--fds-spectrum-tomato:black;--fds-spectrum-tomato-tint-30:black;--fds-spectrum-tomato-tint-90:black;--fds-strong:cubic-bezier(.12,.8,.32,1);--fds-white:black;--fds-white-alpha-05:rgba(255, 255, 255, 0.05);--fds-white-alpha-10:rgba(255, 255, 255, 0.1);--fds-white-alpha-20:rgba(255, 255, 255, 0.2);--fds-white-alpha-30:rgba(255, 255, 255, 0.3);--fds-white-alpha-40:rgba(255, 255, 255, 0.4);--fds-white-alpha-50:rgba(255, 255, 255, 0.5);--fds-white-alpha-60:rgba(255, 255, 255, 0.6);--fds-white-alpha-80:rgba(255, 255, 255, 0.8);--fds-yellow-20:black;--accent:hsl(214, 100%, 59%);--always-white:#ffffff;--always-black:#000000;--always-dark-gradient:linear-gradient(rgba(0,0,0,0), rgba(0,0,0,0.6));--always-dark-overlay:rgba(0, 0, 0, 0.4);--always-light-overlay:rgba(255, 255, 255, 0.4);--always-gray-40:#65676B;--always-gray-75:#BCC0C4;--always-gray-95:#F0F2F5;--attachment-footer-background:rgba(255,255,255,0.1);--background-deemphasized:rgba(255,255,255,0.1);--base-blue:#1877F2;--base-cherry:#F3425F;--base-grape:#9360F7;--base-lemon:#F7B928;--base-lime:#45BD62;--base-pink:#FF66BF;--base-seafoam:#54C7EC;--base-teal:#2ABBA7;--base-tomato:#FB724B;--text-badge-info-background:hsl(214, 100%, 59%);--text-badge-success-background:#31A24C;--text-badge-attention-background:hsl(40, 89%, 52%);--text-badge-critical-background:#e41e3f;--blue-link:#4599FF;--border-focused:#8A8D91;--card-background:#242526;--card-background-flat:#323436;--comment-background:#3A3B3C;--comment-footer-background:#4E4F50;--dataviz-primary-1:rgb(48,200,180);--disabled-button-background:rgba(255, 255, 255, 0.2);--disabled-button-text:rgba(255, 255, 255, 0.3);--disabled-icon:rgba(255, 255, 255, 0.3);--disabled-text:rgba(255, 255, 255, 0.3);--divider:#3E4042;--event-date:#F3425F;--fb-wordmark:#FFFFFF;--filter-accent:invert(40%) sepia(52%) saturate(200%) saturate(200%) saturate(200%) saturate(189%) hue-rotate(191deg) brightness(103%) contrast(102%);--filter-always-white:invert(100%);--filter-disabled-icon:invert(100%) opacity(30%);--filter-placeholder-icon:invert(59%) sepia(11%) saturate(200%) saturate(135%) hue-rotate(176deg) brightness(96%) contrast(94%);--filter-primary-icon:invert(89%) sepia(6%) hue-rotate(185deg);--filter-secondary-icon:invert(62%) sepia(98%) saturate(12%) hue-rotate(175deg) brightness(90%) contrast(96%);--filter-warning-icon:invert(77%) sepia(29%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(128%) hue-rotate(359deg) brightness(102%) contrast(107%);--filter-blue-link-icon:invert(73%) sepia(29%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(103.25%) hue-rotate(189deg) brightness(101%) contrast(101%);--filter-positive:invert(37%) sepia(61%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(115%) hue-rotate(91deg) brightness(97%) contrast(105%);--filter-negative:invert(25%) sepia(33%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(110%) hue-rotate(345deg) brightness(132%) contrast(96%);--glimmer-spinner-icon:white;--hero-banner-background:#E85D07;--hosted-view-selected-state:rgba(45, 136, 255, 0.1);--highlight-bg:rgba(24, 119, 242, .31);--hover-overlay:rgba(255, 255, 255, 0.1);--list-cell-chevron:#B0B3B8;--media-hover:rgba(68, 73, 80, 0.15);--media-inner-border:rgba(255, 255, 255, 0.05);--media-outer-border:#33363A;--media-pressed:rgba(68, 73, 80, 0.35);--messenger-card-background:#242526;--messenger-reply-background:#18191A;--overlay-alpha-80:rgba(11, 11, 11, 0.8);--overlay-on-media:rgba(0, 0, 0, 0.6);--nav-bar-background:#242526;--nav-bar-background-gradient:linear-gradient(to top, #242526, rgba(36,37,38,.9), rgba(36,37,38,.7), rgba(36,37,38,.4), rgba(36,37,38,0));--nav-bar-background-gradient-wash:linear-gradient(to top, #18191A, rgba(24,25,26,.9), rgba(24,25,26,.7), rgba(24,25,26,.4), rgba(24,25,26,0));--negative:hsl(350, 87%, 55%);--negative-background:hsl(350, 87%, 55%, 20%);--new-notification-background:#E7F3FF;--non-media-pressed:rgba(68, 73, 80, 0.15);--non-media-pressed-on-dark:rgba(255, 255, 255, 0.3);--notification-badge:#e41e3f;--placeholder-icon:#8A8D91;--placeholder-image:rgb(164, 167, 171);--placeholder-text:#8A8D91;--placeholder-text-on-media:rgba(255, 255, 255, 0.5);--popover-background:#3E4042;--positive:#31A24C;--positive-background:#1F3520;--press-overlay:rgba(255, 255, 255, 0.1);--primary-button-background:#2374E1;--primary-button-icon:#FFFFFF;--primary-button-pressed:#77A7FF;--primary-button-text:#FFFFFF;--primary-deemphasized-button-background:rgba(45, 136, 255, 0.2);--primary-deemphasized-button-pressed:rgba(24, 119, 242, 0.2);--primary-deemphasized-button-pressed-overlay:rgba(25, 110, 255, 0.15);--primary-deemphasized-button-text:#2D88FF;--primary-icon:#E4E6EB;--primary-text:#E4E6EB;--primary-text-on-media:white;--primary-web-focus-indicator:#D24294;--progress-ring-neutral-background:rgba(255, 255, 255, 0.2);--progress-ring-neutral-foreground:#ffffff;--progress-ring-on-media-background:rgba(255, 255, 255, 0.2);--progress-ring-on-media-foreground:#FFFFFF;--progress-ring-blue-background:rgba(45, 136, 255, 0.2);--progress-ring-blue-foreground:hsl(214, 100%, 59%);--progress-ring-disabled-background:rgba(122,125,130, 0.2);--progress-ring-disabled-foreground:#7A7D82;--rating-star-active:#FF9831;--scroll-thumb:rgba(255, 255, 255, 0.3);--scroll-shadow:0 1px 2px rgba(0, 0, 0, 0.1), 0 -1px rgba(255, 255, 255, 0.05) inset;--secondary-button-background:rgba(255,255,255,.1);--secondary-button-background-floating:#4B4C4F;--secondary-button-background-on-dark:rgba(255, 255, 255, 0.4);--secondary-button-pressed:rgba(0, 0, 0, 0.05);--secondary-button-stroke:transparent;--secondary-button-text:#E4E6EB;--secondary-icon:#B0B3B8;--secondary-text:#B0B3B8;--secondary-text-on-media:rgba(255, 255, 255, 0.9);--section-header-text:#BCC0C4;--shadow-1:rgba(0, 0, 0, 0.1);--shadow-2:rgba(0, 0, 0, 0.2);--shadow-5:rgba(0, 0, 0, 0.5);--shadow-8:rgba(0, 0, 0, 0.8);--shadow-inset:rgba(255, 255, 255, 0.05);--shadow-elevated:0 8px 20px 0 rgba(0, 0, 0, 0.2), 0 2px 4px 0 rgba(0, 0, 0, 0.1);--shadow-persistent:0px 0px 12px rgba(28, 43, 51, 0.6);--shadow-primary:0px 0px 12px rgba(28, 43, 51, 0.1);--surface-background:#242526;--switch-active:hsl(214, 100%, 59%);--text-highlight:rgba(24, 119, 242, 0.45);--input-background:#242526;--input-background-disabled:#18191A;--input-border-color:#3E4042;--input-border-color-hover:var(--placeholder-text);--input-label-color-highlighted:hsl(214, 100%, 59%);--text-input-outside-label:#FFFFFF;--toast-background:rgba(16, 16, 16, 0.85);--toast-text:#FFFFFF;--toast-text-link:#4599FF;--toggle-active-background:rgb(45, 136, 255);--toggle-active-icon:#FFFFFF;--toggle-active-text:#FFFFFF;--toggle-button-active-background:#E6F2FF;--tooltip-background:rgba(11, 11, 11, 0.8);--tooltip-box-shadow:0 2px 4px 0 var(--shadow-5);--wash:#3E4042;--web-wash:#18191A;--warning:hsl(40, 89%, 52%);--fb-logo-color:#2D88FF;--dialog-anchor-vertical-padding:56px;--header-height:0px;--global-panel-width:0px;--global-panel-width-expanded:0px;--alert-banner-corner-radius:8px;--button-corner-radius:6px;--button-corner-radius-medium:10px;--button-corner-radius-large:12px;--button-height-large:40px;--button-height-medium:36px;--button-padding-horizontal-large:16px;--button-padding-horizontal-medium:16px;--button-icon-padding-large:16px;--button-icon-padding-medium:16px;--button-inner-icon-spacing-large:3px;--button-inner-icon-spacing-medium:3px;--blueprint-button-height-medium:40px;--blueprint-button-height-large:48px;--card-corner-radius:8px;--card-box-shadow:0 12px 28px 0 var(--shadow-2), 0 2px 4px 0 var(--shadow-1);--card-padding-horizontal:10px;--card-padding-vertical:20px;--chip-corner-radius:6px;--dialog-corner-radius:8px;--glimmer-corner-radius:8px;--image-corner-radius:4px;--input-corner-radius:6px;--input-border-width:1px;--nav-list-cell-corner-radius:8px;--list-cell-corner-radius:8px;--list-cell-min-height:52px;--list-cell-padding-vertical:20px;--list-cell-padding-vertical-with-addon:14px;--menu-item-base-margin-horizontal:8px;--menu-item-base-padding-horizontal:8px;--nav-list-cell-min-height:0px;--nav-list-cell-padding-vertical:16px;--nav-list-cell-padding-vertical-with-addon:16px;--page-footer-padding-vertical:16px;--section-header-addOnEnd-margin-horizontal:8px;--section-header-addOnStart-margin-horizontal:12px;--section-header-addOnEnd-button-padding-horizontal:0px;--section-header-addOnEnd-button-padding-vertical:0px;--section-header-padding-vertical:16px;--section-header-subtitle-margin-vertical:14px;--section-header-subtitle-with-addOnEnd-margin-vertical:6px;--text-badge-corner-radius:4px;--text-badge-padding-horizontal:6px;--text-badge-padding-vertical:6px;--text-input-multi-padding-between-text-scrollbar:20px;--text-input-multi-padding-scrollbar:16px;--text-input-caption-margin-top:10px;--text-input-label-top:22px;--text-input-min-height:64px;--text-input-padding-vertical:12px;--toast-addon-padding-horizontal:6px;--toast-addon-padding-vertical:6px;--toast-container-max-width:100%;--toast-container-min-width:0px;--toast-container-padding-horizontal:14px;--toast-container-padding-vertical:10px;--toast-corner-radius:8px;--typeahead-list-outer-padding-vertical:2px;--fds-animation-enter-exit-in:cubic-bezier(0.14, 1, 0.34, 1);--fds-animation-enter-exit-out:cubic-bezier(0.45, 0.1, 0.2, 1);--fds-animation-swap-shuffle-in:cubic-bezier(0.14, 1, 0.34, 1);--fds-animation-swap-shuffle-out:cubic-bezier(0.45, 0.1, 0.2, 1);--fds-animation-move-in:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-move-out:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-expand-collapse-in:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-expand-collapse-out:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-passive-move-in:cubic-bezier(0.5, 0, 0.1, 1);--fds-animation-passive-move-out:cubic-bezier(0.5, 0, 0.1, 1);--fds-animation-quick-move-in:cubic-bezier(0.1, 0.9, 0.2, 1);--fds-animation-quick-move-out:cubic-bezier(0.1, 0.9, 0.2, 1);--fds-animation-fade-in:cubic-bezier(0, 0, 1, 1);--fds-animation-fade-out:cubic-bezier(0, 0, 1, 1);--fds-duration-extra-extra-short-in:100ms;--fds-duration-extra-extra-short-out:100ms;--fds-duration-extra-short-in:200ms;--fds-duration-extra-short-out:150ms;--fds-duration-short-in:280ms;--fds-duration-short-out:200ms;--fds-duration-medium-in:400ms;--fds-duration-medium-out:350ms;--fds-duration-long-in:500ms;--fds-duration-long-out:350ms;--fds-duration-extra-long-in:1000ms;--fds-duration-extra-long-out:1000ms;--fds-duration-none:0ms;--fds-fast:200ms;--fds-slow:400ms;--font-family-apple:system-ui, -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', sans-serif;--font-family-code:ui-monospace, Menlo, Consolas, Monaco, monospace;--font-family-default:Helvetica, Arial, sans-serif;--font-family-segoe:Segoe UI Historic, Segoe UI, Helvetica, Arial, sans-serif;--body-font-family:Placeholder Font;--body-font-size:0.9375rem;--body-font-weight:400;--body-line-height:1.3333;--body-emphasized-font-family:Placeholder Font;--body-emphasized-font-size:0.9375rem;--body-emphasized-font-weight:600;--body-emphasized-line-height:1.3333;--headline1-font-family:Optimistic Display Bold, system-ui, sans-serif;--headline1-font-size:1.75rem;--headline1-font-weight:700;--headline1-line-height:1.2143;--headline2-font-family:Optimistic Display Bold, system-ui, sans-serif;--headline2-font-size:1.5rem;--headline2-font-weight:700;--headline2-line-height:1.25;--headline3-font-family:Optimistic Display Bold, system-ui, sans-serif;--headline3-font-size:1.0625rem;--headline3-font-weight:700;--headline3-line-height:1.2941;--meta-font-family:Placeholder Font;--meta-font-size:0.8125rem;--meta-font-weight:400;--meta-line-height:1.3846;--meta-emphasized-font-family:Placeholder Font;--meta-emphasized-font-size:0.8125rem;--meta-emphasized-font-weight:600;--meta-emphasized-line-height:1.3846;--primary-label-font-family:Optimistic Display Medium, system-ui, sans-serif;--primary-label-font-size:1.0625rem;--primary-label-font-weight:500;--primary-label-line-height:1.2941;--secondary-label-font-family:Placeholder Font;--secondary-label-font-size:0.9375rem;--secondary-label-font-weight:500;--secondary-label-line-height:1.3333;--tertiary-label-font-family:Placeholder Font;--tertiary-label-font-size:0.6875rem;--tertiary-label-font-weight:500;--tertiary-label-line-height:1.4545;--text-input-field-font-family:Placeholder Font;--text-input-field-font-size:1rem;--text-input-field-font-weight:500;--text-input-field-line-height:1.2941;--text-input-label-font-family:Placeholder Font;--text-input-label-font-size:17px;--text-input-label-font-size-scale-multiplier:0.75;--text-input-label-font-weight:400;--text-input-label-line-height:1.2941;--tooltip-border-radius:8px;--dialog-size-medium-max-width:700px;--dialog-size-medium-width:100%;--dialog-size-small-max-width:548px;--dialog-size-small-width:100%;--dataviz-primary-2:rgb(134,218,255);--dataviz-primary-3:rgb(95,170,255);--dataviz-secondary-1:rgb(129,77,231);--dataviz-secondary-2:rgb(168,124,255);--dataviz-secondary-3:rgb(219,26,139);--dataviz-supplementary-1:rgb(255,122,105);--dataviz-supplementary-2:rgb(241,168,23);--dataviz-supplementary-3:rgb(49,162,76);--dataviz-supplementary-4:rgb(228,230,235);--base-unit:4px;--blue-0:245, 251, 255;--blue-1:224, 241, 255;--blue-2:179, 219, 255;--blue-3:112, 188, 255;--blue-4:71, 175, 255;--blue-5:0, 149, 246;--blue-6:0, 116, 204;--blue-7:0, 87, 163;--blue-8:0, 55, 107;--blue-9:0, 41, 82;--cyan-5:39, 196, 245;--font-family-system:-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;--font-weight-system-bold:700;--font-weight-system-extra-bold:800;--font-weight-system-extra-light:200;--font-weight-system-light:300;--font-weight-system-medium:500;--font-weight-system-regular:400;--font-weight-system-semibold:600;--green-4:120, 222, 69;--green-5:88, 195, 34;--green-6:55, 166, 0;--grey-0:245, 245, 245;--grey-1:239, 239, 239;--grey-2:219, 219, 219;--grey-3:199, 199, 199;--grey-4:168, 168, 168;--grey-5:142, 142, 142;--grey-6:115, 115, 115;--grey-7:85, 85, 85;--grey-8:54, 54, 54;--grey-9:38, 38, 38;--grey-10:26, 26, 26;--orange-5:253, 141, 50;--pink-5:209, 8, 105;--purple-5:163, 7, 186;--red-4:255, 104, 116;--red-5:237, 73, 86;--red-6:198, 35, 48;--red-7:167, 3, 17;--system-10-font-size:10px;--system-10-line-height:12px;--system-11-font-size:11px;--system-11-line-height:13px;--system-12-font-size:12px;--system-13-font-size:13px;--system-12-line-height:16px;--system-15-font-size:15px;--system-14-font-size:14px;--system-14-line-height:18px;--system-16-font-size:16px;--system-16-line-height:20px;--system-18-font-size:18px;--system-18-line-height:24px;--system-20-font-size:20px;--system-20-line-height:25px;--system-22-font-size:22px;--system-22-line-height:26px;--system-24-font-size:24px;--system-24-line-height:27px;--system-26-font-size:26px;--system-26-line-height:28px;--system-28-font-size:28px;--system-28-line-height:32px;--system-30-font-size:30px;--system-30-line-height:36px;--system-32-font-size:32px;--system-32-line-height:40px;--yellow-5:253, 203, 92;--barcelona-large-screen-breakpoint:748px;--barcelona-large-screen-max-width:620px;--barcelona-large-screen-padding:344px;--barcelona-threadline-column-width:48px;--barcelona-post-horizontal-padding:12px;--barcelona-quoted-post-horizontal-padding:16px;--barcelona-carousel-gap:6px;--barcelona-lightbox-horizontal-padding:92px;--barcelona-primary-text:rgb(243, 245, 247);--barcelona-secondary-text:rgb(97, 97, 97);--barcelona-primary-button:rgb(255, 255, 255);--barcelona-secondary-button:rgb(16, 16, 16);--barcelona-link-text:rgb(24, 163, 254);--barcelona-error-text:rgb(255, 48, 64);--barcelona-primary-background:rgb(16, 16, 16);--barcelona-elevated-background:rgb(24, 24, 24);--barcelona-secondary-background:rgb(10, 10, 10);--barcelona-tertiary-background:rgb(30, 30, 30);--barcelona-navigation-background:rgb(16, 16, 16);--barcelona-dialog-backdrop-background:rgba(16, 16, 16, 0.85);--barcelona-primary-outline:rgba(243, 245, 247, 0.15);--barcelona-media-outline:rgba(243, 245, 247, 0.2);--barcelona-threadline:rgb(51, 54, 56);--color-scheme:dark;}}.__fb-light-mode{--fds-black:#000000;--fds-black-alpha-05:rgba(0, 0, 0, 0.05);--fds-black-alpha-10:rgba(0, 0, 0, 0.1);--fds-black-alpha-15:rgba(0, 0, 0, 0.15);--fds-black-alpha-20:rgba(0, 0, 0, 0.2);--fds-black-alpha-30:rgba(0, 0, 0, 0.3);--fds-black-alpha-40:rgba(0, 0, 0, 0.4);--fds-black-alpha-50:rgba(0, 0, 0, 0.5);--fds-black-alpha-60:rgba(0, 0, 0, 0.6);--fds-black-alpha-80:rgba(0, 0, 0, 0.8);--fds-blue-05:#ECF3FF;--fds-blue-30:#AAC9FF;--fds-blue-40:#77A7FF;--fds-blue-60:#1877F2;--fds-blue-70:#2851A3;--fds-blue-80:#1D3C78;--fds-button-text:#444950;--fds-comment-background:#F2F3F5;--fds-dark-mode-gray-35:#CCCCCC;--fds-dark-mode-gray-50:#828282;--fds-dark-mode-gray-70:#4A4A4A;--fds-dark-mode-gray-80:#373737;--fds-dark-mode-gray-90:#282828;--fds-dark-mode-gray-100:#1C1C1C;--fds-gray-00:#F5F6F7;--fds-gray-05:#F2F3F5;--fds-gray-10:#EBEDF0;--fds-gray-20:#DADDE1;--fds-gray-25:#CCD0D5;--fds-gray-30:#BEC3C9;--fds-gray-45:#8D949E;--fds-gray-70:#606770;--fds-gray-80:#444950;--fds-gray-90:#303338;--fds-gray-100:#1C1E21;--fds-green-55:#00A400;--fds-highlight:#3578E5;--fds-highlight-cell-background:#ECF3FF;--fds-primary-icon:#1C1E21;--fds-primary-text:#1C1E21;--fds-red-55:#FA383E;--fds-soft:cubic-bezier(.08,.52,.52,1);--fds-spectrum-aluminum-tint-70:#E4F0F6;--fds-spectrum-blue-gray-tint-70:#CFD1D5;--fds-spectrum-cherry:#F35369;--fds-spectrum-cherry-tint-70:#FBCCD2;--fds-spectrum-grape-tint-70:#DDD5F0;--fds-spectrum-grape-tint-90:#F4F1FA;--fds-spectrum-lemon-dark-1:#F5C33B;--fds-spectrum-lemon-tint-70:#FEF2D1;--fds-spectrum-lime:#A3CE71;--fds-spectrum-lime-tint-70:#E4F0D5;--fds-spectrum-orange-tint-70:#FCDEC5;--fds-spectrum-orange-tint-90:#FEF4EC;--fds-spectrum-seafoam-tint-70:#CAEEF9;--fds-spectrum-slate-dark-2:#89A1AC;--fds-spectrum-slate-tint-70:#EAEFF2;--fds-spectrum-teal:#6BCEBB;--fds-spectrum-teal-dark-1:#4DBBA6;--fds-spectrum-teal-dark-2:#31A38D;--fds-spectrum-teal-tint-70:#D2F0EA;--fds-spectrum-teal-tint-90:#F0FAF8;--fds-spectrum-tomato:#FB724B;--fds-spectrum-tomato-tint-30:#F38E7B;--fds-spectrum-tomato-tint-90:#FDEFED;--fds-strong:cubic-bezier(.12,.8,.32,1);--fds-white:#FFFFFF;--fds-white-alpha-05:rgba(255, 255, 255, 0.05);--fds-white-alpha-10:rgba(255, 255, 255, 0.1);--fds-white-alpha-20:rgba(255, 255, 255, 0.2);--fds-white-alpha-30:rgba(255, 255, 255, 0.3);--fds-white-alpha-40:rgba(255, 255, 255, 0.4);--fds-white-alpha-50:rgba(255, 255, 255, 0.5);--fds-white-alpha-60:rgba(255, 255, 255, 0.6);--fds-white-alpha-80:rgba(255, 255, 255, 0.8);--fds-yellow-20:#FFBA00;--accent:hsl(214, 89%, 52%);--always-white:#ffffff;--always-black:#000000;--always-dark-gradient:linear-gradient(rgba(0,0,0,0), rgba(0,0,0,0.6));--always-dark-overlay:rgba(0, 0, 0, 0.4);--always-light-overlay:rgba(255, 255, 255, 0.4);--always-gray-40:#65676B;--always-gray-75:#BCC0C4;--always-gray-95:#F0F2F5;--attachment-footer-background:#F0F2F5;--background-deemphasized:#F0F2F5;--base-blue:#1877F2;--base-cherry:#F3425F;--base-grape:#9360F7;--base-lemon:#F7B928;--base-lime:#45BD62;--base-pink:#FF66BF;--base-seafoam:#54C7EC;--base-teal:#2ABBA7;--base-tomato:#FB724B;--text-badge-info-background:hsl(214, 89%, 52%);--text-badge-success-background:#31A24C;--text-badge-attention-background:hsl(40, 89%, 52%);--text-badge-critical-background:#e41e3f;--blue-link:#216FDB;--border-focused:#65676B;--card-background:#FFFFFF;--card-background-flat:#F7F8FA;--comment-background:#F0F2F5;--comment-footer-background:#F6F9FA;--dataviz-primary-1:rgb(48,200,180);--disabled-button-background:#E4E6EB;--disabled-button-text:#BCC0C4;--disabled-icon:#BCC0C4;--disabled-text:#BCC0C4;--divider:#CED0D4;--event-date:#F3425F;--fb-wordmark:#1877F2;--filter-accent:invert(39%) sepia(57%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(147.75%) hue-rotate(202deg) brightness(97%) contrast(96%);--filter-always-white:invert(100%);--filter-disabled-icon:invert(80%) sepia(6%) saturate(200%) saturate(120%) hue-rotate(173deg) brightness(98%) contrast(89%);--filter-placeholder-icon:invert(59%) sepia(11%) saturate(200%) saturate(135%) hue-rotate(176deg) brightness(96%) contrast(94%);--filter-primary-icon:invert(8%) sepia(10%) saturate(200%) saturate(200%) saturate(166%) hue-rotate(177deg) brightness(104%) contrast(91%);--filter-secondary-icon:invert(39%) sepia(21%) saturate(200%) saturate(109.5%) hue-rotate(174deg) brightness(94%) contrast(86%);--filter-warning-icon:invert(77%) sepia(29%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(128%) hue-rotate(359deg) brightness(102%) contrast(107%);--filter-blue-link-icon:invert(30%) sepia(98%) saturate(200%) saturate(200%) saturate(200%) saturate(166.5%) hue-rotate(192deg) brightness(91%) contrast(101%);--filter-positive:invert(37%) sepia(61%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(115%) hue-rotate(91deg) brightness(97%) contrast(105%);--filter-negative:invert(25%) sepia(33%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(110%) hue-rotate(345deg) brightness(132%) contrast(96%);--glimmer-spinner-icon:#65676B;--hero-banner-background:#FFFFFF;--hosted-view-selected-state:rgba(45, 136, 255, 0.1);--highlight-bg:#E7F3FF;--hover-overlay:rgba(0, 0, 0, 0.05);--list-cell-chevron:#65676B;--media-hover:rgba(68, 73, 80, 0.15);--media-inner-border:rgba(0, 0, 0, 0.1);--media-outer-border:#FFFFFF;--media-pressed:rgba(68, 73, 80, 0.35);--messenger-card-background:#FFFFFF;--messenger-reply-background:#F0F2F5;--overlay-alpha-80:rgba(244, 244, 244, 0.8);--overlay-on-media:rgba(0, 0, 0, 0.6);--nav-bar-background:#FFFFFF;--nav-bar-background-gradient:linear-gradient(to top, #FFFFFF, rgba(255,255,255.9), rgba(255,255,255,.7), rgba(255,255,255,.4), rgba(255,255,255,0));--nav-bar-background-gradient-wash:linear-gradient(to top, #F0F2F5, rgba(240,242,245.9), rgba(240,242,245,.7), rgba(240,242,245,.4), rgba(240,242,245,0));--negative:hsl(350, 87%, 55%);--negative-background:hsl(350, 87%, 55%, 20%);--new-notification-background:#E7F3FF;--non-media-pressed:rgba(68, 73, 80, 0.15);--non-media-pressed-on-dark:rgba(255, 255, 255, 0.3);--notification-badge:#e41e3f;--placeholder-icon:#65676B;--placeholder-image:rgb(164, 167, 171);--placeholder-text:#65676B;--placeholder-text-on-media:rgba(255, 255, 255, 0.5);--popover-background:#FFFFFF;--positive:#31A24C;--positive-background:#DEEFE1;--press-overlay:rgba(0, 0, 0, 0.10);--primary-button-background:#1B74E4;--primary-button-icon:#FFFFFF;--primary-button-pressed:#77A7FF;--primary-button-text:#FFFFFF;--primary-deemphasized-button-background:#E7F3FF;--primary-deemphasized-button-pressed:rgba(0, 0, 0, 0.05);--primary-deemphasized-button-pressed-overlay:rgba(25, 110, 255, 0.15);--primary-deemphasized-button-text:#1877F2;--primary-icon:#050505;--primary-text:#050505;--primary-text-on-media:#FFFFFF;--primary-web-focus-indicator:#D24294;--progress-ring-neutral-background:rgba(0, 0, 0, 0.2);--progress-ring-neutral-foreground:#000000;--progress-ring-on-media-background:rgba(255, 255, 255, 0.2);--progress-ring-on-media-foreground:#FFFFFF;--progress-ring-blue-background:rgba(24, 119, 242, 0.2);--progress-ring-blue-foreground:hsl(214, 89%, 52%);--progress-ring-disabled-background:rgba(190,195,201, 0.2);--progress-ring-disabled-foreground:#BEC3C9;--rating-star-active:#EB660D;--scroll-thumb:#BCC0C4;--scroll-shadow:0 1px 2px rgba(0, 0, 0, 0.1), 0 -1px rgba(0, 0, 0, 0.1) inset;--secondary-button-background:#E4E6EB;--secondary-button-background-floating:#ffffff;--secondary-button-background-on-dark:rgba(0, 0, 0, 0.4);--secondary-button-pressed:rgba(0, 0, 0, 0.05);--secondary-button-stroke:transparent;--secondary-button-text:#050505;--secondary-icon:#65676B;--secondary-text:#65676B;--secondary-text-on-media:rgba(255, 255, 255, 0.9);--section-header-text:#4B4C4F;--shadow-1:rgba(0, 0, 0, 0.1);--shadow-2:rgba(0, 0, 0, 0.2);--shadow-5:rgba(0, 0, 0, 0.5);--shadow-8:rgba(0, 0, 0, 0.8);--shadow-inset:rgba(255, 255, 255, 0.5);--shadow-elevated:0 8px 20px 0 rgba(0, 0, 0, 0.2), 0 2px 4px 0 rgba(0, 0, 0, 0.1);--shadow-persistent:0px 0px 12px rgba(52, 72, 84, 0.05);--shadow-primary:0px 5px 12px rgba(52, 72, 84, 0.2);--surface-background:#FFFFFF;--switch-active:hsl(214, 89%, 52%);--text-highlight:rgba(24, 119, 242, 0.2);--input-background:#FFFFFF;--input-background-disabled:#F0F2F5;--input-border-color:#CED0D4;--input-border-color-hover:var(--placeholder-text);--input-label-color-highlighted:hsl(214, 89%, 52%);--text-input-outside-label:#000000;--toast-background:rgba(255, 255, 255, 0.85);--toast-text:#1C2B33;--toast-text-link:#216FDB;--toggle-active-background:#E7F3FF;--toggle-active-icon:rgb(24, 119, 242);--toggle-active-text:rgb(24, 119, 242);--toggle-button-active-background:#E7F3FF;--tooltip-background:rgba(244, 244, 244, 0.8);--tooltip-box-shadow:0 2px 4px 0 var(--shadow-5);--wash:#E4E6EB;--web-wash:#F0F2F5;--warning:hsl(40, 89%, 52%);--fb-logo-color:#2D88FF;--dialog-anchor-vertical-padding:56px;--header-height:0px;--global-panel-width:0px;--global-panel-width-expanded:0px;--alert-banner-corner-radius:8px;--button-corner-radius:6px;--button-corner-radius-medium:10px;--button-corner-radius-large:12px;--button-height-large:40px;--button-height-medium:36px;--button-padding-horizontal-large:16px;--button-padding-horizontal-medium:16px;--button-icon-padding-large:16px;--button-icon-padding-medium:16px;--button-inner-icon-spacing-large:3px;--button-inner-icon-spacing-medium:3px;--blueprint-button-height-medium:40px;--blueprint-button-height-large:48px;--card-corner-radius:8px;--card-box-shadow:0 12px 28px 0 var(--shadow-2), 0 2px 4px 0 var(--shadow-1);--card-padding-horizontal:10px;--card-padding-vertical:20px;--chip-corner-radius:6px;--dialog-corner-radius:8px;--glimmer-corner-radius:8px;--image-corner-radius:4px;--input-corner-radius:6px;--input-border-width:1px;--nav-list-cell-corner-radius:8px;--list-cell-corner-radius:8px;--list-cell-min-height:52px;--list-cell-padding-vertical:20px;--list-cell-padding-vertical-with-addon:14px;--menu-item-base-margin-horizontal:8px;--menu-item-base-padding-horizontal:8px;--nav-list-cell-min-height:0px;--nav-list-cell-padding-vertical:16px;--nav-list-cell-padding-vertical-with-addon:16px;--page-footer-padding-vertical:16px;--section-header-addOnEnd-margin-horizontal:8px;--section-header-addOnStart-margin-horizontal:12px;--section-header-addOnEnd-button-padding-horizontal:0px;--section-header-addOnEnd-button-padding-vertical:0px;--section-header-padding-vertical:16px;--section-header-subtitle-margin-vertical:14px;--section-header-subtitle-with-addOnEnd-margin-vertical:6px;--text-badge-corner-radius:4px;--text-badge-padding-horizontal:6px;--text-badge-padding-vertical:6px;--text-input-multi-padding-between-text-scrollbar:20px;--text-input-multi-padding-scrollbar:16px;--text-input-caption-margin-top:10px;--text-input-label-top:22px;--text-input-min-height:64px;--text-input-padding-vertical:12px;--toast-addon-padding-horizontal:6px;--toast-addon-padding-vertical:6px;--toast-container-max-width:100%;--toast-container-min-width:0px;--toast-container-padding-horizontal:14px;--toast-container-padding-vertical:10px;--toast-corner-radius:8px;--typeahead-list-outer-padding-vertical:2px;--fds-animation-enter-exit-in:cubic-bezier(0.14, 1, 0.34, 1);--fds-animation-enter-exit-out:cubic-bezier(0.45, 0.1, 0.2, 1);--fds-animation-swap-shuffle-in:cubic-bezier(0.14, 1, 0.34, 1);--fds-animation-swap-shuffle-out:cubic-bezier(0.45, 0.1, 0.2, 1);--fds-animation-move-in:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-move-out:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-expand-collapse-in:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-expand-collapse-out:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-passive-move-in:cubic-bezier(0.5, 0, 0.1, 1);--fds-animation-passive-move-out:cubic-bezier(0.5, 0, 0.1, 1);--fds-animation-quick-move-in:cubic-bezier(0.1, 0.9, 0.2, 1);--fds-animation-quick-move-out:cubic-bezier(0.1, 0.9, 0.2, 1);--fds-animation-fade-in:cubic-bezier(0, 0, 1, 1);--fds-animation-fade-out:cubic-bezier(0, 0, 1, 1);--fds-duration-extra-extra-short-in:100ms;--fds-duration-extra-extra-short-out:100ms;--fds-duration-extra-short-in:200ms;--fds-duration-extra-short-out:150ms;--fds-duration-short-in:280ms;--fds-duration-short-out:200ms;--fds-duration-medium-in:400ms;--fds-duration-medium-out:350ms;--fds-duration-long-in:500ms;--fds-duration-long-out:350ms;--fds-duration-extra-long-in:1000ms;--fds-duration-extra-long-out:1000ms;--fds-duration-none:0ms;--fds-fast:200ms;--fds-slow:400ms;--font-family-apple:system-ui, -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', sans-serif;--font-family-code:ui-monospace, Menlo, Consolas, Monaco, monospace;--font-family-default:Helvetica, Arial, sans-serif;--font-family-segoe:Segoe UI Historic, Segoe UI, Helvetica, Arial, sans-serif;--body-font-family:Placeholder Font;--body-font-size:0.9375rem;--body-font-weight:400;--body-line-height:1.3333;--body-emphasized-font-family:Placeholder Font;--body-emphasized-font-size:0.9375rem;--body-emphasized-font-weight:600;--body-emphasized-line-height:1.3333;--headline1-font-family:Optimistic Display Bold, system-ui, sans-serif;--headline1-font-size:1.75rem;--headline1-font-weight:700;--headline1-line-height:1.2143;--headline2-font-family:Optimistic Display Bold, system-ui, sans-serif;--headline2-font-size:1.5rem;--headline2-font-weight:700;--headline2-line-height:1.25;--headline3-font-family:Optimistic Display Bold, system-ui, sans-serif;--headline3-font-size:1.0625rem;--headline3-font-weight:700;--headline3-line-height:1.2941;--meta-font-family:Placeholder Font;--meta-font-size:0.8125rem;--meta-font-weight:400;--meta-line-height:1.3846;--meta-emphasized-font-family:Placeholder Font;--meta-emphasized-font-size:0.8125rem;--meta-emphasized-font-weight:600;--meta-emphasized-line-height:1.3846;--primary-label-font-family:Optimistic Display Medium, system-ui, sans-serif;--primary-label-font-size:1.0625rem;--primary-label-font-weight:500;--primary-label-line-height:1.2941;--secondary-label-font-family:Placeholder Font;--secondary-label-font-size:0.9375rem;--secondary-label-font-weight:500;--secondary-label-line-height:1.3333;--tertiary-label-font-family:Placeholder Font;--tertiary-label-font-size:0.6875rem;--tertiary-label-font-weight:500;--tertiary-label-line-height:1.4545;--text-input-field-font-family:Placeholder Font;--text-input-field-font-size:1rem;--text-input-field-font-weight:500;--text-input-field-line-height:1.2941;--text-input-label-font-family:Placeholder Font;--text-input-label-font-size:17px;--text-input-label-font-size-scale-multiplier:0.75;--text-input-label-font-weight:400;--text-input-label-line-height:1.2941;--tooltip-border-radius:8px;--dialog-size-medium-max-width:700px;--dialog-size-medium-width:100%;--dialog-size-small-max-width:548px;--dialog-size-small-width:100%;--dataviz-primary-2:rgb(134,218,255);--dataviz-primary-3:rgb(95,170,255);--dataviz-secondary-1:rgb(118,62,230);--dataviz-secondary-2:rgb(147,96,247);--dataviz-secondary-3:rgb(219,26,139);--dataviz-supplementary-1:rgb(255,122,105);--dataviz-supplementary-2:rgb(241,168,23);--dataviz-supplementary-3:rgb(49,162,76);--dataviz-supplementary-4:rgb(50,52,54);--base-unit:4px;--blue-0:245, 251, 255;--blue-1:224, 241, 255;--blue-2:179, 219, 255;--blue-3:112, 188, 255;--blue-4:71, 175, 255;--blue-5:0, 149, 246;--blue-6:0, 116, 204;--blue-7:0, 87, 163;--blue-8:0, 55, 107;--blue-9:0, 41, 82;--cyan-5:39, 196, 245;--font-family-system:-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;--font-weight-system-bold:700;--font-weight-system-extra-bold:800;--font-weight-system-extra-light:200;--font-weight-system-light:300;--font-weight-system-medium:500;--font-weight-system-regular:400;--font-weight-system-semibold:600;--green-4:120, 222, 69;--green-5:88, 195, 34;--green-6:55, 166, 0;--grey-0:245, 245, 245;--grey-1:239, 239, 239;--grey-2:219, 219, 219;--grey-3:199, 199, 199;--grey-4:168, 168, 168;--grey-5:142, 142, 142;--grey-6:115, 115, 115;--grey-7:85, 85, 85;--grey-8:54, 54, 54;--grey-9:38, 38, 38;--grey-10:26, 26, 26;--orange-5:253, 141, 50;--pink-5:209, 8, 105;--purple-5:163, 7, 186;--red-4:255, 104, 116;--red-5:237, 73, 86;--red-6:198, 35, 48;--red-7:167, 3, 17;--system-10-font-size:10px;--system-10-line-height:12px;--system-11-font-size:11px;--system-11-line-height:13px;--system-12-font-size:12px;--system-13-font-size:13px;--system-12-line-height:16px;--system-15-font-size:15px;--system-14-font-size:14px;--system-14-line-height:18px;--system-16-font-size:16px;--system-16-line-height:20px;--system-18-font-size:18px;--system-18-line-height:24px;--system-20-font-size:20px;--system-20-line-height:25px;--system-22-font-size:22px;--system-22-line-height:26px;--system-24-font-size:24px;--system-24-line-height:27px;--system-26-font-size:26px;--system-26-line-height:28px;--system-28-font-size:28px;--system-28-line-height:32px;--system-30-font-size:30px;--system-30-line-height:36px;--system-32-font-size:32px;--system-32-line-height:40px;--yellow-5:253, 203, 92;--barcelona-large-screen-breakpoint:748px;--barcelona-large-screen-max-width:620px;--barcelona-large-screen-padding:344px;--barcelona-threadline-column-width:48px;--barcelona-post-horizontal-padding:12px;--barcelona-quoted-post-horizontal-padding:16px;--barcelona-carousel-gap:6px;--barcelona-lightbox-horizontal-padding:92px;--barcelona-primary-text:rgb(0, 0, 0);--barcelona-secondary-text:rgb(153, 153, 153);--barcelona-primary-button:rgb(0, 0, 0);--barcelona-secondary-button:rgb(255, 255, 255);--barcelona-link-text:rgb(0, 149, 246);--barcelona-error-text:rgb(255, 48, 64);--barcelona-primary-background:rgb(255, 255, 255);--barcelona-elevated-background:rgb(255, 255, 255);--barcelona-secondary-background:rgb(250, 250, 250);--barcelona-tertiary-background:rgb(245, 245, 245);--barcelona-navigation-background:rgba(255, 255, 255);--barcelona-dialog-backdrop-background:rgba(255, 255, 255, 0.85);--barcelona-primary-outline:rgba(0, 0, 0, 0.15);--barcelona-media-outline:rgba(0, 0, 0, 0.15);--barcelona-threadline:rgb(229, 229, 229);}.__fb-dark-mode{--fds-black:black;--fds-black-alpha-05:rgba(0, 0, 0, 0.05);--fds-black-alpha-10:rgba(0, 0, 0, 0.1);--fds-black-alpha-15:rgba(0, 0, 0, 0.15);--fds-black-alpha-20:rgba(0, 0, 0, 0.2);--fds-black-alpha-30:rgba(0, 0, 0, 0.3);--fds-black-alpha-40:rgba(0, 0, 0, 0.4);--fds-black-alpha-50:rgba(0, 0, 0, 0.5);--fds-black-alpha-60:rgba(0, 0, 0, 0.6);--fds-black-alpha-80:rgba(0, 0, 0, 0.8);--fds-blue-05:black;--fds-blue-30:black;--fds-blue-40:black;--fds-blue-60:black;--fds-blue-70:black;--fds-blue-80:black;--fds-button-text:black;--fds-comment-background:black;--fds-dark-mode-gray-35:black;--fds-dark-mode-gray-50:black;--fds-dark-mode-gray-70:black;--fds-dark-mode-gray-80:black;--fds-dark-mode-gray-90:black;--fds-dark-mode-gray-100:black;--fds-gray-00:black;--fds-gray-05:black;--fds-gray-10:black;--fds-gray-20:black;--fds-gray-25:black;--fds-gray-30:black;--fds-gray-45:black;--fds-gray-70:black;--fds-gray-80:black;--fds-gray-90:black;--fds-gray-100:black;--fds-green-55:black;--fds-highlight:black;--fds-highlight-cell-background:black;--fds-primary-icon:white;--fds-primary-text:white;--fds-red-55:black;--fds-soft:cubic-bezier(.08,.52,.52,1);--fds-spectrum-aluminum-tint-70:black;--fds-spectrum-blue-gray-tint-70:black;--fds-spectrum-cherry:black;--fds-spectrum-cherry-tint-70:black;--fds-spectrum-grape-tint-70:black;--fds-spectrum-grape-tint-90:black;--fds-spectrum-lemon-dark-1:black;--fds-spectrum-lemon-tint-70:black;--fds-spectrum-lime:black;--fds-spectrum-lime-tint-70:black;--fds-spectrum-orange-tint-70:black;--fds-spectrum-orange-tint-90:black;--fds-spectrum-seafoam-tint-70:black;--fds-spectrum-slate-dark-2:black;--fds-spectrum-slate-tint-70:black;--fds-spectrum-teal:black;--fds-spectrum-teal-dark-1:black;--fds-spectrum-teal-dark-2:black;--fds-spectrum-teal-tint-70:black;--fds-spectrum-teal-tint-90:black;--fds-spectrum-tomato:black;--fds-spectrum-tomato-tint-30:black;--fds-spectrum-tomato-tint-90:black;--fds-strong:cubic-bezier(.12,.8,.32,1);--fds-white:black;--fds-white-alpha-05:rgba(255, 255, 255, 0.05);--fds-white-alpha-10:rgba(255, 255, 255, 0.1);--fds-white-alpha-20:rgba(255, 255, 255, 0.2);--fds-white-alpha-30:rgba(255, 255, 255, 0.3);--fds-white-alpha-40:rgba(255, 255, 255, 0.4);--fds-white-alpha-50:rgba(255, 255, 255, 0.5);--fds-white-alpha-60:rgba(255, 255, 255, 0.6);--fds-white-alpha-80:rgba(255, 255, 255, 0.8);--fds-yellow-20:black;--accent:hsl(214, 100%, 59%);--always-white:#ffffff;--always-black:#000000;--always-dark-gradient:linear-gradient(rgba(0,0,0,0), rgba(0,0,0,0.6));--always-dark-overlay:rgba(0, 0, 0, 0.4);--always-light-overlay:rgba(255, 255, 255, 0.4);--always-gray-40:#65676B;--always-gray-75:#BCC0C4;--always-gray-95:#F0F2F5;--attachment-footer-background:rgba(255,255,255,0.1);--background-deemphasized:rgba(255,255,255,0.1);--base-blue:#1877F2;--base-cherry:#F3425F;--base-grape:#9360F7;--base-lemon:#F7B928;--base-lime:#45BD62;--base-pink:#FF66BF;--base-seafoam:#54C7EC;--base-teal:#2ABBA7;--base-tomato:#FB724B;--text-badge-info-background:hsl(214, 100%, 59%);--text-badge-success-background:#31A24C;--text-badge-attention-background:hsl(40, 89%, 52%);--text-badge-critical-background:#e41e3f;--blue-link:#4599FF;--border-focused:#8A8D91;--card-background:#242526;--card-background-flat:#323436;--comment-background:#3A3B3C;--comment-footer-background:#4E4F50;--dataviz-primary-1:rgb(48,200,180);--disabled-button-background:rgba(255, 255, 255, 0.2);--disabled-button-text:rgba(255, 255, 255, 0.3);--disabled-icon:rgba(255, 255, 255, 0.3);--disabled-text:rgba(255, 255, 255, 0.3);--divider:#3E4042;--event-date:#F3425F;--fb-wordmark:#FFFFFF;--filter-accent:invert(40%) sepia(52%) saturate(200%) saturate(200%) saturate(200%) saturate(189%) hue-rotate(191deg) brightness(103%) contrast(102%);--filter-always-white:invert(100%);--filter-disabled-icon:invert(100%) opacity(30%);--filter-placeholder-icon:invert(59%) sepia(11%) saturate(200%) saturate(135%) hue-rotate(176deg) brightness(96%) contrast(94%);--filter-primary-icon:invert(89%) sepia(6%) hue-rotate(185deg);--filter-secondary-icon:invert(62%) sepia(98%) saturate(12%) hue-rotate(175deg) brightness(90%) contrast(96%);--filter-warning-icon:invert(77%) sepia(29%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(128%) hue-rotate(359deg) brightness(102%) contrast(107%);--filter-blue-link-icon:invert(73%) sepia(29%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(103.25%) hue-rotate(189deg) brightness(101%) contrast(101%);--filter-positive:invert(37%) sepia(61%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(115%) hue-rotate(91deg) brightness(97%) contrast(105%);--filter-negative:invert(25%) sepia(33%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(110%) hue-rotate(345deg) brightness(132%) contrast(96%);--glimmer-spinner-icon:white;--hero-banner-background:#E85D07;--hosted-view-selected-state:rgba(45, 136, 255, 0.1);--highlight-bg:rgba(24, 119, 242, .31);--hover-overlay:rgba(255, 255, 255, 0.1);--list-cell-chevron:#B0B3B8;--media-hover:rgba(68, 73, 80, 0.15);--media-inner-border:rgba(255, 255, 255, 0.05);--media-outer-border:#33363A;--media-pressed:rgba(68, 73, 80, 0.35);--messenger-card-background:#242526;--messenger-reply-background:#18191A;--overlay-alpha-80:rgba(11, 11, 11, 0.8);--overlay-on-media:rgba(0, 0, 0, 0.6);--nav-bar-background:#242526;--nav-bar-background-gradient:linear-gradient(to top, #242526, rgba(36,37,38,.9), rgba(36,37,38,.7), rgba(36,37,38,.4), rgba(36,37,38,0));--nav-bar-background-gradient-wash:linear-gradient(to top, #18191A, rgba(24,25,26,.9), rgba(24,25,26,.7), rgba(24,25,26,.4), rgba(24,25,26,0));--negative:hsl(350, 87%, 55%);--negative-background:hsl(350, 87%, 55%, 20%);--new-notification-background:#E7F3FF;--non-media-pressed:rgba(68, 73, 80, 0.15);--non-media-pressed-on-dark:rgba(255, 255, 255, 0.3);--notification-badge:#e41e3f;--placeholder-icon:#8A8D91;--placeholder-image:rgb(164, 167, 171);--placeholder-text:#8A8D91;--placeholder-text-on-media:rgba(255, 255, 255, 0.5);--popover-background:#3E4042;--positive:#31A24C;--positive-background:#1F3520;--press-overlay:rgba(255, 255, 255, 0.1);--primary-button-background:#2374E1;--primary-button-icon:#FFFFFF;--primary-button-pressed:#77A7FF;--primary-button-text:#FFFFFF;--primary-deemphasized-button-background:rgba(45, 136, 255, 0.2);--primary-deemphasized-button-pressed:rgba(24, 119, 242, 0.2);--primary-deemphasized-button-pressed-overlay:rgba(25, 110, 255, 0.15);--primary-deemphasized-button-text:#2D88FF;--primary-icon:#E4E6EB;--primary-text:#E4E6EB;--primary-text-on-media:white;--primary-web-focus-indicator:#D24294;--progress-ring-neutral-background:rgba(255, 255, 255, 0.2);--progress-ring-neutral-foreground:#ffffff;--progress-ring-on-media-background:rgba(255, 255, 255, 0.2);--progress-ring-on-media-foreground:#FFFFFF;--progress-ring-blue-background:rgba(45, 136, 255, 0.2);--progress-ring-blue-foreground:hsl(214, 100%, 59%);--progress-ring-disabled-background:rgba(122,125,130, 0.2);--progress-ring-disabled-foreground:#7A7D82;--rating-star-active:#FF9831;--scroll-thumb:rgba(255, 255, 255, 0.3);--scroll-shadow:0 1px 2px rgba(0, 0, 0, 0.1), 0 -1px rgba(255, 255, 255, 0.05) inset;--secondary-button-background:rgba(255,255,255,.1);--secondary-button-background-floating:#4B4C4F;--secondary-button-background-on-dark:rgba(255, 255, 255, 0.4);--secondary-button-pressed:rgba(0, 0, 0, 0.05);--secondary-button-stroke:transparent;--secondary-button-text:#E4E6EB;--secondary-icon:#B0B3B8;--secondary-text:#B0B3B8;--secondary-text-on-media:rgba(255, 255, 255, 0.9);--section-header-text:#BCC0C4;--shadow-1:rgba(0, 0, 0, 0.1);--shadow-2:rgba(0, 0, 0, 0.2);--shadow-5:rgba(0, 0, 0, 0.5);--shadow-8:rgba(0, 0, 0, 0.8);--shadow-inset:rgba(255, 255, 255, 0.05);--shadow-elevated:0 8px 20px 0 rgba(0, 0, 0, 0.2), 0 2px 4px 0 rgba(0, 0, 0, 0.1);--shadow-persistent:0px 0px 12px rgba(28, 43, 51, 0.6);--shadow-primary:0px 0px 12px rgba(28, 43, 51, 0.1);--surface-background:#242526;--switch-active:hsl(214, 100%, 59%);--text-highlight:rgba(24, 119, 242, 0.45);--input-background:#242526;--input-background-disabled:#18191A;--input-border-color:#3E4042;--input-border-color-hover:var(--placeholder-text);--input-label-color-highlighted:hsl(214, 100%, 59%);--text-input-outside-label:#FFFFFF;--toast-background:rgba(16, 16, 16, 0.85);--toast-text:#FFFFFF;--toast-text-link:#4599FF;--toggle-active-background:rgb(45, 136, 255);--toggle-active-icon:#FFFFFF;--toggle-active-text:#FFFFFF;--toggle-button-active-background:#E6F2FF;--tooltip-background:rgba(11, 11, 11, 0.8);--tooltip-box-shadow:0 2px 4px 0 var(--shadow-5);--wash:#3E4042;--web-wash:#18191A;--warning:hsl(40, 89%, 52%);--fb-logo-color:#2D88FF;--dialog-anchor-vertical-padding:56px;--header-height:0px;--global-panel-width:0px;--global-panel-width-expanded:0px;--alert-banner-corner-radius:8px;--button-corner-radius:6px;--button-corner-radius-medium:10px;--button-corner-radius-large:12px;--button-height-large:40px;--button-height-medium:36px;--button-padding-horizontal-large:16px;--button-padding-horizontal-medium:16px;--button-icon-padding-large:16px;--button-icon-padding-medium:16px;--button-inner-icon-spacing-large:3px;--button-inner-icon-spacing-medium:3px;--blueprint-button-height-medium:40px;--blueprint-button-height-large:48px;--card-corner-radius:8px;--card-box-shadow:0 12px 28px 0 var(--shadow-2), 0 2px 4px 0 var(--shadow-1);--card-padding-horizontal:10px;--card-padding-vertical:20px;--chip-corner-radius:6px;--dialog-corner-radius:8px;--glimmer-corner-radius:8px;--image-corner-radius:4px;--input-corner-radius:6px;--input-border-width:1px;--nav-list-cell-corner-radius:8px;--list-cell-corner-radius:8px;--list-cell-min-height:52px;--list-cell-padding-vertical:20px;--list-cell-padding-vertical-with-addon:14px;--menu-item-base-margin-horizontal:8px;--menu-item-base-padding-horizontal:8px;--nav-list-cell-min-height:0px;--nav-list-cell-padding-vertical:16px;--nav-list-cell-padding-vertical-with-addon:16px;--page-footer-padding-vertical:16px;--section-header-addOnEnd-margin-horizontal:8px;--section-header-addOnStart-margin-horizontal:12px;--section-header-addOnEnd-button-padding-horizontal:0px;--section-header-addOnEnd-button-padding-vertical:0px;--section-header-padding-vertical:16px;--section-header-subtitle-margin-vertical:14px;--section-header-subtitle-with-addOnEnd-margin-vertical:6px;--text-badge-corner-radius:4px;--text-badge-padding-horizontal:6px;--text-badge-padding-vertical:6px;--text-input-multi-padding-between-text-scrollbar:20px;--text-input-multi-padding-scrollbar:16px;--text-input-caption-margin-top:10px;--text-input-label-top:22px;--text-input-min-height:64px;--text-input-padding-vertical:12px;--toast-addon-padding-horizontal:6px;--toast-addon-padding-vertical:6px;--toast-container-max-width:100%;--toast-container-min-width:0px;--toast-container-padding-horizontal:14px;--toast-container-padding-vertical:10px;--toast-corner-radius:8px;--typeahead-list-outer-padding-vertical:2px;--fds-animation-enter-exit-in:cubic-bezier(0.14, 1, 0.34, 1);--fds-animation-enter-exit-out:cubic-bezier(0.45, 0.1, 0.2, 1);--fds-animation-swap-shuffle-in:cubic-bezier(0.14, 1, 0.34, 1);--fds-animation-swap-shuffle-out:cubic-bezier(0.45, 0.1, 0.2, 1);--fds-animation-move-in:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-move-out:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-expand-collapse-in:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-expand-collapse-out:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-passive-move-in:cubic-bezier(0.5, 0, 0.1, 1);--fds-animation-passive-move-out:cubic-bezier(0.5, 0, 0.1, 1);--fds-animation-quick-move-in:cubic-bezier(0.1, 0.9, 0.2, 1);--fds-animation-quick-move-out:cubic-bezier(0.1, 0.9, 0.2, 1);--fds-animation-fade-in:cubic-bezier(0, 0, 1, 1);--fds-animation-fade-out:cubic-bezier(0, 0, 1, 1);--fds-duration-extra-extra-short-in:100ms;--fds-duration-extra-extra-short-out:100ms;--fds-duration-extra-short-in:200ms;--fds-duration-extra-short-out:150ms;--fds-duration-short-in:280ms;--fds-duration-short-out:200ms;--fds-duration-medium-in:400ms;--fds-duration-medium-out:350ms;--fds-duration-long-in:500ms;--fds-duration-long-out:350ms;--fds-duration-extra-long-in:1000ms;--fds-duration-extra-long-out:1000ms;--fds-duration-none:0ms;--fds-fast:200ms;--fds-slow:400ms;--font-family-apple:system-ui, -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', sans-serif;--font-family-code:ui-monospace, Menlo, Consolas, Monaco, monospace;--font-family-default:Helvetica, Arial, sans-serif;--font-family-segoe:Segoe UI Historic, Segoe UI, Helvetica, Arial, sans-serif;--body-font-family:Placeholder Font;--body-font-size:0.9375rem;--body-font-weight:400;--body-line-height:1.3333;--body-emphasized-font-family:Placeholder Font;--body-emphasized-font-size:0.9375rem;--body-emphasized-font-weight:600;--body-emphasized-line-height:1.3333;--headline1-font-family:Optimistic Display Bold, system-ui, sans-serif;--headline1-font-size:1.75rem;--headline1-font-weight:700;--headline1-line-height:1.2143;--headline2-font-family:Optimistic Display Bold, system-ui, sans-serif;--headline2-font-size:1.5rem;--headline2-font-weight:700;--headline2-line-height:1.25;--headline3-font-family:Optimistic Display Bold, system-ui, sans-serif;--headline3-font-size:1.0625rem;--headline3-font-weight:700;--headline3-line-height:1.2941;--meta-font-family:Placeholder Font;--meta-font-size:0.8125rem;--meta-font-weight:400;--meta-line-height:1.3846;--meta-emphasized-font-family:Placeholder Font;--meta-emphasized-font-size:0.8125rem;--meta-emphasized-font-weight:600;--meta-emphasized-line-height:1.3846;--primary-label-font-family:Optimistic Display Medium, system-ui, sans-serif;--primary-label-font-size:1.0625rem;--primary-label-font-weight:500;--primary-label-line-height:1.2941;--secondary-label-font-family:Placeholder Font;--secondary-label-font-size:0.9375rem;--secondary-label-font-weight:500;--secondary-label-line-height:1.3333;--tertiary-label-font-family:Placeholder Font;--tertiary-label-font-size:0.6875rem;--tertiary-label-font-weight:500;--tertiary-label-line-height:1.4545;--text-input-field-font-family:Placeholder Font;--text-input-field-font-size:1rem;--text-input-field-font-weight:500;--text-input-field-line-height:1.2941;--text-input-label-font-family:Placeholder Font;--text-input-label-font-size:17px;--text-input-label-font-size-scale-multiplier:0.75;--text-input-label-font-weight:400;--text-input-label-line-height:1.2941;--tooltip-border-radius:8px;--dialog-size-medium-max-width:700px;--dialog-size-medium-width:100%;--dialog-size-small-max-width:548px;--dialog-size-small-width:100%;--dataviz-primary-2:rgb(134,218,255);--dataviz-primary-3:rgb(95,170,255);--dataviz-secondary-1:rgb(129,77,231);--dataviz-secondary-2:rgb(168,124,255);--dataviz-secondary-3:rgb(219,26,139);--dataviz-supplementary-1:rgb(255,122,105);--dataviz-supplementary-2:rgb(241,168,23);--dataviz-supplementary-3:rgb(49,162,76);--dataviz-supplementary-4:rgb(228,230,235);--base-unit:4px;--blue-0:245, 251, 255;--blue-1:224, 241, 255;--blue-2:179, 219, 255;--blue-3:112, 188, 255;--blue-4:71, 175, 255;--blue-5:0, 149, 246;--blue-6:0, 116, 204;--blue-7:0, 87, 163;--blue-8:0, 55, 107;--blue-9:0, 41, 82;--cyan-5:39, 196, 245;--font-family-system:-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;--font-weight-system-bold:700;--font-weight-system-extra-bold:800;--font-weight-system-extra-light:200;--font-weight-system-light:300;--font-weight-system-medium:500;--font-weight-system-regular:400;--font-weight-system-semibold:600;--green-4:120, 222, 69;--green-5:88, 195, 34;--green-6:55, 166, 0;--grey-0:245, 245, 245;--grey-1:239, 239, 239;--grey-2:219, 219, 219;--grey-3:199, 199, 199;--grey-4:168, 168, 168;--grey-5:142, 142, 142;--grey-6:115, 115, 115;--grey-7:85, 85, 85;--grey-8:54, 54, 54;--grey-9:38, 38, 38;--grey-10:26, 26, 26;--orange-5:253, 141, 50;--pink-5:209, 8, 105;--purple-5:163, 7, 186;--red-4:255, 104, 116;--red-5:237, 73, 86;--red-6:198, 35, 48;--red-7:167, 3, 17;--system-10-font-size:10px;--system-10-line-height:12px;--system-11-font-size:11px;--system-11-line-height:13px;--system-12-font-size:12px;--system-13-font-size:13px;--system-12-line-height:16px;--system-15-font-size:15px;--system-14-font-size:14px;--system-14-line-height:18px;--system-16-font-size:16px;--system-16-line-height:20px;--system-18-font-size:18px;--system-18-line-height:24px;--system-20-font-size:20px;--system-20-line-height:25px;--system-22-font-size:22px;--system-22-line-height:26px;--system-24-font-size:24px;--system-24-line-height:27px;--system-26-font-size:26px;--system-26-line-height:28px;--system-28-font-size:28px;--system-28-line-height:32px;--system-30-font-size:30px;--system-30-line-height:36px;--system-32-font-size:32px;--system-32-line-height:40px;--yellow-5:253, 203, 92;--barcelona-large-screen-breakpoint:748px;--barcelona-large-screen-max-width:620px;--barcelona-large-screen-padding:344px;--barcelona-threadline-column-width:48px;--barcelona-post-horizontal-padding:12px;--barcelona-quoted-post-horizontal-padding:16px;--barcelona-carousel-gap:6px;--barcelona-lightbox-horizontal-padding:92px;--barcelona-primary-text:rgb(243, 245, 247);--barcelona-secondary-text:rgb(97, 97, 97);--barcelona-primary-button:rgb(255, 255, 255);--barcelona-secondary-button:rgb(16, 16, 16);--barcelona-link-text:rgb(24, 163, 254);--barcelona-error-text:rgb(255, 48, 64);--barcelona-primary-background:rgb(16, 16, 16);--barcelona-elevated-background:rgb(24, 24, 24);--barcelona-secondary-background:rgb(10, 10, 10);--barcelona-tertiary-background:rgb(30, 30, 30);--barcelona-navigation-background:rgb(16, 16, 16);--barcelona-dialog-backdrop-background:rgba(16, 16, 16, 0.85);--barcelona-primary-outline:rgba(243, 245, 247, 0.15);--barcelona-media-outline:rgba(243, 245, 247, 0.2);--barcelona-threadline:rgb(51, 54, 56);--color-scheme:dark;}</style><style nonce="HLIQI2y8"></style><script nonce="HLIQI2y8">__DEV__=0;function envFlush(a){function b(b){for(var c in a)b[c]=a[c]}window.requireLazy?window.requireLazy(["Env"],b):(window.Env=window.Env||{},b(window.Env))}envFlush({"useTrustedTypes":true,"isTrustedTypesReportOnly":true,"routing_namespace":"barcelona_web","scheduledCSSJSScheduler":true,"ig_server_override":"","compat_iframe_token":null});__annotator=function(f){return f};__d_stub=[];__d=function(id,deps,factory,special){__d_stub.push([id,deps,factory,special]);};__rl_stub=[];requireLazy=function(){__rl_stub.push(arguments)};now_inl=(function(){var p=window.performance;return p&&p.now&&p.timing&&p.timing.navigationStart?function(){return p.now()+p.timing.navigationStart}:function(){return new Date().getTime()};})();_btldr={};qpl_inl=(function(){var data={};return function(i,n,t){if(!i)return data;if(!data[i])data[i]={};data[i][n]=t||now_inl();}})();qpl_tag=(function(){var data=[];return function(t){if(!t)return data;data.push(t);}})();(function(a){function b(b){if(!window.openDatabase)return;b.I_AM_INCOGNITO_AND_I_REALLY_NEED_WEBSQL=function(a,b,c,d){return window.openDatabase(a,b,c,d)};window.openDatabase=function(){throw new Error()}}b(a)})(this);</script><script>qpl_inl("7252766176843880442","htmlStart");</script>
+<script type="application/json" data-content-len="82" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766176843880442","htmlStart"]]]}</script>
+<script>qpl_inl("7252766176843880442-server","htmlStart",106);</script>
+<script type="application/json" data-content-len="93" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766176843880442-server","htmlStart",106]]]}</script>
+
+<link type="text/css" rel="stylesheet" href="https://static.xx.fbcdn.net/rsrc.php/v3/yD/l/0,cross/8J4Vh7Dx9_0.css?_nc_x=Ij3Wp8lg5Kz" data-bootloader-hash="3unTLaW" data-p=":2" data-c="1" />
+<link rel="preload" href="https://static.xx.fbcdn.net/rsrc.php/v3/y0/r/E6KZsOw-TyZ.js?_nc_x=Ij3Wp8lg5Kz" as="script" nonce="HLIQI2y8" /><script src="https://static.xx.fbcdn.net/rsrc.php/v3/y0/r/E6KZsOw-TyZ.js?_nc_x=Ij3Wp8lg5Kz" data-bootloader-hash="CcM+LCX" async="1" data-p=":1" data-btmanifest="1007796774_main" data-c="1" onload="_btldr[&quot;CcM+LCX&quot;]=1" onerror="_btldr[&quot;CcM+LCX&quot;]=1" nonce="HLIQI2y8"></script>
+<link rel="preload" href="https://static.xx.fbcdn.net/rsrc.php/v3i1Vd4/y0/l/en_US/9NbTpxFQDN_sHUpS5HkpnGVK1i3Cuen-71Vx1-9lxcVHHr6NpeIaFU7.js?_nc_x=Ij3Wp8lg5Kz" as="script" nonce="HLIQI2y8" /><script src="https://static.xx.fbcdn.net/rsrc.php/v3i1Vd4/y0/l/en_US/9NbTpxFQDN_sHUpS5HkpnGVK1i3Cuen-71Vx1-9lxcVHHr6NpeIaFU7.js?_nc_x=Ij3Wp8lg5Kz" data-bootloader-hash="hOjEt0H" async="1" data-p=":3,11,8,5,24" data-btmanifest="1007796774_main" data-c="1" onload="_btldr[&quot;hOjEt0H&quot;]=1" onerror="_btldr[&quot;hOjEt0H&quot;]=1" nonce="HLIQI2y8"></script>
+<link rel="preload" href="https://static.xx.fbcdn.net/rsrc.php/v3ij4U4/yq/l/en_US/kZT9Qdvtv8D.js?_nc_x=Ij3Wp8lg5Kz" as="script" nonce="HLIQI2y8" /><script src="https://static.xx.fbcdn.net/rsrc.php/v3ij4U4/yq/l/en_US/kZT9Qdvtv8D.js?_nc_x=Ij3Wp8lg5Kz" data-bootloader-hash="L5R7p5D" async="1" data-p=":9" data-btmanifest="1007796774_main" data-c="1" onload="_btldr[&quot;L5R7p5D&quot;]=1" onerror="_btldr[&quot;L5R7p5D&quot;]=1" nonce="HLIQI2y8"></script>
+<link rel="preload" href="https://static.xx.fbcdn.net/rsrc.php/v3iQLo4/yt/l/en_US/gQS6jq0A8uW.js?_nc_x=Ij3Wp8lg5Kz" as="script" nonce="HLIQI2y8" /><script src="https://static.xx.fbcdn.net/rsrc.php/v3iQLo4/yt/l/en_US/gQS6jq0A8uW.js?_nc_x=Ij3Wp8lg5Kz" data-bootloader-hash="L6Tx9we" async="1" data-p=":7" data-btmanifest="1007796774_main" data-c="1" onload="_btldr[&quot;L6Tx9we&quot;]=1" onerror="_btldr[&quot;L6Tx9we&quot;]=1" nonce="HLIQI2y8"></script>
+<link rel="preload" href="https://static.xx.fbcdn.net/rsrc.php/v3idE44/yr/l/en_US/1DwJ8zL6B7E.js?_nc_x=Ij3Wp8lg5Kz" as="script" nonce="HLIQI2y8" /><script src="https://static.xx.fbcdn.net/rsrc.php/v3idE44/yr/l/en_US/1DwJ8zL6B7E.js?_nc_x=Ij3Wp8lg5Kz" data-bootloader-hash="WfD8LHV" async="1" data-p=":10" data-btmanifest="1007796774_main" data-c="1" onload="_btldr[&quot;WfD8LHV&quot;]=1" onerror="_btldr[&quot;WfD8LHV&quot;]=1" nonce="HLIQI2y8"></script>
+<link rel="preload" href="https://static.xx.fbcdn.net/rsrc.php/v3/y5/r/5qKf_cCaYht.js?_nc_x=Ij3Wp8lg5Kz" as="script" nonce="HLIQI2y8" /><script src="https://static.xx.fbcdn.net/rsrc.php/v3/y5/r/5qKf_cCaYht.js?_nc_x=Ij3Wp8lg5Kz" data-bootloader-hash="z6fuRko" async="1" data-p=":20" data-btmanifest="1007796774_main" data-c="1" onload="_btldr[&quot;z6fuRko&quot;]=1" onerror="_btldr[&quot;z6fuRko&quot;]=1" nonce="HLIQI2y8"></script>
+<link rel="preload" href="https://static.xx.fbcdn.net/rsrc.php/v3iT0g4/yh/l/en_US/pjkq_l5ea-y.js?_nc_x=Ij3Wp8lg5Kz" as="script" nonce="HLIQI2y8" /><script src="https://static.xx.fbcdn.net/rsrc.php/v3iT0g4/yh/l/en_US/pjkq_l5ea-y.js?_nc_x=Ij3Wp8lg5Kz" data-bootloader-hash="f2ZV5tU" async="1" data-p=":26" data-btmanifest="1007796774_main" data-c="1" onload="_btldr[&quot;f2ZV5tU&quot;]=1" onerror="_btldr[&quot;f2ZV5tU&quot;]=1" nonce="HLIQI2y8"></script>
+<link rel="preload" href="https://static.xx.fbcdn.net/rsrc.php/v3iJXW4/yk/l/en_US/sG_RutKVqwE.js?_nc_x=Ij3Wp8lg5Kz" as="script" nonce="HLIQI2y8" /><script src="https://static.xx.fbcdn.net/rsrc.php/v3iJXW4/yk/l/en_US/sG_RutKVqwE.js?_nc_x=Ij3Wp8lg5Kz" data-bootloader-hash="DJHbu96" async="1" data-p=":21" data-btmanifest="1007796774_main" data-c="1" onload="_btldr[&quot;DJHbu96&quot;]=1" onerror="_btldr[&quot;DJHbu96&quot;]=1" nonce="HLIQI2y8"></script>
+<!--EF-->
+
+<title>&#064;joyqiuu • A long, long, LONG day and 10M users later… P92 server signing off for the night 🫡
+&#064;zahanm &#064;... • Threads</title>
+<script>requireLazy(["HasteSupportData"],function(m){m.handle({"bxData":{"1160057":{"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/y7\/r\/s_LXY1yMsCT.svg"},"1160058":{"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/yN\/r\/MnQWcWb6SrY.svg"},"1160060":{"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/y5\/r\/Mszq4yIBziR.svg"},"1160061":{"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/yu\/r\/Ddk-AuWE7VS.svg"}},"clpData":{"1744178":{"r":1,"s":1},"1814852":{"r":1},"1836368":{"r":1,"s":1},"1838142":{"r":1,"s":1},"1743656":{"r":1},"1744234":{"r":1},"1744251":{"r":100,"s":1},"1744552":{"r":10000},"1828905":{"r":1},"1829320":{"r":1},"1829321":{"r":1},"1843988":{"r":1}},"gkxData":{"709":{"result":true,"hash":"AT4q9UstE5aF79UwHMk"},"708253":{"result":true,"hash":"AT5n4hBL3YTMnQWtuxs"},"1099893":{"result":false,"hash":"AT5kly2LSZV_DKGRDRg"},"1224637":{"result":false,"hash":"AT7JRluWxuwDm3Xz4tY"},"1263340":{"result":false,"hash":"AT5bwizWgDaFQudmcE4"},"443":{"result":false,"hash":"AT4h1HaIxHYZn6IY51A"},"1393":{"result":true,"hash":"AT42aEHIHsK_NxGQ_cE"},"1426":{"result":false,"hash":"AT4rfyyNv13TbBZ8LRE"},"1475":{"result":false,"hash":"AT7kEzfGQyTYdZJbjqs"},"2772":{"result":false,"hash":"AT5Eu244WIce7iwqDaE"},"2954":{"result":false,"hash":"AT6DTo5oWw4Gi2ycp6o"},"3752":{"result":false,"hash":"AT6eS5UTkkMp_xbP_hM"},"3831":{"result":false,"hash":"AT4W23lQ0XxAZniMkA8"},"4075":{"result":false,"hash":"AT4_ZQi0sTjSt-RxbWw"},"4180":{"result":true,"hash":"AT6ZBPDX_t1nVduVOkc"},"4635":{"result":false,"hash":"AT66qmoOXbBCI2VnXNY"},"4639":{"result":false,"hash":"AT6fuwnCZ25Hjx2lOao"},"5840":{"result":false,"hash":"AT4yZS6129LYTjoco8w"},"6017":{"result":false,"hash":"AT6VK36mN-p0kfQgYTg"},"6196":{"result":false,"hash":"AT79LaB9hNdhYgx4NVA"},"6751":{"result":false,"hash":"AT4_Q5AqWq6jnR2CD5Q"},"6830":{"result":false,"hash":"AT6WoYIwb5Y6x5699qI"},"8126":{"result":false,"hash":"AT4U7qG06p9sF6u8Zuk"},"8232":{"result":false,"hash":"AT7JZiM_jgftdVDLOH0"},"676837":{"result":false,"hash":"AT4N8wBZA8ctCdHwb6w"},"678680":{"result":false,"hash":"AT4Y-6Ul9ZZckQZnOaY"},"950768":{"result":false,"hash":"AT434vVJ93bUu52yy7w"},"1018547":{"result":false,"hash":"AT5OYJhHTg1FexdZ3Pc"},"1167394":{"result":false,"hash":"AT7BpN-tlUPwbIIFLgg"},"1217157":{"result":false,"hash":"AT6B7YmllOsArnK6zbM"},"1293035":{"result":false,"hash":"AT6f-b10jzF6b9M9WEc"},"1407308":{"result":false,"hash":"AT6g20u7kv9f37jOEls"},"1501502":{"result":false,"hash":"AT7iuJThg2U6GkqT1i8"},"1537962":{"result":false,"hash":"AT6YWgGMjb0fUWs1KVY"},"1554827":{"result":false,"hash":"AT7zueGLhGo0cT5xg4w"},"1738486":{"result":false,"hash":"AT4cX37oQco6DwhUGJk"},"1778371":{"result":false,"hash":"AT6HtWXGEXFDQ5JjiWk"},"1902022":{"result":false,"hash":"AT7WD_stYlEMqW8c7MU"},"1914427":{"result":false,"hash":"AT7r7RL9lwTjh6wx8uw"},"227":{"result":true,"hash":"AT5yXnJxXfkiddJSOFY"},"229":{"result":true,"hash":"AT6ACjjf9sN9o2h-BKw"},"231":{"result":true,"hash":"AT5RtBjo7qezdTuhaVk"},"233":{"result":true,"hash":"AT7HvkjZGXZeuumhbZU"},"235":{"result":true,"hash":"AT4gizq47dTbAJ5jPOw"},"664":{"result":false,"hash":"AT7734XsKztSKm10GZU"},"751":{"result":false,"hash":"AT7TXp0TTlIecYKJEe4"},"1226":{"result":false,"hash":"AT4QupJJbI3j_Appt3k"},"1292":{"result":true,"hash":"AT6KRRnA6-Re_k9Kfi0"},"1459":{"result":false,"hash":"AT60sF8lwSNwCEwZLk0"},"1485":{"result":false,"hash":"AT4WNLTpxBYFwess_hQ"},"1682":{"result":true,"hash":"AT4jNPAkujFdMYkD5V4"},"1705":{"result":false,"hash":"AT45JGOqDPcAMbr3VmY"},"2030":{"result":true,"hash":"AT77OC0fYHb5VHYBjY8"},"2254":{"result":true,"hash":"AT4NaskuQ6OBD3qCSDg"},"2448":{"result":true,"hash":"AT7EwlgtPzpIx-1QKjE"},"2458":{"result":true,"hash":"AT5Dy7G1iL0c6SKnNnM"},"2581":{"result":false,"hash":"AT4iw_6E9ISmVfQLDuQ"},"3140":{"result":false,"hash":"AT5-c9fjLEKqfwwA9BI"},"3400":{"result":false,"hash":"AT5LV5sAIJng7-zcOX0"},"3598":{"result":false,"hash":"AT4R-V-zd8OVuUkT52E"},"3773":{"result":false,"hash":"AT7VZ_gM5R4NLSLmhLg"},"3824":{"result":false,"hash":"AT6BtgsnnuM5TALJ5wY"},"4527":{"result":false,"hash":"AT5vKkT8tv-GUeP85Go"},"5205":{"result":false,"hash":"AT4tOojq3gzI7IFZo30"},"5223":{"result":false,"hash":"AT7mncAklIbGZfnPoj4"},"5403":{"result":false,"hash":"AT5zCIAplAr2jSMZlz0"},"5574":{"result":false,"hash":"AT7t8_-pqYHCqFfTw1I"},"5735":{"result":false,"hash":"AT55xkQWRLxMd5TjkGA"},"5945":{"result":false,"hash":"AT75NnnIUkzdzhWfKKc"},"6810":{"result":false,"hash":"AT6JsT-epn3stgDmy1Y"},"894204":{"result":false,"hash":"AT7MWh7MKvvrwCN_BcY"},"919810":{"result":true,"hash":"AT7obFlFcaXOvTBX1q0"},"938288":{"result":false,"hash":"AT60802ujA6R5kZSXWc"},"976093":{"result":true,"hash":"AT6Tnn67lHNTT5CpmPc"},"1070695":{"result":false,"hash":"AT711tHzdMfRy3F3nEM"},"1133447":{"result":false,"hash":"AT6gnU9itzgx89tyfK0"},"1151941":{"result":false,"hash":"AT4VtFw2xNGXhISyfuE"},"1163255":{"result":false,"hash":"AT4p5wUSMH_kRx_dEvk"},"1243442":{"result":false,"hash":"AT6H-KKvL_2kq8U2WKQ"},"1249968":{"result":false,"hash":"AT5AlPmWHlKvEcrj14I"},"1250838":{"result":false,"hash":"AT7z1NkFlLfUKocWeC0"},"1299319":{"result":false,"hash":"AT7zRIpVRWl8hiUYhbw"},"1352928":{"result":false,"hash":"AT7bJwS1VNOxBUhsMcg"},"1382775":{"result":false,"hash":"AT7D5sd_gmE2NRtmQjw"},"1383502":{"result":false,"hash":"AT51zMR8DxFUUVJ8JvI"},"1388683":{"result":false,"hash":"AT63PwzAsKGj12Q6PKM"},"1470120":{"result":false,"hash":"AT7hoNhuKStHslT5EYo"},"1564135":{"result":true,"hash":"AT7iTOcLJuIIpIfCc_o"},"1613919":{"result":false,"hash":"AT7bXvwviv8GGfF3tak"},"1616314":{"result":false,"hash":"AT6Zl4nWIeZ_AYDr18A"},"1626006":{"result":true,"hash":"AT4_TZlW-MUS84RENGQ"},"1642984":{"result":false,"hash":"AT71oE1xc4ID8xb4EsM"},"1657807":{"result":true,"hash":"AT5GneaEpFhH-amrrt8"},"1661552":{"result":false,"hash":"AT5w2VaBMxRPfMyWCds"},"1690028":{"result":false,"hash":"AT7vV-7CyHNNfGJoWMw"},"1703328":{"result":true,"hash":"AT49L03pP2X9Hmsn-5Q"},"1707273":{"result":false,"hash":"AT5oTb36da_qc9QI0sE"},"1721477":{"result":true,"hash":"AT70IfYeUvLOKY5Y4Hk"},"1723588":{"result":false,"hash":"AT485K2jwU-S2ruRN0k"},"1806005":{"result":false,"hash":"AT4tOLFFU6SFy7iT8uY"},"1861546":{"result":true,"hash":"AT7TDKkMR4gPryZgyR0"},"1863055":{"result":false,"hash":"AT7ONu9dmdwXlowbfR4"},"1872325":{"result":false,"hash":"AT4WDV07rUK5enGiVak"},"1902661":{"result":true,"hash":"AT48eoL9MpGKmdHLAcY"},"4240":{"result":false,"hash":"AT6WMihLvltJm0Uj8-U"},"8594":{"result":false,"hash":"AT7Gfw9P9vYQkIA27p4"},"1787898":{"result":true,"hash":"AT5WGsLz9GCUYq8UOeQ"},"1924645":{"result":false,"hash":"AT7xqjINkJcipyjZSVw"},"517":{"result":false,"hash":"AT6nhZGTa49R4qYbToQ"},"1703425":{"result":false,"hash":"AT5M5FNRBAvWiZomq70"},"201":{"result":false,"hash":"AT4alnh_4NnV8Qd_dso"},"2257":{"result":false,"hash":"AT5Mac_Q9jALVGtdMLk"},"6361":{"result":false,"hash":"AT6feNNR6dFIlUi3qfI"},"6862":{"result":false,"hash":"AT68ofpcSp7CAzMdpd0"},"7518":{"result":false,"hash":"AT4evLW9Sc-7F07WQm8"},"8003":{"result":false,"hash":"AT5keQOwqmgpohoa7Es"},"1401060":{"result":true,"hash":"AT5aetN5Gb3reIXV4Vs"},"1596063":{"result":false,"hash":"AT7JHuDWtaOqRuBUht0"},"1778302":{"result":false,"hash":"AT65fisZhmc2X92EB8g"},"1840809":{"result":false,"hash":"AT5nYctoTsr7alRidIE"}},"ixData":{"478233":{"sprited":2,"spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","_spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","w":20,"h":20,"p":"0 -88px","sz":"auto"},"502062":{"sprited":2,"spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","_spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","w":20,"h":20,"p":"0 -67px","sz":"auto"},"512647":{"sprited":2,"spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","_spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","w":20,"h":20,"p":"0 -25px","sz":"auto"},"514454":{"sprited":2,"spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","_spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","w":20,"h":20,"p":"0 -46px","sz":"auto"},"701592":{"sprited":2,"spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","_spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","w":8,"h":8,"p":"-13px -109px","sz":"auto"},"702721":{"sprited":2,"spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","_spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","w":8,"h":8,"p":"0 -131px","sz":"auto"},"897949":{"sprited":2,"spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","_spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","w":8,"h":8,"p":"-9px -122px","sz":"auto"},"1739808":{"sprited":2,"spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","_spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","w":8,"h":8,"p":"0 -122px","sz":"auto"}},"qexData":{"415":{"r":null},"723":{"r":null},"49":{"r":null},"234":{"r":null},"768":{"r":null},"858":{"r":null},"932":{"r":null},"954":{"r":null},"976":{"r":null},"1022":{"r":null},"1637":{"r":null},"1638":{"r":null},"1639":{"r":null},"1640":{"r":null},"1641":{"r":null},"1642":{"r":null},"1643":{"r":null},"1644":{"r":null},"1645":{"r":null},"1646":{"r":null},"2085":{"r":null},"2086":{"r":null},"2087":{"r":null},"2088":{"r":null},"2089":{"r":null},"2090":{"r":null},"2091":{"r":null},"2092":{"r":null},"644":{"r":null}},"qplData":{"1217":{"r":1},"2410":{"r":1},"6702":{"r":1},"334":{"r":2000},"1206":{"r":1000},"1517":{"r":1000},"6204":{"r":7},"6310":{"r":1}},"justknobxData":{"138":{"r":false},"144":{"r":true},"356":{"r":true},"450":{"r":true},"494":{"r":true},"713":{"r":true},"992":{"r":false},"1143":{"r":true},"1203":{"r":true},"55":{"r":true}}})});requireLazy(["Bootloader"],function(m){m.handlePayload({"consistency":{"rev":1007796774}})});</script>
+<link type="text/css" rel="stylesheet" href="data:text/css; charset=utf-8;base64,Ym9keS5fYW1tZHtiYWNrZ3JvdW5kOnZhcigtLWJhcmNlbG9uYS1wcmltYXJ5LWJhY2tncm91bmQpO2NvbG9yOnZhcigtLWJhcmNlbG9uYS1wcmltYXJ5LXRleHQpO2ZvbnQtZmFtaWx5OnZhcigtLWZvbnQtZmFtaWx5LXN5c3RlbSk7Zm9udC1zaXplOnZhcigtLXN5c3RlbS0xNS1mb250LXNpemUpO2xpbmUtaGVpZ2h0OnZhcigtLXN5c3RlbS0xNS1saW5lLWhlaWdodCk7bWFyZ2luOjA7b3ZlcmZsb3cteTp2aXNpYmxlfSNib290bG9hZGVyX1VVV1NzMDd7aGVpZ2h0OjQycHg7fS5ib290bG9hZGVyX1VVV1NzMDd7ZGlzcGxheTpibG9jayFpbXBvcnRhbnQ7fQ==" data-bootloader-hash="UUWSs07" data-p=":0" data-c="1" />
+</head><body class="_ammd _-kb"><div id="barcelona-splash-screen" style="position: fixed; top: 0; right: 0; left: 0; height: 100vh; height: 100dvh; z-index: 3; background-color: rgb(255, 255, 255)"><img class="img" alt="Threads" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAYAAACtWK6eAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAEW3SURBVHgB7X0LkGRpVtY5/80eGnZgcyPWdcZdmewQ1l1FpnrDUEDDydIYYzXQ6Q4FYQPtah8Riuh0G0JAhFpVYsQqPqZbDTBWtKpjVXxAdA+BsAGBleMqu4I6Nb5YBe3cEGSBhamFffR05f2P53+c85//VvVM707no7ru6c6675s37/2//zuv/1yAXnrppZdeeumll1566aWXXnrppZdeeumll1566aWXXnrppZdeeumlCEIvc5ObQxoeHn5qBM6vNd4NPcITjvwQCIYOYYjkRy4+Ah/+8nx6IEjE0/CP+FA6cIgHAHHdFHlflmmDdMC7fQJbnJ5paAowm37lncen0MsDlR4gD0ACED4Dnx6DpxESPsmNf40bNM8zEAhiQ8cwRcqNH8DxuvA/Tlma8CfvC7xPg6j7pk9a7zABJwEpHePyUwz7M+D2eXHqwL/koNmHM356/lNv2YdePifpAfI5yD8d3l0j8GP0+CQiT7n3l8bttFGHxgoVIMIyxOUMGDAAMGBxeb0CIh9TljM4UJiGj0mHpu+Q74J8LCGzEO3z8S8wW00effTO/rmDcwfQy2tKD5D7kB1miAYOL3Cje4qALvBNG6bemnKvDRkEBRCsPjFj5F49rENQUAhQXD5/2C6NWlWsyBS+0/B5m0/b4v6EeVsBWgRFVNkykCCzD4BZjhcw4dM878BN3n7YM8y9pAfIPSSAAtzhRuPxGW5M49h4Q4/tU+NzofHmHjoBw7CGqkkZKHl7AkFWkRQgRu0SIEEBSlLDkjgAcwwU0EW8kD7MYsNAVttAwQpgzi/nJZgGwLCqduPc7PEJ9KLSA6QjO28+HDctbnLnPBaWcFQavpOGnhumU5Wp7CONT7cpkMgY4XbeMAuoLaHfkwx0UdXSeiThC5/BmdAijCM2j8wDCChQAQUCMhDwxLNM+bhbfoDXz/VGfw+QIDsjGrpfgWfZrrjCjXgoQHC5YaqhnXtu6cktMERNKvvXdgjEfXzVm1vmkcZa1iWmAgOscBY15sXol2Wo1CfT+BOY7INWQGCGBJllKo2CVbmJh/bGF7dv24VTKqcaIO9/M41bgkvcGDek0Tid5saPoGAJ4hQk9T7swapZBjMgKmO8tllUFbKMUm3rqEQWOFldq1QrKABx0vAzgyV4idol62pVCwTI+RyynWenfD3bj8PpA8qpBMjOr6E1bmzPcQMfg2GKZFCnRhV66mJ0l/Uu2xUFSIUBErOkdWR6ftf1XBFU9kfwTEEFEioGtXH1Qv5ubeiqgqEBQmGv8FdULrFbhCVAVDVZr8uGQeyxaYaB4rffAl+8C6dEThVAdh7j2EQLm9zoNtCqUABVg3ddm+Ie653EILKnKkixO2oVyjIUdO2R3MF37RKwQMnLwk66joxtQZYtoGYgAsMjWfT6QfeT9WK/gNpAYGyZEJiE7TefAqCcCoBEG+PT8Cw3zCvcgKKLNjKEep6oMqLt+gQCSu5VAOjGN5JN4KsGX4BVACDuXmc8TnZbaeyU1TljpCN0PFOkXCEABjA9/6uyAXTWk1lfjgOyUKLO9+p5pvzZftNDDJSHHiDMGhzQgx1uaCMXYwgJHHX8whrbBjRWtZJjsk1SAoBeYxrO9LRomKQCkwEOdGwTBBMlT7umZVHB1FVc2EA8X2BiLQIcyKwCsp9p80g1m9RAKd+fT16vhyP77nrwDJRzU3jI5KEFSGCN5lOwyb/wSjGqrcHNQCEA63VqwHqqzLzYHNCxS8DYI9a2sCqUMIJRr5QxEDTyDmSN9Kwq2WNUDYsrlEEkZaWwh2zHqpFjp1GroW7tEsNuBWRZFEBmPfpyDqAQmd9+I5y7Bg+RPJQAeT+zBgXWABhpY8/TyB65x07zlk18AU1uZE57f8qGd2KN2k1rzpFduYVNUkQ9ebkMCDIbWEMdTUS9BkMxyovRHq6yNvgBjDs3um0RbIAyr6rODVat0uuS77LNowMwCx6wbAiTBvDy5z8kbPLQAeT9b6FN/lFbpUdHtSWwAxAJ9jXGBqndvCbeASY2Eht0sEsMq8T1HrpJidhhE0kw1MBgtm8gq27KFgIGE8PoGt0WFB3b4Mh+ehZVuXIzN2ymLEFHz2VBVO9gbSBR/GBK0G4/Cm/fhRMuDw1AbrJK9anPwE1+PmOXI9ES6ZZAnjTymAICVK2rbY4Cmq6NovZC5QXL+U/W+DbHgqzL1+py9Bty+jp/5wFvPABlnyQYM9vj9w55yh8cFU9V2pYYAStGcNEVLIKqrh1Rs0qDzjaJzJv1GTiU1TC0epthIoKiGqb5qHpufR586TacYHkoAPI97L7lgN+eVakKE2Blf9QGOGUvFGX1C2sgKIgKoArYii2Cxq4paexwwA11yjvs+7b9KEIzbaCd8k5TOHvn4PVk0/7c2Z8bDWYz/q2zITo34lUjR+5JBtha8NIRFG+cakn5XohSldbpn7ytqEple5KaPeiYhlMDsBxH+x7OXDypKteJB0iwN5yHm2kAkgVHsQOK10oajo9guDdrFK9UjG8QVHGQArLCFmEcBsDsBV69f+ZMOzl3sJw8ppfh9hAGsMbXy0yKT/KljTFkH5t9qodujHLI4NZ9lEgEFGlFYQtzwqxmKQCtm4w7Cg+0/vnwzimcMDnRAPlnj9Elfgi7NiinNgaAskZjVCQHdbzDWUDk+XIOXq92BlUsAknPfh69v3V2MNg/d/CmlR1f8ckzt9eghTGrls+wzTEunqckx/X8CgjDMhYIAhVV97BzDu6EClvFHohVSLf+CLz9RKXWn1iAsFq1yc9qy8YfpJGrOhVsEO9j7KKB5GodgPE6KWigNtIVUJgTDFVlO+BGcZ1BM3nnJ980gRMoxAxzp2kvON+ENP4LdkuQ4rnqeqnKfOXbwqPYEMaxXjJAsfVgA+GdN+CEyIkESAAH3/MtUYsEEAClwTvT4G3K+tGUkmQ0W9uitjP8ATeaW861N955cDJBcS/5DNwesV005l/Jnj8apbU1QGqmEPWqGPGgawvLlPwv3/nGtOzAnRiQnDiARHAAbRX1CUACaqIaVbGMzBqANbsIKKw3qqHsqUmAOiCk64+Cv7bK6tODkkP4qaB6bfDsJTTtv24gXaqgMu1a9sbzVQNFgccg+bKVB8mJAsi/eCtdopZ2xduEYBu8YQ0LBjXCvcm/qlmlilcElysAA2N2KoDRFVbBRh4OmZ3xkqw73kZJe9dTma+XqTL2yz4YmWS1QXJiAPIv30pr1MKLNugXos8hvyoCAsQl6xUwNudKjPPj0tlzBJxjEXj9UX86gdEVgp8c8R3aggiUezHHccu16oUan7R2SRKM6Sl+HeH8yhruJwIgNznOcUj0It/soTbyYHhTHeRroLh1HdnYhfFSxeNAEw9z0O/WgGZX2caYQi+VEPw0G/Kz53h2ZNcWEXoQnSy7ewmKq9cwBx4FU6j5dZ5BMoUVlJUHSAQH0B67KEfopVEXRmhIo7a1FwugBgYUdcqRsA1Hsh1d/i0f/8IJ9PKqwoyyxZNNuyaJGBo1qxDV6lQR3wk6xumUT7K+iiBxsOLSIj3HzDByOf8pRbx9ZIukJnlVlxplC5+9W5QzcdO+AUyNjN1Af6P1h+d7cNyfsNdpiyfnUmO2QZRggAtrkH7SOtlGGlfCygWsnxF/dmAFZaUB8n2PtZvcmC8IGzTywQSS5Iki3YZY5iMwqIAnLidf/AGD5OqX/9IbN873tsZnJQySKcJvCiDZDqxB4QNdUHRtDSrBQjiOVWTqxwQ/8RysmKysinXzbTSG2WwP0XipMj2X5W58wwKiRMNLBi9M27a9yMDoC6W9TiH47xsEnhs0Do829hJDude2e4MleLZ+68p4tlYSIDcf+8wI8cweX9yoZNyWKLdMkzHededSx/7IMQ8Gx2Hr18/3hvgDE4IXR/wU9kAN+PsBiMwfxyJitHs22r9yCisgK6liNXAmqFajZD8Ye0LUJ143yGpUsTWoUsOSAS82COwzOM734HiwEoxqhHY9FHHAys6Ajlr1WX2Gq2SPrBxAvv+tdzcQ241oiKMY4tLwEyBCZDymqiMcBUWepn2i3bH/hkcjc/T2xhwkeZ78Ojdqo7Z6sAb6a7OH/cSo+5jgx67ACshKqVg/xKqVRxdVq+64jCbbHd1lzadCUKPcFFvY/4JHYf3ctAfHvIXVrdDzB3Vr7Sgg7PxrgEVcxtHoH5xbtqq1UgyCTfMsM8OoBPcoqlIDqN23kR3ychr05Iv7Vj5I0x4cixNmkoMQy0huYJF7scQ9PpiBoRiaLV3VWhkG2Rt9ZnT3FbwNUEfHrWGu2bamkIIG/iQqHtUsDgA2sP7Oj/U2x6IlGO6sJu2BZgd73VKmnXmb6EhHjPqrCL9raZVSVgYgP/L4nXBTx+LKjYOfchZDybPqAAWMG1fBgwc4gPM9OJYnBB8a8dN7EdJYel1r96hYQzf7Y/b1QQNgVWt9KZrASqhYP/rWT24wMMZNjoqLYY5RnfLRG1USDFNEXQKFYrCn5MSgWrVXe3AsV5LdgBePGurZCI/lYKiMUDw2yKiGPoPMb8KSZCUYZPL4p2+zzTAS5oAqd8pXhRSkCAOSvKCmDLfl7dff8YtvXgnvRy+RSbZA87eoztk6okrJ1LKI3dYEFpnCgmXpAPm3zB7gcQexHrxkqxOWKocJIMcFDvkzffsvvPkc9LJSwiCJqnOtTh1njxwHjLSc0+YnSE+vw4Jl6SoW2wybDUJWrercKgkKStZu3AdtPlbZp3WHC795vdyXXIY47kM8VKJ22elxhjwUVSxAhEKu1g+NYcGyVID8e2YPbuij1NhbGKAEA30d8ONP43JCYk5CjKoXqmt3+50f618XtoqS7JF2+572yLHrIIJDEiFTinxcv3BbZKkq1n9466++yPdgTdUqqEcAyrIOibUlPVW1oulv+Plfe+JUKxpyYO3OnSF4twYUEv78kBE/tPv4WJGFe1+PofLilANFB/CGM1M8OH/iYjsE/7aoWnCcigU5dT6vyXaoFMEzbLOO8AcmsCAZwJLkJ972q2Nu72uljm0GhIln6OvNAKogYImo821Dvw0rLgkMMwZCu8ZX/RT/sDW6c3eUSoaKZwegvJMjTdNrD2QVJvXkV18Baj4cVJZ9T/CCQ7cP7SOTFKhbZWlZ1QLj+j0aCymDrHxpD3q8qGFxrPwEFiRLY5AX3/orOzzZACgMoe+4yOpVEJcrF9oXX0owkfe7de7nH7sIKygRFK/MNvhCQ7G2NfQU2UHbuxRgs5iojNOEF9TVeadYKiSZrsws5Ryh0SA+D55urUombFcIfnQLuqMSUVgi/BbfcfkCHM82szchXFxIh7AUgPxkiJof3r1tsz4FJJjTDXQZikplcqxyc6Fz51bM9qBHf2LMF8aNgJgxGBS54UccSIuvNAsbKBO0yCaqdimCqSp75eypzMkJ9yQ3sP3KXVghIdjjTqK9DYFFdOx6uhnpV9/LxUvlzrAa5slvN3BxCxYgSwHIf33bJ7Yw9CTGngCja7r8OgBhDlsTN/WokUl2v/hjj1+GFRH6wh/f4Mu7xLPjEvyKWyB5YVB/JxEAHgGIrLAAkancmQKYqH75Y47Rr4zrprxtl6c3VoVVCH54gxB31KsFtpDDUWDoPFajFg/4bp5bBIssh0He+onb/INHcpMKSHTkH5T6ut7cSNDcqwHfoMdXgD1oyIzRxkqPY32oknB3JFLcUa3SmiOT8tbZehfl27ysYQWEDpt0jg9AcbCN7e/YhRUQBsltSuPQoR6jDtU8VbaZ+aTO8yLCH74Fc5aFu3l/6m0vj9kzM9KxG5hiG2E6wFxKFEt8I4ICSypJWke7ywYHDT808m/88B60ITHPj4s/P3+w5Wn+oHFnyjzalIvyQZB5e64SM6Dqe2zDkgsj3Vc/5Ed8nTsE/+52ypNatrTbqIb4cR9hS6p/D4rzJv72Z2EBsnCAsGZwSaqMlEYP1ahBKRhdxpSnwKAY783A34AlCn3Rjz9L3r2YWMMAQho12t6u27ChBkxsBF0w2GVzHgEO1iDC6vhXu3IGChwySD64CUsUhN+3C6loHNj7QDoNHUvpFOR+ld8Z148Jbg5hzrJwgIQqJXEkIKZs3RRBN5VIAns4SNP48QUYaYTh5PGf+fUTWIIEzxSD4zkGwzVmtWHdUKXXlgZfgwRjFZDqAcO9es8KFCbyTHkeu+yCwlg+799CDbIu4/gtgsnNZDQvS9rr9X0AKB2JAYZ0AkfuU1j/6bnn3S0UILd//ccvOMBhYgQp25NAkUqJSn3cXKInq15xrEe+SeSWwx5BpQK4uweuvZIeUMvXKQ0x7gG16tTGT+oNxYbKXjplgnw8dh+8UZuijinASN8jxirZcRRx3w7T6PngKDOlVx+8yCAZwVJkdi2wCOV7Vu5TBWR9QVF3fbbWnoI5y0IB0iA+Iw0f8wjABA5JHSFlFlsVMYEoRc0f/9nFv7SeHmNwIOwBcrAv9HJoezqrBtQfUpVgpmCgrv2A/ugHqHO+0uhLVLlWPyo1TcWA5NiU8mAow94yQBI8UB5mN0JHI8wY7lFSq71mcR8PDN1/TPD+McxRFgqQ+FowKLaGGN9JfSrAiK5dAQ56dfXyigksWCI47oax1kF/D1LATJiYJDX+2RFGQPTGhemPNvojapDZl2rViCqVipInRy4ypUGXeayPvQc45BpGPF0KSPiSb1mgF0B0OpEKIJ375YKDZK7XuBj5udEvjrnBjNCoVQ34okblhpcyelu1OUQNSzck6K2LkwQOn8FhG2hSnRANKNIRxlA3xnTV49uH3ZVsP8ixhhWww07Hfzo9Ltprei2QtAu3SZhFJtwmJoktjgOF/W3S+cg9zKzo6SmYoywMINyfXmiyS7fkU2GxO9COQyewNZailwtp+pafPbewiogRHIctq1UZHNZmgJJIpz10ZThTeYjCMKo6ZVBhR72qjgNlCWuDHN9wOsxTqSBUXoiSR6NRxytm/q3xte3AooXo+VcBLhQ11N7TkuWbvFk7cwP2wgAyIHoqGeK5RE9kDhktKGnr3iQkWsM99jDPwyJlFhpLOyoqVOnBKDd01Ebd8RoF451sj5dtEjTemCPuXDtvWAQsYLIdouCCwhKd7yrXYnrffH/jb6BuTCWuu9DCBxY8InOwWzOfvV46opamuGuXUWcbMCdZCEBeHr08ZCpdEw8VQhkY5fIDF0Mcs0sULWjCTRq4XViQ0Jtf2OSHNK57dJ/dtHHcOygbQJcNol5cemgZ8JN/izz0oKIRHscEli38UXtCVSfIx7f1dwuZWBYxkXzbQ6efVjdOvufPcaR7DRYkKV2EJjUz5uvvMkZsO611+YbjttN0PrKQdPcW7o6d7QnlAYW/VKLHlYdGvVtRpsPpYtQreuyDY2pnW6kBlWtJPbGIz0m1xpag0nBTjlT6vTmpUt+0JPsiYsgj4t/UvgS+mUIY7xFe/xaeyCu8rfHDfC6Ot7hR9DghPgkeWRWiYcyEJ/2CIlWg0KdtunN3t24elMjhDv85DwuTGWsHOE7zNXNSla8V3kUPL/A9Y+N+sI9wee65WAsBSOPYHee7aaxp3mUVQQZCVfq2jkvHCSxK/Cyw3VRyhcDaGPEZlesnzT6G0jADkBzU7Q1kH5ry87/Bu07wkxcmr3odh/feRGf+9Zp3NHbxvecQmU5f3xyvp4MapM4J0ACrC5B4njWCH7iC8NULqkd1uAs4yK8+8BnL8c+UO8nnEzDw1iIA0ZWFJCu+fO7/hYEymbYTGAhKopr2YmQHyhTVgBxd/KLpb5x7YpoIPfZDI+/dFsdgLlWDMo5JPEQwABGWsf1A2jhhGt3GT16cwAMWOhuu9XDLhYFE2tZtomNFXXBE0wK616m5Mc7OLWrcBeGN0EaYJemW9/RScAEzIKawZJk7QF4e3eYe+czL6atEZUq9MaJRW8hsCxeWG1tQs+7i2Te9aXpu4b0HvfkHr/CFbAaVJrUjr6pKMHDT5Rs9hzq9MQUVqrmKBw8eGEeu9ezNEXi3x/Q1qtp8dUlYVEHf2Y5gRvTJpnZh4y7YEzVaBUB0Ze4A+dUv+b9j39Ie2l44qyXdcQBoMjcNWPbfMP1NC9SHa6HHuOFRsxOqaug1556XQH5HWq5Zg67jL3/twmt00SPPb/HfzdTizeXYqabNl0FXVF2/ygH/3oWxyCrK3L1Y6Nl7hcaFKynLJgAUq5NgrlKCbXLrZu8W7/cCLFHwYxen+PN/cJ29UVcxlME0sQtUD5O4dOP0gH/A+jLAEa/37jNbHPu4DMcF3jSzOKR3tPW2I9H2ePzQgz/VhfjmDhBuWE+JZ0JcdFqyR4AB4r7LDc6RLlPjJ7AC0vz8xWscrTzPDW8i4zxIYxYSK/FshLfn8eNfM4ElCt65uMvXctkGLkljIuIMoXK/KxeyrwJz3EktZNzFqsr8GYT8yMUktDYD47DMd6eYAmyYWSUsuzPtwqLnryWRTX7xa9YZDNvKICUIdwBnmDkOvn4KKyB4+Id2+elelQwAtFF7vfYSK0GXwBHjVNWHhgT/agynVOZug3zqN/xU5TpxuacSUxerEXCQVS/IVUz8wSP/511vghUUeux72Chu92J8IrpN3UX8hfcszNN2v0Kf9717rD6N1UAXYx2kkASABFQoOyLwiC2CE4SvXYdTKHONg9z90v+11pJQO4Dk/iRghBVeffS2cANRzuxEWhn26Ap+LDLFOXrLja0Q4ml+4RtWDhxR8JDtkcGL/AyGtRMhTWOUSZwmSCaeWDlQ1sLovdNorM9VxTr0s1GVCgGiarVRfUL0+hE9HmEWDfW0frZUA/1+BH/h0lbDH1hRwTsByLPrMf3F5XQZLLYImuxjkqlJlckA4aj+py/AKZS5AsQ17RrGpD4BhNgcogPP8rpklzRmvzRib3UZ5ETJ3bPXmEEOkq1R2yKkSZFtZygvQWfo8FNwCmW+APHtk2CM7zSf0r0pgkOS7SQBMAMm7nPIca9XptDL65aoGjm6fowbF+o0+7I+DoF11qPlewZ50MINfRjYIWa9ullq+KpmJTC4qFLN4rKOzMtM8shPrfcM8sDE7SoI8tgQTZ03cRLUbV0gBW/WzghOmcwVIN75EartERr+LIIlql3Z3ijDVWdFtYrAaafQywOTZItwDCerU1ABo6Ty14OzCsuksSOhzNHpkvkyCB2OqAKGDDyaRbsD8jbMnzjvDtOym02hlwcrFNLKi81RVT7JjEImw0GCtsosDk6dHTI3N+9n3rHHcYJZch3aOIgd8kndjN4cF4mp5TiFXh6sDGDCsRvQ8BfpH1DVC0iHj6Q4iXX3wsIGUq2KzI1BBiF12UkaRlKrHGaWCFOaxah6GqMtDHM3GueRTdwrH4VeHqjgpy7vA5qKhsdF1u0QXhNpjzGTUML0lMncGIQb+xBz8ClFZ/Pw0zxuAh1mBkkPIvVprY68Yz/XFE6h0GPfNYKmGULbDuNoQqJckMD0ZdEcaNJ8G7eFYas5iDeYQsjCPbjH4KLgOkcptK3r0gShJC1KBj/moG4aDj2k9rtGCH9mCqdE5gYQD4cj1Ch5AERaK/kNsSoIlsol3UJsTeOn8JAKjZ4bwl0Ye4KRw+bJ+IKd+Bo2HAVmhcM273iMKkS5UoM25DS4o1SNP4zb6IveFxanSVXlD7UfBWz2oeV4CJgRh1jmUyeWV8u16vfm6YA1g1l4rcLpkDkyyOHQvmOOhCWqdHcA0PEfRtdNA/QfmrQGGm0xI3zhhRhs8ziGQz8Kv9bFxhlUS5fukwyFhQwCHT4rI5xMDpW8nk1Ga4dzUPedftyYAUcgA7sYfJTPj1WBBzMcOp0sDyeGBDYZf8//WwrnPD0yx1ysw2Fp+JQeaFyWhy3p1lSGrmqvFp5Ec6IBEkEBn7/BP+4Z/pnjaGflxpcaqFjC+b4oMGSKYPtx2+tLNRLig9A05IQZAnlRnahGURujsk818tGeGiUXrqzDPNKQ8rYGTpcdMjeAELENImoVCJPncSEyqtCwSunO8v4f+ZNTOIFCX/LtY5jhM/wrN5gdhsF2QFvEIRvB6Y1TUjyhaqV51zSvuNGx5U5Oku6jmiYJbLFBS4EJgMJAaFQlxDzylgoGyy8wnZg5d5ldYkX4xcvcADJo7j4Rm30GQnwWztK/L40jrsx6t30YJ0joS7bGQG6TDetxGvCVG6GqSaDsIQ25MCaEqKraA/KyttTmsaheETPGTavlU+S7oDAJH0OZQur09cxCKE9CMquFMmSfAqji9o3zb4RTJHNUse6KdgxJxfLZtswJc/GhW8MclFWiUXlChN6xxUYr7fDcONXrzb9aQZAbImZgWDUqUIu0QxcyC1wNCu1OfOc4qvuReE8xDRMQ28QV9U0NcbnVWd2yqpU1Q9SDVdsz0qGt0dnnxnjn6gROgcwPIO5wmDok3+mVDHtUPZY3yydD6O1/aZP87Ep8mQ5kQJDLjTm3tDwRrFBumOhF7XFZ17c2BhW2yeelbKOjfdmnZRPDSgJQQlHWSnEGizOhKXmHbPUWXgC1aRCKe4BPu4Ztu0dn/uaE19zAw2/ZhYdY5mukoxkQJW5JV4z0I8xRHuIUVljoHd864pZyk9XCtQKGbBugsCNEsKQ6uEkVKvyBsYdPxnQbWyKSMVQkGGRGAEayISyWiTR0TwZ9cjiCuGdFi1XvlTBGvkbpn7QQtwKITP9FFaDyhnEYqUjN39jkZ7r9sAJlbpH0EBUPH4IQHb8bs3mZVXj+FYAYQTdRdMnLCusc7xuOWVGh3/wtl6DxL4Jr19IgpDbnK+VBXyDzMggsqZT6Zql4x9M8ajatVkSBkkmb5/Xc+TzOnF/3h5SanvOmoBqIlo8Rj6EreVfxO/W4+ni9DlNEW6Lt5KrrGzHId2jw3j06+94RPGQyPwbhSHqYuNwYCjvIsmGQrtq18Dcn3p/Ql/2FTbYztsRdKyY1iNs27iS/1ZWe2sY3wnxmA8icIkZ1pf9g7u0pzZeYiOUGKLbJkXdBFyMc8uVUlR/FSJeSrxpnkYn1YkHxr9lnKc8wLY/pkG7T4K9dYw/NdbzzbVN4CGR+TTEABDN7CDNEdmAGgc462Sd/mHU+ASsm9OV/fpN73C2QkZFNZo7Yq3tT0T33xE6yYX3ppc1+yipxGGyuKpLPhSbT4GiPTlHdwrwv5eOVVSo2M+M9UgmfzCK5Q5LBbOH3xFd9yXDbY3K1XFu9vkGvTX4X5usJdbTu3t2jZmsDHgKZJ4OYecMW1mBX9Z3A2iS8+8uwQkJr37TJveVWCqQxJ/psCaCNfrvcwTvQuIa6XVFtCbDeqxyvwOzhAvH7yXDXaGgX20IYR0yBED2XXt3G/tTO0aP0l+jxYvLEbOuIP8MOckCnLrGwpGRIKKuoKy794XOP+Hysdm0+yTGhbYStExv0naMyk7J4Act4kMIo2d6AzCJYxobEbYMZrIrQ2jc+yz3tVik+0WrvrQwRe9NS2wsNE0RjXHptsReq40AZorZJEquUelag7IDKBtY+kCnUTKbf1WEazeBNx4rHS+bJMFZBXV30oe74crRdvz9soivBXqOz7Ao/oTJHN+8rZoFq5hDqsDqzzntYFaGv+NMjutvmVwBILw+Q4hWkzAHSyyMWX1XuTRGKu5bMb0abFSgxIb09LrFHsXBA7gvlLi26iY3NkC7HQYldBJGkRyiEBqR2jbp/jYmULrEAJoojZUW070HRPC3IDCPWkbia474juNu+SM23Xcb2vatZGulVZDEM4uw0r3emZKeb1R9sYdlC4ytDODzcQ+3dpSJI8gRFRnBHdf/yijW7Levv6s0C05tT/Yne4myPoPU4GaYIx0dmsmxgj/Gm57c9fQacy4yXh9ra8wjjYNebpkwn5YFI2Y7yK+PKG7PyevV2xZcB3ST3rZtwwmSegULDGmYadd/ugwOzT9cbsyT51K9sQoOjNJYlM4IG41zutV1SSTTfCQxZGi8WgM0qL3aEBAMjebgDDKnpGF6Z4D/BrfgAWs/LTTqhn4Wi2AcwG0DJfObeOZ2eHSIcrPQ45JjEE3y+ITdiXgcpTiOBEPMoLGOoUQNluyQnJiaA8rw8lQwBX4BXztl53vXz3SL3LYyX79iGEyJzDBTODuJDEznOUFddoAMSDL715Ql9xcYIaHYl+WOTOhIDnKL9kUnADFNyeTxGWNGmfloMeFWx5LcndyqrSBM+30vQwAQ+9QUTN52PIUujrTU27YbBmuIf8VRYA+ZlRvGSoDwBcQ4bZBRjPMyEDi7+fJ/7hPxiTVfUtQIiAxIF4ckCyfwA0rRhaGcGiAVDEN9Z7mynJdsh4XXImBp76ikTY4AT2yNrppISEt+zkd1CpqcmZZBwXMy1mvCO4W29u/hfri3Es4PTLSmdNOHPNXqMDWbnbxdmyyCJP4OMn0sNjeh8KH0YHasZFLbJqqcSSzm/HkueQfIXGSR/a+VBMs9Uk5pubUda3eB0E9XOPQKmxQr9zm8Yg/fjyjwLMQ9N/JMutBjiYMd2oNP5khLi0yvYXvq7E1i2DGajFKyU3yAPhArgAcDWSgYoz0iZhWQtFJUvs0elst2LSdj3S+4vMEj+zkqDZI5xkLYAxLoKj1GrbC+Wt41gWYKzSyTpIAoCZ9LWPZQxFuYHxZ9IpgOIKtkB6x6X8T9918p4b1qEYQPGdjCGSOqkfMUfSSj/JfVYldT8MopRbpF6utAkSSoAZTF6wLaouTrF9rkbsKIyPy9WM5sGjxRlDxZFT454rdKH8kc9W1pEbjkqFo0vjPi7N0pR7baORbjksSGNYOdltFFzyc2ifRjg+VUCRxDE2Vq8550avVLAWrxT1PXQZc9WqeVbPHAlWp/vkcZ80jrKMZgqtuLUC3aNzl4ZwYrK/EYUxjEfvoq+QscwRyg9UScfe0mj1tw4NnCxG4LEMHNmCo2Kt5Ai52l9uvRgnCdbBcnfwA//ow1YQXHhXetAZTgOFnvBPoZih6T7UQZjmeclx+UKNTpQFNUAyapZVuUq76TOD+Eu7RFcOY9wbeUi7vMs+/PRojN19FEstF4OqA5fDkDQXyqqk+joApY8r+pFftFMcMOqJhnVr338sd0NWFVx+T0hEuTTfsmoW7lBi2JVe7D8NKSSaF/nil2h+ZpgXMTd56weDChfHs7n2k1WHq7CisncVKyoyRp1SgODzqhTSvMSaJoV1evd4xEsWFg1WKPGayBQPkltyKpVQyVNJAbCzPtPkKZwBi7CKgv6NUlilFQYsAHJ2BeU1BerEoXfh7/0t89xo9/WlBhJ1XclQCgqGnaDoDnIKKoW1R6xKzT4pjGsmMwNIG4QbBAbLS8gEduDZL7xJStW918si9DTF9bQtUM0Ee9qTIWuTzo5Na0BUs6Chdk2TnansKJCX/rNaxSi2vIyHXkejY3YS7ZDti9yxD5H/qfhPPjxv7PF8+djh+CKQS5Zyynr10OV4Zyn9h0kaGsAJxtoh1WtlSoKMT8j3YcXttjeNbOEKw0OtNEJqxijcdH1l7AdgTUuxZC16epYluMQjTpFfYof/Ge7sNLSrqFNTxdPE9hGTFClyUAZpOUdvSRnwl+8ts9te50Pnqh6LOfLrEDKsgCacBk1WHECgPlElXYEg7sr9drpOXqx/IF6qXJjIycvyDHru2pYKF6Q1i+2Jxkcrh0BRPg0vqiCdn3+TZLV651/HlZd0D8VnQlY53EVRjGepsbci9zBOYzBxnK6g2tT/Pj1dQ/t9SP5X654t6pXusVxJ9ZTZtanczy7SiwyVzevuEr1/YNVMlwGgmurB0XFXTqCBYpHP6LsphV7o7I1GtHD8++R5bBPE9733q5+pqrz42BDSVo9aZKlNOj0e0uSIRRVK87fnR532uaX/v4Vvn/bR7QAELXKMhOATTWiTjJlTGx85M7KsMgcs3nZBhGVqrExgrZWX4RBmgyiRpb9E7BAcUhPoBrlVsXK7IdUQGONc9n/0dlKvw2LvowN4PBCIyidAFYjCNtK5T2S4Yv+AH/2O+/5G5uPf+eWJ7peRk5S+SCVrGEbPwELHsjT6EFbGRaZX9GGD3x4GtUlLAONtEF16V28GmIQhgdHfrHvR2+KTWSNS7J2hvFqBQYpwUJuPLdurfaoOWIXtt5vSBkzaIb9GtukeLBMQ49Zxq8uzS/9A+75aRIXUooNKIsoY2SQyHlBAGQ8WsFB88inV4JF5lseIXg9zE23PXJRp4o9grlXy/s9CYsUw2w69sN1gSwAym7M4n1b/SGljR+XXl2YuzbOC2uU/TRLoLlPG2t25yJ3HNNS9cSn9VaFs44ArfLioTLaAZ6FFZD5AqShg2L0JnciYWsoPj0krOyQVoatjujC2uJoNoy1ELuiaUuv2ogBK+5o0muM7zNJjW4EKyy09qc2whACqlSnwuTqWbQqplF9cgnTyf18Fx7sHvCzuwzWtqg8WGDOCbotpa/lfWP2Agzp7J8ew5Jlvi/xhNlLILlKrozXVu+PtUUaWTa93JkFunrRf6Ly5jgqY88bMz5cGCSAvQFtXHThwghWVRA2RZ06ErxzNmYh7vdWVeIcC5ri9Dvv28bCj333hP161+VZkmUqV4bmKltUozPFoxUdIhdgyTLf96QPgopFtV7vPHSjt+RKEqB1/fK/xb0TD0PcRsBrVT0wILbOBVPIrYlG+xhWUOhdf3yD7+vIMjlUXjqfWbw8C7C2VtpnAp+luMN2i7vIAy09pLGO4jErAcjuBzL74CVYssy5RFuItHqoI+nZA2S8WGh7a/UWRdVrcQAZtNPCXpAZzXpkspqg19YBTdM+A6soDW2WlBLq9Na1faWZucYuyZ6lG/BZSlC1+LzXSxZvPmc23CnXutCKR/EgMOwR1yxdzZovQPzhRIxB9U41vrh9mzZ7j2rVStQvdr2OYFHS0H4VHMtqlNgfogZWPWs9P2Y1a6XSJOgrNjYhs0fMgXKlx9YSps40YGeBIdtYvfrp757A5yJn4RoD4ECBIV5B8WppvMVE1oMYG4gDsGNYosz3Pem3PjKl6A5tDY23aoxroMoVA72Kkwzap2BRMrizX0XSRR9vKFcdtODND7RJPWFWXYbweXeegxUR+qqNtVgJUq67ERvEuN1zp4QGOGBtRIzHfdbsIYLTwCJwIzEYxk+pUZwM+GjrmQFZBSQp1Zg7ycW1gWNk7lVwo4FnPFWIVoc3Kkxje2UtrTOkjXeMYAGCu/tBJZjUTgNpSL5EzpvkxRLmQ8MkbEdt0Nf/3kuwZKHxxgjw8KYpu1M6JWVE0zEZ93XxbkGaercLr0cauFVl8sYOJV4laMqJutU78ZAEpqW+m33uAPHoX6hA0HQbYBmZJ8BQT0c01A/HsChp6IWSQkJqh2i2rvP19Unqe2PsEqRr9J6nl/ZQafx1I/B39/iaRokB64af6vqW30QGJJWalVh8Fz/y+rKT8Wd2udMJ7n6qqszrm+SM6xdl2K9E1NP6Ib3hG5d2P+cOEOfa/eyyA5vdW3KuMv2rCmMCdryuwQUa6g4mlZqVGQONUY4dhqHK+xN/V6hRtUff8HsX7qKkp9/DahXsJa8VKOvpvW6Ksawp/Tb2IR2WgKQ5sw0PQpBuQGX7mKG74vjIBnpMle+CxB0+vACBM34f4tgJqlgEq4bYaqpH2S/bLgN4ChYk+N3/cRJB0ljj2xjnNkHRsCI1oi7yOVIKypAZ8SZ9w+/ehAUJPf01z4Kf7YlRXjqjcr0mETQDQGyQwtzSMfGxu7j/YMa2tIT7ZF24UFSrAhI7D2DrBfO6hxggAPuq42J71LWoFF8S6DTSnphnja6MFuYd8tg+T9LbGqBgY1Qssw2F9YJHbuC1gaX4CG75P/Z7bs/+6O/egDkJffUfHtO7/xCrVHSNr2FoHQnigZNBXmjjUGEqA5YyYMimnwA8GPaAQETBm0m5GEzxWGE3BysTBklRuuICXtqLQxEWILTx1hcZimsyFp0g6ZvxZZV4zBVpPk7e6P1FfN//W0g6OV1ZG8IrdJtbyjANxU5PSopFE5Unh1oUTvInwgmk2IO8oFOOoykSG7xucAN3PzCF1yHBnexb2OB29gx/9zhV1En3SmJxsfh1chRlLyuWyjt5m80y73yu40/8qweaLOifeM/L/H1D8qh5jOVa8r3UonuYrzcXAye3jwf/8DwsQeZYOM5Iw4a60GRVxSQDoCSoJbF1qXh/P6AxLywEIHht/6D9pi+/7shvhu/Xy4qXLRUU0zWmBpjfQCsPF/ODj3Vr81tr41uccMQHbwHMtujS0yFtY58byQusn01hcHYfd4/PBqavuzCCNrytq1njcz0ZAEGtX3PhrbZebmcucyq3NFfhC9dAaF9HDQnoRAYcAmySohRTOBui4A9WmMUO+BuG6JzWvYjVTrwUeEjvXik3MN/5VEtrafGlxTDIn/h1F5jSb3YHy1RXIeszz5KhFr6RB/j3fm6h6e/057/8Nn/zSMO8yhKJNdILa/IbbXMPLrV4dRvZ4wyj2N5S5tMNmKZAc1wehiLUoL19vT8pKCwb5H18/hEeyzQDoGaODDJZTvtexA993wPvjGj0R27yN10g8xsiZuP3Z9CYqd6nxNwH+MvfvdjhD1kWwyDtpyc0OAPy9tXyhmPMTyfdi/Q4iy6auhZMrr4rj43x2scmsChx/jJfyV585wZJ7avMCrlmLxqVRVHu81ug5L3NXhXKTJwuVxQS1YwsYEbgRDXKAUr9biwNPmzLjZ5ypceouui7ojNoITOFEwBTvmbMZoaP71c3qtU2fujWXJjaI33CkV5aZg3M35+v0/t4X8IbvMQ+T28DcEtjkEUY6RyEOzhgo3WSjF0CiUTrgCNXqoVUuUImgOjdbAwLFLz23yZ8TdfTNbcmntAmL0u+NtTcrOTF0lQaifMMqLiKG1Cvl42fFE+ecQo4k5qjkfvs6DA5YJgNXnEgkMk4lkxk0nl77vB9YIx22sd/d2sL5iSxoWVPlUTTy9usIP8GrNPhJVlL0bJ4WQhAojQSMJSHW49VJ/FymTHhZFytLhZ1W6zgc//jSnD7SuOkQZsavC3dGUHgTbp+8WRFIEidrabVnC5U17HEfKg01iYPxDIp9qTxodzgNU0kZyc04v0D08EU1znYKLmml1D2HMZ9pvxFc63n5QcS98iAzrEQfbFoXpdiJdk+cVSnnyxBFgeQgZ+Q8cHLqL3Yq7qSahAbCube1jzQUH2PvvXNY1i0zAYXuTFNU8OG0ki1h4fCArFxE9R5W8b1K5nKTWEVSV0hWxbJxILSfiaOgfme5dF4OtbCddL07XVIqkcVMc+NMWRc0+E6Tm5NYZ5iXbrJjEvqlpOOwJhiEmkH0USXh5CFAQSvHUzi0FRJJW/yCEOJIQiz4AxwkOaTaiMxhqD3zxYenQ5eLb62dW5Q0zSqkEpcpPGlyITGbzoZy6JWhs/ASyBRVSrKU2zScWUgmWEMCejl745jZzKwUEsqle8DLconYJRrtWprPGdIAbmIkw9MYc7C2tMbU0AS0jWmsefGHrVpJgA2HSUVm1uOLI5BIBpqz2tpmKw+oKY3iJ4NhYolX0fGCDT+Em0NF26w4V//yJQf3Tr3ZtOkOpXIOmUdX2wF1Kg6lWzfxvTa0tCzPaKN3tnjoDRkFPXqKKtQtnsSAwNYFUvTY0raOmj0PAUFp/w96/gjP7iYaizBVRsbe+fZqmpVpuQsmwDAaWCQ+GUN7VZpHFnXTj1rm3u4Vnu8UlxO9eghzNoxLEEiSB6hdbZB9iMIBmWQV8wliw3eGN/ZLqlTakoPX1hHQJPsFGikHOussGpl+Nu8MFImPnLORhpi2mbZh6dTfATX8QcXBI4gjj2R+hwBjuZjgajSJUesAGgKS5KFAoT1+X02DA8KSAhsJmkpKlAbs9pIEniWVu0Ctz4yxb/6k+d99m6JYa1eKZeMeDJpKWS9WZqLVrx4CUykDZ7UdoGiCsn3iDpqM6Kxm0LSms6nALDklPkb4L7gPN6av1pV37x2rbAG1SqVVlUEHZ4b/FYKEodTWJIsFCBsh8QBNOqq7PR46Kjoyc40MqfjQ8K6MX37o2NYojR/9X9e4Yd4ma9/mty40iAheeVMEqB4pLQ4XlNAkBpAa+yRYq+ordJkV7hmPFMNloFhYps/hr7rCQwj+642N390Y9E1vGjtwhp1PFjKnBKlFHduZo0YHynp75+AJcliGSTIoL0lrk8b5ziSIdvVpZ0t/jDbhCULs8ku/13nCM0NtAyisYWuemQab6WG2R6eqt5fvVw6XwY7ifevGPyWMbrn9bd4/jx+77+5BkuRVDQb7Xhza4uIelXZHRk0LoYTl1a1cinWD/0V9zKEVIp8EyKdai8CtVGGWK5S37sc/rhz+G13prACQlvvGHEj3IJYhUPSP0rqiUaqJbExplDkSDKZ7d6V/aPjxqSkaLJhPia+LBNNuog9T75PLUyYerbxn0wmsEShd/2Bm3xNFzR1xN4fL1a53BuX7oNmFzQhiHIR/+/7llL7ePEMEr816fBa3dv2nvZTrTMxhGScLp1FRKJt8pf/1wYM8BzbJzdCZXu0doIrKkWxHwjQzKegoonYV2NPynHiDo7eM7MOnGXlUEibvW7v/+D6ssERBWlcj/sAjXtosQZjn1TR9eR5m8KSZDkMssUuP4cvV3SqV4SFXiEba3KVTmfydLCO33xnAismtDUawpmzF/i3XUrp6KiJiqloYG4dcWcsbKG9K2jOVkkFB/NJ+5bEPwqmz4R72ufhC87s4rXJypRCpd/61WP+uxevNyRwesuIjbJJyjlrlFGIwr6RSQ7w9s5SEhWDLAUgQeiv4V7qWYzahDnBzubfSDuK85iT3XIaunMTvDpbhxWWCJZHPn/sPV1w4J7k37Emmbc6hqNSo5xm3AoA6qzdDCgf9fIXIKTNwxturRIorNBv//07/Ns2FPzeld8gFRxEpfJdVSt6PSb4v3eW9oyXB5D3QuhZ944YZnJZ8cqEanNDMio9yj7k1hkkEzhBQt/+jnG0wQDX+Ac+ASa1PYo0mDifUuA9uI+6kA7fNvtweDiNEf4VF/qKd48I8XYqrGLtLzsvnQLmdHdhDic22Tb+9O4WLEmWBpAg9B2wx5cwVjcfGN0TUP3kMeU85Q1ByYPXCTca9tBchdWvsH7KhL7q6Q1u6DuBJaJq6bOxIeqVsAi5rDK6BJLAMsIsngOaP707gSXJcox0EYRt0PycdJ+C/zt90jq0qRQNlDSMQdrOyyP/CDzQ4aG9PCBB3EyOO4rPlDqpQ6RuX9IIuj7z1FFOlwkOgCUDBL85lNnBaQwKxYogUPziDVXzKS6S3R8Oi0eEP87B5t33La/yRS9HhcZPPxs6rxQxT8FOzGV9qkh67hgVOPpCHQid3wSWLMtlkCBI2yVYhMoSlEEDAh7dB4zbFJV5zhDcpJ3ljV3upQi9+90MDGZ1DQQadTkwiYDBGQ+lBgZB3cB83A1YsiwdIGw77MaeohNRRWWR4ieXjN/0Xg7osAz3Vh42oZflS3t3M76EVZ9fyYqw41NkTEsavIVm33ASP8X/tlz1KsjyGSQKs4hWAQS9oZL6rPZJBgpaRsFkt+TiyFfoH3PsoZelCb17vMFq1AZpAmKpg1WxhDxXZROfTlDU521YAVkJgOCfiy+jn6ge2pSbWIx1jOu7FA3GbokJcQ1co+9hNull4UIXxsHm2NTyopU6DMVurIbZ+jJISrdByByYwArIijAIBJff1dDY0ahZMpAfXN3rpLEXZr2OuIvbh9DCXg+SJUjb7vCzGNmGTs6m46dAcLFLZPw5ZLtTgBLKnv7zKayArAxA8M/CPru9r9sKF4VJqAJIZa80FjwogdgRBKP9Zm+0L0roD37VZsm5Ii2/iqomk7E3jK0h+WMAOYMCQme5EupVkNVhEBbXwBY2ONVYRwUMqoAARs0qKhcV+yRUcnyFmaQHydyFvvarNmlAW8ocodMyg+K0IIN4HiVVv1PEISdlrgx7BFkpgODl+Lquy0fUKnX7Uv3Jhl8JLKmxnkGEa3CIPUjmKPR1v22TyG9V7vc8OtDaFnUMBMBm9pZjiJ9/szLsEWSlABKEQTLxjm6I50o8W8UVmJzkKZBkwNDUdoqJuq9Fm6QHyQMXes9vY7UqsH4pnGfd8jVoSO1LGZseK22q8Q7hGV7HD68OewRZai7WvSQG/B6BFyHYEilFC0qqe0mF1wzgmKeVsnzjapT9qtNOeXkdL/K0l9ct9MfetQm+2dKBXh5L6r6XrF2X56U6fgPUoiYiYp7mDN8pfvDWOVgxWTkGCRJVLQeXK4NdqFj0V424U3mFlyulcygzi8ZROJDI83v0Q7136/UK/fF3bfL93ZJArRagyJ6qSm3Kz4SkIGDOuSpvtsraQQNzrez4ucpKAiQIfj1MMLzEpYp3GJUKLG1j7cXKN53M9lzmdQSHcLv9/j658XOR8O4U+lNrNxkIW6k2AJmgrvnkNwPTcTEQtRep2CkOtnFya2njzl9NVlLFskLfi3s8GdvxIToWBPJDgLRYKsSDVhA/8gtRp7vxwfy+XuW6H6FvXFtjXegm3+RRVKfkI2M6WlcN+pLtUX2yA6LyWI9UjT4uT/FH/vXKqVYiK8sgKg1dDGU/U0+Vy+U35sWTAOprR+P2rZMbOwZ86sU2+IEGlWsDenlVoatf9iwNZnsx380a3vE+ZpW28cZILy55rczSYZCc2n4ATbsOKywrzyBB2AMV7IcX+WKHwgyEYDJBX22aFnQor5yzjEsM013u0no26Qh96xqrpK/scC8/juPjvalEIsZ2GEYbi1/mUYEtliGzbWINysvYCrM4yXO/jD/4gV1YYTkRAAnCIBmzG3BPvVP3AgOWxm9/XaysTmBAQmZj/Ms+eLiGT69OFHdZEsfR3z37LDfwK+BpmFQjMOoTGO9UVpukwESYD3XGqQOGON+kY6I65rbxB354C1ZcTgxAgtD3szrkYOcoODAZe3CPl4IKqNRIITjGWpH9ptzxbQ9+D9sop1Bo60uYLdwOs8IoNX6qbIrQ+Iv9gNUnMYgzTGNAosNs4/J1vPWjJ8JRcqIAEoR+gD1QDT6nDFAVkwOoSgjp+gIM0vHsBF0uyb4xOeU0GvIAN3D94Ve96L0MjBY2+VPUKQGINwZ2ZA8oRnebq7B4UbcSWNQwb13NJr65hd/3b1bSpXucnDiABGHDeiuOd7algbDLCDndGsouZHerRLbm+c4iL+xCAsoEHiKh51iVmgGrUrDBvf8ovoZDPU6QWCHbGnFbKyoTJCZhRohMMbPHpWPEJgHxYiUG2YdXcB1vrWaJouPkRAIkSATJQEYQYq1KHfer8B7z8BrrC96CBFa5xY0ngGUl/fb3I/T33jbmxvwsN+QxR7iHal8IQNSFC7nB5zf2emOgmzpXIJFyf4xaVRhkHz49OFHgCHJiARKEfphtkgZ35M25aoSrnZHF2ix5tbAJVXcA6+PM+nTKats0DvICeD7UwGXArOyDpx1misM7F7jRPpVr5EZQRO+TGt3Z0JbyPFLkTcHj1AZR1UnK9njxWAFoOZ/WlXPM8AYMPu8K7p4scAQ50QAJQj8SvFsQ3sFeJyN2mISO+aX6rnq4P6lsFntQSg+bQKxyCC/w9UzxdyyPYWhnOILmzJhnn+SGOuaGvVbsBjANvrsuq0ge6jwqwxgKBFWbIIOhqdfnY7zHG83Oj2/ACZUTD5AgtAcjnuxpcqMKRmPc2h6UV6dJfn+57B28YVQZH+U43S3HU8IK6mpgUJBI0Qmwz8vMNPQSG6dT3jN8uBd9wxTXDz7n3pRuxtfQhZGTa7FjmIXf7Z7gBspAwBFfzFArF2rPnr1MleqUvE3RVohsYpkhH0tiU1i1KhviChxXVDGzzGDZxvf9+BacYHkoABIkgqQBVreYUbLgsQySS9AQme0VN7yK2Ntl3MNkwo4ZSV2WQVPAOgVrIqymOa4wTQe5so80tHSeUdrGMQlyyWYgKL2/1u7FpBJ11qt9IfsJGDpuWshAUSDkeEYAgg0CFg+XgAdSQDDHOIjcAa/bxu/6z0t6H8mDk4cGICL0AoTBO5tH3L9lj1cx2IULLCd0wHMchgiOnJAyQtTrTImtUJHq6kYe93GlYLWAqFsZ3q7LU2UG31mmZFMkL1RhjhLsA6hzpqCARFmBr9k3teEegcLrWorBvxpoLthmF/Ha/ol1Ylh56AAShD7ILOJwh2dHeY22+ZizVe2dN1R0Qx23McCRICOZ+S54qJxbVTYy8LNsIg1ezilgkEYej3UFRLLOW7YBE4uA0ssrIAyLaD3csk5Vpq6dEQDblu8qqSJpHeV90asxPmHgXDwJhbXvVx5KgAShD8GIY1xbLryjQ2MbJQWFukyS5V7K1nHcUmpuY+egPOPtGfOWbLuU3bILFUxDBlCVKWX1d9gkfgwDkYBEIthgQIIddQsqWwKNB6syxMX4trGR9hjPVvJUHeCMVarv+O8nXqXqykMLEBH6MbjAbPIcP+8RCjCy4Gv8eqLuPqi2i2wjE6tMr1TrnCBOoWKVtImygZyMfsrA0Ne2eaNakbEZQBo3ZFZypWErY4BZh0fXWdVKmCezS1G1SrJhYQ00sQ3Zxt67Q7ic3iX/8MlDDxCR9j/AFv/YzarBY8UHZh0YtiFdzE346MnpCLd0QAGFZYBKgzeHY7YdUqO3bIHKNNYGSWyRr6cLhviDzbEa5abK61TcvFiBgLI3qxsDUXumjWzCahR7qf7K/3zoWMPKqQFIkKB2cTsLRvyluAxQp8zbBv1ay9WJjy53zRi1PeIyZcCUKVVgKFMUVSqra/XLL6HYL9Y28XINxq7QKUGVFuK7Hi0ogGjRBBLN2HKPu/BKexW3pg/9O1lOFUBEIlDOMFCAgWKNC9kOYMnjyPLxJ5UZLMtUbagaP4mHyxjmcRdRveKCM+8nxGJ7hKPlVWbqBRN1KTNEBoPaIWRVKtQGD2LME0KVZpKzdsEY4rx+wl+9jd88ncApkVMJEBF6kQ35llUvd3zBa6ttFXsDdWzJkf2PYZICinqjqlmVnWLUrvyyT6Kyzbp4KTNHxRAVSKytgtW6on4JGLDYKDbKroa4m8AMt/Hq6QGGyKkGiEgEiocrzsEzkF3D0pzxVXUrK8WleyxQgoRGl5FmjfuiWpGCgeQ8JMySe3sDAsou3gQcl84b93FG5TJ2iAcTK3HFg6XgSMuqSpELiZnX8c/8zAROqfQA6QiDZYPvyjPckC/EZVWTjEERJfTo9waO3VSChWZK9b7YZRrr0g1f7bE24r3xboGxIdT9C8oq1otVDZutgoIgwDjgbdfBnb2Glx9+G+O1pAfIPSSwCqRqKmynuLG06AKPvJ829Gw7IOVGnPYiwwxYdk1n8AUlqr6RWWHVLrE/xPhWu6SoUgk4rjL4deSfMFNmESQz7mMGDAp3A6C5hX/0YxPoRaUHyH1IBEvTjD21Y25WT0GsHn/vW5cwIepWUdFUreowiKhDmh9m2SNuz+e16zNY0Lh8iWqDvJoSGsM9VTL0hM+7Q3cLv/7jE+jlWOkB8jkIA2aN1fzALk9xI13jVj26Lxcw0VHVSxnDGvIWCAAaZ8kso2whnqdqX9cBhpybATFjQKDbZ7XqFl48OPXq0/1ID5AHIAyYIQxCqnlMP38KIKabr8Wp3U/VJsip9ZDsGLEzjMeKiErql7VPCI3N4tQVqzEWz+pSSLH3zb739JILw1zvDPZ7QHxu0gNkjhKBAyBAGXHHP3QIT3CDH+Vd0riOBILRcUY8g+GAwZAad2j8YTxJAEBY9PBRBsAUWh+i2tPXO86kl1566aWXXnrppZdeeumll1566aWXXnrppZdeeumll1566aWXXnrppZdeeumll17mIf8f0/r93LAzEAcAAAAASUVORK5CYII=" width="100" height="100" style="position: absolute; left: calc(50vw - 50px); top: calc(48vh - 50px)" /><img class="img" alt="from Meta" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAOQAAAByCAYAAABDaH3TAAAACXBIWXMAACE4AAAhOAFFljFgAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAACtgSURBVHgB7X0HnFXF9f/33Pd22UUDCNgQdEFjwRKNiX+7oLH3lqJR0SigqIhKs66VKiAxgNjQGGPEbiL6i4a1BPWnKJ+fscbIggQRadK3vHv+596ZuXfu27e7771dED7O97Nv3y0zZ8qdU+bMufMIDnmDman/8DHHAtRfzvaT7+3lOyXfS+T250SZF6aMGDYaDg5FIg2HvDDg+rE7XXrd2D/J4SHChPpq9L2N/NuG/dQiODi0AI4h88CgcePK1y6ur5LDCjg4bEA4hswDaxdnbkSSGRcReCyTN4v9zGo5b0+pkjYe1/8IDg4tAMGhSZxdWVnaaX3buWKcdtGXqgmZ3lNGDq+Gg0Mrw4NDk+hY124fixkDCXaLY0aHDQXHkM2AM/Xd7XPRjq/DwWEDwTFkMyCmbvb55JHDv4SDwwaCY8jm4GVcHzlsNLjB5uCwCcF5WbPQd+i4vYnrdosueN6pMpP8bXTu89mN5c2g9KP7Rw/6xL7Wb8i4nwF1FcExef4ycQj9IypryKjenuedxsR7gqmNpFhRU9bp7GmVF65HE7iqcnyHdevqLiCPdmMfPeDxVpK/Vh7mKvYwhzKZOZNHDp1ORIw80L9yzDa81j/cnJe3LX1lQuWgFeb8ksGjj0ilcQIz7SHLPdsxqIYIC9jn2WVo88TdowbOb4z2ZYNHb5dJ+78lpPZnRnepY0YqtVLmAu9J/f4y5c7B/4JDBLcOmQWiunPl39D4StaY9mh6Y3lTXBesV96eoOdlLpcBfEFw7FN6jnztN2D4PZ3qed3DQvtEDuizKYfRASvK5CAnQw6qHNdxXU1mwrqa2tOljluyjPBQpOr84ZeP42V9FP2Gjxnf97qx47qUrh5fWVnpo6k2r/V7sNWumrW1B8nX21cMmdi1NrX+QSF8NNtlBN/BAeHX66nm+r7DR4+ZOmLInTbNKyZObFOzcP2IDPhSsFcW59RgHCf1v6HfsNFT2takrx8//uplcHAm68bGoEHjOgozzgqYsZB8lw0bfdy69fWfyyA+T7Thls2lFz7tQr4/9uuatrP7DxtfgQIR5Knzat4JmLHJhCJDRA/f0X/46CFR3mvHbFO3cP0bUodBUpMyNFPUmjaZF0RoOOUApyEbQAbRh0z0ZHTB513k4r5xAuteg7z8CZrB2rLMjaJedo3J0bwgn2gceRbUPlceGeyHZJj+qgLZTT7Ui8p9lTx+R+7Jse8hRWXiFT5N0u0eZWbsy6ifcemwEQeLh3g58oCPVFcxs/+MeP1VzEqaIfVerYl2lQocLwddo2KEKS8eNvbV+0deO5vT/Kxc+nl4nWiFB/6zmNZhnK8ntRTT9xzRmLtEbQEfvLC2/AY5rMQPHG4O2Qz6DR95rZhcY8z5vSOHFNRn/YeNmSaD7wJ9GrwV0jk4EIZ6gzN89b2jh77XdP7xFYy61+RwR3NNTOAZqbLU5ZMrr/6ykTKPlDIfgB3uR3j13hFDfpEr/aVDRh3oe/SWlfZjKaQngVbWc2bA/aOGPZqdJ5gb+ilMEhP09DgfPS153mH2RykyuL+sbO3gCZWVKxrUcejoYUwYYZW5gn2/YuqoYd/hBwxnsm5chMwog/3R7dqs7dUcMyrUXQ+bGRmjp44cfEJjzBhgysjB/wjC++SwOrrIOEoYtRfygTCj/BdtWt8rFzMGmDRmyKL1ZSUXiXPmGyvjkcyZ24IjYcybpowcckkuZgzrOGrISNGa91tldpAJd6MOsx8KHENufFRnmIc352gJoLQjLoouMOZ2KV87HHkgCO/L+PwbBBaohk9ciTxB5I8UGh80lWaaeGKZvclW/TpIzlI5elGEwm1oBumS1K32uQzGvfADh2PIjQ5v1P2jhy7IJ6WP2kBjxM/I4yH5MLKBlPO2zFH/bs7F+XLExZUTuzafkz7P90XrUlm6yL7mIXNFHlkx6Y5rvpKvf5tzET574wcOx5AbETKnqkmtLH80//Rkz/m+277NumdRKBgj7dN0zbozmssiTpYRyBNrULs0WRymFxZeSO9YuSvwA4djyI0In+iTSZMGrM47A+Fn8SHNEu1YjwLhe+nP7HOZgzarIcnnT5EnHhpx3bdCNVo3FY/qxygE7C+xztriBw7HkJsorqic2E7UTUdzzvCLimiZeuegrwNvqTmXZZEd0MoIl2CKzowaOERwDLmJoq4uufuAmLtrUSRkCSRiSCZuB4dNFo4hN1H46/2k5iAqR/HYwiKUgcMmC8eQmyi6/Gj1MlGLtlbMwzvaEJdV/iEIs9squsA8Fw6bLBxDbqIIljdkvjcnuhAGeHPBkVV+3eqe9rnM95bAYZOFY8hNGMKAs6JjYOsBw0YdgkKRSfWzT32PZsBhk4VjyE0Ynp/+q32eoVSz0S82gs2dhZWPi6/Qx1PvHPI+HDZZOIbchDF5zNWviYn5WnyFe/UfNuqafPKeXflEqZ/xfy8e1mjHPB98Fxw2aTiG3MThg4ba63wMGm2/e5gL/a8ft0PHmnnP+MDJ1uXqHcrWToPDJg33PuQmjqkjBr/Tb/joIKDcvALmMWNU/2Gj+4j2m0DwPvdTmXrP98Tjw53E73O472d+R8wdDI3wnUSu711IHKzD9wPHkJsB7h0xZKyYqluKdrzZXBMnzx4yJ7w32BqDMp7eAEQ5YYkT247MZ+JTp4xwmztvDnAm62aCKSOHVnqgYDuN6gKyPcfsH3bfnUPmwGGzgNOQzYBSqfdRn7kbRSLDmZdSBPWSLqe+RgsweeTgV+Sre9/ho04TA7WP1E4cNhz81EGbsK7At/J/vjDhax6lHps88trZ+dBNt8WCuvV+3EaPF6MAiEKeTPBLw2N4bxeSl4jeBPtl6thbBQeHzR3BDwL17du3BA4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODUBoZXBlrzS++qId2rSvpUkfrcZGADMTevduD3xbT1Ubp0wHhw2BFjMk9+3RHrWrDwDRxfCxt1zaBb5XAuER+awDY7YUMxd1qWk0fd4/0ErgYw7ojrq6S4T2sfBpVylrSylLbnirpB7vg7wP4fF99MY7/wcHh80ERTMkV1aUYf7KywDvemGGjiGpgAn98JvlQ5opoRglPK4WhqmkJ6ofRpHgE/bbCXWZscL0Z8X0g3KDUjyS76BZUn5wHN77OzhzK73zzpvYCOAdzrgGnKoI68Geuujrbva94NpSLPvjLRTUcSOhNjX4fDEjfh6W7wVdpeulHz/DW1Hu33EjHL53FMWQ3L/dAcik75fBvleS8bI/0IMxwazB96eg1Mk0/T9fFFTucftcgAwmCI0OVhmK+WKmT35U+SyDcQxSW4yit15ehg0I3uHMmTLie4XMaOqEsB6xkCKcSUsfexobAeswrCJNdR/6EAsCqi5KEpjjcAhUl/OI7tiMwHiorBooa3inAyrQZh3hhBpshvAKTA/u12GgDLbX5TAwTw1Dc/zFHJ0C8fO30xF2kxE6m8/qnpdU5l69yoQZ74bvPyR5O+irphxKlBdlkvts6iNpyB+CzJr3+MBeFdjQ0DJAj3klNMgSfj7u4Yo+ZdgISKH2ZqnJlnHhDfuKeONp69bCV8gcVwpeXgLIh+TjLU9TSj6rli/AsrOxmaIghuTLOtwsX4GGahMNNnXHZgp9NftcD0rz7Jnbya1b+cwed6GpMgOHTdtvH5RRfGWYP+AvYpuufcTWNdIKgOJE3B2Z+tf5gEN3xcaEqYPpM6LtsbJ+MDYwGFf1EJ3cx76SK5XwY1GW0qYALxoMgQWyeQoXG3kzJA9oP1iYoTK2clhrO44Zwn6siUecpcmCAUBkrl/Np+8yEo3hpJ4PSbLfxHkt+upTK1WZI99V0ppZkq4+mhqRLRyi59RVRuDLG1RTUs5z24oIum8wtz9nK2xAZMi7K1muXZ3NG2nR/QHCeYCaudDmLlwC5MWQfNmPLgH7o3LciQ+yGcUca7uxoRazzVoeymf8+LYG1E/efawkuyCkEQ1qNhlXyGcofN6Wqj7Yj6pm96aq9w5FirqJeSp5aB5yI9CyFeIYeon/3/Ht0NqI2m40ualywooIDmRO592ODYT61FXHSzGnxrME7WpLVGTzVSb1qUyoFY0XQbVLacnNGc0yJF9VViHtvDVmtOh55tKHf5d710j638ggvFCSVUoJn8WmJrLzhQTVf/8GPvXH10YXT979OrlzdVaewCMSlP8qUume9Oqc0VQ1Z4VNjKreXUSvv/cI1tfvKfknZpnWdo13Q93au9HqCN2rdjm5NCbp/32547k9sSHgYyJb0wdGNGHQNo3l2tkczbyM1odmVCp+VO1KYbNFutkUmfTL0uTt1PMLmu9FLKRnaUGXzBaG608PffteDgq38Dldz5BEd0naijAHW6ZkYHAY/iYew6ft+oV09n+F3u0h87FVjkr/GFLrLqUZH65sqto0e/Za+RrIBx7wjXh0b1cPy4uKVfXmPvzTw2fQ+68/gQ0D1TtAkil90yZOyzgaL1eORSuCUwMvyfjYJSiAlVe36fRB32xmLBkM3Mg4NY00bchgs0WTGpIHll8u/wMHiDUJM5wRMeMjqN/yUHpwyXuN0aHHFjyNet4/TBvrB8T0tMc0nFayeFLpyWj+R5aFRd7z9PKH59KML5pkxkTZb//vnfJ1s1VWltbyxvG+vTpgwyA3K4QMoPuRcQx3OL83WgniyOng+7hOHRPB9u5Gj5Gb49FNHrJ2ymY6ECp+rSc394Y1ypB8edsusnZ2vT5NLm+Yx0w8g+5begFNq16PZkDTFyzDbl8FZuz9ESkiw9qklwcCCHP43RJp1M1q1NVdhCJAb711m5B61moDR8fsd5EyrkZrgxp4UZLzNmO0BvBxJ6OVnBFepp+UsZPFeJzLHa3PNtu5JKV8igclG+WAzdvH2pTJmpa5oI9trWlIUtISqpEqKYhBqDKYYM2/hH/dra2sZZ6jxJs2S2HL8phT9dxzJSh9FL368VIUDf8KeYpHCNkOlgmsvL3sDxItOY7mVK1AayAWLtZxWNY3crxtg3TEB6L9eWfjO7TIdGZc3sVnuoqVFLONuACLpdFbm3s6h65B68gCmbK3WVuypmdtHe2YAnUWy3GLDLhOpH41yTyjDm3f2wYDWifWODBLbc9CuOystAQ2ML7Ay9sQ/L3rwTuk4LWTb49T9F9kUkvLkfmsAsd9jSKR80mEjhzQB6Ih26t5nH607EGHpkmHeIfR1OVFhaPxubu0Q23tDBHnB+noFR3FAjQIu/PDDh5Cf/t0LFoIPuCQi6Xq94Xl+FnlACPog9euQwvBXU+fKf3TS7fFakPACHSJHN8LPyyX4iieUMgvRsdUBVVPa9baaAwZXPGAkLuItfrl2DYPwiSuJPIm+qoeqq5xuupyHtkdRSCImFmTXnhYJkNXycnBHARusGqeMcDUFC8cQ7Ik5b3py7SkE65+NIjWaI7+Itwrc2zeN6DFlphh8gK/xu5RGylhD8wJwgGjNhq/B6n7KpJR6PGa47vjwrz6ey6e6VCHkgFC4nShvb+qAyXoCk32lVekitl7eHcc+Yjdxo/w2u/l5l6+9pkoyZEKqjdnL//gQbp1OTr5qvKr5P84NWg8aMcyRY5z4GGatPJCtACiJcUkTr0nlLePQurscDPDmKCX6IVPj0crgHv1SmNd7SdCd5c4pI6g27YCdehGH1W1SIJz19M0QxKsj2qL5/1chuQAOe6TCO0zggjeTbTy4aKWQhiX9vAp/R/Ss6pAE8ZGjfd6munMOsK3ahDEsazcAoZcg9tPrSeMk1J6GKZjwzARoximV+UFg1apZKomTl3ZEVe+0FQZizBlpgzqI9Sav9H5muGNL8ocG8ZQDMdqekmhQIjnWsI0pDiYeW15PgxZjb9eJlrwDg6nU7qNdpmmLzlL0BFVC2Oetyd6h4rrI1S9JdcOJFGoTEZSBs+CqvbGwb3DWuesgccDYdmqsI0DlmHre7eghaDHv1ootC6SGtXH1K35VYw6tBKoqkr6ldRiedwi0zXtxYA/F62DbLNJlyZN8UqGyt0VkTMrDrELnujV3O53HVEEmFLjEbm/7WcnGoG9Aebcnqxztn8r37Iwsd1K3PZIhvxnxbXSPWohZ5nJpAthPSlhOw1XiDR8bqn3+5s5isJvvEQl1sIZTmJAZiUL/4VFxtyhxIPpkYCtOb/1yq/wUscv6NmZ9eTfIxk6RG0CqxVPspxKZumIYpNZklbI6Rsfo+pGdQtmimJUK2cPlQYdwYNKTw86K7JqskF4kKasqEYrgKZXvyT/7zFFNyhJedFO4pN2vwSthdqSx4Volpc2Gpm/RkthmIusc/0Ew9Nv/rhYBN5dibtx3q1kybvgty645IoD5esUVVAku/WMiqe2wdh/6cKM7ooVlr6WL9ahcsfVtPwdj/i3EY14GUmZUqTWUchwQqjbSM+kjY+J1Mqhn6lc5t09qakyOWIDxWhBNo7iTQL2IiYrhI4spgh1JFliQskHaq7NYqJW1GLd20LtiNB2UeFlpizYTriQ+UlFDEG3H7qxul9u/QT/uM4IQCUjKBYaiC33hpLJCx+s7U3lhMVBPB6tCY92iMoy1pY619Ou0D4YzadVtMrSROi4YXoIRn0omONevN/RXdBymDYwtOGUuFtXdo9cWZKVxai3Adz+vO4oBPX+1ASjxe1aL2vkI6xKRfUIhrQXFpq/d3cVhm8tJqqYkNgtZHyOJbzRQJ5yrxBM1IzWIHocQ2kwNsJWTaF96vctJuYcV57mdhMiF1Ign5KvrwX3te1PHNuOWoMxx5aXjh5oEv/BCzsKtZly+GNVXhTkhIQsszs0LIYjhldM6WuXZahO75CTnpFgRjwlTrbXAvdFifw/KSuZlvlhZaroD6s+RyuBf1Vxofw/2xomVqPtt0bEXKhrew9aCyl6zgptsxlTTutOR4thrzSEk5iEOKYV01bIsxpmpdd1CNucFofZfcgTnOrfR/7vZV0x/wOGmUKYUB2Vi1g1ZFuX+cCjNlPkqweMOyMYqMzZr3b+Wy5Plu9+0vBzJF0/Zv9BSf2JVT1VH4q/5W/gUtxzdI5iV5P+SPfob/nIg1LkQkaPNbDSk+vDPEyBP2C13JVPcB7mWxNeU5/c7fTqhkvanVQPqQloZG2T1nChFYDlcvC6XHxcjh+Tz0ty/CZFWjiskKXd/XZGy1r3E2Unlz22KhenQ6ZTfMFOTMETmYZWAv+6okIqMyIeF+Y1Ke1tjSJ4ohzn8gk9H6UXP34JLcXbb76GAw5ZJEfbJ7SXepjHyL8/oFgEIs6niFh4rUFbBMseexCdzrlUjvYHTJsjI/Io3rJPL1o9raqpohiVpfC/uTkW1HFYjpCa76FkVDK91VaKzNu82HK9d9PAeuYzvNCTaDxShHidGAvEe3j+Vhg+M0f2qWGTeczJ4lSZKHl2ioxnozfDUerfuxh/2MdeGtkGl56cqz4Lcf9pUvQzscEdmrLhkdTvkm644FG74fniSzx9vozE/kaMhv1DtnUfljLLZ//mVfBn/QynrM2m8QlmVDCnfkmUEs8pbQvtsQi0ZjTZJG0QkpcQ10mTNZM5PZLuUQ2s5tSWvoLWAvm3CGm1JhdL2LisLMmhH9sEPrtHe7S06FCAee8i+1GpNh/CDQyJwgvIZvOcdSAMtmRvMj9QiebgLQ5e4apQWWwXTWAl+bcQxixCA7LaZCogDHs1rts2w7hK5W5o8UnZczLMh26F62c2RacjBr9Qj4wsdfG/lF7j7Dl0dw/++cgHKUQ9a0u7wnR+Eh/hiVKhcIs2c7VFSZFDKpAZwux3/BgnHbIbTnolFzMG2APHV/fEMaOFaf8fwi1sWPOf0rYRTXPNQpIhyf9Z3LJo7mOW0d+nKUv/i1YA/6rrGUL/fFMQdMstgzxeQlPzVnNjN6wtuxitAS/zt0YeXyf89Be7o2hYMszUPTJakqAlj82U8V2F3BU5gtteeCoaK6W8746iC/papVrmPn2ZQqdpufJRNMuJa0UNpF8SKaRPASvGD2lEwehhedXr2TthK9wwD3lgGwxZJFpS/BS8IqqPVbyQzi/YJIpX5aQZ3AKeLEdanHpcEZnS0dxX9aus4d62K07O2+m2J46eX4u6XkLp7aTQ1YslOSR/tlPnJ9YgsjVlsL75P2gF8G927Rx6GRPGk7nJ86SSz8VDxVbQxn7ADXzMXt3QUpCsgZKx2DhZnu/vhVaBsr1VeY0MlFRmMOxxlGz7OO7St23OfHV0hfzfMcpil8qZawmVfiM1ipaxTd7mLAKf+CptYMJI+3hs+QO3xvUFRaZshUHVMs7HsHktLUGPfroIEw/Mj1LcpSaetSUhiET+hWF/aBtYzR9Vu4VRXhbNeDMKxE9wrMxZ06KA8LWe5ULNQk3dkxPwiCH52tJ9EPRVEvFgFTMDrQFv9ShpeUVMH2YQBk96IjjTR76XN0GhA1J+yx08ZanPpci6JCMY+HuixWDTcUC248gCLXlcBAMezs6s69QDy+v7N6Bc1r9CSF5pad/oocrAnJXGH55BUzWL55xoDqtRua989dSzzTCDzzrkjvFmO1Q+jyIg9ZwkRL4Lj6PRqRhUPLVHFUBKabJg4s7JwMBCsABPdZX8vWyianqsJ9vw+6NI9MThgcAapunaX9pWiZ9DrCHTfsfk3IftfMGCdqNvc+QL/m2Xg4VkbJIk1utoLj315Xh6tlo8kBgSVSL3MD6FT9zjF2gBqKoq8LzNhb1SHu2GQMVv8RGb2A1nhY2BUzdJ+1dELzQn1zFv4A59kks+Gb9SrpfqzAkNJ0Pzd00UlOO46Tc/CPUnW+m1cyI8JzHh8vYGZ0O0pJisNCusvvGgaLElp/lHZoXqnhN8WMzrkDWo373BUoqKMAhOZnXH6dVoARjbBuvfa6I1U20JhUMut1OHK+zsIeLtOVbT3as+Q0sqdNmeWwqtP9kDIfEhDDdp6dkvHpBL/0S8Nmny6B4KzEpvCvcSmi0CL4DqFcOUxir7KVoChj0vtrVkTtDyR+bL7XsSFFT+4GltJebp9dGN0kv3kWsX2GljmYZphHs+RRNQ5ionrNSm5l3SgJ/oQZMlZYhL4Ldon10h+H7oKxHtFu2No5beK/LJT7Zryo4ULAKS9fCoVqRWdGIu9+9HC7En9qxFEFdhlh85DmCwOz9e9vBpl5gRsywa4kVoKVYvvwaBR9DMkRKmPj1PT8xNvung+cPEE/pG8oWExPLBzigPQ8JGoWh43yByaifeUipF0QjCiz0yh1DGD1TdmzIRS+6SFf6gPVshNim1gKCLufz839M6YVzUPZA1TdL8RGvhZ25Bs2A9coP/XiwOG0+9q2mF/tLczGszqdSBqzK3xSopdLTE+inyu6RS9olOkhLT1+/IbCJPwsV06HnbDgtwT6euuLzJt3s4XHj39DIvWeUW/oayR95+ak1VmYlsLXZ4wWpIa8B4LChYF/Mio8Pu/Jghyd+h0fkwU4sYki/cpoeYWTdplZt0bwSeZHgNdmCjZ758k0/b5VGp7blZ9Yp3EPD5Bj5hj8fpxU/mobiaLUUcVqWequq0FjCkl0WL88oVBAtw+98GmnCSzm6Psg6g9G1cevELcuVniYzhaPSCZeq7CVOqmywDyVkWIzmQc7eGd413NWMVja8Cybcg358ePhq1KTTr7aasMnTf+mDjugnLDAWVH6tpNrWJPIgsPLudHC5tuj1aOGgTWoXUibsORYC5kz2zC9YHdTuRYu/faA0YGwBm7mjmp7HRGpusRJ0bJeShKSdL8/DpT1BlmR6PlzUYU+gvX+aO/ikpHShplkVPLDYvdZ2xJfz0gygatNSYKEjacMWH6ZF5Py1AfswYYYu2D0vODyJRaoNxntTzvuQNMxy5Wj4TmyPPjVqn3Ej6QeVyp02cVz+0qHWRCRUto2j9Yrs/gThKjOMBoIO8ozSavaDC5Erh74AmobUg2/6gxtrXPKTMTogcmKFYUdM9qUs3nNJyCxHa8DTRTdH01OzRpWAveyj3OlkfVdVgdlv0i7t80TY3Ci3jxo6FYPifF6NNplGTk6Z/vExy3GpOYYuwqPO4Nx+zT3FB4Z4fB5knqHM5ioVROvb0gPLLSgunitnJ14Ujk7JsGTXkO+QYcEHaiYRJeQyauDp6LommBvAytC+J6gbDaLnTk34mviFrlRf5m629lCItAT2fisdGyJo+0iVotjUNws+K48agTBIZoOVgpLZVxf183tvMB6Yf4nYCiUB4JBnS0yLKrowZGLUopgJ9tqsQUlfEpRvhaYqhUfTIwvlN0aDn/h3sHDc7qpf6JCagcj6GT9y78D1OfbLaxfE3Fb6ju12bKHY1frWr6ZFvZ1/5aBAa+FqCXkJAasszJjcP/nZ57Z5HjV1ppGYdgSAmVA9GTniCKNtfr+mo2bjhLy13o/rHGigung1HRswZkG7O7EyZuSqZAlTmfIVfA7C0NeEB1TqbIfbqi62yXaiJBlCvhqiO4CytbsWy+usRTag827gMLjUrrXLCq58mc4vO1lg38iGYSMzDbgsn5EWHvGtFSM2EPQdNdnxX1ONe+f4lCgFxG1Wv2H7WhIsSQDFdZGkJshdXmodPoiXDTZ85fibK9ad1UUzPo5soU1mgBLeXSsjs7ZejGZW1a3F9YNZnb/0B/Q5SlXKq6PTm0egZgJ+gZZSZDldmM7j0rgIqkbKIw2lm/bdoAoHjxnRzyMKmlHz7uEFb8V8O32LxybyeaeZ59bw+mM/mvbFao7BGf1RqGIked63l1KFlZuwoKWb1v8fbotCyf9f5WqFxhCk3DsUzAsG7Ru2x0zzo2U+r+ORd/yKHv1ISlRpsfyrnZ4npeiT9z/8V4IqXeYN5NzbZMa30gzzxgEPWUkNToFWPvMXtzpN5N50TM6UlMRQDBd+zqG7KH9ECJKy03PcDh0bgX6BYsYVOgJpalJ3WkYd9FyXOlxm4wOtNEFKPjYzhpPi9KKbkL6RZR5k3x2JmDybRHIRStvgtp7hanHhh00ZsmmXwtWachh3DwY/jFFBw3y5BA26zzJSkTiM8F24NWQioLnDwLLVoJNuievAh7rV/5wKI7hO/hgUlshXdlm3EpCdcWdcKM6bSsuxDWIXsVtrf5F+KwsDZ09rmxm6G/fcMwxLiubscl5Zg/U/wfcGyab3oAaolVh9eEVMOej8ZXBXrW7FaD0ErIJYUln2S9QDiinukFpSTcxbWmbfnQe3y2lqCL9tiO/D6GVJSmUXPHlSrZbANQoGg5+d+Iz19Q2Kul/iE2BHpTLPexpho6FoH0IB5FqBoRPXRofnxtLwQ0LI/LZD23p0leGxij1Dt/QX+GG08YYm1XdMoRWpOnDtOruZ5dBm+JwT8aJwinPDiBgELKPiXxRiZdxte8817n+e3JEY2wGf4ew+h1Nk2WymHLreWPbwPk4MdiJ0SgdbOc0/U+tLJkrFCkbHKiwfWjTRtUTWKAP31synSiplIuMKywb/ho/drNu6QDzpItHi4ebOune0/p9koFnF0cHwtW5vnCVr9iKzdttkaVLo1UiVbI53eBiWprVEqn85UqHZsxDxtOsBlDdLPUBhzammPmOAJa1HZFd8HMlgbuo6YI0eh+YmPevFyoUDshF+L4KHFFK+B6d14wuWZ7ebh2aL2BDbwQTdH73GxcQEwZQ/hmCHb1AlD0ndZGihO7fGVzWlJ7t/xAfk6DYg2PMlOMYf++HV+jpxGUXJZGPcZIApNi+irY58n8ZH7NR0PSRgUmejmSkSqdd5sQaK3C1SRGrRq6pKcn2CJpPDKxF5S5CcjtkJl0NfvRHnMRm8Iutn/kUzlH0YLsRR3HbwCkwrykntIzzNqUTlHbAnNBb8+FzKix3/UW4VwMj42dPXc+h88sSOKwOfeKwOFxvm6/xC9DpnDlRYxpDhY5AHzW8iuZ1ynbqIlZ/AV5Q0kIg/4USe+tP0MWbK5KIeJarBcatPi7THohQ8/he/fHBfO0Ot2mkHD84C5/sxH7T8wFw0++MAh6l1Ctkz0+PGiPv0RWlRJINa8ppJFcuQGBEcarxnfGtOI+DgMdGPjp5W/3mu9W0aiSCzF2GCv3FczVPPnQvKtR+3qeK6ndqQLoLv+hBX4U8HLYCU+3Wd7nNkiKBe7iAH/8md4YYdCaH7u/f0K3+cJ9rZ3xi8Zkhf9a094E4zDQ3GimK5/RbRfqL2ZcEgs+Mi6oTddvueGP1YfvCKU8S6S83b6fvgmp4rVM97Q0Ay4iR76ttV+fo1P7Pmc1OmUaDcJpthq8fUbe6r+rwbueQRRORkSDU/HwvcOj/KYwBpzDvoHvftGQa//JOq180kzpbxequxoY2kKN0vOeAfQ10+1+K2ZouqFazpnKFhKMCaFtdyAVHUpj+neVP51dN2LokKOS4TFRXushnz6ZBpl15Rj2HzkgSUYu7ssmNwl4+0E7ToOrM/xnTDoGuSJRXTv/EBRcGKPVL2k4qUe7eL3OQ8FYi6mTxMSFyDy3pK29aN9X6tlweWCXXHq603R+Qh/2y6N9CjJc37c56Z+SnP4WqTJvaq90Kt3kCK5p045XsX6IAyLKqLFHcu/prGjULxGiw8GJ9enwsRkuQ5UJ91HDy5u3d9C9NMDxPMavMNZEV+kWC+ZHmAW5vJ+Ea01alshqi5lmfFMrfUTdYoweWpn8uC8+d8a26CIt4kxHWRep2l+9Ym5tC+o/n+Fibbzg9hZueSb0ap2nzsrg9ojVnm3PyV8+pct6zNvyjpmfZQfld5KtN2ZU6mfsp/pJ7kPY/LS4YaOZJbJcfUyTPi8I666F/mA+WkREAPNOFWSwehMPve/mHYgwRtKJd5XVOfP81Dm1aBmS0mwvQ+/206Y+4RdxwDiLLmpBnSqkOhgFrwTawSECnEovfYFP/8mUv59fqakugQZmXu2qcnA71wP7iHPvI9kPUhStydW5i/iWHXdH2ZPIhGHnNjLNauNQ4PF9dTj4QwwoX2MRtED209oFaMJc6UPIuX3pQeXrEIrg0/cYy+h/0+tnS1tnv2B1tyR5ozbwYm2fEjvvrkPWgDe+UTRkN4RusxkfeD9nL76PjVk3bdaSrPZ2VxHkM4r5bu6N0djFa7rnSLvFQ6ljB2QbOScpwdfoDkpI83/Sk7XcSDqQdvKeVvo7Y4RBYZn06FVPqdO3AZXvtFcfb7B1INFKPxT7TlHeht/FRRutI+SPV4c3K4CE8K03biunHLsXF6NJ88Uck+qCnn6HRCPfb0rl1qq9MLqR+WoeWy8Wzpiba3iQoL8ASUTSGHaHP6K12s9tYZssF5Do/CEUHscjc15jIFCFk1YBnwirWjb0vRRG4IZQ/J/++RfUnSfsF/UOLNuhvUCsr2dyWM7PjojSyaFRfrkrJQpNzGLZGwCU8gsW8BUjZAnfoQ7Z8qT7qtEmFmwjjuQKVYDpFYmusu1nnK1u1yItyLR83yK+p9hyMm1BaJxvsqnPtui7ywZ4S/C0mBRULhplfaUqiKMz0+dVzdCtwJnPSVpwhhqs7GzvberMmc5fmWSojbEm37qdpk4G7k6CsHeOsprxGa8Zi+n5F5AbZuRZQP+GA1GUcIjaT8QSkwtlID4TFR6b5pS3BJHvqCXPnlGzJ+zpEQVMRLvtxrXJ4EsB4tJTzyI3nrrU7QUkSWoT8yA+95Ra223ZdbtCnc2bYHbH5D+/qWMvZBpojc2spa4FEtETKZYjzUjstnFHGQFZQR/k8CpA4M9d5AnUuCLheAitaO5JhWXBR03GlYg0sF50N0Zv7xZkt6S3MRBCQ7DZFEDWf3EgTbGYgNcNTLg/kd2xS+u00xIMRN6DQR1ToYUj+tK8WQeKYlnqAuqIVo8sHVibiQJM1chlTmotX5yoDmETAn/UISvIdk31DDQQiL54paqaPAdeJeH0tuzfo/WQDwqVL8QZ5f9vcE2ns3z4kjm54+2uOMpD94RMraeZvMzAVb71NpdtI8i9JuUUYqslzuCMfq2LKH07oirB3TClQXFjG6Nfl8z+weRVnikS4uUlvXTBZFliaTnozF0x9mV8tVHPgt0XKvdaaF5ypZmjo2y6C2UdTJXHbEbjr2AlEFvmFsvSfoNatFoiBGNxWIakxGvK34nOefH5qkeXlFvRneC0pYL0/enqSuOpMnftewdygJBL3/8EWrKfi5tDbZbqI9rF3cZotrrrUAIr0utD6O33x6NVgdRA7P4e4axBZAlmbwipEU5Kqu3wC1nSveeLF35FNmlRBZ71OUWc2rtBaqR7+dERxzdEdcctDUGV6FIbI9Lq2UueYTQfJAt9ZGsDtuqIxTVFXnQ7o6zHmaUHiJtmCZMV2Ntu0FG3tpNj00CekWY66g9cFy0/YofT/EiIZEtGPJ6Enw2StGtNNgj9FdiUgS/y/dj+Wwhj3KdlLJYjmVtMPUESullmrCidX70tAXgo/frItLnWGn3OVK39gh+fo6pROoq0pcWyPe7oPR0vD7rdSoyFLnRsnc9ubMsr6gXnGuybvq8kBa+UPCCfmtADZPLdtbvG2fflbEyoUXbVKxDZUUtcKhoTllrpo5SXrBe10mWSjwZdqv9cCdBWii8+LlM+F8oQeqDdrh2CVoZX2HyDh7Sx3hInSHssqW0rbPUYQtWPz22RDrhW5HWHwfbOnbD+a8VQnshnu+8BpnjRICJ04eCMLjuUkawcbc8U1om9L8QJ88/U0g9uQuO+yI7/1xZClmDVNY+UG3EAZL298FhYf//f4kyFoQXFxn3AAAAAElFTkSuQmCC" width="76" height="38" style="position: absolute; left: calc(50vw - 38px); bottom: 34px" /></div><div id="mount_0_0_MB"></div><script>qpl_inl("7252766176843880442","splash_screen_show");</script>
+<script type="application/json" data-content-len="91" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766176843880442","splash_screen_show"]]]}</script>
+
+<script type="application/json" data-content-len="91" data-sjs>{"require":[["injectQPLTagsServerJSIntoWindow","injectQPLTagsServerJSIntoWindow",null,[]]]}</script>
+<script type="application/json" data-content-len="97" data-sjs>{"require":[["injectQPLTimingsServerJSIntoWindow","injectQPLTimingsServerJSIntoWindow",null,[]]]}</script>
+<script>var hc=navigator&&navigator.hardwareConcurrency;null!=hc&&4>hc&&document.documentElement.classList.add("_8ykn");</script>
+<script>requireLazy(["replaceNativeTimer"],function(j){j()})</script>
+<script>requireLazy(["bootstrapWebSession"],function(j){j(1688666217)})</script>
+<script type="application/json" data-content-len="97" data-sjs>{"require":[["qplTagServerJS",null,null,[["react_fizz","comet_aa_coinflip:true","logged_out"]]]]}</script>
+<script>qpl_inl("7252766176843880442","tierOne");</script>
+<script type="application/json" data-content-len="80" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766176843880442","tierOne"]]]}</script>
+<script>qpl_inl("7252766176843880442-server","tierOne",155);</script>
+<script type="application/json" data-content-len="91" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766176843880442-server","tierOne",155]]]}</script>
+<script type="application/json" data-content-len="461" data-sjs>{"require":[["CometSSRFizzContentInjector","ssrInit",null,[{"cavalry_get_lid":"7252766176843880442","success_status":"success","disabled_status":"fail_ssr_disabled","bad_preloaders_status":"fail_bad_preloaders","unknown_boundaries_status":"fail_unknown_boundaries","ROOT":"root","eid":"mount_0_0_MB","should_ignore_static_id":false,"gks":{"comet_content_visibility_for_ssr":false,"comet_ssr_wait_for_dev":false,"ssr_killswitch":true,"mwp_ssr_enabled":true}}]]]}</script>
+<script>requireLazy(["JSScheduler"],function(j){j.makeSchedulerGlobalEntry(null,false)})</script>
+<script>requireLazy(["JSScheduler","ServerJS","ScheduledApplyEach"],function(JSScheduler,ServerJS,ScheduledApplyEach){qpl_inl("7252766176843880442","tierOneBeforeScheduler");JSScheduler.runWithPriority(3,function(){qpl_inl("7252766176843880442","tierOneInsideScheduler");(new ServerJS()).handleWithCustomApplyEach(ScheduledApplyEach,{"define":[["IntlCurrentLocale",[],{"code":"en_US"},5954],["CometPersistQueryParams",[],{"relative":{},"domain":{}},6231],["CookieDomain",[],{"domain":"threads.net"},6421],["JSSelfProfilerTrackedInteractions",[],{"interactions":[]},6918],["CurrentAdAccountInitialData",[],{"AD_ACCOUNT_ID":null},6828],["BootloaderConfig",[],{"deferBootloads":false,"jsRetries":[200,500],"jsRetryAbortNum":2,"jsRetryAbortTime":5,"silentDups":true,"hypStep4":true,"phdOn":false,"btCutoffIndex":51,"fastPathForAlreadyRequired":true,"earlyRequireLazy":false,"translationRetries":[200,500],"translationRetryAbortNum":3,"translationRetryAbortTime":50},329],["CSSLoaderConfig",[],{"timeout":5000,"modulePrefix":"BLCSS:","forcePollForBootloader":true},619],["CookieCoreConfig",[],{"csrftoken":{"t":31449600}},2104],["CurrentCommunityInitialData",[],{},490],["CurrentEnvironment",[],{"facebookdotcom":true,"messengerdotcom":false,"workplacedotcom":false,"instagramdotcom":true,"workdotmetadotcom":false},827],["CurrentUserInitialData",[],{"ACCOUNT_ID":"0","USER_ID":"0","NAME":"","SHORT_NAME":null,"IS_BUSINESS_PERSON_ACCOUNT":false,"HAS_SECONDARY_BUSINESS_PERSON":false,"IS_FACEBOOK_WORK_ACCOUNT":false,"IS_MESSENGER_ONLY_USER":false,"IS_DEACTIVATED_ALLOWED_ON_MESSENGER":false,"IS_MESSENGER_CALL_GUEST_USER":false,"IS_WORK_MESSENGER_CALL_GUEST_USER":false,"IS_WORKROOMS_USER":false,"APP_ID":"238260118697367","IS_BUSINESS_DOMAIN":false,"NON_FACEBOOK_USER_ID":"0","IS_INSTAGRAM_USER":1,"IG_USER_EIMU":"0"},270],["DTSGInitialData",[],{},258],["ISB",[],{},330],["LSD",[],{"token":"rCAtHxRgEYFuaOsWzSe1KN"},323],["RelayAPIConfigDefaults",[],{"accessToken":"","actorID":"0","customHeaders":{"X-IG-App-ID":"238260118697367"},"enableNetworkLogger":false,"fetchTimeout":30000,"graphBatchURI":"\/api\/graphqlbatch\/","graphURI":"\/api\/graphql\/","retryDelays":[1000,3000],"useXController":true,"xhrEncoding":null,"subscriptionTopicURI":null,"withCredentials":false,"isProductionEndpoint":false,"workRequestTaggingProduct":null,"encryptionKeyParams":null},926],["ServerNonce",[],{"ServerNonce":"vfrxVGlSKlvv3xlXPsUVRx"},141],["SiteData",[],{"server_revision":1007796774,"client_revision":1007796774,"tier":"","push_phase":"C3","pkg_cohort":"HYP:barcelona_web_pkg","haste_session":"19544.HYP:barcelona_web_pkg.2.1..0.0","pr":1,"haste_site":"www","manifest_base_uri":"https:\/\/static.xx.fbcdn.net","manifest_origin":null,"manifest_version_prefix":null,"be_one_ahead":true,"is_rtl":false,"is_comet":true,"is_experimental_tier":false,"is_jit_warmed_up":true,"hsi":"7252766176843880442","semr_host_bucket":"6","bl_hash_version":2,"skip_rd_bl":true,"comet_env":29,"wbloks_env":false,"spin":4,"__spin_r":1007796774,"__spin_b":"trunk","__spin_t":1688666217,"vip":"2a03:2880:f248:1c9:face:b00c:0:43fe"},317],["SprinkleConfig",[],{"param_name":"jazoest","version":2,"should_randomize":false},2111],["PromiseUsePolyfillSetImmediateGK",[],{"www_always_use_polyfill_setimmediate":false},2190],["KSConfig",[],{"killed":{"__set":["MLHUB_FLOW_AUTOREFRESH_SEARCH","NEKO_DISABLE_CREATE_FOR_SAP","WORKPLACE_DISPLAY_TEXT_EVIDENCE_REPORTING","BUSINESS_INVITE_FLOW_WITH_SELLER_PROFILE","BUSINESS_GRAPH_SETTING_APP_ASSIGNED_USERS_NEW_API","BUSINESS_GRAPH_SETTING_BU_ASSIGNED_USERS_NEW_API","BUSINESS_GRAPH_SETTING_ESG_ASSIGNED_USERS_NEW_API","BUSINESS_GRAPH_SETTING_PRODUCT_CATALOG_ASSIGNED_USERS_NEW_API","BUSINESS_GRAPH_SETTING_SESG_ASSIGNED_USERS_NEW_API","BUSINESS_GRAPH_SETTING_WABA_ASSIGNED_USERS_NEW_API","FORCE_FETCH_BOOSTED_COMPONENT_AFTER_ADS_CREATION","VIDEO_DIMENSIONS_FROM_PLAYER_IN_UPLOAD_DIALOG","SNIVY_GROUP_BY_EVENT_TRACE_ID_AND_NAME","ADS_STORE_VISITS_METRICS_DEPRECATION","AD_DRAFT_ENABLE_SYNCRHONOUS_FRAGMENT_VALIDATION","SEPARATE_MESSAGING_COMACTIVITY_PAGE_PERMS","LAB_NET_NEW_UI_RELEASE","POCKET_MONSTERS_CREATE","POCKET_MONSTERS_DELETE","WORKPLACE_PLATFORM_SECURE_APPS_MAILBOXES","POCKET_MONSTERS_UPDATE_NAME","IC_DISABLE_MERGE_TOOL_FEED_CHECK_FOR_REPLACE_SCHEDULE","ADS_EPD_IMPACTED_ADVERTISER_MIGRATE_XCONTROLLER","BIZ_INBOX_POP_UP_TIP_NAVIGATION_BUG_FIX","SRT_REVIEW_DISABLE_FELLOWSHIP_REVIEW","EO_STORE_HOME_PAGE_COVID19_BANNER","TPA_SRT_TRANSLATION","WORKROOMS_REQUEST_TAGGING_TAG_NO_INIT_BY_VC_GALAXY"]},"ko":{"__set":["3OsLvnSHNTt","1G7wJ6bJt9K","8NAceEy9JZo","7FOIzos6XJX","4j36SVzvP3w","4NSq3ZC4ScE","53gCxKq281G","3yzzwBY7Npj","1onzIv0jH6H","8PlKuowafe8","4SIH2GRVX5W","2dhqRnqXGLQ","2WgiNOrHVuC","amKHb4Cw4WI","8rDvN9vWdAK","5BdzWGmfvrA","DDZhogI19W","acrJTh9WGdp","1oOE64fL4wO","5XCz1h9Iaw3","7r6mSP7ofr2","6DGPLrRdyts","aWxCyi1sEC7","awYA7fn2Bse","aBMlJ8QRPWE","Fl3bH3ozLe","3sKizTQ6byg","6XsXQ2qHw8y"]}},2580],["TimeSliceInteractionSV",[],{"on_demand_reference_counting":true,"on_demand_profiling_counters":true,"default_rate":1000,"lite_default_rate":100,"interaction_to_lite_coinflip":{"ADS_INTERFACES_INTERACTION":0,"ads_perf_scenario":0,"ads_wait_time":0,"Event":1},"interaction_to_coinflip":{"ADS_INTERFACES_INTERACTION":1,"ads_perf_scenario":1,"ads_wait_time":1,"Event":100},"enable_heartbeat":true,"maxBlockMergeDuration":0,"maxBlockMergeDistance":0,"enable_banzai_stream":true,"user_timing_coinflip":50,"banzai_stream_coinflip":0,"compression_enabled":true,"ref_counting_fix":false,"ref_counting_cont_fix":false,"also_record_new_timeslice_format":false,"force_async_request_tracing_on":false},2609],["CurrentBusinessUser",[],{"business_id":null,"business_persona_id":null,"business_role":null,"business_user_id":null,"businessAccountName":null,"email":null,"first_name":null,"ip_permission":null,"isBusinessPerson":false,"isFacebookWorkAccount":false,"isInstagramBusinessPerson":false,"isEnterpriseBusiness":false,"shouldHideComponentsByUnsupportedFirstPartyTools":false,"shouldShowAccountSwitchComponents":false,"isUserOptInAccountSwitchInfraUpgrade":false,"business_profile_pic_url":null,"enterprise_profile_pic_url":null,"isTwoFacNewFlow":false,"last_name":null,"personal_user_id":"0","is_ads_feature_limited":null,"is_business_banhammered":null,"expiry_time":null,"has_verified_email":null,"permitted_business_account_task_ids":[]},2654],["JSErrorLoggingConfig",[],{"appId":238260118697367,"extra":[],"reportInterval":50,"sampleWeight":1,"sampleWeightKey":"__jssesw","projectBlocklist":[]},2776],["CookieCoreLoggingConfig",[],{"maximumIgnorableStallMs":16.67,"sampleRate":9.7e-5,"sampleRateClassic":1.0e-10,"sampleRateFastStale":1.0e-8},3401],["ImmediateImplementationExperiments",[],{"prefer_message_channel":true},3419],["DTSGInitData",[],{"token":"","async_get_token":""},3515],["UriNeedRawQuerySVConfig",[],{"uris":["dms.netmng.com","doubleclick.net","r.msn.com","watchit.sky.com","graphite.instagram.com","www.kfc.co.th","learn.pantheon.io","www.landmarkshops.in","www.ncl.com","s0.wp.com","www.tatacliq.com","bs.serving-sys.com","kohls.com","lazada.co.th","xg4ken.com","technopark.ru","officedepot.com.mx","bestbuy.com.mx","booking.com","nibio.no"]},3871],["InitialCookieConsent",[],{"deferCookies":false,"initialConsent":[1,2],"noCookies":false,"shouldShowCookieBanner":false},4328],["JSSelfProfilerConfig",[],{"SAMPLE_INTERVAL":10,"MAX_BUFFER_SIZE":3000,"WARMUP_RESTART_INTERVAL":300000,"SAMPLE_RATE":1000},4360],["CometAltpayJsSdkIframeAllowedDomains",[],{"allowed_domains":["https:\/\/live.adyen.com","https:\/\/integration-facebook.payu.in","https:\/\/facebook.payulatam.com","https:\/\/secure.payu.com","https:\/\/facebook.dlocal.com","https:\/\/buy2.boku.com"]},4920],["QuickMarkersConfig",[],{"pageLoadEventId":"7252766176843880442","pageLoadScriptPath":"IGXBarcelonaPostController","sampleWeight":null},4953],["BootloaderEndpointConfig",[],{"debugNoBatching":false,"maxBatchSize":-1,"endpointURI":"https:\/\/www.threads.net\/ajax\/bootloader-endpoint\/"},5094],["CookieConsentIFrameConfig",[],{"consent_param":"FQAREhISAA==.ARYhz6f1gY6sHz3Ai_Z1DagGH85wLy0FDGpvm6fcLcUcTnUy","allowlisted_iframes":[]},5540],["USIDMetadata",[],{"browser_id":"?","tab_id":"","page_id":"Prxdz6x79gs3w","transition_id":0,"version":6},5888],["ServerTimeData",[],{"serverTime":1688666217715,"timeOfRequestStart":1688666217598,"timeOfResponseStart":1688666217708.5},5943],["TransportSelectingClientContextualConfig",[],{"rawConfig":"{\"name\":\"rti\/web_rs_transport_selecting_client\",\"cctype\":\"dense\",\"version\":1,\"policy_id\":\"static\",\"sample_rate\":1000,\"contexts\":[{\"name\":\"method\",\"type\":\"STRING\",\"callsite\":true,\"buckets\":[{\"name\":\"rollout_group_1\",\"strategy\":\"in\",\"values\":[\"FBGQLS:FEEDBACK_LIKE_SUBSCRIBE\",\"Falco\",\"FBLQ:comet_notifications_live_query_experimental\"]},{\"name\":\"rollout_group_6\",\"strategy\":\"in\",\"values\":[\"FBGQLS:COMMENT_CREATE_SUBSCRIBE\",\"FBGQLS:COMMENT_LIKE_SUBSCRIBE\",\"FBGQLS:FEEDBACK_COMMENT_PERMISSION_TOGGLE_SUBSCRIBE\",\"FBGQLS:FEEDBACK_TYPING_SUBSCRIBE\"]},{\"name\":\"rollout_group_4\",\"strategy\":\"regex\",\"values\":[\"FBGQLS:.*\"]},{\"name\":\"rollout_group_3\",\"strategy\":\"regex\",\"values\":[\"FBLQ:.*\"]},{\"name\":\"skywalker\",\"strategy\":\"in\",\"values\":[\"SKY:test_topic\",\"live\/api\/copyright\",\"intern_notify\",\"locplat\/ttm\",\"rti_widget_dashboard\",\"srt\/user_metrics_counter\",\"media_manager_instagram_composer_create_update\",\"cubism_annotations\/fleet_health\",\"srt\/notifications\",\"ads\/reporting\/snapshot\",\"unidash\/widget\",\"cubism_annotations\",\"ads\/reporting\/export\",\"pubx\/notification\/update\",\"ads\/powereditor\/import\",\"lwi_async_create\",\"video_edit\",\"metric_graph_realtime\",\"vcc_video_posting_www\",\"cms\/object_archive_copy_created\",\"cms\/branch_updated\",\"cms\/object_saved\",\"codeless_event_tracking\",\"srt\/job_updated\",\"video_broadcast\",\"video\/broadcast\/error\",\"vcpanel\/api\",\"lwi_everywhere_plugin\",\"commercial_break_v2\",\"advanced_analytics\/query\",\"cubism_annotations\/ads_mastercook_models\",\"gqls\/comment_like_subscribe\",\"live\/api\/copyright\",\"shiba\/mock_bot_error\",\"shiba\/save_state\",\"video_list_publishing_progress_update\",\"assistant_wizard\",\"gizmo\/manage\",\"collab\/presentation\/request\",\"snaptu\/push_notif\"]},{\"name\":\"skywalker_bulletin\",\"strategy\":\"in\",\"values\":[\"www\/sr\/hot_reload\"]},{\"name\":\"rollout_group_5\",\"strategy\":\"regex\",\"values\":[\"Collabri|RealtimeClientSync:.*\"]},{\"name\":\"default\",\"strategy\":\"catch_all\"}]}],\"outputs\":[{\"name\":\"group\",\"type\":\"STRING\"},{\"name\":\"dgwUpsampleMultiplier\",\"type\":\"FLOAT\"}],\"vector\":[\"group1\",\"0.01\",\"group6\",\"0.001\",\"group4\",\"1.0\",\"group3\",\"1.0\",\"skywalker\",\"1.0\",\"skywalker_bulletin\",\"1.0\",\"group5\",\"1.0\",\"default_group\",\"1.0\"],\"vectorDefaults\":[\"default_group\",\"1.0\"],\"timestamp\":1663366072}"},5968],["InstagramUserAgent",[],{"is_chrome":false,"is_edge":false,"is_edge_chromium_based":false,"is_edge_legacy":false,"is_firefox":false,"is_ig_carbon":false,"is_ig_lite":false,"is_ig_webview":false,"is_barcelona_webview":false,"is_igtv_webview":false,"is_in_app_browser":false,"is_ios":false,"is_ipad":false,"is_macos":false,"is_mobile":false,"is_mobile_safari":false,"is_oculus_browser":false,"is_opera":false,"is_safari":false,"is_supported_browser":false,"is_twitter_webview":false,"is_uc_browser":false,"is_vapid_eligible":false,"is_webview":false,"user_agent":"curl\/8.1.2"},6088],["IntlVariationHoldout",[],{"disable_variation":false},6533],["CometUrlTransformsConfig",[],{"should_remove_trailing_slash":true},6589],["RtiWebRequestStreamClient",[],{"ThrottledMethods":{},"overrideHeaders":{}},6639],["IntlNumberTypeProps",["IntlCLDRNumberType05"],{"module":{"__m":"IntlCLDRNumberType05"}},7027],["FbtResultGK",[],{"shouldReturnFbtResult":true,"inlineMode":"NO_INLINE"},876],["IntlPhonologicalRules",[],{"meta":{},"patterns":{}},1496],["IntlViewerContext",[],{"GENDER":3,"regionalLocale":null},772],["LinkshimHandlerConfig",[],{"supports_meta_referrer":false,"default_meta_referrer_policy":"default","switched_meta_referrer_policy":"origin","non_linkshim_lnfb_mode":"ie","link_react_default_hash":"AT0DULOu-X9C8Q3jHiei16QPglO80VEIIOmWDI8-yUk31IcIjIq7qtCptJqgPnB43-TeDfmFknldcSToNfm5K6DfNPm_t0lN_poMYxI3aCxE5AUhEKrIYjGnW2w9ooRFGeYZTg","untrusted_link_default_hash":"AT1l54heue0gPLrXEJ5QB7RF4GVpO9dpln2m_LIlSNaIOrDABo8yH6HvNOOeeZiqQLTit7xO4yCDS2eXN9wOY_6tfZJ8KtryxoY4_RbLU3_icpd_3hbszME9wI0eZRBZlseRbQ","linkshim_host":"l.instagram.com","linkshim_path":"\/","linkshim_enc_param":"e","linkshim_url_param":"u","use_rel_no_opener":false,"use_rel_no_referrer":false,"always_use_https":false,"onion_always_shim":true,"middle_click_requires_event":false,"www_safe_js_mode":"hover","m_safe_js_mode":null,"ghl_param_link_shim":false,"click_ids":null,"is_linkshim_supported":false,"current_domain":"threads.net","blocklisted_domains":["ad.doubleclick.net","ads-encryption-url-example.com","bs.serving-sys.com","ad.atdmt.com","adform.net","ad13.adfarm1.adition.com","ilovemyfreedoms.com","secure.adnxs.com"],"is_mobile_device":false},27],["NumberFormatConfig",[],{"decimalSeparator":",","numberDelimiter":".","minDigitsForThousandsSeparator":4,"standardDecimalPatternInfo":{"primaryGroupSize":3,"secondaryGroupSize":3},"numberingSystemData":null},54],["UserAgentData",[],{"browserArchitecture":"32","browserFullVersion":"8.1.2","browserMinorVersion":1,"browserName":"Curl","browserVersion":8,"deviceName":"Unknown","engineName":"Unknown","engineVersion":null,"platformArchitecture":"32","platformName":"Unknown","platformVersion":null,"platformFullVersion":null},527],["ZeroCategoryHeader",[],{},1127],["ZeroRewriteRules",[],{"rewrite_rules":{},"whitelist":{"\/hr\/r":1,"\/hr\/p":1,"\/zero\/unsupported_browser\/":1,"\/zero\/policy\/optin":1,"\/zero\/optin\/write\/":1,"\/zero\/optin\/legal\/":1,"\/zero\/optin\/free\/":1,"\/about\/privacy\/":1,"\/about\/privacy\/update\/":1,"\/privacy\/explanation\/":1,"\/zero\/toggle\/welcome\/":1,"\/zero\/toggle\/nux\/":1,"\/zero\/toggle\/settings\/":1,"\/fup\/interstitial\/":1,"\/work\/landing":1,"\/work\/login\/":1,"\/work\/email\/":1,"\/ai.php":1,"\/js_dialog_resources\/dialog_descriptions_android.json":0,"\/connect\/jsdialog\/MPlatformAppInvitesJSDialog\/":0,"\/connect\/jsdialog\/MPlatformOAuthShimJSDialog\/":0,"\/connect\/jsdialog\/MPlatformLikeJSDialog\/":0,"\/qp\/interstitial\/":1,"\/qp\/action\/redirect\/":1,"\/qp\/action\/close\/":1,"\/zero\/support\/ineligible\/":1,"\/zero_balance_redirect\/":1,"\/zero_balance_redirect":1,"\/zero_balance_redirect\/l\/":1,"\/l.php":1,"\/lsr.php":1,"\/ajax\/dtsg\/":1,"\/checkpoint\/block\/":1,"\/exitdsite":1,"\/zero\/balance\/pixel\/":1,"\/zero\/balance\/":1,"\/zero\/balance\/carrier_landing\/":1,"\/zero\/flex\/logging\/":1,"\/tr":1,"\/tr\/":1,"\/sem_campaigns\/sem_pixel_test\/":1,"\/bookmarks\/flyout\/body\/":1,"\/zero\/subno\/":1,"\/confirmemail.php":1,"\/policies\/":1,"\/mobile\/internetdotorg\/classifier\/":1,"\/zero\/dogfooding":1,"\/xti.php":1,"\/zero\/fblite\/config\/":1,"\/hr\/zsh\/wc\/":1,"\/ajax\/bootloader-endpoint\/":1,"\/mobile\/zero\/carrier_page\/":1,"\/mobile\/zero\/carrier_page\/education_page\/":1,"\/mobile\/zero\/carrier_page\/feature_switch\/":1,"\/mobile\/zero\/carrier_page\/settings_page\/":1,"\/aloha_check_build":1,"\/upsell\/zbd\/softnudge\/":1,"\/mobile\/zero\/af_transition\/":1,"\/mobile\/zero\/af_transition\/action\/":1,"\/mobile\/zero\/freemium\/":1,"\/mobile\/zero\/freemium\/redirect\/":1,"\/mobile\/zero\/freemium\/zero_fup\/":1,"\/privacy\/policy\/":1,"\/privacy\/center\/":1,"\/data\/manifest\/":1,"\/4oh4.php":1,"\/autologin.php":1,"\/birthday_help.php":1,"\/checkpoint\/":1,"\/contact-importer\/":1,"\/cr.php":1,"\/legal\/terms\/":1,"\/login.php":1,"\/login\/":1,"\/mobile\/account\/":1,"\/n\/":1,"\/remote_test_device\/":1,"\/upsell\/buy\/":1,"\/upsell\/buyconfirm\/":1,"\/upsell\/buyresult\/":1,"\/upsell\/promos\/":1,"\/upsell\/continue\/":1,"\/upsell\/h\/promos\/":1,"\/upsell\/loan\/learnmore\/":1,"\/upsell\/purchase\/":1,"\/upsell\/promos\/upgrade\/":1,"\/upsell\/buy_redirect\/":1,"\/upsell\/loan\/buyconfirm\/":1,"\/upsell\/loan\/buy\/":1,"\/upsell\/sms\/":1,"\/wap\/a\/channel\/reconnect.php":1,"\/wap\/a\/nux\/wizard\/nav.php":1,"\/wap\/appreg.php":1,"\/wap\/birthday_help.php":1,"\/wap\/c.php":1,"\/wap\/confirmemail.php":1,"\/wap\/cr.php":1,"\/wap\/login.php":1,"\/wap\/r.php":1,"\/zero\/datapolicy":1,"\/a\/timezone.php":1,"\/a\/bz":1,"\/bz\/reliability":1,"\/r.php":1,"\/mr\/":1,"\/reg\/":1,"\/registration\/log\/":1,"\/terms\/":1,"\/f123\/":1,"\/expert\/":1,"\/experts\/":1,"\/terms\/index.php":1,"\/terms.php":1,"\/srr\/":1,"\/msite\/redirect\/":1,"\/fbs\/pixel\/":1,"\/contactpoint\/preconfirmation\/":1,"\/contactpoint\/cliff\/":1,"\/contactpoint\/confirm\/submit\/":1,"\/contactpoint\/confirmed\/":1,"\/contactpoint\/login\/":1,"\/preconfirmation\/contactpoint_change\/":1,"\/help\/contact\/":1,"\/survey\/":1,"\/upsell\/loyaltytopup\/accept\/":1,"\/settings\/":1,"\/lite\/":1,"\/zero_status_update\/":1,"\/operator_store\/":1,"\/upsell\/":1,"\/wifiauth\/login\/":1}},1478],["WebDevicePerfClassData",[],{"deviceLevel":"unknown","yearClass":null},3665],["FBDomainsSVConfig",[],{"domains":{"__map":[["www.facebook.com",1],["tfbnw.net",1],["m.beta.facebook.com",1],["touch.beta.facebook.com",1],["www.dev.facebook.com",1],["fb.me",1],["s.fb.com",1],["m.fbjs.facebook.com",1],["facebook.com.es",1],["www.fbjs.facebook.com",1],["m.facebook.com",1],["facebook.fr",1],["fbsbx.com",1],["embed.fbsbx.com",1],["attachment.fbsbx.com",1],["lookaside.fbsbx.com",1],["web.facebook.com",1],["fb.com",1],["messenger.com",1],["secure.facebook.com",1],["secure.my-od.facebook.com",1],["www.my-od.facebook.com",1]]}},3828],["ClickIDDomainBlacklistSVConfig",[],{"domains":["craigslist","tfbnw.net","flashtalking.com","canadiantire.ca","o2.co.uk","archive.org","reddit.com","redd.it","gmail.com","cvk.gov.ua","electoralsearch.in","yahoo.com","cve.mitre.org","usenix.org","ky.gov","voteohio.gov","vote.pa.gov","oversightboard.com","wi.gov","pbs.twimg.com","media.discordapp.net","vastadeal.com","theaustralian.com.au","alloygator.com","elsmannimmobilien.de","news.com.au","dennisbonnen.com","stoett.com","investorhour.com","perspectivasur.com","bonnegueule.fr","firstent.org","twitpic.com","kollosche.com.au","nau.edu","arcourts.gov","lomberg.de","network4.hu","balloonrace.com","awstrack.me","ic3.gov","sos.wyo.gov","cnpq.br","0.discoverapp.com","apple.com","apple.co","dinn.com.mx","soriana.com"]},3829],["CometDarkModeSetting",[],{"initialGuessForDarkModeOnClient":false,"initialClientStateGuess":false,"initialSetting":"UNDECLARED"},4414],["CometCustomKeyCommands",[],{"customCommands":{},"areSingleKeysDisabled":null,"modifiedKeyboardShortcutsPreference":4},4521],["CometRelayConfig",[],{"gc_release_buffer_size":50},4685],["TimeSpentWWWCometConfig",[],{"CONFIG":{"0_delay":0,"0_timeout":8,"delay":1000,"timeout":64}},4748],["CometMaxEnqueuedToastsSitevarConfig",[],{"max":2},4763],["MqttWebDeviceID",[],{"clientID":"190f631e-a0d2-4210-a11d-04f6b3010f6d"},5003],["LiveQueryWebRelayKillList",[],{"liveQueryWebRelayKillList":["test_example_config_id_to_be_killed","data_studio_nav_pane_collections_section","work_recruiting_home_tasks"]},5050],["WebDriverConfig",[],{"isTestRunning":false,"isJestE2ETestRun":false,"isXRequestConfigEnabled":false,"auxiliaryServiceInfo":{},"testPath":null,"originHost":null},5332],["LiveQueryWebClientPollingSwitchList",[],{"liveQueryWebClientPollingSwitchList":{"example_config_id_to_be_switched":10000}},5842],["WebConnectionClassServerGuess",[],{"connectionClass":"EXCELLENT"},4705],["FbtQTOverrides",[],{"overrides":{}},551],["AnalyticsCoreData",[],{"device_id":"$^|Acb3cumc8eJfFqI0FqNPG-gpJxk-2AMkJBqiMep3D1HdwXch_T-353AX-YSR1OTi6EeK4ZQyNNB9tVuqZWqt1ZYtbUHrshNbF6zJNxjZY5NYTcqpIOMg7X0bi4UkKOFuLniXyvfwLHIjhCre5RbT1F6sU7Lk|fd.AcYj9azKpY-T2vDMipNGtkK9U7hfXzEuNN3dgn6gFZ4cvABNZU0Z9yRqWqobc5AdOOGC1WDjikOsmWjKDcnmCyHZ","app_id":"238260118697367","enable_bladerunner":false,"enable_ack":true,"push_phase":"C3","enable_observer":false,"enable_cmcd_observer":false,"enable_dataloss_timer":false,"enable_fallback_for_br":true,"queue_activation_experiment":true,"max_delay_br_queue":60000,"max_delay_br_queue_immediate":3,"consents":{},"app_universe":1,"br_stateful_batching_exp":true,"enable_br_stateful_batching":false,"identity":{"appScopedIdentity":"","claim":"hmac.AR3UwyKLQlxkidd1krryXe3z7R07Qf3M2CwzkJOCccPtsZD_"}},5237],["cr:70",["FBInteractionTracingDependencies"],{"__rc":["FBInteractionTracingDependencies","Aa1hy0Xxx7TZ7p1EBGgJDq_7P6Wtaa-xYsrfS_IQTM2uZCzMYW59EWzT_RkDhW_u8E-8viNsIzHXdYvEJXF80-hjIwB6gHIBVA"]},-1],["cr:449",["vc-tracker"],{"__rc":["vc-tracker","Aa2Dd_wiBxJM0IdTczQqBC3cXRrPDxPmFhkQtxrvf9Q4D-CCYBq1OsyQnvxagL4zSZeBT1HT0IdkztGbfDWmymUFOh_jAULHCH8jBUp_I_ZE"]},-1],["cr:686",[],{"__rc":[null,"Aa26RzjOYX8S8o0_s7_IaEL1nrOGbklNowLBARvwlo7JpQZY2JDJ6cB2FWOcNNibpN4oQjLz_h8HOoVjhmImffhigQ"]},-1],["cr:734",[],{"__rc":[null,"Aa1KG6nBoFNC1WhOzcWRkEQGhyAfowqqgaShR58xZlr65IyqsRAWtcdHLdbW5syBLKtwEl0hqmWdzSMdy3dz62vRJFEVTQY31mgFWLo"]},-1],["cr:1126",["TimeSliceSham"],{"__rc":["TimeSliceSham","Aa3HfswnhZNyNZGYeEX4yOCmK6ALnHuUyM16qlnSVVobUPrpqwYeVFSItYKZYs-hFw9TN_p_-lNbPSGPbZT0L9o"]},-1],["cr:3798",[],{"__rc":[null,"Aa2OpfdXl2KfvzE90V1geOoO1kuuS9QWVTILFtd40SawfEPglDHe8-5Wbt6sju6iLpl4sZPeB4XrWkNIYj4XtJ3cPukefQf7ArY"]},-1],["cr:6640",[],{"__rc":[null,"Aa37-cSfjONz2QWvAV4mxK75_bIMkudnmTMhCBe-ysFxEetcizZGSwjuwQ_2wSEsMnybm3cbj7GJu0gCdfX1NSePne62Yw"]},-1],["cr:683059",["CometVisualCompletion"],{"__rc":["CometVisualCompletion","Aa2Dd_wiBxJM0IdTczQqBC3cXRrPDxPmFhkQtxrvf9Q4D-CCYBq1OsyQnvxagL4zSZeBT1HT0IdkztGbfDWmymUFOh_jAULHCH8jBUp_I_ZE"]},-1],["cr:696703",["JSScheduler"],{"__rc":["JSScheduler","Aa1BcYjypchcS4HoRErgm5XuT2MvKoSv6CC6oo9YrT51-ys02VdgfyysCsypBIjSZTnCiRuaO5Suw2sMFikNlYWaXBs"]},-1],["cr:719780",[],{"__rc":[null,"Aa0MsegWhQl87HNF6STwUR-xyFnnHVZA2jNjwUAq_KPLMD4opNnFhJATL5faX0wVy7wo5nwW3JfCQiBCj4U"]},-1],["cr:806696",["clearTimeoutComet"],{"__rc":["clearTimeoutComet","Aa1BcYjypchcS4HoRErgm5XuT2MvKoSv6CC6oo9YrT51-ys02VdgfyysCsypBIjSZTnCiRuaO5Suw2sMFikNlYWaXBs"]},-1],["cr:807042",["setTimeoutComet"],{"__rc":["setTimeoutComet","Aa1BcYjypchcS4HoRErgm5XuT2MvKoSv6CC6oo9YrT51-ys02VdgfyysCsypBIjSZTnCiRuaO5Suw2sMFikNlYWaXBs"]},-1],["cr:896461",["setIntervalComet"],{"__rc":["setIntervalComet","Aa1BcYjypchcS4HoRErgm5XuT2MvKoSv6CC6oo9YrT51-ys02VdgfyysCsypBIjSZTnCiRuaO5Suw2sMFikNlYWaXBs"]},-1],["cr:896462",["setIntervalComet"],{"__rc":["setIntervalComet","Aa1BcYjypchcS4HoRErgm5XuT2MvKoSv6CC6oo9YrT51-ys02VdgfyysCsypBIjSZTnCiRuaO5Suw2sMFikNlYWaXBs"]},-1],["cr:925100",["RunComet"],{"__rc":["RunComet","Aa1BcYjypchcS4HoRErgm5XuT2MvKoSv6CC6oo9YrT51-ys02VdgfyysCsypBIjSZTnCiRuaO5Suw2sMFikNlYWaXBs"]},-1],["cr:986633",["setTimeoutComet"],{"__rc":["setTimeoutComet","Aa1BcYjypchcS4HoRErgm5XuT2MvKoSv6CC6oo9YrT51-ys02VdgfyysCsypBIjSZTnCiRuaO5Suw2sMFikNlYWaXBs"]},-1],["cr:1003267",["clearIntervalComet"],{"__rc":["clearIntervalComet","Aa1BcYjypchcS4HoRErgm5XuT2MvKoSv6CC6oo9YrT51-ys02VdgfyysCsypBIjSZTnCiRuaO5Suw2sMFikNlYWaXBs"]},-1],["cr:1108857",[],{"__rc":[null,"Aa1nOQ5HQ6nQgSeZCBP_QlSRb5gr5c5hSJAA8OTGxoB2SjKcUsS28P15G8MxUPXFAy6jjJwXe0NjWp0K-w"]},-1],["cr:1294158",["React.classic"],{"__rc":["React.classic","Aa1P3LK7i1coXutKq2XRt8R5njetcCVpx-Eu6ASsS2GS5mUhdmoq8u3Qb1o44ez0jd3r85uu7hrhQCGomNU16KLHG56W"]},-1],["cr:1294159",["ReactDOM.classic"],{"__rc":["ReactDOM.classic","Aa1P3LK7i1coXutKq2XRt8R5njetcCVpx-Eu6ASsS2GS5mUhdmoq8u3Qb1o44ez0jd3r85uu7hrhQCGomNU16KLHG56W"]},-1],["cr:1540330",[],{"__rc":[null,"Aa2n6YV_kpGY--ZcD8YrviLTGmB54ByrJOK--EticGkfPXkUypplO34n1YhY7-CkfRQbWhBpv40uOdnVwhjBvCirn6xwDmvIPAmAnuS8WILdBJK3EQ"]},-1],["cr:1642797",["BanzaiComet"],{"__rc":["BanzaiComet","Aa1BcYjypchcS4HoRErgm5XuT2MvKoSv6CC6oo9YrT51-ys02VdgfyysCsypBIjSZTnCiRuaO5Suw2sMFikNlYWaXBs"]},-1],["cr:1703077",[],{"__rc":[null,"Aa3iBPPVub7lUqWTB9xbuYk-7TzfBsL2kZYGCh5BmYWTUaKtvMxXyMRRPB3h1DM7H57pnP1Qm7ue_-sBC5ClvghTCi3E3g"]},-1],["cr:1984081",[],{"__rc":[null,"Aa1f_aEISiotjPYtNA14b_BTq9LQRrQwBlH0Imkje24xvMUZ_eys6EI0-5ARb1ta56gVrr0Se0mtH0dBTB0k-8mRnVFf"]},-1],["cr:2010754",[],{"__rc":[null,"Aa3b4yLKHtGaNJ_XWzlJUrfMVA_mbosdFnqKLlzxeCNVb7DBGrO7Fb8_wDDhNqbHy2gEBzWv210iWshFc_hCD24WUysFxUU"]},-1],["cr:69",["CometRouterFocusRegion.react"],{"__rc":["CometRouterFocusRegion.react","Aa1P3LK7i1coXutKq2XRt8R5njetcCVpx-Eu6ASsS2GS5mUhdmoq8u3Qb1o44ez0jd3r85uu7hrhQCGomNU16KLHG56W"]},-1],["cr:267",[],{"__rc":[null,"Aa1EeAq5G6HVBaCfada5-Ft79fF9nYWpS-czCeEczQBub4qb9hA1TgESA7GhtF0vbqfDOGIAOrHuLHzWow6m0cWqQFMC_L2dd9gxVA"]},-1],["cr:641",["handleCometErrorCodeSideEffects"],{"__rc":["handleCometErrorCodeSideEffects","Aa1SfRo11iwNwD91YNIl-Ot_dpxY0AmZNrfma041E-RYk4XgQfphIItVdgymh1GIrGJ59n5gOq0snETN4vBP5kLpDbyuL7qPegDSLeoo"]},-1],["cr:795",[],{"__rc":[null,"Aa0YC-1FA1t6z-ivbb0ZBXEM6OY068hCZj7it1bPFefUr8SCSKaAwlxgsWdBW3BUcz8eNKloMWW5bvuZNNoMtfaTBiik1Y_DDg"]},-1],["cr:805",["CometDialogErrorRoot.react"],{"__rc":["CometDialogErrorRoot.react","Aa1P3LK7i1coXutKq2XRt8R5njetcCVpx-Eu6ASsS2GS5mUhdmoq8u3Qb1o44ez0jd3r85uu7hrhQCGomNU16KLHG56W"]},-1],["cr:851",[],{"__rc":[null,"Aa3jVwX7Ki72cSmonoTYvgh1dwS8rLfX4BrE3z4r3eHDQxY06NwMg7nQZ-o-jw5uKxt6Q0fPeYtK0YCe2Gd2W8MLGeepKB0HUg"]},-1],["cr:866",[],{"__rc":[null,"Aa26RzjOYX8S8o0_s7_IaEL1nrOGbklNowLBARvwlo7JpQZY2JDJ6cB2FWOcNNibpN4oQjLz_h8HOoVjhmImffhigQ"]},-1],["cr:945",[],{"__rc":[null,"Aa3jVwX7Ki72cSmonoTYvgh1dwS8rLfX4BrE3z4r3eHDQxY06NwMg7nQZ-o-jw5uKxt6Q0fPeYtK0YCe2Gd2W8MLGeepKB0HUg"]},-1],["cr:1024",[],{"__rc":[null,"Aa0o2p2iI2Dt5eR2RXvmlBAtqeugW_kIHs_l3_F1H-j4x9ANhB8kYsa-ms1OD5EtBhbt1HKBSSHfR01Ob6DHx4KkjomsWI62WQAMITQuPAcbWg4vRIZymcd4h00i"]},-1],["cr:1070",["lowerDomainComet"],{"__rc":["lowerDomainComet","Aa2RQB7OBFlkDwwge-7AM7m2aANjjKhHjmOzpeMqcAq6RUz95crNdjD8C7GD48ZXmlzlE7tWhRscMqTtmo3rMd0XuK0KoeMfpdpO"]},-1],["cr:1196",["handleCometReauthenticationSideEffects"],{"__rc":["handleCometReauthenticationSideEffects","Aa1SfRo11iwNwD91YNIl-Ot_dpxY0AmZNrfma041E-RYk4XgQfphIItVdgymh1GIrGJ59n5gOq0snETN4vBP5kLpDbyuL7qPegDSLeoo"]},-1],["cr:2011",[],{"__rc":[null,"Aa3fpg1nwvPoD2toUYheQhHK-iKL-JORtsIUUSwJoUnpD72pI5w1o3A529yAWmUOyTkaPWp-mrPM9z8xC2WIQXI0rKbjZyw"]},-1],["cr:2099",[],{"__rc":[null,"Aa00XVwlfTt87mtWa1gWXJRiPcoZAcfEEK-bjwSsWMi3s7DSGAk5vyOWIrE6qatGSYHJoSO66CdCcSX45hWcRc0ZdvKQ3G4-luQyzw1Rl_UsUT4p6eyDY-Bs"]},-1],["cr:2654",[],{"__rc":[null,"Aa26RzjOYX8S8o0_s7_IaEL1nrOGbklNowLBARvwlo7JpQZY2JDJ6cB2FWOcNNibpN4oQjLz_h8HOoVjhmImffhigQ"]},-1],["cr:2682",["warningComet"],{"__rc":["warningComet","Aa1BcYjypchcS4HoRErgm5XuT2MvKoSv6CC6oo9YrT51-ys02VdgfyysCsypBIjSZTnCiRuaO5Suw2sMFikNlYWaXBs"]},-1],["cr:2928",["relay-runtime"],{"__rc":["relay-runtime","Aa1x0v0A48nFwLmkHRDypU84cEkmnbnV4d9oV3n_GOAlkdg_8zbQvCxYnASYq3Tbovgr2iKz8mADZmIyhPQ4AFpr97BDUKpdHYyhVA"]},-1],["cr:3832",[],{"__rc":[null,null]},-1],["cr:3919",[],{"__rc":[null,"Aa36xTM4Z-FdCZZu3LcJep3lEqoZ4wLF4cJ6ozQ_uGRnP84hTRrc4pdb61p2P1A9baKk6gnM1meKw2CBySpni3MYi3Kl"]},-1],["cr:4001",[],{"__rc":[null,"Aa0bInlCnc3JqfEr5KM_e05aDecOpf_X5KQeoVNbRN1MHiUJNuEfqPJhk6bhZqBm3PwoMvMcfsg0XY5cp34sQ6g"]},-1],["cr:4166",[],{"__rc":[null,null]},-1],["cr:4345",[],{"__rc":[null,"Aa3vT5lE0k3dd5bzFpgy7Bbld1DBcmG8NEZDeOIlGFUIn1T-i4DfYEdWz8cZJCvR9it2XX1LhSExzkmckchbuK2qzWFRS_MH4JM"]},-1],["cr:4874",[],{"__rc":[null,"Aa1_FuIG5QnuLGP0b1vbQgUCf-4IY9eOPGItNRTDTH20jgx4wt2k535ZSMp0BSRcsHQ8P9o_pIHMfjmpAUk"]},-1],["cr:4964",["FalcoLoggerTransportsDeferred"],{"__rc":["FalcoLoggerTransportsDeferred","Aa0vkUlkYxDkCBO_p8HWjyDGuouEUbarfAyJJErJdhZdnvvQFvp_MIWF5E6cLPR5bO6K6LRTrgrbm-6CV0jrmmRP7Tu7-qUoEAOpTC4BriaZoxRUAs8"]},-1],["cr:5128",[],{"__rc":[null,"Aa0pYZjRXPISf9EhTnDCVT_cFbNSWwV2hu-OE7LmtPBdr_1KCDv2H40f9_8a8KYNiZXdHi3YgUMh5QLFnh-21YM3aYKEAm0r"]},-1],["cr:5655",[],{"__rc":[null,"Aa2-ioHntcWZb81KJMeMsfAkiMN5t1VJBIqbHG5APsGW9S-8mrFLh97fFkhq9aT0jJ2aFM1V42G3b4zDSpsyIHbjJvE"]},-1],["cr:7332",[],{"__rc":[null,"Aa3C5oHfiXVeqqWJ8-oebmEtqRHjDSynrKycfPPdbD0O9-9mPzYayZY_nGek-pZyi-j9eaMFUm-NoNGLsNIQ3ZL9rnfW6yhh8V_vnW6EtrOa6SD1X-nRo0u_EvqjyxWgfOpP-N9eAA6wLHec6ow"]},-1],["cr:10569",[],{"__rc":[null,"Aa083iJJaK0Um57-t_FiR5_9X00QByIq9sMHDhD6rQbJLl8auXI-cDncFrG_OqXMM_CHU2m3iOfmuaKM0-PqD36kvym00w"]},-1],["cr:11053",[],{"__rc":[null,"Aa3jVwX7Ki72cSmonoTYvgh1dwS8rLfX4BrE3z4r3eHDQxY06NwMg7nQZ-o-jw5uKxt6Q0fPeYtK0YCe2Gd2W8MLGeepKB0HUg"]},-1],["cr:11054",[],{"__rc":[null,"Aa3jVwX7Ki72cSmonoTYvgh1dwS8rLfX4BrE3z4r3eHDQxY06NwMg7nQZ-o-jw5uKxt6Q0fPeYtK0YCe2Gd2W8MLGeepKB0HUg"]},-1],["cr:11192",[],{"__rc":[null,"Aa3jVwX7Ki72cSmonoTYvgh1dwS8rLfX4BrE3z4r3eHDQxY06NwMg7nQZ-o-jw5uKxt6Q0fPeYtK0YCe2Gd2W8MLGeepKB0HUg"]},-1],["cr:11202",[],{"__rc":[null,"Aa1nOQ5HQ6nQgSeZCBP_QlSRb5gr5c5hSJAA8OTGxoB2SjKcUsS28P15G8MxUPXFAy6jjJwXe0NjWp0K-w"]},-1],["cr:12338",["CometErrorRoot.react"],{"__rc":["CometErrorRoot.react","Aa1P3LK7i1coXutKq2XRt8R5njetcCVpx-Eu6ASsS2GS5mUhdmoq8u3Qb1o44ez0jd3r85uu7hrhQCGomNU16KLHG56W"]},-1],["cr:840411",[],{"__rc":[null,"Aa1nOQ5HQ6nQgSeZCBP_QlSRb5gr5c5hSJAA8OTGxoB2SjKcUsS28P15G8MxUPXFAy6jjJwXe0NjWp0K-w"]},-1],["cr:844180",["TimeSpentImmediateActiveSecondsLoggerComet"],{"__rc":["TimeSpentImmediateActiveSecondsLoggerComet","Aa1BcYjypchcS4HoRErgm5XuT2MvKoSv6CC6oo9YrT51-ys02VdgfyysCsypBIjSZTnCiRuaO5Suw2sMFikNlYWaXBs"]},-1],["cr:869493",[],{"__rc":[null,"Aa0ov5dnopHYU5_xKMwwPZdK6pCHEdEwgnBWMCpiXrTVzW5Rnaa8ktFkzmwx1PkqYuOhSkiZXD1N"]},-1],["cr:992073",[],{"__rc":[null,"Aa1pr0_lrhTseYwqMjY4N-U7uE4Pf43yq2T_M7ivobAVWwKdGgPiC0l_bFagxBV5dJSpIZRldr36gNSnFepsgiFn8IMSZU7X"]},-1],["cr:994756",["BaseCometModal.react"],{"__rc":["BaseCometModal.react","Aa19IKzx4PkfgEv46AtugMTpYcUdU04ATDaEdKB7-JASP7tSKrrL7kG2FEKgT6J_KDC9uah8W5VJMV8NOY4"]},-1],["cr:1011783",["CometHeroInteractionImpl.react"],{"__rc":["CometHeroInteractionImpl.react","Aa20IKuLMzvZJf-9Y9mTFRxpUAdfwFPX5kVn2vMr3b22KApa1Af1ZTRY-wb3Oo-83E5ZMpRKA9yQfPo"]},-1],["cr:1064332",[],{"__rc":[null,"Aa3UXTap4vGAFHzjEk84tzDGVwv1PZPFuRCCgPJKnWGcPG7pbpem78iieakbuItpgsTdMjHNqbc7M_4"]},-1],["cr:1069930",["cometAsyncFetch"],{"__rc":["cometAsyncFetch","Aa1BcYjypchcS4HoRErgm5XuT2MvKoSv6CC6oo9YrT51-ys02VdgfyysCsypBIjSZTnCiRuaO5Suw2sMFikNlYWaXBs"]},-1],["cr:1083116",[],{"__rc":[null,"Aa1BcYjypchcS4HoRErgm5XuT2MvKoSv6CC6oo9YrT51-ys02VdgfyysCsypBIjSZTnCiRuaO5Suw2sMFikNlYWaXBs"]},-1],["cr:1083117",["recoverableViolation"],{"__rc":["recoverableViolation","Aa1BcYjypchcS4HoRErgm5XuT2MvKoSv6CC6oo9YrT51-ys02VdgfyysCsypBIjSZTnCiRuaO5Suw2sMFikNlYWaXBs"]},-1],["cr:1105154",[],{"__rc":[null,"Aa1nOQ5HQ6nQgSeZCBP_QlSRb5gr5c5hSJAA8OTGxoB2SjKcUsS28P15G8MxUPXFAy6jjJwXe0NjWp0K-w"]},-1],["cr:1106516",[],{"__rc":[null,"Aa2VInlhOXUyFbHQFkusViGXlwZHq91lHIQMskryWDgpNsN44kjJTkHd41Jgy250e9n_iHZeZ_uwsP7t"]},-1],["cr:1110430",[],{"__rc":[null,"Aa1nOQ5HQ6nQgSeZCBP_QlSRb5gr5c5hSJAA8OTGxoB2SjKcUsS28P15G8MxUPXFAy6jjJwXe0NjWp0K-w"]},-1],["cr:1119068",[],{"__rc":[null,"Aa3tOBozt2TVljxZew5j2W0lvAWoI22I-eucSdo7C8hdUrUYacWs8JXbxXD4JTbp40k4mlr_VkqaxnXhgnxQB-SHtQ"]},-1],["cr:1121434",[],{"__rc":[null,"Aa1nOQ5HQ6nQgSeZCBP_QlSRb5gr5c5hSJAA8OTGxoB2SjKcUsS28P15G8MxUPXFAy6jjJwXe0NjWp0K-w"]},-1],["cr:1132918",[],{"__rc":[null,"Aa1nOQ5HQ6nQgSeZCBP_QlSRb5gr5c5hSJAA8OTGxoB2SjKcUsS28P15G8MxUPXFAy6jjJwXe0NjWp0K-w"]},-1],["cr:1183579",["InlineFbtResultImplComet"],{"__rc":["InlineFbtResultImplComet","Aa1BcYjypchcS4HoRErgm5XuT2MvKoSv6CC6oo9YrT51-ys02VdgfyysCsypBIjSZTnCiRuaO5Suw2sMFikNlYWaXBs"]},-1],["cr:1267207",[],{"__rc":[null,"Aa1zheNdnVJrY3qrfMJNzlovuHZ54p7rzv8Q26izHejiJILKUxQo1N1FJB73SILiikYMyqoengt9SDf7TdGnSo8"]},-1],["cr:1445039",[],{"__rc":[null,"Aa2OLb7M2ksz0bCjFMM5kC-TA_pmHA47zvInN19kVcs0Ir0l6n2dmHFY-cIJF8GKtERcaGEOu2bd_IcO5HddZi4pCKLY4b2-VRY_svg"]},-1],["cr:1467370",["CometRelayScheduler"],{"__rc":["CometRelayScheduler","Aa1BcYjypchcS4HoRErgm5XuT2MvKoSv6CC6oo9YrT51-ys02VdgfyysCsypBIjSZTnCiRuaO5Suw2sMFikNlYWaXBs"]},-1],["cr:1522191",["CometLinkTrackingUtils.facebook"],{"__rc":["CometLinkTrackingUtils.facebook","Aa2EJB3j25k6SowRHjqvk32I009-XRylq8UfustJSPNmhkFYSgc9xJF53dA257tHKG7RlhZPrEPKXNGq8auG-VJGdoiJ-qb2J71DvQ"]},-1],["cr:1645510",[],{"__rc":[null,"Aa3-Q0KoRquB4x0XqC9H6qjMzH-xdN2uxGZ6ne2kGaJkS8pMuG3eINTomJ_MXI76tRCqZjI3whbVMG51oubM0F2AN3cuCA"]},-1],["cr:1752405",["QPLAddCometRequestHeaders"],{"__rc":["QPLAddCometRequestHeaders","Aa1BcYjypchcS4HoRErgm5XuT2MvKoSv6CC6oo9YrT51-ys02VdgfyysCsypBIjSZTnCiRuaO5Suw2sMFikNlYWaXBs"]},-1],["cr:1813330",[],{"__rc":[null,"Aa08v_zd9RNGCOFHjJmNC-BfZOfkOVcAsr1dtRdDlbdQ5KTtMur162HGiKGhHgoqxg91_0iK7Tm6zkBD0xvARc_MYc8"]},-1],["cr:1824473",[],{"__rc":[null,"Aa2uKroyULQ4iLS37qNE8OZdglcb5dBamOG0ddQMFJDeTgYUDj-SHgpyeWyPkf-AdIXce7x5jHcaU4sF_gVAoCIS"]},-1],["cr:1829844",[],{"__rc":[null,"Aa3jVwX7Ki72cSmonoTYvgh1dwS8rLfX4BrE3z4r3eHDQxY06NwMg7nQZ-o-jw5uKxt6Q0fPeYtK0YCe2Gd2W8MLGeepKB0HUg"]},-1],["cr:1999269",[],{"__rc":[null,"Aa0AFA0T9tHM8eJh1CvH7FXPYfgf9mKxWpJMermFAzs-xXIOnelVhnJBoVTNvy4q-ald61H-LqFeBKwuAdSLbz-vkfXD3X-B8dvgTkUfv23OlFSHDqfHdp04yA"]},-1],["cr:2306",["NullState404FailedLoadingFB"],{"__rc":["NullState404FailedLoadingFB","Aa1Kuf7pBsempqwVnMItJ065oQg81_4mcY-SGllZQbO5U5Q2sr_7vvkJV8XEWEu8afceoT5tU5fbQ2jADCfcgirb50L6YDyl_X8uCPM"]},-1],["cr:3211",["NullStateGeneralFB"],{"__rc":["NullStateGeneralFB","Aa1Kuf7pBsempqwVnMItJ065oQg81_4mcY-SGllZQbO5U5Q2sr_7vvkJV8XEWEu8afceoT5tU5fbQ2jADCfcgirb50L6YDyl_X8uCPM"]},-1],["cr:3587",["NullStatePermissionsFB"],{"__rc":["NullStatePermissionsFB","Aa1Kuf7pBsempqwVnMItJ065oQg81_4mcY-SGllZQbO5U5Q2sr_7vvkJV8XEWEu8afceoT5tU5fbQ2jADCfcgirb50L6YDyl_X8uCPM"]},-1],["WebLoomConfig",[],{"adaptive_config":{"interactions":{"modules":{"14945":1},"events":{"979439635.barcelona.landingPage":15.9,"979439635.barcelona.postPage":118.2,"979439635.barcelona.profilePage":238.1,"979439938.barcelona.postPage":11.4,"979439938.barcelona.profilePage":30.3}},"qpl":{"modules":{},"events":{}},"modules":null,"events":null}},4171],["BanzaiConfig",[],{"MAX_SIZE":10000,"MAX_WAIT":150000,"MIN_WAIT":null,"RESTORE_WAIT":150000,"blacklist":["time_spent"],"disabled":false,"gks":{"boosted_pagelikes":true,"mercury_send_error_logging":true,"platform_oauth_client_events":true,"graphexplorer":true,"sticker_search_ranking":true},"known_routes":["artillery_javascript_actions","artillery_javascript_trace","artillery_logger_data","logger","falco","gk2_exposure","js_error_logging","loom_trace","marauder","perfx_custom_logger_endpoint","qex","require_cond_exposure_logging"],"should_drop_unknown_routes":true,"should_log_unknown_routes":false},7],["cr:3976",[],{"__rc":[null,"Aa3yvnYokBn3BuEBR63RZ9UGB_6xNC5vdBT9VtSeRCpI8-ZBBtSSXu1MHOknd4W1CPEqXrC92sF9T4S2dtCV6qcMkaCk4qX1Da0"]},-1],["cr:955714",[],{"__rc":[null,"Aa2bcpBsKOwM30n9puUBUR4Ldz6c7QdVG6SSzyjTd0FWDUyjQBezIdhmyUPeueX1q644hZJbymRx30KQ6IHX"]},-1],["cr:1094133",[],{"__rc":[null,"Aa1g5ogBDjAJbQdmtPJ4bXTgCGZm9_NUuwYGAnjtHDLMknEQV3-yGEElzFokvvCNgOYQbJokItU4ObJ4N4QN1-OVbl8"]},-1],["cr:1292365",["React-prod.classic"],{"__rc":["React-prod.classic","Aa1nOQ5HQ6nQgSeZCBP_QlSRb5gr5c5hSJAA8OTGxoB2SjKcUsS28P15G8MxUPXFAy6jjJwXe0NjWp0K-w"]},-1],["cr:5277",["ReactDOM.classic.prod-or-profiling"],{"__rc":["ReactDOM.classic.prod-or-profiling","Aa1nOQ5HQ6nQgSeZCBP_QlSRb5gr5c5hSJAA8OTGxoB2SjKcUsS28P15G8MxUPXFAy6jjJwXe0NjWp0K-w"]},-1],["cr:692209",["cancelIdleCallbackComet"],{"__rc":["cancelIdleCallbackComet","Aa1BcYjypchcS4HoRErgm5XuT2MvKoSv6CC6oo9YrT51-ys02VdgfyysCsypBIjSZTnCiRuaO5Suw2sMFikNlYWaXBs"]},-1],["cr:1268629",["setTimeoutCometLoggingPri"],{"__rc":["setTimeoutCometLoggingPri","Aa1BcYjypchcS4HoRErgm5XuT2MvKoSv6CC6oo9YrT51-ys02VdgfyysCsypBIjSZTnCiRuaO5Suw2sMFikNlYWaXBs"]},-1],["cr:1268630",["setTimeoutCometSpeculative"],{"__rc":["setTimeoutCometSpeculative","Aa1BcYjypchcS4HoRErgm5XuT2MvKoSv6CC6oo9YrT51-ys02VdgfyysCsypBIjSZTnCiRuaO5Suw2sMFikNlYWaXBs"]},-1],["cr:5888",[],{"__rc":[null,"Aa2WHFJIe4kHJI77-qqvzWYBOTMiHgMSteY5S0p9As2CeopsBmJzHguolL0GrSdS8PTnOCUEFJPIGXyx1OUxNuOagQ"]},-1],["cr:983844",[],{"__rc":[null,"Aa1nOQ5HQ6nQgSeZCBP_QlSRb5gr5c5hSJAA8OTGxoB2SjKcUsS28P15G8MxUPXFAy6jjJwXe0NjWp0K-w"]},-1],["cr:1072546",[],{"__rc":[null,"Aa1nOQ5HQ6nQgSeZCBP_QlSRb5gr5c5hSJAA8OTGxoB2SjKcUsS28P15G8MxUPXFAy6jjJwXe0NjWp0K-w"]},-1],["cr:1072547",[],{"__rc":[null,"Aa1nOQ5HQ6nQgSeZCBP_QlSRb5gr5c5hSJAA8OTGxoB2SjKcUsS28P15G8MxUPXFAy6jjJwXe0NjWp0K-w"]},-1],["cr:1072549",[],{"__rc":[null,"Aa1nOQ5HQ6nQgSeZCBP_QlSRb5gr5c5hSJAA8OTGxoB2SjKcUsS28P15G8MxUPXFAy6jjJwXe0NjWp0K-w"]},-1],["cr:5278",["ReactDOM-prod.classic"],{"__rc":["ReactDOM-prod.classic","Aa1vIUtNoitl32Ar0Js8VLL1t9253YSQBDfzbEK2IZcAd2Ud4CupM2BU0OSpi3QLtERlLT4S00Z67FwoVujreP8-6SNy8Fu0EA"]},-1],["cr:1353359",["CometEventListener"],{"__rc":["CometEventListener","Aa3V_HKvC1dSlFAXWCu-KA6Xpqkb8neJxe10yqxP0nwz9StwsF9YSLgFcbhdCxQ95mc1qz5D2XsR9vY1ov26m2H3mfS45VcMhA"]},-1]],"require":[["BarcelonaPostRoot.entrypoint\u0040c3ecf7e8ebc35024f68314d89af62e71"],["BarcelonaPostRoot.react\u0040c3ecf7e8ebc35024f68314d89af62e71"],["CometPlatformRootClient\u00404096e4080fe1ae4791152e4107c64534","init",["BarcelonaCometRootConfig","RequireDeferredReference"],[{"__m":"BarcelonaCometRootConfig"},"mount_0_0_MB","7252766176843880442",{"actorID":"0","rootView":{"allResources":[{"__dr":"BarcelonaPostRoot.entrypoint"},{"__dr":"BarcelonaPostRoot.react"}],"resource":{"__dr":"BarcelonaPostRoot.react"},"props":{"post_id":"3140773771610859901"},"entryPoint":{"__dr":"BarcelonaPostRoot.entrypoint"}},"tracePolicy":"barcelona.postPage","meta":{"title":"\u0040joyqiuu \u2022 A long, long, LONG day and 10M users later\u2026 P92 server signing off for the night \ud83e\udee1\n\u0040zahanm \u0040... \u2022 Threads","accessory":null,"favicon":null},"prefetchable":true,"entityKeyConfig":{"entity_type":{"source":"constant","value":"postPage"}},"hostableView":{"allResources":[{"__dr":"BarcelonaPostRoot.entrypoint"},{"__dr":"BarcelonaPostRoot.react"}],"resource":{"__dr":"BarcelonaPostRoot.react"},"props":{"post_id":"3140773771610859901"},"entryPoint":{"__dr":"BarcelonaPostRoot.entrypoint"}},"url":"\/t\/CuWRRrQuql9","params":{"shortcode":"CuWRRrQuql9"},"routePath":"\/t\/{shortcode}\/"},null,null,{"backgroundRoute":null,"timeSpentMetaData":null}]],["Bootloader\u00408c8b9fe979db377efa98570002fbc438","markComponentsAsImmediate",[],[["CometErrorRoot.react","CometKeyCommandWrapperDialog.react","CometModifiedKeyCommandWrapperDialog.react","BarcelonaCookieConsentDialog.react"]]],["RequireDeferredReference\u004059a7c88d3f95fb0fd84447266466015b","unblock",[],[["BarcelonaPostRoot.entrypoint","BarcelonaPostRoot.react"],"sd"]],["RequireDeferredReference\u004059a7c88d3f95fb0fd84447266466015b","unblock",[],[["BarcelonaPostRoot.entrypoint","BarcelonaPostRoot.react"],"css"]]]});});});</script>
+<script>qpl_inl("7252766176843880442","tierOneEnd");</script>
+<script type="application/json" data-content-len="83" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766176843880442","tierOneEnd"]]]}</script>
+
+<script>qpl_inl("7252766176843880442","tierTwo");</script>
+<script type="application/json" data-content-len="80" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766176843880442","tierTwo"]]]}</script>
+<script>qpl_inl("7252766176843880442-server","tierTwo",180);</script>
+<script type="application/json" data-content-len="91" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766176843880442-server","tierTwo",180]]]}</script>
+<script>requireLazy(["HasteSupportData"],function(m){m.handle({"clpData":{"1276":{"r":100,"s":1},"1115":{"r":1},"4536":{"r":1},"4785":{"r":1},"4790":{"r":1,"s":1},"1743810":{"r":1},"1856513":{"r":1,"s":1},"1914651":{"r":1},"1808128":{"r":1,"s":1}},"gkxData":{"1941":{"result":false,"hash":"AT7GrgqG15p_qcSMQG8"},"3404":{"result":false,"hash":"AT4wMZMWwnW5SJKE9e8"},"3538":{"result":false,"hash":"AT57TGJPNDIjCAO6mF4"},"1147":{"result":false,"hash":"AT7lo3uRS0bAc9UVIig"},"3854":{"result":false,"hash":"AT5Aup-cVQlr_tBvCx4"},"952052":{"result":false,"hash":"AT7wsJl9q10w1hpgZ3U"},"1611172":{"result":false,"hash":"AT6trgho2WMoFqOjF5U"},"161":{"result":false,"hash":"AT4do0BlNYY4RIPQot8"},"1286":{"result":false,"hash":"AT6JZD24vbNiQBGWBNk"},"1541":{"result":true,"hash":"AT4fxbsNTnyhSCcilvg"},"2449":{"result":false,"hash":"AT6wLtxxWYaByN3ZKF8"},"2617":{"result":false,"hash":"AT6UKlOnx8DBsi5_eX8"},"2714":{"result":true,"hash":"AT5vT-5jyll9RTqYN7k"},"3197":{"result":false,"hash":"AT6NTAIQMTd2kZTyVWE"},"3422":{"result":false,"hash":"AT6Er88AzNrP_pC8W78"},"3464":{"result":false,"hash":"AT6h-nmnhq1G5W5AirI"},"3610":{"result":false,"hash":"AT5G5DeylfvqwDf4dX4"},"5868":{"result":false,"hash":"AT7RfXdp6s85kH-y-Ek"},"5900":{"result":false,"hash":"AT4Pl2jv9rEE_PixarM"},"6737":{"result":false,"hash":"AT6tdqjSAxXxxw86gtQ"},"1083274":{"result":false,"hash":"AT6jVQKquJZO6Wz0wz0"},"1124976":{"result":true,"hash":"AT4xXzB8ti8wRGYOYRE"},"1375802":{"result":false,"hash":"AT7J4koKtjN7aFCKEHE"},"1401747":{"result":false,"hash":"AT7JbsxJIa_x4dD_U94"},"1434599":{"result":true,"hash":"AT67c_ay5iYIWOOBI2U"},"1469813":{"result":true,"hash":"AT4KsAWB14cXb7E-ndU"},"1482680":{"result":false,"hash":"AT52-IsjoZhbI5DZbFs"},"1526990":{"result":false,"hash":"AT5T7Mutfj6fyqlGu4A"},"1586633":{"result":false,"hash":"AT4ma-k4QyXhU8hEAF4"},"1755152":{"result":false,"hash":"AT4YqJEBEalQkF8iZ6k"},"1779508":{"result":false,"hash":"AT7TH0IJRiZ_VVRc4D8"},"1792489":{"result":false,"hash":"AT7OMiP2kJA0yObaSj4"},"2007883":{"result":false,"hash":"AT6fe4yBjXoMBt2vKFM"}},"ixData":{"1876411":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yd\/r\/3mD7kKai_7W.gif","width":12,"height":12},"1876412":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y1\/r\/mHADa0fT0mI.gif","width":16,"height":16},"1876413":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yV\/r\/ZY0eC865SgX.gif","width":20,"height":20},"1876414":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y8\/r\/M3mvaC7u8oH.gif","width":24,"height":24},"1876415":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yL\/r\/hVe2HmwMRpE.gif","width":32,"height":32},"1876416":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yC\/r\/yFaaylccZ5L.gif","width":48,"height":48},"1876418":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yk\/r\/96GJYGbUDCJ.gif","width":72,"height":72},"1876419":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yS\/r\/NiR8M1k4AVU.gif","width":12,"height":12},"1876420":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/ym\/r\/FNERtXIk9xp.gif","width":16,"height":16},"1876421":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yJ\/r\/l2FWxc8ihQj.gif","width":20,"height":20},"1876422":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yo\/r\/Io_N1z4MXYh.gif","width":24,"height":24},"1876423":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yD\/r\/-1hifBvDgEQ.gif","width":32,"height":32},"1876424":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yG\/r\/RcIiVWWukEr.gif","width":48,"height":48},"1876426":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/9ISCYYcy94m.gif","width":72,"height":72},"1876427":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yU\/r\/MStXnCtsaSe.gif","width":12,"height":12},"1876428":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y6\/r\/dw2egiKdoVV.gif","width":16,"height":16},"1876429":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yA\/r\/1DbfjOftY0d.gif","width":20,"height":20},"1876430":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yi\/r\/2uPGz8a6lb6.gif","width":24,"height":24},"1876431":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yw\/r\/60r9oPEvxiL.gif","width":32,"height":32},"1876432":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yM\/r\/NlAFhiEx3a1.gif","width":48,"height":48},"1876434":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yx\/r\/uzrQzxgD_Bg.gif","width":72,"height":72},"1876435":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yM\/r\/TtXj9IXnkoK.gif","width":12,"height":12},"1876436":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yy\/r\/HNs8yq0QiXE.gif","width":16,"height":16},"1876437":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yT\/r\/ay_drQe6StD.gif","width":20,"height":20},"1876438":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y4\/r\/iACDMhAROS_.gif","width":24,"height":24},"1876439":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yy\/r\/WEhNL1y2zoZ.gif","width":32,"height":32},"1876440":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y-\/r\/mAeZkO4yhqj.gif","width":48,"height":48},"1876442":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yl\/r\/79uB7ciX8vY.gif","width":72,"height":72},"1876443":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yG\/r\/dzn6it4Fw3p.gif","width":12,"height":12},"1876444":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yc\/r\/wqjQpFb4tea.gif","width":16,"height":16},"1876445":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yk\/r\/yy3mR2PXKrn.gif","width":20,"height":20},"1876446":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yl\/r\/gTdm7zPKz-c.gif","width":24,"height":24},"1876447":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/ym\/r\/kdaft251gQ_.gif","width":32,"height":32},"1876448":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yG\/r\/6-FTd4KBtOk.gif","width":48,"height":48},"1876450":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yq\/r\/Tks_lRPtYc-.gif","width":72,"height":72},"1876451":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yK\/r\/Bys0xcVibDa.gif","width":12,"height":12},"1876452":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yI\/r\/Wk0dcHGH6EG.gif","width":16,"height":16},"1876453":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/ys\/r\/aOTs7vt2hEc.gif","width":20,"height":20},"1876454":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yh\/r\/wVjfNbGZ3CH.gif","width":24,"height":24},"1876455":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yw\/r\/oT6wM_vuQNQ.gif","width":32,"height":32},"1876456":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yp\/r\/ac61i44rSWK.gif","width":48,"height":48},"1876458":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yg\/r\/ZH27Vvjc9-u.gif","width":72,"height":72},"1940508":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y3\/r\/ycQ2OPoZwUA.gif","width":64,"height":64},"1940509":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yg\/r\/8kyIVWHZW-b.gif","width":64,"height":64},"1940510":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yK\/r\/8gPN8wBD9yB.gif","width":64,"height":64},"1940511":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yG\/r\/WtK_u51t3nM.gif","width":64,"height":64},"1940512":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yj\/r\/JYwEre3ewp7.gif","width":64,"height":64},"1940513":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yu\/r\/M2HDLLPAUWl.gif","width":64,"height":64}},"qexData":{"1655":{"r":null},"1675":{"r":null},"2095":{"r":null},"2096":{"r":null},"2097":{"r":null},"2098":{"r":null},"2099":{"r":null},"2100":{"r":null}},"justknobxData":{"344":{"r":true},"948":{"r":false}}})});requireLazy(["Bootloader"],function(m){m.handlePayload({"consistency":{"rev":1007796774},"rsrcMap":{"POkG4Hf":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3ikM54\/yf\/l\/en_US\/dKyu23I5fqr.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":12","m":"1007796774_main","nc":1},"oRj2xU5":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3ivsD4\/yB\/l\/en_US\/FCaa8jsqbBk.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22853","m":"1007796774_longtail","nc":1},"MIwFPq4":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yw\/r\/E4XtvzFTfIx.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22844","m":"1007796774_longtail","nc":1},"+L0X93S":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3i8hs4\/y3\/l\/en_US\/i9nIgo3DWBW.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22868","m":"1007796774_longtail","nc":1},"yjOc\/BX":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yZ\/r\/OCnt_5DwgWw.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22867","m":"1007796774_longtail","nc":1},"KxYcLg+":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yd\/r\/-w8H2PZO-iD.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22839","m":"1007796774_longtail","nc":1},"qiVTe9f":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3inQ44\/yD\/l\/en_US\/aVIZjqnbeG8uYySt466q_EFCaa8jsqbBkE4XtvzFTfIx9BS1T5PFXOB.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22842,22843,22853,22844,22840","m":"1007796774_longtail","nc":1},"L3yxVXS":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yt\/r\/AHkndIEm5Rl.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22841","m":"1007796774_longtail","nc":1},"oHmjilq":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iQpj4\/y_\/l\/en_US\/3SBbpQTh5JQ.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22845","m":"1007796774_longtail","nc":1},"5hdPwUp":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3i3Fo4\/ye\/l\/en_US\/x_k9uxuxzat.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":25","m":"1007796774_main","nc":1},"SrRwK8Q":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yo\/r\/bLEHF9MK5q8.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23643","m":"1007796774_longtail","nc":1},"lI1Yib\/":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/ye\/r\/kZtzguJd8yx.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23642","m":"1007796774_longtail","nc":1},"A2+x9zZ":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y7\/r\/vsWqehdEtWw.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":38","m":"1007796774_main","nc":1},"ouGJTJU":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y1\/r\/6HpGmByZA0s.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":36","m":"1007796774_main","nc":1},"h0zbdh+":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yN\/r\/8sBjwKi_XAJ.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":37","m":"1007796774_main","nc":1},"VJhwr7f":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iPjk4\/yj\/l\/en_US\/tS4NAEkk1ly.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":13","m":"1007796774_main","nc":1},"BG+mBnk":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yW\/r\/s70ZcYOHW2g.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":14","m":"1007796774_main","nc":1},"VluRBpG":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3i8f54\/yL\/l\/en_US\/H8jDqdAkvaPBp-sWNflphmzG5N_ZCDB67s70ZcYOHW2gxudfWkGfnMSQaHJskTXKBsP-FxlnJFYEeuYySt466q_EKoySD9JtZBrFXZtUxipnSj3o_eql4wWVOsES-3svQkGgLmdtKY8ymGHpVMiA7wWSg6sKyq6PtGLsmmCtwsMwDpuuuk1ECc7FJyTC8h4aY11bXDtsrTV6grGR515OhfS5HE3MnYm2bO-GP2D1MY2eDbW-z0Si5EstWO8A1q9NBjVyNNwMMrqfnWVlYdJYLoARF8dGGFiyg8AQNMsQTR5LWgsqVgrL6FeLaAg_7vEtusd6r5NO8w.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22517,22520,22522,14,23282,22513,22574,22843,22519,22678,23283,22538,22681,22540,22539,24755,22521,22542,22523,22518,22679,22528,22543,22560,22515,22524,22525,22516,22526,22514","m":"1007796774_main,1007796774_longtail","nc":1},"4myS+FQ":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yb\/r\/0LyZ2Bhtg3Q.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":24726","m":"1007796774_longtail","nc":1},"ptX5H14":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iMT74\/yv\/l\/en_US\/FviRYH6d8aZL9iclwrP2Mz.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23284,23281","m":"1007796774_longtail","nc":1},"DTEAkkm":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iYTC4\/y0\/l\/en_US\/ymAWa7v3wLK.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":30","m":"1007796774_main","nc":1},"qcJ8oTc":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yk\/r\/yJveFWkDDR4.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23327","m":"1007796774_longtail","nc":1},"HAdaAfP":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y4\/r\/fxdyWGjKtZW.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23287","m":"1007796774_longtail","nc":1},"VQxSZM7":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y3\/r\/pw17-piTWVI.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23329","m":"1007796774_longtail","nc":1},"ppcMzf1":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3ikKB4\/yV\/l\/en_US\/Y5xpL53z6YNfLI-dnZqj4LTzno5eP6nVVsqH8rp3rNzmT2pzc_XfHCJhAA8aEK7kcPsD2Mi-pv4Vvox3TE4PsotI1jhiyd0Mi7X6EksR9mTLwkXGcK2g9xvB8zAYt-ZRkt3ORLRxhRlEh7uuYySt466q_EbFemdCzZOyr8qHP6VIBz4d-es_Ps7G0-0zSIiPUvr3ptNqmwROcNvDkahz1LRM0XaeLmdtKY8ymGHY-fNHdq0n_9zzryhWoIuez6eRNg3AJtVTe2oHS7-bsPGS7fLcvWQauAAgAox9dEkk0cIUQjlstqZUtNpstMRzv7_FQe2cWHULn6.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22273,23259,23230,23244,23236,23241,23275,23245,23258,23277,23243,23288,23279,22843,22459,23290,23289,23273,23239,23232,22681,23278,23235,23276,23234,23261,23274,22420,23240,23237","m":"1007796774_longtail","nc":1},"BmUKcMx":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iez_4\/y3\/l\/en_US\/JIqQQdk3ieE9GMCQUhC9Iq.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23233,23238","m":"1007796774_longtail","nc":1},"LddxAHS":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3i9yU4\/yk\/l\/en_US\/e221EJpXRZd.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23280","m":"1007796774_longtail","nc":1},"80QnIbt":{"type":"css","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yr\/l\/0,cross\/WPrndevEYn8zyEpb6SJKFF.css?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23242,23229","nc":1},"PfR8M03":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iQoG4\/y6\/l\/en_US\/Y5xpL53z6YNfLI-dnZqj4LODfoxHtIg-rTzno5eP6nVV1qcrREK-mqHsqH8rp3rNzmT2pzc_XfHCJhAA8aEK7kcPox3TE4PsotI1jhiyd0Mi7XXGcK2g9xvB8zAYt-ZRkt3OfxdyWGjKtZWyJveFWkDDR4uYySt466q_EbFemdCzZOyrmzuRxJgFeBB8qHP6VIBz4d-es_Ps7G0-0NqmwROcNvDkahz1LRM0XaeLmdtKY8ymGHzzryhWoIuez6eRNg3AJtVTe2oHS7-bsPGcIUQjlstqZUtNpstMRzv7_FQe2cWHULn6.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22273,23259,23286,23230,23231,23244,23236,23241,23245,23258,23243,23288,23287,23327,22843,22459,23285,23290,23289,23239,23232,22681,23235,23276,23234,22420,23240,23237","m":"1007796774_longtail","nc":1},"kYwN4K1":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iOv54\/yd\/l\/en_US\/9GMCQUhC9Iq.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23238","m":"1007796774_longtail","nc":1},"3x11trx":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yt\/r\/JIqQQdk3ieE.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23233","m":"1007796774_longtail","nc":1},"SbjrRrE":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iK7-4\/y0\/l\/en_US\/Tzno5eP6nVV1qcrREK-mqHT2pzc_XfHCJhAA8aEK7kcPpyBDNZM558rox3TE4PsotI1jhiyd0Mi7XXGcK2g9xvB8zAYt-ZRkt3ObFemdCzZOyrmzuRxJgFeBBNqmwROcNvDkahz1LRM0XaezzryhWoIueze2oHS7-bsPGcIUQjlstqZUtNpstMRzv7_FQe2cWHULn6.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23230,23231,23236,23241,23272,23245,23258,23243,23288,22459,23285,23239,23232,23235,23234,22420,23240,23237","m":"1007796774_longtail","nc":1},"BXyw5s5":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3im6X4\/yS\/l\/en_US\/Y5xpL53z6YN.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22273","m":"1007796774_longtail","nc":1},"rKwGmdo":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3ivRF4\/yV\/l\/en_US\/kVewawW9sLi.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":27","m":"1007796774_main","nc":1},"QYet1m8":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iL0l4\/yS\/l\/en_US\/2b0QhKYmHZR.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":42","m":"1007796774_main","nc":1},"N4YVD55":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iVaI4\/yZ\/l\/en_US\/s70ZcYOHW2gg3yoqbXEpmYwxCqhf68Hu9EXzOMjEGRkef1WEGsPamkr0JBqoWCZjPIqpYLDHodxPTIVnWZl7cviNdWZZdPSs6ZbpqTnuoeCk6pZsjNlrulyIdyoHREtSM9Jsu_B3ZISZBs9AIrc88yh4hk7G2jo8ofuzrILlFWhiKYx_qrF1-qnT0JMyD86gn8wGeXZ7u-SCAiNhudK7j4Vngu9Vesh-ZP8F7HecdToupwT2U_sdlNP4ZdmIMEGQsol6uRMSmrV1PNp_6bSQi6r9ERa5IIJ3kuTVsqlBOyoeOvtugati7pKtKghClYVqKmzDS3VQA1.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":14,24681,23332,23349,24707,24728,23321,24687,23313,24666,24701,23994,24680,18243,24710,23309,24722,23887,24702,23328,22276,18214,18244,23342,22275,23314,24683,24685,24711,24767","m":"1007796774_main,1007796774_longtail","nc":1},"txi7upv":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3i-vc4\/ya\/l\/en_US\/FjpyFw8dtiNqiZMXnYKsx26AiDsqxS9hj2A8-plSrNyIWTBsxEMk0oGjGQJZ5hTTO7ir0aXOo6hu9GiKWpcUOxdqpw17-piTWVIrfTsco5uJfSM3Hhz51POq73P2qyi3N0XKdH93URzZjeYe8qQHfoPyNXK6vxPXihp7vXclAo5ZDV_x16hGQn2v-k0Z10vcV3GdgRhj0mU6j2x70YSVf1mwoMpkAuvWZOfGak4iiBfG2EFqtzqRp81TcBkCmV4agjMWnHBnuJM6SUg6InEHrq1vn4uA7WktBjOZhjCbYk6yzRdJERnFqLDkk44q6ypfKE75cdD_2h.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23965,22816,24780,23958,22277,23952,24778,24781,23329,49,24723,18053,23300,24706,23946,23987,24001,23950,24785,24786,23980,23984,23983,24673,23953,23297,22274,22271,24730,23308","m":"1007796774_main,1007796774_longtail","nc":1},"CJJpFpi":{"type":"css","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y-\/l\/0,cross\/9RNFBR_gSEj1etdwR6a81I3jU-LY6XmPy6zzuiyZa4D8Kd2lmIoHxfuilTJBkNQiBWIIyo1-hI3xUC3qfE7YCHo1NZ8UcGjWcqSZqyKYDA1Eol5T8IKFrg-6eoWuaqWpfwKmpPGlbgm47dKTKm9_Q2heWGcOeEjwimKZqRZXEEM_Uh94XZEyMm2-3YUMNorFvAKDgpdoLXukjSq8gZxyPkih5Hkv3JxJYu0Ykk9aTMfgZ8CM51BAZ2QE-Kq3JhZtgcAW5uBp9I8nAckfA9KCE8vaKz4xLGtKy686UOeUw9hYcelD8sl7JH0uDEkhRHIwT9SgsVYxoo.css?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23964,23354,24662,23301,23315,23350,23977,24777,24667,23335,23657,24686,24682,23978,24690,23989,24670,23298,24664,23331,24761,23352,23299,24695,18147,23322,23334,23325,24787,24699","nc":1},"hUeQzzr":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iF5d4\/yE\/l\/en_US\/wAFch5viTHH69FssJOI_G2exJVaBoNrmSTh0PpSNmHFjQG4qJ6_JSCSN7zKZDi949BQPpruh15t0LegNM-bx1lR0NXebqprgpxA4aaw8yetFPeGRUdnQtM5dIolieDd4IJu4bCfnaamX5bMBkyxSp24flWVTOice3J6cjKtVXaNTrk3HysLR_Fhssj6vsWqehdEtWw-yu7ETe8t3dLMDjMFw3MsV0E1dAsWNrLODmgTTo802bhAywHKqrhLV4OZcJ1-eP5c3r40PTgS3hAyaMlDkmMimHkD2SKUNQsv_cbbFAPOpx4ztjoaa4PcrTo1aERw28O7swT.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":24760,24705,23908,24688,23896,24764,23355,23991,24698,24708,24724,24678,23976,23351,24663,23986,23951,38,23337,23303,23295,24768,23319,24693,24691,23296,24742,22442,23144,23330","m":"1007796774_main,1007796774_longtail","nc":1},"lwH\/DrC":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3i3504\/yH\/l\/en_US\/SRAjmBufyGy7tmbEkFIHUT6kfYtB9j00HvMmvdR4VFNcfEskqldov3qysZNDLAbte48xArc4B8cLJLr8-lR_ixnfPhl-HUfEGSWSdoTv3rofQ7e_062QBgldSmpUNK2rSNuagAZiLiHDzjFFGHQD74fAA6fVPHD9o_iWGLxyWLM_xDmsQ9kStQlyoL1lJPjtWsWnrY8FIcLGszJDTKBa19GQ1IkN3-VM1M5w3fjgHyxunZ_3PIqtw6iDIyaa5ovp7hLPKf7zR1bzebgILzTzs1LgHQtH1ycvYhoDT5wmpwipzdUBW4ZAaZDByLQ16DTDQVEH-g-FDC.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":24782,24697,21987,24718,22561,22814,22702,22242,22899,24715,23347,24003,24684,24757,24766,23907,24712,23323,23993,22489,23967,23317,23888,22048,22049,24671,23956,24774,24776,22767","m":"1007796774_longtail","nc":1},"A2jbsLw":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3ixe04\/y0\/l\/en_US\/UKekSwDzTqG0gfp2bvC0uBEox0FBqrm7YvgdM-SLeCs0AKUi-QbPz5sahZ_FWuZ9h8WEIa6nns2kWah8qLI_pU_L8qp5Bb25p0wXYx9Ap03JhasXY4qKM5rtljNLxthsevMw7XB1KXNiN8ABBk7j-f6Zi_7WdzptHN26AaP-2Sjw-Dnh6jcdmVXPXSSq7PBpDfanipUjOjCZmNZo43f2P3vNQieoGapi6yqZZJtAkjwOY348SZwTwcekAeB9q5QFKpFlBalZSNPMTsKe0M8KCJieK-HgiehXb3Phs4i_r77jjSKKq4PxpNqfTopAkQLbu3oaXV5Fcp.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":24769,23979,23960,23942,24679,24531,24007,23340,23316,23947,23320,23943,23336,24000,24775,23999,24704,24677,24689,24762,24725,24784,24719,24783,23988,24721,23990,23656,24788,24713","m":"1007796774_longtail","nc":1},"7DhgKFs":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3indH4\/y0\/l\/en_US\/3TMdy2vMQV59d3CJ4JpiQJTb9lqxabK5qbkb_ipJtb7e2hCJvyirDpkSnFW7BRU1IGNYqFt9n2P-ucubnLZrGrfaFLJXkx8ys-62rSzGVmuKm-NTBXcpfVOaafTtEMBLHQDq8sBjwKi_XAJ3BczY150-hydW7mkbY8JclCuS4-NczIJa-RkISzkM14-3ff1ihBMQKH9snYZlKjcsq66NxPH3h_xOpAT5tQXCbG9JkSyHdjrh8q98iw1DdDXVfsRsQ7AzUSfm6tzNDEpBwXqWj9mKAYAIiwXktZ0OHiFKbU_N7mdnHqJTIohmRQ2b689CQvKFVYjeBk.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":24729,24672,23312,23948,24763,24006,24675,24731,15,24773,23348,23326,37,23305,23344,23343,23353,24005,23995,23963,24692,23955,24758,23294,24700,24669,23982,23489,23966,24676","m":"1007796774_main,1007796774_longtail","nc":1},"DnvkawA":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3i3HS4\/yV\/l\/en_US\/alGW6ij0nUBKpttZctsUAh7snRhBY2cFJJ2ox7D4ckTARtAwBie6gpm3-iPxuccQMwyJveFWkDDR4k9B7P8005D3N1GFDz2K7gzuYySt466q_ErEA_RAKj2QEr3TiNUfejyD0dCy81TCO-mSs5EX7EUkt6V-f-5J1GTPNP-gqmbGTdlYyLMnn9CCb-lbw64Pg5MzAsrk6DouQvBnnCNVXFutjzjtPcSNyiKAlwZY9VrUFtFxt8TQadd7hSJv6WhYwLeeXEG8bdzIdxTIaKT0umNmWjJcnOlKFhylaXJxty0fQxSRQi6vA3jrm8iPoryUilyMCHijIk.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23302,18148,23981,23311,23310,24008,23327,23975,23339,22843,24668,24771,24720,23292,22234,23997,23911,24779,23304,24716,22559,23962,24674,23341,23954,23957,24694,23998,23992,24756","m":"1007796774_longtail","nc":1},"Hti8Jyy":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yi\/r\/gIlLwbOheLl0MgmqdqkoJ3xRLoiiKdpWH6rFQ80ZJIPbh-qw2rfEd9eIgJ3t6cCh6WV9-K1Y2dRAVHp-wggvtrlqBkeWjmN2VsIXkVMgP0mtu9ScWk_hrtbZXsqhHQJJrW33iwsJY06ko3eBhru5eQC90EaYcTPigF0kkydk-1WCefCNUMkdcCJtWGd85H8MqrOScehZIbgEGnIGOWGhzKWh8qUcQEpNcz30M-Ux99y7DkR1P5b4iUWLrw98_YCgUMq13ZnHyEX3OivvegSCTjR7TPYroOjYApImVKSmWqi0cAprDLC7Te5_b9MByR_1IxM5miaxjd.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":24772,23949,22689,24002,24759,23260,24696,23307,23306,24009,23996,24004,23345,23959,24714,23338,23961,23324,18084,23945,23318,24703,23333,24770,24765,23346,24717,23985,23291,24709","m":"1007796774_longtail","nc":1},"IA35W9t":{"type":"css","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yf\/l\/0,cross\/vK5AjnuBuck.css?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":24665","nc":1},"3dE7hOM":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iHIO4\/yy\/l\/en_US\/fAeDB58g0BQ2OXjUZDIH3_BieyhdhRU3L.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23573,23880,23893","m":"1007796774_longtail","nc":1},"V4gVGzG":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y6\/r\/YHgPkyMYPjw.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23574","m":"1007796774_longtail","nc":1},"x1i5pBt":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3i7M54\/yj\/l\/en_US\/me7LiwnFv1d.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":16","m":"1007796774_main","nc":1}},"compMap":{"CometErrorRoot.react":{"r":["hOjEt0H","L5R7p5D","L6Tx9we","CcM+LCX","3unTLaW"],"rdfds":{"m":["CometTooltipDeferredImpl.react"],"r":["WfD8LHV"]},"rds":{"m":["FbtLogging","LynxAsyncCallbackFalcoEvent","CometSuspenseFalcoEvent","IntlQtEventFalcoEvent"],"r":["POkG4Hf"]}},"CometKeyCommandWrapperDialog.react":{"r":["hOjEt0H","L5R7p5D","oRj2xU5","MIwFPq4","CcM+LCX","+L0X93S","3unTLaW","L6Tx9we"],"rdfds":{"m":["CometTooltipDeferredImpl.react"],"r":["WfD8LHV"]},"rds":{"m":["FbtLogging","LynxAsyncCallbackFalcoEvent","CometSuspenseFalcoEvent","IntlQtEventFalcoEvent"],"r":["POkG4Hf"]}},"CometModifiedKeyCommandWrapperDialog.react":{"r":["hOjEt0H","yjOc\/BX","KxYcLg+","L5R7p5D","qiVTe9f","CcM+LCX","L3yxVXS","3unTLaW","oHmjilq","L6Tx9we"],"rdfds":{"m":["CometTooltipDeferredImpl.react"],"r":["WfD8LHV"]},"rds":{"m":["FbtLogging","LynxAsyncCallbackFalcoEvent","CometSuspenseFalcoEvent","IntlQtEventFalcoEvent"],"r":["POkG4Hf"]}},"BarcelonaCookieConsentDialog.react":{"r":["hOjEt0H","L5R7p5D","z6fuRko","5hdPwUp","CcM+LCX","3unTLaW","L6Tx9we"],"rds":{"m":["BarcelonaCookieConsentLearnMoreDialog.react","FbtLogging","LynxAsyncCallbackFalcoEvent","CometSuspenseFalcoEvent","IntlQtEventFalcoEvent"],"r":["POkG4Hf"]}},"VideoPlayerHTML5ApiCea608State":{"r":["SrRwK8Q","CcM+LCX","hOjEt0H"]},"VideoPlayerHTML5ApiWebVttState":{"r":["CcM+LCX","lI1Yib\/"]},"BarcelonaAnimatedScrollArea.react":{"r":["hOjEt0H","L5R7p5D","A2+x9zZ","ouGJTJU","f2ZV5tU","h0zbdh+","CcM+LCX","L6Tx9we"]},"CometTooltip.react":{"r":["hOjEt0H","L5R7p5D","CcM+LCX","3unTLaW","L6Tx9we"],"rdfds":{"m":["CometTooltipDeferredImpl.react"],"r":["WfD8LHV"]},"rds":{"m":["CometSuspenseFalcoEvent","FbtLogging","IntlQtEventFalcoEvent"],"r":["POkG4Hf"]},"be":1},"BaseTooltip.react":{"r":["hOjEt0H","L5R7p5D","CcM+LCX","3unTLaW","L6Tx9we"],"be":1},"liveQueryFetchWithWWWInitial":{"r":["L5R7p5D","CcM+LCX","hOjEt0H"],"rds":{"m":["ContextualConfig","BladeRunnerClient","DGWRequestStreamClient","MqttLongPollingRunner"],"r":["VJhwr7f","POkG4Hf"]},"be":1},"BarcelonaPostRoot.react":{"r":["hOjEt0H","L5R7p5D","CcM+LCX","3unTLaW","L6Tx9we"],"rdfds":{"m":["BarcelonaPostPage.react","CometPressable.react","CometExceptionDialog.react","VideoPlayerSpinner.react","VideoPlayerCaptionsArea.react","CometTooltipDeferredImpl.react"],"r":["WfD8LHV","z6fuRko","f2ZV5tU","DJHbu96"]},"rds":{"m":["FbtLogging","LynxAsyncCallbackFalcoEvent","CometSuspenseFalcoEvent","IntlQtEventFalcoEvent","BarcelonaAppUpsellDialog.react","BarcelonaOverflowMenu.react","ContextualConfig","BladeRunnerClient","BarcelonaLightboxDialog.react","BarcelonaRegionGatedAppUpsellDialog.react","VideoPlayerWithLiveVideoInterruptedOverlay.react","CometRelayEF","DGWRequestStreamClient","CometToast.react","BarcelonaToast.react","MqttLongPollingRunner","BaseToast.react"],"r":["POkG4Hf","VJhwr7f","BG+mBnk"]},"be":1},"SecuredActionChallengePasswordDialog.react":{"r":["hOjEt0H","WfD8LHV","VluRBpG","L5R7p5D","VJhwr7f","f2ZV5tU","L6Tx9we","4myS+FQ","ptX5H14","DTEAkkm","CcM+LCX","3unTLaW"],"rdfds":{"m":["CometTooltipDeferredImpl.react","CometExceptionDialog.react"]},"rds":{"m":["ContextualConfig","BladeRunnerClient","FBBrowserPasswordEncryption","FbtLogging","LynxAsyncCallbackFalcoEvent","DGWRequestStreamClient","CometSuspenseFalcoEvent","IntlQtEventFalcoEvent","CometToast.react","CometRelayEF","MqttLongPollingRunner"],"r":["POkG4Hf","qcJ8oTc","HAdaAfP","VQxSZM7"]},"be":1},"SecuredActionDialogRoot.react":{"r":["hOjEt0H","ppcMzf1","L5R7p5D","VJhwr7f","BmUKcMx","L6Tx9we","LddxAHS","80QnIbt","CcM+LCX","3unTLaW"],"rdfds":{"m":["CometExceptionDialog.react","CometTooltipDeferredImpl.react"],"r":["WfD8LHV"]},"rds":{"m":["ContextualConfig","BladeRunnerClient","CometRelayEF","FbtLogging","LynxAsyncCallbackFalcoEvent","DGWRequestStreamClient","CometSuspenseFalcoEvent","IntlQtEventFalcoEvent","CometToast.react","MqttLongPollingRunner"],"r":["POkG4Hf","BG+mBnk"]},"be":1},"SecuredActionChallengeCDSPasswordDialog.react":{"r":["hOjEt0H","PfR8M03","L5R7p5D","kYwN4K1","L6Tx9we","3x11trx","80QnIbt","CcM+LCX","VQxSZM7","3unTLaW"],"rds":{"m":["FbtLogging","LynxAsyncCallbackFalcoEvent","CometSuspenseFalcoEvent","IntlQtEventFalcoEvent"],"r":["POkG4Hf"]},"be":1},"SecuredActionNoChallengeAvailableCDSDialog.react":{"r":["hOjEt0H","SbjrRrE","L5R7p5D","kYwN4K1","L6Tx9we","3x11trx","80QnIbt","CcM+LCX","BXyw5s5","3unTLaW"],"rds":{"m":["FbtLogging","LynxAsyncCallbackFalcoEvent","CometSuspenseFalcoEvent","IntlQtEventFalcoEvent"],"r":["POkG4Hf"]},"be":1},"BarcelonaPostLikersDialog.react":{"r":["hOjEt0H","L5R7p5D","f2ZV5tU","rKwGmdo","CcM+LCX","3unTLaW","QYet1m8","L6Tx9we"],"rds":{"m":["FbtLogging","LynxAsyncCallbackFalcoEvent","CometSuspenseFalcoEvent","IntlQtEventFalcoEvent"],"r":["POkG4Hf"]},"be":1},"BarcelonaWebBloksEntryPoint.react":{"r":["N4YVD55","txi7upv","hOjEt0H","CJJpFpi","hUeQzzr","WfD8LHV","lwH\/DrC","A2jbsLw","7DhgKFs","DnvkawA","L5R7p5D","Hti8Jyy","IA35W9t","CcM+LCX","3unTLaW","L6Tx9we","f2ZV5tU"],"rds":{"m":["PolarisUnfollowDialog.react","PolarisFBSDK","FbtLogging","LynxAsyncCallbackFalcoEvent","CometSuspenseFalcoEvent","IntlQtEventFalcoEvent","AsyncRequest","ContextualConfig","BladeRunnerClient","DGWRequestStreamClient","MqttLongPollingRunner"],"r":["3dE7hOM","V4gVGzG","POkG4Hf","x1i5pBt","VJhwr7f"]},"be":1}}})});
+requireLazy(["JSScheduler","ServerJS","ScheduledApplyEach"],function(JSScheduler,ServerJS,ScheduledApplyEach){qpl_inl("7252766176843880442","tierTwoBeforeScheduler");JSScheduler.runWithPriority(3,function(){qpl_inl("7252766176843880442","tierTwoInsideScheduler");(new ServerJS()).handleWithCustomApplyEach(ScheduledApplyEach,{"define":[["BarcelonaURLMatcherConfig",[],{"tlds":["\ud55c\uad6d","\uc0bc\uc131","\ub2f7\ucef4","\ub2f7\ub137","\u9999\u6e2f","\u9999\u683c\u91cc\u62c9","\u9910\u5385","\u98df\u54c1","\u98de\u5229\u6d66","\u96fb\u8a0a\u76c8\u79d1","\u96c6\u56e2","\u901a\u8ca9","\u8d2d\u7269","\u8c37\u6b4c","\u8bfa\u57fa\u4e9a","\u8054\u901a","\u7f51\u7edc","\u7f51\u7ad9","\u7f51\u5e97","\u7f51\u5740","\u7ec4\u7ec7\u673a\u6784","\u79fb\u52a8","\u73e0\u5b9d","\u70b9\u770b","\u6fb3\u9580","\u6e38\u620f","\u6de1\u9a6c\u9521","\u673a\u6784","\u66f8\u7c4d","\u65f6\u5c1a","\u65b0\u95fb","\u65b0\u52a0\u5761","\u653f\u5e9c","\u653f\u52a1","\u624b\u8868","\u624b\u673a","\u6211\u7231\u4f60","\u6148\u5584","\u5fae\u535a","\u5e7f\u4e1c","\u5de5\u884c","\u5bb6\u96fb","\u5a31\u4e50","\u5929\u4e3b\u6559","\u5927\u62ff","\u5927\u4f17\u6c7d\u8f66","\u5728\u7ebf","\u5609\u91cc\u5927\u9152\u5e97","\u5609\u91cc","\u5546\u6807","\u5546\u5e97","\u5546\u57ce","\u53f0\u7063","\u53f0\u6e7e","\u516c\u76ca","\u516c\u53f8","\u516b\u5366","\u5065\u5eb7","\u4fe1\u606f","\u4f5b\u5c71","\u4f01\u4e1a","\u4e2d\u6587\u7f51","\u4e2d\u570b","\u4e2d\u56fd","\u4e2d\u4fe1","\u4e16\u754c","\u30dd\u30a4\u30f3\u30c8","\u30d5\u30a1\u30c3\u30b7\u30e7\u30f3","\u30bb\u30fc\u30eb","\u30b9\u30c8\u30a2","\u30b3\u30e0","\u30b0\u30fc\u30b0\u30eb","\u30af\u30e9\u30a6\u30c9","\u307f\u3093\u306a","\u10d2\u10d4","\u0e44\u0e17\u0e22","\u0e04\u0e2d\u0e21","\u0dbd\u0d82\u0d9a\u0dcf","\u0d2d\u0d3e\u0d30\u0d24\u0d02","\u0cad\u0cbe\u0cb0\u0ca4","\u0c2d\u0c3e\u0c30\u0c24\u0c4d","\u0b9a\u0bbf\u0b99\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0bc2\u0bb0\u0bcd","\u0b87\u0bb2\u0b99\u0bcd\u0b95\u0bc8","\u0b87\u0ba8\u0bcd\u0ba4\u0bbf\u0baf\u0bbe","\u0b2d\u0b3e\u0b30\u0b24","\u0aad\u0abe\u0ab0\u0aa4","\u0a2d\u0a3e\u0a30\u0a24","\u09ad\u09be\u09f0\u09a4","\u09ad\u09be\u09b0\u09a4","\u09ac\u09be\u0982\u09b2\u09be","\u0938\u0902\u0917\u0920\u0928","\u092d\u093e\u0930\u094b\u0924","\u092d\u093e\u0930\u0924\u092e\u094d","\u092d\u093e\u0930\u0924","\u0928\u0947\u091f","\u0915\u0949\u092e","\u0680\u0627\u0631\u062a","\u067e\u0627\u06a9\u0633\u062a\u0627\u0646","\u0647\u0645\u0631\u0627\u0647","\u0645\u0648\u0642\u0639","\u0645\u0648\u0628\u0627\u064a\u0644\u064a","\u0645\u0644\u064a\u0633\u064a\u0627","\u0645\u0635\u0631","\u0643\u0648\u0645","\u0643\u0627\u062b\u0648\u0644\u064a\u0643","\u0642\u0637\u0631","\u0641\u0644\u0633\u0637\u064a\u0646","\u0639\u0645\u0627\u0646","\u0639\u0631\u0628","\u0639\u0631\u0627\u0642","\u0634\u0628\u0643\u0629","\u0633\u0648\u0631\u064a\u0629","\u0633\u0648\u062f\u0627\u0646","\u062a\u0648\u0646\u0633","\u0628\u06be\u0627\u0631\u062a","\u0628\u064a\u062a\u0643","\u0628\u0627\u0632\u0627\u0631","\u0628\u0627\u0631\u062a","\u0627\u06cc\u0631\u0627\u0646","\u0627\u0645\u0627\u0631\u0627\u062a","\u0627\u0644\u0645\u063a\u0631\u0628","\u0627\u0644\u0639\u0644\u064a\u0627\u0646","\u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629","\u0627\u0644\u062c\u0632\u0627\u0626\u0631","\u0627\u0644\u0627\u0631\u062f\u0646","\u0627\u0631\u0627\u0645\u0643\u0648","\u0627\u062a\u0635\u0627\u0644\u0627\u062a","\u0627\u0628\u0648\u0638\u0628\u064a","\u05e7\u05d5\u05dd","\u0570\u0561\u0575","\u049b\u0430\u0437","\u0443\u043a\u0440","\u0441\u0440\u0431","\u0441\u0430\u0439\u0442","\u0440\u0444","\u0440\u0443\u0441","\u043e\u0440\u0433","\u043e\u043d\u043b\u0430\u0439\u043d","\u043c\u043e\u0441\u043a\u0432\u0430","\u043c\u043e\u043d","\u043c\u043a\u0434","\u043a\u043e\u043c","\u043a\u0430\u0442\u043e\u043b\u0438\u043a","\u0435\u044e","\u0434\u0435\u0442\u0438","\u0431\u0435\u043b","\u0431\u0433","\u03b5\u03bb","zw","zuerich","zone","zm","zippo","zip","zero","zara","zappos","za","yun","yt","youtube","you","yokohama","yoga","yodobashi","ye","yandex","yamaxun","yahoo","yachts","xyz","xxx","xperia","xn--zfr164b","xn--ygbi2ammx","xn--yfro4i67o","xn--y9a3aq","xn--xkc2dl3a5ee0h","xn--xkc2al3hye2a","xn--xhq521b","xn--wgbl6a","xn--wgbh1c","xn--w4rs40l","xn--w4r85el8fhu5dnra","xn--vuq861b","xn--vhquv","xn--vermgensberatung-pwb","xn--vermgensberater-ctb","xn--unup4y","xn--tiq49xqyj","xn--tckwe","xn--t60b56a","xn--ses554g","xn--s9brj9c","xn--rvc1e0am3e","xn--rovu88b","xn--rhqv96g","xn--qxam","xn--qcka1pmc","xn--q9jyb4c","xn--pssy2u","xn--pgbs0dh","xn--pbt977c","xn--p1ai","xn--p1acf","xn--ogbpf8fl","xn--o3cw4h","xn--nyqy26a","xn--nqv7fs00ema","xn--nqv7f","xn--node","xn--ngbrx","xn--ngbe9e0a","xn--ngbc5azd","xn--mxtq1m","xn--mk1bu44c","xn--mix891f","xn--mgbx4cd0ab","xn--mgbtx2b","xn--mgbt3dhd","xn--mgbpl2fh","xn--mgbi4ecexp","xn--mgbgu82a","xn--mgberp4a5d4ar","xn--mgbca7dzdo","xn--mgbc0a9azcg","xn--mgbbh1a71e","xn--mgbbh1a","xn--mgbb9fbpob","xn--mgbayh7gpa","xn--mgbai9azgqp6j","xn--mgbab2bd","xn--mgbaam7a8h","xn--mgbaakc7dvf","xn--mgba7c0bbn0a","xn--mgba3a4f16a","xn--mgba3a3ejt","xn--mgb9awbf","xn--lgbbat1ad8j","xn--l1acc","xn--kput3i","xn--kpu716f","xn--kpry57d","xn--kprw13d","xn--kcrx77d1x4a","xn--jvr189m","xn--jlq61u9w7b","xn--j6w193g","xn--j1amh","xn--j1aef","xn--io0a7i","xn--imr513n","xn--i1b6b1a6a2e","xn--hxt814e","xn--h2brj9c8c","xn--h2brj9c","xn--h2breg3eve","xn--gk3at1e","xn--gecrj9c","xn--gckr3f0f","xn--g2xx48c","xn--fzys8d69uvgm","xn--fzc2c9e2c","xn--fpcrj9c3d","xn--flw351e","xn--fjq720a","xn--fiqz9s","xn--fiqs8s","xn--fiq64b","xn--fiq228c5hs","xn--fhbei","xn--fct429k","xn--estv75g","xn--efvy88h","xn--eckvdtc9d","xn--e1a4c","xn--d1alf","xn--d1acj3b","xn--czru2d","xn--czrs0t","xn--czr694b","xn--clchc0ea0b2g2a9gcd","xn--cg4bki","xn--cck2b3b","xn--c2br7g","xn--c1avg","xn--bck1b9a5dre4c","xn--b4w605ferd","xn--9krt00a","xn--9et52u","xn--9dbq2a","xn--90ais","xn--90ae","xn--90a3ac","xn--8y0a063a","xn--80aswg","xn--80asehdb","xn--80aqecdr1a","xn--80ao21a","xn--80adxhks","xn--6qq986b3xl","xn--6frz82g","xn--5tzm5g","xn--5su34j936bgsg","xn--55qx5d","xn--55qw42g","xn--54b7fta0cc","xn--4gbrim","xn--45q11c","xn--45brj9c","xn--45br5cyl","xn--42c2d9a","xn--3pxu8k","xn--3oq18vl8pn36a","xn--3hcrj9c","xn--3e0b707e","xn--3ds443g","xn--3bst00m","xn--30rr7y","xn--2scrj9c","xn--1qqw23a","xn--1ck2e1b","xn--11b4c3d","xin","xihuan","xfinity","xerox","xbox","wtf","wtc","ws","wow","world","works","work","woodside","wolterskluwer","wme","winners","wine","windows","win","williamhill","wiki","wien","whoswho","wf","weir","weibo","wedding","wed","website","weber","webcam","weatherchannel","weather","watches","watch","warman","wanggou","wang","walter","walmart","wales","vuelos","vu","voyage","voto","voting","vote","volvo","volkswagen","vodka","vn","vlaanderen","vivo","viva","vistaprint","vista","vision","visa","virgin","vip","vin","villas","viking","vig","video","viajes","vi","vg","vet","versicherung","verm\u00f6gensberatung","verm\u00f6gensberater","verisign","ventures","vegas","ve","vc","vanguard","vana","vacations","va","uz","uy","us","ups","uol","uno","university","unicom","uk","ug","uconnect","ubs","ubank","ua","tz","tw","tvs","tv","tushu","tunes","tui","tube","tt","trv","trust","travelersinsurance","travelers","travelchannel","travel","training","trading","trade","tr","toys","toyota","town","tours","total","toshiba","toray","top","tools","tokyo","today","to","tn","tmall","tm","tl","tkmaxx","tk","tjx","tjmaxx","tj","tirol","tires","tips","tiffany","tienda","tickets","tiaa","theatre","theater","thd","th","tg","tf","teva","tennis","temasek","telefonica","telecity","tel","technology","tech","team","tdk","td","tci","tc","taxi","tax","tattoo","tatar","tatamotors","target","taobao","talk","taipei","tab","sz","systems","symantec","sydney","sy","sx","swiss","swiftcover","swatch","sv","suzuki","surgery","surf","support","supply","supplies","sucks","su","style","study","studio","stream","store","storage","stockholm","stcgroup","stc","statoil","statefarm","statebank","starhub","star","staples","stada","st","srt","srl","sr","spreadbetting","spot","sport","spiegel","space","soy","sony","song","solutions","solar","sohu","software","softbank","social","soccer","so","sncf","sn","smile","smart","sm","sling","sl","skype","sky","skin","ski","sk","sj","site","singles","sina","silk","si","shriram","showtime","show","shouji","shopping","shop","shoes","shiksha","shia","shell","shaw","sharp","shangrila","sh","sg","sfr","sexy","sex","sew","seven","ses","services","sener","select","seek","security","secure","seat","search","se","sd","scot","scor","scjohnson","science","schwarz","schule","school","scholarships","schmidt","schaeffler","scb","sca","sc","sbs","sbi","sb","saxo","save","sas","sarl","sapo","sap","sanofi","sandvikcoromant","sandvik","samsung","samsclub","salon","sale","sakura","safety","safe","saarland","sa","ryukyu","rwe","rw","run","ruhr","rugby","ru","rsvp","rs","room","rogers","rodeo","rocks","rocher","ro","rmit","rip","rio","ril","rightathome","ricoh","richardli","rich","rexroth","reviews","review","restaurant","rest","republican","report","repair","rentals","rent","ren","reliance","reit","reisen","reise","rehab","redumbrella","redstone","red","recipes","realty","realtor","realestate","read","re","raid","radio","racing","qvc","quest","quebec","qpon","qa","py","pwc","pw","pub","pt","ps","prudential","pru","protection","property","properties","promo","progressive","prof","productions","prod","pro","prime","press","praxi","pramerica","pr","post","porn","politie","poker","pohl","pnc","pn","pm","plus","plumbing","playstation","play","place","pl","pk","pizza","pioneer","pink","ping","pin","pid","pictures","pictet","pics","piaget","physio","photos","photography","photo","phone","philips","phd","pharmacy","ph","pg","pfizer","pf","pet","pe","pccw","pay","passagens","party","parts","partners","pars","paris","panerai","panasonic","page","pa","ovh","ott","otsuka","osaka","origins","organic","org","orange","oracle","open","ooo","onyourside","online","onl","onion","ong","one","omega","om","ollo","oldnavy","olayangroup","olayan","okinawa","office","off","observer","obi","nz","nyc","nu","ntt","nrw","nra","nr","np","nowtv","nowruz","now","norton","northwesternmutual","nokia","no","nl","nissay","nissan","ninja","nikon","nike","nico","ni","nhk","ngo","ng","nfl","nf","nexus","nextdirect","next","news","newholland","new","neustar","network","netflix","netbank","net","nec","ne","nc","nba","navy","natura","nationwide","name","nagoya","nadex","nab","na","mz","my","mx","mw","mv","mutual","museum","mu","mtr","mtn","mt","msd","ms","mr","mq","mp","movistar","movie","mov","motorcycles","moto","moscow","mortgage","mormon","mopar","monster","money","monash","mom","moi","moe","moda","mobily","mobile","mobi","mo","mn","mma","mm","mls","mlb","ml","mk","mitsubishi","mit","mint","mini","mil","microsoft","miami","mh","mg","metlife","merckmsd","meo","menu","men","memorial","meme","melbourne","meet","media","med","me","md","mckinsey","mc","mba","mattel","maserati","marshalls","marriott","markets","marketing","market","map","mango","management","man","makeup","maison","maif","madrid","macys","ma","ly","lv","luxury","luxe","lupin","lundbeck","lu","ltda","ltd","lt","ls","lr","lplfinancial","lpl","love","lotto","lotte","london","lol","loft","locus","locker","loans","loan","lk","llc","lixil","living","live","lipsy","link","linde","lincoln","limo","limited","lilly","like","lighting","lifestyle","lifeinsurance","life","lidl","liaison","li","lgbt","lexus","lego","legal","lefrak","leclerc","lease","lds","lc","lb","lawyer","law","latrobe","latino","lat","lasalle","lanxess","landrover","land","lancome","lancia","lancaster","lamer","lamborghini","ladbrokes","lacaixa","la","kz","kyoto","ky","kw","kuokgroup","kred","krd","kr","kpn","kpmg","kp","kosher","komatsu","koeln","kn","km","kiwi","kitchen","kindle","kinder","kim","kia","ki","kh","kg","kfh","kerryproperties","kerrylogistics","kerryhotels","ke","kddi","kaufen","juniper","juegos","jprs","jpmorgan","jp","joy","jot","joburg","jobs","jo","jnj","jmp","jm","jll","jlc","jio","jewelry","jetzt","jeep","je","jcp","jcb","java","jaguar","iwc","iveco","itv","itau","it","istanbul","ist","ismaili","iselect","is","irish","ir","iq","ipiranga","io","investments","intuit","international","intel","int","insure","insurance","institute","ink","ing","info","infiniti","industries","inc","in","immobilien","immo","imdb","imamat","im","il","ikano","ifm","ieee","ie","id","icu","ice","icbc","ibm","hyundai","hyatt","hughes","hu","ht","hsbc","hr","how","house","hotmail","hotels","hoteles","hot","hosting","host","hospital","horse","honeywell","honda","homesense","homes","homegoods","homedepot","holiday","holdings","hockey","hn","hm","hkt","hk","hiv","hitachi","hisamitsu","hiphop","hgtv","hermes","here","helsinki","help","healthcare","health","hdfcbank","hdfc","hbo","haus","hangout","hamburg","hair","gy","gw","guru","guitars","guide","guge","gucci","guardian","gu","gt","gs","group","grocery","gripe","green","gratis","graphics","grainger","gr","gq","gp","gov","got","gop","google","goog","goodyear","goodhands","goo","golf","goldpoint","gold","godaddy","gn","gmx","gmo","gmbh","gmail","gm","globo","global","gle","glass","glade","gl","giving","gives","gifts","gift","gi","gh","ggee","gg","gf","george","genting","gent","gea","ge","gdn","gd","gbiz","gb","gay","garden","gap","games","game","gallup","gallo","gallery","gal","ga","fyi","futbol","furniture","fund","fun","fujixerox","fujitsu","ftr","frontier","frontdoor","frogans","frl","fresenius","free","fr","fox","foundation","forum","forsale","forex","ford","football","foodnetwork","food","foo","fo","fm","fly","flowers","florist","flir","flights","flickr","fk","fj","fitness","fit","fishing","fish","firmdale","firestone","fire","financial","finance","final","film","fido","fidelity","fiat","fi","ferrero","ferrari","feedback","fedex","fast","fashion","farmers","farm","fans","fan","family","faith","fairwinds","fail","fage","extraspace","express","exposed","expert","exchange","everbank","events","eus","eurovision","eu","etisalat","et","esurance","estate","esq","es","erni","ericsson","er","equipment","epson","epost","enterprises","engineering","engineer","energy","emerck","email","eg","ee","education","edu","edeka","eco","ec","eat","earth","dz","dvr","dvag","durban","dupont","duns","dunlop","duck","dubai","dtv","drive","download","dot","domains","doha","dog","dodge","doctor","docs","do","dnp","dm","dk","dj","diy","dish","discover","discount","directory","direct","digital","diet","diamonds","dhl","dev","design","desi","dentist","dental","democrat","delta","deloitte","dell","delivery","degree","deals","dealer","deal","de","dds","dclk","day","datsun","dating","date","data","dance","dad","dabur","cz","cyou","cymru","cy","cx","cw","cv","cuisinella","cu","csc","cruises","cruise","crs","crown","cricket","creditunion","creditcard","credit","cr","cpa","courses","coupons","coupon","country","corsica","coop","cool","cookingchannel","cooking","contractors","contact","consulting","construction","condos","comsec","computer","compare","company","community","commbank","comcast","com","cologne","college","coffee","codes","coach","co","cn","cm","clubmed","club","cloud","clothing","clinique","clinic","click","cleaning","claims","cl","ck","cityeats","city","citic","citi","citadel","cisco","circle","cipriani","ci","church","chrysler","chrome","christmas","chintai","cheap","chat","chase","channel","chanel","ch","cg","cfd","cfa","cf","cern","ceo","center","ceb","cd","cc","cbs","cbre","cbn","cba","catholic","catering","cat","casino","cash","caseih","case","casa","cartier","cars","careers","career","care","cards","caravan","car","capitalone","capital","capetown","canon","cancerresearch","camp","camera","cam","calvinklein","call","cal","cafe","cab","ca","bzh","bz","by","bw","bv","buzz","buy","business","builders","build","bugatti","budapest","bt","bs","brussels","brother","broker","broadway","bridgestone","bradesco","br","box","boutique","bot","boston","bostik","bosch","boots","booking","book","boo","bond","bom","bofa","boehringer","boats","bo","bnpparibas","bnl","bn","bmw","bms","bm","blue","bloomberg","blog","blockbuster","blanco","blackfriday","black","bj","biz","bio","bingo","bing","bike","bid","bible","bi","bharti","bh","bg","bf","bet","bestbuy","best","berlin","bentley","beer","beauty","beats","be","bd","bcn","bcg","bbva","bbt","bbc","bb","bayern","bauhaus","basketball","baseball","bargains","barefoot","barclays","barclaycard","barcelona","bar","bank","band","bananarepublic","banamex","baidu","baby","ba","azure","az","axa","ax","aws","aw","avianca","autos","auto","author","auspost","audio","audible","audi","auction","au","attorney","athleta","at","associates","asia","asda","as","arte","art","arpa","army","archi","aramco","arab","ar","aquarelle","aq","apple","app","apartments","aol","ao","anz","anquan","android","analytics","amsterdam","amica","amfam","amex","americanfamily","americanexpress","am","alstom","alsace","ally","allstate","allfinanz","alipay","alibaba","alfaromeo","al","akdn","airtel","airforce","airbus","aigo","aig","ai","agency","agakhan","ag","africa","afl","afamilycompany","af","aetna","aero","aeg","ae","adult","ads","adac","ad","actor","active","aco","accountants","accountant","accenture","academy","ac","abudhabi","abogado","able","abc","abbvie","abbott","abb","abarth","aarp","aaa"]},7198],["BarcelonaWebConfig",[],{"is_crawler_request":false,"is_past_launch_date":true,"username_domain_suffix":"threads.net","seconds_until_launch_date":-1,"golden_ticket_triggers":["1992","p92","saymore","thread","ticket"],"fediverse_server_names":[]},7172],["IntlCompactDecimalNumberFormatConfig",[],{"short_patterns":{"3":{"4":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0mil","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0mil"},"24":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0mil","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0mil"}},"4":{"4":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0mil","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0mil"},"24":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0mil","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0mil"}},"5":{"4":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0mil","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0mil"},"24":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0mil","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0mil"}},"6":{"4":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0mi","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0mi"},"24":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0mi","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0mi"}},"7":{"4":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0mi","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0mi"},"24":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0mi","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0mi"}},"8":{"4":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0mi","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0mi"},"24":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0mi","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0mi"}},"9":{"4":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0bi","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0bi"},"24":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0bi","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0bi"}},"10":{"4":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0bi","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0bi"},"24":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0bi","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0bi"}},"11":{"4":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0bi","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0bi"},"24":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0bi","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0bi"}},"12":{"4":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0tri","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0tri"},"24":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0tri","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0tri"}},"13":{"4":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0tri","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0tri"},"24":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0tri","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0tri"}},"14":{"4":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0tri","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0tri"},"24":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0tri","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0tri"}}},"long_patterns":{"3":{"4":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":" mil","negative_prefix_pattern":"-","negative_suffix_pattern":" mil"},"24":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":" mil","negative_prefix_pattern":"-","negative_suffix_pattern":" mil"}},"4":{"4":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":" mil","negative_prefix_pattern":"-","negative_suffix_pattern":" mil"},"24":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":" mil","negative_prefix_pattern":"-","negative_suffix_pattern":" mil"}},"5":{"4":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":" mil","negative_prefix_pattern":"-","negative_suffix_pattern":" mil"},"24":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":" mil","negative_prefix_pattern":"-","negative_suffix_pattern":" mil"}},"6":{"4":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":" milh\u00e3o","negative_prefix_pattern":"-","negative_suffix_pattern":" milh\u00e3o"},"24":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":" milh\u00f5es","negative_prefix_pattern":"-","negative_suffix_pattern":" milh\u00f5es"}},"7":{"4":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":" milh\u00e3o","negative_prefix_pattern":"-","negative_suffix_pattern":" milh\u00e3o"},"24":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":" milh\u00f5es","negative_prefix_pattern":"-","negative_suffix_pattern":" milh\u00f5es"}},"8":{"4":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":" milh\u00e3o","negative_prefix_pattern":"-","negative_suffix_pattern":" milh\u00e3o"},"24":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":" milh\u00f5es","negative_prefix_pattern":"-","negative_suffix_pattern":" milh\u00f5es"}},"9":{"4":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":" bilh\u00e3o","negative_prefix_pattern":"-","negative_suffix_pattern":" bilh\u00e3o"},"24":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":" bilh\u00f5es","negative_prefix_pattern":"-","negative_suffix_pattern":" bilh\u00f5es"}},"10":{"4":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":" bilh\u00e3o","negative_prefix_pattern":"-","negative_suffix_pattern":" bilh\u00e3o"},"24":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":" bilh\u00f5es","negative_prefix_pattern":"-","negative_suffix_pattern":" bilh\u00f5es"}},"11":{"4":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":" bilh\u00e3o","negative_prefix_pattern":"-","negative_suffix_pattern":" bilh\u00e3o"},"24":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":" bilh\u00f5es","negative_prefix_pattern":"-","negative_suffix_pattern":" bilh\u00f5es"}},"12":{"4":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":" trilh\u00e3o","negative_prefix_pattern":"-","negative_suffix_pattern":" trilh\u00e3o"},"24":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":" trilh\u00f5es","negative_prefix_pattern":"-","negative_suffix_pattern":" trilh\u00f5es"}},"13":{"4":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":" trilh\u00e3o","negative_prefix_pattern":"-","negative_suffix_pattern":" trilh\u00e3o"},"24":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":" trilh\u00f5es","negative_prefix_pattern":"-","negative_suffix_pattern":" trilh\u00f5es"}},"14":{"4":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":" trilh\u00e3o","negative_prefix_pattern":"-","negative_suffix_pattern":" trilh\u00e3o"},"24":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":" trilh\u00f5es","negative_prefix_pattern":"-","negative_suffix_pattern":" trilh\u00f5es"}}}},2981],["CLDRDateRenderingClientRollout",[],{"formatDateClientLoggerSamplingRate":0.0001},3003],["VideoPlayerStateBasedLoggingEvents",[],{"StateBasedLoggingEventNames":["cancelled_requested_playing","caption_change","chromecast_availability_checked","chromecast_not_supported","chromecast_button_visible","entered_fs","entered_hd","error","exited_fs","exited_hd","finished_loading","finished_playing","headset_connected","headset_disconnected","host_error","muted","paused","player_format_changed","quality_change","requested_playing","scrubbed","seeked","started_playing","unmuted","unpaused","volume_changed","volume_decrease","volume_increase","viewport_rotated","viewport_zoomed","heading_reset","guide_entered","guide_exited","spherical_fallback_entered","played_for_three_seconds","commercial_break_offscreen","commercial_break_onscreen","ad_break_starting_indicator","ad_break_non_interruptive_ad_start","ad_break_non_interruptive_ad_click","ad_break_pre_roll_ad_start","ad_break_tap_on_trailer","ad_break_tap_start_from_trailer","representation_ended","heart_beat","stale","viewability_changed","video_logging_session_timeout","video_logging_session_wakeup","retry_on_error","playback_speed_changed","video_warmup_evicted","suppress_video_off","suppress_video_on","error_recovery_attempt","displayed_frames","video_viewability_updated"]},3462],["CLDRDateFormatConfig",[],{"supportedPHPFormatsKeys":{"D":"E","D g:ia":"Ejm","D M d":"MMMEd","D M d, Y":"yMMMEd","D M j":"MMMEd","D M j, y":"yMMMEd","D, M j":"MMMEd","D, M j, Y":"yMMMEd","F d":"MMMMd","F d, Y":"date_long","F j":"MMMMd","F j, Y":"date_long","F j, Y \u0040 g:i A":"dateTime_long_short","F j, Y g:i a":"dateTime_long_short","F j, Y \u0040 g:i:s A":"dateTime_long_medium","F jS":"MMMMd","F jS, g:ia":"dateTime_long_short","F jS, Y":"date_long","F Y":"yMMMM","g A":"j","G:i":"time_short","g:i":"time_short","g:i a":"time_short","g:i A":"time_short","g:i:s A":"time_medium","g:ia":"time_short","g:iA":"time_short","g:ia F jS, Y":"dateTime_long_short","g:iA l, F jS":"dateTime_full_short","g:ia M jS":"dateTime_medium_short","g:ia, F jS":"dateTime_long_short","g:iA, l M jS":"dateTime_full_short","h:i a":"time_short","h:m:s m\/d\/Y":"dateTime_short_short","j":"d","j F Y":"date_long","l F d, Y":"date_full","l, F d, Y":"date_full","l, F j":"date_full","l, F j, Y":"date_full","l, F jS":"date_full","l, F jS, g:ia":"dateTime_full_short","l, M j":"date_full","l, M j, Y":"date_full","l, M j, Y g:ia":"dateTime_full_short","M d":"MMMd","M d, Y":"date_medium","M d, Y g:ia":"dateTime_medium_short","M d, Y ga":"dateTime_medium_short","M j":"MMMd","M j, Y":"date_medium","M j, Y g:i A":"dateTime_medium_short","M j, Y g:ia":"dateTime_medium_short","M jS, g:ia":"dateTime_medium_short","M y":"yMMM","M Y":"yMMM","M. d":"MMMd","M. d, Y":"date_medium","m\/d":"Md","m\/d\/Y g:ia":"dateTime_short_short","m\/d\/y H:i:s":"dateTime_short_short","n":"M","n\/j":"Md","n\/j, g:ia":"dateTime_short_short","n\/j\/y":"date_short","Y":"y"},"isLocaleInConfigerator":true,"CLDRConfigeratorFormats":{"dateFormats":{"full":"EEEE, d 'de' MMMM 'de' y","long":"d 'de' MMMM 'de' y","medium":"d 'de' MMM 'de' y","short":"dd\/MM\/y"},"timeFormats":{"full":"HH:mm:ss zzzz","long":"HH:mm:ss z","medium":"HH:mm:ss","short":"HH:mm"},"dateTimeFormats":{"full":"{1} {0}","long":"{1} {0}","medium":"{1} {0}","short":"{1} {0}"},"availableFormats":{"Bh":"h B","Bhm":"h:mm B","Bhms":"h:mm:ss B","E":"ccc","EBhm":"E h:mm B","EBhms":"E h:mm:ss B","EHm":"E, HH:mm","EHms":"E, HH:mm:ss","Ed":"E, d","Ehm":"E, h:mm a","Ehms":"E, h:mm:ss a","Gy":"y G","GyMMM":"MMM 'de' y G","GyMMMEd":"E, d 'de' MMM 'de' y G","GyMMMd":"d 'de' MMM 'de' y G","H":"HH","Hm":"HH:mm","Hms":"HH:mm:ss","Hmsv":"HH:mm:ss v","Hmv":"HH:mm v","M":"L","MEd":"E, dd\/MM","MMM":"LLL","MMMEd":"E, d 'de' MMM","MMMMEd":"E, d 'de' MMMM","MMMMW-count-one":"W'\u00aa' 'semana' 'de' MMMM","MMMMW-count-other":"W'\u00aa' 'semana' 'de' MMMM","MMMMd":"d 'de' MMMM","MMMd":"d 'de' MMM","MMdd":"dd\/MM","Md":"d\/M","d":"d","h":"h a","hm":"h:mm a","hms":"h:mm:ss a","hmsv":"h:mm:ss a v","hmv":"h:mm a v","ms":"mm:ss","y":"y","yM":"MM\/y","yMEd":"E, dd\/MM\/y","yMM":"MM\/y","yMMM":"MMM 'de' y","yMMMEd":"E, d 'de' MMM 'de' y","yMMMM":"MMMM 'de' y","yMMMMEd":"E, d 'de' MMMM 'de' y","yMMMMd":"d 'de' MMMM 'de' y","yMMMd":"d 'de' MMM 'de' y","yMd":"dd\/MM\/y","yQQQ":"QQQ 'de' y","yQQQQ":"QQQQ 'de' y","yw-count-one":"w'\u00aa' 'semana' 'de' Y","yw-count-other":"w'\u00aa' 'semana' 'de' Y"}},"CLDRRegionalConfigeratorFormats":{"dateFormats":{"full":"EEEE, d 'de' MMMM 'de' y","long":"d 'de' MMMM 'de' y","medium":"d 'de' MMM 'de' y","short":"dd\/MM\/y"},"timeFormats":{"full":"HH:mm:ss zzzz","long":"HH:mm:ss z","medium":"HH:mm:ss","short":"HH:mm"},"dateTimeFormats":{"full":"{1} {0}","long":"{1} {0}","medium":"{1} {0}","short":"{1} {0}"},"availableFormats":{"Bh":"h B","Bhm":"h:mm B","Bhms":"h:mm:ss B","E":"ccc","EBhm":"E h:mm B","EBhms":"E h:mm:ss B","EHm":"E, HH:mm","EHms":"E, HH:mm:ss","Ed":"E, d","Ehm":"E, h:mm a","Ehms":"E, h:mm:ss a","Gy":"y G","GyMMM":"MMM 'de' y G","GyMMMEd":"E, d 'de' MMM 'de' y G","GyMMMd":"d 'de' MMM 'de' y G","H":"HH","Hm":"HH:mm","Hms":"HH:mm:ss","Hmsv":"HH:mm:ss v","Hmv":"HH:mm v","M":"L","MEd":"E, dd\/MM","MMM":"LLL","MMMEd":"E, d 'de' MMM","MMMMEd":"E, d 'de' MMMM","MMMMW-count-one":"W'\u00aa' 'semana' 'de' MMMM","MMMMW-count-other":"W'\u00aa' 'semana' 'de' MMMM","MMMMd":"d 'de' MMMM","MMMd":"d 'de' MMM","MMdd":"dd\/MM","Md":"d\/M","d":"d","h":"h a","hm":"h:mm a","hms":"h:mm:ss a","hmsv":"h:mm:ss a v","hmv":"h:mm a v","ms":"mm:ss","y":"y","yM":"MM\/y","yMEd":"E, dd\/MM\/y","yMM":"MM\/y","yMMM":"MMM 'de' y","yMMMEd":"E, d 'de' MMM 'de' y","yMMMM":"MMMM 'de' y","yMMMMEd":"E, d 'de' MMMM 'de' y","yMMMMd":"d 'de' MMMM 'de' y","yMMMd":"d 'de' MMM 'de' y","yMd":"dd\/MM\/y","yQQQ":"QQQ 'de' y","yQQQQ":"QQQQ 'de' y","yw-count-one":"w'\u00aa' 'semana' 'de' Y","yw-count-other":"w'\u00aa' 'semana' 'de' Y"}},"CLDRToPHPSymbolConversion":{"yyyy":"Y","yy":"y","y":"Y","MMMMM":"M","MMMM":"F","MMM":"M","MM":"m","M":"n","dd":"d","d":"j","EEEEE":"D","EEEE":"l","EEE":"D","EE":"D","E":"D","aaaaa":"A","aaaa":"A","aaa":"A","aa":"A","a":"A","bbbbb":"A","bbbb":"A","bbb":"A","bb":"A","b":"A","BBBBB":"A","BBBB":"A","BBB":"A","BB":"A","B":"A","HH":"H","H":"G","hh":"h","h":"g","K":"g","mm":"i","ss":"s","z":"","zz":"","zzz":"","ccccc":"D","cccc":"l","ccc":"D","cc":"D","c":"D","LLLLL":"M","LLLL":"f","LLL":"M","LL":"m","L":"n","G":""},"intlDateSpecialChars":{"cldrDelimiter":"'","singleQuote":"'","singleQuoteHolder":"*"}},3019],["IsInternSite",[],{"is_intern_site":false},4517],["VideoPlayerContextSensitiveConfigPayload",[],{"context_sensitive_values":{"buffering_overflow_threshold":[{"value":3.0832147598267,"contexts":[{"name":"connection_quality","value":"POOR"}]},{"value":3.0832147598267,"contexts":[{"name":"connection_quality","value":"MODERATE"}]}],"enable_request_pipelining_for_live":[{"value":false,"contexts":[{"name":"latency_level","value":"low"}]}],"initial_stream_buffer_size_float":[{"value":10,"contexts":[{"name":"is_ad","value":true}]}],"is_low_latency":[{"value":true,"contexts":[{"name":"latency_level","value":"low"}]}],"live_stream_buffer_size_float":[{"value":10,"contexts":[{"name":"content_category","value":"esports"}]},{"value":6.5,"contexts":[{"name":"content_category","value":"gaming"}]}],"num_predictive_segments":[{"value":4,"contexts":[{"name":"latency_level","value":"low"}]}],"oz_www_append_byte_target_without_range":[{"value":1,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_bandwidth_ignore_on_stream_write_samples":[{"value":true,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_bandwidth_use_response_time_adjustment":[{"value":true,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_buffer_ahead_target":[{"value":10,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"content_category","value":"gaming"}]},{"value":14,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"is_latency_sensitive_broadcast","value":true}]},{"value":24,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_catchup_timeout_after_buffering_sec":[{"value":0.001,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_catchup_timeout_after_play_sec":[{"value":30,"contexts":[{"name":"fbls_tier","value":"user"}]}],"oz_www_ignore_reset_after_seek_if_bufferahead":[{"value":true,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_in_play_buffer_overflow_target":[{"value":1,"contexts":[{"name":"connection_quality","value":"POOR"}]},{"value":1,"contexts":[{"name":"connection_quality","value":"MODERATE"}]}],"oz_www_latencymanager_stalled_edgelatency_sec":[{"value":2,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"latency_level","value":"ultra-low"}]},{"value":6,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"content_category","value":"gaming"}]},{"value":10,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"is_latency_sensitive_broadcast","value":true}]},{"value":18,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_latencymanager_stalled_edgelatency_sec_on":[{"value":false,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"latency_level","value":"ultra-low"}]},{"value":true,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_live_initial_playback_position":[{"value":-14,"contexts":[{"name":"content_category","value":"gaming"}]}],"oz_www_live_rewind_seek_to_live_delta":[{"value":4,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"is_latency_sensitive_broadcast","value":true}]}],"oz_www_minimum_bytes_to_sample_on_close":[{"value":10000,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_ms_promise_for_null":[{"value":true,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_ms_promise_for_null_ms":[{"value":1000,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_network_reload_mpd_json":[{"value":"[\"504\", \"404\"]","contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_network_retry_intervals_json":[{"value":"{\"0\": 1000, \"404\": 2000, \"502\": 1000, \"503\": 1000, \"504\": 1000, \"20\": 1, \"429\": 2000}","contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_overwrite_live_time_range_block_margin":[{"value":5,"contexts":[{"name":"latency_level","value":"low"},{"name":"fbls_tier","value":"user"}]}],"oz_www_overwrite_livehead_fall_behind_block_threshold":[{"value":10,"contexts":[{"name":"latency_level","value":"low"}]}],"oz_www_pdash_download_cursor_catchup_threshold_gop_multiplier":[{"value":1,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_pdash_download_cursor_catchup_threshold_sec":[{"value":1,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"latency_level","value":"ultra-low"}]},{"value":2,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"is_latency_sensitive_broadcast","value":true},{"name":"latency_level","value":"low"}]},{"value":6,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"is_latency_sensitive_broadcast","value":true}]},{"value":10,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"latency_level","value":"low"}]},{"value":10,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_pdash_download_cursor_catchup_tolerance_sec":[{"value":1,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_pdash_use_pdash_segmentlocator":[{"value":true,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_per_stream_duration_target":[{"value":0.5,"contexts":[{"name":"connection_quality","value":"GOOD"}]},{"value":0.5,"contexts":[{"name":"connection_quality","value":"EXCELLENT"}]}],"oz_www_playback_speed_latency_slowdown_adjustment_rate":[{"value":0.2,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_playback_speed_latency_speedup_adjustment_rate":[{"value":0.1,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_playback_speed_min_buffer_sec":[{"value":0.5,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"latency_level","value":"ultra-low"}]}],"oz_www_player_emit_mpdparsed_early":[{"value":true,"contexts":[{"name":"is_live","value":true}]}],"oz_www_player_emit_mpdready_early":[{"value":true,"contexts":[{"name":"is_live","value":true}]}],"oz_www_player_formats_for_low_latency":[{"value":"[\"*\"]","contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_playhead_manager_buffered_auto_seek_playhead_slack":[{"value":0.01,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_playhead_manager_buffered_numerical_error":[{"value":0,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_playhead_manager_clamp_initial_playback_position":[{"value":true,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_pre_start_buffer_ahead_target":[{"value":10,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_reset_catchup_timeout_after_play_sec_on_overwrite":[{"value":true,"contexts":[{"name":"content_category","value":"gaming"}]},{"value":true,"contexts":[{"name":"fbls_tier","value":"user"}]}],"oz_www_seek_on_latency_level_change_allowed":[{"value":"[[\"low\",\"normal\"],[\"normal\",\"normal\"]]","contexts":[{"name":"content_category","value":"gaming"},{"name":"is_live","value":true}]}],"oz_www_skip_videobuffer_gaps":[{"value":true,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_skip_videobuffer_gaps_on_buffer_updated":[{"value":true,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_stale_mpd_buffer_ahead_target":[{"value":2,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_start_buffer_underflow_target":[{"value":1.1,"contexts":[{"name":"connection_quality","value":"POOR"}]},{"value":1.1,"contexts":[{"name":"connection_quality","value":"MODERATE"}]}],"oz_www_steadystate_minbuffer_buckets":[{"value":4,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"latency_level","value":"ultra-low"}]},{"value":20,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"is_latency_sensitive_broadcast","value":true}]}],"oz_www_steadystate_minbuffer_sec":[{"value":1,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"latency_level","value":"ultra-low"}]},{"value":1.75,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"is_latency_sensitive_broadcast","value":true}]}],"oz_www_stream_types_eligible_for_partial_playback":[{"value":"audio","contexts":[{"name":"is_live","value":true}]}],"oz_www_systemic_risk_abr_initial_risk_factor":[{"value":4,"contexts":[{"name":"is_live","value":true}]}],"oz_www_systemic_risk_abr_low_mos_resolution":[{"value":260,"contexts":[{"name":"is_live","value":true}]}],"oz_www_time_to_first_byte_ignore_above_threshold_ms":[{"value":200,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_use_live_latency_manager":[{"value":true,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}]},"static_values":{"stream_buffer_size_float":15,"initial_stream_buffer_size_float":7.5,"min_switch_interval":5000,"min_eval_interval":1000,"bandwidth_upgrade_target":0.9,"live_bandwidth_upgrade_target":0.63308577239513,"resolution_constraint_factor":2,"resolve_video_time_update_on_fragmented_time_ranges":true,"live_send_push_headers":false,"live_initial_stream_buffer_size_float":3.5,"enable_video_debug":false,"reappend_init_segment_after_abort":false,"current_time_during_ready_state_zero_throws":false,"www_videos_nudge_timestamp_correction_s":0,"www_videos_extended_spl_logging_for_connected_tv":false,"live_abr_send_push_headers":false,"shaka_native_promise":false,"oz_www_skip_videobuffer_gaps":true,"oz_www_skip_timerange_gaps":true,"oz_www_skip_videobuffer_gaps_on_buffer_updated":true,"oz_www_skip_videobuffer_gaps_max_gap_size_sec":0,"use_resource_timing_entry_for_bandwidth":false,"force_lowest_representation_threshold":0,"force_lower_representation_step_ratio":0,"enable_request_pipelining_for_vod":false,"enable_streaming_for_vod":false,"use_continuous_streaming":false,"streaming_segment_size":4,"streaming_bandwidth_update_interval":180000,"multi_segment_decay":0,"enable_request_pipelining_for_live":true,"enable_streaming_code_path":true,"ignore_errors_after_unload":true,"use_pending_seek_position_for_reference":false,"start_stream_buffer_size":1,"videos_abr_debugger_storage":false,"fix_shaka_xhr_error_status":true,"set_current_time_in_resync":true,"live_stream_buffer_size_float":3,"use_dimensions_fallbacks":true,"aggressive_fast_moving_average_half_life":1.5779530704021,"aggressive_slow_moving_average_half_life":9.2335087917745,"ignore_left_button_when_pausing":true,"disable_360_abr":false,"clear_buffer_on_seek_back":false,"buffering_overflow_threshold":0,"use_buffer_target_only_after_buffering_goal_is_hit":false,"enable_content_protection":true,"drop_buffering_detection_from_html5_api":true,"exclude_tracks_without_smooth_playback":false,"mpd_parse_frame_and_audio_sampling_rate":false,"abort_loading_decisioning_logic":true,"buffer_velocity_time_in_past_to_consider":0,"evaluate_abr_on_fetch_end":false,"ignore_recent_bandwidth_eval_on_fetch_end":false,"bandwidth_penalty_per_additional_video":0.1,"overwrite_video_current_time_property":false,"low_start_stream_buffer_size":2.5,"low_bandwidth_start_stream_buffer_size_threshold":2000000,"connection_quality_context_throttle_frequency":1000,"allow_seek_logging_in_mixin":false,"fix_pause_current_time_in_mixin":true,"better_set_current_time_in_resync":false,"resync_set_current_time_fudge_factor":0,"enable_main_thread_availability_logging":true,"fix_overwritten_get_video_current_time":false,"should_use_oz_p2p":false,"oz_www_fix_oz_p2p_enable_failed":true,"num_predictive_segments":0,"oz_www_generate_mos_segment_buffer_diff":false,"oz_www_pdash_use_pdash_segmentlocator":false,"oz_www_pdash_seq_based_approx":false,"oz_www_pdash_seq_based_approx_use_blockedrange":false,"oz_www_pdash_download_cursor_catchup_threshold_sec":0,"oz_www_pdash_download_cursor_catchup_tolerance_sec":0,"oz_www_pdash_download_cursor_catchup_skip_totalbufer":true,"oz_www_pdash_download_cursor_catchup_threshold_gop_multiplier":0,"oz_www_pdash_download_cursor_tolerance_gop_multiplier":0,"oz_www_pdash_download_cursor_bufferahead_gop_multiplier":0,"oz_www_pdash_download_cursor_between_catchups_seg":0,"oz_www_latencymanager_stalempd_edgelatency_sec":0,"oz_www_latencymanager_stalempd_edgelatency_sec_on":false,"oz_www_latencymanager_stalled_edgelatency_sec_on":false,"oz_www_latencymanager_stalled_edgelatency_sec":0,"oz_www_pdash_future_edgelatency_gops":0,"oz_www_catchup_timeout_after_play_sec":0,"oz_www_catchup_timeout_after_buffering_sec":0,"oz_www_reset_catchup_timeout_after_play_sec_on_overwrite":true,"oz_www_catchup_min_interval_sec":0,"oz_www_playback_speed_latency_adjustment_rate":0,"oz_www_playback_speed_enabled_delay_sec":4,"oz_www_playback_speed_min_buffer_sec":1,"oz_www_playback_speed_min_duration_sec":2,"oz_www_playback_speed_restore_min_duration_sec":1,"oz_www_playback_speed_latency_slowdown_adjustment_rate":0,"oz_www_playback_speed_latency_speedup_adjustment_rate":0,"oz_www_pdash_download_cursor_use_totalbuffer":true,"oz_www_pdash_download_cursor_nocatchup_use_currentbuffer":false,"oz_www_playback_speed_min_sharpness_factor":3,"oz_www_pdash_wait_on_mpd_refresh_when_error":true,"oz_www_pdash_download_cursor_pause_duration_of_gop":false,"oz_www_pdash_download_cursor_catchup_only_when_advancing":false,"oz_www_download_cursor_use_node_time":false,"oz_www_download_cursor_total_buffer_max_sec":0,"oz_www_download_cursor_buffer_ahead_time_max_sec":0,"oz_www_download_cursor_disable_buffer_ahead_rule_on":true,"oz_www_download_cursor_disable_buffer_ahead_rule_lr_on":false,"oz_www_download_cursor_1st_run_set_skipped_segment_on":true,"oz_www_download_cursor_1st_run_2_fallback":false,"oz_www_enable_predictive_dash":true,"oz_www_use_sc_timebased_segments":false,"oz_www_use_templated_pdash_segments":true,"oz_www_use_scf_timebased_segments":false,"oz_www_touch_cb_key":false,"oz_www_enable_dvl":true,"oz_www_use_dvl_with_timeout_ms":0,"oz_www_dvl_update_interval_ms":0,"oz_www_dvl_update_interval_reset_on_err":true,"oz_www_dvl_initial_segment_ignore_count":1,"oz_www_use_inline_manifest_for_live":true,"oz_www_use_live_latency_manager":false,"oz_www_player_emit_mpdready_early":false,"oz_www_clear_on_seek":true,"oz_www_player_emit_mpdparsed_early":false,"is_low_latency":false,"fire_seek_events":false,"shaka_buffer_abr":false,"evaluate_abr_on_tracks_and_bandwidth_change":true,"enable_double_ingest":true,"test_use_embedded_cb":false,"www_videos_playback_remove_src_attr_on_unload":false,"www_videos_playback_call_load_on_unload":false,"has_live_rewind_egress":false,"has_live_rewind_ui_www":false,"use_oz_with_fbms_eligible":true,"create_restore_abort_loading_promise":true,"oz_www_fix_representation_ended_timing":true,"oz_www_safely_log_player_seeks":true,"oz_www_enable_adaptation":true,"oz_www_fix_quick_starter_overhead":true,"oz_www_abr_restrict_from_index":0,"oz_www_abr_restrict_to_index":0,"oz_www_initial_switch_interval":0,"oz_www_min_switch_interval":100,"oz_www_abr_min_bandwidth_samples":0,"oz_www_min_eval_interval":100,"oz_www_bandwidth_estimator_half_life":6,"oz_www_bandwidth_estimator_variance_penalty_half_life":0,"oz_www_bandwidth_estimator_variance_penalty_down_factor":0,"oz_www_bandwidth_estimator_variance_penalty_up_factor":0,"oz_www_bandwidth_estimator_outlier_exclusion_factor":50,"oz_www_bandwidth_estimator_std_dev_penalty_factor":0,"oz_www_abr_confidence_threshold":0.9,"oz_www_segments_to_stream":5,"oz_www_per_stream_duration_target":0,"oz_www_segments_to_stream_under_playhead_threshold":0,"oz_www_low_segment_stream_playhead_threshold":0,"oz_www_appends_per_segment":6,"oz_www_append_byte_target_without_range":100000,"oz_www_log_appended_secs":false,"oz_www_lazy_parse_sidx":false,"oz_www_abr_eval_buffer_threshold":0,"oz_www_throttle_playback_rate_on_stall":true,"oz_www_use_prefetch_cache":true,"oz_www_force_initial_representation":true,"oz_www_buffer_ahead_target":22,"oz_www_low_buffer_bandwidth_target_threshold":10,"oz_www_low_buffer_bandwidth_target_increase_factor":0,"oz_www_segments_to_stream_near_bandwidth_boundary":5,"oz_www_bandwidth_boundary_standard_deviation_factor":1,"oz_www_suppress_playing_event_while_buffering":false,"oz_www_resolution_constraint_factor":2,"oz_www_pre_start_buffer_ahead_target":16.924449682236,"oz_www_stale_mpd_buffer_ahead_target":0,"oz_www_setup_buffer_target_onload":true,"oz_www_in_play_buffer_underflow_target":0.1,"oz_www_in_play_buffer_overflow_target":1,"oz_www_buffer_when_waiting":false,"oz_www_start_buffer_underflow_target":0.1,"oz_www_byte_count_per_sample":200000,"oz_www_minimum_bytes_to_sample_on_close":25000,"oz_www_manifest_update_frequency_ms":0,"oz_www_manifest_initial_update_delay_ms":0,"oz_www_exclude_prefetch_bandwidth_samples":true,"oz_www_connection_quality_context_throttle_frequency":2000,"oz_www_paused_stream_segments_count":2,"oz_www_minimum_bandwidth_sample_duration":10,"oz_www_maximum_bandwidth_sample_bandwidth":100000000,"oz_www_max_bandwidth_sample_count":30,"oz_www_use_performance_entry_on_stream_close":false,"oz_www_ignore_time_to_response_start":false,"oz_www_network_seg_timeout_ms":0,"oz_www_bandwidth_response_time_handicap":0,"oz_www_bandwidth_ignore_on_stream_write_samples":false,"oz_www_bandwidth_use_response_time_adjustment":false,"oz_www_use_scheduler":true,"oz_www_cdn_experiment_id":"","oz_www_disable_audio_scheduler":false,"oz_www_no_new_loop_body_promise_when_stream_ongoing":true,"oz_www_fix_seek_performance":false,"oz_www_ignore_reset_after_seek_if_bufferahead":false,"oz_www_ignore_reset_after_seek_if_bufferahead_liverewind":true,"oz_www_enable_network_manager_error":false,"oz_www_parse_first_segment":false,"oz_www_enable_abr_for_first_request":false,"oz_www_update_media_source_duration":true,"oz_www_ms_promise_for_null":false,"oz_www_ms_promise_for_null_ms":0,"oz_www_sbm_waits_for_update_end":true,"oz_www_sbm_cancel_operation_synchronous":false,"oz_www_sbm_recursively_waits_for_update_end":false,"oz_www_auto_seek_playhead_slack":0.5,"oz_www_playhead_manager_buffered_auto_seek_playhead_slack":0.5,"oz_www_playhead_manager_buffered_is_near_gap_threshold":1.5,"oz_www_playhead_manager_buffered_numerical_error":0.01,"oz_www_playhead_manager_handle_timerange_update_on_timeupdate":true,"oz_www_playhead_manager_buffered_timerange_update_on_timeupdate":true,"oz_www_playhead_manager_timeupdate_throttle_ms":1000,"oz_www_playhead_manager_clamp_initial_playback_position":false,"oz_www_playhead_manager_buffer_gaps_skip_reverse":true,"oz_www_media_stream_buffer_gaps_ignore_before_seek":false,"oz_www_playhead_manager_initial_playback_position_lat_mgr":true,"oz_www_playheadman_dont_skip_ahead_past_last_fetched":false,"oz_www_seek_ahead_epsilon":0.05,"oz_www_seek_ahead_use_native_current_time":true,"oz_www_timeline_offset_threshold":10,"oz_www_live_rewind_seek_to_live_delta":8,"oz_www_update_seekable_range":true,"oz_www_update_duration_when_init_appended":true,"oz_www_abr_prevent_down_switch_buffer_threshold":11,"oz_www_check_buffer_range_once_for_playhead_update":false,"oz_www_fix_start_timestamp":true,"oz_www_fix_templated_manifest_r_field_check":true,"oz_www_seek_on_latency_level_change":false,"oz_www_seek_on_latency_level_change_allowed":"[]","oz_www_live_initial_playback_position":-20,"oz_www_live_query_time_in_range":true,"oz_www_timerange_manager_cleanup":false,"oz_www_livehead_fall_behind_block_threshold":30,"oz_www_overwrite_livehead_fall_behind_block_threshold":0,"oz_www_live_time_range_block_margin":5.9,"oz_www_overwrite_live_time_range_block_margin":0,"oz_www_live_gracefully_handle_mpd_errors":true,"oz_www_live_no_segment_when_playhead_is_before_first_segment":true,"oz_www_live_disable_mpd_updates_when_paused":true,"oz_www_cleanup_video_node_on_destroy":true,"oz_www_detach_media_source_manager":true,"oz_www_enable_abortload_and_reload":true,"oz_www_live_playhead_catch_up":false,"oz_www_live_catch_up_only_when_paused":false,"oz_www_live_catch_up_fall_behind_threshold":20,"oz_www_live_catch_up_live_head_delta":6,"oz_www_live_numerical_error_epsilon":0.0001,"oz_www_stop_manifest_update_when_static":true,"oz_www_buffer_end_only_when_buffering":false,"oz_www_stream_interrupt_check_mpd_stale_count_threshold":6,"oz_www_reach_end_only_when_video_ended":false,"oz_www_allow_queueing_end_of_stream_when_update":false,"oz_www_set_source_buffer_append_window_end":false,"oz_www_use_stream_end_time_in_segment_locator":false,"oz_www_pausable_stream_throws_error_when_aborted":true,"oz_www_network_retry_intervals_json":"{\"0\": 1000, \"404\": 2000, \"502\": 1000, \"503\": 1000, \"504\": 1000, \"429\": 2000, \"20\": 1000}","oz_www_network_retry_intervals_json_retry":false,"oz_www_network_reload_mpd_json_retry":false,"oz_www_network_end_broadcasts_json":"[\"410\"]","oz_www_network_skip_json":"[]","oz_www_network_reload_mpd_json":"[]","oz_www_fallback_on_append_error":false,"oz_www_enable_appends_on_wait_update_end_failure":false,"oz_www_bandwidth_penalty_per_additional_video":0,"oz_www_bandwidth_penalty_additional_video_start":0,"oz_www_prefetch_cache_bandwidth_upper_limit":0,"oz_www_throw_network_error_during_stream":false,"oz_www_retry_fetch_on_prefetch_error":true,"oz_www_use_abr_for_missing_default_representation":true,"oz_www_initial_manifest_request_retry_count":3,"oz_www_download_time_buffer_delta_penalty_factor":0,"oz_www_time_to_first_byte_estimate_half_life_ms":500,"oz_www_handle_missing_manifest_segment_timeline":true,"oz_www_mos_upper_threshold":0,"oz_www_mos_lower_threshold":0,"oz_www_abr_use_download_time":false,"oz_www_minimum_download_additional_buffer_ms":0,"oz_www_use_deferred_streaming_task":true,"oz_www_allow_abort_loading_from_autoplay_controller":false,"oz_www_enable_double_ingest":true,"oz_www_use_oz_credentials_provider":true,"oz_www_throw_on_non_zero_r_d_mismatch":true,"oz_www_fix_template_duration_artifact_in_manifest":true,"oz_www_bandwidth_cache_key":"bandwidthEstimate","oz_www_estimate_video_bandwidth_only":true,"oz_www_enable_bandwidth_navigator_estimation":false,"oz_www_default_bandwidth_estimate":1000000,"oz_www_update_bandwidth_cache_on_sample":false,"oz_www_live_audio_ibr_bandwidth_percentage":0.05,"comet_www_no_pause_on_blur_or_focus_events":false,"oz_www_live_gracefully_handle_no_network":true,"oz_www_live_max_try_attempts_on_404":2,"oz_www_clear_buffer_when_switch_representation_initiator_is_user":true,"oz_www_use_segment_request_cache":false,"oz_www_seconds_to_stream":10,"oz_www_seconds_to_stream_near_bandwidth_boundary":10,"oz_www_queue_data_with_error_handling":false,"oz_www_clear_prepended_segments_count_on_append":true,"oz_www_back_off_pdash_504_retry":true,"oz_www_call_end_of_stream_in_quick_starter":true,"oz_www_instantiate_buffering_detector_before_quick_starter":true,"oz_www_maybe_end_stream_if_prepended_segments":true,"oz_www_seek_to_start_quick_starter":true,"oz_www_remove_src_attr_on_unload":true,"oz_www_use_loose_manifest_updates":false,"oz_www_use_full_player_if_cached":true,"oz_www_enable_quickdashv2":false,"oz_www_copy_new_manifest":true,"oz_www_handle_switch_to_unparsed_representation_sidx":true,"oz_www_stable_buffered_timeranges_in_observedsourcebufferstate":true,"oz_www_emit_stream_error_event":true,"oz_www_max_start_eme_attempts":3,"oz_www_listen_for_canplay_in_buffering_detector":true,"oz_www_handle_mpd_retries_outside_oz_mpd_updater":true,"oz_www_respect_initial_representation_on_setup":false,"oz_www_update_live_video_config_on_representation_switch":true,"oz_www_mpd_update_cancel_current_request_tracker":true,"oz_www_tagged_time_range_per_append_throttle":0,"oz_www_fix_reload_manifest_retry":true,"oz_www_fix_source_buffer_error_logging":true,"oz_www_min_block_time_range_interval_ms":0,"oz_www_fix_buffer_ahead_priority_strategy":true,"oz_www_append_last_segment_if_beyond_end":true,"oz_www_set_stream_anchor_only_on_done_status":true,"oz_www_fix_stream_deferred_cancel":true,"oz_www_sbm_abort_on_readable_stream_error":true,"oz_www_cancel_tracker_on_append_error":true,"oz_www_pixels_below_viewport_to_observe":0,"oz_www_prioritize_by_viewport_static_penalty":0,"oz_www_fix_setup_video_duration_on_representation_switch":true,"oz_www_handle_mpd_null_error_codes":true,"oz_www_fix_prepended_segments_tagging":true,"oz_www_xmlparser_use_domparser":true,"oz_www_cache_mos_threshold":false,"oz_www_load_video_node_on_unload":true,"oz_www_convert_dom_exception_to_oz_error":true,"oz_www_sbm_check_source_buffer_ready_state_on_cancel":true,"oz_www_prevent_unnecessary_seek_stream_anchor_reset":true,"oz_www_stream_types_eligible_for_partial_playback":"","oz_www_partial_playback_buffer_overflow":0.75,"oz_www_live_use_inline_manifest_after_request_manifest":false,"oz_www_live_gracefully_handle_410":true,"oz_www_segment_end_410_response":true,"oz_www_segment_end_410_response_loop_end":true,"oz_www_steadystate_minbuffer_sec":0,"oz_www_steadystate_minbuffer_buckets":0,"oz_www_steadystate_minbuffer_buckets_sec":1,"oz_www_pixels_above_viewport_to_observe":0,"oz_www_delay_stream_end_for_sourceended":true,"www_videos_shaka_use_xbox_buffered_fudge_factor":0.05,"oz_www_media_source_is_available_in_ended_state":true,"oz_www_unset_override_oz_request_implementation_on_hive_error":false,"oz_www_live_gracefully_handle_502":true,"oz_www_systemic_risk_abr_apply_representation_restrictions":true,"oz_www_dynamic_mpd_initial_playback_position_offset_modifier":4,"oz_www_player_formats_for_low_latency":"[]","oz_www_loop_body_handle_error_interval_ms":1,"oz_www_load_sequence_max_delay_ms":0,"oz_www_get_fetch_body_text_when_response_not_ok":true,"oz_www_load_sequence_only_prioritize_first_count":0,"oz_www_stream_interrupted_fuzzy_equals":false,"oz_www_sbm_skip_abort_on_media_error":true,"oz_www_sbm_abort_on_append_new_readable_stream":false,"oz_www_prevent_unnecessary_quickstarter_instance":true,"oz_www_stricter_mpd_parser_invariants":true,"oz_www_accept_external_buffering_detector":true,"oz_www_treat_inline_mpd_xml_empty_string_as_null":false,"oz_www_live_gracefully_handle_429":true,"oz_www_use_systemic_risk_abr":true,"oz_www_systemic_risk_abr_risk_factor":1.75,"oz_www_time_to_first_byte_ignore_above_threshold_ms":0,"oz_www_bandwidth_ttfb_samples_to_save":5,"oz_www_blue_video_player_pass_inline_mpd_xml_empty_string_as_undefined":false,"oz_www_blue_video_player_force_xhr":false,"oz_www_set_global_config":false,"oz_www_systemic_risk_abr_low_mos_risk_factor":1.3,"oz_www_systemic_risk_abr_min_watchable_mos":30,"oz_www_systemic_risk_abr_low_mos_resolution":0,"oz_www_prevent_multiple_successive_representation_switch":true,"oz_www_sidx_parser_memory_optimization":false,"oz_www_buffer_when_waiting_in_partial_buffer":true,"oz_www_stream_interrupt_in_play_buffer_overflow_target":1,"oz_www_stream_interrupt_buffer_target_timeout_ms":10000,"oz_www_recent_buffer_in_play_buffer_overflow_target":3,"oz_www_recent_buffer_timeout_ms":10000,"oz_www_use_ending_duration_for_gop_multiplier":true,"oz_www_live_trace_parse_emsg":true,"oz_www_catchup_use_timeline_range_end_time_as_end":false,"oz_www_perf_log_representation_id_more":true,"oz_www_systemic_risk_use_fetch_range_duration":false,"oz_www_use_simple_moving_average_estimator":false,"oz_www_http_no_cache":false,"oz_www_use_buffering_detector_for_playhead_interruption":true,"oz_www_enable_immediate_down_switch":false,"oz_www_handle_media_source_manager_errors":true,"oz_www_handle_invalid_webm_duration":false,"oz_www_parse_initialization_binary":true,"oz_www_systemic_risk_abr_high_estimate_confidence":52,"oz_www_data_reader_concat_once":true,"oz_www_pump_concat_once":true,"oz_www_sbm_append_readable_stream_concat_once":true,"oz_www_log_appended_segment_info":false,"oz_www_log_media_element_error_source_buffer_updateend_error":true,"oz_www_log_extra_events":true,"oz_www_overwrite_video_current_time_property":true,"oz_www_clear_buffer_on_seek_into_unbuffered_range":true,"oz_www_numerical_range_utils_is_after_range_exclusive":true,"oz_www_server_side_abr_send_client_estimates":false,"oz_www_server_side_abr_use_server_estimates":false,"oz_www_live_gracefully_handle_504":true,"oz_www_debug_live_replay":false,"oz_www_append_retry_quota_exceeded_error":true,"oz_www_buffer_target_constraint_minimum_sec":2,"oz_www_buffer_target_constraint_append_succeeded_reward":0.2,"oz_www_always_use_current_time_in_playback_state":true,"oz_www_buffer_target_constraint_quota_exceeded_penalty":0.3,"oz_www_retry_null_error_code_in_stream":false,"oz_www_emit_destroyed_after_media_keys_clear":false,"oz_www_do_not_end_stream":false,"oz_www_do_not_flush_data_queue_after_destroy":false,"oz_www_do_not_update_duration_vod":false,"oz_www_no_representation_error_detailed_message":true,"oz_www_mpd_updater_network_request_timeout_ms":20000,"oz_www_restart_media_streams_on_stream_resumed":false,"oz_www_media_stream_tracker_cancel_on_seek":false,"oz_www_media_stream_fix_double_segments_compute":false,"oz_www_fix_initial_segment_non_zero_start_time":true,"oz_www_get_mpd_least_last_time_range":true,"oz_www_respect_playback_restrictions_in_abr_fallback":true,"oz_www_null_segment_for_no_buffer_target":true,"oz_www_systemic_risk_abr_initial_risk_factor":1,"oz_www_systemic_risk_abr_document_hidden_risk_factor":0,"oz_www_use_bandwidth_estimate_from_headers_in_abr":false,"oz_www_use_ttfb_from_headers":false,"oz_www_skip_playhead_adjustment_before_initial_playback_position":false,"oz_www_clear_buffer_on_seek_epsilon_s":0,"oz_www_handle_buffered_timerange_update_on_ratechange":false,"oz_www_stub_safari_source_buffer_abort":false,"oz_www_clear_buffer_on_seek_nudge_s":0,"oz_www_streaming_task_reject_current_stream_deferred":true,"oz_www_min_buffer_behind_playhead":10,"oz_www_check_mediasource_readystate_before_end_of_stream":true,"oz_www_retry_video_element_error":true,"oz_www_clamp_seek_to_first_buffer_range_epsilon":0.75,"oz_www_ignore_restrictions_when_all_representations_restricted":false,"oz_www_hive_maximum_trimming_seconds":0,"oz_www_block_representation_status_codes_json":"[500, 503]","oz_www_block_representation_status_codes_temporarily_json":"{}","oz_www_revoke_object_url_on_detach":false,"oz_www_abort_clear_video_node_on_detach":false,"oz_www_proceed_on_representation_change_in_init_append_fail":true,"oz_www_should_check_that_source_buffer_attached":false,"oz_www_exclude_large_representations_after_restrictions":true,"oz_www_stop_loop_driver_immediately_on_cleanup":true,"oz_www_playhead_manager_handle_time_range_update_on_waiting":false,"oz_www_enable_error_recovery_attempt_logging":true,"oz_www_systemic_risk_abr_prefetch_initial_risk_factor":5,"oz_www_prefetch_resolution_threshold":810,"oz_www_use_strict_resolution_constraint":true,"oz_www_throw_no_license_error":true,"oz_www_vtt_caption_representation":true,"oz_www_live_video_send_transaction_id_in_requests":false,"oz_www_log_exposure_on_oz_initialization":false,"oz_www_systemic_risk_abr_prefetch_low_mos_resolution":0,"oz_www_allow_subsequent_prefetch":true,"oz_www_comet_video_player_live_vtt_captions":false,"oz_www_prefetch_retention_duration_ms":0,"oz_www_clear_prefetch_on_unload":false,"oz_www_emit_captions_changed_event":true,"oz_www_use_vtt_captions_visible_buffer_strategy":false,"oz_www_disable_end_of_stream_in_caption_stream":true,"oz_www_append_once_per_stream_in_caption_stream":true,"oz_www_append_once_per_stream_in_application_stream":false,"oz_www_enable_era_logging_for_application_stream":false,"oz_www_emit_stream_gone_on_end_stream_before_start":true,"oz_www_sidx_segment_retry_attempts":9999,"oz_www_sidx_segment_retry_interval_ms":100,"oz_www_clear_buffer_around_playhead_boundary_ms":5000,"oz_www_fix_manifest_fetch_mixed_promise_catch":true,"oz_www_fix_update_duration_check":false,"oz_www_never_decrease_mediasource_duration":false,"oz_www_normalize_mpd_fetch_errors":true,"oz_www_no_retry_on_empty_string_error_code":false,"oz_www_fix_dom_exception_as_message":true,"oz_www_use_src_object_for_media_source":false,"oz_www_mpd_parse_all_adaptation_sets":true,"oz_www_mpd_ensure_playable_representations":false,"oz_www_ull_use_broadcast_sensitivity_type":true,"oz_www_ull_fallback_stall_count":2,"oz_www_live_video_chunk_duration":0,"oz_www_av1_check_hardware_support":false,"oz_www_ultra_low_latency_bandwidth_threshold":10000000,"oz_www_bandwidth_estimate_header_key":"","oz_www_bandwidth_estimate_key":"","oz_www_fix_ull_fallback_stall_count":false,"oz_www_set_latency_context_immediately":false,"oz_www_fall_back_to_low_latency_in_ull":false,"oz_www_bandwidth_header_expire_threshold":0,"oz_www_fix_live_rewind_user_selected_playback_speed":true}},5261],["DateFormatConfig",[],{"numericDateOrder":["m","d","y"],"numericDateSeparator":"\/","shortDayNames":["Mon","Tue","Wed","Thu","Fri","Sat","Sun"],"narrowDayNames":["M","T","W","T","F","S","S"],"timeSeparator":":","weekStart":6,"formats":{"D":"D","D g:ia":"D g:ia","D M d":"D M d","D M d, Y":"D M d, Y","D M j":"D M j","D M j, g:ia":"D M j, g:ia","D M j, y":"D M j, y","D M j, Y g:ia":"D M j, Y g:ia","D, M j, Y":"D, M j, Y","F d":"F d","F d, Y":"F d, Y","F g":"F g","F j":"F j","F j, Y":"F j, Y","F j, Y \u0040 g:i A":"F j, Y \u0040 g:i A","F j, Y g:i a":"F j, Y g:i a","F jS":"F jS","F jS, g:ia":"F jS, g:ia","F jS, Y":"F jS, Y","F Y":"F Y","g A":"g A","g:i":"g:i","g:i A":"g:i A","g:i a":"g:i a","g:iA":"g:iA","g:ia":"g:ia","g:ia F jS, Y":"g:ia F jS, Y","g:iA l, F jS":"g:iA l, F jS","g:ia M j":"g:ia M j","g:ia M jS":"g:ia M jS","g:ia, F jS":"g:ia, F jS","g:iA, l M jS":"g:iA, l M jS","g:sa":"g:sa","H:I - M d, Y":"H:I - M d, Y","h:i a":"h:i a","h:m:s m\/d\/Y":"h:m:s m\/d\/Y","j":"j","l F d, Y":"l F d, Y","l g:ia":"l g:ia","l, F d, Y":"l, F d, Y","l, F j":"l, F j","l, F j, Y":"l, F j, Y","l, F jS":"l, F jS","l, F jS, g:ia":"l, F jS, g:ia","l, M j":"l, M j","l, M j, Y":"l, M j, Y","l, M j, Y g:ia":"l, M j, Y g:ia","M d":"M d","M d, Y":"M d, Y","M d, Y g:ia":"M d, Y g:ia","M d, Y ga":"M d, Y ga","M j":"M j","M j, Y":"M j, Y","M j, Y g:i A":"M j, Y g:i A","M j, Y g:ia":"M j, Y g:ia","M jS, g:ia":"M jS, g:ia","M Y":"M Y","M y":"M y","m-d-y":"m-d-y","M. d":"M. d","M. d, Y":"M. d, Y","j F Y":"j F Y","m.d.y":"m.d.y","m\/d":"m\/d","m\/d\/Y":"m\/d\/Y","m\/d\/y":"m\/d\/y","m\/d\/Y g:ia":"m\/d\/Y g:ia","m\/d\/y H:i:s":"m\/d\/y H:i:s","m\/d\/Y h:m":"m\/d\/Y h:m","n":"n","n\/j":"n\/j","n\/j, g:ia":"n\/j, g:ia","n\/j\/y":"n\/j\/y","Y":"Y","Y-m-d":"Y-m-d","Y\/m\/d":"Y\/m\/d","y\/m\/d":"y\/m\/d","j \/ F \/ Y":"j \/ F \/ Y"},"ordinalSuffixes":{"1":"st","2":"nd","3":"rd","4":"th","5":"th","6":"th","7":"th","8":"th","9":"th","10":"th","11":"th","12":"th","13":"th","14":"th","15":"th","16":"th","17":"th","18":"th","19":"th","20":"th","21":"st","22":"nd","23":"rd","24":"th","25":"th","26":"th","27":"th","28":"th","29":"th","30":"th","31":"st"}},165],["cr:964538",[],{"__rc":[null,"Aa1nOQ5HQ6nQgSeZCBP_QlSRb5gr5c5hSJAA8OTGxoB2SjKcUsS28P15G8MxUPXFAy6jjJwXe0NjWp0K-w"]},-1],["cr:99",[],{"__rc":[null,"Aa0YC-1FA1t6z-ivbb0ZBXEM6OY068hCZj7it1bPFefUr8SCSKaAwlxgsWdBW3BUcz8eNKloMWW5bvuZNNoMtfaTBiik1Y_DDg"]},-1],["cr:506",[],{"__rc":[null,"Aa21sPXXegcyXNYtJ2LMKinL4I3ckZsL8sgng6dJnhtNeMrb8mIqoC3NXejq9Y6FU1An7Sh9vHkGLnKWof_8DPpJYaAiYAXtReUYxy3LkG8"]},-1],["cr:913",[],{"__rc":[null,"Aa2aHkhh38CgkL34GyQCiBhFz6tUMXqUSz9DU7360SooaievY_D5Q49hGpcmdtNVNlWJcz5KGurOi7Tdpr3U8Ya18rpugog"]},-1],["cr:2889",[],{"__rc":[null,"Aa3pjuAzYzNKiZX-PwndtMiRxq9CsTmZRaA_yP_8PyjD0qzkVwpkdzVn8MdbVIcS4WcqQHMvtlvVXJAFkxXSaMFUIylj8fj0S2aXiLFkAuWIdqDPWr-X--vFXbmfIO6b2woTSxwr7YnaIphV"]},-1],["cr:4081",[],{"__rc":[null,null]},-1],["cr:4149",[],{"__rc":[null,"Aa3n9DyXLmeU0Ahrk2CJiej-QLVT_PuG-Z58wYJcCv-6GzQXDxpDae3H4Z9VA8JZMzCL5cEVGghoLuWsWttMTtbAcaBqtk3zsJzntRazKRpa1HVSKlha0d1O4w"]},-1],["cr:921407",["useNoopDebuggingInfoComponent"],{"__rc":["useNoopDebuggingInfoComponent","Aa04l9KkY7RIojcs5KR0m8Aiu8Tlgb31RErPXLbMwyMg6qIiCcaY3abAN1xJvjAfzS5B9KrdLluHASN2nzEh"]},-1],["cr:1269159",["emptyFunction"],{"__rc":["emptyFunction","Aa3upciGF2ITzYdBGMeLqZwZ_c3U7BOjPCfr72RCzvcxKKrE7cbr5Q5aXaK8wKNxgSw9sNKGOEGcx-rGcsGKqEBktomO7r62bF2KgtBSM0CH4dza"]},-1],["cr:1453865",[],{"__rc":[null,"Aa0p3JooVJi44XBdnQe8StvqWIiJH4SEfz_cBZc_w6GucvdAoTL2rHNxB8Qg6fpTBoKuKE9T-VkBzCVaDNhB8W881u0Ybgsdw_s1hto"]},-1],["cr:1473550",[],{"__rc":[null,"Aa1pr0_lrhTseYwqMjY4N-U7uE4Pf43yq2T_M7ivobAVWwKdGgPiC0l_bFagxBV5dJSpIZRldr36gNSnFepsgiFn8IMSZU7X"]},-1],["cr:1634616",["CometUserActivity"],{"__rc":["CometUserActivity","Aa1BcYjypchcS4HoRErgm5XuT2MvKoSv6CC6oo9YrT51-ys02VdgfyysCsypBIjSZTnCiRuaO5Suw2sMFikNlYWaXBs"]},-1],["cr:1672302",[],{"__rc":[null,"Aa3zf35Ua8Qv_p-e1Pc2in8zeXXZxWrGMG5KM8Qg6gqa5iqfIZHwyjQmlC5dDAtgXtJtb32OwlmhdqCdiGF6kGOHDaxpZLBbyOFyE5wRoO_W2foqVGeP"]},-1],["cr:1680308",[],{"__rc":[null,"Aa100DOAi6SKSk5txjPsrncXTnT4OsdQELAp15bUAvu53nKbDkYUdF13iFwW9e4qhQrdhHSg_zZyHwSF9DNkUwfV9bRbAx74RTZwSsWsAZj-N9T5-KT-jus"]},-1],["cr:1724253",[],{"__rc":[null,"Aa0kJXmH0SoR-UThqhHqQkGJ4BGeOsN6O2HdNJoRTmZF2z-7TxKvB8UrnM80usGo5m4fUnNDJhEdzR8ImX5li0vL9LN39cM_wltT2UWaxhp7CieluA"]},-1],["cr:1791018",["CometInteractionVC"],{"__rc":["CometInteractionVC","Aa2Dd_wiBxJM0IdTczQqBC3cXRrPDxPmFhkQtxrvf9Q4D-CCYBq1OsyQnvxagL4zSZeBT1HT0IdkztGbfDWmymUFOh_jAULHCH8jBUp_I_ZE"]},-1],["cr:1802022",["CometPrerenderer.react"],{"__rc":["CometPrerenderer.react",null]},-1],["cr:1802023",["BaseContextualLayerDefaultContainer.react"],{"__rc":["BaseContextualLayerDefaultContainer.react",null]},-1],["cr:1954434",[],{"__rc":[null,"Aa3PTPW23otZjRbM-Cf0FBKiLzOsBTlin_ObkV4o89qDN9gyf8w-mTLMc2txmDaEudUU3ZgibTm99XhBnvChyAw7IsqxEh3QYLNnVQ"]},-1],["cr:4865",["ReactDOMLegacy_DEPRECATED"],{"__rc":["ReactDOMLegacy_DEPRECATED","Aa1P3LK7i1coXutKq2XRt8R5njetcCVpx-Eu6ASsS2GS5mUhdmoq8u3Qb1o44ez0jd3r85uu7hrhQCGomNU16KLHG56W"]},-1],["cr:3569",[],{"__rc":[null,"Aa1v0khPz2I7Bg2CBkIXp51CuuucXCxA1U7HgaM8cvvd9wgh_J7_-bZVQiQCTo7jNNYJLwTXMl2vgDe1u3IF"]},-1],["cr:4772",["ReactApiCallFalcoEvent"],{"__rc":["ReactApiCallFalcoEvent",null]},-1],["cr:1294246",["ReactDOM.classic"],{"__rc":["ReactDOM.classic","Aa1P3LK7i1coXutKq2XRt8R5njetcCVpx-Eu6ASsS2GS5mUhdmoq8u3Qb1o44ez0jd3r85uu7hrhQCGomNU16KLHG56W"]},-1]],"require":[["CometTooltipDeferredImpl.react\u0040838ad10251820a246b75532ad46eb511"],["maybeRemoveElement\u0040838ad10251820a246b75532ad46eb511"],["CometPressable.react\u0040838ad10251820a246b75532ad46eb511"],["GlobalVideoPortsImpl.react\u0040838ad10251820a246b75532ad46eb511"],["CometExceptionDialog.react\u0040838ad10251820a246b75532ad46eb511"],["BarcelonaPostPage.react\u0040838ad10251820a246b75532ad46eb511"],["emptyFunction\u0040bd79be8bb44e6c7cf2f2ac86916da51c","thatReturns",["RequireDeferredReference"],[[{"__dr":"CometTooltipDeferredImpl.react"},{"__dr":"maybeRemoveElement"},{"__dr":"CometPressable.react"},{"__dr":"GlobalVideoPortsImpl.react"},{"__dr":"CometExceptionDialog.react"},{"__dr":"BarcelonaPostPage.react"}]]],["VideoPlayerSpinner.react\u004046173d9b0a2a06510368e27565188241"],["VideoPlayerCaptionsArea.react\u004046173d9b0a2a06510368e27565188241"],["Bootloader\u0040b06c930045dfde1329ab583ead60f0b5","markComponentsAsImmediate",[],[["VideoPlayerHTML5ApiCea608State","VideoPlayerHTML5ApiWebVttState","BarcelonaAnimatedScrollArea.react"]]],["RequireDeferredReference\u00405fa49f9a913b58dc6eb11c8541e7eca0","unblock",[],[["CometTooltipDeferredImpl.react","maybeRemoveElement","CometPressable.react","GlobalVideoPortsImpl.react","CometExceptionDialog.react","BarcelonaPostPage.react","VideoPlayerSpinner.react","VideoPlayerCaptionsArea.react"],"sd"]],["RequireDeferredReference\u00405fa49f9a913b58dc6eb11c8541e7eca0","unblock",[],[["CometTooltipDeferredImpl.react","maybeRemoveElement","CometPressable.react","GlobalVideoPortsImpl.react","CometExceptionDialog.react","BarcelonaPostPage.react","VideoPlayerSpinner.react","VideoPlayerCaptionsArea.react"],"css"]]]});});});</script>
+<script>qpl_inl("7252766176843880442","tierTwoEnd");</script>
+<script type="application/json" data-content-len="83" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766176843880442","tierTwoEnd"]]]}</script>
+
+<script type="application/json" data-content-len="108" data-sjs>{"require":[["CometSSRFizzContentInjector","onPayloadReceived",null,[[{"status":"fail_ssr_disabled"}],[]]]]}</script>
+
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         <script>qpl_inl("7252766176843880442","tierThree");</script>
+<script type="application/json" data-content-len="82" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766176843880442","tierThree"]]]}</script>
+<script>qpl_inl("7252766176843880442-server","tierThree",192);</script>
+<script type="application/json" data-content-len="93" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766176843880442-server","tierThree",192]]]}</script>
+<script>requireLazy(["HasteSupportData"],function(m){m.handle({"clpData":{"1828945":{"r":100,"s":1},"1848815":{"r":10000,"s":1},"4791":{"r":1,"s":1},"819":{"r":1,"s":1},"1744057":{"r":500,"s":1},"1744058":{"r":5000,"s":1},"1744059":{"r":10000,"s":1},"1744060":{"r":1000,"s":1},"1857112":{"r":1},"1871697":{"r":1,"s":1},"1942319":{"r":1,"s":1},"1823926":{"r":1,"s":1},"1743887":{"r":1},"1764786":{"r":1,"s":1},"1755537":{"r":1},"1873550":{"r":10000,"s":1},"1743095":{"r":1,"s":1}},"gkxData":{"307":{"result":true,"hash":"AT5dPMZBMiNY0f7usiU"},"762":{"result":false,"hash":"AT7XePNdehhQhxt4M5Y"},"2795":{"result":false,"hash":"AT5ilL0A5sDVhuaBCEM"},"5639":{"result":true,"hash":"AT5SF61ZadJ9LozlzOo"},"778292":{"result":false,"hash":"AT574OhXHwX0kRP24_E"},"832242":{"result":false,"hash":"AT7QZmREZ7b0HQdOA9Q"},"945829":{"result":true,"hash":"AT6KFs8jy_GkmgnUqAE"},"968609":{"result":true,"hash":"AT7nKteWCVYK6uN6m3E"},"1001007":{"result":false,"hash":"AT54HpnriRBxXJ_Mmp4"},"1066746":{"result":false,"hash":"AT55_E5b8Sj7u5rUimg"},"1166607":{"result":false,"hash":"AT7xrOkGBcaF8I5u6RA"},"996940":{"result":false,"hash":"AT7opYuEGy3sjG1aHFE"},"1073500":{"result":false,"hash":"AT7aJmfnqWyioxOOnys"},"1857581":{"result":false,"hash":"AT5yTxGMp6le0PAtaZs"},"1196":{"result":false,"hash":"AT7JN3eRi_Tkojtt2So"},"1341692":{"result":false,"hash":"AT6ztF4pPshu3yZQxwM"},"1334580":{"result":false,"hash":"AT6P8Id36DnRE-rxrvU"},"574":{"result":false,"hash":"AT5l2P5ytV2bv8xHipE"},"871":{"result":true,"hash":"AT4vyfQGHTBrTQa9wA4"},"1626":{"result":false,"hash":"AT6XwrJGGF9Cvtws_io"},"1799":{"result":false,"hash":"AT6Id9SGNjhz9OshZe4"},"2674":{"result":false,"hash":"AT6LknPzbQEjKsuxubE"},"2819":{"result":false,"hash":"AT77OwnXENquugNcEZA"},"6002":{"result":false,"hash":"AT6qjxreNXGYgzg6X_4"},"3499":{"result":false,"hash":"AT5l5tI3kdeSuUxUFjE"},"1652843":{"result":false,"hash":"AT6uh9NWRY4QEQoYiD0"}},"ixData":{"478231":{"sprited":2,"spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","_spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","w":12,"h":12,"p":"0 -109px","sz":"auto"},"485124":{"sprited":2,"spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","_spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","w":24,"h":24,"p":"0 0","sz":"auto"}},"qexData":{"37":{"r":null},"130":{"r":null},"131":{"r":null},"656":{"r":null},"657":{"r":null},"660":{"r":null},"19":{"r":null},"245":{"r":null},"296":{"r":null},"633":{"r":null}},"qplData":{"1860":{"r":1}},"justknobxData":{"317":{"r":16},"1023":{"r":true}}})});requireLazy(["Bootloader"],function(m){m.handlePayload({"consistency":{"rev":1007796774},"rsrcMap":{"pZuCvpU":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yF\/r\/FLJXkx8ys-6.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":15","m":"1007796774_main","nc":1},"l5HqvCB":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yY\/r\/YT7n1sgH1lv.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":17","m":"1007796774_main","nc":1},"92FWu0u":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yV\/r\/3qf4Dki9jBk.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23099","m":"1007796774_longtail","nc":1},"lNw+3Cn":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iTQy4\/ys\/l\/en_US\/R6UwB5s2nQ2.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22368","m":"1007796774_longtail","nc":1},"ymVdTSF":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yH\/r\/ZV0aNQj4T9JOYKdx9bFmwVfC6z84fkv87OWMWJy1SRRa.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22320,22433,22336,22319","m":"1007796774_longtail","nc":1},"rDyHGpp":{"type":"css","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yq\/l\/0,cross\/4ShJxXUc17dmPpUJGycqYtdM-rzcG2i1ZXJj8Zr6dWgv.css?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":29,22369,22418,22417","nc":1},"cXPO3JJ":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yz\/r\/ov-P0fxTgQg.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22371","m":"1007796774_longtail","nc":1},"PHpesmL":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yf\/r\/2cABj-f85G2.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22370","m":"1007796774_longtail","nc":1},"w4kZepP":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yY\/r\/lZ_qmNlaNM_.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22416","m":"1007796774_longtail","nc":1},"EHXzFna":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yQ\/r\/2bbc1q-688I.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22318","m":"1007796774_longtail","nc":1},"dQOzthE":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/ya\/r\/hXzjLI7TwYY.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22372","m":"1007796774_longtail","nc":1},"zEfyD1a":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y-\/r\/rfTsco5uJfS.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":49","m":"1007796774_main","nc":1},"PWJSBTX":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yu\/r\/tPn65o0StmW.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22373","m":"1007796774_longtail","nc":1},"aeZ8J7P":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y5\/r\/I91dQtKCqtJ.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22223","m":"1007796774_longtail","nc":1},"0nDDuEM":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iGWT4\/yP\/l\/en_US\/tj6aAvg10RR-ha4Zz4enInvo7PIFqzApS6tLnb7_y9_rBefStsZCuAtZV0aNQj4T9JPHKRnYublkQqmh-2VANtdEJJdX6BV3dPz8c0H7ihoY7nbNTHWB_fxixJNSNAbg-4lgvnWIH809jxK_8olt4CfolTwB3N6XBAeljxRdJbjnMUA7AD0vIwbJotBSHV8_sn1YcPS4UlnaoBKWrD1Jrj0GZnF3fC6z84fkv87QfwLFPl3iNfPtmfxLVwAb7OWMWJy1SRRaN_g4sjgwQqVoEYzWWu2LQZcIUQjlstqZU2jr_tFUjDMya20AD8butbT9dkGdmZFcSD.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22419,22380,22328,22379,22923,22320,22421,22922,22927,22929,22348,22347,22931,22324,50,22926,22924,22423,22932,22329,22336,22341,22343,22319,22414,22422,22420,22330,22332,22346","m":"1007796774_main,1007796774_longtail","nc":1},"LuUwuw\/":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/8At9Gn29AsS.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22317","m":"1007796774_longtail","nc":1},"mfYeDTt":{"type":"css","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yX\/l\/0,cross\/4ShJxXUc17dQiOPv89Rn1HbTfuCSgqTH8uI_BdsaE1bCDamMpRL-pW0KHFwP3wSXUoLe9LbROaenqBeRmAWDoP_Y4ely4JoRn8_zHJWgay9vgVdM-rzcG2i1Z2dFqGPal58VlHOnCODX2DmXJj8Zr6dWgvqbv95oZ3elBCiZdqw3CwNn.css?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":29,22832,22337,22340,22364,22829,22327,22323,22338,22925,22418,22345,22325,22417,22333,22830","nc":1},"gcoFAhW":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3i6Vk4\/yY\/l\/en_US\/cs_ZT0eb-iAWeOk-wvL7942bbc1q-688Il-aVxn6yl5EM08arqdo_nNzzcK8de5Syz14xtbHg3WbCqIPs-70z9Tl_EdFuO26ZRQ22ZikDsg7fy.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22326,22930,22318,22378,22342,22928,22321,22383,22331,22322","m":"1007796774_longtail","nc":1},"ATbeq0B":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iTfb4\/yx\/l\/en_US\/bSqxIEuBnPF.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22921","m":"1007796774_longtail","nc":1},"sSCI77M":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yn\/r\/Tle9kBkyWWD.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22344","m":"1007796774_longtail","nc":1},"fIsfPpA":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iJfX4\/yf\/l\/en_US\/q-OC9GvDXLB.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22339","m":"1007796774_longtail","nc":1},"Pfkc54B":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yz\/r\/YBirLTG403L.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22726","m":"1007796774_longtail","nc":1},"sD3z2ST":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/ys\/r\/OgQZKqBcuUW.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22727","m":"1007796774_longtail","nc":1},"+ClWygH":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y5\/r\/r611P2Lt7hb.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22725","m":"1007796774_longtail","nc":1},"n2UPpV0":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yY\/r\/xKJiMS7RGt4.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22721","m":"1007796774_longtail","nc":1},"93jOtlY":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y0\/r\/UmpVPcPmZfo.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22724","m":"1007796774_longtail","nc":1},"2QqVX1U":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yQ\/r\/70ZVM_7bcjA.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22708","m":"1007796774_longtail","nc":1},"mhiCfI5":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y2\/r\/Cu2KVQ06AcD.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22722","m":"1007796774_longtail","nc":1}},"compMap":{"CometProfileVideoSection.react":{"r":["hOjEt0H","L5R7p5D","CcM+LCX","92FWu0u","L6Tx9we"]},"Dialog":{"r":["lNw+3Cn","L5R7p5D","VJhwr7f","ymVdTSF","rDyHGpp","cXPO3JJ","PHpesmL","w4kZepP","x1i5pBt","EHXzFna","dQOzthE","CcM+LCX","zEfyD1a","hOjEt0H","PWJSBTX","L6Tx9we"],"rds":{"m":["FbtLogging","IntlQtEventFalcoEvent"],"r":["POkG4Hf"]},"be":1},"ExceptionDialog":{"r":["hOjEt0H","aeZ8J7P","0nDDuEM","LuUwuw\/","mfYeDTt","L5R7p5D","gcoFAhW","VJhwr7f","w4kZepP","x1i5pBt","ATbeq0B","sSCI77M","fIsfPpA","CcM+LCX","zEfyD1a","3unTLaW","L6Tx9we"],"rds":{"m":["FbtLogging","IntlQtEventFalcoEvent"],"r":["POkG4Hf"]},"be":1},"QuickSandSolver":{"r":["Pfkc54B","L5R7p5D","VJhwr7f","cXPO3JJ","PHpesmL","x1i5pBt","CcM+LCX","zEfyD1a","hOjEt0H","sD3z2ST","+ClWygH","L6Tx9we"],"rds":{"m":["FbtLogging","IntlQtEventFalcoEvent"],"r":["POkG4Hf"]},"be":1},"ConfirmationDialog":{"r":["L5R7p5D","cXPO3JJ","n2UPpV0","PHpesmL","x1i5pBt","CcM+LCX","zEfyD1a"],"be":1},"MWADeveloperReauthBarrier":{"r":["L5R7p5D","93jOtlY","2QqVX1U","mhiCfI5","CcM+LCX"],"be":1}},"sotUpgrades":["VJhwr7f","POkG4Hf","BG+mBnk","pZuCvpU","x1i5pBt","l5HqvCB"]})});
+requireLazy(["CometResourceScheduler","JSScheduler","Bootloader"],function(c,s,b){c.onHighPriComplete(function(){s.scheduleLoggingPriCallback(function(){b.loadResources(["VJhwr7f","POkG4Hf","BG+mBnk","pZuCvpU","x1i5pBt","l5HqvCB"])})})});
+requireLazy(["JSScheduler","ServerJS","ScheduledApplyEach"],function(JSScheduler,ServerJS,ScheduledApplyEach){qpl_inl("7252766176843880442","tierThreeBeforeScheduler");JSScheduler.runWithPriority(3,function(){qpl_inl("7252766176843880442","tierThreeInsideScheduler");(new ServerJS()).handleWithCustomApplyEach(ScheduledApplyEach,{"define":[["MarauderConfig",[],{"app_version":"1.0.0.0 (1007796774)","gk_enabled":false},31],["RTISubscriptionManagerConfig",[],{"config":{},"autobot":{},"assimilator":{},"unsubscribe_release":true,"bladerunner_www_sandbox":null,"is_intern":false},1081],["MqttWebConfig",[],{"fbid":"0","appID":219994525426954,"endpoint":"wss:\/\/edge-chat.facebook.com\/chat","pollingEndpoint":"https:\/\/edge-chat.facebook.com\/mqtt\/pull","subscribedTopics":[],"capabilities":10,"clientCapabilities":3,"chatVisibility":false,"hostNameOverride":""},3790],["MqttPublishTimeoutConfig",[],{"mqttPublishTimeoutMs":90000},4266],["RequestStreamE2EClientSamplingConfig",[],{"sampleRate":100000,"methodToSamplingMultiplier":{"RTCSessionMessage":10000,"Presence":0.01,"FBGQLS:VOD_TICKER_SUBSCRIBE":0.01,"FBGQLS:STORIES_TRAY_SUBSCRIBE":100,"Collabri":0.1,"FBGQLS:WORK_AVAILABILITY_STATUS_FANOUT_SUBSCRIBE":0.1,"FBGQLS:GROUP_UNSEEN_ACTIVITY_SUBSCRIBE":0.1,"FBGQLS:GROUP_RESET_UNSEEN_ACTIVITY_SUBSCRIBE":0.1,"FBGQLS:INTERN_CALENDAR_UPDATE_SUBSCRIBE":0.1,"SKY:gizmo_manage":10000,"FBGQLS:HUDDLE_USERS_REQUESTED_TO_SPEAK_COUNT_SUBSCRIBE":1000,"FBGQLS:FEEDBACK_LIKE_SUBSCRIBE":1}},4501],["AsyncRequestConfig",[],{"retryOnNetworkError":"1","useFetchStreamAjaxPipeTransport":false},328],["SessionNameConfig",[],{"seed":"0vrD"},757],["DataStoreConfig",[],{"expandoKey":"__FB_STORE","useExpando":true},2915],["WebDevicePerfInfoData",[],{"needsFullUpdate":true,"needsPartialUpdate":false,"shouldLogResourcePerf":false},3977],["TrackingConfig",[],{"domain":"https:\/\/pixel.facebook.com"},325],["WebStorageMonsterLoggingURI",[],{"uri":null},3032],["UserTimezoneServerTimeData",[],{"timezone":null,"force_update":null,"server_time":null,"server_gmt_offset":null},5502],["CometRouteActorToasterBlocklist",[],{"route_trace_policies":["comet.jobs.composer","comet.jobs.detailView","comet.compat.XCometPageJobOpeningDetailViewController","comet.offer.create","comet.offers.offer_details","comet.crisis.safety_check","comet.crisis.home_page"]},5542],["DGWWebConfig",[],{"appId":"238260118697367","appVersion":"0","dgwVersion":"2","endpoint":"","fbId":"0","authType":""},5508],["cr:496",[],{"__rc":[null,null]},-1],["cr:7346",[],{"__rc":[null,"Aa2ka00E1mxCsSpYL87ezOGGoNT1P0_fEqVhp1Z8OEEsKofS7TrqtAJ6fds4A90lNW4Ud_EAHkE7m5J4_aXcCdpz7P0aIMsYE1hmJUnl3pd_qQJWl68zjDe7Yg"]},-1],["cr:3024",[],{"__rc":[null,"Aa0vJtqgE58N53xfYqXRkXDSp2vkREEJTUkPVapSpLimIPB64PaB3Vh6RjvFWeGVpmF6c9zNcmPoNvA"]},-1],["cr:2046346",[],{"__rc":[null,null]},-1],["cr:708886",["EventProfilerSham"],{"__rc":["EventProfilerSham","Aa1BcYjypchcS4HoRErgm5XuT2MvKoSv6CC6oo9YrT51-ys02VdgfyysCsypBIjSZTnCiRuaO5Suw2sMFikNlYWaXBs"]},-1],["cr:334",["ghlTestUBTFacebook"],{"__rc":["ghlTestUBTFacebook","Aa1k6ErLlKVzxG9lwaK6xjZ9WayidyCEj0l7Gyn4iA7JI87eys2bIHp8f0hHWKILrnlGaPI6yqlRGFiYSiLhXIifxA"]},-1],["cr:1543261",[],{"__rc":[null,"Aa2ZPv8JKHIb4I_TMb4NsTHvufWTxPBqoqpAxrjgaeiPdRt_T-OaereYrmW9RJ0U9RJzxLNTN-3UAkyXD2WmptJS"]},-1],["cr:653",[],{"__rc":[null,"Aa0Q-czt_IDBU22kXcc2BFPgbw6fbtsHh7AvnWgjeaAWHnHZP5TvIe4JNi1WSgR1SotjZ0tsvxKsaF9SsEey9MXRxG-1DdLHGQ"]},-1],["cr:2718",[],{"__rc":[null,"Aa198rbaZ8KCNO5lEdp7flBA2jOVEYmj4SU3yPYfXDOYgK2bnRkgi64x8B_PMkGFXx7HyZIAo9gOZKAK90tj5OAbHvVATP8"]},-1],["cr:5868",[],{"__rc":[null,"Aa0GW4kmKcpQESfhr4bcwKPpHIbwyBzLiP5iOOgCHipKQSiSv1Rarv8CxDaj2BkTSw6Q50gcOuuFOC2USC9W"]},-1],["cr:10026",[],{"__rc":[null,"Aa2U7CDL5eDG9UKEMFI7W-YsL8zxZT6SahUpVqUsPFld1phNhQKCuPCwTNoidXF3O6HrrftRHf3KXnoB1X7gBBGyn1I1KPfQMqLBkQ"]},-1],["cr:1201738",[],{"__rc":[null,"Aa1JErc5r2W3DNe9-q3L3BYBGgFOPws5ODcxtUWFoD0IauQjTDDO0lr_4TI03O6-3ycgf0chh4-u4sXvbqQw1GMZo2c0Lq7gMvVFYS_MHpKd"]},-1],["cr:1332233",[],{"__rc":[null,"Aa3uDhq6Ton_6HdGuFLvOJSzODkWJXfDakHOR2ah-KxHfRxWy-p6_OWHzw0zcvVRj5vl7OyG9HxN2R48LdzQaqNhrMu9TFPEpA"]},-1],["cr:1345969",["AccessibilityWebAssistiveTechTypedLoggerLite"],{"__rc":["AccessibilityWebAssistiveTechTypedLoggerLite","Aa0Oh0fy8IFiSbyEqXikExImX6XBNLEWr1XDsaVdFbpxMmJp2Cg3Cuj6Qixo1dNodmxcXrTBtDY"]},-1],["cr:1516609",["BDCometSignalCollectionTrigger"],{"__rc":["BDCometSignalCollectionTrigger","Aa0G_e4zDFnGbRvXPa8TADvnX84Ef9y1mcyNPJY5dSE0Kx1RqqjIjT9L3cVCYdtjgquC1jIr2X6w4n-HwwaY4pYH-BjuR2Dq78GL34MwF2RSA0aVowstT5VS6A"]},-1],["cr:1094907",[],{"__rc":[null,"Aa1QszoyYEYtIx_N7EZPzZtpFbLpatdlOmBJ36ErOieE7ixQRS6NBFxzHG3PfOQxDYY8k-uwn9lgASYsjGb-IUo"]},-1],["cr:5800",[],{"__rc":[null,"Aa3JJrlfzyXG8hjOgo2Zzcwon2uAsjbsXQNYJQcVMjR2OriSpBy3ErwMrm-GMYf5_Gkq1d8ygiBsVazkyFvLF_8G23XhCgs"]},-1],["GhlTennisKnobsConfig",[],{"ghlbox_log_validity_in_mins":7200,"ghlbox_initialize_in_mins":14400,"change_class_interval_in_mins":1440},6687],["BDSignalCollectionData",[],{"sc":"{\"t\":1659080345,\"c\":[[30000,838801],[30001,838801],[30002,838801],[30003,838801],[30004,838801],[30005,838801],[30006,573585],[30007,838801],[30008,838801],[30012,838801],[30013,838801],[30015,806033],[30018,806033],[30021,540823],[30022,540817],[30040,806033],[30093,806033],[30094,806033],[30095,806033],[30101,541591],[30102,541591],[30103,541591],[30104,541591],[30106,806039],[30107,806039],[38000,541427],[38001,806643]]}","fds":60,"fda":60,"i":60,"sbs":1,"dbs":100,"bbs":100,"hbi":60,"rt":262144,"hbcbc":2,"hbvbc":0,"hbbi":30,"sid":-1,"hbv":"3481197084471247899"},5239],["cr:1088657",[],{"__rc":[null,"Aa0PNCd58fXaPAVC1tezTzzZ0IXyi_N2NmypwAMJdWiAbkzSH1bv3R7Oymq19PZldssNml_J5QS_aBxHfvF9CUg"]},-1]],"require":[["MAWTTRCSafe\u004047b55ad42d307af8cfefc7705ec85609"],["BarcelonaAppUpsellDialog.react\u004047b55ad42d307af8cfefc7705ec85609"],["addCometProfileSwitchAnnotation\u004047b55ad42d307af8cfefc7705ec85609"],["ContextualConfig\u004047b55ad42d307af8cfefc7705ec85609"],["BladeRunnerClient\u004047b55ad42d307af8cfefc7705ec85609"],["CometToast.react\u004047b55ad42d307af8cfefc7705ec85609"],["BarcelonaRegionGatedAppUpsellDialog.react\u004047b55ad42d307af8cfefc7705ec85609"],["WebDevicePerfInfoLogging\u004047b55ad42d307af8cfefc7705ec85609"],["CometPixelRatioUpdater\u004047b55ad42d307af8cfefc7705ec85609"],["CometUncaughtError.react\u004047b55ad42d307af8cfefc7705ec85609"],["CometGHLTestUBT\u004047b55ad42d307af8cfefc7705ec85609"],["CometRootDeferred\u004047b55ad42d307af8cfefc7705ec85609"],["CometBrowserDimensionsLogger\u004047b55ad42d307af8cfefc7705ec85609"],["CometToasterView_DO_NOT_USE.react\u004047b55ad42d307af8cfefc7705ec85609"],["CometRelayEF\u004047b55ad42d307af8cfefc7705ec85609"],["FbtLogging\u004047b55ad42d307af8cfefc7705ec85609"],["CometRouteActorToaster.react\u004047b55ad42d307af8cfefc7705ec85609"],["LynxAsyncCallbackFalcoEvent\u004047b55ad42d307af8cfefc7705ec85609"],["CometOnBeforeUnloadDialog.react\u004047b55ad42d307af8cfefc7705ec85609"],["ClientConsistencyFalcoEvent\u004047b55ad42d307af8cfefc7705ec85609"],["DGWRequestStreamClient\u004047b55ad42d307af8cfefc7705ec85609"],["CometSuspenseFalcoEvent\u004047b55ad42d307af8cfefc7705ec85609"],["ODS\u004047b55ad42d307af8cfefc7705ec85609"],["IntlQtEventFalcoEvent\u004047b55ad42d307af8cfefc7705ec85609"],["FalcoLoggerTransports\u004047b55ad42d307af8cfefc7705ec85609"],["BarcelonaOverflowMenu.react\u004047b55ad42d307af8cfefc7705ec85609"],["BarcelonaLightboxDialog.react\u004047b55ad42d307af8cfefc7705ec85609"],["VideoPlayerWithLiveVideoInterruptedOverlay.react\u004047b55ad42d307af8cfefc7705ec85609"],["emptyFunction\u0040d18d6c2cc7e21adcd0c429e5805feea9","thatReturns",["RequireDeferredReference"],[[{"__dr":"MAWTTRCSafe"},{"__dr":"BarcelonaAppUpsellDialog.react"},{"__dr":"addCometProfileSwitchAnnotation"},{"__dr":"ContextualConfig"},{"__dr":"BladeRunnerClient"},{"__dr":"CometToast.react"},{"__dr":"BarcelonaRegionGatedAppUpsellDialog.react"},{"__dr":"WebDevicePerfInfoLogging"},{"__dr":"CometPixelRatioUpdater"},{"__dr":"CometUncaughtError.react"},{"__dr":"CometGHLTestUBT"},{"__dr":"CometRootDeferred"},{"__dr":"CometBrowserDimensionsLogger"},{"__dr":"CometToasterView_DO_NOT_USE.react"},{"__dr":"CometRelayEF"},{"__dr":"FbtLogging"},{"__dr":"CometRouteActorToaster.react"},{"__dr":"LynxAsyncCallbackFalcoEvent"},{"__dr":"CometOnBeforeUnloadDialog.react"},{"__dr":"ClientConsistencyFalcoEvent"},{"__dr":"DGWRequestStreamClient"},{"__dr":"CometSuspenseFalcoEvent"},{"__dr":"ODS"},{"__dr":"IntlQtEventFalcoEvent"},{"__dr":"BarcelonaCookieConsentLearnMoreDialog.react"},{"__dr":"FalcoLoggerTransports"},{"__dr":"BarcelonaOverflowMenu.react"},{"__dr":"BarcelonaLightboxDialog.react"},{"__dr":"VideoPlayerWithLiveVideoInterruptedOverlay.react"}]]],["CometPlatformRootClient\u00402b83959e18c2c99ee9b20805c95eb80f","initDeferred",["BarcelonaCometRootConfig"],[{"__m":"BarcelonaCometRootConfig"},{"sketchInfo":null,"userID":0,"deferredCookies":{},"blLoggingCavalryFields":{"bl_sample_rate":0,"hr_sample_rate":0,"parent_lid":"7252766176843880442"}}]],["BarcelonaToast.react\u0040da4c37123ad95802ebef96fb6a05bb50"],["MqttLongPollingRunner\u0040da4c37123ad95802ebef96fb6a05bb50"],["AcfToastImpressionFalcoEvent\u0040da4c37123ad95802ebef96fb6a05bb50"],["TransportSelectingClientSingletonConditional\u00405beab10f52c611a83513ff9172f6cb86"],["BaseToast.react\u0040da4c37123ad95802ebef96fb6a05bb50"],["json-bigint\u0040da4c37123ad95802ebef96fb6a05bb50"],["Bootloader\u0040417af301b507f7d8db0f7c38cffa1ca6","markComponentsAsImmediate",[],[["CometProfileVideoSection.react","VideoPlayerHTML5ApiCea608State","VideoPlayerHTML5ApiWebVttState"]]],["RequireDeferredReference\u0040c64d79ba793f808b0e3250b4c2a57080","unblock",[],[["MAWTTRCSafe","BarcelonaAppUpsellDialog.react","addCometProfileSwitchAnnotation","ContextualConfig","BladeRunnerClient","CometToast.react","BarcelonaRegionGatedAppUpsellDialog.react","WebDevicePerfInfoLogging","CometPixelRatioUpdater","CometUncaughtError.react","CometGHLTestUBT","CometRootDeferred","CometBrowserDimensionsLogger","CometToasterView_DO_NOT_USE.react","CometRelayEF","FbtLogging","CometRouteActorToaster.react","LynxAsyncCallbackFalcoEvent","CometOnBeforeUnloadDialog.react","ClientConsistencyFalcoEvent","DGWRequestStreamClient","CometSuspenseFalcoEvent","ODS","IntlQtEventFalcoEvent","BarcelonaCookieConsentLearnMoreDialog.react","FalcoLoggerTransports","BarcelonaOverflowMenu.react","BarcelonaLightboxDialog.react","VideoPlayerWithLiveVideoInterruptedOverlay.react","BarcelonaToast.react","MqttLongPollingRunner","CometExceptionDialog.react","AcfToastImpressionFalcoEvent","CometTooltipDeferredImpl.react","TransportSelectingClientSingletonConditional","VideoPlayerSpinner.react","VideoPlayerCaptionsArea.react","BaseToast.react","json-bigint"],"sd"]],["RequireDeferredReference\u0040c64d79ba793f808b0e3250b4c2a57080","unblock",[],[["MAWTTRCSafe","BarcelonaAppUpsellDialog.react","addCometProfileSwitchAnnotation","ContextualConfig","BladeRunnerClient","CometToast.react","BarcelonaRegionGatedAppUpsellDialog.react","WebDevicePerfInfoLogging","CometPixelRatioUpdater","CometUncaughtError.react","CometGHLTestUBT","CometRootDeferred","CometBrowserDimensionsLogger","CometToasterView_DO_NOT_USE.react","CometRelayEF","FbtLogging","CometRouteActorToaster.react","LynxAsyncCallbackFalcoEvent","CometOnBeforeUnloadDialog.react","ClientConsistencyFalcoEvent","DGWRequestStreamClient","CometSuspenseFalcoEvent","ODS","IntlQtEventFalcoEvent","FalcoLoggerTransports","BarcelonaOverflowMenu.react","BarcelonaLightboxDialog.react","VideoPlayerWithLiveVideoInterruptedOverlay.react","BarcelonaToast.react","MqttLongPollingRunner","CometExceptionDialog.react","AcfToastImpressionFalcoEvent","CometTooltipDeferredImpl.react","TransportSelectingClientSingletonConditional","VideoPlayerSpinner.react","VideoPlayerCaptionsArea.react","BaseToast.react","json-bigint"],"css"]]]});});});</script>
+<script>qpl_inl("7252766176843880442","tierThreeEnd");</script>
+<script type="application/json" data-content-len="85" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766176843880442","tierThreeEnd"]]]}</script>
+
+<script>window.pldmp = {"7252766176843880442":{"js\/649hye0x8vsw0c4o.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y0\/r\/E6KZsOw-TyZ.js?_nc_x=Ij3Wp8lg5Kz","refs":["htmlStart","tierOne","tierTwo","tierThree"]},"css\/b6sm5nrcj2o8s0go.pkg.css":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yD\/l\/0,cross\/8J4Vh7Dx9_0.css?_nc_x=Ij3Wp8lg5Kz","refs":["htmlStart","tierOne","tierTwo","tierThree"]},"js\/687i1t4o6skkw00w.pkg,js\/dfcvyysajwg0cg4o.pkg,js\/9tn41hehy60w8og0.pkg,js\/27u0lx8ryetcsko4.pkg,js\/ozi0dn0eaw0gwoc8.pkg.__composite__.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3i1Vd4\/y0\/l\/en_US\/9NbTpxFQDN_sHUpS5HkpnGVK1i3Cuen-71Vx1-9lxcVHHr6NpeIaFU7.js?_nc_x=Ij3Wp8lg5Kz","refs":["htmlStart","tierOne","tierTwo","tierThree"]},"js\/c4m95jb0l2go8cks.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3ij4U4\/yq\/l\/en_US\/kZT9Qdvtv8D.js?_nc_x=Ij3Wp8lg5Kz","refs":["htmlStart","tierOne","tierTwo","tierThree"]},"js\/8205t36wcb0oo08c.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iQLo4\/yt\/l\/en_US\/gQS6jq0A8uW.js?_nc_x=Ij3Wp8lg5Kz","refs":["htmlStart","tierOne","tierTwo","tierThree"]},"js\/1j0a8dobn5y8k0k4.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3idE44\/yr\/l\/en_US\/1DwJ8zL6B7E.js?_nc_x=Ij3Wp8lg5Kz","refs":["htmlStart","tierTwo","tierThree"]},"js\/9mxnuotx7ig4www0.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y5\/r\/5qKf_cCaYht.js?_nc_x=Ij3Wp8lg5Kz","refs":["htmlStart","tierTwo"]},"js\/2o5uzr9iekcgss44.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iT0g4\/yh\/l\/en_US\/pjkq_l5ea-y.js?_nc_x=Ij3Wp8lg5Kz","refs":["htmlStart","tierTwo","tierThree"]},"js\/30xmv98hreqswcso.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iJXW4\/yk\/l\/en_US\/sG_RutKVqwE.js?_nc_x=Ij3Wp8lg5Kz","refs":["htmlStart","tierTwo"]},"js\/barcelona\/core\/BarcelonaPage.css":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yh\/l\/0,cross\/9kyY29nvH0n.css?_nc_x=Ij3Wp8lg5Kz","refs":["tierOne"]},"js\/f4hymy2ch3k804o4.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iPjk4\/yj\/l\/en_US\/tS4NAEkk1ly.js?_nc_x=Ij3Wp8lg5Kz","refs":["tierThree"]},"js\/2ees9u6w5yckgkso.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3ikM54\/yf\/l\/en_US\/dKyu23I5fqr.js?_nc_x=Ij3Wp8lg5Kz","refs":["tierThree"]},"js\/5hwz9os7gvwgs00s.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yW\/r\/s70ZcYOHW2g.js?_nc_x=Ij3Wp8lg5Kz","refs":["tierThree"]},"js\/69ea5dcpp4w0wgkw.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yF\/r\/FLJXkx8ys-6.js?_nc_x=Ij3Wp8lg5Kz","refs":["tierThree"]},"js\/2rzkeo3vdbggwscw.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3i7M54\/yj\/l\/en_US\/me7LiwnFv1d.js?_nc_x=Ij3Wp8lg5Kz","refs":["tierThree"]},"js\/djeihiulvfkgcccw.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yY\/r\/YT7n1sgH1lv.js?_nc_x=Ij3Wp8lg5Kz","refs":["tierThree"]}}};</script>
+<script type="application/json" data-content-len="69" data-sjs>{"require":[["qplTagServerJS",null,null,[["lastServerTagFlushed"]]]]}</script>
+<script>qpl_inl("7252766176843880442-server","earlyFlush",109);</script>
+<script type="application/json" data-content-len="94" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766176843880442-server","earlyFlush",109]]]}</script>
+<script>qpl_inl("7252766176843880442-server","cometPageRender",110);</script>
+<script type="application/json" data-content-len="99" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766176843880442-server","cometPageRender",110]]]}</script>
+<script>qpl_inl("7252766176843880442-server","genTierOneHasteResponseStart",122);</script>
+<script type="application/json" data-content-len="112" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766176843880442-server","genTierOneHasteResponseStart",122]]]}</script>
+<script>qpl_inl("7252766176843880442-server","genTierOneHasteResponseEnd",154);</script>
+<script type="application/json" data-content-len="110" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766176843880442-server","genTierOneHasteResponseEnd",154]]]}</script>
+<script>qpl_inl("7252766176843880442-server","genTierTwoHasteResponseStart",162);</script>
+<script type="application/json" data-content-len="112" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766176843880442-server","genTierTwoHasteResponseStart",162]]]}</script>
+<script>qpl_inl("7252766176843880442-server","genTierTwoHasteResponseEnd",179);</script>
+<script type="application/json" data-content-len="110" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766176843880442-server","genTierTwoHasteResponseEnd",179]]]}</script>
+<script>qpl_inl("7252766176843880442-server","genTierThreeHasteResponseStart",187);</script>
+<script type="application/json" data-content-len="114" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766176843880442-server","genTierThreeHasteResponseStart",187]]]}</script>
+<script>qpl_inl("7252766176843880442-server","genTierThreeHasteResponseEnd",192);</script>
+<script type="application/json" data-content-len="112" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766176843880442-server","genTierThreeHasteResponseEnd",192]]]}</script>
+<script>qpl_inl("7252766176843880442-server","responseStart",1);</script>
+<script type="application/json" data-content-len="95" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766176843880442-server","responseStart",1]]]}</script>
+<script>qpl_inl("7252766176843880442-server","responseEnd",193);</script>
+<script type="application/json" data-content-len="95" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766176843880442-server","responseEnd",193]]]}</script>
+<script>window.plbs = {"htmlStart":[80209,11527],"tierOne":[90865,50068],"tierTwo":[102291,30020],"ssr_error":[183,90],"tierThree":[22323,7008]};</script>
+</body></html>
+
diff --git a/spec/fixtures/onebox/threadsstatus_profile.response b/spec/fixtures/onebox/threadsstatus_profile.response
new file mode 100644
index 00000000000..c7992ecfed0
--- /dev/null
+++ b/spec/fixtures/onebox/threadsstatus_profile.response
@@ -0,0 +1,85 @@
+<!DOCTYPE html><html class="_9dls" lang="en" dir="ltr"><head><link data-default-icon="https://static.xx.fbcdn.net/rsrc.php/v3/y2/r/ZI3qMUkj5Tz.png" rel="icon" sizes="192x192" href="https://static.xx.fbcdn.net/rsrc.php/v3/y2/r/ZI3qMUkj5Tz.png" /><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=2,shrink-to-fit=no" /><meta property="og:site_name" content="Threads" /><meta property="og:type" content="profile" /><link rel="canonical" href="https://www.threads.net/&#064;joyqiuu" /><meta name="description" content="2K Followers. ah shit is it time already &#x1f469;&#x1f3fb;&#x200d;&#x1f4bb;" /><meta property="og:title" content="Joy Qiu (&#064;joyqiuu) on Threads" /><meta property="og:description" content="2K Followers. ah shit is it time already &#x1f469;&#x1f3fb;&#x200d;&#x1f4bb;" /><meta property="og:url" content="https://www.threads.net/&#064;joyqiuu" /><meta property="og:image" content="https://scontent.cdninstagram.com/v/t51.2885-19/358167674_306426985144380_6235341132840289293_n.jpg?stp=dst-jpg_s640x640&amp;_nc_ht=scontent.cdninstagram.com&amp;_nc_cat=1&amp;_nc_ohc=KqFQdmSjeMsAX-OWNHA&amp;edm=APs17CUBAAAA&amp;ccb=7-5&amp;oh=00_AfDrfi6q0GGPALemTc0YzaE-Bnxm0GJ3QTrswCox095yRA&amp;oe=64AC85F1&amp;_nc_sid=10d13b" /><meta name="referrer" content="default" id="meta_referrer" /><meta name="twitter:card" content="summary" /><meta name="twitter:title" content="Joy Qiu (&#064;joyqiuu) on Threads" /><meta name="twitter:description" content="2K Followers. ah shit is it time already &#x1f469;&#x1f3fb;&#x200d;&#x1f4bb;" /><meta name="twitter:image" content="https://scontent.cdninstagram.com/v/t51.2885-19/358167674_306426985144380_6235341132840289293_n.jpg?stp=dst-jpg_s640x640&amp;_nc_ht=scontent.cdninstagram.com&amp;_nc_cat=1&amp;_nc_ohc=KqFQdmSjeMsAX-OWNHA&amp;edm=APs17CUBAAAA&amp;ccb=7-5&amp;oh=00_AfDrfi6q0GGPALemTc0YzaE-Bnxm0GJ3QTrswCox095yRA&amp;oe=64AC85F1&amp;_nc_sid=10d13b" /><style nonce="6H5OVuNT">:root{--fds-black:#000000;--fds-black-alpha-05:rgba(0, 0, 0, 0.05);--fds-black-alpha-10:rgba(0, 0, 0, 0.1);--fds-black-alpha-15:rgba(0, 0, 0, 0.15);--fds-black-alpha-20:rgba(0, 0, 0, 0.2);--fds-black-alpha-30:rgba(0, 0, 0, 0.3);--fds-black-alpha-40:rgba(0, 0, 0, 0.4);--fds-black-alpha-50:rgba(0, 0, 0, 0.5);--fds-black-alpha-60:rgba(0, 0, 0, 0.6);--fds-black-alpha-80:rgba(0, 0, 0, 0.8);--fds-blue-05:#ECF3FF;--fds-blue-30:#AAC9FF;--fds-blue-40:#77A7FF;--fds-blue-60:#1877F2;--fds-blue-70:#2851A3;--fds-blue-80:#1D3C78;--fds-button-text:#444950;--fds-comment-background:#F2F3F5;--fds-dark-mode-gray-35:#CCCCCC;--fds-dark-mode-gray-50:#828282;--fds-dark-mode-gray-70:#4A4A4A;--fds-dark-mode-gray-80:#373737;--fds-dark-mode-gray-90:#282828;--fds-dark-mode-gray-100:#1C1C1C;--fds-gray-00:#F5F6F7;--fds-gray-05:#F2F3F5;--fds-gray-10:#EBEDF0;--fds-gray-20:#DADDE1;--fds-gray-25:#CCD0D5;--fds-gray-30:#BEC3C9;--fds-gray-45:#8D949E;--fds-gray-70:#606770;--fds-gray-80:#444950;--fds-gray-90:#303338;--fds-gray-100:#1C1E21;--fds-green-55:#00A400;--fds-highlight:#3578E5;--fds-highlight-cell-background:#ECF3FF;--fds-primary-icon:#1C1E21;--fds-primary-text:#1C1E21;--fds-red-55:#FA383E;--fds-soft:cubic-bezier(.08,.52,.52,1);--fds-spectrum-aluminum-tint-70:#E4F0F6;--fds-spectrum-blue-gray-tint-70:#CFD1D5;--fds-spectrum-cherry:#F35369;--fds-spectrum-cherry-tint-70:#FBCCD2;--fds-spectrum-grape-tint-70:#DDD5F0;--fds-spectrum-grape-tint-90:#F4F1FA;--fds-spectrum-lemon-dark-1:#F5C33B;--fds-spectrum-lemon-tint-70:#FEF2D1;--fds-spectrum-lime:#A3CE71;--fds-spectrum-lime-tint-70:#E4F0D5;--fds-spectrum-orange-tint-70:#FCDEC5;--fds-spectrum-orange-tint-90:#FEF4EC;--fds-spectrum-seafoam-tint-70:#CAEEF9;--fds-spectrum-slate-dark-2:#89A1AC;--fds-spectrum-slate-tint-70:#EAEFF2;--fds-spectrum-teal:#6BCEBB;--fds-spectrum-teal-dark-1:#4DBBA6;--fds-spectrum-teal-dark-2:#31A38D;--fds-spectrum-teal-tint-70:#D2F0EA;--fds-spectrum-teal-tint-90:#F0FAF8;--fds-spectrum-tomato:#FB724B;--fds-spectrum-tomato-tint-30:#F38E7B;--fds-spectrum-tomato-tint-90:#FDEFED;--fds-strong:cubic-bezier(.12,.8,.32,1);--fds-white:#FFFFFF;--fds-white-alpha-05:rgba(255, 255, 255, 0.05);--fds-white-alpha-10:rgba(255, 255, 255, 0.1);--fds-white-alpha-20:rgba(255, 255, 255, 0.2);--fds-white-alpha-30:rgba(255, 255, 255, 0.3);--fds-white-alpha-40:rgba(255, 255, 255, 0.4);--fds-white-alpha-50:rgba(255, 255, 255, 0.5);--fds-white-alpha-60:rgba(255, 255, 255, 0.6);--fds-white-alpha-80:rgba(255, 255, 255, 0.8);--fds-yellow-20:#FFBA00;--accent:hsl(214, 89%, 52%);--always-white:#ffffff;--always-black:#000000;--always-dark-gradient:linear-gradient(rgba(0,0,0,0), rgba(0,0,0,0.6));--always-dark-overlay:rgba(0, 0, 0, 0.4);--always-light-overlay:rgba(255, 255, 255, 0.4);--always-gray-40:#65676B;--always-gray-75:#BCC0C4;--always-gray-95:#F0F2F5;--attachment-footer-background:#F0F2F5;--background-deemphasized:#F0F2F5;--base-blue:#1877F2;--base-cherry:#F3425F;--base-grape:#9360F7;--base-lemon:#F7B928;--base-lime:#45BD62;--base-pink:#FF66BF;--base-seafoam:#54C7EC;--base-teal:#2ABBA7;--base-tomato:#FB724B;--text-badge-info-background:hsl(214, 89%, 52%);--text-badge-success-background:#31A24C;--text-badge-attention-background:hsl(40, 89%, 52%);--text-badge-critical-background:#e41e3f;--blue-link:#216FDB;--border-focused:#65676B;--card-background:#FFFFFF;--card-background-flat:#F7F8FA;--comment-background:#F0F2F5;--comment-footer-background:#F6F9FA;--dataviz-primary-1:rgb(48,200,180);--disabled-button-background:#E4E6EB;--disabled-button-text:#BCC0C4;--disabled-icon:#BCC0C4;--disabled-text:#BCC0C4;--divider:#CED0D4;--event-date:#F3425F;--fb-wordmark:#1877F2;--filter-accent:invert(39%) sepia(57%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(147.75%) hue-rotate(202deg) brightness(97%) contrast(96%);--filter-always-white:invert(100%);--filter-disabled-icon:invert(80%) sepia(6%) saturate(200%) saturate(120%) hue-rotate(173deg) brightness(98%) contrast(89%);--filter-placeholder-icon:invert(59%) sepia(11%) saturate(200%) saturate(135%) hue-rotate(176deg) brightness(96%) contrast(94%);--filter-primary-icon:invert(8%) sepia(10%) saturate(200%) saturate(200%) saturate(166%) hue-rotate(177deg) brightness(104%) contrast(91%);--filter-secondary-icon:invert(39%) sepia(21%) saturate(200%) saturate(109.5%) hue-rotate(174deg) brightness(94%) contrast(86%);--filter-warning-icon:invert(77%) sepia(29%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(128%) hue-rotate(359deg) brightness(102%) contrast(107%);--filter-blue-link-icon:invert(30%) sepia(98%) saturate(200%) saturate(200%) saturate(200%) saturate(166.5%) hue-rotate(192deg) brightness(91%) contrast(101%);--filter-positive:invert(37%) sepia(61%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(115%) hue-rotate(91deg) brightness(97%) contrast(105%);--filter-negative:invert(25%) sepia(33%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(110%) hue-rotate(345deg) brightness(132%) contrast(96%);--glimmer-spinner-icon:#65676B;--hero-banner-background:#FFFFFF;--hosted-view-selected-state:rgba(45, 136, 255, 0.1);--highlight-bg:#E7F3FF;--hover-overlay:rgba(0, 0, 0, 0.05);--list-cell-chevron:#65676B;--media-hover:rgba(68, 73, 80, 0.15);--media-inner-border:rgba(0, 0, 0, 0.1);--media-outer-border:#FFFFFF;--media-pressed:rgba(68, 73, 80, 0.35);--messenger-card-background:#FFFFFF;--messenger-reply-background:#F0F2F5;--overlay-alpha-80:rgba(244, 244, 244, 0.8);--overlay-on-media:rgba(0, 0, 0, 0.6);--nav-bar-background:#FFFFFF;--nav-bar-background-gradient:linear-gradient(to top, #FFFFFF, rgba(255,255,255.9), rgba(255,255,255,.7), rgba(255,255,255,.4), rgba(255,255,255,0));--nav-bar-background-gradient-wash:linear-gradient(to top, #F0F2F5, rgba(240,242,245.9), rgba(240,242,245,.7), rgba(240,242,245,.4), rgba(240,242,245,0));--negative:hsl(350, 87%, 55%);--negative-background:hsl(350, 87%, 55%, 20%);--new-notification-background:#E7F3FF;--non-media-pressed:rgba(68, 73, 80, 0.15);--non-media-pressed-on-dark:rgba(255, 255, 255, 0.3);--notification-badge:#e41e3f;--placeholder-icon:#65676B;--placeholder-image:rgb(164, 167, 171);--placeholder-text:#65676B;--placeholder-text-on-media:rgba(255, 255, 255, 0.5);--popover-background:#FFFFFF;--positive:#31A24C;--positive-background:#DEEFE1;--press-overlay:rgba(0, 0, 0, 0.10);--primary-button-background:#1B74E4;--primary-button-icon:#FFFFFF;--primary-button-pressed:#77A7FF;--primary-button-text:#FFFFFF;--primary-deemphasized-button-background:#E7F3FF;--primary-deemphasized-button-pressed:rgba(0, 0, 0, 0.05);--primary-deemphasized-button-pressed-overlay:rgba(25, 110, 255, 0.15);--primary-deemphasized-button-text:#1877F2;--primary-icon:#050505;--primary-text:#050505;--primary-text-on-media:#FFFFFF;--primary-web-focus-indicator:#D24294;--progress-ring-neutral-background:rgba(0, 0, 0, 0.2);--progress-ring-neutral-foreground:#000000;--progress-ring-on-media-background:rgba(255, 255, 255, 0.2);--progress-ring-on-media-foreground:#FFFFFF;--progress-ring-blue-background:rgba(24, 119, 242, 0.2);--progress-ring-blue-foreground:hsl(214, 89%, 52%);--progress-ring-disabled-background:rgba(190,195,201, 0.2);--progress-ring-disabled-foreground:#BEC3C9;--rating-star-active:#EB660D;--scroll-thumb:#BCC0C4;--scroll-shadow:0 1px 2px rgba(0, 0, 0, 0.1), 0 -1px rgba(0, 0, 0, 0.1) inset;--secondary-button-background:#E4E6EB;--secondary-button-background-floating:#ffffff;--secondary-button-background-on-dark:rgba(0, 0, 0, 0.4);--secondary-button-pressed:rgba(0, 0, 0, 0.05);--secondary-button-stroke:transparent;--secondary-button-text:#050505;--secondary-icon:#65676B;--secondary-text:#65676B;--secondary-text-on-media:rgba(255, 255, 255, 0.9);--section-header-text:#4B4C4F;--shadow-1:rgba(0, 0, 0, 0.1);--shadow-2:rgba(0, 0, 0, 0.2);--shadow-5:rgba(0, 0, 0, 0.5);--shadow-8:rgba(0, 0, 0, 0.8);--shadow-inset:rgba(255, 255, 255, 0.5);--shadow-elevated:0 8px 20px 0 rgba(0, 0, 0, 0.2), 0 2px 4px 0 rgba(0, 0, 0, 0.1);--shadow-persistent:0px 0px 12px rgba(52, 72, 84, 0.05);--shadow-primary:0px 5px 12px rgba(52, 72, 84, 0.2);--surface-background:#FFFFFF;--switch-active:hsl(214, 89%, 52%);--text-highlight:rgba(24, 119, 242, 0.2);--input-background:#FFFFFF;--input-background-disabled:#F0F2F5;--input-border-color:#CED0D4;--input-border-color-hover:var(--placeholder-text);--input-label-color-highlighted:hsl(214, 89%, 52%);--text-input-outside-label:#000000;--toast-background:rgba(255, 255, 255, 0.85);--toast-text:#1C2B33;--toast-text-link:#216FDB;--toggle-active-background:#E7F3FF;--toggle-active-icon:rgb(24, 119, 242);--toggle-active-text:rgb(24, 119, 242);--toggle-button-active-background:#E7F3FF;--tooltip-background:rgba(244, 244, 244, 0.8);--tooltip-box-shadow:0 2px 4px 0 var(--shadow-5);--wash:#E4E6EB;--web-wash:#F0F2F5;--warning:hsl(40, 89%, 52%);--fb-logo-color:#2D88FF;--dialog-anchor-vertical-padding:56px;--header-height:0px;--global-panel-width:0px;--global-panel-width-expanded:0px;--alert-banner-corner-radius:8px;--button-corner-radius:6px;--button-corner-radius-medium:10px;--button-corner-radius-large:12px;--button-height-large:40px;--button-height-medium:36px;--button-padding-horizontal-large:16px;--button-padding-horizontal-medium:16px;--button-icon-padding-large:16px;--button-icon-padding-medium:16px;--button-inner-icon-spacing-large:3px;--button-inner-icon-spacing-medium:3px;--blueprint-button-height-medium:40px;--blueprint-button-height-large:48px;--card-corner-radius:8px;--card-box-shadow:0 12px 28px 0 var(--shadow-2), 0 2px 4px 0 var(--shadow-1);--card-padding-horizontal:10px;--card-padding-vertical:20px;--chip-corner-radius:6px;--dialog-corner-radius:8px;--glimmer-corner-radius:8px;--image-corner-radius:4px;--input-corner-radius:6px;--input-border-width:1px;--nav-list-cell-corner-radius:8px;--list-cell-corner-radius:8px;--list-cell-min-height:52px;--list-cell-padding-vertical:20px;--list-cell-padding-vertical-with-addon:14px;--menu-item-base-margin-horizontal:8px;--menu-item-base-padding-horizontal:8px;--nav-list-cell-min-height:0px;--nav-list-cell-padding-vertical:16px;--nav-list-cell-padding-vertical-with-addon:16px;--page-footer-padding-vertical:16px;--section-header-addOnEnd-margin-horizontal:8px;--section-header-addOnStart-margin-horizontal:12px;--section-header-addOnEnd-button-padding-horizontal:0px;--section-header-addOnEnd-button-padding-vertical:0px;--section-header-padding-vertical:16px;--section-header-subtitle-margin-vertical:14px;--section-header-subtitle-with-addOnEnd-margin-vertical:6px;--text-badge-corner-radius:4px;--text-badge-padding-horizontal:6px;--text-badge-padding-vertical:6px;--text-input-multi-padding-between-text-scrollbar:20px;--text-input-multi-padding-scrollbar:16px;--text-input-caption-margin-top:10px;--text-input-label-top:22px;--text-input-min-height:64px;--text-input-padding-vertical:12px;--toast-addon-padding-horizontal:6px;--toast-addon-padding-vertical:6px;--toast-container-max-width:100%;--toast-container-min-width:0px;--toast-container-padding-horizontal:14px;--toast-container-padding-vertical:10px;--toast-corner-radius:8px;--typeahead-list-outer-padding-vertical:2px;--fds-animation-enter-exit-in:cubic-bezier(0.14, 1, 0.34, 1);--fds-animation-enter-exit-out:cubic-bezier(0.45, 0.1, 0.2, 1);--fds-animation-swap-shuffle-in:cubic-bezier(0.14, 1, 0.34, 1);--fds-animation-swap-shuffle-out:cubic-bezier(0.45, 0.1, 0.2, 1);--fds-animation-move-in:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-move-out:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-expand-collapse-in:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-expand-collapse-out:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-passive-move-in:cubic-bezier(0.5, 0, 0.1, 1);--fds-animation-passive-move-out:cubic-bezier(0.5, 0, 0.1, 1);--fds-animation-quick-move-in:cubic-bezier(0.1, 0.9, 0.2, 1);--fds-animation-quick-move-out:cubic-bezier(0.1, 0.9, 0.2, 1);--fds-animation-fade-in:cubic-bezier(0, 0, 1, 1);--fds-animation-fade-out:cubic-bezier(0, 0, 1, 1);--fds-duration-extra-extra-short-in:100ms;--fds-duration-extra-extra-short-out:100ms;--fds-duration-extra-short-in:200ms;--fds-duration-extra-short-out:150ms;--fds-duration-short-in:280ms;--fds-duration-short-out:200ms;--fds-duration-medium-in:400ms;--fds-duration-medium-out:350ms;--fds-duration-long-in:500ms;--fds-duration-long-out:350ms;--fds-duration-extra-long-in:1000ms;--fds-duration-extra-long-out:1000ms;--fds-duration-none:0ms;--fds-fast:200ms;--fds-slow:400ms;--font-family-apple:system-ui, -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', sans-serif;--font-family-code:ui-monospace, Menlo, Consolas, Monaco, monospace;--font-family-default:Helvetica, Arial, sans-serif;--font-family-segoe:Segoe UI Historic, Segoe UI, Helvetica, Arial, sans-serif;--body-font-family:Placeholder Font;--body-font-size:0.9375rem;--body-font-weight:400;--body-line-height:1.3333;--body-emphasized-font-family:Placeholder Font;--body-emphasized-font-size:0.9375rem;--body-emphasized-font-weight:600;--body-emphasized-line-height:1.3333;--headline1-font-family:Optimistic Display Bold, system-ui, sans-serif;--headline1-font-size:1.75rem;--headline1-font-weight:700;--headline1-line-height:1.2143;--headline2-font-family:Optimistic Display Bold, system-ui, sans-serif;--headline2-font-size:1.5rem;--headline2-font-weight:700;--headline2-line-height:1.25;--headline3-font-family:Optimistic Display Bold, system-ui, sans-serif;--headline3-font-size:1.0625rem;--headline3-font-weight:700;--headline3-line-height:1.2941;--meta-font-family:Placeholder Font;--meta-font-size:0.8125rem;--meta-font-weight:400;--meta-line-height:1.3846;--meta-emphasized-font-family:Placeholder Font;--meta-emphasized-font-size:0.8125rem;--meta-emphasized-font-weight:600;--meta-emphasized-line-height:1.3846;--primary-label-font-family:Optimistic Display Medium, system-ui, sans-serif;--primary-label-font-size:1.0625rem;--primary-label-font-weight:500;--primary-label-line-height:1.2941;--secondary-label-font-family:Placeholder Font;--secondary-label-font-size:0.9375rem;--secondary-label-font-weight:500;--secondary-label-line-height:1.3333;--tertiary-label-font-family:Placeholder Font;--tertiary-label-font-size:0.6875rem;--tertiary-label-font-weight:500;--tertiary-label-line-height:1.4545;--text-input-field-font-family:Placeholder Font;--text-input-field-font-size:1rem;--text-input-field-font-weight:500;--text-input-field-line-height:1.2941;--text-input-label-font-family:Placeholder Font;--text-input-label-font-size:17px;--text-input-label-font-size-scale-multiplier:0.75;--text-input-label-font-weight:400;--text-input-label-line-height:1.2941;--tooltip-border-radius:8px;--dialog-size-medium-max-width:700px;--dialog-size-medium-width:100%;--dialog-size-small-max-width:548px;--dialog-size-small-width:100%;--dataviz-primary-2:rgb(134,218,255);--dataviz-primary-3:rgb(95,170,255);--dataviz-secondary-1:rgb(118,62,230);--dataviz-secondary-2:rgb(147,96,247);--dataviz-secondary-3:rgb(219,26,139);--dataviz-supplementary-1:rgb(255,122,105);--dataviz-supplementary-2:rgb(241,168,23);--dataviz-supplementary-3:rgb(49,162,76);--dataviz-supplementary-4:rgb(50,52,54);--base-unit:4px;--blue-0:245, 251, 255;--blue-1:224, 241, 255;--blue-2:179, 219, 255;--blue-3:112, 188, 255;--blue-4:71, 175, 255;--blue-5:0, 149, 246;--blue-6:0, 116, 204;--blue-7:0, 87, 163;--blue-8:0, 55, 107;--blue-9:0, 41, 82;--cyan-5:39, 196, 245;--font-family-system:-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;--font-weight-system-bold:700;--font-weight-system-extra-bold:800;--font-weight-system-extra-light:200;--font-weight-system-light:300;--font-weight-system-medium:500;--font-weight-system-regular:400;--font-weight-system-semibold:600;--green-4:120, 222, 69;--green-5:88, 195, 34;--green-6:55, 166, 0;--grey-0:245, 245, 245;--grey-1:239, 239, 239;--grey-2:219, 219, 219;--grey-3:199, 199, 199;--grey-4:168, 168, 168;--grey-5:142, 142, 142;--grey-6:115, 115, 115;--grey-7:85, 85, 85;--grey-8:54, 54, 54;--grey-9:38, 38, 38;--grey-10:26, 26, 26;--orange-5:253, 141, 50;--pink-5:209, 8, 105;--purple-5:163, 7, 186;--red-4:255, 104, 116;--red-5:237, 73, 86;--red-6:198, 35, 48;--red-7:167, 3, 17;--system-10-font-size:10px;--system-10-line-height:12px;--system-11-font-size:11px;--system-11-line-height:13px;--system-12-font-size:12px;--system-13-font-size:13px;--system-12-line-height:16px;--system-15-font-size:15px;--system-14-font-size:14px;--system-14-line-height:18px;--system-16-font-size:16px;--system-16-line-height:20px;--system-18-font-size:18px;--system-18-line-height:24px;--system-20-font-size:20px;--system-20-line-height:25px;--system-22-font-size:22px;--system-22-line-height:26px;--system-24-font-size:24px;--system-24-line-height:27px;--system-26-font-size:26px;--system-26-line-height:28px;--system-28-font-size:28px;--system-28-line-height:32px;--system-30-font-size:30px;--system-30-line-height:36px;--system-32-font-size:32px;--system-32-line-height:40px;--yellow-5:253, 203, 92;--barcelona-large-screen-breakpoint:748px;--barcelona-large-screen-max-width:620px;--barcelona-large-screen-padding:344px;--barcelona-threadline-column-width:48px;--barcelona-post-horizontal-padding:12px;--barcelona-quoted-post-horizontal-padding:16px;--barcelona-carousel-gap:6px;--barcelona-lightbox-horizontal-padding:92px;--barcelona-primary-text:rgb(0, 0, 0);--barcelona-secondary-text:rgb(153, 153, 153);--barcelona-primary-button:rgb(0, 0, 0);--barcelona-secondary-button:rgb(255, 255, 255);--barcelona-link-text:rgb(0, 149, 246);--barcelona-error-text:rgb(255, 48, 64);--barcelona-primary-background:rgb(255, 255, 255);--barcelona-elevated-background:rgb(255, 255, 255);--barcelona-secondary-background:rgb(250, 250, 250);--barcelona-tertiary-background:rgb(245, 245, 245);--barcelona-navigation-background:rgba(255, 255, 255);--barcelona-dialog-backdrop-background:rgba(255, 255, 255, 0.85);--barcelona-primary-outline:rgba(0, 0, 0, 0.15);--barcelona-media-outline:rgba(0, 0, 0, 0.15);--barcelona-threadline:rgb(229, 229, 229);}@media (prefers-color-scheme: dark){:root{--fds-black:black;--fds-black-alpha-05:rgba(0, 0, 0, 0.05);--fds-black-alpha-10:rgba(0, 0, 0, 0.1);--fds-black-alpha-15:rgba(0, 0, 0, 0.15);--fds-black-alpha-20:rgba(0, 0, 0, 0.2);--fds-black-alpha-30:rgba(0, 0, 0, 0.3);--fds-black-alpha-40:rgba(0, 0, 0, 0.4);--fds-black-alpha-50:rgba(0, 0, 0, 0.5);--fds-black-alpha-60:rgba(0, 0, 0, 0.6);--fds-black-alpha-80:rgba(0, 0, 0, 0.8);--fds-blue-05:black;--fds-blue-30:black;--fds-blue-40:black;--fds-blue-60:black;--fds-blue-70:black;--fds-blue-80:black;--fds-button-text:black;--fds-comment-background:black;--fds-dark-mode-gray-35:black;--fds-dark-mode-gray-50:black;--fds-dark-mode-gray-70:black;--fds-dark-mode-gray-80:black;--fds-dark-mode-gray-90:black;--fds-dark-mode-gray-100:black;--fds-gray-00:black;--fds-gray-05:black;--fds-gray-10:black;--fds-gray-20:black;--fds-gray-25:black;--fds-gray-30:black;--fds-gray-45:black;--fds-gray-70:black;--fds-gray-80:black;--fds-gray-90:black;--fds-gray-100:black;--fds-green-55:black;--fds-highlight:black;--fds-highlight-cell-background:black;--fds-primary-icon:white;--fds-primary-text:white;--fds-red-55:black;--fds-soft:cubic-bezier(.08,.52,.52,1);--fds-spectrum-aluminum-tint-70:black;--fds-spectrum-blue-gray-tint-70:black;--fds-spectrum-cherry:black;--fds-spectrum-cherry-tint-70:black;--fds-spectrum-grape-tint-70:black;--fds-spectrum-grape-tint-90:black;--fds-spectrum-lemon-dark-1:black;--fds-spectrum-lemon-tint-70:black;--fds-spectrum-lime:black;--fds-spectrum-lime-tint-70:black;--fds-spectrum-orange-tint-70:black;--fds-spectrum-orange-tint-90:black;--fds-spectrum-seafoam-tint-70:black;--fds-spectrum-slate-dark-2:black;--fds-spectrum-slate-tint-70:black;--fds-spectrum-teal:black;--fds-spectrum-teal-dark-1:black;--fds-spectrum-teal-dark-2:black;--fds-spectrum-teal-tint-70:black;--fds-spectrum-teal-tint-90:black;--fds-spectrum-tomato:black;--fds-spectrum-tomato-tint-30:black;--fds-spectrum-tomato-tint-90:black;--fds-strong:cubic-bezier(.12,.8,.32,1);--fds-white:black;--fds-white-alpha-05:rgba(255, 255, 255, 0.05);--fds-white-alpha-10:rgba(255, 255, 255, 0.1);--fds-white-alpha-20:rgba(255, 255, 255, 0.2);--fds-white-alpha-30:rgba(255, 255, 255, 0.3);--fds-white-alpha-40:rgba(255, 255, 255, 0.4);--fds-white-alpha-50:rgba(255, 255, 255, 0.5);--fds-white-alpha-60:rgba(255, 255, 255, 0.6);--fds-white-alpha-80:rgba(255, 255, 255, 0.8);--fds-yellow-20:black;--accent:hsl(214, 100%, 59%);--always-white:#ffffff;--always-black:#000000;--always-dark-gradient:linear-gradient(rgba(0,0,0,0), rgba(0,0,0,0.6));--always-dark-overlay:rgba(0, 0, 0, 0.4);--always-light-overlay:rgba(255, 255, 255, 0.4);--always-gray-40:#65676B;--always-gray-75:#BCC0C4;--always-gray-95:#F0F2F5;--attachment-footer-background:rgba(255,255,255,0.1);--background-deemphasized:rgba(255,255,255,0.1);--base-blue:#1877F2;--base-cherry:#F3425F;--base-grape:#9360F7;--base-lemon:#F7B928;--base-lime:#45BD62;--base-pink:#FF66BF;--base-seafoam:#54C7EC;--base-teal:#2ABBA7;--base-tomato:#FB724B;--text-badge-info-background:hsl(214, 100%, 59%);--text-badge-success-background:#31A24C;--text-badge-attention-background:hsl(40, 89%, 52%);--text-badge-critical-background:#e41e3f;--blue-link:#4599FF;--border-focused:#8A8D91;--card-background:#242526;--card-background-flat:#323436;--comment-background:#3A3B3C;--comment-footer-background:#4E4F50;--dataviz-primary-1:rgb(48,200,180);--disabled-button-background:rgba(255, 255, 255, 0.2);--disabled-button-text:rgba(255, 255, 255, 0.3);--disabled-icon:rgba(255, 255, 255, 0.3);--disabled-text:rgba(255, 255, 255, 0.3);--divider:#3E4042;--event-date:#F3425F;--fb-wordmark:#FFFFFF;--filter-accent:invert(40%) sepia(52%) saturate(200%) saturate(200%) saturate(200%) saturate(189%) hue-rotate(191deg) brightness(103%) contrast(102%);--filter-always-white:invert(100%);--filter-disabled-icon:invert(100%) opacity(30%);--filter-placeholder-icon:invert(59%) sepia(11%) saturate(200%) saturate(135%) hue-rotate(176deg) brightness(96%) contrast(94%);--filter-primary-icon:invert(89%) sepia(6%) hue-rotate(185deg);--filter-secondary-icon:invert(62%) sepia(98%) saturate(12%) hue-rotate(175deg) brightness(90%) contrast(96%);--filter-warning-icon:invert(77%) sepia(29%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(128%) hue-rotate(359deg) brightness(102%) contrast(107%);--filter-blue-link-icon:invert(73%) sepia(29%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(103.25%) hue-rotate(189deg) brightness(101%) contrast(101%);--filter-positive:invert(37%) sepia(61%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(115%) hue-rotate(91deg) brightness(97%) contrast(105%);--filter-negative:invert(25%) sepia(33%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(110%) hue-rotate(345deg) brightness(132%) contrast(96%);--glimmer-spinner-icon:white;--hero-banner-background:#E85D07;--hosted-view-selected-state:rgba(45, 136, 255, 0.1);--highlight-bg:rgba(24, 119, 242, .31);--hover-overlay:rgba(255, 255, 255, 0.1);--list-cell-chevron:#B0B3B8;--media-hover:rgba(68, 73, 80, 0.15);--media-inner-border:rgba(255, 255, 255, 0.05);--media-outer-border:#33363A;--media-pressed:rgba(68, 73, 80, 0.35);--messenger-card-background:#242526;--messenger-reply-background:#18191A;--overlay-alpha-80:rgba(11, 11, 11, 0.8);--overlay-on-media:rgba(0, 0, 0, 0.6);--nav-bar-background:#242526;--nav-bar-background-gradient:linear-gradient(to top, #242526, rgba(36,37,38,.9), rgba(36,37,38,.7), rgba(36,37,38,.4), rgba(36,37,38,0));--nav-bar-background-gradient-wash:linear-gradient(to top, #18191A, rgba(24,25,26,.9), rgba(24,25,26,.7), rgba(24,25,26,.4), rgba(24,25,26,0));--negative:hsl(350, 87%, 55%);--negative-background:hsl(350, 87%, 55%, 20%);--new-notification-background:#E7F3FF;--non-media-pressed:rgba(68, 73, 80, 0.15);--non-media-pressed-on-dark:rgba(255, 255, 255, 0.3);--notification-badge:#e41e3f;--placeholder-icon:#8A8D91;--placeholder-image:rgb(164, 167, 171);--placeholder-text:#8A8D91;--placeholder-text-on-media:rgba(255, 255, 255, 0.5);--popover-background:#3E4042;--positive:#31A24C;--positive-background:#1F3520;--press-overlay:rgba(255, 255, 255, 0.1);--primary-button-background:#2374E1;--primary-button-icon:#FFFFFF;--primary-button-pressed:#77A7FF;--primary-button-text:#FFFFFF;--primary-deemphasized-button-background:rgba(45, 136, 255, 0.2);--primary-deemphasized-button-pressed:rgba(24, 119, 242, 0.2);--primary-deemphasized-button-pressed-overlay:rgba(25, 110, 255, 0.15);--primary-deemphasized-button-text:#2D88FF;--primary-icon:#E4E6EB;--primary-text:#E4E6EB;--primary-text-on-media:white;--primary-web-focus-indicator:#D24294;--progress-ring-neutral-background:rgba(255, 255, 255, 0.2);--progress-ring-neutral-foreground:#ffffff;--progress-ring-on-media-background:rgba(255, 255, 255, 0.2);--progress-ring-on-media-foreground:#FFFFFF;--progress-ring-blue-background:rgba(45, 136, 255, 0.2);--progress-ring-blue-foreground:hsl(214, 100%, 59%);--progress-ring-disabled-background:rgba(122,125,130, 0.2);--progress-ring-disabled-foreground:#7A7D82;--rating-star-active:#FF9831;--scroll-thumb:rgba(255, 255, 255, 0.3);--scroll-shadow:0 1px 2px rgba(0, 0, 0, 0.1), 0 -1px rgba(255, 255, 255, 0.05) inset;--secondary-button-background:rgba(255,255,255,.1);--secondary-button-background-floating:#4B4C4F;--secondary-button-background-on-dark:rgba(255, 255, 255, 0.4);--secondary-button-pressed:rgba(0, 0, 0, 0.05);--secondary-button-stroke:transparent;--secondary-button-text:#E4E6EB;--secondary-icon:#B0B3B8;--secondary-text:#B0B3B8;--secondary-text-on-media:rgba(255, 255, 255, 0.9);--section-header-text:#BCC0C4;--shadow-1:rgba(0, 0, 0, 0.1);--shadow-2:rgba(0, 0, 0, 0.2);--shadow-5:rgba(0, 0, 0, 0.5);--shadow-8:rgba(0, 0, 0, 0.8);--shadow-inset:rgba(255, 255, 255, 0.05);--shadow-elevated:0 8px 20px 0 rgba(0, 0, 0, 0.2), 0 2px 4px 0 rgba(0, 0, 0, 0.1);--shadow-persistent:0px 0px 12px rgba(28, 43, 51, 0.6);--shadow-primary:0px 0px 12px rgba(28, 43, 51, 0.1);--surface-background:#242526;--switch-active:hsl(214, 100%, 59%);--text-highlight:rgba(24, 119, 242, 0.45);--input-background:#242526;--input-background-disabled:#18191A;--input-border-color:#3E4042;--input-border-color-hover:var(--placeholder-text);--input-label-color-highlighted:hsl(214, 100%, 59%);--text-input-outside-label:#FFFFFF;--toast-background:rgba(16, 16, 16, 0.85);--toast-text:#FFFFFF;--toast-text-link:#4599FF;--toggle-active-background:rgb(45, 136, 255);--toggle-active-icon:#FFFFFF;--toggle-active-text:#FFFFFF;--toggle-button-active-background:#E6F2FF;--tooltip-background:rgba(11, 11, 11, 0.8);--tooltip-box-shadow:0 2px 4px 0 var(--shadow-5);--wash:#3E4042;--web-wash:#18191A;--warning:hsl(40, 89%, 52%);--fb-logo-color:#2D88FF;--dialog-anchor-vertical-padding:56px;--header-height:0px;--global-panel-width:0px;--global-panel-width-expanded:0px;--alert-banner-corner-radius:8px;--button-corner-radius:6px;--button-corner-radius-medium:10px;--button-corner-radius-large:12px;--button-height-large:40px;--button-height-medium:36px;--button-padding-horizontal-large:16px;--button-padding-horizontal-medium:16px;--button-icon-padding-large:16px;--button-icon-padding-medium:16px;--button-inner-icon-spacing-large:3px;--button-inner-icon-spacing-medium:3px;--blueprint-button-height-medium:40px;--blueprint-button-height-large:48px;--card-corner-radius:8px;--card-box-shadow:0 12px 28px 0 var(--shadow-2), 0 2px 4px 0 var(--shadow-1);--card-padding-horizontal:10px;--card-padding-vertical:20px;--chip-corner-radius:6px;--dialog-corner-radius:8px;--glimmer-corner-radius:8px;--image-corner-radius:4px;--input-corner-radius:6px;--input-border-width:1px;--nav-list-cell-corner-radius:8px;--list-cell-corner-radius:8px;--list-cell-min-height:52px;--list-cell-padding-vertical:20px;--list-cell-padding-vertical-with-addon:14px;--menu-item-base-margin-horizontal:8px;--menu-item-base-padding-horizontal:8px;--nav-list-cell-min-height:0px;--nav-list-cell-padding-vertical:16px;--nav-list-cell-padding-vertical-with-addon:16px;--page-footer-padding-vertical:16px;--section-header-addOnEnd-margin-horizontal:8px;--section-header-addOnStart-margin-horizontal:12px;--section-header-addOnEnd-button-padding-horizontal:0px;--section-header-addOnEnd-button-padding-vertical:0px;--section-header-padding-vertical:16px;--section-header-subtitle-margin-vertical:14px;--section-header-subtitle-with-addOnEnd-margin-vertical:6px;--text-badge-corner-radius:4px;--text-badge-padding-horizontal:6px;--text-badge-padding-vertical:6px;--text-input-multi-padding-between-text-scrollbar:20px;--text-input-multi-padding-scrollbar:16px;--text-input-caption-margin-top:10px;--text-input-label-top:22px;--text-input-min-height:64px;--text-input-padding-vertical:12px;--toast-addon-padding-horizontal:6px;--toast-addon-padding-vertical:6px;--toast-container-max-width:100%;--toast-container-min-width:0px;--toast-container-padding-horizontal:14px;--toast-container-padding-vertical:10px;--toast-corner-radius:8px;--typeahead-list-outer-padding-vertical:2px;--fds-animation-enter-exit-in:cubic-bezier(0.14, 1, 0.34, 1);--fds-animation-enter-exit-out:cubic-bezier(0.45, 0.1, 0.2, 1);--fds-animation-swap-shuffle-in:cubic-bezier(0.14, 1, 0.34, 1);--fds-animation-swap-shuffle-out:cubic-bezier(0.45, 0.1, 0.2, 1);--fds-animation-move-in:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-move-out:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-expand-collapse-in:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-expand-collapse-out:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-passive-move-in:cubic-bezier(0.5, 0, 0.1, 1);--fds-animation-passive-move-out:cubic-bezier(0.5, 0, 0.1, 1);--fds-animation-quick-move-in:cubic-bezier(0.1, 0.9, 0.2, 1);--fds-animation-quick-move-out:cubic-bezier(0.1, 0.9, 0.2, 1);--fds-animation-fade-in:cubic-bezier(0, 0, 1, 1);--fds-animation-fade-out:cubic-bezier(0, 0, 1, 1);--fds-duration-extra-extra-short-in:100ms;--fds-duration-extra-extra-short-out:100ms;--fds-duration-extra-short-in:200ms;--fds-duration-extra-short-out:150ms;--fds-duration-short-in:280ms;--fds-duration-short-out:200ms;--fds-duration-medium-in:400ms;--fds-duration-medium-out:350ms;--fds-duration-long-in:500ms;--fds-duration-long-out:350ms;--fds-duration-extra-long-in:1000ms;--fds-duration-extra-long-out:1000ms;--fds-duration-none:0ms;--fds-fast:200ms;--fds-slow:400ms;--font-family-apple:system-ui, -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', sans-serif;--font-family-code:ui-monospace, Menlo, Consolas, Monaco, monospace;--font-family-default:Helvetica, Arial, sans-serif;--font-family-segoe:Segoe UI Historic, Segoe UI, Helvetica, Arial, sans-serif;--body-font-family:Placeholder Font;--body-font-size:0.9375rem;--body-font-weight:400;--body-line-height:1.3333;--body-emphasized-font-family:Placeholder Font;--body-emphasized-font-size:0.9375rem;--body-emphasized-font-weight:600;--body-emphasized-line-height:1.3333;--headline1-font-family:Optimistic Display Bold, system-ui, sans-serif;--headline1-font-size:1.75rem;--headline1-font-weight:700;--headline1-line-height:1.2143;--headline2-font-family:Optimistic Display Bold, system-ui, sans-serif;--headline2-font-size:1.5rem;--headline2-font-weight:700;--headline2-line-height:1.25;--headline3-font-family:Optimistic Display Bold, system-ui, sans-serif;--headline3-font-size:1.0625rem;--headline3-font-weight:700;--headline3-line-height:1.2941;--meta-font-family:Placeholder Font;--meta-font-size:0.8125rem;--meta-font-weight:400;--meta-line-height:1.3846;--meta-emphasized-font-family:Placeholder Font;--meta-emphasized-font-size:0.8125rem;--meta-emphasized-font-weight:600;--meta-emphasized-line-height:1.3846;--primary-label-font-family:Optimistic Display Medium, system-ui, sans-serif;--primary-label-font-size:1.0625rem;--primary-label-font-weight:500;--primary-label-line-height:1.2941;--secondary-label-font-family:Placeholder Font;--secondary-label-font-size:0.9375rem;--secondary-label-font-weight:500;--secondary-label-line-height:1.3333;--tertiary-label-font-family:Placeholder Font;--tertiary-label-font-size:0.6875rem;--tertiary-label-font-weight:500;--tertiary-label-line-height:1.4545;--text-input-field-font-family:Placeholder Font;--text-input-field-font-size:1rem;--text-input-field-font-weight:500;--text-input-field-line-height:1.2941;--text-input-label-font-family:Placeholder Font;--text-input-label-font-size:17px;--text-input-label-font-size-scale-multiplier:0.75;--text-input-label-font-weight:400;--text-input-label-line-height:1.2941;--tooltip-border-radius:8px;--dialog-size-medium-max-width:700px;--dialog-size-medium-width:100%;--dialog-size-small-max-width:548px;--dialog-size-small-width:100%;--dataviz-primary-2:rgb(134,218,255);--dataviz-primary-3:rgb(95,170,255);--dataviz-secondary-1:rgb(129,77,231);--dataviz-secondary-2:rgb(168,124,255);--dataviz-secondary-3:rgb(219,26,139);--dataviz-supplementary-1:rgb(255,122,105);--dataviz-supplementary-2:rgb(241,168,23);--dataviz-supplementary-3:rgb(49,162,76);--dataviz-supplementary-4:rgb(228,230,235);--base-unit:4px;--blue-0:245, 251, 255;--blue-1:224, 241, 255;--blue-2:179, 219, 255;--blue-3:112, 188, 255;--blue-4:71, 175, 255;--blue-5:0, 149, 246;--blue-6:0, 116, 204;--blue-7:0, 87, 163;--blue-8:0, 55, 107;--blue-9:0, 41, 82;--cyan-5:39, 196, 245;--font-family-system:-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;--font-weight-system-bold:700;--font-weight-system-extra-bold:800;--font-weight-system-extra-light:200;--font-weight-system-light:300;--font-weight-system-medium:500;--font-weight-system-regular:400;--font-weight-system-semibold:600;--green-4:120, 222, 69;--green-5:88, 195, 34;--green-6:55, 166, 0;--grey-0:245, 245, 245;--grey-1:239, 239, 239;--grey-2:219, 219, 219;--grey-3:199, 199, 199;--grey-4:168, 168, 168;--grey-5:142, 142, 142;--grey-6:115, 115, 115;--grey-7:85, 85, 85;--grey-8:54, 54, 54;--grey-9:38, 38, 38;--grey-10:26, 26, 26;--orange-5:253, 141, 50;--pink-5:209, 8, 105;--purple-5:163, 7, 186;--red-4:255, 104, 116;--red-5:237, 73, 86;--red-6:198, 35, 48;--red-7:167, 3, 17;--system-10-font-size:10px;--system-10-line-height:12px;--system-11-font-size:11px;--system-11-line-height:13px;--system-12-font-size:12px;--system-13-font-size:13px;--system-12-line-height:16px;--system-15-font-size:15px;--system-14-font-size:14px;--system-14-line-height:18px;--system-16-font-size:16px;--system-16-line-height:20px;--system-18-font-size:18px;--system-18-line-height:24px;--system-20-font-size:20px;--system-20-line-height:25px;--system-22-font-size:22px;--system-22-line-height:26px;--system-24-font-size:24px;--system-24-line-height:27px;--system-26-font-size:26px;--system-26-line-height:28px;--system-28-font-size:28px;--system-28-line-height:32px;--system-30-font-size:30px;--system-30-line-height:36px;--system-32-font-size:32px;--system-32-line-height:40px;--yellow-5:253, 203, 92;--barcelona-large-screen-breakpoint:748px;--barcelona-large-screen-max-width:620px;--barcelona-large-screen-padding:344px;--barcelona-threadline-column-width:48px;--barcelona-post-horizontal-padding:12px;--barcelona-quoted-post-horizontal-padding:16px;--barcelona-carousel-gap:6px;--barcelona-lightbox-horizontal-padding:92px;--barcelona-primary-text:rgb(243, 245, 247);--barcelona-secondary-text:rgb(97, 97, 97);--barcelona-primary-button:rgb(255, 255, 255);--barcelona-secondary-button:rgb(16, 16, 16);--barcelona-link-text:rgb(24, 163, 254);--barcelona-error-text:rgb(255, 48, 64);--barcelona-primary-background:rgb(16, 16, 16);--barcelona-elevated-background:rgb(24, 24, 24);--barcelona-secondary-background:rgb(10, 10, 10);--barcelona-tertiary-background:rgb(30, 30, 30);--barcelona-navigation-background:rgb(16, 16, 16);--barcelona-dialog-backdrop-background:rgba(16, 16, 16, 0.85);--barcelona-primary-outline:rgba(243, 245, 247, 0.15);--barcelona-media-outline:rgba(243, 245, 247, 0.2);--barcelona-threadline:rgb(51, 54, 56);--color-scheme:dark;}}.__fb-light-mode{--fds-black:#000000;--fds-black-alpha-05:rgba(0, 0, 0, 0.05);--fds-black-alpha-10:rgba(0, 0, 0, 0.1);--fds-black-alpha-15:rgba(0, 0, 0, 0.15);--fds-black-alpha-20:rgba(0, 0, 0, 0.2);--fds-black-alpha-30:rgba(0, 0, 0, 0.3);--fds-black-alpha-40:rgba(0, 0, 0, 0.4);--fds-black-alpha-50:rgba(0, 0, 0, 0.5);--fds-black-alpha-60:rgba(0, 0, 0, 0.6);--fds-black-alpha-80:rgba(0, 0, 0, 0.8);--fds-blue-05:#ECF3FF;--fds-blue-30:#AAC9FF;--fds-blue-40:#77A7FF;--fds-blue-60:#1877F2;--fds-blue-70:#2851A3;--fds-blue-80:#1D3C78;--fds-button-text:#444950;--fds-comment-background:#F2F3F5;--fds-dark-mode-gray-35:#CCCCCC;--fds-dark-mode-gray-50:#828282;--fds-dark-mode-gray-70:#4A4A4A;--fds-dark-mode-gray-80:#373737;--fds-dark-mode-gray-90:#282828;--fds-dark-mode-gray-100:#1C1C1C;--fds-gray-00:#F5F6F7;--fds-gray-05:#F2F3F5;--fds-gray-10:#EBEDF0;--fds-gray-20:#DADDE1;--fds-gray-25:#CCD0D5;--fds-gray-30:#BEC3C9;--fds-gray-45:#8D949E;--fds-gray-70:#606770;--fds-gray-80:#444950;--fds-gray-90:#303338;--fds-gray-100:#1C1E21;--fds-green-55:#00A400;--fds-highlight:#3578E5;--fds-highlight-cell-background:#ECF3FF;--fds-primary-icon:#1C1E21;--fds-primary-text:#1C1E21;--fds-red-55:#FA383E;--fds-soft:cubic-bezier(.08,.52,.52,1);--fds-spectrum-aluminum-tint-70:#E4F0F6;--fds-spectrum-blue-gray-tint-70:#CFD1D5;--fds-spectrum-cherry:#F35369;--fds-spectrum-cherry-tint-70:#FBCCD2;--fds-spectrum-grape-tint-70:#DDD5F0;--fds-spectrum-grape-tint-90:#F4F1FA;--fds-spectrum-lemon-dark-1:#F5C33B;--fds-spectrum-lemon-tint-70:#FEF2D1;--fds-spectrum-lime:#A3CE71;--fds-spectrum-lime-tint-70:#E4F0D5;--fds-spectrum-orange-tint-70:#FCDEC5;--fds-spectrum-orange-tint-90:#FEF4EC;--fds-spectrum-seafoam-tint-70:#CAEEF9;--fds-spectrum-slate-dark-2:#89A1AC;--fds-spectrum-slate-tint-70:#EAEFF2;--fds-spectrum-teal:#6BCEBB;--fds-spectrum-teal-dark-1:#4DBBA6;--fds-spectrum-teal-dark-2:#31A38D;--fds-spectrum-teal-tint-70:#D2F0EA;--fds-spectrum-teal-tint-90:#F0FAF8;--fds-spectrum-tomato:#FB724B;--fds-spectrum-tomato-tint-30:#F38E7B;--fds-spectrum-tomato-tint-90:#FDEFED;--fds-strong:cubic-bezier(.12,.8,.32,1);--fds-white:#FFFFFF;--fds-white-alpha-05:rgba(255, 255, 255, 0.05);--fds-white-alpha-10:rgba(255, 255, 255, 0.1);--fds-white-alpha-20:rgba(255, 255, 255, 0.2);--fds-white-alpha-30:rgba(255, 255, 255, 0.3);--fds-white-alpha-40:rgba(255, 255, 255, 0.4);--fds-white-alpha-50:rgba(255, 255, 255, 0.5);--fds-white-alpha-60:rgba(255, 255, 255, 0.6);--fds-white-alpha-80:rgba(255, 255, 255, 0.8);--fds-yellow-20:#FFBA00;--accent:hsl(214, 89%, 52%);--always-white:#ffffff;--always-black:#000000;--always-dark-gradient:linear-gradient(rgba(0,0,0,0), rgba(0,0,0,0.6));--always-dark-overlay:rgba(0, 0, 0, 0.4);--always-light-overlay:rgba(255, 255, 255, 0.4);--always-gray-40:#65676B;--always-gray-75:#BCC0C4;--always-gray-95:#F0F2F5;--attachment-footer-background:#F0F2F5;--background-deemphasized:#F0F2F5;--base-blue:#1877F2;--base-cherry:#F3425F;--base-grape:#9360F7;--base-lemon:#F7B928;--base-lime:#45BD62;--base-pink:#FF66BF;--base-seafoam:#54C7EC;--base-teal:#2ABBA7;--base-tomato:#FB724B;--text-badge-info-background:hsl(214, 89%, 52%);--text-badge-success-background:#31A24C;--text-badge-attention-background:hsl(40, 89%, 52%);--text-badge-critical-background:#e41e3f;--blue-link:#216FDB;--border-focused:#65676B;--card-background:#FFFFFF;--card-background-flat:#F7F8FA;--comment-background:#F0F2F5;--comment-footer-background:#F6F9FA;--dataviz-primary-1:rgb(48,200,180);--disabled-button-background:#E4E6EB;--disabled-button-text:#BCC0C4;--disabled-icon:#BCC0C4;--disabled-text:#BCC0C4;--divider:#CED0D4;--event-date:#F3425F;--fb-wordmark:#1877F2;--filter-accent:invert(39%) sepia(57%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(147.75%) hue-rotate(202deg) brightness(97%) contrast(96%);--filter-always-white:invert(100%);--filter-disabled-icon:invert(80%) sepia(6%) saturate(200%) saturate(120%) hue-rotate(173deg) brightness(98%) contrast(89%);--filter-placeholder-icon:invert(59%) sepia(11%) saturate(200%) saturate(135%) hue-rotate(176deg) brightness(96%) contrast(94%);--filter-primary-icon:invert(8%) sepia(10%) saturate(200%) saturate(200%) saturate(166%) hue-rotate(177deg) brightness(104%) contrast(91%);--filter-secondary-icon:invert(39%) sepia(21%) saturate(200%) saturate(109.5%) hue-rotate(174deg) brightness(94%) contrast(86%);--filter-warning-icon:invert(77%) sepia(29%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(128%) hue-rotate(359deg) brightness(102%) contrast(107%);--filter-blue-link-icon:invert(30%) sepia(98%) saturate(200%) saturate(200%) saturate(200%) saturate(166.5%) hue-rotate(192deg) brightness(91%) contrast(101%);--filter-positive:invert(37%) sepia(61%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(115%) hue-rotate(91deg) brightness(97%) contrast(105%);--filter-negative:invert(25%) sepia(33%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(110%) hue-rotate(345deg) brightness(132%) contrast(96%);--glimmer-spinner-icon:#65676B;--hero-banner-background:#FFFFFF;--hosted-view-selected-state:rgba(45, 136, 255, 0.1);--highlight-bg:#E7F3FF;--hover-overlay:rgba(0, 0, 0, 0.05);--list-cell-chevron:#65676B;--media-hover:rgba(68, 73, 80, 0.15);--media-inner-border:rgba(0, 0, 0, 0.1);--media-outer-border:#FFFFFF;--media-pressed:rgba(68, 73, 80, 0.35);--messenger-card-background:#FFFFFF;--messenger-reply-background:#F0F2F5;--overlay-alpha-80:rgba(244, 244, 244, 0.8);--overlay-on-media:rgba(0, 0, 0, 0.6);--nav-bar-background:#FFFFFF;--nav-bar-background-gradient:linear-gradient(to top, #FFFFFF, rgba(255,255,255.9), rgba(255,255,255,.7), rgba(255,255,255,.4), rgba(255,255,255,0));--nav-bar-background-gradient-wash:linear-gradient(to top, #F0F2F5, rgba(240,242,245.9), rgba(240,242,245,.7), rgba(240,242,245,.4), rgba(240,242,245,0));--negative:hsl(350, 87%, 55%);--negative-background:hsl(350, 87%, 55%, 20%);--new-notification-background:#E7F3FF;--non-media-pressed:rgba(68, 73, 80, 0.15);--non-media-pressed-on-dark:rgba(255, 255, 255, 0.3);--notification-badge:#e41e3f;--placeholder-icon:#65676B;--placeholder-image:rgb(164, 167, 171);--placeholder-text:#65676B;--placeholder-text-on-media:rgba(255, 255, 255, 0.5);--popover-background:#FFFFFF;--positive:#31A24C;--positive-background:#DEEFE1;--press-overlay:rgba(0, 0, 0, 0.10);--primary-button-background:#1B74E4;--primary-button-icon:#FFFFFF;--primary-button-pressed:#77A7FF;--primary-button-text:#FFFFFF;--primary-deemphasized-button-background:#E7F3FF;--primary-deemphasized-button-pressed:rgba(0, 0, 0, 0.05);--primary-deemphasized-button-pressed-overlay:rgba(25, 110, 255, 0.15);--primary-deemphasized-button-text:#1877F2;--primary-icon:#050505;--primary-text:#050505;--primary-text-on-media:#FFFFFF;--primary-web-focus-indicator:#D24294;--progress-ring-neutral-background:rgba(0, 0, 0, 0.2);--progress-ring-neutral-foreground:#000000;--progress-ring-on-media-background:rgba(255, 255, 255, 0.2);--progress-ring-on-media-foreground:#FFFFFF;--progress-ring-blue-background:rgba(24, 119, 242, 0.2);--progress-ring-blue-foreground:hsl(214, 89%, 52%);--progress-ring-disabled-background:rgba(190,195,201, 0.2);--progress-ring-disabled-foreground:#BEC3C9;--rating-star-active:#EB660D;--scroll-thumb:#BCC0C4;--scroll-shadow:0 1px 2px rgba(0, 0, 0, 0.1), 0 -1px rgba(0, 0, 0, 0.1) inset;--secondary-button-background:#E4E6EB;--secondary-button-background-floating:#ffffff;--secondary-button-background-on-dark:rgba(0, 0, 0, 0.4);--secondary-button-pressed:rgba(0, 0, 0, 0.05);--secondary-button-stroke:transparent;--secondary-button-text:#050505;--secondary-icon:#65676B;--secondary-text:#65676B;--secondary-text-on-media:rgba(255, 255, 255, 0.9);--section-header-text:#4B4C4F;--shadow-1:rgba(0, 0, 0, 0.1);--shadow-2:rgba(0, 0, 0, 0.2);--shadow-5:rgba(0, 0, 0, 0.5);--shadow-8:rgba(0, 0, 0, 0.8);--shadow-inset:rgba(255, 255, 255, 0.5);--shadow-elevated:0 8px 20px 0 rgba(0, 0, 0, 0.2), 0 2px 4px 0 rgba(0, 0, 0, 0.1);--shadow-persistent:0px 0px 12px rgba(52, 72, 84, 0.05);--shadow-primary:0px 5px 12px rgba(52, 72, 84, 0.2);--surface-background:#FFFFFF;--switch-active:hsl(214, 89%, 52%);--text-highlight:rgba(24, 119, 242, 0.2);--input-background:#FFFFFF;--input-background-disabled:#F0F2F5;--input-border-color:#CED0D4;--input-border-color-hover:var(--placeholder-text);--input-label-color-highlighted:hsl(214, 89%, 52%);--text-input-outside-label:#000000;--toast-background:rgba(255, 255, 255, 0.85);--toast-text:#1C2B33;--toast-text-link:#216FDB;--toggle-active-background:#E7F3FF;--toggle-active-icon:rgb(24, 119, 242);--toggle-active-text:rgb(24, 119, 242);--toggle-button-active-background:#E7F3FF;--tooltip-background:rgba(244, 244, 244, 0.8);--tooltip-box-shadow:0 2px 4px 0 var(--shadow-5);--wash:#E4E6EB;--web-wash:#F0F2F5;--warning:hsl(40, 89%, 52%);--fb-logo-color:#2D88FF;--dialog-anchor-vertical-padding:56px;--header-height:0px;--global-panel-width:0px;--global-panel-width-expanded:0px;--alert-banner-corner-radius:8px;--button-corner-radius:6px;--button-corner-radius-medium:10px;--button-corner-radius-large:12px;--button-height-large:40px;--button-height-medium:36px;--button-padding-horizontal-large:16px;--button-padding-horizontal-medium:16px;--button-icon-padding-large:16px;--button-icon-padding-medium:16px;--button-inner-icon-spacing-large:3px;--button-inner-icon-spacing-medium:3px;--blueprint-button-height-medium:40px;--blueprint-button-height-large:48px;--card-corner-radius:8px;--card-box-shadow:0 12px 28px 0 var(--shadow-2), 0 2px 4px 0 var(--shadow-1);--card-padding-horizontal:10px;--card-padding-vertical:20px;--chip-corner-radius:6px;--dialog-corner-radius:8px;--glimmer-corner-radius:8px;--image-corner-radius:4px;--input-corner-radius:6px;--input-border-width:1px;--nav-list-cell-corner-radius:8px;--list-cell-corner-radius:8px;--list-cell-min-height:52px;--list-cell-padding-vertical:20px;--list-cell-padding-vertical-with-addon:14px;--menu-item-base-margin-horizontal:8px;--menu-item-base-padding-horizontal:8px;--nav-list-cell-min-height:0px;--nav-list-cell-padding-vertical:16px;--nav-list-cell-padding-vertical-with-addon:16px;--page-footer-padding-vertical:16px;--section-header-addOnEnd-margin-horizontal:8px;--section-header-addOnStart-margin-horizontal:12px;--section-header-addOnEnd-button-padding-horizontal:0px;--section-header-addOnEnd-button-padding-vertical:0px;--section-header-padding-vertical:16px;--section-header-subtitle-margin-vertical:14px;--section-header-subtitle-with-addOnEnd-margin-vertical:6px;--text-badge-corner-radius:4px;--text-badge-padding-horizontal:6px;--text-badge-padding-vertical:6px;--text-input-multi-padding-between-text-scrollbar:20px;--text-input-multi-padding-scrollbar:16px;--text-input-caption-margin-top:10px;--text-input-label-top:22px;--text-input-min-height:64px;--text-input-padding-vertical:12px;--toast-addon-padding-horizontal:6px;--toast-addon-padding-vertical:6px;--toast-container-max-width:100%;--toast-container-min-width:0px;--toast-container-padding-horizontal:14px;--toast-container-padding-vertical:10px;--toast-corner-radius:8px;--typeahead-list-outer-padding-vertical:2px;--fds-animation-enter-exit-in:cubic-bezier(0.14, 1, 0.34, 1);--fds-animation-enter-exit-out:cubic-bezier(0.45, 0.1, 0.2, 1);--fds-animation-swap-shuffle-in:cubic-bezier(0.14, 1, 0.34, 1);--fds-animation-swap-shuffle-out:cubic-bezier(0.45, 0.1, 0.2, 1);--fds-animation-move-in:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-move-out:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-expand-collapse-in:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-expand-collapse-out:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-passive-move-in:cubic-bezier(0.5, 0, 0.1, 1);--fds-animation-passive-move-out:cubic-bezier(0.5, 0, 0.1, 1);--fds-animation-quick-move-in:cubic-bezier(0.1, 0.9, 0.2, 1);--fds-animation-quick-move-out:cubic-bezier(0.1, 0.9, 0.2, 1);--fds-animation-fade-in:cubic-bezier(0, 0, 1, 1);--fds-animation-fade-out:cubic-bezier(0, 0, 1, 1);--fds-duration-extra-extra-short-in:100ms;--fds-duration-extra-extra-short-out:100ms;--fds-duration-extra-short-in:200ms;--fds-duration-extra-short-out:150ms;--fds-duration-short-in:280ms;--fds-duration-short-out:200ms;--fds-duration-medium-in:400ms;--fds-duration-medium-out:350ms;--fds-duration-long-in:500ms;--fds-duration-long-out:350ms;--fds-duration-extra-long-in:1000ms;--fds-duration-extra-long-out:1000ms;--fds-duration-none:0ms;--fds-fast:200ms;--fds-slow:400ms;--font-family-apple:system-ui, -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', sans-serif;--font-family-code:ui-monospace, Menlo, Consolas, Monaco, monospace;--font-family-default:Helvetica, Arial, sans-serif;--font-family-segoe:Segoe UI Historic, Segoe UI, Helvetica, Arial, sans-serif;--body-font-family:Placeholder Font;--body-font-size:0.9375rem;--body-font-weight:400;--body-line-height:1.3333;--body-emphasized-font-family:Placeholder Font;--body-emphasized-font-size:0.9375rem;--body-emphasized-font-weight:600;--body-emphasized-line-height:1.3333;--headline1-font-family:Optimistic Display Bold, system-ui, sans-serif;--headline1-font-size:1.75rem;--headline1-font-weight:700;--headline1-line-height:1.2143;--headline2-font-family:Optimistic Display Bold, system-ui, sans-serif;--headline2-font-size:1.5rem;--headline2-font-weight:700;--headline2-line-height:1.25;--headline3-font-family:Optimistic Display Bold, system-ui, sans-serif;--headline3-font-size:1.0625rem;--headline3-font-weight:700;--headline3-line-height:1.2941;--meta-font-family:Placeholder Font;--meta-font-size:0.8125rem;--meta-font-weight:400;--meta-line-height:1.3846;--meta-emphasized-font-family:Placeholder Font;--meta-emphasized-font-size:0.8125rem;--meta-emphasized-font-weight:600;--meta-emphasized-line-height:1.3846;--primary-label-font-family:Optimistic Display Medium, system-ui, sans-serif;--primary-label-font-size:1.0625rem;--primary-label-font-weight:500;--primary-label-line-height:1.2941;--secondary-label-font-family:Placeholder Font;--secondary-label-font-size:0.9375rem;--secondary-label-font-weight:500;--secondary-label-line-height:1.3333;--tertiary-label-font-family:Placeholder Font;--tertiary-label-font-size:0.6875rem;--tertiary-label-font-weight:500;--tertiary-label-line-height:1.4545;--text-input-field-font-family:Placeholder Font;--text-input-field-font-size:1rem;--text-input-field-font-weight:500;--text-input-field-line-height:1.2941;--text-input-label-font-family:Placeholder Font;--text-input-label-font-size:17px;--text-input-label-font-size-scale-multiplier:0.75;--text-input-label-font-weight:400;--text-input-label-line-height:1.2941;--tooltip-border-radius:8px;--dialog-size-medium-max-width:700px;--dialog-size-medium-width:100%;--dialog-size-small-max-width:548px;--dialog-size-small-width:100%;--dataviz-primary-2:rgb(134,218,255);--dataviz-primary-3:rgb(95,170,255);--dataviz-secondary-1:rgb(118,62,230);--dataviz-secondary-2:rgb(147,96,247);--dataviz-secondary-3:rgb(219,26,139);--dataviz-supplementary-1:rgb(255,122,105);--dataviz-supplementary-2:rgb(241,168,23);--dataviz-supplementary-3:rgb(49,162,76);--dataviz-supplementary-4:rgb(50,52,54);--base-unit:4px;--blue-0:245, 251, 255;--blue-1:224, 241, 255;--blue-2:179, 219, 255;--blue-3:112, 188, 255;--blue-4:71, 175, 255;--blue-5:0, 149, 246;--blue-6:0, 116, 204;--blue-7:0, 87, 163;--blue-8:0, 55, 107;--blue-9:0, 41, 82;--cyan-5:39, 196, 245;--font-family-system:-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;--font-weight-system-bold:700;--font-weight-system-extra-bold:800;--font-weight-system-extra-light:200;--font-weight-system-light:300;--font-weight-system-medium:500;--font-weight-system-regular:400;--font-weight-system-semibold:600;--green-4:120, 222, 69;--green-5:88, 195, 34;--green-6:55, 166, 0;--grey-0:245, 245, 245;--grey-1:239, 239, 239;--grey-2:219, 219, 219;--grey-3:199, 199, 199;--grey-4:168, 168, 168;--grey-5:142, 142, 142;--grey-6:115, 115, 115;--grey-7:85, 85, 85;--grey-8:54, 54, 54;--grey-9:38, 38, 38;--grey-10:26, 26, 26;--orange-5:253, 141, 50;--pink-5:209, 8, 105;--purple-5:163, 7, 186;--red-4:255, 104, 116;--red-5:237, 73, 86;--red-6:198, 35, 48;--red-7:167, 3, 17;--system-10-font-size:10px;--system-10-line-height:12px;--system-11-font-size:11px;--system-11-line-height:13px;--system-12-font-size:12px;--system-13-font-size:13px;--system-12-line-height:16px;--system-15-font-size:15px;--system-14-font-size:14px;--system-14-line-height:18px;--system-16-font-size:16px;--system-16-line-height:20px;--system-18-font-size:18px;--system-18-line-height:24px;--system-20-font-size:20px;--system-20-line-height:25px;--system-22-font-size:22px;--system-22-line-height:26px;--system-24-font-size:24px;--system-24-line-height:27px;--system-26-font-size:26px;--system-26-line-height:28px;--system-28-font-size:28px;--system-28-line-height:32px;--system-30-font-size:30px;--system-30-line-height:36px;--system-32-font-size:32px;--system-32-line-height:40px;--yellow-5:253, 203, 92;--barcelona-large-screen-breakpoint:748px;--barcelona-large-screen-max-width:620px;--barcelona-large-screen-padding:344px;--barcelona-threadline-column-width:48px;--barcelona-post-horizontal-padding:12px;--barcelona-quoted-post-horizontal-padding:16px;--barcelona-carousel-gap:6px;--barcelona-lightbox-horizontal-padding:92px;--barcelona-primary-text:rgb(0, 0, 0);--barcelona-secondary-text:rgb(153, 153, 153);--barcelona-primary-button:rgb(0, 0, 0);--barcelona-secondary-button:rgb(255, 255, 255);--barcelona-link-text:rgb(0, 149, 246);--barcelona-error-text:rgb(255, 48, 64);--barcelona-primary-background:rgb(255, 255, 255);--barcelona-elevated-background:rgb(255, 255, 255);--barcelona-secondary-background:rgb(250, 250, 250);--barcelona-tertiary-background:rgb(245, 245, 245);--barcelona-navigation-background:rgba(255, 255, 255);--barcelona-dialog-backdrop-background:rgba(255, 255, 255, 0.85);--barcelona-primary-outline:rgba(0, 0, 0, 0.15);--barcelona-media-outline:rgba(0, 0, 0, 0.15);--barcelona-threadline:rgb(229, 229, 229);}.__fb-dark-mode{--fds-black:black;--fds-black-alpha-05:rgba(0, 0, 0, 0.05);--fds-black-alpha-10:rgba(0, 0, 0, 0.1);--fds-black-alpha-15:rgba(0, 0, 0, 0.15);--fds-black-alpha-20:rgba(0, 0, 0, 0.2);--fds-black-alpha-30:rgba(0, 0, 0, 0.3);--fds-black-alpha-40:rgba(0, 0, 0, 0.4);--fds-black-alpha-50:rgba(0, 0, 0, 0.5);--fds-black-alpha-60:rgba(0, 0, 0, 0.6);--fds-black-alpha-80:rgba(0, 0, 0, 0.8);--fds-blue-05:black;--fds-blue-30:black;--fds-blue-40:black;--fds-blue-60:black;--fds-blue-70:black;--fds-blue-80:black;--fds-button-text:black;--fds-comment-background:black;--fds-dark-mode-gray-35:black;--fds-dark-mode-gray-50:black;--fds-dark-mode-gray-70:black;--fds-dark-mode-gray-80:black;--fds-dark-mode-gray-90:black;--fds-dark-mode-gray-100:black;--fds-gray-00:black;--fds-gray-05:black;--fds-gray-10:black;--fds-gray-20:black;--fds-gray-25:black;--fds-gray-30:black;--fds-gray-45:black;--fds-gray-70:black;--fds-gray-80:black;--fds-gray-90:black;--fds-gray-100:black;--fds-green-55:black;--fds-highlight:black;--fds-highlight-cell-background:black;--fds-primary-icon:white;--fds-primary-text:white;--fds-red-55:black;--fds-soft:cubic-bezier(.08,.52,.52,1);--fds-spectrum-aluminum-tint-70:black;--fds-spectrum-blue-gray-tint-70:black;--fds-spectrum-cherry:black;--fds-spectrum-cherry-tint-70:black;--fds-spectrum-grape-tint-70:black;--fds-spectrum-grape-tint-90:black;--fds-spectrum-lemon-dark-1:black;--fds-spectrum-lemon-tint-70:black;--fds-spectrum-lime:black;--fds-spectrum-lime-tint-70:black;--fds-spectrum-orange-tint-70:black;--fds-spectrum-orange-tint-90:black;--fds-spectrum-seafoam-tint-70:black;--fds-spectrum-slate-dark-2:black;--fds-spectrum-slate-tint-70:black;--fds-spectrum-teal:black;--fds-spectrum-teal-dark-1:black;--fds-spectrum-teal-dark-2:black;--fds-spectrum-teal-tint-70:black;--fds-spectrum-teal-tint-90:black;--fds-spectrum-tomato:black;--fds-spectrum-tomato-tint-30:black;--fds-spectrum-tomato-tint-90:black;--fds-strong:cubic-bezier(.12,.8,.32,1);--fds-white:black;--fds-white-alpha-05:rgba(255, 255, 255, 0.05);--fds-white-alpha-10:rgba(255, 255, 255, 0.1);--fds-white-alpha-20:rgba(255, 255, 255, 0.2);--fds-white-alpha-30:rgba(255, 255, 255, 0.3);--fds-white-alpha-40:rgba(255, 255, 255, 0.4);--fds-white-alpha-50:rgba(255, 255, 255, 0.5);--fds-white-alpha-60:rgba(255, 255, 255, 0.6);--fds-white-alpha-80:rgba(255, 255, 255, 0.8);--fds-yellow-20:black;--accent:hsl(214, 100%, 59%);--always-white:#ffffff;--always-black:#000000;--always-dark-gradient:linear-gradient(rgba(0,0,0,0), rgba(0,0,0,0.6));--always-dark-overlay:rgba(0, 0, 0, 0.4);--always-light-overlay:rgba(255, 255, 255, 0.4);--always-gray-40:#65676B;--always-gray-75:#BCC0C4;--always-gray-95:#F0F2F5;--attachment-footer-background:rgba(255,255,255,0.1);--background-deemphasized:rgba(255,255,255,0.1);--base-blue:#1877F2;--base-cherry:#F3425F;--base-grape:#9360F7;--base-lemon:#F7B928;--base-lime:#45BD62;--base-pink:#FF66BF;--base-seafoam:#54C7EC;--base-teal:#2ABBA7;--base-tomato:#FB724B;--text-badge-info-background:hsl(214, 100%, 59%);--text-badge-success-background:#31A24C;--text-badge-attention-background:hsl(40, 89%, 52%);--text-badge-critical-background:#e41e3f;--blue-link:#4599FF;--border-focused:#8A8D91;--card-background:#242526;--card-background-flat:#323436;--comment-background:#3A3B3C;--comment-footer-background:#4E4F50;--dataviz-primary-1:rgb(48,200,180);--disabled-button-background:rgba(255, 255, 255, 0.2);--disabled-button-text:rgba(255, 255, 255, 0.3);--disabled-icon:rgba(255, 255, 255, 0.3);--disabled-text:rgba(255, 255, 255, 0.3);--divider:#3E4042;--event-date:#F3425F;--fb-wordmark:#FFFFFF;--filter-accent:invert(40%) sepia(52%) saturate(200%) saturate(200%) saturate(200%) saturate(189%) hue-rotate(191deg) brightness(103%) contrast(102%);--filter-always-white:invert(100%);--filter-disabled-icon:invert(100%) opacity(30%);--filter-placeholder-icon:invert(59%) sepia(11%) saturate(200%) saturate(135%) hue-rotate(176deg) brightness(96%) contrast(94%);--filter-primary-icon:invert(89%) sepia(6%) hue-rotate(185deg);--filter-secondary-icon:invert(62%) sepia(98%) saturate(12%) hue-rotate(175deg) brightness(90%) contrast(96%);--filter-warning-icon:invert(77%) sepia(29%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(128%) hue-rotate(359deg) brightness(102%) contrast(107%);--filter-blue-link-icon:invert(73%) sepia(29%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(103.25%) hue-rotate(189deg) brightness(101%) contrast(101%);--filter-positive:invert(37%) sepia(61%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(115%) hue-rotate(91deg) brightness(97%) contrast(105%);--filter-negative:invert(25%) sepia(33%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(110%) hue-rotate(345deg) brightness(132%) contrast(96%);--glimmer-spinner-icon:white;--hero-banner-background:#E85D07;--hosted-view-selected-state:rgba(45, 136, 255, 0.1);--highlight-bg:rgba(24, 119, 242, .31);--hover-overlay:rgba(255, 255, 255, 0.1);--list-cell-chevron:#B0B3B8;--media-hover:rgba(68, 73, 80, 0.15);--media-inner-border:rgba(255, 255, 255, 0.05);--media-outer-border:#33363A;--media-pressed:rgba(68, 73, 80, 0.35);--messenger-card-background:#242526;--messenger-reply-background:#18191A;--overlay-alpha-80:rgba(11, 11, 11, 0.8);--overlay-on-media:rgba(0, 0, 0, 0.6);--nav-bar-background:#242526;--nav-bar-background-gradient:linear-gradient(to top, #242526, rgba(36,37,38,.9), rgba(36,37,38,.7), rgba(36,37,38,.4), rgba(36,37,38,0));--nav-bar-background-gradient-wash:linear-gradient(to top, #18191A, rgba(24,25,26,.9), rgba(24,25,26,.7), rgba(24,25,26,.4), rgba(24,25,26,0));--negative:hsl(350, 87%, 55%);--negative-background:hsl(350, 87%, 55%, 20%);--new-notification-background:#E7F3FF;--non-media-pressed:rgba(68, 73, 80, 0.15);--non-media-pressed-on-dark:rgba(255, 255, 255, 0.3);--notification-badge:#e41e3f;--placeholder-icon:#8A8D91;--placeholder-image:rgb(164, 167, 171);--placeholder-text:#8A8D91;--placeholder-text-on-media:rgba(255, 255, 255, 0.5);--popover-background:#3E4042;--positive:#31A24C;--positive-background:#1F3520;--press-overlay:rgba(255, 255, 255, 0.1);--primary-button-background:#2374E1;--primary-button-icon:#FFFFFF;--primary-button-pressed:#77A7FF;--primary-button-text:#FFFFFF;--primary-deemphasized-button-background:rgba(45, 136, 255, 0.2);--primary-deemphasized-button-pressed:rgba(24, 119, 242, 0.2);--primary-deemphasized-button-pressed-overlay:rgba(25, 110, 255, 0.15);--primary-deemphasized-button-text:#2D88FF;--primary-icon:#E4E6EB;--primary-text:#E4E6EB;--primary-text-on-media:white;--primary-web-focus-indicator:#D24294;--progress-ring-neutral-background:rgba(255, 255, 255, 0.2);--progress-ring-neutral-foreground:#ffffff;--progress-ring-on-media-background:rgba(255, 255, 255, 0.2);--progress-ring-on-media-foreground:#FFFFFF;--progress-ring-blue-background:rgba(45, 136, 255, 0.2);--progress-ring-blue-foreground:hsl(214, 100%, 59%);--progress-ring-disabled-background:rgba(122,125,130, 0.2);--progress-ring-disabled-foreground:#7A7D82;--rating-star-active:#FF9831;--scroll-thumb:rgba(255, 255, 255, 0.3);--scroll-shadow:0 1px 2px rgba(0, 0, 0, 0.1), 0 -1px rgba(255, 255, 255, 0.05) inset;--secondary-button-background:rgba(255,255,255,.1);--secondary-button-background-floating:#4B4C4F;--secondary-button-background-on-dark:rgba(255, 255, 255, 0.4);--secondary-button-pressed:rgba(0, 0, 0, 0.05);--secondary-button-stroke:transparent;--secondary-button-text:#E4E6EB;--secondary-icon:#B0B3B8;--secondary-text:#B0B3B8;--secondary-text-on-media:rgba(255, 255, 255, 0.9);--section-header-text:#BCC0C4;--shadow-1:rgba(0, 0, 0, 0.1);--shadow-2:rgba(0, 0, 0, 0.2);--shadow-5:rgba(0, 0, 0, 0.5);--shadow-8:rgba(0, 0, 0, 0.8);--shadow-inset:rgba(255, 255, 255, 0.05);--shadow-elevated:0 8px 20px 0 rgba(0, 0, 0, 0.2), 0 2px 4px 0 rgba(0, 0, 0, 0.1);--shadow-persistent:0px 0px 12px rgba(28, 43, 51, 0.6);--shadow-primary:0px 0px 12px rgba(28, 43, 51, 0.1);--surface-background:#242526;--switch-active:hsl(214, 100%, 59%);--text-highlight:rgba(24, 119, 242, 0.45);--input-background:#242526;--input-background-disabled:#18191A;--input-border-color:#3E4042;--input-border-color-hover:var(--placeholder-text);--input-label-color-highlighted:hsl(214, 100%, 59%);--text-input-outside-label:#FFFFFF;--toast-background:rgba(16, 16, 16, 0.85);--toast-text:#FFFFFF;--toast-text-link:#4599FF;--toggle-active-background:rgb(45, 136, 255);--toggle-active-icon:#FFFFFF;--toggle-active-text:#FFFFFF;--toggle-button-active-background:#E6F2FF;--tooltip-background:rgba(11, 11, 11, 0.8);--tooltip-box-shadow:0 2px 4px 0 var(--shadow-5);--wash:#3E4042;--web-wash:#18191A;--warning:hsl(40, 89%, 52%);--fb-logo-color:#2D88FF;--dialog-anchor-vertical-padding:56px;--header-height:0px;--global-panel-width:0px;--global-panel-width-expanded:0px;--alert-banner-corner-radius:8px;--button-corner-radius:6px;--button-corner-radius-medium:10px;--button-corner-radius-large:12px;--button-height-large:40px;--button-height-medium:36px;--button-padding-horizontal-large:16px;--button-padding-horizontal-medium:16px;--button-icon-padding-large:16px;--button-icon-padding-medium:16px;--button-inner-icon-spacing-large:3px;--button-inner-icon-spacing-medium:3px;--blueprint-button-height-medium:40px;--blueprint-button-height-large:48px;--card-corner-radius:8px;--card-box-shadow:0 12px 28px 0 var(--shadow-2), 0 2px 4px 0 var(--shadow-1);--card-padding-horizontal:10px;--card-padding-vertical:20px;--chip-corner-radius:6px;--dialog-corner-radius:8px;--glimmer-corner-radius:8px;--image-corner-radius:4px;--input-corner-radius:6px;--input-border-width:1px;--nav-list-cell-corner-radius:8px;--list-cell-corner-radius:8px;--list-cell-min-height:52px;--list-cell-padding-vertical:20px;--list-cell-padding-vertical-with-addon:14px;--menu-item-base-margin-horizontal:8px;--menu-item-base-padding-horizontal:8px;--nav-list-cell-min-height:0px;--nav-list-cell-padding-vertical:16px;--nav-list-cell-padding-vertical-with-addon:16px;--page-footer-padding-vertical:16px;--section-header-addOnEnd-margin-horizontal:8px;--section-header-addOnStart-margin-horizontal:12px;--section-header-addOnEnd-button-padding-horizontal:0px;--section-header-addOnEnd-button-padding-vertical:0px;--section-header-padding-vertical:16px;--section-header-subtitle-margin-vertical:14px;--section-header-subtitle-with-addOnEnd-margin-vertical:6px;--text-badge-corner-radius:4px;--text-badge-padding-horizontal:6px;--text-badge-padding-vertical:6px;--text-input-multi-padding-between-text-scrollbar:20px;--text-input-multi-padding-scrollbar:16px;--text-input-caption-margin-top:10px;--text-input-label-top:22px;--text-input-min-height:64px;--text-input-padding-vertical:12px;--toast-addon-padding-horizontal:6px;--toast-addon-padding-vertical:6px;--toast-container-max-width:100%;--toast-container-min-width:0px;--toast-container-padding-horizontal:14px;--toast-container-padding-vertical:10px;--toast-corner-radius:8px;--typeahead-list-outer-padding-vertical:2px;--fds-animation-enter-exit-in:cubic-bezier(0.14, 1, 0.34, 1);--fds-animation-enter-exit-out:cubic-bezier(0.45, 0.1, 0.2, 1);--fds-animation-swap-shuffle-in:cubic-bezier(0.14, 1, 0.34, 1);--fds-animation-swap-shuffle-out:cubic-bezier(0.45, 0.1, 0.2, 1);--fds-animation-move-in:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-move-out:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-expand-collapse-in:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-expand-collapse-out:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-passive-move-in:cubic-bezier(0.5, 0, 0.1, 1);--fds-animation-passive-move-out:cubic-bezier(0.5, 0, 0.1, 1);--fds-animation-quick-move-in:cubic-bezier(0.1, 0.9, 0.2, 1);--fds-animation-quick-move-out:cubic-bezier(0.1, 0.9, 0.2, 1);--fds-animation-fade-in:cubic-bezier(0, 0, 1, 1);--fds-animation-fade-out:cubic-bezier(0, 0, 1, 1);--fds-duration-extra-extra-short-in:100ms;--fds-duration-extra-extra-short-out:100ms;--fds-duration-extra-short-in:200ms;--fds-duration-extra-short-out:150ms;--fds-duration-short-in:280ms;--fds-duration-short-out:200ms;--fds-duration-medium-in:400ms;--fds-duration-medium-out:350ms;--fds-duration-long-in:500ms;--fds-duration-long-out:350ms;--fds-duration-extra-long-in:1000ms;--fds-duration-extra-long-out:1000ms;--fds-duration-none:0ms;--fds-fast:200ms;--fds-slow:400ms;--font-family-apple:system-ui, -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', sans-serif;--font-family-code:ui-monospace, Menlo, Consolas, Monaco, monospace;--font-family-default:Helvetica, Arial, sans-serif;--font-family-segoe:Segoe UI Historic, Segoe UI, Helvetica, Arial, sans-serif;--body-font-family:Placeholder Font;--body-font-size:0.9375rem;--body-font-weight:400;--body-line-height:1.3333;--body-emphasized-font-family:Placeholder Font;--body-emphasized-font-size:0.9375rem;--body-emphasized-font-weight:600;--body-emphasized-line-height:1.3333;--headline1-font-family:Optimistic Display Bold, system-ui, sans-serif;--headline1-font-size:1.75rem;--headline1-font-weight:700;--headline1-line-height:1.2143;--headline2-font-family:Optimistic Display Bold, system-ui, sans-serif;--headline2-font-size:1.5rem;--headline2-font-weight:700;--headline2-line-height:1.25;--headline3-font-family:Optimistic Display Bold, system-ui, sans-serif;--headline3-font-size:1.0625rem;--headline3-font-weight:700;--headline3-line-height:1.2941;--meta-font-family:Placeholder Font;--meta-font-size:0.8125rem;--meta-font-weight:400;--meta-line-height:1.3846;--meta-emphasized-font-family:Placeholder Font;--meta-emphasized-font-size:0.8125rem;--meta-emphasized-font-weight:600;--meta-emphasized-line-height:1.3846;--primary-label-font-family:Optimistic Display Medium, system-ui, sans-serif;--primary-label-font-size:1.0625rem;--primary-label-font-weight:500;--primary-label-line-height:1.2941;--secondary-label-font-family:Placeholder Font;--secondary-label-font-size:0.9375rem;--secondary-label-font-weight:500;--secondary-label-line-height:1.3333;--tertiary-label-font-family:Placeholder Font;--tertiary-label-font-size:0.6875rem;--tertiary-label-font-weight:500;--tertiary-label-line-height:1.4545;--text-input-field-font-family:Placeholder Font;--text-input-field-font-size:1rem;--text-input-field-font-weight:500;--text-input-field-line-height:1.2941;--text-input-label-font-family:Placeholder Font;--text-input-label-font-size:17px;--text-input-label-font-size-scale-multiplier:0.75;--text-input-label-font-weight:400;--text-input-label-line-height:1.2941;--tooltip-border-radius:8px;--dialog-size-medium-max-width:700px;--dialog-size-medium-width:100%;--dialog-size-small-max-width:548px;--dialog-size-small-width:100%;--dataviz-primary-2:rgb(134,218,255);--dataviz-primary-3:rgb(95,170,255);--dataviz-secondary-1:rgb(129,77,231);--dataviz-secondary-2:rgb(168,124,255);--dataviz-secondary-3:rgb(219,26,139);--dataviz-supplementary-1:rgb(255,122,105);--dataviz-supplementary-2:rgb(241,168,23);--dataviz-supplementary-3:rgb(49,162,76);--dataviz-supplementary-4:rgb(228,230,235);--base-unit:4px;--blue-0:245, 251, 255;--blue-1:224, 241, 255;--blue-2:179, 219, 255;--blue-3:112, 188, 255;--blue-4:71, 175, 255;--blue-5:0, 149, 246;--blue-6:0, 116, 204;--blue-7:0, 87, 163;--blue-8:0, 55, 107;--blue-9:0, 41, 82;--cyan-5:39, 196, 245;--font-family-system:-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;--font-weight-system-bold:700;--font-weight-system-extra-bold:800;--font-weight-system-extra-light:200;--font-weight-system-light:300;--font-weight-system-medium:500;--font-weight-system-regular:400;--font-weight-system-semibold:600;--green-4:120, 222, 69;--green-5:88, 195, 34;--green-6:55, 166, 0;--grey-0:245, 245, 245;--grey-1:239, 239, 239;--grey-2:219, 219, 219;--grey-3:199, 199, 199;--grey-4:168, 168, 168;--grey-5:142, 142, 142;--grey-6:115, 115, 115;--grey-7:85, 85, 85;--grey-8:54, 54, 54;--grey-9:38, 38, 38;--grey-10:26, 26, 26;--orange-5:253, 141, 50;--pink-5:209, 8, 105;--purple-5:163, 7, 186;--red-4:255, 104, 116;--red-5:237, 73, 86;--red-6:198, 35, 48;--red-7:167, 3, 17;--system-10-font-size:10px;--system-10-line-height:12px;--system-11-font-size:11px;--system-11-line-height:13px;--system-12-font-size:12px;--system-13-font-size:13px;--system-12-line-height:16px;--system-15-font-size:15px;--system-14-font-size:14px;--system-14-line-height:18px;--system-16-font-size:16px;--system-16-line-height:20px;--system-18-font-size:18px;--system-18-line-height:24px;--system-20-font-size:20px;--system-20-line-height:25px;--system-22-font-size:22px;--system-22-line-height:26px;--system-24-font-size:24px;--system-24-line-height:27px;--system-26-font-size:26px;--system-26-line-height:28px;--system-28-font-size:28px;--system-28-line-height:32px;--system-30-font-size:30px;--system-30-line-height:36px;--system-32-font-size:32px;--system-32-line-height:40px;--yellow-5:253, 203, 92;--barcelona-large-screen-breakpoint:748px;--barcelona-large-screen-max-width:620px;--barcelona-large-screen-padding:344px;--barcelona-threadline-column-width:48px;--barcelona-post-horizontal-padding:12px;--barcelona-quoted-post-horizontal-padding:16px;--barcelona-carousel-gap:6px;--barcelona-lightbox-horizontal-padding:92px;--barcelona-primary-text:rgb(243, 245, 247);--barcelona-secondary-text:rgb(97, 97, 97);--barcelona-primary-button:rgb(255, 255, 255);--barcelona-secondary-button:rgb(16, 16, 16);--barcelona-link-text:rgb(24, 163, 254);--barcelona-error-text:rgb(255, 48, 64);--barcelona-primary-background:rgb(16, 16, 16);--barcelona-elevated-background:rgb(24, 24, 24);--barcelona-secondary-background:rgb(10, 10, 10);--barcelona-tertiary-background:rgb(30, 30, 30);--barcelona-navigation-background:rgb(16, 16, 16);--barcelona-dialog-backdrop-background:rgba(16, 16, 16, 0.85);--barcelona-primary-outline:rgba(243, 245, 247, 0.15);--barcelona-media-outline:rgba(243, 245, 247, 0.2);--barcelona-threadline:rgb(51, 54, 56);--color-scheme:dark;}</style><style nonce="6H5OVuNT"></style><script nonce="6H5OVuNT">__DEV__=0;function envFlush(a){function b(b){for(var c in a)b[c]=a[c]}window.requireLazy?window.requireLazy(["Env"],b):(window.Env=window.Env||{},b(window.Env))}envFlush({"useTrustedTypes":true,"isTrustedTypesReportOnly":true,"routing_namespace":"barcelona_web","scheduledCSSJSScheduler":true,"ig_server_override":"","compat_iframe_token":null});__annotator=function(f){return f};__d_stub=[];__d=function(id,deps,factory,special){__d_stub.push([id,deps,factory,special]);};__rl_stub=[];requireLazy=function(){__rl_stub.push(arguments)};now_inl=(function(){var p=window.performance;return p&&p.now&&p.timing&&p.timing.navigationStart?function(){return p.now()+p.timing.navigationStart}:function(){return new Date().getTime()};})();_btldr={};qpl_inl=(function(){var data={};return function(i,n,t){if(!i)return data;if(!data[i])data[i]={};data[i][n]=t||now_inl();}})();qpl_tag=(function(){var data=[];return function(t){if(!t)return data;data.push(t);}})();(function(a){function b(b){if(!window.openDatabase)return;b.I_AM_INCOGNITO_AND_I_REALLY_NEED_WEBSQL=function(a,b,c,d){return window.openDatabase(a,b,c,d)};window.openDatabase=function(){throw new Error()}}b(a)})(this);</script><script>qpl_inl("7252775685639807194","htmlStart");</script>
+<script type="application/json" data-content-len="82" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252775685639807194","htmlStart"]]]}</script>
+<script>qpl_inl("7252775685639807194-server","htmlStart",50);</script>
+<script type="application/json" data-content-len="92" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252775685639807194-server","htmlStart",50]]]}</script>
+
+<link type="text/css" rel="stylesheet" href="https://static.xx.fbcdn.net/rsrc.php/v3/yD/l/0,cross/8J4Vh7Dx9_0.css?_nc_x=Ij3Wp8lg5Kz" data-bootloader-hash="3unTLaW" data-p=":2" data-c="1" />
+<link rel="preload" href="https://static.xx.fbcdn.net/rsrc.php/v3/y0/r/E6KZsOw-TyZ.js?_nc_x=Ij3Wp8lg5Kz" as="script" nonce="6H5OVuNT" /><script src="https://static.xx.fbcdn.net/rsrc.php/v3/y0/r/E6KZsOw-TyZ.js?_nc_x=Ij3Wp8lg5Kz" data-bootloader-hash="CcM+LCX" async="1" data-p=":1" data-btmanifest="1007796774_main" data-c="1" onload="_btldr[&quot;CcM+LCX&quot;]=1" onerror="_btldr[&quot;CcM+LCX&quot;]=1" nonce="6H5OVuNT"></script>
+<link rel="preload" href="https://static.xx.fbcdn.net/rsrc.php/v3iD6c4/yp/l/en_US/9NbTpxFQDN_VK1i3Cuen-78JswBdCIdym1Vx1-9lxcVH.js?_nc_x=Ij3Wp8lg5Kz" as="script" nonce="6H5OVuNT" /><script src="https://static.xx.fbcdn.net/rsrc.php/v3iD6c4/yp/l/en_US/9NbTpxFQDN_VK1i3Cuen-78JswBdCIdym1Vx1-9lxcVH.js?_nc_x=Ij3Wp8lg5Kz" data-bootloader-hash="x13eeyY" async="1" data-p=":3,8,23,5" data-btmanifest="1007796774_main" data-c="1" onload="_btldr[&quot;x13eeyY&quot;]=1" onerror="_btldr[&quot;x13eeyY&quot;]=1" nonce="6H5OVuNT"></script>
+<link rel="preload" href="https://static.xx.fbcdn.net/rsrc.php/v3ij4U4/yq/l/en_US/kZT9Qdvtv8D.js?_nc_x=Ij3Wp8lg5Kz" as="script" nonce="6H5OVuNT" /><script src="https://static.xx.fbcdn.net/rsrc.php/v3ij4U4/yq/l/en_US/kZT9Qdvtv8D.js?_nc_x=Ij3Wp8lg5Kz" data-bootloader-hash="L5R7p5D" async="1" data-p=":9" data-btmanifest="1007796774_main" data-c="1" onload="_btldr[&quot;L5R7p5D&quot;]=1" onerror="_btldr[&quot;L5R7p5D&quot;]=1" nonce="6H5OVuNT"></script>
+<link rel="preload" href="https://static.xx.fbcdn.net/rsrc.php/v3iQLo4/yt/l/en_US/gQS6jq0A8uW.js?_nc_x=Ij3Wp8lg5Kz" as="script" nonce="6H5OVuNT" /><script src="https://static.xx.fbcdn.net/rsrc.php/v3iQLo4/yt/l/en_US/gQS6jq0A8uW.js?_nc_x=Ij3Wp8lg5Kz" data-bootloader-hash="L6Tx9we" async="1" data-p=":7" data-btmanifest="1007796774_main" data-c="1" onload="_btldr[&quot;L6Tx9we&quot;]=1" onerror="_btldr[&quot;L6Tx9we&quot;]=1" nonce="6H5OVuNT"></script>
+<link rel="preload" href="https://static.xx.fbcdn.net/rsrc.php/v3idE44/yr/l/en_US/1DwJ8zL6B7E.js?_nc_x=Ij3Wp8lg5Kz" as="script" nonce="6H5OVuNT" /><script src="https://static.xx.fbcdn.net/rsrc.php/v3idE44/yr/l/en_US/1DwJ8zL6B7E.js?_nc_x=Ij3Wp8lg5Kz" data-bootloader-hash="WfD8LHV" async="1" data-p=":10" data-btmanifest="1007796774_main" data-c="1" onload="_btldr[&quot;WfD8LHV&quot;]=1" onerror="_btldr[&quot;WfD8LHV&quot;]=1" nonce="6H5OVuNT"></script>
+<link rel="preload" href="https://static.xx.fbcdn.net/rsrc.php/v3/y5/r/5qKf_cCaYht.js?_nc_x=Ij3Wp8lg5Kz" as="script" nonce="6H5OVuNT" /><script src="https://static.xx.fbcdn.net/rsrc.php/v3/y5/r/5qKf_cCaYht.js?_nc_x=Ij3Wp8lg5Kz" data-bootloader-hash="z6fuRko" async="1" data-p=":20" data-btmanifest="1007796774_main" data-c="1" onload="_btldr[&quot;z6fuRko&quot;]=1" onerror="_btldr[&quot;z6fuRko&quot;]=1" nonce="6H5OVuNT"></script>
+<link rel="preload" href="https://static.xx.fbcdn.net/rsrc.php/v3iT0g4/yh/l/en_US/pjkq_l5ea-y.js?_nc_x=Ij3Wp8lg5Kz" as="script" nonce="6H5OVuNT" /><script src="https://static.xx.fbcdn.net/rsrc.php/v3iT0g4/yh/l/en_US/pjkq_l5ea-y.js?_nc_x=Ij3Wp8lg5Kz" data-bootloader-hash="f2ZV5tU" async="1" data-p=":26" data-btmanifest="1007796774_main" data-c="1" onload="_btldr[&quot;f2ZV5tU&quot;]=1" onerror="_btldr[&quot;f2ZV5tU&quot;]=1" nonce="6H5OVuNT"></script>
+<link rel="preload" href="https://static.xx.fbcdn.net/rsrc.php/v3ivRF4/yV/l/en_US/kVewawW9sLi.js?_nc_x=Ij3Wp8lg5Kz" as="script" nonce="6H5OVuNT" /><script src="https://static.xx.fbcdn.net/rsrc.php/v3ivRF4/yV/l/en_US/kVewawW9sLi.js?_nc_x=Ij3Wp8lg5Kz" data-bootloader-hash="rKwGmdo" async="1" data-p=":27" data-btmanifest="1007796774_main" data-c="1" onload="_btldr[&quot;rKwGmdo&quot;]=1" onerror="_btldr[&quot;rKwGmdo&quot;]=1" nonce="6H5OVuNT"></script>
+<link rel="preload" href="https://static.xx.fbcdn.net/rsrc.php/v3iAiW4/yP/l/en_US/sHUpS5HkpnG.js?_nc_x=Ij3Wp8lg5Kz" as="script" nonce="6H5OVuNT" /><script src="https://static.xx.fbcdn.net/rsrc.php/v3iAiW4/yP/l/en_US/sHUpS5HkpnG.js?_nc_x=Ij3Wp8lg5Kz" data-bootloader-hash="zN+Mt9A" async="1" data-p=":11" data-btmanifest="1007796774_main" data-c="1" onload="_btldr[&quot;zN+Mt9A&quot;]=1" onerror="_btldr[&quot;zN+Mt9A&quot;]=1" nonce="6H5OVuNT"></script>
+<!--EF-->
+
+<title>Joy Qiu (&#064;joyqiuu) on Threads</title>
+<script>requireLazy(["HasteSupportData"],function(m){m.handle({"bxData":{"1160057":{"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/y7\/r\/s_LXY1yMsCT.svg"},"1160058":{"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/yN\/r\/MnQWcWb6SrY.svg"},"1160060":{"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/y5\/r\/Mszq4yIBziR.svg"},"1160061":{"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/yu\/r\/Ddk-AuWE7VS.svg"}},"clpData":{"1744178":{"r":1,"s":1},"1814852":{"r":1},"1836368":{"r":1,"s":1},"1838142":{"r":1,"s":1},"1743656":{"r":1},"1744234":{"r":1},"1744251":{"r":100,"s":1},"1744552":{"r":10000},"1828905":{"r":1},"1829320":{"r":1},"1829321":{"r":1},"1843988":{"r":1}},"gkxData":{"709":{"result":true,"hash":"AT4q9UstE5aF79Uw9vQ"},"708253":{"result":true,"hash":"AT5n4hBL3YTMnQWtCcw"},"1099893":{"result":false,"hash":"AT5kly2LSZV_DKGRL1k"},"1224637":{"result":false,"hash":"AT7JRluWxuwDm3XzaXQ"},"1263340":{"result":false,"hash":"AT5bwizWgDaFQudmBAk"},"443":{"result":false,"hash":"AT4h1HaIxHYZn6IYaew"},"1393":{"result":true,"hash":"AT42aEHIHsK_NxGQusY"},"1426":{"result":false,"hash":"AT4rfyyNv13TbBZ8bD0"},"1475":{"result":false,"hash":"AT7kEzfGQyTYdZJbyWE"},"2772":{"result":false,"hash":"AT5Eu244WIce7iwqe30"},"2954":{"result":false,"hash":"AT6DTo5oWw4Gi2ycT4o"},"3752":{"result":false,"hash":"AT6eS5UTkkMp_xbP37c"},"3831":{"result":false,"hash":"AT4W23lQ0XxAZniMZO8"},"4075":{"result":false,"hash":"AT4_ZQi0sTjSt-RxbeY"},"4180":{"result":true,"hash":"AT6ZBPDX_t1nVduVEgU"},"4635":{"result":false,"hash":"AT66qmoOXbBCI2VnXz4"},"4639":{"result":false,"hash":"AT6fuwnCZ25Hjx2lBLE"},"5840":{"result":false,"hash":"AT4yZS6129LYTjocikg"},"6017":{"result":false,"hash":"AT6VK36mN-p0kfQgOTc"},"6196":{"result":false,"hash":"AT79LaB9hNdhYgx4-Jg"},"6751":{"result":false,"hash":"AT4_Q5AqWq6jnR2CaPI"},"6830":{"result":false,"hash":"AT6WoYIwb5Y6x569mNM"},"8126":{"result":false,"hash":"AT4U7qG06p9sF6u83wc"},"8232":{"result":false,"hash":"AT7JZiM_jgftdVDLtuw"},"676837":{"result":false,"hash":"AT4N8wBZA8ctCdHwMJY"},"678680":{"result":false,"hash":"AT4Y-6Ul9ZZckQZntGw"},"950768":{"result":false,"hash":"AT434vVJ93bUu52yk5c"},"1018547":{"result":false,"hash":"AT5OYJhHTg1FexdZHms"},"1167394":{"result":false,"hash":"AT7BpN-tlUPwbIIFpQ4"},"1217157":{"result":false,"hash":"AT6B7YmllOsArnK6XMU"},"1293035":{"result":false,"hash":"AT6f-b10jzF6b9M9HVo"},"1407308":{"result":false,"hash":"AT6g20u7kv9f37jOwFA"},"1501502":{"result":false,"hash":"AT7iuJThg2U6GkqTHIg"},"1537962":{"result":false,"hash":"AT6YWgGMjb0fUWs1QcI"},"1554827":{"result":false,"hash":"AT7zueGLhGo0cT5xEmI"},"1738486":{"result":false,"hash":"AT4cX37oQco6DwhUnME"},"1778371":{"result":false,"hash":"AT6HtWXGEXFDQ5Jj6m0"},"1902022":{"result":false,"hash":"AT7WD_stYlEMqW8cKU8"},"1914427":{"result":false,"hash":"AT7r7RL9lwTjh6wxY7g"},"227":{"result":true,"hash":"AT5yXnJxXfkiddJS5ko"},"229":{"result":true,"hash":"AT6ACjjf9sN9o2h-SCc"},"231":{"result":true,"hash":"AT5RtBjo7qezdTuhhd4"},"233":{"result":true,"hash":"AT7HvkjZGXZeuumh7sk"},"235":{"result":true,"hash":"AT4gizq47dTbAJ5j6gw"},"664":{"result":false,"hash":"AT7734XsKztSKm10GeI"},"751":{"result":false,"hash":"AT7TXp0TTlIecYKJJD4"},"1226":{"result":false,"hash":"AT4QupJJbI3j_App2NI"},"1292":{"result":true,"hash":"AT6KRRnA6-Re_k9KVkM"},"1459":{"result":false,"hash":"AT60sF8lwSNwCEwZvWM"},"1485":{"result":false,"hash":"AT4WNLTpxBYFwessYr4"},"1682":{"result":true,"hash":"AT4jNPAkujFdMYkDyb8"},"1705":{"result":false,"hash":"AT45JGOqDPcAMbr3xAU"},"2030":{"result":true,"hash":"AT77OC0fYHb5VHYBvLc"},"2254":{"result":true,"hash":"AT4NaskuQ6OBD3qCPGg"},"2448":{"result":true,"hash":"AT7EwlgtPzpIx-1Q0f0"},"2458":{"result":true,"hash":"AT5Dy7G1iL0c6SKnmSw"},"2581":{"result":false,"hash":"AT4iw_6E9ISmVfQLsbQ"},"3140":{"result":false,"hash":"AT5-c9fjLEKqfwwAvMA"},"3400":{"result":false,"hash":"AT5LV5sAIJng7-zcd2o"},"3598":{"result":false,"hash":"AT4R-V-zd8OVuUkT1tk"},"3773":{"result":false,"hash":"AT7VZ_gM5R4NLSLmHuM"},"3824":{"result":false,"hash":"AT6BtgsnnuM5TALJpEs"},"4527":{"result":false,"hash":"AT5vKkT8tv-GUeP8Imc"},"5205":{"result":false,"hash":"AT4tOojq3gzI7IFZbKg"},"5223":{"result":false,"hash":"AT7mncAklIbGZfnPtss"},"5403":{"result":false,"hash":"AT5zCIAplAr2jSMZyA8"},"5574":{"result":false,"hash":"AT7t8_-pqYHCqFfTtA4"},"5735":{"result":false,"hash":"AT55xkQWRLxMd5TjxI0"},"5945":{"result":false,"hash":"AT75NnnIUkzdzhWf1mM"},"6810":{"result":false,"hash":"AT6JsT-epn3stgDmIaE"},"894204":{"result":false,"hash":"AT7MWh7MKvvrwCN_4qM"},"919810":{"result":true,"hash":"AT7obFlFcaXOvTBX42w"},"938288":{"result":false,"hash":"AT60802ujA6R5kZSp_Q"},"976093":{"result":true,"hash":"AT6Tnn67lHNTT5Cpa0o"},"1070695":{"result":false,"hash":"AT711tHzdMfRy3F3w9w"},"1133447":{"result":false,"hash":"AT6gnU9itzgx89tyHWw"},"1151941":{"result":false,"hash":"AT4VtFw2xNGXhISyt3g"},"1163255":{"result":false,"hash":"AT4p5wUSMH_kRx_dSGc"},"1243442":{"result":false,"hash":"AT6H-KKvL_2kq8U2jMs"},"1249968":{"result":false,"hash":"AT5AlPmWHlKvEcrj4Nc"},"1250838":{"result":false,"hash":"AT7z1NkFlLfUKocWzhY"},"1299319":{"result":false,"hash":"AT7zRIpVRWl8hiUYJRI"},"1352928":{"result":false,"hash":"AT7bJwS1VNOxBUhsKQE"},"1382775":{"result":false,"hash":"AT7D5sd_gmE2NRtmxFQ"},"1383502":{"result":false,"hash":"AT51zMR8DxFUUVJ89gE"},"1388683":{"result":false,"hash":"AT63PwzAsKGj12Q6wUw"},"1470120":{"result":false,"hash":"AT7hoNhuKStHslT5rHI"},"1564135":{"result":true,"hash":"AT7iTOcLJuIIpIfC12o"},"1613919":{"result":false,"hash":"AT7bXvwviv8GGfF3-8M"},"1616314":{"result":false,"hash":"AT6Zl4nWIeZ_AYDrE80"},"1626006":{"result":true,"hash":"AT4_TZlW-MUS84REiuI"},"1642984":{"result":false,"hash":"AT71oE1xc4ID8xb4xCI"},"1657807":{"result":true,"hash":"AT5GneaEpFhH-amrU2c"},"1661552":{"result":false,"hash":"AT5w2VaBMxRPfMyW-CE"},"1690028":{"result":false,"hash":"AT7vV-7CyHNNfGJomuQ"},"1703328":{"result":true,"hash":"AT49L03pP2X9Hmsn9-k"},"1707273":{"result":false,"hash":"AT5oTb36da_qc9QImDc"},"1721477":{"result":true,"hash":"AT70IfYeUvLOKY5YpDM"},"1723588":{"result":false,"hash":"AT485K2jwU-S2ruRl6w"},"1806005":{"result":false,"hash":"AT4tOLFFU6SFy7iTV1U"},"1861546":{"result":true,"hash":"AT7TDKkMR4gPryZgq8A"},"1863055":{"result":false,"hash":"AT7ONu9dmdwXlowbTCY"},"1872325":{"result":false,"hash":"AT4WDV07rUK5enGiSjo"},"1902661":{"result":true,"hash":"AT48eoL9MpGKmdHLflY"},"4240":{"result":false,"hash":"AT6WMihLvltJm0Ujy4Q"},"8594":{"result":false,"hash":"AT7Gfw9P9vYQkIA2wrY"},"1787898":{"result":true,"hash":"AT5WGsLz9GCUYq8U2Jc"},"1924645":{"result":false,"hash":"AT7xqjINkJcipyjZA68"},"517":{"result":false,"hash":"AT6nhZGTa49R4qYbgP0"},"1703425":{"result":false,"hash":"AT5M5FNRBAvWiZom8v8"},"201":{"result":false,"hash":"AT4alnh_4NnV8Qd_BdU"},"2257":{"result":false,"hash":"AT5Mac_Q9jALVGtdhbQ"},"6361":{"result":false,"hash":"AT6feNNR6dFIlUi3DBc"},"6862":{"result":false,"hash":"AT68ofpcSp7CAzMdk5s"},"7518":{"result":false,"hash":"AT4evLW9Sc-7F07WlbI"},"8003":{"result":false,"hash":"AT5keQOwqmgpohoasWY"},"1401060":{"result":true,"hash":"AT5aetN5Gb3reIXV9IM"},"1596063":{"result":false,"hash":"AT7JHuDWtaOqRuBU3tM"},"1778302":{"result":false,"hash":"AT65fisZhmc2X92EzoA"},"1840809":{"result":false,"hash":"AT5nYctoTsr7alRiMGM"}},"ixData":{"478233":{"sprited":2,"spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","_spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","w":20,"h":20,"p":"0 -88px","sz":"auto"},"502062":{"sprited":2,"spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","_spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","w":20,"h":20,"p":"0 -67px","sz":"auto"},"512647":{"sprited":2,"spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","_spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","w":20,"h":20,"p":"0 -25px","sz":"auto"},"514454":{"sprited":2,"spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","_spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","w":20,"h":20,"p":"0 -46px","sz":"auto"},"701592":{"sprited":2,"spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","_spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","w":8,"h":8,"p":"-13px -109px","sz":"auto"},"702721":{"sprited":2,"spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","_spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","w":8,"h":8,"p":"0 -131px","sz":"auto"},"897949":{"sprited":2,"spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","_spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","w":8,"h":8,"p":"-9px -122px","sz":"auto"},"1739808":{"sprited":2,"spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","_spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","w":8,"h":8,"p":"0 -122px","sz":"auto"}},"qexData":{"415":{"r":null},"723":{"r":null},"49":{"r":null},"234":{"r":null},"768":{"r":null},"858":{"r":null},"932":{"r":null},"954":{"r":null},"976":{"r":null},"1022":{"r":null},"1637":{"r":null},"1638":{"r":null},"1639":{"r":null},"1640":{"r":null},"1641":{"r":null},"1642":{"r":null},"1643":{"r":null},"1644":{"r":null},"1645":{"r":null},"1646":{"r":null},"2085":{"r":null},"2086":{"r":null},"2087":{"r":null},"2088":{"r":null},"2089":{"r":null},"2090":{"r":null},"2091":{"r":null},"2092":{"r":null},"644":{"r":null}},"qplData":{"1217":{"r":1},"2410":{"r":1},"6702":{"r":1},"334":{"r":2000},"1206":{"r":1000},"1517":{"r":1000},"6204":{"r":7},"6310":{"r":1}},"justknobxData":{"138":{"r":false},"144":{"r":true},"356":{"r":true},"450":{"r":true},"494":{"r":true},"713":{"r":true},"992":{"r":false},"1143":{"r":true},"1203":{"r":true},"55":{"r":true}}})});requireLazy(["Bootloader"],function(m){m.handlePayload({"consistency":{"rev":1007796774}})});</script>
+<link type="text/css" rel="stylesheet" href="data:text/css; charset=utf-8;base64,Ym9keS5fYW1tZHtiYWNrZ3JvdW5kOnZhcigtLWJhcmNlbG9uYS1wcmltYXJ5LWJhY2tncm91bmQpO2NvbG9yOnZhcigtLWJhcmNlbG9uYS1wcmltYXJ5LXRleHQpO2ZvbnQtZmFtaWx5OnZhcigtLWZvbnQtZmFtaWx5LXN5c3RlbSk7Zm9udC1zaXplOnZhcigtLXN5c3RlbS0xNS1mb250LXNpemUpO2xpbmUtaGVpZ2h0OnZhcigtLXN5c3RlbS0xNS1saW5lLWhlaWdodCk7bWFyZ2luOjA7b3ZlcmZsb3cteTp2aXNpYmxlfSNib290bG9hZGVyX1VVV1NzMDd7aGVpZ2h0OjQycHg7fS5ib290bG9hZGVyX1VVV1NzMDd7ZGlzcGxheTpibG9jayFpbXBvcnRhbnQ7fQ==" data-bootloader-hash="UUWSs07" data-p=":0" data-c="1" />
+</head><body class="_ammd _-kb"><div id="barcelona-splash-screen" style="position: fixed; top: 0; right: 0; left: 0; height: 100vh; height: 100dvh; z-index: 3; background-color: rgb(255, 255, 255)"><img class="img" alt="Threads" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAYAAACtWK6eAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAEW3SURBVHgB7X0LkGRpVtY5/80eGnZgcyPWdcZdmewQ1l1FpnrDUEDDydIYYzXQ6Q4FYQPtah8Riuh0G0JAhFpVYsQqPqZbDTBWtKpjVXxAdA+BsAGBleMqu4I6Nb5YBe3cEGSBhamFffR05f2P53+c85//VvVM707no7ru6c6675s37/2//zuv/1yAXnrppZdeeumll1566aWXXnrppZdeeumll1566aWXXnrppZdeeumlCEIvc5ObQxoeHn5qBM6vNd4NPcITjvwQCIYOYYjkRy4+Ah/+8nx6IEjE0/CP+FA6cIgHAHHdFHlflmmDdMC7fQJbnJ5paAowm37lncen0MsDlR4gD0ACED4Dnx6DpxESPsmNf40bNM8zEAhiQ8cwRcqNH8DxuvA/Tlma8CfvC7xPg6j7pk9a7zABJwEpHePyUwz7M+D2eXHqwL/koNmHM356/lNv2YdePifpAfI5yD8d3l0j8GP0+CQiT7n3l8bttFGHxgoVIMIyxOUMGDAAMGBxeb0CIh9TljM4UJiGj0mHpu+Q74J8LCGzEO3z8S8wW00effTO/rmDcwfQy2tKD5D7kB1miAYOL3Cje4qALvBNG6bemnKvDRkEBRCsPjFj5F49rENQUAhQXD5/2C6NWlWsyBS+0/B5m0/b4v6EeVsBWgRFVNkykCCzD4BZjhcw4dM878BN3n7YM8y9pAfIPSSAAtzhRuPxGW5M49h4Q4/tU+NzofHmHjoBw7CGqkkZKHl7AkFWkRQgRu0SIEEBSlLDkjgAcwwU0EW8kD7MYsNAVttAwQpgzi/nJZgGwLCqduPc7PEJ9KLSA6QjO28+HDctbnLnPBaWcFQavpOGnhumU5Wp7CONT7cpkMgY4XbeMAuoLaHfkwx0UdXSeiThC5/BmdAijCM2j8wDCChQAQUCMhDwxLNM+bhbfoDXz/VGfw+QIDsjGrpfgWfZrrjCjXgoQHC5YaqhnXtu6cktMERNKvvXdgjEfXzVm1vmkcZa1iWmAgOscBY15sXol2Wo1CfT+BOY7INWQGCGBJllKo2CVbmJh/bGF7dv24VTKqcaIO9/M41bgkvcGDek0Tid5saPoGAJ4hQk9T7swapZBjMgKmO8tllUFbKMUm3rqEQWOFldq1QrKABx0vAzgyV4idol62pVCwTI+RyynWenfD3bj8PpA8qpBMjOr6E1bmzPcQMfg2GKZFCnRhV66mJ0l/Uu2xUFSIUBErOkdWR6ftf1XBFU9kfwTEEFEioGtXH1Qv5ubeiqgqEBQmGv8FdULrFbhCVAVDVZr8uGQeyxaYaB4rffAl+8C6dEThVAdh7j2EQLm9zoNtCqUABVg3ddm+Ie653EILKnKkixO2oVyjIUdO2R3MF37RKwQMnLwk66joxtQZYtoGYgAsMjWfT6QfeT9WK/gNpAYGyZEJiE7TefAqCcCoBEG+PT8Cw3zCvcgKKLNjKEep6oMqLt+gQCSu5VAOjGN5JN4KsGX4BVACDuXmc8TnZbaeyU1TljpCN0PFOkXCEABjA9/6uyAXTWk1lfjgOyUKLO9+p5pvzZftNDDJSHHiDMGhzQgx1uaCMXYwgJHHX8whrbBjRWtZJjsk1SAoBeYxrO9LRomKQCkwEOdGwTBBMlT7umZVHB1FVc2EA8X2BiLQIcyKwCsp9p80g1m9RAKd+fT16vhyP77nrwDJRzU3jI5KEFSGCN5lOwyb/wSjGqrcHNQCEA63VqwHqqzLzYHNCxS8DYI9a2sCqUMIJRr5QxEDTyDmSN9Kwq2WNUDYsrlEEkZaWwh2zHqpFjp1GroW7tEsNuBWRZFEBmPfpyDqAQmd9+I5y7Bg+RPJQAeT+zBgXWABhpY8/TyB65x07zlk18AU1uZE57f8qGd2KN2k1rzpFduYVNUkQ9ebkMCDIbWEMdTUS9BkMxyovRHq6yNvgBjDs3um0RbIAyr6rODVat0uuS77LNowMwCx6wbAiTBvDy5z8kbPLQAeT9b6FN/lFbpUdHtSWwAxAJ9jXGBqndvCbeASY2Eht0sEsMq8T1HrpJidhhE0kw1MBgtm8gq27KFgIGE8PoGt0WFB3b4Mh+ehZVuXIzN2ymLEFHz2VBVO9gbSBR/GBK0G4/Cm/fhRMuDw1AbrJK9anPwE1+PmOXI9ES6ZZAnjTymAICVK2rbY4Cmq6NovZC5QXL+U/W+DbHgqzL1+py9Bty+jp/5wFvPABlnyQYM9vj9w55yh8cFU9V2pYYAStGcNEVLIKqrh1Rs0qDzjaJzJv1GTiU1TC0epthIoKiGqb5qHpufR586TacYHkoAPI97L7lgN+eVakKE2Blf9QGOGUvFGX1C2sgKIgKoArYii2Cxq4paexwwA11yjvs+7b9KEIzbaCd8k5TOHvn4PVk0/7c2Z8bDWYz/q2zITo34lUjR+5JBtha8NIRFG+cakn5XohSldbpn7ytqEple5KaPeiYhlMDsBxH+x7OXDypKteJB0iwN5yHm2kAkgVHsQOK10oajo9guDdrFK9UjG8QVHGQArLCFmEcBsDsBV69f+ZMOzl3sJw8ppfh9hAGsMbXy0yKT/KljTFkH5t9qodujHLI4NZ9lEgEFGlFYQtzwqxmKQCtm4w7Cg+0/vnwzimcMDnRAPlnj9Elfgi7NiinNgaAskZjVCQHdbzDWUDk+XIOXq92BlUsAknPfh69v3V2MNg/d/CmlR1f8ckzt9eghTGrls+wzTEunqckx/X8CgjDMhYIAhVV97BzDu6EClvFHohVSLf+CLz9RKXWn1iAsFq1yc9qy8YfpJGrOhVsEO9j7KKB5GodgPE6KWigNtIVUJgTDFVlO+BGcZ1BM3nnJ980gRMoxAxzp2kvON+ENP4LdkuQ4rnqeqnKfOXbwqPYEMaxXjJAsfVgA+GdN+CEyIkESAAH3/MtUYsEEAClwTvT4G3K+tGUkmQ0W9uitjP8ATeaW861N955cDJBcS/5DNwesV005l/Jnj8apbU1QGqmEPWqGPGgawvLlPwv3/nGtOzAnRiQnDiARHAAbRX1CUACaqIaVbGMzBqANbsIKKw3qqHsqUmAOiCk64+Cv7bK6tODkkP4qaB6bfDsJTTtv24gXaqgMu1a9sbzVQNFgccg+bKVB8mJAsi/eCtdopZ2xduEYBu8YQ0LBjXCvcm/qlmlilcElysAA2N2KoDRFVbBRh4OmZ3xkqw73kZJe9dTma+XqTL2yz4YmWS1QXJiAPIv30pr1MKLNugXos8hvyoCAsQl6xUwNudKjPPj0tlzBJxjEXj9UX86gdEVgp8c8R3aggiUezHHccu16oUan7R2SRKM6Sl+HeH8yhruJwIgNznOcUj0It/soTbyYHhTHeRroLh1HdnYhfFSxeNAEw9z0O/WgGZX2caYQi+VEPw0G/Kz53h2ZNcWEXoQnSy7ewmKq9cwBx4FU6j5dZ5BMoUVlJUHSAQH0B67KEfopVEXRmhIo7a1FwugBgYUdcqRsA1Hsh1d/i0f/8IJ9PKqwoyyxZNNuyaJGBo1qxDV6lQR3wk6xumUT7K+iiBxsOLSIj3HzDByOf8pRbx9ZIukJnlVlxplC5+9W5QzcdO+AUyNjN1Af6P1h+d7cNyfsNdpiyfnUmO2QZRggAtrkH7SOtlGGlfCygWsnxF/dmAFZaUB8n2PtZvcmC8IGzTywQSS5Iki3YZY5iMwqIAnLidf/AGD5OqX/9IbN873tsZnJQySKcJvCiDZDqxB4QNdUHRtDSrBQjiOVWTqxwQ/8RysmKysinXzbTSG2WwP0XipMj2X5W58wwKiRMNLBi9M27a9yMDoC6W9TiH47xsEnhs0Do829hJDude2e4MleLZ+68p4tlYSIDcf+8wI8cweX9yoZNyWKLdMkzHededSx/7IMQ8Gx2Hr18/3hvgDE4IXR/wU9kAN+PsBiMwfxyJitHs22r9yCisgK6liNXAmqFajZD8Ye0LUJ143yGpUsTWoUsOSAS82COwzOM734HiwEoxqhHY9FHHAys6Ajlr1WX2Gq2SPrBxAvv+tdzcQ241oiKMY4tLwEyBCZDymqiMcBUWepn2i3bH/hkcjc/T2xhwkeZ78Ojdqo7Z6sAb6a7OH/cSo+5jgx67ACshKqVg/xKqVRxdVq+64jCbbHd1lzadCUKPcFFvY/4JHYf3ctAfHvIXVrdDzB3Vr7Sgg7PxrgEVcxtHoH5xbtqq1UgyCTfMsM8OoBPcoqlIDqN23kR3ychr05Iv7Vj5I0x4cixNmkoMQy0huYJF7scQ9PpiBoRiaLV3VWhkG2Rt9ZnT3FbwNUEfHrWGu2bamkIIG/iQqHtUsDgA2sP7Oj/U2x6IlGO6sJu2BZgd73VKmnXmb6EhHjPqrCL9raZVSVgYgP/L4nXBTx+LKjYOfchZDybPqAAWMG1fBgwc4gPM9OJYnBB8a8dN7EdJYel1r96hYQzf7Y/b1QQNgVWt9KZrASqhYP/rWT24wMMZNjoqLYY5RnfLRG1USDFNEXQKFYrCn5MSgWrVXe3AsV5LdgBePGurZCI/lYKiMUDw2yKiGPoPMb8KSZCUYZPL4p2+zzTAS5oAqd8pXhRSkCAOSvKCmDLfl7dff8YtvXgnvRy+RSbZA87eoztk6okrJ1LKI3dYEFpnCgmXpAPm3zB7gcQexHrxkqxOWKocJIMcFDvkzffsvvPkc9LJSwiCJqnOtTh1njxwHjLSc0+YnSE+vw4Jl6SoW2wybDUJWrercKgkKStZu3AdtPlbZp3WHC795vdyXXIY47kM8VKJ22elxhjwUVSxAhEKu1g+NYcGyVID8e2YPbuij1NhbGKAEA30d8ONP43JCYk5CjKoXqmt3+50f618XtoqS7JF2+572yLHrIIJDEiFTinxcv3BbZKkq1n9466++yPdgTdUqqEcAyrIOibUlPVW1oulv+Plfe+JUKxpyYO3OnSF4twYUEv78kBE/tPv4WJGFe1+PofLilANFB/CGM1M8OH/iYjsE/7aoWnCcigU5dT6vyXaoFMEzbLOO8AcmsCAZwJLkJ972q2Nu72uljm0GhIln6OvNAKogYImo821Dvw0rLgkMMwZCu8ZX/RT/sDW6c3eUSoaKZwegvJMjTdNrD2QVJvXkV18Baj4cVJZ9T/CCQ7cP7SOTFKhbZWlZ1QLj+j0aCymDrHxpD3q8qGFxrPwEFiRLY5AX3/orOzzZACgMoe+4yOpVEJcrF9oXX0owkfe7de7nH7sIKygRFK/MNvhCQ7G2NfQU2UHbuxRgs5iojNOEF9TVeadYKiSZrsws5Ryh0SA+D55urUombFcIfnQLuqMSUVgi/BbfcfkCHM82szchXFxIh7AUgPxkiJof3r1tsz4FJJjTDXQZikplcqxyc6Fz51bM9qBHf2LMF8aNgJgxGBS54UccSIuvNAsbKBO0yCaqdimCqSp75eypzMkJ9yQ3sP3KXVghIdjjTqK9DYFFdOx6uhnpV9/LxUvlzrAa5slvN3BxCxYgSwHIf33bJ7Yw9CTGngCja7r8OgBhDlsTN/WokUl2v/hjj1+GFRH6wh/f4Mu7xLPjEvyKWyB5YVB/JxEAHgGIrLAAkancmQKYqH75Y47Rr4zrprxtl6c3VoVVCH54gxB31KsFtpDDUWDoPFajFg/4bp5bBIssh0He+onb/INHcpMKSHTkH5T6ut7cSNDcqwHfoMdXgD1oyIzRxkqPY32oknB3JFLcUa3SmiOT8tbZehfl27ysYQWEDpt0jg9AcbCN7e/YhRUQBsltSuPQoR6jDtU8VbaZ+aTO8yLCH74Fc5aFu3l/6m0vj9kzM9KxG5hiG2E6wFxKFEt8I4ICSypJWke7ywYHDT808m/88B60ITHPj4s/P3+w5Wn+oHFnyjzalIvyQZB5e64SM6Dqe2zDkgsj3Vc/5Ed8nTsE/+52ypNatrTbqIb4cR9hS6p/D4rzJv72Z2EBsnCAsGZwSaqMlEYP1ahBKRhdxpSnwKAY783A34AlCn3Rjz9L3r2YWMMAQho12t6u27ChBkxsBF0w2GVzHgEO1iDC6vhXu3IGChwySD64CUsUhN+3C6loHNj7QDoNHUvpFOR+ld8Z148Jbg5hzrJwgIQqJXEkIKZs3RRBN5VIAns4SNP48QUYaYTh5PGf+fUTWIIEzxSD4zkGwzVmtWHdUKXXlgZfgwRjFZDqAcO9es8KFCbyTHkeu+yCwlg+799CDbIu4/gtgsnNZDQvS9rr9X0AKB2JAYZ0AkfuU1j/6bnn3S0UILd//ccvOMBhYgQp25NAkUqJSn3cXKInq15xrEe+SeSWwx5BpQK4uweuvZIeUMvXKQ0x7gG16tTGT+oNxYbKXjplgnw8dh+8UZuijinASN8jxirZcRRx3w7T6PngKDOlVx+8yCAZwVJkdi2wCOV7Vu5TBWR9QVF3fbbWnoI5y0IB0iA+Iw0f8wjABA5JHSFlFlsVMYEoRc0f/9nFv7SeHmNwIOwBcrAv9HJoezqrBtQfUpVgpmCgrv2A/ugHqHO+0uhLVLlWPyo1TcWA5NiU8mAow94yQBI8UB5mN0JHI8wY7lFSq71mcR8PDN1/TPD+McxRFgqQ+FowKLaGGN9JfSrAiK5dAQ56dfXyigksWCI47oax1kF/D1LATJiYJDX+2RFGQPTGhemPNvojapDZl2rViCqVipInRy4ypUGXeayPvQc45BpGPF0KSPiSb1mgF0B0OpEKIJ375YKDZK7XuBj5udEvjrnBjNCoVQ34okblhpcyelu1OUQNSzck6K2LkwQOn8FhG2hSnRANKNIRxlA3xnTV49uH3ZVsP8ixhhWww07Hfzo9Ltprei2QtAu3SZhFJtwmJoktjgOF/W3S+cg9zKzo6SmYoywMINyfXmiyS7fkU2GxO9COQyewNZailwtp+pafPbewiogRHIctq1UZHNZmgJJIpz10ZThTeYjCMKo6ZVBhR72qjgNlCWuDHN9wOsxTqSBUXoiSR6NRxytm/q3xte3AooXo+VcBLhQ11N7TkuWbvFk7cwP2wgAyIHoqGeK5RE9kDhktKGnr3iQkWsM99jDPwyJlFhpLOyoqVOnBKDd01Ebd8RoF451sj5dtEjTemCPuXDtvWAQsYLIdouCCwhKd7yrXYnrffH/jb6BuTCWuu9DCBxY8InOwWzOfvV46opamuGuXUWcbMCdZCEBeHr08ZCpdEw8VQhkY5fIDF0Mcs0sULWjCTRq4XViQ0Jtf2OSHNK57dJ/dtHHcOygbQJcNol5cemgZ8JN/izz0oKIRHscEli38UXtCVSfIx7f1dwuZWBYxkXzbQ6efVjdOvufPcaR7DRYkKV2EJjUz5uvvMkZsO611+YbjttN0PrKQdPcW7o6d7QnlAYW/VKLHlYdGvVtRpsPpYtQreuyDY2pnW6kBlWtJPbGIz0m1xpag0nBTjlT6vTmpUt+0JPsiYsgj4t/UvgS+mUIY7xFe/xaeyCu8rfHDfC6Ot7hR9DghPgkeWRWiYcyEJ/2CIlWg0KdtunN3t24elMjhDv85DwuTGWsHOE7zNXNSla8V3kUPL/A9Y+N+sI9wee65WAsBSOPYHee7aaxp3mUVQQZCVfq2jkvHCSxK/Cyw3VRyhcDaGPEZlesnzT6G0jADkBzU7Q1kH5ry87/Bu07wkxcmr3odh/feRGf+9Zp3NHbxvecQmU5f3xyvp4MapM4J0ACrC5B4njWCH7iC8NULqkd1uAs4yK8+8BnL8c+UO8nnEzDw1iIA0ZWFJCu+fO7/hYEymbYTGAhKopr2YmQHyhTVgBxd/KLpb5x7YpoIPfZDI+/dFsdgLlWDMo5JPEQwABGWsf1A2jhhGt3GT16cwAMWOhuu9XDLhYFE2tZtomNFXXBE0wK616m5Mc7OLWrcBeGN0EaYJemW9/RScAEzIKawZJk7QF4e3eYe+czL6atEZUq9MaJRW8hsCxeWG1tQs+7i2Te9aXpu4b0HvfkHr/CFbAaVJrUjr6pKMHDT5Rs9hzq9MQUVqrmKBw8eGEeu9ezNEXi3x/Q1qtp8dUlYVEHf2Y5gRvTJpnZh4y7YEzVaBUB0Ze4A+dUv+b9j39Ie2l44qyXdcQBoMjcNWPbfMP1NC9SHa6HHuOFRsxOqaug1556XQH5HWq5Zg67jL3/twmt00SPPb/HfzdTizeXYqabNl0FXVF2/ygH/3oWxyCrK3L1Y6Nl7hcaFKynLJgAUq5NgrlKCbXLrZu8W7/cCLFHwYxen+PN/cJ29UVcxlME0sQtUD5O4dOP0gH/A+jLAEa/37jNbHPu4DMcF3jSzOKR3tPW2I9H2ePzQgz/VhfjmDhBuWE+JZ0JcdFqyR4AB4r7LDc6RLlPjJ7AC0vz8xWscrTzPDW8i4zxIYxYSK/FshLfn8eNfM4ElCt65uMvXctkGLkljIuIMoXK/KxeyrwJz3EktZNzFqsr8GYT8yMUktDYD47DMd6eYAmyYWSUsuzPtwqLnryWRTX7xa9YZDNvKICUIdwBnmDkOvn4KKyB4+Id2+elelQwAtFF7vfYSK0GXwBHjVNWHhgT/agynVOZug3zqN/xU5TpxuacSUxerEXCQVS/IVUz8wSP/511vghUUeux72Chu92J8IrpN3UX8hfcszNN2v0Kf9717rD6N1UAXYx2kkASABFQoOyLwiC2CE4SvXYdTKHONg9z90v+11pJQO4Dk/iRghBVeffS2cANRzuxEWhn26Ap+LDLFOXrLja0Q4ml+4RtWDhxR8JDtkcGL/AyGtRMhTWOUSZwmSCaeWDlQ1sLovdNorM9VxTr0s1GVCgGiarVRfUL0+hE9HmEWDfW0frZUA/1+BH/h0lbDH1hRwTsByLPrMf3F5XQZLLYImuxjkqlJlckA4aj+py/AKZS5AsQ17RrGpD4BhNgcogPP8rpklzRmvzRib3UZ5ETJ3bPXmEEOkq1R2yKkSZFtZygvQWfo8FNwCmW+APHtk2CM7zSf0r0pgkOS7SQBMAMm7nPIca9XptDL65aoGjm6fowbF+o0+7I+DoF11qPlewZ50MINfRjYIWa9ullq+KpmJTC4qFLN4rKOzMtM8shPrfcM8sDE7SoI8tgQTZ03cRLUbV0gBW/WzghOmcwVIN75EartERr+LIIlql3Z3ijDVWdFtYrAaafQywOTZItwDCerU1ABo6Ty14OzCsuksSOhzNHpkvkyCB2OqAKGDDyaRbsD8jbMnzjvDtOym02hlwcrFNLKi81RVT7JjEImw0GCtsosDk6dHTI3N+9n3rHHcYJZch3aOIgd8kndjN4cF4mp5TiFXh6sDGDCsRvQ8BfpH1DVC0iHj6Q4iXX3wsIGUq2KzI1BBiF12UkaRlKrHGaWCFOaxah6GqMtDHM3GueRTdwrH4VeHqjgpy7vA5qKhsdF1u0QXhNpjzGTUML0lMncGIQb+xBz8ClFZ/Pw0zxuAh1mBkkPIvVprY68Yz/XFE6h0GPfNYKmGULbDuNoQqJckMD0ZdEcaNJ8G7eFYas5iDeYQsjCPbjH4KLgOkcptK3r0gShJC1KBj/moG4aDj2k9rtGCH9mCqdE5gYQD4cj1Ch5AERaK/kNsSoIlsol3UJsTeOn8JAKjZ4bwl0Ye4KRw+bJ+IKd+Bo2HAVmhcM273iMKkS5UoM25DS4o1SNP4zb6IveFxanSVXlD7UfBWz2oeV4CJgRh1jmUyeWV8u16vfm6YA1g1l4rcLpkDkyyOHQvmOOhCWqdHcA0PEfRtdNA/QfmrQGGm0xI3zhhRhs8ziGQz8Kv9bFxhlUS5fukwyFhQwCHT4rI5xMDpW8nk1Ga4dzUPedftyYAUcgA7sYfJTPj1WBBzMcOp0sDyeGBDYZf8//WwrnPD0yx1ysw2Fp+JQeaFyWhy3p1lSGrmqvFp5Ec6IBEkEBn7/BP+4Z/pnjaGflxpcaqFjC+b4oMGSKYPtx2+tLNRLig9A05IQZAnlRnahGURujsk818tGeGiUXrqzDPNKQ8rYGTpcdMjeAELENImoVCJPncSEyqtCwSunO8v4f+ZNTOIFCX/LtY5jhM/wrN5gdhsF2QFvEIRvB6Y1TUjyhaqV51zSvuNGx5U5Oku6jmiYJbLFBS4EJgMJAaFQlxDzylgoGyy8wnZg5d5ldYkX4xcvcADJo7j4Rm30GQnwWztK/L40jrsx6t30YJ0joS7bGQG6TDetxGvCVG6GqSaDsIQ25MCaEqKraA/KyttTmsaheETPGTavlU+S7oDAJH0OZQur09cxCKE9CMquFMmSfAqji9o3zb4RTJHNUse6KdgxJxfLZtswJc/GhW8MclFWiUXlChN6xxUYr7fDcONXrzb9aQZAbImZgWDUqUIu0QxcyC1wNCu1OfOc4qvuReE8xDRMQ28QV9U0NcbnVWd2yqpU1Q9SDVdsz0qGt0dnnxnjn6gROgcwPIO5wmDok3+mVDHtUPZY3yydD6O1/aZP87Ep8mQ5kQJDLjTm3tDwRrFBumOhF7XFZ17c2BhW2yeelbKOjfdmnZRPDSgJQQlHWSnEGizOhKXmHbPUWXgC1aRCKe4BPu4Ztu0dn/uaE19zAw2/ZhYdY5mukoxkQJW5JV4z0I8xRHuIUVljoHd864pZyk9XCtQKGbBugsCNEsKQ6uEkVKvyBsYdPxnQbWyKSMVQkGGRGAEayISyWiTR0TwZ9cjiCuGdFi1XvlTBGvkbpn7QQtwKITP9FFaDyhnEYqUjN39jkZ7r9sAJlbpH0EBUPH4IQHb8bs3mZVXj+FYAYQTdRdMnLCusc7xuOWVGh3/wtl6DxL4Jr19IgpDbnK+VBXyDzMggsqZT6Zql4x9M8ajatVkSBkkmb5/Xc+TzOnF/3h5SanvOmoBqIlo8Rj6EreVfxO/W4+ni9DlNEW6Lt5KrrGzHId2jw3j06+94RPGQyPwbhSHqYuNwYCjvIsmGQrtq18Dcn3p/Ql/2FTbYztsRdKyY1iNs27iS/1ZWe2sY3wnxmA8icIkZ1pf9g7u0pzZeYiOUGKLbJkXdBFyMc8uVUlR/FSJeSrxpnkYn1YkHxr9lnKc8wLY/pkG7T4K9dYw/NdbzzbVN4CGR+TTEABDN7CDNEdmAGgc462Sd/mHU+ASsm9OV/fpN73C2QkZFNZo7Yq3tT0T33xE6yYX3ppc1+yipxGGyuKpLPhSbT4GiPTlHdwrwv5eOVVSo2M+M9UgmfzCK5Q5LBbOH3xFd9yXDbY3K1XFu9vkGvTX4X5usJdbTu3t2jZmsDHgKZJ4OYecMW1mBX9Z3A2iS8+8uwQkJr37TJveVWCqQxJ/psCaCNfrvcwTvQuIa6XVFtCbDeqxyvwOzhAvH7yXDXaGgX20IYR0yBED2XXt3G/tTO0aP0l+jxYvLEbOuIP8MOckCnLrGwpGRIKKuoKy794XOP+Hysdm0+yTGhbYStExv0naMyk7J4Act4kMIo2d6AzCJYxobEbYMZrIrQ2jc+yz3tVik+0WrvrQwRe9NS2wsNE0RjXHptsReq40AZorZJEquUelag7IDKBtY+kCnUTKbf1WEazeBNx4rHS+bJMFZBXV30oe74crRdvz9soivBXqOz7Ao/oTJHN+8rZoFq5hDqsDqzzntYFaGv+NMjutvmVwBILw+Q4hWkzAHSyyMWX1XuTRGKu5bMb0abFSgxIb09LrFHsXBA7gvlLi26iY3NkC7HQYldBJGkRyiEBqR2jbp/jYmULrEAJoojZUW070HRPC3IDCPWkbia474juNu+SM23Xcb2vatZGulVZDEM4uw0r3emZKeb1R9sYdlC4ytDODzcQ+3dpSJI8gRFRnBHdf/yijW7Levv6s0C05tT/Yne4myPoPU4GaYIx0dmsmxgj/Gm57c9fQacy4yXh9ra8wjjYNebpkwn5YFI2Y7yK+PKG7PyevV2xZcB3ST3rZtwwmSegULDGmYadd/ugwOzT9cbsyT51K9sQoOjNJYlM4IG41zutV1SSTTfCQxZGi8WgM0qL3aEBAMjebgDDKnpGF6Z4D/BrfgAWs/LTTqhn4Wi2AcwG0DJfObeOZ2eHSIcrPQ45JjEE3y+ITdiXgcpTiOBEPMoLGOoUQNluyQnJiaA8rw8lQwBX4BXztl53vXz3SL3LYyX79iGEyJzDBTODuJDEznOUFddoAMSDL715Ql9xcYIaHYl+WOTOhIDnKL9kUnADFNyeTxGWNGmfloMeFWx5LcndyqrSBM+30vQwAQ+9QUTN52PIUujrTU27YbBmuIf8VRYA+ZlRvGSoDwBcQ4bZBRjPMyEDi7+fJ/7hPxiTVfUtQIiAxIF4ckCyfwA0rRhaGcGiAVDEN9Z7mynJdsh4XXImBp76ikTY4AT2yNrppISEt+zkd1CpqcmZZBwXMy1mvCO4W29u/hfri3Es4PTLSmdNOHPNXqMDWbnbxdmyyCJP4OMn0sNjeh8KH0YHasZFLbJqqcSSzm/HkueQfIXGSR/a+VBMs9Uk5pubUda3eB0E9XOPQKmxQr9zm8Yg/fjyjwLMQ9N/JMutBjiYMd2oNP5khLi0yvYXvq7E1i2DGajFKyU3yAPhArgAcDWSgYoz0iZhWQtFJUvs0elst2LSdj3S+4vMEj+zkqDZI5xkLYAxLoKj1GrbC+Wt41gWYKzSyTpIAoCZ9LWPZQxFuYHxZ9IpgOIKtkB6x6X8T9918p4b1qEYQPGdjCGSOqkfMUfSSj/JfVYldT8MopRbpF6utAkSSoAZTF6wLaouTrF9rkbsKIyPy9WM5sGjxRlDxZFT454rdKH8kc9W1pEbjkqFo0vjPi7N0pR7baORbjksSGNYOdltFFzyc2ifRjg+VUCRxDE2Vq8550avVLAWrxT1PXQZc9WqeVbPHAlWp/vkcZ80jrKMZgqtuLUC3aNzl4ZwYrK/EYUxjEfvoq+QscwRyg9UScfe0mj1tw4NnCxG4LEMHNmCo2Kt5Ai52l9uvRgnCdbBcnfwA//ow1YQXHhXetAZTgOFnvBPoZih6T7UQZjmeclx+UKNTpQFNUAyapZVuUq76TOD+Eu7RFcOY9wbeUi7vMs+/PRojN19FEstF4OqA5fDkDQXyqqk+joApY8r+pFftFMcMOqJhnVr338sd0NWFVx+T0hEuTTfsmoW7lBi2JVe7D8NKSSaF/nil2h+ZpgXMTd56weDChfHs7n2k1WHq7CisncVKyoyRp1SgODzqhTSvMSaJoV1evd4xEsWFg1WKPGayBQPkltyKpVQyVNJAbCzPtPkKZwBi7CKgv6NUlilFQYsAHJ2BeU1BerEoXfh7/0t89xo9/WlBhJ1XclQCgqGnaDoDnIKKoW1R6xKzT4pjGsmMwNIG4QbBAbLS8gEduDZL7xJStW918si9DTF9bQtUM0Ee9qTIWuTzo5Na0BUs6Chdk2TnansKJCX/rNaxSi2vIyHXkejY3YS7ZDti9yxD5H/qfhPPjxv7PF8+djh+CKQS5Zyynr10OV4Zyn9h0kaGsAJxtoh1WtlSoKMT8j3YcXttjeNbOEKw0OtNEJqxijcdH1l7AdgTUuxZC16epYluMQjTpFfYof/Ge7sNLSrqFNTxdPE9hGTFClyUAZpOUdvSRnwl+8ts9te50Pnqh6LOfLrEDKsgCacBk1WHECgPlElXYEg7sr9drpOXqx/IF6qXJjIycvyDHru2pYKF6Q1i+2Jxkcrh0BRPg0vqiCdn3+TZLV651/HlZd0D8VnQlY53EVRjGepsbci9zBOYzBxnK6g2tT/Pj1dQ/t9SP5X654t6pXusVxJ9ZTZtanczy7SiwyVzevuEr1/YNVMlwGgmurB0XFXTqCBYpHP6LsphV7o7I1GtHD8++R5bBPE9733q5+pqrz42BDSVo9aZKlNOj0e0uSIRRVK87fnR532uaX/v4Vvn/bR7QAELXKMhOATTWiTjJlTGx85M7KsMgcs3nZBhGVqrExgrZWX4RBmgyiRpb9E7BAcUhPoBrlVsXK7IdUQGONc9n/0dlKvw2LvowN4PBCIyidAFYjCNtK5T2S4Yv+AH/2O+/5G5uPf+eWJ7peRk5S+SCVrGEbPwELHsjT6EFbGRaZX9GGD3x4GtUlLAONtEF16V28GmIQhgdHfrHvR2+KTWSNS7J2hvFqBQYpwUJuPLdurfaoOWIXtt5vSBkzaIb9GtukeLBMQ49Zxq8uzS/9A+75aRIXUooNKIsoY2SQyHlBAGQ8WsFB88inV4JF5lseIXg9zE23PXJRp4o9grlXy/s9CYsUw2w69sN1gSwAym7M4n1b/SGljR+XXl2YuzbOC2uU/TRLoLlPG2t25yJ3HNNS9cSn9VaFs44ArfLioTLaAZ6FFZD5AqShg2L0JnciYWsoPj0krOyQVoatjujC2uJoNoy1ELuiaUuv2ogBK+5o0muM7zNJjW4EKyy09qc2whACqlSnwuTqWbQqplF9cgnTyf18Fx7sHvCzuwzWtqg8WGDOCbotpa/lfWP2Agzp7J8ew5Jlvi/xhNlLILlKrozXVu+PtUUaWTa93JkFunrRf6Ly5jgqY88bMz5cGCSAvQFtXHThwghWVRA2RZ06ErxzNmYh7vdWVeIcC5ri9Dvv28bCj333hP161+VZkmUqV4bmKltUozPFoxUdIhdgyTLf96QPgopFtV7vPHSjt+RKEqB1/fK/xb0TD0PcRsBrVT0wILbOBVPIrYlG+xhWUOhdf3yD7+vIMjlUXjqfWbw8C7C2VtpnAp+luMN2i7vIAy09pLGO4jErAcjuBzL74CVYssy5RFuItHqoI+nZA2S8WGh7a/UWRdVrcQAZtNPCXpAZzXpkspqg19YBTdM+A6soDW2WlBLq9Na1faWZucYuyZ6lG/BZSlC1+LzXSxZvPmc23CnXutCKR/EgMOwR1yxdzZovQPzhRIxB9U41vrh9mzZ7j2rVStQvdr2OYFHS0H4VHMtqlNgfogZWPWs9P2Y1a6XSJOgrNjYhs0fMgXKlx9YSps40YGeBIdtYvfrp757A5yJn4RoD4ECBIV5B8WppvMVE1oMYG4gDsGNYosz3Pem3PjKl6A5tDY23aoxroMoVA72Kkwzap2BRMrizX0XSRR9vKFcdtODND7RJPWFWXYbweXeegxUR+qqNtVgJUq67ERvEuN1zp4QGOGBtRIzHfdbsIYLTwCJwIzEYxk+pUZwM+GjrmQFZBSQp1Zg7ycW1gWNk7lVwo4FnPFWIVoc3Kkxje2UtrTOkjXeMYAGCu/tBJZjUTgNpSL5EzpvkxRLmQ8MkbEdt0Nf/3kuwZKHxxgjw8KYpu1M6JWVE0zEZ93XxbkGaercLr0cauFVl8sYOJV4laMqJutU78ZAEpqW+m33uAPHoX6hA0HQbYBmZJ8BQT0c01A/HsChp6IWSQkJqh2i2rvP19Unqe2PsEqRr9J6nl/ZQafx1I/B39/iaRokB64af6vqW30QGJJWalVh8Fz/y+rKT8Wd2udMJ7n6qqszrm+SM6xdl2K9E1NP6Ib3hG5d2P+cOEOfa/eyyA5vdW3KuMv2rCmMCdryuwQUa6g4mlZqVGQONUY4dhqHK+xN/V6hRtUff8HsX7qKkp9/DahXsJa8VKOvpvW6Ksawp/Tb2IR2WgKQ5sw0PQpBuQGX7mKG74vjIBnpMle+CxB0+vACBM34f4tgJqlgEq4bYaqpH2S/bLgN4ChYk+N3/cRJB0ljj2xjnNkHRsCI1oi7yOVIKypAZ8SZ9w+/ehAUJPf01z4Kf7YlRXjqjcr0mETQDQGyQwtzSMfGxu7j/YMa2tIT7ZF24UFSrAhI7D2DrBfO6hxggAPuq42J71LWoFF8S6DTSnphnja6MFuYd8tg+T9LbGqBgY1Qssw2F9YJHbuC1gaX4CG75P/Z7bs/+6O/egDkJffUfHtO7/xCrVHSNr2FoHQnigZNBXmjjUGEqA5YyYMimnwA8GPaAQETBm0m5GEzxWGE3BysTBklRuuICXtqLQxEWILTx1hcZimsyFp0g6ZvxZZV4zBVpPk7e6P1FfN//W0g6OV1ZG8IrdJtbyjANxU5PSopFE5Unh1oUTvInwgmk2IO8oFOOoykSG7xucAN3PzCF1yHBnexb2OB29gx/9zhV1En3SmJxsfh1chRlLyuWyjt5m80y73yu40/8qweaLOifeM/L/H1D8qh5jOVa8r3UonuYrzcXAye3jwf/8DwsQeZYOM5Iw4a60GRVxSQDoCSoJbF1qXh/P6AxLywEIHht/6D9pi+/7shvhu/Xy4qXLRUU0zWmBpjfQCsPF/ODj3Vr81tr41uccMQHbwHMtujS0yFtY58byQusn01hcHYfd4/PBqavuzCCNrytq1njcz0ZAEGtX3PhrbZebmcucyq3NFfhC9dAaF9HDQnoRAYcAmySohRTOBui4A9WmMUO+BuG6JzWvYjVTrwUeEjvXik3MN/5VEtrafGlxTDIn/h1F5jSb3YHy1RXIeszz5KhFr6RB/j3fm6h6e/057/8Nn/zSMO8yhKJNdILa/IbbXMPLrV4dRvZ4wyj2N5S5tMNmKZAc1wehiLUoL19vT8pKCwb5H18/hEeyzQDoGaODDJZTvtexA993wPvjGj0R27yN10g8xsiZuP3Z9CYqd6nxNwH+MvfvdjhD1kWwyDtpyc0OAPy9tXyhmPMTyfdi/Q4iy6auhZMrr4rj43x2scmsChx/jJfyV585wZJ7avMCrlmLxqVRVHu81ug5L3NXhXKTJwuVxQS1YwsYEbgRDXKAUr9biwNPmzLjZ5ypceouui7ojNoITOFEwBTvmbMZoaP71c3qtU2fujWXJjaI33CkV5aZg3M35+v0/t4X8IbvMQ+T28DcEtjkEUY6RyEOzhgo3WSjF0CiUTrgCNXqoVUuUImgOjdbAwLFLz23yZ8TdfTNbcmntAmL0u+NtTcrOTF0lQaifMMqLiKG1Cvl42fFE+ecQo4k5qjkfvs6DA5YJgNXnEgkMk4lkxk0nl77vB9YIx22sd/d2sL5iSxoWVPlUTTy9usIP8GrNPhJVlL0bJ4WQhAojQSMJSHW49VJ/FymTHhZFytLhZ1W6zgc//jSnD7SuOkQZsavC3dGUHgTbp+8WRFIEidrabVnC5U17HEfKg01iYPxDIp9qTxodzgNU0kZyc04v0D08EU1znYKLmml1D2HMZ9pvxFc63n5QcS98iAzrEQfbFoXpdiJdk+cVSnnyxBFgeQgZ+Q8cHLqL3Yq7qSahAbCube1jzQUH2PvvXNY1i0zAYXuTFNU8OG0ki1h4fCArFxE9R5W8b1K5nKTWEVSV0hWxbJxILSfiaOgfme5dF4OtbCddL07XVIqkcVMc+NMWRc0+E6Tm5NYZ5iXbrJjEvqlpOOwJhiEmkH0USXh5CFAQSvHUzi0FRJJW/yCEOJIQiz4AxwkOaTaiMxhqD3zxYenQ5eLb62dW5Q0zSqkEpcpPGlyITGbzoZy6JWhs/ASyBRVSrKU2zScWUgmWEMCejl745jZzKwUEsqle8DLconYJRrtWprPGdIAbmIkw9MYc7C2tMbU0AS0jWmsefGHrVpJgA2HSUVm1uOLI5BIBpqz2tpmKw+oKY3iJ4NhYolX0fGCDT+Em0NF26w4V//yJQf3Tr3ZtOkOpXIOmUdX2wF1Kg6lWzfxvTa0tCzPaKN3tnjoDRkFPXqKKtQtnsSAwNYFUvTY0raOmj0PAUFp/w96/gjP7iYaizBVRsbe+fZqmpVpuQsmwDAaWCQ+GUN7VZpHFnXTj1rm3u4Vnu8UlxO9eghzNoxLEEiSB6hdbZB9iMIBmWQV8wliw3eGN/ZLqlTakoPX1hHQJPsFGikHOussGpl+Nu8MFImPnLORhpi2mbZh6dTfATX8QcXBI4gjj2R+hwBjuZjgajSJUesAGgKS5KFAoT1+X02DA8KSAhsJmkpKlAbs9pIEniWVu0Ctz4yxb/6k+d99m6JYa1eKZeMeDJpKWS9WZqLVrx4CUykDZ7UdoGiCsn3iDpqM6Kxm0LSms6nALDklPkb4L7gPN6av1pV37x2rbAG1SqVVlUEHZ4b/FYKEodTWJIsFCBsh8QBNOqq7PR46Kjoyc40MqfjQ8K6MX37o2NYojR/9X9e4Yd4ma9/mty40iAheeVMEqB4pLQ4XlNAkBpAa+yRYq+ordJkV7hmPFMNloFhYps/hr7rCQwj+642N390Y9E1vGjtwhp1PFjKnBKlFHduZo0YHynp75+AJcliGSTIoL0lrk8b5ziSIdvVpZ0t/jDbhCULs8ku/13nCM0NtAyisYWuemQab6WG2R6eqt5fvVw6XwY7ifevGPyWMbrn9bd4/jx+77+5BkuRVDQb7Xhza4uIelXZHRk0LoYTl1a1cinWD/0V9zKEVIp8EyKdai8CtVGGWK5S37sc/rhz+G13prACQlvvGHEj3IJYhUPSP0rqiUaqJbExplDkSDKZ7d6V/aPjxqSkaLJhPia+LBNNuog9T75PLUyYerbxn0wmsEShd/2Bm3xNFzR1xN4fL1a53BuX7oNmFzQhiHIR/+/7llL7ePEMEr816fBa3dv2nvZTrTMxhGScLp1FRKJt8pf/1wYM8BzbJzdCZXu0doIrKkWxHwjQzKegoonYV2NPynHiDo7eM7MOnGXlUEibvW7v/+D6ssERBWlcj/sAjXtosQZjn1TR9eR5m8KSZDkMssUuP4cvV3SqV4SFXiEba3KVTmfydLCO33xnAismtDUawpmzF/i3XUrp6KiJiqloYG4dcWcsbKG9K2jOVkkFB/NJ+5bEPwqmz4R72ufhC87s4rXJypRCpd/61WP+uxevNyRwesuIjbJJyjlrlFGIwr6RSQ7w9s5SEhWDLAUgQeiv4V7qWYzahDnBzubfSDuK85iT3XIaunMTvDpbhxWWCJZHPn/sPV1w4J7k37Emmbc6hqNSo5xm3AoA6qzdDCgf9fIXIKTNwxturRIorNBv//07/Ns2FPzeld8gFRxEpfJdVSt6PSb4v3eW9oyXB5D3QuhZ944YZnJZ8cqEanNDMio9yj7k1hkkEzhBQt/+jnG0wQDX+Ac+ASa1PYo0mDifUuA9uI+6kA7fNvtweDiNEf4VF/qKd48I8XYqrGLtLzsvnQLmdHdhDic22Tb+9O4WLEmWBpAg9B2wx5cwVjcfGN0TUP3kMeU85Q1ByYPXCTca9tBchdWvsH7KhL7q6Q1u6DuBJaJq6bOxIeqVsAi5rDK6BJLAMsIsngOaP707gSXJcox0EYRt0PycdJ+C/zt90jq0qRQNlDSMQdrOyyP/CDzQ4aG9PCBB3EyOO4rPlDqpQ6RuX9IIuj7z1FFOlwkOgCUDBL85lNnBaQwKxYogUPziDVXzKS6S3R8Oi0eEP87B5t33La/yRS9HhcZPPxs6rxQxT8FOzGV9qkh67hgVOPpCHQid3wSWLMtlkCBI2yVYhMoSlEEDAh7dB4zbFJV5zhDcpJ3ljV3upQi9+90MDGZ1DQQadTkwiYDBGQ+lBgZB3cB83A1YsiwdIGw77MaeohNRRWWR4ieXjN/0Xg7osAz3Vh42oZflS3t3M76EVZ9fyYqw41NkTEsavIVm33ASP8X/tlz1KsjyGSQKs4hWAQS9oZL6rPZJBgpaRsFkt+TiyFfoH3PsoZelCb17vMFq1AZpAmKpg1WxhDxXZROfTlDU521YAVkJgOCfiy+jn6ge2pSbWIx1jOu7FA3GbokJcQ1co+9hNull4UIXxsHm2NTyopU6DMVurIbZ+jJISrdByByYwArIijAIBJff1dDY0ahZMpAfXN3rpLEXZr2OuIvbh9DCXg+SJUjb7vCzGNmGTs6m46dAcLFLZPw5ZLtTgBLKnv7zKayArAxA8M/CPru9r9sKF4VJqAJIZa80FjwogdgRBKP9Zm+0L0roD37VZsm5Ii2/iqomk7E3jK0h+WMAOYMCQme5EupVkNVhEBbXwBY2ONVYRwUMqoAARs0qKhcV+yRUcnyFmaQHydyFvvarNmlAW8ocodMyg+K0IIN4HiVVv1PEISdlrgx7BFkpgODl+Lquy0fUKnX7Uv3Jhl8JLKmxnkGEa3CIPUjmKPR1v22TyG9V7vc8OtDaFnUMBMBm9pZjiJ9/szLsEWSlABKEQTLxjm6I50o8W8UVmJzkKZBkwNDUdoqJuq9Fm6QHyQMXes9vY7UqsH4pnGfd8jVoSO1LGZseK22q8Q7hGV7HD68OewRZai7WvSQG/B6BFyHYEilFC0qqe0mF1wzgmKeVsnzjapT9qtNOeXkdL/K0l9ct9MfetQm+2dKBXh5L6r6XrF2X56U6fgPUoiYiYp7mDN8pfvDWOVgxWTkGCRJVLQeXK4NdqFj0V424U3mFlyulcygzi8ZROJDI83v0Q7136/UK/fF3bfL93ZJArRagyJ6qSm3Kz4SkIGDOuSpvtsraQQNzrez4ucpKAiQIfj1MMLzEpYp3GJUKLG1j7cXKN53M9lzmdQSHcLv9/j658XOR8O4U+lNrNxkIW6k2AJmgrvnkNwPTcTEQtRep2CkOtnFya2njzl9NVlLFskLfi3s8GdvxIToWBPJDgLRYKsSDVhA/8gtRp7vxwfy+XuW6H6FvXFtjXegm3+RRVKfkI2M6WlcN+pLtUX2yA6LyWI9UjT4uT/FH/vXKqVYiK8sgKg1dDGU/U0+Vy+U35sWTAOprR+P2rZMbOwZ86sU2+IEGlWsDenlVoatf9iwNZnsx380a3vE+ZpW28cZILy55rczSYZCc2n4ATbsOKywrzyBB2AMV7IcX+WKHwgyEYDJBX22aFnQor5yzjEsM013u0no26Qh96xqrpK/scC8/juPjvalEIsZ2GEYbi1/mUYEtliGzbWINysvYCrM4yXO/jD/4gV1YYTkRAAnCIBmzG3BPvVP3AgOWxm9/XaysTmBAQmZj/Ms+eLiGT69OFHdZEsfR3z37LDfwK+BpmFQjMOoTGO9UVpukwESYD3XGqQOGON+kY6I65rbxB354C1ZcTgxAgtD3szrkYOcoODAZe3CPl4IKqNRIITjGWpH9ptzxbQ9+D9sop1Bo60uYLdwOs8IoNX6qbIrQ+Iv9gNUnMYgzTGNAosNs4/J1vPWjJ8JRcqIAEoR+gD1QDT6nDFAVkwOoSgjp+gIM0vHsBF0uyb4xOeU0GvIAN3D94Ve96L0MjBY2+VPUKQGINwZ2ZA8oRnebq7B4UbcSWNQwb13NJr65hd/3b1bSpXucnDiABGHDeiuOd7algbDLCDndGsouZHerRLbm+c4iL+xCAsoEHiKh51iVmgGrUrDBvf8ovoZDPU6QWCHbGnFbKyoTJCZhRohMMbPHpWPEJgHxYiUG2YdXcB1vrWaJouPkRAIkSATJQEYQYq1KHfer8B7z8BrrC96CBFa5xY0ngGUl/fb3I/T33jbmxvwsN+QxR7iHal8IQNSFC7nB5zf2emOgmzpXIJFyf4xaVRhkHz49OFHgCHJiARKEfphtkgZ35M25aoSrnZHF2ix5tbAJVXcA6+PM+nTKats0DvICeD7UwGXArOyDpx1misM7F7jRPpVr5EZQRO+TGt3Z0JbyPFLkTcHj1AZR1UnK9njxWAFoOZ/WlXPM8AYMPu8K7p4scAQ50QAJQj8SvFsQ3sFeJyN2mISO+aX6rnq4P6lsFntQSg+bQKxyCC/w9UzxdyyPYWhnOILmzJhnn+SGOuaGvVbsBjANvrsuq0ge6jwqwxgKBFWbIIOhqdfnY7zHG83Oj2/ACZUTD5AgtAcjnuxpcqMKRmPc2h6UV6dJfn+57B28YVQZH+U43S3HU8IK6mpgUJBI0Qmwz8vMNPQSG6dT3jN8uBd9wxTXDz7n3pRuxtfQhZGTa7FjmIXf7Z7gBspAwBFfzFArF2rPnr1MleqUvE3RVohsYpkhH0tiU1i1KhviChxXVDGzzGDZxvf9+BacYHkoABIkgqQBVreYUbLgsQySS9AQme0VN7yK2Ntl3MNkwo4ZSV2WQVPAOgVrIqymOa4wTQe5so80tHSeUdrGMQlyyWYgKL2/1u7FpBJ11qt9IfsJGDpuWshAUSDkeEYAgg0CFg+XgAdSQDDHOIjcAa/bxu/6z0t6H8mDk4cGICL0AoTBO5tH3L9lj1cx2IULLCd0wHMchgiOnJAyQtTrTImtUJHq6kYe93GlYLWAqFsZ3q7LU2UG31mmZFMkL1RhjhLsA6hzpqCARFmBr9k3teEegcLrWorBvxpoLthmF/Ha/ol1Ylh56AAShD7ILOJwh2dHeY22+ZizVe2dN1R0Qx23McCRICOZ+S54qJxbVTYy8LNsIg1ezilgkEYej3UFRLLOW7YBE4uA0ssrIAyLaD3csk5Vpq6dEQDblu8qqSJpHeV90asxPmHgXDwJhbXvVx5KgAShD8GIY1xbLryjQ2MbJQWFukyS5V7K1nHcUmpuY+egPOPtGfOWbLuU3bILFUxDBlCVKWX1d9gkfgwDkYBEIthgQIIddQsqWwKNB6syxMX4trGR9hjPVvJUHeCMVarv+O8nXqXqykMLEBH6MbjAbPIcP+8RCjCy4Gv8eqLuPqi2i2wjE6tMr1TrnCBOoWKVtImygZyMfsrA0Ne2eaNakbEZQBo3ZFZypWErY4BZh0fXWdVKmCezS1G1SrJhYQ00sQ3Zxt67Q7ic3iX/8MlDDxCR9j/AFv/YzarBY8UHZh0YtiFdzE346MnpCLd0QAGFZYBKgzeHY7YdUqO3bIHKNNYGSWyRr6cLhviDzbEa5abK61TcvFiBgLI3qxsDUXumjWzCahR7qf7K/3zoWMPKqQFIkKB2cTsLRvyluAxQp8zbBv1ay9WJjy53zRi1PeIyZcCUKVVgKFMUVSqra/XLL6HYL9Y28XINxq7QKUGVFuK7Hi0ogGjRBBLN2HKPu/BKexW3pg/9O1lOFUBEIlDOMFCAgWKNC9kOYMnjyPLxJ5UZLMtUbagaP4mHyxjmcRdRveKCM+8nxGJ7hKPlVWbqBRN1KTNEBoPaIWRVKtQGD2LME0KVZpKzdsEY4rx+wl+9jd88ncApkVMJEBF6kQ35llUvd3zBa6ttFXsDdWzJkf2PYZICinqjqlmVnWLUrvyyT6Kyzbp4KTNHxRAVSKytgtW6on4JGLDYKDbKroa4m8AMt/Hq6QGGyKkGiEgEiocrzsEzkF3D0pzxVXUrK8WleyxQgoRGl5FmjfuiWpGCgeQ8JMySe3sDAsou3gQcl84b93FG5TJ2iAcTK3HFg6XgSMuqSpELiZnX8c/8zAROqfQA6QiDZYPvyjPckC/EZVWTjEERJfTo9waO3VSChWZK9b7YZRrr0g1f7bE24r3xboGxIdT9C8oq1otVDZutgoIgwDjgbdfBnb2Glx9+G+O1pAfIPSSwCqRqKmynuLG06AKPvJ829Gw7IOVGnPYiwwxYdk1n8AUlqr6RWWHVLrE/xPhWu6SoUgk4rjL4deSfMFNmESQz7mMGDAp3A6C5hX/0YxPoRaUHyH1IBEvTjD21Y25WT0GsHn/vW5cwIepWUdFUreowiKhDmh9m2SNuz+e16zNY0Lh8iWqDvJoSGsM9VTL0hM+7Q3cLv/7jE+jlWOkB8jkIA2aN1fzALk9xI13jVj26Lxcw0VHVSxnDGvIWCAAaZ8kso2whnqdqX9cBhpybATFjQKDbZ7XqFl48OPXq0/1ID5AHIAyYIQxCqnlMP38KIKabr8Wp3U/VJsip9ZDsGLEzjMeKiErql7VPCI3N4tQVqzEWz+pSSLH3zb739JILw1zvDPZ7QHxu0gNkjhKBAyBAGXHHP3QIT3CDH+Vd0riOBILRcUY8g+GAwZAad2j8YTxJAEBY9PBRBsAUWh+i2tPXO86kl1566aWXXnrppZdeeumll1566aWXXnrppZdeeumll1566aWXXnrppZdeeumll17mIf8f0/r93LAzEAcAAAAASUVORK5CYII=" width="100" height="100" style="position: absolute; left: calc(50vw - 50px); top: calc(48vh - 50px)" /><img class="img" alt="from Meta" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAOQAAAByCAYAAABDaH3TAAAACXBIWXMAACE4AAAhOAFFljFgAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAACtgSURBVHgB7X0HnFXF9f/33Pd22UUDCNgQdEFjwRKNiX+7oLH3lqJR0SigqIhKs66VKiAxgNjQGGPEbiL6i4a1BPWnKJ+fscbIggQRadK3vHv+596ZuXfu27e7771dED7O97Nv3y0zZ8qdU+bMufMIDnmDman/8DHHAtRfzvaT7+3lOyXfS+T250SZF6aMGDYaDg5FIg2HvDDg+rE7XXrd2D/J4SHChPpq9L2N/NuG/dQiODi0AI4h88CgcePK1y6ur5LDCjg4bEA4hswDaxdnbkSSGRcReCyTN4v9zGo5b0+pkjYe1/8IDg4tAMGhSZxdWVnaaX3buWKcdtGXqgmZ3lNGDq+Gg0Mrw4NDk+hY124fixkDCXaLY0aHDQXHkM2AM/Xd7XPRjq/DwWEDwTFkMyCmbvb55JHDv4SDwwaCY8jm4GVcHzlsNLjB5uCwCcF5WbPQd+i4vYnrdosueN6pMpP8bXTu89mN5c2g9KP7Rw/6xL7Wb8i4nwF1FcExef4ycQj9IypryKjenuedxsR7gqmNpFhRU9bp7GmVF65HE7iqcnyHdevqLiCPdmMfPeDxVpK/Vh7mKvYwhzKZOZNHDp1ORIw80L9yzDa81j/cnJe3LX1lQuWgFeb8ksGjj0ilcQIz7SHLPdsxqIYIC9jn2WVo88TdowbOb4z2ZYNHb5dJ+78lpPZnRnepY0YqtVLmAu9J/f4y5c7B/4JDBLcOmQWiunPl39D4StaY9mh6Y3lTXBesV96eoOdlLpcBfEFw7FN6jnztN2D4PZ3qed3DQvtEDuizKYfRASvK5CAnQw6qHNdxXU1mwrqa2tOljluyjPBQpOr84ZeP42V9FP2Gjxnf97qx47qUrh5fWVnpo6k2r/V7sNWumrW1B8nX21cMmdi1NrX+QSF8NNtlBN/BAeHX66nm+r7DR4+ZOmLInTbNKyZObFOzcP2IDPhSsFcW59RgHCf1v6HfsNFT2takrx8//uplcHAm68bGoEHjOgozzgqYsZB8lw0bfdy69fWfyyA+T7Thls2lFz7tQr4/9uuatrP7DxtfgQIR5Knzat4JmLHJhCJDRA/f0X/46CFR3mvHbFO3cP0bUodBUpMyNFPUmjaZF0RoOOUApyEbQAbRh0z0ZHTB513k4r5xAuteg7z8CZrB2rLMjaJedo3J0bwgn2gceRbUPlceGeyHZJj+qgLZTT7Ui8p9lTx+R+7Jse8hRWXiFT5N0u0eZWbsy6ifcemwEQeLh3g58oCPVFcxs/+MeP1VzEqaIfVerYl2lQocLwddo2KEKS8eNvbV+0deO5vT/Kxc+nl4nWiFB/6zmNZhnK8ntRTT9xzRmLtEbQEfvLC2/AY5rMQPHG4O2Qz6DR95rZhcY8z5vSOHFNRn/YeNmSaD7wJ9GrwV0jk4EIZ6gzN89b2jh77XdP7xFYy61+RwR3NNTOAZqbLU5ZMrr/6ykTKPlDIfgB3uR3j13hFDfpEr/aVDRh3oe/SWlfZjKaQngVbWc2bA/aOGPZqdJ5gb+ilMEhP09DgfPS153mH2RykyuL+sbO3gCZWVKxrUcejoYUwYYZW5gn2/YuqoYd/hBwxnsm5chMwog/3R7dqs7dUcMyrUXQ+bGRmjp44cfEJjzBhgysjB/wjC++SwOrrIOEoYtRfygTCj/BdtWt8rFzMGmDRmyKL1ZSUXiXPmGyvjkcyZ24IjYcybpowcckkuZgzrOGrISNGa91tldpAJd6MOsx8KHENufFRnmIc352gJoLQjLoouMOZ2KV87HHkgCO/L+PwbBBaohk9ciTxB5I8UGh80lWaaeGKZvclW/TpIzlI5elGEwm1oBumS1K32uQzGvfADh2PIjQ5v1P2jhy7IJ6WP2kBjxM/I4yH5MLKBlPO2zFH/bs7F+XLExZUTuzafkz7P90XrUlm6yL7mIXNFHlkx6Y5rvpKvf5tzET574wcOx5AbETKnqkmtLH80//Rkz/m+277NumdRKBgj7dN0zbozmssiTpYRyBNrULs0WRymFxZeSO9YuSvwA4djyI0In+iTSZMGrM47A+Fn8SHNEu1YjwLhe+nP7HOZgzarIcnnT5EnHhpx3bdCNVo3FY/qxygE7C+xztriBw7HkJsorqic2E7UTUdzzvCLimiZeuegrwNvqTmXZZEd0MoIl2CKzowaOERwDLmJoq4uufuAmLtrUSRkCSRiSCZuB4dNFo4hN1H46/2k5iAqR/HYwiKUgcMmC8eQmyi6/Gj1MlGLtlbMwzvaEJdV/iEIs9squsA8Fw6bLBxDbqIIljdkvjcnuhAGeHPBkVV+3eqe9rnM95bAYZOFY8hNGMKAs6JjYOsBw0YdgkKRSfWzT32PZsBhk4VjyE0Ynp/+q32eoVSz0S82gs2dhZWPi6/Qx1PvHPI+HDZZOIbchDF5zNWviYn5WnyFe/UfNuqafPKeXflEqZ/xfy8e1mjHPB98Fxw2aTiG3MThg4ba63wMGm2/e5gL/a8ft0PHmnnP+MDJ1uXqHcrWToPDJg33PuQmjqkjBr/Tb/joIKDcvALmMWNU/2Gj+4j2m0DwPvdTmXrP98Tjw53E73O472d+R8wdDI3wnUSu711IHKzD9wPHkJsB7h0xZKyYqluKdrzZXBMnzx4yJ7w32BqDMp7eAEQ5YYkT247MZ+JTp4xwmztvDnAm62aCKSOHVnqgYDuN6gKyPcfsH3bfnUPmwGGzgNOQzYBSqfdRn7kbRSLDmZdSBPWSLqe+RgsweeTgV+Sre9/ho04TA7WP1E4cNhz81EGbsK7At/J/vjDhax6lHps88trZ+dBNt8WCuvV+3EaPF6MAiEKeTPBLw2N4bxeSl4jeBPtl6thbBQeHzR3BDwL17du3BA4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODUBoZXBlrzS++qId2rSvpUkfrcZGADMTevduD3xbT1Ubp0wHhw2BFjMk9+3RHrWrDwDRxfCxt1zaBb5XAuER+awDY7YUMxd1qWk0fd4/0ErgYw7ojrq6S4T2sfBpVylrSylLbnirpB7vg7wP4fF99MY7/wcHh80ERTMkV1aUYf7KywDvemGGjiGpgAn98JvlQ5opoRglPK4WhqmkJ6ofRpHgE/bbCXWZscL0Z8X0g3KDUjyS76BZUn5wHN77OzhzK73zzpvYCOAdzrgGnKoI68Geuujrbva94NpSLPvjLRTUcSOhNjX4fDEjfh6W7wVdpeulHz/DW1Hu33EjHL53FMWQ3L/dAcik75fBvleS8bI/0IMxwazB96eg1Mk0/T9fFFTucftcgAwmCI0OVhmK+WKmT35U+SyDcQxSW4yit15ehg0I3uHMmTLie4XMaOqEsB6xkCKcSUsfexobAeswrCJNdR/6EAsCqi5KEpjjcAhUl/OI7tiMwHiorBooa3inAyrQZh3hhBpshvAKTA/u12GgDLbX5TAwTw1Dc/zFHJ0C8fO30xF2kxE6m8/qnpdU5l69yoQZ74bvPyR5O+irphxKlBdlkvts6iNpyB+CzJr3+MBeFdjQ0DJAj3klNMgSfj7u4Yo+ZdgISKH2ZqnJlnHhDfuKeONp69bCV8gcVwpeXgLIh+TjLU9TSj6rli/AsrOxmaIghuTLOtwsX4GGahMNNnXHZgp9NftcD0rz7Jnbya1b+cwed6GpMgOHTdtvH5RRfGWYP+AvYpuufcTWNdIKgOJE3B2Z+tf5gEN3xcaEqYPpM6LtsbJ+MDYwGFf1EJ3cx76SK5XwY1GW0qYALxoMgQWyeQoXG3kzJA9oP1iYoTK2clhrO44Zwn6siUecpcmCAUBkrl/Np+8yEo3hpJ4PSbLfxHkt+upTK1WZI99V0ppZkq4+mhqRLRyi59RVRuDLG1RTUs5z24oIum8wtz9nK2xAZMi7K1muXZ3NG2nR/QHCeYCaudDmLlwC5MWQfNmPLgH7o3LciQ+yGcUca7uxoRazzVoeymf8+LYG1E/efawkuyCkEQ1qNhlXyGcofN6Wqj7Yj6pm96aq9w5FirqJeSp5aB5yI9CyFeIYeon/3/Ht0NqI2m40ualywooIDmRO592ODYT61FXHSzGnxrME7WpLVGTzVSb1qUyoFY0XQbVLacnNGc0yJF9VViHtvDVmtOh55tKHf5d710j638ggvFCSVUoJn8WmJrLzhQTVf/8GPvXH10YXT979OrlzdVaewCMSlP8qUume9Oqc0VQ1Z4VNjKreXUSvv/cI1tfvKfknZpnWdo13Q93au9HqCN2rdjm5NCbp/32547k9sSHgYyJb0wdGNGHQNo3l2tkczbyM1odmVCp+VO1KYbNFutkUmfTL0uTt1PMLmu9FLKRnaUGXzBaG608PffteDgq38Dldz5BEd0naijAHW6ZkYHAY/iYew6ft+oV09n+F3u0h87FVjkr/GFLrLqUZH65sqto0e/Za+RrIBx7wjXh0b1cPy4uKVfXmPvzTw2fQ+68/gQ0D1TtAkil90yZOyzgaL1eORSuCUwMvyfjYJSiAlVe36fRB32xmLBkM3Mg4NY00bchgs0WTGpIHll8u/wMHiDUJM5wRMeMjqN/yUHpwyXuN0aHHFjyNet4/TBvrB8T0tMc0nFayeFLpyWj+R5aFRd7z9PKH59KML5pkxkTZb//vnfJ1s1VWltbyxvG+vTpgwyA3K4QMoPuRcQx3OL83WgniyOng+7hOHRPB9u5Gj5Gb49FNHrJ2ymY6ECp+rSc394Y1ypB8edsusnZ2vT5NLm+Yx0w8g+5begFNq16PZkDTFyzDbl8FZuz9ESkiw9qklwcCCHP43RJp1M1q1NVdhCJAb711m5B61moDR8fsd5EyrkZrgxp4UZLzNmO0BvBxJ6OVnBFepp+UsZPFeJzLHa3PNtu5JKV8igclG+WAzdvH2pTJmpa5oI9trWlIUtISqpEqKYhBqDKYYM2/hH/dra2sZZ6jxJs2S2HL8phT9dxzJSh9FL368VIUDf8KeYpHCNkOlgmsvL3sDxItOY7mVK1AayAWLtZxWNY3crxtg3TEB6L9eWfjO7TIdGZc3sVnuoqVFLONuACLpdFbm3s6h65B68gCmbK3WVuypmdtHe2YAnUWy3GLDLhOpH41yTyjDm3f2wYDWifWODBLbc9CuOystAQ2ML7Ay9sQ/L3rwTuk4LWTb49T9F9kUkvLkfmsAsd9jSKR80mEjhzQB6Ih26t5nH607EGHpkmHeIfR1OVFhaPxubu0Q23tDBHnB+noFR3FAjQIu/PDDh5Cf/t0LFoIPuCQi6Xq94Xl+FnlACPog9euQwvBXU+fKf3TS7fFakPACHSJHN8LPyyX4iieUMgvRsdUBVVPa9baaAwZXPGAkLuItfrl2DYPwiSuJPIm+qoeqq5xuupyHtkdRSCImFmTXnhYJkNXycnBHARusGqeMcDUFC8cQ7Ik5b3py7SkE65+NIjWaI7+Itwrc2zeN6DFlphh8gK/xu5RGylhD8wJwgGjNhq/B6n7KpJR6PGa47vjwrz6ey6e6VCHkgFC4nShvb+qAyXoCk32lVekitl7eHcc+Yjdxo/w2u/l5l6+9pkoyZEKqjdnL//gQbp1OTr5qvKr5P84NWg8aMcyRY5z4GGatPJCtACiJcUkTr0nlLePQurscDPDmKCX6IVPj0crgHv1SmNd7SdCd5c4pI6g27YCdehGH1W1SIJz19M0QxKsj2qL5/1chuQAOe6TCO0zggjeTbTy4aKWQhiX9vAp/R/Ss6pAE8ZGjfd6munMOsK3ahDEsazcAoZcg9tPrSeMk1J6GKZjwzARoximV+UFg1apZKomTl3ZEVe+0FQZizBlpgzqI9Sav9H5muGNL8ocG8ZQDMdqekmhQIjnWsI0pDiYeW15PgxZjb9eJlrwDg6nU7qNdpmmLzlL0BFVC2Oetyd6h4rrI1S9JdcOJFGoTEZSBs+CqvbGwb3DWuesgccDYdmqsI0DlmHre7eghaDHv1ootC6SGtXH1K35VYw6tBKoqkr6ldRiedwi0zXtxYA/F62DbLNJlyZN8UqGyt0VkTMrDrELnujV3O53HVEEmFLjEbm/7WcnGoG9Aebcnqxztn8r37Iwsd1K3PZIhvxnxbXSPWohZ5nJpAthPSlhOw1XiDR8bqn3+5s5isJvvEQl1sIZTmJAZiUL/4VFxtyhxIPpkYCtOb/1yq/wUscv6NmZ9eTfIxk6RG0CqxVPspxKZumIYpNZklbI6Rsfo+pGdQtmimJUK2cPlQYdwYNKTw86K7JqskF4kKasqEYrgKZXvyT/7zFFNyhJedFO4pN2vwSthdqSx4Volpc2Gpm/RkthmIusc/0Ew9Nv/rhYBN5dibtx3q1kybvgty645IoD5esUVVAku/WMiqe2wdh/6cKM7ooVlr6WL9ahcsfVtPwdj/i3EY14GUmZUqTWUchwQqjbSM+kjY+J1Mqhn6lc5t09qakyOWIDxWhBNo7iTQL2IiYrhI4spgh1JFliQskHaq7NYqJW1GLd20LtiNB2UeFlpizYTriQ+UlFDEG3H7qxul9u/QT/uM4IQCUjKBYaiC33hpLJCx+s7U3lhMVBPB6tCY92iMoy1pY619Ou0D4YzadVtMrSROi4YXoIRn0omONevN/RXdBymDYwtOGUuFtXdo9cWZKVxai3Adz+vO4oBPX+1ASjxe1aL2vkI6xKRfUIhrQXFpq/d3cVhm8tJqqYkNgtZHyOJbzRQJ5yrxBM1IzWIHocQ2kwNsJWTaF96vctJuYcV57mdhMiF1Ign5KvrwX3te1PHNuOWoMxx5aXjh5oEv/BCzsKtZly+GNVXhTkhIQsszs0LIYjhldM6WuXZahO75CTnpFgRjwlTrbXAvdFifw/KSuZlvlhZaroD6s+RyuBf1Vxofw/2xomVqPtt0bEXKhrew9aCyl6zgptsxlTTutOR4thrzSEk5iEOKYV01bIsxpmpdd1CNucFofZfcgTnOrfR/7vZV0x/wOGmUKYUB2Vi1g1ZFuX+cCjNlPkqweMOyMYqMzZr3b+Wy5Plu9+0vBzJF0/Zv9BSf2JVT1VH4q/5W/gUtxzdI5iV5P+SPfob/nIg1LkQkaPNbDSk+vDPEyBP2C13JVPcB7mWxNeU5/c7fTqhkvanVQPqQloZG2T1nChFYDlcvC6XHxcjh+Tz0ty/CZFWjiskKXd/XZGy1r3E2Unlz22KhenQ6ZTfMFOTMETmYZWAv+6okIqMyIeF+Y1Ke1tjSJ4ohzn8gk9H6UXP34JLcXbb76GAw5ZJEfbJ7SXepjHyL8/oFgEIs6niFh4rUFbBMseexCdzrlUjvYHTJsjI/Io3rJPL1o9raqpohiVpfC/uTkW1HFYjpCa76FkVDK91VaKzNu82HK9d9PAeuYzvNCTaDxShHidGAvEe3j+Vhg+M0f2qWGTeczJ4lSZKHl2ioxnozfDUerfuxh/2MdeGtkGl56cqz4Lcf9pUvQzscEdmrLhkdTvkm644FG74fniSzx9vozE/kaMhv1DtnUfljLLZ//mVfBn/QynrM2m8QlmVDCnfkmUEs8pbQvtsQi0ZjTZJG0QkpcQ10mTNZM5PZLuUQ2s5tSWvoLWAvm3CGm1JhdL2LisLMmhH9sEPrtHe7S06FCAee8i+1GpNh/CDQyJwgvIZvOcdSAMtmRvMj9QiebgLQ5e4apQWWwXTWAl+bcQxixCA7LaZCogDHs1rts2w7hK5W5o8UnZczLMh26F62c2RacjBr9Qj4wsdfG/lF7j7Dl0dw/++cgHKUQ9a0u7wnR+Eh/hiVKhcIs2c7VFSZFDKpAZwux3/BgnHbIbTnolFzMG2APHV/fEMaOFaf8fwi1sWPOf0rYRTXPNQpIhyf9Z3LJo7mOW0d+nKUv/i1YA/6rrGUL/fFMQdMstgzxeQlPzVnNjN6wtuxitAS/zt0YeXyf89Be7o2hYMszUPTJakqAlj82U8V2F3BU5gtteeCoaK6W8746iC/papVrmPn2ZQqdpufJRNMuJa0UNpF8SKaRPASvGD2lEwehhedXr2TthK9wwD3lgGwxZJFpS/BS8IqqPVbyQzi/YJIpX5aQZ3AKeLEdanHpcEZnS0dxX9aus4d62K07O2+m2J46eX4u6XkLp7aTQ1YslOSR/tlPnJ9YgsjVlsL75P2gF8G927Rx6GRPGk7nJ86SSz8VDxVbQxn7ADXzMXt3QUpCsgZKx2DhZnu/vhVaBsr1VeY0MlFRmMOxxlGz7OO7St23OfHV0hfzfMcpil8qZawmVfiM1ipaxTd7mLAKf+CptYMJI+3hs+QO3xvUFRaZshUHVMs7HsHktLUGPfroIEw/Mj1LcpSaetSUhiET+hWF/aBtYzR9Vu4VRXhbNeDMKxE9wrMxZ06KA8LWe5ULNQk3dkxPwiCH52tJ9EPRVEvFgFTMDrQFv9ShpeUVMH2YQBk96IjjTR76XN0GhA1J+yx08ZanPpci6JCMY+HuixWDTcUC248gCLXlcBAMezs6s69QDy+v7N6Bc1r9CSF5pad/oocrAnJXGH55BUzWL55xoDqtRua989dSzzTCDzzrkjvFmO1Q+jyIg9ZwkRL4Lj6PRqRhUPLVHFUBKabJg4s7JwMBCsABPdZX8vWyianqsJ9vw+6NI9MThgcAapunaX9pWiZ9DrCHTfsfk3IftfMGCdqNvc+QL/m2Xg4VkbJIk1utoLj315Xh6tlo8kBgSVSL3MD6FT9zjF2gBqKoq8LzNhb1SHu2GQMVv8RGb2A1nhY2BUzdJ+1dELzQn1zFv4A59kks+Gb9SrpfqzAkNJ0Pzd00UlOO46Tc/CPUnW+m1cyI8JzHh8vYGZ0O0pJisNCusvvGgaLElp/lHZoXqnhN8WMzrkDWo373BUoqKMAhOZnXH6dVoARjbBuvfa6I1U20JhUMut1OHK+zsIeLtOVbT3as+Q0sqdNmeWwqtP9kDIfEhDDdp6dkvHpBL/0S8Nmny6B4KzEpvCvcSmi0CL4DqFcOUxir7KVoChj0vtrVkTtDyR+bL7XsSFFT+4GltJebp9dGN0kv3kWsX2GljmYZphHs+RRNQ5ionrNSm5l3SgJ/oQZMlZYhL4Ldon10h+H7oKxHtFu2No5beK/LJT7Zryo4ULAKS9fCoVqRWdGIu9+9HC7En9qxFEFdhlh85DmCwOz9e9vBpl5gRsywa4kVoKVYvvwaBR9DMkRKmPj1PT8xNvung+cPEE/pG8oWExPLBzigPQ8JGoWh43yByaifeUipF0QjCiz0yh1DGD1TdmzIRS+6SFf6gPVshNim1gKCLufz839M6YVzUPZA1TdL8RGvhZ25Bs2A9coP/XiwOG0+9q2mF/tLczGszqdSBqzK3xSopdLTE+inyu6RS9olOkhLT1+/IbCJPwsV06HnbDgtwT6euuLzJt3s4XHj39DIvWeUW/oayR95+ak1VmYlsLXZ4wWpIa8B4LChYF/Mio8Pu/Jghyd+h0fkwU4sYki/cpoeYWTdplZt0bwSeZHgNdmCjZ758k0/b5VGp7blZ9Yp3EPD5Bj5hj8fpxU/mobiaLUUcVqWequq0FjCkl0WL88oVBAtw+98GmnCSzm6Psg6g9G1cevELcuVniYzhaPSCZeq7CVOqmywDyVkWIzmQc7eGd413NWMVja8Cybcg358ePhq1KTTr7aasMnTf+mDjugnLDAWVH6tpNrWJPIgsPLudHC5tuj1aOGgTWoXUibsORYC5kz2zC9YHdTuRYu/faA0YGwBm7mjmp7HRGpusRJ0bJeShKSdL8/DpT1BlmR6PlzUYU+gvX+aO/ikpHShplkVPLDYvdZ2xJfz0gygatNSYKEjacMWH6ZF5Py1AfswYYYu2D0vODyJRaoNxntTzvuQNMxy5Wj4TmyPPjVqn3Ej6QeVyp02cVz+0qHWRCRUto2j9Yrs/gThKjOMBoIO8ozSavaDC5Erh74AmobUg2/6gxtrXPKTMTogcmKFYUdM9qUs3nNJyCxHa8DTRTdH01OzRpWAveyj3OlkfVdVgdlv0i7t80TY3Ci3jxo6FYPifF6NNplGTk6Z/vExy3GpOYYuwqPO4Nx+zT3FB4Z4fB5knqHM5ioVROvb0gPLLSgunitnJ14Ujk7JsGTXkO+QYcEHaiYRJeQyauDp6LommBvAytC+J6gbDaLnTk34mviFrlRf5m629lCItAT2fisdGyJo+0iVotjUNws+K48agTBIZoOVgpLZVxf183tvMB6Yf4nYCiUB4JBnS0yLKrowZGLUopgJ9tqsQUlfEpRvhaYqhUfTIwvlN0aDn/h3sHDc7qpf6JCagcj6GT9y78D1OfbLaxfE3Fb6ju12bKHY1frWr6ZFvZ1/5aBAa+FqCXkJAasszJjcP/nZ57Z5HjV1ppGYdgSAmVA9GTniCKNtfr+mo2bjhLy13o/rHGigung1HRswZkG7O7EyZuSqZAlTmfIVfA7C0NeEB1TqbIfbqi62yXaiJBlCvhqiO4CytbsWy+usRTag827gMLjUrrXLCq58mc4vO1lg38iGYSMzDbgsn5EWHvGtFSM2EPQdNdnxX1ONe+f4lCgFxG1Wv2H7WhIsSQDFdZGkJshdXmodPoiXDTZ85fibK9ad1UUzPo5soU1mgBLeXSsjs7ZejGZW1a3F9YNZnb/0B/Q5SlXKq6PTm0egZgJ+gZZSZDldmM7j0rgIqkbKIw2lm/bdoAoHjxnRzyMKmlHz7uEFb8V8O32LxybyeaeZ59bw+mM/mvbFao7BGf1RqGIked63l1KFlZuwoKWb1v8fbotCyf9f5WqFxhCk3DsUzAsG7Ru2x0zzo2U+r+ORd/yKHv1ISlRpsfyrnZ4npeiT9z/8V4IqXeYN5NzbZMa30gzzxgEPWUkNToFWPvMXtzpN5N50TM6UlMRQDBd+zqG7KH9ECJKy03PcDh0bgX6BYsYVOgJpalJ3WkYd9FyXOlxm4wOtNEFKPjYzhpPi9KKbkL6RZR5k3x2JmDybRHIRStvgtp7hanHhh00ZsmmXwtWachh3DwY/jFFBw3y5BA26zzJSkTiM8F24NWQioLnDwLLVoJNuievAh7rV/5wKI7hO/hgUlshXdlm3EpCdcWdcKM6bSsuxDWIXsVtrf5F+KwsDZ09rmxm6G/fcMwxLiubscl5Zg/U/wfcGyab3oAaolVh9eEVMOej8ZXBXrW7FaD0ErIJYUln2S9QDiinukFpSTcxbWmbfnQe3y2lqCL9tiO/D6GVJSmUXPHlSrZbANQoGg5+d+Iz19Q2Kul/iE2BHpTLPexpho6FoH0IB5FqBoRPXRofnxtLwQ0LI/LZD23p0leGxij1Dt/QX+GG08YYm1XdMoRWpOnDtOruZ5dBm+JwT8aJwinPDiBgELKPiXxRiZdxte8817n+e3JEY2wGf4ew+h1Nk2WymHLreWPbwPk4MdiJ0SgdbOc0/U+tLJkrFCkbHKiwfWjTRtUTWKAP31synSiplIuMKywb/ho/drNu6QDzpItHi4ebOune0/p9koFnF0cHwtW5vnCVr9iKzdttkaVLo1UiVbI53eBiWprVEqn85UqHZsxDxtOsBlDdLPUBhzammPmOAJa1HZFd8HMlgbuo6YI0eh+YmPevFyoUDshF+L4KHFFK+B6d14wuWZ7ebh2aL2BDbwQTdH73GxcQEwZQ/hmCHb1AlD0ndZGihO7fGVzWlJ7t/xAfk6DYg2PMlOMYf++HV+jpxGUXJZGPcZIApNi+irY58n8ZH7NR0PSRgUmejmSkSqdd5sQaK3C1SRGrRq6pKcn2CJpPDKxF5S5CcjtkJl0NfvRHnMRm8Iutn/kUzlH0YLsRR3HbwCkwrykntIzzNqUTlHbAnNBb8+FzKix3/UW4VwMj42dPXc+h88sSOKwOfeKwOFxvm6/xC9DpnDlRYxpDhY5AHzW8iuZ1ynbqIlZ/AV5Q0kIg/4USe+tP0MWbK5KIeJarBcatPi7THohQ8/he/fHBfO0Ot2mkHD84C5/sxH7T8wFw0++MAh6l1Ctkz0+PGiPv0RWlRJINa8ppJFcuQGBEcarxnfGtOI+DgMdGPjp5W/3mu9W0aiSCzF2GCv3FczVPPnQvKtR+3qeK6ndqQLoLv+hBX4U8HLYCU+3Wd7nNkiKBe7iAH/8md4YYdCaH7u/f0K3+cJ9rZ3xi8Zkhf9a094E4zDQ3GimK5/RbRfqL2ZcEgs+Mi6oTddvueGP1YfvCKU8S6S83b6fvgmp4rVM97Q0Ay4iR76ttV+fo1P7Pmc1OmUaDcJpthq8fUbe6r+rwbueQRRORkSDU/HwvcOj/KYwBpzDvoHvftGQa//JOq180kzpbxequxoY2kKN0vOeAfQ10+1+K2ZouqFazpnKFhKMCaFtdyAVHUpj+neVP51dN2LokKOS4TFRXushnz6ZBpl15Rj2HzkgSUYu7ssmNwl4+0E7ToOrM/xnTDoGuSJRXTv/EBRcGKPVL2k4qUe7eL3OQ8FYi6mTxMSFyDy3pK29aN9X6tlweWCXXHq603R+Qh/2y6N9CjJc37c56Z+SnP4WqTJvaq90Kt3kCK5p045XsX6IAyLKqLFHcu/prGjULxGiw8GJ9enwsRkuQ5UJ91HDy5u3d9C9NMDxPMavMNZEV+kWC+ZHmAW5vJ+Ea01alshqi5lmfFMrfUTdYoweWpn8uC8+d8a26CIt4kxHWRep2l+9Ym5tC+o/n+Fibbzg9hZueSb0ap2nzsrg9ojVnm3PyV8+pct6zNvyjpmfZQfld5KtN2ZU6mfsp/pJ7kPY/LS4YaOZJbJcfUyTPi8I666F/mA+WkREAPNOFWSwehMPve/mHYgwRtKJd5XVOfP81Dm1aBmS0mwvQ+/206Y+4RdxwDiLLmpBnSqkOhgFrwTawSECnEovfYFP/8mUv59fqakugQZmXu2qcnA71wP7iHPvI9kPUhStydW5i/iWHXdH2ZPIhGHnNjLNauNQ4PF9dTj4QwwoX2MRtED209oFaMJc6UPIuX3pQeXrEIrg0/cYy+h/0+tnS1tnv2B1tyR5ozbwYm2fEjvvrkPWgDe+UTRkN4RusxkfeD9nL76PjVk3bdaSrPZ2VxHkM4r5bu6N0djFa7rnSLvFQ6ljB2QbOScpwdfoDkpI83/Sk7XcSDqQdvKeVvo7Y4RBYZn06FVPqdO3AZXvtFcfb7B1INFKPxT7TlHeht/FRRutI+SPV4c3K4CE8K03biunHLsXF6NJ88Uck+qCnn6HRCPfb0rl1qq9MLqR+WoeWy8Wzpiba3iQoL8ASUTSGHaHP6K12s9tYZssF5Do/CEUHscjc15jIFCFk1YBnwirWjb0vRRG4IZQ/J/++RfUnSfsF/UOLNuhvUCsr2dyWM7PjojSyaFRfrkrJQpNzGLZGwCU8gsW8BUjZAnfoQ7Z8qT7qtEmFmwjjuQKVYDpFYmusu1nnK1u1yItyLR83yK+p9hyMm1BaJxvsqnPtui7ywZ4S/C0mBRULhplfaUqiKMz0+dVzdCtwJnPSVpwhhqs7GzvberMmc5fmWSojbEm37qdpk4G7k6CsHeOsprxGa8Zi+n5F5AbZuRZQP+GA1GUcIjaT8QSkwtlID4TFR6b5pS3BJHvqCXPnlGzJ+zpEQVMRLvtxrXJ4EsB4tJTzyI3nrrU7QUkSWoT8yA+95Ra223ZdbtCnc2bYHbH5D+/qWMvZBpojc2spa4FEtETKZYjzUjstnFHGQFZQR/k8CpA4M9d5AnUuCLheAitaO5JhWXBR03GlYg0sF50N0Zv7xZkt6S3MRBCQ7DZFEDWf3EgTbGYgNcNTLg/kd2xS+u00xIMRN6DQR1ToYUj+tK8WQeKYlnqAuqIVo8sHVibiQJM1chlTmotX5yoDmETAn/UISvIdk31DDQQiL54paqaPAdeJeH0tuzfo/WQDwqVL8QZ5f9vcE2ns3z4kjm54+2uOMpD94RMraeZvMzAVb71NpdtI8i9JuUUYqslzuCMfq2LKH07oirB3TClQXFjG6Nfl8z+weRVnikS4uUlvXTBZFliaTnozF0x9mV8tVHPgt0XKvdaaF5ypZmjo2y6C2UdTJXHbEbjr2AlEFvmFsvSfoNatFoiBGNxWIakxGvK34nOefH5qkeXlFvRneC0pYL0/enqSuOpMnftewdygJBL3/8EWrKfi5tDbZbqI9rF3cZotrrrUAIr0utD6O33x6NVgdRA7P4e4axBZAlmbwipEU5Kqu3wC1nSveeLF35FNmlRBZ71OUWc2rtBaqR7+dERxzdEdcctDUGV6FIbI9Lq2UueYTQfJAt9ZGsDtuqIxTVFXnQ7o6zHmaUHiJtmCZMV2Ntu0FG3tpNj00CekWY66g9cFy0/YofT/EiIZEtGPJ6Enw2StGtNNgj9FdiUgS/y/dj+Wwhj3KdlLJYjmVtMPUESullmrCidX70tAXgo/frItLnWGn3OVK39gh+fo6pROoq0pcWyPe7oPR0vD7rdSoyFLnRsnc9ubMsr6gXnGuybvq8kBa+UPCCfmtADZPLdtbvG2fflbEyoUXbVKxDZUUtcKhoTllrpo5SXrBe10mWSjwZdqv9cCdBWii8+LlM+F8oQeqDdrh2CVoZX2HyDh7Sx3hInSHssqW0rbPUYQtWPz22RDrhW5HWHwfbOnbD+a8VQnshnu+8BpnjRICJ04eCMLjuUkawcbc8U1om9L8QJ88/U0g9uQuO+yI7/1xZClmDVNY+UG3EAZL298FhYf//f4kyFoQXFxn3AAAAAElFTkSuQmCC" width="76" height="38" style="position: absolute; left: calc(50vw - 38px); bottom: 34px" /></div><div id="mount_0_0_97"></div><script>qpl_inl("7252775685639807194","splash_screen_show");</script>
+<script type="application/json" data-content-len="91" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252775685639807194","splash_screen_show"]]]}</script>
+
+<script type="application/json" data-content-len="91" data-sjs>{"require":[["injectQPLTagsServerJSIntoWindow","injectQPLTagsServerJSIntoWindow",null,[]]]}</script>
+<script type="application/json" data-content-len="97" data-sjs>{"require":[["injectQPLTimingsServerJSIntoWindow","injectQPLTimingsServerJSIntoWindow",null,[]]]}</script>
+<script>var hc=navigator&&navigator.hardwareConcurrency;null!=hc&&4>hc&&document.documentElement.classList.add("_8ykn");</script>
+<script>requireLazy(["replaceNativeTimer"],function(j){j()})</script>
+<script>requireLazy(["bootstrapWebSession"],function(j){j(1688668431)})</script>
+<script type="application/json" data-content-len="97" data-sjs>{"require":[["qplTagServerJS",null,null,[["react_fizz","comet_aa_coinflip:true","logged_out"]]]]}</script>
+<script>qpl_inl("7252775685639807194","tierOne");</script>
+<script type="application/json" data-content-len="80" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252775685639807194","tierOne"]]]}</script>
+<script>qpl_inl("7252775685639807194-server","tierOne",92);</script>
+<script type="application/json" data-content-len="90" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252775685639807194-server","tierOne",92]]]}</script>
+<script type="application/json" data-content-len="461" data-sjs>{"require":[["CometSSRFizzContentInjector","ssrInit",null,[{"cavalry_get_lid":"7252775685639807194","success_status":"success","disabled_status":"fail_ssr_disabled","bad_preloaders_status":"fail_bad_preloaders","unknown_boundaries_status":"fail_unknown_boundaries","ROOT":"root","eid":"mount_0_0_97","should_ignore_static_id":false,"gks":{"comet_content_visibility_for_ssr":false,"comet_ssr_wait_for_dev":false,"ssr_killswitch":true,"mwp_ssr_enabled":true}}]]]}</script>
+<script>requireLazy(["JSScheduler"],function(j){j.makeSchedulerGlobalEntry(null,false)})</script>
+<script>requireLazy(["JSScheduler","ServerJS","ScheduledApplyEach"],function(JSScheduler,ServerJS,ScheduledApplyEach){qpl_inl("7252775685639807194","tierOneBeforeScheduler");JSScheduler.runWithPriority(3,function(){qpl_inl("7252775685639807194","tierOneInsideScheduler");(new ServerJS()).handleWithCustomApplyEach(ScheduledApplyEach,{"define":[["IntlCurrentLocale",[],{"code":"en_US"},5954],["CometPersistQueryParams",[],{"relative":{},"domain":{}},6231],["CookieDomain",[],{"domain":"threads.net"},6421],["JSSelfProfilerTrackedInteractions",[],{"interactions":[]},6918],["CurrentAdAccountInitialData",[],{"AD_ACCOUNT_ID":null},6828],["BootloaderConfig",[],{"deferBootloads":false,"jsRetries":[200,500],"jsRetryAbortNum":2,"jsRetryAbortTime":5,"silentDups":true,"hypStep4":true,"phdOn":false,"btCutoffIndex":51,"fastPathForAlreadyRequired":true,"earlyRequireLazy":false,"translationRetries":[200,500],"translationRetryAbortNum":3,"translationRetryAbortTime":50},329],["CSSLoaderConfig",[],{"timeout":5000,"modulePrefix":"BLCSS:","forcePollForBootloader":true},619],["CookieCoreConfig",[],{"csrftoken":{"t":31449600}},2104],["CurrentCommunityInitialData",[],{},490],["CurrentEnvironment",[],{"facebookdotcom":true,"messengerdotcom":false,"workplacedotcom":false,"instagramdotcom":true,"workdotmetadotcom":false},827],["CurrentUserInitialData",[],{"ACCOUNT_ID":"0","USER_ID":"0","NAME":"","SHORT_NAME":null,"IS_BUSINESS_PERSON_ACCOUNT":false,"HAS_SECONDARY_BUSINESS_PERSON":false,"IS_FACEBOOK_WORK_ACCOUNT":false,"IS_MESSENGER_ONLY_USER":false,"IS_DEACTIVATED_ALLOWED_ON_MESSENGER":false,"IS_MESSENGER_CALL_GUEST_USER":false,"IS_WORK_MESSENGER_CALL_GUEST_USER":false,"IS_WORKROOMS_USER":false,"APP_ID":"238260118697367","IS_BUSINESS_DOMAIN":false,"NON_FACEBOOK_USER_ID":"0","IS_INSTAGRAM_USER":1,"IG_USER_EIMU":"0"},270],["DTSGInitialData",[],{},258],["ISB",[],{},330],["LSD",[],{"token":"EK12dgkq00d8m9-8I86W35"},323],["RelayAPIConfigDefaults",[],{"accessToken":"","actorID":"0","customHeaders":{"X-IG-App-ID":"238260118697367"},"enableNetworkLogger":false,"fetchTimeout":30000,"graphBatchURI":"\/api\/graphqlbatch\/","graphURI":"\/api\/graphql\/","retryDelays":[1000,3000],"useXController":true,"xhrEncoding":null,"subscriptionTopicURI":null,"withCredentials":false,"isProductionEndpoint":false,"workRequestTaggingProduct":null,"encryptionKeyParams":null},926],["ServerNonce",[],{"ServerNonce":"fNkmAWtSf8HuuFxIsPKzU6"},141],["SiteData",[],{"server_revision":1007797318,"client_revision":1007796774,"tier":"","push_phase":"C3","pkg_cohort":"HYP:barcelona_web_pkg","haste_session":"19544.HYP:barcelona_web_pkg.2.1..0.0","pr":1,"haste_site":"www","manifest_base_uri":"https:\/\/static.xx.fbcdn.net","manifest_origin":null,"manifest_version_prefix":null,"be_one_ahead":true,"is_rtl":false,"is_comet":true,"is_experimental_tier":false,"is_jit_warmed_up":true,"hsi":"7252775685639807194","semr_host_bucket":"6","bl_hash_version":2,"skip_rd_bl":true,"comet_env":29,"wbloks_env":false,"spin":4,"__spin_r":1007796774,"__spin_b":"trunk","__spin_t":1688668431,"vip":"2a03:2880:f248:1c9:face:b00c:0:43fe"},317],["SprinkleConfig",[],{"param_name":"jazoest","version":2,"should_randomize":false},2111],["PromiseUsePolyfillSetImmediateGK",[],{"www_always_use_polyfill_setimmediate":false},2190],["KSConfig",[],{"killed":{"__set":["MLHUB_FLOW_AUTOREFRESH_SEARCH","NEKO_DISABLE_CREATE_FOR_SAP","WORKPLACE_DISPLAY_TEXT_EVIDENCE_REPORTING","BUSINESS_INVITE_FLOW_WITH_SELLER_PROFILE","BUSINESS_GRAPH_SETTING_APP_ASSIGNED_USERS_NEW_API","BUSINESS_GRAPH_SETTING_BU_ASSIGNED_USERS_NEW_API","BUSINESS_GRAPH_SETTING_ESG_ASSIGNED_USERS_NEW_API","BUSINESS_GRAPH_SETTING_PRODUCT_CATALOG_ASSIGNED_USERS_NEW_API","BUSINESS_GRAPH_SETTING_SESG_ASSIGNED_USERS_NEW_API","BUSINESS_GRAPH_SETTING_WABA_ASSIGNED_USERS_NEW_API","FORCE_FETCH_BOOSTED_COMPONENT_AFTER_ADS_CREATION","VIDEO_DIMENSIONS_FROM_PLAYER_IN_UPLOAD_DIALOG","SNIVY_GROUP_BY_EVENT_TRACE_ID_AND_NAME","ADS_STORE_VISITS_METRICS_DEPRECATION","AD_DRAFT_ENABLE_SYNCRHONOUS_FRAGMENT_VALIDATION","SEPARATE_MESSAGING_COMACTIVITY_PAGE_PERMS","LAB_NET_NEW_UI_RELEASE","POCKET_MONSTERS_CREATE","POCKET_MONSTERS_DELETE","WORKPLACE_PLATFORM_SECURE_APPS_MAILBOXES","POCKET_MONSTERS_UPDATE_NAME","IC_DISABLE_MERGE_TOOL_FEED_CHECK_FOR_REPLACE_SCHEDULE","ADS_EPD_IMPACTED_ADVERTISER_MIGRATE_XCONTROLLER","BIZ_INBOX_POP_UP_TIP_NAVIGATION_BUG_FIX","SRT_REVIEW_DISABLE_FELLOWSHIP_REVIEW","EO_STORE_HOME_PAGE_COVID19_BANNER","TPA_SRT_TRANSLATION","WORKROOMS_REQUEST_TAGGING_TAG_NO_INIT_BY_VC_GALAXY"]},"ko":{"__set":["3OsLvnSHNTt","1G7wJ6bJt9K","8NAceEy9JZo","7FOIzos6XJX","4j36SVzvP3w","4NSq3ZC4ScE","53gCxKq281G","3yzzwBY7Npj","1onzIv0jH6H","8PlKuowafe8","4SIH2GRVX5W","2dhqRnqXGLQ","2WgiNOrHVuC","amKHb4Cw4WI","8rDvN9vWdAK","5BdzWGmfvrA","DDZhogI19W","acrJTh9WGdp","1oOE64fL4wO","5XCz1h9Iaw3","7r6mSP7ofr2","6DGPLrRdyts","aWxCyi1sEC7","awYA7fn2Bse","aBMlJ8QRPWE","Fl3bH3ozLe","3sKizTQ6byg","6XsXQ2qHw8y"]}},2580],["TimeSliceInteractionSV",[],{"on_demand_reference_counting":true,"on_demand_profiling_counters":true,"default_rate":1000,"lite_default_rate":100,"interaction_to_lite_coinflip":{"ADS_INTERFACES_INTERACTION":0,"ads_perf_scenario":0,"ads_wait_time":0,"Event":1},"interaction_to_coinflip":{"ADS_INTERFACES_INTERACTION":1,"ads_perf_scenario":1,"ads_wait_time":1,"Event":100},"enable_heartbeat":true,"maxBlockMergeDuration":0,"maxBlockMergeDistance":0,"enable_banzai_stream":true,"user_timing_coinflip":50,"banzai_stream_coinflip":0,"compression_enabled":true,"ref_counting_fix":false,"ref_counting_cont_fix":false,"also_record_new_timeslice_format":false,"force_async_request_tracing_on":false},2609],["CurrentBusinessUser",[],{"business_id":null,"business_persona_id":null,"business_role":null,"business_user_id":null,"businessAccountName":null,"email":null,"first_name":null,"ip_permission":null,"isBusinessPerson":false,"isFacebookWorkAccount":false,"isInstagramBusinessPerson":false,"isEnterpriseBusiness":false,"shouldHideComponentsByUnsupportedFirstPartyTools":false,"shouldShowAccountSwitchComponents":false,"isUserOptInAccountSwitchInfraUpgrade":false,"business_profile_pic_url":null,"enterprise_profile_pic_url":null,"isTwoFacNewFlow":false,"last_name":null,"personal_user_id":"0","is_ads_feature_limited":null,"is_business_banhammered":null,"expiry_time":null,"has_verified_email":null,"permitted_business_account_task_ids":[]},2654],["JSErrorLoggingConfig",[],{"appId":238260118697367,"extra":[],"reportInterval":50,"sampleWeight":1,"sampleWeightKey":"__jssesw","projectBlocklist":[]},2776],["CookieCoreLoggingConfig",[],{"maximumIgnorableStallMs":16.67,"sampleRate":9.7e-5,"sampleRateClassic":1.0e-10,"sampleRateFastStale":1.0e-8},3401],["ImmediateImplementationExperiments",[],{"prefer_message_channel":true},3419],["DTSGInitData",[],{"token":"","async_get_token":""},3515],["UriNeedRawQuerySVConfig",[],{"uris":["dms.netmng.com","doubleclick.net","r.msn.com","watchit.sky.com","graphite.instagram.com","www.kfc.co.th","learn.pantheon.io","www.landmarkshops.in","www.ncl.com","s0.wp.com","www.tatacliq.com","bs.serving-sys.com","kohls.com","lazada.co.th","xg4ken.com","technopark.ru","officedepot.com.mx","bestbuy.com.mx","booking.com","nibio.no"]},3871],["InitialCookieConsent",[],{"deferCookies":false,"initialConsent":[1,2],"noCookies":false,"shouldShowCookieBanner":false},4328],["JSSelfProfilerConfig",[],{"SAMPLE_INTERVAL":10,"MAX_BUFFER_SIZE":3000,"WARMUP_RESTART_INTERVAL":300000,"SAMPLE_RATE":1000},4360],["CometAltpayJsSdkIframeAllowedDomains",[],{"allowed_domains":["https:\/\/live.adyen.com","https:\/\/integration-facebook.payu.in","https:\/\/facebook.payulatam.com","https:\/\/secure.payu.com","https:\/\/facebook.dlocal.com","https:\/\/buy2.boku.com"]},4920],["QuickMarkersConfig",[],{"pageLoadEventId":"7252775685639807194","pageLoadScriptPath":"IGXBarcelonaVanityController","sampleWeight":null},4953],["BootloaderEndpointConfig",[],{"debugNoBatching":false,"maxBatchSize":-1,"endpointURI":"https:\/\/www.threads.net\/ajax\/bootloader-endpoint\/"},5094],["CookieConsentIFrameConfig",[],{"consent_param":"FQAREhISAA==.ARbz5DaxQbozuoXSqzy7PCGuHdfQNj8c62PzDPJDDUkXunct","allowlisted_iframes":[]},5540],["USIDMetadata",[],{"browser_id":"?","tab_id":"","page_id":"Prxe0wf1i5oqsz","transition_id":0,"version":6},5888],["ServerTimeData",[],{"serverTime":1688668431189,"timeOfRequestStart":1688668431126.5,"timeOfResponseStart":1688668431180.4},5943],["TransportSelectingClientContextualConfig",[],{"rawConfig":"{\"name\":\"rti\/web_rs_transport_selecting_client\",\"cctype\":\"dense\",\"version\":1,\"policy_id\":\"static\",\"sample_rate\":1000,\"contexts\":[{\"name\":\"method\",\"type\":\"STRING\",\"callsite\":true,\"buckets\":[{\"name\":\"rollout_group_1\",\"strategy\":\"in\",\"values\":[\"FBGQLS:FEEDBACK_LIKE_SUBSCRIBE\",\"Falco\",\"FBLQ:comet_notifications_live_query_experimental\"]},{\"name\":\"rollout_group_6\",\"strategy\":\"in\",\"values\":[\"FBGQLS:COMMENT_CREATE_SUBSCRIBE\",\"FBGQLS:COMMENT_LIKE_SUBSCRIBE\",\"FBGQLS:FEEDBACK_COMMENT_PERMISSION_TOGGLE_SUBSCRIBE\",\"FBGQLS:FEEDBACK_TYPING_SUBSCRIBE\"]},{\"name\":\"rollout_group_4\",\"strategy\":\"regex\",\"values\":[\"FBGQLS:.*\"]},{\"name\":\"rollout_group_3\",\"strategy\":\"regex\",\"values\":[\"FBLQ:.*\"]},{\"name\":\"skywalker\",\"strategy\":\"in\",\"values\":[\"SKY:test_topic\",\"live\/api\/copyright\",\"intern_notify\",\"locplat\/ttm\",\"rti_widget_dashboard\",\"srt\/user_metrics_counter\",\"media_manager_instagram_composer_create_update\",\"cubism_annotations\/fleet_health\",\"srt\/notifications\",\"ads\/reporting\/snapshot\",\"unidash\/widget\",\"cubism_annotations\",\"ads\/reporting\/export\",\"pubx\/notification\/update\",\"ads\/powereditor\/import\",\"lwi_async_create\",\"video_edit\",\"metric_graph_realtime\",\"vcc_video_posting_www\",\"cms\/object_archive_copy_created\",\"cms\/branch_updated\",\"cms\/object_saved\",\"codeless_event_tracking\",\"srt\/job_updated\",\"video_broadcast\",\"video\/broadcast\/error\",\"vcpanel\/api\",\"lwi_everywhere_plugin\",\"commercial_break_v2\",\"advanced_analytics\/query\",\"cubism_annotations\/ads_mastercook_models\",\"gqls\/comment_like_subscribe\",\"live\/api\/copyright\",\"shiba\/mock_bot_error\",\"shiba\/save_state\",\"video_list_publishing_progress_update\",\"assistant_wizard\",\"gizmo\/manage\",\"collab\/presentation\/request\",\"snaptu\/push_notif\"]},{\"name\":\"skywalker_bulletin\",\"strategy\":\"in\",\"values\":[\"www\/sr\/hot_reload\"]},{\"name\":\"rollout_group_5\",\"strategy\":\"regex\",\"values\":[\"Collabri|RealtimeClientSync:.*\"]},{\"name\":\"default\",\"strategy\":\"catch_all\"}]}],\"outputs\":[{\"name\":\"group\",\"type\":\"STRING\"},{\"name\":\"dgwUpsampleMultiplier\",\"type\":\"FLOAT\"}],\"vector\":[\"group1\",\"0.01\",\"group6\",\"0.001\",\"group4\",\"1.0\",\"group3\",\"1.0\",\"skywalker\",\"1.0\",\"skywalker_bulletin\",\"1.0\",\"group5\",\"1.0\",\"default_group\",\"1.0\"],\"vectorDefaults\":[\"default_group\",\"1.0\"],\"timestamp\":1663366072}"},5968],["InstagramUserAgent",[],{"is_chrome":false,"is_edge":false,"is_edge_chromium_based":false,"is_edge_legacy":false,"is_firefox":false,"is_ig_carbon":false,"is_ig_lite":false,"is_ig_webview":false,"is_barcelona_webview":false,"is_igtv_webview":false,"is_in_app_browser":false,"is_ios":false,"is_ipad":false,"is_macos":false,"is_mobile":false,"is_mobile_safari":false,"is_oculus_browser":false,"is_opera":false,"is_safari":false,"is_supported_browser":false,"is_twitter_webview":false,"is_uc_browser":false,"is_vapid_eligible":false,"is_webview":false,"user_agent":"curl\/8.1.2"},6088],["IntlVariationHoldout",[],{"disable_variation":false},6533],["CometUrlTransformsConfig",[],{"should_remove_trailing_slash":true},6589],["RtiWebRequestStreamClient",[],{"ThrottledMethods":{},"overrideHeaders":{}},6639],["IntlNumberTypeProps",["IntlCLDRNumberType05"],{"module":{"__m":"IntlCLDRNumberType05"}},7027],["FbtResultGK",[],{"shouldReturnFbtResult":true,"inlineMode":"NO_INLINE"},876],["IntlPhonologicalRules",[],{"meta":{},"patterns":{}},1496],["IntlViewerContext",[],{"GENDER":3,"regionalLocale":null},772],["LinkshimHandlerConfig",[],{"supports_meta_referrer":false,"default_meta_referrer_policy":"default","switched_meta_referrer_policy":"origin","non_linkshim_lnfb_mode":"ie","link_react_default_hash":"AT0uWyyOguLhvbFDGtTO7eJXLlYUKWUzfOuZA33NenrJ7VIkdjZi0ra-fbtaVq05Ijhqh-6w7LiZgMwweGly3WGlQ3YnIQvAMdhWRPA1t-LVOuxV3vzd1_M1-I0SWcmvmOxD_Q","untrusted_link_default_hash":"AT3ZrDJ6zASYOD9n5NG7xdDT5jCCBWfFHdk4E4VKh-taKlmiLOxtc5JhX0x_OoQtHSBFRuGI-4Z2F6kl_VWSdm3D3A7yN8EMc3q6GIndPZV8ntQs8R-MHzGmgFbmWcBqouznhg","linkshim_host":"l.instagram.com","linkshim_path":"\/","linkshim_enc_param":"e","linkshim_url_param":"u","use_rel_no_opener":false,"use_rel_no_referrer":false,"always_use_https":false,"onion_always_shim":true,"middle_click_requires_event":false,"www_safe_js_mode":"hover","m_safe_js_mode":null,"ghl_param_link_shim":false,"click_ids":null,"is_linkshim_supported":false,"current_domain":"threads.net","blocklisted_domains":["ad.doubleclick.net","ads-encryption-url-example.com","bs.serving-sys.com","ad.atdmt.com","adform.net","ad13.adfarm1.adition.com","ilovemyfreedoms.com","secure.adnxs.com"],"is_mobile_device":false},27],["NumberFormatConfig",[],{"decimalSeparator":",","numberDelimiter":".","minDigitsForThousandsSeparator":4,"standardDecimalPatternInfo":{"primaryGroupSize":3,"secondaryGroupSize":3},"numberingSystemData":null},54],["UserAgentData",[],{"browserArchitecture":"32","browserFullVersion":"8.1.2","browserMinorVersion":1,"browserName":"Curl","browserVersion":8,"deviceName":"Unknown","engineName":"Unknown","engineVersion":null,"platformArchitecture":"32","platformName":"Unknown","platformVersion":null,"platformFullVersion":null},527],["ZeroCategoryHeader",[],{},1127],["ZeroRewriteRules",[],{"rewrite_rules":{},"whitelist":{"\/hr\/r":1,"\/hr\/p":1,"\/zero\/unsupported_browser\/":1,"\/zero\/policy\/optin":1,"\/zero\/optin\/write\/":1,"\/zero\/optin\/legal\/":1,"\/zero\/optin\/free\/":1,"\/about\/privacy\/":1,"\/about\/privacy\/update\/":1,"\/privacy\/explanation\/":1,"\/zero\/toggle\/welcome\/":1,"\/zero\/toggle\/nux\/":1,"\/zero\/toggle\/settings\/":1,"\/fup\/interstitial\/":1,"\/work\/landing":1,"\/work\/login\/":1,"\/work\/email\/":1,"\/ai.php":1,"\/js_dialog_resources\/dialog_descriptions_android.json":0,"\/connect\/jsdialog\/MPlatformAppInvitesJSDialog\/":0,"\/connect\/jsdialog\/MPlatformOAuthShimJSDialog\/":0,"\/connect\/jsdialog\/MPlatformLikeJSDialog\/":0,"\/qp\/interstitial\/":1,"\/qp\/action\/redirect\/":1,"\/qp\/action\/close\/":1,"\/zero\/support\/ineligible\/":1,"\/zero_balance_redirect\/":1,"\/zero_balance_redirect":1,"\/zero_balance_redirect\/l\/":1,"\/l.php":1,"\/lsr.php":1,"\/ajax\/dtsg\/":1,"\/checkpoint\/block\/":1,"\/exitdsite":1,"\/zero\/balance\/pixel\/":1,"\/zero\/balance\/":1,"\/zero\/balance\/carrier_landing\/":1,"\/zero\/flex\/logging\/":1,"\/tr":1,"\/tr\/":1,"\/sem_campaigns\/sem_pixel_test\/":1,"\/bookmarks\/flyout\/body\/":1,"\/zero\/subno\/":1,"\/confirmemail.php":1,"\/policies\/":1,"\/mobile\/internetdotorg\/classifier\/":1,"\/zero\/dogfooding":1,"\/xti.php":1,"\/zero\/fblite\/config\/":1,"\/hr\/zsh\/wc\/":1,"\/ajax\/bootloader-endpoint\/":1,"\/mobile\/zero\/carrier_page\/":1,"\/mobile\/zero\/carrier_page\/education_page\/":1,"\/mobile\/zero\/carrier_page\/feature_switch\/":1,"\/mobile\/zero\/carrier_page\/settings_page\/":1,"\/aloha_check_build":1,"\/upsell\/zbd\/softnudge\/":1,"\/mobile\/zero\/af_transition\/":1,"\/mobile\/zero\/af_transition\/action\/":1,"\/mobile\/zero\/freemium\/":1,"\/mobile\/zero\/freemium\/redirect\/":1,"\/mobile\/zero\/freemium\/zero_fup\/":1,"\/privacy\/policy\/":1,"\/privacy\/center\/":1,"\/data\/manifest\/":1,"\/4oh4.php":1,"\/autologin.php":1,"\/birthday_help.php":1,"\/checkpoint\/":1,"\/contact-importer\/":1,"\/cr.php":1,"\/legal\/terms\/":1,"\/login.php":1,"\/login\/":1,"\/mobile\/account\/":1,"\/n\/":1,"\/remote_test_device\/":1,"\/upsell\/buy\/":1,"\/upsell\/buyconfirm\/":1,"\/upsell\/buyresult\/":1,"\/upsell\/promos\/":1,"\/upsell\/continue\/":1,"\/upsell\/h\/promos\/":1,"\/upsell\/loan\/learnmore\/":1,"\/upsell\/purchase\/":1,"\/upsell\/promos\/upgrade\/":1,"\/upsell\/buy_redirect\/":1,"\/upsell\/loan\/buyconfirm\/":1,"\/upsell\/loan\/buy\/":1,"\/upsell\/sms\/":1,"\/wap\/a\/channel\/reconnect.php":1,"\/wap\/a\/nux\/wizard\/nav.php":1,"\/wap\/appreg.php":1,"\/wap\/birthday_help.php":1,"\/wap\/c.php":1,"\/wap\/confirmemail.php":1,"\/wap\/cr.php":1,"\/wap\/login.php":1,"\/wap\/r.php":1,"\/zero\/datapolicy":1,"\/a\/timezone.php":1,"\/a\/bz":1,"\/bz\/reliability":1,"\/r.php":1,"\/mr\/":1,"\/reg\/":1,"\/registration\/log\/":1,"\/terms\/":1,"\/f123\/":1,"\/expert\/":1,"\/experts\/":1,"\/terms\/index.php":1,"\/terms.php":1,"\/srr\/":1,"\/msite\/redirect\/":1,"\/fbs\/pixel\/":1,"\/contactpoint\/preconfirmation\/":1,"\/contactpoint\/cliff\/":1,"\/contactpoint\/confirm\/submit\/":1,"\/contactpoint\/confirmed\/":1,"\/contactpoint\/login\/":1,"\/preconfirmation\/contactpoint_change\/":1,"\/help\/contact\/":1,"\/survey\/":1,"\/upsell\/loyaltytopup\/accept\/":1,"\/settings\/":1,"\/lite\/":1,"\/zero_status_update\/":1,"\/operator_store\/":1,"\/upsell\/":1,"\/wifiauth\/login\/":1}},1478],["WebDevicePerfClassData",[],{"deviceLevel":"unknown","yearClass":null},3665],["FBDomainsSVConfig",[],{"domains":{"__map":[["www.facebook.com",1],["tfbnw.net",1],["m.beta.facebook.com",1],["touch.beta.facebook.com",1],["www.dev.facebook.com",1],["fb.me",1],["s.fb.com",1],["m.fbjs.facebook.com",1],["facebook.com.es",1],["www.fbjs.facebook.com",1],["m.facebook.com",1],["facebook.fr",1],["fbsbx.com",1],["embed.fbsbx.com",1],["attachment.fbsbx.com",1],["lookaside.fbsbx.com",1],["web.facebook.com",1],["fb.com",1],["messenger.com",1],["secure.facebook.com",1],["secure.my-od.facebook.com",1],["www.my-od.facebook.com",1]]}},3828],["ClickIDDomainBlacklistSVConfig",[],{"domains":["craigslist","tfbnw.net","flashtalking.com","canadiantire.ca","o2.co.uk","archive.org","reddit.com","redd.it","gmail.com","cvk.gov.ua","electoralsearch.in","yahoo.com","cve.mitre.org","usenix.org","ky.gov","voteohio.gov","vote.pa.gov","oversightboard.com","wi.gov","pbs.twimg.com","media.discordapp.net","vastadeal.com","theaustralian.com.au","alloygator.com","elsmannimmobilien.de","news.com.au","dennisbonnen.com","stoett.com","investorhour.com","perspectivasur.com","bonnegueule.fr","firstent.org","twitpic.com","kollosche.com.au","nau.edu","arcourts.gov","lomberg.de","network4.hu","balloonrace.com","awstrack.me","ic3.gov","sos.wyo.gov","cnpq.br","0.discoverapp.com","apple.com","apple.co","dinn.com.mx","soriana.com"]},3829],["CometDarkModeSetting",[],{"initialGuessForDarkModeOnClient":false,"initialClientStateGuess":false,"initialSetting":"UNDECLARED"},4414],["CometCustomKeyCommands",[],{"customCommands":{},"areSingleKeysDisabled":null,"modifiedKeyboardShortcutsPreference":4},4521],["CometRelayConfig",[],{"gc_release_buffer_size":50},4685],["TimeSpentWWWCometConfig",[],{"CONFIG":{"0_delay":0,"0_timeout":8,"delay":1000,"timeout":64}},4748],["CometMaxEnqueuedToastsSitevarConfig",[],{"max":2},4763],["MqttWebDeviceID",[],{"clientID":"7db0c23b-de57-4809-9938-2e114d2ebdfe"},5003],["LiveQueryWebRelayKillList",[],{"liveQueryWebRelayKillList":["test_example_config_id_to_be_killed","data_studio_nav_pane_collections_section","work_recruiting_home_tasks"]},5050],["WebDriverConfig",[],{"isTestRunning":false,"isJestE2ETestRun":false,"isXRequestConfigEnabled":false,"auxiliaryServiceInfo":{},"testPath":null,"originHost":null},5332],["LiveQueryWebClientPollingSwitchList",[],{"liveQueryWebClientPollingSwitchList":{"example_config_id_to_be_switched":10000}},5842],["FbtQTOverrides",[],{"overrides":{}},551],["WebConnectionClassServerGuess",[],{"connectionClass":"EXCELLENT"},4705],["AnalyticsCoreData",[],{"device_id":"$^|Acb3cumc8eJfFqI0FqNPG-gpJxk-2AMkJBqiMep3D1HdwXch_T-353AX-YSR1OTi6EeK4ZQyNNB9tVuqZWqt1ZYtbUHrshNbF6zJNxjZY5NYTcqpIOMg7X0bi4UkKOFuLniXyvfwLHIjhCre5RbT1F6sU7Lk|fd.AcbRYabOR9azg5sAI-FSR0Wv07idg4FHS0NuWYbCjA8uyb6X-uCvPKxDGl57qHWb659Zg4Q3Y220mUeG_J9EMYJC","app_id":"238260118697367","enable_bladerunner":false,"enable_ack":true,"push_phase":"C3","enable_observer":false,"enable_cmcd_observer":false,"enable_dataloss_timer":false,"enable_fallback_for_br":true,"queue_activation_experiment":true,"max_delay_br_queue":60000,"max_delay_br_queue_immediate":3,"consents":{},"app_universe":1,"br_stateful_batching_exp":true,"enable_br_stateful_batching":false,"identity":{"appScopedIdentity":"","claim":"hmac.AR3UwyKLQlxkidd1krryXe3z7R07Qf3M2CwzkJOCccPtsZso"}},5237],["cr:70",["FBInteractionTracingDependencies"],{"__rc":["FBInteractionTracingDependencies","Aa1xnjTVQXSJNn-JFLQ7Pqdtg6oBlm4H4HMlrozREBj-DC9RtTS4c6pm0I6ydsu5438vmKL07dbLyCxkKsT9P-4A0tFpln5JDw"]},-1],["cr:449",["vc-tracker"],{"__rc":["vc-tracker","Aa3Ku05u8VibKRwoei-QW6lIUhU2Rzc_wF0lwVFv7WBj-Wy037VVyWxuRNAcJlEezT7npoWfBPnAorgweihr3bm2k5nJGH0haICWgaCuu30i"]},-1],["cr:686",[],{"__rc":[null,"Aa1QybXCv2hTkyr4olF28z9JQGTu4bXgAgeVCmeIA7MRxrwOUsa4jPvZ5QMl6vALxRSjtEmeAhVEt6mOoooN9CjQtQ"]},-1],["cr:734",[],{"__rc":[null,"Aa0QnJx2YsXGflAiUxkpUAy-8ZPiCMOgePIJ5riScfNx6V-Nw1ul9_jJPAYCZ0cOCESdOp4VKavyJqg1-ypzUO3KRB526RVNmm_Jdkk"]},-1],["cr:1126",["TimeSliceSham"],{"__rc":["TimeSliceSham","Aa2L-MkkR7rD5wxExJGn4sFoeyZBAjoqr_jMN6BaBZZxZRCGtK2nGHHn_1ZWW6a1fVP7Rs75t7paAPZiFE1-WU8"]},-1],["cr:3798",[],{"__rc":[null,"Aa3V-hWdkNh9ABR-4BzmtHmEJy8gUMhaqWX90ERcja_IFoLtm8JEoZRQ0Yjc8n5qehYEmlyNi_1OpYn6FFCZ5LfmnWDPb59cYxw"]},-1],["cr:6640",[],{"__rc":[null,"Aa2GAkAaDjqyn4ykKa7R79Y9JKAfmXqWmnecdw7ORl0wih48mSBcZ1NOZuV9uUanuA1itow2BNprJh8UlY7EoHz5Opox-A"]},-1],["cr:683059",["CometVisualCompletion"],{"__rc":["CometVisualCompletion","Aa3Ku05u8VibKRwoei-QW6lIUhU2Rzc_wF0lwVFv7WBj-Wy037VVyWxuRNAcJlEezT7npoWfBPnAorgweihr3bm2k5nJGH0haICWgaCuu30i"]},-1],["cr:696703",["JSScheduler"],{"__rc":["JSScheduler","Aa3IKVdA5XO59zqVOEcu1Pcng1QuD1hmp8PXpMKsH2LIhUjRKm6g-TccyHAUYv2jPJlu_DTWI92DUvotD2uCJJnCAD8"]},-1],["cr:719780",[],{"__rc":[null,"Aa3g3Y1QTCsHikOvEuxof8IvxY9vRMdNdHqB9Ib-t5_vvXWt428jVPrYQfGY5z4Wr1lu7e1KGbHGWDYkFII"]},-1],["cr:806696",["clearTimeoutComet"],{"__rc":["clearTimeoutComet","Aa3IKVdA5XO59zqVOEcu1Pcng1QuD1hmp8PXpMKsH2LIhUjRKm6g-TccyHAUYv2jPJlu_DTWI92DUvotD2uCJJnCAD8"]},-1],["cr:807042",["setTimeoutComet"],{"__rc":["setTimeoutComet","Aa3IKVdA5XO59zqVOEcu1Pcng1QuD1hmp8PXpMKsH2LIhUjRKm6g-TccyHAUYv2jPJlu_DTWI92DUvotD2uCJJnCAD8"]},-1],["cr:896461",["setIntervalComet"],{"__rc":["setIntervalComet","Aa3IKVdA5XO59zqVOEcu1Pcng1QuD1hmp8PXpMKsH2LIhUjRKm6g-TccyHAUYv2jPJlu_DTWI92DUvotD2uCJJnCAD8"]},-1],["cr:896462",["setIntervalComet"],{"__rc":["setIntervalComet","Aa3IKVdA5XO59zqVOEcu1Pcng1QuD1hmp8PXpMKsH2LIhUjRKm6g-TccyHAUYv2jPJlu_DTWI92DUvotD2uCJJnCAD8"]},-1],["cr:925100",["RunComet"],{"__rc":["RunComet","Aa3IKVdA5XO59zqVOEcu1Pcng1QuD1hmp8PXpMKsH2LIhUjRKm6g-TccyHAUYv2jPJlu_DTWI92DUvotD2uCJJnCAD8"]},-1],["cr:986633",["setTimeoutComet"],{"__rc":["setTimeoutComet","Aa3IKVdA5XO59zqVOEcu1Pcng1QuD1hmp8PXpMKsH2LIhUjRKm6g-TccyHAUYv2jPJlu_DTWI92DUvotD2uCJJnCAD8"]},-1],["cr:1003267",["clearIntervalComet"],{"__rc":["clearIntervalComet","Aa3IKVdA5XO59zqVOEcu1Pcng1QuD1hmp8PXpMKsH2LIhUjRKm6g-TccyHAUYv2jPJlu_DTWI92DUvotD2uCJJnCAD8"]},-1],["cr:1108857",[],{"__rc":[null,"Aa3qwFKUoLGueEuyA-VZmBjkdpqtBu023KwJR3rOrzuyQmQCf1R-EFdZNtVG0_AisdUvUlT3RQPh2GW2Rg"]},-1],["cr:1294158",["React.classic"],{"__rc":["React.classic","Aa00j-m-jthzOWJNFFIKWhSsADCMV7ISLUYIbUvgLTQSqcWf9s2I7VeSGrgLlBOC6eagJCwz9hQajccwz0WV8Wo9TD1Q"]},-1],["cr:1294159",["ReactDOM.classic"],{"__rc":["ReactDOM.classic","Aa00j-m-jthzOWJNFFIKWhSsADCMV7ISLUYIbUvgLTQSqcWf9s2I7VeSGrgLlBOC6eagJCwz9hQajccwz0WV8Wo9TD1Q"]},-1],["cr:1540330",[],{"__rc":[null,"Aa0PQ7YGpL1H1b6k9gCkeRkQ6aWWOTdj_FL0AO9Y2AEIgE1ewcLw16mC2C6q_F2H4zG1gQnyXGZ_t9OcJ3d3BR-j4rch3iH66U-lbw4w2UjdNfIlVQ"]},-1],["cr:1642797",["BanzaiComet"],{"__rc":["BanzaiComet","Aa3IKVdA5XO59zqVOEcu1Pcng1QuD1hmp8PXpMKsH2LIhUjRKm6g-TccyHAUYv2jPJlu_DTWI92DUvotD2uCJJnCAD8"]},-1],["cr:1703077",[],{"__rc":[null,"Aa0QnsdAALQ3usPrdf41DeRTYUo5QOTSjNQS0cGIGOa4AADbWxUV8UrQMUYdmkzi9-OmGFn0XBtMF210KvY47-XhnpKahw"]},-1],["cr:1984081",[],{"__rc":[null,"Aa3o6cotJqAUnK4XWSjdd6ryKixiIJvnIBk_vvCWq6_lEZFGd1gz3BIGCE1Y8iaeyDV0yAPR1S3pVBRGEBKM0qY1yo6s"]},-1],["cr:2010754",[],{"__rc":[null,"Aa1o9zv6-vHpaxUGMscyALIq1mYAXbkiIvLyWxyf2NAzwTPKO2S39ao1u4zUeDMktK3OHoW0-TqEAyen_7ynrb1s9q5sIaQ"]},-1],["cr:69",["CometRouterFocusRegion.react"],{"__rc":["CometRouterFocusRegion.react","Aa00j-m-jthzOWJNFFIKWhSsADCMV7ISLUYIbUvgLTQSqcWf9s2I7VeSGrgLlBOC6eagJCwz9hQajccwz0WV8Wo9TD1Q"]},-1],["cr:267",[],{"__rc":[null,"Aa2aUz2PLj-PvjLfaFTOurSPAO7Y4JS-epnSruCD1HoOUAAaJpN2mFnf4HBJB_8oOMErE9mnmbzwiHpzueuVXppKE2EiJoor-IjWtQ"]},-1],["cr:641",["handleCometErrorCodeSideEffects"],{"__rc":["handleCometErrorCodeSideEffects","Aa14ITS9WoAaBaY0f-XixMKFJO6sGqBXdebJZjly3O-tsBPsDS2D_VhLbR4fr8ACcZ1muCFS0QS1Q_ELXIdMWiV1RSzJhjp2QDdvy--4"]},-1],["cr:795",[],{"__rc":[null,"Aa2S2GXhW1sYcYEI3_yc8nwPmPfba_qgduZRdA80i1u-Bgz7qyD48M13alhFhb25onU0dDIITQTzH36Ll_eCCh-ZXWHDnpnWIw"]},-1],["cr:805",["CometDialogErrorRoot.react"],{"__rc":["CometDialogErrorRoot.react","Aa00j-m-jthzOWJNFFIKWhSsADCMV7ISLUYIbUvgLTQSqcWf9s2I7VeSGrgLlBOC6eagJCwz9hQajccwz0WV8Wo9TD1Q"]},-1],["cr:851",[],{"__rc":[null,"Aa2qdw3CH1QBP_tI-AwS57ZR-AbFz98XHFvincnULwJ1BqwdWHBHg7yAaxvySliHP0UJzP2CtqANTJqEEaEhhCrROrJL31ohMA"]},-1],["cr:866",[],{"__rc":[null,"Aa1QybXCv2hTkyr4olF28z9JQGTu4bXgAgeVCmeIA7MRxrwOUsa4jPvZ5QMl6vALxRSjtEmeAhVEt6mOoooN9CjQtQ"]},-1],["cr:945",[],{"__rc":[null,"Aa2qdw3CH1QBP_tI-AwS57ZR-AbFz98XHFvincnULwJ1BqwdWHBHg7yAaxvySliHP0UJzP2CtqANTJqEEaEhhCrROrJL31ohMA"]},-1],["cr:1024",[],{"__rc":[null,"Aa3uAdPPWoqaIqyzCyEEEbLY0exGqhpalZ1uVygRrOoyjTk1Ugle6qvFfQiyio4_q6X_CK05cMRg-CutN_gsBnanyqV9yv3H-rsY8_flaQQ5DGnk-AF2pGqpFATP"]},-1],["cr:1070",["lowerDomainComet"],{"__rc":["lowerDomainComet","Aa1iAEDZNFI3ScBpijFbnJUuQHSkmTG_Cr4wSI8uwQWdSlTNnkKQ6W8-LoYHn3b0NxOFZ3yZuNkzRU_73mDTLdQr44Gql_bOxb2z"]},-1],["cr:1196",["handleCometReauthenticationSideEffects"],{"__rc":["handleCometReauthenticationSideEffects","Aa14ITS9WoAaBaY0f-XixMKFJO6sGqBXdebJZjly3O-tsBPsDS2D_VhLbR4fr8ACcZ1muCFS0QS1Q_ELXIdMWiV1RSzJhjp2QDdvy--4"]},-1],["cr:2011",[],{"__rc":[null,"Aa09ZSS8W10NnNIT1k_vQKwlsDhWlV-N9oBNuLpYnt9lgX5QEsRgkzrv2fS88foROfumivX3KLt4-oPGuVyk0-vNiIkWnh8"]},-1],["cr:2099",[],{"__rc":[null,"Aa2TPsZPcVuZ6Bp-lDJUa7r7PyXvnpIBe4d-EfrebUczyJy9Vj3qeV1VWYMMy9tNyz-i94d5m_gjIUVVAXm1XwmtyoUFoDxjYQgDi3jyjXRYnjuNzyPx3nyF"]},-1],["cr:2654",[],{"__rc":[null,"Aa1QybXCv2hTkyr4olF28z9JQGTu4bXgAgeVCmeIA7MRxrwOUsa4jPvZ5QMl6vALxRSjtEmeAhVEt6mOoooN9CjQtQ"]},-1],["cr:2682",["warningComet"],{"__rc":["warningComet","Aa3IKVdA5XO59zqVOEcu1Pcng1QuD1hmp8PXpMKsH2LIhUjRKm6g-TccyHAUYv2jPJlu_DTWI92DUvotD2uCJJnCAD8"]},-1],["cr:2928",["relay-runtime"],{"__rc":["relay-runtime","Aa3nPoDEbX57eaAz1oO-QYbUK7QQsRPvFqR_cBLGEGI8e9T2ao5ANAGU2EcGMoC0tRcEVLnYPTwwsXn7VOY77kvQ2vrTMRHPfyyLAw"]},-1],["cr:3832",[],{"__rc":[null,null]},-1],["cr:3919",[],{"__rc":[null,"Aa1f69OoKqq4piqcvfCWZ30f3khprhSPJTgSUkgLGCWNmtbUVfV1VtmVsvqVgXUI9FukQDlN-qc_JWjo5SLKc30iZFmM"]},-1],["cr:4001",[],{"__rc":[null,"Aa0B4m6gEU8ZkwVx4bbsx2ZNrpUNFPudDyMjIqwAeZFqVe_Nh-50fYJ5k82s5EKRSjK8ypCGiD8YjIL1eVWuEZE"]},-1],["cr:4166",[],{"__rc":[null,null]},-1],["cr:4345",[],{"__rc":[null,"Aa27KxqZI3E6L4F1YCtycGMrp3k9RGXGHuaQtjDjXa-qUMY4zaK2a44DerZPvDcp-6DemUg5Ivxbe5hisAppo0kZ_CzXAyUN2-w"]},-1],["cr:4874",[],{"__rc":[null,"Aa3DypY9d64GM9GkztDAYeVBazmw_UKkzmgVeunzSphnT-n5l26_Xdwl9VIXf-mbHcoPZehPjfK5NSm9k0Q"]},-1],["cr:4964",["FalcoLoggerTransportsDeferred"],{"__rc":["FalcoLoggerTransportsDeferred","Aa0VswsMkXjWiQGQpR8HcwkLU1cmnnwew3ES6vX0zwUEks8aplwpMFwEJudLzDghQbzTsZ8B5NB4ez2W7mRHeHnexuw9gwq9bVAiPevBm9GI9DkNAVY"]},-1],["cr:5128",[],{"__rc":[null,"Aa2Mf-o4tPns39KIyoioonAaxO9Ko8hBd-PhEoI4JdMM8b-1iQoX7fl6EmefdHRgGlhenj-tIIgI8HF_YBSash2thKiKP9So"]},-1],["cr:5655",[],{"__rc":[null,"Aa2CDyK2iITtHQt9u8jhfuTlWqpDHbYIDwIS4PhbgbRs1vnNHsgRUW6bgcTkkcsIanAnSBlATVHOm4t0fYX-OFU_CZ4"]},-1],["cr:7332",[],{"__rc":[null,"Aa28YKMh2DSllkatpMwZTltgyIi0v5PTWtVRKrP2juA3tsJ5QaFtAjf5V7LwLJnkIfm3hA9e66VM06Pn5XHjrqF9-iLrX2Ri0bKN4M-tJzxIS8CX2OlWR8XYFzcT8dU1wq2QAn9-Cy-G5j8_3jg"]},-1],["cr:10569",[],{"__rc":[null,"Aa3WRyJJcbUBPB5OATGQMW_QlMi4LGs9AzyPLlLvZTm7uramSV-HxsdkmW2Icw3V0-QqgLBQzACYWR1QkHbzqOVDFLgTug"]},-1],["cr:11053",[],{"__rc":[null,"Aa2qdw3CH1QBP_tI-AwS57ZR-AbFz98XHFvincnULwJ1BqwdWHBHg7yAaxvySliHP0UJzP2CtqANTJqEEaEhhCrROrJL31ohMA"]},-1],["cr:11054",[],{"__rc":[null,"Aa2qdw3CH1QBP_tI-AwS57ZR-AbFz98XHFvincnULwJ1BqwdWHBHg7yAaxvySliHP0UJzP2CtqANTJqEEaEhhCrROrJL31ohMA"]},-1],["cr:11192",[],{"__rc":[null,"Aa2qdw3CH1QBP_tI-AwS57ZR-AbFz98XHFvincnULwJ1BqwdWHBHg7yAaxvySliHP0UJzP2CtqANTJqEEaEhhCrROrJL31ohMA"]},-1],["cr:11202",[],{"__rc":[null,"Aa3qwFKUoLGueEuyA-VZmBjkdpqtBu023KwJR3rOrzuyQmQCf1R-EFdZNtVG0_AisdUvUlT3RQPh2GW2Rg"]},-1],["cr:12338",["CometErrorRoot.react"],{"__rc":["CometErrorRoot.react","Aa00j-m-jthzOWJNFFIKWhSsADCMV7ISLUYIbUvgLTQSqcWf9s2I7VeSGrgLlBOC6eagJCwz9hQajccwz0WV8Wo9TD1Q"]},-1],["cr:840411",[],{"__rc":[null,"Aa3qwFKUoLGueEuyA-VZmBjkdpqtBu023KwJR3rOrzuyQmQCf1R-EFdZNtVG0_AisdUvUlT3RQPh2GW2Rg"]},-1],["cr:844180",["TimeSpentImmediateActiveSecondsLoggerComet"],{"__rc":["TimeSpentImmediateActiveSecondsLoggerComet","Aa3IKVdA5XO59zqVOEcu1Pcng1QuD1hmp8PXpMKsH2LIhUjRKm6g-TccyHAUYv2jPJlu_DTWI92DUvotD2uCJJnCAD8"]},-1],["cr:869493",[],{"__rc":[null,"Aa1wtkIzwrl-xTDLQ5Jk3gGX4Nd7k151F47tKU3vUtod2XqJkPbhO5LI9SjXEAChEr97QxfpOKcZ"]},-1],["cr:992073",[],{"__rc":[null,"Aa39XNVEATe5CnNmZZkCzQVq9RXBBqi3dKPaRT3LqKYkPtyvgrspB7O4Jxv9C8RsS_FCGoPLVnIi9Zi-4uj596h4pAeShliq"]},-1],["cr:994756",["BaseCometModal.react"],{"__rc":["BaseCometModal.react","Aa2AvbfOd3yiipPivXGddA0M1_1ZO0LJDc3Hf7PhqMUfCqM9-a0jLuks_zA7ItFe4zc7XwsCilZvndjJuYU"]},-1],["cr:1011783",["CometHeroInteractionImpl.react"],{"__rc":["CometHeroInteractionImpl.react","Aa2-ywhbGHOtmWbydEbmv6lHZxq4wtbY8f1J7N9s8wx3-z-iyQ5BkGrdOoXJjDdBaCD_df3CRq23Hio"]},-1],["cr:1064332",[],{"__rc":[null,"Aa3EF6MdACAaGxI2NUmDhWxaCCVhg1a1gVaJC88c0s3eCk_UKk2zEH-_ioB0b_2rKZPyshESbPYqrAI"]},-1],["cr:1069930",["cometAsyncFetch"],{"__rc":["cometAsyncFetch","Aa3IKVdA5XO59zqVOEcu1Pcng1QuD1hmp8PXpMKsH2LIhUjRKm6g-TccyHAUYv2jPJlu_DTWI92DUvotD2uCJJnCAD8"]},-1],["cr:1083116",[],{"__rc":[null,"Aa3IKVdA5XO59zqVOEcu1Pcng1QuD1hmp8PXpMKsH2LIhUjRKm6g-TccyHAUYv2jPJlu_DTWI92DUvotD2uCJJnCAD8"]},-1],["cr:1083117",["recoverableViolation"],{"__rc":["recoverableViolation","Aa3IKVdA5XO59zqVOEcu1Pcng1QuD1hmp8PXpMKsH2LIhUjRKm6g-TccyHAUYv2jPJlu_DTWI92DUvotD2uCJJnCAD8"]},-1],["cr:1105154",[],{"__rc":[null,"Aa3qwFKUoLGueEuyA-VZmBjkdpqtBu023KwJR3rOrzuyQmQCf1R-EFdZNtVG0_AisdUvUlT3RQPh2GW2Rg"]},-1],["cr:1106516",[],{"__rc":[null,"Aa3D3IogCUDu4xloQLGsLFZiZqGsGX9mXLtajEYYTIPOy7-AA-8sgva28Gd5Aew4CBsJlIa2oT5zSBfj"]},-1],["cr:1110430",[],{"__rc":[null,"Aa3qwFKUoLGueEuyA-VZmBjkdpqtBu023KwJR3rOrzuyQmQCf1R-EFdZNtVG0_AisdUvUlT3RQPh2GW2Rg"]},-1],["cr:1119068",[],{"__rc":[null,"Aa2Wfg6zDc_2I9O_zrVwz4H5bRgjjzVfR2l5L2cmcBI7IMo93ZWz0fVOUZDER9ZMKrtgHATUt-XPquP0QW6ynTgW_g"]},-1],["cr:1121434",[],{"__rc":[null,"Aa3qwFKUoLGueEuyA-VZmBjkdpqtBu023KwJR3rOrzuyQmQCf1R-EFdZNtVG0_AisdUvUlT3RQPh2GW2Rg"]},-1],["cr:1132918",[],{"__rc":[null,"Aa3qwFKUoLGueEuyA-VZmBjkdpqtBu023KwJR3rOrzuyQmQCf1R-EFdZNtVG0_AisdUvUlT3RQPh2GW2Rg"]},-1],["cr:1183579",["InlineFbtResultImplComet"],{"__rc":["InlineFbtResultImplComet","Aa3IKVdA5XO59zqVOEcu1Pcng1QuD1hmp8PXpMKsH2LIhUjRKm6g-TccyHAUYv2jPJlu_DTWI92DUvotD2uCJJnCAD8"]},-1],["cr:1267207",[],{"__rc":[null,"Aa0WIBQw_RA7WLEYEdUWgAeIIt40sjU5bXz0j65gWc8_Mz0pG62vkDWliUhN3zZ0YprxbebSt6CSS42hOls_Qt4"]},-1],["cr:1445039",[],{"__rc":[null,"Aa0o4tTQ5evyJHiW_BHotGWtu3CeoVNJQL6vs5VMYjENa0zkgDUsjFUNRVD36K6ya5z-yUP-p_VzlvSbzCBAco6jqNkQe_JhF1WV6Z8"]},-1],["cr:1467370",["CometRelayScheduler"],{"__rc":["CometRelayScheduler","Aa3IKVdA5XO59zqVOEcu1Pcng1QuD1hmp8PXpMKsH2LIhUjRKm6g-TccyHAUYv2jPJlu_DTWI92DUvotD2uCJJnCAD8"]},-1],["cr:1522191",["CometLinkTrackingUtils.facebook"],{"__rc":["CometLinkTrackingUtils.facebook","Aa279FKbgrM1fbKMmL_FpUB3uHYMREvEJF17ndlT9wsClOBCoA-8kDx3VrYsDmiXhX5ixkura7YcXjn_Jug9sjp3ix8xt7j-MxG0NQ"]},-1],["cr:1645510",[],{"__rc":[null,"Aa0JMEEulO_NUPkef33tppLQBNL_RbUvyWT8wFKkTx9-9EIoSo9ADpiejNXtVL1PdaYF7gluJ16UJEHUpugdkaUs1mDDyg"]},-1],["cr:1752405",["QPLAddCometRequestHeaders"],{"__rc":["QPLAddCometRequestHeaders","Aa3IKVdA5XO59zqVOEcu1Pcng1QuD1hmp8PXpMKsH2LIhUjRKm6g-TccyHAUYv2jPJlu_DTWI92DUvotD2uCJJnCAD8"]},-1],["cr:1813330",[],{"__rc":[null,"Aa3LN-TWM_oO5HoOeS9VXR4PSSadBe6wUuMs-BFBr1t9nbg3Stq1OGQTos5_n2iRI9r6-yr1kKYNtA1A1Co2V6a7VJs"]},-1],["cr:1824473",[],{"__rc":[null,"Aa3sTaoCk2N7RGCnciOINDy52v5ugc0s7uUP26-yKMwWZwjTtpiTaFO9GdoBc_i2XHWdoKNqL7JD6k981SZIuIZK"]},-1],["cr:1829844",[],{"__rc":[null,"Aa2qdw3CH1QBP_tI-AwS57ZR-AbFz98XHFvincnULwJ1BqwdWHBHg7yAaxvySliHP0UJzP2CtqANTJqEEaEhhCrROrJL31ohMA"]},-1],["cr:1999269",[],{"__rc":[null,"Aa0D3X-VYZBCbZwZeo0cb_cmQ3RoY_4LyUByGRXJ6x23fOAqVdNbjxOzJkz2HQvDXiayn3ZUgmCUMbUyMDVzDdVXmUBfeknCXUYFAOcWt2aB_akj3bGjG6f7rw"]},-1],["cr:2306",["NullState404FailedLoadingFB"],{"__rc":["NullState404FailedLoadingFB","Aa2GpeSmn7SKfw0J-CaiNGJVUM4LUMUnicPonIJXVIyl6II2gKyEeGXSRm-bSLhakzAEB67s1tM2axRPCrjXwFVZdraRc_0kxb8GfuY"]},-1],["cr:3211",["NullStateGeneralFB"],{"__rc":["NullStateGeneralFB","Aa2GpeSmn7SKfw0J-CaiNGJVUM4LUMUnicPonIJXVIyl6II2gKyEeGXSRm-bSLhakzAEB67s1tM2axRPCrjXwFVZdraRc_0kxb8GfuY"]},-1],["cr:3587",["NullStatePermissionsFB"],{"__rc":["NullStatePermissionsFB","Aa2GpeSmn7SKfw0J-CaiNGJVUM4LUMUnicPonIJXVIyl6II2gKyEeGXSRm-bSLhakzAEB67s1tM2axRPCrjXwFVZdraRc_0kxb8GfuY"]},-1],["WebLoomConfig",[],{"adaptive_config":{"interactions":{"modules":{"14945":1},"events":{"979439635.barcelona.landingPage":14.5,"979439635.barcelona.postPage":109.3,"979439635.barcelona.profilePage":217.8,"979439938.barcelona.postPage":10.4,"979439938.barcelona.profilePage":27.8}},"qpl":{"modules":{},"events":{}},"modules":null,"events":null}},4171],["BanzaiConfig",[],{"MAX_SIZE":10000,"MAX_WAIT":150000,"MIN_WAIT":null,"RESTORE_WAIT":150000,"blacklist":["time_spent"],"disabled":false,"gks":{"boosted_pagelikes":true,"mercury_send_error_logging":true,"platform_oauth_client_events":true,"graphexplorer":true,"sticker_search_ranking":true},"known_routes":["artillery_javascript_actions","artillery_javascript_trace","artillery_logger_data","logger","falco","gk2_exposure","js_error_logging","loom_trace","marauder","perfx_custom_logger_endpoint","qex","require_cond_exposure_logging"],"should_drop_unknown_routes":true,"should_log_unknown_routes":false},7],["cr:3976",[],{"__rc":[null,"Aa2ZF3USdMzfgOcoeAmwwYLhc0QUCUnn0NsfXVtl7GHkNnJAR9fyTeXyndlQFLw9n_CuTG6hlfuZr-4UatF5xSD2ppCkz3jfsI4"]},-1],["cr:955714",[],{"__rc":[null,"Aa3swMXR9yaKfATx9FN0TzeuPu161vyyOjErJoNX2IdBjEQndi1MBQ1nEUVs-ZX5Qjfuqv8RBfAA0ndbyu3y"]},-1],["cr:1094133",[],{"__rc":[null,"Aa3f9popYYfKaZtmM904bf3H_ZIVBhy6UVXfzoOJVNfpNAQ71QGLeEySNNE_BFDJ90_qi6beVAd4Cv64GIMxNHkwoMQ"]},-1],["cr:1292365",["React-prod.classic"],{"__rc":["React-prod.classic","Aa3qwFKUoLGueEuyA-VZmBjkdpqtBu023KwJR3rOrzuyQmQCf1R-EFdZNtVG0_AisdUvUlT3RQPh2GW2Rg"]},-1],["cr:5277",["ReactDOM.classic.prod-or-profiling"],{"__rc":["ReactDOM.classic.prod-or-profiling","Aa3qwFKUoLGueEuyA-VZmBjkdpqtBu023KwJR3rOrzuyQmQCf1R-EFdZNtVG0_AisdUvUlT3RQPh2GW2Rg"]},-1],["cr:692209",["cancelIdleCallbackComet"],{"__rc":["cancelIdleCallbackComet","Aa3IKVdA5XO59zqVOEcu1Pcng1QuD1hmp8PXpMKsH2LIhUjRKm6g-TccyHAUYv2jPJlu_DTWI92DUvotD2uCJJnCAD8"]},-1],["cr:1268629",["setTimeoutCometLoggingPri"],{"__rc":["setTimeoutCometLoggingPri","Aa3IKVdA5XO59zqVOEcu1Pcng1QuD1hmp8PXpMKsH2LIhUjRKm6g-TccyHAUYv2jPJlu_DTWI92DUvotD2uCJJnCAD8"]},-1],["cr:1268630",["setTimeoutCometSpeculative"],{"__rc":["setTimeoutCometSpeculative","Aa3IKVdA5XO59zqVOEcu1Pcng1QuD1hmp8PXpMKsH2LIhUjRKm6g-TccyHAUYv2jPJlu_DTWI92DUvotD2uCJJnCAD8"]},-1],["cr:5888",[],{"__rc":[null,"Aa0vVe6rzOzEh80JdL2aI2tMxJJIdOK4DK3bjxTUSKY7ciqNlZpupLbpMoW0Sponu_5TJkGOwW6pUiiVVjWZdAEsXA"]},-1],["cr:983844",[],{"__rc":[null,"Aa3qwFKUoLGueEuyA-VZmBjkdpqtBu023KwJR3rOrzuyQmQCf1R-EFdZNtVG0_AisdUvUlT3RQPh2GW2Rg"]},-1],["cr:1072546",[],{"__rc":[null,"Aa3qwFKUoLGueEuyA-VZmBjkdpqtBu023KwJR3rOrzuyQmQCf1R-EFdZNtVG0_AisdUvUlT3RQPh2GW2Rg"]},-1],["cr:1072547",[],{"__rc":[null,"Aa3qwFKUoLGueEuyA-VZmBjkdpqtBu023KwJR3rOrzuyQmQCf1R-EFdZNtVG0_AisdUvUlT3RQPh2GW2Rg"]},-1],["cr:1072549",[],{"__rc":[null,"Aa3qwFKUoLGueEuyA-VZmBjkdpqtBu023KwJR3rOrzuyQmQCf1R-EFdZNtVG0_AisdUvUlT3RQPh2GW2Rg"]},-1],["cr:5278",["ReactDOM-prod.classic"],{"__rc":["ReactDOM-prod.classic","Aa2bURflBipgJQesJ4ut2Er9FqpZZC-4kEdB7cWNTVhlLh86hfMbrne6_2WTxHN5RdreMGQEm0_Lp3vd-5LS_HshxL1WOS7mug"]},-1],["cr:1353359",["CometEventListener"],{"__rc":["CometEventListener","Aa3rzZcRT6VKIDmMT0lh3FQ4W19T9Kyf7rvFnH_4fcbNKJgZRh2whvxTLzxXCHvJL0nc2nFBo5yPxqCZbknac5rmO_QgOQiiIg"]},-1]],"require":[["BarcelonaProfileThreadsRoot.react\u004006b6f185e71816b7710c561c22b803e9"],["BarcelonaProfileThreadsRoot.entrypoint\u004006b6f185e71816b7710c561c22b803e9"],["BarcelonaProfileRoot.react\u004006b6f185e71816b7710c561c22b803e9"],["CometPlatformRootClient\u0040ceadb92a6de1c8fb2b3eb0adff142880","init",["BarcelonaCometRootConfig","RequireDeferredReference"],[{"__m":"BarcelonaCometRootConfig"},"mount_0_0_97","7252775685639807194",{"actorID":"0","rootView":{"allResources":[{"__dr":"BarcelonaProfileThreadsRoot.react"},{"__dr":"BarcelonaProfileThreadsRoot.entrypoint"},{"__dr":"BarcelonaProfileRoot.react"}],"resource":{"__dr":"BarcelonaProfileThreadsRoot.react"},"props":{"user_id":"3246359082"},"entryPoint":{"__dr":"BarcelonaProfileThreadsRoot.entrypoint"}},"tracePolicy":"barcelona.profilePage","meta":{"title":"Joy Qiu (\u0040joyqiuu) on Threads","accessory":null,"favicon":null},"prefetchable":true,"entityKeyConfig":{"entity_id":{"source":"prop","value":"user_id"},"entity_type":{"source":"constant","value":"profilePage"}},"hostableView":{"allResources":[{"__dr":"BarcelonaProfileThreadsRoot.react"},{"__dr":"BarcelonaProfileThreadsRoot.entrypoint"},{"__dr":"BarcelonaProfileRoot.react"}],"resource":{"__dr":"BarcelonaProfileThreadsRoot.react"},"props":{"user_id":"3246359082"},"entryPoint":{"__dr":"BarcelonaProfileThreadsRoot.entrypoint"}},"url":"\/\u0040joyqiuu","params":{"tab":null,"vanity":"\u0040joyqiuu"},"routePath":"\/{vanity}\/{?tab}\/"},null,null,{"backgroundRoute":null,"timeSpentMetaData":null}]],["Bootloader\u00405fafa3e9d2fda11de2f2735e26eb148d","markComponentsAsImmediate",[],[["CometErrorRoot.react","CometKeyCommandWrapperDialog.react","CometModifiedKeyCommandWrapperDialog.react","BarcelonaCookieConsentDialog.react"]]],["RequireDeferredReference\u0040bec1b2f4238c5317991972b09f6a921d","unblock",[],[["BarcelonaProfileThreadsRoot.react","BarcelonaProfileThreadsRoot.entrypoint","BarcelonaProfileRoot.react"],"sd"]],["RequireDeferredReference\u0040bec1b2f4238c5317991972b09f6a921d","unblock",[],[["BarcelonaProfileThreadsRoot.react","BarcelonaProfileThreadsRoot.entrypoint","BarcelonaProfileRoot.react"],"css"]]]});});});</script>
+<script>qpl_inl("7252775685639807194","tierOneEnd");</script>
+<script type="application/json" data-content-len="83" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252775685639807194","tierOneEnd"]]]}</script>
+
+<script>qpl_inl("7252775685639807194","tierTwo");</script>
+<script type="application/json" data-content-len="80" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252775685639807194","tierTwo"]]]}</script>
+<script>qpl_inl("7252775685639807194-server","tierTwo",120);</script>
+<script type="application/json" data-content-len="91" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252775685639807194-server","tierTwo",120]]]}</script>
+<script>requireLazy(["HasteSupportData"],function(m){m.handle({"clpData":{"1276":{"r":100,"s":1},"1115":{"r":1},"4536":{"r":1},"4785":{"r":1},"1743810":{"r":1},"1856513":{"r":1,"s":1},"1914651":{"r":1},"4790":{"r":1,"s":1},"1808128":{"r":1,"s":1}},"gkxData":{"1941":{"result":false,"hash":"AT7GrgqG15p_qcSMvLA"},"3404":{"result":false,"hash":"AT4wMZMWwnW5SJKEkwE"},"3538":{"result":false,"hash":"AT57TGJPNDIjCAO6fIU"},"1147":{"result":false,"hash":"AT7lo3uRS0bAc9UVj7g"},"3854":{"result":false,"hash":"AT5Aup-cVQlr_tBvUGI"},"952052":{"result":false,"hash":"AT7wsJl9q10w1hpgjS8"},"1611172":{"result":false,"hash":"AT6trgho2WMoFqOjglk"},"161":{"result":false,"hash":"AT4do0BlNYY4RIPQZcw"},"1286":{"result":false,"hash":"AT6JZD24vbNiQBGWcEc"},"1541":{"result":true,"hash":"AT4fxbsNTnyhSCcibtg"},"2449":{"result":false,"hash":"AT6wLtxxWYaByN3ZsK8"},"2617":{"result":false,"hash":"AT6UKlOnx8DBsi5_iwc"},"2714":{"result":true,"hash":"AT5vT-5jyll9RTqYX3Y"},"3197":{"result":false,"hash":"AT6NTAIQMTd2kZTymSI"},"3422":{"result":false,"hash":"AT6Er88AzNrP_pC8qRA"},"3464":{"result":false,"hash":"AT6h-nmnhq1G5W5Ac2I"},"3610":{"result":false,"hash":"AT5G5DeylfvqwDf4S48"},"5868":{"result":false,"hash":"AT7RfXdp6s85kH-ycqw"},"5900":{"result":false,"hash":"AT4Pl2jv9rEE_PixhuU"},"6737":{"result":false,"hash":"AT6tdqjSAxXxxw86Oyw"},"1083274":{"result":false,"hash":"AT6jVQKquJZO6Wz0PfM"},"1124976":{"result":true,"hash":"AT4xXzB8ti8wRGYOnWA"},"1375802":{"result":false,"hash":"AT7J4koKtjN7aFCKjwA"},"1401747":{"result":false,"hash":"AT7JbsxJIa_x4dD_a-s"},"1434599":{"result":true,"hash":"AT67c_ay5iYIWOOBp6o"},"1469813":{"result":true,"hash":"AT4KsAWB14cXb7E-osg"},"1482680":{"result":false,"hash":"AT52-IsjoZhbI5DZ598"},"1526990":{"result":false,"hash":"AT5T7Mutfj6fyqlGYKM"},"1586633":{"result":false,"hash":"AT4ma-k4QyXhU8hENwg"},"1755152":{"result":false,"hash":"AT4YqJEBEalQkF8in78"},"1779508":{"result":false,"hash":"AT7TH0IJRiZ_VVRcvmk"},"1792489":{"result":false,"hash":"AT7OMiP2kJA0yObapmg"},"2007883":{"result":false,"hash":"AT6fe4yBjXoMBt2vGbA"}},"ixData":{"1876411":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yd\/r\/3mD7kKai_7W.gif","width":12,"height":12},"1876412":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y1\/r\/mHADa0fT0mI.gif","width":16,"height":16},"1876413":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yV\/r\/ZY0eC865SgX.gif","width":20,"height":20},"1876414":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y8\/r\/M3mvaC7u8oH.gif","width":24,"height":24},"1876415":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yL\/r\/hVe2HmwMRpE.gif","width":32,"height":32},"1876416":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yC\/r\/yFaaylccZ5L.gif","width":48,"height":48},"1876418":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yk\/r\/96GJYGbUDCJ.gif","width":72,"height":72},"1876419":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yS\/r\/NiR8M1k4AVU.gif","width":12,"height":12},"1876420":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/ym\/r\/FNERtXIk9xp.gif","width":16,"height":16},"1876421":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yJ\/r\/l2FWxc8ihQj.gif","width":20,"height":20},"1876422":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yo\/r\/Io_N1z4MXYh.gif","width":24,"height":24},"1876423":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yD\/r\/-1hifBvDgEQ.gif","width":32,"height":32},"1876424":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yG\/r\/RcIiVWWukEr.gif","width":48,"height":48},"1876426":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/9ISCYYcy94m.gif","width":72,"height":72},"1876427":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yU\/r\/MStXnCtsaSe.gif","width":12,"height":12},"1876428":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y6\/r\/dw2egiKdoVV.gif","width":16,"height":16},"1876429":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yA\/r\/1DbfjOftY0d.gif","width":20,"height":20},"1876430":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yi\/r\/2uPGz8a6lb6.gif","width":24,"height":24},"1876431":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yw\/r\/60r9oPEvxiL.gif","width":32,"height":32},"1876432":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yM\/r\/NlAFhiEx3a1.gif","width":48,"height":48},"1876434":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yx\/r\/uzrQzxgD_Bg.gif","width":72,"height":72},"1876435":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yM\/r\/TtXj9IXnkoK.gif","width":12,"height":12},"1876436":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yy\/r\/HNs8yq0QiXE.gif","width":16,"height":16},"1876437":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yT\/r\/ay_drQe6StD.gif","width":20,"height":20},"1876438":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y4\/r\/iACDMhAROS_.gif","width":24,"height":24},"1876439":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yy\/r\/WEhNL1y2zoZ.gif","width":32,"height":32},"1876440":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y-\/r\/mAeZkO4yhqj.gif","width":48,"height":48},"1876442":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yl\/r\/79uB7ciX8vY.gif","width":72,"height":72},"1876443":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yG\/r\/dzn6it4Fw3p.gif","width":12,"height":12},"1876444":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yc\/r\/wqjQpFb4tea.gif","width":16,"height":16},"1876445":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yk\/r\/yy3mR2PXKrn.gif","width":20,"height":20},"1876446":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yl\/r\/gTdm7zPKz-c.gif","width":24,"height":24},"1876447":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/ym\/r\/kdaft251gQ_.gif","width":32,"height":32},"1876448":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yG\/r\/6-FTd4KBtOk.gif","width":48,"height":48},"1876450":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yq\/r\/Tks_lRPtYc-.gif","width":72,"height":72},"1876451":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yK\/r\/Bys0xcVibDa.gif","width":12,"height":12},"1876452":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yI\/r\/Wk0dcHGH6EG.gif","width":16,"height":16},"1876453":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/ys\/r\/aOTs7vt2hEc.gif","width":20,"height":20},"1876454":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yh\/r\/wVjfNbGZ3CH.gif","width":24,"height":24},"1876455":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yw\/r\/oT6wM_vuQNQ.gif","width":32,"height":32},"1876456":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yp\/r\/ac61i44rSWK.gif","width":48,"height":48},"1876458":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yg\/r\/ZH27Vvjc9-u.gif","width":72,"height":72},"1940508":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y3\/r\/ycQ2OPoZwUA.gif","width":64,"height":64},"1940509":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yg\/r\/8kyIVWHZW-b.gif","width":64,"height":64},"1940510":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yK\/r\/8gPN8wBD9yB.gif","width":64,"height":64},"1940511":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yG\/r\/WtK_u51t3nM.gif","width":64,"height":64},"1940512":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yj\/r\/JYwEre3ewp7.gif","width":64,"height":64},"1940513":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yu\/r\/M2HDLLPAUWl.gif","width":64,"height":64}},"qexData":{"1655":{"r":null},"1675":{"r":null},"2095":{"r":null},"2096":{"r":null},"2097":{"r":null},"2098":{"r":null},"2099":{"r":null},"2100":{"r":null}},"justknobxData":{"344":{"r":true},"948":{"r":false}}})});requireLazy(["Bootloader"],function(m){m.handlePayload({"consistency":{"rev":1007796774},"rsrcMap":{"POkG4Hf":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3ikM54\/yf\/l\/en_US\/dKyu23I5fqr.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":12","m":"1007796774_main","nc":1},"oRj2xU5":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3ivsD4\/yB\/l\/en_US\/FCaa8jsqbBk.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22853","m":"1007796774_longtail","nc":1},"MIwFPq4":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yw\/r\/E4XtvzFTfIx.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22844","m":"1007796774_longtail","nc":1},"+L0X93S":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3i8hs4\/y3\/l\/en_US\/i9nIgo3DWBW.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22868","m":"1007796774_longtail","nc":1},"yjOc\/BX":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yZ\/r\/OCnt_5DwgWw.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22867","m":"1007796774_longtail","nc":1},"KxYcLg+":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yd\/r\/-w8H2PZO-iD.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22839","m":"1007796774_longtail","nc":1},"qiVTe9f":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3inQ44\/yD\/l\/en_US\/aVIZjqnbeG8uYySt466q_EFCaa8jsqbBkE4XtvzFTfIx9BS1T5PFXOB.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22842,22843,22853,22844,22840","m":"1007796774_longtail","nc":1},"L3yxVXS":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yt\/r\/AHkndIEm5Rl.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22841","m":"1007796774_longtail","nc":1},"oHmjilq":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iQpj4\/y_\/l\/en_US\/3SBbpQTh5JQ.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22845","m":"1007796774_longtail","nc":1},"5hdPwUp":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3i3Fo4\/ye\/l\/en_US\/x_k9uxuxzat.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":25","m":"1007796774_main","nc":1},"SrRwK8Q":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yo\/r\/bLEHF9MK5q8.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23643","m":"1007796774_longtail","nc":1},"lI1Yib\/":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/ye\/r\/kZtzguJd8yx.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23642","m":"1007796774_longtail","nc":1},"A2+x9zZ":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y7\/r\/vsWqehdEtWw.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":38","m":"1007796774_main","nc":1},"ouGJTJU":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y1\/r\/6HpGmByZA0s.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":36","m":"1007796774_main","nc":1},"h0zbdh+":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yN\/r\/8sBjwKi_XAJ.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":37","m":"1007796774_main","nc":1},"VJhwr7f":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iPjk4\/yj\/l\/en_US\/tS4NAEkk1ly.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":13","m":"1007796774_main","nc":1},"BG+mBnk":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yW\/r\/s70ZcYOHW2g.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":14","m":"1007796774_main","nc":1},"VluRBpG":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3i8f54\/yL\/l\/en_US\/H8jDqdAkvaPBp-sWNflphmzG5N_ZCDB67s70ZcYOHW2gxudfWkGfnMSQaHJskTXKBsP-FxlnJFYEeuYySt466q_EKoySD9JtZBrFXZtUxipnSj3o_eql4wWVOsES-3svQkGgLmdtKY8ymGHpVMiA7wWSg6sKyq6PtGLsmmCtwsMwDpuuuk1ECc7FJyTC8h4aY11bXDtsrTV6grGR515OhfS5HE3MnYm2bO-GP2D1MY2eDbW-z0Si5EstWO8A1q9NBjVyNNwMMrqfnWVlYdJYLoARF8dGGFiyg8AQNMsQTR5LWgsqVgrL6FeLaAg_7vEtusd6r5NO8w.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22517,22520,22522,14,23282,22513,22574,22843,22519,22678,23283,22538,22681,22540,22539,24755,22521,22542,22523,22518,22679,22528,22543,22560,22515,22524,22525,22516,22526,22514","m":"1007796774_main,1007796774_longtail","nc":1},"4myS+FQ":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yb\/r\/0LyZ2Bhtg3Q.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":24726","m":"1007796774_longtail","nc":1},"ptX5H14":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iMT74\/yv\/l\/en_US\/FviRYH6d8aZL9iclwrP2Mz.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23284,23281","m":"1007796774_longtail","nc":1},"DTEAkkm":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iYTC4\/y0\/l\/en_US\/ymAWa7v3wLK.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":30","m":"1007796774_main","nc":1},"qcJ8oTc":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yk\/r\/yJveFWkDDR4.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23327","m":"1007796774_longtail","nc":1},"HAdaAfP":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y4\/r\/fxdyWGjKtZW.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23287","m":"1007796774_longtail","nc":1},"VQxSZM7":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y3\/r\/pw17-piTWVI.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23329","m":"1007796774_longtail","nc":1},"ppcMzf1":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3ikKB4\/yV\/l\/en_US\/Y5xpL53z6YNfLI-dnZqj4LTzno5eP6nVVsqH8rp3rNzmT2pzc_XfHCJhAA8aEK7kcPsD2Mi-pv4Vvox3TE4PsotI1jhiyd0Mi7X6EksR9mTLwkXGcK2g9xvB8zAYt-ZRkt3ORLRxhRlEh7uuYySt466q_EbFemdCzZOyr8qHP6VIBz4d-es_Ps7G0-0zSIiPUvr3ptNqmwROcNvDkahz1LRM0XaeLmdtKY8ymGHY-fNHdq0n_9zzryhWoIuez6eRNg3AJtVTe2oHS7-bsPGS7fLcvWQauAAgAox9dEkk0cIUQjlstqZUtNpstMRzv7_FQe2cWHULn6.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22273,23259,23230,23244,23236,23241,23275,23245,23258,23277,23243,23288,23279,22843,22459,23290,23289,23273,23239,23232,22681,23278,23235,23276,23234,23261,23274,22420,23240,23237","m":"1007796774_longtail","nc":1},"BmUKcMx":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iez_4\/y3\/l\/en_US\/JIqQQdk3ieE9GMCQUhC9Iq.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23233,23238","m":"1007796774_longtail","nc":1},"LddxAHS":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3i9yU4\/yk\/l\/en_US\/e221EJpXRZd.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23280","m":"1007796774_longtail","nc":1},"80QnIbt":{"type":"css","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yr\/l\/0,cross\/WPrndevEYn8zyEpb6SJKFF.css?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23242,23229","nc":1},"PfR8M03":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iQoG4\/y6\/l\/en_US\/Y5xpL53z6YNfLI-dnZqj4LODfoxHtIg-rTzno5eP6nVV1qcrREK-mqHsqH8rp3rNzmT2pzc_XfHCJhAA8aEK7kcPox3TE4PsotI1jhiyd0Mi7XXGcK2g9xvB8zAYt-ZRkt3OfxdyWGjKtZWyJveFWkDDR4uYySt466q_EbFemdCzZOyrmzuRxJgFeBB8qHP6VIBz4d-es_Ps7G0-0NqmwROcNvDkahz1LRM0XaeLmdtKY8ymGHzzryhWoIuez6eRNg3AJtVTe2oHS7-bsPGcIUQjlstqZUtNpstMRzv7_FQe2cWHULn6.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22273,23259,23286,23230,23231,23244,23236,23241,23245,23258,23243,23288,23287,23327,22843,22459,23285,23290,23289,23239,23232,22681,23235,23276,23234,22420,23240,23237","m":"1007796774_longtail","nc":1},"kYwN4K1":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iOv54\/yd\/l\/en_US\/9GMCQUhC9Iq.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23238","m":"1007796774_longtail","nc":1},"3x11trx":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yt\/r\/JIqQQdk3ieE.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23233","m":"1007796774_longtail","nc":1},"SbjrRrE":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iK7-4\/y0\/l\/en_US\/Tzno5eP6nVV1qcrREK-mqHT2pzc_XfHCJhAA8aEK7kcPpyBDNZM558rox3TE4PsotI1jhiyd0Mi7XXGcK2g9xvB8zAYt-ZRkt3ObFemdCzZOyrmzuRxJgFeBBNqmwROcNvDkahz1LRM0XaezzryhWoIueze2oHS7-bsPGcIUQjlstqZUtNpstMRzv7_FQe2cWHULn6.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23230,23231,23236,23241,23272,23245,23258,23243,23288,22459,23285,23239,23232,23235,23234,22420,23240,23237","m":"1007796774_longtail","nc":1},"BXyw5s5":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3im6X4\/yS\/l\/en_US\/Y5xpL53z6YN.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22273","m":"1007796774_longtail","nc":1},"QYet1m8":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iL0l4\/yS\/l\/en_US\/2b0QhKYmHZR.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":42","m":"1007796774_main","nc":1},"N4YVD55":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iVaI4\/yZ\/l\/en_US\/s70ZcYOHW2gg3yoqbXEpmYwxCqhf68Hu9EXzOMjEGRkef1WEGsPamkr0JBqoWCZjPIqpYLDHodxPTIVnWZl7cviNdWZZdPSs6ZbpqTnuoeCk6pZsjNlrulyIdyoHREtSM9Jsu_B3ZISZBs9AIrc88yh4hk7G2jo8ofuzrILlFWhiKYx_qrF1-qnT0JMyD86gn8wGeXZ7u-SCAiNhudK7j4Vngu9Vesh-ZP8F7HecdToupwT2U_sdlNP4ZdmIMEGQsol6uRMSmrV1PNp_6bSQi6r9ERa5IIJ3kuTVsqlBOyoeOvtugati7pKtKghClYVqKmzDS3VQA1.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":14,24681,23332,23349,24707,24728,23321,24687,23313,24666,24701,23994,24680,18243,24710,23309,24722,23887,24702,23328,22276,18214,18244,23342,22275,23314,24683,24685,24711,24767","m":"1007796774_main,1007796774_longtail","nc":1},"txi7upv":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3i-vc4\/ya\/l\/en_US\/FjpyFw8dtiNqiZMXnYKsx26AiDsqxS9hj2A8-plSrNyIWTBsxEMk0oGjGQJZ5hTTO7ir0aXOo6hu9GiKWpcUOxdqpw17-piTWVIrfTsco5uJfSM3Hhz51POq73P2qyi3N0XKdH93URzZjeYe8qQHfoPyNXK6vxPXihp7vXclAo5ZDV_x16hGQn2v-k0Z10vcV3GdgRhj0mU6j2x70YSVf1mwoMpkAuvWZOfGak4iiBfG2EFqtzqRp81TcBkCmV4agjMWnHBnuJM6SUg6InEHrq1vn4uA7WktBjOZhjCbYk6yzRdJERnFqLDkk44q6ypfKE75cdD_2h.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23965,22816,24780,23958,22277,23952,24778,24781,23329,49,24723,18053,23300,24706,23946,23987,24001,23950,24785,24786,23980,23984,23983,24673,23953,23297,22274,22271,24730,23308","m":"1007796774_main,1007796774_longtail","nc":1},"CJJpFpi":{"type":"css","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y-\/l\/0,cross\/9RNFBR_gSEj1etdwR6a81I3jU-LY6XmPy6zzuiyZa4D8Kd2lmIoHxfuilTJBkNQiBWIIyo1-hI3xUC3qfE7YCHo1NZ8UcGjWcqSZqyKYDA1Eol5T8IKFrg-6eoWuaqWpfwKmpPGlbgm47dKTKm9_Q2heWGcOeEjwimKZqRZXEEM_Uh94XZEyMm2-3YUMNorFvAKDgpdoLXukjSq8gZxyPkih5Hkv3JxJYu0Ykk9aTMfgZ8CM51BAZ2QE-Kq3JhZtgcAW5uBp9I8nAckfA9KCE8vaKz4xLGtKy686UOeUw9hYcelD8sl7JH0uDEkhRHIwT9SgsVYxoo.css?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23964,23354,24662,23301,23315,23350,23977,24777,24667,23335,23657,24686,24682,23978,24690,23989,24670,23298,24664,23331,24761,23352,23299,24695,18147,23322,23334,23325,24787,24699","nc":1},"hUeQzzr":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iF5d4\/yE\/l\/en_US\/wAFch5viTHH69FssJOI_G2exJVaBoNrmSTh0PpSNmHFjQG4qJ6_JSCSN7zKZDi949BQPpruh15t0LegNM-bx1lR0NXebqprgpxA4aaw8yetFPeGRUdnQtM5dIolieDd4IJu4bCfnaamX5bMBkyxSp24flWVTOice3J6cjKtVXaNTrk3HysLR_Fhssj6vsWqehdEtWw-yu7ETe8t3dLMDjMFw3MsV0E1dAsWNrLODmgTTo802bhAywHKqrhLV4OZcJ1-eP5c3r40PTgS3hAyaMlDkmMimHkD2SKUNQsv_cbbFAPOpx4ztjoaa4PcrTo1aERw28O7swT.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":24760,24705,23908,24688,23896,24764,23355,23991,24698,24708,24724,24678,23976,23351,24663,23986,23951,38,23337,23303,23295,24768,23319,24693,24691,23296,24742,22442,23144,23330","m":"1007796774_main,1007796774_longtail","nc":1},"lwH\/DrC":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3i3504\/yH\/l\/en_US\/SRAjmBufyGy7tmbEkFIHUT6kfYtB9j00HvMmvdR4VFNcfEskqldov3qysZNDLAbte48xArc4B8cLJLr8-lR_ixnfPhl-HUfEGSWSdoTv3rofQ7e_062QBgldSmpUNK2rSNuagAZiLiHDzjFFGHQD74fAA6fVPHD9o_iWGLxyWLM_xDmsQ9kStQlyoL1lJPjtWsWnrY8FIcLGszJDTKBa19GQ1IkN3-VM1M5w3fjgHyxunZ_3PIqtw6iDIyaa5ovp7hLPKf7zR1bzebgILzTzs1LgHQtH1ycvYhoDT5wmpwipzdUBW4ZAaZDByLQ16DTDQVEH-g-FDC.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":24782,24697,21987,24718,22561,22814,22702,22242,22899,24715,23347,24003,24684,24757,24766,23907,24712,23323,23993,22489,23967,23317,23888,22048,22049,24671,23956,24774,24776,22767","m":"1007796774_longtail","nc":1},"A2jbsLw":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3ixe04\/y0\/l\/en_US\/UKekSwDzTqG0gfp2bvC0uBEox0FBqrm7YvgdM-SLeCs0AKUi-QbPz5sahZ_FWuZ9h8WEIa6nns2kWah8qLI_pU_L8qp5Bb25p0wXYx9Ap03JhasXY4qKM5rtljNLxthsevMw7XB1KXNiN8ABBk7j-f6Zi_7WdzptHN26AaP-2Sjw-Dnh6jcdmVXPXSSq7PBpDfanipUjOjCZmNZo43f2P3vNQieoGapi6yqZZJtAkjwOY348SZwTwcekAeB9q5QFKpFlBalZSNPMTsKe0M8KCJieK-HgiehXb3Phs4i_r77jjSKKq4PxpNqfTopAkQLbu3oaXV5Fcp.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":24769,23979,23960,23942,24679,24531,24007,23340,23316,23947,23320,23943,23336,24000,24775,23999,24704,24677,24689,24762,24725,24784,24719,24783,23988,24721,23990,23656,24788,24713","m":"1007796774_longtail","nc":1},"7DhgKFs":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3indH4\/y0\/l\/en_US\/3TMdy2vMQV59d3CJ4JpiQJTb9lqxabK5qbkb_ipJtb7e2hCJvyirDpkSnFW7BRU1IGNYqFt9n2P-ucubnLZrGrfaFLJXkx8ys-62rSzGVmuKm-NTBXcpfVOaafTtEMBLHQDq8sBjwKi_XAJ3BczY150-hydW7mkbY8JclCuS4-NczIJa-RkISzkM14-3ff1ihBMQKH9snYZlKjcsq66NxPH3h_xOpAT5tQXCbG9JkSyHdjrh8q98iw1DdDXVfsRsQ7AzUSfm6tzNDEpBwXqWj9mKAYAIiwXktZ0OHiFKbU_N7mdnHqJTIohmRQ2b689CQvKFVYjeBk.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":24729,24672,23312,23948,24763,24006,24675,24731,15,24773,23348,23326,37,23305,23344,23343,23353,24005,23995,23963,24692,23955,24758,23294,24700,24669,23982,23489,23966,24676","m":"1007796774_main,1007796774_longtail","nc":1},"DnvkawA":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3i3HS4\/yV\/l\/en_US\/alGW6ij0nUBKpttZctsUAh7snRhBY2cFJJ2ox7D4ckTARtAwBie6gpm3-iPxuccQMwyJveFWkDDR4k9B7P8005D3N1GFDz2K7gzuYySt466q_ErEA_RAKj2QEr3TiNUfejyD0dCy81TCO-mSs5EX7EUkt6V-f-5J1GTPNP-gqmbGTdlYyLMnn9CCb-lbw64Pg5MzAsrk6DouQvBnnCNVXFutjzjtPcSNyiKAlwZY9VrUFtFxt8TQadd7hSJv6WhYwLeeXEG8bdzIdxTIaKT0umNmWjJcnOlKFhylaXJxty0fQxSRQi6vA3jrm8iPoryUilyMCHijIk.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23302,18148,23981,23311,23310,24008,23327,23975,23339,22843,24668,24771,24720,23292,22234,23997,23911,24779,23304,24716,22559,23962,24674,23341,23954,23957,24694,23998,23992,24756","m":"1007796774_longtail","nc":1},"Hti8Jyy":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yi\/r\/gIlLwbOheLl0MgmqdqkoJ3xRLoiiKdpWH6rFQ80ZJIPbh-qw2rfEd9eIgJ3t6cCh6WV9-K1Y2dRAVHp-wggvtrlqBkeWjmN2VsIXkVMgP0mtu9ScWk_hrtbZXsqhHQJJrW33iwsJY06ko3eBhru5eQC90EaYcTPigF0kkydk-1WCefCNUMkdcCJtWGd85H8MqrOScehZIbgEGnIGOWGhzKWh8qUcQEpNcz30M-Ux99y7DkR1P5b4iUWLrw98_YCgUMq13ZnHyEX3OivvegSCTjR7TPYroOjYApImVKSmWqi0cAprDLC7Te5_b9MByR_1IxM5miaxjd.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":24772,23949,22689,24002,24759,23260,24696,23307,23306,24009,23996,24004,23345,23959,24714,23338,23961,23324,18084,23945,23318,24703,23333,24770,24765,23346,24717,23985,23291,24709","m":"1007796774_longtail","nc":1},"IA35W9t":{"type":"css","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yf\/l\/0,cross\/vK5AjnuBuck.css?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":24665","nc":1},"3dE7hOM":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iHIO4\/yy\/l\/en_US\/fAeDB58g0BQ2OXjUZDIH3_BieyhdhRU3L.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23573,23880,23893","m":"1007796774_longtail","nc":1},"V4gVGzG":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y6\/r\/YHgPkyMYPjw.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23574","m":"1007796774_longtail","nc":1},"x1i5pBt":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3i7M54\/yj\/l\/en_US\/me7LiwnFv1d.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":16","m":"1007796774_main","nc":1}},"compMap":{"CometErrorRoot.react":{"r":["x13eeyY","L5R7p5D","L6Tx9we","CcM+LCX","3unTLaW"],"rdfds":{"m":["CometTooltipDeferredImpl.react"],"r":["WfD8LHV"]},"rds":{"m":["FbtLogging","LynxAsyncCallbackFalcoEvent","CometSuspenseFalcoEvent","IntlQtEventFalcoEvent"],"r":["POkG4Hf"]}},"CometKeyCommandWrapperDialog.react":{"r":["x13eeyY","L5R7p5D","oRj2xU5","MIwFPq4","CcM+LCX","+L0X93S","3unTLaW","L6Tx9we"],"rdfds":{"m":["CometTooltipDeferredImpl.react"],"r":["WfD8LHV"]},"rds":{"m":["FbtLogging","LynxAsyncCallbackFalcoEvent","CometSuspenseFalcoEvent","IntlQtEventFalcoEvent"],"r":["POkG4Hf"]}},"CometModifiedKeyCommandWrapperDialog.react":{"r":["x13eeyY","yjOc\/BX","KxYcLg+","L5R7p5D","qiVTe9f","CcM+LCX","L3yxVXS","3unTLaW","oHmjilq","L6Tx9we"],"rdfds":{"m":["CometTooltipDeferredImpl.react"],"r":["WfD8LHV"]},"rds":{"m":["FbtLogging","LynxAsyncCallbackFalcoEvent","CometSuspenseFalcoEvent","IntlQtEventFalcoEvent"],"r":["POkG4Hf"]}},"BarcelonaCookieConsentDialog.react":{"r":["x13eeyY","L5R7p5D","z6fuRko","5hdPwUp","CcM+LCX","zN+Mt9A","3unTLaW","L6Tx9we"],"rds":{"m":["BarcelonaCookieConsentLearnMoreDialog.react","FbtLogging","LynxAsyncCallbackFalcoEvent","CometSuspenseFalcoEvent","IntlQtEventFalcoEvent"],"r":["POkG4Hf"]}},"VideoPlayerHTML5ApiCea608State":{"r":["SrRwK8Q","CcM+LCX","x13eeyY"]},"VideoPlayerHTML5ApiWebVttState":{"r":["CcM+LCX","lI1Yib\/"]},"BarcelonaAnimatedScrollArea.react":{"r":["x13eeyY","L5R7p5D","A2+x9zZ","ouGJTJU","f2ZV5tU","h0zbdh+","CcM+LCX","L6Tx9we"]},"CometTooltip.react":{"r":["x13eeyY","L5R7p5D","CcM+LCX","3unTLaW","L6Tx9we"],"rdfds":{"m":["CometTooltipDeferredImpl.react"],"r":["WfD8LHV"]},"rds":{"m":["CometSuspenseFalcoEvent","FbtLogging","IntlQtEventFalcoEvent"],"r":["POkG4Hf"]},"be":1},"BaseTooltip.react":{"r":["x13eeyY","L5R7p5D","CcM+LCX","3unTLaW","L6Tx9we"],"be":1},"liveQueryFetchWithWWWInitial":{"r":["L5R7p5D","CcM+LCX","x13eeyY"],"rds":{"m":["ContextualConfig","BladeRunnerClient","DGWRequestStreamClient","MqttLongPollingRunner"],"r":["VJhwr7f","POkG4Hf"]},"be":1},"BarcelonaProfileRoot.react":{"r":["x13eeyY","L5R7p5D","CcM+LCX","L6Tx9we"],"rdfds":{"m":["BarcelonaProfilePage.react","CometPressable.react"],"r":["WfD8LHV","z6fuRko","f2ZV5tU","rKwGmdo","zN+Mt9A","3unTLaW"]},"rds":{"m":["BarcelonaAppUpsellDialog.react","BarcelonaOverflowMenu.react","BarcelonaFediverseExplainerDialog.react","BarcelonaProfileUserAvatarDialog.react","BarcelonaRegionGatedAppUpsellDialog.react","FbtLogging","LynxAsyncCallbackFalcoEvent","CometSuspenseFalcoEvent","IntlQtEventFalcoEvent","BarcelonaToast.react","BaseToast.react"],"r":["POkG4Hf","VJhwr7f","BG+mBnk"]},"be":1},"BarcelonaProfileThreadsRoot.react":{"r":["x13eeyY","L5R7p5D","CcM+LCX","3unTLaW","L6Tx9we"],"rdfds":{"m":["BarcelonaProfileThreadsTab.react","CometExceptionDialog.react","VideoPlayerSpinner.react","VideoPlayerCaptionsArea.react","CometTooltipDeferredImpl.react"],"r":["WfD8LHV","z6fuRko","f2ZV5tU","rKwGmdo","zN+Mt9A"]},"rds":{"m":["FbtLogging","CometSuspenseFalcoEvent","IntlQtEventFalcoEvent","BarcelonaAppUpsellDialog.react","BarcelonaOverflowMenu.react","ContextualConfig","BladeRunnerClient","BarcelonaLightboxDialog.react","BarcelonaRegionGatedAppUpsellDialog.react","VideoPlayerWithLiveVideoInterruptedOverlay.react","CometRelayEF","LynxAsyncCallbackFalcoEvent","DGWRequestStreamClient","CometToast.react","BarcelonaToast.react","MqttLongPollingRunner","BaseToast.react"],"r":["POkG4Hf","VJhwr7f","BG+mBnk"]},"be":1},"SecuredActionChallengePasswordDialog.react":{"r":["x13eeyY","WfD8LHV","VluRBpG","L5R7p5D","VJhwr7f","f2ZV5tU","L6Tx9we","4myS+FQ","ptX5H14","DTEAkkm","CcM+LCX","zN+Mt9A","3unTLaW"],"rdfds":{"m":["CometTooltipDeferredImpl.react","CometExceptionDialog.react"]},"rds":{"m":["ContextualConfig","BladeRunnerClient","FBBrowserPasswordEncryption","FbtLogging","LynxAsyncCallbackFalcoEvent","DGWRequestStreamClient","CometSuspenseFalcoEvent","IntlQtEventFalcoEvent","CometToast.react","CometRelayEF","MqttLongPollingRunner"],"r":["POkG4Hf","qcJ8oTc","HAdaAfP","VQxSZM7"]},"be":1},"SecuredActionDialogRoot.react":{"r":["x13eeyY","ppcMzf1","L5R7p5D","VJhwr7f","BmUKcMx","L6Tx9we","LddxAHS","80QnIbt","CcM+LCX","3unTLaW"],"rdfds":{"m":["CometExceptionDialog.react","CometTooltipDeferredImpl.react"],"r":["WfD8LHV"]},"rds":{"m":["ContextualConfig","BladeRunnerClient","CometRelayEF","FbtLogging","LynxAsyncCallbackFalcoEvent","DGWRequestStreamClient","CometSuspenseFalcoEvent","IntlQtEventFalcoEvent","CometToast.react","MqttLongPollingRunner"],"r":["POkG4Hf","BG+mBnk"]},"be":1},"SecuredActionChallengeCDSPasswordDialog.react":{"r":["x13eeyY","PfR8M03","L5R7p5D","kYwN4K1","L6Tx9we","3x11trx","80QnIbt","CcM+LCX","VQxSZM7","3unTLaW"],"rds":{"m":["FbtLogging","LynxAsyncCallbackFalcoEvent","CometSuspenseFalcoEvent","IntlQtEventFalcoEvent"],"r":["POkG4Hf"]},"be":1},"SecuredActionNoChallengeAvailableCDSDialog.react":{"r":["x13eeyY","SbjrRrE","L5R7p5D","kYwN4K1","L6Tx9we","3x11trx","80QnIbt","CcM+LCX","BXyw5s5","3unTLaW"],"rds":{"m":["FbtLogging","LynxAsyncCallbackFalcoEvent","CometSuspenseFalcoEvent","IntlQtEventFalcoEvent"],"r":["POkG4Hf"]},"be":1},"BarcelonaPostLikersDialog.react":{"r":["x13eeyY","L5R7p5D","f2ZV5tU","rKwGmdo","CcM+LCX","zN+Mt9A","3unTLaW","QYet1m8","L6Tx9we"],"rds":{"m":["FbtLogging","LynxAsyncCallbackFalcoEvent","CometSuspenseFalcoEvent","IntlQtEventFalcoEvent"],"r":["POkG4Hf"]},"be":1},"BarcelonaWebBloksEntryPoint.react":{"r":["N4YVD55","txi7upv","x13eeyY","CJJpFpi","hUeQzzr","WfD8LHV","lwH\/DrC","A2jbsLw","7DhgKFs","DnvkawA","L5R7p5D","Hti8Jyy","IA35W9t","CcM+LCX","3unTLaW","L6Tx9we","f2ZV5tU"],"rds":{"m":["PolarisUnfollowDialog.react","PolarisFBSDK","FbtLogging","LynxAsyncCallbackFalcoEvent","CometSuspenseFalcoEvent","IntlQtEventFalcoEvent","AsyncRequest","ContextualConfig","BladeRunnerClient","DGWRequestStreamClient","MqttLongPollingRunner"],"r":["3dE7hOM","V4gVGzG","POkG4Hf","x1i5pBt","VJhwr7f"]},"be":1}}})});
+requireLazy(["JSScheduler","ServerJS","ScheduledApplyEach"],function(JSScheduler,ServerJS,ScheduledApplyEach){qpl_inl("7252775685639807194","tierTwoBeforeScheduler");JSScheduler.runWithPriority(3,function(){qpl_inl("7252775685639807194","tierTwoInsideScheduler");(new ServerJS()).handleWithCustomApplyEach(ScheduledApplyEach,{"define":[["BarcelonaURLMatcherConfig",[],{"tlds":["\ud55c\uad6d","\uc0bc\uc131","\ub2f7\ucef4","\ub2f7\ub137","\u9999\u6e2f","\u9999\u683c\u91cc\u62c9","\u9910\u5385","\u98df\u54c1","\u98de\u5229\u6d66","\u96fb\u8a0a\u76c8\u79d1","\u96c6\u56e2","\u901a\u8ca9","\u8d2d\u7269","\u8c37\u6b4c","\u8bfa\u57fa\u4e9a","\u8054\u901a","\u7f51\u7edc","\u7f51\u7ad9","\u7f51\u5e97","\u7f51\u5740","\u7ec4\u7ec7\u673a\u6784","\u79fb\u52a8","\u73e0\u5b9d","\u70b9\u770b","\u6fb3\u9580","\u6e38\u620f","\u6de1\u9a6c\u9521","\u673a\u6784","\u66f8\u7c4d","\u65f6\u5c1a","\u65b0\u95fb","\u65b0\u52a0\u5761","\u653f\u5e9c","\u653f\u52a1","\u624b\u8868","\u624b\u673a","\u6211\u7231\u4f60","\u6148\u5584","\u5fae\u535a","\u5e7f\u4e1c","\u5de5\u884c","\u5bb6\u96fb","\u5a31\u4e50","\u5929\u4e3b\u6559","\u5927\u62ff","\u5927\u4f17\u6c7d\u8f66","\u5728\u7ebf","\u5609\u91cc\u5927\u9152\u5e97","\u5609\u91cc","\u5546\u6807","\u5546\u5e97","\u5546\u57ce","\u53f0\u7063","\u53f0\u6e7e","\u516c\u76ca","\u516c\u53f8","\u516b\u5366","\u5065\u5eb7","\u4fe1\u606f","\u4f5b\u5c71","\u4f01\u4e1a","\u4e2d\u6587\u7f51","\u4e2d\u570b","\u4e2d\u56fd","\u4e2d\u4fe1","\u4e16\u754c","\u30dd\u30a4\u30f3\u30c8","\u30d5\u30a1\u30c3\u30b7\u30e7\u30f3","\u30bb\u30fc\u30eb","\u30b9\u30c8\u30a2","\u30b3\u30e0","\u30b0\u30fc\u30b0\u30eb","\u30af\u30e9\u30a6\u30c9","\u307f\u3093\u306a","\u10d2\u10d4","\u0e44\u0e17\u0e22","\u0e04\u0e2d\u0e21","\u0dbd\u0d82\u0d9a\u0dcf","\u0d2d\u0d3e\u0d30\u0d24\u0d02","\u0cad\u0cbe\u0cb0\u0ca4","\u0c2d\u0c3e\u0c30\u0c24\u0c4d","\u0b9a\u0bbf\u0b99\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0bc2\u0bb0\u0bcd","\u0b87\u0bb2\u0b99\u0bcd\u0b95\u0bc8","\u0b87\u0ba8\u0bcd\u0ba4\u0bbf\u0baf\u0bbe","\u0b2d\u0b3e\u0b30\u0b24","\u0aad\u0abe\u0ab0\u0aa4","\u0a2d\u0a3e\u0a30\u0a24","\u09ad\u09be\u09f0\u09a4","\u09ad\u09be\u09b0\u09a4","\u09ac\u09be\u0982\u09b2\u09be","\u0938\u0902\u0917\u0920\u0928","\u092d\u093e\u0930\u094b\u0924","\u092d\u093e\u0930\u0924\u092e\u094d","\u092d\u093e\u0930\u0924","\u0928\u0947\u091f","\u0915\u0949\u092e","\u0680\u0627\u0631\u062a","\u067e\u0627\u06a9\u0633\u062a\u0627\u0646","\u0647\u0645\u0631\u0627\u0647","\u0645\u0648\u0642\u0639","\u0645\u0648\u0628\u0627\u064a\u0644\u064a","\u0645\u0644\u064a\u0633\u064a\u0627","\u0645\u0635\u0631","\u0643\u0648\u0645","\u0643\u0627\u062b\u0648\u0644\u064a\u0643","\u0642\u0637\u0631","\u0641\u0644\u0633\u0637\u064a\u0646","\u0639\u0645\u0627\u0646","\u0639\u0631\u0628","\u0639\u0631\u0627\u0642","\u0634\u0628\u0643\u0629","\u0633\u0648\u0631\u064a\u0629","\u0633\u0648\u062f\u0627\u0646","\u062a\u0648\u0646\u0633","\u0628\u06be\u0627\u0631\u062a","\u0628\u064a\u062a\u0643","\u0628\u0627\u0632\u0627\u0631","\u0628\u0627\u0631\u062a","\u0627\u06cc\u0631\u0627\u0646","\u0627\u0645\u0627\u0631\u0627\u062a","\u0627\u0644\u0645\u063a\u0631\u0628","\u0627\u0644\u0639\u0644\u064a\u0627\u0646","\u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629","\u0627\u0644\u062c\u0632\u0627\u0626\u0631","\u0627\u0644\u0627\u0631\u062f\u0646","\u0627\u0631\u0627\u0645\u0643\u0648","\u0627\u062a\u0635\u0627\u0644\u0627\u062a","\u0627\u0628\u0648\u0638\u0628\u064a","\u05e7\u05d5\u05dd","\u0570\u0561\u0575","\u049b\u0430\u0437","\u0443\u043a\u0440","\u0441\u0440\u0431","\u0441\u0430\u0439\u0442","\u0440\u0444","\u0440\u0443\u0441","\u043e\u0440\u0433","\u043e\u043d\u043b\u0430\u0439\u043d","\u043c\u043e\u0441\u043a\u0432\u0430","\u043c\u043e\u043d","\u043c\u043a\u0434","\u043a\u043e\u043c","\u043a\u0430\u0442\u043e\u043b\u0438\u043a","\u0435\u044e","\u0434\u0435\u0442\u0438","\u0431\u0435\u043b","\u0431\u0433","\u03b5\u03bb","zw","zuerich","zone","zm","zippo","zip","zero","zara","zappos","za","yun","yt","youtube","you","yokohama","yoga","yodobashi","ye","yandex","yamaxun","yahoo","yachts","xyz","xxx","xperia","xn--zfr164b","xn--ygbi2ammx","xn--yfro4i67o","xn--y9a3aq","xn--xkc2dl3a5ee0h","xn--xkc2al3hye2a","xn--xhq521b","xn--wgbl6a","xn--wgbh1c","xn--w4rs40l","xn--w4r85el8fhu5dnra","xn--vuq861b","xn--vhquv","xn--vermgensberatung-pwb","xn--vermgensberater-ctb","xn--unup4y","xn--tiq49xqyj","xn--tckwe","xn--t60b56a","xn--ses554g","xn--s9brj9c","xn--rvc1e0am3e","xn--rovu88b","xn--rhqv96g","xn--qxam","xn--qcka1pmc","xn--q9jyb4c","xn--pssy2u","xn--pgbs0dh","xn--pbt977c","xn--p1ai","xn--p1acf","xn--ogbpf8fl","xn--o3cw4h","xn--nyqy26a","xn--nqv7fs00ema","xn--nqv7f","xn--node","xn--ngbrx","xn--ngbe9e0a","xn--ngbc5azd","xn--mxtq1m","xn--mk1bu44c","xn--mix891f","xn--mgbx4cd0ab","xn--mgbtx2b","xn--mgbt3dhd","xn--mgbpl2fh","xn--mgbi4ecexp","xn--mgbgu82a","xn--mgberp4a5d4ar","xn--mgbca7dzdo","xn--mgbc0a9azcg","xn--mgbbh1a71e","xn--mgbbh1a","xn--mgbb9fbpob","xn--mgbayh7gpa","xn--mgbai9azgqp6j","xn--mgbab2bd","xn--mgbaam7a8h","xn--mgbaakc7dvf","xn--mgba7c0bbn0a","xn--mgba3a4f16a","xn--mgba3a3ejt","xn--mgb9awbf","xn--lgbbat1ad8j","xn--l1acc","xn--kput3i","xn--kpu716f","xn--kpry57d","xn--kprw13d","xn--kcrx77d1x4a","xn--jvr189m","xn--jlq61u9w7b","xn--j6w193g","xn--j1amh","xn--j1aef","xn--io0a7i","xn--imr513n","xn--i1b6b1a6a2e","xn--hxt814e","xn--h2brj9c8c","xn--h2brj9c","xn--h2breg3eve","xn--gk3at1e","xn--gecrj9c","xn--gckr3f0f","xn--g2xx48c","xn--fzys8d69uvgm","xn--fzc2c9e2c","xn--fpcrj9c3d","xn--flw351e","xn--fjq720a","xn--fiqz9s","xn--fiqs8s","xn--fiq64b","xn--fiq228c5hs","xn--fhbei","xn--fct429k","xn--estv75g","xn--efvy88h","xn--eckvdtc9d","xn--e1a4c","xn--d1alf","xn--d1acj3b","xn--czru2d","xn--czrs0t","xn--czr694b","xn--clchc0ea0b2g2a9gcd","xn--cg4bki","xn--cck2b3b","xn--c2br7g","xn--c1avg","xn--bck1b9a5dre4c","xn--b4w605ferd","xn--9krt00a","xn--9et52u","xn--9dbq2a","xn--90ais","xn--90ae","xn--90a3ac","xn--8y0a063a","xn--80aswg","xn--80asehdb","xn--80aqecdr1a","xn--80ao21a","xn--80adxhks","xn--6qq986b3xl","xn--6frz82g","xn--5tzm5g","xn--5su34j936bgsg","xn--55qx5d","xn--55qw42g","xn--54b7fta0cc","xn--4gbrim","xn--45q11c","xn--45brj9c","xn--45br5cyl","xn--42c2d9a","xn--3pxu8k","xn--3oq18vl8pn36a","xn--3hcrj9c","xn--3e0b707e","xn--3ds443g","xn--3bst00m","xn--30rr7y","xn--2scrj9c","xn--1qqw23a","xn--1ck2e1b","xn--11b4c3d","xin","xihuan","xfinity","xerox","xbox","wtf","wtc","ws","wow","world","works","work","woodside","wolterskluwer","wme","winners","wine","windows","win","williamhill","wiki","wien","whoswho","wf","weir","weibo","wedding","wed","website","weber","webcam","weatherchannel","weather","watches","watch","warman","wanggou","wang","walter","walmart","wales","vuelos","vu","voyage","voto","voting","vote","volvo","volkswagen","vodka","vn","vlaanderen","vivo","viva","vistaprint","vista","vision","visa","virgin","vip","vin","villas","viking","vig","video","viajes","vi","vg","vet","versicherung","verm\u00f6gensberatung","verm\u00f6gensberater","verisign","ventures","vegas","ve","vc","vanguard","vana","vacations","va","uz","uy","us","ups","uol","uno","university","unicom","uk","ug","uconnect","ubs","ubank","ua","tz","tw","tvs","tv","tushu","tunes","tui","tube","tt","trv","trust","travelersinsurance","travelers","travelchannel","travel","training","trading","trade","tr","toys","toyota","town","tours","total","toshiba","toray","top","tools","tokyo","today","to","tn","tmall","tm","tl","tkmaxx","tk","tjx","tjmaxx","tj","tirol","tires","tips","tiffany","tienda","tickets","tiaa","theatre","theater","thd","th","tg","tf","teva","tennis","temasek","telefonica","telecity","tel","technology","tech","team","tdk","td","tci","tc","taxi","tax","tattoo","tatar","tatamotors","target","taobao","talk","taipei","tab","sz","systems","symantec","sydney","sy","sx","swiss","swiftcover","swatch","sv","suzuki","surgery","surf","support","supply","supplies","sucks","su","style","study","studio","stream","store","storage","stockholm","stcgroup","stc","statoil","statefarm","statebank","starhub","star","staples","stada","st","srt","srl","sr","spreadbetting","spot","sport","spiegel","space","soy","sony","song","solutions","solar","sohu","software","softbank","social","soccer","so","sncf","sn","smile","smart","sm","sling","sl","skype","sky","skin","ski","sk","sj","site","singles","sina","silk","si","shriram","showtime","show","shouji","shopping","shop","shoes","shiksha","shia","shell","shaw","sharp","shangrila","sh","sg","sfr","sexy","sex","sew","seven","ses","services","sener","select","seek","security","secure","seat","search","se","sd","scot","scor","scjohnson","science","schwarz","schule","school","scholarships","schmidt","schaeffler","scb","sca","sc","sbs","sbi","sb","saxo","save","sas","sarl","sapo","sap","sanofi","sandvikcoromant","sandvik","samsung","samsclub","salon","sale","sakura","safety","safe","saarland","sa","ryukyu","rwe","rw","run","ruhr","rugby","ru","rsvp","rs","room","rogers","rodeo","rocks","rocher","ro","rmit","rip","rio","ril","rightathome","ricoh","richardli","rich","rexroth","reviews","review","restaurant","rest","republican","report","repair","rentals","rent","ren","reliance","reit","reisen","reise","rehab","redumbrella","redstone","red","recipes","realty","realtor","realestate","read","re","raid","radio","racing","qvc","quest","quebec","qpon","qa","py","pwc","pw","pub","pt","ps","prudential","pru","protection","property","properties","promo","progressive","prof","productions","prod","pro","prime","press","praxi","pramerica","pr","post","porn","politie","poker","pohl","pnc","pn","pm","plus","plumbing","playstation","play","place","pl","pk","pizza","pioneer","pink","ping","pin","pid","pictures","pictet","pics","piaget","physio","photos","photography","photo","phone","philips","phd","pharmacy","ph","pg","pfizer","pf","pet","pe","pccw","pay","passagens","party","parts","partners","pars","paris","panerai","panasonic","page","pa","ovh","ott","otsuka","osaka","origins","organic","org","orange","oracle","open","ooo","onyourside","online","onl","onion","ong","one","omega","om","ollo","oldnavy","olayangroup","olayan","okinawa","office","off","observer","obi","nz","nyc","nu","ntt","nrw","nra","nr","np","nowtv","nowruz","now","norton","northwesternmutual","nokia","no","nl","nissay","nissan","ninja","nikon","nike","nico","ni","nhk","ngo","ng","nfl","nf","nexus","nextdirect","next","news","newholland","new","neustar","network","netflix","netbank","net","nec","ne","nc","nba","navy","natura","nationwide","name","nagoya","nadex","nab","na","mz","my","mx","mw","mv","mutual","museum","mu","mtr","mtn","mt","msd","ms","mr","mq","mp","movistar","movie","mov","motorcycles","moto","moscow","mortgage","mormon","mopar","monster","money","monash","mom","moi","moe","moda","mobily","mobile","mobi","mo","mn","mma","mm","mls","mlb","ml","mk","mitsubishi","mit","mint","mini","mil","microsoft","miami","mh","mg","metlife","merckmsd","meo","menu","men","memorial","meme","melbourne","meet","media","med","me","md","mckinsey","mc","mba","mattel","maserati","marshalls","marriott","markets","marketing","market","map","mango","management","man","makeup","maison","maif","madrid","macys","ma","ly","lv","luxury","luxe","lupin","lundbeck","lu","ltda","ltd","lt","ls","lr","lplfinancial","lpl","love","lotto","lotte","london","lol","loft","locus","locker","loans","loan","lk","llc","lixil","living","live","lipsy","link","linde","lincoln","limo","limited","lilly","like","lighting","lifestyle","lifeinsurance","life","lidl","liaison","li","lgbt","lexus","lego","legal","lefrak","leclerc","lease","lds","lc","lb","lawyer","law","latrobe","latino","lat","lasalle","lanxess","landrover","land","lancome","lancia","lancaster","lamer","lamborghini","ladbrokes","lacaixa","la","kz","kyoto","ky","kw","kuokgroup","kred","krd","kr","kpn","kpmg","kp","kosher","komatsu","koeln","kn","km","kiwi","kitchen","kindle","kinder","kim","kia","ki","kh","kg","kfh","kerryproperties","kerrylogistics","kerryhotels","ke","kddi","kaufen","juniper","juegos","jprs","jpmorgan","jp","joy","jot","joburg","jobs","jo","jnj","jmp","jm","jll","jlc","jio","jewelry","jetzt","jeep","je","jcp","jcb","java","jaguar","iwc","iveco","itv","itau","it","istanbul","ist","ismaili","iselect","is","irish","ir","iq","ipiranga","io","investments","intuit","international","intel","int","insure","insurance","institute","ink","ing","info","infiniti","industries","inc","in","immobilien","immo","imdb","imamat","im","il","ikano","ifm","ieee","ie","id","icu","ice","icbc","ibm","hyundai","hyatt","hughes","hu","ht","hsbc","hr","how","house","hotmail","hotels","hoteles","hot","hosting","host","hospital","horse","honeywell","honda","homesense","homes","homegoods","homedepot","holiday","holdings","hockey","hn","hm","hkt","hk","hiv","hitachi","hisamitsu","hiphop","hgtv","hermes","here","helsinki","help","healthcare","health","hdfcbank","hdfc","hbo","haus","hangout","hamburg","hair","gy","gw","guru","guitars","guide","guge","gucci","guardian","gu","gt","gs","group","grocery","gripe","green","gratis","graphics","grainger","gr","gq","gp","gov","got","gop","google","goog","goodyear","goodhands","goo","golf","goldpoint","gold","godaddy","gn","gmx","gmo","gmbh","gmail","gm","globo","global","gle","glass","glade","gl","giving","gives","gifts","gift","gi","gh","ggee","gg","gf","george","genting","gent","gea","ge","gdn","gd","gbiz","gb","gay","garden","gap","games","game","gallup","gallo","gallery","gal","ga","fyi","futbol","furniture","fund","fun","fujixerox","fujitsu","ftr","frontier","frontdoor","frogans","frl","fresenius","free","fr","fox","foundation","forum","forsale","forex","ford","football","foodnetwork","food","foo","fo","fm","fly","flowers","florist","flir","flights","flickr","fk","fj","fitness","fit","fishing","fish","firmdale","firestone","fire","financial","finance","final","film","fido","fidelity","fiat","fi","ferrero","ferrari","feedback","fedex","fast","fashion","farmers","farm","fans","fan","family","faith","fairwinds","fail","fage","extraspace","express","exposed","expert","exchange","everbank","events","eus","eurovision","eu","etisalat","et","esurance","estate","esq","es","erni","ericsson","er","equipment","epson","epost","enterprises","engineering","engineer","energy","emerck","email","eg","ee","education","edu","edeka","eco","ec","eat","earth","dz","dvr","dvag","durban","dupont","duns","dunlop","duck","dubai","dtv","drive","download","dot","domains","doha","dog","dodge","doctor","docs","do","dnp","dm","dk","dj","diy","dish","discover","discount","directory","direct","digital","diet","diamonds","dhl","dev","design","desi","dentist","dental","democrat","delta","deloitte","dell","delivery","degree","deals","dealer","deal","de","dds","dclk","day","datsun","dating","date","data","dance","dad","dabur","cz","cyou","cymru","cy","cx","cw","cv","cuisinella","cu","csc","cruises","cruise","crs","crown","cricket","creditunion","creditcard","credit","cr","cpa","courses","coupons","coupon","country","corsica","coop","cool","cookingchannel","cooking","contractors","contact","consulting","construction","condos","comsec","computer","compare","company","community","commbank","comcast","com","cologne","college","coffee","codes","coach","co","cn","cm","clubmed","club","cloud","clothing","clinique","clinic","click","cleaning","claims","cl","ck","cityeats","city","citic","citi","citadel","cisco","circle","cipriani","ci","church","chrysler","chrome","christmas","chintai","cheap","chat","chase","channel","chanel","ch","cg","cfd","cfa","cf","cern","ceo","center","ceb","cd","cc","cbs","cbre","cbn","cba","catholic","catering","cat","casino","cash","caseih","case","casa","cartier","cars","careers","career","care","cards","caravan","car","capitalone","capital","capetown","canon","cancerresearch","camp","camera","cam","calvinklein","call","cal","cafe","cab","ca","bzh","bz","by","bw","bv","buzz","buy","business","builders","build","bugatti","budapest","bt","bs","brussels","brother","broker","broadway","bridgestone","bradesco","br","box","boutique","bot","boston","bostik","bosch","boots","booking","book","boo","bond","bom","bofa","boehringer","boats","bo","bnpparibas","bnl","bn","bmw","bms","bm","blue","bloomberg","blog","blockbuster","blanco","blackfriday","black","bj","biz","bio","bingo","bing","bike","bid","bible","bi","bharti","bh","bg","bf","bet","bestbuy","best","berlin","bentley","beer","beauty","beats","be","bd","bcn","bcg","bbva","bbt","bbc","bb","bayern","bauhaus","basketball","baseball","bargains","barefoot","barclays","barclaycard","barcelona","bar","bank","band","bananarepublic","banamex","baidu","baby","ba","azure","az","axa","ax","aws","aw","avianca","autos","auto","author","auspost","audio","audible","audi","auction","au","attorney","athleta","at","associates","asia","asda","as","arte","art","arpa","army","archi","aramco","arab","ar","aquarelle","aq","apple","app","apartments","aol","ao","anz","anquan","android","analytics","amsterdam","amica","amfam","amex","americanfamily","americanexpress","am","alstom","alsace","ally","allstate","allfinanz","alipay","alibaba","alfaromeo","al","akdn","airtel","airforce","airbus","aigo","aig","ai","agency","agakhan","ag","africa","afl","afamilycompany","af","aetna","aero","aeg","ae","adult","ads","adac","ad","actor","active","aco","accountants","accountant","accenture","academy","ac","abudhabi","abogado","able","abc","abbvie","abbott","abb","abarth","aarp","aaa"]},7198],["BarcelonaWebConfig",[],{"is_crawler_request":false,"is_past_launch_date":true,"username_domain_suffix":"threads.net","seconds_until_launch_date":-1,"golden_ticket_triggers":[],"fediverse_server_names":[]},7172],["DateFormatConfig",[],{"numericDateOrder":["m","d","y"],"numericDateSeparator":"\/","shortDayNames":["Mon","Tue","Wed","Thu","Fri","Sat","Sun"],"narrowDayNames":["M","T","W","T","F","S","S"],"timeSeparator":":","weekStart":6,"formats":{"D":"D","D g:ia":"D g:ia","D M d":"D M d","D M d, Y":"D M d, Y","D M j":"D M j","D M j, g:ia":"D M j, g:ia","D M j, y":"D M j, y","D M j, Y g:ia":"D M j, Y g:ia","D, M j, Y":"D, M j, Y","F d":"F d","F d, Y":"F d, Y","F g":"F g","F j":"F j","F j, Y":"F j, Y","F j, Y \u0040 g:i A":"F j, Y \u0040 g:i A","F j, Y g:i a":"F j, Y g:i a","F jS":"F jS","F jS, g:ia":"F jS, g:ia","F jS, Y":"F jS, Y","F Y":"F Y","g A":"g A","g:i":"g:i","g:i A":"g:i A","g:i a":"g:i a","g:iA":"g:iA","g:ia":"g:ia","g:ia F jS, Y":"g:ia F jS, Y","g:iA l, F jS":"g:iA l, F jS","g:ia M j":"g:ia M j","g:ia M jS":"g:ia M jS","g:ia, F jS":"g:ia, F jS","g:iA, l M jS":"g:iA, l M jS","g:sa":"g:sa","H:I - M d, Y":"H:I - M d, Y","h:i a":"h:i a","h:m:s m\/d\/Y":"h:m:s m\/d\/Y","j":"j","l F d, Y":"l F d, Y","l g:ia":"l g:ia","l, F d, Y":"l, F d, Y","l, F j":"l, F j","l, F j, Y":"l, F j, Y","l, F jS":"l, F jS","l, F jS, g:ia":"l, F jS, g:ia","l, M j":"l, M j","l, M j, Y":"l, M j, Y","l, M j, Y g:ia":"l, M j, Y g:ia","M d":"M d","M d, Y":"M d, Y","M d, Y g:ia":"M d, Y g:ia","M d, Y ga":"M d, Y ga","M j":"M j","M j, Y":"M j, Y","M j, Y g:i A":"M j, Y g:i A","M j, Y g:ia":"M j, Y g:ia","M jS, g:ia":"M jS, g:ia","M Y":"M Y","M y":"M y","m-d-y":"m-d-y","M. d":"M. d","M. d, Y":"M. d, Y","j F Y":"j F Y","m.d.y":"m.d.y","m\/d":"m\/d","m\/d\/Y":"m\/d\/Y","m\/d\/y":"m\/d\/y","m\/d\/Y g:ia":"m\/d\/Y g:ia","m\/d\/y H:i:s":"m\/d\/y H:i:s","m\/d\/Y h:m":"m\/d\/Y h:m","n":"n","n\/j":"n\/j","n\/j, g:ia":"n\/j, g:ia","n\/j\/y":"n\/j\/y","Y":"Y","Y-m-d":"Y-m-d","Y\/m\/d":"Y\/m\/d","y\/m\/d":"y\/m\/d","j \/ F \/ Y":"j \/ F \/ Y"},"ordinalSuffixes":{"1":"st","2":"nd","3":"rd","4":"th","5":"th","6":"th","7":"th","8":"th","9":"th","10":"th","11":"th","12":"th","13":"th","14":"th","15":"th","16":"th","17":"th","18":"th","19":"th","20":"th","21":"st","22":"nd","23":"rd","24":"th","25":"th","26":"th","27":"th","28":"th","29":"th","30":"th","31":"st"}},165],["IntlCompactDecimalNumberFormatConfig",[],{"short_patterns":{"3":{"4":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0mil","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0mil"},"24":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0mil","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0mil"}},"4":{"4":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0mil","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0mil"},"24":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0mil","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0mil"}},"5":{"4":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0mil","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0mil"},"24":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0mil","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0mil"}},"6":{"4":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0mi","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0mi"},"24":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0mi","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0mi"}},"7":{"4":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0mi","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0mi"},"24":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0mi","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0mi"}},"8":{"4":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0mi","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0mi"},"24":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0mi","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0mi"}},"9":{"4":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0bi","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0bi"},"24":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0bi","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0bi"}},"10":{"4":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0bi","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0bi"},"24":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0bi","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0bi"}},"11":{"4":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0bi","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0bi"},"24":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0bi","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0bi"}},"12":{"4":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0tri","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0tri"},"24":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0tri","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0tri"}},"13":{"4":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0tri","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0tri"},"24":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0tri","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0tri"}},"14":{"4":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0tri","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0tri"},"24":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0tri","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0tri"}}},"long_patterns":{"3":{"4":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":" mil","negative_prefix_pattern":"-","negative_suffix_pattern":" mil"},"24":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":" mil","negative_prefix_pattern":"-","negative_suffix_pattern":" mil"}},"4":{"4":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":" mil","negative_prefix_pattern":"-","negative_suffix_pattern":" mil"},"24":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":" mil","negative_prefix_pattern":"-","negative_suffix_pattern":" mil"}},"5":{"4":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":" mil","negative_prefix_pattern":"-","negative_suffix_pattern":" mil"},"24":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":" mil","negative_prefix_pattern":"-","negative_suffix_pattern":" mil"}},"6":{"4":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":" milh\u00e3o","negative_prefix_pattern":"-","negative_suffix_pattern":" milh\u00e3o"},"24":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":" milh\u00f5es","negative_prefix_pattern":"-","negative_suffix_pattern":" milh\u00f5es"}},"7":{"4":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":" milh\u00e3o","negative_prefix_pattern":"-","negative_suffix_pattern":" milh\u00e3o"},"24":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":" milh\u00f5es","negative_prefix_pattern":"-","negative_suffix_pattern":" milh\u00f5es"}},"8":{"4":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":" milh\u00e3o","negative_prefix_pattern":"-","negative_suffix_pattern":" milh\u00e3o"},"24":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":" milh\u00f5es","negative_prefix_pattern":"-","negative_suffix_pattern":" milh\u00f5es"}},"9":{"4":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":" bilh\u00e3o","negative_prefix_pattern":"-","negative_suffix_pattern":" bilh\u00e3o"},"24":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":" bilh\u00f5es","negative_prefix_pattern":"-","negative_suffix_pattern":" bilh\u00f5es"}},"10":{"4":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":" bilh\u00e3o","negative_prefix_pattern":"-","negative_suffix_pattern":" bilh\u00e3o"},"24":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":" bilh\u00f5es","negative_prefix_pattern":"-","negative_suffix_pattern":" bilh\u00f5es"}},"11":{"4":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":" bilh\u00e3o","negative_prefix_pattern":"-","negative_suffix_pattern":" bilh\u00e3o"},"24":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":" bilh\u00f5es","negative_prefix_pattern":"-","negative_suffix_pattern":" bilh\u00f5es"}},"12":{"4":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":" trilh\u00e3o","negative_prefix_pattern":"-","negative_suffix_pattern":" trilh\u00e3o"},"24":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":" trilh\u00f5es","negative_prefix_pattern":"-","negative_suffix_pattern":" trilh\u00f5es"}},"13":{"4":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":" trilh\u00e3o","negative_prefix_pattern":"-","negative_suffix_pattern":" trilh\u00e3o"},"24":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":" trilh\u00f5es","negative_prefix_pattern":"-","negative_suffix_pattern":" trilh\u00f5es"}},"14":{"4":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":" trilh\u00e3o","negative_prefix_pattern":"-","negative_suffix_pattern":" trilh\u00e3o"},"24":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":" trilh\u00f5es","negative_prefix_pattern":"-","negative_suffix_pattern":" trilh\u00f5es"}}}},2981],["CLDRDateRenderingClientRollout",[],{"formatDateClientLoggerSamplingRate":0.0001},3003],["VideoPlayerStateBasedLoggingEvents",[],{"StateBasedLoggingEventNames":["cancelled_requested_playing","caption_change","chromecast_availability_checked","chromecast_not_supported","chromecast_button_visible","entered_fs","entered_hd","error","exited_fs","exited_hd","finished_loading","finished_playing","headset_connected","headset_disconnected","host_error","muted","paused","player_format_changed","quality_change","requested_playing","scrubbed","seeked","started_playing","unmuted","unpaused","volume_changed","volume_decrease","volume_increase","viewport_rotated","viewport_zoomed","heading_reset","guide_entered","guide_exited","spherical_fallback_entered","played_for_three_seconds","commercial_break_offscreen","commercial_break_onscreen","ad_break_starting_indicator","ad_break_non_interruptive_ad_start","ad_break_non_interruptive_ad_click","ad_break_pre_roll_ad_start","ad_break_tap_on_trailer","ad_break_tap_start_from_trailer","representation_ended","heart_beat","stale","viewability_changed","video_logging_session_timeout","video_logging_session_wakeup","retry_on_error","playback_speed_changed","video_warmup_evicted","suppress_video_off","suppress_video_on","error_recovery_attempt","displayed_frames","video_viewability_updated"]},3462],["CLDRDateFormatConfig",[],{"supportedPHPFormatsKeys":{"D":"E","D g:ia":"Ejm","D M d":"MMMEd","D M d, Y":"yMMMEd","D M j":"MMMEd","D M j, y":"yMMMEd","D, M j":"MMMEd","D, M j, Y":"yMMMEd","F d":"MMMMd","F d, Y":"date_long","F j":"MMMMd","F j, Y":"date_long","F j, Y \u0040 g:i A":"dateTime_long_short","F j, Y g:i a":"dateTime_long_short","F j, Y \u0040 g:i:s A":"dateTime_long_medium","F jS":"MMMMd","F jS, g:ia":"dateTime_long_short","F jS, Y":"date_long","F Y":"yMMMM","g A":"j","G:i":"time_short","g:i":"time_short","g:i a":"time_short","g:i A":"time_short","g:i:s A":"time_medium","g:ia":"time_short","g:iA":"time_short","g:ia F jS, Y":"dateTime_long_short","g:iA l, F jS":"dateTime_full_short","g:ia M jS":"dateTime_medium_short","g:ia, F jS":"dateTime_long_short","g:iA, l M jS":"dateTime_full_short","h:i a":"time_short","h:m:s m\/d\/Y":"dateTime_short_short","j":"d","j F Y":"date_long","l F d, Y":"date_full","l, F d, Y":"date_full","l, F j":"date_full","l, F j, Y":"date_full","l, F jS":"date_full","l, F jS, g:ia":"dateTime_full_short","l, M j":"date_full","l, M j, Y":"date_full","l, M j, Y g:ia":"dateTime_full_short","M d":"MMMd","M d, Y":"date_medium","M d, Y g:ia":"dateTime_medium_short","M d, Y ga":"dateTime_medium_short","M j":"MMMd","M j, Y":"date_medium","M j, Y g:i A":"dateTime_medium_short","M j, Y g:ia":"dateTime_medium_short","M jS, g:ia":"dateTime_medium_short","M y":"yMMM","M Y":"yMMM","M. d":"MMMd","M. d, Y":"date_medium","m\/d":"Md","m\/d\/Y g:ia":"dateTime_short_short","m\/d\/y H:i:s":"dateTime_short_short","n":"M","n\/j":"Md","n\/j, g:ia":"dateTime_short_short","n\/j\/y":"date_short","Y":"y"},"isLocaleInConfigerator":true,"CLDRConfigeratorFormats":{"dateFormats":{"full":"EEEE, d 'de' MMMM 'de' y","long":"d 'de' MMMM 'de' y","medium":"d 'de' MMM 'de' y","short":"dd\/MM\/y"},"timeFormats":{"full":"HH:mm:ss zzzz","long":"HH:mm:ss z","medium":"HH:mm:ss","short":"HH:mm"},"dateTimeFormats":{"full":"{1} {0}","long":"{1} {0}","medium":"{1} {0}","short":"{1} {0}"},"availableFormats":{"Bh":"h B","Bhm":"h:mm B","Bhms":"h:mm:ss B","E":"ccc","EBhm":"E h:mm B","EBhms":"E h:mm:ss B","EHm":"E, HH:mm","EHms":"E, HH:mm:ss","Ed":"E, d","Ehm":"E, h:mm a","Ehms":"E, h:mm:ss a","Gy":"y G","GyMMM":"MMM 'de' y G","GyMMMEd":"E, d 'de' MMM 'de' y G","GyMMMd":"d 'de' MMM 'de' y G","H":"HH","Hm":"HH:mm","Hms":"HH:mm:ss","Hmsv":"HH:mm:ss v","Hmv":"HH:mm v","M":"L","MEd":"E, dd\/MM","MMM":"LLL","MMMEd":"E, d 'de' MMM","MMMMEd":"E, d 'de' MMMM","MMMMW-count-one":"W'\u00aa' 'semana' 'de' MMMM","MMMMW-count-other":"W'\u00aa' 'semana' 'de' MMMM","MMMMd":"d 'de' MMMM","MMMd":"d 'de' MMM","MMdd":"dd\/MM","Md":"d\/M","d":"d","h":"h a","hm":"h:mm a","hms":"h:mm:ss a","hmsv":"h:mm:ss a v","hmv":"h:mm a v","ms":"mm:ss","y":"y","yM":"MM\/y","yMEd":"E, dd\/MM\/y","yMM":"MM\/y","yMMM":"MMM 'de' y","yMMMEd":"E, d 'de' MMM 'de' y","yMMMM":"MMMM 'de' y","yMMMMEd":"E, d 'de' MMMM 'de' y","yMMMMd":"d 'de' MMMM 'de' y","yMMMd":"d 'de' MMM 'de' y","yMd":"dd\/MM\/y","yQQQ":"QQQ 'de' y","yQQQQ":"QQQQ 'de' y","yw-count-one":"w'\u00aa' 'semana' 'de' Y","yw-count-other":"w'\u00aa' 'semana' 'de' Y"}},"CLDRRegionalConfigeratorFormats":{"dateFormats":{"full":"EEEE, d 'de' MMMM 'de' y","long":"d 'de' MMMM 'de' y","medium":"d 'de' MMM 'de' y","short":"dd\/MM\/y"},"timeFormats":{"full":"HH:mm:ss zzzz","long":"HH:mm:ss z","medium":"HH:mm:ss","short":"HH:mm"},"dateTimeFormats":{"full":"{1} {0}","long":"{1} {0}","medium":"{1} {0}","short":"{1} {0}"},"availableFormats":{"Bh":"h B","Bhm":"h:mm B","Bhms":"h:mm:ss B","E":"ccc","EBhm":"E h:mm B","EBhms":"E h:mm:ss B","EHm":"E, HH:mm","EHms":"E, HH:mm:ss","Ed":"E, d","Ehm":"E, h:mm a","Ehms":"E, h:mm:ss a","Gy":"y G","GyMMM":"MMM 'de' y G","GyMMMEd":"E, d 'de' MMM 'de' y G","GyMMMd":"d 'de' MMM 'de' y G","H":"HH","Hm":"HH:mm","Hms":"HH:mm:ss","Hmsv":"HH:mm:ss v","Hmv":"HH:mm v","M":"L","MEd":"E, dd\/MM","MMM":"LLL","MMMEd":"E, d 'de' MMM","MMMMEd":"E, d 'de' MMMM","MMMMW-count-one":"W'\u00aa' 'semana' 'de' MMMM","MMMMW-count-other":"W'\u00aa' 'semana' 'de' MMMM","MMMMd":"d 'de' MMMM","MMMd":"d 'de' MMM","MMdd":"dd\/MM","Md":"d\/M","d":"d","h":"h a","hm":"h:mm a","hms":"h:mm:ss a","hmsv":"h:mm:ss a v","hmv":"h:mm a v","ms":"mm:ss","y":"y","yM":"MM\/y","yMEd":"E, dd\/MM\/y","yMM":"MM\/y","yMMM":"MMM 'de' y","yMMMEd":"E, d 'de' MMM 'de' y","yMMMM":"MMMM 'de' y","yMMMMEd":"E, d 'de' MMMM 'de' y","yMMMMd":"d 'de' MMMM 'de' y","yMMMd":"d 'de' MMM 'de' y","yMd":"dd\/MM\/y","yQQQ":"QQQ 'de' y","yQQQQ":"QQQQ 'de' y","yw-count-one":"w'\u00aa' 'semana' 'de' Y","yw-count-other":"w'\u00aa' 'semana' 'de' Y"}},"CLDRToPHPSymbolConversion":{"yyyy":"Y","yy":"y","y":"Y","MMMMM":"M","MMMM":"F","MMM":"M","MM":"m","M":"n","dd":"d","d":"j","EEEEE":"D","EEEE":"l","EEE":"D","EE":"D","E":"D","aaaaa":"A","aaaa":"A","aaa":"A","aa":"A","a":"A","bbbbb":"A","bbbb":"A","bbb":"A","bb":"A","b":"A","BBBBB":"A","BBBB":"A","BBB":"A","BB":"A","B":"A","HH":"H","H":"G","hh":"h","h":"g","K":"g","mm":"i","ss":"s","z":"","zz":"","zzz":"","ccccc":"D","cccc":"l","ccc":"D","cc":"D","c":"D","LLLLL":"M","LLLL":"f","LLL":"M","LL":"m","L":"n","G":""},"intlDateSpecialChars":{"cldrDelimiter":"'","singleQuote":"'","singleQuoteHolder":"*"}},3019],["IsInternSite",[],{"is_intern_site":false},4517],["VideoPlayerContextSensitiveConfigPayload",[],{"context_sensitive_values":{"buffering_overflow_threshold":[{"value":3.0832147598267,"contexts":[{"name":"connection_quality","value":"POOR"}]},{"value":3.0832147598267,"contexts":[{"name":"connection_quality","value":"MODERATE"}]}],"enable_request_pipelining_for_live":[{"value":false,"contexts":[{"name":"latency_level","value":"low"}]}],"initial_stream_buffer_size_float":[{"value":10,"contexts":[{"name":"is_ad","value":true}]}],"is_low_latency":[{"value":true,"contexts":[{"name":"latency_level","value":"low"}]}],"live_stream_buffer_size_float":[{"value":10,"contexts":[{"name":"content_category","value":"esports"}]},{"value":6.5,"contexts":[{"name":"content_category","value":"gaming"}]}],"num_predictive_segments":[{"value":4,"contexts":[{"name":"latency_level","value":"low"}]}],"oz_www_append_byte_target_without_range":[{"value":1,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_bandwidth_ignore_on_stream_write_samples":[{"value":true,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_bandwidth_use_response_time_adjustment":[{"value":true,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_buffer_ahead_target":[{"value":10,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"content_category","value":"gaming"}]},{"value":14,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"is_latency_sensitive_broadcast","value":true}]},{"value":24,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_catchup_timeout_after_buffering_sec":[{"value":0.001,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_catchup_timeout_after_play_sec":[{"value":30,"contexts":[{"name":"fbls_tier","value":"user"}]}],"oz_www_ignore_reset_after_seek_if_bufferahead":[{"value":true,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_in_play_buffer_overflow_target":[{"value":1,"contexts":[{"name":"connection_quality","value":"POOR"}]},{"value":1,"contexts":[{"name":"connection_quality","value":"MODERATE"}]}],"oz_www_latencymanager_stalled_edgelatency_sec":[{"value":2,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"latency_level","value":"ultra-low"}]},{"value":6,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"content_category","value":"gaming"}]},{"value":10,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"is_latency_sensitive_broadcast","value":true}]},{"value":18,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_latencymanager_stalled_edgelatency_sec_on":[{"value":false,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"latency_level","value":"ultra-low"}]},{"value":true,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_live_initial_playback_position":[{"value":-14,"contexts":[{"name":"content_category","value":"gaming"}]}],"oz_www_live_rewind_seek_to_live_delta":[{"value":4,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"is_latency_sensitive_broadcast","value":true}]}],"oz_www_minimum_bytes_to_sample_on_close":[{"value":10000,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_ms_promise_for_null":[{"value":true,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_ms_promise_for_null_ms":[{"value":1000,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_network_reload_mpd_json":[{"value":"[\"504\", \"404\"]","contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_network_retry_intervals_json":[{"value":"{\"0\": 1000, \"404\": 2000, \"502\": 1000, \"503\": 1000, \"504\": 1000, \"20\": 1, \"429\": 2000}","contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_overwrite_live_time_range_block_margin":[{"value":5,"contexts":[{"name":"latency_level","value":"low"},{"name":"fbls_tier","value":"user"}]}],"oz_www_overwrite_livehead_fall_behind_block_threshold":[{"value":10,"contexts":[{"name":"latency_level","value":"low"}]}],"oz_www_pdash_download_cursor_catchup_threshold_gop_multiplier":[{"value":1,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_pdash_download_cursor_catchup_threshold_sec":[{"value":1,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"latency_level","value":"ultra-low"}]},{"value":2,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"is_latency_sensitive_broadcast","value":true},{"name":"latency_level","value":"low"}]},{"value":6,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"is_latency_sensitive_broadcast","value":true}]},{"value":10,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"latency_level","value":"low"}]},{"value":10,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_pdash_download_cursor_catchup_tolerance_sec":[{"value":1,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_pdash_use_pdash_segmentlocator":[{"value":true,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_per_stream_duration_target":[{"value":0.5,"contexts":[{"name":"connection_quality","value":"GOOD"}]},{"value":0.5,"contexts":[{"name":"connection_quality","value":"EXCELLENT"}]}],"oz_www_playback_speed_latency_slowdown_adjustment_rate":[{"value":0.2,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_playback_speed_latency_speedup_adjustment_rate":[{"value":0.1,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_playback_speed_min_buffer_sec":[{"value":0.5,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"latency_level","value":"ultra-low"}]}],"oz_www_player_emit_mpdparsed_early":[{"value":true,"contexts":[{"name":"is_live","value":true}]}],"oz_www_player_emit_mpdready_early":[{"value":true,"contexts":[{"name":"is_live","value":true}]}],"oz_www_player_formats_for_low_latency":[{"value":"[\"*\"]","contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_playhead_manager_buffered_auto_seek_playhead_slack":[{"value":0.01,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_playhead_manager_buffered_numerical_error":[{"value":0,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_playhead_manager_clamp_initial_playback_position":[{"value":true,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_pre_start_buffer_ahead_target":[{"value":10,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_reset_catchup_timeout_after_play_sec_on_overwrite":[{"value":true,"contexts":[{"name":"content_category","value":"gaming"}]},{"value":true,"contexts":[{"name":"fbls_tier","value":"user"}]}],"oz_www_seek_on_latency_level_change_allowed":[{"value":"[[\"low\",\"normal\"],[\"normal\",\"normal\"]]","contexts":[{"name":"content_category","value":"gaming"},{"name":"is_live","value":true}]}],"oz_www_skip_videobuffer_gaps":[{"value":true,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_skip_videobuffer_gaps_on_buffer_updated":[{"value":true,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_stale_mpd_buffer_ahead_target":[{"value":2,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_start_buffer_underflow_target":[{"value":1.1,"contexts":[{"name":"connection_quality","value":"POOR"}]},{"value":1.1,"contexts":[{"name":"connection_quality","value":"MODERATE"}]}],"oz_www_steadystate_minbuffer_buckets":[{"value":4,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"latency_level","value":"ultra-low"}]},{"value":20,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"is_latency_sensitive_broadcast","value":true}]}],"oz_www_steadystate_minbuffer_sec":[{"value":1,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"latency_level","value":"ultra-low"}]},{"value":1.75,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"is_latency_sensitive_broadcast","value":true}]}],"oz_www_stream_types_eligible_for_partial_playback":[{"value":"audio","contexts":[{"name":"is_live","value":true}]}],"oz_www_systemic_risk_abr_initial_risk_factor":[{"value":4,"contexts":[{"name":"is_live","value":true}]}],"oz_www_systemic_risk_abr_low_mos_resolution":[{"value":260,"contexts":[{"name":"is_live","value":true}]}],"oz_www_time_to_first_byte_ignore_above_threshold_ms":[{"value":200,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_use_live_latency_manager":[{"value":true,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}]},"static_values":{"stream_buffer_size_float":15,"initial_stream_buffer_size_float":7.5,"min_switch_interval":5000,"min_eval_interval":1000,"bandwidth_upgrade_target":0.9,"live_bandwidth_upgrade_target":0.63308577239513,"resolution_constraint_factor":2,"resolve_video_time_update_on_fragmented_time_ranges":true,"live_send_push_headers":false,"live_initial_stream_buffer_size_float":3.5,"enable_video_debug":false,"reappend_init_segment_after_abort":false,"current_time_during_ready_state_zero_throws":false,"www_videos_nudge_timestamp_correction_s":0,"www_videos_extended_spl_logging_for_connected_tv":false,"live_abr_send_push_headers":false,"shaka_native_promise":false,"oz_www_skip_videobuffer_gaps":true,"oz_www_skip_timerange_gaps":true,"oz_www_skip_videobuffer_gaps_on_buffer_updated":true,"oz_www_skip_videobuffer_gaps_max_gap_size_sec":0,"use_resource_timing_entry_for_bandwidth":false,"force_lowest_representation_threshold":0,"force_lower_representation_step_ratio":0,"enable_request_pipelining_for_vod":false,"enable_streaming_for_vod":false,"use_continuous_streaming":false,"streaming_segment_size":4,"streaming_bandwidth_update_interval":180000,"multi_segment_decay":0,"enable_request_pipelining_for_live":true,"enable_streaming_code_path":true,"ignore_errors_after_unload":true,"use_pending_seek_position_for_reference":false,"start_stream_buffer_size":1,"videos_abr_debugger_storage":false,"fix_shaka_xhr_error_status":true,"set_current_time_in_resync":true,"live_stream_buffer_size_float":3,"use_dimensions_fallbacks":true,"aggressive_fast_moving_average_half_life":1.5779530704021,"aggressive_slow_moving_average_half_life":9.2335087917745,"ignore_left_button_when_pausing":true,"disable_360_abr":false,"clear_buffer_on_seek_back":false,"buffering_overflow_threshold":0,"use_buffer_target_only_after_buffering_goal_is_hit":false,"enable_content_protection":true,"drop_buffering_detection_from_html5_api":true,"exclude_tracks_without_smooth_playback":false,"mpd_parse_frame_and_audio_sampling_rate":false,"abort_loading_decisioning_logic":true,"buffer_velocity_time_in_past_to_consider":0,"evaluate_abr_on_fetch_end":false,"ignore_recent_bandwidth_eval_on_fetch_end":false,"bandwidth_penalty_per_additional_video":0.1,"overwrite_video_current_time_property":false,"low_start_stream_buffer_size":2.5,"low_bandwidth_start_stream_buffer_size_threshold":2000000,"connection_quality_context_throttle_frequency":1000,"allow_seek_logging_in_mixin":false,"fix_pause_current_time_in_mixin":true,"better_set_current_time_in_resync":false,"resync_set_current_time_fudge_factor":0,"enable_main_thread_availability_logging":true,"fix_overwritten_get_video_current_time":false,"should_use_oz_p2p":false,"oz_www_fix_oz_p2p_enable_failed":true,"num_predictive_segments":0,"oz_www_generate_mos_segment_buffer_diff":false,"oz_www_pdash_use_pdash_segmentlocator":false,"oz_www_pdash_seq_based_approx":false,"oz_www_pdash_seq_based_approx_use_blockedrange":false,"oz_www_pdash_download_cursor_catchup_threshold_sec":0,"oz_www_pdash_download_cursor_catchup_tolerance_sec":0,"oz_www_pdash_download_cursor_catchup_skip_totalbufer":true,"oz_www_pdash_download_cursor_catchup_threshold_gop_multiplier":0,"oz_www_pdash_download_cursor_tolerance_gop_multiplier":0,"oz_www_pdash_download_cursor_bufferahead_gop_multiplier":0,"oz_www_pdash_download_cursor_between_catchups_seg":0,"oz_www_latencymanager_stalempd_edgelatency_sec":0,"oz_www_latencymanager_stalempd_edgelatency_sec_on":false,"oz_www_latencymanager_stalled_edgelatency_sec_on":false,"oz_www_latencymanager_stalled_edgelatency_sec":0,"oz_www_pdash_future_edgelatency_gops":0,"oz_www_catchup_timeout_after_play_sec":0,"oz_www_catchup_timeout_after_buffering_sec":0,"oz_www_reset_catchup_timeout_after_play_sec_on_overwrite":true,"oz_www_catchup_min_interval_sec":0,"oz_www_playback_speed_latency_adjustment_rate":0,"oz_www_playback_speed_enabled_delay_sec":4,"oz_www_playback_speed_min_buffer_sec":1,"oz_www_playback_speed_min_duration_sec":2,"oz_www_playback_speed_restore_min_duration_sec":1,"oz_www_playback_speed_latency_slowdown_adjustment_rate":0,"oz_www_playback_speed_latency_speedup_adjustment_rate":0,"oz_www_pdash_download_cursor_use_totalbuffer":true,"oz_www_pdash_download_cursor_nocatchup_use_currentbuffer":false,"oz_www_playback_speed_min_sharpness_factor":3,"oz_www_pdash_wait_on_mpd_refresh_when_error":true,"oz_www_pdash_download_cursor_pause_duration_of_gop":false,"oz_www_pdash_download_cursor_catchup_only_when_advancing":false,"oz_www_download_cursor_use_node_time":false,"oz_www_download_cursor_total_buffer_max_sec":0,"oz_www_download_cursor_buffer_ahead_time_max_sec":0,"oz_www_download_cursor_disable_buffer_ahead_rule_on":true,"oz_www_download_cursor_disable_buffer_ahead_rule_lr_on":false,"oz_www_download_cursor_1st_run_set_skipped_segment_on":true,"oz_www_download_cursor_1st_run_2_fallback":false,"oz_www_enable_predictive_dash":true,"oz_www_use_sc_timebased_segments":false,"oz_www_use_templated_pdash_segments":true,"oz_www_use_scf_timebased_segments":false,"oz_www_touch_cb_key":false,"oz_www_enable_dvl":true,"oz_www_use_dvl_with_timeout_ms":0,"oz_www_dvl_update_interval_ms":0,"oz_www_dvl_update_interval_reset_on_err":true,"oz_www_dvl_initial_segment_ignore_count":1,"oz_www_use_inline_manifest_for_live":true,"oz_www_use_live_latency_manager":false,"oz_www_player_emit_mpdready_early":false,"oz_www_clear_on_seek":true,"oz_www_player_emit_mpdparsed_early":false,"is_low_latency":false,"fire_seek_events":false,"shaka_buffer_abr":false,"evaluate_abr_on_tracks_and_bandwidth_change":true,"enable_double_ingest":true,"test_use_embedded_cb":false,"www_videos_playback_remove_src_attr_on_unload":false,"www_videos_playback_call_load_on_unload":false,"has_live_rewind_egress":false,"has_live_rewind_ui_www":false,"use_oz_with_fbms_eligible":true,"create_restore_abort_loading_promise":true,"oz_www_fix_representation_ended_timing":true,"oz_www_safely_log_player_seeks":true,"oz_www_enable_adaptation":true,"oz_www_fix_quick_starter_overhead":true,"oz_www_abr_restrict_from_index":0,"oz_www_abr_restrict_to_index":0,"oz_www_initial_switch_interval":0,"oz_www_min_switch_interval":100,"oz_www_abr_min_bandwidth_samples":0,"oz_www_min_eval_interval":100,"oz_www_bandwidth_estimator_half_life":6,"oz_www_bandwidth_estimator_variance_penalty_half_life":0,"oz_www_bandwidth_estimator_variance_penalty_down_factor":0,"oz_www_bandwidth_estimator_variance_penalty_up_factor":0,"oz_www_bandwidth_estimator_outlier_exclusion_factor":50,"oz_www_bandwidth_estimator_std_dev_penalty_factor":0,"oz_www_abr_confidence_threshold":0.9,"oz_www_segments_to_stream":5,"oz_www_per_stream_duration_target":0,"oz_www_segments_to_stream_under_playhead_threshold":0,"oz_www_low_segment_stream_playhead_threshold":0,"oz_www_appends_per_segment":6,"oz_www_append_byte_target_without_range":100000,"oz_www_log_appended_secs":false,"oz_www_lazy_parse_sidx":false,"oz_www_abr_eval_buffer_threshold":0,"oz_www_throttle_playback_rate_on_stall":true,"oz_www_use_prefetch_cache":true,"oz_www_force_initial_representation":true,"oz_www_buffer_ahead_target":22,"oz_www_low_buffer_bandwidth_target_threshold":10,"oz_www_low_buffer_bandwidth_target_increase_factor":0,"oz_www_segments_to_stream_near_bandwidth_boundary":5,"oz_www_bandwidth_boundary_standard_deviation_factor":1,"oz_www_suppress_playing_event_while_buffering":false,"oz_www_resolution_constraint_factor":2,"oz_www_pre_start_buffer_ahead_target":16.924449682236,"oz_www_stale_mpd_buffer_ahead_target":0,"oz_www_setup_buffer_target_onload":true,"oz_www_in_play_buffer_underflow_target":0.1,"oz_www_in_play_buffer_overflow_target":1,"oz_www_buffer_when_waiting":false,"oz_www_start_buffer_underflow_target":0.1,"oz_www_byte_count_per_sample":200000,"oz_www_minimum_bytes_to_sample_on_close":25000,"oz_www_manifest_update_frequency_ms":0,"oz_www_manifest_initial_update_delay_ms":0,"oz_www_exclude_prefetch_bandwidth_samples":true,"oz_www_connection_quality_context_throttle_frequency":2000,"oz_www_paused_stream_segments_count":2,"oz_www_minimum_bandwidth_sample_duration":10,"oz_www_maximum_bandwidth_sample_bandwidth":100000000,"oz_www_max_bandwidth_sample_count":30,"oz_www_use_performance_entry_on_stream_close":false,"oz_www_ignore_time_to_response_start":false,"oz_www_network_seg_timeout_ms":0,"oz_www_bandwidth_response_time_handicap":0,"oz_www_bandwidth_ignore_on_stream_write_samples":false,"oz_www_bandwidth_use_response_time_adjustment":false,"oz_www_use_scheduler":true,"oz_www_cdn_experiment_id":"","oz_www_disable_audio_scheduler":false,"oz_www_no_new_loop_body_promise_when_stream_ongoing":true,"oz_www_fix_seek_performance":false,"oz_www_ignore_reset_after_seek_if_bufferahead":false,"oz_www_ignore_reset_after_seek_if_bufferahead_liverewind":true,"oz_www_enable_network_manager_error":false,"oz_www_parse_first_segment":false,"oz_www_enable_abr_for_first_request":false,"oz_www_update_media_source_duration":true,"oz_www_ms_promise_for_null":false,"oz_www_ms_promise_for_null_ms":0,"oz_www_sbm_waits_for_update_end":true,"oz_www_sbm_cancel_operation_synchronous":false,"oz_www_sbm_recursively_waits_for_update_end":false,"oz_www_auto_seek_playhead_slack":0.5,"oz_www_playhead_manager_buffered_auto_seek_playhead_slack":0.5,"oz_www_playhead_manager_buffered_is_near_gap_threshold":1.5,"oz_www_playhead_manager_buffered_numerical_error":0.01,"oz_www_playhead_manager_handle_timerange_update_on_timeupdate":true,"oz_www_playhead_manager_buffered_timerange_update_on_timeupdate":true,"oz_www_playhead_manager_timeupdate_throttle_ms":1000,"oz_www_playhead_manager_clamp_initial_playback_position":false,"oz_www_playhead_manager_buffer_gaps_skip_reverse":true,"oz_www_media_stream_buffer_gaps_ignore_before_seek":false,"oz_www_playhead_manager_initial_playback_position_lat_mgr":true,"oz_www_playheadman_dont_skip_ahead_past_last_fetched":false,"oz_www_seek_ahead_epsilon":0.05,"oz_www_seek_ahead_use_native_current_time":true,"oz_www_timeline_offset_threshold":10,"oz_www_live_rewind_seek_to_live_delta":8,"oz_www_update_seekable_range":true,"oz_www_update_duration_when_init_appended":true,"oz_www_abr_prevent_down_switch_buffer_threshold":11,"oz_www_check_buffer_range_once_for_playhead_update":false,"oz_www_fix_start_timestamp":true,"oz_www_fix_templated_manifest_r_field_check":true,"oz_www_seek_on_latency_level_change":false,"oz_www_seek_on_latency_level_change_allowed":"[]","oz_www_live_initial_playback_position":-20,"oz_www_live_query_time_in_range":true,"oz_www_timerange_manager_cleanup":false,"oz_www_livehead_fall_behind_block_threshold":30,"oz_www_overwrite_livehead_fall_behind_block_threshold":0,"oz_www_live_time_range_block_margin":5.9,"oz_www_overwrite_live_time_range_block_margin":0,"oz_www_live_gracefully_handle_mpd_errors":true,"oz_www_live_no_segment_when_playhead_is_before_first_segment":true,"oz_www_live_disable_mpd_updates_when_paused":true,"oz_www_cleanup_video_node_on_destroy":true,"oz_www_detach_media_source_manager":true,"oz_www_enable_abortload_and_reload":true,"oz_www_live_playhead_catch_up":false,"oz_www_live_catch_up_only_when_paused":false,"oz_www_live_catch_up_fall_behind_threshold":20,"oz_www_live_catch_up_live_head_delta":6,"oz_www_live_numerical_error_epsilon":0.0001,"oz_www_stop_manifest_update_when_static":true,"oz_www_buffer_end_only_when_buffering":false,"oz_www_stream_interrupt_check_mpd_stale_count_threshold":6,"oz_www_reach_end_only_when_video_ended":false,"oz_www_allow_queueing_end_of_stream_when_update":false,"oz_www_set_source_buffer_append_window_end":false,"oz_www_use_stream_end_time_in_segment_locator":false,"oz_www_pausable_stream_throws_error_when_aborted":true,"oz_www_network_retry_intervals_json":"{\"0\": 1000, \"404\": 2000, \"502\": 1000, \"503\": 1000, \"504\": 1000, \"429\": 2000, \"20\": 1000}","oz_www_network_retry_intervals_json_retry":false,"oz_www_network_reload_mpd_json_retry":false,"oz_www_network_end_broadcasts_json":"[\"410\"]","oz_www_network_skip_json":"[]","oz_www_network_reload_mpd_json":"[]","oz_www_fallback_on_append_error":false,"oz_www_enable_appends_on_wait_update_end_failure":false,"oz_www_bandwidth_penalty_per_additional_video":0,"oz_www_bandwidth_penalty_additional_video_start":0,"oz_www_prefetch_cache_bandwidth_upper_limit":0,"oz_www_throw_network_error_during_stream":false,"oz_www_retry_fetch_on_prefetch_error":true,"oz_www_use_abr_for_missing_default_representation":true,"oz_www_initial_manifest_request_retry_count":3,"oz_www_download_time_buffer_delta_penalty_factor":0,"oz_www_time_to_first_byte_estimate_half_life_ms":500,"oz_www_handle_missing_manifest_segment_timeline":true,"oz_www_mos_upper_threshold":0,"oz_www_mos_lower_threshold":0,"oz_www_abr_use_download_time":false,"oz_www_minimum_download_additional_buffer_ms":0,"oz_www_use_deferred_streaming_task":true,"oz_www_allow_abort_loading_from_autoplay_controller":false,"oz_www_enable_double_ingest":true,"oz_www_use_oz_credentials_provider":true,"oz_www_throw_on_non_zero_r_d_mismatch":true,"oz_www_fix_template_duration_artifact_in_manifest":true,"oz_www_bandwidth_cache_key":"bandwidthEstimate","oz_www_estimate_video_bandwidth_only":true,"oz_www_enable_bandwidth_navigator_estimation":false,"oz_www_default_bandwidth_estimate":1000000,"oz_www_update_bandwidth_cache_on_sample":false,"oz_www_live_audio_ibr_bandwidth_percentage":0.05,"comet_www_no_pause_on_blur_or_focus_events":false,"oz_www_live_gracefully_handle_no_network":true,"oz_www_live_max_try_attempts_on_404":2,"oz_www_clear_buffer_when_switch_representation_initiator_is_user":true,"oz_www_use_segment_request_cache":false,"oz_www_seconds_to_stream":10,"oz_www_seconds_to_stream_near_bandwidth_boundary":10,"oz_www_queue_data_with_error_handling":false,"oz_www_clear_prepended_segments_count_on_append":true,"oz_www_back_off_pdash_504_retry":true,"oz_www_call_end_of_stream_in_quick_starter":true,"oz_www_instantiate_buffering_detector_before_quick_starter":true,"oz_www_maybe_end_stream_if_prepended_segments":true,"oz_www_seek_to_start_quick_starter":true,"oz_www_remove_src_attr_on_unload":true,"oz_www_use_loose_manifest_updates":false,"oz_www_use_full_player_if_cached":true,"oz_www_enable_quickdashv2":false,"oz_www_copy_new_manifest":true,"oz_www_handle_switch_to_unparsed_representation_sidx":true,"oz_www_stable_buffered_timeranges_in_observedsourcebufferstate":true,"oz_www_emit_stream_error_event":true,"oz_www_max_start_eme_attempts":3,"oz_www_listen_for_canplay_in_buffering_detector":true,"oz_www_handle_mpd_retries_outside_oz_mpd_updater":true,"oz_www_respect_initial_representation_on_setup":false,"oz_www_update_live_video_config_on_representation_switch":true,"oz_www_mpd_update_cancel_current_request_tracker":true,"oz_www_tagged_time_range_per_append_throttle":0,"oz_www_fix_reload_manifest_retry":true,"oz_www_fix_source_buffer_error_logging":true,"oz_www_min_block_time_range_interval_ms":0,"oz_www_fix_buffer_ahead_priority_strategy":true,"oz_www_append_last_segment_if_beyond_end":true,"oz_www_set_stream_anchor_only_on_done_status":true,"oz_www_fix_stream_deferred_cancel":true,"oz_www_sbm_abort_on_readable_stream_error":true,"oz_www_cancel_tracker_on_append_error":true,"oz_www_pixels_below_viewport_to_observe":0,"oz_www_prioritize_by_viewport_static_penalty":0,"oz_www_fix_setup_video_duration_on_representation_switch":true,"oz_www_handle_mpd_null_error_codes":true,"oz_www_fix_prepended_segments_tagging":true,"oz_www_xmlparser_use_domparser":true,"oz_www_cache_mos_threshold":false,"oz_www_load_video_node_on_unload":true,"oz_www_convert_dom_exception_to_oz_error":true,"oz_www_sbm_check_source_buffer_ready_state_on_cancel":true,"oz_www_prevent_unnecessary_seek_stream_anchor_reset":true,"oz_www_stream_types_eligible_for_partial_playback":"","oz_www_partial_playback_buffer_overflow":0.75,"oz_www_live_use_inline_manifest_after_request_manifest":false,"oz_www_live_gracefully_handle_410":true,"oz_www_segment_end_410_response":true,"oz_www_segment_end_410_response_loop_end":true,"oz_www_steadystate_minbuffer_sec":0,"oz_www_steadystate_minbuffer_buckets":0,"oz_www_steadystate_minbuffer_buckets_sec":1,"oz_www_pixels_above_viewport_to_observe":0,"oz_www_delay_stream_end_for_sourceended":true,"www_videos_shaka_use_xbox_buffered_fudge_factor":0.05,"oz_www_media_source_is_available_in_ended_state":true,"oz_www_unset_override_oz_request_implementation_on_hive_error":false,"oz_www_live_gracefully_handle_502":true,"oz_www_systemic_risk_abr_apply_representation_restrictions":true,"oz_www_dynamic_mpd_initial_playback_position_offset_modifier":4,"oz_www_player_formats_for_low_latency":"[]","oz_www_loop_body_handle_error_interval_ms":1,"oz_www_load_sequence_max_delay_ms":0,"oz_www_get_fetch_body_text_when_response_not_ok":true,"oz_www_load_sequence_only_prioritize_first_count":0,"oz_www_stream_interrupted_fuzzy_equals":false,"oz_www_sbm_skip_abort_on_media_error":true,"oz_www_sbm_abort_on_append_new_readable_stream":false,"oz_www_prevent_unnecessary_quickstarter_instance":true,"oz_www_stricter_mpd_parser_invariants":true,"oz_www_accept_external_buffering_detector":true,"oz_www_treat_inline_mpd_xml_empty_string_as_null":false,"oz_www_live_gracefully_handle_429":true,"oz_www_use_systemic_risk_abr":true,"oz_www_systemic_risk_abr_risk_factor":1.75,"oz_www_time_to_first_byte_ignore_above_threshold_ms":0,"oz_www_bandwidth_ttfb_samples_to_save":5,"oz_www_blue_video_player_pass_inline_mpd_xml_empty_string_as_undefined":false,"oz_www_blue_video_player_force_xhr":false,"oz_www_set_global_config":false,"oz_www_systemic_risk_abr_low_mos_risk_factor":1.3,"oz_www_systemic_risk_abr_min_watchable_mos":30,"oz_www_systemic_risk_abr_low_mos_resolution":0,"oz_www_prevent_multiple_successive_representation_switch":true,"oz_www_sidx_parser_memory_optimization":false,"oz_www_buffer_when_waiting_in_partial_buffer":true,"oz_www_stream_interrupt_in_play_buffer_overflow_target":1,"oz_www_stream_interrupt_buffer_target_timeout_ms":10000,"oz_www_recent_buffer_in_play_buffer_overflow_target":3,"oz_www_recent_buffer_timeout_ms":10000,"oz_www_use_ending_duration_for_gop_multiplier":true,"oz_www_live_trace_parse_emsg":true,"oz_www_catchup_use_timeline_range_end_time_as_end":false,"oz_www_perf_log_representation_id_more":true,"oz_www_systemic_risk_use_fetch_range_duration":false,"oz_www_use_simple_moving_average_estimator":false,"oz_www_http_no_cache":false,"oz_www_use_buffering_detector_for_playhead_interruption":true,"oz_www_enable_immediate_down_switch":false,"oz_www_handle_media_source_manager_errors":true,"oz_www_handle_invalid_webm_duration":false,"oz_www_parse_initialization_binary":true,"oz_www_systemic_risk_abr_high_estimate_confidence":52,"oz_www_data_reader_concat_once":true,"oz_www_pump_concat_once":true,"oz_www_sbm_append_readable_stream_concat_once":true,"oz_www_log_appended_segment_info":false,"oz_www_log_media_element_error_source_buffer_updateend_error":true,"oz_www_log_extra_events":true,"oz_www_overwrite_video_current_time_property":true,"oz_www_clear_buffer_on_seek_into_unbuffered_range":true,"oz_www_numerical_range_utils_is_after_range_exclusive":true,"oz_www_server_side_abr_send_client_estimates":false,"oz_www_server_side_abr_use_server_estimates":false,"oz_www_live_gracefully_handle_504":true,"oz_www_debug_live_replay":false,"oz_www_append_retry_quota_exceeded_error":true,"oz_www_buffer_target_constraint_minimum_sec":2,"oz_www_buffer_target_constraint_append_succeeded_reward":0.2,"oz_www_always_use_current_time_in_playback_state":true,"oz_www_buffer_target_constraint_quota_exceeded_penalty":0.3,"oz_www_retry_null_error_code_in_stream":false,"oz_www_emit_destroyed_after_media_keys_clear":false,"oz_www_do_not_end_stream":false,"oz_www_do_not_flush_data_queue_after_destroy":false,"oz_www_do_not_update_duration_vod":false,"oz_www_no_representation_error_detailed_message":true,"oz_www_mpd_updater_network_request_timeout_ms":20000,"oz_www_restart_media_streams_on_stream_resumed":false,"oz_www_media_stream_tracker_cancel_on_seek":false,"oz_www_media_stream_fix_double_segments_compute":false,"oz_www_fix_initial_segment_non_zero_start_time":true,"oz_www_get_mpd_least_last_time_range":true,"oz_www_respect_playback_restrictions_in_abr_fallback":true,"oz_www_null_segment_for_no_buffer_target":true,"oz_www_systemic_risk_abr_initial_risk_factor":1,"oz_www_systemic_risk_abr_document_hidden_risk_factor":0,"oz_www_use_bandwidth_estimate_from_headers_in_abr":false,"oz_www_use_ttfb_from_headers":false,"oz_www_skip_playhead_adjustment_before_initial_playback_position":false,"oz_www_clear_buffer_on_seek_epsilon_s":0,"oz_www_handle_buffered_timerange_update_on_ratechange":false,"oz_www_stub_safari_source_buffer_abort":false,"oz_www_clear_buffer_on_seek_nudge_s":0,"oz_www_streaming_task_reject_current_stream_deferred":true,"oz_www_min_buffer_behind_playhead":10,"oz_www_check_mediasource_readystate_before_end_of_stream":true,"oz_www_retry_video_element_error":true,"oz_www_clamp_seek_to_first_buffer_range_epsilon":0.75,"oz_www_ignore_restrictions_when_all_representations_restricted":false,"oz_www_hive_maximum_trimming_seconds":0,"oz_www_block_representation_status_codes_json":"[500, 503]","oz_www_block_representation_status_codes_temporarily_json":"{}","oz_www_revoke_object_url_on_detach":false,"oz_www_abort_clear_video_node_on_detach":false,"oz_www_proceed_on_representation_change_in_init_append_fail":true,"oz_www_should_check_that_source_buffer_attached":false,"oz_www_exclude_large_representations_after_restrictions":true,"oz_www_stop_loop_driver_immediately_on_cleanup":true,"oz_www_playhead_manager_handle_time_range_update_on_waiting":false,"oz_www_enable_error_recovery_attempt_logging":true,"oz_www_systemic_risk_abr_prefetch_initial_risk_factor":5,"oz_www_prefetch_resolution_threshold":810,"oz_www_use_strict_resolution_constraint":true,"oz_www_throw_no_license_error":true,"oz_www_vtt_caption_representation":true,"oz_www_live_video_send_transaction_id_in_requests":false,"oz_www_log_exposure_on_oz_initialization":false,"oz_www_systemic_risk_abr_prefetch_low_mos_resolution":0,"oz_www_allow_subsequent_prefetch":true,"oz_www_comet_video_player_live_vtt_captions":false,"oz_www_prefetch_retention_duration_ms":0,"oz_www_clear_prefetch_on_unload":false,"oz_www_emit_captions_changed_event":true,"oz_www_use_vtt_captions_visible_buffer_strategy":false,"oz_www_disable_end_of_stream_in_caption_stream":true,"oz_www_append_once_per_stream_in_caption_stream":true,"oz_www_append_once_per_stream_in_application_stream":false,"oz_www_enable_era_logging_for_application_stream":false,"oz_www_emit_stream_gone_on_end_stream_before_start":true,"oz_www_sidx_segment_retry_attempts":9999,"oz_www_sidx_segment_retry_interval_ms":100,"oz_www_clear_buffer_around_playhead_boundary_ms":5000,"oz_www_fix_manifest_fetch_mixed_promise_catch":true,"oz_www_fix_update_duration_check":false,"oz_www_never_decrease_mediasource_duration":false,"oz_www_normalize_mpd_fetch_errors":true,"oz_www_no_retry_on_empty_string_error_code":false,"oz_www_fix_dom_exception_as_message":true,"oz_www_use_src_object_for_media_source":false,"oz_www_mpd_parse_all_adaptation_sets":true,"oz_www_mpd_ensure_playable_representations":false,"oz_www_ull_use_broadcast_sensitivity_type":true,"oz_www_ull_fallback_stall_count":2,"oz_www_live_video_chunk_duration":0,"oz_www_av1_check_hardware_support":false,"oz_www_ultra_low_latency_bandwidth_threshold":10000000,"oz_www_bandwidth_estimate_header_key":"","oz_www_bandwidth_estimate_key":"","oz_www_fix_ull_fallback_stall_count":false,"oz_www_set_latency_context_immediately":false,"oz_www_fall_back_to_low_latency_in_ull":false,"oz_www_bandwidth_header_expire_threshold":0,"oz_www_fix_live_rewind_user_selected_playback_speed":true}},5261],["cr:964538",[],{"__rc":[null,"Aa3qwFKUoLGueEuyA-VZmBjkdpqtBu023KwJR3rOrzuyQmQCf1R-EFdZNtVG0_AisdUvUlT3RQPh2GW2Rg"]},-1],["cr:99",[],{"__rc":[null,"Aa2S2GXhW1sYcYEI3_yc8nwPmPfba_qgduZRdA80i1u-Bgz7qyD48M13alhFhb25onU0dDIITQTzH36Ll_eCCh-ZXWHDnpnWIw"]},-1],["cr:506",[],{"__rc":[null,"Aa3955VvNVvhJUlSoSka8HuJ5M9_MkTMyvDwvWo5WEQsrvGTl7Ixwytw8ikAqbLs0ssuZEgjZHqnom0wuQlx__reDBzKGTlpvwPPUtZMeT8"]},-1],["cr:913",[],{"__rc":[null,"Aa3zoWymkMXnczA5CFk4HPXtrWH25i86TcXV3CGeLIw-fxtCGLzoPb3omEr82yNIj-6VuE_cTBgWpBHgRPmChGwYdvw4hQg"]},-1],["cr:2889",[],{"__rc":[null,"Aa1SQ8baCQmB1fzR2JLOvFxWXoMHvrj8OVg4DEGLdPSeVE2YdSnDKMthHP_YY8-mAbYI9v3DD03MNuQ6yZcpMei3vuSVQMNFdT022NT57L9iPRl4GJh9sDkSSlVo3arNuTNepxc8wgIzsDR-"]},-1],["cr:4081",[],{"__rc":[null,null]},-1],["cr:4149",[],{"__rc":[null,"Aa20-9eVzap5FXiTZNzUUaGOKXsfUYjBfWpWPZs6CQvFfnYX25m99hP_AbuAwOI76qfVAOr4kv5xqciKXDRZWQGyfAWYTKVlmvNak4f6aQ7NoJ8_0D8KzDuL5Q"]},-1],["cr:921407",["useNoopDebuggingInfoComponent"],{"__rc":["useNoopDebuggingInfoComponent","Aa2Avd8AcSr1mDGUygPVG2AfmB_4DWzW1boOgbFAj-la_m0Z3bJ7WJTYdcF0TusouKixJEb4rvGBdnTfZzc2"]},-1],["cr:1269159",["emptyFunction"],{"__rc":["emptyFunction","Aa01jrmBOy5LQ8c_B8fAxWQpNZORABonoVqdhdqPAPC89Up0UG0P_n7r4V25H6hnAChq-X6P1wGDJVMNjnJ6b80-D7OzLVmFAILZhBu-WepSSPsl"]},-1],["cr:1453865",[],{"__rc":[null,"Aa3E0NA7defD4ujOYW-JIm5GrA0F4JW8aPA4V4RqnJCAMpV_K9Tqq3mK9F9kP0FtTmYFRP-Ij9pakUi0JufmsCVKhh0TB9VOc2jnjDs"]},-1],["cr:1473550",[],{"__rc":[null,"Aa39XNVEATe5CnNmZZkCzQVq9RXBBqi3dKPaRT3LqKYkPtyvgrspB7O4Jxv9C8RsS_FCGoPLVnIi9Zi-4uj596h4pAeShliq"]},-1],["cr:1634616",["CometUserActivity"],{"__rc":["CometUserActivity","Aa3IKVdA5XO59zqVOEcu1Pcng1QuD1hmp8PXpMKsH2LIhUjRKm6g-TccyHAUYv2jPJlu_DTWI92DUvotD2uCJJnCAD8"]},-1],["cr:1672302",[],{"__rc":[null,"Aa2dHFHPl47kSnoXkfMy1IRfEHZZFBM5YYhhiGwbFRpBbJP8CvtOQi3lkmx0La4fXPv5R_0rgagkivU9rM9qnN7-WOAfODIwtUvoBXo6d86eErw9eXZR"]},-1],["cr:1680308",[],{"__rc":[null,"Aa2qO-nEQ4LY4Zc453mfoYoUHVw3UqG0gtqME93zfKGGPdo6MJu88q9f63PAbnQSRzoIfuWcsiwv4Q0W4pY8KS__HtD6LtD9XD-BQWhHrMG3_903NLlS2IM"]},-1],["cr:1724253",[],{"__rc":[null,"Aa0BqZ5xMXDF10M3pBanyyeSF2osn29hFS5qaRcHGoFHOncuQYVGQ0kbSivM1lqHds47VxxGEQ_G--t6Xm3VUF1KXRL7bQnrpxpFGY7k1Y2J9rxXZA"]},-1],["cr:1791018",["CometInteractionVC"],{"__rc":["CometInteractionVC","Aa3Ku05u8VibKRwoei-QW6lIUhU2Rzc_wF0lwVFv7WBj-Wy037VVyWxuRNAcJlEezT7npoWfBPnAorgweihr3bm2k5nJGH0haICWgaCuu30i"]},-1],["cr:1802022",["CometPrerenderer.react"],{"__rc":["CometPrerenderer.react",null]},-1],["cr:1802023",["BaseContextualLayerDefaultContainer.react"],{"__rc":["BaseContextualLayerDefaultContainer.react",null]},-1],["cr:1954434",[],{"__rc":[null,"Aa3-VoNoYAizbc7uxO3vu67yznCLhm69Mx-H-GixpenU84toiB0sCiEj6NU3Ddn0TutyjKXasPS8PH1lPDZkY_avZBJbR4WBGeSuZg"]},-1],["cr:629",[],{"__rc":[null,"Aa3QnG4v8MiulWemJ75HlrIced_pdgXcrs89EGT2DFxEV4Q8mXKvVDvSM8c15eP58kAWZ-HClDBKAFekJbuU3PMxxquk2XHl6wVdDgPII9BdKg"]},-1],["cr:4865",["ReactDOMLegacy_DEPRECATED"],{"__rc":["ReactDOMLegacy_DEPRECATED","Aa00j-m-jthzOWJNFFIKWhSsADCMV7ISLUYIbUvgLTQSqcWf9s2I7VeSGrgLlBOC6eagJCwz9hQajccwz0WV8Wo9TD1Q"]},-1],["cr:3569",[],{"__rc":[null,"Aa33GuZ80dD-mv5ru7tukMyqWuMdV0ehjDOUIbfs6cjUKAdee9vg0xqwwrxJBj7bXEnZtHnuUrZ78IQkF_rf"]},-1],["cr:4772",["ReactApiCallFalcoEvent"],{"__rc":["ReactApiCallFalcoEvent",null]},-1],["cr:1294246",["ReactDOM.classic"],{"__rc":["ReactDOM.classic","Aa00j-m-jthzOWJNFFIKWhSsADCMV7ISLUYIbUvgLTQSqcWf9s2I7VeSGrgLlBOC6eagJCwz9hQajccwz0WV8Wo9TD1Q"]},-1]],"require":[["CometTooltipDeferredImpl.react\u00407520f92af2d16242534ae1dfa895f7b0"],["maybeRemoveElement\u00407520f92af2d16242534ae1dfa895f7b0"],["CometPressable.react\u00407520f92af2d16242534ae1dfa895f7b0"],["GlobalVideoPortsImpl.react\u00407520f92af2d16242534ae1dfa895f7b0"],["CometExceptionDialog.react\u00407520f92af2d16242534ae1dfa895f7b0"],["BarcelonaProfileThreadsTab.react\u00407520f92af2d16242534ae1dfa895f7b0"],["BarcelonaProfilePage.react\u00407520f92af2d16242534ae1dfa895f7b0"],["emptyFunction\u0040c2a14e6adb6ab217740682d02384d34e","thatReturns",["RequireDeferredReference"],[[{"__dr":"CometTooltipDeferredImpl.react"},{"__dr":"maybeRemoveElement"},{"__dr":"CometPressable.react"},{"__dr":"GlobalVideoPortsImpl.react"},{"__dr":"CometExceptionDialog.react"},{"__dr":"BarcelonaProfileThreadsTab.react"},{"__dr":"BarcelonaProfilePage.react"}]]],["VideoPlayerSpinner.react\u004047eabd22c4cdbbad4690edc0ff0a2d38"],["VideoPlayerCaptionsArea.react\u004047eabd22c4cdbbad4690edc0ff0a2d38"],["Bootloader\u00406bd528750b1ba2c7c08c7101b91fc51e","markComponentsAsImmediate",[],[["VideoPlayerHTML5ApiCea608State","VideoPlayerHTML5ApiWebVttState","BarcelonaAnimatedScrollArea.react"]]],["RequireDeferredReference\u0040c2a27641f05d94c0fb488dd545db1faf","unblock",[],[["CometTooltipDeferredImpl.react","maybeRemoveElement","CometPressable.react","GlobalVideoPortsImpl.react","CometExceptionDialog.react","BarcelonaProfileThreadsTab.react","BarcelonaProfilePage.react","VideoPlayerSpinner.react","VideoPlayerCaptionsArea.react"],"sd"]],["RequireDeferredReference\u0040c2a27641f05d94c0fb488dd545db1faf","unblock",[],[["CometTooltipDeferredImpl.react","maybeRemoveElement","CometPressable.react","GlobalVideoPortsImpl.react","CometExceptionDialog.react","BarcelonaProfileThreadsTab.react","BarcelonaProfilePage.react","VideoPlayerSpinner.react","VideoPlayerCaptionsArea.react"],"css"]]]});});});</script>
+<script>qpl_inl("7252775685639807194","tierTwoEnd");</script>
+<script type="application/json" data-content-len="83" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252775685639807194","tierTwoEnd"]]]}</script>
+
+<script type="application/json" data-content-len="108" data-sjs>{"require":[["CometSSRFizzContentInjector","onPayloadReceived",null,[[{"status":"fail_ssr_disabled"}],[]]]]}</script>
+
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         <script>qpl_inl("7252775685639807194","tierThree");</script>
+<script type="application/json" data-content-len="82" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252775685639807194","tierThree"]]]}</script>
+<script>qpl_inl("7252775685639807194-server","tierThree",131);</script>
+<script type="application/json" data-content-len="93" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252775685639807194-server","tierThree",131]]]}</script>
+<script>requireLazy(["HasteSupportData"],function(m){m.handle({"clpData":{"1828945":{"r":100,"s":1},"1848815":{"r":10000,"s":1},"4791":{"r":1,"s":1},"819":{"r":1,"s":1},"1744057":{"r":500,"s":1},"1744058":{"r":5000,"s":1},"1744059":{"r":10000,"s":1},"1744060":{"r":1000,"s":1},"1857112":{"r":1},"1871697":{"r":1,"s":1},"1942319":{"r":1,"s":1},"1823926":{"r":1,"s":1},"1743887":{"r":1},"1764786":{"r":1,"s":1},"1755537":{"r":1},"1873550":{"r":10000,"s":1},"1743095":{"r":1,"s":1}},"gkxData":{"307":{"result":true,"hash":"AT5dPMZBMiNY0f7uC0w"},"762":{"result":false,"hash":"AT7XePNdehhQhxt4xCE"},"2795":{"result":false,"hash":"AT5ilL0A5sDVhuaBgt4"},"5639":{"result":true,"hash":"AT5SF61ZadJ9LozlJuI"},"778292":{"result":false,"hash":"AT574OhXHwX0kRP2aOE"},"832242":{"result":false,"hash":"AT7QZmREZ7b0HQdOpy0"},"945829":{"result":true,"hash":"AT6KFs8jy_GkmgnUKcM"},"968609":{"result":true,"hash":"AT7nKteWCVYK6uN6hFY"},"1001007":{"result":false,"hash":"AT54HpnriRBxXJ_M1C0"},"1066746":{"result":false,"hash":"AT55_E5b8Sj7u5rU0Is"},"1166607":{"result":false,"hash":"AT7xrOkGBcaF8I5uaXQ"},"996940":{"result":false,"hash":"AT7opYuEGy3sjG1a8s4"},"1073500":{"result":false,"hash":"AT7aJmfnqWyioxOOZJw"},"1857581":{"result":false,"hash":"AT5yTxGMp6le0PAtdyg"},"1196":{"result":false,"hash":"AT7JN3eRi_Tkojttc70"},"1341692":{"result":false,"hash":"AT6ztF4pPshu3yZQNno"},"1334580":{"result":false,"hash":"AT6P8Id36DnRE-rxC7g"},"574":{"result":false,"hash":"AT5l2P5ytV2bv8xH7ic"},"871":{"result":true,"hash":"AT4vyfQGHTBrTQa9D9o"},"1626":{"result":false,"hash":"AT6XwrJGGF9Cvtws2Ls"},"1799":{"result":false,"hash":"AT6Id9SGNjhz9Osh92s"},"2674":{"result":false,"hash":"AT6LknPzbQEjKsuxCgg"},"2819":{"result":false,"hash":"AT77OwnXENquugNcEFw"},"6002":{"result":false,"hash":"AT6qjxreNXGYgzg6nkk"},"3499":{"result":false,"hash":"AT5l5tI3kdeSuUxUXUs"},"1652843":{"result":false,"hash":"AT6uh9NWRY4QEQoYapk"}},"ixData":{"478231":{"sprited":2,"spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","_spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","w":12,"h":12,"p":"0 -109px","sz":"auto"},"485124":{"sprited":2,"spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","_spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","w":24,"h":24,"p":"0 0","sz":"auto"}},"qexData":{"37":{"r":null},"130":{"r":null},"131":{"r":null},"656":{"r":null},"657":{"r":null},"660":{"r":null},"19":{"r":null},"245":{"r":null},"296":{"r":null},"633":{"r":null}},"qplData":{"1860":{"r":1}},"justknobxData":{"317":{"r":16},"1023":{"r":true}}})});requireLazy(["Bootloader"],function(m){m.handlePayload({"consistency":{"rev":1007796774},"rsrcMap":{"pZuCvpU":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yF\/r\/FLJXkx8ys-6.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":15","m":"1007796774_main","nc":1},"l5HqvCB":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yY\/r\/YT7n1sgH1lv.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":17","m":"1007796774_main","nc":1},"92FWu0u":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yV\/r\/3qf4Dki9jBk.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23099","m":"1007796774_longtail","nc":1},"lNw+3Cn":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iTQy4\/ys\/l\/en_US\/R6UwB5s2nQ2.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22368","m":"1007796774_longtail","nc":1},"ymVdTSF":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yH\/r\/ZV0aNQj4T9JOYKdx9bFmwVfC6z84fkv87OWMWJy1SRRa.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22320,22433,22336,22319","m":"1007796774_longtail","nc":1},"rDyHGpp":{"type":"css","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yq\/l\/0,cross\/4ShJxXUc17dmPpUJGycqYtdM-rzcG2i1ZXJj8Zr6dWgv.css?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":29,22369,22418,22417","nc":1},"cXPO3JJ":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yz\/r\/ov-P0fxTgQg.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22371","m":"1007796774_longtail","nc":1},"PHpesmL":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yf\/r\/2cABj-f85G2.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22370","m":"1007796774_longtail","nc":1},"w4kZepP":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yY\/r\/lZ_qmNlaNM_.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22416","m":"1007796774_longtail","nc":1},"EHXzFna":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yQ\/r\/2bbc1q-688I.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22318","m":"1007796774_longtail","nc":1},"dQOzthE":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/ya\/r\/hXzjLI7TwYY.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22372","m":"1007796774_longtail","nc":1},"zEfyD1a":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y-\/r\/rfTsco5uJfS.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":49","m":"1007796774_main","nc":1},"PWJSBTX":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yu\/r\/tPn65o0StmW.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22373","m":"1007796774_longtail","nc":1},"aeZ8J7P":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y5\/r\/I91dQtKCqtJ.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22223","m":"1007796774_longtail","nc":1},"0nDDuEM":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iGWT4\/yP\/l\/en_US\/tj6aAvg10RR-ha4Zz4enInvo7PIFqzApS6tLnb7_y9_rBefStsZCuAtZV0aNQj4T9JPHKRnYublkQqmh-2VANtdEJJdX6BV3dPz8c0H7ihoY7nbNTHWB_fxixJNSNAbg-4lgvnWIH809jxK_8olt4CfolTwB3N6XBAeljxRdJbjnMUA7AD0vIwbJotBSHV8_sn1YcPS4UlnaoBKWrD1Jrj0GZnF3fC6z84fkv87QfwLFPl3iNfPtmfxLVwAb7OWMWJy1SRRaN_g4sjgwQqVoEYzWWu2LQZcIUQjlstqZU2jr_tFUjDMya20AD8butbT9dkGdmZFcSD.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22419,22380,22328,22379,22923,22320,22421,22922,22927,22929,22348,22347,22931,22324,50,22926,22924,22423,22932,22329,22336,22341,22343,22319,22414,22422,22420,22330,22332,22346","m":"1007796774_main,1007796774_longtail","nc":1},"LuUwuw\/":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/8At9Gn29AsS.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22317","m":"1007796774_longtail","nc":1},"mfYeDTt":{"type":"css","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yX\/l\/0,cross\/4ShJxXUc17dQiOPv89Rn1HbTfuCSgqTH8uI_BdsaE1bCDamMpRL-pW0KHFwP3wSXUoLe9LbROaenqBeRmAWDoP_Y4ely4JoRn8_zHJWgay9vgVdM-rzcG2i1Z2dFqGPal58VlHOnCODX2DmXJj8Zr6dWgvqbv95oZ3elBCiZdqw3CwNn.css?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":29,22832,22337,22340,22364,22829,22327,22323,22338,22925,22418,22345,22325,22417,22333,22830","nc":1},"gcoFAhW":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3i6Vk4\/yY\/l\/en_US\/cs_ZT0eb-iAWeOk-wvL7942bbc1q-688Il-aVxn6yl5EM08arqdo_nNzzcK8de5Syz14xtbHg3WbCqIPs-70z9Tl_EdFuO26ZRQ22ZikDsg7fy.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22326,22930,22318,22378,22342,22928,22321,22383,22331,22322","m":"1007796774_longtail","nc":1},"ATbeq0B":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iTfb4\/yx\/l\/en_US\/bSqxIEuBnPF.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22921","m":"1007796774_longtail","nc":1},"sSCI77M":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yn\/r\/Tle9kBkyWWD.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22344","m":"1007796774_longtail","nc":1},"fIsfPpA":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iJfX4\/yf\/l\/en_US\/q-OC9GvDXLB.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22339","m":"1007796774_longtail","nc":1},"Pfkc54B":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yz\/r\/YBirLTG403L.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22726","m":"1007796774_longtail","nc":1},"sD3z2ST":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/ys\/r\/OgQZKqBcuUW.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22727","m":"1007796774_longtail","nc":1},"+ClWygH":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y5\/r\/r611P2Lt7hb.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22725","m":"1007796774_longtail","nc":1},"n2UPpV0":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yY\/r\/xKJiMS7RGt4.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22721","m":"1007796774_longtail","nc":1},"93jOtlY":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y0\/r\/UmpVPcPmZfo.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22724","m":"1007796774_longtail","nc":1},"2QqVX1U":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yQ\/r\/70ZVM_7bcjA.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22708","m":"1007796774_longtail","nc":1},"mhiCfI5":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y2\/r\/Cu2KVQ06AcD.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22722","m":"1007796774_longtail","nc":1}},"compMap":{"CometProfileVideoSection.react":{"r":["x13eeyY","L5R7p5D","CcM+LCX","92FWu0u","L6Tx9we"]},"Dialog":{"r":["lNw+3Cn","L5R7p5D","VJhwr7f","ymVdTSF","rDyHGpp","cXPO3JJ","PHpesmL","w4kZepP","x1i5pBt","EHXzFna","dQOzthE","CcM+LCX","zEfyD1a","x13eeyY","PWJSBTX","L6Tx9we"],"rds":{"m":["FbtLogging","IntlQtEventFalcoEvent"],"r":["POkG4Hf"]},"be":1},"ExceptionDialog":{"r":["x13eeyY","aeZ8J7P","0nDDuEM","LuUwuw\/","mfYeDTt","L5R7p5D","gcoFAhW","VJhwr7f","w4kZepP","x1i5pBt","ATbeq0B","sSCI77M","fIsfPpA","CcM+LCX","zN+Mt9A","zEfyD1a","3unTLaW","L6Tx9we"],"rds":{"m":["FbtLogging","IntlQtEventFalcoEvent"],"r":["POkG4Hf"]},"be":1},"QuickSandSolver":{"r":["Pfkc54B","L5R7p5D","VJhwr7f","cXPO3JJ","PHpesmL","x1i5pBt","CcM+LCX","zEfyD1a","x13eeyY","sD3z2ST","+ClWygH","L6Tx9we"],"rds":{"m":["FbtLogging","IntlQtEventFalcoEvent"],"r":["POkG4Hf"]},"be":1},"ConfirmationDialog":{"r":["L5R7p5D","cXPO3JJ","n2UPpV0","PHpesmL","x1i5pBt","CcM+LCX","zEfyD1a"],"be":1},"MWADeveloperReauthBarrier":{"r":["L5R7p5D","93jOtlY","2QqVX1U","mhiCfI5","CcM+LCX"],"be":1}},"sotUpgrades":["VJhwr7f","POkG4Hf","BG+mBnk","pZuCvpU","x1i5pBt","l5HqvCB"]})});
+requireLazy(["CometResourceScheduler","JSScheduler","Bootloader"],function(c,s,b){c.onHighPriComplete(function(){s.scheduleLoggingPriCallback(function(){b.loadResources(["VJhwr7f","POkG4Hf","BG+mBnk","pZuCvpU","x1i5pBt","l5HqvCB"])})})});
+requireLazy(["JSScheduler","ServerJS","ScheduledApplyEach"],function(JSScheduler,ServerJS,ScheduledApplyEach){qpl_inl("7252775685639807194","tierThreeBeforeScheduler");JSScheduler.runWithPriority(3,function(){qpl_inl("7252775685639807194","tierThreeInsideScheduler");(new ServerJS()).handleWithCustomApplyEach(ScheduledApplyEach,{"define":[["MarauderConfig",[],{"app_version":"1.0.0.0 (1007797318)","gk_enabled":false},31],["RTISubscriptionManagerConfig",[],{"config":{},"autobot":{},"assimilator":{},"unsubscribe_release":true,"bladerunner_www_sandbox":null,"is_intern":false},1081],["MqttWebConfig",[],{"fbid":"0","appID":219994525426954,"endpoint":"wss:\/\/edge-chat.facebook.com\/chat","pollingEndpoint":"https:\/\/edge-chat.facebook.com\/mqtt\/pull","subscribedTopics":[],"capabilities":10,"clientCapabilities":3,"chatVisibility":false,"hostNameOverride":""},3790],["MqttPublishTimeoutConfig",[],{"mqttPublishTimeoutMs":90000},4266],["RequestStreamE2EClientSamplingConfig",[],{"sampleRate":100000,"methodToSamplingMultiplier":{"RTCSessionMessage":10000,"Presence":0.01,"FBGQLS:VOD_TICKER_SUBSCRIBE":0.01,"FBGQLS:STORIES_TRAY_SUBSCRIBE":100,"Collabri":0.1,"FBGQLS:WORK_AVAILABILITY_STATUS_FANOUT_SUBSCRIBE":0.1,"FBGQLS:GROUP_UNSEEN_ACTIVITY_SUBSCRIBE":0.1,"FBGQLS:GROUP_RESET_UNSEEN_ACTIVITY_SUBSCRIBE":0.1,"FBGQLS:INTERN_CALENDAR_UPDATE_SUBSCRIBE":0.1,"SKY:gizmo_manage":10000,"FBGQLS:HUDDLE_USERS_REQUESTED_TO_SPEAK_COUNT_SUBSCRIBE":1000,"FBGQLS:FEEDBACK_LIKE_SUBSCRIBE":1}},4501],["AsyncRequestConfig",[],{"retryOnNetworkError":"1","useFetchStreamAjaxPipeTransport":false},328],["SessionNameConfig",[],{"seed":"0Yw2"},757],["DataStoreConfig",[],{"expandoKey":"__FB_STORE","useExpando":true},2915],["WebDevicePerfInfoData",[],{"needsFullUpdate":true,"needsPartialUpdate":false,"shouldLogResourcePerf":false},3977],["TrackingConfig",[],{"domain":"https:\/\/pixel.facebook.com"},325],["WebStorageMonsterLoggingURI",[],{"uri":null},3032],["UserTimezoneServerTimeData",[],{"timezone":null,"force_update":null,"server_time":null,"server_gmt_offset":null},5502],["CometRouteActorToasterBlocklist",[],{"route_trace_policies":["comet.jobs.composer","comet.jobs.detailView","comet.compat.XCometPageJobOpeningDetailViewController","comet.offer.create","comet.offers.offer_details","comet.crisis.safety_check","comet.crisis.home_page"]},5542],["DGWWebConfig",[],{"appId":"238260118697367","appVersion":"0","dgwVersion":"2","endpoint":"","fbId":"0","authType":""},5508],["cr:496",[],{"__rc":[null,null]},-1],["cr:7346",[],{"__rc":[null,"Aa1jr6CJ6ZTF0p_8p5UaOekAPqgb8C7-vq0UtV5bbQD-bq8FoWSVE3TwjVrTlzRdOL7kt2rNcDtda2vG3uLRwA5_r5fUtYcPTVDZ4dVEPngGZ7QAkSCfAieNkA"]},-1],["cr:3024",[],{"__rc":[null,"Aa18dK02R66R9m14V2F7dRkXdpR7TlRSr1L6rx04Plyn79qxwevqZ96HHaiPrCeIBYCbCrDzJM8RHKg"]},-1],["cr:2046346",[],{"__rc":[null,null]},-1],["cr:708886",["EventProfilerSham"],{"__rc":["EventProfilerSham","Aa3IKVdA5XO59zqVOEcu1Pcng1QuD1hmp8PXpMKsH2LIhUjRKm6g-TccyHAUYv2jPJlu_DTWI92DUvotD2uCJJnCAD8"]},-1],["cr:334",["ghlTestUBTFacebook"],{"__rc":["ghlTestUBTFacebook","Aa0_jfY_4Eq6PSND-B_kK-97okiL9zqBCI6WlTAtlwQ53YxGELPa2tblt576cGBAtXBkcwqRemptrc2X_k_hCfOHfg"]},-1],["cr:1543261",[],{"__rc":[null,"Aa35LVHYq0szz19pFcIWpbH52Rb9GCAqh1H6waH02wVS-uUf7G7V1hU3GC1mLE2so9F9A75TvdMBsJbH84bSUV3d"]},-1],["cr:653",[],{"__rc":[null,"Aa0FK_p_Br47VfO-TGLeXApKEV0AX9Vd-_neImWQ0-4J9sPpv1c8WE3guhQhIUJIeHSdJBgrahJH4IHb_wyfnPDd0ebATl7JBg"]},-1],["cr:2718",[],{"__rc":[null,"Aa3a1YUJol8NoRinyyol9gTqhfzYYI1FCXZ5PjrUPLU7tlMZgIMIB7QU62fyYrELWxR7XHz7y2xScsgWy9NmF5XV8TDEYVk"]},-1],["cr:5868",[],{"__rc":[null,"Aa2nnJUM0igfkBHk1pMp-bzFpsAuiUe1oitNMEVOsQHMDmJ_KXibzpzR3ngCgx8j0pIfln8KzDxkB-fxk6DJ"]},-1],["cr:10026",[],{"__rc":[null,"Aa01hcYUUDD7gqWkKqK4PaYfy8jQCfZev97qtc5OAikDZFGZs0nw3li5dqtu-XgIAJiVUCc7clb0drztWyUg20VDHIM-Vqq1Urb2nw"]},-1],["cr:1201738",[],{"__rc":[null,"Aa1dKFlJaUCl4yrxwrGlIL-rUTJUqSq0RoC52DKfh1AKtR6i3TcClEouRh8tiObC72XmmHtiI-XoE-BJmHv-Kl8lOXLPTjlS-8MvFSZ6XWRM"]},-1],["cr:1332233",[],{"__rc":[null,"Aa2fw86ksK6RJMEM6UDP11evtuymOhocixD__T2bEakBnYIWndo_howVM1Sy2-pAQo7VkeYGgVxhSetfv4QlVD6XPW68lT707Q"]},-1],["cr:1345969",["AccessibilityWebAssistiveTechTypedLoggerLite"],{"__rc":["AccessibilityWebAssistiveTechTypedLoggerLite","Aa1YsA3zWJpfGSGBGhx0Qc6z-K-6WD826pMuS1lD2A7lIm9OWQpBP5qAO2qij52ti0knbKDLoRo"]},-1],["cr:1516609",["BDCometSignalCollectionTrigger"],{"__rc":["BDCometSignalCollectionTrigger","Aa3ffc5QpK7AxlRBkbFRK709IbCCSZRLGnbrZKQ_1vY0s4UXUUSntH7OHQWUkS22LNqzFhaagcamS5fALMks5ul5FKTKDHXVAB8g1kehkLBa5tOVAxZ3NpATaQ"]},-1],["cr:1094907",[],{"__rc":[null,"Aa3eMlCSJq8esne1ZwETbfQVFcjUmKEYNP5PQ89QEHl6-4RsKpeSYNZcDsebA9QQgwl73S_E1wg2DXFlggbsyp8"]},-1],["cr:5800",[],{"__rc":[null,"Aa3TB_t_Drn3y3AJyvWmFMY4THshjk5sOOqDbld1YMIyRki_yiPoC0Q0oZLnMn3ipq5H_aoHPGtmcR4CSyOdHlvBRqESgRA"]},-1],["GhlTennisKnobsConfig",[],{"ghlbox_log_validity_in_mins":7200,"ghlbox_initialize_in_mins":14400,"change_class_interval_in_mins":1440},6687],["BDSignalCollectionData",[],{"sc":"{\"t\":1659080345,\"c\":[[30000,838801],[30001,838801],[30002,838801],[30003,838801],[30004,838801],[30005,838801],[30006,573585],[30007,838801],[30008,838801],[30012,838801],[30013,838801],[30015,806033],[30018,806033],[30021,540823],[30022,540817],[30040,806033],[30093,806033],[30094,806033],[30095,806033],[30101,541591],[30102,541591],[30103,541591],[30104,541591],[30106,806039],[30107,806039],[38000,541427],[38001,806643]]}","fds":60,"fda":60,"i":60,"sbs":1,"dbs":100,"bbs":100,"hbi":60,"rt":262144,"hbcbc":2,"hbvbc":0,"hbbi":30,"sid":-1,"hbv":"3481197084471247899"},5239],["cr:1088657",[],{"__rc":[null,"Aa0VrsMR2eStQjm2MEUSYMUY_0DkpSBH70uug9DArrZWd49ST8NxojE4eZ5juhmyAR9O1czB6xmCSXoRyAj92Hk"]},-1]],"require":[["MAWTTRCSafe\u004029cbd899852d3527d5b8fedf889b1ba4"],["BarcelonaAppUpsellDialog.react\u004029cbd899852d3527d5b8fedf889b1ba4"],["addCometProfileSwitchAnnotation\u004029cbd899852d3527d5b8fedf889b1ba4"],["ContextualConfig\u004029cbd899852d3527d5b8fedf889b1ba4"],["BladeRunnerClient\u004029cbd899852d3527d5b8fedf889b1ba4"],["CometToast.react\u004029cbd899852d3527d5b8fedf889b1ba4"],["BarcelonaRegionGatedAppUpsellDialog.react\u004029cbd899852d3527d5b8fedf889b1ba4"],["WebDevicePerfInfoLogging\u004029cbd899852d3527d5b8fedf889b1ba4"],["CometPixelRatioUpdater\u004029cbd899852d3527d5b8fedf889b1ba4"],["CometUncaughtError.react\u004029cbd899852d3527d5b8fedf889b1ba4"],["CometGHLTestUBT\u004029cbd899852d3527d5b8fedf889b1ba4"],["CometRootDeferred\u004029cbd899852d3527d5b8fedf889b1ba4"],["CometBrowserDimensionsLogger\u004029cbd899852d3527d5b8fedf889b1ba4"],["CometToasterView_DO_NOT_USE.react\u004029cbd899852d3527d5b8fedf889b1ba4"],["CometRelayEF\u004029cbd899852d3527d5b8fedf889b1ba4"],["FbtLogging\u004029cbd899852d3527d5b8fedf889b1ba4"],["CometRouteActorToaster.react\u004029cbd899852d3527d5b8fedf889b1ba4"],["LynxAsyncCallbackFalcoEvent\u004029cbd899852d3527d5b8fedf889b1ba4"],["CometOnBeforeUnloadDialog.react\u004029cbd899852d3527d5b8fedf889b1ba4"],["ClientConsistencyFalcoEvent\u004029cbd899852d3527d5b8fedf889b1ba4"],["DGWRequestStreamClient\u004029cbd899852d3527d5b8fedf889b1ba4"],["CometSuspenseFalcoEvent\u004029cbd899852d3527d5b8fedf889b1ba4"],["ODS\u004029cbd899852d3527d5b8fedf889b1ba4"],["IntlQtEventFalcoEvent\u004029cbd899852d3527d5b8fedf889b1ba4"],["FalcoLoggerTransports\u004029cbd899852d3527d5b8fedf889b1ba4"],["BarcelonaOverflowMenu.react\u004029cbd899852d3527d5b8fedf889b1ba4"],["BarcelonaLightboxDialog.react\u004029cbd899852d3527d5b8fedf889b1ba4"],["VideoPlayerWithLiveVideoInterruptedOverlay.react\u004029cbd899852d3527d5b8fedf889b1ba4"],["BarcelonaFediverseExplainerDialog.react\u004029cbd899852d3527d5b8fedf889b1ba4"],["BarcelonaProfileUserAvatarDialog.react\u004029cbd899852d3527d5b8fedf889b1ba4"],["emptyFunction\u004088778af28b1270d45064c848c9d3632b","thatReturns",["RequireDeferredReference"],[[{"__dr":"MAWTTRCSafe"},{"__dr":"BarcelonaAppUpsellDialog.react"},{"__dr":"addCometProfileSwitchAnnotation"},{"__dr":"ContextualConfig"},{"__dr":"BladeRunnerClient"},{"__dr":"CometToast.react"},{"__dr":"BarcelonaRegionGatedAppUpsellDialog.react"},{"__dr":"WebDevicePerfInfoLogging"},{"__dr":"CometPixelRatioUpdater"},{"__dr":"CometUncaughtError.react"},{"__dr":"CometGHLTestUBT"},{"__dr":"CometRootDeferred"},{"__dr":"CometBrowserDimensionsLogger"},{"__dr":"CometToasterView_DO_NOT_USE.react"},{"__dr":"CometRelayEF"},{"__dr":"FbtLogging"},{"__dr":"CometRouteActorToaster.react"},{"__dr":"LynxAsyncCallbackFalcoEvent"},{"__dr":"CometOnBeforeUnloadDialog.react"},{"__dr":"ClientConsistencyFalcoEvent"},{"__dr":"DGWRequestStreamClient"},{"__dr":"CometSuspenseFalcoEvent"},{"__dr":"ODS"},{"__dr":"IntlQtEventFalcoEvent"},{"__dr":"BarcelonaCookieConsentLearnMoreDialog.react"},{"__dr":"FalcoLoggerTransports"},{"__dr":"BarcelonaOverflowMenu.react"},{"__dr":"BarcelonaLightboxDialog.react"},{"__dr":"VideoPlayerWithLiveVideoInterruptedOverlay.react"},{"__dr":"BarcelonaFediverseExplainerDialog.react"},{"__dr":"BarcelonaProfileUserAvatarDialog.react"}]]],["CometPlatformRootClient\u0040d6a9adf78fc085ab2caf07c2c7120a94","initDeferred",["BarcelonaCometRootConfig"],[{"__m":"BarcelonaCometRootConfig"},{"sketchInfo":null,"userID":0,"deferredCookies":{},"blLoggingCavalryFields":{"bl_sample_rate":0,"hr_sample_rate":0,"parent_lid":"7252775685639807194"}}]],["BarcelonaToast.react\u004099294737b939e8ce4ea81d79d448db75"],["MqttLongPollingRunner\u004099294737b939e8ce4ea81d79d448db75"],["AcfToastImpressionFalcoEvent\u004099294737b939e8ce4ea81d79d448db75"],["TransportSelectingClientSingletonConditional\u0040de8a041706dd04b8eb4fb5892e4ec454"],["BaseToast.react\u004099294737b939e8ce4ea81d79d448db75"],["json-bigint\u004099294737b939e8ce4ea81d79d448db75"],["Bootloader\u00404e8889bf605108c22436b4e8ec05971b","markComponentsAsImmediate",[],[["CometProfileVideoSection.react","VideoPlayerHTML5ApiCea608State","VideoPlayerHTML5ApiWebVttState"]]],["RequireDeferredReference\u0040053f32cd864fd464480f7793d64e2c0d","unblock",[],[["MAWTTRCSafe","BarcelonaAppUpsellDialog.react","addCometProfileSwitchAnnotation","ContextualConfig","BladeRunnerClient","CometToast.react","BarcelonaRegionGatedAppUpsellDialog.react","WebDevicePerfInfoLogging","CometPixelRatioUpdater","CometUncaughtError.react","CometGHLTestUBT","CometRootDeferred","CometBrowserDimensionsLogger","CometToasterView_DO_NOT_USE.react","CometRelayEF","FbtLogging","CometRouteActorToaster.react","LynxAsyncCallbackFalcoEvent","CometOnBeforeUnloadDialog.react","ClientConsistencyFalcoEvent","DGWRequestStreamClient","CometSuspenseFalcoEvent","ODS","IntlQtEventFalcoEvent","BarcelonaCookieConsentLearnMoreDialog.react","FalcoLoggerTransports","BarcelonaOverflowMenu.react","BarcelonaLightboxDialog.react","VideoPlayerWithLiveVideoInterruptedOverlay.react","BarcelonaFediverseExplainerDialog.react","BarcelonaProfileUserAvatarDialog.react","BarcelonaToast.react","MqttLongPollingRunner","CometExceptionDialog.react","AcfToastImpressionFalcoEvent","CometTooltipDeferredImpl.react","TransportSelectingClientSingletonConditional","VideoPlayerSpinner.react","VideoPlayerCaptionsArea.react","BaseToast.react","json-bigint"],"sd"]],["RequireDeferredReference\u0040053f32cd864fd464480f7793d64e2c0d","unblock",[],[["MAWTTRCSafe","BarcelonaAppUpsellDialog.react","addCometProfileSwitchAnnotation","ContextualConfig","BladeRunnerClient","CometToast.react","BarcelonaRegionGatedAppUpsellDialog.react","WebDevicePerfInfoLogging","CometPixelRatioUpdater","CometUncaughtError.react","CometGHLTestUBT","CometRootDeferred","CometBrowserDimensionsLogger","CometToasterView_DO_NOT_USE.react","CometRelayEF","FbtLogging","CometRouteActorToaster.react","LynxAsyncCallbackFalcoEvent","CometOnBeforeUnloadDialog.react","ClientConsistencyFalcoEvent","DGWRequestStreamClient","CometSuspenseFalcoEvent","ODS","IntlQtEventFalcoEvent","FalcoLoggerTransports","BarcelonaOverflowMenu.react","BarcelonaLightboxDialog.react","VideoPlayerWithLiveVideoInterruptedOverlay.react","BarcelonaFediverseExplainerDialog.react","BarcelonaProfileUserAvatarDialog.react","BarcelonaToast.react","MqttLongPollingRunner","CometExceptionDialog.react","AcfToastImpressionFalcoEvent","CometTooltipDeferredImpl.react","TransportSelectingClientSingletonConditional","VideoPlayerSpinner.react","VideoPlayerCaptionsArea.react","BaseToast.react","json-bigint"],"css"]]]});});});</script>
+<script>qpl_inl("7252775685639807194","tierThreeEnd");</script>
+<script type="application/json" data-content-len="85" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252775685639807194","tierThreeEnd"]]]}</script>
+
+<script>window.pldmp = {"7252775685639807194":{"js\/649hye0x8vsw0c4o.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y0\/r\/E6KZsOw-TyZ.js?_nc_x=Ij3Wp8lg5Kz","refs":["htmlStart","tierOne","tierTwo","tierThree"]},"css\/b6sm5nrcj2o8s0go.pkg.css":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yD\/l\/0,cross\/8J4Vh7Dx9_0.css?_nc_x=Ij3Wp8lg5Kz","refs":["htmlStart","tierOne","tierTwo","tierThree"]},"js\/687i1t4o6skkw00w.pkg,js\/9tn41hehy60w8og0.pkg,js\/xcfalxlqfnk48cs0.pkg,js\/27u0lx8ryetcsko4.pkg.__composite__.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iD6c4\/yp\/l\/en_US\/9NbTpxFQDN_VK1i3Cuen-78JswBdCIdym1Vx1-9lxcVH.js?_nc_x=Ij3Wp8lg5Kz","refs":["htmlStart","tierOne","tierTwo","tierThree"]},"js\/c4m95jb0l2go8cks.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3ij4U4\/yq\/l\/en_US\/kZT9Qdvtv8D.js?_nc_x=Ij3Wp8lg5Kz","refs":["htmlStart","tierOne","tierTwo","tierThree"]},"js\/8205t36wcb0oo08c.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iQLo4\/yt\/l\/en_US\/gQS6jq0A8uW.js?_nc_x=Ij3Wp8lg5Kz","refs":["htmlStart","tierOne","tierTwo","tierThree"]},"js\/1j0a8dobn5y8k0k4.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3idE44\/yr\/l\/en_US\/1DwJ8zL6B7E.js?_nc_x=Ij3Wp8lg5Kz","refs":["htmlStart","tierTwo","tierThree"]},"js\/9mxnuotx7ig4www0.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y5\/r\/5qKf_cCaYht.js?_nc_x=Ij3Wp8lg5Kz","refs":["htmlStart","tierTwo"]},"js\/2o5uzr9iekcgss44.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iT0g4\/yh\/l\/en_US\/pjkq_l5ea-y.js?_nc_x=Ij3Wp8lg5Kz","refs":["htmlStart","tierTwo","tierThree"]},"js\/62szddi4fxs8s8kc.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3ivRF4\/yV\/l\/en_US\/kVewawW9sLi.js?_nc_x=Ij3Wp8lg5Kz","refs":["htmlStart","tierTwo","tierThree"]},"js\/dfcvyysajwg0cg4o.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iAiW4\/yP\/l\/en_US\/sHUpS5HkpnG.js?_nc_x=Ij3Wp8lg5Kz","refs":["htmlStart","tierTwo","tierThree"]},"js\/barcelona\/core\/BarcelonaPage.css":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yh\/l\/0,cross\/9kyY29nvH0n.css?_nc_x=Ij3Wp8lg5Kz","refs":["tierOne"]},"js\/f4hymy2ch3k804o4.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iPjk4\/yj\/l\/en_US\/tS4NAEkk1ly.js?_nc_x=Ij3Wp8lg5Kz","refs":["tierThree"]},"js\/2ees9u6w5yckgkso.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3ikM54\/yf\/l\/en_US\/dKyu23I5fqr.js?_nc_x=Ij3Wp8lg5Kz","refs":["tierThree"]},"js\/5hwz9os7gvwgs00s.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yW\/r\/s70ZcYOHW2g.js?_nc_x=Ij3Wp8lg5Kz","refs":["tierThree"]},"js\/69ea5dcpp4w0wgkw.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yF\/r\/FLJXkx8ys-6.js?_nc_x=Ij3Wp8lg5Kz","refs":["tierThree"]},"js\/2rzkeo3vdbggwscw.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3i7M54\/yj\/l\/en_US\/me7LiwnFv1d.js?_nc_x=Ij3Wp8lg5Kz","refs":["tierThree"]},"js\/djeihiulvfkgcccw.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yY\/r\/YT7n1sgH1lv.js?_nc_x=Ij3Wp8lg5Kz","refs":["tierThree"]}}};</script>
+<script type="application/json" data-content-len="69" data-sjs>{"require":[["qplTagServerJS",null,null,[["lastServerTagFlushed"]]]]}</script>
+<script>qpl_inl("7252775685639807194-server","earlyFlush",52);</script>
+<script type="application/json" data-content-len="93" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252775685639807194-server","earlyFlush",52]]]}</script>
+<script>qpl_inl("7252775685639807194-server","cometPageRender",54);</script>
+<script type="application/json" data-content-len="98" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252775685639807194-server","cometPageRender",54]]]}</script>
+<script>qpl_inl("7252775685639807194-server","genTierOneHasteResponseStart",67);</script>
+<script type="application/json" data-content-len="111" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252775685639807194-server","genTierOneHasteResponseStart",67]]]}</script>
+<script>qpl_inl("7252775685639807194-server","genTierOneHasteResponseEnd",91);</script>
+<script type="application/json" data-content-len="109" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252775685639807194-server","genTierOneHasteResponseEnd",91]]]}</script>
+<script>qpl_inl("7252775685639807194-server","genTierTwoHasteResponseStart",99);</script>
+<script type="application/json" data-content-len="111" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252775685639807194-server","genTierTwoHasteResponseStart",99]]]}</script>
+<script>qpl_inl("7252775685639807194-server","genTierTwoHasteResponseEnd",118);</script>
+<script type="application/json" data-content-len="110" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252775685639807194-server","genTierTwoHasteResponseEnd",118]]]}</script>
+<script>qpl_inl("7252775685639807194-server","genTierThreeHasteResponseStart",127);</script>
+<script type="application/json" data-content-len="114" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252775685639807194-server","genTierThreeHasteResponseStart",127]]]}</script>
+<script>qpl_inl("7252775685639807194-server","genTierThreeHasteResponseEnd",131);</script>
+<script type="application/json" data-content-len="112" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252775685639807194-server","genTierThreeHasteResponseEnd",131]]]}</script>
+<script>qpl_inl("7252775685639807194-server","responseStart",1);</script>
+<script type="application/json" data-content-len="95" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252775685639807194-server","responseStart",1]]]}</script>
+<script>qpl_inl("7252775685639807194-server","responseEnd",132);</script>
+<script type="application/json" data-content-len="95" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252775685639807194-server","responseEnd",132]]]}</script>
+<script>window.plbs = {"htmlStart":[80193,11430],"tierOne":[91028,49928],"tierTwo":[103052,30115],"ssr_error":[183,88],"tierThree":[22763,7041]};</script>
+</body></html>
+
diff --git a/spec/fixtures/onebox/threadsstatus_without_image.response b/spec/fixtures/onebox/threadsstatus_without_image.response
new file mode 100644
index 00000000000..d7b4d3861b6
--- /dev/null
+++ b/spec/fixtures/onebox/threadsstatus_without_image.response
@@ -0,0 +1,84 @@
+<!DOCTYPE html><html class="_9dls" lang="en" dir="ltr"><head><link data-default-icon="https://static.xx.fbcdn.net/rsrc.php/v3/y2/r/ZI3qMUkj5Tz.png" rel="icon" sizes="192x192" href="https://static.xx.fbcdn.net/rsrc.php/v3/y2/r/ZI3qMUkj5Tz.png" /><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=2,shrink-to-fit=no" /><meta property="og:site_name" content="Threads" /><meta property="og:type" content="article" /><link rel="canonical" href="https://www.threads.net/t/CuVvRcttG57" /><meta name="description" content="3 likes, 1 reply. Podia ter um jeito f&#xe1;cil de trazer a lista de follows do Twitter n&#xe9; &#x1f914;" /><meta property="og:title" content="Rafael Silva (&#064;rafael_falco) on Threads" /><meta property="og:description" content="3 likes, 1 reply. Podia ter um jeito f&#xe1;cil de trazer a lista de follows do Twitter n&#xe9; &#x1f914;" /><meta property="og:url" content="https://www.threads.net/t/CuVvRcttG57" /><meta property="og:image" content="https://scontent.cdninstagram.com/v/t51.2885-19/358195671_1485179698889636_5420020496346583344_n.jpg?stp=dst-jpg_s150x150&amp;_nc_ht=scontent.cdninstagram.com&amp;_nc_cat=108&amp;_nc_ohc=UbFgg6blcOUAX8XVrUj&amp;edm=APs17CUBAAAA&amp;ccb=7-5&amp;oh=00_AfDTSDE1W16bDEOUCofc_RLwOXbwfwL83BafmR_f4_ou6g&amp;oe=64AB848C&amp;_nc_sid=10d13b" /><meta name="referrer" content="default" id="meta_referrer" /><meta name="twitter:card" content="summary" /><meta name="twitter:title" content="Rafael Silva (&#064;rafael_falco) on Threads" /><meta name="twitter:description" content="3 likes, 1 reply. Podia ter um jeito f&#xe1;cil de trazer a lista de follows do Twitter n&#xe9; &#x1f914;" /><meta name="twitter:image" content="https://scontent.cdninstagram.com/v/t51.2885-19/358195671_1485179698889636_5420020496346583344_n.jpg?stp=dst-jpg_s150x150&amp;_nc_ht=scontent.cdninstagram.com&amp;_nc_cat=108&amp;_nc_ohc=UbFgg6blcOUAX8XVrUj&amp;edm=APs17CUBAAAA&amp;ccb=7-5&amp;oh=00_AfDTSDE1W16bDEOUCofc_RLwOXbwfwL83BafmR_f4_ou6g&amp;oe=64AB848C&amp;_nc_sid=10d13b" /><style nonce="eHbBrKwq">:root{--fds-black:#000000;--fds-black-alpha-05:rgba(0, 0, 0, 0.05);--fds-black-alpha-10:rgba(0, 0, 0, 0.1);--fds-black-alpha-15:rgba(0, 0, 0, 0.15);--fds-black-alpha-20:rgba(0, 0, 0, 0.2);--fds-black-alpha-30:rgba(0, 0, 0, 0.3);--fds-black-alpha-40:rgba(0, 0, 0, 0.4);--fds-black-alpha-50:rgba(0, 0, 0, 0.5);--fds-black-alpha-60:rgba(0, 0, 0, 0.6);--fds-black-alpha-80:rgba(0, 0, 0, 0.8);--fds-blue-05:#ECF3FF;--fds-blue-30:#AAC9FF;--fds-blue-40:#77A7FF;--fds-blue-60:#1877F2;--fds-blue-70:#2851A3;--fds-blue-80:#1D3C78;--fds-button-text:#444950;--fds-comment-background:#F2F3F5;--fds-dark-mode-gray-35:#CCCCCC;--fds-dark-mode-gray-50:#828282;--fds-dark-mode-gray-70:#4A4A4A;--fds-dark-mode-gray-80:#373737;--fds-dark-mode-gray-90:#282828;--fds-dark-mode-gray-100:#1C1C1C;--fds-gray-00:#F5F6F7;--fds-gray-05:#F2F3F5;--fds-gray-10:#EBEDF0;--fds-gray-20:#DADDE1;--fds-gray-25:#CCD0D5;--fds-gray-30:#BEC3C9;--fds-gray-45:#8D949E;--fds-gray-70:#606770;--fds-gray-80:#444950;--fds-gray-90:#303338;--fds-gray-100:#1C1E21;--fds-green-55:#00A400;--fds-highlight:#3578E5;--fds-highlight-cell-background:#ECF3FF;--fds-primary-icon:#1C1E21;--fds-primary-text:#1C1E21;--fds-red-55:#FA383E;--fds-soft:cubic-bezier(.08,.52,.52,1);--fds-spectrum-aluminum-tint-70:#E4F0F6;--fds-spectrum-blue-gray-tint-70:#CFD1D5;--fds-spectrum-cherry:#F35369;--fds-spectrum-cherry-tint-70:#FBCCD2;--fds-spectrum-grape-tint-70:#DDD5F0;--fds-spectrum-grape-tint-90:#F4F1FA;--fds-spectrum-lemon-dark-1:#F5C33B;--fds-spectrum-lemon-tint-70:#FEF2D1;--fds-spectrum-lime:#A3CE71;--fds-spectrum-lime-tint-70:#E4F0D5;--fds-spectrum-orange-tint-70:#FCDEC5;--fds-spectrum-orange-tint-90:#FEF4EC;--fds-spectrum-seafoam-tint-70:#CAEEF9;--fds-spectrum-slate-dark-2:#89A1AC;--fds-spectrum-slate-tint-70:#EAEFF2;--fds-spectrum-teal:#6BCEBB;--fds-spectrum-teal-dark-1:#4DBBA6;--fds-spectrum-teal-dark-2:#31A38D;--fds-spectrum-teal-tint-70:#D2F0EA;--fds-spectrum-teal-tint-90:#F0FAF8;--fds-spectrum-tomato:#FB724B;--fds-spectrum-tomato-tint-30:#F38E7B;--fds-spectrum-tomato-tint-90:#FDEFED;--fds-strong:cubic-bezier(.12,.8,.32,1);--fds-white:#FFFFFF;--fds-white-alpha-05:rgba(255, 255, 255, 0.05);--fds-white-alpha-10:rgba(255, 255, 255, 0.1);--fds-white-alpha-20:rgba(255, 255, 255, 0.2);--fds-white-alpha-30:rgba(255, 255, 255, 0.3);--fds-white-alpha-40:rgba(255, 255, 255, 0.4);--fds-white-alpha-50:rgba(255, 255, 255, 0.5);--fds-white-alpha-60:rgba(255, 255, 255, 0.6);--fds-white-alpha-80:rgba(255, 255, 255, 0.8);--fds-yellow-20:#FFBA00;--accent:hsl(214, 89%, 52%);--always-white:#ffffff;--always-black:#000000;--always-dark-gradient:linear-gradient(rgba(0,0,0,0), rgba(0,0,0,0.6));--always-dark-overlay:rgba(0, 0, 0, 0.4);--always-light-overlay:rgba(255, 255, 255, 0.4);--always-gray-40:#65676B;--always-gray-75:#BCC0C4;--always-gray-95:#F0F2F5;--attachment-footer-background:#F0F2F5;--background-deemphasized:#F0F2F5;--base-blue:#1877F2;--base-cherry:#F3425F;--base-grape:#9360F7;--base-lemon:#F7B928;--base-lime:#45BD62;--base-pink:#FF66BF;--base-seafoam:#54C7EC;--base-teal:#2ABBA7;--base-tomato:#FB724B;--text-badge-info-background:hsl(214, 89%, 52%);--text-badge-success-background:#31A24C;--text-badge-attention-background:hsl(40, 89%, 52%);--text-badge-critical-background:#e41e3f;--blue-link:#216FDB;--border-focused:#65676B;--card-background:#FFFFFF;--card-background-flat:#F7F8FA;--comment-background:#F0F2F5;--comment-footer-background:#F6F9FA;--dataviz-primary-1:rgb(48,200,180);--disabled-button-background:#E4E6EB;--disabled-button-text:#BCC0C4;--disabled-icon:#BCC0C4;--disabled-text:#BCC0C4;--divider:#CED0D4;--event-date:#F3425F;--fb-wordmark:#1877F2;--filter-accent:invert(39%) sepia(57%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(147.75%) hue-rotate(202deg) brightness(97%) contrast(96%);--filter-always-white:invert(100%);--filter-disabled-icon:invert(80%) sepia(6%) saturate(200%) saturate(120%) hue-rotate(173deg) brightness(98%) contrast(89%);--filter-placeholder-icon:invert(59%) sepia(11%) saturate(200%) saturate(135%) hue-rotate(176deg) brightness(96%) contrast(94%);--filter-primary-icon:invert(8%) sepia(10%) saturate(200%) saturate(200%) saturate(166%) hue-rotate(177deg) brightness(104%) contrast(91%);--filter-secondary-icon:invert(39%) sepia(21%) saturate(200%) saturate(109.5%) hue-rotate(174deg) brightness(94%) contrast(86%);--filter-warning-icon:invert(77%) sepia(29%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(128%) hue-rotate(359deg) brightness(102%) contrast(107%);--filter-blue-link-icon:invert(30%) sepia(98%) saturate(200%) saturate(200%) saturate(200%) saturate(166.5%) hue-rotate(192deg) brightness(91%) contrast(101%);--filter-positive:invert(37%) sepia(61%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(115%) hue-rotate(91deg) brightness(97%) contrast(105%);--filter-negative:invert(25%) sepia(33%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(110%) hue-rotate(345deg) brightness(132%) contrast(96%);--glimmer-spinner-icon:#65676B;--hero-banner-background:#FFFFFF;--hosted-view-selected-state:rgba(45, 136, 255, 0.1);--highlight-bg:#E7F3FF;--hover-overlay:rgba(0, 0, 0, 0.05);--list-cell-chevron:#65676B;--media-hover:rgba(68, 73, 80, 0.15);--media-inner-border:rgba(0, 0, 0, 0.1);--media-outer-border:#FFFFFF;--media-pressed:rgba(68, 73, 80, 0.35);--messenger-card-background:#FFFFFF;--messenger-reply-background:#F0F2F5;--overlay-alpha-80:rgba(244, 244, 244, 0.8);--overlay-on-media:rgba(0, 0, 0, 0.6);--nav-bar-background:#FFFFFF;--nav-bar-background-gradient:linear-gradient(to top, #FFFFFF, rgba(255,255,255.9), rgba(255,255,255,.7), rgba(255,255,255,.4), rgba(255,255,255,0));--nav-bar-background-gradient-wash:linear-gradient(to top, #F0F2F5, rgba(240,242,245.9), rgba(240,242,245,.7), rgba(240,242,245,.4), rgba(240,242,245,0));--negative:hsl(350, 87%, 55%);--negative-background:hsl(350, 87%, 55%, 20%);--new-notification-background:#E7F3FF;--non-media-pressed:rgba(68, 73, 80, 0.15);--non-media-pressed-on-dark:rgba(255, 255, 255, 0.3);--notification-badge:#e41e3f;--placeholder-icon:#65676B;--placeholder-image:rgb(164, 167, 171);--placeholder-text:#65676B;--placeholder-text-on-media:rgba(255, 255, 255, 0.5);--popover-background:#FFFFFF;--positive:#31A24C;--positive-background:#DEEFE1;--press-overlay:rgba(0, 0, 0, 0.10);--primary-button-background:#1B74E4;--primary-button-icon:#FFFFFF;--primary-button-pressed:#77A7FF;--primary-button-text:#FFFFFF;--primary-deemphasized-button-background:#E7F3FF;--primary-deemphasized-button-pressed:rgba(0, 0, 0, 0.05);--primary-deemphasized-button-pressed-overlay:rgba(25, 110, 255, 0.15);--primary-deemphasized-button-text:#1877F2;--primary-icon:#050505;--primary-text:#050505;--primary-text-on-media:#FFFFFF;--primary-web-focus-indicator:#D24294;--progress-ring-neutral-background:rgba(0, 0, 0, 0.2);--progress-ring-neutral-foreground:#000000;--progress-ring-on-media-background:rgba(255, 255, 255, 0.2);--progress-ring-on-media-foreground:#FFFFFF;--progress-ring-blue-background:rgba(24, 119, 242, 0.2);--progress-ring-blue-foreground:hsl(214, 89%, 52%);--progress-ring-disabled-background:rgba(190,195,201, 0.2);--progress-ring-disabled-foreground:#BEC3C9;--rating-star-active:#EB660D;--scroll-thumb:#BCC0C4;--scroll-shadow:0 1px 2px rgba(0, 0, 0, 0.1), 0 -1px rgba(0, 0, 0, 0.1) inset;--secondary-button-background:#E4E6EB;--secondary-button-background-floating:#ffffff;--secondary-button-background-on-dark:rgba(0, 0, 0, 0.4);--secondary-button-pressed:rgba(0, 0, 0, 0.05);--secondary-button-stroke:transparent;--secondary-button-text:#050505;--secondary-icon:#65676B;--secondary-text:#65676B;--secondary-text-on-media:rgba(255, 255, 255, 0.9);--section-header-text:#4B4C4F;--shadow-1:rgba(0, 0, 0, 0.1);--shadow-2:rgba(0, 0, 0, 0.2);--shadow-5:rgba(0, 0, 0, 0.5);--shadow-8:rgba(0, 0, 0, 0.8);--shadow-inset:rgba(255, 255, 255, 0.5);--shadow-elevated:0 8px 20px 0 rgba(0, 0, 0, 0.2), 0 2px 4px 0 rgba(0, 0, 0, 0.1);--shadow-persistent:0px 0px 12px rgba(52, 72, 84, 0.05);--shadow-primary:0px 5px 12px rgba(52, 72, 84, 0.2);--surface-background:#FFFFFF;--switch-active:hsl(214, 89%, 52%);--text-highlight:rgba(24, 119, 242, 0.2);--input-background:#FFFFFF;--input-background-disabled:#F0F2F5;--input-border-color:#CED0D4;--input-border-color-hover:var(--placeholder-text);--input-label-color-highlighted:hsl(214, 89%, 52%);--text-input-outside-label:#000000;--toast-background:rgba(255, 255, 255, 0.85);--toast-text:#1C2B33;--toast-text-link:#216FDB;--toggle-active-background:#E7F3FF;--toggle-active-icon:rgb(24, 119, 242);--toggle-active-text:rgb(24, 119, 242);--toggle-button-active-background:#E7F3FF;--tooltip-background:rgba(244, 244, 244, 0.8);--tooltip-box-shadow:0 2px 4px 0 var(--shadow-5);--wash:#E4E6EB;--web-wash:#F0F2F5;--warning:hsl(40, 89%, 52%);--fb-logo-color:#2D88FF;--dialog-anchor-vertical-padding:56px;--header-height:0px;--global-panel-width:0px;--global-panel-width-expanded:0px;--alert-banner-corner-radius:8px;--button-corner-radius:6px;--button-corner-radius-medium:10px;--button-corner-radius-large:12px;--button-height-large:40px;--button-height-medium:36px;--button-padding-horizontal-large:16px;--button-padding-horizontal-medium:16px;--button-icon-padding-large:16px;--button-icon-padding-medium:16px;--button-inner-icon-spacing-large:3px;--button-inner-icon-spacing-medium:3px;--blueprint-button-height-medium:40px;--blueprint-button-height-large:48px;--card-corner-radius:8px;--card-box-shadow:0 12px 28px 0 var(--shadow-2), 0 2px 4px 0 var(--shadow-1);--card-padding-horizontal:10px;--card-padding-vertical:20px;--chip-corner-radius:6px;--dialog-corner-radius:8px;--glimmer-corner-radius:8px;--image-corner-radius:4px;--input-corner-radius:6px;--input-border-width:1px;--nav-list-cell-corner-radius:8px;--list-cell-corner-radius:8px;--list-cell-min-height:52px;--list-cell-padding-vertical:20px;--list-cell-padding-vertical-with-addon:14px;--menu-item-base-margin-horizontal:8px;--menu-item-base-padding-horizontal:8px;--nav-list-cell-min-height:0px;--nav-list-cell-padding-vertical:16px;--nav-list-cell-padding-vertical-with-addon:16px;--page-footer-padding-vertical:16px;--section-header-addOnEnd-margin-horizontal:8px;--section-header-addOnStart-margin-horizontal:12px;--section-header-addOnEnd-button-padding-horizontal:0px;--section-header-addOnEnd-button-padding-vertical:0px;--section-header-padding-vertical:16px;--section-header-subtitle-margin-vertical:14px;--section-header-subtitle-with-addOnEnd-margin-vertical:6px;--text-badge-corner-radius:4px;--text-badge-padding-horizontal:6px;--text-badge-padding-vertical:6px;--text-input-multi-padding-between-text-scrollbar:20px;--text-input-multi-padding-scrollbar:16px;--text-input-caption-margin-top:10px;--text-input-label-top:22px;--text-input-min-height:64px;--text-input-padding-vertical:12px;--toast-addon-padding-horizontal:6px;--toast-addon-padding-vertical:6px;--toast-container-max-width:100%;--toast-container-min-width:0px;--toast-container-padding-horizontal:14px;--toast-container-padding-vertical:10px;--toast-corner-radius:8px;--typeahead-list-outer-padding-vertical:2px;--fds-animation-enter-exit-in:cubic-bezier(0.14, 1, 0.34, 1);--fds-animation-enter-exit-out:cubic-bezier(0.45, 0.1, 0.2, 1);--fds-animation-swap-shuffle-in:cubic-bezier(0.14, 1, 0.34, 1);--fds-animation-swap-shuffle-out:cubic-bezier(0.45, 0.1, 0.2, 1);--fds-animation-move-in:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-move-out:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-expand-collapse-in:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-expand-collapse-out:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-passive-move-in:cubic-bezier(0.5, 0, 0.1, 1);--fds-animation-passive-move-out:cubic-bezier(0.5, 0, 0.1, 1);--fds-animation-quick-move-in:cubic-bezier(0.1, 0.9, 0.2, 1);--fds-animation-quick-move-out:cubic-bezier(0.1, 0.9, 0.2, 1);--fds-animation-fade-in:cubic-bezier(0, 0, 1, 1);--fds-animation-fade-out:cubic-bezier(0, 0, 1, 1);--fds-duration-extra-extra-short-in:100ms;--fds-duration-extra-extra-short-out:100ms;--fds-duration-extra-short-in:200ms;--fds-duration-extra-short-out:150ms;--fds-duration-short-in:280ms;--fds-duration-short-out:200ms;--fds-duration-medium-in:400ms;--fds-duration-medium-out:350ms;--fds-duration-long-in:500ms;--fds-duration-long-out:350ms;--fds-duration-extra-long-in:1000ms;--fds-duration-extra-long-out:1000ms;--fds-duration-none:0ms;--fds-fast:200ms;--fds-slow:400ms;--font-family-apple:system-ui, -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', sans-serif;--font-family-code:ui-monospace, Menlo, Consolas, Monaco, monospace;--font-family-default:Helvetica, Arial, sans-serif;--font-family-segoe:Segoe UI Historic, Segoe UI, Helvetica, Arial, sans-serif;--body-font-family:Placeholder Font;--body-font-size:0.9375rem;--body-font-weight:400;--body-line-height:1.3333;--body-emphasized-font-family:Placeholder Font;--body-emphasized-font-size:0.9375rem;--body-emphasized-font-weight:600;--body-emphasized-line-height:1.3333;--headline1-font-family:Optimistic Display Bold, system-ui, sans-serif;--headline1-font-size:1.75rem;--headline1-font-weight:700;--headline1-line-height:1.2143;--headline2-font-family:Optimistic Display Bold, system-ui, sans-serif;--headline2-font-size:1.5rem;--headline2-font-weight:700;--headline2-line-height:1.25;--headline3-font-family:Optimistic Display Bold, system-ui, sans-serif;--headline3-font-size:1.0625rem;--headline3-font-weight:700;--headline3-line-height:1.2941;--meta-font-family:Placeholder Font;--meta-font-size:0.8125rem;--meta-font-weight:400;--meta-line-height:1.3846;--meta-emphasized-font-family:Placeholder Font;--meta-emphasized-font-size:0.8125rem;--meta-emphasized-font-weight:600;--meta-emphasized-line-height:1.3846;--primary-label-font-family:Optimistic Display Medium, system-ui, sans-serif;--primary-label-font-size:1.0625rem;--primary-label-font-weight:500;--primary-label-line-height:1.2941;--secondary-label-font-family:Placeholder Font;--secondary-label-font-size:0.9375rem;--secondary-label-font-weight:500;--secondary-label-line-height:1.3333;--tertiary-label-font-family:Placeholder Font;--tertiary-label-font-size:0.6875rem;--tertiary-label-font-weight:500;--tertiary-label-line-height:1.4545;--text-input-field-font-family:Placeholder Font;--text-input-field-font-size:1rem;--text-input-field-font-weight:500;--text-input-field-line-height:1.2941;--text-input-label-font-family:Placeholder Font;--text-input-label-font-size:17px;--text-input-label-font-size-scale-multiplier:0.75;--text-input-label-font-weight:400;--text-input-label-line-height:1.2941;--tooltip-border-radius:8px;--dialog-size-medium-max-width:700px;--dialog-size-medium-width:100%;--dialog-size-small-max-width:548px;--dialog-size-small-width:100%;--dataviz-primary-2:rgb(134,218,255);--dataviz-primary-3:rgb(95,170,255);--dataviz-secondary-1:rgb(118,62,230);--dataviz-secondary-2:rgb(147,96,247);--dataviz-secondary-3:rgb(219,26,139);--dataviz-supplementary-1:rgb(255,122,105);--dataviz-supplementary-2:rgb(241,168,23);--dataviz-supplementary-3:rgb(49,162,76);--dataviz-supplementary-4:rgb(50,52,54);--base-unit:4px;--blue-0:245, 251, 255;--blue-1:224, 241, 255;--blue-2:179, 219, 255;--blue-3:112, 188, 255;--blue-4:71, 175, 255;--blue-5:0, 149, 246;--blue-6:0, 116, 204;--blue-7:0, 87, 163;--blue-8:0, 55, 107;--blue-9:0, 41, 82;--cyan-5:39, 196, 245;--font-family-system:-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;--font-weight-system-bold:700;--font-weight-system-extra-bold:800;--font-weight-system-extra-light:200;--font-weight-system-light:300;--font-weight-system-medium:500;--font-weight-system-regular:400;--font-weight-system-semibold:600;--green-4:120, 222, 69;--green-5:88, 195, 34;--green-6:55, 166, 0;--grey-0:245, 245, 245;--grey-1:239, 239, 239;--grey-2:219, 219, 219;--grey-3:199, 199, 199;--grey-4:168, 168, 168;--grey-5:142, 142, 142;--grey-6:115, 115, 115;--grey-7:85, 85, 85;--grey-8:54, 54, 54;--grey-9:38, 38, 38;--grey-10:26, 26, 26;--orange-5:253, 141, 50;--pink-5:209, 8, 105;--purple-5:163, 7, 186;--red-4:255, 104, 116;--red-5:237, 73, 86;--red-6:198, 35, 48;--red-7:167, 3, 17;--system-10-font-size:10px;--system-10-line-height:12px;--system-11-font-size:11px;--system-11-line-height:13px;--system-12-font-size:12px;--system-13-font-size:13px;--system-12-line-height:16px;--system-15-font-size:15px;--system-14-font-size:14px;--system-14-line-height:18px;--system-16-font-size:16px;--system-16-line-height:20px;--system-18-font-size:18px;--system-18-line-height:24px;--system-20-font-size:20px;--system-20-line-height:25px;--system-22-font-size:22px;--system-22-line-height:26px;--system-24-font-size:24px;--system-24-line-height:27px;--system-26-font-size:26px;--system-26-line-height:28px;--system-28-font-size:28px;--system-28-line-height:32px;--system-30-font-size:30px;--system-30-line-height:36px;--system-32-font-size:32px;--system-32-line-height:40px;--yellow-5:253, 203, 92;--barcelona-large-screen-breakpoint:748px;--barcelona-large-screen-max-width:620px;--barcelona-large-screen-padding:344px;--barcelona-threadline-column-width:48px;--barcelona-post-horizontal-padding:12px;--barcelona-quoted-post-horizontal-padding:16px;--barcelona-carousel-gap:6px;--barcelona-lightbox-horizontal-padding:92px;--barcelona-primary-text:rgb(0, 0, 0);--barcelona-secondary-text:rgb(153, 153, 153);--barcelona-primary-button:rgb(0, 0, 0);--barcelona-secondary-button:rgb(255, 255, 255);--barcelona-link-text:rgb(0, 149, 246);--barcelona-error-text:rgb(255, 48, 64);--barcelona-primary-background:rgb(255, 255, 255);--barcelona-elevated-background:rgb(255, 255, 255);--barcelona-secondary-background:rgb(250, 250, 250);--barcelona-tertiary-background:rgb(245, 245, 245);--barcelona-navigation-background:rgba(255, 255, 255);--barcelona-dialog-backdrop-background:rgba(255, 255, 255, 0.85);--barcelona-primary-outline:rgba(0, 0, 0, 0.15);--barcelona-media-outline:rgba(0, 0, 0, 0.15);--barcelona-threadline:rgb(229, 229, 229);}@media (prefers-color-scheme: dark){:root{--fds-black:black;--fds-black-alpha-05:rgba(0, 0, 0, 0.05);--fds-black-alpha-10:rgba(0, 0, 0, 0.1);--fds-black-alpha-15:rgba(0, 0, 0, 0.15);--fds-black-alpha-20:rgba(0, 0, 0, 0.2);--fds-black-alpha-30:rgba(0, 0, 0, 0.3);--fds-black-alpha-40:rgba(0, 0, 0, 0.4);--fds-black-alpha-50:rgba(0, 0, 0, 0.5);--fds-black-alpha-60:rgba(0, 0, 0, 0.6);--fds-black-alpha-80:rgba(0, 0, 0, 0.8);--fds-blue-05:black;--fds-blue-30:black;--fds-blue-40:black;--fds-blue-60:black;--fds-blue-70:black;--fds-blue-80:black;--fds-button-text:black;--fds-comment-background:black;--fds-dark-mode-gray-35:black;--fds-dark-mode-gray-50:black;--fds-dark-mode-gray-70:black;--fds-dark-mode-gray-80:black;--fds-dark-mode-gray-90:black;--fds-dark-mode-gray-100:black;--fds-gray-00:black;--fds-gray-05:black;--fds-gray-10:black;--fds-gray-20:black;--fds-gray-25:black;--fds-gray-30:black;--fds-gray-45:black;--fds-gray-70:black;--fds-gray-80:black;--fds-gray-90:black;--fds-gray-100:black;--fds-green-55:black;--fds-highlight:black;--fds-highlight-cell-background:black;--fds-primary-icon:white;--fds-primary-text:white;--fds-red-55:black;--fds-soft:cubic-bezier(.08,.52,.52,1);--fds-spectrum-aluminum-tint-70:black;--fds-spectrum-blue-gray-tint-70:black;--fds-spectrum-cherry:black;--fds-spectrum-cherry-tint-70:black;--fds-spectrum-grape-tint-70:black;--fds-spectrum-grape-tint-90:black;--fds-spectrum-lemon-dark-1:black;--fds-spectrum-lemon-tint-70:black;--fds-spectrum-lime:black;--fds-spectrum-lime-tint-70:black;--fds-spectrum-orange-tint-70:black;--fds-spectrum-orange-tint-90:black;--fds-spectrum-seafoam-tint-70:black;--fds-spectrum-slate-dark-2:black;--fds-spectrum-slate-tint-70:black;--fds-spectrum-teal:black;--fds-spectrum-teal-dark-1:black;--fds-spectrum-teal-dark-2:black;--fds-spectrum-teal-tint-70:black;--fds-spectrum-teal-tint-90:black;--fds-spectrum-tomato:black;--fds-spectrum-tomato-tint-30:black;--fds-spectrum-tomato-tint-90:black;--fds-strong:cubic-bezier(.12,.8,.32,1);--fds-white:black;--fds-white-alpha-05:rgba(255, 255, 255, 0.05);--fds-white-alpha-10:rgba(255, 255, 255, 0.1);--fds-white-alpha-20:rgba(255, 255, 255, 0.2);--fds-white-alpha-30:rgba(255, 255, 255, 0.3);--fds-white-alpha-40:rgba(255, 255, 255, 0.4);--fds-white-alpha-50:rgba(255, 255, 255, 0.5);--fds-white-alpha-60:rgba(255, 255, 255, 0.6);--fds-white-alpha-80:rgba(255, 255, 255, 0.8);--fds-yellow-20:black;--accent:hsl(214, 100%, 59%);--always-white:#ffffff;--always-black:#000000;--always-dark-gradient:linear-gradient(rgba(0,0,0,0), rgba(0,0,0,0.6));--always-dark-overlay:rgba(0, 0, 0, 0.4);--always-light-overlay:rgba(255, 255, 255, 0.4);--always-gray-40:#65676B;--always-gray-75:#BCC0C4;--always-gray-95:#F0F2F5;--attachment-footer-background:rgba(255,255,255,0.1);--background-deemphasized:rgba(255,255,255,0.1);--base-blue:#1877F2;--base-cherry:#F3425F;--base-grape:#9360F7;--base-lemon:#F7B928;--base-lime:#45BD62;--base-pink:#FF66BF;--base-seafoam:#54C7EC;--base-teal:#2ABBA7;--base-tomato:#FB724B;--text-badge-info-background:hsl(214, 100%, 59%);--text-badge-success-background:#31A24C;--text-badge-attention-background:hsl(40, 89%, 52%);--text-badge-critical-background:#e41e3f;--blue-link:#4599FF;--border-focused:#8A8D91;--card-background:#242526;--card-background-flat:#323436;--comment-background:#3A3B3C;--comment-footer-background:#4E4F50;--dataviz-primary-1:rgb(48,200,180);--disabled-button-background:rgba(255, 255, 255, 0.2);--disabled-button-text:rgba(255, 255, 255, 0.3);--disabled-icon:rgba(255, 255, 255, 0.3);--disabled-text:rgba(255, 255, 255, 0.3);--divider:#3E4042;--event-date:#F3425F;--fb-wordmark:#FFFFFF;--filter-accent:invert(40%) sepia(52%) saturate(200%) saturate(200%) saturate(200%) saturate(189%) hue-rotate(191deg) brightness(103%) contrast(102%);--filter-always-white:invert(100%);--filter-disabled-icon:invert(100%) opacity(30%);--filter-placeholder-icon:invert(59%) sepia(11%) saturate(200%) saturate(135%) hue-rotate(176deg) brightness(96%) contrast(94%);--filter-primary-icon:invert(89%) sepia(6%) hue-rotate(185deg);--filter-secondary-icon:invert(62%) sepia(98%) saturate(12%) hue-rotate(175deg) brightness(90%) contrast(96%);--filter-warning-icon:invert(77%) sepia(29%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(128%) hue-rotate(359deg) brightness(102%) contrast(107%);--filter-blue-link-icon:invert(73%) sepia(29%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(103.25%) hue-rotate(189deg) brightness(101%) contrast(101%);--filter-positive:invert(37%) sepia(61%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(115%) hue-rotate(91deg) brightness(97%) contrast(105%);--filter-negative:invert(25%) sepia(33%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(110%) hue-rotate(345deg) brightness(132%) contrast(96%);--glimmer-spinner-icon:white;--hero-banner-background:#E85D07;--hosted-view-selected-state:rgba(45, 136, 255, 0.1);--highlight-bg:rgba(24, 119, 242, .31);--hover-overlay:rgba(255, 255, 255, 0.1);--list-cell-chevron:#B0B3B8;--media-hover:rgba(68, 73, 80, 0.15);--media-inner-border:rgba(255, 255, 255, 0.05);--media-outer-border:#33363A;--media-pressed:rgba(68, 73, 80, 0.35);--messenger-card-background:#242526;--messenger-reply-background:#18191A;--overlay-alpha-80:rgba(11, 11, 11, 0.8);--overlay-on-media:rgba(0, 0, 0, 0.6);--nav-bar-background:#242526;--nav-bar-background-gradient:linear-gradient(to top, #242526, rgba(36,37,38,.9), rgba(36,37,38,.7), rgba(36,37,38,.4), rgba(36,37,38,0));--nav-bar-background-gradient-wash:linear-gradient(to top, #18191A, rgba(24,25,26,.9), rgba(24,25,26,.7), rgba(24,25,26,.4), rgba(24,25,26,0));--negative:hsl(350, 87%, 55%);--negative-background:hsl(350, 87%, 55%, 20%);--new-notification-background:#E7F3FF;--non-media-pressed:rgba(68, 73, 80, 0.15);--non-media-pressed-on-dark:rgba(255, 255, 255, 0.3);--notification-badge:#e41e3f;--placeholder-icon:#8A8D91;--placeholder-image:rgb(164, 167, 171);--placeholder-text:#8A8D91;--placeholder-text-on-media:rgba(255, 255, 255, 0.5);--popover-background:#3E4042;--positive:#31A24C;--positive-background:#1F3520;--press-overlay:rgba(255, 255, 255, 0.1);--primary-button-background:#2374E1;--primary-button-icon:#FFFFFF;--primary-button-pressed:#77A7FF;--primary-button-text:#FFFFFF;--primary-deemphasized-button-background:rgba(45, 136, 255, 0.2);--primary-deemphasized-button-pressed:rgba(24, 119, 242, 0.2);--primary-deemphasized-button-pressed-overlay:rgba(25, 110, 255, 0.15);--primary-deemphasized-button-text:#2D88FF;--primary-icon:#E4E6EB;--primary-text:#E4E6EB;--primary-text-on-media:white;--primary-web-focus-indicator:#D24294;--progress-ring-neutral-background:rgba(255, 255, 255, 0.2);--progress-ring-neutral-foreground:#ffffff;--progress-ring-on-media-background:rgba(255, 255, 255, 0.2);--progress-ring-on-media-foreground:#FFFFFF;--progress-ring-blue-background:rgba(45, 136, 255, 0.2);--progress-ring-blue-foreground:hsl(214, 100%, 59%);--progress-ring-disabled-background:rgba(122,125,130, 0.2);--progress-ring-disabled-foreground:#7A7D82;--rating-star-active:#FF9831;--scroll-thumb:rgba(255, 255, 255, 0.3);--scroll-shadow:0 1px 2px rgba(0, 0, 0, 0.1), 0 -1px rgba(255, 255, 255, 0.05) inset;--secondary-button-background:rgba(255,255,255,.1);--secondary-button-background-floating:#4B4C4F;--secondary-button-background-on-dark:rgba(255, 255, 255, 0.4);--secondary-button-pressed:rgba(0, 0, 0, 0.05);--secondary-button-stroke:transparent;--secondary-button-text:#E4E6EB;--secondary-icon:#B0B3B8;--secondary-text:#B0B3B8;--secondary-text-on-media:rgba(255, 255, 255, 0.9);--section-header-text:#BCC0C4;--shadow-1:rgba(0, 0, 0, 0.1);--shadow-2:rgba(0, 0, 0, 0.2);--shadow-5:rgba(0, 0, 0, 0.5);--shadow-8:rgba(0, 0, 0, 0.8);--shadow-inset:rgba(255, 255, 255, 0.05);--shadow-elevated:0 8px 20px 0 rgba(0, 0, 0, 0.2), 0 2px 4px 0 rgba(0, 0, 0, 0.1);--shadow-persistent:0px 0px 12px rgba(28, 43, 51, 0.6);--shadow-primary:0px 0px 12px rgba(28, 43, 51, 0.1);--surface-background:#242526;--switch-active:hsl(214, 100%, 59%);--text-highlight:rgba(24, 119, 242, 0.45);--input-background:#242526;--input-background-disabled:#18191A;--input-border-color:#3E4042;--input-border-color-hover:var(--placeholder-text);--input-label-color-highlighted:hsl(214, 100%, 59%);--text-input-outside-label:#FFFFFF;--toast-background:rgba(16, 16, 16, 0.85);--toast-text:#FFFFFF;--toast-text-link:#4599FF;--toggle-active-background:rgb(45, 136, 255);--toggle-active-icon:#FFFFFF;--toggle-active-text:#FFFFFF;--toggle-button-active-background:#E6F2FF;--tooltip-background:rgba(11, 11, 11, 0.8);--tooltip-box-shadow:0 2px 4px 0 var(--shadow-5);--wash:#3E4042;--web-wash:#18191A;--warning:hsl(40, 89%, 52%);--fb-logo-color:#2D88FF;--dialog-anchor-vertical-padding:56px;--header-height:0px;--global-panel-width:0px;--global-panel-width-expanded:0px;--alert-banner-corner-radius:8px;--button-corner-radius:6px;--button-corner-radius-medium:10px;--button-corner-radius-large:12px;--button-height-large:40px;--button-height-medium:36px;--button-padding-horizontal-large:16px;--button-padding-horizontal-medium:16px;--button-icon-padding-large:16px;--button-icon-padding-medium:16px;--button-inner-icon-spacing-large:3px;--button-inner-icon-spacing-medium:3px;--blueprint-button-height-medium:40px;--blueprint-button-height-large:48px;--card-corner-radius:8px;--card-box-shadow:0 12px 28px 0 var(--shadow-2), 0 2px 4px 0 var(--shadow-1);--card-padding-horizontal:10px;--card-padding-vertical:20px;--chip-corner-radius:6px;--dialog-corner-radius:8px;--glimmer-corner-radius:8px;--image-corner-radius:4px;--input-corner-radius:6px;--input-border-width:1px;--nav-list-cell-corner-radius:8px;--list-cell-corner-radius:8px;--list-cell-min-height:52px;--list-cell-padding-vertical:20px;--list-cell-padding-vertical-with-addon:14px;--menu-item-base-margin-horizontal:8px;--menu-item-base-padding-horizontal:8px;--nav-list-cell-min-height:0px;--nav-list-cell-padding-vertical:16px;--nav-list-cell-padding-vertical-with-addon:16px;--page-footer-padding-vertical:16px;--section-header-addOnEnd-margin-horizontal:8px;--section-header-addOnStart-margin-horizontal:12px;--section-header-addOnEnd-button-padding-horizontal:0px;--section-header-addOnEnd-button-padding-vertical:0px;--section-header-padding-vertical:16px;--section-header-subtitle-margin-vertical:14px;--section-header-subtitle-with-addOnEnd-margin-vertical:6px;--text-badge-corner-radius:4px;--text-badge-padding-horizontal:6px;--text-badge-padding-vertical:6px;--text-input-multi-padding-between-text-scrollbar:20px;--text-input-multi-padding-scrollbar:16px;--text-input-caption-margin-top:10px;--text-input-label-top:22px;--text-input-min-height:64px;--text-input-padding-vertical:12px;--toast-addon-padding-horizontal:6px;--toast-addon-padding-vertical:6px;--toast-container-max-width:100%;--toast-container-min-width:0px;--toast-container-padding-horizontal:14px;--toast-container-padding-vertical:10px;--toast-corner-radius:8px;--typeahead-list-outer-padding-vertical:2px;--fds-animation-enter-exit-in:cubic-bezier(0.14, 1, 0.34, 1);--fds-animation-enter-exit-out:cubic-bezier(0.45, 0.1, 0.2, 1);--fds-animation-swap-shuffle-in:cubic-bezier(0.14, 1, 0.34, 1);--fds-animation-swap-shuffle-out:cubic-bezier(0.45, 0.1, 0.2, 1);--fds-animation-move-in:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-move-out:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-expand-collapse-in:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-expand-collapse-out:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-passive-move-in:cubic-bezier(0.5, 0, 0.1, 1);--fds-animation-passive-move-out:cubic-bezier(0.5, 0, 0.1, 1);--fds-animation-quick-move-in:cubic-bezier(0.1, 0.9, 0.2, 1);--fds-animation-quick-move-out:cubic-bezier(0.1, 0.9, 0.2, 1);--fds-animation-fade-in:cubic-bezier(0, 0, 1, 1);--fds-animation-fade-out:cubic-bezier(0, 0, 1, 1);--fds-duration-extra-extra-short-in:100ms;--fds-duration-extra-extra-short-out:100ms;--fds-duration-extra-short-in:200ms;--fds-duration-extra-short-out:150ms;--fds-duration-short-in:280ms;--fds-duration-short-out:200ms;--fds-duration-medium-in:400ms;--fds-duration-medium-out:350ms;--fds-duration-long-in:500ms;--fds-duration-long-out:350ms;--fds-duration-extra-long-in:1000ms;--fds-duration-extra-long-out:1000ms;--fds-duration-none:0ms;--fds-fast:200ms;--fds-slow:400ms;--font-family-apple:system-ui, -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', sans-serif;--font-family-code:ui-monospace, Menlo, Consolas, Monaco, monospace;--font-family-default:Helvetica, Arial, sans-serif;--font-family-segoe:Segoe UI Historic, Segoe UI, Helvetica, Arial, sans-serif;--body-font-family:Placeholder Font;--body-font-size:0.9375rem;--body-font-weight:400;--body-line-height:1.3333;--body-emphasized-font-family:Placeholder Font;--body-emphasized-font-size:0.9375rem;--body-emphasized-font-weight:600;--body-emphasized-line-height:1.3333;--headline1-font-family:Optimistic Display Bold, system-ui, sans-serif;--headline1-font-size:1.75rem;--headline1-font-weight:700;--headline1-line-height:1.2143;--headline2-font-family:Optimistic Display Bold, system-ui, sans-serif;--headline2-font-size:1.5rem;--headline2-font-weight:700;--headline2-line-height:1.25;--headline3-font-family:Optimistic Display Bold, system-ui, sans-serif;--headline3-font-size:1.0625rem;--headline3-font-weight:700;--headline3-line-height:1.2941;--meta-font-family:Placeholder Font;--meta-font-size:0.8125rem;--meta-font-weight:400;--meta-line-height:1.3846;--meta-emphasized-font-family:Placeholder Font;--meta-emphasized-font-size:0.8125rem;--meta-emphasized-font-weight:600;--meta-emphasized-line-height:1.3846;--primary-label-font-family:Optimistic Display Medium, system-ui, sans-serif;--primary-label-font-size:1.0625rem;--primary-label-font-weight:500;--primary-label-line-height:1.2941;--secondary-label-font-family:Placeholder Font;--secondary-label-font-size:0.9375rem;--secondary-label-font-weight:500;--secondary-label-line-height:1.3333;--tertiary-label-font-family:Placeholder Font;--tertiary-label-font-size:0.6875rem;--tertiary-label-font-weight:500;--tertiary-label-line-height:1.4545;--text-input-field-font-family:Placeholder Font;--text-input-field-font-size:1rem;--text-input-field-font-weight:500;--text-input-field-line-height:1.2941;--text-input-label-font-family:Placeholder Font;--text-input-label-font-size:17px;--text-input-label-font-size-scale-multiplier:0.75;--text-input-label-font-weight:400;--text-input-label-line-height:1.2941;--tooltip-border-radius:8px;--dialog-size-medium-max-width:700px;--dialog-size-medium-width:100%;--dialog-size-small-max-width:548px;--dialog-size-small-width:100%;--dataviz-primary-2:rgb(134,218,255);--dataviz-primary-3:rgb(95,170,255);--dataviz-secondary-1:rgb(129,77,231);--dataviz-secondary-2:rgb(168,124,255);--dataviz-secondary-3:rgb(219,26,139);--dataviz-supplementary-1:rgb(255,122,105);--dataviz-supplementary-2:rgb(241,168,23);--dataviz-supplementary-3:rgb(49,162,76);--dataviz-supplementary-4:rgb(228,230,235);--base-unit:4px;--blue-0:245, 251, 255;--blue-1:224, 241, 255;--blue-2:179, 219, 255;--blue-3:112, 188, 255;--blue-4:71, 175, 255;--blue-5:0, 149, 246;--blue-6:0, 116, 204;--blue-7:0, 87, 163;--blue-8:0, 55, 107;--blue-9:0, 41, 82;--cyan-5:39, 196, 245;--font-family-system:-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;--font-weight-system-bold:700;--font-weight-system-extra-bold:800;--font-weight-system-extra-light:200;--font-weight-system-light:300;--font-weight-system-medium:500;--font-weight-system-regular:400;--font-weight-system-semibold:600;--green-4:120, 222, 69;--green-5:88, 195, 34;--green-6:55, 166, 0;--grey-0:245, 245, 245;--grey-1:239, 239, 239;--grey-2:219, 219, 219;--grey-3:199, 199, 199;--grey-4:168, 168, 168;--grey-5:142, 142, 142;--grey-6:115, 115, 115;--grey-7:85, 85, 85;--grey-8:54, 54, 54;--grey-9:38, 38, 38;--grey-10:26, 26, 26;--orange-5:253, 141, 50;--pink-5:209, 8, 105;--purple-5:163, 7, 186;--red-4:255, 104, 116;--red-5:237, 73, 86;--red-6:198, 35, 48;--red-7:167, 3, 17;--system-10-font-size:10px;--system-10-line-height:12px;--system-11-font-size:11px;--system-11-line-height:13px;--system-12-font-size:12px;--system-13-font-size:13px;--system-12-line-height:16px;--system-15-font-size:15px;--system-14-font-size:14px;--system-14-line-height:18px;--system-16-font-size:16px;--system-16-line-height:20px;--system-18-font-size:18px;--system-18-line-height:24px;--system-20-font-size:20px;--system-20-line-height:25px;--system-22-font-size:22px;--system-22-line-height:26px;--system-24-font-size:24px;--system-24-line-height:27px;--system-26-font-size:26px;--system-26-line-height:28px;--system-28-font-size:28px;--system-28-line-height:32px;--system-30-font-size:30px;--system-30-line-height:36px;--system-32-font-size:32px;--system-32-line-height:40px;--yellow-5:253, 203, 92;--barcelona-large-screen-breakpoint:748px;--barcelona-large-screen-max-width:620px;--barcelona-large-screen-padding:344px;--barcelona-threadline-column-width:48px;--barcelona-post-horizontal-padding:12px;--barcelona-quoted-post-horizontal-padding:16px;--barcelona-carousel-gap:6px;--barcelona-lightbox-horizontal-padding:92px;--barcelona-primary-text:rgb(243, 245, 247);--barcelona-secondary-text:rgb(97, 97, 97);--barcelona-primary-button:rgb(255, 255, 255);--barcelona-secondary-button:rgb(16, 16, 16);--barcelona-link-text:rgb(24, 163, 254);--barcelona-error-text:rgb(255, 48, 64);--barcelona-primary-background:rgb(16, 16, 16);--barcelona-elevated-background:rgb(24, 24, 24);--barcelona-secondary-background:rgb(10, 10, 10);--barcelona-tertiary-background:rgb(30, 30, 30);--barcelona-navigation-background:rgb(16, 16, 16);--barcelona-dialog-backdrop-background:rgba(16, 16, 16, 0.85);--barcelona-primary-outline:rgba(243, 245, 247, 0.15);--barcelona-media-outline:rgba(243, 245, 247, 0.2);--barcelona-threadline:rgb(51, 54, 56);--color-scheme:dark;}}.__fb-light-mode{--fds-black:#000000;--fds-black-alpha-05:rgba(0, 0, 0, 0.05);--fds-black-alpha-10:rgba(0, 0, 0, 0.1);--fds-black-alpha-15:rgba(0, 0, 0, 0.15);--fds-black-alpha-20:rgba(0, 0, 0, 0.2);--fds-black-alpha-30:rgba(0, 0, 0, 0.3);--fds-black-alpha-40:rgba(0, 0, 0, 0.4);--fds-black-alpha-50:rgba(0, 0, 0, 0.5);--fds-black-alpha-60:rgba(0, 0, 0, 0.6);--fds-black-alpha-80:rgba(0, 0, 0, 0.8);--fds-blue-05:#ECF3FF;--fds-blue-30:#AAC9FF;--fds-blue-40:#77A7FF;--fds-blue-60:#1877F2;--fds-blue-70:#2851A3;--fds-blue-80:#1D3C78;--fds-button-text:#444950;--fds-comment-background:#F2F3F5;--fds-dark-mode-gray-35:#CCCCCC;--fds-dark-mode-gray-50:#828282;--fds-dark-mode-gray-70:#4A4A4A;--fds-dark-mode-gray-80:#373737;--fds-dark-mode-gray-90:#282828;--fds-dark-mode-gray-100:#1C1C1C;--fds-gray-00:#F5F6F7;--fds-gray-05:#F2F3F5;--fds-gray-10:#EBEDF0;--fds-gray-20:#DADDE1;--fds-gray-25:#CCD0D5;--fds-gray-30:#BEC3C9;--fds-gray-45:#8D949E;--fds-gray-70:#606770;--fds-gray-80:#444950;--fds-gray-90:#303338;--fds-gray-100:#1C1E21;--fds-green-55:#00A400;--fds-highlight:#3578E5;--fds-highlight-cell-background:#ECF3FF;--fds-primary-icon:#1C1E21;--fds-primary-text:#1C1E21;--fds-red-55:#FA383E;--fds-soft:cubic-bezier(.08,.52,.52,1);--fds-spectrum-aluminum-tint-70:#E4F0F6;--fds-spectrum-blue-gray-tint-70:#CFD1D5;--fds-spectrum-cherry:#F35369;--fds-spectrum-cherry-tint-70:#FBCCD2;--fds-spectrum-grape-tint-70:#DDD5F0;--fds-spectrum-grape-tint-90:#F4F1FA;--fds-spectrum-lemon-dark-1:#F5C33B;--fds-spectrum-lemon-tint-70:#FEF2D1;--fds-spectrum-lime:#A3CE71;--fds-spectrum-lime-tint-70:#E4F0D5;--fds-spectrum-orange-tint-70:#FCDEC5;--fds-spectrum-orange-tint-90:#FEF4EC;--fds-spectrum-seafoam-tint-70:#CAEEF9;--fds-spectrum-slate-dark-2:#89A1AC;--fds-spectrum-slate-tint-70:#EAEFF2;--fds-spectrum-teal:#6BCEBB;--fds-spectrum-teal-dark-1:#4DBBA6;--fds-spectrum-teal-dark-2:#31A38D;--fds-spectrum-teal-tint-70:#D2F0EA;--fds-spectrum-teal-tint-90:#F0FAF8;--fds-spectrum-tomato:#FB724B;--fds-spectrum-tomato-tint-30:#F38E7B;--fds-spectrum-tomato-tint-90:#FDEFED;--fds-strong:cubic-bezier(.12,.8,.32,1);--fds-white:#FFFFFF;--fds-white-alpha-05:rgba(255, 255, 255, 0.05);--fds-white-alpha-10:rgba(255, 255, 255, 0.1);--fds-white-alpha-20:rgba(255, 255, 255, 0.2);--fds-white-alpha-30:rgba(255, 255, 255, 0.3);--fds-white-alpha-40:rgba(255, 255, 255, 0.4);--fds-white-alpha-50:rgba(255, 255, 255, 0.5);--fds-white-alpha-60:rgba(255, 255, 255, 0.6);--fds-white-alpha-80:rgba(255, 255, 255, 0.8);--fds-yellow-20:#FFBA00;--accent:hsl(214, 89%, 52%);--always-white:#ffffff;--always-black:#000000;--always-dark-gradient:linear-gradient(rgba(0,0,0,0), rgba(0,0,0,0.6));--always-dark-overlay:rgba(0, 0, 0, 0.4);--always-light-overlay:rgba(255, 255, 255, 0.4);--always-gray-40:#65676B;--always-gray-75:#BCC0C4;--always-gray-95:#F0F2F5;--attachment-footer-background:#F0F2F5;--background-deemphasized:#F0F2F5;--base-blue:#1877F2;--base-cherry:#F3425F;--base-grape:#9360F7;--base-lemon:#F7B928;--base-lime:#45BD62;--base-pink:#FF66BF;--base-seafoam:#54C7EC;--base-teal:#2ABBA7;--base-tomato:#FB724B;--text-badge-info-background:hsl(214, 89%, 52%);--text-badge-success-background:#31A24C;--text-badge-attention-background:hsl(40, 89%, 52%);--text-badge-critical-background:#e41e3f;--blue-link:#216FDB;--border-focused:#65676B;--card-background:#FFFFFF;--card-background-flat:#F7F8FA;--comment-background:#F0F2F5;--comment-footer-background:#F6F9FA;--dataviz-primary-1:rgb(48,200,180);--disabled-button-background:#E4E6EB;--disabled-button-text:#BCC0C4;--disabled-icon:#BCC0C4;--disabled-text:#BCC0C4;--divider:#CED0D4;--event-date:#F3425F;--fb-wordmark:#1877F2;--filter-accent:invert(39%) sepia(57%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(147.75%) hue-rotate(202deg) brightness(97%) contrast(96%);--filter-always-white:invert(100%);--filter-disabled-icon:invert(80%) sepia(6%) saturate(200%) saturate(120%) hue-rotate(173deg) brightness(98%) contrast(89%);--filter-placeholder-icon:invert(59%) sepia(11%) saturate(200%) saturate(135%) hue-rotate(176deg) brightness(96%) contrast(94%);--filter-primary-icon:invert(8%) sepia(10%) saturate(200%) saturate(200%) saturate(166%) hue-rotate(177deg) brightness(104%) contrast(91%);--filter-secondary-icon:invert(39%) sepia(21%) saturate(200%) saturate(109.5%) hue-rotate(174deg) brightness(94%) contrast(86%);--filter-warning-icon:invert(77%) sepia(29%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(128%) hue-rotate(359deg) brightness(102%) contrast(107%);--filter-blue-link-icon:invert(30%) sepia(98%) saturate(200%) saturate(200%) saturate(200%) saturate(166.5%) hue-rotate(192deg) brightness(91%) contrast(101%);--filter-positive:invert(37%) sepia(61%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(115%) hue-rotate(91deg) brightness(97%) contrast(105%);--filter-negative:invert(25%) sepia(33%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(110%) hue-rotate(345deg) brightness(132%) contrast(96%);--glimmer-spinner-icon:#65676B;--hero-banner-background:#FFFFFF;--hosted-view-selected-state:rgba(45, 136, 255, 0.1);--highlight-bg:#E7F3FF;--hover-overlay:rgba(0, 0, 0, 0.05);--list-cell-chevron:#65676B;--media-hover:rgba(68, 73, 80, 0.15);--media-inner-border:rgba(0, 0, 0, 0.1);--media-outer-border:#FFFFFF;--media-pressed:rgba(68, 73, 80, 0.35);--messenger-card-background:#FFFFFF;--messenger-reply-background:#F0F2F5;--overlay-alpha-80:rgba(244, 244, 244, 0.8);--overlay-on-media:rgba(0, 0, 0, 0.6);--nav-bar-background:#FFFFFF;--nav-bar-background-gradient:linear-gradient(to top, #FFFFFF, rgba(255,255,255.9), rgba(255,255,255,.7), rgba(255,255,255,.4), rgba(255,255,255,0));--nav-bar-background-gradient-wash:linear-gradient(to top, #F0F2F5, rgba(240,242,245.9), rgba(240,242,245,.7), rgba(240,242,245,.4), rgba(240,242,245,0));--negative:hsl(350, 87%, 55%);--negative-background:hsl(350, 87%, 55%, 20%);--new-notification-background:#E7F3FF;--non-media-pressed:rgba(68, 73, 80, 0.15);--non-media-pressed-on-dark:rgba(255, 255, 255, 0.3);--notification-badge:#e41e3f;--placeholder-icon:#65676B;--placeholder-image:rgb(164, 167, 171);--placeholder-text:#65676B;--placeholder-text-on-media:rgba(255, 255, 255, 0.5);--popover-background:#FFFFFF;--positive:#31A24C;--positive-background:#DEEFE1;--press-overlay:rgba(0, 0, 0, 0.10);--primary-button-background:#1B74E4;--primary-button-icon:#FFFFFF;--primary-button-pressed:#77A7FF;--primary-button-text:#FFFFFF;--primary-deemphasized-button-background:#E7F3FF;--primary-deemphasized-button-pressed:rgba(0, 0, 0, 0.05);--primary-deemphasized-button-pressed-overlay:rgba(25, 110, 255, 0.15);--primary-deemphasized-button-text:#1877F2;--primary-icon:#050505;--primary-text:#050505;--primary-text-on-media:#FFFFFF;--primary-web-focus-indicator:#D24294;--progress-ring-neutral-background:rgba(0, 0, 0, 0.2);--progress-ring-neutral-foreground:#000000;--progress-ring-on-media-background:rgba(255, 255, 255, 0.2);--progress-ring-on-media-foreground:#FFFFFF;--progress-ring-blue-background:rgba(24, 119, 242, 0.2);--progress-ring-blue-foreground:hsl(214, 89%, 52%);--progress-ring-disabled-background:rgba(190,195,201, 0.2);--progress-ring-disabled-foreground:#BEC3C9;--rating-star-active:#EB660D;--scroll-thumb:#BCC0C4;--scroll-shadow:0 1px 2px rgba(0, 0, 0, 0.1), 0 -1px rgba(0, 0, 0, 0.1) inset;--secondary-button-background:#E4E6EB;--secondary-button-background-floating:#ffffff;--secondary-button-background-on-dark:rgba(0, 0, 0, 0.4);--secondary-button-pressed:rgba(0, 0, 0, 0.05);--secondary-button-stroke:transparent;--secondary-button-text:#050505;--secondary-icon:#65676B;--secondary-text:#65676B;--secondary-text-on-media:rgba(255, 255, 255, 0.9);--section-header-text:#4B4C4F;--shadow-1:rgba(0, 0, 0, 0.1);--shadow-2:rgba(0, 0, 0, 0.2);--shadow-5:rgba(0, 0, 0, 0.5);--shadow-8:rgba(0, 0, 0, 0.8);--shadow-inset:rgba(255, 255, 255, 0.5);--shadow-elevated:0 8px 20px 0 rgba(0, 0, 0, 0.2), 0 2px 4px 0 rgba(0, 0, 0, 0.1);--shadow-persistent:0px 0px 12px rgba(52, 72, 84, 0.05);--shadow-primary:0px 5px 12px rgba(52, 72, 84, 0.2);--surface-background:#FFFFFF;--switch-active:hsl(214, 89%, 52%);--text-highlight:rgba(24, 119, 242, 0.2);--input-background:#FFFFFF;--input-background-disabled:#F0F2F5;--input-border-color:#CED0D4;--input-border-color-hover:var(--placeholder-text);--input-label-color-highlighted:hsl(214, 89%, 52%);--text-input-outside-label:#000000;--toast-background:rgba(255, 255, 255, 0.85);--toast-text:#1C2B33;--toast-text-link:#216FDB;--toggle-active-background:#E7F3FF;--toggle-active-icon:rgb(24, 119, 242);--toggle-active-text:rgb(24, 119, 242);--toggle-button-active-background:#E7F3FF;--tooltip-background:rgba(244, 244, 244, 0.8);--tooltip-box-shadow:0 2px 4px 0 var(--shadow-5);--wash:#E4E6EB;--web-wash:#F0F2F5;--warning:hsl(40, 89%, 52%);--fb-logo-color:#2D88FF;--dialog-anchor-vertical-padding:56px;--header-height:0px;--global-panel-width:0px;--global-panel-width-expanded:0px;--alert-banner-corner-radius:8px;--button-corner-radius:6px;--button-corner-radius-medium:10px;--button-corner-radius-large:12px;--button-height-large:40px;--button-height-medium:36px;--button-padding-horizontal-large:16px;--button-padding-horizontal-medium:16px;--button-icon-padding-large:16px;--button-icon-padding-medium:16px;--button-inner-icon-spacing-large:3px;--button-inner-icon-spacing-medium:3px;--blueprint-button-height-medium:40px;--blueprint-button-height-large:48px;--card-corner-radius:8px;--card-box-shadow:0 12px 28px 0 var(--shadow-2), 0 2px 4px 0 var(--shadow-1);--card-padding-horizontal:10px;--card-padding-vertical:20px;--chip-corner-radius:6px;--dialog-corner-radius:8px;--glimmer-corner-radius:8px;--image-corner-radius:4px;--input-corner-radius:6px;--input-border-width:1px;--nav-list-cell-corner-radius:8px;--list-cell-corner-radius:8px;--list-cell-min-height:52px;--list-cell-padding-vertical:20px;--list-cell-padding-vertical-with-addon:14px;--menu-item-base-margin-horizontal:8px;--menu-item-base-padding-horizontal:8px;--nav-list-cell-min-height:0px;--nav-list-cell-padding-vertical:16px;--nav-list-cell-padding-vertical-with-addon:16px;--page-footer-padding-vertical:16px;--section-header-addOnEnd-margin-horizontal:8px;--section-header-addOnStart-margin-horizontal:12px;--section-header-addOnEnd-button-padding-horizontal:0px;--section-header-addOnEnd-button-padding-vertical:0px;--section-header-padding-vertical:16px;--section-header-subtitle-margin-vertical:14px;--section-header-subtitle-with-addOnEnd-margin-vertical:6px;--text-badge-corner-radius:4px;--text-badge-padding-horizontal:6px;--text-badge-padding-vertical:6px;--text-input-multi-padding-between-text-scrollbar:20px;--text-input-multi-padding-scrollbar:16px;--text-input-caption-margin-top:10px;--text-input-label-top:22px;--text-input-min-height:64px;--text-input-padding-vertical:12px;--toast-addon-padding-horizontal:6px;--toast-addon-padding-vertical:6px;--toast-container-max-width:100%;--toast-container-min-width:0px;--toast-container-padding-horizontal:14px;--toast-container-padding-vertical:10px;--toast-corner-radius:8px;--typeahead-list-outer-padding-vertical:2px;--fds-animation-enter-exit-in:cubic-bezier(0.14, 1, 0.34, 1);--fds-animation-enter-exit-out:cubic-bezier(0.45, 0.1, 0.2, 1);--fds-animation-swap-shuffle-in:cubic-bezier(0.14, 1, 0.34, 1);--fds-animation-swap-shuffle-out:cubic-bezier(0.45, 0.1, 0.2, 1);--fds-animation-move-in:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-move-out:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-expand-collapse-in:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-expand-collapse-out:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-passive-move-in:cubic-bezier(0.5, 0, 0.1, 1);--fds-animation-passive-move-out:cubic-bezier(0.5, 0, 0.1, 1);--fds-animation-quick-move-in:cubic-bezier(0.1, 0.9, 0.2, 1);--fds-animation-quick-move-out:cubic-bezier(0.1, 0.9, 0.2, 1);--fds-animation-fade-in:cubic-bezier(0, 0, 1, 1);--fds-animation-fade-out:cubic-bezier(0, 0, 1, 1);--fds-duration-extra-extra-short-in:100ms;--fds-duration-extra-extra-short-out:100ms;--fds-duration-extra-short-in:200ms;--fds-duration-extra-short-out:150ms;--fds-duration-short-in:280ms;--fds-duration-short-out:200ms;--fds-duration-medium-in:400ms;--fds-duration-medium-out:350ms;--fds-duration-long-in:500ms;--fds-duration-long-out:350ms;--fds-duration-extra-long-in:1000ms;--fds-duration-extra-long-out:1000ms;--fds-duration-none:0ms;--fds-fast:200ms;--fds-slow:400ms;--font-family-apple:system-ui, -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', sans-serif;--font-family-code:ui-monospace, Menlo, Consolas, Monaco, monospace;--font-family-default:Helvetica, Arial, sans-serif;--font-family-segoe:Segoe UI Historic, Segoe UI, Helvetica, Arial, sans-serif;--body-font-family:Placeholder Font;--body-font-size:0.9375rem;--body-font-weight:400;--body-line-height:1.3333;--body-emphasized-font-family:Placeholder Font;--body-emphasized-font-size:0.9375rem;--body-emphasized-font-weight:600;--body-emphasized-line-height:1.3333;--headline1-font-family:Optimistic Display Bold, system-ui, sans-serif;--headline1-font-size:1.75rem;--headline1-font-weight:700;--headline1-line-height:1.2143;--headline2-font-family:Optimistic Display Bold, system-ui, sans-serif;--headline2-font-size:1.5rem;--headline2-font-weight:700;--headline2-line-height:1.25;--headline3-font-family:Optimistic Display Bold, system-ui, sans-serif;--headline3-font-size:1.0625rem;--headline3-font-weight:700;--headline3-line-height:1.2941;--meta-font-family:Placeholder Font;--meta-font-size:0.8125rem;--meta-font-weight:400;--meta-line-height:1.3846;--meta-emphasized-font-family:Placeholder Font;--meta-emphasized-font-size:0.8125rem;--meta-emphasized-font-weight:600;--meta-emphasized-line-height:1.3846;--primary-label-font-family:Optimistic Display Medium, system-ui, sans-serif;--primary-label-font-size:1.0625rem;--primary-label-font-weight:500;--primary-label-line-height:1.2941;--secondary-label-font-family:Placeholder Font;--secondary-label-font-size:0.9375rem;--secondary-label-font-weight:500;--secondary-label-line-height:1.3333;--tertiary-label-font-family:Placeholder Font;--tertiary-label-font-size:0.6875rem;--tertiary-label-font-weight:500;--tertiary-label-line-height:1.4545;--text-input-field-font-family:Placeholder Font;--text-input-field-font-size:1rem;--text-input-field-font-weight:500;--text-input-field-line-height:1.2941;--text-input-label-font-family:Placeholder Font;--text-input-label-font-size:17px;--text-input-label-font-size-scale-multiplier:0.75;--text-input-label-font-weight:400;--text-input-label-line-height:1.2941;--tooltip-border-radius:8px;--dialog-size-medium-max-width:700px;--dialog-size-medium-width:100%;--dialog-size-small-max-width:548px;--dialog-size-small-width:100%;--dataviz-primary-2:rgb(134,218,255);--dataviz-primary-3:rgb(95,170,255);--dataviz-secondary-1:rgb(118,62,230);--dataviz-secondary-2:rgb(147,96,247);--dataviz-secondary-3:rgb(219,26,139);--dataviz-supplementary-1:rgb(255,122,105);--dataviz-supplementary-2:rgb(241,168,23);--dataviz-supplementary-3:rgb(49,162,76);--dataviz-supplementary-4:rgb(50,52,54);--base-unit:4px;--blue-0:245, 251, 255;--blue-1:224, 241, 255;--blue-2:179, 219, 255;--blue-3:112, 188, 255;--blue-4:71, 175, 255;--blue-5:0, 149, 246;--blue-6:0, 116, 204;--blue-7:0, 87, 163;--blue-8:0, 55, 107;--blue-9:0, 41, 82;--cyan-5:39, 196, 245;--font-family-system:-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;--font-weight-system-bold:700;--font-weight-system-extra-bold:800;--font-weight-system-extra-light:200;--font-weight-system-light:300;--font-weight-system-medium:500;--font-weight-system-regular:400;--font-weight-system-semibold:600;--green-4:120, 222, 69;--green-5:88, 195, 34;--green-6:55, 166, 0;--grey-0:245, 245, 245;--grey-1:239, 239, 239;--grey-2:219, 219, 219;--grey-3:199, 199, 199;--grey-4:168, 168, 168;--grey-5:142, 142, 142;--grey-6:115, 115, 115;--grey-7:85, 85, 85;--grey-8:54, 54, 54;--grey-9:38, 38, 38;--grey-10:26, 26, 26;--orange-5:253, 141, 50;--pink-5:209, 8, 105;--purple-5:163, 7, 186;--red-4:255, 104, 116;--red-5:237, 73, 86;--red-6:198, 35, 48;--red-7:167, 3, 17;--system-10-font-size:10px;--system-10-line-height:12px;--system-11-font-size:11px;--system-11-line-height:13px;--system-12-font-size:12px;--system-13-font-size:13px;--system-12-line-height:16px;--system-15-font-size:15px;--system-14-font-size:14px;--system-14-line-height:18px;--system-16-font-size:16px;--system-16-line-height:20px;--system-18-font-size:18px;--system-18-line-height:24px;--system-20-font-size:20px;--system-20-line-height:25px;--system-22-font-size:22px;--system-22-line-height:26px;--system-24-font-size:24px;--system-24-line-height:27px;--system-26-font-size:26px;--system-26-line-height:28px;--system-28-font-size:28px;--system-28-line-height:32px;--system-30-font-size:30px;--system-30-line-height:36px;--system-32-font-size:32px;--system-32-line-height:40px;--yellow-5:253, 203, 92;--barcelona-large-screen-breakpoint:748px;--barcelona-large-screen-max-width:620px;--barcelona-large-screen-padding:344px;--barcelona-threadline-column-width:48px;--barcelona-post-horizontal-padding:12px;--barcelona-quoted-post-horizontal-padding:16px;--barcelona-carousel-gap:6px;--barcelona-lightbox-horizontal-padding:92px;--barcelona-primary-text:rgb(0, 0, 0);--barcelona-secondary-text:rgb(153, 153, 153);--barcelona-primary-button:rgb(0, 0, 0);--barcelona-secondary-button:rgb(255, 255, 255);--barcelona-link-text:rgb(0, 149, 246);--barcelona-error-text:rgb(255, 48, 64);--barcelona-primary-background:rgb(255, 255, 255);--barcelona-elevated-background:rgb(255, 255, 255);--barcelona-secondary-background:rgb(250, 250, 250);--barcelona-tertiary-background:rgb(245, 245, 245);--barcelona-navigation-background:rgba(255, 255, 255);--barcelona-dialog-backdrop-background:rgba(255, 255, 255, 0.85);--barcelona-primary-outline:rgba(0, 0, 0, 0.15);--barcelona-media-outline:rgba(0, 0, 0, 0.15);--barcelona-threadline:rgb(229, 229, 229);}.__fb-dark-mode{--fds-black:black;--fds-black-alpha-05:rgba(0, 0, 0, 0.05);--fds-black-alpha-10:rgba(0, 0, 0, 0.1);--fds-black-alpha-15:rgba(0, 0, 0, 0.15);--fds-black-alpha-20:rgba(0, 0, 0, 0.2);--fds-black-alpha-30:rgba(0, 0, 0, 0.3);--fds-black-alpha-40:rgba(0, 0, 0, 0.4);--fds-black-alpha-50:rgba(0, 0, 0, 0.5);--fds-black-alpha-60:rgba(0, 0, 0, 0.6);--fds-black-alpha-80:rgba(0, 0, 0, 0.8);--fds-blue-05:black;--fds-blue-30:black;--fds-blue-40:black;--fds-blue-60:black;--fds-blue-70:black;--fds-blue-80:black;--fds-button-text:black;--fds-comment-background:black;--fds-dark-mode-gray-35:black;--fds-dark-mode-gray-50:black;--fds-dark-mode-gray-70:black;--fds-dark-mode-gray-80:black;--fds-dark-mode-gray-90:black;--fds-dark-mode-gray-100:black;--fds-gray-00:black;--fds-gray-05:black;--fds-gray-10:black;--fds-gray-20:black;--fds-gray-25:black;--fds-gray-30:black;--fds-gray-45:black;--fds-gray-70:black;--fds-gray-80:black;--fds-gray-90:black;--fds-gray-100:black;--fds-green-55:black;--fds-highlight:black;--fds-highlight-cell-background:black;--fds-primary-icon:white;--fds-primary-text:white;--fds-red-55:black;--fds-soft:cubic-bezier(.08,.52,.52,1);--fds-spectrum-aluminum-tint-70:black;--fds-spectrum-blue-gray-tint-70:black;--fds-spectrum-cherry:black;--fds-spectrum-cherry-tint-70:black;--fds-spectrum-grape-tint-70:black;--fds-spectrum-grape-tint-90:black;--fds-spectrum-lemon-dark-1:black;--fds-spectrum-lemon-tint-70:black;--fds-spectrum-lime:black;--fds-spectrum-lime-tint-70:black;--fds-spectrum-orange-tint-70:black;--fds-spectrum-orange-tint-90:black;--fds-spectrum-seafoam-tint-70:black;--fds-spectrum-slate-dark-2:black;--fds-spectrum-slate-tint-70:black;--fds-spectrum-teal:black;--fds-spectrum-teal-dark-1:black;--fds-spectrum-teal-dark-2:black;--fds-spectrum-teal-tint-70:black;--fds-spectrum-teal-tint-90:black;--fds-spectrum-tomato:black;--fds-spectrum-tomato-tint-30:black;--fds-spectrum-tomato-tint-90:black;--fds-strong:cubic-bezier(.12,.8,.32,1);--fds-white:black;--fds-white-alpha-05:rgba(255, 255, 255, 0.05);--fds-white-alpha-10:rgba(255, 255, 255, 0.1);--fds-white-alpha-20:rgba(255, 255, 255, 0.2);--fds-white-alpha-30:rgba(255, 255, 255, 0.3);--fds-white-alpha-40:rgba(255, 255, 255, 0.4);--fds-white-alpha-50:rgba(255, 255, 255, 0.5);--fds-white-alpha-60:rgba(255, 255, 255, 0.6);--fds-white-alpha-80:rgba(255, 255, 255, 0.8);--fds-yellow-20:black;--accent:hsl(214, 100%, 59%);--always-white:#ffffff;--always-black:#000000;--always-dark-gradient:linear-gradient(rgba(0,0,0,0), rgba(0,0,0,0.6));--always-dark-overlay:rgba(0, 0, 0, 0.4);--always-light-overlay:rgba(255, 255, 255, 0.4);--always-gray-40:#65676B;--always-gray-75:#BCC0C4;--always-gray-95:#F0F2F5;--attachment-footer-background:rgba(255,255,255,0.1);--background-deemphasized:rgba(255,255,255,0.1);--base-blue:#1877F2;--base-cherry:#F3425F;--base-grape:#9360F7;--base-lemon:#F7B928;--base-lime:#45BD62;--base-pink:#FF66BF;--base-seafoam:#54C7EC;--base-teal:#2ABBA7;--base-tomato:#FB724B;--text-badge-info-background:hsl(214, 100%, 59%);--text-badge-success-background:#31A24C;--text-badge-attention-background:hsl(40, 89%, 52%);--text-badge-critical-background:#e41e3f;--blue-link:#4599FF;--border-focused:#8A8D91;--card-background:#242526;--card-background-flat:#323436;--comment-background:#3A3B3C;--comment-footer-background:#4E4F50;--dataviz-primary-1:rgb(48,200,180);--disabled-button-background:rgba(255, 255, 255, 0.2);--disabled-button-text:rgba(255, 255, 255, 0.3);--disabled-icon:rgba(255, 255, 255, 0.3);--disabled-text:rgba(255, 255, 255, 0.3);--divider:#3E4042;--event-date:#F3425F;--fb-wordmark:#FFFFFF;--filter-accent:invert(40%) sepia(52%) saturate(200%) saturate(200%) saturate(200%) saturate(189%) hue-rotate(191deg) brightness(103%) contrast(102%);--filter-always-white:invert(100%);--filter-disabled-icon:invert(100%) opacity(30%);--filter-placeholder-icon:invert(59%) sepia(11%) saturate(200%) saturate(135%) hue-rotate(176deg) brightness(96%) contrast(94%);--filter-primary-icon:invert(89%) sepia(6%) hue-rotate(185deg);--filter-secondary-icon:invert(62%) sepia(98%) saturate(12%) hue-rotate(175deg) brightness(90%) contrast(96%);--filter-warning-icon:invert(77%) sepia(29%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(128%) hue-rotate(359deg) brightness(102%) contrast(107%);--filter-blue-link-icon:invert(73%) sepia(29%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(103.25%) hue-rotate(189deg) brightness(101%) contrast(101%);--filter-positive:invert(37%) sepia(61%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(115%) hue-rotate(91deg) brightness(97%) contrast(105%);--filter-negative:invert(25%) sepia(33%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(200%) saturate(110%) hue-rotate(345deg) brightness(132%) contrast(96%);--glimmer-spinner-icon:white;--hero-banner-background:#E85D07;--hosted-view-selected-state:rgba(45, 136, 255, 0.1);--highlight-bg:rgba(24, 119, 242, .31);--hover-overlay:rgba(255, 255, 255, 0.1);--list-cell-chevron:#B0B3B8;--media-hover:rgba(68, 73, 80, 0.15);--media-inner-border:rgba(255, 255, 255, 0.05);--media-outer-border:#33363A;--media-pressed:rgba(68, 73, 80, 0.35);--messenger-card-background:#242526;--messenger-reply-background:#18191A;--overlay-alpha-80:rgba(11, 11, 11, 0.8);--overlay-on-media:rgba(0, 0, 0, 0.6);--nav-bar-background:#242526;--nav-bar-background-gradient:linear-gradient(to top, #242526, rgba(36,37,38,.9), rgba(36,37,38,.7), rgba(36,37,38,.4), rgba(36,37,38,0));--nav-bar-background-gradient-wash:linear-gradient(to top, #18191A, rgba(24,25,26,.9), rgba(24,25,26,.7), rgba(24,25,26,.4), rgba(24,25,26,0));--negative:hsl(350, 87%, 55%);--negative-background:hsl(350, 87%, 55%, 20%);--new-notification-background:#E7F3FF;--non-media-pressed:rgba(68, 73, 80, 0.15);--non-media-pressed-on-dark:rgba(255, 255, 255, 0.3);--notification-badge:#e41e3f;--placeholder-icon:#8A8D91;--placeholder-image:rgb(164, 167, 171);--placeholder-text:#8A8D91;--placeholder-text-on-media:rgba(255, 255, 255, 0.5);--popover-background:#3E4042;--positive:#31A24C;--positive-background:#1F3520;--press-overlay:rgba(255, 255, 255, 0.1);--primary-button-background:#2374E1;--primary-button-icon:#FFFFFF;--primary-button-pressed:#77A7FF;--primary-button-text:#FFFFFF;--primary-deemphasized-button-background:rgba(45, 136, 255, 0.2);--primary-deemphasized-button-pressed:rgba(24, 119, 242, 0.2);--primary-deemphasized-button-pressed-overlay:rgba(25, 110, 255, 0.15);--primary-deemphasized-button-text:#2D88FF;--primary-icon:#E4E6EB;--primary-text:#E4E6EB;--primary-text-on-media:white;--primary-web-focus-indicator:#D24294;--progress-ring-neutral-background:rgba(255, 255, 255, 0.2);--progress-ring-neutral-foreground:#ffffff;--progress-ring-on-media-background:rgba(255, 255, 255, 0.2);--progress-ring-on-media-foreground:#FFFFFF;--progress-ring-blue-background:rgba(45, 136, 255, 0.2);--progress-ring-blue-foreground:hsl(214, 100%, 59%);--progress-ring-disabled-background:rgba(122,125,130, 0.2);--progress-ring-disabled-foreground:#7A7D82;--rating-star-active:#FF9831;--scroll-thumb:rgba(255, 255, 255, 0.3);--scroll-shadow:0 1px 2px rgba(0, 0, 0, 0.1), 0 -1px rgba(255, 255, 255, 0.05) inset;--secondary-button-background:rgba(255,255,255,.1);--secondary-button-background-floating:#4B4C4F;--secondary-button-background-on-dark:rgba(255, 255, 255, 0.4);--secondary-button-pressed:rgba(0, 0, 0, 0.05);--secondary-button-stroke:transparent;--secondary-button-text:#E4E6EB;--secondary-icon:#B0B3B8;--secondary-text:#B0B3B8;--secondary-text-on-media:rgba(255, 255, 255, 0.9);--section-header-text:#BCC0C4;--shadow-1:rgba(0, 0, 0, 0.1);--shadow-2:rgba(0, 0, 0, 0.2);--shadow-5:rgba(0, 0, 0, 0.5);--shadow-8:rgba(0, 0, 0, 0.8);--shadow-inset:rgba(255, 255, 255, 0.05);--shadow-elevated:0 8px 20px 0 rgba(0, 0, 0, 0.2), 0 2px 4px 0 rgba(0, 0, 0, 0.1);--shadow-persistent:0px 0px 12px rgba(28, 43, 51, 0.6);--shadow-primary:0px 0px 12px rgba(28, 43, 51, 0.1);--surface-background:#242526;--switch-active:hsl(214, 100%, 59%);--text-highlight:rgba(24, 119, 242, 0.45);--input-background:#242526;--input-background-disabled:#18191A;--input-border-color:#3E4042;--input-border-color-hover:var(--placeholder-text);--input-label-color-highlighted:hsl(214, 100%, 59%);--text-input-outside-label:#FFFFFF;--toast-background:rgba(16, 16, 16, 0.85);--toast-text:#FFFFFF;--toast-text-link:#4599FF;--toggle-active-background:rgb(45, 136, 255);--toggle-active-icon:#FFFFFF;--toggle-active-text:#FFFFFF;--toggle-button-active-background:#E6F2FF;--tooltip-background:rgba(11, 11, 11, 0.8);--tooltip-box-shadow:0 2px 4px 0 var(--shadow-5);--wash:#3E4042;--web-wash:#18191A;--warning:hsl(40, 89%, 52%);--fb-logo-color:#2D88FF;--dialog-anchor-vertical-padding:56px;--header-height:0px;--global-panel-width:0px;--global-panel-width-expanded:0px;--alert-banner-corner-radius:8px;--button-corner-radius:6px;--button-corner-radius-medium:10px;--button-corner-radius-large:12px;--button-height-large:40px;--button-height-medium:36px;--button-padding-horizontal-large:16px;--button-padding-horizontal-medium:16px;--button-icon-padding-large:16px;--button-icon-padding-medium:16px;--button-inner-icon-spacing-large:3px;--button-inner-icon-spacing-medium:3px;--blueprint-button-height-medium:40px;--blueprint-button-height-large:48px;--card-corner-radius:8px;--card-box-shadow:0 12px 28px 0 var(--shadow-2), 0 2px 4px 0 var(--shadow-1);--card-padding-horizontal:10px;--card-padding-vertical:20px;--chip-corner-radius:6px;--dialog-corner-radius:8px;--glimmer-corner-radius:8px;--image-corner-radius:4px;--input-corner-radius:6px;--input-border-width:1px;--nav-list-cell-corner-radius:8px;--list-cell-corner-radius:8px;--list-cell-min-height:52px;--list-cell-padding-vertical:20px;--list-cell-padding-vertical-with-addon:14px;--menu-item-base-margin-horizontal:8px;--menu-item-base-padding-horizontal:8px;--nav-list-cell-min-height:0px;--nav-list-cell-padding-vertical:16px;--nav-list-cell-padding-vertical-with-addon:16px;--page-footer-padding-vertical:16px;--section-header-addOnEnd-margin-horizontal:8px;--section-header-addOnStart-margin-horizontal:12px;--section-header-addOnEnd-button-padding-horizontal:0px;--section-header-addOnEnd-button-padding-vertical:0px;--section-header-padding-vertical:16px;--section-header-subtitle-margin-vertical:14px;--section-header-subtitle-with-addOnEnd-margin-vertical:6px;--text-badge-corner-radius:4px;--text-badge-padding-horizontal:6px;--text-badge-padding-vertical:6px;--text-input-multi-padding-between-text-scrollbar:20px;--text-input-multi-padding-scrollbar:16px;--text-input-caption-margin-top:10px;--text-input-label-top:22px;--text-input-min-height:64px;--text-input-padding-vertical:12px;--toast-addon-padding-horizontal:6px;--toast-addon-padding-vertical:6px;--toast-container-max-width:100%;--toast-container-min-width:0px;--toast-container-padding-horizontal:14px;--toast-container-padding-vertical:10px;--toast-corner-radius:8px;--typeahead-list-outer-padding-vertical:2px;--fds-animation-enter-exit-in:cubic-bezier(0.14, 1, 0.34, 1);--fds-animation-enter-exit-out:cubic-bezier(0.45, 0.1, 0.2, 1);--fds-animation-swap-shuffle-in:cubic-bezier(0.14, 1, 0.34, 1);--fds-animation-swap-shuffle-out:cubic-bezier(0.45, 0.1, 0.2, 1);--fds-animation-move-in:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-move-out:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-expand-collapse-in:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-expand-collapse-out:cubic-bezier(0.17, 0.17, 0, 1);--fds-animation-passive-move-in:cubic-bezier(0.5, 0, 0.1, 1);--fds-animation-passive-move-out:cubic-bezier(0.5, 0, 0.1, 1);--fds-animation-quick-move-in:cubic-bezier(0.1, 0.9, 0.2, 1);--fds-animation-quick-move-out:cubic-bezier(0.1, 0.9, 0.2, 1);--fds-animation-fade-in:cubic-bezier(0, 0, 1, 1);--fds-animation-fade-out:cubic-bezier(0, 0, 1, 1);--fds-duration-extra-extra-short-in:100ms;--fds-duration-extra-extra-short-out:100ms;--fds-duration-extra-short-in:200ms;--fds-duration-extra-short-out:150ms;--fds-duration-short-in:280ms;--fds-duration-short-out:200ms;--fds-duration-medium-in:400ms;--fds-duration-medium-out:350ms;--fds-duration-long-in:500ms;--fds-duration-long-out:350ms;--fds-duration-extra-long-in:1000ms;--fds-duration-extra-long-out:1000ms;--fds-duration-none:0ms;--fds-fast:200ms;--fds-slow:400ms;--font-family-apple:system-ui, -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', sans-serif;--font-family-code:ui-monospace, Menlo, Consolas, Monaco, monospace;--font-family-default:Helvetica, Arial, sans-serif;--font-family-segoe:Segoe UI Historic, Segoe UI, Helvetica, Arial, sans-serif;--body-font-family:Placeholder Font;--body-font-size:0.9375rem;--body-font-weight:400;--body-line-height:1.3333;--body-emphasized-font-family:Placeholder Font;--body-emphasized-font-size:0.9375rem;--body-emphasized-font-weight:600;--body-emphasized-line-height:1.3333;--headline1-font-family:Optimistic Display Bold, system-ui, sans-serif;--headline1-font-size:1.75rem;--headline1-font-weight:700;--headline1-line-height:1.2143;--headline2-font-family:Optimistic Display Bold, system-ui, sans-serif;--headline2-font-size:1.5rem;--headline2-font-weight:700;--headline2-line-height:1.25;--headline3-font-family:Optimistic Display Bold, system-ui, sans-serif;--headline3-font-size:1.0625rem;--headline3-font-weight:700;--headline3-line-height:1.2941;--meta-font-family:Placeholder Font;--meta-font-size:0.8125rem;--meta-font-weight:400;--meta-line-height:1.3846;--meta-emphasized-font-family:Placeholder Font;--meta-emphasized-font-size:0.8125rem;--meta-emphasized-font-weight:600;--meta-emphasized-line-height:1.3846;--primary-label-font-family:Optimistic Display Medium, system-ui, sans-serif;--primary-label-font-size:1.0625rem;--primary-label-font-weight:500;--primary-label-line-height:1.2941;--secondary-label-font-family:Placeholder Font;--secondary-label-font-size:0.9375rem;--secondary-label-font-weight:500;--secondary-label-line-height:1.3333;--tertiary-label-font-family:Placeholder Font;--tertiary-label-font-size:0.6875rem;--tertiary-label-font-weight:500;--tertiary-label-line-height:1.4545;--text-input-field-font-family:Placeholder Font;--text-input-field-font-size:1rem;--text-input-field-font-weight:500;--text-input-field-line-height:1.2941;--text-input-label-font-family:Placeholder Font;--text-input-label-font-size:17px;--text-input-label-font-size-scale-multiplier:0.75;--text-input-label-font-weight:400;--text-input-label-line-height:1.2941;--tooltip-border-radius:8px;--dialog-size-medium-max-width:700px;--dialog-size-medium-width:100%;--dialog-size-small-max-width:548px;--dialog-size-small-width:100%;--dataviz-primary-2:rgb(134,218,255);--dataviz-primary-3:rgb(95,170,255);--dataviz-secondary-1:rgb(129,77,231);--dataviz-secondary-2:rgb(168,124,255);--dataviz-secondary-3:rgb(219,26,139);--dataviz-supplementary-1:rgb(255,122,105);--dataviz-supplementary-2:rgb(241,168,23);--dataviz-supplementary-3:rgb(49,162,76);--dataviz-supplementary-4:rgb(228,230,235);--base-unit:4px;--blue-0:245, 251, 255;--blue-1:224, 241, 255;--blue-2:179, 219, 255;--blue-3:112, 188, 255;--blue-4:71, 175, 255;--blue-5:0, 149, 246;--blue-6:0, 116, 204;--blue-7:0, 87, 163;--blue-8:0, 55, 107;--blue-9:0, 41, 82;--cyan-5:39, 196, 245;--font-family-system:-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;--font-weight-system-bold:700;--font-weight-system-extra-bold:800;--font-weight-system-extra-light:200;--font-weight-system-light:300;--font-weight-system-medium:500;--font-weight-system-regular:400;--font-weight-system-semibold:600;--green-4:120, 222, 69;--green-5:88, 195, 34;--green-6:55, 166, 0;--grey-0:245, 245, 245;--grey-1:239, 239, 239;--grey-2:219, 219, 219;--grey-3:199, 199, 199;--grey-4:168, 168, 168;--grey-5:142, 142, 142;--grey-6:115, 115, 115;--grey-7:85, 85, 85;--grey-8:54, 54, 54;--grey-9:38, 38, 38;--grey-10:26, 26, 26;--orange-5:253, 141, 50;--pink-5:209, 8, 105;--purple-5:163, 7, 186;--red-4:255, 104, 116;--red-5:237, 73, 86;--red-6:198, 35, 48;--red-7:167, 3, 17;--system-10-font-size:10px;--system-10-line-height:12px;--system-11-font-size:11px;--system-11-line-height:13px;--system-12-font-size:12px;--system-13-font-size:13px;--system-12-line-height:16px;--system-15-font-size:15px;--system-14-font-size:14px;--system-14-line-height:18px;--system-16-font-size:16px;--system-16-line-height:20px;--system-18-font-size:18px;--system-18-line-height:24px;--system-20-font-size:20px;--system-20-line-height:25px;--system-22-font-size:22px;--system-22-line-height:26px;--system-24-font-size:24px;--system-24-line-height:27px;--system-26-font-size:26px;--system-26-line-height:28px;--system-28-font-size:28px;--system-28-line-height:32px;--system-30-font-size:30px;--system-30-line-height:36px;--system-32-font-size:32px;--system-32-line-height:40px;--yellow-5:253, 203, 92;--barcelona-large-screen-breakpoint:748px;--barcelona-large-screen-max-width:620px;--barcelona-large-screen-padding:344px;--barcelona-threadline-column-width:48px;--barcelona-post-horizontal-padding:12px;--barcelona-quoted-post-horizontal-padding:16px;--barcelona-carousel-gap:6px;--barcelona-lightbox-horizontal-padding:92px;--barcelona-primary-text:rgb(243, 245, 247);--barcelona-secondary-text:rgb(97, 97, 97);--barcelona-primary-button:rgb(255, 255, 255);--barcelona-secondary-button:rgb(16, 16, 16);--barcelona-link-text:rgb(24, 163, 254);--barcelona-error-text:rgb(255, 48, 64);--barcelona-primary-background:rgb(16, 16, 16);--barcelona-elevated-background:rgb(24, 24, 24);--barcelona-secondary-background:rgb(10, 10, 10);--barcelona-tertiary-background:rgb(30, 30, 30);--barcelona-navigation-background:rgb(16, 16, 16);--barcelona-dialog-backdrop-background:rgba(16, 16, 16, 0.85);--barcelona-primary-outline:rgba(243, 245, 247, 0.15);--barcelona-media-outline:rgba(243, 245, 247, 0.2);--barcelona-threadline:rgb(51, 54, 56);--color-scheme:dark;}</style><style nonce="eHbBrKwq"></style><script nonce="eHbBrKwq">__DEV__=0;function envFlush(a){function b(b){for(var c in a)b[c]=a[c]}window.requireLazy?window.requireLazy(["Env"],b):(window.Env=window.Env||{},b(window.Env))}envFlush({"useTrustedTypes":true,"isTrustedTypesReportOnly":true,"routing_namespace":"barcelona_web","scheduledCSSJSScheduler":true,"ig_server_override":"","compat_iframe_token":null});__annotator=function(f){return f};__d_stub=[];__d=function(id,deps,factory,special){__d_stub.push([id,deps,factory,special]);};__rl_stub=[];requireLazy=function(){__rl_stub.push(arguments)};now_inl=(function(){var p=window.performance;return p&&p.now&&p.timing&&p.timing.navigationStart?function(){return p.now()+p.timing.navigationStart}:function(){return new Date().getTime()};})();_btldr={};qpl_inl=(function(){var data={};return function(i,n,t){if(!i)return data;if(!data[i])data[i]={};data[i][n]=t||now_inl();}})();qpl_tag=(function(){var data=[];return function(t){if(!t)return data;data.push(t);}})();(function(a){function b(b){if(!window.openDatabase)return;b.I_AM_INCOGNITO_AND_I_REALLY_NEED_WEBSQL=function(a,b,c,d){return window.openDatabase(a,b,c,d)};window.openDatabase=function(){throw new Error()}}b(a)})(this);</script><script>qpl_inl("7252766289159758644","htmlStart");</script>
+<script type="application/json" data-content-len="82" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766289159758644","htmlStart"]]]}</script>
+<script>qpl_inl("7252766289159758644-server","htmlStart",80);</script>
+<script type="application/json" data-content-len="92" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766289159758644-server","htmlStart",80]]]}</script>
+
+<link type="text/css" rel="stylesheet" href="https://static.xx.fbcdn.net/rsrc.php/v3/yD/l/0,cross/8J4Vh7Dx9_0.css?_nc_x=Ij3Wp8lg5Kz" data-bootloader-hash="3unTLaW" data-p=":2" data-c="1" />
+<link rel="preload" href="https://static.xx.fbcdn.net/rsrc.php/v3/y0/r/E6KZsOw-TyZ.js?_nc_x=Ij3Wp8lg5Kz" as="script" nonce="eHbBrKwq" /><script src="https://static.xx.fbcdn.net/rsrc.php/v3/y0/r/E6KZsOw-TyZ.js?_nc_x=Ij3Wp8lg5Kz" data-bootloader-hash="CcM+LCX" async="1" data-p=":1" data-btmanifest="1007796774_main" data-c="1" onload="_btldr[&quot;CcM+LCX&quot;]=1" onerror="_btldr[&quot;CcM+LCX&quot;]=1" nonce="eHbBrKwq"></script>
+<link rel="preload" href="https://static.xx.fbcdn.net/rsrc.php/v3i1Vd4/y0/l/en_US/9NbTpxFQDN_sHUpS5HkpnGVK1i3Cuen-71Vx1-9lxcVHHr6NpeIaFU7.js?_nc_x=Ij3Wp8lg5Kz" as="script" nonce="eHbBrKwq" /><script src="https://static.xx.fbcdn.net/rsrc.php/v3i1Vd4/y0/l/en_US/9NbTpxFQDN_sHUpS5HkpnGVK1i3Cuen-71Vx1-9lxcVHHr6NpeIaFU7.js?_nc_x=Ij3Wp8lg5Kz" data-bootloader-hash="hOjEt0H" async="1" data-p=":3,11,8,5,24" data-btmanifest="1007796774_main" data-c="1" onload="_btldr[&quot;hOjEt0H&quot;]=1" onerror="_btldr[&quot;hOjEt0H&quot;]=1" nonce="eHbBrKwq"></script>
+<link rel="preload" href="https://static.xx.fbcdn.net/rsrc.php/v3ij4U4/yq/l/en_US/kZT9Qdvtv8D.js?_nc_x=Ij3Wp8lg5Kz" as="script" nonce="eHbBrKwq" /><script src="https://static.xx.fbcdn.net/rsrc.php/v3ij4U4/yq/l/en_US/kZT9Qdvtv8D.js?_nc_x=Ij3Wp8lg5Kz" data-bootloader-hash="L5R7p5D" async="1" data-p=":9" data-btmanifest="1007796774_main" data-c="1" onload="_btldr[&quot;L5R7p5D&quot;]=1" onerror="_btldr[&quot;L5R7p5D&quot;]=1" nonce="eHbBrKwq"></script>
+<link rel="preload" href="https://static.xx.fbcdn.net/rsrc.php/v3iQLo4/yt/l/en_US/gQS6jq0A8uW.js?_nc_x=Ij3Wp8lg5Kz" as="script" nonce="eHbBrKwq" /><script src="https://static.xx.fbcdn.net/rsrc.php/v3iQLo4/yt/l/en_US/gQS6jq0A8uW.js?_nc_x=Ij3Wp8lg5Kz" data-bootloader-hash="L6Tx9we" async="1" data-p=":7" data-btmanifest="1007796774_main" data-c="1" onload="_btldr[&quot;L6Tx9we&quot;]=1" onerror="_btldr[&quot;L6Tx9we&quot;]=1" nonce="eHbBrKwq"></script>
+<link rel="preload" href="https://static.xx.fbcdn.net/rsrc.php/v3idE44/yr/l/en_US/1DwJ8zL6B7E.js?_nc_x=Ij3Wp8lg5Kz" as="script" nonce="eHbBrKwq" /><script src="https://static.xx.fbcdn.net/rsrc.php/v3idE44/yr/l/en_US/1DwJ8zL6B7E.js?_nc_x=Ij3Wp8lg5Kz" data-bootloader-hash="WfD8LHV" async="1" data-p=":10" data-btmanifest="1007796774_main" data-c="1" onload="_btldr[&quot;WfD8LHV&quot;]=1" onerror="_btldr[&quot;WfD8LHV&quot;]=1" nonce="eHbBrKwq"></script>
+<link rel="preload" href="https://static.xx.fbcdn.net/rsrc.php/v3/y5/r/5qKf_cCaYht.js?_nc_x=Ij3Wp8lg5Kz" as="script" nonce="eHbBrKwq" /><script src="https://static.xx.fbcdn.net/rsrc.php/v3/y5/r/5qKf_cCaYht.js?_nc_x=Ij3Wp8lg5Kz" data-bootloader-hash="z6fuRko" async="1" data-p=":20" data-btmanifest="1007796774_main" data-c="1" onload="_btldr[&quot;z6fuRko&quot;]=1" onerror="_btldr[&quot;z6fuRko&quot;]=1" nonce="eHbBrKwq"></script>
+<link rel="preload" href="https://static.xx.fbcdn.net/rsrc.php/v3iT0g4/yh/l/en_US/pjkq_l5ea-y.js?_nc_x=Ij3Wp8lg5Kz" as="script" nonce="eHbBrKwq" /><script src="https://static.xx.fbcdn.net/rsrc.php/v3iT0g4/yh/l/en_US/pjkq_l5ea-y.js?_nc_x=Ij3Wp8lg5Kz" data-bootloader-hash="f2ZV5tU" async="1" data-p=":26" data-btmanifest="1007796774_main" data-c="1" onload="_btldr[&quot;f2ZV5tU&quot;]=1" onerror="_btldr[&quot;f2ZV5tU&quot;]=1" nonce="eHbBrKwq"></script>
+<link rel="preload" href="https://static.xx.fbcdn.net/rsrc.php/v3iJXW4/yk/l/en_US/sG_RutKVqwE.js?_nc_x=Ij3Wp8lg5Kz" as="script" nonce="eHbBrKwq" /><script src="https://static.xx.fbcdn.net/rsrc.php/v3iJXW4/yk/l/en_US/sG_RutKVqwE.js?_nc_x=Ij3Wp8lg5Kz" data-bootloader-hash="DJHbu96" async="1" data-p=":21" data-btmanifest="1007796774_main" data-c="1" onload="_btldr[&quot;DJHbu96&quot;]=1" onerror="_btldr[&quot;DJHbu96&quot;]=1" nonce="eHbBrKwq"></script>
+<!--EF-->
+
+<title>&#064;rafael_falco • Podia ter um jeito fácil de trazer a lista de follows do Twitter né 🤔 • Threads</title>
+<script>requireLazy(["HasteSupportData"],function(m){m.handle({"bxData":{"1160057":{"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/y7\/r\/s_LXY1yMsCT.svg"},"1160058":{"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/yN\/r\/MnQWcWb6SrY.svg"},"1160060":{"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/y5\/r\/Mszq4yIBziR.svg"},"1160061":{"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/yu\/r\/Ddk-AuWE7VS.svg"}},"clpData":{"1744178":{"r":1,"s":1},"1814852":{"r":1},"1836368":{"r":1,"s":1},"1838142":{"r":1,"s":1},"1743656":{"r":1},"1744234":{"r":1},"1744251":{"r":100,"s":1},"1744552":{"r":10000},"1828905":{"r":1},"1829320":{"r":1},"1829321":{"r":1},"1843988":{"r":1}},"gkxData":{"709":{"result":true,"hash":"AT4q9UstE5aF79UwqtI"},"708253":{"result":true,"hash":"AT5n4hBL3YTMnQWtyQA"},"1099893":{"result":false,"hash":"AT5kly2LSZV_DKGREME"},"1224637":{"result":false,"hash":"AT7JRluWxuwDm3XzIS8"},"1263340":{"result":false,"hash":"AT5bwizWgDaFQudmv84"},"443":{"result":false,"hash":"AT4h1HaIxHYZn6IYkkw"},"1393":{"result":true,"hash":"AT42aEHIHsK_NxGQBbQ"},"1426":{"result":false,"hash":"AT4rfyyNv13TbBZ8XfY"},"1475":{"result":false,"hash":"AT7kEzfGQyTYdZJbq7E"},"2772":{"result":false,"hash":"AT5Eu244WIce7iwqeVw"},"2954":{"result":false,"hash":"AT6DTo5oWw4Gi2ycaOg"},"3752":{"result":false,"hash":"AT6eS5UTkkMp_xbPkVo"},"3831":{"result":false,"hash":"AT4W23lQ0XxAZniMbkI"},"4075":{"result":false,"hash":"AT4_ZQi0sTjSt-RxKa4"},"4180":{"result":true,"hash":"AT6ZBPDX_t1nVduVxzs"},"4635":{"result":false,"hash":"AT66qmoOXbBCI2VneFA"},"4639":{"result":false,"hash":"AT6fuwnCZ25Hjx2lCCY"},"5840":{"result":false,"hash":"AT4yZS6129LYTjoceog"},"6017":{"result":false,"hash":"AT6VK36mN-p0kfQgvBc"},"6196":{"result":false,"hash":"AT79LaB9hNdhYgx4UtA"},"6751":{"result":false,"hash":"AT4_Q5AqWq6jnR2CW6E"},"6830":{"result":false,"hash":"AT6WoYIwb5Y6x569VqQ"},"8126":{"result":false,"hash":"AT4U7qG06p9sF6u8yHY"},"8232":{"result":false,"hash":"AT7JZiM_jgftdVDLsRw"},"676837":{"result":false,"hash":"AT4N8wBZA8ctCdHwitU"},"678680":{"result":false,"hash":"AT4Y-6Ul9ZZckQZn8ug"},"950768":{"result":false,"hash":"AT434vVJ93bUu52yoac"},"1018547":{"result":false,"hash":"AT5OYJhHTg1FexdZjsQ"},"1167394":{"result":false,"hash":"AT7BpN-tlUPwbIIFpdw"},"1217157":{"result":false,"hash":"AT6B7YmllOsArnK6NLM"},"1293035":{"result":false,"hash":"AT6f-b10jzF6b9M9Zy0"},"1407308":{"result":false,"hash":"AT6g20u7kv9f37jOBOc"},"1501502":{"result":false,"hash":"AT7iuJThg2U6GkqTlb8"},"1537962":{"result":false,"hash":"AT6YWgGMjb0fUWs1hmg"},"1554827":{"result":false,"hash":"AT7zueGLhGo0cT5x6YQ"},"1738486":{"result":false,"hash":"AT4cX37oQco6DwhU-x0"},"1778371":{"result":false,"hash":"AT6HtWXGEXFDQ5JjxPw"},"1902022":{"result":false,"hash":"AT7WD_stYlEMqW8c2Lg"},"1914427":{"result":false,"hash":"AT7r7RL9lwTjh6wx1oA"},"227":{"result":true,"hash":"AT5yXnJxXfkiddJSDFo"},"229":{"result":true,"hash":"AT6ACjjf9sN9o2h-iUE"},"231":{"result":true,"hash":"AT5RtBjo7qezdTuhyjE"},"233":{"result":true,"hash":"AT7HvkjZGXZeuumhtuY"},"235":{"result":true,"hash":"AT4gizq47dTbAJ5jR5k"},"664":{"result":false,"hash":"AT7734XsKztSKm10GJI"},"751":{"result":false,"hash":"AT7TXp0TTlIecYKJFBo"},"1226":{"result":false,"hash":"AT4QupJJbI3j_App3is"},"1292":{"result":true,"hash":"AT6KRRnA6-Re_k9KZ3E"},"1459":{"result":false,"hash":"AT60sF8lwSNwCEwZAGY"},"1485":{"result":false,"hash":"AT4WNLTpxBYFwessN1I"},"1682":{"result":true,"hash":"AT4jNPAkujFdMYkD7sQ"},"1705":{"result":false,"hash":"AT45JGOqDPcAMbr3Nf4"},"2030":{"result":true,"hash":"AT77OC0fYHb5VHYB8gA"},"2254":{"result":true,"hash":"AT4NaskuQ6OBD3qCvvE"},"2448":{"result":true,"hash":"AT7EwlgtPzpIx-1QsI4"},"2458":{"result":true,"hash":"AT5Dy7G1iL0c6SKnQiM"},"2581":{"result":false,"hash":"AT4iw_6E9ISmVfQLdaw"},"3140":{"result":false,"hash":"AT5-c9fjLEKqfwwAaPc"},"3400":{"result":false,"hash":"AT5LV5sAIJng7-zctcE"},"3598":{"result":false,"hash":"AT4R-V-zd8OVuUkTxog"},"3773":{"result":false,"hash":"AT7VZ_gM5R4NLSLmy50"},"3824":{"result":false,"hash":"AT6BtgsnnuM5TALJLxs"},"4527":{"result":false,"hash":"AT5vKkT8tv-GUeP8Fno"},"5205":{"result":false,"hash":"AT4tOojq3gzI7IFZFqc"},"5223":{"result":false,"hash":"AT7mncAklIbGZfnPaXU"},"5403":{"result":false,"hash":"AT5zCIAplAr2jSMZBdY"},"5574":{"result":false,"hash":"AT7t8_-pqYHCqFfTRGc"},"5735":{"result":false,"hash":"AT55xkQWRLxMd5TjiW8"},"5945":{"result":false,"hash":"AT75NnnIUkzdzhWfSa0"},"6810":{"result":false,"hash":"AT6JsT-epn3stgDmBHA"},"894204":{"result":false,"hash":"AT7MWh7MKvvrwCN_Btg"},"919810":{"result":true,"hash":"AT7obFlFcaXOvTBX2nk"},"938288":{"result":false,"hash":"AT60802ujA6R5kZSvXk"},"976093":{"result":true,"hash":"AT6Tnn67lHNTT5CpvSw"},"1070695":{"result":false,"hash":"AT711tHzdMfRy3F3oOM"},"1133447":{"result":false,"hash":"AT6gnU9itzgx89tyUAk"},"1151941":{"result":false,"hash":"AT4VtFw2xNGXhISystM"},"1163255":{"result":false,"hash":"AT4p5wUSMH_kRx_d1-k"},"1243442":{"result":false,"hash":"AT6H-KKvL_2kq8U2o4Q"},"1249968":{"result":false,"hash":"AT5AlPmWHlKvEcrjZVQ"},"1250838":{"result":false,"hash":"AT7z1NkFlLfUKocW-nA"},"1299319":{"result":false,"hash":"AT7zRIpVRWl8hiUY1dw"},"1352928":{"result":false,"hash":"AT7bJwS1VNOxBUhsgio"},"1382775":{"result":false,"hash":"AT7D5sd_gmE2NRtmG-w"},"1383502":{"result":false,"hash":"AT51zMR8DxFUUVJ8k-Q"},"1388683":{"result":false,"hash":"AT63PwzAsKGj12Q681g"},"1470120":{"result":false,"hash":"AT7hoNhuKStHslT5fu4"},"1564135":{"result":true,"hash":"AT7iTOcLJuIIpIfCFDI"},"1613919":{"result":false,"hash":"AT7bXvwviv8GGfF31Uk"},"1616314":{"result":false,"hash":"AT6Zl4nWIeZ_AYDr3Wg"},"1626006":{"result":true,"hash":"AT4_TZlW-MUS84REK_c"},"1642984":{"result":false,"hash":"AT71oE1xc4ID8xb4hZY"},"1657807":{"result":true,"hash":"AT5GneaEpFhH-amr3WM"},"1661552":{"result":false,"hash":"AT5w2VaBMxRPfMyWLNU"},"1690028":{"result":false,"hash":"AT7vV-7CyHNNfGJoNR8"},"1703328":{"result":true,"hash":"AT49L03pP2X9HmsnsIk"},"1707273":{"result":false,"hash":"AT5oTb36da_qc9QIytI"},"1721477":{"result":true,"hash":"AT70IfYeUvLOKY5YbLM"},"1723588":{"result":false,"hash":"AT485K2jwU-S2ruR_AU"},"1806005":{"result":false,"hash":"AT4tOLFFU6SFy7iTYx4"},"1861546":{"result":true,"hash":"AT7TDKkMR4gPryZg15U"},"1863055":{"result":false,"hash":"AT7ONu9dmdwXlowbVqM"},"1872325":{"result":false,"hash":"AT4WDV07rUK5enGibvM"},"1902661":{"result":true,"hash":"AT48eoL9MpGKmdHLD14"},"4240":{"result":false,"hash":"AT6WMihLvltJm0Uj8-c"},"8594":{"result":false,"hash":"AT7Gfw9P9vYQkIA2wUI"},"1787898":{"result":true,"hash":"AT5WGsLz9GCUYq8UoGo"},"1924645":{"result":false,"hash":"AT7xqjINkJcipyjZVqs"},"517":{"result":false,"hash":"AT6nhZGTa49R4qYbZgw"},"1703425":{"result":false,"hash":"AT5M5FNRBAvWiZomwes"},"201":{"result":false,"hash":"AT4alnh_4NnV8Qd_Kuc"},"2257":{"result":false,"hash":"AT5Mac_Q9jALVGtdUT4"},"6361":{"result":false,"hash":"AT6feNNR6dFIlUi3_pE"},"6862":{"result":false,"hash":"AT68ofpcSp7CAzMdVDs"},"7518":{"result":false,"hash":"AT4evLW9Sc-7F07W_xU"},"8003":{"result":false,"hash":"AT5keQOwqmgpohoaOzI"},"1401060":{"result":true,"hash":"AT5aetN5Gb3reIXVznw"},"1596063":{"result":false,"hash":"AT7JHuDWtaOqRuBUJIw"},"1778302":{"result":false,"hash":"AT65fisZhmc2X92EX8E"},"1840809":{"result":false,"hash":"AT5nYctoTsr7alRig9M"}},"ixData":{"478233":{"sprited":2,"spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","_spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","w":20,"h":20,"p":"0 -88px","sz":"auto"},"502062":{"sprited":2,"spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","_spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","w":20,"h":20,"p":"0 -67px","sz":"auto"},"512647":{"sprited":2,"spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","_spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","w":20,"h":20,"p":"0 -25px","sz":"auto"},"514454":{"sprited":2,"spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","_spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","w":20,"h":20,"p":"0 -46px","sz":"auto"},"701592":{"sprited":2,"spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","_spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","w":8,"h":8,"p":"-13px -109px","sz":"auto"},"702721":{"sprited":2,"spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","_spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","w":8,"h":8,"p":"0 -131px","sz":"auto"},"897949":{"sprited":2,"spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","_spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","w":8,"h":8,"p":"-9px -122px","sz":"auto"},"1739808":{"sprited":2,"spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","_spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","w":8,"h":8,"p":"0 -122px","sz":"auto"}},"qexData":{"415":{"r":null},"723":{"r":null},"49":{"r":null},"234":{"r":null},"768":{"r":null},"858":{"r":null},"932":{"r":null},"954":{"r":null},"976":{"r":null},"1022":{"r":null},"1637":{"r":null},"1638":{"r":null},"1639":{"r":null},"1640":{"r":null},"1641":{"r":null},"1642":{"r":null},"1643":{"r":null},"1644":{"r":null},"1645":{"r":null},"1646":{"r":null},"2085":{"r":null},"2086":{"r":null},"2087":{"r":null},"2088":{"r":null},"2089":{"r":null},"2090":{"r":null},"2091":{"r":null},"2092":{"r":null},"644":{"r":null}},"qplData":{"1217":{"r":1},"2410":{"r":1},"6702":{"r":1},"334":{"r":2000},"1206":{"r":1000},"1517":{"r":1000},"6204":{"r":7},"6310":{"r":1}},"justknobxData":{"138":{"r":false},"144":{"r":true},"356":{"r":true},"450":{"r":true},"494":{"r":true},"713":{"r":true},"992":{"r":false},"1143":{"r":true},"1203":{"r":true},"55":{"r":true}}})});requireLazy(["Bootloader"],function(m){m.handlePayload({"consistency":{"rev":1007796774}})});</script>
+<link type="text/css" rel="stylesheet" href="data:text/css; charset=utf-8;base64,Ym9keS5fYW1tZHtiYWNrZ3JvdW5kOnZhcigtLWJhcmNlbG9uYS1wcmltYXJ5LWJhY2tncm91bmQpO2NvbG9yOnZhcigtLWJhcmNlbG9uYS1wcmltYXJ5LXRleHQpO2ZvbnQtZmFtaWx5OnZhcigtLWZvbnQtZmFtaWx5LXN5c3RlbSk7Zm9udC1zaXplOnZhcigtLXN5c3RlbS0xNS1mb250LXNpemUpO2xpbmUtaGVpZ2h0OnZhcigtLXN5c3RlbS0xNS1saW5lLWhlaWdodCk7bWFyZ2luOjA7b3ZlcmZsb3cteTp2aXNpYmxlfSNib290bG9hZGVyX1VVV1NzMDd7aGVpZ2h0OjQycHg7fS5ib290bG9hZGVyX1VVV1NzMDd7ZGlzcGxheTpibG9jayFpbXBvcnRhbnQ7fQ==" data-bootloader-hash="UUWSs07" data-p=":0" data-c="1" />
+</head><body class="_ammd _-kb"><div id="barcelona-splash-screen" style="position: fixed; top: 0; right: 0; left: 0; height: 100vh; height: 100dvh; z-index: 3; background-color: rgb(255, 255, 255)"><img class="img" alt="Threads" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAYAAACtWK6eAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAEW3SURBVHgB7X0LkGRpVtY5/80eGnZgcyPWdcZdmewQ1l1FpnrDUEDDydIYYzXQ6Q4FYQPtah8Riuh0G0JAhFpVYsQqPqZbDTBWtKpjVXxAdA+BsAGBleMqu4I6Nb5YBe3cEGSBhamFffR05f2P53+c85//VvVM707no7ru6c6675s37/2//zuv/1yAXnrppZdeeumll1566aWXXnrppZdeeumll1566aWXXnrppZdeeumlCEIvc5ObQxoeHn5qBM6vNd4NPcITjvwQCIYOYYjkRy4+Ah/+8nx6IEjE0/CP+FA6cIgHAHHdFHlflmmDdMC7fQJbnJ5paAowm37lncen0MsDlR4gD0ACED4Dnx6DpxESPsmNf40bNM8zEAhiQ8cwRcqNH8DxuvA/Tlma8CfvC7xPg6j7pk9a7zABJwEpHePyUwz7M+D2eXHqwL/koNmHM356/lNv2YdePifpAfI5yD8d3l0j8GP0+CQiT7n3l8bttFGHxgoVIMIyxOUMGDAAMGBxeb0CIh9TljM4UJiGj0mHpu+Q74J8LCGzEO3z8S8wW00effTO/rmDcwfQy2tKD5D7kB1miAYOL3Cje4qALvBNG6bemnKvDRkEBRCsPjFj5F49rENQUAhQXD5/2C6NWlWsyBS+0/B5m0/b4v6EeVsBWgRFVNkykCCzD4BZjhcw4dM878BN3n7YM8y9pAfIPSSAAtzhRuPxGW5M49h4Q4/tU+NzofHmHjoBw7CGqkkZKHl7AkFWkRQgRu0SIEEBSlLDkjgAcwwU0EW8kD7MYsNAVttAwQpgzi/nJZgGwLCqduPc7PEJ9KLSA6QjO28+HDctbnLnPBaWcFQavpOGnhumU5Wp7CONT7cpkMgY4XbeMAuoLaHfkwx0UdXSeiThC5/BmdAijCM2j8wDCChQAQUCMhDwxLNM+bhbfoDXz/VGfw+QIDsjGrpfgWfZrrjCjXgoQHC5YaqhnXtu6cktMERNKvvXdgjEfXzVm1vmkcZa1iWmAgOscBY15sXol2Wo1CfT+BOY7INWQGCGBJllKo2CVbmJh/bGF7dv24VTKqcaIO9/M41bgkvcGDek0Tid5saPoGAJ4hQk9T7swapZBjMgKmO8tllUFbKMUm3rqEQWOFldq1QrKABx0vAzgyV4idol62pVCwTI+RyynWenfD3bj8PpA8qpBMjOr6E1bmzPcQMfg2GKZFCnRhV66mJ0l/Uu2xUFSIUBErOkdWR6ftf1XBFU9kfwTEEFEioGtXH1Qv5ubeiqgqEBQmGv8FdULrFbhCVAVDVZr8uGQeyxaYaB4rffAl+8C6dEThVAdh7j2EQLm9zoNtCqUABVg3ddm+Ie653EILKnKkixO2oVyjIUdO2R3MF37RKwQMnLwk66joxtQZYtoGYgAsMjWfT6QfeT9WK/gNpAYGyZEJiE7TefAqCcCoBEG+PT8Cw3zCvcgKKLNjKEep6oMqLt+gQCSu5VAOjGN5JN4KsGX4BVACDuXmc8TnZbaeyU1TljpCN0PFOkXCEABjA9/6uyAXTWk1lfjgOyUKLO9+p5pvzZftNDDJSHHiDMGhzQgx1uaCMXYwgJHHX8whrbBjRWtZJjsk1SAoBeYxrO9LRomKQCkwEOdGwTBBMlT7umZVHB1FVc2EA8X2BiLQIcyKwCsp9p80g1m9RAKd+fT16vhyP77nrwDJRzU3jI5KEFSGCN5lOwyb/wSjGqrcHNQCEA63VqwHqqzLzYHNCxS8DYI9a2sCqUMIJRr5QxEDTyDmSN9Kwq2WNUDYsrlEEkZaWwh2zHqpFjp1GroW7tEsNuBWRZFEBmPfpyDqAQmd9+I5y7Bg+RPJQAeT+zBgXWABhpY8/TyB65x07zlk18AU1uZE57f8qGd2KN2k1rzpFduYVNUkQ9ebkMCDIbWEMdTUS9BkMxyovRHq6yNvgBjDs3um0RbIAyr6rODVat0uuS77LNowMwCx6wbAiTBvDy5z8kbPLQAeT9b6FN/lFbpUdHtSWwAxAJ9jXGBqndvCbeASY2Eht0sEsMq8T1HrpJidhhE0kw1MBgtm8gq27KFgIGE8PoGt0WFB3b4Mh+ehZVuXIzN2ymLEFHz2VBVO9gbSBR/GBK0G4/Cm/fhRMuDw1AbrJK9anPwE1+PmOXI9ES6ZZAnjTymAICVK2rbY4Cmq6NovZC5QXL+U/W+DbHgqzL1+py9Bty+jp/5wFvPABlnyQYM9vj9w55yh8cFU9V2pYYAStGcNEVLIKqrh1Rs0qDzjaJzJv1GTiU1TC0epthIoKiGqb5qHpufR586TacYHkoAPI97L7lgN+eVakKE2Blf9QGOGUvFGX1C2sgKIgKoArYii2Cxq4paexwwA11yjvs+7b9KEIzbaCd8k5TOHvn4PVk0/7c2Z8bDWYz/q2zITo34lUjR+5JBtha8NIRFG+cakn5XohSldbpn7ytqEple5KaPeiYhlMDsBxH+x7OXDypKteJB0iwN5yHm2kAkgVHsQOK10oajo9guDdrFK9UjG8QVHGQArLCFmEcBsDsBV69f+ZMOzl3sJw8ppfh9hAGsMbXy0yKT/KljTFkH5t9qodujHLI4NZ9lEgEFGlFYQtzwqxmKQCtm4w7Cg+0/vnwzimcMDnRAPlnj9Elfgi7NiinNgaAskZjVCQHdbzDWUDk+XIOXq92BlUsAknPfh69v3V2MNg/d/CmlR1f8ckzt9eghTGrls+wzTEunqckx/X8CgjDMhYIAhVV97BzDu6EClvFHohVSLf+CLz9RKXWn1iAsFq1yc9qy8YfpJGrOhVsEO9j7KKB5GodgPE6KWigNtIVUJgTDFVlO+BGcZ1BM3nnJ980gRMoxAxzp2kvON+ENP4LdkuQ4rnqeqnKfOXbwqPYEMaxXjJAsfVgA+GdN+CEyIkESAAH3/MtUYsEEAClwTvT4G3K+tGUkmQ0W9uitjP8ATeaW861N955cDJBcS/5DNwesV005l/Jnj8apbU1QGqmEPWqGPGgawvLlPwv3/nGtOzAnRiQnDiARHAAbRX1CUACaqIaVbGMzBqANbsIKKw3qqHsqUmAOiCk64+Cv7bK6tODkkP4qaB6bfDsJTTtv24gXaqgMu1a9sbzVQNFgccg+bKVB8mJAsi/eCtdopZ2xduEYBu8YQ0LBjXCvcm/qlmlilcElysAA2N2KoDRFVbBRh4OmZ3xkqw73kZJe9dTma+XqTL2yz4YmWS1QXJiAPIv30pr1MKLNugXos8hvyoCAsQl6xUwNudKjPPj0tlzBJxjEXj9UX86gdEVgp8c8R3aggiUezHHccu16oUan7R2SRKM6Sl+HeH8yhruJwIgNznOcUj0It/soTbyYHhTHeRroLh1HdnYhfFSxeNAEw9z0O/WgGZX2caYQi+VEPw0G/Kz53h2ZNcWEXoQnSy7ewmKq9cwBx4FU6j5dZ5BMoUVlJUHSAQH0B67KEfopVEXRmhIo7a1FwugBgYUdcqRsA1Hsh1d/i0f/8IJ9PKqwoyyxZNNuyaJGBo1qxDV6lQR3wk6xumUT7K+iiBxsOLSIj3HzDByOf8pRbx9ZIukJnlVlxplC5+9W5QzcdO+AUyNjN1Af6P1h+d7cNyfsNdpiyfnUmO2QZRggAtrkH7SOtlGGlfCygWsnxF/dmAFZaUB8n2PtZvcmC8IGzTywQSS5Iki3YZY5iMwqIAnLidf/AGD5OqX/9IbN873tsZnJQySKcJvCiDZDqxB4QNdUHRtDSrBQjiOVWTqxwQ/8RysmKysinXzbTSG2WwP0XipMj2X5W58wwKiRMNLBi9M27a9yMDoC6W9TiH47xsEnhs0Do829hJDude2e4MleLZ+68p4tlYSIDcf+8wI8cweX9yoZNyWKLdMkzHededSx/7IMQ8Gx2Hr18/3hvgDE4IXR/wU9kAN+PsBiMwfxyJitHs22r9yCisgK6liNXAmqFajZD8Ye0LUJ143yGpUsTWoUsOSAS82COwzOM734HiwEoxqhHY9FHHAys6Ajlr1WX2Gq2SPrBxAvv+tdzcQ241oiKMY4tLwEyBCZDymqiMcBUWepn2i3bH/hkcjc/T2xhwkeZ78Ojdqo7Z6sAb6a7OH/cSo+5jgx67ACshKqVg/xKqVRxdVq+64jCbbHd1lzadCUKPcFFvY/4JHYf3ctAfHvIXVrdDzB3Vr7Sgg7PxrgEVcxtHoH5xbtqq1UgyCTfMsM8OoBPcoqlIDqN23kR3ychr05Iv7Vj5I0x4cixNmkoMQy0huYJF7scQ9PpiBoRiaLV3VWhkG2Rt9ZnT3FbwNUEfHrWGu2bamkIIG/iQqHtUsDgA2sP7Oj/U2x6IlGO6sJu2BZgd73VKmnXmb6EhHjPqrCL9raZVSVgYgP/L4nXBTx+LKjYOfchZDybPqAAWMG1fBgwc4gPM9OJYnBB8a8dN7EdJYel1r96hYQzf7Y/b1QQNgVWt9KZrASqhYP/rWT24wMMZNjoqLYY5RnfLRG1USDFNEXQKFYrCn5MSgWrVXe3AsV5LdgBePGurZCI/lYKiMUDw2yKiGPoPMb8KSZCUYZPL4p2+zzTAS5oAqd8pXhRSkCAOSvKCmDLfl7dff8YtvXgnvRy+RSbZA87eoztk6okrJ1LKI3dYEFpnCgmXpAPm3zB7gcQexHrxkqxOWKocJIMcFDvkzffsvvPkc9LJSwiCJqnOtTh1njxwHjLSc0+YnSE+vw4Jl6SoW2wybDUJWrercKgkKStZu3AdtPlbZp3WHC795vdyXXIY47kM8VKJ22elxhjwUVSxAhEKu1g+NYcGyVID8e2YPbuij1NhbGKAEA30d8ONP43JCYk5CjKoXqmt3+50f618XtoqS7JF2+572yLHrIIJDEiFTinxcv3BbZKkq1n9466++yPdgTdUqqEcAyrIOibUlPVW1oulv+Plfe+JUKxpyYO3OnSF4twYUEv78kBE/tPv4WJGFe1+PofLilANFB/CGM1M8OH/iYjsE/7aoWnCcigU5dT6vyXaoFMEzbLOO8AcmsCAZwJLkJ972q2Nu72uljm0GhIln6OvNAKogYImo821Dvw0rLgkMMwZCu8ZX/RT/sDW6c3eUSoaKZwegvJMjTdNrD2QVJvXkV18Baj4cVJZ9T/CCQ7cP7SOTFKhbZWlZ1QLj+j0aCymDrHxpD3q8qGFxrPwEFiRLY5AX3/orOzzZACgMoe+4yOpVEJcrF9oXX0owkfe7de7nH7sIKygRFK/MNvhCQ7G2NfQU2UHbuxRgs5iojNOEF9TVeadYKiSZrsws5Ryh0SA+D55urUombFcIfnQLuqMSUVgi/BbfcfkCHM82szchXFxIh7AUgPxkiJof3r1tsz4FJJjTDXQZikplcqxyc6Fz51bM9qBHf2LMF8aNgJgxGBS54UccSIuvNAsbKBO0yCaqdimCqSp75eypzMkJ9yQ3sP3KXVghIdjjTqK9DYFFdOx6uhnpV9/LxUvlzrAa5slvN3BxCxYgSwHIf33bJ7Yw9CTGngCja7r8OgBhDlsTN/WokUl2v/hjj1+GFRH6wh/f4Mu7xLPjEvyKWyB5YVB/JxEAHgGIrLAAkancmQKYqH75Y47Rr4zrprxtl6c3VoVVCH54gxB31KsFtpDDUWDoPFajFg/4bp5bBIssh0He+onb/INHcpMKSHTkH5T6ut7cSNDcqwHfoMdXgD1oyIzRxkqPY32oknB3JFLcUa3SmiOT8tbZehfl27ysYQWEDpt0jg9AcbCN7e/YhRUQBsltSuPQoR6jDtU8VbaZ+aTO8yLCH74Fc5aFu3l/6m0vj9kzM9KxG5hiG2E6wFxKFEt8I4ICSypJWke7ywYHDT808m/88B60ITHPj4s/P3+w5Wn+oHFnyjzalIvyQZB5e64SM6Dqe2zDkgsj3Vc/5Ed8nTsE/+52ypNatrTbqIb4cR9hS6p/D4rzJv72Z2EBsnCAsGZwSaqMlEYP1ahBKRhdxpSnwKAY783A34AlCn3Rjz9L3r2YWMMAQho12t6u27ChBkxsBF0w2GVzHgEO1iDC6vhXu3IGChwySD64CUsUhN+3C6loHNj7QDoNHUvpFOR+ld8Z148Jbg5hzrJwgIQqJXEkIKZs3RRBN5VIAns4SNP48QUYaYTh5PGf+fUTWIIEzxSD4zkGwzVmtWHdUKXXlgZfgwRjFZDqAcO9es8KFCbyTHkeu+yCwlg+799CDbIu4/gtgsnNZDQvS9rr9X0AKB2JAYZ0AkfuU1j/6bnn3S0UILd//ccvOMBhYgQp25NAkUqJSn3cXKInq15xrEe+SeSWwx5BpQK4uweuvZIeUMvXKQ0x7gG16tTGT+oNxYbKXjplgnw8dh+8UZuijinASN8jxirZcRRx3w7T6PngKDOlVx+8yCAZwVJkdi2wCOV7Vu5TBWR9QVF3fbbWnoI5y0IB0iA+Iw0f8wjABA5JHSFlFlsVMYEoRc0f/9nFv7SeHmNwIOwBcrAv9HJoezqrBtQfUpVgpmCgrv2A/ugHqHO+0uhLVLlWPyo1TcWA5NiU8mAow94yQBI8UB5mN0JHI8wY7lFSq71mcR8PDN1/TPD+McxRFgqQ+FowKLaGGN9JfSrAiK5dAQ56dfXyigksWCI47oax1kF/D1LATJiYJDX+2RFGQPTGhemPNvojapDZl2rViCqVipInRy4ypUGXeayPvQc45BpGPF0KSPiSb1mgF0B0OpEKIJ375YKDZK7XuBj5udEvjrnBjNCoVQ34okblhpcyelu1OUQNSzck6K2LkwQOn8FhG2hSnRANKNIRxlA3xnTV49uH3ZVsP8ixhhWww07Hfzo9Ltprei2QtAu3SZhFJtwmJoktjgOF/W3S+cg9zKzo6SmYoywMINyfXmiyS7fkU2GxO9COQyewNZailwtp+pafPbewiogRHIctq1UZHNZmgJJIpz10ZThTeYjCMKo6ZVBhR72qjgNlCWuDHN9wOsxTqSBUXoiSR6NRxytm/q3xte3AooXo+VcBLhQ11N7TkuWbvFk7cwP2wgAyIHoqGeK5RE9kDhktKGnr3iQkWsM99jDPwyJlFhpLOyoqVOnBKDd01Ebd8RoF451sj5dtEjTemCPuXDtvWAQsYLIdouCCwhKd7yrXYnrffH/jb6BuTCWuu9DCBxY8InOwWzOfvV46opamuGuXUWcbMCdZCEBeHr08ZCpdEw8VQhkY5fIDF0Mcs0sULWjCTRq4XViQ0Jtf2OSHNK57dJ/dtHHcOygbQJcNol5cemgZ8JN/izz0oKIRHscEli38UXtCVSfIx7f1dwuZWBYxkXzbQ6efVjdOvufPcaR7DRYkKV2EJjUz5uvvMkZsO611+YbjttN0PrKQdPcW7o6d7QnlAYW/VKLHlYdGvVtRpsPpYtQreuyDY2pnW6kBlWtJPbGIz0m1xpag0nBTjlT6vTmpUt+0JPsiYsgj4t/UvgS+mUIY7xFe/xaeyCu8rfHDfC6Ot7hR9DghPgkeWRWiYcyEJ/2CIlWg0KdtunN3t24elMjhDv85DwuTGWsHOE7zNXNSla8V3kUPL/A9Y+N+sI9wee65WAsBSOPYHee7aaxp3mUVQQZCVfq2jkvHCSxK/Cyw3VRyhcDaGPEZlesnzT6G0jADkBzU7Q1kH5ry87/Bu07wkxcmr3odh/feRGf+9Zp3NHbxvecQmU5f3xyvp4MapM4J0ACrC5B4njWCH7iC8NULqkd1uAs4yK8+8BnL8c+UO8nnEzDw1iIA0ZWFJCu+fO7/hYEymbYTGAhKopr2YmQHyhTVgBxd/KLpb5x7YpoIPfZDI+/dFsdgLlWDMo5JPEQwABGWsf1A2jhhGt3GT16cwAMWOhuu9XDLhYFE2tZtomNFXXBE0wK616m5Mc7OLWrcBeGN0EaYJemW9/RScAEzIKawZJk7QF4e3eYe+czL6atEZUq9MaJRW8hsCxeWG1tQs+7i2Te9aXpu4b0HvfkHr/CFbAaVJrUjr6pKMHDT5Rs9hzq9MQUVqrmKBw8eGEeu9ezNEXi3x/Q1qtp8dUlYVEHf2Y5gRvTJpnZh4y7YEzVaBUB0Ze4A+dUv+b9j39Ie2l44qyXdcQBoMjcNWPbfMP1NC9SHa6HHuOFRsxOqaug1556XQH5HWq5Zg67jL3/twmt00SPPb/HfzdTizeXYqabNl0FXVF2/ygH/3oWxyCrK3L1Y6Nl7hcaFKynLJgAUq5NgrlKCbXLrZu8W7/cCLFHwYxen+PN/cJ29UVcxlME0sQtUD5O4dOP0gH/A+jLAEa/37jNbHPu4DMcF3jSzOKR3tPW2I9H2ePzQgz/VhfjmDhBuWE+JZ0JcdFqyR4AB4r7LDc6RLlPjJ7AC0vz8xWscrTzPDW8i4zxIYxYSK/FshLfn8eNfM4ElCt65uMvXctkGLkljIuIMoXK/KxeyrwJz3EktZNzFqsr8GYT8yMUktDYD47DMd6eYAmyYWSUsuzPtwqLnryWRTX7xa9YZDNvKICUIdwBnmDkOvn4KKyB4+Id2+elelQwAtFF7vfYSK0GXwBHjVNWHhgT/agynVOZug3zqN/xU5TpxuacSUxerEXCQVS/IVUz8wSP/511vghUUeux72Chu92J8IrpN3UX8hfcszNN2v0Kf9717rD6N1UAXYx2kkASABFQoOyLwiC2CE4SvXYdTKHONg9z90v+11pJQO4Dk/iRghBVeffS2cANRzuxEWhn26Ap+LDLFOXrLja0Q4ml+4RtWDhxR8JDtkcGL/AyGtRMhTWOUSZwmSCaeWDlQ1sLovdNorM9VxTr0s1GVCgGiarVRfUL0+hE9HmEWDfW0frZUA/1+BH/h0lbDH1hRwTsByLPrMf3F5XQZLLYImuxjkqlJlckA4aj+py/AKZS5AsQ17RrGpD4BhNgcogPP8rpklzRmvzRib3UZ5ETJ3bPXmEEOkq1R2yKkSZFtZygvQWfo8FNwCmW+APHtk2CM7zSf0r0pgkOS7SQBMAMm7nPIca9XptDL65aoGjm6fowbF+o0+7I+DoF11qPlewZ50MINfRjYIWa9ullq+KpmJTC4qFLN4rKOzMtM8shPrfcM8sDE7SoI8tgQTZ03cRLUbV0gBW/WzghOmcwVIN75EartERr+LIIlql3Z3ijDVWdFtYrAaafQywOTZItwDCerU1ABo6Ty14OzCsuksSOhzNHpkvkyCB2OqAKGDDyaRbsD8jbMnzjvDtOym02hlwcrFNLKi81RVT7JjEImw0GCtsosDk6dHTI3N+9n3rHHcYJZch3aOIgd8kndjN4cF4mp5TiFXh6sDGDCsRvQ8BfpH1DVC0iHj6Q4iXX3wsIGUq2KzI1BBiF12UkaRlKrHGaWCFOaxah6GqMtDHM3GueRTdwrH4VeHqjgpy7vA5qKhsdF1u0QXhNpjzGTUML0lMncGIQb+xBz8ClFZ/Pw0zxuAh1mBkkPIvVprY68Yz/XFE6h0GPfNYKmGULbDuNoQqJckMD0ZdEcaNJ8G7eFYas5iDeYQsjCPbjH4KLgOkcptK3r0gShJC1KBj/moG4aDj2k9rtGCH9mCqdE5gYQD4cj1Ch5AERaK/kNsSoIlsol3UJsTeOn8JAKjZ4bwl0Ye4KRw+bJ+IKd+Bo2HAVmhcM273iMKkS5UoM25DS4o1SNP4zb6IveFxanSVXlD7UfBWz2oeV4CJgRh1jmUyeWV8u16vfm6YA1g1l4rcLpkDkyyOHQvmOOhCWqdHcA0PEfRtdNA/QfmrQGGm0xI3zhhRhs8ziGQz8Kv9bFxhlUS5fukwyFhQwCHT4rI5xMDpW8nk1Ga4dzUPedftyYAUcgA7sYfJTPj1WBBzMcOp0sDyeGBDYZf8//WwrnPD0yx1ysw2Fp+JQeaFyWhy3p1lSGrmqvFp5Ec6IBEkEBn7/BP+4Z/pnjaGflxpcaqFjC+b4oMGSKYPtx2+tLNRLig9A05IQZAnlRnahGURujsk818tGeGiUXrqzDPNKQ8rYGTpcdMjeAELENImoVCJPncSEyqtCwSunO8v4f+ZNTOIFCX/LtY5jhM/wrN5gdhsF2QFvEIRvB6Y1TUjyhaqV51zSvuNGx5U5Oku6jmiYJbLFBS4EJgMJAaFQlxDzylgoGyy8wnZg5d5ldYkX4xcvcADJo7j4Rm30GQnwWztK/L40jrsx6t30YJ0joS7bGQG6TDetxGvCVG6GqSaDsIQ25MCaEqKraA/KyttTmsaheETPGTavlU+S7oDAJH0OZQur09cxCKE9CMquFMmSfAqji9o3zb4RTJHNUse6KdgxJxfLZtswJc/GhW8MclFWiUXlChN6xxUYr7fDcONXrzb9aQZAbImZgWDUqUIu0QxcyC1wNCu1OfOc4qvuReE8xDRMQ28QV9U0NcbnVWd2yqpU1Q9SDVdsz0qGt0dnnxnjn6gROgcwPIO5wmDok3+mVDHtUPZY3yydD6O1/aZP87Ep8mQ5kQJDLjTm3tDwRrFBumOhF7XFZ17c2BhW2yeelbKOjfdmnZRPDSgJQQlHWSnEGizOhKXmHbPUWXgC1aRCKe4BPu4Ztu0dn/uaE19zAw2/ZhYdY5mukoxkQJW5JV4z0I8xRHuIUVljoHd864pZyk9XCtQKGbBugsCNEsKQ6uEkVKvyBsYdPxnQbWyKSMVQkGGRGAEayISyWiTR0TwZ9cjiCuGdFi1XvlTBGvkbpn7QQtwKITP9FFaDyhnEYqUjN39jkZ7r9sAJlbpH0EBUPH4IQHb8bs3mZVXj+FYAYQTdRdMnLCusc7xuOWVGh3/wtl6DxL4Jr19IgpDbnK+VBXyDzMggsqZT6Zql4x9M8ajatVkSBkkmb5/Xc+TzOnF/3h5SanvOmoBqIlo8Rj6EreVfxO/W4+ni9DlNEW6Lt5KrrGzHId2jw3j06+94RPGQyPwbhSHqYuNwYCjvIsmGQrtq18Dcn3p/Ql/2FTbYztsRdKyY1iNs27iS/1ZWe2sY3wnxmA8icIkZ1pf9g7u0pzZeYiOUGKLbJkXdBFyMc8uVUlR/FSJeSrxpnkYn1YkHxr9lnKc8wLY/pkG7T4K9dYw/NdbzzbVN4CGR+TTEABDN7CDNEdmAGgc462Sd/mHU+ASsm9OV/fpN73C2QkZFNZo7Yq3tT0T33xE6yYX3ppc1+yipxGGyuKpLPhSbT4GiPTlHdwrwv5eOVVSo2M+M9UgmfzCK5Q5LBbOH3xFd9yXDbY3K1XFu9vkGvTX4X5usJdbTu3t2jZmsDHgKZJ4OYecMW1mBX9Z3A2iS8+8uwQkJr37TJveVWCqQxJ/psCaCNfrvcwTvQuIa6XVFtCbDeqxyvwOzhAvH7yXDXaGgX20IYR0yBED2XXt3G/tTO0aP0l+jxYvLEbOuIP8MOckCnLrGwpGRIKKuoKy794XOP+Hysdm0+yTGhbYStExv0naMyk7J4Act4kMIo2d6AzCJYxobEbYMZrIrQ2jc+yz3tVik+0WrvrQwRe9NS2wsNE0RjXHptsReq40AZorZJEquUelag7IDKBtY+kCnUTKbf1WEazeBNx4rHS+bJMFZBXV30oe74crRdvz9soivBXqOz7Ao/oTJHN+8rZoFq5hDqsDqzzntYFaGv+NMjutvmVwBILw+Q4hWkzAHSyyMWX1XuTRGKu5bMb0abFSgxIb09LrFHsXBA7gvlLi26iY3NkC7HQYldBJGkRyiEBqR2jbp/jYmULrEAJoojZUW070HRPC3IDCPWkbia474juNu+SM23Xcb2vatZGulVZDEM4uw0r3emZKeb1R9sYdlC4ytDODzcQ+3dpSJI8gRFRnBHdf/yijW7Levv6s0C05tT/Yne4myPoPU4GaYIx0dmsmxgj/Gm57c9fQacy4yXh9ra8wjjYNebpkwn5YFI2Y7yK+PKG7PyevV2xZcB3ST3rZtwwmSegULDGmYadd/ugwOzT9cbsyT51K9sQoOjNJYlM4IG41zutV1SSTTfCQxZGi8WgM0qL3aEBAMjebgDDKnpGF6Z4D/BrfgAWs/LTTqhn4Wi2AcwG0DJfObeOZ2eHSIcrPQ45JjEE3y+ITdiXgcpTiOBEPMoLGOoUQNluyQnJiaA8rw8lQwBX4BXztl53vXz3SL3LYyX79iGEyJzDBTODuJDEznOUFddoAMSDL715Ql9xcYIaHYl+WOTOhIDnKL9kUnADFNyeTxGWNGmfloMeFWx5LcndyqrSBM+30vQwAQ+9QUTN52PIUujrTU27YbBmuIf8VRYA+ZlRvGSoDwBcQ4bZBRjPMyEDi7+fJ/7hPxiTVfUtQIiAxIF4ckCyfwA0rRhaGcGiAVDEN9Z7mynJdsh4XXImBp76ikTY4AT2yNrppISEt+zkd1CpqcmZZBwXMy1mvCO4W29u/hfri3Es4PTLSmdNOHPNXqMDWbnbxdmyyCJP4OMn0sNjeh8KH0YHasZFLbJqqcSSzm/HkueQfIXGSR/a+VBMs9Uk5pubUda3eB0E9XOPQKmxQr9zm8Yg/fjyjwLMQ9N/JMutBjiYMd2oNP5khLi0yvYXvq7E1i2DGajFKyU3yAPhArgAcDWSgYoz0iZhWQtFJUvs0elst2LSdj3S+4vMEj+zkqDZI5xkLYAxLoKj1GrbC+Wt41gWYKzSyTpIAoCZ9LWPZQxFuYHxZ9IpgOIKtkB6x6X8T9918p4b1qEYQPGdjCGSOqkfMUfSSj/JfVYldT8MopRbpF6utAkSSoAZTF6wLaouTrF9rkbsKIyPy9WM5sGjxRlDxZFT454rdKH8kc9W1pEbjkqFo0vjPi7N0pR7baORbjksSGNYOdltFFzyc2ifRjg+VUCRxDE2Vq8550avVLAWrxT1PXQZc9WqeVbPHAlWp/vkcZ80jrKMZgqtuLUC3aNzl4ZwYrK/EYUxjEfvoq+QscwRyg9UScfe0mj1tw4NnCxG4LEMHNmCo2Kt5Ai52l9uvRgnCdbBcnfwA//ow1YQXHhXetAZTgOFnvBPoZih6T7UQZjmeclx+UKNTpQFNUAyapZVuUq76TOD+Eu7RFcOY9wbeUi7vMs+/PRojN19FEstF4OqA5fDkDQXyqqk+joApY8r+pFftFMcMOqJhnVr338sd0NWFVx+T0hEuTTfsmoW7lBi2JVe7D8NKSSaF/nil2h+ZpgXMTd56weDChfHs7n2k1WHq7CisncVKyoyRp1SgODzqhTSvMSaJoV1evd4xEsWFg1WKPGayBQPkltyKpVQyVNJAbCzPtPkKZwBi7CKgv6NUlilFQYsAHJ2BeU1BerEoXfh7/0t89xo9/WlBhJ1XclQCgqGnaDoDnIKKoW1R6xKzT4pjGsmMwNIG4QbBAbLS8gEduDZL7xJStW918si9DTF9bQtUM0Ee9qTIWuTzo5Na0BUs6Chdk2TnansKJCX/rNaxSi2vIyHXkejY3YS7ZDti9yxD5H/qfhPPjxv7PF8+djh+CKQS5Zyynr10OV4Zyn9h0kaGsAJxtoh1WtlSoKMT8j3YcXttjeNbOEKw0OtNEJqxijcdH1l7AdgTUuxZC16epYluMQjTpFfYof/Ge7sNLSrqFNTxdPE9hGTFClyUAZpOUdvSRnwl+8ts9te50Pnqh6LOfLrEDKsgCacBk1WHECgPlElXYEg7sr9drpOXqx/IF6qXJjIycvyDHru2pYKF6Q1i+2Jxkcrh0BRPg0vqiCdn3+TZLV651/HlZd0D8VnQlY53EVRjGepsbci9zBOYzBxnK6g2tT/Pj1dQ/t9SP5X654t6pXusVxJ9ZTZtanczy7SiwyVzevuEr1/YNVMlwGgmurB0XFXTqCBYpHP6LsphV7o7I1GtHD8++R5bBPE9733q5+pqrz42BDSVo9aZKlNOj0e0uSIRRVK87fnR532uaX/v4Vvn/bR7QAELXKMhOATTWiTjJlTGx85M7KsMgcs3nZBhGVqrExgrZWX4RBmgyiRpb9E7BAcUhPoBrlVsXK7IdUQGONc9n/0dlKvw2LvowN4PBCIyidAFYjCNtK5T2S4Yv+AH/2O+/5G5uPf+eWJ7peRk5S+SCVrGEbPwELHsjT6EFbGRaZX9GGD3x4GtUlLAONtEF16V28GmIQhgdHfrHvR2+KTWSNS7J2hvFqBQYpwUJuPLdurfaoOWIXtt5vSBkzaIb9GtukeLBMQ49Zxq8uzS/9A+75aRIXUooNKIsoY2SQyHlBAGQ8WsFB88inV4JF5lseIXg9zE23PXJRp4o9grlXy/s9CYsUw2w69sN1gSwAym7M4n1b/SGljR+XXl2YuzbOC2uU/TRLoLlPG2t25yJ3HNNS9cSn9VaFs44ArfLioTLaAZ6FFZD5AqShg2L0JnciYWsoPj0krOyQVoatjujC2uJoNoy1ELuiaUuv2ogBK+5o0muM7zNJjW4EKyy09qc2whACqlSnwuTqWbQqplF9cgnTyf18Fx7sHvCzuwzWtqg8WGDOCbotpa/lfWP2Agzp7J8ew5Jlvi/xhNlLILlKrozXVu+PtUUaWTa93JkFunrRf6Ly5jgqY88bMz5cGCSAvQFtXHThwghWVRA2RZ06ErxzNmYh7vdWVeIcC5ri9Dvv28bCj333hP161+VZkmUqV4bmKltUozPFoxUdIhdgyTLf96QPgopFtV7vPHSjt+RKEqB1/fK/xb0TD0PcRsBrVT0wILbOBVPIrYlG+xhWUOhdf3yD7+vIMjlUXjqfWbw8C7C2VtpnAp+luMN2i7vIAy09pLGO4jErAcjuBzL74CVYssy5RFuItHqoI+nZA2S8WGh7a/UWRdVrcQAZtNPCXpAZzXpkspqg19YBTdM+A6soDW2WlBLq9Na1faWZucYuyZ6lG/BZSlC1+LzXSxZvPmc23CnXutCKR/EgMOwR1yxdzZovQPzhRIxB9U41vrh9mzZ7j2rVStQvdr2OYFHS0H4VHMtqlNgfogZWPWs9P2Y1a6XSJOgrNjYhs0fMgXKlx9YSps40YGeBIdtYvfrp757A5yJn4RoD4ECBIV5B8WppvMVE1oMYG4gDsGNYosz3Pem3PjKl6A5tDY23aoxroMoVA72Kkwzap2BRMrizX0XSRR9vKFcdtODND7RJPWFWXYbweXeegxUR+qqNtVgJUq67ERvEuN1zp4QGOGBtRIzHfdbsIYLTwCJwIzEYxk+pUZwM+GjrmQFZBSQp1Zg7ycW1gWNk7lVwo4FnPFWIVoc3Kkxje2UtrTOkjXeMYAGCu/tBJZjUTgNpSL5EzpvkxRLmQ8MkbEdt0Nf/3kuwZKHxxgjw8KYpu1M6JWVE0zEZ93XxbkGaercLr0cauFVl8sYOJV4laMqJutU78ZAEpqW+m33uAPHoX6hA0HQbYBmZJ8BQT0c01A/HsChp6IWSQkJqh2i2rvP19Unqe2PsEqRr9J6nl/ZQafx1I/B39/iaRokB64af6vqW30QGJJWalVh8Fz/y+rKT8Wd2udMJ7n6qqszrm+SM6xdl2K9E1NP6Ib3hG5d2P+cOEOfa/eyyA5vdW3KuMv2rCmMCdryuwQUa6g4mlZqVGQONUY4dhqHK+xN/V6hRtUff8HsX7qKkp9/DahXsJa8VKOvpvW6Ksawp/Tb2IR2WgKQ5sw0PQpBuQGX7mKG74vjIBnpMle+CxB0+vACBM34f4tgJqlgEq4bYaqpH2S/bLgN4ChYk+N3/cRJB0ljj2xjnNkHRsCI1oi7yOVIKypAZ8SZ9w+/ehAUJPf01z4Kf7YlRXjqjcr0mETQDQGyQwtzSMfGxu7j/YMa2tIT7ZF24UFSrAhI7D2DrBfO6hxggAPuq42J71LWoFF8S6DTSnphnja6MFuYd8tg+T9LbGqBgY1Qssw2F9YJHbuC1gaX4CG75P/Z7bs/+6O/egDkJffUfHtO7/xCrVHSNr2FoHQnigZNBXmjjUGEqA5YyYMimnwA8GPaAQETBm0m5GEzxWGE3BysTBklRuuICXtqLQxEWILTx1hcZimsyFp0g6ZvxZZV4zBVpPk7e6P1FfN//W0g6OV1ZG8IrdJtbyjANxU5PSopFE5Unh1oUTvInwgmk2IO8oFOOoykSG7xucAN3PzCF1yHBnexb2OB29gx/9zhV1En3SmJxsfh1chRlLyuWyjt5m80y73yu40/8qweaLOifeM/L/H1D8qh5jOVa8r3UonuYrzcXAye3jwf/8DwsQeZYOM5Iw4a60GRVxSQDoCSoJbF1qXh/P6AxLywEIHht/6D9pi+/7shvhu/Xy4qXLRUU0zWmBpjfQCsPF/ODj3Vr81tr41uccMQHbwHMtujS0yFtY58byQusn01hcHYfd4/PBqavuzCCNrytq1njcz0ZAEGtX3PhrbZebmcucyq3NFfhC9dAaF9HDQnoRAYcAmySohRTOBui4A9WmMUO+BuG6JzWvYjVTrwUeEjvXik3MN/5VEtrafGlxTDIn/h1F5jSb3YHy1RXIeszz5KhFr6RB/j3fm6h6e/057/8Nn/zSMO8yhKJNdILa/IbbXMPLrV4dRvZ4wyj2N5S5tMNmKZAc1wehiLUoL19vT8pKCwb5H18/hEeyzQDoGaODDJZTvtexA993wPvjGj0R27yN10g8xsiZuP3Z9CYqd6nxNwH+MvfvdjhD1kWwyDtpyc0OAPy9tXyhmPMTyfdi/Q4iy6auhZMrr4rj43x2scmsChx/jJfyV585wZJ7avMCrlmLxqVRVHu81ug5L3NXhXKTJwuVxQS1YwsYEbgRDXKAUr9biwNPmzLjZ5ypceouui7ojNoITOFEwBTvmbMZoaP71c3qtU2fujWXJjaI33CkV5aZg3M35+v0/t4X8IbvMQ+T28DcEtjkEUY6RyEOzhgo3WSjF0CiUTrgCNXqoVUuUImgOjdbAwLFLz23yZ8TdfTNbcmntAmL0u+NtTcrOTF0lQaifMMqLiKG1Cvl42fFE+ecQo4k5qjkfvs6DA5YJgNXnEgkMk4lkxk0nl77vB9YIx22sd/d2sL5iSxoWVPlUTTy9usIP8GrNPhJVlL0bJ4WQhAojQSMJSHW49VJ/FymTHhZFytLhZ1W6zgc//jSnD7SuOkQZsavC3dGUHgTbp+8WRFIEidrabVnC5U17HEfKg01iYPxDIp9qTxodzgNU0kZyc04v0D08EU1znYKLmml1D2HMZ9pvxFc63n5QcS98iAzrEQfbFoXpdiJdk+cVSnnyxBFgeQgZ+Q8cHLqL3Yq7qSahAbCube1jzQUH2PvvXNY1i0zAYXuTFNU8OG0ki1h4fCArFxE9R5W8b1K5nKTWEVSV0hWxbJxILSfiaOgfme5dF4OtbCddL07XVIqkcVMc+NMWRc0+E6Tm5NYZ5iXbrJjEvqlpOOwJhiEmkH0USXh5CFAQSvHUzi0FRJJW/yCEOJIQiz4AxwkOaTaiMxhqD3zxYenQ5eLb62dW5Q0zSqkEpcpPGlyITGbzoZy6JWhs/ASyBRVSrKU2zScWUgmWEMCejl745jZzKwUEsqle8DLconYJRrtWprPGdIAbmIkw9MYc7C2tMbU0AS0jWmsefGHrVpJgA2HSUVm1uOLI5BIBpqz2tpmKw+oKY3iJ4NhYolX0fGCDT+Em0NF26w4V//yJQf3Tr3ZtOkOpXIOmUdX2wF1Kg6lWzfxvTa0tCzPaKN3tnjoDRkFPXqKKtQtnsSAwNYFUvTY0raOmj0PAUFp/w96/gjP7iYaizBVRsbe+fZqmpVpuQsmwDAaWCQ+GUN7VZpHFnXTj1rm3u4Vnu8UlxO9eghzNoxLEEiSB6hdbZB9iMIBmWQV8wliw3eGN/ZLqlTakoPX1hHQJPsFGikHOussGpl+Nu8MFImPnLORhpi2mbZh6dTfATX8QcXBI4gjj2R+hwBjuZjgajSJUesAGgKS5KFAoT1+X02DA8KSAhsJmkpKlAbs9pIEniWVu0Ctz4yxb/6k+d99m6JYa1eKZeMeDJpKWS9WZqLVrx4CUykDZ7UdoGiCsn3iDpqM6Kxm0LSms6nALDklPkb4L7gPN6av1pV37x2rbAG1SqVVlUEHZ4b/FYKEodTWJIsFCBsh8QBNOqq7PR46Kjoyc40MqfjQ8K6MX37o2NYojR/9X9e4Yd4ma9/mty40iAheeVMEqB4pLQ4XlNAkBpAa+yRYq+ordJkV7hmPFMNloFhYps/hr7rCQwj+642N390Y9E1vGjtwhp1PFjKnBKlFHduZo0YHynp75+AJcliGSTIoL0lrk8b5ziSIdvVpZ0t/jDbhCULs8ku/13nCM0NtAyisYWuemQab6WG2R6eqt5fvVw6XwY7ifevGPyWMbrn9bd4/jx+77+5BkuRVDQb7Xhza4uIelXZHRk0LoYTl1a1cinWD/0V9zKEVIp8EyKdai8CtVGGWK5S37sc/rhz+G13prACQlvvGHEj3IJYhUPSP0rqiUaqJbExplDkSDKZ7d6V/aPjxqSkaLJhPia+LBNNuog9T75PLUyYerbxn0wmsEShd/2Bm3xNFzR1xN4fL1a53BuX7oNmFzQhiHIR/+/7llL7ePEMEr816fBa3dv2nvZTrTMxhGScLp1FRKJt8pf/1wYM8BzbJzdCZXu0doIrKkWxHwjQzKegoonYV2NPynHiDo7eM7MOnGXlUEibvW7v/+D6ssERBWlcj/sAjXtosQZjn1TR9eR5m8KSZDkMssUuP4cvV3SqV4SFXiEba3KVTmfydLCO33xnAismtDUawpmzF/i3XUrp6KiJiqloYG4dcWcsbKG9K2jOVkkFB/NJ+5bEPwqmz4R72ufhC87s4rXJypRCpd/61WP+uxevNyRwesuIjbJJyjlrlFGIwr6RSQ7w9s5SEhWDLAUgQeiv4V7qWYzahDnBzubfSDuK85iT3XIaunMTvDpbhxWWCJZHPn/sPV1w4J7k37Emmbc6hqNSo5xm3AoA6qzdDCgf9fIXIKTNwxturRIorNBv//07/Ns2FPzeld8gFRxEpfJdVSt6PSb4v3eW9oyXB5D3QuhZ944YZnJZ8cqEanNDMio9yj7k1hkkEzhBQt/+jnG0wQDX+Ac+ASa1PYo0mDifUuA9uI+6kA7fNvtweDiNEf4VF/qKd48I8XYqrGLtLzsvnQLmdHdhDic22Tb+9O4WLEmWBpAg9B2wx5cwVjcfGN0TUP3kMeU85Q1ByYPXCTca9tBchdWvsH7KhL7q6Q1u6DuBJaJq6bOxIeqVsAi5rDK6BJLAMsIsngOaP707gSXJcox0EYRt0PycdJ+C/zt90jq0qRQNlDSMQdrOyyP/CDzQ4aG9PCBB3EyOO4rPlDqpQ6RuX9IIuj7z1FFOlwkOgCUDBL85lNnBaQwKxYogUPziDVXzKS6S3R8Oi0eEP87B5t33La/yRS9HhcZPPxs6rxQxT8FOzGV9qkh67hgVOPpCHQid3wSWLMtlkCBI2yVYhMoSlEEDAh7dB4zbFJV5zhDcpJ3ljV3upQi9+90MDGZ1DQQadTkwiYDBGQ+lBgZB3cB83A1YsiwdIGw77MaeohNRRWWR4ieXjN/0Xg7osAz3Vh42oZflS3t3M76EVZ9fyYqw41NkTEsavIVm33ASP8X/tlz1KsjyGSQKs4hWAQS9oZL6rPZJBgpaRsFkt+TiyFfoH3PsoZelCb17vMFq1AZpAmKpg1WxhDxXZROfTlDU521YAVkJgOCfiy+jn6ge2pSbWIx1jOu7FA3GbokJcQ1co+9hNull4UIXxsHm2NTyopU6DMVurIbZ+jJISrdByByYwArIijAIBJff1dDY0ahZMpAfXN3rpLEXZr2OuIvbh9DCXg+SJUjb7vCzGNmGTs6m46dAcLFLZPw5ZLtTgBLKnv7zKayArAxA8M/CPru9r9sKF4VJqAJIZa80FjwogdgRBKP9Zm+0L0roD37VZsm5Ii2/iqomk7E3jK0h+WMAOYMCQme5EupVkNVhEBbXwBY2ONVYRwUMqoAARs0qKhcV+yRUcnyFmaQHydyFvvarNmlAW8ocodMyg+K0IIN4HiVVv1PEISdlrgx7BFkpgODl+Lquy0fUKnX7Uv3Jhl8JLKmxnkGEa3CIPUjmKPR1v22TyG9V7vc8OtDaFnUMBMBm9pZjiJ9/szLsEWSlABKEQTLxjm6I50o8W8UVmJzkKZBkwNDUdoqJuq9Fm6QHyQMXes9vY7UqsH4pnGfd8jVoSO1LGZseK22q8Q7hGV7HD68OewRZai7WvSQG/B6BFyHYEilFC0qqe0mF1wzgmKeVsnzjapT9qtNOeXkdL/K0l9ct9MfetQm+2dKBXh5L6r6XrF2X56U6fgPUoiYiYp7mDN8pfvDWOVgxWTkGCRJVLQeXK4NdqFj0V424U3mFlyulcygzi8ZROJDI83v0Q7136/UK/fF3bfL93ZJArRagyJ6qSm3Kz4SkIGDOuSpvtsraQQNzrez4ucpKAiQIfj1MMLzEpYp3GJUKLG1j7cXKN53M9lzmdQSHcLv9/j658XOR8O4U+lNrNxkIW6k2AJmgrvnkNwPTcTEQtRep2CkOtnFya2njzl9NVlLFskLfi3s8GdvxIToWBPJDgLRYKsSDVhA/8gtRp7vxwfy+XuW6H6FvXFtjXegm3+RRVKfkI2M6WlcN+pLtUX2yA6LyWI9UjT4uT/FH/vXKqVYiK8sgKg1dDGU/U0+Vy+U35sWTAOprR+P2rZMbOwZ86sU2+IEGlWsDenlVoatf9iwNZnsx380a3vE+ZpW28cZILy55rczSYZCc2n4ATbsOKywrzyBB2AMV7IcX+WKHwgyEYDJBX22aFnQor5yzjEsM013u0no26Qh96xqrpK/scC8/juPjvalEIsZ2GEYbi1/mUYEtliGzbWINysvYCrM4yXO/jD/4gV1YYTkRAAnCIBmzG3BPvVP3AgOWxm9/XaysTmBAQmZj/Ms+eLiGT69OFHdZEsfR3z37LDfwK+BpmFQjMOoTGO9UVpukwESYD3XGqQOGON+kY6I65rbxB354C1ZcTgxAgtD3szrkYOcoODAZe3CPl4IKqNRIITjGWpH9ptzxbQ9+D9sop1Bo60uYLdwOs8IoNX6qbIrQ+Iv9gNUnMYgzTGNAosNs4/J1vPWjJ8JRcqIAEoR+gD1QDT6nDFAVkwOoSgjp+gIM0vHsBF0uyb4xOeU0GvIAN3D94Ve96L0MjBY2+VPUKQGINwZ2ZA8oRnebq7B4UbcSWNQwb13NJr65hd/3b1bSpXucnDiABGHDeiuOd7algbDLCDndGsouZHerRLbm+c4iL+xCAsoEHiKh51iVmgGrUrDBvf8ovoZDPU6QWCHbGnFbKyoTJCZhRohMMbPHpWPEJgHxYiUG2YdXcB1vrWaJouPkRAIkSATJQEYQYq1KHfer8B7z8BrrC96CBFa5xY0ngGUl/fb3I/T33jbmxvwsN+QxR7iHal8IQNSFC7nB5zf2emOgmzpXIJFyf4xaVRhkHz49OFHgCHJiARKEfphtkgZ35M25aoSrnZHF2ix5tbAJVXcA6+PM+nTKats0DvICeD7UwGXArOyDpx1misM7F7jRPpVr5EZQRO+TGt3Z0JbyPFLkTcHj1AZR1UnK9njxWAFoOZ/WlXPM8AYMPu8K7p4scAQ50QAJQj8SvFsQ3sFeJyN2mISO+aX6rnq4P6lsFntQSg+bQKxyCC/w9UzxdyyPYWhnOILmzJhnn+SGOuaGvVbsBjANvrsuq0ge6jwqwxgKBFWbIIOhqdfnY7zHG83Oj2/ACZUTD5AgtAcjnuxpcqMKRmPc2h6UV6dJfn+57B28YVQZH+U43S3HU8IK6mpgUJBI0Qmwz8vMNPQSG6dT3jN8uBd9wxTXDz7n3pRuxtfQhZGTa7FjmIXf7Z7gBspAwBFfzFArF2rPnr1MleqUvE3RVohsYpkhH0tiU1i1KhviChxXVDGzzGDZxvf9+BacYHkoABIkgqQBVreYUbLgsQySS9AQme0VN7yK2Ntl3MNkwo4ZSV2WQVPAOgVrIqymOa4wTQe5so80tHSeUdrGMQlyyWYgKL2/1u7FpBJ11qt9IfsJGDpuWshAUSDkeEYAgg0CFg+XgAdSQDDHOIjcAa/bxu/6z0t6H8mDk4cGICL0AoTBO5tH3L9lj1cx2IULLCd0wHMchgiOnJAyQtTrTImtUJHq6kYe93GlYLWAqFsZ3q7LU2UG31mmZFMkL1RhjhLsA6hzpqCARFmBr9k3teEegcLrWorBvxpoLthmF/Ha/ol1Ylh56AAShD7ILOJwh2dHeY22+ZizVe2dN1R0Qx23McCRICOZ+S54qJxbVTYy8LNsIg1ezilgkEYej3UFRLLOW7YBE4uA0ssrIAyLaD3csk5Vpq6dEQDblu8qqSJpHeV90asxPmHgXDwJhbXvVx5KgAShD8GIY1xbLryjQ2MbJQWFukyS5V7K1nHcUmpuY+egPOPtGfOWbLuU3bILFUxDBlCVKWX1d9gkfgwDkYBEIthgQIIddQsqWwKNB6syxMX4trGR9hjPVvJUHeCMVarv+O8nXqXqykMLEBH6MbjAbPIcP+8RCjCy4Gv8eqLuPqi2i2wjE6tMr1TrnCBOoWKVtImygZyMfsrA0Ne2eaNakbEZQBo3ZFZypWErY4BZh0fXWdVKmCezS1G1SrJhYQ00sQ3Zxt67Q7ic3iX/8MlDDxCR9j/AFv/YzarBY8UHZh0YtiFdzE346MnpCLd0QAGFZYBKgzeHY7YdUqO3bIHKNNYGSWyRr6cLhviDzbEa5abK61TcvFiBgLI3qxsDUXumjWzCahR7qf7K/3zoWMPKqQFIkKB2cTsLRvyluAxQp8zbBv1ay9WJjy53zRi1PeIyZcCUKVVgKFMUVSqra/XLL6HYL9Y28XINxq7QKUGVFuK7Hi0ogGjRBBLN2HKPu/BKexW3pg/9O1lOFUBEIlDOMFCAgWKNC9kOYMnjyPLxJ5UZLMtUbagaP4mHyxjmcRdRveKCM+8nxGJ7hKPlVWbqBRN1KTNEBoPaIWRVKtQGD2LME0KVZpKzdsEY4rx+wl+9jd88ncApkVMJEBF6kQ35llUvd3zBa6ttFXsDdWzJkf2PYZICinqjqlmVnWLUrvyyT6Kyzbp4KTNHxRAVSKytgtW6on4JGLDYKDbKroa4m8AMt/Hq6QGGyKkGiEgEiocrzsEzkF3D0pzxVXUrK8WleyxQgoRGl5FmjfuiWpGCgeQ8JMySe3sDAsou3gQcl84b93FG5TJ2iAcTK3HFg6XgSMuqSpELiZnX8c/8zAROqfQA6QiDZYPvyjPckC/EZVWTjEERJfTo9waO3VSChWZK9b7YZRrr0g1f7bE24r3xboGxIdT9C8oq1otVDZutgoIgwDjgbdfBnb2Glx9+G+O1pAfIPSSwCqRqKmynuLG06AKPvJ829Gw7IOVGnPYiwwxYdk1n8AUlqr6RWWHVLrE/xPhWu6SoUgk4rjL4deSfMFNmESQz7mMGDAp3A6C5hX/0YxPoRaUHyH1IBEvTjD21Y25WT0GsHn/vW5cwIepWUdFUreowiKhDmh9m2SNuz+e16zNY0Lh8iWqDvJoSGsM9VTL0hM+7Q3cLv/7jE+jlWOkB8jkIA2aN1fzALk9xI13jVj26Lxcw0VHVSxnDGvIWCAAaZ8kso2whnqdqX9cBhpybATFjQKDbZ7XqFl48OPXq0/1ID5AHIAyYIQxCqnlMP38KIKabr8Wp3U/VJsip9ZDsGLEzjMeKiErql7VPCI3N4tQVqzEWz+pSSLH3zb739JILw1zvDPZ7QHxu0gNkjhKBAyBAGXHHP3QIT3CDH+Vd0riOBILRcUY8g+GAwZAad2j8YTxJAEBY9PBRBsAUWh+i2tPXO86kl1566aWXXnrppZdeeumll1566aWXXnrppZdeeumll1566aWXXnrppZdeeumll17mIf8f0/r93LAzEAcAAAAASUVORK5CYII=" width="100" height="100" style="position: absolute; left: calc(50vw - 50px); top: calc(48vh - 50px)" /><img class="img" alt="from Meta" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAOQAAAByCAYAAABDaH3TAAAACXBIWXMAACE4AAAhOAFFljFgAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAACtgSURBVHgB7X0HnFXF9f/33Pd22UUDCNgQdEFjwRKNiX+7oLH3lqJR0SigqIhKs66VKiAxgNjQGGPEbiL6i4a1BPWnKJ+fscbIggQRadK3vHv+596ZuXfu27e7771dED7O97Nv3y0zZ8qdU+bMufMIDnmDman/8DHHAtRfzvaT7+3lOyXfS+T250SZF6aMGDYaDg5FIg2HvDDg+rE7XXrd2D/J4SHChPpq9L2N/NuG/dQiODi0AI4h88CgcePK1y6ur5LDCjg4bEA4hswDaxdnbkSSGRcReCyTN4v9zGo5b0+pkjYe1/8IDg4tAMGhSZxdWVnaaX3buWKcdtGXqgmZ3lNGDq+Gg0Mrw4NDk+hY124fixkDCXaLY0aHDQXHkM2AM/Xd7XPRjq/DwWEDwTFkMyCmbvb55JHDv4SDwwaCY8jm4GVcHzlsNLjB5uCwCcF5WbPQd+i4vYnrdosueN6pMpP8bXTu89mN5c2g9KP7Rw/6xL7Wb8i4nwF1FcExef4ycQj9IypryKjenuedxsR7gqmNpFhRU9bp7GmVF65HE7iqcnyHdevqLiCPdmMfPeDxVpK/Vh7mKvYwhzKZOZNHDp1ORIw80L9yzDa81j/cnJe3LX1lQuWgFeb8ksGjj0ilcQIz7SHLPdsxqIYIC9jn2WVo88TdowbOb4z2ZYNHb5dJ+78lpPZnRnepY0YqtVLmAu9J/f4y5c7B/4JDBLcOmQWiunPl39D4StaY9mh6Y3lTXBesV96eoOdlLpcBfEFw7FN6jnztN2D4PZ3qed3DQvtEDuizKYfRASvK5CAnQw6qHNdxXU1mwrqa2tOljluyjPBQpOr84ZeP42V9FP2Gjxnf97qx47qUrh5fWVnpo6k2r/V7sNWumrW1B8nX21cMmdi1NrX+QSF8NNtlBN/BAeHX66nm+r7DR4+ZOmLInTbNKyZObFOzcP2IDPhSsFcW59RgHCf1v6HfsNFT2takrx8//uplcHAm68bGoEHjOgozzgqYsZB8lw0bfdy69fWfyyA+T7Thls2lFz7tQr4/9uuatrP7DxtfgQIR5Knzat4JmLHJhCJDRA/f0X/46CFR3mvHbFO3cP0bUodBUpMyNFPUmjaZF0RoOOUApyEbQAbRh0z0ZHTB513k4r5xAuteg7z8CZrB2rLMjaJedo3J0bwgn2gceRbUPlceGeyHZJj+qgLZTT7Ui8p9lTx+R+7Jse8hRWXiFT5N0u0eZWbsy6ifcemwEQeLh3g58oCPVFcxs/+MeP1VzEqaIfVerYl2lQocLwddo2KEKS8eNvbV+0deO5vT/Kxc+nl4nWiFB/6zmNZhnK8ntRTT9xzRmLtEbQEfvLC2/AY5rMQPHG4O2Qz6DR95rZhcY8z5vSOHFNRn/YeNmSaD7wJ9GrwV0jk4EIZ6gzN89b2jh77XdP7xFYy61+RwR3NNTOAZqbLU5ZMrr/6ykTKPlDIfgB3uR3j13hFDfpEr/aVDRh3oe/SWlfZjKaQngVbWc2bA/aOGPZqdJ5gb+ilMEhP09DgfPS153mH2RykyuL+sbO3gCZWVKxrUcejoYUwYYZW5gn2/YuqoYd/hBwxnsm5chMwog/3R7dqs7dUcMyrUXQ+bGRmjp44cfEJjzBhgysjB/wjC++SwOrrIOEoYtRfygTCj/BdtWt8rFzMGmDRmyKL1ZSUXiXPmGyvjkcyZ24IjYcybpowcckkuZgzrOGrISNGa91tldpAJd6MOsx8KHENufFRnmIc352gJoLQjLoouMOZ2KV87HHkgCO/L+PwbBBaohk9ciTxB5I8UGh80lWaaeGKZvclW/TpIzlI5elGEwm1oBumS1K32uQzGvfADh2PIjQ5v1P2jhy7IJ6WP2kBjxM/I4yH5MLKBlPO2zFH/bs7F+XLExZUTuzafkz7P90XrUlm6yL7mIXNFHlkx6Y5rvpKvf5tzET574wcOx5AbETKnqkmtLH80//Rkz/m+277NumdRKBgj7dN0zbozmssiTpYRyBNrULs0WRymFxZeSO9YuSvwA4djyI0In+iTSZMGrM47A+Fn8SHNEu1YjwLhe+nP7HOZgzarIcnnT5EnHhpx3bdCNVo3FY/qxygE7C+xztriBw7HkJsorqic2E7UTUdzzvCLimiZeuegrwNvqTmXZZEd0MoIl2CKzowaOERwDLmJoq4uufuAmLtrUSRkCSRiSCZuB4dNFo4hN1H46/2k5iAqR/HYwiKUgcMmC8eQmyi6/Gj1MlGLtlbMwzvaEJdV/iEIs9squsA8Fw6bLBxDbqIIljdkvjcnuhAGeHPBkVV+3eqe9rnM95bAYZOFY8hNGMKAs6JjYOsBw0YdgkKRSfWzT32PZsBhk4VjyE0Ynp/+q32eoVSz0S82gs2dhZWPi6/Qx1PvHPI+HDZZOIbchDF5zNWviYn5WnyFe/UfNuqafPKeXflEqZ/xfy8e1mjHPB98Fxw2aTiG3MThg4ba63wMGm2/e5gL/a8ft0PHmnnP+MDJ1uXqHcrWToPDJg33PuQmjqkjBr/Tb/joIKDcvALmMWNU/2Gj+4j2m0DwPvdTmXrP98Tjw53E73O472d+R8wdDI3wnUSu711IHKzD9wPHkJsB7h0xZKyYqluKdrzZXBMnzx4yJ7w32BqDMp7eAEQ5YYkT247MZ+JTp4xwmztvDnAm62aCKSOHVnqgYDuN6gKyPcfsH3bfnUPmwGGzgNOQzYBSqfdRn7kbRSLDmZdSBPWSLqe+RgsweeTgV+Sre9/ho04TA7WP1E4cNhz81EGbsK7At/J/vjDhax6lHps88trZ+dBNt8WCuvV+3EaPF6MAiEKeTPBLw2N4bxeSl4jeBPtl6thbBQeHzR3BDwL17du3BA4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODUBoZXBlrzS++qId2rSvpUkfrcZGADMTevduD3xbT1Ubp0wHhw2BFjMk9+3RHrWrDwDRxfCxt1zaBb5XAuER+awDY7YUMxd1qWk0fd4/0ErgYw7ojrq6S4T2sfBpVylrSylLbnirpB7vg7wP4fF99MY7/wcHh80ERTMkV1aUYf7KywDvemGGjiGpgAn98JvlQ5opoRglPK4WhqmkJ6ofRpHgE/bbCXWZscL0Z8X0g3KDUjyS76BZUn5wHN77OzhzK73zzpvYCOAdzrgGnKoI68Geuujrbva94NpSLPvjLRTUcSOhNjX4fDEjfh6W7wVdpeulHz/DW1Hu33EjHL53FMWQ3L/dAcik75fBvleS8bI/0IMxwazB96eg1Mk0/T9fFFTucftcgAwmCI0OVhmK+WKmT35U+SyDcQxSW4yit15ehg0I3uHMmTLie4XMaOqEsB6xkCKcSUsfexobAeswrCJNdR/6EAsCqi5KEpjjcAhUl/OI7tiMwHiorBooa3inAyrQZh3hhBpshvAKTA/u12GgDLbX5TAwTw1Dc/zFHJ0C8fO30xF2kxE6m8/qnpdU5l69yoQZ74bvPyR5O+irphxKlBdlkvts6iNpyB+CzJr3+MBeFdjQ0DJAj3klNMgSfj7u4Yo+ZdgISKH2ZqnJlnHhDfuKeONp69bCV8gcVwpeXgLIh+TjLU9TSj6rli/AsrOxmaIghuTLOtwsX4GGahMNNnXHZgp9NftcD0rz7Jnbya1b+cwed6GpMgOHTdtvH5RRfGWYP+AvYpuufcTWNdIKgOJE3B2Z+tf5gEN3xcaEqYPpM6LtsbJ+MDYwGFf1EJ3cx76SK5XwY1GW0qYALxoMgQWyeQoXG3kzJA9oP1iYoTK2clhrO44Zwn6siUecpcmCAUBkrl/Np+8yEo3hpJ4PSbLfxHkt+upTK1WZI99V0ppZkq4+mhqRLRyi59RVRuDLG1RTUs5z24oIum8wtz9nK2xAZMi7K1muXZ3NG2nR/QHCeYCaudDmLlwC5MWQfNmPLgH7o3LciQ+yGcUca7uxoRazzVoeymf8+LYG1E/efawkuyCkEQ1qNhlXyGcofN6Wqj7Yj6pm96aq9w5FirqJeSp5aB5yI9CyFeIYeon/3/Ht0NqI2m40ualywooIDmRO592ODYT61FXHSzGnxrME7WpLVGTzVSb1qUyoFY0XQbVLacnNGc0yJF9VViHtvDVmtOh55tKHf5d710j638ggvFCSVUoJn8WmJrLzhQTVf/8GPvXH10YXT979OrlzdVaewCMSlP8qUume9Oqc0VQ1Z4VNjKreXUSvv/cI1tfvKfknZpnWdo13Q93au9HqCN2rdjm5NCbp/32547k9sSHgYyJb0wdGNGHQNo3l2tkczbyM1odmVCp+VO1KYbNFutkUmfTL0uTt1PMLmu9FLKRnaUGXzBaG608PffteDgq38Dldz5BEd0naijAHW6ZkYHAY/iYew6ft+oV09n+F3u0h87FVjkr/GFLrLqUZH65sqto0e/Za+RrIBx7wjXh0b1cPy4uKVfXmPvzTw2fQ+68/gQ0D1TtAkil90yZOyzgaL1eORSuCUwMvyfjYJSiAlVe36fRB32xmLBkM3Mg4NY00bchgs0WTGpIHll8u/wMHiDUJM5wRMeMjqN/yUHpwyXuN0aHHFjyNet4/TBvrB8T0tMc0nFayeFLpyWj+R5aFRd7z9PKH59KML5pkxkTZb//vnfJ1s1VWltbyxvG+vTpgwyA3K4QMoPuRcQx3OL83WgniyOng+7hOHRPB9u5Gj5Gb49FNHrJ2ymY6ECp+rSc394Y1ypB8edsusnZ2vT5NLm+Yx0w8g+5begFNq16PZkDTFyzDbl8FZuz9ESkiw9qklwcCCHP43RJp1M1q1NVdhCJAb711m5B61moDR8fsd5EyrkZrgxp4UZLzNmO0BvBxJ6OVnBFepp+UsZPFeJzLHa3PNtu5JKV8igclG+WAzdvH2pTJmpa5oI9trWlIUtISqpEqKYhBqDKYYM2/hH/dra2sZZ6jxJs2S2HL8phT9dxzJSh9FL368VIUDf8KeYpHCNkOlgmsvL3sDxItOY7mVK1AayAWLtZxWNY3crxtg3TEB6L9eWfjO7TIdGZc3sVnuoqVFLONuACLpdFbm3s6h65B68gCmbK3WVuypmdtHe2YAnUWy3GLDLhOpH41yTyjDm3f2wYDWifWODBLbc9CuOystAQ2ML7Ay9sQ/L3rwTuk4LWTb49T9F9kUkvLkfmsAsd9jSKR80mEjhzQB6Ih26t5nH607EGHpkmHeIfR1OVFhaPxubu0Q23tDBHnB+noFR3FAjQIu/PDDh5Cf/t0LFoIPuCQi6Xq94Xl+FnlACPog9euQwvBXU+fKf3TS7fFakPACHSJHN8LPyyX4iieUMgvRsdUBVVPa9baaAwZXPGAkLuItfrl2DYPwiSuJPIm+qoeqq5xuupyHtkdRSCImFmTXnhYJkNXycnBHARusGqeMcDUFC8cQ7Ik5b3py7SkE65+NIjWaI7+Itwrc2zeN6DFlphh8gK/xu5RGylhD8wJwgGjNhq/B6n7KpJR6PGa47vjwrz6ey6e6VCHkgFC4nShvb+qAyXoCk32lVekitl7eHcc+Yjdxo/w2u/l5l6+9pkoyZEKqjdnL//gQbp1OTr5qvKr5P84NWg8aMcyRY5z4GGatPJCtACiJcUkTr0nlLePQurscDPDmKCX6IVPj0crgHv1SmNd7SdCd5c4pI6g27YCdehGH1W1SIJz19M0QxKsj2qL5/1chuQAOe6TCO0zggjeTbTy4aKWQhiX9vAp/R/Ss6pAE8ZGjfd6munMOsK3ahDEsazcAoZcg9tPrSeMk1J6GKZjwzARoximV+UFg1apZKomTl3ZEVe+0FQZizBlpgzqI9Sav9H5muGNL8ocG8ZQDMdqekmhQIjnWsI0pDiYeW15PgxZjb9eJlrwDg6nU7qNdpmmLzlL0BFVC2Oetyd6h4rrI1S9JdcOJFGoTEZSBs+CqvbGwb3DWuesgccDYdmqsI0DlmHre7eghaDHv1ootC6SGtXH1K35VYw6tBKoqkr6ldRiedwi0zXtxYA/F62DbLNJlyZN8UqGyt0VkTMrDrELnujV3O53HVEEmFLjEbm/7WcnGoG9Aebcnqxztn8r37Iwsd1K3PZIhvxnxbXSPWohZ5nJpAthPSlhOw1XiDR8bqn3+5s5isJvvEQl1sIZTmJAZiUL/4VFxtyhxIPpkYCtOb/1yq/wUscv6NmZ9eTfIxk6RG0CqxVPspxKZumIYpNZklbI6Rsfo+pGdQtmimJUK2cPlQYdwYNKTw86K7JqskF4kKasqEYrgKZXvyT/7zFFNyhJedFO4pN2vwSthdqSx4Volpc2Gpm/RkthmIusc/0Ew9Nv/rhYBN5dibtx3q1kybvgty645IoD5esUVVAku/WMiqe2wdh/6cKM7ooVlr6WL9ahcsfVtPwdj/i3EY14GUmZUqTWUchwQqjbSM+kjY+J1Mqhn6lc5t09qakyOWIDxWhBNo7iTQL2IiYrhI4spgh1JFliQskHaq7NYqJW1GLd20LtiNB2UeFlpizYTriQ+UlFDEG3H7qxul9u/QT/uM4IQCUjKBYaiC33hpLJCx+s7U3lhMVBPB6tCY92iMoy1pY619Ou0D4YzadVtMrSROi4YXoIRn0omONevN/RXdBymDYwtOGUuFtXdo9cWZKVxai3Adz+vO4oBPX+1ASjxe1aL2vkI6xKRfUIhrQXFpq/d3cVhm8tJqqYkNgtZHyOJbzRQJ5yrxBM1IzWIHocQ2kwNsJWTaF96vctJuYcV57mdhMiF1Ign5KvrwX3te1PHNuOWoMxx5aXjh5oEv/BCzsKtZly+GNVXhTkhIQsszs0LIYjhldM6WuXZahO75CTnpFgRjwlTrbXAvdFifw/KSuZlvlhZaroD6s+RyuBf1Vxofw/2xomVqPtt0bEXKhrew9aCyl6zgptsxlTTutOR4thrzSEk5iEOKYV01bIsxpmpdd1CNucFofZfcgTnOrfR/7vZV0x/wOGmUKYUB2Vi1g1ZFuX+cCjNlPkqweMOyMYqMzZr3b+Wy5Plu9+0vBzJF0/Zv9BSf2JVT1VH4q/5W/gUtxzdI5iV5P+SPfob/nIg1LkQkaPNbDSk+vDPEyBP2C13JVPcB7mWxNeU5/c7fTqhkvanVQPqQloZG2T1nChFYDlcvC6XHxcjh+Tz0ty/CZFWjiskKXd/XZGy1r3E2Unlz22KhenQ6ZTfMFOTMETmYZWAv+6okIqMyIeF+Y1Ke1tjSJ4ohzn8gk9H6UXP34JLcXbb76GAw5ZJEfbJ7SXepjHyL8/oFgEIs6niFh4rUFbBMseexCdzrlUjvYHTJsjI/Io3rJPL1o9raqpohiVpfC/uTkW1HFYjpCa76FkVDK91VaKzNu82HK9d9PAeuYzvNCTaDxShHidGAvEe3j+Vhg+M0f2qWGTeczJ4lSZKHl2ioxnozfDUerfuxh/2MdeGtkGl56cqz4Lcf9pUvQzscEdmrLhkdTvkm644FG74fniSzx9vozE/kaMhv1DtnUfljLLZ//mVfBn/QynrM2m8QlmVDCnfkmUEs8pbQvtsQi0ZjTZJG0QkpcQ10mTNZM5PZLuUQ2s5tSWvoLWAvm3CGm1JhdL2LisLMmhH9sEPrtHe7S06FCAee8i+1GpNh/CDQyJwgvIZvOcdSAMtmRvMj9QiebgLQ5e4apQWWwXTWAl+bcQxixCA7LaZCogDHs1rts2w7hK5W5o8UnZczLMh26F62c2RacjBr9Qj4wsdfG/lF7j7Dl0dw/++cgHKUQ9a0u7wnR+Eh/hiVKhcIs2c7VFSZFDKpAZwux3/BgnHbIbTnolFzMG2APHV/fEMaOFaf8fwi1sWPOf0rYRTXPNQpIhyf9Z3LJo7mOW0d+nKUv/i1YA/6rrGUL/fFMQdMstgzxeQlPzVnNjN6wtuxitAS/zt0YeXyf89Be7o2hYMszUPTJakqAlj82U8V2F3BU5gtteeCoaK6W8746iC/papVrmPn2ZQqdpufJRNMuJa0UNpF8SKaRPASvGD2lEwehhedXr2TthK9wwD3lgGwxZJFpS/BS8IqqPVbyQzi/YJIpX5aQZ3AKeLEdanHpcEZnS0dxX9aus4d62K07O2+m2J46eX4u6XkLp7aTQ1YslOSR/tlPnJ9YgsjVlsL75P2gF8G927Rx6GRPGk7nJ86SSz8VDxVbQxn7ADXzMXt3QUpCsgZKx2DhZnu/vhVaBsr1VeY0MlFRmMOxxlGz7OO7St23OfHV0hfzfMcpil8qZawmVfiM1ipaxTd7mLAKf+CptYMJI+3hs+QO3xvUFRaZshUHVMs7HsHktLUGPfroIEw/Mj1LcpSaetSUhiET+hWF/aBtYzR9Vu4VRXhbNeDMKxE9wrMxZ06KA8LWe5ULNQk3dkxPwiCH52tJ9EPRVEvFgFTMDrQFv9ShpeUVMH2YQBk96IjjTR76XN0GhA1J+yx08ZanPpci6JCMY+HuixWDTcUC248gCLXlcBAMezs6s69QDy+v7N6Bc1r9CSF5pad/oocrAnJXGH55BUzWL55xoDqtRua989dSzzTCDzzrkjvFmO1Q+jyIg9ZwkRL4Lj6PRqRhUPLVHFUBKabJg4s7JwMBCsABPdZX8vWyianqsJ9vw+6NI9MThgcAapunaX9pWiZ9DrCHTfsfk3IftfMGCdqNvc+QL/m2Xg4VkbJIk1utoLj315Xh6tlo8kBgSVSL3MD6FT9zjF2gBqKoq8LzNhb1SHu2GQMVv8RGb2A1nhY2BUzdJ+1dELzQn1zFv4A59kks+Gb9SrpfqzAkNJ0Pzd00UlOO46Tc/CPUnW+m1cyI8JzHh8vYGZ0O0pJisNCusvvGgaLElp/lHZoXqnhN8WMzrkDWo373BUoqKMAhOZnXH6dVoARjbBuvfa6I1U20JhUMut1OHK+zsIeLtOVbT3as+Q0sqdNmeWwqtP9kDIfEhDDdp6dkvHpBL/0S8Nmny6B4KzEpvCvcSmi0CL4DqFcOUxir7KVoChj0vtrVkTtDyR+bL7XsSFFT+4GltJebp9dGN0kv3kWsX2GljmYZphHs+RRNQ5ionrNSm5l3SgJ/oQZMlZYhL4Ldon10h+H7oKxHtFu2No5beK/LJT7Zryo4ULAKS9fCoVqRWdGIu9+9HC7En9qxFEFdhlh85DmCwOz9e9vBpl5gRsywa4kVoKVYvvwaBR9DMkRKmPj1PT8xNvung+cPEE/pG8oWExPLBzigPQ8JGoWh43yByaifeUipF0QjCiz0yh1DGD1TdmzIRS+6SFf6gPVshNim1gKCLufz839M6YVzUPZA1TdL8RGvhZ25Bs2A9coP/XiwOG0+9q2mF/tLczGszqdSBqzK3xSopdLTE+inyu6RS9olOkhLT1+/IbCJPwsV06HnbDgtwT6euuLzJt3s4XHj39DIvWeUW/oayR95+ak1VmYlsLXZ4wWpIa8B4LChYF/Mio8Pu/Jghyd+h0fkwU4sYki/cpoeYWTdplZt0bwSeZHgNdmCjZ758k0/b5VGp7blZ9Yp3EPD5Bj5hj8fpxU/mobiaLUUcVqWequq0FjCkl0WL88oVBAtw+98GmnCSzm6Psg6g9G1cevELcuVniYzhaPSCZeq7CVOqmywDyVkWIzmQc7eGd413NWMVja8Cybcg358ePhq1KTTr7aasMnTf+mDjugnLDAWVH6tpNrWJPIgsPLudHC5tuj1aOGgTWoXUibsORYC5kz2zC9YHdTuRYu/faA0YGwBm7mjmp7HRGpusRJ0bJeShKSdL8/DpT1BlmR6PlzUYU+gvX+aO/ikpHShplkVPLDYvdZ2xJfz0gygatNSYKEjacMWH6ZF5Py1AfswYYYu2D0vODyJRaoNxntTzvuQNMxy5Wj4TmyPPjVqn3Ej6QeVyp02cVz+0qHWRCRUto2j9Yrs/gThKjOMBoIO8ozSavaDC5Erh74AmobUg2/6gxtrXPKTMTogcmKFYUdM9qUs3nNJyCxHa8DTRTdH01OzRpWAveyj3OlkfVdVgdlv0i7t80TY3Ci3jxo6FYPifF6NNplGTk6Z/vExy3GpOYYuwqPO4Nx+zT3FB4Z4fB5knqHM5ioVROvb0gPLLSgunitnJ14Ujk7JsGTXkO+QYcEHaiYRJeQyauDp6LommBvAytC+J6gbDaLnTk34mviFrlRf5m629lCItAT2fisdGyJo+0iVotjUNws+K48agTBIZoOVgpLZVxf183tvMB6Yf4nYCiUB4JBnS0yLKrowZGLUopgJ9tqsQUlfEpRvhaYqhUfTIwvlN0aDn/h3sHDc7qpf6JCagcj6GT9y78D1OfbLaxfE3Fb6ju12bKHY1frWr6ZFvZ1/5aBAa+FqCXkJAasszJjcP/nZ57Z5HjV1ppGYdgSAmVA9GTniCKNtfr+mo2bjhLy13o/rHGigung1HRswZkG7O7EyZuSqZAlTmfIVfA7C0NeEB1TqbIfbqi62yXaiJBlCvhqiO4CytbsWy+usRTag827gMLjUrrXLCq58mc4vO1lg38iGYSMzDbgsn5EWHvGtFSM2EPQdNdnxX1ONe+f4lCgFxG1Wv2H7WhIsSQDFdZGkJshdXmodPoiXDTZ85fibK9ad1UUzPo5soU1mgBLeXSsjs7ZejGZW1a3F9YNZnb/0B/Q5SlXKq6PTm0egZgJ+gZZSZDldmM7j0rgIqkbKIw2lm/bdoAoHjxnRzyMKmlHz7uEFb8V8O32LxybyeaeZ59bw+mM/mvbFao7BGf1RqGIked63l1KFlZuwoKWb1v8fbotCyf9f5WqFxhCk3DsUzAsG7Ru2x0zzo2U+r+ORd/yKHv1ISlRpsfyrnZ4npeiT9z/8V4IqXeYN5NzbZMa30gzzxgEPWUkNToFWPvMXtzpN5N50TM6UlMRQDBd+zqG7KH9ECJKy03PcDh0bgX6BYsYVOgJpalJ3WkYd9FyXOlxm4wOtNEFKPjYzhpPi9KKbkL6RZR5k3x2JmDybRHIRStvgtp7hanHhh00ZsmmXwtWachh3DwY/jFFBw3y5BA26zzJSkTiM8F24NWQioLnDwLLVoJNuievAh7rV/5wKI7hO/hgUlshXdlm3EpCdcWdcKM6bSsuxDWIXsVtrf5F+KwsDZ09rmxm6G/fcMwxLiubscl5Zg/U/wfcGyab3oAaolVh9eEVMOej8ZXBXrW7FaD0ErIJYUln2S9QDiinukFpSTcxbWmbfnQe3y2lqCL9tiO/D6GVJSmUXPHlSrZbANQoGg5+d+Iz19Q2Kul/iE2BHpTLPexpho6FoH0IB5FqBoRPXRofnxtLwQ0LI/LZD23p0leGxij1Dt/QX+GG08YYm1XdMoRWpOnDtOruZ5dBm+JwT8aJwinPDiBgELKPiXxRiZdxte8817n+e3JEY2wGf4ew+h1Nk2WymHLreWPbwPk4MdiJ0SgdbOc0/U+tLJkrFCkbHKiwfWjTRtUTWKAP31synSiplIuMKywb/ho/drNu6QDzpItHi4ebOune0/p9koFnF0cHwtW5vnCVr9iKzdttkaVLo1UiVbI53eBiWprVEqn85UqHZsxDxtOsBlDdLPUBhzammPmOAJa1HZFd8HMlgbuo6YI0eh+YmPevFyoUDshF+L4KHFFK+B6d14wuWZ7ebh2aL2BDbwQTdH73GxcQEwZQ/hmCHb1AlD0ndZGihO7fGVzWlJ7t/xAfk6DYg2PMlOMYf++HV+jpxGUXJZGPcZIApNi+irY58n8ZH7NR0PSRgUmejmSkSqdd5sQaK3C1SRGrRq6pKcn2CJpPDKxF5S5CcjtkJl0NfvRHnMRm8Iutn/kUzlH0YLsRR3HbwCkwrykntIzzNqUTlHbAnNBb8+FzKix3/UW4VwMj42dPXc+h88sSOKwOfeKwOFxvm6/xC9DpnDlRYxpDhY5AHzW8iuZ1ynbqIlZ/AV5Q0kIg/4USe+tP0MWbK5KIeJarBcatPi7THohQ8/he/fHBfO0Ot2mkHD84C5/sxH7T8wFw0++MAh6l1Ctkz0+PGiPv0RWlRJINa8ppJFcuQGBEcarxnfGtOI+DgMdGPjp5W/3mu9W0aiSCzF2GCv3FczVPPnQvKtR+3qeK6ndqQLoLv+hBX4U8HLYCU+3Wd7nNkiKBe7iAH/8md4YYdCaH7u/f0K3+cJ9rZ3xi8Zkhf9a094E4zDQ3GimK5/RbRfqL2ZcEgs+Mi6oTddvueGP1YfvCKU8S6S83b6fvgmp4rVM97Q0Ay4iR76ttV+fo1P7Pmc1OmUaDcJpthq8fUbe6r+rwbueQRRORkSDU/HwvcOj/KYwBpzDvoHvftGQa//JOq180kzpbxequxoY2kKN0vOeAfQ10+1+K2ZouqFazpnKFhKMCaFtdyAVHUpj+neVP51dN2LokKOS4TFRXushnz6ZBpl15Rj2HzkgSUYu7ssmNwl4+0E7ToOrM/xnTDoGuSJRXTv/EBRcGKPVL2k4qUe7eL3OQ8FYi6mTxMSFyDy3pK29aN9X6tlweWCXXHq603R+Qh/2y6N9CjJc37c56Z+SnP4WqTJvaq90Kt3kCK5p045XsX6IAyLKqLFHcu/prGjULxGiw8GJ9enwsRkuQ5UJ91HDy5u3d9C9NMDxPMavMNZEV+kWC+ZHmAW5vJ+Ea01alshqi5lmfFMrfUTdYoweWpn8uC8+d8a26CIt4kxHWRep2l+9Ym5tC+o/n+Fibbzg9hZueSb0ap2nzsrg9ojVnm3PyV8+pct6zNvyjpmfZQfld5KtN2ZU6mfsp/pJ7kPY/LS4YaOZJbJcfUyTPi8I666F/mA+WkREAPNOFWSwehMPve/mHYgwRtKJd5XVOfP81Dm1aBmS0mwvQ+/206Y+4RdxwDiLLmpBnSqkOhgFrwTawSECnEovfYFP/8mUv59fqakugQZmXu2qcnA71wP7iHPvI9kPUhStydW5i/iWHXdH2ZPIhGHnNjLNauNQ4PF9dTj4QwwoX2MRtED209oFaMJc6UPIuX3pQeXrEIrg0/cYy+h/0+tnS1tnv2B1tyR5ozbwYm2fEjvvrkPWgDe+UTRkN4RusxkfeD9nL76PjVk3bdaSrPZ2VxHkM4r5bu6N0djFa7rnSLvFQ6ljB2QbOScpwdfoDkpI83/Sk7XcSDqQdvKeVvo7Y4RBYZn06FVPqdO3AZXvtFcfb7B1INFKPxT7TlHeht/FRRutI+SPV4c3K4CE8K03biunHLsXF6NJ88Uck+qCnn6HRCPfb0rl1qq9MLqR+WoeWy8Wzpiba3iQoL8ASUTSGHaHP6K12s9tYZssF5Do/CEUHscjc15jIFCFk1YBnwirWjb0vRRG4IZQ/J/++RfUnSfsF/UOLNuhvUCsr2dyWM7PjojSyaFRfrkrJQpNzGLZGwCU8gsW8BUjZAnfoQ7Z8qT7qtEmFmwjjuQKVYDpFYmusu1nnK1u1yItyLR83yK+p9hyMm1BaJxvsqnPtui7ywZ4S/C0mBRULhplfaUqiKMz0+dVzdCtwJnPSVpwhhqs7GzvberMmc5fmWSojbEm37qdpk4G7k6CsHeOsprxGa8Zi+n5F5AbZuRZQP+GA1GUcIjaT8QSkwtlID4TFR6b5pS3BJHvqCXPnlGzJ+zpEQVMRLvtxrXJ4EsB4tJTzyI3nrrU7QUkSWoT8yA+95Ra223ZdbtCnc2bYHbH5D+/qWMvZBpojc2spa4FEtETKZYjzUjstnFHGQFZQR/k8CpA4M9d5AnUuCLheAitaO5JhWXBR03GlYg0sF50N0Zv7xZkt6S3MRBCQ7DZFEDWf3EgTbGYgNcNTLg/kd2xS+u00xIMRN6DQR1ToYUj+tK8WQeKYlnqAuqIVo8sHVibiQJM1chlTmotX5yoDmETAn/UISvIdk31DDQQiL54paqaPAdeJeH0tuzfo/WQDwqVL8QZ5f9vcE2ns3z4kjm54+2uOMpD94RMraeZvMzAVb71NpdtI8i9JuUUYqslzuCMfq2LKH07oirB3TClQXFjG6Nfl8z+weRVnikS4uUlvXTBZFliaTnozF0x9mV8tVHPgt0XKvdaaF5ypZmjo2y6C2UdTJXHbEbjr2AlEFvmFsvSfoNatFoiBGNxWIakxGvK34nOefH5qkeXlFvRneC0pYL0/enqSuOpMnftewdygJBL3/8EWrKfi5tDbZbqI9rF3cZotrrrUAIr0utD6O33x6NVgdRA7P4e4axBZAlmbwipEU5Kqu3wC1nSveeLF35FNmlRBZ71OUWc2rtBaqR7+dERxzdEdcctDUGV6FIbI9Lq2UueYTQfJAt9ZGsDtuqIxTVFXnQ7o6zHmaUHiJtmCZMV2Ntu0FG3tpNj00CekWY66g9cFy0/YofT/EiIZEtGPJ6Enw2StGtNNgj9FdiUgS/y/dj+Wwhj3KdlLJYjmVtMPUESullmrCidX70tAXgo/frItLnWGn3OVK39gh+fo6pROoq0pcWyPe7oPR0vD7rdSoyFLnRsnc9ubMsr6gXnGuybvq8kBa+UPCCfmtADZPLdtbvG2fflbEyoUXbVKxDZUUtcKhoTllrpo5SXrBe10mWSjwZdqv9cCdBWii8+LlM+F8oQeqDdrh2CVoZX2HyDh7Sx3hInSHssqW0rbPUYQtWPz22RDrhW5HWHwfbOnbD+a8VQnshnu+8BpnjRICJ04eCMLjuUkawcbc8U1om9L8QJ88/U0g9uQuO+yI7/1xZClmDVNY+UG3EAZL298FhYf//f4kyFoQXFxn3AAAAAElFTkSuQmCC" width="76" height="38" style="position: absolute; left: calc(50vw - 38px); bottom: 34px" /></div><div id="mount_0_0_xI"></div><script>qpl_inl("7252766289159758644","splash_screen_show");</script>
+<script type="application/json" data-content-len="91" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766289159758644","splash_screen_show"]]]}</script>
+
+<script type="application/json" data-content-len="91" data-sjs>{"require":[["injectQPLTagsServerJSIntoWindow","injectQPLTagsServerJSIntoWindow",null,[]]]}</script>
+<script type="application/json" data-content-len="97" data-sjs>{"require":[["injectQPLTimingsServerJSIntoWindow","injectQPLTimingsServerJSIntoWindow",null,[]]]}</script>
+<script>var hc=navigator&&navigator.hardwareConcurrency;null!=hc&&4>hc&&document.documentElement.classList.add("_8ykn");</script>
+<script>requireLazy(["replaceNativeTimer"],function(j){j()})</script>
+<script>requireLazy(["bootstrapWebSession"],function(j){j(1688666243)})</script>
+<script type="application/json" data-content-len="97" data-sjs>{"require":[["qplTagServerJS",null,null,[["react_fizz","comet_aa_coinflip:true","logged_out"]]]]}</script>
+<script>qpl_inl("7252766289159758644","tierOne");</script>
+<script type="application/json" data-content-len="80" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766289159758644","tierOne"]]]}</script>
+<script>qpl_inl("7252766289159758644-server","tierOne",111);</script>
+<script type="application/json" data-content-len="91" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766289159758644-server","tierOne",111]]]}</script>
+<script type="application/json" data-content-len="461" data-sjs>{"require":[["CometSSRFizzContentInjector","ssrInit",null,[{"cavalry_get_lid":"7252766289159758644","success_status":"success","disabled_status":"fail_ssr_disabled","bad_preloaders_status":"fail_bad_preloaders","unknown_boundaries_status":"fail_unknown_boundaries","ROOT":"root","eid":"mount_0_0_xI","should_ignore_static_id":false,"gks":{"comet_content_visibility_for_ssr":false,"comet_ssr_wait_for_dev":false,"ssr_killswitch":true,"mwp_ssr_enabled":true}}]]]}</script>
+<script>requireLazy(["JSScheduler"],function(j){j.makeSchedulerGlobalEntry(null,false)})</script>
+<script>requireLazy(["JSScheduler","ServerJS","ScheduledApplyEach"],function(JSScheduler,ServerJS,ScheduledApplyEach){qpl_inl("7252766289159758644","tierOneBeforeScheduler");JSScheduler.runWithPriority(3,function(){qpl_inl("7252766289159758644","tierOneInsideScheduler");(new ServerJS()).handleWithCustomApplyEach(ScheduledApplyEach,{"define":[["IntlCurrentLocale",[],{"code":"en_US"},5954],["CometPersistQueryParams",[],{"relative":{},"domain":{}},6231],["CookieDomain",[],{"domain":"threads.net"},6421],["JSSelfProfilerTrackedInteractions",[],{"interactions":[]},6918],["CurrentAdAccountInitialData",[],{"AD_ACCOUNT_ID":null},6828],["BootloaderConfig",[],{"deferBootloads":false,"jsRetries":[200,500],"jsRetryAbortNum":2,"jsRetryAbortTime":5,"silentDups":true,"hypStep4":true,"phdOn":false,"btCutoffIndex":51,"fastPathForAlreadyRequired":true,"earlyRequireLazy":false,"translationRetries":[200,500],"translationRetryAbortNum":3,"translationRetryAbortTime":50},329],["CSSLoaderConfig",[],{"timeout":5000,"modulePrefix":"BLCSS:","forcePollForBootloader":true},619],["CookieCoreConfig",[],{"csrftoken":{"t":31449600}},2104],["CurrentCommunityInitialData",[],{},490],["CurrentEnvironment",[],{"facebookdotcom":true,"messengerdotcom":false,"workplacedotcom":false,"instagramdotcom":true,"workdotmetadotcom":false},827],["CurrentUserInitialData",[],{"ACCOUNT_ID":"0","USER_ID":"0","NAME":"","SHORT_NAME":null,"IS_BUSINESS_PERSON_ACCOUNT":false,"HAS_SECONDARY_BUSINESS_PERSON":false,"IS_FACEBOOK_WORK_ACCOUNT":false,"IS_MESSENGER_ONLY_USER":false,"IS_DEACTIVATED_ALLOWED_ON_MESSENGER":false,"IS_MESSENGER_CALL_GUEST_USER":false,"IS_WORK_MESSENGER_CALL_GUEST_USER":false,"IS_WORKROOMS_USER":false,"APP_ID":"238260118697367","IS_BUSINESS_DOMAIN":false,"NON_FACEBOOK_USER_ID":"0","IS_INSTAGRAM_USER":1,"IG_USER_EIMU":"0"},270],["DTSGInitialData",[],{},258],["ISB",[],{},330],["LSD",[],{"token":"jP1sPXsXMjPheqtYkYfmtf"},323],["RelayAPIConfigDefaults",[],{"accessToken":"","actorID":"0","customHeaders":{"X-IG-App-ID":"238260118697367"},"enableNetworkLogger":false,"fetchTimeout":30000,"graphBatchURI":"\/api\/graphqlbatch\/","graphURI":"\/api\/graphql\/","retryDelays":[1000,3000],"useXController":true,"xhrEncoding":null,"subscriptionTopicURI":null,"withCredentials":false,"isProductionEndpoint":false,"workRequestTaggingProduct":null,"encryptionKeyParams":null},926],["ServerNonce",[],{"ServerNonce":"qjWVRzWl_yGZvNjKz4FgAf"},141],["SiteData",[],{"server_revision":1007796774,"client_revision":1007796774,"tier":"","push_phase":"C3","pkg_cohort":"HYP:barcelona_web_pkg","haste_session":"19544.HYP:barcelona_web_pkg.2.1..0.0","pr":1,"haste_site":"www","manifest_base_uri":"https:\/\/static.xx.fbcdn.net","manifest_origin":null,"manifest_version_prefix":null,"be_one_ahead":true,"is_rtl":false,"is_comet":true,"is_experimental_tier":false,"is_jit_warmed_up":true,"hsi":"7252766289159758644","semr_host_bucket":"6","bl_hash_version":2,"skip_rd_bl":true,"comet_env":29,"wbloks_env":false,"spin":4,"__spin_r":1007796774,"__spin_b":"trunk","__spin_t":1688666243,"vip":"2a03:2880:f248:1c9:face:b00c:0:43fe"},317],["SprinkleConfig",[],{"param_name":"jazoest","version":2,"should_randomize":false},2111],["PromiseUsePolyfillSetImmediateGK",[],{"www_always_use_polyfill_setimmediate":false},2190],["KSConfig",[],{"killed":{"__set":["MLHUB_FLOW_AUTOREFRESH_SEARCH","NEKO_DISABLE_CREATE_FOR_SAP","WORKPLACE_DISPLAY_TEXT_EVIDENCE_REPORTING","BUSINESS_INVITE_FLOW_WITH_SELLER_PROFILE","BUSINESS_GRAPH_SETTING_APP_ASSIGNED_USERS_NEW_API","BUSINESS_GRAPH_SETTING_BU_ASSIGNED_USERS_NEW_API","BUSINESS_GRAPH_SETTING_ESG_ASSIGNED_USERS_NEW_API","BUSINESS_GRAPH_SETTING_PRODUCT_CATALOG_ASSIGNED_USERS_NEW_API","BUSINESS_GRAPH_SETTING_SESG_ASSIGNED_USERS_NEW_API","BUSINESS_GRAPH_SETTING_WABA_ASSIGNED_USERS_NEW_API","FORCE_FETCH_BOOSTED_COMPONENT_AFTER_ADS_CREATION","VIDEO_DIMENSIONS_FROM_PLAYER_IN_UPLOAD_DIALOG","SNIVY_GROUP_BY_EVENT_TRACE_ID_AND_NAME","ADS_STORE_VISITS_METRICS_DEPRECATION","AD_DRAFT_ENABLE_SYNCRHONOUS_FRAGMENT_VALIDATION","SEPARATE_MESSAGING_COMACTIVITY_PAGE_PERMS","LAB_NET_NEW_UI_RELEASE","POCKET_MONSTERS_CREATE","POCKET_MONSTERS_DELETE","WORKPLACE_PLATFORM_SECURE_APPS_MAILBOXES","POCKET_MONSTERS_UPDATE_NAME","IC_DISABLE_MERGE_TOOL_FEED_CHECK_FOR_REPLACE_SCHEDULE","ADS_EPD_IMPACTED_ADVERTISER_MIGRATE_XCONTROLLER","BIZ_INBOX_POP_UP_TIP_NAVIGATION_BUG_FIX","SRT_REVIEW_DISABLE_FELLOWSHIP_REVIEW","EO_STORE_HOME_PAGE_COVID19_BANNER","TPA_SRT_TRANSLATION","WORKROOMS_REQUEST_TAGGING_TAG_NO_INIT_BY_VC_GALAXY"]},"ko":{"__set":["3OsLvnSHNTt","1G7wJ6bJt9K","8NAceEy9JZo","7FOIzos6XJX","4j36SVzvP3w","4NSq3ZC4ScE","53gCxKq281G","3yzzwBY7Npj","1onzIv0jH6H","8PlKuowafe8","4SIH2GRVX5W","2dhqRnqXGLQ","2WgiNOrHVuC","amKHb4Cw4WI","8rDvN9vWdAK","5BdzWGmfvrA","DDZhogI19W","acrJTh9WGdp","1oOE64fL4wO","5XCz1h9Iaw3","7r6mSP7ofr2","6DGPLrRdyts","aWxCyi1sEC7","awYA7fn2Bse","aBMlJ8QRPWE","Fl3bH3ozLe","3sKizTQ6byg","6XsXQ2qHw8y"]}},2580],["TimeSliceInteractionSV",[],{"on_demand_reference_counting":true,"on_demand_profiling_counters":true,"default_rate":1000,"lite_default_rate":100,"interaction_to_lite_coinflip":{"ADS_INTERFACES_INTERACTION":0,"ads_perf_scenario":0,"ads_wait_time":0,"Event":1},"interaction_to_coinflip":{"ADS_INTERFACES_INTERACTION":1,"ads_perf_scenario":1,"ads_wait_time":1,"Event":100},"enable_heartbeat":true,"maxBlockMergeDuration":0,"maxBlockMergeDistance":0,"enable_banzai_stream":true,"user_timing_coinflip":50,"banzai_stream_coinflip":0,"compression_enabled":true,"ref_counting_fix":false,"ref_counting_cont_fix":false,"also_record_new_timeslice_format":false,"force_async_request_tracing_on":false},2609],["CurrentBusinessUser",[],{"business_id":null,"business_persona_id":null,"business_role":null,"business_user_id":null,"businessAccountName":null,"email":null,"first_name":null,"ip_permission":null,"isBusinessPerson":false,"isFacebookWorkAccount":false,"isInstagramBusinessPerson":false,"isEnterpriseBusiness":false,"shouldHideComponentsByUnsupportedFirstPartyTools":false,"shouldShowAccountSwitchComponents":false,"isUserOptInAccountSwitchInfraUpgrade":false,"business_profile_pic_url":null,"enterprise_profile_pic_url":null,"isTwoFacNewFlow":false,"last_name":null,"personal_user_id":"0","is_ads_feature_limited":null,"is_business_banhammered":null,"expiry_time":null,"has_verified_email":null,"permitted_business_account_task_ids":[]},2654],["JSErrorLoggingConfig",[],{"appId":238260118697367,"extra":[],"reportInterval":50,"sampleWeight":1,"sampleWeightKey":"__jssesw","projectBlocklist":[]},2776],["CookieCoreLoggingConfig",[],{"maximumIgnorableStallMs":16.67,"sampleRate":9.7e-5,"sampleRateClassic":1.0e-10,"sampleRateFastStale":1.0e-8},3401],["ImmediateImplementationExperiments",[],{"prefer_message_channel":true},3419],["DTSGInitData",[],{"token":"","async_get_token":""},3515],["UriNeedRawQuerySVConfig",[],{"uris":["dms.netmng.com","doubleclick.net","r.msn.com","watchit.sky.com","graphite.instagram.com","www.kfc.co.th","learn.pantheon.io","www.landmarkshops.in","www.ncl.com","s0.wp.com","www.tatacliq.com","bs.serving-sys.com","kohls.com","lazada.co.th","xg4ken.com","technopark.ru","officedepot.com.mx","bestbuy.com.mx","booking.com","nibio.no"]},3871],["InitialCookieConsent",[],{"deferCookies":false,"initialConsent":[1,2],"noCookies":false,"shouldShowCookieBanner":false},4328],["JSSelfProfilerConfig",[],{"SAMPLE_INTERVAL":10,"MAX_BUFFER_SIZE":3000,"WARMUP_RESTART_INTERVAL":300000,"SAMPLE_RATE":1000},4360],["WebConnectionClassServerGuess",[],{"connectionClass":"EXCELLENT"},4705],["CometAltpayJsSdkIframeAllowedDomains",[],{"allowed_domains":["https:\/\/live.adyen.com","https:\/\/integration-facebook.payu.in","https:\/\/facebook.payulatam.com","https:\/\/secure.payu.com","https:\/\/facebook.dlocal.com","https:\/\/buy2.boku.com"]},4920],["QuickMarkersConfig",[],{"pageLoadEventId":"7252766289159758644","pageLoadScriptPath":"IGXBarcelonaPostController","sampleWeight":null},4953],["BootloaderEndpointConfig",[],{"debugNoBatching":false,"maxBatchSize":-1,"endpointURI":"https:\/\/www.threads.net\/ajax\/bootloader-endpoint\/"},5094],["CookieConsentIFrameConfig",[],{"consent_param":"FQAREhISAA==.ARYhz6f1gY6sHz3Ai_Z1DagGH85wLy0FDGpvm6fcLcUcTvu_","allowlisted_iframes":[]},5540],["USIDMetadata",[],{"browser_id":"?","tab_id":"","page_id":"Prxdz7n95th0t","transition_id":0,"version":6},5888],["ServerTimeData",[],{"serverTime":1688666243765,"timeOfRequestStart":1688666243673.8,"timeOfResponseStart":1688666243758.1},5943],["InstagramUserAgent",[],{"is_chrome":false,"is_edge":false,"is_edge_chromium_based":false,"is_edge_legacy":false,"is_firefox":false,"is_ig_carbon":false,"is_ig_lite":false,"is_ig_webview":false,"is_barcelona_webview":false,"is_igtv_webview":false,"is_in_app_browser":false,"is_ios":false,"is_ipad":false,"is_macos":false,"is_mobile":false,"is_mobile_safari":false,"is_oculus_browser":false,"is_opera":false,"is_safari":false,"is_supported_browser":false,"is_twitter_webview":false,"is_uc_browser":false,"is_vapid_eligible":false,"is_webview":false,"user_agent":"curl\/8.1.2"},6088],["IntlVariationHoldout",[],{"disable_variation":false},6533],["CometUrlTransformsConfig",[],{"should_remove_trailing_slash":true},6589],["RtiWebRequestStreamClient",[],{"ThrottledMethods":{},"overrideHeaders":{}},6639],["IntlNumberTypeProps",["IntlCLDRNumberType05"],{"module":{"__m":"IntlCLDRNumberType05"}},7027],["FbtResultGK",[],{"shouldReturnFbtResult":true,"inlineMode":"NO_INLINE"},876],["IntlPhonologicalRules",[],{"meta":{},"patterns":{}},1496],["IntlViewerContext",[],{"GENDER":3,"regionalLocale":null},772],["LinkshimHandlerConfig",[],{"supports_meta_referrer":false,"default_meta_referrer_policy":"default","switched_meta_referrer_policy":"origin","non_linkshim_lnfb_mode":"ie","link_react_default_hash":"AT1nd9kTStMInXGf69sQAx0a-c0H0wGiARIOxptB3P3lJ5E97SRHXxe0eeFd5cQnEYeSN_RrsjCFFT-GbAHZOY0tpxKiGCd0BBnz13CwLFuUCUc77brOGPnzPLtxRkrT4HyI0g","untrusted_link_default_hash":"AT0BodX0V5xkt-Gglvxbm5Vq7P2Guhu6d6A7dwMn_lOlMyrFG0l5YfKHvUH3Yo0puGBQyC1NN7vy2fYMQAZk3oUdy5Y82o9dtlRZkYsc0rbmhCE48bNn9yMRCiSpqvq9XVmv4g","linkshim_host":"l.instagram.com","linkshim_path":"\/","linkshim_enc_param":"e","linkshim_url_param":"u","use_rel_no_opener":false,"use_rel_no_referrer":false,"always_use_https":false,"onion_always_shim":true,"middle_click_requires_event":false,"www_safe_js_mode":"hover","m_safe_js_mode":null,"ghl_param_link_shim":false,"click_ids":null,"is_linkshim_supported":false,"current_domain":"threads.net","blocklisted_domains":["ad.doubleclick.net","ads-encryption-url-example.com","bs.serving-sys.com","ad.atdmt.com","adform.net","ad13.adfarm1.adition.com","ilovemyfreedoms.com","secure.adnxs.com"],"is_mobile_device":false},27],["NumberFormatConfig",[],{"decimalSeparator":",","numberDelimiter":".","minDigitsForThousandsSeparator":4,"standardDecimalPatternInfo":{"primaryGroupSize":3,"secondaryGroupSize":3},"numberingSystemData":null},54],["UserAgentData",[],{"browserArchitecture":"32","browserFullVersion":"8.1.2","browserMinorVersion":1,"browserName":"Curl","browserVersion":8,"deviceName":"Unknown","engineName":"Unknown","engineVersion":null,"platformArchitecture":"32","platformName":"Unknown","platformVersion":null,"platformFullVersion":null},527],["ZeroCategoryHeader",[],{},1127],["ZeroRewriteRules",[],{"rewrite_rules":{},"whitelist":{"\/hr\/r":1,"\/hr\/p":1,"\/zero\/unsupported_browser\/":1,"\/zero\/policy\/optin":1,"\/zero\/optin\/write\/":1,"\/zero\/optin\/legal\/":1,"\/zero\/optin\/free\/":1,"\/about\/privacy\/":1,"\/about\/privacy\/update\/":1,"\/privacy\/explanation\/":1,"\/zero\/toggle\/welcome\/":1,"\/zero\/toggle\/nux\/":1,"\/zero\/toggle\/settings\/":1,"\/fup\/interstitial\/":1,"\/work\/landing":1,"\/work\/login\/":1,"\/work\/email\/":1,"\/ai.php":1,"\/js_dialog_resources\/dialog_descriptions_android.json":0,"\/connect\/jsdialog\/MPlatformAppInvitesJSDialog\/":0,"\/connect\/jsdialog\/MPlatformOAuthShimJSDialog\/":0,"\/connect\/jsdialog\/MPlatformLikeJSDialog\/":0,"\/qp\/interstitial\/":1,"\/qp\/action\/redirect\/":1,"\/qp\/action\/close\/":1,"\/zero\/support\/ineligible\/":1,"\/zero_balance_redirect\/":1,"\/zero_balance_redirect":1,"\/zero_balance_redirect\/l\/":1,"\/l.php":1,"\/lsr.php":1,"\/ajax\/dtsg\/":1,"\/checkpoint\/block\/":1,"\/exitdsite":1,"\/zero\/balance\/pixel\/":1,"\/zero\/balance\/":1,"\/zero\/balance\/carrier_landing\/":1,"\/zero\/flex\/logging\/":1,"\/tr":1,"\/tr\/":1,"\/sem_campaigns\/sem_pixel_test\/":1,"\/bookmarks\/flyout\/body\/":1,"\/zero\/subno\/":1,"\/confirmemail.php":1,"\/policies\/":1,"\/mobile\/internetdotorg\/classifier\/":1,"\/zero\/dogfooding":1,"\/xti.php":1,"\/zero\/fblite\/config\/":1,"\/hr\/zsh\/wc\/":1,"\/ajax\/bootloader-endpoint\/":1,"\/mobile\/zero\/carrier_page\/":1,"\/mobile\/zero\/carrier_page\/education_page\/":1,"\/mobile\/zero\/carrier_page\/feature_switch\/":1,"\/mobile\/zero\/carrier_page\/settings_page\/":1,"\/aloha_check_build":1,"\/upsell\/zbd\/softnudge\/":1,"\/mobile\/zero\/af_transition\/":1,"\/mobile\/zero\/af_transition\/action\/":1,"\/mobile\/zero\/freemium\/":1,"\/mobile\/zero\/freemium\/redirect\/":1,"\/mobile\/zero\/freemium\/zero_fup\/":1,"\/privacy\/policy\/":1,"\/privacy\/center\/":1,"\/data\/manifest\/":1,"\/4oh4.php":1,"\/autologin.php":1,"\/birthday_help.php":1,"\/checkpoint\/":1,"\/contact-importer\/":1,"\/cr.php":1,"\/legal\/terms\/":1,"\/login.php":1,"\/login\/":1,"\/mobile\/account\/":1,"\/n\/":1,"\/remote_test_device\/":1,"\/upsell\/buy\/":1,"\/upsell\/buyconfirm\/":1,"\/upsell\/buyresult\/":1,"\/upsell\/promos\/":1,"\/upsell\/continue\/":1,"\/upsell\/h\/promos\/":1,"\/upsell\/loan\/learnmore\/":1,"\/upsell\/purchase\/":1,"\/upsell\/promos\/upgrade\/":1,"\/upsell\/buy_redirect\/":1,"\/upsell\/loan\/buyconfirm\/":1,"\/upsell\/loan\/buy\/":1,"\/upsell\/sms\/":1,"\/wap\/a\/channel\/reconnect.php":1,"\/wap\/a\/nux\/wizard\/nav.php":1,"\/wap\/appreg.php":1,"\/wap\/birthday_help.php":1,"\/wap\/c.php":1,"\/wap\/confirmemail.php":1,"\/wap\/cr.php":1,"\/wap\/login.php":1,"\/wap\/r.php":1,"\/zero\/datapolicy":1,"\/a\/timezone.php":1,"\/a\/bz":1,"\/bz\/reliability":1,"\/r.php":1,"\/mr\/":1,"\/reg\/":1,"\/registration\/log\/":1,"\/terms\/":1,"\/f123\/":1,"\/expert\/":1,"\/experts\/":1,"\/terms\/index.php":1,"\/terms.php":1,"\/srr\/":1,"\/msite\/redirect\/":1,"\/fbs\/pixel\/":1,"\/contactpoint\/preconfirmation\/":1,"\/contactpoint\/cliff\/":1,"\/contactpoint\/confirm\/submit\/":1,"\/contactpoint\/confirmed\/":1,"\/contactpoint\/login\/":1,"\/preconfirmation\/contactpoint_change\/":1,"\/help\/contact\/":1,"\/survey\/":1,"\/upsell\/loyaltytopup\/accept\/":1,"\/settings\/":1,"\/lite\/":1,"\/zero_status_update\/":1,"\/operator_store\/":1,"\/upsell\/":1,"\/wifiauth\/login\/":1}},1478],["WebDevicePerfClassData",[],{"deviceLevel":"unknown","yearClass":null},3665],["FBDomainsSVConfig",[],{"domains":{"__map":[["www.facebook.com",1],["tfbnw.net",1],["m.beta.facebook.com",1],["touch.beta.facebook.com",1],["www.dev.facebook.com",1],["fb.me",1],["s.fb.com",1],["m.fbjs.facebook.com",1],["facebook.com.es",1],["www.fbjs.facebook.com",1],["m.facebook.com",1],["facebook.fr",1],["fbsbx.com",1],["embed.fbsbx.com",1],["attachment.fbsbx.com",1],["lookaside.fbsbx.com",1],["web.facebook.com",1],["fb.com",1],["messenger.com",1],["secure.facebook.com",1],["secure.my-od.facebook.com",1],["www.my-od.facebook.com",1]]}},3828],["ClickIDDomainBlacklistSVConfig",[],{"domains":["craigslist","tfbnw.net","flashtalking.com","canadiantire.ca","o2.co.uk","archive.org","reddit.com","redd.it","gmail.com","cvk.gov.ua","electoralsearch.in","yahoo.com","cve.mitre.org","usenix.org","ky.gov","voteohio.gov","vote.pa.gov","oversightboard.com","wi.gov","pbs.twimg.com","media.discordapp.net","vastadeal.com","theaustralian.com.au","alloygator.com","elsmannimmobilien.de","news.com.au","dennisbonnen.com","stoett.com","investorhour.com","perspectivasur.com","bonnegueule.fr","firstent.org","twitpic.com","kollosche.com.au","nau.edu","arcourts.gov","lomberg.de","network4.hu","balloonrace.com","awstrack.me","ic3.gov","sos.wyo.gov","cnpq.br","0.discoverapp.com","apple.com","apple.co","dinn.com.mx","soriana.com"]},3829],["CometDarkModeSetting",[],{"initialGuessForDarkModeOnClient":false,"initialClientStateGuess":false,"initialSetting":"UNDECLARED"},4414],["CometCustomKeyCommands",[],{"customCommands":{},"areSingleKeysDisabled":null,"modifiedKeyboardShortcutsPreference":4},4521],["CometRelayConfig",[],{"gc_release_buffer_size":50},4685],["TimeSpentWWWCometConfig",[],{"CONFIG":{"0_delay":0,"0_timeout":8,"delay":1000,"timeout":64}},4748],["CometMaxEnqueuedToastsSitevarConfig",[],{"max":2},4763],["MqttWebDeviceID",[],{"clientID":"955f6d02-0ef6-4113-b9c5-133307e20481"},5003],["LiveQueryWebRelayKillList",[],{"liveQueryWebRelayKillList":["test_example_config_id_to_be_killed","data_studio_nav_pane_collections_section","work_recruiting_home_tasks"]},5050],["WebDriverConfig",[],{"isTestRunning":false,"isJestE2ETestRun":false,"isXRequestConfigEnabled":false,"auxiliaryServiceInfo":{},"testPath":null,"originHost":null},5332],["LiveQueryWebClientPollingSwitchList",[],{"liveQueryWebClientPollingSwitchList":{"example_config_id_to_be_switched":10000}},5842],["FbtQTOverrides",[],{"overrides":{}},551],["TransportSelectingClientContextualConfig",[],{"rawConfig":"{\"name\":\"rti\/web_rs_transport_selecting_client\",\"cctype\":\"dense\",\"version\":1,\"policy_id\":\"static\",\"sample_rate\":1000,\"contexts\":[{\"name\":\"method\",\"type\":\"STRING\",\"callsite\":true,\"buckets\":[{\"name\":\"rollout_group_1\",\"strategy\":\"in\",\"values\":[\"FBGQLS:FEEDBACK_LIKE_SUBSCRIBE\",\"Falco\",\"FBLQ:comet_notifications_live_query_experimental\"]},{\"name\":\"rollout_group_6\",\"strategy\":\"in\",\"values\":[\"FBGQLS:COMMENT_CREATE_SUBSCRIBE\",\"FBGQLS:COMMENT_LIKE_SUBSCRIBE\",\"FBGQLS:FEEDBACK_COMMENT_PERMISSION_TOGGLE_SUBSCRIBE\",\"FBGQLS:FEEDBACK_TYPING_SUBSCRIBE\"]},{\"name\":\"rollout_group_4\",\"strategy\":\"regex\",\"values\":[\"FBGQLS:.*\"]},{\"name\":\"rollout_group_3\",\"strategy\":\"regex\",\"values\":[\"FBLQ:.*\"]},{\"name\":\"skywalker\",\"strategy\":\"in\",\"values\":[\"SKY:test_topic\",\"live\/api\/copyright\",\"intern_notify\",\"locplat\/ttm\",\"rti_widget_dashboard\",\"srt\/user_metrics_counter\",\"media_manager_instagram_composer_create_update\",\"cubism_annotations\/fleet_health\",\"srt\/notifications\",\"ads\/reporting\/snapshot\",\"unidash\/widget\",\"cubism_annotations\",\"ads\/reporting\/export\",\"pubx\/notification\/update\",\"ads\/powereditor\/import\",\"lwi_async_create\",\"video_edit\",\"metric_graph_realtime\",\"vcc_video_posting_www\",\"cms\/object_archive_copy_created\",\"cms\/branch_updated\",\"cms\/object_saved\",\"codeless_event_tracking\",\"srt\/job_updated\",\"video_broadcast\",\"video\/broadcast\/error\",\"vcpanel\/api\",\"lwi_everywhere_plugin\",\"commercial_break_v2\",\"advanced_analytics\/query\",\"cubism_annotations\/ads_mastercook_models\",\"gqls\/comment_like_subscribe\",\"live\/api\/copyright\",\"shiba\/mock_bot_error\",\"shiba\/save_state\",\"video_list_publishing_progress_update\",\"assistant_wizard\",\"gizmo\/manage\",\"collab\/presentation\/request\",\"snaptu\/push_notif\"]},{\"name\":\"skywalker_bulletin\",\"strategy\":\"in\",\"values\":[\"www\/sr\/hot_reload\"]},{\"name\":\"rollout_group_5\",\"strategy\":\"regex\",\"values\":[\"Collabri|RealtimeClientSync:.*\"]},{\"name\":\"default\",\"strategy\":\"catch_all\"}]}],\"outputs\":[{\"name\":\"group\",\"type\":\"STRING\"},{\"name\":\"dgwUpsampleMultiplier\",\"type\":\"FLOAT\"}],\"vector\":[\"group1\",\"0.01\",\"group6\",\"0.001\",\"group4\",\"1.0\",\"group3\",\"1.0\",\"skywalker\",\"1.0\",\"skywalker_bulletin\",\"1.0\",\"group5\",\"1.0\",\"default_group\",\"1.0\"],\"vectorDefaults\":[\"default_group\",\"1.0\"],\"timestamp\":1663366072}"},5968],["AnalyticsCoreData",[],{"device_id":"$^|Acb3cumc8eJfFqI0FqNPG-gpJxk-2AMkJBqiMep3D1HdwXch_T-353AX-YSR1OTi6EeK4ZQyNNB9tVuqZWqt1ZYtbUHrshNbF6zJNxjZY5NYTcqpIOMg7X0bi4UkKOFuLniXyvfwLHIjhCre5RbT1F6sU7Lk|fd.AcaETcALErJq3giUXbW5UFoBLRoebCJuzJGs3fouZmxWgnLhDdHDpIX0vpW27oCYLy59wH-JW0FL2ww02vHQFriD","app_id":"238260118697367","enable_bladerunner":false,"enable_ack":true,"push_phase":"C3","enable_observer":false,"enable_cmcd_observer":false,"enable_dataloss_timer":false,"enable_fallback_for_br":true,"queue_activation_experiment":true,"max_delay_br_queue":60000,"max_delay_br_queue_immediate":3,"consents":{},"app_universe":1,"br_stateful_batching_exp":true,"enable_br_stateful_batching":false,"identity":{"appScopedIdentity":"","claim":"hmac.AR3UwyKLQlxkidd1krryXe3z7R07Qf3M2CwzkJOCccPtsZJD"}},5237],["cr:70",["FBInteractionTracingDependencies"],{"__rc":["FBInteractionTracingDependencies","Aa2DNDAgcItBI0isOzz5yuIt_RbMLyzzt3LrYfq6oTyFRbnrDHqIYhfqp7WQDe1NI-3qy_KlUGoWEOQHVRm7ikZMoEULsD8Z2w"]},-1],["cr:449",["vc-tracker"],{"__rc":["vc-tracker","Aa3834VJ0okABw5gO1isOE0XVLbE4nKyGPzS6IalWTYgjXeFFNd9yx_rCFM8kmtyGp8FaqPMwh1Q4iKHAPaGh0erZ9Tu9G6x9bwZa0lnXw9r"]},-1],["cr:686",[],{"__rc":[null,"Aa0LfKL_hVnlTLMRITfEfyzaifswmQzGDshj-i2KAgP4jcYxRseps6lgSXX2cMFD5HhQUUNoA4pugoKyzpJlJWnlug"]},-1],["cr:734",[],{"__rc":[null,"Aa1HDcjP4ONv2YFvNt94-jj3wIa4w_xBrMgvUm54Z15i0vRZ-0C1SPQ4IJKFsbtGeSp-Om6dnIyO1Ob21k6zEtnEr-idgzsqccnWkFw"]},-1],["cr:1126",["TimeSliceSham"],{"__rc":["TimeSliceSham","Aa0GF2cgPoKUf--52LJufBw5H0YCqZlQk4_igMeqC-gQ95sReYDByzKF6bqNUSFzwIzGH2fgEB-GlCK7ZGRCr70"]},-1],["cr:3798",[],{"__rc":[null,"Aa0vQ2Fl0rsKxoRORsXOlNgFyJXzwyv1V1WKqwnBTDX82IMnpMeR_EkV4_2MGmd_sUoA48zpH4jbBcNqJqNW2aiiXMsvPYZLkto"]},-1],["cr:6640",[],{"__rc":[null,"Aa1hZaHKrLgKTCa2w1RzeFUVXujbBd4U2oNzhNqVbdU2PbcfA8HwZrwZLWLPSaNQLQPTXMrfz6BtJN0kDAYXvz1fsZfv1A"]},-1],["cr:683059",["CometVisualCompletion"],{"__rc":["CometVisualCompletion","Aa3834VJ0okABw5gO1isOE0XVLbE4nKyGPzS6IalWTYgjXeFFNd9yx_rCFM8kmtyGp8FaqPMwh1Q4iKHAPaGh0erZ9Tu9G6x9bwZa0lnXw9r"]},-1],["cr:696703",["JSScheduler"],{"__rc":["JSScheduler","Aa3FtHkyy8y3V6nYWEHAumALQz6t1GuDk6-j-x5LyLhdBr34-z3OwGfXPR7DN3zL6aoGcZWTuu3DPsNfggIJoUw8-E8"]},-1],["cr:719780",[],{"__rc":[null,"Aa06ml6CpzupPHCHb9r9WKNt9YS-pffQ1RMW_p2dmB6nWkp7ur_lq2BUFpGENVcznZ5izhLx_PASlIX-2w0"]},-1],["cr:806696",["clearTimeoutComet"],{"__rc":["clearTimeoutComet","Aa3FtHkyy8y3V6nYWEHAumALQz6t1GuDk6-j-x5LyLhdBr34-z3OwGfXPR7DN3zL6aoGcZWTuu3DPsNfggIJoUw8-E8"]},-1],["cr:807042",["setTimeoutComet"],{"__rc":["setTimeoutComet","Aa3FtHkyy8y3V6nYWEHAumALQz6t1GuDk6-j-x5LyLhdBr34-z3OwGfXPR7DN3zL6aoGcZWTuu3DPsNfggIJoUw8-E8"]},-1],["cr:896461",["setIntervalComet"],{"__rc":["setIntervalComet","Aa3FtHkyy8y3V6nYWEHAumALQz6t1GuDk6-j-x5LyLhdBr34-z3OwGfXPR7DN3zL6aoGcZWTuu3DPsNfggIJoUw8-E8"]},-1],["cr:896462",["setIntervalComet"],{"__rc":["setIntervalComet","Aa3FtHkyy8y3V6nYWEHAumALQz6t1GuDk6-j-x5LyLhdBr34-z3OwGfXPR7DN3zL6aoGcZWTuu3DPsNfggIJoUw8-E8"]},-1],["cr:925100",["RunComet"],{"__rc":["RunComet","Aa3FtHkyy8y3V6nYWEHAumALQz6t1GuDk6-j-x5LyLhdBr34-z3OwGfXPR7DN3zL6aoGcZWTuu3DPsNfggIJoUw8-E8"]},-1],["cr:986633",["setTimeoutComet"],{"__rc":["setTimeoutComet","Aa3FtHkyy8y3V6nYWEHAumALQz6t1GuDk6-j-x5LyLhdBr34-z3OwGfXPR7DN3zL6aoGcZWTuu3DPsNfggIJoUw8-E8"]},-1],["cr:1003267",["clearIntervalComet"],{"__rc":["clearIntervalComet","Aa3FtHkyy8y3V6nYWEHAumALQz6t1GuDk6-j-x5LyLhdBr34-z3OwGfXPR7DN3zL6aoGcZWTuu3DPsNfggIJoUw8-E8"]},-1],["cr:1108857",[],{"__rc":[null,"Aa0nWfUWoPuX5qJ71hkCdTdlS9mnls_OS6WMA_arDvFb9lgmo6OTRDPxzAwcmPj5dTrT_zU93FS4qRKb6Q"]},-1],["cr:1294158",["React.classic"],{"__rc":["React.classic","Aa0KKC96n83LTa7w2s9Azj2FsnwEcYlvqS-EZAfIl3AWLYeSbmeyH70IBm4O_joZDUUeg8m_v-Sa0rJnCChVl3gnIh7r"]},-1],["cr:1294159",["ReactDOM.classic"],{"__rc":["ReactDOM.classic","Aa0KKC96n83LTa7w2s9Azj2FsnwEcYlvqS-EZAfIl3AWLYeSbmeyH70IBm4O_joZDUUeg8m_v-Sa0rJnCChVl3gnIh7r"]},-1],["cr:1540330",[],{"__rc":[null,"Aa0IcvIy5_SRq_w6dZX7ARy9uvx8Qutfl-Q3kCRv194V-25sEa2KFfOlTkJ9wVDiWYdXAODBFfY73lMjF37mLkTERurT_U4RF5MnKlsPAboEits8tg"]},-1],["cr:1642797",["BanzaiComet"],{"__rc":["BanzaiComet","Aa3FtHkyy8y3V6nYWEHAumALQz6t1GuDk6-j-x5LyLhdBr34-z3OwGfXPR7DN3zL6aoGcZWTuu3DPsNfggIJoUw8-E8"]},-1],["cr:1703077",[],{"__rc":[null,"Aa2tXCXJWAsCf53bV8mouN0JXXjLBT3rpKMEuqIswf4AWIreWPHVLsc-S4fqfcjUkLuyLn0ZwutZ-9Nz5NElY5GOQcGoqQ"]},-1],["cr:1984081",[],{"__rc":[null,"Aa2gM6D95TJhWD6vXpkh6M51tnEfwfzJAeYXJI1O6ivz-eiKHjMaoXrNPLJvFVymzoLufgpWe3iAleX-IVtZ2AoJ7qUp"]},-1],["cr:2010754",[],{"__rc":[null,"Aa2c0eg0cvOySPUjElBo5XmbhnOxxyia7G0t0HhStZNgP6yKq9Ym-v-qC9Bw4CsgUbbnVnDyDGN9WGBoZFJDmUgJBDPG4ME"]},-1],["cr:69",["CometRouterFocusRegion.react"],{"__rc":["CometRouterFocusRegion.react","Aa0KKC96n83LTa7w2s9Azj2FsnwEcYlvqS-EZAfIl3AWLYeSbmeyH70IBm4O_joZDUUeg8m_v-Sa0rJnCChVl3gnIh7r"]},-1],["cr:267",[],{"__rc":[null,"Aa0eO0twYhth2vx-WT0MI1xqKAqipCJwWRTNinbj67HMduUkLFdSfgvDiUxoge06ug55EX-jz5XQwBKXD1AEpvjZPu3RBPCUHN-sBw"]},-1],["cr:641",["handleCometErrorCodeSideEffects"],{"__rc":["handleCometErrorCodeSideEffects","Aa3n7wNCo-J_jlc0Yw_B9O6NAmPNMM4qK3TiPdqbYnx7Wa15jsnshnxJzWJceS9yRzLkE-QjnATldF6VptCvua4HAnzpbyFEgTHM3G_J"]},-1],["cr:795",[],{"__rc":[null,"Aa1mSXsGgKnBhx4ezlT86F4q0Bb4Fj8IXGLNcb6UN6HeeEHUKXo8a0EKhVc5Y_qi7f6LvSy0ror9ZUBfDYkdoQufNwM-7-WGEQ"]},-1],["cr:805",["CometDialogErrorRoot.react"],{"__rc":["CometDialogErrorRoot.react","Aa0KKC96n83LTa7w2s9Azj2FsnwEcYlvqS-EZAfIl3AWLYeSbmeyH70IBm4O_joZDUUeg8m_v-Sa0rJnCChVl3gnIh7r"]},-1],["cr:851",[],{"__rc":[null,"Aa37tZ0jLioAFLywWceMYk5uJEg6XSFxVVAdKOLn2tyfX2XjFaHSnMQVNo755gke3Pkbcy8YTv2uqLFNZBltVHzXD3atdF31Xw"]},-1],["cr:866",[],{"__rc":[null,"Aa0LfKL_hVnlTLMRITfEfyzaifswmQzGDshj-i2KAgP4jcYxRseps6lgSXX2cMFD5HhQUUNoA4pugoKyzpJlJWnlug"]},-1],["cr:945",[],{"__rc":[null,"Aa37tZ0jLioAFLywWceMYk5uJEg6XSFxVVAdKOLn2tyfX2XjFaHSnMQVNo755gke3Pkbcy8YTv2uqLFNZBltVHzXD3atdF31Xw"]},-1],["cr:1024",[],{"__rc":[null,"Aa35qPWRFepAc-2GDQjRrEevytmfppGyhmc8WSAKl6aVWyLIwBVEsmQYbhV5YDHe0yDSA02mCFCvQ1FK2DWdSbO39SVWeubUBlm2Ev_OVty6fmFUYrMONfs7-UZY"]},-1],["cr:1070",["lowerDomainComet"],{"__rc":["lowerDomainComet","Aa12Ojy27jinkgt0cyskqZCz5Iqur2b95dETTvf9lm-MphNE9euq9JWZlSrPC1_tDngjkCvAoU0AqA673PBMNpgRD9JQdo3p7F8T"]},-1],["cr:1196",["handleCometReauthenticationSideEffects"],{"__rc":["handleCometReauthenticationSideEffects","Aa3n7wNCo-J_jlc0Yw_B9O6NAmPNMM4qK3TiPdqbYnx7Wa15jsnshnxJzWJceS9yRzLkE-QjnATldF6VptCvua4HAnzpbyFEgTHM3G_J"]},-1],["cr:2011",[],{"__rc":[null,"Aa0M2N2036sRvHAsi3Dqok2oUaOo-rfBpV-Fj2k4JY4N3sa6gVuVsFya5lRmMBysSmxIQ2LN0YjhPZZ7SKM_5ARfFw-Xtls"]},-1],["cr:2099",[],{"__rc":[null,"Aa1ohNRZeLZ0nUeOSDB54kSE30zAKRVG4ezrBsU8liIPUVl6SsLmqavJ5boz1peyRmz88eNxX9gK4OD30id2J5MWnJ2Y4Ncu_K7IqITpDjYQNn22buGXC3qg"]},-1],["cr:2654",[],{"__rc":[null,"Aa0LfKL_hVnlTLMRITfEfyzaifswmQzGDshj-i2KAgP4jcYxRseps6lgSXX2cMFD5HhQUUNoA4pugoKyzpJlJWnlug"]},-1],["cr:2682",["warningComet"],{"__rc":["warningComet","Aa3FtHkyy8y3V6nYWEHAumALQz6t1GuDk6-j-x5LyLhdBr34-z3OwGfXPR7DN3zL6aoGcZWTuu3DPsNfggIJoUw8-E8"]},-1],["cr:2928",["relay-runtime"],{"__rc":["relay-runtime","Aa22Q7toeuAYGfWAYnMEKOLmbklb6Y4bP0fBR6uz6OpUPXDfMUo3p5fvwaOwOzFBVDYu9dMIOUXkQL9R4nOzW0n6fPdB5FhzvHnqHw"]},-1],["cr:3832",[],{"__rc":[null,null]},-1],["cr:3919",[],{"__rc":[null,"Aa1M-PuN2yrK0i-uvcGnFVKYHU_joDlcKpgSEiyfgza6Lyie3IjBADyvvTxz_gmJz5kJ2gVkJXpEX6OjXoZE-YYwNpw6"]},-1],["cr:4001",[],{"__rc":[null,"Aa3Cw438WOrwN6sJSrwGzGG7dJ7PWV_h1aRWtlYHLop0ZWYc3_PiIDazvcSy8iKLcQXgv1RimutEIFbJzXHcc_s"]},-1],["cr:4166",[],{"__rc":[null,null]},-1],["cr:4345",[],{"__rc":[null,"Aa3PVrmr5gFfKb5KzXwcPGdIViVJtuZPC9FSyiRM_S55Xtkp0Mb6g_t_n3VG0n1Jf5butnOWO41wbakjSXwXBa4q3Ue8W9MESQQ"]},-1],["cr:4874",[],{"__rc":[null,"Aa24FHb-f5pG2IQ5YAyc0CZQNmiSSEqemK0d520DqElL4DCDqVHpw8PgLEU31VxUXns2Tl4UZXJ-K0FqeIU"]},-1],["cr:4964",["FalcoLoggerTransportsDeferred"],{"__rc":["FalcoLoggerTransportsDeferred","Aa1QVFcGpm1B2PCq6o9BINAZO6CtVjK4RXKtpAnGa1DVuqfa7fHkqaZwvaRxAtIskvqDjHRr5WroqBZqFrfCGoRX8ep6o2soMsgR5YoUSa7F8XtLPdA"]},-1],["cr:5128",[],{"__rc":[null,"Aa2bvbE_bBqe7Nay45NZbA9QXPEwSWrg4WmdG15stLigIHh_DMtOup-CUzdU78MtMltxhhbCK7fM0o1PU-NaHOnLObRU_PVc"]},-1],["cr:5655",[],{"__rc":[null,"Aa1P95LJNIZ8zAt-nVA_8N-vhTQzLle6SslReECJeM2vmxJh9ExGCcBYwslwsbcXoYVkKi4WYE0qFxtvqSuJNq2eAFs"]},-1],["cr:7332",[],{"__rc":[null,"Aa2eCfC9Ivuow6jSFvXvBtZDliir8rmSMvIp-NFUE3Vj0Mq4Mni98ZrZ2kErar5NwjlFHlWxwyy-W913cXlHp-uZdo-I-CUoqx6BdOFCymSfV24gRWsZGpG8XwlIPAl1d8jQvcnBEUHqc94nITU"]},-1],["cr:10569",[],{"__rc":[null,"Aa1r8APjEfYJbd6Z-lcV16qqgRusP1vf_eL9zcsnw1C_Xa_1C3wu7uAGck5aUgP7FKbWJpihVPMB1z1LgLMF7hQ0NWOTAw"]},-1],["cr:11053",[],{"__rc":[null,"Aa37tZ0jLioAFLywWceMYk5uJEg6XSFxVVAdKOLn2tyfX2XjFaHSnMQVNo755gke3Pkbcy8YTv2uqLFNZBltVHzXD3atdF31Xw"]},-1],["cr:11054",[],{"__rc":[null,"Aa37tZ0jLioAFLywWceMYk5uJEg6XSFxVVAdKOLn2tyfX2XjFaHSnMQVNo755gke3Pkbcy8YTv2uqLFNZBltVHzXD3atdF31Xw"]},-1],["cr:11192",[],{"__rc":[null,"Aa37tZ0jLioAFLywWceMYk5uJEg6XSFxVVAdKOLn2tyfX2XjFaHSnMQVNo755gke3Pkbcy8YTv2uqLFNZBltVHzXD3atdF31Xw"]},-1],["cr:11202",[],{"__rc":[null,"Aa0nWfUWoPuX5qJ71hkCdTdlS9mnls_OS6WMA_arDvFb9lgmo6OTRDPxzAwcmPj5dTrT_zU93FS4qRKb6Q"]},-1],["cr:12338",["CometErrorRoot.react"],{"__rc":["CometErrorRoot.react","Aa0KKC96n83LTa7w2s9Azj2FsnwEcYlvqS-EZAfIl3AWLYeSbmeyH70IBm4O_joZDUUeg8m_v-Sa0rJnCChVl3gnIh7r"]},-1],["cr:840411",[],{"__rc":[null,"Aa0nWfUWoPuX5qJ71hkCdTdlS9mnls_OS6WMA_arDvFb9lgmo6OTRDPxzAwcmPj5dTrT_zU93FS4qRKb6Q"]},-1],["cr:844180",["TimeSpentImmediateActiveSecondsLoggerComet"],{"__rc":["TimeSpentImmediateActiveSecondsLoggerComet","Aa3FtHkyy8y3V6nYWEHAumALQz6t1GuDk6-j-x5LyLhdBr34-z3OwGfXPR7DN3zL6aoGcZWTuu3DPsNfggIJoUw8-E8"]},-1],["cr:869493",[],{"__rc":[null,"Aa1K8GaLNTLgm55XQN8glzKgWsXdJSlKEcPLBSosnPB7nIJAnhC8iJUZQuqbNvJXq-Py7ionsuP_"]},-1],["cr:992073",[],{"__rc":[null,"Aa2Y2pDTdZh9XtB2JddiSh5y5-6Qrxsr_irU104C8EY04pM1AUfpAQrvaONyMgfmZkyHpCqF3GXhek2DPuZGudLX2i-yejGW"]},-1],["cr:994756",["BaseCometModal.react"],{"__rc":["BaseCometModal.react","Aa23VoQbNrPf6E__AhNFvqHYUBXdA4Ec9-wQgKQn_vvnOL2psaxENKtCjJY_xz39weox8hQZC0sEsHLWV48"]},-1],["cr:1011783",["CometHeroInteractionImpl.react"],{"__rc":["CometHeroInteractionImpl.react","Aa3VF-VzlFACPWWSkHhFcosD-tfNo2vANp1DNCQ-ZnIidtyOc-xKw6A5IXzBZ2sC7efDkKapBnl6qM4"]},-1],["cr:1064332",[],{"__rc":[null,"Aa0pSJ9wVJhSHaN2zcdJgxoyhvZ8BmVGWdLferifTR5EceLE_mnSSlt3Y97jan2kh2Bjh8-omKKjOeU"]},-1],["cr:1069930",["cometAsyncFetch"],{"__rc":["cometAsyncFetch","Aa3FtHkyy8y3V6nYWEHAumALQz6t1GuDk6-j-x5LyLhdBr34-z3OwGfXPR7DN3zL6aoGcZWTuu3DPsNfggIJoUw8-E8"]},-1],["cr:1083116",[],{"__rc":[null,"Aa3FtHkyy8y3V6nYWEHAumALQz6t1GuDk6-j-x5LyLhdBr34-z3OwGfXPR7DN3zL6aoGcZWTuu3DPsNfggIJoUw8-E8"]},-1],["cr:1083117",["recoverableViolation"],{"__rc":["recoverableViolation","Aa3FtHkyy8y3V6nYWEHAumALQz6t1GuDk6-j-x5LyLhdBr34-z3OwGfXPR7DN3zL6aoGcZWTuu3DPsNfggIJoUw8-E8"]},-1],["cr:1105154",[],{"__rc":[null,"Aa0nWfUWoPuX5qJ71hkCdTdlS9mnls_OS6WMA_arDvFb9lgmo6OTRDPxzAwcmPj5dTrT_zU93FS4qRKb6Q"]},-1],["cr:1106516",[],{"__rc":[null,"Aa3FP52XNrHPW3lTgUdIxgsu4rZPJftiEXsDbuWnNhh0Rpv_H6DZqkVZnqmf8zZby-_IZ0Zv4_oavUYL"]},-1],["cr:1110430",[],{"__rc":[null,"Aa0nWfUWoPuX5qJ71hkCdTdlS9mnls_OS6WMA_arDvFb9lgmo6OTRDPxzAwcmPj5dTrT_zU93FS4qRKb6Q"]},-1],["cr:1119068",[],{"__rc":[null,"Aa2waenBJe5OE2sp5-cMKZDSpvuSF5L37FNxjiBhP6CNJg6A4XjFXjwIC8HU97JIG6VAyoWX1QRz8WOiIxfMNWepbw"]},-1],["cr:1121434",[],{"__rc":[null,"Aa0nWfUWoPuX5qJ71hkCdTdlS9mnls_OS6WMA_arDvFb9lgmo6OTRDPxzAwcmPj5dTrT_zU93FS4qRKb6Q"]},-1],["cr:1132918",[],{"__rc":[null,"Aa0nWfUWoPuX5qJ71hkCdTdlS9mnls_OS6WMA_arDvFb9lgmo6OTRDPxzAwcmPj5dTrT_zU93FS4qRKb6Q"]},-1],["cr:1183579",["InlineFbtResultImplComet"],{"__rc":["InlineFbtResultImplComet","Aa3FtHkyy8y3V6nYWEHAumALQz6t1GuDk6-j-x5LyLhdBr34-z3OwGfXPR7DN3zL6aoGcZWTuu3DPsNfggIJoUw8-E8"]},-1],["cr:1267207",[],{"__rc":[null,"Aa2CRYwxWxSGJu3ETfpzmVUU6typyvCDzfnPYVxrqaiGZYwFRneBWfgLY1Cw7rJQWhiJZrt5-NqgrF3EcCkVRDg"]},-1],["cr:1445039",[],{"__rc":[null,"Aa3x4qLcqFr8UPv9_WRA7etlbWF4wvqq0LkZdKEvXjG1YYZxyX7RkNsGw_GiJZ4LcM5rWGCbW674FNWZbTV4cPvmLqifHegpUwTiPyI"]},-1],["cr:1467370",["CometRelayScheduler"],{"__rc":["CometRelayScheduler","Aa3FtHkyy8y3V6nYWEHAumALQz6t1GuDk6-j-x5LyLhdBr34-z3OwGfXPR7DN3zL6aoGcZWTuu3DPsNfggIJoUw8-E8"]},-1],["cr:1522191",["CometLinkTrackingUtils.facebook"],{"__rc":["CometLinkTrackingUtils.facebook","Aa2SMJFPvK0Du0VXe3lwuJWtz3cR6OZjtac2CWSP_9SY1ikTRzqTKp9ZyIBijXeSYpTmKKpkUoXDyj_djrbV1elA8oELfZ_37JOwLg"]},-1],["cr:1645510",[],{"__rc":[null,"Aa1E426t5nrvNzbjz9ghznZkE3yxpZx9hzbOL75GR_KZ6oeGBjpuix7qwOvJjUgz8V_i-GaS_ZNv7V3KQs1qRPa3UZPvcA"]},-1],["cr:1752405",["QPLAddCometRequestHeaders"],{"__rc":["QPLAddCometRequestHeaders","Aa3FtHkyy8y3V6nYWEHAumALQz6t1GuDk6-j-x5LyLhdBr34-z3OwGfXPR7DN3zL6aoGcZWTuu3DPsNfggIJoUw8-E8"]},-1],["cr:1813330",[],{"__rc":[null,"Aa1h6vtOOaGjqqX5CWVF9gLLfTSND_Gia2AWWYRWDO8mkFTqs1SViABczjCQ6ZtH537xiktolC8ypk318-P60hcoCQE"]},-1],["cr:1824473",[],{"__rc":[null,"Aa2eHQ1pNI0X3cJjqOt6duNyIc0KKO7PZswCCQIhVWibKVaJiHGeMXCQ71sKpHyayjApRCLCl9SkEggybE9umiSC"]},-1],["cr:1829844",[],{"__rc":[null,"Aa37tZ0jLioAFLywWceMYk5uJEg6XSFxVVAdKOLn2tyfX2XjFaHSnMQVNo755gke3Pkbcy8YTv2uqLFNZBltVHzXD3atdF31Xw"]},-1],["cr:1999269",[],{"__rc":[null,"Aa3PH6oGDendLxgCSuoz2uSCGQStkNxnRYhH2z_MelFJxk_pft3Cydw4i4gyns_rraVaSpiA1smMrqvVzhQv9Zq6yw8spL1soJ2a1DdDX_5Rovze_7qQutxubg"]},-1],["cr:2306",["NullState404FailedLoadingFB"],{"__rc":["NullState404FailedLoadingFB","Aa3YezXtZCv92Q-y7WUt-ui8WWlTfyiAO_GzmqjpmCCiKa6Xp1c-hRj2gUi8jXrPlOXFrS2yVHZN8tF-pGLg1NhHbVESWujns99tfA0"]},-1],["cr:3211",["NullStateGeneralFB"],{"__rc":["NullStateGeneralFB","Aa3YezXtZCv92Q-y7WUt-ui8WWlTfyiAO_GzmqjpmCCiKa6Xp1c-hRj2gUi8jXrPlOXFrS2yVHZN8tF-pGLg1NhHbVESWujns99tfA0"]},-1],["cr:3587",["NullStatePermissionsFB"],{"__rc":["NullStatePermissionsFB","Aa3YezXtZCv92Q-y7WUt-ui8WWlTfyiAO_GzmqjpmCCiKa6Xp1c-hRj2gUi8jXrPlOXFrS2yVHZN8tF-pGLg1NhHbVESWujns99tfA0"]},-1],["WebLoomConfig",[],{"adaptive_config":{"interactions":{"modules":{"14945":1},"events":{"979439635.barcelona.landingPage":15.9,"979439635.barcelona.postPage":118.2,"979439635.barcelona.profilePage":238.1,"979439938.barcelona.postPage":11.4,"979439938.barcelona.profilePage":30.3}},"qpl":{"modules":{},"events":{}},"modules":null,"events":null}},4171],["BanzaiConfig",[],{"MAX_SIZE":10000,"MAX_WAIT":150000,"MIN_WAIT":null,"RESTORE_WAIT":150000,"blacklist":["time_spent"],"disabled":false,"gks":{"boosted_pagelikes":true,"mercury_send_error_logging":true,"platform_oauth_client_events":true,"graphexplorer":true,"sticker_search_ranking":true},"known_routes":["artillery_javascript_actions","artillery_javascript_trace","artillery_logger_data","logger","falco","gk2_exposure","js_error_logging","loom_trace","marauder","perfx_custom_logger_endpoint","qex","require_cond_exposure_logging"],"should_drop_unknown_routes":true,"should_log_unknown_routes":false},7],["cr:3976",[],{"__rc":[null,"Aa3iCtzCHIR7tfElV4PBaDlBjEdCrhDuADTIOA4CA4Z7_5o3GYHObSSL4nvQ3rJwGAXMvUgChrfDPNej0qKIueoG4E_oWJpFVfU"]},-1],["cr:955714",[],{"__rc":[null,"Aa0U7jIuVVPZIj_R-fNIJq8SejV8i42KjLpH6droTFa8KFqGndpqE-FNEBbUxhgrIHWKBSRajmSLo_1sABgC"]},-1],["cr:1094133",[],{"__rc":[null,"Aa1wKUu7G93ArZb-tFZgDFK94GBfBkQSBVnyl1_G-Ithp60ZJHR9zkxprjrR19mpi96b3re-mZcDy9RQNPP7dnrrV3w"]},-1],["cr:1292365",["React-prod.classic"],{"__rc":["React-prod.classic","Aa0nWfUWoPuX5qJ71hkCdTdlS9mnls_OS6WMA_arDvFb9lgmo6OTRDPxzAwcmPj5dTrT_zU93FS4qRKb6Q"]},-1],["cr:5277",["ReactDOM.classic.prod-or-profiling"],{"__rc":["ReactDOM.classic.prod-or-profiling","Aa0nWfUWoPuX5qJ71hkCdTdlS9mnls_OS6WMA_arDvFb9lgmo6OTRDPxzAwcmPj5dTrT_zU93FS4qRKb6Q"]},-1],["cr:692209",["cancelIdleCallbackComet"],{"__rc":["cancelIdleCallbackComet","Aa3FtHkyy8y3V6nYWEHAumALQz6t1GuDk6-j-x5LyLhdBr34-z3OwGfXPR7DN3zL6aoGcZWTuu3DPsNfggIJoUw8-E8"]},-1],["cr:1268629",["setTimeoutCometLoggingPri"],{"__rc":["setTimeoutCometLoggingPri","Aa3FtHkyy8y3V6nYWEHAumALQz6t1GuDk6-j-x5LyLhdBr34-z3OwGfXPR7DN3zL6aoGcZWTuu3DPsNfggIJoUw8-E8"]},-1],["cr:1268630",["setTimeoutCometSpeculative"],{"__rc":["setTimeoutCometSpeculative","Aa3FtHkyy8y3V6nYWEHAumALQz6t1GuDk6-j-x5LyLhdBr34-z3OwGfXPR7DN3zL6aoGcZWTuu3DPsNfggIJoUw8-E8"]},-1],["cr:5888",[],{"__rc":[null,"Aa2djCyGUvPWq8yWVA5ybnppySDsxMJo8YqXZURq8DM9wpnbaTP-v3LPhTc2UoBc78geT-Wkl7RLi6WV3IOJ8gjzgw"]},-1],["cr:983844",[],{"__rc":[null,"Aa0nWfUWoPuX5qJ71hkCdTdlS9mnls_OS6WMA_arDvFb9lgmo6OTRDPxzAwcmPj5dTrT_zU93FS4qRKb6Q"]},-1],["cr:1072546",[],{"__rc":[null,"Aa0nWfUWoPuX5qJ71hkCdTdlS9mnls_OS6WMA_arDvFb9lgmo6OTRDPxzAwcmPj5dTrT_zU93FS4qRKb6Q"]},-1],["cr:1072547",[],{"__rc":[null,"Aa0nWfUWoPuX5qJ71hkCdTdlS9mnls_OS6WMA_arDvFb9lgmo6OTRDPxzAwcmPj5dTrT_zU93FS4qRKb6Q"]},-1],["cr:1072549",[],{"__rc":[null,"Aa0nWfUWoPuX5qJ71hkCdTdlS9mnls_OS6WMA_arDvFb9lgmo6OTRDPxzAwcmPj5dTrT_zU93FS4qRKb6Q"]},-1],["cr:5278",["ReactDOM-prod.classic"],{"__rc":["ReactDOM-prod.classic","Aa195pHpHTuCRRYw3cuBd8F9D1i4yK-zV3HfhHTTtgWH5uc9GSmSh5jkRlT7kF-esg6rDKi4uyzV0hAwsNcxsJD1BwbgZwHQoA"]},-1],["cr:1353359",["CometEventListener"],{"__rc":["CometEventListener","Aa2R_V5t36M2JBmefWNPn5Wt1fuS7MFVRzKMz1Fvt5I6pouFoK7TB4mopZyXUGbWbHusPgHM6g7uDVb1TmQtAF_ZoJ-25z1XjQ"]},-1]],"require":[["BarcelonaPostRoot.entrypoint\u0040c3ecf7e8ebc35024f68314d89af62e71"],["BarcelonaPostRoot.react\u0040c3ecf7e8ebc35024f68314d89af62e71"],["CometPlatformRootClient\u00404096e4080fe1ae4791152e4107c64534","init",["BarcelonaCometRootConfig","RequireDeferredReference"],[{"__m":"BarcelonaCometRootConfig"},"mount_0_0_xI","7252766289159758644",{"actorID":"0","rootView":{"allResources":[{"__dr":"BarcelonaPostRoot.entrypoint"},{"__dr":"BarcelonaPostRoot.react"}],"resource":{"__dr":"BarcelonaPostRoot.react"},"props":{"post_id":"3140624222409485947"},"entryPoint":{"__dr":"BarcelonaPostRoot.entrypoint"}},"tracePolicy":"barcelona.postPage","meta":{"title":"\u0040rafael_falco \u2022 Podia ter um jeito f\u00e1cil de trazer a lista de follows do Twitter n\u00e9 \ud83e\udd14 \u2022 Threads","accessory":null,"favicon":null},"prefetchable":true,"entityKeyConfig":{"entity_type":{"source":"constant","value":"postPage"}},"hostableView":{"allResources":[{"__dr":"BarcelonaPostRoot.entrypoint"},{"__dr":"BarcelonaPostRoot.react"}],"resource":{"__dr":"BarcelonaPostRoot.react"},"props":{"post_id":"3140624222409485947"},"entryPoint":{"__dr":"BarcelonaPostRoot.entrypoint"}},"url":"\/t\/CuVvRcttG57","params":{"shortcode":"CuVvRcttG57"},"routePath":"\/t\/{shortcode}\/"},null,null,{"backgroundRoute":null,"timeSpentMetaData":null}]],["Bootloader\u00408c8b9fe979db377efa98570002fbc438","markComponentsAsImmediate",[],[["CometErrorRoot.react","CometKeyCommandWrapperDialog.react","CometModifiedKeyCommandWrapperDialog.react","BarcelonaCookieConsentDialog.react"]]],["RequireDeferredReference\u004059a7c88d3f95fb0fd84447266466015b","unblock",[],[["BarcelonaPostRoot.entrypoint","BarcelonaPostRoot.react"],"sd"]],["RequireDeferredReference\u004059a7c88d3f95fb0fd84447266466015b","unblock",[],[["BarcelonaPostRoot.entrypoint","BarcelonaPostRoot.react"],"css"]]]});});});</script>
+<script>qpl_inl("7252766289159758644","tierOneEnd");</script>
+<script type="application/json" data-content-len="83" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766289159758644","tierOneEnd"]]]}</script>
+
+<script>qpl_inl("7252766289159758644","tierTwo");</script>
+<script type="application/json" data-content-len="80" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766289159758644","tierTwo"]]]}</script>
+<script>qpl_inl("7252766289159758644-server","tierTwo",137);</script>
+<script type="application/json" data-content-len="91" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766289159758644-server","tierTwo",137]]]}</script>
+<script>requireLazy(["HasteSupportData"],function(m){m.handle({"clpData":{"1276":{"r":100,"s":1},"1115":{"r":1},"4536":{"r":1},"4785":{"r":1},"4790":{"r":1,"s":1},"1743810":{"r":1},"1856513":{"r":1,"s":1},"1914651":{"r":1},"1808128":{"r":1,"s":1}},"gkxData":{"1941":{"result":false,"hash":"AT7GrgqG15p_qcSMoh0"},"3404":{"result":false,"hash":"AT4wMZMWwnW5SJKE5jI"},"3538":{"result":false,"hash":"AT57TGJPNDIjCAO6-mg"},"1147":{"result":false,"hash":"AT7lo3uRS0bAc9UVTm0"},"3854":{"result":false,"hash":"AT5Aup-cVQlr_tBvpkA"},"952052":{"result":false,"hash":"AT7wsJl9q10w1hpgDnw"},"1611172":{"result":false,"hash":"AT6trgho2WMoFqOjK78"},"161":{"result":false,"hash":"AT4do0BlNYY4RIPQquk"},"1286":{"result":false,"hash":"AT6JZD24vbNiQBGWqR0"},"1541":{"result":true,"hash":"AT4fxbsNTnyhSCcien0"},"2449":{"result":false,"hash":"AT6wLtxxWYaByN3Zycw"},"2617":{"result":false,"hash":"AT6UKlOnx8DBsi5_JoI"},"2714":{"result":true,"hash":"AT5vT-5jyll9RTqYiVY"},"3197":{"result":false,"hash":"AT6NTAIQMTd2kZTydPg"},"3422":{"result":false,"hash":"AT6Er88AzNrP_pC8CjA"},"3464":{"result":false,"hash":"AT6h-nmnhq1G5W5AiA8"},"3610":{"result":false,"hash":"AT5G5DeylfvqwDf4OgA"},"5868":{"result":false,"hash":"AT7RfXdp6s85kH-yiu4"},"5900":{"result":false,"hash":"AT4Pl2jv9rEE_PixaxY"},"6737":{"result":false,"hash":"AT6tdqjSAxXxxw86lwY"},"1083274":{"result":false,"hash":"AT6jVQKquJZO6Wz0Wl8"},"1124976":{"result":true,"hash":"AT4xXzB8ti8wRGYODEk"},"1375802":{"result":false,"hash":"AT7J4koKtjN7aFCKI9Q"},"1401747":{"result":false,"hash":"AT7JbsxJIa_x4dD_sMQ"},"1434599":{"result":true,"hash":"AT67c_ay5iYIWOOBGc8"},"1469813":{"result":true,"hash":"AT4KsAWB14cXb7E-JFI"},"1482680":{"result":false,"hash":"AT52-IsjoZhbI5DZ-ZI"},"1526990":{"result":false,"hash":"AT5T7Mutfj6fyqlGGNk"},"1586633":{"result":false,"hash":"AT4ma-k4QyXhU8hE_EU"},"1755152":{"result":false,"hash":"AT4YqJEBEalQkF8iKFQ"},"1779508":{"result":false,"hash":"AT7TH0IJRiZ_VVRcHr0"},"1792489":{"result":false,"hash":"AT7OMiP2kJA0yOba2l4"},"2007883":{"result":false,"hash":"AT6fe4yBjXoMBt2vh0I"}},"ixData":{"1876411":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yd\/r\/3mD7kKai_7W.gif","width":12,"height":12},"1876412":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y1\/r\/mHADa0fT0mI.gif","width":16,"height":16},"1876413":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yV\/r\/ZY0eC865SgX.gif","width":20,"height":20},"1876414":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y8\/r\/M3mvaC7u8oH.gif","width":24,"height":24},"1876415":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yL\/r\/hVe2HmwMRpE.gif","width":32,"height":32},"1876416":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yC\/r\/yFaaylccZ5L.gif","width":48,"height":48},"1876418":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yk\/r\/96GJYGbUDCJ.gif","width":72,"height":72},"1876419":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yS\/r\/NiR8M1k4AVU.gif","width":12,"height":12},"1876420":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/ym\/r\/FNERtXIk9xp.gif","width":16,"height":16},"1876421":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yJ\/r\/l2FWxc8ihQj.gif","width":20,"height":20},"1876422":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yo\/r\/Io_N1z4MXYh.gif","width":24,"height":24},"1876423":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yD\/r\/-1hifBvDgEQ.gif","width":32,"height":32},"1876424":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yG\/r\/RcIiVWWukEr.gif","width":48,"height":48},"1876426":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/9ISCYYcy94m.gif","width":72,"height":72},"1876427":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yU\/r\/MStXnCtsaSe.gif","width":12,"height":12},"1876428":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y6\/r\/dw2egiKdoVV.gif","width":16,"height":16},"1876429":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yA\/r\/1DbfjOftY0d.gif","width":20,"height":20},"1876430":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yi\/r\/2uPGz8a6lb6.gif","width":24,"height":24},"1876431":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yw\/r\/60r9oPEvxiL.gif","width":32,"height":32},"1876432":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yM\/r\/NlAFhiEx3a1.gif","width":48,"height":48},"1876434":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yx\/r\/uzrQzxgD_Bg.gif","width":72,"height":72},"1876435":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yM\/r\/TtXj9IXnkoK.gif","width":12,"height":12},"1876436":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yy\/r\/HNs8yq0QiXE.gif","width":16,"height":16},"1876437":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yT\/r\/ay_drQe6StD.gif","width":20,"height":20},"1876438":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y4\/r\/iACDMhAROS_.gif","width":24,"height":24},"1876439":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yy\/r\/WEhNL1y2zoZ.gif","width":32,"height":32},"1876440":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y-\/r\/mAeZkO4yhqj.gif","width":48,"height":48},"1876442":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yl\/r\/79uB7ciX8vY.gif","width":72,"height":72},"1876443":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yG\/r\/dzn6it4Fw3p.gif","width":12,"height":12},"1876444":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yc\/r\/wqjQpFb4tea.gif","width":16,"height":16},"1876445":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yk\/r\/yy3mR2PXKrn.gif","width":20,"height":20},"1876446":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yl\/r\/gTdm7zPKz-c.gif","width":24,"height":24},"1876447":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/ym\/r\/kdaft251gQ_.gif","width":32,"height":32},"1876448":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yG\/r\/6-FTd4KBtOk.gif","width":48,"height":48},"1876450":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yq\/r\/Tks_lRPtYc-.gif","width":72,"height":72},"1876451":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yK\/r\/Bys0xcVibDa.gif","width":12,"height":12},"1876452":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yI\/r\/Wk0dcHGH6EG.gif","width":16,"height":16},"1876453":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/ys\/r\/aOTs7vt2hEc.gif","width":20,"height":20},"1876454":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yh\/r\/wVjfNbGZ3CH.gif","width":24,"height":24},"1876455":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yw\/r\/oT6wM_vuQNQ.gif","width":32,"height":32},"1876456":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yp\/r\/ac61i44rSWK.gif","width":48,"height":48},"1876458":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yg\/r\/ZH27Vvjc9-u.gif","width":72,"height":72},"1940508":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y3\/r\/ycQ2OPoZwUA.gif","width":64,"height":64},"1940509":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yg\/r\/8kyIVWHZW-b.gif","width":64,"height":64},"1940510":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yK\/r\/8gPN8wBD9yB.gif","width":64,"height":64},"1940511":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yG\/r\/WtK_u51t3nM.gif","width":64,"height":64},"1940512":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yj\/r\/JYwEre3ewp7.gif","width":64,"height":64},"1940513":{"sprited":0,"uri":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yu\/r\/M2HDLLPAUWl.gif","width":64,"height":64}},"qexData":{"1655":{"r":null},"1675":{"r":null},"2095":{"r":null},"2096":{"r":null},"2097":{"r":null},"2098":{"r":null},"2099":{"r":null},"2100":{"r":null}},"justknobxData":{"344":{"r":true},"948":{"r":false}}})});requireLazy(["Bootloader"],function(m){m.handlePayload({"consistency":{"rev":1007796774},"rsrcMap":{"POkG4Hf":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3ikM54\/yf\/l\/en_US\/dKyu23I5fqr.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":12","m":"1007796774_main","nc":1},"oRj2xU5":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3ivsD4\/yB\/l\/en_US\/FCaa8jsqbBk.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22853","m":"1007796774_longtail","nc":1},"MIwFPq4":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yw\/r\/E4XtvzFTfIx.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22844","m":"1007796774_longtail","nc":1},"+L0X93S":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3i8hs4\/y3\/l\/en_US\/i9nIgo3DWBW.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22868","m":"1007796774_longtail","nc":1},"yjOc\/BX":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yZ\/r\/OCnt_5DwgWw.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22867","m":"1007796774_longtail","nc":1},"KxYcLg+":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yd\/r\/-w8H2PZO-iD.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22839","m":"1007796774_longtail","nc":1},"qiVTe9f":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3inQ44\/yD\/l\/en_US\/aVIZjqnbeG8uYySt466q_EFCaa8jsqbBkE4XtvzFTfIx9BS1T5PFXOB.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22842,22843,22853,22844,22840","m":"1007796774_longtail","nc":1},"L3yxVXS":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yt\/r\/AHkndIEm5Rl.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22841","m":"1007796774_longtail","nc":1},"oHmjilq":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iQpj4\/y_\/l\/en_US\/3SBbpQTh5JQ.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22845","m":"1007796774_longtail","nc":1},"5hdPwUp":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3i3Fo4\/ye\/l\/en_US\/x_k9uxuxzat.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":25","m":"1007796774_main","nc":1},"SrRwK8Q":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yo\/r\/bLEHF9MK5q8.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23643","m":"1007796774_longtail","nc":1},"lI1Yib\/":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/ye\/r\/kZtzguJd8yx.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23642","m":"1007796774_longtail","nc":1},"A2+x9zZ":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y7\/r\/vsWqehdEtWw.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":38","m":"1007796774_main","nc":1},"ouGJTJU":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y1\/r\/6HpGmByZA0s.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":36","m":"1007796774_main","nc":1},"h0zbdh+":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yN\/r\/8sBjwKi_XAJ.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":37","m":"1007796774_main","nc":1},"VJhwr7f":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iPjk4\/yj\/l\/en_US\/tS4NAEkk1ly.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":13","m":"1007796774_main","nc":1},"BG+mBnk":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yW\/r\/s70ZcYOHW2g.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":14","m":"1007796774_main","nc":1},"VluRBpG":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3i8f54\/yL\/l\/en_US\/H8jDqdAkvaPBp-sWNflphmzG5N_ZCDB67s70ZcYOHW2gxudfWkGfnMSQaHJskTXKBsP-FxlnJFYEeuYySt466q_EKoySD9JtZBrFXZtUxipnSj3o_eql4wWVOsES-3svQkGgLmdtKY8ymGHpVMiA7wWSg6sKyq6PtGLsmmCtwsMwDpuuuk1ECc7FJyTC8h4aY11bXDtsrTV6grGR515OhfS5HE3MnYm2bO-GP2D1MY2eDbW-z0Si5EstWO8A1q9NBjVyNNwMMrqfnWVlYdJYLoARF8dGGFiyg8AQNMsQTR5LWgsqVgrL6FeLaAg_7vEtusd6r5NO8w.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22517,22520,22522,14,23282,22513,22574,22843,22519,22678,23283,22538,22681,22540,22539,24755,22521,22542,22523,22518,22679,22528,22543,22560,22515,22524,22525,22516,22526,22514","m":"1007796774_main,1007796774_longtail","nc":1},"4myS+FQ":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yb\/r\/0LyZ2Bhtg3Q.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":24726","m":"1007796774_longtail","nc":1},"ptX5H14":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iMT74\/yv\/l\/en_US\/FviRYH6d8aZL9iclwrP2Mz.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23284,23281","m":"1007796774_longtail","nc":1},"DTEAkkm":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iYTC4\/y0\/l\/en_US\/ymAWa7v3wLK.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":30","m":"1007796774_main","nc":1},"qcJ8oTc":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yk\/r\/yJveFWkDDR4.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23327","m":"1007796774_longtail","nc":1},"HAdaAfP":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y4\/r\/fxdyWGjKtZW.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23287","m":"1007796774_longtail","nc":1},"VQxSZM7":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y3\/r\/pw17-piTWVI.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23329","m":"1007796774_longtail","nc":1},"ppcMzf1":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3ikKB4\/yV\/l\/en_US\/Y5xpL53z6YNfLI-dnZqj4LTzno5eP6nVVsqH8rp3rNzmT2pzc_XfHCJhAA8aEK7kcPsD2Mi-pv4Vvox3TE4PsotI1jhiyd0Mi7X6EksR9mTLwkXGcK2g9xvB8zAYt-ZRkt3ORLRxhRlEh7uuYySt466q_EbFemdCzZOyr8qHP6VIBz4d-es_Ps7G0-0zSIiPUvr3ptNqmwROcNvDkahz1LRM0XaeLmdtKY8ymGHY-fNHdq0n_9zzryhWoIuez6eRNg3AJtVTe2oHS7-bsPGS7fLcvWQauAAgAox9dEkk0cIUQjlstqZUtNpstMRzv7_FQe2cWHULn6.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22273,23259,23230,23244,23236,23241,23275,23245,23258,23277,23243,23288,23279,22843,22459,23290,23289,23273,23239,23232,22681,23278,23235,23276,23234,23261,23274,22420,23240,23237","m":"1007796774_longtail","nc":1},"BmUKcMx":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iez_4\/y3\/l\/en_US\/JIqQQdk3ieE9GMCQUhC9Iq.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23233,23238","m":"1007796774_longtail","nc":1},"LddxAHS":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3i9yU4\/yk\/l\/en_US\/e221EJpXRZd.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23280","m":"1007796774_longtail","nc":1},"80QnIbt":{"type":"css","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yr\/l\/0,cross\/WPrndevEYn8zyEpb6SJKFF.css?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23242,23229","nc":1},"PfR8M03":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iQoG4\/y6\/l\/en_US\/Y5xpL53z6YNfLI-dnZqj4LODfoxHtIg-rTzno5eP6nVV1qcrREK-mqHsqH8rp3rNzmT2pzc_XfHCJhAA8aEK7kcPox3TE4PsotI1jhiyd0Mi7XXGcK2g9xvB8zAYt-ZRkt3OfxdyWGjKtZWyJveFWkDDR4uYySt466q_EbFemdCzZOyrmzuRxJgFeBB8qHP6VIBz4d-es_Ps7G0-0NqmwROcNvDkahz1LRM0XaeLmdtKY8ymGHzzryhWoIuez6eRNg3AJtVTe2oHS7-bsPGcIUQjlstqZUtNpstMRzv7_FQe2cWHULn6.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22273,23259,23286,23230,23231,23244,23236,23241,23245,23258,23243,23288,23287,23327,22843,22459,23285,23290,23289,23239,23232,22681,23235,23276,23234,22420,23240,23237","m":"1007796774_longtail","nc":1},"kYwN4K1":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iOv54\/yd\/l\/en_US\/9GMCQUhC9Iq.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23238","m":"1007796774_longtail","nc":1},"3x11trx":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yt\/r\/JIqQQdk3ieE.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23233","m":"1007796774_longtail","nc":1},"SbjrRrE":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iK7-4\/y0\/l\/en_US\/Tzno5eP6nVV1qcrREK-mqHT2pzc_XfHCJhAA8aEK7kcPpyBDNZM558rox3TE4PsotI1jhiyd0Mi7XXGcK2g9xvB8zAYt-ZRkt3ObFemdCzZOyrmzuRxJgFeBBNqmwROcNvDkahz1LRM0XaezzryhWoIueze2oHS7-bsPGcIUQjlstqZUtNpstMRzv7_FQe2cWHULn6.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23230,23231,23236,23241,23272,23245,23258,23243,23288,22459,23285,23239,23232,23235,23234,22420,23240,23237","m":"1007796774_longtail","nc":1},"BXyw5s5":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3im6X4\/yS\/l\/en_US\/Y5xpL53z6YN.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22273","m":"1007796774_longtail","nc":1},"rKwGmdo":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3ivRF4\/yV\/l\/en_US\/kVewawW9sLi.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":27","m":"1007796774_main","nc":1},"QYet1m8":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iL0l4\/yS\/l\/en_US\/2b0QhKYmHZR.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":42","m":"1007796774_main","nc":1},"N4YVD55":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iVaI4\/yZ\/l\/en_US\/s70ZcYOHW2gg3yoqbXEpmYwxCqhf68Hu9EXzOMjEGRkef1WEGsPamkr0JBqoWCZjPIqpYLDHodxPTIVnWZl7cviNdWZZdPSs6ZbpqTnuoeCk6pZsjNlrulyIdyoHREtSM9Jsu_B3ZISZBs9AIrc88yh4hk7G2jo8ofuzrILlFWhiKYx_qrF1-qnT0JMyD86gn8wGeXZ7u-SCAiNhudK7j4Vngu9Vesh-ZP8F7HecdToupwT2U_sdlNP4ZdmIMEGQsol6uRMSmrV1PNp_6bSQi6r9ERa5IIJ3kuTVsqlBOyoeOvtugati7pKtKghClYVqKmzDS3VQA1.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":14,24681,23332,23349,24707,24728,23321,24687,23313,24666,24701,23994,24680,18243,24710,23309,24722,23887,24702,23328,22276,18214,18244,23342,22275,23314,24683,24685,24711,24767","m":"1007796774_main,1007796774_longtail","nc":1},"txi7upv":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3i-vc4\/ya\/l\/en_US\/FjpyFw8dtiNqiZMXnYKsx26AiDsqxS9hj2A8-plSrNyIWTBsxEMk0oGjGQJZ5hTTO7ir0aXOo6hu9GiKWpcUOxdqpw17-piTWVIrfTsco5uJfSM3Hhz51POq73P2qyi3N0XKdH93URzZjeYe8qQHfoPyNXK6vxPXihp7vXclAo5ZDV_x16hGQn2v-k0Z10vcV3GdgRhj0mU6j2x70YSVf1mwoMpkAuvWZOfGak4iiBfG2EFqtzqRp81TcBkCmV4agjMWnHBnuJM6SUg6InEHrq1vn4uA7WktBjOZhjCbYk6yzRdJERnFqLDkk44q6ypfKE75cdD_2h.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23965,22816,24780,23958,22277,23952,24778,24781,23329,49,24723,18053,23300,24706,23946,23987,24001,23950,24785,24786,23980,23984,23983,24673,23953,23297,22274,22271,24730,23308","m":"1007796774_main,1007796774_longtail","nc":1},"CJJpFpi":{"type":"css","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y-\/l\/0,cross\/9RNFBR_gSEj1etdwR6a81I3jU-LY6XmPy6zzuiyZa4D8Kd2lmIoHxfuilTJBkNQiBWIIyo1-hI3xUC3qfE7YCHo1NZ8UcGjWcqSZqyKYDA1Eol5T8IKFrg-6eoWuaqWpfwKmpPGlbgm47dKTKm9_Q2heWGcOeEjwimKZqRZXEEM_Uh94XZEyMm2-3YUMNorFvAKDgpdoLXukjSq8gZxyPkih5Hkv3JxJYu0Ykk9aTMfgZ8CM51BAZ2QE-Kq3JhZtgcAW5uBp9I8nAckfA9KCE8vaKz4xLGtKy686UOeUw9hYcelD8sl7JH0uDEkhRHIwT9SgsVYxoo.css?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23964,23354,24662,23301,23315,23350,23977,24777,24667,23335,23657,24686,24682,23978,24690,23989,24670,23298,24664,23331,24761,23352,23299,24695,18147,23322,23334,23325,24787,24699","nc":1},"hUeQzzr":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iF5d4\/yE\/l\/en_US\/wAFch5viTHH69FssJOI_G2exJVaBoNrmSTh0PpSNmHFjQG4qJ6_JSCSN7zKZDi949BQPpruh15t0LegNM-bx1lR0NXebqprgpxA4aaw8yetFPeGRUdnQtM5dIolieDd4IJu4bCfnaamX5bMBkyxSp24flWVTOice3J6cjKtVXaNTrk3HysLR_Fhssj6vsWqehdEtWw-yu7ETe8t3dLMDjMFw3MsV0E1dAsWNrLODmgTTo802bhAywHKqrhLV4OZcJ1-eP5c3r40PTgS3hAyaMlDkmMimHkD2SKUNQsv_cbbFAPOpx4ztjoaa4PcrTo1aERw28O7swT.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":24760,24705,23908,24688,23896,24764,23355,23991,24698,24708,24724,24678,23976,23351,24663,23986,23951,38,23337,23303,23295,24768,23319,24693,24691,23296,24742,22442,23144,23330","m":"1007796774_main,1007796774_longtail","nc":1},"lwH\/DrC":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3i3504\/yH\/l\/en_US\/SRAjmBufyGy7tmbEkFIHUT6kfYtB9j00HvMmvdR4VFNcfEskqldov3qysZNDLAbte48xArc4B8cLJLr8-lR_ixnfPhl-HUfEGSWSdoTv3rofQ7e_062QBgldSmpUNK2rSNuagAZiLiHDzjFFGHQD74fAA6fVPHD9o_iWGLxyWLM_xDmsQ9kStQlyoL1lJPjtWsWnrY8FIcLGszJDTKBa19GQ1IkN3-VM1M5w3fjgHyxunZ_3PIqtw6iDIyaa5ovp7hLPKf7zR1bzebgILzTzs1LgHQtH1ycvYhoDT5wmpwipzdUBW4ZAaZDByLQ16DTDQVEH-g-FDC.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":24782,24697,21987,24718,22561,22814,22702,22242,22899,24715,23347,24003,24684,24757,24766,23907,24712,23323,23993,22489,23967,23317,23888,22048,22049,24671,23956,24774,24776,22767","m":"1007796774_longtail","nc":1},"A2jbsLw":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3ixe04\/y0\/l\/en_US\/UKekSwDzTqG0gfp2bvC0uBEox0FBqrm7YvgdM-SLeCs0AKUi-QbPz5sahZ_FWuZ9h8WEIa6nns2kWah8qLI_pU_L8qp5Bb25p0wXYx9Ap03JhasXY4qKM5rtljNLxthsevMw7XB1KXNiN8ABBk7j-f6Zi_7WdzptHN26AaP-2Sjw-Dnh6jcdmVXPXSSq7PBpDfanipUjOjCZmNZo43f2P3vNQieoGapi6yqZZJtAkjwOY348SZwTwcekAeB9q5QFKpFlBalZSNPMTsKe0M8KCJieK-HgiehXb3Phs4i_r77jjSKKq4PxpNqfTopAkQLbu3oaXV5Fcp.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":24769,23979,23960,23942,24679,24531,24007,23340,23316,23947,23320,23943,23336,24000,24775,23999,24704,24677,24689,24762,24725,24784,24719,24783,23988,24721,23990,23656,24788,24713","m":"1007796774_longtail","nc":1},"7DhgKFs":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3indH4\/y0\/l\/en_US\/3TMdy2vMQV59d3CJ4JpiQJTb9lqxabK5qbkb_ipJtb7e2hCJvyirDpkSnFW7BRU1IGNYqFt9n2P-ucubnLZrGrfaFLJXkx8ys-62rSzGVmuKm-NTBXcpfVOaafTtEMBLHQDq8sBjwKi_XAJ3BczY150-hydW7mkbY8JclCuS4-NczIJa-RkISzkM14-3ff1ihBMQKH9snYZlKjcsq66NxPH3h_xOpAT5tQXCbG9JkSyHdjrh8q98iw1DdDXVfsRsQ7AzUSfm6tzNDEpBwXqWj9mKAYAIiwXktZ0OHiFKbU_N7mdnHqJTIohmRQ2b689CQvKFVYjeBk.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":24729,24672,23312,23948,24763,24006,24675,24731,15,24773,23348,23326,37,23305,23344,23343,23353,24005,23995,23963,24692,23955,24758,23294,24700,24669,23982,23489,23966,24676","m":"1007796774_main,1007796774_longtail","nc":1},"DnvkawA":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3i3HS4\/yV\/l\/en_US\/alGW6ij0nUBKpttZctsUAh7snRhBY2cFJJ2ox7D4ckTARtAwBie6gpm3-iPxuccQMwyJveFWkDDR4k9B7P8005D3N1GFDz2K7gzuYySt466q_ErEA_RAKj2QEr3TiNUfejyD0dCy81TCO-mSs5EX7EUkt6V-f-5J1GTPNP-gqmbGTdlYyLMnn9CCb-lbw64Pg5MzAsrk6DouQvBnnCNVXFutjzjtPcSNyiKAlwZY9VrUFtFxt8TQadd7hSJv6WhYwLeeXEG8bdzIdxTIaKT0umNmWjJcnOlKFhylaXJxty0fQxSRQi6vA3jrm8iPoryUilyMCHijIk.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23302,18148,23981,23311,23310,24008,23327,23975,23339,22843,24668,24771,24720,23292,22234,23997,23911,24779,23304,24716,22559,23962,24674,23341,23954,23957,24694,23998,23992,24756","m":"1007796774_longtail","nc":1},"Hti8Jyy":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yi\/r\/gIlLwbOheLl0MgmqdqkoJ3xRLoiiKdpWH6rFQ80ZJIPbh-qw2rfEd9eIgJ3t6cCh6WV9-K1Y2dRAVHp-wggvtrlqBkeWjmN2VsIXkVMgP0mtu9ScWk_hrtbZXsqhHQJJrW33iwsJY06ko3eBhru5eQC90EaYcTPigF0kkydk-1WCefCNUMkdcCJtWGd85H8MqrOScehZIbgEGnIGOWGhzKWh8qUcQEpNcz30M-Ux99y7DkR1P5b4iUWLrw98_YCgUMq13ZnHyEX3OivvegSCTjR7TPYroOjYApImVKSmWqi0cAprDLC7Te5_b9MByR_1IxM5miaxjd.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":24772,23949,22689,24002,24759,23260,24696,23307,23306,24009,23996,24004,23345,23959,24714,23338,23961,23324,18084,23945,23318,24703,23333,24770,24765,23346,24717,23985,23291,24709","m":"1007796774_longtail","nc":1},"IA35W9t":{"type":"css","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yf\/l\/0,cross\/vK5AjnuBuck.css?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":24665","nc":1},"3dE7hOM":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iHIO4\/yy\/l\/en_US\/fAeDB58g0BQ2OXjUZDIH3_BieyhdhRU3L.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23573,23880,23893","m":"1007796774_longtail","nc":1},"V4gVGzG":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y6\/r\/YHgPkyMYPjw.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23574","m":"1007796774_longtail","nc":1},"x1i5pBt":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3i7M54\/yj\/l\/en_US\/me7LiwnFv1d.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":16","m":"1007796774_main","nc":1}},"compMap":{"CometErrorRoot.react":{"r":["hOjEt0H","L5R7p5D","L6Tx9we","CcM+LCX","3unTLaW"],"rdfds":{"m":["CometTooltipDeferredImpl.react"],"r":["WfD8LHV"]},"rds":{"m":["FbtLogging","LynxAsyncCallbackFalcoEvent","CometSuspenseFalcoEvent","IntlQtEventFalcoEvent"],"r":["POkG4Hf"]}},"CometKeyCommandWrapperDialog.react":{"r":["hOjEt0H","L5R7p5D","oRj2xU5","MIwFPq4","CcM+LCX","+L0X93S","3unTLaW","L6Tx9we"],"rdfds":{"m":["CometTooltipDeferredImpl.react"],"r":["WfD8LHV"]},"rds":{"m":["FbtLogging","LynxAsyncCallbackFalcoEvent","CometSuspenseFalcoEvent","IntlQtEventFalcoEvent"],"r":["POkG4Hf"]}},"CometModifiedKeyCommandWrapperDialog.react":{"r":["hOjEt0H","yjOc\/BX","KxYcLg+","L5R7p5D","qiVTe9f","CcM+LCX","L3yxVXS","3unTLaW","oHmjilq","L6Tx9we"],"rdfds":{"m":["CometTooltipDeferredImpl.react"],"r":["WfD8LHV"]},"rds":{"m":["FbtLogging","LynxAsyncCallbackFalcoEvent","CometSuspenseFalcoEvent","IntlQtEventFalcoEvent"],"r":["POkG4Hf"]}},"BarcelonaCookieConsentDialog.react":{"r":["hOjEt0H","L5R7p5D","z6fuRko","5hdPwUp","CcM+LCX","3unTLaW","L6Tx9we"],"rds":{"m":["BarcelonaCookieConsentLearnMoreDialog.react","FbtLogging","LynxAsyncCallbackFalcoEvent","CometSuspenseFalcoEvent","IntlQtEventFalcoEvent"],"r":["POkG4Hf"]}},"VideoPlayerHTML5ApiCea608State":{"r":["SrRwK8Q","CcM+LCX","hOjEt0H"]},"VideoPlayerHTML5ApiWebVttState":{"r":["CcM+LCX","lI1Yib\/"]},"BarcelonaAnimatedScrollArea.react":{"r":["hOjEt0H","L5R7p5D","A2+x9zZ","ouGJTJU","f2ZV5tU","h0zbdh+","CcM+LCX","L6Tx9we"]},"CometTooltip.react":{"r":["hOjEt0H","L5R7p5D","CcM+LCX","3unTLaW","L6Tx9we"],"rdfds":{"m":["CometTooltipDeferredImpl.react"],"r":["WfD8LHV"]},"rds":{"m":["CometSuspenseFalcoEvent","FbtLogging","IntlQtEventFalcoEvent"],"r":["POkG4Hf"]},"be":1},"BaseTooltip.react":{"r":["hOjEt0H","L5R7p5D","CcM+LCX","3unTLaW","L6Tx9we"],"be":1},"liveQueryFetchWithWWWInitial":{"r":["L5R7p5D","CcM+LCX","hOjEt0H"],"rds":{"m":["ContextualConfig","BladeRunnerClient","DGWRequestStreamClient","MqttLongPollingRunner"],"r":["VJhwr7f","POkG4Hf"]},"be":1},"BarcelonaPostRoot.react":{"r":["hOjEt0H","L5R7p5D","CcM+LCX","3unTLaW","L6Tx9we"],"rdfds":{"m":["BarcelonaPostPage.react","CometPressable.react","CometExceptionDialog.react","VideoPlayerSpinner.react","VideoPlayerCaptionsArea.react","CometTooltipDeferredImpl.react"],"r":["WfD8LHV","z6fuRko","f2ZV5tU","DJHbu96"]},"rds":{"m":["FbtLogging","LynxAsyncCallbackFalcoEvent","CometSuspenseFalcoEvent","IntlQtEventFalcoEvent","BarcelonaAppUpsellDialog.react","BarcelonaOverflowMenu.react","ContextualConfig","BladeRunnerClient","BarcelonaLightboxDialog.react","BarcelonaRegionGatedAppUpsellDialog.react","VideoPlayerWithLiveVideoInterruptedOverlay.react","CometRelayEF","DGWRequestStreamClient","CometToast.react","BarcelonaToast.react","MqttLongPollingRunner","BaseToast.react"],"r":["POkG4Hf","VJhwr7f","BG+mBnk"]},"be":1},"SecuredActionChallengePasswordDialog.react":{"r":["hOjEt0H","WfD8LHV","VluRBpG","L5R7p5D","VJhwr7f","f2ZV5tU","L6Tx9we","4myS+FQ","ptX5H14","DTEAkkm","CcM+LCX","3unTLaW"],"rdfds":{"m":["CometTooltipDeferredImpl.react","CometExceptionDialog.react"]},"rds":{"m":["ContextualConfig","BladeRunnerClient","FBBrowserPasswordEncryption","FbtLogging","LynxAsyncCallbackFalcoEvent","DGWRequestStreamClient","CometSuspenseFalcoEvent","IntlQtEventFalcoEvent","CometToast.react","CometRelayEF","MqttLongPollingRunner"],"r":["POkG4Hf","qcJ8oTc","HAdaAfP","VQxSZM7"]},"be":1},"SecuredActionDialogRoot.react":{"r":["hOjEt0H","ppcMzf1","L5R7p5D","VJhwr7f","BmUKcMx","L6Tx9we","LddxAHS","80QnIbt","CcM+LCX","3unTLaW"],"rdfds":{"m":["CometExceptionDialog.react","CometTooltipDeferredImpl.react"],"r":["WfD8LHV"]},"rds":{"m":["ContextualConfig","BladeRunnerClient","CometRelayEF","FbtLogging","LynxAsyncCallbackFalcoEvent","DGWRequestStreamClient","CometSuspenseFalcoEvent","IntlQtEventFalcoEvent","CometToast.react","MqttLongPollingRunner"],"r":["POkG4Hf","BG+mBnk"]},"be":1},"SecuredActionChallengeCDSPasswordDialog.react":{"r":["hOjEt0H","PfR8M03","L5R7p5D","kYwN4K1","L6Tx9we","3x11trx","80QnIbt","CcM+LCX","VQxSZM7","3unTLaW"],"rds":{"m":["FbtLogging","LynxAsyncCallbackFalcoEvent","CometSuspenseFalcoEvent","IntlQtEventFalcoEvent"],"r":["POkG4Hf"]},"be":1},"SecuredActionNoChallengeAvailableCDSDialog.react":{"r":["hOjEt0H","SbjrRrE","L5R7p5D","kYwN4K1","L6Tx9we","3x11trx","80QnIbt","CcM+LCX","BXyw5s5","3unTLaW"],"rds":{"m":["FbtLogging","LynxAsyncCallbackFalcoEvent","CometSuspenseFalcoEvent","IntlQtEventFalcoEvent"],"r":["POkG4Hf"]},"be":1},"BarcelonaPostLikersDialog.react":{"r":["hOjEt0H","L5R7p5D","f2ZV5tU","rKwGmdo","CcM+LCX","3unTLaW","QYet1m8","L6Tx9we"],"rds":{"m":["FbtLogging","LynxAsyncCallbackFalcoEvent","CometSuspenseFalcoEvent","IntlQtEventFalcoEvent"],"r":["POkG4Hf"]},"be":1},"BarcelonaWebBloksEntryPoint.react":{"r":["N4YVD55","txi7upv","hOjEt0H","CJJpFpi","hUeQzzr","WfD8LHV","lwH\/DrC","A2jbsLw","7DhgKFs","DnvkawA","L5R7p5D","Hti8Jyy","IA35W9t","CcM+LCX","3unTLaW","L6Tx9we","f2ZV5tU"],"rds":{"m":["PolarisUnfollowDialog.react","PolarisFBSDK","FbtLogging","LynxAsyncCallbackFalcoEvent","CometSuspenseFalcoEvent","IntlQtEventFalcoEvent","AsyncRequest","ContextualConfig","BladeRunnerClient","DGWRequestStreamClient","MqttLongPollingRunner"],"r":["3dE7hOM","V4gVGzG","POkG4Hf","x1i5pBt","VJhwr7f"]},"be":1}}})});
+requireLazy(["JSScheduler","ServerJS","ScheduledApplyEach"],function(JSScheduler,ServerJS,ScheduledApplyEach){qpl_inl("7252766289159758644","tierTwoBeforeScheduler");JSScheduler.runWithPriority(3,function(){qpl_inl("7252766289159758644","tierTwoInsideScheduler");(new ServerJS()).handleWithCustomApplyEach(ScheduledApplyEach,{"define":[["BarcelonaURLMatcherConfig",[],{"tlds":["\ud55c\uad6d","\uc0bc\uc131","\ub2f7\ucef4","\ub2f7\ub137","\u9999\u6e2f","\u9999\u683c\u91cc\u62c9","\u9910\u5385","\u98df\u54c1","\u98de\u5229\u6d66","\u96fb\u8a0a\u76c8\u79d1","\u96c6\u56e2","\u901a\u8ca9","\u8d2d\u7269","\u8c37\u6b4c","\u8bfa\u57fa\u4e9a","\u8054\u901a","\u7f51\u7edc","\u7f51\u7ad9","\u7f51\u5e97","\u7f51\u5740","\u7ec4\u7ec7\u673a\u6784","\u79fb\u52a8","\u73e0\u5b9d","\u70b9\u770b","\u6fb3\u9580","\u6e38\u620f","\u6de1\u9a6c\u9521","\u673a\u6784","\u66f8\u7c4d","\u65f6\u5c1a","\u65b0\u95fb","\u65b0\u52a0\u5761","\u653f\u5e9c","\u653f\u52a1","\u624b\u8868","\u624b\u673a","\u6211\u7231\u4f60","\u6148\u5584","\u5fae\u535a","\u5e7f\u4e1c","\u5de5\u884c","\u5bb6\u96fb","\u5a31\u4e50","\u5929\u4e3b\u6559","\u5927\u62ff","\u5927\u4f17\u6c7d\u8f66","\u5728\u7ebf","\u5609\u91cc\u5927\u9152\u5e97","\u5609\u91cc","\u5546\u6807","\u5546\u5e97","\u5546\u57ce","\u53f0\u7063","\u53f0\u6e7e","\u516c\u76ca","\u516c\u53f8","\u516b\u5366","\u5065\u5eb7","\u4fe1\u606f","\u4f5b\u5c71","\u4f01\u4e1a","\u4e2d\u6587\u7f51","\u4e2d\u570b","\u4e2d\u56fd","\u4e2d\u4fe1","\u4e16\u754c","\u30dd\u30a4\u30f3\u30c8","\u30d5\u30a1\u30c3\u30b7\u30e7\u30f3","\u30bb\u30fc\u30eb","\u30b9\u30c8\u30a2","\u30b3\u30e0","\u30b0\u30fc\u30b0\u30eb","\u30af\u30e9\u30a6\u30c9","\u307f\u3093\u306a","\u10d2\u10d4","\u0e44\u0e17\u0e22","\u0e04\u0e2d\u0e21","\u0dbd\u0d82\u0d9a\u0dcf","\u0d2d\u0d3e\u0d30\u0d24\u0d02","\u0cad\u0cbe\u0cb0\u0ca4","\u0c2d\u0c3e\u0c30\u0c24\u0c4d","\u0b9a\u0bbf\u0b99\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0bc2\u0bb0\u0bcd","\u0b87\u0bb2\u0b99\u0bcd\u0b95\u0bc8","\u0b87\u0ba8\u0bcd\u0ba4\u0bbf\u0baf\u0bbe","\u0b2d\u0b3e\u0b30\u0b24","\u0aad\u0abe\u0ab0\u0aa4","\u0a2d\u0a3e\u0a30\u0a24","\u09ad\u09be\u09f0\u09a4","\u09ad\u09be\u09b0\u09a4","\u09ac\u09be\u0982\u09b2\u09be","\u0938\u0902\u0917\u0920\u0928","\u092d\u093e\u0930\u094b\u0924","\u092d\u093e\u0930\u0924\u092e\u094d","\u092d\u093e\u0930\u0924","\u0928\u0947\u091f","\u0915\u0949\u092e","\u0680\u0627\u0631\u062a","\u067e\u0627\u06a9\u0633\u062a\u0627\u0646","\u0647\u0645\u0631\u0627\u0647","\u0645\u0648\u0642\u0639","\u0645\u0648\u0628\u0627\u064a\u0644\u064a","\u0645\u0644\u064a\u0633\u064a\u0627","\u0645\u0635\u0631","\u0643\u0648\u0645","\u0643\u0627\u062b\u0648\u0644\u064a\u0643","\u0642\u0637\u0631","\u0641\u0644\u0633\u0637\u064a\u0646","\u0639\u0645\u0627\u0646","\u0639\u0631\u0628","\u0639\u0631\u0627\u0642","\u0634\u0628\u0643\u0629","\u0633\u0648\u0631\u064a\u0629","\u0633\u0648\u062f\u0627\u0646","\u062a\u0648\u0646\u0633","\u0628\u06be\u0627\u0631\u062a","\u0628\u064a\u062a\u0643","\u0628\u0627\u0632\u0627\u0631","\u0628\u0627\u0631\u062a","\u0627\u06cc\u0631\u0627\u0646","\u0627\u0645\u0627\u0631\u0627\u062a","\u0627\u0644\u0645\u063a\u0631\u0628","\u0627\u0644\u0639\u0644\u064a\u0627\u0646","\u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629","\u0627\u0644\u062c\u0632\u0627\u0626\u0631","\u0627\u0644\u0627\u0631\u062f\u0646","\u0627\u0631\u0627\u0645\u0643\u0648","\u0627\u062a\u0635\u0627\u0644\u0627\u062a","\u0627\u0628\u0648\u0638\u0628\u064a","\u05e7\u05d5\u05dd","\u0570\u0561\u0575","\u049b\u0430\u0437","\u0443\u043a\u0440","\u0441\u0440\u0431","\u0441\u0430\u0439\u0442","\u0440\u0444","\u0440\u0443\u0441","\u043e\u0440\u0433","\u043e\u043d\u043b\u0430\u0439\u043d","\u043c\u043e\u0441\u043a\u0432\u0430","\u043c\u043e\u043d","\u043c\u043a\u0434","\u043a\u043e\u043c","\u043a\u0430\u0442\u043e\u043b\u0438\u043a","\u0435\u044e","\u0434\u0435\u0442\u0438","\u0431\u0435\u043b","\u0431\u0433","\u03b5\u03bb","zw","zuerich","zone","zm","zippo","zip","zero","zara","zappos","za","yun","yt","youtube","you","yokohama","yoga","yodobashi","ye","yandex","yamaxun","yahoo","yachts","xyz","xxx","xperia","xn--zfr164b","xn--ygbi2ammx","xn--yfro4i67o","xn--y9a3aq","xn--xkc2dl3a5ee0h","xn--xkc2al3hye2a","xn--xhq521b","xn--wgbl6a","xn--wgbh1c","xn--w4rs40l","xn--w4r85el8fhu5dnra","xn--vuq861b","xn--vhquv","xn--vermgensberatung-pwb","xn--vermgensberater-ctb","xn--unup4y","xn--tiq49xqyj","xn--tckwe","xn--t60b56a","xn--ses554g","xn--s9brj9c","xn--rvc1e0am3e","xn--rovu88b","xn--rhqv96g","xn--qxam","xn--qcka1pmc","xn--q9jyb4c","xn--pssy2u","xn--pgbs0dh","xn--pbt977c","xn--p1ai","xn--p1acf","xn--ogbpf8fl","xn--o3cw4h","xn--nyqy26a","xn--nqv7fs00ema","xn--nqv7f","xn--node","xn--ngbrx","xn--ngbe9e0a","xn--ngbc5azd","xn--mxtq1m","xn--mk1bu44c","xn--mix891f","xn--mgbx4cd0ab","xn--mgbtx2b","xn--mgbt3dhd","xn--mgbpl2fh","xn--mgbi4ecexp","xn--mgbgu82a","xn--mgberp4a5d4ar","xn--mgbca7dzdo","xn--mgbc0a9azcg","xn--mgbbh1a71e","xn--mgbbh1a","xn--mgbb9fbpob","xn--mgbayh7gpa","xn--mgbai9azgqp6j","xn--mgbab2bd","xn--mgbaam7a8h","xn--mgbaakc7dvf","xn--mgba7c0bbn0a","xn--mgba3a4f16a","xn--mgba3a3ejt","xn--mgb9awbf","xn--lgbbat1ad8j","xn--l1acc","xn--kput3i","xn--kpu716f","xn--kpry57d","xn--kprw13d","xn--kcrx77d1x4a","xn--jvr189m","xn--jlq61u9w7b","xn--j6w193g","xn--j1amh","xn--j1aef","xn--io0a7i","xn--imr513n","xn--i1b6b1a6a2e","xn--hxt814e","xn--h2brj9c8c","xn--h2brj9c","xn--h2breg3eve","xn--gk3at1e","xn--gecrj9c","xn--gckr3f0f","xn--g2xx48c","xn--fzys8d69uvgm","xn--fzc2c9e2c","xn--fpcrj9c3d","xn--flw351e","xn--fjq720a","xn--fiqz9s","xn--fiqs8s","xn--fiq64b","xn--fiq228c5hs","xn--fhbei","xn--fct429k","xn--estv75g","xn--efvy88h","xn--eckvdtc9d","xn--e1a4c","xn--d1alf","xn--d1acj3b","xn--czru2d","xn--czrs0t","xn--czr694b","xn--clchc0ea0b2g2a9gcd","xn--cg4bki","xn--cck2b3b","xn--c2br7g","xn--c1avg","xn--bck1b9a5dre4c","xn--b4w605ferd","xn--9krt00a","xn--9et52u","xn--9dbq2a","xn--90ais","xn--90ae","xn--90a3ac","xn--8y0a063a","xn--80aswg","xn--80asehdb","xn--80aqecdr1a","xn--80ao21a","xn--80adxhks","xn--6qq986b3xl","xn--6frz82g","xn--5tzm5g","xn--5su34j936bgsg","xn--55qx5d","xn--55qw42g","xn--54b7fta0cc","xn--4gbrim","xn--45q11c","xn--45brj9c","xn--45br5cyl","xn--42c2d9a","xn--3pxu8k","xn--3oq18vl8pn36a","xn--3hcrj9c","xn--3e0b707e","xn--3ds443g","xn--3bst00m","xn--30rr7y","xn--2scrj9c","xn--1qqw23a","xn--1ck2e1b","xn--11b4c3d","xin","xihuan","xfinity","xerox","xbox","wtf","wtc","ws","wow","world","works","work","woodside","wolterskluwer","wme","winners","wine","windows","win","williamhill","wiki","wien","whoswho","wf","weir","weibo","wedding","wed","website","weber","webcam","weatherchannel","weather","watches","watch","warman","wanggou","wang","walter","walmart","wales","vuelos","vu","voyage","voto","voting","vote","volvo","volkswagen","vodka","vn","vlaanderen","vivo","viva","vistaprint","vista","vision","visa","virgin","vip","vin","villas","viking","vig","video","viajes","vi","vg","vet","versicherung","verm\u00f6gensberatung","verm\u00f6gensberater","verisign","ventures","vegas","ve","vc","vanguard","vana","vacations","va","uz","uy","us","ups","uol","uno","university","unicom","uk","ug","uconnect","ubs","ubank","ua","tz","tw","tvs","tv","tushu","tunes","tui","tube","tt","trv","trust","travelersinsurance","travelers","travelchannel","travel","training","trading","trade","tr","toys","toyota","town","tours","total","toshiba","toray","top","tools","tokyo","today","to","tn","tmall","tm","tl","tkmaxx","tk","tjx","tjmaxx","tj","tirol","tires","tips","tiffany","tienda","tickets","tiaa","theatre","theater","thd","th","tg","tf","teva","tennis","temasek","telefonica","telecity","tel","technology","tech","team","tdk","td","tci","tc","taxi","tax","tattoo","tatar","tatamotors","target","taobao","talk","taipei","tab","sz","systems","symantec","sydney","sy","sx","swiss","swiftcover","swatch","sv","suzuki","surgery","surf","support","supply","supplies","sucks","su","style","study","studio","stream","store","storage","stockholm","stcgroup","stc","statoil","statefarm","statebank","starhub","star","staples","stada","st","srt","srl","sr","spreadbetting","spot","sport","spiegel","space","soy","sony","song","solutions","solar","sohu","software","softbank","social","soccer","so","sncf","sn","smile","smart","sm","sling","sl","skype","sky","skin","ski","sk","sj","site","singles","sina","silk","si","shriram","showtime","show","shouji","shopping","shop","shoes","shiksha","shia","shell","shaw","sharp","shangrila","sh","sg","sfr","sexy","sex","sew","seven","ses","services","sener","select","seek","security","secure","seat","search","se","sd","scot","scor","scjohnson","science","schwarz","schule","school","scholarships","schmidt","schaeffler","scb","sca","sc","sbs","sbi","sb","saxo","save","sas","sarl","sapo","sap","sanofi","sandvikcoromant","sandvik","samsung","samsclub","salon","sale","sakura","safety","safe","saarland","sa","ryukyu","rwe","rw","run","ruhr","rugby","ru","rsvp","rs","room","rogers","rodeo","rocks","rocher","ro","rmit","rip","rio","ril","rightathome","ricoh","richardli","rich","rexroth","reviews","review","restaurant","rest","republican","report","repair","rentals","rent","ren","reliance","reit","reisen","reise","rehab","redumbrella","redstone","red","recipes","realty","realtor","realestate","read","re","raid","radio","racing","qvc","quest","quebec","qpon","qa","py","pwc","pw","pub","pt","ps","prudential","pru","protection","property","properties","promo","progressive","prof","productions","prod","pro","prime","press","praxi","pramerica","pr","post","porn","politie","poker","pohl","pnc","pn","pm","plus","plumbing","playstation","play","place","pl","pk","pizza","pioneer","pink","ping","pin","pid","pictures","pictet","pics","piaget","physio","photos","photography","photo","phone","philips","phd","pharmacy","ph","pg","pfizer","pf","pet","pe","pccw","pay","passagens","party","parts","partners","pars","paris","panerai","panasonic","page","pa","ovh","ott","otsuka","osaka","origins","organic","org","orange","oracle","open","ooo","onyourside","online","onl","onion","ong","one","omega","om","ollo","oldnavy","olayangroup","olayan","okinawa","office","off","observer","obi","nz","nyc","nu","ntt","nrw","nra","nr","np","nowtv","nowruz","now","norton","northwesternmutual","nokia","no","nl","nissay","nissan","ninja","nikon","nike","nico","ni","nhk","ngo","ng","nfl","nf","nexus","nextdirect","next","news","newholland","new","neustar","network","netflix","netbank","net","nec","ne","nc","nba","navy","natura","nationwide","name","nagoya","nadex","nab","na","mz","my","mx","mw","mv","mutual","museum","mu","mtr","mtn","mt","msd","ms","mr","mq","mp","movistar","movie","mov","motorcycles","moto","moscow","mortgage","mormon","mopar","monster","money","monash","mom","moi","moe","moda","mobily","mobile","mobi","mo","mn","mma","mm","mls","mlb","ml","mk","mitsubishi","mit","mint","mini","mil","microsoft","miami","mh","mg","metlife","merckmsd","meo","menu","men","memorial","meme","melbourne","meet","media","med","me","md","mckinsey","mc","mba","mattel","maserati","marshalls","marriott","markets","marketing","market","map","mango","management","man","makeup","maison","maif","madrid","macys","ma","ly","lv","luxury","luxe","lupin","lundbeck","lu","ltda","ltd","lt","ls","lr","lplfinancial","lpl","love","lotto","lotte","london","lol","loft","locus","locker","loans","loan","lk","llc","lixil","living","live","lipsy","link","linde","lincoln","limo","limited","lilly","like","lighting","lifestyle","lifeinsurance","life","lidl","liaison","li","lgbt","lexus","lego","legal","lefrak","leclerc","lease","lds","lc","lb","lawyer","law","latrobe","latino","lat","lasalle","lanxess","landrover","land","lancome","lancia","lancaster","lamer","lamborghini","ladbrokes","lacaixa","la","kz","kyoto","ky","kw","kuokgroup","kred","krd","kr","kpn","kpmg","kp","kosher","komatsu","koeln","kn","km","kiwi","kitchen","kindle","kinder","kim","kia","ki","kh","kg","kfh","kerryproperties","kerrylogistics","kerryhotels","ke","kddi","kaufen","juniper","juegos","jprs","jpmorgan","jp","joy","jot","joburg","jobs","jo","jnj","jmp","jm","jll","jlc","jio","jewelry","jetzt","jeep","je","jcp","jcb","java","jaguar","iwc","iveco","itv","itau","it","istanbul","ist","ismaili","iselect","is","irish","ir","iq","ipiranga","io","investments","intuit","international","intel","int","insure","insurance","institute","ink","ing","info","infiniti","industries","inc","in","immobilien","immo","imdb","imamat","im","il","ikano","ifm","ieee","ie","id","icu","ice","icbc","ibm","hyundai","hyatt","hughes","hu","ht","hsbc","hr","how","house","hotmail","hotels","hoteles","hot","hosting","host","hospital","horse","honeywell","honda","homesense","homes","homegoods","homedepot","holiday","holdings","hockey","hn","hm","hkt","hk","hiv","hitachi","hisamitsu","hiphop","hgtv","hermes","here","helsinki","help","healthcare","health","hdfcbank","hdfc","hbo","haus","hangout","hamburg","hair","gy","gw","guru","guitars","guide","guge","gucci","guardian","gu","gt","gs","group","grocery","gripe","green","gratis","graphics","grainger","gr","gq","gp","gov","got","gop","google","goog","goodyear","goodhands","goo","golf","goldpoint","gold","godaddy","gn","gmx","gmo","gmbh","gmail","gm","globo","global","gle","glass","glade","gl","giving","gives","gifts","gift","gi","gh","ggee","gg","gf","george","genting","gent","gea","ge","gdn","gd","gbiz","gb","gay","garden","gap","games","game","gallup","gallo","gallery","gal","ga","fyi","futbol","furniture","fund","fun","fujixerox","fujitsu","ftr","frontier","frontdoor","frogans","frl","fresenius","free","fr","fox","foundation","forum","forsale","forex","ford","football","foodnetwork","food","foo","fo","fm","fly","flowers","florist","flir","flights","flickr","fk","fj","fitness","fit","fishing","fish","firmdale","firestone","fire","financial","finance","final","film","fido","fidelity","fiat","fi","ferrero","ferrari","feedback","fedex","fast","fashion","farmers","farm","fans","fan","family","faith","fairwinds","fail","fage","extraspace","express","exposed","expert","exchange","everbank","events","eus","eurovision","eu","etisalat","et","esurance","estate","esq","es","erni","ericsson","er","equipment","epson","epost","enterprises","engineering","engineer","energy","emerck","email","eg","ee","education","edu","edeka","eco","ec","eat","earth","dz","dvr","dvag","durban","dupont","duns","dunlop","duck","dubai","dtv","drive","download","dot","domains","doha","dog","dodge","doctor","docs","do","dnp","dm","dk","dj","diy","dish","discover","discount","directory","direct","digital","diet","diamonds","dhl","dev","design","desi","dentist","dental","democrat","delta","deloitte","dell","delivery","degree","deals","dealer","deal","de","dds","dclk","day","datsun","dating","date","data","dance","dad","dabur","cz","cyou","cymru","cy","cx","cw","cv","cuisinella","cu","csc","cruises","cruise","crs","crown","cricket","creditunion","creditcard","credit","cr","cpa","courses","coupons","coupon","country","corsica","coop","cool","cookingchannel","cooking","contractors","contact","consulting","construction","condos","comsec","computer","compare","company","community","commbank","comcast","com","cologne","college","coffee","codes","coach","co","cn","cm","clubmed","club","cloud","clothing","clinique","clinic","click","cleaning","claims","cl","ck","cityeats","city","citic","citi","citadel","cisco","circle","cipriani","ci","church","chrysler","chrome","christmas","chintai","cheap","chat","chase","channel","chanel","ch","cg","cfd","cfa","cf","cern","ceo","center","ceb","cd","cc","cbs","cbre","cbn","cba","catholic","catering","cat","casino","cash","caseih","case","casa","cartier","cars","careers","career","care","cards","caravan","car","capitalone","capital","capetown","canon","cancerresearch","camp","camera","cam","calvinklein","call","cal","cafe","cab","ca","bzh","bz","by","bw","bv","buzz","buy","business","builders","build","bugatti","budapest","bt","bs","brussels","brother","broker","broadway","bridgestone","bradesco","br","box","boutique","bot","boston","bostik","bosch","boots","booking","book","boo","bond","bom","bofa","boehringer","boats","bo","bnpparibas","bnl","bn","bmw","bms","bm","blue","bloomberg","blog","blockbuster","blanco","blackfriday","black","bj","biz","bio","bingo","bing","bike","bid","bible","bi","bharti","bh","bg","bf","bet","bestbuy","best","berlin","bentley","beer","beauty","beats","be","bd","bcn","bcg","bbva","bbt","bbc","bb","bayern","bauhaus","basketball","baseball","bargains","barefoot","barclays","barclaycard","barcelona","bar","bank","band","bananarepublic","banamex","baidu","baby","ba","azure","az","axa","ax","aws","aw","avianca","autos","auto","author","auspost","audio","audible","audi","auction","au","attorney","athleta","at","associates","asia","asda","as","arte","art","arpa","army","archi","aramco","arab","ar","aquarelle","aq","apple","app","apartments","aol","ao","anz","anquan","android","analytics","amsterdam","amica","amfam","amex","americanfamily","americanexpress","am","alstom","alsace","ally","allstate","allfinanz","alipay","alibaba","alfaromeo","al","akdn","airtel","airforce","airbus","aigo","aig","ai","agency","agakhan","ag","africa","afl","afamilycompany","af","aetna","aero","aeg","ae","adult","ads","adac","ad","actor","active","aco","accountants","accountant","accenture","academy","ac","abudhabi","abogado","able","abc","abbvie","abbott","abb","abarth","aarp","aaa"]},7198],["BarcelonaWebConfig",[],{"is_crawler_request":false,"is_past_launch_date":true,"username_domain_suffix":"threads.net","seconds_until_launch_date":-1,"golden_ticket_triggers":["1992","p92","saymore","thread","ticket"],"fediverse_server_names":[]},7172],["DateFormatConfig",[],{"numericDateOrder":["m","d","y"],"numericDateSeparator":"\/","shortDayNames":["Mon","Tue","Wed","Thu","Fri","Sat","Sun"],"narrowDayNames":["M","T","W","T","F","S","S"],"timeSeparator":":","weekStart":6,"formats":{"D":"D","D g:ia":"D g:ia","D M d":"D M d","D M d, Y":"D M d, Y","D M j":"D M j","D M j, g:ia":"D M j, g:ia","D M j, y":"D M j, y","D M j, Y g:ia":"D M j, Y g:ia","D, M j, Y":"D, M j, Y","F d":"F d","F d, Y":"F d, Y","F g":"F g","F j":"F j","F j, Y":"F j, Y","F j, Y \u0040 g:i A":"F j, Y \u0040 g:i A","F j, Y g:i a":"F j, Y g:i a","F jS":"F jS","F jS, g:ia":"F jS, g:ia","F jS, Y":"F jS, Y","F Y":"F Y","g A":"g A","g:i":"g:i","g:i A":"g:i A","g:i a":"g:i a","g:iA":"g:iA","g:ia":"g:ia","g:ia F jS, Y":"g:ia F jS, Y","g:iA l, F jS":"g:iA l, F jS","g:ia M j":"g:ia M j","g:ia M jS":"g:ia M jS","g:ia, F jS":"g:ia, F jS","g:iA, l M jS":"g:iA, l M jS","g:sa":"g:sa","H:I - M d, Y":"H:I - M d, Y","h:i a":"h:i a","h:m:s m\/d\/Y":"h:m:s m\/d\/Y","j":"j","l F d, Y":"l F d, Y","l g:ia":"l g:ia","l, F d, Y":"l, F d, Y","l, F j":"l, F j","l, F j, Y":"l, F j, Y","l, F jS":"l, F jS","l, F jS, g:ia":"l, F jS, g:ia","l, M j":"l, M j","l, M j, Y":"l, M j, Y","l, M j, Y g:ia":"l, M j, Y g:ia","M d":"M d","M d, Y":"M d, Y","M d, Y g:ia":"M d, Y g:ia","M d, Y ga":"M d, Y ga","M j":"M j","M j, Y":"M j, Y","M j, Y g:i A":"M j, Y g:i A","M j, Y g:ia":"M j, Y g:ia","M jS, g:ia":"M jS, g:ia","M Y":"M Y","M y":"M y","m-d-y":"m-d-y","M. d":"M. d","M. d, Y":"M. d, Y","j F Y":"j F Y","m.d.y":"m.d.y","m\/d":"m\/d","m\/d\/Y":"m\/d\/Y","m\/d\/y":"m\/d\/y","m\/d\/Y g:ia":"m\/d\/Y g:ia","m\/d\/y H:i:s":"m\/d\/y H:i:s","m\/d\/Y h:m":"m\/d\/Y h:m","n":"n","n\/j":"n\/j","n\/j, g:ia":"n\/j, g:ia","n\/j\/y":"n\/j\/y","Y":"Y","Y-m-d":"Y-m-d","Y\/m\/d":"Y\/m\/d","y\/m\/d":"y\/m\/d","j \/ F \/ Y":"j \/ F \/ Y"},"ordinalSuffixes":{"1":"st","2":"nd","3":"rd","4":"th","5":"th","6":"th","7":"th","8":"th","9":"th","10":"th","11":"th","12":"th","13":"th","14":"th","15":"th","16":"th","17":"th","18":"th","19":"th","20":"th","21":"st","22":"nd","23":"rd","24":"th","25":"th","26":"th","27":"th","28":"th","29":"th","30":"th","31":"st"}},165],["IntlCompactDecimalNumberFormatConfig",[],{"short_patterns":{"3":{"4":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0mil","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0mil"},"24":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0mil","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0mil"}},"4":{"4":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0mil","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0mil"},"24":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0mil","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0mil"}},"5":{"4":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0mil","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0mil"},"24":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0mil","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0mil"}},"6":{"4":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0mi","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0mi"},"24":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0mi","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0mi"}},"7":{"4":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0mi","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0mi"},"24":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0mi","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0mi"}},"8":{"4":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0mi","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0mi"},"24":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0mi","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0mi"}},"9":{"4":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0bi","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0bi"},"24":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0bi","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0bi"}},"10":{"4":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0bi","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0bi"},"24":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0bi","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0bi"}},"11":{"4":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0bi","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0bi"},"24":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0bi","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0bi"}},"12":{"4":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0tri","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0tri"},"24":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0tri","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0tri"}},"13":{"4":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0tri","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0tri"},"24":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0tri","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0tri"}},"14":{"4":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0tri","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0tri"},"24":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":"\u00a0tri","negative_prefix_pattern":"-","negative_suffix_pattern":"\u00a0tri"}}},"long_patterns":{"3":{"4":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":" mil","negative_prefix_pattern":"-","negative_suffix_pattern":" mil"},"24":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":" mil","negative_prefix_pattern":"-","negative_suffix_pattern":" mil"}},"4":{"4":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":" mil","negative_prefix_pattern":"-","negative_suffix_pattern":" mil"},"24":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":" mil","negative_prefix_pattern":"-","negative_suffix_pattern":" mil"}},"5":{"4":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":" mil","negative_prefix_pattern":"-","negative_suffix_pattern":" mil"},"24":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":" mil","negative_prefix_pattern":"-","negative_suffix_pattern":" mil"}},"6":{"4":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":" milh\u00e3o","negative_prefix_pattern":"-","negative_suffix_pattern":" milh\u00e3o"},"24":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":" milh\u00f5es","negative_prefix_pattern":"-","negative_suffix_pattern":" milh\u00f5es"}},"7":{"4":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":" milh\u00e3o","negative_prefix_pattern":"-","negative_suffix_pattern":" milh\u00e3o"},"24":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":" milh\u00f5es","negative_prefix_pattern":"-","negative_suffix_pattern":" milh\u00f5es"}},"8":{"4":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":" milh\u00e3o","negative_prefix_pattern":"-","negative_suffix_pattern":" milh\u00e3o"},"24":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":" milh\u00f5es","negative_prefix_pattern":"-","negative_suffix_pattern":" milh\u00f5es"}},"9":{"4":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":" bilh\u00e3o","negative_prefix_pattern":"-","negative_suffix_pattern":" bilh\u00e3o"},"24":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":" bilh\u00f5es","negative_prefix_pattern":"-","negative_suffix_pattern":" bilh\u00f5es"}},"10":{"4":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":" bilh\u00e3o","negative_prefix_pattern":"-","negative_suffix_pattern":" bilh\u00e3o"},"24":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":" bilh\u00f5es","negative_prefix_pattern":"-","negative_suffix_pattern":" bilh\u00f5es"}},"11":{"4":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":" bilh\u00e3o","negative_prefix_pattern":"-","negative_suffix_pattern":" bilh\u00e3o"},"24":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":" bilh\u00f5es","negative_prefix_pattern":"-","negative_suffix_pattern":" bilh\u00f5es"}},"12":{"4":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":" trilh\u00e3o","negative_prefix_pattern":"-","negative_suffix_pattern":" trilh\u00e3o"},"24":{"min_fraction_digits":null,"min_integer_digits":1,"positive_prefix_pattern":"","positive_suffix_pattern":" trilh\u00f5es","negative_prefix_pattern":"-","negative_suffix_pattern":" trilh\u00f5es"}},"13":{"4":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":" trilh\u00e3o","negative_prefix_pattern":"-","negative_suffix_pattern":" trilh\u00e3o"},"24":{"min_fraction_digits":null,"min_integer_digits":2,"positive_prefix_pattern":"","positive_suffix_pattern":" trilh\u00f5es","negative_prefix_pattern":"-","negative_suffix_pattern":" trilh\u00f5es"}},"14":{"4":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":" trilh\u00e3o","negative_prefix_pattern":"-","negative_suffix_pattern":" trilh\u00e3o"},"24":{"min_fraction_digits":null,"min_integer_digits":3,"positive_prefix_pattern":"","positive_suffix_pattern":" trilh\u00f5es","negative_prefix_pattern":"-","negative_suffix_pattern":" trilh\u00f5es"}}}},2981],["CLDRDateRenderingClientRollout",[],{"formatDateClientLoggerSamplingRate":0.0001},3003],["VideoPlayerStateBasedLoggingEvents",[],{"StateBasedLoggingEventNames":["cancelled_requested_playing","caption_change","chromecast_availability_checked","chromecast_not_supported","chromecast_button_visible","entered_fs","entered_hd","error","exited_fs","exited_hd","finished_loading","finished_playing","headset_connected","headset_disconnected","host_error","muted","paused","player_format_changed","quality_change","requested_playing","scrubbed","seeked","started_playing","unmuted","unpaused","volume_changed","volume_decrease","volume_increase","viewport_rotated","viewport_zoomed","heading_reset","guide_entered","guide_exited","spherical_fallback_entered","played_for_three_seconds","commercial_break_offscreen","commercial_break_onscreen","ad_break_starting_indicator","ad_break_non_interruptive_ad_start","ad_break_non_interruptive_ad_click","ad_break_pre_roll_ad_start","ad_break_tap_on_trailer","ad_break_tap_start_from_trailer","representation_ended","heart_beat","stale","viewability_changed","video_logging_session_timeout","video_logging_session_wakeup","retry_on_error","playback_speed_changed","video_warmup_evicted","suppress_video_off","suppress_video_on","error_recovery_attempt","displayed_frames","video_viewability_updated"]},3462],["CLDRDateFormatConfig",[],{"supportedPHPFormatsKeys":{"D":"E","D g:ia":"Ejm","D M d":"MMMEd","D M d, Y":"yMMMEd","D M j":"MMMEd","D M j, y":"yMMMEd","D, M j":"MMMEd","D, M j, Y":"yMMMEd","F d":"MMMMd","F d, Y":"date_long","F j":"MMMMd","F j, Y":"date_long","F j, Y \u0040 g:i A":"dateTime_long_short","F j, Y g:i a":"dateTime_long_short","F j, Y \u0040 g:i:s A":"dateTime_long_medium","F jS":"MMMMd","F jS, g:ia":"dateTime_long_short","F jS, Y":"date_long","F Y":"yMMMM","g A":"j","G:i":"time_short","g:i":"time_short","g:i a":"time_short","g:i A":"time_short","g:i:s A":"time_medium","g:ia":"time_short","g:iA":"time_short","g:ia F jS, Y":"dateTime_long_short","g:iA l, F jS":"dateTime_full_short","g:ia M jS":"dateTime_medium_short","g:ia, F jS":"dateTime_long_short","g:iA, l M jS":"dateTime_full_short","h:i a":"time_short","h:m:s m\/d\/Y":"dateTime_short_short","j":"d","j F Y":"date_long","l F d, Y":"date_full","l, F d, Y":"date_full","l, F j":"date_full","l, F j, Y":"date_full","l, F jS":"date_full","l, F jS, g:ia":"dateTime_full_short","l, M j":"date_full","l, M j, Y":"date_full","l, M j, Y g:ia":"dateTime_full_short","M d":"MMMd","M d, Y":"date_medium","M d, Y g:ia":"dateTime_medium_short","M d, Y ga":"dateTime_medium_short","M j":"MMMd","M j, Y":"date_medium","M j, Y g:i A":"dateTime_medium_short","M j, Y g:ia":"dateTime_medium_short","M jS, g:ia":"dateTime_medium_short","M y":"yMMM","M Y":"yMMM","M. d":"MMMd","M. d, Y":"date_medium","m\/d":"Md","m\/d\/Y g:ia":"dateTime_short_short","m\/d\/y H:i:s":"dateTime_short_short","n":"M","n\/j":"Md","n\/j, g:ia":"dateTime_short_short","n\/j\/y":"date_short","Y":"y"},"isLocaleInConfigerator":true,"CLDRConfigeratorFormats":{"dateFormats":{"full":"EEEE, d 'de' MMMM 'de' y","long":"d 'de' MMMM 'de' y","medium":"d 'de' MMM 'de' y","short":"dd\/MM\/y"},"timeFormats":{"full":"HH:mm:ss zzzz","long":"HH:mm:ss z","medium":"HH:mm:ss","short":"HH:mm"},"dateTimeFormats":{"full":"{1} {0}","long":"{1} {0}","medium":"{1} {0}","short":"{1} {0}"},"availableFormats":{"Bh":"h B","Bhm":"h:mm B","Bhms":"h:mm:ss B","E":"ccc","EBhm":"E h:mm B","EBhms":"E h:mm:ss B","EHm":"E, HH:mm","EHms":"E, HH:mm:ss","Ed":"E, d","Ehm":"E, h:mm a","Ehms":"E, h:mm:ss a","Gy":"y G","GyMMM":"MMM 'de' y G","GyMMMEd":"E, d 'de' MMM 'de' y G","GyMMMd":"d 'de' MMM 'de' y G","H":"HH","Hm":"HH:mm","Hms":"HH:mm:ss","Hmsv":"HH:mm:ss v","Hmv":"HH:mm v","M":"L","MEd":"E, dd\/MM","MMM":"LLL","MMMEd":"E, d 'de' MMM","MMMMEd":"E, d 'de' MMMM","MMMMW-count-one":"W'\u00aa' 'semana' 'de' MMMM","MMMMW-count-other":"W'\u00aa' 'semana' 'de' MMMM","MMMMd":"d 'de' MMMM","MMMd":"d 'de' MMM","MMdd":"dd\/MM","Md":"d\/M","d":"d","h":"h a","hm":"h:mm a","hms":"h:mm:ss a","hmsv":"h:mm:ss a v","hmv":"h:mm a v","ms":"mm:ss","y":"y","yM":"MM\/y","yMEd":"E, dd\/MM\/y","yMM":"MM\/y","yMMM":"MMM 'de' y","yMMMEd":"E, d 'de' MMM 'de' y","yMMMM":"MMMM 'de' y","yMMMMEd":"E, d 'de' MMMM 'de' y","yMMMMd":"d 'de' MMMM 'de' y","yMMMd":"d 'de' MMM 'de' y","yMd":"dd\/MM\/y","yQQQ":"QQQ 'de' y","yQQQQ":"QQQQ 'de' y","yw-count-one":"w'\u00aa' 'semana' 'de' Y","yw-count-other":"w'\u00aa' 'semana' 'de' Y"}},"CLDRRegionalConfigeratorFormats":{"dateFormats":{"full":"EEEE, d 'de' MMMM 'de' y","long":"d 'de' MMMM 'de' y","medium":"d 'de' MMM 'de' y","short":"dd\/MM\/y"},"timeFormats":{"full":"HH:mm:ss zzzz","long":"HH:mm:ss z","medium":"HH:mm:ss","short":"HH:mm"},"dateTimeFormats":{"full":"{1} {0}","long":"{1} {0}","medium":"{1} {0}","short":"{1} {0}"},"availableFormats":{"Bh":"h B","Bhm":"h:mm B","Bhms":"h:mm:ss B","E":"ccc","EBhm":"E h:mm B","EBhms":"E h:mm:ss B","EHm":"E, HH:mm","EHms":"E, HH:mm:ss","Ed":"E, d","Ehm":"E, h:mm a","Ehms":"E, h:mm:ss a","Gy":"y G","GyMMM":"MMM 'de' y G","GyMMMEd":"E, d 'de' MMM 'de' y G","GyMMMd":"d 'de' MMM 'de' y G","H":"HH","Hm":"HH:mm","Hms":"HH:mm:ss","Hmsv":"HH:mm:ss v","Hmv":"HH:mm v","M":"L","MEd":"E, dd\/MM","MMM":"LLL","MMMEd":"E, d 'de' MMM","MMMMEd":"E, d 'de' MMMM","MMMMW-count-one":"W'\u00aa' 'semana' 'de' MMMM","MMMMW-count-other":"W'\u00aa' 'semana' 'de' MMMM","MMMMd":"d 'de' MMMM","MMMd":"d 'de' MMM","MMdd":"dd\/MM","Md":"d\/M","d":"d","h":"h a","hm":"h:mm a","hms":"h:mm:ss a","hmsv":"h:mm:ss a v","hmv":"h:mm a v","ms":"mm:ss","y":"y","yM":"MM\/y","yMEd":"E, dd\/MM\/y","yMM":"MM\/y","yMMM":"MMM 'de' y","yMMMEd":"E, d 'de' MMM 'de' y","yMMMM":"MMMM 'de' y","yMMMMEd":"E, d 'de' MMMM 'de' y","yMMMMd":"d 'de' MMMM 'de' y","yMMMd":"d 'de' MMM 'de' y","yMd":"dd\/MM\/y","yQQQ":"QQQ 'de' y","yQQQQ":"QQQQ 'de' y","yw-count-one":"w'\u00aa' 'semana' 'de' Y","yw-count-other":"w'\u00aa' 'semana' 'de' Y"}},"CLDRToPHPSymbolConversion":{"yyyy":"Y","yy":"y","y":"Y","MMMMM":"M","MMMM":"F","MMM":"M","MM":"m","M":"n","dd":"d","d":"j","EEEEE":"D","EEEE":"l","EEE":"D","EE":"D","E":"D","aaaaa":"A","aaaa":"A","aaa":"A","aa":"A","a":"A","bbbbb":"A","bbbb":"A","bbb":"A","bb":"A","b":"A","BBBBB":"A","BBBB":"A","BBB":"A","BB":"A","B":"A","HH":"H","H":"G","hh":"h","h":"g","K":"g","mm":"i","ss":"s","z":"","zz":"","zzz":"","ccccc":"D","cccc":"l","ccc":"D","cc":"D","c":"D","LLLLL":"M","LLLL":"f","LLL":"M","LL":"m","L":"n","G":""},"intlDateSpecialChars":{"cldrDelimiter":"'","singleQuote":"'","singleQuoteHolder":"*"}},3019],["IsInternSite",[],{"is_intern_site":false},4517],["VideoPlayerContextSensitiveConfigPayload",[],{"context_sensitive_values":{"buffering_overflow_threshold":[{"value":3.0832147598267,"contexts":[{"name":"connection_quality","value":"POOR"}]},{"value":3.0832147598267,"contexts":[{"name":"connection_quality","value":"MODERATE"}]}],"enable_request_pipelining_for_live":[{"value":false,"contexts":[{"name":"latency_level","value":"low"}]}],"initial_stream_buffer_size_float":[{"value":10,"contexts":[{"name":"is_ad","value":true}]}],"is_low_latency":[{"value":true,"contexts":[{"name":"latency_level","value":"low"}]}],"live_stream_buffer_size_float":[{"value":10,"contexts":[{"name":"content_category","value":"esports"}]},{"value":6.5,"contexts":[{"name":"content_category","value":"gaming"}]}],"num_predictive_segments":[{"value":4,"contexts":[{"name":"latency_level","value":"low"}]}],"oz_www_append_byte_target_without_range":[{"value":1,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_bandwidth_ignore_on_stream_write_samples":[{"value":true,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_bandwidth_use_response_time_adjustment":[{"value":true,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_buffer_ahead_target":[{"value":10,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"content_category","value":"gaming"}]},{"value":14,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"is_latency_sensitive_broadcast","value":true}]},{"value":24,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_catchup_timeout_after_buffering_sec":[{"value":0.001,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_catchup_timeout_after_play_sec":[{"value":30,"contexts":[{"name":"fbls_tier","value":"user"}]}],"oz_www_ignore_reset_after_seek_if_bufferahead":[{"value":true,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_in_play_buffer_overflow_target":[{"value":1,"contexts":[{"name":"connection_quality","value":"POOR"}]},{"value":1,"contexts":[{"name":"connection_quality","value":"MODERATE"}]}],"oz_www_latencymanager_stalled_edgelatency_sec":[{"value":2,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"latency_level","value":"ultra-low"}]},{"value":6,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"content_category","value":"gaming"}]},{"value":10,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"is_latency_sensitive_broadcast","value":true}]},{"value":18,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_latencymanager_stalled_edgelatency_sec_on":[{"value":false,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"latency_level","value":"ultra-low"}]},{"value":true,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_live_initial_playback_position":[{"value":-14,"contexts":[{"name":"content_category","value":"gaming"}]}],"oz_www_live_rewind_seek_to_live_delta":[{"value":4,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"is_latency_sensitive_broadcast","value":true}]}],"oz_www_minimum_bytes_to_sample_on_close":[{"value":10000,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_ms_promise_for_null":[{"value":true,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_ms_promise_for_null_ms":[{"value":1000,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_network_reload_mpd_json":[{"value":"[\"504\", \"404\"]","contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_network_retry_intervals_json":[{"value":"{\"0\": 1000, \"404\": 2000, \"502\": 1000, \"503\": 1000, \"504\": 1000, \"20\": 1, \"429\": 2000}","contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_overwrite_live_time_range_block_margin":[{"value":5,"contexts":[{"name":"latency_level","value":"low"},{"name":"fbls_tier","value":"user"}]}],"oz_www_overwrite_livehead_fall_behind_block_threshold":[{"value":10,"contexts":[{"name":"latency_level","value":"low"}]}],"oz_www_pdash_download_cursor_catchup_threshold_gop_multiplier":[{"value":1,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_pdash_download_cursor_catchup_threshold_sec":[{"value":1,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"latency_level","value":"ultra-low"}]},{"value":2,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"is_latency_sensitive_broadcast","value":true},{"name":"latency_level","value":"low"}]},{"value":6,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"is_latency_sensitive_broadcast","value":true}]},{"value":10,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"latency_level","value":"low"}]},{"value":10,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_pdash_download_cursor_catchup_tolerance_sec":[{"value":1,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_pdash_use_pdash_segmentlocator":[{"value":true,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_per_stream_duration_target":[{"value":0.5,"contexts":[{"name":"connection_quality","value":"GOOD"}]},{"value":0.5,"contexts":[{"name":"connection_quality","value":"EXCELLENT"}]}],"oz_www_playback_speed_latency_slowdown_adjustment_rate":[{"value":0.2,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_playback_speed_latency_speedup_adjustment_rate":[{"value":0.1,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_playback_speed_min_buffer_sec":[{"value":0.5,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"latency_level","value":"ultra-low"}]}],"oz_www_player_emit_mpdparsed_early":[{"value":true,"contexts":[{"name":"is_live","value":true}]}],"oz_www_player_emit_mpdready_early":[{"value":true,"contexts":[{"name":"is_live","value":true}]}],"oz_www_player_formats_for_low_latency":[{"value":"[\"*\"]","contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_playhead_manager_buffered_auto_seek_playhead_slack":[{"value":0.01,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_playhead_manager_buffered_numerical_error":[{"value":0,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_playhead_manager_clamp_initial_playback_position":[{"value":true,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_pre_start_buffer_ahead_target":[{"value":10,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_reset_catchup_timeout_after_play_sec_on_overwrite":[{"value":true,"contexts":[{"name":"content_category","value":"gaming"}]},{"value":true,"contexts":[{"name":"fbls_tier","value":"user"}]}],"oz_www_seek_on_latency_level_change_allowed":[{"value":"[[\"low\",\"normal\"],[\"normal\",\"normal\"]]","contexts":[{"name":"content_category","value":"gaming"},{"name":"is_live","value":true}]}],"oz_www_skip_videobuffer_gaps":[{"value":true,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_skip_videobuffer_gaps_on_buffer_updated":[{"value":true,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_stale_mpd_buffer_ahead_target":[{"value":2,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_start_buffer_underflow_target":[{"value":1.1,"contexts":[{"name":"connection_quality","value":"POOR"}]},{"value":1.1,"contexts":[{"name":"connection_quality","value":"MODERATE"}]}],"oz_www_steadystate_minbuffer_buckets":[{"value":4,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"latency_level","value":"ultra-low"}]},{"value":20,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"is_latency_sensitive_broadcast","value":true}]}],"oz_www_steadystate_minbuffer_sec":[{"value":1,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"latency_level","value":"ultra-low"}]},{"value":1.75,"contexts":[{"name":"streaming_implementation","value":"pdash"},{"name":"is_latency_sensitive_broadcast","value":true}]}],"oz_www_stream_types_eligible_for_partial_playback":[{"value":"audio","contexts":[{"name":"is_live","value":true}]}],"oz_www_systemic_risk_abr_initial_risk_factor":[{"value":4,"contexts":[{"name":"is_live","value":true}]}],"oz_www_systemic_risk_abr_low_mos_resolution":[{"value":260,"contexts":[{"name":"is_live","value":true}]}],"oz_www_time_to_first_byte_ignore_above_threshold_ms":[{"value":200,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}],"oz_www_use_live_latency_manager":[{"value":true,"contexts":[{"name":"streaming_implementation","value":"pdash"}]}]},"static_values":{"stream_buffer_size_float":15,"initial_stream_buffer_size_float":7.5,"min_switch_interval":5000,"min_eval_interval":1000,"bandwidth_upgrade_target":0.9,"live_bandwidth_upgrade_target":0.63308577239513,"resolution_constraint_factor":2,"resolve_video_time_update_on_fragmented_time_ranges":true,"live_send_push_headers":false,"live_initial_stream_buffer_size_float":3.5,"enable_video_debug":false,"reappend_init_segment_after_abort":false,"current_time_during_ready_state_zero_throws":false,"www_videos_nudge_timestamp_correction_s":0,"www_videos_extended_spl_logging_for_connected_tv":false,"live_abr_send_push_headers":false,"shaka_native_promise":false,"oz_www_skip_videobuffer_gaps":true,"oz_www_skip_timerange_gaps":true,"oz_www_skip_videobuffer_gaps_on_buffer_updated":true,"oz_www_skip_videobuffer_gaps_max_gap_size_sec":0,"use_resource_timing_entry_for_bandwidth":false,"force_lowest_representation_threshold":0,"force_lower_representation_step_ratio":0,"enable_request_pipelining_for_vod":false,"enable_streaming_for_vod":false,"use_continuous_streaming":false,"streaming_segment_size":4,"streaming_bandwidth_update_interval":180000,"multi_segment_decay":0,"enable_request_pipelining_for_live":true,"enable_streaming_code_path":true,"ignore_errors_after_unload":true,"use_pending_seek_position_for_reference":false,"start_stream_buffer_size":1,"videos_abr_debugger_storage":false,"fix_shaka_xhr_error_status":true,"set_current_time_in_resync":true,"live_stream_buffer_size_float":3,"use_dimensions_fallbacks":true,"aggressive_fast_moving_average_half_life":1.5779530704021,"aggressive_slow_moving_average_half_life":9.2335087917745,"ignore_left_button_when_pausing":true,"disable_360_abr":false,"clear_buffer_on_seek_back":false,"buffering_overflow_threshold":0,"use_buffer_target_only_after_buffering_goal_is_hit":false,"enable_content_protection":true,"drop_buffering_detection_from_html5_api":true,"exclude_tracks_without_smooth_playback":false,"mpd_parse_frame_and_audio_sampling_rate":false,"abort_loading_decisioning_logic":true,"buffer_velocity_time_in_past_to_consider":0,"evaluate_abr_on_fetch_end":false,"ignore_recent_bandwidth_eval_on_fetch_end":false,"bandwidth_penalty_per_additional_video":0.1,"overwrite_video_current_time_property":false,"low_start_stream_buffer_size":2.5,"low_bandwidth_start_stream_buffer_size_threshold":2000000,"connection_quality_context_throttle_frequency":1000,"allow_seek_logging_in_mixin":false,"fix_pause_current_time_in_mixin":true,"better_set_current_time_in_resync":false,"resync_set_current_time_fudge_factor":0,"enable_main_thread_availability_logging":true,"fix_overwritten_get_video_current_time":false,"should_use_oz_p2p":false,"oz_www_fix_oz_p2p_enable_failed":true,"num_predictive_segments":0,"oz_www_generate_mos_segment_buffer_diff":false,"oz_www_pdash_use_pdash_segmentlocator":false,"oz_www_pdash_seq_based_approx":false,"oz_www_pdash_seq_based_approx_use_blockedrange":false,"oz_www_pdash_download_cursor_catchup_threshold_sec":0,"oz_www_pdash_download_cursor_catchup_tolerance_sec":0,"oz_www_pdash_download_cursor_catchup_skip_totalbufer":true,"oz_www_pdash_download_cursor_catchup_threshold_gop_multiplier":0,"oz_www_pdash_download_cursor_tolerance_gop_multiplier":0,"oz_www_pdash_download_cursor_bufferahead_gop_multiplier":0,"oz_www_pdash_download_cursor_between_catchups_seg":0,"oz_www_latencymanager_stalempd_edgelatency_sec":0,"oz_www_latencymanager_stalempd_edgelatency_sec_on":false,"oz_www_latencymanager_stalled_edgelatency_sec_on":false,"oz_www_latencymanager_stalled_edgelatency_sec":0,"oz_www_pdash_future_edgelatency_gops":0,"oz_www_catchup_timeout_after_play_sec":0,"oz_www_catchup_timeout_after_buffering_sec":0,"oz_www_reset_catchup_timeout_after_play_sec_on_overwrite":true,"oz_www_catchup_min_interval_sec":0,"oz_www_playback_speed_latency_adjustment_rate":0,"oz_www_playback_speed_enabled_delay_sec":4,"oz_www_playback_speed_min_buffer_sec":1,"oz_www_playback_speed_min_duration_sec":2,"oz_www_playback_speed_restore_min_duration_sec":1,"oz_www_playback_speed_latency_slowdown_adjustment_rate":0,"oz_www_playback_speed_latency_speedup_adjustment_rate":0,"oz_www_pdash_download_cursor_use_totalbuffer":true,"oz_www_pdash_download_cursor_nocatchup_use_currentbuffer":false,"oz_www_playback_speed_min_sharpness_factor":3,"oz_www_pdash_wait_on_mpd_refresh_when_error":true,"oz_www_pdash_download_cursor_pause_duration_of_gop":false,"oz_www_pdash_download_cursor_catchup_only_when_advancing":false,"oz_www_download_cursor_use_node_time":false,"oz_www_download_cursor_total_buffer_max_sec":0,"oz_www_download_cursor_buffer_ahead_time_max_sec":0,"oz_www_download_cursor_disable_buffer_ahead_rule_on":true,"oz_www_download_cursor_disable_buffer_ahead_rule_lr_on":false,"oz_www_download_cursor_1st_run_set_skipped_segment_on":true,"oz_www_download_cursor_1st_run_2_fallback":false,"oz_www_enable_predictive_dash":true,"oz_www_use_sc_timebased_segments":false,"oz_www_use_templated_pdash_segments":true,"oz_www_use_scf_timebased_segments":false,"oz_www_touch_cb_key":false,"oz_www_enable_dvl":true,"oz_www_use_dvl_with_timeout_ms":0,"oz_www_dvl_update_interval_ms":0,"oz_www_dvl_update_interval_reset_on_err":true,"oz_www_dvl_initial_segment_ignore_count":1,"oz_www_use_inline_manifest_for_live":true,"oz_www_use_live_latency_manager":false,"oz_www_player_emit_mpdready_early":false,"oz_www_clear_on_seek":true,"oz_www_player_emit_mpdparsed_early":false,"is_low_latency":false,"fire_seek_events":false,"shaka_buffer_abr":false,"evaluate_abr_on_tracks_and_bandwidth_change":true,"enable_double_ingest":true,"test_use_embedded_cb":false,"www_videos_playback_remove_src_attr_on_unload":false,"www_videos_playback_call_load_on_unload":false,"has_live_rewind_egress":false,"has_live_rewind_ui_www":false,"use_oz_with_fbms_eligible":true,"create_restore_abort_loading_promise":true,"oz_www_fix_representation_ended_timing":true,"oz_www_safely_log_player_seeks":true,"oz_www_enable_adaptation":true,"oz_www_fix_quick_starter_overhead":true,"oz_www_abr_restrict_from_index":0,"oz_www_abr_restrict_to_index":0,"oz_www_initial_switch_interval":0,"oz_www_min_switch_interval":100,"oz_www_abr_min_bandwidth_samples":0,"oz_www_min_eval_interval":100,"oz_www_bandwidth_estimator_half_life":6,"oz_www_bandwidth_estimator_variance_penalty_half_life":0,"oz_www_bandwidth_estimator_variance_penalty_down_factor":0,"oz_www_bandwidth_estimator_variance_penalty_up_factor":0,"oz_www_bandwidth_estimator_outlier_exclusion_factor":50,"oz_www_bandwidth_estimator_std_dev_penalty_factor":0,"oz_www_abr_confidence_threshold":0.9,"oz_www_segments_to_stream":5,"oz_www_per_stream_duration_target":0,"oz_www_segments_to_stream_under_playhead_threshold":0,"oz_www_low_segment_stream_playhead_threshold":0,"oz_www_appends_per_segment":6,"oz_www_append_byte_target_without_range":100000,"oz_www_log_appended_secs":false,"oz_www_lazy_parse_sidx":false,"oz_www_abr_eval_buffer_threshold":0,"oz_www_throttle_playback_rate_on_stall":true,"oz_www_use_prefetch_cache":true,"oz_www_force_initial_representation":true,"oz_www_buffer_ahead_target":22,"oz_www_low_buffer_bandwidth_target_threshold":10,"oz_www_low_buffer_bandwidth_target_increase_factor":0,"oz_www_segments_to_stream_near_bandwidth_boundary":5,"oz_www_bandwidth_boundary_standard_deviation_factor":1,"oz_www_suppress_playing_event_while_buffering":false,"oz_www_resolution_constraint_factor":2,"oz_www_pre_start_buffer_ahead_target":16.924449682236,"oz_www_stale_mpd_buffer_ahead_target":0,"oz_www_setup_buffer_target_onload":true,"oz_www_in_play_buffer_underflow_target":0.1,"oz_www_in_play_buffer_overflow_target":1,"oz_www_buffer_when_waiting":false,"oz_www_start_buffer_underflow_target":0.1,"oz_www_byte_count_per_sample":200000,"oz_www_minimum_bytes_to_sample_on_close":25000,"oz_www_manifest_update_frequency_ms":0,"oz_www_manifest_initial_update_delay_ms":0,"oz_www_exclude_prefetch_bandwidth_samples":true,"oz_www_connection_quality_context_throttle_frequency":2000,"oz_www_paused_stream_segments_count":2,"oz_www_minimum_bandwidth_sample_duration":10,"oz_www_maximum_bandwidth_sample_bandwidth":100000000,"oz_www_max_bandwidth_sample_count":30,"oz_www_use_performance_entry_on_stream_close":false,"oz_www_ignore_time_to_response_start":false,"oz_www_network_seg_timeout_ms":0,"oz_www_bandwidth_response_time_handicap":0,"oz_www_bandwidth_ignore_on_stream_write_samples":false,"oz_www_bandwidth_use_response_time_adjustment":false,"oz_www_use_scheduler":true,"oz_www_cdn_experiment_id":"","oz_www_disable_audio_scheduler":false,"oz_www_no_new_loop_body_promise_when_stream_ongoing":true,"oz_www_fix_seek_performance":false,"oz_www_ignore_reset_after_seek_if_bufferahead":false,"oz_www_ignore_reset_after_seek_if_bufferahead_liverewind":true,"oz_www_enable_network_manager_error":false,"oz_www_parse_first_segment":false,"oz_www_enable_abr_for_first_request":false,"oz_www_update_media_source_duration":true,"oz_www_ms_promise_for_null":false,"oz_www_ms_promise_for_null_ms":0,"oz_www_sbm_waits_for_update_end":true,"oz_www_sbm_cancel_operation_synchronous":false,"oz_www_sbm_recursively_waits_for_update_end":false,"oz_www_auto_seek_playhead_slack":0.5,"oz_www_playhead_manager_buffered_auto_seek_playhead_slack":0.5,"oz_www_playhead_manager_buffered_is_near_gap_threshold":1.5,"oz_www_playhead_manager_buffered_numerical_error":0.01,"oz_www_playhead_manager_handle_timerange_update_on_timeupdate":true,"oz_www_playhead_manager_buffered_timerange_update_on_timeupdate":true,"oz_www_playhead_manager_timeupdate_throttle_ms":1000,"oz_www_playhead_manager_clamp_initial_playback_position":false,"oz_www_playhead_manager_buffer_gaps_skip_reverse":true,"oz_www_media_stream_buffer_gaps_ignore_before_seek":false,"oz_www_playhead_manager_initial_playback_position_lat_mgr":true,"oz_www_playheadman_dont_skip_ahead_past_last_fetched":false,"oz_www_seek_ahead_epsilon":0.05,"oz_www_seek_ahead_use_native_current_time":true,"oz_www_timeline_offset_threshold":10,"oz_www_live_rewind_seek_to_live_delta":8,"oz_www_update_seekable_range":true,"oz_www_update_duration_when_init_appended":true,"oz_www_abr_prevent_down_switch_buffer_threshold":11,"oz_www_check_buffer_range_once_for_playhead_update":false,"oz_www_fix_start_timestamp":true,"oz_www_fix_templated_manifest_r_field_check":true,"oz_www_seek_on_latency_level_change":false,"oz_www_seek_on_latency_level_change_allowed":"[]","oz_www_live_initial_playback_position":-20,"oz_www_live_query_time_in_range":true,"oz_www_timerange_manager_cleanup":false,"oz_www_livehead_fall_behind_block_threshold":30,"oz_www_overwrite_livehead_fall_behind_block_threshold":0,"oz_www_live_time_range_block_margin":5.9,"oz_www_overwrite_live_time_range_block_margin":0,"oz_www_live_gracefully_handle_mpd_errors":true,"oz_www_live_no_segment_when_playhead_is_before_first_segment":true,"oz_www_live_disable_mpd_updates_when_paused":true,"oz_www_cleanup_video_node_on_destroy":true,"oz_www_detach_media_source_manager":true,"oz_www_enable_abortload_and_reload":true,"oz_www_live_playhead_catch_up":false,"oz_www_live_catch_up_only_when_paused":false,"oz_www_live_catch_up_fall_behind_threshold":20,"oz_www_live_catch_up_live_head_delta":6,"oz_www_live_numerical_error_epsilon":0.0001,"oz_www_stop_manifest_update_when_static":true,"oz_www_buffer_end_only_when_buffering":false,"oz_www_stream_interrupt_check_mpd_stale_count_threshold":6,"oz_www_reach_end_only_when_video_ended":false,"oz_www_allow_queueing_end_of_stream_when_update":false,"oz_www_set_source_buffer_append_window_end":false,"oz_www_use_stream_end_time_in_segment_locator":false,"oz_www_pausable_stream_throws_error_when_aborted":true,"oz_www_network_retry_intervals_json":"{\"0\": 1000, \"404\": 2000, \"502\": 1000, \"503\": 1000, \"504\": 1000, \"429\": 2000, \"20\": 1000}","oz_www_network_retry_intervals_json_retry":false,"oz_www_network_reload_mpd_json_retry":false,"oz_www_network_end_broadcasts_json":"[\"410\"]","oz_www_network_skip_json":"[]","oz_www_network_reload_mpd_json":"[]","oz_www_fallback_on_append_error":false,"oz_www_enable_appends_on_wait_update_end_failure":false,"oz_www_bandwidth_penalty_per_additional_video":0,"oz_www_bandwidth_penalty_additional_video_start":0,"oz_www_prefetch_cache_bandwidth_upper_limit":0,"oz_www_throw_network_error_during_stream":false,"oz_www_retry_fetch_on_prefetch_error":true,"oz_www_use_abr_for_missing_default_representation":true,"oz_www_initial_manifest_request_retry_count":3,"oz_www_download_time_buffer_delta_penalty_factor":0,"oz_www_time_to_first_byte_estimate_half_life_ms":500,"oz_www_handle_missing_manifest_segment_timeline":true,"oz_www_mos_upper_threshold":0,"oz_www_mos_lower_threshold":0,"oz_www_abr_use_download_time":false,"oz_www_minimum_download_additional_buffer_ms":0,"oz_www_use_deferred_streaming_task":true,"oz_www_allow_abort_loading_from_autoplay_controller":false,"oz_www_enable_double_ingest":true,"oz_www_use_oz_credentials_provider":true,"oz_www_throw_on_non_zero_r_d_mismatch":true,"oz_www_fix_template_duration_artifact_in_manifest":true,"oz_www_bandwidth_cache_key":"bandwidthEstimate","oz_www_estimate_video_bandwidth_only":true,"oz_www_enable_bandwidth_navigator_estimation":false,"oz_www_default_bandwidth_estimate":1000000,"oz_www_update_bandwidth_cache_on_sample":false,"oz_www_live_audio_ibr_bandwidth_percentage":0.05,"comet_www_no_pause_on_blur_or_focus_events":false,"oz_www_live_gracefully_handle_no_network":true,"oz_www_live_max_try_attempts_on_404":2,"oz_www_clear_buffer_when_switch_representation_initiator_is_user":true,"oz_www_use_segment_request_cache":false,"oz_www_seconds_to_stream":10,"oz_www_seconds_to_stream_near_bandwidth_boundary":10,"oz_www_queue_data_with_error_handling":false,"oz_www_clear_prepended_segments_count_on_append":true,"oz_www_back_off_pdash_504_retry":true,"oz_www_call_end_of_stream_in_quick_starter":true,"oz_www_instantiate_buffering_detector_before_quick_starter":true,"oz_www_maybe_end_stream_if_prepended_segments":true,"oz_www_seek_to_start_quick_starter":true,"oz_www_remove_src_attr_on_unload":true,"oz_www_use_loose_manifest_updates":false,"oz_www_use_full_player_if_cached":true,"oz_www_enable_quickdashv2":false,"oz_www_copy_new_manifest":true,"oz_www_handle_switch_to_unparsed_representation_sidx":true,"oz_www_stable_buffered_timeranges_in_observedsourcebufferstate":true,"oz_www_emit_stream_error_event":true,"oz_www_max_start_eme_attempts":3,"oz_www_listen_for_canplay_in_buffering_detector":true,"oz_www_handle_mpd_retries_outside_oz_mpd_updater":true,"oz_www_respect_initial_representation_on_setup":false,"oz_www_update_live_video_config_on_representation_switch":true,"oz_www_mpd_update_cancel_current_request_tracker":true,"oz_www_tagged_time_range_per_append_throttle":0,"oz_www_fix_reload_manifest_retry":true,"oz_www_fix_source_buffer_error_logging":true,"oz_www_min_block_time_range_interval_ms":0,"oz_www_fix_buffer_ahead_priority_strategy":true,"oz_www_append_last_segment_if_beyond_end":true,"oz_www_set_stream_anchor_only_on_done_status":true,"oz_www_fix_stream_deferred_cancel":true,"oz_www_sbm_abort_on_readable_stream_error":true,"oz_www_cancel_tracker_on_append_error":true,"oz_www_pixels_below_viewport_to_observe":0,"oz_www_prioritize_by_viewport_static_penalty":0,"oz_www_fix_setup_video_duration_on_representation_switch":true,"oz_www_handle_mpd_null_error_codes":true,"oz_www_fix_prepended_segments_tagging":true,"oz_www_xmlparser_use_domparser":true,"oz_www_cache_mos_threshold":false,"oz_www_load_video_node_on_unload":true,"oz_www_convert_dom_exception_to_oz_error":true,"oz_www_sbm_check_source_buffer_ready_state_on_cancel":true,"oz_www_prevent_unnecessary_seek_stream_anchor_reset":true,"oz_www_stream_types_eligible_for_partial_playback":"","oz_www_partial_playback_buffer_overflow":0.75,"oz_www_live_use_inline_manifest_after_request_manifest":false,"oz_www_live_gracefully_handle_410":true,"oz_www_segment_end_410_response":true,"oz_www_segment_end_410_response_loop_end":true,"oz_www_steadystate_minbuffer_sec":0,"oz_www_steadystate_minbuffer_buckets":0,"oz_www_steadystate_minbuffer_buckets_sec":1,"oz_www_pixels_above_viewport_to_observe":0,"oz_www_delay_stream_end_for_sourceended":true,"www_videos_shaka_use_xbox_buffered_fudge_factor":0.05,"oz_www_media_source_is_available_in_ended_state":true,"oz_www_unset_override_oz_request_implementation_on_hive_error":false,"oz_www_live_gracefully_handle_502":true,"oz_www_systemic_risk_abr_apply_representation_restrictions":true,"oz_www_dynamic_mpd_initial_playback_position_offset_modifier":4,"oz_www_player_formats_for_low_latency":"[]","oz_www_loop_body_handle_error_interval_ms":1,"oz_www_load_sequence_max_delay_ms":0,"oz_www_get_fetch_body_text_when_response_not_ok":true,"oz_www_load_sequence_only_prioritize_first_count":0,"oz_www_stream_interrupted_fuzzy_equals":false,"oz_www_sbm_skip_abort_on_media_error":true,"oz_www_sbm_abort_on_append_new_readable_stream":false,"oz_www_prevent_unnecessary_quickstarter_instance":true,"oz_www_stricter_mpd_parser_invariants":true,"oz_www_accept_external_buffering_detector":true,"oz_www_treat_inline_mpd_xml_empty_string_as_null":false,"oz_www_live_gracefully_handle_429":true,"oz_www_use_systemic_risk_abr":true,"oz_www_systemic_risk_abr_risk_factor":1.75,"oz_www_time_to_first_byte_ignore_above_threshold_ms":0,"oz_www_bandwidth_ttfb_samples_to_save":5,"oz_www_blue_video_player_pass_inline_mpd_xml_empty_string_as_undefined":false,"oz_www_blue_video_player_force_xhr":false,"oz_www_set_global_config":false,"oz_www_systemic_risk_abr_low_mos_risk_factor":1.3,"oz_www_systemic_risk_abr_min_watchable_mos":30,"oz_www_systemic_risk_abr_low_mos_resolution":0,"oz_www_prevent_multiple_successive_representation_switch":true,"oz_www_sidx_parser_memory_optimization":false,"oz_www_buffer_when_waiting_in_partial_buffer":true,"oz_www_stream_interrupt_in_play_buffer_overflow_target":1,"oz_www_stream_interrupt_buffer_target_timeout_ms":10000,"oz_www_recent_buffer_in_play_buffer_overflow_target":3,"oz_www_recent_buffer_timeout_ms":10000,"oz_www_use_ending_duration_for_gop_multiplier":true,"oz_www_live_trace_parse_emsg":true,"oz_www_catchup_use_timeline_range_end_time_as_end":false,"oz_www_perf_log_representation_id_more":true,"oz_www_systemic_risk_use_fetch_range_duration":false,"oz_www_use_simple_moving_average_estimator":false,"oz_www_http_no_cache":false,"oz_www_use_buffering_detector_for_playhead_interruption":true,"oz_www_enable_immediate_down_switch":false,"oz_www_handle_media_source_manager_errors":true,"oz_www_handle_invalid_webm_duration":false,"oz_www_parse_initialization_binary":true,"oz_www_systemic_risk_abr_high_estimate_confidence":52,"oz_www_data_reader_concat_once":true,"oz_www_pump_concat_once":true,"oz_www_sbm_append_readable_stream_concat_once":true,"oz_www_log_appended_segment_info":false,"oz_www_log_media_element_error_source_buffer_updateend_error":true,"oz_www_log_extra_events":true,"oz_www_overwrite_video_current_time_property":true,"oz_www_clear_buffer_on_seek_into_unbuffered_range":true,"oz_www_numerical_range_utils_is_after_range_exclusive":true,"oz_www_server_side_abr_send_client_estimates":false,"oz_www_server_side_abr_use_server_estimates":false,"oz_www_live_gracefully_handle_504":true,"oz_www_debug_live_replay":false,"oz_www_append_retry_quota_exceeded_error":true,"oz_www_buffer_target_constraint_minimum_sec":2,"oz_www_buffer_target_constraint_append_succeeded_reward":0.2,"oz_www_always_use_current_time_in_playback_state":true,"oz_www_buffer_target_constraint_quota_exceeded_penalty":0.3,"oz_www_retry_null_error_code_in_stream":false,"oz_www_emit_destroyed_after_media_keys_clear":false,"oz_www_do_not_end_stream":false,"oz_www_do_not_flush_data_queue_after_destroy":false,"oz_www_do_not_update_duration_vod":false,"oz_www_no_representation_error_detailed_message":true,"oz_www_mpd_updater_network_request_timeout_ms":20000,"oz_www_restart_media_streams_on_stream_resumed":false,"oz_www_media_stream_tracker_cancel_on_seek":false,"oz_www_media_stream_fix_double_segments_compute":false,"oz_www_fix_initial_segment_non_zero_start_time":true,"oz_www_get_mpd_least_last_time_range":true,"oz_www_respect_playback_restrictions_in_abr_fallback":true,"oz_www_null_segment_for_no_buffer_target":true,"oz_www_systemic_risk_abr_initial_risk_factor":1,"oz_www_systemic_risk_abr_document_hidden_risk_factor":0,"oz_www_use_bandwidth_estimate_from_headers_in_abr":false,"oz_www_use_ttfb_from_headers":false,"oz_www_skip_playhead_adjustment_before_initial_playback_position":false,"oz_www_clear_buffer_on_seek_epsilon_s":0,"oz_www_handle_buffered_timerange_update_on_ratechange":false,"oz_www_stub_safari_source_buffer_abort":false,"oz_www_clear_buffer_on_seek_nudge_s":0,"oz_www_streaming_task_reject_current_stream_deferred":true,"oz_www_min_buffer_behind_playhead":10,"oz_www_check_mediasource_readystate_before_end_of_stream":true,"oz_www_retry_video_element_error":true,"oz_www_clamp_seek_to_first_buffer_range_epsilon":0.75,"oz_www_ignore_restrictions_when_all_representations_restricted":false,"oz_www_hive_maximum_trimming_seconds":0,"oz_www_block_representation_status_codes_json":"[500, 503]","oz_www_block_representation_status_codes_temporarily_json":"{}","oz_www_revoke_object_url_on_detach":false,"oz_www_abort_clear_video_node_on_detach":false,"oz_www_proceed_on_representation_change_in_init_append_fail":true,"oz_www_should_check_that_source_buffer_attached":false,"oz_www_exclude_large_representations_after_restrictions":true,"oz_www_stop_loop_driver_immediately_on_cleanup":true,"oz_www_playhead_manager_handle_time_range_update_on_waiting":false,"oz_www_enable_error_recovery_attempt_logging":true,"oz_www_systemic_risk_abr_prefetch_initial_risk_factor":5,"oz_www_prefetch_resolution_threshold":810,"oz_www_use_strict_resolution_constraint":true,"oz_www_throw_no_license_error":true,"oz_www_vtt_caption_representation":true,"oz_www_live_video_send_transaction_id_in_requests":false,"oz_www_log_exposure_on_oz_initialization":false,"oz_www_systemic_risk_abr_prefetch_low_mos_resolution":0,"oz_www_allow_subsequent_prefetch":true,"oz_www_comet_video_player_live_vtt_captions":false,"oz_www_prefetch_retention_duration_ms":0,"oz_www_clear_prefetch_on_unload":false,"oz_www_emit_captions_changed_event":true,"oz_www_use_vtt_captions_visible_buffer_strategy":false,"oz_www_disable_end_of_stream_in_caption_stream":true,"oz_www_append_once_per_stream_in_caption_stream":true,"oz_www_append_once_per_stream_in_application_stream":false,"oz_www_enable_era_logging_for_application_stream":false,"oz_www_emit_stream_gone_on_end_stream_before_start":true,"oz_www_sidx_segment_retry_attempts":9999,"oz_www_sidx_segment_retry_interval_ms":100,"oz_www_clear_buffer_around_playhead_boundary_ms":5000,"oz_www_fix_manifest_fetch_mixed_promise_catch":true,"oz_www_fix_update_duration_check":false,"oz_www_never_decrease_mediasource_duration":false,"oz_www_normalize_mpd_fetch_errors":true,"oz_www_no_retry_on_empty_string_error_code":false,"oz_www_fix_dom_exception_as_message":true,"oz_www_use_src_object_for_media_source":false,"oz_www_mpd_parse_all_adaptation_sets":true,"oz_www_mpd_ensure_playable_representations":false,"oz_www_ull_use_broadcast_sensitivity_type":true,"oz_www_ull_fallback_stall_count":2,"oz_www_live_video_chunk_duration":0,"oz_www_av1_check_hardware_support":false,"oz_www_ultra_low_latency_bandwidth_threshold":10000000,"oz_www_bandwidth_estimate_header_key":"","oz_www_bandwidth_estimate_key":"","oz_www_fix_ull_fallback_stall_count":false,"oz_www_set_latency_context_immediately":false,"oz_www_fall_back_to_low_latency_in_ull":false,"oz_www_bandwidth_header_expire_threshold":0,"oz_www_fix_live_rewind_user_selected_playback_speed":true}},5261],["cr:964538",[],{"__rc":[null,"Aa0nWfUWoPuX5qJ71hkCdTdlS9mnls_OS6WMA_arDvFb9lgmo6OTRDPxzAwcmPj5dTrT_zU93FS4qRKb6Q"]},-1],["cr:99",[],{"__rc":[null,"Aa1mSXsGgKnBhx4ezlT86F4q0Bb4Fj8IXGLNcb6UN6HeeEHUKXo8a0EKhVc5Y_qi7f6LvSy0ror9ZUBfDYkdoQufNwM-7-WGEQ"]},-1],["cr:506",[],{"__rc":[null,"Aa2XO_OQ_Q64GNdfI6dQrkvanMLGK-fz1msGo5xE-EMDdk3AZJCljLU4oN71WuayS-QqIaF5oyE8v2xHbDKGP3IVEWR3RzjvjLfhhICREG4"]},-1],["cr:913",[],{"__rc":[null,"Aa09PbGAIGmNovXe6wnFxxPSrQP03DsIRP3rpiopYokMzszktOORTtQlM2Mni5dyG2SHeQ3aqCmQzbhrbWWLx4k1jrEsqjc"]},-1],["cr:2889",[],{"__rc":[null,"Aa3aP8praJetO7wHaj2Am_4cP3as9J3oT5KgGHyTMF3D6vwdwIMRWqM7DdcvmErM7eY1OaGg-NGKNtgxXk4Aw4Oc8RHDUJ6xsdRtFHATBlr371R1mJ7qUIMzsRFoXJ7nGhshCdnzZCXi8p0z"]},-1],["cr:4081",[],{"__rc":[null,null]},-1],["cr:4149",[],{"__rc":[null,"Aa1MduGtoLzw7oQf8pXPe-gKnE4wIGvYWw1JJ8Jt_W1WmjOCgmdSd5AkPD3wn8NgRwuBE5BqB-TI9Cn4cQAHSE4aV7Kn47n3MQ2WbMZa69dLY-VGdiOJtUBNWA"]},-1],["cr:921407",["useNoopDebuggingInfoComponent"],{"__rc":["useNoopDebuggingInfoComponent","Aa1FOoeRXemzAtEVjpybo8qKslsH8xJzwhh9l7amDyHGUGX4IpI6Ws5ZTe7rqlObsKW--XSHuHAT_4E4u9PA"]},-1],["cr:1269159",["emptyFunction"],{"__rc":["emptyFunction","Aa3PJioe3MDWnNtuzqynyPcSS7PFUQY301jgRUzgT98PGPC2apslUNh_8865QAUxJRIRroM7tks11wwPWIYM1qxmO__Hu0XxJ-CKBauB6mQ_WKaH"]},-1],["cr:1453865",[],{"__rc":[null,"Aa2TaI3OL7y_W0lX_F_krZ8eJ94IP9yX7Dp_S7Cdt_cafLAUBUGVzTn-sK6--DnX_CtEm43sszLzkKJNuiYC3hFiNz8CGRf168NhhhU"]},-1],["cr:1473550",[],{"__rc":[null,"Aa2Y2pDTdZh9XtB2JddiSh5y5-6Qrxsr_irU104C8EY04pM1AUfpAQrvaONyMgfmZkyHpCqF3GXhek2DPuZGudLX2i-yejGW"]},-1],["cr:1634616",["CometUserActivity"],{"__rc":["CometUserActivity","Aa3FtHkyy8y3V6nYWEHAumALQz6t1GuDk6-j-x5LyLhdBr34-z3OwGfXPR7DN3zL6aoGcZWTuu3DPsNfggIJoUw8-E8"]},-1],["cr:1672302",[],{"__rc":[null,"Aa1Lfo94Aj0iCi6jud7vwqvhILRN0m--aSAfJiewrNXwR623Sa_JfkJnhkUFAS46USuww_HC0uAEsoIo59QleGGbuKfosNL8bubxqs_KrxqSOYp4Yoh1"]},-1],["cr:1680308",[],{"__rc":[null,"Aa3Ceam2Y4bYuEClVJeFmnjtNtXAm3NPMPONeqZKYr1b8g7NmL64HH6IOz_pQc-OcJ4ERzIWSJlH-ggLT9ri6Ye1SQhBcb5nmUdMaUUoOt8FAzYBl6jvY8E"]},-1],["cr:1724253",[],{"__rc":[null,"Aa1qRa6QdpN-NDDSwXq_9W0qdk7n2GCxs3A2rsP6F5IkD_z8ZqXZil_cCYYs_izWewpSiQOpUVNi--5SZwOFvOqOWK1daBb37Rg7sj4KqJM-kewXkg"]},-1],["cr:1791018",["CometInteractionVC"],{"__rc":["CometInteractionVC","Aa3834VJ0okABw5gO1isOE0XVLbE4nKyGPzS6IalWTYgjXeFFNd9yx_rCFM8kmtyGp8FaqPMwh1Q4iKHAPaGh0erZ9Tu9G6x9bwZa0lnXw9r"]},-1],["cr:1802022",["CometPrerenderer.react"],{"__rc":["CometPrerenderer.react",null]},-1],["cr:1802023",["BaseContextualLayerDefaultContainer.react"],{"__rc":["BaseContextualLayerDefaultContainer.react",null]},-1],["cr:1954434",[],{"__rc":[null,"Aa3rK4zFzq8dB1tt_uVxfwzyyD_osM97ePnAOiA3C8Eu7YPJm1-efSdGVJOSqmyeQyGqNEs70yCQYsk49bFj4I7LsyN9HROJTsyEjQ"]},-1],["cr:4865",["ReactDOMLegacy_DEPRECATED"],{"__rc":["ReactDOMLegacy_DEPRECATED","Aa0KKC96n83LTa7w2s9Azj2FsnwEcYlvqS-EZAfIl3AWLYeSbmeyH70IBm4O_joZDUUeg8m_v-Sa0rJnCChVl3gnIh7r"]},-1],["cr:3569",[],{"__rc":[null,"Aa12qDH1e8Jt5BaZFtc7soPTYlSMTC9NmLxm_UBqXPmEE9TgmXjnnfYHbbYOyUUP1eS056jsQVGYzQyyru-i"]},-1],["cr:4772",["ReactApiCallFalcoEvent"],{"__rc":["ReactApiCallFalcoEvent",null]},-1],["cr:1294246",["ReactDOM.classic"],{"__rc":["ReactDOM.classic","Aa0KKC96n83LTa7w2s9Azj2FsnwEcYlvqS-EZAfIl3AWLYeSbmeyH70IBm4O_joZDUUeg8m_v-Sa0rJnCChVl3gnIh7r"]},-1]],"require":[["CometTooltipDeferredImpl.react\u0040838ad10251820a246b75532ad46eb511"],["maybeRemoveElement\u0040838ad10251820a246b75532ad46eb511"],["CometPressable.react\u0040838ad10251820a246b75532ad46eb511"],["GlobalVideoPortsImpl.react\u0040838ad10251820a246b75532ad46eb511"],["CometExceptionDialog.react\u0040838ad10251820a246b75532ad46eb511"],["BarcelonaPostPage.react\u0040838ad10251820a246b75532ad46eb511"],["emptyFunction\u0040bd79be8bb44e6c7cf2f2ac86916da51c","thatReturns",["RequireDeferredReference"],[[{"__dr":"CometTooltipDeferredImpl.react"},{"__dr":"maybeRemoveElement"},{"__dr":"CometPressable.react"},{"__dr":"GlobalVideoPortsImpl.react"},{"__dr":"CometExceptionDialog.react"},{"__dr":"BarcelonaPostPage.react"}]]],["VideoPlayerSpinner.react\u004046173d9b0a2a06510368e27565188241"],["VideoPlayerCaptionsArea.react\u004046173d9b0a2a06510368e27565188241"],["Bootloader\u0040b06c930045dfde1329ab583ead60f0b5","markComponentsAsImmediate",[],[["VideoPlayerHTML5ApiCea608State","VideoPlayerHTML5ApiWebVttState","BarcelonaAnimatedScrollArea.react"]]],["RequireDeferredReference\u00405fa49f9a913b58dc6eb11c8541e7eca0","unblock",[],[["CometTooltipDeferredImpl.react","maybeRemoveElement","CometPressable.react","GlobalVideoPortsImpl.react","CometExceptionDialog.react","BarcelonaPostPage.react","VideoPlayerSpinner.react","VideoPlayerCaptionsArea.react"],"sd"]],["RequireDeferredReference\u00405fa49f9a913b58dc6eb11c8541e7eca0","unblock",[],[["CometTooltipDeferredImpl.react","maybeRemoveElement","CometPressable.react","GlobalVideoPortsImpl.react","CometExceptionDialog.react","BarcelonaPostPage.react","VideoPlayerSpinner.react","VideoPlayerCaptionsArea.react"],"css"]]]});});});</script>
+<script>qpl_inl("7252766289159758644","tierTwoEnd");</script>
+<script type="application/json" data-content-len="83" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766289159758644","tierTwoEnd"]]]}</script>
+
+<script type="application/json" data-content-len="108" data-sjs>{"require":[["CometSSRFizzContentInjector","onPayloadReceived",null,[[{"status":"fail_ssr_disabled"}],[]]]]}</script>
+
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         <script>qpl_inl("7252766289159758644","tierThree");</script>
+<script type="application/json" data-content-len="82" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766289159758644","tierThree"]]]}</script>
+<script>qpl_inl("7252766289159758644-server","tierThree",149);</script>
+<script type="application/json" data-content-len="93" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766289159758644-server","tierThree",149]]]}</script>
+<script>requireLazy(["HasteSupportData"],function(m){m.handle({"clpData":{"1828945":{"r":100,"s":1},"1848815":{"r":10000,"s":1},"4791":{"r":1,"s":1},"819":{"r":1,"s":1},"1744057":{"r":500,"s":1},"1744058":{"r":5000,"s":1},"1744059":{"r":10000,"s":1},"1744060":{"r":1000,"s":1},"1857112":{"r":1},"1871697":{"r":1,"s":1},"1942319":{"r":1,"s":1},"1823926":{"r":1,"s":1},"1743887":{"r":1},"1764786":{"r":1,"s":1},"1755537":{"r":1},"1873550":{"r":10000,"s":1},"1743095":{"r":1,"s":1}},"gkxData":{"307":{"result":true,"hash":"AT5dPMZBMiNY0f7u2vQ"},"762":{"result":false,"hash":"AT7XePNdehhQhxt4klg"},"2795":{"result":false,"hash":"AT5ilL0A5sDVhuaBr08"},"5639":{"result":true,"hash":"AT5SF61ZadJ9LozlJfw"},"778292":{"result":false,"hash":"AT574OhXHwX0kRP2TXI"},"832242":{"result":false,"hash":"AT7QZmREZ7b0HQdOxzc"},"945829":{"result":true,"hash":"AT6KFs8jy_GkmgnUgyQ"},"968609":{"result":true,"hash":"AT7nKteWCVYK6uN6W7o"},"1001007":{"result":false,"hash":"AT54HpnriRBxXJ_M7S8"},"1066746":{"result":false,"hash":"AT55_E5b8Sj7u5rUj7s"},"1166607":{"result":false,"hash":"AT7xrOkGBcaF8I5uNLs"},"996940":{"result":false,"hash":"AT7opYuEGy3sjG1aRXw"},"1073500":{"result":false,"hash":"AT7aJmfnqWyioxOO3aI"},"1857581":{"result":false,"hash":"AT5yTxGMp6le0PAtLJw"},"1196":{"result":false,"hash":"AT7JN3eRi_Tkojttr4U"},"1341692":{"result":false,"hash":"AT6ztF4pPshu3yZQjXk"},"1334580":{"result":false,"hash":"AT6P8Id36DnRE-rxTVg"},"574":{"result":false,"hash":"AT5l2P5ytV2bv8xH0is"},"871":{"result":true,"hash":"AT4vyfQGHTBrTQa9Mzs"},"1626":{"result":false,"hash":"AT6XwrJGGF9Cvtws6mU"},"1799":{"result":false,"hash":"AT6Id9SGNjhz9OshYuI"},"2674":{"result":false,"hash":"AT6LknPzbQEjKsuxlrc"},"2819":{"result":false,"hash":"AT77OwnXENquugNcLnQ"},"6002":{"result":false,"hash":"AT6qjxreNXGYgzg6nOQ"},"3499":{"result":false,"hash":"AT5l5tI3kdeSuUxUD04"},"1652843":{"result":false,"hash":"AT6uh9NWRY4QEQoYo0Y"}},"ixData":{"478231":{"sprited":2,"spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","_spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","w":12,"h":12,"p":"0 -109px","sz":"auto"},"485124":{"sprited":2,"spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","_spi":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/fuOujzjUcP9.png","w":24,"h":24,"p":"0 0","sz":"auto"}},"qexData":{"37":{"r":null},"130":{"r":null},"131":{"r":null},"656":{"r":null},"657":{"r":null},"660":{"r":null},"19":{"r":null},"245":{"r":null},"296":{"r":null},"633":{"r":null}},"qplData":{"1860":{"r":1}},"justknobxData":{"317":{"r":16},"1023":{"r":true}}})});requireLazy(["Bootloader"],function(m){m.handlePayload({"consistency":{"rev":1007796774},"rsrcMap":{"pZuCvpU":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yF\/r\/FLJXkx8ys-6.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":15","m":"1007796774_main","nc":1},"l5HqvCB":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yY\/r\/YT7n1sgH1lv.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":17","m":"1007796774_main","nc":1},"92FWu0u":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yV\/r\/3qf4Dki9jBk.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":23099","m":"1007796774_longtail","nc":1},"lNw+3Cn":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iTQy4\/ys\/l\/en_US\/R6UwB5s2nQ2.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22368","m":"1007796774_longtail","nc":1},"ymVdTSF":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yH\/r\/ZV0aNQj4T9JOYKdx9bFmwVfC6z84fkv87OWMWJy1SRRa.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22320,22433,22336,22319","m":"1007796774_longtail","nc":1},"rDyHGpp":{"type":"css","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yq\/l\/0,cross\/4ShJxXUc17dmPpUJGycqYtdM-rzcG2i1ZXJj8Zr6dWgv.css?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":29,22369,22418,22417","nc":1},"cXPO3JJ":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yz\/r\/ov-P0fxTgQg.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22371","m":"1007796774_longtail","nc":1},"PHpesmL":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yf\/r\/2cABj-f85G2.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22370","m":"1007796774_longtail","nc":1},"w4kZepP":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yY\/r\/lZ_qmNlaNM_.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22416","m":"1007796774_longtail","nc":1},"EHXzFna":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yQ\/r\/2bbc1q-688I.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22318","m":"1007796774_longtail","nc":1},"dQOzthE":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/ya\/r\/hXzjLI7TwYY.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22372","m":"1007796774_longtail","nc":1},"zEfyD1a":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y-\/r\/rfTsco5uJfS.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":49","m":"1007796774_main","nc":1},"PWJSBTX":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yu\/r\/tPn65o0StmW.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22373","m":"1007796774_longtail","nc":1},"aeZ8J7P":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y5\/r\/I91dQtKCqtJ.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22223","m":"1007796774_longtail","nc":1},"0nDDuEM":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iGWT4\/yP\/l\/en_US\/tj6aAvg10RR-ha4Zz4enInvo7PIFqzApS6tLnb7_y9_rBefStsZCuAtZV0aNQj4T9JPHKRnYublkQqmh-2VANtdEJJdX6BV3dPz8c0H7ihoY7nbNTHWB_fxixJNSNAbg-4lgvnWIH809jxK_8olt4CfolTwB3N6XBAeljxRdJbjnMUA7AD0vIwbJotBSHV8_sn1YcPS4UlnaoBKWrD1Jrj0GZnF3fC6z84fkv87QfwLFPl3iNfPtmfxLVwAb7OWMWJy1SRRaN_g4sjgwQqVoEYzWWu2LQZcIUQjlstqZU2jr_tFUjDMya20AD8butbT9dkGdmZFcSD.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22419,22380,22328,22379,22923,22320,22421,22922,22927,22929,22348,22347,22931,22324,50,22926,22924,22423,22932,22329,22336,22341,22343,22319,22414,22422,22420,22330,22332,22346","m":"1007796774_main,1007796774_longtail","nc":1},"LuUwuw\/":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yP\/r\/8At9Gn29AsS.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22317","m":"1007796774_longtail","nc":1},"mfYeDTt":{"type":"css","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yX\/l\/0,cross\/4ShJxXUc17dQiOPv89Rn1HbTfuCSgqTH8uI_BdsaE1bCDamMpRL-pW0KHFwP3wSXUoLe9LbROaenqBeRmAWDoP_Y4ely4JoRn8_zHJWgay9vgVdM-rzcG2i1Z2dFqGPal58VlHOnCODX2DmXJj8Zr6dWgvqbv95oZ3elBCiZdqw3CwNn.css?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":29,22832,22337,22340,22364,22829,22327,22323,22338,22925,22418,22345,22325,22417,22333,22830","nc":1},"gcoFAhW":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3i6Vk4\/yY\/l\/en_US\/cs_ZT0eb-iAWeOk-wvL7942bbc1q-688Il-aVxn6yl5EM08arqdo_nNzzcK8de5Syz14xtbHg3WbCqIPs-70z9Tl_EdFuO26ZRQ22ZikDsg7fy.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22326,22930,22318,22378,22342,22928,22321,22383,22331,22322","m":"1007796774_longtail","nc":1},"ATbeq0B":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iTfb4\/yx\/l\/en_US\/bSqxIEuBnPF.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22921","m":"1007796774_longtail","nc":1},"sSCI77M":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yn\/r\/Tle9kBkyWWD.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22344","m":"1007796774_longtail","nc":1},"fIsfPpA":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iJfX4\/yf\/l\/en_US\/q-OC9GvDXLB.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22339","m":"1007796774_longtail","nc":1},"Pfkc54B":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yz\/r\/YBirLTG403L.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22726","m":"1007796774_longtail","nc":1},"sD3z2ST":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/ys\/r\/OgQZKqBcuUW.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22727","m":"1007796774_longtail","nc":1},"+ClWygH":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y5\/r\/r611P2Lt7hb.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22725","m":"1007796774_longtail","nc":1},"n2UPpV0":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yY\/r\/xKJiMS7RGt4.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22721","m":"1007796774_longtail","nc":1},"93jOtlY":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y0\/r\/UmpVPcPmZfo.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22724","m":"1007796774_longtail","nc":1},"2QqVX1U":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yQ\/r\/70ZVM_7bcjA.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22708","m":"1007796774_longtail","nc":1},"mhiCfI5":{"type":"js","src":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y2\/r\/Cu2KVQ06AcD.js?_nc_x=Ij3Wp8lg5Kz","c":1,"p":":22722","m":"1007796774_longtail","nc":1}},"compMap":{"CometProfileVideoSection.react":{"r":["hOjEt0H","L5R7p5D","CcM+LCX","92FWu0u","L6Tx9we"]},"Dialog":{"r":["lNw+3Cn","L5R7p5D","VJhwr7f","ymVdTSF","rDyHGpp","cXPO3JJ","PHpesmL","w4kZepP","x1i5pBt","EHXzFna","dQOzthE","CcM+LCX","zEfyD1a","hOjEt0H","PWJSBTX","L6Tx9we"],"rds":{"m":["FbtLogging","IntlQtEventFalcoEvent"],"r":["POkG4Hf"]},"be":1},"ExceptionDialog":{"r":["hOjEt0H","aeZ8J7P","0nDDuEM","LuUwuw\/","mfYeDTt","L5R7p5D","gcoFAhW","VJhwr7f","w4kZepP","x1i5pBt","ATbeq0B","sSCI77M","fIsfPpA","CcM+LCX","zEfyD1a","3unTLaW","L6Tx9we"],"rds":{"m":["FbtLogging","IntlQtEventFalcoEvent"],"r":["POkG4Hf"]},"be":1},"QuickSandSolver":{"r":["Pfkc54B","L5R7p5D","VJhwr7f","cXPO3JJ","PHpesmL","x1i5pBt","CcM+LCX","zEfyD1a","hOjEt0H","sD3z2ST","+ClWygH","L6Tx9we"],"rds":{"m":["FbtLogging","IntlQtEventFalcoEvent"],"r":["POkG4Hf"]},"be":1},"ConfirmationDialog":{"r":["L5R7p5D","cXPO3JJ","n2UPpV0","PHpesmL","x1i5pBt","CcM+LCX","zEfyD1a"],"be":1},"MWADeveloperReauthBarrier":{"r":["L5R7p5D","93jOtlY","2QqVX1U","mhiCfI5","CcM+LCX"],"be":1}},"sotUpgrades":["VJhwr7f","POkG4Hf","BG+mBnk","pZuCvpU","x1i5pBt","l5HqvCB"]})});
+requireLazy(["CometResourceScheduler","JSScheduler","Bootloader"],function(c,s,b){c.onHighPriComplete(function(){s.scheduleLoggingPriCallback(function(){b.loadResources(["VJhwr7f","POkG4Hf","BG+mBnk","pZuCvpU","x1i5pBt","l5HqvCB"])})})});
+requireLazy(["JSScheduler","ServerJS","ScheduledApplyEach"],function(JSScheduler,ServerJS,ScheduledApplyEach){qpl_inl("7252766289159758644","tierThreeBeforeScheduler");JSScheduler.runWithPriority(3,function(){qpl_inl("7252766289159758644","tierThreeInsideScheduler");(new ServerJS()).handleWithCustomApplyEach(ScheduledApplyEach,{"define":[["MarauderConfig",[],{"app_version":"1.0.0.0 (1007796774)","gk_enabled":false},31],["RTISubscriptionManagerConfig",[],{"config":{},"autobot":{},"assimilator":{},"unsubscribe_release":true,"bladerunner_www_sandbox":null,"is_intern":false},1081],["MqttWebConfig",[],{"fbid":"0","appID":219994525426954,"endpoint":"wss:\/\/edge-chat.facebook.com\/chat","pollingEndpoint":"https:\/\/edge-chat.facebook.com\/mqtt\/pull","subscribedTopics":[],"capabilities":10,"clientCapabilities":3,"chatVisibility":false,"hostNameOverride":""},3790],["MqttPublishTimeoutConfig",[],{"mqttPublishTimeoutMs":90000},4266],["RequestStreamE2EClientSamplingConfig",[],{"sampleRate":100000,"methodToSamplingMultiplier":{"RTCSessionMessage":10000,"Presence":0.01,"FBGQLS:VOD_TICKER_SUBSCRIBE":0.01,"FBGQLS:STORIES_TRAY_SUBSCRIBE":100,"Collabri":0.1,"FBGQLS:WORK_AVAILABILITY_STATUS_FANOUT_SUBSCRIBE":0.1,"FBGQLS:GROUP_UNSEEN_ACTIVITY_SUBSCRIBE":0.1,"FBGQLS:GROUP_RESET_UNSEEN_ACTIVITY_SUBSCRIBE":0.1,"FBGQLS:INTERN_CALENDAR_UPDATE_SUBSCRIBE":0.1,"SKY:gizmo_manage":10000,"FBGQLS:HUDDLE_USERS_REQUESTED_TO_SPEAK_COUNT_SUBSCRIBE":1000,"FBGQLS:FEEDBACK_LIKE_SUBSCRIBE":1}},4501],["AsyncRequestConfig",[],{"retryOnNetworkError":"1","useFetchStreamAjaxPipeTransport":false},328],["SessionNameConfig",[],{"seed":"0YP9"},757],["DataStoreConfig",[],{"expandoKey":"__FB_STORE","useExpando":true},2915],["WebDevicePerfInfoData",[],{"needsFullUpdate":true,"needsPartialUpdate":false,"shouldLogResourcePerf":false},3977],["TrackingConfig",[],{"domain":"https:\/\/pixel.facebook.com"},325],["WebStorageMonsterLoggingURI",[],{"uri":null},3032],["UserTimezoneServerTimeData",[],{"timezone":null,"force_update":null,"server_time":null,"server_gmt_offset":null},5502],["CometRouteActorToasterBlocklist",[],{"route_trace_policies":["comet.jobs.composer","comet.jobs.detailView","comet.compat.XCometPageJobOpeningDetailViewController","comet.offer.create","comet.offers.offer_details","comet.crisis.safety_check","comet.crisis.home_page"]},5542],["DGWWebConfig",[],{"appId":"238260118697367","appVersion":"0","dgwVersion":"2","endpoint":"","fbId":"0","authType":""},5508],["cr:496",[],{"__rc":[null,null]},-1],["cr:7346",[],{"__rc":[null,"Aa1uG3Ixnm9LUGmyDz0kOPhT5qAY3YNEmqpVmr8KdHvTz8r5CH79Hr0cOfF1bXwOu6dUkLf-R9q4iFn1lM32Ijmu3KOXKjkVuqjglgXV93nsXvDXeY_fyHFsqw"]},-1],["cr:3024",[],{"__rc":[null,"Aa0nx2eg4Mcjaw65XCQvxUWErdMnHdgKRdo5Hfx9kASPZTbqy4Frq5yig12OHBhFkcTTZ44adRsRDHM"]},-1],["cr:2046346",[],{"__rc":[null,null]},-1],["cr:708886",["EventProfilerSham"],{"__rc":["EventProfilerSham","Aa3FtHkyy8y3V6nYWEHAumALQz6t1GuDk6-j-x5LyLhdBr34-z3OwGfXPR7DN3zL6aoGcZWTuu3DPsNfggIJoUw8-E8"]},-1],["cr:334",["ghlTestUBTFacebook"],{"__rc":["ghlTestUBTFacebook","Aa19o3kRmBNP9oYoQxBWIuS05YI-TBfvs4TGJBT73iZLbDe0dzB-GC4NeoOdUBbbP74xpC33k9yzr-m-aINcWTF4Eg"]},-1],["cr:1543261",[],{"__rc":[null,"Aa2zxP-ObERewFJblmzWlC3s4lU8lCCaAoTWwChDw9jJ4ftMJrizYrTKkxLHsO7u23Qx_ByvkXH03CI9HfQkm8qB"]},-1],["cr:653",[],{"__rc":[null,"Aa3t9CAmqj_8nLOb6T6UUX33NWOSADIJDR21UZoicHvLAbfoGn78ZS-3b5YpJfUXqA_g3c5JX_wma8dLwQSCzOo6UMEuFRhpnw"]},-1],["cr:2718",[],{"__rc":[null,"Aa0D_DksQQwaajzbOTDM_bozkx8RQ8KACF7i-VgaL6I2mzQgQLfD6JtrNIzItQtFOethGJo7ZguKyXj2YE8Uga95N5Ka3FM"]},-1],["cr:5868",[],{"__rc":[null,"Aa06o_BFbNqylhD6ue7IyOqPisPcNG-2GtCq1vDIKyZU34--eAAR3PgRHLF_lIgv-nPfl56Vhcsj2bJWeqHY"]},-1],["cr:10026",[],{"__rc":[null,"Aa1BEeblW70xM3GXiyF8Jtql0czAd8P02km--Roxf0B5XibsN967kyaH3L6x4ncSWcCEw9ACizH_dQaczOytYycdwpWU4htKMiTXgA"]},-1],["cr:1201738",[],{"__rc":[null,"Aa03F9TMqysMwFhd3Q-LJWPiYsMFExaLGUKof8p5TSOSsu5gAt1-6x45a_BOxzY-kne5j73rG2SAmw1kwmBQolfG9NFRdaVZJlCXAPVoNaJa"]},-1],["cr:1332233",[],{"__rc":[null,"Aa1EpiT3xNzytNkeIO_gkQAPJqtld3fHt2vB6A1sURAZwTApR9_B0wZ7wgFw2Bp_WKVk98XC47r4DjxmKF3A6VpHHqHYcCvGcw"]},-1],["cr:1345969",["AccessibilityWebAssistiveTechTypedLoggerLite"],{"__rc":["AccessibilityWebAssistiveTechTypedLoggerLite","Aa0R_7ODFU8gOsNVC967DU_QeCkKwE9TCzXIlLSyHfxPQbPQ6bIRCcGjPv0LoArY8dKLThOiqNM"]},-1],["cr:1516609",["BDCometSignalCollectionTrigger"],{"__rc":["BDCometSignalCollectionTrigger","Aa0ch2_nfkoF06ZniAnixGd3PuiyeYWSsA-Tk5rJDoL7lfhVY2tQKR4PRMpmtGnbhrTt8OqBt7iUDL-AHv8vEtAdUI7e1LB69OKb9poIOb5VIxp2O4l0VD5aPg"]},-1],["cr:1094907",[],{"__rc":[null,"Aa2PKKET78AqwJR1made8iVs879_Geh8ObUU6zL5GhWj3cE79SlHhzIZnBM-eNlV9KfyVCriPi4RSG9ZRciOyWk"]},-1],["cr:5800",[],{"__rc":[null,"Aa0WyKt76IwRkrhiGCDkiReyZUQUisQvzVwOGolUwb_ZjFI0mgHBG6wgu8PCKt62iQ5QxXzxC8UQSyiLuRoNPKOqSshokl8"]},-1],["GhlTennisKnobsConfig",[],{"ghlbox_log_validity_in_mins":7200,"ghlbox_initialize_in_mins":14400,"change_class_interval_in_mins":1440},6687],["BDSignalCollectionData",[],{"sc":"{\"t\":1659080345,\"c\":[[30000,838801],[30001,838801],[30002,838801],[30003,838801],[30004,838801],[30005,838801],[30006,573585],[30007,838801],[30008,838801],[30012,838801],[30013,838801],[30015,806033],[30018,806033],[30021,540823],[30022,540817],[30040,806033],[30093,806033],[30094,806033],[30095,806033],[30101,541591],[30102,541591],[30103,541591],[30104,541591],[30106,806039],[30107,806039],[38000,541427],[38001,806643]]}","fds":60,"fda":60,"i":60,"sbs":1,"dbs":100,"bbs":100,"hbi":60,"rt":262144,"hbcbc":2,"hbvbc":0,"hbbi":30,"sid":-1,"hbv":"3481197084471247899"},5239],["cr:1088657",[],{"__rc":[null,"Aa0oy1dE_Lq9-k6IIA4r8j5Rp9J8e-sZwK30FIcR7yaQrlGrvT0x97sdlmRRUDpzOTO3BEHwzV0hiqqh0af5JCU"]},-1]],"require":[["MAWTTRCSafe\u004047b55ad42d307af8cfefc7705ec85609"],["BarcelonaAppUpsellDialog.react\u004047b55ad42d307af8cfefc7705ec85609"],["addCometProfileSwitchAnnotation\u004047b55ad42d307af8cfefc7705ec85609"],["ContextualConfig\u004047b55ad42d307af8cfefc7705ec85609"],["BladeRunnerClient\u004047b55ad42d307af8cfefc7705ec85609"],["CometToast.react\u004047b55ad42d307af8cfefc7705ec85609"],["BarcelonaRegionGatedAppUpsellDialog.react\u004047b55ad42d307af8cfefc7705ec85609"],["WebDevicePerfInfoLogging\u004047b55ad42d307af8cfefc7705ec85609"],["CometPixelRatioUpdater\u004047b55ad42d307af8cfefc7705ec85609"],["CometUncaughtError.react\u004047b55ad42d307af8cfefc7705ec85609"],["CometGHLTestUBT\u004047b55ad42d307af8cfefc7705ec85609"],["CometRootDeferred\u004047b55ad42d307af8cfefc7705ec85609"],["CometBrowserDimensionsLogger\u004047b55ad42d307af8cfefc7705ec85609"],["CometToasterView_DO_NOT_USE.react\u004047b55ad42d307af8cfefc7705ec85609"],["CometRelayEF\u004047b55ad42d307af8cfefc7705ec85609"],["FbtLogging\u004047b55ad42d307af8cfefc7705ec85609"],["CometRouteActorToaster.react\u004047b55ad42d307af8cfefc7705ec85609"],["LynxAsyncCallbackFalcoEvent\u004047b55ad42d307af8cfefc7705ec85609"],["CometOnBeforeUnloadDialog.react\u004047b55ad42d307af8cfefc7705ec85609"],["ClientConsistencyFalcoEvent\u004047b55ad42d307af8cfefc7705ec85609"],["DGWRequestStreamClient\u004047b55ad42d307af8cfefc7705ec85609"],["CometSuspenseFalcoEvent\u004047b55ad42d307af8cfefc7705ec85609"],["ODS\u004047b55ad42d307af8cfefc7705ec85609"],["IntlQtEventFalcoEvent\u004047b55ad42d307af8cfefc7705ec85609"],["FalcoLoggerTransports\u004047b55ad42d307af8cfefc7705ec85609"],["BarcelonaOverflowMenu.react\u004047b55ad42d307af8cfefc7705ec85609"],["BarcelonaLightboxDialog.react\u004047b55ad42d307af8cfefc7705ec85609"],["VideoPlayerWithLiveVideoInterruptedOverlay.react\u004047b55ad42d307af8cfefc7705ec85609"],["emptyFunction\u0040d18d6c2cc7e21adcd0c429e5805feea9","thatReturns",["RequireDeferredReference"],[[{"__dr":"MAWTTRCSafe"},{"__dr":"BarcelonaAppUpsellDialog.react"},{"__dr":"addCometProfileSwitchAnnotation"},{"__dr":"ContextualConfig"},{"__dr":"BladeRunnerClient"},{"__dr":"CometToast.react"},{"__dr":"BarcelonaRegionGatedAppUpsellDialog.react"},{"__dr":"WebDevicePerfInfoLogging"},{"__dr":"CometPixelRatioUpdater"},{"__dr":"CometUncaughtError.react"},{"__dr":"CometGHLTestUBT"},{"__dr":"CometRootDeferred"},{"__dr":"CometBrowserDimensionsLogger"},{"__dr":"CometToasterView_DO_NOT_USE.react"},{"__dr":"CometRelayEF"},{"__dr":"FbtLogging"},{"__dr":"CometRouteActorToaster.react"},{"__dr":"LynxAsyncCallbackFalcoEvent"},{"__dr":"CometOnBeforeUnloadDialog.react"},{"__dr":"ClientConsistencyFalcoEvent"},{"__dr":"DGWRequestStreamClient"},{"__dr":"CometSuspenseFalcoEvent"},{"__dr":"ODS"},{"__dr":"IntlQtEventFalcoEvent"},{"__dr":"BarcelonaCookieConsentLearnMoreDialog.react"},{"__dr":"FalcoLoggerTransports"},{"__dr":"BarcelonaOverflowMenu.react"},{"__dr":"BarcelonaLightboxDialog.react"},{"__dr":"VideoPlayerWithLiveVideoInterruptedOverlay.react"}]]],["CometPlatformRootClient\u00402b83959e18c2c99ee9b20805c95eb80f","initDeferred",["BarcelonaCometRootConfig"],[{"__m":"BarcelonaCometRootConfig"},{"sketchInfo":null,"userID":0,"deferredCookies":{},"blLoggingCavalryFields":{"bl_sample_rate":0,"hr_sample_rate":0,"parent_lid":"7252766289159758644"}}]],["BarcelonaToast.react\u0040da4c37123ad95802ebef96fb6a05bb50"],["MqttLongPollingRunner\u0040da4c37123ad95802ebef96fb6a05bb50"],["AcfToastImpressionFalcoEvent\u0040da4c37123ad95802ebef96fb6a05bb50"],["TransportSelectingClientSingletonConditional\u00405beab10f52c611a83513ff9172f6cb86"],["BaseToast.react\u0040da4c37123ad95802ebef96fb6a05bb50"],["json-bigint\u0040da4c37123ad95802ebef96fb6a05bb50"],["Bootloader\u0040417af301b507f7d8db0f7c38cffa1ca6","markComponentsAsImmediate",[],[["CometProfileVideoSection.react","VideoPlayerHTML5ApiCea608State","VideoPlayerHTML5ApiWebVttState"]]],["RequireDeferredReference\u0040c64d79ba793f808b0e3250b4c2a57080","unblock",[],[["MAWTTRCSafe","BarcelonaAppUpsellDialog.react","addCometProfileSwitchAnnotation","ContextualConfig","BladeRunnerClient","CometToast.react","BarcelonaRegionGatedAppUpsellDialog.react","WebDevicePerfInfoLogging","CometPixelRatioUpdater","CometUncaughtError.react","CometGHLTestUBT","CometRootDeferred","CometBrowserDimensionsLogger","CometToasterView_DO_NOT_USE.react","CometRelayEF","FbtLogging","CometRouteActorToaster.react","LynxAsyncCallbackFalcoEvent","CometOnBeforeUnloadDialog.react","ClientConsistencyFalcoEvent","DGWRequestStreamClient","CometSuspenseFalcoEvent","ODS","IntlQtEventFalcoEvent","BarcelonaCookieConsentLearnMoreDialog.react","FalcoLoggerTransports","BarcelonaOverflowMenu.react","BarcelonaLightboxDialog.react","VideoPlayerWithLiveVideoInterruptedOverlay.react","BarcelonaToast.react","MqttLongPollingRunner","CometExceptionDialog.react","AcfToastImpressionFalcoEvent","CometTooltipDeferredImpl.react","TransportSelectingClientSingletonConditional","VideoPlayerSpinner.react","VideoPlayerCaptionsArea.react","BaseToast.react","json-bigint"],"sd"]],["RequireDeferredReference\u0040c64d79ba793f808b0e3250b4c2a57080","unblock",[],[["MAWTTRCSafe","BarcelonaAppUpsellDialog.react","addCometProfileSwitchAnnotation","ContextualConfig","BladeRunnerClient","CometToast.react","BarcelonaRegionGatedAppUpsellDialog.react","WebDevicePerfInfoLogging","CometPixelRatioUpdater","CometUncaughtError.react","CometGHLTestUBT","CometRootDeferred","CometBrowserDimensionsLogger","CometToasterView_DO_NOT_USE.react","CometRelayEF","FbtLogging","CometRouteActorToaster.react","LynxAsyncCallbackFalcoEvent","CometOnBeforeUnloadDialog.react","ClientConsistencyFalcoEvent","DGWRequestStreamClient","CometSuspenseFalcoEvent","ODS","IntlQtEventFalcoEvent","FalcoLoggerTransports","BarcelonaOverflowMenu.react","BarcelonaLightboxDialog.react","VideoPlayerWithLiveVideoInterruptedOverlay.react","BarcelonaToast.react","MqttLongPollingRunner","CometExceptionDialog.react","AcfToastImpressionFalcoEvent","CometTooltipDeferredImpl.react","TransportSelectingClientSingletonConditional","VideoPlayerSpinner.react","VideoPlayerCaptionsArea.react","BaseToast.react","json-bigint"],"css"]]]});});});</script>
+<script>qpl_inl("7252766289159758644","tierThreeEnd");</script>
+<script type="application/json" data-content-len="85" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766289159758644","tierThreeEnd"]]]}</script>
+
+<script>window.pldmp = {"7252766289159758644":{"js\/649hye0x8vsw0c4o.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y0\/r\/E6KZsOw-TyZ.js?_nc_x=Ij3Wp8lg5Kz","refs":["htmlStart","tierOne","tierTwo","tierThree"]},"css\/b6sm5nrcj2o8s0go.pkg.css":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yD\/l\/0,cross\/8J4Vh7Dx9_0.css?_nc_x=Ij3Wp8lg5Kz","refs":["htmlStart","tierOne","tierTwo","tierThree"]},"js\/687i1t4o6skkw00w.pkg,js\/dfcvyysajwg0cg4o.pkg,js\/9tn41hehy60w8og0.pkg,js\/27u0lx8ryetcsko4.pkg,js\/ozi0dn0eaw0gwoc8.pkg.__composite__.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3i1Vd4\/y0\/l\/en_US\/9NbTpxFQDN_sHUpS5HkpnGVK1i3Cuen-71Vx1-9lxcVHHr6NpeIaFU7.js?_nc_x=Ij3Wp8lg5Kz","refs":["htmlStart","tierOne","tierTwo","tierThree"]},"js\/c4m95jb0l2go8cks.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3ij4U4\/yq\/l\/en_US\/kZT9Qdvtv8D.js?_nc_x=Ij3Wp8lg5Kz","refs":["htmlStart","tierOne","tierTwo","tierThree"]},"js\/8205t36wcb0oo08c.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iQLo4\/yt\/l\/en_US\/gQS6jq0A8uW.js?_nc_x=Ij3Wp8lg5Kz","refs":["htmlStart","tierOne","tierTwo","tierThree"]},"js\/1j0a8dobn5y8k0k4.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3idE44\/yr\/l\/en_US\/1DwJ8zL6B7E.js?_nc_x=Ij3Wp8lg5Kz","refs":["htmlStart","tierTwo","tierThree"]},"js\/9mxnuotx7ig4www0.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/y5\/r\/5qKf_cCaYht.js?_nc_x=Ij3Wp8lg5Kz","refs":["htmlStart","tierTwo"]},"js\/2o5uzr9iekcgss44.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iT0g4\/yh\/l\/en_US\/pjkq_l5ea-y.js?_nc_x=Ij3Wp8lg5Kz","refs":["htmlStart","tierTwo","tierThree"]},"js\/30xmv98hreqswcso.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iJXW4\/yk\/l\/en_US\/sG_RutKVqwE.js?_nc_x=Ij3Wp8lg5Kz","refs":["htmlStart","tierTwo"]},"js\/barcelona\/core\/BarcelonaPage.css":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yh\/l\/0,cross\/9kyY29nvH0n.css?_nc_x=Ij3Wp8lg5Kz","refs":["tierOne"]},"js\/f4hymy2ch3k804o4.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3iPjk4\/yj\/l\/en_US\/tS4NAEkk1ly.js?_nc_x=Ij3Wp8lg5Kz","refs":["tierThree"]},"js\/2ees9u6w5yckgkso.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3ikM54\/yf\/l\/en_US\/dKyu23I5fqr.js?_nc_x=Ij3Wp8lg5Kz","refs":["tierThree"]},"js\/5hwz9os7gvwgs00s.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yW\/r\/s70ZcYOHW2g.js?_nc_x=Ij3Wp8lg5Kz","refs":["tierThree"]},"js\/69ea5dcpp4w0wgkw.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yF\/r\/FLJXkx8ys-6.js?_nc_x=Ij3Wp8lg5Kz","refs":["tierThree"]},"js\/2rzkeo3vdbggwscw.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3i7M54\/yj\/l\/en_US\/me7LiwnFv1d.js?_nc_x=Ij3Wp8lg5Kz","refs":["tierThree"]},"js\/djeihiulvfkgcccw.pkg.js":{"url":"https:\/\/static.xx.fbcdn.net\/rsrc.php\/v3\/yY\/r\/YT7n1sgH1lv.js?_nc_x=Ij3Wp8lg5Kz","refs":["tierThree"]}}};</script>
+<script type="application/json" data-content-len="69" data-sjs>{"require":[["qplTagServerJS",null,null,[["lastServerTagFlushed"]]]]}</script>
+<script>qpl_inl("7252766289159758644-server","earlyFlush",83);</script>
+<script type="application/json" data-content-len="93" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766289159758644-server","earlyFlush",83]]]}</script>
+<script>qpl_inl("7252766289159758644-server","cometPageRender",84);</script>
+<script type="application/json" data-content-len="98" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766289159758644-server","cometPageRender",84]]]}</script>
+<script>qpl_inl("7252766289159758644-server","genTierOneHasteResponseStart",95);</script>
+<script type="application/json" data-content-len="111" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766289159758644-server","genTierOneHasteResponseStart",95]]]}</script>
+<script>qpl_inl("7252766289159758644-server","genTierOneHasteResponseEnd",110);</script>
+<script type="application/json" data-content-len="110" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766289159758644-server","genTierOneHasteResponseEnd",110]]]}</script>
+<script>qpl_inl("7252766289159758644-server","genTierTwoHasteResponseStart",119);</script>
+<script type="application/json" data-content-len="112" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766289159758644-server","genTierTwoHasteResponseStart",119]]]}</script>
+<script>qpl_inl("7252766289159758644-server","genTierTwoHasteResponseEnd",136);</script>
+<script type="application/json" data-content-len="110" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766289159758644-server","genTierTwoHasteResponseEnd",136]]]}</script>
+<script>qpl_inl("7252766289159758644-server","genTierThreeHasteResponseStart",144);</script>
+<script type="application/json" data-content-len="114" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766289159758644-server","genTierThreeHasteResponseStart",144]]]}</script>
+<script>qpl_inl("7252766289159758644-server","genTierThreeHasteResponseEnd",149);</script>
+<script type="application/json" data-content-len="112" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766289159758644-server","genTierThreeHasteResponseEnd",149]]]}</script>
+<script>qpl_inl("7252766289159758644-server","responseStart",1);</script>
+<script type="application/json" data-content-len="95" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766289159758644-server","responseStart",1]]]}</script>
+<script>qpl_inl("7252766289159758644-server","responseEnd",150);</script>
+<script type="application/json" data-content-len="95" data-sjs>{"require":[["qplTimingsServerJS",null,null,["7252766289159758644-server","responseEnd",150]]]}</script>
+<script>window.plbs = {"htmlStart":[79876,11432],"tierOne":[90809,50014],"tierTwo":[102291,29948],"ssr_error":[183,88],"tierThree":[22323,6992]};</script>
+</body></html>
+
diff --git a/spec/fixtures/onebox/twitterstatus.response b/spec/fixtures/onebox/twitterstatus.response
index 8bb442d5d8e..1761117c994 100644
--- a/spec/fixtures/onebox/twitterstatus.response
+++ b/spec/fixtures/onebox/twitterstatus.response
@@ -1,2814 +1,1867 @@
 <!DOCTYPE html>
-<html lang="en" data-scribe-reduced-action-queue="true">
-  <head>
-
-
-
-
-
-
-
-    <meta charset="utf-8">
-
-    <noscript><meta http-equiv="refresh" content="0; URL=https://mobile.twitter.com/i/nojs_router?path=%2Fvyki_e%2Fstatus%2F363116819147538433"></noscript>
-
-
-
-  <script id="bouncer_terminate_iframe" nonce="KXwIjaJlN1QIxC47iHrsvQ==">
-    if (window.top != window) {
-  window.top.postMessage({'bouncer': true, 'event': 'complete'}, '*');
-}
-  </script>
-  <script id="swift_action_queue" nonce="KXwIjaJlN1QIxC47iHrsvQ==">
-    (function(){function m(a){a||(a=window.event);if(!a)return!1;a.timestamp=(new Date).getTime();!a.target&&a.srcElement&&(a.target=a.srcElement);if(document.documentElement.getAttribute("data-scribe-reduced-action-queue")){var b=a.target;while(b&&b!=document
-.body){if(b.tagName=="A")return;b=b.parentNode}}r("all",s(a));if(!q(a)){r("direct",a);return!0}document.addEventListener||(a=s(a));a.preventDefault=a.stopPropagation=a.stopImmediatePropagation=function(){};if(i){f.push(a);r("captured",a)}else r("ignored",a
-);return!1}function n($){p();for(var a=0,b;b=f[a];a++){var d=$(b.target),e=d.closest("a")[0];if(b.type=="click"&&e){var g=$.data(e,"events"),i=g&&g.click,j=!e.hostname.match(c)||!e.href.match(/#$/);if(!i&&j){window.location=e.href;continue}}d.trigger($.event
-.fix(b))}window.swiftActionQueue.wasFlushed=!0}function o(){for(var a in j){if(a=="all")continue;var b=j[a];for(var c=0;c<b.length;c++)console.log("actionQueue",u(b[c]))}}function p(){clearTimeout(g);for(var a=0,b;b=e[a];a++)document["on"+b]=null}function q
-(a){if(!a.target)return!1;var b=a.target,e=(b.tagName||"").toLowerCase();if(a.metaKey)return!1;if(a.shiftKey&&e=="a")return!1;if(b.hostname&&!b.hostname.match(c))return!1;if(a.type.match(d)&&w(b))return!1;if(e=="label"){var f=b.getAttribute("for");if(f){var g=
-document.getElementById(f);if(g&&v(g))return!1}else for(var i=0,j;j=b.childNodes[i];i++)if(v(j))return!1}return!0}function r(a,b){b.bucket=a;j[a].push(b)}function s(a){var b={};for(var c in a)b[c]=a[c];return b}function t(a){while(a&&a!=document.body){if(a
-.tagName=="A")return a;a=a.parentNode}}function u(b){var c=[];b.bucket&&c.push("["+b.bucket+"]");c.push(b.type);var d=b.target,e=t(d),f="",g,i,j=b.timestamp&&b.timestamp-a;if(b.type==="click"&&e){g=e.className.trim().replace(/\s+/g,".");i=e.id.trim();f=/[^#]$/
-.test(e.href)?" ("+e.href+")":"";d='"'+e.innerText.replace(/\n+/g," ").trim()+'"'}else{g=d.className.trim().replace(/\s+/g,".");i=d.id.trim();d=d.tagName.toLowerCase();b.keyCode&&(d=String.fromCharCode(b.keyCode)+" : "+d)}c.push(d+f+(i&&"#"+i)+(!i&&g?"."+g
-:""));j&&c.push(j);return c.join(" ")}function v(a){var b=(a.tagName||"").toLowerCase();return b=="input"&&a.getAttribute("type")=="checkbox"}function w(a){var b=(a.tagName||"").toLowerCase();return b=="textarea"||b=="input"&&a.getAttribute("type")=="text"||
-a.getAttribute("contenteditable")=="true"}var a=(new Date).getTime(),b=1e4,c=/^([^\.]+\.)*twitter\.com$/,d=/^key/,e=["click","keydown","keypress","keyup"],f=[],g=null,i=!0,j={captured:[],ignored:[],direct:[],all:[]};for(var k=0,l;l=e[k];k++)document["on"+l
-]=m;g=setTimeout(function(){i=!1},b);window.swiftActionQueue={buckets:j,flush:n,logActions:o,wasFlushed:!1}})();
-  </script>
-  <script id="composition_state" nonce="KXwIjaJlN1QIxC47iHrsvQ==">
-    (function(){function a(a){a.target.setAttribute("data-in-composition","true")}function b(a){a.target.removeAttribute("data-in-composition")}if(document.addEventListener){document.addEventListener("compositionstart",a,!1);document.addEventListener("compositionend"
-,b,!1)}})();
-  </script>
-  <script id="load_js" nonce="KXwIjaJlN1QIxC47iHrsvQ==">
-    /*! loadJS: load a JS file asynchronously. [c]2014 @scottjehl, Filament Group, Inc. (Based on http://goo.gl/REQGQ by Paul Irish). Licensed MIT */(function(a){var b=function(b,c){"use strict";var d=a.document.getElementsByTagName("script")[0],e=a.document.createElement
-("script");e.src=b;e.async=!0;d.parentNode.insertBefore(e,d);c&&typeof c=="function"&&(e.onload=c);return e};typeof module!="undefined"?module.exports=b:a.loadJS=b})(typeof global!="undefined"?global:this);
-  </script>
-
-    <link rel="stylesheet" href="https://abs.twimg.com/a/1467966468/css/t1/twitter_core.bundle.css">
-  <link rel="stylesheet" href="https://abs.twimg.com/a/1467966468/css/t1/twitter_more_1.bundle.css">
-  <link rel="stylesheet" href="https://abs.twimg.com/a/1467966468/css/t1/twitter_more_2.bundle.css">
-
-    <link rel="dns-prefetch" href="https://pbs.twimg.com">
-    <link rel="dns-prefetch" href="https://t.co">
-      <link rel="preload" href="https://abs.twimg.com/c/swift/en/init.314a9707f177773430c9b565030e9ea5b8638c96.js" as="script">
-      <link rel="preload" href="https://abs.twimg.com/c/swift/en/bundle/timeline.20389bc2f54407a5eb508e248a2a7a64457c0609.js" as="script">
-      <link rel="preload" href="https://abs.twimg.com/c/swift/en/bundle/boot.c09735539d966801edba73cbc8a86a0042072a93.js" as="script">
-
-      <title>Vyki Englert on Twitter: &quot;I&#39;m a sucker for pledges.  @Peers Pledge #sharingeconomy http://t.co/T4Sc47KAzh&quot;</title>
-      <meta name="robots" content="NOODP">
-
-
-
-
-<meta name="msapplication-TileImage" content="//abs.twimg.com/favicons/win8-tile-144.png"/>
-<meta name="msapplication-TileColor" content="#00aced"/>
-
-
-<link rel="mask-icon" sizes="any" href="https://abs.twimg.com/a/1467966468/img/t1/favicon.svg" color="#55acee">
-
-<link href="//abs.twimg.com/favicons/favicon.ico" rel="shortcut icon" type="image/x-icon">
-
-<link rel="manifest" href="/manifest.json">
-
-
-  <meta name="swift-page-name" id="swift-page-name" content="permalink">
-
-    <link rel="canonical" href="https://twitter.com/vyki_e/status/363116819147538433">
-  <link rel="alternate" hreflang="x-default" href="https://twitter.com/vyki_e/status/363116819147538433">
-  <link rel="alternate" hreflang="fr" href="https://twitter.com/vyki_e/status/363116819147538433?lang=fr"><link rel="alternate" hreflang="en" href="https://twitter.com/vyki_e/status/363116819147538433?lang=en"><link rel="alternate" hreflang="ar" href="https://twitter.com/vyki_e/status/363116819147538433?lang=ar"><link rel="alternate" hreflang="ja" href="https://twitter.com/vyki_e/status/363116819147538433?lang=ja"><link rel="alternate" hreflang="es" href="https://twitter.com/vyki_e/status/363116819147538433?lang=es"><link rel="alternate" hreflang="de" href="https://twitter.com/vyki_e/status/363116819147538433?lang=de"><link rel="alternate" hreflang="it" href="https://twitter.com/vyki_e/status/363116819147538433?lang=it"><link rel="alternate" hreflang="id" href="https://twitter.com/vyki_e/status/363116819147538433?lang=id"><link rel="alternate" hreflang="pt" href="https://twitter.com/vyki_e/status/363116819147538433?lang=pt"><link rel="alternate" hreflang="ko" href="https://twitter.com/vyki_e/status/363116819147538433?lang=ko"><link rel="alternate" hreflang="tr" href="https://twitter.com/vyki_e/status/363116819147538433?lang=tr"><link rel="alternate" hreflang="ru" href="https://twitter.com/vyki_e/status/363116819147538433?lang=ru"><link rel="alternate" hreflang="nl" href="https://twitter.com/vyki_e/status/363116819147538433?lang=nl"><link rel="alternate" hreflang="fil" href="https://twitter.com/vyki_e/status/363116819147538433?lang=fil"><link rel="alternate" hreflang="ms" href="https://twitter.com/vyki_e/status/363116819147538433?lang=ms"><link rel="alternate" hreflang="zh-tw" href="https://twitter.com/vyki_e/status/363116819147538433?lang=zh-tw"><link rel="alternate" hreflang="zh-cn" href="https://twitter.com/vyki_e/status/363116819147538433?lang=zh-cn"><link rel="alternate" hreflang="hi" href="https://twitter.com/vyki_e/status/363116819147538433?lang=hi"><link rel="alternate" hreflang="no" href="https://twitter.com/vyki_e/status/363116819147538433?lang=no"><link rel="alternate" hreflang="sv" href="https://twitter.com/vyki_e/status/363116819147538433?lang=sv"><link rel="alternate" hreflang="fi" href="https://twitter.com/vyki_e/status/363116819147538433?lang=fi"><link rel="alternate" hreflang="da" href="https://twitter.com/vyki_e/status/363116819147538433?lang=da"><link rel="alternate" hreflang="pl" href="https://twitter.com/vyki_e/status/363116819147538433?lang=pl"><link rel="alternate" hreflang="hu" href="https://twitter.com/vyki_e/status/363116819147538433?lang=hu"><link rel="alternate" hreflang="fa" href="https://twitter.com/vyki_e/status/363116819147538433?lang=fa"><link rel="alternate" hreflang="he" href="https://twitter.com/vyki_e/status/363116819147538433?lang=he"><link rel="alternate" hreflang="ur" href="https://twitter.com/vyki_e/status/363116819147538433?lang=ur"><link rel="alternate" hreflang="th" href="https://twitter.com/vyki_e/status/363116819147538433?lang=th"><link rel="alternate" hreflang="uk" href="https://twitter.com/vyki_e/status/363116819147538433?lang=uk"><link rel="alternate" hreflang="ca" href="https://twitter.com/vyki_e/status/363116819147538433?lang=ca"><link rel="alternate" hreflang="ga" href="https://twitter.com/vyki_e/status/363116819147538433?lang=ga"><link rel="alternate" hreflang="el" href="https://twitter.com/vyki_e/status/363116819147538433?lang=el"><link rel="alternate" hreflang="eu" href="https://twitter.com/vyki_e/status/363116819147538433?lang=eu"><link rel="alternate" hreflang="cs" href="https://twitter.com/vyki_e/status/363116819147538433?lang=cs"><link rel="alternate" hreflang="gl" href="https://twitter.com/vyki_e/status/363116819147538433?lang=gl"><link rel="alternate" hreflang="ro" href="https://twitter.com/vyki_e/status/363116819147538433?lang=ro"><link rel="alternate" hreflang="hr" href="https://twitter.com/vyki_e/status/363116819147538433?lang=hr"><link rel="alternate" hreflang="en-gb" href="https://twitter.com/vyki_e/status/363116819147538433?lang=en-gb"><link rel="alternate" hreflang="vi" href="https://twitter.com/vyki_e/status/363116819147538433?lang=vi"><link rel="alternate" hreflang="bn" href="https://twitter.com/vyki_e/status/363116819147538433?lang=bn"><link rel="alternate" hreflang="bg" href="https://twitter.com/vyki_e/status/363116819147538433?lang=bg"><link rel="alternate" hreflang="sr" href="https://twitter.com/vyki_e/status/363116819147538433?lang=sr"><link rel="alternate" hreflang="sk" href="https://twitter.com/vyki_e/status/363116819147538433?lang=sk"><link rel="alternate" hreflang="gu" href="https://twitter.com/vyki_e/status/363116819147538433?lang=gu"><link rel="alternate" hreflang="mr" href="https://twitter.com/vyki_e/status/363116819147538433?lang=mr"><link rel="alternate" hreflang="ta" href="https://twitter.com/vyki_e/status/363116819147538433?lang=ta"><link rel="alternate" hreflang="kn" href="https://twitter.com/vyki_e/status/363116819147538433?lang=kn">
-
-    <link rel="alternate" type="application/json+oembed" href="https://publish.twitter.com/oembed?url=https://twitter.com/vyki_e/status/363116819147538433" title="Vyki Englert on Twitter: &quot;I&#39;m a sucker for pledges.  @Peers Pledge #sharingeconomy http://t.co/T4Sc47KAzh&quot;">
-
-
-  <link rel="alternate" media="handheld, only screen and (max-width: 640px)" href="https://mobile.twitter.com/vyki_e/status/363116819147538433">
-
-      <link rel="alternate" href="android-app://com.twitter.android/twitter/tweet?status_id=363116819147538433&amp;ref_src=twsrc%5Egoogle%7Ctwcamp%5Eandroidseo%7Ctwgr%5Estatus%7Ctwterm%5E363116819147538433">
-
+<html dir="ltr" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0,viewport-fit=cover">
+<link rel="preconnect" href="//abs.twimg.com">
+<link rel="dns-prefetch" href="//abs.twimg.com">
+<link rel="preconnect" href="//api.twitter.com">
+<link rel="dns-prefetch" href="//api.twitter.com">
+<link rel="preconnect" href="//pbs.twimg.com">
+<link rel="dns-prefetch" href="//pbs.twimg.com">
+<link rel="preconnect" href="//t.co">
+<link rel="dns-prefetch" href="//t.co">
+<link rel="preconnect" href="//video.twimg.com">
+<link rel="dns-prefetch" href="//video.twimg.com">
+<meta property="fb:app_id" content="2231777543">
+<meta property="og:site_name" content="Twitter">
+<meta name="google-site-verification" content="acYOOcR5z6puMzLn6hLDZI1nNHXPxt57OIstz1vnCV0">
+<meta name="facebook-domain-verification" content="x6sdcc8b5ju3bh8nbm59eswogvg6t1">
+<meta http-equiv="onion-location" content="https://twitter3e4tixl4xyajtrzo62zg5vztmjuricljdp2c5kshju4avyoid.onion/">
+<link rel="manifest" href="/manifest.json" crossorigin="use-credentials">
 <link rel="search" type="application/opensearchdescription+xml" href="/opensearch.xml" title="Twitter">
-
-    <link id="async-css-placeholder">
-
-        <meta  property="og:type" content="article">
-        <meta  property="og:url" content="https://twitter.com/vyki_e/status/363116819147538433">
-        <meta  property="og:title" content="Vyki Englert on Twitter">
-        <meta  property="og:image" content="https://pbs.twimg.com/profile_images/732349210264133632/RTNgZLrm_400x400.jpg">
-        <meta  property="og:description" content="“I&#39;m a sucker for pledges.  @Peers Pledge #sharingeconomy http://t.co/T4Sc47KAzh”">
-        <meta  property="og:site_name" content="Twitter">
-        <meta  property="fb:app_id" content="2231777543">
-      <input type="hidden" id="init-data" class="json-data" value="{&quot;keyboardShortcuts&quot;:[{&quot;name&quot;:&quot;Actions&quot;,&quot;description&quot;:&quot;Shortcuts for common actions.&quot;,&quot;shortcuts&quot;:[{&quot;keys&quot;:[&quot;Enter&quot;],&quot;description&quot;:&quot;Open Tweet details&quot;},{&quot;keys&quot;:[&quot;o&quot;],&quot;description&quot;:&quot;Expand photo&quot;},{&quot;keys&quot;:[&quot;\/&quot;],&quot;description&quot;:&quot;Search&quot;}]},{&quot;name&quot;:&quot;Navigation&quot;,&quot;description&quot;:&quot;Shortcuts for navigating between items in timelines.&quot;,&quot;shortcuts&quot;:[{&quot;keys&quot;:[&quot;?&quot;],&quot;description&quot;:&quot;This menu&quot;},{&quot;keys&quot;:[&quot;j&quot;],&quot;description&quot;:&quot;Next Tweet&quot;},{&quot;keys&quot;:[&quot;k&quot;],&quot;description&quot;:&quot;Previous Tweet&quot;},{&quot;keys&quot;:[&quot;Space&quot;],&quot;description&quot;:&quot;Page down&quot;},{&quot;keys&quot;:[&quot;.&quot;],&quot;description&quot;:&quot;Load new Tweets&quot;}]},{&quot;name&quot;:&quot;Timelines&quot;,&quot;description&quot;:&quot;Shortcuts for navigating to different timelines or pages.&quot;,&quot;shortcuts&quot;:[{&quot;keys&quot;:[&quot;g&quot;,&quot;u&quot;],&quot;description&quot;:&quot;Go to user\u2026&quot;}]}],&quot;jsInitDelay&quot;:0,&quot;hasKenburnEffectOnSingleImage&quot;:false,&quot;composeIgnoreAttachmentText&quot;:false,&quot;baseFoucClass&quot;:&quot;swift-loading&quot;,&quot;bodyFoucClassNames&quot;:&quot;swift-loading&quot;,&quot;macawSwift&quot;:true,&quot;assetsBasePath&quot;:&quot;https:\/\/abs.twimg.com\/a\/1467966468\/&quot;,&quot;assetVersionKey&quot;:&quot;f28314&quot;,&quot;environment&quot;:&quot;production&quot;,&quot;formAuthenticityToken&quot;:&quot;0ca3d94aff5192efa7e34ae4eae60d07f5babd38&quot;,&quot;loggedIn&quot;:false,&quot;softUserLoggedIn&quot;:false,&quot;screenName&quot;:null,&quot;fullName&quot;:null,&quot;userId&quot;:null,&quot;guestId&quot;:&quot;142926596918437608&quot;,&quot;allowAdsPersonalization&quot;:true,&quot;scribeBufferSize&quot;:3,&quot;pageName&quot;:&quot;permalink&quot;,&quot;sectionName&quot;:&quot;permalink&quot;,&quot;scribeParameters&quot;:{},&quot;recaptchaApiUrl&quot;:&quot;https:\/\/www.google.com\/recaptcha\/api\/js\/recaptcha_ajax.js&quot;,&quot;internalReferer&quot;:null,&quot;geoEnabled&quot;:false,&quot;typeaheadData&quot;:{&quot;accounts&quot;:{&quot;enabled&quot;:true,&quot;localQueriesEnabled&quot;:false,&quot;remoteQueriesEnabled&quot;:true,&quot;limit&quot;:6},&quot;trendLocations&quot;:{&quot;enabled&quot;:true},&quot;dmConversations&quot;:{&quot;enabled&quot;:false},&quot;savedSearches&quot;:{&quot;enabled&quot;:false,&quot;items&quot;:[]},&quot;dmAccounts&quot;:{&quot;enabled&quot;:false,&quot;localQueriesEnabled&quot;:false,&quot;remoteQueriesEnabled&quot;:false,&quot;onlyDMable&quot;:true},&quot;mediaTagAccounts&quot;:{&quot;enabled&quot;:false,&quot;localQueriesEnabled&quot;:true,&quot;remoteQueriesEnabled&quot;:false,&quot;onlyShowUsersWithCanMediaTag&quot;:false,&quot;currentUserId&quot;:-1},&quot;selectedUsers&quot;:{&quot;enabled&quot;:false},&quot;prefillUsers&quot;:{&quot;enabled&quot;:false},&quot;topics&quot;:{&quot;enabled&quot;:true,&quot;localQueriesEnabled&quot;:false,&quot;remoteQueriesEnabled&quot;:true,&quot;prefetchLimit&quot;:500,&quot;limit&quot;:4},&quot;concierge&quot;:{&quot;enabled&quot;:false,&quot;localQueriesEnabled&quot;:false,&quot;remoteQueriesEnabled&quot;:false,&quot;prefetchLimit&quot;:500,&quot;limit&quot;:6},&quot;recentSearches&quot;:{&quot;enabled&quot;:false},&quot;hashtags&quot;:{&quot;enabled&quot;:false,&quot;localQueriesEnabled&quot;:false,&quot;remoteQueriesEnabled&quot;:true,&quot;prefetchLimit&quot;:500},&quot;useIndexedDB&quot;:false,&quot;showSearchAccountSocialContext&quot;:false,&quot;showDebugInfo&quot;:false,&quot;useThrottle&quot;:true,&quot;accountsOnTop&quot;:false,&quot;remoteDebounceInterval&quot;:300,&quot;remoteThrottleInterval&quot;:300,&quot;tweetContextEnabled&quot;:false,&quot;fullNameMatchingInCompose&quot;:true,&quot;topicsWithFiltersEnabled&quot;:false},&quot;dm&quot;:{&quot;notifications&quot;:false,&quot;usePushForNotifications&quot;:false,&quot;participant_max&quot;:50,&quot;video_gif_render&quot;:true,&quot;video_gif_upload&quot;:true,&quot;twitter_video_player&quot;:true,&quot;typing_indicators_publish&quot;:false,&quot;poll_options&quot;:{&quot;foreground_poll_interval&quot;:3000,&quot;burst_poll_interval&quot;:3000,&quot;burst_poll_duration&quot;:300000,&quot;max_poll_interval&quot;:60000}},&quot;whitelistedVideoUser&quot;:false,&quot;autoplayDisabled&quot;:false,&quot;pushStatePageLimit&quot;:500000,&quot;routes&quot;:{&quot;profile&quot;:&quot;\/&quot;},&quot;pushState&quot;:true,&quot;viewContainer&quot;:&quot;#page-container&quot;,&quot;dragAndDropPhotoUpload&quot;:true,&quot;href&quot;:&quot;\/vyki_e\/status\/363116819147538433&quot;,&quot;searchPathWithQuery&quot;:&quot;\/search?q=query&amp;src=typd&quot;,&quot;timelineCardsGallery&quot;:true,&quot;composeAltText&quot;:false,&quot;deciders&quot;:{&quot;bulkUnfollowEnabled&quot;:true,&quot;custom_timeline_curation&quot;:false,&quot;moment_maker_enabled&quot;:false,&quot;disable_profile_popup&quot;:false,&quot;native_notifications&quot;:true,&quot;dm_polling_frequency_in_seconds&quot;:3000,&quot;enable_media_tag_prefetch&quot;:true,&quot;foundMediaTrendingEnabled&quot;:false,&quot;enableMacawNymizerConversionLanding&quot;:false,&quot;hqImageUploads&quot;:false,&quot;largeHeaderImageUpload&quot;:true,&quot;live_pipeline_consume&quot;:false,&quot;mqImageUploads&quot;:false,&quot;partnerIdSyncEnabled&quot;:true,&quot;sruMediaCategory&quot;:true,&quot;photoSruGifLimitMb&quot;:15,&quot;promoted_video_logging_enabled&quot;:true,&quot;pushState&quot;:true,&quot;scribeReducedActionQueue&quot;:true,&quot;smartInfiniteScroll&quot;:false,&quot;useHtml5Webcam&quot;:true,&quot;hideLeadingMentions&quot;:false,&quot;hideLeadingMentionsWithTooltip&quot;:true,&quot;web_perftown_stats&quot;:true,&quot;web_perftown_ttft&quot;:true,&quot;web_sru_stats&quot;:false,&quot;web_upload_direct&quot;:true,&quot;web_upload_video&quot;:true,&quot;web_upload_video_advanced&quot;:false,&quot;upload_video_size&quot;:500,&quot;defaultVideoDuration&quot;:45,&quot;maxVideoDuration&quot;:140,&quot;internationalShippingEnabled&quot;:true,&quot;useV2EndpointsEnabled&quot;:true,&quot;useVmapVariants&quot;:false,&quot;autoplayPreviewPreroll&quot;:true,&quot;moments_lohp_enabled&quot;:true,&quot;momentsExperienceEnabled&quot;:false,&quot;enableNativePush&quot;:false,&quot;installNativePush&quot;:false,&quot;autoSubscribeNativePush&quot;:false,&quot;stickersInteractivity&quot;:true,&quot;stickersInteractivityDuringLoading&quot;:true,&quot;stickersExperience&quot;:true,&quot;dynamic_video_ads_include_long_videos&quot;:true,&quot;push_state_size&quot;:1000,&quot;canBeSoftUser&quot;:false,&quot;isInSoftExperiment&quot;:false},&quot;experiments&quot;:{},&quot;toasts_dm&quot;:false,&quot;toasts_spoonbill&quot;:false,&quot;toasts_timeline&quot;:false,&quot;toasts_dm_poll_scale&quot;:60,&quot;defaultNotificationIcon&quot;:&quot;https:\/\/abs.twimg.com\/a\/1467966468\/img\/t1\/mobile\/wp7_app_icon.png&quot;,&quot;uploadDomain&quot;:&quot;upload.twitter.com&quot;,&quot;promptbirdData&quot;:{&quot;promptbirdEnabled&quot;:false,&quot;immediateTriggers&quot;:[&quot;PullToRefresh&quot;,&quot;Navigate&quot;],&quot;format&quot;:null},&quot;passwordResetAdvancedLoginForm&quot;:true,&quot;skipAutoSignupDialog&quot;:true,&quot;shouldReplaceSignupWithLogin&quot;:true,&quot;hashflagBaseUrl&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/&quot;,&quot;activeHashflags&quot;:{&quot;المسافر&quot;:&quot;AlMosafer\/travel.png&quot;,&quot;سفرة_الصيف&quot;:&quot;AlMosafer\/travel.png&quot;,&quot;whitejersey&quot;:&quot;TDF2016\/WhiteJersey.png&quot;,&quot;bacphysique&quot;:&quot;baccalaureat_emoji\/baccalaureat_emoji.png&quot;,&quot;togetherstronger&quot;:&quot;EurosFootball2016\/Wales.png&quot;,&quot;ger&quot;:&quot;EurosFootball2016\/Germany.png&quot;,&quot;meinestimme&quot;:&quot;USElections2016\/ivoted.png&quot;,&quot;bacst2s&quot;:&quot;baccalaureat_emoji\/baccalaureat_emoji.png&quot;,&quot;اقترعت&quot;:&quot;USElections2016\/ivoted.png&quot;,&quot;immerwiederoesterreich&quot;:&quot;EurosFootball2016\/Austria.png&quot;,&quot;一站到底&quot;:&quot;JSBCI\/JSBCI_emoji.png&quot;,&quot;bacpro&quot;:&quot;baccalaureat_emoji\/baccalaureat_emoji.png&quot;,&quot;سافر_الحين_وادفع_بعدين&quot;:&quot;AlMosafer\/travel.png&quot;,&quot;tdf&quot;:&quot;TDF2016\/TDF.png&quot;,&quot;bacstmg&quot;:&quot;baccalaureat_emoji\/baccalaureat_emoji.png&quot;,&quot;maillotjaunelcl&quot;:&quot;TDF2016\/YellowJersey.png&quot;,&quot;periscope&quot;:&quot;Periscope\/Periscope.png&quot;,&quot;bethefastest&quot;:&quot;EmojiVirgin\/EmojiVirgin.png&quot;,&quot;jederfuerjeden&quot;:&quot;EurosFootball2016\/Germany.png&quot;,&quot;abfabmovie&quot;:&quot;AbFabMovie\/AbFabMovie.png&quot;,&quot;yoenunvw&quot;:&quot;Volkswagen\/YoEnUnVW.png&quot;,&quot;lovetwitter&quot;:&quot;LoveTwitter\/LoveTwitter.png&quot;,&quot;ifoodnomengão&quot;:&quot;iFoodBrazil\/flamengo.png&quot;,&quot;badisbred&quot;:&quot;AnimalKingdom_Deliver\/BadisBred.png&quot;,&quot;arabianoud&quot;:&quot;ArabianOud\/incense_burner.png&quot;,&quot;عطور_عربية&quot;:&quot;ArabianOud\/incense_burner.png&quot;,&quot;admis&quot;:&quot;baccalaureat_emoji\/baccalaureat_emoji.png&quot;,&quot;weareamerica&quot;:&quot;AdCouncilEmoji\/AdCouncilEmoji_Original.png&quot;,&quot;cervantes400&quot;:&quot;CervantesEmoji\/cervantes-emoji.png&quot;,&quot;maillotapoiscarrefour&quot;:&quot;TDF2016\/PolkaDotJersey.png&quot;,&quot;hovotato&quot;:&quot;USElections2016\/ivoted.png&quot;,&quot;seleçãoeuro&quot;:&quot;EuroNoSporTV\/EuroNoSporTV.png&quot;,&quot;япроголосовал(а)&quot;:&quot;USElections2016\/ivoted.png&quot;,&quot;bastilleday&quot;:&quot;BastilleDay2016\/BastilleDay.png&quot;,&quot;sienteelsabor&quot;:&quot;CocaCola\/SienteElSabor.png&quot;,&quot;bacfrançais&quot;:&quot;baccalaureat_emoji\/baccalaureat_emoji.png&quot;,&quot;gawa&quot;:&quot;EurosFootball2016\/NorthernIreland.png&quot;,&quot;احساس&quot;:&quot;ArabianOud\/incense_burner.png&quot;,&quot;hun&quot;:&quot;EurosFootball2016\/Hungary.png&quot;,&quot;مضاوي&quot;:&quot;ArabianOud\/incense_burner.png&quot;,&quot;bacsti2d&quot;:&quot;baccalaureat_emoji\/baccalaureat_emoji.png&quot;,&quot;wimbledon&quot;:&quot;Wimbledon2016\/Wimbledon.png&quot;,&quot;yellowjersey&quot;:&quot;TDF2016\/YellowJersey.png&quot;,&quot;vivelamannschaft&quot;:&quot;Mercedes\/Mercedes.png&quot;,&quot;maillotapois&quot;:&quot;TDF2016\/PolkaDotJersey.png&quot;,&quot;bacanglais&quot;:&quot;baccalaureat_emoji\/baccalaureat_emoji.png&quot;,&quot;1of11million&quot;:&quot;EurosFootball2016\/Portugal.png&quot;,&quot;jaivoté&quot;:&quot;USElections2016\/ivoted.png&quot;,&quot;fetenationale&quot;:&quot;BastilleDay2016\/BastilleDay.png&quot;,&quot;golive&quot;:&quot;goLIVE2016\/goLIVE.png&quot;,&quot;zoella&quot;:&quot;ZoellaEmoji\/Zoella.png&quot;,&quot;everycharactermatters&quot;:&quot;EveryCharacterMatters\/EveryCharacterMatters.png&quot;,&quot;bachistoiregeographie&quot;:&quot;baccalaureat_emoji\/baccalaureat_emoji.png&quot;,&quot;whosstillstanding&quot;:&quot;JSBCI\/JSBCI_emoji.png&quot;,&quot;我已投票&quot;:&quot;USElections2016\/ivoted.png&quot;,&quot;euro2016&quot;:&quot;EurosFootball2016\/trophy.png&quot;,&quot;bacsvt&quot;:&quot;baccalaureat_emoji\/baccalaureat_emoji.png&quot;,&quot;twitterstaryarasky&quot;:&quot;TwitterstarYarasky\/TwitterstarYarasky.png&quot;,&quot;fazerdiferente&quot;:&quot;TIM\/emoji_tim_final_3.png&quot;,&quot;tousenfrance&quot;:&quot;EurosFootball2016\/Belgium.png&quot;,&quot;400cervantes&quot;:&quot;CervantesEmoji\/cervantes-emoji.png&quot;,&quot;directpr&quot;:&quot;BastilleDay2016\/BastilleDay.png&quot;,&quot;bacsthr&quot;:&quot;baccalaureat_emoji\/baccalaureat_emoji.png&quot;,&quot;maillotblanc&quot;:&quot;TDF2016\/WhiteJersey.png&quot;,&quot;jaimonbac&quot;:&quot;baccalaureat_emoji\/baccalaureat_emoji.png&quot;,&quot;isl&quot;:&quot;EurosFootball2016\/Iceland.png&quot;,&quot;bizbittidemedenbitmez&quot;:&quot;EurosFootball2016\/Turkey.png&quot;,&quot;ceskarepre&quot;:&quot;EurosFootball2016\/CzechRepublic.png&quot;,&quot;sui&quot;:&quot;EurosFootball2016\/Switzerland.png&quot;,&quot;svk&quot;:&quot;EurosFootball2016\/Slovakia.png&quot;,&quot;تطبيق_المسافر_للحجوزات&quot;:&quot;AlMosafer\/travel.png&quot;,&quot;bactmd&quot;:&quot;baccalaureat_emoji\/baccalaureat_emoji.png&quot;,&quot;투표했어요&quot;:&quot;USElections2016\/ivoted.png&quot;,&quot;euronosportv&quot;:&quot;EuroNoSporTV\/EuroNoSporTV.png&quot;,&quot;allezlasuisse&quot;:&quot;EurosFootball2016\/Switzerland.png&quot;,&quot;timchef&quot;:&quot;TIMChef\/emoji_masterchef.png&quot;,&quot;rumoaorio&quot;:&quot;100Days\/100Days.png&quot;,&quot;однакоманда&quot;:&quot;EurosFootball2016\/Russia.png&quot;,&quot;nir&quot;:&quot;EurosFootball2016\/NorthernIreland.png&quot;,&quot;aut&quot;:&quot;EurosFootball2016\/Austria.png&quot;,&quot;bachistoire&quot;:&quot;baccalaureat_emoji\/baccalaureat_emoji.png&quot;,&quot;وودي&quot;:&quot;ArabianOud\/incense_burner.png&quot;,&quot;csakegyutt&quot;:&quot;EurosFootball2016\/Hungary.png&quot;,&quot;goingsolo&quot;:&quot;ZoellaEmoji\/Zoella.png&quot;,&quot;تطبيق_المسافر&quot;:&quot;AlMosafer\/travel.png&quot;,&quot;tdf2016&quot;:&quot;TDF2016\/TDF.png&quot;,&quot;bacphilo&quot;:&quot;baccalaureat_emoji\/baccalaureat_emoji.png&quot;,&quot;bacphysiquechimie&quot;:&quot;baccalaureat_emoji\/baccalaureat_emoji.png&quot;,&quot;твоязбірна&quot;:&quot;EurosFootball2016\/Ukraine.png&quot;,&quot;eng&quot;:&quot;EurosFootball2016\/England.png&quot;,&quot;14juillet2016&quot;:&quot;BastilleDay2016\/BastilleDay.png&quot;,&quot;chamaolimpica&quot;:&quot;OlympicTorch_Emoji\/OlympicTorch.png&quot;,&quot;presidentduterte&quot;:&quot;PresidentDuterte\/PHVoteDuterte.png&quot;,&quot;ivoted&quot;:&quot;USElections2016\/ivoted.png&quot;,&quot;rus&quot;:&quot;EurosFootball2016\/Russia.png&quot;,&quot;olympicflame&quot;:&quot;OlympicTorch_Emoji\/OlympicTorch.png&quot;,&quot;ifoodnomengao&quot;:&quot;iFoodBrazil\/flamengo.png&quot;,&quot;alb&quot;:&quot;EurosFootball2016\/Albania.png&quot;,&quot;thequeue&quot;:&quot;Wimbledon2016\/TheQueue.png&quot;,&quot;rou&quot;:&quot;EurosFootball2016\/Romania.png&quot;,&quot;badmoms&quot;:&quot;Universal_BadMoms_Emoji\/BadMoms.png&quot;,&quot;greenjersey&quot;:&quot;TDF2016\/GreenJersey.png&quot;,&quot;صقر&quot;:&quot;ArabianOud\/incense_burner.png&quot;,&quot;bacallemand&quot;:&quot;baccalaureat_emoji\/baccalaureat_emoji.png&quot;,&quot;polkadotjersey&quot;:&quot;TDF2016\/PolkaDotJersey.png&quot;,&quot;الفارس&quot;:&quot;ArabianOud\/incense_burner.png&quot;,&quot;bumotoako&quot;:&quot;USElections2016\/ivoted.png&quot;,&quot;twittersparkle&quot;:&quot;TwitterSparkle\/TwitterSparkle.png&quot;,&quot;maillotvertskoda&quot;:&quot;TDF2016\/GreenJersey.png&quot;,&quot;ita&quot;:&quot;EurosFootball2016\/Italy.png&quot;,&quot;vivoazzurro&quot;:&quot;EurosFootball2016\/Italy.png&quot;,&quot;resultatsbac&quot;:&quot;baccalaureat_emoji\/baccalaureat_emoji.png&quot;,&quot;bacitalien&quot;:&quot;baccalaureat_emoji\/baccalaureat_emoji.png&quot;,&quot;لمسة&quot;:&quot;ArabianOud\/incense_burner.png&quot;,&quot;سناب_المسافر_دايما_مسافر&quot;:&quot;AlMosafer\/travel.png&quot;,&quot;maillotblanckrys&quot;:&quot;TDF2016\/WhiteJersey.png&quot;,&quot;origin&quot;:&quot;StateOfOrigin\/Origin.png&quot;,&quot;bacfrancais&quot;:&quot;baccalaureat_emoji\/baccalaureat_emoji.png&quot;,&quot;bachotellerie&quot;:&quot;baccalaureat_emoji\/baccalaureat_emoji.png&quot;,&quot;thehill&quot;:&quot;Wimbledon2016\/TheHill.png&quot;,&quot;hairomania&quot;:&quot;EurosFootball2016\/Romania.png&quot;,&quot;admise&quot;:&quot;baccalaureat_emoji\/baccalaureat_emoji.png&quot;,&quot;yarasky&quot;:&quot;TwitterstarYarasky\/TwitterstarYarasky.png&quot;,&quot;maillotvert&quot;:&quot;TDF2016\/GreenJersey.png&quot;,&quot;yovote&quot;:&quot;USElections2016\/ivoted.png&quot;,&quot;qlder&quot;:&quot;StateOfOrigin\/QLDER.png&quot;,&quot;رسالة&quot;:&quot;ArabianOud\/incense_burner.png&quot;,&quot;energia&quot;:&quot;JBalvinNew\/JBalvinNew.png&quot;,&quot;انا_المسافر&quot;:&quot;AlMosafer\/travel.png&quot;,&quot;rumboario&quot;:&quot;100Days\/100Days.png&quot;,&quot;girlonlinegoingsolo&quot;:&quot;ZoellaEmoji\/Zoella.png&quot;,&quot;blackhistorymonth&quot;:&quot;BlackHistoryMonth\/BlackHistoryMonth.png&quot;,&quot;overdadeirosabor&quot;:&quot;Hellmanns\/emoji_hellmans.png&quot;,&quot;baces&quot;:&quot;baccalaureat_emoji\/baccalaureat_emoji.png&quot;,&quot;bacmaths&quot;:&quot;baccalaureat_emoji\/baccalaureat_emoji.png&quot;,&quot;سافر_بالتقسيط&quot;:&quot;AlMosafer\/travel.png&quot;,&quot;とと姉ちゃん&quot;:&quot;NHKMorningDrama\/NHKMorningDrama.png&quot;,&quot;yovoté&quot;:&quot;USElections2016\/ivoted.png&quot;,&quot;14juillet&quot;:&quot;BastilleDay2016\/BastilleDay.png&quot;,&quot;togetherforengland&quot;:&quot;EurosFootball2016\/England.png&quot;,&quot;łączynaspolska&quot;:&quot;EurosFootball2016\/Poland.png&quot;,&quot;zoesugg&quot;:&quot;ZoellaEmoji\/Zoella.png&quot;,&quot;bachôtellerie&quot;:&quot;baccalaureat_emoji\/baccalaureat_emoji.png&quot;,&quot;bacs&quot;:&quot;baccalaureat_emoji\/baccalaureat_emoji.png&quot;,&quot;bacstav&quot;:&quot;baccalaureat_emoji\/baccalaureat_emoji.png&quot;,&quot;nowyoucan&quot;:&quot;SkyNow\/SKYNowYouCan.png&quot;,&quot;tur&quot;:&quot;EurosFootball2016\/Turkey.png&quot;,&quot;bhm&quot;:&quot;BlackHistoryMonth\/BlackHistoryMonth.png&quot;,&quot;roadtorio&quot;:&quot;100Days\/100Days.png&quot;,&quot;bacses&quot;:&quot;baccalaureat_emoji\/baccalaureat_emoji.png&quot;,&quot;bacstl&quot;:&quot;baccalaureat_emoji\/baccalaureat_emoji.png&quot;,&quot;wal&quot;:&quot;EurosFootball2016\/Wales.png&quot;,&quot;bacespagnol&quot;:&quot;baccalaureat_emoji\/baccalaureat_emoji.png&quot;,&quot;bel&quot;:&quot;EurosFootball2016\/Belgium.png&quot;,&quot;bacstd2a&quot;:&quot;baccalaureat_emoji\/baccalaureat_emoji.png&quot;,&quot;fiersdetrebleus&quot;:&quot;EurosFootball2016\/France.png&quot;,&quot;cze&quot;:&quot;EurosFootball2016\/CzechRepublic.png&quot;,&quot;blacklivesmatter&quot;:&quot;BlackHistoryMonth\/BlackHistoryMonth.png&quot;,&quot;pol&quot;:&quot;EurosFootball2016\/Poland.png&quot;,&quot;العربية_للعود&quot;:&quot;ArabianOud\/incense_burner.png&quot;,&quot;résultatsbac&quot;:&quot;baccalaureat_emoji\/baccalaureat_emoji.png&quot;,&quot;budiponosan&quot;:&quot;EurosFootball2016\/Croatia.png&quot;,&quot;fandimespolu&quot;:&quot;EurosFootball2016\/Slovakia.png&quot;,&quot;thisbudsforyou&quot;:&quot;Bud_Emoji\/Bud.png&quot;,&quot;icaucused&quot;:&quot;USElections2016\/ivoted.png&quot;,&quot;ukr&quot;:&quot;EurosFootball2016\/Ukraine.png&quot;,&quot;esp&quot;:&quot;EurosFootball2016\/Spain.png&quot;,&quot;makethefuture&quot;:&quot;Shell_Emoji\/ShellLightbulb.png&quot;,&quot;cro&quot;:&quot;EurosFootball2016\/Croatia.png&quot;,&quot;irl&quot;:&quot;EurosFootball2016\/ROIreland.png&quot;,&quot;lovehasnolabels&quot;:&quot;AdCouncilEmoji\/AdCouncilEmoji_Original.png&quot;,&quot;vamosespaña&quot;:&quot;EurosFootball2016\/Spain.png&quot;,&quot;bacl&quot;:&quot;baccalaureat_emoji\/baccalaureat_emoji.png&quot;,&quot;uptheblues&quot;:&quot;StateOfOrigin\/UpTheBlues.png&quot;,&quot;sharkweek&quot;:&quot;SharkWeekEmoji\/SharkWeek_Original.png&quot;,&quot;por&quot;:&quot;EurosFootball2016\/Portugal.png&quot;,&quot;swe&quot;:&quot;EurosFootball2016\/Sweden.png&quot;,&quot;bac2016&quot;:&quot;baccalaureat_emoji\/baccalaureat_emoji.png&quot;,&quot;maillotjaune&quot;:&quot;TDF2016\/YellowJersey.png&quot;,&quot;fra&quot;:&quot;EurosFootball2016\/France.png&quot;,&quot;ufc200&quot;:&quot;UFC200\/UFC200.png&quot;,&quot;coybig&quot;:&quot;EurosFootball2016\/ROIreland.png&quot;},&quot;tweetId&quot;:&quot;363116819147538433&quot;,&quot;profile_id&quot;:1087064150,&quot;endpoint&quot;:&quot;\/i\/vyki_e\/conversation\/363116819147538433&quot;,&quot;overlayCapable&quot;:false,&quot;finagleTraceId&quot;:&quot;00b1ca1d00abbeb2&quot;,&quot;isThreaded&quot;:true,&quot;inOverlay&quot;:true,&quot;trendsCacheKey&quot;:null,&quot;decider_personalized_trends&quot;:false,&quot;trendsEndpoint&quot;:&quot;\/i\/trends&quot;,&quot;initialState&quot;:{&quot;title&quot;:&quot;Vyki Englert on Twitter: \&quot;I&#39;m a sucker for pledges.  @Peers Pledge #sharingeconomy http:\/\/t.co\/T4Sc47KAzh\&quot;&quot;,&quot;section&quot;:null,&quot;module&quot;:&quot;app\/pages\/permalink&quot;,&quot;cache_ttl&quot;:300,&quot;body_class_names&quot;:&quot;three-col logged-out user-style-vyki_e PermalinkPage&quot;,&quot;doc_class_names&quot;:&quot;route-permalink&quot;,&quot;route_name&quot;:&quot;permalink&quot;,&quot;page_container_class_names&quot;:&quot;AppContent wrapper wrapper-permalink&quot;,&quot;ttft_navigation&quot;:false}}">
-
-
-
-    <input type="hidden" class="swift-boot-module" value="app/pages/permalink">
-  <input type="hidden" id="swift-module-path" value="https://abs.twimg.com/c/swift/en">
-
-
-    <script src="https://abs.twimg.com/c/swift/en/init.314a9707f177773430c9b565030e9ea5b8638c96.js" async></script>
-
-  </head>
-  <body class="three-col logged-out user-style-vyki_e PermalinkPage"
-data-fouc-class-names="swift-loading"
- dir="ltr">
-      <script id="swift_loading_indicator" nonce="KXwIjaJlN1QIxC47iHrsvQ==">
-        document.body.className=document.body.className+" "+document.body.getAttribute("data-fouc-class-names");
-      </script>
-
-
-
-
-
-
-
-
-
-
-    <div id="doc" data-at-shortcutkeys="{&quot;Enter&quot;:&quot;Open Tweet details&quot;,&quot;o&quot;:&quot;Expand photo&quot;,&quot;/&quot;:&quot;Search&quot;,&quot;?&quot;:&quot;This menu&quot;,&quot;j&quot;:&quot;Next Tweet&quot;,&quot;k&quot;:&quot;Previous Tweet&quot;,&quot;Space&quot;:&quot;Page down&quot;,&quot;.&quot;:&quot;Load new Tweets&quot;,&quot;gu&quot;:&quot;Go to user\u2026&quot;}" class="route-permalink">
-        <div class="topbar js-topbar">
-
-
-  <div class="global-nav global-nav--newLoggedOut" data-section-term="top_nav">
-    <div class="global-nav-inner">
-      <div class="container">
-
-
-<ul class="nav js-global-actions" role="navigation" id="global-actions">
-  <li id="global-nav-home" class="home" data-global-action="home">
-    <a class="js-nav js-tooltip js-dynamic-tooltip" data-placement="bottom" href="/" data-component-context="home_nav" data-nav="home">
-      <span class="Icon Icon--bird Icon--large"></span>
-      <span class="text">Home</span>
-    </a>
-  </li>
-    <li id="global-nav-about" class="about" data-global-action="about">
-      <a class="js-tooltip js-dynamic-tooltip" data-placement="bottom" href="/about" target="_blank" data-component-context="about_nav" data-nav="about">
-        <span class="text">About</span>
-      </a>
-    </li>
-</ul>
-<div class="pull-right">
-    <div role="search">
-  <form class="t1-form form-search js-search-form" action="/search" id="global-nav-search">
-    <label class="visuallyhidden" for="search-query">Search query</label>
-    <input class="search-input" type="text" id="search-query" placeholder="Search Twitter" name="q" autocomplete="off" spellcheck="false">
-    <span class="search-icon js-search-action">
-      <button type="submit" class="Icon Icon--search nav-search">
-        <span class="visuallyhidden">Search Twitter</span>
-      </button>
-    </span>
-
-
-
-<div role="listbox" class="dropdown-menu typeahead">
-  <div aria-hidden="true" class="dropdown-caret">
-    <div class="caret-outer"></div>
-    <div class="caret-inner"></div>
-  </div>
-  <div role="presentation" class="dropdown-inner js-typeahead-results">
-    <div role="presentation" class="typeahead-saved-searches">
-  <h3 id="saved-searches-heading" class="typeahead-category-title saved-searches-title">Saved searches</h3>
-  <ul role="presentation" class="typeahead-items saved-searches-list">
-
-    <li role="presentation" class="typeahead-item typeahead-saved-search-item">
-      <span class="Icon Icon--close" aria-hidden="true"><span class="visuallyhidden">Remove</span></span>
-      <a role="option" aria-describedby="saved-searches-heading" class="js-nav" href="" data-search-query="" data-query-source="" data-ds="saved_search" tabindex="-1"></a>
-    </li>
-  </ul>
-</div>
-
-    <ul role="presentation" class="typeahead-items typeahead-topics">
-
-  <li role="presentation" class="typeahead-item typeahead-topic-item">
-    <a role="option" class="js-nav" href="" data-search-query="" data-query-source="typeahead_click" data-ds="topics" tabindex="-1"></a>
-  </li>
-</ul>
-
-
-
-<ul role="presentation" class="typeahead-items typeahead-accounts js-typeahead-accounts">
-
-  <li role="presentation" data-user-id="" data-user-screenname="" data-remote="true" data-score="" class="typeahead-item typeahead-account-item js-selectable">
-
-    <a role="option" class="js-nav" data-query-source="typeahead_click" data-search-query="" data-ds="account">
-      <img class="avatar size32" alt="">
-      <span class="typeahead-user-item-info">
-        <span class="fullname"></span>
-        <span class="js-verified hidden"><span class="Icon Icon--verified Icon--small">
-  <span class="u-hiddenVisually">Verified account</span>
-</span></span>
-        <span class="username"><s>@</s><b></b></span>
-      </span>
-    </a>
-  </li>
-  <li role="presentation" class="js-selectable typeahead-accounts-shortcut js-shortcut"><a role="option" class="js-nav" href="" data-search-query="" data-query-source="typeahead_click" data-shortcut="true" data-ds="account_search"></a></li>
-</ul>
-
-    <ul role="presentation" class="typeahead-items typeahead-trend-locations-list">
-
-  <li role="presentation" class="typeahead-item typeahead-trend-locations-item"><a role="option" class="js-nav" href="" data-ds="trend_location" data-search-query="" tabindex="-1"></a></li>
-</ul>
-    <div role="presentation" class="typeahead-user-select">
-  <div role="presentation" class="typeahead-empty-suggestions">
-    Suggested users
-  </div>
-  <ul role="presentation" class="typeahead-items typeahead-selected js-typeahead-selected">
-
-    <li role="presentation" data-user-id="" data-user-screenname="" data-remote="true" data-score="" class="typeahead-item typeahead-selected-item js-selectable">
-
-      <a role="option" class="js-nav" data-query-source="typeahead_click" data-search-query="" data-ds="account">
-        <img class="avatar size32" alt="">
-        <span class="typeahead-user-item-info">
-          <span class="select-status deselect-user js-deselect-user Icon Icon--check"></span>
-          <span class="select-status select-disabled Icon Icon--unfollow"></span>
-          <span class="fullname"></span>
-          <span class="js-verified hidden"><span class="Icon Icon--verified Icon--small">
-  <span class="u-hiddenVisually">Verified account</span>
-</span></span>
-          <span class="username"><s>@</s><b></b></span>
-        </span>
-      </a>
-    </li>
-    <li role="presentation" class="typeahead-selected-end"></li>
-  </ul>
-
-  <ul role="presentation" class="typeahead-items typeahead-accounts js-typeahead-accounts">
-
-    <li role="presentation" data-user-id="" data-user-screenname="" data-remote="true" data-score="" class="typeahead-item typeahead-account-item js-selectable">
-
-      <a role="option" class="js-nav" data-query-source="typeahead_click" data-search-query="" data-ds="account">
-        <img class="avatar size32" alt="">
-        <span class="typeahead-user-item-info">
-          <span class="select-status deselect-user js-deselect-user Icon Icon--check"></span>
-          <span class="select-status select-disabled Icon Icon--unfollow"></span>
-          <span class="fullname"></span>
-          <span class="js-verified hidden"><span class="Icon Icon--verified Icon--small">
-  <span class="u-hiddenVisually">Verified account</span>
-</span></span>
-          <span class="username"><s>@</s><b></b></span>
-        </span>
-      </a>
-    </li>
-    <li role="presentation" class="typeahead-accounts-end"></li>
-  </ul>
-</div>
-
-    <div role="presentation" class="typeahead-dm-conversations">
-  <ul role="presentation" class="typeahead-items typeahead-dm-conversation-items">
-    <li role="presentation" class="typeahead-item typeahead-dm-conversation-item">
-      <a role="option" tabindex="-1"></a>
-    </li>
-  </ul>
-</div>
-  </div>
-</div>
-
-  </form>
-</div>
-
-
-  <ul class="nav secondary-nav language-dropdown">
-    <li class="dropdown js-language-dropdown">
-      <a href="#supported_languages" class="dropdown-toggle js-dropdown-toggle">
-        <small>Language:</small> <span class="js-current-language">English</span> <b class="caret"></b>
-      </a>
-      <div class="dropdown-menu">
-        <div class="dropdown-caret right">
-          <span class="caret-outer"> </span>
-          <span class="caret-inner"></span>
-        </div>
-        <ul id="supported_languages">
-            <li><a href="?lang=id" data-lang-code="id" title="Indonesian" class="js-language-link js-tooltip">Bahasa Indonesia</a></li>
-            <li><a href="?lang=msa" data-lang-code="msa" title="Malay" class="js-language-link js-tooltip">Bahasa Melayu</a></li>
-            <li><a href="?lang=ca" data-lang-code="ca" title="Catalan" class="js-language-link js-tooltip">Català</a></li>
-            <li><a href="?lang=cs" data-lang-code="cs" title="Czech" class="js-language-link js-tooltip">Čeština</a></li>
-            <li><a href="?lang=da" data-lang-code="da" title="Danish" class="js-language-link js-tooltip">Dansk</a></li>
-            <li><a href="?lang=de" data-lang-code="de" title="German" class="js-language-link js-tooltip">Deutsch</a></li>
-            <li><a href="?lang=en-gb" data-lang-code="en-gb" title="British English" class="js-language-link js-tooltip">English UK</a></li>
-            <li><a href="?lang=es" data-lang-code="es" title="Spanish" class="js-language-link js-tooltip">Español</a></li>
-            <li><a href="?lang=fil" data-lang-code="fil" title="Filipino" class="js-language-link js-tooltip">Filipino</a></li>
-            <li><a href="?lang=fr" data-lang-code="fr" title="French" class="js-language-link js-tooltip">Français</a></li>
-            <li><a href="?lang=hr" data-lang-code="hr" title="Croatian" class="js-language-link js-tooltip">Hrvatski</a></li>
-            <li><a href="?lang=it" data-lang-code="it" title="Italian" class="js-language-link js-tooltip">Italiano</a></li>
-            <li><a href="?lang=hu" data-lang-code="hu" title="Hungarian" class="js-language-link js-tooltip">Magyar</a></li>
-            <li><a href="?lang=nl" data-lang-code="nl" title="Dutch" class="js-language-link js-tooltip">Nederlands</a></li>
-            <li><a href="?lang=no" data-lang-code="no" title="Norwegian" class="js-language-link js-tooltip">Norsk</a></li>
-            <li><a href="?lang=pl" data-lang-code="pl" title="Polish" class="js-language-link js-tooltip">Polski</a></li>
-            <li><a href="?lang=pt" data-lang-code="pt" title="Portuguese" class="js-language-link js-tooltip">Português</a></li>
-            <li><a href="?lang=ro" data-lang-code="ro" title="Romanian" class="js-language-link js-tooltip">Română</a></li>
-            <li><a href="?lang=sk" data-lang-code="sk" title="Slovak" class="js-language-link js-tooltip">Slovenčina</a></li>
-            <li><a href="?lang=fi" data-lang-code="fi" title="Finnish" class="js-language-link js-tooltip">Suomi</a></li>
-            <li><a href="?lang=sv" data-lang-code="sv" title="Swedish" class="js-language-link js-tooltip">Svenska</a></li>
-            <li><a href="?lang=vi" data-lang-code="vi" title="Vietnamese" class="js-language-link js-tooltip">Tiếng Việt</a></li>
-            <li><a href="?lang=tr" data-lang-code="tr" title="Turkish" class="js-language-link js-tooltip">Türkçe</a></li>
-            <li><a href="?lang=el" data-lang-code="el" title="Greek" class="js-language-link js-tooltip">Ελληνικά</a></li>
-            <li><a href="?lang=bg" data-lang-code="bg" title="Bulgarian" class="js-language-link js-tooltip">Български език</a></li>
-            <li><a href="?lang=ru" data-lang-code="ru" title="Russian" class="js-language-link js-tooltip">Русский</a></li>
-            <li><a href="?lang=sr" data-lang-code="sr" title="Serbian" class="js-language-link js-tooltip">Српски</a></li>
-            <li><a href="?lang=uk" data-lang-code="uk" title="Ukrainian" class="js-language-link js-tooltip">Українська мова</a></li>
-            <li><a href="?lang=he" data-lang-code="he" title="Hebrew" class="js-language-link js-tooltip">עִבְרִית</a></li>
-            <li><a href="?lang=ar" data-lang-code="ar" title="Arabic" class="js-language-link js-tooltip">العربية</a></li>
-            <li><a href="?lang=fa" data-lang-code="fa" title="Persian" class="js-language-link js-tooltip">فارسی</a></li>
-            <li><a href="?lang=mr" data-lang-code="mr" title="Marathi" class="js-language-link js-tooltip">मराठी</a></li>
-            <li><a href="?lang=hi" data-lang-code="hi" title="Hindi" class="js-language-link js-tooltip">हिन्दी</a></li>
-            <li><a href="?lang=bn" data-lang-code="bn" title="Bengali" class="js-language-link js-tooltip">বাংলা</a></li>
-            <li><a href="?lang=gu" data-lang-code="gu" title="Gujarati" class="js-language-link js-tooltip">ગુજરાતી</a></li>
-            <li><a href="?lang=ta" data-lang-code="ta" title="Tamil" class="js-language-link js-tooltip">தமிழ்</a></li>
-            <li><a href="?lang=kn" data-lang-code="kn" title="Kannada" class="js-language-link js-tooltip">ಕನ್ನಡ</a></li>
-            <li><a href="?lang=th" data-lang-code="th" title="Thai" class="js-language-link js-tooltip">ภาษาไทย</a></li>
-            <li><a href="?lang=ko" data-lang-code="ko" title="Korean" class="js-language-link js-tooltip">한국어</a></li>
-            <li><a href="?lang=ja" data-lang-code="ja" title="Japanese" class="js-language-link js-tooltip">日本語</a></li>
-            <li><a href="?lang=zh-cn" data-lang-code="zh-cn" title="Simplified Chinese" class="js-language-link js-tooltip">简体中文</a></li>
-            <li><a href="?lang=zh-tw" data-lang-code="zh-tw" title="Traditional Chinese" class="js-language-link js-tooltip">繁體中文</a></li>
-        </ul>
-      </div>
-      <div class="js-front-language">
-        <form action="/sessions/change_locale" class="t1-form language" method="POST">
-          <input type="hidden" name="lang"> <input type="hidden" name="redirect">
-          <input type="hidden" name="authenticity_token" value="0ca3d94aff5192efa7e34ae4eae60d07f5babd38">
-        </form>
-      </div>
-    </li>
-  </ul>
-
-    <ul class="nav secondary-nav session-dropdown" id="session">
-      <li class="dropdown js-session">
-          <a href="/login" class="dropdown-toggle js-dropdown-toggle dropdown-signin" id="signin-link" data-nav="login">
-            <small>Have an account?</small> <span class="emphasize"> Log in</span><span class="caret"></span>
-          </a>
-          <div class="dropdown-menu dropdown-form" id="signin-dropdown">
-            <div class="dropdown-caret right"> <span class="caret-outer"></span> <span class="caret-inner"></span> </div>
-            <div class="signin-dialog-body">
-              <div>Have an account?</div>
-              <form action="https://twitter.com/sessions" class="LoginForm js-front-signin" method="post"
-  data-component="login_callout"
-  data-element="form"
->
-  <div class="LoginForm-input LoginForm-username">
-    <input
-      type="text"
-      class="text-input email-input js-signin-email"
-      name="session[username_or_email]"
-      autocomplete="username"
-      placeholder="Phone, email or username"
-    />
-  </div>
-
-  <div class="LoginForm-input LoginForm-password">
-    <input type="password" class="text-input" name="session[password]" placeholder="Password" autocomplete="current-password">
-  </div>
-
-  <div class="LoginForm-rememberForgot">
-    <label>
-      <input type="checkbox" value="1" name="remember_me" checked="checked">
-      <span>Remember me</span>
-    </label>
-    <span class="separator">&middot;</span>
-    <a class="forgot" href="/account/begin_password_reset">Forgot password?</a>
-  </div>
-
-  <input type="submit" class="submit btn primary-btn js-submit" value="Log in">
-
-    <input type="hidden" name="return_to_ssl" value="true">
-
-  <input type="hidden" name="scribe_log">
-  <input type="hidden" name="redirect_after_login" value="/vyki_e/status/363116819147538433">
-  <input type="hidden" value="0ca3d94aff5192efa7e34ae4eae60d07f5babd38" name="authenticity_token">
-</form>
-
-              <hr>
-              <div class="signup SignupForm">
-                <div class="SignupForm-header">New to Twitter?</div>
-                <a href="https://twitter.com/signup" role="button" class="SignupForm-submit u-block u-textCenter js-signup btn"
-                  data-component="signup_callout"
-                  data-element="dropdown"
-                  >Sign up
-                </a>
-              </div>
-            </div>
-          </div>
-      </li>
-    </ul>
-</div>
-
-      </div>
-    </div>
-  </div>
-</div>
-
-
-        <div id="page-outer">
-          <div id="page-container" class="AppContent wrapper wrapper-permalink">
-
-
-<a class="PermalinkProfile-overlay js-nav" href="/vyki_e">
-  <span class="visuallyhidden">vyki_e's profile</span>
-</a>
-<div class="PermalinkProfile-background without-banner">
-  <div class="ProfileCanopy ProfileCanopy--withNav ProfileCanopy--large">
-  <div class="ProfileCanopy-inner">
-
-    <div class="ProfileCanopy-header u-bgUserColor">
-    <div class="ProfileCanopy-headerBg">
-      <img alt=""
-        src="https://pbs.twimg.com/profile_banners/1087064150/1424315468/1500x500"
-
-      >
-    </div>
-
-  <div class="AppContainer">
-
-    <div class="ProfileCanopy-avatar">
-      <div class="ProfileAvatar">
-    <a class="ProfileAvatar-container u-block js-tooltip profile-picture"
-        href="https://pbs.twimg.com/profile_images/732349210264133632/RTNgZLrm.jpg"
-        title="Vyki Englert"
-        data-resolved-url-large="https://pbs.twimg.com/profile_images/732349210264133632/RTNgZLrm.jpg"
-        data-url="https://pbs.twimg.com/profile_images/732349210264133632/RTNgZLrm.jpg"
-        target="_blank">
-      <img class="ProfileAvatar-image " src="https://pbs.twimg.com/profile_images/732349210264133632/RTNgZLrm_400x400.jpg" alt="Vyki Englert">
-    </a>
-</div>
-
-    </div>
-
-
-    <div class="ProfileCanopy-headerPromptAnchor"></div>
-  </div>
-
-</div>
-
-
-    <div class="ProfileCanopy-navBar">
-
-      <div class="AppContainer">
-        <div class="Grid Grid--withGutter">
-          <div class="Grid-cell u-size1of3 u-lg-size1of4">
-            <div class="ProfileCanopy-card" role="presentation">
-              <div class="ProfileCardMini">
-  <a class="ProfileCardMini-avatar profile-picture js-tooltip"
-     href="https://pbs.twimg.com/profile_images/732349210264133632/RTNgZLrm.jpg"
-     title="Vyki Englert"
-     data-resolved-url-large="https://pbs.twimg.com/profile_images/732349210264133632/RTNgZLrm.jpg"
-     data-url="https://pbs.twimg.com/profile_images/732349210264133632/RTNgZLrm.jpg"
-     target="_blank">
-    <img class="ProfileCardMini-avatarImage" alt="Vyki Englert" src="https://pbs.twimg.com/profile_images/732349210264133632/RTNgZLrm_normal.jpg" >
-  </a>
-  <div class="ProfileCardMini-details">
-    <div class="ProfileNameTruncated">
-  <div class="u-textTruncate u-inlineBlock">
-    <a class="ProfileNameTruncated-link u-textInheritColor js-nav js-action-profile-name" href="/vyki_e"  data-aria-label-part>
-      Vyki Englert
-    </a>
-  </div>
-</div>
-    <div class="ProfileCardMini-screenname">
-      <a href="/vyki_e" class="ProfileCardMini-screennameLink u-linkComplex js-nav u-dir" dir="ltr">@<span class="u-linkComplex-target">vyki_e</span></a>
-    </div>
-  </div>
-</div>
-
-            </div>
-          </div>
-
-          <div class="Grid-cell u-size2of3 u-lg-size3of4">
-            <div class="ProfileCanopy-nav">
-
-
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-
-  </div>
-</div>
-
-
-    <div class="ProfileHeading">
-  <div class="ProfileHeading-spacer"></div>
-</div>
-
-
-  <div class="AppContainer">
-    <div class="Grid Grid--withGutter">
-      <div class="Grid-cell u-size1of3 u-lg-size1of4">
-        <div class="Grid Grid--withGutter">
-          <div class="Grid-cell">
-            <div class="ProfileSidebar ProfileSidebar--withLeftAlignment">
-  <div class="ProfileHeaderCard">
-  <h1 class="ProfileHeaderCard-name">
-    <a href="/vyki_e"
-       class="ProfileHeaderCard-nameLink u-textInheritColor js-nav
-">Vyki Englert</a>
-  </h1>
-
-  <h2 class="ProfileHeaderCard-screenname u-inlineBlock u-dir" dir="ltr">
-    <a class="ProfileHeaderCard-screennameLink u-linkComplex js-nav" href="/vyki_e">@<span class="u-linkComplex-target">vyki_e</span></a>
-  </h2>
-
-    <p class="ProfileHeaderCard-bio u-dir"
-
-      dir="ltr">Rides bikes, writes code, likes maps. <a href="/CompilerLA" class="tweet-url twitter-atreply pretty-link" dir="ltr" data-mentioned-user-id="0" rel="nofollow" ><s>@</s><b>CompilerLA</b></a> / <a href="/CityGrows" class="tweet-url twitter-atreply pretty-link" dir="ltr" data-mentioned-user-id="0" rel="nofollow" ><s>@</s><b>CityGrows</b></a> / Brigade Captain <a href="/HackforLA" class="tweet-url twitter-atreply pretty-link" dir="ltr" data-mentioned-user-id="0" rel="nofollow" ><s>@</s><b>HackforLA</b></a></p>
-
-
-
-
-    <div class="ProfileHeaderCard-joinDate">
-      <span class="Icon Icon--calendar Icon--small"></span>
-      <span class="ProfileHeaderCard-joinDateText js-tooltip u-dir" dir="ltr" title="11:53 AM - 13 Jan 2013">Joined January 2013</span>
-    </div>
-
-      <div class="ProfileHeaderCard-birthdate u-hidden">
-        <span class="Icon Icon--balloon Icon--medium"></span>
-        <span class="ProfileHeaderCard-birthdateText u-dir" dir="ltr">
-</span>
-      </div>
-
-
-</div>
-
-
-
-
-
-
-
-
-
-</div>
-
-          </div>
-        </div>
-      </div>
-      <div class="Grid-cell u-size2of3 u-lg-size3of4">
-        <div class="Grid Grid--withGutter">
-          <div class="Grid-cell u-lg-size2of3" data-test-selector="ProfileTimeline">
-              <div class="ProfileHeading">
-  <div class="ProfileHeading-spacer"></div>
-</div>
-
-
-
-
-
-
-
-
-
-
-
-          </div>
-          <div class="Grid-cell u-size1of3">
-            <div class="Grid Grid--withGutter">
-              <div class="Grid-cell">
-                <div class="ProfileSidebar ProfileSidebar--withRightAlignment">
-                  <div class="MoveableModule">
-
-<div class="SidebarCommonModules">
-
-
-
-
-
-
-  <div class="Footer module roaming-module
-            Footer--slim
-            ">
-  <div class="flex-module">
-    <div class="flex-module-inner js-items-container">
-      <ul class="u-cf">
-        <li class="Footer-item Footer-copyright copyright">&copy; 2016 Twitter</li>
-        <li class="Footer-item"><a class="Footer-link" href="/about">About</a></li>
-        <li class="Footer-item"><a class="Footer-link" href="//support.twitter.com">Help</a></li>
-        <li class="Footer-item"><a class="Footer-link" href="/tos">Terms</a></li>
-        <li class="Footer-item"><a class="Footer-link" href="/privacy">Privacy</a></li>
-        <li class="Footer-item"><a class="Footer-link" href="//support.twitter.com/articles/20170514">Cookies</a></li>
-        <li class="Footer-item"><a class="Footer-link" href="//support.twitter.com/articles/20170451">Ads info</a></li>
-      </ul>
-    </div>
-  </div>
-</div>
-
-</div>
-
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-
-<style id="user-style-vyki_e">
-
-
-
-
-
-  a,
-  a:hover,
-  a:focus,
-  a:active {
-    color: #4E99D1;
-  }
-
-  .u-textUserColor,
-  .u-textUserColorHover:hover,
-  .u-textUserColorHover:focus {
-    color: #4E99D1 !important;
-  }
-
-  .u-borderUserColor,
-  .u-borderUserColorHover:hover,
-  .u-borderUserColorHover:focus {
-    border-color: #4E99D1 !important;
-  }
-
-  .u-bgUserColor,
-  .u-bgUserColorHover:hover,
-  .u-bgUserColorHover:focus {
-    background-color: #4E99D1 !important;
-  }
-
-
-  .u-dropdownUserColor > li:hover,
-  .u-dropdownUserColor > li:focus,
-  .u-dropdownUserColor > li > button:hover,
-  .u-dropdownUserColor > li > button:focus {
-    color: #fff !important;
-    background-color: #4E99D1 !important;
-  }
-
-  .u-boxShadowInsetUserColorHover:hover,
-  .u-boxShadowInsetUserColorHover:focus {
-    box-shadow: inset 0 0 0 5px #4E99D1 !important;
-  }
-
-
-
-  .u-textUserColorLight {
-    color: #B8D6EC !important;
-  }
-
-  .u-borderUserColorLight,
-  .u-borderUserColorLightFocus:focus,
-  .u-borderUserColorLightHover:hover,
-  .u-borderUserColorLightHover:focus {
-    border-color: #B8D6EC !important;
-  }
-
-  .u-bgUserColorLight {
-    background-color: #B8D6EC !important;
-  }
-
-
-  .u-boxShadowUserColorLighterFocus:focus {
-    box-shadow: 0 0 8px rgba(0, 0, 0, 0.05), inset 0 1px 2px rgba(78,153,209,0.25) !important;
-  }
-
-
-  .u-textUserColorLightest {
-    color: #EDF4FA !important;
-  }
-
-  .u-borderUserColorLightest {
-    border-color: #EDF4FA !important;
-  }
-
-  .u-bgUserColorLightest {
-    background-color: #EDF4FA !important;
-  }
-
-
-  .u-textUserColorLighter {
-    color: #D2E5F3 !important;
-  }
-
-  .u-borderUserColorLighter {
-    border-color: #D2E5F3 !important;
-  }
-
-  .u-bgUserColorLighter {
-    background-color: #D2E5F3 !important;
-  }
-
-
-  .u-bgUserColorDarkHover:hover {
-    background-color: #3E7AA7 !important;
-  }
-
-  .u-borderUserColorDark {
-    border-color: #3E7AA7 !important;
-  }
-
-
-  .u-bgUserColorDarkerActive:active {
-    background-color: #2E5B7D !important;
-  }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-a,
-.btn-link,
-.btn-link:focus,
-.icon-btn,
-
-
-
-.pretty-link b,
-.pretty-link:hover s,
-.pretty-link:hover b,
-.pretty-link:focus s,
-.pretty-link:focus b,
-/* Account Group */
-.metadata a:hover,
-.metadata a:focus,
-
-.account-group:hover .fullname,
-.account-group:focus .fullname,
-.account-summary:focus .fullname,
-
-.message .message-text a,
-.stats a strong,
-.plain-btn:hover,
-.plain-btn:focus,
-.dropdown.open .user-dropdown.plain-btn,
-.open > .plain-btn,
-#global-actions .new:before,
-.module .list-link:hover,
-.module .list-link:focus,
-
-.stats a:hover,
-.stats a:hover strong,
-.stats a:focus,
-.stats a:focus strong,
-
-.find-friends-sources li:hover .source,
-
-
-
-
-
-.stream-item a:hover .fullname,
-.stream-item a:focus .fullname,
-
-.stream-item .view-all-supplements:hover,
-.stream-item .view-all-supplements:focus,
-
-.tweet .time a:hover,
-.tweet .time a:focus,
-.tweet .details.with-icn b,
-.tweet .details.with-icn .Icon,
-.tweet .tweet-geo-text a:hover,
-
-.stream-item:hover .original-tweet .details b,
-.stream-item .original-tweet.focus .details b,
-.stream-item.open .original-tweet .details b,
-
-.client-and-actions a:hover,
-.client-and-actions a:focus,
-
-.dismiss-btn:hover b,
-
-.tweet .context .pretty-link:hover s,
-.tweet .context .pretty-link:hover b,
-.tweet .context .pretty-link:focus s,
-.tweet .context .pretty-link:focus b,
-
-.list .username a:hover,
-.list .username a:focus,
-.list-membership-container .create-a-list,
-.list-membership-container .create-a-list:hover,
-
-
-
-.card .list-details a:hover,
-.card .list-details a:focus,
-.card .card-body:hover .attribution,
-.card .card-body .attribution:focus,
-.new-tweets-bar,
-.onebox .soccer ul.ticker a:hover,
-.onebox .soccer ul.ticker a:focus,
-
-
-
-.remove-background-btn,
-
-
-
-.stream-item-activity-notification .latest-tweet .tweet-row a:hover,
-.stream-item-activity-notification .latest-tweet .tweet-row a:focus,
-.stream-item-activity-notification .latest-tweet .tweet-row a:hover b,
-.stream-item-activity-notification .latest-tweet .tweet-row a:focus b {
-    color: #4E99D1;
-}
-
-
-
-
-  /* hover state for found media items */
-  .FoundMediaSearch--keyboard .FoundMediaSearch-focusable.is-focused {
-    border-color: #4E99D1;
-  }
-
-  /* hover state for photo select button*/
-  .photo-selector:hover .btn,
-  .icon-btn:hover,
-  .icon-btn:active,
-  .icon-btn.active,
-  .icon-btn.enabled {
-    border-color: #4E99D1;
-    border-color: rgba(78,153,209,.5);
-    color: #4E99D1;
-  }
-
-  /* hover state for photo select button*/
-  .photo-selector:hover .btn,
-  .icon-btn:hover {
-    background-image: linear-gradient(rgba(255,255,255,0), rgba(78,153,209,.1));
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00FFFFFF', endColorstr='#194E99D1'); /* IE8-9 */
-  }
-
-  .icon-btn.disabled,
-  .icon-btn.disabled:hover,
-  .icon-btn[disabled],
-  .icon-btn[aria-disabled=true] {
-    color: #4E99D1;
-  }
-
-  /* tweet-btn can have primary-btn class as well so the following rules ensure that the correct background color is applied */
-  .tweet-btn,
-  .tweet-btn:focus {
-    background-color: #4E99D1;
-    background: rgba(78,153,209,.8);
-  }
-
-  .tweet-btn:hover,
-  .tweet-btn:active,
-  .tweet-btn.active {
-    background-color: #4E99D1;
-  }
-
-  .tweet-btn.btn.disabled,
-  .tweet-btn.btn.disabled:hover,
-  .tweet-btn.btn[disabled],
-  .tweet-btn.btn[aria-disabled=true] {
-    background: #4E99D1;
-  }
-
-  .btn:focus,
-  .btn.focus,
-  .Button:focus {
-    box-shadow:
-      0 0 0 1px #fff,
-      0 0 0 3px rgba(78, 153, 209, 0.5);
-  }
-
-  .selected-stream-item:focus {
-    box-shadow: 0 0 0 3px rgba(78, 153, 209, 0.5);
-  }
-
-  /* highlighting when navigate through timeline stream table view with j & k. */
-  .js-navigable-stream.stream-table-view .selected-stream-item[tabindex="-1"]:focus {
-    outline: 3px solid rgba(78, 153, 209, 0.5) !important;
-  }
-
-  /* box-shadow does not work with table tr element */
-  .js-navigable-stream.stream-table-view .selected-stream-item:focus {
-    box-shadow: none;
-  }
-
-  /**
-   * 1. Bring actionable tweet to top when active to ensure border
-   *    highlighting wraps entire tweet. Value must be at least at if not
-   *    higher than the z-index value of ProfileHeading to ensure first
-   *    tweet in timeline receives border on all four sides.
-   *    NOTE: z-index should be 2 to avoid conflicts with .ProfileCanopy and .ProfileCard-avatarLink
-   */
-
-  .js-stream-item.is-selected:focus .ProfileCard,
-  .QuoteTweet:hover,
-  .QuoteTweet:focus,
-  .QuoteTweet:active,
-  .activity-user-profile-content:hover,
-  .activity-user-profile-content:focus,
-  .activity-user-profile-content:active {
-    border-color: rgba(78, 153, 209, 0.5);
-    z-index: 2; /* 1 */
-  }
-
-  .global-dm-nav.new.with-count .dm-new {
-    background: #fff;
-  }
-
-  .global-dm-nav.new.with-count .dm-new .count-inner {
-    background: #4E99D1;
-  }
-
-  .global-nav .people .count .count-inner {
-    background: #4E99D1;
-  }
-
-  .dropdown-menu li > a:hover,
-  .dropdown-menu li > a:focus,
-  .dropdown-menu .dropdown-link:hover,
-  .dropdown-menu .dropdown-link:focus,
-  .dropdown-menu .dropdown-link.is-focused,
-  .dropdown-menu li:hover .dropdown-link,
-  .dropdown-menu li:focus .dropdown-link,
-  .dropdown-menu .typeahead-recent-search-item.selected,
-  .dropdown-menu .typeahead-saved-search-item.selected,
-  .dropdown-menu .selected a,
-  .dropdown-menu .dropdown-link.selected {
-    background-color: #4E99D1 !important;
-  }
-
-/* give tweet boxes 10% of the users link color as background */
-.home-tweet-box,
-.LiveVideo-tweetBox,
-.RetweetDialog-commentBox,
-.WebToast-box--altColor {
-  background-color: #EDF4FA;
-}
-
-.top-timeline-tweetbox .timeline-tweet-box .tweet-form.condensed .tweet-box {
-  color: #4E99D1;
-}
-/* give tweet box containers an outline using the users link color */
-.RichEditor {
-  border-color: #D2E5F3;
-}
-
-input:focus,
-textarea:focus,
-div[contenteditable="true"]:focus,
-div[contenteditable="true"].fake-focus {
-  border-color: #94C1E3;
-  box-shadow: inset 0 0 0 1px rgba(78, 153, 209, 0.7);
-}
-
-.tweet-box textarea:focus,
-.tweet-box input[type=text],
-.currently-dragging .tweet-form.is-droppable .tweet-drag-help,
-.tweet-box[contenteditable="true"]:focus,
-.RichEditor.is-fakeFocus {
-  border-color: #B8D6EC;
-  box-shadow: none;
-}
-
-
-
-
-s,
-.pretty-link:hover s,
-.pretty-link:focus s,
-.stream-item-activity-notification .latest-tweet .tweet-row a:hover s,
-.stream-item-activity-notification .latest-tweet .tweet-row a:focus s {
-    color: #4E99D1;
-}
-
-
-
-.vellip,
-.vellip:before,
-.vellip:after,
-.conversation-module > li:after,
-.conversation-module > li:before,
-.ThreadedConversation-tweet ~ .ThreadedConversation-tweet:before,
-.ThreadedConversation-tweet:after,
-.ThreadedConversation-viewOther:before,
-.ThreadedConversation-unavailableTweet:before,
-.ThreadedConversation-unavailableTweet:after {
-    background-color: #94C1E3;
-}
-
-
-
-
-.tweet .sm-reply,
-.tweet .sm-rt,
-.tweet .sm-fav,
-.tweet .sm-image,
-.tweet .sm-video,
-.tweet .sm-audio,
-.tweet .sm-geo,
-.tweet .sm-in,
-.tweet .sm-trash,
-.tweet .sm-more,
-.tweet .sm-page,
-.tweet .sm-embed,
-.tweet .sm-summary,
-.tweet .sm-chat,
-
-.timelines-navigation .active .profile-nav-icon,
-.timelines-navigation .profile-nav-icon:hover,
-.timelines-navigation .profile-nav-link:focus .profile-nav-icon,
-
-.sm-top-tweet,
-
-.metadata a.tweet-geo-text:hover .sm-geo {
-    background-color: #4E99D1;
-}
-
-.enhanced-mini-profile .mini-profile .profile-summary {
-  background-image: url(https://pbs.twimg.com/profile_banners/1087064150/1424315468/mobile);
-}
-
-.wrapper-profile .profile-card.profile-header .profile-header-inner {
-  background-image: url(https://pbs.twimg.com/profile_banners/1087064150/1424315468/web);
-}
-
-  #global-tweet-dialog .modal-header {
-    border-bottom: solid 1px rgba(78, 153, 209, .25);
-  }
-
-  #global-tweet-dialog .modal-tweet-form-container {
-    background-color: #4E99D1;
-    background: rgba(78, 153, 209, .1);
-  }
-
-  .inline-reply-tweetbox {
-    background-color: #EDF4FA;
-  }
-
-</style>
-
-
-<style id="user-style-vyki_e-header-img" class="js-user-style-header-img">
-
-    body.user-style-vyki_e .enhanced-mini-profile .mini-profile .profile-summary {
-      background-image: url(https://pbs.twimg.com/profile_banners/1087064150/1424315468/web);
+<link rel="shortcut icon" href="//abs.twimg.com/favicons/twitter.2.ico">
+<meta name="mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-title" content="Twitter">
+<meta name="apple-mobile-web-app-status-bar-style" content="white">
+<meta name="theme-color" content="#ffffff">
+<script type="application/ld+json">{"@context":"https://schema.org","@type":"WebSite","url":"https://twitter.com/","potentialAction":{"@type":"SearchAction","query-input":"required name=search_term_string","target":{"@type":"EntryPoint","urlTemplate":"https://twitter.com/search?q={search_term_string}&ref_src=twcamp%5Eseo_searchbox%7Ctwsrc%5Eseo"}}}</script><meta http-equiv="origin-trial" content="AlpCmb40F5ZjDi9ZYe+wnr/V8MF+XmY41K4qUhoq+2mbepJTNd3q4CRqlACfnythEPZqcjryfAS1+ExS0FFRcA8AAABmeyJvcmlnaW4iOiJodHRwczovL3R3aXR0ZXIuY29tOjQ0MyIsImZlYXR1cmUiOiJMYXVuY2ggSGFuZGxlciIsImV4cGlyeSI6MTY1NTI1MTE5OSwiaXNTdWJkb21haW4iOnRydWV9">
+<style>html,body{height: 100%;}::cue{white-space:normal}</style>
+<style id="react-native-stylesheet">[stylesheet-group="0"]{}
+html{-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;-webkit-tap-highlight-color:rgba(0,0,0,0);}
+body{margin:0;}
+button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0;}
+input::-webkit-search-cancel-button,input::-webkit-search-decoration,input::-webkit-search-results-button,input::-webkit-search-results-decoration{display:none;}
+[stylesheet-group="0.1"]{}
+:focus:not([data-focusvisible-polyfill]){outline: none;}
+[stylesheet-group="0.5"]{}
+.css-4rbku5{background-color:rgba(0,0,0,0.00);color:inherit;font:inherit;list-style:none;margin-bottom:0px;margin-left:0px;margin-right:0px;margin-top:0px;text-align:inherit;text-decoration:none;}
+.css-18t94o4{cursor:pointer;}
+[stylesheet-group="1"]{}
+.css-1dbjc4n{-ms-flex-align:stretch;-ms-flex-direction:column;-ms-flex-negative:0;-ms-flex-preferred-size:auto;-webkit-align-items:stretch;-webkit-box-align:stretch;-webkit-box-direction:normal;-webkit-box-orient:vertical;-webkit-flex-basis:auto;-webkit-flex-direction:column;-webkit-flex-shrink:0;align-items:stretch;border:0 solid black;box-sizing:border-box;display:-webkit-box;display:-moz-box;display:-ms-flexbox;display:-webkit-flex;display:flex;flex-basis:auto;flex-direction:column;flex-shrink:0;margin-bottom:0px;margin-left:0px;margin-right:0px;margin-top:0px;min-height:0px;min-width:0px;padding-bottom:0px;padding-left:0px;padding-right:0px;padding-top:0px;position:relative;z-index:0;}
+.css-901oao{border:0 solid black;box-sizing:border-box;color:rgba(0,0,0,1.00);display:inline;font:14px -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Helvetica,Arial,sans-serif;margin-bottom:0px;margin-left:0px;margin-right:0px;margin-top:0px;padding-bottom:0px;padding-left:0px;padding-right:0px;padding-top:0px;white-space:pre-wrap;word-wrap:break-word;}
+.css-16my406{color:inherit;font:inherit;white-space:inherit;}
+.css-1hf3ou5{max-width:100%;overflow-x:hidden;overflow-y:hidden;text-overflow:ellipsis;white-space:nowrap;word-wrap:normal;}
+.css-9pa8cd{bottom:0px;height:100%;left:0px;opacity:0;position:absolute;right:0px;top:0px;width:100%;z-index:-1;}
+[stylesheet-group="2"]{}
+.r-13awgt0{-ms-flex:1 1 0%;-webkit-flex:1;flex:1;}
+.r-6koalj{display:-webkit-box;display:-moz-box;display:-ms-flexbox;display:-webkit-flex;display:flex;}
+.r-sdzlij{border-bottom-left-radius:9999px;border-bottom-right-radius:9999px;border-top-left-radius:9999px;border-top-right-radius:9999px;}
+.r-1phboty{border-bottom-style:solid;border-left-style:solid;border-right-style:solid;border-top-style:solid;}
+.r-rs99b7{border-bottom-width:1px;border-left-width:1px;border-right-width:1px;border-top-width:1px;}
+.r-4qtqp9{display:inline-block;}
+.r-crgep1{margin-bottom:0px;margin-left:0px;margin-right:0px;margin-top:0px;}
+.r-t60dpp{padding-bottom:0px;padding-left:0px;padding-right:0px;padding-top:0px;}
+.r-1yadl64{border-bottom-width:0px;border-left-width:0px;border-right-width:0px;border-top-width:0px;}
+.r-42olwf{border-bottom-color:rgba(0,0,0,0.00);border-left-color:rgba(0,0,0,0.00);border-right-color:rgba(0,0,0,0.00);border-top-color:rgba(0,0,0,0.00);}
+.r-17gur6a{border-bottom-left-radius:0px;border-bottom-right-radius:0px;border-top-left-radius:0px;border-top-right-radius:0px;}
+.r-xyw6el{padding-bottom:12px;padding-left:12px;padding-right:12px;padding-top:12px;}
+.r-jxzhtn{border-bottom-color:rgba(239,243,244,1.00);border-left-color:rgba(239,243,244,1.00);border-right-color:rgba(239,243,244,1.00);border-top-color:rgba(239,243,244,1.00);}
+.r-4iw3lz{border-bottom-width:0;border-left-width:0;border-right-width:0;border-top-width:0;}
+.r-1udh08x{overflow-x:hidden;overflow-y:hidden;}
+.r-wwvuq4{padding-bottom:0;padding-left:0;padding-right:0;padding-top:0;}
+.r-1adg3ll{display:block;}
+.r-bztko3{overflow-x:visible;overflow-y:visible;}
+.r-xoduu5{display:-webkit-inline-box;display:-moz-inline-box;display:-ms-inline-flexbox;display:-webkit-inline-flex;display:inline-flex;}
+.r-1471scf{display:inline;}
+.r-xf4iuw{margin-bottom:-8px;margin-left:-8px;margin-right:-8px;margin-top:-8px;}
+.r-1ets6dv{border-bottom-color:rgba(207,217,222,1.00);border-left-color:rgba(207,217,222,1.00);border-right-color:rgba(207,217,222,1.00);border-top-color:rgba(207,217,222,1.00);}
+.r-1867qdf{border-bottom-left-radius:16px;border-bottom-right-radius:16px;border-top-left-radius:16px;border-top-right-radius:16px;}
+.r-z2wwpe{border-bottom-left-radius:4px;border-bottom-right-radius:4px;border-top-left-radius:4px;border-top-right-radius:4px;}
+.r-hvic4v{display:none;}
+.r-11mg6pl{border-bottom-color:rgba(255,255,255,1.00);border-left-color:rgba(255,255,255,1.00);border-right-color:rgba(255,255,255,1.00);border-top-color:rgba(255,255,255,1.00);}
+.r-14f9gny{border-bottom-width:4px;border-left-width:4px;border-right-width:4px;border-top-width:4px;}
+[stylesheet-group="2.1"]{}
+.r-1jgb5lz{margin-left:auto;margin-right:auto;}
+.r-ymttw5{padding-left:16px;padding-right:16px;}
+.r-oyd9sg{padding-bottom:4px;padding-top:4px;}
+.r-1fz3rvf{margin-left:12px;margin-right:12px;}
+.r-rjfia{padding-bottom:0px;padding-top:0px;}
+.r-1r5su4o{margin-bottom:16px;margin-top:16px;}
+.r-s1qlax{padding-left:4px;padding-right:4px;}
+.r-1yzf0co{padding-bottom:16px;padding-top:16px;}
+.r-1e081e0{padding-left:12px;padding-right:12px;}
+.r-1pn2ns4{padding-left:8px;padding-right:8px;}
+.r-t7s2l5{margin-bottom:auto;margin-top:auto;}
+.r-5njf8e{padding-bottom:8px;padding-top:8px;}
+[stylesheet-group="2.2"]{}
+.r-12vffkv>*{pointer-events:auto;}
+.r-12vffkv{pointer-events:none!important;}
+.r-2llsf{min-height:100%;}
+.r-13qz1uu{width:100%;}
+.r-417010{z-index:0;}
+.r-lrvibr{-moz-user-select:none;-ms-user-select:none;-webkit-user-select:none;user-select:none;}
+.r-1g40b8q{z-index:3;}
+.r-orgf3d{opacity:0;}
+.r-633pao{pointer-events:none!important;}
+.r-1d2f490{left:0px;}
+.r-1xcajam{position:fixed;}
+.r-zchlnj{right:0px;}
+.r-1gn8etr{top:-0.5px;}
+.r-dkhcqf{-webkit-transition-duration:350ms;transition-duration:350ms;}
+.r-axxi2z{-moz-transition-property:transform;-webkit-transition-property:-webkit-transform,transform;transition-property:-webkit-transform,transform;}
+.r-18jm5s1{-webkit-transition-timing-function:cubic-bezier(0,0,0,1);transition-timing-function:cubic-bezier(0,0,0,1);}
+.r-16e0dcy{-webkit-transform:translate3d(0, 0, 0) translateY(0px);transform:translate3d(0, 0, 0) translateY(0px);}
+.r-1e5uvyk{-webkit-backdrop-filter:blur(12px);backdrop-filter:blur(12px);}
+.r-6026j{background-color:rgba(255,255,255,0.85);}
+.r-136ojw6{z-index:2;}
+.r-fxvszc{height:106px;}
+.r-1h3ijdo{height:53px;}
+.r-1awozwy{-ms-flex-align:center;-webkit-align-items:center;-webkit-box-align:center;align-items:center;}
+.r-18u37iz{-ms-flex-direction:row;-webkit-box-direction:normal;-webkit-box-orient:horizontal;-webkit-flex-direction:row;flex-direction:row;}
+.r-1777fci{-ms-flex-pack:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;}
+.r-1pz39u2{-ms-flex-item-align:stretch;-ms-grid-row-align:stretch;-webkit-align-self:stretch;align-self:stretch;}
+.r-15ysp7h{min-height:32px;}
+.r-4wgw6l{min-width:32px;}
+.r-1habvwh{-ms-flex-align:start;-webkit-align-items:flex-start;-webkit-box-align:start;align-items:flex-start;}
+.r-s8bhmr{min-width:56px;}
+.r-1mf7evn{margin-right:20px;}
+.r-1loqt21{cursor:pointer;}
+.r-16y2uox{-ms-flex-positive:1;-webkit-box-flex:1;-webkit-flex-grow:1;flex-grow:1;}
+.r-2yi16{min-height:36px;}
+.r-1qi8awa{min-width:36px;}
+.r-o7ynqc{-webkit-transition-duration:0.2s;transition-duration:0.2s;}
+.r-6416eg{-moz-transition-property:background-color, box-shadow;-webkit-transition-property:background-color, box-shadow;transition-property:background-color, box-shadow;}
+.r-1ny4l3l{outline-style:none;}
+.r-bcqeeo{min-width:0px;}
+.r-qvutc0{word-wrap:break-word;}
+.r-rjixqe{line-height:20px;}
+.r-37j5jr{font-family:"TwitterChirp",-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Helvetica,Arial,sans-serif;}
+.r-q4m81j{text-align:center;}
+.r-a023e6{font-size:15px;}
+.r-b88u0q{font-weight:700;}
+.r-yyyyoo{fill:currentcolor;}
+.r-1xvli5t{height:1.25em;}
+.r-dnmrzs{max-width:100%;}
+.r-bnwqim{position:relative;}
+.r-1plcrui{vertical-align:text-bottom;}
+.r-z80fyv{height:20px;}
+.r-19wmn03{width:20px;}
+.r-1cvl2hr{color:rgba(29,155,240,1.00);}
+.r-lwhw9o{height:1.75rem;}
+.r-poiln3{font-family:inherit;}
+.r-1wbh5a2{-ms-flex-negative:1;-webkit-flex-shrink:1;flex-shrink:1;}
+.r-1pi2tsx{height:100%;}
+.r-1iusvr4{-ms-flex-preferred-size:0px;-webkit-flex-basis:0px;flex-basis:0px;}
+.r-1oszu61{-ms-flex-align:stretch;-webkit-align-items:stretch;-webkit-box-align:stretch;align-items:stretch;}
+.r-eqz5dr{-ms-flex-direction:column;-webkit-box-direction:normal;-webkit-box-orient:vertical;-webkit-flex-direction:column;flex-direction:column;}
+.r-8fdsdq{z-index:4;}
+.r-vqxq0j{border:0 solid black;}
+.r-deolkf{box-sizing:border-box;}
+.r-1mlwlqe{-ms-flex-preferred-size:auto;-webkit-flex-basis:auto;flex-basis:auto;}
+.r-ifefl9{min-height:0px;}
+.r-1sw30gj{background-color:rgba(239,243,244,1.00);}
+.r-1dqbpge{cursor:-webkit-text;cursor:text;}
+.r-7q8q6z{cursor:default;}
+.r-14j79pv{color:rgba(83,100,113,1.00);}
+.r-f727ji{padding-left:12px;}
+.r-16dba41{font-weight:400;}
+.r-30o5oe{-moz-appearance:none;-webkit-appearance:none;appearance:none;}
+.r-1dz5y72{resize:none;}
+.r-1niwhzg{background-color:rgba(0,0,0,0.00);}
+.r-homxoj{color:inherit;}
+.r-7cikom{font-size:inherit;}
+.r-1ttztb7{text-align:inherit;}
+.r-fdjqy7{text-align:left;}
+.r-y0fyvk::-webkit-input-placeholder{color:rgba(83,100,113,1.00);opacity:1;}
+.r-y0fyvk::-moz-placeholder{color:rgba(83,100,113,1.00);opacity:1;}
+.r-y0fyvk:-ms-input-placeholder{color:rgba(83,100,113,1.00);opacity:1;}
+.r-y0fyvk::placeholder{color:rgba(83,100,113,1.00);opacity:1;}
+.r-obd0qt{-ms-flex-align:end;-webkit-align-items:flex-end;-webkit-box-align:end;align-items:flex-end;}
+.r-1d4mawv{margin-right:4px;}
+.r-1w6e6rj{-ms-flex-wrap:wrap;-webkit-box-lines:multiple;-webkit-flex-wrap:wrap;flex-wrap:wrap;}
+.r-1wtj0ep{-ms-flex-pack:justify;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;}
+.r-1b43r93{font-size:14px;}
+.r-1cwl3u0{line-height:16px;}
+.r-u8s1d{position:absolute;}
+.r-150rngu{-webkit-overflow-scrolling:touch;}
+.r-17bb2tj{-webkit-animation-duration:0.75s;animation-duration:0.75s;}
+.r-1muvv40{-webkit-animation-iteration-count:infinite;animation-iteration-count:infinite;}
+.r-127358a{-webkit-animation-name:r-9p3sdl;animation-name:r-9p3sdl;}
+@-webkit-keyframes r-9p3sdl{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg);}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg);}}
+@keyframes r-9p3sdl{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg);}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg);}}
+.r-1ldzwu0{-webkit-animation-timing-function:linear;animation-timing-function:linear;}
+.r-aqfbo4{-webkit-backface-visibility:hidden;backface-visibility:hidden;}
+.r-14lw9ot{background-color:rgba(255,255,255,1.00);}
+.r-1ljd8xs{border-left-width:1px;}
+.r-13l2t4g{border-right-width:1px;}
+.r-33ulu8{width:600px;}
+.r-184en5c{z-index:1;}
+.r-1xk2f4g{clip:rect(1px, 1px, 1px, 1px);}
+.r-109y4c4{height:1px;}
+.r-92ng3h{width:1px;}
+.r-19u6a5r{margin-left:12px;}
+.r-1lul07w{-webkit-transform:translate3d(0, -3.5em, 0);transform:translate3d(0, -3.5em, 0);}
+.r-eafdt9{-webkit-transition-duration:0.15s;transition-duration:0.15s;}
+.r-1b8bd59{-moz-transition-property:transform, opacity;-webkit-transition-property:-webkit-transform,transform, opacity;transition-property:-webkit-transform,transform, opacity;}
+.r-nx0j10{-webkit-transition-timing-function:ease, ease, step-end;transition-timing-function:ease, ease, step-end;}
+.r-l5o3uw{background-color:rgba(29,155,240,1.00);}
+.r-y3da5r{box-shadow:0 0 8px rgba(101,119,134,0.2), 0 1px 3px 1px rgba(101,119,134,0.25);}
+.r-1kihuf0{-ms-flex-item-align:center;-ms-grid-row-align:center;-webkit-align-self:center;align-self:center;}
+.r-jwli3a{color:rgba(255,255,255,1.00);}
+.r-13hce6t{margin-left:4px;}
+.r-j5o65s{border-bottom-color:rgba(239,243,244,1.00);}
+.r-qklmqi{border-bottom-width:1px;}
+.r-1qhn6m8{padding-left:16px;}
+.r-i023vh{padding-right:16px;}
+.r-ttdzmv{padding-top:12px;}
+.r-15zivkp{margin-bottom:4px;}
+.r-18kxxzh{-ms-flex-positive:0;-webkit-box-flex:0;-webkit-flex-grow:0;flex-grow:0;}
+.r-1b7u577{margin-right:12px;}
+.r-1hwvwag{-ms-flex-preferred-size:48px;-webkit-flex-basis:48px;flex-basis:48px;}
+.r-1p0dtai{bottom:0px;}
+.r-ipm5af{top:0px;}
+.r-1wyvozj{left:50%;}
+.r-1v2oles{top:50%;}
+.r-desppf{-webkit-transform:translateX(-50%) translateY(-50%);transform:translateX(-50%) translateY(-50%);}
+.r-ggadg3{left:-2px;}
+.r-8jfcpp{top:-2px;}
+.r-vvn4in{background-position:center;}
+.r-u6sd8q{background-repeat:no-repeat;}
+.r-4gszlv{background-size:cover;}
+.r-1wyyakw{z-index:-1;}
+.r-12181gd{box-shadow:0 0 2px rgba(0,0,0,0.03) inset;}
+.r-zl2h9q{margin-bottom:2px;}
+.r-k4xj1c{-ms-flex-align:start;-webkit-align-items:start;-webkit-box-align:start;align-items:start;}
+.r-1d09ksm{-ms-flex-align:baseline;-webkit-align-items:baseline;-webkit-box-align:baseline;align-items:baseline;}
+.r-3s2u2q{white-space:nowrap;}
+.r-1q142lx{-ms-flex-negative:0;-webkit-flex-shrink:0;flex-shrink:0;}
+.r-f9ja8p{max-height:20px;}
+.r-og9te1{max-width:20px;}
+.r-9cviqr{margin-left:2px;}
+.r-1wvb978{-webkit-font-feature-settings:'ss01' on;font-feature-settings:'ss01' on;}
+.r-1s2bzr4{margin-top:12px;}
+.r-1inkyih{font-size:17px;}
+.r-9aw3ui{gap:4px;}
+.r-1dgieki{border-top-color:rgba(239,243,244,1.00);}
+.r-1efd50x{border-top-style:solid;}
+.r-5kkj8d{border-top-width:1px;}
+.r-1ta3fxp{-moz-column-gap:8px;-webkit-column-gap:8px;column-gap:8px;}
+.r-a2tzq0{-ms-flex-pack:distribute;-webkit-box-pack:justify;-webkit-justify-content:space-around;justify-content:space-around;}
+.r-3qxfft{min-height:1.875rem;}
+.r-h3s6tt{height:48px;}
+.r-rull8r{border-bottom-style:solid;}
+.r-1h0z5md{-ms-flex-pack:start;-webkit-box-pack:start;-webkit-justify-content:flex-start;justify-content:flex-start;}
+.r-bt1l66{min-height:20px;}
+.r-clp7b1{-moz-transition-property:color;-webkit-transition-property:color;transition-property:color;}
+.r-50lct3{height:1.5em;}
+.r-1srniue{width:1.5em;}
+.r-1ut4w64{margin-bottom:-1px;}
+.r-1bimlpy{background-color:rgba(207,217,222,1.00);}
+.r-m5arl1{width:2px;}
+.r-14gqq1x{margin-top:4px;}
+.r-kzbkwu{padding-bottom:12px;}
+.r-dflpy8{height:1.2em;}
+.r-sjv1od{margin-left:0.075em;}
+.r-zw8f10{margin-right:0.075em;}
+.r-10akycc{vertical-align:-20%;}
+.r-h9hxbl{width:1.2em;}
+.r-a5pmau{margin-right:2px;}
+.r-p3p4p0{max-height:17px;}
+.r-hm2b0w{max-width:17px;}
+.r-1mdbhws{max-width:425px;}
+.r-1hdv0qi{width:1.25em;}
+.r-n6v787{font-size:13px;}
+.r-1k6nrdp{min-width:calc(1em + 2 * 12px);}
+.r-vc7bo5{min-width:calc(1em + 2 * 8px);}
+.r-m2pi6t{padding-left:4px;}
+.r-1r8g8re{height:36px;}
+.r-10ptun7{height:16px;}
+.r-epq5cr{height:2px;}
+.r-1ssbvtb{gap:12px;}
+.r-pm9dpa{max-height:100%;}
+.r-rki7wi{bottom:12px;}
+.r-161ttwi{left:12px;}
+.r-k200y{-ms-flex-item-align:start;-webkit-align-self:flex-start;align-self:flex-start;}
+.r-loe9s5{background-color:rgba(0,0,0,0.77);}
+.r-pm2fo{border-bottom-left-radius:0px;}
+.r-zmljjp{border-bottom-right-radius:0px;}
+.r-ou6ah9{border-top-left-radius:0px;}
+.r-t12b5v{border-top-right-radius:0px;}
+.r-6t5ypu{border-bottom-left-radius:4px;}
+.r-kicko2{border-top-left-radius:4px;}
+.r-1dpl46z{border-bottom-right-radius:4px;}
+.r-notknq{border-top-right-radius:4px;}
+.r-105ug2t{pointer-events:auto!important;}
+.r-e6wyp1{height:67px;}
+.r-1p15a4t{width:67px;}
+.r-1sa8knb{height:calc(50% + 4px);}
+.r-gcko2u{width:calc(50% + 4px);}
+.r-1dsia8u{padding-left:3px;}
+.r-o52ifk{height:100px;}</style>
+<title data-rh="true">Marques Brownlee on Twitter: "I've never played Minecraft" / Twitter</title>
+<meta data-rh="true" content="article" property="og:type">
+<meta data-rh="true" content="https://twitter.com/MKBHD/status/1625192182859632661" property="og:url">
+<meta data-rh="true" content="Marques Brownlee on Twitter" property="og:title">
+<meta data-rh="true" content="“I've never played Minecraft”" property="og:description">
+<meta data-rh="true" content="https://pbs.twimg.com/profile_images/1468001914302390278/B_Xv_8gu_200x200.jpg" property="og:image">
+<meta data-rh="true" description="" name="description"> <link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661" rel="canonical">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661" hreflang="x-default" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=ar" hreflang="ar" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=ar-x-fm" hreflang="ar-x-fm" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=bg" hreflang="bg" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=bn" hreflang="bn" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=ca" hreflang="ca" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=cs" hreflang="cs" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=da" hreflang="da" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=de" hreflang="de" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=el" hreflang="el" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=en" hreflang="en" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=en-GB" hreflang="en-GB" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=es" hreflang="es" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=eu" hreflang="eu" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=fa" hreflang="fa" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=fi" hreflang="fi" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=fil" hreflang="fil" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=fr" hreflang="fr" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=ga" hreflang="ga" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=gl" hreflang="gl" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=gu" hreflang="gu" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=ha" hreflang="ha" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=he" hreflang="he" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=hi" hreflang="hi" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=hr" hreflang="hr" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=hu" hreflang="hu" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=id" hreflang="id" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=ig" hreflang="ig" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=it" hreflang="it" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=ja" hreflang="ja" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=kn" hreflang="kn" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=ko" hreflang="ko" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=mr" hreflang="mr" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=ms" hreflang="ms" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=nb" hreflang="nb" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=nl" hreflang="nl" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=no" hreflang="no" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=pl" hreflang="pl" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=pt" hreflang="pt" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=ro" hreflang="ro" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=ru" hreflang="ru" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=sk" hreflang="sk" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=sr" hreflang="sr" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=sv" hreflang="sv" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=ta" hreflang="ta" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=th" hreflang="th" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=tl" hreflang="tl" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=tr" hreflang="tr" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=uk" hreflang="uk" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=ur" hreflang="ur" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=vi" hreflang="vi" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=yo" hreflang="yo" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=zh" hreflang="zh" rel="alternate">
+<link data-rh="true" href="https://twitter.com/MKBHD/status/1625192182859632661?lang=zh-Hant" hreflang="zh-Hant" rel="alternate"> <meta data-rh="true" content="twitter://status?id=1625192182859632661" property="al:ios:url">
+<meta data-rh="true" content="333903271" property="al:ios:app_store_id">
+<meta data-rh="true" content="Twitter" property="al:ios:app_name">
+<meta data-rh="true" content="twitter://status?id=1625192182859632661" property="al:android:url">
+<meta data-rh="true" content="com.twitter.android" property="al:android:package">
+<meta data-rh="true" content="Twitter" property="al:android:app_name">
+</head>
+<body style="background-color: #FFFFFF;">
+  <noscript>
+    <style>
+    body {
+      -ms-overflow-style: scrollbar;
+      overflow-y: scroll;
+      overscroll-behavior-y: none;
     }
 
-    body.user-style-vyki_e .wrapper-profile .profile-card.profile-header .profile-header-inner {
-      background-image: url(https://pbs.twimg.com/profile_banners/1087064150/1424315468/web);
+    .errorContainer {
+      background-color: #FFF;
+      color: #0F1419;
+      max-width: 600px;
+      margin: 0 auto;
+      padding: 10%;
+      font-family: Helvetica, sans-serif;
+      font-size: 16px;
     }
 
-    .DashboardProfileCard-bg {
-      background-image: url(https://pbs.twimg.com/profile_banners/1087064150/1424315468/600x200);
+    .errorButton {
+      margin: 3em 0;
     }
 
-    body.user-style-vyki_e .profile-canopy .bg-img {
-      background-image: url(https://pbs.twimg.com/profile_banners/1087064150/1424315468/web_retina);
+    .errorButton a {
+      background: #1DA1F2;
+      border-radius: 2.5em;
+      color: white;
+      padding: 1em 2em;
+      text-decoration: none;
     }
 
-</style>
-
-
-
-
-          </div>
-        </div>
-
-    </div>
-    <div class="alert-messages hidden" id="message-drawer">
-    <div class="message ">
-  <div class="message-inside">
-    <span class="message-text"></span>
-      <a role="button" class="Icon Icon--close Icon--medium dismiss" href="#">
-        <span class="visuallyhidden">Dismiss</span>
-      </a>
-  </div>
-</div>
-</div>
-
-
-
-
-<div class="gallery-overlay"></div>
-<div class="Gallery">
-  <div class="Gallery-closeTarget"></div>
-  <div class="Gallery-content">
-    <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--large">
-    <span class="visuallyhidden">Close</span>
-  </span>
-</button>
-
-    <div class="Gallery-media"></div>
-    <div class="GalleryNav GalleryNav--prev">
-      <span class="GalleryNav-handle GalleryNav-handle--prev">
-        <span class="Icon Icon--caretLeft Icon--large">
-          <span class="u-hiddenVisually">
-            Previous
-          </span>
-        </span>
-      </span>
-    </div>
-    <div class="GalleryNav GalleryNav--next">
-      <span class="GalleryNav-handle GalleryNav-handle--next">
-        <span class="Icon Icon--caretRight Icon--large">
-          <span class="u-hiddenVisually">
-            Next
-          </span>
-        </span>
-      </span>
-    </div>
-    <div class="GalleryTweet"></div>
-  </div>
-</div>
-
-
-
-<div class="modal-overlay"></div>
-
-<div id="profile-hover-container"></div>
-
-
-
-<div id="goto-user-dialog" class="modal-container">
-  <div class="modal modal-small draggable">
-    <div class="modal-content">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Close</span>
-  </span>
-</button>
-
-
-      <div class="modal-header">
-        <h3 class="modal-title">Go to a person's profile</h3>
-      </div>
-
-      <div class="modal-body">
-        <div class="modal-inner">
-          <form class="t1-form goto-user-form">
-            <input class="input-block username-input" type="text" placeholder="Start typing a name to jump to a profile" aria-label="User">
-
-
-
-<div role="listbox" class="dropdown-menu typeahead">
-  <div aria-hidden="true" class="dropdown-caret">
-    <div class="caret-outer"></div>
-    <div class="caret-inner"></div>
-  </div>
-  <div role="presentation" class="dropdown-inner js-typeahead-results">
-    <div role="presentation" class="typeahead-saved-searches">
-  <h3 id="saved-searches-heading" class="typeahead-category-title saved-searches-title">Saved searches</h3>
-  <ul role="presentation" class="typeahead-items saved-searches-list">
-
-    <li role="presentation" class="typeahead-item typeahead-saved-search-item">
-      <span class="Icon Icon--close" aria-hidden="true"><span class="visuallyhidden">Remove</span></span>
-      <a role="option" aria-describedby="saved-searches-heading" class="js-nav" href="" data-search-query="" data-query-source="" data-ds="saved_search" tabindex="-1"></a>
-    </li>
-  </ul>
-</div>
-
-    <ul role="presentation" class="typeahead-items typeahead-topics">
-
-  <li role="presentation" class="typeahead-item typeahead-topic-item">
-    <a role="option" class="js-nav" href="" data-search-query="" data-query-source="typeahead_click" data-ds="topics" tabindex="-1"></a>
-  </li>
-</ul>
-
-
-
-<ul role="presentation" class="typeahead-items typeahead-accounts js-typeahead-accounts">
-
-  <li role="presentation" data-user-id="" data-user-screenname="" data-remote="true" data-score="" class="typeahead-item typeahead-account-item js-selectable">
-
-    <a role="option" class="js-nav" data-query-source="typeahead_click" data-search-query="" data-ds="account">
-      <img class="avatar size32" alt="">
-      <span class="typeahead-user-item-info">
-        <span class="fullname"></span>
-        <span class="js-verified hidden"><span class="Icon Icon--verified Icon--small">
-  <span class="u-hiddenVisually">Verified account</span>
-</span></span>
-        <span class="username"><s>@</s><b></b></span>
-      </span>
-    </a>
-  </li>
-  <li role="presentation" class="js-selectable typeahead-accounts-shortcut js-shortcut"><a role="option" class="js-nav" href="" data-search-query="" data-query-source="typeahead_click" data-shortcut="true" data-ds="account_search"></a></li>
-</ul>
-
-    <ul role="presentation" class="typeahead-items typeahead-trend-locations-list">
-
-  <li role="presentation" class="typeahead-item typeahead-trend-locations-item"><a role="option" class="js-nav" href="" data-ds="trend_location" data-search-query="" tabindex="-1"></a></li>
-</ul>
-    <div role="presentation" class="typeahead-user-select">
-  <div role="presentation" class="typeahead-empty-suggestions">
-    Suggested users
-  </div>
-  <ul role="presentation" class="typeahead-items typeahead-selected js-typeahead-selected">
-
-    <li role="presentation" data-user-id="" data-user-screenname="" data-remote="true" data-score="" class="typeahead-item typeahead-selected-item js-selectable">
-
-      <a role="option" class="js-nav" data-query-source="typeahead_click" data-search-query="" data-ds="account">
-        <img class="avatar size32" alt="">
-        <span class="typeahead-user-item-info">
-          <span class="select-status deselect-user js-deselect-user Icon Icon--check"></span>
-          <span class="select-status select-disabled Icon Icon--unfollow"></span>
-          <span class="fullname"></span>
-          <span class="js-verified hidden"><span class="Icon Icon--verified Icon--small">
-  <span class="u-hiddenVisually">Verified account</span>
-</span></span>
-          <span class="username"><s>@</s><b></b></span>
-        </span>
-      </a>
-    </li>
-    <li role="presentation" class="typeahead-selected-end"></li>
-  </ul>
-
-  <ul role="presentation" class="typeahead-items typeahead-accounts js-typeahead-accounts">
-
-    <li role="presentation" data-user-id="" data-user-screenname="" data-remote="true" data-score="" class="typeahead-item typeahead-account-item js-selectable">
-
-      <a role="option" class="js-nav" data-query-source="typeahead_click" data-search-query="" data-ds="account">
-        <img class="avatar size32" alt="">
-        <span class="typeahead-user-item-info">
-          <span class="select-status deselect-user js-deselect-user Icon Icon--check"></span>
-          <span class="select-status select-disabled Icon Icon--unfollow"></span>
-          <span class="fullname"></span>
-          <span class="js-verified hidden"><span class="Icon Icon--verified Icon--small">
-  <span class="u-hiddenVisually">Verified account</span>
-</span></span>
-          <span class="username"><s>@</s><b></b></span>
-        </span>
-      </a>
-    </li>
-    <li role="presentation" class="typeahead-accounts-end"></li>
-  </ul>
-</div>
-
-    <div role="presentation" class="typeahead-dm-conversations">
-  <ul role="presentation" class="typeahead-items typeahead-dm-conversation-items">
-    <li role="presentation" class="typeahead-item typeahead-dm-conversation-item">
-      <a role="option" tabindex="-1"></a>
-    </li>
-  </ul>
-</div>
-  </div>
-</div>
-
-          </form>
-        </div>
-      </div>
-
-    </div>
-  </div>
-</div>
-
-
-  <div id="retweet-tweet-dialog" class="RetweetDialog modal-container">
-  <div class="close-modal-background-target"></div>
-  <div class="RetweetDialog-modal modal draggable">
-    <div class="modal-content">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Close</span>
-  </span>
-</button>
-
-
-      <div class="modal-header">
-        <h3 class="modal-title">Retweet this to your followers?</h3>
-      </div>
-
-      <form class="t1-form tweet-form condensed RetweetDialog-tweetForm isWithoutComment" data-condensed-text="Add a comment...">
-        <div class="RetweetDialog-commentBox">
-          <span class="visuallyhidden" id="-label">Optional comment for Retweet</span>
-          <div class="tweet-content">
-            <div class="RichEditor">
-
-  <div class="RichEditor-mozillaCursorWorkaround">&nbsp;</div>
-  <div class="RichEditor-scrollContainer">
-
-
-
-            <div aria-labelledby="-label" id="" class="tweet-box rich-editor"
-              contenteditable="true" spellcheck="true" role="textbox" aria-multiline="true"></div>
-
-    <div class="RichEditor-pictographs" aria-hidden="true"></div>
-  </div>
-  <div class="RichEditor-mozillaCursorWorkaround">&nbsp;</div>
-</div>
-
-          </div>
-
-
-
-<div role="listbox" class="dropdown-menu typeahead">
-  <div aria-hidden="true" class="dropdown-caret">
-    <div class="caret-outer"></div>
-    <div class="caret-inner"></div>
-  </div>
-  <div role="presentation" class="dropdown-inner js-typeahead-results">
-    <div role="presentation" class="typeahead-saved-searches">
-  <h3 id="saved-searches-heading" class="typeahead-category-title saved-searches-title">Saved searches</h3>
-  <ul role="presentation" class="typeahead-items saved-searches-list">
-
-    <li role="presentation" class="typeahead-item typeahead-saved-search-item">
-      <span class="Icon Icon--close" aria-hidden="true"><span class="visuallyhidden">Remove</span></span>
-      <a role="option" aria-describedby="saved-searches-heading" class="js-nav" href="" data-search-query="" data-query-source="" data-ds="saved_search" tabindex="-1"></a>
-    </li>
-  </ul>
-</div>
-
-    <ul role="presentation" class="typeahead-items typeahead-topics">
-
-  <li role="presentation" class="typeahead-item typeahead-topic-item">
-    <a role="option" class="js-nav" href="" data-search-query="" data-query-source="typeahead_click" data-ds="topics" tabindex="-1"></a>
-  </li>
-</ul>
-
-
-
-<ul role="presentation" class="typeahead-items typeahead-accounts js-typeahead-accounts">
-
-  <li role="presentation" data-user-id="" data-user-screenname="" data-remote="true" data-score="" class="typeahead-item typeahead-account-item js-selectable">
-
-    <a role="option" class="js-nav" data-query-source="typeahead_click" data-search-query="" data-ds="account">
-      <img class="avatar size32" alt="">
-      <span class="typeahead-user-item-info">
-        <span class="fullname"></span>
-        <span class="js-verified hidden"><span class="Icon Icon--verified Icon--small">
-  <span class="u-hiddenVisually">Verified account</span>
-</span></span>
-        <span class="username"><s>@</s><b></b></span>
-      </span>
-    </a>
-  </li>
-  <li role="presentation" class="js-selectable typeahead-accounts-shortcut js-shortcut"><a role="option" class="js-nav" href="" data-search-query="" data-query-source="typeahead_click" data-shortcut="true" data-ds="account_search"></a></li>
-</ul>
-
-    <ul role="presentation" class="typeahead-items typeahead-trend-locations-list">
-
-  <li role="presentation" class="typeahead-item typeahead-trend-locations-item"><a role="option" class="js-nav" href="" data-ds="trend_location" data-search-query="" tabindex="-1"></a></li>
-</ul>
-    <div role="presentation" class="typeahead-user-select">
-  <div role="presentation" class="typeahead-empty-suggestions">
-    Suggested users
-  </div>
-  <ul role="presentation" class="typeahead-items typeahead-selected js-typeahead-selected">
-
-    <li role="presentation" data-user-id="" data-user-screenname="" data-remote="true" data-score="" class="typeahead-item typeahead-selected-item js-selectable">
-
-      <a role="option" class="js-nav" data-query-source="typeahead_click" data-search-query="" data-ds="account">
-        <img class="avatar size32" alt="">
-        <span class="typeahead-user-item-info">
-          <span class="select-status deselect-user js-deselect-user Icon Icon--check"></span>
-          <span class="select-status select-disabled Icon Icon--unfollow"></span>
-          <span class="fullname"></span>
-          <span class="js-verified hidden"><span class="Icon Icon--verified Icon--small">
-  <span class="u-hiddenVisually">Verified account</span>
-</span></span>
-          <span class="username"><s>@</s><b></b></span>
-        </span>
-      </a>
-    </li>
-    <li role="presentation" class="typeahead-selected-end"></li>
-  </ul>
-
-  <ul role="presentation" class="typeahead-items typeahead-accounts js-typeahead-accounts">
-
-    <li role="presentation" data-user-id="" data-user-screenname="" data-remote="true" data-score="" class="typeahead-item typeahead-account-item js-selectable">
-
-      <a role="option" class="js-nav" data-query-source="typeahead_click" data-search-query="" data-ds="account">
-        <img class="avatar size32" alt="">
-        <span class="typeahead-user-item-info">
-          <span class="select-status deselect-user js-deselect-user Icon Icon--check"></span>
-          <span class="select-status select-disabled Icon Icon--unfollow"></span>
-          <span class="fullname"></span>
-          <span class="js-verified hidden"><span class="Icon Icon--verified Icon--small">
-  <span class="u-hiddenVisually">Verified account</span>
-</span></span>
-          <span class="username"><s>@</s><b></b></span>
-        </span>
-      </a>
-    </li>
-    <li role="presentation" class="typeahead-accounts-end"></li>
-  </ul>
-</div>
-
-    <div role="presentation" class="typeahead-dm-conversations">
-  <ul role="presentation" class="typeahead-items typeahead-dm-conversation-items">
-    <li role="presentation" class="typeahead-item typeahead-dm-conversation-item">
-      <a role="option" tabindex="-1"></a>
-    </li>
-  </ul>
-</div>
-  </div>
-</div>
-
-        </div>
-
-        <div class="RetweetDialog-footer u-cf">
-          <div class="tweet-loading">
-  <div class="spinner-bigger"></div>
-</div>
-
-          <div class="RetweetDialog-tweet modal-body modal-tweet tweet"></div>
-          <div class="tweet-button">
-            <span class="spinner"></span>
-            <span class="RetweetDialog-counter tweet-counter">140</span>
-            <button class="btn primary-btn retweet-action" type="button">
-              <span class="RetweetDialog-retweetActionLabel">
-                <span class="Icon Icon--retweet"></span>
-                Retweet
-              </span>
-              <span class="RetweetDialog-tweetActionLabel">
-                <span class="Icon Icon--tweet"></span>
-                Tweet
-              </span>
-            </button>
-          </div>
-        </div>
-      </form>
-    </div>
-  </div>
-</div>
-
-  <div id="delete-tweet-dialog" class="modal-container">
-  <div class="close-modal-background-target"></div>
-  <div class="modal draggable">
-    <div class="modal-content">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Close</span>
-  </span>
-</button>
-
-
-      <div class="modal-header">
-        <h3 class="modal-title">Are you sure you want to delete this Tweet?</h3>
-      </div>
-
-      <div class="tweet-loading">
-  <div class="spinner-bigger"></div>
-</div>
-
-      <div class="modal-body modal-tweet"></div>
-
-      <div class="modal-footer">
-        <button class="btn cancel-action js-close">Cancel</button>
-        <button class="btn primary-btn delete-action">Delete</button>
-      </div>
-    </div>
-  </div>
-</div>
-
-  <div id="quick-promote-dialog" class="QuickPromoteDialog modal-container">
-  <div class="close-modal-background-target"></div>
-  <div class="modal draggable">
-    <div class="modal-content">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--large">
-    <span class="visuallyhidden">Close</span>
-  </span>
-</button>
-
-      <div class="modal-header">
-        <h3 class="modal-title">Promote this Tweet</h3>
-      </div>
-      <div class="modal-body">
-        <div class="quick-promote-view-container">
-          <div class="media">
-            <iframe
-              class="quick-promote-iframe js-initial-focus"
-              scrolling="no"
-              frameborder="0"
-              src="">
-            </iframe>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div id="block-user-dialog" class="modal-container">
-  <div class="close-modal-background-target"></div>
-  <div class="modal draggable">
-    <div class="modal-content">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Close</span>
-  </span>
-</button>
-
-
-      <div class="modal-header">
-        <h3 class="modal-title">Block</h3>
-      </div>
-
-      <div class="tweet-loading">
-  <div class="spinner-bigger"></div>
-</div>
-
-      <div class="modal-body modal-tweet"></div>
-
-      <div class="modal-footer">
-        <button class="btn cancel-action js-close">Cancel</button>
-        <button class="btn primary-btn block-action">Block</button>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-
-
-
-
-     <div id="geo-disabled-dropdown">
-      <div tabindex="-1">
-  <div class="dropdown-caret">
-    <span class="caret-outer"></span>
-    <span class="caret-inner"></span>
-  </div>
-  <ul>
-    <li class="geo-not-enabled-yet">
-      <h2>Add a location to your Tweets</h2>
-      <p>
-        When you tweet with a location, Twitter stores that location.&#32;
-        You can switch location on/off before each Tweet and always have the option to delete your location history.
-        <a href="http://support.twitter.com/forums/26810/entries/78525" target="_blank">Learn more</a>
-      </p>
-      <div>
-        <button type="button" class="geo-turn-on btn primary-btn">Turn location on</button>
-        <button type="button" class="geo-not-now btn-link">Not now</button>
-      </div>
-    </li>
-  </ul>
-</div>
-
-    </div>
-
-  <div id="geo-enabled-dropdown">
-    <div tabindex="-1">
-  <div class="dropdown-caret">
-    <span class="caret-outer"></span>
-    <span class="caret-inner"></span>
-  </div>
-  <div>
-    <div class="geo-query-location">
-      <input class="GeoSearch-queryInput" type="text" autocomplete="off" placeholder="Search for a neighborhood or city">
-      <span class="Icon Icon--search"></span>
-    </div>
-    <div class="geo-dropdown-status"></div>
-    <ul class="GeoSearch-dropdownMenu"></ul>
-  </div>
-</div>
-
-  </div>
-
-
-  <div id="profile_popup" class="modal-container ProfilePopupContainer--bellbird">
-  <div class="close-modal-background-target"></div>
-  <div class="modal modal-small draggable">
-    <div class="modal-content clearfix">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Close</span>
-  </span>
-</button>
-
-      <div class="modal-header">
-        <h3 class="modal-title">Profile summary</h3>
-      </div>
-
-      <div class="modal-body profile-modal">
-
-      </div>
-
-      <div class="loading">
-        <span class="spinner-bigger"></span>
-      </div>
-    </div>
-  </div>
-</div>
-
-  <div id="list-membership-dialog" class="modal-container">
-  <div class="close-modal-background-target"></div>
-  <div class="modal modal-small draggable">
-    <div class="modal-content">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Close</span>
-  </span>
-</button>
-
-      <div class="modal-header">
-        <h3 class="modal-title">Your lists</h3>
-      </div>
-      <div class="modal-body">
-        <div class="list-membership-content"></div>
-        <span class="spinner lists-spinner" title="Loading&hellip;"></span>
-      </div>
-    </div>
-  </div>
-</div>
-  <div id="list-operations-dialog" class="modal-container">
-  <div class="close-modal-background-target"></div>
-  <div class="modal modal-medium draggable">
-    <div class="modal-content">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Close</span>
-  </span>
-</button>
-
-      <div class="modal-header">
-        <h3 class="modal-title">Create a new list</h3>
-      </div>
-      <div class="modal-body">
-
-<div class="list-editor">
-  <div class="field">
-    <label class="t1-label" for="list-name">List name</label>
-    <input id="list-name" type="text" class="text" name="name" value="" />
-  </div>
-  <hr/>
-
-  <div class="field">
-    <label class="t1-label" for="list-description">Description</label>
-    <textarea id="list-description" name="description"></textarea>
-    <span class="help-text">Under 100 characters, optional</span>
-  </div>
-  <hr/>
-
-  <fieldset class="field">
-    <legend class="t1-legend">Privacy</legend>
-    <div class="options">
-      <label class="t1-label" for="list-public-radio">
-        <input class="radio" type="radio" name="mode" id="list-public-radio" value="public" checked="checked"  />
-        <b>Public</b> &middot; Anyone can follow this list
-      </label>
-      <label class="t1-label" for="list-private-radio">
-        <input class="radio" type="radio" name="mode" id="list-private-radio" value="private"  />
-        <b>Private</b> &middot; Only you can access this list
-      </label>
-    </div>
-  </fieldset>
-  <hr/>
-
-  <div class="list-editor-save">
-    <button type="button" class="btn btn-primary update-list-button" data-list-id="">Save list</button>
-  </div>
-
-</div>
-
-      </div>
-    </div>
-  </div>
-</div>
-
-<div id="activity-popup-dialog" class="modal-container">
-  <div class="close-modal-background-target"></div>
-  <div class="modal draggable">
-    <div class="modal-content clearfix">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Close</span>
-  </span>
-</button>
-
-
-      <div class="modal-header">
-        <h3 class="modal-title"></h3>
-      </div>
-
-      <div class="modal-body">
-        <div class="reply-users-header">
-  Your reply includes the people in this conversation up to this point. <a href="https://support.twitter.com/articles/14023">Learn more</a>
-</div>
-
-        <div class="tweet-loading">
-  <div class="spinner-bigger"></div>
-</div>
-
-        <div class="activity-tweet modal-tweet clearfix"></div>
-        <div class="loading">
-          <span class="spinner-bigger"></span>
-        </div>
-        <div class="activity-content clearfix"></div>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-
-
-<div id="copy-link-to-tweet-dialog" class="modal-container">
-  <div class="close-modal-background-target"></div>
-  <div class="modal modal-medium draggable">
-    <div class="modal-content">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Close</span>
-  </span>
-</button>
-
-      <div class="modal-header">
-        <h3 class="modal-title">Copy link to Tweet</h3>
-      </div>
-      <div class="modal-body">
-        <div class="copy-link-to-tweet-container">
-          <label class="t1-label">
-            <p class="copy-link-to-tweet-instructions">The URL of this tweet is below. Copy it to easily share with friends.</p>
-            <textarea class="link-to-tweet-destination js-initial-focus u-dir" dir="ltr" readonly></textarea>
-          </label>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div id="embed-tweet-dialog" class="modal-container">
-  <div class="close-modal-background-target"></div>
-  <div class="modal modal-medium draggable">
-    <div class="modal-content">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Close</span>
-  </span>
-</button>
-
-      <div class="modal-header">
-        <h3 class="modal-title embed-tweet-title">Embed this Tweet</h3>
-        <h3 class="modal-title embed-video-title">Embed this Video</h3>
-      </div>
-      <div class="modal-body">
-        <div class="embed-code-container">
-  <p class="embed-tweet-instructions">Add this Tweet to your website by copying the code below. <a href="//dev.twitter.com/docs/embedded-tweets">Learn more</a></p>
-  <p class="embed-video-instructions">Add this video to your website by copying the code below. <a href="//dev.twitter.com/docs/embedded-tweets">Learn more</a></p>
-  <form class="t1-form">
-
-    <div class="embed-destination-wrapper">
-      <div class="embed-overlay embed-overlay-spinner"><div class="embed-overlay-content"></div></div>
-      <div class="embed-overlay embed-overlay-error">
-        <p class="embed-overlay-content">Hmm, there was a problem reaching the server. <button type="button" class="btn-link retry-embed">Try again?</button></p>
-      </div>
-      <textarea class="embed-destination js-initial-focus"></textarea>
-      <div class="embed-options">
-        <div class="embed-include-parent-tweet">
-          <label class="t1-label" for="include-parent-tweet">
-            <input type="checkbox" id="include-parent-tweet" class="include-parent-tweet" checked>
-            Include parent Tweet
-          </label>
-        </div>
-        <div class="embed-include-card">
-          <label class="t1-label" for="include-card">
-            <input type="checkbox" id="include-card" class="include-card" checked>
-            Include media
-          </label>
-        </div>
-      </div>
-    </div>
-  </form>
-  <div class="embed-preview">
-    <h3>Preview</h3>
-  </div>
-</div>
-
-      </div>
-    </div>
-  </div>
-</div>
-
-
-
-  <div id="login-dialog" class="LoginDialog modal-container u-textCenter">
-  <div class="close-modal-background-target"></div>
-  <div class="modal modal-large draggable">
-    <div class="LoginDialog-content modal-content">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Close</span>
-  </span>
-</button>
-
-      <div class="modal-header">
-        <h3 class="modal-title">Log in to Twitter</h3>
-      </div>
-      <div class="LoginDialog-body modal-body">
-        <div class="LoginDialog-bird">
-          <span class="Icon Icon--bird Icon--large"></span>
-        </div>
-        <div class="LoginDialog-form">
-<form action="https://twitter.com/sessions" class="LoginForm js-front-signin" method="post"
-  data-component="dialog"
-  data-element="login"
->
-  <div class="LoginForm-input LoginForm-username">
-    <input
-      type="text"
-      class="text-input email-input js-signin-email"
-      name="session[username_or_email]"
-      autocomplete="username"
-      placeholder="Phone, email or username"
-    />
-  </div>
-
-  <div class="LoginForm-input LoginForm-password">
-    <input type="password" class="text-input" name="session[password]" placeholder="Password" autocomplete="current-password">
-  </div>
-
-  <div class="LoginForm-rememberForgot">
-    <label>
-      <input type="checkbox" value="1" name="remember_me" checked="checked">
-      <span>Remember me</span>
-    </label>
-    <span class="separator">&middot;</span>
-    <a class="forgot" href="/account/begin_password_reset">Forgot password?</a>
-  </div>
-
-  <input type="submit" class="submit btn primary-btn js-submit" value="Log in">
-
-    <input type="hidden" name="return_to_ssl" value="true">
-
-  <input type="hidden" name="scribe_log">
-  <input type="hidden" name="redirect_after_login" value="/vyki_e/status/363116819147538433">
-  <input type="hidden" value="0ca3d94aff5192efa7e34ae4eae60d07f5babd38" name="authenticity_token">
-</form>
-        </div>
-      </div>
-      <div class="LoginDialog-footer modal-footer u-textCenter">
-        Don't have an account? <a class="LoginDialog-signupLink" href="https://twitter.com/signup">Sign up &raquo;</a>
-      </div>
-    </div>
-  </div>
-</div>
-
-  <div id="signup-dialog" class="SignupDialog modal-container u-textCenter">
-  <div class="close-modal-background-target"></div>
-  <div class="modal modal-large draggable">
-    <div class="SignupDialog-content modal-content">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Close</span>
-  </span>
-</button>
-
-      <div class="modal-header">
-        <h3 class="modal-title">Sign up for Twitter</h3>
-      </div>
-      <div class="SignupDialog-body modal-body">
-        <div class="SignupDialog-icon">
-          <span class="Icon Icon--bird Icon--extraLarge"></span>
-        </div>
-        <h2 class="SignupDialog-heading">Not on Twitter? Sign up, tune into the things you care about, and get updates as they happen.</h2>
-        <div class="SignupDialog-form">
-  <div class="signup SignupForm
-    ">
-    <a href="https://twitter.com/signup" role="button" class="SignupForm-submit u-block u-textCenter js-signup btn primary-btn"
-    data-component="dialog"
-    data-element="signup"
-    >Sign up</a>
-  </div>
-        </div>
-      </div>
-      <div class="SignupDialog-footer modal-footer u-textCenter">
-        Have an account? <a class="SignupDialog-signinLink" href="/login">Log in &raquo;</a>
-      </div>
-    </div>
-  </div>
-</div>
-
-  <div id="sms-codes-dialog" class="modal-container">
-  <div class="close-modal-background-target"></div>
-  <div class="modal modal-medium draggable">
-    <div class="modal-content">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Close</span>
-  </span>
-</button>
-
-      <div class="modal-header">
-        <h3 class="modal-title">Two-way (sending and receiving) short codes:</h3>
-      </div>
-      <div class="modal-body">
-
-<table id="sms_codes" cellpadding="0" cellspacing="0">
-  <thead>
-    <tr>
-      <th>Country</th>
-      <th>Code</th>
-      <th>For customers of</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>United States</td>
-      <td>40404</td>
-      <td>(any)</td>
-    </tr>
-    <tr>
-      <td>Canada</td>
-      <td>21212</td>
-      <td>(any)</td>
-    </tr>
-    <tr>
-      <td>United Kingdom</td>
-      <td>86444</td>
-      <td>Vodafone, Orange, 3, O2</td>
-    </tr>
-    <tr>
-      <td>Brazil</td>
-      <td>40404</td>
-      <td>Nextel, TIM</td>
-    </tr>
-    <tr>
-      <td>Haiti</td>
-      <td>40404</td>
-      <td>Digicel, Voila</td>
-    </tr>
-    <tr>
-      <td>Ireland</td>
-      <td>51210</td>
-      <td>Vodafone, O2</td>
-    </tr>
-    <tr>
-      <td>India</td>
-      <td>53000</td>
-      <td>Bharti Airtel, Videocon, Reliance</td>
-    </tr>
-    <tr>
-      <td>Indonesia</td>
-      <td>89887</td>
-      <td>AXIS, 3, Telkomsel, Indosat, XL Axiata</td>
-    </tr>
-    <tr>
-      <td rowspan="2">Italy</td>
-      <td>4880804</td>
-      <td>Wind</td>
-    </tr>
-    <tr>
-      <td>3424486444</td>
-      <td>Vodafone</td>
-    </tr>
-  </tbody>
-  <tfoot>
-    <tr>
-      <td colspan="3">
-        &raquo; <a class="js-initial-focus" target="_blank" href="http://support.twitter.com/articles/14226-how-to-find-your-twitter-short-code-or-long-code">See SMS short codes for other countries</a>
-      </td>
-    </tr>
-  </tfoot>
-</table>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div id="leadgen-confirm-dialog" class="modal-container">
-  <div class="close-modal-background-target"></div>
-  <div class="modal draggable">
-    <div class="modal-content">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Close</span>
-  </span>
-</button>
-
-      <div class="modal-header">
-        <h3 class="modal-title">Confirmation</h3>
-      </div>
-      <div class="modal-body">
-        <div class="leadgen-card-container">
-          <div class="media">
-            <iframe
-              class="cards2-promotion-iframe"
-              scrolling="no"
-              frameborder="0"
-              src="">
-            </iframe>
-          </div>
-        </div>
-        <div class="js-macaw-cards-iframe-container" data-card-name="promotion">
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div id="auth-webview-dialog" class="AuthWebViewDialog modal-container">
-  <div class="close-modal-background-target"></div>
-  <div class="modal draggable">
-    <div class="modal-content">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--large">
-    <span class="visuallyhidden">Close</span>
-  </span>
-</button>
-
-      <div class="modal-header">
-        <h3 class="modal-title">&nbsp;</h3>
-      </div>
-      <div class="modal-body">
-        <div class="auth-webview-view-container">
-          <div class="media">
-            <iframe
-              class="auth-webview-card-iframe js-initial-focus"
-              scrolling="no"
-              frameborder="0"
-              width="590px"
-              height="500px"
-              src="">
-            </iframe>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-
-<div id="promptbird-modal-prompt" class="modal-container">
-  <div class="close-modal-background-target"></div>
-  <div class="modal">
-
-    <button type="button" class="modal-btn js-promptDismiss modal-close js-close">
-      <span class="Icon Icon--close Icon--medium">
-        <span class="visuallyhidden">Close</span>
-      </span>
-    </button>
-    <div class="modal-content"></div>
-  </div>
-</div>
-
-
-   <div id="payment-order-detail-dialog" class="PaymentOrderDialog modal-container">
-  <div class="close-modal-background-target"></div>
-  <div class="modal draggable">
-    <div class="modal-content">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--large">
-    <span class="visuallyhidden">Close</span>
-  </span>
-</button>
-
-      <div class="modal-header">
-        <h3 class="modal-title">Buy Now</h3>
-      </div>
-      <div class="modal-body">
-        <div class="alert">
-          <h4>Hmm... Something went wrong. Please try again.</h4>
-        </div>
-        <div class="spinner-bigger"></div>
-        <div class="PaymentOrderDialog-orderDetails"></div>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-
-
-
-
-<div id="create-custom-timeline-dialog" class="modal-container"></div>
-<div id="edit-custom-timeline-dialog" class="modal-container"></div>
-<div id="curate-dialog" class="modal-container"></div>
-<div id="media-edit-dialog" class="modal-container"></div>
-
-
-      <div class="PermalinkOverlay PermalinkOverlay-with-background load-at-boot" id="permalink-overlay">
-  <button class="PermalinkOverlay-next PermalinkOverlay-button u-posFixed js-next" type="button">
-    <span class="Icon Icon--caretLeft Icon--large"></span>
-    <span class="u-hiddenVisually">Next Tweet from user</span>
-  </button>
-  <div class="PermalinkOverlay-modal">
-    <div class="PermalinkOverlay-spinnerContainer u-hidden">
-      <div class="PermalinkOverlay-spinner"></div>
-    </div>
-    <div class="PermalinkOverlay-content">
-      <div class="PermalinkOverlay-body"
-          data-background-path="/vyki_e"
->
-            <div class="permalink-container permalink-container--withArrows">
-  <div class="PermalinkProfile-dismiss">
-    <span class="Icon Icon--close Icon--large"></span>
-  </div>
-
-  <div role="main" class="permalink light-inline-actions  stream-uncapped original-permalink-page">
-
-<div class="TweetArrows">
-    <a href="/vyki_e/status/575780485156077568" class="TweetArrow-previous js-nav">
-      <span class="visuallyhidden">Previous Tweet</span>
-      <span class="Icon Icon--caretLeft"></span>
-    </a>
-</div>
-
-
-
-
-  <div class="permalink-inner permalink-tweet-container">
-
-
-    <div class="tweet permalink-tweet js-actionable-user js-actionable-tweet js-original-tweet
-
-
-
-
-          no-replies
-          js-initial-focus
-"
-        data-associated-tweet-id="363116819147538433"
-
-data-tweet-id="363116819147538433"
-data-item-id="363116819147538433"
-data-permalink-path="/vyki_e/status/363116819147538433"
-
-
-
-
-
-
-
-
-  data-screen-name="vyki_e" data-name="Vyki Englert" data-user-id="1087064150"
-  data-you-follow="false"
-  data-follows-you="false"
-  data-you-block="false"
- data-mentions="peers"
-
-
-
-
-
-
-
-
-data-disclosure-type=""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-        tabindex="0"
-      >
-
-
-        <div class="content clearfix">
-          <div class="permalink-header">
-
-
-
-    <div class="follow-bar">
-      <div class="user-actions btn-group not-following  " data-user-id="1087064150"
-    data-screen-name="vyki_e" data-name="Vyki Englert" data-protected="false">
-
-
-
-
-
-
-  <button class="user-actions-follow-button js-follow-btn follow-button btn" type="button">
-  <span class="button-text follow-text">
-     <span class="Icon Icon--follow"></span> Follow
-
-  </span>
-  <span class="button-text following-text">
-     Following
-
-  </span>
-  <span class="button-text unfollow-text">
-     Unfollow
-
-  </span>
-  <span class="button-text blocked-text">Blocked</span>
-  <span class="button-text unblock-text">Unblock</span>
-  <span class="button-text pending-text">Pending</span>
-  <span class="button-text cancel-text">Cancel</span>
-</button>
-
-
-
-</div>
-
-    </div>
-
-
-              <a  class="account-group js-account-group js-action-profile js-user-profile-link js-nav" href="/vyki_e" data-user-id="1087064150">
-    <img class="avatar js-action-profile-avatar" src="https://pbs.twimg.com/profile_images/732349210264133632/RTNgZLrm_bigger.jpg" alt="">
-    <strong class="fullname js-action-profile-name show-popup-with-id" data-aria-label-part>Vyki Englert</strong>
-    <span>&rlm;</span><span class="username js-action-profile-name" data-aria-label-part><s>@</s><b>vyki_e</b></span>
-
-  </a>
-
-
-            <small class="time">
-  <a href="/vyki_e/status/363116819147538433" class="tweet-timestamp js-permalink js-nav js-tooltip" title="6:59 PM - 1 Aug 2013" ><span class="_timestamp js-short-timestamp " data-aria-label-part="last" data-time="1375408770" data-time-ms="1375408770000" data-long-form="true">1 Aug 2013</span></a>
-</small>
-
-          </div>
-        </div>
-
-
-        <div class="js-tweet-text-container">
-  <p class="TweetTextSize TweetTextSize--26px js-tweet-text tweet-text" lang="en" data-aria-label-part="0">I&#39;m a sucker for pledges.  <a href="/peers" class="twitter-atreply pretty-link js-nav" dir="ltr" data-mentioned-user-id="1428357889" ><s>@</s><b>Peers</b></a> Pledge <a href="/hashtag/sharingeconomy?src=hash" data-query-source="hashtag_click" class="twitter-hashtag pretty-link js-nav" dir="ltr" ><s>#</s><b>sharingeconomy</b></a> <a href="http://t.co/T4Sc47KAzh" rel="nofollow" dir="ltr" data-expanded-url="http://www.peers.org/action/peers-pledgea/" class="twitter-timeline-link" target="_blank" title="http://www.peers.org/action/peers-pledgea/" ><span class="tco-ellipsis"></span><span class="invisible">http://www.</span><span class="js-display-url">peers.org/action/peers-p</span><span class="invisible">ledgea/</span><span class="tco-ellipsis"><span class="invisible">&nbsp;</span>…</span></a></p>
-</div>
-
-
-
-
-
-
-      <div class="js-tweet-details-fixer tweet-details-fixer">
-
-  <div class="js-machine-translated-tweet-container"></div>
-  <div class="js-tweet-stats-container tweet-stats-container">
-  </div>
-
-  <div class="client-and-actions">
-  <span class="metadata">
-    <span>6:59 PM - 1 Aug 2013</span>
-  </span>
-</div>
-
-
-</div>
-
-
-
-      <div class="stream-item-footer">
-
-
-
-
-
-              <div class="ProfileTweet-actionCountList u-hiddenVisually">
-
-    <span class="ProfileTweet-action--reply u-hiddenVisually"></span>
-    <span class="ProfileTweet-action--retweet u-hiddenVisually">
-
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" >0 retweets</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--favorite u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" >0 likes</span>
-      </span>
-    </span>
-  </div>
-
-    <div class="ProfileTweet-actionList js-actions" role="group" aria-label="Tweet actions">
-        <div class="ProfileTweet-action ProfileTweet-action--reply">
-  <button class="ProfileTweet-actionButton u-textUserColorHover js-actionButton js-actionReply"
-    data-modal="ProfileTweet-reply"
-    type="button">
-    <div class="IconContainer js-tooltip" title="Reply">
-      <span class="Icon Icon--reply"></span>
-      <span class="u-hiddenVisually">Reply</span>
-    </div>
-  </button>
-</div>
-        <div class="ProfileTweet-action ProfileTweet-action--retweet js-toggleState js-toggleRt">
-  <button class="ProfileTweet-actionButton  js-actionButton js-actionRetweet"
-
-    data-modal="ProfileTweet-retweet"
-    type="button">
-    <div class="IconContainer js-tooltip" title="Retweet">
-      <span class="Icon Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retweet</span>
-    </div>
-      <div class="IconTextContainer">
-        <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-          <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-        </span>
-      </div>
-  </button><button class="ProfileTweet-actionButtonUndo js-actionButton js-actionRetweet" data-modal="ProfileTweet-retweet" type="button">
-    <div class="IconContainer js-tooltip" title="Undo retweet">
-      <span class="Icon Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retweeted</span>
-    </div>
-      <div class="IconTextContainer">
-        <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-          <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-        </span>
-      </div>
-  </button>
-</div>
-
-      <div class="ProfileTweet-action ProfileTweet-action--favorite js-toggleState">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionFavorite" type="button">
-    <div class="IconContainer js-tooltip" title="Like">
-      <div class="HeartAnimationContainer">
-        <div class="HeartAnimation"></div>
-      </div>
-      <span class="u-hiddenVisually">Like</span>
-    </div>
-      <div class="IconTextContainer">
-        <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-          <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-        </span>
-      </div>
-  </button><button class="ProfileTweet-actionButtonUndo u-linkClean js-actionButton js-actionFavorite" type="button">
-    <div class="IconContainer js-tooltip" title="Undo like">
-      <div class="HeartAnimationContainer">
-        <div class="HeartAnimation"></div>
-      </div>
-      <span class="u-hiddenVisually">Liked</span>
-    </div>
-      <div class="IconTextContainer">
-        <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-          <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-        </span>
-      </div>
-  </button>
-</div>
-
-
-
-
-        <div class="ProfileTweet-action ProfileTweet-action--more js-more-ProfileTweet-actions">
-    <div class="dropdown">
-  <button class="ProfileTweet-actionButton u-textUserColorHover dropdown-toggle js-dropdown-toggle" type="button">
-      <div class="IconContainer js-tooltip" title="More">
-        <span class="Icon Icon--dots"></span>
-        <span class="u-hiddenVisually">More</span>
-      </div>
-  </button>
-  <div class="dropdown-menu">
-  <div class="dropdown-caret">
-    <div class="caret-outer"></div>
-    <div class="caret-inner"></div>
-  </div>
-  <ul>
-
-      <li class="copy-link-to-tweet js-actionCopyLinkToTweet">
-        <button type="button" class="dropdown-link">Copy link to Tweet</button>
-      </li>
-      <li class="embed-link js-actionEmbedTweet" data-nav="embed_tweet">
-        <button type="button" class="dropdown-link">Embed Tweet</button>
-      </li>
-  </ul>
-</div>
-
-</div>
-
-  </div>
-
-    </div>
-
-      </div>
-
-      <div class="permalink-footer">
-
-      </div>
-    </div>
-
-  </div>
-
-
-
-
-<div class="replies-to  hidden permalink-inner permalink-replies" data-component-context="replies">
-    <div class="tweets-wrapper">
-      <div id="descendants" class="ThreadedDescendants">
-          <div class="stream-container  "
-    data-max-position="" data-min-position=""
-    >
-
-    <div class="stream">
-        <ol class="stream-items js-navigable-stream" id="stream-items-id">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-        </ol>
-        <div class="stream-footer ">
-  <div class='timeline-end  '>
-    <div class="stream-end">
-  <div class="stream-end-inner">
-      <span class="Icon Icon--large Icon--logo"></span>
-
-    <p class="empty-text">
-
-
+    .errorButton a:hover,
+    .errorButton a:focus {
+      background: rgb(26, 145, 218);
+    }
+
+    .errorFooter {
+      color: #657786;
+      font-size: 80%;
+      line-height: 1.5;
+      padding: 1em 0;
+    }
+
+    .errorFooter a,
+    .errorFooter a:visited {
+      color: #657786;
+      text-decoration: none;
+      padding-right: 1em;
+    }
+
+    .errorFooter a:hover,
+    .errorFooter a:active {
+      text-decoration: underline;
+    }
+
+      #placeholder,
+      #react-root {
+        display: none !important;
+      }
+      body {
+        background-color: #FFF !important;
+      }
+    </style>
+    <div class="errorContainer">
+      <img width="46" height="38" srcset="https://abs.twimg.com/errors/logo46x38.png 1x, https://abs.twimg.com/errors/logo46x38@2x.png 2x" src="https://abs.twimg.com/errors/logo46x38.png" alt="Twitter">
+      <h1>JavaScript is not available.</h1>
+      <p>We’ve detected that JavaScript is disabled in this browser. Please enable JavaScript or switch to a supported browser to continue using twitter.com. You can see a list of supported browsers in our Help Center.</p>
+      <p class="errorButton"><a href="https://help.twitter.com/using-twitter/twitter-supported-browsers">Help Center</a></p>
+    <p class="errorFooter">
+      <a href="https://twitter.com/tos">Terms of Service</a>
+      <a href="https://twitter.com/privacy">Privacy Policy</a>
+      <a href="https://support.twitter.com/articles/20170514">Cookie Policy</a>
+      <a href="https://legal.twitter.com/imprint.html">Imprint</a>
+      <a href="https://business.twitter.com/en/help/troubleshooting/how-twitter-ads-work.html?ref=web-twc-ao-gbl-adsinfo&amp;utm_source=twc&amp;utm_medium=web&amp;utm_campaign=ao&amp;utm_content=adsinfo">Ads info</a>
+      © 2023 X Corp.
     </p>
 
-          <p><button type='button' class='btn-link back-to-top hidden'>Back to top &uarr;</button></p>
-
-  </div>
-</div>
-
-    <div class="stream-loading">
-  <div class="stream-end-inner">
-    <span class="spinner" title="Loading..."></span>
-  </div>
-</div>
-
-  </div>
-</div>
-<div class="stream-fail-container">
-    <div class="js-stream-whale-end stream-whale-end stream-placeholder centered-placeholder">
-  <div class="stream-end-inner">
-    <h2 class="title">Loading seems to be taking a while.</h2>
-    <p>
-      Twitter may be over capacity or experiencing a momentary hiccup. <a role="button" href="#" class="try-again-after-whale">Try again</a> or visit <a target="_blank" href="http://status.twitter.com">Twitter Status</a> for more information.
-    </p>
-  </div>
-</div>
-</div>
-
-      <ol class="hidden-replies-container"></ol>
-    </div>
-  </div>
-
-      </div>
     </div>
+  </noscript>
+<div id="react-root" style="height:100%;display:flex;"><div class="css-1dbjc4n r-13awgt0 r-12vffkv"><div class="css-1dbjc4n r-13awgt0 r-12vffkv"><div class="css-1dbjc4n r-13qz1uu r-417010" style="min-height:736px">
+<div aria-label="Skip to home timeline" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1niwhzg r-1ets6dv r-sdzlij r-1phboty r-4iw3lz r-1xk2f4g r-109y4c4 r-2yi16 r-1qi8awa r-1ny4l3l r-1udh08x r-wwvuq4 r-u8s1d r-o7ynqc r-6416eg r-lrvibr r-92ng3h"><div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-18u37iz r-16y2uox r-37j5jr r-a023e6 r-b88u0q r-1777fci r-rjixqe r-bcqeeo r-q4m81j r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-a023e6 r-rjixqe r-bcqeeo r-qvutc0"></span></div></div>
+<div aria-label="Skip to trending" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1niwhzg r-1ets6dv r-sdzlij r-1phboty r-4iw3lz r-1xk2f4g r-109y4c4 r-2yi16 r-1qi8awa r-1ny4l3l r-1udh08x r-wwvuq4 r-u8s1d r-o7ynqc r-6416eg r-lrvibr r-92ng3h"><div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-18u37iz r-16y2uox r-37j5jr r-a023e6 r-b88u0q r-1777fci r-rjixqe r-bcqeeo r-q4m81j r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-a023e6 r-rjixqe r-bcqeeo r-qvutc0"></span></div></div>
+<header role="banner" class="css-1dbjc4n r-lrvibr r-1g40b8q"><div class="css-1dbjc4n r-1h3ijdo r-orgf3d r-633pao"></div>
+<div class="css-1dbjc4n" data-testid="SSRSafeLayer"><div class="css-1dbjc4n r-1d2f490 r-1xcajam r-zchlnj r-1gn8etr">
+<div class="css-1dbjc4n r-1e5uvyk r-6026j r-16e0dcy r-dkhcqf r-axxi2z r-18jm5s1" data-testid="TopNavBar"><div class="css-1dbjc4n r-1jgb5lz r-13qz1uu"><div class="css-1dbjc4n r-fxvszc r-136ojw6" data-testid="twitter-logged-out-nav">
+<div class="css-1dbjc4n r-1h3ijdo r-136ojw6"><div class="css-1dbjc4n"><div class="css-1dbjc4n r-1h3ijdo"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1h3ijdo r-1777fci r-1jgb5lz r-ymttw5 r-13qz1uu">
+<div class="css-1dbjc4n r-1habvwh r-1pz39u2 r-1777fci r-15ysp7h r-s8bhmr"><div class="css-1dbjc4n r-1777fci r-1mf7evn"><h1 role="heading" class="css-4rbku5 css-1dbjc4n r-1awozwy r-1pz39u2 r-1loqt21 r-6koalj r-16y2uox r-1777fci r-4wgw6l"><a href="/" aria-label="Twitter" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1niwhzg r-42olwf r-sdzlij r-1phboty r-rs99b7 r-1loqt21 r-2yi16 r-1qi8awa r-1ny4l3l r-o7ynqc r-6416eg r-lrvibr" style="margin-left:calc(0px + (-1 * ((36px + (1px * 2)) - 1.75rem) / 2))"><div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-18u37iz r-16y2uox r-37j5jr r-a023e6 r-b88u0q r-1777fci r-rjixqe r-bcqeeo r-q4m81j r-qvutc0" style="color:rgba(15,20,25,1.00)">
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-1cvl2hr r-4qtqp9 r-yyyyoo r-16y2uox r-lwhw9o r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-19wmn03"><g><path d="M23.643 4.937c-.835.37-1.732.62-2.675.733.962-.576 1.7-1.49 2.048-2.578-.9.534-1.897.922-2.958 1.13-.85-.904-2.06-1.47-3.4-1.47-2.572 0-4.658 2.086-4.658 4.66 0 .364.042.718.12 1.06-3.873-.195-7.304-2.05-9.602-4.868-.4.69-.63 1.49-.63 2.342 0 1.616.823 3.043 2.072 3.878-.764-.025-1.482-.234-2.11-.583v.06c0 2.257 1.605 4.14 3.737 4.568-.392.106-.803.162-1.227.162-.3 0-.593-.028-.877-.082.593 1.85 2.313 3.198 4.352 3.234-1.595 1.25-3.604 1.995-5.786 1.995-.376 0-.747-.022-1.112-.065 2.062 1.323 4.51 2.093 7.14 2.093 8.57 0 13.255-7.098 13.255-13.254 0-.2-.005-.402-.014-.602.91-.658 1.7-1.477 2.323-2.41z"></path></g></svg><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-a023e6 r-rjixqe r-bcqeeo r-qvutc0"></span>
+</div></a></h1></div></div>
+<div class="css-1dbjc4n r-16y2uox r-1wbh5a2 r-1pi2tsx r-1777fci">
+<div class="css-1dbjc4n r-1habvwh"></div>
+<div class="css-1dbjc4n r-1awozwy r-1iusvr4 r-18u37iz r-16y2uox"><div class="css-1dbjc4n r-1oszu61 r-1iusvr4 r-18u37iz r-16y2uox"><div class="css-1dbjc4n r-13awgt0 r-eqz5dr r-bnwqim r-8fdsdq"><div class="r-1oszu61 r-vqxq0j r-deolkf r-6koalj r-1mlwlqe r-eqz5dr r-1wbh5a2 r-crgep1 r-ifefl9 r-bcqeeo r-t60dpp r-bnwqim r-13qz1uu r-417010"><form action="#" aria-label="Search Twitter" role="search" class="r-1oszu61 r-1phboty r-1yadl64 r-deolkf r-6koalj r-13awgt0 r-eqz5dr r-crgep1 r-ifefl9 r-bcqeeo r-t60dpp r-bnwqim r-417010">
+<div class="css-1dbjc4n r-1wbh5a2"><div class="css-1dbjc4n r-1sw30gj r-42olwf r-sdzlij r-1phboty r-rs99b7 r-eqz5dr r-16y2uox r-1wbh5a2 r-1777fci"><div class="css-1dbjc4n"><div class="css-1dbjc4n r-1awozwy r-18u37iz"><label class="css-1dbjc4n r-1dqbpge r-13awgt0 r-18u37iz" data-testid="SearchBox_Search_Input_label"><div class="css-1dbjc4n r-7q8q6z r-6koalj r-1777fci"><svg viewbox="0 0 24 24" aria-hidden="true" class="r-14j79pv r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-4wgw6l r-f727ji r-bnwqim r-1plcrui r-lrvibr"><g><path d="M10.25 3.75c-3.59 0-6.5 2.91-6.5 6.5s2.91 6.5 6.5 6.5c1.795 0 3.419-.726 4.596-1.904 1.178-1.177 1.904-2.801 1.904-4.596 0-3.59-2.91-6.5-6.5-6.5zm-8.5 6.5c0-4.694 3.806-8.5 8.5-8.5s8.5 3.806 8.5 8.5c0 1.986-.682 3.815-1.824 5.262l4.781 4.781-1.414 1.414-4.781-4.781c-1.447 1.142-3.276 1.824-5.262 1.824-4.694 0-8.5-3.806-8.5-8.5z"></path></g></svg></div>
+<div class="css-1dbjc4n r-16y2uox r-1wbh5a2"><div dir="ltr" class="css-901oao r-6koalj r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><input type="text" aria-activedescendant="typeaheadFocus-0.006247190900518174" aria-autocomplete="list" aria-label="Search query" aria-owns="typeaheadDropdown-78518" autocapitalize="sentences" autocomplete="off" autocorrect="off" placeholder="Search Twitter" role="combobox" spellcheck="false" value="" enterkeyhint="search" dir="auto" class="r-30o5oe r-1niwhzg r-17gur6a r-1yadl64 r-deolkf r-homxoj r-poiln3 r-7cikom r-1ny4l3l r-xyw6el r-oyd9sg r-y0fyvk r-1dz5y72 r-fdjqy7 r-13qz1uu" data-testid="SearchBox_Search_Input"></div></div>
+<div class="css-1dbjc4n r-6koalj r-1777fci"></div></label></div></div></div></div>
+<div class="css-1dbjc4n r-13awgt0 r-bnwqim"></div>
+</form></div></div></div></div>
 </div>
-
-
-
-
-  </div>
-
-
-  <div class="stream-container suggested-tweet-stream-container dismissible-container ">
-    <div class="stream suggested-tweet-stream permalink-replies">
-      <h3 class="promoted-heading">Promoted Tweet</h3>
-      <ol class="stream-items suggested-tweet-stream-items js-navigable-stream" id="suggested-stream-items-id">
-
-
-
-
-
-  <div class="tweet js-stream-tweet js-actionable-tweet js-profile-popup-actionable
-       original-tweet js-original-tweet
-
-       promoted-tweet pixel-promoted-tweet has-cards  has-content
-"
-
-data-tweet-id="708322579254267906"
-data-item-id="708322579254267906"
-data-permalink-path="/EnquetesOnline/status/708322579254267906"
-
-
-
-
-
-
-
-
-  data-screen-name="EnquetesOnline" data-name="EnqueteVergelijk" data-user-id="3832036337"
-  data-you-follow="false"
-  data-follows-you="false"
-  data-you-block="false"
-
-
-
-
-
-
-
-
-data-impression-id="2d21a58718bcb645"
-data-disclosure-type="promoted"
-  data-promoted="true"
-   data-advertiser-id="3832036337"
- data-impression-cookie="[&quot;708322579254267906&quot;,&quot;2d21a58718bcb645&quot;,&quot;promoted&quot;,&quot;&quot;,[],&quot;3832036337&quot;]"
-
-
-
- data-has-cards="true"
-
-
-
-
-
-
-
-
- data-component-context="conversation-suggestions"
-
-
-    >
-
-
-    <div class="context">
-
-
-    </div>
-
-    <div class="content">
-
-
-
-      <div class="stream-item-header">
-          <a data-impression-cookie="[&quot;3832036337&quot;,&quot;2d21a58718bcb645&quot;,&quot;promoted&quot;,&quot;&quot;,[],&quot;3832036337&quot;]" class="account-group js-account-group js-action-profile js-user-profile-link js-nav" href="/EnquetesOnline" data-user-id="3832036337">
-    <img class="avatar js-action-profile-avatar" src="https://pbs.twimg.com/profile_images/682161235798929409/WrtoYroK_bigger.png" alt="">
-    <strong class="fullname js-action-profile-name show-popup-with-id" data-aria-label-part>EnqueteVergelijk</strong>
-    <span>&rlm;</span><span class="username js-action-profile-name" data-aria-label-part><s>@</s><b>EnquetesOnline</b></span>
-
-  </a>
-
-        <small class="time">
-  <a href="/EnquetesOnline/status/708322579254267906" class="tweet-timestamp js-permalink js-nav js-tooltip" title="8:03 AM - 11 Mar 2016" data-send-impression-cookie><span class="_timestamp js-short-timestamp " data-aria-label-part="last" data-time="1457712237" data-time-ms="1457712237000" data-long-form="true">Mar 11</span></a>
-</small>
-
-
-
-      </div>
-
-
-        <div class="js-tweet-text-container">
-  <p class="TweetTextSize  js-tweet-text tweet-text" lang="nl" data-aria-label-part="0">Extra geld nodig voor komend weekeinde? Verdien tot €75 extra per week met betaalde enquêtes <a href="https://t.co/7URysZPCIG" rel="nofollow" dir="ltr" data-expanded-url="http://bit.ly/1T2Fhr3" class="twitter-timeline-link" target="_blank" title="http://bit.ly/1T2Fhr3" ><span class="tco-ellipsis"></span><span class="invisible">http://</span><span class="js-display-url">bit.ly/1T2Fhr3</span><span class="invisible"></span><span class="tco-ellipsis"><span class="invisible">&nbsp;</span></span></a><a href="https://t.co/fKtcerUzWC" class="twitter-timeline-link u-hidden" data-pre-embedded="true" dir="ltr" >pic.twitter.com/fKtcerUzWC</a></p>
+<div class="css-1dbjc4n r-obd0qt r-1pz39u2 r-1777fci r-15ysp7h r-s8bhmr"><div aria-expanded="false" aria-haspopup="menu" aria-label="More" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1niwhzg r-42olwf r-sdzlij r-1phboty r-rs99b7 r-2yi16 r-1qi8awa r-1ny4l3l r-o7ynqc r-6416eg r-lrvibr" style="margin-right:calc(4px + (-1 * ((36px + (1px * 2)) - 20px) / 2))"><div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-18u37iz r-16y2uox r-37j5jr r-a023e6 r-b88u0q r-1777fci r-rjixqe r-bcqeeo r-q4m81j r-qvutc0" style="color:rgba(15,20,25,1.00)">
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-z80fyv r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-19wmn03" style="color:rgba(15,20,25,1.00)"><g><path d="M3 12c0-1.1.9-2 2-2s2 .9 2 2-.9 2-2 2-2-.9-2-2zm9 2c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm7 0c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2z"></path></g></svg><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-a023e6 r-rjixqe r-bcqeeo r-qvutc0" style="border-bottom:2px solid #0F1419"></span>
+</div></div></div>
+</div></div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-16y2uox r-1w6e6rj r-1h3ijdo r-1wtj0ep r-1fz3rvf r-rjfia"><div class="css-1dbjc4n r-1awozwy r-1pz39u2 r-18u37iz r-16y2uox"><div class="css-1dbjc4n r-1awozwy r-1pz39u2 r-18u37iz r-16y2uox">
+<div class="css-1dbjc4n r-16y2uox"><a href="/login" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1niwhzg r-1ets6dv r-sdzlij r-1phboty r-rs99b7 r-1loqt21 r-15ysp7h r-4wgw6l r-1ny4l3l r-ymttw5 r-o7ynqc r-6416eg r-lrvibr" data-testid="login"><div dir="ltr" class="css-901oao r-1awozwy r-1cvl2hr r-6koalj r-18u37iz r-16y2uox r-37j5jr r-a023e6 r-b88u0q r-1777fci r-rjixqe r-bcqeeo r-q4m81j r-qvutc0"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-1b43r93 r-1cwl3u0 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Log in</span></span></div></a></div>
+<div class="css-1dbjc4n r-16y2uox r-19u6a5r"><a href="/i/flow/signup" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-l5o3uw r-42olwf r-sdzlij r-1phboty r-rs99b7 r-1loqt21 r-15ysp7h r-4wgw6l r-1ny4l3l r-ymttw5 r-o7ynqc r-6416eg r-lrvibr" data-testid="signup"><div dir="ltr" class="css-901oao r-1awozwy r-jwli3a r-6koalj r-18u37iz r-16y2uox r-37j5jr r-a023e6 r-b88u0q r-1777fci r-rjixqe r-bcqeeo r-q4m81j r-qvutc0"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-1b43r93 r-1cwl3u0 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Sign up</span></span></div></a></div>
+</div></div></div>
+</div></div></div>
+<div class="css-1dbjc4n r-633pao r-u8s1d r-dkhcqf r-axxi2z r-18jm5s1 r-13qz1uu r-1wyyakw" style="-webkit-transform:translate3d(0, 0, 0) translateY(53px);transform:translate3d(0, 0, 0) translateY(53px)"><div class="css-1dbjc4n r-1jgb5lz r-13qz1uu"><div class="css-1dbjc4n r-1awozwy r-1777fci r-1jgb5lz r-19u6a5r r-13qz1uu"><div role="status" class="css-1dbjc4n r-1r5su4o r-orgf3d r-1lul07w r-eafdt9 r-1b8bd59 r-nx0j10"><div aria-label="New Tweets are available. Push the period key to go to the them." role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-l5o3uw r-sdzlij r-y3da5r r-1777fci r-1ny4l3l r-ymttw5 r-oyd9sg r-o7ynqc r-6416eg"><div class="css-1dbjc4n r-18u37iz">
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-1kihuf0 r-jwli3a r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-19wmn03"><g><path d="M12 3.59l7.457 7.45-1.414 1.42L13 7.41V21h-2V7.41l-5.043 5.05-1.414-1.42L12 3.59z"></path></g></svg><div dir="ltr" class="css-901oao css-1hf3ou5 r-1kihuf0 r-jwli3a r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-13hce6t r-bcqeeo r-qvutc0" data-testid="pillLabel"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">See new Tweets</span></div>
+</div></div></div></div></div></div>
+</div></div></header><main role="main" class="css-1dbjc4n r-16y2uox r-1wbh5a2"><div class="css-1dbjc4n r-150rngu r-16y2uox r-1wbh5a2"><div class="css-1dbjc4n r-aqfbo4 r-16y2uox"><div class="css-1dbjc4n r-1oszu61 r-1niwhzg r-18u37iz r-16y2uox r-1jgb5lz r-2llsf r-13qz1uu"><div class="css-1dbjc4n r-14lw9ot r-42olwf r-1ljd8xs r-13l2t4g r-1phboty r-16y2uox r-1jgb5lz r-13qz1uu r-184en5c" data-testid="primaryColumn"><div aria-label="Home timeline" tabindex="0" class="css-1dbjc4n"><div itemscope="" itemtype="https://schema.org/Collection">
+<meta content="Tweet with replies" itemprop="name">
+<section aria-labelledby="accessible-list-35179" role="region" class="css-1dbjc4n"><h1 dir="auto" aria-level="1" role="heading" class="css-4rbku5 css-901oao r-4iw3lz r-1xk2f4g r-109y4c4 r-1udh08x r-wwvuq4 r-u8s1d r-92ng3h" id="accessible-list-35179">Conversation</h1>
+<div aria-label="Timeline: Conversation" class="css-1dbjc4n"><div class="css-1dbjc4n">
+<div class="css-1dbjc4n r-j5o65s r-qklmqi r-1adg3ll r-1ny4l3l"><div itemprop="hasPart" itemscope="" itemtype="https://schema.org/SocialMediaPosting">
+<meta content="1625192182859632661" itemprop="identifier">
+<meta content="1" itemprop="position">
+<meta content="2734" itemprop="commentCount">
+<meta content="" itemprop="contentRating">
+<meta content="2023-02-13T17:56:25.000Z" itemprop="dateCreated">
+<meta content="2023-02-13T17:56:25.000Z" itemprop="datePublished">
+<meta content="https://twitter.com/MKBHD/status/1625192182859632661" itemprop="url">
+<meta content="https://twitter.com/MKBHD/status/1625192182859632661" itemprop="mainEntityOfPage">
+<div itemprop="author" itemscope="" itemtype="https://schema.org/Person">
+<meta content="29873662" itemprop="identifier">
+<meta content="MKBHD" itemprop="additionalName">
+<meta content="Marques Brownlee" itemprop="givenName">
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/FollowAction" itemprop="interactionType">
+<meta content="Likes" itemprop="name">
+<meta content="6099227" itemprop="userInteractionCount">
 </div>
-
-
-
-
-
-            <div class="AdaptiveMedia
-      allow-expansion
-
-
-      is-generic-video
-
-      has-autoplayable-media"
-    >
-    <div class="AdaptiveMedia-container
-        js-adaptive-media-container
-        "
-      >
-        <div class="AdaptiveMedia-video">
-  <div class="AdaptiveMedia-videoContainer">
-      <div class="PlayableMedia PlayableMedia--gif">
-
-  <div
-    class="PlayableMedia-player
-
-      "
-    data-playable-media-url=""
-      data-border-top-left-radius=""
-      data-border-top-right-radius=""
-      data-border-bottom-left-radius=""
-      data-border-bottom-right-radius=""
-    style="padding-bottom: 49.80237154150198%; background-image:url('https://pbs.twimg.com/tweet_video_thumb/CdR3k4RWoAEPONJ.jpg')">
-  </div>
-
-
-
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/SubscribeAction" itemprop="interactionType">
+<meta content="Retweets" itemprop="name">
+<meta content="455" itemprop="userInteractionCount">
 </div>
-
-  </div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/LikeAction" itemprop="interactionType">
+<meta content="Quotes" itemprop="name">
+<meta content="54252" itemprop="userInteractionCount">
 </div>
-
-    </div>
-  </div>
-
-
-
-
-
-
-
-      <div class="stream-item-footer">
-
-        <div class="ProfileTweet-actionCountList u-hiddenVisually">
-
-    <span class="ProfileTweet-action--reply u-hiddenVisually"></span>
-    <span class="ProfileTweet-action--retweet u-hiddenVisually">
-
-      <span class="ProfileTweet-actionCount"  data-tweet-stat-count="59">
-        <span class="ProfileTweet-actionCountForAria" data-aria-label-part>59 retweets</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--favorite u-hiddenVisually">
-      <span class="ProfileTweet-actionCount"  data-tweet-stat-count="334">
-        <span class="ProfileTweet-actionCountForAria" data-aria-label-part>334 likes</span>
-      </span>
-    </span>
-  </div>
-
-    <div class="ProfileTweet-actionList js-actions" role="group" aria-label="Tweet actions">
-        <div class="ProfileTweet-action ProfileTweet-action--reply">
-  <button class="ProfileTweet-actionButton u-textUserColorHover js-actionButton js-actionReply"
-    data-modal="ProfileTweet-reply"
-    type="button">
-    <div class="IconContainer js-tooltip" title="Reply">
-      <span class="Icon Icon--reply"></span>
-      <span class="u-hiddenVisually">Reply</span>
-    </div>
-  </button>
 </div>
-        <div class="ProfileTweet-action ProfileTweet-action--retweet js-toggleState js-toggleRt">
-  <button class="ProfileTweet-actionButton  js-actionButton js-actionRetweet"
-
-    data-modal="ProfileTweet-retweet"
-    type="button">
-    <div class="IconContainer js-tooltip" title="Retweet">
-      <span class="Icon Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retweet</span>
-    </div>
-      <div class="IconTextContainer">
-        <span class="ProfileTweet-actionCount">
-          <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">59</span>
-        </span>
-      </div>
-  </button><button class="ProfileTweet-actionButtonUndo js-actionButton js-actionRetweet" data-modal="ProfileTweet-retweet" type="button">
-    <div class="IconContainer js-tooltip" title="Undo retweet">
-      <span class="Icon Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retweeted</span>
-    </div>
-      <div class="IconTextContainer">
-        <span class="ProfileTweet-actionCount">
-          <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">59</span>
-        </span>
-      </div>
-  </button>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/LikeAction" itemprop="interactionType">
+<meta content="Likes" itemprop="name">
+<meta content="https://twitter.com/MKBHD/status/1625192182859632661/likes" itemprop="url">
+<meta content="46756" itemprop="userInteractionCount">
 </div>
-
-      <div class="ProfileTweet-action ProfileTweet-action--favorite js-toggleState">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionFavorite" type="button">
-    <div class="IconContainer js-tooltip" title="Like">
-      <div class="HeartAnimationContainer">
-        <div class="HeartAnimation"></div>
-      </div>
-      <span class="u-hiddenVisually">Like</span>
-    </div>
-      <div class="IconTextContainer">
-        <span class="ProfileTweet-actionCount">
-          <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">334</span>
-        </span>
-      </div>
-  </button><button class="ProfileTweet-actionButtonUndo u-linkClean js-actionButton js-actionFavorite" type="button">
-    <div class="IconContainer js-tooltip" title="Undo like">
-      <div class="HeartAnimationContainer">
-        <div class="HeartAnimation"></div>
-      </div>
-      <span class="u-hiddenVisually">Liked</span>
-    </div>
-      <div class="IconTextContainer">
-        <span class="ProfileTweet-actionCount">
-          <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">334</span>
-        </span>
-      </div>
-  </button>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Retweets" itemprop="name">
+<meta content="https://twitter.com/MKBHD/status/1625192182859632661/retweets" itemprop="url">
+<meta content="1460" itemprop="userInteractionCount">
 </div>
-
-
-
-
-        <div class="ProfileTweet-action ProfileTweet-action--more js-more-ProfileTweet-actions">
-    <div class="dropdown">
-  <button class="ProfileTweet-actionButton u-textUserColorHover dropdown-toggle js-dropdown-toggle" type="button">
-      <div class="IconContainer js-tooltip" title="More">
-        <span class="Icon Icon--dots"></span>
-        <span class="u-hiddenVisually">More</span>
-      </div>
-  </button>
-  <div class="dropdown-menu">
-  <div class="dropdown-caret">
-    <div class="caret-outer"></div>
-    <div class="caret-inner"></div>
-  </div>
-  <ul>
-
-      <li class="copy-link-to-tweet js-actionCopyLinkToTweet">
-        <button type="button" class="dropdown-link">Copy link to Tweet</button>
-      </li>
-      <li class="embed-link js-actionEmbedTweet" data-nav="embed_tweet">
-        <button type="button" class="dropdown-link">Embed Tweet</button>
-      </li>
-        <li class="ads-info-link js-actionOpenAdsInfoPage">
-          <button type="button" class="dropdown-link">Ads info</button>
-        </li>
-  </ul>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Quotes" itemprop="name">
+<meta content="https://twitter.com/MKBHD/status/1625192182859632661/retweets/with_comments" itemprop="url">
+<meta content="477" itemprop="userInteractionCount">
 </div>
-
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Replies" itemprop="name">
+<meta content="https://twitter.com/MKBHD/status/1625192182859632661" itemprop="url">
+<meta content="2734" itemprop="userInteractionCount">
 </div>
-
-  </div>
-
-    </div>
-
+<article aria-labelledby="id__w6erc4o3qb id__fyd1mhw8odq id__if1m3ijjejf id__f5amgd75ty id__bk3ru05nxq8 id__mdnukndkzq id__81ysxx9s95t id__i0vicyjkv2 id__4p0o3fcjr0b id__yl750m0dn8p id__jsfx3z75t4c id__rrm0096lkr id__gmw003czpn id__xtpjxxhecqf id__meugdhu0np id__f14cqbblq3c id__loq8wyezy9m id__ednkh7miqj8 id__iou8irloszm" role="article" tabindex="-1" class="css-1dbjc4n r-18u37iz r-1ny4l3l r-1udh08x r-1qhn6m8 r-i023vh" data-testid="tweet"><div class="css-1dbjc4n r-eqz5dr r-16y2uox r-1wbh5a2"><div class="css-1dbjc4n r-16y2uox r-1wbh5a2 r-1ny4l3l">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-18u37iz"><div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-ttdzmv"></div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-15zivkp">
+<div class="css-1dbjc4n r-1awozwy r-1hwvwag r-18kxxzh r-1b7u577"><div class="css-1dbjc4n" data-testid="Tweet-User-Avatar"><div class="css-1dbjc4n r-18kxxzh r-1wbh5a2 r-13qz1uu"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1adg3ll r-h3s6tt r-bztko3" style="width:48px" data-testid="UserAvatar-Container-MKBHD">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-1adg3ll r-1pi2tsx r-1wyvozj r-bztko3 r-u8s1d r-1v2oles r-desppf r-13qz1uu">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-ggadg3 r-1udh08x r-u8s1d r-8jfcpp" style="height:calc(100% - -4px);width:calc(100% - -4px)"><a href="/MKBHD" aria-hidden="true" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1niwhzg r-1loqt21 r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1niwhzg r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-14lw9ot r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-14lw9ot r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1adg3ll r-1udh08x" style="background-color:rgba(185,202,211,1.00)">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/profile_images/1468001914302390278/B_Xv_8gu_400x400.jpg")'></div>
+<img alt="" draggable="true" src="https://pbs.twimg.com/profile_images/1468001914302390278/B_Xv_8gu_400x400.jpg" class="css-9pa8cd">
+</div></div>
+</div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-12181gd r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"></div></div></a></div></div>
+</div></div>
+</div></div></div></div></div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-1777fci"><div class="css-1dbjc4n r-zl2h9q"><div class="css-1dbjc4n r-k4xj1c r-18u37iz r-1wtj0ep"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs r-1ny4l3l" id="id__bk3ru05nxq8" data-testid="User-Name">
+<div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/MKBHD" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs">
+<div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-37j5jr r-a023e6 r-b88u0q r-rjixqe r-bcqeeo r-1udh08x r-3s2u2q r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Marques Brownlee</span></span></div>
+<div dir="ltr" class="css-901oao r-xoduu5 r-18u37iz r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 r-1awozwy r-xoduu5 r-poiln3 r-bcqeeo r-qvutc0"><svg viewbox="0 0 22 22" aria-label="Verified account" role="img" class="r-1cvl2hr r-4qtqp9 r-yyyyoo r-1xvli5t r-9cviqr r-f9ja8p r-og9te1 r-bnwqim r-1plcrui r-lrvibr" data-testid="icon-verified"><g><path d="M20.396 11c-.018-.646-.215-1.275-.57-1.816-.354-.54-.852-.972-1.438-1.246.223-.607.27-1.264.14-1.897-.131-.634-.437-1.218-.882-1.687-.47-.445-1.053-.75-1.687-.882-.633-.13-1.29-.083-1.897.14-.273-.587-.704-1.086-1.245-1.44S11.647 1.62 11 1.604c-.646.017-1.273.213-1.813.568s-.969.854-1.24 1.44c-.608-.223-1.267-.272-1.902-.14-.635.13-1.22.436-1.69.882-.445.47-.749 1.055-.878 1.688-.13.633-.08 1.29.144 1.896-.587.274-1.087.705-1.443 1.245-.356.54-.555 1.17-.574 1.817.02.647.218 1.276.574 1.817.356.54.856.972 1.443 1.245-.224.606-.274 1.263-.144 1.896.13.634.433 1.218.877 1.688.47.443 1.054.747 1.687.878.633.132 1.29.084 1.897-.136.274.586.705 1.084 1.246 1.439.54.354 1.17.551 1.816.569.647-.016 1.276-.213 1.817-.567s.972-.854 1.245-1.44c.604.239 1.266.296 1.903.164.636-.132 1.22-.447 1.68-.907.46-.46.776-1.044.908-1.681s.075-1.299-.165-1.903c.586-.274 1.084-.705 1.439-1.246.354-.54.551-1.17.569-1.816zM9.662 14.85l-3.429-3.428 1.293-1.302 2.072 2.072 4.4-4.794 1.347 1.246z"></path></g></svg></span></div>
+</div></a></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1wbh5a2"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/MKBHD" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div dir="ltr" class="css-901oao css-1hf3ou5 r-14j79pv r-18u37iz r-37j5jr r-1wvb978 r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">@MKBHD</span></div></a></div></div></div>
+</div></div></div></div></div></div>
 </div>
-
-      <div class="context">
-  <span class="metadata with-icn js-disclosure js-tooltip" title="">
-      <span class="Icon Icon--promoted"></span>
-<a href="/EnquetesOnline"
-   class="js-action-profile-promoted js-user-profile-link js-promoted-badge"
-   data-user-id="3832036337"
-   data-impression-cookie="[&quot;708322579254267906&quot;,&quot;2d21a58718bcb645&quot;,&quot;promoted&quot;,&quot;&quot;,[],&quot;3832036337&quot;]"
->Promoted</a>
-
-  </span>
-
-      <button type="button" class="btn-link dismiss-btn js-action-dismiss">
-        <span class="Icon Icon--close Icon--smallest"></span>
-        <span>Dismiss</span>
-      </button>
+<div class="css-1dbjc4n">
+<div class="css-1dbjc4n r-1habvwh"></div>
+<div class="css-1dbjc4n"><div itemprop="articleBody" data-testid="tweetTextAnnotations"><div class="css-1dbjc4n r-1s2bzr4"><div dir="auto" lang="en" class="css-901oao r-37j5jr r-1inkyih r-16dba41 r-rjixqe r-bcqeeo r-bnwqim r-qvutc0" style="color:rgba(15,20,25,1.00)" id="id__jsfx3z75t4c" data-testid="tweetText"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">I've never played Minecraft</span></div></div></div></div>
+<div class="css-1dbjc4n"></div>
+<div class="css-1dbjc4n"></div>
+<div class="css-1dbjc4n r-1r5su4o"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wtj0ep">
+<div class="css-1dbjc4n r-1b7u577"><div class="css-1dbjc4n r-1d09ksm r-1471scf r-18u37iz r-1wbh5a2">
+<div dir="ltr" class="css-901oao r-14j79pv r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0"><a href="/MKBHD/status/1625192182859632661" aria-describedby="id__aa01qsl1mhd" aria-label="5:56 PM · Feb 13, 2023" role="link" class="css-4rbku5 css-18t94o4 css-901oao css-16my406 r-14j79pv r-1loqt21 r-xoduu5 r-1q142lx r-1w6e6rj r-poiln3 r-9aw3ui r-bcqeeo r-3s2u2q r-qvutc0"><time datetime="2023-02-13T17:56:25.000Z">5:56 PM · Feb 13, 2023</time></a></div>
+<div dir="ltr" aria-hidden="true" class="css-901oao r-14j79pv r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-s1qlax r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">·</span></div>
+<div dir="ltr" class="css-901oao r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0"><div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-1b43r93 r-b88u0q r-1cwl3u0 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">4M</span></span></span></div> <span class="css-901oao css-16my406 r-14j79pv r-poiln3 r-1b43r93 r-1cwl3u0 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Views</span></span></span></div>
+</div></div>
+<div class="css-1dbjc4n r-18u37iz"></div>
+</div></div>
+<div role="group" class="css-1dbjc4n r-18u37iz r-1w6e6rj">
+<div role="separator" class="css-1dbjc4n r-1dgieki r-1efd50x r-5kkj8d r-109y4c4 r-13qz1uu"></div>
+<div class="css-1dbjc4n r-1mf7evn r-1yzf0co"><a href="/MKBHD/status/1625192182859632661/retweets" dir="ltr" role="link" class="css-4rbku5 css-18t94o4 css-901oao r-1loqt21 r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-1b43r93 r-b88u0q r-1cwl3u0 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">1,460</span></span></span></div> <span class="css-901oao css-16my406 r-14j79pv r-poiln3 r-1b43r93 r-1cwl3u0 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Retweets</span></span></a></div>
+<div class="css-1dbjc4n r-1mf7evn r-1yzf0co"><a href="/MKBHD/status/1625192182859632661/retweets/with_comments" dir="ltr" role="link" class="css-4rbku5 css-18t94o4 css-901oao r-1loqt21 r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-1b43r93 r-b88u0q r-1cwl3u0 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">477</span></span></span></div> <span class="css-901oao css-16my406 r-14j79pv r-poiln3 r-1b43r93 r-1cwl3u0 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Quotes</span></span></a></div>
+<div class="css-1dbjc4n r-1mf7evn r-1yzf0co"><a href="/MKBHD/status/1625192182859632661/likes" dir="ltr" role="link" class="css-4rbku5 css-18t94o4 css-901oao r-1loqt21 r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-1b43r93 r-b88u0q r-1cwl3u0 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">46.7K</span></span></span></div> <span class="css-901oao css-16my406 r-14j79pv r-poiln3 r-1b43r93 r-1cwl3u0 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Likes</span></span></a></div>
+<div class="css-1dbjc4n r-1mf7evn r-1yzf0co"><div dir="ltr" class="css-901oao r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)">
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-1b43r93 r-b88u0q r-1cwl3u0 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">168</span></span></span></div> <span class="css-901oao css-16my406 r-14j79pv r-poiln3 r-1b43r93 r-1cwl3u0 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Bookmarks</span></span>
+</div></div>
 </div>
-
-
-
-
-
-
-
-
-    </div>
-  </div>
-
-
-      </ol>
-    </div>
-   </div>
-
-    <div class="Trends module trends hidden
-            Trends--wide
-            ">
-  <div class="trends-inner">
-    <div class="flex-module trends-container ">
-  <div class="flex-module-header">
-
-    <h3><span class="trend-location js-trend-location">false</span></h3>
-  </div>
-  <div class="flex-module-inner">
-    <ul class="trend-items js-trends">
-    </ul>
-  </div>
+<div class="css-1dbjc4n"><div role="group" class="css-1dbjc4n r-1oszu61 r-j5o65s r-rull8r r-qklmqi r-1dgieki r-1efd50x r-5kkj8d r-1ta3fxp r-18u37iz r-h3s6tt r-a2tzq0 r-3qxfft r-s1qlax" id="id__iou8irloszm">
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="Reply" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="reply"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-50lct3 r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1srniue"><g><path d="M1.751 10c0-4.42 3.584-8 8.005-8h4.366c4.49 0 8.129 3.64 8.129 8.13 0 2.96-1.607 5.68-4.196 7.11l-8.054 4.46v-3.69h-.067c-4.49.1-8.183-3.51-8.183-8.01zm8.005-6c-3.317 0-6.005 2.69-6.005 6 0 3.37 2.77 6.08 6.138 6.01l.351-.01h1.761v2.3l5.087-2.81c1.951-1.08 3.163-3.13 3.163-5.36 0-3.39-2.744-6.13-6.129-6.13H9.756z"></path></g></svg>
+</div></div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="Retweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="retweet"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-50lct3 r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1srniue"><g><path d="M4.5 3.88l4.432 4.14-1.364 1.46L5.5 7.55V16c0 1.1.896 2 2 2H13v2H7.5c-2.209 0-4-1.79-4-4V7.55L1.432 9.48.068 8.02 4.5 3.88zM16.5 6H11V4h5.5c2.209 0 4 1.79 4 4v8.45l2.068-1.93 1.364 1.46-4.432 4.14-4.432-4.14 1.364-1.46 2.068 1.93V8c0-1.1-.896-2-2-2z"></path></g></svg>
+</div></div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="Like" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="like"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-50lct3 r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1srniue"><g><path d="M16.697 5.5c-1.222-.06-2.679.51-3.89 2.16l-.805 1.09-.806-1.09C9.984 6.01 8.526 5.44 7.304 5.5c-1.243.07-2.349.78-2.91 1.91-.552 1.12-.633 2.78.479 4.82 1.074 1.97 3.257 4.27 7.129 6.61 3.87-2.34 6.052-4.64 7.126-6.61 1.111-2.04 1.03-3.7.477-4.82-.561-1.13-1.666-1.84-2.908-1.91zm4.187 7.69c-1.351 2.48-4.001 5.12-8.379 7.67l-.503.3-.504-.3c-4.379-2.55-7.029-5.19-8.382-7.67-1.36-2.5-1.41-4.86-.514-6.67.887-1.79 2.647-2.91 4.601-3.01 1.651-.09 3.368.56 4.798 2.01 1.429-1.45 3.146-2.1 4.796-2.01 1.954.1 3.714 1.22 4.601 3.01.896 1.81.846 4.17-.514 6.67z"></path></g></svg>
+</div></div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="Bookmark" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="bookmark"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-50lct3 r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1srniue"><g><path d="M4 4.5C4 3.12 5.119 2 6.5 2h11C18.881 2 20 3.12 20 4.5v18.44l-8-5.71-8 5.71V4.5zM6.5 4c-.276 0-.5.22-.5.5v14.56l6-4.29 6 4.29V4.5c0-.28-.224-.5-.5-.5h-11z"></path></g></svg>
+</div></div></div></div>
+<div class="css-1dbjc4n" style="display:inline-grid;-webkit-justify-content:inherit;justify-content:inherit;-webkit-transform:rotate(0deg) scale(1) translate3d(0, 0, 0);transform:rotate(0deg) scale(1) translate3d(0, 0, 0);-ms-flex-pack:inherit;-webkit-box-pack:inherit"><div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="Share Tweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-50lct3 r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1srniue"><g><path d="M12 2.59l5.7 5.7-1.41 1.42L13 6.41V16h-2V6.41l-3.3 3.3-1.41-1.42L12 2.59zM21 15l-.02 3.51c0 1.38-1.12 2.49-2.5 2.49H5.5C4.11 21 3 19.88 3 18.5V15h2v3.5c0 .28.22.5.5.5h12.98c.28 0 .5-.22.5-.5L19 15h2z"></path></g></svg>
+</div></div></div></div></div>
+</div></div>
 </div>
-  </div>
+</div></div></article>
+</div></div>
+<div class="css-1dbjc4n r-1adg3ll r-1ny4l3l"></div>
+<div class="css-1dbjc4n r-1adg3ll r-1ny4l3l"><div itemprop="hasPart" itemscope="" itemtype="https://schema.org/SocialMediaPosting">
+<meta content="1625209637837611008" itemprop="identifier">
+<meta content="2" itemprop="position">
+<meta content="64" itemprop="commentCount">
+<meta content="" itemprop="contentRating">
+<meta content="2023-02-13T19:05:47.000Z" itemprop="dateCreated">
+<meta content="2023-02-13T19:05:47.000Z" itemprop="datePublished">
+<meta content="https://twitter.com/Quackity/status/1625209637837611008" itemprop="url">
+<div itemprop="author" itemscope="" itemtype="https://schema.org/Person">
+<meta content="2260704146" itemprop="identifier">
+<meta content="Quackity" itemprop="additionalName">
+<meta content="Quackity 🪷" itemprop="givenName">
+<meta content="QUACKITY MERCH" itemprop="disambiguatingDescription">
 </div>
-
-
-  <div class="permalink-footer">
-      <div class="Footer module roaming-module
-            Footer--slim
-            ">
-  <div class="flex-module">
-    <div class="flex-module-inner js-items-container">
-      <ul class="u-cf">
-        <li class="Footer-item Footer-copyright copyright">&copy; 2016 Twitter</li>
-        <li class="Footer-item"><a class="Footer-link" href="/about">About</a></li>
-        <li class="Footer-item"><a class="Footer-link" href="//support.twitter.com">Help</a></li>
-        <li class="Footer-item"><a class="Footer-link" href="/tos">Terms</a></li>
-        <li class="Footer-item"><a class="Footer-link" href="/privacy">Privacy</a></li>
-        <li class="Footer-item"><a class="Footer-link" href="//support.twitter.com/articles/20170514">Cookies</a></li>
-        <li class="Footer-item"><a class="Footer-link" href="//support.twitter.com/articles/20170451">Ads info</a></li>
-      </ul>
-    </div>
-  </div>
+<meta content="https://twitter.com/MKBHD/status/1625192182859632661" itemprop="isPartOf">
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/LikeAction" itemprop="interactionType">
+<meta content="Likes" itemprop="name">
+<meta content="https://twitter.com/Quackity/status/1625209637837611008/likes" itemprop="url">
+<meta content="24438" itemprop="userInteractionCount">
 </div>
-
-  </div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Retweets" itemprop="name">
+<meta content="https://twitter.com/Quackity/status/1625209637837611008/retweets" itemprop="url">
+<meta content="405" itemprop="userInteractionCount">
 </div>
-
-
-      </div>
-    </div>
-  </div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Quotes" itemprop="name">
+<meta content="https://twitter.com/Quackity/status/1625209637837611008/retweets/with_comments" itemprop="url">
+<meta content="12" itemprop="userInteractionCount">
 </div>
-
-    <div class="hidden" id="hidden-content">
-  <iframe aria-hidden="true" class="tweet-post-iframe" name="tweet-post-iframe"></iframe>
-  <iframe aria-hidden="true" class="dm-post-iframe" name="dm-post-iframe"></iframe>
-
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Replies" itemprop="name">
+<meta content="https://twitter.com/Quackity/status/1625209637837611008" itemprop="url">
+<meta content="64" itemprop="userInteractionCount">
 </div>
-
-
-    <div id="spoonbill-outer"></div>
-  </body>
-</html>
-
+<article aria-labelledby="id__2mbzlvh4hd4 id__oxll8cknjy id__g16xu6t3ogq id__gy3scbv69va id__k9w29kn7wc id__f6nkt5684jd id__i274mimsvsr id__2hwitsnavfe id__bi5rmtaz5yp id__kv0w1cu7vb id__gwsfc2ctnz8 id__b5powkgtfa9 id__94f3506sh8o id__p1olhzydb1 id__24gujc7bnkw id__r8swkh4yf1f id__o3ttysy37zf id__sha9s5ijyuc id__xq8xoch4t2o" role="article" tabindex="-1" class="css-1dbjc4n r-18u37iz r-1ut4w64 r-1ny4l3l r-1udh08x r-1qhn6m8 r-i023vh" data-testid="tweet"><div class="css-1dbjc4n r-eqz5dr r-16y2uox r-1wbh5a2"><div class="css-1dbjc4n r-16y2uox r-1wbh5a2 r-1ny4l3l">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-18u37iz"><div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-ttdzmv"></div></div></div>
+<div class="css-1dbjc4n r-18u37iz">
+<div class="css-1dbjc4n r-1awozwy r-1hwvwag r-18kxxzh r-1b7u577">
+<div class="css-1dbjc4n" data-testid="Tweet-User-Avatar"><div class="css-1dbjc4n r-18kxxzh r-1wbh5a2 r-13qz1uu"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1adg3ll r-h3s6tt r-bztko3" style="width:48px" data-testid="UserAvatar-Container-Quackity">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-1adg3ll r-1pi2tsx r-1wyvozj r-bztko3 r-u8s1d r-1v2oles r-desppf r-13qz1uu">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-ggadg3 r-1udh08x r-u8s1d r-8jfcpp" style="height:calc(100% - -4px);width:calc(100% - -4px)"><a href="/Quackity" aria-hidden="true" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1niwhzg r-1loqt21 r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1niwhzg r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-14lw9ot r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-14lw9ot r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1adg3ll r-1udh08x" style="background-color:rgba(185,202,211,1.00)">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/profile_images/1207501693799284738/x44HzZe5_400x400.jpg")'></div>
+<img alt="" draggable="true" src="https://pbs.twimg.com/profile_images/1207501693799284738/x44HzZe5_400x400.jpg" class="css-9pa8cd">
+</div></div>
+</div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-12181gd r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"></div></div></a></div></div>
+</div></div>
+</div></div></div></div>
+<div class="css-1dbjc4n r-1bimlpy r-16y2uox r-1jgb5lz r-14gqq1x r-m5arl1"></div>
+</div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-1777fci r-kzbkwu">
+<div class="css-1dbjc4n r-zl2h9q">
+<div class="css-1dbjc4n r-k4xj1c r-18u37iz r-1wtj0ep"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs r-1ny4l3l" id="id__k9w29kn7wc" data-testid="User-Name">
+<div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/Quackity" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs">
+<div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-37j5jr r-a023e6 r-b88u0q r-rjixqe r-bcqeeo r-1udh08x r-3s2u2q r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Quackity </span><img alt="🪷" draggable="false" src="https://abs-0.twimg.com/emoji/v2/svg/1fab7.svg" class="r-4qtqp9 r-dflpy8 r-sjv1od r-zw8f10 r-10akycc r-h9hxbl"></span></div>
+<div dir="ltr" class="css-901oao r-xoduu5 r-18u37iz r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 r-1awozwy r-xoduu5 r-poiln3 r-bcqeeo r-qvutc0"><svg viewbox="0 0 22 22" aria-label="Verified account" role="img" class="r-1cvl2hr r-4qtqp9 r-yyyyoo r-1xvli5t r-9cviqr r-f9ja8p r-og9te1 r-bnwqim r-1plcrui r-lrvibr" data-testid="icon-verified"><g><path d="M20.396 11c-.018-.646-.215-1.275-.57-1.816-.354-.54-.852-.972-1.438-1.246.223-.607.27-1.264.14-1.897-.131-.634-.437-1.218-.882-1.687-.47-.445-1.053-.75-1.687-.882-.633-.13-1.29-.083-1.897.14-.273-.587-.704-1.086-1.245-1.44S11.647 1.62 11 1.604c-.646.017-1.273.213-1.813.568s-.969.854-1.24 1.44c-.608-.223-1.267-.272-1.902-.14-.635.13-1.22.436-1.69.882-.445.47-.749 1.055-.878 1.688-.13.633-.08 1.29.144 1.896-.587.274-1.087.705-1.443 1.245-.356.54-.555 1.17-.574 1.817.02.647.218 1.276.574 1.817.356.54.856.972 1.443 1.245-.224.606-.274 1.263-.144 1.896.13.634.433 1.218.877 1.688.47.443 1.054.747 1.687.878.633.132 1.29.084 1.897-.136.274.586.705 1.084 1.246 1.439.54.354 1.17.551 1.816.569.647-.016 1.276-.213 1.817-.567s.972-.854 1.245-1.44c.604.239 1.266.296 1.903.164.636-.132 1.22-.447 1.68-.907.46-.46.776-1.044.908-1.681s.075-1.299-.165-1.903c.586-.274 1.084-.705 1.439-1.246.354-.54.551-1.17.569-1.816zM9.662 14.85l-3.429-3.428 1.293-1.302 2.072 2.072 4.4-4.794 1.347 1.246z"></path></g></svg><div tabindex="0" class="css-1dbjc4n r-1loqt21 r-xoduu5 r-1777fci r-13hce6t r-a5pmau r-1ny4l3l"><div class="css-1dbjc4n r-4qtqp9 r-p3p4p0 r-hm2b0w r-bnwqim" style="height:calc(1.25em*0.85);width:calc(1.25em*0.85)"><div class="css-1dbjc4n r-1adg3ll r-1udh08x">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-6koalj r-1mlwlqe r-1pi2tsx r-1udh08x r-13qz1uu r-417010" style="border-top-left-radius:2px;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:2px">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-xoduu5 r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/profile_images/1630800273018068992/kJwADgJJ_bigger.jpg")'></div>
+<img alt="" draggable="false" src="https://pbs.twimg.com/profile_images/1630800273018068992/kJwADgJJ_bigger.jpg" class="css-9pa8cd">
+</div></div>
+</div></div></div></span></div>
+</div></a></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1wbh5a2 r-13hce6t"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2">
+<div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/Quackity" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div dir="ltr" class="css-901oao css-1hf3ou5 r-14j79pv r-18u37iz r-37j5jr r-1wvb978 r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">@Quackity</span></div></a></div>
+<div dir="ltr" aria-hidden="true" class="css-901oao r-14j79pv r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-s1qlax r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">·</span></div>
+<div class="css-1dbjc4n r-18u37iz r-1q142lx"><a href="/Quackity/status/1625209637837611008" dir="ltr" aria-label="Feb 13" role="link" class="css-4rbku5 css-18t94o4 css-901oao r-14j79pv r-1loqt21 r-xoduu5 r-1q142lx r-1w6e6rj r-37j5jr r-a023e6 r-16dba41 r-9aw3ui r-rjixqe r-bcqeeo r-3s2u2q r-qvutc0"><time datetime="2023-02-13T19:05:47.000Z">Feb 13</time></a></div>
+</div></div>
+</div></div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1wtj0ep r-zl2h9q"></div>
+</div>
+<div itemprop="articleBody" data-testid="tweetTextAnnotations"><div class="css-1dbjc4n"><div dir="auto" lang="en" class="css-901oao r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-bnwqim r-qvutc0" style="color:rgba(15,20,25,1.00)" id="id__gwsfc2ctnz8" data-testid="tweetText"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Marques Brownlee i Can teach u How</span></div></div></div>
+<div class="css-1dbjc4n"><div aria-label="64 replies, 417 Retweets, 24438 likes" role="group" class="css-1dbjc4n r-1ta3fxp r-18u37iz r-1wtj0ep r-1s2bzr4 r-1mdbhws" id="id__xq8xoch4t2o">
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="64 Replies. Reply" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="reply"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M1.751 10c0-4.42 3.584-8 8.005-8h4.366c4.49 0 8.129 3.64 8.129 8.13 0 2.96-1.607 5.68-4.196 7.11l-8.054 4.46v-3.69h-.067c-4.49.1-8.183-3.51-8.183-8.01zm8.005-6c-3.317 0-6.005 2.69-6.005 6 0 3.37 2.77 6.08 6.138 6.01l.351-.01h1.761v2.3l5.087-2.81c1.951-1.08 3.163-3.13 3.163-5.36 0-3.39-2.744-6.13-6.129-6.13H9.756z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">64</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="417 Retweets. Retweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="retweet"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M4.5 3.88l4.432 4.14-1.364 1.46L5.5 7.55V16c0 1.1.896 2 2 2H13v2H7.5c-2.209 0-4-1.79-4-4V7.55L1.432 9.48.068 8.02 4.5 3.88zM16.5 6H11V4h5.5c2.209 0 4 1.79 4 4v8.45l2.068-1.93 1.364 1.46-4.432 4.14-4.432-4.14 1.364-1.46 2.068 1.93V8c0-1.1-.896-2-2-2z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">417</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="24438 Likes. Like" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="like"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M16.697 5.5c-1.222-.06-2.679.51-3.89 2.16l-.805 1.09-.806-1.09C9.984 6.01 8.526 5.44 7.304 5.5c-1.243.07-2.349.78-2.91 1.91-.552 1.12-.633 2.78.479 4.82 1.074 1.97 3.257 4.27 7.129 6.61 3.87-2.34 6.052-4.64 7.126-6.61 1.111-2.04 1.03-3.7.477-4.82-.561-1.13-1.666-1.84-2.908-1.91zm4.187 7.69c-1.351 2.48-4.001 5.12-8.379 7.67l-.503.3-.504-.3c-4.379-2.55-7.029-5.19-8.382-7.67-1.36-2.5-1.41-4.86-.514-6.67.887-1.79 2.647-2.91 4.601-3.01 1.651-.09 3.368.56 4.798 2.01 1.429-1.45 3.146-2.1 4.796-2.01 1.954.1 3.714 1.22 4.601 3.01.896 1.81.846 4.17-.514 6.67z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">24.4K</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n" style="display:inline-grid;-webkit-justify-content:inherit;justify-content:inherit;-webkit-transform:rotate(0deg) scale(1) translate3d(0, 0, 0);transform:rotate(0deg) scale(1) translate3d(0, 0, 0);-ms-flex-pack:inherit;-webkit-box-pack:inherit"><div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="Share Tweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M12 2.59l5.7 5.7-1.41 1.42L13 6.41V16h-2V6.41l-3.3 3.3-1.41-1.42L12 2.59zM21 15l-.02 3.51c0 1.38-1.12 2.49-2.5 2.49H5.5C4.11 21 3 19.88 3 18.5V15h2v3.5c0 .28.22.5.5.5h12.98c.28 0 .5-.22.5-.5L19 15h2z"></path></g></svg>
+</div></div></div></div></div>
+</div></div>
+</div>
+</div>
+</div></div></article>
+</div></div>
+<div class="css-1dbjc4n r-1adg3ll r-1ny4l3l"><div itemprop="hasPart" itemscope="" itemtype="https://schema.org/SocialMediaPosting">
+<meta content="1625300146790535170" itemprop="identifier">
+<meta content="3" itemprop="position">
+<meta content="21" itemprop="commentCount">
+<meta content="" itemprop="contentRating">
+<meta content="2023-02-14T01:05:26.000Z" itemprop="dateCreated">
+<meta content="2023-02-14T01:05:26.000Z" itemprop="datePublished">
+<meta content="https://twitter.com/MKBHD/status/1625300146790535170" itemprop="url">
+<div itemprop="author" itemscope="" itemtype="https://schema.org/Person">
+<meta content="29873662" itemprop="identifier">
+<meta content="MKBHD" itemprop="additionalName">
+<meta content="Marques Brownlee" itemprop="givenName">
+</div>
+<meta content="https://twitter.com/Quackity/status/1625209637837611008" itemprop="isPartOf">
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/LikeAction" itemprop="interactionType">
+<meta content="Likes" itemprop="name">
+<meta content="https://twitter.com/MKBHD/status/1625300146790535170/likes" itemprop="url">
+<meta content="2142" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Retweets" itemprop="name">
+<meta content="https://twitter.com/MKBHD/status/1625300146790535170/retweets" itemprop="url">
+<meta content="27" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Quotes" itemprop="name">
+<meta content="https://twitter.com/MKBHD/status/1625300146790535170/retweets/with_comments" itemprop="url">
+<meta content="2" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Replies" itemprop="name">
+<meta content="https://twitter.com/MKBHD/status/1625300146790535170" itemprop="url">
+<meta content="21" itemprop="userInteractionCount">
+</div>
+<article aria-labelledby="id__buxyidni40m id__b5tqtplkqpb id__2dlu0zj2scf id__te2zcbhdp5 id__8v0egotwx4 id__rz8po5s4imo id__a0yx8dxz13e id__2vcdgn555eb id__1zk264oau1ri id__u2ai6exurbj id__s0in3nyc7td id__ac9x6109avr id__jkojo0qu9h id__b9ejkrre3jk id__haqc40842ni id__qz6jqenusn id__oinre35cqb id__6tw5g7qkcm3 id__i8qf3oz2igm" role="article" tabindex="-1" class="css-1dbjc4n r-18u37iz r-1ut4w64 r-1ny4l3l r-1udh08x r-1qhn6m8 r-i023vh" data-testid="tweet"><div class="css-1dbjc4n r-eqz5dr r-16y2uox r-1wbh5a2"><div class="css-1dbjc4n r-16y2uox r-1wbh5a2 r-1ny4l3l">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-18u37iz">
+<div class="css-1dbjc4n r-1hwvwag r-18kxxzh r-15zivkp r-1b7u577"><div class="css-1dbjc4n r-1bimlpy r-1p0dtai r-1d2f490 r-1jgb5lz r-u8s1d r-zchlnj r-ipm5af r-m5arl1"></div></div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-ttdzmv"></div>
+</div></div>
+<div class="css-1dbjc4n r-18u37iz">
+<div class="css-1dbjc4n r-1awozwy r-1hwvwag r-18kxxzh r-1b7u577">
+<div class="css-1dbjc4n" data-testid="Tweet-User-Avatar"><div class="css-1dbjc4n r-18kxxzh r-1wbh5a2 r-13qz1uu"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1adg3ll r-h3s6tt r-bztko3" style="width:48px" data-testid="UserAvatar-Container-MKBHD">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-1adg3ll r-1pi2tsx r-1wyvozj r-bztko3 r-u8s1d r-1v2oles r-desppf r-13qz1uu">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-ggadg3 r-1udh08x r-u8s1d r-8jfcpp" style="height:calc(100% - -4px);width:calc(100% - -4px)"><a href="/MKBHD" aria-hidden="true" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1niwhzg r-1loqt21 r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1niwhzg r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-14lw9ot r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-14lw9ot r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1adg3ll r-1udh08x" style="background-color:rgba(185,202,211,1.00)">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/profile_images/1468001914302390278/B_Xv_8gu_400x400.jpg")'></div>
+<img alt="" draggable="true" src="https://pbs.twimg.com/profile_images/1468001914302390278/B_Xv_8gu_400x400.jpg" class="css-9pa8cd">
+</div></div>
+</div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-12181gd r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"></div></div></a></div></div>
+</div></div>
+</div></div></div></div>
+<div class="css-1dbjc4n r-1bimlpy r-16y2uox r-1jgb5lz r-14gqq1x r-m5arl1"></div>
+</div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-1777fci r-kzbkwu">
+<div class="css-1dbjc4n r-zl2h9q"><div class="css-1dbjc4n r-k4xj1c r-18u37iz r-1wtj0ep"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs r-1ny4l3l" id="id__8v0egotwx4" data-testid="User-Name">
+<div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/MKBHD" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs">
+<div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-37j5jr r-a023e6 r-b88u0q r-rjixqe r-bcqeeo r-1udh08x r-3s2u2q r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Marques Brownlee</span></span></div>
+<div dir="ltr" class="css-901oao r-xoduu5 r-18u37iz r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 r-1awozwy r-xoduu5 r-poiln3 r-bcqeeo r-qvutc0"><svg viewbox="0 0 22 22" aria-label="Verified account" role="img" class="r-1cvl2hr r-4qtqp9 r-yyyyoo r-1xvli5t r-9cviqr r-f9ja8p r-og9te1 r-bnwqim r-1plcrui r-lrvibr" data-testid="icon-verified"><g><path d="M20.396 11c-.018-.646-.215-1.275-.57-1.816-.354-.54-.852-.972-1.438-1.246.223-.607.27-1.264.14-1.897-.131-.634-.437-1.218-.882-1.687-.47-.445-1.053-.75-1.687-.882-.633-.13-1.29-.083-1.897.14-.273-.587-.704-1.086-1.245-1.44S11.647 1.62 11 1.604c-.646.017-1.273.213-1.813.568s-.969.854-1.24 1.44c-.608-.223-1.267-.272-1.902-.14-.635.13-1.22.436-1.69.882-.445.47-.749 1.055-.878 1.688-.13.633-.08 1.29.144 1.896-.587.274-1.087.705-1.443 1.245-.356.54-.555 1.17-.574 1.817.02.647.218 1.276.574 1.817.356.54.856.972 1.443 1.245-.224.606-.274 1.263-.144 1.896.13.634.433 1.218.877 1.688.47.443 1.054.747 1.687.878.633.132 1.29.084 1.897-.136.274.586.705 1.084 1.246 1.439.54.354 1.17.551 1.816.569.647-.016 1.276-.213 1.817-.567s.972-.854 1.245-1.44c.604.239 1.266.296 1.903.164.636-.132 1.22-.447 1.68-.907.46-.46.776-1.044.908-1.681s.075-1.299-.165-1.903c.586-.274 1.084-.705 1.439-1.246.354-.54.551-1.17.569-1.816zM9.662 14.85l-3.429-3.428 1.293-1.302 2.072 2.072 4.4-4.794 1.347 1.246z"></path></g></svg></span></div>
+</div></a></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1wbh5a2 r-13hce6t"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2">
+<div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/MKBHD" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div dir="ltr" class="css-901oao css-1hf3ou5 r-14j79pv r-18u37iz r-37j5jr r-1wvb978 r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">@MKBHD</span></div></a></div>
+<div dir="ltr" aria-hidden="true" class="css-901oao r-14j79pv r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-s1qlax r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">·</span></div>
+<div class="css-1dbjc4n r-18u37iz r-1q142lx"><a href="/MKBHD/status/1625300146790535170" dir="ltr" aria-label="Feb 14" role="link" class="css-4rbku5 css-18t94o4 css-901oao r-14j79pv r-1loqt21 r-xoduu5 r-1q142lx r-1w6e6rj r-37j5jr r-a023e6 r-16dba41 r-9aw3ui r-rjixqe r-bcqeeo r-3s2u2q r-qvutc0"><time datetime="2023-02-14T01:05:26.000Z">Feb 14</time></a></div>
+</div></div>
+</div></div></div></div></div>
+<div itemprop="articleBody" data-testid="tweetTextAnnotations"><div class="css-1dbjc4n"><div dir="auto" lang="en" class="css-901oao r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-bnwqim r-qvutc0" style="color:rgba(15,20,25,1.00)" id="id__s0in3nyc7td" data-testid="tweetText"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">What am I gonna need</span></div></div></div>
+<div class="css-1dbjc4n"><div aria-label="21 replies, 29 Retweets, 2142 likes" role="group" class="css-1dbjc4n r-1ta3fxp r-18u37iz r-1wtj0ep r-1s2bzr4 r-1mdbhws" id="id__i8qf3oz2igm">
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="21 Replies. Reply" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="reply"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M1.751 10c0-4.42 3.584-8 8.005-8h4.366c4.49 0 8.129 3.64 8.129 8.13 0 2.96-1.607 5.68-4.196 7.11l-8.054 4.46v-3.69h-.067c-4.49.1-8.183-3.51-8.183-8.01zm8.005-6c-3.317 0-6.005 2.69-6.005 6 0 3.37 2.77 6.08 6.138 6.01l.351-.01h1.761v2.3l5.087-2.81c1.951-1.08 3.163-3.13 3.163-5.36 0-3.39-2.744-6.13-6.129-6.13H9.756z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">21</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="29 Retweets. Retweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="retweet"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M4.5 3.88l4.432 4.14-1.364 1.46L5.5 7.55V16c0 1.1.896 2 2 2H13v2H7.5c-2.209 0-4-1.79-4-4V7.55L1.432 9.48.068 8.02 4.5 3.88zM16.5 6H11V4h5.5c2.209 0 4 1.79 4 4v8.45l2.068-1.93 1.364 1.46-4.432 4.14-4.432-4.14 1.364-1.46 2.068 1.93V8c0-1.1-.896-2-2-2z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">29</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="2142 Likes. Like" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="like"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M16.697 5.5c-1.222-.06-2.679.51-3.89 2.16l-.805 1.09-.806-1.09C9.984 6.01 8.526 5.44 7.304 5.5c-1.243.07-2.349.78-2.91 1.91-.552 1.12-.633 2.78.479 4.82 1.074 1.97 3.257 4.27 7.129 6.61 3.87-2.34 6.052-4.64 7.126-6.61 1.111-2.04 1.03-3.7.477-4.82-.561-1.13-1.666-1.84-2.908-1.91zm4.187 7.69c-1.351 2.48-4.001 5.12-8.379 7.67l-.503.3-.504-.3c-4.379-2.55-7.029-5.19-8.382-7.67-1.36-2.5-1.41-4.86-.514-6.67.887-1.79 2.647-2.91 4.601-3.01 1.651-.09 3.368.56 4.798 2.01 1.429-1.45 3.146-2.1 4.796-2.01 1.954.1 3.714 1.22 4.601 3.01.896 1.81.846 4.17-.514 6.67z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">2,142</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n" style="display:inline-grid;-webkit-justify-content:inherit;justify-content:inherit;-webkit-transform:rotate(0deg) scale(1) translate3d(0, 0, 0);transform:rotate(0deg) scale(1) translate3d(0, 0, 0);-ms-flex-pack:inherit;-webkit-box-pack:inherit"><div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="Share Tweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M12 2.59l5.7 5.7-1.41 1.42L13 6.41V16h-2V6.41l-3.3 3.3-1.41-1.42L12 2.59zM21 15l-.02 3.51c0 1.38-1.12 2.49-2.5 2.49H5.5C4.11 21 3 19.88 3 18.5V15h2v3.5c0 .28.22.5.5.5h12.98c.28 0 .5-.22.5-.5L19 15h2z"></path></g></svg>
+</div></div></div></div></div>
+</div></div>
+</div>
+</div>
+</div></div></article>
+</div></div>
+<div class="css-1dbjc4n r-j5o65s r-qklmqi r-1adg3ll r-1ny4l3l"><div class="css-1dbjc4n r-1udh08x"><div role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-16y2uox r-19u6a5r r-1ny4l3l r-m2pi6t r-o7ynqc r-6416eg"><div class="css-1dbjc4n r-18u37iz">
+<div class="css-1dbjc4n r-1awozwy r-6koalj r-1hwvwag r-18kxxzh r-1r8g8re r-1b7u577 r-bnwqim"><div class="css-1dbjc4n r-1awozwy r-10ptun7 r-1wtj0ep r-t7s2l5">
+<div class="css-1dbjc4n r-1bimlpy r-1adg3ll r-epq5cr r-m5arl1"></div>
+<div class="css-1dbjc4n r-1bimlpy r-1adg3ll r-epq5cr r-m5arl1"></div>
+<div class="css-1dbjc4n r-1bimlpy r-1adg3ll r-epq5cr r-m5arl1"></div>
+</div></div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox"><div dir="ltr" class="css-901oao r-1cvl2hr r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-5njf8e r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Show replies</span></div></div>
+</div></div></div></div>
+<div class="css-1dbjc4n r-1adg3ll r-1ny4l3l"></div>
+<div class="css-1dbjc4n r-1adg3ll r-1ny4l3l"><div itemprop="hasPart" itemscope="" itemtype="https://schema.org/SocialMediaPosting">
+<meta content="1625261225327181824" itemprop="identifier">
+<meta content="4" itemprop="position">
+<meta content="13" itemprop="commentCount">
+<meta content="" itemprop="contentRating">
+<meta content="2023-02-13T22:30:46.000Z" itemprop="dateCreated">
+<meta content="2023-02-13T22:30:46.000Z" itemprop="datePublished">
+<meta content="https://twitter.com/AnnaCramling/status/1625261225327181824" itemprop="url">
+<div itemprop="author" itemscope="" itemtype="https://schema.org/Person">
+<meta content="1229072922641301508" itemprop="identifier">
+<meta content="AnnaCramling" itemprop="additionalName">
+<meta content="Anna Cramling" itemprop="givenName">
+</div>
+<meta content="https://twitter.com/MKBHD/status/1625192182859632661" itemprop="isPartOf">
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/LikeAction" itemprop="interactionType">
+<meta content="Likes" itemprop="name">
+<meta content="https://twitter.com/AnnaCramling/status/1625261225327181824/likes" itemprop="url">
+<meta content="513" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Retweets" itemprop="name">
+<meta content="https://twitter.com/AnnaCramling/status/1625261225327181824/retweets" itemprop="url">
+<meta content="1" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Quotes" itemprop="name">
+<meta content="https://twitter.com/AnnaCramling/status/1625261225327181824/retweets/with_comments" itemprop="url">
+<meta content="1" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Replies" itemprop="name">
+<meta content="https://twitter.com/AnnaCramling/status/1625261225327181824" itemprop="url">
+<meta content="13" itemprop="userInteractionCount">
+</div>
+<article aria-labelledby="id__snybguy2p8 id__mr2c0m9sibm id__5y1s2ske6s7 id__x72277bdfck id__uncxi19l81o id__gsj01673wog id__f4xztc0uhtj id__zq6qieqo58 id__xh9k0vhf9zs id__zuxxiuwyvpe id__bw5g4h3lbs id__qxoe7furoz id__tk4krwe0ygk id__xy3i2kdfdz id__vkbu1t9nzlg id__r43pk6nwmx id__nhp0ei08kfo id__d98enbitmt id__y305zp4tz7" role="article" tabindex="-1" class="css-1dbjc4n r-18u37iz r-1ut4w64 r-1ny4l3l r-1udh08x r-1qhn6m8 r-i023vh" data-testid="tweet"><div class="css-1dbjc4n r-eqz5dr r-16y2uox r-1wbh5a2"><div class="css-1dbjc4n r-16y2uox r-1wbh5a2 r-1ny4l3l">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-18u37iz"><div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-ttdzmv"></div></div></div>
+<div class="css-1dbjc4n r-18u37iz">
+<div class="css-1dbjc4n r-1awozwy r-1hwvwag r-18kxxzh r-1b7u577">
+<div class="css-1dbjc4n" data-testid="Tweet-User-Avatar"><div class="css-1dbjc4n r-18kxxzh r-1wbh5a2 r-13qz1uu"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1adg3ll r-h3s6tt r-bztko3" style="width:48px" data-testid="UserAvatar-Container-AnnaCramling">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-1adg3ll r-1pi2tsx r-1wyvozj r-bztko3 r-u8s1d r-1v2oles r-desppf r-13qz1uu">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-ggadg3 r-1udh08x r-u8s1d r-8jfcpp" style="height:calc(100% - -4px);width:calc(100% - -4px)"><a href="/AnnaCramling" aria-hidden="true" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1niwhzg r-1loqt21 r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1niwhzg r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-14lw9ot r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-14lw9ot r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1adg3ll r-1udh08x" style="background-color:rgba(185,202,211,1.00)">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/profile_images/1431215929564831749/su2lUm8t_400x400.jpg")'></div>
+<img alt="" draggable="true" src="https://pbs.twimg.com/profile_images/1431215929564831749/su2lUm8t_400x400.jpg" class="css-9pa8cd">
+</div></div>
+</div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-12181gd r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"></div></div></a></div></div>
+</div></div>
+</div></div></div></div>
+<div class="css-1dbjc4n r-1bimlpy r-16y2uox r-1jgb5lz r-14gqq1x r-m5arl1"></div>
+</div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-1777fci r-kzbkwu">
+<div class="css-1dbjc4n r-zl2h9q"><div class="css-1dbjc4n r-k4xj1c r-18u37iz r-1wtj0ep"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs r-1ny4l3l" id="id__uncxi19l81o" data-testid="User-Name">
+<div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/AnnaCramling" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs">
+<div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-37j5jr r-a023e6 r-b88u0q r-rjixqe r-bcqeeo r-1udh08x r-3s2u2q r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Anna Cramling</span></span></div>
+<div dir="ltr" class="css-901oao r-xoduu5 r-18u37iz r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 r-1awozwy r-xoduu5 r-poiln3 r-bcqeeo r-qvutc0"><svg viewbox="0 0 22 22" aria-label="Verified account" role="img" class="r-1cvl2hr r-4qtqp9 r-yyyyoo r-1xvli5t r-9cviqr r-f9ja8p r-og9te1 r-bnwqim r-1plcrui r-lrvibr" data-testid="icon-verified"><g><path d="M20.396 11c-.018-.646-.215-1.275-.57-1.816-.354-.54-.852-.972-1.438-1.246.223-.607.27-1.264.14-1.897-.131-.634-.437-1.218-.882-1.687-.47-.445-1.053-.75-1.687-.882-.633-.13-1.29-.083-1.897.14-.273-.587-.704-1.086-1.245-1.44S11.647 1.62 11 1.604c-.646.017-1.273.213-1.813.568s-.969.854-1.24 1.44c-.608-.223-1.267-.272-1.902-.14-.635.13-1.22.436-1.69.882-.445.47-.749 1.055-.878 1.688-.13.633-.08 1.29.144 1.896-.587.274-1.087.705-1.443 1.245-.356.54-.555 1.17-.574 1.817.02.647.218 1.276.574 1.817.356.54.856.972 1.443 1.245-.224.606-.274 1.263-.144 1.896.13.634.433 1.218.877 1.688.47.443 1.054.747 1.687.878.633.132 1.29.084 1.897-.136.274.586.705 1.084 1.246 1.439.54.354 1.17.551 1.816.569.647-.016 1.276-.213 1.817-.567s.972-.854 1.245-1.44c.604.239 1.266.296 1.903.164.636-.132 1.22-.447 1.68-.907.46-.46.776-1.044.908-1.681s.075-1.299-.165-1.903c.586-.274 1.084-.705 1.439-1.246.354-.54.551-1.17.569-1.816zM9.662 14.85l-3.429-3.428 1.293-1.302 2.072 2.072 4.4-4.794 1.347 1.246z"></path></g></svg></span></div>
+</div></a></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1wbh5a2 r-13hce6t"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2">
+<div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/AnnaCramling" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div dir="ltr" class="css-901oao css-1hf3ou5 r-14j79pv r-18u37iz r-37j5jr r-1wvb978 r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">@AnnaCramling</span></div></a></div>
+<div dir="ltr" aria-hidden="true" class="css-901oao r-14j79pv r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-s1qlax r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">·</span></div>
+<div class="css-1dbjc4n r-18u37iz r-1q142lx"><a href="/AnnaCramling/status/1625261225327181824" dir="ltr" aria-label="Feb 13" role="link" class="css-4rbku5 css-18t94o4 css-901oao r-14j79pv r-1loqt21 r-xoduu5 r-1q142lx r-1w6e6rj r-37j5jr r-a023e6 r-16dba41 r-9aw3ui r-rjixqe r-bcqeeo r-3s2u2q r-qvutc0"><time datetime="2023-02-13T22:30:46.000Z">Feb 13</time></a></div>
+</div></div>
+</div></div></div></div></div>
+<div itemprop="articleBody" data-testid="tweetTextAnnotations"><div class="css-1dbjc4n"><div dir="auto" lang="en" class="css-901oao r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-bnwqim r-qvutc0" style="color:rgba(15,20,25,1.00)" id="id__bw5g4h3lbs" data-testid="tweetText"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Have you played chess?</span></div></div></div>
+<div class="css-1dbjc4n"><div aria-label="13 replies, 2 Retweets, 513 likes" role="group" class="css-1dbjc4n r-1ta3fxp r-18u37iz r-1wtj0ep r-1s2bzr4 r-1mdbhws" id="id__y305zp4tz7">
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="13 Replies. Reply" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="reply"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M1.751 10c0-4.42 3.584-8 8.005-8h4.366c4.49 0 8.129 3.64 8.129 8.13 0 2.96-1.607 5.68-4.196 7.11l-8.054 4.46v-3.69h-.067c-4.49.1-8.183-3.51-8.183-8.01zm8.005-6c-3.317 0-6.005 2.69-6.005 6 0 3.37 2.77 6.08 6.138 6.01l.351-.01h1.761v2.3l5.087-2.81c1.951-1.08 3.163-3.13 3.163-5.36 0-3.39-2.744-6.13-6.129-6.13H9.756z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">13</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="2 Retweets. Retweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="retweet"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M4.5 3.88l4.432 4.14-1.364 1.46L5.5 7.55V16c0 1.1.896 2 2 2H13v2H7.5c-2.209 0-4-1.79-4-4V7.55L1.432 9.48.068 8.02 4.5 3.88zM16.5 6H11V4h5.5c2.209 0 4 1.79 4 4v8.45l2.068-1.93 1.364 1.46-4.432 4.14-4.432-4.14 1.364-1.46 2.068 1.93V8c0-1.1-.896-2-2-2z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">2</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="513 Likes. Like" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="like"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M16.697 5.5c-1.222-.06-2.679.51-3.89 2.16l-.805 1.09-.806-1.09C9.984 6.01 8.526 5.44 7.304 5.5c-1.243.07-2.349.78-2.91 1.91-.552 1.12-.633 2.78.479 4.82 1.074 1.97 3.257 4.27 7.129 6.61 3.87-2.34 6.052-4.64 7.126-6.61 1.111-2.04 1.03-3.7.477-4.82-.561-1.13-1.666-1.84-2.908-1.91zm4.187 7.69c-1.351 2.48-4.001 5.12-8.379 7.67l-.503.3-.504-.3c-4.379-2.55-7.029-5.19-8.382-7.67-1.36-2.5-1.41-4.86-.514-6.67.887-1.79 2.647-2.91 4.601-3.01 1.651-.09 3.368.56 4.798 2.01 1.429-1.45 3.146-2.1 4.796-2.01 1.954.1 3.714 1.22 4.601 3.01.896 1.81.846 4.17-.514 6.67z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">513</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n" style="display:inline-grid;-webkit-justify-content:inherit;justify-content:inherit;-webkit-transform:rotate(0deg) scale(1) translate3d(0, 0, 0);transform:rotate(0deg) scale(1) translate3d(0, 0, 0);-ms-flex-pack:inherit;-webkit-box-pack:inherit"><div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="Share Tweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M12 2.59l5.7 5.7-1.41 1.42L13 6.41V16h-2V6.41l-3.3 3.3-1.41-1.42L12 2.59zM21 15l-.02 3.51c0 1.38-1.12 2.49-2.5 2.49H5.5C4.11 21 3 19.88 3 18.5V15h2v3.5c0 .28.22.5.5.5h12.98c.28 0 .5-.22.5-.5L19 15h2z"></path></g></svg>
+</div></div></div></div></div>
+</div></div>
+</div>
+</div>
+</div></div></article>
+</div></div>
+<div class="css-1dbjc4n r-1adg3ll r-1ny4l3l"><div itemprop="hasPart" itemscope="" itemtype="https://schema.org/SocialMediaPosting">
+<meta content="1625299686067212288" itemprop="identifier">
+<meta content="5" itemprop="position">
+<meta content="6" itemprop="commentCount">
+<meta content="" itemprop="contentRating">
+<meta content="2023-02-14T01:03:36.000Z" itemprop="dateCreated">
+<meta content="2023-02-14T01:03:36.000Z" itemprop="datePublished">
+<meta content="https://twitter.com/MKBHD/status/1625299686067212288" itemprop="url">
+<div itemprop="author" itemscope="" itemtype="https://schema.org/Person">
+<meta content="29873662" itemprop="identifier">
+<meta content="MKBHD" itemprop="additionalName">
+<meta content="Marques Brownlee" itemprop="givenName">
+</div>
+<meta content="https://twitter.com/AnnaCramling/status/1625261225327181824" itemprop="isPartOf">
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/LikeAction" itemprop="interactionType">
+<meta content="Likes" itemprop="name">
+<meta content="https://twitter.com/MKBHD/status/1625299686067212288/likes" itemprop="url">
+<meta content="430" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Retweets" itemprop="name">
+<meta content="https://twitter.com/MKBHD/status/1625299686067212288/retweets" itemprop="url">
+<meta content="2" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Quotes" itemprop="name">
+<meta content="https://twitter.com/MKBHD/status/1625299686067212288/retweets/with_comments" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Replies" itemprop="name">
+<meta content="https://twitter.com/MKBHD/status/1625299686067212288" itemprop="url">
+<meta content="6" itemprop="userInteractionCount">
+</div>
+<article aria-labelledby="id__5ghaodf7j2a id__vg6jvyup679 id__4njmecfnmi id__ydospg3u4w id__g5caa0gxzm id__81moxmw4gzr id__yivfmuar4b id__ljbf7obn8xl id__kw6nev2di id__4ibj8krmqmt id__vrvpj81bn5 id__9hhp7vupa9d id__drapiia4p0h id__ywyb9lf9zhp id__0y9svddk16h id__2tauv1esgo7 id__flzw7hvgjn8 id__0mutszf63it id__sujx2ku3y3" role="article" tabindex="-1" class="css-1dbjc4n r-18u37iz r-1ut4w64 r-1ny4l3l r-1udh08x r-1qhn6m8 r-i023vh" data-testid="tweet"><div class="css-1dbjc4n r-eqz5dr r-16y2uox r-1wbh5a2"><div class="css-1dbjc4n r-16y2uox r-1wbh5a2 r-1ny4l3l">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-18u37iz">
+<div class="css-1dbjc4n r-1hwvwag r-18kxxzh r-15zivkp r-1b7u577"><div class="css-1dbjc4n r-1bimlpy r-1p0dtai r-1d2f490 r-1jgb5lz r-u8s1d r-zchlnj r-ipm5af r-m5arl1"></div></div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-ttdzmv"></div>
+</div></div>
+<div class="css-1dbjc4n r-18u37iz">
+<div class="css-1dbjc4n r-1awozwy r-1hwvwag r-18kxxzh r-1b7u577">
+<div class="css-1dbjc4n" data-testid="Tweet-User-Avatar"><div class="css-1dbjc4n r-18kxxzh r-1wbh5a2 r-13qz1uu"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1adg3ll r-h3s6tt r-bztko3" style="width:48px" data-testid="UserAvatar-Container-MKBHD">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-1adg3ll r-1pi2tsx r-1wyvozj r-bztko3 r-u8s1d r-1v2oles r-desppf r-13qz1uu">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-ggadg3 r-1udh08x r-u8s1d r-8jfcpp" style="height:calc(100% - -4px);width:calc(100% - -4px)"><a href="/MKBHD" aria-hidden="true" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1niwhzg r-1loqt21 r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1niwhzg r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-14lw9ot r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-14lw9ot r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1adg3ll r-1udh08x" style="background-color:rgba(185,202,211,1.00)">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/profile_images/1468001914302390278/B_Xv_8gu_400x400.jpg")'></div>
+<img alt="" draggable="true" src="https://pbs.twimg.com/profile_images/1468001914302390278/B_Xv_8gu_400x400.jpg" class="css-9pa8cd">
+</div></div>
+</div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-12181gd r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"></div></div></a></div></div>
+</div></div>
+</div></div></div></div>
+<div class="css-1dbjc4n r-1bimlpy r-16y2uox r-1jgb5lz r-14gqq1x r-m5arl1"></div>
+</div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-1777fci r-kzbkwu">
+<div class="css-1dbjc4n r-zl2h9q"><div class="css-1dbjc4n r-k4xj1c r-18u37iz r-1wtj0ep"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs r-1ny4l3l" id="id__g5caa0gxzm" data-testid="User-Name">
+<div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/MKBHD" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs">
+<div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-37j5jr r-a023e6 r-b88u0q r-rjixqe r-bcqeeo r-1udh08x r-3s2u2q r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Marques Brownlee</span></span></div>
+<div dir="ltr" class="css-901oao r-xoduu5 r-18u37iz r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 r-1awozwy r-xoduu5 r-poiln3 r-bcqeeo r-qvutc0"><svg viewbox="0 0 22 22" aria-label="Verified account" role="img" class="r-1cvl2hr r-4qtqp9 r-yyyyoo r-1xvli5t r-9cviqr r-f9ja8p r-og9te1 r-bnwqim r-1plcrui r-lrvibr" data-testid="icon-verified"><g><path d="M20.396 11c-.018-.646-.215-1.275-.57-1.816-.354-.54-.852-.972-1.438-1.246.223-.607.27-1.264.14-1.897-.131-.634-.437-1.218-.882-1.687-.47-.445-1.053-.75-1.687-.882-.633-.13-1.29-.083-1.897.14-.273-.587-.704-1.086-1.245-1.44S11.647 1.62 11 1.604c-.646.017-1.273.213-1.813.568s-.969.854-1.24 1.44c-.608-.223-1.267-.272-1.902-.14-.635.13-1.22.436-1.69.882-.445.47-.749 1.055-.878 1.688-.13.633-.08 1.29.144 1.896-.587.274-1.087.705-1.443 1.245-.356.54-.555 1.17-.574 1.817.02.647.218 1.276.574 1.817.356.54.856.972 1.443 1.245-.224.606-.274 1.263-.144 1.896.13.634.433 1.218.877 1.688.47.443 1.054.747 1.687.878.633.132 1.29.084 1.897-.136.274.586.705 1.084 1.246 1.439.54.354 1.17.551 1.816.569.647-.016 1.276-.213 1.817-.567s.972-.854 1.245-1.44c.604.239 1.266.296 1.903.164.636-.132 1.22-.447 1.68-.907.46-.46.776-1.044.908-1.681s.075-1.299-.165-1.903c.586-.274 1.084-.705 1.439-1.246.354-.54.551-1.17.569-1.816zM9.662 14.85l-3.429-3.428 1.293-1.302 2.072 2.072 4.4-4.794 1.347 1.246z"></path></g></svg></span></div>
+</div></a></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1wbh5a2 r-13hce6t"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2">
+<div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/MKBHD" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div dir="ltr" class="css-901oao css-1hf3ou5 r-14j79pv r-18u37iz r-37j5jr r-1wvb978 r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">@MKBHD</span></div></a></div>
+<div dir="ltr" aria-hidden="true" class="css-901oao r-14j79pv r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-s1qlax r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">·</span></div>
+<div class="css-1dbjc4n r-18u37iz r-1q142lx"><a href="/MKBHD/status/1625299686067212288" dir="ltr" aria-label="Feb 14" role="link" class="css-4rbku5 css-18t94o4 css-901oao r-14j79pv r-1loqt21 r-xoduu5 r-1q142lx r-1w6e6rj r-37j5jr r-a023e6 r-16dba41 r-9aw3ui r-rjixqe r-bcqeeo r-3s2u2q r-qvutc0"><time datetime="2023-02-14T01:03:36.000Z">Feb 14</time></a></div>
+</div></div>
+</div></div></div></div></div>
+<div itemprop="articleBody" data-testid="tweetTextAnnotations"><div class="css-1dbjc4n"><div dir="auto" lang="en" class="css-901oao r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-bnwqim r-qvutc0" style="color:rgba(15,20,25,1.00)" id="id__vrvpj81bn5" data-testid="tweetText"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Lil bit</span></div></div></div>
+<div class="css-1dbjc4n"><div aria-label="6 replies, 2 Retweets, 430 likes" role="group" class="css-1dbjc4n r-1ta3fxp r-18u37iz r-1wtj0ep r-1s2bzr4 r-1mdbhws" id="id__sujx2ku3y3">
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="6 Replies. Reply" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="reply"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M1.751 10c0-4.42 3.584-8 8.005-8h4.366c4.49 0 8.129 3.64 8.129 8.13 0 2.96-1.607 5.68-4.196 7.11l-8.054 4.46v-3.69h-.067c-4.49.1-8.183-3.51-8.183-8.01zm8.005-6c-3.317 0-6.005 2.69-6.005 6 0 3.37 2.77 6.08 6.138 6.01l.351-.01h1.761v2.3l5.087-2.81c1.951-1.08 3.163-3.13 3.163-5.36 0-3.39-2.744-6.13-6.129-6.13H9.756z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">6</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="2 Retweets. Retweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="retweet"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M4.5 3.88l4.432 4.14-1.364 1.46L5.5 7.55V16c0 1.1.896 2 2 2H13v2H7.5c-2.209 0-4-1.79-4-4V7.55L1.432 9.48.068 8.02 4.5 3.88zM16.5 6H11V4h5.5c2.209 0 4 1.79 4 4v8.45l2.068-1.93 1.364 1.46-4.432 4.14-4.432-4.14 1.364-1.46 2.068 1.93V8c0-1.1-.896-2-2-2z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">2</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="430 Likes. Like" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="like"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M16.697 5.5c-1.222-.06-2.679.51-3.89 2.16l-.805 1.09-.806-1.09C9.984 6.01 8.526 5.44 7.304 5.5c-1.243.07-2.349.78-2.91 1.91-.552 1.12-.633 2.78.479 4.82 1.074 1.97 3.257 4.27 7.129 6.61 3.87-2.34 6.052-4.64 7.126-6.61 1.111-2.04 1.03-3.7.477-4.82-.561-1.13-1.666-1.84-2.908-1.91zm4.187 7.69c-1.351 2.48-4.001 5.12-8.379 7.67l-.503.3-.504-.3c-4.379-2.55-7.029-5.19-8.382-7.67-1.36-2.5-1.41-4.86-.514-6.67.887-1.79 2.647-2.91 4.601-3.01 1.651-.09 3.368.56 4.798 2.01 1.429-1.45 3.146-2.1 4.796-2.01 1.954.1 3.714 1.22 4.601 3.01.896 1.81.846 4.17-.514 6.67z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">430</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n" style="display:inline-grid;-webkit-justify-content:inherit;justify-content:inherit;-webkit-transform:rotate(0deg) scale(1) translate3d(0, 0, 0);transform:rotate(0deg) scale(1) translate3d(0, 0, 0);-ms-flex-pack:inherit;-webkit-box-pack:inherit"><div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="Share Tweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M12 2.59l5.7 5.7-1.41 1.42L13 6.41V16h-2V6.41l-3.3 3.3-1.41-1.42L12 2.59zM21 15l-.02 3.51c0 1.38-1.12 2.49-2.5 2.49H5.5C4.11 21 3 19.88 3 18.5V15h2v3.5c0 .28.22.5.5.5h12.98c.28 0 .5-.22.5-.5L19 15h2z"></path></g></svg>
+</div></div></div></div></div>
+</div></div>
+</div>
+</div>
+</div></div></article>
+</div></div>
+<div class="css-1dbjc4n r-j5o65s r-qklmqi r-1adg3ll r-1ny4l3l"><div class="css-1dbjc4n r-1udh08x"><div role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-16y2uox r-19u6a5r r-1ny4l3l r-m2pi6t r-o7ynqc r-6416eg"><div class="css-1dbjc4n r-18u37iz">
+<div class="css-1dbjc4n r-1awozwy r-6koalj r-1hwvwag r-18kxxzh r-1r8g8re r-1b7u577 r-bnwqim"><div class="css-1dbjc4n r-1awozwy r-10ptun7 r-1wtj0ep r-t7s2l5">
+<div class="css-1dbjc4n r-1bimlpy r-1adg3ll r-epq5cr r-m5arl1"></div>
+<div class="css-1dbjc4n r-1bimlpy r-1adg3ll r-epq5cr r-m5arl1"></div>
+<div class="css-1dbjc4n r-1bimlpy r-1adg3ll r-epq5cr r-m5arl1"></div>
+</div></div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox"><div dir="ltr" class="css-901oao r-1cvl2hr r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-5njf8e r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Show replies</span></div></div>
+</div></div></div></div>
+<div class="css-1dbjc4n r-1adg3ll r-1ny4l3l"></div>
+<div class="css-1dbjc4n r-1adg3ll r-1ny4l3l"><div itemprop="hasPart" itemscope="" itemtype="https://schema.org/SocialMediaPosting">
+<meta content="1625296716013477888" itemprop="identifier">
+<meta content="6" itemprop="position">
+<meta content="2" itemprop="commentCount">
+<meta content="" itemprop="contentRating">
+<meta content="2023-02-14T00:51:48.000Z" itemprop="dateCreated">
+<meta content="2023-02-14T00:51:48.000Z" itemprop="datePublished">
+<meta content="https://twitter.com/ndgoHODL/status/1625296716013477888" itemprop="url">
+<div itemprop="author" itemscope="" itemtype="https://schema.org/Person">
+<meta content="1514735851565203461" itemprop="identifier">
+<meta content="ndgoHODL" itemprop="additionalName">
+<meta content="ndgo" itemprop="givenName">
+</div>
+<meta content="https://twitter.com/MKBHD/status/1625192182859632661" itemprop="isPartOf">
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/LikeAction" itemprop="interactionType">
+<meta content="Likes" itemprop="name">
+<meta content="https://twitter.com/ndgoHODL/status/1625296716013477888/likes" itemprop="url">
+<meta content="576" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Retweets" itemprop="name">
+<meta content="https://twitter.com/ndgoHODL/status/1625296716013477888/retweets" itemprop="url">
+<meta content="3" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Quotes" itemprop="name">
+<meta content="https://twitter.com/ndgoHODL/status/1625296716013477888/retweets/with_comments" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Replies" itemprop="name">
+<meta content="https://twitter.com/ndgoHODL/status/1625296716013477888" itemprop="url">
+<meta content="2" itemprop="userInteractionCount">
+</div>
+<article aria-labelledby="id__ognzg2rp0y id__76vk2uvu8pt id__q7eein2sq8b id__qu322x1w18 id__mvm1uha4c3f id__qam2o03xy68 id__0xdqjvp97oil id__zd314afc5qe id__tzro8823jjd id__9w4yjng7iuk id__bins29citqm id__rd8b42br07d id__cpmtz20cxia id__dw6y00qmjp6 id__p2mi9y7pg6b id__3r00dht2pyv id__m3w26m9onk9 id__odpgo1qrr9 id__6goidetaifs" role="article" tabindex="-1" class="css-1dbjc4n r-18u37iz r-1ut4w64 r-1ny4l3l r-1udh08x r-1qhn6m8 r-i023vh" data-testid="tweet"><div class="css-1dbjc4n r-eqz5dr r-16y2uox r-1wbh5a2"><div class="css-1dbjc4n r-16y2uox r-1wbh5a2 r-1ny4l3l">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-18u37iz"><div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-ttdzmv"></div></div></div>
+<div class="css-1dbjc4n r-18u37iz">
+<div class="css-1dbjc4n r-1awozwy r-1hwvwag r-18kxxzh r-1b7u577">
+<div class="css-1dbjc4n" data-testid="Tweet-User-Avatar"><div class="css-1dbjc4n r-18kxxzh r-1wbh5a2 r-13qz1uu"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1adg3ll r-h3s6tt r-bztko3" style="width:48px" data-testid="UserAvatar-Container-ndgoHODL">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-1adg3ll r-1pi2tsx r-1wyvozj r-bztko3 r-u8s1d r-1v2oles r-desppf r-13qz1uu">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-ggadg3 r-1udh08x r-u8s1d r-8jfcpp" style="height:calc(100% - -4px);width:calc(100% - -4px)"><a href="/ndgoHODL" aria-hidden="true" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1niwhzg r-1loqt21 r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1niwhzg r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-14lw9ot r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-14lw9ot r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1adg3ll r-1udh08x" style="background-color:rgba(185,202,211,1.00)">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/profile_images/1597917111669645315/XgoQoy94_400x400.jpg")'></div>
+<img alt="" draggable="true" src="https://pbs.twimg.com/profile_images/1597917111669645315/XgoQoy94_400x400.jpg" class="css-9pa8cd">
+</div></div>
+</div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-12181gd r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"></div></div></a></div></div>
+</div></div>
+</div></div></div></div>
+<div class="css-1dbjc4n r-1bimlpy r-16y2uox r-1jgb5lz r-14gqq1x r-m5arl1"></div>
+</div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-1777fci r-kzbkwu">
+<div class="css-1dbjc4n r-zl2h9q"><div class="css-1dbjc4n r-k4xj1c r-18u37iz r-1wtj0ep"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs r-1ny4l3l" id="id__mvm1uha4c3f" data-testid="User-Name">
+<div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/ndgoHODL" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs">
+<div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-37j5jr r-a023e6 r-b88u0q r-rjixqe r-bcqeeo r-1udh08x r-3s2u2q r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">ndgo</span></span></div>
+<div dir="ltr" class="css-901oao r-xoduu5 r-18u37iz r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 r-1awozwy r-xoduu5 r-poiln3 r-bcqeeo r-qvutc0"></span></div>
+</div></a></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1wbh5a2 r-13hce6t"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2">
+<div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/ndgoHODL" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div dir="ltr" class="css-901oao css-1hf3ou5 r-14j79pv r-18u37iz r-37j5jr r-1wvb978 r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">@ndgoHODL</span></div></a></div>
+<div dir="ltr" aria-hidden="true" class="css-901oao r-14j79pv r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-s1qlax r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">·</span></div>
+<div class="css-1dbjc4n r-18u37iz r-1q142lx"><a href="/ndgoHODL/status/1625296716013477888" dir="ltr" aria-label="Feb 14" role="link" class="css-4rbku5 css-18t94o4 css-901oao r-14j79pv r-1loqt21 r-xoduu5 r-1q142lx r-1w6e6rj r-37j5jr r-a023e6 r-16dba41 r-9aw3ui r-rjixqe r-bcqeeo r-3s2u2q r-qvutc0"><time datetime="2023-02-14T00:51:48.000Z">Feb 14</time></a></div>
+</div></div>
+</div></div></div></div></div>
+<div itemprop="articleBody" data-testid="tweetTextAnnotations"><div class="css-1dbjc4n"><div dir="auto" lang="en" class="css-901oao r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-bnwqim r-qvutc0" style="color:rgba(15,20,25,1.00)" id="id__bins29citqm" data-testid="tweetText"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Step 1: punch a tree</span></div></div></div>
+<div class="css-1dbjc4n"><div aria-label="2 replies, 3 Retweets, 576 likes" role="group" class="css-1dbjc4n r-1ta3fxp r-18u37iz r-1wtj0ep r-1s2bzr4 r-1mdbhws" id="id__6goidetaifs">
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="2 Replies. Reply" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="reply"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M1.751 10c0-4.42 3.584-8 8.005-8h4.366c4.49 0 8.129 3.64 8.129 8.13 0 2.96-1.607 5.68-4.196 7.11l-8.054 4.46v-3.69h-.067c-4.49.1-8.183-3.51-8.183-8.01zm8.005-6c-3.317 0-6.005 2.69-6.005 6 0 3.37 2.77 6.08 6.138 6.01l.351-.01h1.761v2.3l5.087-2.81c1.951-1.08 3.163-3.13 3.163-5.36 0-3.39-2.744-6.13-6.129-6.13H9.756z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">2</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="3 Retweets. Retweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="retweet"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M4.5 3.88l4.432 4.14-1.364 1.46L5.5 7.55V16c0 1.1.896 2 2 2H13v2H7.5c-2.209 0-4-1.79-4-4V7.55L1.432 9.48.068 8.02 4.5 3.88zM16.5 6H11V4h5.5c2.209 0 4 1.79 4 4v8.45l2.068-1.93 1.364 1.46-4.432 4.14-4.432-4.14 1.364-1.46 2.068 1.93V8c0-1.1-.896-2-2-2z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">3</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="576 Likes. Like" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="like"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M16.697 5.5c-1.222-.06-2.679.51-3.89 2.16l-.805 1.09-.806-1.09C9.984 6.01 8.526 5.44 7.304 5.5c-1.243.07-2.349.78-2.91 1.91-.552 1.12-.633 2.78.479 4.82 1.074 1.97 3.257 4.27 7.129 6.61 3.87-2.34 6.052-4.64 7.126-6.61 1.111-2.04 1.03-3.7.477-4.82-.561-1.13-1.666-1.84-2.908-1.91zm4.187 7.69c-1.351 2.48-4.001 5.12-8.379 7.67l-.503.3-.504-.3c-4.379-2.55-7.029-5.19-8.382-7.67-1.36-2.5-1.41-4.86-.514-6.67.887-1.79 2.647-2.91 4.601-3.01 1.651-.09 3.368.56 4.798 2.01 1.429-1.45 3.146-2.1 4.796-2.01 1.954.1 3.714 1.22 4.601 3.01.896 1.81.846 4.17-.514 6.67z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">576</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n" style="display:inline-grid;-webkit-justify-content:inherit;justify-content:inherit;-webkit-transform:rotate(0deg) scale(1) translate3d(0, 0, 0);transform:rotate(0deg) scale(1) translate3d(0, 0, 0);-ms-flex-pack:inherit;-webkit-box-pack:inherit"><div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="Share Tweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M12 2.59l5.7 5.7-1.41 1.42L13 6.41V16h-2V6.41l-3.3 3.3-1.41-1.42L12 2.59zM21 15l-.02 3.51c0 1.38-1.12 2.49-2.5 2.49H5.5C4.11 21 3 19.88 3 18.5V15h2v3.5c0 .28.22.5.5.5h12.98c.28 0 .5-.22.5-.5L19 15h2z"></path></g></svg>
+</div></div></div></div></div>
+</div></div>
+</div>
+</div>
+</div></div></article>
+</div></div>
+<div class="css-1dbjc4n r-1adg3ll r-1ny4l3l"><div itemprop="hasPart" itemscope="" itemtype="https://schema.org/SocialMediaPosting">
+<meta content="1625299875926532107" itemprop="identifier">
+<meta content="7" itemprop="position">
+<meta content="13" itemprop="commentCount">
+<meta content="" itemprop="contentRating">
+<meta content="2023-02-14T01:04:21.000Z" itemprop="dateCreated">
+<meta content="2023-02-14T01:04:21.000Z" itemprop="datePublished">
+<meta content="https://twitter.com/MKBHD/status/1625299875926532107" itemprop="url">
+<div itemprop="author" itemscope="" itemtype="https://schema.org/Person">
+<meta content="29873662" itemprop="identifier">
+<meta content="MKBHD" itemprop="additionalName">
+<meta content="Marques Brownlee" itemprop="givenName">
+</div>
+<meta content="https://twitter.com/ndgoHODL/status/1625296716013477888" itemprop="isPartOf">
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/LikeAction" itemprop="interactionType">
+<meta content="Likes" itemprop="name">
+<meta content="https://twitter.com/MKBHD/status/1625299875926532107/likes" itemprop="url">
+<meta content="1433" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Retweets" itemprop="name">
+<meta content="https://twitter.com/MKBHD/status/1625299875926532107/retweets" itemprop="url">
+<meta content="10" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Quotes" itemprop="name">
+<meta content="https://twitter.com/MKBHD/status/1625299875926532107/retweets/with_comments" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Replies" itemprop="name">
+<meta content="https://twitter.com/MKBHD/status/1625299875926532107" itemprop="url">
+<meta content="13" itemprop="userInteractionCount">
+</div>
+<article aria-labelledby="id__n53lgeviwa8 id__fryb4qffc56 id__eh2uwhcdfhg id__hfbiis5nmj6 id__y3qzt4z3a4b id__uqfg4iu94sl id__y2sgqcdk1v id__puaeef7azd id__bki3sye7ldd id__aejttbj4ajw id__37v4vykp5u1 id__ea5hd7qy5ne id__y4rd2lxoad9 id__3rnagd2nsvt id__rhdryhu2jt id__uysq6db5eo id__m0htkq22rkb id__p3ifruo0u0r id__l7ijagtty5" role="article" tabindex="-1" class="css-1dbjc4n r-18u37iz r-1ut4w64 r-1ny4l3l r-1udh08x r-1qhn6m8 r-i023vh" data-testid="tweet"><div class="css-1dbjc4n r-eqz5dr r-16y2uox r-1wbh5a2"><div class="css-1dbjc4n r-16y2uox r-1wbh5a2 r-1ny4l3l">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-18u37iz">
+<div class="css-1dbjc4n r-1hwvwag r-18kxxzh r-15zivkp r-1b7u577"><div class="css-1dbjc4n r-1bimlpy r-1p0dtai r-1d2f490 r-1jgb5lz r-u8s1d r-zchlnj r-ipm5af r-m5arl1"></div></div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-ttdzmv"></div>
+</div></div>
+<div class="css-1dbjc4n r-18u37iz">
+<div class="css-1dbjc4n r-1awozwy r-1hwvwag r-18kxxzh r-1b7u577">
+<div class="css-1dbjc4n" data-testid="Tweet-User-Avatar"><div class="css-1dbjc4n r-18kxxzh r-1wbh5a2 r-13qz1uu"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1adg3ll r-h3s6tt r-bztko3" style="width:48px" data-testid="UserAvatar-Container-MKBHD">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-1adg3ll r-1pi2tsx r-1wyvozj r-bztko3 r-u8s1d r-1v2oles r-desppf r-13qz1uu">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-ggadg3 r-1udh08x r-u8s1d r-8jfcpp" style="height:calc(100% - -4px);width:calc(100% - -4px)"><a href="/MKBHD" aria-hidden="true" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1niwhzg r-1loqt21 r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1niwhzg r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-14lw9ot r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-14lw9ot r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1adg3ll r-1udh08x" style="background-color:rgba(185,202,211,1.00)">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/profile_images/1468001914302390278/B_Xv_8gu_400x400.jpg")'></div>
+<img alt="" draggable="true" src="https://pbs.twimg.com/profile_images/1468001914302390278/B_Xv_8gu_400x400.jpg" class="css-9pa8cd">
+</div></div>
+</div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-12181gd r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"></div></div></a></div></div>
+</div></div>
+</div></div></div></div>
+<div class="css-1dbjc4n r-1bimlpy r-16y2uox r-1jgb5lz r-14gqq1x r-m5arl1"></div>
+</div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-1777fci r-kzbkwu">
+<div class="css-1dbjc4n r-zl2h9q"><div class="css-1dbjc4n r-k4xj1c r-18u37iz r-1wtj0ep"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs r-1ny4l3l" id="id__y3qzt4z3a4b" data-testid="User-Name">
+<div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/MKBHD" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs">
+<div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-37j5jr r-a023e6 r-b88u0q r-rjixqe r-bcqeeo r-1udh08x r-3s2u2q r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Marques Brownlee</span></span></div>
+<div dir="ltr" class="css-901oao r-xoduu5 r-18u37iz r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 r-1awozwy r-xoduu5 r-poiln3 r-bcqeeo r-qvutc0"><svg viewbox="0 0 22 22" aria-label="Verified account" role="img" class="r-1cvl2hr r-4qtqp9 r-yyyyoo r-1xvli5t r-9cviqr r-f9ja8p r-og9te1 r-bnwqim r-1plcrui r-lrvibr" data-testid="icon-verified"><g><path d="M20.396 11c-.018-.646-.215-1.275-.57-1.816-.354-.54-.852-.972-1.438-1.246.223-.607.27-1.264.14-1.897-.131-.634-.437-1.218-.882-1.687-.47-.445-1.053-.75-1.687-.882-.633-.13-1.29-.083-1.897.14-.273-.587-.704-1.086-1.245-1.44S11.647 1.62 11 1.604c-.646.017-1.273.213-1.813.568s-.969.854-1.24 1.44c-.608-.223-1.267-.272-1.902-.14-.635.13-1.22.436-1.69.882-.445.47-.749 1.055-.878 1.688-.13.633-.08 1.29.144 1.896-.587.274-1.087.705-1.443 1.245-.356.54-.555 1.17-.574 1.817.02.647.218 1.276.574 1.817.356.54.856.972 1.443 1.245-.224.606-.274 1.263-.144 1.896.13.634.433 1.218.877 1.688.47.443 1.054.747 1.687.878.633.132 1.29.084 1.897-.136.274.586.705 1.084 1.246 1.439.54.354 1.17.551 1.816.569.647-.016 1.276-.213 1.817-.567s.972-.854 1.245-1.44c.604.239 1.266.296 1.903.164.636-.132 1.22-.447 1.68-.907.46-.46.776-1.044.908-1.681s.075-1.299-.165-1.903c.586-.274 1.084-.705 1.439-1.246.354-.54.551-1.17.569-1.816zM9.662 14.85l-3.429-3.428 1.293-1.302 2.072 2.072 4.4-4.794 1.347 1.246z"></path></g></svg></span></div>
+</div></a></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1wbh5a2 r-13hce6t"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2">
+<div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/MKBHD" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div dir="ltr" class="css-901oao css-1hf3ou5 r-14j79pv r-18u37iz r-37j5jr r-1wvb978 r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">@MKBHD</span></div></a></div>
+<div dir="ltr" aria-hidden="true" class="css-901oao r-14j79pv r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-s1qlax r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">·</span></div>
+<div class="css-1dbjc4n r-18u37iz r-1q142lx"><a href="/MKBHD/status/1625299875926532107" dir="ltr" aria-label="Feb 14" role="link" class="css-4rbku5 css-18t94o4 css-901oao r-14j79pv r-1loqt21 r-xoduu5 r-1q142lx r-1w6e6rj r-37j5jr r-a023e6 r-16dba41 r-9aw3ui r-rjixqe r-bcqeeo r-3s2u2q r-qvutc0"><time datetime="2023-02-14T01:04:21.000Z">Feb 14</time></a></div>
+</div></div>
+</div></div></div></div></div>
+<div itemprop="articleBody" data-testid="tweetTextAnnotations"><div class="css-1dbjc4n"><div dir="auto" lang="en" class="css-901oao r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-bnwqim r-qvutc0" style="color:rgba(15,20,25,1.00)" id="id__37v4vykp5u1" data-testid="tweetText"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Instructions unclear, broken hand</span></div></div></div>
+<div class="css-1dbjc4n"><div aria-label="13 replies, 10 Retweets, 1433 likes" role="group" class="css-1dbjc4n r-1ta3fxp r-18u37iz r-1wtj0ep r-1s2bzr4 r-1mdbhws" id="id__l7ijagtty5">
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="13 Replies. Reply" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="reply"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M1.751 10c0-4.42 3.584-8 8.005-8h4.366c4.49 0 8.129 3.64 8.129 8.13 0 2.96-1.607 5.68-4.196 7.11l-8.054 4.46v-3.69h-.067c-4.49.1-8.183-3.51-8.183-8.01zm8.005-6c-3.317 0-6.005 2.69-6.005 6 0 3.37 2.77 6.08 6.138 6.01l.351-.01h1.761v2.3l5.087-2.81c1.951-1.08 3.163-3.13 3.163-5.36 0-3.39-2.744-6.13-6.129-6.13H9.756z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">13</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="10 Retweets. Retweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="retweet"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M4.5 3.88l4.432 4.14-1.364 1.46L5.5 7.55V16c0 1.1.896 2 2 2H13v2H7.5c-2.209 0-4-1.79-4-4V7.55L1.432 9.48.068 8.02 4.5 3.88zM16.5 6H11V4h5.5c2.209 0 4 1.79 4 4v8.45l2.068-1.93 1.364 1.46-4.432 4.14-4.432-4.14 1.364-1.46 2.068 1.93V8c0-1.1-.896-2-2-2z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">10</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="1433 Likes. Like" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="like"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M16.697 5.5c-1.222-.06-2.679.51-3.89 2.16l-.805 1.09-.806-1.09C9.984 6.01 8.526 5.44 7.304 5.5c-1.243.07-2.349.78-2.91 1.91-.552 1.12-.633 2.78.479 4.82 1.074 1.97 3.257 4.27 7.129 6.61 3.87-2.34 6.052-4.64 7.126-6.61 1.111-2.04 1.03-3.7.477-4.82-.561-1.13-1.666-1.84-2.908-1.91zm4.187 7.69c-1.351 2.48-4.001 5.12-8.379 7.67l-.503.3-.504-.3c-4.379-2.55-7.029-5.19-8.382-7.67-1.36-2.5-1.41-4.86-.514-6.67.887-1.79 2.647-2.91 4.601-3.01 1.651-.09 3.368.56 4.798 2.01 1.429-1.45 3.146-2.1 4.796-2.01 1.954.1 3.714 1.22 4.601 3.01.896 1.81.846 4.17-.514 6.67z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">1,433</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n" style="display:inline-grid;-webkit-justify-content:inherit;justify-content:inherit;-webkit-transform:rotate(0deg) scale(1) translate3d(0, 0, 0);transform:rotate(0deg) scale(1) translate3d(0, 0, 0);-ms-flex-pack:inherit;-webkit-box-pack:inherit"><div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="Share Tweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M12 2.59l5.7 5.7-1.41 1.42L13 6.41V16h-2V6.41l-3.3 3.3-1.41-1.42L12 2.59zM21 15l-.02 3.51c0 1.38-1.12 2.49-2.5 2.49H5.5C4.11 21 3 19.88 3 18.5V15h2v3.5c0 .28.22.5.5.5h12.98c.28 0 .5-.22.5-.5L19 15h2z"></path></g></svg>
+</div></div></div></div></div>
+</div></div>
+</div>
+</div>
+</div></div></article>
+</div></div>
+<div class="css-1dbjc4n r-j5o65s r-qklmqi r-1adg3ll r-1ny4l3l"><div class="css-1dbjc4n r-1udh08x"><div role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-16y2uox r-19u6a5r r-1ny4l3l r-m2pi6t r-o7ynqc r-6416eg"><div class="css-1dbjc4n r-18u37iz">
+<div class="css-1dbjc4n r-1awozwy r-6koalj r-1hwvwag r-18kxxzh r-1r8g8re r-1b7u577 r-bnwqim"><div class="css-1dbjc4n r-1awozwy r-10ptun7 r-1wtj0ep r-t7s2l5">
+<div class="css-1dbjc4n r-1bimlpy r-1adg3ll r-epq5cr r-m5arl1"></div>
+<div class="css-1dbjc4n r-1bimlpy r-1adg3ll r-epq5cr r-m5arl1"></div>
+<div class="css-1dbjc4n r-1bimlpy r-1adg3ll r-epq5cr r-m5arl1"></div>
+</div></div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox"><div dir="ltr" class="css-901oao r-1cvl2hr r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-5njf8e r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Show replies</span></div></div>
+</div></div></div></div>
+<div class="css-1dbjc4n r-1adg3ll r-1ny4l3l"></div>
+<div class="css-1dbjc4n r-j5o65s r-qklmqi r-1adg3ll r-1ny4l3l"><div itemprop="hasPart" itemscope="" itemtype="https://schema.org/SocialMediaPosting">
+<meta content="1625192306658709507" itemprop="identifier">
+<meta content="8" itemprop="position">
+<meta content="0" itemprop="commentCount">
+<meta content="" itemprop="contentRating">
+<meta content="2023-02-13T17:56:55.000Z" itemprop="dateCreated">
+<meta content="2023-02-13T17:56:55.000Z" itemprop="datePublished">
+<meta content="https://twitter.com/tyler_warnecke/status/1625192306658709507" itemprop="url">
+<div itemprop="author" itemscope="" itemtype="https://schema.org/Person">
+<meta content="164958204" itemprop="identifier">
+<meta content="tyler_warnecke" itemprop="additionalName">
+<meta content="Tyler Jon Warnecke" itemprop="givenName">
+</div>
+<meta content="https://twitter.com/MKBHD/status/1625192182859632661" itemprop="isPartOf">
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/LikeAction" itemprop="interactionType">
+<meta content="Likes" itemprop="name">
+<meta content="https://twitter.com/tyler_warnecke/status/1625192306658709507/likes" itemprop="url">
+<meta content="13" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Retweets" itemprop="name">
+<meta content="https://twitter.com/tyler_warnecke/status/1625192306658709507/retweets" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Quotes" itemprop="name">
+<meta content="https://twitter.com/tyler_warnecke/status/1625192306658709507/retweets/with_comments" itemprop="url">
+<meta content="1" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Replies" itemprop="name">
+<meta content="https://twitter.com/tyler_warnecke/status/1625192306658709507" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<article aria-labelledby="id__ckemg9hk97s id__vu8voq9rn8d id__9q6d08tnzjo id__4j3zr78x2ef id__0eih57ny6s19 id__mqvhtqjelw id__lj10emf3wph id__zls745x8gzh id__0p8pkk5t51j id__77hg1n9emtu id__ngd52vr5z3 id__c6sxioy2bh id__qf5stfnx0ld id__c5otmt3ni5e id__3ff0t7i3z61 id__8lglwhd05yu id__bp2qptubtum id__s159ekmzx6i id__w8rydf83be" role="article" tabindex="-1" class="css-1dbjc4n r-18u37iz r-1ny4l3l r-1udh08x r-1qhn6m8 r-i023vh" data-testid="tweet"><div class="css-1dbjc4n r-eqz5dr r-16y2uox r-1wbh5a2"><div class="css-1dbjc4n r-16y2uox r-1wbh5a2 r-1ny4l3l">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-18u37iz"><div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-ttdzmv"></div></div></div>
+<div class="css-1dbjc4n r-18u37iz">
+<div class="css-1dbjc4n r-1awozwy r-1hwvwag r-18kxxzh r-1b7u577"><div class="css-1dbjc4n" data-testid="Tweet-User-Avatar"><div class="css-1dbjc4n r-18kxxzh r-1wbh5a2 r-13qz1uu"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1adg3ll r-h3s6tt r-bztko3" style="width:48px" data-testid="UserAvatar-Container-tyler_warnecke">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-1adg3ll r-1pi2tsx r-1wyvozj r-bztko3 r-u8s1d r-1v2oles r-desppf r-13qz1uu">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-ggadg3 r-1udh08x r-u8s1d r-8jfcpp" style="height:calc(100% - -4px);width:calc(100% - -4px)"><a href="/tyler_warnecke" aria-hidden="true" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1niwhzg r-1loqt21 r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1niwhzg r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-14lw9ot r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-14lw9ot r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1adg3ll r-1udh08x" style="background-color:rgba(185,202,211,1.00)">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/profile_images/1457091856131571725/K5gZT0b9_400x400.jpg")'></div>
+<img alt="" draggable="true" src="https://pbs.twimg.com/profile_images/1457091856131571725/K5gZT0b9_400x400.jpg" class="css-9pa8cd">
+</div></div>
+</div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-12181gd r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"></div></div></a></div></div>
+</div></div>
+</div></div></div></div></div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-1777fci r-kzbkwu">
+<div class="css-1dbjc4n r-zl2h9q"><div class="css-1dbjc4n r-k4xj1c r-18u37iz r-1wtj0ep"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs r-1ny4l3l" id="id__0eih57ny6s19" data-testid="User-Name">
+<div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/tyler_warnecke" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs">
+<div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-37j5jr r-a023e6 r-b88u0q r-rjixqe r-bcqeeo r-1udh08x r-3s2u2q r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Tyler Jon Warnecke</span></span></div>
+<div dir="ltr" class="css-901oao r-xoduu5 r-18u37iz r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 r-1awozwy r-xoduu5 r-poiln3 r-bcqeeo r-qvutc0"><svg viewbox="0 0 22 22" aria-label="Verified account" role="img" class="r-1cvl2hr r-4qtqp9 r-yyyyoo r-1xvli5t r-9cviqr r-f9ja8p r-og9te1 r-bnwqim r-1plcrui r-lrvibr" data-testid="icon-verified"><g><path d="M20.396 11c-.018-.646-.215-1.275-.57-1.816-.354-.54-.852-.972-1.438-1.246.223-.607.27-1.264.14-1.897-.131-.634-.437-1.218-.882-1.687-.47-.445-1.053-.75-1.687-.882-.633-.13-1.29-.083-1.897.14-.273-.587-.704-1.086-1.245-1.44S11.647 1.62 11 1.604c-.646.017-1.273.213-1.813.568s-.969.854-1.24 1.44c-.608-.223-1.267-.272-1.902-.14-.635.13-1.22.436-1.69.882-.445.47-.749 1.055-.878 1.688-.13.633-.08 1.29.144 1.896-.587.274-1.087.705-1.443 1.245-.356.54-.555 1.17-.574 1.817.02.647.218 1.276.574 1.817.356.54.856.972 1.443 1.245-.224.606-.274 1.263-.144 1.896.13.634.433 1.218.877 1.688.47.443 1.054.747 1.687.878.633.132 1.29.084 1.897-.136.274.586.705 1.084 1.246 1.439.54.354 1.17.551 1.816.569.647-.016 1.276-.213 1.817-.567s.972-.854 1.245-1.44c.604.239 1.266.296 1.903.164.636-.132 1.22-.447 1.68-.907.46-.46.776-1.044.908-1.681s.075-1.299-.165-1.903c.586-.274 1.084-.705 1.439-1.246.354-.54.551-1.17.569-1.816zM9.662 14.85l-3.429-3.428 1.293-1.302 2.072 2.072 4.4-4.794 1.347 1.246z"></path></g></svg></span></div>
+</div></a></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1wbh5a2 r-13hce6t"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2">
+<div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/tyler_warnecke" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div dir="ltr" class="css-901oao css-1hf3ou5 r-14j79pv r-18u37iz r-37j5jr r-1wvb978 r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">@tyler_warnecke</span></div></a></div>
+<div dir="ltr" aria-hidden="true" class="css-901oao r-14j79pv r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-s1qlax r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">·</span></div>
+<div class="css-1dbjc4n r-18u37iz r-1q142lx"><a href="/tyler_warnecke/status/1625192306658709507" dir="ltr" aria-label="Feb 13" role="link" class="css-4rbku5 css-18t94o4 css-901oao r-14j79pv r-1loqt21 r-xoduu5 r-1q142lx r-1w6e6rj r-37j5jr r-a023e6 r-16dba41 r-9aw3ui r-rjixqe r-bcqeeo r-3s2u2q r-qvutc0"><time datetime="2023-02-13T17:56:55.000Z">Feb 13</time></a></div>
+</div></div>
+</div></div></div></div></div>
+<div itemprop="articleBody" data-testid="tweetTextAnnotations"><div class="css-1dbjc4n"><div dir="auto" lang="en" class="css-901oao r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-bnwqim r-qvutc0" style="color:rgba(15,20,25,1.00)" id="id__ngd52vr5z3" data-testid="tweetText"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Play it.</span></div></div></div>
+<div class="css-1dbjc4n"><div aria-label="1 Retweet, 13 likes" role="group" class="css-1dbjc4n r-1ta3fxp r-18u37iz r-1wtj0ep r-1s2bzr4 r-1mdbhws" id="id__w8rydf83be">
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="0 Replies. Reply" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="reply"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M1.751 10c0-4.42 3.584-8 8.005-8h4.366c4.49 0 8.129 3.64 8.129 8.13 0 2.96-1.607 5.68-4.196 7.11l-8.054 4.46v-3.69h-.067c-4.49.1-8.183-3.51-8.183-8.01zm8.005-6c-3.317 0-6.005 2.69-6.005 6 0 3.37 2.77 6.08 6.138 6.01l.351-.01h1.761v2.3l5.087-2.81c1.951-1.08 3.163-3.13 3.163-5.36 0-3.39-2.744-6.13-6.129-6.13H9.756z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="1 Retweet. Retweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="retweet"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M4.5 3.88l4.432 4.14-1.364 1.46L5.5 7.55V16c0 1.1.896 2 2 2H13v2H7.5c-2.209 0-4-1.79-4-4V7.55L1.432 9.48.068 8.02 4.5 3.88zM16.5 6H11V4h5.5c2.209 0 4 1.79 4 4v8.45l2.068-1.93 1.364 1.46-4.432 4.14-4.432-4.14 1.364-1.46 2.068 1.93V8c0-1.1-.896-2-2-2z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">1</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="13 Likes. Like" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="like"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M16.697 5.5c-1.222-.06-2.679.51-3.89 2.16l-.805 1.09-.806-1.09C9.984 6.01 8.526 5.44 7.304 5.5c-1.243.07-2.349.78-2.91 1.91-.552 1.12-.633 2.78.479 4.82 1.074 1.97 3.257 4.27 7.129 6.61 3.87-2.34 6.052-4.64 7.126-6.61 1.111-2.04 1.03-3.7.477-4.82-.561-1.13-1.666-1.84-2.908-1.91zm4.187 7.69c-1.351 2.48-4.001 5.12-8.379 7.67l-.503.3-.504-.3c-4.379-2.55-7.029-5.19-8.382-7.67-1.36-2.5-1.41-4.86-.514-6.67.887-1.79 2.647-2.91 4.601-3.01 1.651-.09 3.368.56 4.798 2.01 1.429-1.45 3.146-2.1 4.796-2.01 1.954.1 3.714 1.22 4.601 3.01.896 1.81.846 4.17-.514 6.67z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">13</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n" style="display:inline-grid;-webkit-justify-content:inherit;justify-content:inherit;-webkit-transform:rotate(0deg) scale(1) translate3d(0, 0, 0);transform:rotate(0deg) scale(1) translate3d(0, 0, 0);-ms-flex-pack:inherit;-webkit-box-pack:inherit"><div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="Share Tweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M12 2.59l5.7 5.7-1.41 1.42L13 6.41V16h-2V6.41l-3.3 3.3-1.41-1.42L12 2.59zM21 15l-.02 3.51c0 1.38-1.12 2.49-2.5 2.49H5.5C4.11 21 3 19.88 3 18.5V15h2v3.5c0 .28.22.5.5.5h12.98c.28 0 .5-.22.5-.5L19 15h2z"></path></g></svg>
+</div></div></div></div></div>
+</div></div>
+</div>
+</div>
+</div></div></article>
+</div></div>
+<div class="css-1dbjc4n r-1adg3ll r-1ny4l3l"></div>
+<div class="css-1dbjc4n r-j5o65s r-qklmqi r-1adg3ll r-1ny4l3l"><div itemprop="hasPart" itemscope="" itemtype="https://schema.org/SocialMediaPosting">
+<meta content="1625192315982696452" itemprop="identifier">
+<meta content="9" itemprop="position">
+<meta content="0" itemprop="commentCount">
+<meta content="" itemprop="contentRating">
+<meta content="2023-02-13T17:56:57.000Z" itemprop="dateCreated">
+<meta content="2023-02-13T17:56:57.000Z" itemprop="datePublished">
+<meta content="https://twitter.com/cottrell345/status/1625192315982696452" itemprop="url">
+<div itemprop="author" itemscope="" itemtype="https://schema.org/Person">
+<meta content="315296990" itemprop="identifier">
+<meta content="cottrell345" itemprop="additionalName">
+<meta content="TFM 🍊" itemprop="givenName">
+</div>
+<div itemprop="sharedContent" itemscope="" itemtype="https://schema.org/CreativeWork">
+<meta content="Expanded Tweet URLs" itemprop="name">
+<meta content="https://t.co/15jc2Tzay7" itemprop="url">
+<meta content="https://twitter.com/cottrell345/status/1625192315982696452/photo/1" itemprop="url">
+</div>
+<meta content="https://twitter.com/MKBHD/status/1625192182859632661" itemprop="isPartOf">
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/LikeAction" itemprop="interactionType">
+<meta content="Likes" itemprop="name">
+<meta content="https://twitter.com/cottrell345/status/1625192315982696452/likes" itemprop="url">
+<meta content="2" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Retweets" itemprop="name">
+<meta content="https://twitter.com/cottrell345/status/1625192315982696452/retweets" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Quotes" itemprop="name">
+<meta content="https://twitter.com/cottrell345/status/1625192315982696452/retweets/with_comments" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Replies" itemprop="name">
+<meta content="https://twitter.com/cottrell345/status/1625192315982696452" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<article aria-labelledby="id__jl51w70sf3t id__9xhimqbh2p id__4czwuov171z id__n2jm6kfrutj id__u69acygkjr id__mpnh5guuad id__ik1vwfyd54 id__17kesyaxih8 id__mec5z05we5f id__xx7nxg85fen id__7szlc25nie2 id__nl0eb95u21 id__kxzwrm993j id__rh15170zyk id__4xwm8zwmihd id__xqq9wd4x7rj id__f8dkuzvyhlh id__yob9b8gzxmc id__n3mb572a2b" role="article" tabindex="-1" class="css-1dbjc4n r-18u37iz r-1ny4l3l r-1udh08x r-1qhn6m8 r-i023vh" data-testid="tweet"><div class="css-1dbjc4n r-eqz5dr r-16y2uox r-1wbh5a2"><div class="css-1dbjc4n r-16y2uox r-1wbh5a2 r-1ny4l3l">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-18u37iz"><div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-ttdzmv"></div></div></div>
+<div class="css-1dbjc4n r-18u37iz">
+<div class="css-1dbjc4n r-1awozwy r-1hwvwag r-18kxxzh r-1b7u577"><div class="css-1dbjc4n" data-testid="Tweet-User-Avatar"><div class="css-1dbjc4n r-18kxxzh r-1wbh5a2 r-13qz1uu"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1adg3ll r-h3s6tt r-bztko3" style="width:48px" data-testid="UserAvatar-Container-cottrell345">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-1adg3ll r-1pi2tsx r-1wyvozj r-bztko3 r-u8s1d r-1v2oles r-desppf r-13qz1uu">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-ggadg3 r-1udh08x r-u8s1d r-8jfcpp" style="height:calc(100% - -4px);width:calc(100% - -4px)"><a href="/cottrell345" aria-hidden="true" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1niwhzg r-1loqt21 r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1niwhzg r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-14lw9ot r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-14lw9ot r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1adg3ll r-1udh08x" style="background-color:rgba(185,202,211,1.00)">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/profile_images/1629175304236285952/qMTK7azt_400x400.jpg")'></div>
+<img alt="" draggable="true" src="https://pbs.twimg.com/profile_images/1629175304236285952/qMTK7azt_400x400.jpg" class="css-9pa8cd">
+</div></div>
+</div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-12181gd r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"></div></div></a></div></div>
+</div></div>
+</div></div></div></div></div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-1777fci r-kzbkwu">
+<div class="css-1dbjc4n r-zl2h9q"><div class="css-1dbjc4n r-k4xj1c r-18u37iz r-1wtj0ep"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs r-1ny4l3l" id="id__u69acygkjr" data-testid="User-Name">
+<div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/cottrell345" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs">
+<div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-37j5jr r-a023e6 r-b88u0q r-rjixqe r-bcqeeo r-1udh08x r-3s2u2q r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">TFM </span><img alt="🍊" draggable="false" src="https://abs-0.twimg.com/emoji/v2/svg/1f34a.svg" class="r-4qtqp9 r-dflpy8 r-sjv1od r-zw8f10 r-10akycc r-h9hxbl"></span></div>
+<div dir="ltr" class="css-901oao r-xoduu5 r-18u37iz r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 r-1awozwy r-xoduu5 r-poiln3 r-bcqeeo r-qvutc0"><svg viewbox="0 0 22 22" aria-label="Verified account" role="img" class="r-1cvl2hr r-4qtqp9 r-yyyyoo r-1xvli5t r-9cviqr r-f9ja8p r-og9te1 r-bnwqim r-1plcrui r-lrvibr" data-testid="icon-verified"><g><path d="M20.396 11c-.018-.646-.215-1.275-.57-1.816-.354-.54-.852-.972-1.438-1.246.223-.607.27-1.264.14-1.897-.131-.634-.437-1.218-.882-1.687-.47-.445-1.053-.75-1.687-.882-.633-.13-1.29-.083-1.897.14-.273-.587-.704-1.086-1.245-1.44S11.647 1.62 11 1.604c-.646.017-1.273.213-1.813.568s-.969.854-1.24 1.44c-.608-.223-1.267-.272-1.902-.14-.635.13-1.22.436-1.69.882-.445.47-.749 1.055-.878 1.688-.13.633-.08 1.29.144 1.896-.587.274-1.087.705-1.443 1.245-.356.54-.555 1.17-.574 1.817.02.647.218 1.276.574 1.817.356.54.856.972 1.443 1.245-.224.606-.274 1.263-.144 1.896.13.634.433 1.218.877 1.688.47.443 1.054.747 1.687.878.633.132 1.29.084 1.897-.136.274.586.705 1.084 1.246 1.439.54.354 1.17.551 1.816.569.647-.016 1.276-.213 1.817-.567s.972-.854 1.245-1.44c.604.239 1.266.296 1.903.164.636-.132 1.22-.447 1.68-.907.46-.46.776-1.044.908-1.681s.075-1.299-.165-1.903c.586-.274 1.084-.705 1.439-1.246.354-.54.551-1.17.569-1.816zM9.662 14.85l-3.429-3.428 1.293-1.302 2.072 2.072 4.4-4.794 1.347 1.246z"></path></g></svg></span></div>
+</div></a></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1wbh5a2 r-13hce6t"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2">
+<div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/cottrell345" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div dir="ltr" class="css-901oao css-1hf3ou5 r-14j79pv r-18u37iz r-37j5jr r-1wvb978 r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">@cottrell345</span></div></a></div>
+<div dir="ltr" aria-hidden="true" class="css-901oao r-14j79pv r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-s1qlax r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">·</span></div>
+<div class="css-1dbjc4n r-18u37iz r-1q142lx"><a href="/cottrell345/status/1625192315982696452" dir="ltr" aria-label="Feb 13" role="link" class="css-4rbku5 css-18t94o4 css-901oao r-14j79pv r-1loqt21 r-xoduu5 r-1q142lx r-1w6e6rj r-37j5jr r-a023e6 r-16dba41 r-9aw3ui r-rjixqe r-bcqeeo r-3s2u2q r-qvutc0"><time datetime="2023-02-13T17:56:57.000Z">Feb 13</time></a></div>
+</div></div>
+</div></div></div></div></div>
+<div itemprop="articleBody" data-testid="tweetTextAnnotations"><div class="css-1dbjc4n"></div></div>
+<div aria-labelledby="id__eg8wuvx4p6 id__at3n6ht0daw" class="css-1dbjc4n r-1ssbvtb r-1s2bzr4" id="id__kxzwrm993j"><div class="css-1dbjc4n r-9aw3ui"><div class="css-1dbjc4n"><div class="css-1dbjc4n r-1ets6dv r-1867qdf r-1phboty r-rs99b7 r-1ny4l3l r-1udh08x r-o7ynqc r-6416eg"><div class="css-1dbjc4n"><div class="css-1dbjc4n r-1pi2tsx" data-testid="tweetPhoto">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-1adg3ll r-pm9dpa r-1udh08x">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:66.66666666666667%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="Shocked Face GIF" class="css-1dbjc4n r-1awozwy r-1p0dtai r-1777fci r-1d2f490 r-u8s1d r-zchlnj r-ipm5af" data-testid="previewInterstitial">
+<div class="css-1dbjc4n r-1p0dtai r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af"><div aria-label="Shocked Face GIF" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/tweet_video_thumb/Fo3Xy0iXgAAh-u8?format=jpg&amp;name=small")'></div>
+<img alt="Shocked Face GIF" draggable="true" src="https://pbs.twimg.com/tweet_video_thumb/Fo3Xy0iXgAAh-u8?format=jpg&amp;name=small" class="css-9pa8cd">
+</div></div>
+<div class="css-1dbjc4n r-rki7wi r-18u37iz r-161ttwi r-633pao r-u8s1d">
+<div class="css-1dbjc4n r-1awozwy r-k200y r-loe9s5 r-6t5ypu r-zmljjp r-z2wwpe r-kicko2 r-t12b5v r-z80fyv r-1777fci r-a5pmau r-s1qlax r-633pao"><div dir="ltr" class="css-901oao r-jwli3a r-37j5jr r-n6v787 r-b88u0q r-1cwl3u0 r-bcqeeo r-q4m81j r-lrvibr r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">GIF</span></div></div>
+<div aria-expanded="false" aria-haspopup="menu" tabindex="-1" class="css-1dbjc4n r-pm2fo r-1dpl46z r-ou6ah9 r-notknq r-1ny4l3l r-o7ynqc r-6416eg">
+<div dir="auto" class="css-901oao r-hvic4v" id="id__5wyea6w7lug">read image description</div>
+<div aria-describedby="id__5wyea6w7lug" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1ny4l3l r-105ug2t r-o7ynqc r-6416eg"><div class="css-1dbjc4n r-1awozwy r-k200y r-loe9s5 r-pm2fo r-1dpl46z r-z2wwpe r-ou6ah9 r-notknq r-z80fyv r-1777fci r-s1qlax r-105ug2t"><div dir="ltr" class="css-901oao r-jwli3a r-37j5jr r-n6v787 r-b88u0q r-1cwl3u0 r-bcqeeo r-q4m81j r-lrvibr r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">ALT</span></div></div></div>
+</div>
+</div>
+<div aria-label="Play this GIF" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-l5o3uw r-11mg6pl r-sdzlij r-1phboty r-14f9gny r-e6wyp1 r-1ny4l3l r-o7ynqc r-6416eg r-1p15a4t" data-testid="playButton"><div class="css-1dbjc4n r-1awozwy r-1pi2tsx r-1777fci r-u8s1d r-13qz1uu"><svg viewbox="0 0 24 24" aria-hidden="true" class="r-jwli3a r-4qtqp9 r-yyyyoo r-1sa8knb r-dnmrzs r-1dsia8u r-bnwqim r-1plcrui r-lrvibr r-gcko2u"><g><path d="M21 12L4 2v20l17-10z"></path></g></svg></div></div>
+</div></div>
+</div></div>
+<div itemprop="video" itemscope="" itemtype="https://schema.org/VideoObject">
+<meta content="@cottrell345's video Tweet" itemprop="name">
+<meta content="Shocked Face GIF" itemprop="description">
+<meta content="https://platform.twitter.com/embed/Tweet.html?dnt=false&amp;embedId=twitter-widget-1&amp;frame=false&amp;hideCard=false&amp;hideThread=false&amp;lang=en&amp;id=1625192315982696452" itemprop="embedUrl">
+<meta content="https://pbs.twimg.com/tweet_video_thumb/Fo3Xy0iXgAAh-u8.jpg" itemprop="thumbnailUrl">
+<meta content="Shocked Face GIF" itemprop="caption">
+<meta content="2023-02-13T17:56:57.000Z" itemprop="uploadDate">
+<meta content="PT0H0M0S" itemprop="duration">
+</div>
+</div></div></div></div></div></div>
+<div class="css-1dbjc4n"><div aria-label="2 likes" role="group" class="css-1dbjc4n r-1ta3fxp r-18u37iz r-1wtj0ep r-1s2bzr4 r-1mdbhws" id="id__n3mb572a2b">
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="0 Replies. Reply" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="reply"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M1.751 10c0-4.42 3.584-8 8.005-8h4.366c4.49 0 8.129 3.64 8.129 8.13 0 2.96-1.607 5.68-4.196 7.11l-8.054 4.46v-3.69h-.067c-4.49.1-8.183-3.51-8.183-8.01zm8.005-6c-3.317 0-6.005 2.69-6.005 6 0 3.37 2.77 6.08 6.138 6.01l.351-.01h1.761v2.3l5.087-2.81c1.951-1.08 3.163-3.13 3.163-5.36 0-3.39-2.744-6.13-6.129-6.13H9.756z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="0 Retweets. Retweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="retweet"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M4.5 3.88l4.432 4.14-1.364 1.46L5.5 7.55V16c0 1.1.896 2 2 2H13v2H7.5c-2.209 0-4-1.79-4-4V7.55L1.432 9.48.068 8.02 4.5 3.88zM16.5 6H11V4h5.5c2.209 0 4 1.79 4 4v8.45l2.068-1.93 1.364 1.46-4.432 4.14-4.432-4.14 1.364-1.46 2.068 1.93V8c0-1.1-.896-2-2-2z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="2 Likes. Like" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="like"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M16.697 5.5c-1.222-.06-2.679.51-3.89 2.16l-.805 1.09-.806-1.09C9.984 6.01 8.526 5.44 7.304 5.5c-1.243.07-2.349.78-2.91 1.91-.552 1.12-.633 2.78.479 4.82 1.074 1.97 3.257 4.27 7.129 6.61 3.87-2.34 6.052-4.64 7.126-6.61 1.111-2.04 1.03-3.7.477-4.82-.561-1.13-1.666-1.84-2.908-1.91zm4.187 7.69c-1.351 2.48-4.001 5.12-8.379 7.67l-.503.3-.504-.3c-4.379-2.55-7.029-5.19-8.382-7.67-1.36-2.5-1.41-4.86-.514-6.67.887-1.79 2.647-2.91 4.601-3.01 1.651-.09 3.368.56 4.798 2.01 1.429-1.45 3.146-2.1 4.796-2.01 1.954.1 3.714 1.22 4.601 3.01.896 1.81.846 4.17-.514 6.67z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">2</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n" style="display:inline-grid;-webkit-justify-content:inherit;justify-content:inherit;-webkit-transform:rotate(0deg) scale(1) translate3d(0, 0, 0);transform:rotate(0deg) scale(1) translate3d(0, 0, 0);-ms-flex-pack:inherit;-webkit-box-pack:inherit"><div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="Share Tweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M12 2.59l5.7 5.7-1.41 1.42L13 6.41V16h-2V6.41l-3.3 3.3-1.41-1.42L12 2.59zM21 15l-.02 3.51c0 1.38-1.12 2.49-2.5 2.49H5.5C4.11 21 3 19.88 3 18.5V15h2v3.5c0 .28.22.5.5.5h12.98c.28 0 .5-.22.5-.5L19 15h2z"></path></g></svg>
+</div></div></div></div></div>
+</div></div>
+</div>
+</div>
+</div></div></article>
+</div></div>
+<div class="css-1dbjc4n r-1adg3ll r-1ny4l3l"></div>
+<div class="css-1dbjc4n r-j5o65s r-qklmqi r-1adg3ll r-1ny4l3l"><div itemprop="hasPart" itemscope="" itemtype="https://schema.org/SocialMediaPosting">
+<meta content="1625192333443473408" itemprop="identifier">
+<meta content="10" itemprop="position">
+<meta content="0" itemprop="commentCount">
+<meta content="" itemprop="contentRating">
+<meta content="2023-02-13T17:57:01.000Z" itemprop="dateCreated">
+<meta content="2023-02-13T17:57:01.000Z" itemprop="datePublished">
+<meta content="https://twitter.com/papa_ice_water/status/1625192333443473408" itemprop="url">
+<div itemprop="author" itemscope="" itemtype="https://schema.org/Person">
+<meta content="1666606794" itemprop="identifier">
+<meta content="papa_ice_water" itemprop="additionalName">
+<meta content="Jeff Bezos Without the Pesos" itemprop="givenName">
+</div>
+<div itemprop="sharedContent" itemscope="" itemtype="https://schema.org/CreativeWork">
+<meta content="Expanded Tweet URLs" itemprop="name">
+<meta content="https://t.co/ve0ZTtO1MA" itemprop="url">
+<meta content="https://twitter.com/papa_ice_water/status/1625192333443473408/photo/1" itemprop="url">
+</div>
+<meta content="https://twitter.com/MKBHD/status/1625192182859632661" itemprop="isPartOf">
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/LikeAction" itemprop="interactionType">
+<meta content="Likes" itemprop="name">
+<meta content="https://twitter.com/papa_ice_water/status/1625192333443473408/likes" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Retweets" itemprop="name">
+<meta content="https://twitter.com/papa_ice_water/status/1625192333443473408/retweets" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Quotes" itemprop="name">
+<meta content="https://twitter.com/papa_ice_water/status/1625192333443473408/retweets/with_comments" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Replies" itemprop="name">
+<meta content="https://twitter.com/papa_ice_water/status/1625192333443473408" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<article aria-labelledby="id__pu3wuh9w6jo id__lppuqfoj83r id__wqu7yzq8d0f id__hnc0iyab7t id__w00jonjpw58 id__3lto719j664 id__zuwzbjrowo id__wi37o1txq1 id__vmj7myy8jkg id__6xmqikmld1j id__1e6v6agayuz id__g2lycqyooot id__gytfex4gyxn id__pqa52xh8xm id__87xtv0z32ct id__v0cbk6dqt2b id__u141yxgchj id__mxpl02fu1a8" role="article" tabindex="-1" class="css-1dbjc4n r-18u37iz r-1ny4l3l r-1udh08x r-1qhn6m8 r-i023vh" data-testid="tweet"><div class="css-1dbjc4n r-eqz5dr r-16y2uox r-1wbh5a2"><div class="css-1dbjc4n r-16y2uox r-1wbh5a2 r-1ny4l3l">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-18u37iz"><div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-ttdzmv"></div></div></div>
+<div class="css-1dbjc4n r-18u37iz">
+<div class="css-1dbjc4n r-1awozwy r-1hwvwag r-18kxxzh r-1b7u577"><div class="css-1dbjc4n" data-testid="Tweet-User-Avatar"><div class="css-1dbjc4n r-18kxxzh r-1wbh5a2 r-13qz1uu"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1adg3ll r-h3s6tt r-bztko3" style="width:48px" data-testid="UserAvatar-Container-papa_ice_water">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-1adg3ll r-1pi2tsx r-1wyvozj r-bztko3 r-u8s1d r-1v2oles r-desppf r-13qz1uu">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-ggadg3 r-1udh08x r-u8s1d r-8jfcpp" style="height:calc(100% - -4px);width:calc(100% - -4px)"><a href="/papa_ice_water" aria-hidden="true" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1niwhzg r-1loqt21 r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1niwhzg r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-14lw9ot r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-14lw9ot r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1adg3ll r-1udh08x" style="background-color:rgba(185,202,211,1.00)">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/profile_images/1608352826610049025/cLyEbT5A_400x400.jpg")'></div>
+<img alt="" draggable="true" src="https://pbs.twimg.com/profile_images/1608352826610049025/cLyEbT5A_400x400.jpg" class="css-9pa8cd">
+</div></div>
+</div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-12181gd r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"></div></div></a></div></div>
+</div></div>
+</div></div></div></div></div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-1777fci r-kzbkwu">
+<div class="css-1dbjc4n r-zl2h9q"><div class="css-1dbjc4n r-k4xj1c r-18u37iz r-1wtj0ep"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs r-1ny4l3l" id="id__w00jonjpw58" data-testid="User-Name">
+<div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/papa_ice_water" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs">
+<div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-37j5jr r-a023e6 r-b88u0q r-rjixqe r-bcqeeo r-1udh08x r-3s2u2q r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Jeff Bezos Without the Pesos</span></span></div>
+<div dir="ltr" class="css-901oao r-xoduu5 r-18u37iz r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 r-1awozwy r-xoduu5 r-poiln3 r-bcqeeo r-qvutc0"><svg viewbox="0 0 22 22" aria-label="Verified account" role="img" class="r-1cvl2hr r-4qtqp9 r-yyyyoo r-1xvli5t r-9cviqr r-f9ja8p r-og9te1 r-bnwqim r-1plcrui r-lrvibr" data-testid="icon-verified"><g><path d="M20.396 11c-.018-.646-.215-1.275-.57-1.816-.354-.54-.852-.972-1.438-1.246.223-.607.27-1.264.14-1.897-.131-.634-.437-1.218-.882-1.687-.47-.445-1.053-.75-1.687-.882-.633-.13-1.29-.083-1.897.14-.273-.587-.704-1.086-1.245-1.44S11.647 1.62 11 1.604c-.646.017-1.273.213-1.813.568s-.969.854-1.24 1.44c-.608-.223-1.267-.272-1.902-.14-.635.13-1.22.436-1.69.882-.445.47-.749 1.055-.878 1.688-.13.633-.08 1.29.144 1.896-.587.274-1.087.705-1.443 1.245-.356.54-.555 1.17-.574 1.817.02.647.218 1.276.574 1.817.356.54.856.972 1.443 1.245-.224.606-.274 1.263-.144 1.896.13.634.433 1.218.877 1.688.47.443 1.054.747 1.687.878.633.132 1.29.084 1.897-.136.274.586.705 1.084 1.246 1.439.54.354 1.17.551 1.816.569.647-.016 1.276-.213 1.817-.567s.972-.854 1.245-1.44c.604.239 1.266.296 1.903.164.636-.132 1.22-.447 1.68-.907.46-.46.776-1.044.908-1.681s.075-1.299-.165-1.903c.586-.274 1.084-.705 1.439-1.246.354-.54.551-1.17.569-1.816zM9.662 14.85l-3.429-3.428 1.293-1.302 2.072 2.072 4.4-4.794 1.347 1.246z"></path></g></svg></span></div>
+</div></a></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1wbh5a2 r-13hce6t"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2">
+<div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/papa_ice_water" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div dir="ltr" class="css-901oao css-1hf3ou5 r-14j79pv r-18u37iz r-37j5jr r-1wvb978 r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">@papa_ice_water</span></div></a></div>
+<div dir="ltr" aria-hidden="true" class="css-901oao r-14j79pv r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-s1qlax r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">·</span></div>
+<div class="css-1dbjc4n r-18u37iz r-1q142lx"><a href="/papa_ice_water/status/1625192333443473408" dir="ltr" aria-label="Feb 13" role="link" class="css-4rbku5 css-18t94o4 css-901oao r-14j79pv r-1loqt21 r-xoduu5 r-1q142lx r-1w6e6rj r-37j5jr r-a023e6 r-16dba41 r-9aw3ui r-rjixqe r-bcqeeo r-3s2u2q r-qvutc0"><time datetime="2023-02-13T17:57:01.000Z">Feb 13</time></a></div>
+</div></div>
+</div></div></div></div></div>
+<div itemprop="articleBody" data-testid="tweetTextAnnotations"><div class="css-1dbjc4n"></div></div>
+<div aria-labelledby="id__nrkr2q0ic5p id__1px8q8ehv91" class="css-1dbjc4n r-1ssbvtb r-1s2bzr4" id="id__gytfex4gyxn"><div class="css-1dbjc4n r-9aw3ui"><div class="css-1dbjc4n"><div class="css-1dbjc4n r-1ets6dv r-1867qdf r-1phboty r-rs99b7 r-1ny4l3l r-1udh08x r-o7ynqc r-6416eg"><div class="css-1dbjc4n"><div class="css-1dbjc4n r-1pi2tsx" data-testid="tweetPhoto">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-1adg3ll r-pm9dpa r-1udh08x">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="Gavin Free Love GIF by Rooster Teeth" class="css-1dbjc4n r-1awozwy r-1p0dtai r-1777fci r-1d2f490 r-u8s1d r-zchlnj r-ipm5af" data-testid="previewInterstitial">
+<div class="css-1dbjc4n r-1p0dtai r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af"><div aria-label="Gavin Free Love GIF by Rooster Teeth" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/tweet_video_thumb/Fo3Xz59WYAEUNQD?format=jpg&amp;name=small")'></div>
+<img alt="Gavin Free Love GIF by Rooster Teeth" draggable="true" src="https://pbs.twimg.com/tweet_video_thumb/Fo3Xz59WYAEUNQD?format=jpg&amp;name=small" class="css-9pa8cd">
+</div></div>
+<div class="css-1dbjc4n r-rki7wi r-18u37iz r-161ttwi r-633pao r-u8s1d">
+<div class="css-1dbjc4n r-1awozwy r-k200y r-loe9s5 r-6t5ypu r-zmljjp r-z2wwpe r-kicko2 r-t12b5v r-z80fyv r-1777fci r-a5pmau r-s1qlax r-633pao"><div dir="ltr" class="css-901oao r-jwli3a r-37j5jr r-n6v787 r-b88u0q r-1cwl3u0 r-bcqeeo r-q4m81j r-lrvibr r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">GIF</span></div></div>
+<div aria-expanded="false" aria-haspopup="menu" tabindex="-1" class="css-1dbjc4n r-pm2fo r-1dpl46z r-ou6ah9 r-notknq r-1ny4l3l r-o7ynqc r-6416eg">
+<div dir="auto" class="css-901oao r-hvic4v" id="id__ru8cv7cwr2s">read image description</div>
+<div aria-describedby="id__ru8cv7cwr2s" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1ny4l3l r-105ug2t r-o7ynqc r-6416eg"><div class="css-1dbjc4n r-1awozwy r-k200y r-loe9s5 r-pm2fo r-1dpl46z r-z2wwpe r-ou6ah9 r-notknq r-z80fyv r-1777fci r-s1qlax r-105ug2t"><div dir="ltr" class="css-901oao r-jwli3a r-37j5jr r-n6v787 r-b88u0q r-1cwl3u0 r-bcqeeo r-q4m81j r-lrvibr r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">ALT</span></div></div></div>
+</div>
+</div>
+<div aria-label="Play this GIF" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-l5o3uw r-11mg6pl r-sdzlij r-1phboty r-14f9gny r-e6wyp1 r-1ny4l3l r-o7ynqc r-6416eg r-1p15a4t" data-testid="playButton"><div class="css-1dbjc4n r-1awozwy r-1pi2tsx r-1777fci r-u8s1d r-13qz1uu"><svg viewbox="0 0 24 24" aria-hidden="true" class="r-jwli3a r-4qtqp9 r-yyyyoo r-1sa8knb r-dnmrzs r-1dsia8u r-bnwqim r-1plcrui r-lrvibr r-gcko2u"><g><path d="M21 12L4 2v20l17-10z"></path></g></svg></div></div>
+</div></div>
+</div></div>
+<div itemprop="video" itemscope="" itemtype="https://schema.org/VideoObject">
+<meta content="@papa_ice_water's video Tweet" itemprop="name">
+<meta content="Gavin Free Love GIF by Rooster Teeth" itemprop="description">
+<meta content="https://platform.twitter.com/embed/Tweet.html?dnt=false&amp;embedId=twitter-widget-1&amp;frame=false&amp;hideCard=false&amp;hideThread=false&amp;lang=en&amp;id=1625192333443473408" itemprop="embedUrl">
+<meta content="https://pbs.twimg.com/tweet_video_thumb/Fo3Xz59WYAEUNQD.jpg" itemprop="thumbnailUrl">
+<meta content="Gavin Free Love GIF by Rooster Teeth" itemprop="caption">
+<meta content="2023-02-13T17:57:01.000Z" itemprop="uploadDate">
+<meta content="PT0H0M0S" itemprop="duration">
+</div>
+</div></div></div></div></div></div>
+<div class="css-1dbjc4n"><div aria-label="" role="group" class="css-1dbjc4n r-1ta3fxp r-18u37iz r-1wtj0ep r-1s2bzr4 r-1mdbhws" id="id__olmkp354pjp">
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="0 Replies. Reply" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="reply"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M1.751 10c0-4.42 3.584-8 8.005-8h4.366c4.49 0 8.129 3.64 8.129 8.13 0 2.96-1.607 5.68-4.196 7.11l-8.054 4.46v-3.69h-.067c-4.49.1-8.183-3.51-8.183-8.01zm8.005-6c-3.317 0-6.005 2.69-6.005 6 0 3.37 2.77 6.08 6.138 6.01l.351-.01h1.761v2.3l5.087-2.81c1.951-1.08 3.163-3.13 3.163-5.36 0-3.39-2.744-6.13-6.129-6.13H9.756z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="0 Retweets. Retweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="retweet"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M4.5 3.88l4.432 4.14-1.364 1.46L5.5 7.55V16c0 1.1.896 2 2 2H13v2H7.5c-2.209 0-4-1.79-4-4V7.55L1.432 9.48.068 8.02 4.5 3.88zM16.5 6H11V4h5.5c2.209 0 4 1.79 4 4v8.45l2.068-1.93 1.364 1.46-4.432 4.14-4.432-4.14 1.364-1.46 2.068 1.93V8c0-1.1-.896-2-2-2z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="0 Likes. Like" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="like"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M16.697 5.5c-1.222-.06-2.679.51-3.89 2.16l-.805 1.09-.806-1.09C9.984 6.01 8.526 5.44 7.304 5.5c-1.243.07-2.349.78-2.91 1.91-.552 1.12-.633 2.78.479 4.82 1.074 1.97 3.257 4.27 7.129 6.61 3.87-2.34 6.052-4.64 7.126-6.61 1.111-2.04 1.03-3.7.477-4.82-.561-1.13-1.666-1.84-2.908-1.91zm4.187 7.69c-1.351 2.48-4.001 5.12-8.379 7.67l-.503.3-.504-.3c-4.379-2.55-7.029-5.19-8.382-7.67-1.36-2.5-1.41-4.86-.514-6.67.887-1.79 2.647-2.91 4.601-3.01 1.651-.09 3.368.56 4.798 2.01 1.429-1.45 3.146-2.1 4.796-2.01 1.954.1 3.714 1.22 4.601 3.01.896 1.81.846 4.17-.514 6.67z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n" style="display:inline-grid;-webkit-justify-content:inherit;justify-content:inherit;-webkit-transform:rotate(0deg) scale(1) translate3d(0, 0, 0);transform:rotate(0deg) scale(1) translate3d(0, 0, 0);-ms-flex-pack:inherit;-webkit-box-pack:inherit"><div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="Share Tweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M12 2.59l5.7 5.7-1.41 1.42L13 6.41V16h-2V6.41l-3.3 3.3-1.41-1.42L12 2.59zM21 15l-.02 3.51c0 1.38-1.12 2.49-2.5 2.49H5.5C4.11 21 3 19.88 3 18.5V15h2v3.5c0 .28.22.5.5.5h12.98c.28 0 .5-.22.5-.5L19 15h2z"></path></g></svg>
+</div></div></div></div></div>
+</div></div>
+</div>
+</div>
+</div></div></article>
+</div></div>
+<div class="css-1dbjc4n r-1adg3ll r-1ny4l3l"></div>
+<div class="css-1dbjc4n r-1adg3ll r-1ny4l3l"><div itemprop="hasPart" itemscope="" itemtype="https://schema.org/SocialMediaPosting">
+<meta content="1625192452264198144" itemprop="identifier">
+<meta content="11" itemprop="position">
+<meta content="65" itemprop="commentCount">
+<meta content="" itemprop="contentRating">
+<meta content="2023-02-13T17:57:29.000Z" itemprop="dateCreated">
+<meta content="2023-02-13T17:57:29.000Z" itemprop="datePublished">
+<meta content="https://twitter.com/getpeid/status/1625192452264198144" itemprop="url">
+<div itemprop="author" itemscope="" itemtype="https://schema.org/Person">
+<meta content="41777199" itemprop="identifier">
+<meta content="getpeid" itemprop="additionalName">
+<meta content="Carl Pei" itemprop="givenName">
+<meta content="Nothing" itemprop="disambiguatingDescription">
+</div>
+<meta content="https://twitter.com/MKBHD/status/1625192182859632661" itemprop="isPartOf">
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/LikeAction" itemprop="interactionType">
+<meta content="Likes" itemprop="name">
+<meta content="https://twitter.com/getpeid/status/1625192452264198144/likes" itemprop="url">
+<meta content="1037" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Retweets" itemprop="name">
+<meta content="https://twitter.com/getpeid/status/1625192452264198144/retweets" itemprop="url">
+<meta content="5" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Quotes" itemprop="name">
+<meta content="https://twitter.com/getpeid/status/1625192452264198144/retweets/with_comments" itemprop="url">
+<meta content="1" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Replies" itemprop="name">
+<meta content="https://twitter.com/getpeid/status/1625192452264198144" itemprop="url">
+<meta content="65" itemprop="userInteractionCount">
+</div>
+<article aria-labelledby="id__615k64xeq59 id__ead91zmiyf4 id__ec9rn4rtnd6 id__ghinsu113ag id__tvvidrqvxs id__owp0vkj12l id__j7tcbrw6taq id__y78sz64djmc id__0pm1i9m9rj3 id__5mihwfr8pt id__ok4dae8tcat id__qu15hn5wa4h id__f7wcaz5589u id__i7e0ra137q id__ikmxfvl89oh id__wa1fsvo3idf id__69nzzqrgzso id__65gdccw3zuv id__7wxjgpnm5zv" role="article" tabindex="-1" class="css-1dbjc4n r-18u37iz r-1ut4w64 r-1ny4l3l r-1udh08x r-1qhn6m8 r-i023vh" data-testid="tweet"><div class="css-1dbjc4n r-eqz5dr r-16y2uox r-1wbh5a2"><div class="css-1dbjc4n r-16y2uox r-1wbh5a2 r-1ny4l3l">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-18u37iz"><div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-ttdzmv"></div></div></div>
+<div class="css-1dbjc4n r-18u37iz">
+<div class="css-1dbjc4n r-1awozwy r-1hwvwag r-18kxxzh r-1b7u577">
+<div class="css-1dbjc4n" data-testid="Tweet-User-Avatar"><div class="css-1dbjc4n r-18kxxzh r-1wbh5a2 r-13qz1uu"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1adg3ll r-h3s6tt r-bztko3" style="width:48px" data-testid="UserAvatar-Container-getpeid">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-1adg3ll r-1pi2tsx r-1wyvozj r-bztko3 r-u8s1d r-1v2oles r-desppf r-13qz1uu">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-ggadg3 r-1udh08x r-u8s1d r-8jfcpp" style="height:calc(100% - -4px);width:calc(100% - -4px)"><a href="/getpeid" aria-hidden="true" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1niwhzg r-1loqt21 r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1niwhzg r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-14lw9ot r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-14lw9ot r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1adg3ll r-1udh08x" style="background-color:rgba(185,202,211,1.00)">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/profile_images/1640707890456711170/Q1IPes_W_400x400.jpg")'></div>
+<img alt="" draggable="true" src="https://pbs.twimg.com/profile_images/1640707890456711170/Q1IPes_W_400x400.jpg" class="css-9pa8cd">
+</div></div>
+</div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-12181gd r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"></div></div></a></div></div>
+</div></div>
+</div></div></div></div>
+<div class="css-1dbjc4n r-1bimlpy r-16y2uox r-1jgb5lz r-14gqq1x r-m5arl1"></div>
+</div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-1777fci r-kzbkwu">
+<div class="css-1dbjc4n r-zl2h9q">
+<div class="css-1dbjc4n r-k4xj1c r-18u37iz r-1wtj0ep"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs r-1ny4l3l" id="id__tvvidrqvxs" data-testid="User-Name">
+<div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/getpeid" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs">
+<div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-37j5jr r-a023e6 r-b88u0q r-rjixqe r-bcqeeo r-1udh08x r-3s2u2q r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Carl Pei</span></span></div>
+<div dir="ltr" class="css-901oao r-xoduu5 r-18u37iz r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 r-1awozwy r-xoduu5 r-poiln3 r-bcqeeo r-qvutc0"><svg viewbox="0 0 22 22" aria-label="Verified account" role="img" class="r-1cvl2hr r-4qtqp9 r-yyyyoo r-1xvli5t r-9cviqr r-f9ja8p r-og9te1 r-bnwqim r-1plcrui r-lrvibr" data-testid="icon-verified"><g><path d="M20.396 11c-.018-.646-.215-1.275-.57-1.816-.354-.54-.852-.972-1.438-1.246.223-.607.27-1.264.14-1.897-.131-.634-.437-1.218-.882-1.687-.47-.445-1.053-.75-1.687-.882-.633-.13-1.29-.083-1.897.14-.273-.587-.704-1.086-1.245-1.44S11.647 1.62 11 1.604c-.646.017-1.273.213-1.813.568s-.969.854-1.24 1.44c-.608-.223-1.267-.272-1.902-.14-.635.13-1.22.436-1.69.882-.445.47-.749 1.055-.878 1.688-.13.633-.08 1.29.144 1.896-.587.274-1.087.705-1.443 1.245-.356.54-.555 1.17-.574 1.817.02.647.218 1.276.574 1.817.356.54.856.972 1.443 1.245-.224.606-.274 1.263-.144 1.896.13.634.433 1.218.877 1.688.47.443 1.054.747 1.687.878.633.132 1.29.084 1.897-.136.274.586.705 1.084 1.246 1.439.54.354 1.17.551 1.816.569.647-.016 1.276-.213 1.817-.567s.972-.854 1.245-1.44c.604.239 1.266.296 1.903.164.636-.132 1.22-.447 1.68-.907.46-.46.776-1.044.908-1.681s.075-1.299-.165-1.903c.586-.274 1.084-.705 1.439-1.246.354-.54.551-1.17.569-1.816zM9.662 14.85l-3.429-3.428 1.293-1.302 2.072 2.072 4.4-4.794 1.347 1.246z"></path></g></svg><div tabindex="0" class="css-1dbjc4n r-1loqt21 r-xoduu5 r-1777fci r-13hce6t r-a5pmau r-1ny4l3l"><div class="css-1dbjc4n r-4qtqp9 r-p3p4p0 r-hm2b0w r-bnwqim" style="height:calc(1.25em*0.85);width:calc(1.25em*0.85)"><div class="css-1dbjc4n r-1adg3ll r-1udh08x">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-6koalj r-1mlwlqe r-1pi2tsx r-1udh08x r-13qz1uu r-417010" style="border-top-left-radius:2px;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:2px">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-xoduu5 r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/profile_images/1510020431696310279/fhgfNZ44_bigger.jpg")'></div>
+<img alt="" draggable="false" src="https://pbs.twimg.com/profile_images/1510020431696310279/fhgfNZ44_bigger.jpg" class="css-9pa8cd">
+</div></div>
+</div></div></div></span></div>
+</div></a></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1wbh5a2 r-13hce6t"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2">
+<div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/getpeid" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div dir="ltr" class="css-901oao css-1hf3ou5 r-14j79pv r-18u37iz r-37j5jr r-1wvb978 r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">@getpeid</span></div></a></div>
+<div dir="ltr" aria-hidden="true" class="css-901oao r-14j79pv r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-s1qlax r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">·</span></div>
+<div class="css-1dbjc4n r-18u37iz r-1q142lx"><a href="/getpeid/status/1625192452264198144" dir="ltr" aria-label="Feb 13" role="link" class="css-4rbku5 css-18t94o4 css-901oao r-14j79pv r-1loqt21 r-xoduu5 r-1q142lx r-1w6e6rj r-37j5jr r-a023e6 r-16dba41 r-9aw3ui r-rjixqe r-bcqeeo r-3s2u2q r-qvutc0"><time datetime="2023-02-13T17:57:29.000Z">Feb 13</time></a></div>
+</div></div>
+</div></div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1wtj0ep r-zl2h9q"></div>
+</div>
+<div itemprop="articleBody" data-testid="tweetTextAnnotations"><div class="css-1dbjc4n"><div dir="auto" lang="en" class="css-901oao r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-bnwqim r-qvutc0" style="color:rgba(15,20,25,1.00)" id="id__ok4dae8tcat" data-testid="tweetText"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Same</span></div></div></div>
+<div class="css-1dbjc4n"><div aria-label="65 replies, 6 Retweets, 1037 likes" role="group" class="css-1dbjc4n r-1ta3fxp r-18u37iz r-1wtj0ep r-1s2bzr4 r-1mdbhws" id="id__7wxjgpnm5zv">
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="65 Replies. Reply" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="reply"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M1.751 10c0-4.42 3.584-8 8.005-8h4.366c4.49 0 8.129 3.64 8.129 8.13 0 2.96-1.607 5.68-4.196 7.11l-8.054 4.46v-3.69h-.067c-4.49.1-8.183-3.51-8.183-8.01zm8.005-6c-3.317 0-6.005 2.69-6.005 6 0 3.37 2.77 6.08 6.138 6.01l.351-.01h1.761v2.3l5.087-2.81c1.951-1.08 3.163-3.13 3.163-5.36 0-3.39-2.744-6.13-6.129-6.13H9.756z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">65</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="6 Retweets. Retweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="retweet"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M4.5 3.88l4.432 4.14-1.364 1.46L5.5 7.55V16c0 1.1.896 2 2 2H13v2H7.5c-2.209 0-4-1.79-4-4V7.55L1.432 9.48.068 8.02 4.5 3.88zM16.5 6H11V4h5.5c2.209 0 4 1.79 4 4v8.45l2.068-1.93 1.364 1.46-4.432 4.14-4.432-4.14 1.364-1.46 2.068 1.93V8c0-1.1-.896-2-2-2z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">6</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="1037 Likes. Like" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="like"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M16.697 5.5c-1.222-.06-2.679.51-3.89 2.16l-.805 1.09-.806-1.09C9.984 6.01 8.526 5.44 7.304 5.5c-1.243.07-2.349.78-2.91 1.91-.552 1.12-.633 2.78.479 4.82 1.074 1.97 3.257 4.27 7.129 6.61 3.87-2.34 6.052-4.64 7.126-6.61 1.111-2.04 1.03-3.7.477-4.82-.561-1.13-1.666-1.84-2.908-1.91zm4.187 7.69c-1.351 2.48-4.001 5.12-8.379 7.67l-.503.3-.504-.3c-4.379-2.55-7.029-5.19-8.382-7.67-1.36-2.5-1.41-4.86-.514-6.67.887-1.79 2.647-2.91 4.601-3.01 1.651-.09 3.368.56 4.798 2.01 1.429-1.45 3.146-2.1 4.796-2.01 1.954.1 3.714 1.22 4.601 3.01.896 1.81.846 4.17-.514 6.67z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">1,037</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n" style="display:inline-grid;-webkit-justify-content:inherit;justify-content:inherit;-webkit-transform:rotate(0deg) scale(1) translate3d(0, 0, 0);transform:rotate(0deg) scale(1) translate3d(0, 0, 0);-ms-flex-pack:inherit;-webkit-box-pack:inherit"><div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="Share Tweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M12 2.59l5.7 5.7-1.41 1.42L13 6.41V16h-2V6.41l-3.3 3.3-1.41-1.42L12 2.59zM21 15l-.02 3.51c0 1.38-1.12 2.49-2.5 2.49H5.5C4.11 21 3 19.88 3 18.5V15h2v3.5c0 .28.22.5.5.5h12.98c.28 0 .5-.22.5-.5L19 15h2z"></path></g></svg>
+</div></div></div></div></div>
+</div></div>
+</div>
+</div>
+</div></div></article>
+</div></div>
+<div class="css-1dbjc4n r-j5o65s r-qklmqi r-1adg3ll r-1ny4l3l"><div itemprop="hasPart" itemscope="" itemtype="https://schema.org/SocialMediaPosting">
+<meta content="1625192625971011586" itemprop="identifier">
+<meta content="12" itemprop="position">
+<meta content="1" itemprop="commentCount">
+<meta content="" itemprop="contentRating">
+<meta content="2023-02-13T17:58:11.000Z" itemprop="dateCreated">
+<meta content="2023-02-13T17:58:11.000Z" itemprop="datePublished">
+<meta content="https://twitter.com/ianzelbo/status/1625192625971011586" itemprop="url">
+<div itemprop="author" itemscope="" itemtype="https://schema.org/Person">
+<meta content="1328409419344990208" itemprop="identifier">
+<meta content="ianzelbo" itemprop="additionalName">
+<meta content="Ian Zelbo" itemprop="givenName">
+</div>
+<meta content="https://twitter.com/getpeid/status/1625192452264198144" itemprop="isPartOf">
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/LikeAction" itemprop="interactionType">
+<meta content="Likes" itemprop="name">
+<meta content="https://twitter.com/ianzelbo/status/1625192625971011586/likes" itemprop="url">
+<meta content="34" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Retweets" itemprop="name">
+<meta content="https://twitter.com/ianzelbo/status/1625192625971011586/retweets" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Quotes" itemprop="name">
+<meta content="https://twitter.com/ianzelbo/status/1625192625971011586/retweets/with_comments" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Replies" itemprop="name">
+<meta content="https://twitter.com/ianzelbo/status/1625192625971011586" itemprop="url">
+<meta content="1" itemprop="userInteractionCount">
+</div>
+<article aria-labelledby="id__rgl38ykh65 id__mkg4et4l15 id__74uwzd0qjhh id__wr67o29ncm id__q6yt09cgaqn id__dlleh8rsur id__wow90327yi id__be3ekicpo id__02p9n2vqt7qk id__5ci5fy1zbq id__56gilbzk7ji id__acxkrky7qy5 id__zzt1eude68q id__flvrfko1qk id__yliej5ncpwq id__epefonuyx1m id__svem2b3m9vf id__js4octv2y99 id__05qmwbv1j4yr" role="article" tabindex="-1" class="css-1dbjc4n r-18u37iz r-1ny4l3l r-1udh08x r-1qhn6m8 r-i023vh" data-testid="tweet"><div class="css-1dbjc4n r-eqz5dr r-16y2uox r-1wbh5a2"><div class="css-1dbjc4n r-16y2uox r-1wbh5a2 r-1ny4l3l">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-18u37iz">
+<div class="css-1dbjc4n r-1hwvwag r-18kxxzh r-15zivkp r-1b7u577"><div class="css-1dbjc4n r-1bimlpy r-1p0dtai r-1d2f490 r-1jgb5lz r-u8s1d r-zchlnj r-ipm5af r-m5arl1"></div></div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-ttdzmv"></div>
+</div></div>
+<div class="css-1dbjc4n r-18u37iz">
+<div class="css-1dbjc4n r-1awozwy r-1hwvwag r-18kxxzh r-1b7u577"><div class="css-1dbjc4n" data-testid="Tweet-User-Avatar"><div class="css-1dbjc4n r-18kxxzh r-1wbh5a2 r-13qz1uu"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1adg3ll r-h3s6tt r-bztko3" style="width:48px" data-testid="UserAvatar-Container-ianzelbo">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-1adg3ll r-1pi2tsx r-1wyvozj r-bztko3 r-u8s1d r-1v2oles r-desppf r-13qz1uu">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-ggadg3 r-1udh08x r-u8s1d r-8jfcpp" style="height:calc(100% - -4px);width:calc(100% - -4px)"><a href="/ianzelbo" aria-hidden="true" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1niwhzg r-1loqt21 r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1niwhzg r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-14lw9ot r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-14lw9ot r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1adg3ll r-1udh08x" style="background-color:rgba(185,202,211,1.00)">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/profile_images/1628559866808655877/40jJBV4T_400x400.jpg")'></div>
+<img alt="" draggable="true" src="https://pbs.twimg.com/profile_images/1628559866808655877/40jJBV4T_400x400.jpg" class="css-9pa8cd">
+</div></div>
+</div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-12181gd r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"></div></div></a></div></div>
+</div></div>
+</div></div></div></div></div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-1777fci r-kzbkwu">
+<div class="css-1dbjc4n r-zl2h9q"><div class="css-1dbjc4n r-k4xj1c r-18u37iz r-1wtj0ep"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs r-1ny4l3l" id="id__q6yt09cgaqn" data-testid="User-Name">
+<div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/ianzelbo" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs">
+<div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-37j5jr r-a023e6 r-b88u0q r-rjixqe r-bcqeeo r-1udh08x r-3s2u2q r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Ian Zelbo</span></span></div>
+<div dir="ltr" class="css-901oao r-xoduu5 r-18u37iz r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 r-1awozwy r-xoduu5 r-poiln3 r-bcqeeo r-qvutc0"><svg viewbox="0 0 22 22" aria-label="Verified account" role="img" class="r-1cvl2hr r-4qtqp9 r-yyyyoo r-1xvli5t r-9cviqr r-f9ja8p r-og9te1 r-bnwqim r-1plcrui r-lrvibr" data-testid="icon-verified"><g><path d="M20.396 11c-.018-.646-.215-1.275-.57-1.816-.354-.54-.852-.972-1.438-1.246.223-.607.27-1.264.14-1.897-.131-.634-.437-1.218-.882-1.687-.47-.445-1.053-.75-1.687-.882-.633-.13-1.29-.083-1.897.14-.273-.587-.704-1.086-1.245-1.44S11.647 1.62 11 1.604c-.646.017-1.273.213-1.813.568s-.969.854-1.24 1.44c-.608-.223-1.267-.272-1.902-.14-.635.13-1.22.436-1.69.882-.445.47-.749 1.055-.878 1.688-.13.633-.08 1.29.144 1.896-.587.274-1.087.705-1.443 1.245-.356.54-.555 1.17-.574 1.817.02.647.218 1.276.574 1.817.356.54.856.972 1.443 1.245-.224.606-.274 1.263-.144 1.896.13.634.433 1.218.877 1.688.47.443 1.054.747 1.687.878.633.132 1.29.084 1.897-.136.274.586.705 1.084 1.246 1.439.54.354 1.17.551 1.816.569.647-.016 1.276-.213 1.817-.567s.972-.854 1.245-1.44c.604.239 1.266.296 1.903.164.636-.132 1.22-.447 1.68-.907.46-.46.776-1.044.908-1.681s.075-1.299-.165-1.903c.586-.274 1.084-.705 1.439-1.246.354-.54.551-1.17.569-1.816zM9.662 14.85l-3.429-3.428 1.293-1.302 2.072 2.072 4.4-4.794 1.347 1.246z"></path></g></svg></span></div>
+</div></a></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1wbh5a2 r-13hce6t"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2">
+<div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/ianzelbo" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div dir="ltr" class="css-901oao css-1hf3ou5 r-14j79pv r-18u37iz r-37j5jr r-1wvb978 r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">@ianzelbo</span></div></a></div>
+<div dir="ltr" aria-hidden="true" class="css-901oao r-14j79pv r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-s1qlax r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">·</span></div>
+<div class="css-1dbjc4n r-18u37iz r-1q142lx"><a href="/ianzelbo/status/1625192625971011586" dir="ltr" aria-label="Feb 13" role="link" class="css-4rbku5 css-18t94o4 css-901oao r-14j79pv r-1loqt21 r-xoduu5 r-1q142lx r-1w6e6rj r-37j5jr r-a023e6 r-16dba41 r-9aw3ui r-rjixqe r-bcqeeo r-3s2u2q r-qvutc0"><time datetime="2023-02-13T17:58:11.000Z">Feb 13</time></a></div>
+</div></div>
+</div></div></div></div></div>
+<div itemprop="articleBody" data-testid="tweetTextAnnotations"><div class="css-1dbjc4n"><div dir="auto" lang="en" class="css-901oao r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-bnwqim r-qvutc0" style="color:rgba(15,20,25,1.00)" id="id__56gilbzk7ji" data-testid="tweetText"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">There’s nothing I want to do more in life than play hypixel with you</span></div></div></div>
+<div class="css-1dbjc4n"><div aria-label="1 reply, 34 likes" role="group" class="css-1dbjc4n r-1ta3fxp r-18u37iz r-1wtj0ep r-1s2bzr4 r-1mdbhws" id="id__05qmwbv1j4yr">
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="1 Reply. Reply" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="reply"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M1.751 10c0-4.42 3.584-8 8.005-8h4.366c4.49 0 8.129 3.64 8.129 8.13 0 2.96-1.607 5.68-4.196 7.11l-8.054 4.46v-3.69h-.067c-4.49.1-8.183-3.51-8.183-8.01zm8.005-6c-3.317 0-6.005 2.69-6.005 6 0 3.37 2.77 6.08 6.138 6.01l.351-.01h1.761v2.3l5.087-2.81c1.951-1.08 3.163-3.13 3.163-5.36 0-3.39-2.744-6.13-6.129-6.13H9.756z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">1</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="0 Retweets. Retweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="retweet"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M4.5 3.88l4.432 4.14-1.364 1.46L5.5 7.55V16c0 1.1.896 2 2 2H13v2H7.5c-2.209 0-4-1.79-4-4V7.55L1.432 9.48.068 8.02 4.5 3.88zM16.5 6H11V4h5.5c2.209 0 4 1.79 4 4v8.45l2.068-1.93 1.364 1.46-4.432 4.14-4.432-4.14 1.364-1.46 2.068 1.93V8c0-1.1-.896-2-2-2z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="34 Likes. Like" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="like"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M16.697 5.5c-1.222-.06-2.679.51-3.89 2.16l-.805 1.09-.806-1.09C9.984 6.01 8.526 5.44 7.304 5.5c-1.243.07-2.349.78-2.91 1.91-.552 1.12-.633 2.78.479 4.82 1.074 1.97 3.257 4.27 7.129 6.61 3.87-2.34 6.052-4.64 7.126-6.61 1.111-2.04 1.03-3.7.477-4.82-.561-1.13-1.666-1.84-2.908-1.91zm4.187 7.69c-1.351 2.48-4.001 5.12-8.379 7.67l-.503.3-.504-.3c-4.379-2.55-7.029-5.19-8.382-7.67-1.36-2.5-1.41-4.86-.514-6.67.887-1.79 2.647-2.91 4.601-3.01 1.651-.09 3.368.56 4.798 2.01 1.429-1.45 3.146-2.1 4.796-2.01 1.954.1 3.714 1.22 4.601 3.01.896 1.81.846 4.17-.514 6.67z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">34</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n" style="display:inline-grid;-webkit-justify-content:inherit;justify-content:inherit;-webkit-transform:rotate(0deg) scale(1) translate3d(0, 0, 0);transform:rotate(0deg) scale(1) translate3d(0, 0, 0);-ms-flex-pack:inherit;-webkit-box-pack:inherit"><div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="Share Tweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M12 2.59l5.7 5.7-1.41 1.42L13 6.41V16h-2V6.41l-3.3 3.3-1.41-1.42L12 2.59zM21 15l-.02 3.51c0 1.38-1.12 2.49-2.5 2.49H5.5C4.11 21 3 19.88 3 18.5V15h2v3.5c0 .28.22.5.5.5h12.98c.28 0 .5-.22.5-.5L19 15h2z"></path></g></svg>
+</div></div></div></div></div>
+</div></div>
+</div>
+</div>
+</div></div></article>
+</div></div>
+<div class="css-1dbjc4n r-o52ifk"><div class="css-1dbjc4n r-o52ifk"></div></div>
+</div></div></section>
+</div></div></div></div></div></div></main><div aria-valuemax="1" aria-valuemin="0" role="progressbar" class="css-1dbjc4n r-1awozwy r-1777fci" style="width:300px"><div class="css-1dbjc4n r-17bb2tj r-1muvv40 r-127358a r-1ldzwu0" style="height:26px;width:26px"><svg height="100%" viewbox="0 0 32 32" width="100%"><circle cx="16" cy="16" fill="none" r="14" stroke-width="4" style="stroke:#1D9BF0;opacity:0.2"></circle><circle cx="16" cy="16" fill="none" r="14" stroke-width="4" style="stroke:#1D9BF0;stroke-dasharray:80;stroke-dashoffset:60"></circle></svg></div></div>
+</div></div></div></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/spec/fixtures/onebox/twitterstatus_featured_image.response b/spec/fixtures/onebox/twitterstatus_featured_image.response
index 0f865fe6287..38ce52af715 100644
--- a/spec/fixtures/onebox/twitterstatus_featured_image.response
+++ b/spec/fixtures/onebox/twitterstatus_featured_image.response
@@ -1,4149 +1,1114 @@
 <!DOCTYPE html>
-<html lang="en" data-scribe-reduced-action-queue="true">
-  <head>
-    
-    
-    
-    
-    
-    
-    
-    <meta charset="utf-8">
-      <script  nonce="PumNFXfgvYvkQzJpN49/1g==">
-        !function(){window.initErrorstack||(window.initErrorstack=[]),window.onerror=function(r,i,n,o,t){r.indexOf("Script error.")>-1||window.initErrorstack.push({errorMsg:r,url:i,lineNumber:n,column:o,errorObj:t})}}();
-      </script>
-    
-    
-  
-  <script id="bouncer_terminate_iframe" nonce="PumNFXfgvYvkQzJpN49/1g==">
-    if (window.top != window) {
-  window.top.postMessage({'bouncer': true, 'event': 'complete'}, '*');
-}
-  </script>
-  <script id="swift_action_queue" nonce="PumNFXfgvYvkQzJpN49/1g==">
-    !function(){function e(e){if(e||(e=window.event),!e)return!1;if(e.timestamp=(new Date).getTime(),!e.target&&e.srcElement&&(e.target=e.srcElement),document.documentElement.getAttribute("data-scribe-reduced-action-queue"))for(var t=e.target;t&&t!=document.body;){if("A"==t.tagName)return;t=t.parentNode}return i("all",o(e)),a(e)?(document.addEventListener||(e=o(e)),e.preventDefault=e.stopPropagation=e.stopImmediatePropagation=function(){},y?(v.push(e),i("captured",e)):i("ignored",e),!1):(i("direct",e),!0)}function t(e){n();for(var t,r=0;t=v[r];r++){var a=e(t.target),i=a.closest("a")[0];if("click"==t.type&&i){var o=e.data(i,"events"),u=o&&o.click,c=!i.hostname.match(g)||!i.href.match(/#$/);if(!u&&c){window.location=i.href;continue}}a.trigger(e.event.fix(t))}window.swiftActionQueue.wasFlushed=!0}function r(){for(var e in b)if("all"!=e)for(var t=b[e],r=0;r<t.length;r++)console.log("actionQueue",c(t[r]))}function n(){clearTimeout(w);for(var e,t=0;e=h[t];t++)document["on"+e]=null}function a(e){if(!e.target)return!1;var t=e.target,r=(t.tagName||"").toLowerCase();if(e.metaKey)return!1;if(e.shiftKey&&"a"==r)return!1;if(t.hostname&&!t.hostname.match(g))return!1;if(e.type.match(p)&&s(t))return!1;if("label"==r){var n=t.getAttribute("for");if(n){var a=document.getElementById(n);if(a&&f(a))return!1}else for(var i,o=0;i=t.childNodes[o];o++)if(f(i))return!1}return!0}function i(e,t){t.bucket=e,b[e].push(t)}function o(e){var t={};for(var r in e)t[r]=e[r];return t}function u(e){for(;e&&e!=document.body;){if("A"==e.tagName)return e;e=e.parentNode}}function c(e){var t=[];e.bucket&&t.push("["+e.bucket+"]"),t.push(e.type);var r,n,a=e.target,i=u(a),o="",c=e.timestamp&&e.timestamp-d;return"click"===e.type&&i?(r=i.className.trim().replace(/\s+/g,"."),n=i.id.trim(),o=/[^#]$/.test(i.href)?" ("+i.href+")":"",a='"'+i.innerText.replace(/\n+/g," ").trim()+'"'):(r=a.className.trim().replace(/\s+/g,"."),n=a.id.trim(),a=a.tagName.toLowerCase(),e.keyCode&&(a=String.fromCharCode(e.keyCode)+" : "+a)),t.push(a+o+(n&&"#"+n)+(!n&&r?"."+r:"")),c&&t.push(c),t.join(" ")}function f(e){var t=(e.tagName||"").toLowerCase();return"input"==t&&"checkbox"==e.getAttribute("type")}function s(e){var t=(e.tagName||"").toLowerCase();return"textarea"==t||"input"==t&&"text"==e.getAttribute("type")||"true"==e.getAttribute("contenteditable")}for(var m,d=(new Date).getTime(),l=1e4,g=/^([^\.]+\.)*twitter\.com$/,p=/^key/,h=["click","keydown","keypress","keyup"],v=[],w=null,y=!0,b={captured:[],ignored:[],direct:[],all:[]},k=0;m=h[k];k++)document["on"+m]=e;w=setTimeout(function(){y=!1},l),window.swiftActionQueue={buckets:b,flush:t,logActions:r,wasFlushed:!1}}();
-  </script>
-  <script id="composition_state" nonce="PumNFXfgvYvkQzJpN49/1g==">
-    !function(){function t(t){t.target.setAttribute("data-in-composition","true")}function n(t){t.target.removeAttribute("data-in-composition")}document.addEventListener&&(document.addEventListener("compositionstart",t,!1),document.addEventListener("compositionend",n,!1))}();
-  </script>
-
-    <link rel="stylesheet" href="https://abs.twimg.com/a/1625696336/css/t1/twitter_core.bundle.css" class="coreCSSBundles">
-  <link rel="stylesheet" class="moreCSSBundles" href="https://abs.twimg.com/a/1625696336/css/t1/twitter_more_1.bundle.css">
-  <link rel="stylesheet" class="moreCSSBundles" href="https://abs.twimg.com/a/1625696336/css/t1/twitter_more_2.bundle.css">
-
-    <link rel="dns-prefetch" href="https://pbs.twimg.com">
-    <link rel="dns-prefetch" href="https://t.co">
-      <link rel="preload" href="https://abs.twimg.com/k/en/init.en.d28d8449d76b990b62bf.js" as="script">
-      <link rel="preload" href="https://abs.twimg.com/k/en/0.commons.en.2d6be4aa18878a5eb7fc.js" as="script">
-      <link rel="preload" href="https://abs.twimg.com/k/en/5.pages_permalink.en.d01701ba3cce1f0d3917.js" as="script">
-
-      <title>Jeff Atwood on Twitter: &quot;My first text message from my child! A moment that shall live on in infamy!… &quot;</title>
-      <meta name="robots" content="NOODP">
-  
-
-
-
-<meta name="msapplication-TileImage" content="//abs.twimg.com/favicons/win8-tile-144.png"/>
-<meta name="msapplication-TileColor" content="#00aced"/>
-
-
-
-<meta name="facebook-domain-verification" content="moho2ug7zs57jijiywrewd8wb5a08h" />
-
-
-
-<link rel="mask-icon" sizes="any" href="https://abs.twimg.com/a/1625696336/icons/favicon.svg" color="#1da1f2">
-
-<link rel="shortcut icon" href="//abs.twimg.com/favicons/favicon.ico" type="image/x-icon">
-<link rel="apple-touch-icon" href="https://abs.twimg.com/icons/apple-touch-icon-192x192.png" sizes="192x192">
-
-<link rel="manifest" href="/manifest.json">
-
-
-  <meta name="swift-page-name" id="swift-page-name" content="permalink">
-  <meta name="swift-page-section" id="swift-section-name" content="permalink">
-
-    <link rel="canonical" href="https://twitter.com/codinghorror/status/1409351083177046020">
-  <link rel="alternate" hreflang="x-default" href="https://twitter.com/codinghorror/status/1409351083177046020">
-  <link rel="alternate" hreflang="fr" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=fr"><link rel="alternate" hreflang="en" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=en"><link rel="alternate" hreflang="ar" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=ar"><link rel="alternate" hreflang="ja" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=ja"><link rel="alternate" hreflang="es" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=es"><link rel="alternate" hreflang="de" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=de"><link rel="alternate" hreflang="it" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=it"><link rel="alternate" hreflang="id" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=id"><link rel="alternate" hreflang="pt" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=pt"><link rel="alternate" hreflang="ko" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=ko"><link rel="alternate" hreflang="tr" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=tr"><link rel="alternate" hreflang="ru" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=ru"><link rel="alternate" hreflang="nl" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=nl"><link rel="alternate" hreflang="fil" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=fil"><link rel="alternate" hreflang="ms" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=ms"><link rel="alternate" hreflang="zh-tw" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=zh-tw"><link rel="alternate" hreflang="zh-cn" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=zh-cn"><link rel="alternate" hreflang="hi" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=hi"><link rel="alternate" hreflang="no" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=no"><link rel="alternate" hreflang="sv" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=sv"><link rel="alternate" hreflang="fi" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=fi"><link rel="alternate" hreflang="da" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=da"><link rel="alternate" hreflang="pl" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=pl"><link rel="alternate" hreflang="hu" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=hu"><link rel="alternate" hreflang="fa" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=fa"><link rel="alternate" hreflang="he" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=he"><link rel="alternate" hreflang="ur" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=ur"><link rel="alternate" hreflang="th" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=th"><link rel="alternate" hreflang="uk" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=uk"><link rel="alternate" hreflang="ca" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=ca"><link rel="alternate" hreflang="ga" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=ga"><link rel="alternate" hreflang="el" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=el"><link rel="alternate" hreflang="eu" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=eu"><link rel="alternate" hreflang="cs" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=cs"><link rel="alternate" hreflang="gl" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=gl"><link rel="alternate" hreflang="ro" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=ro"><link rel="alternate" hreflang="hr" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=hr"><link rel="alternate" hreflang="en-gb" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=en-gb"><link rel="alternate" hreflang="vi" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=vi"><link rel="alternate" hreflang="bn" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=bn"><link rel="alternate" hreflang="bg" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=bg"><link rel="alternate" hreflang="sr" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=sr"><link rel="alternate" hreflang="sk" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=sk"><link rel="alternate" hreflang="gu" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=gu"><link rel="alternate" hreflang="mr" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=mr"><link rel="alternate" hreflang="ta" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=ta"><link rel="alternate" hreflang="kn" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=kn">
-
-    <link rel="alternate" type="application/json+oembed" href="https://publish.twitter.com/oembed?url=https://twitter.com/codinghorror/status/1409351083177046020" title="Jeff Atwood on Twitter: &quot;My first text message from my child! A moment that shall live on in infamy!… &quot;">
-
-
-  <link rel="alternate" media="handheld, only screen and (max-width: 640px)" href="https://mobile.twitter.com/codinghorror/status/1409351083177046020">
-
-      <link rel="alternate" href="android-app://com.twitter.android/twitter/tweet?status_id=1409351083177046020&amp;ref_src=twsrc%5Egoogle%7Ctwcamp%5Eandroidseo%7Ctwgr%5Estatus%7Ctwterm%5E1409351083177046020">
-
+<html dir="ltr" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0,viewport-fit=cover">
+<link rel="preconnect" href="//abs.twimg.com">
+<link rel="dns-prefetch" href="//abs.twimg.com">
+<link rel="preconnect" href="//api.twitter.com">
+<link rel="dns-prefetch" href="//api.twitter.com">
+<link rel="preconnect" href="//pbs.twimg.com">
+<link rel="dns-prefetch" href="//pbs.twimg.com">
+<link rel="preconnect" href="//t.co">
+<link rel="dns-prefetch" href="//t.co">
+<link rel="preconnect" href="//video.twimg.com">
+<link rel="dns-prefetch" href="//video.twimg.com">
+<meta property="fb:app_id" content="2231777543">
+<meta property="og:site_name" content="Twitter">
+<meta name="google-site-verification" content="acYOOcR5z6puMzLn6hLDZI1nNHXPxt57OIstz1vnCV0">
+<meta name="facebook-domain-verification" content="x6sdcc8b5ju3bh8nbm59eswogvg6t1">
+<meta http-equiv="onion-location" content="https://twitter3e4tixl4xyajtrzo62zg5vztmjuricljdp2c5kshju4avyoid.onion/">
+<link rel="manifest" href="/manifest.json" crossorigin="use-credentials">
 <link rel="search" type="application/opensearchdescription+xml" href="/opensearch.xml" title="Twitter">
-
-    <link id="async-css-placeholder">
-
-        <meta  property="al:ios:url" content="twitter://status?id=1409351083177046020">
-    <meta  property="al:ios:app_store_id" content="333903271">
-    <meta  property="al:ios:app_name" content="Twitter">
-    <meta  property="al:android:url" content="twitter://status?status_id=1409351083177046020">
-    <meta  property="al:android:package" content="com.twitter.android">
-    <meta  property="al:android:app_name" content="Twitter">
-    <meta  property="og:type" content="article">
-    <meta  property="og:url" content="https://twitter.com/codinghorror/status/1409351083177046020">
-    <meta  property="og:title" content="Jeff Atwood on Twitter">
-    <meta  property="og:image" content="https://pbs.twimg.com/media/E48FVowUUAYyGLX.jpg:large">
-    <meta  property="og:image:user_generated" content="true">
-    <meta  property="og:description" content="“My first text message from my child! A moment that shall live on in infamy!”">
-    <meta  property="og:site_name" content="Twitter">
-    <meta  property="fb:app_id" content="2231777543">
-
-  </head>
-  <body class="three-col logged-out user-style-codinghorror PermalinkPage" 
-data-fouc-class-names="swift-loading no-nav-banners"
- dir="ltr">
-      <script id="swift_loading_indicator" nonce="PumNFXfgvYvkQzJpN49/1g==">
-        document.body.className=document.body.className+" "+document.body.getAttribute("data-fouc-class-names");
-      </script>
-
-    
-    <noscript>
-      <form action="https://mobile.twitter.com/i/nojs_router?path=%2Fcodinghorror%2Fstatus%2F1409351083177046020" method="POST" class="NoScriptForm">
-        <input type="hidden" value="46a6f55f84bf8fb45d8b56ce053c0606e73735e0" name="authenticity_token">
-
-        <div class="NoScriptForm-content">
-          <span class="NoScriptForm-logo Icon Icon--logo Icon--extraLarge"></span>
-          <p>We've detected that JavaScript is disabled in your browser. Would you like to proceed to legacy Twitter?</p>
-          <p class="NoScriptForm-buttonContainer"><button type="submit" class="EdgeButton EdgeButton--primary">Yes</button></p>
-        </div>
-      </form>
-    </noscript>
-
-    <a href="#timeline" class="u-hiddenVisually focusable">Skip to content</a>
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    <div id="doc" data-at-shortcutkeys="{&quot;Enter&quot;:&quot;Open Tweet details&quot;,&quot;o&quot;:&quot;Expand photo&quot;,&quot;/&quot;:&quot;Search&quot;,&quot;?&quot;:&quot;This menu&quot;,&quot;j&quot;:&quot;Next Tweet&quot;,&quot;k&quot;:&quot;Previous Tweet&quot;,&quot;Space&quot;:&quot;Page down&quot;,&quot;.&quot;:&quot;Load new Tweets&quot;,&quot;gu&quot;:&quot;Go to user\u2026&quot;}" class="route-permalink">
-        <div class="topbar js-topbar">
-    
-
-
-    <div class="global-nav global-nav--newLoggedOut" data-section-term="top_nav">
-      <div class="global-nav-inner">
-        <div class="container">
-
-          
-<ul class="nav js-global-actions" role="navigation" id="global-actions">
-  <li id="global-nav-home" class="home" data-global-action="home">
-    <a class="js-nav js-tooltip js-dynamic-tooltip" data-placement="bottom" href="/" data-component-context="home_nav" data-nav="home">
-      <span class="Icon Icon--bird Icon--large"></span>
-      <span class="text" aria-hidden="true">Home</span>
-      <span class="u-hiddenVisually a11y-inactive-page-text">Home</span>
-      <span class="u-hiddenVisually a11y-active-page-text">Home, current page.</span>
-    </a>
-  </li>
-    <li id="global-nav-moments" class="moments" data-global-action="moments">
-      <a class="js-nav js-tooltip js-dynamic-tooltip" data-placement="bottom" href="/i/moments" data-component-context="moments_nav" data-nav="moments">
-        <span class="Icon Icon--lightning Icon--large"></span>
-        <span class="Icon Icon--lightningFilled Icon--large"></span>
-        <span class="text" aria-hidden="true">Moments</span>
-        <span class="u-hiddenVisually a11y-inactive-page-text">Moments</span>
-        <span class="u-hiddenVisually a11y-active-page-text">Moments, current page.</span>
-      </a>
-    </li>
-</ul>
-<div class="pull-right nav-extras">
-    <div role="search">
-  <form class="t1-form form-search js-search-form" action="/search" id="global-nav-search">
-    <label class="visuallyhidden" for="search-query">Search query</label>
-    <input class="search-input" type="text" id="search-query" placeholder="Search Twitter" name="q" autocomplete="off" spellcheck="false">
-    <span class="search-icon js-search-action">
-      <button type="submit" class="Icon Icon--medium Icon--search nav-search">
-        <span class="visuallyhidden">Search Twitter</span>
-      </button>
-    </span>
-      
-
-
-<div role="listbox" class="dropdown-menu typeahead">
-  <div aria-hidden="true" class="dropdown-caret">
-    <div class="caret-outer"></div>
-    <div class="caret-inner"></div>
-  </div>
-  <div role="presentation" class="dropdown-inner js-typeahead-results">
-    <div role="presentation" class="typeahead-saved-searches">
-  <h3 id="saved-searches-heading" class="typeahead-category-title saved-searches-title">Saved searches</h3>
-  <ul role="presentation" class="typeahead-items saved-searches-list">
-    
-    <li role="presentation" class="typeahead-item typeahead-saved-search-item">
-      <span class="Icon Icon--close" aria-hidden="true"><span class="visuallyhidden">Remove</span></span>
-      <a role="option" aria-describedby="saved-searches-heading" class="js-nav" href="" data-search-query="" data-query-source="" data-ds="saved_search" tabindex="-1"></a>
-    </li>
-  </ul>
-</div>
-
-    <ul role="presentation" class="typeahead-items typeahead-topics">
-  
-  <li role="presentation" class="typeahead-item typeahead-topic-item">
-    <a role="option" class="js-nav" href="" data-search-query="" data-query-source="typeahead_click" data-ds="topics" tabindex="-1"></a>
-  </li>
-</ul>
-    <ul role="presentation" class="typeahead-items typeahead-accounts social-context js-typeahead-accounts">
-  
-  <li role="presentation" data-user-id="" data-user-screenname="" data-remote="true" data-score="" class="typeahead-item typeahead-account-item js-selectable">
-    
-    <a role="option" class="js-nav" data-query-source="typeahead_click" data-search-query="" data-ds="account">
-      <div class="js-selectable typeahead-in-conversation hidden">
-        <span class="Icon Icon--follower Icon--small"></span>
-        <span class="typeahead-in-conversation-text">In this conversation</span>
-      </div>
-      <img class="avatar size32" alt="">
-      <span class="typeahead-user-item-info account-group">
-        <span class="fullname"></span><span class="UserBadges"><span class="Icon Icon--verified js-verified hidden"><span class="u-hiddenVisually">Verified account</span></span><span class="Icon Icon--protected js-protected hidden"><span class="u-hiddenVisually">Protected Tweets</span></span></span><span class="UserNameBreak">&nbsp;</span><span class="username u-dir" dir="ltr">@<b></b></span>
-      </span>
-      <span class="typeahead-social-context"></span>
-    </a>
-  </li>
-  <li role="presentation" class="js-selectable typeahead-accounts-shortcut js-shortcut"><a role="option" class="js-nav" href="" data-search-query="" data-query-source="typeahead_click" data-shortcut="true" data-ds="account_search"></a></li>
-</ul>
-
-    <ul role="presentation" class="typeahead-items typeahead-trend-locations-list">
-  
-  <li role="presentation" class="typeahead-item typeahead-trend-locations-item"><a role="option" class="js-nav" href="" data-ds="trend_location" data-search-query="" tabindex="-1"></a></li>
-</ul>
-    
-<div role="presentation" class="typeahead-user-select">
-  <div role="presentation" class="typeahead-empty-suggestions">
-    Suggested users
-  </div>
-  <ul role="presentation" class="typeahead-items typeahead-selected js-typeahead-selected">
-    
-    <li role="presentation" data-user-id="" data-user-screenname="" data-remote="true" data-score="" class="typeahead-item typeahead-selected-item js-selectable">
-      
-      <a role="option" class="js-nav" data-query-source="typeahead_click" data-search-query="" data-ds="account">
-        <img class="avatar size32" alt="">
-        <span class="typeahead-user-item-info account-group">
-          <span class="select-status deselect-user js-deselect-user Icon Icon--check"></span>
-          <span class="select-status select-disabled Icon Icon--unfollow"></span>
-          <span class="fullname"></span><span class="UserBadges"><span class="Icon Icon--verified js-verified hidden"><span class="u-hiddenVisually">Verified account</span></span><span class="Icon Icon--protected js-protected hidden"><span class="u-hiddenVisually">Protected Tweets</span></span></span><span class="UserNameBreak">&nbsp;</span><span class="username u-dir" dir="ltr">@<b></b></span>
-        </span>
-      </a>
-    </li>
-    <li role="presentation" class="typeahead-selected-end"></li>
-  </ul>
-
-  <ul role="presentation" class="typeahead-items typeahead-accounts js-typeahead-accounts">
-    
-    <li role="presentation" data-user-id="" data-user-screenname="" data-remote="true" data-score="" class="typeahead-item typeahead-account-item js-selectable">
-      
-      <a role="option" class="js-nav" data-query-source="typeahead_click" data-search-query="" data-ds="account">
-        <img class="avatar size32" alt="">
-        <span class="typeahead-user-item-info account-group">
-          <span class="select-status deselect-user js-deselect-user Icon Icon--check"></span>
-          <span class="select-status select-disabled Icon Icon--unfollow"></span>
-          <span class="fullname"></span><span class="UserBadges"><span class="Icon Icon--verified js-verified hidden"><span class="u-hiddenVisually">Verified account</span></span><span class="Icon Icon--protected js-protected hidden"><span class="u-hiddenVisually">Protected Tweets</span></span></span><span class="UserNameBreak">&nbsp;</span><span class="username u-dir" dir="ltr">@<b></b></span>
-        </span>
-      </a>
-    </li>
-    <li role="presentation" class="typeahead-accounts-end"></li>
-  </ul>
-</div>
-
-    <div role="presentation" class="typeahead-dm-conversations">
-  <ul role="presentation" class="typeahead-items typeahead-dm-conversation-items">
-    <li role="presentation" class="typeahead-item typeahead-dm-conversation-item">
-      <a role="option" tabindex="-1"></a>
-    </li>
-  </ul>
-</div>
-  </div>
-</div>
-
-  </form>
-</div>
-
-
-  <ul class="nav secondary-nav language-dropdown">
-    <li class="dropdown js-language-dropdown">
-      <a href="#supported_languages" class="dropdown-toggle js-dropdown-toggle">
-        <small>Language:</small> <span class="js-current-language">English</span> <b class="caret"></b>
-      </a>
-      <div class="dropdown-menu dropdown-menu--rightAlign is-forceRight">
-        <div class="dropdown-caret right">
-          <span class="caret-outer"> </span>
-          <span class="caret-inner"></span>
-        </div>
-        <ul id="supported_languages">
-            <li><a href="?lang=id" data-lang-code="id" title="Indonesian" class="js-language-link js-tooltip" rel="noopener">Bahasa Indonesia</a></li>
-            <li><a href="?lang=msa" data-lang-code="msa" title="Malay" class="js-language-link js-tooltip" rel="noopener">Bahasa Melayu</a></li>
-            <li><a href="?lang=ca" data-lang-code="ca" title="Catalan" class="js-language-link js-tooltip" rel="noopener">Català</a></li>
-            <li><a href="?lang=cs" data-lang-code="cs" title="Czech" class="js-language-link js-tooltip" rel="noopener">Čeština</a></li>
-            <li><a href="?lang=da" data-lang-code="da" title="Danish" class="js-language-link js-tooltip" rel="noopener">Dansk</a></li>
-            <li><a href="?lang=de" data-lang-code="de" title="German" class="js-language-link js-tooltip" rel="noopener">Deutsch</a></li>
-            <li><a href="?lang=en-gb" data-lang-code="en-gb" title="British English" class="js-language-link js-tooltip" rel="noopener">English UK</a></li>
-            <li><a href="?lang=es" data-lang-code="es" title="Spanish" class="js-language-link js-tooltip" rel="noopener">Español</a></li>
-            <li><a href="?lang=fil" data-lang-code="fil" title="Filipino" class="js-language-link js-tooltip" rel="noopener">Filipino</a></li>
-            <li><a href="?lang=fr" data-lang-code="fr" title="French" class="js-language-link js-tooltip" rel="noopener">Français</a></li>
-            <li><a href="?lang=hr" data-lang-code="hr" title="Croatian" class="js-language-link js-tooltip" rel="noopener">Hrvatski</a></li>
-            <li><a href="?lang=it" data-lang-code="it" title="Italian" class="js-language-link js-tooltip" rel="noopener">Italiano</a></li>
-            <li><a href="?lang=hu" data-lang-code="hu" title="Hungarian" class="js-language-link js-tooltip" rel="noopener">Magyar</a></li>
-            <li><a href="?lang=nl" data-lang-code="nl" title="Dutch" class="js-language-link js-tooltip" rel="noopener">Nederlands</a></li>
-            <li><a href="?lang=no" data-lang-code="no" title="Norwegian" class="js-language-link js-tooltip" rel="noopener">Norsk</a></li>
-            <li><a href="?lang=pl" data-lang-code="pl" title="Polish" class="js-language-link js-tooltip" rel="noopener">Polski</a></li>
-            <li><a href="?lang=pt" data-lang-code="pt" title="Portuguese" class="js-language-link js-tooltip" rel="noopener">Português</a></li>
-            <li><a href="?lang=ro" data-lang-code="ro" title="Romanian" class="js-language-link js-tooltip" rel="noopener">Română</a></li>
-            <li><a href="?lang=sk" data-lang-code="sk" title="Slovak" class="js-language-link js-tooltip" rel="noopener">Slovenčina</a></li>
-            <li><a href="?lang=fi" data-lang-code="fi" title="Finnish" class="js-language-link js-tooltip" rel="noopener">Suomi</a></li>
-            <li><a href="?lang=sv" data-lang-code="sv" title="Swedish" class="js-language-link js-tooltip" rel="noopener">Svenska</a></li>
-            <li><a href="?lang=vi" data-lang-code="vi" title="Vietnamese" class="js-language-link js-tooltip" rel="noopener">Tiếng Việt</a></li>
-            <li><a href="?lang=tr" data-lang-code="tr" title="Turkish" class="js-language-link js-tooltip" rel="noopener">Türkçe</a></li>
-            <li><a href="?lang=el" data-lang-code="el" title="Greek" class="js-language-link js-tooltip" rel="noopener">Ελληνικά</a></li>
-            <li><a href="?lang=bg" data-lang-code="bg" title="Bulgarian" class="js-language-link js-tooltip" rel="noopener">Български език</a></li>
-            <li><a href="?lang=ru" data-lang-code="ru" title="Russian" class="js-language-link js-tooltip" rel="noopener">Русский</a></li>
-            <li><a href="?lang=sr" data-lang-code="sr" title="Serbian" class="js-language-link js-tooltip" rel="noopener">Српски</a></li>
-            <li><a href="?lang=uk" data-lang-code="uk" title="Ukrainian" class="js-language-link js-tooltip" rel="noopener">Українська мова</a></li>
-            <li><a href="?lang=he" data-lang-code="he" title="Hebrew" class="js-language-link js-tooltip" rel="noopener">עִבְרִית</a></li>
-            <li><a href="?lang=ar" data-lang-code="ar" title="Arabic" class="js-language-link js-tooltip" rel="noopener">العربية</a></li>
-            <li><a href="?lang=fa" data-lang-code="fa" title="Persian" class="js-language-link js-tooltip" rel="noopener">فارسی</a></li>
-            <li><a href="?lang=mr" data-lang-code="mr" title="Marathi" class="js-language-link js-tooltip" rel="noopener">मराठी</a></li>
-            <li><a href="?lang=hi" data-lang-code="hi" title="Hindi" class="js-language-link js-tooltip" rel="noopener">हिन्दी</a></li>
-            <li><a href="?lang=bn" data-lang-code="bn" title="Bangla" class="js-language-link js-tooltip" rel="noopener">বাংলা</a></li>
-            <li><a href="?lang=gu" data-lang-code="gu" title="Gujarati" class="js-language-link js-tooltip" rel="noopener">ગુજરાતી</a></li>
-            <li><a href="?lang=ta" data-lang-code="ta" title="Tamil" class="js-language-link js-tooltip" rel="noopener">தமிழ்</a></li>
-            <li><a href="?lang=kn" data-lang-code="kn" title="Kannada" class="js-language-link js-tooltip" rel="noopener">ಕನ್ನಡ</a></li>
-            <li><a href="?lang=th" data-lang-code="th" title="Thai" class="js-language-link js-tooltip" rel="noopener">ภาษาไทย</a></li>
-            <li><a href="?lang=ko" data-lang-code="ko" title="Korean" class="js-language-link js-tooltip" rel="noopener">한국어</a></li>
-            <li><a href="?lang=ja" data-lang-code="ja" title="Japanese" class="js-language-link js-tooltip" rel="noopener">日本語</a></li>
-            <li><a href="?lang=zh-cn" data-lang-code="zh-cn" title="Simplified Chinese" class="js-language-link js-tooltip" rel="noopener">简体中文</a></li>
-            <li><a href="?lang=zh-tw" data-lang-code="zh-tw" title="Traditional Chinese" class="js-language-link js-tooltip" rel="noopener">繁體中文</a></li>
-        </ul>
-      </div>
-      <div class="js-front-language">
-        <form action="/sessions/change_locale" class="t1-form language" method="POST">
-          <input type="hidden" name="lang"> <input type="hidden" name="redirect">
-          <input type="hidden" name="authenticity_token" value="46a6f55f84bf8fb45d8b56ce053c0606e73735e0">
-        </form>
-      </div>
-    </li>
-  </ul>
-
-    <ul class="nav secondary-nav session-dropdown" id="session">
-      <li class="dropdown js-session">
-          <a href="/login" class="dropdown-toggle js-dropdown-toggle dropdown-signin" role="button" id="signin-link" data-nav="login">
-            <small>Have an account?</small> <span class="emphasize"> Log in</span><span class="caret"></span>
-          </a>
-          <div class="dropdown-menu dropdown-form dropdown-menu--rightAlign is-forceRight" id="signin-dropdown">
-            <div class="dropdown-caret right"> <span class="caret-outer"></span> <span class="caret-inner"></span> </div>
-            <div class="signin-dialog-body">
-              <div>Have an account?</div>
-<form action="https://twitter.com/sessions" class="LoginForm js-front-signin" method="post"
-  data-component="login_callout"
-  data-element="form"
->
-  <div class="LoginForm-input LoginForm-username">
-    <input
-      type="text"
-      class="text-input email-input js-signin-email"
-      name="session[username_or_email]"
-      autocomplete="username"
-      placeholder="Phone, email, or username"
-    />
-  </div>
-
-  <div class="LoginForm-input LoginForm-password">
-    <input type="password" class="text-input" name="session[password]" placeholder="Password" autocomplete="current-password">
-    
-  </div>
-
-    <div class="LoginForm-rememberForgot">
-      <label>
-        <input type="checkbox" value="1" name="remember_me" checked="checked">
-        <span>Remember me</span>
-      </label>
-      <span class="separator">&middot;</span>
-      <a class="forgot" href="/account/begin_password_reset" rel="noopener">Forgot password?</a>
-    </div>
-
-  <input type="submit" class="EdgeButton EdgeButton--primary EdgeButton--medium submit js-submit" value="Log in">
-
-    <input type="hidden" name="return_to_ssl" value="true">
-
-  <input type="hidden" name="scribe_log">
-  <input type="hidden" name="redirect_after_login" value="/codinghorror/status/1409351083177046020">
-  <input type="hidden" value="46a6f55f84bf8fb45d8b56ce053c0606e73735e0" name="authenticity_token">
-      <input type="hidden" name="ui_metrics" autocomplete="off">
-      <script src="/i/js_inst?c_name=ui_metrics" async></script>
-</form>
-              <hr>
-              <div class="signup SignupForm">
-                <div class="SignupForm-header">New to Twitter?</div>
-                <a href="https://twitter.com/signup" role="button" class="EdgeButton EdgeButton--secondary EdgeButton--medium u-block js-signup"
-                  data-component="signup_callout"
-                  data-element="dropdown"
-                  >Sign up
-                </a>
-              </div>
-            </div>
-          </div>
-      </li>
-    </ul>
-</div>
-
-        </div>
-      </div>
-    </div>
-</div>
-
-
-        <div id="page-outer">
-          <div id="page-container" class="AppContent wrapper wrapper-permalink">
-              
-              
-<a class="PermalinkProfile-overlay js-nav" href="/codinghorror">
-  <span class="visuallyhidden">codinghorror's profile</span>
-</a>
-<div class="PermalinkProfile-background without-banner">
-  <div class="ProfileCanopy ProfileCanopy--withNav ProfileCanopy--large js-variableHeightTopBar">
-  <div class="ProfileCanopy-inner">
-
-    <div class="ProfileCanopy-header u-bgUserColor">
-  <div class="ProfileCanopy-headerBg">
-    <img alt=""
-      src="https://pbs.twimg.com/profile_banners/5637652/1398207303/1500x500"
-      
-    >
-  </div>
-
-  <div class="AppContainer">
-
-    <div class="ProfileCanopy-avatar">
-      <div class="ProfileAvatar">
-    <a class="ProfileAvatar-container u-block js-tooltip profile-picture"
-        href="https://pbs.twimg.com/profile_images/1246568020991864832/hh4FVqbl_400x400.jpg"
-        title="Jeff Atwood"
-        data-resolved-url-large="https://pbs.twimg.com/profile_images/1246568020991864832/hh4FVqbl_400x400.jpg"
-        data-url="https://pbs.twimg.com/profile_images/1246568020991864832/hh4FVqbl_400x400.jpg"
-        target="_blank"
-        rel="noopener">
-        <img class="ProfileAvatar-image " src="https://pbs.twimg.com/profile_images/1246568020991864832/hh4FVqbl_400x400.jpg" alt="Jeff Atwood">
-    </a>
-</div>
-
-    </div>
-
-
-    <div class="ProfileCanopy-headerPromptAnchor"></div>
-  </div>
-
-</div>
-
-
-    <div class="ProfileCanopy-navBar u-boxShadow">
-      
-      <div class="AppContainer">
-        <div class="Grid Grid--withGutter">
-          <div class="Grid-cell u-size1of3 u-lg-size1of4">
-            <div class="ProfileCanopy-card" role="presentation">
-              <div class="ProfileCardMini">
-  <a class="ProfileCardMini-avatar profile-picture js-tooltip"
-     href="https://pbs.twimg.com/profile_images/1246568020991864832/hh4FVqbl.jpg"
-     title="Jeff Atwood"
-     data-resolved-url-large="https://pbs.twimg.com/profile_images/1246568020991864832/hh4FVqbl.jpg"
-     data-url="https://pbs.twimg.com/profile_images/1246568020991864832/hh4FVqbl.jpg"
-     target="_blank"
-     rel="noopener">
-    <img class="ProfileCardMini-avatarImage" alt="Jeff Atwood" src="https://pbs.twimg.com/profile_images/1246568020991864832/hh4FVqbl_normal.jpg" >
-  </a>
-  <div class="ProfileCardMini-details">
-    <div class="ProfileNameTruncated account-group">
-  <div class="u-textTruncate u-inlineBlock ProfileNameTruncated-withBadges ProfileNameTruncated-withBadges--1">
-    <a class="fullname ProfileNameTruncated-link u-textInheritColor js-nav" href="/codinghorror"  data-aria-label-part>
-      Jeff Atwood</a></div><span class="UserBadges"><span class="Icon Icon--verified"><span class="u-hiddenVisually">Verified account</span></span></span>
-</div>
-    <div class="ProfileCardMini-screenname">
-      <a href="/codinghorror" class="ProfileCardMini-screennameLink u-linkComplex js-nav u-dir" dir="ltr">
-        <span class="username u-dir" dir="ltr">@<b class="u-linkComplex-target">codinghorror</b></span>
-      </a>
-    </div>
-  </div>
-</div>
-
-            </div>
-          </div>
-
-          <div class="Grid-cell u-size2of3 u-lg-size3of4">
-            <div class="ProfileCanopy-nav">
-              
-
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-
-  </div>
-</div>
-
-
-    <div class="ProfileHeading">
-  <div class="ProfileHeading-spacer"></div>
-    <h2 id="content-main-heading" class="u-hiddenVisually">Tweets</h2>
-</div>
-
-
-  <div class="AppContainer">
-    <div class="Grid Grid--withGutter">
-      <div class="Grid-cell u-size1of3 u-lg-size1of4">
-        <div class="Grid Grid--withGutter">
-          <div class="Grid-cell">
-            <div class="ProfileSidebar ProfileSidebar--withLeftAlignment">
-  <div class="ProfileHeaderCard">
-  <h1 class="ProfileHeaderCard-name">
-    <a href="/codinghorror"
-       class="ProfileHeaderCard-nameLink u-textInheritColor js-nav">Jeff Atwood</a><span class="ProfileHeaderCard-badges"><a href="" class="js-tooltip" target="_blank" title="Verified account" data-placement="right" rel="noopener"><span class="Icon Icon--verified"><span class="u-hiddenVisually">Verified account</span></span></a></span>
-  </h1>
-
-  <h2 class="ProfileHeaderCard-screenname u-inlineBlock u-dir" dir="ltr">
-    <a class="ProfileHeaderCard-screennameLink u-linkComplex js-nav" href="/codinghorror">
-      <span class="username u-dir" dir="ltr">@<b class="u-linkComplex-target">codinghorror</b></span>
-    </a>
-  </h2>
-
-  
-
-      <p class="ProfileHeaderCard-bio u-dir" dir="ltr">Indoor enthusiast. Co-founder of <a href="https://t.co/P7MEYP7MjF" rel="nofollow noopener" dir="ltr" data-expanded-url="http://stackoverflow.com" class="twitter-timeline-link" target="_blank" title="http://stackoverflow.com" ><span class="invisible">http://</span><span class="js-display-url">stackoverflow.com</span><span class="tco-ellipsis"><span class="invisible">&nbsp;</span></span></a> and <a href="https://t.co/rlk2RG61MA" rel="nofollow noopener" dir="ltr" data-expanded-url="http://discourse.org" class="twitter-timeline-link" target="_blank" title="http://discourse.org" ><span class="invisible">http://</span><span class="js-display-url">discourse.org</span><span class="tco-ellipsis"><span class="invisible">&nbsp;</span></span></a>. Let’s be kind to each other. Disclaimer: I have no idea what I&#39;m talking about.</p>
-
-      <div class="ProfileHeaderCard-location ">
-        <span class="Icon Icon--geo Icon--medium" aria-hidden="true" role="presentation"></span>
-        <span class="ProfileHeaderCard-locationText u-dir" dir="ltr">
-              Bay Area, CA
-
-        </span>
-      </div>
-
-      <div class="ProfileHeaderCard-url ">
-        <span class="Icon Icon--url Icon--medium" aria-hidden="true" role="presentation"></span>
-        <span class="ProfileHeaderCard-urlText u-dir">  <a class="u-textUserColor" target="_blank" rel="me nofollow noopener" href="http://t.co/rM9N1bQpLr" title="http://blog.codinghorror.com">
-    blog.codinghorror.com
-  </a>
-
-</span>
-      </div>
-
-
-      <div class="ProfileHeaderCard-joinDate">
-        <span class="Icon Icon--calendar Icon--medium" aria-hidden="true" role="presentation"></span>
-        <span class="ProfileHeaderCard-joinDateText js-tooltip u-dir" dir="ltr" title="1:50 PM - 29 Apr 2007">Joined April 2007</span>
-      </div>
-
-      <div class="ProfileHeaderCard-birthdate u-hidden">
-        <span class="Icon Icon--balloon Icon--medium" aria-hidden="true" role="presentation"></span>
-        <span class="ProfileHeaderCard-birthdateText u-dir" dir="ltr">
-</span>
-      </div>
-
-
-</div>
-
-
-
-
-
-
-
-</div>
-
-          </div>
-        </div>
-      </div>
-      <div class="Grid-cell u-size2of3 u-lg-size3of4">
-        <div class="Grid Grid--withGutter">
-          <div class="Grid-cell u-lg-size2of3" data-test-selector="ProfileTimeline">
-              <div class="ProfileHeading">
-  <div class="ProfileHeading-spacer"></div>
-    <h2 id="content-main-heading" class="u-hiddenVisually">Tweets</h2>
-</div>
-
-            
-
-
-
-
-
-
-
-
-
-          </div>
-          <div class="Grid-cell u-size1of3">
-            <div class="Grid Grid--withGutter">
-              <div class="Grid-cell">
-                <div class="ProfileSidebar ProfileSidebar--withRightAlignment">
-                  <div class="MoveableModule">
-                    
-<div class="SidebarCommonModules">
-
-
-
-
-
-  <div class="Footer module roaming-module Footer--slim"
-  >
-  <div class="flex-module">
-    <div class="flex-module-inner js-items-container">
-      <ul class="u-cf">
-        <li class="Footer-item Footer-copyright copyright">&copy; 2021 Twitter</li>
-        <li class="Footer-item"><a class="Footer-link" href="/about" rel="noopener">About</a></li>
-        <li class="Footer-item"><a class="Footer-link" href="//support.twitter.com" rel="noopener">Help Center</a></li>
-        <li class="Footer-item"><a class="Footer-link" href="/tos" rel="noopener">Terms</a></li>
-        <li class="Footer-item"><a class="Footer-link" href="/privacy" rel="noopener">Privacy policy</a></li>
-        <li class="Footer-item"><a class="Footer-link" href="//support.twitter.com/articles/20170514" rel="noopener">Cookies</a></li>
-        <li class="Footer-item"><a class="Footer-link" href="//business.twitter.com/en/help/troubleshooting/how-twitter-ads-work.html" rel="noopener">Ads info</a></li>
-      </ul>
-    </div>
-  </div>
-
-</div>
-
-</div>
-
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-    
-<style id="user-style-codinghorror">
-
-
-
-
-
-
-  a,
-  a:hover,
-  a:focus,
-  a:active {
-    color: #282D58;
-  }
-
-  .u-textUserColor,
-  .u-textUserColorHover:hover,
-  .u-textUserColorHover:hover .ProfileTweet-actionCount,
-  .u-textUserColorHover:focus {
-    color: #282D58 !important;
-  }
-
-  .u-borderUserColor,
-  .u-borderUserColorHover:hover,
-  .u-borderUserColorHover:focus {
-    border-color: #282D58 !important;
-  }
-
-  .u-bgUserColor,
-  .u-bgUserColorHover:hover,
-  .u-bgUserColorHover:focus {
-    background-color: #282D58 !important;
-  }
-
-  .u-dropdownUserColor > li:hover,
-  .u-dropdownUserColor > li:focus,
-  .u-dropdownUserColor > li > button:hover,
-  .u-dropdownUserColor > li > button:focus,
-  .u-dropdownUserColor > li > a:focus,
-  .u-dropdownUserColor > li > a:hover {
-    color: #fff !important;
-    background-color: #282D58 !important;
-  }
-
-  .u-boxShadowInsetUserColorHover:hover,
-  .u-boxShadowInsetUserColorHover:focus {
-    box-shadow: inset 0 0 0 5px #282D58 !important;
-  }
-
-  .u-dropdownOpenUserColor.dropdown.open .dropdown-toggle {
-    color: #282D58;
-  }
-
-
-  .u-textUserColorLight {
-    color: #A9ABBC !important;
-  }
-
-  .u-borderUserColorLight,
-  .u-borderUserColorLightFocus:focus,
-  .u-borderUserColorLightHover:hover,
-  .u-borderUserColorLightHover:focus {
-    border-color: #A9ABBC !important;
-  }
-
-  .u-bgUserColorLight {
-    background-color: #A9ABBC !important;
-  }
-
-
-  .u-boxShadowUserColorLighterFocus:focus {
-    box-shadow: 0 0 8px rgba(0, 0, 0, 0.05), inset 0 1px 2px rgba(40,45,88,0.25) !important;
-  }
-
-
-  .u-textUserColorLightest {
-    color: #E9EAEE !important;
-  }
-
-  .u-borderUserColorLightest {
-    border-color: #E9EAEE !important;
-  }
-
-  .u-bgUserColorLightest {
-    background-color: #E9EAEE !important;
-  }
-
-
-  .u-textUserColorLighter {
-    color: #C9CAD5 !important;
-  }
-
-  .u-borderUserColorLighter {
-    border-color: #C9CAD5 !important;
-  }
-
-  .u-bgUserColorLighter {
-    background-color: #C9CAD5 !important;
-  }
-
-
-  .u-bgUserColorDarkHover:hover {
-    background-color: #252C51 !important;
-  }
-
-  .u-borderUserColorDark {
-    border-color: #252C51 !important;
-  }
-
-
-  .u-bgUserColorDarkerActive:active {
-    background-color: #222B4A !important;
-  }
-
-
-
-
-
-
-
-
-
-
-
-
-
-a,
-.btn-link,
-.btn-link:focus,
-.icon-btn,
-
-
-
-.pretty-link b,
-.pretty-link:hover s,
-.pretty-link:hover b,
-.pretty-link:focus s,
-.pretty-link:focus b,
-
-.metadata a:hover,
-.metadata a:focus,
-
-a.account-group:hover .fullname,
-a.account-group:focus .fullname,
-.account-summary:focus .fullname,
-
-.message .message-text a,
-.message .message-text button,
-.stats a strong,
-.plain-btn:hover,
-.plain-btn:focus,
-.dropdown.open .user-dropdown.plain-btn,
-.open > .plain-btn,
-#global-actions .new:before,
-.module .list-link:hover,
-.module .list-link:focus,
-
-.stats a:hover,
-.stats a:hover strong,
-.stats a:focus,
-.stats a:focus strong,
-
-.find-friends-sources li:hover .source,
-
-
-
-
-
-.stream-item a:hover .fullname,
-.stream-item a:focus .fullname,
-
-.stream-item .view-all-supplements:hover,
-.stream-item .view-all-supplements:focus,
-
-.tweet .time a:hover,
-.tweet .time a:focus,
-.tweet .details.with-icn b,
-.tweet .details.with-icn .Icon,
-
-.stream-item:hover .original-tweet .details b,
-.stream-item .original-tweet.focus .details b,
-.stream-item.open .original-tweet .details b,
-
-.client-and-actions a:hover,
-.client-and-actions a:focus,
-
-.dismiss-btn:hover b,
-
-.tweet .context .pretty-link:hover s,
-.tweet .context .pretty-link:hover b,
-.tweet .context .pretty-link:focus s,
-.tweet .context .pretty-link:focus b,
-
-.list .username a:hover,
-.list .username a:focus,
-.list-membership-container .create-a-list,
-.list-membership-container .create-a-list:hover,
-.new-tweets-bar,
-
-
-
-.card .list-details a:hover,
-.card .list-details a:focus,
-.card .card-body:hover .attribution,
-.card .card-body .attribution:focus {
-  color: #282D58;
-}
-
-
-
-
-  
-  .FoundMediaSearch--keyboard .FoundMediaSearch-focusable.is-focused {
-    border-color: #282D58;
-  }
-
-  
-  .photo-selector:hover .btn,
-  .icon-btn:hover,
-  .icon-btn:active,
-  .icon-btn.active,
-  .icon-btn.enabled {
-    border-color: #282D58;
-    border-color: rgba(40,45,88,0.4);
-    color: #282D58;
-  }
-
-  
-  .photo-selector:hover .btn,
-  .icon-btn:hover {
-    background-image: linear-gradient(rgba(255,255,255,0), rgba(40,45,88,0.1));
-  }
-
-  .icon-btn.disabled,
-  .icon-btn.disabled:hover,
-  .icon-btn[disabled],
-  .icon-btn[aria-disabled=true] {
-    color: #282D58;
-  }
-
-  
-  
-
-  .EdgeButton--primary,
-  .EdgeButton--primary:focus {
-    background-color: #525679;
-    border-color: transparent;
-  }
-
-  .EdgeButton--primary:hover,
-  .EdgeButton--primary:active {
-    background-color: #282D58;
-    border-color: #282D58;
-  }
-
-  .EdgeButton--primary:focus {
-    box-shadow:
-      0 0 0 2px #FFFFFF,
-      0 0 0 4px #A9ABBC;
-  }
-
-  .EdgeButton--primary:active {
-    box-shadow:
-      0 0 0 2px #FFFFFF,
-      0 0 0 4px #525679;
-  }
-
-  
-  
-
-  .EdgeButton--secondary,
-  .EdgeButton--secondary:hover,
-  .EdgeButton--secondary:focus,
-  .EdgeButton--secondary:active {
-    border-color: #282D58;
-    color: #282D58;
-  }
-
-  .EdgeButton--secondary:hover,
-  .EdgeButton--secondary:active {
-    background-color: #E9EAEE;
-  }
-
-  .EdgeButton--secondary:focus {
-    box-shadow:
-      0 0 0 2px #FFFFFF,
-      0 0 0 4px rgba(40,45,88,0.4);
-  }
-
-  .EdgeButton--secondary:active {
-    box-shadow:
-      0 0 0 2px #FFFFFF,
-      0 0 0 4px #282D58;
-  }
-
-  
-  
-
-  .EdgeButton--invertedPrimary {
-    color: #282D58 !important;
-  }
-
-  .EdgeButton--invertedPrimary:focus {
-    box-shadow:
-      0 0 0 2px #282D58,
-      0 0 0 4px #A9ABBC;
-  }
-
-  .EdgeButton--invertedPrimary:active {
-    box-shadow:
-      0 0 0 2px #282D58,
-      0 0 0 4px #FFFFFF;
-  }
-
-  
-  
-
-  .EdgeButton--invertedSecondary {
-    background-color: #282D58;
-  }
-
-  .EdgeButton--invertedSecondary:hover {
-    background-color: #525679;
-  }
-
-  .EdgeButton--invertedSecondary:focus {
-    box-shadow:
-      0 0 0 2px #282D58,
-      0 0 0 4px #A9ABBC;
-  }
-
-  .EdgeButton--invertedSecondary:active {
-    box-shadow:
-      0 0 0 2px #282D58,
-      0 0 0 4px #FFFFFF;
-  }
-
-  
-
-  .btn:focus,
-  .btn.focus,
-  .Button:focus,
-  .EmojiPicker-item.is-focused,
-  .EmojiPicker .EmojiCategoryIcon:focus,
-  .EmojiPicker-skinTone:focus + .EmojiPicker-skinToneSwatch,
-  a:focus > img:first-child:last-child,
-  button:focus {
-    box-shadow:
-      0 0 0 2px #FFFFFF,
-      0 0 2px 4px rgba(40,45,88,0.4);
-  }
-
-  .selected-stream-item:focus {
-    box-shadow: 0 0 0 3px rgba(40,45,88,0.4);
-  }
-
-  
-  .js-navigable-stream.stream-table-view .selected-stream-item[tabindex="-1"]:focus {
-    outline: 3px solid rgba(40,45,88,0.4) !important;
-  }
-
-  
-  .js-navigable-stream.stream-table-view .selected-stream-item:focus {
-    box-shadow: none;
-  }
-
-  
-
-  .global-dm-nav.new.with-count .dm-new .count-inner {
-    background: #282D58;
-  }
-
-  .global-nav .people .count .count-inner {
-    background: #282D58;
-  }
-
-  .dropdown-menu li > a:hover,
-  .dropdown-menu li > a:focus,
-  .dropdown-menu .dropdown-link:hover,
-  .dropdown-menu .dropdown-link:focus,
-  .dropdown-menu .dropdown-link.is-focused,
-  .dropdown-menu li:hover .dropdown-link,
-  .dropdown-menu li:focus .dropdown-link,
-  .dropdown-menu .selected a,
-  .dropdown-menu .dropdown-link.selected {
-    background-color: #282D58 !important;
-  }
-
-  /* for items in typeahead dropdown menu on logged in pages */
-  .dropdown-menu .typeahead-items li > a:focus,
-  .dropdown-menu .typeahead-items li > a:hover,
-  .dropdown-menu .typeahead-items .selected,
-  .dropdown-menu .typeahead-items .selected a {
-    background-color: #E9EAEE !important;
-    color: #282D58 !important;
-  }
-
-  .typeahead a:hover,
-  .typeahead a:hover strong,
-  .typeahead a:hover .fullname,
-  .typeahead .selected a,
-  .typeahead .selected strong,
-  .typeahead .selected .fullname,
-  .typeahead .selected .Icon--close {
-    color: #282D58 !important;
-  }
-
-
-.home-tweet-box,
-.LiveVideo-tweetBox,
-.RetweetDialog-commentBox {
-  background-color: #E9EAEE;
-}
-
-.top-timeline-tweetbox .timeline-tweet-box .tweet-form.condensed .tweet-box {
-  color: #282D58;
-}
-
-.RichEditor,
-.TweetBoxAttachments {
-  border-color: #C9CAD5;
-}
-
-input:focus,
-textarea:focus,
-div[contenteditable="true"]:focus,
-div[contenteditable="true"].fake-focus,
-div[contenteditable="plaintext-only"]:focus,
-div[contenteditable="plaintext-only"].fake-focus {
-  border-color: #A9ABBC;
-  box-shadow: inset 0 0 0 1px rgba(40,45,88,0.7);
-}
-
-.tweet-box textarea:focus,
-.tweet-box input[type=text],
-.currently-dragging .tweet-form.is-droppable .tweet-drag-help,
-.tweet-box[contenteditable="true"]:focus,
-.RichEditor.is-fakeFocus,
-.RichEditor.is-fakeFocus ~ .TweetBoxAttachments {
-  border-color: #A9ABBC;
-  box-shadow: 0 0 0 1px #A9ABBC;
-}
-
-.MomentCapsuleItem.selected-stream-item:focus {
-  box-shadow: 0 0 0 3px rgba(40,45,88,0.4);
-}
-
-
-
-
-s,
-.pretty-link:hover s,
-.pretty-link:focus s,
-.stream-item-activity-notification .latest-tweet .tweet-row a:hover s,
-.stream-item-activity-notification .latest-tweet .tweet-row a:focus s {
-    color: #282D58;
-}
-
-
-
-.vellip,
-.vellip:before,
-.vellip:after,
-.conversation-module > li:after,
-.conversation-module > li:before,
-.ThreadedConversation--loneTweet:after,
-.ThreadedConversation-tweet:not(.is-hiddenAncestor) ~ .ThreadedConversation-tweet:before,
-.ThreadedConversation-tweet:after,
-.ThreadedConversation-moreReplies:before,
-.ThreadedConversation-viewOther:before,
-.ThreadedConversation-unavailableTweet:before,
-.ThreadedConversation-unavailableTweet:after,
-.ThreadedConversation--permalinkTweetWithAncestors:before,
-.mini-avatar-with-thread:before,
-.permalink.self-thread-permalink-with-descendant .permalink-tweet-container:after,
-.permalink.self-thread-permalink-with-descendant .inline-reply-tweetbox-container:after {
-    border-color: #A9ABBC;
-}
-
-
-
-
-.tweet .sm-reply,
-.tweet .sm-rt,
-.tweet .sm-fav,
-.tweet .sm-image,
-.tweet .sm-video,
-.tweet .sm-audio,
-.tweet .sm-geo,
-.tweet .sm-in,
-.tweet .sm-trash,
-.tweet .sm-more,
-.tweet .sm-page,
-.tweet .sm-embed,
-.tweet .sm-summary,
-.tweet .sm-chat,
-
-.timelines-navigation .active .profile-nav-icon,
-.timelines-navigation .profile-nav-icon:hover,
-.timelines-navigation .profile-nav-link:focus .profile-nav-icon,
-
-.sm-top-tweet {
-    background-color: #282D58;
-}
-
-.enhanced-mini-profile .mini-profile .profile-summary {
-  background-image: url(https://pbs.twimg.com/profile_banners/5637652/1398207303/mobile);
-}
-
-  #global-tweet-dialog .modal-header,
-  #Tweetstorm-dialog .modal-header {
-    border-bottom: solid 1px rgba(40,45,88,0.25);
-  }
-
-  #global-tweet-dialog .modal-tweet-form-container,
-  #Tweetstorm-dialog .modal-body {
-    background-color: #282D58;
-    background: rgba(40,45,88,0.1);
-  }
-
-  .TweetstormDialog-reply-context .tweet-box-avatar:after,
-  .TweetstormDialog-reply-context .tweet-box-avatar:before,
-  .TweetstormDialog-tweet-box .tweet-box-avatar:after,
-  .TweetstormDialog-tweet-box .tweet-box-avatar:before {
-    border-color: #A9ABBC;
-  }
-
-  .global-nav .search-input:focus,
-  .global-nav .search-input.focus {
-    border: 2px solid #282D58;
-  }
-}
-
-  .inline-reply-tweetbox {
-    background-color: #E9EAEE;
-  }
-
-</style>
-
-
-<style id="user-style-codinghorror-header-img" class="js-user-style-header-img">
-
-    body.user-style-codinghorror .enhanced-mini-profile .mini-profile .profile-summary {
-      background-image: url(https://pbs.twimg.com/profile_banners/5637652/1398207303/web);
+<link rel="shortcut icon" href="//abs.twimg.com/favicons/twitter.2.ico">
+<meta name="mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-title" content="Twitter">
+<meta name="apple-mobile-web-app-status-bar-style" content="white">
+<meta name="theme-color" content="#ffffff">
+<script type="application/ld+json">{"@context":"https://schema.org","@type":"WebSite","url":"https://twitter.com/","potentialAction":{"@type":"SearchAction","query-input":"required name=search_term_string","target":{"@type":"EntryPoint","urlTemplate":"https://twitter.com/search?q={search_term_string}&ref_src=twcamp%5Eseo_searchbox%7Ctwsrc%5Eseo"}}}</script><meta http-equiv="origin-trial" content="AlpCmb40F5ZjDi9ZYe+wnr/V8MF+XmY41K4qUhoq+2mbepJTNd3q4CRqlACfnythEPZqcjryfAS1+ExS0FFRcA8AAABmeyJvcmlnaW4iOiJodHRwczovL3R3aXR0ZXIuY29tOjQ0MyIsImZlYXR1cmUiOiJMYXVuY2ggSGFuZGxlciIsImV4cGlyeSI6MTY1NTI1MTE5OSwiaXNTdWJkb21haW4iOnRydWV9">
+<style>html,body{height: 100%;}::cue{white-space:normal}</style>
+<style id="react-native-stylesheet">[stylesheet-group="0"]{}
+html{-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;-webkit-tap-highlight-color:rgba(0,0,0,0);}
+body{margin:0;}
+button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0;}
+input::-webkit-search-cancel-button,input::-webkit-search-decoration,input::-webkit-search-results-button,input::-webkit-search-results-decoration{display:none;}
+[stylesheet-group="0.1"]{}
+:focus:not([data-focusvisible-polyfill]){outline: none;}
+[stylesheet-group="0.5"]{}
+.css-18t94o4{cursor:pointer;}
+.css-4rbku5{background-color:rgba(0,0,0,0.00);color:inherit;font:inherit;list-style:none;margin-bottom:0px;margin-left:0px;margin-right:0px;margin-top:0px;text-align:inherit;text-decoration:none;}
+[stylesheet-group="1"]{}
+.css-1dbjc4n{-ms-flex-align:stretch;-ms-flex-direction:column;-ms-flex-negative:0;-ms-flex-preferred-size:auto;-webkit-align-items:stretch;-webkit-box-align:stretch;-webkit-box-direction:normal;-webkit-box-orient:vertical;-webkit-flex-basis:auto;-webkit-flex-direction:column;-webkit-flex-shrink:0;align-items:stretch;border:0 solid black;box-sizing:border-box;display:-webkit-box;display:-moz-box;display:-ms-flexbox;display:-webkit-flex;display:flex;flex-basis:auto;flex-direction:column;flex-shrink:0;margin-bottom:0px;margin-left:0px;margin-right:0px;margin-top:0px;min-height:0px;min-width:0px;padding-bottom:0px;padding-left:0px;padding-right:0px;padding-top:0px;position:relative;z-index:0;}
+.css-901oao{border:0 solid black;box-sizing:border-box;color:rgba(0,0,0,1.00);display:inline;font:14px -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Helvetica,Arial,sans-serif;margin-bottom:0px;margin-left:0px;margin-right:0px;margin-top:0px;padding-bottom:0px;padding-left:0px;padding-right:0px;padding-top:0px;white-space:pre-wrap;word-wrap:break-word;}
+.css-16my406{color:inherit;font:inherit;white-space:inherit;}
+.css-1hf3ou5{max-width:100%;overflow-x:hidden;overflow-y:hidden;text-overflow:ellipsis;white-space:nowrap;word-wrap:normal;}
+.css-9pa8cd{bottom:0px;height:100%;left:0px;opacity:0;position:absolute;right:0px;top:0px;width:100%;z-index:-1;}
+[stylesheet-group="2"]{}
+.r-13awgt0{-ms-flex:1 1 0%;-webkit-flex:1;flex:1;}
+.r-sdzlij{border-bottom-left-radius:9999px;border-bottom-right-radius:9999px;border-top-left-radius:9999px;border-top-right-radius:9999px;}
+.r-1phboty{border-bottom-style:solid;border-left-style:solid;border-right-style:solid;border-top-style:solid;}
+.r-rs99b7{border-bottom-width:1px;border-left-width:1px;border-right-width:1px;border-top-width:1px;}
+.r-4iw3lz{border-bottom-width:0;border-left-width:0;border-right-width:0;border-top-width:0;}
+.r-1udh08x{overflow-x:hidden;overflow-y:hidden;}
+.r-wwvuq4{padding-bottom:0;padding-left:0;padding-right:0;padding-top:0;}
+.r-6koalj{display:-webkit-box;display:-moz-box;display:-ms-flexbox;display:-webkit-flex;display:flex;}
+.r-4qtqp9{display:inline-block;}
+.r-crgep1{margin-bottom:0px;margin-left:0px;margin-right:0px;margin-top:0px;}
+.r-t60dpp{padding-bottom:0px;padding-left:0px;padding-right:0px;padding-top:0px;}
+.r-1yadl64{border-bottom-width:0px;border-left-width:0px;border-right-width:0px;border-top-width:0px;}
+.r-42olwf{border-bottom-color:rgba(0,0,0,0.00);border-left-color:rgba(0,0,0,0.00);border-right-color:rgba(0,0,0,0.00);border-top-color:rgba(0,0,0,0.00);}
+.r-17gur6a{border-bottom-left-radius:0px;border-bottom-right-radius:0px;border-top-left-radius:0px;border-top-right-radius:0px;}
+.r-xyw6el{padding-bottom:12px;padding-left:12px;padding-right:12px;padding-top:12px;}
+.r-jxzhtn{border-bottom-color:rgba(239,243,244,1.00);border-left-color:rgba(239,243,244,1.00);border-right-color:rgba(239,243,244,1.00);border-top-color:rgba(239,243,244,1.00);}
+.r-1adg3ll{display:block;}
+.r-bztko3{overflow-x:visible;overflow-y:visible;}
+.r-xoduu5{display:-webkit-inline-box;display:-moz-inline-box;display:-ms-inline-flexbox;display:-webkit-inline-flex;display:inline-flex;}
+.r-xf4iuw{margin-bottom:-8px;margin-left:-8px;margin-right:-8px;margin-top:-8px;}
+.r-1ets6dv{border-bottom-color:rgba(207,217,222,1.00);border-left-color:rgba(207,217,222,1.00);border-right-color:rgba(207,217,222,1.00);border-top-color:rgba(207,217,222,1.00);}
+.r-1867qdf{border-bottom-left-radius:16px;border-bottom-right-radius:16px;border-top-left-radius:16px;border-top-right-radius:16px;}
+.r-1471scf{display:inline;}
+[stylesheet-group="2.1"]{}
+.r-1jgb5lz{margin-left:auto;margin-right:auto;}
+.r-ymttw5{padding-left:16px;padding-right:16px;}
+.r-oyd9sg{padding-bottom:4px;padding-top:4px;}
+.r-1fz3rvf{margin-left:12px;margin-right:12px;}
+.r-rjfia{padding-bottom:0px;padding-top:0px;}
+.r-1r5su4o{margin-bottom:16px;margin-top:16px;}
+.r-s1qlax{padding-left:4px;padding-right:4px;}
+.r-1e081e0{padding-left:12px;padding-right:12px;}
+.r-1pn2ns4{padding-left:8px;padding-right:8px;}
+.r-1yzf0co{padding-bottom:16px;padding-top:16px;}
+[stylesheet-group="2.2"]{}
+.r-12vffkv>*{pointer-events:auto;}
+.r-12vffkv{pointer-events:none!important;}
+.r-2llsf{min-height:100%;}
+.r-13qz1uu{width:100%;}
+.r-417010{z-index:0;}
+.r-lrvibr{-moz-user-select:none;-ms-user-select:none;-webkit-user-select:none;user-select:none;}
+.r-1xk2f4g{clip:rect(1px, 1px, 1px, 1px);}
+.r-109y4c4{height:1px;}
+.r-u8s1d{position:absolute;}
+.r-92ng3h{width:1px;}
+.r-2yi16{min-height:36px;}
+.r-1qi8awa{min-width:36px;}
+.r-o7ynqc{-webkit-transition-duration:0.2s;transition-duration:0.2s;}
+.r-6416eg{-moz-transition-property:background-color, box-shadow;-webkit-transition-property:background-color, box-shadow;transition-property:background-color, box-shadow;}
+.r-1ny4l3l{outline-style:none;}
+.r-bcqeeo{min-width:0px;}
+.r-qvutc0{word-wrap:break-word;}
+.r-rjixqe{line-height:20px;}
+.r-37j5jr{font-family:"TwitterChirp",-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Helvetica,Arial,sans-serif;}
+.r-q4m81j{text-align:center;}
+.r-a023e6{font-size:15px;}
+.r-b88u0q{font-weight:700;}
+.r-1awozwy{-ms-flex-align:center;-webkit-align-items:center;-webkit-box-align:center;align-items:center;}
+.r-18u37iz{-ms-flex-direction:row;-webkit-box-direction:normal;-webkit-box-orient:horizontal;-webkit-flex-direction:row;flex-direction:row;}
+.r-16y2uox{-ms-flex-positive:1;-webkit-box-flex:1;-webkit-flex-grow:1;flex-grow:1;}
+.r-1777fci{-ms-flex-pack:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;}
+.r-poiln3{font-family:inherit;}
+.r-1g40b8q{z-index:3;}
+.r-orgf3d{opacity:0;}
+.r-633pao{pointer-events:none!important;}
+.r-1d2f490{left:0px;}
+.r-1xcajam{position:fixed;}
+.r-zchlnj{right:0px;}
+.r-1gn8etr{top:-0.5px;}
+.r-dkhcqf{-webkit-transition-duration:350ms;transition-duration:350ms;}
+.r-axxi2z{-moz-transition-property:transform;-webkit-transition-property:-webkit-transform,transform;transition-property:-webkit-transform,transform;}
+.r-18jm5s1{-webkit-transition-timing-function:cubic-bezier(0,0,0,1);transition-timing-function:cubic-bezier(0,0,0,1);}
+.r-16e0dcy{-webkit-transform:translate3d(0, 0, 0) translateY(0px);transform:translate3d(0, 0, 0) translateY(0px);}
+.r-1e5uvyk{-webkit-backdrop-filter:blur(12px);backdrop-filter:blur(12px);}
+.r-6026j{background-color:rgba(255,255,255,0.85);}
+.r-136ojw6{z-index:2;}
+.r-fxvszc{height:106px;}
+.r-1h3ijdo{height:53px;}
+.r-1pz39u2{-ms-flex-item-align:stretch;-ms-grid-row-align:stretch;-webkit-align-self:stretch;align-self:stretch;}
+.r-15ysp7h{min-height:32px;}
+.r-4wgw6l{min-width:32px;}
+.r-1habvwh{-ms-flex-align:start;-webkit-align-items:flex-start;-webkit-box-align:start;align-items:flex-start;}
+.r-s8bhmr{min-width:56px;}
+.r-1mf7evn{margin-right:20px;}
+.r-1loqt21{cursor:pointer;}
+.r-yyyyoo{fill:currentcolor;}
+.r-1xvli5t{height:1.25em;}
+.r-dnmrzs{max-width:100%;}
+.r-bnwqim{position:relative;}
+.r-1plcrui{vertical-align:text-bottom;}
+.r-z80fyv{height:20px;}
+.r-19wmn03{width:20px;}
+.r-1cvl2hr{color:rgba(29,155,240,1.00);}
+.r-lwhw9o{height:1.75rem;}
+.r-1wbh5a2{-ms-flex-negative:1;-webkit-flex-shrink:1;flex-shrink:1;}
+.r-1pi2tsx{height:100%;}
+.r-1iusvr4{-ms-flex-preferred-size:0px;-webkit-flex-basis:0px;flex-basis:0px;}
+.r-1oszu61{-ms-flex-align:stretch;-webkit-align-items:stretch;-webkit-box-align:stretch;align-items:stretch;}
+.r-eqz5dr{-ms-flex-direction:column;-webkit-box-direction:normal;-webkit-box-orient:vertical;-webkit-flex-direction:column;flex-direction:column;}
+.r-8fdsdq{z-index:4;}
+.r-vqxq0j{border:0 solid black;}
+.r-deolkf{box-sizing:border-box;}
+.r-1mlwlqe{-ms-flex-preferred-size:auto;-webkit-flex-basis:auto;flex-basis:auto;}
+.r-ifefl9{min-height:0px;}
+.r-1sw30gj{background-color:rgba(239,243,244,1.00);}
+.r-1dqbpge{cursor:-webkit-text;cursor:text;}
+.r-7q8q6z{cursor:default;}
+.r-14j79pv{color:rgba(83,100,113,1.00);}
+.r-f727ji{padding-left:12px;}
+.r-16dba41{font-weight:400;}
+.r-30o5oe{-moz-appearance:none;-webkit-appearance:none;appearance:none;}
+.r-1dz5y72{resize:none;}
+.r-1niwhzg{background-color:rgba(0,0,0,0.00);}
+.r-homxoj{color:inherit;}
+.r-7cikom{font-size:inherit;}
+.r-1ttztb7{text-align:inherit;}
+.r-fdjqy7{text-align:left;}
+.r-y0fyvk::-webkit-input-placeholder{color:rgba(83,100,113,1.00);opacity:1;}
+.r-y0fyvk::-moz-placeholder{color:rgba(83,100,113,1.00);opacity:1;}
+.r-y0fyvk:-ms-input-placeholder{color:rgba(83,100,113,1.00);opacity:1;}
+.r-y0fyvk::placeholder{color:rgba(83,100,113,1.00);opacity:1;}
+.r-obd0qt{-ms-flex-align:end;-webkit-align-items:flex-end;-webkit-box-align:end;align-items:flex-end;}
+.r-1d4mawv{margin-right:4px;}
+.r-1w6e6rj{-ms-flex-wrap:wrap;-webkit-box-lines:multiple;-webkit-flex-wrap:wrap;flex-wrap:wrap;}
+.r-1wtj0ep{-ms-flex-pack:justify;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;}
+.r-1b43r93{font-size:14px;}
+.r-1cwl3u0{line-height:16px;}
+.r-19u6a5r{margin-left:12px;}
+.r-1lul07w{-webkit-transform:translate3d(0, -3.5em, 0);transform:translate3d(0, -3.5em, 0);}
+.r-eafdt9{-webkit-transition-duration:0.15s;transition-duration:0.15s;}
+.r-1b8bd59{-moz-transition-property:transform, opacity;-webkit-transition-property:-webkit-transform,transform, opacity;transition-property:-webkit-transform,transform, opacity;}
+.r-nx0j10{-webkit-transition-timing-function:ease, ease, step-end;transition-timing-function:ease, ease, step-end;}
+.r-l5o3uw{background-color:rgba(29,155,240,1.00);}
+.r-y3da5r{box-shadow:0 0 8px rgba(101,119,134,0.2), 0 1px 3px 1px rgba(101,119,134,0.25);}
+.r-1kihuf0{-ms-flex-item-align:center;-ms-grid-row-align:center;-webkit-align-self:center;align-self:center;}
+.r-jwli3a{color:rgba(255,255,255,1.00);}
+.r-13hce6t{margin-left:4px;}
+.r-150rngu{-webkit-overflow-scrolling:touch;}
+.r-aqfbo4{-webkit-backface-visibility:hidden;backface-visibility:hidden;}
+.r-14lw9ot{background-color:rgba(255,255,255,1.00);}
+.r-1ljd8xs{border-left-width:1px;}
+.r-13l2t4g{border-right-width:1px;}
+.r-33ulu8{width:600px;}
+.r-184en5c{z-index:1;}
+.r-1ut4w64{margin-bottom:-1px;}
+.r-1qhn6m8{padding-left:16px;}
+.r-i023vh{padding-right:16px;}
+.r-ttdzmv{padding-top:12px;}
+.r-18kxxzh{-ms-flex-positive:0;-webkit-box-flex:0;-webkit-flex-grow:0;flex-grow:0;}
+.r-1b7u577{margin-right:12px;}
+.r-1hwvwag{-ms-flex-preferred-size:48px;-webkit-flex-basis:48px;flex-basis:48px;}
+.r-1p0dtai{bottom:0px;}
+.r-ipm5af{top:0px;}
+.r-1wyvozj{left:50%;}
+.r-1v2oles{top:50%;}
+.r-desppf{-webkit-transform:translateX(-50%) translateY(-50%);transform:translateX(-50%) translateY(-50%);}
+.r-ggadg3{left:-2px;}
+.r-8jfcpp{top:-2px;}
+.r-vvn4in{background-position:center;}
+.r-u6sd8q{background-repeat:no-repeat;}
+.r-4gszlv{background-size:cover;}
+.r-1wyyakw{z-index:-1;}
+.r-12181gd{box-shadow:0 0 2px rgba(0,0,0,0.03) inset;}
+.r-1bimlpy{background-color:rgba(207,217,222,1.00);}
+.r-m5arl1{width:2px;}
+.r-14gqq1x{margin-top:4px;}
+.r-kzbkwu{padding-bottom:12px;}
+.r-zl2h9q{margin-bottom:2px;}
+.r-k4xj1c{-ms-flex-align:start;-webkit-align-items:start;-webkit-box-align:start;align-items:start;}
+.r-1d09ksm{-ms-flex-align:baseline;-webkit-align-items:baseline;-webkit-box-align:baseline;align-items:baseline;}
+.r-3s2u2q{white-space:nowrap;}
+.r-1q142lx{-ms-flex-negative:0;-webkit-flex-shrink:0;flex-shrink:0;}
+.r-1wvb978{-webkit-font-feature-settings:'ss01' on;font-feature-settings:'ss01' on;}
+.r-9aw3ui{gap:4px;}
+.r-1ta3fxp{-moz-column-gap:8px;-webkit-column-gap:8px;column-gap:8px;}
+.r-1mdbhws{max-width:425px;}
+.r-1s2bzr4{margin-top:12px;}
+.r-1h0z5md{-ms-flex-pack:start;-webkit-box-pack:start;-webkit-justify-content:flex-start;justify-content:flex-start;}
+.r-bt1l66{min-height:20px;}
+.r-clp7b1{-moz-transition-property:color;-webkit-transition-property:color;transition-property:color;}
+.r-1hdv0qi{width:1.25em;}
+.r-n6v787{font-size:13px;}
+.r-1k6nrdp{min-width:calc(1em + 2 * 12px);}
+.r-vc7bo5{min-width:calc(1em + 2 * 8px);}
+.r-j5o65s{border-bottom-color:rgba(239,243,244,1.00);}
+.r-qklmqi{border-bottom-width:1px;}
+.r-15zivkp{margin-bottom:4px;}
+.r-1inkyih{font-size:17px;}
+.r-1ssbvtb{gap:12px;}
+.r-1dgieki{border-top-color:rgba(239,243,244,1.00);}
+.r-1efd50x{border-top-style:solid;}
+.r-5kkj8d{border-top-width:1px;}
+.r-a2tzq0{-ms-flex-pack:distribute;-webkit-box-pack:justify;-webkit-justify-content:space-around;justify-content:space-around;}
+.r-3qxfft{min-height:1.875rem;}
+.r-h3s6tt{height:48px;}
+.r-50lct3{height:1.5em;}
+.r-1srniue{width:1.5em;}
+.r-rull8r{border-bottom-style:solid;}
+.r-o52ifk{height:100px;}
+.r-17bb2tj{-webkit-animation-duration:0.75s;animation-duration:0.75s;}
+.r-1muvv40{-webkit-animation-iteration-count:infinite;animation-iteration-count:infinite;}
+.r-127358a{-webkit-animation-name:r-9p3sdl;animation-name:r-9p3sdl;}
+@-webkit-keyframes r-9p3sdl{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg);}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg);}}
+@keyframes r-9p3sdl{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg);}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg);}}
+.r-1ldzwu0{-webkit-animation-timing-function:linear;animation-timing-function:linear;}</style>
+<title data-rh="true">Jeff Atwood on Twitter: "My first text message from my child! A moment that shall live on in infamy! https://t.co/TQMRJsFwnO" / Twitter</title>
+<meta data-rh="true" content="article" property="og:type">
+<meta data-rh="true" content="https://twitter.com/codinghorror/status/1409351083177046020" property="og:url">
+<meta data-rh="true" content="Jeff Atwood on Twitter" property="og:title">
+<meta data-rh="true" content="“My first text message from my child! A moment that shall live on in infamy!”" property="og:description">
+<meta data-rh="true" content="https://pbs.twimg.com/media/E48FVowUUAYyGLX.jpg:large" property="og:image">
+<meta data-rh="true" description="" name="description"> <link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020" rel="canonical">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020" hreflang="x-default" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=ar" hreflang="ar" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=ar-x-fm" hreflang="ar-x-fm" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=bg" hreflang="bg" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=bn" hreflang="bn" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=ca" hreflang="ca" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=cs" hreflang="cs" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=da" hreflang="da" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=de" hreflang="de" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=el" hreflang="el" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=en" hreflang="en" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=en-GB" hreflang="en-GB" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=es" hreflang="es" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=eu" hreflang="eu" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=fa" hreflang="fa" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=fi" hreflang="fi" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=fil" hreflang="fil" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=fr" hreflang="fr" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=ga" hreflang="ga" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=gl" hreflang="gl" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=gu" hreflang="gu" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=ha" hreflang="ha" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=he" hreflang="he" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=hi" hreflang="hi" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=hr" hreflang="hr" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=hu" hreflang="hu" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=id" hreflang="id" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=ig" hreflang="ig" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=it" hreflang="it" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=ja" hreflang="ja" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=kn" hreflang="kn" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=ko" hreflang="ko" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=mr" hreflang="mr" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=ms" hreflang="ms" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=nb" hreflang="nb" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=nl" hreflang="nl" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=no" hreflang="no" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=pl" hreflang="pl" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=pt" hreflang="pt" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=ro" hreflang="ro" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=ru" hreflang="ru" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=sk" hreflang="sk" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=sr" hreflang="sr" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=sv" hreflang="sv" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=ta" hreflang="ta" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=th" hreflang="th" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=tl" hreflang="tl" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=tr" hreflang="tr" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=uk" hreflang="uk" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=ur" hreflang="ur" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=vi" hreflang="vi" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=yo" hreflang="yo" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=zh" hreflang="zh" rel="alternate">
+<link data-rh="true" href="https://twitter.com/codinghorror/status/1409351083177046020?lang=zh-Hant" hreflang="zh-Hant" rel="alternate"> <meta data-rh="true" content="twitter://status?id=1409351083177046020" property="al:ios:url">
+<meta data-rh="true" content="333903271" property="al:ios:app_store_id">
+<meta data-rh="true" content="Twitter" property="al:ios:app_name">
+<meta data-rh="true" content="twitter://status?id=1409351083177046020" property="al:android:url">
+<meta data-rh="true" content="com.twitter.android" property="al:android:package">
+<meta data-rh="true" content="Twitter" property="al:android:app_name">
+</head>
+<body style="background-color: #FFFFFF;">
+  <noscript>
+    <style>
+    body {
+      -ms-overflow-style: scrollbar;
+      overflow-y: scroll;
+      overscroll-behavior-y: none;
     }
 
-    .DashboardProfileCard-bg {
-      background-image: url(https://pbs.twimg.com/profile_banners/5637652/1398207303/600x200);
+    .errorContainer {
+      background-color: #FFF;
+      color: #0F1419;
+      max-width: 600px;
+      margin: 0 auto;
+      padding: 10%;
+      font-family: Helvetica, sans-serif;
+      font-size: 16px;
     }
 
-</style>
-
-
-
-
-          </div>
-        </div>
-    </div>
-    <div class="alert-messages hidden" id="message-drawer">
-    <div class="message ">
-  <div class="message-inside">
-    <span class="message-text"></span>
-      <a role="button" class="Icon Icon--close Icon--medium dismiss" href="#">
-        <span class="visuallyhidden">Dismiss</span>
-      </a>
-  </div>
-</div>
-</div>
-
-    
-
-
-<div class="gallery-overlay"></div>
-<div class="Gallery with-tweet">
-  <style class="Gallery-styles"></style>
-  <div class="Gallery-closeTarget"></div>
-  <div class="Gallery-content">
-    <div class="GalleryTweet-newsCameraBadge"></div>
-    <button type="button" class="modal-btn modal-close modal-close-fixed js-close">
-  <span class="Icon Icon--close Icon--large">
-    <span class="visuallyhidden">Close</span>
-  </span>
-</button>
-
-    <div class="Gallery-media"></div>
-    <div class="GalleryNav GalleryNav--prev">
-      <span class="GalleryNav-handle GalleryNav-handle--prev">
-        <span class="Icon Icon--caretLeft Icon--large">
-          <span class="u-hiddenVisually">
-            Previous
-          </span>
-        </span>
-      </span>
-    </div>
-    <div class="GalleryNav GalleryNav--next">
-      <span class="GalleryNav-handle GalleryNav-handle--next">
-        <span class="Icon Icon--caretRight Icon--large">
-          <span class="u-hiddenVisually">
-            Next
-          </span>
-        </span>
-      </span>
-    </div>
-    <div class="GalleryTweet"></div>
-  </div>
-</div>
-
-
-<div class="modal-overlay"></div>
-
-<div id="profile-hover-container"></div>
-
-
-<div id="goto-user-dialog" class="modal-container">
-  <div class="modal modal-small draggable">
-    <div class="modal-content">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Close</span>
-  </span>
-</button>
-
-
-      <div class="modal-header">
-        <h3 class="modal-title">Go to a person's profile</h3>
-      </div>
-
-      <div class="modal-body">
-        <div class="modal-inner">
-          <form class="t1-form goto-user-form">
-            <input class="input-block username-input" type="text" placeholder="Start typing a name to jump to a profile" aria-label="User">
-            
-
-
-<div role="listbox" class="dropdown-menu typeahead">
-  <div aria-hidden="true" class="dropdown-caret">
-    <div class="caret-outer"></div>
-    <div class="caret-inner"></div>
-  </div>
-  <div role="presentation" class="dropdown-inner js-typeahead-results">
-    <div role="presentation" class="typeahead-saved-searches">
-  <h3 id="saved-searches-heading" class="typeahead-category-title saved-searches-title">Saved searches</h3>
-  <ul role="presentation" class="typeahead-items saved-searches-list">
-    
-    <li role="presentation" class="typeahead-item typeahead-saved-search-item">
-      <span class="Icon Icon--close" aria-hidden="true"><span class="visuallyhidden">Remove</span></span>
-      <a role="option" aria-describedby="saved-searches-heading" class="js-nav" href="" data-search-query="" data-query-source="" data-ds="saved_search" tabindex="-1"></a>
-    </li>
-  </ul>
-</div>
-
-    <ul role="presentation" class="typeahead-items typeahead-topics">
-  
-  <li role="presentation" class="typeahead-item typeahead-topic-item">
-    <a role="option" class="js-nav" href="" data-search-query="" data-query-source="typeahead_click" data-ds="topics" tabindex="-1"></a>
-  </li>
-</ul>
-    <ul role="presentation" class="typeahead-items typeahead-accounts social-context js-typeahead-accounts">
-  
-  <li role="presentation" data-user-id="" data-user-screenname="" data-remote="true" data-score="" class="typeahead-item typeahead-account-item js-selectable">
-    
-    <a role="option" class="js-nav" data-query-source="typeahead_click" data-search-query="" data-ds="account">
-      <div class="js-selectable typeahead-in-conversation hidden">
-        <span class="Icon Icon--follower Icon--small"></span>
-        <span class="typeahead-in-conversation-text">In this conversation</span>
-      </div>
-      <img class="avatar size32" alt="">
-      <span class="typeahead-user-item-info account-group">
-        <span class="fullname"></span><span class="UserBadges"><span class="Icon Icon--verified js-verified hidden"><span class="u-hiddenVisually">Verified account</span></span><span class="Icon Icon--protected js-protected hidden"><span class="u-hiddenVisually">Protected Tweets</span></span></span><span class="UserNameBreak">&nbsp;</span><span class="username u-dir" dir="ltr">@<b></b></span>
-      </span>
-      <span class="typeahead-social-context"></span>
-    </a>
-  </li>
-  <li role="presentation" class="js-selectable typeahead-accounts-shortcut js-shortcut"><a role="option" class="js-nav" href="" data-search-query="" data-query-source="typeahead_click" data-shortcut="true" data-ds="account_search"></a></li>
-</ul>
-
-    <ul role="presentation" class="typeahead-items typeahead-trend-locations-list">
-  
-  <li role="presentation" class="typeahead-item typeahead-trend-locations-item"><a role="option" class="js-nav" href="" data-ds="trend_location" data-search-query="" tabindex="-1"></a></li>
-</ul>
-    
-<div role="presentation" class="typeahead-user-select">
-  <div role="presentation" class="typeahead-empty-suggestions">
-    Suggested users
-  </div>
-  <ul role="presentation" class="typeahead-items typeahead-selected js-typeahead-selected">
-    
-    <li role="presentation" data-user-id="" data-user-screenname="" data-remote="true" data-score="" class="typeahead-item typeahead-selected-item js-selectable">
-      
-      <a role="option" class="js-nav" data-query-source="typeahead_click" data-search-query="" data-ds="account">
-        <img class="avatar size32" alt="">
-        <span class="typeahead-user-item-info account-group">
-          <span class="select-status deselect-user js-deselect-user Icon Icon--check"></span>
-          <span class="select-status select-disabled Icon Icon--unfollow"></span>
-          <span class="fullname"></span><span class="UserBadges"><span class="Icon Icon--verified js-verified hidden"><span class="u-hiddenVisually">Verified account</span></span><span class="Icon Icon--protected js-protected hidden"><span class="u-hiddenVisually">Protected Tweets</span></span></span><span class="UserNameBreak">&nbsp;</span><span class="username u-dir" dir="ltr">@<b></b></span>
-        </span>
-      </a>
-    </li>
-    <li role="presentation" class="typeahead-selected-end"></li>
-  </ul>
-
-  <ul role="presentation" class="typeahead-items typeahead-accounts js-typeahead-accounts">
-    
-    <li role="presentation" data-user-id="" data-user-screenname="" data-remote="true" data-score="" class="typeahead-item typeahead-account-item js-selectable">
-      
-      <a role="option" class="js-nav" data-query-source="typeahead_click" data-search-query="" data-ds="account">
-        <img class="avatar size32" alt="">
-        <span class="typeahead-user-item-info account-group">
-          <span class="select-status deselect-user js-deselect-user Icon Icon--check"></span>
-          <span class="select-status select-disabled Icon Icon--unfollow"></span>
-          <span class="fullname"></span><span class="UserBadges"><span class="Icon Icon--verified js-verified hidden"><span class="u-hiddenVisually">Verified account</span></span><span class="Icon Icon--protected js-protected hidden"><span class="u-hiddenVisually">Protected Tweets</span></span></span><span class="UserNameBreak">&nbsp;</span><span class="username u-dir" dir="ltr">@<b></b></span>
-        </span>
-      </a>
-    </li>
-    <li role="presentation" class="typeahead-accounts-end"></li>
-  </ul>
-</div>
-
-    <div role="presentation" class="typeahead-dm-conversations">
-  <ul role="presentation" class="typeahead-items typeahead-dm-conversation-items">
-    <li role="presentation" class="typeahead-item typeahead-dm-conversation-item">
-      <a role="option" tabindex="-1"></a>
-    </li>
-  </ul>
-</div>
-  </div>
-</div>
-
-          </form>
-        </div>
-      </div>
-
-    </div>
-  </div>
-</div>
-
-<div id="quick-promote-dialog" class="QuickPromoteDialog modal-container">
-  <div class="modal draggable">
-    <div class="modal-content">
-      <button type="button" class="modal-btn modal-close modal-close-fixed js-close">
-  <span class="Icon Icon--close Icon--large">
-    <span class="visuallyhidden">Close</span>
-  </span>
-</button>
-
-      <div class="modal-header">
-        <h3 class="modal-title">Promote this Tweet</h3>
-      </div>
-      <div class="modal-body">
-        <div class="quick-promote-view-container">
-          <div class="media">
-            <iframe
-              class="quick-promote-iframe js-initial-focus"
-              scrolling="no"
-              frameborder="0"
-              src="">
-            </iframe>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div id="block-user-dialog" class="modal-container">
-  <div class="modal draggable">
-    <div class="modal-content">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Close</span>
-  </span>
-</button>
-
-
-      <div class="modal-header">
-        <h3 class="modal-title">Block</h3>
-      </div>
-
-      <div class="tweet-loading">
-  <div class="spinner-bigger"></div>
-</div>
-
-      <div class="modal-body modal-tweet"></div>
-
-      <div class="modal-footer">
-        <button class="EdgeButton EdgeButton--tertiary cancel-action js-close">Cancel</button>
-        <button class="EdgeButton EdgeButton--danger block-action">Block</button>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-
-
-
-
-   <div id="geo-disabled-dropdown">
-    <div tabindex="-1">
-  <div class="dropdown-caret">
-    <span class="caret-outer"></span>
-    <span class="caret-inner"></span>
-  </div>
-  <ul>
-    <li class="geo-not-enabled-yet">
-      <h2>Tweet with a location</h2>
-      <p>
-        You can add location information to your Tweets, such as your city or precise location, from the web and via third-party applications. You always have the option to delete your Tweet location history.
-        <a href="http://support.twitter.com/forums/26810/entries/78525" target="_blank" rel="noopener">Learn more</a>
-      </p>
-      <div>
-        <button type="button" class="geo-turn-on EdgeButton EdgeButton--primary">Turn on</button>
-        <button type="button" class="geo-not-now EdgeButton EdgeButton--secondary">Not now</button>
-      </div>
-    </li>
-  </ul>
-</div>
-
-  </div>
-
-<div id="geo-enabled-dropdown">
-  <div tabindex="-1">
-  <div class="dropdown-caret">
-    <span class="caret-outer"></span>
-    <span class="caret-inner"></span>
-  </div>
-  <div>
-    <div class="geo-query-location">
-      <input class="GeoSearch-queryInput" type="text" autocomplete="off" placeholder="Search for a neighborhood or city">
-      <span class="Icon Icon--search"></span>
-    </div>
-    <div class="geo-dropdown-status"></div>
-    <ul class="GeoSearch-dropdownMenu"></ul>
-  </div>
-</div>
-
-</div>
-
-
-
-  <div id="list-membership-dialog" class="modal-container">
-  <div class="modal modal-small draggable">
-    <div class="modal-content">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Close</span>
-  </span>
-</button>
-
-      <div class="modal-header">
-        <h3 class="modal-title">Your lists</h3>
-      </div>
-      <div class="modal-body">
-        <div class="list-membership-content"></div>
-        <span class="spinner lists-spinner" title="Loading&hellip;"></span>
-      </div>
-    </div>
-  </div>
-</div>
-  <div id="list-operations-dialog" class="modal-container">
-  <div class="modal modal-medium draggable">
-    <div class="modal-content">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Close</span>
-  </span>
-</button>
-
-      <div class="modal-header">
-        <h3 class="modal-title">Create a new list</h3>
-      </div>
-      <div class="modal-body">
-        <div class="list-editor">
-  <div class="field">
-    <label class="t1-label" for="list-name">List name</label>
-    <input id="list-name" type="text" class="text" name="name" value="" />
-  </div>
-  <hr/>
-
-  <div class="field">
-    <label class="t1-label" for="list-description">Description</label>
-    <textarea id="list-description" name="description"></textarea>
-    <span class="help-text">Under 100 characters, optional</span>
-  </div>
-  <hr/>
-
-  <fieldset class="field">
-    <legend class="t1-legend">Privacy</legend>
-    <div class="options">
-      <label class="t1-label" for="list-public-radio">
-        <input class="radio" type="radio" name="mode" id="list-public-radio" value="public" checked="checked"  />
-        <b>Public</b> &middot; Anyone can follow this list
-      </label>
-      <label class="t1-label" for="list-private-radio">
-        <input class="radio" type="radio" name="mode" id="list-private-radio" value="private"  />
-        <b>Private</b> &middot; Only you can access this list
-      </label>
-    </div>
-  </fieldset>
-  <hr/>
-
-  <div class="list-editor-save">
-    <button type="button" class="EdgeButton EdgeButton--secondary update-list-button" data-list-id="">Save list</button>
-  </div>
-</div>
-
-      </div>
-    </div>
-  </div>
-</div>
-
-<div id="activity-popup-dialog" class="modal-container">
-  <div class="modal draggable">
-    <div class="modal-content clearfix">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Close</span>
-  </span>
-</button>
-
-
-      <div class="modal-header">
-        <h3 class="modal-title"></h3>
-      </div>
-
-      <div class="modal-body">
-        <div class="tweet-loading">
-  <div class="spinner-bigger"></div>
-</div>
-
-        <div class="activity-popup-dialog-content modal-tweet clearfix"></div>
-        <div class="loading">
-          <span class="spinner-bigger"></span>
-        </div>
-        <div class="activity-popup-dialog-users clearfix"></div>
-        <div class="activity-popup-dialog-footer"></div>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-
-
-<div id="copy-link-to-tweet-dialog" class="modal-container">
-  <div class="modal modal-medium draggable">
-    <div class="modal-content">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Close</span>
-  </span>
-</button>
-
-      <div class="modal-header">
-        <h3 class="modal-title">Copy link to Tweet</h3>
-      </div>
-      <div class="modal-body">
-        <div class="copy-link-to-tweet-container">
-          <label class="t1-label">
-            <p class="copy-link-to-tweet-instructions">Here's the URL for this Tweet. Copy it to easily share with friends.</p>
-            <textarea class="link-to-tweet-destination js-initial-focus u-dir" dir="ltr" readonly></textarea>
-          </label>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div id="embed-tweet-dialog" class="modal-container">
-  <div class="modal modal-medium draggable">
-    <div class="modal-content">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Close</span>
-  </span>
-</button>
-
-      <div class="modal-header">
-        <h3 class="modal-title embed-tweet-title">Embed this Tweet</h3>
-        <h3 class="modal-title embed-video-title">Embed this Video</h3>
-      </div>
-      <div class="modal-body">
-        <div class="embed-code-container">
-  <p class="embed-tweet-instructions">Add this Tweet to your website by copying the code below. <a href="https://dev.twitter.com/web/embedded-tweets" target="_blank" rel="noopener">Learn more</a></p>
-  <p class="embed-video-instructions">Add this video to your website by copying the code below. <a href="https://dev.twitter.com/web/embedded-tweets" target="_blank" rel="noopener">Learn more</a></p>
-  <form class="t1-form">
-
-    <div class="embed-destination-wrapper">
-      <div class="embed-overlay embed-overlay-spinner"><div class="embed-overlay-content"></div></div>
-      <div class="embed-overlay embed-overlay-error">
-        <p class="embed-overlay-content">Hmm, there was a problem reaching the server. <button type="button" class="btn-link retry-embed">Try again?</button></p>
-      </div>
-      <textarea class="embed-destination js-initial-focus"></textarea>
-      <div class="embed-options">
-        <div class="embed-include-parent-tweet">
-          <label class="t1-label" for="include-parent-tweet">
-            <input type="checkbox" id="include-parent-tweet" class="include-parent-tweet" checked>
-            Include parent Tweet
-          </label>
-        </div>
-        <div class="embed-include-card">
-          <label class="t1-label" for="include-card">
-            <input type="checkbox" id="include-card" class="include-card" checked>
-            Include media
-          </label>
-        </div>
-      </div>
-    </div>
-  </form>
-  <p class="embed-tweet-description">By embedding Twitter content in your website or app, you are agreeing to the Twitter <a href="https://dev.twitter.com/overview/terms/agreement" rel="noopener">Developer Agreement</a> and <a href="https://dev.twitter.com/overview/terms/policy" rel="noopener">Developer Policy</a>.</p>
-  <h3 class="embed-preview-header">Preview</h3>
-  <div class="embed-preview">
-  </div>
-</div>
-
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div id="why-this-ad-dialog" class="modal-container why-this-ad-dialog">
-  <div class="modal modal-large draggable">
-    <div class="modal-content">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Close</span>
-  </span>
-</button>
-
-      <div class="modal-header">
-        <h3 class="modal-title why-this-ad-title">Why you're seeing this ad</h3>
-      </div>
-      <div class="why-this-ad-content">
-        <div class="why-this-ad-spinner">
-          <div class="spinner-bigger"></div>
-        </div>
-        <iframe id="why-this-ad-frame" class="hidden" aria-hidden="true" scrolling="auto">
-        </iframe>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-
-  <div id="login-dialog" class="LoginDialog modal-container u-textCenter">
-  <div class="modal modal-large draggable">
-    <div class="LoginDialog-content modal-content">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Close</span>
-  </span>
-</button>
-
-      <div class="modal-header">
-        <h3 class="modal-title">Log in to Twitter</h3>
-      </div>
-      <div class="LoginDialog-body modal-body">
-        <div class="LoginDialog-bird">
-          <span class="Icon Icon--bird Icon--large"></span>
-        </div>
-        <div class="LoginDialog-form">
-<form action="https://twitter.com/sessions" class="LoginForm js-front-signin" method="post"
-  data-component="dialog"
-  data-element="login"
->
-  <div class="LoginForm-input LoginForm-username">
-    <input
-      type="text"
-      class="text-input email-input js-signin-email"
-      name="session[username_or_email]"
-      autocomplete="username"
-      placeholder="Phone, email, or username"
-    />
-  </div>
-
-  <div class="LoginForm-input LoginForm-password">
-    <input type="password" class="text-input" name="session[password]" placeholder="Password" autocomplete="current-password">
-    
-  </div>
-
-    <div class="LoginForm-rememberForgot">
-      <label>
-        <input type="checkbox" value="1" name="remember_me" checked="checked">
-        <span>Remember me</span>
-      </label>
-      <span class="separator">&middot;</span>
-      <a class="forgot" href="/account/begin_password_reset" rel="noopener">Forgot password?</a>
-    </div>
-
-  <input type="submit" class="EdgeButton EdgeButton--primary EdgeButton--medium submit js-submit" value="Log in">
-
-    <input type="hidden" name="return_to_ssl" value="true">
-
-  <input type="hidden" name="scribe_log">
-  <input type="hidden" name="redirect_after_login" value="/codinghorror/status/1409351083177046020">
-  <input type="hidden" value="46a6f55f84bf8fb45d8b56ce053c0606e73735e0" name="authenticity_token">
-      <input type="hidden" name="ui_metrics" autocomplete="off">
-      <script src="/i/js_inst?c_name=ui_metrics" async></script>
-</form>
-        </div>
-      </div>
-      <div class="LoginDialog-footer modal-footer u-textCenter">
-        Don't have an account? <a class="LoginDialog-signupLink" href="https://twitter.com/signup" rel="noopener">Sign up &raquo;</a>
-      </div>
-    </div>
-  </div>
-</div>
-
-  <div id="signup-dialog" class="SignupDialog modal-container u-textCenter">
-  <div class="modal modal-large draggable">
-    <div class="SignupDialog-content modal-content">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Close</span>
-  </span>
-</button>
-
-      <div class="modal-header">
-        <h3 class="modal-title">Sign up for Twitter</h3>
-      </div>
-      <div class="SignupDialog-body modal-body">
-        <div class="SignupDialog-icon">
-          <span class="Icon Icon--bird Icon--extraLarge"></span>
-        </div>
-        <h2 class="SignupDialog-heading">Not on Twitter? Sign up, tune into the things you care about, and get updates as they happen.</h2>
-        <div class="SignupDialog-form">
-<div class="signup SignupForm
-  ">
-  <a href="https://twitter.com/signup" role="button" class="EdgeButton EdgeButton--large EdgeButton--primary SignupForm-submit u-block js-signup "
-  data-component="dialog"
-  data-element="signup"
-  >Sign up</a>
-</div>
-        </div>
-      </div>
-      <div class="SignupDialog-footer modal-footer u-textCenter">
-        Have an account? <a class="SignupDialog-signinLink" href="/login" rel="noopener">Log in &raquo;</a>
-      </div>
-    </div>
-  </div>
-</div>
-
-  <div id="sms-codes-dialog" class="modal-container">
-  <div class="modal modal-medium draggable">
-    <div class="modal-content">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Close</span>
-  </span>
-</button>
-
-      <div class="modal-header">
-        <h3 class="modal-title">Two-way (sending and receiving) short codes:</h3>
-      </div>
-      <div class="modal-body">
-        
-<table id="sms_codes" cellpadding="0" cellspacing="0">
-  <thead>
-    <tr>
-      <th>Country</th>
-      <th>Code</th>
-      <th>For customers of</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>United States</td>
-      <td>40404</td>
-      <td>(any)</td>
-    </tr>
-    <tr>
-      <td>Canada</td>
-      <td>21212</td>
-      <td>(any)</td>
-    </tr>
-    <tr>
-      <td>United Kingdom</td>
-      <td>86444</td>
-      <td>Vodafone, Orange, 3, O2</td>
-    </tr>
-    <tr>
-      <td>Brazil</td>
-      <td>40404</td>
-      <td>Nextel, TIM</td>
-    </tr>
-    <tr>
-      <td>Haiti</td>
-      <td>40404</td>
-      <td>Digicel, Voila</td>
-    </tr>
-    <tr>
-      <td>Ireland</td>
-      <td>51210</td>
-      <td>Vodafone, O2</td>
-    </tr>
-    <tr>
-      <td>India</td>
-      <td>53000</td>
-      <td>Bharti Airtel, Videocon, Reliance</td>
-    </tr>
-    <tr>
-      <td>Indonesia</td>
-      <td>89887</td>
-      <td>AXIS, 3, Telkomsel, Indosat, XL Axiata</td>
-    </tr>
-    <tr>
-      <td rowspan="2">Italy</td>
-      <td>4880804</td>
-      <td>Wind</td>
-    </tr>
-    <tr>
-      <td>3424486444</td>
-      <td>Vodafone</td>
-    </tr>
-  </tbody>
-  <tfoot>
-    <tr>
-      <td colspan="3">
-        &raquo; <a class="js-initial-focus" target="_blank" href="http://support.twitter.com/articles/14226-how-to-find-your-twitter-short-code-or-long-code" rel="noopener">See SMS short codes for other countries</a>
-      </td>
-    </tr>
-  </tfoot>
-</table>
-      </div>
-    </div>
-  </div>
-</div>
-
-<div id="leadgen-confirm-dialog" class="modal-container">
-  <div class="modal draggable">
-    <div class="modal-content">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Close</span>
-  </span>
-</button>
-
-      <div class="modal-header">
-        <h3 class="modal-title">Confirmation</h3>
-      </div>
-      <div class="modal-body">
-        <div class="leadgen-card-container">
-          <div class="media">
-            <iframe
-              class="cards2-promotion-iframe"
-              scrolling="no"
-              frameborder="0"
-              src="">
-            </iframe>
-          </div>
-        </div>
-        <div class="js-macaw-cards-iframe-container" data-card-name="promotion">
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div id="auth-webview-dialog" class="AuthWebViewDialog modal-container">
-  <div class="modal draggable">
-    <div class="modal-content">
-      <button type="button" class="modal-btn modal-close modal-close-fixed js-close">
-  <span class="Icon Icon--close Icon--large">
-    <span class="visuallyhidden">Close</span>
-  </span>
-</button>
-
-      <div class="modal-header">
-        <h3 class="modal-title">&nbsp;</h3>
-      </div>
-      <div class="modal-body">
-        <div class="auth-webview-view-container">
-          <div class="media">
-            <iframe
-              class="auth-webview-card-iframe js-initial-focus"
-              scrolling="no"
-              frameborder="0"
-              width="590px"
-              height="500px"
-              src="">
-            </iframe>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-
-<div id="promptbird-modal-prompt" class="modal-container">
-  <div class="modal">
-    
-    <button type="button" class="modal-btn js-promptDismiss modal-close js-close">
-      <span class="Icon Icon--close Icon--medium">
-        <span class="visuallyhidden">Close</span>
-      </span>
-    </button>
-    <div class="modal-content"></div>
-  </div>
-</div>
-
-
-<div id="ui-walkthrough-dialog" class="modal-container UIWalkthrough">
-  <div class="UIWalkthrough-clickBlocker"></div>
-  <div class="modal modal-small">
-    <div class="UIWalkthrough-caret"></div>
-    <div class="modal-content">
-      <div class="modal-body">
-        <div class="UIWalkthrough-header">
-          <span class="UIWalkthrough-stepProgress"></span>
-          <button class="UIWalkthrough-skip js-close">
-            Skip all
-          </button>
-        </div>
-        
-
-
-
-<div class="UIWalkthrough-step UIWalkthrough-step--welcome">
-  <h3 class="UIWalkthrough-title">
-    <span class="Icon Icon--home UIWalkthrough-icon"></span>
-    Welcome home!
-  </h3>
-  <p class="UIWalkthrough-message">This timeline is where you’ll spend most of your time, getting instant updates about what matters to you.</p>
-</div>
-
-
-
-<div class="UIWalkthrough-step UIWalkthrough-step--unfollow">
-  <h3 class="UIWalkthrough-title">
-    <span class="Icon Icon--smileRating1Fill UIWalkthrough-icon"></span>
-    Tweets not working for you?
-  </h3>
-  <p class="UIWalkthrough-message">
-    Hover over the profile pic and click the Following button to unfollow any account.
-  </p>
-</div>
-
-<div class="UIWalkthrough-step UIWalkthrough-step--like">
-
-  <h3 class="UIWalkthrough-title">
-    <span class="Icon Icon--heart UIWalkthrough-icon"></span>
-    Say a lot with a little
-  </h3>
-  <p class="UIWalkthrough-message">
-    When you see a Tweet you love, tap the heart — it lets  the person who wrote it know you shared the love.
-  </p>
-</div>
-
-<div class="UIWalkthrough-step UIWalkthrough-step--retweet">
-  <h3 class="UIWalkthrough-title">
-    <span class="Icon Icon--retweet UIWalkthrough-icon"></span>
-    Spread the word
-  </h3>
-  <p class="UIWalkthrough-message">
-    The fastest way to share someone else’s Tweet with your followers is with a Retweet. Tap the icon to send it instantly.
-  </p>
-</div>
-
-<div class="UIWalkthrough-step UIWalkthrough-step--reply">
-  <h3 class="UIWalkthrough-title">
-    <span class="Icon Icon--reply UIWalkthrough-icon"></span>
-    Join the conversation
-  </h3>
-  <p class="UIWalkthrough-message">
-    Add your thoughts about any Tweet with a Reply. Find a topic you’re passionate about, and jump right in.
-  </p>
-</div>
-
-
-
-<div class="UIWalkthrough-step UIWalkthrough-step--trends">
-  <h3 class="UIWalkthrough-title">
-    <span class="Icon Icon--discover UIWalkthrough-icon"></span>
-    Learn the latest
-  </h3>
-  <p class="UIWalkthrough-message">
-    Get instant insight into what people are talking about now.
-  </p>
-</div>
-
-<div class="UIWalkthrough-step UIWalkthrough-step--wtf">
-  <h3 class="UIWalkthrough-title">
-    <span class="Icon Icon--follow UIWalkthrough-icon"></span>
-    Get more of what you love
-  </h3>
-  <p class="UIWalkthrough-message">
-    Follow more accounts to get instant updates about topics you care about.
-  </p>
-</div>
-
-<div class="UIWalkthrough-step UIWalkthrough-step--search">
-  <h3 class="UIWalkthrough-title">
-    <span class="Icon Icon--search UIWalkthrough-icon"></span>
-    Find what's happening
-  </h3>
-  <p class="UIWalkthrough-message">
-    See the latest conversations about any topic instantly.
-  </p>
-</div>
-
-<div class="UIWalkthrough-step UIWalkthrough-step--moments">
-  <h3 class="UIWalkthrough-title">
-    <span class="Icon Icon--lightning UIWalkthrough-icon"></span>
-    Never miss a Moment
-  </h3>
-  <p class="UIWalkthrough-message">
-    Catch up instantly on the best stories happening as they unfold.
-  </p>
-</div>
-      </div>
-
-      <div class="modal-footer">
-        <button class="EdgeButton EdgeButton--tertiary u-floatLeft plain-btn UIWalkthrough-button js-previous-step">Back</button>
-        <button class="EdgeButton EdgeButton--secondary UIWalkthrough-button js-next-step js-initial-focus">Next</button>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-
-
-<div id="create-custom-timeline-dialog" class="modal-container"></div>
-<div id="edit-custom-timeline-dialog" class="modal-container"></div>
-<div id="curate-dialog" class="modal-container"></div>
-<div id="media-edit-dialog" class="modal-container"></div>
-
-
-      <div class="PermalinkOverlay PermalinkOverlay-with-background load-at-boot" id="permalink-overlay">
-  <div class="PermalinkProfile-dismiss modal-close-fixed">
-    <span class="Icon Icon--close"></span>
-  </div>
-  <button class="PermalinkOverlay-next PermalinkOverlay-button u-posFixed js-next" type="button">
-    <span class="Icon Icon--caretLeft Icon--large"></span>
-    <span class="u-hiddenVisually">Next Tweet from user</span>
-  </button>
-  <div class="PermalinkOverlay-modal">
-    <div class="PermalinkOverlay-spinnerContainer u-hidden">
-      <div class="PermalinkOverlay-spinner"></div>
-    </div>
-    <div class="PermalinkOverlay-content">
-      <div class="PermalinkOverlay-body"
-          data-background-path="/codinghorror"
->
-            <div class="permalink-container permalink-container--withArrows">
-  <div role="main" class="permalink light-inline-actions
-  stream-uncapped
-  has-replies
-  original-permalink-page
-  self-thread-permalink
-  ">
-
-        <div class="permalink-in-reply-tos" data-component-term="in_reply_to">
-          <div class="permalink-inner in-reply-to" data-replied-tweet-id="1409270864315486209" data-component-context="conversation">
-              <div class="tweets-wrapper">
-                <div id="ancestors" class="ThreadedConversation ThreadedConversation--ancestors">
-                    <div class="stream-container  "
-    data-max-position="" data-min-position=""
-    >
-    <div class="stream">
-        <ol class="stream-items js-navigable-stream" id="stream-items-id">
-          
-        <div class="ThreadedConversation-tweet">
-  <li class="js-stream-item stream-item stream-item
-" data-item-id="1409270864315486209"
-id="stream-item-tweet-1409270864315486209"
-data-item-type="tweet"
->
-    
-
-
-  <div class="tweet js-stream-tweet js-actionable-tweet js-profile-popup-actionable dismissible-content
-      
-      
-      
-       ancestor permalink-ancestor-tweet
-"
-      
-data-tweet-id="1409270864315486209"
-data-item-id="1409270864315486209"
-data-permalink-path="/codinghorror/status/1409270864315486209"
-data-conversation-id="1409270864315486209"
-
-
-
-
-data-tweet-nonce="1409270864315486209-50f8bd6f-7f68-42bd-b161-0c76de903d13"
-data-tweet-stat-initialized="true"
-
-
-
-
-
-
-  data-screen-name="codinghorror" data-name="Jeff Atwood" data-user-id="5637652"
-  data-you-follow="false"
-  data-follows-you="false"
-  data-you-block="false"
-
-
-data-reply-to-users-json="[{&quot;id_str&quot;:&quot;5637652&quot;,&quot;screen_name&quot;:&quot;codinghorror&quot;,&quot;name&quot;:&quot;Jeff Atwood&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Jeff Atwood&quot;,&quot;emojified_text_as_html&quot;:&quot;Jeff Atwood&quot;}}]"
-
-
-
-
-
-
-
-data-disclosure-type=""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- data-component-context="conversation"
-
-
-    >
-
-    <div class="context">
-      
-      
-    </div>
-
-    <div class="content">
-      
-
-      
-
-      
-      <div class="stream-item-header">
-          <a  class="account-group js-account-group js-action-profile js-user-profile-link js-nav" href="/codinghorror" data-user-id="5637652">
-      <img class="avatar js-action-profile-avatar" src="https://pbs.twimg.com/profile_images/1246568020991864832/hh4FVqbl_bigger.jpg" alt="">
-    <span class="FullNameGroup">
-      <strong class="fullname show-popup-with-id u-textTruncate " data-aria-label-part>Jeff Atwood</strong><span>&rlm;</span><span class="UserBadges"><span class="Icon Icon--verified"><span class="u-hiddenVisually">Verified account</span></span></span><span class="UserNameBreak">&nbsp;</span></span><span class="username u-dir u-textTruncate" dir="ltr" data-aria-label-part>@<b>codinghorror</b></span></a>
-
-        
-        <small class="time">
-  <a href="/codinghorror/status/1409270864315486209" class="tweet-timestamp js-permalink js-nav js-tooltip" title="3:02 PM - 27 Jun 2021"  data-conversation-id="1409270864315486209"><span class="_timestamp js-short-timestamp " data-aria-label-part="last" data-time="1624831331" data-time-ms="1624831331000" data-long-form="true">Jun 27</span></a>
-</small>
-
-          <div class="ProfileTweet-action ProfileTweet-action--more js-more-ProfileTweet-actions">
-    <div class="dropdown">
-  <button class="ProfileTweet-actionButton u-textUserColorHover dropdown-toggle js-dropdown-toggle" type="button">
-      <div class="IconContainer js-tooltip" title="More">
-        <span class="Icon Icon--caretDownLight Icon--small"></span>
-        <span class="u-hiddenVisually">More</span>
-      </div>
-  </button>
-  <div class="dropdown-menu is-autoCentered">
-  <div class="dropdown-caret">
-    <div class="caret-outer"></div>
-    <div class="caret-inner"></div>
-  </div>
-  <ul>
-    
-      <li class="copy-link-to-tweet js-actionCopyLinkToTweet">
-        <button type="button" class="dropdown-link">Copy link to Tweet</button>
-      </li>
-      <li class="embed-link js-actionEmbedTweet" data-nav="embed_tweet">
-        <button type="button" class="dropdown-link">Embed Tweet</button>
-      </li>
-  </ul>
-</div>
-
-</div>
-
-  </div>
-
-      </div>
-
-      
-
-      
-
-
-      
-        <div class="js-tweet-text-container">
-  <p class="TweetTextSize  js-tweet-text tweet-text" lang="en" data-aria-label-part="0">Anyone else doing cellular Apple Watches rather than full blown cell phones for their almost-teens? The more I research this the more I like it.</p>
-</div>
-
-
-      
-
-      
-        
-
-
-      
-      
-
-      
-      <div class="stream-item-footer">
-  
-      <div class="ProfileTweet-actionCountList u-hiddenVisually">
-    
-    
-    <span class="ProfileTweet-action--reply u-hiddenVisually">
-      <span class="ProfileTweet-actionCount"  data-tweet-stat-count="24">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-reply-count-aria-1409270864315486209" data-aria-label-part>24 replies</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--retweet u-hiddenVisually">
-      <span class="ProfileTweet-actionCount"  data-tweet-stat-count="5">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-retweet-count-aria-1409270864315486209" data-aria-label-part>5 retweets</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--favorite u-hiddenVisually">
-      <span class="ProfileTweet-actionCount"  data-tweet-stat-count="96">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-favorite-count-aria-1409270864315486209" data-aria-label-part>96 likes</span>
-      </span>
-    </span>
-  </div>
-
-  <div class="ProfileTweet-actionList js-actions" role="group" aria-label="Tweet actions">
-    <div class="ProfileTweet-action ProfileTweet-action--reply">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionReply"
-    data-modal="ProfileTweet-reply" type="button"
-    aria-describedby="profile-tweet-action-reply-count-aria-1409270864315486209">
-    <div class="IconContainer js-tooltip" title="Reply">
-      <span class="Icon Icon--medium Icon--reply"></span>
-      <span class="u-hiddenVisually">Reply</span>
-    </div>
-      <span class="ProfileTweet-actionCount ">
-        <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">24</span>
-      </span>
-  </button>
-</div>
-
-    <div class="ProfileTweet-action ProfileTweet-action--retweet js-toggleState js-toggleRt">
-  <button class="ProfileTweet-actionButton  js-actionButton js-actionRetweet"
-    
-    data-modal="ProfileTweet-retweet"
-    type="button"
-    aria-describedby="profile-tweet-action-retweet-count-aria-1409270864315486209">
-    <div class="IconContainer js-tooltip" title="Retweet">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retweet</span>
-    </div>
-      <span class="ProfileTweet-actionCount">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">5</span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo js-actionButton js-actionRetweet" data-modal="ProfileTweet-retweet" type="button">
-    <div class="IconContainer js-tooltip" title="Undo retweet">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retweeted</span>
-    </div>
-      <span class="ProfileTweet-actionCount">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">5</span>
-  </span>
-
-  </button>
-</div>
-
-
-    <div class="ProfileTweet-action ProfileTweet-action--favorite js-toggleState">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionFavorite" type="button"
-    aria-describedby="profile-tweet-action-favorite-count-aria-1409270864315486209">
-    <div class="IconContainer js-tooltip" title="Like">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Like</span>
-    </div>
-      <span class="ProfileTweet-actionCount">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">96</span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo ProfileTweet-action--unfavorite u-linkClean js-actionButton js-actionFavorite" type="button">
-    <div class="IconContainer js-tooltip" title="Undo like">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Liked</span>
-    </div>
-      <span class="ProfileTweet-actionCount">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">96</span>
-  </span>
-
-  </button>
-</div>
-
-
-    
-
-    
-
-  </div>
-
-</div>
-  
-
-
-
-      
-      
-
-      
-        <div class="self-thread-context">
-  Show this thread
-</div>
-
-
-      
-
-    </div>
-
-  </div>
-
-
-
-</li>
-    </div>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
-
-        </ol>
-      <ol class="hidden-replies-container"></ol>
-    </div>
-  </div>
-                </div>
-              </div>
-          </div>
-        </div>
-
-        
-  <div class="permalink-inner permalink-tweet-container ThreadedConversation ThreadedConversation--permalinkTweetWithAncestors">
-
-    <div class="tweet permalink-tweet js-actionable-user js-actionable-tweet js-original-tweet
-         has-cards with-social-proof  has-content
-
-        
-        
-          
-          js-initial-focus
-"
-        data-associated-tweet-id="1409351083177046020"
-        
-data-tweet-id="1409351083177046020"
-data-item-id="1409351083177046020"
-data-permalink-path="/codinghorror/status/1409351083177046020"
-data-conversation-id="1409270864315486209"
-
- data-is-reply-to="true" 
- data-has-parent-tweet="true" 
-
-data-tweet-nonce="1409351083177046020-1486a324-f369-4db8-9202-a350ed9b9535"
-data-tweet-stat-initialized="true"
-
-
-
-
-
-
-  data-screen-name="codinghorror" data-name="Jeff Atwood" data-user-id="5637652"
-  data-you-follow="false"
-  data-follows-you="false"
-  data-you-block="false"
-
-
-data-reply-to-users-json="[{&quot;id_str&quot;:&quot;5637652&quot;,&quot;screen_name&quot;:&quot;codinghorror&quot;,&quot;name&quot;:&quot;Jeff Atwood&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Jeff Atwood&quot;,&quot;emojified_text_as_html&quot;:&quot;Jeff Atwood&quot;}}]"
-
-
-
-
-
-
-
-data-disclosure-type=""
-
-
-
-
- data-has-cards="true"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-        tabindex="0"
-      >
-
-
-      
-      <div class="content clearfix">
-        <div class="permalink-header">
-            <a  class="account-group js-account-group js-action-profile js-user-profile-link js-nav" href="/codinghorror" data-user-id="5637652">
-      <img class="avatar js-action-profile-avatar" src="https://pbs.twimg.com/profile_images/1246568020991864832/hh4FVqbl_bigger.jpg" alt="">
-    <span class="FullNameGroup">
-      <strong class="fullname show-popup-with-id u-textTruncate " data-aria-label-part>Jeff Atwood</strong><span>&rlm;</span><span class="UserBadges"><span class="Icon Icon--verified"><span class="u-hiddenVisually">Verified account</span></span></span><span class="UserNameBreak">&nbsp;</span></span><span class="username u-dir u-textTruncate" dir="ltr" data-aria-label-part>@<b>codinghorror</b></span></a>
-
-          
-          <small class="time">
-  <a href="/codinghorror/status/1409351083177046020" class="tweet-timestamp js-permalink js-nav js-tooltip" title="8:20 PM - 27 Jun 2021"  data-conversation-id="1409270864315486209"><span class="_timestamp js-short-timestamp " data-aria-label-part="last" data-time="1624850457" data-time-ms="1624850457000" data-long-form="true">Jun 27</span></a>
-</small>
-
-            
-
-    
-    <div class="follow-bar">
-      <div class="user-actions btn-group not-following  "
-    data-user-id="5637652"
-    data-screen-name="codinghorror"
-    data-name="Jeff Atwood"
-    data-protected="false"
-  >
-  <span class="user-actions-follow-button js-follow-btn follow-button">
-  <button type="button" class="
-    EdgeButton
-    EdgeButton--secondary
-    
-    EdgeButton--medium 
-    button-text
-    follow-text">
-      <span aria-hidden="true">Follow</span>
-      <span class="u-hiddenVisually">Follow <span class="username u-dir u-textTruncate" dir="ltr" >@<b>codinghorror</b></span></span>
-  </button>
-  <button type="button" class="
-    EdgeButton
-    EdgeButton--primary
-    
-    EdgeButton--medium 
-    button-text
-    following-text">
-      <span aria-hidden="true">Following</span>
-      <span class="u-hiddenVisually">Following <span class="username u-dir u-textTruncate" dir="ltr" >@<b>codinghorror</b></span></span>
-  </button>
-  <button type="button" class="
-    EdgeButton
-    EdgeButton--danger
-    
-    EdgeButton--medium 
-    button-text
-    unfollow-text">
-      <span aria-hidden="true">Unfollow</span>
-      <span class="u-hiddenVisually">Unfollow <span class="username u-dir u-textTruncate" dir="ltr" >@<b>codinghorror</b></span></span>
-  </button>
-  <button type="button" class="
-    EdgeButton
-    EdgeButton--invertedDanger
-    
-    EdgeButton--medium 
-    button-text
-    blocked-text">
-    <span aria-hidden="true">Blocked</span>
-    <span class="u-hiddenVisually">Blocked <span class="username u-dir u-textTruncate" dir="ltr" >@<b>codinghorror</b></span></span>
-  </button>
-  <button type="button" class="
-    EdgeButton
-    EdgeButton--danger
-    
-    EdgeButton--medium 
-    button-text
-    unblock-text">
-    <span aria-hidden="true">Unblock</span>
-    <span class="u-hiddenVisually">Unblock <span class="username u-dir u-textTruncate" dir="ltr" >@<b>codinghorror</b></span></span>
-  </button>
-  <button type="button" class="
-    EdgeButton
-    EdgeButton--secondary
-    
-    EdgeButton--medium 
-    button-text
-    pending-text">
-    <span aria-hidden="true">Pending</span>
-    <span class="u-hiddenVisually">Pending follow request from <span class="username u-dir u-textTruncate" dir="ltr" >@<b>codinghorror</b></span></span>
-  </button>
-  <button type="button" class="
-    EdgeButton
-    EdgeButton--secondary
-    
-    EdgeButton--medium 
-    button-text
-    cancel-text">
-    <span aria-hidden="true">Cancel</span>
-    <span class="u-hiddenVisually">Cancel your follow request to <span class="username u-dir u-textTruncate" dir="ltr" >@<b>codinghorror</b></span></span>
-  </button>
-</span>
-
-</div>
-
-    </div>
-
-            <div class="ProfileTweet-action ProfileTweet-action--more js-more-ProfileTweet-actions">
-    <div class="dropdown">
-  <button class="ProfileTweet-actionButton u-textUserColorHover dropdown-toggle js-dropdown-toggle" type="button">
-      <div class="IconContainer js-tooltip" title="More">
-        <span class="Icon Icon--caretDownLight Icon--small"></span>
-        <span class="u-hiddenVisually">More</span>
-      </div>
-  </button>
-  <div class="dropdown-menu is-autoCentered">
-  <div class="dropdown-caret">
-    <div class="caret-outer"></div>
-    <div class="caret-inner"></div>
-  </div>
-  <ul>
-    
-      <li class="copy-link-to-tweet js-actionCopyLinkToTweet">
-        <button type="button" class="dropdown-link">Copy link to Tweet</button>
-      </li>
-      <li class="embed-link js-actionEmbedTweet" data-nav="embed_tweet">
-        <button type="button" class="dropdown-link">Embed Tweet</button>
-      </li>
-  </ul>
-</div>
-
-</div>
-
-  </div>
-
-        </div>
-        
-      </div>
-
-
-      
-        <div class="js-tweet-text-container">
-  <p class="TweetTextSize TweetTextSize--jumbo js-tweet-text tweet-text" lang="en" data-aria-label-part="0">My first text message from my child! A moment that shall live on in infamy!<a href="https://t.co/TQMRJsFwnO" class="twitter-timeline-link u-hidden" data-pre-embedded="true" dir="ltr" >pic.twitter.com/TQMRJsFwnO</a></p>
-</div>
-
-
-      
-
-      
-          <div class="AdaptiveMediaOuterContainer">
-    <div class="AdaptiveMedia
-        
-        is-square
-        
-        
-        
-        "
-      >
-      <div class="AdaptiveMedia-container">
-          <div class="AdaptiveMedia-singlePhoto"
-    style="padding-top: calc(1.2457684495599188 * 100% - 0.5px);"
->
-    <div class="AdaptiveMedia-photoContainer js-adaptive-photo "
-  data-image-url="https://pbs.twimg.com/media/E48FVowUUAYyGLX.jpg"
-  
-  
-  data-element-context="platform_photo_card"
-    style="background-color:rgba(38,10,6,1.0);"
-    data-dominant-color="[38,10,6]"
->
-  <img data-aria-label-part src="https://pbs.twimg.com/media/E48FVowUUAYyGLX.jpg" alt=""
-      style="width: 100%; top: -62px;"
->
-</div>
-
-
-</div>
-      </div>
-    </div>
-  </div>
-
-
-
-      <div class="js-tweet-details-fixer tweet-details-fixer">
-  <div class="client-and-actions">
-  <span class="metadata">
-    <span>8:20 PM - 27 Jun 2021</span>
-      
-  </span>
-  
-</div>
-
-
-  <div class="js-machine-translated-tweet-container"></div>
-  <div class="js-tweet-stats-container tweet-stats-container">      
-
-<ul class="stats" aria-label="Retweeted and favorited by">
-
-    <li class="js-stat-count js-stat-favorites stat-count" aria-hidden="true">
-      <a tabindex=0 role="button"
-         data-tweet-stat-count="90" 
-         data-compact-localized-count="90"
-         class="request-favorited-popup"
-         data-activity-popup-title="90 likes">
-          
-          <strong>90</strong> Likes
-      </a>
-    </li>
-
-  <li class="avatar-row js-face-pile-container">
-      <a class="js-profile-popup-actionable js-tooltip" href="/blairbryant" data-user-id="12336122" original-title="Blair &quot;The Architect&quot;" title="Blair &quot;The Architect&quot;" rel="noopener">
-  <img class="avatar size24 js-user-profile-link" src="https://pbs.twimg.com/profile_images/64678397/twiki01_normal.jpg" alt="Blair &quot;The Architect&quot;">
-</a>
-      <a class="js-profile-popup-actionable js-tooltip" href="/f_fz" data-user-id="56679923" original-title="Ferdi (Ferdinand Fanötöna Zebua)" title="Ferdi (Ferdinand Fanötöna Zebua)" rel="noopener">
-  <img class="avatar size24 js-user-profile-link" src="https://pbs.twimg.com/profile_images/1361289869025181696/xvnNIGUA_normal.jpg" alt="Ferdi (Ferdinand Fanötöna Zebua)">
-</a>
-      <a class="js-profile-popup-actionable js-tooltip" href="/gregstoll" data-user-id="7155172" original-title="Greg Stoll 💉💉🎉" title="Greg Stoll 💉💉🎉" rel="noopener">
-  <img class="avatar size24 js-user-profile-link" src="https://pbs.twimg.com/profile_images/378800000124042138/6d6f7032a0efd358c83fc68083a1e8c7_normal.jpeg" alt="Greg Stoll 💉💉🎉">
-</a>
-      <a class="js-profile-popup-actionable js-tooltip" href="/uncle_miles" data-user-id="731360639776493568" original-title="Miles McNerney" title="Miles McNerney" rel="noopener">
-  <img class="avatar size24 js-user-profile-link" src="https://pbs.twimg.com/profile_images/842604441089978369/DD3_BVQz_normal.jpg" alt="Miles McNerney">
-</a>
-      <a class="js-profile-popup-actionable js-tooltip" href="/Castaa" data-user-id="14199776" original-title="Jon C" title="Jon C" rel="noopener">
-  <img class="avatar size24 js-user-profile-link" src="https://pbs.twimg.com/profile_images/831939185279791104/hUCGssdI_normal.jpg" alt="Jon C">
-</a>
-      <a class="js-profile-popup-actionable js-tooltip" href="/threadripper_" data-user-id="336011917" original-title="Javad:~$" title="Javad:~$" rel="noopener">
-  <img class="avatar size24 js-user-profile-link" src="https://pbs.twimg.com/profile_images/1008608583028822016/2Vyu7CLm_normal.jpg" alt="Javad:~$">
-</a>
-      <a class="js-profile-popup-actionable js-tooltip" href="/pbrdmn" data-user-id="227124578" original-title="Philip is staying at home" title="Philip is staying at home" rel="noopener">
-  <img class="avatar size24 js-user-profile-link" src="https://pbs.twimg.com/profile_images/1406905135825969159/ChusY6Di_normal.jpg" alt="Philip is staying at home">
-</a>
-      <a class="js-profile-popup-actionable js-tooltip" href="/BrosukeH" data-user-id="259032808" original-title="Welcome to the NFT 📉 | BLM 🏳️‍🌈" title="Welcome to the NFT 📉 | BLM 🏳️‍🌈" rel="noopener">
-  <img class="avatar size24 js-user-profile-link" src="https://pbs.twimg.com/profile_images/1228576203751092224/uoT5TCYW_normal.jpg" alt="Welcome to the NFT 📉 | BLM 🏳️‍🌈">
-</a>
-      <a class="js-profile-popup-actionable js-tooltip" href="/liagason" data-user-id="65491901" original-title="liagason" title="liagason" rel="noopener">
-  <img class="avatar size24 js-user-profile-link" src="https://pbs.twimg.com/profile_images/1405165059261669380/eoBV_sdh_normal.jpg" alt="liagason">
-</a>
-  </li>
-</ul>
-
-
-  </div>
-</div>
-
-
-      
-      <div class="stream-item-footer">
-          
-
-
-        
-            <div class="ProfileTweet-actionCountList u-hiddenVisually">
-    
-    
-    <span class="ProfileTweet-action--reply u-hiddenVisually">
-      <span class="ProfileTweet-actionCount"  data-tweet-stat-count="4">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-reply-count-aria-1409351083177046020" data-aria-label-part>4 replies</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--retweet u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-retweet-count-aria-1409351083177046020" >0 retweets</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--favorite u-hiddenVisually">
-      <span class="ProfileTweet-actionCount"  data-tweet-stat-count="90">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-favorite-count-aria-1409351083177046020" data-aria-label-part>90 likes</span>
-      </span>
-    </span>
-  </div>
-
-  <div class="ProfileTweet-actionList js-actions" role="group" aria-label="Tweet actions">
-    <div class="ProfileTweet-action ProfileTweet-action--reply">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionReply"
-    data-modal="ProfileTweet-reply" type="button"
-    aria-describedby="profile-tweet-action-reply-count-aria-1409351083177046020">
-    <div class="IconContainer js-tooltip" title="Reply">
-      <span class="Icon Icon--medium Icon--reply"></span>
-      <span class="u-hiddenVisually">Reply</span>
-    </div>
-      <span class="ProfileTweet-actionCount ">
-        <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">4</span>
-      </span>
-  </button>
-</div>
-
-    <div class="ProfileTweet-action ProfileTweet-action--retweet js-toggleState js-toggleRt">
-  <button class="ProfileTweet-actionButton  js-actionButton js-actionRetweet"
-    
-    data-modal="ProfileTweet-retweet"
-    type="button"
-    aria-describedby="profile-tweet-action-retweet-count-aria-1409351083177046020">
-    <div class="IconContainer js-tooltip" title="Retweet">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retweet</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo js-actionButton js-actionRetweet" data-modal="ProfileTweet-retweet" type="button">
-    <div class="IconContainer js-tooltip" title="Undo retweet">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retweeted</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button>
-</div>
-
-
-    <div class="ProfileTweet-action ProfileTweet-action--favorite js-toggleState">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionFavorite" type="button"
-    aria-describedby="profile-tweet-action-favorite-count-aria-1409351083177046020">
-    <div class="IconContainer js-tooltip" title="Like">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Like</span>
-    </div>
-      <span class="ProfileTweet-actionCount">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">90</span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo ProfileTweet-action--unfavorite u-linkClean js-actionButton js-actionFavorite" type="button">
-    <div class="IconContainer js-tooltip" title="Undo like">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Liked</span>
-    </div>
-      <span class="ProfileTweet-actionCount">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">90</span>
-  </span>
-
-  </button>
-</div>
-
-
-    
-
-    
-
-  </div>
-
-      </div>
-
-      <div class="permalink-footer">
-        
-      </div>
-    </div>
-
-  </div>
-
-
-      
-<div class="replies-to  permalink-inner permalink-replies" data-component-context="replies">
-    <div class="tweets-wrapper">
-      <div id="descendants" class="ThreadedDescendants">
-          <div class="stream-container  "
-    data-max-position="" data-min-position=""
-    >
-    <div class="stream">
-        <ol class="stream-items js-navigable-stream" id="stream-items-id">
-          
-
-
-
-
-
-
-
-
-
-
-
-      <li class="ThreadedConversation--loneTweet
-  
-  ">
-    <ol class="stream-items">
-      <li class="js-stream-item stream-item stream-item
-" data-item-id="1409352104590729216"
-id="stream-item-tweet-1409352104590729216"
-data-item-type="tweet"
- data-suggestion-json="{&quot;suggestion_details&quot;:{},&quot;tweet_ids&quot;:&quot;1409352104590729216&quot;,&quot;scribe_component&quot;:&quot;tweet&quot;}">
-    
-
-
-  <div class="tweet js-stream-tweet js-actionable-tweet js-profile-popup-actionable dismissible-content
-      
-      
-      
-       descendant permalink-descendant-tweet
-"
-      
-data-tweet-id="1409352104590729216"
-data-item-id="1409352104590729216"
-data-permalink-path="/f_fz/status/1409352104590729216"
-data-conversation-id="1409270864315486209"
-
-
- data-has-parent-tweet="true" 
-
-data-tweet-nonce="1409352104590729216-1de294b4-26f7-4472-a226-d318fdb734e4"
-data-tweet-stat-initialized="true"
-data-conversation-section-quality="HighQuality"
-
-
-
-
-
-  data-screen-name="f_fz" data-name="Ferdi (Ferdinand Fanötöna Zebua)" data-user-id="56679923"
-  data-you-follow="false"
-  data-follows-you="false"
-  data-you-block="false"
- data-mentions="codinghorror"
-
-data-reply-to-users-json="[{&quot;id_str&quot;:&quot;56679923&quot;,&quot;screen_name&quot;:&quot;f_fz&quot;,&quot;name&quot;:&quot;Ferdi (Ferdinand Fan\u00f6t\u00f6na Zebua)&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Ferdi (Ferdinand Fan\u00f6t\u00f6na Zebua)&quot;,&quot;emojified_text_as_html&quot;:&quot;Ferdi (Ferdinand Fan\u00f6t\u00f6na Zebua)&quot;}},{&quot;id_str&quot;:&quot;5637652&quot;,&quot;screen_name&quot;:&quot;codinghorror&quot;,&quot;name&quot;:&quot;Jeff Atwood&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Jeff Atwood&quot;,&quot;emojified_text_as_html&quot;:&quot;Jeff Atwood&quot;}}]"
-
-
-
-
-
-
-
-data-disclosure-type=""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- data-component-context="replies"
-
-
-    >
-
-    <div class="context">
-      
-      
-    </div>
-
-    <div class="content">
-      
-
-      
-
-      
-      <div class="stream-item-header">
-          <a  class="account-group js-account-group js-action-profile js-user-profile-link js-nav" href="/f_fz" data-user-id="56679923">
-      <img class="avatar js-action-profile-avatar" src="https://pbs.twimg.com/profile_images/1361289869025181696/xvnNIGUA_bigger.jpg" alt="">
-    <span class="FullNameGroup">
-      <strong class="fullname show-popup-with-id u-textTruncate " data-aria-label-part>Ferdi (Ferdinand Fanötöna Zebua)</strong><span>&rlm;</span><span class="UserBadges"></span><span class="UserNameBreak">&nbsp;</span></span><span class="username u-dir u-textTruncate" dir="ltr" data-aria-label-part>@<b>f_fz</b></span></a>
-
-        
-        <small class="time">
-  <a href="/f_fz/status/1409352104590729216" class="tweet-timestamp js-permalink js-nav js-tooltip" title="8:25 PM - 27 Jun 2021"  data-conversation-id="1409270864315486209"><span class="_timestamp js-short-timestamp " data-aria-label-part="last" data-time="1624850700" data-time-ms="1624850700000" data-long-form="true">Jun 27</span></a>
-</small>
-
-          <div class="ProfileTweet-action ProfileTweet-action--more js-more-ProfileTweet-actions">
-    <div class="dropdown">
-  <button class="ProfileTweet-actionButton u-textUserColorHover dropdown-toggle js-dropdown-toggle" type="button">
-      <div class="IconContainer js-tooltip" title="More">
-        <span class="Icon Icon--caretDownLight Icon--small"></span>
-        <span class="u-hiddenVisually">More</span>
-      </div>
-  </button>
-  <div class="dropdown-menu is-autoCentered">
-  <div class="dropdown-caret">
-    <div class="caret-outer"></div>
-    <div class="caret-inner"></div>
-  </div>
-  <ul>
-    
-      <li class="copy-link-to-tweet js-actionCopyLinkToTweet">
-        <button type="button" class="dropdown-link">Copy link to Tweet</button>
-      </li>
-      <li class="embed-link js-actionEmbedTweet" data-nav="embed_tweet">
-        <button type="button" class="dropdown-link">Embed Tweet</button>
-      </li>
-  </ul>
-</div>
-
-</div>
-
-  </div>
-
-      </div>
-
-      
-
-      
-
-        <div class="ReplyingToContextBelowAuthor" data-aria-label-part>
-    Replying to <a class="pretty-link js-user-profile-link" href="/codinghorror" data-user-id="5637652" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>codinghorror</b></span></a>
-
-
-
-</div>
-
-
-      
-        <div class="js-tweet-text-container">
-  <p class="TweetTextSize  js-tweet-text tweet-text" lang="en" data-aria-label-part="0">Mind-blown!</p>
-</div>
-
-
-      
-
-      
-        
-
-
-      
-      
-
-      
-      <div class="stream-item-footer">
-  
-      <div class="ProfileTweet-actionCountList u-hiddenVisually">
-    
-    
-    <span class="ProfileTweet-action--reply u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-reply-count-aria-1409352104590729216" >0 replies</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--retweet u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-retweet-count-aria-1409352104590729216" >0 retweets</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--favorite u-hiddenVisually">
-      <span class="ProfileTweet-actionCount"  data-tweet-stat-count="1">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-favorite-count-aria-1409352104590729216" data-aria-label-part>1 like</span>
-      </span>
-    </span>
-  </div>
-
-  <div class="ProfileTweet-actionList js-actions" role="group" aria-label="Tweet actions">
-    <div class="ProfileTweet-action ProfileTweet-action--reply">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionReply"
-    data-modal="ProfileTweet-reply" type="button"
-    aria-describedby="profile-tweet-action-reply-count-aria-1409352104590729216">
-    <div class="IconContainer js-tooltip" title="Reply">
-      <span class="Icon Icon--medium Icon--reply"></span>
-      <span class="u-hiddenVisually">Reply</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero ">
-        <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-      </span>
-  </button>
-</div>
-
-    <div class="ProfileTweet-action ProfileTweet-action--retweet js-toggleState js-toggleRt">
-  <button class="ProfileTweet-actionButton  js-actionButton js-actionRetweet"
-    
-    data-modal="ProfileTweet-retweet"
-    type="button"
-    aria-describedby="profile-tweet-action-retweet-count-aria-1409352104590729216">
-    <div class="IconContainer js-tooltip" title="Retweet">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retweet</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo js-actionButton js-actionRetweet" data-modal="ProfileTweet-retweet" type="button">
-    <div class="IconContainer js-tooltip" title="Undo retweet">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retweeted</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button>
-</div>
-
-
-    <div class="ProfileTweet-action ProfileTweet-action--favorite js-toggleState">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionFavorite" type="button"
-    aria-describedby="profile-tweet-action-favorite-count-aria-1409352104590729216">
-    <div class="IconContainer js-tooltip" title="Like">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Like</span>
-    </div>
-      <span class="ProfileTweet-actionCount">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">1</span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo ProfileTweet-action--unfavorite u-linkClean js-actionButton js-actionFavorite" type="button">
-    <div class="IconContainer js-tooltip" title="Undo like">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Liked</span>
-    </div>
-      <span class="ProfileTweet-actionCount">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">1</span>
-  </span>
-
-  </button>
-</div>
-
-
-    
-
-    
-
-  </div>
-
-</div>
-  
-
-
-
-      
-      
-
-      
-
-      
-
-    </div>
-
-  </div>
-
-
-
-    
-<div class="dismiss-module">
-  <div class="dismissed-module">
-    <div class="feedback-actions">
-        <div class="feedback-action" data-feedback-type="DontLike" data-feedback-url="">
-          <div class="action-confirmation dismiss-module-item">Thanks. Twitter will use this to make your timeline better.
-            <span class="undo-action">Undo</span>
-          </div>
-        </div>
-    </div>
-    <div class="child-feedback-confirmation">
-      <div class="child-confirmation-item">
-        <span class="child-confirmation-text"></span>
-        <span class="undo-child-feedback-action">Undo</span>
-      </div>
-    </div>
-  </div>
-</div>
-
-</li>
-    </ol>
-  </li>
-
-
-      <li class="ThreadedConversation--loneTweet
-  
-  ">
-    <ol class="stream-items">
-      <li class="js-stream-item stream-item stream-item
-" data-item-id="1409352727008714757"
-id="stream-item-tweet-1409352727008714757"
-data-item-type="tweet"
- data-suggestion-json="{&quot;suggestion_details&quot;:{},&quot;tweet_ids&quot;:&quot;1409352727008714757&quot;,&quot;scribe_component&quot;:&quot;tweet&quot;}">
-    
-
-
-  <div class="tweet js-stream-tweet js-actionable-tweet js-profile-popup-actionable dismissible-content
-      
-      
-      
-       descendant permalink-descendant-tweet
-"
-      
-data-tweet-id="1409352727008714757"
-data-item-id="1409352727008714757"
-data-permalink-path="/chetfaliszek/status/1409352727008714757"
-data-conversation-id="1409270864315486209"
-
-
- data-has-parent-tweet="true" 
-
-data-tweet-nonce="1409352727008714757-f2f400be-6b3d-4292-b759-ea3b1953af8e"
-data-tweet-stat-initialized="true"
-data-conversation-section-quality="HighQuality"
-
-
-
-
-
-  data-screen-name="chetfaliszek" data-name="Chet Faliszek" data-user-id="982040378"
-  data-you-follow="false"
-  data-follows-you="false"
-  data-you-block="false"
- data-mentions="codinghorror"
-
-data-reply-to-users-json="[{&quot;id_str&quot;:&quot;982040378&quot;,&quot;screen_name&quot;:&quot;chetfaliszek&quot;,&quot;name&quot;:&quot;Chet Faliszek&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Chet Faliszek&quot;,&quot;emojified_text_as_html&quot;:&quot;Chet Faliszek&quot;}},{&quot;id_str&quot;:&quot;5637652&quot;,&quot;screen_name&quot;:&quot;codinghorror&quot;,&quot;name&quot;:&quot;Jeff Atwood&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Jeff Atwood&quot;,&quot;emojified_text_as_html&quot;:&quot;Jeff Atwood&quot;}}]"
-
-
-
-
-
-
-
-data-disclosure-type=""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- data-component-context="replies"
-
-
-    >
-
-    <div class="context">
-      
-      
-    </div>
-
-    <div class="content">
-      
-
-      
-
-      
-      <div class="stream-item-header">
-          <a  class="account-group js-account-group js-action-profile js-user-profile-link js-nav" href="/chetfaliszek" data-user-id="982040378">
-      <img class="avatar js-action-profile-avatar" src="https://pbs.twimg.com/profile_images/2920094567/ecc0064d125a61407e9c0a735a5c5f76_bigger.jpeg" alt="">
-    <span class="FullNameGroup">
-      <strong class="fullname show-popup-with-id u-textTruncate " data-aria-label-part>Chet Faliszek</strong><span>&rlm;</span><span class="UserBadges"><span class="Icon Icon--verified"><span class="u-hiddenVisually">Verified account</span></span></span><span class="UserNameBreak">&nbsp;</span></span><span class="username u-dir u-textTruncate" dir="ltr" data-aria-label-part>@<b>chetfaliszek</b></span></a>
-
-        
-        <small class="time">
-  <a href="/chetfaliszek/status/1409352727008714757" class="tweet-timestamp js-permalink js-nav js-tooltip" title="8:27 PM - 27 Jun 2021"  data-conversation-id="1409270864315486209"><span class="_timestamp js-short-timestamp " data-aria-label-part="last" data-time="1624850849" data-time-ms="1624850849000" data-long-form="true">Jun 27</span></a>
-</small>
-
-          <div class="ProfileTweet-action ProfileTweet-action--more js-more-ProfileTweet-actions">
-    <div class="dropdown">
-  <button class="ProfileTweet-actionButton u-textUserColorHover dropdown-toggle js-dropdown-toggle" type="button">
-      <div class="IconContainer js-tooltip" title="More">
-        <span class="Icon Icon--caretDownLight Icon--small"></span>
-        <span class="u-hiddenVisually">More</span>
-      </div>
-  </button>
-  <div class="dropdown-menu is-autoCentered">
-  <div class="dropdown-caret">
-    <div class="caret-outer"></div>
-    <div class="caret-inner"></div>
-  </div>
-  <ul>
-    
-      <li class="copy-link-to-tweet js-actionCopyLinkToTweet">
-        <button type="button" class="dropdown-link">Copy link to Tweet</button>
-      </li>
-      <li class="embed-link js-actionEmbedTweet" data-nav="embed_tweet">
-        <button type="button" class="dropdown-link">Embed Tweet</button>
-      </li>
-  </ul>
-</div>
-
-</div>
-
-  </div>
-
-      </div>
-
-      
-
-      
-
-        <div class="ReplyingToContextBelowAuthor" data-aria-label-part>
-    Replying to <a class="pretty-link js-user-profile-link" href="/codinghorror" data-user-id="5637652" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>codinghorror</b></span></a>
-
-
-
-</div>
-
-
-      
-        <div class="js-tweet-text-container">
-  <p class="TweetTextSize  js-tweet-text tweet-text" lang="en" data-aria-label-part="0">Make it their first NFT!</p>
-</div>
-
-
-      
-
-      
-        
-
-
-      
-      
-
-      
-      <div class="stream-item-footer">
-  
-      <div class="ProfileTweet-actionCountList u-hiddenVisually">
-    
-    
-    <span class="ProfileTweet-action--reply u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-reply-count-aria-1409352727008714757" >0 replies</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--retweet u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-retweet-count-aria-1409352727008714757" >0 retweets</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--favorite u-hiddenVisually">
-      <span class="ProfileTweet-actionCount"  data-tweet-stat-count="2">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-favorite-count-aria-1409352727008714757" data-aria-label-part>2 likes</span>
-      </span>
-    </span>
-  </div>
-
-  <div class="ProfileTweet-actionList js-actions" role="group" aria-label="Tweet actions">
-    <div class="ProfileTweet-action ProfileTweet-action--reply">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionReply"
-    data-modal="ProfileTweet-reply" type="button"
-    aria-describedby="profile-tweet-action-reply-count-aria-1409352727008714757">
-    <div class="IconContainer js-tooltip" title="Reply">
-      <span class="Icon Icon--medium Icon--reply"></span>
-      <span class="u-hiddenVisually">Reply</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero ">
-        <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-      </span>
-  </button>
-</div>
-
-    <div class="ProfileTweet-action ProfileTweet-action--retweet js-toggleState js-toggleRt">
-  <button class="ProfileTweet-actionButton  js-actionButton js-actionRetweet"
-    
-    data-modal="ProfileTweet-retweet"
-    type="button"
-    aria-describedby="profile-tweet-action-retweet-count-aria-1409352727008714757">
-    <div class="IconContainer js-tooltip" title="Retweet">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retweet</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo js-actionButton js-actionRetweet" data-modal="ProfileTweet-retweet" type="button">
-    <div class="IconContainer js-tooltip" title="Undo retweet">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retweeted</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button>
-</div>
-
-
-    <div class="ProfileTweet-action ProfileTweet-action--favorite js-toggleState">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionFavorite" type="button"
-    aria-describedby="profile-tweet-action-favorite-count-aria-1409352727008714757">
-    <div class="IconContainer js-tooltip" title="Like">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Like</span>
-    </div>
-      <span class="ProfileTweet-actionCount">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">2</span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo ProfileTweet-action--unfavorite u-linkClean js-actionButton js-actionFavorite" type="button">
-    <div class="IconContainer js-tooltip" title="Undo like">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Liked</span>
-    </div>
-      <span class="ProfileTweet-actionCount">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">2</span>
-  </span>
-
-  </button>
-</div>
-
-
-    
-
-    
-
-  </div>
-
-</div>
-  
-
-
-
-      
-      
-
-      
-
-      
-
-    </div>
-
-  </div>
-
-
-
-    
-<div class="dismiss-module">
-  <div class="dismissed-module">
-    <div class="feedback-actions">
-        <div class="feedback-action" data-feedback-type="DontLike" data-feedback-url="">
-          <div class="action-confirmation dismiss-module-item">Thanks. Twitter will use this to make your timeline better.
-            <span class="undo-action">Undo</span>
-          </div>
-        </div>
-    </div>
-    <div class="child-feedback-confirmation">
-      <div class="child-confirmation-item">
-        <span class="child-confirmation-text"></span>
-        <span class="undo-child-feedback-action">Undo</span>
-      </div>
-    </div>
-  </div>
-</div>
-
-</li>
-    </ol>
-  </li>
-
-
-      <li class="ThreadedConversation--loneTweet
-  
-  ">
-    <ol class="stream-items">
-      <li class="js-stream-item stream-item stream-item
-" data-item-id="1409353075232362505"
-id="stream-item-tweet-1409353075232362505"
-data-item-type="tweet"
- data-suggestion-json="{&quot;suggestion_details&quot;:{},&quot;tweet_ids&quot;:&quot;1409353075232362505&quot;,&quot;scribe_component&quot;:&quot;tweet&quot;}">
-    
-
-
-  <div class="tweet js-stream-tweet js-actionable-tweet js-profile-popup-actionable dismissible-content
-      
-      
-      
-       has-cards descendant permalink-descendant-tweet has-content
-"
-      
-data-tweet-id="1409353075232362505"
-data-item-id="1409353075232362505"
-data-permalink-path="/Hanzo55/status/1409353075232362505"
-data-conversation-id="1409270864315486209"
-
-
- data-has-parent-tweet="true" 
-
-data-tweet-nonce="1409353075232362505-800385d7-5a47-4d14-940c-106e408a2802"
-data-tweet-stat-initialized="true"
-data-conversation-section-quality="HighQuality"
-
-
-
-
-
-  data-screen-name="Hanzo55" data-name="Shawn Holmes" data-user-id="34945729"
-  data-you-follow="false"
-  data-follows-you="false"
-  data-you-block="false"
- data-mentions="codinghorror"
-
-data-reply-to-users-json="[{&quot;id_str&quot;:&quot;34945729&quot;,&quot;screen_name&quot;:&quot;Hanzo55&quot;,&quot;name&quot;:&quot;Shawn Holmes&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Shawn Holmes&quot;,&quot;emojified_text_as_html&quot;:&quot;Shawn Holmes&quot;}},{&quot;id_str&quot;:&quot;5637652&quot;,&quot;screen_name&quot;:&quot;codinghorror&quot;,&quot;name&quot;:&quot;Jeff Atwood&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Jeff Atwood&quot;,&quot;emojified_text_as_html&quot;:&quot;Jeff Atwood&quot;}}]"
-
-
-
-
-
-
-
-data-disclosure-type=""
-
-
-
-
- data-has-cards="true"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- data-component-context="replies"
-
-
-    >
-
-    <div class="context">
-      
-      
-    </div>
-
-    <div class="content">
-      
-
-      
-
-      
-      <div class="stream-item-header">
-          <a  class="account-group js-account-group js-action-profile js-user-profile-link js-nav" href="/Hanzo55" data-user-id="34945729">
-      <img class="avatar js-action-profile-avatar" src="https://pbs.twimg.com/profile_images/1400457518669721604/v5zouGS9_bigger.jpg" alt="">
-    <span class="FullNameGroup">
-      <strong class="fullname show-popup-with-id u-textTruncate " data-aria-label-part>Shawn Holmes</strong><span>&rlm;</span><span class="UserBadges"></span><span class="UserNameBreak">&nbsp;</span></span><span class="username u-dir u-textTruncate" dir="ltr" data-aria-label-part>@<b>Hanzo55</b></span></a>
-
-        
-        <small class="time">
-  <a href="/Hanzo55/status/1409353075232362505" class="tweet-timestamp js-permalink js-nav js-tooltip" title="8:28 PM - 27 Jun 2021"  data-conversation-id="1409270864315486209"><span class="_timestamp js-short-timestamp " data-aria-label-part="last" data-time="1624850932" data-time-ms="1624850932000" data-long-form="true">Jun 27</span></a>
-</small>
-
-          <div class="ProfileTweet-action ProfileTweet-action--more js-more-ProfileTweet-actions">
-    <div class="dropdown">
-  <button class="ProfileTweet-actionButton u-textUserColorHover dropdown-toggle js-dropdown-toggle" type="button">
-      <div class="IconContainer js-tooltip" title="More">
-        <span class="Icon Icon--caretDownLight Icon--small"></span>
-        <span class="u-hiddenVisually">More</span>
-      </div>
-  </button>
-  <div class="dropdown-menu is-autoCentered">
-  <div class="dropdown-caret">
-    <div class="caret-outer"></div>
-    <div class="caret-inner"></div>
-  </div>
-  <ul>
-    
-      <li class="copy-link-to-tweet js-actionCopyLinkToTweet">
-        <button type="button" class="dropdown-link">Copy link to Tweet</button>
-      </li>
-      <li class="embed-link js-actionEmbedTweet" data-nav="embed_tweet">
-        <button type="button" class="dropdown-link">Embed Tweet</button>
-      </li>
-  </ul>
-</div>
-
-</div>
-
-  </div>
-
-      </div>
-
-      
-
-      
-
-        <div class="ReplyingToContextBelowAuthor" data-aria-label-part>
-    Replying to <a class="pretty-link js-user-profile-link" href="/codinghorror" data-user-id="5637652" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>codinghorror</b></span></a>
-
-
-
-</div>
-
-
-      
-        <div class="js-tweet-text-container">
-  <p class="TweetTextSize  js-tweet-text tweet-text" lang="en" data-aria-label-part="0">This will be the next milestone<a href="https://t.co/ARtq5AkZqG" class="twitter-timeline-link u-hidden" data-pre-embedded="true" dir="ltr" >pic.twitter.com/ARtq5AkZqG</a></p>
-</div>
-
-
-      
-
-      
-            <div class="AdaptiveMediaOuterContainer">
-    <div class="AdaptiveMedia
-        
-        is-square
-        
-        
-        
-        "
-      >
-      <div class="AdaptiveMedia-container">
-          <div class="AdaptiveMedia-singlePhoto"
-    style="padding-top: calc(0.5807799442896936 * 100% - 0.5px);"
->
-    <div class="AdaptiveMedia-photoContainer js-adaptive-photo "
-  data-image-url="https://pbs.twimg.com/media/E48HJy6XIAAUbuy.jpg"
-  
-  
-  data-element-context="platform_photo_card"
-    style="background-color:rgba(25,40,38,1.0);"
-    data-dominant-color="[25,40,38]"
->
-  <img data-aria-label-part src="https://pbs.twimg.com/media/E48HJy6XIAAUbuy.jpg" alt=""
-      style="width: 100%; top: -0px;"
->
-</div>
-
-
-</div>
-      </div>
-    </div>
-  </div>
-
-
-
-
-      
-      
-
-      
-      <div class="stream-item-footer">
-  
-      <div class="ProfileTweet-actionCountList u-hiddenVisually">
-    
-    
-    <span class="ProfileTweet-action--reply u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-reply-count-aria-1409353075232362505" >0 replies</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--retweet u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-retweet-count-aria-1409353075232362505" >0 retweets</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--favorite u-hiddenVisually">
-      <span class="ProfileTweet-actionCount"  data-tweet-stat-count="2">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-favorite-count-aria-1409353075232362505" data-aria-label-part>2 likes</span>
-      </span>
-    </span>
-  </div>
-
-  <div class="ProfileTweet-actionList js-actions" role="group" aria-label="Tweet actions">
-    <div class="ProfileTweet-action ProfileTweet-action--reply">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionReply"
-    data-modal="ProfileTweet-reply" type="button"
-    aria-describedby="profile-tweet-action-reply-count-aria-1409353075232362505">
-    <div class="IconContainer js-tooltip" title="Reply">
-      <span class="Icon Icon--medium Icon--reply"></span>
-      <span class="u-hiddenVisually">Reply</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero ">
-        <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-      </span>
-  </button>
-</div>
-
-    <div class="ProfileTweet-action ProfileTweet-action--retweet js-toggleState js-toggleRt">
-  <button class="ProfileTweet-actionButton  js-actionButton js-actionRetweet"
-    
-    data-modal="ProfileTweet-retweet"
-    type="button"
-    aria-describedby="profile-tweet-action-retweet-count-aria-1409353075232362505">
-    <div class="IconContainer js-tooltip" title="Retweet">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retweet</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo js-actionButton js-actionRetweet" data-modal="ProfileTweet-retweet" type="button">
-    <div class="IconContainer js-tooltip" title="Undo retweet">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retweeted</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button>
-</div>
-
-
-    <div class="ProfileTweet-action ProfileTweet-action--favorite js-toggleState">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionFavorite" type="button"
-    aria-describedby="profile-tweet-action-favorite-count-aria-1409353075232362505">
-    <div class="IconContainer js-tooltip" title="Like">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Like</span>
-    </div>
-      <span class="ProfileTweet-actionCount">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">2</span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo ProfileTweet-action--unfavorite u-linkClean js-actionButton js-actionFavorite" type="button">
-    <div class="IconContainer js-tooltip" title="Undo like">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Liked</span>
-    </div>
-      <span class="ProfileTweet-actionCount">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">2</span>
-  </span>
-
-  </button>
-</div>
-
-
-    
-
-    
-
-  </div>
-
-</div>
-  
-
-
-
-      
-      
-
-      
-
-      
-
-    </div>
-
-  </div>
-
-
-
-    
-<div class="dismiss-module">
-  <div class="dismissed-module">
-    <div class="feedback-actions">
-        <div class="feedback-action" data-feedback-type="DontLike" data-feedback-url="">
-          <div class="action-confirmation dismiss-module-item">Thanks. Twitter will use this to make your timeline better.
-            <span class="undo-action">Undo</span>
-          </div>
-        </div>
-    </div>
-    <div class="child-feedback-confirmation">
-      <div class="child-confirmation-item">
-        <span class="child-confirmation-text"></span>
-        <span class="undo-child-feedback-action">Undo</span>
-      </div>
-    </div>
-  </div>
-</div>
-
-</li>
-    </ol>
-  </li>
-
-
-      <li class="ThreadedConversation--loneTweet
-  
-  ">
-    <ol class="stream-items">
-      <li class="js-stream-item stream-item stream-item
-" data-item-id="1409354572838195201"
-id="stream-item-tweet-1409354572838195201"
-data-item-type="tweet"
- data-suggestion-json="{&quot;suggestion_details&quot;:{},&quot;tweet_ids&quot;:&quot;1409354572838195201&quot;,&quot;scribe_component&quot;:&quot;tweet&quot;}">
-    
-
-
-  <div class="tweet js-stream-tweet js-actionable-tweet js-profile-popup-actionable dismissible-content
-      
-      
-      
-       descendant permalink-descendant-tweet
-"
-      
-data-tweet-id="1409354572838195201"
-data-item-id="1409354572838195201"
-data-permalink-path="/andrenaleen/status/1409354572838195201"
-data-conversation-id="1409270864315486209"
-
-
- data-has-parent-tweet="true" 
-
-data-tweet-nonce="1409354572838195201-c8f2982b-c875-4693-9374-ada017b355f4"
-data-tweet-stat-initialized="true"
-data-conversation-section-quality="HighQuality"
-
-
-
-
-
-  data-screen-name="andrenaleen" data-name="Andrei Taranchenko" data-user-id="901153681806176256"
-  data-you-follow="false"
-  data-follows-you="false"
-  data-you-block="false"
- data-mentions="codinghorror"
-
-data-reply-to-users-json="[{&quot;id_str&quot;:&quot;901153681806176256&quot;,&quot;screen_name&quot;:&quot;andrenaleen&quot;,&quot;name&quot;:&quot;Andrei Taranchenko&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Andrei Taranchenko&quot;,&quot;emojified_text_as_html&quot;:&quot;Andrei Taranchenko&quot;}},{&quot;id_str&quot;:&quot;5637652&quot;,&quot;screen_name&quot;:&quot;codinghorror&quot;,&quot;name&quot;:&quot;Jeff Atwood&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Jeff Atwood&quot;,&quot;emojified_text_as_html&quot;:&quot;Jeff Atwood&quot;}}]"
-
-
-
-
-
-
-
-data-disclosure-type=""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- data-component-context="replies"
-
-
-    >
-
-    <div class="context">
-      
-      
-    </div>
-
-    <div class="content">
-      
-
-      
-
-      
-      <div class="stream-item-header">
-          <a  class="account-group js-account-group js-action-profile js-user-profile-link js-nav" href="/andrenaleen" data-user-id="901153681806176256">
-      <img class="avatar js-action-profile-avatar" src="https://pbs.twimg.com/profile_images/1069583899683110912/Xe38w2ow_bigger.jpg" alt="">
-    <span class="FullNameGroup">
-      <strong class="fullname show-popup-with-id u-textTruncate " data-aria-label-part>Andrei Taranchenko</strong><span>&rlm;</span><span class="UserBadges"></span><span class="UserNameBreak">&nbsp;</span></span><span class="username u-dir u-textTruncate" dir="ltr" data-aria-label-part>@<b>andrenaleen</b></span></a>
-
-        
-        <small class="time">
-  <a href="/andrenaleen/status/1409354572838195201" class="tweet-timestamp js-permalink js-nav js-tooltip" title="8:34 PM - 27 Jun 2021"  data-conversation-id="1409270864315486209"><span class="_timestamp js-short-timestamp " data-aria-label-part="last" data-time="1624851289" data-time-ms="1624851289000" data-long-form="true">Jun 27</span></a>
-</small>
-
-          <div class="ProfileTweet-action ProfileTweet-action--more js-more-ProfileTweet-actions">
-    <div class="dropdown">
-  <button class="ProfileTweet-actionButton u-textUserColorHover dropdown-toggle js-dropdown-toggle" type="button">
-      <div class="IconContainer js-tooltip" title="More">
-        <span class="Icon Icon--caretDownLight Icon--small"></span>
-        <span class="u-hiddenVisually">More</span>
-      </div>
-  </button>
-  <div class="dropdown-menu is-autoCentered">
-  <div class="dropdown-caret">
-    <div class="caret-outer"></div>
-    <div class="caret-inner"></div>
-  </div>
-  <ul>
-    
-      <li class="copy-link-to-tweet js-actionCopyLinkToTweet">
-        <button type="button" class="dropdown-link">Copy link to Tweet</button>
-      </li>
-      <li class="embed-link js-actionEmbedTweet" data-nav="embed_tweet">
-        <button type="button" class="dropdown-link">Embed Tweet</button>
-      </li>
-  </ul>
-</div>
-
-</div>
-
-  </div>
-
-      </div>
-
-      
-
-      
-
-        <div class="ReplyingToContextBelowAuthor" data-aria-label-part>
-    Replying to <a class="pretty-link js-user-profile-link" href="/codinghorror" data-user-id="5637652" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>codinghorror</b></span></a>
-
-
-
-</div>
-
-
-      
-        <div class="js-tweet-text-container">
-  <p class="TweetTextSize  js-tweet-text tweet-text" lang="en" data-aria-label-part="0">I mean, a text from your kid is less dramatic than Pearl Harbor, but I don&#39;t have all the info.</p>
-</div>
-
-
-      
-
-      
-        
-
-
-      
-      
-
-      
-      <div class="stream-item-footer">
-  
-      <div class="ProfileTweet-actionCountList u-hiddenVisually">
-    
-    
-    <span class="ProfileTweet-action--reply u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-reply-count-aria-1409354572838195201" >0 replies</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--retweet u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-retweet-count-aria-1409354572838195201" >0 retweets</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--favorite u-hiddenVisually">
-      <span class="ProfileTweet-actionCount"  data-tweet-stat-count="1">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-favorite-count-aria-1409354572838195201" data-aria-label-part>1 like</span>
-      </span>
-    </span>
-  </div>
-
-  <div class="ProfileTweet-actionList js-actions" role="group" aria-label="Tweet actions">
-    <div class="ProfileTweet-action ProfileTweet-action--reply">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionReply"
-    data-modal="ProfileTweet-reply" type="button"
-    aria-describedby="profile-tweet-action-reply-count-aria-1409354572838195201">
-    <div class="IconContainer js-tooltip" title="Reply">
-      <span class="Icon Icon--medium Icon--reply"></span>
-      <span class="u-hiddenVisually">Reply</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero ">
-        <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-      </span>
-  </button>
-</div>
-
-    <div class="ProfileTweet-action ProfileTweet-action--retweet js-toggleState js-toggleRt">
-  <button class="ProfileTweet-actionButton  js-actionButton js-actionRetweet"
-    
-    data-modal="ProfileTweet-retweet"
-    type="button"
-    aria-describedby="profile-tweet-action-retweet-count-aria-1409354572838195201">
-    <div class="IconContainer js-tooltip" title="Retweet">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retweet</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo js-actionButton js-actionRetweet" data-modal="ProfileTweet-retweet" type="button">
-    <div class="IconContainer js-tooltip" title="Undo retweet">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retweeted</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button>
-</div>
-
-
-    <div class="ProfileTweet-action ProfileTweet-action--favorite js-toggleState">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionFavorite" type="button"
-    aria-describedby="profile-tweet-action-favorite-count-aria-1409354572838195201">
-    <div class="IconContainer js-tooltip" title="Like">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Like</span>
-    </div>
-      <span class="ProfileTweet-actionCount">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">1</span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo ProfileTweet-action--unfavorite u-linkClean js-actionButton js-actionFavorite" type="button">
-    <div class="IconContainer js-tooltip" title="Undo like">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Liked</span>
-    </div>
-      <span class="ProfileTweet-actionCount">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">1</span>
-  </span>
-
-  </button>
-</div>
-
-
-    
-
-    
-
-  </div>
-
-</div>
-  
-
-
-
-      
-      
-
-      
-
-      
-
-    </div>
-
-  </div>
-
-
-
-    
-<div class="dismiss-module">
-  <div class="dismissed-module">
-    <div class="feedback-actions">
-        <div class="feedback-action" data-feedback-type="DontLike" data-feedback-url="">
-          <div class="action-confirmation dismiss-module-item">Thanks. Twitter will use this to make your timeline better.
-            <span class="undo-action">Undo</span>
-          </div>
-        </div>
-    </div>
-    <div class="child-feedback-confirmation">
-      <div class="child-confirmation-item">
-        <span class="child-confirmation-text"></span>
-        <span class="undo-child-feedback-action">Undo</span>
-      </div>
-    </div>
-  </div>
-</div>
-
-</li>
-    </ol>
-  </li>
-
-
-
-
-
- 
-
-        </ol>
-        <div class="stream-footer ">
-  <div class="timeline-end has-items ">
-      <div class="stream-end">
-    <div class="stream-end-inner">
-        <span class="Icon Icon--large Icon--logo"></span>
-
-      <p class="empty-text">
-
-          
-      </p>
-
-        <p><button type="button" class="btn-link back-to-top hidden">Back to top &uarr;</button></p>
-    </div>
-  </div>
-
-
-    <div class="stream-loading">
-  <div class="stream-end-inner">
-    <span class="spinner" title="Loading..."></span>
-  </div>
-</div>
-
-  </div>
-</div>
-<div class="stream-fail-container">
-    <div class="js-stream-whale-end stream-whale-end stream-placeholder centered-placeholder">
-  <div class="stream-end-inner">
-    <h2 class="title">Loading seems to be taking a while.</h2>
-    <p>
-      Twitter may be over capacity or experiencing a momentary hiccup. <a role="button" href="#" class="try-again-after-whale">Try again</a> or visit <a target="_blank" href="http://status.twitter.com" rel="noopener">Twitter Status</a> for more information.
+    .errorButton {
+      margin: 3em 0;
+    }
+
+    .errorButton a {
+      background: #1DA1F2;
+      border-radius: 2.5em;
+      color: white;
+      padding: 1em 2em;
+      text-decoration: none;
+    }
+
+    .errorButton a:hover,
+    .errorButton a:focus {
+      background: rgb(26, 145, 218);
+    }
+
+    .errorFooter {
+      color: #657786;
+      font-size: 80%;
+      line-height: 1.5;
+      padding: 1em 0;
+    }
+
+    .errorFooter a,
+    .errorFooter a:visited {
+      color: #657786;
+      text-decoration: none;
+      padding-right: 1em;
+    }
+
+    .errorFooter a:hover,
+    .errorFooter a:active {
+      text-decoration: underline;
+    }
+
+      #placeholder,
+      #react-root {
+        display: none !important;
+      }
+      body {
+        background-color: #FFF !important;
+      }
+    </style>
+    <div class="errorContainer">
+      <img width="46" height="38" srcset="https://abs.twimg.com/errors/logo46x38.png 1x, https://abs.twimg.com/errors/logo46x38@2x.png 2x" src="https://abs.twimg.com/errors/logo46x38.png" alt="Twitter">
+      <h1>JavaScript is not available.</h1>
+      <p>We’ve detected that JavaScript is disabled in this browser. Please enable JavaScript or switch to a supported browser to continue using twitter.com. You can see a list of supported browsers in our Help Center.</p>
+      <p class="errorButton"><a href="https://help.twitter.com/using-twitter/twitter-supported-browsers">Help Center</a></p>
+    <p class="errorFooter">
+      <a href="https://twitter.com/tos">Terms of Service</a>
+      <a href="https://twitter.com/privacy">Privacy Policy</a>
+      <a href="https://support.twitter.com/articles/20170514">Cookie Policy</a>
+      <a href="https://legal.twitter.com/imprint.html">Imprint</a>
+      <a href="https://business.twitter.com/en/help/troubleshooting/how-twitter-ads-work.html?ref=web-twc-ao-gbl-adsinfo&amp;utm_source=twc&amp;utm_medium=web&amp;utm_campaign=ao&amp;utm_content=adsinfo">Ads info</a>
+      © 2023 X Corp.
     </p>
-  </div>
-</div>
-</div>
 
-      <ol class="hidden-replies-container"></ol>
-    </div>
-  </div>
-      </div>
     </div>
+  </noscript>
+<div id="react-root" style="height:100%;display:flex;"><div class="css-1dbjc4n r-13awgt0 r-12vffkv"><div class="css-1dbjc4n r-13awgt0 r-12vffkv"><div class="css-1dbjc4n r-13qz1uu r-417010" style="min-height:736px">
+<div aria-label="Skip to home timeline" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1niwhzg r-1ets6dv r-sdzlij r-1phboty r-4iw3lz r-1xk2f4g r-109y4c4 r-2yi16 r-1qi8awa r-1ny4l3l r-1udh08x r-wwvuq4 r-u8s1d r-o7ynqc r-6416eg r-lrvibr r-92ng3h"><div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-18u37iz r-16y2uox r-37j5jr r-a023e6 r-b88u0q r-1777fci r-rjixqe r-bcqeeo r-q4m81j r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-a023e6 r-rjixqe r-bcqeeo r-qvutc0"></span></div></div>
+<div aria-label="Skip to trending" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1niwhzg r-1ets6dv r-sdzlij r-1phboty r-4iw3lz r-1xk2f4g r-109y4c4 r-2yi16 r-1qi8awa r-1ny4l3l r-1udh08x r-wwvuq4 r-u8s1d r-o7ynqc r-6416eg r-lrvibr r-92ng3h"><div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-18u37iz r-16y2uox r-37j5jr r-a023e6 r-b88u0q r-1777fci r-rjixqe r-bcqeeo r-q4m81j r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-a023e6 r-rjixqe r-bcqeeo r-qvutc0"></span></div></div>
+<header role="banner" class="css-1dbjc4n r-lrvibr r-1g40b8q"><div class="css-1dbjc4n r-1h3ijdo r-orgf3d r-633pao"></div>
+<div class="css-1dbjc4n" data-testid="SSRSafeLayer"><div class="css-1dbjc4n r-1d2f490 r-1xcajam r-zchlnj r-1gn8etr">
+<div class="css-1dbjc4n r-1e5uvyk r-6026j r-16e0dcy r-dkhcqf r-axxi2z r-18jm5s1" data-testid="TopNavBar"><div class="css-1dbjc4n r-1jgb5lz r-13qz1uu"><div class="css-1dbjc4n r-fxvszc r-136ojw6" data-testid="twitter-logged-out-nav">
+<div class="css-1dbjc4n r-1h3ijdo r-136ojw6"><div class="css-1dbjc4n"><div class="css-1dbjc4n r-1h3ijdo"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1h3ijdo r-1777fci r-1jgb5lz r-ymttw5 r-13qz1uu">
+<div class="css-1dbjc4n r-1habvwh r-1pz39u2 r-1777fci r-15ysp7h r-s8bhmr"><div class="css-1dbjc4n r-1777fci r-1mf7evn"><h1 role="heading" class="css-4rbku5 css-1dbjc4n r-1awozwy r-1pz39u2 r-1loqt21 r-6koalj r-16y2uox r-1777fci r-4wgw6l"><a href="/" aria-label="Twitter" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1niwhzg r-42olwf r-sdzlij r-1phboty r-rs99b7 r-1loqt21 r-2yi16 r-1qi8awa r-1ny4l3l r-o7ynqc r-6416eg r-lrvibr" style="margin-left:calc(0px + (-1 * ((36px + (1px * 2)) - 1.75rem) / 2))"><div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-18u37iz r-16y2uox r-37j5jr r-a023e6 r-b88u0q r-1777fci r-rjixqe r-bcqeeo r-q4m81j r-qvutc0" style="color:rgba(15,20,25,1.00)">
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-1cvl2hr r-4qtqp9 r-yyyyoo r-16y2uox r-lwhw9o r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-19wmn03"><g><path d="M23.643 4.937c-.835.37-1.732.62-2.675.733.962-.576 1.7-1.49 2.048-2.578-.9.534-1.897.922-2.958 1.13-.85-.904-2.06-1.47-3.4-1.47-2.572 0-4.658 2.086-4.658 4.66 0 .364.042.718.12 1.06-3.873-.195-7.304-2.05-9.602-4.868-.4.69-.63 1.49-.63 2.342 0 1.616.823 3.043 2.072 3.878-.764-.025-1.482-.234-2.11-.583v.06c0 2.257 1.605 4.14 3.737 4.568-.392.106-.803.162-1.227.162-.3 0-.593-.028-.877-.082.593 1.85 2.313 3.198 4.352 3.234-1.595 1.25-3.604 1.995-5.786 1.995-.376 0-.747-.022-1.112-.065 2.062 1.323 4.51 2.093 7.14 2.093 8.57 0 13.255-7.098 13.255-13.254 0-.2-.005-.402-.014-.602.91-.658 1.7-1.477 2.323-2.41z"></path></g></svg><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-a023e6 r-rjixqe r-bcqeeo r-qvutc0"></span>
+</div></a></h1></div></div>
+<div class="css-1dbjc4n r-16y2uox r-1wbh5a2 r-1pi2tsx r-1777fci">
+<div class="css-1dbjc4n r-1habvwh"></div>
+<div class="css-1dbjc4n r-1awozwy r-1iusvr4 r-18u37iz r-16y2uox"><div class="css-1dbjc4n r-1oszu61 r-1iusvr4 r-18u37iz r-16y2uox"><div class="css-1dbjc4n r-13awgt0 r-eqz5dr r-bnwqim r-8fdsdq"><div class="r-1oszu61 r-vqxq0j r-deolkf r-6koalj r-1mlwlqe r-eqz5dr r-1wbh5a2 r-crgep1 r-ifefl9 r-bcqeeo r-t60dpp r-bnwqim r-13qz1uu r-417010"><form action="#" aria-label="Search Twitter" role="search" class="r-1oszu61 r-1phboty r-1yadl64 r-deolkf r-6koalj r-13awgt0 r-eqz5dr r-crgep1 r-ifefl9 r-bcqeeo r-t60dpp r-bnwqim r-417010">
+<div class="css-1dbjc4n r-1wbh5a2"><div class="css-1dbjc4n r-1sw30gj r-42olwf r-sdzlij r-1phboty r-rs99b7 r-eqz5dr r-16y2uox r-1wbh5a2 r-1777fci"><div class="css-1dbjc4n"><div class="css-1dbjc4n r-1awozwy r-18u37iz"><label class="css-1dbjc4n r-1dqbpge r-13awgt0 r-18u37iz" data-testid="SearchBox_Search_Input_label"><div class="css-1dbjc4n r-7q8q6z r-6koalj r-1777fci"><svg viewbox="0 0 24 24" aria-hidden="true" class="r-14j79pv r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-4wgw6l r-f727ji r-bnwqim r-1plcrui r-lrvibr"><g><path d="M10.25 3.75c-3.59 0-6.5 2.91-6.5 6.5s2.91 6.5 6.5 6.5c1.795 0 3.419-.726 4.596-1.904 1.178-1.177 1.904-2.801 1.904-4.596 0-3.59-2.91-6.5-6.5-6.5zm-8.5 6.5c0-4.694 3.806-8.5 8.5-8.5s8.5 3.806 8.5 8.5c0 1.986-.682 3.815-1.824 5.262l4.781 4.781-1.414 1.414-4.781-4.781c-1.447 1.142-3.276 1.824-5.262 1.824-4.694 0-8.5-3.806-8.5-8.5z"></path></g></svg></div>
+<div class="css-1dbjc4n r-16y2uox r-1wbh5a2"><div dir="ltr" class="css-901oao r-6koalj r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><input type="text" aria-activedescendant="typeaheadFocus-0.5412497229651458" aria-autocomplete="list" aria-label="Search query" aria-owns="typeaheadDropdown-27962" autocapitalize="sentences" autocomplete="off" autocorrect="off" placeholder="Search Twitter" role="combobox" spellcheck="false" value="" enterkeyhint="search" dir="auto" class="r-30o5oe r-1niwhzg r-17gur6a r-1yadl64 r-deolkf r-homxoj r-poiln3 r-7cikom r-1ny4l3l r-xyw6el r-oyd9sg r-y0fyvk r-1dz5y72 r-fdjqy7 r-13qz1uu" data-testid="SearchBox_Search_Input"></div></div>
+<div class="css-1dbjc4n r-6koalj r-1777fci"></div></label></div></div></div></div>
+<div class="css-1dbjc4n r-13awgt0 r-bnwqim"></div>
+</form></div></div></div></div>
 </div>
-
-
-
-  </div>
-
-
-  <div class="stream-container suggested-tweet-stream-container dismissible-container u-hidden">
-    <div class="stream suggested-tweet-stream permalink-replies">
-      <h3 class="promoted-heading">Promoted Tweet</h3>
-      <ol class="stream-items suggested-tweet-stream-items js-navigable-stream" id="suggested-stream-items-id">
-        
-      </ol>
-    </div>
-   </div>
-
-    <div class="module Trends trends hidden Trends--wide">
-  <div class="trends-inner">
-    <div class="flex-module trends-container ">
-  <div class="flex-module-header">
-    
-    <h3><span class="trend-location js-trend-location">false</span></h3>
-  </div>
-  <div class="flex-module-inner">
-    <ul class="trend-items js-trends">
-    </ul>
-  </div>
+<div class="css-1dbjc4n r-obd0qt r-1pz39u2 r-1777fci r-15ysp7h r-s8bhmr"><div aria-expanded="false" aria-haspopup="menu" aria-label="More" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1niwhzg r-42olwf r-sdzlij r-1phboty r-rs99b7 r-2yi16 r-1qi8awa r-1ny4l3l r-o7ynqc r-6416eg r-lrvibr" style="margin-right:calc(4px + (-1 * ((36px + (1px * 2)) - 20px) / 2))"><div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-18u37iz r-16y2uox r-37j5jr r-a023e6 r-b88u0q r-1777fci r-rjixqe r-bcqeeo r-q4m81j r-qvutc0" style="color:rgba(15,20,25,1.00)">
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-z80fyv r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-19wmn03" style="color:rgba(15,20,25,1.00)"><g><path d="M3 12c0-1.1.9-2 2-2s2 .9 2 2-.9 2-2 2-2-.9-2-2zm9 2c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm7 0c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2z"></path></g></svg><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-a023e6 r-rjixqe r-bcqeeo r-qvutc0" style="border-bottom:2px solid #0F1419"></span>
+</div></div></div>
+</div></div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-16y2uox r-1w6e6rj r-1h3ijdo r-1wtj0ep r-1fz3rvf r-rjfia"><div class="css-1dbjc4n r-1awozwy r-1pz39u2 r-18u37iz r-16y2uox"><div class="css-1dbjc4n r-1awozwy r-1pz39u2 r-18u37iz r-16y2uox">
+<div class="css-1dbjc4n r-16y2uox"><a href="/login" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1niwhzg r-1ets6dv r-sdzlij r-1phboty r-rs99b7 r-1loqt21 r-15ysp7h r-4wgw6l r-1ny4l3l r-ymttw5 r-o7ynqc r-6416eg r-lrvibr" data-testid="login"><div dir="ltr" class="css-901oao r-1awozwy r-1cvl2hr r-6koalj r-18u37iz r-16y2uox r-37j5jr r-a023e6 r-b88u0q r-1777fci r-rjixqe r-bcqeeo r-q4m81j r-qvutc0"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-1b43r93 r-1cwl3u0 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Log in</span></span></div></a></div>
+<div class="css-1dbjc4n r-16y2uox r-19u6a5r"><a href="/i/flow/signup" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-l5o3uw r-42olwf r-sdzlij r-1phboty r-rs99b7 r-1loqt21 r-15ysp7h r-4wgw6l r-1ny4l3l r-ymttw5 r-o7ynqc r-6416eg r-lrvibr" data-testid="signup"><div dir="ltr" class="css-901oao r-1awozwy r-jwli3a r-6koalj r-18u37iz r-16y2uox r-37j5jr r-a023e6 r-b88u0q r-1777fci r-rjixqe r-bcqeeo r-q4m81j r-qvutc0"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-1b43r93 r-1cwl3u0 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Sign up</span></span></div></a></div>
+</div></div></div>
+</div></div></div>
+<div class="css-1dbjc4n r-633pao r-u8s1d r-dkhcqf r-axxi2z r-18jm5s1 r-13qz1uu r-1wyyakw" style="-webkit-transform:translate3d(0, 0, 0) translateY(53px);transform:translate3d(0, 0, 0) translateY(53px)"><div class="css-1dbjc4n r-1jgb5lz r-13qz1uu"><div class="css-1dbjc4n r-1awozwy r-1777fci r-1jgb5lz r-19u6a5r r-13qz1uu"><div role="status" class="css-1dbjc4n r-1r5su4o r-orgf3d r-1lul07w r-eafdt9 r-1b8bd59 r-nx0j10"><div aria-label="New Tweets are available. Push the period key to go to the them." role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-l5o3uw r-sdzlij r-y3da5r r-1777fci r-1ny4l3l r-ymttw5 r-oyd9sg r-o7ynqc r-6416eg"><div class="css-1dbjc4n r-18u37iz">
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-1kihuf0 r-jwli3a r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-19wmn03"><g><path d="M12 3.59l7.457 7.45-1.414 1.42L13 7.41V21h-2V7.41l-5.043 5.05-1.414-1.42L12 3.59z"></path></g></svg><div dir="ltr" class="css-901oao css-1hf3ou5 r-1kihuf0 r-jwli3a r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-13hce6t r-bcqeeo r-qvutc0" data-testid="pillLabel"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">See new Tweets</span></div>
+</div></div></div></div></div></div>
+</div></div></header><main role="main" class="css-1dbjc4n r-16y2uox r-1wbh5a2"><div class="css-1dbjc4n r-150rngu r-16y2uox r-1wbh5a2"><div class="css-1dbjc4n r-aqfbo4 r-16y2uox"><div class="css-1dbjc4n r-1oszu61 r-1niwhzg r-18u37iz r-16y2uox r-1jgb5lz r-2llsf r-13qz1uu"><div class="css-1dbjc4n r-14lw9ot r-42olwf r-1ljd8xs r-13l2t4g r-1phboty r-16y2uox r-1jgb5lz r-13qz1uu r-184en5c" data-testid="primaryColumn"><div aria-label="Home timeline" tabindex="0" class="css-1dbjc4n"><div itemscope="" itemtype="https://schema.org/Collection">
+<meta content="Tweet with replies" itemprop="name">
+<section aria-labelledby="accessible-list-12471" role="region" class="css-1dbjc4n"><h1 dir="auto" aria-level="1" role="heading" class="css-4rbku5 css-901oao r-4iw3lz r-1xk2f4g r-109y4c4 r-1udh08x r-wwvuq4 r-u8s1d r-92ng3h" id="accessible-list-12471">Conversation</h1>
+<div aria-label="Timeline: Conversation" class="css-1dbjc4n"><div class="css-1dbjc4n">
+<div class="css-1dbjc4n r-1adg3ll r-1ny4l3l"><div itemprop="hasPart" itemscope="" itemtype="https://schema.org/SocialMediaPosting">
+<meta content="1409270864315486209" itemprop="identifier">
+<meta content="1" itemprop="position">
+<meta content="22" itemprop="commentCount">
+<meta content="" itemprop="contentRating">
+<meta content="2021-06-27T22:02:11.000Z" itemprop="dateCreated">
+<meta content="2021-06-27T22:02:11.000Z" itemprop="datePublished">
+<meta content="https://twitter.com/codinghorror/status/1409270864315486209" itemprop="url">
+<div itemprop="author" itemscope="" itemtype="https://schema.org/Person">
+<meta content="5637652" itemprop="identifier">
+<meta content="codinghorror" itemprop="additionalName">
+<meta content="Jeff Atwood" itemprop="givenName">
 </div>
-
-  </div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/LikeAction" itemprop="interactionType">
+<meta content="Likes" itemprop="name">
+<meta content="https://twitter.com/codinghorror/status/1409270864315486209/likes" itemprop="url">
+<meta content="90" itemprop="userInteractionCount">
 </div>
-
-
-  <div class="permalink-footer">
-      <div class="Footer module roaming-module Footer--slim"
-  >
-  <div class="flex-module">
-    <div class="flex-module-inner js-items-container">
-      <ul class="u-cf">
-        <li class="Footer-item Footer-copyright copyright">&copy; 2021 Twitter</li>
-        <li class="Footer-item"><a class="Footer-link" href="/about" rel="noopener">About</a></li>
-        <li class="Footer-item"><a class="Footer-link" href="//support.twitter.com" rel="noopener">Help Center</a></li>
-        <li class="Footer-item"><a class="Footer-link" href="/tos" rel="noopener">Terms</a></li>
-        <li class="Footer-item"><a class="Footer-link" href="/privacy" rel="noopener">Privacy policy</a></li>
-        <li class="Footer-item"><a class="Footer-link" href="//support.twitter.com/articles/20170514" rel="noopener">Cookies</a></li>
-        <li class="Footer-item"><a class="Footer-link" href="//business.twitter.com/en/help/troubleshooting/how-twitter-ads-work.html" rel="noopener">Ads info</a></li>
-      </ul>
-    </div>
-  </div>
-
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Retweets" itemprop="name">
+<meta content="https://twitter.com/codinghorror/status/1409270864315486209/retweets" itemprop="url">
+<meta content="5" itemprop="userInteractionCount">
 </div>
-
-  </div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Quotes" itemprop="name">
+<meta content="https://twitter.com/codinghorror/status/1409270864315486209/retweets/with_comments" itemprop="url">
+<meta content="1" itemprop="userInteractionCount">
 </div>
-
-
-      </div>
-    </div>
-  </div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Replies" itemprop="name">
+<meta content="https://twitter.com/codinghorror/status/1409270864315486209" itemprop="url">
+<meta content="22" itemprop="userInteractionCount">
 </div>
-
-    <div class="hidden" id="hidden-content">
-  <iframe aria-hidden="true" class="tweet-post-iframe" name="tweet-post-iframe"></iframe>
-  <iframe aria-hidden="true" class="dm-post-iframe" name="dm-post-iframe"></iframe>
-
+<article aria-labelledby="id__wk2npqyqe27 id__heytm06p3we id__1zlrqaji4zqj id__5lgpqiwbk3o id__zu7ppdkqypi id__fji39rts3g id__e9i5ssdstbm id__i961vzlkwe id__snsbalo4huf id__8y0tu67ubkg id__sd2ta53lv3 id__cq6e4s57d7d id__ch9rj9lapkr id__3yxqrgxmpz5 id__o450j16s83 id__bx2tmboihww id__6wsy9ir2gav id__yaid674jaw id__q2j8mv07ccl" role="article" tabindex="-1" class="css-1dbjc4n r-18u37iz r-1ut4w64 r-1ny4l3l r-1udh08x r-1qhn6m8 r-i023vh" data-testid="tweet"><div class="css-1dbjc4n r-eqz5dr r-16y2uox r-1wbh5a2"><div class="css-1dbjc4n r-16y2uox r-1wbh5a2 r-1ny4l3l">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-18u37iz"><div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-ttdzmv"></div></div></div>
+<div class="css-1dbjc4n r-18u37iz">
+<div class="css-1dbjc4n r-1awozwy r-1hwvwag r-18kxxzh r-1b7u577">
+<div class="css-1dbjc4n" data-testid="Tweet-User-Avatar"><div class="css-1dbjc4n r-18kxxzh r-1wbh5a2 r-13qz1uu"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1adg3ll r-h3s6tt r-bztko3" style="width:48px" data-testid="UserAvatar-Container-codinghorror">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-1adg3ll r-1pi2tsx r-1wyvozj r-bztko3 r-u8s1d r-1v2oles r-desppf r-13qz1uu">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-ggadg3 r-1udh08x r-u8s1d r-8jfcpp" style="height:calc(100% - -4px);width:calc(100% - -4px)"><a href="/codinghorror" aria-hidden="true" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1niwhzg r-1loqt21 r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1niwhzg r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-14lw9ot r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-14lw9ot r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1adg3ll r-1udh08x" style="background-color:rgba(185,202,211,1.00)">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/profile_images/1517287320235298816/Qx-O6UCY_400x400.jpg")'></div>
+<img alt="" draggable="true" src="https://pbs.twimg.com/profile_images/1517287320235298816/Qx-O6UCY_400x400.jpg" class="css-9pa8cd">
+</div></div>
+</div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-12181gd r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"></div></div></a></div></div>
+</div></div>
+</div></div></div></div>
+<div class="css-1dbjc4n r-1bimlpy r-16y2uox r-1jgb5lz r-14gqq1x r-m5arl1"></div>
 </div>
-
-    
-    
-      <input type="hidden" id="init-data" class="json-data" value="{&quot;keyboardShortcuts&quot;:[{&quot;name&quot;:&quot;Actions&quot;,&quot;description&quot;:&quot;Shortcuts for common actions.&quot;,&quot;shortcuts&quot;:[{&quot;keys&quot;:[&quot;Enter&quot;],&quot;description&quot;:&quot;Open Tweet details&quot;},{&quot;keys&quot;:[&quot;o&quot;],&quot;description&quot;:&quot;Expand photo&quot;},{&quot;keys&quot;:[&quot;\/&quot;],&quot;description&quot;:&quot;Search&quot;}]},{&quot;name&quot;:&quot;Navigation&quot;,&quot;description&quot;:&quot;Shortcuts for navigating between items in timelines.&quot;,&quot;shortcuts&quot;:[{&quot;keys&quot;:[&quot;?&quot;],&quot;description&quot;:&quot;This menu&quot;},{&quot;keys&quot;:[&quot;j&quot;],&quot;description&quot;:&quot;Next Tweet&quot;},{&quot;keys&quot;:[&quot;k&quot;],&quot;description&quot;:&quot;Previous Tweet&quot;},{&quot;keys&quot;:[&quot;Space&quot;],&quot;description&quot;:&quot;Page down&quot;},{&quot;keys&quot;:[&quot;.&quot;],&quot;description&quot;:&quot;Load new Tweets&quot;}]},{&quot;name&quot;:&quot;Timelines&quot;,&quot;description&quot;:&quot;Shortcuts for navigating to different timelines or pages.&quot;,&quot;shortcuts&quot;:[{&quot;keys&quot;:[&quot;g&quot;,&quot;u&quot;],&quot;description&quot;:&quot;Go to user\u2026&quot;}]}],&quot;baseFoucClass&quot;:&quot;swift-loading&quot;,&quot;bodyFoucClassNames&quot;:&quot;swift-loading no-nav-banners&quot;,&quot;assetsBasePath&quot;:&quot;https:\/\/abs.twimg.com\/a\/1625696336\/&quot;,&quot;assetVersionKey&quot;:&quot;2b0fec&quot;,&quot;emojiAssetsPath&quot;:&quot;https:\/\/abs.twimg.com\/emoji\/v2\/72x72\/&quot;,&quot;environment&quot;:&quot;production&quot;,&quot;formAuthenticityToken&quot;:&quot;46a6f55f84bf8fb45d8b56ce053c0606e73735e0&quot;,&quot;loggedIn&quot;:false,&quot;screenName&quot;:null,&quot;fullName&quot;:null,&quot;userId&quot;:null,&quot;guestId&quot;:&quot;162612517316402055&quot;,&quot;createdAt&quot;:null,&quot;needsPhoneVerification&quot;:false,&quot;allowAdsPersonalization&quot;:true,&quot;scribeBufferSize&quot;:3,&quot;pageName&quot;:&quot;permalink&quot;,&quot;sectionName&quot;:&quot;permalink&quot;,&quot;scribeParameters&quot;:{},&quot;recaptchaApiUrl&quot;:&quot;https:\/\/www.google.com\/recaptcha\/api\/js\/recaptcha_ajax.js&quot;,&quot;internalReferer&quot;:null,&quot;geoEnabled&quot;:false,&quot;typeaheadData&quot;:{&quot;accounts&quot;:{&quot;enabled&quot;:true,&quot;localQueriesEnabled&quot;:false,&quot;remoteQueriesEnabled&quot;:true,&quot;limit&quot;:6},&quot;trendLocations&quot;:{&quot;enabled&quot;:true},&quot;dmConversations&quot;:{&quot;enabled&quot;:false},&quot;followedSearches&quot;:{&quot;enabled&quot;:false},&quot;savedSearches&quot;:{&quot;enabled&quot;:false,&quot;items&quot;:[]},&quot;dmAccounts&quot;:{&quot;enabled&quot;:false,&quot;localQueriesEnabled&quot;:false,&quot;remoteQueriesEnabled&quot;:false,&quot;onlyDMable&quot;:true},&quot;mediaTagAccounts&quot;:{&quot;enabled&quot;:false,&quot;localQueriesEnabled&quot;:false,&quot;remoteQueriesEnabled&quot;:false,&quot;onlyShowUsersWithCanMediaTag&quot;:false,&quot;currentUserId&quot;:-1},&quot;selectedUsers&quot;:{&quot;enabled&quot;:false},&quot;prefillUsers&quot;:{&quot;enabled&quot;:false},&quot;topics&quot;:{&quot;enabled&quot;:true,&quot;localQueriesEnabled&quot;:false,&quot;remoteQueriesEnabled&quot;:true,&quot;prefetchLimit&quot;:500,&quot;limit&quot;:4},&quot;concierge&quot;:{&quot;enabled&quot;:false,&quot;localQueriesEnabled&quot;:false,&quot;remoteQueriesEnabled&quot;:false,&quot;prefetchLimit&quot;:500,&quot;limit&quot;:6},&quot;recentSearches&quot;:{&quot;enabled&quot;:false},&quot;hashtags&quot;:{&quot;enabled&quot;:false,&quot;localQueriesEnabled&quot;:false,&quot;remoteQueriesEnabled&quot;:true,&quot;prefetchLimit&quot;:500},&quot;useIndexedDB&quot;:false,&quot;showSearchAccountSocialContext&quot;:false,&quot;showDebugInfo&quot;:false,&quot;useThrottle&quot;:true,&quot;accountsOnTop&quot;:false,&quot;remoteDebounceInterval&quot;:300,&quot;remoteThrottleInterval&quot;:300,&quot;tweetContextEnabled&quot;:false,&quot;fullNameMatchingInCompose&quot;:true,&quot;topicsWithFiltersEnabled&quot;:false},&quot;shellReferrer&quot;:null,&quot;rwebOptInCookieName&quot;:&quot;rweb_optin&quot;,&quot;rwebOptInCookieNewValue&quot;:&quot;on&quot;,&quot;dm&quot;:{&quot;notifications&quot;:false,&quot;usePushForNotifications&quot;:false,&quot;participant_max&quot;:50,&quot;welcome_message_add_to_conversation_enabled&quot;:true,&quot;poll_options&quot;:{&quot;foreground_poll_interval&quot;:3000,&quot;burst_poll_interval&quot;:3000,&quot;burst_poll_duration&quot;:300000,&quot;max_poll_interval&quot;:60000},&quot;card_prefetch&quot;:true,&quot;card_prefetch_interval_in_seconds&quot;:2000,&quot;dm_quick_reply_options_panel_dismiss_in_ms&quot;:2000,&quot;open_dm_enabled&quot;:false},&quot;autoplayDisabled&quot;:false,&quot;pushStatePageLimit&quot;:500000,&quot;routes&quot;:{&quot;profile&quot;:&quot;\/&quot;},&quot;pushState&quot;:false,&quot;viewContainer&quot;:&quot;#page-container&quot;,&quot;href&quot;:&quot;\/codinghorror\/status\/1409351083177046020&quot;,&quot;searchPathWithQuery&quot;:&quot;\/search?q=query&amp;src=typd&quot;,&quot;composeAltText&quot;:false,&quot;night_mode_activated&quot;:false,&quot;user_color&quot;:null,&quot;deciders&quot;:{&quot;gdprAgeGateDialog&quot;:true,&quot;gdprSoftBounceDialog&quot;:true,&quot;geo_picker_incident_reset&quot;:true,&quot;custom_timeline_curation&quot;:false,&quot;native_notifications&quot;:true,&quot;disable_ajax_datatype_default_to_text&quot;:false,&quot;dm_polling_frequency_in_seconds&quot;:3000,&quot;dm_granular_mute_controls&quot;:true,&quot;enable_media_tag_prefetch&quot;:true,&quot;enableMacawNymizerConversionLanding&quot;:false,&quot;hqImageUploads&quot;:false,&quot;live_pipeline_consume&quot;:true,&quot;mqImageUploads&quot;:false,&quot;partnerIdSyncEnabled&quot;:true,&quot;sruMediaCategory&quot;:true,&quot;photoSruGifLimitMb&quot;:15,&quot;promoted_logging_force_post&quot;:true,&quot;promoted_video_logging_enabled&quot;:true,&quot;pushState&quot;:false,&quot;emojiNewCategory&quot;:false,&quot;contentEditablePlainTextOnly&quot;:false,&quot;web_client_api_stats&quot;:false,&quot;web_perftown_stats&quot;:true,&quot;web_perftown_ttft&quot;:false,&quot;web_client_events_ttft&quot;:false,&quot;log_push_state_ttft_metrics&quot;:false,&quot;web_sru_stats&quot;:false,&quot;web_upload_video&quot;:true,&quot;web_upload_video_advanced&quot;:false,&quot;upload_video_size&quot;:500,&quot;useVmapVariants&quot;:false,&quot;autoplayPreviewPreroll&quot;:true,&quot;moments_home_module&quot;:false,&quot;moments_lohp_enabled&quot;:true,&quot;enableNativePush&quot;:false,&quot;autoSubscribeNativePush&quot;:false,&quot;allowWebPushVapidUpgrade&quot;:true,&quot;stickersInteractivity&quot;:true,&quot;stickersInteractivityDuringLoading&quot;:true,&quot;stickersExperience&quot;:true,&quot;dynamic_video_ads_include_long_videos&quot;:true,&quot;push_state_size&quot;:1000,&quot;live_video_media_control_enabled&quot;:false,&quot;cards2_enable_periscope_card_transition&quot;:true,&quot;use_api_for_retweet_and_unretweet&quot;:false,&quot;use_api_for_follow_and_unfollow&quot;:true,&quot;edge_probe_enabled&quot;:false,&quot;like_over_http_client&quot;:true,&quot;enable_inline_location&quot;:true,&quot;enable_tweetstorm_creation&quot;:true,&quot;enable_tweetstorm_drafts&quot;:false,&quot;enable_tweetstorm_tooltip&quot;:true,&quot;twitter_text_emoji_counting_enabled&quot;:true,&quot;text_length_for_tweetstorm_tooltip&quot;:50,&quot;dm_report_webview_macaw_swift_enabled&quot;:true,&quot;page_title_unread_notification_count&quot;:false,&quot;page_title_badge_after_unread_tweets&quot;:20},&quot;experiments&quot;:{},&quot;toasts_dm&quot;:false,&quot;toasts_timeline&quot;:false,&quot;toasts_dm_poll_scale&quot;:60,&quot;defaultNotificationIcon&quot;:&quot;https:\/\/abs.twimg.com\/a\/1625696336\/img\/t1\/mobile\/wp7_app_icon.png&quot;,&quot;promptbirdData&quot;:{&quot;promptbirdEnabled&quot;:false,&quot;immediateTriggers&quot;:[&quot;PullToRefresh&quot;,&quot;Navigate&quot;],&quot;format&quot;:null},&quot;passwordResetAdvancedLoginForm&quot;:true,&quot;skipAutoSignupDialog&quot;:true,&quot;shouldReplaceSignupWithLogin&quot;:false,&quot;activeHashflags&quot;:{&quot;thelword&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Showtime_Q2_21_v2\/Showtime_Q2_21_v2.png&quot;,&quot;matkoolkawanku&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MatKool_2021\/MatKool_2021.png&quot;,&quot;vamouz&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EsportsAllAccess_Jan_2021_ReadyWillingAble\/EsportsAllAccess_Jan_2021_ReadyWillingAble.png&quot;,&quot;disabledandable&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Twitter_DisabledAndAble\/Twitter_DisabledAndAble.png&quot;,&quot;hbdfoodpanda&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Foodpanda7thAnniversary_2021\/Foodpanda7thAnniversary_2021.png&quot;,&quot;euro2020&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Euro_UK_2021\/Euro_UK_2021.png&quot;,&quot;growtogether&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/GrowTogether_v4\/GrowTogether_v4.png&quot;,&quot;kiakarakatiateao&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;oldthemovie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBC_OldMovie_May_2021_v2\/NBC_OldMovie_May_2021_v2.png&quot;,&quot;petealonso&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLBHRDerby2021-Mets\/MLBHRDerby2021-Mets.png&quot;,&quot;parkboyoungonviu&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DAYSOnViu_2021\/DAYSOnViu_2021.png&quot;,&quot;loveisland&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LoveIsland_2021\/LoveIsland_2021.png&quot;,&quot;modok&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HuluMODOK2021\/HuluMODOK2021.png&quot;,&quot;listeningiseverything&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Spotify_Q2_21\/Spotify_Q2_21.png&quot;,&quot;verzuz&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Verzuz_2020_Flight4\/Verzuz_2020_Flight4.png&quot;,&quot;zola&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ZolaMovie_2021\/ZolaMovie_2021.png&quot;,&quot;gunakanmasker&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WearAMask_2020_2021_ext3\/WearAMask_2020_2021_ext3.png&quot;,&quot;akb単独コンサート&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/17_AKB_May_2021\/17_AKB_May_2021.png&quot;,&quot;eligeelpaisquequieres&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ChileElections_2021\/ChileElections_2021.png&quot;,&quot;levántateydale&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_OAK\/MLB_Teams_2021_OAK.png&quot;,&quot;mladivode&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YouthLead_2020\/YouthLead_2020.png&quot;,&quot;sweettoothnetflix&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NetflixSweetTooth2021\/NetflixSweetTooth2021.png&quot;,&quot;mightywest&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AFL_2021_MightyWest\/AFL_2021_MightyWest.png&quot;,&quot;mesraisons&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/VaccineCanada_2021\/VaccineCanada_2021.png&quot;,&quot;ausairforce&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DFR_2021_AusAirForce_May\/DFR_2021_AusAirForce_May.png&quot;,&quot;somosmujeres&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterWomenTentpole_2021\/TwitterWomenTentpole_2021.png&quot;,&quot;posedinpurpose&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FX_Pose_April_2021\/FX_Pose_April_2021.png&quot;,&quot;asianpacificheritagemonth&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AHM_RepresentAsian_2021\/AHM_RepresentAsian_2021.png&quot;,&quot;백신맞았어요&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;onlyvegas&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LVCVA_Vegas_June_2021\/LVCVA_Vegas_June_2021.png&quot;,&quot;tsm&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCS_Jan_2021_TSMWIN\/LCS_Jan_2021_TSMWIN.png&quot;,&quot;bts_butter&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KpopVIT_BTS_June2021_BTS_Butter\/KpopVIT_BTS_June2021_BTS_Butter.png&quot;,&quot;halomultiplayer&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/XboxOlympus_2021\/XboxOlympus_2021.png&quot;,&quot;maaf70ans&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MAAF_70thBirthday_2021_2\/MAAF_70thBirthday_2021_2.png&quot;,&quot;vidasnegrasimportam&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BlackLivesMatter_VidasNegrasImportam\/BlackLivesMatter_VidasNegrasImportam.png&quot;,&quot;vaccinée&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;lfgthefilm&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMax_LFGDocumentary_2021\/HBOMax_LFGDocumentary_2021.png&quot;,&quot;cubtogether&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_CHC\/MLB_Teams_2021_CHC.png&quot;,&quot;restiamoacasa&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;manlyforever&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL_2021_ManlyForever\/NRL_2021_ManlyForever.png&quot;,&quot;t1win&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCK_2021_Team_P1_T1\/LCK_2021_Team_P1_T1.png&quot;,&quot;sheerios&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EdSheeran_June_UK_2021\/EdSheeran_June_UK_2021.png&quot;,&quot;mywhy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/VaccineCanada_2021\/VaccineCanada_2021.png&quot;,&quot;legomastersonfoxtv&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FOX_LEGOGoldenBrick_2021\/FOX_LEGOGoldenBrick_2021.png&quot;,&quot;fortheh&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_HOU\/MLB_Teams_2021_HOU.png&quot;,&quot;trx&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TRON_Coin_Feb_2021_ext\/TRON_Coin_Feb_2021_ext.png&quot;,&quot;nemumaamas&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;zilliqa&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Zilliqa_April_2021\/Zilliqa_April_2021.png&quot;,&quot;youloveme&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMax_Friends_Turkey\/HBOMax_Friends_Turkey.png&quot;,&quot;hpe&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HPEDiscover2021\/HPEDiscover2021.png&quot;,&quot;カルピス&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AsahiSoftDrinkCalpis02TanabataJapan2021\/AsahiSoftDrinkCalpis02TanabataJapan2021.png&quot;,&quot;forza&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/XboxWoodstock_2021\/XboxWoodstock_2021.png&quot;,&quot;ユージェネ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YouGeneration_JP_2021\/YouGeneration_JP_2021.png&quot;,&quot;geimpft&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;thickandfluffyeggowaffles&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Eggo_May_2021_2\/Eggo_May_2021_2.png&quot;,&quot;treseonnetflix&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TreseOnNetflix_May_2021_ext\/TreseOnNetflix_May_2021_ext.png&quot;,&quot;lokibuaya&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_AlligatorLoki_2021_v2\/Disney_LokiLaunch_AlligatorLoki_2021_v2.png&quot;,&quot;tänkförstdelasen&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2020_ThinkBeforeSharing\/MediaInformationLiteracyWeeks_2020_ThinkBeforeSharing.png&quot;,&quot;katiethurston&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheBachelorette_2021\/TheBachelorette_2021.png&quot;,&quot;जेनरेशनइक्वालिटी&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;jackinthebox&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JackintheBoxTinyTacos_2021\/JackintheBoxTinyTacos_2021.png&quot;,&quot;ger&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Euro_UK_2021_GER\/Euro_UK_2021_GER.png&quot;,&quot;veioparaficar&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avon_PowerStay_BR_2021\/Avon_PowerStay_BR_2021.png&quot;,&quot;フィギュアストーリー&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bytedance_ako_figurestory_June_2021\/Bytedance_ako_figurestory_June_2021.png&quot;,&quot;spacejam&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SpaceJam_2021\/SpaceJam_2021.png&quot;,&quot;cheetosllenosdediversión&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ChesterCheetos_MX_2021\/ChesterCheetos_MX_2021.png&quot;,&quot;apagóndigital&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KeepItOn_InternetShutdown_2021\/KeepItOn_InternetShutdown_2021.png&quot;,&quot;davidoat10&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Davido10YearAnniversary_2021_1\/Davido10YearAnniversary_2021_1.png&quot;,&quot;loveislandusa&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LoveIslandUSA_2021\/LoveIslandUSA_2021.png&quot;,&quot;diversifyyourbuy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SupplierInclusionDiversity_2021\/SupplierInclusionDiversity_2021.png&quot;,&quot;waltdisneyworld&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_MickeyEars_2020_Flight5_V2\/DisneyParks_MickeyEars_2020_Flight5_V2.png&quot;,&quot;bdo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BlackDesert2021Summer\/BlackDesert2021Summer.png&quot;,&quot;vaktsineeritud&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;ruadomedo1978&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_FearStreetTrilogy1978_2021\/Netflix_FearStreetTrilogy1978_2021.png&quot;,&quot;digwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCS_Jan_2021_DIGWIN\/LCS_Jan_2021_DIGWIN.png&quot;,&quot;heretheycome&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_2021_Teams_HereTheyCome\/NBA_2021_Teams_HereTheyCome.png&quot;,&quot;silênciobruno&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Alberto_2021\/Disney_PixarLuca_Alberto_2021.png&quot;,&quot;blijfbinnen&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;толькоты&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Spotify_Q2_21\/Spotify_Q2_21.png&quot;,&quot;dcaboveall&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_2021_Teams_DCAboveAll\/NBA_2021_Teams_DCAboveAll.png&quot;,&quot;ドラブラ世界頂戦&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Tencent_CDB_EVA_phase2_2021\/Tencent_CDB_EVA_phase2_2021.png&quot;,&quot;webexmclaren&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/webexmclaren_2021\/webexmclaren_2021.png&quot;,&quot;pixaralberto&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Alberto_2021\/Disney_PixarLuca_Alberto_2021.png&quot;,&quot;oneteam&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OneTeam_Evergreen\/OneTeam_Evergreen.png&quot;,&quot;tineriilaconducere&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YouthLead_2020\/YouthLead_2020.png&quot;,&quot;whohasmypig&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NeonRated_PigtheFilm_June2021\/NeonRated_PigtheFilm_June2021.png&quot;,&quot;международныйденькрасногокреста&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WorldRedCrossDay_May_2021_add2\/WorldRedCrossDay_May_2021_add2.png&quot;,&quot;ワクチン完了&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;housetargaryen&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HouseoftheDragonHBO_2021\/HouseoftheDragonHBO_2021.png&quot;,&quot;wnbatwitter&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WNBATwitter_2021\/WNBATwitter_2021.png&quot;,&quot;ởnhàlàyêunước&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;healthyathome&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;theflightattendant&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FlightAttendant_LA_May_2021\/FlightAttendant_LA_May_2021.png&quot;,&quot;nextatacer&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Acer_aspirevero_2021\/Acer_aspirevero_2021.png&quot;,&quot;somostimbers&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_PT\/MLS_2021_PT.png&quot;,&quot;nursesweek2021&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CeraVe_ThankYouNurses_2021\/CeraVe_ThankYouNurses_2021.png&quot;,&quot;이달의소녀&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KpopVIT_LOONA_June_2021\/KpopVIT_LOONA_June_2021.png&quot;,&quot;prizm&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PaniniAmericaQ2_21\/PaniniAmericaQ2_21.png&quot;,&quot;ワンピースの日とナッツの日&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Meijinutschoco_2021\/Meijinutschoco_2021.png&quot;,&quot;ff7rの4人が幻影戦争に全員参戦&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WOTV_JP_2021_April\/WOTV_JP_2021_April.png&quot;,&quot;qoo10最大のショッピング祭り&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Qoo10_Shopping_Q2_2021\/Qoo10_Shopping_Q2_2021.png&quot;,&quot;covid19indiahelp&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Covid19India_2021\/Covid19India_2021.png&quot;,&quot;districtofchange&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WNBA_Teams_2021_WAS2\/WNBA_Teams_2021_WAS2.png&quot;,&quot;อยู่บ้านนะคนดี&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;fazerpartenãotempreço&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MasterButterfly_BR_2021\/MasterButterfly_BR_2021.png&quot;,&quot;실렌치오_브루노&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Alberto_2021\/Disney_PixarLuca_Alberto_2021.png&quot;,&quot;dadstop&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DadStopEmbarrassingMeNetflix_2021\/DadStopEmbarrassingMeNetflix_2021.png&quot;,&quot;bmm&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BlackMusicMonth_2021\/BlackMusicMonth_2021.png&quot;,&quot;selenatheseries&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SelenaNetflix_2021\/SelenaNetflix_2021.png&quot;,&quot;메카&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FinalgearKR2021KR\/FinalgearKR2021KR.png&quot;,&quot;thefastsaga&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FastFurious9_April_2021\/FastFurious9_April_2021.png&quot;,&quot;wtfarcry&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Farcry6_UK_2021\/Farcry6_UK_2021.png&quot;,&quot;ワタ棘&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Piccoma_Watatoge_June_2021\/Piccoma_Watatoge_June_2021.png&quot;,&quot;generationequality&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020_add\/OrangeTheWorld_2020_add.png&quot;,&quot;wearemisfits&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LEC_EM_2021_MSFWIN\/LEC_EM_2021_MSFWIN.png&quot;,&quot;hondamvp&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HondaMVP_July_2021\/HondaMVP_July_2021.png&quot;,&quot;16dagen&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;defiantforever&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_Feb_2021_TOR\/OWL_Season4_Team_Feb_2021_TOR.png&quot;,&quot;googleio&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/GoogleIO2021\/GoogleIO2021.png&quot;,&quot;16gün&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;fiqueemcasa&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;レジェンズ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MyDBLegends_May_2021\/MyDBLegends_May_2021.png&quot;,&quot;俺だけレベルアップな件byピッコマ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Piccoma_Oreleve_June_2021\/Piccoma_Oreleve_June_2021.png&quot;,&quot;vaccinated&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021\/vaccinated_2021.png&quot;,&quot;ひとつぶで元気になる&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Meijinutschoco_2021\/Meijinutschoco_2021.png&quot;,&quot;bts&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KpopVIT_BTS_June2021\/KpopVIT_BTS_June2021.png&quot;,&quot;elmachips&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ElmaChipsMeFazUmPix_2021\/ElmaChipsMeFazUmPix_2021.png&quot;,&quot;lavaliant&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_Feb_2021_LAValiant\/OWL_Season4_Team_Feb_2021_LAValiant.png&quot;,&quot;리아&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KPOP_VIT_ITZY_April_2021_LIA\/KPOP_VIT_ITZY_April_2021_LIA.png&quot;,&quot;supersave&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AMFIQ2IPL_2021_v2\/AMFIQ2IPL_2021_v2.png&quot;,&quot;eqotoken&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Eqonex_July_2021\/Eqonex_July_2021.png&quot;,&quot;dbレジェンズキャラ診断&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MyDBLegends_May_2021\/MyDBLegends_May_2021.png&quot;,&quot;muahecualuca&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Luca_2021\/Disney_PixarLuca_Luca_2021.png&quot;,&quot;saudávelemcasa&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;verfdewereldoranje&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;dirtywater&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_BOS\/MLB_Teams_2021_BOS.png&quot;,&quot;smasheverymonth&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CamelotTokyo_2021\/CamelotTokyo_2021.png&quot;,&quot;spottedxoxo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMaxGossipGirl_July_2021_Phone\/HBOMaxGossipGirl_July_2021_Phone.png&quot;,&quot;magicofthecup&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FFACup_2021\/FFACup_2021.png&quot;,&quot;hotbirdsummer&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TucaandBertie_2021\/TucaandBertie_2021.png&quot;,&quot;equiporepsolhonda&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RepsolMotogpMotorcycle_2021\/RepsolMotogpMotorcycle_2021.png&quot;,&quot;gherbo25&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Gherbo_25_Album_Emoji_2021\/Gherbo_25_Album_Emoji_2021.png&quot;,&quot;milkteaalliance&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MilkTeaAlliance_2021\/MilkTeaAlliance_2021.png&quot;,&quot;فیلترنت&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KeepItOn_InternetShutdown_2021\/KeepItOn_InternetShutdown_2021.png&quot;,&quot;あんスタ6周年&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/enstars_music6yearsanniversary_2021\/enstars_music6yearsanniversary_2021.png&quot;,&quot;boksvlions&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LionsRugbyTour_2021_SeriesTrophy\/LionsRugbyTour_2021_SeriesTrophy.png&quot;,&quot;awssummit&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AWSSummit_2021\/AWSSummit_2021.png&quot;,&quot;lavatelasmanos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WashYourHands_2020_2021_ext3\/WashYourHands_2020_2021_ext3.png&quot;,&quot;mntwins&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_MIN\/MLB_Teams_2021_MIN.png&quot;,&quot;gonnaneedmilk&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MilkPEP_May_2021\/MilkPEP_May_2021.png&quot;,&quot;veiopraficar&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avon_PowerStay_BR_2021\/Avon_PowerStay_BR_2021.png&quot;,&quot;blackdesertsummer&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BlackDesert2021Summer\/BlackDesert2021Summer.png&quot;,&quot;ライブ応援&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KIRINChallengeCupJapan2021\/KIRINChallengeCupJapan2021.png&quot;,&quot;redbullgaming&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RedBull_GIVESYOUWINGS_2021_V2\/RedBull_GIVESYOUWINGS_2021_V2.png&quot;,&quot;filmedindetroit&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NoSuddenMove_July_2021\/NoSuddenMove_July_2021.png&quot;,&quot;daysonviu&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DAYSOnViu_2021\/DAYSOnViu_2021.png&quot;,&quot;thatsgame&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_ThatsGame_2021\/NBA_ThatsGame_2021.png&quot;,&quot;deerboy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NetflixSweetTooth2021\/NetflixSweetTooth2021.png&quot;,&quot;detidepende&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AdCouncilVaccine_2021_add\/AdCouncilVaccine_2021_add.png&quot;,&quot;ourwatch&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;xgppc&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/XboxGamePass_2021\/XboxGamePass_2021.png&quot;,&quot;blindspottingfinale&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/STARZ_Blindspotting_May_2021\/STARZ_Blindspotting_May_2021.png&quot;,&quot;todosunidos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_NSC\/MLS_2021_NSC.png&quot;,&quot;mostawaitedreno&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OPPOReno6Series_2021\/OPPOReno6Series_2021.png&quot;,&quot;ユージェネってなに&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YouGeneration_JP_2021\/YouGeneration_JP_2021.png&quot;,&quot;mulherespower&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PowerCouple_BR_May_2021\/PowerCouple_BR_May_2021.png&quot;,&quot;ace_comeback&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KpopACE_June_2021\/KpopACE_June_2021.png&quot;,&quot;백신접종&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;bitcoin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bitcoin_evergreen\/Bitcoin_evergreen.png&quot;,&quot;tfclive&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_TFC\/MLS_2021_TFC.png&quot;,&quot;laatjevaccineren&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;tanaoreodebrincar&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OreoPromocao_2021\/OreoPromocao_2021.png&quot;,&quot;gopies&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AFL_2021_gopies\/AFL_2021_gopies.png&quot;,&quot;sparkit&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_Feb_2021_Hangzhou\/OWL_Season4_Team_Feb_2021_Hangzhou.png&quot;,&quot;ognidonna&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EveryWoman_2020\/EveryWoman_2020.png&quot;,&quot;strawberrydrinksforever&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StarbucksCanadaSummer2021\/StarbucksCanadaSummer2021.png&quot;,&quot;edgwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LPL_2021_EDGWIN\/LPL_2021_EDGWIN.png&quot;,&quot;gunakanpelitupmuka&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WearAMask_2020_2021_ext3\/WearAMask_2020_2021_ext3.png&quot;,&quot;runtheworld&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/STARZ_RuntheWorld_2021\/STARZ_RuntheWorld_2021.png&quot;,&quot;rapids96&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_CR\/MLS_2021_CR.png&quot;,&quot;wearewpg&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHLWPGPlayoffs2021\/NHLWPGPlayoffs2021.png&quot;,&quot;gobolts&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHL_2021_Teams_GoBolts\/NHL_2021_Teams_GoBolts.png&quot;,&quot;équipecanada&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CanadaOlympicParalympic_Tokyo\/CanadaOlympicParalympic_Tokyo.png&quot;,&quot;skywardswordhd&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NintendoZeldaSkywardSword_2021\/NintendoZeldaSkywardSword_2021.png&quot;,&quot;عمانتل&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OmanTel5G_2021_v3\/OmanTel5G_2021_v3.png&quot;,&quot;coronanoparedão&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/COVIDRelief_2021_Brazil\/COVIDRelief_2021_Brazil.png&quot;,&quot;killerthreesome&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HitmansWifesBodyguard_2021_All3_\/HitmansWifesBodyguard_2021_All3_.png&quot;,&quot;gaad&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/GAAD_May_2021_ext\/GAAD_May_2021_ext.png&quot;,&quot;repcosc&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RepcoSC_2021\/RepcoSC_2021.png&quot;,&quot;bólusettur&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;7月7日はカルピスの誕生日&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AsahiSoftDrinkCalpis02TanabataJapan2021\/AsahiSoftDrinkCalpis02TanabataJapan2021.png&quot;,&quot;dieforaman&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bebe_Rexha_2021\/Bebe_Rexha_2021.png&quot;,&quot;hlewin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCK_2021_Team_P1_HLE\/LCK_2021_Team_P1_HLE.png&quot;,&quot;astralisfamily&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LEC_EM_2021_ASTWIN\/LEC_EM_2021_ASTWIN.png&quot;,&quot;ステイホーム&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;lpl&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LPL_2021\/LPL_2021.png&quot;,&quot;justiceisserved&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_2021_WASH\/OWL_Season4_Team_2021_WASH.png&quot;,&quot;tether&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TRC20USDT_2021\/TRC20USDT_2021.png&quot;,&quot;valorantchampionstour&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/VALORANT_Champions_Tour_2021\/VALORANT_Champions_Tour_2021.png&quot;,&quot;wnba&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WNBA_2021Season_25thAnniversary_2\/WNBA_2021Season_25thAnniversary_2.png&quot;,&quot;dblegends&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MyDBLegends_May_2021\/MyDBLegends_May_2021.png&quot;,&quot;itvpeston&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Peston_UK_April_2021\/Peston_UK_April_2021.png&quot;,&quot;whitespikesspotted&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PrimeVideoIndiaTomorrowWar_2021\/PrimeVideoIndiaTomorrowWar_2021.png&quot;,&quot;cazadorab15&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_HunterB15_2021\/Disney_LokiLaunch_HunterB15_2021.png&quot;,&quot;khongraduong&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;해야해&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Kpop_VIT_2PM\/Kpop_VIT_2PM.png&quot;,&quot;periscope&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Periscope\/Periscope.png&quot;,&quot;quedateencasaya&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;युवानेतृत्व&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YouthLead_2020\/YouthLead_2020.png&quot;,&quot;whiteclawhardseltzer&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LetsWhiteClaw_2021_SP\/LetsWhiteClaw_2021_SP.png&quot;,&quot;tasaarvosukupolvi&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;先想再点击&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2020_ThinkBeforeClicking\/MediaInformationLiteracyWeeks_2020_ThinkBeforeClicking.png&quot;,&quot;gokingsgo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHL_2021_Teams_GoKingsGo\/NHL_2021_Teams_GoKingsGo.png&quot;,&quot;canucks&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHL_2021_Teams_canucks\/NHL_2021_Teams_canucks.png&quot;,&quot;ned&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Euro_UK_2021_NED\/Euro_UK_2021_NED.png&quot;,&quot;babaeako&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;kamiwanita&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterWomenTentpole_2021\/TwitterWomenTentpole_2021.png&quot;,&quot;俺だけレベルアップな件ーsmartoon&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Piccoma_Oreleve_June_2021\/Piccoma_Oreleve_June_2021.png&quot;,&quot;v5win&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LPL_2021_V5WIN\/LPL_2021_V5WIN.png&quot;,&quot;xboxbethesda&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Xbox_ProjectNeutron_2021_add2\/Xbox_ProjectNeutron_2021_add2.png&quot;,&quot;equalplayequalpay&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMax_LFGDocumentary_2021\/HBOMax_LFGDocumentary_2021.png&quot;,&quot;翻墙&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KeepItOn_InternetShutdown_2021\/KeepItOn_InternetShutdown_2021.png&quot;,&quot;私を突き刺す棘&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Piccoma_Watatoge_June_2021\/Piccoma_Watatoge_June_2021.png&quot;,&quot;erstdenkendannteilen&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2020_ThinkBeforeSharing\/MediaInformationLiteracyWeeks_2020_ThinkBeforeSharing.png&quot;,&quot;wegotyousis&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SistasOnBET_2021\/SistasOnBET_2021.png&quot;,&quot;cymrudragons&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JDXWALES_2021\/JDXWALES_2021.png&quot;,&quot;کورونا_مدد_انڈیا&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Covid19India_2021\/Covid19India_2021.png&quot;,&quot;6months6games&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/XboxLoveStory_2021\/XboxLoveStory_2021.png&quot;,&quot;alligatorloki&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_AlligatorLoki_2021_v2\/Disney_LokiLaunch_AlligatorLoki_2021_v2.png&quot;,&quot;thestory&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ZolaMovie_2021\/ZolaMovie_2021.png&quot;,&quot;noikhongvoibaohanh&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;lckwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCK_League_2021\/LCK_League_2021.png&quot;,&quot;valorantchampions&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/VALORANT_Champions_Tour_April_2021\/VALORANT_Champions_Tour_April_2021.png&quot;,&quot;luca&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Luca_2021\/Disney_PixarLuca_Luca_2021.png&quot;,&quot;lightingtheway&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Cadillac_LYRIQ_Phase1_April_2021\/Cadillac_LYRIQ_Phase1_April_2021.png&quot;,&quot;twittertips&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterTips_2020\/TwitterTips_2020.png&quot;,&quot;webelieve&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_LAA\/MLB_Teams_2021_LAA.png&quot;,&quot;අත්සෝදන්න&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WashYourHands_2020_2021_ext3\/WashYourHands_2020_2021_ext3.png&quot;,&quot;farcry6&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Farcry6_UK_2021\/Farcry6_UK_2021.png&quot;,&quot;yosoyleón&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Guerreros_MX_June_2021_YoSoyLeon\/Guerreros_MX_June_2021_YoSoyLeon.png&quot;,&quot;tervekotona&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;haloinfinite&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/XboxOlympus_2021\/XboxOlympus_2021.png&quot;,&quot;あんスタ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/enstars_music6yearsanniversary_2021\/enstars_music6yearsanniversary_2021.png&quot;,&quot;اتحدث_بالمونث&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FemaleArabic_21\/FemaleArabic_21.png&quot;,&quot;tänkförstklickasen&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2020_ThinkBeforeClicking\/MediaInformationLiteracyWeeks_2020_ThinkBeforeClicking.png&quot;,&quot;pixaralbertoid&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Alberto_2021\/Disney_PixarLuca_Alberto_2021.png&quot;,&quot;jdfactor50&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JDLoveIsland_2021\/JDLoveIsland_2021.png&quot;,&quot;미투&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MeToo_Korea_2018_v2\/MeToo_Korea_2018_v2.png&quot;,&quot;ชานมข้นกว่าเลือด&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MilkTeaAlliance_2021\/MilkTeaAlliance_2021.png&quot;,&quot;animalkingdom&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AnimalKingdom_S5_Surfboard\/AnimalKingdom_S5_Surfboard.png&quot;,&quot;halo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/XboxOlympus_2021\/XboxOlympus_2021.png&quot;,&quot;rootedinla&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WNBA_Teams_2021_LA\/WNBA_Teams_2021_LA.png&quot;,&quot;estamosready&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_NYY\/MLB_Teams_2021_NYY.png&quot;,&quot;spiral&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SpiralSaw2021\/SpiralSaw2021.png&quot;,&quot;vakcinējos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;lostwins&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_MIN\/MLB_Teams_2021_MIN.png&quot;,&quot;红新月日&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WorldRedCrossDay_May_2021_add2\/WorldRedCrossDay_May_2021_add2.png&quot;,&quot;thepowerofbetter&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LEC_EM_2021_XLWIN_fix\/LEC_EM_2021_XLWIN_fix.png&quot;,&quot;qoo10メガ割&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Qoo10_Shopping_Q2_2021\/Qoo10_Shopping_Q2_2021.png&quot;,&quot;أنا_اتطعمت&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;toofaanonprime&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ToofaanOnPrime_July_2021\/ToofaanOnPrime_July_2021.png&quot;,&quot;mtgafr&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MagicTheGathering_june_2021_\/MagicTheGathering_june_2021_.png&quot;,&quot;dadstopnetflix&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DadStopEmbarrassingMeNetflix_2021\/DadStopEmbarrassingMeNetflix_2021.png&quot;,&quot;红十字日&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WorldRedCrossDay_May_2021_add2\/WorldRedCrossDay_May_2021_add2.png&quot;,&quot;4thevalley&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WNBA_Teams_2021_PHX_v2\/WNBA_Teams_2021_PHX_v2.png&quot;,&quot;rolltide&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AlabamaCFP2021YEARLONG\/AlabamaCFP2021YEARLONG.png&quot;,&quot;lovetwitter&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LoveTwitter\/LoveTwitter.png&quot;,&quot;poseball&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FX_Pose_April_2021\/FX_Pose_April_2021.png&quot;,&quot;dalereal&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_RSL\/MLS_2021_RSL.png&quot;,&quot;browin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCK_2021_Team_P1_GOBRO\/LCK_2021_Team_P1_GOBRO.png&quot;,&quot;endalz&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ALZ_2021\/ALZ_2021.png&quot;,&quot;lokilefanfaron&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_BoastfulLoki_2021\/Disney_LokiLaunch_BoastfulLoki_2021.png&quot;,&quot;whatsthescoop&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMaxGossipGirl_July_2021_Phone\/HBOMaxGossipGirl_July_2021_Phone.png&quot;,&quot;sounders&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_SeaS\/MLS_2021_SeaS.png&quot;,&quot;noussommeslesfemmes&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterWomenTentpole_2021\/TwitterWomenTentpole_2021.png&quot;,&quot;lattesandlovers&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMaxGossipGirl_July_2021_Latte\/HBOMaxGossipGirl_July_2021_Latte.png&quot;,&quot;ovw&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_Miss_Minutes_2021\/Disney_LokiLaunch_Miss_Minutes_2021.png&quot;,&quot;quakes74&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_SJE\/MLS_2021_SJE.png&quot;,&quot;xboxgobrrrrr&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/XboxMiniFridge_2021\/XboxMiniFridge_2021.png&quot;,&quot;裏切り王子&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_TVA_Jacket_Loki_2021_V2\/Disney_LokiLaunch_TVA_Jacket_Loki_2021_V2.png&quot;,&quot;リィンラボ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NieRReincarnationLaunch_May_2021\/NieRReincarnationLaunch_May_2021.png&quot;,&quot;ギアスト&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bytedance_ako_figurestory_June_2021\/Bytedance_ako_figurestory_June_2021.png&quot;,&quot;dexter&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Showtime_Q2_21_v2\/Showtime_Q2_21_v2.png&quot;,&quot;keinemehr&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;blackmonday&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Showtime_Q2_21_v2\/Showtime_Q2_21_v2.png&quot;,&quot;globalaccessibilityawarenessday2021&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/GAAD_May_2021_ext\/GAAD_May_2021_ext.png&quot;,&quot;housebrokenonfox&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HouseBrokenFOX_May_2021\/HouseBrokenFOX_May_2021.png&quot;,&quot;rojoxsiempre&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_NYRB\/MLS_2021_NYRB.png&quot;,&quot;sotw&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyNatGeo_SecretsoftheWhales_April_2021\/DisneyNatGeo_SecretsoftheWhales_April_2021.png&quot;,&quot;닥쳐_브루노&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Alberto_2021\/Disney_PixarLuca_Alberto_2021.png&quot;,&quot;第五人格3周年&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/IdentityVJP_Q3_2021\/IdentityVJP_Q3_2021.png&quot;,&quot;sherni&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SherniOnPrime_2021\/SherniOnPrime_2021.png&quot;,&quot;boastfulloki&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_BoastfulLoki_2021\/Disney_LokiLaunch_BoastfulLoki_2021.png&quot;,&quot;gossipgirl&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMaxGossipGirl_July_2021_XOXO\/HBOMaxGossipGirl_July_2021_XOXO.png&quot;,&quot;deerhybrid&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NetflixSweetTooth2021_add\/NetflixSweetTooth2021_add.png&quot;,&quot;sagars&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Romasaga_25y_May_2021\/Romasaga_25y_May_2021.png&quot;,&quot;kynguyenmoi&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SpaceJam_2021\/SpaceJam_2021.png&quot;,&quot;s04win&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LEC_EM_2021_S04WIN\/LEC_EM_2021_S04WIN.png&quot;,&quot;vamosangels&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_LAA\/MLB_Teams_2021_LAA.png&quot;,&quot;disneycruisewish&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_DisneyCruise_2021\/DisneyParks_DisneyCruise_2021.png&quot;,&quot;malusogsabahay&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;cbj&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHL_2021_Teams_CBJ\/NHL_2021_Teams_CBJ.png&quot;,&quot;poptart&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PopTarts_June_2021\/PopTarts_June_2021.png&quot;,&quot;aapi&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AHM_RepresentAsian_2021\/AHM_RepresentAsian_2021.png&quot;,&quot;디즈니픽사_알베르토&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Alberto_2021\/Disney_PixarLuca_Alberto_2021.png&quot;,&quot;zombietigercat&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ZombieTiger_UK_May_2021\/ZombieTiger_UK_May_2021.png&quot;,&quot;wimbledonthing&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Wimbledon_2021_hearts\/Wimbledon_2021_hearts.png&quot;,&quot;斷網&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KeepItOn_InternetShutdown_2021\/KeepItOn_InternetShutdown_2021.png&quot;,&quot;wowclassic&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BurningCrusadeClassic_2021\/BurningCrusadeClassic_2021.png&quot;,&quot;nierreplicant&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NieRReplicant_April_2021_V2\/NieRReplicant_April_2021_V2.png&quot;,&quot;imitchellcontrolemacchine&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_MitchellvsTheMachines_2021\/Netflix_MitchellvsTheMachines_2021.png&quot;,&quot;หยุดอยู่บ้านเพื่อชาติ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;blueweekend&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WolfAlice_2021\/WolfAlice_2021.png&quot;,&quot;aspirevero&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Acer_aspirevero_2021\/Acer_aspirevero_2021.png&quot;,&quot;vaskhendene&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WashYourHands_2020_2021_ext3\/WashYourHands_2020_2021_ext3.png&quot;,&quot;burgerkoreapedas&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MD_BurgerKoreaPedas_2021\/MD_BurgerKoreaPedas_2021.png&quot;,&quot;badisbred&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AnimalKingdom_S5_Palmtree\/AnimalKingdom_S5_Palmtree.png&quot;,&quot;covid19brasilfome&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/COVIDRelief_2021_Brazil\/COVIDRelief_2021_Brazil.png&quot;,&quot;portatelamascherina&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WearAMask_2020_2021_ext3\/WearAMask_2020_2021_ext3.png&quot;,&quot;마스크착용&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WearAMask_2020_2021_ext3\/WearAMask_2020_2021_ext3.png&quot;,&quot;blackmusicmonth&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BlackMusicMonth_2021\/BlackMusicMonth_2021.png&quot;,&quot;portorosso&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Portorosso_2021\/Disney_PixarLuca_Portorosso_2021.png&quot;,&quot;godrx&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LcK_2021_Teams_DRX\/LcK_2021_Teams_DRX.png&quot;,&quot;lokilagarto&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_AlligatorLoki_2021_v2\/Disney_LokiLaunch_AlligatorLoki_2021_v2.png&quot;,&quot;guardiantecate&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/GuardianTecate_July_2021\/GuardianTecate_July_2021.png&quot;,&quot;ワニロキ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_AlligatorLoki_2021_v2\/Disney_LokiLaunch_AlligatorLoki_2021_v2.png&quot;,&quot;fusioncarry&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_Feb_2021_Philly\/OWL_Season4_Team_Feb_2021_Philly.png&quot;,&quot;madden22&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MaddenNFL22\/MaddenNFL22.png&quot;,&quot;بطاقاتنا_تربحك&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RiyadBankCard_2021\/RiyadBankCard_2021.png&quot;,&quot;untilweallbelong&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterTogether_2019_v3\/TwitterTogether_2019_v3.png&quot;,&quot;twitterparaobem&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterForGood_Refresh_2021\/TwitterForGood_Refresh_2021.png&quot;,&quot;gossipgirlhere&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMaxGossipGirl_July_2021_Phone\/HBOMaxGossipGirl_July_2021_Phone.png&quot;,&quot;wirbleibenzuhaus&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;globalaccessibilityawarenessday21&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/GAAD_May_2021_ext\/GAAD_May_2021_ext.png&quot;,&quot;wijde15&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WeThe15_2021\/WeThe15_2021.png&quot;,&quot;rakita&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JagameThandhiramOnNetflix_2021\/JagameThandhiramOnNetflix_2021.png&quot;,&quot;goldenguardians&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCS_Jan_2021_GGWIN\/LCS_Jan_2021_GGWIN.png&quot;,&quot;pflmma&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PFLMMA_April_2021\/PFLMMA_April_2021.png&quot;,&quot;seakraken&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHL_2021_Teams_SeaKraken\/NHL_2021_Teams_SeaKraken.png&quot;,&quot;brickbybrick&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CDL_Team_2021_CHI\/CDL_Team_2021_CHI.png&quot;,&quot;stanleycup&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StanleyCup_2021\/StanleyCup_2021.png&quot;,&quot;modokhulu&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HuluMODOK2021\/HuluMODOK2021.png&quot;,&quot;nba&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBALeague_2021\/NBALeague_2021.png&quot;,&quot;พลังคนรุ่นใหม่&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YouthLead_2020\/YouthLead_2020.png&quot;,&quot;vacúnate&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;第五人格&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/IdentityVJP_Q3_2021\/IdentityVJP_Q3_2021.png&quot;,&quot;friendsframe&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMax_Friends_Frame\/HBOMax_Friends_Frame.png&quot;,&quot;深淵覚醒チャレンジ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/blacksurgenightJapanHidden_2021\/blacksurgenightJapanHidden_2021.png&quot;,&quot;peston&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Peston_UK_April_2021\/Peston_UK_April_2021.png&quot;,&quot;sixofcrows&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_ShadowandBone_April_2021\/Netflix_ShadowandBone_April_2021.png&quot;,&quot;cookcleverwasteless&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HellmannsUKNomadMay2021\/HellmannsUKNomadMay2021.png&quot;,&quot;pasunedeplus&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;rupaulsdragrace&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ParamountRuPaulsDragRaceAllStars_July_2021\/ParamountRuPaulsDragRaceAllStars_July_2021.png&quot;,&quot;rgewin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LEC_EM_2021_RGEWIN\/LEC_EM_2021_RGEWIN.png&quot;,&quot;billions&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Showtime_Q2_21_v2\/Showtime_Q2_21_v2.png&quot;,&quot;donttellmehowtodress&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;lokienfant&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_KidlLoki_2021\/Disney_LokiLaunch_KidlLoki_2021.png&quot;,&quot;carritolleno&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BodegaAurrera_PlanVerano_2021\/BodegaAurrera_PlanVerano_2021.png&quot;,&quot;usdtether&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TRC20USDT_2021\/TRC20USDT_2021.png&quot;,&quot;lokiclássico&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_ClassiclLoki_2021\/Disney_LokiLaunch_ClassiclLoki_2021.png&quot;,&quot;bornforthis&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WNBA_Teams_2021_CON\/WNBA_Teams_2021_CON.png&quot;,&quot;eurocopa2020enas&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DiarioAs_2021\/DiarioAs_2021.png&quot;,&quot;realhousewivesofpotomac&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bravo_RHOP_Q3_2021\/Bravo_RHOP_Q3_2021.png&quot;,&quot;makeamazinghappen&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CamelotTokyo_2021\/CamelotTokyo_2021.png&quot;,&quot;leverage&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Amazon_LeverageRedemption_2021\/Amazon_LeverageRedemption_2021.png&quot;,&quot;remesamala&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_TheBadBatch_Helmet_April_2021\/Disney_TheBadBatch_Helmet_April_2021.png&quot;,&quot;ผู้หญิงทุกคน&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EveryWoman_2020\/EveryWoman_2020.png&quot;,&quot;marvelstudiosviúvanegra&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_Symbol_2021_V2\/Disney_BlackWidow_Symbol_2021_V2.png&quot;,&quot;thenevershbo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/thenevershbo_2021_May_v2\/thenevershbo_2021_May_v2.png&quot;,&quot;obeymeanime&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NTTSolmareObeyme_June_2021\/NTTSolmareObeyme_June_2021.png&quot;,&quot;水曜はロキの日&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_TVA_Jacket_Loki_2021_V2\/Disney_LokiLaunch_TVA_Jacket_Loki_2021_V2.png&quot;,&quot;therealhousewivesofpotomac&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bravo_RHOP_Q3_2021\/Bravo_RHOP_Q3_2021.png&quot;,&quot;gloriaeterna&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Libertadores_July_2021\/Libertadores_July_2021.png&quot;,&quot;rokotettu&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;intermiamicf&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_IMCF\/MLS_2021_IMCF.png&quot;,&quot;blackladysketch&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBO_ABLSS_May_2021\/HBO_ABLSS_May_2021.png&quot;,&quot;hernameis&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;gosensgo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHL_2021_Teams_GoSensGo_v2\/NHL_2021_Teams_GoSensGo_v2.png&quot;,&quot;16dagar&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;nosuddenmovehbomax&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NoSuddenMove_July_2021\/NoSuddenMove_July_2021.png&quot;,&quot;contralasmáquinas&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_MitchellvsTheMachines_2021\/Netflix_MitchellvsTheMachines_2021.png&quot;,&quot;портороссо&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Portorosso_2021\/Disney_PixarLuca_Portorosso_2021.png&quot;,&quot;stopvoldmodkvinder&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020_add\/StopViolenceAgainstWomen_2020_add.png&quot;,&quot;ecfontnt&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBAPlayoffsonTNT_2021\/NBAPlayoffsonTNT_2021.png&quot;,&quot;shieldsup&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_2021_LAG\/OWL_Season4_Team_2021_LAG.png&quot;,&quot;fordf150lightning&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/F150Lightning_May_2021_2\/F150Lightning_May_2021_2.png&quot;,&quot;lokiprésident&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_PresidentLoki_2021\/Disney_LokiLaunch_PresidentLoki_2021.png&quot;,&quot;mi11xpro&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Mi11XSeries_IN_April_2021_v2\/Mi11XSeries_IN_April_2021_v2.png&quot;,&quot;東京2020&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Tokyo2020_Olympics_add\/Tokyo2020_Olympics_add.png&quot;,&quot;burningcrusadeclassic&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BurningCrusadeClassic_2021\/BurningCrusadeClassic_2021.png&quot;,&quot;valorantmasters&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/VALORANT_Champions_Tour_April_2021\/VALORANT_Champions_Tour_April_2021.png&quot;,&quot;blackdesertonline&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BlackDesert2021Summer\/BlackDesert2021Summer.png&quot;,&quot;peakstreaming&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ParamountPlus_2021_ext\/ParamountPlus_2021_ext.png&quot;,&quot;spacejam2&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SpaceJam_2021\/SpaceJam_2021.png&quot;,&quot;legogoldenbrick&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LEGOGoldenBrick_2021\/LEGOGoldenBrick_2021.png&quot;,&quot;mlbtheshow&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLBTheSho_2021\/MLBTheSho_2021.png&quot;,&quot;ruadomedo1666&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_FearStreetTrilogy_1666_2021\/Netflix_FearStreetTrilogy_1666_2021.png&quot;,&quot;boatcricketgiveaway&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BOAT_IPL_2021_v2\/BOAT_IPL_2021_v2.png&quot;,&quot;алексейшостаков&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_RedGuardian_2021\/Disney_BlackWidow_RedGuardian_2021.png&quot;,&quot;楽天カードマン&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RakutenCard_May_2021_Flight3\/RakutenCard_May_2021_Flight3.png&quot;,&quot;goavsgo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHL_2021_Teams_GoAvsGo\/NHL_2021_Teams_GoAvsGo.png&quot;,&quot;fiatlux&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_Feb_2021_Paris\/OWL_Season4_Team_Feb_2021_Paris.png&quot;,&quot;terlindungibersama&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KebaikanAqua_April_2021\/KebaikanAqua_April_2021.png&quot;,&quot;奶茶聯盟&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MilkTeaAlliance_2021\/MilkTeaAlliance_2021.png&quot;,&quot;heroesbehindthemasks&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CeraVe_ThankYouNurses_2021\/CeraVe_ThankYouNurses_2021.png&quot;,&quot;babyboss2&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BossBaby2_July_2021\/BossBaby2_July_2021.png&quot;,&quot;btcturkpro&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/btcturk_May_2021\/btcturk_May_2021.png&quot;,&quot;7afl&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AFL_2021_7AFL\/AFL_2021_7AFL.png&quot;,&quot;lovetoreadit&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LoveToSeeIt_2021\/LoveToSeeIt_2021.png&quot;,&quot;pixarлука&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Luca_2021\/Disney_PixarLuca_Luca_2021.png&quot;,&quot;wethe15&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WeThe15_2021\/WeThe15_2021.png&quot;,&quot;verde&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_AFC\/MLS_2021_AFC.png&quot;,&quot;스쿨미투&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MeToo_Korea_2018_v2\/MeToo_Korea_2018_v2.png&quot;,&quot;engarde&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CDL_Team_2021_PAR\/CDL_Team_2021_PAR.png&quot;,&quot;kpop&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KpopTwitter_2021_Red\/KpopTwitter_2021_Red.png&quot;,&quot;lsbwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCK_2021_Team_P1_SB_v2\/LCK_2021_Team_P1_SB_v2.png&quot;,&quot;おつかれパルム&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MorinagaMilk_Parm_April_2021\/MorinagaMilk_Parm_April_2021.png&quot;,&quot;valentinethetiger&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ZombieTiger_UK_May_2021\/ZombieTiger_UK_May_2021.png&quot;,&quot;мойтеруки&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WashYourHands_2020_2021_ext3\/WashYourHands_2020_2021_ext3.png&quot;,&quot;bawatbabae&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EveryWoman_2020\/EveryWoman_2020.png&quot;,&quot;dragrace&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ParamountRuPaulsDragRaceAllStars_July_2021\/ParamountRuPaulsDragRaceAllStars_July_2021.png&quot;,&quot;deusdatrapaça&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_TVA_Jacket_Loki_2021_V2\/Disney_LokiLaunch_TVA_Jacket_Loki_2021_V2.png&quot;,&quot;letthenetwork&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KeepItOn_InternetShutdown_2021\/KeepItOn_InternetShutdown_2021.png&quot;,&quot;wecandothis&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HHS_WeCanDoThis_2021\/HHS_WeCanDoThis_2021.png&quot;,&quot;lávatelasmanos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WashYourHands_2020_2021_ext3\/WashYourHands_2020_2021_ext3.png&quot;,&quot;avt&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_Miss_Minutes_2021\/Disney_LokiLaunch_Miss_Minutes_2021.png&quot;,&quot;generasisetara&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;baradu&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Spotify_Q2_21\/Spotify_Q2_21.png&quot;,&quot;منتخب_قطر&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/QatarAtGoldCup_2021\/QatarAtGoldCup_2021.png&quot;,&quot;இளைஞர்முதண்மையில்&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YouthLead_2020_add\/YouthLead_2020_add.png&quot;,&quot;twitteruntukkebaikan&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterForGood_Refresh_2021\/TwitterForGood_Refresh_2021.png&quot;,&quot;pds2021&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PrimeDayShow21_v2\/PrimeDayShow21_v2.png&quot;,&quot;lionssa2021&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LionsRugbyTour_2021_SeriesTrophy\/LionsRugbyTour_2021_SeriesTrophy.png&quot;,&quot;legomastersfoxtv&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FOX_LEGOGoldenBrick_2021\/FOX_LEGOGoldenBrick_2021.png&quot;,&quot;kadınızbiz&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterWomenTentpole_2021\/TwitterWomenTentpole_2021.png&quot;,&quot;alwaysgame&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_2021_Teams_AlwaysGame\/NBA_2021_Teams_AlwaysGame.png&quot;,&quot;metooindia&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MeToo_India_2018\/MeToo_India_2018.png&quot;,&quot;juntosmiami&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_MIA\/MLB_Teams_2021_MIA.png&quot;,&quot;thankanurse&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CeraVe_ThankYouNurses_2021\/CeraVe_ThankYouNurses_2021.png&quot;,&quot;मास्कपहनिये&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WearAMask_2020_2021_ext3\/WearAMask_2020_2021_ext3.png&quot;,&quot;blacktranswomenmatter&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BlackTransLivesMatter_2020\/BlackTransLivesMatter_2020.png&quot;,&quot;방탄소년단&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KpopVIT_BTS_June2021\/KpopVIT_BTS_June2021.png&quot;,&quot;soberish&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LizPhair_2021\/LizPhair_2021.png&quot;,&quot;قطر_في_الكأس_الذهبية&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/QatarAtGoldCup_2021_v2\/QatarAtGoldCup_2021_v2.png&quot;,&quot;usunited&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SnyderCut_LA_May_2021\/SnyderCut_LA_May_2021.png&quot;,&quot;gointz&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/INTZ_June_2021\/INTZ_June_2021.png&quot;,&quot;haendewaschen&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WashYourHands_2020_2021_ext3\/WashYourHands_2020_2021_ext3.png&quot;,&quot;vaccinerad&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;50周年・思い出のメニューが続々&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/McDonalds50thanniversaryJP2021\/McDonalds50thanniversaryJP2021.png&quot;,&quot;១៦ថ្ងៃ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;fêtenationale&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FranceBastilleDay2021\/FranceBastilleDay2021.png&quot;,&quot;capalothalloffame&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Polo_G_Album_2021\/Polo_G_Album_2021.png&quot;,&quot;redbullsoloq&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RedBull_GIVESYOUWINGS_2021_V2\/RedBull_GIVESYOUWINGS_2021_V2.png&quot;,&quot;redtaylorsversion&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TSRed2021\/TSRed2021.png&quot;,&quot;mitb&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WWEMoneyintheBank_2021\/WWEMoneyintheBank_2021.png&quot;,&quot;ageofempiresiv&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/XboxCardinal_2021\/XboxCardinal_2021.png&quot;,&quot;nytspellingbee&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NYTimesGames_NYTSpellingBee_2021\/NYTimesGames_NYTSpellingBee_2021.png&quot;,&quot;gmtf&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bastille_June_2021\/Bastille_June_2021.png&quot;,&quot;híbridowendy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_SweetTooth_Pig\/Netflix_SweetTooth_Pig.png&quot;,&quot;binancesmartchain&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BinanceTurns4_2021\/BinanceTurns4_2021.png&quot;,&quot;leggowitheggo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Eggo_May_2021_2\/Eggo_May_2021_2.png&quot;,&quot;doitforthebay&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/STARZ_Blindspotting_May_2021\/STARZ_Blindspotting_May_2021.png&quot;,&quot;netslevel&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_2021_Teams_BrooklynTogether_add\/NBA_2021_Teams_BrooklynTogether_add.png&quot;,&quot;optussport&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OptusSport_May_2021\/OptusSport_May_2021.png&quot;,&quot;キューテンサンプルマーケット&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Qoo10_Q22021\/Qoo10_Q22021.png&quot;,&quot;youknowyoumissedme&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMaxGossipGirl_July_2021_CB\/HBOMaxGossipGirl_July_2021_CB.png&quot;,&quot;ewayselectropop&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RenaulteWays_2_2021\/RenaulteWays_2_2021.png&quot;,&quot;milkaschokolade&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MilkaSummerCampaign_2021\/MilkaSummerCampaign_2021.png&quot;,&quot;renslayer&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_Renslayer_2021\/Disney_LokiLaunch_Renslayer_2021.png&quot;,&quot;allfly&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_2021_Teams_AllFly\/NBA_2021_Teams_AllFly.png&quot;,&quot;internetbloqueada&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KeepItOn_InternetShutdown_2021\/KeepItOn_InternetShutdown_2021.png&quot;,&quot;ได้รับวัคซีนแล้ว&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;wearecol&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EsportsAllAccess_Jan_2021_COLWIN\/EsportsAllAccess_Jan_2021_COLWIN.png&quot;,&quot;letsgobucs&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_PIT\/MLB_Teams_2021_PIT.png&quot;,&quot;teamgb&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TeamGB_2021\/TeamGB_2021.png&quot;,&quot;starbuckssummer&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StarbucksCanadaSummer2021\/StarbucksCanadaSummer2021.png&quot;,&quot;ditohighspeed&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DITO_May_2021_ext\/DITO_May_2021_ext.png&quot;,&quot;තාරුණ්‍යයපෙරමගට&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YouthLead_2020_add\/YouthLead_2020_add.png&quot;,&quot;zerokeganasan&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;タルラ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Yostar_ArknightsStaff_April_2021\/Yostar_ArknightsStaff_April_2021.png&quot;,&quot;俺だけレベルアップな件&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Piccoma_Oreleve_June_2021\/Piccoma_Oreleve_June_2021.png&quot;,&quot;genglol&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LcK_2021_Teams_GenG\/LcK_2021_Teams_GenG.png&quot;,&quot;thecubetbs&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BeatTheCube_2021\/BeatTheCube_2021.png&quot;,&quot;fncwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LEC_EM_2021_FNCWIN\/LEC_EM_2021_FNCWIN.png&quot;,&quot;cofred&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHL_2021_Teams_CofRed\/NHL_2021_Teams_CofRed.png&quot;,&quot;getvaccineanswers&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AdCouncilVaccine_2021\/AdCouncilVaccine_2021.png&quot;,&quot;porlaa&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_ATL\/MLB_Teams_2021_ATL.png&quot;,&quot;ทวิ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterForGood_Refresh_2021\/TwitterForGood_Refresh_2021.png&quot;,&quot;lokialligator&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_AlligatorLoki_2021_v2\/Disney_LokiLaunch_AlligatorLoki_2021_v2.png&quot;,&quot;이달의소녀_ptt&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KpopVIT_LOONA_June_2021\/KpopVIT_LOONA_June_2021.png&quot;,&quot;myxawards2021&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MYXAwards2021\/MYXAwards2021.png&quot;,&quot;edgeofwonderful&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/IntelMWC_2021\/IntelMWC_2021.png&quot;,&quot;madwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LEC_EM_2021_MADWIN\/LEC_EM_2021_MADWIN.png&quot;,&quot;smackdown&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WWE_Recurring_2020_SmackDown\/WWE_Recurring_2020_SmackDown.png&quot;,&quot;drumstick&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DrumstickCone2021\/DrumstickCone2021.png&quot;,&quot;juntosreales&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_KC\/MLB_Teams_2021_KC.png&quot;,&quot;thebigscreenisback&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheBigScreenIsBack_2021\/TheBigScreenIsBack_2021.png&quot;,&quot;אנחנו_נשים&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterWomenTentpole_2021\/TwitterWomenTentpole_2021.png&quot;,&quot;climatepledge&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Amazon_ClimatePledge_2021\/Amazon_ClimatePledge_2021.png&quot;,&quot;hellmanns&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HellmannsUKNomadMay2021\/HellmannsUKNomadMay2021.png&quot;,&quot;sucessonobanheiro&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SucessoNoBanheiro_2021\/SucessoNoBanheiro_2021.png&quot;,&quot;soundofchampions&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BOAT_IPL_2021_v2\/BOAT_IPL_2021_v2.png&quot;,&quot;sbmulti&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Sportsbet_July_2021\/Sportsbet_July_2021.png&quot;,&quot;bastilleday&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FranceBastilleDay2021\/FranceBastilleDay2021.png&quot;,&quot;jdgwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LPL_2021_JDGWIN\/LPL_2021_JDGWIN.png&quot;,&quot;somosdetroit&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_DET\/MLB_Teams_2021_DET.png&quot;,&quot;internetbloccato&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KeepItOn_InternetShutdown_2021\/KeepItOn_InternetShutdown_2021.png&quot;,&quot;rhop&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bravo_RHOP_Q3_2021\/Bravo_RHOP_Q3_2021.png&quot;,&quot;blindspottingpremiere&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/STARZ_Blindspotting_May_2021\/STARZ_Blindspotting_May_2021.png&quot;,&quot;phongdich&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WashYourHands_2020_2021_ext3\/WashYourHands_2020_2021_ext3.png&quot;,&quot;jdgetgrafting&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JDLoveIsland_2021\/JDLoveIsland_2021.png&quot;,&quot;wewin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LPL_2021_WEWIN\/LPL_2021_WEWIN.png&quot;,&quot;ヴァルコネ5周年&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ateam_valkyrie_connect_0601_2021\/Ateam_valkyrie_connect_0601_2021.png&quot;,&quot;godfatherofharlem&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/GFOH_April_2021\/GFOH_April_2021.png&quot;,&quot;letsgocanes&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHL_2021_Teams_LetsGoCanes\/NHL_2021_Teams_LetsGoCanes.png&quot;,&quot;daveburd&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DaveFX_May_2021_v2\/DaveFX_May_2021_v2.png&quot;,&quot;grishaverse&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_ShadowandBone_April_2021\/Netflix_ShadowandBone_April_2021.png&quot;,&quot;ageofempires&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/XboxCardinal_2021\/XboxCardinal_2021.png&quot;,&quot;留在家裡&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;binanceturns4&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BinanceTurns4_2021\/BinanceTurns4_2021.png&quot;,&quot;fos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FOS_May_2021\/FOS_May_2021.png&quot;,&quot;missminutes&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_Miss_Minutes_2021\/Disney_LokiLaunch_Miss_Minutes_2021.png&quot;,&quot;imlookingforapig&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NeonRated_PigtheFilm_June2021\/NeonRated_PigtheFilm_June2021.png&quot;,&quot;shocktheworld&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_Feb_2021_SF\/OWL_Season4_Team_Feb_2021_SF.png&quot;,&quot;barrioangelino&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_LAFC\/MLS_2021_LAFC.png&quot;,&quot;エミール探し&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NieRReplicant_April_2021_V2\/NieRReplicant_April_2021_V2.png&quot;,&quot;gohabsgo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHL_2021_Teams_GoHabsGo\/NHL_2021_Teams_GoHabsGo.png&quot;,&quot;periodweeksandbladderleaks&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Poise_May_2021\/Poise_May_2021.png&quot;,&quot;مجلس_الصحة&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/GHC_SA_June_2021\/GHC_SA_June_2021.png&quot;,&quot;afreecafreecs&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCK_2021_Team_P1_AF_v2\/LCK_2021_Team_P1_AF_v2.png&quot;,&quot;상하이어니언&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/McD_KR_July_2021\/McD_KR_July_2021.png&quot;,&quot;postforthepress&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WaPo_WorldPressFreedom_2021\/WaPo_WorldPressFreedom_2021.png&quot;,&quot;raysbeisbol&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_TB\/MLB_Teams_2021_TB.png&quot;,&quot;lokiklasik&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_ClassiclLoki_2021\/Disney_LokiLaunch_ClassiclLoki_2021.png&quot;,&quot;usalamascarilla&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WearAMask_2020_2021_ext3\/WearAMask_2020_2021_ext3.png&quot;,&quot;yemeksepeti20yaşında&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YemekSepeti_2021\/YemekSepeti_2021.png&quot;,&quot;qoo10サンプルマーケット&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Qoo10_Q22021\/Qoo10_Q22021.png&quot;,&quot;88rising&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/88RISING_May_2021\/88RISING_May_2021.png&quot;,&quot;mtvmiaw2021&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PinkCarpetMTVMIAW_2021\/PinkCarpetMTVMIAW_2021.png&quot;,&quot;marcusrashfordbookclub&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MarcusRashfordBook_2021\/MarcusRashfordBook_2021.png&quot;,&quot;fearthedeer&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_2021_Teams_FearTheDeer\/NBA_2021_Teams_FearTheDeer.png&quot;,&quot;beliefbelongs&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BeliefBelongs_2020\/BeliefBelongs_2020.png&quot;,&quot;အင်တာနက်ဆက်ဖွင့်ထားပါ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KeepItOn_InternetShutdown_2021\/KeepItOn_InternetShutdown_2021.png&quot;,&quot;hälsosamthem&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;rtw&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/STARZ_RuntheWorld_2021\/STARZ_RuntheWorld_2021.png&quot;,&quot;indossalamascherina&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WearAMask_2020_2021_ext3\/WearAMask_2020_2021_ext3.png&quot;,&quot;lildicky&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DaveFX_May_2021_v2\/DaveFX_May_2021_v2.png&quot;,&quot;saludosme&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ProjectSoul_June_2021\/ProjectSoul_June_2021.png&quot;,&quot;wwptd&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PopTarts_June_2021\/PopTarts_June_2021.png&quot;,&quot;thebadbatch&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_TheBadBatch_Helmet_April_2021\/Disney_TheBadBatch_Helmet_April_2021.png&quot;,&quot;vamosorlando&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_OCSC\/MLS_2021_OCSC.png&quot;,&quot;荘園にも奇妙な物語&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/IdentityVJP_Q3_2021\/IdentityVJP_Q3_2021.png&quot;,&quot;집콕생활&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;magicthegathering&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MagicTheGathering_june_2021_\/MagicTheGathering_june_2021_.png&quot;,&quot;geng&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LcK_2021_Teams_GenG\/LcK_2021_Teams_GenG.png&quot;,&quot;thetenthanniversary&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Lady_Gaga_Born_This_Way_Anniversary_GOLD_Emoji\/Lady_Gaga_Born_This_Way_Anniversary_GOLD_Emoji.png&quot;,&quot;قطرفيالكأس_الذهبية&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/QatarAtGoldCup_2021\/QatarAtGoldCup_2021.png&quot;,&quot;preparadoslistospanic&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AmazonStudios_Panic_2021\/AmazonStudios_Panic_2021.png&quot;,&quot;awssummitindia&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AWSSummit_2021\/AWSSummit_2021.png&quot;,&quot;vacunada&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;twittertogether&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterTogether_2019_v3\/TwitterTogether_2019_v3.png&quot;,&quot;rctid&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_PT\/MLS_2021_PT.png&quot;,&quot;lvcapucines&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LVCapucines_April_2021\/LVCapucines_April_2021.png&quot;,&quot;robyndixon&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bravo_RHOP_Q3_2021_RobynDixon\/Bravo_RHOP_Q3_2021_RobynDixon.png&quot;,&quot;owlhybrid&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_SweetTooth_Owl\/Netflix_SweetTooth_Owl.png&quot;,&quot;notonemore&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;世界紅十字日&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WorldRedCrossDay_May_2021_add2\/WorldRedCrossDay_May_2021_add2.png&quot;,&quot;fin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Euro_UK_2021_FIN\/Euro_UK_2021_FIN.png&quot;,&quot;wwdc21&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/USEN_HRT_TLB_72x72_BAN_WWDC_DAYD_NA_NA_NA_NA_NA\/USEN_HRT_TLB_72x72_BAN_WWDC_DAYD_NA_NA_NA_NA_NA.png&quot;,&quot;feelthecharge&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_2021_Guangzhou\/OWL_Season4_Team_2021_Guangzhou.png&quot;,&quot;primedayshow&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PrimeDayShow21_v2\/PrimeDayShow21_v2.png&quot;,&quot;bornthiswayanniversary&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Lady_Gaga_Born_This_Way_Anniversary_GOLD_Emoji\/Lady_Gaga_Born_This_Way_Anniversary_GOLD_Emoji.png&quot;,&quot;recensementde2021&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StatCanCensus_2021\/StatCanCensus_2021.png&quot;,&quot;shoheiohtani&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLBHRDerby2021-LAA\/MLBHRDerby2021-LAA.png&quot;,&quot;ablss&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBO_ABLSS_May_2021\/HBO_ABLSS_May_2021.png&quot;,&quot;coldplay&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Coldplay_May_2021\/Coldplay_May_2021.png&quot;,&quot;guadiandelsabor&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/GuardianTecate_July_2021\/GuardianTecate_July_2021.png&quot;,&quot;herkadın&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EveryWoman_2020\/EveryWoman_2020.png&quot;,&quot;youthlead&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YouthLead_2020\/YouthLead_2020.png&quot;,&quot;kduo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MD_BurgerKoreaPedas_2021\/MD_BurgerKoreaPedas_2021.png&quot;,&quot;edsheeran&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EdSheeran_June_UK_2021\/EdSheeran_June_UK_2021.png&quot;,&quot;hun&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Euro_UK_2021_HUN\/Euro_UK_2021_HUN.png&quot;,&quot;pixarluca&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Luca_2021\/Disney_PixarLuca_Luca_2021.png&quot;,&quot;juégatelaconcheetos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ChesterCheetos_MX_2021\/ChesterCheetos_MX_2021.png&quot;,&quot;tucaandbertie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TucaandBertie_2021\/TucaandBertie_2021.png&quot;,&quot;labretagneentête&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TourdeFrance_2021\/TourdeFrance_2021.png&quot;,&quot;igotmyshotsg&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add3\/vaccinated_2021_add3.png&quot;,&quot;joeygallo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLBHRDerby2021-Tex\/MLBHRDerby2021-Tex.png&quot;,&quot;futureinc&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bastille_June_2021\/Bastille_June_2021.png&quot;,&quot;parm&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MorinagaMilk_Parm_April_2021\/MorinagaMilk_Parm_April_2021.png&quot;,&quot;قطع_الإنترنت&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KeepItOn_InternetShutdown_2021\/KeepItOn_InternetShutdown_2021.png&quot;,&quot;vaccinate&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;សមធម៌ជំនាន់&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;ハリポタ新作ゲーム&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HarryPotterNetease_Q2_2021\/HarryPotterNetease_Q2_2021.png&quot;,&quot;ハンターb15&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_HunterB15_2021\/Disney_LokiLaunch_HunterB15_2021.png&quot;,&quot;yuna&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KPOP_VIT_ITZY_April_2021_YUNA\/KPOP_VIT_ITZY_April_2021_YUNA.png&quot;,&quot;rawin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LPL_2021_RAWIN\/LPL_2021_RAWIN.png&quot;,&quot;gettheglow&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OPPOReno6Series_2021\/OPPOReno6Series_2021.png&quot;,&quot;liveinvegas&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LVCVA_Vegas_June_2021\/LVCVA_Vegas_June_2021.png&quot;,&quot;primadicliccarepensa&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2020_ThinkBeforeClicking\/MediaInformationLiteracyWeeks_2020_ThinkBeforeClicking.png&quot;,&quot;twitterparaelbien&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterForGood_Refresh_2021\/TwitterForGood_Refresh_2021.png&quot;,&quot;lsb&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCK_2021_Team_P1_SB_v2\/LCK_2021_Team_P1_SB_v2.png&quot;,&quot;ฉีดวัคซีน&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;mietiennenklikkia&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2020_ThinkBeforeClicking\/MediaInformationLiteracyWeeks_2020_ThinkBeforeClicking.png&quot;,&quot;raisedbywolves&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_2021_Teams_RaisedByWolves\/NBA_2021_Teams_RaisedByWolves.png&quot;,&quot;atevencermosafome&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/COVIDRelief_2021_Brazil\/COVIDRelief_2021_Brazil.png&quot;,&quot;your_choice&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KpopVIT_SEVENTEEN_June_2021\/KpopVIT_SEVENTEEN_June_2021.png&quot;,&quot;ニーアレプリカント&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NieRReplicant_April_2021_V2\/NieRReplicant_April_2021_V2.png&quot;,&quot;temporaryhighsinthevioletskies&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SnohAalegra_2021\/SnohAalegra_2021.png&quot;,&quot;wimbledon&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Wimbledon_2021\/Wimbledon_2021.png&quot;,&quot;wolfalice&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WolfAlice_2021\/WolfAlice_2021.png&quot;,&quot;eligeelpaísquequieres&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ChileElections_2021\/ChileElections_2021.png&quot;,&quot;theforeverpurge&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheForeverPurge_2021\/TheForeverPurge_2021.png&quot;,&quot;vacunado&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;junefree&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Hulu_THT_S4_2021\/Hulu_THT_S4_2021.png&quot;,&quot;ชัตดาวน์อินเทอร์เน็ต&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KeepItOn_InternetShutdown_2021\/KeepItOn_InternetShutdown_2021.png&quot;,&quot;yelenabelova&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_Yelena_2021\/Disney_BlackWidow_Yelena_2021.png&quot;,&quot;2pm&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Kpop_VIT_2PM\/Kpop_VIT_2PM.png&quot;,&quot;yaac&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MarcusRashfordBook_2021\/MarcusRashfordBook_2021.png&quot;,&quot;待在家里&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;doghybrid&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_SweetTooth_Dog\/Netflix_SweetTooth_Dog.png&quot;,&quot;atinangmundo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ProjectSoul_June_2021\/ProjectSoul_June_2021.png&quot;,&quot;grownish&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/grownishseason4_2021\/grownishseason4_2021.png&quot;,&quot;must&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Kpop_VIT_2PM\/Kpop_VIT_2PM.png&quot;,&quot;wendyosefo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bravo_RHOP_Q3_2021_WendyOsefo\/Bravo_RHOP_Q3_2021_WendyOsefo.png&quot;,&quot;cymrucoch&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JDXWALES_2021\/JDXWALES_2021.png&quot;,&quot;ミルクティー同盟&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MilkTeaAlliance_2021_add\/MilkTeaAlliance_2021_add.png&quot;,&quot;walk2endalz&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ALZ_2021\/ALZ_2021.png&quot;,&quot;endalzheimers&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ALZ_2021\/ALZ_2021.png&quot;,&quot;الجيل_الخامس_لعمان&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OmanTel5G_2021_v3\/OmanTel5G_2021_v3.png&quot;,&quot;المراكز_الترفيهية&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EnjoySaudi_June2021\/EnjoySaudi_June2021.png&quot;,&quot;c9win&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCS_Jan_2021_C9WIN\/LCS_Jan_2021_C9WIN.png&quot;,&quot;우리는여성이다&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterWomenTentpole_2021_add\/TwitterWomenTentpole_2021_add.png&quot;,&quot;takeflight&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WNBA_Teams_2021_DAL\/WNBA_Teams_2021_DAL.png&quot;,&quot;מחוסן&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;disneyland&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_MickeyEars_2020_Flight5_V2\/DisneyParks_MickeyEars_2020_Flight5_V2.png&quot;,&quot;somosatlanta&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_AU\/MLS_2021_AU.png&quot;,&quot;yourstorm&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL_2021_YourStorm\/NRL_2021_YourStorm.png&quot;,&quot;winterinatlanta&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Njomza_Album_Emoji_2021\/Njomza_Album_Emoji_2021.png&quot;,&quot;밀크티동맹&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MilkTeaAlliance_2021\/MilkTeaAlliance_2021.png&quot;,&quot;makeanythingbetterwithheinz&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KraftHeinz_CrowdSauce_SG_2021\/KraftHeinz_CrowdSauce_SG_2021.png&quot;,&quot;powerrankingdelaeuro&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DiarioAs_2021\/DiarioAs_2021.png&quot;,&quot;lokifanfarrón&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_BoastfulLoki_2021\/Disney_LokiLaunch_BoastfulLoki_2021.png&quot;,&quot;thinkbeforeclicking&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2020_ThinkBeforeClicking\/MediaInformationLiteracyWeeks_2020_ThinkBeforeClicking.png&quot;,&quot;blackdesert&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BlackDesert2021Summer\/BlackDesert2021Summer.png&quot;,&quot;يومالهاللاألحمر&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WorldRedCrossDay_May_2021_add2\/WorldRedCrossDay_May_2021_add2.png&quot;,&quot;omantel&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OmanTel5G_2021_v3\/OmanTel5G_2021_v3.png&quot;,&quot;aquietplace&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AQuietPlace_P2_2021\/AQuietPlace_P2_2021.png&quot;,&quot;presidentloki&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_PresidentLoki_2021\/Disney_LokiLaunch_PresidentLoki_2021.png&quot;,&quot;armchairexpert&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ArmchairExpert_2021\/ArmchairExpert_2021.png&quot;,&quot;reignathome&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_2021_ATL\/OWL_Season4_Team_2021_ATL.png&quot;,&quot;vivasualiberdade&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DoritosFreedom_2021\/DoritosFreedom_2021.png&quot;,&quot;ownthelifeyouwant&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ProjectSoul_June_2021\/ProjectSoul_June_2021.png&quot;,&quot;キューテンサンq&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Qoo10_Q22021\/Qoo10_Q22021.png&quot;,&quot;유겸&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Kpop_Yugyeom_June_2021\/Kpop_Yugyeom_June_2021.png&quot;,&quot;alchemystars&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TencentAlchemyStarsJPLaunch_2021\/TencentAlchemyStarsJPLaunch_2021.png&quot;,&quot;skatekitchen&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BettyHBO_S2_2021\/BettyHBO_S2_2021.png&quot;,&quot;lavezvouslesmains&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WashYourHands_2020_2021_ext3\/WashYourHands_2020_2021_ext3.png&quot;,&quot;whitelotushbo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBO_TheWhiteLotus_2021\/HBO_TheWhiteLotus_2021.png&quot;,&quot;nabakunahan&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;เราคือผู้หญิง&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterWomenTentpole_2021\/TwitterWomenTentpole_2021.png&quot;,&quot;rwwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LPL_2021_RWWIN\/LPL_2021_RWWIN.png&quot;,&quot;ロマサガrs祝2・5周年&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Romasaga_25y_May_2021\/Romasaga_25y_May_2021.png&quot;,&quot;ggwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCS_Jan_2021_GGWIN\/LCS_Jan_2021_GGWIN.png&quot;,&quot;letsrakita&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JagameThandhiramOnNetflix_2021\/JagameThandhiramOnNetflix_2021.png&quot;,&quot;mattolson&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLBHRDerby2021-OAK\/MLBHRDerby2021-OAK.png&quot;,&quot;mydblegends&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MyDBLegends_May_2021\/MyDBLegends_May_2021.png&quot;,&quot;블랙위도우&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_Symbol_2021_V2\/Disney_BlackWidow_Symbol_2021_V2.png&quot;,&quot;nrlw&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL_2021\/NRL_2021.png&quot;,&quot;jdxsco&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JDXSCOTLAND_2021\/JDXSCOTLAND_2021.png&quot;,&quot;младежколидерство&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YouthLead_2020_add\/YouthLead_2020_add.png&quot;,&quot;lunglives&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LungLives_May_2021_v2\/LungLives_May_2021_v2.png&quot;,&quot;poweredbyzil&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Zilliqa_April_2021\/Zilliqa_April_2021.png&quot;,&quot;thehandmaidstale&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Hulu_THT_S4_2021\/Hulu_THT_S4_2021.png&quot;,&quot;redguardian&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_RedGuardian_2021\/Disney_BlackWidow_RedGuardian_2021.png&quot;,&quot;samegamemulti&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Sportsbet_July_2021\/Sportsbet_July_2021.png&quot;,&quot;alleenjij&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Spotify_Q2_21\/Spotify_Q2_21.png&quot;,&quot;thefinalpose&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FX_Pose_April_2021_add\/FX_Pose_April_2021_add.png&quot;,&quot;xoxogossipgirl&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMaxGossipGirl_July_2021_XOXO\/HBOMaxGossipGirl_July_2021_XOXO.png&quot;,&quot;ageofempires4&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/XboxCardinal_2021\/XboxCardinal_2021.png&quot;,&quot;centenário2021&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Libertadores_July_2021\/Libertadores_July_2021.png&quot;,&quot;cryptoclimate&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CryptocomCimate_2021_v2\/CryptocomCimate_2021_v2.png&quot;,&quot;hybrids&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NetflixSweetTooth2021\/NetflixSweetTooth2021.png&quot;,&quot;wearebluejays&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_TOR\/MLB_Teams_2021_TOR.png&quot;,&quot;timeforasub&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TimeForASub_2021\/TimeForASub_2021.png&quot;,&quot;先想再分享&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2020_ThinkBeforeSharing\/MediaInformationLiteracyWeeks_2020_ThinkBeforeSharing.png&quot;,&quot;決戦なのだ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Romasaga_25y_May_2021\/Romasaga_25y_May_2021.png&quot;,&quot;arawngredcross&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WorldRedCrossDay_May_2021_add2\/WorldRedCrossDay_May_2021_add2.png&quot;,&quot;magisipbagomagshare&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2020_ThinkBeforeSharing\/MediaInformationLiteracyWeeks_2020_ThinkBeforeSharing.png&quot;,&quot;lokiclassique&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_ClassiclLoki_2021\/Disney_LokiLaunch_ClassiclLoki_2021.png&quot;,&quot;faze5&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EsportsAllAccess_Jan_2021_Faze\/EsportsAllAccess_Jan_2021_Faze.png&quot;,&quot;lottoitcouldbeyou&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CamelotTokyo_2021\/CamelotTokyo_2021.png&quot;,&quot;fearstreet&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_FearStreetTrilogy_Franchise_2_2021\/Netflix_FearStreetTrilogy_Franchise_2_2021.png&quot;,&quot;nikkiglaser&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FBOYIsland_2021_fboyfbye\/FBOYIsland_2021_fboyfbye.png&quot;,&quot;nosuddenmove&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NoSuddenMove_July_2021\/NoSuddenMove_July_2021.png&quot;,&quot;quartasdoloki&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_TVA_Jacket_Loki_2021_V2\/Disney_LokiLaunch_TVA_Jacket_Loki_2021_V2.png&quot;,&quot;anteup&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_2021_HOUSTON_v2\/OWL_Season4_Team_2021_HOUSTON_v2.png&quot;,&quot;맥도날드&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/McD_KR_July_2021\/McD_KR_July_2021.png&quot;,&quot;hacksonhbomax&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Hacks_HBOMax_April_2021_v3\/Hacks_HBOMax_April_2021_v3.png&quot;,&quot;togetherwerise&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AFL_2021_TogetherWeRise\/AFL_2021_TogetherWeRise.png&quot;,&quot;iagdzt&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ZombieTiger_UK_May_2021\/ZombieTiger_UK_May_2021.png&quot;,&quot;thepurge&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheForeverPurge_2021\/TheForeverPurge_2021.png&quot;,&quot;fetenationale&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FranceBastilleDay2021\/FranceBastilleDay2021.png&quot;,&quot;cfmtl&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_CFMTL\/MLS_2021_CFMTL.png&quot;,&quot;منصة_عيشها&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EnjoySaudi_June2021\/EnjoySaudi_June2021.png&quot;,&quot;verzuzbattle&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Verzuz_2020_Flight4\/Verzuz_2020_Flight4.png&quot;,&quot;redv&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL_2021_redv\/NRL_2021_redv.png&quot;,&quot;cesttoutmoi&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Spotify_Q2_21\/Spotify_Q2_21.png&quot;,&quot;5aside&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ladbrokes5ASide_May_2021\/Ladbrokes5ASide_May_2021.png&quot;,&quot;madebymany&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCS_League_2021\/LCS_League_2021.png&quot;,&quot;kaotican&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Coldplay_May_2021\/Coldplay_May_2021.png&quot;,&quot;ace_higher&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KpopACE_June_2021\/KpopACE_June_2021.png&quot;,&quot;чернаявдова&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_Symbol_2021_V2\/Disney_BlackWidow_Symbol_2021_V2.png&quot;,&quot;နို့လက်ဖက်ရည်မဟာမိတ်&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MilkTeaAlliance_2021\/MilkTeaAlliance_2021.png&quot;,&quot;disneycruiseline&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_DisneyCruise_2021\/DisneyParks_DisneyCruise_2021.png&quot;,&quot;futbolziyafeti&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YemekSepeti_2021\/YemekSepeti_2021.png&quot;,&quot;الجوائز_الثقافية_الوطنية&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NationalCulturalAwardsFinalEvent_2021\/NationalCulturalAwardsFinalEvent_2021.png&quot;,&quot;ausarmy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DFR_2021_AusArmy_May\/DFR_2021_AusArmy_May.png&quot;,&quot;自然に健康new十六茶&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AsahiSoftDrink16tea02Japan_2021\/AsahiSoftDrink16tea02Japan_2021.png&quot;,&quot;cmoncymru&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JDXWALES_2021\/JDXWALES_2021.png&quot;,&quot;igwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LPL_2021_IGWIN\/LPL_2021_IGWIN.png&quot;,&quot;রেডক্রিসেন্টদিবস&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WorldRedCrossDay_May_2021_add2\/WorldRedCrossDay_May_2021_add2.png&quot;,&quot;gaga&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Lady_Gaga_Born_This_Way_Anniversary_GOLD_Emoji\/Lady_Gaga_Born_This_Way_Anniversary_GOLD_Emoji.png&quot;,&quot;globalaccessibilityawarenessday&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/GAAD_May_2021_ext\/GAAD_May_2021_ext.png&quot;,&quot;realcoolmagic&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Midea_RAC_May_2021\/Midea_RAC_May_2021.png&quot;,&quot;lfgdocumentary&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMax_LFGDocumentary_2021\/HBOMax_LFGDocumentary_2021.png&quot;,&quot;globalrickandmortyday&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RickandMorty2021_globalrickandmortyday\/RickandMorty2021_globalrickandmortyday.png&quot;,&quot;bostonup&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_Feb_2021_BostonUp\/OWL_Season4_Team_Feb_2021_BostonUp.png&quot;,&quot;f150&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/F150Lightning_May_2021_2\/F150Lightning_May_2021_2.png&quot;,&quot;viudanegramarvel&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_Symbol_2021_V2\/Disney_BlackWidow_Symbol_2021_V2.png&quot;,&quot;duo4realcool&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Midea_RAC_May_2021\/Midea_RAC_May_2021.png&quot;,&quot;apahm&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AHM_RepresentAsian_2021\/AHM_RepresentAsian_2021.png&quot;,&quot;intz&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/INTZ_June_2021\/INTZ_June_2021.png&quot;,&quot;theturn2kl&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheTurn2KL_2021\/TheTurn2KL_2021.png&quot;,&quot;lag&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CDL_Team_2021_LAG_v2\/CDL_Team_2021_LAG_v2.png&quot;,&quot;someity&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Paralympic_Mascot_Emoji_EXT2\/Paralympic_Mascot_Emoji_EXT2.png&quot;,&quot;dewzonewithdruski&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MountainDewNBA_June_2021\/MountainDewNBA_June_2021.png&quot;,&quot;jodifyyourlife&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HuluMODOK2021\/HuluMODOK2021.png&quot;,&quot;bettys2&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BettyHBO_S2_2021\/BettyHBO_S2_2021.png&quot;,&quot;aewontnt&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/aewontnt_May_2021\/aewontnt_May_2021.png&quot;,&quot;断网&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KeepItOn_InternetShutdown_2021\/KeepItOn_InternetShutdown_2021.png&quot;,&quot;bittorrent&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JustinSuntron_2021_ext\/JustinSuntron_2021_ext.png&quot;,&quot;heinzistheanswer&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KraftHeinz_CrowdSauce_SG_2021\/KraftHeinz_CrowdSauce_SG_2021.png&quot;,&quot;สเปซแจม&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SpaceJam_2021\/SpaceJam_2021.png&quot;,&quot;lfgthemovie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMax_LFGDocumentary_2021\/HBOMax_LFGDocumentary_2021.png&quot;,&quot;identityv&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/IdentityVJP_Q3_2021\/IdentityVJP_Q3_2021.png&quot;,&quot;hitungmundurloki&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_Miss_Minutes_2021\/Disney_LokiLaunch_Miss_Minutes_2021.png&quot;,&quot;somosmibr&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EsportsAllAccess_Jan_2021_MIBR\/EsportsAllAccess_Jan_2021_MIBR.png&quot;,&quot;supplierinclusion&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SupplierInclusionDiversity_2021\/SupplierInclusionDiversity_2021.png&quot;,&quot;everupward&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_Feb_2021_NY\/OWL_Season4_Team_Feb_2021_NY.png&quot;,&quot;vaccinati&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;rockets&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_2021_Teams_Rockets\/NBA_2021_Teams_Rockets.png&quot;,&quot;sylvie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_Sylvie_2021_V2\/Disney_LokiLaunch_Sylvie_2021_V2.png&quot;,&quot;อร่อยได้เมื่อมีไฮนซ์&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KraftHeinz_CrowdSauce_SG_2021\/KraftHeinz_CrowdSauce_SG_2021.png&quot;,&quot;zilnft&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Zilliqa_April_2021\/Zilliqa_April_2021.png&quot;,&quot;selenalaserie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SelenaNetflix_2021\/SelenaNetflix_2021.png&quot;,&quot;thankyounurses&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CeraVe_ThankYouNurses_2021\/CeraVe_ThankYouNurses_2021.png&quot;,&quot;lokiclassico&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_ClassiclLoki_2021\/Disney_LokiLaunch_ClassiclLoki_2021.png&quot;,&quot;awsforindia&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AWSSummit_2021\/AWSSummit_2021.png&quot;,&quot;teswin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LPL_2021_TESWIN\/LPL_2021_TESWIN.png&quot;,&quot;farcry&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Farcry6_UK_2021\/Farcry6_UK_2021.png&quot;,&quot;aflw&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AFL_2021_AFLW\/AFL_2021_AFLW.png&quot;,&quot;サマナーズウォー7周年&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Com2us_summonerswar_April_2021\/Com2us_summonerswar_April_2021.png&quot;,&quot;doomatyourserviceonviu&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DAYSOnViu_2021\/DAYSOnViu_2021.png&quot;,&quot;nrlgf&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL_2021\/NRL_2021.png&quot;,&quot;imaginequeépossível&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TIMOlimpiadas2021\/TIMOlimpiadas2021.png&quot;,&quot;fazeclan&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EsportsAllAccess_Jan_2021_Faze\/EsportsAllAccess_Jan_2021_Faze.png&quot;,&quot;tomorrowwarmovie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AmazonStudios_TomorrowWar_2021_add\/AmazonStudios_TomorrowWar_2021_add.png&quot;,&quot;ourcle&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_CLE\/MLB_Teams_2021_CLE.png&quot;,&quot;stopfeminicides&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;kakayaninnatinito&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HHS_WeCanDoThis_2021_add\/HHS_WeCanDoThis_2021_add.png&quot;,&quot;thismeanseverything&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JDXSCOTLAND_2021\/JDXSCOTLAND_2021.png&quot;,&quot;알콜프리&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Kpop_VIT_TWICE_June_2021\/Kpop_VIT_TWICE_June_2021.png&quot;,&quot;colwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EsportsAllAccess_Jan_2021_COLWIN\/EsportsAllAccess_Jan_2021_COLWIN.png&quot;,&quot;jedefrau&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EveryWoman_2020\/EveryWoman_2020.png&quot;,&quot;sourpatchkidsmystery&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SourPatchMystery_May_2021\/SourPatchMystery_May_2021.png&quot;,&quot;단한명의여성도&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;vamosnyc&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_NYC_v2\/MLS_2021_NYC_v2.png&quot;,&quot;halomp&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/XboxOlympus_2021\/XboxOlympus_2021.png&quot;,&quot;saw&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SpiralSaw2021\/SpiralSaw2021.png&quot;,&quot;usemascara&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WearAMask_2020_2021_ext3\/WearAMask_2020_2021_ext3.png&quot;,&quot;followlocaljournalists&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FollowLocalJournalists_2021\/FollowLocalJournalists_2021.png&quot;,&quot;pūhouwhakahaere&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YouthLead_2020\/YouthLead_2020.png&quot;,&quot;runskg&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LEC_EM_2021_SKWIN\/LEC_EM_2021_SKWIN.png&quot;,&quot;beliamemimpin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YouthLead_2020\/YouthLead_2020.png&quot;,&quot;btfs&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JustinSuntron_2021_ext\/JustinSuntron_2021_ext.png&quot;,&quot;webull7&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WeBull_May_2021_v2\/WeBull_May_2021_v2.png&quot;,&quot;skinsistareset&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SkinsistaRESET_2021\/SkinsistaRESET_2021.png&quot;,&quot;vierkvinner&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterWomenTentpole_2021\/TwitterWomenTentpole_2021.png&quot;,&quot;cervezatecate&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/GuardianTecate_July_2021\/GuardianTecate_July_2021.png&quot;,&quot;ひと夏の奇跡&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Alberto_2021\/Disney_PixarLuca_Alberto_2021.png&quot;,&quot;ウォーサバ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ElexTWDSJP_2021\/ElexTWDSJP_2021.png&quot;,&quot;newworldamazon&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NewWorldLaunch_2021\/NewWorldLaunch_2021.png&quot;,&quot;legomastersonfox&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FOX_LEGOGoldenBrick_2021\/FOX_LEGOGoldenBrick_2021.png&quot;,&quot;gopherhybrid&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_SweetTooth_Gopher\/Netflix_SweetTooth_Gopher.png&quot;,&quot;リィンカネ生&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NieRReincarnationLaunch_May_2021\/NieRReincarnationLaunch_May_2021.png&quot;,&quot;guinnesstime&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/GuinnessTime_May_2021\/GuinnessTime_May_2021.png&quot;,&quot;spacejamanewlegacy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SpaceJam_2021\/SpaceJam_2021.png&quot;,&quot;khôngrađường&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;dodgers&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_LAD\/MLB_Teams_2021_LAD.png&quot;,&quot;alexeishostakov&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_RedGuardian_2021\/Disney_BlackWidow_RedGuardian_2021.png&quot;,&quot;classicloki&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_ClassiclLoki_2021\/Disney_LokiLaunch_ClassiclLoki_2021.png&quot;,&quot;alidanraturatuqueens&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NetflixARRQ_2021\/NetflixARRQ_2021.png&quot;,&quot;turkeyhead&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMax_Friends_Turkey\/HBOMax_Friends_Turkey.png&quot;,&quot;saturdaysolstice&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/inchscider_2021_add\/inchscider_2021_add.png&quot;,&quot;justiceiscoming&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FastFurious9_April_2021\/FastFurious9_April_2021.png&quot;,&quot;treymancini&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLBHRDerby2021-BAL\/MLBHRDerby2021-BAL.png&quot;,&quot;msfwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LEC_EM_2021_MSFWIN\/LEC_EM_2021_MSFWIN.png&quot;,&quot;askdionne&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Dionne_Warwick_2021_V2\/Dionne_Warwick_2021_V2.png&quot;,&quot;dk&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LcK_2021_Teams_DK\/LcK_2021_Teams_DK.png&quot;,&quot;qoo10&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Qoo10_Shopping_Q2_2021\/Qoo10_Shopping_Q2_2021.png&quot;,&quot;haveago&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AU_Olympic_2021\/AU_Olympic_2021.png&quot;,&quot;キューテン&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Qoo10_Shopping_Q2_2021\/Qoo10_Shopping_Q2_2021.png&quot;,&quot;squadup&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_NYY\/MLB_Teams_2021_NYY.png&quot;,&quot;wweraw&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WWE_Recurring_2020_WWERaw\/WWE_Recurring_2020_WWERaw.png&quot;,&quot;grownishsenioryear&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/grownishseason4_2021\/grownishseason4_2021.png&quot;,&quot;вечначистка&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheForeverPurge_2021_v2\/TheForeverPurge_2021_v2.png&quot;,&quot;fikirsebelumklik&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2020_ThinkBeforeClicking\/MediaInformationLiteracyWeeks_2020_ThinkBeforeClicking.png&quot;,&quot;16days&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020_add\/OrangeTheWorld_2020_add.png&quot;,&quot;mercredisdeloki&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_TVA_Jacket_Loki_2021_V2\/Disney_LokiLaunch_TVA_Jacket_Loki_2021_V2.png&quot;,&quot;문샷&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KPOP_NFlying_June_2021\/KPOP_NFlying_June_2021.png&quot;,&quot;wethenorth&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_2021_Teams_WeTheNorth\/NBA_2021_Teams_WeTheNorth.png&quot;,&quot;permissiontodance&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Kpop_VIT_BTS_single_July1_2021_W2\/Kpop_VIT_BTS_single_July1_2021_W2.png&quot;,&quot;pixarальберто&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Alberto_2021\/Disney_PixarLuca_Alberto_2021.png&quot;,&quot;itsawimbledonthing&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Wimbledon_2021_hearts\/Wimbledon_2021_hearts.png&quot;,&quot;i̇yikidoyduk&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YemekSepeti_2021\/YemekSepeti_2021.png&quot;,&quot;औरतकासम्मान&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;aflwgf&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AFL_2021_AFLW\/AFL_2021_AFLW.png&quot;,&quot;brooklyntogether&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_2021_Teams_BrooklynTogether\/NBA_2021_Teams_BrooklynTogether.png&quot;,&quot;spacejammovie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SpaceJam_2021\/SpaceJam_2021.png&quot;,&quot;twitterparasakabutihan&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterForGood_Refresh_2021\/TwitterForGood_Refresh_2021.png&quot;,&quot;omgwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LPL_2021_OMGWIN\/LPL_2021_OMGWIN.png&quot;,&quot;unitethepride&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/VodafoneLions_Tour_2021\/VodafoneLions_Tour_2021.png&quot;,&quot;dontspoilthetrip&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBC_OldMovie_May_2021_v2\/NBC_OldMovie_May_2021_v2.png&quot;,&quot;opporeno6series&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OPPOReno6Series_2021\/OPPOReno6Series_2021.png&quot;,&quot;onlyyou&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Spotify_Q2_21\/Spotify_Q2_21.png&quot;,&quot;bettyhbo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BettyHBO_S2_2021\/BettyHBO_S2_2021.png&quot;,&quot;coffeeconfidential&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMaxGossipGirl_July_2021_Latte\/HBOMaxGossipGirl_July_2021_Latte.png&quot;,&quot;pensaprimadicondividere&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2020_ThinkBeforeSharing\/MediaInformationLiteracyWeeks_2020_ThinkBeforeSharing.png&quot;,&quot;日本にはおいしいサイダーがある&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AsahiSoftDrinkmitsuyasummercider2_Japan_2021\/AsahiSoftDrinkmitsuyasummercider2_Japan_2021.png&quot;,&quot;magsuotngmask&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WearAMask_2020_2021_ext3\/WearAMask_2020_2021_ext3.png&quot;,&quot;hacksonmax&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Hacks_HBOMax_April_2021_v3\/Hacks_HBOMax_April_2021_v3.png&quot;,&quot;parradise&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL_2021_PARRAdise\/NRL_2021_PARRAdise.png&quot;,&quot;ナターシャロマノフ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_BWNatasha_again_2021\/Disney_BlackWidow_BWNatasha_again_2021.png&quot;,&quot;blindspotting&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/STARZ_Blindspotting_May_2021\/STARZ_Blindspotting_May_2021.png&quot;,&quot;七夕の願い事&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/2021StarFestivalTanabata\/2021StarFestivalTanabata.png&quot;,&quot;lizphair&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LizPhair_2021\/LizPhair_2021.png&quot;,&quot;libertadores&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Libertadores_July_2021\/Libertadores_July_2021.png&quot;,&quot;ruletheschool&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMaxGossipGirl_July_2021_CB\/HBOMaxGossipGirl_July_2021_CB.png&quot;,&quot;wirsinddie15&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WeThe15_2021\/WeThe15_2021.png&quot;,&quot;7anosintz&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/INTZ_June_2021\/INTZ_June_2021.png&quot;,&quot;foreverpurgesg&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheForeverPurge_2021_v2\/TheForeverPurge_2021_v2.png&quot;,&quot;distortedlightbeam&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bastille_June_2021\/Bastille_June_2021.png&quot;,&quot;青年領導&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YouthLead_2020\/YouthLead_2020.png&quot;,&quot;gorabbitohs&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL_2021_GoRabbitohs\/NRL_2021_GoRabbitohs.png&quot;,&quot;mysterysourpatchflavor&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SourPatchMystery_May_2021\/SourPatchMystery_May_2021.png&quot;,&quot;maailmaoranssiksi&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;gospursgo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_2021_Teams_GoSpursGo\/NBA_2021_Teams_GoSpursGo.png&quot;,&quot;infovacunacovid&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AdCouncilVaccine_2021_add\/AdCouncilVaccine_2021_add.png&quot;,&quot;dragraceallstars&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ParamountRuPaulsDragRaceAllStars_July_2021\/ParamountRuPaulsDragRaceAllStars_July_2021.png&quot;,&quot;vaskdinehænder&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WashYourHands_2020_2021_ext3\/WashYourHands_2020_2021_ext3.png&quot;,&quot;jagamethandhiramonnetflix&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JagameThandhiramOnNetflix_2021\/JagameThandhiramOnNetflix_2021.png&quot;,&quot;pikirsebelumsebar&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2020_ThinkBeforeSharing\/MediaInformationLiteracyWeeks_2020_ThinkBeforeSharing.png&quot;,&quot;touteslesfemmes&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EveryWoman_2020\/EveryWoman_2020.png&quot;,&quot;hoochseries&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyPlus_TurnerandHooch_Dog_2021\/DisneyPlus_TurnerandHooch_Dog_2021.png&quot;,&quot;dubnation&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_2021_Teams_DubNation\/NBA_2021_Teams_DubNation.png&quot;,&quot;spotifypodcasts&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PodcastDiscoveryLATAM_2021\/PodcastDiscoveryLATAM_2021.png&quot;,&quot;gushybrid&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NetflixSweetTooth2021_add\/NetflixSweetTooth2021_add.png&quot;,&quot;đeokhẩutrang&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WearAMask_2020_2021_ext3\/WearAMask_2020_2021_ext3.png&quot;,&quot;releasethesnydercut&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SnyderCut_LA_May_2021\/SnyderCut_LA_May_2021.png&quot;,&quot;픽사_알베르토&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Alberto_2021\/Disney_PixarLuca_Alberto_2021.png&quot;,&quot;disneyplusturnerandhooch&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyPlus_TurnerandHooch_Dog_2021\/DisneyPlus_TurnerandHooch_Dog_2021.png&quot;,&quot;يومالصليباألحمر&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WorldRedCrossDay_May_2021_add2\/WorldRedCrossDay_May_2021_add2.png&quot;,&quot;dudukrumah&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;ディーサイドトロイメライ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DCide_July_2021\/DCide_July_2021.png&quot;,&quot;takenote&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_2021_Teams_TakeNote\/NBA_2021_Teams_TakeNote.png&quot;,&quot;انٹرنٹ_شٹ_ڈاؤنز&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KeepItOn_InternetShutdown_2021\/KeepItOn_InternetShutdown_2021.png&quot;,&quot;ispeakenserio&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/GuardianTecate_July_2021\/GuardianTecate_July_2021.png&quot;,&quot;dionnewarwick&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Dionne_Warwick_2021_V2\/Dionne_Warwick_2021_V2.png&quot;,&quot;gizellebryant&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bravo_RHOP_Q3_2021_GizelleBryant\/Bravo_RHOP_Q3_2021_GizelleBryant.png&quot;,&quot;深淵覚醒&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/blacksurgenightJapanHidden_2021\/blacksurgenightJapanHidden_2021.png&quot;,&quot;beinfinite&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Paramount_Infinite_2021\/Paramount_Infinite_2021.png&quot;,&quot;färbdieweltorange&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;nichtnocheine&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;br6&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RainbowSixProLeague_2021_BR6\/RainbowSixProLeague_2021_BR6.png&quot;,&quot;taste_of_love&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Kpop_VIT_TWICE_June_2021\/Kpop_VIT_TWICE_June_2021.png&quot;,&quot;포르토로소&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Portorosso_2021\/Disney_PixarLuca_Portorosso_2021.png&quot;,&quot;七夕&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/2021StarFestivalTanabata\/2021StarFestivalTanabata.png&quot;,&quot;theflightattendantonhbomax&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FlightAttendant_LA_May_2021\/FlightAttendant_LA_May_2021.png&quot;,&quot;جيل_المساواة&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;fboy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FBOYIsland_2021_fboy\/FBOYIsland_2021_fboy.png&quot;,&quot;cuidarteescuidarnos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;gokt&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCK_2021_Team_P1_KTWIN_v2\/LCK_2021_Team_P1_KTWIN_v2.png&quot;,&quot;outlawsnation&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_2021_HOUSTON_v2\/OWL_Season4_Team_2021_HOUSTON_v2.png&quot;,&quot;legomastersfox&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FOX_LEGOGoldenBrick_2021\/FOX_LEGOGoldenBrick_2021.png&quot;,&quot;dcu&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_DCU\/MLS_2021_DCU.png&quot;,&quot;colorailmondodiarancione&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;goitz&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/INTZ_June_2021\/INTZ_June_2021.png&quot;,&quot;shernitrailer&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SherniOnPrime_2021\/SherniOnPrime_2021.png&quot;,&quot;thetomorrowwarmovie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AmazonStudios_TomorrowWar_2021_add\/AmazonStudios_TomorrowWar_2021_add.png&quot;,&quot;١٦يوم&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;twice&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Kpop_VIT_TWICE_June_2021\/Kpop_VIT_TWICE_June_2021.png&quot;,&quot;女力覺醒&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterWomenTentpole_2021\/TwitterWomenTentpole_2021.png&quot;,&quot;翻牆&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KeepItOn_InternetShutdown_2021\/KeepItOn_InternetShutdown_2021.png&quot;,&quot;internetkesilmesi&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KeepItOn_InternetShutdown_2021\/KeepItOn_InternetShutdown_2021.png&quot;,&quot;loveandhiphop&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/VH1LHHAtlanta_2021\/VH1LHHAtlanta_2021.png&quot;,&quot;lapurgaporsiempre&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LaPurgaPorSiempre_2021\/LaPurgaPorSiempre_2021.png&quot;,&quot;afl&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AFL_2021\/AFL_2021.png&quot;,&quot;hpediscover2021&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HPEDiscover2021\/HPEDiscover2021.png&quot;,&quot;lafamiliaimcf&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_IMCF\/MLS_2021_IMCF.png&quot;,&quot;panelacheiasalva&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/COVIDRelief_2021_Brazil\/COVIDRelief_2021_Brazil.png&quot;,&quot;feedthedream&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SobeysOlympic_2021\/SobeysOlympic_2021.png&quot;,&quot;lavatusmanos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WashYourHands_2020_2021_ext3\/WashYourHands_2020_2021_ext3.png&quot;,&quot;obeymebd&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NTTSolmareObeyme_June_2021\/NTTSolmareObeyme_June_2021.png&quot;,&quot;поколениеравенства&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;msbuild&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MicrosoftBuild_2021\/MicrosoftBuild_2021.png&quot;,&quot;mifters&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneuPlus_MonstersatWork_Helmet_2021\/DisneuPlus_MonstersatWork_Helmet_2021.png&quot;,&quot;togetherroyal&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_KC\/MLB_Teams_2021_KC.png&quot;,&quot;ditoph&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DITO_May_2021_ext\/DITO_May_2021_ext.png&quot;,&quot;トレクル&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JP_ONEPIECE_trecru_2021\/JP_ONEPIECE_trecru_2021.png&quot;,&quot;generationgleichberechtigung&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;motherlandfortsalem&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MotherlandFortSalem_2021\/MotherlandFortSalem_2021.png&quot;,&quot;evdesağlıklıkal&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;boatxhardikpandya&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BOAT_IPL_2021_v2\/BOAT_IPL_2021_v2.png&quot;,&quot;thisisitzy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SpotifyxITZY_April_2021\/SpotifyxITZY_April_2021.png&quot;,&quot;buildtothemoon&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BinanceTurns4_2021\/BinanceTurns4_2021.png&quot;,&quot;morenaluansantana&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/morenaluansantana_June_2021\/morenaluansantana_June_2021.png&quot;,&quot;rngwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RNGWIN_May_2021\/RNGWIN_May_2021.png&quot;,&quot;mrinbetween&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MrInbetweenFX_May_2021\/MrInbetweenFX_May_2021.png&quot;,&quot;サマナーズウォー&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Com2us_summonerswar_April_2021\/Com2us_summonerswar_April_2021.png&quot;,&quot;fortniteinvasion&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FortniteSeason7_2021\/FortniteSeason7_2021.png&quot;,&quot;sf9&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Kpop_VIT_SF9_June_2021\/Kpop_VIT_SF9_June_2021.png&quot;,&quot;คนรุ่นใหม่ที่เท่าเทียม&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;류진&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KPOP_VIT_ITZY_April_2021_RYUJIN\/KPOP_VIT_ITZY_April_2021_RYUJIN.png&quot;,&quot;vaksinasi&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;ratedrookie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PaniniAmericaQ2_21\/PaniniAmericaQ2_21.png&quot;,&quot;vidaspretasimportam&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BlackLivesMatter_VidasNegrasImportam_add\/BlackLivesMatter_VidasNegrasImportam_add.png&quot;,&quot;nowruz&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/nowruz2018_v4\/nowruz2018_v4.png&quot;,&quot;siemprecercadeti&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KelloggsMasterBrandCercaDeTi_2021_V3\/KelloggsMasterBrandCercaDeTi_2021_V3.png&quot;,&quot;勤洗手&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WashYourHands_2020_2021_ext3\/WashYourHands_2020_2021_ext3.png&quot;,&quot;nonamenit&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_Miss_Minutes_2021\/Disney_LokiLaunch_Miss_Minutes_2021.png&quot;,&quot;lasparks&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WNBA_Teams_2021_LA\/WNBA_Teams_2021_LA.png&quot;,&quot;betheboss&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ladbrokes5ASide_May_2021\/Ladbrokes5ASide_May_2021.png&quot;,&quot;epcot&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_MickeyEars_2020_Flight5_V2\/DisneyParks_MickeyEars_2020_Flight5_V2.png&quot;,&quot;timstwitterparty&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TimsTwitterListeningParty_2021_2022\/TimsTwitterListeningParty_2021_2022.png&quot;,&quot;انٹرنیٹ_شٹ_ڈاؤنز&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KeepItOn_InternetShutdown_2021\/KeepItOn_InternetShutdown_2021.png&quot;,&quot;rickandmorty&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RickandMorty2021\/RickandMorty2021.png&quot;,&quot;shopsmall&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AmexCanadaShopSmall_2021\/AmexCanadaShopSmall_2021.png&quot;,&quot;watchmework&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WNBA_2021Season_25thAnniversary_1\/WNBA_2021Season_25thAnniversary_1.png&quot;,&quot;lockdengobeefeater&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Beefeater_June_2021\/Beefeater_June_2021.png&quot;,&quot;snwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LPL_2021_SNWIN\/LPL_2021_SNWIN.png&quot;,&quot;lhhmia&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/VH1LHHAtlanta_2021\/VH1LHHAtlanta_2021.png&quot;,&quot;lck&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCK_League_2021\/LCK_League_2021.png&quot;,&quot;salvyperez&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLBHRDerby2021-KC\/MLBHRDerby2021-KC.png&quot;,&quot;クラシックロキ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_ClassiclLoki_2021\/Disney_LokiLaunch_ClassiclLoki_2021.png&quot;,&quot;dailyclimateshow&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DailyClimateShow_2021\/DailyClimateShow_2021.png&quot;,&quot;فكر_قبل_الضغط&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2020_ThinkBeforeClicking\/MediaInformationLiteracyWeeks_2020_ThinkBeforeClicking.png&quot;,&quot;thisismycrew&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_MIL\/MLB_Teams_2021_MIL.png&quot;,&quot;larojaenas&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DiarioAs_2021_add\/DiarioAs_2021_add.png&quot;,&quot;mutualfundssahihai&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AMFIQ2IPL_2021_v2\/AMFIQ2IPL_2021_v2.png&quot;,&quot;ilnyaquevous&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Spotify_Q2_21\/Spotify_Q2_21.png&quot;,&quot;kvinnofrid&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;cricketsemftak&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AMFIQ2IPL_2021_v2\/AMFIQ2IPL_2021_v2.png&quot;,&quot;観ようぜ日本代表戦&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Akatsuki5_June_2021\/Akatsuki5_June_2021.png&quot;,&quot;heattwitter&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_2021_Teams_HEATTwitter\/NBA_2021_Teams_HEATTwitter.png&quot;,&quot;impracticaljokers&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheImpracticalJokers_Julu_2021\/TheImpracticalJokers_Julu_2021.png&quot;,&quot;snakeeyeselorigen&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SnakeEyesMovie2021\/SnakeEyesMovie2021.png&quot;,&quot;adaaqua&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KebaikanAqua_April_2021\/KebaikanAqua_April_2021.png&quot;,&quot;sooultra&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CDL_Team_2021_TOR\/CDL_Team_2021_TOR.png&quot;,&quot;houseofthedragonhbo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HouseoftheDragonHBO_2021\/HouseoftheDragonHBO_2021.png&quot;,&quot;youknowyouloveme&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMaxGossipGirl_July_2021_XOXO\/HBOMaxGossipGirl_July_2021_XOXO.png&quot;,&quot;大切に使わせてもらう&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YugiohYusei_May2021\/YugiohYusei_May2021.png&quot;,&quot;oguardiãovermelho&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_RedGuardian_2021\/Disney_BlackWidow_RedGuardian_2021.png&quot;,&quot;godons&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AFL_2021_godons\/AFL_2021_godons.png&quot;,&quot;トロメラ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DCide_July_2021\/DCide_July_2021.png&quot;,&quot;generationjämställdhet&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;civogliamovive&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;wwenxt&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WWE_Recurring_2020_WWENXT\/WWE_Recurring_2020_WWENXT.png&quot;,&quot;유나&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KPOP_VIT_ITZY_April_2021_YUNA\/KPOP_VIT_ITZY_April_2021_YUNA.png&quot;,&quot;flightattendant&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FlightAttendant_LA_May_2021\/FlightAttendant_LA_May_2021.png&quot;,&quot;sui&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Euro_UK_2021_SUI\/Euro_UK_2021_SUI.png&quot;,&quot;sihatdirumah&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;原神&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/miHoYo_genshin_0421\/miHoYo_genshin_0421.png&quot;,&quot;ルフィ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JP_ONEPIECE_trecru_2021\/JP_ONEPIECE_trecru_2021.png&quot;,&quot;thewhitelotushbo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBO_TheWhiteLotus_2021\/HBO_TheWhiteLotus_2021.png&quot;,&quot;winnable&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_Feb_2021_SF\/OWL_Season4_Team_Feb_2021_SF.png&quot;,&quot;natasharomanoff&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_BWNatasha_again_2021\/Disney_BlackWidow_BWNatasha_again_2021.png&quot;,&quot;elleriniyıka&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WashYourHands_2020_2021_ext3\/WashYourHands_2020_2021_ext3.png&quot;,&quot;橘起世界&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;lokiorgulhoso&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_BoastfulLoki_2021\/Disney_LokiLaunch_BoastfulLoki_2021.png&quot;,&quot;toduntaak&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ToofaanOnPrime_July_2021\/ToofaanOnPrime_July_2021.png&quot;,&quot;masketak&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WearAMask_2020_2021_ext3\/WearAMask_2020_2021_ext3.png&quot;,&quot;acer&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Acer_aspirevero_2021\/Acer_aspirevero_2021.png&quot;,&quot;geelongstrong&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AFL_2021_GeelongStrong\/AFL_2021_GeelongStrong.png&quot;,&quot;بس_إنت&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Spotify_Q2_21\/Spotify_Q2_21.png&quot;,&quot;lavesuasmãos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WashYourHands_2020_2021_ext3\/WashYourHands_2020_2021_ext3.png&quot;,&quot;gobro&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCK_2021_Team_P1_GOBRO\/LCK_2021_Team_P1_GOBRO.png&quot;,&quot;あの人と乾杯したい&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AsahiSoftDrinkCalpis02TanabataJapan2021\/AsahiSoftDrinkCalpis02TanabataJapan2021.png&quot;,&quot;svk&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Euro_UK_2021_SVK\/Euro_UK_2021_SVK.png&quot;,&quot;upwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LPL_2021_UPWIN\/LPL_2021_UPWIN.png&quot;,&quot;手を洗おう&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WashYourHands_2020_2021_ext3\/WashYourHands_2020_2021_ext3.png&quot;,&quot;mytwitteranniversary&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MyTwitterAnniversary\/MyTwitterAnniversary.png&quot;,&quot;noponto&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PontoFrio_Rebrand_2021\/PontoFrio_Rebrand_2021.png&quot;,&quot;man_on_the_moon&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KPOP_NFlying_June_2021\/KPOP_NFlying_June_2021.png&quot;,&quot;itzy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KPOP_VIT_ITZY_April_2021\/KPOP_VIT_ITZY_April_2021.png&quot;,&quot;guerreros2021&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Guerreros_MX_June_2021\/Guerreros_MX_June_2021.png&quot;,&quot;シーモンスター&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Luca_2021\/Disney_PixarLuca_Luca_2021.png&quot;,&quot;karenhuger&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bravo_RHOP_Q3_2021_KarenHuger\/Bravo_RHOP_Q3_2021_KarenHuger.png&quot;,&quot;私を突き刺す棘ーsmartoon&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Piccoma_Watatoge_June_2021\/Piccoma_Watatoge_June_2021.png&quot;,&quot;powercouple&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PowerCouple_BR_May_2021\/PowerCouple_BR_May_2021.png&quot;,&quot;رمضان_سليم&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SaudiMOH_TaketheStep_2021\/SaudiMOH_TaketheStep_2021.png&quot;,&quot;semremorso&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TomClancysWithoutRemorse_2021\/TomClancysWithoutRemorse_2021.png&quot;,&quot;إهداء_للتاريخ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/stcHistory2021\/stcHistory2021.png&quot;,&quot;renaulteways&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RenaulteWays_2_2021\/RenaulteWays_2_2021.png&quot;,&quot;ボスベイビー&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BossBaby2_July_2021\/BossBaby2_July_2021.png&quot;,&quot;hunterb15&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_HunterB15_2021\/Disney_LokiLaunch_HunterB15_2021.png&quot;,&quot;playasone&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CDL_Team_2021_MINN\/CDL_Team_2021_MINN.png&quot;,&quot;深淵&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/blacksurgenightJapanHidden_2021\/blacksurgenightJapanHidden_2021.png&quot;,&quot;영화_루카&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Luca_2021\/Disney_PixarLuca_Luca_2021.png&quot;,&quot;primedayshow2021&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PrimeDayShow21_v2\/PrimeDayShow21_v2.png&quot;,&quot;iseeyouxoxo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMaxGossipGirl_July_2021_Phone\/HBOMaxGossipGirl_July_2021_Phone.png&quot;,&quot;loki&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_TVA_Jacket_Loki_2021_V2\/Disney_LokiLaunch_TVA_Jacket_Loki_2021_V2.png&quot;,&quot;niunamenos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;diosdelengaño&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_TVA_Jacket_Loki_2021_V2\/Disney_LokiLaunch_TVA_Jacket_Loki_2021_V2.png&quot;,&quot;tylortuskman&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneuPlus_MonstersatWork_Helmet_2021\/DisneuPlus_MonstersatWork_Helmet_2021.png&quot;,&quot;presidenteloki&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_PresidentLoki_2021\/Disney_LokiLaunch_PresidentLoki_2021.png&quot;,&quot;fortniteseason7&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FortniteSeason7_2021\/FortniteSeason7_2021.png&quot;,&quot;onhalayeunuoc&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;animationdomination&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HouseBrokenFOX_May_2021\/HouseBrokenFOX_May_2021.png&quot;,&quot;greenwall&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EsportsAllAccess_Jan_2021_GreenWall\/EsportsAllAccess_Jan_2021_GreenWall.png&quot;,&quot;ミライトワ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Olympic_Mascot_Emoji_EXT2\/Olympic_Mascot_Emoji_EXT2.png&quot;,&quot;ditotelecommunity&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DITO_May_2021_ext\/DITO_May_2021_ext.png&quot;,&quot;daysviuoriginal&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DAYSOnViu_2021\/DAYSOnViu_2021.png&quot;,&quot;nonunadipiù&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;generatievangelijkheid&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;kerriwalshjennings&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Almonds_2021\/Almonds_2021.png&quot;,&quot;melina&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_Melina_2021\/Disney_BlackWidow_Melina_2021.png&quot;,&quot;2・5周年大決戦祭&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Romasaga_25y_May_2021\/Romasaga_25y_May_2021.png&quot;,&quot;ezaf&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CDL_Team_2021_ATL\/CDL_Team_2021_ATL.png&quot;,&quot;br2&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bebe_Rexha_2021\/Bebe_Rexha_2021.png&quot;,&quot;seaofred&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LionsRugbyTour_2021_Lion\/LionsRugbyTour_2021_Lion.png&quot;,&quot;femalearabic&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FemaleArabic_21\/FemaleArabic_21.png&quot;,&quot;zombietiger&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ZombieTiger_UK_May_2021\/ZombieTiger_UK_May_2021.png&quot;,&quot;crypto4climate&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CryptocomCimate_2021_v2\/CryptocomCimate_2021_v2.png&quot;,&quot;age4&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/XboxCardinal_2021\/XboxCardinal_2021.png&quot;,&quot;magicishere&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_MickeyEars_2020_Flight5_V2\/DisneyParks_MickeyEars_2020_Flight5_V2.png&quot;,&quot;vivasnosqueremos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;neutralidaddelared&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Net_Emoji_Evergreen_SpanishAdd\/Net_Emoji_Evergreen_SpanishAdd.png&quot;,&quot;международныйденькрасногополумесяца&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WorldRedCrossDay_May_2021_add2\/WorldRedCrossDay_May_2021_add2.png&quot;,&quot;اغسل_يديك&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WashYourHands_2020_2021_ext3\/WashYourHands_2020_2021_ext3.png&quot;,&quot;pds21&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PrimeDayShow21_v2\/PrimeDayShow21_v2.png&quot;,&quot;bettys2premiere&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BettyHBO_S2_2021\/BettyHBO_S2_2021.png&quot;,&quot;annepagbabalik&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Foodpanda7thAnniversary_2021\/Foodpanda7thAnniversary_2021.png&quot;,&quot;sinremordimientos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TomClancysWithoutRemorse_2021\/TomClancysWithoutRemorse_2021.png&quot;,&quot;mlbtheshow21&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLBTheSho_2021\/MLBTheSho_2021.png&quot;,&quot;tomclancyswithoutremorse&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TomClancysWithoutRemorse_2021\/TomClancysWithoutRemorse_2021.png&quot;,&quot;mnwild&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHL_2021_Teams_mnwild\/NHL_2021_Teams_mnwild.png&quot;,&quot;glóriaeterna&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Libertadores_July_2021\/Libertadores_July_2021.png&quot;,&quot;세븐틴&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KpopVIT_SEVENTEEN_June_2021\/KpopVIT_SEVENTEEN_June_2021.png&quot;,&quot;cincoforgood&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Corona_CincoForGood_2021\/Corona_CincoForGood_2021.png&quot;,&quot;gorickyourself&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RickandMorty2021_rick\/RickandMorty2021_rick.png&quot;,&quot;hbomaxhacks&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Hacks_HBOMax_April_2021_v3\/Hacks_HBOMax_April_2021_v3.png&quot;,&quot;letsgohunt&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_2021_CHENGDU\/OWL_Season4_Team_2021_CHENGDU.png&quot;,&quot;トロメラアニメ01&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DCide_July_2021\/DCide_July_2021.png&quot;,&quot;bigtricktrutv&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BigTricktruTV_2021\/BigTricktruTV_2021.png&quot;,&quot;eurovisionagain&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EurovisionAgain_2021\/EurovisionAgain_2021.png&quot;,&quot;घरमेंरहेंस्वस्थरहें&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;venmoforbusiness&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Venmo_June_2021\/Venmo_June_2021.png&quot;,&quot;burningcrusade&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BurningCrusadeClassic_2021\/BurningCrusadeClassic_2021.png&quot;,&quot;티어드롭&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Kpop_VIT_SF9_June_2021\/Kpop_VIT_SF9_June_2021.png&quot;,&quot;goninjas&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NiPGaming_Jan_2021\/NiPGaming_Jan_2021.png&quot;,&quot;jdxwales&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JDXWALES_2021\/JDXWALES_2021.png&quot;,&quot;insidethenba&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBAPlayoffsonTNT_2021\/NBAPlayoffsonTNT_2021.png&quot;,&quot;wirsindfrauen&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterWomenTentpole_2021\/TwitterWomenTentpole_2021.png&quot;,&quot;우리는여자다&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterWomenTentpole_2021\/TwitterWomenTentpole_2021.png&quot;,&quot;16วัน&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;olympictorchrelay&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TokyoOlympic_2021_Part1\/TokyoOlympic_2021_Part1.png&quot;,&quot;cucitanganmu&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WashYourHands_2020_2021_ext3\/WashYourHands_2020_2021_ext3.png&quot;,&quot;blgwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LPL_2021_BLGWIN\/LPL_2021_BLGWIN.png&quot;,&quot;ウォーキング・デッドサバイバー&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ElexTWDSJP_2021\/ElexTWDSJP_2021.png&quot;,&quot;summergamefest&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/summergamefest_May_2021\/summergamefest_May_2021.png&quot;,&quot;welcometothewhitelotus&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBO_TheWhiteLotus_2021\/HBO_TheWhiteLotus_2021.png&quot;,&quot;poweryourdrinks&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/XboxMiniFridge_2021\/XboxMiniFridge_2021.png&quot;,&quot;aut&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Euro_UK_2021_AUT\/Euro_UK_2021_AUT.png&quot;,&quot;makeitmajor&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_MakeItMajor\/MLB_Teams_2021_MakeItMajor.png&quot;,&quot;respetonaman&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;viúvanegra&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_Symbol_2021_V2\/Disney_BlackWidow_Symbol_2021_V2.png&quot;,&quot;savethehybrids&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NetflixSweetTooth2021_add\/NetflixSweetTooth2021_add.png&quot;,&quot;اهداء_للتاريخ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/stcHistory2021\/stcHistory2021.png&quot;,&quot;maafassurances&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MAAF_70thBirthday_2021_2\/MAAF_70thBirthday_2021_2.png&quot;,&quot;fanzonespace&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DiarioAs_2021_add\/DiarioAs_2021_add.png&quot;,&quot;lokicoccodrillo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_AlligatorLoki_2021_v2\/Disney_LokiLaunch_AlligatorLoki_2021_v2.png&quot;,&quot;liveevil&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCS_Jan_2021_EGWIN\/LCS_Jan_2021_EGWIN.png&quot;,&quot;sobrock&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/John_Mayer_2021_Album\/John_Mayer_2021_Album.png&quot;,&quot;newyorkforever&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_2021_Teams_NewYorkForever\/NBA_2021_Teams_NewYorkForever.png&quot;,&quot;esteesmicrew&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_MIL\/MLB_Teams_2021_MIL.png&quot;,&quot;híbridocerdo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_SweetTooth_Pig\/Netflix_SweetTooth_Pig.png&quot;,&quot;hpediscover&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HPEDiscover2021\/HPEDiscover2021.png&quot;,&quot;btsarmy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KpopVIT_BTS_June2021_BTSARMY\/KpopVIT_BTS_June2021_BTSARMY.png&quot;,&quot;aflfinals&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AFL_2021\/AFL_2021.png&quot;,&quot;ミスミニッツ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_Miss_Minutes_2021\/Disney_LokiLaunch_Miss_Minutes_2021.png&quot;,&quot;tsmwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCS_Jan_2021_TSMWIN\/LCS_Jan_2021_TSMWIN.png&quot;,&quot;november19&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TSRed2021\/TSRed2021.png&quot;,&quot;ディズニーピクサー&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Luca_2021\/Disney_PixarLuca_Luca_2021.png&quot;,&quot;kaotica&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Coldplay_May_2021\/Coldplay_May_2021.png&quot;,&quot;sochkesharekaro&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2020_ThinkBeforeSharing\/MediaInformationLiteracyWeeks_2020_ThinkBeforeSharing.png&quot;,&quot;lco&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCO_2021\/LCO_2021.png&quot;,&quot;mrinbetweenfx&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MrInbetweenFX_May_2021\/MrInbetweenFX_May_2021.png&quot;,&quot;brasilcontraafome&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/COVIDRelief_2021_Brazil\/COVIDRelief_2021_Brazil.png&quot;,&quot;xoxopremiere&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMaxGossipGirl_July_2021_Kiss\/HBOMaxGossipGirl_July_2021_Kiss.png&quot;,&quot;aquietplace2&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AQuietPlace_P2_2021\/AQuietPlace_P2_2021.png&quot;,&quot;nyr&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHL_2021_Teams_NYR\/NHL_2021_Teams_NYR.png&quot;,&quot;njomza&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Njomza_Album_Emoji_2021\/Njomza_Album_Emoji_2021.png&quot;,&quot;mnightnewtrip&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBC_OldMovie_May_2021_v2\/NBC_OldMovie_May_2021_v2.png&quot;,&quot;nonunadimeno&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;echoke&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Davido10YearAnniversary_2021_2\/Davido10YearAnniversary_2021_2.png&quot;,&quot;yosoycobra&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Guerreros_MX_June_2021_YoSoyCobra\/Guerreros_MX_June_2021_YoSoyCobra.png&quot;,&quot;sotinysomany&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JackintheBoxTinyTacos_2021\/JackintheBoxTinyTacos_2021.png&quot;,&quot;ontherise&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_Feb_2021_BostonUp\/OWL_Season4_Team_Feb_2021_BostonUp.png&quot;,&quot;dtid&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_FCDal\/MLS_2021_FCDal.png&quot;,&quot;lavozargentina&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LaVozArgentina_2021\/LaVozArgentina_2021.png&quot;,&quot;우리가바로15&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WeThe15_2021\/WeThe15_2021.png&quot;,&quot;파이널기어&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FinalgearKR2021KR\/FinalgearKR2021KR.png&quot;,&quot;navination&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NaVi_Esports_2021_v2\/NaVi_Esports_2021_v2.png&quot;,&quot;askkpoptwitter&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KpopTwitter_2021_Red\/KpopTwitter_2021_Red.png&quot;,&quot;bornthisway&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Lady_Gaga_Born_This_Way_Anniversary_GOLD_Emoji\/Lady_Gaga_Born_This_Way_Anniversary_GOLD_Emoji.png&quot;,&quot;askwolfalice&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WolfAlice_2021\/WolfAlice_2021.png&quot;,&quot;jackstinytacos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JackintheBoxTinyTacos_2021\/JackintheBoxTinyTacos_2021.png&quot;,&quot;spacejamthemovie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SpaceJam_2021\/SpaceJam_2021.png&quot;,&quot;buildanempire&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CDL_Team_2021_DAL\/CDL_Team_2021_DAL.png&quot;,&quot;pantherpride&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL_2021_pantherpride\/NRL_2021_pantherpride.png&quot;,&quot;losdodgers&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_LosDodgers_2021\/MLB_LosDodgers_2021.png&quot;,&quot;टीकालगादेना&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;hinterdemmac&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FutureDays_Emoji_72px_72px\/FutureDays_Emoji_72px_72px.png&quot;,&quot;wanitabangkit&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;キズナアイコラボ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bytedance_ako_figurestory_June_2021\/Bytedance_ako_figurestory_June_2021.png&quot;,&quot;weeklyclimateshow&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DailyClimateShow_2021_add\/DailyClimateShow_2021_add.png&quot;,&quot;အင်တာနက်ဆက်ဖွင့်ထား&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KeepItOn_InternetShutdown_2021\/KeepItOn_InternetShutdown_2021.png&quot;,&quot;lfghbomax&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMax_LFGDocumentary_2021\/HBOMax_LFGDocumentary_2021.png&quot;,&quot;orangezlemonde&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;phòngdịch&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WashYourHands_2020_2021_ext3\/WashYourHands_2020_2021_ext3.png&quot;,&quot;theinsidestory&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBAPlayoffsonTNT_2021\/NBAPlayoffsonTNT_2021.png&quot;,&quot;kamiber15&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WeThe15_2021\/WeThe15_2021.png&quot;,&quot;ourwayunscripted&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WNBA_Teams_2021_IND_add\/WNBA_Teams_2021_IND_add.png&quot;,&quot;lightsout&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CDL_Team_2021_LAG_v2\/CDL_Team_2021_LAG_v2.png&quot;,&quot;pratodascomunidades&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/COVIDRelief_2021_Brazil\/COVIDRelief_2021_Brazil.png&quot;,&quot;eliminaçãopowercouple&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PowerCouple_BR_May_2021\/PowerCouple_BR_May_2021.png&quot;,&quot;weflyasone&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AFL_2021_WeFlyAsOne\/AFL_2021_WeFlyAsOne.png&quot;,&quot;façaparte&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MasterButterfly_BR_2021\/MasterButterfly_BR_2021.png&quot;,&quot;dogsofwar&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL_2021_DogsOfWar\/NRL_2021_DogsOfWar.png&quot;,&quot;onebypoise&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Poise_May_2021\/Poise_May_2021.png&quot;,&quot;인터넷셧다운&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KeepItOn_InternetShutdown_2021\/KeepItOn_InternetShutdown_2021.png&quot;,&quot;díamundialmedialunaroja&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WorldRedCrossDay_May_2021_add2\/WorldRedCrossDay_May_2021_add2.png&quot;,&quot;corasjourney&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Amazon_UndergroundRailroad_2021\/Amazon_UndergroundRailroad_2021.png&quot;,&quot;supportjournalism&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WaPo_WorldPressFreedom_2021\/WaPo_WorldPressFreedom_2021.png&quot;,&quot;bachelorette&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheBachelorette_2021\/TheBachelorette_2021.png&quot;,&quot;doritosfreedom&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DoritosFreedom_2021\/DoritosFreedom_2021.png&quot;,&quot;fpxwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LPL_2021_FPXWIN\/LPL_2021_FPXWIN.png&quot;,&quot;lionsden&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EnglandEuros_May_2021\/EnglandEuros_May_2021.png&quot;,&quot;itsonlyamatteroftime&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBC_OldMovie_May_2021_v2\/NBC_OldMovie_May_2021_v2.png&quot;,&quot;solotú&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Spotify_Q2_21\/Spotify_Q2_21.png&quot;,&quot;sportingkc&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_KC\/MLS_2021_KC.png&quot;,&quot;alwaysfnatic&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LEC_EM_2021_FNCWIN\/LEC_EM_2021_FNCWIN.png&quot;,&quot;cucitangananda&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WashYourHands_2020_2021_ext3\/WashYourHands_2020_2021_ext3.png&quot;,&quot;görvärldenorange&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;lildrums&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DrumstickCone2021\/DrumstickCone2021.png&quot;,&quot;foodpanda&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Foodpanda7thAnniversary_2021\/Foodpanda7thAnniversary_2021.png&quot;,&quot;itsbetterwithheinz&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KraftHeinz_CrowdSauce_SG_2021\/KraftHeinz_CrowdSauce_SG_2021.png&quot;,&quot;spacejamcandycrush&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SpaceJam_2021_add\/SpaceJam_2021_add.png&quot;,&quot;eggomothersnight&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Eggo_May_2021_2\/Eggo_May_2021_2.png&quot;,&quot;トロメラアニメ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DCide_July_2021\/DCide_July_2021.png&quot;,&quot;buildlikeamaster&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LEGOGoldenBrick_2021\/LEGOGoldenBrick_2021.png&quot;,&quot;shinbonerspirit&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AFL_2021_ShinbonerSpirit\/AFL_2021_ShinbonerSpirit.png&quot;,&quot;skywardsword&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NintendoZeldaSkywardSword_2021\/NintendoZeldaSkywardSword_2021.png&quot;,&quot;netflixdadstopembarrassingme&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DadStopEmbarrassingMeNetflix_2021\/DadStopEmbarrassingMeNetflix_2021.png&quot;,&quot;サマナ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Com2us_summonerswar_April_2021\/Com2us_summonerswar_April_2021.png&quot;,&quot;siamodonne&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterWomenTentpole_2021\/TwitterWomenTentpole_2021.png&quot;,&quot;happiestplace&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_MickeyEars_2020_Flight5_V2\/DisneyParks_MickeyEars_2020_Flight5_V2.png&quot;,&quot;austinfc&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_AFC\/MLS_2021_AFC.png&quot;,&quot;defendthethrone&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CDL_Team_2021_DAL\/CDL_Team_2021_DAL.png&quot;,&quot;슈니언&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/McD_KR_July_2021\/McD_KR_July_2021.png&quot;,&quot;snohaalegra&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SnohAalegra_2021\/SnohAalegra_2021.png&quot;,&quot;elmachipsmefazumpix&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ElmaChipsMeFazUmPix_2021\/ElmaChipsMeFazUmPix_2021.png&quot;,&quot;أفكار_الترفيه&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/GEA_June_2021\/GEA_June_2021.png&quot;,&quot;мы15процентов&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WeThe15_2021\/WeThe15_2021.png&quot;,&quot;kickofflive&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/summergamefest_May_2021\/summergamefest_May_2021.png&quot;,&quot;ใส่หน้ากากอนามัย&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WearAMask_2020_2021_ext3\/WearAMask_2020_2021_ext3.png&quot;,&quot;themitchellsvsthemachines&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_MitchellvsTheMachines_2021\/Netflix_MitchellvsTheMachines_2021.png&quot;,&quot;cleanitscrunchitcoopit&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CooperativeEnvironment_July_2021\/CooperativeEnvironment_July_2021.png&quot;,&quot;njdevils&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHL_2021_Teams_NJDevils\/NHL_2021_Teams_NJDevils.png&quot;,&quot;アレクセイ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_RedGuardian_2021\/Disney_BlackWidow_RedGuardian_2021.png&quot;,&quot;pinteomundodelaranja&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;siestakey&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MTV_April_2021\/MTV_April_2021.png&quot;,&quot;dadstopembarrassingme&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DadStopEmbarrassingMeNetflix_2021\/DadStopEmbarrassingMeNetflix_2021.png&quot;,&quot;upthebaggers&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AFL_2021_UpTheBaggers\/AFL_2021_UpTheBaggers.png&quot;,&quot;afwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LcK_2021_Teams_PL_AF\/LcK_2021_Teams_PL_AF.png&quot;,&quot;聖獣麒麟&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KIRINChallengeCupJapan2021\/KIRINChallengeCupJapan2021.png&quot;,&quot;btt&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JustinSuntron_2021_ext\/JustinSuntron_2021_ext.png&quot;,&quot;venmo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Venmo_June_2021\/Venmo_June_2021.png&quot;,&quot;niunpasoenfalso&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NoSuddenMove_July_2021\/NoSuddenMove_July_2021.png&quot;,&quot;gunakanmask&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WearAMask_2020_2021_ext3\/WearAMask_2020_2021_ext3.png&quot;,&quot;americannightmare5&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheForeverPurge_2021_v2\/TheForeverPurge_2021_v2.png&quot;,&quot;foreverfreo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AFL_2021_foreverfreo\/AFL_2021_foreverfreo.png&quot;,&quot;adultswim&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RickandMorty2021_adultswim\/RickandMorty2021_adultswim.png&quot;,&quot;whitelotus&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBO_TheWhiteLotus_2021\/HBO_TheWhiteLotus_2021.png&quot;,&quot;afterthefinalrose&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheBachelorette_2021\/TheBachelorette_2021.png&quot;,&quot;レッドガーディアン&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_RedGuardian_2021\/Disney_BlackWidow_RedGuardian_2021.png&quot;,&quot;itzy_guesswho&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KPOP_VIT_ITZY_April_2021\/KPOP_VIT_ITZY_April_2021.png&quot;,&quot;huomisensota&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AmazonStudios_TomorrowWar_2021\/AmazonStudios_TomorrowWar_2021.png&quot;,&quot;redcrescent&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WorldRedCrossDay_May_2021_add2\/WorldRedCrossDay_May_2021_add2.png&quot;,&quot;netneutrality&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Net_Emoji_Evergreen\/Net_Emoji_Evergreen.png&quot;,&quot;primedayshow21&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PrimeDayShow21_v2\/PrimeDayShow21_v2.png&quot;,&quot;sansaucunremords&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TomClancysWithoutRemorse_2021\/TomClancysWithoutRemorse_2021.png&quot;,&quot;asianamericanpacificislanderheritagemonth&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AHM_RepresentAsian_2021\/AHM_RepresentAsian_2021.png&quot;,&quot;koollaweyh&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MatKool_2021\/MatKool_2021.png&quot;,&quot;climatepledgesignatory&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Amazon_ClimatePledge_2021\/Amazon_ClimatePledge_2021.png&quot;,&quot;leaveitallonthefloor&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Legendary_S2_HBOMax_2021\/Legendary_S2_HBOMax_2021.png&quot;,&quot;ace&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KpopACE_June_2021\/KpopACE_June_2021.png&quot;,&quot;ຢູ່ເຮືອນເດີ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;gomad&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LEC_EM_2021_MADWIN\/LEC_EM_2021_MADWIN.png&quot;,&quot;เปลี่ยนโลกเป็นสีส้ม&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;utorrent&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JustinSuntron_2021_ext\/JustinSuntron_2021_ext.png&quot;,&quot;点亮橙色&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;fastandfurious&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FastFurious9_April_2021\/FastFurious9_April_2021.png&quot;,&quot;twitterflightschool&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterFlightSchool_2021_22\/TwitterFlightSchool_2021_22.png&quot;,&quot;lucalefilm&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Luca_2021\/Disney_PixarLuca_Luca_2021.png&quot;,&quot;eways&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RenaulteWays_2_2021\/RenaulteWays_2_2021.png&quot;,&quot;secretdelacaramilk&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CaramilkSecret_May_2021\/CaramilkSecret_May_2021.png&quot;,&quot;kcgt2021&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YugiohYusei_May2021\/YugiohYusei_May2021.png&quot;,&quot;loona&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KpopVIT_LOONA_June_2021\/KpopVIT_LOONA_June_2021.png&quot;,&quot;dionneontour&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Dionne_Warwick_2021_V2\/Dionne_Warwick_2021_V2.png&quot;,&quot;teamcryptocom&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CryptocomCimate_2021_v2\/CryptocomCimate_2021_v2.png&quot;,&quot;guardiánrojo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_RedGuardian_2021\/Disney_BlackWidow_RedGuardian_2021.png&quot;,&quot;withoutremorse&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TomClancysWithoutRemorse_2021\/TomClancysWithoutRemorse_2021.png&quot;,&quot;seattlesurge&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CDL_Team_2021_SEA\/CDL_Team_2021_SEA.png&quot;,&quot;armcherry&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ArmchairExpert_2021\/ArmchairExpert_2021.png&quot;,&quot;nevershbo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/thenevershbo_2021_May_v2\/thenevershbo_2021_May_v2.png&quot;,&quot;ಕೋವಿಡ್ಇಂಡಿಯಾಸಹಾಯ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Covid19India_2021\/Covid19India_2021.png&quot;,&quot;ヴァルコネ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ateam_valkyrie_connect_0601_2021\/Ateam_valkyrie_connect_0601_2021.png&quot;,&quot;theboldtypetv&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheBoldTypeTV_May_2021\/TheBoldTypeTV_May_2021.png&quot;,&quot;deokhautrang&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WearAMask_2020_2021_ext3\/WearAMask_2020_2021_ext3.png&quot;,&quot;vivetaville&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BPIBigTour_2021\/BPIBigTour_2021.png&quot;,&quot;eng&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Euro_UK_2021_ENG\/Euro_UK_2021_ENG.png&quot;,&quot;enjoytherivalry&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Heineken_starofthematch_May_2021\/Heineken_starofthematch_May_2021.png&quot;,&quot;ownthecrown&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WNBA_Teams_2021_NY1\/WNBA_Teams_2021_NY1.png&quot;,&quot;agoraéponto&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PontoFrio_Rebrand_2021\/PontoFrio_Rebrand_2021.png&quot;,&quot;porlah&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_HOU\/MLB_Teams_2021_HOU.png&quot;,&quot;iem&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/IEM_2021\/IEM_2021.png&quot;,&quot;мелина&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_Yelena_2021\/Disney_BlackWidow_Yelena_2021.png&quot;,&quot;قطاع_الترفيه&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/GEA_June_2021\/GEA_June_2021.png&quot;,&quot;thecube&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BeatTheCube_2021\/BeatTheCube_2021.png&quot;,&quot;альберто&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Alberto_2021\/Disney_PixarLuca_Alberto_2021.png&quot;,&quot;playnewworld&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NewWorldLaunch_2021\/NewWorldLaunch_2021.png&quot;,&quot;청춘리드&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YouthLead_2020\/YouthLead_2020.png&quot;,&quot;dewxnba&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MountainDewNBA_June_2021\/MountainDewNBA_June_2021.png&quot;,&quot;នៅផ្ទះ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;calldelterror1978&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_FearStreetTrilogy1978_2021\/Netflix_FearStreetTrilogy1978_2021.png&quot;,&quot;guardiãovermelho&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_RedGuardian_2021\/Disney_BlackWidow_RedGuardian_2021.png&quot;,&quot;seattlestorm&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WNBA_Teams_2021_SEA\/WNBA_Teams_2021_SEA.png&quot;,&quot;reptar&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Paramount_Rugrats_May_2021\/Paramount_Rugrats_May_2021.png&quot;,&quot;สวมหน้ากาก&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WearAMask_2020_2021_ext3\/WearAMask_2020_2021_ext3.png&quot;,&quot;starwarslaremesamala&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_TheBadBatch_Helmet_April_2021\/Disney_TheBadBatch_Helmet_April_2021.png&quot;,&quot;คิดก่อนคลิก&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2020_ThinkBeforeClicking\/MediaInformationLiteracyWeeks_2020_ThinkBeforeClicking.png&quot;,&quot;capitalonesthematch&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TurnerTheMatchQ22021\/TurnerTheMatchQ22021.png&quot;,&quot;canfessional&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Poise_May_2021\/Poise_May_2021.png&quot;,&quot;geekedweek&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/geekedweeknetflix_2021\/geekedweeknetflix_2021.png&quot;,&quot;homeishere&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HomeIsHere_2021\/HomeIsHere_2021.png&quot;,&quot;perempuanberbangga&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterWomenTentpole_2021\/TwitterWomenTentpole_2021.png&quot;,&quot;sacramentoproud&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_2021_Teams_SacramentoProud\/NBA_2021_Teams_SacramentoProud.png&quot;,&quot;若者が主役&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YouthLead_2020\/YouthLead_2020.png&quot;,&quot;thunderup&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_2021_Teams_ThunderUp\/NBA_2021_Teams_ThunderUp.png&quot;,&quot;nysl&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CDL_Team_2021_NYS\/CDL_Team_2021_NYS.png&quot;,&quot;lokiniño&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_KidlLoki_2021\/Disney_LokiLaunch_KidlLoki_2021.png&quot;,&quot;最新作&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Luca_2021\/Disney_PixarLuca_Luca_2021.png&quot;,&quot;spanishdoors&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LizPhair_2021\/LizPhair_2021.png&quot;,&quot;brighterdaysarehere&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StarbucksCanadaSummer2021\/StarbucksCanadaSummer2021.png&quot;,&quot;nbatwitter&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBATwitter_2018_RefreshEmoji\/NBATwitter_2018_RefreshEmoji.png&quot;,&quot;whywomenkill&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ParamountWhyWomenKill_2021\/ParamountWhyWomenKill_2021.png&quot;,&quot;sistasonbet&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SistasOnBET_2021\/SistasOnBET_2021.png&quot;,&quot;sourpatchmystery&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SourPatchMystery_May_2021\/SourPatchMystery_May_2021.png&quot;,&quot;somosfcd&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_FCDal\/MLS_2021_FCDal.png&quot;,&quot;stopkvindedrab&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020_add\/StopViolenceAgainstWomen_2020_add.png&quot;,&quot;temgentecomfome&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/COVIDRelief_2021_Brazil\/COVIDRelief_2021_Brazil.png&quot;,&quot;мелинавостокофф&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_Melina_2021\/Disney_BlackWidow_Melina_2021.png&quot;,&quot;withwebull&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WeBull_May_2021_v2\/WeBull_May_2021_v2.png&quot;,&quot;aewdark&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/aewontnt_May_2021_add\/aewontnt_May_2021_add.png&quot;,&quot;thisisday6&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SpotifyxITZY_April_2021\/SpotifyxITZY_April_2021.png&quot;,&quot;زكاتك_تصلهم_بزكاتي&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Zakaty_May_2021\/Zakaty_May_2021.png&quot;,&quot;알렉세이쇼스타코프&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_RedGuardian_2021\/Disney_BlackWidow_RedGuardian_2021.png&quot;,&quot;roarwithsherni&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SherniOnPrime_2021\/SherniOnPrime_2021.png&quot;,&quot;wearamask&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WearAMask_2020_2021_ext3\/WearAMask_2020_2021_ext3.png&quot;,&quot;seventeen&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KpopVIT_SEVENTEEN_June_2021\/KpopVIT_SEVENTEEN_June_2021.png&quot;,&quot;piensaantesdedarclick&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2020_ThinkBeforeClicking\/MediaInformationLiteracyWeeks_2020_ThinkBeforeClicking.png&quot;,&quot;زكاتي&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Zakaty_May_2021\/Zakaty_May_2021.png&quot;,&quot;matkool&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MatKool_2021\/MatKool_2021.png&quot;,&quot;keepiton&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KeepItOn_InternetShutdown_2021\/KeepItOn_InternetShutdown_2021.png&quot;,&quot;애니_루카&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Luca_2021\/Disney_PixarLuca_Luca_2021.png&quot;,&quot;16दिन&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;youwantataste&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMaxGossipGirl_July_2021_Kiss\/HBOMaxGossipGirl_July_2021_Kiss.png&quot;,&quot;bobbyhybrid&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_SweetTooth_Gopher\/Netflix_SweetTooth_Gopher.png&quot;,&quot;poptarts&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PopTarts_June_2021\/PopTarts_June_2021.png&quot;,&quot;fast92020&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FastFurious9_April_2021\/FastFurious9_April_2021.png&quot;,&quot;cheetosarraiá&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CheetosBrasil_June_2021\/CheetosBrasil_June_2021.png&quot;,&quot;알베르토&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Alberto_2021\/Disney_PixarLuca_Alberto_2021.png&quot;,&quot;mettezunmasque&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WearAMask_2020_2021_ext3\/WearAMask_2020_2021_ext3.png&quot;,&quot;sundthjem&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;مسرحيات_العيد&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WorldTheatreDay_2021_AE_2\/WorldTheatreDay_2021_AE_2.png&quot;,&quot;intothewaves&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BlackDesert2021Summer\/BlackDesert2021Summer.png&quot;,&quot;楽天カード&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RakutenCard_May_2021_Flight3\/RakutenCard_May_2021_Flight3.png&quot;,&quot;armchairexpertpod&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ArmchairExpert_2021\/ArmchairExpert_2021.png&quot;,&quot;bancoagrícola&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BancolombiaNewHeart_April_2021\/BancolombiaNewHeart_April_2021.png&quot;,&quot;g2win&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LEC_EM_2021_G2WIN\/LEC_EM_2021_G2WIN.png&quot;,&quot;silenciobruno&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Alberto_2021\/Disney_PixarLuca_Alberto_2021.png&quot;,&quot;weareportadelaide&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AFL_2021_weareportadelaide\/AFL_2021_weareportadelaide.png&quot;,&quot;seafoamszn&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WNBA_Teams_2021_NY2\/WNBA_Teams_2021_NY2.png&quot;,&quot;posevirtualball&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FX_Pose_April_2021\/FX_Pose_April_2021.png&quot;,&quot;tigernation&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_Feb_2021_Seoul\/OWL_Season4_Team_Feb_2021_Seoul.png&quot;,&quot;seizart&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MilkaSummerCampaign_2021\/MilkaSummerCampaign_2021.png&quot;,&quot;tvättadinahänder&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WashYourHands_2020_2021_ext3\/WashYourHands_2020_2021_ext3.png&quot;,&quot;juntossípodemos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HHS_WeCanDoThis_2021_add\/HHS_WeCanDoThis_2021_add.png&quot;,&quot;minidrums&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DrumstickCone2021\/DrumstickCone2021.png&quot;,&quot;백신접종완료&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;flightattendantonmax&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FlightAttendant_LA_May_2021\/FlightAttendant_LA_May_2021.png&quot;,&quot;snydercut&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SnyderCut_LA_May_2021\/SnyderCut_LA_May_2021.png&quot;,&quot;newworldmmo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NewWorldLaunch_2021\/NewWorldLaunch_2021.png&quot;,&quot;rus&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Euro_UK_2021_RUS\/Euro_UK_2021_RUS.png&quot;,&quot;itsmellsbadinhere&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMax_Friends_Turkey\/HBOMax_Friends_Turkey.png&quot;,&quot;mnight&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBC_OldMovie_May_2021_v2\/NBC_OldMovie_May_2021_v2.png&quot;,&quot;seouldynasty&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_Feb_2021_Seoul\/OWL_Season4_Team_Feb_2021_Seoul.png&quot;,&quot;世界红十字日&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WorldRedCrossDay_May_2021_add2\/WorldRedCrossDay_May_2021_add2.png&quot;,&quot;vijanawaongoza&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YouthLead_2020\/YouthLead_2020.png&quot;,&quot;론칭&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FinalgearKR2021KR\/FinalgearKR2021KR.png&quot;,&quot;اتحدث_بالمؤنث&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FemaleArabic_21\/FemaleArabic_21.png&quot;,&quot;yosoyleon&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Guerreros_MX_June_2021_YoSoyLeon\/Guerreros_MX_June_2021_YoSoyLeon.png&quot;,&quot;whodoyoucollect&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PaniniAmericaQ2_21\/PaniniAmericaQ2_21.png&quot;,&quot;saveahybrid&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NetflixSweetTooth2021_add\/NetflixSweetTooth2021_add.png&quot;,&quot;ロマサガrs&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Romasaga_25y_May_2021\/Romasaga_25y_May_2021.png&quot;,&quot;takewarning&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHLCarolinaPlayoffs2021\/NHLCarolinaPlayoffs2021.png&quot;,&quot;gopurple&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ALZ_2021\/ALZ_2021.png&quot;,&quot;nerevs&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_NER\/MLS_2021_NER.png&quot;,&quot;justiceforhan&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FastFurious9_April_2021\/FastFurious9_April_2021.png&quot;,&quot;todasycadauna&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EveryWoman_2020\/EveryWoman_2020.png&quot;,&quot;babaekami&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterWomenTentpole_2021\/TwitterWomenTentpole_2021.png&quot;,&quot;footballcan2041&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BSANTANDER_Footballcan2041_2021\/BSANTANDER_Footballcan2041_2021.png&quot;,&quot;puckerupnyc&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMaxGossipGirl_July_2021_Kiss\/HBOMaxGossipGirl_July_2021_Kiss.png&quot;,&quot;disneyparks&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_MickeyEars_2020_Flight5_V2\/DisneyParks_MickeyEars_2020_Flight5_V2.png&quot;,&quot;चुप्पीतोड़ो&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;naistenoikeudet&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;sistasseason3&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SistasOnBET_2021\/SistasOnBET_2021.png&quot;,&quot;caramilksecret&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CaramilkSecret_May_2021\/CaramilkSecret_May_2021.png&quot;,&quot;ouractionsmatter&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020_add\/OrangeTheWorld_2020_add.png&quot;,&quot;theletout&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Legendary_S2_HBOMax_2021\/Legendary_S2_HBOMax_2021.png&quot;,&quot;onyendunkendindinaetoeto&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YouthLead_2020\/YouthLead_2020.png&quot;,&quot;got_army_behind_us&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KpopVIT_BTS_June2021_BTSARMY\/KpopVIT_BTS_June2021_BTSARMY.png&quot;,&quot;nosqueremosvivas&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;闇を行け&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/blacksurgenightJapanHidden_2021\/blacksurgenightJapanHidden_2021.png&quot;,&quot;philaunite&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_2021_Teams_PhilaUnite_add\/NBA_2021_Teams_PhilaUnite_add.png&quot;,&quot;summerforever&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StarbucksCanadaSummer2021\/StarbucksCanadaSummer2021.png&quot;,&quot;chốngbạohành&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;generazioneuguaglianza&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;standwithus&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHLNashvillePlayoffs2021_2\/NHLNashvillePlayoffs2021_2.png&quot;,&quot;hitcfest&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/88RISING_May_2021\/88RISING_May_2021.png&quot;,&quot;disneyplusmalaysia&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyPlusHotstarMalaysia_2021\/DisneyPlusHotstarMalaysia_2021.png&quot;,&quot;eyesontheprize&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/STARZ_RuntheWorld_2021\/STARZ_RuntheWorld_2021.png&quot;,&quot;playdayone&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/XboxGamePass_2021\/XboxGamePass_2021.png&quot;,&quot;ミリしらニーアレプリカント&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NieRReplicant_April_2021_V2\/NieRReplicant_April_2021_V2.png&quot;,&quot;erstdenkendannklicken&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2020_ThinkBeforeClicking\/MediaInformationLiteracyWeeks_2020_ThinkBeforeClicking.png&quot;,&quot;ブラックウィドウ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_Symbol_2021_V2\/Disney_BlackWidow_Symbol_2021_V2.png&quot;,&quot;魔法覚醒&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HarryPotterNetease_Q2_2021\/HarryPotterNetease_Q2_2021.png&quot;,&quot;whoareyouridingwith&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BettyHBO_S2_2021\/BettyHBO_S2_2021.png&quot;,&quot;handleitall&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Poise_May_2021\/Poise_May_2021.png&quot;,&quot;ikahelangmundo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;talktomenice&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BeatTheCube_2021\/BeatTheCube_2021.png&quot;,&quot;先想再點擊&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2020_ThinkBeforeClicking\/MediaInformationLiteracyWeeks_2020_ThinkBeforeClicking.png&quot;,&quot;twitterforgood&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterForGood_Refresh_2021\/TwitterForGood_Refresh_2021.png&quot;,&quot;fearstreet1978&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_FearStreetTrilogy1978_2021\/Netflix_FearStreetTrilogy1978_2021.png&quot;,&quot;successanywhere&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SFWT_successanywhere_2021\/SFWT_successanywhere_2021.png&quot;,&quot;bitcointurkiye&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/btcturk_May_2021\/btcturk_May_2021.png&quot;,&quot;lrr&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CDL_Team_2021_LON\/CDL_Team_2021_LON.png&quot;,&quot;dkwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LcK_2021_Teams_DK\/LcK_2021_Teams_DK.png&quot;,&quot;loswhitesox&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_CHW\/MLB_Teams_2021_CHW.png&quot;,&quot;इंटरनेटबंदी&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KeepItOn_InternetShutdown_2021\/KeepItOn_InternetShutdown_2021.png&quot;,&quot;watchuswingit&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WatchUsWingIt_TwitterParents_2020\/WatchUsWingIt_TwitterParents_2020.png&quot;,&quot;lafc&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_LAFC\/MLS_2021_LAFC.png&quot;,&quot;lovetohearit&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LoveToSeeIt_2021\/LoveToSeeIt_2021.png&quot;,&quot;bloccointernet&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KeepItOn_InternetShutdown_2021\/KeepItOn_InternetShutdown_2021.png&quot;,&quot;ラグオリ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RagnarokOrigin_June_2021\/RagnarokOrigin_June_2021.png&quot;,&quot;starofthematch&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Heineken_starofthematch_May_2021\/Heineken_starofthematch_May_2021.png&quot;,&quot;lyriq&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Cadillac_LYRIQ_Phase1_April_2021\/Cadillac_LYRIQ_Phase1_April_2021.png&quot;,&quot;مستحقوها_أقرب_مما_تتصور&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Zakaty_May_2021\/Zakaty_May_2021.png&quot;,&quot;레드가디언&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_RedGuardian_2021\/Disney_BlackWidow_RedGuardian_2021.png&quot;,&quot;夏はカルピスで乾杯&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AsahiSoftDrinkCalpis02TanabataJapan2021\/AsahiSoftDrinkCalpis02TanabataJapan2021.png&quot;,&quot;loona_and_orbit&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KpopVIT_LOONA_June_2021\/KpopVIT_LOONA_June_2021.png&quot;,&quot;bigtimeinbigsky&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TurnerTheMatchQ22021\/TurnerTheMatchQ22021.png&quot;,&quot;disneywish&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_DisneyCruise_2021\/DisneyParks_DisneyCruise_2021.png&quot;,&quot;ヴァルキリーコネクト&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ateam_valkyrie_connect_0601_2021\/Ateam_valkyrie_connect_0601_2021.png&quot;,&quot;ryujin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KPOP_VIT_ITZY_April_2021_RYUJIN\/KPOP_VIT_ITZY_April_2021_RYUJIN.png&quot;,&quot;blastpremier&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BLASTPremier_Jan_2021\/BLASTPremier_Jan_2021.png&quot;,&quot;rsl&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_RSL\/MLS_2021_RSL.png&quot;,&quot;thenevers&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/thenevershbo_2021_May_v2\/thenevershbo_2021_May_v2.png&quot;,&quot;netflixgeekedweek&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/geekedweeknetflix_2021\/geekedweeknetflix_2021.png&quot;,&quot;黙れブルーノ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Alberto_2021\/Disney_PixarLuca_Alberto_2021.png&quot;,&quot;oldlefilm&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBC_OldMovie_May_2021_v2\/NBC_OldMovie_May_2021_v2.png&quot;,&quot;lovetobeit&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LoveToSeeIt_2021\/LoveToSeeIt_2021.png&quot;,&quot;legendarymax&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Legendary_S2_HBOMax_2021\/Legendary_S2_HBOMax_2021.png&quot;,&quot;mffl&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_2021_Teams_MFFL\/NBA_2021_Teams_MFFL.png&quot;,&quot;ヒロトラ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/heroaca_ui_JP_2021\/heroaca_ui_JP_2021.png&quot;,&quot;opticchitown&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CDL_Team_2021_CHI\/CDL_Team_2021_CHI.png&quot;,&quot;無限殺戮日&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheForeverPurge_2021_v2\/TheForeverPurge_2021_v2.png&quot;,&quot;tipsyforcinco&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JoseCuervo_TipsyForCinco_2021\/JoseCuervo_TipsyForCinco_2021.png&quot;,&quot;ngs&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PSO2NGS_JP_2021\/PSO2NGS_JP_2021.png&quot;,&quot;rokkr&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CDL_Team_2021_MINN\/CDL_Team_2021_MINN.png&quot;,&quot;detroitroots&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_DET\/MLB_Teams_2021_DET.png&quot;,&quot;メリーナ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_Melina_2021\/Disney_BlackWidow_Melina_2021.png&quot;,&quot;maafpro&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MAAF_70thBirthday_2021_2\/MAAF_70thBirthday_2021_2.png&quot;,&quot;funnelcakefrappuccino&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StarbucksCanadaSummer2021\/StarbucksCanadaSummer2021.png&quot;,&quot;dewchasethecrown&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MountainDewNBA_June_2021\/MountainDewNBA_June_2021.png&quot;,&quot;youjuststartedabook&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YouJustStartedABook_May_2021_v2\/YouJustStartedABook_May_2021_v2.png&quot;,&quot;isles&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHL_2021_Teams_Isles\/NHL_2021_Teams_Isles.png&quot;,&quot;gamedayhappens&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MaddenNFL22\/MaddenNFL22.png&quot;,&quot;thotyssey&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ZolaMovie_2021\/ZolaMovie_2021.png&quot;,&quot;красныйстраж&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_RedGuardian_2021\/Disney_BlackWidow_RedGuardian_2021.png&quot;,&quot;nosgestescomptent&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;نحن_نساء&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterWomenTentpole_2021\/TwitterWomenTentpole_2021.png&quot;,&quot;bidibidibombom&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SelenaNetflix_2021\/SelenaNetflix_2021.png&quot;,&quot;internetblockade&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KeepItOn_InternetShutdown_2021\/KeepItOn_InternetShutdown_2021.png&quot;,&quot;cuentaatrásloki&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_Miss_Minutes_2021\/Disney_LokiLaunch_Miss_Minutes_2021.png&quot;,&quot;viejospelicula&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBC_OldMovie_May_2021_v2\/NBC_OldMovie_May_2021_v2.png&quot;,&quot;കോവിഡ്19ഇന്ത്യസഹായം&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Covid19India_2021\/Covid19India_2021.png&quot;,&quot;gengwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LcK_2021_Teams_GenG\/LcK_2021_Teams_GenG.png&quot;,&quot;アークナイツ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Yostar_ArknightsStaff_April_2021\/Yostar_ArknightsStaff_April_2021.png&quot;,&quot;shadowandbone&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_ShadowandBone_April_2021\/Netflix_ShadowandBone_April_2021.png&quot;,&quot;hitmanswife&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HitmansWifesBodyguard_2021_SamSalma_\/HitmansWifesBodyguard_2021_SamSalma_.png&quot;,&quot;usaeltapabocas&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WearAMask_2020_2021_ext3\/WearAMask_2020_2021_ext3.png&quot;,&quot;noceiling&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WNBA_Teams_2021_CHI\/WNBA_Teams_2021_CHI.png&quot;,&quot;ドラゴンボールレジェンズ3周年&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MyDBLegends_May_2021\/MyDBLegends_May_2021.png&quot;,&quot;ponto&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PontoFrio_Rebrand_2021\/PontoFrio_Rebrand_2021.png&quot;,&quot;covidindiasos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Covid19India_2021\/Covid19India_2021.png&quot;,&quot;xboxminifridge&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/XboxMiniFridge_2021\/XboxMiniFridge_2021.png&quot;,&quot;wasjehanden&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WashYourHands_2020_2021_ext3\/WashYourHands_2020_2021_ext3.png&quot;,&quot;hofpolog&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Polo_G_Album_2021\/Polo_G_Album_2021.png&quot;,&quot;キリンチャレンジカップ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KIRINChallengeCupJapan2021\/KIRINChallengeCupJapan2021.png&quot;,&quot;pixaralbertosg&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Alberto_2021\/Disney_PixarLuca_Alberto_2021.png&quot;,&quot;sgf2021&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/summergamefest_May_2021\/summergamefest_May_2021.png&quot;,&quot;opoderosochefinho2&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BossBaby2_July_2021\/BossBaby2_July_2021.png&quot;,&quot;californiaalmonds&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Almonds_2021\/Almonds_2021.png&quot;,&quot;lavalemani&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WashYourHands_2020_2021_ext3\/WashYourHands_2020_2021_ext3.png&quot;,&quot;myxawards&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MYXAwards2021\/MYXAwards2021.png&quot;,&quot;رحلة_ابداعية&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/GEA_June_2021\/GEA_June_2021.png&quot;,&quot;कोविड१९भारतसहाय&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Covid19India_2021\/Covid19India_2021.png&quot;,&quot;todaslasmujeres&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EveryWoman_2020\/EveryWoman_2020.png&quot;,&quot;むむっ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RakutenCard_May_2021_Flight3\/RakutenCard_May_2021_Flight3.png&quot;,&quot;fearlesstaylorsversion&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TSFearless2021\/TSFearless2021.png&quot;,&quot;nnevvy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MilkTeaAlliance_2021\/MilkTeaAlliance_2021.png&quot;,&quot;masketragen&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WearAMask_2020_2021_ext3\/WearAMask_2020_2021_ext3.png&quot;,&quot;mountaindewrise&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MountainDewRise_April_2021\/MountainDewRise_April_2021.png&quot;,&quot;24時間短冊&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/2021StarFestivalTanabata\/2021StarFestivalTanabata.png&quot;,&quot;一緒に宴をするなら&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JP_ONEPIECE_trecru_2021\/JP_ONEPIECE_trecru_2021.png&quot;,&quot;stopaapihate&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StandForAsians_2021\/StandForAsians_2021.png&quot;,&quot;matkoolmatkoolkawanku&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MatKool_2021\/MatKool_2021.png&quot;,&quot;paralympics&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Paralympics_2021\/Paralympics_2021.png&quot;,&quot;tronnetwork&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TRON_Coin_Feb_2021_ext\/TRON_Coin_Feb_2021_ext.png&quot;,&quot;findnewroutes&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/USPSSpring2021\/USPSSpring2021.png&quot;,&quot;trailheadx&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SalesforceTrailhead2021\/SalesforceTrailhead2021.png&quot;,&quot;matkoolmatkool&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MatKool_2021\/MatKool_2021.png&quot;,&quot;lhhatl&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/VH1LHHAtlanta_2021\/VH1LHHAtlanta_2021.png&quot;,&quot;디즈니픽사_루카&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Luca_2021\/Disney_PixarLuca_Luca_2021.png&quot;,&quot;io2021&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/GoogleIO2021\/GoogleIO2021.png&quot;,&quot;cruelsummer&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Freeform_CruelSummer_2021\/Freeform_CruelSummer_2021.png&quot;,&quot;เราคือ15&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WeThe15_2021\/WeThe15_2021.png&quot;,&quot;letsgoliquid&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCS_Jan_2021_TLWIN\/LCS_Jan_2021_TLWIN.png&quot;,&quot;siestakeymtv&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MTV_April_2021\/MTV_April_2021.png&quot;,&quot;pikirsebelumklik&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2020_ThinkBeforeClicking\/MediaInformationLiteracyWeeks_2020_ThinkBeforeClicking.png&quot;,&quot;シェアする前に考えよう&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2020_ThinkBeforeSharing\/MediaInformationLiteracyWeeks_2020_ThinkBeforeSharing.png&quot;,&quot;personajeskelloggs&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KelloggsMasterBrandCercaDeTi_2021_V3\/KelloggsMasterBrandCercaDeTi_2021_V3.png&quot;,&quot;híbridobúho&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_SweetTooth_Owl\/Netflix_SweetTooth_Owl.png&quot;,&quot;ditonakami&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DITO_May_2021_ext\/DITO_May_2021_ext.png&quot;,&quot;armchairexpertpodcast&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ArmchairExpert_2021\/ArmchairExpert_2021.png&quot;,&quot;마블스튜디오블랙위도우&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_Symbol_2021_V2\/Disney_BlackWidow_Symbol_2021_V2.png&quot;,&quot;apartment20&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMax_Friends_Frame\/HBOMax_Friends_Frame.png&quot;,&quot;holdmymilk&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MilkPEP_May_2021\/MilkPEP_May_2021.png&quot;,&quot;fccincy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_FCCin\/MLS_2021_FCCin.png&quot;,&quot;olemmenaisia&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterWomenTentpole_2021\/TwitterWomenTentpole_2021.png&quot;,&quot;taylorswift&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TSRed2021\/TSRed2021.png&quot;,&quot;କୋଭିଡ୧୯ଭାରତସେବା&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Covid19India_2021\/Covid19India_2021.png&quot;,&quot;dracarys&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HouseoftheDragonHBO_2021\/HouseoftheDragonHBO_2021.png&quot;,&quot;burnblue&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_Feb_2021_Dallas\/OWL_Season4_Team_Feb_2021_Dallas.png&quot;,&quot;sansunbruit2&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AQuietPlace_P2_2021\/AQuietPlace_P2_2021.png&quot;,&quot;트와이스&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Kpop_VIT_TWICE_June_2021\/Kpop_VIT_TWICE_June_2021.png&quot;,&quot;whitespike&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PrimeVideoIndiaTomorrowWar_2021\/PrimeVideoIndiaTomorrowWar_2021.png&quot;,&quot;findyourstar&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/enstars_music6yearsanniversary_2021\/enstars_music6yearsanniversary_2021.png&quot;,&quot;protectblacktranswomen&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BlackTransLivesMatter_2020\/BlackTransLivesMatter_2020.png&quot;,&quot;redbull3x&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RedBull_GIVESYOUWINGS_2021_V2\/RedBull_GIVESYOUWINGS_2021_V2.png&quot;,&quot;kebaikanaqua&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KebaikanAqua_April_2021\/KebaikanAqua_April_2021.png&quot;,&quot;egready&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCS_Jan_2021_EGWIN\/LCS_Jan_2021_EGWIN.png&quot;,&quot;thehobby&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PaniniAmericaQ2_21\/PaniniAmericaQ2_21.png&quot;,&quot;幻影戦争&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WOTV_JP_2021_April\/WOTV_JP_2021_April.png&quot;,&quot;henerasyongpantaypantay&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;うちのカルピスつくろう&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AsahiSoftDrinkCalpis02TanabataJapan2021\/AsahiSoftDrinkCalpis02TanabataJapan2021.png&quot;,&quot;viudanegra&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_Symbol_2021_V2\/Disney_BlackWidow_Symbol_2021_V2.png&quot;,&quot;aflgf&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AFL_2021\/AFL_2021.png&quot;,&quot;بوابة_الترفيه&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/GEA_June_2021\/GEA_June_2021.png&quot;,&quot;कोविड१९भारतसेवा&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Covid19India_2021\/Covid19India_2021.png&quot;,&quot;btlm&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BlackTransLivesMatter_2020\/BlackTransLivesMatter_2020.png&quot;,&quot;riseandgrind&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_OAK\/MLB_Teams_2021_OAK.png&quot;,&quot;r6latam&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RainbowSixProLeague_2021_R6LATAM\/RainbowSixProLeague_2021_R6LATAM.png&quot;,&quot;vacinado&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;pintaelmundodenaranja&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;obois10&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Davido10YearAnniversary_2021_1\/Davido10YearAnniversary_2021_1.png&quot;,&quot;aewdynamite&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/aewontnt_May_2021\/aewontnt_May_2021.png&quot;,&quot;everyonen&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_NSC\/MLS_2021_NSC.png&quot;,&quot;alinastarkovwonder&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_ShadowandBone_April_2021\/Netflix_ShadowandBone_April_2021.png&quot;,&quot;bethealpha&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AnimalKingdom_S5_Wolf\/AnimalKingdom_S5_Wolf.png&quot;,&quot;phillypower&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_Feb_2021_Philly\/OWL_Season4_Team_Feb_2021_Philly.png&quot;,&quot;ruadomedo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_FearStreetTrilogy_1994_2021\/Netflix_FearStreetTrilogy_1994_2021.png&quot;,&quot;penseantesdeclicar&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2020_ThinkBeforeClicking\/MediaInformationLiteracyWeeks_2020_ThinkBeforeClicking.png&quot;,&quot;theroadtof9&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FastFurious9_April_2021\/FastFurious9_April_2021.png&quot;,&quot;razónycorazónes&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BancolombiaNewHeart_April_2021\/BancolombiaNewHeart_April_2021.png&quot;,&quot;arrq&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NetflixARRQ_2021\/NetflixARRQ_2021.png&quot;,&quot;mi11xseries&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Mi11XSeries_IN_April_2021_v2\/Mi11XSeries_IN_April_2021_v2.png&quot;,&quot;fuelfighting&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_Feb_2021_Dallas\/OWL_Season4_Team_Feb_2021_Dallas.png&quot;,&quot;disneyplushotstarmalaysia&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyPlusHotstarMalaysia_2021\/DisneyPlusHotstarMalaysia_2021.png&quot;,&quot;dlb&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bastille_June_2021\/Bastille_June_2021.png&quot;,&quot;fearstreet1994&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_FearStreetTrilogy_1994_2021\/Netflix_FearStreetTrilogy_1994_2021.png&quot;,&quot;wewantusalive&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;twitterignite&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterIgnite_2021\/TwitterIgnite_2021.png&quot;,&quot;podcastsmexico&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PodcastDiscoveryLATAM_2021\/PodcastDiscoveryLATAM_2021.png&quot;,&quot;thechi&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Showtime_Q2_21_v2\/Showtime_Q2_21_v2.png&quot;,&quot;countit&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WNBA_2021Season_25thAnniversary_2\/WNBA_2021Season_25thAnniversary_2.png&quot;,&quot;shadowandbonenetflix&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_ShadowandBone_April_2021\/Netflix_ShadowandBone_April_2021.png&quot;,&quot;mightyminidrums&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DrumstickCone2021\/DrumstickCone2021.png&quot;,&quot;hackshbomax&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Hacks_HBOMax_April_2021_v3\/Hacks_HBOMax_April_2021_v3.png&quot;,&quot;vacciné&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;grindcity&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_2021_Teams_GrindCity\/NBA_2021_Teams_GrindCity.png&quot;,&quot;jdscotland&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JDXSCOTLAND_2021\/JDXSCOTLAND_2021.png&quot;,&quot;हममहिलाएँहैं&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterWomenTentpole_2021\/TwitterWomenTentpole_2021.png&quot;,&quot;三ツ矢夏まつり&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AsahiSoftDrinkmitsuyasummercider2_Japan_2021\/AsahiSoftDrinkmitsuyasummercider2_Japan_2021.png&quot;,&quot;キリチャレの日&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KIRINChallengeCupJapan2021\/KIRINChallengeCupJapan2021.png&quot;,&quot;いきなりですが&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RakutenCard_May_2021_Flight3\/RakutenCard_May_2021_Flight3.png&quot;,&quot;tapmonayan&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Foodpanda7thAnniversary_2021\/Foodpanda7thAnniversary_2021.png&quot;,&quot;lads5aside&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ladbrokes5ASide_May_2021\/Ladbrokes5ASide_May_2021.png&quot;,&quot;bettermistakes&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bebe_Rexha_2021\/Bebe_Rexha_2021.png&quot;,&quot;mixballantines&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ballantinesbr_June_2021\/ballantinesbr_June_2021.png&quot;,&quot;thepurgemovie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheForeverPurge_2021\/TheForeverPurge_2021.png&quot;,&quot;tothestars&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LEC_EM_2021_ASTWIN\/LEC_EM_2021_ASTWIN.png&quot;,&quot;boatxshikhardhawan&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BOAT_IPL_2021_v2\/BOAT_IPL_2021_v2.png&quot;,&quot;에스에프나인&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Kpop_VIT_SF9_June_2021\/Kpop_VIT_SF9_June_2021.png&quot;,&quot;skwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LEC_EM_2021_SKWIN\/LEC_EM_2021_SKWIN.png&quot;,&quot;ahm&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AHM_RepresentAsian_2021\/AHM_RepresentAsian_2021.png&quot;,&quot;f9&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FastFurious9_April_2021\/FastFurious9_April_2021.png&quot;,&quot;chúngtôilàphụnữ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterWomenTentpole_2021\/TwitterWomenTentpole_2021.png&quot;,&quot;juansoto&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLBHRDerby2021-WAS\/MLBHRDerby2021-WAS.png&quot;,&quot;16tage&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;世代平等&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;mobius&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_Mobius_2021\/Disney_LokiLaunch_Mobius_2021.png&quot;,&quot;oneburningquestion&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Hulu_THT_S4_2021\/Hulu_THT_S4_2021.png&quot;,&quot;unjefeenpañales2&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BossBaby2_July_2021\/BossBaby2_July_2021.png&quot;,&quot;ioniq5&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Hyundai_ZeroEmission_FR_2021\/Hyundai_ZeroEmission_FR_2021.png&quot;,&quot;ひとつぶの大秘宝&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Meijinutschoco_2021\/Meijinutschoco_2021.png&quot;,&quot;restateacasa&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;있지&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KPOP_VIT_ITZY_April_2021\/KPOP_VIT_ITZY_April_2021.png&quot;,&quot;våldmotkvinnor&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;zilliqafootballstars&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Zilliqa_April_2021\/Zilliqa_April_2021.png&quot;,&quot;blackwidow&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_Symbol_2021_V2\/Disney_BlackWidow_Symbol_2021_V2.png&quot;,&quot;beberexha&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bebe_Rexha_2021\/Bebe_Rexha_2021.png&quot;,&quot;electricvehicules&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RenaulteWays_2_2021\/RenaulteWays_2_2021.png&quot;,&quot;해리포터깨어난마법&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HarryPotterNetease_Q2_2021\/HarryPotterNetease_Q2_2021.png&quot;,&quot;weareimt&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCS_Jan_2021_IMTWIN\/LCS_Jan_2021_IMTWIN.png&quot;,&quot;mccartney&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PaulMcCartney_April_2021\/PaulMcCartney_April_2021.png&quot;,&quot;fboyisland&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FBOYIsland_2021_fboyisland\/FBOYIsland_2021_fboyisland.png&quot;,&quot;io21&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/GoogleIO2021\/GoogleIO2021.png&quot;,&quot;lgrw&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHL_2021_Teams_LGRW\/NHL_2021_Teams_LGRW.png&quot;,&quot;トレクル7周年&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JP_ONEPIECE_trecru_2021\/JP_ONEPIECE_trecru_2021.png&quot;,&quot;maskenan&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WearAMask_2020_2021_ext3\/WearAMask_2020_2021_ext3.png&quot;,&quot;comeoutcharging&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL_2021_comeoutcharging\/NRL_2021_comeoutcharging.png&quot;,&quot;runtheworldstarz&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/STARZ_RuntheWorld_2021\/STARZ_RuntheWorld_2021.png&quot;,&quot;gotmilk&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MilkPEP_May_2021\/MilkPEP_May_2021.png&quot;,&quot;selenanetflix&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SelenaNetflix_2021\/SelenaNetflix_2021.png&quot;,&quot;snakeeyes&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SnakeEyesMovie2021\/SnakeEyesMovie2021.png&quot;,&quot;tron&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TRON_Coin_Feb_2021_ext\/TRON_Coin_Feb_2021_ext.png&quot;,&quot;dünyayıturuncuyaboya&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;f150lightning&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/F150Lightning_May_2021_2\/F150Lightning_May_2021_2.png&quot;,&quot;結論パルム&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MorinagaMilk_Parm_April_2021\/MorinagaMilk_Parm_April_2021.png&quot;,&quot;pledgesignatory&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Amazon_ClimatePledge_2021\/Amazon_ClimatePledge_2021.png&quot;,&quot;racetohybrid&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/webexmclaren_2021\/webexmclaren_2021.png&quot;,&quot;siemprehayconque&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Tostitos_MX_May_2021\/Tostitos_MX_May_2021.png&quot;,&quot;stlblues&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHL_2021_Teams_stlblues\/NHL_2021_Teams_stlblues.png&quot;,&quot;bnb&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BinanceTurns4_2021\/BinanceTurns4_2021.png&quot;,&quot;hitmansbodyguard&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HitmansWifesBodyguard_2021_SalmaRyan_\/HitmansWifesBodyguard_2021_SalmaRyan_.png&quot;,&quot;atobttr&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_CIN\/MLB_Teams_2021_CIN.png&quot;,&quot;mtvmiawtime&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PinkCarpetMTVMIAW_2021\/PinkCarpetMTVMIAW_2021.png&quot;,&quot;hopegrows&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ShebaHopeReef_2021\/ShebaHopeReef_2021.png&quot;,&quot;sicem&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Baylor2021ChampFullyear\/Baylor2021ChampFullyear.png&quot;,&quot;welcometotheordeal&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/STARZ_Blindspotting_May_2021\/STARZ_Blindspotting_May_2021.png&quot;,&quot;maskenitak&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WearAMask_2020_2021_ext3\/WearAMask_2020_2021_ext3.png&quot;,&quot;lgdwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LPL_2021_LGDWIN\/LPL_2021_LGDWIN.png&quot;,&quot;100win&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCS_Jan_2021_100T\/LCS_Jan_2021_100T.png&quot;,&quot;hungryformore&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_SD\/MLB_Teams_2021_SD.png&quot;,&quot;oldmovie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBC_OldMovie_May_2021_v2\/NBC_OldMovie_May_2021_v2.png&quot;,&quot;xbox&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/XboxLoveStory_2021\/XboxLoveStory_2021.png&quot;,&quot;imbackxoxo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMaxGossipGirl_July_2021_Phone\/HBOMaxGossipGirl_July_2021_Phone.png&quot;,&quot;wontbowdown&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_2021_Teams_WontBowDown\/NBA_2021_Teams_WontBowDown.png&quot;,&quot;ita&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Euro_UK_2021_ITA\/Euro_UK_2021_ITA.png&quot;,&quot;हाथकीसफाईमेंभलाई&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WashYourHands_2020_2021_ext3\/WashYourHands_2020_2021_ext3.png&quot;,&quot;badboysofmagic&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BigTricktruTV_2021\/BigTricktruTV_2021.png&quot;,&quot;ready_to_love&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KpopVIT_SEVENTEEN_June_2021\/KpopVIT_SEVENTEEN_June_2021.png&quot;,&quot;indianafever&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WNBA_Teams_2021_IND\/WNBA_Teams_2021_IND.png&quot;,&quot;valoaeiväkivaltaa&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;cooldownplaymore&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/XboxMiniFridge_2021\/XboxMiniFridge_2021.png&quot;,&quot;마스크쓰세요&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WearAMask_2020_2021_ext3\/WearAMask_2020_2021_ext3.png&quot;,&quot;gotiges&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AFL_2021_gotiges\/AFL_2021_gotiges.png&quot;,&quot;vamossj&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_SJE\/MLS_2021_SJE.png&quot;,&quot;naisiinkohdistuvaväkivalta&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;cloneforce99&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_TheBadBatch_Helmet_April_2021\/Disney_TheBadBatch_Helmet_April_2021.png&quot;,&quot;tupelotueleccion&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Dove_TuPeloTuEleccion_May_2021\/Dove_TuPeloTuEleccion_May_2021.png&quot;,&quot;konahybrid&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Hyundai_ZeroEmission_FR_2021\/Hyundai_ZeroEmission_FR_2021.png&quot;,&quot;jdsummer&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JDLoveIsland_2021\/JDLoveIsland_2021.png&quot;,&quot;vamosvancouver&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_VWFC\/MLS_2021_VWFC.png&quot;,&quot;私たちならでき&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HHS_WeCanDoThis_2021_add\/HHS_WeCanDoThis_2021_add.png&quot;,&quot;stc5g&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/stc_5G_Feb_2021_ext\/stc_5G_Feb_2021_ext.png&quot;,&quot;manatilisabahaymagligtasngbuhay&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;apihm&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AHM_RepresentAsian_2021\/AHM_RepresentAsian_2021.png&quot;,&quot;キミと走るアイドル&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/enstars_music6yearsanniversary_2021\/enstars_music6yearsanniversary_2021.png&quot;,&quot;upthemilk&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL_2021_UpTheMilk\/NRL_2021_UpTheMilk.png&quot;,&quot;missedme&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMaxGossipGirl_July_2021_Latte\/HBOMaxGossipGirl_July_2021_Latte.png&quot;,&quot;jumbojuichcape&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JumboJuichcapeSummerOfSports2021\/JumboJuichcapeSummerOfSports2021.png&quot;,&quot;rockies&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_COL\/MLB_Teams_2021_COL.png&quot;,&quot;집콕&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;thehillsnewbeginnings&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MTV_April_2021\/MTV_April_2021.png&quot;,&quot;hybrides&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NetflixSweetTooth2021\/NetflixSweetTooth2021.png&quot;,&quot;portarelamscherina&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WearAMask_2020_2021_ext3\/WearAMask_2020_2021_ext3.png&quot;,&quot;glassandahalf&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CadburyGlassAndAHalf_2021\/CadburyGlassAndAHalf_2021.png&quot;,&quot;xboxgamepass&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/XboxGamePass_2021\/XboxGamePass_2021.png&quot;,&quot;newweeknewmovie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_NewWeekNewMovie_2021\/Netflix_NewWeekNewMovie_2021.png&quot;,&quot;maghugasngkamay&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WashYourHands_2020_2021_ext3\/WashYourHands_2020_2021_ext3.png&quot;,&quot;bodegazos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BodegaAurrera_PlanVerano_2021\/BodegaAurrera_PlanVerano_2021.png&quot;,&quot;ridemcowboys&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL_2021_ridemcowboys\/NRL_2021_ridemcowboys.png&quot;,&quot;bleedgreen&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_2021_Teams_BleedGreen\/NBA_2021_Teams_BleedGreen.png&quot;,&quot;starwarsbadbatch&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_TheBadBatch_Helmet_April_2021\/Disney_TheBadBatch_Helmet_April_2021.png&quot;,&quot;maafpréférence&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MAAF_70thBirthday_2021_2\/MAAF_70thBirthday_2021_2.png&quot;,&quot;vacinada&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;allstars6&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ParamountRuPaulsDragRaceAllStars_July_2021\/ParamountRuPaulsDragRaceAllStars_July_2021.png&quot;,&quot;anidommonday&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HouseBrokenFOX_May_2021\/HouseBrokenFOX_May_2021.png&quot;,&quot;letsgonewarriors&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL_2021_LetsGoneWarriors\/NRL_2021_LetsGoneWarriors.png&quot;,&quot;filmeluca&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Luca_2021\/Disney_PixarLuca_Luca_2021.png&quot;,&quot;moonshot&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KPOP_NFlying_June_2021\/KPOP_NFlying_June_2021.png&quot;,&quot;filmluca&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Luca_2021\/Disney_PixarLuca_Luca_2021.png&quot;,&quot;haloinfinitemp&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/XboxOlympus_2021\/XboxOlympus_2021.png&quot;,&quot;helpmeleggo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Eggo_May_2021_2\/Eggo_May_2021_2.png&quot;,&quot;doubleornothing&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/aewontnt_May_2021\/aewontnt_May_2021.png&quot;,&quot;teamcanada&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CanadaOlympicParalympic_Tokyo\/CanadaOlympicParalympic_Tokyo.png&quot;,&quot;세계적십자의날&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WorldRedCrossDay_May_2021_add2\/WorldRedCrossDay_May_2021_add2.png&quot;,&quot;equipecanada&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CanadaOlympicParalympic_Tokyo\/CanadaOlympicParalympic_Tokyo.png&quot;,&quot;thetomorrowwaronprime&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PrimeVideoIndiaTomorrowWar_2021\/PrimeVideoIndiaTomorrowWar_2021.png&quot;,&quot;sahihai&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AMFIQ2IPL_2021_v2\/AMFIQ2IPL_2021_v2.png&quot;,&quot;pepsishow&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PepsiOpeningCeremony2021\/PepsiOpeningCeremony2021.png&quot;,&quot;intzarmy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/INTZ_June_2021\/INTZ_June_2021.png&quot;,&quot;فكر_قبل_المشاركة&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2020_ThinkBeforeSharing\/MediaInformationLiteracyWeeks_2020_ThinkBeforeSharing.png&quot;,&quot;wirbleibendrin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;monicaturkeyhead&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMax_Friends_Turkey\/HBOMax_Friends_Turkey.png&quot;,&quot;posefx&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FX_Pose_April_2021\/FX_Pose_April_2021.png&quot;,&quot;12horasparasobrevivirescapealafrontera&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheForeverPurge_2021_v2\/TheForeverPurge_2021_v2.png&quot;,&quot;คิดก่อนแชร์&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2020_ThinkBeforeSharing\/MediaInformationLiteracyWeeks_2020_ThinkBeforeSharing.png&quot;,&quot;fikirsebelumkongsi&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2020_ThinkBeforeSharing\/MediaInformationLiteracyWeeks_2020_ThinkBeforeSharing.png&quot;,&quot;drxwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LcK_2021_Teams_DRX\/LcK_2021_Teams_DRX.png&quot;,&quot;truetoatlanta&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_2021_Teams_TrueToAtlanta\/NBA_2021_Teams_TrueToAtlanta.png&quot;,&quot;ogsportsdrink&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MilkPEP_May_2021\/MilkPEP_May_2021.png&quot;,&quot;백야극광&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TencentAlchemyStarsJPLaunch_2021\/TencentAlchemyStarsJPLaunch_2021.png&quot;,&quot;टीकाकरण&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;makeit&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Kpop_VIT_2PM\/Kpop_VIT_2PM.png&quot;,&quot;ได้วัคซีนแล้ว&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;westjet&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WestJet_Summer_2021\/WestJet_Summer_2021.png&quot;,&quot;とびっきりのサイダーでございます&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AsahiSoftDrinkmitsuyasummercider2_Japan_2021\/AsahiSoftDrinkmitsuyasummercider2_Japan_2021.png&quot;,&quot;tdf2021&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TourdeFrance_2021\/TourdeFrance_2021.png&quot;,&quot;theugrailroad&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Amazon_UndergroundRailroad_2021\/Amazon_UndergroundRailroad_2021.png&quot;,&quot;écoutezmoiaussi&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;dcl&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_DisneyCruise_2021\/DisneyParks_DisneyCruise_2021.png&quot;,&quot;கோவிட்19இந்தியாஉதவி&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Covid19India_2021\/Covid19India_2021.png&quot;,&quot;oranyekandunia&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;سلامتك&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/GHC_SA_June_2021\/GHC_SA_June_2021.png&quot;,&quot;quédateencasa&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;spotifyxday6&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SpotifyxITZY_April_2021\/SpotifyxITZY_April_2021.png&quot;,&quot;timstwitterlisteningparty&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TimsTwitterListeningParty_2021_2022\/TimsTwitterListeningParty_2021_2022.png&quot;,&quot;nfltwitter&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NFLTwitter\/NFLTwitter.png&quot;,&quot;fordlightning&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/F150Lightning_May_2021_2\/F150Lightning_May_2021_2.png&quot;,&quot;ポルトロッソ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Portorosso_2021\/Disney_PixarLuca_Portorosso_2021.png&quot;,&quot;自慢好きロキ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_BoastfulLoki_2021\/Disney_LokiLaunch_BoastfulLoki_2021.png&quot;,&quot;aflwfinals&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AFL_2021_AFLW\/AFL_2021_AFLW.png&quot;,&quot;piensaantesdecompartir&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2020_ThinkBeforeSharing\/MediaInformationLiteracyWeeks_2020_ThinkBeforeSharing.png&quot;,&quot;pakaimasker&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WearAMask_2020_2021_ext3\/WearAMask_2020_2021_ext3.png&quot;,&quot;ฉีดวัคซีนแล้ว&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;ヒロトラ100万dl&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/heroaca_ui_JP_2021\/heroaca_ui_JP_2021.png&quot;,&quot;earthdayondisneyplus&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyNatGeo_SecretsoftheWhales_April_2021\/DisneyNatGeo_SecretsoftheWhales_April_2021.png&quot;,&quot;f3arthedeep&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CDL_Team_2021_FLO\/CDL_Team_2021_FLO.png&quot;,&quot;híbridoperro&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_SweetTooth_Dog\/Netflix_SweetTooth_Dog.png&quot;,&quot;maafaçondêtre&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MAAF_70thBirthday_2021_2\/MAAF_70thBirthday_2021_2.png&quot;,&quot;friendsreunion&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMax_Friends_Frame\/HBOMax_Friends_Frame.png&quot;,&quot;timslisteningparty&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TimsTwitterListeningParty_2021_2022\/TimsTwitterListeningParty_2021_2022.png&quot;,&quot;今日のアイスどうする問題&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MorinagaMilk_Parm_April_2021\/MorinagaMilk_Parm_April_2021.png&quot;,&quot;warcraft&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BurningCrusadeClassic_2021\/BurningCrusadeClassic_2021.png&quot;,&quot;quedateencasa&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;bijakberplastik&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KebaikanAqua_April_2021\/KebaikanAqua_April_2021.png&quot;,&quot;kaming15&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WeThe15_2021\/WeThe15_2021.png&quot;,&quot;blackhawks&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHL_2021_Teams_Blackhawks\/NHL_2021_Teams_Blackhawks.png&quot;,&quot;tupelotuelección&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Dove_TuPeloTuEleccion_May_2021\/Dove_TuPeloTuEleccion_May_2021.png&quot;,&quot;bossbaby&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BossBaby2_July_2021\/BossBaby2_July_2021.png&quot;,&quot;손을씻으세요&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WashYourHands_2020_2021_ext3\/WashYourHands_2020_2021_ext3.png&quot;,&quot;starwarsremesamala&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_TheBadBatch_Helmet_April_2021\/Disney_TheBadBatch_Helmet_April_2021.png&quot;,&quot;sjsharks&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHL_2021_Teams_SJSharks\/NHL_2021_Teams_SJSharks.png&quot;,&quot;watchhacks&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Hacks_HBOMax_April_2021_v3\/Hacks_HBOMax_April_2021_v3.png&quot;,&quot;toofan&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ToofaanOnPrime_July_2021\/ToofaanOnPrime_July_2021.png&quot;,&quot;tokyotogether&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AU_Olympic_2021\/AU_Olympic_2021.png&quot;,&quot;kidloki&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_KidlLoki_2021\/Disney_LokiLaunch_KidlLoki_2021.png&quot;,&quot;xbox20&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Xbox20thAnniversary_2021\/Xbox20thAnniversary_2021.png&quot;,&quot;btcturk&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/btcturk_May_2021\/btcturk_May_2021.png&quot;,&quot;señoritaminutos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_Miss_Minutes_2021\/Disney_LokiLaunch_Miss_Minutes_2021.png&quot;,&quot;knowyouloveme&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMaxGossipGirl_July_2021_Kiss\/HBOMaxGossipGirl_July_2021_Kiss.png&quot;,&quot;contagemregressivaparaloki&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_Miss_Minutes_2021\/Disney_LokiLaunch_Miss_Minutes_2021.png&quot;,&quot;슈니언버거&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/McD_KR_July_2021\/McD_KR_July_2021.png&quot;,&quot;forzahorizon5&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/XboxWoodstock_2021\/XboxWoodstock_2021.png&quot;,&quot;superfan&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JumboJuichcapeSummerOfSports2021\/JumboJuichcapeSummerOfSports2021.png&quot;,&quot;spotifyxitzy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SpotifyxITZY_April_2021\/SpotifyxITZY_April_2021.png&quot;,&quot;紅新月日&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WorldRedCrossDay_May_2021_add2\/WorldRedCrossDay_May_2021_add2.png&quot;,&quot;lokijacaré&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_AlligatorLoki_2021_v2\/Disney_LokiLaunch_AlligatorLoki_2021_v2.png&quot;,&quot;whatwouldpoptartsdo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PopTarts_June_2021\/PopTarts_June_2021.png&quot;,&quot;mlbts21&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLBTheSho_2021\/MLBTheSho_2021.png&quot;,&quot;sourpatchmysteryflavor&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SourPatchMystery_May_2021\/SourPatchMystery_May_2021.png&quot;,&quot;あの夏のルカ感想キャンペーン&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Luca_2021\/Disney_PixarLuca_Luca_2021.png&quot;,&quot;r6nal&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RainbowSixProLeague_2021_R6NAL\/RainbowSixProLeague_2021_R6NAL.png&quot;,&quot;morethanaheadline&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WaPo_WorldPressFreedom_2021\/WaPo_WorldPressFreedom_2021.png&quot;,&quot;chargeforward&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_2021_Guangzhou\/OWL_Season4_Team_2021_Guangzhou.png&quot;,&quot;whitespikes&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PrimeVideoIndiaTomorrowWar_2021\/PrimeVideoIndiaTomorrowWar_2021.png&quot;,&quot;skytown&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WNBA_Teams_2021_CHI\/WNBA_Teams_2021_CHI.png&quot;,&quot;サンq&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Qoo10_Q22021\/Qoo10_Q22021.png&quot;,&quot;thetomorrowwar&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AmazonStudios_TomorrowWar_2021\/AmazonStudios_TomorrowWar_2021.png&quot;,&quot;fboyfbye&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FBOYIsland_2021_fboyfbye\/FBOYIsland_2021_fboyfbye.png&quot;,&quot;デュエルリンクス&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YugiohYusei_May2021\/YugiohYusei_May2021.png&quot;,&quot;categoryislegendary&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Legendary_S2_HBOMax_2021\/Legendary_S2_HBOMax_2021.png&quot;,&quot;ilovemilka&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MilkaSummerCampaign_2021\/MilkaSummerCampaign_2021.png&quot;,&quot;paramountplus&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ParamountPlus_2021_ext\/ParamountPlus_2021_ext.png&quot;,&quot;marvelstudiosblackwidow&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_Symbol_2021_V2\/Disney_BlackWidow_Symbol_2021_V2.png&quot;,&quot;白夜極光リリース記念祭&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TencentAlchemyStarsJPLaunch_2021\/TencentAlchemyStarsJPLaunch_2021.png&quot;,&quot;miraitowa&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Olympic_Mascot_Emoji_EXT2\/Olympic_Mascot_Emoji_EXT2.png&quot;,&quot;ligadossaboreslays&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LaysUEFAChampionsLeague_2021\/LaysUEFAChampionsLeague_2021.png&quot;,&quot;equiporepsol&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RepsolMotogpMotorcycle_2021\/RepsolMotogpMotorcycle_2021.png&quot;,&quot;letsgo2kl&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LetsGo2KL_2021\/LetsGo2KL_2021.png&quot;,&quot;マイベストヒロトラ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/heroaca_ui_JP_2021\/heroaca_ui_JP_2021.png&quot;,&quot;laguerrededemain&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AmazonStudios_TomorrowWar_2021\/AmazonStudios_TomorrowWar_2021.png&quot;,&quot;rugrats&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Paramount_Rugrats_May_2021\/Paramount_Rugrats_May_2021.png&quot;,&quot;cochcymru&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JDXWALES_2021\/JDXWALES_2021.png&quot;,&quot;chestercheetos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ChesterCheetos_MX_2021\/ChesterCheetos_MX_2021.png&quot;,&quot;optic&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EsportsAllAccess_Jan_2021_GreenWall\/EsportsAllAccess_Jan_2021_GreenWall.png&quot;,&quot;thebachelorette&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheBachelorette_2021\/TheBachelorette_2021.png&quot;,&quot;yugyeom&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Kpop_Yugyeom_June_2021\/Kpop_Yugyeom_June_2021.png&quot;,&quot;risetogether&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_Feb_2021_TOR\/OWL_Season4_Team_Feb_2021_TOR.png&quot;,&quot;candiacedillardbassett&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bravo_RHOP_Q3_2021_CandiaceDillardBassett\/Bravo_RHOP_Q3_2021_CandiaceDillardBassett.png&quot;,&quot;letitreign&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_2021_ATL\/OWL_Season4_Team_2021_ATL.png&quot;,&quot;showyourstripes&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL_2021_ShowYourStripes\/NRL_2021_ShowYourStripes.png&quot;,&quot;restezalamaison&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;housebrokenfox&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HouseBrokenFOX_May_2021\/HouseBrokenFOX_May_2021.png&quot;,&quot;gostars&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHL_2021_Teams_GoStars\/NHL_2021_Teams_GoStars.png&quot;,&quot;마피아_inthemorning&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KPOP_VIT_ITZY_April_2021\/KPOP_VIT_ITZY_April_2021.png&quot;,&quot;mclarenxwebex&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/webexmclaren_2021\/webexmclaren_2021.png&quot;,&quot;thinkbeforesharing&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2020_ThinkBeforeSharing\/MediaInformationLiteracyWeeks_2020_ThinkBeforeSharing.png&quot;,&quot;verzuztalk&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Verzuz_2020_Flight4\/Verzuz_2020_Flight4.png&quot;,&quot;operationspkmysteryflavor&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SourPatchMystery_May_2021\/SourPatchMystery_May_2021.png&quot;,&quot;នៅផ្ទះសុខភាពល្អ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;sóvocê&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Spotify_Q2_21\/Spotify_Q2_21.png&quot;,&quot;maskeauf&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WearAMask_2020_2021_ext3\/WearAMask_2020_2021_ext3.png&quot;,&quot;vero&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Acer_aspirevero_2021\/Acer_aspirevero_2021.png&quot;,&quot;pigmovie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NeonRated_PigtheFilm_June2021\/NeonRated_PigtheFilm_June2021.png&quot;,&quot;jumpin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/XboxLoveStory_2021\/XboxLoveStory_2021.png&quot;,&quot;16天&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;spotifyonlyyou&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Spotify_Q2_21\/Spotify_Q2_21.png&quot;,&quot;اسے_آن_رکھیں&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KeepItOn_InternetShutdown_2021\/KeepItOn_InternetShutdown_2021.png&quot;,&quot;webexftw&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/webexmclaren_2021\/webexmclaren_2021.png&quot;,&quot;シルヴィ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_Sylvie_2021_V2\/Disney_LokiLaunch_Sylvie_2021_V2.png&quot;,&quot;상하이어니언버거&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/McD_KR_July_2021\/McD_KR_July_2021.png&quot;,&quot;nemumpassoemfalso&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NoSuddenMove_July_2021\/NoSuddenMove_July_2021.png&quot;,&quot;forceofnature&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_Feb_2021_Vancouver\/OWL_Season4_Team_Feb_2021_Vancouver.png&quot;,&quot;hollywoodstudios&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_MickeyEars_2020_Flight5_V2\/DisneyParks_MickeyEars_2020_Flight5_V2.png&quot;,&quot;eqonexexchange&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Eqonex_July_2021\/Eqonex_July_2021.png&quot;,&quot;badhabitsvideo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EdSheeran_June_UK_2021\/EdSheeran_June_UK_2021.png&quot;,&quot;kerriandalmonds&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Almonds_2021\/Almonds_2021.png&quot;,&quot;レンスレイヤー&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_Renslayer_2021\/Disney_LokiLaunch_Renslayer_2021.png&quot;,&quot;hockeytwitter&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HockeyTwitter_ON\/HockeyTwitter_ON.png&quot;,&quot;realcool&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Midea_RAC_May_2021\/Midea_RAC_May_2021.png&quot;,&quot;turnerandhoochondisneyplus&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyPlus_TurnerandHooch_Dog_2021\/DisneyPlus_TurnerandHooch_Dog_2021.png&quot;,&quot;アサルトリリィ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Assaultlily_LastBullet_Apr_2021\/Assaultlily_LastBullet_Apr_2021.png&quot;,&quot;vancouvertitans&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_Feb_2021_Vancouver\/OWL_Season4_Team_Feb_2021_Vancouver.png&quot;,&quot;theopen&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheOpen_July2021\/TheOpen_July2021.png&quot;,&quot;t1fighting&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCK_2021_Team_P1_T1\/LCK_2021_Team_P1_T1.png&quot;,&quot;umlugarsilencioso2&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AQuietPlace_P2_2021\/AQuietPlace_P2_2021.png&quot;,&quot;unleashthefury&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHLWSHPlayoffs2021\/NHLWSHPlayoffs2021.png&quot;,&quot;cleartheskies&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_Feb_2021_London\/OWL_Season4_Team_Feb_2021_London.png&quot;,&quot;qlder&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL_2021_QLDer\/NRL_2021_QLDer.png&quot;,&quot;binance&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BinanceTurns4_2021\/BinanceTurns4_2021.png&quot;,&quot;ニーア&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NieRReplicant_April_2021_V2\/NieRReplicant_April_2021_V2.png&quot;,&quot;spotify&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Spotify_Q2_21\/Spotify_Q2_21.png&quot;,&quot;flapanthers&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHL_2021_Teams_FLAPanthers\/NHL_2021_Teams_FLAPanthers.png&quot;,&quot;suenalacampana&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_PHI\/MLB_Teams_2021_PHI.png&quot;,&quot;منتخبنا_في_أمريكا&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/QatarAtGoldCup_2021_v2\/QatarAtGoldCup_2021_v2.png&quot;,&quot;chking&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BurgerKing_chking_2021\/BurgerKing_chking_2021.png&quot;,&quot;marcusrashfordbook&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MarcusRashfordBook_2021\/MarcusRashfordBook_2021.png&quot;,&quot;trc20usdt&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TRC20USDT_2021\/TRC20USDT_2021.png&quot;,&quot;lucamovie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Luca_2021\/Disney_PixarLuca_Luca_2021.png&quot;,&quot;asianheritagemonth&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AHM_RepresentAsian_2021\/AHM_RepresentAsian_2021.png&quot;,&quot;silenziobruno&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Alberto_2021\/Disney_PixarLuca_Alberto_2021.png&quot;,&quot;hopeunited&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HopeUnited_May_2021\/HopeUnited_May_2021.png&quot;,&quot;snakeeyesmovie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SnakeEyesMovie2021\/SnakeEyesMovie2021.png&quot;,&quot;akb15周年&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/17_AKB_May_2021\/17_AKB_May_2021.png&quot;,&quot;salvemosaloshibridos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NetflixSweetTooth2021_add\/NetflixSweetTooth2021_add.png&quot;,&quot;hazlogrande&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_HazloGrande\/MLB_Teams_2021_HazloGrande.png&quot;,&quot;tinytacos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JackintheBoxTinyTacos_2021\/JackintheBoxTinyTacos_2021.png&quot;,&quot;elguardiánrojo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_RedGuardian_2021\/Disney_BlackWidow_RedGuardian_2021.png&quot;,&quot;fboyorniceguy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FBOYIsland_2021_fboy\/FBOYIsland_2021_fboy.png&quot;,&quot;tesonline&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BethesdaElderScrollsBlackwood_2021\/BethesdaElderScrollsBlackwood_2021.png&quot;,&quot;edgetocloud&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HPEDiscover2021\/HPEDiscover2021.png&quot;,&quot;spotifylisteningiseverything&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Spotify_Q2_21\/Spotify_Q2_21.png&quot;,&quot;smartbts&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SmartXBTS_2021\/SmartXBTS_2021.png&quot;,&quot;лука&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Luca_2021\/Disney_PixarLuca_Luca_2021.png&quot;,&quot;lagradarepsol&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RepsolMotogpMotorcycle_2021\/RepsolMotogpMotorcycle_2021.png&quot;,&quot;venmoitforward&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Venmo_June_2021\/Venmo_June_2021.png&quot;,&quot;अबऔरहिंसानहीं&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;sistascircle&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SistasOnBET_2021\/SistasOnBET_2021.png&quot;,&quot;thebaddest10years&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Davido10YearAnniversary_2021_1\/Davido10YearAnniversary_2021_1.png&quot;,&quot;ruadomedo1994&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_FearStreetTrilogy_1994_2021\/Netflix_FearStreetTrilogy_1994_2021.png&quot;,&quot;teenqueens&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMaxGossipGirl_July_2021_CB\/HBOMaxGossipGirl_July_2021_CB.png&quot;,&quot;ugrr&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Amazon_UndergroundRailroad_2021\/Amazon_UndergroundRailroad_2021.png&quot;,&quot;matasanekejagoranci&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YouthLead_2020\/YouthLead_2020.png&quot;,&quot;femizid&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;penseavantdepartager&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2020_ThinkBeforeSharing\/MediaInformationLiteracyWeeks_2020_ThinkBeforeSharing.png&quot;,&quot;heforshe&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HeForShe_fixed\/HeForShe_fixed.png&quot;,&quot;lazeroemission&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Hyundai_ZeroEmission_FR_2021\/Hyundai_ZeroEmission_FR_2021.png&quot;,&quot;obsessedwe&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NaVi_Esports_2021_v2\/NaVi_Esports_2021_v2.png&quot;,&quot;вакцинировано&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;rushtogether&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCK_2021_Team_P1_HLE\/LCK_2021_Team_P1_HLE.png&quot;,&quot;နှာခေါင်းစည်းဝတ်ပါ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WearAMask_2020_2021_ext3\/WearAMask_2020_2021_ext3.png&quot;,&quot;לשטוףידיים&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WashYourHands_2020_2021_ext3\/WashYourHands_2020_2021_ext3.png&quot;,&quot;孤独な暗殺者&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_Symbol_2021_V2\/Disney_BlackWidow_Symbol_2021_V2.png&quot;,&quot;她力量&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterWomenTentpole_2021\/TwitterWomenTentpole_2021.png&quot;,&quot;rupaulsdragraceallstars&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ParamountRuPaulsDragRaceAllStars_July_2021\/ParamountRuPaulsDragRaceAllStars_July_2021.png&quot;,&quot;maketastenotwaste&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HellmannsUKNomadMay2021\/HellmannsUKNomadMay2021.png&quot;,&quot;သင့်လက်ကိုဆေးပါ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WashYourHands_2020_2021_ext3\/WashYourHands_2020_2021_ext3.png&quot;,&quot;اليومالعالميللصليب_الأحمر&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WorldRedCrossDay_May_2021_add2\/WorldRedCrossDay_May_2021_add2.png&quot;,&quot;祝みぃちゃん卒業&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/17_AKB_May_2021\/17_AKB_May_2021.png&quot;,&quot;somosmulheres&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterWomenTentpole_2021\/TwitterWomenTentpole_2021.png&quot;,&quot;msbuild2021&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MicrosoftBuild_2021\/MicrosoftBuild_2021.png&quot;,&quot;centenario2021&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Libertadores_July_2021\/Libertadores_July_2021.png&quot;,&quot;ニーアリィンカーネーション&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NieRReincarnationLaunch_May_2021\/NieRReincarnationLaunch_May_2021.png&quot;,&quot;gghbomax&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMaxGossipGirl_July_2021_XOXO\/HBOMaxGossipGirl_July_2021_XOXO.png&quot;,&quot;spotifypodcast&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PodcastDiscoveryLATAM_2021\/PodcastDiscoveryLATAM_2021.png&quot;,&quot;paulmccartney&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PaulMcCartney_April_2021\/PaulMcCartney_April_2021.png&quot;,&quot;fastfurious&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FastFurious9_April_2021\/FastFurious9_April_2021.png&quot;,&quot;에이스&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KpopACE_June_2021\/KpopACE_June_2021.png&quot;,&quot;callofdutyleague&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CallofDutyLeague2021\/CallofDutyLeague2021.png&quot;,&quot;yangmudamemimpin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YouthLead_2020\/YouthLead_2020.png&quot;,&quot;juventudlidera&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YouthLead_2020\/YouthLead_2020.png&quot;,&quot;worldofwarcraft&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BurningCrusadeClassic_2021\/BurningCrusadeClassic_2021.png&quot;,&quot;أسهل_طريقة_لدفع_الزكاة&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Zakaty_May_2021\/Zakaty_May_2021.png&quot;,&quot;наташароманофф&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_BWNatasha_again_2021\/Disney_BlackWidow_BWNatasha_again_2021.png&quot;,&quot;峯岸みなみ卒コン&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/17_AKB_May_2021\/17_AKB_May_2021.png&quot;,&quot;disneyplushotstarmy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyPlusHotstarMalaysia_2021\/DisneyPlusHotstarMalaysia_2021.png&quot;,&quot;eqonex&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Eqonex_July_2021\/Eqonex_July_2021.png&quot;,&quot;earthion&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Acer_aspirevero_2021\/Acer_aspirevero_2021.png&quot;,&quot;laguerradidomani&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AmazonStudios_TomorrowWar_2021\/AmazonStudios_TomorrowWar_2021.png&quot;,&quot;先輩とあんさんぶるミッション&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/enstars_music6yearsanniversary_2021\/enstars_music6yearsanniversary_2021.png&quot;,&quot;dreamog&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OGEsports_May_2021\/OGEsports_May_2021.png&quot;,&quot;orlandocity&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_OCSC\/MLS_2021_OCSC.png&quot;,&quot;cuentaregresivaparaloki&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_Miss_Minutes_2021\/Disney_LokiLaunch_Miss_Minutes_2021.png&quot;,&quot;vuelastl&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_STL\/MLB_Teams_2021_STL.png&quot;,&quot;oldfilm&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBC_OldMovie_May_2021_v2\/NBC_OldMovie_May_2021_v2.png&quot;,&quot;investwithwebull&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WeBull_May_2021_v2\/WeBull_May_2021_v2.png&quot;,&quot;adoptazombietiger&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ZombieTiger_UK_May_2021\/ZombieTiger_UK_May_2021.png&quot;,&quot;monstersatwork&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneuPlus_MonstersatWork_Helmet_2021\/DisneuPlus_MonstersatWork_Helmet_2021.png&quot;,&quot;believeatlanta&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_2021_Teams_TrueToAtlanta_add\/NBA_2021_Teams_TrueToAtlanta_add.png&quot;,&quot;mtndewrise&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MountainDewRise_April_2021\/MountainDewRise_April_2021.png&quot;,&quot;lokiclásico&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_ClassiclLoki_2021\/Disney_LokiLaunch_ClassiclLoki_2021.png&quot;,&quot;davefxx&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DaveFX_May_2021_v2\/DaveFX_May_2021_v2.png&quot;,&quot;conelsabornosejuega&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/GuardianTecate_July_2021\/GuardianTecate_July_2021.png&quot;,&quot;determnation&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHLMinnesotaPlayoffs2021\/NHLMinnesotaPlayoffs2021.png&quot;,&quot;rufflescheddarebacon&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RufflesCheddarEBacon_2021\/RufflesCheddarEBacon_2021.png&quot;,&quot;takecover&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WNBA_Teams_2021_SEA\/WNBA_Teams_2021_SEA.png&quot;,&quot;nbatopshotthis&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBATopShotThis_2021\/NBATopShotThis_2021.png&quot;,&quot;usemáscara&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WearAMask_2020_2021_ext3\/WearAMask_2020_2021_ext3.png&quot;,&quot;三ツ矢サイダー&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AsahiSoftDrinkmitsuyasummercider2_Japan_2021\/AsahiSoftDrinkmitsuyasummercider2_Japan_2021.png&quot;,&quot;washyourhands&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WashYourHands_2020_2021_ext3\/WashYourHands_2020_2021_ext3.png&quot;,&quot;owntheshow&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLBTheSho_2021\/MLBTheSho_2021.png&quot;,&quot;obeyme&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NTTSolmareObeyme_June_2021\/NTTSolmareObeyme_June_2021.png&quot;,&quot;natitude&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_WAS\/MLB_Teams_2021_WAS.png&quot;,&quot;mediasrojas&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_BOS\/MLB_Teams_2021_BOS.png&quot;,&quot;nrgontop&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EsportsAllAccess_Jan_2021_V2_NRG\/EsportsAllAccess_Jan_2021_V2_NRG.png&quot;,&quot;breakmyheartmyself&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bebe_Rexha_2021\/Bebe_Rexha_2021.png&quot;,&quot;híbridobobby&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_SweetTooth_Gopher\/Netflix_SweetTooth_Gopher.png&quot;,&quot;oneplusnordce&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OnePlusNord_2021\/OnePlusNord_2021.png&quot;,&quot;ficaemcasa&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;uncaged&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AFL_2021_Uncaged\/AFL_2021_Uncaged.png&quot;,&quot;силенциобруно&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Alberto_2021\/Disney_PixarLuca_Alberto_2021.png&quot;,&quot;vamosunited&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_DCU\/MLS_2021_DCU.png&quot;,&quot;spotifyxbts&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SpotifyxITZY_April_2021\/SpotifyxITZY_April_2021.png&quot;,&quot;jdloveisland&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JDLoveIsland_2021\/JDLoveIsland_2021.png&quot;,&quot;itslaughterwereafter&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneuPlus_MonstersatWork_Helmet_2021\/DisneuPlus_MonstersatWork_Helmet_2021.png&quot;,&quot;lgm&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_NYM\/MLB_Teams_2021_NYM.png&quot;,&quot;lucalapelícula&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Luca_2021\/Disney_PixarLuca_Luca_2021.png&quot;,&quot;draageenmondmasker&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WearAMask_2020_2021_ext3\/WearAMask_2020_2021_ext3.png&quot;,&quot;투피엠&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Kpop_VIT_2PM\/Kpop_VIT_2PM.png&quot;,&quot;den&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Euro_UK_2021_DEN\/Euro_UK_2021_DEN.png&quot;,&quot;16giorni&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;pighybrid&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_SweetTooth_Pig\/Netflix_SweetTooth_Pig.png&quot;,&quot;ibelievejeanette&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Freeform_CruelSummer_Jeanette_2021_\/Freeform_CruelSummer_Jeanette_2021_.png&quot;,&quot;xboxmoments&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Xbox20thAnniversary_2021\/Xbox20thAnniversary_2021.png&quot;,&quot;bornthisway10&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Lady_Gaga_Born_This_Way_Anniversary_GOLD_Emoji\/Lady_Gaga_Born_This_Way_Anniversary_GOLD_Emoji.png&quot;,&quot;ពណ៌ទឹកក្រូចពិភពលោក&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;nicholascage&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NeonRated_PigtheFilm_June2021\/NeonRated_PigtheFilm_June2021.png&quot;,&quot;紅十字日&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WorldRedCrossDay_May_2021_add2\/WorldRedCrossDay_May_2021_add2.png&quot;,&quot;stlfly&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_STL\/MLB_Teams_2021_STL.png&quot;,&quot;housebroken&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HouseBrokenFOX_May_2021\/HouseBrokenFOX_May_2021.png&quot;,&quot;doop&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_PU\/MLS_2021_PU.png&quot;,&quot;ロキまでのカウントダウン&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_Miss_Minutes_2021\/Disney_LokiLaunch_Miss_Minutes_2021.png&quot;,&quot;青年领导&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YouthLead_2020\/YouthLead_2020.png&quot;,&quot;knightup&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHLVGKPlayoffs2021\/NHLVGKPlayoffs2021.png&quot;,&quot;4aklondikeshake&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KlondikeMasterband_2021\/KlondikeMasterband_2021.png&quot;,&quot;スネークアイズ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SnakeEyesMovie2021\/SnakeEyesMovie2021.png&quot;,&quot;letsgopens&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHL_2021_Teams_LetsGoPens\/NHL_2021_Teams_LetsGoPens.png&quot;,&quot;indossatelamascherina&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WearAMask_2020_2021_ext3\/WearAMask_2020_2021_ext3.png&quot;,&quot;oneplusnord&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OnePlusNord_2021\/OnePlusNord_2021.png&quot;,&quot;キッドロキ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_KidlLoki_2021\/Disney_LokiLaunch_KidlLoki_2021.png&quot;,&quot;minifridge&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/XboxMiniFridge_2021\/XboxMiniFridge_2021.png&quot;,&quot;इंटरनेटबंद&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KeepItOn_InternetShutdown_2021\/KeepItOn_InternetShutdown_2021.png&quot;,&quot;shanghaidragons&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_2021_Shanghai\/OWL_Season4_Team_2021_Shanghai.png&quot;,&quot;threelions&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EnglandEuros_May_2021\/EnglandEuros_May_2021.png&quot;,&quot;losrockies&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_COL\/MLB_Teams_2021_COL.png&quot;,&quot;flytogether&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHL_2021_Teams_FlyTogether\/NHL_2021_Teams_FlyTogether.png&quot;,&quot;goleafsgo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHLTORPlayoffs2021_2\/NHLTORPlayoffs2021_2.png&quot;,&quot;fh5&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/XboxWoodstock_2021\/XboxWoodstock_2021.png&quot;,&quot;أتحدث_بالمؤنث&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FemaleArabic_21\/FemaleArabic_21.png&quot;,&quot;vamosninjas&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NiPGaming_Jan_2021\/NiPGaming_Jan_2021.png&quot;,&quot;missedmexoxo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMaxGossipGirl_July_2021_CB\/HBOMaxGossipGirl_July_2021_CB.png&quot;,&quot;magicawakened&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HarryPotterNetease_Q2_2021\/HarryPotterNetease_Q2_2021.png&quot;,&quot;aguerradoamanhã&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AmazonStudios_TomorrowWar_2021\/AmazonStudios_TomorrowWar_2021.png&quot;,&quot;白夜極光&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TencentAlchemyStarsJPLaunch_2021\/TencentAlchemyStarsJPLaunch_2021.png&quot;,&quot;mantenhanoar&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KeepItOn_InternetShutdown_2021\/KeepItOn_InternetShutdown_2021.png&quot;,&quot;thegoodfight&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheGoodFight_July_2021\/TheGoodFight_July_2021.png&quot;,&quot;imtwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCS_Jan_2021_IMTWIN\/LCS_Jan_2021_IMTWIN.png&quot;,&quot;eso&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BethesdaElderScrollsBlackwood_2021\/BethesdaElderScrollsBlackwood_2021.png&quot;,&quot;givesyouwings&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RedBull_GIVESYOUWINGS_2021_V2\/RedBull_GIVESYOUWINGS_2021_V2.png&quot;,&quot;stanleytweets&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StanleyCup_2021_add\/StanleyCup_2021_add.png&quot;,&quot;nationalcultureawards&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NationalCulturalAwardsFinalEvent_2021\/NationalCulturalAwardsFinalEvent_2021.png&quot;,&quot;forçaclone99&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_TheBadBatch_Helmet_April_2021\/Disney_TheBadBatch_Helmet_April_2021.png&quot;,&quot;bacheloretteabc&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheBachelorette_2021\/TheBachelorette_2021.png&quot;,&quot;drownthemout&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CDL_Team_2021_SEA\/CDL_Team_2021_SEA.png&quot;,&quot;restecheztoi&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;gorogue&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LEC_EM_2021_RGEWIN\/LEC_EM_2021_RGEWIN.png&quot;,&quot;thehills&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MTV_April_2021\/MTV_April_2021.png&quot;,&quot;canttameus&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WNBA_Teams_2021_MIN\/WNBA_Teams_2021_MIN.png&quot;,&quot;vamoskc&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_KC\/MLS_2021_KC.png&quot;,&quot;unlugarensilencio&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AQuietPlace_P2_2021\/AQuietPlace_P2_2021.png&quot;,&quot;عروض_حية&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EnjoySaudi_June2021\/EnjoySaudi_June2021.png&quot;,&quot;readytopanic&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AmazonStudios_Panic_2021\/AmazonStudios_Panic_2021.png&quot;,&quot;vaccinato&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;نوروز&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/nowruz2018_v4\/nowruz2018_v4.png&quot;,&quot;penseantesdecompartilhar&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2020_ThinkBeforeSharing\/MediaInformationLiteracyWeeks_2020_ThinkBeforeSharing.png&quot;,&quot;lagalaxy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_LAGalaxy\/MLS_2021_LAGalaxy.png&quot;,&quot;bringthemayhem&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_Feb_2021_Florida\/OWL_Season4_Team_Feb_2021_Florida.png&quot;,&quot;nhlbruins&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHL_2021_Teams_NHLBruins\/NHL_2021_Teams_NHLBruins.png&quot;,&quot;flywin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCS_Jan_2021_FLYWIN_v2\/LCS_Jan_2021_FLYWIN_v2.png&quot;,&quot;netflixgeeked&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/geekedweeknetflix_2021\/geekedweeknetflix_2021.png&quot;,&quot;blackhistorymonth&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BlackHistoryMonth\/BlackHistoryMonth.png&quot;,&quot;pixarlucasg&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Luca_2021\/Disney_PixarLuca_Luca_2021.png&quot;,&quot;thewhitelotus&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBO_TheWhiteLotus_2021\/HBO_TheWhiteLotus_2021.png&quot;,&quot;aapihm&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AHM_RepresentAsian_2021\/AHM_RepresentAsian_2021.png&quot;,&quot;pesekätesi&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WashYourHands_2020_2021_ext3\/WashYourHands_2020_2021_ext3.png&quot;,&quot;jeunesseenavant&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YouthLead_2020\/YouthLead_2020.png&quot;,&quot;theimpracticaljokers&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheImpracticalJokers_Julu_2021\/TheImpracticalJokers_Julu_2021.png&quot;,&quot;askverzuz&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Verzuz_2020_Flight4\/Verzuz_2020_Flight4.png&quot;,&quot;ioniq&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Hyundai_ZeroEmission_FR_2021\/Hyundai_ZeroEmission_FR_2021.png&quot;,&quot;wdw&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_MickeyEars_2020_Flight5_V2\/DisneyParks_MickeyEars_2020_Flight5_V2.png&quot;,&quot;nycfc&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_NYC_v2\/MLS_2021_NYC_v2.png&quot;,&quot;mccartneyiii&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PaulMcCartney_April_2021\/PaulMcCartney_April_2021.png&quot;,&quot;jagamethandhiram&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JagameThandhiramOnNetflix_2021\/JagameThandhiramOnNetflix_2021.png&quot;,&quot;jdxscotland&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JDXSCOTLAND_2021\/JDXSCOTLAND_2021.png&quot;,&quot;svt_ready_to_love&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KpopVIT_SEVENTEEN_June_2021\/KpopVIT_SEVENTEEN_June_2021.png&quot;,&quot;chengduzone&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_2021_CHENGDU\/OWL_Season4_Team_2021_CHENGDU.png&quot;,&quot;dreamcometruemoney&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CamelotTokyo_2021\/CamelotTokyo_2021.png&quot;,&quot;bitcoinledegistir&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/btcturk_May_2021\/btcturk_May_2021.png&quot;,&quot;ffacup&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FFACup_2021\/FFACup_2021.png&quot;,&quot;スペースプレイヤーズ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SpaceJam_2021\/SpaceJam_2021.png&quot;,&quot;contralasmaquinas&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_MitchellvsTheMachines_2021\/Netflix_MitchellvsTheMachines_2021.png&quot;,&quot;undergroundrailroad&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Amazon_UndergroundRailroad_2021\/Amazon_UndergroundRailroad_2021.png&quot;,&quot;세상을_주황빛으로&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;xlwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LEC_EM_2021_XLWIN_fix\/LEC_EM_2021_XLWIN_fix.png&quot;,&quot;vegasborn&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHL_2021_Teams_VegasBorn\/NHL_2021_Teams_VegasBorn.png&quot;,&quot;lalabanako&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;protectourelders&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StandForAsians_2021\/StandForAsians_2021.png&quot;,&quot;dito&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DITO_May_2021_ext\/DITO_May_2021_ext.png&quot;,&quot;foreverpurge&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheForeverPurge_2021\/TheForeverPurge_2021.png&quot;,&quot;justinsun&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TRON_Coin_Feb_2021_ext\/TRON_Coin_Feb_2021_ext.png&quot;,&quot;インターネット遮断&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KeepItOn_InternetShutdown_2021\/KeepItOn_InternetShutdown_2021.png&quot;,&quot;handmaidstale&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Hulu_THT_S4_2021\/Hulu_THT_S4_2021.png&quot;,&quot;monstersinc&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneuPlus_MonstersatWork_Helmet_2021\/DisneuPlus_MonstersatWork_Helmet_2021.png&quot;,&quot;snoh&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SnohAalegra_2021\/SnohAalegra_2021.png&quot;,&quot;oatmilkandnicesilk&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMaxGossipGirl_July_2021_Latte\/HBOMaxGossipGirl_July_2021_Latte.png&quot;,&quot;thethotyssey&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ZolaMovie_2021\/ZolaMovie_2021.png&quot;,&quot;conquerthemorning&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MountainDewRise_April_2021\/MountainDewRise_April_2021.png&quot;,&quot;winsathome&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ProjectSoul_June_2021\/ProjectSoul_June_2021.png&quot;,&quot;resetผิวใหม่ใน7วัน&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SkinsistaRESET_2021\/SkinsistaRESET_2021.png&quot;,&quot;大統領ロキ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_PresidentLoki_2021\/Disney_LokiLaunch_PresidentLoki_2021.png&quot;,&quot;metoo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MeToo_v3\/MeToo_v3.png&quot;,&quot;blackwood&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BethesdaElderScrollsBlackwood_2021\/BethesdaElderScrollsBlackwood_2021.png&quot;,&quot;qatarteam&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/QatarAtGoldCup_2021_v2\/QatarAtGoldCup_2021_v2.png&quot;,&quot;vacunate&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;انٹرنیٹ_شٹ_ڈاؤن&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KeepItOn_InternetShutdown_2021\/KeepItOn_InternetShutdown_2021.png&quot;,&quot;guesswho&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KPOP_VIT_ITZY_April_2021\/KPOP_VIT_ITZY_April_2021.png&quot;,&quot;resetantiaging&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SkinsistaRESET_2021\/SkinsistaRESET_2021.png&quot;,&quot;aew&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/aewontnt_May_2021\/aewontnt_May_2021.png&quot;,&quot;btc&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bitcoin_evergreen\/Bitcoin_evergreen.png&quot;,&quot;mitchellsvsmachines&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_MitchellvsTheMachines_2021\/Netflix_MitchellvsTheMachines_2021.png&quot;,&quot;hangzhouspark&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_Feb_2021_Hangzhou\/OWL_Season4_Team_Feb_2021_Hangzhou.png&quot;,&quot;あの夏のルカ夏待ちキャンペーン&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Portorosso_2021\/Disney_PixarLuca_Portorosso_2021.png&quot;,&quot;heinzcrowdsauce&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KraftHeinz_CrowdSauce_SG_2021\/KraftHeinz_CrowdSauce_SG_2021.png&quot;,&quot;nflying&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KPOP_NFlying_June_2021\/KPOP_NFlying_June_2021.png&quot;,&quot;cffc&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_CF\/MLS_2021_CF.png&quot;,&quot;higherpower&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Coldplay_May_2021\/Coldplay_May_2021.png&quot;,&quot;クリックする前に考えよう&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2020_ThinkBeforeClicking\/MediaInformationLiteracyWeeks_2020_ThinkBeforeClicking.png&quot;,&quot;mnightshyamalan&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBC_OldMovie_May_2021_v2\/NBC_OldMovie_May_2021_v2.png&quot;,&quot;turnerandhooch&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyPlus_TurnerandHooch_Dog_2021\/DisneyPlus_TurnerandHooch_Dog_2021.png&quot;,&quot;なななんと&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RakutenCard_May_2021_Flight3\/RakutenCard_May_2021_Flight3.png&quot;,&quot;wemetontwitter&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WeMetOnt_Emoji\/WeMetOnt_Emoji.png&quot;,&quot;mfsahihai&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AMFIQ2IPL_2021_v2\/AMFIQ2IPL_2021_v2.png&quot;,&quot;2021census&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StatCanCensus_2021\/StatCanCensus_2021.png&quot;,&quot;dirumahaja&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;híbridogopher&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_SweetTooth_Gopher\/Netflix_SweetTooth_Gopher.png&quot;,&quot;కోవిడ్౧౯ఇండియాసహాయం&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Covid19India_2021\/Covid19India_2021.png&quot;,&quot;ヴァルコネ最大300連無料ガチャ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ateam_valkyrie_connect_0601_2021\/Ateam_valkyrie_connect_0601_2021.png&quot;,&quot;wingsout&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_Feb_2021_LAValiant\/OWL_Season4_Team_Feb_2021_LAValiant.png&quot;,&quot;netzeroby2040&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Amazon_ClimatePledge_2021\/Amazon_ClimatePledge_2021.png&quot;,&quot;xboxandchill&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/XboxMiniFridge_2021\/XboxMiniFridge_2021.png&quot;,&quot;alcoholfree&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Kpop_VIT_TWICE_June_2021\/Kpop_VIT_TWICE_June_2021.png&quot;,&quot;lokiwednesdays&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_TVA_Jacket_Loki_2021_V2\/Disney_LokiLaunch_TVA_Jacket_Loki_2021_V2.png&quot;,&quot;pridefx&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PrideFX_2021\/PrideFX_2021.png&quot;,&quot;nobodylistenslikeyou&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Spotify_Q2_21\/Spotify_Q2_21.png&quot;,&quot;btw10&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Lady_Gaga_Born_This_Way_Anniversary_GOLD_Emoji\/Lady_Gaga_Born_This_Way_Anniversary_GOLD_Emoji.png&quot;,&quot;portalamascherina&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WearAMask_2020_2021_ext3\/WearAMask_2020_2021_ext3.png&quot;,&quot;nãoquerguerracomninguem&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RufflesCheddarEBacon_2021\/RufflesCheddarEBacon_2021.png&quot;,&quot;ปิดอินเทอร์เน็ต&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KeepItOn_InternetShutdown_2021\/KeepItOn_InternetShutdown_2021.png&quot;,&quot;sco&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Euro_UK_2021_SCO\/Euro_UK_2021_SCO.png&quot;,&quot;juegatelaconcheetos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ChesterCheetos_MX_2021\/ChesterCheetos_MX_2021.png&quot;,&quot;almondmode&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Almonds_2021\/Almonds_2021.png&quot;,&quot;youareachampion&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MarcusRashfordBook_2021\/MarcusRashfordBook_2021.png&quot;,&quot;آمن_بالبيت&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;bigbigsound&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AFL_2021_BigBigSound\/AFL_2021_BigBigSound.png&quot;,&quot;だがオレはレアだぜ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YugiohYusei_May2021\/YugiohYusei_May2021.png&quot;,&quot;قطعی_اینترنت&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KeepItOn_InternetShutdown_2021\/KeepItOn_InternetShutdown_2021.png&quot;,&quot;miércoleslokis&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_TVA_Jacket_Loki_2021_V2\/Disney_LokiLaunch_TVA_Jacket_Loki_2021_V2.png&quot;,&quot;届けてキリン&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KIRINChallengeCupJapan2021\/KIRINChallengeCupJapan2021.png&quot;,&quot;egwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCS_Jan_2021_EGWIN\/LCS_Jan_2021_EGWIN.png&quot;,&quot;каждаяженщина&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EveryWoman_2020\/EveryWoman_2020.png&quot;,&quot;奶茶联盟&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MilkTeaAlliance_2021\/MilkTeaAlliance_2021.png&quot;,&quot;polog&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Polo_G_Album_2021\/Polo_G_Album_2021.png&quot;,&quot;100thieves&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCS_Jan_2021_100T\/LCS_Jan_2021_100T.png&quot;,&quot;คุณเท่านั้น&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Spotify_Q2_21\/Spotify_Q2_21.png&quot;,&quot;pixarlucaid&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Luca_2021\/Disney_PixarLuca_Luca_2021.png&quot;,&quot;zolamovie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ZolaMovie_2021\/ZolaMovie_2021.png&quot;,&quot;함께이겨냅시다&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HHS_WeCanDoThis_2021_add\/HHS_WeCanDoThis_2021_add.png&quot;,&quot;明治ナッツチョコとワンピース&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Meijinutschoco_2021\/Meijinutschoco_2021.png&quot;,&quot;スターウォーズバッドバッチ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_TheBadBatch_Helmet_April_2021_add\/Disney_TheBadBatch_Helmet_April_2021_add.png&quot;,&quot;chaeryeong&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KPOP_VIT_ITZY_April_2021_CHAERYEONG\/KPOP_VIT_ITZY_April_2021_CHAERYEONG.png&quot;,&quot;gherboalbum25&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Gherbo_25_Album_Emoji_2021\/Gherbo_25_Album_Emoji_2021.png&quot;,&quot;cheetosdedosllenosdediversion&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ChesterCheetos_MX_2021\/ChesterCheetos_MX_2021.png&quot;,&quot;14juillet&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FranceBastilleDay2021\/FranceBastilleDay2021.png&quot;,&quot;태스크마스터&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_Taskmaster_2021\/Disney_BlackWidow_Taskmaster_2021.png&quot;,&quot;davefxonhulu&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DaveFX_May_2021_v2\/DaveFX_May_2021_v2.png&quot;,&quot;メビウス&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_Mobius_2021\/Disney_LokiLaunch_Mobius_2021.png&quot;,&quot;suruli&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JagameThandhiramOnNetflix_2021\/JagameThandhiramOnNetflix_2021.png&quot;,&quot;tempofilme&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBC_OldMovie_May_2021_v2\/NBC_OldMovie_May_2021_v2.png&quot;,&quot;drpowercouple&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PowerCouple_BR_May_2021\/PowerCouple_BR_May_2021.png&quot;,&quot;kindfrozen&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KINDFrozen_July_2021\/KINDFrozen_July_2021.png&quot;,&quot;zartebotschaft&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MilkaSummerCampaign_2021\/MilkaSummerCampaign_2021.png&quot;,&quot;representasian&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AHM_RepresentAsian_2021\/AHM_RepresentAsian_2021.png&quot;,&quot;fast9&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FastFurious9_April_2021\/FastFurious9_April_2021.png&quot;,&quot;mnufc&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_MNUFC\/MLS_2021_MNUFC.png&quot;,&quot;zacksnydersjusticeleague&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SnyderCut_LA_May_2021\/SnyderCut_LA_May_2021.png&quot;,&quot;lokipresiden&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_PresidentLoki_2021\/Disney_LokiLaunch_PresidentLoki_2021.png&quot;,&quot;중장전희&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FinalgearKR2021KR\/FinalgearKR2021KR.png&quot;,&quot;미소녀&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FinalgearKR2021KR\/FinalgearKR2021KR.png&quot;,&quot;mtndew3pt&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MountainDewNBA_June_2021\/MountainDewNBA_June_2021.png&quot;,&quot;podcastmexico&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PodcastDiscoveryLATAM_2021\/PodcastDiscoveryLATAM_2021.png&quot;,&quot;fearnoone&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHLFloridaPlayoffs2021\/NHLFloridaPlayoffs2021.png&quot;,&quot;gatesofoblivion&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BethesdaElderScrollsBlackwood_2021\/BethesdaElderScrollsBlackwood_2021.png&quot;,&quot;vwfc&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_VWFC\/MLS_2021_VWFC.png&quot;,&quot;vamosgalaxy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_LAGalaxy\/MLS_2021_LAGalaxy.png&quot;,&quot;tylerperry&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SistasOnBET_2021\/SistasOnBET_2021.png&quot;,&quot;20yıldıraynısofrada&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YemekSepeti_2021\/YemekSepeti_2021.png&quot;,&quot;internetshutdown&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KeepItOn_InternetShutdown_2021\/KeepItOn_InternetShutdown_2021.png&quot;,&quot;onlyamatteroftime&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBC_OldMovie_May_2021_v2\/NBC_OldMovie_May_2021_v2.png&quot;,&quot;bloqueodigital&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KeepItOn_InternetShutdown_2021\/KeepItOn_InternetShutdown_2021.png&quot;,&quot;ladbrokes5aside&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ladbrokes5ASide_May_2021\/Ladbrokes5ASide_May_2021.png&quot;,&quot;16hari&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;obeymehdd&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NTTSolmareObeyme_June_2021\/NTTSolmareObeyme_June_2021.png&quot;,&quot;dadstopembarrassingmenetflix&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DadStopEmbarrassingMeNetflix_2021\/DadStopEmbarrassingMeNetflix_2021.png&quot;,&quot;internetiaçıktut&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KeepItOn_InternetShutdown_2021\/KeepItOn_InternetShutdown_2021.png&quot;,&quot;letsgobuffalo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHL_2021_Teams_LetsGoBuffalo\/NHL_2021_Teams_LetsGoBuffalo.png&quot;,&quot;redbull&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RedBull_GIVESYOUWINGS_2021_V2\/RedBull_GIVESYOUWINGS_2021_V2.png&quot;,&quot;losloons&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_MNUFC\/MLS_2021_MNUFC.png&quot;,&quot;私たち15&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WeThe15_2021\/WeThe15_2021.png&quot;,&quot;espnplus&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ESPNPlus_2021_3_v3\/ESPNPlus_2021_3_v3.png&quot;,&quot;saudivision2030&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SaudiVision2030\/SaudiVision2030.png&quot;,&quot;standforasians&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StandForAsians_2021\/StandForAsians_2021.png&quot;,&quot;whitespikeshunt&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PrimeVideoIndiaTomorrowWar_2021\/PrimeVideoIndiaTomorrowWar_2021.png&quot;,&quot;caçadorab15&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_HunterB15_2021\/Disney_LokiLaunch_HunterB15_2021.png&quot;,&quot;yotes&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHL_2021_Teams_Yotes\/NHL_2021_Teams_Yotes.png&quot;,&quot;لوّن_العالم_برتقالياً&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;amaliatrue&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/thenevershbo_2021_May_v2\/thenevershbo_2021_May_v2.png&quot;,&quot;lhha&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/VH1LHHAtlanta_2021\/VH1LHHAtlanta_2021.png&quot;,&quot;mtvwednesdays&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MTV_April_2021\/MTV_April_2021.png&quot;,&quot;donruss&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PaniniAmericaQ2_21\/PaniniAmericaQ2_21.png&quot;,&quot;اليومالعالميللهلال_الأحمر&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WorldRedCrossDay_May_2021_add2\/WorldRedCrossDay_May_2021_add2.png&quot;,&quot;パルム&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MorinagaMilk_Parm_April_2021\/MorinagaMilk_Parm_April_2021.png&quot;,&quot;clgfighting&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCS_Jan_2021_CLGWIN\/LCS_Jan_2021_CLGWIN.png&quot;,&quot;vct&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/VALORANT_Champions_Tour_2021\/VALORANT_Champions_Tour_2021.png&quot;,&quot;atfr&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheBachelorette_2021\/TheBachelorette_2021.png&quot;,&quot;ibelievekate&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Freeform_CruelSummer_Kate_2021\/Freeform_CruelSummer_Kate_2021.png&quot;,&quot;midearealcool&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Midea_RAC_May_2021\/Midea_RAC_May_2021.png&quot;,&quot;diosdelasmentiras&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_TVA_Jacket_Loki_2021_V2\/Disney_LokiLaunch_TVA_Jacket_Loki_2021_V2.png&quot;,&quot;itsalltruth&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMaxGossipGirl_July_2021_Kiss\/HBOMaxGossipGirl_July_2021_Kiss.png&quot;,&quot;envyus&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EsportsAllAccess_Jan_2021_V2_Envy\/EsportsAllAccess_Jan_2021_V2_Envy.png&quot;,&quot;トゥモロー・ウォー&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AmazonStudios_TomorrowWar_2021\/AmazonStudios_TomorrowWar_2021.png&quot;,&quot;prontosparapanic&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AmazonStudios_Panic_2021\/AmazonStudios_Panic_2021.png&quot;,&quot;usacubrebocas&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WearAMask_2020_2021_ext3\/WearAMask_2020_2021_ext3.png&quot;,&quot;lgi&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHLNYIPlayoffs2021\/NHLNYIPlayoffs2021.png&quot;,&quot;siren&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KpopACE_June_2021\/KpopACE_June_2021.png&quot;,&quot;lapurgainfinita&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheForeverPurge_2021_v2\/TheForeverPurge_2021_v2.png&quot;,&quot;build2021&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MicrosoftBuild_2021\/MicrosoftBuild_2021.png&quot;,&quot;ワタトゲー私を突き刺す棘&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Piccoma_Watatoge_June_2021\/Piccoma_Watatoge_June_2021.png&quot;,&quot;انٹرنٹ_شٹ_ڈاؤن&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KeepItOn_InternetShutdown_2021\/KeepItOn_InternetShutdown_2021.png&quot;,&quot;raturatuhidupku&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NetflixARRQ_2021\/NetflixARRQ_2021.png&quot;,&quot;엔플라잉&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KPOP_NFlying_June_2021\/KPOP_NFlying_June_2021.png&quot;,&quot;blackladysketchshow&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBO_ABLSS_May_2021\/HBO_ABLSS_May_2021.png&quot;,&quot;mantodamassa&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MantoDaMassa_June_2021\/MantoDaMassa_June_2021.png&quot;,&quot;พันธมิตรชานม&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MilkTeaAlliance_2021\/MilkTeaAlliance_2021.png&quot;,&quot;grownishseason4&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/grownishseason4_2021\/grownishseason4_2021.png&quot;,&quot;theshow21&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLBTheSho_2021\/MLBTheSho_2021.png&quot;,&quot;jointhepride&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LionsRugbyTour_2021_Lion\/LionsRugbyTour_2021_Lion.png&quot;,&quot;clgwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCS_Jan_2021_CLGWIN\/LCS_Jan_2021_CLGWIN.png&quot;,&quot;s04&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LEC_EM_2021_S04WIN\/LEC_EM_2021_S04WIN.png&quot;,&quot;tur&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Euro_UK_2021_TUR\/Euro_UK_2021_TUR.png&quot;,&quot;blijfgezond&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;टीकालगाना&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;5gforoman&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OmanTel5G_2021_v3\/OmanTel5G_2021_v3.png&quot;,&quot;hbomax&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMax_LatinAmerica_2021\/HBOMax_LatinAmerica_2021.png&quot;,&quot;nbaontnt&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBAPlayoffsonTNT_2021\/NBAPlayoffsonTNT_2021.png&quot;,&quot;legomasters&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LEGOGoldenBrick_2021\/LEGOGoldenBrick_2021.png&quot;,&quot;itswhatwedo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CooperativeEnvironment_July_2021\/CooperativeEnvironment_July_2021.png&quot;,&quot;bhm&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BlackHistoryMonth\/BlackHistoryMonth.png&quot;,&quot;orangetheworld&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;အိမ်မှာကျန်းမာစွာနေပါ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;laremesamala&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_TheBadBatch_Helmet_April_2021\/Disney_TheBadBatch_Helmet_April_2021.png&quot;,&quot;geekedweeknetflix&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/geekedweeknetflix_2021\/geekedweeknetflix_2021.png&quot;,&quot;hotd&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HouseoftheDragonHBO_2021\/HouseoftheDragonHBO_2021.png&quot;,&quot;fazeup&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EsportsAllAccess_Jan_2021_Faze\/EsportsAllAccess_Jan_2021_Faze.png&quot;,&quot;leverageredemption&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Amazon_LeverageRedemption_2021\/Amazon_LeverageRedemption_2021.png&quot;,&quot;pontofrio&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PontoFrio_Rebrand_2021\/PontoFrio_Rebrand_2021.png&quot;,&quot;mcdkidolsearch&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MD_BurgerKoreaPedas_2021\/MD_BurgerKoreaPedas_2021.png&quot;,&quot;nstogether&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LcK_2021_Teams_NS\/LcK_2021_Teams_NS.png&quot;,&quot;whiteclaw&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LetsWhiteClaw_2021_SP\/LetsWhiteClaw_2021_SP.png&quot;,&quot;lokipresidente&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_PresidentLoki_2021\/Disney_LokiLaunch_PresidentLoki_2021.png&quot;,&quot;លាងដៃ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WashYourHands_2020_2021_ext3\/WashYourHands_2020_2021_ext3.png&quot;,&quot;inourownwords&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CadburyGlassAndAHalf_2021\/CadburyGlassAndAHalf_2021.png&quot;,&quot;nbaplayoffsontnt&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBAPlayoffsonTNT_2021\/NBAPlayoffsonTNT_2021.png&quot;,&quot;stopasianhatecrimes&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StandForAsians_2021\/StandForAsians_2021.png&quot;,&quot;ysiencuentroconqué&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Tostitos_MX_May_2021\/Tostitos_MX_May_2021.png&quot;,&quot;legendaryhbomax&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Legendary_S2_HBOMax_2021\/Legendary_S2_HBOMax_2021.png&quot;,&quot;ຢູ່ເຮືອນຢຸດເຊື້ອເພື່ອຊາດ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;dionnebiopic&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Dionne_Warwick_2021_V2\/Dionne_Warwick_2021_V2.png&quot;,&quot;indossarelamascherina&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WearAMask_2020_2021_ext3\/WearAMask_2020_2021_ext3.png&quot;,&quot;gojetsgo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHL_2021_Teams_GoJetsGo\/NHL_2021_Teams_GoJetsGo.png&quot;,&quot;કોવિડ૧૯ઈન્ડિયાહેલ્પ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Covid19India_2021\/Covid19India_2021.png&quot;,&quot;fordf150&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/F150Lightning_May_2021_2\/F150Lightning_May_2021_2.png&quot;,&quot;ล้างมือกัน&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WashYourHands_2020_2021_ext3\/WashYourHands_2020_2021_ext3.png&quot;,&quot;vaksinert&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;lokianakanak&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_KidlLoki_2021\/Disney_LokiLaunch_KidlLoki_2021.png&quot;,&quot;あの夏のルカ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Luca_2021\/Disney_PixarLuca_Luca_2021.png&quot;,&quot;bullsnation&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_2021_Teams_BullsNation\/NBA_2021_Teams_BullsNation.png&quot;,&quot;googleio2021&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/GoogleIO2021\/GoogleIO2021.png&quot;,&quot;godofmischief&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_TVA_Jacket_Loki_2021_V2\/Disney_LokiLaunch_TVA_Jacket_Loki_2021_V2.png&quot;,&quot;gegengewaltgegenfrauen&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;internetbloqué&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KeepItOn_InternetShutdown_2021\/KeepItOn_InternetShutdown_2021.png&quot;,&quot;怪物奇兵全新世代&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SpaceJam_2021\/SpaceJam_2021.png&quot;,&quot;bakuna&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;dropyourvenmo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Venmo_June_2021\/Venmo_June_2021.png&quot;,&quot;nrl&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL_2021\/NRL_2021.png&quot;,&quot;calledelterror1994&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_FearStreetTrilogy_1994_2021\/Netflix_FearStreetTrilogy_1994_2021.png&quot;,&quot;lia&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KPOP_VIT_ITZY_April_2021_LIA\/KPOP_VIT_ITZY_April_2021_LIA.png&quot;,&quot;twdsurvivors&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TWDSurvivors_SG_2021\/TWDSurvivors_SG_2021.png&quot;,&quot;vamosfire&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_CF\/MLS_2021_CF.png&quot;,&quot;マーベルのブラックウィドウ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_Symbol_2021_V2\/Disney_BlackWidow_Symbol_2021_V2.png&quot;,&quot;ruffles&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RufflesCheddarEBacon_2021\/RufflesCheddarEBacon_2021.png&quot;,&quot;highschoolheartthrobs&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMaxGossipGirl_July_2021_CB\/HBOMaxGossipGirl_July_2021_CB.png&quot;,&quot;anytimeanywhere&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHL_2021_Teams_AnytimeAnywhere\/NHL_2021_Teams_AnytimeAnywhere.png&quot;,&quot;hereforthetea&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMaxGossipGirl_July_2021_Latte\/HBOMaxGossipGirl_July_2021_Latte.png&quot;,&quot;bigtour&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BPIBigTour_2021\/BPIBigTour_2021.png&quot;,&quot;letsgoc9&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCS_Jan_2021_C9WIN\/LCS_Jan_2021_C9WIN.png&quot;,&quot;owl2021&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_2021\/OWL_2021.png&quot;,&quot;pročišćenjezauvek&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheForeverPurge_2021_v2\/TheForeverPurge_2021_v2.png&quot;,&quot;teamenvy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EsportsAllAccess_Jan_2021_V2_Envy\/EsportsAllAccess_Jan_2021_V2_Envy.png&quot;,&quot;wal&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Euro_UK_2021_WAL\/Euro_UK_2021_WAL.png&quot;,&quot;geeked&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/geekedweeknetflix_2021\/geekedweeknetflix_2021.png&quot;,&quot;タスクマスター&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_Taskmaster_2021\/Disney_BlackWidow_Taskmaster_2021.png&quot;,&quot;valorantchallengers&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/VALORANT_Champions_Tour_2021\/VALORANT_Champions_Tour_2021.png&quot;,&quot;おいデュエルしろよ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YugiohYusei_May2021\/YugiohYusei_May2021.png&quot;,&quot;bloqueodeinternet&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KeepItOn_InternetShutdown_2021\/KeepItOn_InternetShutdown_2021.png&quot;,&quot;forthea&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_ATL\/MLB_Teams_2021_ATL.png&quot;,&quot;才能を追い越せ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Com2us_summonerswar_April_2021\/Com2us_summonerswar_April_2021.png&quot;,&quot;unlugartranquilo2&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AQuietPlace_P2_2021\/AQuietPlace_P2_2021.png&quot;,&quot;mtgdnd&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MagicTheGathering_june_2021_\/MagicTheGathering_june_2021_.png&quot;,&quot;트위터포굿&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterForGood_Refresh_2021\/TwitterForGood_Refresh_2021.png&quot;,&quot;letswhiteclaw&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LetsWhiteClaw_2021_BCW\/LetsWhiteClaw_2021_BCW.png&quot;,&quot;disneyworld&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_MickeyEars_2020_Flight5_V2\/DisneyParks_MickeyEars_2020_Flight5_V2.png&quot;,&quot;bel&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Euro_UK_2021_BEL\/Euro_UK_2021_BEL.png&quot;,&quot;badhabits&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EdSheeran_June_UK_2021\/EdSheeran_June_UK_2021.png&quot;,&quot;ナッツチョコは明治&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Meijinutschoco_2021\/Meijinutschoco_2021.png&quot;,&quot;kpoptwitter&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KpopTwitter_2021_Blue\/KpopTwitter_2021_Blue.png&quot;,&quot;teamupforexcellence&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RemyMartin_teamupforexcellence_2021\/RemyMartin_teamupforexcellence_2021.png&quot;,&quot;16araw&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;لك_وللحياة&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/GHC_SA_June_2021\/GHC_SA_June_2021.png&quot;,&quot;うちで過ごそう&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;therepsolstand&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RepsolMotogpMotorcycle_2021\/RepsolMotogpMotorcycle_2021.png&quot;,&quot;giovanialcomando&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YouthLead_2020\/YouthLead_2020.png&quot;,&quot;classifieddrops&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SnakeEyesMovie2021\/SnakeEyesMovie2021.png&quot;,&quot;cze&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Euro_UK_2021_CZE\/Euro_UK_2021_CZE.png&quot;,&quot;멜리나&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_Yelena_2021\/Disney_BlackWidow_Yelena_2021.png&quot;,&quot;blacklivesmatter&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BlackHistoryMonth\/BlackHistoryMonth.png&quot;,&quot;ハリポタ覚醒&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HarryPotterNetease_Q2_2021\/HarryPotterNetease_Q2_2021.png&quot;,&quot;mtndewriseenergy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MountainDewRise_April_2021\/MountainDewRise_April_2021.png&quot;,&quot;pinkcarpetmtvmiaw&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PinkCarpetMTVMIAW_2021\/PinkCarpetMTVMIAW_2021.png&quot;,&quot;ladygaga&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Lady_Gaga_Born_This_Way_Anniversary_GOLD_Emoji\/Lady_Gaga_Born_This_Way_Anniversary_GOLD_Emoji.png&quot;,&quot;प्रत्येकमहिला&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EveryWoman_2020\/EveryWoman_2020.png&quot;,&quot;everywoman&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EveryWoman_2020\/EveryWoman_2020.png&quot;,&quot;クワイエット・プレイス&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AQuietPlace_P2_2021\/AQuietPlace_P2_2021.png&quot;,&quot;quédateencasaya&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;heineken&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Heineken_starofthematch_May_2021\/Heineken_starofthematch_May_2021.png&quot;,&quot;رؤية_2030_واقع_يتحقق&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SaudiVision2030\/SaudiVision2030.png&quot;,&quot;루카&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Luca_2021\/Disney_PixarLuca_Luca_2021.png&quot;,&quot;aliandraturatuqueens&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NetflixARRQ_2021\/NetflixARRQ_2021.png&quot;,&quot;cdl2021&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CallofDutyLeague2021\/CallofDutyLeague2021.png&quot;,&quot;оставайтесьдома&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;akatsukifive&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Akatsuki5_June_2021\/Akatsuki5_June_2021.png&quot;,&quot;怒号光明&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Yostar_ArknightsStaff_April_2021\/Yostar_ArknightsStaff_April_2021.png&quot;,&quot;الشباب_قادة&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YouthLead_2020\/YouthLead_2020.png&quot;,&quot;somosel15&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WeThe15_2021\/WeThe15_2021.png&quot;,&quot;ソメイティ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Paralympic_Mascot_Emoji_EXT2\/Paralympic_Mascot_Emoji_EXT2.png&quot;,&quot;trevorstory&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLBHRDerby2021-COL\/MLBHRDerby2021-COL.png&quot;,&quot;foodpandabdayblowout&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Foodpanda7thAnniversary_2021\/Foodpanda7thAnniversary_2021.png&quot;,&quot;theclimatepledge&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Amazon_ClimatePledge_2021\/Amazon_ClimatePledge_2021.png&quot;,&quot;android12&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/GoogleIO2021\/GoogleIO2021.png&quot;,&quot;drivinghybridwork&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/webexmclaren_2021\/webexmclaren_2021.png&quot;,&quot;akorin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;ahstories&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AHStories_July_2021\/AHStories_July_2021.png&quot;,&quot;サンプルマーケット&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Qoo10_Q22021\/Qoo10_Q22021.png&quot;,&quot;スカイウォードソードhd&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NintendoZeldaSkywardSword_2021\/NintendoZeldaSkywardSword_2021.png&quot;,&quot;ギア子&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bytedance_ako_figurestory_June_2021\/Bytedance_ako_figurestory_June_2021.png&quot;,&quot;mideaduo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Midea_RAC_May_2021\/Midea_RAC_May_2021.png&quot;,&quot;purotejas&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_TEX\/MLB_Teams_2021_TEX.png&quot;,&quot;preds&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHL_2021_Teams_Preds\/NHL_2021_Teams_Preds.png&quot;,&quot;pol&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Euro_UK_2021_POL\/Euro_UK_2021_POL.png&quot;,&quot;16päivää&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;オレレベー俺だけレベルアップな件&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Piccoma_Oreleve_June_2021\/Piccoma_Oreleve_June_2021.png&quot;,&quot;noustoutes&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;世界をオレンジ色に&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;noi15percento&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WeThe15_2021\/WeThe15_2021.png&quot;,&quot;disneycruise&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_DisneyCruise_2021\/DisneyParks_DisneyCruise_2021.png&quot;,&quot;wearewomen&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterWomenTentpole_2021\/TwitterWomenTentpole_2021.png&quot;,&quot;allcaps&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHL_2021_Teams_ALLCAPS\/NHL_2021_Teams_ALLCAPS.png&quot;,&quot;نحن_الـ15&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WeThe15_2021_add\/WeThe15_2021_add.png&quot;,&quot;eaststowin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL_2021_EastsToWin\/NRL_2021_EastsToWin.png&quot;,&quot;nrgfam&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EsportsAllAccess_Jan_2021_V2_NRG\/EsportsAllAccess_Jan_2021_V2_NRG.png&quot;,&quot;showcasegreatness&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCS_Jan_2021_FLYWIN_v2\/LCS_Jan_2021_FLYWIN_v2.png&quot;,&quot;seoingukonviu&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DAYSOnViu_2021\/DAYSOnViu_2021.png&quot;,&quot;losmets&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_NYM\/MLB_Teams_2021_NYM.png&quot;,&quot;منتخبنافيأمريكا&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/QatarAtGoldCup_2021\/QatarAtGoldCup_2021.png&quot;,&quot;togetherdc&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WNBA_Teams_2021_WAS1\/WNBA_Teams_2021_WAS1.png&quot;,&quot;sehatdirumah&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;skinsista&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SkinsistaRESET_2021\/SkinsistaRESET_2021.png&quot;,&quot;overanddone&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Njomza_Album_Emoji_2021\/Njomza_Album_Emoji_2021.png&quot;,&quot;laveniravélo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TourdeFrance_2021\/TourdeFrance_2021.png&quot;,&quot;thematch&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TurnerTheMatchQ22021\/TurnerTheMatchQ22021.png&quot;,&quot;diretoaoponto&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PontoFrio_Rebrand_2021\/PontoFrio_Rebrand_2021.png&quot;,&quot;vitwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LEC_EM_2021_VITWIN\/LEC_EM_2021_VITWIN.png&quot;,&quot;digi&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCS_Jan_2021_DIGWIN\/LCS_Jan_2021_DIGWIN.png&quot;,&quot;16дней&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;bancolombia&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BancolombiaNewHeart_April_2021\/BancolombiaNewHeart_April_2021.png&quot;,&quot;magictogether&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_2021_Teams_MagicTogether\/NBA_2021_Teams_MagicTogether.png&quot;,&quot;letsgetkraken&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CDL_Team_2021_FLO\/CDL_Team_2021_FLO.png&quot;,&quot;バッドバッチ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_TheBadBatch_Helmet_April_2021\/Disney_TheBadBatch_Helmet_April_2021.png&quot;,&quot;wendyhybrid&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_SweetTooth_Pig\/Netflix_SweetTooth_Pig.png&quot;,&quot;milehighbasketball&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_2021_Teams_MileHighBasketball\/NBA_2021_Teams_MileHighBasketball.png&quot;,&quot;sadecesen&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Spotify_Q2_21\/Spotify_Q2_21.png&quot;,&quot;أتحدث_بالمونث&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FemaleArabic_21\/FemaleArabic_21.png&quot;,&quot;onechampionship&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ONEonTNT_2021\/ONEonTNT_2021.png&quot;,&quot;3imagined&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PaulMcCartney_April_2021\/PaulMcCartney_April_2021.png&quot;,&quot;alidinetflix&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NetflixARRQ_2021\/NetflixARRQ_2021.png&quot;,&quot;エレーナ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_Yelena_2021\/Disney_BlackWidow_Yelena_2021.png&quot;,&quot;newbalance&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NewBalance574_2021\/NewBalance574_2021.png&quot;,&quot;tronics&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TRON_Coin_Feb_2021_ext\/TRON_Coin_Feb_2021_ext.png&quot;,&quot;lovetoseeit&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LoveToSeeIt_2021\/LoveToSeeIt_2021.png&quot;,&quot;zilforthewin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Zilliqa_April_2021\/Zilliqa_April_2021.png&quot;,&quot;holditdown&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_HOU\/MLS_2021_HOU.png&quot;,&quot;pariseternal&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_Feb_2021_Paris\/OWL_Season4_Team_Feb_2021_Paris.png&quot;,&quot;r6apacl&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RainbowSixProLeague_2021_R6APACL\/RainbowSixProLeague_2021_R6APACL.png&quot;,&quot;ngaraatekaumaono&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;thelongestday&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ALZ_2021\/ALZ_2021.png&quot;,&quot;lego&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LEGOGoldenBrick_2021\/LEGOGoldenBrick_2021.png&quot;,&quot;ysiencuentroconque&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Tostitos_MX_May_2021\/Tostitos_MX_May_2021.png&quot;,&quot;bronxnation&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Origins21_Broxnation_\/Origins21_Broxnation_.png&quot;,&quot;badbatch&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_TheBadBatch_Helmet_April_2021\/Disney_TheBadBatch_Helmet_April_2021.png&quot;,&quot;hivemind&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NYTimesGames_NYTSpellingBee_2021_add\/NYTimesGames_NYTSpellingBee_2021_add.png&quot;,&quot;inclusionishappening&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterTogether_InclusionIsHappening_v2\/TwitterTogether_InclusionIsHappening_v2.png&quot;,&quot;第五人格ivc&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/IdentityVJP_Q3_2021\/IdentityVJP_Q3_2021.png&quot;,&quot;morningmakesyou&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MountainDewRise_April_2021\/MountainDewRise_April_2021.png&quot;,&quot;hitmanswifesbodyguard&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HitmansWifesBodyguard_2021_All3_\/HitmansWifesBodyguard_2021_All3_.png&quot;,&quot;ashleydarby&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bravo_RHOP_Q3_2021_AshleyDarby\/Bravo_RHOP_Q3_2021_AshleyDarby.png&quot;,&quot;doitforthedream&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WNBA_Teams_2021_ATL\/WNBA_Teams_2021_ATL.png&quot;,&quot;تويتر_للخير&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterForGood_Refresh_2021\/TwitterForGood_Refresh_2021.png&quot;,&quot;upup&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL_2021_UpUp\/NRL_2021_UpUp.png&quot;,&quot;ऑरंजदीवर्ल्ड&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;obeymax&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NTTSolmareObeyme_June_2021\/NTTSolmareObeyme_June_2021.png&quot;,&quot;mietiennenjakoa&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2020_ThinkBeforeSharing\/MediaInformationLiteracyWeeks_2020_ThinkBeforeSharing.png&quot;,&quot;supportresponsibly&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Heineken_starofthematch_May_2021\/Heineken_starofthematch_May_2021.png&quot;,&quot;教えてリィンカネ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NieRReincarnationLaunch_May_2021\/NieRReincarnationLaunch_May_2021.png&quot;,&quot;qataratgoldcup&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/QatarAtGoldCup_2021_v2\/QatarAtGoldCup_2021_v2.png&quot;,&quot;lec&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LEC_EM_2021_LEC\/LEC_EM_2021_LEC.png&quot;,&quot;bigtrickenergy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BigTricktruTV_2021\/BigTricktruTV_2021.png&quot;,&quot;niccage&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NeonRated_PigtheFilm_June2021\/NeonRated_PigtheFilm_June2021.png&quot;,&quot;toduntak&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ToofaanOnPrime_July_2021\/ToofaanOnPrime_July_2021.png&quot;,&quot;flightattendanthbomax&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FlightAttendant_LA_May_2021\/FlightAttendant_LA_May_2021.png&quot;,&quot;lildrumsbigflavor&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DrumstickCone2021\/DrumstickCone2021.png&quot;,&quot;fboyislandonmax&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FBOYIsland_2021_fboyisland\/FBOYIsland_2021_fboyisland.png&quot;,&quot;lasttrainhome&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/John_Mayer_2021_Album\/John_Mayer_2021_Album.png&quot;,&quot;lhhatlanta&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/VH1LHHAtlanta_2021\/VH1LHHAtlanta_2021.png&quot;,&quot;vamosgigantes&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_SF\/MLB_Teams_2021_SF.png&quot;,&quot;ukr&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Euro_UK_2021_UKR\/Euro_UK_2021_UKR.png&quot;,&quot;dejalotodo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_HOU\/MLS_2021_HOU.png&quot;,&quot;gevaccineerd&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;tlwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCS_Jan_2021_TLWIN\/LCS_Jan_2021_TLWIN.png&quot;,&quot;smoothlikebutter&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KpopVIT_BTS_June2021_SmoothLikeButter\/KpopVIT_BTS_June2021_SmoothLikeButter.png&quot;,&quot;ロキ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_TVA_Jacket_Loki_2021_V2\/Disney_LokiLaunch_TVA_Jacket_Loki_2021_V2.png&quot;,&quot;채령&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KPOP_VIT_ITZY_April_2021_CHAERYEONG\/KPOP_VIT_ITZY_April_2021_CHAERYEONG.png&quot;,&quot;justicefighting&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_2021_WASH\/OWL_Season4_Team_2021_WASH.png&quot;,&quot;サイダートーク&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AsahiSoftDrinkmitsuyasummercider2_Japan_2021\/AsahiSoftDrinkmitsuyasummercider2_Japan_2021.png&quot;,&quot;vaccinata&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;venmome&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Venmo_June_2021\/Venmo_June_2021.png&quot;,&quot;eggo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Eggo_May_2021_2\/Eggo_May_2021_2.png&quot;,&quot;konaelectric&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Hyundai_ZeroEmission_FR_2021\/Hyundai_ZeroEmission_FR_2021.png&quot;,&quot;letsgooilers&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHL_2021_Teams_LetsGoOilers\/NHL_2021_Teams_LetsGoOilers.png&quot;,&quot;boatxklrahul&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BOAT_IPL_2021_v2\/BOAT_IPL_2021_v2.png&quot;,&quot;blacktranslivesmatter&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BlackTransLivesMatter_2020\/BlackTransLivesMatter_2020.png&quot;,&quot;lionsrugby&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/VodafoneLions_Tour_2021\/VodafoneLions_Tour_2021.png&quot;,&quot;wegotnow&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NewBalance574_2021\/NewBalance574_2021.png&quot;,&quot;amigoskelloggs&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KelloggsMasterBrandCercaDeTi_2021_V3\/KelloggsMasterBrandCercaDeTi_2021_V3.png&quot;,&quot;poseonfx&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FX_Pose_April_2021\/FX_Pose_April_2021.png&quot;,&quot;pointofviewu&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Kpop_Yugyeom_June_2021\/Kpop_Yugyeom_June_2021.png&quot;,&quot;アークナイツ戦友募集&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Yostar_ArknightsStaff_April_2021\/Yostar_ArknightsStaff_April_2021.png&quot;,&quot;magisipbagomagclick&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2020_ThinkBeforeClicking\/MediaInformationLiteracyWeeks_2020_ThinkBeforeClicking.png&quot;,&quot;beatthecube&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BeatTheCube_2021\/BeatTheCube_2021.png&quot;,&quot;vamosnerevs&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_NER\/MLS_2021_NER.png&quot;,&quot;mkd&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Euro_UK_2021_MKD\/Euro_UK_2021_MKD.png&quot;,&quot;私たちは女性&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterWomenTentpole_2021\/TwitterWomenTentpole_2021.png&quot;,&quot;hernesileşitlik&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;bloods&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AFL_2021_Bloods\/AFL_2021_Bloods.png&quot;,&quot;fearstreet1666&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_FearStreetTrilogy_1666_2021\/Netflix_FearStreetTrilogy_1666_2021.png&quot;,&quot;snohalbum&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SnohAalegra_2021\/SnohAalegra_2021.png&quot;,&quot;covidemergencyindia&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Covid19India_2021\/Covid19India_2021.png&quot;,&quot;tomorrowwar&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AmazonStudios_TomorrowWar_2021_add\/AmazonStudios_TomorrowWar_2021_add.png&quot;,&quot;inthere&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LizPhair_2021\/LizPhair_2021.png&quot;,&quot;strengthinthenorth&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CDL_Team_2021_TOR\/CDL_Team_2021_TOR.png&quot;,&quot;leafsforever&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHL_2021_Teams_LeafsForever\/NHL_2021_Teams_LeafsForever.png&quot;,&quot;ارتدي_الكمامة&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WearAMask_2020_2021_ext3\/WearAMask_2020_2021_ext3.png&quot;,&quot;rattleon&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_ARI\/MLB_Teams_2021_ARI.png&quot;,&quot;almonds&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Almonds_2021\/Almonds_2021.png&quot;,&quot;сделаймироранжевым&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;crushitspacejam&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SpaceJam_2021_add\/SpaceJam_2021_add.png&quot;,&quot;6in6&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/XboxLoveStory_2021\/XboxLoveStory_2021.png&quot;,&quot;milka&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MilkaSummerCampaign_2021\/MilkaSummerCampaign_2021.png&quot;,&quot;ripcity&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_2021_Teams_RipCity\/NBA_2021_Teams_RipCity.png&quot;,&quot;ゼルダの伝説&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NintendoZeldaSkywardSword_2021\/NintendoZeldaSkywardSword_2021.png&quot;,&quot;spotifyxenjoyenjaami&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SpotifyXEnjoyEnjaami_2021\/SpotifyXEnjoyEnjaami_2021.png&quot;,&quot;mvsm&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_MitchellvsTheMachines_2021\/Netflix_MitchellvsTheMachines_2021.png&quot;,&quot;100t&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCS_Jan_2021_100T\/LCS_Jan_2021_100T.png&quot;,&quot;loona_ptt&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KpopVIT_LOONA_June_2021\/KpopVIT_LOONA_June_2021.png&quot;,&quot;pso2ngs&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PSO2NGS_JP_2021\/PSO2NGS_JP_2021.png&quot;,&quot;promoçãoelmachips&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ElmaChipsMeFazUmPix_2021\/ElmaChipsMeFazUmPix_2021.png&quot;,&quot;porcolumbus&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_CC\/MLS_2021_CC.png&quot;,&quot;ringthebell&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_PHI\/MLB_Teams_2021_PHI.png&quot;,&quot;disneyplusmy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyPlusHotstarMalaysia_2021\/DisneyPlusHotstarMalaysia_2021.png&quot;,&quot;kami15&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WeThe15_2021\/WeThe15_2021.png&quot;,&quot;weallbleedblue&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHLSTLPlayoffs2021\/NHLSTLPlayoffs2021.png&quot;,&quot;stayhome&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;lakeshow&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_2021_Teams_LakeShow\/NBA_2021_Teams_LakeShow.png&quot;,&quot;白夜極光配信開始&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TencentAlchemyStarsJPLaunch_2021\/TencentAlchemyStarsJPLaunch_2021.png&quot;,&quot;픽사_루카&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Luca_2021\/Disney_PixarLuca_Luca_2021.png&quot;,&quot;ウルトラインパクト&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/heroaca_ui_JP_2021\/heroaca_ui_JP_2021.png&quot;,&quot;ttwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LPL_2021_TTWIN\/LPL_2021_TTWIN.png&quot;,&quot;nyalakanlagi&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KeepItOn_InternetShutdown_2021\/KeepItOn_InternetShutdown_2021.png&quot;,&quot;cheddarebacon&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RufflesCheddarEBacon_2021\/RufflesCheddarEBacon_2021.png&quot;,&quot;miercolesdeloki&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_TVA_Jacket_Loki_2021_V2\/Disney_LokiLaunch_TVA_Jacket_Loki_2021_V2.png&quot;,&quot;怪物奇兵&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SpaceJam_2021\/SpaceJam_2021.png&quot;,&quot;私を突き刺す棘byピッコマ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Piccoma_Watatoge_June_2021\/Piccoma_Watatoge_June_2021.png&quot;,&quot;新十六茶に新垣さんと中村さん&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AsahiSoftDrink16tea02Japan_2021\/AsahiSoftDrink16tea02Japan_2021.png&quot;,&quot;rbny&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_NYRB\/MLS_2021_NYRB.png&quot;,&quot;rallythevalley&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_2021_Teams_RallyTheValley_add\/NBA_2021_Teams_RallyTheValley_add.png&quot;,&quot;fanzoneshow&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DiarioAs_2021_add\/DiarioAs_2021_add.png&quot;,&quot;lngwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LPL_2021_LNGWIN\/LPL_2021_LNGWIN.png&quot;,&quot;dariuskincaid&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HitmansWifesBodyguard_2021_SamSalma_\/HitmansWifesBodyguard_2021_SamSalma_.png&quot;,&quot;esp&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Euro_UK_2021_ESP\/Euro_UK_2021_ESP.png&quot;,&quot;루카_애니&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Luca_2021\/Disney_PixarLuca_Luca_2021.png&quot;,&quot;cro&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Euro_UK_2021_CRO\/Euro_UK_2021_CRO.png&quot;,&quot;ตเตอร์เพื่อสิ่งดีดี&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterForGood_Refresh_2021\/TwitterForGood_Refresh_2021.png&quot;,&quot;nousles15&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WeThe15_2021\/WeThe15_2021.png&quot;,&quot;tva&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_Miss_Minutes_2021\/Disney_LokiLaunch_Miss_Minutes_2021.png&quot;,&quot;sarahfier&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_FearStreetTrilogy_Franchise_2_2021\/Netflix_FearStreetTrilogy_Franchise_2_2021.png&quot;,&quot;thitvs&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SnohAalegra_2021\/SnohAalegra_2021.png&quot;,&quot;astwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LEC_EM_2021_ASTWIN\/LEC_EM_2021_ASTWIN.png&quot;,&quot;خليك_بالبيت&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;cutabovethebest&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Mi11XSeries_IN_April_2021_v2\/Mi11XSeries_IN_April_2021_v2.png&quot;,&quot;princeherb&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheImpracticalJokers_Julu_2021\/TheImpracticalJokers_Julu_2021.png&quot;,&quot;countdowntoloki&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_Miss_Minutes_2021\/Disney_LokiLaunch_Miss_Minutes_2021.png&quot;,&quot;リィンカネ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NieRReincarnationLaunch_May_2021\/NieRReincarnationLaunch_May_2021.png&quot;,&quot;dunkindonutday&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DunkinDonutDay_2021\/DunkinDonutDay_2021.png&quot;,&quot;ヒロトラフレンド募集&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/heroaca_ui_JP_2021\/heroaca_ui_JP_2021.png&quot;,&quot;livesmarterbts&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SmartXBTS_2021\/SmartXBTS_2021.png&quot;,&quot;headintheclouds&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/88RISING_May_2021\/88RISING_May_2021.png&quot;,&quot;turnerandhoochseries&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyPlus_TurnerandHooch_Dog_2021\/DisneyPlus_TurnerandHooch_Dog_2021.png&quot;,&quot;shyamalan&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBC_OldMovie_May_2021_v2\/NBC_OldMovie_May_2021_v2.png&quot;,&quot;nóikhôngvớibạohành&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;vaccineret&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;calledelterror1666&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_FearStreetTrilogy_1666_2021\/Netflix_FearStreetTrilogy_1666_2021.png&quot;,&quot;bam&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BancolombiaNewHeart_April_2021\/BancolombiaNewHeart_April_2021.png&quot;,&quot;قطع_اینترنت&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KeepItOn_InternetShutdown_2021\/KeepItOn_InternetShutdown_2021.png&quot;,&quot;naotemjeitoerrado&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ballantinesbr_June_2021\/ballantinesbr_June_2021.png&quot;,&quot;tümkadınlar&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EveryWoman_2020\/EveryWoman_2020.png&quot;,&quot;20yılıyedik&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YemekSepeti_2021\/YemekSepeti_2021.png&quot;,&quot;bethefight&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_2021_Teams_BeTheFight\/NBA_2021_Teams_BeTheFight.png&quot;,&quot;هيئة_الترفيه&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/GEA_June_2021\/GEA_June_2021.png&quot;,&quot;အိမ်မှာနေပါ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;survivalkitchallenge&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TWDSurvivors_SG_2021\/TWDSurvivors_SG_2021.png&quot;,&quot;clippernation&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_2021_Teams_ClipperNation\/NBA_2021_Teams_ClipperNation.png&quot;,&quot;openingday&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_OpeningDay\/MLB_Teams_2021_OpeningDay.png&quot;,&quot;таскмастер&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_Taskmaster_2021\/Disney_BlackWidow_Taskmaster_2021.png&quot;,&quot;r6eul&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RainbowSixProLeague_2021_R6EUL\/RainbowSixProLeague_2021_R6EUL.png&quot;,&quot;starwarsthebadbatch&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_TheBadBatch_Helmet_April_2021\/Disney_TheBadBatch_Helmet_April_2021.png&quot;,&quot;asiarisingtogether&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/88RISING_May_2021\/88RISING_May_2021.png&quot;,&quot;6thraven&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CDL_Team_2021_LON\/CDL_Team_2021_LON.png&quot;,&quot;pemvaksinan&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;purgaparasempre&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheForeverPurge_2021_v2\/TheForeverPurge_2021_v2.png&quot;,&quot;rickyourself&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RickandMorty2021_rick\/RickandMorty2021_rick.png&quot;,&quot;myx&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MYXAwards2021\/MYXAwards2021.png&quot;,&quot;miathornton&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bravo_RHOP_Q3_2021_MiaThornton\/Bravo_RHOP_Q3_2021_MiaThornton.png&quot;,&quot;lucapelicula&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Luca_2021\/Disney_PixarLuca_Luca_2021.png&quot;,&quot;thebacheloretteabc&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheBachelorette_2021\/TheBachelorette_2021.png&quot;,&quot;magpabakuna&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add\/vaccinated_2021_add.png&quot;,&quot;みんなの聖火リレー&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TokyoOlympic_2021_Part1\/TokyoOlympic_2021_Part1.png&quot;,&quot;taskmaster&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_Taskmaster_2021\/Disney_BlackWidow_Taskmaster_2021.png&quot;,&quot;raysup&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_TB\/MLB_Teams_2021_TB.png&quot;,&quot;toofaan&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ToofaanOnPrime_July_2021\/ToofaanOnPrime_July_2021.png&quot;,&quot;mr10&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MarcusRashfordBook_2021\/MarcusRashfordBook_2021.png&quot;,&quot;루카_영화&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Luca_2021\/Disney_PixarLuca_Luca_2021.png&quot;,&quot;vamossounders&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_SeaS\/MLS_2021_SeaS.png&quot;,&quot;taylorsversion&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TSRed2021\/TSRed2021.png&quot;,&quot;احجز_وعيشها&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EnjoySaudi_June2021\/EnjoySaudi_June2021.png&quot;,&quot;留在家里&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;yeji&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KPOP_VIT_ITZY_April_2021_YEJI\/KPOP_VIT_ITZY_April_2021_YEJI.png&quot;,&quot;나타샤로마노프&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_BWNatasha_again_2021\/Disney_BlackWidow_BWNatasha_again_2021.png&quot;,&quot;ausnavy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DFR_2021_AusNavy_May\/DFR_2021_AusNavy_May.png&quot;,&quot;deoorlogvanmorgen&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AmazonStudios_TomorrowWar_2021\/AmazonStudios_TomorrowWar_2021.png&quot;,&quot;bigtour2021&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BPIBigTour_2021\/BPIBigTour_2021.png&quot;,&quot;snollebollekesjuichcape&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JumboJuichcapeSummerOfSports2021\/JumboJuichcapeSummerOfSports2021.png&quot;,&quot;молодежьлидирует&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YouthLead_2020\/YouthLead_2020.png&quot;,&quot;detroitup&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_2021_Teams_DetroitUp\/NBA_2021_Teams_DetroitUp.png&quot;,&quot;pologhalloffame&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Polo_G_Album_2021\/Polo_G_Album_2021.png&quot;,&quot;passionpurposebts&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SmartXBTS_2021\/SmartXBTS_2021.png&quot;,&quot;zelda&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NintendoZeldaSkywardSword_2021\/NintendoZeldaSkywardSword_2021.png&quot;,&quot;johnmayer&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/John_Mayer_2021_Album\/John_Mayer_2021_Album.png&quot;,&quot;fastandfurious9&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FastFurious9_April_2021\/FastFurious9_April_2021.png&quot;,&quot;xlweekend&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_Feb_2021_NY\/OWL_Season4_Team_Feb_2021_NY.png&quot;,&quot;elderscrollsonline&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BethesdaElderScrollsBlackwood_2021\/BethesdaElderScrollsBlackwood_2021.png&quot;,&quot;dödsorsakkvinna&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;verzuztv&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Verzuz_2020_Flight4\/Verzuz_2020_Flight4.png&quot;,&quot;repsolhondateam&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RepsolMotogpMotorcycle_2021\/RepsolMotogpMotorcycle_2021.png&quot;,&quot;changethegame&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_CHW\/MLB_Teams_2021_CHW.png&quot;,&quot;星よりレアより育成だ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Com2us_summonerswar_April_2021\/Com2us_summonerswar_April_2021.png&quot;,&quot;हम15&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WeThe15_2021\/WeThe15_2021.png&quot;,&quot;eqos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Eqonex_July_2021\/Eqonex_July_2021.png&quot;,&quot;1series1xperience&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Mi11XSeries_IN_April_2021_v2\/Mi11XSeries_IN_April_2021_v2.png&quot;,&quot;eltigretoño&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KelloggsMasterBrandCercaDeTi_2021_V3\/KelloggsMasterBrandCercaDeTi_2021_V3.png&quot;,&quot;limboep&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Njomza_Album_Emoji_2021\/Njomza_Album_Emoji_2021.png&quot;,&quot;tokyo2020&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Tokyo2020_Olympics\/Tokyo2020_Olympics.png&quot;,&quot;inchscider&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/inchscider_2021\/inchscider_2021.png&quot;,&quot;mtgmeetsdnd&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MagicTheGathering_june_2021_\/MagicTheGathering_june_2021_.png&quot;,&quot;20yearsofxbox&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Xbox20thAnniversary_2021\/Xbox20thAnniversary_2021.png&quot;,&quot;armcherries&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ArmchairExpert_2021\/ArmchairExpert_2021.png&quot;,&quot;stopgeweldtegenvrouwen&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;mtgxdnd&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MagicTheGathering_june_2021_\/MagicTheGathering_june_2021_.png&quot;,&quot;aceshigh&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_Feb_2021_London\/OWL_Season4_Team_Feb_2021_London.png&quot;,&quot;aoe4&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/XboxCardinal_2021\/XboxCardinal_2021.png&quot;,&quot;getgrafting&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JDLoveIsland_2021\/JDLoveIsland_2021.png&quot;,&quot;gofreecs&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LcK_2021_Teams_PL_AF\/LcK_2021_Teams_PL_AF.png&quot;,&quot;michaelbryce&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HitmansWifesBodyguard_2021_SalmaRyan_\/HitmansWifesBodyguard_2021_SalmaRyan_.png&quot;,&quot;bigdealtinytacos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JackintheBoxTinyTacos_2021\/JackintheBoxTinyTacos_2021.png&quot;,&quot;persiannewyear&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/nowruz2018_v4\/nowruz2018_v4.png&quot;,&quot;threeimagined&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PaulMcCartney_April_2021\/PaulMcCartney_April_2021.png&quot;,&quot;guardianorosso&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_RedGuardian_2021\/Disney_BlackWidow_RedGuardian_2021.png&quot;,&quot;adaptoid&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HuluMODOK2021\/HuluMODOK2021.png&quot;,&quot;teoritetangaongawhakatipuranga&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;스페이스잼&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SpaceJam_2021\/SpaceJam_2021.png&quot;,&quot;secretsofthewhales&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyNatGeo_SecretsoftheWhales_April_2021\/DisneyNatGeo_SecretsoftheWhales_April_2021.png&quot;,&quot;hrderby&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLBHRDerby2021-HRDerby\/MLBHRDerby2021-HRDerby.png&quot;,&quot;xbox6in6&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/XboxLoveStory_2021\/XboxLoveStory_2021.png&quot;,&quot;howcanimakeitok&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WolfAlice_2021\/WolfAlice_2021.png&quot;,&quot;lathieves&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CDL_Team_2021_LAT\/CDL_Team_2021_LAT.png&quot;,&quot;nieteenmeer&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;banistmo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BancolombiaNewHeart_April_2021\/BancolombiaNewHeart_April_2021.png&quot;,&quot;por&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Euro_UK_2021_POR\/Euro_UK_2021_POR.png&quot;,&quot;lagrandeboucleelectrique&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Enedis_TDF_2021\/Enedis_TDF_2021.png&quot;,&quot;stopasianhate&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StandForAsians_2021\/StandForAsians_2021.png&quot;,&quot;pandaigdigangarawngredcross&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WorldRedCrossDay_May_2021_add2\/WorldRedCrossDay_May_2021_add2.png&quot;,&quot;2inonebypoise&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Poise_May_2021\/Poise_May_2021.png&quot;,&quot;diamundialmedialunaroja&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WorldRedCrossDay_May_2021_add2\/WorldRedCrossDay_May_2021_add2.png&quot;,&quot;uniteandconquer&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_AU\/MLS_2021_AU.png&quot;,&quot;monicaturkeydance&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMax_Friends_Turkey\/HBOMax_Friends_Turkey.png&quot;,&quot;俺レベ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Piccoma_Oreleve_June_2021\/Piccoma_Oreleve_June_2021.png&quot;,&quot;ktwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCK_2021_Team_P1_KTWIN_v2\/LCK_2021_Team_P1_KTWIN_v2.png&quot;,&quot;كل_امرأة&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EveryWoman_2020\/EveryWoman_2020.png&quot;,&quot;チーム8ツアーファイナル&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/17_AKB_May_2021\/17_AKB_May_2021.png&quot;,&quot;xgp&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/XboxGamePass_2021\/XboxGamePass_2021.png&quot;,&quot;g2army&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LEC_EM_2021_G2WIN\/LEC_EM_2021_G2WIN.png&quot;,&quot;おしえてトレクル&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JP_ONEPIECE_trecru_2021\/JP_ONEPIECE_trecru_2021.png&quot;,&quot;mibr&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EsportsAllAccess_Jan_2021_MIBR\/EsportsAllAccess_Jan_2021_MIBR.png&quot;,&quot;sweettooth&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NetflixSweetTooth2021\/NetflixSweetTooth2021.png&quot;,&quot;eqo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Eqonex_July_2021\/Eqonex_July_2021.png&quot;,&quot;nbatwitterlive&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBATwitterLive_2021\/NBATwitterLive_2021.png&quot;,&quot;マスクをしよう&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WearAMask_2020_2021_ext3\/WearAMask_2020_2021_ext3.png&quot;,&quot;ਕੋਵਿਡ19ਭਾਰਤਸੇਵਾ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Covid19India_2021\/Covid19India_2021.png&quot;,&quot;femininearabic&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FemaleArabic_21\/FemaleArabic_21.png&quot;,&quot;nonunadipiu&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;vamosdbacks&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_VamosDbacks_2021\/MLB_VamosDbacks_2021.png&quot;,&quot;igottheshot&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AdCouncilVaccine_2021\/AdCouncilVaccine_2021.png&quot;,&quot;gherbo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Gherbo_25_Album_Emoji_2021\/Gherbo_25_Album_Emoji_2021.png&quot;,&quot;resilientsf&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_SF\/MLB_Teams_2021_SF.png&quot;,&quot;electricoffensive&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RenaulteWays_2_2021\/RenaulteWays_2_2021.png&quot;,&quot;seausrise&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_SEA\/MLB_Teams_2021_SEA.png&quot;,&quot;lvaces&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WNBA_Teams_2021_LV\/WNBA_Teams_2021_LV.png&quot;,&quot;birdland&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_BAL\/MLB_Teams_2021_BAL.png&quot;,&quot;internetshutdowns&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KeepItOn_InternetShutdown_2021\/KeepItOn_InternetShutdown_2021.png&quot;,&quot;nursehero&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CeraVe_ThankYouNurses_2021\/CeraVe_ThankYouNurses_2021.png&quot;,&quot;лукафильм&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_PixarLuca_Luca_2021\/Disney_PixarLuca_Luca_2021.png&quot;,&quot;待在家裡&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StayHome_2020_2021_ext3\/StayHome_2020_2021_ext3.png&quot;,&quot;buildyour5asideteam&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ladbrokes5ASide_May_2021\/Ladbrokes5ASide_May_2021.png&quot;,&quot;dlive&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JustinSuntron_2021_ext\/JustinSuntron_2021_ext.png&quot;,&quot;swe&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Euro_UK_2021_SWE\/Euro_UK_2021_SWE.png&quot;,&quot;تطبيق_عيشها&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EnjoySaudi_June2021\/EnjoySaudi_June2021.png&quot;,&quot;gostanford&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StanfordWomensFULLYearChamp\/StanfordWomensFULLYearChamp.png&quot;,&quot;maddennfl22&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MaddenNFL22\/MaddenNFL22.png&quot;,&quot;sonukupaolsun&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/btcturk_May_2021\/btcturk_May_2021.png&quot;,&quot;readysetpanic&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AmazonStudios_Panic_2021\/AmazonStudios_Panic_2021.png&quot;,&quot;tabitabipo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TreseOnNetflix_May_2021_ext\/TreseOnNetflix_May_2021_ext.png&quot;,&quot;houseofthedragon&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HouseoftheDragonHBO_2021\/HouseoftheDragonHBO_2021.png&quot;,&quot;crew96&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_2021_CC\/MLS_2021_CC.png&quot;,&quot;رؤية_السعودية_2030&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SaudiVision2030\/SaudiVision2030.png&quot;,&quot;농심레드포스&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LcK_2021_Teams_NS\/LcK_2021_Teams_NS.png&quot;,&quot;studentsstandup&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Parkland_Extension\/Parkland_Extension.png&quot;,&quot;marshmello&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PepsiOpeningCeremony2021\/PepsiOpeningCeremony2021.png&quot;,&quot;vforvictory&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LEC_EM_2021_VITWIN\/LEC_EM_2021_VITWIN.png&quot;,&quot;eumasters&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LEC_EM_2021_EUMasters\/LEC_EM_2021_EUMasters.png&quot;,&quot;hktwittergetsvaxxed&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/vaccinated_2021_add2\/vaccinated_2021_add2.png&quot;,&quot;niunamás&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;shernionprime&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SherniOnPrime_2021\/SherniOnPrime_2021.png&quot;,&quot;marvelsmodok&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HuluMODOK2021\/HuluMODOK2021.png&quot;,&quot;laguerradelmañana&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AmazonStudios_TomorrowWar_2021\/AmazonStudios_TomorrowWar_2021.png&quot;,&quot;anewtrip&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBC_OldMovie_May_2021_v2\/NBC_OldMovie_May_2021_v2.png&quot;,&quot;tdx21&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SalesforceTrailhead2021\/SalesforceTrailhead2021.png&quot;,&quot;penanceadair&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/thenevershbo_2021_May_v2\/thenevershbo_2021_May_v2.png&quot;,&quot;infinite&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Paramount_Infinite_2021\/Paramount_Infinite_2021.png&quot;,&quot;niunamas&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StopViolenceAgainstWomen_2020\/StopViolenceAgainstWomen_2020.png&quot;,&quot;ablackladysketchshow&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBO_ABLSS_May_2021\/HBO_ABLSS_May_2021.png&quot;,&quot;elecciones2021cl&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ChileElections_2021\/ChileElections_2021.png&quot;,&quot;oneplusnord2&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OnePlusNord_2021\/OnePlusNord_2021.png&quot;,&quot;senhoritaminutos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_Miss_Minutes_2021\/Disney_LokiLaunch_Miss_Minutes_2021.png&quot;,&quot;lightitup&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_Season4_Team_Feb_2021_Florida\/OWL_Season4_Team_Feb_2021_Florida.png&quot;,&quot;gossipgirlhbomax&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMaxGossipGirl_July_2021_XOXO\/HBOMaxGossipGirl_July_2021_XOXO.png&quot;,&quot;lcs&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCS_League_2021\/LCS_League_2021.png&quot;,&quot;lovetomakeit&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LoveToSeeIt_2021\/LoveToSeeIt_2021.png&quot;,&quot;কোভিড১৯ইন্ডিয়াসাহায্য&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Covid19India_2021\/Covid19India_2021.png&quot;,&quot;minumaqua&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KebaikanAqua_April_2021\/KebaikanAqua_April_2021.png&quot;,&quot;raidiant&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Raidiant_June_2021\/Raidiant_June_2021.png&quot;,&quot;メガ割&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Qoo10_Shopping_Q2_2021\/Qoo10_Shopping_Q2_2021.png&quot;,&quot;fra&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Euro_UK_2021_FRA\/Euro_UK_2021_FRA.png&quot;,&quot;calledelterror&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_FearStreetTrilogy_1994_2021\/Netflix_FearStreetTrilogy_1994_2021.png&quot;,&quot;todasasmulheres&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EveryWoman_2020\/EveryWoman_2020.png&quot;,&quot;juichcape&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JumboJuichcapeSummerOfSports2021\/JumboJuichcapeSummerOfSports2021.png&quot;,&quot;dieudelamalice&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_TVA_Jacket_Loki_2021_V2\/Disney_LokiLaunch_TVA_Jacket_Loki_2021_V2.png&quot;,&quot;purgemovie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheForeverPurge_2021\/TheForeverPurge_2021.png&quot;,&quot;backtheblues&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Origins21_BackTheBlues\/Origins21_BackTheBlues.png&quot;,&quot;atlup&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CDL_Team_2021_ATL\/CDL_Team_2021_ATL.png&quot;,&quot;missuniverse&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MissUniverse_2021\/MissUniverse_2021.png&quot;,&quot;maddennfl&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MaddenNFL22\/MaddenNFL22.png&quot;,&quot;wearethevalley&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_2021_Teams_WeAreTheValley\/NBA_2021_Teams_WeAreTheValley.png&quot;,&quot;theundergroundrailroad&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Amazon_UndergroundRailroad_2021\/Amazon_UndergroundRailroad_2021.png&quot;,&quot;selenaday&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SelenaNetflix_2021\/SelenaNetflix_2021.png&quot;,&quot;misschanandlerbong&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBOMax_Friends_Frame\/HBOMax_Friends_Frame.png&quot;,&quot;十六茶&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AsahiSoftDrink16tea02Japan_2021\/AsahiSoftDrink16tea02Japan_2021.png&quot;,&quot;theboldtype&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheBoldTypeTV_May_2021\/TheBoldTypeTV_May_2021.png&quot;,&quot;webull&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WeBull_May_2021_v2\/WeBull_May_2021_v2.png&quot;,&quot;playme&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SpiralSaw2021\/SpiralSaw2021.png&quot;,&quot;homenspower&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PowerCouple_BR_May_2021\/PowerCouple_BR_May_2021.png&quot;,&quot;點亮橙色&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrangeTheWorld_2020\/OrangeTheWorld_2020.png&quot;,&quot;straightuptx&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_TEX\/MLB_Teams_2021_TEX.png&quot;,&quot;мыженщины&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterWomenTentpole_2021\/TwitterWomenTentpole_2021.png&quot;,&quot;adobesummit&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AdobeSummit_2021\/AdobeSummit_2021.png&quot;,&quot;physical&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PHYS_HASHFLAG_STRONGARM_2021\/PHYS_HASHFLAG_STRONGARM_2021.png&quot;,&quot;nuestrocle&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_Teams_2021_CLE\/MLB_Teams_2021_CLE.png&quot;,&quot;pologhof&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Polo_G_Album_2021\/Polo_G_Album_2021.png&quot;,&quot;lokicongkak&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_LokiLaunch_BoastfulLoki_2021\/Disney_LokiLaunch_BoastfulLoki_2021.png&quot;,&quot;hitc3&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/88RISING_May_2021\/88RISING_May_2021.png&quot;,&quot;예지&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KPOP_VIT_ITZY_April_2021_YEJI\/KPOP_VIT_ITZY_April_2021_YEJI.png&quot;,&quot;readywillingable&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EsportsAllAccess_Jan_2021_ReadyWillingAble\/EsportsAllAccess_Jan_2021_ReadyWillingAble.png&quot;,&quot;timstwitterlisteningparties&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TimsTwitterListeningParty_2021_2022\/TimsTwitterListeningParty_2021_2022.png&quot;,&quot;fuerzaclon99&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_TheBadBatch_Helmet_April_2021\/Disney_TheBadBatch_Helmet_April_2021.png&quot;,&quot;magickingdom&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_MickeyEars_2020_Flight5_V2\/DisneyParks_MickeyEars_2020_Flight5_V2.png&quot;,&quot;marvelчернаявдова&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_BlackWidow_Symbol_2021_V2\/Disney_BlackWidow_Symbol_2021_V2.png&quot;},&quot;tweetId&quot;:&quot;1409351083177046020&quot;,&quot;profile_id&quot;:5637652,&quot;endpoint&quot;:&quot;\/i\/codinghorror\/conversation\/1409351083177046020&quot;,&quot;overlayCapable&quot;:false,&quot;finagleTraceId&quot;:&quot;001a05230064e857&quot;,&quot;isThreaded&quot;:true,&quot;inOverlay&quot;:true,&quot;trendsCacheKey&quot;:null,&quot;decider_personalized_trends&quot;:false,&quot;trendsEndpoint&quot;:&quot;\/i\/trends&quot;,&quot;initialState&quot;:{&quot;title&quot;:&quot;Jeff Atwood on Twitter: \&quot;My first text message from my child! A moment that shall live on in infamy!\u2026 \&quot;&quot;,&quot;section&quot;:null,&quot;module&quot;:&quot;app\/pages\/permalink&quot;,&quot;cache_ttl&quot;:300,&quot;body_class_names&quot;:&quot;three-col logged-out user-style-codinghorror PermalinkPage&quot;,&quot;doc_class_names&quot;:&quot;route-permalink&quot;,&quot;route_name&quot;:&quot;permalink&quot;,&quot;page_container_class_names&quot;:&quot;AppContent wrapper wrapper-permalink&quot;,&quot;ttft_navigation&quot;:false}}">
-
-  
-
-    <input type="hidden" class="swift-boot-module" value="app/pages/permalink">
-  <input type="hidden" id="swift-module-path" value="https://abs.twimg.com/k/swift/en">
-
-  
-    <script src="https://abs.twimg.com/k/en/init.en.d28d8449d76b990b62bf.js" async></script>
-
-  </body>
-</html>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-1777fci r-kzbkwu">
+<div class="css-1dbjc4n r-zl2h9q"><div class="css-1dbjc4n r-k4xj1c r-18u37iz r-1wtj0ep"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs r-1ny4l3l" id="id__zu7ppdkqypi" data-testid="User-Name">
+<div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/codinghorror" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs">
+<div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-37j5jr r-a023e6 r-b88u0q r-rjixqe r-bcqeeo r-1udh08x r-3s2u2q r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Jeff Atwood</span></span></div>
+<div dir="ltr" class="css-901oao r-xoduu5 r-18u37iz r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 r-1awozwy r-xoduu5 r-poiln3 r-bcqeeo r-qvutc0"></span></div>
+</div></a></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1wbh5a2 r-13hce6t"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2">
+<div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/codinghorror" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div dir="ltr" class="css-901oao css-1hf3ou5 r-14j79pv r-18u37iz r-37j5jr r-1wvb978 r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">@codinghorror</span></div></a></div>
+<div dir="ltr" aria-hidden="true" class="css-901oao r-14j79pv r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-s1qlax r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">·</span></div>
+<div class="css-1dbjc4n r-18u37iz r-1q142lx"><a href="/codinghorror/status/1409270864315486209" dir="ltr" aria-label="Jun 27, 2021" role="link" class="css-4rbku5 css-18t94o4 css-901oao r-14j79pv r-1loqt21 r-xoduu5 r-1q142lx r-1w6e6rj r-37j5jr r-a023e6 r-16dba41 r-9aw3ui r-rjixqe r-bcqeeo r-3s2u2q r-qvutc0"><time datetime="2021-06-27T22:02:11.000Z">Jun 27, 2021</time></a></div>
+</div></div>
+</div></div></div></div></div>
+<div itemprop="articleBody" data-testid="tweetTextAnnotations"><div class="css-1dbjc4n"><div dir="auto" lang="en" class="css-901oao r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-bnwqim r-qvutc0" style="color:rgba(15,20,25,1.00)" id="id__sd2ta53lv3" data-testid="tweetText"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Anyone else doing cellular Apple Watches rather than full blown cell phones for their almost-teens? The more I research this the more I like it.</span></div></div></div>
+<div class="css-1dbjc4n"><div aria-label="22 replies, 6 Retweets, 90 likes" role="group" class="css-1dbjc4n r-1ta3fxp r-18u37iz r-1wtj0ep r-1s2bzr4 r-1mdbhws" id="id__q2j8mv07ccl">
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="22 Replies. Reply" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="reply"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M1.751 10c0-4.42 3.584-8 8.005-8h4.366c4.49 0 8.129 3.64 8.129 8.13 0 2.96-1.607 5.68-4.196 7.11l-8.054 4.46v-3.69h-.067c-4.49.1-8.183-3.51-8.183-8.01zm8.005-6c-3.317 0-6.005 2.69-6.005 6 0 3.37 2.77 6.08 6.138 6.01l.351-.01h1.761v2.3l5.087-2.81c1.951-1.08 3.163-3.13 3.163-5.36 0-3.39-2.744-6.13-6.129-6.13H9.756z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">22</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="6 Retweets. Retweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="retweet"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M4.5 3.88l4.432 4.14-1.364 1.46L5.5 7.55V16c0 1.1.896 2 2 2H13v2H7.5c-2.209 0-4-1.79-4-4V7.55L1.432 9.48.068 8.02 4.5 3.88zM16.5 6H11V4h5.5c2.209 0 4 1.79 4 4v8.45l2.068-1.93 1.364 1.46-4.432 4.14-4.432-4.14 1.364-1.46 2.068 1.93V8c0-1.1-.896-2-2-2z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">6</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="90 Likes. Like" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="like"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M16.697 5.5c-1.222-.06-2.679.51-3.89 2.16l-.805 1.09-.806-1.09C9.984 6.01 8.526 5.44 7.304 5.5c-1.243.07-2.349.78-2.91 1.91-.552 1.12-.633 2.78.479 4.82 1.074 1.97 3.257 4.27 7.129 6.61 3.87-2.34 6.052-4.64 7.126-6.61 1.111-2.04 1.03-3.7.477-4.82-.561-1.13-1.666-1.84-2.908-1.91zm4.187 7.69c-1.351 2.48-4.001 5.12-8.379 7.67l-.503.3-.504-.3c-4.379-2.55-7.029-5.19-8.382-7.67-1.36-2.5-1.41-4.86-.514-6.67.887-1.79 2.647-2.91 4.601-3.01 1.651-.09 3.368.56 4.798 2.01 1.429-1.45 3.146-2.1 4.796-2.01 1.954.1 3.714 1.22 4.601 3.01.896 1.81.846 4.17-.514 6.67z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">90</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n" style="display:inline-grid;-webkit-justify-content:inherit;justify-content:inherit;-webkit-transform:rotate(0deg) scale(1) translate3d(0, 0, 0);transform:rotate(0deg) scale(1) translate3d(0, 0, 0);-ms-flex-pack:inherit;-webkit-box-pack:inherit"><div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="Share Tweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M12 2.59l5.7 5.7-1.41 1.42L13 6.41V16h-2V6.41l-3.3 3.3-1.41-1.42L12 2.59zM21 15l-.02 3.51c0 1.38-1.12 2.49-2.5 2.49H5.5C4.11 21 3 19.88 3 18.5V15h2v3.5c0 .28.22.5.5.5h12.98c.28 0 .5-.22.5-.5L19 15h2z"></path></g></svg>
+</div></div></div></div></div>
+</div></div>
+</div>
+</div>
+</div></div></article>
+</div></div>
+<div class="css-1dbjc4n r-j5o65s r-qklmqi r-1adg3ll r-1ny4l3l"><div itemprop="hasPart" itemscope="" itemtype="https://schema.org/SocialMediaPosting">
+<meta content="1409351083177046020" itemprop="identifier">
+<meta content="2" itemprop="position">
+<meta content="4" itemprop="commentCount">
+<meta content="" itemprop="contentRating">
+<meta content="2021-06-28T03:20:57.000Z" itemprop="dateCreated">
+<meta content="2021-06-28T03:20:57.000Z" itemprop="datePublished">
+<meta content="https://twitter.com/codinghorror/status/1409351083177046020" itemprop="url">
+<meta content="https://twitter.com/codinghorror/status/1409351083177046020" itemprop="mainEntityOfPage">
+<div itemprop="author" itemscope="" itemtype="https://schema.org/Person">
+<meta content="5637652" itemprop="identifier">
+<meta content="codinghorror" itemprop="additionalName">
+<meta content="Jeff Atwood" itemprop="givenName">
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/FollowAction" itemprop="interactionType">
+<meta content="Likes" itemprop="name">
+<meta content="284044" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/SubscribeAction" itemprop="interactionType">
+<meta content="Retweets" itemprop="name">
+<meta content="277" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/LikeAction" itemprop="interactionType">
+<meta content="Quotes" itemprop="name">
+<meta content="82117" itemprop="userInteractionCount">
+</div>
+</div>
+<div itemprop="sharedContent" itemscope="" itemtype="https://schema.org/CreativeWork">
+<meta content="Expanded Tweet URLs" itemprop="name">
+<meta content="https://t.co/TQMRJsFwnO" itemprop="url">
+<meta content="https://twitter.com/codinghorror/status/1409351083177046020/photo/1" itemprop="url">
+</div>
+<meta content="https://twitter.com/codinghorror/status/1409270864315486209" itemprop="isPartOf">
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/LikeAction" itemprop="interactionType">
+<meta content="Likes" itemprop="name">
+<meta content="https://twitter.com/codinghorror/status/1409351083177046020/likes" itemprop="url">
+<meta content="85" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Retweets" itemprop="name">
+<meta content="https://twitter.com/codinghorror/status/1409351083177046020/retweets" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Quotes" itemprop="name">
+<meta content="https://twitter.com/codinghorror/status/1409351083177046020/retweets/with_comments" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Replies" itemprop="name">
+<meta content="https://twitter.com/codinghorror/status/1409351083177046020" itemprop="url">
+<meta content="4" itemprop="userInteractionCount">
+</div>
+<article aria-labelledby="id__suctvga0xlr id__kj6f74rrf5r id__b0efe6oquqf id__f3z2uddesr id__xmkqo9g1w1q id__bwl366m317s id__rnobdd1dfy id__4ne6vtsu02n id__k3kkoosn7lm id__iw09csvxbqa id__pie16bp4qbj id__rxqpdtu6rwq id__f7iutpffwuj id__1ipvwa4pbuz id__z59ufmodgg id__lf27xcfcf6s id__sl06dryrnk id__fmj9712b4x id__u8kmfj3tezh" role="article" tabindex="-1" class="css-1dbjc4n r-18u37iz r-1ny4l3l r-1udh08x r-1qhn6m8 r-i023vh" data-testid="tweet"><div class="css-1dbjc4n r-eqz5dr r-16y2uox r-1wbh5a2"><div class="css-1dbjc4n r-16y2uox r-1wbh5a2 r-1ny4l3l">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-18u37iz">
+<div class="css-1dbjc4n r-1hwvwag r-18kxxzh r-15zivkp r-1b7u577"><div class="css-1dbjc4n r-1bimlpy r-1p0dtai r-1d2f490 r-1jgb5lz r-u8s1d r-zchlnj r-ipm5af r-m5arl1"></div></div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-ttdzmv"></div>
+</div></div>
+<div class="css-1dbjc4n r-18u37iz r-15zivkp">
+<div class="css-1dbjc4n r-1awozwy r-1hwvwag r-18kxxzh r-1b7u577"><div class="css-1dbjc4n" data-testid="Tweet-User-Avatar"><div class="css-1dbjc4n r-18kxxzh r-1wbh5a2 r-13qz1uu"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1adg3ll r-h3s6tt r-bztko3" style="width:48px" data-testid="UserAvatar-Container-codinghorror">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-1adg3ll r-1pi2tsx r-1wyvozj r-bztko3 r-u8s1d r-1v2oles r-desppf r-13qz1uu">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-ggadg3 r-1udh08x r-u8s1d r-8jfcpp" style="height:calc(100% - -4px);width:calc(100% - -4px)"><a href="/codinghorror" aria-hidden="true" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1niwhzg r-1loqt21 r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1niwhzg r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-14lw9ot r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-14lw9ot r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1adg3ll r-1udh08x" style="background-color:rgba(185,202,211,1.00)">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/profile_images/1517287320235298816/Qx-O6UCY_400x400.jpg")'></div>
+<img alt="" draggable="true" src="https://pbs.twimg.com/profile_images/1517287320235298816/Qx-O6UCY_400x400.jpg" class="css-9pa8cd">
+</div></div>
+</div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-12181gd r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"></div></div></a></div></div>
+</div></div>
+</div></div></div></div></div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-1777fci"><div class="css-1dbjc4n r-zl2h9q"><div class="css-1dbjc4n r-k4xj1c r-18u37iz r-1wtj0ep"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs r-1ny4l3l" id="id__xmkqo9g1w1q" data-testid="User-Name">
+<div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/codinghorror" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs">
+<div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-37j5jr r-a023e6 r-b88u0q r-rjixqe r-bcqeeo r-1udh08x r-3s2u2q r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Jeff Atwood</span></span></div>
+<div dir="ltr" class="css-901oao r-xoduu5 r-18u37iz r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 r-1awozwy r-xoduu5 r-poiln3 r-bcqeeo r-qvutc0"></span></div>
+</div></a></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1wbh5a2"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/codinghorror" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div dir="ltr" class="css-901oao css-1hf3ou5 r-14j79pv r-18u37iz r-37j5jr r-1wvb978 r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">@codinghorror</span></div></a></div></div></div>
+</div></div></div></div></div></div>
+</div>
+<div class="css-1dbjc4n">
+<div class="css-1dbjc4n r-1habvwh"></div>
+<div class="css-1dbjc4n"><div itemprop="articleBody" data-testid="tweetTextAnnotations"><div class="css-1dbjc4n r-1s2bzr4"><div dir="auto" lang="en" class="css-901oao r-37j5jr r-1inkyih r-16dba41 r-rjixqe r-bcqeeo r-bnwqim r-qvutc0" style="color:rgba(15,20,25,1.00)" id="id__pie16bp4qbj" data-testid="tweetText"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">My first text message from my child! A moment that shall live on in infamy!</span></div></div></div></div>
+<div class="css-1dbjc4n"><div aria-labelledby="id__7ylkdjmyscc id__x9cyyyj309m" class="css-1dbjc4n r-1ssbvtb r-1s2bzr4" id="id__f7iutpffwuj"><div class="css-1dbjc4n r-9aw3ui"><div class="css-1dbjc4n"><div class="css-1dbjc4n r-1ets6dv r-1867qdf r-1phboty r-rs99b7 r-1ny4l3l r-1udh08x r-o7ynqc r-6416eg">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-16y2uox r-1pi2tsx r-13qz1uu"><div role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1pi2tsx r-1ny4l3l"><div class="css-1dbjc4n r-1adg3ll r-1udh08x">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:124.57684495599187%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="Image" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010" data-testid="tweetPhoto">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/media/E48FVowUUAYyGLX?format=jpg&amp;name=large")'></div>
+<img alt="Image" draggable="true" src="https://pbs.twimg.com/media/E48FVowUUAYyGLX?format=jpg&amp;name=large" class="css-9pa8cd">
+</div></div>
+</div></div></div></div>
+<div itemprop="image" itemscope="" itemtype="https://schema.org/ImageObject">
+<meta content="Image" itemprop="caption">
+<meta content="https://pbs.twimg.com/media/E48FVowUUAYyGLX.jpg" itemprop="contentUrl">
+<meta content="https://pbs.twimg.com/media/E48FVowUUAYyGLX?format=jpg&amp;name=thumb" itemprop="thumbnailUrl">
+<meta content="1477" itemprop="width">
+<meta content="" itemprop="contentRating">
+</div>
+</div></div></div></div></div>
+<div class="css-1dbjc4n"></div>
+<div class="css-1dbjc4n r-1r5su4o"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wtj0ep">
+<div class="css-1dbjc4n r-1b7u577"><div class="css-1dbjc4n r-1d09ksm r-1471scf r-18u37iz r-1wbh5a2"><div dir="ltr" class="css-901oao r-14j79pv r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0"><a href="/codinghorror/status/1409351083177046020" aria-describedby="id__lcuy47jaujk" aria-label="3:20 AM · Jun 28, 2021" role="link" class="css-4rbku5 css-18t94o4 css-901oao css-16my406 r-14j79pv r-1loqt21 r-xoduu5 r-1q142lx r-1w6e6rj r-poiln3 r-9aw3ui r-bcqeeo r-3s2u2q r-qvutc0"><time datetime="2021-06-28T03:20:57.000Z">3:20 AM · Jun 28, 2021</time></a></div></div></div>
+<div class="css-1dbjc4n r-18u37iz"></div>
+</div></div>
+<div role="group" class="css-1dbjc4n r-18u37iz r-1w6e6rj">
+<div role="separator" class="css-1dbjc4n r-1dgieki r-1efd50x r-5kkj8d r-109y4c4 r-13qz1uu"></div>
+<div class="css-1dbjc4n r-1mf7evn r-1yzf0co"><a href="/codinghorror/status/1409351083177046020/likes" dir="ltr" role="link" class="css-4rbku5 css-18t94o4 css-901oao r-1loqt21 r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-1b43r93 r-b88u0q r-1cwl3u0 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">85</span></span></span></div> <span class="css-901oao css-16my406 r-14j79pv r-poiln3 r-1b43r93 r-1cwl3u0 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Likes</span></span></a></div>
+</div>
+<div class="css-1dbjc4n"><div role="group" class="css-1dbjc4n r-1oszu61 r-1dgieki r-1efd50x r-5kkj8d r-1ta3fxp r-18u37iz r-h3s6tt r-a2tzq0 r-3qxfft r-s1qlax" id="id__u8kmfj3tezh">
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="Reply" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="reply"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-50lct3 r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1srniue"><g><path d="M1.751 10c0-4.42 3.584-8 8.005-8h4.366c4.49 0 8.129 3.64 8.129 8.13 0 2.96-1.607 5.68-4.196 7.11l-8.054 4.46v-3.69h-.067c-4.49.1-8.183-3.51-8.183-8.01zm8.005-6c-3.317 0-6.005 2.69-6.005 6 0 3.37 2.77 6.08 6.138 6.01l.351-.01h1.761v2.3l5.087-2.81c1.951-1.08 3.163-3.13 3.163-5.36 0-3.39-2.744-6.13-6.129-6.13H9.756z"></path></g></svg>
+</div></div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="Retweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="retweet"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-50lct3 r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1srniue"><g><path d="M4.5 3.88l4.432 4.14-1.364 1.46L5.5 7.55V16c0 1.1.896 2 2 2H13v2H7.5c-2.209 0-4-1.79-4-4V7.55L1.432 9.48.068 8.02 4.5 3.88zM16.5 6H11V4h5.5c2.209 0 4 1.79 4 4v8.45l2.068-1.93 1.364 1.46-4.432 4.14-4.432-4.14 1.364-1.46 2.068 1.93V8c0-1.1-.896-2-2-2z"></path></g></svg>
+</div></div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="Like" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="like"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-50lct3 r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1srniue"><g><path d="M16.697 5.5c-1.222-.06-2.679.51-3.89 2.16l-.805 1.09-.806-1.09C9.984 6.01 8.526 5.44 7.304 5.5c-1.243.07-2.349.78-2.91 1.91-.552 1.12-.633 2.78.479 4.82 1.074 1.97 3.257 4.27 7.129 6.61 3.87-2.34 6.052-4.64 7.126-6.61 1.111-2.04 1.03-3.7.477-4.82-.561-1.13-1.666-1.84-2.908-1.91zm4.187 7.69c-1.351 2.48-4.001 5.12-8.379 7.67l-.503.3-.504-.3c-4.379-2.55-7.029-5.19-8.382-7.67-1.36-2.5-1.41-4.86-.514-6.67.887-1.79 2.647-2.91 4.601-3.01 1.651-.09 3.368.56 4.798 2.01 1.429-1.45 3.146-2.1 4.796-2.01 1.954.1 3.714 1.22 4.601 3.01.896 1.81.846 4.17-.514 6.67z"></path></g></svg>
+</div></div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="Bookmark" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="bookmark"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-50lct3 r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1srniue"><g><path d="M4 4.5C4 3.12 5.119 2 6.5 2h11C18.881 2 20 3.12 20 4.5v18.44l-8-5.71-8 5.71V4.5zM6.5 4c-.276 0-.5.22-.5.5v14.56l6-4.29 6 4.29V4.5c0-.28-.224-.5-.5-.5h-11z"></path></g></svg>
+</div></div></div></div>
+<div class="css-1dbjc4n" style="display:inline-grid;-webkit-justify-content:inherit;justify-content:inherit;-webkit-transform:rotate(0deg) scale(1) translate3d(0, 0, 0);transform:rotate(0deg) scale(1) translate3d(0, 0, 0);-ms-flex-pack:inherit;-webkit-box-pack:inherit"><div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="Share Tweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-50lct3 r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1srniue"><g><path d="M12 2.59l5.7 5.7-1.41 1.42L13 6.41V16h-2V6.41l-3.3 3.3-1.41-1.42L12 2.59zM21 15l-.02 3.51c0 1.38-1.12 2.49-2.5 2.49H5.5C4.11 21 3 19.88 3 18.5V15h2v3.5c0 .28.22.5.5.5h12.98c.28 0 .5-.22.5-.5L19 15h2z"></path></g></svg>
+</div></div></div></div></div>
+</div></div>
+<div class="css-1dbjc4n r-j5o65s r-rull8r r-qklmqi"></div>
+</div>
+</div></div></article>
+</div></div>
+<div class="css-1dbjc4n r-1adg3ll r-1ny4l3l"></div>
+<div class="css-1dbjc4n r-j5o65s r-qklmqi r-1adg3ll r-1ny4l3l"><div itemprop="hasPart" itemscope="" itemtype="https://schema.org/SocialMediaPosting">
+<meta content="1409352104590729216" itemprop="identifier">
+<meta content="3" itemprop="position">
+<meta content="0" itemprop="commentCount">
+<meta content="" itemprop="contentRating">
+<meta content="2021-06-28T03:25:00.000Z" itemprop="dateCreated">
+<meta content="2021-06-28T03:25:00.000Z" itemprop="datePublished">
+<meta content="https://twitter.com/f_fz/status/1409352104590729216" itemprop="url">
+<div itemprop="author" itemscope="" itemtype="https://schema.org/Person">
+<meta content="56679923" itemprop="identifier">
+<meta content="f_fz" itemprop="additionalName">
+<meta content="Ferdi F.Z." itemprop="givenName">
+</div>
+<meta content="https://twitter.com/codinghorror/status/1409351083177046020" itemprop="isPartOf">
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/LikeAction" itemprop="interactionType">
+<meta content="Likes" itemprop="name">
+<meta content="https://twitter.com/f_fz/status/1409352104590729216/likes" itemprop="url">
+<meta content="1" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Retweets" itemprop="name">
+<meta content="https://twitter.com/f_fz/status/1409352104590729216/retweets" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Quotes" itemprop="name">
+<meta content="https://twitter.com/f_fz/status/1409352104590729216/retweets/with_comments" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Replies" itemprop="name">
+<meta content="https://twitter.com/f_fz/status/1409352104590729216" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<article aria-labelledby="id__bejfoqizk5 id__d4nrpwgwmwk id__fj9wmixnu7n id__vyvu1f5clp id__bj2jrgmi7u5 id__s50mes4osei id__zozaeyvv4lp id__b8pwfq6rp4e id__z7jk16pt6t id__pous16hv06l id__kcl6ciq674a id__3xnlzwvx60v id__ao9xmr9n23w id__99uy1bs53xd id__20ffhwkuid8 id__lnl96mogrza id__6sfa5g6xjf id__pz7aekvp1f id__mm5atbl979f" role="article" tabindex="-1" class="css-1dbjc4n r-18u37iz r-1ny4l3l r-1udh08x r-1qhn6m8 r-i023vh" data-testid="tweet"><div class="css-1dbjc4n r-eqz5dr r-16y2uox r-1wbh5a2"><div class="css-1dbjc4n r-16y2uox r-1wbh5a2 r-1ny4l3l">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-18u37iz"><div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-ttdzmv"></div></div></div>
+<div class="css-1dbjc4n r-18u37iz">
+<div class="css-1dbjc4n r-1awozwy r-1hwvwag r-18kxxzh r-1b7u577"><div class="css-1dbjc4n" data-testid="Tweet-User-Avatar"><div class="css-1dbjc4n r-18kxxzh r-1wbh5a2 r-13qz1uu"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1adg3ll r-h3s6tt r-bztko3" style="width:48px" data-testid="UserAvatar-Container-f_fz">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-1adg3ll r-1pi2tsx r-1wyvozj r-bztko3 r-u8s1d r-1v2oles r-desppf r-13qz1uu">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-ggadg3 r-1udh08x r-u8s1d r-8jfcpp" style="height:calc(100% - -4px);width:calc(100% - -4px)"><a href="/f_fz" aria-hidden="true" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1niwhzg r-1loqt21 r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1niwhzg r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-14lw9ot r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-14lw9ot r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1adg3ll r-1udh08x" style="background-color:rgba(185,202,211,1.00)">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/profile_images/1361289869025181696/xvnNIGUA_400x400.jpg")'></div>
+<img alt="" draggable="true" src="https://pbs.twimg.com/profile_images/1361289869025181696/xvnNIGUA_400x400.jpg" class="css-9pa8cd">
+</div></div>
+</div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-12181gd r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"></div></div></a></div></div>
+</div></div>
+</div></div></div></div></div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-1777fci r-kzbkwu">
+<div class="css-1dbjc4n r-zl2h9q"><div class="css-1dbjc4n r-k4xj1c r-18u37iz r-1wtj0ep"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs r-1ny4l3l" id="id__bj2jrgmi7u5" data-testid="User-Name">
+<div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/f_fz" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs">
+<div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-37j5jr r-a023e6 r-b88u0q r-rjixqe r-bcqeeo r-1udh08x r-3s2u2q r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Ferdi F.Z.</span></span></div>
+<div dir="ltr" class="css-901oao r-xoduu5 r-18u37iz r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 r-1awozwy r-xoduu5 r-poiln3 r-bcqeeo r-qvutc0"></span></div>
+</div></a></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1wbh5a2 r-13hce6t"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2">
+<div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/f_fz" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div dir="ltr" class="css-901oao css-1hf3ou5 r-14j79pv r-18u37iz r-37j5jr r-1wvb978 r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">@f_fz</span></div></a></div>
+<div dir="ltr" aria-hidden="true" class="css-901oao r-14j79pv r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-s1qlax r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">·</span></div>
+<div class="css-1dbjc4n r-18u37iz r-1q142lx"><a href="/f_fz/status/1409352104590729216" dir="ltr" aria-label="Jun 28, 2021" role="link" class="css-4rbku5 css-18t94o4 css-901oao r-14j79pv r-1loqt21 r-xoduu5 r-1q142lx r-1w6e6rj r-37j5jr r-a023e6 r-16dba41 r-9aw3ui r-rjixqe r-bcqeeo r-3s2u2q r-qvutc0"><time datetime="2021-06-28T03:25:00.000Z">Jun 28, 2021</time></a></div>
+</div></div>
+</div></div></div></div></div>
+<div itemprop="articleBody" data-testid="tweetTextAnnotations"><div class="css-1dbjc4n"><div dir="auto" lang="en" class="css-901oao r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-bnwqim r-qvutc0" style="color:rgba(15,20,25,1.00)" id="id__kcl6ciq674a" data-testid="tweetText"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Mind-blown!</span></div></div></div>
+<div class="css-1dbjc4n"><div aria-label="1 like" role="group" class="css-1dbjc4n r-1ta3fxp r-18u37iz r-1wtj0ep r-1s2bzr4 r-1mdbhws" id="id__mm5atbl979f">
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="0 Replies. Reply" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="reply"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M1.751 10c0-4.42 3.584-8 8.005-8h4.366c4.49 0 8.129 3.64 8.129 8.13 0 2.96-1.607 5.68-4.196 7.11l-8.054 4.46v-3.69h-.067c-4.49.1-8.183-3.51-8.183-8.01zm8.005-6c-3.317 0-6.005 2.69-6.005 6 0 3.37 2.77 6.08 6.138 6.01l.351-.01h1.761v2.3l5.087-2.81c1.951-1.08 3.163-3.13 3.163-5.36 0-3.39-2.744-6.13-6.129-6.13H9.756z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="0 Retweets. Retweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="retweet"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M4.5 3.88l4.432 4.14-1.364 1.46L5.5 7.55V16c0 1.1.896 2 2 2H13v2H7.5c-2.209 0-4-1.79-4-4V7.55L1.432 9.48.068 8.02 4.5 3.88zM16.5 6H11V4h5.5c2.209 0 4 1.79 4 4v8.45l2.068-1.93 1.364 1.46-4.432 4.14-4.432-4.14 1.364-1.46 2.068 1.93V8c0-1.1-.896-2-2-2z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="1 Like. Like" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="like"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M16.697 5.5c-1.222-.06-2.679.51-3.89 2.16l-.805 1.09-.806-1.09C9.984 6.01 8.526 5.44 7.304 5.5c-1.243.07-2.349.78-2.91 1.91-.552 1.12-.633 2.78.479 4.82 1.074 1.97 3.257 4.27 7.129 6.61 3.87-2.34 6.052-4.64 7.126-6.61 1.111-2.04 1.03-3.7.477-4.82-.561-1.13-1.666-1.84-2.908-1.91zm4.187 7.69c-1.351 2.48-4.001 5.12-8.379 7.67l-.503.3-.504-.3c-4.379-2.55-7.029-5.19-8.382-7.67-1.36-2.5-1.41-4.86-.514-6.67.887-1.79 2.647-2.91 4.601-3.01 1.651-.09 3.368.56 4.798 2.01 1.429-1.45 3.146-2.1 4.796-2.01 1.954.1 3.714 1.22 4.601 3.01.896 1.81.846 4.17-.514 6.67z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">1</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n" style="display:inline-grid;-webkit-justify-content:inherit;justify-content:inherit;-webkit-transform:rotate(0deg) scale(1) translate3d(0, 0, 0);transform:rotate(0deg) scale(1) translate3d(0, 0, 0);-ms-flex-pack:inherit;-webkit-box-pack:inherit"><div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="Share Tweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M12 2.59l5.7 5.7-1.41 1.42L13 6.41V16h-2V6.41l-3.3 3.3-1.41-1.42L12 2.59zM21 15l-.02 3.51c0 1.38-1.12 2.49-2.5 2.49H5.5C4.11 21 3 19.88 3 18.5V15h2v3.5c0 .28.22.5.5.5h12.98c.28 0 .5-.22.5-.5L19 15h2z"></path></g></svg>
+</div></div></div></div></div>
+</div></div>
+</div>
+</div>
+</div></div></article>
+</div></div>
+<div class="css-1dbjc4n r-1adg3ll r-1ny4l3l"></div>
+<div class="css-1dbjc4n r-j5o65s r-qklmqi r-1adg3ll r-1ny4l3l"><div itemprop="hasPart" itemscope="" itemtype="https://schema.org/SocialMediaPosting">
+<meta content="1409352727008714757" itemprop="identifier">
+<meta content="4" itemprop="position">
+<meta content="0" itemprop="commentCount">
+<meta content="" itemprop="contentRating">
+<meta content="2021-06-28T03:27:29.000Z" itemprop="dateCreated">
+<meta content="2021-06-28T03:27:29.000Z" itemprop="datePublished">
+<meta content="https://twitter.com/chetfaliszek/status/1409352727008714757" itemprop="url">
+<div itemprop="author" itemscope="" itemtype="https://schema.org/Person">
+<meta content="982040378" itemprop="identifier">
+<meta content="chetfaliszek" itemprop="additionalName">
+<meta content="Chet Faliszek" itemprop="givenName">
+</div>
+<meta content="https://twitter.com/codinghorror/status/1409351083177046020" itemprop="isPartOf">
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/LikeAction" itemprop="interactionType">
+<meta content="Likes" itemprop="name">
+<meta content="https://twitter.com/chetfaliszek/status/1409352727008714757/likes" itemprop="url">
+<meta content="2" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Retweets" itemprop="name">
+<meta content="https://twitter.com/chetfaliszek/status/1409352727008714757/retweets" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Quotes" itemprop="name">
+<meta content="https://twitter.com/chetfaliszek/status/1409352727008714757/retweets/with_comments" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Replies" itemprop="name">
+<meta content="https://twitter.com/chetfaliszek/status/1409352727008714757" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<article aria-labelledby="id__6s3oxgufz6r id__atl1s0nqiwe id__dm1b7tg5a46 id__jlzv7mqmzus id__r6naboxypj9 id__qq9yprs0szb id__j8yzpnggksk id__h8ef30teyk id__60viiklzgl6 id__hjvr8n6lpb id__tr5imvyt5bg id__y4hm0wgr8r id__uefmcgxzbec id__2sa5ffr9i7d id__6k87dgzslqq id__9edyg17z9fe id__ak7eo0ltcxw id__c16rhgl89uh id__h22detcuhtf" role="article" tabindex="-1" class="css-1dbjc4n r-18u37iz r-1ny4l3l r-1udh08x r-1qhn6m8 r-i023vh" data-testid="tweet"><div class="css-1dbjc4n r-eqz5dr r-16y2uox r-1wbh5a2"><div class="css-1dbjc4n r-16y2uox r-1wbh5a2 r-1ny4l3l">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-18u37iz"><div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-ttdzmv"></div></div></div>
+<div class="css-1dbjc4n r-18u37iz">
+<div class="css-1dbjc4n r-1awozwy r-1hwvwag r-18kxxzh r-1b7u577"><div class="css-1dbjc4n" data-testid="Tweet-User-Avatar"><div class="css-1dbjc4n r-18kxxzh r-1wbh5a2 r-13qz1uu"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1adg3ll r-h3s6tt r-bztko3" style="width:48px" data-testid="UserAvatar-Container-chetfaliszek">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-1adg3ll r-1pi2tsx r-1wyvozj r-bztko3 r-u8s1d r-1v2oles r-desppf r-13qz1uu">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-ggadg3 r-1udh08x r-u8s1d r-8jfcpp" style="height:calc(100% - -4px);width:calc(100% - -4px)"><a href="/chetfaliszek" aria-hidden="true" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1niwhzg r-1loqt21 r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1niwhzg r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-14lw9ot r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-14lw9ot r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1adg3ll r-1udh08x" style="background-color:rgba(185,202,211,1.00)">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/profile_images/2920094567/ecc0064d125a61407e9c0a735a5c5f76_400x400.jpeg")'></div>
+<img alt="" draggable="true" src="https://pbs.twimg.com/profile_images/2920094567/ecc0064d125a61407e9c0a735a5c5f76_400x400.jpeg" class="css-9pa8cd">
+</div></div>
+</div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-12181gd r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"></div></div></a></div></div>
+</div></div>
+</div></div></div></div></div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-1777fci r-kzbkwu">
+<div class="css-1dbjc4n r-zl2h9q"><div class="css-1dbjc4n r-k4xj1c r-18u37iz r-1wtj0ep"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs r-1ny4l3l" id="id__r6naboxypj9" data-testid="User-Name">
+<div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/chetfaliszek" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs">
+<div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-37j5jr r-a023e6 r-b88u0q r-rjixqe r-bcqeeo r-1udh08x r-3s2u2q r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Chet Faliszek</span></span></div>
+<div dir="ltr" class="css-901oao r-xoduu5 r-18u37iz r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 r-1awozwy r-xoduu5 r-poiln3 r-bcqeeo r-qvutc0"></span></div>
+</div></a></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1wbh5a2 r-13hce6t"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2">
+<div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/chetfaliszek" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div dir="ltr" class="css-901oao css-1hf3ou5 r-14j79pv r-18u37iz r-37j5jr r-1wvb978 r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">@chetfaliszek</span></div></a></div>
+<div dir="ltr" aria-hidden="true" class="css-901oao r-14j79pv r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-s1qlax r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">·</span></div>
+<div class="css-1dbjc4n r-18u37iz r-1q142lx"><a href="/chetfaliszek/status/1409352727008714757" dir="ltr" aria-label="Jun 28, 2021" role="link" class="css-4rbku5 css-18t94o4 css-901oao r-14j79pv r-1loqt21 r-xoduu5 r-1q142lx r-1w6e6rj r-37j5jr r-a023e6 r-16dba41 r-9aw3ui r-rjixqe r-bcqeeo r-3s2u2q r-qvutc0"><time datetime="2021-06-28T03:27:29.000Z">Jun 28, 2021</time></a></div>
+</div></div>
+</div></div></div></div></div>
+<div itemprop="articleBody" data-testid="tweetTextAnnotations"><div class="css-1dbjc4n"><div dir="auto" lang="en" class="css-901oao r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-bnwqim r-qvutc0" style="color:rgba(15,20,25,1.00)" id="id__tr5imvyt5bg" data-testid="tweetText"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Make it their first NFT!</span></div></div></div>
+<div class="css-1dbjc4n"><div aria-label="2 likes" role="group" class="css-1dbjc4n r-1ta3fxp r-18u37iz r-1wtj0ep r-1s2bzr4 r-1mdbhws" id="id__h22detcuhtf">
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="0 Replies. Reply" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="reply"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M1.751 10c0-4.42 3.584-8 8.005-8h4.366c4.49 0 8.129 3.64 8.129 8.13 0 2.96-1.607 5.68-4.196 7.11l-8.054 4.46v-3.69h-.067c-4.49.1-8.183-3.51-8.183-8.01zm8.005-6c-3.317 0-6.005 2.69-6.005 6 0 3.37 2.77 6.08 6.138 6.01l.351-.01h1.761v2.3l5.087-2.81c1.951-1.08 3.163-3.13 3.163-5.36 0-3.39-2.744-6.13-6.129-6.13H9.756z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="0 Retweets. Retweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="retweet"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M4.5 3.88l4.432 4.14-1.364 1.46L5.5 7.55V16c0 1.1.896 2 2 2H13v2H7.5c-2.209 0-4-1.79-4-4V7.55L1.432 9.48.068 8.02 4.5 3.88zM16.5 6H11V4h5.5c2.209 0 4 1.79 4 4v8.45l2.068-1.93 1.364 1.46-4.432 4.14-4.432-4.14 1.364-1.46 2.068 1.93V8c0-1.1-.896-2-2-2z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="2 Likes. Like" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="like"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M16.697 5.5c-1.222-.06-2.679.51-3.89 2.16l-.805 1.09-.806-1.09C9.984 6.01 8.526 5.44 7.304 5.5c-1.243.07-2.349.78-2.91 1.91-.552 1.12-.633 2.78.479 4.82 1.074 1.97 3.257 4.27 7.129 6.61 3.87-2.34 6.052-4.64 7.126-6.61 1.111-2.04 1.03-3.7.477-4.82-.561-1.13-1.666-1.84-2.908-1.91zm4.187 7.69c-1.351 2.48-4.001 5.12-8.379 7.67l-.503.3-.504-.3c-4.379-2.55-7.029-5.19-8.382-7.67-1.36-2.5-1.41-4.86-.514-6.67.887-1.79 2.647-2.91 4.601-3.01 1.651-.09 3.368.56 4.798 2.01 1.429-1.45 3.146-2.1 4.796-2.01 1.954.1 3.714 1.22 4.601 3.01.896 1.81.846 4.17-.514 6.67z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">2</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n" style="display:inline-grid;-webkit-justify-content:inherit;justify-content:inherit;-webkit-transform:rotate(0deg) scale(1) translate3d(0, 0, 0);transform:rotate(0deg) scale(1) translate3d(0, 0, 0);-ms-flex-pack:inherit;-webkit-box-pack:inherit"><div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="Share Tweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M12 2.59l5.7 5.7-1.41 1.42L13 6.41V16h-2V6.41l-3.3 3.3-1.41-1.42L12 2.59zM21 15l-.02 3.51c0 1.38-1.12 2.49-2.5 2.49H5.5C4.11 21 3 19.88 3 18.5V15h2v3.5c0 .28.22.5.5.5h12.98c.28 0 .5-.22.5-.5L19 15h2z"></path></g></svg>
+</div></div></div></div></div>
+</div></div>
+</div>
+</div>
+</div></div></article>
+</div></div>
+<div class="css-1dbjc4n r-1adg3ll r-1ny4l3l"></div>
+<div class="css-1dbjc4n r-j5o65s r-qklmqi r-1adg3ll r-1ny4l3l"><div itemprop="hasPart" itemscope="" itemtype="https://schema.org/SocialMediaPosting">
+<meta content="1409353075232362505" itemprop="identifier">
+<meta content="5" itemprop="position">
+<meta content="0" itemprop="commentCount">
+<meta content="" itemprop="contentRating">
+<meta content="2021-06-28T03:28:52.000Z" itemprop="dateCreated">
+<meta content="2021-06-28T03:28:52.000Z" itemprop="datePublished">
+<meta content="https://twitter.com/Hanzo55/status/1409353075232362505" itemprop="url">
+<div itemprop="author" itemscope="" itemtype="https://schema.org/Person">
+<meta content="34945729" itemprop="identifier">
+<meta content="Hanzo55" itemprop="additionalName">
+<meta content="Shawn Holmes" itemprop="givenName">
+</div>
+<div itemprop="sharedContent" itemscope="" itemtype="https://schema.org/CreativeWork">
+<meta content="Expanded Tweet URLs" itemprop="name">
+<meta content="https://t.co/ARtq5AkZqG" itemprop="url">
+<meta content="https://twitter.com/Hanzo55/status/1409353075232362505/photo/1" itemprop="url">
+</div>
+<meta content="https://twitter.com/codinghorror/status/1409351083177046020" itemprop="isPartOf">
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/LikeAction" itemprop="interactionType">
+<meta content="Likes" itemprop="name">
+<meta content="https://twitter.com/Hanzo55/status/1409353075232362505/likes" itemprop="url">
+<meta content="2" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Retweets" itemprop="name">
+<meta content="https://twitter.com/Hanzo55/status/1409353075232362505/retweets" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Quotes" itemprop="name">
+<meta content="https://twitter.com/Hanzo55/status/1409353075232362505/retweets/with_comments" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Replies" itemprop="name">
+<meta content="https://twitter.com/Hanzo55/status/1409353075232362505" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<article aria-labelledby="id__86a4p49htdb id__xh9f4uz2plb id__zoyrlnm72c id__ddin2pguay id__ljree44kcpc id__2bmhbv5czdm id__1uwenpesxk7 id__pik36rqcqt id__zoq5r106ejb id__4faym9u57th id__fcxz47a7ikl id__1vur6c8r629 id__dws3bivncbd id__4859bu5qwus id__hzik0htuiwb id__nih33plwasd id__agtlessmu7 id__j2x7h2airba id__nafsejmaop" role="article" tabindex="-1" class="css-1dbjc4n r-18u37iz r-1ny4l3l r-1udh08x r-1qhn6m8 r-i023vh" data-testid="tweet"><div class="css-1dbjc4n r-eqz5dr r-16y2uox r-1wbh5a2"><div class="css-1dbjc4n r-16y2uox r-1wbh5a2 r-1ny4l3l">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-18u37iz"><div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-ttdzmv"></div></div></div>
+<div class="css-1dbjc4n r-18u37iz">
+<div class="css-1dbjc4n r-1awozwy r-1hwvwag r-18kxxzh r-1b7u577"><div class="css-1dbjc4n" data-testid="Tweet-User-Avatar"><div class="css-1dbjc4n r-18kxxzh r-1wbh5a2 r-13qz1uu"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1adg3ll r-h3s6tt r-bztko3" style="width:48px" data-testid="UserAvatar-Container-Hanzo55">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-1adg3ll r-1pi2tsx r-1wyvozj r-bztko3 r-u8s1d r-1v2oles r-desppf r-13qz1uu">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-ggadg3 r-1udh08x r-u8s1d r-8jfcpp" style="height:calc(100% - -4px);width:calc(100% - -4px)"><a href="/Hanzo55" aria-hidden="true" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1niwhzg r-1loqt21 r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1niwhzg r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-14lw9ot r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-14lw9ot r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1adg3ll r-1udh08x" style="background-color:rgba(185,202,211,1.00)">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/profile_images/1400457518669721604/v5zouGS9_400x400.jpg")'></div>
+<img alt="" draggable="true" src="https://pbs.twimg.com/profile_images/1400457518669721604/v5zouGS9_400x400.jpg" class="css-9pa8cd">
+</div></div>
+</div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-12181gd r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"></div></div></a></div></div>
+</div></div>
+</div></div></div></div></div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-1777fci r-kzbkwu">
+<div class="css-1dbjc4n r-zl2h9q"><div class="css-1dbjc4n r-k4xj1c r-18u37iz r-1wtj0ep"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs r-1ny4l3l" id="id__ljree44kcpc" data-testid="User-Name">
+<div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/Hanzo55" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs">
+<div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-37j5jr r-a023e6 r-b88u0q r-rjixqe r-bcqeeo r-1udh08x r-3s2u2q r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Shawn Holmes</span></span></div>
+<div dir="ltr" class="css-901oao r-xoduu5 r-18u37iz r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 r-1awozwy r-xoduu5 r-poiln3 r-bcqeeo r-qvutc0"></span></div>
+</div></a></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1wbh5a2 r-13hce6t"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2">
+<div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/Hanzo55" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div dir="ltr" class="css-901oao css-1hf3ou5 r-14j79pv r-18u37iz r-37j5jr r-1wvb978 r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">@Hanzo55</span></div></a></div>
+<div dir="ltr" aria-hidden="true" class="css-901oao r-14j79pv r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-s1qlax r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">·</span></div>
+<div class="css-1dbjc4n r-18u37iz r-1q142lx"><a href="/Hanzo55/status/1409353075232362505" dir="ltr" aria-label="Jun 28, 2021" role="link" class="css-4rbku5 css-18t94o4 css-901oao r-14j79pv r-1loqt21 r-xoduu5 r-1q142lx r-1w6e6rj r-37j5jr r-a023e6 r-16dba41 r-9aw3ui r-rjixqe r-bcqeeo r-3s2u2q r-qvutc0"><time datetime="2021-06-28T03:28:52.000Z">Jun 28, 2021</time></a></div>
+</div></div>
+</div></div></div></div></div>
+<div itemprop="articleBody" data-testid="tweetTextAnnotations"><div class="css-1dbjc4n"><div dir="auto" lang="en" class="css-901oao r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-bnwqim r-qvutc0" style="color:rgba(15,20,25,1.00)" id="id__fcxz47a7ikl" data-testid="tweetText"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">This will be the next milestone</span></div></div></div>
+<div aria-labelledby="id__iqqc4vxsqc id__bnes0pdnfdh" class="css-1dbjc4n r-1ssbvtb r-1s2bzr4" id="id__dws3bivncbd"><div class="css-1dbjc4n r-9aw3ui"><div class="css-1dbjc4n"><div class="css-1dbjc4n r-1ets6dv r-1867qdf r-1phboty r-rs99b7 r-1ny4l3l r-1udh08x r-o7ynqc r-6416eg">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-16y2uox r-1pi2tsx r-13qz1uu"><div role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1pi2tsx r-1ny4l3l"><div class="css-1dbjc4n r-1adg3ll r-1udh08x">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:58.07799442896936%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="Image" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010" data-testid="tweetPhoto">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/media/E48HJy6XIAAUbuy?format=jpg&amp;name=900x900")'></div>
+<img alt="Image" draggable="true" src="https://pbs.twimg.com/media/E48HJy6XIAAUbuy?format=jpg&amp;name=900x900" class="css-9pa8cd">
+</div></div>
+</div></div></div></div>
+<div itemprop="image" itemscope="" itemtype="https://schema.org/ImageObject">
+<meta content="Image" itemprop="caption">
+<meta content="https://pbs.twimg.com/media/E48HJy6XIAAUbuy.jpg" itemprop="contentUrl">
+<meta content="https://pbs.twimg.com/media/E48HJy6XIAAUbuy?format=jpg&amp;name=thumb" itemprop="thumbnailUrl">
+<meta content="718" itemprop="width">
+<meta content="" itemprop="contentRating">
+</div>
+</div></div></div></div>
+<div class="css-1dbjc4n"><div aria-label="2 likes" role="group" class="css-1dbjc4n r-1ta3fxp r-18u37iz r-1wtj0ep r-1s2bzr4 r-1mdbhws" id="id__nafsejmaop">
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="0 Replies. Reply" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="reply"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M1.751 10c0-4.42 3.584-8 8.005-8h4.366c4.49 0 8.129 3.64 8.129 8.13 0 2.96-1.607 5.68-4.196 7.11l-8.054 4.46v-3.69h-.067c-4.49.1-8.183-3.51-8.183-8.01zm8.005-6c-3.317 0-6.005 2.69-6.005 6 0 3.37 2.77 6.08 6.138 6.01l.351-.01h1.761v2.3l5.087-2.81c1.951-1.08 3.163-3.13 3.163-5.36 0-3.39-2.744-6.13-6.129-6.13H9.756z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="0 Retweets. Retweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="retweet"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M4.5 3.88l4.432 4.14-1.364 1.46L5.5 7.55V16c0 1.1.896 2 2 2H13v2H7.5c-2.209 0-4-1.79-4-4V7.55L1.432 9.48.068 8.02 4.5 3.88zM16.5 6H11V4h5.5c2.209 0 4 1.79 4 4v8.45l2.068-1.93 1.364 1.46-4.432 4.14-4.432-4.14 1.364-1.46 2.068 1.93V8c0-1.1-.896-2-2-2z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="2 Likes. Like" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="like"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M16.697 5.5c-1.222-.06-2.679.51-3.89 2.16l-.805 1.09-.806-1.09C9.984 6.01 8.526 5.44 7.304 5.5c-1.243.07-2.349.78-2.91 1.91-.552 1.12-.633 2.78.479 4.82 1.074 1.97 3.257 4.27 7.129 6.61 3.87-2.34 6.052-4.64 7.126-6.61 1.111-2.04 1.03-3.7.477-4.82-.561-1.13-1.666-1.84-2.908-1.91zm4.187 7.69c-1.351 2.48-4.001 5.12-8.379 7.67l-.503.3-.504-.3c-4.379-2.55-7.029-5.19-8.382-7.67-1.36-2.5-1.41-4.86-.514-6.67.887-1.79 2.647-2.91 4.601-3.01 1.651-.09 3.368.56 4.798 2.01 1.429-1.45 3.146-2.1 4.796-2.01 1.954.1 3.714 1.22 4.601 3.01.896 1.81.846 4.17-.514 6.67z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">2</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n" style="display:inline-grid;-webkit-justify-content:inherit;justify-content:inherit;-webkit-transform:rotate(0deg) scale(1) translate3d(0, 0, 0);transform:rotate(0deg) scale(1) translate3d(0, 0, 0);-ms-flex-pack:inherit;-webkit-box-pack:inherit"><div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="Share Tweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M12 2.59l5.7 5.7-1.41 1.42L13 6.41V16h-2V6.41l-3.3 3.3-1.41-1.42L12 2.59zM21 15l-.02 3.51c0 1.38-1.12 2.49-2.5 2.49H5.5C4.11 21 3 19.88 3 18.5V15h2v3.5c0 .28.22.5.5.5h12.98c.28 0 .5-.22.5-.5L19 15h2z"></path></g></svg>
+</div></div></div></div></div>
+</div></div>
+</div>
+</div>
+</div></div></article>
+</div></div>
+<div class="css-1dbjc4n r-1adg3ll r-1ny4l3l"></div>
+<div class="css-1dbjc4n r-j5o65s r-qklmqi r-1adg3ll r-1ny4l3l"><div itemprop="hasPart" itemscope="" itemtype="https://schema.org/SocialMediaPosting">
+<meta content="1409354572838195201" itemprop="identifier">
+<meta content="6" itemprop="position">
+<meta content="0" itemprop="commentCount">
+<meta content="" itemprop="contentRating">
+<meta content="2021-06-28T03:34:49.000Z" itemprop="dateCreated">
+<meta content="2021-06-28T03:34:49.000Z" itemprop="datePublished">
+<meta content="https://twitter.com/andrenaleen/status/1409354572838195201" itemprop="url">
+<div itemprop="author" itemscope="" itemtype="https://schema.org/Person">
+<meta content="901153681806176256" itemprop="identifier">
+<meta content="andrenaleen" itemprop="additionalName">
+<meta content="Andrei Taranchenko" itemprop="givenName">
+</div>
+<meta content="https://twitter.com/codinghorror/status/1409351083177046020" itemprop="isPartOf">
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/LikeAction" itemprop="interactionType">
+<meta content="Likes" itemprop="name">
+<meta content="https://twitter.com/andrenaleen/status/1409354572838195201/likes" itemprop="url">
+<meta content="1" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Retweets" itemprop="name">
+<meta content="https://twitter.com/andrenaleen/status/1409354572838195201/retweets" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Quotes" itemprop="name">
+<meta content="https://twitter.com/andrenaleen/status/1409354572838195201/retweets/with_comments" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Replies" itemprop="name">
+<meta content="https://twitter.com/andrenaleen/status/1409354572838195201" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<article aria-labelledby="id__h7bvcsebky9 id__hc8ixps6x5t id__nu952nfyqk id__peis6vyrys id__8dcsijrt8sb id__fayyx23n6i id__pnx8m01a1l id__tn2xwku5nr id__9v81q0zmtu4 id__gcwkb5ylrii id__zllf8uan3kc id__cs37rzzpt9o id__smsdaa7bkhc id__suaoitn4fj id__rxd6aqy76rq id__mcxhli3g73g id__guc3dmwzabr id__dc5tj6adrit id__hoo5q3ndf1h" role="article" tabindex="-1" class="css-1dbjc4n r-18u37iz r-1ny4l3l r-1udh08x r-1qhn6m8 r-i023vh" data-testid="tweet"><div class="css-1dbjc4n r-eqz5dr r-16y2uox r-1wbh5a2"><div class="css-1dbjc4n r-16y2uox r-1wbh5a2 r-1ny4l3l">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-18u37iz"><div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-ttdzmv"></div></div></div>
+<div class="css-1dbjc4n r-18u37iz">
+<div class="css-1dbjc4n r-1awozwy r-1hwvwag r-18kxxzh r-1b7u577"><div class="css-1dbjc4n" data-testid="Tweet-User-Avatar"><div class="css-1dbjc4n r-18kxxzh r-1wbh5a2 r-13qz1uu"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1adg3ll r-h3s6tt r-bztko3" style="width:48px" data-testid="UserAvatar-Container-andrenaleen">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-1adg3ll r-1pi2tsx r-1wyvozj r-bztko3 r-u8s1d r-1v2oles r-desppf r-13qz1uu">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-ggadg3 r-1udh08x r-u8s1d r-8jfcpp" style="height:calc(100% - -4px);width:calc(100% - -4px)"><a href="/andrenaleen" aria-hidden="true" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1niwhzg r-1loqt21 r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1niwhzg r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-14lw9ot r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-14lw9ot r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1adg3ll r-1udh08x" style="background-color:rgba(185,202,211,1.00)">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/profile_images/1069583899683110912/Xe38w2ow_400x400.jpg")'></div>
+<img alt="" draggable="true" src="https://pbs.twimg.com/profile_images/1069583899683110912/Xe38w2ow_400x400.jpg" class="css-9pa8cd">
+</div></div>
+</div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-12181gd r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"></div></div></a></div></div>
+</div></div>
+</div></div></div></div></div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-1777fci r-kzbkwu">
+<div class="css-1dbjc4n r-zl2h9q"><div class="css-1dbjc4n r-k4xj1c r-18u37iz r-1wtj0ep"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs r-1ny4l3l" id="id__8dcsijrt8sb" data-testid="User-Name">
+<div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/andrenaleen" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs">
+<div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-37j5jr r-a023e6 r-b88u0q r-rjixqe r-bcqeeo r-1udh08x r-3s2u2q r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Andrei Taranchenko</span></span></div>
+<div dir="ltr" class="css-901oao r-xoduu5 r-18u37iz r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 r-1awozwy r-xoduu5 r-poiln3 r-bcqeeo r-qvutc0"></span></div>
+</div></a></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1wbh5a2 r-13hce6t"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2">
+<div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/andrenaleen" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div dir="ltr" class="css-901oao css-1hf3ou5 r-14j79pv r-18u37iz r-37j5jr r-1wvb978 r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">@andrenaleen</span></div></a></div>
+<div dir="ltr" aria-hidden="true" class="css-901oao r-14j79pv r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-s1qlax r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">·</span></div>
+<div class="css-1dbjc4n r-18u37iz r-1q142lx"><a href="/andrenaleen/status/1409354572838195201" dir="ltr" aria-label="Jun 28, 2021" role="link" class="css-4rbku5 css-18t94o4 css-901oao r-14j79pv r-1loqt21 r-xoduu5 r-1q142lx r-1w6e6rj r-37j5jr r-a023e6 r-16dba41 r-9aw3ui r-rjixqe r-bcqeeo r-3s2u2q r-qvutc0"><time datetime="2021-06-28T03:34:49.000Z">Jun 28, 2021</time></a></div>
+</div></div>
+</div></div></div></div></div>
+<div itemprop="articleBody" data-testid="tweetTextAnnotations"><div class="css-1dbjc4n"><div dir="auto" lang="en" class="css-901oao r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-bnwqim r-qvutc0" style="color:rgba(15,20,25,1.00)" id="id__zllf8uan3kc" data-testid="tweetText"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">I mean, a text from your kid is less dramatic than Pearl Harbor, but I don't have all the info.</span></div></div></div>
+<div class="css-1dbjc4n"><div aria-label="1 like" role="group" class="css-1dbjc4n r-1ta3fxp r-18u37iz r-1wtj0ep r-1s2bzr4 r-1mdbhws" id="id__hoo5q3ndf1h">
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="0 Replies. Reply" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="reply"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M1.751 10c0-4.42 3.584-8 8.005-8h4.366c4.49 0 8.129 3.64 8.129 8.13 0 2.96-1.607 5.68-4.196 7.11l-8.054 4.46v-3.69h-.067c-4.49.1-8.183-3.51-8.183-8.01zm8.005-6c-3.317 0-6.005 2.69-6.005 6 0 3.37 2.77 6.08 6.138 6.01l.351-.01h1.761v2.3l5.087-2.81c1.951-1.08 3.163-3.13 3.163-5.36 0-3.39-2.744-6.13-6.129-6.13H9.756z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="0 Retweets. Retweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="retweet"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M4.5 3.88l4.432 4.14-1.364 1.46L5.5 7.55V16c0 1.1.896 2 2 2H13v2H7.5c-2.209 0-4-1.79-4-4V7.55L1.432 9.48.068 8.02 4.5 3.88zM16.5 6H11V4h5.5c2.209 0 4 1.79 4 4v8.45l2.068-1.93 1.364 1.46-4.432 4.14-4.432-4.14 1.364-1.46 2.068 1.93V8c0-1.1-.896-2-2-2z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="1 Like. Like" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="like"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M16.697 5.5c-1.222-.06-2.679.51-3.89 2.16l-.805 1.09-.806-1.09C9.984 6.01 8.526 5.44 7.304 5.5c-1.243.07-2.349.78-2.91 1.91-.552 1.12-.633 2.78.479 4.82 1.074 1.97 3.257 4.27 7.129 6.61 3.87-2.34 6.052-4.64 7.126-6.61 1.111-2.04 1.03-3.7.477-4.82-.561-1.13-1.666-1.84-2.908-1.91zm4.187 7.69c-1.351 2.48-4.001 5.12-8.379 7.67l-.503.3-.504-.3c-4.379-2.55-7.029-5.19-8.382-7.67-1.36-2.5-1.41-4.86-.514-6.67.887-1.79 2.647-2.91 4.601-3.01 1.651-.09 3.368.56 4.798 2.01 1.429-1.45 3.146-2.1 4.796-2.01 1.954.1 3.714 1.22 4.601 3.01.896 1.81.846 4.17-.514 6.67z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">1</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n" style="display:inline-grid;-webkit-justify-content:inherit;justify-content:inherit;-webkit-transform:rotate(0deg) scale(1) translate3d(0, 0, 0);transform:rotate(0deg) scale(1) translate3d(0, 0, 0);-ms-flex-pack:inherit;-webkit-box-pack:inherit"><div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="Share Tweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M12 2.59l5.7 5.7-1.41 1.42L13 6.41V16h-2V6.41l-3.3 3.3-1.41-1.42L12 2.59zM21 15l-.02 3.51c0 1.38-1.12 2.49-2.5 2.49H5.5C4.11 21 3 19.88 3 18.5V15h2v3.5c0 .28.22.5.5.5h12.98c.28 0 .5-.22.5-.5L19 15h2z"></path></g></svg>
+</div></div></div></div></div>
+</div></div>
+</div>
+</div>
+</div></div></article>
+</div></div>
+<div class="css-1dbjc4n r-o52ifk"><div class="css-1dbjc4n r-o52ifk"></div></div>
+</div></div></section>
+</div></div></div></div></div></div></main><div aria-valuemax="1" aria-valuemin="0" role="progressbar" class="css-1dbjc4n r-1awozwy r-1777fci" style="width:300px"><div class="css-1dbjc4n r-17bb2tj r-1muvv40 r-127358a r-1ldzwu0" style="height:26px;width:26px"><svg height="100%" viewbox="0 0 32 32" width="100%"><circle cx="16" cy="16" fill="none" r="14" stroke-width="4" style="stroke:#1D9BF0;opacity:0.2"></circle><circle cx="16" cy="16" fill="none" r="14" stroke-width="4" style="stroke:#1D9BF0;stroke-dasharray:80;stroke-dashoffset:60"></circle></svg></div></div>
+</div></div></div></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/spec/fixtures/onebox/twitterstatus_quoted.response b/spec/fixtures/onebox/twitterstatus_quoted.response
index e1c12efe70f..4ee67fb39cc 100644
--- a/spec/fixtures/onebox/twitterstatus_quoted.response
+++ b/spec/fixtures/onebox/twitterstatus_quoted.response
@@ -1,7199 +1,1940 @@
 <!DOCTYPE html>
-<html lang="es" data-scribe-reduced-action-queue="true">
-  <head>
-
-
-
-
-
-
-
-    <meta charset="utf-8">
-      <script  nonce="EhqI0o5dnBq1BU4s2e1q/w==">
-        !function(){window.initErrorstack||(window.initErrorstack=[]),window.onerror=function(r,i,n,o,t){r.indexOf("Script error.")>-1||window.initErrorstack.push({errorMsg:r,url:i,lineNumber:n,column:o,errorObj:t})}}();
-      </script>
-
-
-
-  <script id="bouncer_terminate_iframe" nonce="EhqI0o5dnBq1BU4s2e1q/w==">
-    if (window.top != window) {
-  window.top.postMessage({'bouncer': true, 'event': 'complete'}, '*');
-}
-  </script>
-  <script id="swift_action_queue" nonce="EhqI0o5dnBq1BU4s2e1q/w==">
-    !function(){function e(e){if(e||(e=window.event),!e)return!1;if(e.timestamp=(new Date).getTime(),!e.target&&e.srcElement&&(e.target=e.srcElement),document.documentElement.getAttribute("data-scribe-reduced-action-queue"))for(var t=e.target;t&&t!=document.body;){if("A"==t.tagName)return;t=t.parentNode}return i("all",o(e)),a(e)?(document.addEventListener||(e=o(e)),e.preventDefault=e.stopPropagation=e.stopImmediatePropagation=function(){},y?(v.push(e),i("captured",e)):i("ignored",e),!1):(i("direct",e),!0)}function t(e){n();for(var t,r=0;t=v[r];r++){var a=e(t.target),i=a.closest("a")[0];if("click"==t.type&&i){var o=e.data(i,"events"),u=o&&o.click,c=!i.hostname.match(g)||!i.href.match(/#$/);if(!u&&c){window.location=i.href;continue}}a.trigger(e.event.fix(t))}window.swiftActionQueue.wasFlushed=!0}function r(){for(var e in b)if("all"!=e)for(var t=b[e],r=0;r<t.length;r++)console.log("actionQueue",c(t[r]))}function n(){clearTimeout(w);for(var e,t=0;e=h[t];t++)document["on"+e]=null}function a(e){if(!e.target)return!1;var t=e.target,r=(t.tagName||"").toLowerCase();if(e.metaKey)return!1;if(e.shiftKey&&"a"==r)return!1;if(t.hostname&&!t.hostname.match(g))return!1;if(e.type.match(p)&&s(t))return!1;if("label"==r){var n=t.getAttribute("for");if(n){var a=document.getElementById(n);if(a&&f(a))return!1}else for(var i,o=0;i=t.childNodes[o];o++)if(f(i))return!1}return!0}function i(e,t){t.bucket=e,b[e].push(t)}function o(e){var t={};for(var r in e)t[r]=e[r];return t}function u(e){for(;e&&e!=document.body;){if("A"==e.tagName)return e;e=e.parentNode}}function c(e){var t=[];e.bucket&&t.push("["+e.bucket+"]"),t.push(e.type);var r,n,a=e.target,i=u(a),o="",c=e.timestamp&&e.timestamp-d;return"click"===e.type&&i?(r=i.className.trim().replace(/\s+/g,"."),n=i.id.trim(),o=/[^#]$/.test(i.href)?" ("+i.href+")":"",a='"'+i.innerText.replace(/\n+/g," ").trim()+'"'):(r=a.className.trim().replace(/\s+/g,"."),n=a.id.trim(),a=a.tagName.toLowerCase(),e.keyCode&&(a=String.fromCharCode(e.keyCode)+" : "+a)),t.push(a+o+(n&&"#"+n)+(!n&&r?"."+r:"")),c&&t.push(c),t.join(" ")}function f(e){var t=(e.tagName||"").toLowerCase();return"input"==t&&"checkbox"==e.getAttribute("type")}function s(e){var t=(e.tagName||"").toLowerCase();return"textarea"==t||"input"==t&&"text"==e.getAttribute("type")||"true"==e.getAttribute("contenteditable")}for(var m,d=(new Date).getTime(),l=1e4,g=/^([^\.]+\.)*twitter\.com$/,p=/^key/,h=["click","keydown","keypress","keyup"],v=[],w=null,y=!0,b={captured:[],ignored:[],direct:[],all:[]},k=0;m=h[k];k++)document["on"+m]=e;w=setTimeout(function(){y=!1},l),window.swiftActionQueue={buckets:b,flush:t,logActions:r,wasFlushed:!1}}();
-  </script>
-  <script id="composition_state" nonce="EhqI0o5dnBq1BU4s2e1q/w==">
-    !function(){function t(t){t.target.setAttribute("data-in-composition","true")}function n(t){t.target.removeAttribute("data-in-composition")}document.addEventListener&&(document.addEventListener("compositionstart",t,!1),document.addEventListener("compositionend",n,!1))}();
-  </script>
-
-    <link rel="stylesheet" href="https://abs.twimg.com/a/1558678534/css/t1/twitter_core.bundle.css" class="coreCSSBundles">
-  <link rel="stylesheet" class="moreCSSBundles" href="https://abs.twimg.com/a/1558678534/css/t1/twitter_more_1.bundle.css">
-  <link rel="stylesheet" class="moreCSSBundles" href="https://abs.twimg.com/a/1558678534/css/t1/twitter_more_2.bundle.css">
-
-    <link rel="dns-prefetch" href="https://pbs.twimg.com">
-    <link rel="dns-prefetch" href="https://t.co">
-      <link rel="preload" href="https://abs.twimg.com/k/es/init.es.385f8696ec56dc29cfc0.js" as="script">
-      <link rel="preload" href="https://abs.twimg.com/k/es/0.commons.es.db1356329b6e4ff88e45.js" as="script">
-      <link rel="preload" href="https://abs.twimg.com/k/es/5.pages_permalink.es.284053c57214b5dfa9de.js" as="script">
-
-      <title>Metallica en Twitter: &quot;Thank you to everyone who came out for #MetInParis last night for helping us support @EMMAUSolidarite &amp; @PompiersParis. #AWMH #MetalicaGivesBack… https://t.co/00ZbffUluP&quot;</title>
-      <meta name="robots" content="NOODP">
-
-
-
-
-<meta name="msapplication-TileImage" content="//abs.twimg.com/favicons/win8-tile-144.png"/>
-<meta name="msapplication-TileColor" content="#00aced"/>
-
-
-
-<link rel="mask-icon" sizes="any" href="https://abs.twimg.com/a/1558678534/icons/favicon.svg" color="#1da1f2">
-
-<link rel="shortcut icon" href="//abs.twimg.com/favicons/favicon.ico" type="image/x-icon">
-<link rel="apple-touch-icon" href="https://abs.twimg.com/icons/apple-touch-icon-192x192.png" sizes="192x192">
-
-<link rel="manifest" href="/manifest.json">
-
-
-  <meta name="swift-page-name" id="swift-page-name" content="permalink">
-  <meta name="swift-page-section" id="swift-section-name" content="permalink">
-
-    <link rel="canonical" href="https://twitter.com/metallica/status/1128068672289890305">
-  <link rel="alternate" hreflang="x-default" href="https://twitter.com/metallica/status/1128068672289890305">
-  <link rel="alternate" hreflang="fr" href="https://twitter.com/metallica/status/1128068672289890305?lang=fr"><link rel="alternate" hreflang="en" href="https://twitter.com/metallica/status/1128068672289890305?lang=en"><link rel="alternate" hreflang="ar" href="https://twitter.com/metallica/status/1128068672289890305?lang=ar"><link rel="alternate" hreflang="ja" href="https://twitter.com/metallica/status/1128068672289890305?lang=ja"><link rel="alternate" hreflang="es" href="https://twitter.com/metallica/status/1128068672289890305?lang=es"><link rel="alternate" hreflang="de" href="https://twitter.com/metallica/status/1128068672289890305?lang=de"><link rel="alternate" hreflang="it" href="https://twitter.com/metallica/status/1128068672289890305?lang=it"><link rel="alternate" hreflang="id" href="https://twitter.com/metallica/status/1128068672289890305?lang=id"><link rel="alternate" hreflang="pt" href="https://twitter.com/metallica/status/1128068672289890305?lang=pt"><link rel="alternate" hreflang="ko" href="https://twitter.com/metallica/status/1128068672289890305?lang=ko"><link rel="alternate" hreflang="tr" href="https://twitter.com/metallica/status/1128068672289890305?lang=tr"><link rel="alternate" hreflang="ru" href="https://twitter.com/metallica/status/1128068672289890305?lang=ru"><link rel="alternate" hreflang="nl" href="https://twitter.com/metallica/status/1128068672289890305?lang=nl"><link rel="alternate" hreflang="fil" href="https://twitter.com/metallica/status/1128068672289890305?lang=fil"><link rel="alternate" hreflang="ms" href="https://twitter.com/metallica/status/1128068672289890305?lang=ms"><link rel="alternate" hreflang="zh-tw" href="https://twitter.com/metallica/status/1128068672289890305?lang=zh-tw"><link rel="alternate" hreflang="zh-cn" href="https://twitter.com/metallica/status/1128068672289890305?lang=zh-cn"><link rel="alternate" hreflang="hi" href="https://twitter.com/metallica/status/1128068672289890305?lang=hi"><link rel="alternate" hreflang="no" href="https://twitter.com/metallica/status/1128068672289890305?lang=no"><link rel="alternate" hreflang="sv" href="https://twitter.com/metallica/status/1128068672289890305?lang=sv"><link rel="alternate" hreflang="fi" href="https://twitter.com/metallica/status/1128068672289890305?lang=fi"><link rel="alternate" hreflang="da" href="https://twitter.com/metallica/status/1128068672289890305?lang=da"><link rel="alternate" hreflang="pl" href="https://twitter.com/metallica/status/1128068672289890305?lang=pl"><link rel="alternate" hreflang="hu" href="https://twitter.com/metallica/status/1128068672289890305?lang=hu"><link rel="alternate" hreflang="fa" href="https://twitter.com/metallica/status/1128068672289890305?lang=fa"><link rel="alternate" hreflang="he" href="https://twitter.com/metallica/status/1128068672289890305?lang=he"><link rel="alternate" hreflang="ur" href="https://twitter.com/metallica/status/1128068672289890305?lang=ur"><link rel="alternate" hreflang="th" href="https://twitter.com/metallica/status/1128068672289890305?lang=th"><link rel="alternate" hreflang="uk" href="https://twitter.com/metallica/status/1128068672289890305?lang=uk"><link rel="alternate" hreflang="ca" href="https://twitter.com/metallica/status/1128068672289890305?lang=ca"><link rel="alternate" hreflang="ga" href="https://twitter.com/metallica/status/1128068672289890305?lang=ga"><link rel="alternate" hreflang="el" href="https://twitter.com/metallica/status/1128068672289890305?lang=el"><link rel="alternate" hreflang="eu" href="https://twitter.com/metallica/status/1128068672289890305?lang=eu"><link rel="alternate" hreflang="cs" href="https://twitter.com/metallica/status/1128068672289890305?lang=cs"><link rel="alternate" hreflang="gl" href="https://twitter.com/metallica/status/1128068672289890305?lang=gl"><link rel="alternate" hreflang="ro" href="https://twitter.com/metallica/status/1128068672289890305?lang=ro"><link rel="alternate" hreflang="hr" href="https://twitter.com/metallica/status/1128068672289890305?lang=hr"><link rel="alternate" hreflang="en-gb" href="https://twitter.com/metallica/status/1128068672289890305?lang=en-gb"><link rel="alternate" hreflang="vi" href="https://twitter.com/metallica/status/1128068672289890305?lang=vi"><link rel="alternate" hreflang="bn" href="https://twitter.com/metallica/status/1128068672289890305?lang=bn"><link rel="alternate" hreflang="bg" href="https://twitter.com/metallica/status/1128068672289890305?lang=bg"><link rel="alternate" hreflang="sr" href="https://twitter.com/metallica/status/1128068672289890305?lang=sr"><link rel="alternate" hreflang="sk" href="https://twitter.com/metallica/status/1128068672289890305?lang=sk"><link rel="alternate" hreflang="gu" href="https://twitter.com/metallica/status/1128068672289890305?lang=gu"><link rel="alternate" hreflang="mr" href="https://twitter.com/metallica/status/1128068672289890305?lang=mr"><link rel="alternate" hreflang="ta" href="https://twitter.com/metallica/status/1128068672289890305?lang=ta"><link rel="alternate" hreflang="kn" href="https://twitter.com/metallica/status/1128068672289890305?lang=kn">
-
-    <link rel="alternate" type="application/json+oembed" href="https://publish.twitter.com/oembed?url=https://twitter.com/Metallica/status/1128068672289890305" title="Metallica en Twitter: &quot;Thank you to everyone who came out for #MetInParis last night for helping us support @EMMAUSolidarite &amp; @PompiersParis. #AWMH #MetalicaGivesBack… https://t.co/00ZbffUluP&quot;">
-
-
-  <link rel="alternate" media="handheld, only screen and (max-width: 640px)" href="https://mobile.twitter.com/metallica/status/1128068672289890305">
-
-      <link rel="alternate" href="android-app://com.twitter.android/twitter/tweet?status_id=1128068672289890305&amp;ref_src=twsrc%5Egoogle%7Ctwcamp%5Eandroidseo%7Ctwgr%5Estatus%7Ctwterm%5E1128068672289890305">
-
+<html dir="ltr" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0,viewport-fit=cover">
+<link rel="preconnect" href="//abs.twimg.com">
+<link rel="dns-prefetch" href="//abs.twimg.com">
+<link rel="preconnect" href="//api.twitter.com">
+<link rel="dns-prefetch" href="//api.twitter.com">
+<link rel="preconnect" href="//pbs.twimg.com">
+<link rel="dns-prefetch" href="//pbs.twimg.com">
+<link rel="preconnect" href="//t.co">
+<link rel="dns-prefetch" href="//t.co">
+<link rel="preconnect" href="//video.twimg.com">
+<link rel="dns-prefetch" href="//video.twimg.com">
+<meta property="fb:app_id" content="2231777543">
+<meta property="og:site_name" content="Twitter">
+<meta name="google-site-verification" content="acYOOcR5z6puMzLn6hLDZI1nNHXPxt57OIstz1vnCV0">
+<meta name="facebook-domain-verification" content="x6sdcc8b5ju3bh8nbm59eswogvg6t1">
+<meta http-equiv="onion-location" content="https://twitter3e4tixl4xyajtrzo62zg5vztmjuricljdp2c5kshju4avyoid.onion/">
+<link rel="manifest" href="/manifest.json" crossorigin="use-credentials">
 <link rel="search" type="application/opensearchdescription+xml" href="/opensearch.xml" title="Twitter">
-
-    <link id="async-css-placeholder">
-
-        <meta  property="al:ios:url" content="twitter://status?id=1128068672289890305">
-    <meta  property="al:ios:app_store_id" content="333903271">
-    <meta  property="al:ios:app_name" content="Twitter">
-    <meta  property="al:android:url" content="twitter://status?status_id=1128068672289890305">
-    <meta  property="al:android:package" content="com.twitter.android">
-    <meta  property="al:android:app_name" content="Twitter">
-    <meta  property="og:type" content="article">
-    <meta  property="og:url" content="https://twitter.com/Metallica/status/1128068672289890305">
-    <meta  property="og:title" content="Metallica on Twitter">
-    <meta  property="og:image" content="https://pbs.twimg.com/profile_images/766360293953802240/kt0hiSmv_400x400.jpg">
-    <meta  property="og:description" content="“Thank you to everyone who came out for #MetInParis last night for helping us support @EMMAUSolidarite &amp;amp; @PompiersParis. #AWMH #MetalicaGivesBack https://t.co/gLtZSdDFmN”">
-    <meta  property="og:site_name" content="Twitter">
-    <meta  property="fb:app_id" content="2231777543">
-
-  </head>
-  <body class="three-col logged-out user-style-Metallica western es PermalinkPage"
-data-fouc-class-names="swift-loading no-nav-banners"
- dir="ltr">
-      <script id="swift_loading_indicator" nonce="EhqI0o5dnBq1BU4s2e1q/w==">
-        document.body.className=document.body.className+" "+document.body.getAttribute("data-fouc-class-names");
-      </script>
-
-
-    <noscript>
-      <form action="https://mobile.twitter.com/i/nojs_router?path=%2FMetallica%2Fstatus%2F1128068672289890305" method="POST" class="NoScriptForm">
-        <input type="hidden" value="b236e0558eecae44fa52b464d55738d5236980e7" name="authenticity_token">
-
-        <div class="NoScriptForm-content">
-          <span class="NoScriptForm-logo Icon Icon--logo Icon--extraLarge"></span>
-          <p>Detectamos que JavaScript está desactivado en tu navegador. ¿Quieres continuar con la versión antigua de Twitter?</p>
-          <p class="NoScriptForm-buttonContainer"><button type="submit" class="EdgeButton EdgeButton--primary">Sí</button></p>
-        </div>
-      </form>
-    </noscript>
-
-    <a href="#timeline" class="u-hiddenVisually focusable">Saltar al contenido</a>
-
-
-
-
-
-
-
-
-
-
-    <div id="doc" data-at-shortcutkeys="{&quot;Enter&quot;:&quot;Abrir detalles del Tweet&quot;,&quot;o&quot;:&quot;Expandir foto&quot;,&quot;/&quot;:&quot;Buscar&quot;,&quot;?&quot;:&quot;Este men\u00fa&quot;,&quot;j&quot;:&quot;Siguiente Tweet&quot;,&quot;k&quot;:&quot;Tweet anterior&quot;,&quot;Space&quot;:&quot;Desplazar hacia abajo&quot;,&quot;.&quot;:&quot;Cargar Tweets nuevos&quot;,&quot;gu&quot;:&quot;Ir al usuario\u2026&quot;}" class="route-permalink">
-        <div class="topbar js-topbar">
-
-
-
-    <div class="global-nav global-nav--newLoggedOut" data-section-term="top_nav">
-      <div class="global-nav-inner">
-        <div class="container">
-
-
-<ul class="nav js-global-actions" role="navigation" id="global-actions">
-  <li id="global-nav-home" class="home" data-global-action="home">
-    <a class="js-nav js-tooltip js-dynamic-tooltip" data-placement="bottom" href="/" data-component-context="home_nav" data-nav="home">
-      <span class="Icon Icon--bird Icon--large"></span>
-      <span class="text" aria-hidden="true">Inicio</span>
-      <span class="u-hiddenVisually a11y-inactive-page-text">Inicio</span>
-      <span class="u-hiddenVisually a11y-active-page-text">Inicio, página actual.</span>
-    </a>
-  </li>
-    <li id="global-nav-moments" class="moments" data-global-action="moments">
-      <a class="js-nav js-tooltip js-dynamic-tooltip" data-placement="bottom" href="/i/moments" data-component-context="moments_nav" data-nav="moments">
-        <span class="Icon Icon--lightning Icon--large"></span>
-        <span class="Icon Icon--lightningFilled Icon--large"></span>
-        <span class="text" aria-hidden="true">Momentos</span>
-        <span class="u-hiddenVisually a11y-inactive-page-text">Momentos</span>
-        <span class="u-hiddenVisually a11y-active-page-text">Momentos, página actual.</span>
-      </a>
-    </li>
-</ul>
-<div class="pull-right nav-extras">
-    <div role="search">
-  <form class="t1-form form-search js-search-form" action="/search" id="global-nav-search">
-    <label class="visuallyhidden" for="search-query">Consulta de búsqueda</label>
-    <input class="search-input" type="text" id="search-query" placeholder="Buscar en Twitter" name="q" autocomplete="off" spellcheck="false">
-    <span class="search-icon js-search-action">
-      <button type="submit" class="Icon Icon--medium Icon--search nav-search">
-        <span class="visuallyhidden">Buscar en Twitter</span>
-      </button>
-    </span>
-
-
-
-<div role="listbox" class="dropdown-menu typeahead">
-  <div aria-hidden="true" class="dropdown-caret">
-    <div class="caret-outer"></div>
-    <div class="caret-inner"></div>
-  </div>
-  <div role="presentation" class="dropdown-inner js-typeahead-results">
-    <div role="presentation" class="typeahead-saved-searches">
-  <h3 id="saved-searches-heading" class="typeahead-category-title saved-searches-title">Búsquedas guardadas</h3>
-  <ul role="presentation" class="typeahead-items saved-searches-list">
-
-    <li role="presentation" class="typeahead-item typeahead-saved-search-item">
-      <span class="Icon Icon--close" aria-hidden="true"><span class="visuallyhidden">Eliminar</span></span>
-      <a role="option" aria-describedby="saved-searches-heading" class="js-nav" href="" data-search-query="" data-query-source="" data-ds="saved_search" tabindex="-1"></a>
-    </li>
-  </ul>
-</div>
-
-    <ul role="presentation" class="typeahead-items typeahead-topics">
-
-  <li role="presentation" class="typeahead-item typeahead-topic-item">
-    <a role="option" class="js-nav" href="" data-search-query="" data-query-source="typeahead_click" data-ds="topics" tabindex="-1"></a>
-  </li>
-</ul>
-    <ul role="presentation" class="typeahead-items typeahead-accounts social-context js-typeahead-accounts">
-
-  <li role="presentation" data-user-id="" data-user-screenname="" data-remote="true" data-score="" class="typeahead-item typeahead-account-item js-selectable">
-
-    <a role="option" class="js-nav" data-query-source="typeahead_click" data-search-query="" data-ds="account">
-      <div class="js-selectable typeahead-in-conversation hidden">
-        <span class="Icon Icon--follower Icon--small"></span>
-        <span class="typeahead-in-conversation-text">En esta conversación</span>
-      </div>
-      <img class="avatar size32" alt="">
-      <span class="typeahead-user-item-info account-group">
-        <span class="fullname"></span><span class="UserBadges"><span class="Icon Icon--verified js-verified hidden"><span class="u-hiddenVisually">Cuenta verificada</span></span><span class="Icon Icon--protected js-protected hidden"><span class="u-hiddenVisually">Tweets Protegidos</span></span></span><span class="UserNameBreak">&nbsp;</span><span class="username u-dir" dir="ltr">@<b></b></span>
-      </span>
-      <span class="typeahead-social-context"></span>
-    </a>
-  </li>
-  <li role="presentation" class="js-selectable typeahead-accounts-shortcut js-shortcut"><a role="option" class="js-nav" href="" data-search-query="" data-query-source="typeahead_click" data-shortcut="true" data-ds="account_search"></a></li>
-</ul>
-
-    <ul role="presentation" class="typeahead-items typeahead-trend-locations-list">
-
-  <li role="presentation" class="typeahead-item typeahead-trend-locations-item"><a role="option" class="js-nav" href="" data-ds="trend_location" data-search-query="" tabindex="-1"></a></li>
-</ul>
-
-<div role="presentation" class="typeahead-user-select">
-  <div role="presentation" class="typeahead-empty-suggestions">
-    Usuarios recomendados
-  </div>
-  <ul role="presentation" class="typeahead-items typeahead-selected js-typeahead-selected">
-
-    <li role="presentation" data-user-id="" data-user-screenname="" data-remote="true" data-score="" class="typeahead-item typeahead-selected-item js-selectable">
-
-      <a role="option" class="js-nav" data-query-source="typeahead_click" data-search-query="" data-ds="account">
-        <img class="avatar size32" alt="">
-        <span class="typeahead-user-item-info account-group">
-          <span class="select-status deselect-user js-deselect-user Icon Icon--check"></span>
-          <span class="select-status select-disabled Icon Icon--unfollow"></span>
-          <span class="fullname"></span><span class="UserBadges"><span class="Icon Icon--verified js-verified hidden"><span class="u-hiddenVisually">Cuenta verificada</span></span><span class="Icon Icon--protected js-protected hidden"><span class="u-hiddenVisually">Tweets Protegidos</span></span></span><span class="UserNameBreak">&nbsp;</span><span class="username u-dir" dir="ltr">@<b></b></span>
-        </span>
-      </a>
-    </li>
-    <li role="presentation" class="typeahead-selected-end"></li>
-  </ul>
-
-  <ul role="presentation" class="typeahead-items typeahead-accounts js-typeahead-accounts">
-
-    <li role="presentation" data-user-id="" data-user-screenname="" data-remote="true" data-score="" class="typeahead-item typeahead-account-item js-selectable">
-
-      <a role="option" class="js-nav" data-query-source="typeahead_click" data-search-query="" data-ds="account">
-        <img class="avatar size32" alt="">
-        <span class="typeahead-user-item-info account-group">
-          <span class="select-status deselect-user js-deselect-user Icon Icon--check"></span>
-          <span class="select-status select-disabled Icon Icon--unfollow"></span>
-          <span class="fullname"></span><span class="UserBadges"><span class="Icon Icon--verified js-verified hidden"><span class="u-hiddenVisually">Cuenta verificada</span></span><span class="Icon Icon--protected js-protected hidden"><span class="u-hiddenVisually">Tweets Protegidos</span></span></span><span class="UserNameBreak">&nbsp;</span><span class="username u-dir" dir="ltr">@<b></b></span>
-        </span>
-      </a>
-    </li>
-    <li role="presentation" class="typeahead-accounts-end"></li>
-  </ul>
-</div>
-
-    <div role="presentation" class="typeahead-dm-conversations">
-  <ul role="presentation" class="typeahead-items typeahead-dm-conversation-items">
-    <li role="presentation" class="typeahead-item typeahead-dm-conversation-item">
-      <a role="option" tabindex="-1"></a>
-    </li>
-  </ul>
-</div>
-  </div>
-</div>
-
-  </form>
-</div>
-
-
-  <ul class="nav secondary-nav language-dropdown">
-    <li class="dropdown js-language-dropdown">
-      <a href="#supported_languages" class="dropdown-toggle js-dropdown-toggle">
-        <small>Idioma:</small> <span class="js-current-language">Español</span> <b class="caret"></b>
-      </a>
-      <div class="dropdown-menu dropdown-menu--rightAlign is-forceRight">
-        <div class="dropdown-caret right">
-          <span class="caret-outer"> </span>
-          <span class="caret-inner"></span>
-        </div>
-        <ul id="supported_languages">
-            <li><a href="?lang=id" data-lang-code="id" title="indonesio" class="js-language-link js-tooltip" rel="noopener">Bahasa Indonesia</a></li>
-            <li><a href="?lang=msa" data-lang-code="msa" title="malayo" class="js-language-link js-tooltip" rel="noopener">Bahasa Melayu</a></li>
-            <li><a href="?lang=ca" data-lang-code="ca" title="catalán" class="js-language-link js-tooltip" rel="noopener">Català</a></li>
-            <li><a href="?lang=cs" data-lang-code="cs" title="checo" class="js-language-link js-tooltip" rel="noopener">Čeština</a></li>
-            <li><a href="?lang=da" data-lang-code="da" title="danés" class="js-language-link js-tooltip" rel="noopener">Dansk</a></li>
-            <li><a href="?lang=de" data-lang-code="de" title="alemán" class="js-language-link js-tooltip" rel="noopener">Deutsch</a></li>
-            <li><a href="?lang=en" data-lang-code="en" title="inglés" class="js-language-link js-tooltip" rel="noopener">English</a></li>
-            <li><a href="?lang=en-gb" data-lang-code="en-gb" title="inglés británico" class="js-language-link js-tooltip" rel="noopener">English UK</a></li>
-            <li><a href="?lang=fil" data-lang-code="fil" title="filipino" class="js-language-link js-tooltip" rel="noopener">Filipino</a></li>
-            <li><a href="?lang=fr" data-lang-code="fr" title="francés" class="js-language-link js-tooltip" rel="noopener">Français</a></li>
-            <li><a href="?lang=hr" data-lang-code="hr" title="croata" class="js-language-link js-tooltip" rel="noopener">Hrvatski</a></li>
-            <li><a href="?lang=it" data-lang-code="it" title="italiano" class="js-language-link js-tooltip" rel="noopener">Italiano</a></li>
-            <li><a href="?lang=hu" data-lang-code="hu" title="húngaro" class="js-language-link js-tooltip" rel="noopener">Magyar</a></li>
-            <li><a href="?lang=nl" data-lang-code="nl" title="neerlandés" class="js-language-link js-tooltip" rel="noopener">Nederlands</a></li>
-            <li><a href="?lang=no" data-lang-code="no" title="noruego" class="js-language-link js-tooltip" rel="noopener">Norsk</a></li>
-            <li><a href="?lang=pl" data-lang-code="pl" title="polaco" class="js-language-link js-tooltip" rel="noopener">Polski</a></li>
-            <li><a href="?lang=pt" data-lang-code="pt" title="portugués" class="js-language-link js-tooltip" rel="noopener">Português</a></li>
-            <li><a href="?lang=ro" data-lang-code="ro" title="rumano" class="js-language-link js-tooltip" rel="noopener">Română</a></li>
-            <li><a href="?lang=sk" data-lang-code="sk" title="eslovaco" class="js-language-link js-tooltip" rel="noopener">Slovenčina</a></li>
-            <li><a href="?lang=fi" data-lang-code="fi" title="finés" class="js-language-link js-tooltip" rel="noopener">Suomi</a></li>
-            <li><a href="?lang=sv" data-lang-code="sv" title="sueco" class="js-language-link js-tooltip" rel="noopener">Svenska</a></li>
-            <li><a href="?lang=vi" data-lang-code="vi" title="vietnamita" class="js-language-link js-tooltip" rel="noopener">Tiếng Việt</a></li>
-            <li><a href="?lang=tr" data-lang-code="tr" title="turco" class="js-language-link js-tooltip" rel="noopener">Türkçe</a></li>
-            <li><a href="?lang=el" data-lang-code="el" title="griego" class="js-language-link js-tooltip" rel="noopener">Ελληνικά</a></li>
-            <li><a href="?lang=bg" data-lang-code="bg" title="búlgaro" class="js-language-link js-tooltip" rel="noopener">Български език</a></li>
-            <li><a href="?lang=ru" data-lang-code="ru" title="ruso" class="js-language-link js-tooltip" rel="noopener">Русский</a></li>
-            <li><a href="?lang=sr" data-lang-code="sr" title="serbio" class="js-language-link js-tooltip" rel="noopener">Српски</a></li>
-            <li><a href="?lang=uk" data-lang-code="uk" title="ucraniano" class="js-language-link js-tooltip" rel="noopener">Українська мова</a></li>
-            <li><a href="?lang=he" data-lang-code="he" title="hebreo" class="js-language-link js-tooltip" rel="noopener">עִבְרִית</a></li>
-            <li><a href="?lang=ar" data-lang-code="ar" title="árabe" class="js-language-link js-tooltip" rel="noopener">العربية</a></li>
-            <li><a href="?lang=fa" data-lang-code="fa" title="persa" class="js-language-link js-tooltip" rel="noopener">فارسی</a></li>
-            <li><a href="?lang=mr" data-lang-code="mr" title="maratí" class="js-language-link js-tooltip" rel="noopener">मराठी</a></li>
-            <li><a href="?lang=hi" data-lang-code="hi" title="hindi" class="js-language-link js-tooltip" rel="noopener">हिन्दी</a></li>
-            <li><a href="?lang=bn" data-lang-code="bn" title="bengalí" class="js-language-link js-tooltip" rel="noopener">বাংলা</a></li>
-            <li><a href="?lang=gu" data-lang-code="gu" title="guyaratí" class="js-language-link js-tooltip" rel="noopener">ગુજરાતી</a></li>
-            <li><a href="?lang=ta" data-lang-code="ta" title="tamil" class="js-language-link js-tooltip" rel="noopener">தமிழ்</a></li>
-            <li><a href="?lang=kn" data-lang-code="kn" title="canarés" class="js-language-link js-tooltip" rel="noopener">ಕನ್ನಡ</a></li>
-            <li><a href="?lang=th" data-lang-code="th" title="tailandés" class="js-language-link js-tooltip" rel="noopener">ภาษาไทย</a></li>
-            <li><a href="?lang=ko" data-lang-code="ko" title="coreano" class="js-language-link js-tooltip" rel="noopener">한국어</a></li>
-            <li><a href="?lang=ja" data-lang-code="ja" title="japonés" class="js-language-link js-tooltip" rel="noopener">日本語</a></li>
-            <li><a href="?lang=zh-cn" data-lang-code="zh-cn" title="chino simplificado" class="js-language-link js-tooltip" rel="noopener">简体中文</a></li>
-            <li><a href="?lang=zh-tw" data-lang-code="zh-tw" title="chino tradicional" class="js-language-link js-tooltip" rel="noopener">繁體中文</a></li>
-        </ul>
-      </div>
-      <div class="js-front-language">
-        <form action="/sessions/change_locale" class="t1-form language" method="POST">
-          <input type="hidden" name="lang"> <input type="hidden" name="redirect">
-          <input type="hidden" name="authenticity_token" value="b236e0558eecae44fa52b464d55738d5236980e7">
-        </form>
-      </div>
-    </li>
-  </ul>
-
-    <ul class="nav secondary-nav session-dropdown" id="session">
-      <li class="dropdown js-session">
-          <a href="/login" class="dropdown-toggle js-dropdown-toggle dropdown-signin" role="button" id="signin-link" data-nav="login">
-            <small>¿Tienes cuenta?</small> <span class="emphasize"> Iniciar sesión</span><span class="caret"></span>
-          </a>
-          <div class="dropdown-menu dropdown-form dropdown-menu--rightAlign is-forceRight" id="signin-dropdown">
-            <div class="dropdown-caret right"> <span class="caret-outer"></span> <span class="caret-inner"></span> </div>
-            <div class="signin-dialog-body">
-              <div>¿Tienes cuenta?</div>
-<form action="https://twitter.com/sessions" class="LoginForm js-front-signin" method="post"
-  data-component="login_callout"
-  data-element="form"
->
-  <div class="LoginForm-input LoginForm-username">
-    <input
-      type="text"
-      class="text-input email-input js-signin-email"
-      name="session[username_or_email]"
-      autocomplete="username"
-      placeholder="Teléfono, correo electrónico o nombre de usuario"
-    />
-  </div>
-
-  <div class="LoginForm-input LoginForm-password">
-    <input type="password" class="text-input" name="session[password]" placeholder="Contraseña" autocomplete="current-password">
-
-  </div>
-
-    <div class="LoginForm-rememberForgot">
-      <label>
-        <input type="checkbox" value="1" name="remember_me" checked="checked">
-        <span>Recordar mis datos</span>
-      </label>
-      <span class="separator">&middot;</span>
-      <a class="forgot" href="/account/begin_password_reset" rel="noopener">¿Olvidaste tu contraseña?</a>
-    </div>
-
-  <input type="submit" class="EdgeButton EdgeButton--primary EdgeButton--medium submit js-submit" value="Iniciar sesión">
-
-    <input type="hidden" name="return_to_ssl" value="true">
-
-  <input type="hidden" name="scribe_log">
-  <input type="hidden" name="redirect_after_login" value="/Metallica/status/1128068672289890305">
-  <input type="hidden" value="b236e0558eecae44fa52b464d55738d5236980e7" name="authenticity_token">
-      <input type="hidden" name="ui_metrics" autocomplete="off">
-      <script src="/i/js_inst?c_name=ui_metrics" async></script>
-</form>
-              <hr>
-              <div class="signup SignupForm">
-                <div class="SignupForm-header">¿Nuevo en Twitter?</div>
-                <a href="https://twitter.com/signup" role="button" class="EdgeButton EdgeButton--secondary EdgeButton--medium u-block js-signup"
-                  data-component="signup_callout"
-                  data-element="dropdown"
-                  >Regístrate
-                </a>
-              </div>
-            </div>
-          </div>
-      </li>
-    </ul>
-</div>
-
-        </div>
-      </div>
-    </div>
-</div>
-
-
-        <div id="page-outer">
-          <div id="page-container" class="AppContent wrapper wrapper-permalink">
-
-
-<a class="PermalinkProfile-overlay js-nav" href="/Metallica">
-  <span class="visuallyhidden">Perfil de Metallica</span>
-</a>
-<div class="PermalinkProfile-background without-banner">
-  <div class="ProfileCanopy ProfileCanopy--withNav ProfileCanopy--large js-variableHeightTopBar">
-  <div class="ProfileCanopy-inner">
-
-    <div class="ProfileCanopy-header u-bgUserColor">
-  <div class="ProfileCanopy-headerBg">
-    <img alt=""
-      src="https://pbs.twimg.com/profile_banners/238475531/1479538295/1500x500"
-
-    >
-  </div>
-
-  <div class="AppContainer">
-
-    <div class="ProfileCanopy-avatar">
-      <div class="ProfileAvatar">
-    <a class="ProfileAvatar-container u-block js-tooltip profile-picture"
-        href="https://pbs.twimg.com/profile_images/766360293953802240/kt0hiSmv_400x400.jpg"
-        title="Metallica"
-        data-resolved-url-large="https://pbs.twimg.com/profile_images/766360293953802240/kt0hiSmv_400x400.jpg"
-        data-url="https://pbs.twimg.com/profile_images/766360293953802240/kt0hiSmv_400x400.jpg"
-        target="_blank"
-        rel="noopener">
-        <img class="ProfileAvatar-image " src="https://pbs.twimg.com/profile_images/766360293953802240/kt0hiSmv_400x400.jpg" alt="Metallica">
-    </a>
-</div>
-
-    </div>
-
-
-    <div class="ProfileCanopy-headerPromptAnchor"></div>
-  </div>
-
-</div>
-
-
-    <div class="ProfileCanopy-navBar u-boxShadow">
-
-      <div class="AppContainer">
-        <div class="Grid Grid--withGutter">
-          <div class="Grid-cell u-size1of3 u-lg-size1of4">
-            <div class="ProfileCanopy-card" role="presentation">
-              <div class="ProfileCardMini">
-  <a class="ProfileCardMini-avatar profile-picture js-tooltip"
-     href="https://pbs.twimg.com/profile_images/766360293953802240/kt0hiSmv.jpg"
-     title="Metallica"
-     data-resolved-url-large="https://pbs.twimg.com/profile_images/766360293953802240/kt0hiSmv.jpg"
-     data-url="https://pbs.twimg.com/profile_images/766360293953802240/kt0hiSmv.jpg"
-     target="_blank"
-     rel="noopener">
-    <img class="ProfileCardMini-avatarImage" alt="Metallica" src="https://pbs.twimg.com/profile_images/766360293953802240/kt0hiSmv_normal.jpg" >
-  </a>
-  <div class="ProfileCardMini-details">
-    <div class="ProfileNameTruncated account-group">
-  <div class="u-textTruncate u-inlineBlock ProfileNameTruncated-withBadges ProfileNameTruncated-withBadges--1">
-    <a class="fullname ProfileNameTruncated-link u-textInheritColor js-nav" href="/Metallica"  data-aria-label-part>
-      Metallica</a></div><span class="UserBadges"><span class="Icon Icon--verified"><span class="u-hiddenVisually">Cuenta verificada</span></span></span>
-</div>
-    <div class="ProfileCardMini-screenname">
-      <a href="/Metallica" class="ProfileCardMini-screennameLink u-linkComplex js-nav u-dir" dir="ltr">
-        <span class="username u-dir" dir="ltr">@<b class="u-linkComplex-target">Metallica</b></span>
-      </a>
-    </div>
-  </div>
-</div>
-
-            </div>
-          </div>
-
-          <div class="Grid-cell u-size2of3 u-lg-size3of4">
-            <div class="ProfileCanopy-nav">
-
-
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-
-  </div>
-</div>
-
-
-    <div class="ProfileHeading">
-  <div class="ProfileHeading-spacer"></div>
-    <h2 id="content-main-heading" class="u-hiddenVisually">Tweets</h2>
-</div>
-
-
-  <div class="AppContainer">
-    <div class="Grid Grid--withGutter">
-      <div class="Grid-cell u-size1of3 u-lg-size1of4">
-        <div class="Grid Grid--withGutter">
-          <div class="Grid-cell">
-            <div class="ProfileSidebar ProfileSidebar--withLeftAlignment">
-  <div class="ProfileHeaderCard">
-  <h1 class="ProfileHeaderCard-name">
-    <a href="/Metallica"
-       class="ProfileHeaderCard-nameLink u-textInheritColor js-nav">Metallica</a><span class="ProfileHeaderCard-badges"><a href="" class="js-tooltip" target="_blank" title="Cuenta verificada" data-placement="right" rel="noopener"><span class="Icon Icon--verified"><span class="u-hiddenVisually">Cuenta verificada</span></span></a></span>
-  </h1>
-
-  <h2 class="ProfileHeaderCard-screenname u-inlineBlock u-dir" dir="ltr">
-    <a class="ProfileHeaderCard-screennameLink u-linkComplex js-nav" href="/Metallica">
-      <span class="username u-dir" dir="ltr">@<b class="u-linkComplex-target">Metallica</b></span>
-    </a>
-  </h2>
-
-
-
-      <p class="ProfileHeaderCard-bio u-dir" dir="ltr"><a href="http://t.co/EAkqroM0OA" rel="nofollow noopener" dir="ltr" data-expanded-url="http://metallica.com" class="twitter-timeline-link" target="_blank" title="http://metallica.com" ><span class="invisible">http://</span><span class="js-display-url">metallica.com</span><span class="tco-ellipsis"><span class="invisible">&nbsp;</span></span></a> | <a href="http://t.co/BEu6OVRhKG" rel="nofollow noopener" dir="ltr" data-expanded-url="http://livemetallica.com" class="twitter-timeline-link" target="_blank" title="http://livemetallica.com" ><span class="invisible">http://</span><span class="js-display-url">livemetallica.com</span><span class="tco-ellipsis"><span class="invisible">&nbsp;</span></span></a></p>
-
-      <div class="ProfileHeaderCard-location ">
-        <span class="Icon Icon--geo Icon--medium" aria-hidden="true" role="presentation"></span>
-        <span class="ProfileHeaderCard-locationText u-dir" dir="ltr">
-              San Francisco, CA
-
-        </span>
-      </div>
-
-      <div class="ProfileHeaderCard-url ">
-        <span class="Icon Icon--url Icon--medium" aria-hidden="true" role="presentation"></span>
-        <span class="ProfileHeaderCard-urlText u-dir">  <a class="u-textUserColor" target="_blank" rel="me nofollow noopener" href="http://t.co/kVxaQpmqSI" title="http://www.metallica.com">
-    metallica.com
-  </a>
-
-</span>
-      </div>
-
-
-      <div class="ProfileHeaderCard-joinDate">
-        <span class="Icon Icon--calendar Icon--medium" aria-hidden="true" role="presentation"></span>
-        <span class="ProfileHeaderCard-joinDateText js-tooltip u-dir" dir="ltr" title="23:34 - 14 ene. 2011">Se unió en enero de 2011</span>
-      </div>
-
-      <div class="ProfileHeaderCard-birthdate u-hidden">
-        <span class="Icon Icon--balloon Icon--medium" aria-hidden="true" role="presentation"></span>
-        <span class="ProfileHeaderCard-birthdateText u-dir" dir="ltr">
-</span>
-      </div>
-
-
-</div>
-
-
-
-
-
-
-
-</div>
-
-          </div>
-        </div>
-      </div>
-      <div class="Grid-cell u-size2of3 u-lg-size3of4">
-        <div class="Grid Grid--withGutter">
-          <div class="Grid-cell u-lg-size2of3" data-test-selector="ProfileTimeline">
-              <div class="ProfileHeading">
-  <div class="ProfileHeading-spacer"></div>
-    <h2 id="content-main-heading" class="u-hiddenVisually">Tweets</h2>
-</div>
-
-
-
-
-
-
-
-
-
-
-
-          </div>
-          <div class="Grid-cell u-size1of3">
-            <div class="Grid Grid--withGutter">
-              <div class="Grid-cell">
-                <div class="ProfileSidebar ProfileSidebar--withRightAlignment">
-                  <div class="MoveableModule">
-
-<div class="SidebarCommonModules">
-
-
-
-
-
-  <div class="Footer module roaming-module Footer--slim"
-  >
-  <div class="flex-module">
-    <div class="flex-module-inner js-items-container">
-      <ul class="u-cf">
-        <li class="Footer-item Footer-copyright copyright">&copy; 2019 Twitter</li>
-        <li class="Footer-item"><a class="Footer-link" href="/about" rel="noopener">Sobre nosotros</a></li>
-        <li class="Footer-item"><a class="Footer-link" href="//support.twitter.com" rel="noopener">Centro de Ayuda</a></li>
-        <li class="Footer-item"><a class="Footer-link" href="/tos" rel="noopener">Condiciones</a></li>
-        <li class="Footer-item"><a class="Footer-link" href="/privacy" rel="noopener">Política de privacidad</a></li>
-        <li class="Footer-item"><a class="Footer-link" href="//support.twitter.com/articles/20170514" rel="noopener">Cookies</a></li>
-        <li class="Footer-item"><a class="Footer-link" href="//business.twitter.com/en/help/troubleshooting/how-twitter-ads-work.html" rel="noopener">Información sobre anuncios</a></li>
-      </ul>
-    </div>
-  </div>
-
-</div>
-
-</div>
-
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-
-<style id="user-style-Metallica">
-
-
-
-
-
-
-  a,
-  a:hover,
-  a:focus,
-  a:active {
-    color: #2FC2EF;
-  }
-
-  .u-textUserColor,
-  .u-textUserColorHover:hover,
-  .u-textUserColorHover:hover .ProfileTweet-actionCount,
-  .u-textUserColorHover:focus {
-    color: #2FC2EF !important;
-  }
-
-  .u-borderUserColor,
-  .u-borderUserColorHover:hover,
-  .u-borderUserColorHover:focus {
-    border-color: #2FC2EF !important;
-  }
-
-  .u-bgUserColor,
-  .u-bgUserColorHover:hover,
-  .u-bgUserColorHover:focus {
-    background-color: #2FC2EF !important;
-  }
-
-  .u-dropdownUserColor > li:hover,
-  .u-dropdownUserColor > li:focus,
-  .u-dropdownUserColor > li > button:hover,
-  .u-dropdownUserColor > li > button:focus,
-  .u-dropdownUserColor > li > a:focus,
-  .u-dropdownUserColor > li > a:hover {
-    color: #fff !important;
-    background-color: #2FC2EF !important;
-  }
-
-  .u-boxShadowInsetUserColorHover:hover,
-  .u-boxShadowInsetUserColorHover:focus {
-    box-shadow: inset 0 0 0 5px #2FC2EF !important;
-  }
-
-  .u-dropdownOpenUserColor.dropdown.open .dropdown-toggle {
-    color: #2FC2EF;
-  }
-
-
-  .u-textUserColorLight {
-    color: #ABE6F8 !important;
-  }
-
-  .u-borderUserColorLight,
-  .u-borderUserColorLightFocus:focus,
-  .u-borderUserColorLightHover:hover,
-  .u-borderUserColorLightHover:focus {
-    border-color: #ABE6F8 !important;
-  }
-
-  .u-bgUserColorLight {
-    background-color: #ABE6F8 !important;
-  }
-
-
-  .u-boxShadowUserColorLighterFocus:focus {
-    box-shadow: 0 0 8px rgba(0, 0, 0, 0.05), inset 0 1px 2px rgba(47,194,239,0.25) !important;
-  }
-
-
-  .u-textUserColorLightest {
-    color: #EAF8FD !important;
-  }
-
-  .u-borderUserColorLightest {
-    border-color: #EAF8FD !important;
-  }
-
-  .u-bgUserColorLightest {
-    background-color: #EAF8FD !important;
-  }
-
-
-  .u-textUserColorLighter {
-    color: #CBEFFB !important;
-  }
-
-  .u-borderUserColorLighter {
-    border-color: #CBEFFB !important;
-  }
-
-  .u-bgUserColorLighter {
-    background-color: #CBEFFB !important;
-  }
-
-
-  .u-bgUserColorDarkHover:hover {
-    background-color: #2BA3CA !important;
-  }
-
-  .u-borderUserColorDark {
-    border-color: #2BA3CA !important;
-  }
-
-
-  .u-bgUserColorDarkerActive:active {
-    background-color: #2784A5 !important;
-  }
-
-
-
-
-
-
-
-
-
-
-
-
-
-a,
-.btn-link,
-.btn-link:focus,
-.icon-btn,
-
-
-
-.pretty-link b,
-.pretty-link:hover s,
-.pretty-link:hover b,
-.pretty-link:focus s,
-.pretty-link:focus b,
-
-.metadata a:hover,
-.metadata a:focus,
-
-a.account-group:hover .fullname,
-a.account-group:focus .fullname,
-.account-summary:focus .fullname,
-
-.message .message-text a,
-.message .message-text button,
-.stats a strong,
-.plain-btn:hover,
-.plain-btn:focus,
-.dropdown.open .user-dropdown.plain-btn,
-.open > .plain-btn,
-#global-actions .new:before,
-.module .list-link:hover,
-.module .list-link:focus,
-
-.stats a:hover,
-.stats a:hover strong,
-.stats a:focus,
-.stats a:focus strong,
-
-.find-friends-sources li:hover .source,
-
-
-
-
-
-.stream-item a:hover .fullname,
-.stream-item a:focus .fullname,
-
-.stream-item .view-all-supplements:hover,
-.stream-item .view-all-supplements:focus,
-
-.tweet .time a:hover,
-.tweet .time a:focus,
-.tweet .details.with-icn b,
-.tweet .details.with-icn .Icon,
-
-.stream-item:hover .original-tweet .details b,
-.stream-item .original-tweet.focus .details b,
-.stream-item.open .original-tweet .details b,
-
-.client-and-actions a:hover,
-.client-and-actions a:focus,
-
-.dismiss-btn:hover b,
-
-.tweet .context .pretty-link:hover s,
-.tweet .context .pretty-link:hover b,
-.tweet .context .pretty-link:focus s,
-.tweet .context .pretty-link:focus b,
-
-.list .username a:hover,
-.list .username a:focus,
-.list-membership-container .create-a-list,
-.list-membership-container .create-a-list:hover,
-.new-tweets-bar,
-
-
-
-.card .list-details a:hover,
-.card .list-details a:focus,
-.card .card-body:hover .attribution,
-.card .card-body .attribution:focus {
-  color: #2FC2EF;
-}
-
-
-
-
-
-  .FoundMediaSearch--keyboard .FoundMediaSearch-focusable.is-focused {
-    border-color: #2FC2EF;
-  }
-
-
-  .photo-selector:hover .btn,
-  .icon-btn:hover,
-  .icon-btn:active,
-  .icon-btn.active,
-  .icon-btn.enabled {
-    border-color: #2FC2EF;
-    border-color: rgba(47,194,239,0.4);
-    color: #2FC2EF;
-  }
-
-
-  .photo-selector:hover .btn,
-  .icon-btn:hover {
-    background-image: linear-gradient(rgba(255,255,255,0), rgba(47,194,239,0.1));
-  }
-
-  .icon-btn.disabled,
-  .icon-btn.disabled:hover,
-  .icon-btn[disabled],
-  .icon-btn[aria-disabled=true] {
-    color: #2FC2EF;
-  }
-
-
-
-
-  .EdgeButton--primary,
-  .EdgeButton--primary:focus {
-    background-color: #58CEF2;
-    border-color: transparent;
-  }
-
-  .EdgeButton--primary:hover,
-  .EdgeButton--primary:active {
-    background-color: #2FC2EF;
-    border-color: #2FC2EF;
-  }
-
-  .EdgeButton--primary:focus {
-    box-shadow:
-      0 0 0 2px #FFFFFF,
-      0 0 0 4px #ABE6F8;
-  }
-
-  .EdgeButton--primary:active {
-    box-shadow:
-      0 0 0 2px #FFFFFF,
-      0 0 0 4px #58CEF2;
-  }
-
-
-
-
-  .EdgeButton--secondary,
-  .EdgeButton--secondary:hover,
-  .EdgeButton--secondary:focus,
-  .EdgeButton--secondary:active {
-    border-color: #2FC2EF;
-    color: #2FC2EF;
-  }
-
-  .EdgeButton--secondary:hover,
-  .EdgeButton--secondary:active {
-    background-color: #EAF8FD;
-  }
-
-  .EdgeButton--secondary:focus {
-    box-shadow:
-      0 0 0 2px #FFFFFF,
-      0 0 0 4px rgba(47,194,239,0.4);
-  }
-
-  .EdgeButton--secondary:active {
-    box-shadow:
-      0 0 0 2px #FFFFFF,
-      0 0 0 4px #2FC2EF;
-  }
-
-
-
-
-  .EdgeButton--invertedPrimary {
-    color: #2FC2EF !important;
-  }
-
-  .EdgeButton--invertedPrimary:focus {
-    box-shadow:
-      0 0 0 2px #2FC2EF,
-      0 0 0 4px #ABE6F8;
-  }
-
-  .EdgeButton--invertedPrimary:active {
-    box-shadow:
-      0 0 0 2px #2FC2EF,
-      0 0 0 4px #FFFFFF;
-  }
-
-
-
-
-  .EdgeButton--invertedSecondary {
-    background-color: #2FC2EF;
-  }
-
-  .EdgeButton--invertedSecondary:hover {
-    background-color: #58CEF2;
-  }
-
-  .EdgeButton--invertedSecondary:focus {
-    box-shadow:
-      0 0 0 2px #2FC2EF,
-      0 0 0 4px #ABE6F8;
-  }
-
-  .EdgeButton--invertedSecondary:active {
-    box-shadow:
-      0 0 0 2px #2FC2EF,
-      0 0 0 4px #FFFFFF;
-  }
-
-
-
-  .btn:focus,
-  .btn.focus,
-  .Button:focus,
-  .EmojiPicker-item.is-focused,
-  .EmojiPicker .EmojiCategoryIcon:focus,
-  .EmojiPicker-skinTone:focus + .EmojiPicker-skinToneSwatch,
-  a:focus > img:first-child:last-child,
-  button:focus {
-    box-shadow:
-      0 0 0 2px #FFFFFF,
-      0 0 2px 4px rgba(47,194,239,0.4);
-  }
-
-  .selected-stream-item:focus {
-    box-shadow: 0 0 0 3px rgba(47,194,239,0.4);
-  }
-
-
-  .js-navigable-stream.stream-table-view .selected-stream-item[tabindex="-1"]:focus {
-    outline: 3px solid rgba(47,194,239,0.4) !important;
-  }
-
-
-  .js-navigable-stream.stream-table-view .selected-stream-item:focus {
-    box-shadow: none;
-  }
-
-
-
-  .global-dm-nav.new.with-count .dm-new .count-inner {
-    background: #2FC2EF;
-  }
-
-  .global-nav .people .count .count-inner {
-    background: #2FC2EF;
-  }
-
-  .dropdown-menu li > a:hover,
-  .dropdown-menu li > a:focus,
-  .dropdown-menu .dropdown-link:hover,
-  .dropdown-menu .dropdown-link:focus,
-  .dropdown-menu .dropdown-link.is-focused,
-  .dropdown-menu li:hover .dropdown-link,
-  .dropdown-menu li:focus .dropdown-link,
-  .dropdown-menu .selected a,
-  .dropdown-menu .dropdown-link.selected {
-    background-color: #2FC2EF !important;
-  }
-
-  /* for items in typeahead dropdown menu on logged in pages */
-  .dropdown-menu .typeahead-items li > a:focus,
-  .dropdown-menu .typeahead-items li > a:hover,
-  .dropdown-menu .typeahead-items .selected,
-  .dropdown-menu .typeahead-items .selected a {
-    background-color: #EAF8FD !important;
-    color: #2FC2EF !important;
-  }
-
-  .typeahead a:hover,
-  .typeahead a:hover strong,
-  .typeahead a:hover .fullname,
-  .typeahead .selected a,
-  .typeahead .selected strong,
-  .typeahead .selected .fullname,
-  .typeahead .selected .Icon--close {
-    color: #2FC2EF !important;
-  }
-
-
-.home-tweet-box,
-.LiveVideo-tweetBox,
-.RetweetDialog-commentBox {
-  background-color: #EAF8FD;
-}
-
-.top-timeline-tweetbox .timeline-tweet-box .tweet-form.condensed .tweet-box {
-  color: #2FC2EF;
-}
-
-.RichEditor,
-.TweetBoxAttachments {
-  border-color: #CBEFFB;
-}
-
-input:focus,
-textarea:focus,
-div[contenteditable="true"]:focus,
-div[contenteditable="true"].fake-focus,
-div[contenteditable="plaintext-only"]:focus,
-div[contenteditable="plaintext-only"].fake-focus {
-  border-color: #ABE6F8;
-  box-shadow: inset 0 0 0 1px rgba(47,194,239,0.7);
-}
-
-.tweet-box textarea:focus,
-.tweet-box input[type=text],
-.currently-dragging .tweet-form.is-droppable .tweet-drag-help,
-.tweet-box[contenteditable="true"]:focus,
-.RichEditor.is-fakeFocus,
-.RichEditor.is-fakeFocus ~ .TweetBoxAttachments {
-  border-color: #ABE6F8;
-  box-shadow: 0 0 0 1px #ABE6F8;
-}
-
-.MomentCapsuleItem.selected-stream-item:focus {
-  box-shadow: 0 0 0 3px rgba(47,194,239,0.4);
-}
-
-
-
-
-s,
-.pretty-link:hover s,
-.pretty-link:focus s,
-.stream-item-activity-notification .latest-tweet .tweet-row a:hover s,
-.stream-item-activity-notification .latest-tweet .tweet-row a:focus s {
-    color: #2FC2EF;
-}
-
-
-
-.vellip,
-.vellip:before,
-.vellip:after,
-.conversation-module > li:after,
-.conversation-module > li:before,
-.ThreadedConversation--loneTweet:after,
-.ThreadedConversation-tweet:not(.is-hiddenAncestor) ~ .ThreadedConversation-tweet:before,
-.ThreadedConversation-tweet:after,
-.ThreadedConversation-moreReplies:before,
-.ThreadedConversation-viewOther:before,
-.ThreadedConversation-unavailableTweet:before,
-.ThreadedConversation-unavailableTweet:after,
-.ThreadedConversation--permalinkTweetWithAncestors:before,
-.mini-avatar-with-thread:before,
-.permalink.self-thread-permalink-with-descendant .permalink-tweet-container:after,
-.permalink.self-thread-permalink-with-descendant .inline-reply-tweetbox-container:after {
-    border-color: #ABE6F8;
-}
-
-
-
-
-.tweet .sm-reply,
-.tweet .sm-rt,
-.tweet .sm-fav,
-.tweet .sm-image,
-.tweet .sm-video,
-.tweet .sm-audio,
-.tweet .sm-geo,
-.tweet .sm-in,
-.tweet .sm-trash,
-.tweet .sm-more,
-.tweet .sm-page,
-.tweet .sm-embed,
-.tweet .sm-summary,
-.tweet .sm-chat,
-
-.timelines-navigation .active .profile-nav-icon,
-.timelines-navigation .profile-nav-icon:hover,
-.timelines-navigation .profile-nav-link:focus .profile-nav-icon,
-
-.sm-top-tweet {
-    background-color: #2FC2EF;
-}
-
-.enhanced-mini-profile .mini-profile .profile-summary {
-  background-image: url(https://pbs.twimg.com/profile_banners/238475531/1479538295/mobile);
-}
-
-  #global-tweet-dialog .modal-header,
-  #Tweetstorm-dialog .modal-header {
-    border-bottom: solid 1px rgba(47,194,239,0.25);
-  }
-
-  #global-tweet-dialog .modal-tweet-form-container,
-  #Tweetstorm-dialog .modal-body {
-    background-color: #2FC2EF;
-    background: rgba(47,194,239,0.1);
-  }
-
-  .TweetstormDialog-reply-context .tweet-box-avatar:after,
-  .TweetstormDialog-reply-context .tweet-box-avatar:before,
-  .TweetstormDialog-tweet-box .tweet-box-avatar:after,
-  .TweetstormDialog-tweet-box .tweet-box-avatar:before {
-    border-color: #ABE6F8;
-  }
-
-  .global-nav .search-input:focus,
-  .global-nav .search-input.focus {
-    border: 2px solid #2FC2EF;
-  }
-}
-
-  .inline-reply-tweetbox {
-    background-color: #EAF8FD;
-  }
-
-</style>
-
-
-<style id="user-style-Metallica-header-img" class="js-user-style-header-img">
-
-    body.user-style-Metallica .enhanced-mini-profile .mini-profile .profile-summary {
-      background-image: url(https://pbs.twimg.com/profile_banners/238475531/1479538295/web);
+<link rel="shortcut icon" href="//abs.twimg.com/favicons/twitter.2.ico">
+<meta name="mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-title" content="Twitter">
+<meta name="apple-mobile-web-app-status-bar-style" content="white">
+<meta name="theme-color" content="#ffffff">
+<script type="application/ld+json">{"@context":"https://schema.org","@type":"WebSite","url":"https://twitter.com/","potentialAction":{"@type":"SearchAction","query-input":"required name=search_term_string","target":{"@type":"EntryPoint","urlTemplate":"https://twitter.com/search?q={search_term_string}&ref_src=twcamp%5Eseo_searchbox%7Ctwsrc%5Eseo"}}}</script><meta http-equiv="origin-trial" content="AlpCmb40F5ZjDi9ZYe+wnr/V8MF+XmY41K4qUhoq+2mbepJTNd3q4CRqlACfnythEPZqcjryfAS1+ExS0FFRcA8AAABmeyJvcmlnaW4iOiJodHRwczovL3R3aXR0ZXIuY29tOjQ0MyIsImZlYXR1cmUiOiJMYXVuY2ggSGFuZGxlciIsImV4cGlyeSI6MTY1NTI1MTE5OSwiaXNTdWJkb21haW4iOnRydWV9">
+<style>html,body{height: 100%;}::cue{white-space:normal}</style>
+<style id="react-native-stylesheet">[stylesheet-group="0"]{}
+html{-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;-webkit-tap-highlight-color:rgba(0,0,0,0);}
+body{margin:0;}
+button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0;}
+input::-webkit-search-cancel-button,input::-webkit-search-decoration,input::-webkit-search-results-button,input::-webkit-search-results-decoration{display:none;}
+[stylesheet-group="0.1"]{}
+:focus:not([data-focusvisible-polyfill]){outline: none;}
+[stylesheet-group="0.5"]{}
+.css-4rbku5{background-color:rgba(0,0,0,0.00);color:inherit;font:inherit;list-style:none;margin-bottom:0px;margin-left:0px;margin-right:0px;margin-top:0px;text-align:inherit;text-decoration:none;}
+.css-18t94o4{cursor:pointer;}
+[stylesheet-group="1"]{}
+.css-1dbjc4n{-ms-flex-align:stretch;-ms-flex-direction:column;-ms-flex-negative:0;-ms-flex-preferred-size:auto;-webkit-align-items:stretch;-webkit-box-align:stretch;-webkit-box-direction:normal;-webkit-box-orient:vertical;-webkit-flex-basis:auto;-webkit-flex-direction:column;-webkit-flex-shrink:0;align-items:stretch;border:0 solid black;box-sizing:border-box;display:-webkit-box;display:-moz-box;display:-ms-flexbox;display:-webkit-flex;display:flex;flex-basis:auto;flex-direction:column;flex-shrink:0;margin-bottom:0px;margin-left:0px;margin-right:0px;margin-top:0px;min-height:0px;min-width:0px;padding-bottom:0px;padding-left:0px;padding-right:0px;padding-top:0px;position:relative;z-index:0;}
+.css-901oao{border:0 solid black;box-sizing:border-box;color:rgba(0,0,0,1.00);display:inline;font:14px -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Helvetica,Arial,sans-serif;margin-bottom:0px;margin-left:0px;margin-right:0px;margin-top:0px;padding-bottom:0px;padding-left:0px;padding-right:0px;padding-top:0px;white-space:pre-wrap;word-wrap:break-word;}
+.css-16my406{color:inherit;font:inherit;white-space:inherit;}
+.css-1hf3ou5{max-width:100%;overflow-x:hidden;overflow-y:hidden;text-overflow:ellipsis;white-space:nowrap;word-wrap:normal;}
+.css-9pa8cd{bottom:0px;height:100%;left:0px;opacity:0;position:absolute;right:0px;top:0px;width:100%;z-index:-1;}
+.css-cens5h{-webkit-box-orient:vertical;display:-webkit-box;max-width:100%;overflow-x:hidden;overflow-y:hidden;text-overflow:ellipsis;}
+[stylesheet-group="2"]{}
+.r-13awgt0{-ms-flex:1 1 0%;-webkit-flex:1;flex:1;}
+.r-6koalj{display:-webkit-box;display:-moz-box;display:-ms-flexbox;display:-webkit-flex;display:flex;}
+.r-sdzlij{border-bottom-left-radius:9999px;border-bottom-right-radius:9999px;border-top-left-radius:9999px;border-top-right-radius:9999px;}
+.r-1phboty{border-bottom-style:solid;border-left-style:solid;border-right-style:solid;border-top-style:solid;}
+.r-rs99b7{border-bottom-width:1px;border-left-width:1px;border-right-width:1px;border-top-width:1px;}
+.r-4qtqp9{display:inline-block;}
+.r-crgep1{margin-bottom:0px;margin-left:0px;margin-right:0px;margin-top:0px;}
+.r-t60dpp{padding-bottom:0px;padding-left:0px;padding-right:0px;padding-top:0px;}
+.r-1yadl64{border-bottom-width:0px;border-left-width:0px;border-right-width:0px;border-top-width:0px;}
+.r-42olwf{border-bottom-color:rgba(0,0,0,0.00);border-left-color:rgba(0,0,0,0.00);border-right-color:rgba(0,0,0,0.00);border-top-color:rgba(0,0,0,0.00);}
+.r-17gur6a{border-bottom-left-radius:0px;border-bottom-right-radius:0px;border-top-left-radius:0px;border-top-right-radius:0px;}
+.r-xyw6el{padding-bottom:12px;padding-left:12px;padding-right:12px;padding-top:12px;}
+.r-jxzhtn{border-bottom-color:rgba(239,243,244,1.00);border-left-color:rgba(239,243,244,1.00);border-right-color:rgba(239,243,244,1.00);border-top-color:rgba(239,243,244,1.00);}
+.r-4iw3lz{border-bottom-width:0;border-left-width:0;border-right-width:0;border-top-width:0;}
+.r-1udh08x{overflow-x:hidden;overflow-y:hidden;}
+.r-wwvuq4{padding-bottom:0;padding-left:0;padding-right:0;padding-top:0;}
+.r-1adg3ll{display:block;}
+.r-bztko3{overflow-x:visible;overflow-y:visible;}
+.r-xoduu5{display:-webkit-inline-box;display:-moz-inline-box;display:-ms-inline-flexbox;display:-webkit-inline-flex;display:inline-flex;}
+.r-1ets6dv{border-bottom-color:rgba(207,217,222,1.00);border-left-color:rgba(207,217,222,1.00);border-right-color:rgba(207,217,222,1.00);border-top-color:rgba(207,217,222,1.00);}
+.r-1867qdf{border-bottom-left-radius:16px;border-bottom-right-radius:16px;border-top-left-radius:16px;border-top-right-radius:16px;}
+.r-1471scf{display:inline;}
+.r-xf4iuw{margin-bottom:-8px;margin-left:-8px;margin-right:-8px;margin-top:-8px;}
+.r-z2wwpe{border-bottom-left-radius:4px;border-bottom-right-radius:4px;border-top-left-radius:4px;border-top-right-radius:4px;}
+.r-11mg6pl{border-bottom-color:rgba(255,255,255,1.00);border-left-color:rgba(255,255,255,1.00);border-right-color:rgba(255,255,255,1.00);border-top-color:rgba(255,255,255,1.00);}
+.r-14f9gny{border-bottom-width:4px;border-left-width:4px;border-right-width:4px;border-top-width:4px;}
+[stylesheet-group="2.1"]{}
+.r-1jgb5lz{margin-left:auto;margin-right:auto;}
+.r-ymttw5{padding-left:16px;padding-right:16px;}
+.r-oyd9sg{padding-bottom:4px;padding-top:4px;}
+.r-1fz3rvf{margin-left:12px;margin-right:12px;}
+.r-rjfia{padding-bottom:0px;padding-top:0px;}
+.r-1r5su4o{margin-bottom:16px;margin-top:16px;}
+.r-s1qlax{padding-left:4px;padding-right:4px;}
+.r-1yzf0co{padding-bottom:16px;padding-top:16px;}
+.r-1e081e0{padding-left:12px;padding-right:12px;}
+.r-1pn2ns4{padding-left:8px;padding-right:8px;}
+.r-1f1sjgu{padding-bottom:12px;padding-top:12px;}
+[stylesheet-group="2.2"]{}
+.r-12vffkv>*{pointer-events:auto;}
+.r-12vffkv{pointer-events:none!important;}
+.r-2llsf{min-height:100%;}
+.r-13qz1uu{width:100%;}
+.r-417010{z-index:0;}
+.r-lrvibr{-moz-user-select:none;-ms-user-select:none;-webkit-user-select:none;user-select:none;}
+.r-1g40b8q{z-index:3;}
+.r-orgf3d{opacity:0;}
+.r-633pao{pointer-events:none!important;}
+.r-1d2f490{left:0px;}
+.r-1xcajam{position:fixed;}
+.r-zchlnj{right:0px;}
+.r-1gn8etr{top:-0.5px;}
+.r-dkhcqf{-webkit-transition-duration:350ms;transition-duration:350ms;}
+.r-axxi2z{-moz-transition-property:transform;-webkit-transition-property:-webkit-transform,transform;transition-property:-webkit-transform,transform;}
+.r-18jm5s1{-webkit-transition-timing-function:cubic-bezier(0,0,0,1);transition-timing-function:cubic-bezier(0,0,0,1);}
+.r-16e0dcy{-webkit-transform:translate3d(0, 0, 0) translateY(0px);transform:translate3d(0, 0, 0) translateY(0px);}
+.r-1e5uvyk{-webkit-backdrop-filter:blur(12px);backdrop-filter:blur(12px);}
+.r-6026j{background-color:rgba(255,255,255,0.85);}
+.r-136ojw6{z-index:2;}
+.r-fxvszc{height:106px;}
+.r-1h3ijdo{height:53px;}
+.r-1awozwy{-ms-flex-align:center;-webkit-align-items:center;-webkit-box-align:center;align-items:center;}
+.r-18u37iz{-ms-flex-direction:row;-webkit-box-direction:normal;-webkit-box-orient:horizontal;-webkit-flex-direction:row;flex-direction:row;}
+.r-1777fci{-ms-flex-pack:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;}
+.r-1pz39u2{-ms-flex-item-align:stretch;-ms-grid-row-align:stretch;-webkit-align-self:stretch;align-self:stretch;}
+.r-15ysp7h{min-height:32px;}
+.r-4wgw6l{min-width:32px;}
+.r-1habvwh{-ms-flex-align:start;-webkit-align-items:flex-start;-webkit-box-align:start;align-items:flex-start;}
+.r-s8bhmr{min-width:56px;}
+.r-1mf7evn{margin-right:20px;}
+.r-1loqt21{cursor:pointer;}
+.r-16y2uox{-ms-flex-positive:1;-webkit-box-flex:1;-webkit-flex-grow:1;flex-grow:1;}
+.r-2yi16{min-height:36px;}
+.r-1qi8awa{min-width:36px;}
+.r-o7ynqc{-webkit-transition-duration:0.2s;transition-duration:0.2s;}
+.r-6416eg{-moz-transition-property:background-color, box-shadow;-webkit-transition-property:background-color, box-shadow;transition-property:background-color, box-shadow;}
+.r-1ny4l3l{outline-style:none;}
+.r-bcqeeo{min-width:0px;}
+.r-qvutc0{word-wrap:break-word;}
+.r-rjixqe{line-height:20px;}
+.r-37j5jr{font-family:"TwitterChirp",-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Helvetica,Arial,sans-serif;}
+.r-q4m81j{text-align:center;}
+.r-a023e6{font-size:15px;}
+.r-b88u0q{font-weight:700;}
+.r-yyyyoo{fill:currentcolor;}
+.r-1xvli5t{height:1.25em;}
+.r-dnmrzs{max-width:100%;}
+.r-bnwqim{position:relative;}
+.r-1plcrui{vertical-align:text-bottom;}
+.r-z80fyv{height:20px;}
+.r-19wmn03{width:20px;}
+.r-1cvl2hr{color:rgba(29,155,240,1.00);}
+.r-lwhw9o{height:1.75rem;}
+.r-poiln3{font-family:inherit;}
+.r-1wbh5a2{-ms-flex-negative:1;-webkit-flex-shrink:1;flex-shrink:1;}
+.r-1pi2tsx{height:100%;}
+.r-1iusvr4{-ms-flex-preferred-size:0px;-webkit-flex-basis:0px;flex-basis:0px;}
+.r-1oszu61{-ms-flex-align:stretch;-webkit-align-items:stretch;-webkit-box-align:stretch;align-items:stretch;}
+.r-eqz5dr{-ms-flex-direction:column;-webkit-box-direction:normal;-webkit-box-orient:vertical;-webkit-flex-direction:column;flex-direction:column;}
+.r-8fdsdq{z-index:4;}
+.r-vqxq0j{border:0 solid black;}
+.r-deolkf{box-sizing:border-box;}
+.r-1mlwlqe{-ms-flex-preferred-size:auto;-webkit-flex-basis:auto;flex-basis:auto;}
+.r-ifefl9{min-height:0px;}
+.r-1sw30gj{background-color:rgba(239,243,244,1.00);}
+.r-1dqbpge{cursor:-webkit-text;cursor:text;}
+.r-7q8q6z{cursor:default;}
+.r-14j79pv{color:rgba(83,100,113,1.00);}
+.r-f727ji{padding-left:12px;}
+.r-16dba41{font-weight:400;}
+.r-30o5oe{-moz-appearance:none;-webkit-appearance:none;appearance:none;}
+.r-1dz5y72{resize:none;}
+.r-1niwhzg{background-color:rgba(0,0,0,0.00);}
+.r-homxoj{color:inherit;}
+.r-7cikom{font-size:inherit;}
+.r-1ttztb7{text-align:inherit;}
+.r-fdjqy7{text-align:left;}
+.r-y0fyvk::-webkit-input-placeholder{color:rgba(83,100,113,1.00);opacity:1;}
+.r-y0fyvk::-moz-placeholder{color:rgba(83,100,113,1.00);opacity:1;}
+.r-y0fyvk:-ms-input-placeholder{color:rgba(83,100,113,1.00);opacity:1;}
+.r-y0fyvk::placeholder{color:rgba(83,100,113,1.00);opacity:1;}
+.r-obd0qt{-ms-flex-align:end;-webkit-align-items:flex-end;-webkit-box-align:end;align-items:flex-end;}
+.r-1d4mawv{margin-right:4px;}
+.r-1w6e6rj{-ms-flex-wrap:wrap;-webkit-box-lines:multiple;-webkit-flex-wrap:wrap;flex-wrap:wrap;}
+.r-1wtj0ep{-ms-flex-pack:justify;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;}
+.r-1b43r93{font-size:14px;}
+.r-1cwl3u0{line-height:16px;}
+.r-u8s1d{position:absolute;}
+.r-150rngu{-webkit-overflow-scrolling:touch;}
+.r-17bb2tj{-webkit-animation-duration:0.75s;animation-duration:0.75s;}
+.r-1muvv40{-webkit-animation-iteration-count:infinite;animation-iteration-count:infinite;}
+.r-127358a{-webkit-animation-name:r-9p3sdl;animation-name:r-9p3sdl;}
+@-webkit-keyframes r-9p3sdl{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg);}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg);}}
+@keyframes r-9p3sdl{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg);}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg);}}
+.r-1ldzwu0{-webkit-animation-timing-function:linear;animation-timing-function:linear;}
+.r-aqfbo4{-webkit-backface-visibility:hidden;backface-visibility:hidden;}
+.r-14lw9ot{background-color:rgba(255,255,255,1.00);}
+.r-1ljd8xs{border-left-width:1px;}
+.r-13l2t4g{border-right-width:1px;}
+.r-33ulu8{width:600px;}
+.r-184en5c{z-index:1;}
+.r-1xk2f4g{clip:rect(1px, 1px, 1px, 1px);}
+.r-109y4c4{height:1px;}
+.r-92ng3h{width:1px;}
+.r-19u6a5r{margin-left:12px;}
+.r-1lul07w{-webkit-transform:translate3d(0, -3.5em, 0);transform:translate3d(0, -3.5em, 0);}
+.r-eafdt9{-webkit-transition-duration:0.15s;transition-duration:0.15s;}
+.r-1b8bd59{-moz-transition-property:transform, opacity;-webkit-transition-property:-webkit-transform,transform, opacity;transition-property:-webkit-transform,transform, opacity;}
+.r-nx0j10{-webkit-transition-timing-function:ease, ease, step-end;transition-timing-function:ease, ease, step-end;}
+.r-l5o3uw{background-color:rgba(29,155,240,1.00);}
+.r-y3da5r{box-shadow:0 0 8px rgba(101,119,134,0.2), 0 1px 3px 1px rgba(101,119,134,0.25);}
+.r-1kihuf0{-ms-flex-item-align:center;-ms-grid-row-align:center;-webkit-align-self:center;align-self:center;}
+.r-jwli3a{color:rgba(255,255,255,1.00);}
+.r-13hce6t{margin-left:4px;}
+.r-j5o65s{border-bottom-color:rgba(239,243,244,1.00);}
+.r-qklmqi{border-bottom-width:1px;}
+.r-1qhn6m8{padding-left:16px;}
+.r-i023vh{padding-right:16px;}
+.r-ttdzmv{padding-top:12px;}
+.r-15zivkp{margin-bottom:4px;}
+.r-18kxxzh{-ms-flex-positive:0;-webkit-box-flex:0;-webkit-flex-grow:0;flex-grow:0;}
+.r-1b7u577{margin-right:12px;}
+.r-1hwvwag{-ms-flex-preferred-size:48px;-webkit-flex-basis:48px;flex-basis:48px;}
+.r-1p0dtai{bottom:0px;}
+.r-ipm5af{top:0px;}
+.r-1wyvozj{left:50%;}
+.r-1v2oles{top:50%;}
+.r-desppf{-webkit-transform:translateX(-50%) translateY(-50%);transform:translateX(-50%) translateY(-50%);}
+.r-ggadg3{left:-2px;}
+.r-8jfcpp{top:-2px;}
+.r-vvn4in{background-position:center;}
+.r-u6sd8q{background-repeat:no-repeat;}
+.r-4gszlv{background-size:cover;}
+.r-1wyyakw{z-index:-1;}
+.r-12181gd{box-shadow:0 0 2px rgba(0,0,0,0.03) inset;}
+.r-zl2h9q{margin-bottom:2px;}
+.r-k4xj1c{-ms-flex-align:start;-webkit-align-items:start;-webkit-box-align:start;align-items:start;}
+.r-1d09ksm{-ms-flex-align:baseline;-webkit-align-items:baseline;-webkit-box-align:baseline;align-items:baseline;}
+.r-3s2u2q{white-space:nowrap;}
+.r-1q142lx{-ms-flex-negative:0;-webkit-flex-shrink:0;flex-shrink:0;}
+.r-f9ja8p{max-height:20px;}
+.r-og9te1{max-width:20px;}
+.r-9cviqr{margin-left:2px;}
+.r-1wvb978{-webkit-font-feature-settings:'ss01' on;font-feature-settings:'ss01' on;}
+.r-1s2bzr4{margin-top:12px;}
+.r-1inkyih{font-size:17px;}
+.r-1ssbvtb{gap:12px;}
+.r-adacv{min-height:64px;}
+.r-9aw3ui{gap:4px;}
+.r-6gpygo{margin-bottom:12px;}
+.r-14gqq1x{margin-top:4px;}
+.r-a5pmau{margin-right:2px;}
+.r-1dgieki{border-top-color:rgba(239,243,244,1.00);}
+.r-1efd50x{border-top-style:solid;}
+.r-5kkj8d{border-top-width:1px;}
+.r-1ta3fxp{-moz-column-gap:8px;-webkit-column-gap:8px;column-gap:8px;}
+.r-a2tzq0{-ms-flex-pack:distribute;-webkit-box-pack:justify;-webkit-justify-content:space-around;justify-content:space-around;}
+.r-3qxfft{min-height:1.875rem;}
+.r-h3s6tt{height:48px;}
+.r-rull8r{border-bottom-style:solid;}
+.r-1h0z5md{-ms-flex-pack:start;-webkit-box-pack:start;-webkit-justify-content:flex-start;justify-content:flex-start;}
+.r-bt1l66{min-height:20px;}
+.r-clp7b1{-moz-transition-property:color;-webkit-transition-property:color;transition-property:color;}
+.r-50lct3{height:1.5em;}
+.r-1srniue{width:1.5em;}
+.r-kzbkwu{padding-bottom:12px;}
+.r-dflpy8{height:1.2em;}
+.r-sjv1od{margin-left:0.075em;}
+.r-zw8f10{margin-right:0.075em;}
+.r-10akycc{vertical-align:-20%;}
+.r-h9hxbl{width:1.2em;}
+.r-1mdbhws{max-width:425px;}
+.r-1hdv0qi{width:1.25em;}
+.r-n6v787{font-size:13px;}
+.r-1k6nrdp{min-width:calc(1em + 2 * 12px);}
+.r-vc7bo5{min-width:calc(1em + 2 * 8px);}
+.r-k200y{-ms-flex-item-align:start;-webkit-align-self:flex-start;align-self:flex-start;}
+.r-adyw6z{font-size:20px;}
+.r-135wba7{line-height:24px;}
+.r-1vr29t4{font-weight:800;}
+.r-17s6mgv{-ms-flex-pack:end;-webkit-box-pack:end;-webkit-justify-content:flex-end;justify-content:flex-end;}
+.r-hiw28u{font-size:0px;}
+.r-qvk6io{line-height:0px;}
+.r-pm9dpa{max-height:100%;}
+.r-rki7wi{bottom:12px;}
+.r-161ttwi{left:12px;}
+.r-loe9s5{background-color:rgba(0,0,0,0.77);}
+.r-pm2fo{border-bottom-left-radius:0px;}
+.r-zmljjp{border-bottom-right-radius:0px;}
+.r-ou6ah9{border-top-left-radius:0px;}
+.r-t12b5v{border-top-right-radius:0px;}
+.r-6t5ypu{border-bottom-left-radius:4px;}
+.r-kicko2{border-top-left-radius:4px;}
+.r-1dpl46z{border-bottom-right-radius:4px;}
+.r-notknq{border-top-right-radius:4px;}
+.r-e6wyp1{height:67px;}
+.r-1p15a4t{width:67px;}
+.r-1sa8knb{height:calc(50% + 4px);}
+.r-gcko2u{width:calc(50% + 4px);}
+.r-1dsia8u{padding-left:3px;}
+.r-o52ifk{height:100px;}</style>
+<title data-rh="true">Metallica on Twitter: "Thank you to everyone who came out for #MetInParis last night for helping us support @EMMAUSolidarite &amp;amp; @PompiersParis. #AWMH #MetalicaGivesBack" / Twitter</title>
+<meta data-rh="true" content="article" property="og:type">
+<meta data-rh="true" content="https://twitter.com/Metallica/status/1128068672289890305" property="og:url">
+<meta data-rh="true" content="Metallica on Twitter" property="og:title">
+<meta data-rh="true" content="“Thank you to everyone who came out for #MetInParis last night for helping us support @EMMAUSolidarite &amp;amp; @PompiersParis. #AWMH #MetalicaGivesBack”" property="og:description">
+<meta data-rh="true" content="https://pbs.twimg.com/profile_images/1597280886809952256/gsJvGiqU_200x200.jpg" property="og:image">
+<meta data-rh="true" description="" name="description"> <link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305" rel="canonical">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305" hreflang="x-default" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=ar" hreflang="ar" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=ar-x-fm" hreflang="ar-x-fm" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=bg" hreflang="bg" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=bn" hreflang="bn" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=ca" hreflang="ca" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=cs" hreflang="cs" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=da" hreflang="da" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=de" hreflang="de" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=el" hreflang="el" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=en" hreflang="en" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=en-GB" hreflang="en-GB" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=es" hreflang="es" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=eu" hreflang="eu" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=fa" hreflang="fa" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=fi" hreflang="fi" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=fil" hreflang="fil" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=fr" hreflang="fr" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=ga" hreflang="ga" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=gl" hreflang="gl" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=gu" hreflang="gu" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=ha" hreflang="ha" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=he" hreflang="he" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=hi" hreflang="hi" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=hr" hreflang="hr" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=hu" hreflang="hu" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=id" hreflang="id" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=ig" hreflang="ig" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=it" hreflang="it" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=ja" hreflang="ja" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=kn" hreflang="kn" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=ko" hreflang="ko" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=mr" hreflang="mr" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=ms" hreflang="ms" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=nb" hreflang="nb" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=nl" hreflang="nl" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=no" hreflang="no" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=pl" hreflang="pl" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=pt" hreflang="pt" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=ro" hreflang="ro" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=ru" hreflang="ru" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=sk" hreflang="sk" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=sr" hreflang="sr" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=sv" hreflang="sv" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=ta" hreflang="ta" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=th" hreflang="th" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=tl" hreflang="tl" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=tr" hreflang="tr" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=uk" hreflang="uk" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=ur" hreflang="ur" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=vi" hreflang="vi" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=yo" hreflang="yo" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=zh" hreflang="zh" rel="alternate">
+<link data-rh="true" href="https://twitter.com/Metallica/status/1128068672289890305?lang=zh-Hant" hreflang="zh-Hant" rel="alternate"> <meta data-rh="true" content="twitter://status?id=1128068672289890305" property="al:ios:url">
+<meta data-rh="true" content="333903271" property="al:ios:app_store_id">
+<meta data-rh="true" content="Twitter" property="al:ios:app_name">
+<meta data-rh="true" content="twitter://status?id=1128068672289890305" property="al:android:url">
+<meta data-rh="true" content="com.twitter.android" property="al:android:package">
+<meta data-rh="true" content="Twitter" property="al:android:app_name">
+</head>
+<body style="background-color: #FFFFFF;">
+  <noscript>
+    <style>
+    body {
+      -ms-overflow-style: scrollbar;
+      overflow-y: scroll;
+      overscroll-behavior-y: none;
     }
 
-    .DashboardProfileCard-bg {
-      background-image: url(https://pbs.twimg.com/profile_banners/238475531/1479538295/600x200);
+    .errorContainer {
+      background-color: #FFF;
+      color: #0F1419;
+      max-width: 600px;
+      margin: 0 auto;
+      padding: 10%;
+      font-family: Helvetica, sans-serif;
+      font-size: 16px;
     }
 
-</style>
-
-
-
-
-          </div>
-        </div>
-    </div>
-    <div class="alert-messages hidden" id="message-drawer">
-    <div class="message ">
-  <div class="message-inside">
-    <span class="message-text"></span>
-      <a role="button" class="Icon Icon--close Icon--medium dismiss" href="#">
-        <span class="visuallyhidden">Descartar</span>
-      </a>
-  </div>
-</div>
-</div>
-
-
-
-
-<div class="gallery-overlay"></div>
-<div class="Gallery with-tweet">
-  <style class="Gallery-styles"></style>
-  <div class="Gallery-closeTarget"></div>
-  <div class="Gallery-content">
-    <div class="GalleryTweet-newsCameraBadge"></div>
-    <button type="button" class="modal-btn modal-close modal-close-fixed js-close">
-  <span class="Icon Icon--close Icon--large">
-    <span class="visuallyhidden">Cerrar</span>
-  </span>
-</button>
-
-    <div class="Gallery-media"></div>
-    <div class="GalleryNav GalleryNav--prev">
-      <span class="GalleryNav-handle GalleryNav-handle--prev">
-        <span class="Icon Icon--caretLeft Icon--large">
-          <span class="u-hiddenVisually">
-            Anterior
-          </span>
-        </span>
-      </span>
-    </div>
-    <div class="GalleryNav GalleryNav--next">
-      <span class="GalleryNav-handle GalleryNav-handle--next">
-        <span class="Icon Icon--caretRight Icon--large">
-          <span class="u-hiddenVisually">
-            Siguiente
-          </span>
-        </span>
-      </span>
-    </div>
-    <div class="GalleryTweet"></div>
-  </div>
-</div>
-
-
-<div class="modal-overlay"></div>
-
-<div id="profile-hover-container"></div>
-
-
-<div id="goto-user-dialog" class="modal-container">
-  <div class="modal modal-small draggable">
-    <div class="modal-content">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Cerrar</span>
-  </span>
-</button>
-
-
-      <div class="modal-header">
-        <h3 class="modal-title">Ir al perfil de un usuario</h3>
-      </div>
-
-      <div class="modal-body">
-        <div class="modal-inner">
-          <form class="t1-form goto-user-form">
-            <input class="input-block username-input" type="text" placeholder="Empieza escribiendo un nombre para saltar a un perfil" aria-label="Usuario">
-
-
-
-<div role="listbox" class="dropdown-menu typeahead">
-  <div aria-hidden="true" class="dropdown-caret">
-    <div class="caret-outer"></div>
-    <div class="caret-inner"></div>
-  </div>
-  <div role="presentation" class="dropdown-inner js-typeahead-results">
-    <div role="presentation" class="typeahead-saved-searches">
-  <h3 id="saved-searches-heading" class="typeahead-category-title saved-searches-title">Búsquedas guardadas</h3>
-  <ul role="presentation" class="typeahead-items saved-searches-list">
-
-    <li role="presentation" class="typeahead-item typeahead-saved-search-item">
-      <span class="Icon Icon--close" aria-hidden="true"><span class="visuallyhidden">Eliminar</span></span>
-      <a role="option" aria-describedby="saved-searches-heading" class="js-nav" href="" data-search-query="" data-query-source="" data-ds="saved_search" tabindex="-1"></a>
-    </li>
-  </ul>
-</div>
-
-    <ul role="presentation" class="typeahead-items typeahead-topics">
-
-  <li role="presentation" class="typeahead-item typeahead-topic-item">
-    <a role="option" class="js-nav" href="" data-search-query="" data-query-source="typeahead_click" data-ds="topics" tabindex="-1"></a>
-  </li>
-</ul>
-    <ul role="presentation" class="typeahead-items typeahead-accounts social-context js-typeahead-accounts">
-
-  <li role="presentation" data-user-id="" data-user-screenname="" data-remote="true" data-score="" class="typeahead-item typeahead-account-item js-selectable">
-
-    <a role="option" class="js-nav" data-query-source="typeahead_click" data-search-query="" data-ds="account">
-      <div class="js-selectable typeahead-in-conversation hidden">
-        <span class="Icon Icon--follower Icon--small"></span>
-        <span class="typeahead-in-conversation-text">En esta conversación</span>
-      </div>
-      <img class="avatar size32" alt="">
-      <span class="typeahead-user-item-info account-group">
-        <span class="fullname"></span><span class="UserBadges"><span class="Icon Icon--verified js-verified hidden"><span class="u-hiddenVisually">Cuenta verificada</span></span><span class="Icon Icon--protected js-protected hidden"><span class="u-hiddenVisually">Tweets Protegidos</span></span></span><span class="UserNameBreak">&nbsp;</span><span class="username u-dir" dir="ltr">@<b></b></span>
-      </span>
-      <span class="typeahead-social-context"></span>
-    </a>
-  </li>
-  <li role="presentation" class="js-selectable typeahead-accounts-shortcut js-shortcut"><a role="option" class="js-nav" href="" data-search-query="" data-query-source="typeahead_click" data-shortcut="true" data-ds="account_search"></a></li>
-</ul>
-
-    <ul role="presentation" class="typeahead-items typeahead-trend-locations-list">
-
-  <li role="presentation" class="typeahead-item typeahead-trend-locations-item"><a role="option" class="js-nav" href="" data-ds="trend_location" data-search-query="" tabindex="-1"></a></li>
-</ul>
-
-<div role="presentation" class="typeahead-user-select">
-  <div role="presentation" class="typeahead-empty-suggestions">
-    Usuarios recomendados
-  </div>
-  <ul role="presentation" class="typeahead-items typeahead-selected js-typeahead-selected">
-
-    <li role="presentation" data-user-id="" data-user-screenname="" data-remote="true" data-score="" class="typeahead-item typeahead-selected-item js-selectable">
-
-      <a role="option" class="js-nav" data-query-source="typeahead_click" data-search-query="" data-ds="account">
-        <img class="avatar size32" alt="">
-        <span class="typeahead-user-item-info account-group">
-          <span class="select-status deselect-user js-deselect-user Icon Icon--check"></span>
-          <span class="select-status select-disabled Icon Icon--unfollow"></span>
-          <span class="fullname"></span><span class="UserBadges"><span class="Icon Icon--verified js-verified hidden"><span class="u-hiddenVisually">Cuenta verificada</span></span><span class="Icon Icon--protected js-protected hidden"><span class="u-hiddenVisually">Tweets Protegidos</span></span></span><span class="UserNameBreak">&nbsp;</span><span class="username u-dir" dir="ltr">@<b></b></span>
-        </span>
-      </a>
-    </li>
-    <li role="presentation" class="typeahead-selected-end"></li>
-  </ul>
-
-  <ul role="presentation" class="typeahead-items typeahead-accounts js-typeahead-accounts">
-
-    <li role="presentation" data-user-id="" data-user-screenname="" data-remote="true" data-score="" class="typeahead-item typeahead-account-item js-selectable">
-
-      <a role="option" class="js-nav" data-query-source="typeahead_click" data-search-query="" data-ds="account">
-        <img class="avatar size32" alt="">
-        <span class="typeahead-user-item-info account-group">
-          <span class="select-status deselect-user js-deselect-user Icon Icon--check"></span>
-          <span class="select-status select-disabled Icon Icon--unfollow"></span>
-          <span class="fullname"></span><span class="UserBadges"><span class="Icon Icon--verified js-verified hidden"><span class="u-hiddenVisually">Cuenta verificada</span></span><span class="Icon Icon--protected js-protected hidden"><span class="u-hiddenVisually">Tweets Protegidos</span></span></span><span class="UserNameBreak">&nbsp;</span><span class="username u-dir" dir="ltr">@<b></b></span>
-        </span>
-      </a>
-    </li>
-    <li role="presentation" class="typeahead-accounts-end"></li>
-  </ul>
-</div>
-
-    <div role="presentation" class="typeahead-dm-conversations">
-  <ul role="presentation" class="typeahead-items typeahead-dm-conversation-items">
-    <li role="presentation" class="typeahead-item typeahead-dm-conversation-item">
-      <a role="option" tabindex="-1"></a>
-    </li>
-  </ul>
-</div>
-  </div>
-</div>
-
-          </form>
-        </div>
-      </div>
-
-    </div>
-  </div>
-</div>
-
-<div id="quick-promote-dialog" class="QuickPromoteDialog modal-container">
-  <div class="modal draggable">
-    <div class="modal-content">
-      <button type="button" class="modal-btn modal-close modal-close-fixed js-close">
-  <span class="Icon Icon--close Icon--large">
-    <span class="visuallyhidden">Cerrar</span>
-  </span>
-</button>
-
-      <div class="modal-header">
-        <h3 class="modal-title">Promocionar este Tweet</h3>
-      </div>
-      <div class="modal-body">
-        <div class="quick-promote-view-container">
-          <div class="media">
-            <iframe
-              class="quick-promote-iframe js-initial-focus"
-              scrolling="no"
-              frameborder="0"
-              src="">
-            </iframe>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div id="block-user-dialog" class="modal-container">
-  <div class="modal draggable">
-    <div class="modal-content">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Cerrar</span>
-  </span>
-</button>
-
-
-      <div class="modal-header">
-        <h3 class="modal-title">Bloquear</h3>
-      </div>
-
-      <div class="tweet-loading">
-  <div class="spinner-bigger"></div>
-</div>
-
-      <div class="modal-body modal-tweet"></div>
-
-      <div class="modal-footer">
-        <button class="EdgeButton EdgeButton--tertiary cancel-action js-close">Cancelar</button>
-        <button class="EdgeButton EdgeButton--danger block-action">Bloquear</button>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-
-
-
-
-   <div id="geo-disabled-dropdown">
-    <div tabindex="-1">
-  <div class="dropdown-caret">
-    <span class="caret-outer"></span>
-    <span class="caret-inner"></span>
-  </div>
-  <ul>
-    <li class="geo-not-enabled-yet">
-      <h2>Twittear con la ubicación</h2>
-      <p>
-        Puedes agregar la información de ubicación a tus Tweets, como tu ciudad o tu ubicación exacta, desde la web y a través de aplicaciones de terceros. Siempre tendrás la opción de eliminar el historial de ubicaciones de tus Tweets.
-        <a href="http://support.twitter.com/forums/26810/entries/78525" target="_blank" rel="noopener">Más información</a>
-      </p>
-      <div>
-        <button type="button" class="geo-turn-on EdgeButton EdgeButton--primary">Activar</button>
-        <button type="button" class="geo-not-now EdgeButton EdgeButton--secondary">Por ahora no</button>
-      </div>
-    </li>
-  </ul>
-</div>
-
-  </div>
-
-<div id="geo-enabled-dropdown">
-  <div tabindex="-1">
-  <div class="dropdown-caret">
-    <span class="caret-outer"></span>
-    <span class="caret-inner"></span>
-  </div>
-  <div>
-    <div class="geo-query-location">
-      <input class="GeoSearch-queryInput" type="text" autocomplete="off" placeholder="Buscar un vecindario o ciudad">
-      <span class="Icon Icon--search"></span>
-    </div>
-    <div class="geo-dropdown-status"></div>
-    <ul class="GeoSearch-dropdownMenu"></ul>
-  </div>
-</div>
-
-</div>
-
-
-
-  <div id="list-membership-dialog" class="modal-container">
-  <div class="modal modal-small draggable">
-    <div class="modal-content">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Cerrar</span>
-  </span>
-</button>
-
-      <div class="modal-header">
-        <h3 class="modal-title">Tus listas</h3>
-      </div>
-      <div class="modal-body">
-        <div class="list-membership-content"></div>
-        <span class="spinner lists-spinner" title="Cargando&hellip;"></span>
-      </div>
-    </div>
-  </div>
-</div>
-  <div id="list-operations-dialog" class="modal-container">
-  <div class="modal modal-medium draggable">
-    <div class="modal-content">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Cerrar</span>
-  </span>
-</button>
-
-      <div class="modal-header">
-        <h3 class="modal-title">Crear una nueva lista</h3>
-      </div>
-      <div class="modal-body">
-        <div class="list-editor">
-  <div class="field">
-    <label class="t1-label" for="list-name">Nombre de la lista</label>
-    <input id="list-name" type="text" class="text" name="name" value="" />
-  </div>
-  <hr/>
-
-  <div class="field">
-    <label class="t1-label" for="list-description">Descripción</label>
-    <textarea id="list-description" name="description"></textarea>
-    <span class="help-text">Menos de 100 caracteres, opcional</span>
-  </div>
-  <hr/>
-
-  <fieldset class="field">
-    <legend class="t1-legend">Privacidad</legend>
-    <div class="options">
-      <label class="t1-label" for="list-public-radio">
-        <input class="radio" type="radio" name="mode" id="list-public-radio" value="public" checked="checked"  />
-        <b>Pública</b> &middot; Cualquiera puede seguir esta lista
-      </label>
-      <label class="t1-label" for="list-private-radio">
-        <input class="radio" type="radio" name="mode" id="list-private-radio" value="private"  />
-        <b>Privada</b> &middot; Solo tú puedes acceder a esta lista
-      </label>
-    </div>
-  </fieldset>
-  <hr/>
-
-  <div class="list-editor-save">
-    <button type="button" class="EdgeButton EdgeButton--secondary update-list-button" data-list-id="">Guardar lista</button>
-  </div>
-</div>
-
-      </div>
-    </div>
-  </div>
-</div>
-
-<div id="activity-popup-dialog" class="modal-container">
-  <div class="modal draggable">
-    <div class="modal-content clearfix">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Cerrar</span>
-  </span>
-</button>
-
-
-      <div class="modal-header">
-        <h3 class="modal-title"></h3>
-      </div>
-
-      <div class="modal-body">
-        <div class="tweet-loading">
-  <div class="spinner-bigger"></div>
-</div>
-
-        <div class="activity-popup-dialog-content modal-tweet clearfix"></div>
-        <div class="loading">
-          <span class="spinner-bigger"></span>
-        </div>
-        <div class="activity-popup-dialog-users clearfix"></div>
-        <div class="activity-popup-dialog-footer"></div>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-
-
-<div id="copy-link-to-tweet-dialog" class="modal-container">
-  <div class="modal modal-medium draggable">
-    <div class="modal-content">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Cerrar</span>
-  </span>
-</button>
-
-      <div class="modal-header">
-        <h3 class="modal-title">Copiar enlace del Tweet</h3>
-      </div>
-      <div class="modal-body">
-        <div class="copy-link-to-tweet-container">
-          <label class="t1-label">
-            <p class="copy-link-to-tweet-instructions">Aquí está la URL para este Tweet. Cópiala para compartirlo fácilmente con tus amigos.</p>
-            <textarea class="link-to-tweet-destination js-initial-focus u-dir" dir="ltr" readonly></textarea>
-          </label>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div id="embed-tweet-dialog" class="modal-container">
-  <div class="modal modal-medium draggable">
-    <div class="modal-content">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Cerrar</span>
-  </span>
-</button>
-
-      <div class="modal-header">
-        <h3 class="modal-title embed-tweet-title">Insertar este Tweet</h3>
-        <h3 class="modal-title embed-video-title">Embed this Video</h3>
-      </div>
-      <div class="modal-body">
-        <div class="embed-code-container">
-  <p class="embed-tweet-instructions">Añade este Tweet a tu sitio web copiando el siguiente código. <a href="https://dev.twitter.com/web/embedded-tweets" target="_blank" rel="noopener">Más información</a></p>
-  <p class="embed-video-instructions">Añade este video a tu sitio web copiando el siguiente código. <a href="https://dev.twitter.com/web/embedded-tweets" target="_blank" rel="noopener">Más información</a></p>
-  <form class="t1-form">
-
-    <div class="embed-destination-wrapper">
-      <div class="embed-overlay embed-overlay-spinner"><div class="embed-overlay-content"></div></div>
-      <div class="embed-overlay embed-overlay-error">
-        <p class="embed-overlay-content">Mmm, hubo un problema al contactar con el servidor. <button type="button" class="btn-link retry-embed">¿Intentar de nuevo?</button></p>
-      </div>
-      <textarea class="embed-destination js-initial-focus"></textarea>
-      <div class="embed-options">
-        <div class="embed-include-parent-tweet">
-          <label class="t1-label" for="include-parent-tweet">
-            <input type="checkbox" id="include-parent-tweet" class="include-parent-tweet" checked>
-            Incluir Tweet principal
-          </label>
-        </div>
-        <div class="embed-include-card">
-          <label class="t1-label" for="include-card">
-            <input type="checkbox" id="include-card" class="include-card" checked>
-            Incluir contenido multimedia
-          </label>
-        </div>
-      </div>
-    </div>
-  </form>
-  <p class="embed-tweet-description">Al insertar contenido de Twitter en tu sitio web o aplicación, aceptas el <a href="https://dev.twitter.com/overview/terms/agreement" rel="noopener">Acuerdo para desarrolladores</a> y la <a href="https://dev.twitter.com/overview/terms/policy" rel="noopener">Política para desarrolladores</a> de Twitter.</p>
-  <h3 class="embed-preview-header">Vista previa</h3>
-  <div class="embed-preview">
-  </div>
-</div>
-
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div id="why-this-ad-dialog" class="modal-container why-this-ad-dialog">
-  <div class="modal modal-large draggable">
-    <div class="modal-content">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Cerrar</span>
-  </span>
-</button>
-
-      <div class="modal-header">
-        <h3 class="modal-title why-this-ad-title">Por qué se te muestra este anuncio</h3>
-      </div>
-      <div class="why-this-ad-content">
-        <div class="why-this-ad-spinner">
-          <div class="spinner-bigger"></div>
-        </div>
-        <iframe id="why-this-ad-frame" class="hidden" aria-hidden="true" scrolling="auto">
-        </iframe>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-
-  <div id="login-dialog" class="LoginDialog modal-container u-textCenter">
-  <div class="modal modal-large draggable">
-    <div class="LoginDialog-content modal-content">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Cerrar</span>
-  </span>
-</button>
-
-      <div class="modal-header">
-        <h3 class="modal-title">Inicia sesión en Twitter</h3>
-      </div>
-      <div class="LoginDialog-body modal-body">
-        <div class="LoginDialog-bird">
-          <span class="Icon Icon--bird Icon--large"></span>
-        </div>
-        <div class="LoginDialog-form">
-<form action="https://twitter.com/sessions" class="LoginForm js-front-signin" method="post"
-  data-component="dialog"
-  data-element="login"
->
-  <div class="LoginForm-input LoginForm-username">
-    <input
-      type="text"
-      class="text-input email-input js-signin-email"
-      name="session[username_or_email]"
-      autocomplete="username"
-      placeholder="Teléfono, correo electrónico o nombre de usuario"
-    />
-  </div>
-
-  <div class="LoginForm-input LoginForm-password">
-    <input type="password" class="text-input" name="session[password]" placeholder="Contraseña" autocomplete="current-password">
-
-  </div>
-
-    <div class="LoginForm-rememberForgot">
-      <label>
-        <input type="checkbox" value="1" name="remember_me" checked="checked">
-        <span>Recordar mis datos</span>
-      </label>
-      <span class="separator">&middot;</span>
-      <a class="forgot" href="/account/begin_password_reset" rel="noopener">¿Olvidaste tu contraseña?</a>
-    </div>
-
-  <input type="submit" class="EdgeButton EdgeButton--primary EdgeButton--medium submit js-submit" value="Iniciar sesión">
-
-    <input type="hidden" name="return_to_ssl" value="true">
-
-  <input type="hidden" name="scribe_log">
-  <input type="hidden" name="redirect_after_login" value="/Metallica/status/1128068672289890305">
-  <input type="hidden" value="b236e0558eecae44fa52b464d55738d5236980e7" name="authenticity_token">
-      <input type="hidden" name="ui_metrics" autocomplete="off">
-      <script src="/i/js_inst?c_name=ui_metrics" async></script>
-</form>
-        </div>
-      </div>
-      <div class="LoginDialog-footer modal-footer u-textCenter">
-        ¿No tienes una cuenta? <a class="LoginDialog-signupLink" href="https://twitter.com/signup" rel="noopener">Regístrate &raquo;</a>
-      </div>
-    </div>
-  </div>
-</div>
-
-  <div id="signup-dialog" class="SignupDialog modal-container u-textCenter">
-  <div class="modal modal-large draggable">
-    <div class="SignupDialog-content modal-content">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Cerrar</span>
-  </span>
-</button>
-
-      <div class="modal-header">
-        <h3 class="modal-title">Regístrate en Twitter</h3>
-      </div>
-      <div class="SignupDialog-body modal-body">
-        <div class="SignupDialog-icon">
-          <span class="Icon Icon--bird Icon--extraLarge"></span>
-        </div>
-        <h2 class="SignupDialog-heading">¿No estás en Twitter? Regístrate, ponte al día con las cosas que te importan y recibe actualizaciones inmediatas.</h2>
-        <div class="SignupDialog-form">
-<div class="signup SignupForm
-  ">
-  <a href="https://twitter.com/signup" role="button" class="EdgeButton EdgeButton--large EdgeButton--primary SignupForm-submit u-block js-signup "
-  data-component="dialog"
-  data-element="signup"
-  >Regístrate</a>
-</div>
-        </div>
-      </div>
-      <div class="SignupDialog-footer modal-footer u-textCenter">
-        ¿Tienes cuenta? <a class="SignupDialog-signinLink" href="/login" rel="noopener">Iniciar sesión &raquo;</a>
-      </div>
-    </div>
-  </div>
-</div>
-
-  <div id="sms-codes-dialog" class="modal-container">
-  <div class="modal modal-medium draggable">
-    <div class="modal-content">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Cerrar</span>
-  </span>
-</button>
-
-      <div class="modal-header">
-        <h3 class="modal-title">Códigos cortos</h3>
-      </div>
-      <div class="modal-body">
-
-<table id="sms_codes" cellpadding="0" cellspacing="0">
-  <thead>
-    <tr>
-      <th>País</th>
-      <th>Código</th>
-      <th>Para clientes de</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>Estados Unidos</td>
-      <td>40404</td>
-      <td>(cualquiera)</td>
-    </tr>
-    <tr>
-      <td>Canadá</td>
-      <td>21212</td>
-      <td>(cualquiera)</td>
-    </tr>
-    <tr>
-      <td>Reino Unido</td>
-      <td>86444</td>
-      <td>Vodafone, Orange, 3, O2</td>
-    </tr>
-    <tr>
-      <td>Brasil</td>
-      <td>40404</td>
-      <td>Nextel, TIM</td>
-    </tr>
-    <tr>
-      <td>Haití</td>
-      <td>40404</td>
-      <td>Digicel, Voila</td>
-    </tr>
-    <tr>
-      <td>Irlanda</td>
-      <td>51210</td>
-      <td>Vodafone, O2</td>
-    </tr>
-    <tr>
-      <td>India</td>
-      <td>53000</td>
-      <td>Bharti Airtel, Videocon, Reliance</td>
-    </tr>
-    <tr>
-      <td>Indonesia</td>
-      <td>89887</td>
-      <td>AXIS, 3, Telkomsel, Indosat, XL Axiata</td>
-    </tr>
-    <tr>
-      <td rowspan="2">Italia</td>
-      <td>4880804</td>
-      <td>Wind</td>
-    </tr>
-    <tr>
-      <td>3424486444</td>
-      <td>Vodafone</td>
-    </tr>
-  </tbody>
-  <tfoot>
-    <tr>
-      <td colspan="3">
-        &raquo; <a class="js-initial-focus" target="_blank" href="http://support.twitter.com/articles/14226-how-to-find-your-twitter-short-code-or-long-code" rel="noopener">Ver códigos cortos de SMS para otros países</a>
-      </td>
-    </tr>
-  </tfoot>
-</table>
-      </div>
-    </div>
-  </div>
-</div>
-
-<div id="leadgen-confirm-dialog" class="modal-container">
-  <div class="modal draggable">
-    <div class="modal-content">
-      <button type="button" class="modal-btn modal-close js-close">
-  <span class="Icon Icon--close Icon--medium">
-    <span class="visuallyhidden">Cerrar</span>
-  </span>
-</button>
-
-      <div class="modal-header">
-        <h3 class="modal-title">Confirmación</h3>
-      </div>
-      <div class="modal-body">
-        <div class="leadgen-card-container">
-          <div class="media">
-            <iframe
-              class="cards2-promotion-iframe"
-              scrolling="no"
-              frameborder="0"
-              src="">
-            </iframe>
-          </div>
-        </div>
-        <div class="js-macaw-cards-iframe-container" data-card-name="promotion">
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div id="auth-webview-dialog" class="AuthWebViewDialog modal-container">
-  <div class="modal draggable">
-    <div class="modal-content">
-      <button type="button" class="modal-btn modal-close modal-close-fixed js-close">
-  <span class="Icon Icon--close Icon--large">
-    <span class="visuallyhidden">Cerrar</span>
-  </span>
-</button>
-
-      <div class="modal-header">
-        <h3 class="modal-title">&nbsp;</h3>
-      </div>
-      <div class="modal-body">
-        <div class="auth-webview-view-container">
-          <div class="media">
-            <iframe
-              class="auth-webview-card-iframe js-initial-focus"
-              scrolling="no"
-              frameborder="0"
-              width="590px"
-              height="500px"
-              src="">
-            </iframe>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-
-<div id="promptbird-modal-prompt" class="modal-container">
-  <div class="modal">
-
-    <button type="button" class="modal-btn js-promptDismiss modal-close js-close">
-      <span class="Icon Icon--close Icon--medium">
-        <span class="visuallyhidden">Cerrar</span>
-      </span>
-    </button>
-    <div class="modal-content"></div>
-  </div>
-</div>
-
-
-<div id="ui-walkthrough-dialog" class="modal-container UIWalkthrough">
-  <div class="UIWalkthrough-clickBlocker"></div>
-  <div class="modal modal-small">
-    <div class="UIWalkthrough-caret"></div>
-    <div class="modal-content">
-      <div class="modal-body">
-        <div class="UIWalkthrough-header">
-          <span class="UIWalkthrough-stepProgress"></span>
-          <button class="UIWalkthrough-skip js-close">
-            Omitir todo
-          </button>
-        </div>
-
-
-
-
-<div class="UIWalkthrough-step UIWalkthrough-step--welcome">
-  <h3 class="UIWalkthrough-title">
-    <span class="Icon Icon--home UIWalkthrough-icon"></span>
-    ¡Bienvenido a casa!
-  </h3>
-  <p class="UIWalkthrough-message">En esta cronología pasarás la mayoría de tu tiempo recibiendo actualizaciones sobre lo que más te interesa.</p>
-</div>
-
-
-
-<div class="UIWalkthrough-step UIWalkthrough-step--unfollow">
-  <h3 class="UIWalkthrough-title">
-    <span class="Icon Icon--smileRating1Fill UIWalkthrough-icon"></span>
-    ¿Ninguno de los Tweets te interesa?
-  </h3>
-  <p class="UIWalkthrough-message">
-    Posiciona tu puntero sobre la imagen de perfil y haz clic en el botón Siguiendo para dejar de seguir a cualquier cuenta.
-  </p>
-</div>
-
-<div class="UIWalkthrough-step UIWalkthrough-step--like">
-
-  <h3 class="UIWalkthrough-title">
-    <span class="Icon Icon--heart UIWalkthrough-icon"></span>
-    Di mucho con poco
-  </h3>
-  <p class="UIWalkthrough-message">
-    Cuando te guste un Tweet, pulsa el corazón: le hará saber a la persona que lo escribió que compartiste el amor.
-  </p>
-</div>
-
-<div class="UIWalkthrough-step UIWalkthrough-step--retweet">
-  <h3 class="UIWalkthrough-title">
-    <span class="Icon Icon--retweet UIWalkthrough-icon"></span>
-    Difunde el mensaje
-  </h3>
-  <p class="UIWalkthrough-message">
-    La manera más rápida de compartir el Tweet de alguien con tus seguidores es con un Retweet. Pulsa el icono para enviarlo instantáneamente.
-  </p>
-</div>
-
-<div class="UIWalkthrough-step UIWalkthrough-step--reply">
-  <h3 class="UIWalkthrough-title">
-    <span class="Icon Icon--reply UIWalkthrough-icon"></span>
-    Únete a la conversación
-  </h3>
-  <p class="UIWalkthrough-message">
-    Di lo que opinas sobre cualquier Tweet con una respuesta. Encuentra un tema que te apasione, y únete a la conversación.
-  </p>
-</div>
-
-
-
-<div class="UIWalkthrough-step UIWalkthrough-step--trends">
-  <h3 class="UIWalkthrough-title">
-    <span class="Icon Icon--discover UIWalkthrough-icon"></span>
-    Infórmate de lo más reciente
-  </h3>
-  <p class="UIWalkthrough-message">
-    Consigue información instantánea sobre lo que las personas están hablando en este momento.
-  </p>
-</div>
-
-<div class="UIWalkthrough-step UIWalkthrough-step--wtf">
-  <h3 class="UIWalkthrough-title">
-    <span class="Icon Icon--follow UIWalkthrough-icon"></span>
-    Consigue más de lo que te encanta
-  </h3>
-  <p class="UIWalkthrough-message">
-    Sigue a más cuentas para recibir actualizaciones instantáneas sobre los temas que te interesan.
-  </p>
-</div>
-
-<div class="UIWalkthrough-step UIWalkthrough-step--search">
-  <h3 class="UIWalkthrough-title">
-    <span class="Icon Icon--search UIWalkthrough-icon"></span>
-    Encuentra lo que está sucediendo
-  </h3>
-  <p class="UIWalkthrough-message">
-    Ve las conversaciones más recientes sobre cualquier tema instantáneamente.
-  </p>
-</div>
-
-<div class="UIWalkthrough-step UIWalkthrough-step--moments">
-  <h3 class="UIWalkthrough-title">
-    <span class="Icon Icon--lightning UIWalkthrough-icon"></span>
-    Nunca te pierdas un Momento
-  </h3>
-  <p class="UIWalkthrough-message">
-    Infórmate de las mejores historias instantáneamente mientras están sucediendo.
-  </p>
-</div>
-      </div>
-
-      <div class="modal-footer">
-        <button class="EdgeButton EdgeButton--tertiary u-floatLeft plain-btn UIWalkthrough-button js-previous-step">Regresar</button>
-        <button class="EdgeButton EdgeButton--secondary UIWalkthrough-button js-next-step js-initial-focus">Siguiente</button>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-
-
-<div id="create-custom-timeline-dialog" class="modal-container"></div>
-<div id="edit-custom-timeline-dialog" class="modal-container"></div>
-<div id="curate-dialog" class="modal-container"></div>
-<div id="media-edit-dialog" class="modal-container"></div>
-
-
-      <div class="PermalinkOverlay PermalinkOverlay-with-background load-at-boot" id="permalink-overlay">
-  <div class="PermalinkProfile-dismiss modal-close-fixed">
-    <span class="Icon Icon--close"></span>
-  </div>
-  <button class="PermalinkOverlay-next PermalinkOverlay-button u-posFixed js-next" type="button">
-    <span class="Icon Icon--caretLeft Icon--large"></span>
-    <span class="u-hiddenVisually">Siguiente Tweet del usuario</span>
-  </button>
-  <div class="PermalinkOverlay-modal">
-    <div class="PermalinkOverlay-spinnerContainer u-hidden">
-      <div class="PermalinkOverlay-spinner"></div>
-    </div>
-    <div class="PermalinkOverlay-content">
-      <div class="PermalinkOverlay-body"
-          data-background-path="/Metallica"
->
-            <div class="permalink-container permalink-container--withArrows">
-  <div role="main" class="permalink light-inline-actions
-  stream-uncapped
-  has-replies
-  original-permalink-page
-
-  ">
-
-
-
-  <div class="permalink-inner permalink-tweet-container">
-
-    <div class="tweet permalink-tweet js-actionable-user js-actionable-tweet js-original-tweet
-         with-social-proof
-
-
-
-
-          js-initial-focus
-"
-        data-associated-tweet-id="1128068672289890305"
-
-data-tweet-id="1128068672289890305"
-data-item-id="1128068672289890305"
-data-permalink-path="/Metallica/status/1128068672289890305"
-data-conversation-id="1128068672289890305"
-
-
-
-
-data-tweet-nonce="1128068672289890305-09d498bc-7a50-4dc3-8f18-1cf6222200e7"
-
-
-
-
-
-
-
-  data-screen-name="Metallica" data-name="Metallica" data-user-id="238475531"
-  data-you-follow="false"
-  data-follows-you="false"
-  data-you-block="false"
- data-mentions="EMMAUSolidarite PompiersParis"
-
-data-reply-to-users-json="[{&quot;id_str&quot;:&quot;238475531&quot;,&quot;screen_name&quot;:&quot;Metallica&quot;,&quot;name&quot;:&quot;Metallica&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Metallica&quot;,&quot;emojified_text_as_html&quot;:&quot;Metallica&quot;}},{&quot;id_str&quot;:&quot;2912493406&quot;,&quot;screen_name&quot;:&quot;EMMAUSolidarite&quot;,&quot;name&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;,&quot;emojified_text_as_html&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;}},{&quot;id_str&quot;:&quot;1342191438&quot;,&quot;screen_name&quot;:&quot;PompiersParis&quot;,&quot;name&quot;:&quot;Pompiers de Paris&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Pompiers de Paris&quot;,&quot;emojified_text_as_html&quot;:&quot;Pompiers de Paris&quot;}}]"
-
-
-
-
-
-
-
-data-disclosure-type=""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-        tabindex="0"
-      >
-
-
-
-      <div class="content clearfix">
-        <div class="permalink-header">
-            <a  class="account-group js-account-group js-action-profile js-user-profile-link js-nav" href="/Metallica" data-user-id="238475531">
-      <img class="avatar js-action-profile-avatar" src="https://pbs.twimg.com/profile_images/766360293953802240/kt0hiSmv_bigger.jpg" alt="">
-    <span class="FullNameGroup">
-      <strong class="fullname show-popup-with-id u-textTruncate " >Metallica</strong><span>&rlm;</span><span class="UserBadges"><span class="Icon Icon--verified"><span class="u-hiddenVisually">Cuenta verificada</span></span></span><span class="UserNameBreak">&nbsp;</span></span><span class="username u-dir u-textTruncate" dir="ltr" >@<b>Metallica</b></span></a>
-
-
-          <small class="time">
-  <a href="/Metallica/status/1128068672289890305" class="tweet-timestamp js-permalink js-nav js-tooltip" title="10:45 PM - 13 May 2019"  data-conversation-id="1128068672289890305"><span class="_timestamp js-short-timestamp " data-aria-label-part="last" data-time="1557787504" data-time-ms="1557787504000" data-long-form="true">13 may.</span></a>
-</small>
-
-
-
-
-    <div class="follow-bar">
-      <div class="user-actions btn-group not-following  "
-    data-user-id="238475531"
-    data-screen-name="Metallica"
-    data-name="Metallica"
-    data-protected="false"
-  >
-  <span class="user-actions-follow-button js-follow-btn follow-button">
-  <button type="button" class="
-    EdgeButton
-    EdgeButton--secondary
-
-    EdgeButton--medium
-    button-text
-    follow-text">
-      <span aria-hidden="true">Seguir</span>
-      <span class="u-hiddenVisually">Seguir a <span class="username u-dir u-textTruncate" dir="ltr" >@<b>Metallica</b></span></span>
-  </button>
-  <button type="button" class="
-    EdgeButton
-    EdgeButton--primary
-
-    EdgeButton--medium
-    button-text
-    following-text">
-      <span aria-hidden="true">Siguiendo</span>
-      <span class="u-hiddenVisually">Siguiendo a <span class="username u-dir u-textTruncate" dir="ltr" >@<b>Metallica</b></span></span>
-  </button>
-  <button type="button" class="
-    EdgeButton
-    EdgeButton--danger
-
-    EdgeButton--medium
-    button-text
-    unfollow-text">
-      <span aria-hidden="true">Dejar de seguir</span>
-      <span class="u-hiddenVisually">Dejar de seguir a <span class="username u-dir u-textTruncate" dir="ltr" >@<b>Metallica</b></span></span>
-  </button>
-  <button type="button" class="
-    EdgeButton
-    EdgeButton--invertedDanger
-
-    EdgeButton--medium
-    button-text
-    blocked-text">
-    <span aria-hidden="true">Bloqueado</span>
-    <span class="u-hiddenVisually"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>Metallica</b></span> está bloqueado</span>
-  </button>
-  <button type="button" class="
-    EdgeButton
-    EdgeButton--danger
-
-    EdgeButton--medium
-    button-text
-    unblock-text">
-    <span aria-hidden="true">Desbloquear</span>
-    <span class="u-hiddenVisually">Desbloquear a <span class="username u-dir u-textTruncate" dir="ltr" >@<b>Metallica</b></span></span>
-  </button>
-  <button type="button" class="
-    EdgeButton
-    EdgeButton--secondary
-
-    EdgeButton--medium
-    button-text
-    pending-text">
-    <span aria-hidden="true">Pendiente</span>
-    <span class="u-hiddenVisually">Solicitud de seguimiento de <span class="username u-dir u-textTruncate" dir="ltr" >@<b>Metallica</b></span> pendiente</span>
-  </button>
-  <button type="button" class="
-    EdgeButton
-    EdgeButton--secondary
-
-    EdgeButton--medium
-    button-text
-    cancel-text">
-    <span aria-hidden="true">Cancelar</span>
-    <span class="u-hiddenVisually">Cancelar tu solicitud de seguimiento a <span class="username u-dir u-textTruncate" dir="ltr" >@<b>Metallica</b></span></span>
-  </button>
-</span>
-
-</div>
-
-    </div>
-
-            <div class="ProfileTweet-action ProfileTweet-action--more js-more-ProfileTweet-actions">
-    <div class="dropdown">
-  <button class="ProfileTweet-actionButton u-textUserColorHover dropdown-toggle js-dropdown-toggle" type="button">
-      <div class="IconContainer js-tooltip" title="Más">
-        <span class="Icon Icon--caretDownLight Icon--small"></span>
-        <span class="u-hiddenVisually">Más</span>
-      </div>
-  </button>
-  <div class="dropdown-menu is-autoCentered">
-  <div class="dropdown-caret">
-    <div class="caret-outer"></div>
-    <div class="caret-inner"></div>
-  </div>
-  <ul>
-
-      <li class="copy-link-to-tweet js-actionCopyLinkToTweet">
-        <button type="button" class="dropdown-link">Copiar enlace del Tweet</button>
-      </li>
-      <li class="embed-link js-actionEmbedTweet" data-nav="embed_tweet">
-        <button type="button" class="dropdown-link">Insertar Tweet</button>
-      </li>
-  </ul>
-</div>
-
-</div>
-
-  </div>
-
-        </div>
-
-      </div>
-
-
-
-          <p class="u-hiddenVisually" aria-hidden="true" data-aria-label-part="1">Metallica Retwitteó All Within My Hands Foundation</p>
-
-
-<div class="js-tweet-text-container">
-  <p class="TweetTextSize TweetTextSize--jumbo js-tweet-text tweet-text" lang="en" data-aria-label-part="4">Thank you to everyone who came out for <a href="/hashtag/MetInParis?src=hash" data-query-source="hashtag_click" class="twitter-hashtag pretty-link js-nav" dir="ltr" ><s>#</s><b>MetInParis</b></a> last night for helping us support <a href="/EMMAUSolidarite" class="twitter-atreply pretty-link js-nav" dir="ltr" data-mentioned-user-id="2912493406" ><s>@</s><b>EMMAUSolidarite</b></a> &amp; <a href="/PompiersParis" class="twitter-atreply pretty-link js-nav" dir="ltr" data-mentioned-user-id="1342191438" ><s>@</s><b>PompiersParis</b></a>. <a href="/hashtag/AWMH?src=hash" data-query-source="hashtag_click" class="twitter-hashtag pretty-link js-nav" dir="ltr" ><s>#</s><b>AWMH</b></a> <a href="/hashtag/MetalicaGivesBack?src=hash" data-query-source="hashtag_click" class="twitter-hashtag pretty-link js-nav" dir="ltr" ><s>#</s><b>MetalicaGivesBack</b></a><a href="https://t.co/gLtZSdDFmN" rel="nofollow noopener" dir="ltr" data-expanded-url="https://twitter.com/AWMHFoundation/status/1127646016931487744" class="twitter-timeline-link u-hidden" target="_blank" title="https://twitter.com/AWMHFoundation/status/1127646016931487744" ><span class="tco-ellipsis"></span><span class="invisible">https://</span><span class="js-display-url">twitter.com/AWMHFoundation</span><span class="invisible">/status/1127646016931487744</span><span class="tco-ellipsis"><span class="invisible">&nbsp;</span>…</span></a></p>
-</div>
-
-
-<p class="u-hiddenVisually" aria-hidden="true" data-aria-label-part="3">Metallica agregado,</p>
-
-      <div class="QuoteTweet
-
-
-    u-block js-tweet-details-fixer">
-  <div class="QuoteTweet-container">
-    <a class="QuoteTweet-link js-nav" href="/AWMHFoundation/status/1127646016931487744" data-conversation-id="1127646016931487744" aria-hidden="true"
-       >
-    </a>
-    <div class="QuoteTweet-innerContainer u-cf js-permalink js-media-container"
-      data-item-id="1127646016931487744"
-      data-item-type="tweet"
-      data-screen-name="AWMHFoundation"
-      data-user-id="886959980254871552"
-      href="/AWMHFoundation/status/1127646016931487744"
-      data-conversation-id="1127646016931487744"
-      tabindex="0">
-      <div class="tweet-content">
-            <div class="QuoteMedia">
-      <div class="QuoteMedia-container js-quote-media-container">
-          <div class="QuoteMedia-doublePhoto">
-    <div class="QuoteMedia-halfPhoto">
-      <div class="QuoteMedia-photoContainer js-quote-photo"
-  data-image-url="https://pbs.twimg.com/media/D6YzUC8V4AApDdF.jpg"
-
-  data-element-context="platform_photo_card"
-    style="background-color:rgba(48,55,64,1.0);"
-    data-dominant-color="[48,55,64]"
->
-  <img data-aria-label-part src="https://pbs.twimg.com/media/D6YzUC8V4AApDdF.jpg" alt=""
-      style="height: 100%; left: -18px;"
->
-</div>
-
-    </div>
-    <div class="QuoteMedia-halfPhoto">
-      <div class="QuoteMedia-photoContainer js-quote-photo"
-  data-image-url="https://pbs.twimg.com/media/D6YzVKeV4AEPpSQ.jpg"
-
-  data-element-context="platform_photo_card"
-    style="background-color:rgba(39,33,35,1.0);"
-    data-dominant-color="[39,33,35]"
->
-  <img data-aria-label-part src="https://pbs.twimg.com/media/D6YzVKeV4AEPpSQ.jpg" alt=""
-      style="height: 100%; left: -6px;"
->
-</div>
-
-    </div>
-</div>
-      </div>
-  </div>
-
-        <div class="QuoteTweet-authorAndText u-alignTop">
-
-  <div class="QuoteTweet-originalAuthor u-cf u-textTruncate stream-item-header account-group js-user-profile-link">
-    <b class="QuoteTweet-fullname u-linkComplex-target">All Within My Hands Foundation</b><span class="UserBadges"></span><span class="UserNameBreak">&nbsp;</span><span class="username u-dir u-textTruncate" dir="ltr" >@<b>AWMHFoundation</b></span>
-  </div>
-
-
-
-          <div class="QuoteTweet-text tweet-text u-dir js-ellipsis"
-            lang="en"
-            data-aria-label-part="2"
-
-            dir="ltr">If you bought a ticket for tonight’s <span class="twitter-atreply pretty-link js-nav" dir="ltr" data-mentioned-user-id="238475531" ><s>@</s><b>Metallica</b></span> show at Stade de France, you have helped contribute to <span class="twitter-atreply pretty-link js-nav" dir="ltr" data-mentioned-user-id="2912493406" ><s>@</s><b>EMMAUSolidarite</b></span> &amp; <span class="twitter-atreply pretty-link js-nav" dir="ltr" data-mentioned-user-id="1342191438" ><s>@</s><b>PompiersParis</b></span>. <span data-query-source="hashtag_click" class="twitter-hashtag pretty-link js-nav" dir="ltr" ><s>#</s><b>MetallicaGivesBack</b></span> <span data-query-source="hashtag_click" class="twitter-hashtag pretty-link js-nav" dir="ltr" ><s>#</s><b>AWMH</b></span> <span data-query-source="hashtag_click" class="twitter-hashtag pretty-link js-nav" dir="ltr" ><s>#</s><b>MetInParis</b></span> <span class="twitter-timeline-link u-hidden" data-pre-embedded="true" dir="ltr" >pic.twitter.com/wlUtDQbQEK</span></div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-
-
-
-
-
-
-      <div class="js-tweet-details-fixer tweet-details-fixer">
-  <div class="client-and-actions">
-  <span class="metadata">
-    <span>15:45 - 13 may. 2019</span>
-
-  </span>
-
-</div>
-
-
-  <div class="js-machine-translated-tweet-container"></div>
-  <div class="js-tweet-stats-container tweet-stats-container">
-
-<ul class="stats" aria-label="Retwitteado y marcado como favorito por">
-    <li class="js-stat-count js-stat-retweets stat-count" aria-hidden="true">
-      <a tabindex=0 role="button"
-        data-tweet-stat-count="201"
-        data-compact-localized-count="201"
-        class="request-retweeted-popup"
-        data-activity-popup-title="201 retweets">
-
-          <strong>201</strong> Retweets      </a>
-    </li>
-
-    <li class="js-stat-count js-stat-favorites stat-count" aria-hidden="true">
-      <a tabindex=0 role="button"
-         data-tweet-stat-count="1664"
-         data-compact-localized-count="1.7K"
-         class="request-favorited-popup"
-         data-activity-popup-title="1.664 Me gusta">
-
-          <strong>1.664</strong> Me gusta      </a>
-    </li>
-
-  <li class="avatar-row js-face-pile-container">
-      <a class="js-profile-popup-actionable js-tooltip" href="/Vivana88703255" data-user-id="1132748366415368192" original-title="ViiviiCasco" title="ViiviiCasco" rel="noopener">
-  <img class="avatar size24 js-user-profile-link" src="https://pbs.twimg.com/profile_images/1132994451524202496/7LlpbEKj_normal.jpg" alt="ViiviiCasco">
-</a>
-      <a class="js-profile-popup-actionable js-tooltip" href="/estrelaffu2" data-user-id="1032598497202192384" original-title="Raphaela Estrela" title="Raphaela Estrela" rel="noopener">
-  <img class="avatar size24 js-user-profile-link" src="https://pbs.twimg.com/profile_images/1032599434968883205/5lgWkVgu_normal.jpg" alt="Raphaela Estrela">
-</a>
-      <a class="js-profile-popup-actionable js-tooltip" href="/Abby6668" data-user-id="1050416779481231360" original-title="Abby_666" title="Abby_666" rel="noopener">
-  <img class="avatar size24 js-user-profile-link" src="https://pbs.twimg.com/profile_images/1075798931433492486/qWUkHSxF_normal.jpg" alt="Abby_666">
-</a>
-      <a class="js-profile-popup-actionable js-tooltip" href="/orangemama22" data-user-id="609709195" original-title="Gena Gonzales" title="Gena Gonzales" rel="noopener">
-  <img class="avatar size24 js-user-profile-link" src="https://pbs.twimg.com/profile_images/965319987672924160/P2-5m21G_normal.jpg" alt="Gena Gonzales">
-</a>
-      <a class="js-profile-popup-actionable js-tooltip" href="/Gahbueno99Bueno" data-user-id="723158862786879490" original-title="Gabriel Bueno" title="Gabriel Bueno" rel="noopener">
-  <img class="avatar size24 js-user-profile-link" src="https://pbs.twimg.com/profile_images/1087665289393815553/6dY77Wxt_normal.jpg" alt="Gabriel Bueno">
-</a>
-      <a class="js-profile-popup-actionable js-tooltip" href="/MakanaMclain" data-user-id="1130321701181374464" original-title="makana mclain" title="makana mclain" rel="noopener">
-  <img class="avatar size24 js-user-profile-link" src="https://pbs.twimg.com/profile_images/1131796514177556480/KoIb9exq_normal.jpg" alt="makana mclain">
-</a>
-      <a class="js-profile-popup-actionable js-tooltip" href="/HippyDrewTHR" data-user-id="972559413704830977" original-title="Drew" title="Drew" rel="noopener">
-  <img class="avatar size24 js-user-profile-link" src="https://pbs.twimg.com/profile_images/1125086235574321152/kDS4jgBT_normal.jpg" alt="Drew">
-</a>
-      <a class="js-profile-popup-actionable js-tooltip" href="/Alexandralsnc" data-user-id="4289465071" original-title="Александра" title="Александра" rel="noopener">
-  <img class="avatar size24 js-user-profile-link" src="https://pbs.twimg.com/profile_images/1128627557740556288/dTq-jPnx_normal.jpg" alt="Александра">
-</a>
-      <a class="js-profile-popup-actionable js-tooltip" href="/LordiCavalera" data-user-id="4610880202" original-title="Lordi Walmir Cavalera" title="Lordi Walmir Cavalera" rel="noopener">
-  <img class="avatar size24 js-user-profile-link" src="https://pbs.twimg.com/profile_images/943333887807295488/xjLBnbQ0_normal.jpg" alt="Lordi Walmir Cavalera">
-</a>
-  </li>
-</ul>
-
-
-  </div>
-</div>
-
-
-
-      <div class="stream-item-footer">
-
-
-
-
-            <div class="ProfileTweet-actionCountList u-hiddenVisually">
-
-
-    <span class="ProfileTweet-action--reply u-hiddenVisually">
-      <span class="ProfileTweet-actionCount"  data-tweet-stat-count="23">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-reply-count-aria-1128068672289890305" data-aria-label-part>23 respuestas</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--retweet u-hiddenVisually">
-      <span class="ProfileTweet-actionCount"  data-tweet-stat-count="201">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-retweet-count-aria-1128068672289890305" data-aria-label-part>201 retweets</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--favorite u-hiddenVisually">
-      <span class="ProfileTweet-actionCount"  data-tweet-stat-count="1664">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-favorite-count-aria-1128068672289890305" data-aria-label-part>1.664 Me gusta</span>
-      </span>
-    </span>
-  </div>
-
-  <div class="ProfileTweet-actionList js-actions" role="group" aria-label="Acciones del Tweet">
-    <div class="ProfileTweet-action ProfileTweet-action--reply">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionReply"
-    data-modal="ProfileTweet-reply" type="button"
-    aria-describedby="profile-tweet-action-reply-count-aria-1128068672289890305">
-    <div class="IconContainer js-tooltip" title="Responder">
-      <span class="Icon Icon--medium Icon--reply"></span>
-      <span class="u-hiddenVisually">Responder</span>
-    </div>
-      <span class="ProfileTweet-actionCount ">
-        <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-      </span>
-  </button>
-</div>
-
-    <div class="ProfileTweet-action ProfileTweet-action--retweet js-toggleState js-toggleRt">
-  <button class="ProfileTweet-actionButton  js-actionButton js-actionRetweet"
-
-    data-modal="ProfileTweet-retweet"
-    type="button"
-    aria-describedby="profile-tweet-action-retweet-count-aria-1128068672289890305">
-    <div class="IconContainer js-tooltip" title="Retwittear">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retwittear</span>
-    </div>
-      <span class="ProfileTweet-actionCount">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo js-actionButton js-actionRetweet" data-modal="ProfileTweet-retweet" type="button">
-    <div class="IconContainer js-tooltip" title="Deshacer Retweet">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retwitteado</span>
-    </div>
-      <span class="ProfileTweet-actionCount">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button>
-</div>
-
-
-    <div class="ProfileTweet-action ProfileTweet-action--favorite js-toggleState">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionFavorite" type="button"
-    aria-describedby="profile-tweet-action-favorite-count-aria-1128068672289890305">
-    <div class="IconContainer js-tooltip" title="Me gusta">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Me gusta</span>
-    </div>
-      <span class="ProfileTweet-actionCount">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo ProfileTweet-action--unfavorite u-linkClean js-actionButton js-actionFavorite" type="button">
-    <div class="IconContainer js-tooltip" title="Deshacer me gusta">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Gustado</span>
-    </div>
-      <span class="ProfileTweet-actionCount">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button>
-</div>
-
-
-
-
-
-
-  </div>
-
-      </div>
-
-      <div class="permalink-footer">
-
-      </div>
-    </div>
-
-  </div>
-
-
-
-<div class="replies-to  permalink-inner permalink-replies" data-component-context="replies">
-    <div class="tweets-wrapper">
-      <div id="descendants" class="ThreadedDescendants">
-          <div class="stream-container  "
-    data-max-position="" data-min-position="DAACDwABCgAAABMPp9UNahfgAA-ntQcs1uABD6e2XSUWkAEPp7X2zFeQAA-n2_DWFVAAD6l3n0uWwAEPp7S3ZFTQAA-p7d0wlCAHD6l2-v_WwAAPp7TbdxRQAA-nxlb6FrAAD6yjmiiW4AUPqAfHjVbAAA-ohleelNABD6e07-FUwAEPqjYWdVRgAA-n5kZfF7ACD6gI875X4AAPp7ZvGpegAwgAAwAAAAECAAQAAAA"
-    >
-    <div class="stream">
-        <ol class="stream-items js-navigable-stream" id="stream-items-id">
-
-
-
-
-
-
-
-
-
-
-
-
-      <li class="ThreadedConversation--loneTweet
-
-  ">
-    <ol class="stream-items">
-      <li class="js-stream-item stream-item stream-item
-" data-item-id="1128104485270839296"
-id="stream-item-tweet-1128104485270839296"
-data-item-type="tweet"
- data-suggestion-json="{&quot;suggestion_details&quot;:{},&quot;tweet_ids&quot;:&quot;1128104485270839296&quot;,&quot;scribe_component&quot;:&quot;tweet&quot;}">
-
-
-
-  <div class="tweet js-stream-tweet js-actionable-tweet js-profile-popup-actionable dismissible-content
-
-
-
-       descendant permalink-descendant-tweet
-"
-
-data-tweet-id="1128104485270839296"
-data-item-id="1128104485270839296"
-data-permalink-path="/totopopi56/status/1128104485270839296"
-data-conversation-id="1128068672289890305"
-
-
- data-has-parent-tweet="true"
-
-data-tweet-nonce="1128104485270839296-9cc18e95-a3d9-49a0-94b3-21d717710a64"
-data-tweet-stat-initialized="true"
-data-conversation-section-quality="HighQuality"
-
-
-
-
-
-  data-screen-name="totopopi56" data-name="norali" data-user-id="741037312151330816"
-  data-you-follow="false"
-  data-follows-you="false"
-  data-you-block="false"
- data-mentions="Metallica EMMAUSolidarite PompiersParis"
-
-data-reply-to-users-json="[{&quot;id_str&quot;:&quot;741037312151330816&quot;,&quot;screen_name&quot;:&quot;totopopi56&quot;,&quot;name&quot;:&quot;norali&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;norali&quot;,&quot;emojified_text_as_html&quot;:&quot;norali&quot;}},{&quot;id_str&quot;:&quot;238475531&quot;,&quot;screen_name&quot;:&quot;Metallica&quot;,&quot;name&quot;:&quot;Metallica&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Metallica&quot;,&quot;emojified_text_as_html&quot;:&quot;Metallica&quot;}},{&quot;id_str&quot;:&quot;2912493406&quot;,&quot;screen_name&quot;:&quot;EMMAUSolidarite&quot;,&quot;name&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;,&quot;emojified_text_as_html&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;}},{&quot;id_str&quot;:&quot;1342191438&quot;,&quot;screen_name&quot;:&quot;PompiersParis&quot;,&quot;name&quot;:&quot;Pompiers de Paris&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Pompiers de Paris&quot;,&quot;emojified_text_as_html&quot;:&quot;Pompiers de Paris&quot;}}]"
-
-
-
-
-
-
-
-data-disclosure-type=""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- data-component-context="replies"
-
-
-    >
-
-    <div class="context">
-
-
-    </div>
-
-    <div class="content">
-
-
-
-
-
-      <div class="stream-item-header">
-          <a  class="account-group js-account-group js-action-profile js-user-profile-link js-nav" href="/totopopi56" data-user-id="741037312151330816">
-      <img class="avatar js-action-profile-avatar" src="https://pbs.twimg.com/profile_images/1081516152013185024/cHbT4Wof_bigger.jpg" alt="">
-    <span class="FullNameGroup">
-      <strong class="fullname show-popup-with-id u-textTruncate " data-aria-label-part>norali</strong><span>&rlm;</span><span class="UserBadges"></span><span class="UserNameBreak">&nbsp;</span></span><span class="username u-dir u-textTruncate" dir="ltr" data-aria-label-part>@<b>totopopi56</b></span></a>
-
-
-        <small class="time">
-  <a href="/totopopi56/status/1128104485270839296" class="tweet-timestamp js-permalink js-nav js-tooltip" title="18:07 - 13 may. 2019"  data-conversation-id="1128068672289890305"><span class="_timestamp js-short-timestamp " data-aria-label-part="last" data-time="1557796043" data-time-ms="1557796043000" data-long-form="true">14 may.</span></a>
-</small>
-
-          <div class="ProfileTweet-action ProfileTweet-action--more js-more-ProfileTweet-actions">
-    <div class="dropdown">
-  <button class="ProfileTweet-actionButton u-textUserColorHover dropdown-toggle js-dropdown-toggle" type="button">
-      <div class="IconContainer js-tooltip" title="Más">
-        <span class="Icon Icon--caretDownLight Icon--small"></span>
-        <span class="u-hiddenVisually">Más</span>
-      </div>
-  </button>
-  <div class="dropdown-menu is-autoCentered">
-  <div class="dropdown-caret">
-    <div class="caret-outer"></div>
-    <div class="caret-inner"></div>
-  </div>
-  <ul>
-
-      <li class="copy-link-to-tweet js-actionCopyLinkToTweet">
-        <button type="button" class="dropdown-link">Copiar enlace del Tweet</button>
-      </li>
-      <li class="embed-link js-actionEmbedTweet" data-nav="embed_tweet">
-        <button type="button" class="dropdown-link">Insertar Tweet</button>
-      </li>
-  </ul>
-</div>
-
-</div>
-
-  </div>
-
-      </div>
-
-
-
-
-
-        <div class="ReplyingToContextBelowAuthor" data-aria-label-part>
-
-
-    En respuesta a <a class="pretty-link js-user-profile-link" href="/Metallica" data-user-id="238475531" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>Metallica</b></span></a> <a class="pretty-link js-user-profile-link" href="/EMMAUSolidarite" data-user-id="2912493406" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>EMMAUSolidarite</b></span></a> <a class="pretty-link js-user-profile-link" href="/PompiersParis" data-user-id="1342191438" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>PompiersParis</b></span></a>
-
-</div>
-
-
-
-        <div class="js-tweet-text-container">
-  <p class="TweetTextSize  js-tweet-text tweet-text" lang="en" data-aria-label-part="0">GOOD MEN GOOD ACTIONS  <img class="Emoji Emoji--forText" src="https://abs.twimg.com/emoji/v2/72x72/1f918.png" draggable="false" alt="🤘" title="Señal de los cuernos" aria-label="Emoji: Señal de los cuernos"><img class="Emoji Emoji--forText" src="https://abs.twimg.com/emoji/v2/72x72/2764.png" draggable="false" alt="❤" title="Corazón rojo" aria-label="Emoji: Corazón rojo"><img class="Emoji Emoji--forText" src="https://abs.twimg.com/emoji/v2/72x72/1f918.png" draggable="false" alt="🤘" title="Señal de los cuernos" aria-label="Emoji: Señal de los cuernos"></p>
-</div>
-
-
-
-
-
-
-
-
-
-
-
-
-      <div class="stream-item-footer">
-
-      <div class="ProfileTweet-actionCountList u-hiddenVisually">
-
-
-    <span class="ProfileTweet-action--reply u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-reply-count-aria-1128104485270839296" >0 respuestas</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--retweet u-hiddenVisually">
-      <span class="ProfileTweet-actionCount"  data-tweet-stat-count="1">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-retweet-count-aria-1128104485270839296" data-aria-label-part>1 retweet</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--favorite u-hiddenVisually">
-      <span class="ProfileTweet-actionCount"  data-tweet-stat-count="3">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-favorite-count-aria-1128104485270839296" data-aria-label-part>3 Me gusta</span>
-      </span>
-    </span>
-  </div>
-
-  <div class="ProfileTweet-actionList js-actions" role="group" aria-label="Acciones del Tweet">
-    <div class="ProfileTweet-action ProfileTweet-action--reply">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionReply"
-    data-modal="ProfileTweet-reply" type="button"
-    aria-describedby="profile-tweet-action-reply-count-aria-1128104485270839296">
-    <div class="IconContainer js-tooltip" title="Responder">
-      <span class="Icon Icon--medium Icon--reply"></span>
-      <span class="u-hiddenVisually">Responder</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero ">
-        <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-      </span>
-  </button>
-</div>
-
-    <div class="ProfileTweet-action ProfileTweet-action--retweet js-toggleState js-toggleRt">
-  <button class="ProfileTweet-actionButton  js-actionButton js-actionRetweet"
-
-    data-modal="ProfileTweet-retweet"
-    type="button"
-    aria-describedby="profile-tweet-action-retweet-count-aria-1128104485270839296">
-    <div class="IconContainer js-tooltip" title="Retwittear">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retwittear</span>
-    </div>
-      <span class="ProfileTweet-actionCount">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">1</span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo js-actionButton js-actionRetweet" data-modal="ProfileTweet-retweet" type="button">
-    <div class="IconContainer js-tooltip" title="Deshacer Retweet">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retwitteado</span>
-    </div>
-      <span class="ProfileTweet-actionCount">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">1</span>
-  </span>
-
-  </button>
-</div>
-
-
-    <div class="ProfileTweet-action ProfileTweet-action--favorite js-toggleState">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionFavorite" type="button"
-    aria-describedby="profile-tweet-action-favorite-count-aria-1128104485270839296">
-    <div class="IconContainer js-tooltip" title="Me gusta">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Me gusta</span>
-    </div>
-      <span class="ProfileTweet-actionCount">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">3</span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo ProfileTweet-action--unfavorite u-linkClean js-actionButton js-actionFavorite" type="button">
-    <div class="IconContainer js-tooltip" title="Deshacer me gusta">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Gustado</span>
-    </div>
-      <span class="ProfileTweet-actionCount">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">3</span>
-  </span>
-
-  </button>
-</div>
-
-
-
-
-
-
-  </div>
-
-</div>
-
-
-
-
-
-
-
-
-
-
-
-    </div>
-
-  </div>
-
-
-
-
-<div class="dismiss-module">
-  <div class="dismissed-module">
-    <div class="feedback-actions">
-        <div class="feedback-action" data-feedback-type="DontLike" data-feedback-url="">
-          <div class="action-confirmation dismiss-module-item">Gracias. Twitter usará esto para mejorar tu cronología.
-            <span class="undo-action">Deshacer</span>
-          </div>
-        </div>
-    </div>
-    <div class="child-feedback-confirmation">
-      <div class="child-confirmation-item">
-        <span class="child-confirmation-text"></span>
-        <span class="undo-child-feedback-action">Deshacer</span>
-      </div>
-    </div>
-  </div>
-</div>
-
-</li>
-    </ol>
-  </li>
-
-
-      <li class="ThreadedConversation--loneTweet
-
-  ">
-    <ol class="stream-items">
-      <li class="js-stream-item stream-item stream-item
-" data-item-id="1128069274101276673"
-id="stream-item-tweet-1128069274101276673"
-data-item-type="tweet"
- data-suggestion-json="{&quot;suggestion_details&quot;:{},&quot;tweet_ids&quot;:&quot;1128069274101276673&quot;,&quot;scribe_component&quot;:&quot;tweet&quot;}">
-
-
-
-  <div class="tweet js-stream-tweet js-actionable-tweet js-profile-popup-actionable dismissible-content
-
-
-
-       descendant permalink-descendant-tweet
-"
-
-data-tweet-id="1128069274101276673"
-data-item-id="1128069274101276673"
-data-permalink-path="/LizzyHock1963/status/1128069274101276673"
-data-conversation-id="1128068672289890305"
-
-
- data-has-parent-tweet="true"
-
-data-tweet-nonce="1128069274101276673-60bc7d8d-bf5b-48d8-b37a-e4b6cd3c1b86"
-data-tweet-stat-initialized="true"
-data-conversation-section-quality="HighQuality"
-
-
-
-
-
-  data-screen-name="LizzyHock1963" data-name="♬♪♬ 🇺🇸 Elizabeth Hock 🇮🇱 ♬♪♬" data-user-id="863480651881734144"
-  data-you-follow="false"
-  data-follows-you="false"
-  data-you-block="false"
- data-mentions="Metallica EMMAUSolidarite PompiersParis"
-
-data-reply-to-users-json="[{&quot;id_str&quot;:&quot;863480651881734144&quot;,&quot;screen_name&quot;:&quot;LizzyHock1963&quot;,&quot;name&quot;:&quot;\u266c\u266a\u266c \ud83c\uddfa\ud83c\uddf8 Elizabeth Hock \ud83c\uddee\ud83c\uddf1 \u266c\u266a\u266c&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;\u266c\u266a\u266c \ud83c\uddfa\ud83c\uddf8 Elizabeth Hock \ud83c\uddee\ud83c\uddf1 \u266c\u266a\u266c&quot;,&quot;emojified_text_as_html&quot;:&quot;\u266c\u266a\u266c \u003cspan class=\&quot;Emoji Emoji--forLinks\&quot; style=\&quot;background-image:url(&#39;https:\/\/abs.twimg.com\/emoji\/v2\/72x72\/1f1fa-1f1f8.png&#39;)\&quot; title=\&quot;Bandera de Estados Unidos\&quot; aria-label=\&quot;Emoji: Bandera de Estados Unidos\&quot;\u003e&amp;nbsp;\u003c\/span\u003e\u003cspan class=\&quot;visuallyhidden\&quot; aria-hidden=\&quot;true\&quot;\u003e\ud83c\uddfa\ud83c\uddf8\u003c\/span\u003e Elizabeth Hock \u003cspan class=\&quot;Emoji Emoji--forLinks\&quot; style=\&quot;background-image:url(&#39;https:\/\/abs.twimg.com\/emoji\/v2\/72x72\/1f1ee-1f1f1.png&#39;)\&quot; title=\&quot;Bandera de Israel\&quot; aria-label=\&quot;Emoji: Bandera de Israel\&quot;\u003e&amp;nbsp;\u003c\/span\u003e\u003cspan class=\&quot;visuallyhidden\&quot; aria-hidden=\&quot;true\&quot;\u003e\ud83c\uddee\ud83c\uddf1\u003c\/span\u003e \u266c\u266a\u266c&quot;}},{&quot;id_str&quot;:&quot;238475531&quot;,&quot;screen_name&quot;:&quot;Metallica&quot;,&quot;name&quot;:&quot;Metallica&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Metallica&quot;,&quot;emojified_text_as_html&quot;:&quot;Metallica&quot;}},{&quot;id_str&quot;:&quot;2912493406&quot;,&quot;screen_name&quot;:&quot;EMMAUSolidarite&quot;,&quot;name&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;,&quot;emojified_text_as_html&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;}},{&quot;id_str&quot;:&quot;1342191438&quot;,&quot;screen_name&quot;:&quot;PompiersParis&quot;,&quot;name&quot;:&quot;Pompiers de Paris&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Pompiers de Paris&quot;,&quot;emojified_text_as_html&quot;:&quot;Pompiers de Paris&quot;}}]"
-
-
-
-
-
-
-
-data-disclosure-type=""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- data-component-context="replies"
-
-
-    >
-
-    <div class="context">
-
-
-    </div>
-
-    <div class="content">
-
-
-
-
-
-      <div class="stream-item-header">
-          <a  class="account-group js-account-group js-action-profile js-user-profile-link js-nav" href="/LizzyHock1963" data-user-id="863480651881734144">
-      <img class="avatar js-action-profile-avatar" src="https://pbs.twimg.com/profile_images/1062506213588516864/bDltXSyt_bigger.jpg" alt="">
-    <span class="FullNameGroup">
-      <strong class="fullname show-popup-with-id u-textTruncate " data-aria-label-part>♬♪♬ <span class="Emoji Emoji--forLinks" style="background-image:url('https://abs.twimg.com/emoji/v2/72x72/1f1fa-1f1f8.png')" title="Bandera de Estados Unidos" aria-label="Emoji: Bandera de Estados Unidos">&nbsp;</span><span class="visuallyhidden" aria-hidden="true">🇺🇸</span> Elizabeth Hock <span class="Emoji Emoji--forLinks" style="background-image:url('https://abs.twimg.com/emoji/v2/72x72/1f1ee-1f1f1.png')" title="Bandera de Israel" aria-label="Emoji: Bandera de Israel">&nbsp;</span><span class="visuallyhidden" aria-hidden="true">🇮🇱</span> ♬♪♬</strong><span>&rlm;</span><span class="UserBadges"></span><span class="UserNameBreak">&nbsp;</span></span><span class="username u-dir u-textTruncate" dir="ltr" data-aria-label-part>@<b>LizzyHock1963</b></span></a>
-
-
-        <small class="time">
-  <a href="/LizzyHock1963/status/1128069274101276673" class="tweet-timestamp js-permalink js-nav js-tooltip" title="15:47 - 13 may. 2019"  data-conversation-id="1128068672289890305"><span class="_timestamp js-short-timestamp " data-aria-label-part="last" data-time="1557787648" data-time-ms="1557787648000" data-long-form="true">13 may.</span></a>
-</small>
-
-          <div class="ProfileTweet-action ProfileTweet-action--more js-more-ProfileTweet-actions">
-    <div class="dropdown">
-  <button class="ProfileTweet-actionButton u-textUserColorHover dropdown-toggle js-dropdown-toggle" type="button">
-      <div class="IconContainer js-tooltip" title="Más">
-        <span class="Icon Icon--caretDownLight Icon--small"></span>
-        <span class="u-hiddenVisually">Más</span>
-      </div>
-  </button>
-  <div class="dropdown-menu is-autoCentered">
-  <div class="dropdown-caret">
-    <div class="caret-outer"></div>
-    <div class="caret-inner"></div>
-  </div>
-  <ul>
-
-      <li class="copy-link-to-tweet js-actionCopyLinkToTweet">
-        <button type="button" class="dropdown-link">Copiar enlace del Tweet</button>
-      </li>
-      <li class="embed-link js-actionEmbedTweet" data-nav="embed_tweet">
-        <button type="button" class="dropdown-link">Insertar Tweet</button>
-      </li>
-  </ul>
-</div>
-
-</div>
-
-  </div>
-
-      </div>
-
-
-
-
-
-        <div class="ReplyingToContextBelowAuthor" data-aria-label-part>
-
-
-    En respuesta a <a class="pretty-link js-user-profile-link" href="/Metallica" data-user-id="238475531" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>Metallica</b></span></a> <a class="pretty-link js-user-profile-link" href="/EMMAUSolidarite" data-user-id="2912493406" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>EMMAUSolidarite</b></span></a> <a class="pretty-link js-user-profile-link" href="/PompiersParis" data-user-id="1342191438" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>PompiersParis</b></span></a>
-
-</div>
-
-
-
-        <div class="js-tweet-text-container">
-  <p class="TweetTextSize  js-tweet-text tweet-text" lang="en" data-aria-label-part="0">Thank you MetallicA, for being so generous!<img class="Emoji Emoji--forText" src="https://abs.twimg.com/emoji/v2/72x72/1f495.png" draggable="false" alt="💕" title="Dos corazones" aria-label="Emoji: Dos corazones"><img class="Emoji Emoji--forText" src="https://abs.twimg.com/emoji/v2/72x72/1f49e.png" draggable="false" alt="💞" title="Corazones girando" aria-label="Emoji: Corazones girando"><img class="Emoji Emoji--forText" src="https://abs.twimg.com/emoji/v2/72x72/1f49f.png" draggable="false" alt="💟" title="Decoración de corazón" aria-label="Emoji: Decoración de corazón"> <img class="Emoji Emoji--forText" src="https://abs.twimg.com/emoji/v2/72x72/1f918.png" draggable="false" alt="🤘" title="Señal de los cuernos" aria-label="Emoji: Señal de los cuernos"></p>
-</div>
-
-
-
-
-
-
-
-
-
-
-
-
-      <div class="stream-item-footer">
-
-      <div class="ProfileTweet-actionCountList u-hiddenVisually">
-
-
-    <span class="ProfileTweet-action--reply u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-reply-count-aria-1128069274101276673" >0 respuestas</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--retweet u-hiddenVisually">
-      <span class="ProfileTweet-actionCount"  data-tweet-stat-count="1">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-retweet-count-aria-1128069274101276673" data-aria-label-part>1 retweet</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--favorite u-hiddenVisually">
-      <span class="ProfileTweet-actionCount"  data-tweet-stat-count="2">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-favorite-count-aria-1128069274101276673" data-aria-label-part>2 Me gusta</span>
-      </span>
-    </span>
-  </div>
-
-  <div class="ProfileTweet-actionList js-actions" role="group" aria-label="Acciones del Tweet">
-    <div class="ProfileTweet-action ProfileTweet-action--reply">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionReply"
-    data-modal="ProfileTweet-reply" type="button"
-    aria-describedby="profile-tweet-action-reply-count-aria-1128069274101276673">
-    <div class="IconContainer js-tooltip" title="Responder">
-      <span class="Icon Icon--medium Icon--reply"></span>
-      <span class="u-hiddenVisually">Responder</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero ">
-        <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-      </span>
-  </button>
-</div>
-
-    <div class="ProfileTweet-action ProfileTweet-action--retweet js-toggleState js-toggleRt">
-  <button class="ProfileTweet-actionButton  js-actionButton js-actionRetweet"
-
-    data-modal="ProfileTweet-retweet"
-    type="button"
-    aria-describedby="profile-tweet-action-retweet-count-aria-1128069274101276673">
-    <div class="IconContainer js-tooltip" title="Retwittear">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retwittear</span>
-    </div>
-      <span class="ProfileTweet-actionCount">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">1</span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo js-actionButton js-actionRetweet" data-modal="ProfileTweet-retweet" type="button">
-    <div class="IconContainer js-tooltip" title="Deshacer Retweet">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retwitteado</span>
-    </div>
-      <span class="ProfileTweet-actionCount">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">1</span>
-  </span>
-
-  </button>
-</div>
-
-
-    <div class="ProfileTweet-action ProfileTweet-action--favorite js-toggleState">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionFavorite" type="button"
-    aria-describedby="profile-tweet-action-favorite-count-aria-1128069274101276673">
-    <div class="IconContainer js-tooltip" title="Me gusta">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Me gusta</span>
-    </div>
-      <span class="ProfileTweet-actionCount">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">2</span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo ProfileTweet-action--unfavorite u-linkClean js-actionButton js-actionFavorite" type="button">
-    <div class="IconContainer js-tooltip" title="Deshacer me gusta">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Gustado</span>
-    </div>
-      <span class="ProfileTweet-actionCount">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">2</span>
-  </span>
-
-  </button>
-</div>
-
-
-
-
-
-
-  </div>
-
-</div>
-
-
-
-
-
-
-
-
-
-
-
-    </div>
-
-  </div>
-
-
-
-
-<div class="dismiss-module">
-  <div class="dismissed-module">
-    <div class="feedback-actions">
-        <div class="feedback-action" data-feedback-type="DontLike" data-feedback-url="">
-          <div class="action-confirmation dismiss-module-item">Gracias. Twitter usará esto para mejorar tu cronología.
-            <span class="undo-action">Deshacer</span>
-          </div>
-        </div>
-    </div>
-    <div class="child-feedback-confirmation">
-      <div class="child-confirmation-item">
-        <span class="child-confirmation-text"></span>
-        <span class="undo-child-feedback-action">Deshacer</span>
-      </div>
-    </div>
-  </div>
-</div>
-
-</li>
-    </ol>
-  </li>
-
-
-      <li class="ThreadedConversation--loneTweet
-
-  ">
-    <ol class="stream-items">
-      <li class="js-stream-item stream-item stream-item
-" data-item-id="1128070742850048001"
-id="stream-item-tweet-1128070742850048001"
-data-item-type="tweet"
- data-suggestion-json="{&quot;suggestion_details&quot;:{},&quot;tweet_ids&quot;:&quot;1128070742850048001&quot;,&quot;scribe_component&quot;:&quot;tweet&quot;}">
-
-
-
-  <div class="tweet js-stream-tweet js-actionable-tweet js-profile-popup-actionable dismissible-content
-
-
-
-       descendant permalink-descendant-tweet
-"
-
-data-tweet-id="1128070742850048001"
-data-item-id="1128070742850048001"
-data-permalink-path="/Glen010982/status/1128070742850048001"
-data-conversation-id="1128068672289890305"
-
-
- data-has-parent-tweet="true"
-
-data-tweet-nonce="1128070742850048001-28dbc73d-7c59-4d2d-bf53-fa8c1b97b087"
-data-tweet-stat-initialized="true"
-data-conversation-section-quality="HighQuality"
-
-
-
-
-
-  data-screen-name="Glen010982" data-name="Glen" data-user-id="959118933558222848"
-  data-you-follow="false"
-  data-follows-you="false"
-  data-you-block="false"
- data-mentions="Metallica EMMAUSolidarite PompiersParis"
-
-data-reply-to-users-json="[{&quot;id_str&quot;:&quot;959118933558222848&quot;,&quot;screen_name&quot;:&quot;Glen010982&quot;,&quot;name&quot;:&quot;Glen&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Glen&quot;,&quot;emojified_text_as_html&quot;:&quot;Glen&quot;}},{&quot;id_str&quot;:&quot;238475531&quot;,&quot;screen_name&quot;:&quot;Metallica&quot;,&quot;name&quot;:&quot;Metallica&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Metallica&quot;,&quot;emojified_text_as_html&quot;:&quot;Metallica&quot;}},{&quot;id_str&quot;:&quot;2912493406&quot;,&quot;screen_name&quot;:&quot;EMMAUSolidarite&quot;,&quot;name&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;,&quot;emojified_text_as_html&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;}},{&quot;id_str&quot;:&quot;1342191438&quot;,&quot;screen_name&quot;:&quot;PompiersParis&quot;,&quot;name&quot;:&quot;Pompiers de Paris&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Pompiers de Paris&quot;,&quot;emojified_text_as_html&quot;:&quot;Pompiers de Paris&quot;}}]"
-
-
-
-
-
-
-
-data-disclosure-type=""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- data-component-context="replies"
-
-
-    >
-
-    <div class="context">
-
-
-    </div>
-
-    <div class="content">
-
-
-
-
-
-      <div class="stream-item-header">
-          <a  class="account-group js-account-group js-action-profile js-user-profile-link js-nav" href="/Glen010982" data-user-id="959118933558222848">
-      <img class="avatar js-action-profile-avatar" src="https://pbs.twimg.com/profile_images/1073306696573952001/00J19A8-_bigger.jpg" alt="">
-    <span class="FullNameGroup">
-      <strong class="fullname show-popup-with-id u-textTruncate " data-aria-label-part>Glen</strong><span>&rlm;</span><span class="UserBadges"></span><span class="UserNameBreak">&nbsp;</span></span><span class="username u-dir u-textTruncate" dir="ltr" data-aria-label-part>@<b>Glen010982</b></span></a>
-
-
-        <small class="time">
-  <a href="/Glen010982/status/1128070742850048001" class="tweet-timestamp js-permalink js-nav js-tooltip" title="15:53 - 13 may. 2019"  data-conversation-id="1128068672289890305"><span class="_timestamp js-short-timestamp " data-aria-label-part="last" data-time="1557787998" data-time-ms="1557787998000" data-long-form="true">13 may.</span></a>
-</small>
-
-          <div class="ProfileTweet-action ProfileTweet-action--more js-more-ProfileTweet-actions">
-    <div class="dropdown">
-  <button class="ProfileTweet-actionButton u-textUserColorHover dropdown-toggle js-dropdown-toggle" type="button">
-      <div class="IconContainer js-tooltip" title="Más">
-        <span class="Icon Icon--caretDownLight Icon--small"></span>
-        <span class="u-hiddenVisually">Más</span>
-      </div>
-  </button>
-  <div class="dropdown-menu is-autoCentered">
-  <div class="dropdown-caret">
-    <div class="caret-outer"></div>
-    <div class="caret-inner"></div>
-  </div>
-  <ul>
-
-      <li class="copy-link-to-tweet js-actionCopyLinkToTweet">
-        <button type="button" class="dropdown-link">Copiar enlace del Tweet</button>
-      </li>
-      <li class="embed-link js-actionEmbedTweet" data-nav="embed_tweet">
-        <button type="button" class="dropdown-link">Insertar Tweet</button>
-      </li>
-  </ul>
-</div>
-
-</div>
-
-  </div>
-
-      </div>
-
-
-
-
-
-        <div class="ReplyingToContextBelowAuthor" data-aria-label-part>
-
-
-    En respuesta a <a class="pretty-link js-user-profile-link" href="/Metallica" data-user-id="238475531" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>Metallica</b></span></a> <a class="pretty-link js-user-profile-link" href="/EMMAUSolidarite" data-user-id="2912493406" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>EMMAUSolidarite</b></span></a> <a class="pretty-link js-user-profile-link" href="/PompiersParis" data-user-id="1342191438" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>PompiersParis</b></span></a>
-
-</div>
-
-
-
-        <div class="js-tweet-text-container">
-  <p class="TweetTextSize  js-tweet-text tweet-text" lang="en" data-aria-label-part="0">These guys are always awesome on good causes and good times.<img class="Emoji Emoji--forText" src="https://abs.twimg.com/emoji/v2/72x72/1f44d.png" draggable="false" alt="👍" title="Signo de pulgar hacia arriba" aria-label="Emoji: Signo de pulgar hacia arriba"><img class="Emoji Emoji--forText" src="https://abs.twimg.com/emoji/v2/72x72/2764.png" draggable="false" alt="❤️" title="Corazón rojo" aria-label="Emoji: Corazón rojo"></p>
-</div>
-
-
-
-
-
-
-
-
-
-
-
-
-      <div class="stream-item-footer">
-
-      <div class="ProfileTweet-actionCountList u-hiddenVisually">
-
-
-    <span class="ProfileTweet-action--reply u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-reply-count-aria-1128070742850048001" >0 respuestas</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--retweet u-hiddenVisually">
-      <span class="ProfileTweet-actionCount"  data-tweet-stat-count="1">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-retweet-count-aria-1128070742850048001" data-aria-label-part>1 retweet</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--favorite u-hiddenVisually">
-      <span class="ProfileTweet-actionCount"  data-tweet-stat-count="1">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-favorite-count-aria-1128070742850048001" data-aria-label-part>1 Me gusta</span>
-      </span>
-    </span>
-  </div>
-
-  <div class="ProfileTweet-actionList js-actions" role="group" aria-label="Acciones del Tweet">
-    <div class="ProfileTweet-action ProfileTweet-action--reply">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionReply"
-    data-modal="ProfileTweet-reply" type="button"
-    aria-describedby="profile-tweet-action-reply-count-aria-1128070742850048001">
-    <div class="IconContainer js-tooltip" title="Responder">
-      <span class="Icon Icon--medium Icon--reply"></span>
-      <span class="u-hiddenVisually">Responder</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero ">
-        <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-      </span>
-  </button>
-</div>
-
-    <div class="ProfileTweet-action ProfileTweet-action--retweet js-toggleState js-toggleRt">
-  <button class="ProfileTweet-actionButton  js-actionButton js-actionRetweet"
-
-    data-modal="ProfileTweet-retweet"
-    type="button"
-    aria-describedby="profile-tweet-action-retweet-count-aria-1128070742850048001">
-    <div class="IconContainer js-tooltip" title="Retwittear">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retwittear</span>
-    </div>
-      <span class="ProfileTweet-actionCount">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">1</span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo js-actionButton js-actionRetweet" data-modal="ProfileTweet-retweet" type="button">
-    <div class="IconContainer js-tooltip" title="Deshacer Retweet">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retwitteado</span>
-    </div>
-      <span class="ProfileTweet-actionCount">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">1</span>
-  </span>
-
-  </button>
-</div>
-
-
-    <div class="ProfileTweet-action ProfileTweet-action--favorite js-toggleState">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionFavorite" type="button"
-    aria-describedby="profile-tweet-action-favorite-count-aria-1128070742850048001">
-    <div class="IconContainer js-tooltip" title="Me gusta">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Me gusta</span>
-    </div>
-      <span class="ProfileTweet-actionCount">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">1</span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo ProfileTweet-action--unfavorite u-linkClean js-actionButton js-actionFavorite" type="button">
-    <div class="IconContainer js-tooltip" title="Deshacer me gusta">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Gustado</span>
-    </div>
-      <span class="ProfileTweet-actionCount">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">1</span>
-  </span>
-
-  </button>
-</div>
-
-
-
-
-
-
-  </div>
-
-</div>
-
-
-
-
-
-
-
-
-
-
-
-    </div>
-
-  </div>
-
-
-
-
-<div class="dismiss-module">
-  <div class="dismissed-module">
-    <div class="feedback-actions">
-        <div class="feedback-action" data-feedback-type="DontLike" data-feedback-url="">
-          <div class="action-confirmation dismiss-module-item">Gracias. Twitter usará esto para mejorar tu cronología.
-            <span class="undo-action">Deshacer</span>
-          </div>
-        </div>
-    </div>
-    <div class="child-feedback-confirmation">
-      <div class="child-confirmation-item">
-        <span class="child-confirmation-text"></span>
-        <span class="undo-child-feedback-action">Deshacer</span>
-      </div>
-    </div>
-  </div>
-</div>
-
-</li>
-    </ol>
-  </li>
-
-
-    <li class="ThreadedConversation">
-  <ol class="stream-items">
-          <div class="ThreadedConversation-tweet"
-  >
-      <span class="u-hiddenVisually">Conversación nueva</span>
-    <li class="js-stream-item stream-item stream-item
-" data-item-id="1128070303274471424"
-id="stream-item-tweet-1128070303274471424"
-data-item-type="tweet"
->
-
-
-
-  <div class="tweet js-stream-tweet js-actionable-tweet js-profile-popup-actionable dismissible-content
-
-
-
-       descendant permalink-descendant-tweet
-"
-
-data-tweet-id="1128070303274471424"
-data-item-id="1128070303274471424"
-data-permalink-path="/TomOlson8/status/1128070303274471424"
-data-conversation-id="1128068672289890305"
-
-
- data-has-parent-tweet="true"
-
-data-tweet-nonce="1128070303274471424-80a4c24d-d768-4ba3-b589-a7227b7510de"
-data-tweet-stat-initialized="true"
-data-conversation-section-quality="HighQuality"
-
-
-
-
-
-  data-screen-name="TomOlson8" data-name="Brutus" data-user-id="623979006"
-  data-you-follow="false"
-  data-follows-you="false"
-  data-you-block="false"
- data-mentions="Metallica EMMAUSolidarite PompiersParis"
-
-data-reply-to-users-json="[{&quot;id_str&quot;:&quot;623979006&quot;,&quot;screen_name&quot;:&quot;TomOlson8&quot;,&quot;name&quot;:&quot;Brutus&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Brutus&quot;,&quot;emojified_text_as_html&quot;:&quot;Brutus&quot;}},{&quot;id_str&quot;:&quot;238475531&quot;,&quot;screen_name&quot;:&quot;Metallica&quot;,&quot;name&quot;:&quot;Metallica&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Metallica&quot;,&quot;emojified_text_as_html&quot;:&quot;Metallica&quot;}},{&quot;id_str&quot;:&quot;2912493406&quot;,&quot;screen_name&quot;:&quot;EMMAUSolidarite&quot;,&quot;name&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;,&quot;emojified_text_as_html&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;}},{&quot;id_str&quot;:&quot;1342191438&quot;,&quot;screen_name&quot;:&quot;PompiersParis&quot;,&quot;name&quot;:&quot;Pompiers de Paris&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Pompiers de Paris&quot;,&quot;emojified_text_as_html&quot;:&quot;Pompiers de Paris&quot;}}]"
-
-
-
-
-
-
-
-data-disclosure-type=""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- data-component-context="replies"
-
-
-    >
-
-    <div class="context">
-
-
-    </div>
-
-    <div class="content">
-
-
-
-
-
-      <div class="stream-item-header">
-          <a  class="account-group js-account-group js-action-profile js-user-profile-link js-nav" href="/TomOlson8" data-user-id="623979006">
-      <img class="avatar js-action-profile-avatar" src="https://pbs.twimg.com/profile_images/543212042631794688/lMegt8oL_bigger.jpeg" alt="">
-    <span class="FullNameGroup">
-      <strong class="fullname show-popup-with-id u-textTruncate " data-aria-label-part>Brutus</strong><span>&rlm;</span><span class="UserBadges"></span><span class="UserNameBreak">&nbsp;</span></span><span class="username u-dir u-textTruncate" dir="ltr" data-aria-label-part>@<b>TomOlson8</b></span></a>
-
-
-        <small class="time">
-  <a href="/TomOlson8/status/1128070303274471424" class="tweet-timestamp js-permalink js-nav js-tooltip" title="15:51 - 13 may. 2019"  data-conversation-id="1128068672289890305"><span class="_timestamp js-short-timestamp " data-aria-label-part="last" data-time="1557787893" data-time-ms="1557787893000" data-long-form="true">13 may.</span></a>
-</small>
-
-          <div class="ProfileTweet-action ProfileTweet-action--more js-more-ProfileTweet-actions">
-    <div class="dropdown">
-  <button class="ProfileTweet-actionButton u-textUserColorHover dropdown-toggle js-dropdown-toggle" type="button">
-      <div class="IconContainer js-tooltip" title="Más">
-        <span class="Icon Icon--caretDownLight Icon--small"></span>
-        <span class="u-hiddenVisually">Más</span>
-      </div>
-  </button>
-  <div class="dropdown-menu is-autoCentered">
-  <div class="dropdown-caret">
-    <div class="caret-outer"></div>
-    <div class="caret-inner"></div>
-  </div>
-  <ul>
-
-      <li class="copy-link-to-tweet js-actionCopyLinkToTweet">
-        <button type="button" class="dropdown-link">Copiar enlace del Tweet</button>
-      </li>
-      <li class="embed-link js-actionEmbedTweet" data-nav="embed_tweet">
-        <button type="button" class="dropdown-link">Insertar Tweet</button>
-      </li>
-  </ul>
-</div>
-
-</div>
-
-  </div>
-
-      </div>
-
-
-
-
-
-        <div class="ReplyingToContextBelowAuthor" data-aria-label-part>
-
-
-    En respuesta a <a class="pretty-link js-user-profile-link" href="/Metallica" data-user-id="238475531" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>Metallica</b></span></a> <a class="pretty-link js-user-profile-link" href="/EMMAUSolidarite" data-user-id="2912493406" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>EMMAUSolidarite</b></span></a> <a class="pretty-link js-user-profile-link" href="/PompiersParis" data-user-id="1342191438" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>PompiersParis</b></span></a>
-
-</div>
-
-
-
-        <div class="js-tweet-text-container">
-  <p class="TweetTextSize  js-tweet-text tweet-text" lang="en" data-aria-label-part="0">Orion <img class="Emoji Emoji--forText" src="https://abs.twimg.com/emoji/v2/72x72/1f44d.png" draggable="false" alt="👍" title="Signo de pulgar hacia arriba" aria-label="Emoji: Signo de pulgar hacia arriba"></p>
-</div>
-
-
-
-
-
-
-
-
-
-
-
-
-      <div class="stream-item-footer">
-
-      <div class="ProfileTweet-actionCountList u-hiddenVisually">
-
-
-    <span class="ProfileTweet-action--reply u-hiddenVisually">
-      <span class="ProfileTweet-actionCount"  data-tweet-stat-count="1">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-reply-count-aria-1128070303274471424" data-aria-label-part>1 respuesta</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--retweet u-hiddenVisually">
-      <span class="ProfileTweet-actionCount"  data-tweet-stat-count="1">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-retweet-count-aria-1128070303274471424" data-aria-label-part>1 retweet</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--favorite u-hiddenVisually">
-      <span class="ProfileTweet-actionCount"  data-tweet-stat-count="1">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-favorite-count-aria-1128070303274471424" data-aria-label-part>1 Me gusta</span>
-      </span>
-    </span>
-  </div>
-
-  <div class="ProfileTweet-actionList js-actions" role="group" aria-label="Acciones del Tweet">
-    <div class="ProfileTweet-action ProfileTweet-action--reply">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionReply"
-    data-modal="ProfileTweet-reply" type="button"
-    aria-describedby="profile-tweet-action-reply-count-aria-1128070303274471424">
-    <div class="IconContainer js-tooltip" title="Responder">
-      <span class="Icon Icon--medium Icon--reply"></span>
-      <span class="u-hiddenVisually">Responder</span>
-    </div>
-      <span class="ProfileTweet-actionCount ">
-        <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">1</span>
-      </span>
-  </button>
-</div>
-
-    <div class="ProfileTweet-action ProfileTweet-action--retweet js-toggleState js-toggleRt">
-  <button class="ProfileTweet-actionButton  js-actionButton js-actionRetweet"
-
-    data-modal="ProfileTweet-retweet"
-    type="button"
-    aria-describedby="profile-tweet-action-retweet-count-aria-1128070303274471424">
-    <div class="IconContainer js-tooltip" title="Retwittear">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retwittear</span>
-    </div>
-      <span class="ProfileTweet-actionCount">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">1</span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo js-actionButton js-actionRetweet" data-modal="ProfileTweet-retweet" type="button">
-    <div class="IconContainer js-tooltip" title="Deshacer Retweet">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retwitteado</span>
-    </div>
-      <span class="ProfileTweet-actionCount">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">1</span>
-  </span>
-
-  </button>
-</div>
-
-
-    <div class="ProfileTweet-action ProfileTweet-action--favorite js-toggleState">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionFavorite" type="button"
-    aria-describedby="profile-tweet-action-favorite-count-aria-1128070303274471424">
-    <div class="IconContainer js-tooltip" title="Me gusta">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Me gusta</span>
-    </div>
-      <span class="ProfileTweet-actionCount">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">1</span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo ProfileTweet-action--unfavorite u-linkClean js-actionButton js-actionFavorite" type="button">
-    <div class="IconContainer js-tooltip" title="Deshacer me gusta">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Gustado</span>
-    </div>
-      <span class="ProfileTweet-actionCount">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">1</span>
-  </span>
-
-  </button>
-</div>
-
-
-
-
-
-
-  </div>
-
-</div>
-
-
-
-
-
-
-
-
-
-
-
-    </div>
-
-  </div>
-
-
-
-</li>
-  </div>
-
-      <li class="ThreadedConversation-moreReplies" data-element-context="show_more_button" data-expansion-url="/i/threaded_conversation/1128070303274471424/DAADCgABD6e19sxXkAALAAIAAAAmY29udmVyc2F0aW9uVGhyZWFkLTExMjgwNzAzMDMyNzQ0NzE0MjQIAAMAAAABAAA">
-        <a href="" class="ThreadedConversation-moreRepliesLink">1 respuesta más</a>
-        <span class="vellip"></span>
-        <span class="ThreadedConversation-moreRepliesSpinner u-hidden"></span>
-      </li>
-  </ol>
-</li>
-
-
-      <li class="ThreadedConversation--loneTweet
-
-  ">
-    <ol class="stream-items">
-      <li class="js-stream-item stream-item stream-item
-" data-item-id="1128112059109953536"
-id="stream-item-tweet-1128112059109953536"
-data-item-type="tweet"
- data-suggestion-json="{&quot;suggestion_details&quot;:{},&quot;tweet_ids&quot;:&quot;1128112059109953536&quot;,&quot;scribe_component&quot;:&quot;tweet&quot;}">
-
-
-
-  <div class="tweet js-stream-tweet js-actionable-tweet js-profile-popup-actionable dismissible-content
-
-
-
-       descendant permalink-descendant-tweet
-"
-
-data-tweet-id="1128112059109953536"
-data-item-id="1128112059109953536"
-data-permalink-path="/sandymitt6/status/1128112059109953536"
-data-conversation-id="1128068672289890305"
-
-
- data-has-parent-tweet="true"
-
-data-tweet-nonce="1128112059109953536-58e50e50-9d20-4225-b991-fd1c48e48f96"
-data-tweet-stat-initialized="true"
-data-conversation-section-quality="HighQuality"
-
-
-
-
-
-  data-screen-name="sandymitt6" data-name="Stephen Marsh" data-user-id="3021820380"
-  data-you-follow="false"
-  data-follows-you="false"
-  data-you-block="false"
- data-mentions="Metallica EMMAUSolidarite PompiersParis VANS_66"
-
-data-reply-to-users-json="[{&quot;id_str&quot;:&quot;3021820380&quot;,&quot;screen_name&quot;:&quot;sandymitt6&quot;,&quot;name&quot;:&quot;Stephen Marsh&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Stephen Marsh&quot;,&quot;emojified_text_as_html&quot;:&quot;Stephen Marsh&quot;}},{&quot;id_str&quot;:&quot;238475531&quot;,&quot;screen_name&quot;:&quot;Metallica&quot;,&quot;name&quot;:&quot;Metallica&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Metallica&quot;,&quot;emojified_text_as_html&quot;:&quot;Metallica&quot;}},{&quot;id_str&quot;:&quot;2912493406&quot;,&quot;screen_name&quot;:&quot;EMMAUSolidarite&quot;,&quot;name&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;,&quot;emojified_text_as_html&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;}},{&quot;id_str&quot;:&quot;1342191438&quot;,&quot;screen_name&quot;:&quot;PompiersParis&quot;,&quot;name&quot;:&quot;Pompiers de Paris&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Pompiers de Paris&quot;,&quot;emojified_text_as_html&quot;:&quot;Pompiers de Paris&quot;}},{&quot;id_str&quot;:&quot;15383636&quot;,&quot;screen_name&quot;:&quot;VANS_66&quot;,&quot;name&quot;:&quot;Vans&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Vans&quot;,&quot;emojified_text_as_html&quot;:&quot;Vans&quot;}}]"
-
-
-
-
-
-
-
-data-disclosure-type=""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- data-component-context="replies"
-
-
-    >
-
-    <div class="context">
-
-
-    </div>
-
-    <div class="content">
-
-
-
-
-
-      <div class="stream-item-header">
-          <a  class="account-group js-account-group js-action-profile js-user-profile-link js-nav" href="/sandymitt6" data-user-id="3021820380">
-      <img class="avatar js-action-profile-avatar" src="https://pbs.twimg.com/profile_images/567159111880437760/pnQNr4qa_bigger.jpeg" alt="">
-    <span class="FullNameGroup">
-      <strong class="fullname show-popup-with-id u-textTruncate " data-aria-label-part>Stephen Marsh</strong><span>&rlm;</span><span class="UserBadges"></span><span class="UserNameBreak">&nbsp;</span></span><span class="username u-dir u-textTruncate" dir="ltr" data-aria-label-part>@<b>sandymitt6</b></span></a>
-
-
-        <small class="time">
-  <a href="/sandymitt6/status/1128112059109953536" class="tweet-timestamp js-permalink js-nav js-tooltip" title="18:37 - 13 may. 2019"  data-conversation-id="1128068672289890305"><span class="_timestamp js-short-timestamp " data-aria-label-part="last" data-time="1557797848" data-time-ms="1557797848000" data-long-form="true">14 may.</span></a>
-</small>
-
-          <div class="ProfileTweet-action ProfileTweet-action--more js-more-ProfileTweet-actions">
-    <div class="dropdown">
-  <button class="ProfileTweet-actionButton u-textUserColorHover dropdown-toggle js-dropdown-toggle" type="button">
-      <div class="IconContainer js-tooltip" title="Más">
-        <span class="Icon Icon--caretDownLight Icon--small"></span>
-        <span class="u-hiddenVisually">Más</span>
-      </div>
-  </button>
-  <div class="dropdown-menu is-autoCentered">
-  <div class="dropdown-caret">
-    <div class="caret-outer"></div>
-    <div class="caret-inner"></div>
-  </div>
-  <ul>
-
-      <li class="copy-link-to-tweet js-actionCopyLinkToTweet">
-        <button type="button" class="dropdown-link">Copiar enlace del Tweet</button>
-      </li>
-      <li class="embed-link js-actionEmbedTweet" data-nav="embed_tweet">
-        <button type="button" class="dropdown-link">Insertar Tweet</button>
-      </li>
-  </ul>
-</div>
-
-</div>
-
-  </div>
-
-      </div>
-
-
-
-
-
-        <div class="ReplyingToContextBelowAuthor" data-aria-label-part>
-
-
-    En respuesta a <a class="pretty-link js-user-profile-link" href="/Metallica" data-user-id="238475531" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>Metallica</b></span></a> <a class="pretty-link js-user-profile-link" href="/EMMAUSolidarite" data-user-id="2912493406" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>EMMAUSolidarite</b></span></a> <a class="pretty-link js-user-profile-link" href="/PompiersParis" data-user-id="1342191438" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>PompiersParis</b></span></a>
-
-</div>
-
-
-
-        <div class="js-tweet-text-container">
-  <p class="TweetTextSize  js-tweet-text tweet-text" lang="da" data-aria-label-part="0">Sweet <a href="/VANS_66" class="twitter-atreply pretty-link js-nav" dir="ltr" data-mentioned-user-id="15383636" ><s>@</s><b>VANS_66</b></a> Kirk.</p>
-</div>
-
-
-
-
-
-
-
-
-
-
-
-
-      <div class="stream-item-footer">
-
-      <div class="ProfileTweet-actionCountList u-hiddenVisually">
-
-
-    <span class="ProfileTweet-action--reply u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-reply-count-aria-1128112059109953536" >0 respuestas</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--retweet u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-retweet-count-aria-1128112059109953536" >0 retweets</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--favorite u-hiddenVisually">
-      <span class="ProfileTweet-actionCount"  data-tweet-stat-count="1">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-favorite-count-aria-1128112059109953536" data-aria-label-part>1 Me gusta</span>
-      </span>
-    </span>
-  </div>
-
-  <div class="ProfileTweet-actionList js-actions" role="group" aria-label="Acciones del Tweet">
-    <div class="ProfileTweet-action ProfileTweet-action--reply">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionReply"
-    data-modal="ProfileTweet-reply" type="button"
-    aria-describedby="profile-tweet-action-reply-count-aria-1128112059109953536">
-    <div class="IconContainer js-tooltip" title="Responder">
-      <span class="Icon Icon--medium Icon--reply"></span>
-      <span class="u-hiddenVisually">Responder</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero ">
-        <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-      </span>
-  </button>
-</div>
-
-    <div class="ProfileTweet-action ProfileTweet-action--retweet js-toggleState js-toggleRt">
-  <button class="ProfileTweet-actionButton  js-actionButton js-actionRetweet"
-
-    data-modal="ProfileTweet-retweet"
-    type="button"
-    aria-describedby="profile-tweet-action-retweet-count-aria-1128112059109953536">
-    <div class="IconContainer js-tooltip" title="Retwittear">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retwittear</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo js-actionButton js-actionRetweet" data-modal="ProfileTweet-retweet" type="button">
-    <div class="IconContainer js-tooltip" title="Deshacer Retweet">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retwitteado</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button>
-</div>
-
-
-    <div class="ProfileTweet-action ProfileTweet-action--favorite js-toggleState">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionFavorite" type="button"
-    aria-describedby="profile-tweet-action-favorite-count-aria-1128112059109953536">
-    <div class="IconContainer js-tooltip" title="Me gusta">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Me gusta</span>
-    </div>
-      <span class="ProfileTweet-actionCount">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">1</span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo ProfileTweet-action--unfavorite u-linkClean js-actionButton js-actionFavorite" type="button">
-    <div class="IconContainer js-tooltip" title="Deshacer me gusta">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Gustado</span>
-    </div>
-      <span class="ProfileTweet-actionCount">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true">1</span>
-  </span>
-
-  </button>
-</div>
-
-
-
-
-
-
-  </div>
-
-</div>
-
-
-
-
-
-
-
-
-
-
-
-    </div>
-
-  </div>
-
-
-
-
-<div class="dismiss-module">
-  <div class="dismissed-module">
-    <div class="feedback-actions">
-        <div class="feedback-action" data-feedback-type="DontLike" data-feedback-url="">
-          <div class="action-confirmation dismiss-module-item">Gracias. Twitter usará esto para mejorar tu cronología.
-            <span class="undo-action">Deshacer</span>
-          </div>
-        </div>
-    </div>
-    <div class="child-feedback-confirmation">
-      <div class="child-confirmation-item">
-        <span class="child-confirmation-text"></span>
-        <span class="undo-child-feedback-action">Deshacer</span>
-      </div>
-    </div>
-  </div>
-</div>
-
-</li>
-    </ol>
-  </li>
-
-
-      <li class="ThreadedConversation--loneTweet
-
-  ">
-    <ol class="stream-items">
-      <li class="js-stream-item stream-item stream-item
-" data-item-id="1128564707684696065"
-id="stream-item-tweet-1128564707684696065"
-data-item-type="tweet"
- data-suggestion-json="{&quot;suggestion_details&quot;:{},&quot;tweet_ids&quot;:&quot;1128564707684696065&quot;,&quot;scribe_component&quot;:&quot;tweet&quot;}">
-
-
-
-  <div class="tweet js-stream-tweet js-actionable-tweet js-profile-popup-actionable dismissible-content
-
-
-
-       has-cards descendant permalink-descendant-tweet cards-forward
-"
-
-data-tweet-id="1128564707684696065"
-data-item-id="1128564707684696065"
-data-permalink-path="/124OUNxV9IlLMFN/status/1128564707684696065"
-data-conversation-id="1128068672289890305"
-
-
- data-has-parent-tweet="true"
-
-data-tweet-nonce="1128564707684696065-fe34948b-cd4c-4792-99be-7f0ad62fc814"
-data-tweet-stat-initialized="true"
-data-conversation-section-quality="HighQuality"
-
-
-
-
-
-  data-screen-name="124OUNxV9IlLMFN" data-name="עמרי שחר" data-user-id="1124395358359040000"
-  data-you-follow="false"
-  data-follows-you="false"
-  data-you-block="false"
- data-mentions="Metallica EMMAUSolidarite PompiersParis"
-
-data-reply-to-users-json="[{&quot;id_str&quot;:&quot;1124395358359040000&quot;,&quot;screen_name&quot;:&quot;124OUNxV9IlLMFN&quot;,&quot;name&quot;:&quot;\u05e2\u05de\u05e8\u05d9 \u05e9\u05d7\u05e8&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;\u05e2\u05de\u05e8\u05d9 \u05e9\u05d7\u05e8&quot;,&quot;emojified_text_as_html&quot;:&quot;\u05e2\u05de\u05e8\u05d9 \u05e9\u05d7\u05e8&quot;}},{&quot;id_str&quot;:&quot;238475531&quot;,&quot;screen_name&quot;:&quot;Metallica&quot;,&quot;name&quot;:&quot;Metallica&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Metallica&quot;,&quot;emojified_text_as_html&quot;:&quot;Metallica&quot;}},{&quot;id_str&quot;:&quot;2912493406&quot;,&quot;screen_name&quot;:&quot;EMMAUSolidarite&quot;,&quot;name&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;,&quot;emojified_text_as_html&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;}},{&quot;id_str&quot;:&quot;1342191438&quot;,&quot;screen_name&quot;:&quot;PompiersParis&quot;,&quot;name&quot;:&quot;Pompiers de Paris&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Pompiers de Paris&quot;,&quot;emojified_text_as_html&quot;:&quot;Pompiers de Paris&quot;}}]"
-
-
-
- data-possibly-sensitive="true"
-
-
-
-data-disclosure-type=""
-
-
-
- data-card2-type="player"
- data-has-cards="true"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- data-component-context="replies"
-
-
-    >
-
-    <div class="context">
-
-
-    </div>
-
-    <div class="content">
-
-
-
-
-
-      <div class="stream-item-header">
-          <a  class="account-group js-account-group js-action-profile js-user-profile-link js-nav" href="/124OUNxV9IlLMFN" data-user-id="1124395358359040000">
-      <img class="avatar js-action-profile-avatar" src="https://pbs.twimg.com/profile_images/1124508998491938817/0WXst_2N_bigger.jpg" alt="">
-    <span class="FullNameGroup">
-      <strong class="fullname show-popup-with-id u-textTruncate fullname-rtl" data-aria-label-part>עמרי שחר</strong><span>&rlm;</span><span class="UserBadges"></span><span class="UserNameBreak">&nbsp;</span></span><span class="username u-dir u-textTruncate" dir="ltr" data-aria-label-part>@<b>124OUNxV9IlLMFN</b></span></a>
-
-
-        <small class="time">
-  <a href="/124OUNxV9IlLMFN/status/1128564707684696065" class="tweet-timestamp js-permalink js-nav js-tooltip" title="0:36 - 15 may. 2019"  data-conversation-id="1128068672289890305"><span class="_timestamp js-short-timestamp " data-aria-label-part="last" data-time="1557905768" data-time-ms="1557905768000" data-long-form="true">15 may.</span></a>
-</small>
-
-          <div class="ProfileTweet-action ProfileTweet-action--more js-more-ProfileTweet-actions">
-    <div class="dropdown">
-  <button class="ProfileTweet-actionButton u-textUserColorHover dropdown-toggle js-dropdown-toggle" type="button">
-      <div class="IconContainer js-tooltip" title="Más">
-        <span class="Icon Icon--caretDownLight Icon--small"></span>
-        <span class="u-hiddenVisually">Más</span>
-      </div>
-  </button>
-  <div class="dropdown-menu is-autoCentered">
-  <div class="dropdown-caret">
-    <div class="caret-outer"></div>
-    <div class="caret-inner"></div>
-  </div>
-  <ul>
-
-      <li class="copy-link-to-tweet js-actionCopyLinkToTweet">
-        <button type="button" class="dropdown-link">Copiar enlace del Tweet</button>
-      </li>
-      <li class="embed-link js-actionEmbedTweet" data-nav="embed_tweet">
-        <button type="button" class="dropdown-link">Insertar Tweet</button>
-      </li>
-  </ul>
-</div>
-
-</div>
-
-  </div>
-
-      </div>
-
-
-
-
-
-        <div class="ReplyingToContextBelowAuthor" data-aria-label-part>
-
-
-    En respuesta a <a class="pretty-link js-user-profile-link" href="/Metallica" data-user-id="238475531" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>Metallica</b></span></a> <a class="pretty-link js-user-profile-link" href="/EMMAUSolidarite" data-user-id="2912493406" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>EMMAUSolidarite</b></span></a> <a class="pretty-link js-user-profile-link" href="/PompiersParis" data-user-id="1342191438" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>PompiersParis</b></span></a>
-
-</div>
-
-
-
-        <div class="js-tweet-text-container">
-  <p class="TweetTextSize  js-tweet-text tweet-text" lang="und" data-aria-label-part="0"><a href="https://t.co/y8gyw6vwZl" rel="nofollow noopener" dir="ltr" data-expanded-url="https://youtu.be/yCNees5_doE" class="twitter-timeline-link u-hidden" target="_blank" title="https://youtu.be/yCNees5_doE" ><span class="tco-ellipsis"></span><span class="invisible">https://</span><span class="js-display-url">youtu.be/yCNees5_doE</span><span class="invisible"></span><span class="tco-ellipsis"><span class="invisible">&nbsp;</span></span></a></p>
-</div>
-
-
-
-
-
-
-
-
-
-          <div class="card2 js-media-container
-    "
-    data-card2-name="player"
-  >
-
-<div class="js-macaw-cards-iframe-container initial-card-height card-type-player"
-  data-src="/i/cards/tfw/v1/1128564707684696065?cardname=player&amp;autoplay_disabled=true&amp;forward=true&amp;possibly_sensitive=true&amp;earned=true&amp;edge=true&amp;lang=es"
-  data-card-name="player"
-  data-card-url="https://t.co/y8gyw6vwZl"
-  data-publisher-id="10228272"
-  data-creator-id=""
-  data-amplify-content-id=""
-  data-amplify-playlist-url=""
-  data-full-card-iframe-url="/i/cards/tfw/v1/1128564707684696065?cardname=player&amp;autoplay_disabled=true&amp;possibly_sensitive=true&amp;earned=true&amp;edge=true&amp;lang=es"
-  data-has-autoplayable-media="false">
-</div>
-
-</div>
-
-
-
-
-      <div class="stream-item-footer">
-
-      <div class="ProfileTweet-actionCountList u-hiddenVisually">
-
-
-    <span class="ProfileTweet-action--reply u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-reply-count-aria-1128564707684696065" >0 respuestas</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--retweet u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-retweet-count-aria-1128564707684696065" >0 retweets</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--favorite u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-favorite-count-aria-1128564707684696065" >0 Me gusta</span>
-      </span>
-    </span>
-  </div>
-
-  <div class="ProfileTweet-actionList js-actions" role="group" aria-label="Acciones del Tweet">
-    <div class="ProfileTweet-action ProfileTweet-action--reply">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionReply"
-    data-modal="ProfileTweet-reply" type="button"
-    aria-describedby="profile-tweet-action-reply-count-aria-1128564707684696065">
-    <div class="IconContainer js-tooltip" title="Responder">
-      <span class="Icon Icon--medium Icon--reply"></span>
-      <span class="u-hiddenVisually">Responder</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero ">
-        <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-      </span>
-  </button>
-</div>
-
-    <div class="ProfileTweet-action ProfileTweet-action--retweet js-toggleState js-toggleRt">
-  <button class="ProfileTweet-actionButton  js-actionButton js-actionRetweet"
-
-    data-modal="ProfileTweet-retweet"
-    type="button"
-    aria-describedby="profile-tweet-action-retweet-count-aria-1128564707684696065">
-    <div class="IconContainer js-tooltip" title="Retwittear">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retwittear</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo js-actionButton js-actionRetweet" data-modal="ProfileTweet-retweet" type="button">
-    <div class="IconContainer js-tooltip" title="Deshacer Retweet">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retwitteado</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button>
-</div>
-
-
-    <div class="ProfileTweet-action ProfileTweet-action--favorite js-toggleState">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionFavorite" type="button"
-    aria-describedby="profile-tweet-action-favorite-count-aria-1128564707684696065">
-    <div class="IconContainer js-tooltip" title="Me gusta">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Me gusta</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo ProfileTweet-action--unfavorite u-linkClean js-actionButton js-actionFavorite" type="button">
-    <div class="IconContainer js-tooltip" title="Deshacer me gusta">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Gustado</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button>
-</div>
-
-
-
-
-
-
-  </div>
-
-</div>
-
-
-
-
-
-
-
-
-
-
-
-    </div>
-
-  </div>
-
-
-
-
-<div class="dismiss-module">
-  <div class="dismissed-module">
-    <div class="feedback-actions">
-        <div class="feedback-action" data-feedback-type="DontLike" data-feedback-url="">
-          <div class="action-confirmation dismiss-module-item">Gracias. Twitter usará esto para mejorar tu cronología.
-            <span class="undo-action">Deshacer</span>
-          </div>
-        </div>
-    </div>
-    <div class="child-feedback-confirmation">
-      <div class="child-confirmation-item">
-        <span class="child-confirmation-text"></span>
-        <span class="undo-child-feedback-action">Deshacer</span>
-      </div>
-    </div>
-  </div>
-</div>
-
-</li>
-    </ol>
-  </li>
-
-
-    <div class="ThreadedConversation--loneTweet">
-    <div class="stream-tombstone-container ThreadedConversation-tweet last">
-  <li class="stream-tombstone-item stream-item js-stream-item">
-<div class="Tombstone">
-  <span class="Tombstone-label">        <span class="Tombstone-label">Este Tweet no está disponible</span>
-</span>
-
-</div>  </li>
-</div>
-
-  </div>
-
-      <li class="ThreadedConversation--loneTweet
-
-  ">
-    <ol class="stream-items">
-      <li class="js-stream-item stream-item stream-item
-" data-item-id="1128694715891589127"
-id="stream-item-tweet-1128694715891589127"
-data-item-type="tweet"
- data-suggestion-json="{&quot;suggestion_details&quot;:{},&quot;tweet_ids&quot;:&quot;1128694715891589127&quot;,&quot;scribe_component&quot;:&quot;tweet&quot;}">
-
-
-
-  <div class="tweet js-stream-tweet js-actionable-tweet js-profile-popup-actionable dismissible-content
-
-
-
-       has-cards descendant permalink-descendant-tweet has-content
-"
-
-data-tweet-id="1128694715891589127"
-data-item-id="1128694715891589127"
-data-permalink-path="/nvmbvrz/status/1128694715891589127"
-data-conversation-id="1128068672289890305"
-
-
- data-has-parent-tweet="true"
-
-data-tweet-nonce="1128694715891589127-0f69a7ae-a7fa-45a5-bfb2-8c60ded220b2"
-data-tweet-stat-initialized="true"
-data-conversation-section-quality="HighQuality"
-
-
-
-
-
-  data-screen-name="nvmbvrz" data-name="NVMBVRZ" data-user-id="1113181115039092736"
-  data-you-follow="false"
-  data-follows-you="false"
-  data-you-block="false"
- data-mentions="Metallica EMMAUSolidarite PompiersParis"
-
-data-reply-to-users-json="[{&quot;id_str&quot;:&quot;1113181115039092736&quot;,&quot;screen_name&quot;:&quot;nvmbvrz&quot;,&quot;name&quot;:&quot;NVMBVRZ&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;NVMBVRZ&quot;,&quot;emojified_text_as_html&quot;:&quot;NVMBVRZ&quot;}},{&quot;id_str&quot;:&quot;238475531&quot;,&quot;screen_name&quot;:&quot;Metallica&quot;,&quot;name&quot;:&quot;Metallica&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Metallica&quot;,&quot;emojified_text_as_html&quot;:&quot;Metallica&quot;}},{&quot;id_str&quot;:&quot;2912493406&quot;,&quot;screen_name&quot;:&quot;EMMAUSolidarite&quot;,&quot;name&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;,&quot;emojified_text_as_html&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;}},{&quot;id_str&quot;:&quot;1342191438&quot;,&quot;screen_name&quot;:&quot;PompiersParis&quot;,&quot;name&quot;:&quot;Pompiers de Paris&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Pompiers de Paris&quot;,&quot;emojified_text_as_html&quot;:&quot;Pompiers de Paris&quot;}}]"
-
-
-
-
-
-
-
-data-disclosure-type=""
-
-
-
-
- data-has-cards="true"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- data-component-context="replies"
-
-
-    >
-
-    <div class="context">
-
-
-    </div>
-
-    <div class="content">
-
-
-
-
-
-      <div class="stream-item-header">
-          <a  class="account-group js-account-group js-action-profile js-user-profile-link js-nav" href="/nvmbvrz" data-user-id="1113181115039092736">
-      <img class="avatar js-action-profile-avatar" src="https://pbs.twimg.com/profile_images/1113181211721994240/65l1Lb9E_bigger.jpg" alt="">
-    <span class="FullNameGroup">
-      <strong class="fullname show-popup-with-id u-textTruncate " data-aria-label-part>NVMBVRZ</strong><span>&rlm;</span><span class="UserBadges"></span><span class="UserNameBreak">&nbsp;</span></span><span class="username u-dir u-textTruncate" dir="ltr" data-aria-label-part>@<b>nvmbvrz</b></span></a>
-
-
-        <small class="time">
-  <a href="/nvmbvrz/status/1128694715891589127" class="tweet-timestamp js-permalink js-nav js-tooltip" title="9:12 - 15 may. 2019"  data-conversation-id="1128068672289890305"><span class="_timestamp js-short-timestamp " data-aria-label-part="last" data-time="1557936765" data-time-ms="1557936765000" data-long-form="true">15 may.</span></a>
-</small>
-
-          <div class="ProfileTweet-action ProfileTweet-action--more js-more-ProfileTweet-actions">
-    <div class="dropdown">
-  <button class="ProfileTweet-actionButton u-textUserColorHover dropdown-toggle js-dropdown-toggle" type="button">
-      <div class="IconContainer js-tooltip" title="Más">
-        <span class="Icon Icon--caretDownLight Icon--small"></span>
-        <span class="u-hiddenVisually">Más</span>
-      </div>
-  </button>
-  <div class="dropdown-menu is-autoCentered">
-  <div class="dropdown-caret">
-    <div class="caret-outer"></div>
-    <div class="caret-inner"></div>
-  </div>
-  <ul>
-
-      <li class="copy-link-to-tweet js-actionCopyLinkToTweet">
-        <button type="button" class="dropdown-link">Copiar enlace del Tweet</button>
-      </li>
-      <li class="embed-link js-actionEmbedTweet" data-nav="embed_tweet">
-        <button type="button" class="dropdown-link">Insertar Tweet</button>
-      </li>
-  </ul>
-</div>
-
-</div>
-
-  </div>
-
-      </div>
-
-
-
-
-
-        <div class="ReplyingToContextBelowAuthor" data-aria-label-part>
-
-
-    En respuesta a <a class="pretty-link js-user-profile-link" href="/Metallica" data-user-id="238475531" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>Metallica</b></span></a> <a class="pretty-link js-user-profile-link" href="/EMMAUSolidarite" data-user-id="2912493406" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>EMMAUSolidarite</b></span></a> <a class="pretty-link js-user-profile-link" href="/PompiersParis" data-user-id="1342191438" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>PompiersParis</b></span></a>
-
-</div>
-
-
-
-        <div class="js-tweet-text-container">
-  <p class="TweetTextSize  js-tweet-text tweet-text" lang="en" data-aria-label-part="0">Metallica is awesome!!!<a href="https://t.co/qhaStTXtOy" class="twitter-timeline-link u-hidden" data-pre-embedded="true" dir="ltr" >pic.twitter.com/qhaStTXtOy</a></p>
-</div>
-
-
-
-
-
-            <div class="AdaptiveMediaOuterContainer">
-    <div class="AdaptiveMedia
-
-
-        is-video
-
-        has-autoplayable-media
-        "
-      >
-      <div class="AdaptiveMedia-container">
-          <div class="AdaptiveMedia-video">
-  <div class="AdaptiveMedia-videoContainer">
-      <div class="PlayableMedia PlayableMedia--gif">
-
-
-  <div class="PlayableMedia-container">
-    <div
-      class="PlayableMedia-player
-
-        "
-      data-playable-media-url=""
-        data-use-react-player
-        data-use-b-version-of-react-player
-        data-use-player-precache
-
-        data-border-top-left-radius=""
-        data-border-top-right-radius=""
-        data-border-bottom-left-radius=""
-        data-border-bottom-right-radius=""
-      style="padding-bottom: 55.99999999999999%; background-image:url('https://pbs.twimg.com/tweet_video_thumb/D6ntppdVUAAZqRV.jpg')">
-    </div>
-
-  </div>
-</div>
-
-  </div>
-</div>
-
-      </div>
-    </div>
-  </div>
-
-
-
-
-
-
-
-
-      <div class="stream-item-footer">
-
-      <div class="ProfileTweet-actionCountList u-hiddenVisually">
-
-
-    <span class="ProfileTweet-action--reply u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-reply-count-aria-1128694715891589127" >0 respuestas</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--retweet u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-retweet-count-aria-1128694715891589127" >0 retweets</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--favorite u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-favorite-count-aria-1128694715891589127" >0 Me gusta</span>
-      </span>
-    </span>
-  </div>
-
-  <div class="ProfileTweet-actionList js-actions" role="group" aria-label="Acciones del Tweet">
-    <div class="ProfileTweet-action ProfileTweet-action--reply">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionReply"
-    data-modal="ProfileTweet-reply" type="button"
-    aria-describedby="profile-tweet-action-reply-count-aria-1128694715891589127">
-    <div class="IconContainer js-tooltip" title="Responder">
-      <span class="Icon Icon--medium Icon--reply"></span>
-      <span class="u-hiddenVisually">Responder</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero ">
-        <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-      </span>
-  </button>
-</div>
-
-    <div class="ProfileTweet-action ProfileTweet-action--retweet js-toggleState js-toggleRt">
-  <button class="ProfileTweet-actionButton  js-actionButton js-actionRetweet"
-
-    data-modal="ProfileTweet-retweet"
-    type="button"
-    aria-describedby="profile-tweet-action-retweet-count-aria-1128694715891589127">
-    <div class="IconContainer js-tooltip" title="Retwittear">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retwittear</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo js-actionButton js-actionRetweet" data-modal="ProfileTweet-retweet" type="button">
-    <div class="IconContainer js-tooltip" title="Deshacer Retweet">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retwitteado</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button>
-</div>
-
-
-    <div class="ProfileTweet-action ProfileTweet-action--favorite js-toggleState">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionFavorite" type="button"
-    aria-describedby="profile-tweet-action-favorite-count-aria-1128694715891589127">
-    <div class="IconContainer js-tooltip" title="Me gusta">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Me gusta</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo ProfileTweet-action--unfavorite u-linkClean js-actionButton js-actionFavorite" type="button">
-    <div class="IconContainer js-tooltip" title="Deshacer me gusta">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Gustado</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button>
-</div>
-
-
-
-
-
-
-  </div>
-
-</div>
-
-
-
-
-
-
-
-
-
-
-
-    </div>
-
-  </div>
-
-
-
-
-<div class="dismiss-module">
-  <div class="dismissed-module">
-    <div class="feedback-actions">
-        <div class="feedback-action" data-feedback-type="DontLike" data-feedback-url="">
-          <div class="action-confirmation dismiss-module-item">Gracias. Twitter usará esto para mejorar tu cronología.
-            <span class="undo-action">Deshacer</span>
-          </div>
-        </div>
-    </div>
-    <div class="child-feedback-confirmation">
-      <div class="child-confirmation-item">
-        <span class="child-confirmation-text"></span>
-        <span class="undo-child-feedback-action">Deshacer</span>
-      </div>
-    </div>
-  </div>
-</div>
-
-</li>
-    </ol>
-  </li>
-
-
-    <div class="ThreadedConversation--loneTweet">
-    <div class="stream-tombstone-container ThreadedConversation-tweet last">
-  <li class="stream-tombstone-item stream-item js-stream-item">
-<div class="Tombstone">
-  <span class="Tombstone-label">        <span class="Tombstone-label">Este Tweet no está disponible</span>
-</span>
-
-</div>  </li>
-</div>
-
-  </div>
-
-      <li class="ThreadedConversation--loneTweet
-
-  ">
-    <ol class="stream-items">
-      <li class="js-stream-item stream-item stream-item
-" data-item-id="1128088308544876544"
-id="stream-item-tweet-1128088308544876544"
-data-item-type="tweet"
- data-suggestion-json="{&quot;suggestion_details&quot;:{},&quot;tweet_ids&quot;:&quot;1128088308544876544&quot;,&quot;scribe_component&quot;:&quot;tweet&quot;}">
-
-
-
-  <div class="tweet js-stream-tweet js-actionable-tweet js-profile-popup-actionable dismissible-content
-
-
-
-       descendant permalink-descendant-tweet
-"
-
-data-tweet-id="1128088308544876544"
-data-item-id="1128088308544876544"
-data-permalink-path="/BeeWall74/status/1128088308544876544"
-data-conversation-id="1128068672289890305"
-
-
- data-has-parent-tweet="true"
-
-data-tweet-nonce="1128088308544876544-b8ac1bb3-b1ae-48a5-8577-ca80e235cbee"
-data-tweet-stat-initialized="true"
-data-conversation-section-quality="HighQuality"
-
-
-
-
-
-  data-screen-name="BeeWall74" data-name="Unleash the Beast" data-user-id="1265540816"
-  data-you-follow="false"
-  data-follows-you="false"
-  data-you-block="false"
- data-mentions="Metallica EMMAUSolidarite PompiersParis"
-
-data-reply-to-users-json="[{&quot;id_str&quot;:&quot;1265540816&quot;,&quot;screen_name&quot;:&quot;BeeWall74&quot;,&quot;name&quot;:&quot;Unleash the Beast&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Unleash the Beast&quot;,&quot;emojified_text_as_html&quot;:&quot;Unleash the Beast&quot;}},{&quot;id_str&quot;:&quot;238475531&quot;,&quot;screen_name&quot;:&quot;Metallica&quot;,&quot;name&quot;:&quot;Metallica&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Metallica&quot;,&quot;emojified_text_as_html&quot;:&quot;Metallica&quot;}},{&quot;id_str&quot;:&quot;2912493406&quot;,&quot;screen_name&quot;:&quot;EMMAUSolidarite&quot;,&quot;name&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;,&quot;emojified_text_as_html&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;}},{&quot;id_str&quot;:&quot;1342191438&quot;,&quot;screen_name&quot;:&quot;PompiersParis&quot;,&quot;name&quot;:&quot;Pompiers de Paris&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Pompiers de Paris&quot;,&quot;emojified_text_as_html&quot;:&quot;Pompiers de Paris&quot;}}]"
-
-
-
-
-
-
-
-data-disclosure-type=""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- data-component-context="replies"
-
-
-    >
-
-    <div class="context">
-
-
-    </div>
-
-    <div class="content">
-
-
-
-
-
-      <div class="stream-item-header">
-          <a  class="account-group js-account-group js-action-profile js-user-profile-link js-nav" href="/BeeWall74" data-user-id="1265540816">
-      <img class="avatar js-action-profile-avatar" src="https://pbs.twimg.com/profile_images/1018183975158808577/hdyYsK-G_bigger.jpg" alt="">
-    <span class="FullNameGroup">
-      <strong class="fullname show-popup-with-id u-textTruncate " data-aria-label-part>Unleash the Beast</strong><span>&rlm;</span><span class="UserBadges"></span><span class="UserNameBreak">&nbsp;</span></span><span class="username u-dir u-textTruncate" dir="ltr" data-aria-label-part>@<b>BeeWall74</b></span></a>
-
-
-        <small class="time">
-  <a href="/BeeWall74/status/1128088308544876544" class="tweet-timestamp js-permalink js-nav js-tooltip" title="17:03 - 13 may. 2019"  data-conversation-id="1128068672289890305"><span class="_timestamp js-short-timestamp " data-aria-label-part="last" data-time="1557792186" data-time-ms="1557792186000" data-long-form="true">14 may.</span></a>
-</small>
-
-          <div class="ProfileTweet-action ProfileTweet-action--more js-more-ProfileTweet-actions">
-    <div class="dropdown">
-  <button class="ProfileTweet-actionButton u-textUserColorHover dropdown-toggle js-dropdown-toggle" type="button">
-      <div class="IconContainer js-tooltip" title="Más">
-        <span class="Icon Icon--caretDownLight Icon--small"></span>
-        <span class="u-hiddenVisually">Más</span>
-      </div>
-  </button>
-  <div class="dropdown-menu is-autoCentered">
-  <div class="dropdown-caret">
-    <div class="caret-outer"></div>
-    <div class="caret-inner"></div>
-  </div>
-  <ul>
-
-      <li class="copy-link-to-tweet js-actionCopyLinkToTweet">
-        <button type="button" class="dropdown-link">Copiar enlace del Tweet</button>
-      </li>
-      <li class="embed-link js-actionEmbedTweet" data-nav="embed_tweet">
-        <button type="button" class="dropdown-link">Insertar Tweet</button>
-      </li>
-  </ul>
-</div>
-
-</div>
-
-  </div>
-
-      </div>
-
-
-
-
-
-        <div class="ReplyingToContextBelowAuthor" data-aria-label-part>
-
-
-    En respuesta a <a class="pretty-link js-user-profile-link" href="/Metallica" data-user-id="238475531" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>Metallica</b></span></a> <a class="pretty-link js-user-profile-link" href="/EMMAUSolidarite" data-user-id="2912493406" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>EMMAUSolidarite</b></span></a> <a class="pretty-link js-user-profile-link" href="/PompiersParis" data-user-id="1342191438" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>PompiersParis</b></span></a>
-
-</div>
-
-
-
-        <div class="js-tweet-text-container">
-  <p class="TweetTextSize  js-tweet-text tweet-text" lang="en" data-aria-label-part="0">Love Papa Het but,,,,,he always looks like he&#39;s got a stomach problem in pics,,</p>
-</div>
-
-
-
-
-
-
-
-
-
-
-
-
-      <div class="stream-item-footer">
-
-      <div class="ProfileTweet-actionCountList u-hiddenVisually">
-
-
-    <span class="ProfileTweet-action--reply u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-reply-count-aria-1128088308544876544" >0 respuestas</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--retweet u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-retweet-count-aria-1128088308544876544" >0 retweets</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--favorite u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-favorite-count-aria-1128088308544876544" >0 Me gusta</span>
-      </span>
-    </span>
-  </div>
-
-  <div class="ProfileTweet-actionList js-actions" role="group" aria-label="Acciones del Tweet">
-    <div class="ProfileTweet-action ProfileTweet-action--reply">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionReply"
-    data-modal="ProfileTweet-reply" type="button"
-    aria-describedby="profile-tweet-action-reply-count-aria-1128088308544876544">
-    <div class="IconContainer js-tooltip" title="Responder">
-      <span class="Icon Icon--medium Icon--reply"></span>
-      <span class="u-hiddenVisually">Responder</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero ">
-        <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-      </span>
-  </button>
-</div>
-
-    <div class="ProfileTweet-action ProfileTweet-action--retweet js-toggleState js-toggleRt">
-  <button class="ProfileTweet-actionButton  js-actionButton js-actionRetweet"
-
-    data-modal="ProfileTweet-retweet"
-    type="button"
-    aria-describedby="profile-tweet-action-retweet-count-aria-1128088308544876544">
-    <div class="IconContainer js-tooltip" title="Retwittear">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retwittear</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo js-actionButton js-actionRetweet" data-modal="ProfileTweet-retweet" type="button">
-    <div class="IconContainer js-tooltip" title="Deshacer Retweet">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retwitteado</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button>
-</div>
-
-
-    <div class="ProfileTweet-action ProfileTweet-action--favorite js-toggleState">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionFavorite" type="button"
-    aria-describedby="profile-tweet-action-favorite-count-aria-1128088308544876544">
-    <div class="IconContainer js-tooltip" title="Me gusta">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Me gusta</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo ProfileTweet-action--unfavorite u-linkClean js-actionButton js-actionFavorite" type="button">
-    <div class="IconContainer js-tooltip" title="Deshacer me gusta">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Gustado</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button>
-</div>
-
-
-
-
-
-
-  </div>
-
-</div>
-
-
-
-
-
-
-
-
-
-
-
-    </div>
-
-  </div>
-
-
-
-
-<div class="dismiss-module">
-  <div class="dismissed-module">
-    <div class="feedback-actions">
-        <div class="feedback-action" data-feedback-type="DontLike" data-feedback-url="">
-          <div class="action-confirmation dismiss-module-item">Gracias. Twitter usará esto para mejorar tu cronología.
-            <span class="undo-action">Deshacer</span>
-          </div>
-        </div>
-    </div>
-    <div class="child-feedback-confirmation">
-      <div class="child-confirmation-item">
-        <span class="child-confirmation-text"></span>
-        <span class="undo-child-feedback-action">Deshacer</span>
-      </div>
-    </div>
-  </div>
-</div>
-
-</li>
-    </ol>
-  </li>
-
-
-      <li class="ThreadedConversation--loneTweet
-
-  ">
-    <ol class="stream-items">
-      <li class="js-stream-item stream-item stream-item
-" data-item-id="1129457489064419333"
-id="stream-item-tweet-1129457489064419333"
-data-item-type="tweet"
- data-suggestion-json="{&quot;suggestion_details&quot;:{},&quot;tweet_ids&quot;:&quot;1129457489064419333&quot;,&quot;scribe_component&quot;:&quot;tweet&quot;}">
-
-
-
-  <div class="tweet js-stream-tweet js-actionable-tweet js-profile-popup-actionable dismissible-content
-
-
-
-       descendant permalink-descendant-tweet
-"
-
-data-tweet-id="1129457489064419333"
-data-item-id="1129457489064419333"
-data-permalink-path="/Jasmeeneem/status/1129457489064419333"
-data-conversation-id="1128068672289890305"
-
-
- data-has-parent-tweet="true"
-
-data-tweet-nonce="1129457489064419333-c2950797-adc4-47a2-9793-455535a9a33e"
-data-tweet-stat-initialized="true"
-data-conversation-section-quality="HighQuality"
-
-
-
-
-
-  data-screen-name="Jasmeeneem" data-name="Moumoucha" data-user-id="913084942732677123"
-  data-you-follow="false"
-  data-follows-you="false"
-  data-you-block="false"
- data-mentions="Metallica EMMAUSolidarite PompiersParis"
-
-data-reply-to-users-json="[{&quot;id_str&quot;:&quot;913084942732677123&quot;,&quot;screen_name&quot;:&quot;Jasmeeneem&quot;,&quot;name&quot;:&quot;Moumoucha&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Moumoucha&quot;,&quot;emojified_text_as_html&quot;:&quot;Moumoucha&quot;}},{&quot;id_str&quot;:&quot;238475531&quot;,&quot;screen_name&quot;:&quot;Metallica&quot;,&quot;name&quot;:&quot;Metallica&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Metallica&quot;,&quot;emojified_text_as_html&quot;:&quot;Metallica&quot;}},{&quot;id_str&quot;:&quot;2912493406&quot;,&quot;screen_name&quot;:&quot;EMMAUSolidarite&quot;,&quot;name&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;,&quot;emojified_text_as_html&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;}},{&quot;id_str&quot;:&quot;1342191438&quot;,&quot;screen_name&quot;:&quot;PompiersParis&quot;,&quot;name&quot;:&quot;Pompiers de Paris&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Pompiers de Paris&quot;,&quot;emojified_text_as_html&quot;:&quot;Pompiers de Paris&quot;}}]"
-
-
-
-
-
-
-
-data-disclosure-type=""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- data-component-context="replies"
-
-
-    >
-
-    <div class="context">
-
-
-    </div>
-
-    <div class="content">
-
-
-
-
-
-      <div class="stream-item-header">
-          <a  class="account-group js-account-group js-action-profile js-user-profile-link js-nav" href="/Jasmeeneem" data-user-id="913084942732677123">
-      <img class="avatar js-action-profile-avatar" src="https://pbs.twimg.com/profile_images/1134169061296877570/026s0-U0_bigger.jpg" alt="">
-    <span class="FullNameGroup">
-      <strong class="fullname show-popup-with-id u-textTruncate " data-aria-label-part>Moumoucha</strong><span>&rlm;</span><span class="UserBadges"></span><span class="UserNameBreak">&nbsp;</span></span><span class="username u-dir u-textTruncate" dir="ltr" data-aria-label-part>@<b>Jasmeeneem</b></span></a>
-
-
-        <small class="time">
-  <a href="/Jasmeeneem/status/1129457489064419333" class="tweet-timestamp js-permalink js-nav js-tooltip" title="11:43 - 17 may. 2019"  data-conversation-id="1128068672289890305"><span class="_timestamp js-short-timestamp " data-aria-label-part="last" data-time="1558118624" data-time-ms="1558118624000" data-long-form="true">17 may.</span></a>
-</small>
-
-          <div class="ProfileTweet-action ProfileTweet-action--more js-more-ProfileTweet-actions">
-    <div class="dropdown">
-  <button class="ProfileTweet-actionButton u-textUserColorHover dropdown-toggle js-dropdown-toggle" type="button">
-      <div class="IconContainer js-tooltip" title="Más">
-        <span class="Icon Icon--caretDownLight Icon--small"></span>
-        <span class="u-hiddenVisually">Más</span>
-      </div>
-  </button>
-  <div class="dropdown-menu is-autoCentered">
-  <div class="dropdown-caret">
-    <div class="caret-outer"></div>
-    <div class="caret-inner"></div>
-  </div>
-  <ul>
-
-      <li class="copy-link-to-tweet js-actionCopyLinkToTweet">
-        <button type="button" class="dropdown-link">Copiar enlace del Tweet</button>
-      </li>
-      <li class="embed-link js-actionEmbedTweet" data-nav="embed_tweet">
-        <button type="button" class="dropdown-link">Insertar Tweet</button>
-      </li>
-  </ul>
-</div>
-
-</div>
-
-  </div>
-
-      </div>
-
-
-
-
-
-        <div class="ReplyingToContextBelowAuthor" data-aria-label-part>
-
-
-    En respuesta a <a class="pretty-link js-user-profile-link" href="/Metallica" data-user-id="238475531" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>Metallica</b></span></a> <a class="pretty-link js-user-profile-link" href="/EMMAUSolidarite" data-user-id="2912493406" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>EMMAUSolidarite</b></span></a> <a class="pretty-link js-user-profile-link" href="/PompiersParis" data-user-id="1342191438" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>PompiersParis</b></span></a>
-
-</div>
-
-
-
-        <div class="js-tweet-text-container">
-  <p class="TweetTextSize  js-tweet-text tweet-text" lang="en" data-aria-label-part="0"><img class="Emoji Emoji--forText" src="https://abs.twimg.com/emoji/v2/72x72/2764.png" draggable="false" alt="❤️" title="Corazón rojo" aria-label="Emoji: Corazón rojo">be blessed...</p>
-</div>
-
-
-
-
-
-
-
-
-
-
-
-
-      <div class="stream-item-footer">
-
-      <div class="ProfileTweet-actionCountList u-hiddenVisually">
-
-
-    <span class="ProfileTweet-action--reply u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-reply-count-aria-1129457489064419333" >0 respuestas</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--retweet u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-retweet-count-aria-1129457489064419333" >0 retweets</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--favorite u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-favorite-count-aria-1129457489064419333" >0 Me gusta</span>
-      </span>
-    </span>
-  </div>
-
-  <div class="ProfileTweet-actionList js-actions" role="group" aria-label="Acciones del Tweet">
-    <div class="ProfileTweet-action ProfileTweet-action--reply">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionReply"
-    data-modal="ProfileTweet-reply" type="button"
-    aria-describedby="profile-tweet-action-reply-count-aria-1129457489064419333">
-    <div class="IconContainer js-tooltip" title="Responder">
-      <span class="Icon Icon--medium Icon--reply"></span>
-      <span class="u-hiddenVisually">Responder</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero ">
-        <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-      </span>
-  </button>
-</div>
-
-    <div class="ProfileTweet-action ProfileTweet-action--retweet js-toggleState js-toggleRt">
-  <button class="ProfileTweet-actionButton  js-actionButton js-actionRetweet"
-
-    data-modal="ProfileTweet-retweet"
-    type="button"
-    aria-describedby="profile-tweet-action-retweet-count-aria-1129457489064419333">
-    <div class="IconContainer js-tooltip" title="Retwittear">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retwittear</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo js-actionButton js-actionRetweet" data-modal="ProfileTweet-retweet" type="button">
-    <div class="IconContainer js-tooltip" title="Deshacer Retweet">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retwitteado</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button>
-</div>
-
-
-    <div class="ProfileTweet-action ProfileTweet-action--favorite js-toggleState">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionFavorite" type="button"
-    aria-describedby="profile-tweet-action-favorite-count-aria-1129457489064419333">
-    <div class="IconContainer js-tooltip" title="Me gusta">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Me gusta</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo ProfileTweet-action--unfavorite u-linkClean js-actionButton js-actionFavorite" type="button">
-    <div class="IconContainer js-tooltip" title="Deshacer me gusta">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Gustado</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button>
-</div>
-
-
-
-
-
-
-  </div>
-
-</div>
-
-
-
-
-
-
-
-
-
-
-
-    </div>
-
-  </div>
-
-
-
-
-<div class="dismiss-module">
-  <div class="dismissed-module">
-    <div class="feedback-actions">
-        <div class="feedback-action" data-feedback-type="DontLike" data-feedback-url="">
-          <div class="action-confirmation dismiss-module-item">Gracias. Twitter usará esto para mejorar tu cronología.
-            <span class="undo-action">Deshacer</span>
-          </div>
-        </div>
-    </div>
-    <div class="child-feedback-confirmation">
-      <div class="child-confirmation-item">
-        <span class="child-confirmation-text"></span>
-        <span class="undo-child-feedback-action">Deshacer</span>
-      </div>
-    </div>
-  </div>
-</div>
-
-</li>
-    </ol>
-  </li>
-
-
-      <li class="ThreadedConversation--loneTweet
-
-  ">
-    <ol class="stream-items">
-      <li class="js-stream-item stream-item stream-item
-" data-item-id="1128160260307468288"
-id="stream-item-tweet-1128160260307468288"
-data-item-type="tweet"
- data-suggestion-json="{&quot;suggestion_details&quot;:{},&quot;tweet_ids&quot;:&quot;1128160260307468288&quot;,&quot;scribe_component&quot;:&quot;tweet&quot;}">
-
-
-
-  <div class="tweet js-stream-tweet js-actionable-tweet js-profile-popup-actionable dismissible-content
-
-
-
-       descendant permalink-descendant-tweet
-"
-
-data-tweet-id="1128160260307468288"
-data-item-id="1128160260307468288"
-data-permalink-path="/kaelgoth/status/1128160260307468288"
-data-conversation-id="1128068672289890305"
-
-
- data-has-parent-tweet="true"
-
-data-tweet-nonce="1128160260307468288-d0dd2f6e-d609-479d-b05e-9d24885ab90b"
-data-tweet-stat-initialized="true"
-data-conversation-section-quality="HighQuality"
-
-
-
-
-
-  data-screen-name="kaelgoth" data-name="Mika Chu" data-user-id="702699632"
-  data-you-follow="false"
-  data-follows-you="false"
-  data-you-block="false"
- data-mentions="Metallica EMMAUSolidarite PompiersParis"
-
-data-reply-to-users-json="[{&quot;id_str&quot;:&quot;702699632&quot;,&quot;screen_name&quot;:&quot;kaelgoth&quot;,&quot;name&quot;:&quot;Mika Chu&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Mika Chu&quot;,&quot;emojified_text_as_html&quot;:&quot;Mika Chu&quot;}},{&quot;id_str&quot;:&quot;238475531&quot;,&quot;screen_name&quot;:&quot;Metallica&quot;,&quot;name&quot;:&quot;Metallica&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Metallica&quot;,&quot;emojified_text_as_html&quot;:&quot;Metallica&quot;}},{&quot;id_str&quot;:&quot;2912493406&quot;,&quot;screen_name&quot;:&quot;EMMAUSolidarite&quot;,&quot;name&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;,&quot;emojified_text_as_html&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;}},{&quot;id_str&quot;:&quot;1342191438&quot;,&quot;screen_name&quot;:&quot;PompiersParis&quot;,&quot;name&quot;:&quot;Pompiers de Paris&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Pompiers de Paris&quot;,&quot;emojified_text_as_html&quot;:&quot;Pompiers de Paris&quot;}}]"
-
-
-
-
-
-
-
-data-disclosure-type=""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- data-component-context="replies"
-
-
-    >
-
-    <div class="context">
-
-
-    </div>
-
-    <div class="content">
-
-
-
-
-
-      <div class="stream-item-header">
-          <a  class="account-group js-account-group js-action-profile js-user-profile-link js-nav" href="/kaelgoth" data-user-id="702699632">
-      <img class="avatar js-action-profile-avatar" src="https://pbs.twimg.com/profile_images/780634865641349120/G3fP0jhI_bigger.jpg" alt="">
-    <span class="FullNameGroup">
-      <strong class="fullname show-popup-with-id u-textTruncate " data-aria-label-part>Mika Chu</strong><span>&rlm;</span><span class="UserBadges"></span><span class="UserNameBreak">&nbsp;</span></span><span class="username u-dir u-textTruncate" dir="ltr" data-aria-label-part>@<b>kaelgoth</b></span></a>
-
-
-        <small class="time">
-  <a href="/kaelgoth/status/1128160260307468288" class="tweet-timestamp js-permalink js-nav js-tooltip" title="21:49 - 13 may. 2019"  data-conversation-id="1128068672289890305"><span class="_timestamp js-short-timestamp " data-aria-label-part="last" data-time="1557809340" data-time-ms="1557809340000" data-long-form="true">14 may.</span></a>
-</small>
-
-          <div class="ProfileTweet-action ProfileTweet-action--more js-more-ProfileTweet-actions">
-    <div class="dropdown">
-  <button class="ProfileTweet-actionButton u-textUserColorHover dropdown-toggle js-dropdown-toggle" type="button">
-      <div class="IconContainer js-tooltip" title="Más">
-        <span class="Icon Icon--caretDownLight Icon--small"></span>
-        <span class="u-hiddenVisually">Más</span>
-      </div>
-  </button>
-  <div class="dropdown-menu is-autoCentered">
-  <div class="dropdown-caret">
-    <div class="caret-outer"></div>
-    <div class="caret-inner"></div>
-  </div>
-  <ul>
-
-      <li class="copy-link-to-tweet js-actionCopyLinkToTweet">
-        <button type="button" class="dropdown-link">Copiar enlace del Tweet</button>
-      </li>
-      <li class="embed-link js-actionEmbedTweet" data-nav="embed_tweet">
-        <button type="button" class="dropdown-link">Insertar Tweet</button>
-      </li>
-  </ul>
-</div>
-
-</div>
-
-  </div>
-
-      </div>
-
-
-
-
-
-        <div class="ReplyingToContextBelowAuthor" data-aria-label-part>
-
-
-    En respuesta a <a class="pretty-link js-user-profile-link" href="/Metallica" data-user-id="238475531" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>Metallica</b></span></a> <a class="pretty-link js-user-profile-link" href="/EMMAUSolidarite" data-user-id="2912493406" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>EMMAUSolidarite</b></span></a> <a class="pretty-link js-user-profile-link" href="/PompiersParis" data-user-id="1342191438" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>PompiersParis</b></span></a>
-
-</div>
-
-
-
-        <div class="js-tweet-text-container">
-  <p class="TweetTextSize  js-tweet-text tweet-text" lang="en" data-aria-label-part="0">Great move for 2 great causes.</p>
-</div>
-
-
-
-
-
-
-
-
-
-
-
-
-      <div class="stream-item-footer">
-
-      <div class="ProfileTweet-actionCountList u-hiddenVisually">
-
-
-    <span class="ProfileTweet-action--reply u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-reply-count-aria-1128160260307468288" >0 respuestas</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--retweet u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-retweet-count-aria-1128160260307468288" >0 retweets</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--favorite u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-favorite-count-aria-1128160260307468288" >0 Me gusta</span>
-      </span>
-    </span>
-  </div>
-
-  <div class="ProfileTweet-actionList js-actions" role="group" aria-label="Acciones del Tweet">
-    <div class="ProfileTweet-action ProfileTweet-action--reply">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionReply"
-    data-modal="ProfileTweet-reply" type="button"
-    aria-describedby="profile-tweet-action-reply-count-aria-1128160260307468288">
-    <div class="IconContainer js-tooltip" title="Responder">
-      <span class="Icon Icon--medium Icon--reply"></span>
-      <span class="u-hiddenVisually">Responder</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero ">
-        <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-      </span>
-  </button>
-</div>
-
-    <div class="ProfileTweet-action ProfileTweet-action--retweet js-toggleState js-toggleRt">
-  <button class="ProfileTweet-actionButton  js-actionButton js-actionRetweet"
-
-    data-modal="ProfileTweet-retweet"
-    type="button"
-    aria-describedby="profile-tweet-action-retweet-count-aria-1128160260307468288">
-    <div class="IconContainer js-tooltip" title="Retwittear">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retwittear</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo js-actionButton js-actionRetweet" data-modal="ProfileTweet-retweet" type="button">
-    <div class="IconContainer js-tooltip" title="Deshacer Retweet">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retwitteado</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button>
-</div>
-
-
-    <div class="ProfileTweet-action ProfileTweet-action--favorite js-toggleState">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionFavorite" type="button"
-    aria-describedby="profile-tweet-action-favorite-count-aria-1128160260307468288">
-    <div class="IconContainer js-tooltip" title="Me gusta">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Me gusta</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo ProfileTweet-action--unfavorite u-linkClean js-actionButton js-actionFavorite" type="button">
-    <div class="IconContainer js-tooltip" title="Deshacer me gusta">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Gustado</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button>
-</div>
-
-
-
-
-
-
-  </div>
-
-</div>
-
-
-
-
-
-
-
-
-
-
-
-    </div>
-
-  </div>
-
-
-
-
-<div class="dismiss-module">
-  <div class="dismissed-module">
-    <div class="feedback-actions">
-        <div class="feedback-action" data-feedback-type="DontLike" data-feedback-url="">
-          <div class="action-confirmation dismiss-module-item">Gracias. Twitter usará esto para mejorar tu cronología.
-            <span class="undo-action">Deshacer</span>
-          </div>
-        </div>
-    </div>
-    <div class="child-feedback-confirmation">
-      <div class="child-confirmation-item">
-        <span class="child-confirmation-text"></span>
-        <span class="undo-child-feedback-action">Deshacer</span>
-      </div>
-    </div>
-  </div>
-</div>
-
-</li>
-    </ol>
-  </li>
-
-
-      <li class="ThreadedConversation--loneTweet
-
-  ">
-    <ol class="stream-items">
-      <li class="js-stream-item stream-item stream-item
-" data-item-id="1128299417537138689"
-id="stream-item-tweet-1128299417537138689"
-data-item-type="tweet"
- data-suggestion-json="{&quot;suggestion_details&quot;:{},&quot;tweet_ids&quot;:&quot;1128299417537138689&quot;,&quot;scribe_component&quot;:&quot;tweet&quot;}">
-
-
-
-  <div class="tweet js-stream-tweet js-actionable-tweet js-profile-popup-actionable dismissible-content
-
-
-
-       descendant permalink-descendant-tweet
-"
-
-data-tweet-id="1128299417537138689"
-data-item-id="1128299417537138689"
-data-permalink-path="/lchristinep/status/1128299417537138689"
-data-conversation-id="1128068672289890305"
-
-
- data-has-parent-tweet="true"
-
-data-tweet-nonce="1128299417537138689-2454137d-ca6e-4912-9554-b349e731526c"
-data-tweet-stat-initialized="true"
-data-conversation-section-quality="HighQuality"
-
-
-
-
-
-  data-screen-name="lchristinep" data-name="Servant" data-user-id="777529956"
-  data-you-follow="false"
-  data-follows-you="false"
-  data-you-block="false"
- data-mentions="Metallica EMMAUSolidarite PompiersParis"
-
-data-reply-to-users-json="[{&quot;id_str&quot;:&quot;777529956&quot;,&quot;screen_name&quot;:&quot;lchristinep&quot;,&quot;name&quot;:&quot;Servant&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Servant&quot;,&quot;emojified_text_as_html&quot;:&quot;Servant&quot;}},{&quot;id_str&quot;:&quot;238475531&quot;,&quot;screen_name&quot;:&quot;Metallica&quot;,&quot;name&quot;:&quot;Metallica&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Metallica&quot;,&quot;emojified_text_as_html&quot;:&quot;Metallica&quot;}},{&quot;id_str&quot;:&quot;2912493406&quot;,&quot;screen_name&quot;:&quot;EMMAUSolidarite&quot;,&quot;name&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;,&quot;emojified_text_as_html&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;}},{&quot;id_str&quot;:&quot;1342191438&quot;,&quot;screen_name&quot;:&quot;PompiersParis&quot;,&quot;name&quot;:&quot;Pompiers de Paris&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Pompiers de Paris&quot;,&quot;emojified_text_as_html&quot;:&quot;Pompiers de Paris&quot;}}]"
-
-
-
-
-
-
-
-data-disclosure-type=""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- data-component-context="replies"
-
-
-    >
-
-    <div class="context">
-
-
-    </div>
-
-    <div class="content">
-
-
-
-
-
-      <div class="stream-item-header">
-          <a  class="account-group js-account-group js-action-profile js-user-profile-link js-nav" href="/lchristinep" data-user-id="777529956">
-      <img class="avatar js-action-profile-avatar" src="https://pbs.twimg.com/profile_images/1117402765292998663/cNsxPk3j_bigger.jpg" alt="">
-    <span class="FullNameGroup">
-      <strong class="fullname show-popup-with-id u-textTruncate " data-aria-label-part>Servant</strong><span>&rlm;</span><span class="UserBadges"></span><span class="UserNameBreak">&nbsp;</span></span><span class="username u-dir u-textTruncate" dir="ltr" data-aria-label-part>@<b>lchristinep</b></span></a>
-
-
-        <small class="time">
-  <a href="/lchristinep/status/1128299417537138689" class="tweet-timestamp js-permalink js-nav js-tooltip" title="7:01 - 14 may. 2019"  data-conversation-id="1128068672289890305"><span class="_timestamp js-short-timestamp " data-aria-label-part="last" data-time="1557842518" data-time-ms="1557842518000" data-long-form="true">14 may.</span></a>
-</small>
-
-          <div class="ProfileTweet-action ProfileTweet-action--more js-more-ProfileTweet-actions">
-    <div class="dropdown">
-  <button class="ProfileTweet-actionButton u-textUserColorHover dropdown-toggle js-dropdown-toggle" type="button">
-      <div class="IconContainer js-tooltip" title="Más">
-        <span class="Icon Icon--caretDownLight Icon--small"></span>
-        <span class="u-hiddenVisually">Más</span>
-      </div>
-  </button>
-  <div class="dropdown-menu is-autoCentered">
-  <div class="dropdown-caret">
-    <div class="caret-outer"></div>
-    <div class="caret-inner"></div>
-  </div>
-  <ul>
-
-      <li class="copy-link-to-tweet js-actionCopyLinkToTweet">
-        <button type="button" class="dropdown-link">Copiar enlace del Tweet</button>
-      </li>
-      <li class="embed-link js-actionEmbedTweet" data-nav="embed_tweet">
-        <button type="button" class="dropdown-link">Insertar Tweet</button>
-      </li>
-  </ul>
-</div>
-
-</div>
-
-  </div>
-
-      </div>
-
-
-
-
-
-        <div class="ReplyingToContextBelowAuthor" data-aria-label-part>
-
-
-    En respuesta a <a class="pretty-link js-user-profile-link" href="/Metallica" data-user-id="238475531" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>Metallica</b></span></a> <a class="pretty-link js-user-profile-link" href="/EMMAUSolidarite" data-user-id="2912493406" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>EMMAUSolidarite</b></span></a> <a class="pretty-link js-user-profile-link" href="/PompiersParis" data-user-id="1342191438" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>PompiersParis</b></span></a>
-
-</div>
-
-
-
-        <div class="js-tweet-text-container">
-  <p class="TweetTextSize  js-tweet-text tweet-text" lang="und" data-aria-label-part="0"><img class="Emoji Emoji--forText" src="https://abs.twimg.com/emoji/v2/72x72/1f918.png" draggable="false" alt="🤘" title="Señal de los cuernos" aria-label="Emoji: Señal de los cuernos"><img class="Emoji Emoji--forText" src="https://abs.twimg.com/emoji/v2/72x72/1f49c.png" draggable="false" alt="💜" title="Corazón morado" aria-label="Emoji: Corazón morado"></p>
-</div>
-
-
-
-
-
-
-
-
-
-
-
-
-      <div class="stream-item-footer">
-
-      <div class="ProfileTweet-actionCountList u-hiddenVisually">
-
-
-    <span class="ProfileTweet-action--reply u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-reply-count-aria-1128299417537138689" >0 respuestas</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--retweet u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-retweet-count-aria-1128299417537138689" >0 retweets</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--favorite u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-favorite-count-aria-1128299417537138689" >0 Me gusta</span>
-      </span>
-    </span>
-  </div>
-
-  <div class="ProfileTweet-actionList js-actions" role="group" aria-label="Acciones del Tweet">
-    <div class="ProfileTweet-action ProfileTweet-action--reply">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionReply"
-    data-modal="ProfileTweet-reply" type="button"
-    aria-describedby="profile-tweet-action-reply-count-aria-1128299417537138689">
-    <div class="IconContainer js-tooltip" title="Responder">
-      <span class="Icon Icon--medium Icon--reply"></span>
-      <span class="u-hiddenVisually">Responder</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero ">
-        <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-      </span>
-  </button>
-</div>
-
-    <div class="ProfileTweet-action ProfileTweet-action--retweet js-toggleState js-toggleRt">
-  <button class="ProfileTweet-actionButton  js-actionButton js-actionRetweet"
-
-    data-modal="ProfileTweet-retweet"
-    type="button"
-    aria-describedby="profile-tweet-action-retweet-count-aria-1128299417537138689">
-    <div class="IconContainer js-tooltip" title="Retwittear">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retwittear</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo js-actionButton js-actionRetweet" data-modal="ProfileTweet-retweet" type="button">
-    <div class="IconContainer js-tooltip" title="Deshacer Retweet">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retwitteado</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button>
-</div>
-
-
-    <div class="ProfileTweet-action ProfileTweet-action--favorite js-toggleState">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionFavorite" type="button"
-    aria-describedby="profile-tweet-action-favorite-count-aria-1128299417537138689">
-    <div class="IconContainer js-tooltip" title="Me gusta">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Me gusta</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo ProfileTweet-action--unfavorite u-linkClean js-actionButton js-actionFavorite" type="button">
-    <div class="IconContainer js-tooltip" title="Deshacer me gusta">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Gustado</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button>
-</div>
-
-
-
-
-
-
-  </div>
-
-</div>
-
-
-
-
-
-
-
-
-
-
-
-    </div>
-
-  </div>
-
-
-
-
-<div class="dismiss-module">
-  <div class="dismissed-module">
-    <div class="feedback-actions">
-        <div class="feedback-action" data-feedback-type="DontLike" data-feedback-url="">
-          <div class="action-confirmation dismiss-module-item">Gracias. Twitter usará esto para mejorar tu cronología.
-            <span class="undo-action">Deshacer</span>
-          </div>
-        </div>
-    </div>
-    <div class="child-feedback-confirmation">
-      <div class="child-confirmation-item">
-        <span class="child-confirmation-text"></span>
-        <span class="undo-child-feedback-action">Deshacer</span>
-      </div>
-    </div>
-  </div>
-</div>
-
-</li>
-    </ol>
-  </li>
-
-
-    <div class="ThreadedConversation--loneTweet">
-    <div class="stream-tombstone-container ThreadedConversation-tweet last">
-  <li class="stream-tombstone-item stream-item js-stream-item">
-<div class="Tombstone">
-  <span class="Tombstone-label">        <span class="Tombstone-label">Este Tweet no está disponible</span>
-</span>
-
-</div>  </li>
-</div>
-
-  </div>
-
-      <li class="ThreadedConversation--loneTweet
-
-  ">
-    <ol class="stream-items">
-      <li class="js-stream-item stream-item stream-item
-" data-item-id="1128774126695374848"
-id="stream-item-tweet-1128774126695374848"
-data-item-type="tweet"
- data-suggestion-json="{&quot;suggestion_details&quot;:{},&quot;tweet_ids&quot;:&quot;1128774126695374848&quot;,&quot;scribe_component&quot;:&quot;tweet&quot;}">
-
-
-
-  <div class="tweet js-stream-tweet js-actionable-tweet js-profile-popup-actionable dismissible-content
-
-
-
-       has-cards descendant permalink-descendant-tweet has-content
-"
-
-data-tweet-id="1128774126695374848"
-data-item-id="1128774126695374848"
-data-permalink-path="/bralalalala/status/1128774126695374848"
-data-conversation-id="1128068672289890305"
-
-
- data-has-parent-tweet="true"
-
-data-tweet-nonce="1128774126695374848-49d0aa19-3e90-4246-af40-644b4b5b6504"
-data-tweet-stat-initialized="true"
-data-conversation-section-quality="HighQuality"
-
-
-
-
-
-  data-screen-name="bralalalala" data-name="Bralalalala (An Artist &amp; Band,Not “Banned”)" data-user-id="1005982702850281473"
-  data-you-follow="false"
-  data-follows-you="false"
-  data-you-block="false"
- data-mentions="Metallica EMMAUSolidarite PompiersParis"
-
-data-reply-to-users-json="[{&quot;id_str&quot;:&quot;1005982702850281473&quot;,&quot;screen_name&quot;:&quot;bralalalala&quot;,&quot;name&quot;:&quot;Bralalalala (An Artist &amp; Band,Not \u201cBanned\u201d)&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Bralalalala (An Artist &amp; Band,Not \u201cBanned\u201d)&quot;,&quot;emojified_text_as_html&quot;:&quot;Bralalalala (An Artist &amp;amp; Band,Not \u201cBanned\u201d)&quot;}},{&quot;id_str&quot;:&quot;238475531&quot;,&quot;screen_name&quot;:&quot;Metallica&quot;,&quot;name&quot;:&quot;Metallica&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Metallica&quot;,&quot;emojified_text_as_html&quot;:&quot;Metallica&quot;}},{&quot;id_str&quot;:&quot;2912493406&quot;,&quot;screen_name&quot;:&quot;EMMAUSolidarite&quot;,&quot;name&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;,&quot;emojified_text_as_html&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;}},{&quot;id_str&quot;:&quot;1342191438&quot;,&quot;screen_name&quot;:&quot;PompiersParis&quot;,&quot;name&quot;:&quot;Pompiers de Paris&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Pompiers de Paris&quot;,&quot;emojified_text_as_html&quot;:&quot;Pompiers de Paris&quot;}}]"
-
-
-
-
-
-
-
-data-disclosure-type=""
-
-
-
-
- data-has-cards="true"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- data-component-context="replies"
-
-
-    >
-
-    <div class="context">
-
-
-    </div>
-
-    <div class="content">
-
-
-
-
-
-      <div class="stream-item-header">
-          <a  class="account-group js-account-group js-action-profile js-user-profile-link js-nav" href="/bralalalala" data-user-id="1005982702850281473">
-      <img class="avatar js-action-profile-avatar" src="https://pbs.twimg.com/profile_images/1129973210370285568/WfpAc8Jh_bigger.jpg" alt="">
-    <span class="FullNameGroup">
-      <strong class="fullname show-popup-with-id u-textTruncate " data-aria-label-part>Bralalalala (An Artist &amp; Band,Not “Banned”)</strong><span>&rlm;</span><span class="UserBadges"></span><span class="UserNameBreak">&nbsp;</span></span><span class="username u-dir u-textTruncate" dir="ltr" data-aria-label-part>@<b>bralalalala</b></span></a>
-
-
-        <small class="time">
-  <a href="/bralalalala/status/1128774126695374848" class="tweet-timestamp js-permalink js-nav js-tooltip" title="14:28 - 15 may. 2019"  data-conversation-id="1128068672289890305"><span class="_timestamp js-short-timestamp " data-aria-label-part="last" data-time="1557955698" data-time-ms="1557955698000" data-long-form="true">15 may.</span></a>
-</small>
-
-          <div class="ProfileTweet-action ProfileTweet-action--more js-more-ProfileTweet-actions">
-    <div class="dropdown">
-  <button class="ProfileTweet-actionButton u-textUserColorHover dropdown-toggle js-dropdown-toggle" type="button">
-      <div class="IconContainer js-tooltip" title="Más">
-        <span class="Icon Icon--caretDownLight Icon--small"></span>
-        <span class="u-hiddenVisually">Más</span>
-      </div>
-  </button>
-  <div class="dropdown-menu is-autoCentered">
-  <div class="dropdown-caret">
-    <div class="caret-outer"></div>
-    <div class="caret-inner"></div>
-  </div>
-  <ul>
-
-      <li class="copy-link-to-tweet js-actionCopyLinkToTweet">
-        <button type="button" class="dropdown-link">Copiar enlace del Tweet</button>
-      </li>
-      <li class="embed-link js-actionEmbedTweet" data-nav="embed_tweet">
-        <button type="button" class="dropdown-link">Insertar Tweet</button>
-      </li>
-  </ul>
-</div>
-
-</div>
-
-  </div>
-
-      </div>
-
-
-
-
-
-        <div class="ReplyingToContextBelowAuthor" data-aria-label-part>
-
-
-    En respuesta a <a class="pretty-link js-user-profile-link" href="/Metallica" data-user-id="238475531" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>Metallica</b></span></a> <a class="pretty-link js-user-profile-link" href="/EMMAUSolidarite" data-user-id="2912493406" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>EMMAUSolidarite</b></span></a> <a class="pretty-link js-user-profile-link" href="/PompiersParis" data-user-id="1342191438" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>PompiersParis</b></span></a>
-
-</div>
-
-
-
-        <div class="js-tweet-text-container">
-  <p class="TweetTextSize  js-tweet-text tweet-text" lang="en" data-aria-label-part="0">It looks like Bralalalala albums are too good for the public which is still mired in ancient sexist and transphobic lore .Well, tough luck...best albums in metal history not being performed for you then...feature the drummer of Megadeth and blow Metallica out of the game<a href="https://t.co/lhr7f687Mo" class="twitter-timeline-link u-hidden" data-pre-embedded="true" dir="ltr" >pic.twitter.com/lhr7f687Mo</a></p>
-</div>
-
-
-
-
-
-            <div class="AdaptiveMediaOuterContainer">
-    <div class="AdaptiveMedia
-
-        is-square
-
-
-
-        "
-      >
-      <div class="AdaptiveMedia-container">
-          <div class="AdaptiveMedia-singlePhoto"
-    style="padding-top: calc(0.986328125 * 100% - 0.5px);"
->
-    <div class="AdaptiveMedia-photoContainer js-adaptive-photo "
-  data-image-url="https://pbs.twimg.com/media/D6o2FSMU8AEYN4a.jpg"
-
-
-  data-element-context="platform_photo_card"
-    style="background-color:rgba(38,27,30,1.0);"
-    data-dominant-color="[38,27,30]"
->
-  <img data-aria-label-part src="https://pbs.twimg.com/media/D6o2FSMU8AEYN4a.jpg" alt=""
-      style="width: 100%; top: -0px;"
->
-</div>
-
-
-</div>
-      </div>
-    </div>
-  </div>
-
-
-
-
-
-
-
-
-      <div class="stream-item-footer">
-
-      <div class="ProfileTweet-actionCountList u-hiddenVisually">
-
-
-    <span class="ProfileTweet-action--reply u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-reply-count-aria-1128774126695374848" >0 respuestas</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--retweet u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-retweet-count-aria-1128774126695374848" >0 retweets</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--favorite u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-favorite-count-aria-1128774126695374848" >0 Me gusta</span>
-      </span>
-    </span>
-  </div>
-
-  <div class="ProfileTweet-actionList js-actions" role="group" aria-label="Acciones del Tweet">
-    <div class="ProfileTweet-action ProfileTweet-action--reply">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionReply"
-    data-modal="ProfileTweet-reply" type="button"
-    aria-describedby="profile-tweet-action-reply-count-aria-1128774126695374848">
-    <div class="IconContainer js-tooltip" title="Responder">
-      <span class="Icon Icon--medium Icon--reply"></span>
-      <span class="u-hiddenVisually">Responder</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero ">
-        <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-      </span>
-  </button>
-</div>
-
-    <div class="ProfileTweet-action ProfileTweet-action--retweet js-toggleState js-toggleRt">
-  <button class="ProfileTweet-actionButton  js-actionButton js-actionRetweet"
-
-    data-modal="ProfileTweet-retweet"
-    type="button"
-    aria-describedby="profile-tweet-action-retweet-count-aria-1128774126695374848">
-    <div class="IconContainer js-tooltip" title="Retwittear">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retwittear</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo js-actionButton js-actionRetweet" data-modal="ProfileTweet-retweet" type="button">
-    <div class="IconContainer js-tooltip" title="Deshacer Retweet">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retwitteado</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button>
-</div>
-
-
-    <div class="ProfileTweet-action ProfileTweet-action--favorite js-toggleState">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionFavorite" type="button"
-    aria-describedby="profile-tweet-action-favorite-count-aria-1128774126695374848">
-    <div class="IconContainer js-tooltip" title="Me gusta">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Me gusta</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo ProfileTweet-action--unfavorite u-linkClean js-actionButton js-actionFavorite" type="button">
-    <div class="IconContainer js-tooltip" title="Deshacer me gusta">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Gustado</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button>
-</div>
-
-
-
-
-
-
-  </div>
-
-</div>
-
-
-
-
-
-
-
-
-
-
-
-    </div>
-
-  </div>
-
-
-
-
-<div class="dismiss-module">
-  <div class="dismissed-module">
-    <div class="feedback-actions">
-        <div class="feedback-action" data-feedback-type="DontLike" data-feedback-url="">
-          <div class="action-confirmation dismiss-module-item">Gracias. Twitter usará esto para mejorar tu cronología.
-            <span class="undo-action">Deshacer</span>
-          </div>
-        </div>
-    </div>
-    <div class="child-feedback-confirmation">
-      <div class="child-confirmation-item">
-        <span class="child-confirmation-text"></span>
-        <span class="undo-child-feedback-action">Deshacer</span>
-      </div>
-    </div>
-  </div>
-</div>
-
-</li>
-    </ol>
-  </li>
-
-
-      <li class="ThreadedConversation--loneTweet
-
-  ">
-    <ol class="stream-items">
-      <li class="js-stream-item stream-item stream-item
-" data-item-id="1128123421597085698"
-id="stream-item-tweet-1128123421597085698"
-data-item-type="tweet"
- data-suggestion-json="{&quot;suggestion_details&quot;:{},&quot;tweet_ids&quot;:&quot;1128123421597085698&quot;,&quot;scribe_component&quot;:&quot;tweet&quot;}">
-
-
-
-  <div class="tweet js-stream-tweet js-actionable-tweet js-profile-popup-actionable dismissible-content
-
-
-
-       descendant permalink-descendant-tweet
-"
-
-data-tweet-id="1128123421597085698"
-data-item-id="1128123421597085698"
-data-permalink-path="/MaryMagdallena/status/1128123421597085698"
-data-conversation-id="1128068672289890305"
-
-
- data-has-parent-tweet="true"
-
-data-tweet-nonce="1128123421597085698-c4ba0f99-fcd1-4050-bdca-4534e941d5c7"
-data-tweet-stat-initialized="true"
-data-conversation-section-quality="HighQuality"
-
-
-
-
-
-  data-screen-name="MaryMagdallena" data-name="aga" data-user-id="631026979"
-  data-you-follow="false"
-  data-follows-you="false"
-  data-you-block="false"
- data-mentions="Metallica EMMAUSolidarite PompiersParis"
-
-data-reply-to-users-json="[{&quot;id_str&quot;:&quot;631026979&quot;,&quot;screen_name&quot;:&quot;MaryMagdallena&quot;,&quot;name&quot;:&quot;aga&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;aga&quot;,&quot;emojified_text_as_html&quot;:&quot;aga&quot;}},{&quot;id_str&quot;:&quot;238475531&quot;,&quot;screen_name&quot;:&quot;Metallica&quot;,&quot;name&quot;:&quot;Metallica&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Metallica&quot;,&quot;emojified_text_as_html&quot;:&quot;Metallica&quot;}},{&quot;id_str&quot;:&quot;2912493406&quot;,&quot;screen_name&quot;:&quot;EMMAUSolidarite&quot;,&quot;name&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;,&quot;emojified_text_as_html&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;}},{&quot;id_str&quot;:&quot;1342191438&quot;,&quot;screen_name&quot;:&quot;PompiersParis&quot;,&quot;name&quot;:&quot;Pompiers de Paris&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Pompiers de Paris&quot;,&quot;emojified_text_as_html&quot;:&quot;Pompiers de Paris&quot;}}]"
-
-
-
-
-
-
-
-data-disclosure-type=""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- data-component-context="replies"
-
-
-    >
-
-    <div class="context">
-
-
-    </div>
-
-    <div class="content">
-
-
-
-
-
-      <div class="stream-item-header">
-          <a  class="account-group js-account-group js-action-profile js-user-profile-link js-nav" href="/MaryMagdallena" data-user-id="631026979">
-      <img class="avatar js-action-profile-avatar" src="https://pbs.twimg.com/profile_images/1049575595628216320/n8iq2u66_bigger.jpg" alt="">
-    <span class="FullNameGroup">
-      <strong class="fullname show-popup-with-id u-textTruncate " data-aria-label-part>aga</strong><span>&rlm;</span><span class="UserBadges"></span><span class="UserNameBreak">&nbsp;</span></span><span class="username u-dir u-textTruncate" dir="ltr" data-aria-label-part>@<b>MaryMagdallena</b></span></a>
-
-
-        <small class="time">
-  <a href="/MaryMagdallena/status/1128123421597085698" class="tweet-timestamp js-permalink js-nav js-tooltip" title="19:22 - 13 may. 2019"  data-conversation-id="1128068672289890305"><span class="_timestamp js-short-timestamp " data-aria-label-part="last" data-time="1557800557" data-time-ms="1557800557000" data-long-form="true">14 may.</span></a>
-</small>
-
-          <div class="ProfileTweet-action ProfileTweet-action--more js-more-ProfileTweet-actions">
-    <div class="dropdown">
-  <button class="ProfileTweet-actionButton u-textUserColorHover dropdown-toggle js-dropdown-toggle" type="button">
-      <div class="IconContainer js-tooltip" title="Más">
-        <span class="Icon Icon--caretDownLight Icon--small"></span>
-        <span class="u-hiddenVisually">Más</span>
-      </div>
-  </button>
-  <div class="dropdown-menu is-autoCentered">
-  <div class="dropdown-caret">
-    <div class="caret-outer"></div>
-    <div class="caret-inner"></div>
-  </div>
-  <ul>
-
-      <li class="copy-link-to-tweet js-actionCopyLinkToTweet">
-        <button type="button" class="dropdown-link">Copiar enlace del Tweet</button>
-      </li>
-      <li class="embed-link js-actionEmbedTweet" data-nav="embed_tweet">
-        <button type="button" class="dropdown-link">Insertar Tweet</button>
-      </li>
-  </ul>
-</div>
-
-</div>
-
-  </div>
-
-      </div>
-
-
-
-
-
-        <div class="ReplyingToContextBelowAuthor" data-aria-label-part>
-
-
-    En respuesta a <a class="pretty-link js-user-profile-link" href="/Metallica" data-user-id="238475531" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>Metallica</b></span></a> <a class="pretty-link js-user-profile-link" href="/EMMAUSolidarite" data-user-id="2912493406" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>EMMAUSolidarite</b></span></a> <a class="pretty-link js-user-profile-link" href="/PompiersParis" data-user-id="1342191438" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>PompiersParis</b></span></a>
-
-</div>
-
-
-
-        <div class="js-tweet-text-container">
-  <p class="TweetTextSize  js-tweet-text tweet-text" lang="und" data-aria-label-part="0"><img class="Emoji Emoji--forText" src="https://abs.twimg.com/emoji/v2/72x72/2764.png" draggable="false" alt="❤" title="Corazón rojo" aria-label="Emoji: Corazón rojo"></p>
-</div>
-
-
-
-
-
-
-
-
-
-
-
-
-      <div class="stream-item-footer">
-
-      <div class="ProfileTweet-actionCountList u-hiddenVisually">
-
-
-    <span class="ProfileTweet-action--reply u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-reply-count-aria-1128123421597085698" >0 respuestas</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--retweet u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-retweet-count-aria-1128123421597085698" >0 retweets</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--favorite u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-favorite-count-aria-1128123421597085698" >0 Me gusta</span>
-      </span>
-    </span>
-  </div>
-
-  <div class="ProfileTweet-actionList js-actions" role="group" aria-label="Acciones del Tweet">
-    <div class="ProfileTweet-action ProfileTweet-action--reply">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionReply"
-    data-modal="ProfileTweet-reply" type="button"
-    aria-describedby="profile-tweet-action-reply-count-aria-1128123421597085698">
-    <div class="IconContainer js-tooltip" title="Responder">
-      <span class="Icon Icon--medium Icon--reply"></span>
-      <span class="u-hiddenVisually">Responder</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero ">
-        <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-      </span>
-  </button>
-</div>
-
-    <div class="ProfileTweet-action ProfileTweet-action--retweet js-toggleState js-toggleRt">
-  <button class="ProfileTweet-actionButton  js-actionButton js-actionRetweet"
-
-    data-modal="ProfileTweet-retweet"
-    type="button"
-    aria-describedby="profile-tweet-action-retweet-count-aria-1128123421597085698">
-    <div class="IconContainer js-tooltip" title="Retwittear">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retwittear</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo js-actionButton js-actionRetweet" data-modal="ProfileTweet-retweet" type="button">
-    <div class="IconContainer js-tooltip" title="Deshacer Retweet">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retwitteado</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button>
-</div>
-
-
-    <div class="ProfileTweet-action ProfileTweet-action--favorite js-toggleState">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionFavorite" type="button"
-    aria-describedby="profile-tweet-action-favorite-count-aria-1128123421597085698">
-    <div class="IconContainer js-tooltip" title="Me gusta">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Me gusta</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo ProfileTweet-action--unfavorite u-linkClean js-actionButton js-actionFavorite" type="button">
-    <div class="IconContainer js-tooltip" title="Deshacer me gusta">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Gustado</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button>
-</div>
-
-
-
-
-
-
-  </div>
-
-</div>
-
-
-
-
-
-
-
-
-
-
-
-    </div>
-
-  </div>
-
-
-
-
-<div class="dismiss-module">
-  <div class="dismissed-module">
-    <div class="feedback-actions">
-        <div class="feedback-action" data-feedback-type="DontLike" data-feedback-url="">
-          <div class="action-confirmation dismiss-module-item">Gracias. Twitter usará esto para mejorar tu cronología.
-            <span class="undo-action">Deshacer</span>
-          </div>
-        </div>
-    </div>
-    <div class="child-feedback-confirmation">
-      <div class="child-confirmation-item">
-        <span class="child-confirmation-text"></span>
-        <span class="undo-child-feedback-action">Deshacer</span>
-      </div>
-    </div>
-  </div>
-</div>
-
-</li>
-    </ol>
-  </li>
-
-
-      <li class="ThreadedConversation--loneTweet
-
-  ">
-    <ol class="stream-items">
-      <li class="js-stream-item stream-item stream-item
-" data-item-id="1128161549619814400"
-id="stream-item-tweet-1128161549619814400"
-data-item-type="tweet"
- data-suggestion-json="{&quot;suggestion_details&quot;:{},&quot;tweet_ids&quot;:&quot;1128161549619814400&quot;,&quot;scribe_component&quot;:&quot;tweet&quot;}">
-
-
-
-  <div class="tweet js-stream-tweet js-actionable-tweet js-profile-popup-actionable dismissible-content
-
-
-
-       descendant permalink-descendant-tweet
-"
-
-data-tweet-id="1128161549619814400"
-data-item-id="1128161549619814400"
-data-permalink-path="/JR_Seas/status/1128161549619814400"
-data-conversation-id="1128068672289890305"
-
-
- data-has-parent-tweet="true"
-
-data-tweet-nonce="1128161549619814400-1637358d-f989-4b32-b105-f9948485513e"
-data-tweet-stat-initialized="true"
-data-conversation-section-quality="HighQuality"
-
-
-
-
-
-  data-screen-name="JR_Seas" data-name="Josh Doesn&#39;t Abide" data-user-id="1279066278"
-  data-you-follow="false"
-  data-follows-you="false"
-  data-you-block="false"
- data-mentions="Metallica EMMAUSolidarite PompiersParis"
-
-data-reply-to-users-json="[{&quot;id_str&quot;:&quot;1279066278&quot;,&quot;screen_name&quot;:&quot;JR_Seas&quot;,&quot;name&quot;:&quot;Josh Doesn&#39;t Abide&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Josh Doesn&#39;t Abide&quot;,&quot;emojified_text_as_html&quot;:&quot;Josh Doesn&amp;#39;t Abide&quot;}},{&quot;id_str&quot;:&quot;238475531&quot;,&quot;screen_name&quot;:&quot;Metallica&quot;,&quot;name&quot;:&quot;Metallica&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Metallica&quot;,&quot;emojified_text_as_html&quot;:&quot;Metallica&quot;}},{&quot;id_str&quot;:&quot;2912493406&quot;,&quot;screen_name&quot;:&quot;EMMAUSolidarite&quot;,&quot;name&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;,&quot;emojified_text_as_html&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;}},{&quot;id_str&quot;:&quot;1342191438&quot;,&quot;screen_name&quot;:&quot;PompiersParis&quot;,&quot;name&quot;:&quot;Pompiers de Paris&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Pompiers de Paris&quot;,&quot;emojified_text_as_html&quot;:&quot;Pompiers de Paris&quot;}}]"
-
-
-
-
-
-
-
-data-disclosure-type=""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- data-component-context="replies"
-
-
-    >
-
-    <div class="context">
-
-
-    </div>
-
-    <div class="content">
-
-
-
-
-
-      <div class="stream-item-header">
-          <a  class="account-group js-account-group js-action-profile js-user-profile-link js-nav" href="/JR_Seas" data-user-id="1279066278">
-      <img class="avatar js-action-profile-avatar" src="https://pbs.twimg.com/profile_images/941427634306732034/n-UdIQ8t_bigger.jpg" alt="">
-    <span class="FullNameGroup">
-      <strong class="fullname show-popup-with-id u-textTruncate " data-aria-label-part>Josh Doesn&#39;t Abide</strong><span>&rlm;</span><span class="UserBadges"></span><span class="UserNameBreak">&nbsp;</span></span><span class="username u-dir u-textTruncate" dir="ltr" data-aria-label-part>@<b>JR_Seas</b></span></a>
-
-
-        <small class="time">
-  <a href="/JR_Seas/status/1128161549619814400" class="tweet-timestamp js-permalink js-nav js-tooltip" title="21:54 - 13 may. 2019"  data-conversation-id="1128068672289890305"><span class="_timestamp js-short-timestamp " data-aria-label-part="last" data-time="1557809648" data-time-ms="1557809648000" data-long-form="true">14 may.</span></a>
-</small>
-
-          <div class="ProfileTweet-action ProfileTweet-action--more js-more-ProfileTweet-actions">
-    <div class="dropdown">
-  <button class="ProfileTweet-actionButton u-textUserColorHover dropdown-toggle js-dropdown-toggle" type="button">
-      <div class="IconContainer js-tooltip" title="Más">
-        <span class="Icon Icon--caretDownLight Icon--small"></span>
-        <span class="u-hiddenVisually">Más</span>
-      </div>
-  </button>
-  <div class="dropdown-menu is-autoCentered">
-  <div class="dropdown-caret">
-    <div class="caret-outer"></div>
-    <div class="caret-inner"></div>
-  </div>
-  <ul>
-
-      <li class="copy-link-to-tweet js-actionCopyLinkToTweet">
-        <button type="button" class="dropdown-link">Copiar enlace del Tweet</button>
-      </li>
-      <li class="embed-link js-actionEmbedTweet" data-nav="embed_tweet">
-        <button type="button" class="dropdown-link">Insertar Tweet</button>
-      </li>
-  </ul>
-</div>
-
-</div>
-
-  </div>
-
-      </div>
-
-
-
-
-
-        <div class="ReplyingToContextBelowAuthor" data-aria-label-part>
-
-
-    En respuesta a <a class="pretty-link js-user-profile-link" href="/Metallica" data-user-id="238475531" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>Metallica</b></span></a> <a class="pretty-link js-user-profile-link" href="/EMMAUSolidarite" data-user-id="2912493406" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>EMMAUSolidarite</b></span></a> <a class="pretty-link js-user-profile-link" href="/PompiersParis" data-user-id="1342191438" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>PompiersParis</b></span></a>
-
-</div>
-
-
-
-        <div class="js-tweet-text-container">
-  <p class="TweetTextSize  js-tweet-text tweet-text" lang="en" data-aria-label-part="0">Papa Het is looking very well fed with large amounts of hunted game meat. As a big man myself, it&#39;s nice to see him embrace not living in a pretentious place full of hypocritical, smug, self-righteous douchebags. True hunters never let anything go to waste. <a href="/hashtag/RealOrganticLife?src=hash" data-query-source="hashtag_click" class="twitter-hashtag pretty-link js-nav" dir="ltr" ><s>#</s><b>RealOrganticLife</b></a></p>
-</div>
-
-
-
-
-
-
-
-
-
-
-
-
-      <div class="stream-item-footer">
-
-      <div class="ProfileTweet-actionCountList u-hiddenVisually">
-
-
-    <span class="ProfileTweet-action--reply u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-reply-count-aria-1128161549619814400" >0 respuestas</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--retweet u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-retweet-count-aria-1128161549619814400" >0 retweets</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--favorite u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-favorite-count-aria-1128161549619814400" >0 Me gusta</span>
-      </span>
-    </span>
-  </div>
-
-  <div class="ProfileTweet-actionList js-actions" role="group" aria-label="Acciones del Tweet">
-    <div class="ProfileTweet-action ProfileTweet-action--reply">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionReply"
-    data-modal="ProfileTweet-reply" type="button"
-    aria-describedby="profile-tweet-action-reply-count-aria-1128161549619814400">
-    <div class="IconContainer js-tooltip" title="Responder">
-      <span class="Icon Icon--medium Icon--reply"></span>
-      <span class="u-hiddenVisually">Responder</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero ">
-        <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-      </span>
-  </button>
-</div>
-
-    <div class="ProfileTweet-action ProfileTweet-action--retweet js-toggleState js-toggleRt">
-  <button class="ProfileTweet-actionButton  js-actionButton js-actionRetweet"
-
-    data-modal="ProfileTweet-retweet"
-    type="button"
-    aria-describedby="profile-tweet-action-retweet-count-aria-1128161549619814400">
-    <div class="IconContainer js-tooltip" title="Retwittear">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retwittear</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo js-actionButton js-actionRetweet" data-modal="ProfileTweet-retweet" type="button">
-    <div class="IconContainer js-tooltip" title="Deshacer Retweet">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retwitteado</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button>
-</div>
-
-
-    <div class="ProfileTweet-action ProfileTweet-action--favorite js-toggleState">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionFavorite" type="button"
-    aria-describedby="profile-tweet-action-favorite-count-aria-1128161549619814400">
-    <div class="IconContainer js-tooltip" title="Me gusta">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Me gusta</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo ProfileTweet-action--unfavorite u-linkClean js-actionButton js-actionFavorite" type="button">
-    <div class="IconContainer js-tooltip" title="Deshacer me gusta">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Gustado</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button>
-</div>
-
-
-
-
-
-
-  </div>
-
-</div>
-
-
-
-
-
-
-
-
-
-
-
-    </div>
-
-  </div>
-
-
-
-
-<div class="dismiss-module">
-  <div class="dismissed-module">
-    <div class="feedback-actions">
-        <div class="feedback-action" data-feedback-type="DontLike" data-feedback-url="">
-          <div class="action-confirmation dismiss-module-item">Gracias. Twitter usará esto para mejorar tu cronología.
-            <span class="undo-action">Deshacer</span>
-          </div>
-        </div>
-    </div>
-    <div class="child-feedback-confirmation">
-      <div class="child-confirmation-item">
-        <span class="child-confirmation-text"></span>
-        <span class="undo-child-feedback-action">Deshacer</span>
-      </div>
-    </div>
-  </div>
-</div>
-
-</li>
-    </ol>
-  </li>
-
-
-      <li class="ThreadedConversation--loneTweet
-
-  ">
-    <ol class="stream-items">
-      <li class="js-stream-item stream-item stream-item
-" data-item-id="1128070819983368195"
-id="stream-item-tweet-1128070819983368195"
-data-item-type="tweet"
- data-suggestion-json="{&quot;suggestion_details&quot;:{},&quot;tweet_ids&quot;:&quot;1128070819983368195&quot;,&quot;scribe_component&quot;:&quot;tweet&quot;}">
-
-
-
-  <div class="tweet js-stream-tweet js-actionable-tweet js-profile-popup-actionable dismissible-content
-
-
-
-       descendant permalink-descendant-tweet
-"
-
-data-tweet-id="1128070819983368195"
-data-item-id="1128070819983368195"
-data-permalink-path="/Hammoud33308783/status/1128070819983368195"
-data-conversation-id="1128068672289890305"
-
-
- data-has-parent-tweet="true"
-
-data-tweet-nonce="1128070819983368195-6c456bad-83ed-4e2e-8fc4-4671908e8a37"
-data-tweet-stat-initialized="true"
-data-conversation-section-quality="HighQuality"
-
-
-
-
-
-  data-screen-name="Hammoud33308783" data-name="Hammoudi" data-user-id="3346991835"
-  data-you-follow="false"
-  data-follows-you="false"
-  data-you-block="false"
- data-mentions="Metallica EMMAUSolidarite PompiersParis"
-
-data-reply-to-users-json="[{&quot;id_str&quot;:&quot;3346991835&quot;,&quot;screen_name&quot;:&quot;Hammoud33308783&quot;,&quot;name&quot;:&quot;Hammoudi&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Hammoudi&quot;,&quot;emojified_text_as_html&quot;:&quot;Hammoudi&quot;}},{&quot;id_str&quot;:&quot;238475531&quot;,&quot;screen_name&quot;:&quot;Metallica&quot;,&quot;name&quot;:&quot;Metallica&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Metallica&quot;,&quot;emojified_text_as_html&quot;:&quot;Metallica&quot;}},{&quot;id_str&quot;:&quot;2912493406&quot;,&quot;screen_name&quot;:&quot;EMMAUSolidarite&quot;,&quot;name&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;,&quot;emojified_text_as_html&quot;:&quot;EMMA\u00dcS Solidarit\u00e9&quot;}},{&quot;id_str&quot;:&quot;1342191438&quot;,&quot;screen_name&quot;:&quot;PompiersParis&quot;,&quot;name&quot;:&quot;Pompiers de Paris&quot;,&quot;emojified_name&quot;:{&quot;text&quot;:&quot;Pompiers de Paris&quot;,&quot;emojified_text_as_html&quot;:&quot;Pompiers de Paris&quot;}}]"
-
-
-
-
-
-
-
-data-disclosure-type=""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- data-component-context="replies"
-
-
-    >
-
-    <div class="context">
-
-
-    </div>
-
-    <div class="content">
-
-
-
-
-
-      <div class="stream-item-header">
-          <a  class="account-group js-account-group js-action-profile js-user-profile-link js-nav" href="/Hammoud33308783" data-user-id="3346991835">
-      <img class="avatar js-action-profile-avatar" src="https://pbs.twimg.com/profile_images/614575659944411136/zY_lTG1A_bigger.jpg" alt="">
-    <span class="FullNameGroup">
-      <strong class="fullname show-popup-with-id u-textTruncate " data-aria-label-part>Hammoudi</strong><span>&rlm;</span><span class="UserBadges"></span><span class="UserNameBreak">&nbsp;</span></span><span class="username u-dir u-textTruncate" dir="ltr" data-aria-label-part>@<b>Hammoud33308783</b></span></a>
-
-
-        <small class="time">
-  <a href="/Hammoud33308783/status/1128070819983368195" class="tweet-timestamp js-permalink js-nav js-tooltip" title="15:53 - 13 may. 2019"  data-conversation-id="1128068672289890305"><span class="_timestamp js-short-timestamp " data-aria-label-part="last" data-time="1557788016" data-time-ms="1557788016000" data-long-form="true">13 may.</span></a>
-</small>
-
-          <div class="ProfileTweet-action ProfileTweet-action--more js-more-ProfileTweet-actions">
-    <div class="dropdown">
-  <button class="ProfileTweet-actionButton u-textUserColorHover dropdown-toggle js-dropdown-toggle" type="button">
-      <div class="IconContainer js-tooltip" title="Más">
-        <span class="Icon Icon--caretDownLight Icon--small"></span>
-        <span class="u-hiddenVisually">Más</span>
-      </div>
-  </button>
-  <div class="dropdown-menu is-autoCentered">
-  <div class="dropdown-caret">
-    <div class="caret-outer"></div>
-    <div class="caret-inner"></div>
-  </div>
-  <ul>
-
-      <li class="copy-link-to-tweet js-actionCopyLinkToTweet">
-        <button type="button" class="dropdown-link">Copiar enlace del Tweet</button>
-      </li>
-      <li class="embed-link js-actionEmbedTweet" data-nav="embed_tweet">
-        <button type="button" class="dropdown-link">Insertar Tweet</button>
-      </li>
-  </ul>
-</div>
-
-</div>
-
-  </div>
-
-      </div>
-
-
-
-
-
-        <div class="ReplyingToContextBelowAuthor" data-aria-label-part>
-
-
-    En respuesta a <a class="pretty-link js-user-profile-link" href="/Metallica" data-user-id="238475531" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>Metallica</b></span></a> <a class="pretty-link js-user-profile-link" href="/EMMAUSolidarite" data-user-id="2912493406" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>EMMAUSolidarite</b></span></a> <a class="pretty-link js-user-profile-link" href="/PompiersParis" data-user-id="1342191438" rel="noopener" dir="ltr"><span class="username u-dir u-textTruncate" dir="ltr" >@<b>PompiersParis</b></span></a>
-
-</div>
-
-
-
-        <div class="js-tweet-text-container">
-  <p class="TweetTextSize  js-tweet-text tweet-text" lang="en" data-aria-label-part="0">Thank you very much !!! Im fan of Metallica since 1982 guys !! You are my family !!<img class="Emoji Emoji--forText" src="https://abs.twimg.com/emoji/v2/72x72/1f44d.png" draggable="false" alt="👍" title="Signo de pulgar hacia arriba" aria-label="Emoji: Signo de pulgar hacia arriba"><img class="Emoji Emoji--forText" src="https://abs.twimg.com/emoji/v2/72x72/1f44d.png" draggable="false" alt="👍" title="Signo de pulgar hacia arriba" aria-label="Emoji: Signo de pulgar hacia arriba"><img class="Emoji Emoji--forText" src="https://abs.twimg.com/emoji/v2/72x72/1f44d.png" draggable="false" alt="👍" title="Signo de pulgar hacia arriba" aria-label="Emoji: Signo de pulgar hacia arriba"><img class="Emoji Emoji--forText" src="https://abs.twimg.com/emoji/v2/72x72/1f44d.png" draggable="false" alt="👍" title="Signo de pulgar hacia arriba" aria-label="Emoji: Signo de pulgar hacia arriba"><img class="Emoji Emoji--forText" src="https://abs.twimg.com/emoji/v2/72x72/1f44b.png" draggable="false" alt="👋" title="Signo de mano saludando" aria-label="Emoji: Signo de mano saludando"><img class="Emoji Emoji--forText" src="https://abs.twimg.com/emoji/v2/72x72/1f44b.png" draggable="false" alt="👋" title="Signo de mano saludando" aria-label="Emoji: Signo de mano saludando"><img class="Emoji Emoji--forText" src="https://abs.twimg.com/emoji/v2/72x72/1f44b.png" draggable="false" alt="👋" title="Signo de mano saludando" aria-label="Emoji: Signo de mano saludando"><img class="Emoji Emoji--forText" src="https://abs.twimg.com/emoji/v2/72x72/1f44b.png" draggable="false" alt="👋" title="Signo de mano saludando" aria-label="Emoji: Signo de mano saludando"><img class="Emoji Emoji--forText" src="https://abs.twimg.com/emoji/v2/72x72/1f918.png" draggable="false" alt="🤘" title="Señal de los cuernos" aria-label="Emoji: Señal de los cuernos"><img class="Emoji Emoji--forText" src="https://abs.twimg.com/emoji/v2/72x72/1f918.png" draggable="false" alt="🤘" title="Señal de los cuernos" aria-label="Emoji: Señal de los cuernos"><img class="Emoji Emoji--forText" src="https://abs.twimg.com/emoji/v2/72x72/1f918.png" draggable="false" alt="🤘" title="Señal de los cuernos" aria-label="Emoji: Señal de los cuernos"><img class="Emoji Emoji--forText" src="https://abs.twimg.com/emoji/v2/72x72/1f918.png" draggable="false" alt="🤘" title="Señal de los cuernos" aria-label="Emoji: Señal de los cuernos"><img class="Emoji Emoji--forText" src="https://abs.twimg.com/emoji/v2/72x72/1f1eb-1f1f7.png" draggable="false" alt="🇫🇷" title="Bandera de Francia" aria-label="Emoji: Bandera de Francia"><img class="Emoji Emoji--forText" src="https://abs.twimg.com/emoji/v2/72x72/1f1eb-1f1f7.png" draggable="false" alt="🇫🇷" title="Bandera de Francia" aria-label="Emoji: Bandera de Francia"><img class="Emoji Emoji--forText" src="https://abs.twimg.com/emoji/v2/72x72/1f1eb-1f1f7.png" draggable="false" alt="🇫🇷" title="Bandera de Francia" aria-label="Emoji: Bandera de Francia"><img class="Emoji Emoji--forText" src="https://abs.twimg.com/emoji/v2/72x72/1f1eb-1f1f7.png" draggable="false" alt="🇫🇷" title="Bandera de Francia" aria-label="Emoji: Bandera de Francia"></p>
-</div>
-
-
-
-
-
-
-
-
-
-
-
-
-      <div class="stream-item-footer">
-
-      <div class="ProfileTweet-actionCountList u-hiddenVisually">
-
-
-    <span class="ProfileTweet-action--reply u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-reply-count-aria-1128070819983368195" >0 respuestas</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--retweet u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-retweet-count-aria-1128070819983368195" >0 retweets</span>
-      </span>
-    </span>
-    <span class="ProfileTweet-action--favorite u-hiddenVisually">
-      <span class="ProfileTweet-actionCount" aria-hidden="true" data-tweet-stat-count="0">
-        <span class="ProfileTweet-actionCountForAria" id="profile-tweet-action-favorite-count-aria-1128070819983368195" >0 Me gusta</span>
-      </span>
-    </span>
-  </div>
-
-  <div class="ProfileTweet-actionList js-actions" role="group" aria-label="Acciones del Tweet">
-    <div class="ProfileTweet-action ProfileTweet-action--reply">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionReply"
-    data-modal="ProfileTweet-reply" type="button"
-    aria-describedby="profile-tweet-action-reply-count-aria-1128070819983368195">
-    <div class="IconContainer js-tooltip" title="Responder">
-      <span class="Icon Icon--medium Icon--reply"></span>
-      <span class="u-hiddenVisually">Responder</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero ">
-        <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-      </span>
-  </button>
-</div>
-
-    <div class="ProfileTweet-action ProfileTweet-action--retweet js-toggleState js-toggleRt">
-  <button class="ProfileTweet-actionButton  js-actionButton js-actionRetweet"
-
-    data-modal="ProfileTweet-retweet"
-    type="button"
-    aria-describedby="profile-tweet-action-retweet-count-aria-1128070819983368195">
-    <div class="IconContainer js-tooltip" title="Retwittear">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retwittear</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo js-actionButton js-actionRetweet" data-modal="ProfileTweet-retweet" type="button">
-    <div class="IconContainer js-tooltip" title="Deshacer Retweet">
-      <span class="Icon Icon--medium Icon--retweet"></span>
-      <span class="u-hiddenVisually">Retwitteado</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button>
-</div>
-
-
-    <div class="ProfileTweet-action ProfileTweet-action--favorite js-toggleState">
-  <button class="ProfileTweet-actionButton js-actionButton js-actionFavorite" type="button"
-    aria-describedby="profile-tweet-action-favorite-count-aria-1128070819983368195">
-    <div class="IconContainer js-tooltip" title="Me gusta">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Me gusta</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button><button class="ProfileTweet-actionButtonUndo ProfileTweet-action--unfavorite u-linkClean js-actionButton js-actionFavorite" type="button">
-    <div class="IconContainer js-tooltip" title="Deshacer me gusta">
-      <span role="presentation" class="Icon Icon--heart Icon--medium"></span>
-      <div class="HeartAnimation"></div>
-      <span class="u-hiddenVisually">Gustado</span>
-    </div>
-      <span class="ProfileTweet-actionCount ProfileTweet-actionCount--isZero">
-    <span class="ProfileTweet-actionCountForPresentation" aria-hidden="true"></span>
-  </span>
-
-  </button>
-</div>
-
-
-
-
-
-
-  </div>
-
-</div>
-
-
-
-
-
-
-
-
-
-
-
-    </div>
-
-  </div>
-
-
-
-
-<div class="dismiss-module">
-  <div class="dismissed-module">
-    <div class="feedback-actions">
-        <div class="feedback-action" data-feedback-type="DontLike" data-feedback-url="">
-          <div class="action-confirmation dismiss-module-item">Gracias. Twitter usará esto para mejorar tu cronología.
-            <span class="undo-action">Deshacer</span>
-          </div>
-        </div>
-    </div>
-    <div class="child-feedback-confirmation">
-      <div class="child-confirmation-item">
-        <span class="child-confirmation-text"></span>
-        <span class="undo-child-feedback-action">Deshacer</span>
-      </div>
-    </div>
-  </div>
-</div>
-
-</li>
-    </ol>
-  </li>
-
-
-
-
-
-
-
-        </ol>
-        <div class="stream-footer ">
-  <div class="timeline-end has-items has-more-items">
-      <div class="stream-end">
-    <div class="stream-end-inner">
-        <span class="Icon Icon--large Icon--logo"></span>
-
-      <p class="empty-text">
-
-
-      </p>
-
-        <p><button type="button" class="btn-link back-to-top hidden">Volver arriba &uarr;</button></p>
-    </div>
-  </div>
-
-
-    <div class="stream-loading">
-  <div class="stream-end-inner">
-    <span class="spinner" title="Cargando..."></span>
-  </div>
-</div>
-
-  </div>
-</div>
-<div class="stream-fail-container">
-    <div class="js-stream-whale-end stream-whale-end stream-placeholder centered-placeholder">
-  <div class="stream-end-inner">
-    <h2 class="title">Parece que el contenido está tardando un poco en cargarse.</h2>
-    <p>
-      Puede que Twitter esté saturado o experimentando un problema momentáneo.
- <a role="button" href="#" class="try-again-after-whale">Inténtalo
- de nuevo</a> o visita el <a target="_blank" href="http://status.twitter.com" rel="noopener">Estado de Twitter</a> para más
-información.
+    .errorButton {
+      margin: 3em 0;
+    }
+
+    .errorButton a {
+      background: #1DA1F2;
+      border-radius: 2.5em;
+      color: white;
+      padding: 1em 2em;
+      text-decoration: none;
+    }
+
+    .errorButton a:hover,
+    .errorButton a:focus {
+      background: rgb(26, 145, 218);
+    }
+
+    .errorFooter {
+      color: #657786;
+      font-size: 80%;
+      line-height: 1.5;
+      padding: 1em 0;
+    }
+
+    .errorFooter a,
+    .errorFooter a:visited {
+      color: #657786;
+      text-decoration: none;
+      padding-right: 1em;
+    }
+
+    .errorFooter a:hover,
+    .errorFooter a:active {
+      text-decoration: underline;
+    }
+
+      #placeholder,
+      #react-root {
+        display: none !important;
+      }
+      body {
+        background-color: #FFF !important;
+      }
+    </style>
+    <div class="errorContainer">
+      <img width="46" height="38" srcset="https://abs.twimg.com/errors/logo46x38.png 1x, https://abs.twimg.com/errors/logo46x38@2x.png 2x" src="https://abs.twimg.com/errors/logo46x38.png" alt="Twitter">
+      <h1>JavaScript is not available.</h1>
+      <p>We’ve detected that JavaScript is disabled in this browser. Please enable JavaScript or switch to a supported browser to continue using twitter.com. You can see a list of supported browsers in our Help Center.</p>
+      <p class="errorButton"><a href="https://help.twitter.com/using-twitter/twitter-supported-browsers">Help Center</a></p>
+    <p class="errorFooter">
+      <a href="https://twitter.com/tos">Terms of Service</a>
+      <a href="https://twitter.com/privacy">Privacy Policy</a>
+      <a href="https://support.twitter.com/articles/20170514">Cookie Policy</a>
+      <a href="https://legal.twitter.com/imprint.html">Imprint</a>
+      <a href="https://business.twitter.com/en/help/troubleshooting/how-twitter-ads-work.html?ref=web-twc-ao-gbl-adsinfo&amp;utm_source=twc&amp;utm_medium=web&amp;utm_campaign=ao&amp;utm_content=adsinfo">Ads info</a>
+      © 2023 X Corp.
     </p>
-  </div>
-</div>
-</div>
 
-      <ol class="hidden-replies-container"></ol>
-    </div>
-  </div>
-      </div>
     </div>
+  </noscript>
+<div id="react-root" style="height:100%;display:flex;"><div class="css-1dbjc4n r-13awgt0 r-12vffkv"><div class="css-1dbjc4n r-13awgt0 r-12vffkv"><div class="css-1dbjc4n r-13qz1uu r-417010" style="min-height:736px">
+<div aria-label="Skip to home timeline" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1niwhzg r-1ets6dv r-sdzlij r-1phboty r-4iw3lz r-1xk2f4g r-109y4c4 r-2yi16 r-1qi8awa r-1ny4l3l r-1udh08x r-wwvuq4 r-u8s1d r-o7ynqc r-6416eg r-lrvibr r-92ng3h"><div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-18u37iz r-16y2uox r-37j5jr r-a023e6 r-b88u0q r-1777fci r-rjixqe r-bcqeeo r-q4m81j r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-a023e6 r-rjixqe r-bcqeeo r-qvutc0"></span></div></div>
+<div aria-label="Skip to trending" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1niwhzg r-1ets6dv r-sdzlij r-1phboty r-4iw3lz r-1xk2f4g r-109y4c4 r-2yi16 r-1qi8awa r-1ny4l3l r-1udh08x r-wwvuq4 r-u8s1d r-o7ynqc r-6416eg r-lrvibr r-92ng3h"><div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-18u37iz r-16y2uox r-37j5jr r-a023e6 r-b88u0q r-1777fci r-rjixqe r-bcqeeo r-q4m81j r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-a023e6 r-rjixqe r-bcqeeo r-qvutc0"></span></div></div>
+<header role="banner" class="css-1dbjc4n r-lrvibr r-1g40b8q"><div class="css-1dbjc4n r-1h3ijdo r-orgf3d r-633pao"></div>
+<div class="css-1dbjc4n" data-testid="SSRSafeLayer"><div class="css-1dbjc4n r-1d2f490 r-1xcajam r-zchlnj r-1gn8etr">
+<div class="css-1dbjc4n r-1e5uvyk r-6026j r-16e0dcy r-dkhcqf r-axxi2z r-18jm5s1" data-testid="TopNavBar"><div class="css-1dbjc4n r-1jgb5lz r-13qz1uu"><div class="css-1dbjc4n r-fxvszc r-136ojw6" data-testid="twitter-logged-out-nav">
+<div class="css-1dbjc4n r-1h3ijdo r-136ojw6"><div class="css-1dbjc4n"><div class="css-1dbjc4n r-1h3ijdo"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1h3ijdo r-1777fci r-1jgb5lz r-ymttw5 r-13qz1uu">
+<div class="css-1dbjc4n r-1habvwh r-1pz39u2 r-1777fci r-15ysp7h r-s8bhmr"><div class="css-1dbjc4n r-1777fci r-1mf7evn"><h1 role="heading" class="css-4rbku5 css-1dbjc4n r-1awozwy r-1pz39u2 r-1loqt21 r-6koalj r-16y2uox r-1777fci r-4wgw6l"><a href="/" aria-label="Twitter" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1niwhzg r-42olwf r-sdzlij r-1phboty r-rs99b7 r-1loqt21 r-2yi16 r-1qi8awa r-1ny4l3l r-o7ynqc r-6416eg r-lrvibr" style="margin-left:calc(0px + (-1 * ((36px + (1px * 2)) - 1.75rem) / 2))"><div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-18u37iz r-16y2uox r-37j5jr r-a023e6 r-b88u0q r-1777fci r-rjixqe r-bcqeeo r-q4m81j r-qvutc0" style="color:rgba(15,20,25,1.00)">
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-1cvl2hr r-4qtqp9 r-yyyyoo r-16y2uox r-lwhw9o r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-19wmn03"><g><path d="M23.643 4.937c-.835.37-1.732.62-2.675.733.962-.576 1.7-1.49 2.048-2.578-.9.534-1.897.922-2.958 1.13-.85-.904-2.06-1.47-3.4-1.47-2.572 0-4.658 2.086-4.658 4.66 0 .364.042.718.12 1.06-3.873-.195-7.304-2.05-9.602-4.868-.4.69-.63 1.49-.63 2.342 0 1.616.823 3.043 2.072 3.878-.764-.025-1.482-.234-2.11-.583v.06c0 2.257 1.605 4.14 3.737 4.568-.392.106-.803.162-1.227.162-.3 0-.593-.028-.877-.082.593 1.85 2.313 3.198 4.352 3.234-1.595 1.25-3.604 1.995-5.786 1.995-.376 0-.747-.022-1.112-.065 2.062 1.323 4.51 2.093 7.14 2.093 8.57 0 13.255-7.098 13.255-13.254 0-.2-.005-.402-.014-.602.91-.658 1.7-1.477 2.323-2.41z"></path></g></svg><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-a023e6 r-rjixqe r-bcqeeo r-qvutc0"></span>
+</div></a></h1></div></div>
+<div class="css-1dbjc4n r-16y2uox r-1wbh5a2 r-1pi2tsx r-1777fci">
+<div class="css-1dbjc4n r-1habvwh"></div>
+<div class="css-1dbjc4n r-1awozwy r-1iusvr4 r-18u37iz r-16y2uox"><div class="css-1dbjc4n r-1oszu61 r-1iusvr4 r-18u37iz r-16y2uox"><div class="css-1dbjc4n r-13awgt0 r-eqz5dr r-bnwqim r-8fdsdq"><div class="r-1oszu61 r-vqxq0j r-deolkf r-6koalj r-1mlwlqe r-eqz5dr r-1wbh5a2 r-crgep1 r-ifefl9 r-bcqeeo r-t60dpp r-bnwqim r-13qz1uu r-417010"><form action="#" aria-label="Search Twitter" role="search" class="r-1oszu61 r-1phboty r-1yadl64 r-deolkf r-6koalj r-13awgt0 r-eqz5dr r-crgep1 r-ifefl9 r-bcqeeo r-t60dpp r-bnwqim r-417010">
+<div class="css-1dbjc4n r-1wbh5a2"><div class="css-1dbjc4n r-1sw30gj r-42olwf r-sdzlij r-1phboty r-rs99b7 r-eqz5dr r-16y2uox r-1wbh5a2 r-1777fci"><div class="css-1dbjc4n"><div class="css-1dbjc4n r-1awozwy r-18u37iz"><label class="css-1dbjc4n r-1dqbpge r-13awgt0 r-18u37iz" data-testid="SearchBox_Search_Input_label"><div class="css-1dbjc4n r-7q8q6z r-6koalj r-1777fci"><svg viewbox="0 0 24 24" aria-hidden="true" class="r-14j79pv r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-4wgw6l r-f727ji r-bnwqim r-1plcrui r-lrvibr"><g><path d="M10.25 3.75c-3.59 0-6.5 2.91-6.5 6.5s2.91 6.5 6.5 6.5c1.795 0 3.419-.726 4.596-1.904 1.178-1.177 1.904-2.801 1.904-4.596 0-3.59-2.91-6.5-6.5-6.5zm-8.5 6.5c0-4.694 3.806-8.5 8.5-8.5s8.5 3.806 8.5 8.5c0 1.986-.682 3.815-1.824 5.262l4.781 4.781-1.414 1.414-4.781-4.781c-1.447 1.142-3.276 1.824-5.262 1.824-4.694 0-8.5-3.806-8.5-8.5z"></path></g></svg></div>
+<div class="css-1dbjc4n r-16y2uox r-1wbh5a2"><div dir="ltr" class="css-901oao r-6koalj r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><input type="text" aria-activedescendant="typeaheadFocus-0.6013879544345411" aria-autocomplete="list" aria-label="Search query" aria-owns="typeaheadDropdown-139588" autocapitalize="sentences" autocomplete="off" autocorrect="off" placeholder="Search Twitter" role="combobox" spellcheck="false" value="" enterkeyhint="search" dir="auto" class="r-30o5oe r-1niwhzg r-17gur6a r-1yadl64 r-deolkf r-homxoj r-poiln3 r-7cikom r-1ny4l3l r-xyw6el r-oyd9sg r-y0fyvk r-1dz5y72 r-fdjqy7 r-13qz1uu" data-testid="SearchBox_Search_Input"></div></div>
+<div class="css-1dbjc4n r-6koalj r-1777fci"></div></label></div></div></div></div>
+<div class="css-1dbjc4n r-13awgt0 r-bnwqim"></div>
+</form></div></div></div></div>
 </div>
-
-
-
-  </div>
-
-
-  <div class="stream-container suggested-tweet-stream-container dismissible-container u-hidden">
-    <div class="stream suggested-tweet-stream permalink-replies">
-      <h3 class="promoted-heading">Tweet promocionado</h3>
-      <ol class="stream-items suggested-tweet-stream-items js-navigable-stream" id="suggested-stream-items-id">
-
-      </ol>
-    </div>
-   </div>
-
-    <div class="module Trends trends hidden Trends--wide">
-  <div class="trends-inner">
-    <div class="flex-module trends-container ">
-  <div class="flex-module-header">
-
-    <h3><span class="trend-location js-trend-location">false</span></h3>
-  </div>
-  <div class="flex-module-inner">
-    <ul class="trend-items js-trends">
-    </ul>
-  </div>
+<div class="css-1dbjc4n r-obd0qt r-1pz39u2 r-1777fci r-15ysp7h r-s8bhmr"><div aria-expanded="false" aria-haspopup="menu" aria-label="More" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1niwhzg r-42olwf r-sdzlij r-1phboty r-rs99b7 r-2yi16 r-1qi8awa r-1ny4l3l r-o7ynqc r-6416eg r-lrvibr" style="margin-right:calc(4px + (-1 * ((36px + (1px * 2)) - 20px) / 2))"><div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-18u37iz r-16y2uox r-37j5jr r-a023e6 r-b88u0q r-1777fci r-rjixqe r-bcqeeo r-q4m81j r-qvutc0" style="color:rgba(15,20,25,1.00)">
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-z80fyv r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-19wmn03" style="color:rgba(15,20,25,1.00)"><g><path d="M3 12c0-1.1.9-2 2-2s2 .9 2 2-.9 2-2 2-2-.9-2-2zm9 2c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm7 0c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2z"></path></g></svg><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-a023e6 r-rjixqe r-bcqeeo r-qvutc0" style="border-bottom:2px solid #0F1419"></span>
+</div></div></div>
+</div></div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-16y2uox r-1w6e6rj r-1h3ijdo r-1wtj0ep r-1fz3rvf r-rjfia"><div class="css-1dbjc4n r-1awozwy r-1pz39u2 r-18u37iz r-16y2uox"><div class="css-1dbjc4n r-1awozwy r-1pz39u2 r-18u37iz r-16y2uox">
+<div class="css-1dbjc4n r-16y2uox"><a href="/login" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1niwhzg r-1ets6dv r-sdzlij r-1phboty r-rs99b7 r-1loqt21 r-15ysp7h r-4wgw6l r-1ny4l3l r-ymttw5 r-o7ynqc r-6416eg r-lrvibr" data-testid="login"><div dir="ltr" class="css-901oao r-1awozwy r-1cvl2hr r-6koalj r-18u37iz r-16y2uox r-37j5jr r-a023e6 r-b88u0q r-1777fci r-rjixqe r-bcqeeo r-q4m81j r-qvutc0"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-1b43r93 r-1cwl3u0 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Log in</span></span></div></a></div>
+<div class="css-1dbjc4n r-16y2uox r-19u6a5r"><a href="/i/flow/signup" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-l5o3uw r-42olwf r-sdzlij r-1phboty r-rs99b7 r-1loqt21 r-15ysp7h r-4wgw6l r-1ny4l3l r-ymttw5 r-o7ynqc r-6416eg r-lrvibr" data-testid="signup"><div dir="ltr" class="css-901oao r-1awozwy r-jwli3a r-6koalj r-18u37iz r-16y2uox r-37j5jr r-a023e6 r-b88u0q r-1777fci r-rjixqe r-bcqeeo r-q4m81j r-qvutc0"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-1b43r93 r-1cwl3u0 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Sign up</span></span></div></a></div>
+</div></div></div>
+</div></div></div>
+<div class="css-1dbjc4n r-633pao r-u8s1d r-dkhcqf r-axxi2z r-18jm5s1 r-13qz1uu r-1wyyakw" style="-webkit-transform:translate3d(0, 0, 0) translateY(53px);transform:translate3d(0, 0, 0) translateY(53px)"><div class="css-1dbjc4n r-1jgb5lz r-13qz1uu"><div class="css-1dbjc4n r-1awozwy r-1777fci r-1jgb5lz r-19u6a5r r-13qz1uu"><div role="status" class="css-1dbjc4n r-1r5su4o r-orgf3d r-1lul07w r-eafdt9 r-1b8bd59 r-nx0j10"><div aria-label="New Tweets are available. Push the period key to go to the them." role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-l5o3uw r-sdzlij r-y3da5r r-1777fci r-1ny4l3l r-ymttw5 r-oyd9sg r-o7ynqc r-6416eg"><div class="css-1dbjc4n r-18u37iz">
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-1kihuf0 r-jwli3a r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-19wmn03"><g><path d="M12 3.59l7.457 7.45-1.414 1.42L13 7.41V21h-2V7.41l-5.043 5.05-1.414-1.42L12 3.59z"></path></g></svg><div dir="ltr" class="css-901oao css-1hf3ou5 r-1kihuf0 r-jwli3a r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-13hce6t r-bcqeeo r-qvutc0" data-testid="pillLabel"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">See new Tweets</span></div>
+</div></div></div></div></div></div>
+</div></div></header><main role="main" class="css-1dbjc4n r-16y2uox r-1wbh5a2"><div class="css-1dbjc4n r-150rngu r-16y2uox r-1wbh5a2"><div class="css-1dbjc4n r-aqfbo4 r-16y2uox"><div class="css-1dbjc4n r-1oszu61 r-1niwhzg r-18u37iz r-16y2uox r-1jgb5lz r-2llsf r-13qz1uu"><div class="css-1dbjc4n r-14lw9ot r-42olwf r-1ljd8xs r-13l2t4g r-1phboty r-16y2uox r-1jgb5lz r-13qz1uu r-184en5c" data-testid="primaryColumn"><div aria-label="Home timeline" tabindex="0" class="css-1dbjc4n"><div itemscope="" itemtype="https://schema.org/Collection">
+<meta content="Tweet with replies" itemprop="name">
+<section aria-labelledby="accessible-list-62189" role="region" class="css-1dbjc4n"><h1 dir="auto" aria-level="1" role="heading" class="css-4rbku5 css-901oao r-4iw3lz r-1xk2f4g r-109y4c4 r-1udh08x r-wwvuq4 r-u8s1d r-92ng3h" id="accessible-list-62189">Conversation</h1>
+<div aria-label="Timeline: Conversation" class="css-1dbjc4n"><div class="css-1dbjc4n">
+<div class="css-1dbjc4n r-j5o65s r-qklmqi r-1adg3ll r-1ny4l3l"><div itemprop="hasPart" itemscope="" itemtype="https://schema.org/SocialMediaPosting">
+<meta content="1128068672289890305" itemprop="identifier">
+<meta content="1" itemprop="position">
+<meta content="21" itemprop="commentCount">
+<meta content="" itemprop="contentRating">
+<meta content="2019-05-13T22:45:04.000Z" itemprop="dateCreated">
+<meta content="2019-05-13T22:45:04.000Z" itemprop="datePublished">
+<meta content="https://twitter.com/Metallica/status/1128068672289890305" itemprop="url">
+<meta content="https://twitter.com/Metallica/status/1128068672289890305" itemprop="mainEntityOfPage">
+<div itemprop="author" itemscope="" itemtype="https://schema.org/Person">
+<meta content="238475531" itemprop="identifier">
+<meta content="Metallica" itemprop="additionalName">
+<meta content="Metallica" itemprop="givenName">
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/FollowAction" itemprop="interactionType">
+<meta content="Likes" itemprop="name">
+<meta content="6201953" itemprop="userInteractionCount">
 </div>
-
-  </div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/SubscribeAction" itemprop="interactionType">
+<meta content="Retweets" itemprop="name">
+<meta content="36" itemprop="userInteractionCount">
 </div>
-
-
-  <div class="permalink-footer">
-      <div class="Footer module roaming-module Footer--slim"
-  >
-  <div class="flex-module">
-    <div class="flex-module-inner js-items-container">
-      <ul class="u-cf">
-        <li class="Footer-item Footer-copyright copyright">&copy; 2019 Twitter</li>
-        <li class="Footer-item"><a class="Footer-link" href="/about" rel="noopener">Sobre nosotros</a></li>
-        <li class="Footer-item"><a class="Footer-link" href="//support.twitter.com" rel="noopener">Centro de Ayuda</a></li>
-        <li class="Footer-item"><a class="Footer-link" href="/tos" rel="noopener">Condiciones</a></li>
-        <li class="Footer-item"><a class="Footer-link" href="/privacy" rel="noopener">Política de privacidad</a></li>
-        <li class="Footer-item"><a class="Footer-link" href="//support.twitter.com/articles/20170514" rel="noopener">Cookies</a></li>
-        <li class="Footer-item"><a class="Footer-link" href="//business.twitter.com/en/help/troubleshooting/how-twitter-ads-work.html" rel="noopener">Información sobre anuncios</a></li>
-      </ul>
-    </div>
-  </div>
-
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/LikeAction" itemprop="interactionType">
+<meta content="Quotes" itemprop="name">
+<meta content="5640" itemprop="userInteractionCount">
 </div>
-
-  </div>
 </div>
-
-
-      </div>
-    </div>
-  </div>
+<meta content="https://twitter.com/AWMHFoundation/status/1127646016931487744" itemprop="isBasedOn">
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/LikeAction" itemprop="interactionType">
+<meta content="Likes" itemprop="name">
+<meta content="https://twitter.com/Metallica/status/1128068672289890305/likes" itemprop="url">
+<meta content="1424" itemprop="userInteractionCount">
 </div>
-
-    <div class="hidden" id="hidden-content">
-  <iframe aria-hidden="true" class="tweet-post-iframe" name="tweet-post-iframe"></iframe>
-  <iframe aria-hidden="true" class="dm-post-iframe" name="dm-post-iframe"></iframe>
-
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Retweets" itemprop="name">
+<meta content="https://twitter.com/Metallica/status/1128068672289890305/retweets" itemprop="url">
+<meta content="171" itemprop="userInteractionCount">
 </div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Quotes" itemprop="name">
+<meta content="https://twitter.com/Metallica/status/1128068672289890305/retweets/with_comments" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Replies" itemprop="name">
+<meta content="https://twitter.com/Metallica/status/1128068672289890305" itemprop="url">
+<meta content="21" itemprop="userInteractionCount">
+</div>
+<article aria-labelledby="id__7niw2xrn83p id__wiaodv8wbng id__l1qvmbpbn5 id__mptyoylc8ya id__k6dqn3tgyyp id__gp902kqdw7d id__rvp2ny97qj id__f6nt4i3i067 id__hg2hl2vkp0k id__joscq79mhk id__k6mh68isd1 id__gg1kalgjw4t id__2w5b4v3q2m8 id__nnd3mx6ihvn id__ydnjvea5f1 id__2fdcpu82ok5 id__vxje9y78up id__xu65rqh5er id__9qyczaa555" role="article" tabindex="-1" class="css-1dbjc4n r-18u37iz r-1ny4l3l r-1udh08x r-1qhn6m8 r-i023vh" data-testid="tweet"><div class="css-1dbjc4n r-eqz5dr r-16y2uox r-1wbh5a2"><div class="css-1dbjc4n r-16y2uox r-1wbh5a2 r-1ny4l3l">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-18u37iz"><div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-ttdzmv"></div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-15zivkp">
+<div class="css-1dbjc4n r-1awozwy r-1hwvwag r-18kxxzh r-1b7u577"><div class="css-1dbjc4n" data-testid="Tweet-User-Avatar"><div class="css-1dbjc4n r-18kxxzh r-1wbh5a2 r-13qz1uu"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1adg3ll r-h3s6tt r-bztko3" style="width:48px" data-testid="UserAvatar-Container-Metallica">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-1adg3ll r-1pi2tsx r-1wyvozj r-bztko3 r-u8s1d r-1v2oles r-desppf r-13qz1uu">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-ggadg3 r-u8s1d r-8jfcpp" style="-webkit-clip-path:url(#shape-square);clip-path:url(#shape-square);height:calc(100% - -4px);width:calc(100% - -4px)"><a href="/Metallica" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1niwhzg r-1loqt21 r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"><div class="css-1dbjc4n r-1wyvozj r-633pao r-u8s1d r-1v2oles r-desppf" style="-webkit-clip-path:url(#shape-square);clip-path:url(#shape-square);height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1niwhzg r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-1wyvozj r-633pao r-u8s1d r-1v2oles r-desppf" style="-webkit-clip-path:url(#shape-square-rx-8);clip-path:url(#shape-square-rx-8);height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-14lw9ot r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-14lw9ot r-1wyvozj r-633pao r-u8s1d r-1v2oles r-desppf" style="-webkit-clip-path:url(#shape-square-rx-8);clip-path:url(#shape-square-rx-8);height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1adg3ll r-1udh08x" style="background-color:rgba(185,202,211,1.00)">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="Square profile picture" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/profile_images/1597280886809952256/gsJvGiqU_400x400.jpg")'></div>
+<img alt="Square profile picture" draggable="true" src="https://pbs.twimg.com/profile_images/1597280886809952256/gsJvGiqU_400x400.jpg" class="css-9pa8cd">
+</div></div>
+</div></div>
+<div class="css-1dbjc4n r-1wyvozj r-u8s1d r-1v2oles r-desppf" style="-webkit-clip-path:url(#shape-square-rx-8);clip-path:url(#shape-square-rx-8);height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-12181gd r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"></div></div></a></div></div>
+</div></div>
+</div></div></div></div></div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-1777fci"><div class="css-1dbjc4n r-zl2h9q"><div class="css-1dbjc4n r-k4xj1c r-18u37iz r-1wtj0ep"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs r-1ny4l3l" id="id__k6dqn3tgyyp" data-testid="User-Name">
+<div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/Metallica" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs">
+<div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-37j5jr r-a023e6 r-b88u0q r-rjixqe r-bcqeeo r-1udh08x r-3s2u2q r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Metallica</span></span></div>
+<div dir="ltr" class="css-901oao r-xoduu5 r-18u37iz r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 r-1awozwy r-xoduu5 r-poiln3 r-bcqeeo r-qvutc0"><svg viewbox="0 0 22 22" aria-label="Verified account" role="img" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-9cviqr r-f9ja8p r-og9te1 r-bnwqim r-1plcrui r-lrvibr" data-testid="icon-verified"><g><lineargradient gradientunits="userSpaceOnUse" id="18690-a" x1="4.411" x2="18.083" y1="2.495" y2="21.508"><stop offset="0" stop-color="#f4e72a"></stop><stop offset=".539" stop-color="#cd8105"></stop><stop offset=".68" stop-color="#cb7b00"></stop><stop offset="1" stop-color="#f4ec26"></stop><stop offset="1" stop-color="#f4e72a"></stop></lineargradient><lineargradient gradientunits="userSpaceOnUse" id="18690-b" x1="5.355" x2="16.361" y1="3.395" y2="19.133"><stop offset="0" stop-color="#f9e87f"></stop><stop offset=".406" stop-color="#e2b719"></stop><stop offset=".989" stop-color="#e2b719"></stop></lineargradient><g clip-rule="evenodd" fill-rule="evenodd"><path d="M13.324 3.848L11 1.6 8.676 3.848l-3.201-.453-.559 3.184L2.06 8.095 3.48 11l-1.42 2.904 2.856 1.516.559 3.184 3.201-.452L11 20.4l2.324-2.248 3.201.452.559-3.184 2.856-1.516L18.52 11l1.42-2.905-2.856-1.516-.559-3.184zm-7.09 7.575l3.428 3.428 5.683-6.206-1.347-1.247-4.4 4.795-2.072-2.072z" fill="url(#18690-a)"></path><path d="M13.101 4.533L11 2.5 8.899 4.533l-2.895-.41-.505 2.88-2.583 1.37L4.2 11l-1.284 2.627 2.583 1.37.505 2.88 2.895-.41L11 19.5l2.101-2.033 2.895.41.505-2.88 2.583-1.37L17.8 11l1.284-2.627-2.583-1.37-.505-2.88zm-6.868 6.89l3.429 3.428 5.683-6.206-1.347-1.247-4.4 4.795-2.072-2.072z" fill="url(#18690-b)"></path><path d="M6.233 11.423l3.429 3.428 5.65-6.17.038-.033-.005 1.398-5.683 6.206-3.429-3.429-.003-1.405.005.003z" fill="#d18800"></path></g></g></svg></span></div>
+</div></a></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1wbh5a2"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/Metallica" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div dir="ltr" class="css-901oao css-1hf3ou5 r-14j79pv r-18u37iz r-37j5jr r-1wvb978 r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">@Metallica</span></div></a></div></div></div>
+</div></div></div></div></div></div>
+</div>
+<div class="css-1dbjc4n">
+<div class="css-1dbjc4n r-1habvwh"></div>
+<div class="css-1dbjc4n"><div itemprop="articleBody" data-testid="tweetTextAnnotations"><div class="css-1dbjc4n r-1s2bzr4"><div dir="auto" lang="en" class="css-901oao r-37j5jr r-1inkyih r-16dba41 r-rjixqe r-bcqeeo r-bnwqim r-qvutc0" style="color:rgba(15,20,25,1.00)" id="id__k6mh68isd1" data-testid="tweetText">
+<span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Thank you to everyone who came out for </span><span class="r-18u37iz"><a dir="ltr" href="/hashtag/MetInParis?src=hashtag_click" role="link" class="css-4rbku5 css-18t94o4 css-901oao css-16my406 r-1cvl2hr r-1loqt21 r-poiln3 r-bcqeeo r-qvutc0">#MetInParis</a></span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0"> last night for helping us support </span><div class="css-1dbjc4n r-xoduu5"><span class="r-18u37iz"><a dir="ltr" href="/EMMAUSolidarite" role="link" class="css-4rbku5 css-18t94o4 css-901oao css-16my406 r-1cvl2hr r-1loqt21 r-poiln3 r-bcqeeo r-qvutc0">@EMMAUSolidarite</a></span></div>
+<span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0"> &amp; </span><div class="css-1dbjc4n r-xoduu5"><span class="r-18u37iz"><a dir="ltr" href="/PompiersParis" role="link" class="css-4rbku5 css-18t94o4 css-901oao css-16my406 r-1cvl2hr r-1loqt21 r-poiln3 r-bcqeeo r-qvutc0">@PompiersParis</a></span></div>
+<span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">. </span><span class="r-18u37iz"><a dir="ltr" href="/hashtag/AWMH?src=hashtag_click" role="link" class="css-4rbku5 css-18t94o4 css-901oao css-16my406 r-1cvl2hr r-1loqt21 r-poiln3 r-bcqeeo r-qvutc0">#AWMH</a></span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0"> </span><span class="r-18u37iz"><a dir="ltr" href="/hashtag/MetalicaGivesBack?src=hashtag_click" role="link" class="css-4rbku5 css-18t94o4 css-901oao css-16my406 r-1cvl2hr r-1loqt21 r-poiln3 r-bcqeeo r-qvutc0">#MetalicaGivesBack</a></span>
+</div></div></div></div>
+<div class="css-1dbjc4n"><div aria-labelledby="id__da3mlwmkmnc id__3agb7x3hqvt" class="css-1dbjc4n r-1ssbvtb r-1s2bzr4" id="id__2w5b4v3q2m8"><div class="css-1dbjc4n" id="id__da3mlwmkmnc">
+<div dir="ltr" class="css-901oao r-4iw3lz r-1xk2f4g r-37j5jr r-a023e6 r-16dba41 r-109y4c4 r-rjixqe r-bcqeeo r-1udh08x r-wwvuq4 r-u8s1d r-92ng3h r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Quote Tweet</span></div>
+<div tabindex="0" class="css-1dbjc4n r-1ets6dv r-1867qdf r-rs99b7 r-1loqt21 r-adacv r-1ny4l3l r-1udh08x r-o7ynqc r-6416eg"><div class="css-1dbjc4n">
+<div class="css-1dbjc4n r-eqz5dr r-1fz3rvf r-1s2bzr4"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2"><div class="css-1dbjc4n r-1wbh5a2 r-1udh08x"><div class="css-1dbjc4n r-1habvwh r-18u37iz r-dnmrzs">
+<div class="css-1dbjc4n r-1d4mawv" data-testid="Tweet-User-Avatar"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1adg3ll r-z80fyv r-bztko3 r-19wmn03" data-testid="UserAvatar-Container-AWMHFoundation">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-1adg3ll r-1pi2tsx r-1wyvozj r-bztko3 r-u8s1d r-1v2oles r-desppf r-13qz1uu">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-ggadg3 r-1udh08x r-u8s1d r-8jfcpp" style="height:calc(100% - -4px);width:calc(100% - -4px)"><a href="/AWMHFoundation" aria-hidden="true" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1niwhzg r-1loqt21 r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1niwhzg r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-14lw9ot r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-14lw9ot r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1adg3ll r-1udh08x" style="background-color:rgba(185,202,211,1.00)">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/profile_images/935181032185241600/D8FoOIRJ_400x400.jpg")'></div>
+<img alt="" draggable="true" src="https://pbs.twimg.com/profile_images/935181032185241600/D8FoOIRJ_400x400.jpg" class="css-9pa8cd">
+</div></div>
+</div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-12181gd r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"></div></div></a></div></div>
+</div></div>
+</div></div></div>
+<div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs r-1ny4l3l" data-testid="User-Name">
+<div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/AWMHFoundation" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs">
+<div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-37j5jr r-a023e6 r-b88u0q r-rjixqe r-bcqeeo r-1udh08x r-3s2u2q r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">All Within My Hands Foundation</span></span></div>
+<div dir="ltr" class="css-901oao r-xoduu5 r-18u37iz r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 r-1awozwy r-xoduu5 r-poiln3 r-bcqeeo r-qvutc0"></span></div>
+</div></a></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1wbh5a2 r-13hce6t"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2">
+<div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/AWMHFoundation" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div dir="ltr" class="css-901oao css-1hf3ou5 r-14j79pv r-18u37iz r-37j5jr r-1wvb978 r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">@AWMHFoundation</span></div></a></div>
+<div dir="ltr" aria-hidden="true" class="css-901oao r-14j79pv r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-s1qlax r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">·</span></div>
+<div class="css-1dbjc4n r-18u37iz r-1q142lx"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2"><a href="/AWMHFoundation/status/1127646016931487744" dir="ltr" aria-label="May 12, 2019" role="link" class="css-4rbku5 css-18t94o4 css-901oao r-14j79pv r-1loqt21 r-xoduu5 r-1q142lx r-1w6e6rj r-37j5jr r-a023e6 r-16dba41 r-9aw3ui r-rjixqe r-bcqeeo r-3s2u2q r-qvutc0"><time datetime="2019-05-12T18:45:35.000Z">May 12, 2019</time></a></div></div>
+</div></div>
+</div></div>
+</div></div></div></div>
+<div class="css-1dbjc4n r-6gpygo r-1fz3rvf"><div dir="auto" lang="en" class="css-901oao r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-14gqq1x r-bcqeeo r-bnwqim r-qvutc0" style="color:rgba(15,20,25,1.00)" data-testid="tweetText">
+<span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">If you bought a ticket for tonight’s </span><span class="r-18u37iz"><span dir="ltr" class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">@Metallica</span></span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0"> show at Stade de France, you have helped contribute to </span><span class="r-18u37iz"><span dir="ltr" class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">@EMMAUSolidarite</span></span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0"> &amp; </span><span class="r-18u37iz"><span dir="ltr" class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">@PompiersParis</span></span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">. </span><span class="r-18u37iz"><span dir="ltr" class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">#MetallicaGivesBack</span></span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0"> </span><span class="r-18u37iz"><span dir="ltr" class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">#AWMH</span></span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0"> </span><span class="r-18u37iz"><span dir="ltr" class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">#MetInParis</span></span>
+</div></div>
+<div class="css-1dbjc4n r-14gqq1x"><div class="css-1dbjc4n"><div class="css-1dbjc4n r-1ny4l3l r-o7ynqc r-6416eg">
+<div class="css-1dbjc4n r-1adg3ll r-1udh08x">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:56.25%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-18u37iz r-1pi2tsx r-13qz1uu">
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-a5pmau r-bnwqim"><div class="css-1dbjc4n r-16y2uox r-1pi2tsx r-13qz1uu"><div class="css-1dbjc4n r-1pi2tsx r-1ny4l3l"><div class="css-1dbjc4n r-1p0dtai r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af"><div aria-label="Image" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010" data-testid="tweetPhoto">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/media/D6YzUC8V4AApDdF?format=jpg&amp;name=4096x4096")'></div>
+<img alt="Image" draggable="true" src="https://pbs.twimg.com/media/D6YzUC8V4AApDdF?format=jpg&amp;name=4096x4096" class="css-9pa8cd">
+</div></div></div></div></div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-bnwqim"><div class="css-1dbjc4n r-16y2uox r-1pi2tsx r-13qz1uu"><div class="css-1dbjc4n r-1pi2tsx r-1ny4l3l"><div class="css-1dbjc4n r-1p0dtai r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af"><div aria-label="Image" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010" data-testid="tweetPhoto">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/media/D6YzVKeV4AEPpSQ?format=jpg&amp;name=4096x4096")'></div>
+<img alt="Image" draggable="true" src="https://pbs.twimg.com/media/D6YzVKeV4AEPpSQ?format=jpg&amp;name=4096x4096" class="css-9pa8cd">
+</div></div></div></div></div>
+</div></div>
+</div>
+<div itemprop="image" itemscope="" itemtype="https://schema.org/ImageObject">
+<meta content="Image" itemprop="caption">
+<meta content="https://pbs.twimg.com/media/D6YzUC8V4AApDdF.jpg" itemprop="contentUrl">
+<meta content="https://pbs.twimg.com/media/D6YzUC8V4AApDdF?format=jpg&amp;name=thumb" itemprop="thumbnailUrl">
+<meta content="4096" itemprop="width">
+<meta content="" itemprop="contentRating">
+</div>
+<div itemprop="image" itemscope="" itemtype="https://schema.org/ImageObject">
+<meta content="Image" itemprop="caption">
+<meta content="https://pbs.twimg.com/media/D6YzVKeV4AEPpSQ.jpg" itemprop="contentUrl">
+<meta content="https://pbs.twimg.com/media/D6YzVKeV4AEPpSQ?format=jpg&amp;name=thumb" itemprop="thumbnailUrl">
+<meta content="4096" itemprop="width">
+<meta content="" itemprop="contentRating">
+</div>
+</div></div></div>
+</div></div>
+</div></div></div>
+<div class="css-1dbjc4n"></div>
+<div class="css-1dbjc4n r-1r5su4o"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wtj0ep">
+<div class="css-1dbjc4n r-1b7u577"><div class="css-1dbjc4n r-1d09ksm r-1471scf r-18u37iz r-1wbh5a2"><div dir="ltr" class="css-901oao r-14j79pv r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0"><a href="/Metallica/status/1128068672289890305" aria-describedby="id__uvi818zhjqi" aria-label="10:45 PM · May 13, 2019" role="link" class="css-4rbku5 css-18t94o4 css-901oao css-16my406 r-14j79pv r-1loqt21 r-xoduu5 r-1q142lx r-1w6e6rj r-poiln3 r-9aw3ui r-bcqeeo r-3s2u2q r-qvutc0"><time datetime="2019-05-13T22:45:04.000Z">10:45 PM · May 13, 2019</time></a></div></div></div>
+<div class="css-1dbjc4n r-18u37iz"></div>
+</div></div>
+<div role="group" class="css-1dbjc4n r-18u37iz r-1w6e6rj">
+<div role="separator" class="css-1dbjc4n r-1dgieki r-1efd50x r-5kkj8d r-109y4c4 r-13qz1uu"></div>
+<div class="css-1dbjc4n r-1mf7evn r-1yzf0co"><a href="/Metallica/status/1128068672289890305/retweets" dir="ltr" role="link" class="css-4rbku5 css-18t94o4 css-901oao r-1loqt21 r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-1b43r93 r-b88u0q r-1cwl3u0 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">171</span></span></span></div> <span class="css-901oao css-16my406 r-14j79pv r-poiln3 r-1b43r93 r-1cwl3u0 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Retweets</span></span></a></div>
+<div class="css-1dbjc4n r-1mf7evn r-1yzf0co"><a href="/Metallica/status/1128068672289890305/likes" dir="ltr" role="link" class="css-4rbku5 css-18t94o4 css-901oao r-1loqt21 r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-1b43r93 r-b88u0q r-1cwl3u0 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">1,424</span></span></span></div> <span class="css-901oao css-16my406 r-14j79pv r-poiln3 r-1b43r93 r-1cwl3u0 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Likes</span></span></a></div>
+<div class="css-1dbjc4n r-1mf7evn r-1yzf0co"><div dir="ltr" class="css-901oao r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)">
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-1b43r93 r-b88u0q r-1cwl3u0 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">2</span></span></span></div> <span class="css-901oao css-16my406 r-14j79pv r-poiln3 r-1b43r93 r-1cwl3u0 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Bookmarks</span></span>
+</div></div>
+</div>
+<div class="css-1dbjc4n"><div role="group" class="css-1dbjc4n r-1oszu61 r-j5o65s r-rull8r r-qklmqi r-1dgieki r-1efd50x r-5kkj8d r-1ta3fxp r-18u37iz r-h3s6tt r-a2tzq0 r-3qxfft r-s1qlax" id="id__9qyczaa555">
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="Reply" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="reply"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-50lct3 r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1srniue"><g><path d="M1.751 10c0-4.42 3.584-8 8.005-8h4.366c4.49 0 8.129 3.64 8.129 8.13 0 2.96-1.607 5.68-4.196 7.11l-8.054 4.46v-3.69h-.067c-4.49.1-8.183-3.51-8.183-8.01zm8.005-6c-3.317 0-6.005 2.69-6.005 6 0 3.37 2.77 6.08 6.138 6.01l.351-.01h1.761v2.3l5.087-2.81c1.951-1.08 3.163-3.13 3.163-5.36 0-3.39-2.744-6.13-6.129-6.13H9.756z"></path></g></svg>
+</div></div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="Retweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="retweet"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-50lct3 r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1srniue"><g><path d="M4.5 3.88l4.432 4.14-1.364 1.46L5.5 7.55V16c0 1.1.896 2 2 2H13v2H7.5c-2.209 0-4-1.79-4-4V7.55L1.432 9.48.068 8.02 4.5 3.88zM16.5 6H11V4h5.5c2.209 0 4 1.79 4 4v8.45l2.068-1.93 1.364 1.46-4.432 4.14-4.432-4.14 1.364-1.46 2.068 1.93V8c0-1.1-.896-2-2-2z"></path></g></svg>
+</div></div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="Like" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="like"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-50lct3 r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1srniue"><g><path d="M16.697 5.5c-1.222-.06-2.679.51-3.89 2.16l-.805 1.09-.806-1.09C9.984 6.01 8.526 5.44 7.304 5.5c-1.243.07-2.349.78-2.91 1.91-.552 1.12-.633 2.78.479 4.82 1.074 1.97 3.257 4.27 7.129 6.61 3.87-2.34 6.052-4.64 7.126-6.61 1.111-2.04 1.03-3.7.477-4.82-.561-1.13-1.666-1.84-2.908-1.91zm4.187 7.69c-1.351 2.48-4.001 5.12-8.379 7.67l-.503.3-.504-.3c-4.379-2.55-7.029-5.19-8.382-7.67-1.36-2.5-1.41-4.86-.514-6.67.887-1.79 2.647-2.91 4.601-3.01 1.651-.09 3.368.56 4.798 2.01 1.429-1.45 3.146-2.1 4.796-2.01 1.954.1 3.714 1.22 4.601 3.01.896 1.81.846 4.17-.514 6.67z"></path></g></svg>
+</div></div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="Bookmark" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="bookmark"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-50lct3 r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1srniue"><g><path d="M4 4.5C4 3.12 5.119 2 6.5 2h11C18.881 2 20 3.12 20 4.5v18.44l-8-5.71-8 5.71V4.5zM6.5 4c-.276 0-.5.22-.5.5v14.56l6-4.29 6 4.29V4.5c0-.28-.224-.5-.5-.5h-11z"></path></g></svg>
+</div></div></div></div>
+<div class="css-1dbjc4n" style="display:inline-grid;-webkit-justify-content:inherit;justify-content:inherit;-webkit-transform:rotate(0deg) scale(1) translate3d(0, 0, 0);transform:rotate(0deg) scale(1) translate3d(0, 0, 0);-ms-flex-pack:inherit;-webkit-box-pack:inherit"><div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="Share Tweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-50lct3 r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1srniue"><g><path d="M12 2.59l5.7 5.7-1.41 1.42L13 6.41V16h-2V6.41l-3.3 3.3-1.41-1.42L12 2.59zM21 15l-.02 3.51c0 1.38-1.12 2.49-2.5 2.49H5.5C4.11 21 3 19.88 3 18.5V15h2v3.5c0 .28.22.5.5.5h12.98c.28 0 .5-.22.5-.5L19 15h2z"></path></g></svg>
+</div></div></div></div></div>
+</div></div>
+</div>
+</div></div></article>
+</div></div>
+<div class="css-1dbjc4n r-1adg3ll r-1ny4l3l"></div>
+<div class="css-1dbjc4n r-j5o65s r-qklmqi r-1adg3ll r-1ny4l3l"><div itemprop="hasPart" itemscope="" itemtype="https://schema.org/SocialMediaPosting">
+<meta content="1128069274101276673" itemprop="identifier">
+<meta content="2" itemprop="position">
+<meta content="0" itemprop="commentCount">
+<meta content="" itemprop="contentRating">
+<meta content="2019-05-13T22:47:28.000Z" itemprop="dateCreated">
+<meta content="2019-05-13T22:47:28.000Z" itemprop="datePublished">
+<meta content="https://twitter.com/LizzyHock1963/status/1128069274101276673" itemprop="url">
+<div itemprop="author" itemscope="" itemtype="https://schema.org/Person">
+<meta content="863480651881734144" itemprop="identifier">
+<meta content="LizzyHock1963" itemprop="additionalName">
+<meta content="🇺🇸 Lizzy H♡ck 🇺🇲" itemprop="givenName">
+</div>
+<meta content="https://twitter.com/Metallica/status/1128068672289890305" itemprop="isPartOf">
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/LikeAction" itemprop="interactionType">
+<meta content="Likes" itemprop="name">
+<meta content="https://twitter.com/LizzyHock1963/status/1128069274101276673/likes" itemprop="url">
+<meta content="2" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Retweets" itemprop="name">
+<meta content="https://twitter.com/LizzyHock1963/status/1128069274101276673/retweets" itemprop="url">
+<meta content="1" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Quotes" itemprop="name">
+<meta content="https://twitter.com/LizzyHock1963/status/1128069274101276673/retweets/with_comments" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Replies" itemprop="name">
+<meta content="https://twitter.com/LizzyHock1963/status/1128069274101276673" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<article aria-labelledby="id__umiud8mmr6 id__06c0rlsrz2p9 id__73c5jmc81qo id__o4vsxq3y8zk id__usqvf9jtsh id__jv9cu1e7mg id__2pzksfxvrrc id__5jo2n6agpgt id__mozy1dh7pun id__cfwjm4qmlv id__u9jds4ivrj id__bjvgxk8a9p id__ml7uhygofu id__72tuxiq2e82 id__31d3vl9kpcr id__gwl2zh5u44w id__75t82gy5ys6 id__en9rsfxujpg id__ntx1zknz4xa" role="article" tabindex="-1" class="css-1dbjc4n r-18u37iz r-1ny4l3l r-1udh08x r-1qhn6m8 r-i023vh" data-testid="tweet"><div class="css-1dbjc4n r-eqz5dr r-16y2uox r-1wbh5a2"><div class="css-1dbjc4n r-16y2uox r-1wbh5a2 r-1ny4l3l">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-18u37iz"><div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-ttdzmv"></div></div></div>
+<div class="css-1dbjc4n r-18u37iz">
+<div class="css-1dbjc4n r-1awozwy r-1hwvwag r-18kxxzh r-1b7u577"><div class="css-1dbjc4n" data-testid="Tweet-User-Avatar"><div class="css-1dbjc4n r-18kxxzh r-1wbh5a2 r-13qz1uu"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1adg3ll r-h3s6tt r-bztko3" style="width:48px" data-testid="UserAvatar-Container-LizzyHock1963">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-1adg3ll r-1pi2tsx r-1wyvozj r-bztko3 r-u8s1d r-1v2oles r-desppf r-13qz1uu">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-ggadg3 r-1udh08x r-u8s1d r-8jfcpp" style="height:calc(100% - -4px);width:calc(100% - -4px)"><a href="/LizzyHock1963" aria-hidden="true" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1niwhzg r-1loqt21 r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1niwhzg r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-14lw9ot r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-14lw9ot r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1adg3ll r-1udh08x" style="background-color:rgba(185,202,211,1.00)">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/profile_images/1525587715697389568/FvMoE7ge_400x400.jpg")'></div>
+<img alt="" draggable="true" src="https://pbs.twimg.com/profile_images/1525587715697389568/FvMoE7ge_400x400.jpg" class="css-9pa8cd">
+</div></div>
+</div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-12181gd r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"></div></div></a></div></div>
+</div></div>
+</div></div></div></div></div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-1777fci r-kzbkwu">
+<div class="css-1dbjc4n r-zl2h9q"><div class="css-1dbjc4n r-k4xj1c r-18u37iz r-1wtj0ep"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs r-1ny4l3l" id="id__usqvf9jtsh" data-testid="User-Name">
+<div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/LizzyHock1963" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs">
+<div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-37j5jr r-a023e6 r-b88u0q r-rjixqe r-bcqeeo r-1udh08x r-3s2u2q r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-bcqeeo r-qvutc0"><img alt="🇺🇸" draggable="false" src="https://abs-0.twimg.com/emoji/v2/svg/1f1fa-1f1f8.svg" class="r-4qtqp9 r-dflpy8 r-sjv1od r-zw8f10 r-10akycc r-h9hxbl"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0"> Lizzy H♡ck </span><img alt="🇺🇲" draggable="false" src="https://abs-0.twimg.com/emoji/v2/svg/1f1fa-1f1f2.svg" class="r-4qtqp9 r-dflpy8 r-sjv1od r-zw8f10 r-10akycc r-h9hxbl"></span></div>
+<div dir="ltr" class="css-901oao r-xoduu5 r-18u37iz r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 r-1awozwy r-xoduu5 r-poiln3 r-bcqeeo r-qvutc0"></span></div>
+</div></a></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1wbh5a2 r-13hce6t"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2">
+<div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/LizzyHock1963" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div dir="ltr" class="css-901oao css-1hf3ou5 r-14j79pv r-18u37iz r-37j5jr r-1wvb978 r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">@LizzyHock1963</span></div></a></div>
+<div dir="ltr" aria-hidden="true" class="css-901oao r-14j79pv r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-s1qlax r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">·</span></div>
+<div class="css-1dbjc4n r-18u37iz r-1q142lx"><a href="/LizzyHock1963/status/1128069274101276673" dir="ltr" aria-label="May 13, 2019" role="link" class="css-4rbku5 css-18t94o4 css-901oao r-14j79pv r-1loqt21 r-xoduu5 r-1q142lx r-1w6e6rj r-37j5jr r-a023e6 r-16dba41 r-9aw3ui r-rjixqe r-bcqeeo r-3s2u2q r-qvutc0"><time datetime="2019-05-13T22:47:28.000Z">May 13, 2019</time></a></div>
+</div></div>
+</div></div></div></div></div>
+<div itemprop="articleBody" data-testid="tweetTextAnnotations"><div class="css-1dbjc4n"><div dir="auto" lang="en" class="css-901oao r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-bnwqim r-qvutc0" style="color:rgba(15,20,25,1.00)" id="id__u9jds4ivrj" data-testid="tweetText">
+<span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Thank you MetallicA, for being so generous!</span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">💕</span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">💞</span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">💟</span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0"> </span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">🤘</span>
+</div></div></div>
+<div class="css-1dbjc4n"><div aria-label="1 Retweet, 2 likes" role="group" class="css-1dbjc4n r-1ta3fxp r-18u37iz r-1wtj0ep r-1s2bzr4 r-1mdbhws" id="id__ntx1zknz4xa">
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="0 Replies. Reply" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="reply"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M1.751 10c0-4.42 3.584-8 8.005-8h4.366c4.49 0 8.129 3.64 8.129 8.13 0 2.96-1.607 5.68-4.196 7.11l-8.054 4.46v-3.69h-.067c-4.49.1-8.183-3.51-8.183-8.01zm8.005-6c-3.317 0-6.005 2.69-6.005 6 0 3.37 2.77 6.08 6.138 6.01l.351-.01h1.761v2.3l5.087-2.81c1.951-1.08 3.163-3.13 3.163-5.36 0-3.39-2.744-6.13-6.129-6.13H9.756z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="1 Retweet. Retweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="retweet"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M4.5 3.88l4.432 4.14-1.364 1.46L5.5 7.55V16c0 1.1.896 2 2 2H13v2H7.5c-2.209 0-4-1.79-4-4V7.55L1.432 9.48.068 8.02 4.5 3.88zM16.5 6H11V4h5.5c2.209 0 4 1.79 4 4v8.45l2.068-1.93 1.364 1.46-4.432 4.14-4.432-4.14 1.364-1.46 2.068 1.93V8c0-1.1-.896-2-2-2z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">1</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="2 Likes. Like" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="like"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M16.697 5.5c-1.222-.06-2.679.51-3.89 2.16l-.805 1.09-.806-1.09C9.984 6.01 8.526 5.44 7.304 5.5c-1.243.07-2.349.78-2.91 1.91-.552 1.12-.633 2.78.479 4.82 1.074 1.97 3.257 4.27 7.129 6.61 3.87-2.34 6.052-4.64 7.126-6.61 1.111-2.04 1.03-3.7.477-4.82-.561-1.13-1.666-1.84-2.908-1.91zm4.187 7.69c-1.351 2.48-4.001 5.12-8.379 7.67l-.503.3-.504-.3c-4.379-2.55-7.029-5.19-8.382-7.67-1.36-2.5-1.41-4.86-.514-6.67.887-1.79 2.647-2.91 4.601-3.01 1.651-.09 3.368.56 4.798 2.01 1.429-1.45 3.146-2.1 4.796-2.01 1.954.1 3.714 1.22 4.601 3.01.896 1.81.846 4.17-.514 6.67z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">2</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n" style="display:inline-grid;-webkit-justify-content:inherit;justify-content:inherit;-webkit-transform:rotate(0deg) scale(1) translate3d(0, 0, 0);transform:rotate(0deg) scale(1) translate3d(0, 0, 0);-ms-flex-pack:inherit;-webkit-box-pack:inherit"><div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="Share Tweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M12 2.59l5.7 5.7-1.41 1.42L13 6.41V16h-2V6.41l-3.3 3.3-1.41-1.42L12 2.59zM21 15l-.02 3.51c0 1.38-1.12 2.49-2.5 2.49H5.5C4.11 21 3 19.88 3 18.5V15h2v3.5c0 .28.22.5.5.5h12.98c.28 0 .5-.22.5-.5L19 15h2z"></path></g></svg>
+</div></div></div></div></div>
+</div></div>
+</div>
+</div>
+</div></div></article>
+</div></div>
+<div class="css-1dbjc4n r-1adg3ll r-1ny4l3l"></div>
+<div class="css-1dbjc4n r-j5o65s r-qklmqi r-1adg3ll r-1ny4l3l"><div itemprop="hasPart" itemscope="" itemtype="https://schema.org/SocialMediaPosting">
+<meta content="1128070303274471424" itemprop="identifier">
+<meta content="3" itemprop="position">
+<meta content="1" itemprop="commentCount">
+<meta content="" itemprop="contentRating">
+<meta content="2019-05-13T22:51:33.000Z" itemprop="dateCreated">
+<meta content="2019-05-13T22:51:33.000Z" itemprop="datePublished">
+<meta content="https://twitter.com/TomOlson8/status/1128070303274471424" itemprop="url">
+<div itemprop="author" itemscope="" itemtype="https://schema.org/Person">
+<meta content="623979006" itemprop="identifier">
+<meta content="TomOlson8" itemprop="additionalName">
+<meta content="Brutus" itemprop="givenName">
+</div>
+<meta content="https://twitter.com/Metallica/status/1128068672289890305" itemprop="isPartOf">
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/LikeAction" itemprop="interactionType">
+<meta content="Likes" itemprop="name">
+<meta content="https://twitter.com/TomOlson8/status/1128070303274471424/likes" itemprop="url">
+<meta content="1" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Retweets" itemprop="name">
+<meta content="https://twitter.com/TomOlson8/status/1128070303274471424/retweets" itemprop="url">
+<meta content="1" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Quotes" itemprop="name">
+<meta content="https://twitter.com/TomOlson8/status/1128070303274471424/retweets/with_comments" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Replies" itemprop="name">
+<meta content="https://twitter.com/TomOlson8/status/1128070303274471424" itemprop="url">
+<meta content="1" itemprop="userInteractionCount">
+</div>
+<article aria-labelledby="id__jw9n37cumur id__3po4bdj3dfp id__xc0c8g88fy id__805jn6pbxgs id__omo4zugd3m id__an0a8bzjs76 id__tqc91oydnj id__ci4ebxw8yh4 id__oswdnpcxwld id__5mcwj4iplkq id__i28slfpg7vg id__7i30lpe1xsn id__64hcp9w7i57 id__ytyb57urfw id__428dyhevxmn id__vyqfo4m0xso id__44el5m164o9 id__7w7y0o6w67k id__giqsh5mqm7d" role="article" tabindex="-1" class="css-1dbjc4n r-18u37iz r-1ny4l3l r-1udh08x r-1qhn6m8 r-i023vh" data-testid="tweet"><div class="css-1dbjc4n r-eqz5dr r-16y2uox r-1wbh5a2"><div class="css-1dbjc4n r-16y2uox r-1wbh5a2 r-1ny4l3l">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-18u37iz"><div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-ttdzmv"></div></div></div>
+<div class="css-1dbjc4n r-18u37iz">
+<div class="css-1dbjc4n r-1awozwy r-1hwvwag r-18kxxzh r-1b7u577"><div class="css-1dbjc4n" data-testid="Tweet-User-Avatar"><div class="css-1dbjc4n r-18kxxzh r-1wbh5a2 r-13qz1uu"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1adg3ll r-h3s6tt r-bztko3" style="width:48px" data-testid="UserAvatar-Container-TomOlson8">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-1adg3ll r-1pi2tsx r-1wyvozj r-bztko3 r-u8s1d r-1v2oles r-desppf r-13qz1uu">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-ggadg3 r-1udh08x r-u8s1d r-8jfcpp" style="height:calc(100% - -4px);width:calc(100% - -4px)"><a href="/TomOlson8" aria-hidden="true" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1niwhzg r-1loqt21 r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1niwhzg r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-14lw9ot r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-14lw9ot r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1adg3ll r-1udh08x" style="background-color:rgba(185,202,211,1.00)">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/profile_images/543212042631794688/lMegt8oL_400x400.jpeg")'></div>
+<img alt="" draggable="true" src="https://pbs.twimg.com/profile_images/543212042631794688/lMegt8oL_400x400.jpeg" class="css-9pa8cd">
+</div></div>
+</div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-12181gd r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"></div></div></a></div></div>
+</div></div>
+</div></div></div></div></div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-1777fci r-kzbkwu">
+<div class="css-1dbjc4n r-zl2h9q"><div class="css-1dbjc4n r-k4xj1c r-18u37iz r-1wtj0ep"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs r-1ny4l3l" id="id__omo4zugd3m" data-testid="User-Name">
+<div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/TomOlson8" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs">
+<div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-37j5jr r-a023e6 r-b88u0q r-rjixqe r-bcqeeo r-1udh08x r-3s2u2q r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Brutus</span></span></div>
+<div dir="ltr" class="css-901oao r-xoduu5 r-18u37iz r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 r-1awozwy r-xoduu5 r-poiln3 r-bcqeeo r-qvutc0"></span></div>
+</div></a></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1wbh5a2 r-13hce6t"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2">
+<div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/TomOlson8" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div dir="ltr" class="css-901oao css-1hf3ou5 r-14j79pv r-18u37iz r-37j5jr r-1wvb978 r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">@TomOlson8</span></div></a></div>
+<div dir="ltr" aria-hidden="true" class="css-901oao r-14j79pv r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-s1qlax r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">·</span></div>
+<div class="css-1dbjc4n r-18u37iz r-1q142lx"><a href="/TomOlson8/status/1128070303274471424" dir="ltr" aria-label="May 13, 2019" role="link" class="css-4rbku5 css-18t94o4 css-901oao r-14j79pv r-1loqt21 r-xoduu5 r-1q142lx r-1w6e6rj r-37j5jr r-a023e6 r-16dba41 r-9aw3ui r-rjixqe r-bcqeeo r-3s2u2q r-qvutc0"><time datetime="2019-05-13T22:51:33.000Z">May 13, 2019</time></a></div>
+</div></div>
+</div></div></div></div></div>
+<div itemprop="articleBody" data-testid="tweetTextAnnotations"><div class="css-1dbjc4n"><div dir="auto" lang="en" class="css-901oao r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-bnwqim r-qvutc0" style="color:rgba(15,20,25,1.00)" id="id__i28slfpg7vg" data-testid="tweetText">
+<span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Orion </span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">👍</span>
+</div></div></div>
+<div class="css-1dbjc4n"><div aria-label="1 reply, 1 Retweet, 1 like" role="group" class="css-1dbjc4n r-1ta3fxp r-18u37iz r-1wtj0ep r-1s2bzr4 r-1mdbhws" id="id__giqsh5mqm7d">
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="1 Reply. Reply" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="reply"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M1.751 10c0-4.42 3.584-8 8.005-8h4.366c4.49 0 8.129 3.64 8.129 8.13 0 2.96-1.607 5.68-4.196 7.11l-8.054 4.46v-3.69h-.067c-4.49.1-8.183-3.51-8.183-8.01zm8.005-6c-3.317 0-6.005 2.69-6.005 6 0 3.37 2.77 6.08 6.138 6.01l.351-.01h1.761v2.3l5.087-2.81c1.951-1.08 3.163-3.13 3.163-5.36 0-3.39-2.744-6.13-6.129-6.13H9.756z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">1</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="1 Retweet. Retweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="retweet"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M4.5 3.88l4.432 4.14-1.364 1.46L5.5 7.55V16c0 1.1.896 2 2 2H13v2H7.5c-2.209 0-4-1.79-4-4V7.55L1.432 9.48.068 8.02 4.5 3.88zM16.5 6H11V4h5.5c2.209 0 4 1.79 4 4v8.45l2.068-1.93 1.364 1.46-4.432 4.14-4.432-4.14 1.364-1.46 2.068 1.93V8c0-1.1-.896-2-2-2z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">1</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="1 Like. Like" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="like"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M16.697 5.5c-1.222-.06-2.679.51-3.89 2.16l-.805 1.09-.806-1.09C9.984 6.01 8.526 5.44 7.304 5.5c-1.243.07-2.349.78-2.91 1.91-.552 1.12-.633 2.78.479 4.82 1.074 1.97 3.257 4.27 7.129 6.61 3.87-2.34 6.052-4.64 7.126-6.61 1.111-2.04 1.03-3.7.477-4.82-.561-1.13-1.666-1.84-2.908-1.91zm4.187 7.69c-1.351 2.48-4.001 5.12-8.379 7.67l-.503.3-.504-.3c-4.379-2.55-7.029-5.19-8.382-7.67-1.36-2.5-1.41-4.86-.514-6.67.887-1.79 2.647-2.91 4.601-3.01 1.651-.09 3.368.56 4.798 2.01 1.429-1.45 3.146-2.1 4.796-2.01 1.954.1 3.714 1.22 4.601 3.01.896 1.81.846 4.17-.514 6.67z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">1</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n" style="display:inline-grid;-webkit-justify-content:inherit;justify-content:inherit;-webkit-transform:rotate(0deg) scale(1) translate3d(0, 0, 0);transform:rotate(0deg) scale(1) translate3d(0, 0, 0);-ms-flex-pack:inherit;-webkit-box-pack:inherit"><div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="Share Tweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M12 2.59l5.7 5.7-1.41 1.42L13 6.41V16h-2V6.41l-3.3 3.3-1.41-1.42L12 2.59zM21 15l-.02 3.51c0 1.38-1.12 2.49-2.5 2.49H5.5C4.11 21 3 19.88 3 18.5V15h2v3.5c0 .28.22.5.5.5h12.98c.28 0 .5-.22.5-.5L19 15h2z"></path></g></svg>
+</div></div></div></div></div>
+</div></div>
+</div>
+</div>
+</div></div></article>
+</div></div>
+<div class="css-1dbjc4n r-1adg3ll r-1ny4l3l"></div>
+<div class="css-1dbjc4n r-j5o65s r-qklmqi r-1adg3ll r-1ny4l3l"><div itemprop="hasPart" itemscope="" itemtype="https://schema.org/SocialMediaPosting">
+<meta content="1128088308544876544" itemprop="identifier">
+<meta content="4" itemprop="position">
+<meta content="0" itemprop="commentCount">
+<meta content="" itemprop="contentRating">
+<meta content="2019-05-14T00:03:06.000Z" itemprop="dateCreated">
+<meta content="2019-05-14T00:03:06.000Z" itemprop="datePublished">
+<meta content="https://twitter.com/BeeWall74/status/1128088308544876544" itemprop="url">
+<div itemprop="author" itemscope="" itemtype="https://schema.org/Person">
+<meta content="1265540816" itemprop="identifier">
+<meta content="BeeWall74" itemprop="additionalName">
+<meta content="B" itemprop="givenName">
+</div>
+<meta content="https://twitter.com/Metallica/status/1128068672289890305" itemprop="isPartOf">
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/LikeAction" itemprop="interactionType">
+<meta content="Likes" itemprop="name">
+<meta content="https://twitter.com/BeeWall74/status/1128088308544876544/likes" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Retweets" itemprop="name">
+<meta content="https://twitter.com/BeeWall74/status/1128088308544876544/retweets" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Quotes" itemprop="name">
+<meta content="https://twitter.com/BeeWall74/status/1128088308544876544/retweets/with_comments" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Replies" itemprop="name">
+<meta content="https://twitter.com/BeeWall74/status/1128088308544876544" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<article aria-labelledby="id__obba3ujjrng id__uw1cw293hml id__ds3cnwtp4sv id__dgp8ivd4ef7 id__hmhdz0gvizo id__ccjo75a4oes id__54jlomzx5i4 id__ru3ptng7y9 id__hkmfro8uhuq id__x727z63h02r id__i51x2pk2ws id__i51am5vszdk id__okzl4s1swa id__txurxxvatxb id__s4bn14tual id__zselr6hja6c id__qfefnu8iv7a id__0dececs854o9" role="article" tabindex="-1" class="css-1dbjc4n r-18u37iz r-1ny4l3l r-1udh08x r-1qhn6m8 r-i023vh" data-testid="tweet"><div class="css-1dbjc4n r-eqz5dr r-16y2uox r-1wbh5a2"><div class="css-1dbjc4n r-16y2uox r-1wbh5a2 r-1ny4l3l">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-18u37iz"><div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-ttdzmv"></div></div></div>
+<div class="css-1dbjc4n r-18u37iz">
+<div class="css-1dbjc4n r-1awozwy r-1hwvwag r-18kxxzh r-1b7u577"><div class="css-1dbjc4n" data-testid="Tweet-User-Avatar"><div class="css-1dbjc4n r-18kxxzh r-1wbh5a2 r-13qz1uu"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1adg3ll r-h3s6tt r-bztko3" style="width:48px" data-testid="UserAvatar-Container-BeeWall74">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-1adg3ll r-1pi2tsx r-1wyvozj r-bztko3 r-u8s1d r-1v2oles r-desppf r-13qz1uu">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-ggadg3 r-1udh08x r-u8s1d r-8jfcpp" style="height:calc(100% - -4px);width:calc(100% - -4px)"><a href="/BeeWall74" aria-hidden="true" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1niwhzg r-1loqt21 r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1niwhzg r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-14lw9ot r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-14lw9ot r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1adg3ll r-1udh08x" style="background-color:rgba(185,202,211,1.00)">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/profile_images/1353056859406573571/EiBI0eSz_400x400.jpg")'></div>
+<img alt="" draggable="true" src="https://pbs.twimg.com/profile_images/1353056859406573571/EiBI0eSz_400x400.jpg" class="css-9pa8cd">
+</div></div>
+</div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-12181gd r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"></div></div></a></div></div>
+</div></div>
+</div></div></div></div></div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-1777fci r-kzbkwu">
+<div class="css-1dbjc4n r-zl2h9q"><div class="css-1dbjc4n r-k4xj1c r-18u37iz r-1wtj0ep"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs r-1ny4l3l" id="id__hmhdz0gvizo" data-testid="User-Name">
+<div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/BeeWall74" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs">
+<div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-37j5jr r-a023e6 r-b88u0q r-rjixqe r-bcqeeo r-1udh08x r-3s2u2q r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">B</span></span></div>
+<div dir="ltr" class="css-901oao r-xoduu5 r-18u37iz r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 r-1awozwy r-xoduu5 r-poiln3 r-bcqeeo r-qvutc0"></span></div>
+</div></a></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1wbh5a2 r-13hce6t"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2">
+<div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/BeeWall74" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div dir="ltr" class="css-901oao css-1hf3ou5 r-14j79pv r-18u37iz r-37j5jr r-1wvb978 r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">@BeeWall74</span></div></a></div>
+<div dir="ltr" aria-hidden="true" class="css-901oao r-14j79pv r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-s1qlax r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">·</span></div>
+<div class="css-1dbjc4n r-18u37iz r-1q142lx"><a href="/BeeWall74/status/1128088308544876544" dir="ltr" aria-label="May 14, 2019" role="link" class="css-4rbku5 css-18t94o4 css-901oao r-14j79pv r-1loqt21 r-xoduu5 r-1q142lx r-1w6e6rj r-37j5jr r-a023e6 r-16dba41 r-9aw3ui r-rjixqe r-bcqeeo r-3s2u2q r-qvutc0"><time datetime="2019-05-14T00:03:06.000Z">May 14, 2019</time></a></div>
+</div></div>
+</div></div></div></div></div>
+<div itemprop="articleBody" data-testid="tweetTextAnnotations"><div class="css-1dbjc4n"><div dir="auto" lang="en" class="css-901oao r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-bnwqim r-qvutc0" style="color:rgba(15,20,25,1.00)" id="id__i51x2pk2ws" data-testid="tweetText"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Love Papa Het but,,,,,he always looks like he's got a stomach problem in pics,,</span></div></div></div>
+<div class="css-1dbjc4n"><div aria-label="" role="group" class="css-1dbjc4n r-1ta3fxp r-18u37iz r-1wtj0ep r-1s2bzr4 r-1mdbhws" id="id__6tsyak8lrhg">
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="0 Replies. Reply" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="reply"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M1.751 10c0-4.42 3.584-8 8.005-8h4.366c4.49 0 8.129 3.64 8.129 8.13 0 2.96-1.607 5.68-4.196 7.11l-8.054 4.46v-3.69h-.067c-4.49.1-8.183-3.51-8.183-8.01zm8.005-6c-3.317 0-6.005 2.69-6.005 6 0 3.37 2.77 6.08 6.138 6.01l.351-.01h1.761v2.3l5.087-2.81c1.951-1.08 3.163-3.13 3.163-5.36 0-3.39-2.744-6.13-6.129-6.13H9.756z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="0 Retweets. Retweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="retweet"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M4.5 3.88l4.432 4.14-1.364 1.46L5.5 7.55V16c0 1.1.896 2 2 2H13v2H7.5c-2.209 0-4-1.79-4-4V7.55L1.432 9.48.068 8.02 4.5 3.88zM16.5 6H11V4h5.5c2.209 0 4 1.79 4 4v8.45l2.068-1.93 1.364 1.46-4.432 4.14-4.432-4.14 1.364-1.46 2.068 1.93V8c0-1.1-.896-2-2-2z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="0 Likes. Like" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="like"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M16.697 5.5c-1.222-.06-2.679.51-3.89 2.16l-.805 1.09-.806-1.09C9.984 6.01 8.526 5.44 7.304 5.5c-1.243.07-2.349.78-2.91 1.91-.552 1.12-.633 2.78.479 4.82 1.074 1.97 3.257 4.27 7.129 6.61 3.87-2.34 6.052-4.64 7.126-6.61 1.111-2.04 1.03-3.7.477-4.82-.561-1.13-1.666-1.84-2.908-1.91zm4.187 7.69c-1.351 2.48-4.001 5.12-8.379 7.67l-.503.3-.504-.3c-4.379-2.55-7.029-5.19-8.382-7.67-1.36-2.5-1.41-4.86-.514-6.67.887-1.79 2.647-2.91 4.601-3.01 1.651-.09 3.368.56 4.798 2.01 1.429-1.45 3.146-2.1 4.796-2.01 1.954.1 3.714 1.22 4.601 3.01.896 1.81.846 4.17-.514 6.67z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n" style="display:inline-grid;-webkit-justify-content:inherit;justify-content:inherit;-webkit-transform:rotate(0deg) scale(1) translate3d(0, 0, 0);transform:rotate(0deg) scale(1) translate3d(0, 0, 0);-ms-flex-pack:inherit;-webkit-box-pack:inherit"><div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="Share Tweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M12 2.59l5.7 5.7-1.41 1.42L13 6.41V16h-2V6.41l-3.3 3.3-1.41-1.42L12 2.59zM21 15l-.02 3.51c0 1.38-1.12 2.49-2.5 2.49H5.5C4.11 21 3 19.88 3 18.5V15h2v3.5c0 .28.22.5.5.5h12.98c.28 0 .5-.22.5-.5L19 15h2z"></path></g></svg>
+</div></div></div></div></div>
+</div></div>
+</div>
+</div>
+</div></div></article>
+</div></div>
+<div class="css-1dbjc4n r-1adg3ll r-1ny4l3l"></div>
+<div class="css-1dbjc4n r-j5o65s r-qklmqi r-1adg3ll r-1ny4l3l"><div itemprop="hasPart" itemscope="" itemtype="https://schema.org/SocialMediaPosting">
+<meta content="1128112059109953536" itemprop="identifier">
+<meta content="5" itemprop="position">
+<meta content="0" itemprop="commentCount">
+<meta content="" itemprop="contentRating">
+<meta content="2019-05-14T01:37:28.000Z" itemprop="dateCreated">
+<meta content="2019-05-14T01:37:28.000Z" itemprop="datePublished">
+<meta content="https://twitter.com/sandymitt6/status/1128112059109953536" itemprop="url">
+<div itemprop="author" itemscope="" itemtype="https://schema.org/Person">
+<meta content="3021820380" itemprop="identifier">
+<meta content="sandymitt6" itemprop="additionalName">
+<meta content="S" itemprop="givenName">
+</div>
+<meta content="https://twitter.com/Metallica/status/1128068672289890305" itemprop="isPartOf">
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/LikeAction" itemprop="interactionType">
+<meta content="Likes" itemprop="name">
+<meta content="https://twitter.com/sandymitt6/status/1128112059109953536/likes" itemprop="url">
+<meta content="1" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Retweets" itemprop="name">
+<meta content="https://twitter.com/sandymitt6/status/1128112059109953536/retweets" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Quotes" itemprop="name">
+<meta content="https://twitter.com/sandymitt6/status/1128112059109953536/retweets/with_comments" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Replies" itemprop="name">
+<meta content="https://twitter.com/sandymitt6/status/1128112059109953536" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<article aria-labelledby="id__toy0ktlxsci id__xnkhbtqi5n id__8xwricbq1mc id__0j0udyipy2wa id__hey2l0b3a2 id__w5033p7fga id__cuqfg0dpa9d id__e6g8wrrw9q id__y308kzrdcpj id__p109m8r7tm id__qx0ct839hn id__w2liw37sygg id__bykwsul1g2l id__2qzxc54nmho id__du1dghchu9l id__x0gxbfp3s5i id__1avmy8dm2ke id__f91hz0vn94 id__t6lemjk2ma" role="article" tabindex="-1" class="css-1dbjc4n r-18u37iz r-1ny4l3l r-1udh08x r-1qhn6m8 r-i023vh" data-testid="tweet"><div class="css-1dbjc4n r-eqz5dr r-16y2uox r-1wbh5a2"><div class="css-1dbjc4n r-16y2uox r-1wbh5a2 r-1ny4l3l">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-18u37iz"><div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-ttdzmv"></div></div></div>
+<div class="css-1dbjc4n r-18u37iz">
+<div class="css-1dbjc4n r-1awozwy r-1hwvwag r-18kxxzh r-1b7u577"><div class="css-1dbjc4n" data-testid="Tweet-User-Avatar"><div class="css-1dbjc4n r-18kxxzh r-1wbh5a2 r-13qz1uu"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1adg3ll r-h3s6tt r-bztko3" style="width:48px" data-testid="UserAvatar-Container-sandymitt6">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-1adg3ll r-1pi2tsx r-1wyvozj r-bztko3 r-u8s1d r-1v2oles r-desppf r-13qz1uu">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-ggadg3 r-1udh08x r-u8s1d r-8jfcpp" style="height:calc(100% - -4px);width:calc(100% - -4px)"><a href="/sandymitt6" aria-hidden="true" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1niwhzg r-1loqt21 r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1niwhzg r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-14lw9ot r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-14lw9ot r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1adg3ll r-1udh08x" style="background-color:rgba(185,202,211,1.00)">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/profile_images/1603798240855748610/sO5ZDzYU_400x400.jpg")'></div>
+<img alt="" draggable="true" src="https://pbs.twimg.com/profile_images/1603798240855748610/sO5ZDzYU_400x400.jpg" class="css-9pa8cd">
+</div></div>
+</div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-12181gd r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"></div></div></a></div></div>
+</div></div>
+</div></div></div></div></div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-1777fci r-kzbkwu">
+<div class="css-1dbjc4n r-zl2h9q"><div class="css-1dbjc4n r-k4xj1c r-18u37iz r-1wtj0ep"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs r-1ny4l3l" id="id__hey2l0b3a2" data-testid="User-Name">
+<div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/sandymitt6" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs">
+<div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-37j5jr r-a023e6 r-b88u0q r-rjixqe r-bcqeeo r-1udh08x r-3s2u2q r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">S</span></span></div>
+<div dir="ltr" class="css-901oao r-xoduu5 r-18u37iz r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 r-1awozwy r-xoduu5 r-poiln3 r-bcqeeo r-qvutc0"></span></div>
+</div></a></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1wbh5a2 r-13hce6t"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2">
+<div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/sandymitt6" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div dir="ltr" class="css-901oao css-1hf3ou5 r-14j79pv r-18u37iz r-37j5jr r-1wvb978 r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">@sandymitt6</span></div></a></div>
+<div dir="ltr" aria-hidden="true" class="css-901oao r-14j79pv r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-s1qlax r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">·</span></div>
+<div class="css-1dbjc4n r-18u37iz r-1q142lx"><a href="/sandymitt6/status/1128112059109953536" dir="ltr" aria-label="May 14, 2019" role="link" class="css-4rbku5 css-18t94o4 css-901oao r-14j79pv r-1loqt21 r-xoduu5 r-1q142lx r-1w6e6rj r-37j5jr r-a023e6 r-16dba41 r-9aw3ui r-rjixqe r-bcqeeo r-3s2u2q r-qvutc0"><time datetime="2019-05-14T01:37:28.000Z">May 14, 2019</time></a></div>
+</div></div>
+</div></div></div></div></div>
+<div itemprop="articleBody" data-testid="tweetTextAnnotations"><div class="css-1dbjc4n"><div dir="auto" lang="da" class="css-901oao r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-bnwqim r-qvutc0" style="color:rgba(15,20,25,1.00)" id="id__qx0ct839hn" data-testid="tweetText"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Sweet @VANS_66 Kirk.</span></div></div></div>
+<div class="css-1dbjc4n"><div aria-label="1 like" role="group" class="css-1dbjc4n r-1ta3fxp r-18u37iz r-1wtj0ep r-1s2bzr4 r-1mdbhws" id="id__t6lemjk2ma">
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="0 Replies. Reply" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="reply"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M1.751 10c0-4.42 3.584-8 8.005-8h4.366c4.49 0 8.129 3.64 8.129 8.13 0 2.96-1.607 5.68-4.196 7.11l-8.054 4.46v-3.69h-.067c-4.49.1-8.183-3.51-8.183-8.01zm8.005-6c-3.317 0-6.005 2.69-6.005 6 0 3.37 2.77 6.08 6.138 6.01l.351-.01h1.761v2.3l5.087-2.81c1.951-1.08 3.163-3.13 3.163-5.36 0-3.39-2.744-6.13-6.129-6.13H9.756z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="0 Retweets. Retweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="retweet"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M4.5 3.88l4.432 4.14-1.364 1.46L5.5 7.55V16c0 1.1.896 2 2 2H13v2H7.5c-2.209 0-4-1.79-4-4V7.55L1.432 9.48.068 8.02 4.5 3.88zM16.5 6H11V4h5.5c2.209 0 4 1.79 4 4v8.45l2.068-1.93 1.364 1.46-4.432 4.14-4.432-4.14 1.364-1.46 2.068 1.93V8c0-1.1-.896-2-2-2z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="1 Like. Like" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="like"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M16.697 5.5c-1.222-.06-2.679.51-3.89 2.16l-.805 1.09-.806-1.09C9.984 6.01 8.526 5.44 7.304 5.5c-1.243.07-2.349.78-2.91 1.91-.552 1.12-.633 2.78.479 4.82 1.074 1.97 3.257 4.27 7.129 6.61 3.87-2.34 6.052-4.64 7.126-6.61 1.111-2.04 1.03-3.7.477-4.82-.561-1.13-1.666-1.84-2.908-1.91zm4.187 7.69c-1.351 2.48-4.001 5.12-8.379 7.67l-.503.3-.504-.3c-4.379-2.55-7.029-5.19-8.382-7.67-1.36-2.5-1.41-4.86-.514-6.67.887-1.79 2.647-2.91 4.601-3.01 1.651-.09 3.368.56 4.798 2.01 1.429-1.45 3.146-2.1 4.796-2.01 1.954.1 3.714 1.22 4.601 3.01.896 1.81.846 4.17-.514 6.67z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">1</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n" style="display:inline-grid;-webkit-justify-content:inherit;justify-content:inherit;-webkit-transform:rotate(0deg) scale(1) translate3d(0, 0, 0);transform:rotate(0deg) scale(1) translate3d(0, 0, 0);-ms-flex-pack:inherit;-webkit-box-pack:inherit"><div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="Share Tweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M12 2.59l5.7 5.7-1.41 1.42L13 6.41V16h-2V6.41l-3.3 3.3-1.41-1.42L12 2.59zM21 15l-.02 3.51c0 1.38-1.12 2.49-2.5 2.49H5.5C4.11 21 3 19.88 3 18.5V15h2v3.5c0 .28.22.5.5.5h12.98c.28 0 .5-.22.5-.5L19 15h2z"></path></g></svg>
+</div></div></div></div></div>
+</div></div>
+</div>
+</div>
+</div></div></article>
+</div></div>
+<div class="css-1dbjc4n r-1adg3ll r-1ny4l3l"></div>
+<div class="css-1dbjc4n r-j5o65s r-qklmqi r-1adg3ll r-1ny4l3l"><div itemprop="hasPart" itemscope="" itemtype="https://schema.org/SocialMediaPosting">
+<meta content="1128160260307468288" itemprop="identifier">
+<meta content="6" itemprop="position">
+<meta content="0" itemprop="commentCount">
+<meta content="" itemprop="contentRating">
+<meta content="2019-05-14T04:49:00.000Z" itemprop="dateCreated">
+<meta content="2019-05-14T04:49:00.000Z" itemprop="datePublished">
+<meta content="https://twitter.com/kaelgoth/status/1128160260307468288" itemprop="url">
+<div itemprop="author" itemscope="" itemtype="https://schema.org/Person">
+<meta content="702699632" itemprop="identifier">
+<meta content="kaelgoth" itemprop="additionalName">
+<meta content="Mika Chu" itemprop="givenName">
+</div>
+<meta content="https://twitter.com/Metallica/status/1128068672289890305" itemprop="isPartOf">
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/LikeAction" itemprop="interactionType">
+<meta content="Likes" itemprop="name">
+<meta content="https://twitter.com/kaelgoth/status/1128160260307468288/likes" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Retweets" itemprop="name">
+<meta content="https://twitter.com/kaelgoth/status/1128160260307468288/retweets" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Quotes" itemprop="name">
+<meta content="https://twitter.com/kaelgoth/status/1128160260307468288/retweets/with_comments" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Replies" itemprop="name">
+<meta content="https://twitter.com/kaelgoth/status/1128160260307468288" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<article aria-labelledby="id__5jj5weeggl3 id__2um4g1a2yca id__02ynu4dy4q2g id__df3rv70exs id__qqn1iqdhvgr id__29x6ig4e6ei id__n3lnk3wwf6f id__4067w7cs546 id__c88693uqgig id__lgcaor9t3ro id__j0236limgbs id__g28t9egty1o id__q57kfo0tue id__luvb76gdo89 id__18ekmf53drd id__3ifjo8s8wau id__lcclrz5b4ym id__ebons81jbn7" role="article" tabindex="-1" class="css-1dbjc4n r-18u37iz r-1ny4l3l r-1udh08x r-1qhn6m8 r-i023vh" data-testid="tweet"><div class="css-1dbjc4n r-eqz5dr r-16y2uox r-1wbh5a2"><div class="css-1dbjc4n r-16y2uox r-1wbh5a2 r-1ny4l3l">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-18u37iz"><div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-ttdzmv"></div></div></div>
+<div class="css-1dbjc4n r-18u37iz">
+<div class="css-1dbjc4n r-1awozwy r-1hwvwag r-18kxxzh r-1b7u577"><div class="css-1dbjc4n" data-testid="Tweet-User-Avatar"><div class="css-1dbjc4n r-18kxxzh r-1wbh5a2 r-13qz1uu"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1adg3ll r-h3s6tt r-bztko3" style="width:48px" data-testid="UserAvatar-Container-kaelgoth">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-1adg3ll r-1pi2tsx r-1wyvozj r-bztko3 r-u8s1d r-1v2oles r-desppf r-13qz1uu">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-ggadg3 r-1udh08x r-u8s1d r-8jfcpp" style="height:calc(100% - -4px);width:calc(100% - -4px)"><a href="/kaelgoth" aria-hidden="true" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1niwhzg r-1loqt21 r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1niwhzg r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-14lw9ot r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-14lw9ot r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1adg3ll r-1udh08x" style="background-color:rgba(185,202,211,1.00)">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/profile_images/780634865641349120/G3fP0jhI_400x400.jpg")'></div>
+<img alt="" draggable="true" src="https://pbs.twimg.com/profile_images/780634865641349120/G3fP0jhI_400x400.jpg" class="css-9pa8cd">
+</div></div>
+</div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-12181gd r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"></div></div></a></div></div>
+</div></div>
+</div></div></div></div></div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-1777fci r-kzbkwu">
+<div class="css-1dbjc4n r-zl2h9q"><div class="css-1dbjc4n r-k4xj1c r-18u37iz r-1wtj0ep"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs r-1ny4l3l" id="id__qqn1iqdhvgr" data-testid="User-Name">
+<div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/kaelgoth" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs">
+<div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-37j5jr r-a023e6 r-b88u0q r-rjixqe r-bcqeeo r-1udh08x r-3s2u2q r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Mika Chu</span></span></div>
+<div dir="ltr" class="css-901oao r-xoduu5 r-18u37iz r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 r-1awozwy r-xoduu5 r-poiln3 r-bcqeeo r-qvutc0"></span></div>
+</div></a></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1wbh5a2 r-13hce6t"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2">
+<div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/kaelgoth" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div dir="ltr" class="css-901oao css-1hf3ou5 r-14j79pv r-18u37iz r-37j5jr r-1wvb978 r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">@kaelgoth</span></div></a></div>
+<div dir="ltr" aria-hidden="true" class="css-901oao r-14j79pv r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-s1qlax r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">·</span></div>
+<div class="css-1dbjc4n r-18u37iz r-1q142lx"><a href="/kaelgoth/status/1128160260307468288" dir="ltr" aria-label="May 14, 2019" role="link" class="css-4rbku5 css-18t94o4 css-901oao r-14j79pv r-1loqt21 r-xoduu5 r-1q142lx r-1w6e6rj r-37j5jr r-a023e6 r-16dba41 r-9aw3ui r-rjixqe r-bcqeeo r-3s2u2q r-qvutc0"><time datetime="2019-05-14T04:49:00.000Z">May 14, 2019</time></a></div>
+</div></div>
+</div></div></div></div></div>
+<div itemprop="articleBody" data-testid="tweetTextAnnotations"><div class="css-1dbjc4n"><div dir="auto" lang="en" class="css-901oao r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-bnwqim r-qvutc0" style="color:rgba(15,20,25,1.00)" id="id__j0236limgbs" data-testid="tweetText"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Great move for 2 great causes.</span></div></div></div>
+<div class="css-1dbjc4n"><div aria-label="" role="group" class="css-1dbjc4n r-1ta3fxp r-18u37iz r-1wtj0ep r-1s2bzr4 r-1mdbhws" id="id__syn04vc4jw">
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="0 Replies. Reply" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="reply"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M1.751 10c0-4.42 3.584-8 8.005-8h4.366c4.49 0 8.129 3.64 8.129 8.13 0 2.96-1.607 5.68-4.196 7.11l-8.054 4.46v-3.69h-.067c-4.49.1-8.183-3.51-8.183-8.01zm8.005-6c-3.317 0-6.005 2.69-6.005 6 0 3.37 2.77 6.08 6.138 6.01l.351-.01h1.761v2.3l5.087-2.81c1.951-1.08 3.163-3.13 3.163-5.36 0-3.39-2.744-6.13-6.129-6.13H9.756z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="0 Retweets. Retweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="retweet"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M4.5 3.88l4.432 4.14-1.364 1.46L5.5 7.55V16c0 1.1.896 2 2 2H13v2H7.5c-2.209 0-4-1.79-4-4V7.55L1.432 9.48.068 8.02 4.5 3.88zM16.5 6H11V4h5.5c2.209 0 4 1.79 4 4v8.45l2.068-1.93 1.364 1.46-4.432 4.14-4.432-4.14 1.364-1.46 2.068 1.93V8c0-1.1-.896-2-2-2z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="0 Likes. Like" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="like"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M16.697 5.5c-1.222-.06-2.679.51-3.89 2.16l-.805 1.09-.806-1.09C9.984 6.01 8.526 5.44 7.304 5.5c-1.243.07-2.349.78-2.91 1.91-.552 1.12-.633 2.78.479 4.82 1.074 1.97 3.257 4.27 7.129 6.61 3.87-2.34 6.052-4.64 7.126-6.61 1.111-2.04 1.03-3.7.477-4.82-.561-1.13-1.666-1.84-2.908-1.91zm4.187 7.69c-1.351 2.48-4.001 5.12-8.379 7.67l-.503.3-.504-.3c-4.379-2.55-7.029-5.19-8.382-7.67-1.36-2.5-1.41-4.86-.514-6.67.887-1.79 2.647-2.91 4.601-3.01 1.651-.09 3.368.56 4.798 2.01 1.429-1.45 3.146-2.1 4.796-2.01 1.954.1 3.714 1.22 4.601 3.01.896 1.81.846 4.17-.514 6.67z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n" style="display:inline-grid;-webkit-justify-content:inherit;justify-content:inherit;-webkit-transform:rotate(0deg) scale(1) translate3d(0, 0, 0);transform:rotate(0deg) scale(1) translate3d(0, 0, 0);-ms-flex-pack:inherit;-webkit-box-pack:inherit"><div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="Share Tweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M12 2.59l5.7 5.7-1.41 1.42L13 6.41V16h-2V6.41l-3.3 3.3-1.41-1.42L12 2.59zM21 15l-.02 3.51c0 1.38-1.12 2.49-2.5 2.49H5.5C4.11 21 3 19.88 3 18.5V15h2v3.5c0 .28.22.5.5.5h12.98c.28 0 .5-.22.5-.5L19 15h2z"></path></g></svg>
+</div></div></div></div></div>
+</div></div>
+</div>
+</div>
+</div></div></article>
+</div></div>
+<div class="css-1dbjc4n r-1adg3ll r-1ny4l3l"></div>
+<div class="css-1dbjc4n r-j5o65s r-qklmqi r-1adg3ll r-1ny4l3l"><div itemprop="hasPart" itemscope="" itemtype="https://schema.org/SocialMediaPosting">
+<meta content="1128199343826018305" itemprop="identifier">
+<meta content="7" itemprop="position">
+<meta content="0" itemprop="commentCount">
+<meta content="" itemprop="contentRating">
+<meta content="2019-05-14T07:24:19.000Z" itemprop="dateCreated">
+<meta content="2019-05-14T07:24:19.000Z" itemprop="datePublished">
+<meta content="https://twitter.com/Ajkapoor2/status/1128199343826018305" itemprop="url">
+<div itemprop="author" itemscope="" itemtype="https://schema.org/Person">
+<meta content="1104301653392416769" itemprop="identifier">
+<meta content="Ajkapoor2" itemprop="additionalName">
+<meta content="Aj kapoor" itemprop="givenName">
+</div>
+<meta content="https://twitter.com/Metallica/status/1128068672289890305" itemprop="isPartOf">
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/LikeAction" itemprop="interactionType">
+<meta content="Likes" itemprop="name">
+<meta content="https://twitter.com/Ajkapoor2/status/1128199343826018305/likes" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Retweets" itemprop="name">
+<meta content="https://twitter.com/Ajkapoor2/status/1128199343826018305/retweets" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Quotes" itemprop="name">
+<meta content="https://twitter.com/Ajkapoor2/status/1128199343826018305/retweets/with_comments" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Replies" itemprop="name">
+<meta content="https://twitter.com/Ajkapoor2/status/1128199343826018305" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<article aria-labelledby="id__5de1tmxn0ei id__1tzfrepmn7m id__0h7edb9fjkzw id__1l281nsrhf6j id__e0xe9ow84yf id__x5xaqsfl62i id__ts81dh4kuv id__fpxwja8crea id__064b81odrqjk id__fhhcjhbhxws id__1u5w68o2vfh id__nln4w0peetk id__ahhat17u7gq id__6xagy4xdnpy id__4up1rr7frgr id__p5g73dmfw6 id__xwsepd4eibm id__7a3rr1ppht4" role="article" tabindex="-1" class="css-1dbjc4n r-18u37iz r-1ny4l3l r-1udh08x r-1qhn6m8 r-i023vh" data-testid="tweet"><div class="css-1dbjc4n r-eqz5dr r-16y2uox r-1wbh5a2"><div class="css-1dbjc4n r-16y2uox r-1wbh5a2 r-1ny4l3l">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-18u37iz"><div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-ttdzmv"></div></div></div>
+<div class="css-1dbjc4n r-18u37iz">
+<div class="css-1dbjc4n r-1awozwy r-1hwvwag r-18kxxzh r-1b7u577"><div class="css-1dbjc4n" data-testid="Tweet-User-Avatar"><div class="css-1dbjc4n r-18kxxzh r-1wbh5a2 r-13qz1uu"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1adg3ll r-h3s6tt r-bztko3" style="width:48px" data-testid="UserAvatar-Container-Ajkapoor2">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-1adg3ll r-1pi2tsx r-1wyvozj r-bztko3 r-u8s1d r-1v2oles r-desppf r-13qz1uu">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-ggadg3 r-1udh08x r-u8s1d r-8jfcpp" style="height:calc(100% - -4px);width:calc(100% - -4px)"><a href="/Ajkapoor2" aria-hidden="true" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1niwhzg r-1loqt21 r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1niwhzg r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-14lw9ot r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-14lw9ot r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1adg3ll r-1udh08x" style="background-color:rgba(185,202,211,1.00)">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/profile_images/1136530593829740545/F7waHoQn_400x400.jpg")'></div>
+<img alt="" draggable="true" src="https://pbs.twimg.com/profile_images/1136530593829740545/F7waHoQn_400x400.jpg" class="css-9pa8cd">
+</div></div>
+</div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-12181gd r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"></div></div></a></div></div>
+</div></div>
+</div></div></div></div></div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-1777fci r-kzbkwu">
+<div class="css-1dbjc4n r-zl2h9q"><div class="css-1dbjc4n r-k4xj1c r-18u37iz r-1wtj0ep"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs r-1ny4l3l" id="id__e0xe9ow84yf" data-testid="User-Name">
+<div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/Ajkapoor2" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs">
+<div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-37j5jr r-a023e6 r-b88u0q r-rjixqe r-bcqeeo r-1udh08x r-3s2u2q r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Aj kapoor</span></span></div>
+<div dir="ltr" class="css-901oao r-xoduu5 r-18u37iz r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 r-1awozwy r-xoduu5 r-poiln3 r-bcqeeo r-qvutc0"></span></div>
+</div></a></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1wbh5a2 r-13hce6t"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2">
+<div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/Ajkapoor2" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div dir="ltr" class="css-901oao css-1hf3ou5 r-14j79pv r-18u37iz r-37j5jr r-1wvb978 r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">@Ajkapoor2</span></div></a></div>
+<div dir="ltr" aria-hidden="true" class="css-901oao r-14j79pv r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-s1qlax r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">·</span></div>
+<div class="css-1dbjc4n r-18u37iz r-1q142lx"><a href="/Ajkapoor2/status/1128199343826018305" dir="ltr" aria-label="May 14, 2019" role="link" class="css-4rbku5 css-18t94o4 css-901oao r-14j79pv r-1loqt21 r-xoduu5 r-1q142lx r-1w6e6rj r-37j5jr r-a023e6 r-16dba41 r-9aw3ui r-rjixqe r-bcqeeo r-3s2u2q r-qvutc0"><time datetime="2019-05-14T07:24:19.000Z">May 14, 2019</time></a></div>
+</div></div>
+</div></div></div></div></div>
+<div itemprop="articleBody" data-testid="tweetTextAnnotations"><div class="css-1dbjc4n"><div dir="auto" lang="en" class="css-901oao r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-bnwqim r-qvutc0" style="color:rgba(15,20,25,1.00)" id="id__1u5w68o2vfh" data-testid="tweetText"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">ONE OF GREAT ROCK BAND</span></div></div></div>
+<div class="css-1dbjc4n"><div aria-label="" role="group" class="css-1dbjc4n r-1ta3fxp r-18u37iz r-1wtj0ep r-1s2bzr4 r-1mdbhws" id="id__69xqgl5pslg">
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="0 Replies. Reply" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="reply"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M1.751 10c0-4.42 3.584-8 8.005-8h4.366c4.49 0 8.129 3.64 8.129 8.13 0 2.96-1.607 5.68-4.196 7.11l-8.054 4.46v-3.69h-.067c-4.49.1-8.183-3.51-8.183-8.01zm8.005-6c-3.317 0-6.005 2.69-6.005 6 0 3.37 2.77 6.08 6.138 6.01l.351-.01h1.761v2.3l5.087-2.81c1.951-1.08 3.163-3.13 3.163-5.36 0-3.39-2.744-6.13-6.129-6.13H9.756z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="0 Retweets. Retweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="retweet"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M4.5 3.88l4.432 4.14-1.364 1.46L5.5 7.55V16c0 1.1.896 2 2 2H13v2H7.5c-2.209 0-4-1.79-4-4V7.55L1.432 9.48.068 8.02 4.5 3.88zM16.5 6H11V4h5.5c2.209 0 4 1.79 4 4v8.45l2.068-1.93 1.364 1.46-4.432 4.14-4.432-4.14 1.364-1.46 2.068 1.93V8c0-1.1-.896-2-2-2z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="0 Likes. Like" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="like"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M16.697 5.5c-1.222-.06-2.679.51-3.89 2.16l-.805 1.09-.806-1.09C9.984 6.01 8.526 5.44 7.304 5.5c-1.243.07-2.349.78-2.91 1.91-.552 1.12-.633 2.78.479 4.82 1.074 1.97 3.257 4.27 7.129 6.61 3.87-2.34 6.052-4.64 7.126-6.61 1.111-2.04 1.03-3.7.477-4.82-.561-1.13-1.666-1.84-2.908-1.91zm4.187 7.69c-1.351 2.48-4.001 5.12-8.379 7.67l-.503.3-.504-.3c-4.379-2.55-7.029-5.19-8.382-7.67-1.36-2.5-1.41-4.86-.514-6.67.887-1.79 2.647-2.91 4.601-3.01 1.651-.09 3.368.56 4.798 2.01 1.429-1.45 3.146-2.1 4.796-2.01 1.954.1 3.714 1.22 4.601 3.01.896 1.81.846 4.17-.514 6.67z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n" style="display:inline-grid;-webkit-justify-content:inherit;justify-content:inherit;-webkit-transform:rotate(0deg) scale(1) translate3d(0, 0, 0);transform:rotate(0deg) scale(1) translate3d(0, 0, 0);-ms-flex-pack:inherit;-webkit-box-pack:inherit"><div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="Share Tweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M12 2.59l5.7 5.7-1.41 1.42L13 6.41V16h-2V6.41l-3.3 3.3-1.41-1.42L12 2.59zM21 15l-.02 3.51c0 1.38-1.12 2.49-2.5 2.49H5.5C4.11 21 3 19.88 3 18.5V15h2v3.5c0 .28.22.5.5.5h12.98c.28 0 .5-.22.5-.5L19 15h2z"></path></g></svg>
+</div></div></div></div></div>
+</div></div>
+</div>
+</div>
+</div></div></article>
+</div></div>
+<div class="css-1dbjc4n r-1adg3ll r-1ny4l3l"></div>
+<div class="css-1dbjc4n r-j5o65s r-qklmqi r-1adg3ll r-1ny4l3l"><div itemprop="hasPart" itemscope="" itemtype="https://schema.org/SocialMediaPosting">
+<meta content="1128299417537138689" itemprop="identifier">
+<meta content="8" itemprop="position">
+<meta content="0" itemprop="commentCount">
+<meta content="" itemprop="contentRating">
+<meta content="2019-05-14T14:01:58.000Z" itemprop="dateCreated">
+<meta content="2019-05-14T14:01:58.000Z" itemprop="datePublished">
+<meta content="https://twitter.com/lchristinep/status/1128299417537138689" itemprop="url">
+<div itemprop="author" itemscope="" itemtype="https://schema.org/Person">
+<meta content="777529956" itemprop="identifier">
+<meta content="lchristinep" itemprop="additionalName">
+<meta content="Power of Three- Energy, Frequency, Vibration 🧬" itemprop="givenName">
+</div>
+<meta content="https://twitter.com/Metallica/status/1128068672289890305" itemprop="isPartOf">
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/LikeAction" itemprop="interactionType">
+<meta content="Likes" itemprop="name">
+<meta content="https://twitter.com/lchristinep/status/1128299417537138689/likes" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Retweets" itemprop="name">
+<meta content="https://twitter.com/lchristinep/status/1128299417537138689/retweets" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Quotes" itemprop="name">
+<meta content="https://twitter.com/lchristinep/status/1128299417537138689/retweets/with_comments" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Replies" itemprop="name">
+<meta content="https://twitter.com/lchristinep/status/1128299417537138689" itemprop="url">
+<meta content="0" itemprop="userInteractionCount">
+</div>
+<article aria-labelledby="id__xdkyxi9ih5 id__piz0yt4ik9 id__jrjsxpsxfl id__km2xgs0a2g id__0i6ys07xub4h id__z4v5vsiigyp id__0sn68k0lwxrj id__985xx2qtjb7 id__8wzeugwdqls id__y5imcplqvhd id__7vwovxnmo87 id__8bwsfs1i633 id__ukoe0jld2pl id__pzxa4vkl7mo id__3ryoy7ekps5 id__xfbx9aznvij id__9d8a0sz9bzq id__dr55puibj0l" role="article" tabindex="-1" class="css-1dbjc4n r-18u37iz r-1ny4l3l r-1udh08x r-1qhn6m8 r-i023vh" data-testid="tweet"><div class="css-1dbjc4n r-eqz5dr r-16y2uox r-1wbh5a2"><div class="css-1dbjc4n r-16y2uox r-1wbh5a2 r-1ny4l3l">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-18u37iz"><div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-ttdzmv"></div></div></div>
+<div class="css-1dbjc4n r-18u37iz">
+<div class="css-1dbjc4n r-1awozwy r-1hwvwag r-18kxxzh r-1b7u577"><div class="css-1dbjc4n" data-testid="Tweet-User-Avatar"><div class="css-1dbjc4n r-18kxxzh r-1wbh5a2 r-13qz1uu"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1adg3ll r-h3s6tt r-bztko3" style="width:48px" data-testid="UserAvatar-Container-lchristinep">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-1adg3ll r-1pi2tsx r-1wyvozj r-bztko3 r-u8s1d r-1v2oles r-desppf r-13qz1uu">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-ggadg3 r-1udh08x r-u8s1d r-8jfcpp" style="height:calc(100% - -4px);width:calc(100% - -4px)"><a href="/lchristinep" aria-hidden="true" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1niwhzg r-1loqt21 r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"><div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1niwhzg r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-14lw9ot r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-14lw9ot r-sdzlij r-1wyvozj r-1udh08x r-633pao r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1adg3ll r-1udh08x" style="background-color:rgba(185,202,211,1.00)">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/profile_images/1627331665717780480/_JsgNBBI_400x400.jpg")'></div>
+<img alt="" draggable="true" src="https://pbs.twimg.com/profile_images/1627331665717780480/_JsgNBBI_400x400.jpg" class="css-9pa8cd">
+</div></div>
+</div></div>
+<div class="css-1dbjc4n r-sdzlij r-1wyvozj r-1udh08x r-u8s1d r-1v2oles r-desppf" style="height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-12181gd r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"></div></div></a></div></div>
+</div></div>
+</div></div></div></div></div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-1777fci r-kzbkwu">
+<div class="css-1dbjc4n r-zl2h9q"><div class="css-1dbjc4n r-k4xj1c r-18u37iz r-1wtj0ep"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs r-1ny4l3l" id="id__0i6ys07xub4h" data-testid="User-Name">
+<div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/lchristinep" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs">
+<div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-37j5jr r-a023e6 r-b88u0q r-rjixqe r-bcqeeo r-1udh08x r-3s2u2q r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Power of Three- Energy, Frequency, Vibration </span><img alt="🧬" draggable="false" src="https://abs-0.twimg.com/emoji/v2/svg/1f9ec.svg" class="r-4qtqp9 r-dflpy8 r-sjv1od r-zw8f10 r-10akycc r-h9hxbl"></span></div>
+<div dir="ltr" class="css-901oao r-xoduu5 r-18u37iz r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 r-1awozwy r-xoduu5 r-poiln3 r-bcqeeo r-qvutc0"></span></div>
+</div></a></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1wbh5a2 r-13hce6t"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2">
+<div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/lchristinep" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div dir="ltr" class="css-901oao css-1hf3ou5 r-14j79pv r-18u37iz r-37j5jr r-1wvb978 r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">@lchristinep</span></div></a></div>
+<div dir="ltr" aria-hidden="true" class="css-901oao r-14j79pv r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-s1qlax r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">·</span></div>
+<div class="css-1dbjc4n r-18u37iz r-1q142lx"><a href="/lchristinep/status/1128299417537138689" dir="ltr" aria-label="May 14, 2019" role="link" class="css-4rbku5 css-18t94o4 css-901oao r-14j79pv r-1loqt21 r-xoduu5 r-1q142lx r-1w6e6rj r-37j5jr r-a023e6 r-16dba41 r-9aw3ui r-rjixqe r-bcqeeo r-3s2u2q r-qvutc0"><time datetime="2019-05-14T14:01:58.000Z">May 14, 2019</time></a></div>
+</div></div>
+</div></div></div></div></div>
+<div itemprop="articleBody" data-testid="tweetTextAnnotations"><div class="css-1dbjc4n"><div dir="auto" lang="qme" class="css-901oao r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-bnwqim r-qvutc0" style="color:rgba(15,20,25,1.00)" id="id__7vwovxnmo87" data-testid="tweetText">
+<span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">🤘</span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">💜</span>
+</div></div></div>
+<div class="css-1dbjc4n"><div aria-label="" role="group" class="css-1dbjc4n r-1ta3fxp r-18u37iz r-1wtj0ep r-1s2bzr4 r-1mdbhws" id="id__tb9mlhxknp">
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="0 Replies. Reply" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="reply"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M1.751 10c0-4.42 3.584-8 8.005-8h4.366c4.49 0 8.129 3.64 8.129 8.13 0 2.96-1.607 5.68-4.196 7.11l-8.054 4.46v-3.69h-.067c-4.49.1-8.183-3.51-8.183-8.01zm8.005-6c-3.317 0-6.005 2.69-6.005 6 0 3.37 2.77 6.08 6.138 6.01l.351-.01h1.761v2.3l5.087-2.81c1.951-1.08 3.163-3.13 3.163-5.36 0-3.39-2.744-6.13-6.129-6.13H9.756z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="0 Retweets. Retweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="retweet"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M4.5 3.88l4.432 4.14-1.364 1.46L5.5 7.55V16c0 1.1.896 2 2 2H13v2H7.5c-2.209 0-4-1.79-4-4V7.55L1.432 9.48.068 8.02 4.5 3.88zM16.5 6H11V4h5.5c2.209 0 4 1.79 4 4v8.45l2.068-1.93 1.364 1.46-4.432 4.14-4.432-4.14 1.364-1.46 2.068 1.93V8c0-1.1-.896-2-2-2z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="0 Likes. Like" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="like"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M16.697 5.5c-1.222-.06-2.679.51-3.89 2.16l-.805 1.09-.806-1.09C9.984 6.01 8.526 5.44 7.304 5.5c-1.243.07-2.349.78-2.91 1.91-.552 1.12-.633 2.78.479 4.82 1.074 1.97 3.257 4.27 7.129 6.61 3.87-2.34 6.052-4.64 7.126-6.61 1.111-2.04 1.03-3.7.477-4.82-.561-1.13-1.666-1.84-2.908-1.91zm4.187 7.69c-1.351 2.48-4.001 5.12-8.379 7.67l-.503.3-.504-.3c-4.379-2.55-7.029-5.19-8.382-7.67-1.36-2.5-1.41-4.86-.514-6.67.887-1.79 2.647-2.91 4.601-3.01 1.651-.09 3.368.56 4.798 2.01 1.429-1.45 3.146-2.1 4.796-2.01 1.954.1 3.714 1.22 4.601 3.01.896 1.81.846 4.17-.514 6.67z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n" style="display:inline-grid;-webkit-justify-content:inherit;justify-content:inherit;-webkit-transform:rotate(0deg) scale(1) translate3d(0, 0, 0);transform:rotate(0deg) scale(1) translate3d(0, 0, 0);-ms-flex-pack:inherit;-webkit-box-pack:inherit"><div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="Share Tweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M12 2.59l5.7 5.7-1.41 1.42L13 6.41V16h-2V6.41l-3.3 3.3-1.41-1.42L12 2.59zM21 15l-.02 3.51c0 1.38-1.12 2.49-2.5 2.49H5.5C4.11 21 3 19.88 3 18.5V15h2v3.5c0 .28.22.5.5.5h12.98c.28 0 .5-.22.5-.5L19 15h2z"></path></g></svg>
+</div></div></div></div></div>
+</div></div>
+</div>
+</div>
+</div></div></article>
+</div></div>
+<div class="css-1dbjc4n r-1adg3ll r-1ny4l3l"></div>
+<div class="css-1dbjc4n r-1adg3ll r-1ny4l3l"><div class="css-1dbjc4n r-1wtj0ep r-1ny4l3l r-ymttw5 r-1f1sjgu">
+<h2 aria-level="2" role="heading" class="css-4rbku5 css-1dbjc4n r-18u37iz">
+<div class="css-1dbjc4n r-k200y r-z80fyv r-1777fci"></div>
+<div dir="ltr" class="css-901oao css-cens5h r-37j5jr r-adyw6z r-1vr29t4 r-135wba7 r-bcqeeo r-qvutc0" style="-webkit-line-clamp:3;color:rgba(15,20,25,1.00);max-height:calc(3 * 24px)"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Discover more</span></div>
+<div class="css-1dbjc4n r-1kihuf0 r-18u37iz r-16y2uox r-17s6mgv"><div class="css-1dbjc4n"></div></div>
+</h2>
+<div dir="ltr" class="css-901oao css-cens5h r-k200y r-14j79pv r-37j5jr r-n6v787 r-16dba41 r-1cwl3u0 r-bcqeeo r-qvutc0" style="-webkit-line-clamp:2;max-height:calc(2 * 16px)"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Sourced from across Twitter</span></div>
+</div></div>
+<div class="css-1dbjc4n r-j5o65s r-qklmqi r-1adg3ll r-1ny4l3l"><div itemprop="hasPart" itemscope="" itemtype="https://schema.org/SocialMediaPosting">
+<meta content="1670883033954791424" itemprop="identifier">
+<meta content="9" itemprop="position">
+<meta content="37" itemprop="commentCount">
+<meta content="" itemprop="contentRating">
+<meta content="2023-06-19T19:55:33.000Z" itemprop="dateCreated">
+<meta content="2023-06-19T19:55:33.000Z" itemprop="datePublished">
+<meta content="https://twitter.com/Metallica/status/1670883033954791424" itemprop="url">
+<div itemprop="author" itemscope="" itemtype="https://schema.org/Person">
+<meta content="238475531" itemprop="identifier">
+<meta content="Metallica" itemprop="additionalName">
+<meta content="Metallica" itemprop="givenName">
+</div>
+<div itemprop="sharedContent" itemscope="" itemtype="https://schema.org/CreativeWork">
+<meta content="Expanded Tweet URLs" itemprop="name">
+<meta content="https://t.co/ynEbXh65nu" itemprop="url">
+<meta content="http://youtu.be/YfouL5PyORU" itemprop="url">
+<meta content="https://t.co/Y88XIqBwW1" itemprop="url">
+<meta content="http://metallica.lnk.to/LiveInDonington2023Night2" itemprop="url">
+<meta content="https://t.co/MpX87C2hCO" itemprop="url">
+<meta content="https://twitter.com/Metallica/status/1670883033954791424/video/1" itemprop="url">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/LikeAction" itemprop="interactionType">
+<meta content="Likes" itemprop="name">
+<meta content="https://twitter.com/Metallica/status/1670883033954791424/likes" itemprop="url">
+<meta content="2296" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Retweets" itemprop="name">
+<meta content="https://twitter.com/Metallica/status/1670883033954791424/retweets" itemprop="url">
+<meta content="326" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Quotes" itemprop="name">
+<meta content="https://twitter.com/Metallica/status/1670883033954791424/retweets/with_comments" itemprop="url">
+<meta content="26" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Replies" itemprop="name">
+<meta content="https://twitter.com/Metallica/status/1670883033954791424" itemprop="url">
+<meta content="37" itemprop="userInteractionCount">
+</div>
+<article aria-labelledby="id__n1gj76kevkh id__sdihoc3zb4f id__9so69dxs4yn id__ds3wqj03kc id__53mu7adf8yl id__o52zs98gue id__p1x6v014hu id__jue6yokt2vl id__qdcyrjnnsgk id__9jdaqu47wfg id__hh9be7r6dff id__x07wp1rh04 id__xptwyy4gyvk id__94aqbdahqit id__bit8ephsr9c id__g3xrd4nwcn id__6m3rbu7qxpp id__k7g5gfb732k id__wmn66a2741l" role="article" tabindex="-1" class="css-1dbjc4n r-18u37iz r-1ny4l3l r-1udh08x r-1qhn6m8 r-i023vh" data-testid="tweet"><div class="css-1dbjc4n r-eqz5dr r-16y2uox r-1wbh5a2"><div class="css-1dbjc4n r-16y2uox r-1wbh5a2 r-1ny4l3l">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-18u37iz"><div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-ttdzmv"></div></div></div>
+<div class="css-1dbjc4n r-18u37iz">
+<div class="css-1dbjc4n r-1awozwy r-1hwvwag r-18kxxzh r-1b7u577"><div class="css-1dbjc4n" data-testid="Tweet-User-Avatar"><div class="css-1dbjc4n r-18kxxzh r-1wbh5a2 r-13qz1uu"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1adg3ll r-h3s6tt r-bztko3" style="width:48px" data-testid="UserAvatar-Container-Metallica">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-1adg3ll r-1pi2tsx r-1wyvozj r-bztko3 r-u8s1d r-1v2oles r-desppf r-13qz1uu">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-ggadg3 r-u8s1d r-8jfcpp" style="-webkit-clip-path:url(#shape-square);clip-path:url(#shape-square);height:calc(100% - -4px);width:calc(100% - -4px)"><a href="/Metallica" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1niwhzg r-1loqt21 r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"><div class="css-1dbjc4n r-1wyvozj r-633pao r-u8s1d r-1v2oles r-desppf" style="-webkit-clip-path:url(#shape-square);clip-path:url(#shape-square);height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1niwhzg r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-1wyvozj r-633pao r-u8s1d r-1v2oles r-desppf" style="-webkit-clip-path:url(#shape-square-rx-8);clip-path:url(#shape-square-rx-8);height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-14lw9ot r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-14lw9ot r-1wyvozj r-633pao r-u8s1d r-1v2oles r-desppf" style="-webkit-clip-path:url(#shape-square-rx-8);clip-path:url(#shape-square-rx-8);height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1adg3ll r-1udh08x" style="background-color:rgba(185,202,211,1.00)">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="Square profile picture" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/profile_images/1597280886809952256/gsJvGiqU_400x400.jpg")'></div>
+<img alt="Square profile picture" draggable="true" src="https://pbs.twimg.com/profile_images/1597280886809952256/gsJvGiqU_400x400.jpg" class="css-9pa8cd">
+</div></div>
+</div></div>
+<div class="css-1dbjc4n r-1wyvozj r-u8s1d r-1v2oles r-desppf" style="-webkit-clip-path:url(#shape-square-rx-8);clip-path:url(#shape-square-rx-8);height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-12181gd r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"></div></div></a></div></div>
+</div></div>
+</div></div></div></div></div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-1777fci r-kzbkwu">
+<div class="css-1dbjc4n r-zl2h9q"><div class="css-1dbjc4n r-k4xj1c r-18u37iz r-1wtj0ep"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs r-1ny4l3l" id="id__53mu7adf8yl" data-testid="User-Name">
+<div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/Metallica" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs">
+<div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-37j5jr r-a023e6 r-b88u0q r-rjixqe r-bcqeeo r-1udh08x r-3s2u2q r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Metallica</span></span></div>
+<div dir="ltr" class="css-901oao r-xoduu5 r-18u37iz r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 r-1awozwy r-xoduu5 r-poiln3 r-bcqeeo r-qvutc0"><svg viewbox="0 0 22 22" aria-label="Verified account" role="img" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-9cviqr r-f9ja8p r-og9te1 r-bnwqim r-1plcrui r-lrvibr" data-testid="icon-verified"><g><lineargradient gradientunits="userSpaceOnUse" id="18691-a" x1="4.411" x2="18.083" y1="2.495" y2="21.508"><stop offset="0" stop-color="#f4e72a"></stop><stop offset=".539" stop-color="#cd8105"></stop><stop offset=".68" stop-color="#cb7b00"></stop><stop offset="1" stop-color="#f4ec26"></stop><stop offset="1" stop-color="#f4e72a"></stop></lineargradient><lineargradient gradientunits="userSpaceOnUse" id="18691-b" x1="5.355" x2="16.361" y1="3.395" y2="19.133"><stop offset="0" stop-color="#f9e87f"></stop><stop offset=".406" stop-color="#e2b719"></stop><stop offset=".989" stop-color="#e2b719"></stop></lineargradient><g clip-rule="evenodd" fill-rule="evenodd"><path d="M13.324 3.848L11 1.6 8.676 3.848l-3.201-.453-.559 3.184L2.06 8.095 3.48 11l-1.42 2.904 2.856 1.516.559 3.184 3.201-.452L11 20.4l2.324-2.248 3.201.452.559-3.184 2.856-1.516L18.52 11l1.42-2.905-2.856-1.516-.559-3.184zm-7.09 7.575l3.428 3.428 5.683-6.206-1.347-1.247-4.4 4.795-2.072-2.072z" fill="url(#18691-a)"></path><path d="M13.101 4.533L11 2.5 8.899 4.533l-2.895-.41-.505 2.88-2.583 1.37L4.2 11l-1.284 2.627 2.583 1.37.505 2.88 2.895-.41L11 19.5l2.101-2.033 2.895.41.505-2.88 2.583-1.37L17.8 11l1.284-2.627-2.583-1.37-.505-2.88zm-6.868 6.89l3.429 3.428 5.683-6.206-1.347-1.247-4.4 4.795-2.072-2.072z" fill="url(#18691-b)"></path><path d="M6.233 11.423l3.429 3.428 5.65-6.17.038-.033-.005 1.398-5.683 6.206-3.429-3.429-.003-1.405.005.003z" fill="#d18800"></path></g></g></svg></span></div>
+</div></a></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1wbh5a2 r-13hce6t"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2">
+<div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/Metallica" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div dir="ltr" class="css-901oao css-1hf3ou5 r-14j79pv r-18u37iz r-37j5jr r-1wvb978 r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">@Metallica</span></div></a></div>
+<div dir="ltr" aria-hidden="true" class="css-901oao r-14j79pv r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-s1qlax r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">·</span></div>
+<div class="css-1dbjc4n r-18u37iz r-1q142lx"><a href="/Metallica/status/1670883033954791424" dir="ltr" aria-label="Jun 19" role="link" class="css-4rbku5 css-18t94o4 css-901oao r-14j79pv r-1loqt21 r-xoduu5 r-1q142lx r-1w6e6rj r-37j5jr r-a023e6 r-16dba41 r-9aw3ui r-rjixqe r-bcqeeo r-3s2u2q r-qvutc0"><time datetime="2023-06-19T19:55:33.000Z">Jun 19</time></a></div>
+</div></div>
+</div></div></div></div></div>
+<div itemprop="articleBody" data-testid="tweetTextAnnotations"><div class="css-1dbjc4n"><div dir="auto" lang="en" class="css-901oao r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-bnwqim r-qvutc0" style="color:rgba(15,20,25,1.00)" id="id__hh9be7r6dff" data-testid="tweetText">
+<span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">“But the devil take that woman…” </span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">🏴󠁧󠁢󠁥󠁮󠁧󠁿</span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0"> </span><span class="r-18u37iz"><a dir="ltr" href="/hashtag/M72Donington?src=hashtag_click" role="link" class="css-4rbku5 css-18t94o4 css-901oao css-16my406 r-1cvl2hr r-1loqt21 r-poiln3 r-bcqeeo r-qvutc0">#M72Donington</a></span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0"> Night 2
 
+Watch the Full Video </span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">⚡</span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0"> </span><a dir="ltr" href="https://t.co/ynEbXh65nu" rel="noopener noreferrer nofollow" target="_blank" role="link" class="css-4rbku5 css-18t94o4 css-901oao css-16my406 r-1cvl2hr r-1loqt21 r-poiln3 r-bcqeeo r-qvutc0"><span aria-hidden="true" class="css-901oao css-16my406 r-poiln3 r-hiw28u r-qvk6io r-bcqeeo r-qvutc0">http://</span>youtu.be/YfouL5PyORU</a><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">
 
+Listen to the Full Show </span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">🎧</span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0"> </span><a dir="ltr" href="https://t.co/Y88XIqBwW1" rel="noopener noreferrer nofollow" target="_blank" role="link" class="css-4rbku5 css-18t94o4 css-901oao css-16my406 r-1cvl2hr r-1loqt21 r-poiln3 r-bcqeeo r-qvutc0"><span aria-hidden="true" class="css-901oao css-16my406 r-poiln3 r-hiw28u r-qvk6io r-bcqeeo r-qvutc0">http://</span>metallica.lnk.to/LiveInDoningto<span aria-hidden="true" class="css-901oao css-16my406 r-poiln3 r-hiw28u r-qvk6io r-bcqeeo r-qvutc0">n2023Night2</span><span aria-hidden="true" class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-lrvibr r-qvutc0">…</span></a><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">
 
-      <input type="hidden" id="init-data" class="json-data" value="{&quot;keyboardShortcuts&quot;:[{&quot;name&quot;:&quot;Acciones&quot;,&quot;description&quot;:&quot;Atajos para acciones comunes.&quot;,&quot;shortcuts&quot;:[{&quot;keys&quot;:[&quot;Enter&quot;],&quot;description&quot;:&quot;Abrir detalles del Tweet&quot;},{&quot;keys&quot;:[&quot;o&quot;],&quot;description&quot;:&quot;Expandir foto&quot;},{&quot;keys&quot;:[&quot;\/&quot;],&quot;description&quot;:&quot;Buscar&quot;}]},{&quot;name&quot;:&quot;Navegaci\u00f3n&quot;,&quot;description&quot;:&quot;Atajos para navegar entre elementos en las cronolog\u00edas.&quot;,&quot;shortcuts&quot;:[{&quot;keys&quot;:[&quot;?&quot;],&quot;description&quot;:&quot;Este men\u00fa&quot;},{&quot;keys&quot;:[&quot;j&quot;],&quot;description&quot;:&quot;Siguiente Tweet&quot;},{&quot;keys&quot;:[&quot;k&quot;],&quot;description&quot;:&quot;Tweet anterior&quot;},{&quot;keys&quot;:[&quot;Space&quot;],&quot;description&quot;:&quot;Desplazar hacia abajo&quot;},{&quot;keys&quot;:[&quot;.&quot;],&quot;description&quot;:&quot;Cargar Tweets nuevos&quot;}]},{&quot;name&quot;:&quot;Cronolog\u00edas&quot;,&quot;description&quot;:&quot;Atajos para navegar a diferentes cronolog\u00edas o p\u00e1ginas.&quot;,&quot;shortcuts&quot;:[{&quot;keys&quot;:[&quot;g&quot;,&quot;u&quot;],&quot;description&quot;:&quot;Ir al usuario\u2026&quot;}]}],&quot;baseFoucClass&quot;:&quot;swift-loading&quot;,&quot;bodyFoucClassNames&quot;:&quot;swift-loading no-nav-banners&quot;,&quot;assetsBasePath&quot;:&quot;https:\/\/abs.twimg.com\/a\/1558678534\/&quot;,&quot;assetVersionKey&quot;:&quot;486a8f&quot;,&quot;emojiAssetsPath&quot;:&quot;https:\/\/abs.twimg.com\/emoji\/v2\/72x72\/&quot;,&quot;environment&quot;:&quot;production&quot;,&quot;formAuthenticityToken&quot;:&quot;b236e0558eecae44fa52b464d55738d5236980e7&quot;,&quot;loggedIn&quot;:false,&quot;screenName&quot;:null,&quot;fullName&quot;:null,&quot;userId&quot;:null,&quot;guestId&quot;:&quot;155925164498999276&quot;,&quot;createdAt&quot;:null,&quot;needsPhoneVerification&quot;:false,&quot;allowAdsPersonalization&quot;:true,&quot;scribeBufferSize&quot;:3,&quot;pageName&quot;:&quot;permalink&quot;,&quot;sectionName&quot;:&quot;permalink&quot;,&quot;scribeParameters&quot;:{},&quot;recaptchaApiUrl&quot;:&quot;https:\/\/www.google.com\/recaptcha\/api\/js\/recaptcha_ajax.js&quot;,&quot;internalReferer&quot;:null,&quot;geoEnabled&quot;:false,&quot;typeaheadData&quot;:{&quot;accounts&quot;:{&quot;enabled&quot;:true,&quot;localQueriesEnabled&quot;:false,&quot;remoteQueriesEnabled&quot;:true,&quot;limit&quot;:6},&quot;trendLocations&quot;:{&quot;enabled&quot;:true},&quot;dmConversations&quot;:{&quot;enabled&quot;:false},&quot;followedSearches&quot;:{&quot;enabled&quot;:false},&quot;savedSearches&quot;:{&quot;enabled&quot;:false,&quot;items&quot;:[]},&quot;dmAccounts&quot;:{&quot;enabled&quot;:false,&quot;localQueriesEnabled&quot;:false,&quot;remoteQueriesEnabled&quot;:false,&quot;onlyDMable&quot;:true},&quot;mediaTagAccounts&quot;:{&quot;enabled&quot;:false,&quot;localQueriesEnabled&quot;:false,&quot;remoteQueriesEnabled&quot;:false,&quot;onlyShowUsersWithCanMediaTag&quot;:false,&quot;currentUserId&quot;:-1},&quot;selectedUsers&quot;:{&quot;enabled&quot;:false},&quot;prefillUsers&quot;:{&quot;enabled&quot;:false},&quot;topics&quot;:{&quot;enabled&quot;:true,&quot;localQueriesEnabled&quot;:false,&quot;remoteQueriesEnabled&quot;:true,&quot;prefetchLimit&quot;:500,&quot;limit&quot;:4},&quot;concierge&quot;:{&quot;enabled&quot;:false,&quot;localQueriesEnabled&quot;:false,&quot;remoteQueriesEnabled&quot;:false,&quot;prefetchLimit&quot;:500,&quot;limit&quot;:6},&quot;recentSearches&quot;:{&quot;enabled&quot;:false},&quot;hashtags&quot;:{&quot;enabled&quot;:false,&quot;localQueriesEnabled&quot;:false,&quot;remoteQueriesEnabled&quot;:true,&quot;prefetchLimit&quot;:500},&quot;useIndexedDB&quot;:false,&quot;showSearchAccountSocialContext&quot;:false,&quot;showDebugInfo&quot;:false,&quot;useThrottle&quot;:true,&quot;accountsOnTop&quot;:false,&quot;remoteDebounceInterval&quot;:300,&quot;remoteThrottleInterval&quot;:300,&quot;tweetContextEnabled&quot;:false,&quot;fullNameMatchingInCompose&quot;:true,&quot;topicsWithFiltersEnabled&quot;:false},&quot;shellReferrer&quot;:null,&quot;rwebOptInCookieName&quot;:&quot;rweb_optin&quot;,&quot;rwebOptInCookieNewValue&quot;:&quot;on&quot;,&quot;dm&quot;:{&quot;notifications&quot;:false,&quot;usePushForNotifications&quot;:false,&quot;participant_max&quot;:50,&quot;welcome_message_add_to_conversation_enabled&quot;:true,&quot;poll_options&quot;:{&quot;foreground_poll_interval&quot;:3000,&quot;burst_poll_interval&quot;:3000,&quot;burst_poll_duration&quot;:300000,&quot;max_poll_interval&quot;:60000},&quot;card_prefetch&quot;:true,&quot;card_prefetch_interval_in_seconds&quot;:2000,&quot;dm_quick_reply_options_panel_dismiss_in_ms&quot;:2000,&quot;open_dm_enabled&quot;:false},&quot;autoplayDisabled&quot;:false,&quot;pushStatePageLimit&quot;:500000,&quot;routes&quot;:{&quot;profile&quot;:&quot;\/&quot;},&quot;pushState&quot;:true,&quot;viewContainer&quot;:&quot;#page-container&quot;,&quot;href&quot;:&quot;\/Metallica\/status\/1128068672289890305&quot;,&quot;searchPathWithQuery&quot;:&quot;\/search?q=query&amp;src=typd&quot;,&quot;composeAltText&quot;:false,&quot;night_mode_activated&quot;:false,&quot;user_color&quot;:null,&quot;deciders&quot;:{&quot;gdprAgeGateDialog&quot;:true,&quot;gdprSoftBounceDialog&quot;:true,&quot;geo_picker_incident_reset&quot;:true,&quot;custom_timeline_curation&quot;:false,&quot;native_notifications&quot;:true,&quot;disable_ajax_datatype_default_to_text&quot;:false,&quot;dm_polling_frequency_in_seconds&quot;:3000,&quot;dm_granular_mute_controls&quot;:true,&quot;enable_media_tag_prefetch&quot;:true,&quot;enableMacawNymizerConversionLanding&quot;:false,&quot;hqImageUploads&quot;:false,&quot;live_pipeline_consume&quot;:true,&quot;mqImageUploads&quot;:false,&quot;partnerIdSyncEnabled&quot;:true,&quot;sruMediaCategory&quot;:true,&quot;photoSruGifLimitMb&quot;:15,&quot;promoted_logging_force_post&quot;:true,&quot;promoted_video_logging_enabled&quot;:true,&quot;pushState&quot;:true,&quot;emojiNewCategory&quot;:false,&quot;contentEditablePlainTextOnly&quot;:false,&quot;web_client_api_stats&quot;:false,&quot;web_perftown_stats&quot;:true,&quot;web_perftown_ttft&quot;:false,&quot;web_client_events_ttft&quot;:false,&quot;log_push_state_ttft_metrics&quot;:false,&quot;web_sru_stats&quot;:false,&quot;web_upload_video&quot;:true,&quot;web_upload_video_advanced&quot;:false,&quot;upload_video_size&quot;:500,&quot;useVmapVariants&quot;:false,&quot;autoplayPreviewPreroll&quot;:true,&quot;moments_home_module&quot;:false,&quot;moments_lohp_enabled&quot;:true,&quot;enableNativePush&quot;:false,&quot;autoSubscribeNativePush&quot;:false,&quot;allowWebPushVapidUpgrade&quot;:true,&quot;stickersInteractivity&quot;:true,&quot;stickersInteractivityDuringLoading&quot;:true,&quot;stickersExperience&quot;:true,&quot;dynamic_video_ads_include_long_videos&quot;:true,&quot;push_state_size&quot;:1000,&quot;live_video_media_control_enabled&quot;:false,&quot;cards2_enable_periscope_card_transition&quot;:true,&quot;use_api_for_retweet_and_unretweet&quot;:false,&quot;use_api_for_follow_and_unfollow&quot;:true,&quot;edge_probe_enabled&quot;:false,&quot;like_over_http_client&quot;:true,&quot;enable_inline_location&quot;:true,&quot;enable_tweetstorm_creation&quot;:true,&quot;enable_tweetstorm_drafts&quot;:false,&quot;enable_tweetstorm_tooltip&quot;:true,&quot;twitter_text_emoji_counting_enabled&quot;:true,&quot;text_length_for_tweetstorm_tooltip&quot;:50,&quot;dm_report_webview_macaw_swift_enabled&quot;:true,&quot;page_title_unread_notification_count&quot;:false,&quot;page_title_badge_after_unread_tweets&quot;:20},&quot;experiments&quot;:{},&quot;toasts_dm&quot;:false,&quot;toasts_timeline&quot;:false,&quot;toasts_dm_poll_scale&quot;:60,&quot;defaultNotificationIcon&quot;:&quot;https:\/\/abs.twimg.com\/a\/1558678534\/img\/t1\/mobile\/wp7_app_icon.png&quot;,&quot;promptbirdData&quot;:{&quot;promptbirdEnabled&quot;:false,&quot;immediateTriggers&quot;:[&quot;PullToRefresh&quot;,&quot;Navigate&quot;],&quot;format&quot;:null},&quot;passwordResetAdvancedLoginForm&quot;:true,&quot;skipAutoSignupDialog&quot;:true,&quot;shouldReplaceSignupWithLogin&quot;:false,&quot;activeHashflags&quot;:{&quot;デレステxゆず&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/imascg_stage_May2019\/imascg_stage_May2019.png&quot;,&quot;ittfworlds2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ITTFworld_2019\/ITTFworld_2019.png&quot;,&quot;growtogether&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/GrowTogether_v4\/GrowTogether_v4.png&quot;,&quot;5sos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/5SOS_2019\/5SOS_2019.png&quot;,&quot;타노스&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Thanos\/Avengers_Endgame_2019_Thanos.png&quot;,&quot;infinitygauntlet&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_InfinityGauntlet\/Avengers_Endgame_2019_InfinityGauntlet.png&quot;,&quot;loveisland&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LoveIsland_May2019\/LoveIsland_May2019.png&quot;,&quot;showthempower&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UnitedColoursofBenetton_2019\/UnitedColoursofBenetton_2019.png&quot;,&quot;estonoestáchido&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CampaignsforChange_2019\/CampaignsforChange_2019.png&quot;,&quot;superligafan&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SuperLigaFinal_2019\/SuperLigaFinal_2019.png&quot;,&quot;最後のxメン&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FOX_Xmen_Japan_2019\/FOX_Xmen_Japan_2019.png&quot;,&quot;thanos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Thanos\/Avengers_Endgame_2019_Thanos.png&quot;,&quot;tresdeseos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Genie\/Disney_Aladdin_Genie.png&quot;,&quot;mightywest&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AFL_2019_MightyWest\/AFL_2019_MightyWest.png&quot;,&quot;ausairforce&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AusAirForce_2019\/AusAirForce_2019.png&quot;,&quot;benedictwong&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Wong\/Avengers_Endgame_2019_Wong.png&quot;,&quot;ヴァルキリー&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Valkyrie\/Avengers_Endgame_2019_Valkyrie.png&quot;,&quot;cmtmusicawards&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CMTMusicAwards_2019\/CMTMusicAwards_2019.png&quot;,&quot;asianpacificheritagemonth&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AsianHeritageMonth_2019\/AsianHeritageMonth_2019.png&quot;,&quot;tsm&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Esports_AllAccessTeam_TSM_filled_ext19\/Esports_AllAccessTeam_TSM_filled_ext19.png&quot;,&quot;eiropasvēlēšanas2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EU_Election_2019\/EU_Election_2019.png&quot;,&quot;princesajasmin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Jasmine\/Disney_Aladdin_Jasmine.png&quot;,&quot;euvolitve19&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EU_Election_2019\/EU_Election_2019.png&quot;,&quot;vidasnegrasimportam&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BlackLivesMatter_VidasNegrasImportam\/BlackLivesMatter_VidasNegrasImportam.png&quot;,&quot;ciudadesinteligentes&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Cabify_DecisionesInteligentes_2019\/Cabify_DecisionesInteligentes_2019.png&quot;,&quot;로키&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Loki\/Avengers_Endgame_2019_Loki.png&quot;,&quot;thewasp&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Wasp\/Avengers_Endgame_2019_Wasp.png&quot;,&quot;modernwarfare&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CallofDuty_ModernWarfare_2019_v2\/CallofDuty_ModernWarfare_2019_v2.png&quot;,&quot;orbisu&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ORBIS_2019\/ORBIS_2019.png&quot;,&quot;swgalaxysedge&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/disney_starwarsgalaxysedge_2019_v2\/disney_starwarsgalaxysedge_2019_v2.png&quot;,&quot;オコエ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Okoye\/Avengers_Endgame_2019_Okoye.png&quot;,&quot;blackdahlia&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TNT_IAmTheNight_2019_v2\/TNT_IAmTheNight_2019_v2.png&quot;,&quot;vsonwatch&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StephenCurry_2019\/StephenCurry_2019.png&quot;,&quot;令和ニッポンの愛国心&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AbemaTV_2019\/AbemaTV_2019.png&quot;,&quot;bigramadhansale&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ShopeeRamadan_May_2019\/ShopeeRamadan_May_2019.png&quot;,&quot;зимнийсолдат&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_WinterSoldier\/Avengers_Endgame_2019_WinterSoldier.png&quot;,&quot;vidasecretadosbichos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Pets2_2018_Snowball_Brazil\/Pets2_2018_Snowball_Brazil.png&quot;,&quot;waltdisneyworld&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_MickeyEars_Flight2\/DisneyParks_MickeyEars_Flight2.png&quot;,&quot;digwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Esports_V2_19_DIG\/Esports_V2_19_DIG.png&quot;,&quot;heretheycome&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_18_PHI\/NBA_18_PHI.png&quot;,&quot;맨티스&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Mantis\/Avengers_Endgame_2019_Mantis.png&quot;,&quot;щегол&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WB_TheGoldfinch_2019\/WB_TheGoldfinch_2019.png&quot;,&quot;oneteam&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OneTeam_2018_Evergreen\/OneTeam_2018_Evergreen.png&quot;,&quot;amorlivre&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AmorLivre_2019\/AmorLivre_2019.png&quot;,&quot;こどもの日&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ChildrensDay_2019\/ChildrensDay_2019.png&quot;,&quot;timetofly&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_StLouis\/MLB_2019_StLouis.png&quot;,&quot;kolkataknightriders&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KolkataKnights_2019\/KolkataKnights_2019.png&quot;,&quot;しまコレ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Shimamura_2019\/Shimamura_2019.png&quot;,&quot;metcamp&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/VogueMetGala_2019_add\/VogueMetGala_2019_add.png&quot;,&quot;世界メディア情報リテラシーウィーク&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2018_GlobalMILWeeks\/MediaInformationLiteracyWeeks_2018_GlobalMILWeeks.png&quot;,&quot;marvelstudios&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_KevinFeige\/Avengers_Endgame_2019_KevinFeige.png&quot;,&quot;রমজান&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019\/Ramadan_2019.png&quot;,&quot;3月28日は三ツ矢の日&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Asahi_MitsuyaBrand_2019\/Asahi_MitsuyaBrand_2019.png&quot;,&quot;cg&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCS_2019_ClutchGaming\/LCS_2019_ClutchGaming.png&quot;,&quot;srh&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/IPL_2019_2_Sunrisers\/IPL_2019_2_Sunrisers.png&quot;,&quot;알라딘&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_2019\/Disney_Aladdin_2019.png&quot;,&quot;oppomoon&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Oppo_KSA_RenoLaunch_Q2_2019\/Oppo_KSA_RenoLaunch_Q2_2019.png&quot;,&quot;timesup&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TimesUp_v4\/TimesUp_v4.png&quot;,&quot;kcon2019jp&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KCON2019JAPAN\/KCON2019JAPAN.png&quot;,&quot;godzillailfilm&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Godzilla_WB_2019\/Godzilla_WB_2019.png&quot;,&quot;쿠키런&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CookieRunGame_2019\/CookieRunGame_2019.png&quot;,&quot;viratkohli&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CricketWorldCup_2019_Players_ViratKohli\/CricketWorldCup_2019_Players_ViratKohli.png&quot;,&quot;rexonanowunited&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RexonaNowUnited_72x72\/RexonaNowUnited_72x72.png&quot;,&quot;fafduplessis&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CricketWorldCup_2019_Players_FafDuPlessis\/CricketWorldCup_2019_Players_FafDuPlessis.png&quot;,&quot;untethered&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UsMovie_2018\/UsMovie_2018.png&quot;,&quot;goldfinch&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WB_TheGoldfinch_2019_add\/WB_TheGoldfinch_2019_add.png&quot;,&quot;spotifypremium3ヶ月100円&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SpotifyJapan_TVCM\/SpotifyJapan_TVCM.png&quot;,&quot;2019wttc&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ITTFworld_2019\/ITTFworld_2019.png&quot;,&quot;gantdelinfinité&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_InfinityGauntlet\/Avengers_Endgame_2019_InfinityGauntlet.png&quot;,&quot;джинн&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Genie\/Disney_Aladdin_Genie.png&quot;,&quot;idolduets&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AmericanIdol_2019\/AmericanIdol_2019.png&quot;,&quot;頑張りすぎちゃう私へ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KIRINGT_JP_2019_V3\/KIRINGT_JP_2019_V3.png&quot;,&quot;love放置少女&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/houchishoujo_2yearanniversary_v2\/houchishoujo_2yearanniversary_v2.png&quot;,&quot;dirtywater&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Boston\/MLB_2019_Boston.png&quot;,&quot;مو_قدها_لا_تلعبها&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/invasionarab1_Ramadan_2019\/invasionarab1_Ramadan_2019.png&quot;,&quot;shopeeserba10ribu&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ShopeeRamadan_May_2019\/ShopeeRamadan_May_2019.png&quot;,&quot;令和最初の乾杯&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Suntory_PremiumMalts_JP\/Suntory_PremiumMalts_JP.png&quot;,&quot;mntwins&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Minn\/MLB_2019_Minn.png&quot;,&quot;avidasecretadosbichos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Pets2_2018_Snowball_Brazil\/Pets2_2018_Snowball_Brazil.png&quot;,&quot;brujaescarlata&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_ScarletWitch\/Avengers_Endgame_2019_ScarletWitch.png&quot;,&quot;スカーレットウィッチ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_ScarletWitch\/Avengers_Endgame_2019_ScarletWitch.png&quot;,&quot;地球日&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EarthDay_2019_fixed\/EarthDay_2019_fixed.png&quot;,&quot;しまうさ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Shimamura_2019\/Shimamura_2019.png&quot;,&quot;mickey90&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Mickey90th_2018\/Mickey90th_2018.png&quot;,&quot;yg4hunnid&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YG_2019\/YG_2019.png&quot;,&quot;uglyox&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UglyDolls_Ox\/UglyDolls_Ox.png&quot;,&quot;eintraumwirdwahr&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Jasmine\/Disney_Aladdin_Jasmine.png&quot;,&quot;foreverorange&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_19_HOU\/MLS_19_HOU.png&quot;,&quot;pagodedopericao&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Pericles_2019\/Pericles_2019.png&quot;,&quot;spiceworld2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SpiceGirlsTour_2019\/SpiceGirlsTour_2019.png&quot;,&quot;미디어리터러시&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2018_GlobalMILWeeks\/MediaInformationLiteracyWeeks_2018_GlobalMILWeeks.png&quot;,&quot;lableedsblue&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Dodgers\/MLB_2019_Dodgers.png&quot;,&quot;bgt2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BritainsGotTalent_2019_star\/BritainsGotTalent_2019_star.png&quot;,&quot;تراها_سهلة&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/taqa_sa_2019\/taqa_sa_2019.png&quot;,&quot;tfclive&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_19_TFC\/MLS_19_TFC.png&quot;,&quot;miek&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Miek\/Avengers_Endgame_2019_Miek.png&quot;,&quot;natgeohotzone&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HotZone_NatGeoChannel_2019\/HotZone_NatGeoChannel_2019.png&quot;,&quot;diadaterra&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EarthDay_2019_fixed\/EarthDay_2019_fixed.png&quot;,&quot;rapids96&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_19_CO\/MLS_19_CO.png&quot;,&quot;teamindia&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CricketWorldCup_2019_Teams_TeamIndia\/CricketWorldCup_2019_Teams_TeamIndia.png&quot;,&quot;gobolts&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bolts2019Playoffs\/Bolts2019Playoffs.png&quot;,&quot;oxtheuglydoll&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UglyDolls_Ox\/UglyDolls_Ox.png&quot;,&quot;happytastesgood&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DairyQueen_HappyTastesGood_2019\/DairyQueen_HappyTastesGood_2019.png&quot;,&quot;でっかいfire新登場&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KIRINFIRE_ONEDAY_JP\/KIRINFIRE_ONEDAY_JP.png&quot;,&quot;bharatthiseid&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BharatFilm_2019\/BharatFilm_2019.png&quot;,&quot;vidastarz&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/STARZ_Vida_S2\/STARZ_Vida_S2.png&quot;,&quot;mightybombers&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AFL_2019_MightyBombers\/AFL_2019_MightyBombers.png&quot;,&quot;alwaysroyal&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Kansas\/MLB_2019_Kansas.png&quot;,&quot;mightythor&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Thor\/Avengers_Endgame_2019_Thor.png&quot;,&quot;korg&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Korg\/Avengers_Endgame_2019_Korg.png&quot;,&quot;princessjasmine&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Jasmine\/Disney_Aladdin_Jasmine.png&quot;,&quot;vidalongaàsroupas&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/VidaLongaAsRoupas_Unilever\/VidaLongaAsRoupas_Unilever.png&quot;,&quot;justiceisserved&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_19_Wash\/OWL_19_Wash.png&quot;,&quot;xメンが好き&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FOX_Xmen_Japan_2019\/FOX_Xmen_Japan_2019.png&quot;,&quot;wnba&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WNBA_2019\/WNBA_2019.png&quot;,&quot;باقات_موبايلي_مفوتر_الجديدة&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Mobily_CommercialRamadan_2019_add\/Mobily_CommercialRamadan_2019_add.png&quot;,&quot;captiamarvel&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_CaptainMarvel\/Avengers_Endgame_2019_CaptainMarvel.png&quot;,&quot;バズライトイヤー&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_Buzz\/Disney_ToyStory4_Buzz.png&quot;,&quot;periscope&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Periscope\/Periscope.png&quot;,&quot;rr&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/IPL_2019_2_Royals\/IPL_2019_2_Royals.png&quot;,&quot;魔法のランプ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Lamp\/Disney_Aladdin_Lamp.png&quot;,&quot;stavoltavoto&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EUElections_VoterEngagement_2019\/EUElections_VoterEngagement_2019.png&quot;,&quot;uglywage&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UglyDolls_Wage\/UglyDolls_Wage.png&quot;,&quot;thefalcon&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Falcon\/Avengers_Endgame_2019_Falcon.png&quot;,&quot;twitterforgoodday&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FridayforGood_2019\/FridayforGood_2019.png&quot;,&quot;فانوس&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019_Lantern\/Ramadan_2019_Lantern.png&quot;,&quot;jbfa&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JamesBeard_FoundationAwards_2019\/JamesBeard_FoundationAwards_2019.png&quot;,&quot;erstdenkendannteilen&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2018_ThinkBeforeSharing\/MediaInformationLiteracyWeeks_2018_ThinkBeforeSharing.png&quot;,&quot;decisionesinteligentes&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Cabify_DecisionesInteligentes_2019\/Cabify_DecisionesInteligentes_2019.png&quot;,&quot;историяигрушекбазз&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_Buzz\/Disney_ToyStory4_Buzz.png&quot;,&quot;ngk&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NGKFilm_2019\/NGKFilm_2019.png&quot;,&quot;ggswin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCS_2019_GGS\/LCS_2019_GGS.png&quot;,&quot;nebulaavengers&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Nebula\/Avengers_Endgame_2019_Nebula.png&quot;,&quot;occiodifalco&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Hawkeye\/Avengers_Endgame_2019_Hawkeye.png&quot;,&quot;tuproposito&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Adecco_2019\/Adecco_2019.png&quot;,&quot;killthislovewithblackpink&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KPOP_BLACKPINK_2019_add\/KPOP_BLACKPINK_2019_add.png&quot;,&quot;penseavantdecliquer&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2018_ThinkBeforeClicking\/MediaInformationLiteracyWeeks_2018_ThinkBeforeClicking.png&quot;,&quot;bestoftweets&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BestofTweetsPrize_2019\/BestofTweetsPrize_2019.png&quot;,&quot;gatormovie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Paramount_Crawl_2019\/Paramount_Crawl_2019.png&quot;,&quot;годзілла2&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Godzilla_WB_2019\/Godzilla_WB_2019.png&quot;,&quot;nebula&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Nebula\/Avengers_Endgame_2019_Nebula.png&quot;,&quot;deixaaquímicarolar&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NaturaHumor_May2019_V2\/NaturaHumor_May2019_V2.png&quot;,&quot;미투&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MeToo_Korea_2018_v2\/MeToo_Korea_2018_v2.png&quot;,&quot;uglymoxy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UglyDolls_Moxy\/UglyDolls_Moxy.png&quot;,&quot;bll&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBO_BigLittleLies_Season2_2019\/HBO_BigLittleLies_Season2_2019.png&quot;,&quot;makemeaprince&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_2019\/Disney_Aladdin_2019.png&quot;,&quot;donutlove&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Dunkin_NationalDonutDay_2019\/Dunkin_NationalDonutDay_2019.png&quot;,&quot;onefamily&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MumbaiIndians_2018\/MumbaiIndians_2018.png&quot;,&quot;грут&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Groot\/Avengers_Endgame_2019_Groot.png&quot;,&quot;lightupyournight&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/VivoPHV15_2019\/VivoPHV15_2019.png&quot;,&quot;prado200&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MuseoDelPrado_2018\/MuseoDelPrado_2018.png&quot;,&quot;決勝で会おうぜ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YuGiOh_DL_INFO_May2019\/YuGiOh_DL_INFO_May2019.png&quot;,&quot;diewasp&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Wasp\/Avengers_Endgame_2019_Wasp.png&quot;,&quot;shopeeid&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ShopeeRamadan_May_2019\/ShopeeRamadan_May_2019.png&quot;,&quot;onepluslaunch&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OnePlus7_2019\/OnePlus7_2019.png&quot;,&quot;yeoldebucketlist&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BudLight_BudKnight_2019\/BudLight_BudKnight_2019.png&quot;,&quot;lovetwitter&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LoveTwitter\/LoveTwitter.png&quot;,&quot;bendstudio&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PlayStation_DaysGone\/PlayStation_DaysGone.png&quot;,&quot;got7_keepspinning&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KPOP_GOT7_2019_GOT7WORLDTOUR\/KPOP_GOT7_2019_GOT7WORLDTOUR.png&quot;,&quot;pericles50&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Pericles_2019\/Pericles_2019.png&quot;,&quot;weareengland&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CricketWorldCup_2019_Teams_England\/CricketWorldCup_2019_Teams_England.png&quot;,&quot;jordensdag&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EarthDay_2019_fixed\/EarthDay_2019_fixed.png&quot;,&quot;uglydollbabo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UglyDolls_Babo\/UglyDolls_Babo.png&quot;,&quot;ευρωεκλογές2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EU_Election_2019\/EU_Election_2019.png&quot;,&quot;avengersendgame&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019\/Avengers_Endgame_2019.png&quot;,&quot;detroitbasketball&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_18_DET\/NBA_18_DET.png&quot;,&quot;quakes74&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_19_SJ\/MLS_19_SJ.png&quot;,&quot;artisttofollow&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ArtistToFollow_2019\/ArtistToFollow_2019.png&quot;,&quot;rootedinoakland&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Oakland\/MLB_2019_Oakland.png&quot;,&quot;jasmine&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Jasmine\/Disney_Aladdin_Jasmine.png&quot;,&quot;thelamp&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Lamp\/Disney_Aladdin_Lamp.png&quot;,&quot;budapest2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ITTFworld_2019\/ITTFworld_2019.png&quot;,&quot;vivov15prolaunch&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/VivoPHV15_2019\/VivoPHV15_2019.png&quot;,&quot;happybirthdaygeorge&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/GeorgeHarrison_2019_v2\/GeorgeHarrison_2019_v2.png&quot;,&quot;mlbtheshow19&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_TheShow19\/MLB_TheShow19.png&quot;,&quot;valquiria&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Valkyrie\/Avengers_Endgame_2019_Valkyrie.png&quot;,&quot;eusouliquid&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Esports_AllAccessTeam_TeamLiquid_ext19\/Esports_AllAccessTeam_TeamLiquid_ext19.png&quot;,&quot;nuestroplaneta&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_OurPlanet_2019\/Netflix_OurPlanet_2019.png&quot;,&quot;korgpileofrocks&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Korg\/Avengers_Endgame_2019_Korg.png&quot;,&quot;человекпаук&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Spiderman\/Avengers_Endgame_2019_Spiderman.png&quot;,&quot;monterey5&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBO_BigLittleLies_Season2_2019\/HBO_BigLittleLies_Season2_2019.png&quot;,&quot;togetherwe&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Texas\/MLB_2019_Texas.png&quot;,&quot;激レアモンスターだぜ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YuGiOh_DL_INFO_May2019\/YuGiOh_DL_INFO_May2019.png&quot;,&quot;アイスクレマで贅沢なひとときを&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AIDAMITSUWO_2019\/AIDAMITSUWO_2019.png&quot;,&quot;s04win&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Riot_Schalke04\/Riot_Schalke04.png&quot;,&quot;レッツデレステ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/imascg_stage_May2019\/imascg_stage_May2019.png&quot;,&quot;powerstone&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_InfinityGauntlet\/Avengers_Endgame_2019_InfinityGauntlet.png&quot;,&quot;katyperry&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KatyPerry_May2019\/KatyPerry_May2019.png&quot;,&quot;cbj&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bluejacketsplayoffs2019\/Bluejacketsplayoffs2019.png&quot;,&quot;aapi&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AsianHeritageMonth_2019\/AsianHeritageMonth_2019.png&quot;,&quot;ramadankareem&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019\/Ramadan_2019.png&quot;,&quot;teamiseverything&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_18_UTA\/NBA_18_UTA.png&quot;,&quot;blueandwhiteignite&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OrlandoPlayoffs2019\/OrlandoPlayoffs2019.png&quot;,&quot;borntobaseball&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Cincinnati\/MLB_2019_Cincinnati.png&quot;,&quot;uglydollmoxy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UglyDolls_Moxy\/UglyDolls_Moxy.png&quot;,&quot;drstrange&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_DoctorStrange\/Avengers_Endgame_2019_DoctorStrange.png&quot;,&quot;tiempodevolar&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_StLouis\/MLB_2019_StLouis.png&quot;,&quot;suhurramadan&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019_Iftar\/Ramadan_2019_Iftar.png&quot;,&quot;annabelle&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WB_Annabelle_3_v2\/WB_Annabelle_3_v2.png&quot;,&quot;teampixie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheVoice_UK_2019\/TheVoice_UK_2019.png&quot;,&quot;valg2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DanishElection_2019\/DanishElection_2019.png&quot;,&quot;meilleursamispourlavie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_Woody\/Disney_ToyStory4_Woody.png&quot;,&quot;thisisnewdelhi&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DelhiCapitals_IPL\/DelhiCapitals_IPL.png&quot;,&quot;thetethered&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UsMovie_2018\/UsMovie_2018.png&quot;,&quot;遊戯王wcs2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YuGiOh_DL_INFO_May2019\/YuGiOh_DL_INFO_May2019.png&quot;,&quot;stanleycup&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StanleyCup_2019\/StanleyCup_2019.png&quot;,&quot;diabloguardian2&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Amazon_DiabloGuardian\/Amazon_DiabloGuardian.png&quot;,&quot;воитель&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_WarMachine\/Avengers_Endgame_2019_WarMachine.png&quot;,&quot;endgame&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019\/Avengers_Endgame_2019.png&quot;,&quot;nba&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_18_logo\/NBA_18_logo.png&quot;,&quot;kkrhaitaiyaar&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KolkataKnights_2019\/KolkataKnights_2019.png&quot;,&quot;earthday&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EarthDay_2019_fixed\/EarthDay_2019_fixed.png&quot;,&quot;owl2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_19\/OWL_19.png&quot;,&quot;peston&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PestonUK_2018_flight3\/PestonUK_2018_flight3.png&quot;,&quot;rgewin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Riot_Rogue\/Riot_Rogue.png&quot;,&quot;ゴジラ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Godzilla_WB_2019_add\/Godzilla_WB_2019_add.png&quot;,&quot;paradisehotelonfox&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Fox_Summer_ParadiseHotel\/Fox_Summer_ParadiseHotel.png&quot;,&quot;valquíria&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Valkyrie\/Avengers_Endgame_2019_Valkyrie.png&quot;,&quot;ドラガリアロスト&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/dragalialos_March2019_v2\/dragalialos_March2019_v2.png&quot;,&quot;رمضان_أجمل_هدية&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Qatar_charity2019\/Qatar_charity2019.png&quot;,&quot;超最高の働き方選手権&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KIRINMetsJP_2019\/KIRINMetsJP_2019.png&quot;,&quot;марияхилл&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_MariaHill\/Avengers_Endgame_2019_MariaHill.png&quot;,&quot;uglydogtheuglydoll&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UglyDolls_Dog\/UglyDolls_Dog.png&quot;,&quot;riseofthetigers&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CricketWorldCup_2019_Teams_RiseOfTheTigers\/CricketWorldCup_2019_Teams_RiseOfTheTigers.png&quot;,&quot;downtonabbeyfilm&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DowntonAbbey_2019\/DowntonAbbey_2019.png&quot;,&quot;lesoldatdelhiver&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_WinterSoldier\/Avengers_Endgame_2019_WinterSoldier.png&quot;,&quot;ncwtixfor20&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NationalConcertWeek_2019\/NationalConcertWeek_2019.png&quot;,&quot;tokyoafterdark&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Nike_Japan_JDI_2019\/Nike_Japan_JDI_2019.png&quot;,&quot;gloriaeterna&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Libertadores_2019\/Libertadores_2019.png&quot;,&quot;viuvanegra&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_BlackWidow\/Avengers_Endgame_2019_BlackWidow.png&quot;,&quot;playwithyourfears&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Diesel_OTB_Noe\/Diesel_OTB_Noe.png&quot;,&quot;افطار&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019_Iftar\/Ramadan_2019_Iftar.png&quot;,&quot;guantedelinfinito&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_InfinityGauntlet\/Avengers_Endgame_2019_InfinityGauntlet.png&quot;,&quot;mewtu&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBPikachu_Mewtwo\/WBPikachu_Mewtwo.png&quot;,&quot;コーグ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Korg\/Avengers_Endgame_2019_Korg.png&quot;,&quot;xerifewoody&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_Woody\/Disney_ToyStory4_Woody.png&quot;,&quot;hollywoodweek&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AmericanIdol_2019\/AmericanIdol_2019.png&quot;,&quot;labergère&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_BoPeep\/Disney_ToyStory4_BoPeep.png&quot;,&quot;starwarsgalaxysedge&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/disney_starwarsgalaxysedge_2019_v2\/disney_starwarsgalaxysedge_2019_v2.png&quot;,&quot;movietvawards&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MTV_Awards_May2019\/MTV_Awards_May2019.png&quot;,&quot;rocketmanofilme&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Paramount_Rocketman_Rocket\/Paramount_Rocketman_Rocket.png&quot;,&quot;shieldsup&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_19_LAG\/OWL_19_LAG.png&quot;,&quot;orgulloyankees&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Yankees\/MLB_2019_Yankees.png&quot;,&quot;chevyblazer&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ChevyBlazer_2019\/ChevyBlazer_2019.png&quot;,&quot;ドラゴン当たれ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/dragalialos_March2019_v2\/dragalialos_March2019_v2.png&quot;,&quot;bulbasaur&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBPikachu_Bulbasaur\/WBPikachu_Bulbasaur.png&quot;,&quot;latenightthemovie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Amazon_LateNight_2019\/Amazon_LateNight_2019.png&quot;,&quot;باقات_موبايلي_المفوترة_الجديدة&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Mobily_CommercialRamadan_2019\/Mobily_CommercialRamadan_2019.png&quot;,&quot;aquestavegadavoto&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EUElections_VoterEngagement_2019\/EUElections_VoterEngagement_2019.png&quot;,&quot;معا_للحياة&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Zamzam_2019\/Zamzam_2019.png&quot;,&quot;aisplay&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AIS_GameofThrones_2019\/AIS_GameofThrones_2019.png&quot;,&quot;mainerisesup&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MaineforVivo_2019\/MaineforVivo_2019.png&quot;,&quot;tymrazemglosuje&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EUElections_VoterEngagement_2019\/EUElections_VoterEngagement_2019.png&quot;,&quot;어버이날&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/2019_MothersDay\/2019_MothersDay.png&quot;,&quot;مقاضي_رمضان&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ZadFresh_2019_v3\/ZadFresh_2019_v3.png&quot;,&quot;ilcardellino&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WB_TheGoldfinch_2019\/WB_TheGoldfinch_2019.png&quot;,&quot;mlbtheshow&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_TheShow19\/MLB_TheShow19.png&quot;,&quot;jesuistonmeilleurami&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Genie\/Disney_Aladdin_Genie.png&quot;,&quot;халк&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Hulk\/Avengers_Endgame_2019_Hulk.png&quot;,&quot;hornets30&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_18_BCHA\/NBA_18_BCHA.png&quot;,&quot;errolspencejr&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FoxSports_PBC\/FoxSports_PBC.png&quot;,&quot;loveislandaftersun&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LoveIsland_May2019\/LoveIsland_May2019.png&quot;,&quot;infinitystones&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_InfinityGauntlet\/Avengers_Endgame_2019_InfinityGauntlet.png&quot;,&quot;goavsgo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AvsPlayoffs2019\/AvsPlayoffs2019.png&quot;,&quot;fiatlux&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_19_Paris\/OWL_19_Paris.png&quot;,&quot;プリコネr&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Priconne_Rezaro_2019_v2\/Priconne_Rezaro_2019_v2.png&quot;,&quot;galaxysedge&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/disney_starwarsgalaxysedge_2019_v2\/disney_starwarsgalaxysedge_2019_v2.png&quot;,&quot;newbrew&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Carlsberg_NewBrew_2019\/Carlsberg_NewBrew_2019.png&quot;,&quot;metgala&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/VogueMetGala_2019\/VogueMetGala_2019.png&quot;,&quot;7afl&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AFL_2019_7AFL\/AFL_2019_7AFL.png&quot;,&quot;uglydollsfilm&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UglyDollsMovie\/UglyDollsMovie.png&quot;,&quot;theintruder&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SonyIntruder_2018\/SonyIntruder_2018.png&quot;,&quot;goodbagels&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Warburtons_Bagel_Boss\/Warburtons_Bagel_Boss.png&quot;,&quot;فوانيس_رمضان&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019_Lantern\/Ramadan_2019_Lantern.png&quot;,&quot;الخطوط_الجوية_القطرية&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/QatarAirways_2019\/QatarAirways_2019.png&quot;,&quot;mapfrepreguntarafa&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MapfreRafaNadal_2019\/MapfreRafaNadal_2019.png&quot;,&quot;discoveryreserve&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Budweiser_SpaceBeer_2019\/Budweiser_SpaceBeer_2019.png&quot;,&quot;스쿨미투&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MeToo_Korea_2018_v2\/MeToo_Korea_2018_v2.png&quot;,&quot;setforlifetnl&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TNL_SetforLife_2019\/TNL_SetforLife_2019.png&quot;,&quot;amtodmbfn&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BuzzFeedMorning_2019ext\/BuzzFeedMorning_2019ext.png&quot;,&quot;cementeriomaldito&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Paramount_PetSematary_2019_v2\/Paramount_PetSematary_2019_v2.png&quot;,&quot;uglydollwage&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UglyDolls_Wage\/UglyDolls_Wage.png&quot;,&quot;토이스토리보핍&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_BoPeep\/Disney_ToyStory4_BoPeep.png&quot;,&quot;kpop&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KPOPTwitter2019_red\/KPOPTwitter2019_red.png&quot;,&quot;somespoilmoviesbutnotus&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019\/Avengers_Endgame_2019.png&quot;,&quot;diabloguardiánii&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Amazon_DiabloGuardian\/Amazon_DiabloGuardian.png&quot;,&quot;エムバク&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Mbaku\/Avengers_Endgame_2019_Mbaku.png&quot;,&quot;riseupfromtheexpected&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MaineforVivo_2019\/MaineforVivo_2019.png&quot;,&quot;jourdelaterre&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EarthDay_2019_fixed\/EarthDay_2019_fixed.png&quot;,&quot;капитанамерика&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_CaptainAmerica\/Avengers_Endgame_2019_CaptainAmerica.png&quot;,&quot;backtheblackcaps&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CricketWorldCup_2019_Teams_BACKTHEBLACKCAPS\/CricketWorldCup_2019_Teams_BACKTHEBLACKCAPS.png&quot;,&quot;лучшиедрузья&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_Woody\/Disney_ToyStory4_Woody.png&quot;,&quot;huaweip30pro&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Huawei_P30_2019\/Huawei_P30_2019.png&quot;,&quot;staydangerous&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YG_2019\/YG_2019.png&quot;,&quot;ggs&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCS_2019_GGS\/LCS_2019_GGS.png&quot;,&quot;cricketmerijaan&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MumbaiIndians_2018\/MumbaiIndians_2018.png&quot;,&quot;音楽さえあればいい&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SpotifyJapan_TVCM\/SpotifyJapan_TVCM.png&quot;,&quot;nationalpetsday&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Pets2_Max_v2_ext\/Pets2_Max_v2_ext.png&quot;,&quot;metooindia&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MeToo_India_2018\/MeToo_India_2018.png&quot;,&quot;pixarpalsparty&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_NowMoreThanEver_v2\/DisneyParks_NowMoreThanEver_v2.png&quot;,&quot;vainogas&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CocaCola_VaiNoGas\/CocaCola_VaiNoGas.png&quot;,&quot;平成最後の漢字一文字&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NewEra_2019_ext_add\/NewEra_2019_ext_add.png&quot;,&quot;juntosmiami&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Miami\/MLB_2019_Miami.png&quot;,&quot;mickey&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Mickey90th_2018\/Mickey90th_2018.png&quot;,&quot;окое&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Okoye\/Avengers_Endgame_2019_Okoye.png&quot;,&quot;teambabo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UglyDolls_Babo_add\/UglyDolls_Babo_add.png&quot;,&quot;suhour&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019_Iftar\/Ramadan_2019_Iftar.png&quot;,&quot;surprisecelebration&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_NowMoreThanEver_v2\/DisneyParks_NowMoreThanEver_v2.png&quot;,&quot;cmonaussie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CricketWorldCup_2019_Teams_CmonAussie\/CricketWorldCup_2019_Teams_CmonAussie.png&quot;,&quot;블랙팬서&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_BlackPanther\/Avengers_Endgame_2019_BlackPanther.png&quot;,&quot;tokratgremvolit&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EUElections_VoterEngagement_2019\/EUElections_VoterEngagement_2019.png&quot;,&quot;iheartawards2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/iHeartAwards2019\/iHeartAwards2019.png&quot;,&quot;toystoryland&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_ToyStoryLand\/DisneyParks_ToyStoryLand.png&quot;,&quot;euval2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EU_Election_2019\/EU_Election_2019.png&quot;,&quot;uglydog&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UglyDolls_Dog\/UglyDolls_Dog.png&quot;,&quot;toystorywoody&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_Woody\/Disney_ToyStory4_Woody.png&quot;,&quot;자스민&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Jasmine\/Disney_Aladdin_Jasmine.png&quot;,&quot;laysnachampions&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Lays_UCL_2019\/Lays_UCL_2019.png&quot;,&quot;agrabah&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Jasmine\/Disney_Aladdin_Jasmine.png&quot;,&quot;아빠사랑해요&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/2019_MothersDay\/2019_MothersDay.png&quot;,&quot;lv52デス&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LineageMSecondBrand_2019\/LineageMSecondBrand_2019.png&quot;,&quot;mk2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBGames_MortalKombat_2019\/WBGames_MortalKombat_2019.png&quot;,&quot;disneyaladdin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_2019\/Disney_Aladdin_2019.png&quot;,&quot;operatingonchingonalevel&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/STARZ_Vida_S2\/STARZ_Vida_S2.png&quot;,&quot;wttc2019budapest&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ITTFworld_2019\/ITTFworld_2019.png&quot;,&quot;アントマン&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_AntMan\/Avengers_Endgame_2019_AntMan.png&quot;,&quot;letsgobucs&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Pitts\/MLB_2019_Pitts.png&quot;,&quot;해피호건&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_HappyHogan\/Avengers_Endgame_2019_HappyHogan.png&quot;,&quot;مسابقة_طيران_ناس&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FlyNas_2019\/FlyNas_2019.png&quot;,&quot;gogovp&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Esports_V2_19_Virtus\/Esports_V2_19_Virtus.png&quot;,&quot;ペッパーポッツ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_PepperPotts\/Avengers_Endgame_2019_PepperPotts.png&quot;,&quot;fncwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Riot_Fnatic\/Riot_Fnatic.png&quot;,&quot;cemitériomaldito&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Paramount_PetSematary_2019_v2\/Paramount_PetSematary_2019_v2.png&quot;,&quot;brooklyn99&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Brooklyn99_2019\/Brooklyn99_2019.png&quot;,&quot;uglydollsmoxy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UglyDolls_Moxy\/UglyDolls_Moxy.png&quot;,&quot;biglittlelies&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBO_BigLittleLies_Season2_2019\/HBO_BigLittleLies_Season2_2019.png&quot;,&quot;fangoals&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CapitalOne_MarchMadness_2019\/CapitalOne_MarchMadness_2019.png&quot;,&quot;wagetheuglydoll&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UglyDolls_Wage\/UglyDolls_Wage.png&quot;,&quot;ffg&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FridayforGood_2019\/FridayforGood_2019.png&quot;,&quot;ワスプ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Wasp\/Avengers_Endgame_2019_Wasp.png&quot;,&quot;yellove&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PL_2019_2_CSK_v2\/PL_2019_2_CSK_v2.png&quot;,&quot;フシギダネ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBPikachu_Bulbasaur\/WBPikachu_Bulbasaur.png&quot;,&quot;оса&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Wasp\/Avengers_Endgame_2019_Wasp.png&quot;,&quot;ayudaaunprimerizo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AmazonHotSale2019\/AmazonHotSale2019.png&quot;,&quot;iammighty&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Thor\/Avengers_Endgame_2019_Thor.png&quot;,&quot;telleurope&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EUElections_VoterEngagement_2019_add\/EUElections_VoterEngagement_2019_add.png&quot;,&quot;ما_نختلف&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Mobily_Branding_2019\/Mobily_Branding_2019.png&quot;,&quot;dg2&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Amazon_DiabloGuardian\/Amazon_DiabloGuardian.png&quot;,&quot;토이스토리포키&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_Forky\/Disney_ToyStory4_Forky.png&quot;,&quot;thisfreelife&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ThisFreeLife_March_2019\/ThisFreeLife_March_2019.png&quot;,&quot;amtodm&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BuzzFeedMorning_2019ext\/BuzzFeedMorning_2019ext.png&quot;,&quot;mantis&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Mantis\/Avengers_Endgame_2019_Mantis.png&quot;,&quot;bukapuasa&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019_Iftar\/Ramadan_2019_Iftar.png&quot;,&quot;тор&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Thor\/Avengers_Endgame_2019_Thor.png&quot;,&quot;got7&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KPOP_GOT7_2019_GOT7WORLDTOUR\/KPOP_GOT7_2019_GOT7WORLDTOUR.png&quot;,&quot;танос&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Thanos\/Avengers_Endgame_2019_Thanos.png&quot;,&quot;proteafire&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CricketWorldCup_2019_Teams_ProteaFire\/CricketWorldCup_2019_Teams_ProteaFire.png&quot;,&quot;ガモーラ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Gamora\/Avengers_Endgame_2019_Gamora.png&quot;,&quot;toystoryporzellinchen&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_BoPeep\/Disney_ToyStory4_BoPeep.png&quot;,&quot;whatadelivery&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bundl_Swiggy_2019\/Bundl_Swiggy_2019.png&quot;,&quot;avispa&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Wasp\/Avengers_Endgame_2019_Wasp.png&quot;,&quot;iamopl&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OPL_2019\/OPL_2019.png&quot;,&quot;watchuswatchnascar&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Xfinity_WatchUsWatchNASCAR_2019\/Xfinity_WatchUsWatchNASCAR_2019.png&quot;,&quot;shocktheworld&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_19_SF\/OWL_19_SF.png&quot;,&quot;šįkartąbalsuosiu&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EUElections_VoterEngagement_2019\/EUElections_VoterEngagement_2019.png&quot;,&quot;brightburn\&quot;evilhasfounditssuperhero&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Sony_Brightburn_BB_2019\/Sony_Brightburn_BB_2019.png&quot;,&quot;raysbeisbol&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Tampa\/MLB_2019_Tampa.png&quot;,&quot;prettyugly&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UglyDollsMovie\/UglyDollsMovie.png&quot;,&quot;edboon&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBGames_MortalKombat_2019\/WBGames_MortalKombat_2019.png&quot;,&quot;theworldisours&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DiscoveryChannel_2019\/DiscoveryChannel_2019.png&quot;,&quot;snapforandroid&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SnapAndroid_Launch_2019\/SnapAndroid_Launch_2019.png&quot;,&quot;ghostrecon&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/GhostRecon_2019_v2\/GhostRecon_2019_v2.png&quot;,&quot;버즈라이트이어&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_Buzz\/Disney_ToyStory4_Buzz.png&quot;,&quot;祝ロマサガrs半周年&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/romasaga_rs_2019\/romasaga_rs_2019.png&quot;,&quot;cordoba2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SuperLigaFinal_2019\/SuperLigaFinal_2019.png&quot;,&quot;fearthedeer&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_18_MIL\/NBA_18_MIL.png&quot;,&quot;am2dmbf&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BuzzFeedMorning_2019ext\/BuzzFeedMorning_2019ext.png&quot;,&quot;tälläkertaaäänestän&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EUElections_VoterEngagement_2019\/EUElections_VoterEngagement_2019.png&quot;,&quot;flames&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FlamesPlayoffs2019\/FlamesPlayoffs2019.png&quot;,&quot;алаяведьма&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_ScarletWitch\/Avengers_Endgame_2019_ScarletWitch.png&quot;,&quot;friarfaithful&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_SD\/MLB_2019_SD.png&quot;,&quot;schalkenullfear&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Riot_Schalke04\/Riot_Schalke04.png&quot;,&quot;gamora&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Gamora\/Avengers_Endgame_2019_Gamora.png&quot;,&quot;العلا&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AlUlaCity_2019\/AlUlaCity_2019.png&quot;,&quot;warburtonsbagels&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Warburtons_Bagel_Boss\/Warburtons_Bagel_Boss.png&quot;,&quot;fireワンデイブラック&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KIRINFIRE_ONEDAY_JP\/KIRINFIRE_ONEDAY_JP.png&quot;,&quot;groot&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Groot\/Avengers_Endgame_2019_Groot.png&quot;,&quot;俺達のnba&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RakutenTV_NBA_Logo_2019_v2\/RakutenTV_NBA_Logo_2019_v2.png&quot;,&quot;хэппихоган&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_HappyHogan\/Avengers_Endgame_2019_HappyHogan.png&quot;,&quot;bharatwithfamily&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BharatFilm_2019\/BharatFilm_2019.png&quot;,&quot;lasangraazul&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Dodgers\/MLB_2019_Dodgers.png&quot;,&quot;마리아힐&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_MariaHill\/Avengers_Endgame_2019_MariaHill.png&quot;,&quot;lalámpara&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Lamp\/Disney_Aladdin_Lamp.png&quot;,&quot;geng&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Esports_V2_19_GENG\/Esports_V2_19_GENG.png&quot;,&quot;falconavengers&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Falcon\/Avengers_Endgame_2019_Falcon.png&quot;,&quot;드랙스&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Drax\/Avengers_Endgame_2019_Drax.png&quot;,&quot;ミドガルズオルム&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/dragalialos_March2019_v2\/dragalialos_March2019_v2.png&quot;,&quot;ロケット&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Rocket\/Avengers_Endgame_2019_Rocket.png&quot;,&quot;rctid&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_19_POR\/MLS_19_POR.png&quot;,&quot;thecontinentalhotel&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JohnWick_3_ext\/JohnWick_3_ext.png&quot;,&quot;epvalg2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EU_Election_2019\/EU_Election_2019.png&quot;,&quot;downtonabbeytrailer&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DowntonAbbey_2019\/DowntonAbbey_2019.png&quot;,&quot;qatar_charity&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Qatar_charity2019\/Qatar_charity2019.png&quot;,&quot;ramadan_lanterns&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019_Lantern\/Ramadan_2019_Lantern.png&quot;,&quot;ourcultureouridentity&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MOCSaudi_2019\/MOCSaudi_2019.png&quot;,&quot;feelthecharge&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_19_Guangzhou\/OWL_19_Guangzhou.png&quot;,&quot;sahur&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019_Iftar\/Ramadan_2019_Iftar.png&quot;,&quot;pelopantene&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PG_Spain_Pantene_2019\/PG_Spain_Pantene_2019.png&quot;,&quot;booksmart&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Booksmart_2019\/Booksmart_2019.png&quot;,&quot;tflflauntit&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ThisFreeLife_March_2019\/ThisFreeLife_March_2019.png&quot;,&quot;mickeymouse&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Mickey90th_2018\/Mickey90th_2018.png&quot;,&quot;vamosbravos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Atlanta\/MLB_2019_Atlanta.png&quot;,&quot;مافي_زي_stcpay&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/STCPay_2019\/STCPay_2019.png&quot;,&quot;mapfreyrafajuntos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MapfreRafaNadal_2019\/MapfreRafaNadal_2019.png&quot;,&quot;tictocnews&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/bloombergtictoc2018_ext19\/bloombergtictoc2018_ext19.png&quot;,&quot;adidasoriginals&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Adidas_NiteJogger_2019_add\/Adidas_NiteJogger_2019_add.png&quot;,&quot;오코예&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Okoye\/Avengers_Endgame_2019_Okoye.png&quot;,&quot;ニックフューリー&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_NickFury\/Avengers_Endgame_2019_NickFury.png&quot;,&quot;thebrandisbrolic&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DesusandMero_2019\/DesusandMero_2019.png&quot;,&quot;يوم_الارض&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EarthDay_2019_fixed\/EarthDay_2019_fixed.png&quot;,&quot;toystorybuzz&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_Buzz\/Disney_ToyStory4_Buzz.png&quot;,&quot;opporenouae&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Oppo_KSA_RenoLaunch_Q2_2019\/Oppo_KSA_RenoLaunch_Q2_2019.png&quot;,&quot;mbaku&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Mbaku\/Avengers_Endgame_2019_Mbaku.png&quot;,&quot;放置少女2周年記念&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/houchishoujo_2yearanniversary_v2\/houchishoujo_2yearanniversary_v2.png&quot;,&quot;mickeytrueoriginal&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Mickey90th_2018\/Mickey90th_2018.png&quot;,&quot;alampada&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Lamp\/Disney_Aladdin_Lamp.png&quot;,&quot;petcemetarymovie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Paramount_PetSematary_2019_v2\/Paramount_PetSematary_2019_v2.png&quot;,&quot;unserplanet&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_OurPlanet_2019\/Netflix_OurPlanet_2019.png&quot;,&quot;alfombramágica&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Lamp\/Disney_Aladdin_Lamp.png&quot;,&quot;housewendys&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HouseWendys_2019\/HouseWendys_2019.png&quot;,&quot;warmachine&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_WarMachine\/Avengers_Endgame_2019_WarMachine.png&quot;,&quot;beardawards&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JamesBeard_FoundationAwards_2019\/JamesBeard_FoundationAwards_2019.png&quot;,&quot;годзилла2&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Godzilla_WB_2019\/Godzilla_WB_2019.png&quot;,&quot;usmovie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UsMovie_2018\/UsMovie_2018.png&quot;,&quot;ありがとうアベンジャーズ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019\/Avengers_Endgame_2019.png&quot;,&quot;loveislandfinal&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LoveIsland_May2019\/LoveIsland_May2019.png&quot;,&quot;haribumi&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EarthDay_2019_fixed\/EarthDay_2019_fixed.png&quot;,&quot;c9win&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Esports_AllAccessTeam_Cloud9_ext19\/Esports_AllAccessTeam_Cloud9_ext19.png&quot;,&quot;it2&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WB_It_Chp2\/WB_It_Chp2.png&quot;,&quot;jabaritribe&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Mbaku\/Avengers_Endgame_2019_Mbaku.png&quot;,&quot;uglydollsmovie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UglyDollsMovie\/UglyDollsMovie.png&quot;,&quot;زمزم&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Zamzam_2019\/Zamzam_2019.png&quot;,&quot;disneyland&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_MickeyEars_Flight2\/DisneyParks_MickeyEars_Flight2.png&quot;,&quot;motoron&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Detroit_v2\/MLB_2019_Detroit_v2.png&quot;,&quot;thebrandisstrong&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DesusandMero_2019\/DesusandMero_2019.png&quot;,&quot;premiosmtvmiaw&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MTV_Miaw_2019\/MTV_Miaw_2019.png&quot;,&quot;thinkau&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ThinkAU_2019\/ThinkAU_2019.png&quot;,&quot;bharat&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BharatFilm_2019\/BharatFilm_2019.png&quot;,&quot;thinkbeforeclicking&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2018_ThinkBeforeClicking\/MediaInformationLiteracyWeeks_2018_ThinkBeforeClicking.png&quot;,&quot;cf97&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_19_CHI\/MLS_19_CHI.png&quot;,&quot;ثقافتنا_هويتنا&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MOCSaudi_2019\/MOCSaudi_2019.png&quot;,&quot;valchiria&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Valkyrie\/Avengers_Endgame_2019_Valkyrie.png&quot;,&quot;microsoftai&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Microsoft_APAC_2019_v2\/Microsoft_APAC_2019_v2.png&quot;,&quot;tagdererde&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EarthDay_2019_fixed\/EarthDay_2019_fixed.png&quot;,&quot;falcão&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Falcon\/Avengers_Endgame_2019_Falcon.png&quot;,&quot;wong&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Wong\/Avengers_Endgame_2019_Wong.png&quot;,&quot;kohlscash&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Kohls_Q2_2019\/Kohls_Q2_2019.png&quot;,&quot;nickfuria&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_NickFury\/Avengers_Endgame_2019_NickFury.png&quot;,&quot;ダークフェニックス&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/20thCenturyFox_DarkPhoenix\/20thCenturyFox_DarkPhoenix.png&quot;,&quot;スーパーゼウスとネコに願いよ届け&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Japan_DreamsComeTrue_2019\/Japan_DreamsComeTrue_2019.png&quot;,&quot;pulitzer&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PulitzerPrizes_2019\/PulitzerPrizes_2019.png&quot;,&quot;블랙위도우&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_BlackWidow\/Avengers_Endgame_2019_BlackWidow.png&quot;,&quot;sulamericana&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Sulamericana_2019\/Sulamericana_2019.png&quot;,&quot;uglydollox&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UglyDolls_Ox\/UglyDolls_Ox.png&quot;,&quot;onthehunt&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Riot_Splyce\/Riot_Splyce.png&quot;,&quot;nrlw&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL_2019_MidSeason_NRLW\/NRL_2019_MidSeason_NRLW.png&quot;,&quot;petsematary&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Paramount_PetSematary_2019_v2\/Paramount_PetSematary_2019_v2.png&quot;,&quot;مفاجات_وااو&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SAIB_2019\/SAIB_2019.png&quot;,&quot;шури&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Shuri\/Avengers_Endgame_2019_Shuri.png&quot;,&quot;snapdroid&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SnapAndroid_Launch_2019\/SnapAndroid_Launch_2019.png&quot;,&quot;天下一武道会&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Dragonball_2019\/Dragonball_2019.png&quot;,&quot;пепперпоттс&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_PepperPotts\/Avengers_Endgame_2019_PepperPotts.png&quot;,&quot;вуди&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_Woody\/Disney_ToyStory4_Woody.png&quot;,&quot;ソー&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Thor\/Avengers_Endgame_2019_Thor.png&quot;,&quot;riverdalecw&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Riverdale_S4_2019_v2\/Riverdale_S4_2019_v2.png&quot;,&quot;hawkeye&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Hawkeye\/Avengers_Endgame_2019_Hawkeye.png&quot;,&quot;ninenine&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Brooklyn99_2019\/Brooklyn99_2019.png&quot;,&quot;先想再分享&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2018_ThinkBeforeSharing\/MediaInformationLiteracyWeeks_2018_ThinkBeforeSharing.png&quot;,&quot;doitbig&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_18_NOP\/NBA_18_NOP.png&quot;,&quot;prixbestoftweets&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BestofTweetsPrize_2019\/BestofTweetsPrize_2019.png&quot;,&quot;いくぜ超刺激メッツ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KIRINMetsJP_2019\/KIRINMetsJP_2019.png&quot;,&quot;알라딘지니&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Genie\/Disney_Aladdin_Genie.png&quot;,&quot;notjustpingpong&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ITTFworld_2019\/ITTFworld_2019.png&quot;,&quot;faze5&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Esports_AllAccessTeam_FaZeClan_ext19\/Esports_AllAccessTeam_FaZeClan_ext19.png&quot;,&quot;αυτήτηφοράψηφίζω&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EUElections_VoterEngagement_2019\/EUElections_VoterEngagement_2019.png&quot;,&quot;pikapika&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Pikachu_Pokemon_PartnerUp_2019\/Pikachu_Pokemon_PartnerUp_2019.png&quot;,&quot;pulitzerprize&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PulitzerPrizes_2019\/PulitzerPrizes_2019.png&quot;,&quot;anteup&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_19_Houston_change\/OWL_19_Houston_change.png&quot;,&quot;きのこの山&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KinokomeijiJP_2019\/KinokomeijiJP_2019.png&quot;,&quot;gulbadinnaib&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CricketWorldCup_2019_Players_GulbadinNaib\/CricketWorldCup_2019_Players_GulbadinNaib.png&quot;,&quot;ofertashotsale&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AmazonHotSale2019\/AmazonHotSale2019.png&quot;,&quot;finaisnbb&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBB2019Finals\/NBB2019Finals.png&quot;,&quot;teamluckybat&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UglyDolls_LuckyBat_add\/UglyDolls_LuckyBat_add.png&quot;,&quot;ronin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Hawkeye\/Avengers_Endgame_2019_Hawkeye.png&quot;,&quot;デスナイトへの道&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LineageMSecondBrand_2019\/LineageMSecondBrand_2019.png&quot;,&quot;redv&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL2019_RedV\/NRL2019_RedV.png&quot;,&quot;thrivetogether&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Riot_exceL_add\/Riot_exceL_add.png&quot;,&quot;booksmartmovie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Booksmart_2019\/Booksmart_2019.png&quot;,&quot;앤트맨&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_AntMan\/Avengers_Endgame_2019_AntMan.png&quot;,&quot;чернаявдова&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_BlackWidow\/Avengers_Endgame_2019_BlackWidow.png&quot;,&quot;rallytogether&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Cleveland\/MLB_2019_Cleveland.png&quot;,&quot;mentellall&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bachelorette_2019\/Bachelorette_2019.png&quot;,&quot;pulitzers&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PulitzerPrizes_2019\/PulitzerPrizes_2019.png&quot;,&quot;ausarmy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AusArmy_2019\/AusArmy_2019.png&quot;,&quot;чармандер&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBPikachu_Charmander\/WBPikachu_Charmander.png&quot;,&quot;suhur&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019_Iftar\/Ramadan_2019_Iftar.png&quot;,&quot;betterwithpets&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PurinaBetterWithPets_2019\/PurinaBetterWithPets_2019.png&quot;,&quot;うまみいただきました&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KIRINnamacya2019\/KIRINnamacya2019.png&quot;,&quot;azure&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Microsoft_APAC_2019_v2\/Microsoft_APAC_2019_v2.png&quot;,&quot;madeinheaven&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MadeInHeaven_Amazon_2019\/MadeInHeaven_Amazon_2019.png&quot;,&quot;сквиртл&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBPikachu_Squirtle_v2\/WBPikachu_Squirtle_v2.png&quot;,&quot;sorrybaby&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KillingEve_US_2019\/KillingEve_US_2019.png&quot;,&quot;hashtaglatenightmovie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Amazon_LateNight_2019\/Amazon_LateNight_2019.png&quot;,&quot;bostonup&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_19_Boston\/OWL_19_Boston.png&quot;,&quot;everybodyin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Cubs\/MLB_2019_Cubs.png&quot;,&quot;nowmorethanever&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_NowMoreThanEver_v2\/DisneyParks_NowMoreThanEver_v2.png&quot;,&quot;apahm&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AsianHeritageMonth_2019\/AsianHeritageMonth_2019.png&quot;,&quot;neverreallyover&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KatyPerry_May2019\/KatyPerry_May2019.png&quot;,&quot;redmisuperselfie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RedmiY3_2019\/RedmiY3_2019.png&quot;,&quot;aladdín&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_2019\/Disney_Aladdin_2019.png&quot;,&quot;bestoftweetsawards&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BestofTweetsPrize_2019\/BestofTweetsPrize_2019.png&quot;,&quot;ракета&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Rocket\/Avengers_Endgame_2019_Rocket.png&quot;,&quot;timestone&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_InfinityGauntlet\/Avengers_Endgame_2019_InfinityGauntlet.png&quot;,&quot;مصرفية_الراجحي_الرقمية&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AlRajhiBank_2019\/AlRajhiBank_2019.png&quot;,&quot;disneymagic&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_NowMoreThanEver_v2\/DisneyParks_NowMoreThanEver_v2.png&quot;,&quot;まがつリリースは４月２３日&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/magatsu_ver2_2019\/magatsu_ver2_2019.png&quot;,&quot;ee2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EU_Election_2019\/EU_Election_2019.png&quot;,&quot;世界ペンギンデー&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WorldPenguinDay_2019\/WorldPenguinDay_2019.png&quot;,&quot;رمضان_كريم&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019\/Ramadan_2019.png&quot;,&quot;somosmibr&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Esports_V2_19_MIBR\/Esports_V2_19_MIBR.png&quot;,&quot;jordanpeele&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UsMovie_2018\/UsMovie_2018.png&quot;,&quot;iamgroot&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Groot\/Avengers_Endgame_2019_Groot.png&quot;,&quot;mikadoensérie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/France_MondelezMikado_2019\/France_MondelezMikado_2019.png&quot;,&quot;everupward&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_19_NY\/OWL_19_NY.png&quot;,&quot;kcon2019japan&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KCON2019JAPAN\/KCON2019JAPAN.png&quot;,&quot;rockets&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_18_HOU\/NBA_18_HOU.png&quot;,&quot;movieandtvawards&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MTV_Awards_May2019\/MTV_Awards_May2019.png&quot;,&quot;ロケットマン&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Paramount_Rocketman_Rocket\/Paramount_Rocketman_Rocket.png&quot;,&quot;teamsolomid&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Esports_AllAccessTeam_TSM_filled_ext19\/Esports_AllAccessTeam_TSM_filled_ext19.png&quot;,&quot;badmutha&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WB_ShaftMovie_2019\/WB_ShaftMovie_2019.png&quot;,&quot;yadamnright&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WB_ShaftMovie_2019\/WB_ShaftMovie_2019.png&quot;,&quot;myfriendmiek&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Miek\/Avengers_Endgame_2019_Miek.png&quot;,&quot;ネビュラ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Nebula\/Avengers_Endgame_2019_Nebula.png&quot;,&quot;secretlifeofmypet&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Pets2_Max_v2_ext\/Pets2_Max_v2_ext.png&quot;,&quot;roarmacha&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DelhiCapitals_IPL\/DelhiCapitals_IPL.png&quot;,&quot;flynas&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FlyNas_2019\/FlyNas_2019.png&quot;,&quot;fazeclan&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Esports_AllAccessTeam_FaZeClan_ext19\/Esports_AllAccessTeam_FaZeClan_ext19.png&quot;,&quot;withstkilda&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AFL_2019_withstkilda\/AFL_2019_withstkilda.png&quot;,&quot;แอนนาเบลล์&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WB_Annabelle_3_v2\/WB_Annabelle_3_v2.png&quot;,&quot;pubg&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PUBGKR2019\/PUBGKR2019.png&quot;,&quot;diadelatierra&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EarthDay_2019_fixed\/EarthDay_2019_fixed.png&quot;,&quot;globalmilweek&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2018_GlobalMILWeeks\/MediaInformationLiteracyWeeks_2018_GlobalMILWeeks.png&quot;,&quot;whislepodu&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/IPL_2019_2_CSK\/IPL_2019_2_CSK.png&quot;,&quot;ikstemdezekeer&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EUElections_VoterEngagement_2019\/EUElections_VoterEngagement_2019.png&quot;,&quot;kandil&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019_Lantern\/Ramadan_2019_Lantern.png&quot;,&quot;sweepthenation&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Nissan_CWC_2019\/Nissan_CWC_2019.png&quot;,&quot;アラジン&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_2019\/Disney_Aladdin_2019.png&quot;,&quot;runskg&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Riot_SK\/Riot_SK.png&quot;,&quot;spotifyxtxt&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Spotify_KPOP_2019_v2\/Spotify_KPOP_2019_v2.png&quot;,&quot;wunderlampe&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Lamp\/Disney_Aladdin_Lamp.png&quot;,&quot;clg&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCS_2019_CounterLogicGaming\/LCS_2019_CounterLogicGaming.png&quot;,&quot;キリンレモントリビュート&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KIRINLEMON_2019\/KIRINLEMON_2019.png&quot;,&quot;watchyourself&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UsMovie_2018\/UsMovie_2018.png&quot;,&quot;choosesnooze&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CasperChooseSnooze_2019\/CasperChooseSnooze_2019.png&quot;,&quot;小火龍&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBPikachu_Charmander\/WBPikachu_Charmander.png&quot;,&quot;tobaccofreepride&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ThisFreeLife_March_2019\/ThisFreeLife_March_2019.png&quot;,&quot;sarfarazahmed&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CricketWorldCup_2019_Players_SarfarazAhmed\/CricketWorldCup_2019_Players_SarfarazAhmed.png&quot;,&quot;weareready&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL2019_WeAreReady\/NRL2019_WeAreReady.png&quot;,&quot;loveislandpodcast&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LoveIsland_May2019\/LoveIsland_May2019.png&quot;,&quot;toystorygarfinho&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_Forky\/Disney_ToyStory4_Forky.png&quot;,&quot;vivoxmaine&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MaineforVivo_2019\/MaineforVivo_2019.png&quot;,&quot;iftarramadan&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019_Iftar\/Ramadan_2019_Iftar.png&quot;,&quot;msfwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Riot_MisfitsGaming\/Riot_MisfitsGaming.png&quot;,&quot;johnwick3&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JohnWick_3_ext\/JohnWick_3_ext.png&quot;,&quot;onepursuit&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Wash\/MLB_2019_Wash.png&quot;,&quot;deixeaquímicarolar&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NaturaHumor_May2019_V2\/NaturaHumor_May2019_V2.png&quot;,&quot;quieromicamion&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Quality_Corona_May2019\/Quality_Corona_May2019.png&quot;,&quot;wearegeelong&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AFL_2019_WeAreGeelong\/AFL_2019_WeAreGeelong.png&quot;,&quot;indycaronnbc&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBCSportsIndy500_MustBeMay\/NBCSportsIndy500_MustBeMay.png&quot;,&quot;dunkin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Dunkin_NationalDonutDay_2019\/Dunkin_NationalDonutDay_2019.png&quot;,&quot;rocketman&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Paramount_Rocketman_Rocket\/Paramount_Rocketman_Rocket.png&quot;,&quot;アナベル&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WB_Annabelle_3_v2\/WB_Annabelle_3_v2.png&quot;,&quot;babo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UglyDolls_Babo\/UglyDolls_Babo.png&quot;,&quot;thestonekeeper&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_RedSkull\/Avengers_Endgame_2019_RedSkull.png&quot;,&quot;wethenorth&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_18_TOR\/NBA_18_TOR.png&quot;,&quot;соколиныйглаз&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Hawkeye\/Avengers_Endgame_2019_Hawkeye.png&quot;,&quot;mingguliterasimedia&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2018_GlobalMILWeeks\/MediaInformationLiteracyWeeks_2018_GlobalMILWeeks.png&quot;,&quot;excommunicado&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JohnWick_3_ext\/JohnWick_3_ext.png&quot;,&quot;discoverychannel&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DiscoveryChannel_2019\/DiscoveryChannel_2019.png&quot;,&quot;nebulosa&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Nebula\/Avengers_Endgame_2019_Nebula.png&quot;,&quot;nicholasjfury&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_NickFury\/Avengers_Endgame_2019_NickFury.png&quot;,&quot;pennywise&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WB_It_Chp2\/WB_It_Chp2.png&quot;,&quot;mustbemay&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBCSportsIndy500_MustBeMay\/NBCSportsIndy500_MustBeMay.png&quot;,&quot;usmovieart&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UsMovie_2018_add\/UsMovie_2018_add.png&quot;,&quot;parradise&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL2019_Parradise\/NRL2019_Parradise.png&quot;,&quot;libertadores&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Libertadores_2019\/Libertadores_2019.png&quot;,&quot;askkhaled&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DJKhaled_May2019\/DJKhaled_May2019.png&quot;,&quot;noseson&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RedNoseDay_2019\/RedNoseDay_2019.png&quot;,&quot;lvcruise&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LouisVuittonCruiseMay2019\/LouisVuittonCruiseMay2019.png&quot;,&quot;まがつ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/magatsu_ver2_2019\/magatsu_ver2_2019.png&quot;,&quot;ڤيمتو&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Vimto_Ramadan_2019_v2\/Vimto_Ramadan_2019_v2.png&quot;,&quot;gorabbitohs&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL2019_GoRabbitohs\/NRL2019_GoRabbitohs.png&quot;,&quot;gospursgo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_18_SAS\/NBA_18_SAS.png&quot;,&quot;سحور_رمضان&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019_Iftar\/Ramadan_2019_Iftar.png&quot;,&quot;إفطار_رمضان&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019_Iftar\/Ramadan_2019_Iftar.png&quot;,&quot;boltonbagelboss&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Warburtons_Bagel_Boss\/Warburtons_Bagel_Boss.png&quot;,&quot;وزارة_الثقافة&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MOCSaudi_2019\/MOCSaudi_2019.png&quot;,&quot;pikirsebelumsebar&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2018_ThinkBeforeSharing\/MediaInformationLiteracyWeeks_2018_ThinkBeforeSharing.png&quot;,&quot;galaxyに願いよ届け&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Japan_DreamsComeTrue_2019\/Japan_DreamsComeTrue_2019.png&quot;,&quot;bryceharper&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_TheShow19\/MLB_TheShow19.png&quot;,&quot;thesecretlifeofpets&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Pets2_Max_v2_ext\/Pets2_Max_v2_ext.png&quot;,&quot;thenextidol&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AmericanIdol_2019\/AmericanIdol_2019.png&quot;,&quot;dubnation&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_18_GSW\/NBA_18_GSW.png&quot;,&quot;thelumineers&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Lumineers_May_2019\/Lumineers_May_2019.png&quot;,&quot;smugglersrun&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/disney_starwarsgalaxysedge_2019_v2\/disney_starwarsgalaxysedge_2019_v2.png&quot;,&quot;šoreizesbalsošu&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EUElections_VoterEngagement_2019\/EUElections_VoterEngagement_2019.png&quot;,&quot;برنامج_أصيل&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SAIB_2019\/SAIB_2019.png&quot;,&quot;マンティス&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Mantis\/Avengers_Endgame_2019_Mantis.png&quot;,&quot;небула&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Nebula\/Avengers_Endgame_2019_Nebula.png&quot;,&quot;lionsroar&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CricketWorldCup_2019_Teams_LionsRoar\/CricketWorldCup_2019_Teams_LionsRoar.png&quot;,&quot;panteranegra&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_BlackPanther\/Avengers_Endgame_2019_BlackPanther.png&quot;,&quot;takenote&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Utah\/Utah.png&quot;,&quot;valkiria&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Valkyrie\/Avengers_Endgame_2019_Valkyrie.png&quot;,&quot;sweetbitterstarz&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/STARZ_Sweetbitter_Season2\/STARZ_Sweetbitter_Season2.png&quot;,&quot;mtvmiaw2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MTV_Miaw_2019\/MTV_Miaw_2019.png&quot;,&quot;puasa&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019\/Ramadan_2019.png&quot;,&quot;토이스토리버즈&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_Buzz\/Disney_ToyStory4_Buzz.png&quot;,&quot;godzillamovie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Godzilla_WB_2019\/Godzilla_WB_2019.png&quot;,&quot;teamrocketman&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Paramount_Rocketman_Star\/Paramount_Rocketman_Star.png&quot;,&quot;パンテーンに願いよ届け&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Japan_DreamsComeTrue_2019\/Japan_DreamsComeTrue_2019.png&quot;,&quot;3deseos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Genie\/Disney_Aladdin_Genie.png&quot;,&quot;dcu&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_19_DCU\/MLS_19_DCU.png&quot;,&quot;con_canas&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PG_Spain_Pantene_2019\/PG_Spain_Pantene_2019.png&quot;,&quot;standupflagsup&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL2019_StandUpFlagsUp\/NRL2019_StandUpFlagsUp.png&quot;,&quot;twice&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KPOP_TWICE_Fancy_2019\/KPOP_TWICE_Fancy_2019.png&quot;,&quot;cmonlittlelady&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Halsey_2019\/Halsey_2019.png&quot;,&quot;перчаткабесконечности&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_InfinityGauntlet\/Avengers_Endgame_2019_InfinityGauntlet.png&quot;,&quot;زاد_رمضان&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ZadFresh_2019_v3\/ZadFresh_2019_v3.png&quot;,&quot;avidasecretadosbichos2&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Pets2_2018_Snowball_Brazil\/Pets2_2018_Snowball_Brazil.png&quot;,&quot;まがつリリースは4月23日&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/magatsu_ver2_2019_add\/magatsu_ver2_2019_add.png&quot;,&quot;afl&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AFL_2019\/AFL_2019.png&quot;,&quot;ramadanmubarak&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019\/Ramadan_2019.png&quot;,&quot;euverkiezingen2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EU_Election_2019\/EU_Election_2019.png&quot;,&quot;気になりだしたら止まらないこと選手権&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/rakuma_official_brand_2019\/rakuma_official_brand_2019.png&quot;,&quot;blackpanther&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_BlackPanther\/Avengers_Endgame_2019_BlackPanther.png&quot;,&quot;افطارا_شهيا&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019_Iftar\/Ramadan_2019_Iftar.png&quot;,&quot;riverdale&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Riverdale_S4_2019_v2\/Riverdale_S4_2019_v2.png&quot;,&quot;оно2&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WB_It_Chp2\/WB_It_Chp2.png&quot;,&quot;manopladoinfinito&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_InfinityGauntlet\/Avengers_Endgame_2019_InfinityGauntlet.png&quot;,&quot;nos4a2&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Nos4a2_2019\/Nos4a2_2019.png&quot;,&quot;グリムエコーズ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/GrimmsEchoes_PR_2019\/GrimmsEchoes_PR_2019.png&quot;,&quot;cidadesinteligentes&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Cabify_DecisionesInteligentes_2019\/Cabify_DecisionesInteligentes_2019.png&quot;,&quot;toystory4&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_Woody\/Disney_ToyStory4_Woody.png&quot;,&quot;iftar_ramadan&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019_Iftar\/Ramadan_2019_Iftar.png&quot;,&quot;pikaparty&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Pikachu_Pokemon_PartnerUp_2019\/Pikachu_Pokemon_PartnerUp_2019.png&quot;,&quot;santiago2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Libertadores_2019\/Libertadores_2019.png&quot;,&quot;johnwick&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JohnWick_3_ext\/JohnWick_3_ext.png&quot;,&quot;그것2&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WB_It_Chp2\/WB_It_Chp2.png&quot;,&quot;ngkfire&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NGKFilm_2019\/NGKFilm_2019.png&quot;,&quot;ngabuburit&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019\/Ramadan_2019.png&quot;,&quot;放置系美少女ゲーム&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/houchishoujo_2yearanniversary_v2\/houchishoujo_2yearanniversary_v2.png&quot;,&quot;soundersmatchday&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_19_SEA\/MLS_19_SEA.png&quot;,&quot;secretlifeofpets2&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Pets2_Max_v2_ext\/Pets2_Max_v2_ext.png&quot;,&quot;nowruz&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/nowruz2018_v4\/nowruz2018_v4.png&quot;,&quot;lawasp&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Wasp\/Avengers_Endgame_2019_Wasp.png&quot;,&quot;epcot&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_MickeyEars_Flight2\/DisneyParks_MickeyEars_Flight2.png&quot;,&quot;ivetastedblood&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Halsey_2019\/Halsey_2019.png&quot;,&quot;timetorise&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_18_PHX\/NBA_18_PHX.png&quot;,&quot;pacers&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_18_IND\/NBA_18_IND.png&quot;,&quot;ブラックパンサー&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_BlackPanther\/Avengers_Endgame_2019_BlackPanther.png&quot;,&quot;rakutennba&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RakutenTV_NBA_Logo_2019_v2\/RakutenTV_NBA_Logo_2019_v2.png&quot;,&quot;lewiscapaldi&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LewisCapaldi_2019\/LewisCapaldi_2019.png&quot;,&quot;opintassilgo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WB_TheGoldfinch_2019\/WB_TheGoldfinch_2019.png&quot;,&quot;برنامج_وااو&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SAIB_2019\/SAIB_2019.png&quot;,&quot;デレステ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/imascg_stage_May2019\/imascg_stage_May2019.png&quot;,&quot;블랙핑크&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KPOP_BLACKPINK_2019\/KPOP_BLACKPINK_2019.png&quot;,&quot;فكر_قبل_الضغط&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2018_ThinkBeforeClicking\/MediaInformationLiteracyWeeks_2018_ThinkBeforeClicking.png&quot;,&quot;thisismycrew&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Milwaukee\/MLB_2019_Milwaukee.png&quot;,&quot;charliemanx&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Nos4a2_2019\/Nos4a2_2019.png&quot;,&quot;winecountrymovie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WineCountry_Netflix\/WineCountry_Netflix.png&quot;,&quot;thesecretlifeofpets2&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Pets2_Max_v2_ext\/Pets2_Max_v2_ext.png&quot;,&quot;mindstone&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_InfinityGauntlet\/Avengers_Endgame_2019_InfinityGauntlet.png&quot;,&quot;生茶が変わった&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KIRINnamacya2019\/KIRINnamacya2019.png&quot;,&quot;からあげクンに願いよ届け&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Japan_DreamsComeTrue_2019\/Japan_DreamsComeTrue_2019.png&quot;,&quot;murmureuntweet&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OuiGO_SNCF_2019\/OuiGO_SNCF_2019.png&quot;,&quot;親バカ部&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ChildrensDay_2019\/ChildrensDay_2019.png&quot;,&quot;キリンレモンのうた2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KIRINLEMON_2019\/KIRINLEMON_2019.png&quot;,&quot;dignitas&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Esports_V2_19_DIG\/Esports_V2_19_DIG.png&quot;,&quot;wiredforwireless&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Cisco_Avengers_2019\/Cisco_Avengers_2019.png&quot;,&quot;스칼렛위치&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_ScarletWitch\/Avengers_Endgame_2019_ScarletWitch.png&quot;,&quot;uglydollluckybat&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UglyDolls_LuckyBat\/UglyDolls_LuckyBat.png&quot;,&quot;comisariowoody&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_Woody\/Disney_ToyStory4_Woody.png&quot;,&quot;whoarethesparks&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Lumineers_May_2019\/Lumineers_May_2019.png&quot;,&quot;capitánamérica&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_CaptainAmerica\/Avengers_Endgame_2019_CaptainAmerica.png&quot;,&quot;hollywoodstudios30&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_NowMoreThanEver_v2\/DisneyParks_NowMoreThanEver_v2.png&quot;,&quot;seeher&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SeeHer_2019\/SeeHer_2019.png&quot;,&quot;فطور&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019_Iftar\/Ramadan_2019_Iftar.png&quot;,&quot;ogwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Riot_Origen\/Riot_Origen.png&quot;,&quot;しまむら&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Shimamura_2019\/Shimamura_2019.png&quot;,&quot;三ツ矢&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Asahi_MitsuyaBrand_2019_add\/Asahi_MitsuyaBrand_2019_add.png&quot;,&quot;mtvmiaw&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MTV_Miaw_2019\/MTV_Miaw_2019.png&quot;,&quot;fuelthefire&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FuelTheFire_SuperSport_2019\/FuelTheFire_SuperSport_2019.png&quot;,&quot;kombatkast&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBGames_MortalKombat_2019\/WBGames_MortalKombat_2019.png&quot;,&quot;azurefriday&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Microsoft_APAC_2019_v2_add\/Microsoft_APAC_2019_v2_add.png&quot;,&quot;antman&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_AntMan\/Avengers_Endgame_2019_AntMan.png&quot;,&quot;hawkeyeavengers&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Hawkeye\/Avengers_Endgame_2019_Hawkeye.png&quot;,&quot;whateverittakes&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019\/Avengers_Endgame_2019.png&quot;,&quot;folketingsvalg&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DanishElection_2019\/DanishElection_2019.png&quot;,&quot;リネージュmは5月29日リリース&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LineageMFirstBrand_2019\/LineageMFirstBrand_2019.png&quot;,&quot;shareourplanet&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_OurPlanet_2019\/Netflix_OurPlanet_2019.png&quot;,&quot;desusandmero&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DesusandMero_2019\/DesusandMero_2019.png&quot;,&quot;iontheprize&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_19_Phil\/OWL_19_Phil.png&quot;,&quot;mytwitteranniversary&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MyTwitterAnniversary\/MyTwitterAnniversary.png&quot;,&quot;brightburn&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Sony_Brightburn_BB_2019_add\/Sony_Brightburn_BB_2019_add.png&quot;,&quot;duniyahiladenge&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MumbaiIndians_2018\/MumbaiIndians_2018.png&quot;,&quot;닉퓨리&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_NickFury\/Avengers_Endgame_2019_NickFury.png&quot;,&quot;allthemoods&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Spotify_AllTheMoods\/Spotify_AllTheMoods.png&quot;,&quot;傑尼龜&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBPikachu_Squirtle_v2\/WBPikachu_Squirtle_v2.png&quot;,&quot;워머신&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_WarMachine\/Avengers_Endgame_2019_WarMachine.png&quot;,&quot;ヒトカゲ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBPikachu_Charmander\/WBPikachu_Charmander.png&quot;,&quot;ジャスミン&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Jasmine\/Disney_Aladdin_Jasmine.png&quot;,&quot;サランラップのくま&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AsahiKaseiHP_2019\/AsahiKaseiHP_2019.png&quot;,&quot;لحظات_مكية_بالأشواق&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JODC_GreenDevice\/JODC_GreenDevice.png&quot;,&quot;おいしいついでに栄養補給&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KIRIN_Tropicana_JP\/KIRIN_Tropicana_JP.png&quot;,&quot;abematvに願いよ届け&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Japan_DreamsComeTrue_2019\/Japan_DreamsComeTrue_2019.png&quot;,&quot;princesajasmín&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Jasmine\/Disney_Aladdin_Jasmine.png&quot;,&quot;モバレ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Elex_MobileLegendsJP_2019\/Elex_MobileLegendsJP_2019.png&quot;,&quot;redminote7&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/XiaomiRedmi_Pro7_2019\/XiaomiRedmi_Pro7_2019.png&quot;,&quot;تطبيق_مصرف_الراجحي&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AlRajhiBank_2019\/AlRajhiBank_2019.png&quot;,&quot;theboystv&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AmazonStudios_TheBoys_2019\/AmazonStudios_TheBoys_2019.png&quot;,&quot;loki&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Loki\/Avengers_Endgame_2019_Loki.png&quot;,&quot;nbbnotwitter&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBB_2018_2019Season\/NBB_2018_2019Season.png&quot;,&quot;bestfriends4ever&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_Woody\/Disney_ToyStory4_Woody.png&quot;,&quot;crawlmovie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Paramount_Crawl_2019\/Paramount_Crawl_2019.png&quot;,&quot;amigosporsiempre&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_Woody\/Disney_ToyStory4_Woody.png&quot;,&quot;derdistelfink&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WB_TheGoldfinch_2019\/WB_TheGoldfinch_2019.png&quot;,&quot;историяигрушеквуди&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_Woody\/Disney_ToyStory4_Woody.png&quot;,&quot;greenwall&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Esports_AllAccessTeam_Greenwall_ext19\/Esports_AllAccessTeam_Greenwall_ext19.png&quot;,&quot;thevalkyrie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Valkyrie\/Avengers_Endgame_2019_Valkyrie.png&quot;,&quot;cheddarlive&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CheddarLIVE_2019\/CheddarLIVE_2019.png&quot;,&quot;overwatchleague&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_19\/OWL_19.png&quot;,&quot;七つの大罪グラクロ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netmarble_7deadlysins_2019\/Netmarble_7deadlysins_2019.png&quot;,&quot;golddontquit&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/IndianaPlayoffs2019\/IndianaPlayoffs2019.png&quot;,&quot;iambharat&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BharatFilm_2019\/BharatFilm_2019.png&quot;,&quot;bravo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ProjectRunway_Bravo\/ProjectRunway_Bravo.png&quot;,&quot;nebulaendgame&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Nebula\/Avengers_Endgame_2019_Nebula.png&quot;,&quot;maineforvivo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/VivoPHV15_2019\/VivoPHV15_2019.png&quot;,&quot;バッキ―&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_WinterSoldier\/Avengers_Endgame_2019_WinterSoldier.png&quot;,&quot;doutorestranho&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_DoctorStrange\/Avengers_Endgame_2019_DoctorStrange.png&quot;,&quot;جمعية_زمزم&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Zamzam_2019\/Zamzam_2019.png&quot;,&quot;freshempirevibes&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FreshEmpire_MayAugust_2019\/FreshEmpire_MayAugust_2019.png&quot;,&quot;elpoderdeunpelopantene&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PG_Spain_Pantene_2019\/PG_Spain_Pantene_2019.png&quot;,&quot;トロピカーナ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KIRIN_Tropicana_JP\/KIRIN_Tropicana_JP.png&quot;,&quot;spiderman&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Spiderman\/Avengers_Endgame_2019_Spiderman.png&quot;,&quot;gosnapshot&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PokemonGoJP_GoSnapshot_2019\/PokemonGoJP_GoSnapshot_2019.png&quot;,&quot;toystory&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_Woody\/Disney_ToyStory4_Woody.png&quot;,&quot;itsbouttime&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ESPN_UFC_2019_v3\/ESPN_UFC_2019_v3.png&quot;,&quot;letsgohunt&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_19_Chengdu\/OWL_19_Chengdu.png&quot;,&quot;thistimeimvoting&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EUElections_VoterEngagement_2019\/EUElections_VoterEngagement_2019.png&quot;,&quot;screamback&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SonyIntruder_2018\/SonyIntruder_2018.png&quot;,&quot;ホークアイ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Hawkeye\/Avengers_Endgame_2019_Hawkeye.png&quot;,&quot;pulitzerprizes&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PulitzerPrizes_2019\/PulitzerPrizes_2019.png&quot;,&quot;サランラップ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AsahiKaseiHP_2019\/AsahiKaseiHP_2019.png&quot;,&quot;goninjas&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Esports_V2_19_NIP\/Esports_V2_19_NIP.png&quot;,&quot;이상해씨&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBPikachu_Bulbasaur\/WBPikachu_Bulbasaur.png&quot;,&quot;viúvanegra&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_BlackWidow\/Avengers_Endgame_2019_BlackWidow.png&quot;,&quot;euválasztás2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EU_Election_2019\/EU_Election_2019.png&quot;,&quot;мбаку&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Mbaku\/Avengers_Endgame_2019_Mbaku.png&quot;,&quot;fancyyou&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KPOP_TWICE_Fancy_2019\/KPOP_TWICE_Fancy_2019.png&quot;,&quot;walküre&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Valkyrie\/Avengers_Endgame_2019_Valkyrie.png&quot;,&quot;eskapitel2&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WB_It_Chp2\/WB_It_Chp2.png&quot;,&quot;ウィンターソルジャー&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_WinterSoldier\/Avengers_Endgame_2019_WinterSoldier.png&quot;,&quot;newyorkforever&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_18_NYK\/NBA_18_NYK.png&quot;,&quot;runasone&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HoustonPlayoffs2019\/HoustonPlayoffs2019.png&quot;,&quot;elgeniodealaddín&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Genie\/Disney_Aladdin_Genie.png&quot;,&quot;keanureeves&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JohnWick_3_ext\/JohnWick_3_ext.png&quot;,&quot;tsmwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Esports_AllAccessTeam_TSM_filled_ext19\/Esports_AllAccessTeam_TSM_filled_ext19.png&quot;,&quot;mumbaiindians&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MumbaiIndians_2018\/MumbaiIndians_2018.png&quot;,&quot;sochkesharekaro&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2018_ThinkBeforeSharing\/MediaInformationLiteracyWeeks_2018_ThinkBeforeSharing.png&quot;,&quot;ريالك_مبارك&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ZadFresh_2019_v3\/ZadFresh_2019_v3.png&quot;,&quot;uglydolluglydog&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UglyDolls_Dog\/UglyDolls_Dog.png&quot;,&quot;रमजान&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019\/Ramadan_2019.png&quot;,&quot;가모라&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Gamora\/Avengers_Endgame_2019_Gamora.png&quot;,&quot;ペンギンの日&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WorldPenguinDay_2019\/WorldPenguinDay_2019.png&quot;,&quot;porzellinchen&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_BoPeep\/Disney_ToyStory4_BoPeep.png&quot;,&quot;リネージュm開戦&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LineageMFirstBrand_2019\/LineageMFirstBrand_2019.png&quot;,&quot;dtid&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_19_DTID\/MLS_19_DTID.png&quot;,&quot;hulk&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Hulk\/Avengers_Endgame_2019_Hulk.png&quot;,&quot;dunkincoffee&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Dunkin_NationalDonutDay_2019\/Dunkin_NationalDonutDay_2019.png&quot;,&quot;toystoryforky&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_Forky\/Disney_ToyStory4_Forky.png&quot;,&quot;weareourownworstenemy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UsMovie_2018\/UsMovie_2018.png&quot;,&quot;스파이더맨&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Spiderman\/Avengers_Endgame_2019_Spiderman.png&quot;,&quot;гамора&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Gamora\/Avengers_Endgame_2019_Gamora.png&quot;,&quot;milcity&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaLiterateCities_2018\/MediaLiterateCities_2018.png&quot;,&quot;アベンジャーズ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019\/Avengers_Endgame_2019.png&quot;,&quot;deixeaquimicarolar&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NaturaHumor_May2019_V2\/NaturaHumor_May2019_V2.png&quot;,&quot;americanidol&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AmericanIdol_2019\/AmericanIdol_2019.png&quot;,&quot;halseynightmare&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Halsey_2019\/Halsey_2019.png&quot;,&quot;euelections2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EU_Election_2019\/EU_Election_2019.png&quot;,&quot;しまむらコーデ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Shimamura_2019\/Shimamura_2019.png&quot;,&quot;homemformiga&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_AntMan\/Avengers_Endgame_2019_AntMan.png&quot;,&quot;weflyasone&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AFL_2019_WeFlyAsOne\/AFL_2019_WeFlyAsOne.png&quot;,&quot;y3&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RedmiY3_2019\/RedmiY3_2019.png&quot;,&quot;сокол&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Falcon\/Avengers_Endgame_2019_Falcon.png&quot;,&quot;forthepeopleabc&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ForthePeople_ABC_2019\/ForthePeople_ABC_2019.png&quot;,&quot;godzillareidosmonstros&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Godzilla_WB_2019\/Godzilla_WB_2019.png&quot;,&quot;theuntethering&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UsMovie_2018\/UsMovie_2018.png&quot;,&quot;スポティファイ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SpotifyJapan_TVCM\/SpotifyJapan_TVCM.png&quot;,&quot;bachelorette&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bachelorette_2019\/Bachelorette_2019.png&quot;,&quot;metgala2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/VogueMetGala_2019\/VogueMetGala_2019.png&quot;,&quot;スパイダーマン&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Spiderman\/Avengers_Endgame_2019_Spiderman.png&quot;,&quot;wwdc19&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Apple_WWDC19\/Apple_WWDC19.png&quot;,&quot;sunrisers&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/IPL_2019_2_Sunrisers\/IPL_2019_2_Sunrisers.png&quot;,&quot;妙蛙种子&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBPikachu_Bulbasaur\/WBPikachu_Bulbasaur.png&quot;,&quot;世界ペンギンの日&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WorldPenguinDay_2019\/WorldPenguinDay_2019.png&quot;,&quot;alwaysfnatic&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Riot_Fnatic\/Riot_Fnatic.png&quot;,&quot;gantdelinfini&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_InfinityGauntlet\/Avengers_Endgame_2019_InfinityGauntlet.png&quot;,&quot;projectrunway&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ProjectRunway_Bravo\/ProjectRunway_Bravo.png&quot;,&quot;cookierun&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CookieRunGame_2019\/CookieRunGame_2019.png&quot;,&quot;tchalla&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_BlackPanther\/Avengers_Endgame_2019_BlackPanther.png&quot;,&quot;sceriffowoody&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_Woody\/Disney_ToyStory4_Woody.png&quot;,&quot;takis&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TAKIS_WILD_2019\/TAKIS_WILD_2019.png&quot;,&quot;newlies&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBO_BigLittleLies_Season2_2019\/HBO_BigLittleLies_Season2_2019.png&quot;,&quot;человекмуравей&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_AntMan\/Avengers_Endgame_2019_AntMan.png&quot;,&quot;uglyluckybat&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UglyDolls_LuckyBat\/UglyDolls_LuckyBat.png&quot;,&quot;killingeve&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KillingEve_US_2019\/KillingEve_US_2019.png&quot;,&quot;screambackscreenings&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SonyIntruder_2018\/SonyIntruder_2018.png&quot;,&quot;latenightmovie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Amazon_LateNight_2019\/Amazon_LateNight_2019.png&quot;,&quot;ojodehalcon&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Hawkeye\/Avengers_Endgame_2019_Hawkeye.png&quot;,&quot;asklewiscapaldi&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LewisCapaldi_2019\/LewisCapaldi_2019.png&quot;,&quot;canyadigit&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WB_ShaftMovie_2019\/WB_ShaftMovie_2019.png&quot;,&quot;friendlikeme&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Genie\/Disney_Aladdin_Genie.png&quot;,&quot;nitejogger&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Adidas_NiteJogger_2019\/Adidas_NiteJogger_2019.png&quot;,&quot;foreverfreo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AFL_2019_ForeverFreo\/AFL_2019_ForeverFreo.png&quot;,&quot;anbuden&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PL_2019_2_CSK_v2\/PL_2019_2_CSK_v2.png&quot;,&quot;ドラゴンボールz_ブッチギリマッチ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Dragonball_2019\/Dragonball_2019.png&quot;,&quot;saddapunjab&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/IPL_2019_2_KXIP\/IPL_2019_2_KXIP.png&quot;,&quot;intrudermovie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SonyIntruder_2018\/SonyIntruder_2018.png&quot;,&quot;netneutrality&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Net_Emoji_Evergreen\/Net_Emoji_Evergreen.png&quot;,&quot;latenightout&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Amazon_LateNight_2019\/Amazon_LateNight_2019.png&quot;,&quot;超夢&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBPikachu_Mewtwo\/WBPikachu_Mewtwo.png&quot;,&quot;asianamericanpacificislanderheritagemonth&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AsianHeritageMonth_2019\/AsianHeritageMonth_2019.png&quot;,&quot;takeitback&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Houston\/MLB_2019_Houston.png&quot;,&quot;мьюту&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBPikachu_Mewtwo\/WBPikachu_Mewtwo.png&quot;,&quot;amazonprimevideo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AmazonPrimeVideo_Dionysus_2019_v2\/AmazonPrimeVideo_Dionysus_2019_v2.png&quot;,&quot;bravoprojectrunway&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ProjectRunway_Bravo\/ProjectRunway_Bravo.png&quot;,&quot;thevoicekidsuk&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheVoice_UK_2019\/TheVoice_UK_2019.png&quot;,&quot;gloriasparks&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Lumineers_May_2019\/Lumineers_May_2019.png&quot;,&quot;thevoicekids&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheVoice_UK_2019\/TheVoice_UK_2019.png&quot;,&quot;amtodmbf&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BuzzFeedMorning_2019ext\/BuzzFeedMorning_2019ext.png&quot;,&quot;iamthenight&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TNT_IAmTheNight_2019_v2\/TNT_IAmTheNight_2019_v2.png&quot;,&quot;orangearmy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/IPL_2019_2_Sunrisers\/IPL_2019_2_Sunrisers.png&quot;,&quot;awholenewworld&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Jasmine\/Disney_Aladdin_Jasmine.png&quot;,&quot;vidasecretadosbichos2&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Pets2_2018_Snowball_Brazil\/Pets2_2018_Snowball_Brazil.png&quot;,&quot;riseupwithvivov15&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MaineforVivo_2019\/MaineforVivo_2019.png&quot;,&quot;超梦&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBPikachu_Mewtwo\/WBPikachu_Mewtwo.png&quot;,&quot;ヴァルコネ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Vconnect_jp_2019_V2\/Vconnect_jp_2019_V2.png&quot;,&quot;hallabol&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/IPL_2019_2_Royals\/IPL_2019_2_Royals.png&quot;,&quot;frenchopen&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FrenchOpen_RolandGarros_2019\/FrenchOpen_RolandGarros_2019.png&quot;,&quot;램프&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Lamp\/Disney_Aladdin_Lamp.png&quot;,&quot;فلاي_ناس&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FlyNas_2019\/FlyNas_2019.png&quot;,&quot;新きのこ党&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KinokomeijiJP_2019\/KinokomeijiJP_2019.png&quot;,&quot;鍛えろ筋肉とロマサガrs&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/romasaga_rs_2019\/romasaga_rs_2019.png&quot;,&quot;リネm友達募集デス&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LineageMSecondBrand_2019\/LineageMSecondBrand_2019.png&quot;,&quot;mortalkombat11&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBGames_MortalKombat_2019\/WBGames_MortalKombat_2019.png&quot;,&quot;europee2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EU_Election_2019\/EU_Election_2019.png&quot;,&quot;estonoestachido&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CampaignsforChange_2019\/CampaignsforChange_2019.png&quot;,&quot;mmas2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MYXMusicAwards_2019\/MYXMusicAwards_2019.png&quot;,&quot;cgwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCS_2019_ClutchGaming\/LCS_2019_ClutchGaming.png&quot;,&quot;лампа&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Lamp\/Disney_Aladdin_Lamp.png&quot;,&quot;ボーピープ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_BoPeep\/Disney_ToyStory4_BoPeep.png&quot;,&quot;sacramentoproud&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_18_SAC\/NBA_18_SAC.png&quot;,&quot;キャプテンアメリカ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_CaptainAmerica\/Avengers_Endgame_2019_CaptainAmerica.png&quot;,&quot;thunderup&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_18_OKC\/NBA_18_OKC.png&quot;,&quot;kkrtaiyaar&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KolkataKnights_2019\/KolkataKnights_2019.png&quot;,&quot;오분의일상탈출&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CookieRunGame_2019\/CookieRunGame_2019.png&quot;,&quot;nbatwitter&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBATwitter_2018_RefreshEmoji\/NBATwitter_2018_RefreshEmoji.png&quot;,&quot;milcities&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaLiterateCities_2018\/MediaLiterateCities_2018.png&quot;,&quot;drax&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Drax\/Avengers_Endgame_2019_Drax.png&quot;,&quot;妙蛙種子&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBPikachu_Bulbasaur\/WBPikachu_Bulbasaur.png&quot;,&quot;マッチングシーブリーズ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Matching_seabreeze_2019\/Matching_seabreeze_2019.png&quot;,&quot;бопип&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_BoPeep\/Disney_ToyStory4_BoPeep.png&quot;,&quot;thisisnotjust&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PercyPig_2019\/PercyPig_2019.png&quot;,&quot;díadelatierra&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EarthDay_2019_fixed\/EarthDay_2019_fixed.png&quot;,&quot;buffaloranchtakis&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TAKIS_WILD_2019\/TAKIS_WILD_2019.png&quot;,&quot;오븐브레이크챌린지&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CookieRunGame_2019\/CookieRunGame_2019.png&quot;,&quot;happyhogan&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_HappyHogan\/Avengers_Endgame_2019_HappyHogan.png&quot;,&quot;neverhadafriendlikeme&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Genie\/Disney_Aladdin_Genie.png&quot;,&quot;medialitwk&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2018_MediaLitWk\/MediaInformationLiteracyWeeks_2018_MediaLitWk.png&quot;,&quot;upupcronulla&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL2019_UpUpCronulla\/NRL2019_UpUpCronulla.png&quot;,&quot;f4glory&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Euroleague_Jan2019_add\/Euroleague_Jan2019_add.png&quot;,&quot;вонг&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Wong\/Avengers_Endgame_2019_Wong.png&quot;,&quot;piensaantesdedarclick&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2018_ThinkBeforeClicking\/MediaInformationLiteracyWeeks_2018_ThinkBeforeClicking.png&quot;,&quot;insanityrules&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bethesda_RAGE2_2019\/Bethesda_RAGE2_2019.png&quot;,&quot;dcfamily&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_18_DC\/NBA_18_DC.png&quot;,&quot;spencejrgarcia&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FoxSports_PBC\/FoxSports_PBC.png&quot;,&quot;diabloguardian&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Amazon_DiabloGuardian\/Amazon_DiabloGuardian.png&quot;,&quot;wロマンシング祭&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/romasaga_rs_2019\/romasaga_rs_2019.png&quot;,&quot;声でココロ診断&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AIDAMITSUWO_2019\/AIDAMITSUWO_2019.png&quot;,&quot;vingadores&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019\/Avengers_Endgame_2019.png&quot;,&quot;mortalkombat&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBGames_MortalKombat_2019\/WBGames_MortalKombat_2019.png&quot;,&quot;mapfretenis&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MapfreRafaNadal_2019\/MapfreRafaNadal_2019.png&quot;,&quot;g2win&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Esports_AllAccessTeam_G2_ext19\/Esports_AllAccessTeam_G2_ext19.png&quot;,&quot;dontruintheendgame&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019\/Avengers_Endgame_2019.png&quot;,&quot;buzzlightyear&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_Buzz\/Disney_ToyStory4_Buzz.png&quot;,&quot;hegra&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AlUlaCity_2019\/AlUlaCity_2019.png&quot;,&quot;captainamerica&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_CaptainAmerica\/Avengers_Endgame_2019_CaptainAmerica.png&quot;,&quot;wearetfl&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ThisFreeLife_March_2019\/ThisFreeLife_March_2019.png&quot;,&quot;オルビス&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ORBIS_2019_add\/ORBIS_2019_add.png&quot;,&quot;tethered&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UsMovie_2018\/UsMovie_2018.png&quot;,&quot;whistlepodu&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PL_2019_2_CSK_v2\/PL_2019_2_CSK_v2.png&quot;,&quot;دائماً_متألقة&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Vimto_Ramadan_2019_v2\/Vimto_Ramadan_2019_v2.png&quot;,&quot;ucl&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ChampionsLeague_Final_2019\/ChampionsLeague_Final_2019.png&quot;,&quot;luckybat&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UglyDolls_LuckyBat\/UglyDolls_LuckyBat.png&quot;,&quot;schiggy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBPikachu_Squirtle_v2\/WBPikachu_Squirtle_v2.png&quot;,&quot;星のドラゴンクエスト&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Hoshidora_May2019\/Hoshidora_May2019.png&quot;,&quot;optwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Esports_AllAccessTeam_Greenwall_add\/Esports_AllAccessTeam_Greenwall_add.png&quot;,&quot;teamuglydog&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UglyDolls_Dog_add\/UglyDolls_Dog_add.png&quot;,&quot;prixbestoftweet&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BestofTweetsPrize_2019\/BestofTweetsPrize_2019.png&quot;,&quot;イット見えたら終わり&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WB_It_Chp2\/WB_It_Chp2.png&quot;,&quot;mothersday&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/2019_MothersDay\/2019_MothersDay.png&quot;,&quot;luckybattheuglydoll&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UglyDolls_LuckyBat\/UglyDolls_LuckyBat.png&quot;,&quot;kcon2019ny&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KCON2019USA_2019\/KCON2019USA_2019.png&quot;,&quot;celtics&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CelticsPlayoffs2019\/CelticsPlayoffs2019.png&quot;,&quot;ロマサガrs&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/romasaga_rs_2019\/romasaga_rs_2019.png&quot;,&quot;takewarning&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CanesPlayoff2019\/CanesPlayoff2019.png&quot;,&quot;jw3&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JohnWick_3_ext\/JohnWick_3_ext.png&quot;,&quot;nerevs&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_19_NERevs\/MLS_19_NERevs.png&quot;,&quot;disneyparks&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_MickeyEars_Flight2\/DisneyParks_MickeyEars_Flight2.png&quot;,&quot;friedhofderkuscheltiere&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Paramount_PetSematary_2019_v2\/Paramount_PetSematary_2019_v2.png&quot;,&quot;retomemos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Houston\/MLB_2019_Houston.png&quot;,&quot;gaviaoarqueiro&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Hawkeye\/Avengers_Endgame_2019_Hawkeye.png&quot;,&quot;jamesbeard&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JamesBeard_FoundationAwards_2019\/JamesBeard_FoundationAwards_2019.png&quot;,&quot;philaunite&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SixersPlayoffs2019v2\/SixersPlayoffs2019v2.png&quot;,&quot;amc&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Nos4a2_2019\/Nos4a2_2019.png&quot;,&quot;アイアンマン&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_IronMan\/Avengers_Endgame_2019_IronMan.png&quot;,&quot;アースデー&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EarthDay_2019_fixed\/EarthDay_2019_fixed.png&quot;,&quot;nro&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KatyPerry_May2019\/KatyPerry_May2019.png&quot;,&quot;dutahe&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LewisCapaldi_2019\/LewisCapaldi_2019.png&quot;,&quot;애나벨&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WB_Annabelle_3_v2\/WB_Annabelle_3_v2.png&quot;,&quot;erstdenkendannklicken&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2018_ThinkBeforeClicking\/MediaInformationLiteracyWeeks_2018_ThinkBeforeClicking.png&quot;,&quot;ブラックウィドウ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_BlackWidow\/Avengers_Endgame_2019_BlackWidow.png&quot;,&quot;superherohorror&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Sony_Brightburn_Mask_2019\/Sony_Brightburn_Mask_2019.png&quot;,&quot;theworldwillknowhisname&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Sony_Brightburn_BB_2019\/Sony_Brightburn_BB_2019.png&quot;,&quot;laguepe&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Wasp\/Avengers_Endgame_2019_Wasp.png&quot;,&quot;rg19&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FrenchOpen_RolandGarros_2019\/FrenchOpen_RolandGarros_2019.png&quot;,&quot;先想再點擊&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2018_ThinkBeforeClicking\/MediaInformationLiteracyWeeks_2018_ThinkBeforeClicking.png&quot;,&quot;twitterforgood&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FridayforGood_2019\/FridayforGood_2019.png&quot;,&quot;diddarbasenivvota&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EUElections_VoterEngagement_2019\/EUElections_VoterEngagement_2019.png&quot;,&quot;garfinho&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_Forky\/Disney_ToyStory4_Forky.png&quot;,&quot;सोचकेशेयरकरो&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2018_GlobalMILWeeks\/MediaInformationLiteracyWeeks_2018_GlobalMILWeeks.png&quot;,&quot;arawngdaigdig&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EarthDay_2019_fixed\/EarthDay_2019_fixed.png&quot;,&quot;downtonabbeypelicula&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DowntonAbbey_2019\/DowntonAbbey_2019.png&quot;,&quot;kcon&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KCON2019\/KCON2019.png&quot;,&quot;annabelle3&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WB_Annabelle_3_v2\/WB_Annabelle_3_v2.png&quot;,&quot;loswhitesox&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Chicago\/MLB_2019_Chicago.png&quot;,&quot;lafc&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_19_LAFC\/MLS_19_LAFC.png&quot;,&quot;homemdeferro&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_IronMan\/Avengers_Endgame_2019_IronMan.png&quot;,&quot;윈터솔져&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_WinterSoldier\/Avengers_Endgame_2019_WinterSoldier.png&quot;,&quot;teamwill&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheVoice_UK_2019\/TheVoice_UK_2019.png&quot;,&quot;ミュウツー&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBPikachu_Mewtwo\/WBPikachu_Mewtwo.png&quot;,&quot;buckybarnes&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_WinterSoldier\/Avengers_Endgame_2019_WinterSoldier.png&quot;,&quot;brightburnmovie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Sony_Brightburn_BB_2019\/Sony_Brightburn_BB_2019.png&quot;,&quot;валькирия&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Valkyrie\/Avengers_Endgame_2019_Valkyrie.png&quot;,&quot;ヴァルキリーコネクト&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Vconnect_jp_2019_V2\/Vconnect_jp_2019_V2.png&quot;,&quot;allflavorswelcome&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AbsolutPlanetEarthsFavoriteVodka_2019\/AbsolutPlanetEarthsFavoriteVodka_2019.png&quot;,&quot;サノス&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Thanos\/Avengers_Endgame_2019_Thanos.png&quot;,&quot;sweetbitter&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/STARZ_Sweetbitter_Season2\/STARZ_Sweetbitter_Season2.png&quot;,&quot;melbourneproud&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL2019_MelbourneProud\/NRL2019_MelbourneProud.png&quot;,&quot;グルート&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Groot\/Avengers_Endgame_2019_Groot.png&quot;,&quot;scottlang&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_AntMan\/Avengers_Endgame_2019_AntMan.png&quot;,&quot;mtvawards&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MTV_Awards_May2019\/MTV_Awards_May2019.png&quot;,&quot;rsl&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_19_RSL\/MLS_19_RSL.png&quot;,&quot;soldadoinvernal&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_WinterSoldier\/Avengers_Endgame_2019_WinterSoldier.png&quot;,&quot;mffl&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_18_DAL\/NBA_18_DAL.png&quot;,&quot;carapuce&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBPikachu_Squirtle_v2\/WBPikachu_Squirtle_v2.png&quot;,&quot;헐크&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Hulk\/Avengers_Endgame_2019_Hulk.png&quot;,&quot;sweetbitterpremiere&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/STARZ_Sweetbitter_Season2\/STARZ_Sweetbitter_Season2.png&quot;,&quot;djkhaled&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DJKhaled_May2019\/DJKhaled_May2019.png&quot;,&quot;فطور_رمضان&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019_Iftar\/Ramadan_2019_Iftar.png&quot;,&quot;ep19dk&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EU_Election_2019\/EU_Election_2019.png&quot;,&quot;vidapremiere&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/STARZ_Vida_S2\/STARZ_Vida_S2.png&quot;,&quot;金翅雀&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WB_TheGoldfinch_2019\/WB_TheGoldfinch_2019.png&quot;,&quot;freshevents&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FreshEmpire_MayAugust_2019\/FreshEmpire_MayAugust_2019.png&quot;,&quot;isles&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/IslandersPlayoffs2019\/IslandersPlayoffs2019.png&quot;,&quot;tweeptour&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TweepTour_2019\/TweepTour_2019.png&quot;,&quot;f11proinegypt&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Oppo_F11ProInEgypt_2019\/Oppo_F11ProInEgypt_2019.png&quot;,&quot;hotzone&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HotZone_NatGeoChannel_2019\/HotZone_NatGeoChannel_2019.png&quot;,&quot;allin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ClemsonYearLongNatty19\/ClemsonYearLongNatty19.png&quot;,&quot;eljilguero&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WB_TheGoldfinch_2019\/WB_TheGoldfinch_2019.png&quot;,&quot;buzzleclair&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_Buzz\/Disney_ToyStory4_Buzz.png&quot;,&quot;gengwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Esports_V2_19_GENG\/Esports_V2_19_GENG.png&quot;,&quot;downtonabbey&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DowntonAbbey_2019\/DowntonAbbey_2019.png&quot;,&quot;aladdin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_2019\/Disney_Aladdin_2019.png&quot;,&quot;sherifwoody&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_Woody\/Disney_ToyStory4_Woody.png&quot;,&quot;mihplannerchallenge&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MadeInHeaven_Amazon_2019\/MadeInHeaven_Amazon_2019.png&quot;,&quot;平成を語ろう&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NewEra_2019\/NewEra_2019.png&quot;,&quot;diamondintherough&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_2019\/Disney_Aladdin_2019.png&quot;,&quot;threestripelive&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/adidas_ThreeStripeLive_2019\/adidas_ThreeStripeLive_2019.png&quot;,&quot;downtonabbeylapelicula&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DowntonAbbey_2019\/DowntonAbbey_2019.png&quot;,&quot;城之内死す&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YuGiOh_DL_INFO_May2019\/YuGiOh_DL_INFO_May2019.png&quot;,&quot;takjil&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019_Iftar\/Ramadan_2019_Iftar.png&quot;,&quot;sfgiants&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_SFGiants\/MLB_2019_SFGiants.png&quot;,&quot;mashrafemortaza&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CricketWorldCup_2019_Players_MashrafeMortaza\/CricketWorldCup_2019_Players_MashrafeMortaza.png&quot;,&quot;doyoutrustme&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_2019\/Disney_Aladdin_2019.png&quot;,&quot;全球媒介和信息素养周&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2018_GlobalMILWeeks\/MediaInformationLiteracyWeeks_2018_GlobalMILWeeks.png&quot;,&quot;am2dm&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BuzzFeedMorning_2019ext\/BuzzFeedMorning_2019ext.png&quot;,&quot;3stripelive&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/adidas_ThreeStripeLive_2019\/adidas_ThreeStripeLive_2019.png&quot;,&quot;teamuglydolls&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UglyDollsMovie\/UglyDollsMovie.png&quot;,&quot;buscando&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Itau_2019_v2\/Itau_2019_v2.png&quot;,&quot;kcon19la&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KCON2019USA_2019\/KCON2019USA_2019.png&quot;,&quot;토르&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Thor\/Avengers_Endgame_2019_Thor.png&quot;,&quot;teamdanny&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheVoice_UK_2019\/TheVoice_UK_2019.png&quot;,&quot;moxytheuglydoll&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UglyDolls_Moxy\/UglyDolls_Moxy.png&quot;,&quot;dschinni&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Genie\/Disney_Aladdin_Genie.png&quot;,&quot;さよなら僕らのxメン&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FOX_Xmen_Japan_2019\/FOX_Xmen_Japan_2019.png&quot;,&quot;woody&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_Woody\/Disney_ToyStory4_Woody.png&quot;,&quot;letsgoliquid&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Esports_AllAccessTeam_TeamLiquid_ext19\/Esports_AllAccessTeam_TeamLiquid_ext19.png&quot;,&quot;callofduty&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CallofDuty_ModernWarfare_2019_v2\/CallofDuty_ModernWarfare_2019_v2.png&quot;,&quot;pikirsebelumklik&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2018_ThinkBeforeClicking\/MediaInformationLiteracyWeeks_2018_ThinkBeforeClicking.png&quot;,&quot;ramazan&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019\/Ramadan_2019.png&quot;,&quot;villanelle&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KillingEve_US_2019\/KillingEve_US_2019.png&quot;,&quot;シェアする前に考えよう&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2018_ThinkBeforeSharing\/MediaInformationLiteracyWeeks_2018_ThinkBeforeSharing.png&quot;,&quot;مقاضي&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ZadFresh_2019_v3\/ZadFresh_2019_v3.png&quot;,&quot;20年間ありがとう&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FOX_Xmen_Japan_2019\/FOX_Xmen_Japan_2019.png&quot;,&quot;fccincy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_19_CIN\/MLS_19_CIN.png&quot;,&quot;bodegahive&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DesusandMero_2019\/DesusandMero_2019.png&quot;,&quot;iamironman&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_IronMan\/Avengers_Endgame_2019_IronMan.png&quot;,&quot;suhoor&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019_Iftar\/Ramadan_2019_Iftar.png&quot;,&quot;assunção2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Sulamericana_2019_add\/Sulamericana_2019_add.png&quot;,&quot;cmtawards2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CMTMusicAwards_2019\/CMTMusicAwards_2019.png&quot;,&quot;tuiteratura&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FeriaDelHilo_v2\/FeriaDelHilo_v2.png&quot;,&quot;burnblue&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_19_Dallas\/OWL_19_Dallas.png&quot;,&quot;تراها_سهله&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/taqa_sa_2019\/taqa_sa_2019.png&quot;,&quot;マリアヒル&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_MariaHill\/Avengers_Endgame_2019_MariaHill.png&quot;,&quot;트와이스&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KPOP_TWICE_Fancy_2019\/KPOP_TWICE_Fancy_2019.png&quot;,&quot;csk&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PL_2019_2_CSK_v2\/PL_2019_2_CSK_v2.png&quot;,&quot;egready&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Esports_V2_19_EG\/Esports_V2_19_EG.png&quot;,&quot;uclfinal&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ChampionsLeague_Final_2019\/ChampionsLeague_Final_2019.png&quot;,&quot;asuncion2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Sulamericana_2019_add\/Sulamericana_2019_add.png&quot;,&quot;sweebitterseason2&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/STARZ_Sweetbitter_Season2\/STARZ_Sweetbitter_Season2.png&quot;,&quot;sc30&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StephenCurry_2019\/StephenCurry_2019.png&quot;,&quot;diablonomedesampares&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Amazon_DiabloGuardian\/Amazon_DiabloGuardian.png&quot;,&quot;alula&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AlUlaCity_2019\/AlUlaCity_2019.png&quot;,&quot;forky&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_Forky\/Disney_ToyStory4_Forky.png&quot;,&quot;prinzessinjasmin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Jasmine\/Disney_Aladdin_Jasmine.png&quot;,&quot;gottapartnerup&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Pikachu_Pokemon_PartnerUp_2019\/Pikachu_Pokemon_PartnerUp_2019.png&quot;,&quot;キリンレモンのうた&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KIRINLEMON_2019\/KIRINLEMON_2019.png&quot;,&quot;penseantesdeclicar&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2018_ThinkBeforeClicking\/MediaInformationLiteracyWeeks_2018_ThinkBeforeClicking.png&quot;,&quot;ブッチギリマッチ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Dragonball_2019\/Dragonball_2019.png&quot;,&quot;absolutvodka&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AbsolutPlanetEarthsFavoriteVodka_2019\/AbsolutPlanetEarthsFavoriteVodka_2019.png&quot;,&quot;oneplus7&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OnePlus7_2019\/OnePlus7_2019.png&quot;,&quot;grindcity&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_18_MEM\/NBA_18_MEM.png&quot;,&quot;caveofwonders&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Lamp\/Disney_Aladdin_Lamp.png&quot;,&quot;saddasquad&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/IPL_2019_2_KXIP\/IPL_2019_2_KXIP.png&quot;,&quot;teamjessiej&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheVoice_UK_2019\/TheVoice_UK_2019.png&quot;,&quot;فوانيس&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019_Lantern\/Ramadan_2019_Lantern.png&quot;,&quot;페퍼포츠&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_PepperPotts\/Avengers_Endgame_2019_PepperPotts.png&quot;,&quot;teamwage&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UglyDolls_Wage_add\/UglyDolls_Wage_add.png&quot;,&quot;kurma&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019_Iftar\/Ramadan_2019_Iftar.png&quot;,&quot;ramadan_lantern&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019_Lantern\/Ramadan_2019_Lantern.png&quot;,&quot;デカうまい&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KIRINFIRE_ONEDAY_JP\/KIRINFIRE_ONEDAY_JP.png&quot;,&quot;ファルコン&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Falcon\/Avengers_Endgame_2019_Falcon.png&quot;,&quot;soulstone&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_InfinityGauntlet\/Avengers_Endgame_2019_InfinityGauntlet.png&quot;,&quot;skwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Riot_SK\/Riot_SK.png&quot;,&quot;ahm&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AsianHeritageMonth_2019\/AsianHeritageMonth_2019.png&quot;,&quot;salamèche&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBPikachu_Charmander\/WBPikachu_Charmander.png&quot;,&quot;onebadmutha&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WB_ShaftMovie_2019\/WB_ShaftMovie_2019.png&quot;,&quot;新元号考えてみた&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NewEra_2019\/NewEra_2019.png&quot;,&quot;madeinheavenamazon&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MadeInHeaven_Amazon_2019\/MadeInHeaven_Amazon_2019.png&quot;,&quot;genie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Genie\/Disney_Aladdin_Genie.png&quot;,&quot;жасмин&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Jasmine\/Disney_Aladdin_Jasmine.png&quot;,&quot;blackwidow&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_BlackWidow\/Avengers_Endgame_2019_BlackWidow.png&quot;,&quot;午後の紅茶&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KIRINGT_JP_2019_V3\/KIRINGT_JP_2019_V3.png&quot;,&quot;ジーニー&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Genie\/Disney_Aladdin_Genie.png&quot;,&quot;tt30&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TakeThatEuropeanTour_2019\/TakeThatEuropeanTour_2019.png&quot;,&quot;アイスクレマ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AIDAMITSUWO_2019\/AIDAMITSUWO_2019.png&quot;,&quot;뮤츠&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBPikachu_Mewtwo\/WBPikachu_Mewtwo.png&quot;,&quot;oùestmachaussette&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Monoprix_2019\/Monoprix_2019.png&quot;,&quot;simetierre&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Paramount_PetSematary_2019_v2\/Paramount_PetSematary_2019_v2.png&quot;,&quot;ogme&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TLOG_Season2\/TLOG_Season2.png&quot;,&quot;stlblues&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BluesPlayoffs2019\/BluesPlayoffs2019.png&quot;,&quot;johnwickch3&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JohnWick_3_ext\/JohnWick_3_ext.png&quot;,&quot;evilgeniuses&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Esports_V2_19_EG\/Esports_V2_19_EG.png&quot;,&quot;xメンの魅力を広めたい&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FOX_Xmen_Japan_2019\/FOX_Xmen_Japan_2019.png&quot;,&quot;cmtawards&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CMTMusicAwards_2019\/CMTMusicAwards_2019.png&quot;,&quot;thelastog&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TLOG_Season2\/TLOG_Season2.png&quot;,&quot;たぶんクマ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AsahiKaseiHP_2019\/AsahiKaseiHP_2019.png&quot;,&quot;spencevsgarcia&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FoxSports_PBC\/FoxSports_PBC.png&quot;,&quot;pericao50&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Pericles_2019\/Pericles_2019.png&quot;,&quot;100win&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Esports_AllAccessTeam_100Thieves_ext19\/Esports_AllAccessTeam_100Thieves_ext19.png&quot;,&quot;0426逆襲へ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019\/Avengers_Endgame_2019.png&quot;,&quot;b99&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Brooklyn99_2019\/Brooklyn99_2019.png&quot;,&quot;comigoninguemtoddy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ComigoNinguemToddy_2019\/ComigoNinguemToddy_2019.png&quot;,&quot;avespa&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Wasp_add\/Avengers_Endgame_2019_Wasp_add.png&quot;,&quot;ramadanlanterns&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019_Lantern\/Ramadan_2019_Lantern.png&quot;,&quot;virtuspro&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Esports_V2_19_Virtus\/Esports_V2_19_Virtus.png&quot;,&quot;kcon2019la&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KCON2019USA_2019\/KCON2019USA_2019.png&quot;,&quot;gotiges&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AFL_2019_GoTiges\/AFL_2019_GoTiges.png&quot;,&quot;デレステ10連ガシャ無料&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/imascg_stage_May2019\/imascg_stage_May2019.png&quot;,&quot;baikitumudah&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bukalapak_2019\/Bukalapak_2019.png&quot;,&quot;disneysaladdin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_2019\/Disney_Aladdin_2019.png&quot;,&quot;apihm&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AsianHeritageMonth_2019\/AsianHeritageMonth_2019.png&quot;,&quot;ミーク&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Miek\/Avengers_Endgame_2019_Miek.png&quot;,&quot;星のファンファーレ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Hoshidora_May2019\/Hoshidora_May2019.png&quot;,&quot;rockies&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Colorado\/MLB_2019_Colorado.png&quot;,&quot;elfutbolmesigue&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Soccer_Google_2019\/Soccer_Google_2019.png&quot;,&quot;uglybabo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UglyDolls_Babo\/UglyDolls_Babo.png&quot;,&quot;thewintersoldier&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_WinterSoldier\/Avengers_Endgame_2019_WinterSoldier.png&quot;,&quot;ridemcowboys&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL2019_ridemcowboys\/NRL2019_ridemcowboys.png&quot;,&quot;homemaranha&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Spiderman\/Avengers_Endgame_2019_Spiderman.png&quot;,&quot;fourchette&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_Forky\/Disney_ToyStory4_Forky.png&quot;,&quot;シュリ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Shuri\/Avengers_Endgame_2019_Shuri.png&quot;,&quot;thecrawlmovie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Paramount_Crawl_2019\/Paramount_Crawl_2019.png&quot;,&quot;令和&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NewEra_2019_ext\/NewEra_2019_ext.png&quot;,&quot;spencegarcia&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FoxSports_PBC\/FoxSports_PBC.png&quot;,&quot;историяигрушеквилкинс&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_Forky\/Disney_ToyStory4_Forky.png&quot;,&quot;星ドラギガミーティング&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Hoshidora_May2019\/Hoshidora_May2019.png&quot;,&quot;dontspoiltheendgame&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019\/Avengers_Endgame_2019.png&quot;,&quot;annabellecomeshome&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WB_Annabelle_3_v2\/WB_Annabelle_3_v2.png&quot;,&quot;teammoxy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UglyDolls_Moxy_add\/UglyDolls_Moxy_add.png&quot;,&quot;ramadan&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019\/Ramadan_2019.png&quot;,&quot;downtonabbeymovie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DowntonAbbey_2019\/DowntonAbbey_2019.png&quot;,&quot;المباشر_للأفراد&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AlRajhiBank_2019\/AlRajhiBank_2019.png&quot;,&quot;stephencurryfacebookwatch&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StephenCurry_2019\/StephenCurry_2019.png&quot;,&quot;فكر_قبل_المشاركة&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2018_ThinkBeforeSharing\/MediaInformationLiteracyWeeks_2018_ThinkBeforeSharing.png&quot;,&quot;uglydollsox&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UglyDolls_Ox\/UglyDolls_Ox.png&quot;,&quot;mrwick&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JohnWick_3_ext\/JohnWick_3_ext.png&quot;,&quot;kcon19ny&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KCON2019USA_2019\/KCON2019USA_2019.png&quot;,&quot;scarletwitch&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_ScarletWitch\/Avengers_Endgame_2019_ScarletWitch.png&quot;,&quot;ipromise&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LeBronJames_IPromise_2018\/LeBronJames_IPromise_2018.png&quot;,&quot;fincに願いよ届け&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Japan_DreamsComeTrue_2019\/Japan_DreamsComeTrue_2019.png&quot;,&quot;higherfurtherfaster&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_CaptainMarvel_May2019\/Disney_CaptainMarvel_May2019.png&quot;,&quot;ドラックス&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Drax\/Avengers_Endgame_2019_Drax.png&quot;,&quot;truetoatlanta&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_18_ATL\/NBA_18_ATL.png&quot;,&quot;xiaomi&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/XiaomiRedmi_Pro7_2019\/XiaomiRedmi_Pro7_2019.png&quot;,&quot;leveluptovivov15&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/VivoPHV15_2019\/VivoPHV15_2019.png&quot;,&quot;슈리&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Shuri\/Avengers_Endgame_2019_Shuri.png&quot;,&quot;اوبو_رينو_يقرب_الجميع&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Oppo_KSA_RenoLaunch_Q2_2019\/Oppo_KSA_RenoLaunch_Q2_2019.png&quot;,&quot;goldenbuzzer&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BritainsGotTalent_2019_buzzer\/BritainsGotTalent_2019_buzzer.png&quot;,&quot;thisfreelifepride&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ThisFreeLife_March_2019\/ThisFreeLife_March_2019.png&quot;,&quot;星ドラ応援ソング&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Hoshidora_May2019\/Hoshidora_May2019.png&quot;,&quot;bgt&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BritainsGotTalent_2019_star\/BritainsGotTalent_2019_star.png&quot;,&quot;rage2&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bethesda_RAGE2_2019\/Bethesda_RAGE2_2019.png&quot;,&quot;историяигрушекбопип&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_BoPeep\/Disney_ToyStory4_BoPeep.png&quot;,&quot;qatarairways&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/QatarAirways_2019\/QatarAirways_2019.png&quot;,&quot;アイデムに願いよ届け&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Japan_DreamsComeTrue_2019\/Japan_DreamsComeTrue_2019.png&quot;,&quot;gohoos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UVAChampYearLong\/UVAChampYearLong.png&quot;,&quot;brooklynninenine&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Brooklyn99_2019\/Brooklyn99_2019.png&quot;,&quot;capitanamarvel&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_CaptainMarvel\/Avengers_Endgame_2019_CaptainMarvel.png&quot;,&quot;お母さんありがとう&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/2019_MothersDay\/2019_MothersDay.png&quot;,&quot;somosmapfre&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MapfreRafaNadal_2019\/MapfreRafaNadal_2019.png&quot;,&quot;piensaantesdecompartir&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2018_ThinkBeforeSharing\/MediaInformationLiteracyWeeks_2018_ThinkBeforeSharing.png&quot;,&quot;วันเพนกวินโลก&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WorldPenguinDay_2019\/WorldPenguinDay_2019.png&quot;,&quot;тозипътщегласувам&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EUElections_VoterEngagement_2019\/EUElections_VoterEngagement_2019.png&quot;,&quot;baikitumudahchallenge&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bukalapak_2019\/Bukalapak_2019.png&quot;,&quot;sidebyside&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AFL_Part2_2019_SidebySide\/AFL_Part2_2019_SidebySide.png&quot;,&quot;blackpink&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KPOP_BLACKPINK_2019\/KPOP_BLACKPINK_2019.png&quot;,&quot;sandraoh&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KillingEve_US_2019\/KillingEve_US_2019.png&quot;,&quot;うまみに和む&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KIRINnamacya2019\/KIRINnamacya2019.png&quot;,&quot;sjsharks&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Sharksplayoffsv3\/Sharksplayoffsv3.png&quot;,&quot;leveluptov15pro&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/VivoPHV15_2019\/VivoPHV15_2019.png&quot;,&quot;trashpanda&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Rocket\/Avengers_Endgame_2019_Rocket.png&quot;,&quot;dhs30&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_NowMoreThanEver_v2\/DisneyParks_NowMoreThanEver_v2.png&quot;,&quot;wearethewest&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AFL_2019_WeAreTheWest_v2\/AFL_2019_WeAreTheWest_v2.png&quot;,&quot;maanpäivä&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EarthDay_2019_fixed\/EarthDay_2019_fixed.png&quot;,&quot;닥터스트레인지&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_DoctorStrange\/Avengers_Endgame_2019_DoctorStrange.png&quot;,&quot;네뷸라&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Nebula\/Avengers_Endgame_2019_Nebula.png&quot;,&quot;xmenfênixnegra&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/20thCenturyFox_DarkPhoenix\/20thCenturyFox_DarkPhoenix.png&quot;,&quot;호크아이&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Hawkeye\/Avengers_Endgame_2019_Hawkeye.png&quot;,&quot;mk11&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBGames_MortalKombat_2019\/WBGames_MortalKombat_2019.png&quot;,&quot;pubg_mobile&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PUBGKR2019\/PUBGKR2019.png&quot;,&quot;toghcháinae2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EU_Election_2019\/EU_Election_2019.png&quot;,&quot;vidalongaasroupas&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/VidaLongaAsRoupas_Unilever\/VidaLongaAsRoupas_Unilever.png&quot;,&quot;hannahb&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bachelorette_2019\/Bachelorette_2019.png&quot;,&quot;ユニクロ戦利品&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UNIQLO_Kanshasai_2019_v3\/UNIQLO_Kanshasai_2019_v3.png&quot;,&quot;لتبقى&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/taqa_sa_2019\/taqa_sa_2019.png&quot;,&quot;takiswild&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TAKIS_WILD_2019\/TAKIS_WILD_2019.png&quot;,&quot;デュエルリンクス&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YuGiOh_DL_INFO_May2019\/YuGiOh_DL_INFO_May2019.png&quot;,&quot;iijmioに願いよ届け&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Japan_DreamsComeTrue_2019\/Japan_DreamsComeTrue_2019.png&quot;,&quot;joehill&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Nos4a2_2019\/Nos4a2_2019.png&quot;,&quot;deixaaquimicarolar&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NaturaHumor_May2019_V2\/NaturaHumor_May2019_V2.png&quot;,&quot;goodomens&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Amazon_GoodOmens\/Amazon_GoodOmens.png&quot;,&quot;thebachelorette&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bachelorette_2019\/Bachelorette_2019.png&quot;,&quot;europawal2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EU_Election_2019\/EU_Election_2019.png&quot;,&quot;risetogether&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_19_Toronto\/OWL_19_Toronto.png&quot;,&quot;letitreign&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_19_Atlanta\/OWL_19_Atlanta.png&quot;,&quot;مصرف_الراجحي_applepay&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AlRajhiBank_2019\/AlRajhiBank_2019.png&quot;,&quot;gostars&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DallasNHLPlayoffs2019\/DallasNHLPlayoffs2019.png&quot;,&quot;powerofeighteen&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Powerof18_India\/Powerof18_India.png&quot;,&quot;thinkbeforesharing&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2018_ThinkBeforeSharing\/MediaInformationLiteracyWeeks_2018_ThinkBeforeSharing.png&quot;,&quot;وسع_افاق_رؤيتك&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Oppo_KSA_RenoLaunch_Q2_2019\/Oppo_KSA_RenoLaunch_Q2_2019.png&quot;,&quot;smallactsoflove&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Unilever_LXP_smallactsoflove_2019\/Unilever_LXP_smallactsoflove_2019.png&quot;,&quot;세계팽귄의날&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WorldPenguinDay_2019\/WorldPenguinDay_2019.png&quot;,&quot;chopon&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Atlanta\/MLB_2019_Atlanta.png&quot;,&quot;wintersoldier&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_WinterSoldier\/Avengers_Endgame_2019_WinterSoldier.png&quot;,&quot;wehavewewill&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CricketWorldCup_2019_Teams_WeHaveWeWill\/CricketWorldCup_2019_Teams_WeHaveWeWill.png&quot;,&quot;goloko&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YG_2019\/YG_2019.png&quot;,&quot;madeinheavenhashtags&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MadeInHeaven_Amazon_2019\/MadeInHeaven_Amazon_2019.png&quot;,&quot;snapchatandroid&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SnapAndroid_Launch_2019\/SnapAndroid_Launch_2019.png&quot;,&quot;saelections2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SouthAfrican_Election_2019\/SouthAfrican_Election_2019.png&quot;,&quot;forceofnature&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_19_Vancouver\/OWL_19_Vancouver.png&quot;,&quot;feriadehilos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FeriaDelHilo_v2\/FeriaDelHilo_v2.png&quot;,&quot;hollywoodstudios&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_MickeyEars_Flight2\/DisneyParks_MickeyEars_Flight2.png&quot;,&quot;honoramongthieves&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Esports_AllAccessTeam_100Thieves_ext19\/Esports_AllAccessTeam_100Thieves_ext19.png&quot;,&quot;twice_fancy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KPOP_TWICE_Fancy_2019\/KPOP_TWICE_Fancy_2019.png&quot;,&quot;euvaalit2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EU_Election_2019\/EU_Election_2019.png&quot;,&quot;sweetrabbit&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Rocket\/Avengers_Endgame_2019_Rocket.png&quot;,&quot;hockeytwitter&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HockeyTwitter_2018\/HockeyTwitter_2018.png&quot;,&quot;vidafyc&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/STARZ_Vida_S2\/STARZ_Vida_S2.png&quot;,&quot;caroldanvers&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_CaptainMarvel\/Avengers_Endgame_2019_CaptainMarvel.png&quot;,&quot;qlder&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL_2019_MidSeason_QLDER\/NRL_2019_MidSeason_QLDER.png&quot;,&quot;liveinlevis&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Spain_Levis_2019\/Spain_Levis_2019.png&quot;,&quot;bopeep&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_BoPeep\/Disney_ToyStory4_BoPeep.png&quot;,&quot;got7_spinningtop&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KPOP_GOT7_2019_GOT7WORLDTOUR\/KPOP_GOT7_2019_GOT7WORLDTOUR.png&quot;,&quot;suenalacampana&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Phil\/MLB_2019_Phil.png&quot;,&quot;бульбазавр&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBPikachu_Bulbasaur\/WBPikachu_Bulbasaur.png&quot;,&quot;ourjungle&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL2019_OurJungle\/NRL2019_OurJungle.png&quot;,&quot;어벤져스&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019\/Avengers_Endgame_2019.png&quot;,&quot;asianheritagemonth&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AsianHeritageMonth_2019\/AsianHeritageMonth_2019.png&quot;,&quot;عالم_من_القصص&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ToyotaStories_2019\/ToyotaStories_2019.png&quot;,&quot;خلنا_نجتمع&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Vimto_Ramadan_2019_v2\/Vimto_Ramadan_2019_v2.png&quot;,&quot;fv19&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DanishElection_2019\/DanishElection_2019.png&quot;,&quot;penguinday&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WorldPenguinDay_2019\/WorldPenguinDay_2019.png&quot;,&quot;gaviãoarqueiro&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Hawkeye\/Avengers_Endgame_2019_Hawkeye.png&quot;,&quot;thelongnight&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/GoT_S8_Tree\/GoT_S8_Tree.png&quot;,&quot;サランラップのクマ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AsahiKaseiHP_2019\/AsahiKaseiHP_2019.png&quot;,&quot;ドン勝tv&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PUBGKR2019\/PUBGKR2019.png&quot;,&quot;リゼロプリコネrコラボ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Priconne_Rezaro_2019_v2\/Priconne_Rezaro_2019_v2.png&quot;,&quot;proudtobeabulldog&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL2019_Proudtobeabulldog\/NRL2019_Proudtobeabulldog.png&quot;,&quot;capitanamerica&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_CaptainAmerica\/Avengers_Endgame_2019_CaptainAmerica.png&quot;,&quot;oneplus7series&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OnePlus7_2019\/OnePlus7_2019.png&quot;,&quot;ハッピーホーガン&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_HappyHogan\/Avengers_Endgame_2019_HappyHogan.png&quot;,&quot;историяигрушек4&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_Woody\/Disney_ToyStory4_Woody.png&quot;,&quot;freshempire&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FreshEmpire_MayAugust_2019\/FreshEmpire_MayAugust_2019.png&quot;,&quot;rednoseday&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RedNoseDay_2019\/RedNoseDay_2019.png&quot;,&quot;nowapocalypsepremiere&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/STARZ_NowApocalypse_2019\/STARZ_NowApocalypse_2019.png&quot;,&quot;諦めたくない夢&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RakutenTV_NBA_Logo_2019_v2\/RakutenTV_NBA_Logo_2019_v2.png&quot;,&quot;ナイキ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Nike_Japan_JDI_2019\/Nike_Japan_JDI_2019.png&quot;,&quot;illuminationsfarewell&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_NowMoreThanEver_v2\/DisneyParks_NowMoreThanEver_v2.png&quot;,&quot;فيمتو&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Vimto_Ramadan_2019_v2\/Vimto_Ramadan_2019_v2.png&quot;,&quot;escolhasinteligentes&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Cabify_DecisionesInteligentes_2019\/Cabify_DecisionesInteligentes_2019.png&quot;,&quot;ひらめいてロマサガ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/romasaga_rs_2019\/romasaga_rs_2019.png&quot;,&quot;nébula&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Nebula\/Avengers_Endgame_2019_Nebula.png&quot;,&quot;dunkindonuts&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Dunkin_NationalDonutDay_2019\/Dunkin_NationalDonutDay_2019.png&quot;,&quot;foxfam&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCS_2019_EchoFox_add\/LCS_2019_EchoFox_add.png&quot;,&quot;nightmarehalsey&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Halsey_2019\/Halsey_2019.png&quot;,&quot;penseavantdepartager&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2018_ThinkBeforeSharing\/MediaInformationLiteracyWeeks_2018_ThinkBeforeSharing.png&quot;,&quot;heforshe&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HeForShe_fixed\/HeForShe_fixed.png&quot;,&quot;proudlysydney&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AFL_Part2_2019_ProudlySydney\/AFL_Part2_2019_ProudlySydney.png&quot;,&quot;walkure&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Valkyrie\/Avengers_Endgame_2019_Valkyrie.png&quot;,&quot;estavezvoto&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EUElections_VoterEngagement_2019\/EUElections_VoterEngagement_2019.png&quot;,&quot;imfc&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_19_IMFC\/MLS_19_IMFC.png&quot;,&quot;令和最初の夢&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Japan_DreamsComeTrue_2019\/Japan_DreamsComeTrue_2019.png&quot;,&quot;elpoderdelascanas&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PG_Spain_Pantene_2019\/PG_Spain_Pantene_2019.png&quot;,&quot;lionesses&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LionessesEnglandFootball2019\/LionessesEnglandFootball2019.png&quot;,&quot;budknightsback&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BudLight_BudKnight_2019\/BudLight_BudKnight_2019.png&quot;,&quot;dennegangstemmerjeg&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EUElections_VoterEngagement_2019\/EUElections_VoterEngagement_2019.png&quot;,&quot;primevideo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AmazonPrimeVideo_Dionysus_2019_v2\/AmazonPrimeVideo_Dionysus_2019_v2.png&quot;,&quot;إبداعات_ڤيمتو&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Vimto_Ramadan_2019_add\/Vimto_Ramadan_2019_add.png&quot;,&quot;theonlywayisessex&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TOWIE_Essex_2019\/TOWIE_Essex_2019.png&quot;,&quot;heatculture&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_18_MIA\/NBA_18_MIA.png&quot;,&quot;ligadia&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Spain_LigaDia_2018\/Spain_LigaDia_2018.png&quot;,&quot;theshow19&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_TheShow19\/MLB_TheShow19.png&quot;,&quot;hechoenoakland&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Oakland\/MLB_2019_Oakland.png&quot;,&quot;seekordlähenvalima&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EUElections_VoterEngagement_2019\/EUElections_VoterEngagement_2019.png&quot;,&quot;4hunnid&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YG_2019\/YG_2019.png&quot;,&quot;3wishes&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Genie\/Disney_Aladdin_Genie.png&quot;,&quot;tracymorgan&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TLOG_Season2\/TLOG_Season2.png&quot;,&quot;rompiendoestereotipos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PG_Spain_Pantene_2019\/PG_Spain_Pantene_2019.png&quot;,&quot;البنك_السعودي_للاستثمار&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SAIB_2019\/SAIB_2019.png&quot;,&quot;ルージュミニ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Maquillage_rouge_2019\/Maquillage_rouge_2019.png&quot;,&quot;vimto&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Vimto_Ramadan_2019_v2\/Vimto_Ramadan_2019_v2.png&quot;,&quot;happymothersday&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/2019_MothersDay\/2019_MothersDay.png&quot;,&quot;kanewilliamson&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CricketWorldCup_2019_Players_KaneWilliamson\/CricketWorldCup_2019_Players_KaneWilliamson.png&quot;,&quot;로켓&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Rocket\/Avengers_Endgame_2019_Rocket.png&quot;,&quot;음바쿠&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Mbaku\/Avengers_Endgame_2019_Mbaku.png&quot;,&quot;indiaeisley&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TNT_IAmTheNight_2019_v2\/TNT_IAmTheNight_2019_v2.png&quot;,&quot;danishpilsner&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Carlsberg_NewBrew_2019\/Carlsberg_NewBrew_2019.png&quot;,&quot;untethering&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UsMovie_2018\/UsMovie_2018.png&quot;,&quot;bbsightings&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Sony_Brightburn_Mask_2019\/Sony_Brightburn_Mask_2019.png&quot;,&quot;toystorymania&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_ToyStoryLand\/DisneyParks_ToyStoryLand.png&quot;,&quot;worldpenguinday&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WorldPenguinDay_2019\/WorldPenguinDay_2019.png&quot;,&quot;мантис&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Mantis\/Avengers_Endgame_2019_Mantis.png&quot;,&quot;بريال&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ZadFresh_2019_v3\/ZadFresh_2019_v3.png&quot;,&quot;rocketmanes&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Paramount_Rocketman_Rocket\/Paramount_Rocketman_Rocket.png&quot;,&quot;wholenewworld&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Jasmine\/Disney_Aladdin_Jasmine.png&quot;,&quot;докторстрэндж&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_DoctorStrange\/Avengers_Endgame_2019_DoctorStrange.png&quot;,&quot;slinkydogdash&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_ToyStoryLand\/DisneyParks_ToyStoryLand.png&quot;,&quot;三ツ矢サイダー&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Asahi_MitsuyaBrand_2019_add\/Asahi_MitsuyaBrand_2019_add.png&quot;,&quot;uglydollsluckybat&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UglyDolls_LuckyBat\/UglyDolls_LuckyBat.png&quot;,&quot;riseoftheresistance&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/disney_starwarsgalaxysedge_2019_v2\/disney_starwarsgalaxysedge_2019_v2.png&quot;,&quot;放置少女に願いよ届け&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Japan_DreamsComeTrue_2019\/Japan_DreamsComeTrue_2019.png&quot;,&quot;charmander&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBPikachu_Charmander\/WBPikachu_Charmander.png&quot;,&quot;happybirthdaymickey&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Mickey90th_2018\/Mickey90th_2018.png&quot;,&quot;hotsaleamazon&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AmazonHotSale2019\/AmazonHotSale2019.png&quot;,&quot;absolut&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AbsolutPlanetEarthsFavoriteVodka_2019\/AbsolutPlanetEarthsFavoriteVodka_2019.png&quot;,&quot;strengthinnumbers&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WarriorsPlayoffsv3\/WarriorsPlayoffsv3.png&quot;,&quot;フォーキー&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_Forky\/Disney_ToyStory4_Forky.png&quot;,&quot;aiだみつを&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AIDAMITSUWO_2019\/AIDAMITSUWO_2019.png&quot;,&quot;whywewearblack&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TimesUp_v4\/TimesUp_v4.png&quot;,&quot;spotifyxbts&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Spotify_KPOP_2019_v2\/Spotify_KPOP_2019_v2.png&quot;,&quot;bstudios&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BStudios_2019\/BStudios_2019.png&quot;,&quot;encendiendomotores&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Detroit_v2\/MLB_2019_Detroit_v2.png&quot;,&quot;lgm&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Mets\/MLB_2019_Mets.png&quot;,&quot;wethebest&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DJKhaled_May2019\/DJKhaled_May2019.png&quot;,&quot;freegameswithprime&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitchPrime_2019\/TwitchPrime_2019.png&quot;,&quot;nossoplaneta&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_OurPlanet_2019\/Netflix_OurPlanet_2019.png&quot;,&quot;pubg_jp&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PUBGKR2019\/PUBGKR2019.png&quot;,&quot;geniotangenial&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Genie\/Disney_Aladdin_Genie.png&quot;,&quot;evepolastri&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KillingEve_US_2019\/KillingEve_US_2019.png&quot;,&quot;absolutplanet&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AbsolutPlanetEarthsFavoriteVodka_2019\/AbsolutPlanetEarthsFavoriteVodka_2019.png&quot;,&quot;doop&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_19_PHIL\/MLS_19_PHIL.png&quot;,&quot;winecountrynetflix&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WineCountry_Netflix\/WineCountry_Netflix.png&quot;,&quot;spotifyxblackpink&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Spotify_KPOP_2019_v2\/Spotify_KPOP_2019_v2.png&quot;,&quot;子どもの日&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ChildrensDay_2019\/ChildrensDay_2019.png&quot;,&quot;禍つヴァールハイト&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/magatsu_ver2_2019\/magatsu_ver2_2019.png&quot;,&quot;아이언맨&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_IronMan\/Avengers_Endgame_2019_IronMan.png&quot;,&quot;rewritetherules&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Huawei_P30_2019\/Huawei_P30_2019.png&quot;,&quot;nohayungeniotangenial&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Genie\/Disney_Aladdin_Genie.png&quot;,&quot;teamox&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UglyDolls_Ox_add\/UglyDolls_Ox_add.png&quot;,&quot;letsgopens&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PensPlayoffs2019\/PensPlayoffs2019.png&quot;,&quot;팽귄의날&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WorldPenguinDay_2019\/WorldPenguinDay_2019.png&quot;,&quot;breakthrough&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_19_Shanghai\/OWL_19_Shanghai.png&quot;,&quot;asklewis&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LewisCapaldi_2019\/LewisCapaldi_2019.png&quot;,&quot;losrockies&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Colorado\/MLB_2019_Colorado.png&quot;,&quot;loveislandreunion&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LoveIsland_May2019\/LoveIsland_May2019.png&quot;,&quot;аладдин&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_2019\/Disney_Aladdin_2019.png&quot;,&quot;خدمة_حسابي&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SaudiElectricity_2019\/SaudiElectricity_2019.png&quot;,&quot;افطار_رمضان&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019_Iftar\/Ramadan_2019_Iftar.png&quot;,&quot;uglydolls&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UglyDollsMovie\/UglyDollsMovie.png&quot;,&quot;itmovie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WB_It_Chp2\/WB_It_Chp2.png&quot;,&quot;butnotus&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019\/Avengers_Endgame_2019.png&quot;,&quot;bravotv&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ProjectRunway_Bravo\/ProjectRunway_Bravo.png&quot;,&quot;maquinadeguerra&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_WarMachine\/Avengers_Endgame_2019_WarMachine.png&quot;,&quot;levis&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Spain_Levis_2019\/Spain_Levis_2019.png&quot;,&quot;anuairseobeidhméagvótáil&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EUElections_VoterEngagement_2019\/EUElections_VoterEngagement_2019.png&quot;,&quot;しまパト&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Shimamura_2019\/Shimamura_2019.png&quot;,&quot;twitchprime&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitchPrime_2019\/TwitchPrime_2019.png&quot;,&quot;gorogue&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Riot_Rogue\/Riot_Rogue.png&quot;,&quot;oppoksa&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Oppo_KSA_RenoLaunch_Q2_2019\/Oppo_KSA_RenoLaunch_Q2_2019.png&quot;,&quot;ناس&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FlyNas_2019\/FlyNas_2019.png&quot;,&quot;smoreslife&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Starbucks_Canada_SummerFrapp\/Starbucks_Canada_SummerFrapp.png&quot;,&quot;wakandaforever&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_BlackPanther\/Avengers_Endgame_2019_BlackPanther.png&quot;,&quot;نوروز&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/nowruz2018_v4\/nowruz2018_v4.png&quot;,&quot;onlywayisessex&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TOWIE_Essex_2019\/TOWIE_Essex_2019.png&quot;,&quot;penseantesdecompartilhar&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2018_ThinkBeforeSharing\/MediaInformationLiteracyWeeks_2018_ThinkBeforeSharing.png&quot;,&quot;lagalaxy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_19_LAGalaxy\/MLS_19_LAGalaxy.png&quot;,&quot;divinelyuninspiredtoahellishextent&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LewisCapaldi_2019\/LewisCapaldi_2019.png&quot;,&quot;bringthemayhem&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_19_Florida\/OWL_19_Florida.png&quot;,&quot;çachapitre2&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WB_It_Chp2\/WB_It_Chp2.png&quot;,&quot;warburtons&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Warburtons_Bagel_Boss\/Warburtons_Bagel_Boss.png&quot;,&quot;nhlbruins&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BruinsPlayoffs19\/BruinsPlayoffs19.png&quot;,&quot;flywin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Esports_AllAccessTeam_FlyQuest_add\/Esports_AllAccessTeam_FlyQuest_add.png&quot;,&quot;diesmalwähleich&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EUElections_VoterEngagement_2019\/EUElections_VoterEngagement_2019.png&quot;,&quot;bgmt&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BritainsGotTalent_2019_star_add\/BritainsGotTalent_2019_star_add.png&quot;,&quot;iftar&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019_Iftar\/Ramadan_2019_Iftar.png&quot;,&quot;blackhistorymonth&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BlackHistoryMonth\/BlackHistoryMonth.png&quot;,&quot;infinitystone&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_InfinityGauntlet\/Avengers_Endgame_2019_InfinityGauntlet.png&quot;,&quot;aapihm&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AsianHeritageMonth_2019\/AsianHeritageMonth_2019.png&quot;,&quot;cwc19&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CricketWorldCup_2019_Trophy\/CricketWorldCup_2019_Trophy.png&quot;,&quot;wdw&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_MickeyEars_Flight2\/DisneyParks_MickeyEars_Flight2.png&quot;,&quot;nycfc&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_19_NYCFC\/MLS_19_NYCFC.png&quot;,&quot;スターフェス200連無料&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Vconnect_jp_2019_V2\/Vconnect_jp_2019_V2.png&quot;,&quot;와스프&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Wasp\/Avengers_Endgame_2019_Wasp.png&quot;,&quot;absolutpride&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AbsolutPlanetEarthsFavoriteVodka_2019\/AbsolutPlanetEarthsFavoriteVodka_2019.png&quot;,&quot;千川ちひろ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/imascg_stage_May2019\/imascg_stage_May2019.png&quot;,&quot;unitedbyvote&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UnitedColoursofBenetton_2019\/UnitedColoursofBenetton_2019.png&quot;,&quot;oneplus7pro&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OnePlus7_2019\/OnePlus7_2019.png&quot;,&quot;ep2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EU_Election_2019\/EU_Election_2019.png&quot;,&quot;인피&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_InfinityGauntlet\/Avengers_Endgame_2019_InfinityGauntlet.png&quot;,&quot;spacestone&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_InfinityGauntlet\/Avengers_Endgame_2019_InfinityGauntlet.png&quot;,&quot;رمضان&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019\/Ramadan_2019.png&quot;,&quot;баззлайтер&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_Buzz\/Disney_ToyStory4_Buzz.png&quot;,&quot;xlwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Riot_exceL\/Riot_exceL.png&quot;,&quot;vegasborn&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/VegasPlayoffs19\/VegasPlayoffs19.png&quot;,&quot;nationalpetday&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Pets2_Max_v2_ext\/Pets2_Max_v2_ext.png&quot;,&quot;squirtle&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBPikachu_Squirtle_v2\/WBPikachu_Squirtle_v2.png&quot;,&quot;발키리&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Valkyrie\/Avengers_Endgame_2019_Valkyrie.png&quot;,&quot;delhicapitals&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DelhiCapitals_IPL\/DelhiCapitals_IPL.png&quot;,&quot;実はきのこ派でした&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KinokomeijiJP_2019\/KinokomeijiJP_2019.png&quot;,&quot;ovajputglasam&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EUElections_VoterEngagement_2019\/EUElections_VoterEngagement_2019.png&quot;,&quot;قطر_الخيرية&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Qatar_charity2019\/Qatar_charity2019.png&quot;,&quot;askyg&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YG_2019\/YG_2019.png&quot;,&quot;theprocess&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JoelFace2018\/JoelFace2018.png&quot;,&quot;metoo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MeToo_v3\/MeToo_v3.png&quot;,&quot;kpopdaebak&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Spotify_KPOP_2019_v2\/Spotify_KPOP_2019_v2.png&quot;,&quot;железныйчеловек&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_IronMan\/Avengers_Endgame_2019_IronMan.png&quot;,&quot;movilidadinteligente&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Cabify_DecisionesInteligentes_2019\/Cabify_DecisionesInteligentes_2019.png&quot;,&quot;ゼニガメ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBPikachu_Squirtle_v2\/WBPikachu_Squirtle_v2.png&quot;,&quot;クリックする前に考えよう&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2018_ThinkBeforeClicking\/MediaInformationLiteracyWeeks_2018_ThinkBeforeClicking.png&quot;,&quot;thebachelorettefinale&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bachelorette_2019\/Bachelorette_2019.png&quot;,&quot;wemetontwitter&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WeMetOnt_Emoji\/WeMetOnt_Emoji.png&quot;,&quot;wingsout&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_19_LAV\/OWL_19_LAV.png&quot;,&quot;lionkingcelebration&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_NowMoreThanEver_v2\/DisneyParks_NowMoreThanEver_v2.png&quot;,&quot;adoptaunprimerizo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AmazonHotSale2019\/AmazonHotSale2019.png&quot;,&quot;magiccarpetride&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_2019\/Disney_Aladdin_2019.png&quot;,&quot;ウォン&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Wong\/Avengers_Endgame_2019_Wong.png&quot;,&quot;pattyjenkins&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TNT_IAmTheNight_2019_v2\/TNT_IAmTheNight_2019_v2.png&quot;,&quot;bestoftweet&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BestofTweetsPrize_2019\/BestofTweetsPrize_2019.png&quot;,&quot;dunkout&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Dunkin_NationalDonutDay_2019\/Dunkin_NationalDonutDay_2019.png&quot;,&quot;rocketfans&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Paramount_Rocketman_Star\/Paramount_Rocketman_Star.png&quot;,&quot;epvalimised2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EU_Election_2019\/EU_Election_2019.png&quot;,&quot;100thieves&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Esports_AllAccessTeam_100Thieves_ext19\/Esports_AllAccessTeam_100Thieves_ext19.png&quot;,&quot;ramadanlantern&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019_Lantern\/Ramadan_2019_Lantern.png&quot;,&quot;avengersengame&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_add\/Avengers_Endgame_2019_add.png&quot;,&quot;超ラジオ体操&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KIRINMetsJP_2019\/KIRINMetsJP_2019.png&quot;,&quot;꼬부기&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBPikachu_Squirtle_v2\/WBPikachu_Squirtle_v2.png&quot;,&quot;파이리&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBPikachu_Charmander\/WBPikachu_Charmander.png&quot;,&quot;artfulepcot&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_NowMoreThanEver_v2\/DisneyParks_NowMoreThanEver_v2.png&quot;,&quot;ogfamily&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Riot_Origen\/Riot_Origen.png&quot;,&quot;captainmarvel&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_CaptainMarvel\/Avengers_Endgame_2019_CaptainMarvel.png&quot;,&quot;woodylunchbox&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_ToyStoryLand\/DisneyParks_ToyStoryLand.png&quot;,&quot;secretlifeofpets&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Pets2_Max_v2_ext\/Pets2_Max_v2_ext.png&quot;,&quot;로켓맨&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Paramount_Rocketman_Rocket\/Paramount_Rocketman_Rocket.png&quot;,&quot;mnufc&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_19_MNUFC\/MLS_19_MNUFC.png&quot;,&quot;4aklondike&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Unilever_4AKlondike_2019\/Unilever_4AKlondike_2019.png&quot;,&quot;weareorigen&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Riot_Origen\/Riot_Origen.png&quot;,&quot;redmi&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/XiaomiRedmi_Pro7_2019\/XiaomiRedmi_Pro7_2019.png&quot;,&quot;fatherofasahd&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DJKhaled_May2019\/DJKhaled_May2019.png&quot;,&quot;north150&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AFL_2019_North150\/AFL_2019_North150.png&quot;,&quot;オルビスユー&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ORBIS_2019\/ORBIS_2019.png&quot;,&quot;wyboryeuropejskie2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EU_Election_2019\/EU_Election_2019.png&quot;,&quot;unamicocomeme&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Genie\/Disney_Aladdin_Genie.png&quot;,&quot;vwfc&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_19_VAN\/MLS_19_VAN.png&quot;,&quot;feeleuphoria&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBO_Euphoria_2019\/HBO_Euphoria_2019.png&quot;,&quot;dontlethimin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SonyIntruder_2018\/SonyIntruder_2018.png&quot;,&quot;kcon2019usa&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KCON2019USA_2019\/KCON2019USA_2019.png&quot;,&quot;tokyolitmap&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Nike_Japan_JDI_2019\/Nike_Japan_JDI_2019.png&quot;,&quot;oppo60xzoom&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Oppo_KSA_RenoLaunch_Q2_2019\/Oppo_KSA_RenoLaunch_Q2_2019.png&quot;,&quot;bulanpuasa&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019\/Ramadan_2019.png&quot;,&quot;budknightbucketlist&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BudLight_BudKnight_2019\/BudLight_BudKnight_2019.png&quot;,&quot;epvolby2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EU_Election_2019\/EU_Election_2019.png&quot;,&quot;wearemanly&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL2019_WeAreManly\/NRL2019_WeAreManly.png&quot;,&quot;七つの大罪&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netmarble_7deadlysins_2019\/Netmarble_7deadlysins_2019.png&quot;,&quot;redmi32mp&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RedmiY3_2019\/RedmiY3_2019.png&quot;,&quot;thehustle&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheHustle_2019\/TheHustle_2019.png&quot;,&quot;livenation&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NationalConcertWeek_2019\/NationalConcertWeek_2019.png&quot;,&quot;shaftmovie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WB_ShaftMovie_2019\/WB_ShaftMovie_2019.png&quot;,&quot;haroldhogan&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_HappyHogan\/Avengers_Endgame_2019_HappyHogan.png&quot;,&quot;kingsxipunjab&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/IPL_2019_2_KXIP\/IPL_2019_2_KXIP.png&quot;,&quot;cementeriodeanimales&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Paramount_PetSematary_2019_v2\/Paramount_PetSematary_2019_v2.png&quot;,&quot;primedayamazon&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AmazonHotSale2019\/AmazonHotSale2019.png&quot;,&quot;平成ノブコブ最後の日&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AbemaTV_2019\/AbemaTV_2019.png&quot;,&quot;perfectlybalanced&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Thanos\/Avengers_Endgame_2019_Thanos.png&quot;,&quot;никфьюри&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_NickFury\/Avengers_Endgame_2019_NickFury.png&quot;,&quot;destavezeuvoto&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EUElections_VoterEngagement_2019\/EUElections_VoterEngagement_2019.png&quot;,&quot;uglydollswage&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UglyDolls_Wage\/UglyDolls_Wage.png&quot;,&quot;wegohard&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_18_BKN\/NBA_18_BKN.png&quot;,&quot;alegeriue2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EU_Election_2019\/EU_Election_2019.png&quot;,&quot;母の日&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/2019_MothersDay\/2019_MothersDay.png&quot;,&quot;roaron&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_19_Seoul\/OWL_19_Seoul.png&quot;,&quot;vengadores&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019\/Avengers_Endgame_2019.png&quot;,&quot;紅茶派&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KIRINGT_JP_2019_V3\/KIRINGT_JP_2019_V3.png&quot;,&quot;mlsishere&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ESPN_MLS_2019\/ESPN_MLS_2019.png&quot;,&quot;redmi32mpsuperselfie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RedmiY3_2019\/RedmiY3_2019.png&quot;,&quot;放置少女百花繚乱&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/houchishoujo_2yearanniversary_v2\/houchishoujo_2yearanniversary_v2.png&quot;,&quot;joganogoogle&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/GoogleSoccer_Brazil_2019\/GoogleSoccer_Brazil_2019.png&quot;,&quot;capitãmarvel&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_CaptainMarvel\/Avengers_Endgame_2019_CaptainMarvel.png&quot;,&quot;스타로드&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Starlord\/Avengers_Endgame_2019_Starlord.png&quot;,&quot;ナイトジョガー&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Adidas_NiteJogger_2019_add\/Adidas_NiteJogger_2019_add.png&quot;,&quot;thisismay&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBCSportsIndy500_MustBeMay\/NBCSportsIndy500_MustBeMay.png&quot;,&quot;redminote7pro&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/XiaomiRedmi_Pro7_2019\/XiaomiRedmi_Pro7_2019.png&quot;,&quot;あんスタ4周年&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ansta4th_2019\/Ansta4th_2019.png&quot;,&quot;cmtawards19&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CMTMusicAwards_2019\/CMTMusicAwards_2019.png&quot;,&quot;euroleague&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Euroleague_Jan2019\/Euroleague_Jan2019.png&quot;,&quot;paradisehotel&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Fox_Summer_ParadiseHotel\/Fox_Summer_ParadiseHotel.png&quot;,&quot;soldadodelinvierno&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_WinterSoldier\/Avengers_Endgame_2019_WinterSoldier.png&quot;,&quot;絶好調はおぎなえる&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KIRIN_Tropicana_JP\/KIRIN_Tropicana_JP.png&quot;,&quot;clgwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCS_2019_CounterLogicGaming\/LCS_2019_CounterLogicGaming.png&quot;,&quot;babotheuglydoll&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UglyDolls_Babo\/UglyDolls_Babo.png&quot;,&quot;放置少女の萌姫たち&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/houchishoujo_2yearanniversary_v2\/houchishoujo_2yearanniversary_v2.png&quot;,&quot;s04&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Riot_Schalke04\/Riot_Schalke04.png&quot;,&quot;رمضان_الصقور_غير&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/invasionarab1_Ramadan_2019\/invasionarab1_Ramadan_2019.png&quot;,&quot;serbuseru&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bukalapak_2019\/Bukalapak_2019.png&quot;,&quot;bhm&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BlackHistoryMonth\/BlackHistoryMonth.png&quot;,&quot;mi&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MumbaiIndians_2018\/MumbaiIndians_2018.png&quot;,&quot;pepperpotts&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_PepperPotts\/Avengers_Endgame_2019_PepperPotts.png&quot;,&quot;toystoryfourchette&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_Forky\/Disney_ToyStory4_Forky.png&quot;,&quot;chrispine&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TNT_IAmTheNight_2019_v2\/TNT_IAmTheNight_2019_v2.png&quot;,&quot;masterchef&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Masterchef_March_2019\/Masterchef_March_2019.png&quot;,&quot;elgeniodealadd&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Genie\/Disney_Aladdin_Genie.png&quot;,&quot;fazeup&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Esports_AllAccessTeam_FaZeClan_ext19\/Esports_AllAccessTeam_FaZeClan_ext19.png&quot;,&quot;صقور_العرب&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/invasionarab1_Ramadan_2019\/invasionarab1_Ramadan_2019.png&quot;,&quot;winecountryus&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WineCountry_Netflix\/WineCountry_Netflix.png&quot;,&quot;4real4real&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YG_2019\/YG_2019.png&quot;,&quot;snapchatforandroid&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SnapAndroid_Launch_2019\/SnapAndroid_Launch_2019.png&quot;,&quot;lalampara&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Lamp\/Disney_Aladdin_Lamp.png&quot;,&quot;lampada&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Lamp\/Disney_Aladdin_Lamp.png&quot;,&quot;إفطارًا_شهيًا&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019_Iftar\/Ramadan_2019_Iftar.png&quot;,&quot;capitaoamerica&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_CaptainAmerica\/Avengers_Endgame_2019_CaptainAmerica.png&quot;,&quot;microsoft&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Microsoft_APAC_2019_v2\/Microsoft_APAC_2019_v2.png&quot;,&quot;بطاقة_السفر&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SAIB_2019\/SAIB_2019.png&quot;,&quot;eleccionesue2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EU_Election_2019\/EU_Election_2019.png&quot;,&quot;eprinkimai2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EU_Election_2019\/EU_Election_2019.png&quot;,&quot;celebratemickey&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_NowMoreThanEver_v2\/DisneyParks_NowMoreThanEver_v2.png&quot;,&quot;gojetsgo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHLJetsPlayoffs2019\/NHLJetsPlayoffs2019.png&quot;,&quot;hotzoneshow&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HotZone_NatGeoChannel_2019\/HotZone_NatGeoChannel_2019.png&quot;,&quot;petsematarymovie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Paramount_PetSematary_2019_v2\/Paramount_PetSematary_2019_v2.png&quot;,&quot;気になった時がはじめ時&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Livita_JP_2019_V3\/Livita_JP_2019_V3.png&quot;,&quot;bullsnation&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_18_CHI\/NBA_18_CHI.png&quot;,&quot;twinsbeisbol&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Minn\/MLB_2019_Minn.png&quot;,&quot;nrl&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL2019_NRL\/NRL2019_NRL.png&quot;,&quot;eleicoeseuropeias2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EU_Election_2019\/EU_Election_2019.png&quot;,&quot;азизбирамес2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EU_Election_2019\/EU_Election_2019.png&quot;,&quot;nfl100&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NFL100AnniversaryEmoji\/NFL100AnniversaryEmoji.png&quot;,&quot;サランラップ漫画劇場&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AsahiKaseiHP_2019\/AsahiKaseiHP_2019.png&quot;,&quot;herohighfive&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RedNoseDay_2019\/RedNoseDay_2019.png&quot;,&quot;pericao&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Pericles_2019\/Pericles_2019.png&quot;,&quot;血盟ジョイン&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LineageMFirstBrand_2019\/LineageMFirstBrand_2019.png&quot;,&quot;ilovemi&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/XiaomiRedmi_Pro7_2019\/XiaomiRedmi_Pro7_2019.png&quot;,&quot;letsgoc9&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Esports_AllAccessTeam_Cloud9_ext19\/Esports_AllAccessTeam_Cloud9_ext19.png&quot;,&quot;lalampe&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Lamp\/Disney_Aladdin_Lamp.png&quot;,&quot;glumanda&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBPikachu_Charmander\/WBPikachu_Charmander.png&quot;,&quot;リゼロコラボ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Priconne_Rezaro_2019_v2\/Priconne_Rezaro_2019_v2.png&quot;,&quot;moremagic&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_NowMoreThanEver_v2\/DisneyParks_NowMoreThanEver_v2.png&quot;,&quot;teamenvy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Esports_AllAccessTeam_Envy_ext2\/Esports_AllAccessTeam_Envy_ext2.png&quot;,&quot;myxmusicawards2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MYXMusicAwards_2019\/MYXMusicAwards_2019.png&quot;,&quot;ドン勝&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PUBGKR2019\/PUBGKR2019.png&quot;,&quot;nottoday&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/GoT_S8_Tree\/GoT_S8_Tree.png&quot;,&quot;ハルク&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Hulk\/Avengers_Endgame_2019_Hulk.png&quot;,&quot;الحجر&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AlUlaCity_2019\/AlUlaCity_2019.png&quot;,&quot;itchaptertwo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WB_It_Chp2\/WB_It_Chp2.png&quot;,&quot;breakpoint&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/GhostRecon_2019_breakpoint\/GhostRecon_2019_breakpoint.png&quot;,&quot;forgloryforcity&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_19_SKC_v2\/MLS_19_SKC_v2.png&quot;,&quot;britainsgottalent&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BritainsGotTalent_2019_star\/BritainsGotTalent_2019_star.png&quot;,&quot;ofertasprimeday&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AmazonHotSale2019\/AmazonHotSale2019.png&quot;,&quot;carlsbergpilsner&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Carlsberg_NewBrew_2019\/Carlsberg_NewBrew_2019.png&quot;,&quot;disneyworld&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_MickeyEars_Flight2\/DisneyParks_MickeyEars_Flight2.png&quot;,&quot;womeninfootball&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WomenInFootball_Flight3\/WomenInFootball_Flight3.png&quot;,&quot;पृथ्वीदिवस&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EarthDay_2019_fixed\/EarthDay_2019_fixed.png&quot;,&quot;izborieu2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EU_Election_2019\/EU_Election_2019.png&quot;,&quot;포키&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_Forky\/Disney_ToyStory4_Forky.png&quot;,&quot;vcnuncaviunadaigual&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBB_2018_2019Season\/NBB_2018_2019Season.png&quot;,&quot;アラジンと新しい世界へ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Lamp\/Disney_Aladdin_Lamp.png&quot;,&quot;kpoptwitter&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KPOPTwitter2019\/KPOPTwitter2019.png&quot;,&quot;vacinabrasil&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Brasil_InfluenzaVaccination\/Brasil_InfluenzaVaccination.png&quot;,&quot;mewtwo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBPikachu_Mewtwo\/WBPikachu_Mewtwo.png&quot;,&quot;지구의날&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EarthDay_2019_fixed\/EarthDay_2019_fixed.png&quot;,&quot;powerof18&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Powerof18_India\/Powerof18_India.png&quot;,&quot;blacklivesmatter&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BlackHistoryMonth\/BlackHistoryMonth.png&quot;,&quot;foxwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCS_2019_EchoFox\/LCS_2019_EchoFox.png&quot;,&quot;wearewarriors&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL2019_WeAreWarriors\/NRL2019_WeAreWarriors.png&quot;,&quot;pinkcarpetmtvmiaw&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MTV_Miaw_2019\/MTV_Miaw_2019.png&quot;,&quot;senhordasestrelas&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Starlord\/Avengers_Endgame_2019_Starlord.png&quot;,&quot;グラクロ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netmarble_7deadlysins_2019\/Netmarble_7deadlysins_2019.png&quot;,&quot;ourplanet&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netflix_OurPlanet_2019\/Netflix_OurPlanet_2019.png&quot;,&quot;toandroidlovesnapchat&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SnapAndroid_Launch_2019\/SnapAndroid_Launch_2019.png&quot;,&quot;moc&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MOCSaudi_2019\/MOCSaudi_2019.png&quot;,&quot;僕はおもちゃじゃない&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_Forky\/Disney_ToyStory4_Forky.png&quot;,&quot;gonip&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Esports_V2_19_NIP\/Esports_V2_19_NIP.png&quot;,&quot;インフィニティガントレット&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_InfinityGauntlet\/Avengers_Endgame_2019_InfinityGauntlet.png&quot;,&quot;teusegredo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Pericles_2019\/Pericles_2019.png&quot;,&quot;보핍&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_BoPeep\/Disney_ToyStory4_BoPeep.png&quot;,&quot;projectrunwaybravo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ProjectRunway_Bravo\/ProjectRunway_Bravo.png&quot;,&quot;starlord&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Starlord\/Avengers_Endgame_2019_Starlord.png&quot;,&quot;nickfury&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_NickFury\/Avengers_Endgame_2019_NickFury.png&quot;,&quot;rocketmanmovie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Paramount_Rocketman_Rocket\/Paramount_Rocketman_Rocket.png&quot;,&quot;preds&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PredsPlayoffs2019\/PredsPlayoffs2019.png&quot;,&quot;feriadelhilo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FeriaDelHilo_v2\/FeriaDelHilo_v2.png&quot;,&quot;звёздныйлорд&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Starlord\/Avengers_Endgame_2019_Starlord.png&quot;,&quot;eoinmorgan&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CricketWorldCup_2019_Players_EoinMorgan\/CricketWorldCup_2019_Players_EoinMorgan.png&quot;,&quot;ドクターストレンジ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_DoctorStrange\/Avengers_Endgame_2019_DoctorStrange.png&quot;,&quot;サントリーに願いよ届け&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Japan_DreamsComeTrue_2019\/Japan_DreamsComeTrue_2019.png&quot;,&quot;xfinitywatchathon&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Xfinity_Watchathon_2019\/Xfinity_Watchathon_2019.png&quot;,&quot;リネmプレイ中デス&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LineageMSecondBrand_2019\/LineageMSecondBrand_2019.png&quot;,&quot;hawkeyeavenger&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Hawkeye\/Avengers_Endgame_2019_Hawkeye.png&quot;,&quot;disneycruise&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_MickeyEars_Flight2\/DisneyParks_MickeyEars_Flight2.png&quot;,&quot;cettefoisjevote&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EUElections_VoterEngagement_2019\/EUElections_VoterEngagement_2019.png&quot;,&quot;nrlmagicround&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL_2019_MidSeason_NRLWMagicRound\/NRL_2019_MidSeason_NRLWMagicRound.png&quot;,&quot;allcaps&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NHL_2017_2018_Caps_v3\/NHL_2017_2018_Caps_v3.png&quot;,&quot;дракс&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Drax\/Avengers_Endgame_2019_Drax.png&quot;,&quot;kevinfeige&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_KevinFeige\/Avengers_Endgame_2019_KevinFeige.png&quot;,&quot;eaststowin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL2019_EastsToWin\/NRL2019_EastsToWin.png&quot;,&quot;alâmpada&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Lamp\/Disney_Aladdin_Lamp.png&quot;,&quot;nrgfam&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Esports_AllAccessTeam_NRG_ext19\/Esports_AllAccessTeam_NRG_ext19.png&quot;,&quot;ngkfrommay31&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NGKFilm_2019\/NGKFilm_2019.png&quot;,&quot;wehaveahulk&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Hulk\/Avengers_Endgame_2019_Hulk.png&quot;,&quot;キャプテンマーベル&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_CaptainMarvel\/Avengers_Endgame_2019_CaptainMarvel.png&quot;,&quot;杰尼龟&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBPikachu_Squirtle_v2\/WBPikachu_Squirtle_v2.png&quot;,&quot;vitwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Riot_TeamVitality\/Riot_TeamVitality.png&quot;,&quot;milehighbasketball&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_18_DEN\/NBA_18_DEN.png&quot;,&quot;캡틴아메리카&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_CaptainAmerica\/Avengers_Endgame_2019_CaptainAmerica.png&quot;,&quot;ドラガリ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/dragalialos_March2019_v2\/dragalialos_March2019_v2.png&quot;,&quot;إفطار&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019_Iftar\/Ramadan_2019_Iftar.png&quot;,&quot;paradisehotelfox&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Fox_Summer_ParadiseHotel\/Fox_Summer_ParadiseHotel.png&quot;,&quot;powerof18india&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Powerof18_India\/Powerof18_India.png&quot;,&quot;diabloguardián&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Amazon_DiabloGuardian_add\/Amazon_DiabloGuardian_add.png&quot;,&quot;therevengers&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheHustle_2019\/TheHustle_2019.png&quot;,&quot;winecountryfilm&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WineCountry_Netflix\/WineCountry_Netflix.png&quot;,&quot;aisxlisa&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AISXLISA_2019\/AISXLISA_2019.png&quot;,&quot;ويش_بتسوي_لو_صرت_الحاكم&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/invasionarab1_Ramadan_2019\/invasionarab1_Ramadan_2019.png&quot;,&quot;bronxnation&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL2019_Bronxnation\/NRL2019_Bronxnation.png&quot;,&quot;inclusionishappening&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TwitterTogether_InclusionIsHappening_v2\/TwitterTogether_InclusionIsHappening_v2.png&quot;,&quot;hilanderos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FeriaDelHilo_v2\/FeriaDelHilo_v2.png&quot;,&quot;七つの大罪光と闇の交戦&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Netmarble_7deadlysins_2019\/Netmarble_7deadlysins_2019.png&quot;,&quot;magiclamp&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Lamp\/Disney_Aladdin_Lamp.png&quot;,&quot;starbuckssummersippin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Starbucks_Canada_SummerFrapp_add\/Starbucks_Canada_SummerFrapp_add.png&quot;,&quot;lec&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Riot_LEC\/Riot_LEC.png&quot;,&quot;draxthedestroyer&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Drax\/Avengers_Endgame_2019_Drax.png&quot;,&quot;okoye&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Okoye\/Avengers_Endgame_2019_Okoye.png&quot;,&quot;mtvaward&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MTV_Awards_May2019\/MTV_Awards_May2019.png&quot;,&quot;pileofrocks&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Korg\/Avengers_Endgame_2019_Korg.png&quot;,&quot;วันคุ้มครองโลก&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EarthDay_2019_fixed\/EarthDay_2019_fixed.png&quot;,&quot;リネm&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LineageMFirstBrand_2019\/LineageMFirstBrand_2019.png&quot;,&quot;تبرعك_أسهل&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Zamzam_2019\/Zamzam_2019.png&quot;,&quot;рокетмен&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Paramount_Rocketman_Rocket\/Paramount_Rocketman_Rocket.png&quot;,&quot;tlwin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Esports_AllAccessTeam_TeamLiquid_ext19\/Esports_AllAccessTeam_TeamLiquid_ext19.png&quot;,&quot;ロキ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Loki\/Avengers_Endgame_2019_Loki.png&quot;,&quot;flyquest&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Esports_AllAccessTeam_FlyQuest_ext19\/Esports_AllAccessTeam_FlyQuest_ext19.png&quot;,&quot;pets2&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Pets2_Max_v2_ext\/Pets2_Max_v2_ext.png&quot;,&quot;mariahill&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_MariaHill\/Avengers_Endgame_2019_MariaHill.png&quot;,&quot;캡틴마블&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_CaptainMarvel\/Avengers_Endgame_2019_CaptainMarvel.png&quot;,&quot;رمضان_مبارك&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019\/Ramadan_2019.png&quot;,&quot;euroekloges2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EU_Election_2019\/EU_Election_2019.png&quot;,&quot;미에크&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Miek\/Avengers_Endgame_2019_Miek.png&quot;,&quot;うさピヨ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Usapiyo_2019\/Usapiyo_2019.png&quot;,&quot;чернаяпантера&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_BlackPanther\/Avengers_Endgame_2019_BlackPanther.png&quot;,&quot;freshepcot&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_NowMoreThanEver_v2\/DisneyParks_NowMoreThanEver_v2.png&quot;,&quot;thisworldcomesforyou&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PlayStation_DaysGone\/PlayStation_DaysGone.png&quot;,&quot;puremagic&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_18_ORL\/NBA_18_ORL.png&quot;,&quot;nbaplayoffs&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBAPlayoffs2019v2\/NBAPlayoffs2019v2.png&quot;,&quot;bulbizarre&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBPikachu_Bulbasaur\/WBPikachu_Bulbasaur.png&quot;,&quot;rocketfan&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Paramount_Rocketman_Star\/Paramount_Rocketman_Star.png&quot;,&quot;spywin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Riot_Splyce\/Riot_Splyce.png&quot;,&quot;thehotzonenatgeo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HotZone_NatGeoChannel_2019\/HotZone_NatGeoChannel_2019.png&quot;,&quot;maquinadecombate&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_WarMachine\/Avengers_Endgame_2019_WarMachine.png&quot;,&quot;オルビスユーローション&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ORBIS_2019_add\/ORBIS_2019_add.png&quot;,&quot;got7worldtour&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KPOP_GOT7_2019_GOT7WORLDTOUR\/KPOP_GOT7_2019_GOT7WORLDTOUR.png&quot;,&quot;thecontinental&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JohnWick_3_ext\/JohnWick_3_ext.png&quot;,&quot;alfombramágicatour&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Lamp\/Disney_Aladdin_Lamp.png&quot;,&quot;ministryofculture&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MOCSaudi_2019\/MOCSaudi_2019.png&quot;,&quot;leafsforever&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LeafsPlayoffs2019\/LeafsPlayoffs2019.png&quot;,&quot;rattleon&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Arizona\/MLB_2019_Arizona.png&quot;,&quot;อิท2&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WB_It_Chp2\/WB_It_Chp2.png&quot;,&quot;loveislandday&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LoveIsland_May2019\/LoveIsland_May2019.png&quot;,&quot;rexonadancestudio&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RexonaNowUnited_72x72\/RexonaNowUnited_72x72.png&quot;,&quot;スターロード&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Starlord\/Avengers_Endgame_2019_Starlord.png&quot;,&quot;uglydollsbabo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UglyDolls_Babo\/UglyDolls_Babo.png&quot;,&quot;локи&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Loki\/Avengers_Endgame_2019_Loki.png&quot;,&quot;мстители&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019\/Avengers_Endgame_2019.png&quot;,&quot;thehustlemovie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheHustle_2019\/TheHustle_2019.png&quot;,&quot;ripcity&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_18_POR\/NBA_18_POR.png&quot;,&quot;zacharyquinto&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Nos4a2_2019\/Nos4a2_2019.png&quot;,&quot;100t&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Esports_AllAccessTeam_100Thieves_ext19\/Esports_AllAccessTeam_100Thieves_ext19.png&quot;,&quot;mikeygarcia&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FoxSports_PBC\/FoxSports_PBC.png&quot;,&quot;stonekeeper&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_RedSkull\/Avengers_Endgame_2019_RedSkull.png&quot;,&quot;todosjuntos&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Texas\/MLB_2019_Texas.png&quot;,&quot;ringthebell&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Phil\/MLB_2019_Phil.png&quot;,&quot;hustlemovie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TheHustle_2019\/TheHustle_2019.png&quot;,&quot;risewithus&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/IPL_2019_2_Sunrisers\/IPL_2019_2_Sunrisers.png&quot;,&quot;엄마사랑해요&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/2019_MothersDay\/2019_MothersDay.png&quot;,&quot;jamesbeardawards&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JamesBeard_FoundationAwards_2019\/JamesBeard_FoundationAwards_2019.png&quot;,&quot;lakeshow&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_18_LAL\/NBA_18_LAL.png&quot;,&quot;toystorybetty&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_BoPeep\/Disney_ToyStory4_BoPeep.png&quot;,&quot;showtimelatenight&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DesusandMero_2019\/DesusandMero_2019.png&quot;,&quot;magiccarpet&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_2019\/Disney_Aladdin_2019.png&quot;,&quot;fridayforgood&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FridayforGood_2019\/FridayforGood_2019.png&quot;,&quot;nosebowl&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RedNoseDay_2019\/RedNoseDay_2019.png&quot;,&quot;flyq&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Esports_AllAccessTeam_FlyQuest_ext19\/Esports_AllAccessTeam_FlyQuest_ext19.png&quot;,&quot;szavaznifogok&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EUElections_VoterEngagement_2019\/EUElections_VoterEngagement_2019.png&quot;,&quot;popsdiner&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Riverdale_S4_2019_v2\/Riverdale_S4_2019_v2.png&quot;,&quot;budknightreturn&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BudLight_BudKnight_2019\/BudLight_BudKnight_2019.png&quot;,&quot;rbny&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_19_RBNY\/MLS_19_RBNY.png&quot;,&quot;magiccarpettour&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Lamp\/Disney_Aladdin_Lamp.png&quot;,&quot;dedataastavotez&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EUElections_VoterEngagement_2019\/EUElections_VoterEngagement_2019.png&quot;,&quot;makethefuture&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Shell_makethefuture_2019\/Shell_makethefuture_2019.png&quot;,&quot;ユニクロ感謝祭&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UNIQLO_Kanshasai_2019_v3\/UNIQLO_Kanshasai_2019_v3.png&quot;,&quot;raysbéisbol&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Tampa\/MLB_2019_Tampa.png&quot;,&quot;kohlscashsweepstakes&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Kohls_Q2_2019\/Kohls_Q2_2019.png&quot;,&quot;darkphoenix&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/20thCenturyFox_DarkPhoenix\/20thCenturyFox_DarkPhoenix.png&quot;,&quot;mihplanner&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MadeInHeaven_Amazon_2019\/MadeInHeaven_Amazon_2019.png&quot;,&quot;cmtaward&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CMTMusicAwards_2019\/CMTMusicAwards_2019.png&quot;,&quot;nowapocalypsestarz&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/STARZ_NowApocalypse_2019\/STARZ_NowApocalypse_2019.png&quot;,&quot;bang&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_19_Hangzhou\/OWL_19_Hangzhou.png&quot;,&quot;パパジャニwestに願いよ届け&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Japan_DreamsComeTrue_2019\/Japan_DreamsComeTrue_2019.png&quot;,&quot;elezzjonijietue2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EU_Election_2019\/EU_Election_2019.png&quot;,&quot;itsus&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UsMovie_2018\/UsMovie_2018.png&quot;,&quot;semainemondialeemi&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2018_GlobalMILWeeks\/MediaInformationLiteracyWeeks_2018_GlobalMILWeeks.png&quot;,&quot;faceofcity&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_19_ORL\/MLS_19_ORL.png&quot;,&quot;팔콘&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Falcon\/Avengers_Endgame_2019_Falcon.png&quot;,&quot;vainogás&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CocaCola_VaiNoGas\/CocaCola_VaiNoGas.png&quot;,&quot;sheriffwoody&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_Woody\/Disney_ToyStory4_Woody.png&quot;,&quot;코르그&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Korg\/Avengers_Endgame_2019_Korg.png&quot;,&quot;星ドラ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Hoshidora_May2019\/Hoshidora_May2019.png&quot;,&quot;bulbassauro&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBPikachu_Bulbasaur\/WBPikachu_Bulbasaur.png&quot;,&quot;dragalialost&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/dragalialos_March2019_v2\/dragalialos_March2019_v2.png&quot;,&quot;shaftsays&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WB_ShaftMovie_2019\/WB_ShaftMovie_2019.png&quot;,&quot;ilguantodellinfinito&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_InfinityGauntlet\/Avengers_Endgame_2019_InfinityGauntlet.png&quot;,&quot;lastog&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TLOG_Season2\/TLOG_Season2.png&quot;,&quot;いつかきっとここで&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RakutenTV_NBA_Logo_2019_v2\/RakutenTV_NBA_Logo_2019_v2.png&quot;,&quot;realitystone&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_InfinityGauntlet\/Avengers_Endgame_2019_InfinityGauntlet.png&quot;,&quot;boundbyblue&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AFL_Part2_2019_BoundByBlue\/AFL_Part2_2019_BoundByBlue.png&quot;,&quot;سحور&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019_Iftar\/Ramadan_2019_Iftar.png&quot;,&quot;peterquill&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Starlord\/Avengers_Endgame_2019_Starlord.png&quot;,&quot;itchapter2&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WB_It_Chp2\/WB_It_Chp2.png&quot;,&quot;mapfreandrafa&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MapfreRafaNadal_2019\/MapfreRafaNadal_2019.png&quot;,&quot;alligatormovie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Paramount_Crawl_2019\/Paramount_Crawl_2019.png&quot;,&quot;全球媒介和信息素養週&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2018_GlobalMILWeeks\/MediaInformationLiteracyWeeks_2018_GlobalMILWeeks.png&quot;,&quot;오븐브레이크&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CookieRunGame_2019\/CookieRunGame_2019.png&quot;,&quot;georgeharrison&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/GeorgeHarrison_2019_v3\/GeorgeHarrison_2019_v3.png&quot;,&quot;ramadán&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019\/Ramadan_2019.png&quot;,&quot;行くぜ令和&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AbemaTV_2019\/AbemaTV_2019.png&quot;,&quot;bethefight&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_18_CLE\/NBA_18_CLE.png&quot;,&quot;clippernation&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_18_LAC\/NBA_18_LAC.png&quot;,&quot;openingday&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019\/MLB_2019.png&quot;,&quot;bisasam&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBPikachu_Bulbasaur\/WBPikachu_Bulbasaur.png&quot;,&quot;tredesideri&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Genie\/Disney_Aladdin_Genie.png&quot;,&quot;copasuperliga&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/SuperLigaFinal_2019\/SuperLigaFinal_2019.png&quot;,&quot;thefutureischingona&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/STARZ_Vida_S2\/STARZ_Vida_S2.png&quot;,&quot;denhärgångenröstarjag&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EUElections_VoterEngagement_2019\/EUElections_VoterEngagement_2019.png&quot;,&quot;sudamericana&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Sulamericana_2019\/Sulamericana_2019.png&quot;,&quot;avengerendgame&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_add2\/Avengers_Endgame_2019_add2.png&quot;,&quot;갓세븐&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KPOP_GOT7_2019_GOT7WORLDTOUR\/KPOP_GOT7_2019_GOT7WORLDTOUR.png&quot;,&quot;livevictoriously&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/GreyGoose_REBRAND_2019\/GreyGoose_REBRAND_2019.png&quot;,&quot;capitãoamérica&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_CaptainAmerica\/Avengers_Endgame_2019_CaptainAmerica.png&quot;,&quot;rocketmannl&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Paramount_Rocketman_Rocket\/Paramount_Rocketman_Rocket.png&quot;,&quot;ジョジョピタ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Jojos_PitaPataHop_2019\/Jojos_PitaPataHop_2019.png&quot;,&quot;budknight&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/BudLight_BudKnight_2019\/BudLight_BudKnight_2019.png&quot;,&quot;nbafinals&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBAFinals2019\/NBAFinals2019.png&quot;,&quot;halsey&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Halsey_2019\/Halsey_2019.png&quot;,&quot;raysup&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Tampa\/MLB_2019_Tampa.png&quot;,&quot;ironman&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_IronMan\/Avengers_Endgame_2019_IronMan.png&quot;,&quot;weareraiders&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL2019_WeAreRaiders\/NRL2019_WeAreRaiders.png&quot;,&quot;tentorazidemvolit&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EUElections_VoterEngagement_2019\/EUElections_VoterEngagement_2019.png&quot;,&quot;rocketraccoon&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Rocket\/Avengers_Endgame_2019_Rocket.png&quot;,&quot;máquinadeguerra&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_WarMachine\/Avengers_Endgame_2019_WarMachine.png&quot;,&quot;デスナイト&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LineageMSecondBrand_2019\/LineageMSecondBrand_2019.png&quot;,&quot;ウォーマシン&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_WarMachine\/Avengers_Endgame_2019_WarMachine.png&quot;,&quot;uptheblues&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL_2019_MidSeason_UpTheBlues\/NRL_2019_MidSeason_UpTheBlues.png&quot;,&quot;ausnavy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AusNavy_DFR_2019\/AusNavy_DFR_2019.png&quot;,&quot;キャッシュレス&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Aomaru2019\/Aomaru2019.png&quot;,&quot;truetotheblue&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Seattle\/MLB_2019_Seattle.png&quot;,&quot;капитанмарвел&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_CaptainMarvel\/Avengers_Endgame_2019_CaptainMarvel.png&quot;,&quot;リネージュm&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LineageMFirstBrand_2019\/LineageMFirstBrand_2019.png&quot;,&quot;lalampada&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Lamp\/Disney_Aladdin_Lamp.png&quot;,&quot;tonystark&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_IronMan\/Avengers_Endgame_2019_IronMan.png&quot;,&quot;myheartbeatstrue&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AFL_Part2_2019_MyHeartBeatsTrue\/AFL_Part2_2019_MyHeartBeatsTrue.png&quot;,&quot;stephenvsthegame&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StephenCurry_2019\/StephenCurry_2019.png&quot;,&quot;moxy&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/UglyDolls_Moxy\/UglyDolls_Moxy.png&quot;,&quot;compartilheobem&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Pedigree_DogBots_2019\/Pedigree_DogBots_2019.png&quot;,&quot;alienswirlingsaucers&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_ToyStoryLand\/DisneyParks_ToyStoryLand.png&quot;,&quot;threewishes&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Genie\/Disney_Aladdin_Genie.png&quot;,&quot;nitegoods&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Adidas_NiteJogger_2019_add\/Adidas_NiteJogger_2019_add.png&quot;,&quot;فانوس_رمضان&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019_Lantern\/Ramadan_2019_Lantern.png&quot;,&quot;jasonholder&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CricketWorldCup_2019_Players_JasonHolder\/CricketWorldCup_2019_Players_JasonHolder.png&quot;,&quot;towie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TOWIE_Essex_2019\/TOWIE_Essex_2019.png&quot;,&quot;facetheintensity&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/TAKIS_WILD_2019\/TAKIS_WILD_2019.png&quot;,&quot;laguêpe&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Wasp\/Avengers_Endgame_2019_Wasp.png&quot;,&quot;tgit&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ABC_TGIT_Spring2019\/ABC_TGIT_Spring2019.png&quot;,&quot;diamondgeezer&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bethesda_RAGE2_2019\/Bethesda_RAGE2_2019.png&quot;,&quot;aceshigh&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/OWL_19_London\/OWL_19_London.png&quot;,&quot;mouseparty&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_NowMoreThanEver_v2\/DisneyParks_NowMoreThanEver_v2.png&quot;,&quot;vivoxmaineriseup&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MaineforVivo_2019\/MaineforVivo_2019.png&quot;,&quot;persiannewyear&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/nowruz2018_v4\/nowruz2018_v4.png&quot;,&quot;вилкинс&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_Forky\/Disney_ToyStory4_Forky.png&quot;,&quot;letskcon&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KCON2019\/KCON2019.png&quot;,&quot;letsgobluejays&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Toronto\/MLB_2019_Toronto.png&quot;,&quot;electionsue19&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EU_Election_2019\/EU_Election_2019.png&quot;,&quot;steverogers&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_CaptainAmerica\/Avengers_Endgame_2019_CaptainAmerica.png&quot;,&quot;siemprereal&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Kansas\/MLB_2019_Kansas.png&quot;,&quot;tentokratbuduvolit&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EUElections_VoterEngagement_2019\/EUElections_VoterEngagement_2019.png&quot;,&quot;spacebeer&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Budweiser_SpaceBeer_2019\/Budweiser_SpaceBeer_2019.png&quot;,&quot;msinnovationsummit&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Microsoft_APAC_2019_v2\/Microsoft_APAC_2019_v2.png&quot;,&quot;parabellum&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/JohnWick_3_ext\/JohnWick_3_ext.png&quot;,&quot;nbb&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBB_2018_2019Season\/NBB_2018_2019Season.png&quot;,&quot;stopsnitchin&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/YG_2019\/YG_2019.png&quot;,&quot;bk99&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Brooklyn99_2019\/Brooklyn99_2019.png&quot;,&quot;平成最後にありがとう&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AbemaTV_2019\/AbemaTV_2019.png&quot;,&quot;europawahl2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EU_Election_2019\/EU_Election_2019.png&quot;,&quot;máquinadecombate&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_WarMachine\/Avengers_Endgame_2019_WarMachine.png&quot;,&quot;グリムノーツ&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/GrimmsEchoes_PR_2019\/GrimmsEchoes_PR_2019.png&quot;,&quot;uniteandconquer&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_19_ATL\/MLS_19_ATL.png&quot;,&quot;meninmaroon&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CricketWorldCup_2019_Teams_MenInMaroon\/CricketWorldCup_2019_Teams_MenInMaroon.png&quot;,&quot;aaronfinch&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CricketWorldCup_2019_Players_AaronFinch\/CricketWorldCup_2019_Players_AaronFinch.png&quot;,&quot;bll2&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HBO_BigLittleLies_Season2_2019\/HBO_BigLittleLies_Season2_2019.png&quot;,&quot;kkr&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KolkataKnights_2019\/KolkataKnights_2019.png&quot;,&quot;ojodehalcón&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Hawkeye\/Avengers_Endgame_2019_Hawkeye.png&quot;,&quot;g2army&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Esports_AllAccessTeam_G2_ext19\/Esports_AllAccessTeam_G2_ext19.png&quot;,&quot;rolandgarros&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FrenchOpen_RolandGarros_2019\/FrenchOpen_RolandGarros_2019.png&quot;,&quot;whitesox&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Chicago\/MLB_2019_Chicago.png&quot;,&quot;mibr&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Esports_V2_19_MIBR\/Esports_V2_19_MIBR.png&quot;,&quot;daysgone&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PlayStation_DaysGone\/PlayStation_DaysGone.png&quot;,&quot;therookie&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ABC_TheRookie_2018_ext\/ABC_TheRookie_2018_ext.png&quot;,&quot;mickeymouseclub&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Mickey90th_2018\/Mickey90th_2018.png&quot;,&quot;nbatwitterlive&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBATwitterLive2019\/NBATwitterLive2019.png&quot;,&quot;kcon2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KCON2019\/KCON2019.png&quot;,&quot;neverordinary&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Paramount_Rocketman_Star\/Paramount_Rocketman_Star.png&quot;,&quot;معمل_الصراحة&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FairFactory_Jawwy\/FairFactory_Jawwy.png&quot;,&quot;serba10ribu&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ShopeeRamadan_May_2019\/ShopeeRamadan_May_2019.png&quot;,&quot;vedovanera&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_BlackWidow\/Avengers_Endgame_2019_BlackWidow.png&quot;,&quot;محافظة_العلا&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AlUlaCity_2019\/AlUlaCity_2019.png&quot;,&quot;birdland&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Baltimore\/MLB_2019_Baltimore.png&quot;,&quot;nowapocalypse&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/STARZ_NowApocalypse_2019\/STARZ_NowApocalypse_2019.png&quot;,&quot;pinstripepride&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Yankees\/MLB_2019_Yankees.png&quot;,&quot;nationalconcertweek&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NationalConcertWeek_2019\/NationalConcertWeek_2019.png&quot;,&quot;semanadeeducaçãoemmídia&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2018_GlobalMILWeeks\/MediaInformationLiteracyWeeks_2018_GlobalMILWeeks.png&quot;,&quot;princeali&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_2019\/Disney_Aladdin_2019.png&quot;,&quot;hilanderas&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FeriaDelHilo_v2\/FeriaDelHilo_v2.png&quot;,&quot;من_الرابح_الأكبر&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/invasionarab1_Ramadan_2019\/invasionarab1_Ramadan_2019.png&quot;,&quot;طيران_ناس&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/FlyNas_2019\/FlyNas_2019.png&quot;,&quot;afriendlikeme&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_Genie\/Disney_Aladdin_Genie.png&quot;,&quot;crew96&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLS_19_COL\/MLS_19_COL.png&quot;,&quot;studentsstandup&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Parkland_Extension\/Parkland_Extension.png&quot;,&quot;petcemetary&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Paramount_PetSematary_2019_v2\/Paramount_PetSematary_2019_v2.png&quot;,&quot;vforvictory&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Riot_TeamVitality\/Riot_TeamVitality.png&quot;,&quot;ruinthegame&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/StephenCurry_2019\/StephenCurry_2019.png&quot;,&quot;twinsbéisbol&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Minn\/MLB_2019_Minn.png&quot;,&quot;killthislove&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KPOP_BLACKPINK_2019\/KPOP_BLACKPINK_2019.png&quot;,&quot;toystorybopeep&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_BoPeep\/Disney_ToyStory4_BoPeep.png&quot;,&quot;itcapítulo2&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WB_It_Chp2\/WB_It_Chp2.png&quot;,&quot;lechardonneret&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WB_TheGoldfinch_2019\/WB_TheGoldfinch_2019.png&quot;,&quot;smashperrier&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NestlePerrier_May2019\/NestlePerrier_May2019.png&quot;,&quot;redmiy3&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/RedmiY3_2019\/RedmiY3_2019.png&quot;,&quot;guccicruise20&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Gucci_Cruise20\/Gucci_Cruise20.png&quot;,&quot;كفاءة_الطاقة&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/taqa_sa_2019\/taqa_sa_2019.png&quot;,&quot;وزارة_الثقافة_السعودية&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MOCSaudi_2019\/MOCSaudi_2019.png&quot;,&quot;afghanatalan&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CricketWorldCup_2019_Teams_AfghanAtalan\/CricketWorldCup_2019_Teams_AfghanAtalan.png&quot;,&quot;thegoldfinch&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WB_TheGoldfinch_2019\/WB_TheGoldfinch_2019.png&quot;,&quot;令和ニッポンの未来&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/AbemaTV_2019\/AbemaTV_2019.png&quot;,&quot;dimuthkarunaratne&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/CricketWorldCup_2019_Players_DimuthKarunaratne\/CricketWorldCup_2019_Players_DimuthKarunaratne.png&quot;,&quot;thehaloway&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_LA\/MLB_2019_LA.png&quot;,&quot;lcs&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/LCS_2019_change\/LCS_2019_change.png&quot;,&quot;dontknowwhattodo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KPOP_BLACKPINK_2019\/KPOP_BLACKPINK_2019.png&quot;,&quot;booksmartbffs&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Booksmart_2019\/Booksmart_2019.png&quot;,&quot;princealiababwa&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_Aladdin_2019\/Disney_Aladdin_2019.png&quot;,&quot;orbis&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ORBIS_2019\/ORBIS_2019.png&quot;,&quot;shuri&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Shuri\/Avengers_Endgame_2019_Shuri.png&quot;,&quot;wastelandsuperhero&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Bethesda_RAGE2_2019\/Bethesda_RAGE2_2019.png&quot;,&quot;huaweip30&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Huawei_P30_2019\/Huawei_P30_2019.png&quot;,&quot;gohardgoknights&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NRL2019_GoHardGoKnights\/NRL2019_GoHardGoKnights.png&quot;,&quot;shopeebigramadhansale&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ShopeeRamadan_May_2019\/ShopeeRamadan_May_2019.png&quot;,&quot;semanaglobalami&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MediaInformationLiteracyWeeks_2018_GlobalMILWeeks\/MediaInformationLiteracyWeeks_2018_GlobalMILWeeks.png&quot;,&quot;feiticeiraescarlate&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_ScarletWitch\/Avengers_Endgame_2019_ScarletWitch.png&quot;,&quot;thor&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Thor\/Avengers_Endgame_2019_Thor.png&quot;,&quot;wakanda&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Okoye\/Avengers_Endgame_2019_Okoye.png&quot;,&quot;mymarksfave&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/PercyPig_2019\/PercyPig_2019.png&quot;,&quot;alleyesnorth&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/NBA_18_MIN\/NBA_18_MIN.png&quot;,&quot;корг&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Korg\/Avengers_Endgame_2019_Korg.png&quot;,&quot;그루트&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Groot\/Avengers_Endgame_2019_Groot.png&quot;,&quot;小火龙&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/WBPikachu_Charmander\/WBPikachu_Charmander.png&quot;,&quot;ramadhan&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Ramadan_2019\/Ramadan_2019.png&quot;,&quot;thehotzone&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/HotZone_NatGeoChannel_2019\/HotZone_NatGeoChannel_2019.png&quot;,&quot;festadopikachu&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Pikachu_Pokemon_PartnerUp_2019\/Pikachu_Pokemon_PartnerUp_2019.png&quot;,&quot;шерифву&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Disney_ToyStory4_Woody\/Disney_ToyStory4_Woody.png&quot;,&quot;korbolorbojeetbo&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/KolkataKnights_2019\/KolkataKnights_2019.png&quot;,&quot;avengers&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019\/Avengers_Endgame_2019.png&quot;,&quot;ドルフロに願いよ届け&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Japan_DreamsComeTrue_2019\/Japan_DreamsComeTrue_2019.png&quot;,&quot;kxip&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/IPL_2019_2_KXIP\/IPL_2019_2_KXIP.png&quot;,&quot;evropskévolby2019&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/EU_Election_2019\/EU_Election_2019.png&quot;,&quot;itcanwait&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/ITCanWait_2019\/ITCanWait_2019.png&quot;,&quot;ボスからtea&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Suntory_CraftBossTea\/Suntory_CraftBossTea.png&quot;,&quot;desde1869&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/MLB_2019_Cincinnati\/MLB_2019_Cincinnati.png&quot;,&quot;doctorstrange&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_DoctorStrange\/Avengers_Endgame_2019_DoctorStrange.png&quot;,&quot;웡&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Avengers_Endgame_2019_Wong\/Avengers_Endgame_2019_Wong.png&quot;,&quot;together_for_life&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Zamzam_2019\/Zamzam_2019.png&quot;,&quot;godzilla2&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/Godzilla_WB_2019\/Godzilla_WB_2019.png&quot;,&quot;magickingdom&quot;:&quot;https:\/\/abs.twimg.com\/hashflags\/DisneyParks_MickeyEars_Flight2\/DisneyParks_MickeyEars_Flight2.png&quot;},&quot;tweetId&quot;:&quot;1128068672289890305&quot;,&quot;profile_id&quot;:238475531,&quot;endpoint&quot;:&quot;\/i\/Metallica\/conversation\/1128068672289890305&quot;,&quot;overlayCapable&quot;:false,&quot;finagleTraceId&quot;:&quot;000c3ae1003af840&quot;,&quot;isThreaded&quot;:true,&quot;inOverlay&quot;:true,&quot;trendsCacheKey&quot;:null,&quot;decider_personalized_trends&quot;:false,&quot;trendsEndpoint&quot;:&quot;\/i\/trends&quot;,&quot;initialState&quot;:{&quot;title&quot;:&quot;Metallica en Twitter: \&quot;Thank you to everyone who came out for #MetInParis last night for helping us support @EMMAUSolidarite &amp; @PompiersParis. #AWMH #MetalicaGivesBack\u2026 https:\/\/t.co\/00ZbffUluP\&quot;&quot;,&quot;section&quot;:null,&quot;module&quot;:&quot;app\/pages\/permalink&quot;,&quot;cache_ttl&quot;:300,&quot;body_class_names&quot;:&quot;three-col logged-out user-style-Metallica western es PermalinkPage&quot;,&quot;doc_class_names&quot;:&quot;route-permalink&quot;,&quot;route_name&quot;:&quot;permalink&quot;,&quot;page_container_class_names&quot;:&quot;AppContent wrapper wrapper-permalink&quot;,&quot;ttft_navigation&quot;:false}}">
+</span><span class="r-18u37iz"><a dir="ltr" href="/hashtag/Metallica?src=hashtag_click" role="link" class="css-4rbku5 css-18t94o4 css-901oao css-16my406 r-1cvl2hr r-1loqt21 r-poiln3 r-bcqeeo r-qvutc0">#Metallica</a></span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0"> </span><span class="r-18u37iz"><a dir="ltr" href="/hashtag/M72?src=hashtag_click" role="link" class="css-4rbku5 css-18t94o4 css-901oao css-16my406 r-1cvl2hr r-1loqt21 r-poiln3 r-bcqeeo r-qvutc0">#M72</a></span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0"> </span><span class="r-18u37iz"><a dir="ltr" href="/hashtag/MetOnTour?src=hashtag_click" role="link" class="css-4rbku5 css-18t94o4 css-901oao css-16my406 r-1cvl2hr r-1loqt21 r-poiln3 r-bcqeeo r-qvutc0">#MetOnTour</a></span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0"> </span><span class="r-18u37iz"><a dir="ltr" href="/hashtag/DL20?src=hashtag_click" role="link" class="css-4rbku5 css-18t94o4 css-901oao css-16my406 r-1cvl2hr r-1loqt21 r-poiln3 r-bcqeeo r-qvutc0">#DL20</a></span>
+</div></div></div>
+<div aria-labelledby="id__cd9397h0xvu id__ebnmc84ddvr" class="css-1dbjc4n r-1ssbvtb r-1s2bzr4" id="id__xptwyy4gyvk"><div class="css-1dbjc4n r-9aw3ui"><div class="css-1dbjc4n"><div class="css-1dbjc4n r-1ets6dv r-1867qdf r-1phboty r-rs99b7 r-1ny4l3l r-1udh08x r-o7ynqc r-6416eg"><a href="/Metallica/status/1670883033954791424/mediaviewer" aria-label="Embedded video" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1ny4l3l r-o7ynqc r-6416eg" data-testid="tweet-media-video-interaction-link-1670883033954791424"><div class="css-1dbjc4n">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-1adg3ll r-pm9dpa r-1udh08x">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:56.25%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="Embedded video" class="css-1dbjc4n r-1awozwy r-1p0dtai r-1777fci r-1d2f490 r-u8s1d r-zchlnj r-ipm5af" data-testid="previewInterstitial">
+<div class="css-1dbjc4n r-1p0dtai r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af"><div aria-label="Embedded video" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/ext_tw_video_thumb/1670869246434504704/pu/img/C1oncFY5i-wmLSY7?format=jpg&amp;name=large")'></div>
+<img alt="Embedded video" draggable="true" src="https://pbs.twimg.com/ext_tw_video_thumb/1670869246434504704/pu/img/C1oncFY5i-wmLSY7?format=jpg&amp;name=large" class="css-9pa8cd">
+</div></div>
+<div class="css-1dbjc4n r-rki7wi r-18u37iz r-161ttwi r-633pao r-u8s1d">
+<div class="css-1dbjc4n r-1awozwy r-k200y r-loe9s5 r-6t5ypu r-zmljjp r-z2wwpe r-kicko2 r-t12b5v r-z80fyv r-1777fci r-a5pmau r-s1qlax r-633pao"><div dir="ltr" class="css-901oao r-jwli3a r-37j5jr r-n6v787 r-16dba41 r-1cwl3u0 r-bcqeeo r-q4m81j r-lrvibr r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">1:00</span></div></div>
+<div class="css-1dbjc4n r-1awozwy r-k200y r-loe9s5 r-pm2fo r-1dpl46z r-z2wwpe r-ou6ah9 r-notknq r-z80fyv r-1777fci r-s1qlax r-633pao"><div dir="ltr" class="css-901oao r-jwli3a r-37j5jr r-n6v787 r-16dba41 r-1cwl3u0 r-bcqeeo r-q4m81j r-lrvibr r-qvutc0">41.7K views</div></div>
+</div>
+<div aria-label="Play this video" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-l5o3uw r-11mg6pl r-sdzlij r-1phboty r-14f9gny r-e6wyp1 r-1ny4l3l r-o7ynqc r-6416eg r-1p15a4t" data-testid="playButton"><div class="css-1dbjc4n r-1awozwy r-1pi2tsx r-1777fci r-u8s1d r-13qz1uu"><svg viewbox="0 0 24 24" aria-hidden="true" class="r-jwli3a r-4qtqp9 r-yyyyoo r-1sa8knb r-dnmrzs r-1dsia8u r-bnwqim r-1plcrui r-lrvibr r-gcko2u"><g><path d="M21 12L4 2v20l17-10z"></path></g></svg></div></div>
+</div></div>
+</div></div>
+<div itemprop="video" itemscope="" itemtype="https://schema.org/VideoObject">
+<meta content="@Metallica's video Tweet" itemprop="name">
+<meta content="Embedded video" itemprop="description">
+<meta content="https://platform.twitter.com/embed/Tweet.html?dnt=false&amp;embedId=twitter-widget-1&amp;frame=false&amp;hideCard=false&amp;hideThread=false&amp;lang=en&amp;id=1670883033954791424" itemprop="embedUrl">
+<meta content="https://pbs.twimg.com/ext_tw_video_thumb/1670869246434504704/pu/img/C1oncFY5i-wmLSY7.jpg" itemprop="thumbnailUrl">
+<meta content="Embedded video" itemprop="caption">
+<meta content="2023-06-19T19:55:33.000Z" itemprop="uploadDate">
+<meta content="PT0H1M0S" itemprop="duration">
+</div>
+</div></a></div></div></div></div>
+<div class="css-1dbjc4n"><div aria-label="37 replies, 352 Retweets, 2296 likes" role="group" class="css-1dbjc4n r-1ta3fxp r-18u37iz r-1wtj0ep r-1s2bzr4 r-1mdbhws" id="id__wmn66a2741l">
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="37 Replies. Reply" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="reply"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M1.751 10c0-4.42 3.584-8 8.005-8h4.366c4.49 0 8.129 3.64 8.129 8.13 0 2.96-1.607 5.68-4.196 7.11l-8.054 4.46v-3.69h-.067c-4.49.1-8.183-3.51-8.183-8.01zm8.005-6c-3.317 0-6.005 2.69-6.005 6 0 3.37 2.77 6.08 6.138 6.01l.351-.01h1.761v2.3l5.087-2.81c1.951-1.08 3.163-3.13 3.163-5.36 0-3.39-2.744-6.13-6.129-6.13H9.756z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">37</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="352 Retweets. Retweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="retweet"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M4.5 3.88l4.432 4.14-1.364 1.46L5.5 7.55V16c0 1.1.896 2 2 2H13v2H7.5c-2.209 0-4-1.79-4-4V7.55L1.432 9.48.068 8.02 4.5 3.88zM16.5 6H11V4h5.5c2.209 0 4 1.79 4 4v8.45l2.068-1.93 1.364 1.46-4.432 4.14-4.432-4.14 1.364-1.46 2.068 1.93V8c0-1.1-.896-2-2-2z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">352</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="2296 Likes. Like" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="like"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M16.697 5.5c-1.222-.06-2.679.51-3.89 2.16l-.805 1.09-.806-1.09C9.984 6.01 8.526 5.44 7.304 5.5c-1.243.07-2.349.78-2.91 1.91-.552 1.12-.633 2.78.479 4.82 1.074 1.97 3.257 4.27 7.129 6.61 3.87-2.34 6.052-4.64 7.126-6.61 1.111-2.04 1.03-3.7.477-4.82-.561-1.13-1.666-1.84-2.908-1.91zm4.187 7.69c-1.351 2.48-4.001 5.12-8.379 7.67l-.503.3-.504-.3c-4.379-2.55-7.029-5.19-8.382-7.67-1.36-2.5-1.41-4.86-.514-6.67.887-1.79 2.647-2.91 4.601-3.01 1.651-.09 3.368.56 4.798 2.01 1.429-1.45 3.146-2.1 4.796-2.01 1.954.1 3.714 1.22 4.601 3.01.896 1.81.846 4.17-.514 6.67z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">2,296</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n" style="display:inline-grid;-webkit-justify-content:inherit;justify-content:inherit;-webkit-transform:rotate(0deg) scale(1) translate3d(0, 0, 0);transform:rotate(0deg) scale(1) translate3d(0, 0, 0);-ms-flex-pack:inherit;-webkit-box-pack:inherit"><div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="Share Tweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M12 2.59l5.7 5.7-1.41 1.42L13 6.41V16h-2V6.41l-3.3 3.3-1.41-1.42L12 2.59zM21 15l-.02 3.51c0 1.38-1.12 2.49-2.5 2.49H5.5C4.11 21 3 19.88 3 18.5V15h2v3.5c0 .28.22.5.5.5h12.98c.28 0 .5-.22.5-.5L19 15h2z"></path></g></svg>
+</div></div></div></div></div>
+</div></div>
+</div>
+</div>
+</div></div></article>
+</div></div>
+<div class="css-1dbjc4n r-j5o65s r-qklmqi r-1adg3ll r-1ny4l3l"><div itemprop="hasPart" itemscope="" itemtype="https://schema.org/SocialMediaPosting">
+<meta content="1670325471379169280" itemprop="identifier">
+<meta content="10" itemprop="position">
+<meta content="39" itemprop="commentCount">
+<meta content="" itemprop="contentRating">
+<meta content="2023-06-18T07:00:00.000Z" itemprop="dateCreated">
+<meta content="2023-06-18T07:00:00.000Z" itemprop="datePublished">
+<meta content="https://twitter.com/Metallica/status/1670325471379169280" itemprop="url">
+<div itemprop="author" itemscope="" itemtype="https://schema.org/Person">
+<meta content="238475531" itemprop="identifier">
+<meta content="Metallica" itemprop="additionalName">
+<meta content="Metallica" itemprop="givenName">
+</div>
+<div itemprop="sharedContent" itemscope="" itemtype="https://schema.org/CreativeWork">
+<meta content="Expanded Tweet URLs" itemprop="name">
+<meta content="https://t.co/ThDPnKJkdk" itemprop="url">
+<meta content="https://twitter.com/Metallica/status/1670325471379169280/photo/1" itemprop="url">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/LikeAction" itemprop="interactionType">
+<meta content="Likes" itemprop="name">
+<meta content="https://twitter.com/Metallica/status/1670325471379169280/likes" itemprop="url">
+<meta content="1693" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Retweets" itemprop="name">
+<meta content="https://twitter.com/Metallica/status/1670325471379169280/retweets" itemprop="url">
+<meta content="151" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Quotes" itemprop="name">
+<meta content="https://twitter.com/Metallica/status/1670325471379169280/retweets/with_comments" itemprop="url">
+<meta content="6" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Replies" itemprop="name">
+<meta content="https://twitter.com/Metallica/status/1670325471379169280" itemprop="url">
+<meta content="39" itemprop="userInteractionCount">
+</div>
+<article aria-labelledby="id__nwm98f1a4q id__mxymsha6hnf id__5ycjj3yqpdw id__flam2r3m45n id__7oeedbz3gg6 id__ncu1hmpuec9 id__dqmbpavum3j id__nb1cpzis8z id__1o4vb27wjmy id__7sw98pfn9ig id__nsb5llyukr id__988rlf9keq7 id__ayqu6i8xht id__r3j21gfnej id__52g4und8t3g id__wtpp006dd5p id__idqceuy6uc id__vgc8mb2zfl id__la8mmm1chat" role="article" tabindex="-1" class="css-1dbjc4n r-18u37iz r-1ny4l3l r-1udh08x r-1qhn6m8 r-i023vh" data-testid="tweet"><div class="css-1dbjc4n r-eqz5dr r-16y2uox r-1wbh5a2"><div class="css-1dbjc4n r-16y2uox r-1wbh5a2 r-1ny4l3l">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-18u37iz"><div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-ttdzmv"></div></div></div>
+<div class="css-1dbjc4n r-18u37iz">
+<div class="css-1dbjc4n r-1awozwy r-1hwvwag r-18kxxzh r-1b7u577"><div class="css-1dbjc4n" data-testid="Tweet-User-Avatar"><div class="css-1dbjc4n r-18kxxzh r-1wbh5a2 r-13qz1uu"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1adg3ll r-h3s6tt r-bztko3" style="width:48px" data-testid="UserAvatar-Container-Metallica">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-1adg3ll r-1pi2tsx r-1wyvozj r-bztko3 r-u8s1d r-1v2oles r-desppf r-13qz1uu">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-ggadg3 r-u8s1d r-8jfcpp" style="-webkit-clip-path:url(#shape-square);clip-path:url(#shape-square);height:calc(100% - -4px);width:calc(100% - -4px)"><a href="/Metallica" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1niwhzg r-1loqt21 r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"><div class="css-1dbjc4n r-1wyvozj r-633pao r-u8s1d r-1v2oles r-desppf" style="-webkit-clip-path:url(#shape-square);clip-path:url(#shape-square);height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1niwhzg r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-1wyvozj r-633pao r-u8s1d r-1v2oles r-desppf" style="-webkit-clip-path:url(#shape-square-rx-8);clip-path:url(#shape-square-rx-8);height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-14lw9ot r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-14lw9ot r-1wyvozj r-633pao r-u8s1d r-1v2oles r-desppf" style="-webkit-clip-path:url(#shape-square-rx-8);clip-path:url(#shape-square-rx-8);height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1adg3ll r-1udh08x" style="background-color:rgba(185,202,211,1.00)">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="Square profile picture" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/profile_images/1597280886809952256/gsJvGiqU_400x400.jpg")'></div>
+<img alt="Square profile picture" draggable="true" src="https://pbs.twimg.com/profile_images/1597280886809952256/gsJvGiqU_400x400.jpg" class="css-9pa8cd">
+</div></div>
+</div></div>
+<div class="css-1dbjc4n r-1wyvozj r-u8s1d r-1v2oles r-desppf" style="-webkit-clip-path:url(#shape-square-rx-8);clip-path:url(#shape-square-rx-8);height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-12181gd r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"></div></div></a></div></div>
+</div></div>
+</div></div></div></div></div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-1777fci r-kzbkwu">
+<div class="css-1dbjc4n r-zl2h9q"><div class="css-1dbjc4n r-k4xj1c r-18u37iz r-1wtj0ep"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs r-1ny4l3l" id="id__7oeedbz3gg6" data-testid="User-Name">
+<div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/Metallica" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs">
+<div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-37j5jr r-a023e6 r-b88u0q r-rjixqe r-bcqeeo r-1udh08x r-3s2u2q r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Metallica</span></span></div>
+<div dir="ltr" class="css-901oao r-xoduu5 r-18u37iz r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 r-1awozwy r-xoduu5 r-poiln3 r-bcqeeo r-qvutc0"><svg viewbox="0 0 22 22" aria-label="Verified account" role="img" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-9cviqr r-f9ja8p r-og9te1 r-bnwqim r-1plcrui r-lrvibr" data-testid="icon-verified"><g><lineargradient gradientunits="userSpaceOnUse" id="18692-a" x1="4.411" x2="18.083" y1="2.495" y2="21.508"><stop offset="0" stop-color="#f4e72a"></stop><stop offset=".539" stop-color="#cd8105"></stop><stop offset=".68" stop-color="#cb7b00"></stop><stop offset="1" stop-color="#f4ec26"></stop><stop offset="1" stop-color="#f4e72a"></stop></lineargradient><lineargradient gradientunits="userSpaceOnUse" id="18692-b" x1="5.355" x2="16.361" y1="3.395" y2="19.133"><stop offset="0" stop-color="#f9e87f"></stop><stop offset=".406" stop-color="#e2b719"></stop><stop offset=".989" stop-color="#e2b719"></stop></lineargradient><g clip-rule="evenodd" fill-rule="evenodd"><path d="M13.324 3.848L11 1.6 8.676 3.848l-3.201-.453-.559 3.184L2.06 8.095 3.48 11l-1.42 2.904 2.856 1.516.559 3.184 3.201-.452L11 20.4l2.324-2.248 3.201.452.559-3.184 2.856-1.516L18.52 11l1.42-2.905-2.856-1.516-.559-3.184zm-7.09 7.575l3.428 3.428 5.683-6.206-1.347-1.247-4.4 4.795-2.072-2.072z" fill="url(#18692-a)"></path><path d="M13.101 4.533L11 2.5 8.899 4.533l-2.895-.41-.505 2.88-2.583 1.37L4.2 11l-1.284 2.627 2.583 1.37.505 2.88 2.895-.41L11 19.5l2.101-2.033 2.895.41.505-2.88 2.583-1.37L17.8 11l1.284-2.627-2.583-1.37-.505-2.88zm-6.868 6.89l3.429 3.428 5.683-6.206-1.347-1.247-4.4 4.795-2.072-2.072z" fill="url(#18692-b)"></path><path d="M6.233 11.423l3.429 3.428 5.65-6.17.038-.033-.005 1.398-5.683 6.206-3.429-3.429-.003-1.405.005.003z" fill="#d18800"></path></g></g></svg></span></div>
+</div></a></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1wbh5a2 r-13hce6t"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2">
+<div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/Metallica" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div dir="ltr" class="css-901oao css-1hf3ou5 r-14j79pv r-18u37iz r-37j5jr r-1wvb978 r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">@Metallica</span></div></a></div>
+<div dir="ltr" aria-hidden="true" class="css-901oao r-14j79pv r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-s1qlax r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">·</span></div>
+<div class="css-1dbjc4n r-18u37iz r-1q142lx"><a href="/Metallica/status/1670325471379169280" dir="ltr" aria-label="Jun 18" role="link" class="css-4rbku5 css-18t94o4 css-901oao r-14j79pv r-1loqt21 r-xoduu5 r-1q142lx r-1w6e6rj r-37j5jr r-a023e6 r-16dba41 r-9aw3ui r-rjixqe r-bcqeeo r-3s2u2q r-qvutc0"><time datetime="2023-06-18T07:00:00.000Z">Jun 18</time></a></div>
+</div></div>
+</div></div></div></div></div>
+<div itemprop="articleBody" data-testid="tweetTextAnnotations"><div class="css-1dbjc4n"><div dir="auto" lang="en" class="css-901oao r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-bnwqim r-qvutc0" style="color:rgba(15,20,25,1.00)" id="id__nsb5llyukr" data-testid="tweetText">
+<span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">🇸🇪</span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0"> TONIGHT </span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">🇸🇪</span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">
 
+The final </span><span class="r-18u37iz"><a dir="ltr" href="/hashtag/M72?src=hashtag_click" role="link" class="css-4rbku5 css-18t94o4 css-901oao css-16my406 r-1cvl2hr r-1loqt21 r-poiln3 r-bcqeeo r-qvutc0">#M72</a></span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0"> show in Europe for 2023! We’ll pick things back up in North America in August, &amp; return to Europe in May 2024.
 
+Show us what you've been up to with </span><span class="r-18u37iz"><a dir="ltr" href="/hashtag/M72Gothenburg?src=hashtag_click" role="link" class="css-4rbku5 css-18t94o4 css-901oao css-16my406 r-1cvl2hr r-1loqt21 r-poiln3 r-bcqeeo r-qvutc0">#M72Gothenburg</a></span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">.
 
-    <input type="hidden" class="swift-boot-module" value="app/pages/permalink">
-  <input type="hidden" id="swift-module-path" value="https://abs.twimg.com/k/swift/es">
+Posters by </span><div class="css-1dbjc4n r-xoduu5"><span class="r-18u37iz"><a dir="ltr" href="/milestsang" role="link" class="css-4rbku5 css-18t94o4 css-901oao css-16my406 r-1cvl2hr r-1loqt21 r-poiln3 r-bcqeeo r-qvutc0">@milestsang</a></span></div>
+<span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0"> from both shows are only available for purchase at the venue.</span>
+</div></div></div>
+<div aria-labelledby="id__zbi2vw826pr id__pbuv2ciw9j" class="css-1dbjc4n r-1ssbvtb r-1s2bzr4" id="id__ayqu6i8xht"><div class="css-1dbjc4n r-9aw3ui"><div class="css-1dbjc4n"><div class="css-1dbjc4n r-1ets6dv r-1867qdf r-1phboty r-rs99b7 r-1ny4l3l r-1udh08x r-o7ynqc r-6416eg">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-16y2uox r-1pi2tsx r-13qz1uu"><div role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1pi2tsx r-1ny4l3l"><div class="css-1dbjc4n r-1adg3ll r-1udh08x">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="Image" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010" data-testid="tweetPhoto">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/media/Fy2dKRBagAAINZH?format=jpg&amp;name=4096x4096")'></div>
+<img alt="Image" draggable="true" src="https://pbs.twimg.com/media/Fy2dKRBagAAINZH?format=jpg&amp;name=4096x4096" class="css-9pa8cd">
+</div></div>
+</div></div></div></div>
+<div itemprop="image" itemscope="" itemtype="https://schema.org/ImageObject">
+<meta content="Image" itemprop="caption">
+<meta content="https://pbs.twimg.com/media/Fy2dKRBagAAINZH.jpg" itemprop="contentUrl">
+<meta content="https://pbs.twimg.com/media/Fy2dKRBagAAINZH?format=jpg&amp;name=thumb" itemprop="thumbnailUrl">
+<meta content="3600" itemprop="width">
+<meta content="" itemprop="contentRating">
+</div>
+</div></div></div></div>
+<div class="css-1dbjc4n"><div aria-label="39 replies, 157 Retweets, 1693 likes" role="group" class="css-1dbjc4n r-1ta3fxp r-18u37iz r-1wtj0ep r-1s2bzr4 r-1mdbhws" id="id__la8mmm1chat">
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="39 Replies. Reply" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="reply"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M1.751 10c0-4.42 3.584-8 8.005-8h4.366c4.49 0 8.129 3.64 8.129 8.13 0 2.96-1.607 5.68-4.196 7.11l-8.054 4.46v-3.69h-.067c-4.49.1-8.183-3.51-8.183-8.01zm8.005-6c-3.317 0-6.005 2.69-6.005 6 0 3.37 2.77 6.08 6.138 6.01l.351-.01h1.761v2.3l5.087-2.81c1.951-1.08 3.163-3.13 3.163-5.36 0-3.39-2.744-6.13-6.129-6.13H9.756z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">39</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="157 Retweets. Retweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="retweet"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M4.5 3.88l4.432 4.14-1.364 1.46L5.5 7.55V16c0 1.1.896 2 2 2H13v2H7.5c-2.209 0-4-1.79-4-4V7.55L1.432 9.48.068 8.02 4.5 3.88zM16.5 6H11V4h5.5c2.209 0 4 1.79 4 4v8.45l2.068-1.93 1.364 1.46-4.432 4.14-4.432-4.14 1.364-1.46 2.068 1.93V8c0-1.1-.896-2-2-2z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">157</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="1693 Likes. Like" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="like"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M16.697 5.5c-1.222-.06-2.679.51-3.89 2.16l-.805 1.09-.806-1.09C9.984 6.01 8.526 5.44 7.304 5.5c-1.243.07-2.349.78-2.91 1.91-.552 1.12-.633 2.78.479 4.82 1.074 1.97 3.257 4.27 7.129 6.61 3.87-2.34 6.052-4.64 7.126-6.61 1.111-2.04 1.03-3.7.477-4.82-.561-1.13-1.666-1.84-2.908-1.91zm4.187 7.69c-1.351 2.48-4.001 5.12-8.379 7.67l-.503.3-.504-.3c-4.379-2.55-7.029-5.19-8.382-7.67-1.36-2.5-1.41-4.86-.514-6.67.887-1.79 2.647-2.91 4.601-3.01 1.651-.09 3.368.56 4.798 2.01 1.429-1.45 3.146-2.1 4.796-2.01 1.954.1 3.714 1.22 4.601 3.01.896 1.81.846 4.17-.514 6.67z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">1,693</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n" style="display:inline-grid;-webkit-justify-content:inherit;justify-content:inherit;-webkit-transform:rotate(0deg) scale(1) translate3d(0, 0, 0);transform:rotate(0deg) scale(1) translate3d(0, 0, 0);-ms-flex-pack:inherit;-webkit-box-pack:inherit"><div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="Share Tweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M12 2.59l5.7 5.7-1.41 1.42L13 6.41V16h-2V6.41l-3.3 3.3-1.41-1.42L12 2.59zM21 15l-.02 3.51c0 1.38-1.12 2.49-2.5 2.49H5.5C4.11 21 3 19.88 3 18.5V15h2v3.5c0 .28.22.5.5.5h12.98c.28 0 .5-.22.5-.5L19 15h2z"></path></g></svg>
+</div></div></div></div></div>
+</div></div>
+</div>
+</div>
+</div></div></article>
+</div></div>
+<div class="css-1dbjc4n r-j5o65s r-qklmqi r-1adg3ll r-1ny4l3l"><div itemprop="hasPart" itemscope="" itemtype="https://schema.org/SocialMediaPosting">
+<meta content="1671246544035610627" itemprop="identifier">
+<meta content="11" itemprop="position">
+<meta content="25" itemprop="commentCount">
+<meta content="" itemprop="contentRating">
+<meta content="2023-06-20T20:00:01.000Z" itemprop="dateCreated">
+<meta content="2023-06-20T20:00:01.000Z" itemprop="datePublished">
+<meta content="https://twitter.com/Metallica/status/1671246544035610627" itemprop="url">
+<div itemprop="author" itemscope="" itemtype="https://schema.org/Person">
+<meta content="238475531" itemprop="identifier">
+<meta content="Metallica" itemprop="additionalName">
+<meta content="Metallica" itemprop="givenName">
+</div>
+<div itemprop="sharedContent" itemscope="" itemtype="https://schema.org/CreativeWork">
+<meta content="Expanded Tweet URLs" itemprop="name">
+<meta content="https://t.co/2aoeiuOIr4" itemprop="url">
+<meta content="http://youtu.be/BWug_HXBXKg" itemprop="url">
+<meta content="https://t.co/Y88XIqAZ6t" itemprop="url">
+<meta content="http://metallica.lnk.to/LiveInDonington2023Night2" itemprop="url">
+<meta content="https://t.co/NBomonxWcg" itemprop="url">
+<meta content="https://twitter.com/Metallica/status/1671246544035610627/video/1" itemprop="url">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/LikeAction" itemprop="interactionType">
+<meta content="Likes" itemprop="name">
+<meta content="https://twitter.com/Metallica/status/1671246544035610627/likes" itemprop="url">
+<meta content="1522" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Retweets" itemprop="name">
+<meta content="https://twitter.com/Metallica/status/1671246544035610627/retweets" itemprop="url">
+<meta content="232" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Quotes" itemprop="name">
+<meta content="https://twitter.com/Metallica/status/1671246544035610627/retweets/with_comments" itemprop="url">
+<meta content="21" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Replies" itemprop="name">
+<meta content="https://twitter.com/Metallica/status/1671246544035610627" itemprop="url">
+<meta content="25" itemprop="userInteractionCount">
+</div>
+<article aria-labelledby="id__nuhay6zpmm id__yfxq5j5d5s id__6wpi67f7yem id__ham3r15rlsc id__of6rfcaos3 id__ypw5jb1oiq id__98zo6liekq4 id__bdxqcun0zkr id__xmkcci47izb id__nwbuk3xiu3k id__lmbosmqekb id__vcp9bak88x id__llxphgyigi id__a42k37vycx id__j7fx3kv2ays id__lphjcngfb9 id__w164xjnh61c id__41gqe8k0p24 id__llqmz6w7dwr" role="article" tabindex="-1" class="css-1dbjc4n r-18u37iz r-1ny4l3l r-1udh08x r-1qhn6m8 r-i023vh" data-testid="tweet"><div class="css-1dbjc4n r-eqz5dr r-16y2uox r-1wbh5a2"><div class="css-1dbjc4n r-16y2uox r-1wbh5a2 r-1ny4l3l">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-18u37iz"><div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-ttdzmv"></div></div></div>
+<div class="css-1dbjc4n r-18u37iz">
+<div class="css-1dbjc4n r-1awozwy r-1hwvwag r-18kxxzh r-1b7u577"><div class="css-1dbjc4n" data-testid="Tweet-User-Avatar"><div class="css-1dbjc4n r-18kxxzh r-1wbh5a2 r-13qz1uu"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1adg3ll r-h3s6tt r-bztko3" style="width:48px" data-testid="UserAvatar-Container-Metallica">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-1adg3ll r-1pi2tsx r-1wyvozj r-bztko3 r-u8s1d r-1v2oles r-desppf r-13qz1uu">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-ggadg3 r-u8s1d r-8jfcpp" style="-webkit-clip-path:url(#shape-square);clip-path:url(#shape-square);height:calc(100% - -4px);width:calc(100% - -4px)"><a href="/Metallica" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1niwhzg r-1loqt21 r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"><div class="css-1dbjc4n r-1wyvozj r-633pao r-u8s1d r-1v2oles r-desppf" style="-webkit-clip-path:url(#shape-square);clip-path:url(#shape-square);height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1niwhzg r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-1wyvozj r-633pao r-u8s1d r-1v2oles r-desppf" style="-webkit-clip-path:url(#shape-square-rx-8);clip-path:url(#shape-square-rx-8);height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-14lw9ot r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-14lw9ot r-1wyvozj r-633pao r-u8s1d r-1v2oles r-desppf" style="-webkit-clip-path:url(#shape-square-rx-8);clip-path:url(#shape-square-rx-8);height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1adg3ll r-1udh08x" style="background-color:rgba(185,202,211,1.00)">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="Square profile picture" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/profile_images/1597280886809952256/gsJvGiqU_400x400.jpg")'></div>
+<img alt="Square profile picture" draggable="true" src="https://pbs.twimg.com/profile_images/1597280886809952256/gsJvGiqU_400x400.jpg" class="css-9pa8cd">
+</div></div>
+</div></div>
+<div class="css-1dbjc4n r-1wyvozj r-u8s1d r-1v2oles r-desppf" style="-webkit-clip-path:url(#shape-square-rx-8);clip-path:url(#shape-square-rx-8);height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-12181gd r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"></div></div></a></div></div>
+</div></div>
+</div></div></div></div></div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-1777fci r-kzbkwu">
+<div class="css-1dbjc4n r-zl2h9q"><div class="css-1dbjc4n r-k4xj1c r-18u37iz r-1wtj0ep"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs r-1ny4l3l" id="id__of6rfcaos3" data-testid="User-Name">
+<div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/Metallica" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs">
+<div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-37j5jr r-a023e6 r-b88u0q r-rjixqe r-bcqeeo r-1udh08x r-3s2u2q r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Metallica</span></span></div>
+<div dir="ltr" class="css-901oao r-xoduu5 r-18u37iz r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 r-1awozwy r-xoduu5 r-poiln3 r-bcqeeo r-qvutc0"><svg viewbox="0 0 22 22" aria-label="Verified account" role="img" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-9cviqr r-f9ja8p r-og9te1 r-bnwqim r-1plcrui r-lrvibr" data-testid="icon-verified"><g><lineargradient gradientunits="userSpaceOnUse" id="18693-a" x1="4.411" x2="18.083" y1="2.495" y2="21.508"><stop offset="0" stop-color="#f4e72a"></stop><stop offset=".539" stop-color="#cd8105"></stop><stop offset=".68" stop-color="#cb7b00"></stop><stop offset="1" stop-color="#f4ec26"></stop><stop offset="1" stop-color="#f4e72a"></stop></lineargradient><lineargradient gradientunits="userSpaceOnUse" id="18693-b" x1="5.355" x2="16.361" y1="3.395" y2="19.133"><stop offset="0" stop-color="#f9e87f"></stop><stop offset=".406" stop-color="#e2b719"></stop><stop offset=".989" stop-color="#e2b719"></stop></lineargradient><g clip-rule="evenodd" fill-rule="evenodd"><path d="M13.324 3.848L11 1.6 8.676 3.848l-3.201-.453-.559 3.184L2.06 8.095 3.48 11l-1.42 2.904 2.856 1.516.559 3.184 3.201-.452L11 20.4l2.324-2.248 3.201.452.559-3.184 2.856-1.516L18.52 11l1.42-2.905-2.856-1.516-.559-3.184zm-7.09 7.575l3.428 3.428 5.683-6.206-1.347-1.247-4.4 4.795-2.072-2.072z" fill="url(#18693-a)"></path><path d="M13.101 4.533L11 2.5 8.899 4.533l-2.895-.41-.505 2.88-2.583 1.37L4.2 11l-1.284 2.627 2.583 1.37.505 2.88 2.895-.41L11 19.5l2.101-2.033 2.895.41.505-2.88 2.583-1.37L17.8 11l1.284-2.627-2.583-1.37-.505-2.88zm-6.868 6.89l3.429 3.428 5.683-6.206-1.347-1.247-4.4 4.795-2.072-2.072z" fill="url(#18693-b)"></path><path d="M6.233 11.423l3.429 3.428 5.65-6.17.038-.033-.005 1.398-5.683 6.206-3.429-3.429-.003-1.405.005.003z" fill="#d18800"></path></g></g></svg></span></div>
+</div></a></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1wbh5a2 r-13hce6t"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2">
+<div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/Metallica" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div dir="ltr" class="css-901oao css-1hf3ou5 r-14j79pv r-18u37iz r-37j5jr r-1wvb978 r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">@Metallica</span></div></a></div>
+<div dir="ltr" aria-hidden="true" class="css-901oao r-14j79pv r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-s1qlax r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">·</span></div>
+<div class="css-1dbjc4n r-18u37iz r-1q142lx"><a href="/Metallica/status/1671246544035610627" dir="ltr" aria-label="6 hours ago" role="link" class="css-4rbku5 css-18t94o4 css-901oao r-14j79pv r-1loqt21 r-xoduu5 r-1q142lx r-1w6e6rj r-37j5jr r-a023e6 r-16dba41 r-9aw3ui r-rjixqe r-bcqeeo r-3s2u2q r-qvutc0"><time datetime="2023-06-20T20:00:01.000Z">6h</time></a></div>
+</div></div>
+</div></div></div></div></div>
+<div itemprop="articleBody" data-testid="tweetTextAnnotations"><div class="css-1dbjc4n"><div dir="auto" lang="en" class="css-901oao r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-bnwqim r-qvutc0" style="color:rgba(15,20,25,1.00)" id="id__lmbosmqekb" data-testid="tweetText">
+<span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">“Now the world is gone, I’m just one…” </span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">🏴󠁧󠁢󠁥󠁮󠁧󠁿</span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0"> </span><span class="r-18u37iz"><a dir="ltr" href="/hashtag/M72Donington?src=hashtag_click" role="link" class="css-4rbku5 css-18t94o4 css-901oao css-16my406 r-1cvl2hr r-1loqt21 r-poiln3 r-bcqeeo r-qvutc0">#M72Donington</a></span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0"> Night 2
 
+Watch the Full Video </span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">⚡</span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0"> </span><a dir="ltr" href="https://t.co/2aoeiuOIr4" rel="noopener noreferrer nofollow" target="_blank" role="link" class="css-4rbku5 css-18t94o4 css-901oao css-16my406 r-1cvl2hr r-1loqt21 r-poiln3 r-bcqeeo r-qvutc0"><span aria-hidden="true" class="css-901oao css-16my406 r-poiln3 r-hiw28u r-qvk6io r-bcqeeo r-qvutc0">http://</span>youtu.be/BWug_HXBXKg</a><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">
 
-    <script src="https://abs.twimg.com/k/es/init.es.385f8696ec56dc29cfc0.js" async></script>
+Listen to the Full Show </span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">🎧</span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0"> </span><a dir="ltr" href="https://t.co/Y88XIqAZ6t" rel="noopener noreferrer nofollow" target="_blank" role="link" class="css-4rbku5 css-18t94o4 css-901oao css-16my406 r-1cvl2hr r-1loqt21 r-poiln3 r-bcqeeo r-qvutc0"><span aria-hidden="true" class="css-901oao css-16my406 r-poiln3 r-hiw28u r-qvk6io r-bcqeeo r-qvutc0">http://</span>metallica.lnk.to/LiveInDoningto<span aria-hidden="true" class="css-901oao css-16my406 r-poiln3 r-hiw28u r-qvk6io r-bcqeeo r-qvutc0">n2023Night2</span><span aria-hidden="true" class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-lrvibr r-qvutc0">…</span></a><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">
 
-  </body>
-</html>
+</span><span class="r-18u37iz"><a dir="ltr" href="/hashtag/Metallica?src=hashtag_click" role="link" class="css-4rbku5 css-18t94o4 css-901oao css-16my406 r-1cvl2hr r-1loqt21 r-poiln3 r-bcqeeo r-qvutc0">#Metallica</a></span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0"> </span><span class="r-18u37iz"><a dir="ltr" href="/hashtag/M72?src=hashtag_click" role="link" class="css-4rbku5 css-18t94o4 css-901oao css-16my406 r-1cvl2hr r-1loqt21 r-poiln3 r-bcqeeo r-qvutc0">#M72</a></span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0"> </span><span class="r-18u37iz"><a dir="ltr" href="/hashtag/MetOnTour?src=hashtag_click" role="link" class="css-4rbku5 css-18t94o4 css-901oao css-16my406 r-1cvl2hr r-1loqt21 r-poiln3 r-bcqeeo r-qvutc0">#MetOnTour</a></span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0"> </span><span class="r-18u37iz"><a dir="ltr" href="/hashtag/DL20?src=hashtag_click" role="link" class="css-4rbku5 css-18t94o4 css-901oao css-16my406 r-1cvl2hr r-1loqt21 r-poiln3 r-bcqeeo r-qvutc0">#DL20</a></span>
+</div></div></div>
+<div aria-labelledby="id__w2fq2kb2aua id__pbm0lik7xj9" class="css-1dbjc4n r-1ssbvtb r-1s2bzr4" id="id__llxphgyigi"><div class="css-1dbjc4n r-9aw3ui"><div class="css-1dbjc4n"><div class="css-1dbjc4n r-1ets6dv r-1867qdf r-1phboty r-rs99b7 r-1ny4l3l r-1udh08x r-o7ynqc r-6416eg"><a href="/Metallica/status/1671246544035610627/mediaviewer" aria-label="Embedded video" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1ny4l3l r-o7ynqc r-6416eg" data-testid="tweet-media-video-interaction-link-1671246544035610627"><div class="css-1dbjc4n">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-1adg3ll r-pm9dpa r-1udh08x">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:56.25%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="Embedded video" class="css-1dbjc4n r-1awozwy r-1p0dtai r-1777fci r-1d2f490 r-u8s1d r-zchlnj r-ipm5af" data-testid="previewInterstitial">
+<div class="css-1dbjc4n r-1p0dtai r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af"><div aria-label="Embedded video" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/ext_tw_video_thumb/1671215998647832576/pu/img/u_TB-J3wjdFUe5WM?format=jpg&amp;name=large")'></div>
+<img alt="Embedded video" draggable="true" src="https://pbs.twimg.com/ext_tw_video_thumb/1671215998647832576/pu/img/u_TB-J3wjdFUe5WM?format=jpg&amp;name=large" class="css-9pa8cd">
+</div></div>
+<div class="css-1dbjc4n r-rki7wi r-18u37iz r-161ttwi r-633pao r-u8s1d">
+<div class="css-1dbjc4n r-1awozwy r-k200y r-loe9s5 r-6t5ypu r-zmljjp r-z2wwpe r-kicko2 r-t12b5v r-z80fyv r-1777fci r-a5pmau r-s1qlax r-633pao"><div dir="ltr" class="css-901oao r-jwli3a r-37j5jr r-n6v787 r-16dba41 r-1cwl3u0 r-bcqeeo r-q4m81j r-lrvibr r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">1:00</span></div></div>
+<div class="css-1dbjc4n r-1awozwy r-k200y r-loe9s5 r-pm2fo r-1dpl46z r-z2wwpe r-ou6ah9 r-notknq r-z80fyv r-1777fci r-s1qlax r-633pao"><div dir="ltr" class="css-901oao r-jwli3a r-37j5jr r-n6v787 r-16dba41 r-1cwl3u0 r-bcqeeo r-q4m81j r-lrvibr r-qvutc0">23K views</div></div>
+</div>
+<div aria-label="Play this video" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-l5o3uw r-11mg6pl r-sdzlij r-1phboty r-14f9gny r-e6wyp1 r-1ny4l3l r-o7ynqc r-6416eg r-1p15a4t" data-testid="playButton"><div class="css-1dbjc4n r-1awozwy r-1pi2tsx r-1777fci r-u8s1d r-13qz1uu"><svg viewbox="0 0 24 24" aria-hidden="true" class="r-jwli3a r-4qtqp9 r-yyyyoo r-1sa8knb r-dnmrzs r-1dsia8u r-bnwqim r-1plcrui r-lrvibr r-gcko2u"><g><path d="M21 12L4 2v20l17-10z"></path></g></svg></div></div>
+</div></div>
+</div></div>
+<div itemprop="video" itemscope="" itemtype="https://schema.org/VideoObject">
+<meta content="@Metallica's video Tweet" itemprop="name">
+<meta content="Embedded video" itemprop="description">
+<meta content="https://platform.twitter.com/embed/Tweet.html?dnt=false&amp;embedId=twitter-widget-1&amp;frame=false&amp;hideCard=false&amp;hideThread=false&amp;lang=en&amp;id=1671246544035610627" itemprop="embedUrl">
+<meta content="https://pbs.twimg.com/ext_tw_video_thumb/1671215998647832576/pu/img/u_TB-J3wjdFUe5WM.jpg" itemprop="thumbnailUrl">
+<meta content="Embedded video" itemprop="caption">
+<meta content="2023-06-20T20:00:01.000Z" itemprop="uploadDate">
+<meta content="PT0H1M0S" itemprop="duration">
+</div>
+</div></a></div></div></div></div>
+<div class="css-1dbjc4n"><div aria-label="25 replies, 253 Retweets, 1522 likes" role="group" class="css-1dbjc4n r-1ta3fxp r-18u37iz r-1wtj0ep r-1s2bzr4 r-1mdbhws" id="id__llqmz6w7dwr">
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="25 Replies. Reply" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="reply"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M1.751 10c0-4.42 3.584-8 8.005-8h4.366c4.49 0 8.129 3.64 8.129 8.13 0 2.96-1.607 5.68-4.196 7.11l-8.054 4.46v-3.69h-.067c-4.49.1-8.183-3.51-8.183-8.01zm8.005-6c-3.317 0-6.005 2.69-6.005 6 0 3.37 2.77 6.08 6.138 6.01l.351-.01h1.761v2.3l5.087-2.81c1.951-1.08 3.163-3.13 3.163-5.36 0-3.39-2.744-6.13-6.129-6.13H9.756z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">25</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="253 Retweets. Retweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="retweet"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M4.5 3.88l4.432 4.14-1.364 1.46L5.5 7.55V16c0 1.1.896 2 2 2H13v2H7.5c-2.209 0-4-1.79-4-4V7.55L1.432 9.48.068 8.02 4.5 3.88zM16.5 6H11V4h5.5c2.209 0 4 1.79 4 4v8.45l2.068-1.93 1.364 1.46-4.432 4.14-4.432-4.14 1.364-1.46 2.068 1.93V8c0-1.1-.896-2-2-2z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">253</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="1522 Likes. Like" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="like"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M16.697 5.5c-1.222-.06-2.679.51-3.89 2.16l-.805 1.09-.806-1.09C9.984 6.01 8.526 5.44 7.304 5.5c-1.243.07-2.349.78-2.91 1.91-.552 1.12-.633 2.78.479 4.82 1.074 1.97 3.257 4.27 7.129 6.61 3.87-2.34 6.052-4.64 7.126-6.61 1.111-2.04 1.03-3.7.477-4.82-.561-1.13-1.666-1.84-2.908-1.91zm4.187 7.69c-1.351 2.48-4.001 5.12-8.379 7.67l-.503.3-.504-.3c-4.379-2.55-7.029-5.19-8.382-7.67-1.36-2.5-1.41-4.86-.514-6.67.887-1.79 2.647-2.91 4.601-3.01 1.651-.09 3.368.56 4.798 2.01 1.429-1.45 3.146-2.1 4.796-2.01 1.954.1 3.714 1.22 4.601 3.01.896 1.81.846 4.17-.514 6.67z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">1,522</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n" style="display:inline-grid;-webkit-justify-content:inherit;justify-content:inherit;-webkit-transform:rotate(0deg) scale(1) translate3d(0, 0, 0);transform:rotate(0deg) scale(1) translate3d(0, 0, 0);-ms-flex-pack:inherit;-webkit-box-pack:inherit"><div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="Share Tweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M12 2.59l5.7 5.7-1.41 1.42L13 6.41V16h-2V6.41l-3.3 3.3-1.41-1.42L12 2.59zM21 15l-.02 3.51c0 1.38-1.12 2.49-2.5 2.49H5.5C4.11 21 3 19.88 3 18.5V15h2v3.5c0 .28.22.5.5.5h12.98c.28 0 .5-.22.5-.5L19 15h2z"></path></g></svg>
+</div></div></div></div></div>
+</div></div>
+</div>
+</div>
+</div></div></article>
+</div></div>
+<div class="css-1dbjc4n r-j5o65s r-qklmqi r-1adg3ll r-1ny4l3l"><div itemprop="hasPart" itemscope="" itemtype="https://schema.org/SocialMediaPosting">
+<meta content="1670857104733913088" itemprop="identifier">
+<meta content="12" itemprop="position">
+<meta content="7" itemprop="commentCount">
+<meta content="" itemprop="contentRating">
+<meta content="2023-06-19T18:12:31.000Z" itemprop="dateCreated">
+<meta content="2023-06-19T18:12:31.000Z" itemprop="datePublished">
+<meta content="https://twitter.com/Metallica/status/1670857104733913088" itemprop="url">
+<div itemprop="author" itemscope="" itemtype="https://schema.org/Person">
+<meta content="238475531" itemprop="identifier">
+<meta content="Metallica" itemprop="additionalName">
+<meta content="Metallica" itemprop="givenName">
+</div>
+<div itemprop="sharedContent" itemscope="" itemtype="https://schema.org/CreativeWork">
+<meta content="Expanded Tweet URLs" itemprop="name">
+<meta content="https://t.co/oPRIsN8ZDf" itemprop="url">
+<meta content="http://metallica.com/store/summer-blowout-sale" itemprop="url">
+<meta content="https://t.co/a4FaLT2RCq" itemprop="url">
+<meta content="https://twitter.com/Metallica/status/1670857104733913088/photo/1" itemprop="url">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/LikeAction" itemprop="interactionType">
+<meta content="Likes" itemprop="name">
+<meta content="https://twitter.com/Metallica/status/1670857104733913088/likes" itemprop="url">
+<meta content="984" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Retweets" itemprop="name">
+<meta content="https://twitter.com/Metallica/status/1670857104733913088/retweets" itemprop="url">
+<meta content="71" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Quotes" itemprop="name">
+<meta content="https://twitter.com/Metallica/status/1670857104733913088/retweets/with_comments" itemprop="url">
+<meta content="5" itemprop="userInteractionCount">
+</div>
+<div itemprop="interactionStatistic" itemscope="" itemtype="https://schema.org/InteractionCounter">
+<meta content="https://schema.org/InteractAction" itemprop="interactionType">
+<meta content="Replies" itemprop="name">
+<meta content="https://twitter.com/Metallica/status/1670857104733913088" itemprop="url">
+<meta content="7" itemprop="userInteractionCount">
+</div>
+<article aria-labelledby="id__q7t8l8ex2cm id__6ihm538qomy id__cn2y0evtngj id__9r1hed31bac id__8whwxjf2mwp id__brd984q9deb id__gb74n2owlqi id__p217l0l1jm id__x4sfpu0f1xa id__1t4x4qiiwbx id__osoitzof3f id__hj30chsezfw id__32cjqqo1hjj id__s5z5vq0ua0b id__2sda7pjemjq id__1xx52jw976pj id__1vc9wcw808v id__6tgz73g58so id__1qewno0xfnq" role="article" tabindex="-1" class="css-1dbjc4n r-18u37iz r-1ny4l3l r-1udh08x r-1qhn6m8 r-i023vh" data-testid="tweet"><div class="css-1dbjc4n r-eqz5dr r-16y2uox r-1wbh5a2"><div class="css-1dbjc4n r-16y2uox r-1wbh5a2 r-1ny4l3l">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-18u37iz"><div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-ttdzmv"></div></div></div>
+<div class="css-1dbjc4n r-18u37iz">
+<div class="css-1dbjc4n r-1awozwy r-1hwvwag r-18kxxzh r-1b7u577"><div class="css-1dbjc4n" data-testid="Tweet-User-Avatar"><div class="css-1dbjc4n r-18kxxzh r-1wbh5a2 r-13qz1uu"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1adg3ll r-h3s6tt r-bztko3" style="width:48px" data-testid="UserAvatar-Container-Metallica">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-1adg3ll r-1pi2tsx r-1wyvozj r-bztko3 r-u8s1d r-1v2oles r-desppf r-13qz1uu">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div class="css-1dbjc4n r-ggadg3 r-u8s1d r-8jfcpp" style="-webkit-clip-path:url(#shape-square);clip-path:url(#shape-square);height:calc(100% - -4px);width:calc(100% - -4px)"><a href="/Metallica" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1niwhzg r-1loqt21 r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"><div class="css-1dbjc4n r-1wyvozj r-633pao r-u8s1d r-1v2oles r-desppf" style="-webkit-clip-path:url(#shape-square);clip-path:url(#shape-square);height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1niwhzg r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-1wyvozj r-633pao r-u8s1d r-1v2oles r-desppf" style="-webkit-clip-path:url(#shape-square-rx-8);clip-path:url(#shape-square-rx-8);height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-14lw9ot r-1pi2tsx r-13qz1uu"></div></div>
+<div class="css-1dbjc4n r-14lw9ot r-1wyvozj r-633pao r-u8s1d r-1v2oles r-desppf" style="-webkit-clip-path:url(#shape-square-rx-8);clip-path:url(#shape-square-rx-8);height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-1adg3ll r-1udh08x" style="background-color:rgba(185,202,211,1.00)">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="Square profile picture" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/profile_images/1597280886809952256/gsJvGiqU_400x400.jpg")'></div>
+<img alt="Square profile picture" draggable="true" src="https://pbs.twimg.com/profile_images/1597280886809952256/gsJvGiqU_400x400.jpg" class="css-9pa8cd">
+</div></div>
+</div></div>
+<div class="css-1dbjc4n r-1wyvozj r-u8s1d r-1v2oles r-desppf" style="-webkit-clip-path:url(#shape-square-rx-8);clip-path:url(#shape-square-rx-8);height:calc(100% - 4px);width:calc(100% - 4px)"><div class="css-1dbjc4n r-12181gd r-1pi2tsx r-1ny4l3l r-o7ynqc r-6416eg r-13qz1uu"></div></div></a></div></div>
+</div></div>
+</div></div></div></div></div>
+<div class="css-1dbjc4n r-1iusvr4 r-16y2uox r-1777fci r-kzbkwu">
+<div class="css-1dbjc4n r-zl2h9q"><div class="css-1dbjc4n r-k4xj1c r-18u37iz r-1wtj0ep"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs r-1ny4l3l" id="id__8whwxjf2mwp" data-testid="User-Name">
+<div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs"><div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/Metallica" role="link" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div class="css-1dbjc4n r-1awozwy r-18u37iz r-1wbh5a2 r-dnmrzs">
+<div dir="ltr" class="css-901oao r-1awozwy r-6koalj r-37j5jr r-a023e6 r-b88u0q r-rjixqe r-bcqeeo r-1udh08x r-3s2u2q r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 css-1hf3ou5 r-poiln3 r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">Metallica</span></span></div>
+<div dir="ltr" class="css-901oao r-xoduu5 r-18u37iz r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0" style="color:rgba(15,20,25,1.00)"><span class="css-901oao css-16my406 r-1awozwy r-xoduu5 r-poiln3 r-bcqeeo r-qvutc0"><svg viewbox="0 0 22 22" aria-label="Verified account" role="img" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-9cviqr r-f9ja8p r-og9te1 r-bnwqim r-1plcrui r-lrvibr" data-testid="icon-verified"><g><lineargradient gradientunits="userSpaceOnUse" id="18694-a" x1="4.411" x2="18.083" y1="2.495" y2="21.508"><stop offset="0" stop-color="#f4e72a"></stop><stop offset=".539" stop-color="#cd8105"></stop><stop offset=".68" stop-color="#cb7b00"></stop><stop offset="1" stop-color="#f4ec26"></stop><stop offset="1" stop-color="#f4e72a"></stop></lineargradient><lineargradient gradientunits="userSpaceOnUse" id="18694-b" x1="5.355" x2="16.361" y1="3.395" y2="19.133"><stop offset="0" stop-color="#f9e87f"></stop><stop offset=".406" stop-color="#e2b719"></stop><stop offset=".989" stop-color="#e2b719"></stop></lineargradient><g clip-rule="evenodd" fill-rule="evenodd"><path d="M13.324 3.848L11 1.6 8.676 3.848l-3.201-.453-.559 3.184L2.06 8.095 3.48 11l-1.42 2.904 2.856 1.516.559 3.184 3.201-.452L11 20.4l2.324-2.248 3.201.452.559-3.184 2.856-1.516L18.52 11l1.42-2.905-2.856-1.516-.559-3.184zm-7.09 7.575l3.428 3.428 5.683-6.206-1.347-1.247-4.4 4.795-2.072-2.072z" fill="url(#18694-a)"></path><path d="M13.101 4.533L11 2.5 8.899 4.533l-2.895-.41-.505 2.88-2.583 1.37L4.2 11l-1.284 2.627 2.583 1.37.505 2.88 2.895-.41L11 19.5l2.101-2.033 2.895.41.505-2.88 2.583-1.37L17.8 11l1.284-2.627-2.583-1.37-.505-2.88zm-6.868 6.89l3.429 3.428 5.683-6.206-1.347-1.247-4.4 4.795-2.072-2.072z" fill="url(#18694-b)"></path><path d="M6.233 11.423l3.429 3.428 5.65-6.17.038-.033-.005 1.398-5.683 6.206-3.429-3.429-.003-1.405.005.003z" fill="#d18800"></path></g></g></svg></span></div>
+</div></a></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1wbh5a2 r-13hce6t"><div class="css-1dbjc4n r-1d09ksm r-18u37iz r-1wbh5a2">
+<div class="css-1dbjc4n r-1wbh5a2 r-dnmrzs"><a href="/Metallica" role="link" tabindex="-1" class="css-4rbku5 css-18t94o4 css-1dbjc4n r-1loqt21 r-1wbh5a2 r-dnmrzs r-1ny4l3l"><div dir="ltr" class="css-901oao css-1hf3ou5 r-14j79pv r-18u37iz r-37j5jr r-1wvb978 r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">@Metallica</span></div></a></div>
+<div dir="ltr" aria-hidden="true" class="css-901oao r-14j79pv r-1q142lx r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-s1qlax r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">·</span></div>
+<div class="css-1dbjc4n r-18u37iz r-1q142lx"><a href="/Metallica/status/1670857104733913088" dir="ltr" aria-label="Jun 19" role="link" class="css-4rbku5 css-18t94o4 css-901oao r-14j79pv r-1loqt21 r-xoduu5 r-1q142lx r-1w6e6rj r-37j5jr r-a023e6 r-16dba41 r-9aw3ui r-rjixqe r-bcqeeo r-3s2u2q r-qvutc0"><time datetime="2023-06-19T18:12:31.000Z">Jun 19</time></a></div>
+</div></div>
+</div></div></div></div></div>
+<div itemprop="articleBody" data-testid="tweetTextAnnotations"><div class="css-1dbjc4n"><div dir="auto" lang="en" class="css-901oao r-37j5jr r-a023e6 r-16dba41 r-rjixqe r-bcqeeo r-bnwqim r-qvutc0" style="color:rgba(15,20,25,1.00)" id="id__osoitzof3f" data-testid="tweetText">
+<span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">The Summer Blowout Sale has arrived! </span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">☀️</span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">
+
+Stock up on your favorite shirts, grab something to wear on the </span><span class="r-18u37iz"><a dir="ltr" href="/hashtag/M72?src=hashtag_click" role="link" class="css-4rbku5 css-18t94o4 css-901oao css-16my406 r-1cvl2hr r-1loqt21 r-poiln3 r-bcqeeo r-qvutc0">#M72</a></span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0"> World Tour, take home a mystery tour shirt for $6.99, and more!
+
+Shop The Met Store </span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">➡️</span><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0"> </span><a dir="ltr" href="https://t.co/oPRIsN8ZDf" rel="noopener noreferrer nofollow" target="_blank" role="link" class="css-4rbku5 css-18t94o4 css-901oao css-16my406 r-1cvl2hr r-1loqt21 r-poiln3 r-bcqeeo r-qvutc0"><span aria-hidden="true" class="css-901oao css-16my406 r-poiln3 r-hiw28u r-qvk6io r-bcqeeo r-qvutc0">http://</span>metallica.com/store/summer-b<span aria-hidden="true" class="css-901oao css-16my406 r-poiln3 r-hiw28u r-qvk6io r-bcqeeo r-qvutc0">lowout-sale</span><span aria-hidden="true" class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-lrvibr r-qvutc0">…</span></a>
+</div></div></div>
+<div aria-labelledby="id__0d2lf38vx71u id__p7xwriqrsq" class="css-1dbjc4n r-1ssbvtb r-1s2bzr4" id="id__32cjqqo1hjj"><div class="css-1dbjc4n r-9aw3ui"><div class="css-1dbjc4n"><div class="css-1dbjc4n r-1ets6dv r-1867qdf r-1phboty r-rs99b7 r-1ny4l3l r-1udh08x r-o7ynqc r-6416eg">
+<div class="css-1dbjc4n"><div class="css-1dbjc4n r-16y2uox r-1pi2tsx r-13qz1uu"><div role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1pi2tsx r-1ny4l3l"><div class="css-1dbjc4n r-1adg3ll r-1udh08x">
+<div class="r-1adg3ll r-13qz1uu" style="padding-bottom:100%"></div>
+<div class="r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-ipm5af r-13qz1uu"><div aria-label="Image" class="css-1dbjc4n r-1p0dtai r-1mlwlqe r-1d2f490 r-1udh08x r-u8s1d r-zchlnj r-ipm5af r-417010" data-testid="tweetPhoto">
+<div class="css-1dbjc4n r-1niwhzg r-vvn4in r-u6sd8q r-4gszlv r-1p0dtai r-1pi2tsx r-1d2f490 r-u8s1d r-zchlnj r-ipm5af r-13qz1uu r-1wyyakw" style='background-image:url("https://pbs.twimg.com/media/FzATqXSaIAANy4B?format=jpg&amp;name=medium")'></div>
+<img alt="Image" draggable="true" src="https://pbs.twimg.com/media/FzATqXSaIAANy4B?format=jpg&amp;name=medium" class="css-9pa8cd">
+</div></div>
+</div></div></div></div>
+<div itemprop="image" itemscope="" itemtype="https://schema.org/ImageObject">
+<meta content="Image" itemprop="caption">
+<meta content="https://pbs.twimg.com/media/FzATqXSaIAANy4B.jpg" itemprop="contentUrl">
+<meta content="https://pbs.twimg.com/media/FzATqXSaIAANy4B?format=jpg&amp;name=thumb" itemprop="thumbnailUrl">
+<meta content="1200" itemprop="width">
+<meta content="" itemprop="contentRating">
+</div>
+</div></div></div></div>
+<div class="css-1dbjc4n"><div aria-label="7 replies, 76 Retweets, 984 likes" role="group" class="css-1dbjc4n r-1ta3fxp r-18u37iz r-1wtj0ep r-1s2bzr4 r-1mdbhws" id="id__1qewno0xfnq">
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="7 Replies. Reply" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="reply"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M1.751 10c0-4.42 3.584-8 8.005-8h4.366c4.49 0 8.129 3.64 8.129 8.13 0 2.96-1.607 5.68-4.196 7.11l-8.054 4.46v-3.69h-.067c-4.49.1-8.183-3.51-8.183-8.01zm8.005-6c-3.317 0-6.005 2.69-6.005 6 0 3.37 2.77 6.08 6.138 6.01l.351-.01h1.761v2.3l5.087-2.81c1.951-1.08 3.163-3.13 3.163-5.36 0-3.39-2.744-6.13-6.129-6.13H9.756z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">7</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="76 Retweets. Retweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="retweet"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M4.5 3.88l4.432 4.14-1.364 1.46L5.5 7.55V16c0 1.1.896 2 2 2H13v2H7.5c-2.209 0-4-1.79-4-4V7.55L1.432 9.48.068 8.02 4.5 3.88zM16.5 6H11V4h5.5c2.209 0 4 1.79 4 4v8.45l2.068-1.93 1.364 1.46-4.432 4.14-4.432-4.14 1.364-1.46 2.068 1.93V8c0-1.1-.896-2-2-2z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">76</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-label="984 Likes. Like" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr" data-testid="like"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0">
+<div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M16.697 5.5c-1.222-.06-2.679.51-3.89 2.16l-.805 1.09-.806-1.09C9.984 6.01 8.526 5.44 7.304 5.5c-1.243.07-2.349.78-2.91 1.91-.552 1.12-.633 2.78.479 4.82 1.074 1.97 3.257 4.27 7.129 6.61 3.87-2.34 6.052-4.64 7.126-6.61 1.111-2.04 1.03-3.7.477-4.82-.561-1.13-1.666-1.84-2.908-1.91zm4.187 7.69c-1.351 2.48-4.001 5.12-8.379 7.67l-.503.3-.504-.3c-4.379-2.55-7.029-5.19-8.382-7.67-1.36-2.5-1.41-4.86-.514-6.67.887-1.79 2.647-2.91 4.601-3.01 1.651-.09 3.368.56 4.798 2.01 1.429-1.45 3.146-2.1 4.796-2.01 1.954.1 3.714 1.22 4.601 3.01.896 1.81.846 4.17-.514 6.67z"></path></g></svg>
+</div>
+<div class="css-1dbjc4n r-xoduu5 r-1udh08x"><span data-testid="app-text-transition-container" style="transition-property:transform;transition-duration:0.3s;transform:translate3d(0, 0, 0)"><span class="css-901oao css-16my406 r-poiln3 r-n6v787 r-1cwl3u0 r-vc7bo5 r-1pn2ns4 r-qvutc0"><span class="css-901oao css-16my406 r-poiln3 r-bcqeeo r-qvutc0">984</span></span></span></div>
+</div></div></div>
+<div class="css-1dbjc4n" style="display:inline-grid;-webkit-justify-content:inherit;justify-content:inherit;-webkit-transform:rotate(0deg) scale(1) translate3d(0, 0, 0);transform:rotate(0deg) scale(1) translate3d(0, 0, 0);-ms-flex-pack:inherit;-webkit-box-pack:inherit"><div class="css-1dbjc4n r-18u37iz r-1h0z5md"><div aria-expanded="false" aria-haspopup="menu" aria-label="Share Tweet" role="button" tabindex="0" class="css-18t94o4 css-1dbjc4n r-1777fci r-bt1l66 r-1ny4l3l r-bztko3 r-lrvibr"><div dir="ltr" class="css-901oao r-1awozwy r-14j79pv r-6koalj r-37j5jr r-a023e6 r-16dba41 r-1h0z5md r-rjixqe r-bcqeeo r-o7ynqc r-clp7b1 r-3s2u2q r-qvutc0"><div class="css-1dbjc4n r-xoduu5">
+<div class="css-1dbjc4n r-1niwhzg r-sdzlij r-1p0dtai r-xoduu5 r-1d2f490 r-xf4iuw r-1ny4l3l r-u8s1d r-zchlnj r-ipm5af r-o7ynqc r-6416eg"></div>
+<svg viewbox="0 0 24 24" aria-hidden="true" class="r-4qtqp9 r-yyyyoo r-1xvli5t r-dnmrzs r-bnwqim r-1plcrui r-lrvibr r-1hdv0qi"><g><path d="M12 2.59l5.7 5.7-1.41 1.42L13 6.41V16h-2V6.41l-3.3 3.3-1.41-1.42L12 2.59zM21 15l-.02 3.51c0 1.38-1.12 2.49-2.5 2.49H5.5C4.11 21 3 19.88 3 18.5V15h2v3.5c0 .28.22.5.5.5h12.98c.28 0 .5-.22.5-.5L19 15h2z"></path></g></svg>
+</div></div></div></div></div>
+</div></div>
+</div>
+</div>
+</div></div></article>
+</div></div>
+<div class="css-1dbjc4n r-o52ifk"><div class="css-1dbjc4n r-o52ifk"></div></div>
+</div></div></section>
+</div></div></div></div></div></div></main><div aria-valuemax="1" aria-valuemin="0" role="progressbar" class="css-1dbjc4n r-1awozwy r-1777fci" style="width:300px"><div class="css-1dbjc4n r-17bb2tj r-1muvv40 r-127358a r-1ldzwu0" style="height:26px;width:26px"><svg height="100%" viewbox="0 0 32 32" width="100%"><circle cx="16" cy="16" fill="none" r="14" stroke-width="4" style="stroke:#1D9BF0;opacity:0.2"></circle><circle cx="16" cy="16" fill="none" r="14" stroke-width="4" style="stroke:#1D9BF0;stroke-dasharray:80;stroke-dashoffset:60"></circle></svg></div></div>
+</div></div></div></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/spec/fixtures/plugins/scss_plugin/assets/stylesheets/common/common.scss b/spec/fixtures/plugins/scss_plugin/assets/stylesheets/common/common.scss
index 0ff1ecfff14..bcf35618fbb 100644
--- a/spec/fixtures/plugins/scss_plugin/assets/stylesheets/common/common.scss
+++ b/spec/fixtures/plugins/scss_plugin/assets/stylesheets/common/common.scss
@@ -8,6 +8,8 @@ body {
   line-height: $lineheight;
 }
 
+.pull-left { float: left; }
+
 footer {
   border-color: $footer1;
 }
diff --git a/spec/fixtures/theme_settings/valid_settings.yaml b/spec/fixtures/theme_settings/valid_settings.yaml
index a6e8e9b6fa1..4c3e3b480d4 100644
--- a/spec/fixtures/theme_settings/valid_settings.yaml
+++ b/spec/fixtures/theme_settings/valid_settings.yaml
@@ -71,7 +71,7 @@ enum_setting_03:
 
 upload_setting:
   type: upload
-  default: ""
+  default: "default-upload"
 
 invalid_json_schema_setting:
   default: ""
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 0b70af81741..50d6f419947 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -640,6 +640,38 @@ RSpec.describe ApplicationHelper do
         expect(helper.crawlable_meta_data).not_to include("twitter:image")
       end
     end
+
+    context "with breadcrumbs" do
+      subject(:metadata) { helper.crawlable_meta_data(breadcrumbs: breadcrumbs) }
+
+      let(:breadcrumbs) do
+        [{ name: "section1", color: "ff0000" }, { name: "section2", color: "0000ff" }]
+      end
+      let(:tags) { <<~HTML.strip }
+        <meta property="og:article:section" content="section1" />
+        <meta property="og:article:section:color" content="ff0000" />
+        <meta property="og:article:section" content="section2" />
+        <meta property="og:article:section:color" content="0000ff" />
+        HTML
+
+      it "generates section and color tags" do
+        expect(metadata).to include tags
+      end
+    end
+
+    context "with tags" do
+      subject(:metadata) { helper.crawlable_meta_data(tags: tags) }
+
+      let(:tags) { %w[tag1 tag2] }
+      let(:output_tags) { <<~HTML.strip }
+        <meta property="og:article:tag" content="tag1" />
+        <meta property="og:article:tag" content="tag2" />
+        HTML
+
+      it "generates tag tags" do
+        expect(metadata).to include output_tags
+      end
+    end
   end
 
   describe "discourse_color_scheme_stylesheets" do
@@ -651,8 +683,7 @@ RSpec.describe ApplicationHelper do
     end
 
     it "returns two color scheme link tags when dark mode is enabled" do
-      SiteSetting.default_dark_mode_color_scheme_id =
-        ColorScheme.where(name: "Dark").pluck_first(:id)
+      SiteSetting.default_dark_mode_color_scheme_id = ColorScheme.where(name: "Dark").pick(:id)
       cs_stylesheets = helper.discourse_color_scheme_stylesheets
 
       expect(cs_stylesheets).to include("(prefers-color-scheme: dark)")
@@ -708,8 +739,7 @@ RSpec.describe ApplicationHelper do
         helper.request.env[Auth::DefaultCurrentUserProvider::CURRENT_USER_KEY] = user
         @new_cs = Fabricate(:color_scheme, name: "Custom Color Scheme")
 
-        SiteSetting.default_dark_mode_color_scheme_id =
-          ColorScheme.where(name: "Dark").pluck_first(:id)
+        SiteSetting.default_dark_mode_color_scheme_id = ColorScheme.where(name: "Dark").pick(:id)
       end
 
       it "returns no dark scheme stylesheet when user has disabled that option" do
diff --git a/spec/initializers/track_setting_changes_spec.rb b/spec/initializers/track_setting_changes_spec.rb
index 47c538b4f5a..de96e852caf 100644
--- a/spec/initializers/track_setting_changes_spec.rb
+++ b/spec/initializers/track_setting_changes_spec.rb
@@ -43,4 +43,56 @@ RSpec.describe "Setting changes" do
       expect(Reviewable.min_score_for_priority(:low)).not_to eq(new_threshold)
     end
   end
+
+  describe "#title and #site_description" do
+    before do
+      general_category = Fabricate(:category, name: "General")
+      SiteSetting.general_category_id = general_category.id
+      SeedData::Topics.with_default_locale.create(site_setting_names: ["welcome_topic_id"])
+    end
+
+    it "updates the welcome topic when title changes" do
+      SiteSetting.title = SecureRandom.alphanumeric
+
+      topic = Topic.find(SiteSetting.welcome_topic_id)
+      expect(topic.title).to include(SiteSetting.title)
+    end
+
+    it "updates the welcome topic when site_description changes" do
+      SiteSetting.title = SecureRandom.alphanumeric
+      SiteSetting.site_description = SecureRandom.alphanumeric
+
+      topic = Topic.find(SiteSetting.welcome_topic_id)
+      expect(topic.title).to include(SiteSetting.title)
+      expect(topic.first_post.raw).to include(SiteSetting.title)
+      expect(topic.first_post.raw).to include(SiteSetting.site_description)
+    end
+  end
+
+  describe "#company_name" do
+    it "creates the TOS and Privacy topics" do
+      expect { SiteSetting.company_name = "Company Name" }.to change { Topic.count }.by(
+        2,
+      ).and change { SiteSetting.tos_topic_id }.and change { SiteSetting.privacy_topic_id }
+    end
+
+    it "creates, updates and deletes the topic" do
+      # Topic is created
+      expect { SiteSetting.company_name = "Company Name" }.to change { Topic.count }.by(2)
+      topic = Topic.find(SiteSetting.tos_topic_id)
+      first_post = topic.first_post
+      expect(first_post.raw).to include("Company Name")
+
+      # Topic is edited
+      expect { SiteSetting.company_name = "Other Name" }.not_to change { Topic.count }
+      expect(first_post.reload.raw).to include("Other Name")
+
+      # Topic can be deleted
+      expect { SiteSetting.company_name = "" }.to change { Topic.count }.by(-2)
+
+      # Topic can be recovered and edited
+      SiteSetting.company_name = "New Name"
+      expect(first_post.reload.raw).to include("New Name")
+    end
+  end
 end
diff --git a/spec/initializers/web_hook_events_spec.rb b/spec/initializers/web_hook_events_spec.rb
new file mode 100644
index 00000000000..1dc7634a377
--- /dev/null
+++ b/spec/initializers/web_hook_events_spec.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+RSpec.describe "Webhook event handlers" do
+  fab!(:user_badge) { Fabricate(:user_badge) }
+  fab!(:web_hook) { Fabricate(:user_badge_web_hook) }
+  fab!(:user) { Fabricate(:user) }
+  fab!(:badge) { Fabricate(:badge) }
+  fab!(:post) { Fabricate(:post) }
+
+  describe "user_badge events" do
+    it "enqueues user_badge_granted webhook event" do
+      expect do
+        BadgeGranter.grant(badge, user, granted_by: Discourse.system_user, post_id: post.id)
+      end.to change { Jobs::EmitWebHookEvent.jobs.size }.by(1)
+
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+      expect(job_args["id"]).to eq(user.user_badges.last.id)
+      expect(job_args["event_name"]).to eq("user_badge_granted")
+    end
+
+    it "enqueues user_badge_revoked webhook event" do
+      expect { BadgeGranter.revoke(user_badge) }.to change { Jobs::EmitWebHookEvent.jobs.size }.by(
+        1,
+      )
+
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+      expect(job_args["id"]).to eq(user_badge.id)
+      expect(job_args["event_name"]).to eq("user_badge_revoked")
+    end
+  end
+end
diff --git a/spec/integration/email_style_spec.rb b/spec/integration/email_style_spec.rb
index 1b6aa37a7da..645ed98a70e 100644
--- a/spec/integration/email_style_spec.rb
+++ b/spec/integration/email_style_spec.rb
@@ -23,11 +23,12 @@ RSpec.describe EmailStyle do
     end
 
     context "with invite" do
-      fab!(:invite) { Fabricate(:invite) }
-      let(:invite_mail) { InviteMailer.send_invite(invite) }
-
       subject(:mail_html) { Email::Renderer.new(invite_mail).html }
 
+      fab!(:invite) { Fabricate(:invite) }
+
+      let(:invite_mail) { InviteMailer.send_invite(invite) }
+
       it "applies customizations" do
         expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
         expect(mail_html).to match("#{Discourse.base_url}/invites/#{invite.invite_key}")
@@ -48,6 +49,8 @@ RSpec.describe EmailStyle do
     end
 
     context "when user_replied" do
+      subject(:mail_html) { Email::Renderer.new(mail).html }
+
       let(:response_by_user) { Fabricate(:user, name: "John Doe") }
       let(:category) { Fabricate(:category, name: "India") }
       let(:topic) { Fabricate(:topic, category: category, title: "Super cool topic") }
@@ -65,8 +68,6 @@ RSpec.describe EmailStyle do
         )
       end
 
-      subject(:mail_html) { Email::Renderer.new(mail).html }
-
       it "customizations are applied to html part of emails" do
         SiteSetting.default_email_in_reply_to = true
 
@@ -80,9 +81,10 @@ RSpec.describe EmailStyle do
     end
 
     context "with signup" do
-      let(:signup_mail) { UserNotifications.signup(Fabricate(:user)) }
       subject(:mail_html) { Email::Renderer.new(signup_mail).html }
 
+      let(:signup_mail) { UserNotifications.signup(Fabricate(:user)) }
+
       it "customizations are applied to html part of emails" do
         expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
         expect(mail_html).to include("activate-account")
@@ -124,11 +126,13 @@ RSpec.describe EmailStyle do
     end
 
     context "with digest" do
+      subject(:mail_html) { Email::Renderer.new(summary_email).html }
+
       fab!(:popular_topic) do
         Fabricate(:topic, user: Fabricate(:coding_horror), created_at: 1.hour.ago)
       end
+
       let(:summary_email) { UserNotifications.digest(Fabricate(:user)) }
-      subject(:mail_html) { Email::Renderer.new(summary_email).html }
 
       it "customizations are applied to html part of emails" do
         expect(mail_html.scan('<h1 style="color: red;">FOR YOU</h1>').count).to eq(1)
diff --git a/spec/integration/rate_limiting_spec.rb b/spec/integration/rate_limiting_spec.rb
index cdda0a8a75b..ede48f7f404 100644
--- a/spec/integration/rate_limiting_spec.rb
+++ b/spec/integration/rate_limiting_spec.rb
@@ -2,10 +2,9 @@
 # frozen_string_literal: true
 
 RSpec.describe "rate limiter integration" do
-  before do
-    RateLimiter.enable
-    RateLimiter.clear_all!
-  end
+  before { RateLimiter.enable }
+
+  use_redis_snapshotting
 
   it "will rate limit message bus requests once queueing" do
     freeze_time
@@ -49,8 +48,6 @@ RSpec.describe "rate limiter integration" do
   it "can cleanly limit requests and sets a Retry-After header" do
     freeze_time
 
-    RateLimiter.clear_all!
-
     admin = Fabricate(:admin)
     api_key = Fabricate(:api_key, user: admin)
 
diff --git a/spec/integration/spam_rules_spec.rb b/spec/integration/spam_rules_spec.rb
index 9c1f2c9f78d..be43d3effe6 100644
--- a/spec/integration/spam_rules_spec.rb
+++ b/spec/integration/spam_rules_spec.rb
@@ -124,7 +124,7 @@ RSpec.describe "spam rules for users" do
     end
 
     [[:user, trust_level: TrustLevel[2]], [:admin], [:moderator]].each do |spammer_args|
-      context "spammer is trusted #{spammer_args[0]}" do
+      context "if spammer is trusted #{spammer_args[0]}" do
         let!(:spammer) { Fabricate(*spammer_args) }
         let!(:spam_post) { Fabricate(:post, user: spammer) }
         let!(:private_messages_count) { spammer.private_topics_count }
diff --git a/spec/integration/watched_words_spec.rb b/spec/integration/watched_words_spec.rb
index 2304fb6bce0..a7d6902fbdd 100644
--- a/spec/integration/watched_words_spec.rb
+++ b/spec/integration/watched_words_spec.rb
@@ -64,6 +64,14 @@ RSpec.describe WatchedWord do
       should_block_post(manager)
     end
 
+    it "should handle UTF-8 characters" do
+      block_word = Fabricate(:watched_word, action: WatchedWord.actions[:block], word: "abc")
+      manager =
+        NewPostManager.new(tl2_user, title: "Hello world", raw: "abcódef", topic_id: topic.id)
+
+      expect(manager.perform).to be_success
+    end
+
     it "should block the post from admin" do
       manager =
         NewPostManager.new(
diff --git a/spec/integrity/coding_style_spec.rb b/spec/integrity/coding_style_spec.rb
index ebd3ade729a..7d91c4fbc0c 100644
--- a/spec/integrity/coding_style_spec.rb
+++ b/spec/integrity/coding_style_spec.rb
@@ -4,10 +4,6 @@ def list_files(base_dir, pattern = "*")
   Dir[File.join("#{base_dir}", pattern)]
 end
 
-def list_js_files(base_dir)
-  list_files(base_dir, "**/*.es6")
-end
-
 def grep_files(files, regex)
   files.select { |file| grep_file(file, regex) }
 end
@@ -18,21 +14,6 @@ def grep_file(file, regex)
 end
 
 RSpec.describe "Coding style" do
-  describe "Javascript" do
-    it 'prevents this.get("foo") pattern' do
-      js_files = list_js_files("app/assets/javascripts")
-      offenses = grep_files(js_files, /this\.get\("\w+"\)/)
-
-      expect(offenses).to be_empty, <<~TEXT
-        Do not use this.get("foo") accessor for single property, instead
-        prefer to use this.foo
-
-        Offenses:
-        #{offenses.join("\n")}
-      TEXT
-    end
-  end
-
   describe "Post Migrations" do
     def check_offenses(files, method_name, constant_name)
       method_name_regex = /#{Regexp.escape(method_name)}/
@@ -64,4 +45,19 @@ RSpec.describe "Coding style" do
       check_offenses(migration_files, "TableDropper.execute_drop", "DROPPED_TABLES")
     end
   end
+
+  describe "non-colocated component templates" do
+    {
+      "discourse" => "app/assets/javascripts/discourse/app/templates/components",
+      "admin" => "app/assets/javascripts/admin/addon/templates/components",
+      "wizard" => "app/assets/javascripts/wizard/addon/templates/components",
+      "chat/discourse" => "plugins/chat/assets/javascripts/discourse/templates/components",
+      "chat/admin" => "plugins/chat/assets/javascripts/admin/templates/components",
+      "styleguide" => "plugins/styleguide/assets/javascripts/discourse/templates/components",
+    }.each_pair do |name, dir|
+      it "do not exist for #{name}" do
+        expect(list_files(dir)).to eq([])
+      end
+    end
+  end
 end
diff --git a/spec/integrity/i18n_spec.rb b/spec/integrity/i18n_spec.rb
index edf7bea714b..1b50b7abec2 100644
--- a/spec/integrity/i18n_spec.rb
+++ b/spec/integrity/i18n_spec.rb
@@ -31,8 +31,8 @@ end
 RSpec.describe "i18n integrity checks" do
   it "has an i18n key for each Site Setting" do
     SiteSetting.all_settings.each do |s|
-      next if s[:setting][/^test_/]
-      expect(s[:description]).not_to match(/translation missing/)
+      next if s[:plugin] == SiteSetting::SAMPLE_TEST_PLUGIN.name
+      expect(s[:description]).not_to match(/Translation missing/)
     end
   end
 
diff --git a/spec/jobs/admin_problems_spec.rb b/spec/jobs/admin_problems_spec.rb
new file mode 100644
index 00000000000..cd92c7737a2
--- /dev/null
+++ b/spec/jobs/admin_problems_spec.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+RSpec.describe ::Jobs::AdminProblems do
+  fab!(:admin) { Fabricate(:admin) }
+
+  it "creates notification when problems persist for at least 2 days" do
+    Discourse.redis.setex(AdminDashboardData.problems_started_key, 14.days.to_i, Time.zone.now.to_s)
+    expect { described_class.new.execute({}) }.not_to change { Notification.count }
+
+    Discourse.redis.setex(AdminDashboardData.problems_started_key, 14.days.to_i, 3.days.ago)
+    expect { described_class.new.execute({}) }.to change { Notification.count }.by(1)
+  end
+
+  it "does not replace old notification created in last 7 days" do
+    Discourse.redis.setex(AdminDashboardData.problems_started_key, 14.days.to_i, 3.days.ago)
+    expect { described_class.new.execute({}) }.to change { Notification.count }.by(1)
+    old_notification = Notification.last
+
+    expect { described_class.new.execute({}) }.not_to change { Notification.count }
+    new_notification = Notification.last
+
+    expect(old_notification.id).to equal(new_notification.id)
+  end
+
+  it "replace old notification created more than 7 days ago" do
+    Discourse.redis.setex(AdminDashboardData.problems_started_key, 14.days.to_i, 13.days.ago)
+    freeze_time 10.days.ago do
+      expect { described_class.new.execute({}) }.to change { Notification.count }.by(1)
+    end
+    old_notification = Notification.last
+
+    expect { described_class.new.execute({}) }.not_to change { Notification.count }
+    new_notification = Notification.last
+
+    expect(old_notification.id).not_to equal(new_notification.id)
+  end
+end
diff --git a/spec/jobs/auto_queue_handler_spec.rb b/spec/jobs/auto_queue_handler_spec.rb
index f4d1ada3afc..718234c9435 100644
--- a/spec/jobs/auto_queue_handler_spec.rb
+++ b/spec/jobs/auto_queue_handler_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe Jobs::AutoQueueHandler do
-  subject { Jobs::AutoQueueHandler.new.execute({}) }
+  subject(:job) { Jobs::AutoQueueHandler.new.execute({}) }
 
   describe "old flagged post" do
     fab!(:spam_result) do
@@ -23,7 +23,7 @@ RSpec.describe Jobs::AutoQueueHandler do
 
     it "defers the old flag if auto_handle_queued_age is 60" do
       SiteSetting.auto_handle_queued_age = 60
-      subject
+      job
       expect(not_old.reload).to be_pending
       expect(old.reload).not_to be_pending
       expect(post_action.related_post.topic.posts_count).to eq(1)
@@ -31,7 +31,7 @@ RSpec.describe Jobs::AutoQueueHandler do
 
     it "doesn't defer the old flag if auto_handle_queued_age is 0" do
       SiteSetting.auto_handle_queued_age = 0
-      subject
+      job
       expect(not_old.reload).to be_pending
       expect(old.reload).to be_pending
     end
@@ -45,7 +45,7 @@ RSpec.describe Jobs::AutoQueueHandler do
 
     it "rejects the post when auto_handle_queued_age is 60" do
       SiteSetting.auto_handle_queued_age = 60
-      subject
+      job
       expect(new_post.reload.pending?).to eq(true)
       expect(old_post.reload.rejected?).to eq(true)
       expect(new_user.reload.pending?).to eq(true)
@@ -54,7 +54,7 @@ RSpec.describe Jobs::AutoQueueHandler do
 
     it "leaves reviewables as pending auto_handle_queued_age is 0" do
       SiteSetting.auto_handle_queued_age = 0
-      subject
+      job
       expect(new_post.reload.pending?).to eq(true)
       expect(new_user.reload.pending?).to eq(true)
       expect(old_post.reload.pending?).to eq(true)
diff --git a/spec/jobs/backfill_sidebar_site_settings_spec.rb b/spec/jobs/backfill_sidebar_site_settings_spec.rb
new file mode 100644
index 00000000000..22efce29cce
--- /dev/null
+++ b/spec/jobs/backfill_sidebar_site_settings_spec.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+RSpec.describe Jobs::BackfillSidebarSiteSettings do
+  it "should have a cluster concurrency of 1" do
+    expect(Jobs::BackfillSidebarSiteSettings.get_cluster_concurrency).to eq(1)
+  end
+end
diff --git a/spec/jobs/bookmark_reminder_notifications_spec.rb b/spec/jobs/bookmark_reminder_notifications_spec.rb
index 22a9a17f83b..eb6b256da97 100644
--- a/spec/jobs/bookmark_reminder_notifications_spec.rb
+++ b/spec/jobs/bookmark_reminder_notifications_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe Jobs::BookmarkReminderNotifications do
-  subject { described_class.new }
+  subject(:job) { described_class.new }
 
   fab!(:user) { Fabricate(:user) }
   let(:five_minutes_ago) { Time.zone.now - 5.minutes }
@@ -19,7 +19,7 @@ RSpec.describe Jobs::BookmarkReminderNotifications do
   end
 
   it "sends every reminder and sets the reminder_last_sent_at" do
-    subject.execute
+    job.execute
     bookmark1.reload
     bookmark2.reload
     bookmark3.reload
@@ -31,7 +31,7 @@ RSpec.describe Jobs::BookmarkReminderNotifications do
   it "will not send a reminder for a bookmark in the future" do
     freeze_time
     bookmark4 = Fabricate(:bookmark, reminder_at: Time.zone.now + 1.day)
-    expect { subject.execute }.to change { Notification.where(user: user).count }.by(3)
+    expect { job.execute }.to change { Notification.where(user: user).count }.by(3)
     expect(bookmark1.reload.reminder_last_sent_at).to eq_time(Time.zone.now)
     expect(bookmark2.reload.reminder_last_sent_at).to eq_time(Time.zone.now)
     expect(bookmark3.reload.reminder_last_sent_at).to eq_time(Time.zone.now)
@@ -44,7 +44,7 @@ RSpec.describe Jobs::BookmarkReminderNotifications do
       other_bookmark = Fabricate(:bookmark, user: bookmark1.user)
       other_bookmark.update_column(:reminder_at, five_minutes_ago)
       SiteSetting.max_bookmarks_per_user = 2
-      expect { subject.execute }.not_to raise_error
+      expect { job.execute }.not_to raise_error
     end
   end
 
@@ -52,7 +52,7 @@ RSpec.describe Jobs::BookmarkReminderNotifications do
     it "does not send them in the current run, but will send them in the next" do
       begin
         Jobs::BookmarkReminderNotifications.max_reminder_notifications_per_run = 2
-        subject.execute
+        job.execute
         expect(bookmark1.reload.reminder_last_sent_at).not_to eq(nil)
         expect(bookmark2.reload.reminder_last_sent_at).not_to eq(nil)
         expect(bookmark3.reload.reminder_last_sent_at).to eq(nil)
@@ -64,7 +64,7 @@ RSpec.describe Jobs::BookmarkReminderNotifications do
     bookmark1.bookmarkable.topic.destroy
     bookmark2.bookmarkable.topic.destroy
     bookmark3.bookmarkable.topic.destroy
-    expect { subject.execute }.not_to change {
+    expect { job.execute }.not_to change {
       Notification.where(notification_type: Notification.types[:bookmark_reminder]).count
     }
   end
diff --git a/spec/jobs/change_display_name_spec.rb b/spec/jobs/change_display_name_spec.rb
new file mode 100644
index 00000000000..e18db2cf346
--- /dev/null
+++ b/spec/jobs/change_display_name_spec.rb
@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+RSpec.describe Jobs::ChangeDisplayName do
+  before { stub_image_size }
+
+  let(:user) { Fabricate(:user, username: "codinghorror", name: "Jeff") }
+  let(:topic) { Fabricate(:topic, user: user) }
+  let!(:post) { create_post(post_attributes.merge(topic_id: topic.id)) }
+
+  let!(:quoted_post) { create_post(user: user, topic: topic, post_number: 1, raw: "quoted post") }
+  let(:avatar_url) { user.avatar_template_url.gsub("{size}", "48") }
+
+  let(:post_attributes) { { raw: <<~RAW } }
+    [quote="Jeff, post:1, topic:#{quoted_post.topic.id}, username:codinghorror"]
+    quoted post
+    [/quote]
+  RAW
+
+  let(:revised_post_attributes) { { raw: <<~RAW } }
+    [quote="Jeff, post:1, topic:#{quoted_post.topic.id}, username:codinghorror"]
+    quoted post
+    [/quote]
+    Forgot something.
+  RAW
+
+  let(:args) { { user_id: user.id, old_name: "Jeff", new_name: "Mr. Atwood" } }
+
+  describe "#execute" do
+    context "when the renamed user has been quoted" do
+      it "rewrites the raw quote display name" do
+        expect { described_class.new.execute(args) }.to change { post.reload.raw }.to(<<~RAW.strip)
+          [quote="Mr. Atwood, post:1, topic:#{quoted_post.topic.id}, username:codinghorror"]
+          quoted post
+          [/quote]
+        RAW
+      end
+
+      it "rewrites the cooked quote display name" do
+        expect { described_class.new.execute(args) }.to change { post.reload.cooked }.to(
+          match_html(<<~HTML.strip),
+          <aside class="quote no-group" data-username="codinghorror" data-post="1" data-topic="#{quoted_post.topic.id}">
+          <div class="title">
+          <div class="quote-controls"></div>
+          <img loading="lazy" alt="" width="24" height="24" src="#{avatar_url}" class="avatar"> Mr. Atwood:</div>
+          <blockquote>
+          <p>quoted post</p>
+          </blockquote>
+          </aside>
+        HTML
+        )
+      end
+    end
+
+    context "when the user has been quoted in revisions" do
+      before { post.revise(post.user, revised_post_attributes, force_new_version: true) }
+
+      it "rewrites the quote in revisions" do
+        expect { described_class.new.execute(args) }.to change {
+          post.reload.revisions[0].modifications["raw"][0]
+        }.to(<<~RAW.strip)
+          [quote="Mr. Atwood, post:1, topic:#{quoted_post.topic.id}, username:codinghorror"]
+          quoted post
+          [/quote]
+          RAW
+      end
+    end
+  end
+end
diff --git a/spec/jobs/check_translation_overrides_spec.rb b/spec/jobs/check_translation_overrides_spec.rb
new file mode 100644
index 00000000000..2bd0e63dd44
--- /dev/null
+++ b/spec/jobs/check_translation_overrides_spec.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+RSpec.describe Jobs::CheckTranslationOverrides do
+  fab!(:up_to_date_translation) { Fabricate(:translation_override, translation_key: "title") }
+  fab!(:deprecated_translation) { Fabricate(:translation_override, translation_key: "foo.bar") }
+  fab!(:outdated_translation) do
+    Fabricate(:translation_override, translation_key: "posts", original_translation: "outdated")
+  end
+  fab!(:invalid_translation) { Fabricate(:translation_override, translation_key: "topics") }
+
+  it "marks translations with keys which no longer exist in the locale file" do
+    expect { described_class.new.execute({}) }.to change {
+      deprecated_translation.reload.status
+    }.from("up_to_date").to("deprecated")
+  end
+
+  it "marks translations with invalid interpolation keys" do
+    invalid_translation.update_attribute("value", "Invalid %{foo}")
+
+    expect { described_class.new.execute({}) }.to change { invalid_translation.reload.status }.from(
+      "up_to_date",
+    ).to("invalid_interpolation_keys")
+  end
+
+  it "marks translations that are outdated" do
+    expect { described_class.new.execute({}) }.to change {
+      outdated_translation.reload.status
+    }.from("up_to_date").to("outdated")
+  end
+
+  it "does not mark up to date translations" do
+    expect { described_class.new.execute({}) }.not_to change {
+      up_to_date_translation.reload.status
+    }
+  end
+end
diff --git a/spec/jobs/clean_up_associated_accounts_spec.rb b/spec/jobs/clean_up_associated_accounts_spec.rb
index cefcac82bde..b9ecb71e837 100644
--- a/spec/jobs/clean_up_associated_accounts_spec.rb
+++ b/spec/jobs/clean_up_associated_accounts_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe Jobs::CleanUpAssociatedAccounts do
-  subject { Jobs::CleanUpAssociatedAccounts.new.execute({}) }
+  subject(:job) { Jobs::CleanUpAssociatedAccounts.new.execute({}) }
 
   it "deletes the correct records" do
     freeze_time
@@ -26,7 +26,7 @@ RSpec.describe Jobs::CleanUpAssociatedAccounts do
         updated_at: 12.hours.ago,
       )
 
-    expect { subject }.to change { UserAssociatedAccount.count }.by(-1)
+    expect { job }.to change { UserAssociatedAccount.count }.by(-1)
     expect(UserAssociatedAccount.all).to contain_exactly(today, connected)
   end
 end
diff --git a/spec/jobs/clean_up_crawler_stats_spec.rb b/spec/jobs/clean_up_crawler_stats_spec.rb
index 8f954b4334d..0b51f1683ed 100644
--- a/spec/jobs/clean_up_crawler_stats_spec.rb
+++ b/spec/jobs/clean_up_crawler_stats_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe Jobs::CleanUpCrawlerStats do
-  subject { Jobs::CleanUpCrawlerStats.new.execute({}) }
+  subject(:job) { Jobs::CleanUpCrawlerStats.new.execute({}) }
 
   it "deletes records older than 30 days old" do
     freeze_time
@@ -10,7 +10,7 @@ RSpec.describe Jobs::CleanUpCrawlerStats do
     yesterday = Fabricate(:web_crawler_request, date: 1.day.ago.to_date)
     too_old = Fabricate(:web_crawler_request, date: 31.days.ago.to_date)
 
-    expect { subject }.to change { WebCrawlerRequest.count }.by(-1)
+    expect { job }.to change { WebCrawlerRequest.count }.by(-1)
     expect(WebCrawlerRequest.where(id: too_old.id)).to_not exist
   end
 
@@ -25,7 +25,7 @@ RSpec.describe Jobs::CleanUpCrawlerStats do
     req2 = Fabricate(:web_crawler_request, date: 1.day.ago.to_date, count: 50)
     req5 = Fabricate(:web_crawler_request, date: 1.day.ago.to_date, count: 1)
 
-    expect { subject }.to change { WebCrawlerRequest.count }.by(-2)
+    expect { job }.to change { WebCrawlerRequest.count }.by(-2)
     expect(WebCrawlerRequest.all).to contain_exactly(req1, req2, req3)
   end
 end
diff --git a/spec/jobs/clean_up_inactive_users_spec.rb b/spec/jobs/clean_up_inactive_users_spec.rb
index 985659519d7..e2a16cef43a 100644
--- a/spec/jobs/clean_up_inactive_users_spec.rb
+++ b/spec/jobs/clean_up_inactive_users_spec.rb
@@ -4,18 +4,35 @@ RSpec.describe Jobs::CleanUpInactiveUsers do
   it "should clean up new users that have been inactive" do
     SiteSetting.clean_up_inactive_users_after_days = 0
 
-    user = Fabricate(:user, last_seen_at: 5.days.ago, trust_level: TrustLevel.levels[:newuser])
+    user =
+      Fabricate(
+        :user,
+        created_at: 5.days.ago,
+        last_seen_at: 5.days.ago,
+        trust_level: TrustLevel.levels[:newuser],
+      )
 
     Fabricate(:active_user)
 
     Fabricate(
       :post,
-      user: Fabricate(:user, trust_level: TrustLevel.levels[:newuser], last_seen_at: 5.days.ago),
+      user:
+        Fabricate(
+          :user,
+          trust_level: TrustLevel.levels[:newuser],
+          created_at: 5.days.ago,
+          last_seen_at: 5.days.ago,
+        ),
     ).user
 
-    Fabricate(:user, trust_level: TrustLevel.levels[:newuser], last_seen_at: 2.days.ago)
+    Fabricate(
+      :user,
+      trust_level: TrustLevel.levels[:newuser],
+      created_at: 5.days.ago,
+      last_seen_at: 2.days.ago,
+    )
 
-    Fabricate(:user, trust_level: TrustLevel.levels[:basic])
+    Fabricate(:user, trust_level: TrustLevel.levels[:basic], created_at: 5.days.ago)
 
     expect { described_class.new.execute({}) }.to_not change { User.count }
 
@@ -28,7 +45,13 @@ RSpec.describe Jobs::CleanUpInactiveUsers do
 
   it "doesn't delete inactive admins" do
     SiteSetting.clean_up_inactive_users_after_days = 4
-    admin = Fabricate(:admin, last_seen_at: 5.days.ago, trust_level: TrustLevel.levels[:newuser])
+    admin =
+      Fabricate(
+        :admin,
+        created_at: 5.days.ago,
+        last_seen_at: 5.days.ago,
+        trust_level: TrustLevel.levels[:newuser],
+      )
 
     expect { described_class.new.execute({}) }.to_not change { User.count }
     expect(User.exists?(admin.id)).to eq(true)
@@ -37,9 +60,56 @@ RSpec.describe Jobs::CleanUpInactiveUsers do
   it "doesn't delete inactive mods" do
     SiteSetting.clean_up_inactive_users_after_days = 4
     moderator =
-      Fabricate(:moderator, last_seen_at: 5.days.ago, trust_level: TrustLevel.levels[:newuser])
+      Fabricate(
+        :moderator,
+        created_at: 5.days.ago,
+        last_seen_at: 5.days.ago,
+        trust_level: TrustLevel.levels[:newuser],
+      )
 
     expect { described_class.new.execute({}) }.to_not change { User.count }
     expect(User.exists?(moderator.id)).to eq(true)
   end
+
+  it "should clean up a user that has a deleted post" do
+    SiteSetting.clean_up_inactive_users_after_days = 1
+
+    Fabricate(:active_user)
+
+    Fabricate(
+      :post,
+      user:
+        Fabricate(
+          :user,
+          trust_level: TrustLevel.levels[:newuser],
+          created_at: 5.days.ago,
+          last_seen_at: 2.days.ago,
+        ),
+      # ensuring that topic author is a different user as the topic is non-deleted
+      topic: Fabricate(:topic, user: Fabricate(:user)),
+      deleted_at: Time.now,
+    ).user
+
+    expect { described_class.new.execute({}) }.to change { User.count }.by(-1)
+  end
+
+  it "should clean up user that has a deleted topic" do
+    SiteSetting.clean_up_inactive_users_after_days = 1
+
+    Fabricate(:active_user)
+
+    Fabricate(
+      :topic,
+      user:
+        Fabricate(
+          :user,
+          trust_level: TrustLevel.levels[:newuser],
+          created_at: 2.days.ago,
+          last_seen_at: 2.days.ago,
+        ),
+      deleted_at: Time.now,
+    ).user
+
+    expect { described_class.new.execute({}) }.to change { User.count }.by(-1)
+  end
 end
diff --git a/spec/jobs/clean_up_uploads_spec.rb b/spec/jobs/clean_up_uploads_spec.rb
index 39ba932329a..a0d4befcdc3 100644
--- a/spec/jobs/clean_up_uploads_spec.rb
+++ b/spec/jobs/clean_up_uploads_spec.rb
@@ -137,9 +137,16 @@ RSpec.describe Jobs::CleanUpUploads do
       Jobs::CleanUpUploads.new.execute(nil)
 
       [
-        logo_upload, logo_small_upload, digest_logo_upload, mobile_logo_upload, large_icon_upload,
-        opengraph_image_upload, twitter_summary_large_image_upload, favicon_upload,
-        apple_touch_icon_upload, system_upload,
+        logo_upload,
+        logo_small_upload,
+        digest_logo_upload,
+        mobile_logo_upload,
+        large_icon_upload,
+        opengraph_image_upload,
+        twitter_summary_large_image_upload,
+        favicon_upload,
+        apple_touch_icon_upload,
+        system_upload,
       ].each { |record| expect(Upload.exists?(id: record.id)).to eq(true) }
 
       fabricate_upload
diff --git a/spec/jobs/create_recent_post_search_indexes_spec.rb b/spec/jobs/create_recent_post_search_indexes_spec.rb
index 1d350d254b4..67a4de9fcc2 100644
--- a/spec/jobs/create_recent_post_search_indexes_spec.rb
+++ b/spec/jobs/create_recent_post_search_indexes_spec.rb
@@ -1,17 +1,10 @@
 # frozen_string_literal: true
 
 RSpec.describe Jobs::CreateRecentPostSearchIndexes do
-  subject { described_class.new }
+  subject(:job) { described_class.new }
 
-  fab!(:post) do
-    SearchIndexer.enable
-    Fabricate(:post)
-  end
-
-  fab!(:post_2) do
-    SearchIndexer.enable
-    Fabricate(:post)
-  end
+  fab!(:post) { with_search_indexer_enabled { Fabricate(:post) } }
+  fab!(:post_2) { with_search_indexer_enabled { Fabricate(:post) } }
 
   before { SearchIndexer.enable }
 
@@ -20,7 +13,7 @@ RSpec.describe Jobs::CreateRecentPostSearchIndexes do
       SiteSetting.search_recent_posts_size = 1
       SiteSetting.search_enable_recent_regular_posts_offset_size = 3
 
-      expect do subject.execute({}) end.to_not change {
+      expect { job.execute({}) }.to_not change {
         SiteSetting.search_recent_regular_posts_offset_post_id
       }
     end
@@ -29,7 +22,7 @@ RSpec.describe Jobs::CreateRecentPostSearchIndexes do
       SiteSetting.search_recent_posts_size = 1
       SiteSetting.search_enable_recent_regular_posts_offset_size = 1
 
-      subject.execute({})
+      job.execute({})
 
       expect(SiteSetting.search_recent_regular_posts_offset_post_id).to eq(post_2.id)
 
diff --git a/spec/jobs/dashboard_stats_spec.rb b/spec/jobs/dashboard_stats_spec.rb
deleted file mode 100644
index 82aeaab1223..00000000000
--- a/spec/jobs/dashboard_stats_spec.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe ::Jobs::DashboardStats do
-  let(:group_message) do
-    GroupMessage.new(Group[:admins].name, :dashboard_problems, limit_once_per: 7.days.to_i)
-  end
-
-  def clear_recently_sent!
-    # We won't immediately create new PMs due to the limit_once_per option, reset the value for testing purposes.
-    Discourse.redis.del(group_message.sent_recently_key)
-  end
-
-  after { clear_recently_sent! }
-
-  it "creates group message when problems are persistent for 2 days" do
-    Discourse.redis.setex(AdminDashboardData.problems_started_key, 14.days.to_i, Time.zone.now.to_s)
-    expect { described_class.new.execute({}) }.not_to change { Topic.count }
-
-    Discourse.redis.setex(AdminDashboardData.problems_started_key, 14.days.to_i, 3.days.ago)
-    expect { described_class.new.execute({}) }.to change { Topic.count }.by(1)
-  end
-
-  it "replaces old message" do
-    Discourse.redis.setex(AdminDashboardData.problems_started_key, 14.days.to_i, 3.days.ago)
-    expect { described_class.new.execute({}) }.to change { Topic.count }.by(1)
-    old_topic = Topic.last
-    clear_recently_sent!
-
-    new_topic = described_class.new.execute({}).topic
-    expect(old_topic.reload.deleted_at.present?).to eq(true)
-    expect(new_topic.reload.deleted_at).to be_nil
-    expect(new_topic.title).to eq(old_topic.title)
-  end
-
-  it "respects the sent_recently? check when deleting previous message" do
-    Discourse.redis.setex(AdminDashboardData.problems_started_key, 14.days.to_i, 3.days.ago)
-    expect { described_class.new.execute({}) }.to change { Topic.count }.by(1)
-
-    expect { described_class.new.execute({}) }.not_to change { Topic.count }
-  end
-
-  it "duplicates message if previous one has replies" do
-    Discourse.redis.setex(AdminDashboardData.problems_started_key, 14.days.to_i, 3.days.ago)
-    expect { described_class.new.execute({}) }.to change { Topic.count }.by(1)
-    clear_recently_sent!
-
-    _reply_1 = Fabricate(:post, topic: Topic.last)
-    expect { described_class.new.execute({}) }.to change { Topic.count }.by(1)
-  end
-
-  it "duplicates message if previous was 3 months ago" do
-    freeze_time 3.months.ago do
-      Discourse.redis.setex(AdminDashboardData.problems_started_key, 14.days.to_i, 3.days.ago)
-      expect { described_class.new.execute({}) }.to change { Topic.count }.by(1)
-      clear_recently_sent!
-    end
-
-    expect { described_class.new.execute({}) }.to change { Topic.count }.by(1)
-  end
-end
diff --git a/spec/jobs/emit_web_hook_event_spec.rb b/spec/jobs/emit_web_hook_event_spec.rb
index efddb33a040..38d024ba94b 100644
--- a/spec/jobs/emit_web_hook_event_spec.rb
+++ b/spec/jobs/emit_web_hook_event_spec.rb
@@ -3,25 +3,27 @@
 require "excon"
 
 RSpec.describe Jobs::EmitWebHookEvent do
+  subject(:job) { described_class.new }
+
   fab!(:post_hook) { Fabricate(:web_hook) }
   fab!(:inactive_hook) { Fabricate(:inactive_web_hook) }
   fab!(:post) { Fabricate(:post) }
   fab!(:user) { Fabricate(:user) }
 
   it "raises an error when there is no web hook record" do
-    expect do subject.execute(event_type: "post", payload: {}) end.to raise_error(
+    expect { job.execute(event_type: "post", payload: {}) }.to raise_error(
       Discourse::InvalidParameters,
     )
   end
 
   it "raises an error when there is no event type" do
-    expect do subject.execute(web_hook_id: post_hook.id, payload: {}) end.to raise_error(
+    expect { job.execute(web_hook_id: post_hook.id, payload: {}) }.to raise_error(
       Discourse::InvalidParameters,
     )
   end
 
   it "raises an error when there is no payload" do
-    expect do subject.execute(web_hook_id: post_hook.id, event_type: "post") end.to raise_error(
+    expect { job.execute(web_hook_id: post_hook.id, event_type: "post") }.to raise_error(
       Discourse::InvalidParameters,
     )
   end
@@ -29,7 +31,7 @@ RSpec.describe Jobs::EmitWebHookEvent do
   it "should not destroy webhook event in case of error" do
     stub_request(:post, post_hook.payload_url).to_return(status: 500)
 
-    subject.execute(
+    job.execute(
       web_hook_id: post_hook.id,
       payload: { id: post.id }.to_json,
       event_type: WebHookEventType::POST,
@@ -53,7 +55,7 @@ RSpec.describe Jobs::EmitWebHookEvent do
 
       it "disables the webhook" do
         expect do
-          subject.execute(
+          job.execute(
             web_hook_id: post_hook.id,
             event_type: described_class::PING_EVENT,
             retry_count: described_class::MAX_RETRY_COUNT,
@@ -62,7 +64,7 @@ RSpec.describe Jobs::EmitWebHookEvent do
       end
 
       it "logs webhook deactivation reason" do
-        subject.execute(
+        job.execute(
           web_hook_id: post_hook.id,
           event_type: described_class::PING_EVENT,
           retry_count: described_class::MAX_RETRY_COUNT,
@@ -86,7 +88,7 @@ RSpec.describe Jobs::EmitWebHookEvent do
 
       it "retry if site setting is enabled" do
         expect do
-          subject.execute(web_hook_id: post_hook.id, event_type: described_class::PING_EVENT)
+          job.execute(web_hook_id: post_hook.id, event_type: described_class::PING_EVENT)
         end.to change { Jobs::EmitWebHookEvent.jobs.size }.by(1)
       end
 
@@ -96,13 +98,13 @@ RSpec.describe Jobs::EmitWebHookEvent do
         expect(Jobs::EmitWebHookEvent::MAX_RETRY_COUNT + 1).to eq(5)
 
         expect do
-          subject.execute(web_hook_id: post_hook.id, event_type: described_class::PING_EVENT)
+          job.execute(web_hook_id: post_hook.id, event_type: described_class::PING_EVENT)
         end.to change { WebHookEvent.count }.by(Jobs::EmitWebHookEvent::MAX_RETRY_COUNT + 1)
       end
 
       it "does not retry for more than maximum allowed times" do
         expect do
-          subject.execute(
+          job.execute(
             web_hook_id: post_hook.id,
             event_type: described_class::PING_EVENT,
             retry_count: described_class::MAX_RETRY_COUNT,
@@ -114,13 +116,13 @@ RSpec.describe Jobs::EmitWebHookEvent do
         SiteSetting.retry_web_hook_events = false
 
         expect do
-          subject.execute(web_hook_id: post_hook.id, event_type: described_class::PING_EVENT)
+          job.execute(web_hook_id: post_hook.id, event_type: described_class::PING_EVENT)
         end.not_to change { Jobs::EmitWebHookEvent.jobs.size }
       end
 
       it "properly logs error on rescue" do
         stub_request(:post, post_hook.payload_url).to_raise("connection error")
-        subject.execute(web_hook_id: post_hook.id, event_type: described_class::PING_EVENT)
+        job.execute(web_hook_id: post_hook.id, event_type: described_class::PING_EVENT)
 
         event = WebHookEvent.last
         expect(event.payload).to eq(MultiJson.dump(ping: "OK"))
@@ -133,11 +135,11 @@ RSpec.describe Jobs::EmitWebHookEvent do
   it "does not raise an error for a ping event without payload" do
     stub_request(:post, post_hook.payload_url).to_return(body: "OK", status: 200)
 
-    subject.execute(web_hook_id: post_hook.id, event_type: described_class::PING_EVENT)
+    job.execute(web_hook_id: post_hook.id, event_type: described_class::PING_EVENT)
   end
 
   it "doesn't emit when the hook is inactive" do
-    subject.execute(
+    job.execute(
       web_hook_id: inactive_hook.id,
       event_type: "post",
       payload: { test: "some payload" }.to_json,
@@ -149,7 +151,7 @@ RSpec.describe Jobs::EmitWebHookEvent do
       body: "{\"post\":{\"test\":\"some payload\"}}",
     ).to_return(body: "OK", status: 200)
 
-    subject.execute(
+    job.execute(
       web_hook_id: post_hook.id,
       event_type: "post",
       payload: { test: "some payload" }.to_json,
@@ -158,7 +160,7 @@ RSpec.describe Jobs::EmitWebHookEvent do
 
   it "doesn't emit if the payload URL resolves to a disallowed IP" do
     FinalDestination::TestHelper.stub_to_fail do
-      subject.execute(
+      job.execute(
         web_hook_id: post_hook.id,
         event_type: "post",
         payload: { test: "some payload" }.to_json,
@@ -179,7 +181,7 @@ RSpec.describe Jobs::EmitWebHookEvent do
     fab!(:topic_hook) { Fabricate(:topic_web_hook, categories: [category]) }
 
     it "doesn't emit when event is not related with defined categories" do
-      subject.execute(
+      job.execute(
         web_hook_id: topic_hook.id,
         event_type: "topic",
         category_id: topic.category.id,
@@ -192,7 +194,7 @@ RSpec.describe Jobs::EmitWebHookEvent do
         body: "{\"topic\":{\"test\":\"some payload\"}}",
       ).to_return(body: "OK", status: 200)
 
-      subject.execute(
+      job.execute(
         web_hook_id: topic_hook.id,
         event_type: "topic",
         category_id: topic_with_category.category.id,
@@ -207,7 +209,7 @@ RSpec.describe Jobs::EmitWebHookEvent do
     fab!(:topic_hook) { Fabricate(:topic_web_hook, tags: [tag]) }
 
     it "doesn't emit when event is not included any tags" do
-      subject.execute(
+      job.execute(
         web_hook_id: topic_hook.id,
         event_type: "topic",
         payload: { test: "some payload" }.to_json,
@@ -215,7 +217,7 @@ RSpec.describe Jobs::EmitWebHookEvent do
     end
 
     it "doesn't emit when event is not related with defined tags" do
-      subject.execute(
+      job.execute(
         web_hook_id: topic_hook.id,
         event_type: "topic",
         tag_ids: [Fabricate(:tag).id],
@@ -228,7 +230,7 @@ RSpec.describe Jobs::EmitWebHookEvent do
         body: "{\"topic\":{\"test\":\"some payload\"}}",
       ).to_return(body: "OK", status: 200)
 
-      subject.execute(
+      job.execute(
         web_hook_id: topic_hook.id,
         event_type: "topic",
         tag_ids: topic.tags.pluck(:id),
@@ -243,7 +245,7 @@ RSpec.describe Jobs::EmitWebHookEvent do
     fab!(:like_hook) { Fabricate(:like_web_hook, groups: [group]) }
 
     it "doesn't emit when event is not included any groups" do
-      subject.execute(
+      job.execute(
         web_hook_id: like_hook.id,
         event_type: "like",
         payload: { test: "some payload" }.to_json,
@@ -251,7 +253,7 @@ RSpec.describe Jobs::EmitWebHookEvent do
     end
 
     it "doesn't emit when event is not related with defined groups" do
-      subject.execute(
+      job.execute(
         web_hook_id: like_hook.id,
         event_type: "like",
         group_ids: [Fabricate(:group).id],
@@ -264,7 +266,7 @@ RSpec.describe Jobs::EmitWebHookEvent do
         body: "{\"like\":{\"test\":\"some payload\"}}",
       ).to_return(body: "OK", status: 200)
 
-      subject.execute(
+      job.execute(
         web_hook_id: like_hook.id,
         event_type: "like",
         group_ids: user.groups.pluck(:id),
@@ -281,7 +283,7 @@ RSpec.describe Jobs::EmitWebHookEvent do
       web_hook_id = Fabricate("#{topic_event_type.name}_web_hook").id
 
       expect do
-        subject.execute(
+        job.execute(
           web_hook_id: web_hook_id,
           event_type: topic_event_type.name,
           payload: { test: "some payload" }.to_json,
@@ -298,7 +300,7 @@ RSpec.describe Jobs::EmitWebHookEvent do
         status: 200,
       )
 
-      subject.execute(
+      job.execute(
         web_hook_id: post_hook.id,
         event_type: described_class::PING_EVENT,
         event_name: described_class::PING_EVENT,
@@ -324,7 +326,7 @@ RSpec.describe Jobs::EmitWebHookEvent do
     it "sets up proper request headers when an error raised" do
       stub_request(:post, post_hook.payload_url).to_raise("error")
 
-      subject.execute(
+      job.execute(
         web_hook_id: post_hook.id,
         event_type: described_class::PING_EVENT,
         event_name: described_class::PING_EVENT,
diff --git a/spec/jobs/enqueue_suspect_users_spec.rb b/spec/jobs/enqueue_suspect_users_spec.rb
index 125e2e0de4c..7ddaada92ea 100644
--- a/spec/jobs/enqueue_suspect_users_spec.rb
+++ b/spec/jobs/enqueue_suspect_users_spec.rb
@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
 RSpec.describe Jobs::EnqueueSuspectUsers do
+  subject(:job) { described_class.new }
+
   before { SiteSetting.approve_suspect_users = true }
 
   it "does nothing when there are no suspect users" do
-    subject.execute({})
+    job.execute({})
 
     expect(ReviewableUser.count).to be_zero
   end
@@ -13,7 +15,7 @@ RSpec.describe Jobs::EnqueueSuspectUsers do
     let!(:suspect_user) { Fabricate(:active_user, created_at: 1.day.ago) }
 
     it "creates a reviewable when there is a suspect user" do
-      subject.execute({})
+      job.execute({})
 
       expect(ReviewableUser.count).to eq(1)
     end
@@ -26,14 +28,14 @@ RSpec.describe Jobs::EnqueueSuspectUsers do
           reviewable_by_moderator: true,
         )
 
-      subject.execute({})
+      job.execute({})
 
       expect(ReviewableUser.count).to eq(1)
       expect(ReviewableUser.last).to eq(review_user)
     end
 
     it "adds a score" do
-      subject.execute({})
+      job.execute({})
       score = ReviewableScore.last
 
       expect(score.reason).to eq("suspect_user")
@@ -42,7 +44,7 @@ RSpec.describe Jobs::EnqueueSuspectUsers do
     it "only enqueues non-approved users" do
       suspect_user.update!(approved: true)
 
-      subject.execute({})
+      job.execute({})
 
       expect(ReviewableUser.where(target: suspect_user).exists?).to eq(false)
     end
@@ -51,7 +53,7 @@ RSpec.describe Jobs::EnqueueSuspectUsers do
       SiteSetting.must_approve_users = true
       suspect_user.update!(approved: false)
 
-      subject.execute({})
+      job.execute({})
 
       expect(ReviewableUser.where(target: suspect_user).exists?).to eq(false)
     end
@@ -59,7 +61,7 @@ RSpec.describe Jobs::EnqueueSuspectUsers do
     it "ignores users created more than six months ago" do
       suspect_user.update!(created_at: 1.year.ago)
 
-      subject.execute({})
+      job.execute({})
 
       expect(ReviewableUser.where(target: suspect_user).exists?).to eq(false)
     end
@@ -67,7 +69,7 @@ RSpec.describe Jobs::EnqueueSuspectUsers do
     it "ignores users that were imported from another site" do
       suspect_user.upsert_custom_fields({ import_id: "fake_id" })
 
-      subject.execute({})
+      job.execute({})
 
       expect(ReviewableUser.where(target: suspect_user).exists?).to eq(false)
     end
@@ -75,7 +77,7 @@ RSpec.describe Jobs::EnqueueSuspectUsers do
     it "enqueues a suspect users with custom fields" do
       suspect_user.upsert_custom_fields({ field_a: "value", field_b: "value" })
 
-      subject.execute({})
+      job.execute({})
 
       expect(ReviewableUser.where(target: suspect_user).exists?).to eq(true)
     end
@@ -85,7 +87,7 @@ RSpec.describe Jobs::EnqueueSuspectUsers do
         { field_a: "value", field_b: "value", import_id: "fake_id" },
       )
 
-      subject.execute({})
+      job.execute({})
 
       expect(ReviewableUser.where(target: suspect_user).exists?).to eq(false)
     end
@@ -97,7 +99,7 @@ RSpec.describe Jobs::EnqueueSuspectUsers do
         time_read: 30.seconds.to_i,
       )
 
-      subject.execute({})
+      job.execute({})
 
       expect(ReviewableUser.count).to eq(1)
     end
@@ -109,7 +111,7 @@ RSpec.describe Jobs::EnqueueSuspectUsers do
         time_read: 2.minutes.to_i,
       )
 
-      subject.execute({})
+      job.execute({})
 
       expect(ReviewableUser.count).to eq(0)
     end
diff --git a/spec/jobs/ensure_s3_uploads_existence_spec.rb b/spec/jobs/ensure_s3_uploads_existence_spec.rb
index 84d6e6c812a..846f58b5a5b 100644
--- a/spec/jobs/ensure_s3_uploads_existence_spec.rb
+++ b/spec/jobs/ensure_s3_uploads_existence_spec.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 RSpec.describe Jobs::EnsureS3UploadsExistence do
+  subject(:job) { described_class.new }
+
   context "with S3 inventory enabled" do
     before do
       setup_s3
@@ -9,21 +11,21 @@ RSpec.describe Jobs::EnsureS3UploadsExistence do
 
     it "works" do
       S3Inventory.any_instance.expects(:backfill_etags_and_list_missing).once
-      subject.execute({})
+      job.execute({})
     end
 
     it "doesn't execute when the site was restored within the last 48 hours" do
       S3Inventory.any_instance.expects(:backfill_etags_and_list_missing).never
       BackupMetadata.update_last_restore_date(47.hours.ago)
 
-      subject.execute({})
+      job.execute({})
     end
 
     it "executes when the site was restored more than 48 hours ago" do
       S3Inventory.any_instance.expects(:backfill_etags_and_list_missing).once
       BackupMetadata.update_last_restore_date(49.hours.ago)
 
-      subject.execute({})
+      job.execute({})
     end
   end
 
@@ -32,7 +34,7 @@ RSpec.describe Jobs::EnsureS3UploadsExistence do
 
     it "doesn't execute" do
       S3Inventory.any_instance.expects(:backfill_etags_and_list_missing).never
-      subject.execute({})
+      job.execute({})
     end
   end
 end
diff --git a/spec/jobs/export_user_archive_spec.rb b/spec/jobs/export_user_archive_spec.rb
index ea6f91cf1f8..b45d8e78d70 100644
--- a/spec/jobs/export_user_archive_spec.rb
+++ b/spec/jobs/export_user_archive_spec.rb
@@ -522,9 +522,11 @@ RSpec.describe Jobs::ExportUserArchive do
 
   describe "queued posts" do
     let(:component) { "queued_posts" }
-    let(:reviewable_post) { Fabricate(:reviewable_queued_post, topic: topic, created_by: user) }
+    let(:reviewable_post) do
+      Fabricate(:reviewable_queued_post, topic: topic, target_created_by: user)
+    end
     let(:reviewable_topic) do
-      Fabricate(:reviewable_queued_post_topic, category: category, created_by: user)
+      Fabricate(:reviewable_queued_post_topic, category: category, target_created_by: user)
     end
 
     it "correctly exports queued posts" do
diff --git a/spec/jobs/grant_anniversary_badges_spec.rb b/spec/jobs/grant_anniversary_badges_spec.rb
index 5cee3130870..57b54708c9b 100644
--- a/spec/jobs/grant_anniversary_badges_spec.rb
+++ b/spec/jobs/grant_anniversary_badges_spec.rb
@@ -12,6 +12,15 @@ RSpec.describe Jobs::GrantAnniversaryBadges do
     expect(badge).to be_blank
   end
 
+  it "doesn't award to a bot" do
+    user = Fabricate(:bot, created_at: 400.days.ago)
+    Fabricate(:post, user: user, created_at: 1.week.ago)
+    granter.execute({})
+
+    badge = user.user_badges.where(badge_id: Badge::Anniversary)
+    expect(badge).to be_blank
+  end
+
   it "doesn't award to an inactive user" do
     user = Fabricate(:user, created_at: 400.days.ago, active: false)
     Fabricate(:post, user: user, created_at: 1.week.ago)
@@ -30,6 +39,33 @@ RSpec.describe Jobs::GrantAnniversaryBadges do
     expect(badge).to be_blank
   end
 
+  it "doesn't award to a suspended user" do
+    user = Fabricate(:user, created_at: 400.days.ago, suspended_till: 1.year.from_now)
+    Fabricate(:post, user: user, created_at: 1.week.ago)
+    granter.execute({})
+
+    badge = user.user_badges.where(badge_id: Badge::Anniversary)
+    expect(badge).to be_blank
+  end
+
+  it "doesn't award to a staged user" do
+    user = Fabricate(:user, created_at: 400.days.ago, staged: true)
+    Fabricate(:post, user: user, created_at: 1.week.ago)
+    granter.execute({})
+
+    badge = user.user_badges.where(badge_id: Badge::Anniversary)
+    expect(badge).to be_blank
+  end
+
+  it "doesn't award to an anonymous user" do
+    user = Fabricate(:anonymous, created_at: 400.days.ago)
+    Fabricate(:post, user: user, created_at: 1.week.ago)
+    granter.execute({})
+
+    badge = user.user_badges.where(badge_id: Badge::Anniversary)
+    expect(badge).to be_blank
+  end
+
   it "doesn't award when a post is deleted" do
     user = Fabricate(:user, created_at: 400.days.ago)
     Fabricate(:post, user: user, created_at: 1.week.ago, deleted_at: 1.day.ago)
diff --git a/spec/jobs/ignored_users_summary_spec.rb b/spec/jobs/ignored_users_summary_spec.rb
index 461d94081a2..465ed1b3b0f 100644
--- a/spec/jobs/ignored_users_summary_spec.rb
+++ b/spec/jobs/ignored_users_summary_spec.rb
@@ -1,17 +1,17 @@
 # frozen_string_literal: true
 
 RSpec.describe Jobs::IgnoredUsersSummary do
+  subject(:job) { Jobs::IgnoredUsersSummary.new.execute({}) }
+
   before do
     SiteSetting.ignored_users_count_message_threshold = 1
     SiteSetting.ignored_users_message_gap_days = 365
   end
 
-  subject { Jobs::IgnoredUsersSummary.new.execute({}) }
-
   context "with no ignored users" do
     it "does nothing" do
-      subject
-      expect { subject }.to_not change { Post.count }
+      job
+      expect { job }.to_not change { Post.count }
     end
   end
 
@@ -30,14 +30,14 @@ RSpec.describe Jobs::IgnoredUsersSummary do
         before { SiteSetting.ignored_users_count_message_threshold = 5 }
 
         it "does nothing" do
-          subject
-          expect { subject }.to_not change { Post.count }
+          job
+          expect { job }.to_not change { Post.count }
         end
       end
 
       context "when threshold is hit" do
         it "creates a system message" do
-          subject
+          job
           posts =
             Post.joins(:topic).where(
               topics: {
@@ -57,15 +57,15 @@ RSpec.describe Jobs::IgnoredUsersSummary do
         before { SiteSetting.ignored_users_count_message_threshold = 5 }
 
         it "does nothing" do
-          subject
-          expect { subject }.to_not change { Post.count }
+          job
+          expect { job }.to_not change { Post.count }
         end
       end
 
       context "when threshold is hit" do
         it "does nothing" do
-          subject
-          expect { subject }.to_not change { Post.count }
+          job
+          expect { job }.to_not change { Post.count }
         end
       end
     end
diff --git a/spec/jobs/invalidate_inactive_admins_spec.rb b/spec/jobs/invalidate_inactive_admins_spec.rb
index 7c070aa5c1d..03707dfed90 100644
--- a/spec/jobs/invalidate_inactive_admins_spec.rb
+++ b/spec/jobs/invalidate_inactive_admins_spec.rb
@@ -1,14 +1,15 @@
 # frozen_string_literal: true
 
 RSpec.describe Jobs::InvalidateInactiveAdmins do
-  fab!(:active_admin) { Fabricate(:admin, last_seen_at: 1.hour.ago) }
-  before { active_admin.email_tokens.update_all(confirmed: true) }
+  subject(:job) { Jobs::InvalidateInactiveAdmins.new.execute({}) }
 
-  subject { Jobs::InvalidateInactiveAdmins.new.execute({}) }
+  fab!(:active_admin) { Fabricate(:admin, last_seen_at: 1.hour.ago) }
+
+  before { active_admin.email_tokens.update_all(confirmed: true) }
 
   it "does nothing when all admins have been seen recently" do
     SiteSetting.invalidate_inactive_admin_email_after_days = 365
-    subject
+    job
     expect(active_admin.reload.active).to eq(true)
     expect(active_admin.email_tokens.where(confirmed: true).exists?).to eq(true)
   end
@@ -21,12 +22,12 @@ RSpec.describe Jobs::InvalidateInactiveAdmins do
       before { SiteSetting.invalidate_inactive_admin_email_after_days = 365 }
 
       it "marks email tokens as unconfirmed" do
-        subject
+        job
         expect(not_seen_admin.reload.email_tokens.where(confirmed: true).exists?).to eq(false)
       end
 
       it "makes the user as not active and logs the action" do
-        subject
+        job
         expect(not_seen_admin.reload.active).to eq(false)
 
         log = UserHistory.last
@@ -35,7 +36,7 @@ RSpec.describe Jobs::InvalidateInactiveAdmins do
       end
 
       it "adds a staff log" do
-        subject
+        job
         expect(not_seen_admin.reload.active).to eq(false)
       end
 
@@ -52,20 +53,20 @@ RSpec.describe Jobs::InvalidateInactiveAdmins do
         end
 
         it "removes the social logins" do
-          subject
+          job
           expect(UserAssociatedAccount.where(user_id: not_seen_admin.id).exists?).to eq(false)
         end
       end
 
       it "doesn't deactivate admins with recent posts" do
         Fabricate(:post, user: not_seen_admin)
-        subject
+        job
         expect(not_seen_admin.reload.active).to eq(true)
       end
 
       it "doesn't deactivate admins with recently used api keys" do
         Fabricate(:api_key, user: not_seen_admin, last_used_at: 1.day.ago)
-        subject
+        job
         expect(not_seen_admin.reload.active).to eq(true)
       end
     end
@@ -74,7 +75,7 @@ RSpec.describe Jobs::InvalidateInactiveAdmins do
       before { SiteSetting.invalidate_inactive_admin_email_after_days = 0 }
 
       it "does nothing" do
-        subject
+        job
         expect(active_admin.reload.active).to eq(true)
         expect(active_admin.email_tokens.where(confirmed: true).exists?).to eq(true)
         expect(not_seen_admin.reload.active).to eq(true)
diff --git a/spec/jobs/jobs_base_spec.rb b/spec/jobs/jobs_base_spec.rb
index a76fed09e3b..0467758028c 100644
--- a/spec/jobs/jobs_base_spec.rb
+++ b/spec/jobs/jobs_base_spec.rb
@@ -22,6 +22,55 @@ RSpec.describe ::Jobs::Base do
     end
   end
 
+  class ConcurrentJob < ::Jobs::Base
+    cluster_concurrency 1
+
+    def self.stop!
+      @stop = true
+    end
+
+    def self.stop
+      @stop
+    end
+
+    def self.running?
+      @running
+    end
+
+    def self.running=(val)
+      @running = val
+    end
+
+    def execute(args)
+      self.class.running = true
+      sleep 0.0001 while !self.class.stop
+    ensure
+      self.class.running = false
+    end
+  end
+
+  it "handles job concurrency" do
+    ConcurrentJob.clear_cluster_concurrency_lock!
+
+    expect(ConcurrentJob.get_cluster_concurrency).to eq(1)
+    expect(BadJob.get_cluster_concurrency).to eq(nil)
+
+    expect(Sidekiq::Queues["default"].size).to eq(0)
+
+    thread = Thread.new { ConcurrentJob.new.perform({ "test" => 100 }) }
+
+    wait_for { ConcurrentJob.running? }
+
+    ConcurrentJob.new.perform({ "test" => 100 })
+    expect(Sidekiq::Queues["default"].size).to eq(1)
+
+    expect(Sidekiq::Queues["default"][0]["args"][0]).to eq("test" => 100)
+
+    ConcurrentJob.stop!
+
+    thread.join
+  end
+
   it "handles correct jobs" do
     job = GoodJob.new
     job.perform({})
diff --git a/spec/jobs/notify_reviewable_spec.rb b/spec/jobs/notify_reviewable_spec.rb
index 4eecaf75e13..4e3da51ffc7 100644
--- a/spec/jobs/notify_reviewable_spec.rb
+++ b/spec/jobs/notify_reviewable_spec.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 RSpec.describe Jobs::NotifyReviewable do
-  # remove all the legacy stuff here when redesigned_user_menu_enabled is
-  # removed
   describe "#execute" do
     fab!(:admin) { Fabricate(:admin, moderator: true) }
     fab!(:moderator) { Fabricate(:moderator) }
@@ -10,7 +8,7 @@ RSpec.describe Jobs::NotifyReviewable do
     fab!(:group) { group_user.group }
     fab!(:user) { group_user.user }
 
-    it "will notify users of new reviewable content for the new user menu" do
+    it "will notify users of new reviewable content for the user menu" do
       SiteSetting.navigation_menu = "sidebar"
       SiteSetting.enable_category_group_moderation = true
 
@@ -83,75 +81,6 @@ RSpec.describe Jobs::NotifyReviewable do
       expect(group_user_message.data[:unseen_reviewable_count]).to eq(1)
     end
 
-    it "will notify users of new reviewable content for the old user menu" do
-      SiteSetting.navigation_menu = "legacy"
-      SiteSetting.enable_category_group_moderation = true
-
-      GroupUser.create!(group_id: group.id, user_id: moderator.id)
-
-      # Content for admins only
-      admin_reviewable = Fabricate(:reviewable, reviewable_by_moderator: false)
-      admin.update!(last_seen_reviewable_id: admin_reviewable.id)
-
-      messages =
-        MessageBus.track_publish { described_class.new.execute(reviewable_id: admin_reviewable.id) }
-
-      expect(messages.size).to eq(1)
-
-      admin_message = messages.first
-
-      expect(admin_message.channel).to eq("/reviewable_counts")
-      expect(admin_message.user_ids).to eq([admin.id])
-      expect(admin_message.data[:reviewable_count]).to eq(1)
-      expect(admin_message.data.has_key?(:unseen_reviewable_count)).to eq(false)
-
-      # Content for moderators
-      moderator_reviewable = Fabricate(:reviewable, reviewable_by_moderator: true)
-
-      messages =
-        MessageBus.track_publish do
-          described_class.new.execute(reviewable_id: moderator_reviewable.id)
-        end
-
-      expect(messages.size).to eq(2)
-
-      admin_message = messages.find { |m| m.user_ids == [admin.id] }
-      expect(admin_message.channel).to eq("/reviewable_counts")
-      expect(admin_message.data[:reviewable_count]).to eq(2)
-      expect(admin_message.data.has_key?(:unseen_reviewable_count)).to eq(false)
-
-      moderator_message = messages.find { |m| m.user_ids == [moderator.id] }
-      expect(moderator_message.channel).to eq("/reviewable_counts")
-      expect(moderator_message.data[:reviewable_count]).to eq(1)
-      expect(moderator_message.data.key?(:unseen_reviewable_count)).to eq(false)
-
-      moderator.update!(last_seen_reviewable_id: moderator_reviewable.id)
-
-      # Content for a group
-      group_reviewable =
-        Fabricate(:reviewable, reviewable_by_moderator: true, reviewable_by_group: group)
-
-      messages =
-        MessageBus.track_publish { described_class.new.execute(reviewable_id: group_reviewable.id) }
-
-      expect(messages.size).to eq(3)
-
-      admin_message = messages.find { |m| m.user_ids == [admin.id] }
-      expect(admin_message.data[:reviewable_count]).to eq(3)
-      expect(admin_message.channel).to eq("/reviewable_counts")
-      expect(admin_message.data.key?(:unseen_reviewable_count)).to eq(false)
-
-      moderator_message = messages.find { |m| m.user_ids == [moderator.id] }
-      expect(moderator_message.data[:reviewable_count]).to eq(2)
-      expect(moderator_message.channel).to eq("/reviewable_counts")
-      expect(moderator_message.data.key?(:unseen_reviewable_count)).to eq(false)
-
-      group_user_message = messages.find { |m| m.user_ids == [user.id] }
-      expect(group_user_message.data[:reviewable_count]).to eq(1)
-      expect(group_user_message.channel).to eq("/reviewable_counts")
-      expect(group_user_message.data.key?(:unseen_reviewable_count)).to eq(false)
-    end
-
     it "won't notify a group when disabled" do
       SiteSetting.enable_category_group_moderation = false
 
@@ -167,71 +96,5 @@ RSpec.describe Jobs::NotifyReviewable do
 
       expect(group_user_message).to be_blank
     end
-
-    it "respects priority" do
-      SiteSetting.navigation_menu = "legacy"
-      SiteSetting.enable_category_group_moderation = true
-      Reviewable.set_priorities(medium: 2.0)
-      SiteSetting.reviewable_default_visibility = "medium"
-
-      GroupUser.create!(group_id: group.id, user_id: moderator.id)
-
-      # Content for admins only
-      admin_reviewable = Fabricate(:reviewable, reviewable_by_moderator: false)
-
-      messages =
-        MessageBus.track_publish("/reviewable_counts") do
-          described_class.new.execute(reviewable_id: admin_reviewable.id)
-        end
-
-      admin_message = messages.find { |m| m.user_ids.include?(admin.id) }
-      expect(admin_message.data[:reviewable_count]).to eq(0)
-
-      # Content for moderators
-      moderator_reviewable = Fabricate(:reviewable, reviewable_by_moderator: true)
-
-      messages =
-        MessageBus.track_publish("/reviewable_counts") do
-          described_class.new.execute(reviewable_id: moderator_reviewable.id)
-        end
-
-      admin_message = messages.find { |m| m.user_ids.include?(admin.id) }
-
-      expect(admin_message.data[:reviewable_count]).to eq(0)
-
-      moderator_message = messages.find { |m| m.user_ids.include?(moderator.id) }
-      expect(moderator_message.data[:reviewable_count]).to eq(0)
-
-      # Content for a group
-      group_reviewable =
-        Fabricate(:reviewable, reviewable_by_moderator: true, reviewable_by_group: group)
-
-      messages =
-        MessageBus.track_publish("/reviewable_counts") do
-          described_class.new.execute(reviewable_id: group_reviewable.id)
-        end
-
-      admin_message = messages.find { |m| m.user_ids.include?(admin.id) }
-      expect(admin_message.data[:reviewable_count]).to eq(0)
-
-      moderator_messages = messages.select { |m| m.user_ids.include?(moderator.id) }
-      expect(moderator_messages.size).to eq(1)
-      expect(moderator_messages[0].data[:reviewable_count]).to eq(0)
-
-      group_user_message = messages.find { |m| m.user_ids.include?(user.id) }
-      expect(group_user_message.data[:reviewable_count]).to eq(0)
-    end
-  end
-
-  it "skips sending notifications if user_ids is empty" do
-    reviewable = Fabricate(:reviewable, reviewable_by_moderator: true)
-    regular_user = Fabricate(:user)
-
-    messages =
-      MessageBus.track_publish("/reviewable_counts") do
-        described_class.new.execute(reviewable_id: reviewable.id)
-      end
-
-    expect(messages.size).to eq(0)
   end
 end
diff --git a/spec/jobs/pending_reviewables_reminder_spec.rb b/spec/jobs/pending_reviewables_reminder_spec.rb
index bb3fa0f4c76..2e5663588e0 100644
--- a/spec/jobs/pending_reviewables_reminder_spec.rb
+++ b/spec/jobs/pending_reviewables_reminder_spec.rb
@@ -20,8 +20,8 @@ RSpec.describe Jobs::PendingReviewablesReminder do
     expect(execute.sent_reminder).to eq(false)
   end
 
-  context "when notify_about_flags_after is 0" do
-    before { SiteSetting.notify_about_flags_after = 0 }
+  context "when notify_about_reviewable_item_after is 0" do
+    before { SiteSetting.notify_about_reviewable_item_after = 0 }
 
     it "never notifies" do
       create_flag(50.hours.ago)
@@ -29,8 +29,8 @@ RSpec.describe Jobs::PendingReviewablesReminder do
     end
   end
 
-  context "when notify_about_flags_after accepts a float" do
-    before { SiteSetting.notify_about_flags_after = 0.25 }
+  context "when notify_about_reviewable_item_after accepts a float" do
+    before { SiteSetting.notify_about_reviewable_item_after = 0.25 }
 
     it "doesn't send message when flags are less than 15 minutes old" do
       create_flag(14.minutes.ago)
@@ -43,9 +43,9 @@ RSpec.describe Jobs::PendingReviewablesReminder do
     end
   end
 
-  context "when notify_about_flags_after is 48" do
+  context "when notify_about_reviewable_item_after is 48" do
     before do
-      SiteSetting.notify_about_flags_after = 48
+      SiteSetting.notify_about_reviewable_item_after = 48
       described_class.clear_key
     end
 
diff --git a/spec/jobs/poll_mailbox_spec.rb b/spec/jobs/poll_mailbox_spec.rb
index ab6162e60b1..a4ad5aa0537 100644
--- a/spec/jobs/poll_mailbox_spec.rb
+++ b/spec/jobs/poll_mailbox_spec.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require "email/poller"
 
 RSpec.describe Jobs::PollMailbox do
   let(:poller) { Jobs::PollMailbox.new }
@@ -175,4 +176,45 @@ RSpec.describe Jobs::PollMailbox do
       )
     end
   end
+
+  describe "poller plugin" do
+    let(:poller_plugin) do
+      Class
+        .new(described_class) do
+          def set_enabled(e)
+            @enabled = e
+          end
+
+          def enabled?
+            @enabled
+          end
+
+          def poll_mailbox(process_cb)
+            process_cb.call(file_from_fixtures("original_message.eml", "emails"))
+          end
+        end
+        .new
+    end
+
+    let(:plugin) { Plugin::Instance.new }
+
+    before(:each) { plugin.register_email_poller(poller_plugin) }
+
+    after(:each) do
+      Discourse.plugins.delete plugin
+      DiscoursePluginRegistry.reset!
+    end
+
+    it "doesn't call process method when plugin is not active" do
+      poller_plugin.set_enabled(false)
+      poller.expects(:process_popmail).never
+      poller.execute({})
+    end
+
+    it "calls process method when plugin is active" do
+      poller_plugin.set_enabled(true)
+      poller.expects(:process_popmail).once
+      poller.execute({})
+    end
+  end
 end
diff --git a/spec/jobs/post_update_topic_tracking_state_spec.rb b/spec/jobs/post_update_topic_tracking_state_spec.rb
index 442f5574018..144887a9ddb 100644
--- a/spec/jobs/post_update_topic_tracking_state_spec.rb
+++ b/spec/jobs/post_update_topic_tracking_state_spec.rb
@@ -1,16 +1,18 @@
 # frozen_string_literal: true
 
 RSpec.describe Jobs::PostUpdateTopicTrackingState do
+  subject(:job) { described_class.new }
+
   fab!(:post) { Fabricate(:post) }
 
   it "should publish messages" do
-    messages = MessageBus.track_publish { subject.execute({ post_id: post.id }) }
+    messages = MessageBus.track_publish { job.execute({ post_id: post.id }) }
     expect(messages.size).not_to eq(0)
   end
 
   it "should not publish messages for deleted topics" do
     post.topic.trash!
-    messages = MessageBus.track_publish { subject.execute({ post_id: post.id }) }
+    messages = MessageBus.track_publish { job.execute({ post_id: post.id }) }
     expect(messages.size).to eq(0)
   end
 end
diff --git a/spec/jobs/process_shelved_notifications_spec.rb b/spec/jobs/process_shelved_notifications_spec.rb
index f0e419f733c..44146c57147 100644
--- a/spec/jobs/process_shelved_notifications_spec.rb
+++ b/spec/jobs/process_shelved_notifications_spec.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 RSpec.describe Jobs::ProcessShelvedNotifications do
+  subject(:job) { described_class.new }
+
   fab!(:user) { Fabricate(:user) }
   let(:post) { Fabricate(:post) }
 
@@ -8,7 +10,7 @@ RSpec.describe Jobs::ProcessShelvedNotifications do
     future = Fabricate(:do_not_disturb_timing, ends_at: 1.day.from_now)
     past = Fabricate(:do_not_disturb_timing, starts_at: 2.day.ago, ends_at: 1.minute.ago)
 
-    expect { subject.execute({}) }.to change { DoNotDisturbTiming.count }.by (-1)
+    expect { job.execute({}) }.to change { DoNotDisturbTiming.count }.by (-1)
     expect(DoNotDisturbTiming.find_by(id: future.id)).to eq(future)
     expect(DoNotDisturbTiming.find_by(id: past.id)).to eq(nil)
   end
@@ -25,7 +27,7 @@ RSpec.describe Jobs::ProcessShelvedNotifications do
         notification_type: 1,
       )
     expect(notification.shelved_notification).to be_present
-    subject.execute({})
+    job.execute({})
     expect(notification.shelved_notification).to be_present
   end
 
@@ -43,7 +45,7 @@ RSpec.describe Jobs::ProcessShelvedNotifications do
     user.do_not_disturb_timings.last.update(ends_at: 1.days.ago)
 
     expect(notification.shelved_notification).to be_present
-    subject.execute({})
+    job.execute({})
     expect { notification.shelved_notification.reload }.to raise_error(ActiveRecord::RecordNotFound)
   end
 end
diff --git a/spec/jobs/pull_hotlinked_images_spec.rb b/spec/jobs/pull_hotlinked_images_spec.rb
index 3f842c275c1..e722cd35e99 100644
--- a/spec/jobs/pull_hotlinked_images_spec.rb
+++ b/spec/jobs/pull_hotlinked_images_spec.rb
@@ -472,25 +472,25 @@ RSpec.describe Jobs::PullHotlinkedImages do
   end
 
   describe "#should_download_image?" do
-    subject { described_class.new }
+    subject(:job) { described_class.new }
 
     describe "when url is invalid" do
       it "should return false" do
-        expect(subject.should_download_image?("null")).to eq(false)
-        expect(subject.should_download_image?("meta.discourse.org")).to eq(false)
+        expect(job.should_download_image?("null")).to eq(false)
+        expect(job.should_download_image?("meta.discourse.org")).to eq(false)
       end
     end
 
     describe "when url is valid" do
       it "should return true" do
-        expect(subject.should_download_image?("http://meta.discourse.org")).to eq(true)
-        expect(subject.should_download_image?("//meta.discourse.org")).to eq(true)
+        expect(job.should_download_image?("http://meta.discourse.org")).to eq(true)
+        expect(job.should_download_image?("//meta.discourse.org")).to eq(true)
       end
     end
 
     describe "when url is an upload" do
       it "should return false for original" do
-        expect(subject.should_download_image?(Fabricate(:upload).url)).to eq(false)
+        expect(job.should_download_image?(Fabricate(:upload).url)).to eq(false)
       end
 
       context "when secure uploads enabled" do
@@ -501,19 +501,19 @@ RSpec.describe Jobs::PullHotlinkedImages do
           upload = Fabricate(:upload_s3, secure: true)
           stub_s3(upload)
           url = Upload.secure_uploads_url_from_upload_url(upload.url)
-          expect(subject.should_download_image?(url)).to eq(false)
+          expect(job.should_download_image?(url)).to eq(false)
         end
       end
 
       it "should return true for optimized" do
         src = Discourse.store.get_path_for_optimized_image(Fabricate(:optimized_image))
-        expect(subject.should_download_image?(src)).to eq(true)
+        expect(job.should_download_image?(src)).to eq(true)
       end
     end
 
     it "returns false for emoji" do
       src = Emoji.url_for("testemoji.png")
-      expect(subject.should_download_image?(src)).to eq(false)
+      expect(job.should_download_image?(src)).to eq(false)
     end
 
     it "returns false for emoji when app and S3 CDNs configured" do
@@ -522,14 +522,14 @@ RSpec.describe Jobs::PullHotlinkedImages do
       set_cdn_url "https://mydomain.cdn/test"
 
       src = UrlHelper.cook_url(Emoji.url_for("testemoji.png"))
-      expect(subject.should_download_image?(src)).to eq(false)
+      expect(job.should_download_image?(src)).to eq(false)
     end
 
     it "returns false for emoji when emoji CDN configured" do
       SiteSetting.external_emoji_url = "https://emoji.cdn.com"
 
       src = UrlHelper.cook_url(Emoji.url_for("testemoji.png"))
-      expect(subject.should_download_image?(src)).to eq(false)
+      expect(job.should_download_image?(src)).to eq(false)
     end
 
     it "returns false for emoji when app, S3 *and* emoji CDNs configured" do
@@ -539,17 +539,17 @@ RSpec.describe Jobs::PullHotlinkedImages do
       set_cdn_url "https://mydomain.cdn/test"
 
       src = UrlHelper.cook_url(Emoji.url_for("testemoji.png"))
-      expect(subject.should_download_image?(src)).to eq(false)
+      expect(job.should_download_image?(src)).to eq(false)
     end
 
     it "returns false for plugin assets" do
       src = UrlHelper.cook_url("/plugins/discourse-amazing-plugin/myasset.png")
-      expect(subject.should_download_image?(src)).to eq(false)
+      expect(job.should_download_image?(src)).to eq(false)
     end
 
     it "returns false for local non-uploaded files" do
       src = UrlHelper.cook_url("/mycustomroute.png")
-      expect(subject.should_download_image?(src)).to eq(false)
+      expect(job.should_download_image?(src)).to eq(false)
     end
 
     context "when download_remote_images_to_local? is false" do
@@ -557,11 +557,11 @@ RSpec.describe Jobs::PullHotlinkedImages do
 
       it "still returns true for optimized" do
         src = Discourse.store.get_path_for_optimized_image(Fabricate(:optimized_image))
-        expect(subject.should_download_image?(src)).to eq(true)
+        expect(job.should_download_image?(src)).to eq(true)
       end
 
       it "returns false for valid remote URLs" do
-        expect(subject.should_download_image?("http://meta.discourse.org")).to eq(false)
+        expect(job.should_download_image?("http://meta.discourse.org")).to eq(false)
       end
     end
   end
diff --git a/spec/jobs/purge_expired_ignored_users_spec.rb b/spec/jobs/purge_expired_ignored_users_spec.rb
index 67f74e53310..90e4c6e86c4 100644
--- a/spec/jobs/purge_expired_ignored_users_spec.rb
+++ b/spec/jobs/purge_expired_ignored_users_spec.rb
@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 RSpec.describe Jobs::PurgeExpiredIgnoredUsers do
-  subject { Jobs::PurgeExpiredIgnoredUsers.new.execute({}) }
+  subject(:job) { Jobs::PurgeExpiredIgnoredUsers.new.execute({}) }
 
   context "with no ignored users" do
     it "does nothing" do
-      expect { subject }.to_not change { IgnoredUser.count }
+      expect { job }.to_not change { IgnoredUser.count }
     end
   end
 
@@ -21,7 +21,7 @@ RSpec.describe Jobs::PurgeExpiredIgnoredUsers do
 
     context "when no expired ignored users" do
       it "does nothing" do
-        expect { subject }.to_not change { IgnoredUser.count }
+        expect { job }.to_not change { IgnoredUser.count }
       end
     end
 
@@ -32,7 +32,7 @@ RSpec.describe Jobs::PurgeExpiredIgnoredUsers do
         Fabricate(:ignored_user, user: tarek, ignored_user: fred, expiring_at: 1.month.from_now)
 
         freeze_time(2.months.from_now) do
-          subject
+          job
           expect(IgnoredUser.find_by(ignored_user: fred)).to be_nil
         end
       end
diff --git a/spec/jobs/regular/group_smtp_email_spec.rb b/spec/jobs/regular/group_smtp_email_spec.rb
index 475e939d9b1..25108a6d2a1 100644
--- a/spec/jobs/regular/group_smtp_email_spec.rb
+++ b/spec/jobs/regular/group_smtp_email_spec.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 RSpec.describe Jobs::GroupSmtpEmail do
+  subject(:job) { described_class.new }
+
   fab!(:topic) { Fabricate(:private_message_topic, title: "Help I need support") }
   fab!(:post) do
     Fabricate(:post, topic: topic, raw: "some first post content")
@@ -46,11 +48,11 @@ RSpec.describe Jobs::GroupSmtpEmail do
         bcc_addresses: [],
       )
       .returns(message)
-    subject.execute(args)
+    job.execute(args)
   end
 
   it "includes a 'reply above this line' message" do
-    subject.execute(args)
+    job.execute(args)
     email_log =
       EmailLog.find_by(post_id: post.id, topic_id: post.topic_id, user_id: recipient_user.id)
     expect(email_log.as_mail_message.html_part.to_s).to include(
@@ -59,7 +61,7 @@ RSpec.describe Jobs::GroupSmtpEmail do
   end
 
   it "does not include context posts" do
-    subject.execute(args)
+    job.execute(args)
     email_log =
       EmailLog.find_by(post_id: post.id, topic_id: post.topic_id, user_id: recipient_user.id)
     expect(email_log.as_mail_message.text_part.to_s).not_to include(
@@ -72,7 +74,7 @@ RSpec.describe Jobs::GroupSmtpEmail do
     second_post = topic.posts.find_by(post_number: 2)
     post.update!(reply_to_post_number: 1, reply_to_user: second_post.user)
     PostReply.create(post: second_post, reply: post)
-    subject.execute(args)
+    job.execute(args)
     email_log =
       EmailLog.find_by(post_id: post.id, topic_id: post.topic_id, user_id: recipient_user.id)
     expect(email_log.raw_headers).to include(
@@ -84,7 +86,7 @@ RSpec.describe Jobs::GroupSmtpEmail do
   end
 
   it "includes the participants in the correct format (but not the recipient user), and does not have links for the staged users" do
-    subject.execute(args)
+    job.execute(args)
     email_log =
       EmailLog.find_by(post_id: post.id, topic_id: post.topic_id, user_id: recipient_user.id)
     email_text = email_log.as_mail_message.text_part.to_s
@@ -98,7 +100,7 @@ RSpec.describe Jobs::GroupSmtpEmail do
   end
 
   it "creates an EmailLog record with the correct details" do
-    subject.execute(args)
+    job.execute(args)
     email_log =
       EmailLog.find_by(post_id: post.id, topic_id: post.topic_id, user_id: recipient_user.id)
     expect(email_log).not_to eq(nil)
@@ -106,7 +108,7 @@ RSpec.describe Jobs::GroupSmtpEmail do
   end
 
   it "creates an IncomingEmail record with the correct details to avoid double processing IMAP" do
-    subject.execute(args)
+    job.execute(args)
     expect(ActionMailer::Base.deliveries.count).to eq(1)
     expect(ActionMailer::Base.deliveries.last.subject).to eq("Re: Help I need support")
     incoming_email =
@@ -120,7 +122,7 @@ RSpec.describe Jobs::GroupSmtpEmail do
   end
 
   it "does not create a post reply key, it always replies to the group email_username" do
-    subject.execute(args)
+    job.execute(args)
     expect(ActionMailer::Base.deliveries.count).to eq(1)
     expect(ActionMailer::Base.deliveries.last.subject).to eq("Re: Help I need support")
     email_log =
@@ -132,7 +134,7 @@ RSpec.describe Jobs::GroupSmtpEmail do
   end
 
   it "creates an EmailLog record with the correct details" do
-    subject.execute(args)
+    job.execute(args)
     expect(ActionMailer::Base.deliveries.count).to eq(1)
     expect(ActionMailer::Base.deliveries.last.subject).to eq("Re: Help I need support")
     email_log =
@@ -142,7 +144,7 @@ RSpec.describe Jobs::GroupSmtpEmail do
   end
 
   it "creates an IncomingEmail record with the correct details to avoid double processing IMAP" do
-    subject.execute(args)
+    job.execute(args)
     expect(ActionMailer::Base.deliveries.count).to eq(1)
     expect(ActionMailer::Base.deliveries.last.subject).to eq("Re: Help I need support")
     incoming_email =
@@ -156,7 +158,7 @@ RSpec.describe Jobs::GroupSmtpEmail do
   end
 
   it "does not create a post reply key, it always replies to the group email_username" do
-    subject.execute(args)
+    job.execute(args)
     expect(ActionMailer::Base.deliveries.count).to eq(1)
     expect(ActionMailer::Base.deliveries.last.subject).to eq("Re: Help I need support")
     email_log =
@@ -169,7 +171,7 @@ RSpec.describe Jobs::GroupSmtpEmail do
 
   it "falls back to the group name if full name is blank" do
     group.update(full_name: "")
-    subject.execute(args)
+    job.execute(args)
     expect(ActionMailer::Base.deliveries.count).to eq(1)
     expect(ActionMailer::Base.deliveries.last.subject).to eq("Re: Help I need support")
     email_log =
@@ -178,7 +180,7 @@ RSpec.describe Jobs::GroupSmtpEmail do
   end
 
   it "has the group_smtp_id and the to_address filled in correctly" do
-    subject.execute(args)
+    job.execute(args)
     expect(ActionMailer::Base.deliveries.count).to eq(1)
     expect(ActionMailer::Base.deliveries.last.subject).to eq("Re: Help I need support")
     email_log =
@@ -190,7 +192,7 @@ RSpec.describe Jobs::GroupSmtpEmail do
   it "drops malformed cc addresses when sending the email" do
     args2 = args.clone
     args2[:cc_emails] << "somebadccemail@test.com<mailto:somebadccemail@test.com"
-    subject.execute(args2)
+    job.execute(args2)
     expect(ActionMailer::Base.deliveries.count).to eq(1)
     last_email = ActionMailer::Base.deliveries.last
     expect(last_email.subject).to eq("Re: Help I need support")
@@ -199,7 +201,7 @@ RSpec.describe Jobs::GroupSmtpEmail do
 
   context "when there are cc_addresses" do
     it "has the cc_addresses and cc_user_ids filled in correctly" do
-      subject.execute(args)
+      job.execute(args)
       expect(ActionMailer::Base.deliveries.count).to eq(1)
       sent_mail = ActionMailer::Base.deliveries.last
       expect(sent_mail.subject).to eq("Re: Help I need support")
@@ -212,7 +214,7 @@ RSpec.describe Jobs::GroupSmtpEmail do
 
     it "where cc_addresses match non-staged users, convert to bcc_addresses" do
       staged2.update!(staged: false, active: true)
-      subject.execute(args)
+      job.execute(args)
       expect(ActionMailer::Base.deliveries.count).to eq(1)
       sent_mail = ActionMailer::Base.deliveries.last
       expect(sent_mail.subject).to eq("Re: Help I need support")
@@ -233,7 +235,7 @@ RSpec.describe Jobs::GroupSmtpEmail do
       before { group.update!(imap_enabled: true) }
 
       it "aborts and does not send a group SMTP email; the OP is the one that sent the email in the first place" do
-        expect { subject.execute(args) }.not_to(change { EmailLog.count })
+        expect { job.execute(args) }.not_to(change { EmailLog.count })
         expect(ActionMailer::Base.deliveries.count).to eq(0)
       end
     end
@@ -242,7 +244,7 @@ RSpec.describe Jobs::GroupSmtpEmail do
       before { group.update!(imap_enabled: false) }
 
       it "sends the email as expected" do
-        subject.execute(args)
+        job.execute(args)
         expect(ActionMailer::Base.deliveries.count).to eq(1)
       end
     end
@@ -251,7 +253,7 @@ RSpec.describe Jobs::GroupSmtpEmail do
   context "when the post is deleted" do
     it "aborts and adds a skipped email log" do
       post.trash!
-      subject.execute(args)
+      job.execute(args)
       expect(ActionMailer::Base.deliveries.count).to eq(0)
       expect(
         SkippedEmailLog.exists?(
@@ -268,7 +270,7 @@ RSpec.describe Jobs::GroupSmtpEmail do
   context "when the topic is deleted" do
     it "aborts and adds a skipped email log" do
       post.topic.trash!
-      subject.execute(args)
+      job.execute(args)
       expect(ActionMailer::Base.deliveries.count).to eq(0)
       expect(
         SkippedEmailLog.exists?(
@@ -285,7 +287,7 @@ RSpec.describe Jobs::GroupSmtpEmail do
   context "when smtp is not enabled" do
     it "returns without sending email" do
       SiteSetting.enable_smtp = false
-      subject.execute(args)
+      job.execute(args)
       expect(ActionMailer::Base.deliveries.count).to eq(0)
     end
   end
@@ -293,7 +295,7 @@ RSpec.describe Jobs::GroupSmtpEmail do
   context "when disable_emails is yes" do
     it "returns without sending email" do
       SiteSetting.disable_emails = "yes"
-      subject.execute(args)
+      job.execute(args)
       expect(ActionMailer::Base.deliveries.count).to eq(0)
     end
   end
@@ -301,7 +303,7 @@ RSpec.describe Jobs::GroupSmtpEmail do
   context "when group is deleted" do
     it "returns without sending email" do
       group.destroy
-      subject.execute(args)
+      job.execute(args)
       expect(ActionMailer::Base.deliveries.count).to eq(0)
     end
   end
@@ -309,7 +311,7 @@ RSpec.describe Jobs::GroupSmtpEmail do
   context "when smtp is not enabled for the group" do
     it "returns without sending email" do
       group.update!(smtp_enabled: false)
-      subject.execute(args)
+      job.execute(args)
       expect(ActionMailer::Base.deliveries.count).to eq(0)
       expect(
         SkippedEmailLog.exists?(
diff --git a/spec/jobs/regular/publish_group_membership_updates_spec.rb b/spec/jobs/regular/publish_group_membership_updates_spec.rb
index 6f5479b090b..559df03ecdd 100644
--- a/spec/jobs/regular/publish_group_membership_updates_spec.rb
+++ b/spec/jobs/regular/publish_group_membership_updates_spec.rb
@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 
 describe Jobs::PublishGroupMembershipUpdates do
+  subject(:job) { described_class.new }
+
   fab!(:user) { Fabricate(:user) }
   fab!(:group) { Fabricate(:group) }
 
   it "publishes events for added users" do
     events =
       DiscourseEvent.track_events do
-        subject.execute(user_ids: [user.id], group_id: group.id, type: "add")
+        job.execute(user_ids: [user.id], group_id: group.id, type: "add")
       end
 
     expect(events).to include(
@@ -19,7 +21,7 @@ describe Jobs::PublishGroupMembershipUpdates do
   it "publishes events for removed users" do
     events =
       DiscourseEvent.track_events do
-        subject.execute(user_ids: [user.id], group_id: group.id, type: "remove")
+        job.execute(user_ids: [user.id], group_id: group.id, type: "remove")
       end
 
     expect(events).to include(event_name: :user_removed_from_group, params: [user, group])
@@ -27,9 +29,7 @@ describe Jobs::PublishGroupMembershipUpdates do
 
   it "does nothing if the group doesn't exist" do
     events =
-      DiscourseEvent.track_events do
-        subject.execute(user_ids: [user.id], group_id: nil, type: "add")
-      end
+      DiscourseEvent.track_events { job.execute(user_ids: [user.id], group_id: nil, type: "add") }
 
     expect(events).not_to include(
       event_name: :user_added_to_group,
@@ -38,7 +38,7 @@ describe Jobs::PublishGroupMembershipUpdates do
   end
 
   it "fails when the update type is invalid" do
-    expect { subject.execute(user_ids: [user.id], group_id: nil, type: nil) }.to raise_error(
+    expect { job.execute(user_ids: [user.id], group_id: nil, type: nil) }.to raise_error(
       Discourse::InvalidParameters,
     )
   end
@@ -46,7 +46,7 @@ describe Jobs::PublishGroupMembershipUpdates do
   it "does nothing when the user is not human" do
     events =
       DiscourseEvent.track_events do
-        subject.execute(user_ids: [Discourse.system_user.id], group_id: nil, type: "add")
+        job.execute(user_ids: [Discourse.system_user.id], group_id: nil, type: "add")
       end
 
     expect(events).not_to include(
diff --git a/spec/jobs/reindex_search_spec.rb b/spec/jobs/reindex_search_spec.rb
index ae63f64d055..0aefc88afbb 100644
--- a/spec/jobs/reindex_search_spec.rb
+++ b/spec/jobs/reindex_search_spec.rb
@@ -1,12 +1,15 @@
 # frozen_string_literal: true
 
 RSpec.describe Jobs::ReindexSearch do
+  subject(:job) { described_class.new }
+
+  let(:locale) { "fr" }
+
   before do
     SearchIndexer.enable
     Jobs.run_immediately!
   end
 
-  let(:locale) { "fr" }
   # This works since test db has a small record less than limit.
   # Didn't check `topic` because topic doesn't have posts in fabrication
   # thus no search data
@@ -15,7 +18,7 @@ RSpec.describe Jobs::ReindexSearch do
       SiteSetting.default_locale = "en"
       model = Fabricate(m.to_sym)
       SiteSetting.default_locale = locale
-      subject.execute({})
+      job.execute({})
       expect(model.public_send("#{m}_search_data").locale).to eq locale
     end
 
@@ -26,7 +29,7 @@ RSpec.describe Jobs::ReindexSearch do
       search_data.update!(version: 0)
       model.reload
 
-      subject.execute({})
+      job.execute({})
       expect(model.public_send("#{m}_search_data").version).to eq(
         "SearchIndexer::#{m.upcase}_INDEX_VERSION".constantize,
       )
@@ -64,15 +67,15 @@ RSpec.describe Jobs::ReindexSearch do
       post2.topic.trash!
       post3.trash!
 
-      subject.rebuild_posts(indexer: FakeIndexer)
+      job.rebuild_posts(indexer: FakeIndexer)
 
       expect(FakeIndexer.posts).to contain_exactly(post)
     end
 
     it "should not reindex posts with a developmental version" do
-      post = Fabricate(:post, version: SearchIndexer::MIN_POST_REINDEX_VERSION + 1)
+      Fabricate(:post, version: SearchIndexer::POST_INDEX_VERSION + 1)
 
-      subject.rebuild_posts(indexer: FakeIndexer)
+      job.rebuild_posts(indexer: FakeIndexer)
 
       expect(FakeIndexer.posts).to eq([])
     end
@@ -85,7 +88,7 @@ RSpec.describe Jobs::ReindexSearch do
 
       post2.save!(validate: false)
 
-      subject.rebuild_posts(indexer: FakeIndexer)
+      job.rebuild_posts(indexer: FakeIndexer)
 
       expect(FakeIndexer.posts).to contain_exactly(post)
     end
@@ -100,7 +103,7 @@ RSpec.describe Jobs::ReindexSearch do
 
       freeze_time(1.day.ago) { topic.trash! }
 
-      expect { subject.execute({}) }.to change { TopicSearchData.count }.by(-1)
+      expect { job.execute({}) }.to change { TopicSearchData.count }.by(-1)
       expect(Topic.pluck(:id)).to contain_exactly(topic2.id)
 
       expect(TopicSearchData.pluck(:topic_id)).to contain_exactly(topic2.topic_search_data.topic_id)
@@ -124,7 +127,7 @@ RSpec.describe Jobs::ReindexSearch do
         post6.trash!
       end
 
-      expect { subject.execute({}) }.to change { PostSearchData.count }.by(-3)
+      expect { job.execute({}) }.to change { PostSearchData.count }.by(-3)
 
       expect(Post.pluck(:id)).to contain_exactly(post.id, post2.id, post3.id, post4.id, post5.id)
 
diff --git a/spec/jobs/sync_topic_user_bookmarked_spec.rb b/spec/jobs/sync_topic_user_bookmarked_spec.rb
index 3938085fe38..a66ea21393c 100644
--- a/spec/jobs/sync_topic_user_bookmarked_spec.rb
+++ b/spec/jobs/sync_topic_user_bookmarked_spec.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 RSpec.describe Jobs::SyncTopicUserBookmarked do
+  subject(:job) { described_class.new }
+
   fab!(:topic) { Fabricate(:topic) }
   fab!(:post1) { Fabricate(:post, topic: topic) }
   fab!(:post2) { Fabricate(:post, topic: topic) }
@@ -16,7 +18,7 @@ RSpec.describe Jobs::SyncTopicUserBookmarked do
     Fabricate(:bookmark, user: tu1.user, bookmarkable: topic.posts.sample)
     Fabricate(:bookmark, user: tu4.user, bookmarkable: topic.posts.sample)
 
-    subject.execute(topic_id: topic.id)
+    job.execute(topic_id: topic.id)
 
     expect(tu1.reload.bookmarked).to eq(true)
     expect(tu2.reload.bookmarked).to eq(false)
@@ -31,7 +33,7 @@ RSpec.describe Jobs::SyncTopicUserBookmarked do
 
     post1.trash!
 
-    subject.execute(topic_id: topic.id)
+    job.execute(topic_id: topic.id)
 
     expect(tu1.reload.bookmarked).to eq(false)
     expect(tu2.reload.bookmarked).to eq(false)
@@ -41,7 +43,7 @@ RSpec.describe Jobs::SyncTopicUserBookmarked do
     Fabricate(:bookmark, user: tu1.user, bookmarkable: topic.posts.sample)
     Fabricate(:bookmark, user: tu4.user, bookmarkable: topic.posts.sample)
 
-    subject.execute
+    job.execute
 
     expect(tu1.reload.bookmarked).to eq(true)
     expect(tu2.reload.bookmarked).to eq(false)
diff --git a/spec/jobs/tl3_promotions_spec.rb b/spec/jobs/tl3_promotions_spec.rb
index d1f44556658..28fc7439591 100644
--- a/spec/jobs/tl3_promotions_spec.rb
+++ b/spec/jobs/tl3_promotions_spec.rb
@@ -133,5 +133,19 @@ RSpec.describe Jobs::Tl3Promotions do
       run_job
       expect(user.reload.trust_level).to eq(TrustLevel[3])
     end
+
+    it "doesn't error if user is missing email records" do
+      user = nil
+
+      freeze_time 4.days.ago do
+        user = create_leader_user
+      end
+      user.user_emails.delete_all
+
+      TrustLevel3Requirements.any_instance.stubs(:requirements_met?).returns(false)
+      TrustLevel3Requirements.any_instance.stubs(:requirements_lost?).returns(true)
+      run_job
+      expect(user.reload.trust_level).to eq(TrustLevel[2])
+    end
   end
 end
diff --git a/spec/jobs/topic_timer_enqueuer_spec.rb b/spec/jobs/topic_timer_enqueuer_spec.rb
index 95f73fd93ef..1d8fa534b3c 100644
--- a/spec/jobs/topic_timer_enqueuer_spec.rb
+++ b/spec/jobs/topic_timer_enqueuer_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe Jobs::TopicTimerEnqueuer do
-  subject { described_class.new }
+  subject(:job) { described_class.new }
 
   fab!(:timer1) do
     Fabricate(
@@ -40,20 +40,20 @@ RSpec.describe Jobs::TopicTimerEnqueuer do
 
   it "does not enqueue deleted timers" do
     expect_not_enqueued_with(job: :close_topic, args: { topic_timer_id: deleted_timer.id })
-    subject.execute
+    job.execute
     expect(deleted_timer.topic.reload.closed?).to eq(false)
   end
 
   it "does not enqueue future timers" do
     expect_not_enqueued_with(job: :close_topic, args: { topic_timer_id: future_timer.id })
-    subject.execute
+    job.execute
     expect(future_timer.topic.reload.closed?).to eq(false)
   end
 
   it "enqueues the related job" do
     expect_not_enqueued_with(job: :close_topic, args: { topic_timer_id: deleted_timer.id })
     expect_not_enqueued_with(job: :close_topic, args: { topic_timer_id: future_timer.id })
-    subject.execute
+    job.execute
     expect_job_enqueued(job: :close_topic, args: { topic_timer_id: timer1.id })
     expect_job_enqueued(job: :open_topic, args: { topic_timer_id: timer2.id })
   end
@@ -61,11 +61,11 @@ RSpec.describe Jobs::TopicTimerEnqueuer do
   it "does not re-enqueue a job that has already been scheduled ahead of time in sidekiq (legacy topic timers)" do
     expect_not_enqueued_with(job: :close_topic, args: { topic_timer_id: timer1.id })
     Jobs.enqueue_at(1.hours.from_now, :close_topic, topic_timer_id: timer1.id)
-    subject.execute
+    job.execute
   end
 
   it "does not fail to enqueue other timers just because one timer errors" do
     TopicTimer.any_instance.stubs(:enqueue_typed_job).raises(StandardError).then.returns(true)
-    expect { subject.execute }.not_to raise_error
+    expect { job.execute }.not_to raise_error
   end
 end
diff --git a/spec/jobs/truncate_user_flag_stats_spec.rb b/spec/jobs/truncate_user_flag_stats_spec.rb
index ffd1c0981e9..74cdc0e9726 100644
--- a/spec/jobs/truncate_user_flag_stats_spec.rb
+++ b/spec/jobs/truncate_user_flag_stats_spec.rb
@@ -53,7 +53,7 @@ RSpec.describe Jobs::TruncateUserFlagStats do
 
     r0.perform(Discourse.system_user, :agree_and_keep)
     r1.perform(Discourse.system_user, :disagree)
-    r2.perform(Discourse.system_user, :ignore)
+    r2.perform(Discourse.system_user, :ignore_and_do_nothing)
     r3.perform(Discourse.system_user, :agree_and_keep)
 
     user.user_stat.reload
diff --git a/spec/jobs/user_email_spec.rb b/spec/jobs/user_email_spec.rb
index 3a52f547be4..749b9ad2601 100644
--- a/spec/jobs/user_email_spec.rb
+++ b/spec/jobs/user_email_spec.rb
@@ -423,37 +423,76 @@ RSpec.describe Jobs::UserEmail do
       end
 
       context "when user is suspended" do
-        it "doesn't send email for a pm from a regular user" do
-          Jobs::UserEmail.new.execute(
-            type: :user_private_message,
-            user_id: suspended.id,
-            post_id: post.id,
-          )
+        context "when topic is a private message" do
+          subject(:send_email) do
+            described_class.new.execute(
+              type: :user_private_message,
+              user_id: suspended.id,
+              post_id: post.id,
+              notification_id: pm_notification.id,
+            )
+          end
 
-          expect(ActionMailer::Base.deliveries).to eq([])
-        end
-
-        it "does send an email for a pm from a staff user" do
-          pm_from_staff = Fabricate(:post, user: Fabricate(:moderator))
-          pm_from_staff.topic.topic_allowed_users.create!(user_id: suspended.id)
-
-          pm_notification =
+          let(:pm_notification) do
             Fabricate(
               :notification,
               user: suspended,
-              topic: pm_from_staff.topic,
-              post_number: pm_from_staff.post_number,
-              data: { original_post_id: pm_from_staff.id }.to_json,
+              topic: post.topic,
+              post_number: post.post_number,
+              data: { original_post_id: post.id }.to_json,
             )
+          end
+          fab!(:moderator) { Fabricate(:moderator) }
+          fab!(:regular_user) { Fabricate(:user) }
 
-          Jobs::UserEmail.new.execute(
-            type: :user_private_message,
-            user_id: suspended.id,
-            post_id: pm_from_staff.id,
-            notification_id: pm_notification.id,
-          )
+          context "when this is not a group PM" do
+            let(:post) { Fabricate(:private_message_post, user: user, recipient: suspended) }
 
-          expect(ActionMailer::Base.deliveries.first.to).to contain_exactly(suspended.email)
+            context "when post is from a staff user" do
+              let(:user) { moderator }
+
+              it "does send an email" do
+                send_email
+                expect(ActionMailer::Base.deliveries.first.to).to contain_exactly(suspended.email)
+              end
+            end
+
+            context "when post is from a regular user" do
+              let(:user) { regular_user }
+
+              it "doesn't send email" do
+                send_email
+                expect(ActionMailer::Base.deliveries).to be_empty
+              end
+            end
+          end
+
+          context "when this is a group PM" do
+            fab!(:group) { Fabricate(:group) }
+            fab!(:users) { Fabricate.times(2, :user) }
+
+            let(:post) { Fabricate(:group_private_message_post, user: user, recipients: group) }
+
+            before { group.users << [suspended, *users] }
+
+            context "when post is from a staff user" do
+              let(:user) { moderator }
+
+              it "does not send an email" do
+                send_email
+                expect(ActionMailer::Base.deliveries).to be_empty
+              end
+            end
+
+            context "when post is from a regular user" do
+              let(:user) { regular_user }
+
+              it "does not send an email" do
+                send_email
+                expect(ActionMailer::Base.deliveries).to be_empty
+              end
+            end
+          end
         end
 
         it "doesn't send PM from system user" do
@@ -524,7 +563,7 @@ RSpec.describe Jobs::UserEmail do
           Jobs::UserEmail.new.message_for_email(
             user,
             post,
-            :user_mentioned,
+            "user_mentioned",
             notification,
             notification_type: notification.notification_type,
             notification_data_hash: notification.data_hash,
@@ -808,7 +847,7 @@ RSpec.describe Jobs::UserEmail do
             Jobs::UserEmail.new.message_for_email(
               suspended,
               Fabricate.build(:post),
-              :user_private_message,
+              "user_private_message",
               notification,
             )
 
@@ -834,7 +873,7 @@ RSpec.describe Jobs::UserEmail do
             Jobs::UserEmail.new.message_for_email(
               suspended,
               @pm_from_staff,
-              :user_private_message,
+              "user_private_message",
               @pm_notification,
             )
           end
@@ -891,5 +930,24 @@ RSpec.describe Jobs::UserEmail do
         end
       end
     end
+
+    context "without post" do
+      context "when user is suspended" do
+        subject(:send_email) do
+          described_class.new.execute(
+            type: :account_suspended,
+            user_id: suspended.id,
+            user_history_id: user_history.id,
+          )
+        end
+
+        let(:user_history) { Fabricate(:user_history, action: UserHistory.actions[:suspend_user]) }
+
+        it "does send an email" do
+          send_email
+          expect(ActionMailer::Base.deliveries.first.to).to contain_exactly(suspended.email)
+        end
+      end
+    end
   end
 end
diff --git a/spec/lib/auth/default_current_user_provider_spec.rb b/spec/lib/auth/default_current_user_provider_spec.rb
index 39b84153f3b..9893401e3cc 100644
--- a/spec/lib/auth/default_current_user_provider_spec.rb
+++ b/spec/lib/auth/default_current_user_provider_spec.rb
@@ -202,6 +202,8 @@ RSpec.describe Auth::DefaultCurrentUserProvider do
     context "with rate limiting" do
       before { RateLimiter.enable }
 
+      use_redis_snapshotting
+
       it "rate limits admin api requests" do
         global_setting :max_admin_api_reqs_per_minute, 3
 
diff --git a/spec/lib/auth/managed_authenticator_spec.rb b/spec/lib/auth/managed_authenticator_spec.rb
index 940be5776b1..ab9b5d7da61 100644
--- a/spec/lib/auth/managed_authenticator_spec.rb
+++ b/spec/lib/auth/managed_authenticator_spec.rb
@@ -372,7 +372,7 @@ RSpec.describe Auth::ManagedAuthenticator do
         expect(result.user).to eq(nil)
       end
 
-      it "does not match if default match_by_username not overriden" do
+      it "does not match if default match_by_username not overridden" do
         SiteSetting.username_change_period = 0
         authenticator =
           Class
diff --git a/spec/lib/backup_restore/database_restorer_multisite_spec.rb b/spec/lib/backup_restore/database_restorer_multisite_spec.rb
index 19044c1f726..0da53b7513b 100644
--- a/spec/lib/backup_restore/database_restorer_multisite_spec.rb
+++ b/spec/lib/backup_restore/database_restorer_multisite_spec.rb
@@ -3,12 +3,12 @@
 require_relative "shared_context_for_backup_restore"
 
 RSpec.describe BackupRestore::DatabaseRestorer, type: :multisite do
+  subject(:restorer) { BackupRestore::DatabaseRestorer.new(logger, current_db) }
+
   include_context "with shared stuff"
 
   let(:current_db) { RailsMultisite::ConnectionManagement.current_db }
 
-  subject { BackupRestore::DatabaseRestorer.new(logger, current_db) }
-
   describe "#restore" do
     context "with database connection" do
       it "reconnects to the correct database" do
diff --git a/spec/lib/backup_restore/database_restorer_spec.rb b/spec/lib/backup_restore/database_restorer_spec.rb
index afa4bea4f36..8d8711e9247 100644
--- a/spec/lib/backup_restore/database_restorer_spec.rb
+++ b/spec/lib/backup_restore/database_restorer_spec.rb
@@ -3,12 +3,12 @@
 require_relative "shared_context_for_backup_restore"
 
 RSpec.describe BackupRestore::DatabaseRestorer do
+  subject(:restorer) { BackupRestore::DatabaseRestorer.new(logger, current_db) }
+
   include_context "with shared stuff"
 
   let(:current_db) { RailsMultisite::ConnectionManagement.current_db }
 
-  subject { BackupRestore::DatabaseRestorer.new(logger, current_db) }
-
   describe "#restore" do
     it "executes everything in the correct order" do
       restore = sequence("restore")
@@ -18,7 +18,7 @@ RSpec.describe BackupRestore::DatabaseRestorer do
       expect_db_migrate.in_sequence(restore)
       expect_db_reconnect.in_sequence(restore)
 
-      subject.restore("foo.sql")
+      restorer.restore("foo.sql")
     end
 
     it "stores the date of the last restore" do
@@ -146,12 +146,12 @@ RSpec.describe BackupRestore::DatabaseRestorer do
     it "moves tables back when tables were moved" do
       BackupRestore.stubs(:can_rollback?).returns(true)
       BackupRestore.expects(:move_tables_between_schemas).with("backup", "public").never
-      subject.rollback
+      restorer.rollback
 
       execute_stubbed_restore
 
       BackupRestore.expects(:move_tables_between_schemas).with("backup", "public").once
-      subject.rollback
+      restorer.rollback
     end
   end
 
@@ -164,7 +164,7 @@ RSpec.describe BackupRestore::DatabaseRestorer do
 
     it "doesn't try to drop function when no functions have been created" do
       Migration::BaseDropper.expects(:drop_readonly_function).never
-      subject.clean_up
+      restorer.clean_up
     end
 
     it "creates and drops all functions when none exist" do
@@ -174,7 +174,7 @@ RSpec.describe BackupRestore::DatabaseRestorer do
 
       Migration::BaseDropper.expects(:drop_readonly_function).with(:posts, :via_email)
       Migration::BaseDropper.expects(:drop_readonly_function).with(:posts, :raw_email)
-      subject.clean_up
+      restorer.clean_up
     end
 
     it "creates and drops only missing functions during restore" do
@@ -186,19 +186,17 @@ RSpec.describe BackupRestore::DatabaseRestorer do
       execute_stubbed_restore(stub_readonly_functions: false)
 
       Migration::BaseDropper.expects(:drop_readonly_function).with(:posts, :via_email)
-      subject.clean_up
+      restorer.clean_up
     end
   end
 
   describe ".drop_backup_schema" do
-    subject { BackupRestore::DatabaseRestorer }
-
     context "when no backup schema exists" do
       it "doesn't do anything" do
         ActiveRecord::Base.connection.expects(:schema_exists?).with("backup").returns(false)
         ActiveRecord::Base.connection.expects(:drop_schema).never
 
-        subject.drop_backup_schema
+        described_class.drop_backup_schema
       end
     end
 
@@ -209,14 +207,14 @@ RSpec.describe BackupRestore::DatabaseRestorer do
         ActiveRecord::Base.connection.expects(:drop_schema).with("backup")
         BackupMetadata.update_last_restore_date(8.days.ago)
 
-        subject.drop_backup_schema
+        described_class.drop_backup_schema
       end
 
       it "doesn't drop the schema when the last restore was recently" do
         ActiveRecord::Base.connection.expects(:drop_schema).with("backup").never
         BackupMetadata.update_last_restore_date(6.days.ago)
 
-        subject.drop_backup_schema
+        described_class.drop_backup_schema
       end
 
       it "stores the current date when there is no record of the last restore" do
@@ -225,7 +223,7 @@ RSpec.describe BackupRestore::DatabaseRestorer do
         date_string = "2020-01-08T17:38:27Z"
         freeze_time(Time.parse(date_string))
 
-        subject.drop_backup_schema
+        described_class.drop_backup_schema
         expect(BackupMetadata.value_for(BackupMetadata::LAST_RESTORE_DATE)).to eq(date_string)
       end
     end
diff --git a/spec/lib/backup_restore/local_backup_store_spec.rb b/spec/lib/backup_restore/local_backup_store_spec.rb
index 345fb4e4d16..4eb51f257ce 100644
--- a/spec/lib/backup_restore/local_backup_store_spec.rb
+++ b/spec/lib/backup_restore/local_backup_store_spec.rb
@@ -4,6 +4,8 @@ require "backup_restore/local_backup_store"
 require_relative "shared_examples_for_backup_store"
 
 RSpec.describe BackupRestore::LocalBackupStore do
+  subject(:store) { BackupRestore::BackupStore.create(root_directory: @root_directory) }
+
   before do
     @root_directory = Dir.mktmpdir
     @paths = []
@@ -12,7 +14,6 @@ RSpec.describe BackupRestore::LocalBackupStore do
 
   after { FileUtils.remove_dir(@root_directory, true) }
 
-  subject(:store) { BackupRestore::BackupStore.create(root_directory: @root_directory) }
   let(:expected_type) { BackupRestore::LocalBackupStore }
 
   it_behaves_like "backup store"
diff --git a/spec/lib/backup_restore/s3_backup_store_spec.rb b/spec/lib/backup_restore/s3_backup_store_spec.rb
index 7989fbaa4d8..297572e131f 100644
--- a/spec/lib/backup_restore/s3_backup_store_spec.rb
+++ b/spec/lib/backup_restore/s3_backup_store_spec.rb
@@ -5,6 +5,8 @@ require "backup_restore/s3_backup_store"
 require_relative "shared_examples_for_backup_store"
 
 RSpec.describe BackupRestore::S3BackupStore do
+  subject(:store) { BackupRestore::BackupStore.create(s3_options: @s3_options) }
+
   before do
     @s3_client = Aws::S3::Client.new(stub_responses: true)
     @s3_options = { client: @s3_client }
@@ -86,7 +88,6 @@ RSpec.describe BackupRestore::S3BackupStore do
     SiteSetting.backup_location = BackupLocationSiteSetting::S3
   end
 
-  subject(:store) { BackupRestore::BackupStore.create(s3_options: @s3_options) }
   let(:expected_type) { BackupRestore::S3BackupStore }
 
   it_behaves_like "backup store"
diff --git a/spec/lib/backup_restore/system_interface_multisite_spec.rb b/spec/lib/backup_restore/system_interface_multisite_spec.rb
index dbc669ca7e8..5b656933a40 100644
--- a/spec/lib/backup_restore/system_interface_multisite_spec.rb
+++ b/spec/lib/backup_restore/system_interface_multisite_spec.rb
@@ -3,9 +3,9 @@
 require_relative "shared_context_for_backup_restore"
 
 RSpec.describe BackupRestore::SystemInterface, type: :multisite do
-  include_context "with shared stuff"
+  subject(:system_interface) { BackupRestore::SystemInterface.new(logger) }
 
-  subject { BackupRestore::SystemInterface.new(logger) }
+  include_context "with shared stuff"
 
   describe "#flush_redis" do
     it "removes only keys from the current site in a multisite" do
@@ -24,7 +24,7 @@ RSpec.describe BackupRestore::SystemInterface, type: :multisite do
         expect(Discourse.redis.get("foo")).to eq("second-foo")
         expect(Discourse.redis.get("bar")).to eq("second-bar")
 
-        subject.flush_redis
+        system_interface.flush_redis
 
         expect(Discourse.redis.get("foo")).to be_nil
         expect(Discourse.redis.get("bar")).to be_nil
@@ -43,7 +43,7 @@ RSpec.describe BackupRestore::SystemInterface, type: :multisite do
         BackupRestore.mark_as_running!
 
         expect do
-          thread = subject.listen_for_shutdown_signal
+          thread = system_interface.listen_for_shutdown_signal
           BackupRestore.set_shutdown_signal!
           thread.join
         end.to raise_error(SystemExit)
diff --git a/spec/lib/backup_restore/system_interface_spec.rb b/spec/lib/backup_restore/system_interface_spec.rb
index 8f1461cc17c..e22b90daa6f 100644
--- a/spec/lib/backup_restore/system_interface_spec.rb
+++ b/spec/lib/backup_restore/system_interface_spec.rb
@@ -3,9 +3,9 @@
 require_relative "shared_context_for_backup_restore"
 
 RSpec.describe BackupRestore::SystemInterface do
-  include_context "with shared stuff"
+  subject(:system_interface) { BackupRestore::SystemInterface.new(logger) }
 
-  subject { BackupRestore::SystemInterface.new(logger) }
+  include_context "with shared stuff"
 
   describe "readonly mode" do
     after { Discourse::READONLY_KEYS.each { |key| Discourse.redis.del(key) } }
@@ -13,26 +13,26 @@ RSpec.describe BackupRestore::SystemInterface do
     describe "#enable_readonly_mode" do
       it "enables readonly mode" do
         Discourse.expects(:enable_readonly_mode).once
-        subject.enable_readonly_mode
+        system_interface.enable_readonly_mode
       end
 
       it "does not enable readonly mode when it is already in readonly mode" do
         Discourse.enable_readonly_mode
         Discourse.expects(:enable_readonly_mode).never
-        subject.enable_readonly_mode
+        system_interface.enable_readonly_mode
       end
     end
 
     describe "#disable_readonly_mode" do
       it "disables readonly mode" do
         Discourse.expects(:disable_readonly_mode).once
-        subject.disable_readonly_mode
+        system_interface.disable_readonly_mode
       end
 
       it "does not disable readonly mode when readonly mode was explicitly enabled" do
         Discourse.enable_readonly_mode
         Discourse.expects(:disable_readonly_mode).never
-        subject.disable_readonly_mode
+        system_interface.disable_readonly_mode
       end
     end
   end
@@ -40,14 +40,14 @@ RSpec.describe BackupRestore::SystemInterface do
   describe "#mark_restore_as_running" do
     it "calls mark_restore_as_running" do
       BackupRestore.expects(:mark_as_running!).once
-      subject.mark_restore_as_running
+      system_interface.mark_restore_as_running
     end
   end
 
   describe "#mark_restore_as_not_running" do
     it "calls mark_restore_as_not_running" do
       BackupRestore.expects(:mark_as_not_running!).once
-      subject.mark_restore_as_not_running
+      system_interface.mark_restore_as_not_running
     end
   end
 
@@ -61,7 +61,7 @@ RSpec.describe BackupRestore::SystemInterface do
 
     it "exits the process when shutdown signal is set" do
       expect do
-        thread = subject.listen_for_shutdown_signal
+        thread = system_interface.listen_for_shutdown_signal
         BackupRestore.set_shutdown_signal!
         thread.join
       end.to raise_error(SystemExit)
@@ -71,7 +71,7 @@ RSpec.describe BackupRestore::SystemInterface do
       BackupRestore.set_shutdown_signal!
       expect(BackupRestore.should_shutdown?).to eq(true)
 
-      thread = subject.listen_for_shutdown_signal
+      thread = system_interface.listen_for_shutdown_signal
       expect(BackupRestore.should_shutdown?).to eq(false)
       Thread.kill(thread)
     end
@@ -82,7 +82,7 @@ RSpec.describe BackupRestore::SystemInterface do
 
     it "calls pause!" do
       expect(Sidekiq.paused?).to eq(false)
-      subject.pause_sidekiq("my reason")
+      system_interface.pause_sidekiq("my reason")
       expect(Sidekiq.paused?).to eq(true)
       expect(Discourse.redis.get(SidekiqPauser::PAUSED_KEY)).to eq("my reason")
     end
@@ -93,15 +93,15 @@ RSpec.describe BackupRestore::SystemInterface do
       Sidekiq.pause!
       expect(Sidekiq.paused?).to eq(true)
 
-      subject.unpause_sidekiq
+      system_interface.unpause_sidekiq
       expect(Sidekiq.paused?).to eq(false)
     end
   end
 
   describe "#wait_for_sidekiq" do
     it "waits 6 seconds even when there are no running Sidekiq jobs" do
-      subject.expects(:sleep).with(6).once
-      subject.wait_for_sidekiq
+      system_interface.expects(:sleep).with(6).once
+      system_interface.wait_for_sidekiq
     end
 
     context "with Sidekiq workers" do
@@ -146,22 +146,26 @@ RSpec.describe BackupRestore::SystemInterface do
       end
 
       it "waits up to 60 seconds for jobs running for the current site to finish" do
-        subject.expects(:sleep).with(6).times(10)
+        system_interface.expects(:sleep).with(6).times(10)
         create_workers
-        expect { subject.wait_for_sidekiq }.to raise_error(BackupRestore::RunningSidekiqJobsError)
+        expect { system_interface.wait_for_sidekiq }.to raise_error(
+          BackupRestore::RunningSidekiqJobsError,
+        )
       end
 
       it "waits up to 60 seconds for jobs running on all sites to finish" do
-        subject.expects(:sleep).with(6).times(10)
+        system_interface.expects(:sleep).with(6).times(10)
         create_workers(all_sites: true)
-        expect { subject.wait_for_sidekiq }.to raise_error(BackupRestore::RunningSidekiqJobsError)
+        expect { system_interface.wait_for_sidekiq }.to raise_error(
+          BackupRestore::RunningSidekiqJobsError,
+        )
       end
 
       it "ignores jobs of other sites" do
-        subject.expects(:sleep).with(6).once
+        system_interface.expects(:sleep).with(6).once
         create_workers(site_id: "another_site")
 
-        subject.wait_for_sidekiq
+        system_interface.wait_for_sidekiq
       end
     end
   end
@@ -172,7 +176,7 @@ RSpec.describe BackupRestore::SystemInterface do
 
       it "doesn't unpause Sidekiq" do
         Sidekiq.pause!
-        subject.flush_redis
+        system_interface.flush_redis
 
         expect(Sidekiq.paused?).to eq(true)
       end
diff --git a/spec/lib/backup_restore/uploads_restorer_spec.rb b/spec/lib/backup_restore/uploads_restorer_spec.rb
index ff00811c9aa..079b5513aba 100644
--- a/spec/lib/backup_restore/uploads_restorer_spec.rb
+++ b/spec/lib/backup_restore/uploads_restorer_spec.rb
@@ -4,9 +4,9 @@
 require_relative "shared_context_for_backup_restore"
 
 RSpec.describe BackupRestore::UploadsRestorer do
-  include_context "with shared stuff"
+  subject(:restorer) { BackupRestore::UploadsRestorer.new(logger) }
 
-  subject { BackupRestore::UploadsRestorer.new(logger) }
+  include_context "with shared stuff"
 
   def with_temp_uploads_directory(name: "default", with_optimized: false)
     Dir.mktmpdir do |directory|
@@ -93,7 +93,7 @@ RSpec.describe BackupRestore::UploadsRestorer do
 
   def setup_and_restore(directory, metadata)
     metadata.each { |d| BackupMetadata.create!(d) }
-    subject.restore(directory)
+    restorer.restore(directory)
   end
 
   def uploads_path(database)
@@ -119,15 +119,15 @@ RSpec.describe BackupRestore::UploadsRestorer do
     let(:target_site_name) { target_site_type == multisite ? "second" : "default" }
     let(:target_hostname) { target_site_type == multisite ? "test2.localhost" : "test.localhost" }
 
-    shared_context "with no uploads" do
+    shared_examples "with no uploads" do
       it "does nothing when temporary uploads directory is missing or empty" do
         store_class.any_instance.expects(:copy_from).never
 
         Dir.mktmpdir do |directory|
-          subject.restore(directory)
+          restorer.restore(directory)
 
           FileUtils.mkdir(File.join(directory, "uploads"))
-          subject.restore(directory)
+          restorer.restore(directory)
         end
       end
     end
@@ -176,7 +176,7 @@ RSpec.describe BackupRestore::UploadsRestorer do
         with_temp_uploads_directory do |directory, path|
           store_class.any_instance.expects(:copy_from).with(path).once
 
-          expect { subject.restore(directory) }.to change { OptimizedImage.count }.by_at_most(
+          expect { restorer.restore(directory) }.to change { OptimizedImage.count }.by_at_most(
             -1,
           ).and change { Jobs::CreateAvatarThumbnails.jobs.size }.by(1).and change {
                         Post.where(baked_version: nil).count
@@ -190,7 +190,7 @@ RSpec.describe BackupRestore::UploadsRestorer do
         with_temp_uploads_directory(with_optimized: true) do |directory, path|
           store_class.any_instance.expects(:copy_from).with(path).once
 
-          expect { subject.restore(directory) }.to not_change {
+          expect { restorer.restore(directory) }.to not_change {
             OptimizedImage.count
           }.and not_change { Jobs::CreateAvatarThumbnails.jobs.size }.and change {
                         Post.where(baked_version: nil).count
@@ -609,14 +609,14 @@ RSpec.describe BackupRestore::UploadsRestorer do
     Discourse.stubs(:store).returns(Object.new)
 
     with_temp_uploads_directory do |directory|
-      expect { subject.restore(directory) }.to raise_error(BackupRestore::UploadsRestoreError)
+      expect { restorer.restore(directory) }.to raise_error(BackupRestore::UploadsRestoreError)
     end
   end
 
   it "raises an exception when there are multiple folders in the uploads directory" do
     with_temp_uploads_directory do |directory|
       FileUtils.mkdir_p(File.join(directory, "uploads", "foo"))
-      expect { subject.restore(directory) }.to raise_error(BackupRestore::UploadsRestoreError)
+      expect { restorer.restore(directory) }.to raise_error(BackupRestore::UploadsRestoreError)
     end
   end
 
diff --git a/spec/lib/bookmark_manager_spec.rb b/spec/lib/bookmark_manager_spec.rb
index 164cee18727..24ab55a7d80 100644
--- a/spec/lib/bookmark_manager_spec.rb
+++ b/spec/lib/bookmark_manager_spec.rb
@@ -1,25 +1,25 @@
 # frozen_string_literal: true
 
 RSpec.describe BookmarkManager do
-  let(:user) { Fabricate(:user) }
+  subject(:manager) { described_class.new(user) }
 
-  let(:reminder_at) { 1.day.from_now }
   fab!(:post) { Fabricate(:post) }
-  let(:name) { "Check this out!" }
 
-  subject { described_class.new(user) }
+  let(:user) { Fabricate(:user) }
+  let(:reminder_at) { 1.day.from_now }
+  let(:name) { "Check this out!" }
 
   describe ".destroy" do
     let!(:bookmark) { Fabricate(:bookmark, user: user, bookmarkable: post) }
     it "deletes the existing bookmark" do
-      subject.destroy(bookmark.id)
+      manager.destroy(bookmark.id)
       expect(Bookmark.exists?(id: bookmark.id)).to eq(false)
     end
 
     context "if the bookmark is the last one bookmarked in the topic" do
       it "marks the topic user bookmarked column as false" do
         TopicUser.create(user: user, topic: post.topic, bookmarked: true)
-        subject.destroy(bookmark.id)
+        manager.destroy(bookmark.id)
         tu = TopicUser.find_by(user: user)
         expect(tu.bookmarked).to eq(false)
       end
@@ -28,13 +28,13 @@ RSpec.describe BookmarkManager do
     context "if the bookmark is belonging to some other user" do
       let!(:bookmark) { Fabricate(:bookmark, user: Fabricate(:admin), bookmarkable: post) }
       it "raises an invalid access error" do
-        expect { subject.destroy(bookmark.id) }.to raise_error(Discourse::InvalidAccess)
+        expect { manager.destroy(bookmark.id) }.to raise_error(Discourse::InvalidAccess)
       end
     end
 
     context "if the bookmark no longer exists" do
       it "raises a not found error" do
-        expect { subject.destroy(9999) }.to raise_error(Discourse::NotFound)
+        expect { manager.destroy(9999) }.to raise_error(Discourse::NotFound)
       end
     end
   end
@@ -53,7 +53,7 @@ RSpec.describe BookmarkManager do
     let(:options) { {} }
 
     def update_bookmark
-      subject.update(
+      manager.update(
         bookmark_id: bookmark.id,
         name: new_name,
         reminder_at: new_reminder_at,
@@ -70,7 +70,7 @@ RSpec.describe BookmarkManager do
 
     it "does not reminder_last_sent_at if reminder did not change" do
       bookmark.update(reminder_last_sent_at: 1.day.ago)
-      subject.update(bookmark_id: bookmark.id, name: new_name, reminder_at: bookmark.reminder_at)
+      manager.update(bookmark_id: bookmark.id, name: new_name, reminder_at: bookmark.reminder_at)
       bookmark.reload
       expect(bookmark.reminder_last_sent_at).not_to eq(nil)
     end
@@ -112,20 +112,20 @@ RSpec.describe BookmarkManager do
     end
 
     it "destroys all bookmarks for the topic for the specified user" do
-      subject.destroy_for_topic(topic)
+      manager.destroy_for_topic(topic)
       expect(Bookmark.for_user_in_topic(user.id, topic.id).length).to eq(0)
     end
 
     it "does not destroy any other user's topic bookmarks" do
       user2 = Fabricate(:user)
       Fabricate(:bookmark, bookmarkable: Fabricate(:post, topic: topic), user: user2)
-      subject.destroy_for_topic(topic)
+      manager.destroy_for_topic(topic)
       expect(Bookmark.for_user_in_topic(user2.id, topic.id).length).to eq(1)
     end
 
     it "updates the topic user bookmarked column to false" do
       TopicUser.create(user: user, topic: topic, bookmarked: true)
-      subject.destroy_for_topic(topic)
+      manager.destroy_for_topic(topic)
       tu = TopicUser.find_by(user: user)
       expect(tu.bookmarked).to eq(false)
     end
@@ -176,20 +176,20 @@ RSpec.describe BookmarkManager do
 
     it "sets pinned to false if it is true" do
       bookmark.update(pinned: true)
-      subject.toggle_pin(bookmark_id: bookmark.id)
+      manager.toggle_pin(bookmark_id: bookmark.id)
       expect(bookmark.reload.pinned).to eq(false)
     end
 
     it "sets pinned to true if it is false" do
       bookmark.update(pinned: false)
-      subject.toggle_pin(bookmark_id: bookmark.id)
+      manager.toggle_pin(bookmark_id: bookmark.id)
       expect(bookmark.reload.pinned).to eq(true)
     end
 
     context "if the bookmark is belonging to some other user" do
       let!(:bookmark) { Fabricate(:bookmark, user: Fabricate(:admin)) }
       it "raises an invalid access error" do
-        expect { subject.toggle_pin(bookmark_id: bookmark.id) }.to raise_error(
+        expect { manager.toggle_pin(bookmark_id: bookmark.id) }.to raise_error(
           Discourse::InvalidAccess,
         )
       end
@@ -198,18 +198,18 @@ RSpec.describe BookmarkManager do
     context "if the bookmark no longer exists" do
       before { bookmark.destroy! }
       it "raises a not found error" do
-        expect { subject.toggle_pin(bookmark_id: bookmark.id) }.to raise_error(Discourse::NotFound)
+        expect { manager.toggle_pin(bookmark_id: bookmark.id) }.to raise_error(Discourse::NotFound)
       end
     end
   end
 
   describe "#create_for" do
     it "allows creating a bookmark for the topic and for the first post" do
-      subject.create_for(bookmarkable_id: post.topic_id, bookmarkable_type: "Topic", name: name)
+      manager.create_for(bookmarkable_id: post.topic_id, bookmarkable_type: "Topic", name: name)
       bookmark = Bookmark.find_by(user: user, bookmarkable: post.topic)
       expect(bookmark.present?).to eq(true)
 
-      subject.create_for(bookmarkable_id: post.id, bookmarkable_type: "Post", name: name)
+      manager.create_for(bookmarkable_id: post.id, bookmarkable_type: "Post", name: name)
       bookmark = Bookmark.find_by(user: user, bookmarkable: post)
       expect(bookmark).not_to eq(nil)
     end
@@ -217,26 +217,26 @@ RSpec.describe BookmarkManager do
     it "when topic is deleted it raises invalid access from guardian check" do
       post.topic.trash!
       expect {
-        subject.create_for(bookmarkable_id: post.topic_id, bookmarkable_type: "Topic", name: name)
+        manager.create_for(bookmarkable_id: post.topic_id, bookmarkable_type: "Topic", name: name)
       }.to raise_error(Discourse::InvalidAccess)
     end
 
     it "when post is deleted it raises invalid access from guardian check" do
       post.trash!
       expect do
-        subject.create_for(bookmarkable_id: post.id, bookmarkable_type: "Post", name: name)
+        manager.create_for(bookmarkable_id: post.id, bookmarkable_type: "Post", name: name)
       end.to raise_error(Discourse::InvalidAccess)
     end
 
     it "adds a validation error when the bookmarkable_type is not registered" do
-      subject.create_for(bookmarkable_id: post.id, bookmarkable_type: "BlahFactory", name: name)
-      expect(subject.errors.full_messages).to include(
+      manager.create_for(bookmarkable_id: post.id, bookmarkable_type: "BlahFactory", name: name)
+      expect(manager.errors.full_messages).to include(
         I18n.t("bookmarks.errors.invalid_bookmarkable", type: "BlahFactory"),
       )
     end
 
     it "updates the topic user bookmarked column to true if any post is bookmarked" do
-      subject.create_for(
+      manager.create_for(
         bookmarkable_id: post.id,
         bookmarkable_type: "Post",
         name: name,
@@ -246,14 +246,14 @@ RSpec.describe BookmarkManager do
       expect(tu.bookmarked).to eq(true)
       tu.update(bookmarked: false)
       new_post = Fabricate(:post, topic: post.topic)
-      subject.create_for(bookmarkable_id: new_post.id, bookmarkable_type: "Post")
+      manager.create_for(bookmarkable_id: new_post.id, bookmarkable_type: "Post")
       tu.reload
       expect(tu.bookmarked).to eq(true)
     end
 
     it "sets auto_delete_preference to clear_reminder by default" do
       bookmark =
-        subject.create_for(
+        manager.create_for(
           bookmarkable_id: post.id,
           bookmarkable_type: "Post",
           name: name,
@@ -273,7 +273,7 @@ RSpec.describe BookmarkManager do
 
       it "sets auto_delete_preferences to the user's user_option.bookmark_auto_delete_preference" do
         bookmark =
-          subject.create_for(
+          manager.create_for(
             bookmarkable_id: post.id,
             bookmarkable_type: "Post",
             name: name,
@@ -286,7 +286,7 @@ RSpec.describe BookmarkManager do
 
       it "uses the passed in auto_delete_preference option instead of the user's one" do
         bookmark =
-          subject.create_for(
+          manager.create_for(
             bookmarkable_id: post.id,
             bookmarkable_type: "Post",
             name: name,
@@ -303,7 +303,7 @@ RSpec.describe BookmarkManager do
 
     context "when a reminder time is provided" do
       it "saves the values correctly" do
-        subject.create_for(
+        manager.create_for(
           bookmarkable_id: post.id,
           bookmarkable_type: "Post",
           name: name,
@@ -322,7 +322,7 @@ RSpec.describe BookmarkManager do
       end
 
       it "saves any additional options successfully" do
-        subject.create_for(
+        manager.create_for(
           bookmarkable_id: post.id,
           bookmarkable_type: "Post",
           name: name,
@@ -339,8 +339,8 @@ RSpec.describe BookmarkManager do
       before { Bookmark.create(bookmarkable: post, user: user) }
 
       it "adds an error to the manager" do
-        subject.create_for(bookmarkable_id: post.id, bookmarkable_type: "Post")
-        expect(subject.errors.full_messages).to include(
+        manager.create_for(bookmarkable_id: post.id, bookmarkable_type: "Post")
+        expect(manager.errors.full_messages).to include(
           I18n.t("bookmarks.errors.already_bookmarked", type: "Post"),
         )
       end
@@ -348,8 +348,8 @@ RSpec.describe BookmarkManager do
 
     context "when the bookmark name is too long" do
       it "adds an error to the manager" do
-        subject.create_for(bookmarkable_id: post.id, bookmarkable_type: "Post", name: "test" * 100)
-        expect(subject.errors.full_messages).to include(
+        manager.create_for(bookmarkable_id: post.id, bookmarkable_type: "Post", name: "test" * 100)
+        expect(manager.errors.full_messages).to include(
           "Name is too long (maximum is 100 characters)",
         )
       end
@@ -359,13 +359,13 @@ RSpec.describe BookmarkManager do
       let(:reminder_at) { 10.days.ago }
 
       it "adds an error to the manager" do
-        subject.create_for(
+        manager.create_for(
           bookmarkable_id: post.id,
           bookmarkable_type: "Post",
           name: name,
           reminder_at: reminder_at,
         )
-        expect(subject.errors.full_messages).to include(
+        expect(manager.errors.full_messages).to include(
           I18n.t("bookmarks.errors.cannot_set_past_reminder"),
         )
       end
@@ -375,13 +375,13 @@ RSpec.describe BookmarkManager do
       let(:reminder_at) { 11.years.from_now }
 
       it "adds an error to the manager" do
-        subject.create_for(
+        manager.create_for(
           bookmarkable_id: post.id,
           bookmarkable_type: "Post",
           name: name,
           reminder_at: reminder_at,
         )
-        expect(subject.errors.full_messages).to include(
+        expect(manager.errors.full_messages).to include(
           I18n.t("bookmarks.errors.cannot_set_reminder_in_distant_future"),
         )
       end
@@ -391,7 +391,7 @@ RSpec.describe BookmarkManager do
       before { post.trash! }
       it "raises an invalid access error" do
         expect {
-          subject.create_for(bookmarkable_id: post.id, bookmarkable_type: "Post", name: name)
+          manager.create_for(bookmarkable_id: post.id, bookmarkable_type: "Post", name: name)
         }.to raise_error(Discourse::InvalidAccess)
       end
     end
@@ -400,7 +400,7 @@ RSpec.describe BookmarkManager do
       before { post.topic.update(category: Fabricate(:private_category, group: Fabricate(:group))) }
       it "raises an invalid access error" do
         expect {
-          subject.create_for(bookmarkable_id: post.id, bookmarkable_type: "Post", name: name)
+          manager.create_for(bookmarkable_id: post.id, bookmarkable_type: "Post", name: name)
         }.to raise_error(Discourse::InvalidAccess)
       end
     end
diff --git a/spec/lib/bookmark_query_spec.rb b/spec/lib/bookmark_query_spec.rb
index d083932240a..d54c10d07d2 100644
--- a/spec/lib/bookmark_query_spec.rb
+++ b/spec/lib/bookmark_query_spec.rb
@@ -11,7 +11,6 @@ RSpec.describe BookmarkQuery do
 
   describe "#list_all" do
     before do
-      Bookmark.reset_bookmarkables
       register_test_bookmarkable
 
       Fabricate(:topic_user, user: user, topic: post_bookmark.bookmarkable.topic)
@@ -19,14 +18,14 @@ RSpec.describe BookmarkQuery do
       user_bookmark
     end
 
+    after { DiscoursePluginRegistry.reset! }
+
     let(:post_bookmark) { Fabricate(:bookmark, user: user, bookmarkable: Fabricate(:post)) }
     let(:topic_bookmark) { Fabricate(:bookmark, user: user, bookmarkable: Fabricate(:topic)) }
     let(:user_bookmark) do
       Fabricate(:bookmark, user: user, bookmarkable: Fabricate(:user, username: "bookmarkqueen"))
     end
 
-    after { Bookmark.reset_bookmarkables }
-
     it "returns all the bookmarks for a user" do
       expect(bookmark_query.list_all.count).to eq(3)
     end
@@ -76,9 +75,7 @@ RSpec.describe BookmarkQuery do
         )
       end
 
-      before { Bookmark.reset_bookmarkables }
-
-      after { Bookmark.reset_bookmarkables }
+      after { DiscoursePluginRegistry.reset! }
 
       let(:bookmark3) do
         Fabricate(:bookmark, user: user, name: "Check up later", bookmarkable: Fabricate(:post))
diff --git a/spec/lib/bookmark_reminder_notification_handler_spec.rb b/spec/lib/bookmark_reminder_notification_handler_spec.rb
index 9a77ad9bb15..6311d9bf871 100644
--- a/spec/lib/bookmark_reminder_notification_handler_spec.rb
+++ b/spec/lib/bookmark_reminder_notification_handler_spec.rb
@@ -1,19 +1,20 @@
 # frozen_string_literal: true
 
 RSpec.describe BookmarkReminderNotificationHandler do
-  subject { described_class }
-
   fab!(:user) { Fabricate(:user) }
 
   before { Discourse.redis.flushdb }
 
   describe "#send_notification" do
+    subject(:send_notification) { handler.send_notification }
+
+    let(:handler) { described_class.new(bookmark) }
     let!(:bookmark) do
       Fabricate(:bookmark_next_business_day_reminder, user: user, bookmarkable: Fabricate(:post))
     end
 
     it "creates a bookmark reminder notification with the correct details" do
-      subject.new(bookmark).send_notification
+      send_notification
       notif = bookmark.user.notifications.last
       expect(notif.notification_type).to eq(Notification.types[:bookmark_reminder])
       expect(notif.topic_id).to eq(bookmark.bookmarkable.topic_id)
@@ -32,7 +33,7 @@ RSpec.describe BookmarkReminderNotificationHandler do
       end
 
       it "does not send a notification and updates last notification attempt time" do
-        expect { subject.new(bookmark).send_notification }.not_to change { Notification.count }
+        expect { send_notification }.not_to change { Notification.count }
         expect(bookmark.reload.reminder_last_sent_at).not_to be_blank
       end
     end
@@ -46,12 +47,12 @@ RSpec.describe BookmarkReminderNotificationHandler do
       end
 
       it "deletes the bookmark after the reminder gets sent" do
-        subject.new(bookmark).send_notification
+        send_notification
         expect(Bookmark.find_by(id: bookmark.id)).to eq(nil)
       end
 
       it "changes the TopicUser bookmarked column to false" do
-        subject.new(bookmark).send_notification
+        send_notification
         expect(TopicUser.find_by(topic: bookmark.bookmarkable.topic, user: user).bookmarked).to eq(
           false,
         )
@@ -67,7 +68,7 @@ RSpec.describe BookmarkReminderNotificationHandler do
         end
 
         it "does not change the TopicUser bookmarked column to false" do
-          subject.new(bookmark).send_notification
+          send_notification
           expect(
             TopicUser.find_by(topic: bookmark.bookmarkable.topic, user: user).bookmarked,
           ).to eq(true)
@@ -82,7 +83,7 @@ RSpec.describe BookmarkReminderNotificationHandler do
       end
 
       it "resets reminder_at after the reminder gets sent" do
-        subject.new(bookmark).send_notification
+        send_notification
         expect(Bookmark.find_by(id: bookmark.id).reminder_at).to eq(nil)
       end
     end
diff --git a/spec/lib/category_badge_spec.rb b/spec/lib/category_badge_spec.rb
index 3d36d1af035..3eada370f23 100644
--- a/spec/lib/category_badge_spec.rb
+++ b/spec/lib/category_badge_spec.rb
@@ -18,6 +18,6 @@ RSpec.describe CategoryBadge do
     c = Fabricate(:category, description: '<code>\' &lt;b id="x"&gt;</code>')
     html = CategoryBadge.html_for(c)
 
-    expect(html).to include("title='&#x27; &lt;b id=&quot;x&quot;&gt;'")
+    expect(html).to include("title='&#39; &lt;b id=&quot;x&quot;&gt;'")
   end
 end
diff --git a/spec/lib/category_guardian_spec.rb b/spec/lib/category_guardian_spec.rb
index 0cbd94cea1a..e37deeaf940 100644
--- a/spec/lib/category_guardian_spec.rb
+++ b/spec/lib/category_guardian_spec.rb
@@ -39,6 +39,19 @@ RSpec.describe CategoryGuardian do
         expect(Guardian.new(user).can_post_in_category?(category)).to eq(false)
       end
 
+      it "returns false if everyone has readonly access" do
+        everyone = Group.find(Group::AUTO_GROUPS[:everyone])
+        everyone.add(user)
+        category = Fabricate(:category)
+        Fabricate(
+          :category_group,
+          category: category,
+          group: everyone,
+          permission_type: CategoryGroup.permission_types[:readonly],
+        )
+        expect(Guardian.new(user).can_post_in_category?(category)).to eq(false)
+      end
+
       it "returns true for admin" do
         expect(Guardian.new(admin).can_post_in_category?(category)).to eq(true)
       end
diff --git a/spec/lib/color_math_spec.rb b/spec/lib/color_math_spec.rb
new file mode 100644
index 00000000000..82b12119848
--- /dev/null
+++ b/spec/lib/color_math_spec.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+describe ColorMath do
+  describe "#brightness" do
+    it "works" do
+      expect(ColorMath.brightness("000")).to eq(0)
+      expect(ColorMath.brightness("fff")).to eq(255)
+    end
+  end
+
+  describe "#scale_color_lightness" do
+    it "works" do
+      expect(ColorMath.scale_color_lightness("000", 0.5)).to eq("808080")
+      expect(ColorMath.scale_color_lightness("fff", -0.5)).to eq("808080")
+    end
+
+    it "works with non-greyscale colors" do
+      expect(ColorMath.scale_color_lightness("f00", 0.5)).to eq("ff8080")
+    end
+  end
+
+  describe "#dark_light_diff" do
+    it "darkens by requested amount if target color is darker than comparison" do
+      expect(ColorMath.dark_light_diff("fff", "eee", 0, -0.5)).to eq("808080")
+    end
+
+    it "lightens by requested amount if target color is lighter than comparison" do
+      expect(ColorMath.dark_light_diff("000", "eee", 0.5, 0)).to eq("808080")
+    end
+  end
+end
diff --git a/spec/lib/common_passwords/common_passwords_spec.rb b/spec/lib/common_passwords/common_passwords_spec.rb
index 7373882a207..34b8ae20ef7 100644
--- a/spec/lib/common_passwords/common_passwords_spec.rb
+++ b/spec/lib/common_passwords/common_passwords_spec.rb
@@ -6,32 +6,32 @@ RSpec.describe CommonPasswords do
   end
 
   describe "#common_password?" do
-    before { described_class.stubs(:redis).returns(stub_everything) }
+    subject(:common_password) { described_class.common_password? @password }
 
-    subject { described_class.common_password? @password }
+    before { described_class.stubs(:redis).returns(stub_everything) }
 
     it "returns false if password isn't in the common passwords list" do
       described_class.stubs(:password_list).returns(stub_everything(include?: false))
       @password = "uncommonPassword"
-      expect(subject).to eq(false)
+      expect(common_password).to eq(false)
     end
 
     it "returns false if password is nil" do
       described_class.expects(:password_list).never
       @password = nil
-      expect(subject).to eq(false)
+      expect(common_password).to eq(false)
     end
 
     it "returns false if password is blank" do
       described_class.expects(:password_list).never
       @password = ""
-      expect(subject).to eq(false)
+      expect(common_password).to eq(false)
     end
 
     it "returns true if password is in the common passwords list" do
       described_class.stubs(:password_list).returns(stub_everything(include?: true))
       @password = "password"
-      expect(subject).to eq(true)
+      expect(common_password).to eq(true)
     end
   end
 
diff --git a/spec/lib/composer_messages_finder_spec.rb b/spec/lib/composer_messages_finder_spec.rb
index 1d7ad381a81..7a7785215ae 100644
--- a/spec/lib/composer_messages_finder_spec.rb
+++ b/spec/lib/composer_messages_finder_spec.rb
@@ -328,6 +328,95 @@ RSpec.describe ComposerMessagesFinder do
     end
   end
 
+  describe "#dont_feed_the_trolls" do
+    fab!(:user) { Fabricate(:user) }
+    fab!(:author) { Fabricate(:user) }
+    fab!(:other_user) { Fabricate(:user) }
+    fab!(:third_user) { Fabricate(:user) }
+    fab!(:topic) { Fabricate(:topic, user: author) }
+    fab!(:original_post) { Fabricate(:post, topic: topic, user: author) }
+    fab!(:unflagged_post) { Fabricate(:post, topic: topic, user: author) }
+    fab!(:self_flagged_post) { Fabricate(:post, topic: topic, user: author) }
+    fab!(:under_flagged_post) { Fabricate(:post, topic: topic, user: author) }
+    fab!(:over_flagged_post) { Fabricate(:post, topic: topic, user: author) }
+    fab!(:resolved_flag_post) { Fabricate(:post, topic: topic, user: author) }
+
+    before { SiteSetting.dont_feed_the_trolls_threshold = 2 }
+
+    it "does not show a message for unflagged posts" do
+      finder =
+        ComposerMessagesFinder.new(
+          user,
+          composer_action: "reply",
+          topic_id: topic.id,
+          post_id: unflagged_post.id,
+        )
+      expect(finder.check_dont_feed_the_trolls).to be_blank
+    end
+
+    it "shows a message when the replier has already flagged the post" do
+      Fabricate(:flag, post: self_flagged_post, user: user)
+      finder =
+        ComposerMessagesFinder.new(
+          user,
+          composer_action: "reply",
+          topic_id: topic.id,
+          post_id: self_flagged_post.id,
+        )
+      expect(finder.check_dont_feed_the_trolls).to be_present
+    end
+
+    it "shows a message when replying to flagged topic (first post)" do
+      Fabricate(:flag, post: original_post, user: user)
+      finder = ComposerMessagesFinder.new(user, composer_action: "reply", topic_id: topic.id)
+      expect(finder.check_dont_feed_the_trolls).to be_present
+    end
+
+    it "does not show a message when not enough others have flagged the post" do
+      Fabricate(:flag, post: under_flagged_post, user: other_user)
+      finder =
+        ComposerMessagesFinder.new(
+          user,
+          composer_action: "reply",
+          topic_id: topic.id,
+          post_id: under_flagged_post.id,
+        )
+      expect(finder.check_dont_feed_the_trolls).to be_blank
+    end
+
+    it "does not show a message when the flag has already been resolved" do
+      SiteSetting.dont_feed_the_trolls_threshold = 1
+
+      Fabricate(:flag, post: resolved_flag_post, user: other_user, disagreed_at: 1.hour.ago)
+      finder =
+        ComposerMessagesFinder.new(
+          user,
+          composer_action: "reply",
+          topic_id: topic.id,
+          post_id: resolved_flag_post.id,
+        )
+      expect(finder.check_dont_feed_the_trolls).to be_blank
+    end
+
+    it "shows a message when enough others have already flagged the post" do
+      Fabricate(:flag, post: over_flagged_post, user: other_user)
+      Fabricate(:flag, post: over_flagged_post, user: third_user)
+      finder =
+        ComposerMessagesFinder.new(
+          user,
+          composer_action: "reply",
+          topic_id: topic.id,
+          post_id: over_flagged_post.id,
+        )
+      expect(finder.check_dont_feed_the_trolls).to be_present
+    end
+
+    it "safely returns from not finding a post" do
+      finder = ComposerMessagesFinder.new(user, composer_action: "reply", topic_id: nil)
+      expect(finder.check_dont_feed_the_trolls).to be_blank
+    end
+  end
+
   describe ".check_get_a_room" do
     fab!(:user) { Fabricate(:user) }
     fab!(:other_user) { Fabricate(:user) }
diff --git a/spec/lib/concern/cached_counting_spec.rb b/spec/lib/concern/cached_counting_spec.rb
index 041a4c3c24c..64ff9afc56c 100644
--- a/spec/lib/concern/cached_counting_spec.rb
+++ b/spec/lib/concern/cached_counting_spec.rb
@@ -80,15 +80,15 @@ RSpec.describe CachedCounting do
       freeze_time
       d1 = Time.now.utc.to_date
 
-      RailsCacheCounter.perform_increment!("a,a")
-      RailsCacheCounter.perform_increment!("b")
-      20.times { RailsCacheCounter.perform_increment!("a,a") }
+      RailsCacheCounter.perform_increment!("a,a", async: true)
+      RailsCacheCounter.perform_increment!("b", async: true)
+      20.times { RailsCacheCounter.perform_increment!("a,a", async: true) }
 
       freeze_time 2.days.from_now
       d2 = Time.now.utc.to_date
 
-      RailsCacheCounter.perform_increment!("a,a")
-      RailsCacheCounter.perform_increment!("d")
+      RailsCacheCounter.perform_increment!("a,a", async: true)
+      RailsCacheCounter.perform_increment!("d", async: true)
 
       CachedCounting.flush
 
diff --git a/spec/lib/content_security_policy_spec.rb b/spec/lib/content_security_policy_spec.rb
index 5138f6969fc..338a2e1e085 100644
--- a/spec/lib/content_security_policy_spec.rb
+++ b/spec/lib/content_security_policy_spec.rb
@@ -85,6 +85,8 @@ RSpec.describe ContentSecurityPolicy do
       before { SiteSetting.ga_universal_tracking_code = "UA-12345678-9" }
 
       it "allowlists Google Analytics v3 when integrated" do
+        SiteSetting.ga_version = "v3_analytics"
+
         script_srcs = parse(policy)["script-src"]
         expect(script_srcs).to include("https://www.google-analytics.com/analytics.js")
         expect(script_srcs).not_to include("https://www.googletagmanager.com/gtag/js")
diff --git a/spec/lib/cooked_post_processor_spec.rb b/spec/lib/cooked_post_processor_spec.rb
index f55ef0e6895..b95882b2614 100644
--- a/spec/lib/cooked_post_processor_spec.rb
+++ b/spec/lib/cooked_post_processor_spec.rb
@@ -1012,7 +1012,7 @@ RSpec.describe CookedPostProcessor do
       end
     end
 
-    it "optimizes images in quotes" do
+    it "optimizes and wraps images in quotes with lightbox wrapper" do
       post = Fabricate(:post, raw: <<~MD)
         [quote]
         ![image|1024x768, 50%](#{large_image_upload.short_url})
@@ -1023,7 +1023,7 @@ RSpec.describe CookedPostProcessor do
       cpp.post_process
 
       doc = Nokogiri::HTML5.fragment(cpp.html)
-      expect(doc.css(".lightbox-wrapper").size).to eq(0)
+      expect(doc.css(".lightbox-wrapper").size).to eq(1)
       expect(doc.css("img").first["srcset"]).to_not eq(nil)
     end
 
@@ -1042,7 +1042,9 @@ RSpec.describe CookedPostProcessor do
 
       doc = Nokogiri::HTML5.fragment(cpp.html)
       expect(doc.css(".lightbox-wrapper").size).to eq(0)
-      expect(doc.css("img").first["srcset"]).to_not eq(nil)
+      expect(doc.css("img").first["srcset"]).to eq(nil)
+      expect(doc.css("img").first["src"]).to include("optimized")
+      expect(doc.css("img").first["src"]).to include("512x384")
     end
   end
 
@@ -1080,7 +1082,7 @@ RSpec.describe CookedPostProcessor do
           .returns("<img class='onebox' src='#{image_url}' />")
 
         post = Fabricate(:post, raw: url)
-        upload.update!(url: "https://test.s3.amazonaws.com/something.png")
+        upload.update!(url: "https://test.s3.amazonaws.com/something.png", dominant_color: "00ffff")
 
         PostHotlinkedMedia.create!(
           url: "//image.com/avatar.png",
@@ -1094,7 +1096,7 @@ RSpec.describe CookedPostProcessor do
         cpp.post_process_oneboxes
 
         expect(cpp.doc.to_s).to eq(
-          "<p><img class=\"onebox\" src=\"#{upload.url}\" width=\"100\" height=\"200\"></p>",
+          "<p><img class=\"onebox\" src=\"#{upload.url}\" data-dominant-color=\"00ffff\" width=\"100\" height=\"200\"></p>",
         )
 
         upload.destroy!
@@ -1124,7 +1126,10 @@ RSpec.describe CookedPostProcessor do
             .returns("<img class='onebox' src='#{image_url}' />")
 
           post = Fabricate(:post, raw: url)
-          upload.update!(url: "https://test.s3.amazonaws.com/something.png")
+          upload.update!(
+            url: "https://test.s3.amazonaws.com/something.png",
+            dominant_color: "00ffff",
+          )
 
           PostHotlinkedMedia.create!(
             url: "//image.com/avatar.png",
@@ -1141,7 +1146,7 @@ RSpec.describe CookedPostProcessor do
           cpp.post_process_oneboxes
 
           expect(cpp.doc.to_s).to eq(
-            "<p><img class=\"onebox\" src=\"#{cooked_url}\" width=\"100\" height=\"200\"></p>",
+            "<p><img class=\"onebox\" src=\"#{cooked_url}\" data-dominant-color=\"00ffff\" width=\"100\" height=\"200\"></p>",
           )
         end
       end
@@ -1149,13 +1154,13 @@ RSpec.describe CookedPostProcessor do
 
     it "replaces large image placeholder" do
       SiteSetting.max_image_size_kb = 4096
-      url = "https://image.com/my-avatar"
-      image_url = "https://image.com/avatar.png"
+      url = "https://image.com/avatar.png"
 
-      Oneboxer
-        .stubs(:onebox)
-        .with(url, anything)
-        .returns("<img class='onebox' src='#{image_url}' />")
+      Oneboxer.stubs(:onebox).with(url, anything).returns <<~HTML
+          <a href="#{url}" target="_blank" rel="noopener" class="onebox">
+            <img class='onebox' src='#{url}' />
+          </a>
+        HTML
 
       post = Fabricate(:post, raw: url)
 
@@ -1665,15 +1670,23 @@ RSpec.describe CookedPostProcessor do
               audio_upload.url.sub(SiteSetting.s3_cdn_url, "#{Discourse.base_url}/secure-uploads")
 
             expect(cpp.html).to match_html <<~HTML
-              <p>This post has a video upload.</p>
-              <div class="onebox video-onebox">
+              <p>This post has a video upload.</p><div class="onebox video-onebox">
                 <video width="100%" height="100%" controls="">
                   <source src="#{secure_video_url}">
-                  <a href="#{secure_video_url}">#{secure_video_url}</a>
+                  <a href="#{secure_video_url}">
+                    #{secure_video_url}
+                  </a>
                 </video>
               </div>
+
               <p>This post has an audio upload.<br>
-              <audio controls=""><source src="#{secure_audio_url}"><a href="#{secure_audio_url}">#{secure_audio_url}</a></audio></p>
+              <audio controls="">
+                <source src="#{secure_audio_url}">
+                <a href="#{secure_audio_url}">
+                  #{secure_audio_url}
+                </a>
+              </audio>
+              </p>
               <p>And an image upload.<br>
               <img src="#{image_upload.url}" alt="#{image_upload.original_filename}" data-base62-sha1="#{image_upload.base62_sha1}"></p>
             HTML
@@ -2133,10 +2146,10 @@ RSpec.describe CookedPostProcessor do
   end
 
   describe "#html" do
-    it "escapes attributes" do
-      post = Fabricate(:post, raw: '<img alt="<something>">')
-      expect(post.cook(post.raw)).to eq('<p><img alt="&lt;something&gt;"></p>')
-      expect(CookedPostProcessor.new(post).html).to eq('<p><img alt="&lt;something&gt;"></p>')
+    it "escapes html entities in attributes per html5" do
+      post = Fabricate(:post, raw: '<img alt="&<something>">')
+      expect(post.cook(post.raw)).to eq('<p><img alt="&amp;<something>"></p>')
+      expect(CookedPostProcessor.new(post).html).to eq('<p><img alt="&amp;<something>"></p>')
     end
   end
 end
diff --git a/spec/lib/discourse_js_processor_spec.rb b/spec/lib/discourse_js_processor_spec.rb
index 3c2eeac8033..24fd32d735b 100644
--- a/spec/lib/discourse_js_processor_spec.rb
+++ b/spec/lib/discourse_js_processor_spec.rb
@@ -35,6 +35,64 @@ RSpec.describe DiscourseJsProcessor do
     it "returns false if the header is not present" do
       expect(DiscourseJsProcessor.skip_module?("// just some JS\nconsole.log()")).to eq(false)
     end
+
+    it "works end-to-end" do
+      source = <<~JS.chomp
+        // discourse-skip-module
+        console.log("hello world");
+      JS
+      expect(DiscourseJsProcessor.transpile(source, "test", "test")).to eq(source)
+    end
+  end
+
+  it "passes through modern JS syntaxes which are supported in our target browsers" do
+    script = <<~JS.chomp
+      optional?.chaining;
+      const template = func`test`;
+      let numericSeparator = 100_000_000;
+      logicalAssignment ||= 2;
+      nullishCoalescing ?? 'works';
+      try {
+        "optional catch binding";
+      } catch {
+        "works";
+      }
+      async function* asyncGeneratorFunction() {
+        yield await Promise.resolve('a');
+      }
+      let a = {
+        x,
+        y,
+        ...spreadRest
+      };
+    JS
+
+    result = DiscourseJsProcessor.transpile(script, "blah", "blah/mymodule")
+    expect(result).to eq <<~JS.strip
+      define("blah/mymodule", [], function () {
+        "use strict";
+
+      #{script.indent(2)}
+      });
+    JS
+  end
+
+  it "supports decorators and class properties without error" do
+    script = <<~JS.chomp
+      class MyClass {
+        classProperty = 1;
+        #privateProperty = 1;
+        #privateMethod() {
+          console.log("hello world");
+        }
+        @decorated
+        myMethod(){
+        }
+      }
+    JS
+
+    result = DiscourseJsProcessor.transpile(script, "blah", "blah/mymodule")
+    expect(result).to include("_applyDecoratedDescriptor")
   end
 
   it "correctly transpiles widget hbs" do
@@ -71,7 +129,7 @@ RSpec.describe DiscourseJsProcessor do
         {
           "id": null,
           "block": "[[[1,[34,0]]],[],false,[\\"somevalue\\"]]",
-          "moduleName": "(unknown template module)",
+          "moduleName": "/blah/mymodule",
           "isStrictMode": false
         });
       });
diff --git a/spec/lib/discourse_plugin_registry_spec.rb b/spec/lib/discourse_plugin_registry_spec.rb
index c74db5e14fc..6bd872f78f0 100644
--- a/spec/lib/discourse_plugin_registry_spec.rb
+++ b/spec/lib/discourse_plugin_registry_spec.rb
@@ -98,6 +98,13 @@ RSpec.describe DiscoursePluginRegistry do
     end
   end
 
+  describe "#mail_pollers" do
+    it "defaults to an empty Set" do
+      registry.reset!
+      expect(registry.mail_pollers).to eq(Set.new)
+    end
+  end
+
   describe ".register_html_builder" do
     it "can register and build html" do
       DiscoursePluginRegistry.register_html_builder(:my_html) { "<b>my html</b>" }
@@ -258,4 +265,55 @@ RSpec.describe DiscoursePluginRegistry do
       )
     end
   end
+
+  context "with filters" do
+    after { DiscoursePluginRegistry.clear_modifiers! }
+
+    class TestFilterPlugInstance < Plugin::Instance
+      def enabled?
+        !@disabled
+      end
+
+      def enabled=(value)
+        @disabled = !value
+      end
+    end
+
+    let(:plugin_instance) { TestFilterPlugInstance.new }
+    let(:plugin_instance2) { TestFilterPlugInstance.new }
+
+    it "handles modifiers with multiple parameters" do
+      DiscoursePluginRegistry.register_modifier(plugin_instance, :magic_sum_modifier) do |a, b|
+        a + b
+      end
+
+      sum = DiscoursePluginRegistry.apply_modifier(:magic_sum_modifier, 1, 2)
+      expect(sum).to eq(3)
+    end
+
+    it "handles modifier stacking" do
+      # first in, first called
+      DiscoursePluginRegistry.register_modifier(plugin_instance, :stacking) { |x| x == 1 ? 2 : 1 }
+      DiscoursePluginRegistry.register_modifier(plugin_instance2, :stacking) { |x| x + 1 }
+
+      expect(DiscoursePluginRegistry.apply_modifier(:stacking, 1)).to eq(3)
+    end
+
+    it "handles disabled plugins" do
+      plugin_instance.enabled = false
+      DiscoursePluginRegistry.register_modifier(plugin_instance, :magic_sum_modifier) do |a, b|
+        a + b
+      end
+
+      sum = DiscoursePluginRegistry.apply_modifier(:magic_sum_modifier, 1, 2)
+      expect(sum).to eq(1)
+    end
+
+    it "can handle arity mismatch" do
+      DiscoursePluginRegistry.register_modifier(plugin_instance, :magic_sum_modifier) { 42 }
+
+      sum = DiscoursePluginRegistry.apply_modifier(:magic_sum_modifier, 1, 2)
+      expect(sum).to eq(42)
+    end
+  end
 end
diff --git a/spec/lib/discourse_spec.rb b/spec/lib/discourse_spec.rb
index 1a4227fe118..2504a12169a 100644
--- a/spec/lib/discourse_spec.rb
+++ b/spec/lib/discourse_spec.rb
@@ -13,28 +13,8 @@ RSpec.describe Discourse do
 
   describe "avatar_sizes" do
     it "returns a list of integers" do
-      expect(Discourse.avatar_sizes).to contain_exactly(
-        20,
-        25,
-        30,
-        32,
-        37,
-        40,
-        45,
-        48,
-        50,
-        60,
-        64,
-        67,
-        75,
-        90,
-        96,
-        120,
-        135,
-        180,
-        240,
-        360,
-      )
+      SiteSetting.avatar_sizes = "10|20|30"
+      expect(Discourse.avatar_sizes).to contain_exactly(10, 20, 30)
     end
   end
 
@@ -300,12 +280,18 @@ RSpec.describe Discourse do
         Discourse.disable_readonly_mode(user_readonly_mode_key)
         expect(Discourse.readonly_mode?).to eq(false)
       end
+
+      it "returns true when forced via global setting" do
+        expect(Discourse.readonly_mode?).to eq(false)
+        global_setting :pg_force_readonly_mode, true
+        expect(Discourse.readonly_mode?).to eq(true)
+      end
     end
 
     describe ".received_postgres_readonly!" do
       it "sets the right time" do
         time = Discourse.received_postgres_readonly!
-        expect(Discourse.postgres_last_read_only["default"]).to eq(time)
+        expect(Discourse.redis.get(Discourse::LAST_POSTGRES_READONLY_KEY).to_i).to eq(time.to_i)
       end
     end
 
@@ -322,7 +308,7 @@ RSpec.describe Discourse do
         messages = []
 
         expect do messages = MessageBus.track_publish { Discourse.clear_readonly! } end.to change {
-          Discourse.postgres_last_read_only["default"]
+          Discourse.redis.get(Discourse::LAST_POSTGRES_READONLY_KEY)
         }.to(nil)
 
         expect(messages.any? { |m| m.channel == Site::SITE_JSON_CHANNEL }).to eq(true)
diff --git a/spec/lib/discourse_tagging_spec.rb b/spec/lib/discourse_tagging_spec.rb
index 02782eefd5d..75f3779c825 100644
--- a/spec/lib/discourse_tagging_spec.rb
+++ b/spec/lib/discourse_tagging_spec.rb
@@ -97,6 +97,312 @@ RSpec.describe DiscourseTagging do
     end
   end
 
+  describe "#validate_one_tag_from_group_per_topic" do
+    fab!(:tag_group) { Fabricate(:tag_group, tags: [tag1, tag2, tag3], one_per_topic: true) }
+    fab!(:topic) { Fabricate(:topic) }
+    fab!(:category) { Fabricate(:category, allowed_tag_groups: [tag_group.name]) }
+
+    it "returns true if the topic doesn't belong to a category" do
+      result =
+        DiscourseTagging.validate_one_tag_from_group_per_topic(guardian, topic, nil, [tag1, tag2])
+      expect(result).to eq(true)
+    end
+
+    it "returns true if only one tag is provided" do
+      result =
+        DiscourseTagging.validate_one_tag_from_group_per_topic(guardian, topic, category, [tag1])
+      expect(result).to eq(true)
+
+      result =
+        DiscourseTagging.validate_one_tag_from_group_per_topic(guardian, topic, category, [tag2])
+      expect(result).to eq(true)
+    end
+
+    it "returns true if only one tag in the group matches" do
+      tag4 = Fabricate(:tag, name: "fun4")
+
+      result =
+        DiscourseTagging.validate_one_tag_from_group_per_topic(
+          guardian,
+          topic,
+          category,
+          [tag1, tag4],
+        )
+      expect(result).to eq(true)
+    end
+
+    context "when it fails" do
+      it "returns false if more than one tag from the group is provided" do
+        result =
+          DiscourseTagging.validate_one_tag_from_group_per_topic(
+            guardian,
+            topic,
+            category,
+            [tag1, tag2],
+          )
+
+        expect(topic.errors[:base]&.first).to eq(
+          I18n.t(
+            "tags.limited_to_one_tag_from_group",
+            tags: [tag1.name, tag2.name].sort.join(", "),
+          ),
+        )
+        expect(result).to eq(false)
+      end
+
+      it "returns multiple errors when incompatible sets from more then one group are detected" do
+        tag4 = Fabricate(:tag, name: "fun4")
+        tag5 = Fabricate(:tag, name: "fun5")
+        tag_group2 = Fabricate(:tag_group, tags: [tag4, tag5], one_per_topic: true)
+        category2 = Fabricate(:category, allowed_tag_groups: [tag_group.name, tag_group2.name])
+
+        result =
+          DiscourseTagging.validate_one_tag_from_group_per_topic(
+            guardian,
+            topic,
+            category2,
+            [tag1, tag2, tag4, tag5],
+          )
+
+        expect(topic.errors[:base]).to contain_exactly(
+          *[[tag1.name, tag2.name], [tag4.name, tag5.name]].map do |failed_set|
+            I18n.t("tags.limited_to_one_tag_from_group", tags: failed_set.sort.join(", "))
+          end,
+        )
+        expect(result).to eq(false)
+      end
+    end
+  end
+
+  describe "#filter_tags_violating_one_tag_from_group_per_topic" do
+    fab!(:tag_group) { Fabricate(:tag_group, tags: [tag1, tag2, tag3], one_per_topic: true) }
+
+    context "when the topic doesn't belong to a category" do
+      it "does not return tags that are not violating the one tag from group per topic rule" do
+        tag4 = Fabricate(:tag, name: "fun4")
+        tag5 = Fabricate(:tag, name: "fun5")
+
+        invalid_tags =
+          DiscourseTagging.filter_tags_violating_one_tag_from_group_per_topic(
+            guardian,
+            nil,
+            [tag4, tag5],
+          )
+        expect(invalid_tags).to be_empty
+      end
+
+      it "returns tags that are violating the one tag from group per topic rule when there is only one group" do
+        invalid_tags =
+          DiscourseTagging
+            .filter_tags_violating_one_tag_from_group_per_topic(guardian, nil, [tag1, tag2])
+            .values
+            .first
+            .map(&:name)
+        expect(invalid_tags).to contain_exactly(tag1.name, tag2.name)
+      end
+    end
+
+    context "when the topic belongs to a category" do
+      context "when the category only allows tags from some tag groups" do
+        it "returns tags that are violating the one tag from group per topic rule when there is only one group" do
+          category = Fabricate(:category, allowed_tag_groups: [tag_group.name])
+
+          [[tag1, tag2], [tag1, tag3], [tag2, tag3], [tag1, tag2, tag3]].each do |test_values|
+            invalid_tags =
+              DiscourseTagging
+                .filter_tags_violating_one_tag_from_group_per_topic(guardian, category, test_values)
+                .values
+                .first
+                .map(&:name)
+            expect(invalid_tags).to contain_exactly(*test_values.map(&:name))
+          end
+        end
+
+        it "returns tags that are violating the one tag from group per topic rule when there are multiple groups" do
+          tag4 = Fabricate(:tag, name: "fun4")
+          tag5 = Fabricate(:tag, name: "fun5")
+
+          tag_group2 = Fabricate(:tag_group, tags: [tag4, tag5], one_per_topic: true)
+
+          category = Fabricate(:category, allowed_tag_groups: [tag_group.name, tag_group2.name])
+
+          [
+            [tag1, tag2],
+            [tag1, tag3],
+            [tag2, tag3],
+            [tag1, tag2, tag3],
+            [tag4, tag5],
+          ].each do |test_values|
+            invalid_tags =
+              DiscourseTagging
+                .filter_tags_violating_one_tag_from_group_per_topic(guardian, category, test_values)
+                .values
+                .first
+                .map(&:name)
+            expect(invalid_tags).to contain_exactly(*test_values.map(&:name))
+          end
+
+          invalid_tags =
+            DiscourseTagging
+              .filter_tags_violating_one_tag_from_group_per_topic(
+                guardian,
+                category,
+                [tag1, tag2, tag4, tag5],
+              )
+              .values
+              .map { |tags| tags.map(&:name) }
+          expect(invalid_tags).to contain_exactly([tag1.name, tag2.name], [tag4.name, tag5.name])
+        end
+
+        it "returns an empty array when only one tag is provided" do
+          tag4 = Fabricate(:tag, name: "fun4")
+          tag5 = Fabricate(:tag, name: "fun5")
+
+          tag_group2 = Fabricate(:tag_group, tags: [tag4, tag5], one_per_topic: true)
+
+          category = Fabricate(:category, allowed_tag_groups: [tag_group.name, tag_group2.name])
+
+          [tag1, tag2, tag3, tag4, tag5].each do |tag|
+            invalid_tags =
+              DiscourseTagging.filter_tags_violating_one_tag_from_group_per_topic(
+                guardian,
+                category,
+                [tag],
+              )
+            expect(invalid_tags).to be_empty
+          end
+        end
+
+        it "returns and empty array if the tags don't belong to a tag group" do
+          tag4 = Fabricate(:tag, name: "fun4")
+          tag5 = Fabricate(:tag, name: "fun5")
+
+          category = Fabricate(:category, allowed_tag_groups: [tag_group.name])
+
+          invalid_tags =
+            DiscourseTagging.filter_tags_violating_one_tag_from_group_per_topic(
+              guardian,
+              category,
+              [tag4, tag5],
+            )
+          expect(invalid_tags).to be_empty
+        end
+      end
+
+      context "when some tag groups are required in the category" do
+        it "returns tags that are violating the one tag from group per topic rule when there is only one group" do
+          category =
+            Fabricate(
+              :category,
+              category_required_tag_groups: [
+                CategoryRequiredTagGroup.new(tag_group: tag_group, min_count: 1),
+              ],
+            )
+
+          [[tag1, tag2], [tag1, tag3], [tag2, tag3], [tag1, tag2, tag3]].each do |test_values|
+            invalid_tags =
+              DiscourseTagging
+                .filter_tags_violating_one_tag_from_group_per_topic(guardian, category, test_values)
+                .values
+                .first
+                .map(&:name)
+            expect(invalid_tags).to contain_exactly(*test_values.map(&:name))
+          end
+        end
+
+        it "returns tags that are violating the one tag from group per topic rule when there are multiple groups" do
+          tag4 = Fabricate(:tag, name: "fun4")
+          tag5 = Fabricate(:tag, name: "fun5")
+
+          tag_group2 = Fabricate(:tag_group, tags: [tag4, tag5], one_per_topic: true)
+
+          category =
+            Fabricate(
+              :category,
+              category_required_tag_groups: [
+                CategoryRequiredTagGroup.new(tag_group: tag_group, min_count: 1),
+                CategoryRequiredTagGroup.new(tag_group: tag_group2, min_count: 1),
+              ],
+            )
+
+          [
+            [tag1, tag2],
+            [tag1, tag3],
+            [tag2, tag3],
+            [tag1, tag2, tag3],
+            [tag4, tag5],
+          ].each do |test_values|
+            invalid_tags =
+              DiscourseTagging
+                .filter_tags_violating_one_tag_from_group_per_topic(guardian, category, test_values)
+                .values
+                .first
+                .map(&:name)
+            expect(invalid_tags).to contain_exactly(*test_values.map(&:name))
+          end
+
+          invalid_tags =
+            DiscourseTagging
+              .filter_tags_violating_one_tag_from_group_per_topic(
+                guardian,
+                category,
+                [tag1, tag2, tag4, tag5],
+              )
+              .values
+              .map { |tags| tags.map(&:name) }
+          expect(invalid_tags).to contain_exactly([tag1.name, tag2.name], [tag4.name, tag5.name])
+        end
+
+        it "returns an empty array when only one tag is provided" do
+          tag4 = Fabricate(:tag, name: "fun4")
+          tag5 = Fabricate(:tag, name: "fun5")
+
+          tag_group2 = Fabricate(:tag_group, tags: [tag4, tag5], one_per_topic: true)
+
+          category =
+            Fabricate(
+              :category,
+              category_required_tag_groups: [
+                CategoryRequiredTagGroup.new(tag_group: tag_group, min_count: 1),
+                CategoryRequiredTagGroup.new(tag_group: tag_group2, min_count: 1),
+              ],
+            )
+
+          [tag1, tag2, tag3, tag4, tag5].each do |tag|
+            invalid_tags =
+              DiscourseTagging.filter_tags_violating_one_tag_from_group_per_topic(
+                guardian,
+                category,
+                [tag],
+              )
+            expect(invalid_tags).to be_empty
+          end
+        end
+
+        it "returns and empty array if the tags don't belong to a tag group" do
+          tag4 = Fabricate(:tag, name: "fun4")
+          tag5 = Fabricate(:tag, name: "fun5")
+
+          category =
+            Fabricate(
+              :category,
+              category_required_tag_groups: [
+                CategoryRequiredTagGroup.new(tag_group: tag_group, min_count: 1),
+              ],
+            )
+
+          invalid_tags =
+            DiscourseTagging.filter_tags_violating_one_tag_from_group_per_topic(
+              guardian,
+              category,
+              [tag4, tag5],
+            )
+          expect(invalid_tags).to be_empty
+        end
+      end
+    end
+  end
+
   describe "filter_allowed_tags" do
     context "for input fields" do
       it "doesn't return selected tags if there's a search term" do
@@ -317,6 +623,139 @@ RSpec.describe DiscourseTagging do
         end
       end
 
+      context "with tag groups restricted to the category in which the number of tags per topic is limited to one" do
+        fab!(:tag_group) { Fabricate(:tag_group, tags: [tag1, tag2, tag3], one_per_topic: true) }
+        fab!(:tag_group2) { Fabricate(:tag_group, tags: [tag1, tag2], one_per_topic: true) }
+
+        it "doesn't return tags leaked from other tag groups containing the same tags" do
+          # this tests covers the bug described in
+          # https://meta.discourse.org/t/limiting-tags-to-categories-not-working-as-expected/263143
+
+          category = Fabricate(:category, tag_groups: [tag_group])
+
+          # In the beginning, show tags for tag_group
+          tags =
+            DiscourseTagging.filter_allowed_tags(
+              Guardian.new(user),
+              for_input: true,
+              category: category,
+            ).to_a
+          expect(sorted_tag_names(tags)).to eq(sorted_tag_names([tag1, tag2, tag3]))
+
+          # Once a tag has been selected it should not return any tags from the same group
+          # this is where the problem reported in the bug linked above was happening
+          # If the user selected a tag that belonged only to the tag group restricted to the category but other tags
+          # from the same tag group were also present in other tag groups, they were being returned because they were
+          # bleeding from the tag list as the filter performed in the query was scoping only the category to apply the
+          # restriction. Since the join was done on tag_id, it was returning all tags with the same ids even if they
+          # actually belonged to other tag groups that should not be returned because the category was not restricted
+          # to them
+          tags =
+            DiscourseTagging.filter_allowed_tags(
+              Guardian.new(user),
+              for_input: true,
+              category: category,
+              selected_tags: [tag3.name],
+            ).to_a
+          expect(sorted_tag_names(tags)).to be_empty
+        end
+
+        it "doesn't return a tag excluded from a tag group even if also belongs to another allowed one" do
+          tag4 = Fabricate(:tag)
+          tag5 = Fabricate(:tag)
+          tag_group3 = Fabricate(:tag_group, tags: [tag3, tag4], one_per_topic: true)
+
+          category = Fabricate(:category, tag_groups: [tag_group, tag_group2, tag_group3])
+
+          # In the beginning, show all expected tags
+          tags =
+            DiscourseTagging.filter_allowed_tags(
+              Guardian.new(user),
+              for_input: true,
+              category: category,
+            ).to_a
+          expect(sorted_tag_names(tags)).to eq(sorted_tag_names([tag1, tag2, tag3, tag4]))
+
+          # tag3 belongs to tag_group1 and tag_group3. no tags from both groups should be returned
+          tags =
+            DiscourseTagging.filter_allowed_tags(
+              Guardian.new(user),
+              for_input: true,
+              category: category,
+              selected_tags: [tag3.name],
+            ).to_a
+          expect(sorted_tag_names(tags)).to be_empty
+
+          # tag4 only belong belongs to tag_group3. tag1 and tag2 should be returned because they belong to tag_group1
+          # and tag_group2 but don't belong to tag_group3
+          tags =
+            DiscourseTagging.filter_allowed_tags(
+              Guardian.new(user),
+              for_input: true,
+              category: category,
+              selected_tags: [tag4.name],
+            ).to_a
+          expect(sorted_tag_names(tags)).to eq(sorted_tag_names([tag1, tag2]))
+        end
+
+        it "returns correctly tags from other restricted tag groups when they're not limited to one" do
+          tag4 = Fabricate(:tag, name: "fun4")
+          tag5 = Fabricate(:tag, name: "fun5")
+          tag_group3 = Fabricate(:tag_group, tags: [tag4, tag5])
+
+          category = Fabricate(:category, tag_groups: [tag_group, tag_group2, tag_group3])
+
+          # In the beginning, show all expected tags
+          tags =
+            DiscourseTagging.filter_allowed_tags(
+              Guardian.new(user),
+              for_input: true,
+              category: category,
+            ).to_a
+          expect(sorted_tag_names(tags)).to eq(sorted_tag_names([tag1, tag2, tag3, tag4, tag5]))
+
+          # Once a tag from a limited group has been selected it should not return any tags from the same group
+          tags =
+            DiscourseTagging.filter_allowed_tags(
+              Guardian.new(user),
+              for_input: true,
+              category: category,
+              selected_tags: [tag1.name],
+            ).to_a
+          expect(sorted_tag_names(tags)).to eq(sorted_tag_names([tag4, tag5]))
+
+          # if a tag from the group not limited to one tag is also selected the other should be returned
+          tags =
+            DiscourseTagging.filter_allowed_tags(
+              Guardian.new(user),
+              for_input: true,
+              category: category,
+              selected_tags: [tag1.name, tag4.name],
+            ).to_a
+          expect(sorted_tag_names(tags)).to eq(sorted_tag_names([tag5]))
+
+          tags =
+            DiscourseTagging.filter_allowed_tags(
+              Guardian.new(user),
+              for_input: true,
+              category: category,
+              selected_tags: [tag1.name, tag5.name],
+            ).to_a
+          expect(sorted_tag_names(tags)).to eq(sorted_tag_names([tag4]))
+
+          # finally if all the tags from the group not limited to one tag are also selected, then there is no other
+          # tag to return
+          tags =
+            DiscourseTagging.filter_allowed_tags(
+              Guardian.new(user),
+              for_input: true,
+              category: category,
+              selected_tags: [tag1.name, tag4.name, tag5.name],
+            ).to_a
+          expect(sorted_tag_names(tags)).to be_empty
+        end
+      end
+
       context "with many required tags in a tag group" do
         fab!(:tag4) { Fabricate(:tag, name: "T4") }
         fab!(:tag5) { Fabricate(:tag, name: "T5") }
@@ -682,6 +1121,194 @@ RSpec.describe DiscourseTagging do
         )
       end
 
+      it "fails when parent tag missing will conflict with another tag from tag group set to one tag per topic" do
+        parent_tag = Fabricate(:tag, name: "parent-1")
+        parent_tag2 = Fabricate(:tag, name: "parent-2")
+        parent_tag_group =
+          Fabricate(:tag_group, tags: [parent_tag, parent_tag2], one_per_topic: true)
+
+        tag4 = Fabricate(:tag, name: "fun4")
+        tag5 = Fabricate(:tag, name: "fun5")
+
+        child_tag_group =
+          Fabricate(:tag_group, tags: [tag1, tag2, tag3], parent_tag_id: parent_tag.id)
+        child_tag_group2 = Fabricate(:tag_group, tags: [tag4, tag5], parent_tag_id: parent_tag2.id)
+
+        tag_limited_category =
+          Fabricate(
+            :category,
+            allowed_tag_groups: [
+              parent_tag_group.name,
+              child_tag_group.name,
+              child_tag_group2.name,
+            ],
+          )
+
+        topic = Fabricate(:topic, category: tag_limited_category)
+
+        # tag2 will insert parent_tag which is missing. parent_tag will conflict with parent_tag2
+        valid =
+          DiscourseTagging.tag_topic_by_names(
+            topic,
+            Guardian.new(user),
+            [parent_tag2.name, tag2.name],
+          )
+        expect(valid).to eq(false)
+        expect(topic.errors[:base]&.first).to eq(
+          I18n.t(
+            "tags.limited_to_one_tag_from_group",
+            tags: [parent_tag2.name, tag2.name].sort.join(", "),
+          ),
+        )
+
+        topic = Fabricate(:topic, category: tag_limited_category)
+
+        # tag4 will insert parent_tag2 which is missing. parent_tag will conflict with parent_tag2
+        valid =
+          DiscourseTagging.tag_topic_by_names(
+            topic,
+            Guardian.new(user),
+            [parent_tag.name, tag1.name, tag4.name],
+          )
+        expect(valid).to eq(false)
+        expect(topic.errors[:base]&.first).to eq(
+          I18n.t(
+            "tags.limited_to_one_tag_from_group",
+            tags: [parent_tag.name, tag4.name].sort.join(", "),
+          ),
+        )
+      end
+
+      it "fails when multiple parent tag missing will conflict with another tag from tag group set to one tag per topic" do
+        parent_tag = Fabricate(:tag, name: "parent-1")
+        parent_tag2 = Fabricate(:tag, name: "parent-2")
+        parent_tag3 = Fabricate(:tag, name: "parent-3")
+        parent_tag_group =
+          Fabricate(:tag_group, tags: [parent_tag, parent_tag2, parent_tag3], one_per_topic: true)
+
+        tag4 = Fabricate(:tag, name: "fun4")
+        tag5 = Fabricate(:tag, name: "fun5")
+
+        child_tag_group =
+          Fabricate(:tag_group, tags: [tag1, tag2, tag3], parent_tag_id: parent_tag.id)
+        child_tag_group2 = Fabricate(:tag_group, tags: [tag4], parent_tag_id: parent_tag2.id)
+        child_tag_group3 = Fabricate(:tag_group, tags: [tag5], parent_tag_id: parent_tag3.id)
+
+        tag_limited_category =
+          Fabricate(
+            :category,
+            allowed_tag_groups: [
+              parent_tag_group.name,
+              child_tag_group.name,
+              child_tag_group2.name,
+              child_tag_group3.name,
+            ],
+          )
+
+        topic = Fabricate(:topic, category: tag_limited_category)
+
+        # tag4 and tag5 will insert parent_tag2 and parent_tag3 which are missing. they will conflict with parent_tag
+        valid =
+          DiscourseTagging.tag_topic_by_names(
+            topic,
+            Guardian.new(user),
+            [parent_tag.name, tag4.name, tag5.name],
+          )
+        expect(valid).to eq(false)
+        expect(topic.errors[:base]&.first).to eq(
+          I18n.t(
+            "tags.limited_to_one_tag_from_group",
+            tags: [parent_tag.name, tag4.name, tag5.name].sort.join(", "),
+          ),
+        )
+      end
+
+      it "fails when multiple parent tag missing will conflict in tag group set to one tag per topic" do
+        parent_tag = Fabricate(:tag, name: "parent-1")
+        parent_tag2 = Fabricate(:tag, name: "parent-2")
+        parent_tag_group =
+          Fabricate(:tag_group, tags: [parent_tag, parent_tag2], one_per_topic: true)
+
+        tag4 = Fabricate(:tag, name: "fun4")
+        tag5 = Fabricate(:tag, name: "fun5")
+
+        child_tag_group =
+          Fabricate(:tag_group, tags: [tag1, tag2, tag3], parent_tag_id: parent_tag.id)
+        child_tag_group2 = Fabricate(:tag_group, tags: [tag4, tag5], parent_tag_id: parent_tag2.id)
+
+        tag_limited_category =
+          Fabricate(
+            :category,
+            allowed_tag_groups: [
+              parent_tag_group.name,
+              child_tag_group.name,
+              child_tag_group2.name,
+            ],
+          )
+
+        topic = Fabricate(:topic, category: tag_limited_category)
+
+        # tag1 and tag4 will insert parent_tag and parent_tag2 which are missing. they will conflict with each other
+        valid =
+          DiscourseTagging.tag_topic_by_names(topic, Guardian.new(user), [tag1.name, tag4.name])
+        expect(valid).to eq(false)
+        expect(topic.errors[:base]&.first).to eq(
+          I18n.t(
+            "tags.limited_to_one_tag_from_group",
+            tags: [tag1.name, tag4.name].sort.join(", "),
+          ),
+        )
+      end
+
+      it "fails with multiple errors when parent tag missing will conflict in more than one tag group set to one tag per topic" do
+        parent_tag = Fabricate(:tag, name: "parent-1")
+        parent_tag2 = Fabricate(:tag, name: "parent-2")
+        parent_tag_group =
+          Fabricate(:tag_group, tags: [parent_tag, parent_tag2], one_per_topic: true)
+
+        parent_tag3 = Fabricate(:tag, name: "parent-3")
+        parent_tag4 = Fabricate(:tag, name: "parent-4")
+        parent_tag_group2 =
+          Fabricate(:tag_group, tags: [parent_tag3, parent_tag4], one_per_topic: true)
+
+        tag4 = Fabricate(:tag, name: "fun4")
+
+        child_tag_group = Fabricate(:tag_group, tags: [tag1], parent_tag_id: parent_tag.id)
+        child_tag_group2 = Fabricate(:tag_group, tags: [tag2], parent_tag_id: parent_tag2.id)
+        child_tag_group3 = Fabricate(:tag_group, tags: [tag3], parent_tag_id: parent_tag3.id)
+        child_tag_group4 = Fabricate(:tag_group, tags: [tag4], parent_tag_id: parent_tag4.id)
+
+        tag_limited_category =
+          Fabricate(
+            :category,
+            allowed_tag_groups: [
+              parent_tag_group.name,
+              parent_tag_group2.name,
+              child_tag_group.name,
+              child_tag_group2.name,
+              child_tag_group3.name,
+              child_tag_group4.name,
+            ],
+          )
+
+        topic = Fabricate(:topic, category: tag_limited_category)
+
+        # tag2 will insert parent_tag2 which is missing. it will conflict with parent_tag
+        # tag4 will insert parent_tag4 which is missing. it will conflict with parent_tag3
+        valid =
+          DiscourseTagging.tag_topic_by_names(
+            topic,
+            Guardian.new(user),
+            [parent_tag.name, tag2.name, parent_tag3.name, tag4.name],
+          )
+        expect(valid).to eq(false)
+        expect(topic.errors[:base]).to contain_exactly(
+          *[[parent_tag.name, tag2.name], [parent_tag3.name, tag4.name]].map do |conflicting_tags|
+            I18n.t("tags.limited_to_one_tag_from_group", tags: conflicting_tags.sort.join(", "))
+          end,
+        )
+      end
+
       it "adds only the necessary parent tags" do
         common = Fabricate(:tag, name: "common")
         tag_group.tags = [tag3, common]
@@ -832,7 +1459,8 @@ RSpec.describe DiscourseTagging do
         )
       end
 
-      it "only sanitizes new tags" do # for backwards compat
+      it "only sanitizes new tags" do
+        # for backwards compat
         Tag.new(name: "math=fun").save(validate: false)
         expect(
           described_class.tags_for_saving(%w[math=fun fun*2@gmail.com], guardian).try(:sort),
@@ -924,6 +1552,19 @@ RSpec.describe DiscourseTagging do
       expect(tag2.reload.target_tag).to eq(tag1)
     end
 
+    it "replaces topic synonym tags with target tag" do
+      tag4, tag5 = 2.times.collect { Fabricate(:tag) }
+      topic = Fabricate(:topic, tags: [tag2, tag3, tag4])
+      expect {
+        expect(DiscourseTagging.add_or_create_synonyms_by_name(tag1, [tag2.name, tag3.name])).to eq(
+          true,
+        )
+      }.to_not change { Tag.count }
+      expect_same_tag_names(tag1.reload.synonyms, [tag2, tag3])
+      expect_same_tag_names(topic.reload.tags, [tag1, tag4])
+      expect(tag5.reload).to be_present
+    end
+
     it "can create new tags" do
       expect {
         expect(DiscourseTagging.add_or_create_synonyms_by_name(tag1, ["synonym1"])).to eq(true)
diff --git a/spec/lib/discourse_updates_spec.rb b/spec/lib/discourse_updates_spec.rb
index efbb2467af3..6e1f30d2f31 100644
--- a/spec/lib/discourse_updates_spec.rb
+++ b/spec/lib/discourse_updates_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe DiscourseUpdates do
     DiscourseUpdates.updated_at = updated_at
   end
 
-  subject { DiscourseUpdates.check_version }
+  subject(:version) { DiscourseUpdates.check_version }
 
   context "when version check was done at the current installed version" do
     before { DiscourseUpdates.last_installed_version = Discourse::VERSION::STRING }
@@ -19,15 +19,15 @@ RSpec.describe DiscourseUpdates do
         before { stub_data(Discourse::VERSION::STRING, 0, false, time) }
 
         it "returns all the version fields" do
-          expect(subject.latest_version).to eq(Discourse::VERSION::STRING)
-          expect(subject.missing_versions_count).to eq(0)
-          expect(subject.critical_updates).to eq(false)
-          expect(subject.installed_version).to eq(Discourse::VERSION::STRING)
-          expect(subject.stale_data).to eq(false)
+          expect(version.latest_version).to eq(Discourse::VERSION::STRING)
+          expect(version.missing_versions_count).to eq(0)
+          expect(version.critical_updates).to eq(false)
+          expect(version.installed_version).to eq(Discourse::VERSION::STRING)
+          expect(version.stale_data).to eq(false)
         end
 
         it "returns the timestamp of the last version check" do
-          expect(subject.updated_at).to be_within_one_second_of(time)
+          expect(version.updated_at).to be_within_one_second_of(time)
         end
       end
 
@@ -36,14 +36,14 @@ RSpec.describe DiscourseUpdates do
         before { stub_data("0.9.0", 2, false, time) }
 
         it "returns all the version fields" do
-          expect(subject.latest_version).to eq("0.9.0")
-          expect(subject.missing_versions_count).to eq(2)
-          expect(subject.critical_updates).to eq(false)
-          expect(subject.installed_version).to eq(Discourse::VERSION::STRING)
+          expect(version.latest_version).to eq("0.9.0")
+          expect(version.missing_versions_count).to eq(2)
+          expect(version.critical_updates).to eq(false)
+          expect(version.installed_version).to eq(Discourse::VERSION::STRING)
         end
 
         it "returns the timestamp of the last version check" do
-          expect(subject.updated_at).to be_within_one_second_of(time)
+          expect(version.updated_at).to be_within_one_second_of(time)
         end
       end
     end
@@ -52,22 +52,22 @@ RSpec.describe DiscourseUpdates do
       before { stub_data(nil, nil, false, nil) }
 
       it "returns the installed version" do
-        expect(subject.installed_version).to eq(Discourse::VERSION::STRING)
+        expect(version.installed_version).to eq(Discourse::VERSION::STRING)
       end
 
       it "indicates that version check has not been performed" do
-        expect(subject.updated_at).to eq(nil)
-        expect(subject.stale_data).to eq(true)
+        expect(version.updated_at).to eq(nil)
+        expect(version.stale_data).to eq(true)
       end
 
       it "does not return latest version info" do
-        expect(subject.latest_version).to eq(nil)
-        expect(subject.missing_versions_count).to eq(nil)
-        expect(subject.critical_updates).to eq(nil)
+        expect(version.latest_version).to eq(nil)
+        expect(version.missing_versions_count).to eq(nil)
+        expect(version.critical_updates).to eq(nil)
       end
 
       it "queues a version check" do
-        expect_enqueued_with(job: :version_check) { subject }
+        expect_enqueued_with(job: :version_check) { version }
       end
     end
 
@@ -76,15 +76,15 @@ RSpec.describe DiscourseUpdates do
     context "with old version check data" do
       shared_examples "queue version check and report that version is ok" do
         it "queues a version check" do
-          expect_enqueued_with(job: :version_check) { subject }
+          expect_enqueued_with(job: :version_check) { version }
         end
 
         it "reports 0 missing versions" do
-          expect(subject.missing_versions_count).to eq(0)
+          expect(version.missing_versions_count).to eq(0)
         end
 
         it "reports that a version check will be run soon" do
-          expect(subject.version_check_pending).to eq(true)
+          expect(version.version_check_pending).to eq(true)
         end
       end
 
@@ -105,15 +105,15 @@ RSpec.describe DiscourseUpdates do
 
     shared_examples "when last_installed_version is old" do
       it "queues a version check" do
-        expect_enqueued_with(job: :version_check) { subject }
+        expect_enqueued_with(job: :version_check) { version }
       end
 
       it "reports 0 missing versions" do
-        expect(subject.missing_versions_count).to eq(0)
+        expect(version.missing_versions_count).to eq(0)
       end
 
       it "reports that a version check will be run soon" do
-        expect(subject.version_check_pending).to eq(true)
+        expect(version.version_check_pending).to eq(true)
       end
     end
 
diff --git a/spec/lib/email/message_builder_spec.rb b/spec/lib/email/message_builder_spec.rb
index 567f4b5a922..3be2744da14 100644
--- a/spec/lib/email/message_builder_spec.rb
+++ b/spec/lib/email/message_builder_spec.rb
@@ -4,9 +4,9 @@ require "email/message_builder"
 
 RSpec.describe Email::MessageBuilder do
   let(:to_address) { "jake@adventuretime.ooo" }
-  let(:subject) { "Tree Trunks has made some apple pie!" }
+  let(:email_subject) { "Tree Trunks has made some apple pie!" }
   let(:body) { "oh my glob Jake, Tree Trunks just made the tastiest apple pie ever!" }
-  let(:builder) { Email::MessageBuilder.new(to_address, subject: subject, body: body) }
+  let(:builder) { Email::MessageBuilder.new(to_address, subject: email_subject, body: body) }
   let(:build_args) { builder.build_args }
   let(:header_args) { builder.header_args }
   let(:allow_reply_header) { described_class::ALLOW_REPLY_BY_EMAIL_HEADER }
@@ -16,7 +16,7 @@ RSpec.describe Email::MessageBuilder do
   end
 
   it "has the subject" do
-    expect(builder.subject).to eq(subject)
+    expect(builder.subject).to eq(email_subject)
   end
 
   it "has the body" do
diff --git a/spec/lib/email/processor_spec.rb b/spec/lib/email/processor_spec.rb
index 4f57124145f..2d0d797b495 100644
--- a/spec/lib/email/processor_spec.rb
+++ b/spec/lib/email/processor_spec.rb
@@ -48,6 +48,13 @@ RSpec.describe Email::Processor do
     end
   end
 
+  describe "when mail is not set" do
+    it "does not raise an error" do
+      expect { Email::Processor.process!(nil) }.not_to raise_error
+      expect { Email::Processor.process!("") }.not_to raise_error
+    end
+  end
+
   describe "rate limits" do
     let(:mail) { "From: #{from}\nTo: bar@foo.com\nSubject: FOO BAR\n\nFoo foo bar bar?" }
     let(:limit_exceeded) { RateLimiter::LimitExceeded.new(10) }
diff --git a/spec/lib/email/receiver_spec.rb b/spec/lib/email/receiver_spec.rb
index 99035646be8..6b67176be1a 100644
--- a/spec/lib/email/receiver_spec.rb
+++ b/spec/lib/email/receiver_spec.rb
@@ -218,14 +218,6 @@ RSpec.describe Email::Receiver do
     expect(IncomingEmail.last.error).to eq("RuntimeError")
   end
 
-  it "matches the correct user" do
-    user = Fabricate(:user)
-    email_log = Fabricate(:email_log, to_address: user.email, user: user, bounce_key: nil)
-    email, name = Email::Receiver.new(email(:existing_user)).parse_from_field
-    expect(email).to eq("existing@bar.com")
-    expect(name).to eq("Foo Bar")
-  end
-
   it "strips null bytes from the subject" do
     expect do process(:null_byte_in_subject) end.to raise_error(
       Email::Receiver::BadDestinationAddress,
@@ -512,15 +504,18 @@ RSpec.describe Email::Receiver do
       )
     end
 
-    it "handles invalid from header" do
-      expect { process(:invalid_from_1) }.to change { topic.posts.count }
-      expect(topic.posts.last.raw).to eq("This email was sent with an invalid from header field.")
+    it "raises a NoSenderDetectedError when the From header can't be parsed" do
+      expect { process(:invalid_from_1) }.to raise_error(Email::Receiver::NoSenderDetectedError)
     end
 
     it "raises a NoSenderDetectedError when the From header doesn't contain an email address" do
       expect { process(:invalid_from_2) }.to raise_error(Email::Receiver::NoSenderDetectedError)
     end
 
+    it "doesn't raise an AutoGeneratedEmailError due to an X-Auto-Response-Suppress header" do
+      expect { process(:quirks_exchange_xars) }.to change { topic.posts.count }
+    end
+
     it "doesn't raise an AutoGeneratedEmailError when the mail is auto generated but is allowlisted" do
       SiteSetting.auto_generated_allowlist = "foo@bar.com|discourse@bar.com"
       expect { process(:auto_generated_allowlisted) }.to change { topic.posts.count }
@@ -1992,6 +1987,38 @@ RSpec.describe Email::Receiver do
     end
   end
 
+  describe "mailman mirror" do
+    fab!(:category) { Fabricate(:mailinglist_mirror_category) }
+
+    it "uses 'from' email address" do
+      expect { process(:mailman_1) }.to change { Topic.count }
+      user = Topic.last.user
+      expect(user.email).to eq("some@one.com")
+      expect(user.name).to eq("Some One")
+    end
+
+    it "uses 'reply-to' email address" do
+      expect { process(:mailman_2) }.to change { Topic.count }
+      user = Topic.last.user
+      expect(user.email).to eq("some@one.com")
+      expect(user.name).to eq("Some")
+    end
+
+    it "uses 'x-mailfrom' email address and name from CC" do
+      expect { process(:mailman_3) }.to change { Topic.count }
+      user = Topic.last.user
+      expect(user.email).to eq("some@one.com")
+      expect(user.name).to eq("Some One")
+    end
+
+    it "uses 'x-original-from' email address" do
+      expect { process(:mailman_4) }.to change { Topic.count }
+      user = Topic.last.user
+      expect(user.email).to eq("some@one.com")
+      expect(user.name).to eq("Some")
+    end
+  end
+
   describe "mailing list mirror" do
     fab!(:category) { Fabricate(:mailinglist_mirror_category) }
 
diff --git a/spec/lib/email/sender_spec.rb b/spec/lib/email/sender_spec.rb
index a3619e28c25..2194b379ad0 100644
--- a/spec/lib/email/sender_spec.rb
+++ b/spec/lib/email/sender_spec.rb
@@ -572,7 +572,7 @@ RSpec.describe Email::Sender do
       reply.rebake!
       Email::Sender.new(message, :valid_type).send
       expected = <<~HTML
-      <a href=\"#{Discourse.base_url}#{category.url}\" data-type=\"category\" data-slug=\"dev\" style=\"text-decoration: none; font-weight: bold; color: #006699;\"><span>#dev</span>
+      <a href=\"#{Discourse.base_url}#{category.url}\" data-type=\"category\" data-slug=\"dev\" data-id=\"#{category.id}\" style=\"text-decoration: none; font-weight: bold; color: #006699;\"><span>#dev</span>
       HTML
       expect(message.html_part.body.to_s).to include(expected.chomp)
     end
diff --git a/spec/lib/email/styles_spec.rb b/spec/lib/email/styles_spec.rb
index a5190008940..0363358a7f5 100644
--- a/spec/lib/email/styles_spec.rb
+++ b/spec/lib/email/styles_spec.rb
@@ -109,12 +109,10 @@ RSpec.describe Email::Styles do
     end
 
     it "replaces hashtag-cooked text with raw #hashtag" do
-      hashtag_html =
-        "<a class=\"hashtag-cooked\" href=\"#{Discourse.base_url}/c/123/dev\" data-type=\"category\" data-slug=\"dev\"><svg class=\"fa d-icon d-icon-folder svg-icon svg-node\"><use href=\"#folder\"></use></svg><span>Dev Zone</span></a>"
-      frag = html_fragment(hashtag_html)
-      expect(frag.at("a").text.chomp).to eq("#dev")
-      hashtag_html =
-        "<a class=\"hashtag-cooked\" href=\"#{Discourse.base_url}/c/123/dev\" data-type=\"category\" data-slug=\"dev\"><svg class=\"fa d-icon d-icon-folder svg-icon svg-node\">Dev Zone</a>"
+      category = Fabricate(:category, name: "dev", slug: "dev")
+      post = Fabricate(:post, raw: "this is #dev")
+      post.rebake!
+      hashtag_html = post.cooked
       frag = html_fragment(hashtag_html)
       expect(frag.at("a").text.chomp).to eq("#dev")
     end
diff --git a/spec/lib/excerpt_parser_spec.rb b/spec/lib/excerpt_parser_spec.rb
index 5a6e494df06..3613a944c7e 100644
--- a/spec/lib/excerpt_parser_spec.rb
+++ b/spec/lib/excerpt_parser_spec.rb
@@ -110,6 +110,57 @@ RSpec.describe ExcerptParser do
         The first paragraph of this pinned topic will be &hellip;
       HTML
     end
+
+    it "keeps the content for internal oneboxes that contain github oneboxes" do
+      html = <<~HTML.strip
+        <p>Another commit to test out.</p>
+        <p>This time this commit has a longer commit message.</p>
+        <aside class="onebox githubcommit" data-onebox-src="https://github.com/discourse/discourse/commit/90f395a11895e9cfb7edd182b0bf5ec3d51d7892">
+          <header class="source">
+              <a href="https://github.com/discourse/discourse/commit/90f395a11895e9cfb7edd182b0bf5ec3d51d7892" target="_blank" rel="noopener">github.com/discourse/discourse</a>
+          </header>
+          <article class="onebox-body">
+            <div class="github-row">
+          <div class="github-icon-container" title="Commit">
+            <svg width="60" height="60" class="github-icon" viewBox="0 0 14 16" aria-hidden="true"><path fill-rule="evenodd" d="M10.86 7c-.45-1.72-2-3-3.86-3-1.86 0-3.41 1.28-3.86 3H0v2h3.14c.45 1.72 2 3 3.86 3 1.86 0 3.41-1.28 3.86-3H14V7h-3.14zM7 10.2c-1.22 0-2.2-.98-2.2-2.2 0-1.22.98-2.2 2.2-2.2 1.22 0 2.2.98 2.2 2.2 0 1.22-.98 2.2-2.2 2.2z"></path></svg>
+          </div>
+          <div class="github-info-container">
+            <h4>
+              <a href="https://github.com/discourse/discourse/commit/90f395a11895e9cfb7edd182b0bf5ec3d51d7892" target="_blank" rel="noopener">DEV: Skip srcset for onebox thumbnails (#22621)</a>
+            </h4>
+            <div class="github-info">
+              <div class="date">
+                committed <span class="discourse-local-date" data-format="ll" data-date="2023-07-19" data-time="18:21:34" data-timezone="UTC">06:21PM - 19 Jul 23 UTC (UTC)</span>
+              </div>
+              <div class="user">
+                <a href="https://github.com/oblakeerickson" target="_blank" rel="noopener">
+                  <img alt="oblakeerickson" src="//localhost:3000/uploads/default/original/1X/741ac99d6a66d71cdd46dd99fb5156506e13fdf2.jpeg" class="onebox-avatar-inline" width="20" height="20" data-dominant-color="3C3C3C">
+                  oblakeerickson
+                </a>
+              </div>
+              <div class="lines" title="changed 2 files with 24 additions and 15 deletions">
+                <a href="https://github.com/discourse/discourse/commit/90f395a11895e9cfb7edd182b0bf5ec3d51d7892" target="_blank" rel="noopener">
+                  <span class="added">+24</span>
+                  <span class="removed">-15</span>
+                </a>
+              </div>
+            </div>
+          </div>
+        </div>
+          <div class="github-row">
+            <p class="github-body-container">* DEV: Test commit message
+        This is a longer commit message <span class="show-more-container"><a href="https://github.com/discourse/discourse/commit/90f395a11895e9cfb7edd182b0bf5ec3d51d7892" target="_blank" rel="noopener" class="show-more">…</a></span><span class="excerpt hidden">that has the show-more class along with the exerpt hidden class</span></p>
+          </div>
+          </article>
+          <div class="onebox-metadata">
+          </div>
+          <div style="clear: both"></div>
+        </aside>
+      HTML
+      expect(ExcerptParser.get_excerpt(html, 100, keep_onebox_body: false)).to eq(<<~HTML.strip)
+        Another commit to test out. \nThis time this commit has a longer commit message.
+      HTML
+    end
   end
 
   describe "keep_quotes parameter" do
diff --git a/spec/lib/file_store/s3_store_spec.rb b/spec/lib/file_store/s3_store_spec.rb
index 856ff53e683..29576c3f1f2 100644
--- a/spec/lib/file_store/s3_store_spec.rb
+++ b/spec/lib/file_store/s3_store_spec.rb
@@ -130,6 +130,38 @@ RSpec.describe FileStore::S3Store do
           expect(store.url_for(upload)).to eq(upload.url)
         end
       end
+
+      describe "when ACLs are disabled" do
+        it "doesn't supply an ACL" do
+          SiteSetting.s3_use_acls = false
+          SiteSetting.authorized_extensions = "pdf|png|jpg|gif"
+          upload =
+            Fabricate(:upload, original_filename: "small.pdf", extension: "pdf", secure: true)
+
+          s3_helper.expects(:s3_bucket).returns(s3_bucket)
+          s3_bucket
+            .expects(:object)
+            .with(regexp_matches(%r{original/\d+X.*/#{upload.sha1}\.pdf}))
+            .returns(s3_object)
+          s3_object
+            .expects(:put)
+            .with(
+              {
+                acl: nil,
+                cache_control: "max-age=31556952, public, immutable",
+                content_type: "application/pdf",
+                content_disposition:
+                  "attachment; filename=\"#{upload.original_filename}\"; filename*=UTF-8''#{upload.original_filename}",
+                body: uploaded_file,
+              },
+            )
+            .returns(Aws::S3::Types::PutObjectOutput.new(etag: "\"#{etag}\""))
+
+          expect(store.store_upload(uploaded_file, upload)).to match(
+            %r{//s3-upload-bucket\.s3\.dualstack\.us-west-1\.amazonaws\.com/original/\d+X.*/#{upload.sha1}\.pdf},
+          )
+        end
+      end
     end
 
     describe "#store_optimized_image" do
@@ -461,12 +493,7 @@ RSpec.describe FileStore::S3Store do
 
       it "sets acl to public by default" do
         s3_helper.expects(:s3_bucket).returns(s3_bucket)
-        s3_bucket
-          .expects(:object)
-          .with(regexp_matches(%r{original/\d+X.*/#{upload.sha1}\.pdf}))
-          .returns(s3_object)
-        s3_object.expects(:acl).returns(s3_object)
-        s3_object.expects(:put).with(acl: "public-read").returns(s3_object)
+        expect_upload_acl_update(upload, "public-read")
 
         expect(store.update_upload_ACL(upload)).to be_truthy
       end
@@ -474,14 +501,34 @@ RSpec.describe FileStore::S3Store do
       it "sets acl to private when upload is marked secure" do
         upload.update!(secure: true)
         s3_helper.expects(:s3_bucket).returns(s3_bucket)
+        expect_upload_acl_update(upload, "private")
+
+        expect(store.update_upload_ACL(upload)).to be_truthy
+      end
+
+      describe "optimized images" do
+        it "sets acl to public by default" do
+          s3_helper.expects(:s3_bucket).returns(s3_bucket).at_least_once
+          expect_upload_acl_update(upload, "public-read")
+          optimized_image = Fabricate(:optimized_image, upload: upload)
+          path = Discourse.store.get_path_for_optimized_image(optimized_image)
+
+          stub_optimized_image = stub
+          s3_bucket.expects(:object).with(path).returns(stub_optimized_image)
+          stub_optimized_image.expects(:acl).returns(stub_optimized_image)
+          stub_optimized_image.expects(:put).with(acl: "public-read").returns(stub_optimized_image)
+
+          expect(store.update_upload_ACL(upload)).to be_truthy
+        end
+      end
+
+      def expect_upload_acl_update(upload, acl)
         s3_bucket
           .expects(:object)
           .with(regexp_matches(%r{original/\d+X.*/#{upload.sha1}\.pdf}))
           .returns(s3_object)
         s3_object.expects(:acl).returns(s3_object)
-        s3_object.expects(:put).with(acl: "private").returns(s3_object)
-
-        expect(store.update_upload_ACL(upload)).to be_truthy
+        s3_object.expects(:put).with(acl: acl).returns(s3_object)
       end
     end
   end
diff --git a/spec/lib/final_destination/resolver_spec.rb b/spec/lib/final_destination/resolver_spec.rb
index cdaa3d6c0db..4dff59031c9 100644
--- a/spec/lib/final_destination/resolver_spec.rb
+++ b/spec/lib/final_destination/resolver_spec.rb
@@ -34,6 +34,11 @@ describe FinalDestination::Resolver do
     expect(alive_thread_count).to eq(start_thread_count + 1)
   end
 
+  it "reads default query timeout from configuration" do
+    GlobalSetting.stubs(:dns_query_timeout_secs).returns(123)
+    expect(FinalDestination::Resolver.send(:default_dns_query_timeout)).to eq(123)
+  end
+
   it "can lookup correctly" do
     Addrinfo.stubs(:getaddrinfo).with { |addr| addr == "example.com" }.returns(mock_response)
 
diff --git a/spec/lib/final_destination/ssrf_detector_spec.rb b/spec/lib/final_destination/ssrf_detector_spec.rb
index 8479f8bf159..8781390507d 100644
--- a/spec/lib/final_destination/ssrf_detector_spec.rb
+++ b/spec/lib/final_destination/ssrf_detector_spec.rb
@@ -6,8 +6,8 @@ describe FinalDestination::SSRFDetector do
       SiteSetting.blocked_ip_blocks = "13.134.89.0/24|73.234.19.0/30\n"
       SiteSetting.allowed_internal_hosts = "awesomesauce.com\n|goodbye.net"
 
-      expect(subject.blocked_ip_blocks).to eq(%w[13.134.89.0/24 73.234.19.0/30])
-      expect(subject.allowed_internal_hosts).to eq(
+      expect(described_class.blocked_ip_blocks).to eq(%w[13.134.89.0/24 73.234.19.0/30])
+      expect(described_class.allowed_internal_hosts).to eq(
         [
           "test.localhost", # Discourse.base_url
           "awesomesauce.com",
@@ -20,8 +20,8 @@ describe FinalDestination::SSRFDetector do
       SiteSetting.blocked_ip_blocks = "13.134.89.0/24\n73.234.19.0/30\n\n"
       SiteSetting.allowed_internal_hosts = "awesomesauce.com\n\ngoodbye.net\n\n"
 
-      expect(subject.blocked_ip_blocks).to eq(%w[13.134.89.0/24 73.234.19.0/30])
-      expect(subject.allowed_internal_hosts).to eq(
+      expect(described_class.blocked_ip_blocks).to eq(%w[13.134.89.0/24 73.234.19.0/30])
+      expect(described_class.allowed_internal_hosts).to eq(
         [
           "test.localhost", # Discourse.base_url
           "awesomesauce.com",
@@ -32,90 +32,90 @@ describe FinalDestination::SSRFDetector do
 
     it "ignores invalid IP blocks" do
       SiteSetting.blocked_ip_blocks = "2001:abc:de::/48|notanip"
-      expect(subject.blocked_ip_blocks).to eq(%w[2001:abc:de::/48])
+      expect(described_class.blocked_ip_blocks).to eq(%w[2001:abc:de::/48])
     end
   end
 
   describe ".ip_allowed?" do
     it "returns false for blocked IPs" do
       SiteSetting.blocked_ip_blocks = "98.0.0.0/8|78.13.47.0/24|9001:82f3::/32"
-      expect(subject.ip_allowed?("98.23.19.111")).to eq(false)
-      expect(subject.ip_allowed?("9001:82f3:8873::3")).to eq(false)
+      expect(described_class.ip_allowed?("98.23.19.111")).to eq(false)
+      expect(described_class.ip_allowed?("9001:82f3:8873::3")).to eq(false)
     end
 
     %w[0.0.0.0 10.0.0.0 127.0.0.0 172.31.100.31 255.255.255.255 ::1 ::].each do |internal_ip|
       it "returns false for '#{internal_ip}'" do
-        expect(subject.ip_allowed?(internal_ip)).to eq(false)
+        expect(described_class.ip_allowed?(internal_ip)).to eq(false)
       end
     end
 
     it "returns false for private IPv4-mapped IPv6 addresses" do
-      expect(subject.ip_allowed?("::ffff:172.31.100.31")).to eq(false)
-      expect(subject.ip_allowed?("::ffff:0.0.0.0")).to eq(false)
+      expect(described_class.ip_allowed?("::ffff:172.31.100.31")).to eq(false)
+      expect(described_class.ip_allowed?("::ffff:0.0.0.0")).to eq(false)
     end
 
     it "returns true for public IPv4-mapped IPv6 addresses" do
-      expect(subject.ip_allowed?("::ffff:52.52.167.244")).to eq(true)
+      expect(described_class.ip_allowed?("::ffff:52.52.167.244")).to eq(true)
     end
   end
 
   describe ".host_bypasses_checks?" do
     it "returns true for URLs when allowed_internal_hosts allows the host" do
       SiteSetting.allowed_internal_hosts = "allowedhost1.com|allowedhost2.com"
-      expect(subject.host_bypasses_checks?("allowedhost1.com")).to eq(true)
-      expect(subject.host_bypasses_checks?("allowedhost2.com")).to eq(true)
+      expect(described_class.host_bypasses_checks?("allowedhost1.com")).to eq(true)
+      expect(described_class.host_bypasses_checks?("allowedhost2.com")).to eq(true)
     end
 
     it "returns false for other hosts" do
-      expect(subject.host_bypasses_checks?("otherhost.com")).to eq(false)
+      expect(described_class.host_bypasses_checks?("otherhost.com")).to eq(false)
     end
 
     it "returns true for the base uri" do
       SiteSetting.force_hostname = "final-test.example.com"
-      expect(subject.host_bypasses_checks?("final-test.example.com")).to eq(true)
+      expect(described_class.host_bypasses_checks?("final-test.example.com")).to eq(true)
     end
 
     it "returns true for the S3 CDN url" do
       SiteSetting.enable_s3_uploads = true
       SiteSetting.s3_cdn_url = "https://s3.example.com"
-      expect(subject.host_bypasses_checks?("s3.example.com")).to eq(true)
+      expect(described_class.host_bypasses_checks?("s3.example.com")).to eq(true)
     end
 
     it "returns true for the CDN url" do
       GlobalSetting.stubs(:cdn_url).returns("https://cdn.example.com/discourse")
-      expect(subject.host_bypasses_checks?("cdn.example.com")).to eq(true)
+      expect(described_class.host_bypasses_checks?("cdn.example.com")).to eq(true)
     end
   end
 
   describe ".lookup_and_filter_ips" do
     it "returns a fake response in tests" do
-      expect(subject.lookup_and_filter_ips("example.com")).to eq(["1.2.3.4"])
+      expect(described_class.lookup_and_filter_ips("example.com")).to eq(["1.2.3.4"])
     end
 
     it "correctly filters private and blocked IPs" do
       SiteSetting.blocked_ip_blocks = "9.10.11.12/24"
-      subject.stubs(:lookup_ips).returns(%w[127.0.0.1 5.6.7.8 9.10.11.12])
-      expect(subject.lookup_and_filter_ips("example.com")).to eq(["5.6.7.8"])
+      described_class.stubs(:lookup_ips).returns(%w[127.0.0.1 5.6.7.8 9.10.11.12])
+      expect(described_class.lookup_and_filter_ips("example.com")).to eq(["5.6.7.8"])
     end
 
     it "raises an exception if all IPs are blocked" do
-      subject.stubs(:lookup_ips).returns(["127.0.0.1"])
-      expect { subject.lookup_and_filter_ips("example.com") }.to raise_error(
-        subject::DisallowedIpError,
+      described_class.stubs(:lookup_ips).returns(["127.0.0.1"])
+      expect { described_class.lookup_and_filter_ips("example.com") }.to raise_error(
+        described_class::DisallowedIpError,
       )
     end
 
     it "raises an exception if lookup fails" do
-      subject.stubs(:lookup_ips).raises(SocketError)
-      expect { subject.lookup_and_filter_ips("example.com") }.to raise_error(
-        subject::LookupFailedError,
+      described_class.stubs(:lookup_ips).raises(SocketError)
+      expect { described_class.lookup_and_filter_ips("example.com") }.to raise_error(
+        described_class::LookupFailedError,
       )
     end
 
     it "bypasses filtering for allowlisted hosts" do
       SiteSetting.allowed_internal_hosts = "example.com"
-      subject.stubs(:lookup_ips).returns(["127.0.0.1"])
-      expect(subject.lookup_and_filter_ips("example.com")).to eq(["127.0.0.1"])
+      described_class.stubs(:lookup_ips).returns(["127.0.0.1"])
+      expect(described_class.lookup_and_filter_ips("example.com")).to eq(["127.0.0.1"])
     end
   end
 end
diff --git a/spec/lib/freedom_patches/translate_accelerator_spec.rb b/spec/lib/freedom_patches/translate_accelerator_spec.rb
index 16c0c9e1acf..c7a019ed554 100644
--- a/spec/lib/freedom_patches/translate_accelerator_spec.rb
+++ b/spec/lib/freedom_patches/translate_accelerator_spec.rb
@@ -26,7 +26,13 @@ RSpec.describe "translate accelerator" do
     orig = I18n.t("i_am_an_unknown_key99")
 
     expect(I18n.t("i_am_an_unknown_key99").object_id).to eq(orig.object_id)
-    expect(I18n.t("i_am_an_unknown_key99")).to eq("translation missing: en.i_am_an_unknown_key99")
+    expect(I18n.t("i_am_an_unknown_key99")).to eq("Translation missing: en.i_am_an_unknown_key99")
+  end
+
+  it "has the same 'translation missing' message as upstream" do
+    expect(I18n.t("this_key_does_not_exist")).to eq(
+      I18n.translate_no_cache("this_key_does_not_exist"),
+    )
   end
 
   it "returns the correct language" do
diff --git a/spec/lib/git_repo_spec.rb b/spec/lib/git_repo_spec.rb
new file mode 100644
index 00000000000..4620cf36422
--- /dev/null
+++ b/spec/lib/git_repo_spec.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+RSpec.describe GitRepo do
+  let(:git_repo) { GitRepo.new("/tmp", "discourse") }
+
+  it "returns the correct URL" do
+    Discourse::Utils.stubs(:execute_command).returns("https://github.com/username/my_plugin.git")
+    expect(git_repo.url).to eq("https://github.com/username/my_plugin")
+    Discourse::Utils.stubs(:execute_command).returns("git@github.com/username/my_plugin.git")
+    expect(git_repo.url).to eq("https://github.com/username/my_plugin")
+  end
+
+  it "returns the correct commit hash" do
+    Discourse::Utils.expects(:execute_command).returns("123456")
+    expect(git_repo.latest_local_commit).to eq("123456")
+  end
+end
diff --git a/spec/lib/group_lookup_spec.rb b/spec/lib/group_lookup_spec.rb
new file mode 100644
index 00000000000..d782ecb6f4d
--- /dev/null
+++ b/spec/lib/group_lookup_spec.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+RSpec.describe GroupLookup do
+  fab!(:group) { Fabricate(:group) }
+
+  describe "#[]" do
+    before { @group_lookup = GroupLookup.new([group.id, nil]) }
+
+    it "returns nil if group_id does not exists" do
+      expect(@group_lookup[0]).to eq(nil)
+    end
+
+    it "returns nil if group_id is nil" do
+      expect(@group_lookup[nil]).to eq(nil)
+    end
+
+    it "returns name if group_id exists" do
+      expect(@group_lookup[group.id]).to eq(group.name)
+    end
+  end
+end
diff --git a/spec/lib/guardian/post_guardian_spec.rb b/spec/lib/guardian/post_guardian_spec.rb
new file mode 100644
index 00000000000..da2e385fd9d
--- /dev/null
+++ b/spec/lib/guardian/post_guardian_spec.rb
@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+RSpec.describe PostGuardian do
+  fab!(:groupless_user) { Fabricate(:user) }
+  fab!(:user) { Fabricate(:user) }
+  fab!(:anon) { Fabricate(:anonymous) }
+  fab!(:admin) { Fabricate(:admin) }
+  fab!(:moderator) { Fabricate(:moderator) }
+  fab!(:group) { Fabricate(:group) }
+  fab!(:group_user) { Fabricate(:group_user, group: group, user: user) }
+  fab!(:category) { Fabricate(:category) }
+  fab!(:topic) { Fabricate(:topic, category: category) }
+  fab!(:hidden_post) { Fabricate(:post, topic: topic, hidden: true) }
+
+  describe "#can_see_hidden_post?" do
+    context "when the hidden_post_visible_groups contains everyone" do
+      before { SiteSetting.hidden_post_visible_groups = "#{Group::AUTO_GROUPS[:everyone]}" }
+
+      it "returns true for everyone" do
+        expect(Guardian.new(anon).can_see_hidden_post?(hidden_post)).to eq(true)
+        expect(Guardian.new(user).can_see_hidden_post?(hidden_post)).to eq(true)
+        expect(Guardian.new(admin).can_see_hidden_post?(hidden_post)).to eq(true)
+        expect(Guardian.new(moderator).can_see_hidden_post?(hidden_post)).to eq(true)
+      end
+    end
+
+    context "when the post is a created by the user" do
+      fab!(:hidden_post) { Fabricate(:post, topic: topic, hidden: true, user: user) }
+
+      before { SiteSetting.hidden_post_visible_groups = "" }
+
+      it "returns true for the author" do
+        SiteSetting.hidden_post_visible_groups = ""
+        expect(Guardian.new(user).can_see_hidden_post?(hidden_post)).to eq(true)
+      end
+    end
+
+    context "when the post is a created by another user" do
+      before { SiteSetting.hidden_post_visible_groups = "14|#{group.id}" }
+
+      it "returns true for staff users" do
+        expect(Guardian.new(admin).can_see_hidden_post?(hidden_post)).to eq(true)
+        expect(Guardian.new(moderator).can_see_hidden_post?(hidden_post)).to eq(true)
+      end
+
+      it "returns false for anonymous users" do
+        expect(Guardian.new(anon).can_see_hidden_post?(hidden_post)).to eq(false)
+      end
+
+      it "returns true if the user is in hidden_post_visible_groups" do
+        expect(Guardian.new(user).can_see_hidden_post?(hidden_post)).to eq(true)
+      end
+
+      it "returns false if the user is not in hidden_post_visible_groups" do
+        expect(Guardian.new(groupless_user).can_see_hidden_post?(hidden_post)).to eq(false)
+      end
+    end
+  end
+
+  describe "#is_in_edit_post_groups?" do
+    it "returns true if the user is in edit_all_post_groups" do
+      SiteSetting.edit_all_post_groups = group.id.to_s
+
+      expect(Guardian.new(user).is_in_edit_post_groups?).to eq(true)
+    end
+
+    it "returns false if the user is not in edit_all_post_groups" do
+      SiteSetting.edit_all_post_groups = Group::AUTO_GROUPS[:trust_level_4]
+
+      expect(Guardian.new(Fabricate(:trust_level_3)).is_in_edit_post_groups?).to eq(false)
+    end
+
+    it "returns false if the edit_all_post_groups is empty" do
+      SiteSetting.edit_all_post_groups = nil
+
+      expect(Guardian.new(user).is_in_edit_post_groups?).to eq(false)
+    end
+  end
+end
diff --git a/spec/lib/guardian/topic_guardian_spec.rb b/spec/lib/guardian/topic_guardian_spec.rb
index 94ff370848f..5b070b167c7 100644
--- a/spec/lib/guardian/topic_guardian_spec.rb
+++ b/spec/lib/guardian/topic_guardian_spec.rb
@@ -3,7 +3,8 @@
 RSpec.describe TopicGuardian do
   fab!(:user) { Fabricate(:user) }
   fab!(:admin) { Fabricate(:admin) }
-  fab!(:tl3_user) { Fabricate(:leader) }
+  fab!(:tl3_user) { Fabricate(:trust_level_3) }
+  fab!(:tl4_user) { Fabricate(:trust_level_4) }
   fab!(:moderator) { Fabricate(:moderator) }
   fab!(:category) { Fabricate(:category) }
   fab!(:group) { Fabricate(:group) }
@@ -74,6 +75,59 @@ RSpec.describe TopicGuardian do
     end
   end
 
+  describe "#can_see_deleted_topics?" do
+    it "returns true for staff" do
+      expect(Guardian.new(admin).can_see_deleted_topics?(topic.category)).to eq(true)
+    end
+
+    it "returns true for group moderator" do
+      SiteSetting.enable_category_group_moderation = true
+      expect(Guardian.new(user).can_see_deleted_topics?(topic.category)).to eq(false)
+      category.update!(reviewable_by_group_id: group.id)
+      group.add(user)
+      topic.update!(category: category)
+      expect(Guardian.new(user).can_see_deleted_topics?(topic.category)).to eq(true)
+    end
+
+    it "returns true when tl4 can delete posts and topics" do
+      expect(Guardian.new(tl4_user).can_see_deleted_topics?(topic.category)).to eq(false)
+      SiteSetting.tl4_delete_posts_and_topics = true
+      expect(Guardian.new(tl4_user).can_see_deleted_topics?(topic.category)).to eq(true)
+    end
+
+    it "returns false for anonymous user" do
+      SiteSetting.tl4_delete_posts_and_topics = true
+      expect(Guardian.new.can_see_deleted_topics?(topic.category)).to be_falsey
+    end
+  end
+
+  describe "#can_recover_topic?" do
+    fab!(:deleted_topic) { Fabricate(:topic, category: category, deleted_at: 1.day.ago) }
+    it "returns true for staff" do
+      expect(Guardian.new(admin).can_recover_topic?(Topic.with_deleted.last)).to eq(true)
+    end
+
+    it "returns true for group moderator" do
+      SiteSetting.enable_category_group_moderation = true
+      expect(Guardian.new(user).can_recover_topic?(Topic.with_deleted.last)).to eq(false)
+      category.update!(reviewable_by_group_id: group.id)
+      group.add(user)
+      topic.update!(category: category)
+      expect(Guardian.new(user).can_recover_topic?(Topic.with_deleted.last)).to eq(true)
+    end
+
+    it "returns true when tl4 can delete posts and topics" do
+      expect(Guardian.new(tl4_user).can_recover_topic?(Topic.with_deleted.last)).to eq(false)
+      SiteSetting.tl4_delete_posts_and_topics = true
+      expect(Guardian.new(tl4_user).can_recover_topic?(Topic.with_deleted.last)).to eq(true)
+    end
+
+    it "returns false for anonymous user" do
+      SiteSetting.tl4_delete_posts_and_topics = true
+      expect(Guardian.new.can_recover_topic?(Topic.with_deleted.last)).to eq(false)
+    end
+  end
+
   describe "#can_edit_topic?" do
     context "when the topic is a shared draft" do
       let(:tl2_user) { Fabricate(:user, trust_level: TrustLevel[2]) }
@@ -119,9 +173,29 @@ RSpec.describe TopicGuardian do
     end
   end
 
+  describe "#is_in_edit_topic_groups?" do
+    it "returns true if the user is in edit_all_topic_groups" do
+      group.add(user)
+      SiteSetting.edit_all_topic_groups = group.id.to_s
+
+      expect(Guardian.new(user).is_in_edit_topic_groups?).to eq(true)
+    end
+
+    it "returns false if the user is not in edit_all_topic_groups" do
+      SiteSetting.edit_all_topic_groups = Group::AUTO_GROUPS[:trust_level_4]
+
+      expect(Guardian.new(tl3_user).is_in_edit_topic_groups?).to eq(false)
+    end
+
+    it "returns false if the edit_all_topic_groups is empty" do
+      SiteSetting.edit_all_topic_groups = nil
+
+      expect(Guardian.new(user).is_in_edit_topic_groups?).to eq(false)
+    end
+  end
+
   describe "#can_review_topic?" do
     it "returns false for TL4 users" do
-      tl4_user = Fabricate(:user, trust_level: TrustLevel[4])
       topic = Fabricate(:topic)
 
       expect(Guardian.new(tl4_user).can_review_topic?(topic)).to eq(false)
@@ -134,8 +208,6 @@ RSpec.describe TopicGuardian do
     end
 
     it "returns true for TL4 users" do
-      tl4_user = Fabricate(:user, trust_level: TrustLevel[4])
-
       expect(Guardian.new(tl4_user).can_create_unlisted_topic?(topic)).to eq(true)
     end
 
@@ -144,6 +216,20 @@ RSpec.describe TopicGuardian do
     end
   end
 
+  describe "#can_see_unlisted_topics?" do
+    it "is allowed for staff users" do
+      expect(Guardian.new(moderator).can_see_unlisted_topics?).to eq(true)
+    end
+
+    it "is allowed for TL4 users" do
+      expect(Guardian.new(tl4_user).can_see_unlisted_topics?).to eq(true)
+    end
+
+    it "is not allowed for lower level users" do
+      expect(Guardian.new(tl3_user).can_see_unlisted_topics?).to eq(false)
+    end
+  end
+
   # The test cases here are intentionally kept brief because majority of the cases are already handled by
   # `TopicGuardianCanSeeConsistencyCheck` which we run to ensure that the implementation between `TopicGuardian#can_see_topic_ids`
   # and `TopicGuardian#can_see_topic?` is consistent.
diff --git a/spec/lib/guardian/user_guardian_spec.rb b/spec/lib/guardian/user_guardian_spec.rb
index b6b0ab0e804..5808d2a8f50 100644
--- a/spec/lib/guardian/user_guardian_spec.rb
+++ b/spec/lib/guardian/user_guardian_spec.rb
@@ -91,6 +91,12 @@ RSpec.describe UserGuardian do
     end
   end
 
+  describe "#can_see_user?" do
+    it "is always true" do
+      expect(Guardian.new.can_see_user?(anything)).to eq(true)
+    end
+  end
+
   describe "#can_see_profile?" do
     it "is false for no user" do
       expect(Guardian.new.can_see_profile?(nil)).to eq(false)
diff --git a/spec/lib/guardian_spec.rb b/spec/lib/guardian_spec.rb
index 4e5bf8d88f1..82d85785504 100644
--- a/spec/lib/guardian_spec.rb
+++ b/spec/lib/guardian_spec.rb
@@ -98,6 +98,38 @@ RSpec.describe Guardian do
     fab!(:user) { Fabricate(:user) }
     fab!(:post) { Fabricate(:post) }
 
+    describe "an anonymous user" do
+      before { SiteSetting.allow_anonymous_posting = true }
+
+      context "when allow_anonymous_likes is enabled" do
+        before { SiteSetting.allow_anonymous_likes = true }
+
+        it "returns true when liking" do
+          expect(Guardian.new(anonymous_user).post_can_act?(post, :like)).to be_truthy
+        end
+
+        it "cannot perform any other action" do
+          expect(Guardian.new(anonymous_user).post_can_act?(post, :flag)).to be_falsey
+          expect(Guardian.new(anonymous_user).post_can_act?(post, :bookmark)).to be_falsey
+          expect(Guardian.new(anonymous_user).post_can_act?(post, :notify_user)).to be_falsey
+        end
+      end
+
+      context "when allow_anonymous_likes is disabled" do
+        before { SiteSetting.allow_anonymous_likes = false }
+
+        it "returns false when liking" do
+          expect(Guardian.new(anonymous_user).post_can_act?(post, :like)).to be_falsey
+        end
+
+        it "cannot perform any other action" do
+          expect(Guardian.new(anonymous_user).post_can_act?(post, :flag)).to be_falsey
+          expect(Guardian.new(anonymous_user).post_can_act?(post, :bookmark)).to be_falsey
+          expect(Guardian.new(anonymous_user).post_can_act?(post, :notify_user)).to be_falsey
+        end
+      end
+    end
+
     it "returns false when the user is nil" do
       expect(Guardian.new(nil).post_can_act?(post, :like)).to be_falsey
     end
@@ -539,6 +571,10 @@ RSpec.describe Guardian do
   end
 
   describe "can_impersonate?" do
+    it "disallows impersonation when disabled globally" do
+      global_setting :allow_impersonation, false
+      expect(Guardian.new(admin).can_impersonate?(moderator)).to be_falsey
+    end
     it "allows impersonation correctly" do
       expect(Guardian.new(admin).can_impersonate?(nil)).to be_falsey
       expect(Guardian.new.can_impersonate?(user)).to be_falsey
@@ -809,7 +845,7 @@ RSpec.describe Guardian do
       expect(Guardian.new(user).can_see_deleted_post?(post)).to be_falsey
     end
 
-    it "returns false if not ther person who deleted it" do
+    it "returns false if not the person who deleted it" do
       post.update!(deleted_by: another_user)
       expect(Guardian.new(user).can_see_deleted_post?(post)).to be_falsey
     end
@@ -820,11 +856,52 @@ RSpec.describe Guardian do
     end
   end
 
+  describe "can_receive_post_notifications?" do
+    it "returns false with a nil object" do
+      expect(Guardian.new.can_receive_post_notifications?(nil)).to be_falsey
+      expect(Guardian.new(user).can_receive_post_notifications?(nil)).to be_falsey
+    end
+
+    it "does not allow anonymous to be notified" do
+      expect(Guardian.new.can_receive_post_notifications?(post)).to be_falsey
+    end
+
+    it "allows public categories" do
+      expect(Guardian.new(trust_level_0).can_receive_post_notifications?(post)).to be_truthy
+      expect(Guardian.new(admin).can_receive_post_notifications?(post)).to be_truthy
+    end
+
+    it "diallows secure categories with no access" do
+      secure_category = Fabricate(:category, read_restricted: true)
+      post.topic.update!(category_id: secure_category.id)
+
+      expect(Guardian.new(trust_level_0).can_receive_post_notifications?(post)).to be_falsey
+      expect(Guardian.new(admin).can_receive_post_notifications?(post)).to be_truthy
+
+      SiteSetting.suppress_secured_categories_from_admin = true
+
+      expect(Guardian.new(admin).can_receive_post_notifications?(post)).to be_falsey
+
+      secure_category.set_permissions(group => :write)
+      secure_category.save!
+
+      group.add(admin)
+      group.save!
+
+      expect(Guardian.new(admin).can_receive_post_notifications?(post)).to be_truthy
+    end
+  end
+
   describe "can_see?" do
     it "returns false with a nil object" do
       expect(Guardian.new.can_see?(nil)).to be_falsey
     end
 
+    it "returns false when no visibility method is defined for the object" do
+      unguarded_object = 42
+      expect(Guardian.new.can_see?(unguarded_object)).to be_falsey
+    end
+
     describe "a Category" do
       it "allows public categories" do
         public_category = Fabricate(:category, read_restricted: false)
@@ -1347,6 +1424,13 @@ RSpec.describe Guardian do
       expect(Guardian.new(user).can_recover_topic?(topic)).to be_falsey
     end
 
+    it "returns true when tl4 can delete posts and topics" do
+      PostDestroyer.new(moderator, topic.first_post).destroy
+      expect(Guardian.new(trust_level_4).can_recover_topic?(topic)).to be_falsey
+      SiteSetting.tl4_delete_posts_and_topics = true
+      expect(Guardian.new(trust_level_4).can_recover_topic?(topic.reload)).to be_truthy
+    end
+
     context "as a moderator" do
       describe "when post has been deleted" do
         it "should return the right value" do
@@ -1574,11 +1658,6 @@ RSpec.describe Guardian do
         expect(Guardian.new(trust_level_4).can_edit?(post)).to be_truthy
       end
 
-      it "returns false as a TL4 user if trusted_users_can_edit_others is false" do
-        SiteSetting.trusted_users_can_edit_others = false
-        expect(Guardian.new(trust_level_4).can_edit?(post)).to eq(false)
-      end
-
       it "returns false when trying to edit a topic with no trust" do
         SiteSetting.min_trust_to_edit_post = 2
         post.user.trust_level = 1
@@ -1824,11 +1903,6 @@ RSpec.describe Guardian do
           expect(Guardian.new(trust_level_3).can_edit?(topic)).to eq(true)
         end
 
-        it "is false at TL3, if `trusted_users_can_edit_others` is false" do
-          SiteSetting.trusted_users_can_edit_others = false
-          expect(Guardian.new(trust_level_3).can_edit?(topic)).to eq(false)
-        end
-
         it "returns false when the category is read only" do
           topic.category.set_permissions(everyone: :readonly)
           topic.category.save
@@ -1878,9 +1952,14 @@ RSpec.describe Guardian do
           expect(Guardian.new(trust_level_4).can_edit?(archived_topic)).to be_truthy
         end
 
-        it "is false at TL4, if `trusted_users_can_edit_others` is false" do
-          SiteSetting.trusted_users_can_edit_others = false
-          expect(Guardian.new(trust_level_4).can_edit?(archived_topic)).to eq(false)
+        it "returns true if the user is in edit_all_post_groups" do
+          SiteSetting.edit_all_post_groups = "14"
+          expect(Guardian.new(trust_level_4).can_edit?(archived_topic)).to eq(true)
+        end
+
+        it "returns false if the user is not in edit_all_post_groups" do
+          SiteSetting.edit_all_post_groups = "14"
+          expect(Guardian.new(trust_level_3).can_edit?(archived_topic)).to eq(false)
         end
 
         it "returns false at trust level 3" do
@@ -2195,6 +2274,12 @@ RSpec.describe Guardian do
         expect(Guardian.new(topic.user).can_delete?(topic)).to be_falsey
       end
 
+      it "returns true when tl4 can delete posts and topics" do
+        expect(Guardian.new(trust_level_4).can_delete?(topic)).to be_falsey
+        SiteSetting.tl4_delete_posts_and_topics = true
+        expect(Guardian.new(trust_level_4).can_delete?(topic)).to be_truthy
+      end
+
       it "returns false if topic was created > 24h ago" do
         topic.update!(posts_count: 1, created_at: 48.hours.ago)
         expect(Guardian.new(topic.user).can_delete?(topic)).to be_falsey
@@ -2241,6 +2326,12 @@ RSpec.describe Guardian do
         expect(Guardian.new(trust_level_4).can_delete?(post)).to be_falsey
       end
 
+      it "returns true when tl4 can delete posts and topics" do
+        expect(Guardian.new(trust_level_4).can_delete?(post)).to be_falsey
+        SiteSetting.tl4_delete_posts_and_topics = true
+        expect(Guardian.new(trust_level_4).can_delete?(post)).to be_truthy
+      end
+
       it "returns false when self deletions are disabled" do
         SiteSetting.max_post_deletions_per_day = 0
         expect(Guardian.new(user).can_delete?(post)).to be_falsey
@@ -2384,6 +2475,138 @@ RSpec.describe Guardian do
     end
   end
 
+  describe "#can_delete_post_action" do
+    before do
+      SiteSetting.allow_anonymous_posting = true
+      Guardian.any_instance.stubs(:anonymous?).returns(true)
+    end
+
+    context "with allow_anonymous_likes enabled" do
+      before { SiteSetting.allow_anonymous_likes = true }
+      describe "an anonymous user" do
+        let(:post_action) do
+          user.id = anonymous_user.id
+          post.id = 1
+
+          a =
+            PostAction.new(
+              user: anonymous_user,
+              post: post,
+              post_action_type_id: PostActionType.types[:like],
+            )
+          a.created_at = 1.minute.ago
+          a
+        end
+
+        let(:non_like_post_action) do
+          user.id = anonymous_user.id
+          post.id = 1
+
+          a =
+            PostAction.new(
+              user: anonymous_user,
+              post: post,
+              post_action_type_id: PostActionType.types[:reply],
+            )
+          a.created_at = 1.minute.ago
+          a
+        end
+
+        let(:other_users_post_action) do
+          user.id = user.id
+          post.id = 1
+
+          a =
+            PostAction.new(user: user, post: post, post_action_type_id: PostActionType.types[:like])
+          a.created_at = 1.minute.ago
+          a
+        end
+
+        it "returns true if the post belongs to the anonymous user" do
+          expect(Guardian.new(anonymous_user).can_delete_post_action?(post_action)).to be_truthy
+        end
+
+        it "return false if the post belongs to another user" do
+          expect(
+            Guardian.new(anonymous_user).can_delete_post_action?(other_users_post_action),
+          ).to be_falsey
+        end
+
+        it "returns false for any other action" do
+          expect(
+            Guardian.new(anonymous_user).can_delete_post_action?(non_like_post_action),
+          ).to be_falsey
+        end
+
+        it "returns false if the window has expired" do
+          post_action.created_at = 20.minutes.ago
+          SiteSetting.post_undo_action_window_mins = 10
+
+          expect(Guardian.new(anonymous_user).can_delete?(post_action)).to be_falsey
+        end
+      end
+    end
+
+    context "with allow_anonymous_likes disabled" do
+      before do
+        SiteSetting.allow_anonymous_likes = false
+        SiteSetting.allow_anonymous_posting = true
+      end
+      describe "an anonymous user" do
+        let(:post_action) do
+          user.id = anonymous_user.id
+          post.id = 1
+
+          a =
+            PostAction.new(
+              user: anonymous_user,
+              post: post,
+              post_action_type_id: PostActionType.types[:like],
+            )
+          a.created_at = 1.minute.ago
+          a
+        end
+
+        let(:non_like_post_action) do
+          user.id = anonymous_user.id
+          post.id = 1
+
+          a =
+            PostAction.new(
+              user: anonymous_user,
+              post: post,
+              post_action_type_id: PostActionType.types[:reply],
+            )
+          a.created_at = 1.minute.ago
+          a
+        end
+
+        it "any action returns false" do
+          expect(Guardian.new(anonymous_user).can_delete_post_action?(post_action)).to be_falsey
+          expect(
+            Guardian.new(anonymous_user).can_delete_post_action?(non_like_post_action),
+          ).to be_falsey
+        end
+      end
+    end
+  end
+
+  describe "#can_see_deleted_posts?" do
+    it "returns true if the user is an admin" do
+      expect(Guardian.new(admin).can_see_deleted_posts?(post.topic.category)).to be_truthy
+    end
+
+    it "returns true if the user is a moderator of category" do
+      expect(Guardian.new(moderator).can_see_deleted_posts?(post.topic.category)).to be_truthy
+    end
+
+    it "returns true when tl4 can delete posts and topics" do
+      expect(Guardian.new(trust_level_4).can_see_deleted_posts?(post)).to be_falsey
+      SiteSetting.tl4_delete_posts_and_topics = true
+      expect(Guardian.new(trust_level_4).can_see_deleted_posts?(post)).to be_truthy
+    end
+  end
+
   describe "#can_approve?" do
     it "wont allow a non-logged in user to approve" do
       expect(Guardian.new.can_approve?(user)).to be_falsey
@@ -2697,6 +2920,16 @@ RSpec.describe Guardian do
       expect(Guardian.new(user).can_anonymize_user?(user)).to be_falsey
     end
 
+    it "is false for an anonymized user" do
+      expect(Guardian.new(user).can_anonymize_user?(anonymous_user)).to be_falsey
+    end
+
+    it "is true for a user with no email" do
+      bad_state_user = Fabricate.build(:user, email: nil)
+      bad_state_user.skip_email_validation = true
+      expect(Guardian.new(moderator).can_anonymize_user?(bad_state_user)).to eq(true)
+    end
+
     it "is true for admin anonymizing a regular user" do
       expect(Guardian.new(admin).can_anonymize_user?(user)).to eq(true)
     end
@@ -3461,6 +3694,12 @@ RSpec.describe Guardian do
       context "when min_trust_to_create_tag is 3" do
         before { SiteSetting.min_trust_to_create_tag = 3 }
 
+        describe "#can_see_tag?" do
+          it "is always true" do
+            expect(Guardian.new.can_see_tag?(anything)).to be_truthy
+          end
+        end
+
         describe "can_create_tag" do
           it "returns false if trust level is too low" do
             expect(Guardian.new(trust_level_2).can_create_tag?).to be_falsey
@@ -4099,9 +4338,65 @@ RSpec.describe Guardian do
       expect(guardian.is_category_group_moderator?(plain_category)).to eq(false)
       expect(guardian.is_category_group_moderator?(plain_category)).to eq(false)
 
-      # edge case ... site setting disabled while guardian instansiated (can help with test cases)
+      # edge case ... site setting disabled while guardian instantiated (can help with test cases)
       SiteSetting.enable_category_group_moderation = false
       expect(guardian.is_category_group_moderator?(category)).to eq(false)
     end
   end
+
+  describe "#can_delete_reviewable_queued_post" do
+    context "when attempting to destroy a non personal reviewable" do
+      it "returns true for api requests from admins" do
+        api_key = Fabricate(:api_key).key
+        queued_post = Fabricate(:reviewable_queued_post, created_by: user)
+        opts = {
+          "HTTP_API_USERNAME" => admin.username,
+          "HTTP_API_KEY" => api_key,
+          "REQUEST_METHOD" => "DELETE",
+          "#{Auth::DefaultCurrentUserProvider::API_KEY_ENV}" => "foo",
+        }
+
+        env = create_request_env(path: "/review/#{queued_post.id}.json").merge(opts)
+        guardian = Guardian.new(admin, ActionDispatch::Request.new(env))
+        expect(guardian.can_delete_reviewable_queued_post?(queued_post)).to eq(true)
+      end
+
+      it "returns false for admin requests not via the API" do
+        queued_post = Fabricate(:reviewable_queued_post, created_by: user)
+        env =
+          create_request_env(path: "/review/#{queued_post.id}.json").merge(
+            { "REQUEST_METHOD" => "DELETE" },
+          )
+        guardian = Guardian.new(admin, ActionDispatch::Request.new(env))
+        expect(guardian.can_delete_reviewable_queued_post?(queued_post)).to eq(false)
+      end
+
+      it "returns false for api requests from tl4 users" do
+        api_key = Fabricate(:api_key).key
+        queued_post = Fabricate(:reviewable_queued_post, created_by: user)
+        opts = {
+          "HTTP_API_USERNAME" => trust_level_4.username,
+          "HTTP_API_KEY" => api_key,
+          "REQUEST_METHOD" => "DELETE",
+          "#{Auth::DefaultCurrentUserProvider::API_KEY_ENV}" => "foo",
+        }
+
+        env = create_request_env(path: "/review/#{queued_post.id}.json").merge(opts)
+        guardian = Guardian.new(trust_level_4, ActionDispatch::Request.new(env))
+        expect(guardian.can_delete_reviewable_queued_post?(queued_post)).to eq(false)
+      end
+    end
+
+    context "when attempting to destroy your own reviewable" do
+      it "returns true" do
+        queued_post = Fabricate(:reviewable_queued_post, created_by: user)
+        env =
+          create_request_env(path: "/review/#{queued_post.id}.json").merge(
+            { "REQUEST_METHOD" => "DELETE" },
+          )
+        guardian = Guardian.new(user, ActionDispatch::Request.new(env))
+        expect(guardian.can_delete_reviewable_queued_post?(queued_post)).to eq(true)
+      end
+    end
+  end
 end
diff --git a/spec/lib/i18n/discourse_i18n_spec.rb b/spec/lib/i18n/discourse_i18n_spec.rb
index cd990834e91..6f265aed516 100644
--- a/spec/lib/i18n/discourse_i18n_spec.rb
+++ b/spec/lib/i18n/discourse_i18n_spec.rb
@@ -86,14 +86,13 @@ RSpec.describe I18n::Backend::DiscourseI18n do
         items: {
           one: "%{count} Russian item",
           many: "%{count} Russian items are many",
-          other: "%{count} Russian items",
         },
       )
 
       expect(backend.translate(:ru, :items, count: 1)).to eq("1 Russian item")
       expect(backend.translate(:ru, :items, count: 2)).to eq("2 items")
       expect(backend.translate(:ru, :items, count: 5)).to eq("5 Russian items are many")
-      expect(backend.translate(:ru, :items, count: 10.2)).to eq("10.2 Russian items")
+      expect(backend.translate(:ru, :items, count: 10.2)).to eq("10.2 items")
 
       backend.store_translations(
         :ru,
@@ -104,7 +103,9 @@ RSpec.describe I18n::Backend::DiscourseI18n do
           other: "%{count} Russian items",
         },
       )
+
       expect(backend.translate(:ru, :items, count: 2)).to eq("2 Russian items are a few")
+      expect(backend.translate(:ru, :items, count: 10.2)).to eq("10.2 Russian items")
 
       backend.store_translations(:en, airplanes: { one: "%{count} airplane" })
       expect(backend.translate(:ru, :airplanes, count: 1)).to eq("1 airplane")
diff --git a/spec/lib/imap/sync_spec.rb b/spec/lib/imap/sync_spec.rb
index 991ab4c38f4..b993e157f3a 100644
--- a/spec/lib/imap/sync_spec.rb
+++ b/spec/lib/imap/sync_spec.rb
@@ -39,14 +39,14 @@ RSpec.describe Imap::Sync do
 
   describe "no previous sync" do
     let(:from) { "john@free.fr" }
-    let(:subject) { "Testing email post" }
+    let(:email_subject) { "Testing email post" }
     let(:message_id) { "#{SecureRandom.hex}@example.com" }
 
     let(:email) do
       EmailFabricator(
         from: from,
         to: group.email_username,
-        subject: subject,
+        subject: email_subject,
         message_id: message_id,
       )
     end
@@ -80,7 +80,7 @@ RSpec.describe Imap::Sync do
       expect(group.imap_last_uid).to eq(100)
 
       topic = Topic.last
-      expect(topic.title).to eq(subject)
+      expect(topic.title).to eq(email_subject)
       expect(topic.user.email).to eq(from)
       expect(topic.tags.pluck(:name)).to contain_exactly("seen", "important", "test-label")
 
@@ -110,7 +110,7 @@ RSpec.describe Imap::Sync do
         expect(group.imap_last_uid).to eq(100)
 
         topic = Topic.last
-        expect(topic.title).to eq(subject)
+        expect(topic.title).to eq(email_subject)
         expect(topic.user.email).to eq(from)
         expect(topic.tags).to eq([])
       end
@@ -161,7 +161,7 @@ RSpec.describe Imap::Sync do
   end
 
   describe "previous sync" do
-    let(:subject) { "Testing email post" }
+    let(:email_subject) { "Testing email post" }
 
     let(:first_from) { "john@free.fr" }
     let(:first_message_id) { SecureRandom.hex }
@@ -191,7 +191,7 @@ RSpec.describe Imap::Sync do
                   from: first_from,
                   to: group.email_username,
                   cc: second_from,
-                  subject: subject,
+                  subject: email_subject,
                   body: first_body,
                 ),
             },
@@ -203,7 +203,7 @@ RSpec.describe Imap::Sync do
             }.by(1).and change { IncomingEmail.count }.by(1)
 
       topic = Topic.last
-      expect(topic.title).to eq(subject)
+      expect(topic.title).to eq(email_subject)
       expect(GroupArchivedMessage.where(topic_id: topic.id).exists?).to eq(false)
 
       post = Post.where(post_type: Post.types[:regular]).last
@@ -233,7 +233,7 @@ RSpec.describe Imap::Sync do
                   in_reply_to: first_message_id,
                   from: second_from,
                   to: group.email_username,
-                  subject: "Re: #{subject}",
+                  subject: "Re: #{email_subject}",
                   body: second_body,
                 ),
             },
@@ -267,7 +267,7 @@ RSpec.describe Imap::Sync do
             }.and not_change { IncomingEmail.count }
 
       topic = Topic.last
-      expect(topic.title).to eq(subject)
+      expect(topic.title).to eq(email_subject)
       expect(GroupArchivedMessage.where(topic_id: topic.id).exists?).to eq(true)
 
       expect(Topic.last.posts.where(post_type: Post.types[:regular]).count).to eq(2)
@@ -294,7 +294,7 @@ RSpec.describe Imap::Sync do
                     from: first_from,
                     to: group.email_username,
                     cc: second_from,
-                    subject: subject,
+                    subject: email_subject,
                     body: first_body,
                   ),
               },
@@ -389,7 +389,7 @@ RSpec.describe Imap::Sync do
                     from: first_from,
                     to: group.email_username,
                     cc: second_from,
-                    subject: subject,
+                    subject: email_subject,
                     body: first_body,
                   ),
               },
@@ -446,7 +446,7 @@ RSpec.describe Imap::Sync do
                     from: first_from,
                     to: group.email_username,
                     cc: second_from,
-                    subject: subject,
+                    subject: email_subject,
                     body: first_body,
                   ),
               },
@@ -494,7 +494,7 @@ RSpec.describe Imap::Sync do
   end
 
   describe "invalidated previous sync" do
-    let(:subject) { "Testing email post" }
+    let(:email_subject) { "Testing email post" }
 
     let(:first_from) { "john@free.fr" }
     let(:first_message_id) { SecureRandom.hex }
@@ -526,7 +526,7 @@ RSpec.describe Imap::Sync do
                   from: first_from,
                   to: group.email_username,
                   cc: second_from,
-                  subject: subject,
+                  subject: email_subject,
                   body: first_body,
                 ),
             },
@@ -540,7 +540,7 @@ RSpec.describe Imap::Sync do
                   in_reply_to: first_message_id,
                   from: second_from,
                   to: group.email_username,
-                  subject: "Re: #{subject}",
+                  subject: "Re: #{email_subject}",
                   body: second_body,
                 ),
             },
@@ -571,7 +571,7 @@ RSpec.describe Imap::Sync do
                   from: first_from,
                   to: group.email_username,
                   cc: second_from,
-                  subject: subject,
+                  subject: email_subject,
                   body: first_body,
                 ),
             },
@@ -585,7 +585,7 @@ RSpec.describe Imap::Sync do
                   in_reply_to: first_message_id,
                   from: second_from,
                   to: group.email_username,
-                  subject: "Re: #{subject}",
+                  subject: "Re: #{email_subject}",
                   body: second_body,
                 ),
             },
diff --git a/spec/lib/message_id_service_spec.rb b/spec/lib/message_id_service_spec.rb
index dc8fa436fcc..d51750aa3e2 100644
--- a/spec/lib/message_id_service_spec.rb
+++ b/spec/lib/message_id_service_spec.rb
@@ -5,81 +5,16 @@ RSpec.describe Email::MessageIdService do
   fab!(:post) { Fabricate(:post, topic: topic) }
   fab!(:second_post) { Fabricate(:post, topic: topic) }
 
-  subject { described_class }
-
-  describe "#generate_for_post" do
-    it "generates for the post using the message_id on the post's incoming_email" do
-      Fabricate(:incoming_email, message_id: "test@test.localhost", post: post)
-      post.reload
-      expect(subject.generate_for_post(post, use_incoming_email_if_present: true)).to eq(
-        "<test@test.localhost>",
-      )
-    end
-
-    it "generates for the post without an incoming_email record" do
-      expect(subject.generate_for_post(post)).to match(subject.message_id_post_id_regexp)
-      expect(subject.generate_for_post(post, use_incoming_email_if_present: true)).to match(
-        subject.message_id_post_id_regexp,
-      )
-    end
-  end
-
-  describe "#generate_for_topic" do
-    it "generates for the topic using the message_id on the first post's incoming_email" do
-      Fabricate(
-        :incoming_email,
-        message_id: "test213428@somemailservice.com",
-        post: post,
-        created_via: IncomingEmail.created_via_types[:handle_mail],
-      )
-      post.reload
-      expect(subject.generate_for_topic(topic, use_incoming_email_if_present: true)).to eq(
-        "<test213428@somemailservice.com>",
-      )
-    end
-
-    it "does not use the first post's incoming email if it was created via group_smtp, only handle_mail" do
-      incoming =
-        Fabricate(
-          :incoming_email,
-          message_id: "test213428@somemailservice.com",
-          post: post,
-          created_via: IncomingEmail.created_via_types[:group_smtp],
-        )
-      post.reload
-      expect(subject.generate_for_topic(topic, use_incoming_email_if_present: true)).to match(
-        subject.message_id_topic_id_regexp,
-      )
-      incoming.update(created_via: IncomingEmail.created_via_types[:handle_mail])
-      expect(subject.generate_for_topic(topic, use_incoming_email_if_present: true)).to eq(
-        "<test213428@somemailservice.com>",
-      )
-    end
-
-    it "generates for the topic without an incoming_email record" do
-      expect(subject.generate_for_topic(topic)).to match(subject.message_id_topic_id_regexp)
-      expect(subject.generate_for_topic(topic, use_incoming_email_if_present: true)).to match(
-        subject.message_id_topic_id_regexp,
-      )
-    end
-
-    it "generates canonical for the topic" do
-      canonical_topic_id = subject.generate_for_topic(topic, canonical: true)
-      expect(canonical_topic_id).to match(subject.message_id_topic_id_regexp)
-      expect(canonical_topic_id).to eq("<topic/#{topic.id}@test.localhost>")
-    end
-  end
-
   describe "#generate_or_use_existing" do
     it "does not override a post's existing outbound_message_id" do
       post.update!(outbound_message_id: "blah@host.test")
-      result = subject.generate_or_use_existing(post.id)
+      result = described_class.generate_or_use_existing(post.id)
       expect(result).to eq(["<blah@host.test>"])
     end
 
     it "generates an outbound_message_id in the correct format if it's blank for the post" do
       post.update!(outbound_message_id: nil)
-      result = subject.generate_or_use_existing(post.id)
+      result = described_class.generate_or_use_existing(post.id)
       expect(result).to eq(["<discourse/post/#{post.id}@#{Email::MessageIdService.host}>"])
     end
 
@@ -102,7 +37,7 @@ RSpec.describe Email::MessageIdService do
         )
       post_bulk4 = Fabricate(:post, topic: topic, created_at: 3.days.ago, outbound_message_id: nil)
       result =
-        subject.generate_or_use_existing(
+        described_class.generate_or_use_existing(
           [post_bulk1.id, post_bulk2.id, post_bulk3.id, post_bulk4.id],
         )
       expect(result).to eq(
@@ -126,36 +61,43 @@ RSpec.describe Email::MessageIdService do
     end
 
     it "finds a post based only on a post-format message id" do
-      expect(subject.find_post_from_message_ids([post_format_message_id])).to eq(post)
+      expect(described_class.find_post_from_message_ids([post_format_message_id])).to eq(post)
     end
 
     it "finds a post based only on a topic-format message id" do
-      expect(subject.find_post_from_message_ids([topic_format_message_id])).to eq(post)
+      expect(described_class.find_post_from_message_ids([topic_format_message_id])).to eq(post)
     end
 
     it "finds a post based only on a discourse-format message id" do
-      expect(subject.find_post_from_message_ids([discourse_format_message_id])).to eq(post)
+      expect(described_class.find_post_from_message_ids([discourse_format_message_id])).to eq(post)
     end
 
     it "finds a post from the post's outbound_message_id" do
-      post.update!(outbound_message_id: subject.message_id_clean(discourse_format_message_id))
-      expect(subject.find_post_from_message_ids([discourse_format_message_id])).to eq(post)
+      post.update!(
+        outbound_message_id: described_class.message_id_clean(discourse_format_message_id),
+      )
+      expect(described_class.find_post_from_message_ids([discourse_format_message_id])).to eq(post)
     end
 
     it "finds a post from the email log" do
       email_log =
-        Fabricate(:email_log, message_id: subject.message_id_clean(default_format_message_id))
-      expect(subject.find_post_from_message_ids([default_format_message_id])).to eq(email_log.post)
+        Fabricate(
+          :email_log,
+          message_id: described_class.message_id_clean(default_format_message_id),
+        )
+      expect(described_class.find_post_from_message_ids([default_format_message_id])).to eq(
+        email_log.post,
+      )
     end
 
     it "finds a post from the incoming email log" do
       incoming_email =
         Fabricate(
           :incoming_email,
-          message_id: subject.message_id_clean(gmail_format_message_id),
+          message_id: described_class.message_id_clean(gmail_format_message_id),
           post: Fabricate(:post),
         )
-      expect(subject.find_post_from_message_ids([gmail_format_message_id])).to eq(
+      expect(described_class.find_post_from_message_ids([gmail_format_message_id])).to eq(
         incoming_email.post,
       )
     end
@@ -164,16 +106,16 @@ RSpec.describe Email::MessageIdService do
       incoming_email =
         Fabricate(
           :incoming_email,
-          message_id: subject.message_id_clean(post_format_message_id),
+          message_id: described_class.message_id_clean(post_format_message_id),
           post: Fabricate(:post, created_at: 10.days.ago),
         )
-      expect(subject.find_post_from_message_ids([post_format_message_id])).to eq(post)
+      expect(described_class.find_post_from_message_ids([post_format_message_id])).to eq(post)
     end
   end
 
   describe "#discourse_generated_message_id?" do
     def check_format(message_id)
-      subject.discourse_generated_message_id?(message_id)
+      described_class.discourse_generated_message_id?(message_id)
     end
 
     it "works correctly for the different possible formats" do
diff --git a/spec/lib/middleware/anonymous_cache_spec.rb b/spec/lib/middleware/anonymous_cache_spec.rb
index 6c858645273..33b52642daa 100644
--- a/spec/lib/middleware/anonymous_cache_spec.rb
+++ b/spec/lib/middleware/anonymous_cache_spec.rb
@@ -218,9 +218,9 @@ RSpec.describe Middleware::AnonymousCache do
   describe "#force_anonymous!" do
     before { RateLimiter.enable }
 
-    it "will revert to anonymous once we reach the limit" do
-      RateLimiter.clear_all!
+    use_redis_snapshotting
 
+    it "will revert to anonymous once we reach the limit" do
       is_anon = false
 
       app =
diff --git a/spec/lib/middleware/request_tracker_spec.rb b/spec/lib/middleware/request_tracker_spec.rb
index 4e852aa3b01..a2ee21de7df 100644
--- a/spec/lib/middleware/request_tracker_spec.rb
+++ b/spec/lib/middleware/request_tracker_spec.rb
@@ -21,6 +21,7 @@ RSpec.describe Middleware::RequestTracker do
   end
 
   after do
+    CachedCounting.reset
     ApplicationRequest.disable
     CachedCounting.disable
   end
@@ -253,7 +254,6 @@ RSpec.describe Middleware::RequestTracker do
     before do
       RateLimiter.enable
       RateLimiter.clear_all_global!
-      RateLimiter.clear_all!
 
       @orig_logger = Rails.logger
       Rails.logger = @fake_logger = FakeLogger.new
@@ -263,6 +263,8 @@ RSpec.describe Middleware::RequestTracker do
       freeze_time DateTime.parse("2021-01-01 01:00")
     end
 
+    use_redis_snapshotting
+
     after { Rails.logger = @orig_logger }
 
     let :middleware do
diff --git a/spec/lib/migration/safe_migrate_spec.rb b/spec/lib/migration/safe_migrate_spec.rb
index 06c15e985b3..3ed5413330a 100644
--- a/spec/lib/migration/safe_migrate_spec.rb
+++ b/spec/lib/migration/safe_migrate_spec.rb
@@ -70,6 +70,16 @@ RSpec.describe Migration::SafeMigrate do
     expect { User.first.username }.not_to raise_error
   end
 
+  it "allows dropping NOT NULL" do
+    Migration::SafeMigrate.enable!
+
+    path = File.expand_path "#{Rails.root}/spec/fixtures/db/migrate/drop_not_null"
+
+    output = capture_stdout { migrate_up(path) }
+
+    expect(output).to include("change_column_null(:users, :username, true)")
+  end
+
   it "supports being disabled" do
     Migration::SafeMigrate.enable!
     Migration::SafeMigrate.disable!
diff --git a/spec/lib/mobile_detection_spec.rb b/spec/lib/mobile_detection_spec.rb
index 853fe24b1be..584e20ebda6 100644
--- a/spec/lib/mobile_detection_spec.rb
+++ b/spec/lib/mobile_detection_spec.rb
@@ -10,6 +10,8 @@ RSpec.describe MobileDetection do
       Mozilla/5.0 (iPhone; CPU iPhone OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5376e Safari/8536.25
       Mozilla/5.0 (Linux; Android 8.0; Pixel 2 Build/OPD3.170816.012) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.121 Mobile Safari/537.36 (comp
       Mozilla/5.0 (Linux; Android 8.0; Pixel 2 Build/OPD3.170816.012) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.3626.121 Mobile Safari/537.36 (comp
+      Mozilla/5.0 (iPhone; CPU iPhone OS 14_8_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.1.2 Mobile/15E148 Safari/604.1
+      Mozilla/5.0 (iPhone; CPU iPhone OS 14_8 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/99.0.4844.59 Mobile/15E148 Safari/604.1
     STR
   end
 
@@ -17,7 +19,6 @@ RSpec.describe MobileDetection do
     (<<~STR).split("\n")
       Mozilla/5.0 (iPhone; CPU iPhone OS 15_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.3 Mobile/15E148 Safari/604.1
       Mozilla/5.0 (Linux; Android 6.0.1; Nexus 5X Build/MMB29P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.84 Mobile Safari/537.36 (compatible;
-      Mozilla/5.0 (iPhone; CPU iPhone OS 14_8_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.1.2 Mobile/15E148 Safari/604.1
       Mozilla/5.0 (Linux; Android 6.0.1; Nexus 5X Build/MMB29P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.60 Mobile Safari/537.36 (compatible
       Mozilla/5.0 (Android 12; Mobile; rv:98.0) Gecko/98.0 Firefox/98.0
       Mozilla/5.0 (iPad; CPU OS 15_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/99.0.4844.59 Mobile/15E148 Safari/604.1
@@ -26,7 +27,6 @@ RSpec.describe MobileDetection do
       Mozilla/5.0 (iPhone; CPU iPhone OS 15_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 DiscourseHub
       Mozilla/5.0 (Linux; Android 10) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.88 Mobile Safari/537.36
       Mozilla/5.0 (Android 12; Mobile; rv:99.0) Gecko/99.0 Firefox/99.0
-Mozilla/5.0 (iPhone; CPU iPhone OS 14_8 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/99.0.4844.59 Mobile/15E148 Safari/604.1
       Mozilla/5.0 (Linux; Android 12; Pixel 6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.88 Mobile Safari/537.36
       Mozilla/5.0 (Linux; Android 12; Pixel 4a) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.88 Mobile Safari/537.36
       Mozilla/5.0 (Linux; Android 10) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.60 Mobile Safari/537.36
@@ -36,11 +36,17 @@ Mozilla/5.0 (iPhone; CPU iPhone OS 14_8 like Mac OS X) AppleWebKit/605.1.15 (KHT
 
   it "detects modern browsers correctly" do
     modern_user_agents.each do |agent|
-      expect(MobileDetection.modern_mobile_device?(agent)).to eq(true)
+      expect(MobileDetection.modern_mobile_device?(agent)).to(
+        eq(true),
+        "Failed User Agent: '#{agent}'",
+      )
     end
 
     old_user_agents.each do |agent|
-      expect(MobileDetection.modern_mobile_device?(agent)).to eq(false)
+      expect(MobileDetection.modern_mobile_device?(agent)).to(
+        eq(false),
+        "Failed User Agent: '#{agent}'",
+      )
     end
   end
 end
diff --git a/spec/lib/onebox/engine/discourse_topic_onebox_spec.rb b/spec/lib/onebox/engine/discourse_topic_onebox_spec.rb
new file mode 100644
index 00000000000..7b8450c7e7e
--- /dev/null
+++ b/spec/lib/onebox/engine/discourse_topic_onebox_spec.rb
@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+RSpec.describe Onebox::Engine::DiscourseTopicOnebox do
+  subject(:onebox) { described_class.new(url) }
+
+  describe "#data" do
+    subject(:data) { onebox.data }
+
+    let(:url) do
+      "https://meta.discourse.org/t/congratulations-most-stars-in-2013-github-octoverse/12483"
+    end
+    let(:expected_data) do
+      {
+        article_published_time: "6 Feb 14",
+        article_published_time_title: "04:55AM - 06 February 2014",
+        article_tags: %w[how-to sso],
+        card: "summary",
+        categories: [{ name: "praise", color: "9EB83B" }],
+        data1: "1 mins 🕑",
+        data2: "9 ❤",
+        description:
+          "Congratulations Discourse for qualifying Repositories with the most stars on GitHub Octoverse.     And that too in just over an year, way to go! 💥",
+        domain: "Discourse Meta",
+        favicon:
+          "https://d11a6trkgmumsb.cloudfront.net/optimized/3X/b/3/b33be9538df3547fcf9d1a51a4637d77392ac6f9_2_32x32.png",
+        ignore_canonical: "true",
+        image:
+          "https://d11a6trkgmumsb.cloudfront.net/optimized/2X/d/d063b3b0807377d98695ee08042a9ba0a8c593bd_2_690x362.png",
+        label1: "Reading time",
+        label2: "Likes",
+        link:
+          "https://meta.discourse.org/t/congratulations-most-stars-in-2013-github-octoverse/12483",
+        published_time: "2014-02-06T04:55:19+00:00",
+        render_category_block?: true,
+        render_tags?: true,
+        site_name: "Discourse Meta",
+        title: "Congratulations, most stars in 2013 GitHub Octoverse!",
+        url:
+          "https://meta.discourse.org/t/congratulations-most-stars-in-2013-github-octoverse/12483",
+      }
+    end
+
+    before do
+      stub_request(:get, url).to_return(status: 200, body: onebox_response("discourse_topic"))
+    end
+
+    it "returns the expected data" do
+      expect(data).to include expected_data
+    end
+  end
+end
diff --git a/spec/lib/onebox/engine/google_maps_onebox_spec.rb b/spec/lib/onebox/engine/google_maps_onebox_spec.rb
index 498d4289f4c..fab528a6799 100644
--- a/spec/lib/onebox/engine/google_maps_onebox_spec.rb
+++ b/spec/lib/onebox/engine/google_maps_onebox_spec.rb
@@ -34,10 +34,10 @@ RSpec.describe Onebox::Engine::GoogleMapsOnebox do
     },
     unresolveable: {
       test:
-        "https://www.google.com/maps/place/Den+Abattoir/@51.2285173,4.4336702,17z/data=!4m7!1m4!3m3!1s0x47c3f7a5ac48e237:0x63d716018f584a33!2zUGnDqXRyYWlu!3b1!3m1!1s0x0000000000000000:0xfbfac0c41c32471a",
+        "https://www.google.com/maps/place/Den+Abattoir/@51.2285173,4.4336702,17.5z/data=!4m7!1m4!3m3!1s0x47c3f7a5ac48e237:0x63d716018f584a33!2zUGnDqXRyYWlu!3b1!3m1!1s0x0000000000000000:0xfbfac0c41c32471a",
       redirect: [
         302,
-        "https://www.google.com/maps/place/Den+Abattoir/@51.2285173,4.4336702,17z/data=!4m7!1m4!3m3!1s0x47c3f7a5ac48e237:0x63d716018f584a33!2zUGnDqXRyYWlu!3b1!3m1!1s0x0000000000000000:0xfbfac0c41c32471a?dg=dbrw&newdg=1",
+        "https://www.google.com/maps/place/Den+Abattoir/@51.2285173,4.4336702,17.5z/data=!4m7!1m4!3m3!1s0x47c3f7a5ac48e237:0x63d716018f584a33!2zUGnDqXRyYWlu!3b1!3m1!1s0x0000000000000000:0xfbfac0c41c32471a?dg=dbrw&newdg=1",
       ],
       expect:
         "https://maps.google.com/maps?ll=51.2285173,4.4336702&z=17&output=embed&dg=ntvb&q=Den+Abattoir&cid=18157036796216755994",
@@ -53,6 +53,16 @@ RSpec.describe Onebox::Engine::GoogleMapsOnebox do
   }
 
   # Register URL redirects
+  # Prevent sleep from wasting our time when we test with strange redirects
+  subject(:onebox) do
+    described_class
+      .send(:allocate)
+      .tap do |obj|
+        obj.stubs(:sleep)
+        obj.send(:initialize, link)
+      end
+  end
+
   before do
     URLS.values.each do |t|
       status, location = *t[:redirect]
@@ -62,27 +72,17 @@ RSpec.describe Onebox::Engine::GoogleMapsOnebox do
     end
   end
 
-  # Prevent sleep from wasting our time when we test with strange redirects
-  subject do
-    described_class
-      .send(:allocate)
-      .tap do |obj|
-        obj.stubs(:sleep)
-        obj.send(:initialize, link)
-      end
-  end
-
-  let(:data) { Onebox::Helpers.symbolize_keys(subject.send(:data)) }
+  let(:data) { Onebox::Helpers.symbolize_keys(onebox.send(:data)) }
   let(:link) { |example| URLS[example.metadata[:urltype] || :short][:test] }
 
   include_context "an engine", urltype: :short
 
   URLS.each do |kind, t|
     it "processes #{kind.to_s} url correctly", urltype: kind do
-      expect(subject.url).to eq t[:expect]
-      expect(subject.streetview?).to t[:streetview] ? be_truthy : be_falsey
-      expect(subject.to_html).to include("<iframe")
-      expect(subject.placeholder_html).to include("placeholder-icon map")
+      expect(onebox.url).to eq t[:expect]
+      expect(onebox.streetview?).to t[:streetview] ? be_truthy : be_falsey
+      expect(onebox.to_html).to include("<iframe")
+      expect(onebox.placeholder_html).to include("placeholder-icon map")
     end
   end
 end
diff --git a/spec/lib/onebox/engine/motoko_onebox_spec.rb b/spec/lib/onebox/engine/motoko_onebox_spec.rb
index ed58b81348f..1ffa368056a 100644
--- a/spec/lib/onebox/engine/motoko_onebox_spec.rb
+++ b/spec/lib/onebox/engine/motoko_onebox_spec.rb
@@ -3,17 +3,17 @@
 RSpec.describe Onebox::Engine::MotokoOnebox do
   before do
     body =
-      '{"version":"1.0","provider_name":"Embed Motoko","provider_url":"https://embed.smartcontracts.org","type":"rich","width":800,"height":500,"html":"<iframe src=\"https://embed.smartcontracts.org\" width=\"800\" height=\"500\" style=\"border:0\" />"}'
+      '{"version":"1.0","provider_name":"Embed Motoko","provider_url":"https://embed.motoko.org","type":"rich","width":800,"height":500,"html":"<iframe src=\"https://embed.motoko.org\" width=\"800\" height=\"500\" style=\"border:0\" />"}'
 
     stub_request(
       :get,
-      "https://embed.smartcontracts.org/api/onebox?url=https://embed.smartcontracts.org",
+      "https://embed.smartcontracts.org/services/onebox?url=https://embed.motoko.org",
     ).to_return(status: 200, body: body, headers: {})
   end
 
   it "returns the expected iframe markup" do
-    expect(Onebox.preview("https://embed.smartcontracts.org").to_s.chomp).to include(
-      '<iframe src="https://embed.smartcontracts.org" width="800" height="500" style="border:0"',
+    expect(Onebox.preview("https://embed.motoko.org").to_s.chomp).to include(
+      '<iframe src="https://embed.motoko.org" width="800" height="500" style="border:0"',
     )
   end
 end
diff --git a/spec/lib/onebox/engine/threads_status_onebox_spec.rb b/spec/lib/onebox/engine/threads_status_onebox_spec.rb
new file mode 100644
index 00000000000..87457a63770
--- /dev/null
+++ b/spec/lib/onebox/engine/threads_status_onebox_spec.rb
@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+RSpec.describe Onebox::Engine::ThreadsStatusOnebox do
+  context "with a thread with only text" do
+    let(:link) { "https://www.threads.net/t/CuVvRcttG57" }
+    let(:html) { described_class.new(link).to_html }
+
+    before do
+      stub_request(:get, link).to_return(
+        status: 200,
+        body: onebox_response("threadsstatus_without_image"),
+      )
+      stub_request(:get, "https://www.threads.net/@rafael_falco").to_return(
+        status: 200,
+        body: onebox_response("threadsstatus_without_image"),
+      )
+    end
+
+    it "includes threads content" do
+      expect(html).to include("trazer a lista de follows")
+    end
+
+    it "includes name" do
+      expect(html).to include("Rafael Silva")
+    end
+
+    it "includes username" do
+      expect(html).to include("@rafael_falco")
+    end
+
+    it "includes user avatar" do
+      expect(html).to include(
+        "https://scontent.cdninstagram.com/v/t51.2885-19/358195671_1485179698889636_5420020496346583344_n.jpg?stp=dst-jpg_s150x150&amp;_nc_ht=scontent.cdninstagram.com&amp;_nc_cat=108&amp;_nc_ohc=UbFgg6blcOUAX8XVrUj&amp;edm=APs17CUBAAAA&amp;ccb=7-5&amp;oh=00_AfDTSDE1W16bDEOUCofc_RLwOXbwfwL83BafmR_f4_ou6g&amp;oe=64AB848C&amp;_nc_sid=10d13b",
+      )
+    end
+
+    it "includes twitter link" do
+      expect(html).to include("https://www.threads.net/t/CuVvRcttG57")
+    end
+
+    it "includes twitter likes" do
+      expect(html).to include("3")
+    end
+
+    it "includes twitter retweets" do
+      expect(html).to include("1")
+    end
+  end
+
+  context "with a thread containing an image" do
+    let(:link) { "https://www.threads.net/t/CuWRRrQuql9" }
+    let(:html) { described_class.new(link).to_html }
+
+    before do
+      stub_request(:get, link).to_return(
+        status: 200,
+        body: onebox_response("threadsstatus_featured_image"),
+      )
+      stub_request(:get, "https://www.threads.net/@joyqiuu").to_return(
+        status: 200,
+        body: onebox_response("threadsstatus_profile"),
+      )
+    end
+
+    it "includes threads content" do
+      expect(html).to include("10M users later")
+    end
+
+    it "includes name" do
+      expect(html).to include("Joy Qiu")
+    end
+
+    it "includes username" do
+      expect(html).to include("@joyqiuu")
+    end
+
+    it "includes user avatar" do
+      expect(html).to include(
+        "https://scontent.cdninstagram.com/v/t51.2885-19/358167674_306426985144380_6235341132840289293_n.jpg?stp=dst-jpg_s640x640&amp;_nc_ht=scontent.cdninstagram.com&amp;_nc_cat=1&amp;_nc_ohc=KqFQdmSjeMsAX-OWNHA&amp;edm=APs17CUBAAAA&amp;ccb=7-5&amp;oh=00_AfDrfi6q0GGPALemTc0YzaE-Bnxm0GJ3QTrswCox095yRA&amp;oe=64AC85F1&amp;_nc_sid=10d13b",
+      )
+    end
+
+    it "includes twitter link" do
+      expect(html).to include("https://www.threads.net/t/CuWRRrQuql9")
+    end
+
+    it "includes twitter likes" do
+      expect(html).to include("5.8K")
+    end
+
+    it "includes twitter retweets" do
+      expect(html).to include("449")
+    end
+  end
+end
diff --git a/spec/lib/onebox/engine/twitch_clips_onebox_spec.rb b/spec/lib/onebox/engine/twitch_clips_onebox_spec.rb
index 0c799a2983b..a0c620013b2 100644
--- a/spec/lib/onebox/engine/twitch_clips_onebox_spec.rb
+++ b/spec/lib/onebox/engine/twitch_clips_onebox_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe Onebox::Engine::TwitchClipsOnebox do
-  let(:hostname) { "www.example.com" }
+  let(:hostname) { Discourse.current_hostname }
   let(:options) { { hostname: hostname } }
 
   it "has the iframe with the correct channel" do
diff --git a/spec/lib/onebox/engine/twitch_stream_onebox_spec.rb b/spec/lib/onebox/engine/twitch_stream_onebox_spec.rb
index f8485f5b271..0015fd7b535 100644
--- a/spec/lib/onebox/engine/twitch_stream_onebox_spec.rb
+++ b/spec/lib/onebox/engine/twitch_stream_onebox_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe Onebox::Engine::TwitchStreamOnebox do
-  let(:hostname) { "www.example.com" }
+  let(:hostname) { Discourse.current_hostname }
   let(:options) { { hostname: hostname } }
 
   it "has the iframe with the correct channel" do
diff --git a/spec/lib/onebox/engine/twitch_video_onebox_spec.rb b/spec/lib/onebox/engine/twitch_video_onebox_spec.rb
index fd6ddd41902..b9e3d168a0a 100644
--- a/spec/lib/onebox/engine/twitch_video_onebox_spec.rb
+++ b/spec/lib/onebox/engine/twitch_video_onebox_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe Onebox::Engine::TwitchVideoOnebox do
-  let(:hostname) { "www.example.com" }
+  let(:hostname) { Discourse.current_hostname }
   let(:options) { { hostname: hostname } }
 
   it "has the iframe with the correct channel" do
diff --git a/spec/lib/onebox/engine/twitter_status_onebox_spec.rb b/spec/lib/onebox/engine/twitter_status_onebox_spec.rb
index 59001ab2f78..6a4fcaea593 100644
--- a/spec/lib/onebox/engine/twitter_status_onebox_spec.rb
+++ b/spec/lib/onebox/engine/twitter_status_onebox_spec.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+include ActionView::Helpers::NumberHelper
 
 RSpec.describe Onebox::Engine::TwitterStatusOnebox do
   shared_examples_for "#to_html" do
@@ -42,37 +43,35 @@ RSpec.describe Onebox::Engine::TwitterStatusOnebox do
 
   shared_context "with standard tweet info" do
     before do
-      @link = "https://twitter.com/vyki_e/status/363116819147538433"
+      @link = "https://twitter.com/MKBHD/status/1625192182859632661"
       @onebox_fixture = "twitterstatus"
     end
 
-    let(:full_name) { "Vyki Englert" }
-    let(:screen_name) { "vyki_e" }
-    let(:avatar) { "732349210264133632/RTNgZLrm_400x400.jpg" }
-    let(:timestamp) { "6:59 PM - 1 Aug 2013" }
+    let(:full_name) { "Marques Brownlee" }
+    let(:screen_name) { "MKBHD" }
+    let(:avatar) { "https://pbs.twimg.com/profile_images/1468001914302390278/B_Xv_8gu_normal.jpg" }
+    let(:timestamp) { "5:56 PM - 13 Feb 2023" }
     let(:link) { @link }
-    let(:favorite_count) { "0" }
-    let(:retweets_count) { "0" }
+    let(:favorite_count) { "47K" }
+    let(:retweets_count) { "1.5K" }
   end
 
   shared_context "with quoted tweet info" do
     before do
-      @link = "https://twitter.com/metallica/status/1128068672289890305"
+      @link = "https://twitter.com/Metallica/status/1128068672289890305"
       @onebox_fixture = "twitterstatus_quoted"
 
-      stub_request(:get, @link.downcase).to_return(
-        status: 200,
-        body: onebox_response(@onebox_fixture),
-      )
+      stub_request(:head, @link)
+      stub_request(:get, @link).to_return(status: 200, body: onebox_response(@onebox_fixture))
     end
 
     let(:full_name) { "Metallica" }
     let(:screen_name) { "Metallica" }
-    let(:avatar) { "profile_images/766360293953802240/kt0hiSmv_400x400.jpg" }
+    let(:avatar) { "https://pbs.twimg.com/profile_images/1597280886809952256/gsJvGiqU_normal.jpg" }
     let(:timestamp) { "10:45 PM - 13 May 2019" }
     let(:link) { @link }
-    let(:favorite_count) { "1.7K" }
-    let(:retweets_count) { "201" }
+    let(:favorite_count) { "1.4K" }
+    let(:retweets_count) { "170" }
   end
 
   shared_context "with featured image info" do
@@ -88,11 +87,11 @@ RSpec.describe Onebox::Engine::TwitterStatusOnebox do
 
     let(:full_name) { "Jeff Atwood" }
     let(:screen_name) { "codinghorror" }
-    let(:avatar) { "" }
+    let(:avatar) { "https://pbs.twimg.com/profile_images/1517287320235298816/Qx-O6UCY_normal.jpg" }
     let(:timestamp) { "3:02 PM - 27 Jun 2021" }
     let(:link) { @link }
     let(:favorite_count) { "90" }
-    let(:retweets_count) { "0" }
+    let(:retweets_count) { "5" }
   end
 
   shared_examples "includes quoted tweet data" do
@@ -119,9 +118,9 @@ RSpec.describe Onebox::Engine::TwitterStatusOnebox do
     let(:link) { "https://twitter.com/discourse/status/1428031057186627589" }
     let(:html) { described_class.new(link).to_html }
 
-    it "does not match the url" do
+    it "does match the url" do
       onebox = Onebox::Matcher.new(link, { allowed_iframe_regexes: [/.*/] }).oneboxed
-      expect(onebox).not_to be(described_class)
+      expect(onebox).to be(described_class)
     end
 
     it "logs a warn message if rate limited" do
@@ -137,7 +136,7 @@ RSpec.describe Onebox::Engine::TwitterStatusOnebox do
 
       stub_request(
         :get,
-        "https://api.twitter.com/1.1/statuses/show.json?id=1428031057186627589&tweet_mode=extended",
+        "https://api.twitter.com/2/tweets/1428031057186627589?tweet.fields=id,author_id,text,created_at,entities,referenced_tweets,public_metrics&user.fields=id,name,username,profile_image_url&media.fields=type,height,width,variants,preview_image_url,url&expansions=attachments.media_keys,referenced_tweets.id.author_id",
       ).to_return(status: 429, body: "{}", headers: {})
 
       Rails.logger.expects(:warn).with(regexp_matches(/rate limit/)).at_least_once
@@ -154,7 +153,6 @@ RSpec.describe Onebox::Engine::TwitterStatusOnebox do
           status: api_response,
           prettify_tweet: tweet_content,
           twitter_credentials_missing?: false,
-          prettify_number: favorite_count,
         )
 
       @previous_options = Onebox.options.to_h
@@ -164,118 +162,47 @@ RSpec.describe Onebox::Engine::TwitterStatusOnebox do
     after { Onebox.options = @previous_options }
 
     context "with a standard tweet" do
-      let(:tweet_content) do
-        "I'm a sucker for pledges.  <a href='https://twitter.com/Peers' target='_blank'>@Peers</a> Pledge <a href='https://twitter.com/search?q=%23sharingeconomy' target='_blank'>#sharingeconomy</a> <a target='_blank' href='http://www.peers.org/action/peers-pledgea/'>peers.org/action/peers-p…</a>"
-      end
+      let(:tweet_content) { "I've never played Minecraft" }
 
       let(:api_response) do
         {
-          created_at: "Fri Aug 02 01:59:30 +0000 2013",
-          id: 363_116_819_147_538_400,
-          id_str: "363116819147538433",
-          text: "I'm a sucker for pledges. @Peers Pledge #sharingeconomy http://t.co/T4Sc47KAzh",
-          truncated: false,
-          entities: {
-            hashtags: [{ text: "sharingeconomy", indices: [41, 56] }],
-            symbols: [],
-            user_mentions: [
-              {
-                screen_name: "peers",
-                name: "Peers",
-                id: 1_428_357_889,
-                id_str: "1428357889",
-                indices: [27, 33],
-              },
-            ],
-            urls: [
-              {
-                url: "http://t.co/T4Sc47KAzh",
-                expanded_url: "http://www.peers.org/action/peers-pledgea/",
-                display_url: "peers.org/action/peers-p…",
-                indices: [57, 79],
-              },
-            ],
-          },
-          source:
-            "<a href=\"https://dev.twitter.com/docs/tfw\" rel=\"nofollow\">Twitter for Websites</a>",
-          in_reply_to_status_id: nil,
-          in_reply_to_status_id_str: nil,
-          in_reply_to_user_id: nil,
-          in_reply_to_user_id_str: nil,
-          in_reply_to_screen_name: nil,
-          user: {
-            id: 1_087_064_150,
-            id_str: "1087064150",
-            name: "Vyki Englert",
-            screen_name: "vyki_e",
-            location: "Los Angeles, CA",
-            description:
-              "Rides bikes, writes code, likes maps. @CompilerLA / @CityGrows / Brigade Captain @HackforLA",
-            url: "http://t.co/YCAP3asRG1",
-            entities: {
-              url: {
-                urls: [
-                  {
-                    url: "http://t.co/YCAP3asRG1",
-                    expanded_url: "http://www.compiler.la",
-                    display_url: "compiler.la",
-                    indices: [0, 22],
-                  },
-                ],
-              },
-              description: {
-                urls: [],
-              },
+          data: {
+            edit_history_tweet_ids: ["1625192182859632661"],
+            created_at: "2023-02-13T17:56:25.000Z",
+            author_id: "29873662",
+            public_metrics: {
+              retweet_count: 1460,
+              reply_count: 2734,
+              like_count: 46_756,
+              quote_count: 477,
+              bookmark_count: 168,
+              impression_count: 4_017_878,
             },
-            protected: false,
-            followers_count: 1128,
-            friends_count: 2244,
-            listed_count: 83,
-            created_at: "Sun Jan 13 19:53:00 +0000 2013",
-            favourites_count: 2928,
-            utc_offset: -25_200,
-            time_zone: "Pacific Time (US & Canada)",
-            geo_enabled: true,
-            verified: false,
-            statuses_count: 3295,
-            lang: "en",
-            contributors_enabled: false,
-            is_translator: false,
-            is_translation_enabled: false,
-            profile_background_color: "ACDED6",
-            profile_background_image_url: "http://abs.twimg.com/images/themes/theme18/bg.gif",
-            profile_background_image_url_https:
-              "https://abs.twimg.com/images/themes/theme18/bg.gif",
-            profile_background_tile: false,
-            profile_image_url:
-              "http://pbs.twimg.com/profile_images/732349210264133632/RTNgZLrm_normal.jpg",
-            profile_image_url_https:
-              "https://pbs.twimg.com/profile_images/732349210264133632/RTNgZLrm_normal.jpg",
-            profile_banner_url: "https://pbs.twimg.com/profile_banners/1087064150/1424315468",
-            profile_link_color: "4E99D1",
-            profile_sidebar_border_color: "EEEEEE",
-            profile_sidebar_fill_color: "F6F6F6",
-            profile_text_color: "333333",
-            profile_use_background_image: true,
-            has_extended_profile: false,
-            default_profile: false,
-            default_profile_image: false,
-            following: false,
-            follow_request_sent: false,
-            notifications: false,
+            text: "I've never played Minecraft",
+            entities: {
+              annotations: [
+                {
+                  start: 18,
+                  end: 26,
+                  probability: 0.9807,
+                  type: "Other",
+                  normalized_text: "Minecraft",
+                },
+              ],
+            },
+            id: "1625192182859632661",
+          },
+          includes: {
+            users: [
+              {
+                name: "Marques Brownlee",
+                id: "29873662",
+                profile_image_url:
+                  "https://pbs.twimg.com/profile_images/1468001914302390278/B_Xv_8gu_normal.jpg",
+                username: "MKBHD",
+              },
+            ],
           },
-          geo: nil,
-          coordinates: nil,
-          place: nil,
-          contributors: nil,
-          is_quote_status: false,
-          retweet_count: 0,
-          favorite_count: 0,
-          favorited: false,
-          retweeted: false,
-          possibly_sensitive: false,
-          possibly_sensitive_appealable: false,
-          lang: "en",
         }
       end
 
@@ -293,372 +220,167 @@ RSpec.describe Onebox::Engine::TwitterStatusOnebox do
 
       let(:api_response) do
         {
-          created_at: "Mon May 13 22:45:04 +0000 2019",
-          id: 1_128_068_672_289_890_305,
-          id_str: "1128068672289890305",
-          full_text:
-            "Thank you to everyone who came out for #MetInParis last night for helping us support @EMMAUSolidarite &amp; @PompiersParis. #AWMH #MetalicaGivesBack https://t.co/gLtZSdDFmN",
-          truncated: false,
-          display_text_range: [0, 148],
-          entities: {
-            hashtags: [
-              { text: "MetInParis", indices: [39, 50] },
-              { text: "AWMH", indices: [124, 129] },
-              { text: "MetalicaGivesBack", indices: [130, 148] },
-            ],
-            symbols: [],
-            user_mentions: [
-              {
-                screen_name: "EMMAUSolidarite",
-                name: "EMMAÜS Solidarité",
-                id: 2_912_493_406,
-                id_str: "2912493406",
-                indices: [85, 101],
-              },
-              {
-                screen_name: "PompiersParis",
-                name: "Pompiers de Paris",
-                id: 1_342_191_438,
-                id_str: "1342191438",
-                indices: [108, 122],
-              },
-            ],
-            urls: [
-              {
-                url: "https://t.co/gLtZSdDFmN",
-                expanded_url: "https://twitter.com/AWMHFoundation/status/1127646016931487744",
-                display_url: "twitter.com/AWMHFoundation…",
-                indices: [149, 172],
-              },
-            ],
-          },
-          source: "<a href=\"http://twitter.com\" rel=\"nofollow\">Twitter Web Client</a>",
-          in_reply_to_status_id: nil,
-          in_reply_to_status_id_str: nil,
-          in_reply_to_user_id: nil,
-          in_reply_to_user_id_str: nil,
-          in_reply_to_screen_name: nil,
-          user: {
-            id: 238_475_531,
-            id_str: "238475531",
-            name: "Metallica",
-            screen_name: "Metallica",
-            location: "San Francisco, CA",
-            description: "http://t.co/EAkqroM0OA | http://t.co/BEu6OVRhKG",
-            url: "http://t.co/kVxaQpmqSI",
-            entities: {
-              url: {
-                urls: [
-                  {
-                    url: "http://t.co/kVxaQpmqSI",
-                    expanded_url: "http://www.metallica.com",
-                    display_url: "metallica.com",
-                    indices: [0, 22],
-                  },
-                ],
-              },
-              description: {
-                urls: [
-                  {
-                    url: "http://t.co/EAkqroM0OA",
-                    expanded_url: "http://metallica.com",
-                    display_url: "metallica.com",
-                    indices: [0, 22],
-                  },
-                  {
-                    url: "http://t.co/BEu6OVRhKG",
-                    expanded_url: "http://livemetallica.com",
-                    display_url: "livemetallica.com",
-                    indices: [25, 47],
-                  },
-                ],
-              },
-            },
-            protected: false,
-            followers_count: 5_760_661,
-            friends_count: 31,
-            listed_count: 12_062,
-            created_at: "Sat Jan 15 07:34:59 +0000 2011",
-            favourites_count: 567,
-            utc_offset: nil,
-            time_zone: nil,
-            geo_enabled: true,
-            verified: true,
-            statuses_count: 3764,
-            lang: nil,
-            contributors_enabled: false,
-            is_translator: false,
-            is_translation_enabled: false,
-            profile_background_color: "000000",
-            profile_background_image_url: "http://abs.twimg.com/images/themes/theme9/bg.gif",
-            profile_background_image_url_https: "https://abs.twimg.com/images/themes/theme9/bg.gif",
-            profile_background_tile: false,
-            profile_image_url:
-              "http://pbs.twimg.com/profile_images/766360293953802240/kt0hiSmv_normal.jpg",
-            profile_image_url_https:
-              "https://pbs.twimg.com/profile_images/766360293953802240/kt0hiSmv_normal.jpg",
-            profile_banner_url: "https://pbs.twimg.com/profile_banners/238475531/1479538295",
-            profile_link_color: "2FC2EF",
-            profile_sidebar_border_color: "000000",
-            profile_sidebar_fill_color: "252429",
-            profile_text_color: "666666",
-            profile_use_background_image: false,
-            has_extended_profile: false,
-            default_profile: false,
-            default_profile_image: false,
-            following: false,
-            follow_request_sent: false,
-            notifications: false,
-            translator_type: "regular",
-          },
-          geo: nil,
-          coordinates: nil,
-          place: nil,
-          contributors: nil,
-          is_quote_status: true,
-          quoted_status_id: 1_127_646_016_931_487_744,
-          quoted_status_id_str: "1127646016931487744",
-          quoted_status_permalink: {
-            url: "https://t.co/gLtZSdDFmN",
-            expanded: "https://twitter.com/AWMHFoundation/status/1127646016931487744",
-            display: "twitter.com/AWMHFoundation…",
-          },
-          quoted_status: {
-            created_at: "Sun May 12 18:45:35 +0000 2019",
-            id: 1_127_646_016_931_487_744,
-            id_str: "1127646016931487744",
-            full_text:
-              "If you bought a ticket for tonight’s @Metallica show at Stade de France, you have helped contribute to @EMMAUSolidarite &amp; @PompiersParis. #MetallicaGivesBack #AWMH #MetInParis https://t.co/wlUtDQbQEK",
-            truncated: false,
-            display_text_range: [0, 179],
+          data: {
+            text:
+              "Thank you to everyone who came out for #MetInParis last night for helping us support @EMMAUSolidarite &amp; @PompiersParis. #AWMH #MetalicaGivesBack https://t.co/gLtZSdDFmN",
+            edit_history_tweet_ids: ["1128068672289890305"],
             entities: {
+              mentions: [
+                { start: 85, end: 101, username: "EMMAUSolidarite", id: "2912493406" },
+                { start: 108, end: 122, username: "PompiersParis", id: "1342191438" },
+              ],
+              urls: [
+                {
+                  start: 149,
+                  end: 172,
+                  url: "https://t.co/gLtZSdDFmN",
+                  expanded_url: "https://twitter.com/AWMHFoundation/status/1127646016931487744",
+                  display_url: "twitter.com/AWMHFoundation…",
+                },
+              ],
               hashtags: [
-                { text: "MetallicaGivesBack", indices: [142, 161] },
-                { text: "AWMH", indices: [162, 167] },
-                { text: "MetInParis", indices: [168, 179] },
+                { start: 39, end: 50, tag: "MetInParis" },
+                { start: 124, end: 129, tag: "AWMH" },
+                { start: 130, end: 148, tag: "MetalicaGivesBack" },
               ],
-              symbols: [],
-              user_mentions: [
+              annotations: [
                 {
-                  screen_name: "Metallica",
-                  name: "Metallica",
-                  id: 238_475_531,
-                  id_str: "238475531",
-                  indices: [37, 47],
+                  start: 40,
+                  end: 49,
+                  probability: 0.6012,
+                  type: "Other",
+                  normalized_text: "MetInParis",
                 },
                 {
-                  screen_name: "EMMAUSolidarite",
-                  name: "EMMAÜS Solidarité",
-                  id: 2_912_493_406,
-                  id_str: "2912493406",
-                  indices: [103, 119],
+                  start: 125,
+                  end: 128,
+                  probability: 0.5884,
+                  type: "Other",
+                  normalized_text: "AWMH",
                 },
                 {
-                  screen_name: "PompiersParis",
-                  name: "Pompiers de Paris",
-                  id: 1_342_191_438,
-                  id_str: "1342191438",
-                  indices: [126, 140],
-                },
-              ],
-              urls: [],
-              media: [
-                {
-                  id: 1_127_645_176_183_250_944,
-                  id_str: "1127645176183250944",
-                  indices: [180, 203],
-                  media_url: "http://pbs.twimg.com/media/D6YzUC8V4AApDdF.jpg",
-                  media_url_https: "https://pbs.twimg.com/media/D6YzUC8V4AApDdF.jpg",
-                  url: "https://t.co/wlUtDQbQEK",
-                  display_url: "pic.twitter.com/wlUtDQbQEK",
-                  expanded_url:
-                    "https://twitter.com/AWMHFoundation/status/1127646016931487744/photo/1",
-                  type: "photo",
-                  sizes: {
-                    large: {
-                      w: 2048,
-                      h: 1498,
-                      resize: "fit",
-                    },
-                    thumb: {
-                      w: 150,
-                      h: 150,
-                      resize: "crop",
-                    },
-                    medium: {
-                      w: 1200,
-                      h: 877,
-                      resize: "fit",
-                    },
-                    small: {
-                      w: 680,
-                      h: 497,
-                      resize: "fit",
-                    },
-                  },
+                  start: 131,
+                  end: 147,
+                  probability: 0.6366,
+                  type: "Other",
+                  normalized_text: "MetalicaGivesBack",
                 },
               ],
             },
-            extended_entities: {
-              media: [
-                {
-                  id: 1_127_645_176_183_250_944,
-                  id_str: "1127645176183250944",
-                  indices: [180, 203],
-                  media_url: "http://pbs.twimg.com/media/D6YzUC8V4AApDdF.jpg",
-                  media_url_https: "https://pbs.twimg.com/media/D6YzUC8V4AApDdF.jpg",
-                  url: "https://t.co/wlUtDQbQEK",
-                  display_url: "pic.twitter.com/wlUtDQbQEK",
-                  expanded_url:
-                    "https://twitter.com/AWMHFoundation/status/1127646016931487744/photo/1",
-                  type: "photo",
-                  sizes: {
-                    large: {
-                      w: 2048,
-                      h: 1498,
-                      resize: "fit",
-                    },
-                    thumb: {
-                      w: 150,
-                      h: 150,
-                      resize: "crop",
-                    },
-                    medium: {
-                      w: 1200,
-                      h: 877,
-                      resize: "fit",
-                    },
-                    small: {
-                      w: 680,
-                      h: 497,
-                      resize: "fit",
-                    },
-                  },
-                },
-                {
-                  id: 1_127_645_195_384_774_657,
-                  id_str: "1127645195384774657",
-                  indices: [180, 203],
-                  media_url: "http://pbs.twimg.com/media/D6YzVKeV4AEPpSQ.jpg",
-                  media_url_https: "https://pbs.twimg.com/media/D6YzVKeV4AEPpSQ.jpg",
-                  url: "https://t.co/wlUtDQbQEK",
-                  display_url: "pic.twitter.com/wlUtDQbQEK",
-                  expanded_url:
-                    "https://twitter.com/AWMHFoundation/status/1127646016931487744/photo/1",
-                  type: "photo",
-                  sizes: {
-                    thumb: {
-                      w: 150,
-                      h: 150,
-                      resize: "crop",
-                    },
-                    medium: {
-                      w: 1200,
-                      h: 922,
-                      resize: "fit",
-                    },
-                    small: {
-                      w: 680,
-                      h: 522,
-                      resize: "fit",
-                    },
-                    large: {
-                      w: 2048,
-                      h: 1574,
-                      resize: "fit",
-                    },
-                  },
-                },
-              ],
+            id: "1128068672289890305",
+            referenced_tweets: [{ type: "quoted", id: "1127646016931487744" }],
+            created_at: "2019-05-13T22:45:04.000Z",
+            public_metrics: {
+              retweet_count: 171,
+              reply_count: 21,
+              like_count: 1424,
+              quote_count: 0,
+              bookmark_count: 2,
+              impression_count: 0,
             },
-            source: "<a href=\"http://twitter.com\" rel=\"nofollow\">Twitter Web Client</a>",
-            in_reply_to_status_id: nil,
-            in_reply_to_status_id_str: nil,
-            in_reply_to_user_id: nil,
-            in_reply_to_user_id_str: nil,
-            in_reply_to_screen_name: nil,
-            user: {
-              id: 886_959_980_254_871_552,
-              id_str: "886959980254871552",
-              name: "All Within My Hands Foundation",
-              screen_name: "AWMHFoundation",
-              location: "",
-              description: "",
-              url: "https://t.co/KgwIPrVVhg",
-              entities: {
-                url: {
+            author_id: "238475531",
+          },
+          includes: {
+            users: [
+              {
+                profile_image_url:
+                  "https://pbs.twimg.com/profile_images/1597280886809952256/gsJvGiqU_normal.jpg",
+                name: "Metallica",
+                id: "238475531",
+                username: "Metallica",
+              },
+              {
+                profile_image_url:
+                  "https://pbs.twimg.com/profile_images/935181032185241600/D8FoOIRJ_normal.jpg",
+                name: "All Within My Hands Foundation",
+                id: "886959980254871552",
+                username: "AWMHFoundation",
+              },
+            ],
+            tweets: [
+              {
+                text:
+                  "If you bought a ticket for tonight’s @Metallica show at Stade de France, you have helped contribute to @EMMAUSolidarite &amp; @PompiersParis. #MetallicaGivesBack #AWMH #MetInParis https://t.co/wlUtDQbQEK",
+                edit_history_tweet_ids: ["1127646016931487744"],
+                entities: {
+                  mentions: [
+                    { start: 37, end: 47, username: "Metallica", id: "238475531" },
+                    { start: 103, end: 119, username: "EMMAUSolidarite", id: "2912493406" },
+                    { start: 126, end: 140, username: "PompiersParis", id: "1342191438" },
+                  ],
                   urls: [
                     {
-                      url: "https://t.co/KgwIPrVVhg",
-                      expanded_url: "http://allwithinmyhands.org",
-                      display_url: "allwithinmyhands.org",
-                      indices: [0, 23],
+                      start: 180,
+                      end: 203,
+                      url: "https://t.co/wlUtDQbQEK",
+                      expanded_url:
+                        "https://twitter.com/AWMHFoundation/status/1127646016931487744/photo/1",
+                      display_url: "pic.twitter.com/wlUtDQbQEK",
+                      media_key: "3_1127645176183250944",
+                    },
+                    {
+                      start: 180,
+                      end: 203,
+                      url: "https://t.co/wlUtDQbQEK",
+                      expanded_url:
+                        "https://twitter.com/AWMHFoundation/status/1127646016931487744/photo/1",
+                      display_url: "pic.twitter.com/wlUtDQbQEK",
+                      media_key: "3_1127645195384774657",
+                    },
+                  ],
+                  hashtags: [
+                    { start: 142, end: 161, tag: "MetallicaGivesBack" },
+                    { start: 162, end: 167, tag: "AWMH" },
+                    { start: 168, end: 179, tag: "MetInParis" },
+                  ],
+                  annotations: [
+                    {
+                      start: 56,
+                      end: 70,
+                      probability: 0.7845,
+                      type: "Place",
+                      normalized_text: "Stade de France",
+                    },
+                    {
+                      start: 143,
+                      end: 160,
+                      probability: 0.5569,
+                      type: "Organization",
+                      normalized_text: "MetallicaGivesBack",
+                    },
+                    {
+                      start: 163,
+                      end: 166,
+                      probability: 0.4496,
+                      type: "Other",
+                      normalized_text: "AWMH",
+                    },
+                    {
+                      start: 169,
+                      end: 178,
+                      probability: 0.3784,
+                      type: "Place",
+                      normalized_text: "MetInParis",
                     },
                   ],
                 },
-                description: {
-                  urls: [],
+                id: "1127646016931487744",
+                created_at: "2019-05-12T18:45:35.000Z",
+                attachments: {
+                  media_keys: %w[3_1127645176183250944 3_1127645195384774657],
                 },
+                public_metrics: {
+                  retweet_count: 34,
+                  reply_count: 5,
+                  like_count: 241,
+                  quote_count: 9,
+                  bookmark_count: 0,
+                  impression_count: 0,
+                },
+                author_id: "886959980254871552",
               },
-              protected: false,
-              followers_count: 5962,
-              friends_count: 6,
-              listed_count: 15,
-              created_at: "Mon Jul 17 14:45:13 +0000 2017",
-              favourites_count: 30,
-              utc_offset: nil,
-              time_zone: nil,
-              geo_enabled: true,
-              verified: false,
-              statuses_count: 241,
-              lang: nil,
-              contributors_enabled: false,
-              is_translator: false,
-              is_translation_enabled: false,
-              profile_background_color: "000000",
-              profile_background_image_url: "http://abs.twimg.com/images/themes/theme1/bg.png",
-              profile_background_image_url_https:
-                "https://abs.twimg.com/images/themes/theme1/bg.png",
-              profile_background_tile: false,
-              profile_image_url:
-                "http://pbs.twimg.com/profile_images/935181032185241600/D8FoOIRJ_normal.jpg",
-              profile_image_url_https:
-                "https://pbs.twimg.com/profile_images/935181032185241600/D8FoOIRJ_normal.jpg",
-              profile_banner_url:
-                "https://pbs.twimg.com/profile_banners/886959980254871552/1511799663",
-              profile_link_color: "000000",
-              profile_sidebar_border_color: "000000",
-              profile_sidebar_fill_color: "000000",
-              profile_text_color: "000000",
-              profile_use_background_image: false,
-              has_extended_profile: false,
-              default_profile: false,
-              default_profile_image: false,
-              following: false,
-              follow_request_sent: false,
-              notifications: false,
-              translator_type: "none",
-            },
-            geo: nil,
-            coordinates: nil,
-            place: nil,
-            contributors: nil,
-            is_quote_status: false,
-            retweet_count: 46,
-            favorite_count: 275,
-            favorited: false,
-            retweeted: false,
-            possibly_sensitive: false,
-            possibly_sensitive_appealable: false,
-            lang: "en",
+            ],
           },
-          retweet_count: 201,
-          favorite_count: 1664,
-          favorited: false,
-          retweeted: false,
-          possibly_sensitive: false,
-          possibly_sensitive_appealable: false,
-          lang: "en",
         }
       end
 
diff --git a/spec/lib/onebox/engine/wikimedia_onebox_spec.rb b/spec/lib/onebox/engine/wikimedia_onebox_spec.rb
index 78b1516aa0f..da177db3ed3 100644
--- a/spec/lib/onebox/engine/wikimedia_onebox_spec.rb
+++ b/spec/lib/onebox/engine/wikimedia_onebox_spec.rb
@@ -19,7 +19,7 @@ RSpec.describe Onebox::Engine::WikimediaOnebox do
 
   it "has the image" do
     expect(html).to include(
-      "https://upload.wikimedia.org/wikipedia/commons/a/af/Stones_members_montage2.jpg",
+      "https://upload.wikimedia.org/wikipedia/commons/thumb/a/af/Stones_members_montage2.jpg/500px-Stones_members_montage2.jpg",
     )
   end
 end
diff --git a/spec/lib/onebox/open_graph_spec.rb b/spec/lib/onebox/open_graph_spec.rb
index efbbb90bb47..71de9468e8f 100644
--- a/spec/lib/onebox/open_graph_spec.rb
+++ b/spec/lib/onebox/open_graph_spec.rb
@@ -24,4 +24,32 @@ RSpec.describe Onebox::OpenGraph do
     og = described_class.new(doc)
     expect(og.image).to eq("http://test.com/test&apos;ing.mp3")
   end
+
+  describe "Collections" do
+    subject(:graph) { described_class.new(doc) }
+
+    let(:doc) { Nokogiri.HTML(<<-HTML) }
+      <html>
+        <title>test</title>
+        <meta property="og:article:tag" content="&lt;b&gt;tag1&lt;/b&gt;" />
+        <meta property="og:article:tag" content="tag2" />
+        <meta property="og:article:section" content="category1" />
+        <meta property="og:article:section" content="category2" />
+        <meta property="og:article:section:color" content="ff0000" />
+        <meta property="og:article:section:color" content="0000ff" />
+      </html>
+      HTML
+
+    it "handles multiple article:tag tags" do
+      expect(graph.article_tags).to eq %w[tag1 tag2]
+    end
+
+    it "handles multiple article:section tags" do
+      expect(graph.article_sections).to eq %w[category1 category2]
+    end
+
+    it "handles multiple article:section:color tags" do
+      expect(graph.article_section_colors).to eq %w[ff0000 0000ff]
+    end
+  end
 end
diff --git a/spec/lib/oneboxer_spec.rb b/spec/lib/oneboxer_spec.rb
index 7e23517425a..a3a68f5e414 100644
--- a/spec/lib/oneboxer_spec.rb
+++ b/spec/lib/oneboxer_spec.rb
@@ -94,7 +94,7 @@ RSpec.describe Oneboxer do
 
       onebox = preview(public_reply.url, user, public_category, public_topic)
       expect(onebox).not_to include(public_topic.title)
-      expect(onebox).to include(replier.avatar_template_url.sub("{size}", "40"))
+      expect(onebox).to include(replier.avatar_template_url.sub("{size}", "48"))
 
       expect(preview(public_hidden.url, user, public_category)).to match_html(
         link(public_hidden.url),
@@ -178,14 +178,43 @@ RSpec.describe Oneboxer do
       expect(preview("/u/#{user.username}")).to include("Thunderland")
     end
 
-    it "includes hashtag HTML and icons" do
+    it "includes hashtag HTML" do
       SiteSetting.enable_experimental_hashtag_autocomplete = true
       category = Fabricate(:category, slug: "random")
-      Fabricate(:tag, name: "bug")
+      tag = Fabricate(:tag, name: "bug")
       public_post = Fabricate(:post, raw: "This post has some hashtags, #random and #bug")
-      expect(preview(public_post.url).chomp).to include(<<~HTML.chomp)
-        <a class="hashtag-cooked" href="#{category.url}" data-type="category" data-slug="random"><svg class="fa d-icon d-icon-folder svg-icon svg-node"><use href="#folder"></use></svg>#{category.name}</a> and <a class="hashtag-cooked" href="/tag/bug" data-type="tag" data-slug="bug"><svg class="fa d-icon d-icon-tag svg-icon svg-node"><use href="#tag"></use></svg>bug</a>
-      HTML
+      preview =
+        Nokogiri::HTML5
+          .fragment(preview(public_post.url).chomp)
+          .css("blockquote")
+          .inner_html
+          .chomp
+          .strip
+      expect(preview).to include("This post has some hashtags")
+      expect(preview).to have_tag(
+        "a",
+        with: {
+          class: "hashtag-cooked",
+          href: category.url,
+          "data-type": "category",
+          "data-slug": category.slug,
+          "data-id": category.id,
+        },
+      ) do
+        with_tag("span", with: { class: "hashtag-icon-placeholder" })
+      end
+      expect(preview).to have_tag(
+        "a",
+        with: {
+          class: "hashtag-cooked",
+          href: tag.url,
+          "data-type": "tag",
+          "data-slug": tag.name,
+          "data-id": tag.id,
+        },
+      ) do
+        with_tag("span", with: { class: "hashtag-icon-placeholder" })
+      end
     end
   end
 
@@ -748,7 +777,7 @@ RSpec.describe Oneboxer do
 
       stub_request(
         :get,
-        "https://api.twitter.com/1.1/statuses/show.json?id=1428031057186627589&tweet_mode=extended",
+        "https://api.twitter.com/2/tweets/1428031057186627589?tweet.fields=id,author_id,text,created_at,entities,referenced_tweets,public_metrics&user.fields=id,name,username,profile_image_url&media.fields=type,height,width,variants,preview_image_url,url&expansions=attachments.media_keys,referenced_tweets.id.author_id",
       ).to_return(status: 429, body: "{}", headers: {})
 
       stub_request(:post, "https://api.twitter.com/oauth2/token").to_return(
@@ -788,7 +817,8 @@ RSpec.describe Oneboxer do
     it "does keeps SVGs valid" do
       raw = "Onebox\n\nhttps://example.com"
       cooked = PrettyText.cook(raw)
-      cooked = Oneboxer.apply(Loofah.fragment(cooked)) { "<div><svg><path></path></svg></div>" }
+      cooked =
+        Oneboxer.apply(Loofah.html5_fragment(cooked)) { "<div><svg><path></path></svg></div>" }
       doc = Nokogiri::HTML5.fragment(cooked.to_html)
       expect(doc.to_html).to match_html <<~HTML
         <p>Onebox</p>
diff --git a/spec/lib/password_hasher_spec.rb b/spec/lib/password_hasher_spec.rb
new file mode 100644
index 00000000000..c31d054c012
--- /dev/null
+++ b/spec/lib/password_hasher_spec.rb
@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+describe PasswordHasher do
+  def hash(password: "mypass", salt: "mysalt", algorithm:)
+    PasswordHasher.hash_password(password: password, salt: salt, algorithm: algorithm)
+  end
+
+  describe "pbkdf2-sha256 algorithm" do
+    it "can hash correctly" do
+      result = hash(password: "mypass", salt: "mysalt", algorithm: "$pbkdf2-sha256$i=3,l=32$")
+      expect(result).to eq("8d4f9a685ff73eef7b06e07ab5889784775290a0a9cebb6eb4492a695c93a51e")
+    end
+
+    it "supports different iteration numbers" do
+      iter_3 = hash(algorithm: "$pbkdf2-sha256$i=3,l=32$")
+      iter_4 = hash(algorithm: "$pbkdf2-sha256$i=4,l=32$")
+
+      expect(iter_3).not_to eq(iter_4)
+    end
+
+    it "raises an error for non-standard length" do
+      expect { hash(algorithm: "$pbkdf2-sha256$i=3,l=20$") }.to raise_error(
+        PasswordHasher::UnsupportedAlgorithmError,
+      )
+    end
+
+    it "raises an error for missing length param" do
+      expect { hash(algorithm: "$pbkdf2-sha256$i=3$") }.to raise_error(
+        PasswordHasher::UnsupportedAlgorithmError,
+      )
+    end
+
+    it "raises an error for missing iteration param" do
+      expect { hash(algorithm: "$pbkdf2-sha256$l=32$") }.to raise_error(
+        PasswordHasher::UnsupportedAlgorithmError,
+      )
+    end
+
+    it "raises an error for missing salt" do
+      expect { hash(salt: nil, algorithm: "$pbkdf2-sha256$l=32,i=3$") }.to raise_error(
+        ArgumentError,
+      )
+    end
+
+    it "raises an error for missing password" do
+      expect { hash(password: nil, algorithm: "$pbkdf2-sha256$l=32,i=3$") }.to raise_error(
+        ArgumentError,
+      )
+    end
+  end
+
+  it "raises error for invalid algorithm" do
+    expect { hash(algorithm: "$pbkdf2-sha256$l=32$somethinginvalid") }.to raise_error(
+      PasswordHasher::InvalidAlgorithmError,
+    )
+  end
+
+  it "raises error for unknown algorithm" do
+    expect { hash(algorithm: "$pbkdf2-invalid$l=32$") }.to raise_error(
+      PasswordHasher::UnsupportedAlgorithmError,
+    )
+    expect { hash(algorithm: "$unknown$l=32$") }.to raise_error(
+      PasswordHasher::UnsupportedAlgorithmError,
+    )
+  end
+end
diff --git a/spec/lib/plugin/instance_spec.rb b/spec/lib/plugin/instance_spec.rb
index cb9314464ad..cc07ac964ab 100644
--- a/spec/lib/plugin/instance_spec.rb
+++ b/spec/lib/plugin/instance_spec.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 RSpec.describe Plugin::Instance do
+  subject(:plugin_instance) { described_class.new }
+
   after { DiscoursePluginRegistry.reset! }
 
   describe "find_all" do
@@ -11,6 +13,13 @@ RSpec.describe Plugin::Instance do
 
       expect(plugin.name).to eq("plugin-name")
       expect(plugin.path).to eq("#{Rails.root}/spec/fixtures/plugins/my_plugin/plugin.rb")
+
+      git_repo = plugin.git_repo
+      plugin.git_repo.stubs(:latest_local_commit).returns("123456")
+      plugin.git_repo.stubs(:url).returns("http://github.com/discourse/discourse-plugin")
+
+      expect(plugin.commit_hash).to eq("123456")
+      expect(plugin.commit_url).to eq("http://github.com/discourse/discourse-plugin/commit/123456")
     end
 
     it "does not blow up on missing directory" do
@@ -75,6 +84,14 @@ RSpec.describe Plugin::Instance do
 
         # Serializer
         @plugin.add_to_serializer(:trout, :scales) { 1024 }
+        @plugin.add_to_serializer(:trout, :unconditional_scales, respect_plugin_enabled: false) do
+          2048
+        end
+        @plugin.add_to_serializer(
+          :trout,
+          :conditional_scales,
+          include_condition: -> { !!object.data&.[](:has_scales) },
+        ) { 4096 }
 
         @serializer = TroutSerializer.new(@trout)
         @child_serializer = TroutJuniorSerializer.new(@trout)
@@ -100,6 +117,7 @@ RSpec.describe Plugin::Instance do
         expect(@hello_count).to eq(1)
         expect(@serializer.scales).to eq(1024)
         expect(@serializer.include_scales?).to eq(false)
+        expect(@serializer.include_unconditional_scales?).to eq(true)
         expect(@serializer.name).to eq("a trout")
 
         expect(@child_serializer.scales).to eq(1024)
@@ -107,6 +125,25 @@ RSpec.describe Plugin::Instance do
         expect(@child_serializer.name).to eq("a trout jr")
       end
 
+      it "can control the include_* implementation" do
+        @plugin.enabled = true
+
+        expect(@serializer.scales).to eq(1024)
+        expect(@serializer.include_scales?).to eq(true)
+
+        expect(@serializer.unconditional_scales).to eq(2048)
+        expect(@serializer.include_unconditional_scales?).to eq(true)
+
+        expect(@serializer.include_conditional_scales?).to eq(false)
+        @trout.data = { has_scales: true }
+        expect(@serializer.include_conditional_scales?).to eq(true)
+
+        @plugin.enabled = false
+        expect(@serializer.include_scales?).to eq(false)
+        expect(@serializer.include_unconditional_scales?).to eq(true)
+        expect(@serializer.include_conditional_scales?).to eq(false)
+      end
+
       it "only returns HTML if enabled" do
         ctx = Trout.new
         ctx.data = "hello"
@@ -215,8 +252,7 @@ RSpec.describe Plugin::Instance do
     end
 
     it "can activate plugins correctly" do
-      plugin = Plugin::Instance.new
-      plugin.path = "#{Rails.root}/spec/fixtures/plugins/my_plugin/plugin.rb"
+      plugin = plugin_from_fixtures("my_plugin")
       junk_file = "#{plugin.auto_generated_path}/junk"
 
       plugin.ensure_directory(junk_file)
@@ -232,8 +268,7 @@ RSpec.describe Plugin::Instance do
     end
 
     it "registers auth providers correctly" do
-      plugin = Plugin::Instance.new
-      plugin.path = "#{Rails.root}/spec/fixtures/plugins/my_plugin/plugin.rb"
+      plugin = plugin_from_fixtures("my_plugin")
       plugin.activate!
       expect(DiscoursePluginRegistry.auth_providers.count).to eq(0)
       plugin.notify_before_auth
@@ -243,8 +278,7 @@ RSpec.describe Plugin::Instance do
     end
 
     it "finds all the custom assets" do
-      plugin = Plugin::Instance.new
-      plugin.path = "#{Rails.root}/spec/fixtures/plugins/my_plugin/plugin.rb"
+      plugin = plugin_from_fixtures("my_plugin")
 
       plugin.register_asset("test.css")
       plugin.register_asset("test2.scss")
@@ -369,8 +403,8 @@ RSpec.describe Plugin::Instance do
   end
 
   describe "locales" do
-    let(:plugin_path) { "#{Rails.root}/spec/fixtures/plugins/custom_locales" }
-    let!(:plugin) { Plugin::Instance.new(nil, "#{plugin_path}/plugin.rb") }
+    let!(:plugin) { plugin_from_fixtures("custom_locales") }
+    let(:plugin_path) { File.dirname(plugin.path) }
     let(:plural) do
       {
         keys: %i[one few other],
@@ -555,6 +589,14 @@ RSpec.describe Plugin::Instance do
       expect(custom_emoji.url).to eq("/baz/bar.png")
       expect(custom_emoji.group).to eq("baz")
     end
+
+    it "sanitizes emojis' names" do
+      Plugin::Instance.new.register_emoji("?", "/baz/bar.png", "baz")
+      Plugin::Instance.new.register_emoji("?test?!!", "/foo/bar.png", "baz")
+
+      expect(Emoji.custom.first.name).to eq("_")
+      expect(Emoji.custom.second.name).to eq("_test_")
+    end
   end
 
   describe "#replace_flags" do
@@ -569,7 +611,7 @@ RSpec.describe Plugin::Instance do
       highest_flag_id = ReviewableScore.types.values.max
       flag_name = :new_flag
 
-      subject.replace_flags(settings: original_flags) do |settings, next_flag_id|
+      plugin_instance.replace_flags(settings: original_flags) do |settings, next_flag_id|
         settings.add(next_flag_id, flag_name)
       end
 
@@ -581,7 +623,7 @@ RSpec.describe Plugin::Instance do
       highest_flag_id = ReviewableScore.types.values.max
       new_score_type = :new_score_type
 
-      subject.replace_flags(
+      plugin_instance.replace_flags(
         settings: original_flags,
         score_type_names: [new_score_type],
       ) { |settings, next_flag_id| settings.add(next_flag_id, :new_flag) }
@@ -597,7 +639,7 @@ RSpec.describe Plugin::Instance do
 
     it "adds a custom api key scope" do
       actions = %w[admin/groups#create]
-      subject.add_api_key_scope(:groups, create: { actions: actions })
+      plugin_instance.add_api_key_scope(:groups, create: { actions: actions })
 
       expect(ApiKeyScope.scope_mappings.dig(:groups, :create, :actions)).to contain_exactly(
         *actions,
@@ -769,7 +811,7 @@ RSpec.describe Plugin::Instance do
   describe "#register_about_stat_group" do
     let(:plugin) { Plugin::Instance.new }
 
-    after { About.clear_plugin_stat_groups }
+    after { DiscoursePluginRegistry.reset! }
 
     it "registers an about stat group correctly" do
       stats = { :last_day => 1, "7_days" => 10, "30_days" => 100, :count => 1000 }
@@ -789,6 +831,13 @@ RSpec.describe Plugin::Instance do
       plugin.register_about_stat_group("some_group") { stats }
       expect(About.displayed_plugin_stat_groups).to eq([])
     end
+
+    it "does not allow duplicate named stat groups" do
+      stats = { :last_day => 1, "7_days" => 10, "30_days" => 100, :count => 1000 }
+      plugin.register_about_stat_group("some_group") { stats }
+      plugin.register_about_stat_group("some_group") { stats }
+      expect(DiscoursePluginRegistry.about_stat_groups.count).to eq(1)
+    end
   end
 
   describe "#register_user_destroyer_on_content_deletion_callback" do
@@ -820,4 +869,17 @@ RSpec.describe Plugin::Instance do
       expect(callback_called).to eq(false)
     end
   end
+
+  describe "#register_modifier" do
+    let(:plugin) { Plugin::Instance.new }
+
+    after { DiscoursePluginRegistry.clear_modifiers! }
+
+    it "allows modifier registration" do
+      plugin.register_modifier(:magic_sum_modifier) { |a, b| a + b }
+
+      sum = DiscoursePluginRegistry.apply_modifier(:magic_sum_modifier, 1, 2)
+      expect(sum).to eq(3)
+    end
+  end
 end
diff --git a/spec/lib/post_action_creator_spec.rb b/spec/lib/post_action_creator_spec.rb
index 4304febc949..0f3c2da4749 100644
--- a/spec/lib/post_action_creator_spec.rb
+++ b/spec/lib/post_action_creator_spec.rb
@@ -9,10 +9,9 @@ RSpec.describe PostActionCreator do
   before { Group.refresh_automatic_groups! }
 
   describe "rate limits" do
-    before do
-      RateLimiter.clear_all!
-      RateLimiter.enable
-    end
+    before { RateLimiter.enable }
+
+    use_redis_snapshotting
 
     it "limits redo/undo" do
       PostActionCreator.like(user, post)
@@ -191,7 +190,7 @@ RSpec.describe PostActionCreator do
       end
 
       describe "When the post was already reviewed by staff" do
-        before { reviewable.perform(admin, :ignore) }
+        before { reviewable.perform(admin, :ignore_and_do_nothing) }
 
         it "fails because the post was recently reviewed" do
           freeze_time 10.seconds.from_now
diff --git a/spec/lib/post_destroyer_spec.rb b/spec/lib/post_destroyer_spec.rb
index 25fa3496dd8..2733138add0 100644
--- a/spec/lib/post_destroyer_spec.rb
+++ b/spec/lib/post_destroyer_spec.rb
@@ -94,7 +94,7 @@ RSpec.describe PostDestroyer do
       expect(reply1.deleted_at).to eq(nil)
 
       # ignore the flag, we should be able to delete the stub
-      reviewable.perform(Discourse.system_user, :ignore)
+      reviewable.perform(Discourse.system_user, :ignore_and_do_nothing)
       PostDestroyer.destroy_stubs
 
       reply1.reload
@@ -735,20 +735,20 @@ RSpec.describe PostDestroyer do
     end
 
     context "as an admin" do
-      subject { PostDestroyer.new(admin, post).destroy }
+      subject(:destroyer) { PostDestroyer.new(admin, post).destroy }
 
       it "deletes the post" do
-        subject
+        destroyer
         expect(post.deleted_at).to be_present
         expect(post.deleted_by).to eq(admin)
       end
 
       it "creates a new user history entry" do
-        expect { subject }.to change { UserHistory.count }.by(1)
+        expect { destroyer }.to change { UserHistory.count }.by(1)
       end
 
       it "triggers a extensibility event" do
-        events = DiscourseEvent.track_events { subject }
+        events = DiscourseEvent.track_events { destroyer }
 
         expect(events[0][:event_name]).to eq(:post_destroyed)
         expect(events[0][:params].first).to eq(post)
@@ -768,34 +768,34 @@ RSpec.describe PostDestroyer do
     end
 
     context "as a moderator" do
-      subject { PostDestroyer.new(moderator, reply).destroy }
+      subject(:destroyer) { PostDestroyer.new(moderator, reply).destroy }
 
       it "deletes the reply" do
-        subject
+        destroyer
         expect(reply.deleted_at).to be_present
         expect(reply.deleted_by).to eq(moderator)
       end
 
       it "doesn't decrement post_count again" do
-        expect { subject }.to_not change { author.user_stat.post_count }
+        expect { destroyer }.to_not change { author.user_stat.post_count }
       end
     end
 
     context "as an admin" do
-      subject { PostDestroyer.new(admin, reply).destroy }
+      subject(:destroyer) { PostDestroyer.new(admin, reply).destroy }
 
       it "deletes the post" do
-        subject
+        destroyer
         expect(reply.deleted_at).to be_present
         expect(reply.deleted_by).to eq(admin)
       end
 
       it "doesn't decrement post_count again" do
-        expect { subject }.to_not change { author.user_stat.post_count }
+        expect { destroyer }.to_not change { author.user_stat.post_count }
       end
 
       it "creates a new user history entry" do
-        expect { subject }.to change { UserHistory.count }.by(1)
+        expect { destroyer }.to change { UserHistory.count }.by(1)
       end
     end
   end
@@ -938,7 +938,7 @@ RSpec.describe PostDestroyer do
 
     it "should not send the flags_agreed_and_post_deleted message if flags were ignored" do
       expect(ReviewableFlaggedPost.pending.count).to eq(1)
-      flag_result.reviewable.perform(moderator, :ignore)
+      flag_result.reviewable.perform(moderator, :ignore_and_do_nothing)
       second_post.reload
       expect(ReviewableFlaggedPost.pending.count).to eq(0)
 
@@ -1116,13 +1116,32 @@ RSpec.describe PostDestroyer do
       expect(post_revision.reload.persisted?).to be true
     end
 
-    it "always destroy the post when the force_destroy option is passed" do
+    it "destroys the post when force_destroy is true for soft deleted topics" do
+      post = Fabricate(:post)
+      topic = post.topic
+
+      PostDestroyer.new(moderator, post).destroy
+      post = Post.with_deleted.find_by(id: post.id)
+      expect(post).not_to eq(nil)
+
+      PostDestroyer.new(moderator, post, force_destroy: true).destroy
+      post = Post.with_deleted.find_by(id: post.id)
+      expect(post).to eq(nil)
+
+      topic = Topic.with_deleted.find_by(id: topic.id)
+      expect(topic).to eq(nil)
+    end
+
+    it "destroys the post when force_destroy is true for regular posts" do
       PostDestroyer.new(moderator, reply, force_destroy: true).destroy
       expect { reply.reload }.to raise_error(ActiveRecord::RecordNotFound)
 
       regular_post = Fabricate(:post)
+      topic = regular_post.topic
+
       PostDestroyer.new(moderator, regular_post, force_destroy: true).destroy
       expect { regular_post.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect { topic.reload }.to raise_error(ActiveRecord::RecordNotFound)
     end
   end
 
diff --git a/spec/lib/post_jobs_enqueuer_spec.rb b/spec/lib/post_jobs_enqueuer_spec.rb
index 3a66a3ab4dc..266c4f8b0de 100644
--- a/spec/lib/post_jobs_enqueuer_spec.rb
+++ b/spec/lib/post_jobs_enqueuer_spec.rb
@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 RSpec.describe PostJobsEnqueuer do
+  subject(:enqueuer) { described_class.new(post, topic, new_topic, opts) }
+
   let!(:post) { Fabricate(:post, topic: topic) }
   let!(:topic) { Fabricate(:topic) }
   let(:new_topic) { false }
   let(:opts) { { post_alert_options: {} } }
 
-  subject { described_class.new(post, topic, new_topic, opts) }
-
   context "for regular topics" do
     it "enqueues the :post_alert job" do
       expect_enqueued_with(
@@ -17,24 +17,24 @@ RSpec.describe PostJobsEnqueuer do
           new_record: true,
           options: opts[:post_alert_options],
         },
-      ) { subject.enqueue_jobs }
+      ) { enqueuer.enqueue_jobs }
     end
 
     it "enqueues the :notify_mailing_list_subscribers job" do
       expect_enqueued_with(job: :notify_mailing_list_subscribers, args: { post_id: post.id }) do
-        subject.enqueue_jobs
+        enqueuer.enqueue_jobs
       end
     end
 
     it "enqueues the :post_update_topic_tracking_state job" do
       expect_enqueued_with(job: :post_update_topic_tracking_state, args: { post_id: post.id }) do
-        subject.enqueue_jobs
+        enqueuer.enqueue_jobs
       end
     end
 
     it "enqueues the :feature_topic_users job" do
       expect_enqueued_with(job: :feature_topic_users, args: { topic_id: topic.id }) do
-        subject.enqueue_jobs
+        enqueuer.enqueue_jobs
       end
     end
 
@@ -44,7 +44,7 @@ RSpec.describe PostJobsEnqueuer do
       it "calls the correct topic tracking state class to publish_new" do
         TopicTrackingState.expects(:publish_new).with(topic)
         PrivateMessageTopicTrackingState.expects(:publish_new).never
-        subject.enqueue_jobs
+        enqueuer.enqueue_jobs
       end
     end
   end
@@ -54,19 +54,19 @@ RSpec.describe PostJobsEnqueuer do
 
     it "does not enqueue the :notify_mailing_list_subscribers job" do
       expect_not_enqueued_with(job: :notify_mailing_list_subscribers, args: { post_id: post.id }) do
-        subject.enqueue_jobs
+        enqueuer.enqueue_jobs
       end
     end
 
     it "enqueues the :post_update_topic_tracking_state job" do
       expect_enqueued_with(job: :post_update_topic_tracking_state, args: { post_id: post.id }) do
-        subject.enqueue_jobs
+        enqueuer.enqueue_jobs
       end
     end
 
     it "enqueues the :feature_topic_users job" do
       expect_enqueued_with(job: :feature_topic_users, args: { topic_id: topic.id }) do
-        subject.enqueue_jobs
+        enqueuer.enqueue_jobs
       end
     end
 
@@ -76,7 +76,7 @@ RSpec.describe PostJobsEnqueuer do
       it "calls the correct topic tracking state class to publish_new" do
         TopicTrackingState.expects(:publish_new).never
         PrivateMessageTopicTrackingState.expects(:publish_new).with(topic)
-        subject.enqueue_jobs
+        enqueuer.enqueue_jobs
       end
     end
 
@@ -99,7 +99,7 @@ RSpec.describe PostJobsEnqueuer do
             args: {
               topic_id: topic.id,
             },
-          ) { subject.enqueue_jobs }
+          ) { enqueuer.enqueue_jobs }
         end
       end
     end
diff --git a/spec/lib/post_revisor_spec.rb b/spec/lib/post_revisor_spec.rb
index 7af48fcdb73..83a471798d3 100644
--- a/spec/lib/post_revisor_spec.rb
+++ b/spec/lib/post_revisor_spec.rb
@@ -120,12 +120,86 @@ RSpec.describe PostRevisor do
       post.revise(post.user, category_id: new_category.id, tags: ["test_tag"])
       expect(post.reload.topic.category_id).to eq(new_category.id)
     end
+
+    it "returns an error if the topic does not have minimum amount of tags that the new category requires" do
+      SiteSetting.min_trust_to_create_tag = 0
+      SiteSetting.min_trust_level_to_tag_topics = 0
+
+      old_category = Fabricate(:category, minimum_required_tags: 0)
+      new_category = Fabricate(:category, minimum_required_tags: 1)
+
+      post = create_post(category: old_category)
+      topic = post.topic
+
+      post.revise(post.user, category_id: new_category.id)
+      expect(topic.errors.full_messages).to eq([I18n.t("tags.minimum_required_tags", count: 1)])
+    end
+
+    it "returns an error if the topic has tags not allowed in the new category" do
+      SiteSetting.min_trust_to_create_tag = 0
+      SiteSetting.min_trust_level_to_tag_topics = 0
+
+      tag1 = Fabricate(:tag)
+      tag2 = Fabricate(:tag)
+      tag_group = Fabricate(:tag_group, tags: [tag1])
+      tag_group2 = Fabricate(:tag_group, tags: [tag2])
+
+      old_category = Fabricate(:category, tag_groups: [tag_group])
+      new_category = Fabricate(:category, tag_groups: [tag_group2])
+
+      post = create_post(category: old_category, tags: [tag1.name])
+      topic = post.topic
+
+      post.revise(post.user, category_id: new_category.id)
+      expect(topic.errors.full_messages).to eq(
+        [
+          I18n.t(
+            "tags.forbidden.restricted_tags_cannot_be_used_in_category",
+            count: 1,
+            tags: tag1.name,
+            category: new_category.name,
+          ),
+        ],
+      )
+    end
+
+    it "returns an error if the topic is missing tags required from a tag group in the new category" do
+      SiteSetting.min_trust_to_create_tag = 0
+      SiteSetting.min_trust_level_to_tag_topics = 0
+
+      tag1 = Fabricate(:tag)
+      tag_group = Fabricate(:tag_group, tags: [tag1])
+
+      old_category = Fabricate(:category)
+      new_category =
+        Fabricate(
+          :category,
+          category_required_tag_groups: [
+            CategoryRequiredTagGroup.new(tag_group: tag_group, min_count: 1),
+          ],
+        )
+
+      post = create_post(category: old_category)
+      topic = post.topic
+
+      post.revise(post.user, category_id: new_category.id)
+      expect(topic.errors.full_messages).to eq(
+        [
+          I18n.t(
+            "tags.required_tags_from_group",
+            count: 1,
+            tag_group_name: tag_group.name,
+            tags: tag1.name,
+          ),
+        ],
+      )
+    end
   end
 
   describe "editing tags" do
-    fab!(:post) { Fabricate(:post) }
+    subject(:post_revisor) { PostRevisor.new(post) }
 
-    subject { PostRevisor.new(post) }
+    fab!(:post) { Fabricate(:post) }
 
     before do
       Jobs.run_immediately!
@@ -138,23 +212,94 @@ RSpec.describe PostRevisor do
     end
 
     it "creates notifications" do
-      expect { subject.revise!(admin, tags: ["new-tag"]) }.to change { Notification.count }.by(1)
+      expect { post_revisor.revise!(admin, tags: ["new-tag"]) }.to change { Notification.count }.by(
+        1,
+      )
     end
 
     it "skips notifications if disable_tags_edit_notifications" do
       SiteSetting.disable_tags_edit_notifications = true
 
-      expect { subject.revise!(admin, tags: ["new-tag"]) }.not_to change { Notification.count }
+      expect { post_revisor.revise!(admin, tags: ["new-tag"]) }.not_to change { Notification.count }
+    end
+
+    it "doesn't create a small_action post when create_post_for_category_and_tag_changes is false" do
+      SiteSetting.create_post_for_category_and_tag_changes = false
+
+      expect { post_revisor.revise!(admin, tags: ["new-tag"]) }.not_to change { Post.count }
+    end
+
+    describe "when `create_post_for_category_and_tag_changes` site setting is enabled" do
+      fab!(:tag1) { Fabricate(:tag, name: "First tag") }
+      fab!(:tag2) { Fabricate(:tag, name: "Second tag") }
+
+      before { SiteSetting.create_post_for_category_and_tag_changes = true }
+
+      it "Creates a small_action post with correct translation when both adding and removing tags" do
+        post.topic.update!(tags: [tag1])
+
+        expect { post_revisor.revise!(admin, tags: [tag2.name]) }.to change {
+          Post.where(topic_id: post.topic_id, action_code: "tags_changed").count
+        }.by(1)
+
+        expect(post.topic.ordered_posts.last.raw).to eq(
+          I18n.t(
+            "topic_tag_changed.added_and_removed",
+            added: "##{tag2.name}",
+            removed: "##{tag1.name}",
+          ),
+        )
+      end
+
+      it "Creates a small_action post with correct translation when adding tags" do
+        post.topic.update!(tags: [])
+
+        expect { post_revisor.revise!(admin, tags: [tag1.name]) }.to change {
+          Post.where(topic_id: post.topic_id, action_code: "tags_changed").count
+        }.by(1)
+
+        expect(post.topic.ordered_posts.last.raw).to eq(
+          I18n.t("topic_tag_changed.added", added: "##{tag1.name}"),
+        )
+      end
+
+      it "Creates a small_action post with correct translation when removing tags" do
+        post.topic.update!(tags: [tag1, tag2])
+
+        expect { post_revisor.revise!(admin, tags: []) }.to change {
+          Post.where(topic_id: post.topic_id, action_code: "tags_changed").count
+        }.by(1)
+
+        expect(post.topic.ordered_posts.last.raw).to eq(
+          I18n.t("topic_tag_changed.removed", removed: "##{tag1.name}, ##{tag2.name}"),
+        )
+      end
+
+      it "Creates a small_action post when category is changed" do
+        current_category = post.topic.category
+        category = Fabricate(:category)
+
+        expect { post_revisor.revise!(admin, category_id: category.id) }.to change {
+          Post.where(topic_id: post.topic_id, action_code: "category_changed").count
+        }.by(1)
+
+        expect(post.topic.ordered_posts.last.raw).to eq(
+          I18n.t(
+            "topic_category_changed",
+            to: "##{category.slug}",
+            from: "##{current_category.slug}",
+          ),
+        )
+      end
     end
   end
 
   describe "revise wiki" do
-    before do
-      # There used to be a bug where wiki changes were considered posting "too similar"
-      # so this is enabled and checked
-      Discourse.redis.delete_prefixed("unique-post")
-      SiteSetting.unique_posts_mins = 10
-    end
+    # There used to be a bug where wiki changes were considered posting "too similar"
+    # so this is enabled and checked
+    use_redis_snapshotting
+
+    before { SiteSetting.unique_posts_mins = 10 }
 
     it "allows the user to change it to a wiki" do
       pc =
@@ -167,23 +312,24 @@ RSpec.describe PostRevisor do
   end
 
   describe "revise" do
+    subject(:post_revisor) { PostRevisor.new(post) }
+
     let(:post) { Fabricate(:post, post_args) }
     let(:first_version_at) { post.last_version_at }
 
-    subject { PostRevisor.new(post) }
-
     it "destroys last revision if edit is undone" do
       old_raw = post.raw
 
-      subject.revise!(admin, raw: "new post body", tags: ["new-tag"])
+      post_revisor.revise!(admin, raw: "new post body", tags: ["new-tag"])
       expect(post.topic.reload.tags.map(&:name)).to contain_exactly("new-tag")
       expect(post.post_revisions.reload.size).to eq(1)
+      expect(post_revisor.raw_changed?).to eq(true)
 
-      subject.revise!(admin, raw: old_raw, tags: [])
+      post_revisor.revise!(admin, raw: old_raw, tags: [])
       expect(post.topic.reload.tags.map(&:name)).to be_empty
       expect(post.post_revisions.reload.size).to eq(0)
 
-      subject.revise!(admin, raw: "next post body", tags: ["new-tag"])
+      post_revisor.revise!(admin, raw: "next post body", tags: ["new-tag"])
       expect(post.topic.reload.tags.map(&:name)).to contain_exactly("new-tag")
       expect(post.post_revisions.reload.size).to eq(1)
     end
@@ -191,7 +337,7 @@ RSpec.describe PostRevisor do
     describe "with the same body" do
       it "doesn't change version" do
         expect {
-          expect(subject.revise!(post.user, raw: post.raw)).to eq(false)
+          expect(post_revisor.revise!(post.user, raw: post.raw)).to eq(false)
           post.reload
         }.not_to change(post, :version)
       end
@@ -200,7 +346,7 @@ RSpec.describe PostRevisor do
     describe "with nil raw contents" do
       it "doesn't change version" do
         expect {
-          expect(subject.revise!(post.user, raw: nil)).to eq(false)
+          expect(post_revisor.revise!(post.user, raw: nil)).to eq(false)
           post.reload
         }.not_to change(post, :version)
       end
@@ -210,7 +356,7 @@ RSpec.describe PostRevisor do
       before { topic.update!(slow_mode_seconds: 1000) }
 
       it "regular edits are not allowed by default" do
-        subject.revise!(
+        post_revisor.revise!(
           post.user,
           { raw: "updated body" },
           revised_at: post.updated_at + 1000.minutes,
@@ -224,7 +370,7 @@ RSpec.describe PostRevisor do
       it "grace period editing is allowed" do
         SiteSetting.editing_grace_period = 1.minute
 
-        subject.revise!(
+        post_revisor.revise!(
           post.user,
           { raw: "updated body" },
           revised_at: post.updated_at + 10.seconds,
@@ -237,7 +383,7 @@ RSpec.describe PostRevisor do
       it "regular edits are allowed if it was turned on in settings" do
         SiteSetting.slow_mode_prevents_editing = false
 
-        subject.revise!(
+        post_revisor.revise!(
           post.user,
           { raw: "updated body" },
           revised_at: post.updated_at + 10.minutes,
@@ -249,7 +395,11 @@ RSpec.describe PostRevisor do
 
       it "staff is allowed to edit posts even if the topic is in slow mode" do
         admin = Fabricate(:admin)
-        subject.revise!(admin, { raw: "updated body" }, revised_at: post.updated_at + 10.minutes)
+        post_revisor.revise!(
+          admin,
+          { raw: "updated body" },
+          revised_at: post.updated_at + 10.minutes,
+        )
 
         post.reload
         expect(post.errors).to be_empty
@@ -260,7 +410,7 @@ RSpec.describe PostRevisor do
       it "correctly applies edits" do
         SiteSetting.editing_grace_period = 1.minute
 
-        subject.revise!(
+        post_revisor.revise!(
           post.user,
           { raw: "updated body" },
           revised_at: post.updated_at + 10.seconds,
@@ -271,7 +421,7 @@ RSpec.describe PostRevisor do
         expect(post.public_version).to eq(1)
         expect(post.revisions.size).to eq(0)
         expect(post.last_version_at).to eq_time(first_version_at)
-        expect(subject.category_changed).to be_blank
+        expect(post_revisor.category_changed).to be_blank
       end
 
       it "does create a new version if a large diff happens" do
@@ -318,18 +468,37 @@ RSpec.describe PostRevisor do
         expect(post.revisions.count).to eq(1)
       end
 
+      it "creates a new version when the post is flagged" do
+        SiteSetting.editing_grace_period = 1.minute
+
+        post = Fabricate(:post, raw: "hello world")
+
+        Fabricate(:flag, post: post, user: user)
+
+        revisor = PostRevisor.new(post)
+        revisor.revise!(
+          post.user,
+          { raw: "hello world, JK" },
+          revised_at: post.updated_at + 1.second,
+        )
+
+        post.reload
+        expect(post.version).to eq(2)
+        expect(post.revisions.count).to eq(1)
+      end
+
       it "doesn't create a new version" do
         SiteSetting.editing_grace_period = 1.minute
         SiteSetting.editing_grace_period_max_diff = 100
 
         # making a revision
-        subject.revise!(
+        post_revisor.revise!(
           post.user,
           { raw: "updated body" },
           revised_at: post.updated_at + SiteSetting.editing_grace_period + 1.seconds,
         )
         # "roll back"
-        subject.revise!(
+        post_revisor.revise!(
           post.user,
           { raw: "Hello world" },
           revised_at: post.updated_at + SiteSetting.editing_grace_period + 2.seconds,
@@ -344,7 +513,7 @@ RSpec.describe PostRevisor do
 
       it "should bump the topic" do
         expect {
-          subject.revise!(
+          post_revisor.revise!(
             post.user,
             { raw: "updated body" },
             revised_at: post.updated_at + SiteSetting.editing_grace_period + 1.seconds,
@@ -352,11 +521,25 @@ RSpec.describe PostRevisor do
         }.to change { post.topic.bumped_at }
       end
 
+      it "should bump topic when no topic category" do
+        topic_with_no_category = Fabricate(:topic, category_id: nil)
+        post_from_topic_with_no_category = Fabricate(:post, topic: topic_with_no_category)
+        expect {
+          result =
+            post_revisor.revise!(
+              Fabricate(:admin),
+              raw: post_from_topic_with_no_category.raw,
+              tags: ["foo"],
+            )
+          expect(result).to eq(true)
+        }.to change { topic.reload.bumped_at }
+      end
+
       it "should send muted and latest message" do
         TopicUser.create!(topic: post.topic, user: post.user, notification_level: 0)
         messages =
           MessageBus.track_publish("/latest") do
-            subject.revise!(
+            post_revisor.revise!(
               post.user,
               { raw: "updated body" },
               revised_at: post.updated_at + SiteSetting.editing_grace_period + 1.seconds,
@@ -455,12 +638,12 @@ RSpec.describe PostRevisor do
 
       before do
         SiteSetting.editing_grace_period = 1.minute
-        subject.revise!(post.user, { raw: "updated body" }, revised_at: revised_at)
+        post_revisor.revise!(post.user, { raw: "updated body" }, revised_at: revised_at)
         post.reload
       end
 
       it "doesn't update a category" do
-        expect(subject.category_changed).to be_blank
+        expect(post_revisor.category_changed).to be_blank
       end
 
       it "updates the versions" do
@@ -478,7 +661,11 @@ RSpec.describe PostRevisor do
 
       describe "new edit window" do
         before do
-          subject.revise!(post.user, { raw: "yet another updated body" }, revised_at: revised_at)
+          post_revisor.revise!(
+            post.user,
+            { raw: "yet another updated body" },
+            revised_at: revised_at,
+          )
           post.reload
         end
 
@@ -492,14 +679,14 @@ RSpec.describe PostRevisor do
         end
 
         it "doesn't update a category" do
-          expect(subject.category_changed).to be_blank
+          expect(post_revisor.category_changed).to be_blank
         end
 
         context "after second window" do
           let!(:new_revised_at) { revised_at + 2.minutes }
 
           before do
-            subject.revise!(
+            post_revisor.revise!(
               post.user,
               { raw: "yet another, another updated body" },
               revised_at: new_revised_at,
@@ -534,12 +721,12 @@ RSpec.describe PostRevisor do
 
       context "with one paragraph description" do
         before do
-          subject.revise!(post.user, raw: new_description)
+          post_revisor.revise!(post.user, raw: new_description)
           category.reload
         end
 
         it "returns the changed category info" do
-          expect(subject.category_changed).to eq(category)
+          expect(post_revisor.category_changed).to eq(category)
         end
 
         it "updates the description of the category" do
@@ -549,12 +736,12 @@ RSpec.describe PostRevisor do
 
       context "with multiple paragraph description" do
         before do
-          subject.revise!(post.user, raw: "#{new_description}\n\nOther content goes here.")
+          post_revisor.revise!(post.user, raw: "#{new_description}\n\nOther content goes here.")
           category.reload
         end
 
         it "returns the changed category info" do
-          expect(subject.category_changed).to eq(category)
+          expect(post_revisor.category_changed).to eq(category)
         end
 
         it "updates the description of the category" do
@@ -564,7 +751,7 @@ RSpec.describe PostRevisor do
 
       context "with invalid description without paragraphs" do
         before do
-          subject.revise!(post.user, raw: "# This is a title")
+          post_revisor.revise!(post.user, raw: "# This is a title")
           category.reload
         end
 
@@ -583,7 +770,7 @@ RSpec.describe PostRevisor do
       context "when updating back to the original paragraph" do
         before do
           category.update_column(:description, "this is my description")
-          subject.revise!(post.user, raw: Category.post_template)
+          post_revisor.revise!(post.user, raw: Category.post_template)
           category.reload
         end
 
@@ -592,7 +779,7 @@ RSpec.describe PostRevisor do
         end
 
         it "returns the changed category info" do
-          expect(subject.category_changed).to eq(category)
+          expect(post_revisor.category_changed).to eq(category)
         end
       end
     end
@@ -602,22 +789,23 @@ RSpec.describe PostRevisor do
 
       before do
         RateLimiter.enable
-        RateLimiter.clear_all!
         SiteSetting.editing_grace_period = 0
       end
 
+      use_redis_snapshotting
+
       it "triggers a rate limiter" do
         EditRateLimiter.any_instance.expects(:performed!)
-        subject.revise!(changed_by, raw: "updated body")
+        post_revisor.revise!(changed_by, raw: "updated body")
       end
 
       it "raises error when a user gets rate limited" do
         SiteSetting.max_edits_per_day = 1
         user = Fabricate(:user, trust_level: 1)
 
-        subject.revise!(user, raw: "body (edited)")
+        post_revisor.revise!(user, raw: "body (edited)")
 
-        expect do subject.revise!(user, raw: "body (edited twice) ") end.to raise_error(
+        expect do post_revisor.revise!(user, raw: "body (edited twice) ") end.to raise_error(
           RateLimiter::LimitExceeded,
         )
       end
@@ -629,26 +817,26 @@ RSpec.describe PostRevisor do
         SiteSetting.tl4_additional_edits_per_day_multiplier = 4
 
         user = Fabricate(:user, trust_level: 2)
-        expect { subject.revise!(user, raw: "body (edited)") }.to_not raise_error
-        expect { subject.revise!(user, raw: "body (edited twice)") }.to_not raise_error
-        expect do subject.revise!(user, raw: "body (edited three times) ") end.to raise_error(
+        expect { post_revisor.revise!(user, raw: "body (edited)") }.to_not raise_error
+        expect { post_revisor.revise!(user, raw: "body (edited twice)") }.to_not raise_error
+        expect do post_revisor.revise!(user, raw: "body (edited three times) ") end.to raise_error(
           RateLimiter::LimitExceeded,
         )
 
         user = Fabricate(:user, trust_level: 3)
-        expect { subject.revise!(user, raw: "body (edited)") }.to_not raise_error
-        expect { subject.revise!(user, raw: "body (edited twice)") }.to_not raise_error
-        expect { subject.revise!(user, raw: "body (edited three times)") }.to_not raise_error
-        expect do subject.revise!(user, raw: "body (edited four times) ") end.to raise_error(
+        expect { post_revisor.revise!(user, raw: "body (edited)") }.to_not raise_error
+        expect { post_revisor.revise!(user, raw: "body (edited twice)") }.to_not raise_error
+        expect { post_revisor.revise!(user, raw: "body (edited three times)") }.to_not raise_error
+        expect do post_revisor.revise!(user, raw: "body (edited four times) ") end.to raise_error(
           RateLimiter::LimitExceeded,
         )
 
         user = Fabricate(:user, trust_level: 4)
-        expect { subject.revise!(user, raw: "body (edited)") }.to_not raise_error
-        expect { subject.revise!(user, raw: "body (edited twice)") }.to_not raise_error
-        expect { subject.revise!(user, raw: "body (edited three times)") }.to_not raise_error
-        expect { subject.revise!(user, raw: "body (edited four times)") }.to_not raise_error
-        expect do subject.revise!(user, raw: "body (edited five times) ") end.to raise_error(
+        expect { post_revisor.revise!(user, raw: "body (edited)") }.to_not raise_error
+        expect { post_revisor.revise!(user, raw: "body (edited twice)") }.to_not raise_error
+        expect { post_revisor.revise!(user, raw: "body (edited three times)") }.to_not raise_error
+        expect { post_revisor.revise!(user, raw: "body (edited four times)") }.to_not raise_error
+        expect do post_revisor.revise!(user, raw: "body (edited five times) ") end.to raise_error(
           RateLimiter::LimitExceeded,
         )
       end
@@ -661,7 +849,7 @@ RSpec.describe PostRevisor do
         SiteSetting.newuser_max_embedded_media = 0
         url = "http://i.imgur.com/wfn7rgU.jpg"
         Oneboxer.stubs(:onebox).with(url, anything).returns("<img src='#{url}'>")
-        subject.revise!(changed_by, raw: "So, post them here!\n#{url}")
+        post_revisor.revise!(changed_by, raw: "So, post them here!\n#{url}")
       end
 
       it "allows an admin to insert images into a new user's post" do
@@ -678,7 +866,7 @@ RSpec.describe PostRevisor do
         SiteSetting.newuser_max_embedded_media = 0
         url = "http://i.imgur.com/FGg7Vzu.gif"
         Oneboxer.stubs(:cached_onebox).with(url, anything).returns("<img src='#{url}'>")
-        subject.revise!(post.user, raw: "So, post them here!\n#{url}")
+        post_revisor.revise!(post.user, raw: "So, post them here!\n#{url}")
       end
 
       it "doesn't allow images to be inserted" do
@@ -690,7 +878,7 @@ RSpec.describe PostRevisor do
       before { SiteSetting.editing_grace_period_max_diff = 1000 }
 
       fab!(:changed_by) { coding_horror }
-      let!(:result) { subject.revise!(changed_by, raw: "lets update the body. Здравствуйте") }
+      let!(:result) { post_revisor.revise!(changed_by, raw: "lets update the body. Здравствуйте") }
 
       it "correctly updates raw" do
         expect(result).to eq(true)
@@ -708,7 +896,7 @@ RSpec.describe PostRevisor do
       end
 
       it "increases the post_edits stat count" do
-        expect do subject.revise!(post.user, { raw: "This is a new revision" }) end.to change {
+        expect do post_revisor.revise!(post.user, { raw: "This is a new revision" }) end.to change {
           post.user.user_stat.post_edits_count.to_i
         }.by(1)
       end
@@ -716,7 +904,7 @@ RSpec.describe PostRevisor do
       context "when second poster posts again quickly" do
         it "is a grace period edit, because the second poster posted again quickly" do
           SiteSetting.editing_grace_period = 1.minute
-          subject.revise!(
+          post_revisor.revise!(
             changed_by,
             { raw: "yet another updated body" },
             revised_at: post.updated_at + 10.seconds,
@@ -731,7 +919,7 @@ RSpec.describe PostRevisor do
       context "when passing skip_revision as true" do
         before do
           SiteSetting.editing_grace_period = 1.minute
-          subject.revise!(
+          post_revisor.revise!(
             changed_by,
             { raw: "yet another updated body" },
             revised_at: post.updated_at + 10.hours,
@@ -750,7 +938,7 @@ RSpec.describe PostRevisor do
       context "when editing the before_edit_post event signature" do
         it "contains post and params" do
           params = { raw: "body (edited)" }
-          events = DiscourseEvent.track_events { subject.revise!(user, params) }
+          events = DiscourseEvent.track_events { post_revisor.revise!(user, params) }
           expect(events).to include(event_name: :before_edit_post, params: [post, params])
         end
       end
@@ -776,28 +964,8 @@ RSpec.describe PostRevisor do
       end
     end
 
-    describe "welcome topic" do
-      before { SiteSetting.welcome_topic_id = topic.id }
-
-      it "should publish welcome topic edit message" do
-        revisor = PostRevisor.new(post)
-        first_post = topic.first_post
-        UserAuthToken.generate!(user_id: admin.id)
-        Discourse.cache.write(Site.welcome_topic_banner_cache_key(admin.id), true)
-
-        messages =
-          MessageBus.track_publish("/site/welcome-topic-banner") do
-            revisor.revise!(admin, { raw: "updated welcome topic body" })
-          end
-        welcome_topic_banner_message =
-          messages.find { |message| message.channel == "/site/welcome-topic-banner" }
-        expect(welcome_topic_banner_message).to be_present
-        expect(welcome_topic_banner_message.data).to eq(false)
-      end
-    end
-
     it "doesn't strip starting whitespaces" do
-      subject.revise!(post.user, raw: "    <-- whitespaces -->    ")
+      post_revisor.revise!(post.user, raw: "    <-- whitespaces -->    ")
       post.reload
       expect(post.raw).to eq("    <-- whitespaces -->")
     end
@@ -805,18 +973,24 @@ RSpec.describe PostRevisor do
     it "revises and tracks changes of topic titles" do
       new_title = "New topic title"
       result =
-        subject.revise!(post.user, { title: new_title }, revised_at: post.updated_at + 10.minutes)
+        post_revisor.revise!(
+          post.user,
+          { title: new_title },
+          revised_at: post.updated_at + 10.minutes,
+        )
 
       expect(result).to eq(true)
       post.reload
       expect(post.topic.title).to eq(new_title)
       expect(post.revisions.first.modifications["title"][1]).to eq(new_title)
+      expect(post_revisor.topic_title_changed?).to eq(true)
+      expect(post_revisor.raw_changed?).to eq(false)
     end
 
     it "revises and tracks changes of topic archetypes" do
       new_archetype = Archetype.banner
       result =
-        subject.revise!(
+        post_revisor.revise!(
           post.user,
           { archetype: new_archetype },
           revised_at: post.updated_at + 10.minutes,
@@ -826,17 +1000,21 @@ RSpec.describe PostRevisor do
       post.reload
       expect(post.topic.archetype).to eq(new_archetype)
       expect(post.revisions.first.modifications["archetype"][1]).to eq(new_archetype)
+      expect(post_revisor.raw_changed?).to eq(false)
     end
 
     it "revises and tracks changes of topic tags" do
-      subject.revise!(admin, tags: ["new-tag"])
+      post_revisor.revise!(admin, tags: ["new-tag"])
       expect(post.post_revisions.last.modifications).to eq("tags" => [[], ["new-tag"]])
+      expect(post_revisor.raw_changed?).to eq(false)
 
-      subject.revise!(admin, tags: %w[new-tag new-tag-2])
+      post_revisor.revise!(admin, tags: %w[new-tag new-tag-2])
       expect(post.post_revisions.last.modifications).to eq("tags" => [[], %w[new-tag new-tag-2]])
+      expect(post_revisor.raw_changed?).to eq(false)
 
-      subject.revise!(admin, tags: ["new-tag-3"])
+      post_revisor.revise!(admin, tags: ["new-tag-3"])
       expect(post.post_revisions.last.modifications).to eq("tags" => [[], ["new-tag-3"]])
+      expect(post_revisor.raw_changed?).to eq(false)
     end
 
     describe "#publish_changes" do
@@ -859,14 +1037,14 @@ RSpec.describe PostRevisor do
 
     context "when logging staff edits" do
       it "doesn't log when a regular user revises a post" do
-        subject.revise!(post.user, raw: "lets totally update the body")
+        post_revisor.revise!(post.user, raw: "lets totally update the body")
         log =
           UserHistory.where(acting_user_id: post.user.id, action: UserHistory.actions[:post_edit])
         expect(log).to be_blank
       end
 
       it "logs an edit when a staff member revises a post" do
-        subject.revise!(moderator, raw: "lets totally update the body")
+        post_revisor.revise!(moderator, raw: "lets totally update the body")
         log =
           UserHistory.where(
             acting_user_id: moderator.id,
@@ -877,7 +1055,11 @@ RSpec.describe PostRevisor do
       end
 
       it "doesn't log an edit when skip_staff_log is true" do
-        subject.revise!(moderator, { raw: "lets totally update the body" }, skip_staff_log: true)
+        post_revisor.revise!(
+          moderator,
+          { raw: "lets totally update the body" },
+          skip_staff_log: true,
+        )
         log =
           UserHistory.where(
             acting_user_id: moderator.id,
@@ -931,7 +1113,7 @@ RSpec.describe PostRevisor do
         before { SiteSetting.staff_edit_locks_post = false }
 
         it "does not lock the post when revised" do
-          result = subject.revise!(moderator, raw: "lets totally update the body")
+          result = post_revisor.revise!(moderator, raw: "lets totally update the body")
           expect(result).to eq(true)
           post.reload
           expect(post).not_to be_locked
@@ -942,7 +1124,7 @@ RSpec.describe PostRevisor do
         before { SiteSetting.staff_edit_locks_post = true }
 
         it "locks the post when revised by staff" do
-          result = subject.revise!(moderator, raw: "lets totally update the body")
+          result = post_revisor.revise!(moderator, raw: "lets totally update the body")
           expect(result).to eq(true)
           post.reload
           expect(post).to be_locked
@@ -950,14 +1132,14 @@ RSpec.describe PostRevisor do
 
         it "doesn't lock the wiki posts" do
           post.wiki = true
-          result = subject.revise!(moderator, raw: "some new raw content")
+          result = post_revisor.revise!(moderator, raw: "some new raw content")
           expect(result).to eq(true)
           post.reload
           expect(post).not_to be_locked
         end
 
         it "doesn't lock the post when the raw did not change" do
-          result = subject.revise!(moderator, title: "New topic title, cool!")
+          result = post_revisor.revise!(moderator, title: "New topic title, cool!")
           expect(result).to eq(true)
           post.reload
           expect(post.topic.title).to eq("New topic title, cool!")
@@ -965,14 +1147,15 @@ RSpec.describe PostRevisor do
         end
 
         it "doesn't lock the post when revised by a regular user" do
-          result = subject.revise!(user, raw: "lets totally update the body")
+          result = post_revisor.revise!(user, raw: "lets totally update the body")
           expect(result).to eq(true)
           post.reload
           expect(post).not_to be_locked
         end
 
         it "doesn't lock the post when revised by system user" do
-          result = subject.revise!(Discourse.system_user, raw: "I usually replace hotlinked images")
+          result =
+            post_revisor.revise!(Discourse.system_user, raw: "I usually replace hotlinked images")
           expect(result).to eq(true)
           post.reload
           expect(post).not_to be_locked
@@ -997,13 +1180,16 @@ RSpec.describe PostRevisor do
 
       it "generates a notification for a mention" do
         expect {
-          subject.revise!(user, raw: "Random user is mentioning @#{mentioned_user.username_lower}")
+          post_revisor.revise!(
+            user,
+            raw: "Random user is mentioning @#{mentioned_user.username_lower}",
+          )
         }.to change { Notification.where(notification_type: Notification.types[:mentioned]).count }
       end
 
       it "never generates a notification for a mention when the System user revise a post" do
         expect {
-          subject.revise!(
+          post_revisor.revise!(
             Discourse.system_user,
             raw: "System user is mentioning @#{mentioned_user.username_lower}",
           )
@@ -1019,7 +1205,11 @@ RSpec.describe PostRevisor do
 
         it "doesn't add the tags" do
           result =
-            subject.revise!(user, raw: "lets totally update the body", tags: %w[totally update])
+            post_revisor.revise!(
+              user,
+              raw: "lets totally update the body",
+              tags: %w[totally update],
+            )
           expect(result).to eq(true)
           post.reload
           expect(post.topic.tags.size).to eq(0)
@@ -1038,7 +1228,11 @@ RSpec.describe PostRevisor do
           it "can create all tags if none exist" do
             expect {
               @result =
-                subject.revise!(user, raw: "lets totally update the body", tags: %w[totally update])
+                post_revisor.revise!(
+                  user,
+                  raw: "lets totally update the body",
+                  tags: %w[totally update],
+                )
             }.to change { Tag.count }.by(2)
             expect(@result).to eq(true)
             post.reload
@@ -1049,7 +1243,11 @@ RSpec.describe PostRevisor do
             Fabricate(:tag, name: "totally")
             expect {
               @result =
-                subject.revise!(user, raw: "lets totally update the body", tags: %w[totally update])
+                post_revisor.revise!(
+                  user,
+                  raw: "lets totally update the body",
+                  tags: %w[totally update],
+                )
             }.to change { Tag.count }.by(1)
             expect(@result).to eq(true)
             post.reload
@@ -1058,7 +1256,7 @@ RSpec.describe PostRevisor do
 
           it "can remove all tags" do
             topic.tags = [Fabricate(:tag, name: "super"), Fabricate(:tag, name: "stuff")]
-            result = subject.revise!(user, raw: "lets totally update the body", tags: [])
+            result = post_revisor.revise!(user, raw: "lets totally update the body", tags: [])
             expect(result).to eq(true)
             post.reload
             expect(post.topic.tags.size).to eq(0)
@@ -1067,7 +1265,11 @@ RSpec.describe PostRevisor do
           it "can't add staff-only tags" do
             create_staff_only_tags(["important"])
             result =
-              subject.revise!(user, raw: "lets totally update the body", tags: %w[important stuff])
+              post_revisor.revise!(
+                user,
+                raw: "lets totally update the body",
+                tags: %w[important stuff],
+              )
             expect(result).to eq(false)
             expect(post.topic.errors.present?).to eq(true)
           end
@@ -1075,7 +1277,11 @@ RSpec.describe PostRevisor do
           it "staff can add staff-only tags" do
             create_staff_only_tags(["important"])
             result =
-              subject.revise!(admin, raw: "lets totally update the body", tags: %w[important stuff])
+              post_revisor.revise!(
+                admin,
+                raw: "lets totally update the body",
+                tags: %w[important stuff],
+              )
             expect(result).to eq(true)
             post.reload
             expect(post.topic.tags.map(&:name).sort).to eq(%w[important stuff])
@@ -1086,7 +1292,7 @@ RSpec.describe PostRevisor do
 
             events =
               DiscourseEvent.track_events do
-                subject.revise!(user, raw: "lets totally update the body", tags: [])
+                post_revisor.revise!(user, raw: "lets totally update the body", tags: [])
               end
 
             event = events.find { |e| e[:event_name] == :post_edited }
@@ -1109,7 +1315,8 @@ RSpec.describe PostRevisor do
             end
 
             it "staff-only tags can't be removed" do
-              result = subject.revise!(user, raw: "lets totally update the body", tags: ["stuff"])
+              result =
+                post_revisor.revise!(user, raw: "lets totally update the body", tags: ["stuff"])
               expect(result).to eq(false)
               expect(post.topic.errors.present?).to eq(true)
               post.reload
@@ -1117,7 +1324,7 @@ RSpec.describe PostRevisor do
             end
 
             it "can't remove all tags if some are staff-only" do
-              result = subject.revise!(user, raw: "lets totally update the body", tags: [])
+              result = post_revisor.revise!(user, raw: "lets totally update the body", tags: [])
               expect(result).to eq(false)
               expect(post.topic.errors.present?).to eq(true)
               post.reload
@@ -1125,14 +1332,15 @@ RSpec.describe PostRevisor do
             end
 
             it "staff-only tags can be removed by staff" do
-              result = subject.revise!(admin, raw: "lets totally update the body", tags: ["stuff"])
+              result =
+                post_revisor.revise!(admin, raw: "lets totally update the body", tags: ["stuff"])
               expect(result).to eq(true)
               post.reload
               expect(post.topic.tags.map(&:name)).to eq(["stuff"])
             end
 
             it "staff can remove all tags" do
-              result = subject.revise!(admin, raw: "lets totally update the body", tags: [])
+              result = post_revisor.revise!(admin, raw: "lets totally update the body", tags: [])
               expect(result).to eq(true)
               post.reload
               expect(post.topic.tags.size).to eq(0)
@@ -1156,7 +1364,7 @@ RSpec.describe PostRevisor do
             it "doesn't bump topic if only staff-only tags are added" do
               expect {
                 result =
-                  subject.revise!(
+                  post_revisor.revise!(
                     Fabricate(:admin),
                     raw: post.raw,
                     tags: topic.tags.map(&:name) + ["secret"],
@@ -1168,7 +1376,7 @@ RSpec.describe PostRevisor do
             it "doesn't bump topic if only staff-only tags are removed" do
               expect {
                 result =
-                  subject.revise!(
+                  post_revisor.revise!(
                     Fabricate(:admin),
                     raw: post.raw,
                     tags: topic.tags.map(&:name) - %w[important secret],
@@ -1180,7 +1388,7 @@ RSpec.describe PostRevisor do
             it "doesn't bump topic if only staff-only tags are removed and there are no tags left" do
               topic.tags = Tag.where(name: %w[important secret]).to_a
               expect {
-                result = subject.revise!(Fabricate(:admin), raw: post.raw, tags: [])
+                result = post_revisor.revise!(Fabricate(:admin), raw: post.raw, tags: [])
                 expect(result).to eq(true)
               }.to_not change { topic.reload.bumped_at }
             end
@@ -1188,7 +1396,7 @@ RSpec.describe PostRevisor do
             it "doesn't bump topic if empty string is given" do
               topic.tags = Tag.where(name: %w[important secret]).to_a
               expect {
-                result = subject.revise!(Fabricate(:admin), raw: post.raw, tags: [""])
+                result = post_revisor.revise!(Fabricate(:admin), raw: post.raw, tags: [""])
                 expect(result).to eq(true)
               }.to_not change { topic.reload.bumped_at }
             end
@@ -1196,7 +1404,7 @@ RSpec.describe PostRevisor do
             it "should bump topic if non staff-only tags are added" do
               expect {
                 result =
-                  subject.revise!(
+                  post_revisor.revise!(
                     Fabricate(:admin),
                     raw: post.raw,
                     tags: topic.tags.map(&:name) + [Fabricate(:tag).name],
@@ -1206,7 +1414,7 @@ RSpec.describe PostRevisor do
             end
 
             it "creates a hidden revision" do
-              subject.revise!(
+              post_revisor.revise!(
                 Fabricate(:admin),
                 raw: post.raw,
                 tags: topic.tags.map(&:name) + ["secret"],
@@ -1218,7 +1426,7 @@ RSpec.describe PostRevisor do
               PostActionNotifier.enable
               Jobs.run_immediately!
               expect {
-                subject.revise!(
+                post_revisor.revise!(
                   Fabricate(:admin),
                   raw: post.raw,
                   tags: topic.tags.map(&:name) + ["secret"],
@@ -1248,20 +1456,21 @@ RSpec.describe PostRevisor do
 
             it "doesn't allow removing all tags from the group" do
               post.topic.tags = [tag1, tag2]
-              result = subject.revise!(user, raw: "lets totally update the body", tags: [])
+              result = post_revisor.revise!(user, raw: "lets totally update the body", tags: [])
               expect(result).to eq(false)
             end
 
             it "allows removing some tags" do
               post.topic.tags = [tag1, tag2, tag3]
-              result = subject.revise!(user, raw: "lets totally update the body", tags: [tag1.name])
+              result =
+                post_revisor.revise!(user, raw: "lets totally update the body", tags: [tag1.name])
               expect(result).to eq(true)
               expect(post.reload.topic.tags.map(&:name)).to eq([tag1.name])
             end
 
             it "allows admins to remove the tags" do
               post.topic.tags = [tag1, tag2, tag3]
-              result = subject.revise!(admin, raw: "lets totally update the body", tags: [])
+              result = post_revisor.revise!(admin, raw: "lets totally update the body", tags: [])
               expect(result).to eq(true)
               expect(post.reload.topic.tags.size).to eq(0)
             end
@@ -1278,7 +1487,11 @@ RSpec.describe PostRevisor do
             Fabricate(:tag, name: "totally")
             expect {
               @result =
-                subject.revise!(user, raw: "lets totally update the body", tags: %w[totally update])
+                post_revisor.revise!(
+                  user,
+                  raw: "lets totally update the body",
+                  tags: %w[totally update],
+                )
             }.to_not change { Tag.count }
             expect(@result).to eq(true)
             post.reload
@@ -1294,20 +1507,20 @@ RSpec.describe PostRevisor do
       let(:image3) { Fabricate(:upload) }
       let(:image4) { Fabricate(:upload) }
       let(:post_args) { { user: user, topic: topic, raw: <<~RAW } }
-            This is a post with multiple uploads
-            ![image1](#{image1.short_url})
-            ![image2](#{image2.short_url})
-          RAW
+        This is a post with multiple uploads
+        ![image1](#{image1.short_url})
+        ![image2](#{image2.short_url})
+      RAW
 
       it "updates linked post uploads" do
         post.link_post_uploads
         expect(post.upload_references.pluck(:upload_id)).to contain_exactly(image1.id, image2.id)
 
-        subject.revise!(user, raw: <<~RAW)
-            This is a post with multiple uploads
-            ![image2](#{image2.short_url})
-            ![image3](#{image3.short_url})
-            ![image4](#{image4.short_url})
+        post_revisor.revise!(user, raw: <<~RAW)
+          This is a post with multiple uploads
+          ![image2](#{image2.short_url})
+          ![image3](#{image3.short_url})
+          ![image4](#{image4.short_url})
         RAW
 
         expect(post.reload.upload_references.pluck(:upload_id)).to contain_exactly(
@@ -1329,9 +1542,9 @@ RSpec.describe PostRevisor do
 
         it "updates the upload secure status, which is secure by default from the composer. set to false for a public topic" do
           stub_image_size
-          subject.revise!(user, raw: <<~RAW)
-              This is a post with a secure upload
-              ![image5](#{image5.short_url})
+          post_revisor.revise!(user, raw: <<~RAW)
+            This is a post with a secure upload
+            ![image5](#{image5.short_url})
           RAW
 
           expect(image5.reload.secure).to eq(false)
@@ -1343,9 +1556,9 @@ RSpec.describe PostRevisor do
         it "does not update the upload secure status, which is secure by default from the composer for a private" do
           post.topic.update(category: Fabricate(:private_category, group: Fabricate(:group)))
           stub_image_size
-          subject.revise!(user, raw: <<~RAW)
-              This is a post with a secure upload
-              ![image5](#{image5.short_url})
+          post_revisor.revise!(user, raw: <<~RAW)
+            This is a post with a secure upload
+            ![image5](#{image5.short_url})
           RAW
 
           expect(image5.reload.secure).to eq(true)
@@ -1390,12 +1603,12 @@ RSpec.describe PostRevisor do
       fab!(:post) { Fabricate(:post, raw: "aaa", skip_validation: true) }
 
       it "can revise multiple times and remove unnecessary revisions" do
-        subject.revise!(admin, { raw: "bbb" }, skip_validations: true)
+        post_revisor.revise!(admin, { raw: "bbb" }, skip_validations: true)
         expect(post.errors).to be_empty
 
         # Revert to old version which was invalid to destroy previously created
         # post revision and trigger another post save.
-        subject.revise!(admin, { raw: "aaa" }, skip_validations: true)
+        post_revisor.revise!(admin, { raw: "aaa" }, skip_validations: true)
         expect(post.errors).to be_empty
       end
     end
diff --git a/spec/lib/presence_channel_spec.rb b/spec/lib/presence_channel_spec.rb
index 29a1f44f833..be6e28fc1cb 100644
--- a/spec/lib/presence_channel_spec.rb
+++ b/spec/lib/presence_channel_spec.rb
@@ -24,6 +24,8 @@ RSpec.describe PresenceChannel do
         PresenceChannel::Config.new(allowed_user_ids: [user.id])
       when "/test/allowedgroup"
         PresenceChannel::Config.new(allowed_group_ids: [group.id])
+      when "/test/everyonegroup"
+        PresenceChannel::Config.new(allowed_group_ids: [Group::AUTO_GROUPS[:everyone]])
       when "/test/noaccess"
         PresenceChannel::Config.new
       when "/test/countonly"
@@ -63,6 +65,12 @@ RSpec.describe PresenceChannel do
     expect(channel3.count).to eq(0)
   end
 
+  it "does not raise error when getting channel config under readonly" do
+    PresenceChannel.redis.stubs(:set).raises(Redis::CommandError.new("READONLY")).once
+    channel = PresenceChannel.new("/test/public1")
+    expect(channel.user_ids).to eq([])
+  end
+
   it "can automatically expire users" do
     channel = PresenceChannel.new("/test/public1")
 
@@ -204,11 +212,13 @@ RSpec.describe PresenceChannel do
     expect(PresenceChannel.new("/test/secureuser").can_enter?(user_id: nil)).to eq(false)
     expect(PresenceChannel.new("/test/securegroup").can_enter?(user_id: nil)).to eq(false)
     expect(PresenceChannel.new("/test/noaccess").can_enter?(user_id: nil)).to eq(false)
+    expect(PresenceChannel.new("/test/everyonegroup").can_enter?(user_id: nil)).to eq(false)
 
     expect(PresenceChannel.new("/test/public1").can_view?(user_id: nil)).to eq(true)
     expect(PresenceChannel.new("/test/secureuser").can_view?(user_id: nil)).to eq(false)
     expect(PresenceChannel.new("/test/securegroup").can_view?(user_id: nil)).to eq(false)
     expect(PresenceChannel.new("/test/noaccess").can_view?(user_id: nil)).to eq(false)
+    expect(PresenceChannel.new("/test/everyonegroup").can_view?(user_id: nil)).to eq(false)
   end
 
   it "handles security correctly for a user" do
@@ -216,12 +226,14 @@ RSpec.describe PresenceChannel do
     expect(PresenceChannel.new("/test/securegroup").can_enter?(user_id: user.id)).to eq(false)
     expect(PresenceChannel.new("/test/alloweduser").can_enter?(user_id: user.id)).to eq(true)
     expect(PresenceChannel.new("/test/allowedgroup").can_enter?(user_id: user.id)).to eq(true)
+    expect(PresenceChannel.new("/test/everyonegroup").can_enter?(user_id: user.id)).to eq(true)
     expect(PresenceChannel.new("/test/noaccess").can_enter?(user_id: user.id)).to eq(false)
 
     expect(PresenceChannel.new("/test/secureuser").can_view?(user_id: user.id)).to eq(false)
     expect(PresenceChannel.new("/test/securegroup").can_view?(user_id: user.id)).to eq(false)
     expect(PresenceChannel.new("/test/alloweduser").can_view?(user_id: user.id)).to eq(true)
     expect(PresenceChannel.new("/test/allowedgroup").can_view?(user_id: user.id)).to eq(true)
+    expect(PresenceChannel.new("/test/everyonegroup").can_view?(user_id: user.id)).to eq(true)
     expect(PresenceChannel.new("/test/noaccess").can_view?(user_id: user.id)).to eq(false)
   end
 
diff --git a/spec/lib/pretty_text/helpers_spec.rb b/spec/lib/pretty_text/helpers_spec.rb
index c8612c9cc4b..0244da8a3b4 100644
--- a/spec/lib/pretty_text/helpers_spec.rb
+++ b/spec/lib/pretty_text/helpers_spec.rb
@@ -68,6 +68,7 @@ RSpec.describe PrettyText::Helpers do
           text: "somecooltag",
           description: "Coolest things ever",
           icon: "tag",
+          id: tag.id,
           slug: "somecooltag",
           ref: "somecooltag::tag",
           type: "tag",
@@ -85,6 +86,7 @@ RSpec.describe PrettyText::Helpers do
           text: "Some Awesome Category",
           description: "Really great stuff here",
           icon: "folder",
+          id: category.id,
           slug: "someawesomecategory",
           ref: "someawesomecategory::category",
           type: "category",
@@ -101,6 +103,7 @@ RSpec.describe PrettyText::Helpers do
           text: "Some Awesome Category",
           description: "Really great stuff here",
           icon: "folder",
+          id: category.id,
           slug: "someawesomecategory",
           ref: "someawesomecategory",
           type: "category",
@@ -115,6 +118,7 @@ RSpec.describe PrettyText::Helpers do
           text: "somecooltag",
           description: "Coolest things ever",
           icon: "tag",
+          id: tag.id,
           slug: "somecooltag",
           ref: "somecooltag",
           type: "tag",
@@ -128,6 +132,7 @@ RSpec.describe PrettyText::Helpers do
           text: "Some Awesome Category",
           description: "Really great stuff here",
           icon: "folder",
+          id: category.id,
           slug: "someawesomecategory",
           ref: "someawesomecategory",
           type: "category",
@@ -150,6 +155,7 @@ RSpec.describe PrettyText::Helpers do
           text: "Manager Hideout",
           description: nil,
           icon: "folder",
+          id: private_category.id,
           slug: "secretcategory",
           ref: "secretcategory",
           type: "category",
@@ -157,6 +163,13 @@ RSpec.describe PrettyText::Helpers do
       )
     end
 
+    it "does not return any results for disabled types" do
+      SiteSetting.tagging_enabled = false
+      expect(
+        PrettyText::Helpers.hashtag_lookup("somecooltag::tag", user.id, %w[category tag]),
+      ).to eq(nil)
+    end
+
     it "returns nil when no tag or category that matches exists" do
       expect(PrettyText::Helpers.hashtag_lookup("blah", user.id, %w[category tag])).to eq(nil)
     end
diff --git a/spec/lib/pretty_text_spec.rb b/spec/lib/pretty_text_spec.rb
index 7b3ef983203..df6fc039632 100644
--- a/spec/lib/pretty_text_spec.rb
+++ b/spec/lib/pretty_text_spec.rb
@@ -28,14 +28,34 @@ RSpec.describe PrettyText do
 
       before { User.stubs(:default_template).returns(default_avatar) }
 
+      it "correctly extracts usernames from the new quote format" do
+        topic = Fabricate(:topic, title: "this is a test topic :slight_smile:")
+        expected = <<~HTML
+          <aside class="quote no-group" data-username="codinghorror" data-post="2" data-topic="#{topic.id}">
+          <div class="title">
+          <div class="quote-controls"></div>
+          <a href="http://test.localhost/t/this-is-a-test-topic/#{topic.id}/2">This is a test topic <img width="20" height="20" src="/images/emoji/twitter/slight_smile.png?v=#{Emoji::EMOJI_VERSION}" title="slight_smile" loading="lazy" alt="slight_smile" class="emoji"></a></div>
+          <blockquote>
+          <p>ddd</p>
+          </blockquote>
+          </aside>
+        HTML
+
+        expect(
+          cook(
+            "[quote=\"Jeff, post:2, topic:#{topic.id}, username:codinghorror\"]\nddd\n[/quote]",
+            topic_id: 1,
+          ),
+        ).to eq(n(expected))
+      end
+
       it "do off topic quoting with emoji unescape" do
         topic = Fabricate(:topic, title: "this is a test topic :slight_smile:")
         expected = <<~HTML
           <aside class="quote no-group" data-username="EvilTrout" data-post="2" data-topic="#{topic.id}">
           <div class="title">
           <div class="quote-controls"></div>
-          <a href="http://test.localhost/t/this-is-a-test-topic/#{topic.id}/2">This is a test topic <img width="20" height="20" src="/images/emoji/twitter/slight_smile.png?v=#{Emoji::EMOJI_VERSION}" title="slight_smile" loading="lazy" alt="slight_smile" class="emoji"></a>
-          </div>
+          <a href="http://test.localhost/t/this-is-a-test-topic/#{topic.id}/2">This is a test topic <img width="20" height="20" src="/images/emoji/twitter/slight_smile.png?v=#{Emoji::EMOJI_VERSION}" title="slight_smile" loading="lazy" alt="slight_smile" class="emoji"></a></div>
           <blockquote>
           <p>ddd</p>
           </blockquote>
@@ -200,8 +220,7 @@ RSpec.describe PrettyText do
           <aside class="quote no-group" data-username="maja" data-post="3" data-topic="#{topic.id}">
           <div class="title">
           <div class="quote-controls"></div>
-          <a href="http://test.localhost/t/#{topic.id}/3">#{I18n.t("on_another_topic")}</a>
-          </div>
+          <a href="http://test.localhost/t/#{topic.id}/3">#{I18n.t("on_another_topic")}</a></div>
           <blockquote>
           <p>I have nothing to say.</p>
           </blockquote>
@@ -223,8 +242,7 @@ RSpec.describe PrettyText do
           <aside class="quote no-group" data-username="maja" data-post="3" data-topic="#{topic.id}">
           <div class="title">
           <div class="quote-controls"></div>
-          <a href="http://test.localhost/t/this-is-an-off-topic-topic/#{topic.id}/3">#{topic.title}</a>
-          </div>
+          <a href="http://test.localhost/t/this-is-an-off-topic-topic/#{topic.id}/3">#{topic.title}</a></div>
           <blockquote>
           <p>I have nothing to say.</p>
           </blockquote>
@@ -251,7 +269,7 @@ RSpec.describe PrettyText do
           <aside class="quote no-group" data-username="#{user.username}" data-post="123" data-topic="456" data-full="true">
           <div class="title">
           <div class="quote-controls"></div>
-          <img loading="lazy" alt="" width="20" height="20" src="//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png" class="avatar"> #{user.username}:</div>
+          <img loading="lazy" alt="" width="24" height="24" src="//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/48.png" class="avatar"> #{user.username}:</div>
           <blockquote>
           <p>ddd</p>
           </blockquote>
@@ -273,7 +291,7 @@ RSpec.describe PrettyText do
           <aside class="quote no-group" data-username="#{user.username}" data-post="123" data-topic="456" data-full="true">
           <div class="title">
           <div class="quote-controls"></div>
-          <img loading="lazy" alt="" width="20" height="20" src="//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png" class="avatar"> #{user.username}:</div>
+          <img loading="lazy" alt="" width="24" height="24" src="//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/48.png" class="avatar"> #{user.username}:</div>
           <blockquote>
           <p>ddd</p>
           </blockquote>
@@ -294,7 +312,7 @@ RSpec.describe PrettyText do
           <aside class="quote no-group" data-username="#{user.username}" data-post="555" data-topic="666">
           <div class="title">
           <div class="quote-controls"></div>
-          <img loading="lazy" alt="" width="20" height="20" src="//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png" class="avatar"> #{user.username}:</div>
+          <img loading="lazy" alt="" width="24" height="24" src="//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/48.png" class="avatar"> #{user.username}:</div>
           <blockquote>
           <p>ddd</p>
           </blockquote>
@@ -320,8 +338,7 @@ RSpec.describe PrettyText do
           <aside class="quote group-#{group.name}" data-username="#{user.username}" data-post="2" data-topic="#{topic.id}">
           <div class="title">
           <div class="quote-controls"></div>
-          <img loading="lazy" alt="" width="20" height="20" src="//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png" class="avatar"><a href="http://test.localhost/t/this-is-a-test-topic/#{topic.id}/2">This is a test topic</a>
-          </div>
+          <img loading="lazy" alt="" width="24" height="24" src="//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/48.png" class="avatar"><a href="http://test.localhost/t/this-is-a-test-topic/#{topic.id}/2">This is a test topic</a></div>
           <blockquote>
           <p>ddd</p>
           </blockquote>
@@ -544,6 +561,45 @@ RSpec.describe PrettyText do
         ).to match_html '<p>Hello <span class="mention">@狮子</span></p>'
       end
     end
+
+    context "with pretty_text_extract_mentions modifier" do
+      it "allows changing the mentions extracted" do
+        cooked_html = <<~HTML
+        <p>
+          <a class="mention" href="/u/test">@test</a>,
+          <a class="mention-group" href="/g/test-group">@test-group</a>,
+          <a class="custom-mention" href="/custom-mention">@test-custom</a>,
+          this is a test
+        </p>
+        HTML
+
+        extracted_mentions = PrettyText.extract_mentions(Nokogiri::HTML5.fragment(cooked_html))
+        expect(extracted_mentions).to include("test", "test-group")
+        expect(extracted_mentions).not_to include("test-custom")
+
+        Plugin::Instance
+          .new
+          .register_modifier(:pretty_text_extract_mentions) do |mentions, cooked_text|
+            custom_mentions =
+              cooked_text
+                .css(".custom-mention")
+                .map do |e|
+                  if (name = e.inner_text)
+                    name = name[1..-1]
+                    name = User.normalize_username(name)
+                    name
+                  end
+                end
+
+            mentions + custom_mentions
+          end
+
+        extracted_mentions = PrettyText.extract_mentions(Nokogiri::HTML5.fragment(cooked_html))
+        expect(extracted_mentions).to include("test", "test-group", "test-custom")
+      ensure
+        DiscoursePluginRegistry.clear_modifiers!
+      end
+    end
   end
 
   describe "code fences" do
@@ -1019,12 +1075,30 @@ RSpec.describe PrettyText do
       expect(extract_urls(html)).to eq(["https://example.com"])
     end
 
-    it "should lazyYT videos" do
-      expect(
-        extract_urls(
-          "<div class=\"lazyYT\" data-youtube-id=\"yXEuEUQIP3Q\" data-youtube-title=\"Mister Rogers defending PBS to the US Senate\" data-width=\"480\" data-height=\"270\" data-parameters=\"feature=oembed&amp;wmode=opaque\"></div>",
-        ),
-      ).to eq(["https://www.youtube.com/watch?v=yXEuEUQIP3Q"])
+    context "when lazy-videos" do
+      it "should extract youtube url" do
+        expect(
+          extract_urls(
+            "<div class=\"lazy-video-container\" data-video-id=\"yXEuEUQIP3Q\" data-video-title=\"Mister Rogers defending PBS to the US Senate\" data-provider-name=\"youtube\"></div>",
+          ),
+        ).to eq(["https://www.youtube.com/watch?v=yXEuEUQIP3Q"])
+      end
+
+      it "should extract vimeo url" do
+        expect(
+          extract_urls(
+            "<div class=\"lazy-video-container\" data-video-id=\"786646692\" data-video-title=\"Dear Rich\" data-provider-name=\"vimeo\"></div>",
+          ),
+        ).to eq(["https://vimeo.com/786646692"])
+      end
+
+      it "should extract tiktok url" do
+        expect(
+          extract_urls(
+            "<div class=\"lazy-video-container\" data-video-id=\"6718335390845095173\" data-video-title=\"Scramble up ur name &amp;amp; I’ll try to guess it😍❤️ #foryoupage #petsoftiktok...\" data-provider-name=\"tiktok\"></div>",
+          ),
+        ).to eq(["https://m.tiktok.com/v/6718335390845095173"])
+      end
     end
 
     it "should extract links to posts" do
@@ -1298,6 +1372,14 @@ RSpec.describe PrettyText do
       )
     end
 
+    it "creates a valid URL when data-original-href is missing from Vimeo link" do
+      html =
+        '<iframe src="https://player.vimeo.com/video/508864124?h=fcbbcc92fa" width="640" height="360" frameborder="0" allow="autoplay; fullscreen; picture-in-picture" allowfullscreen></iframe>'
+      expect(PrettyText.format_for_email(html, post)).to match(
+        "https://vimeo.com/508864124/fcbbcc92fa",
+      )
+    end
+
     describe "#convert_vimeo_iframes" do
       it "converts <iframe> to <a>" do
         html = <<~HTML
@@ -1453,7 +1535,7 @@ RSpec.describe PrettyText do
 
     it "replaces some glyphs that are not in the emoji range" do
       expect(PrettyText.cook("☹")).to match(/\:frowning\:/)
-      expect(PrettyText.cook("☺")).to match(/\:relaxed\:/)
+      expect(PrettyText.cook("☺")).to match(/\:smiling_face\:/)
       expect(PrettyText.cook("☻")).to match(/\:slight_smile\:/)
       expect(PrettyText.cook("♡")).to match(/\:heart\:/)
       expect(PrettyText.cook("❤")).to match(/\:heart\:/)
@@ -1508,6 +1590,27 @@ RSpec.describe PrettyText do
     it "replaces Emoji from Unicode 14.0" do
       expect(PrettyText.cook("🫣")).to match(/\:face_with_peeking_eye\:/)
     end
+
+    context "with subfolder" do
+      it "prepends the subfolder path to the emoji url" do
+        set_subfolder "/forum"
+
+        expected = "src=\"/forum/images/emoji/twitter/grinning.png?v=#{Emoji::EMOJI_VERSION}\""
+
+        expect(PrettyText.cook("😀")).to include(expected)
+        expect(PrettyText.cook(":grinning:")).to include(expected)
+      end
+
+      it "prepends the subfolder path even if it is part of the emoji url" do
+        set_subfolder "/info"
+
+        expected =
+          "src=\"/info/images/emoji/twitter/information_source.png?v=#{Emoji::EMOJI_VERSION}\""
+
+        expect(PrettyText.cook("ℹ️")).to include(expected)
+        expect(PrettyText.cook(":information_source:")).to include(expected)
+      end
+    end
   end
 
   describe "custom emoji" do
@@ -1668,28 +1771,65 @@ RSpec.describe PrettyText do
     category2 = Fabricate(:category, name: "known", slug: "known")
     group = Fabricate(:group)
     private_category = Fabricate(:private_category, name: "secret", group: group, slug: "secret")
-    Fabricate(:topic, tags: [Fabricate(:tag, name: "known")])
+    tag = Fabricate(:tag, name: "known")
+    Fabricate(:topic, tags: [tag])
 
     cooked = PrettyText.cook(" #unknown::tag #known #known::tag #testing #secret", user_id: user.id)
 
-    expect(cooked).to include("<span class=\"hashtag-raw\">#unknown::tag</span>")
-    expect(cooked).to include(
-      "<a class=\"hashtag-cooked\" href=\"#{category2.url}\" data-type=\"category\" data-slug=\"known\"><svg class=\"fa d-icon d-icon-folder svg-icon svg-node\"><use href=\"#folder\"></use></svg><span>known</span></a>",
-    )
-    expect(cooked).to include(
-      "<a class=\"hashtag-cooked\" href=\"/tag/known\" data-type=\"tag\" data-slug=\"known\" data-ref=\"known::tag\"><svg class=\"fa d-icon d-icon-tag svg-icon svg-node\"><use href=\"#tag\"></use></svg><span>known</span></a>",
-    )
-    expect(cooked).to include(
-      "<a class=\"hashtag-cooked\" href=\"#{category.url}\" data-type=\"category\" data-slug=\"testing\"><svg class=\"fa d-icon d-icon-folder svg-icon svg-node\"><use href=\"#folder\"></use></svg><span>testing</span></a>",
-    )
-    expect(cooked).to include("<span class=\"hashtag-raw\">#secret</span>")
+    expect(cooked).to have_tag("span", text: "#unknown::tag", with: { class: "hashtag-raw" })
+    expect(cooked).to have_tag(
+      "a",
+      with: {
+        class: "hashtag-cooked",
+        href: category2.url,
+        "data-type": "category",
+        "data-slug": category2.slug,
+        "data-id": category2.id,
+      },
+    ) do
+      with_tag("span", with: { class: "hashtag-icon-placeholder" })
+    end
+    expect(cooked).to have_tag(
+      "a",
+      with: {
+        class: "hashtag-cooked",
+        href: category.url,
+        "data-type": "category",
+        "data-slug": category.slug,
+        "data-id": category.id,
+      },
+    ) do
+      with_tag("span", with: { class: "hashtag-icon-placeholder" })
+    end
+    expect(cooked).to have_tag(
+      "a",
+      with: {
+        class: "hashtag-cooked",
+        href: tag.url,
+        "data-type": "tag",
+        "data-slug": tag.name,
+        "data-id": tag.id,
+      },
+    ) do
+      with_tag("span", with: { class: "hashtag-icon-placeholder" })
+    end
+    expect(cooked).to have_tag("span", text: "#secret", with: { class: "hashtag-raw" })
 
     # If the user hash access to the private category it should be cooked with the details + icon
     group.add(user)
     cooked = PrettyText.cook(" #unknown::tag #known #known::tag #testing #secret", user_id: user.id)
-    expect(cooked).to include(
-      "<a class=\"hashtag-cooked\" href=\"#{private_category.url}\" data-type=\"category\" data-slug=\"secret\"><svg class=\"fa d-icon d-icon-folder svg-icon svg-node\"><use href=\"#folder\"></use></svg><span>secret</span></a>",
-    )
+    expect(cooked).to have_tag(
+      "a",
+      with: {
+        class: "hashtag-cooked",
+        href: private_category.url,
+        "data-type": "category",
+        "data-slug": private_category.slug,
+        "data-id": private_category.id,
+      },
+    ) do
+      with_tag("span", with: { class: "hashtag-icon-placeholder" })
+    end
 
     cooked = PrettyText.cook("[`a` #known::tag here](http://example.com)", user_id: user.id)
 
@@ -1705,10 +1845,18 @@ RSpec.describe PrettyText do
     expect(cooked).to eq(html.strip)
 
     cooked = PrettyText.cook("<A href='/a'>test</A> #known::tag", user_id: user.id)
-    html = <<~HTML
-      <p><a href="/a">test</a> <a class="hashtag-cooked" href="/tag/known" data-type="tag" data-slug="known" data-ref="known::tag"><svg class="fa d-icon d-icon-tag svg-icon svg-node"><use href="#tag"></use></svg><span>known</span></a></p>
-    HTML
-    expect(cooked).to eq(html.strip)
+    expect(cooked).to have_tag(
+      "a",
+      with: {
+        class: "hashtag-cooked",
+        href: tag.url,
+        "data-type": "tag",
+        "data-slug": tag.name,
+        "data-id": tag.id,
+      },
+    ) do
+      with_tag("span", with: { class: "hashtag-icon-placeholder" })
+    end
 
     # ensure it does not fight with the autolinker
     expect(PrettyText.cook(" http://somewhere.com/#known")).not_to include("hashtag")
@@ -1947,22 +2095,35 @@ HTML
         replacement: "discourse",
       )
 
-      expect(PrettyText.cook("@test #test test")).to match_html(<<~HTML)
-        <p>
-          <a class="mention" href="/u/test">@test</a>
-          <a class="hashtag" href="/c/test/#{category.id}">#<span>test</span></a>
-          tdiscourset
-        </p>
-      HTML
+      cooked = PrettyText.cook("@test #test test")
+      expect(cooked).to have_tag("a", text: "@test", with: { class: "mention", href: "/u/test" })
+      expect(cooked).to have_tag(
+        "a",
+        text: "#test",
+        with: {
+          class: "hashtag",
+          href: "/c/test/#{category.id}",
+        },
+      )
+      expect(cooked).to include("tdiscourset")
 
       SiteSetting.enable_experimental_hashtag_autocomplete = true
-      expect(PrettyText.cook("@test #test test")).to match_html(<<~HTML)
-        <p>
-          <a class="mention" href="/u/test">@test</a>
-          <a class="hashtag-cooked" href="#{category.url}" data-type="category" data-slug="test"><svg class="fa d-icon d-icon-folder svg-icon svg-node"><use href="#folder"></use></svg><span>test</span></a>
-          tdiscourset
-        </p>
-      HTML
+      cooked = PrettyText.cook("@test #test test")
+      expect(cooked).to have_tag("a", text: "@test", with: { class: "mention", href: "/u/test" })
+      expect(cooked).to have_tag(
+        "a",
+        text: "test",
+        with: {
+          class: "hashtag-cooked",
+          href: "/c/test/#{category.id}",
+          "data-type": "category",
+          "data-slug": category.slug,
+          "data-id": category.id,
+        },
+      ) do
+        with_tag("span", with: { class: "hashtag-icon-placeholder" })
+      end
+      expect(cooked).to include("tdiscourset")
     end
 
     it "supports overlapping words" do
@@ -2096,11 +2257,11 @@ HTML
     expect(cooked).to eq(html)
   end
 
-  it "provides safety for img bbcode" do
-    cooked = PrettyText.cook "[img]http://aaa.com<script>alert(1);</script>[/img]"
-    html =
-      '<p><img src="http://aaa.com&lt;script&gt;alert(1);&lt;/script&gt;" alt="" role="presentation"></p>'
-    expect(cooked).to eq(html)
+  it "supports img bbcode entities in attributes" do
+    actual = PrettyText.cook "[img]http://aaa.com/?a=1&b=<script>alert(1);</script>[/img]"
+    expected =
+      '<p><img src="http://aaa.com/?a=1&b=&lt;script&gt;alert(1);&lt;/script&gt;" alt="" role="presentation"></p>'
+    expect(expected).to be_same_dom(actual)
   end
 
   it "supports email bbcode" do
@@ -2173,6 +2334,13 @@ HTML
 
   it "should strip SCRIPT" do
     expect(PrettyText.cook("<script>alert(42)</script>")).to eq ""
+    expect(PrettyText.cook("<div><script>alert(42)</script></div>")).to eq "<div></div>"
+  end
+
+  it "strips script regardless of sanitize" do
+    expect(
+      PrettyText.cook("<div><script>alert(42)</script></div>", sanitize: false),
+    ).to eq "<div></div>"
   end
 
   it "should allow sanitize bypass" do
@@ -2319,6 +2487,21 @@ HTML
     expect(cooked).to eq(html.strip)
   end
 
+  it "can skip relative paths in allowlist iframes" do
+    SiteSetting.allowed_iframes = "https://bob.com/abc/def"
+    raw = <<~HTML
+      <iframe src='https://bob.com/abc/def'></iframe>
+      <iframe src='https://bob.com/abc/def/../ghi'></iframe>
+      <iframe src='https://bob.com/abc/def/ghi/../../jkl'></iframe>
+    HTML
+
+    html = <<~HTML
+      <iframe src="https://bob.com/abc/def"></iframe>
+    HTML
+
+    expect(PrettyText.cook(raw).strip).to eq(html.strip)
+  end
+
   it "You can disable linkify" do
     md = "www.cnn.com test.it http://test.com https://test.ab https://a"
     cooked = PrettyText.cook(md)
@@ -2527,4 +2710,18 @@ HTML
       expect(cooked).to eq("<p>:grin: <span class=\"mention\">@mention</span></p>")
     end
   end
+
+  it "does not amend HTML when scrubbing" do
+    md = <<~MD
+      <s>\n\nhello\n\n</s>
+    MD
+
+    html = <<~HTML
+      <s>\n<p>hello</p>\n</s>
+    HTML
+
+    cooked = PrettyText.cook(md)
+
+    expect(cooked.strip).to eq(html.strip)
+  end
 end
diff --git a/spec/lib/promotion_spec.rb b/spec/lib/promotion_spec.rb
index d830480ce39..f31deebe961 100644
--- a/spec/lib/promotion_spec.rb
+++ b/spec/lib/promotion_spec.rb
@@ -99,9 +99,18 @@ RSpec.describe Promotion do
         stat.posts_read_count = SiteSetting.tl1_requires_read_posts
         stat.time_read = SiteSetting.tl1_requires_time_spent_mins * 60
         Promotion.recalculate(user)
+
+        expect(user.trust_level).to eq(1)
+
         expect(Jobs::SendSystemMessage.jobs.length).to eq(0)
       end
 
+      it "respects default trust level" do
+        SiteSetting.default_trust_level = 2
+        Promotion.recalculate(user)
+        expect(user.trust_level).to eq(2)
+      end
+
       it "can be turned off" do
         SiteSetting.send_tl1_welcome_message = false
         @result = promotion.review
@@ -264,4 +273,18 @@ RSpec.describe Promotion do
       end
     end
   end
+
+  describe "#change_trust_level!" do
+    fab!(:user) { Fabricate(:user, trust_level: TrustLevel[0]) }
+    let(:promotion) { Promotion.new(user) }
+
+    context "when the user has no emails" do
+      before { user.user_emails.delete_all }
+
+      it "does not error" do
+        expect { promotion.change_trust_level!(TrustLevel[1]) }.not_to raise_error
+        expect(user.reload.trust_level).to eq(TrustLevel[1])
+      end
+    end
+  end
 end
diff --git a/spec/lib/quote_rewriter_spec.rb b/spec/lib/quote_rewriter_spec.rb
new file mode 100644
index 00000000000..52e9dd5d693
--- /dev/null
+++ b/spec/lib/quote_rewriter_spec.rb
@@ -0,0 +1,131 @@
+# frozen_string_literal: true
+
+RSpec.describe QuoteRewriter do
+  subject(:quote_rewriter) { described_class.new(post.id) }
+
+  before { stub_image_size }
+
+  let(:user) { Fabricate(:user, username: "codinghorror") }
+  let(:topic) { Fabricate(:topic, user: user) }
+  let(:post) { create_post(post_attributes.merge(topic_id: topic.id)) }
+
+  let(:quoted_post) { create_post(user: user, topic: topic, post_number: 1, raw: "quoted post") }
+  let(:avatar_url) { user.avatar_template_url.gsub("{size}", "48") }
+
+  describe "#rewrite_raw_username" do
+    context "when using the old quote format" do
+      let(:post_attributes) { { raw: <<~RAW } }
+            [quote="codinghorror, post:1, topic:#{quoted_post.topic.id}"]
+            quoted post
+            [/quote]
+          RAW
+
+      it "rewrites the username" do
+        expect(quote_rewriter.rewrite_raw_username(post.raw, "codinghorror", "codingterror")).to eq(
+          <<~RAW.strip,
+          [quote="codingterror, post:1, topic:#{quoted_post.topic.id}"]
+          quoted post
+          [/quote]
+        RAW
+        )
+      end
+    end
+
+    context "when using the new quote format" do
+      let(:post_attributes) { { raw: <<~RAW } }
+            [quote="Jeff, post:1, topic:#{quoted_post.topic.id}, username:codinghorror"]
+            quoted post
+            [/quote]
+          RAW
+
+      it "rewrites the username" do
+        expect(quote_rewriter.rewrite_raw_username(post.raw, "codinghorror", "codingterror")).to eq(
+          <<~RAW.strip,
+          [quote="Jeff, post:1, topic:#{quoted_post.topic.id}, username:codingterror"]
+          quoted post
+          [/quote]
+        RAW
+        )
+      end
+    end
+  end
+
+  describe "#rewrite_raw_display_name" do
+    context "when using the old quote format" do
+      let(:post_attributes) { { raw: <<~RAW } }
+            [quote="codinghorror, post:1, topic:#{quoted_post.topic.id}"]
+            quoted post
+            [/quote]
+          RAW
+
+      it "does nothing because the username hasn't changed" do
+        expect(quote_rewriter.rewrite_raw_display_name(post.raw, "Jeff", "Mr. Atwood")).to eq(
+          <<~RAW.strip,
+          [quote="codinghorror, post:1, topic:#{quoted_post.topic.id}"]
+          quoted post
+          [/quote]
+        RAW
+        )
+      end
+    end
+
+    context "when using the new quote format" do
+      let(:post_attributes) { { raw: <<~RAW } }
+            [quote="Jeff, post:1, topic:#{quoted_post.topic.id}, username:codinghorror"]
+            quoted post
+            [/quote]
+          RAW
+
+      it "rewrites the display name" do
+        expect(quote_rewriter.rewrite_raw_display_name(post.raw, "Jeff", "Mr. Atwood")).to eq(
+          <<~RAW.strip,
+          [quote="Mr. Atwood, post:1, topic:#{quoted_post.topic.id}, username:codinghorror"]
+          quoted post
+          [/quote]
+        RAW
+        )
+      end
+    end
+  end
+
+  describe "#rewrite_cooked_display_name" do
+    let(:doc) { Nokogiri::HTML5.fragment(post.cooked) }
+
+    context "when using the old quote format" do
+      let(:post_attributes) { { raw: <<~RAW } }
+            [quote="codinghorror, post:1, topic:#{quoted_post.topic.id}"]
+            quoted post
+            [/quote]
+          RAW
+
+      it "does nothing because the display name is the username" do
+        expect(quote_rewriter.rewrite_cooked_display_name(doc, "Jeff", "Mr. Atwood").to_html).to eq(
+          post.cooked.strip,
+        )
+      end
+    end
+
+    context "when using the new quote format" do
+      let(:post_attributes) { { raw: <<~RAW } }
+            [quote="Jeff, post:1, topic:#{quoted_post.topic.id}, username:codinghorror"]
+            quoted post
+            [/quote]
+          RAW
+
+      it "rewrites the display name" do
+        expect(
+          quote_rewriter.rewrite_cooked_display_name(doc, "Jeff", "Mr. Atwood").to_html,
+        ).to match_html(<<~HTML.strip)
+          <aside class="quote no-group" data-username="codinghorror" data-post="1" data-topic="#{quoted_post.topic.id}">
+          <div class="title">
+          <div class="quote-controls"></div>
+          <img loading="lazy" alt="" width="24" height="24" src="#{avatar_url}" class="avatar"> Mr. Atwood:</div>
+          <blockquote>
+          <p>quoted post</p>
+          </blockquote>
+          </aside>
+        HTML
+      end
+    end
+  end
+end
diff --git a/spec/lib/retrieve_title_spec.rb b/spec/lib/retrieve_title_spec.rb
index 5afc01a0d7a..685696efb50 100644
--- a/spec/lib/retrieve_title_spec.rb
+++ b/spec/lib/retrieve_title_spec.rb
@@ -203,7 +203,7 @@ RSpec.describe RetrieveTitle do
     end
 
     it "ignores SSRF lookup errors" do
-      subject.stubs(:fetch_title).raises(FinalDestination::SSRFDetector::LookupFailedError)
+      described_class.stubs(:fetch_title).raises(FinalDestination::SSRFDetector::LookupFailedError)
 
       expect(RetrieveTitle.crawl("https://example.com")).to eq(nil)
     end
diff --git a/spec/lib/scheduler/defer_spec.rb b/spec/lib/scheduler/defer_spec.rb
index 67882c2a7ef..f886335fd2a 100644
--- a/spec/lib/scheduler/defer_spec.rb
+++ b/spec/lib/scheduler/defer_spec.rb
@@ -12,11 +12,41 @@ RSpec.describe Scheduler::Defer do
   end
 
   before do
+    Discourse.catch_job_exceptions!
     @defer = DeferInstance.new
     @defer.async = true
   end
 
-  after { @defer.stop! }
+  after do
+    @defer.stop!
+    Discourse.reset_catch_job_exceptions!
+  end
+
+  it "supports basic instrumentation" do
+    @defer.later("first") {}
+    @defer.later("first") {}
+    @defer.later("second") {}
+    @defer.later("bad") { raise "boom" }
+
+    wait_for(200) { @defer.length == 0 }
+
+    stats = Hash[@defer.stats]
+
+    expect(stats["first"][:queued]).to eq(2)
+    expect(stats["first"][:finished]).to eq(2)
+    expect(stats["first"][:errors]).to eq(0)
+    expect(stats["first"][:duration]).to be > 0
+
+    expect(stats["second"][:queued]).to eq(1)
+    expect(stats["second"][:finished]).to eq(1)
+    expect(stats["second"][:errors]).to eq(0)
+    expect(stats["second"][:duration]).to be > 0
+
+    expect(stats["bad"][:queued]).to eq(1)
+    expect(stats["bad"][:finished]).to eq(1)
+    expect(stats["bad"][:duration]).to be > 0
+    expect(stats["bad"][:errors]).to eq(1)
+  end
 
   it "supports timeout reporting" do
     @defer.timeout = 0.05
diff --git a/spec/lib/search_spec.rb b/spec/lib/search_spec.rb
index 01640a5f99b..7bb695c2781 100644
--- a/spec/lib/search_spec.rb
+++ b/spec/lib/search_spec.rb
@@ -113,32 +113,29 @@ RSpec.describe Search do
         expect(Search.execute("oeuvre").posts).to contain_exactly(post_2)
       end
     end
-  end
 
-  context "with apostrophes" do
-    fab!(:post_1) { Fabricate(:post, raw: "searching for: John's") }
-    fab!(:post_2) { Fabricate(:post, raw: "searching for: Johns") }
+    context "when search_ranking_weights site setting has been configured" do
+      fab!(:topic) { Fabricate(:topic, title: "Some random topic title start") }
+      fab!(:topic2) { Fabricate(:topic, title: "Some random topic title") }
+      fab!(:post1) { Fabricate(:post, raw: "start", topic: topic) }
+      fab!(:post2) { Fabricate(:post, raw: "#{"start " * 100}", topic: topic2) }
 
-    before { SearchIndexer.enable }
+      before do
+        SearchIndexer.enable
+        SiteSetting.max_duplicate_search_index_terms = -1
+        SiteSetting.prioritize_exact_search_title_match = false
+        [post1, post2].each { |post| SearchIndexer.index(post, force: true) }
+      end
 
-    after { SearchIndexer.disable }
+      after { SearchIndexer.disable }
 
-    it "returns correct results" do
-      SiteSetting.search_ignore_accents = false
-      [post_1, post_2].each { |post| SearchIndexer.index(post.topic, force: true) }
+      it "should apply the custom ranking weights correctly" do
+        expect(Search.execute("start").posts).to eq([post2, post1])
 
-      expect(Search.execute("John's").posts).to contain_exactly(post_1, post_2)
-      expect(Search.execute("John’s").posts).to contain_exactly(post_1, post_2)
-      expect(Search.execute("Johns").posts).to contain_exactly(post_1, post_2)
-    end
+        SiteSetting.search_ranking_weights = "{0.00001,0.2,0.4,1.0}"
 
-    it "returns correct results with accents" do
-      SiteSetting.search_ignore_accents = true
-      [post_1, post_2].each { |post| SearchIndexer.index(post.topic, force: true) }
-
-      expect(Search.execute("John's").posts).to contain_exactly(post_1, post_2)
-      expect(Search.execute("John’s").posts).to contain_exactly(post_1, post_2)
-      expect(Search.execute("Johns").posts).to contain_exactly(post_1, post_2)
+        expect(Search.execute("start").posts).to eq([post1, post2])
+      end
     end
   end
 
@@ -723,7 +720,7 @@ RSpec.describe Search do
         end
 
         it "returns nothing if user is not a group member" do
-          pm = create_pm(users: [current, participant], group: group)
+          _pm = create_pm(users: [current, participant], group: group)
 
           results =
             Search.execute("group_messages:#{group.name}", guardian: Guardian.new(non_participant))
@@ -735,7 +732,7 @@ RSpec.describe Search do
         end
 
         it "returns nothing if group has messages disabled" do
-          pm = create_pm(users: [current, participant], group: group)
+          _pm = create_pm(users: [current, participant], group: group)
           group.update!(has_messages: false)
 
           results = Search.execute("group_messages:#{group.name}", guardian: Guardian.new(current))
@@ -897,7 +894,7 @@ RSpec.describe Search do
       result = Search.execute("search term")
 
       expect(result.posts.first.topic_title_headline).to eq(<<~HTML.chomp)
-      Very very very very very very very long topic title with our <span class=\"#{Search::HIGHLIGHT_CSS_CLASS}\">search</span> <span class=\"#{Search::HIGHLIGHT_CSS_CLASS}\">term</span> in the middle of the title
+        Very very very very very very very long topic title with our <span class=\"#{Search::HIGHLIGHT_CSS_CLASS}\">search</span> <span class=\"#{Search::HIGHLIGHT_CSS_CLASS}\">term</span> in the middle of the title
       HTML
     end
 
@@ -926,15 +923,23 @@ RSpec.describe Search do
       expect(result.blurb(result.posts.first)).to eq(expected_blurb)
     end
 
-    it "applies a small penalty to closed topic when ranking" do
-      post =
+    it "applies a small penalty to closed topics and archived topics when ranking" do
+      archived_post =
+        Fabricate(
+          :post,
+          raw: "My weekly update",
+          topic:
+            Fabricate(:topic, title: "A topic that will be archived", archived: true, closed: true),
+        )
+
+      closed_post =
         Fabricate(
           :post,
           raw: "My weekly update",
           topic: Fabricate(:topic, title: "A topic that will be closed", closed: true),
         )
 
-      post2 =
+      open_post =
         Fabricate(
           :post,
           raw: "My weekly update",
@@ -942,12 +947,24 @@ RSpec.describe Search do
         )
 
       result = Search.execute("weekly update")
-      expect(result.posts.pluck(:id)).to eq([post2.id, post.id])
+      expect(result.posts.pluck(:id)).to eq([open_post.id, closed_post.id, archived_post.id])
+    end
+
+    it "can find posts by searching for a url prefix" do
+      post = Fabricate(:post, raw: "checkout the amazing domain https://happy.sappy.com")
+
+      results = Search.execute("happy")
+      expect(results.posts.count).to eq(1)
+      expect(results.posts.first.id).to eq(post.id)
+
+      results = Search.execute("sappy")
+      expect(results.posts.count).to eq(1)
+      expect(results.posts.first.id).to eq(post.id)
     end
 
     it "aggregates searches in a topic by returning the post with the lowest post number" do
       post = Fabricate(:post, topic: topic, raw: "this is a play post")
-      post2 = Fabricate(:post, topic: topic, raw: "play play playing played play")
+      _post2 = Fabricate(:post, topic: topic, raw: "play play playing played play")
       post3 = Fabricate(:post, raw: "this is a play post")
 
       5.times { Fabricate(:post, topic: topic, raw: "play playing played") }
@@ -1315,8 +1332,32 @@ RSpec.describe Search do
       end
 
       context "with non staff logged in" do
-        it "shows doesn’t show group" do
-          expect(search.groups.map(&:name)).to be_empty
+        fab!(:user) { Fabricate(:user) }
+
+        it "shows doesn't show group" do
+          expect(search(user).groups.map(&:name)).to eq([])
+        end
+      end
+    end
+
+    context "with registered plugin callbacks" do
+      let!(:group) { Fabricate(:group, name: "plugin-special") }
+
+      context "when :search_groups_set_query_callback is registered" do
+        it "changes the search results" do
+          # initial result (without applying the plugin callback )
+          expect(search.groups.map(&:name).include?("plugin-special")).to eq(true)
+
+          DiscoursePluginRegistry.register_search_groups_set_query_callback(
+            Proc.new { |query, term, guardian| query.where.not(name: "plugin-special") },
+            Plugin::Instance.new,
+          )
+
+          # after using the callback we expect the search result to be changed because the
+          # query was altered
+          expect(search.groups.map(&:name).include?("plugin-special")).to eq(false)
+
+          DiscoursePluginRegistry.reset_register!(:search_groups_set_query_callbacks)
         end
       end
     end
@@ -1617,7 +1658,7 @@ RSpec.describe Search do
 
       it "can filter by posts in the user's bookmarks" do
         expect(search_with_bookmarks.posts.map(&:id)).to eq([])
-        bm = Fabricate(:bookmark, user: user, bookmarkable: bookmark_post1)
+        Fabricate(:bookmark, user: user, bookmarkable: bookmark_post1)
         expect(search_with_bookmarks.posts.map(&:id)).to match_array([bookmark_post1.id])
       end
     end
@@ -1780,6 +1821,31 @@ RSpec.describe Search do
           Search.execute("group:#{group.id}", guardian: Guardian.new(user)).posts,
         ).to contain_exactly(post)
       end
+
+      context "with registered plugin callbacks" do
+        context "when :search_groups_set_query_callback is registered" do
+          it "changes the search results" do
+            group.update!(
+              visibility_level: Group.visibility_levels[:public],
+              members_visibility_level: Group.visibility_levels[:public],
+            )
+
+            # initial result (without applying the plugin callback )
+            expect(Search.execute("group:like_a_boss").posts).to contain_exactly(post)
+
+            DiscoursePluginRegistry.register_search_groups_set_query_callback(
+              Proc.new { |query, term, guardian| query.where.not(name: "Like_a_Boss") },
+              Plugin::Instance.new,
+            )
+
+            # after using the callback we expect the search result to be changed because the
+            # query was altered
+            expect(Search.execute("group:like_a_boss").posts).to be_blank
+
+            DiscoursePluginRegistry.reset_register!(:search_groups_set_query_callbacks)
+          end
+        end
+      end
     end
 
     it "supports badge" do
@@ -1808,7 +1874,7 @@ RSpec.describe Search do
         )
       post2 = Fabricate(:post, raw: "test URL post with")
 
-      expect(Search.execute("test post with 'a URL).posts").posts).to eq([post2, post])
+      expect(Search.execute("test post URL l").posts).to eq([post2, post])
       expect(Search.execute(%{"test post with 'a URL"}).posts).to eq([post])
       expect(Search.execute(%{"https://some.site.com/search?q=test.test.test"}).posts).to eq([post])
       expect(
@@ -1936,6 +2002,17 @@ RSpec.describe Search do
       expect(Search.execute("l sam").posts.map(&:id)).to eq([post2.id, post1.id])
     end
 
+    it "can find by oldest" do
+      topic1 = Fabricate(:topic, title: "I do not like that Sam I am")
+      post1 = Fabricate(:post, topic: topic1, raw: "sam is a sam sam sam") # score higher
+
+      topic2 = Fabricate(:topic, title: "I do not like that Sam I am 2", created_at: 5.minutes.ago)
+      post2 = Fabricate(:post, topic: topic2, created_at: 5.minutes.ago)
+
+      expect(Search.execute("sam").posts.map(&:id)).to eq([post1.id, post2.id])
+      expect(Search.execute("sam ORDER:oldest").posts.map(&:id)).to eq([post2.id, post1.id])
+    end
+
     it "can order by topic creation" do
       today = Date.today
       yesterday = 1.day.ago
@@ -1973,6 +2050,13 @@ RSpec.describe Search do
       expect(Search.execute("Topic order:latest_topic").posts.map(&:id)).to eq(
         [category.topic.first_post.id, latest_irrelevant_topic_post.id, old_relevant_topic_post.id],
       )
+
+      # push weight to the front to ensure test is correct and is not just a coincidence
+      latest_irrelevant_topic_post.update!(raw: "Topic Topic Topic")
+
+      expect(Search.execute("Topic order:oldest_topic").posts.map(&:id)).to eq(
+        [old_relevant_topic_post.id, latest_irrelevant_topic_post.id, category.topic.first_post.id],
+      )
     end
 
     it "can order by topic views" do
@@ -2243,11 +2327,11 @@ RSpec.describe Search do
 
     it "escapes the term correctly" do
       expect(Search.ts_query(term: 'Title with trailing backslash\\')).to eq(
-        "TO_TSQUERY('english', '''Title with trailing backslash\\\\\\\\'':*')",
+        "REPLACE(TO_TSQUERY('english', '''Title with trailing backslash\\\\\\\\'':*')::text, '<->', '&')::tsquery",
       )
 
       expect(Search.ts_query(term: "Title with trailing quote'")).to eq(
-        "TO_TSQUERY('english', '''Title with trailing quote'''''':*')",
+        "REPLACE(TO_TSQUERY('english', '''Title with trailing quote'''''':*')::text, '<->', '&')::tsquery",
       )
     end
   end
@@ -2356,7 +2440,7 @@ RSpec.describe Search do
       expect(results.posts.length).to eq(1)
 
       # TODO: this is a test we need to fix!
-      #expect(results.blurb(results.posts.first)).to include('Rágis')
+      # expect(results.blurb(results.posts.first)).to include('Rágis')
 
       results = Search.execute("สวัสดี", type_filter: "topic")
       expect(results.posts.length).to eq(1)
@@ -2422,7 +2506,7 @@ RSpec.describe Search do
       expect(results.posts.length).to eq(Search.per_facet)
       expect(results.more_posts).to eq(nil) # not 6 posts yet
 
-      post6 = Fabricate(:post, raw: "hello post #6")
+      _post6 = Fabricate(:post, raw: "hello post #6")
 
       results = Search.execute("hello", search_type: :header)
       expect(results.posts.length).to eq(Search.per_facet)
@@ -2534,4 +2618,122 @@ RSpec.describe Search do
       expect(result.categories.length).to eq(0)
     end
   end
+
+  context "when prioritize_exact_search_match is enabled" do
+    before { SearchIndexer.enable }
+
+    after { SearchIndexer.disable }
+
+    it "correctly ranks topics" do
+      SiteSetting.prioritize_exact_search_title_match = true
+
+      topic1 = Fabricate(:topic, title: "saml saml saml is the best")
+      post1 = Fabricate(:post, topic: topic1, raw: "this topic is a story about saml")
+
+      topic2 = Fabricate(:topic, title: "sam has ideas about lots of things")
+      post2 = Fabricate(:post, topic: topic2, raw: "this topic is not about saml saml saml")
+
+      topic3 = Fabricate(:topic, title: "jane has ideas about lots of things")
+      post3 = Fabricate(:post, topic: topic3, raw: "sam sam sam sam lets add sams")
+
+      SearchIndexer.index(post1, force: true)
+      SearchIndexer.index(post2, force: true)
+      SearchIndexer.index(post3, force: true)
+
+      result = Search.execute("sam")
+      expect(result.posts.length).to eq(3)
+
+      # title match should win cause we limited duplication
+      expect(result.posts.pluck(:id)).to eq([post2.id, post1.id, post3.id])
+    end
+  end
+
+  context "when plugin introduces a search_rank_sort_priorities modifier" do
+    before do
+      SearchIndexer.enable
+      DiscoursePluginRegistry.clear_modifiers!
+    end
+    after do
+      SearchIndexer.disable
+
+      DiscoursePluginRegistry.clear_modifiers!
+    end
+
+    it "allow modifying the search rank" do
+      plugin = Plugin::Instance.new
+      plugin.register_modifier(:search_rank_sort_priorities) do |ranks, search|
+        [["topics.closed", 77]]
+      end
+
+      closed_topic = Fabricate(:topic, title: "saml saml saml is the best", closed: true)
+      closed_post = Fabricate(:post, topic: closed_topic, raw: "this topic is a story about saml")
+
+      open_topic = Fabricate(:topic, title: "saml saml saml is the best2")
+      open_post = Fabricate(:post, topic: open_topic, raw: "this topic is a story about saml")
+
+      result = Search.execute("story")
+      expect(result.posts.pluck(:id)).to eq([closed_post.id, open_post.id])
+    end
+  end
+
+  context "when some categories are prioritized" do
+    before { SearchIndexer.enable }
+    after { SearchIndexer.disable }
+
+    it "correctly ranks topics with prioritized categories and stuffed topic terms" do
+      topic1 = Fabricate(:topic, title: "invite invited invites testing stuff with things")
+      post1 =
+        Fabricate(
+          :post,
+          topic: topic1,
+          raw: "this topic is a story about some person invites are fun",
+        )
+
+      category = Fabricate(:category, search_priority: Searchable::PRIORITIES[:high])
+
+      topic2 = Fabricate(:topic, title: "invite is the bestest", category: category)
+      post2 =
+        Fabricate(
+          :post,
+          topic: topic2,
+          raw: "this topic is a story about some other person invites are fun",
+        )
+
+      result = Search.execute("invite")
+      expect(result.posts.length).to eq(2)
+
+      # title match should win cause we limited duplication
+      expect(result.posts.pluck(:id)).to eq([post2.id, post1.id])
+    end
+  end
+
+  context "when max_duplicate_search_index_terms limits duplication" do
+    before { SearchIndexer.enable }
+
+    after { SearchIndexer.disable }
+
+    it "correctly ranks topics" do
+      SiteSetting.max_duplicate_search_index_terms = 5
+
+      topic1 = Fabricate(:topic, title: "this is a topic about sam")
+      post1 = Fabricate(:post, topic: topic1, raw: "this topic is a story about some person")
+
+      topic2 = Fabricate(:topic, title: "this is a topic about bob")
+      post2 =
+        Fabricate(
+          :post,
+          topic: topic2,
+          raw: "this topic is a story about some person #{"sam " * 100}",
+        )
+
+      SearchIndexer.index(post1, force: true)
+      SearchIndexer.index(post2, force: true)
+
+      result = Search.execute("sam")
+      expect(result.posts.length).to eq(2)
+
+      # title match should win cause we limited duplication
+      expect(result.posts.pluck(:id)).to eq([post1.id, post2.id])
+    end
+  end
 end
diff --git a/spec/lib/seed_data/categories_spec.rb b/spec/lib/seed_data/categories_spec.rb
index dd52520af22..fa92fbe12a3 100644
--- a/spec/lib/seed_data/categories_spec.rb
+++ b/spec/lib/seed_data/categories_spec.rb
@@ -3,10 +3,10 @@
 require "seed_data/categories"
 
 RSpec.describe SeedData::Categories do
-  subject { SeedData::Categories.with_default_locale }
+  subject(:seeder) { SeedData::Categories.with_default_locale }
 
   def create_category(name = "staff_category_id")
-    subject.create(site_setting_names: [name])
+    seeder.create(site_setting_names: [name])
   end
 
   def description_post(category)
@@ -118,14 +118,14 @@ RSpec.describe SeedData::Categories do
       expect(category.category_groups.first).to have_attributes(permissions(:staff, :full))
     end
 
-    it "adds default categories SiteSetting.default_sidebar_categories" do
+    it "adds default categories SiteSetting.default_navigation_menu_categories" do
       create_category("staff_category_id")
       staff_category = Category.last
       create_category("meta_category_id")
       site_feedback_category = Category.last
       create_category("general_category_id")
       general_category = Category.last
-      site_setting_ids = SiteSetting.default_sidebar_categories.split("|")
+      site_setting_ids = SiteSetting.default_navigation_menu_categories.split("|")
       create_category("uncategorized_category_id")
 
       expect(site_setting_ids[0].to_i).to eq(staff_category.id)
@@ -152,7 +152,7 @@ RSpec.describe SeedData::Categories do
 
   describe "#update" do
     def update_category(name = "staff_category_id", skip_changed: false)
-      subject.update(site_setting_names: [name], skip_changed: skip_changed)
+      seeder.update(site_setting_names: [name], skip_changed: skip_changed)
     end
 
     before do
@@ -211,7 +211,7 @@ RSpec.describe SeedData::Categories do
         { id: "general_category_id", name: I18n.t("general_category_name"), selected: false },
       ]
 
-      expect(subject.reseed_options).to eq(expected_options)
+      expect(seeder.reseed_options).to eq(expected_options)
     end
   end
 end
diff --git a/spec/lib/seed_data/topics_spec.rb b/spec/lib/seed_data/topics_spec.rb
index 581ecc10273..afea102617b 100644
--- a/spec/lib/seed_data/topics_spec.rb
+++ b/spec/lib/seed_data/topics_spec.rb
@@ -3,7 +3,7 @@
 require "seed_data/topics"
 
 RSpec.describe SeedData::Topics do
-  subject { SeedData::Topics.with_default_locale }
+  subject(:seeder) { SeedData::Topics.with_default_locale }
 
   before do
     general_category = Fabricate(:category, name: "General")
@@ -11,7 +11,7 @@ RSpec.describe SeedData::Topics do
   end
 
   def create_topic(name = "welcome_topic_id")
-    subject.create(site_setting_names: [name])
+    seeder.create(site_setting_names: [name], include_legal_topics: true)
   end
 
   describe "#create" do
@@ -19,9 +19,17 @@ RSpec.describe SeedData::Topics do
       expect { create_topic }.to change { Topic.count }.by(1).and change { Post.count }.by(1)
 
       topic = Topic.last
-      expect(topic.title).to eq(I18n.t("discourse_welcome_topic.title"))
+      expect(topic.title).to eq(
+        I18n.t("discourse_welcome_topic.title", site_title: SiteSetting.title),
+      )
       expect(topic.first_post.raw).to eq(
-        I18n.t("discourse_welcome_topic.body", base_path: Discourse.base_path).rstrip,
+        I18n.t(
+          "discourse_welcome_topic.body",
+          base_path: Discourse.base_path,
+          site_title: SiteSetting.title,
+          site_description: SiteSetting.site_description,
+          site_info_quote: "",
+        ).rstrip,
       )
       expect(topic.category_id).to eq(SiteSetting.general_category_id)
       expect(topic.user_id).to eq(Discourse::SYSTEM_USER_ID)
@@ -64,11 +72,45 @@ RSpec.describe SeedData::Topics do
 
       expect { create_topic }.to_not change { Topic.count }
     end
+
+    it "does not create a legal topic if company_name is not set" do
+      seeder.create(site_setting_names: ["tos_topic_id"])
+
+      expect(SiteSetting.tos_topic_id).to eq(-1)
+    end
+
+    it "creates a welcome topic without site title" do
+      SiteSetting.title = "My Awesome Community"
+      SiteSetting.site_description = ""
+
+      create_topic
+
+      post = Post.find_by(topic_id: SiteSetting.welcome_topic_id, post_number: 1)
+      expect(post.raw).not_to include("> ## My Awesome Community")
+    end
+
+    it "creates a welcome topic with site title and description" do
+      SiteSetting.title = "My Awesome Community"
+      SiteSetting.site_description = "The best community"
+
+      create_topic
+
+      post = Post.find_by(topic_id: SiteSetting.welcome_topic_id, post_number: 1)
+      expect(post.raw).to include("> ## My Awesome Community")
+      expect(post.raw).to include("> The best community")
+    end
+
+    it "creates a legal topic if company_name is set" do
+      SiteSetting.company_name = "Company Name"
+      seeder.create(site_setting_names: ["tos_topic_id"])
+
+      expect(SiteSetting.tos_topic_id).to_not eq(-1)
+    end
   end
 
   describe "#update" do
     def update_topic(name = "welcome_topic_id", skip_changed: false)
-      subject.update(site_setting_names: [name], skip_changed: skip_changed)
+      seeder.update(site_setting_names: [name], skip_changed: skip_changed)
     end
 
     it "updates the changed topic" do
@@ -81,9 +123,17 @@ RSpec.describe SeedData::Topics do
       update_topic
       topic.reload
 
-      expect(topic.title).to eq(I18n.t("discourse_welcome_topic.title"))
+      expect(topic.title).to eq(
+        I18n.t("discourse_welcome_topic.title", site_title: SiteSetting.title),
+      )
       expect(topic.first_post.raw).to eq(
-        I18n.t("discourse_welcome_topic.body", base_path: Discourse.base_path).rstrip,
+        I18n.t(
+          "discourse_welcome_topic.body",
+          base_path: Discourse.base_path,
+          site_title: SiteSetting.title,
+          site_description: SiteSetting.site_description,
+          site_info_quote: "",
+        ).rstrip,
       )
     end
 
@@ -115,6 +165,29 @@ RSpec.describe SeedData::Topics do
     end
   end
 
+  describe "#delete" do
+    def delete_topic(name = "welcome_topic_id", skip_changed: false)
+      seeder.delete(site_setting_names: [name], skip_changed: skip_changed)
+    end
+
+    it "deletes the topic" do
+      create_topic
+
+      topic = Topic.last
+
+      expect { delete_topic }.to change { Topic.count }.by(-1)
+    end
+
+    it "does not delete the topic if changed" do
+      create_topic
+
+      topic = Topic.last
+      topic.first_post.revise(Fabricate(:admin), raw: "New text of first post.")
+
+      expect { delete_topic(skip_changed: true) }.not_to change { Topic.count }
+    end
+  end
+
   describe "#reseed_options" do
     it "returns only existing topics as options" do
       create_topic("guidelines_topic_id")
@@ -126,7 +199,7 @@ RSpec.describe SeedData::Topics do
         { id: "welcome_topic_id", name: "Changed Topic Title", selected: false },
       ]
 
-      expect(subject.reseed_options).to eq(expected_options)
+      expect(seeder.reseed_options).to eq(expected_options)
     end
   end
 end
diff --git a/spec/lib/sidebar_section_links_updater_spec.rb b/spec/lib/sidebar_section_links_updater_spec.rb
index e9c54d0e250..a0be7e5c3de 100644
--- a/spec/lib/sidebar_section_links_updater_spec.rb
+++ b/spec/lib/sidebar_section_links_updater_spec.rb
@@ -7,12 +7,11 @@ RSpec.describe SidebarSectionLinksUpdater do
   describe ".update_category_section_links" do
     fab!(:public_category) { Fabricate(:category) }
     fab!(:public_category2) { Fabricate(:category) }
-    fab!(:group) { Fabricate(:group) }
-    fab!(:secured_category) { Fabricate(:private_category, group: group) }
 
     fab!(:user_category_section_link) do
       Fabricate(:category_sidebar_section_link, linkable: public_category, user: user)
     end
+
     fab!(:user2_category_section_link) do
       Fabricate(:category_sidebar_section_link, linkable: public_category, user: user2)
     end
@@ -24,71 +23,49 @@ RSpec.describe SidebarSectionLinksUpdater do
       expect(SidebarSectionLink.exists?(linkable: public_category, user: user2)).to eq(true)
     end
 
-    it "updates user's sidebar category section link records to given category ids except for category restricted to user" do
+    it "updates user's sidebar category section link records to given category ids" do
       expect(
         SidebarSectionLink.where(linkable_type: "Category", user: user).pluck(:linkable_id),
       ).to contain_exactly(public_category.id)
 
       described_class.update_category_section_links(
         user,
-        category_ids: [public_category2.id, secured_category.id],
+        category_ids: [public_category.id, public_category2.id],
       )
 
       expect(
         SidebarSectionLink.where(linkable_type: "Category", user: user).pluck(:linkable_id),
-      ).to contain_exactly(public_category2.id)
-
-      group.add(user)
-
-      described_class.update_category_section_links(
-        user,
-        category_ids: [public_category2.id, secured_category.id],
-      )
-
-      expect(
-        SidebarSectionLink.where(linkable_type: "Category", user: user).pluck(:linkable_id),
-      ).to contain_exactly(public_category2.id, secured_category.id)
+      ).to contain_exactly(public_category.id, public_category2.id)
     end
   end
 
   describe ".update_tag_section_links" do
     fab!(:tag) { Fabricate(:tag) }
     fab!(:tag2) { Fabricate(:tag) }
-    fab!(:hidden_tag) { Fabricate(:tag) }
-    fab!(:staff_tag_group) do
-      Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name])
-    end
 
     fab!(:user_tag_section_link) { Fabricate(:tag_sidebar_section_link, linkable: tag, user: user) }
+
     fab!(:user2_tag_section_link) do
       Fabricate(:tag_sidebar_section_link, linkable: tag, user: user2)
     end
 
     it "deletes all sidebar tag section links when tag names provided is blank" do
-      described_class.update_tag_section_links(user, tag_names: [])
+      described_class.update_tag_section_links(user, tag_ids: [])
 
       expect(SidebarSectionLink.exists?(linkable: tag, user: user)).to eq(false)
       expect(SidebarSectionLink.exists?(linkable: tag, user: user2)).to eq(true)
     end
 
-    it "updates user's sidebar tag section link records to given tag names except for tags not visible to user" do
+    it "updates user's sidebar tag section link records to given tag names" do
       expect(
         SidebarSectionLink.where(linkable_type: "Tag", user: user).pluck(:linkable_id),
       ).to contain_exactly(tag.id)
 
-      described_class.update_tag_section_links(user, tag_names: [tag2.name, hidden_tag.name])
+      described_class.update_tag_section_links(user, tag_ids: [tag.id, tag2.id])
 
       expect(
         SidebarSectionLink.where(linkable_type: "Tag", user: user).pluck(:linkable_id),
-      ).to contain_exactly(tag2.id)
-
-      user.update!(admin: true)
-
-      described_class.update_tag_section_links(user, tag_names: [tag2.name, hidden_tag.name])
-
-      expect(
-        SidebarSectionLink.where(linkable_type: "Tag", user: user).pluck(:linkable_id),
-      ).to contain_exactly(tag2.id, hidden_tag.id)
+      ).to contain_exactly(tag.id, tag2.id)
     end
   end
 end
diff --git a/spec/lib/site_setting_extension_spec.rb b/spec/lib/site_setting_extension_spec.rb
index d1e84a032fa..15093f33b7c 100644
--- a/spec/lib/site_setting_extension_spec.rb
+++ b/spec/lib/site_setting_extension_spec.rb
@@ -178,6 +178,34 @@ RSpec.describe SiteSettingExtension do
     end
   end
 
+  describe "DiscourseEvent for login_required changed to true" do
+    before do
+      SiteSetting.login_required = false
+      SiteSetting.bootstrap_mode_min_users = 50
+      SiteSetting.bootstrap_mode_enabled = true
+    end
+
+    it "lowers bootstrap mode min users for private sites" do
+      SiteSetting.login_required = true
+
+      expect(SiteSetting.bootstrap_mode_min_users).to eq(10)
+    end
+  end
+
+  describe "DiscourseEvent for login_required changed to false" do
+    before do
+      SiteSetting.login_required = true
+      SiteSetting.bootstrap_mode_min_users = 50
+      SiteSetting.bootstrap_mode_enabled = true
+    end
+
+    it "resets bootstrap mode min users for public sites" do
+      SiteSetting.login_required = false
+
+      expect(SiteSetting.bootstrap_mode_min_users).to eq(50)
+    end
+  end
+
   describe "int setting" do
     before do
       settings.setting(:test_setting, 77)
@@ -825,4 +853,36 @@ RSpec.describe SiteSettingExtension do
       end
     end
   end
+
+  describe "_map extension for list settings" do
+    it "handles splitting group_list settings" do
+      SiteSetting.personal_message_enabled_groups = "1|2"
+      expect(SiteSetting.personal_message_enabled_groups_map).to eq([1, 2])
+    end
+
+    it "handles splitting compact list settings" do
+      SiteSetting.markdown_linkify_tlds = "com|net"
+      expect(SiteSetting.markdown_linkify_tlds_map).to eq(%w[com net])
+    end
+
+    it "handles splitting simple list settings" do
+      SiteSetting.ga_universal_auto_link_domains = "test.com|xy.com"
+      expect(SiteSetting.ga_universal_auto_link_domains_map).to eq(%w[test.com xy.com])
+    end
+
+    it "does not handle splitting secret list settings" do
+      SiteSetting.discourse_connect_provider_secrets = "test|secret1\ntest2|secret2"
+      expect(SiteSetting.respond_to?(:discourse_connect_provider_secrets_map)).to eq(false)
+    end
+
+    it "handles null values for settings" do
+      SiteSetting.ga_universal_auto_link_domains = nil
+      SiteSetting.pm_tags_allowed_for_groups = nil
+      SiteSetting.exclude_rel_nofollow_domains = nil
+
+      expect(SiteSetting.ga_universal_auto_link_domains_map).to eq([])
+      expect(SiteSetting.pm_tags_allowed_for_groups_map).to eq([])
+      expect(SiteSetting.exclude_rel_nofollow_domains_map).to eq([])
+    end
+  end
 end
diff --git a/spec/lib/site_settings/defaults_provider_spec.rb b/spec/lib/site_settings/defaults_provider_spec.rb
index eeb7c42e927..22c9a22dea6 100644
--- a/spec/lib/site_settings/defaults_provider_spec.rb
+++ b/spec/lib/site_settings/defaults_provider_spec.rb
@@ -128,4 +128,27 @@ RSpec.describe SiteSettings::DefaultsProvider do
       expect(settings.defaults.has_setting?("question")).to be_truthy
     end
   end
+
+  describe "plugin modifier" do
+    before { settings.setting(:my_setting, "defaultval") }
+
+    class TestFilterPlugInstance < Plugin::Instance
+    end
+
+    let(:plugin_instance) { TestFilterPlugInstance.new }
+
+    it "can change defaults" do
+      expect(settings.defaults.get(:my_setting)).to eq "defaultval"
+      expect(settings.defaults.all[:my_setting]).to eq "defaultval"
+
+      plugin_instance.register_modifier(:site_setting_defaults) do |defaults|
+        defaults.merge({ my_setting: "overridden default" })
+      end
+
+      expect(settings.defaults.get(:my_setting)).to eq "overridden default"
+      expect(settings.defaults.all[:my_setting]).to eq "overridden default"
+    ensure
+      DiscoursePluginRegistry.reset!
+    end
+  end
 end
diff --git a/spec/lib/site_settings/type_supervisor_spec.rb b/spec/lib/site_settings/type_supervisor_spec.rb
index 59400f49207..b1d416c18d6 100644
--- a/spec/lib/site_settings/type_supervisor_spec.rb
+++ b/spec/lib/site_settings/type_supervisor_spec.rb
@@ -9,8 +9,6 @@ RSpec.describe SiteSettings::TypeSupervisor do
     new_settings(provider_local)
   end
 
-  subject { SiteSettings::TypeSupervisor }
-
   describe "constants" do
     it "validator opts are the subset of consumed opts" do
       expect(
@@ -95,38 +93,41 @@ RSpec.describe SiteSettings::TypeSupervisor do
       it "'emoji_list' should be at the right position" do
         expect(SiteSettings::TypeSupervisor.types[:emoji_list]).to eq(24)
       end
+      it "'tag_group_list' should be at the right position" do
+        expect(SiteSettings::TypeSupervisor.types[:tag_group_list]).to eq(26)
+      end
     end
   end
 
   describe "#parse_value_type" do
     it "returns :null type when the value is nil" do
-      expect(subject.parse_value_type(nil)).to eq(SiteSetting.types[:null])
+      expect(described_class.parse_value_type(nil)).to eq(SiteSetting.types[:null])
     end
 
     it "returns :integer type when the value is int" do
-      expect(subject.parse_value_type(2)).to eq(SiteSetting.types[:integer])
+      expect(described_class.parse_value_type(2)).to eq(SiteSetting.types[:integer])
     end
 
     it "returns :integer type when the value is large int" do
-      expect(subject.parse_value_type(99_999_999_999_999_999_999_999_999_999_999_999)).to eq(
-        SiteSetting.types[:integer],
-      )
+      expect(
+        described_class.parse_value_type(99_999_999_999_999_999_999_999_999_999_999_999),
+      ).to eq(SiteSetting.types[:integer])
     end
 
     it "returns :float type when the value is float" do
-      expect(subject.parse_value_type(1.23)).to eq(SiteSetting.types[:float])
+      expect(described_class.parse_value_type(1.23)).to eq(SiteSetting.types[:float])
     end
 
     it "returns :bool type when the value is true" do
-      expect(subject.parse_value_type(true)).to eq(SiteSetting.types[:bool])
+      expect(described_class.parse_value_type(true)).to eq(SiteSetting.types[:bool])
     end
 
     it "returns :bool type when the value is false" do
-      expect(subject.parse_value_type(false)).to eq(SiteSetting.types[:bool])
+      expect(described_class.parse_value_type(false)).to eq(SiteSetting.types[:bool])
     end
 
     it "raises when the value is not listed" do
-      expect { subject.parse_value_type(Object.new) }.to raise_error ArgumentError
+      expect { described_class.parse_value_type(Object.new) }.to raise_error ArgumentError
     end
   end
 
diff --git a/spec/lib/site_settings/validations_spec.rb b/spec/lib/site_settings/validations_spec.rb
index fea8230d8c6..2b6e392c547 100644
--- a/spec/lib/site_settings/validations_spec.rb
+++ b/spec/lib/site_settings/validations_spec.rb
@@ -3,22 +3,24 @@
 require "site_settings/validations"
 
 RSpec.describe SiteSettings::Validations do
-  subject { Class.new.include(described_class).new }
+  subject(:validations) { Class.new.include(described_class).new }
 
   describe "default_categories" do
     fab!(:category) { Fabricate(:category) }
 
     it "supports valid categories" do
-      expect { subject.validate_default_categories_watching("#{category.id}") }.not_to raise_error
+      expect {
+        validations.validate_default_categories_watching("#{category.id}")
+      }.not_to raise_error
     end
 
     it "won't allow you to input junk categories" do
-      expect { subject.validate_default_categories_watching("junk") }.to raise_error(
+      expect { validations.validate_default_categories_watching("junk") }.to raise_error(
         Discourse::InvalidParameters,
       )
 
       expect {
-        subject.validate_default_categories_watching("#{category.id}|12312323")
+        validations.validate_default_categories_watching("#{category.id}|12312323")
       }.to raise_error(Discourse::InvalidParameters)
     end
 
@@ -28,6 +30,10 @@ RSpec.describe SiteSettings::Validations do
       expect { SiteSetting.default_categories_tracking = "#{category.id}" }.to raise_error(
         Discourse::InvalidParameters,
       )
+
+      expect { SiteSetting.default_categories_normal = "#{category.id}" }.to raise_error(
+        Discourse::InvalidParameters,
+      )
     end
   end
 
@@ -81,7 +87,7 @@ RSpec.describe SiteSettings::Validations do
       let(:other_setting_name) { "s3_upload_bucket" }
 
       def validate(new_value)
-        subject.validate_s3_backup_bucket(new_value)
+        validations.validate_s3_backup_bucket(new_value)
       end
 
       it_behaves_like "s3 bucket validation"
@@ -99,7 +105,7 @@ RSpec.describe SiteSettings::Validations do
       let(:other_setting_name) { "s3_backup_bucket" }
 
       def validate(new_value)
-        subject.validate_s3_upload_bucket(new_value)
+        validations.validate_s3_upload_bucket(new_value)
       end
 
       it_behaves_like "s3 bucket validation"
@@ -138,7 +144,7 @@ RSpec.describe SiteSettings::Validations do
         before { SiteSetting.enable_local_logins = false }
 
         it "should raise an error" do
-          expect { subject.validate_enforce_second_factor("t") }.to raise_error(
+          expect { validations.validate_enforce_second_factor("t") }.to raise_error(
             Discourse::InvalidParameters,
             error_message,
           )
@@ -149,7 +155,7 @@ RSpec.describe SiteSettings::Validations do
         before { SiteSetting.enable_local_logins = true }
 
         it "should be ok" do
-          expect { subject.validate_enforce_second_factor("t") }.not_to raise_error
+          expect { validations.validate_enforce_second_factor("t") }.not_to raise_error
         end
       end
 
@@ -166,7 +172,7 @@ RSpec.describe SiteSettings::Validations do
         end
 
         it "raises and error, and specifies the auth providers" do
-          expect { subject.validate_enforce_second_factor("all") }.to raise_error(
+          expect { validations.validate_enforce_second_factor("all") }.to raise_error(
             Discourse::InvalidParameters,
             error_message,
           )
@@ -185,7 +191,7 @@ RSpec.describe SiteSettings::Validations do
         end
 
         it "should raise an error" do
-          expect { subject.validate_enforce_second_factor("t") }.to raise_error(
+          expect { validations.validate_enforce_second_factor("t") }.to raise_error(
             Discourse::InvalidParameters,
             error_message,
           )
@@ -203,7 +209,7 @@ RSpec.describe SiteSettings::Validations do
           before { SiteSetting.enforce_second_factor = "all" }
 
           it "should raise an error" do
-            expect { subject.validate_enable_local_logins("f") }.to raise_error(
+            expect { validations.validate_enable_local_logins("f") }.to raise_error(
               Discourse::InvalidParameters,
               error_message,
             )
@@ -214,14 +220,14 @@ RSpec.describe SiteSettings::Validations do
           before { SiteSetting.enforce_second_factor = "no" }
 
           it "should be ok" do
-            expect { subject.validate_enable_local_logins("f") }.not_to raise_error
+            expect { validations.validate_enable_local_logins("f") }.not_to raise_error
           end
         end
       end
 
       context "when the new value is true" do
         it "should be ok" do
-          expect { subject.validate_enable_local_logins("t") }.not_to raise_error
+          expect { validations.validate_enable_local_logins("t") }.not_to raise_error
         end
       end
     end
@@ -233,7 +239,7 @@ RSpec.describe SiteSettings::Validations do
 
       context "when the new value has trailing slash" do
         it "should raise an error" do
-          expect { subject.validate_cors_origins("https://www.rainbows.com/") }.to raise_error(
+          expect { validations.validate_cors_origins("https://www.rainbows.com/") }.to raise_error(
             Discourse::InvalidParameters,
             error_message,
           )
@@ -244,7 +250,7 @@ RSpec.describe SiteSettings::Validations do
     describe "#validate_enable_page_publishing" do
       context "when the new value is true" do
         it "is ok" do
-          expect { subject.validate_enable_page_publishing("t") }.not_to raise_error
+          expect { validations.validate_enable_page_publishing("t") }.not_to raise_error
         end
 
         context "if secure uploads is enabled" do
@@ -252,7 +258,33 @@ RSpec.describe SiteSettings::Validations do
           before { enable_secure_uploads }
 
           it "is not ok" do
-            expect { subject.validate_enable_page_publishing("t") }.to raise_error(
+            expect { validations.validate_enable_page_publishing("t") }.to raise_error(
+              Discourse::InvalidParameters,
+              error_message,
+            )
+          end
+        end
+      end
+    end
+
+    describe "#validate_s3_use_acls" do
+      context "when the new value is true" do
+        it "is ok" do
+          expect { validations.validate_s3_use_acls("t") }.not_to raise_error
+        end
+      end
+
+      context "when the new value is false" do
+        it "is ok" do
+          expect { validations.validate_s3_use_acls("f") }.not_to raise_error
+        end
+
+        context "if secure uploads is enabled" do
+          let(:error_message) { I18n.t("errors.site_settings.s3_use_acls_requirements") }
+          before { enable_secure_uploads }
+
+          it "is not ok" do
+            expect { validations.validate_s3_use_acls("f") }.to raise_error(
               Discourse::InvalidParameters,
               error_message,
             )
@@ -264,12 +296,12 @@ RSpec.describe SiteSettings::Validations do
     describe "#validate_secure_uploads" do
       let(:error_message) { I18n.t("errors.site_settings.secure_uploads_requirements") }
 
-      context "when the new value is true" do
+      context "when the new secure uploads value is true" do
         context "if site setting for enable_s3_uploads is enabled" do
           before { SiteSetting.enable_s3_uploads = true }
 
           it "should be ok" do
-            expect { subject.validate_secure_uploads("t") }.not_to raise_error
+            expect { validations.validate_secure_uploads("t") }.not_to raise_error
           end
         end
 
@@ -277,7 +309,7 @@ RSpec.describe SiteSettings::Validations do
           before { SiteSetting.enable_s3_uploads = false }
 
           it "is not ok" do
-            expect { subject.validate_secure_uploads("t") }.to raise_error(
+            expect { validations.validate_secure_uploads("t") }.to raise_error(
               Discourse::InvalidParameters,
               error_message,
             )
@@ -287,10 +319,21 @@ RSpec.describe SiteSettings::Validations do
             before { GlobalSetting.stubs(:use_s3?).returns(true) }
 
             it "should be ok" do
-              expect { subject.validate_secure_uploads("t") }.not_to raise_error
+              expect { validations.validate_secure_uploads("t") }.not_to raise_error
             end
           end
         end
+
+        context "if site setting for s3_use_acls is not enabled" do
+          before { SiteSetting.s3_use_acls = false }
+
+          it "is not ok" do
+            expect { validations.validate_secure_uploads("t") }.to raise_error(
+              Discourse::InvalidParameters,
+              error_message,
+            )
+          end
+        end
       end
     end
 
@@ -304,7 +347,7 @@ RSpec.describe SiteSettings::Validations do
           before { GlobalSetting.stubs(:use_s3?).returns(true) }
 
           it "is not ok" do
-            expect { subject.validate_enable_s3_uploads("t") }.to raise_error(
+            expect { validations.validate_enable_s3_uploads("t") }.to raise_error(
               Discourse::InvalidParameters,
               error_message,
             )
@@ -315,7 +358,7 @@ RSpec.describe SiteSettings::Validations do
           before { GlobalSetting.stubs(:use_s3?).returns(false) }
 
           it "should be ok" do
-            expect { subject.validate_enable_s3_uploads("t") }.not_to raise_error
+            expect { validations.validate_enable_s3_uploads("t") }.not_to raise_error
           end
         end
 
@@ -325,7 +368,7 @@ RSpec.describe SiteSettings::Validations do
           before { SiteSetting.s3_upload_bucket = nil }
 
           it "is not ok" do
-            expect { subject.validate_enable_s3_uploads("t") }.to raise_error(
+            expect { validations.validate_enable_s3_uploads("t") }.to raise_error(
               Discourse::InvalidParameters,
               error_message,
             )
@@ -336,7 +379,7 @@ RSpec.describe SiteSettings::Validations do
           before { SiteSetting.s3_upload_bucket = "some-bucket" }
 
           it "should be ok" do
-            expect { subject.validate_enable_s3_uploads("t") }.not_to raise_error
+            expect { validations.validate_enable_s3_uploads("t") }.not_to raise_error
           end
         end
       end
@@ -358,49 +401,47 @@ RSpec.describe SiteSettings::Validations do
     end
 
     it "cannot contain a user agent that's shorter than 3 characters" do
-      expect { subject.validate_slow_down_crawler_user_agents("ao|acsw") }.to raise_error(
+      expect { validations.validate_slow_down_crawler_user_agents("ao|acsw") }.to raise_error(
         Discourse::InvalidParameters,
         too_short_message,
       )
-      expect { subject.validate_slow_down_crawler_user_agents("up") }.to raise_error(
+      expect { validations.validate_slow_down_crawler_user_agents("up") }.to raise_error(
         Discourse::InvalidParameters,
         too_short_message,
       )
-      expect { subject.validate_slow_down_crawler_user_agents("a|") }.to raise_error(
+      expect { validations.validate_slow_down_crawler_user_agents("a|") }.to raise_error(
         Discourse::InvalidParameters,
         too_short_message,
       )
-      expect { subject.validate_slow_down_crawler_user_agents("|a") }.to raise_error(
+      expect { validations.validate_slow_down_crawler_user_agents("|a") }.to raise_error(
         Discourse::InvalidParameters,
         too_short_message,
       )
     end
 
     it "allows user agents that are 3 characters or longer" do
-      expect { subject.validate_slow_down_crawler_user_agents("aoc") }.not_to raise_error
-      expect { subject.validate_slow_down_crawler_user_agents("anuq") }.not_to raise_error
-      expect { subject.validate_slow_down_crawler_user_agents("pupsc|kcx") }.not_to raise_error
+      expect { validations.validate_slow_down_crawler_user_agents("aoc") }.not_to raise_error
+      expect { validations.validate_slow_down_crawler_user_agents("anuq") }.not_to raise_error
+      expect { validations.validate_slow_down_crawler_user_agents("pupsc|kcx") }.not_to raise_error
     end
 
     it "allows the setting to be empty" do
-      expect { subject.validate_slow_down_crawler_user_agents("") }.not_to raise_error
+      expect { validations.validate_slow_down_crawler_user_agents("") }.not_to raise_error
     end
 
     it "cannot contain a token of a popular browser user agent" do
-      expect { subject.validate_slow_down_crawler_user_agents("mOzilla") }.to raise_error(
+      expect { validations.validate_slow_down_crawler_user_agents("mOzilla") }.to raise_error(
         Discourse::InvalidParameters,
         popular_browser_message,
       )
 
-      expect { subject.validate_slow_down_crawler_user_agents("chRome|badcrawler") }.to raise_error(
-        Discourse::InvalidParameters,
-        popular_browser_message,
-      )
+      expect {
+        validations.validate_slow_down_crawler_user_agents("chRome|badcrawler")
+      }.to raise_error(Discourse::InvalidParameters, popular_browser_message)
 
-      expect { subject.validate_slow_down_crawler_user_agents("html|badcrawler") }.to raise_error(
-        Discourse::InvalidParameters,
-        popular_browser_message,
-      )
+      expect {
+        validations.validate_slow_down_crawler_user_agents("html|badcrawler")
+      }.to raise_error(Discourse::InvalidParameters, popular_browser_message)
     end
   end
 
@@ -417,7 +458,7 @@ RSpec.describe SiteSettings::Validations do
           before { SiteSetting.composer_media_optimization_image_enabled = true }
 
           it "should raise an error" do
-            expect { subject.validate_strip_image_metadata("f") }.to raise_error(
+            expect { validations.validate_strip_image_metadata("f") }.to raise_error(
               Discourse::InvalidParameters,
               error_message,
             )
@@ -428,14 +469,14 @@ RSpec.describe SiteSettings::Validations do
           before { SiteSetting.composer_media_optimization_image_enabled = false }
 
           it "should be ok" do
-            expect { subject.validate_strip_image_metadata("f") }.not_to raise_error
+            expect { validations.validate_strip_image_metadata("f") }.not_to raise_error
           end
         end
       end
 
       context "when the new value is true" do
         it "should be ok" do
-          expect { subject.validate_strip_image_metadata("t") }.not_to raise_error
+          expect { validations.validate_strip_image_metadata("t") }.not_to raise_error
         end
       end
     end
@@ -444,13 +485,13 @@ RSpec.describe SiteSettings::Validations do
   describe "#twitter_summary_large_image" do
     it "does not allow SVG image files" do
       upload = Fabricate(:upload, url: "/images/logo-dark.svg", extension: "svg")
-      expect { subject.validate_twitter_summary_large_image(upload.id) }.to raise_error(
+      expect { validations.validate_twitter_summary_large_image(upload.id) }.to raise_error(
         Discourse::InvalidParameters,
         I18n.t("errors.site_settings.twitter_summary_large_image_no_svg"),
       )
       upload.update!(url: "/images/logo-dark.png", extension: "png")
-      expect { subject.validate_twitter_summary_large_image(upload.id) }.not_to raise_error
-      expect { subject.validate_twitter_summary_large_image(nil) }.not_to raise_error
+      expect { validations.validate_twitter_summary_large_image(upload.id) }.not_to raise_error
+      expect { validations.validate_twitter_summary_large_image(nil) }.not_to raise_error
     end
   end
 end
diff --git a/spec/lib/stylesheet/compiler_spec.rb b/spec/lib/stylesheet/compiler_spec.rb
index 81915f46ad2..c6902eb1757 100644
--- a/spec/lib/stylesheet/compiler_spec.rb
+++ b/spec/lib/stylesheet/compiler_spec.rb
@@ -56,15 +56,13 @@ RSpec.describe Stylesheet::Compiler do
 
     context "with a plugin" do
       let :plugin1 do
-        plugin1 = Plugin::Instance.new
-        plugin1.path = "#{Rails.root}/spec/fixtures/plugins/my_plugin/plugin.rb"
+        plugin1 = plugin_from_fixtures("my_plugin")
         plugin1.register_css "body { background: $primary }"
         plugin1
       end
 
       let :plugin2 do
-        plugin2 = Plugin::Instance.new
-        plugin2.path = "#{Rails.root}/spec/fixtures/plugins/scss_plugin/plugin.rb"
+        plugin2 = plugin_from_fixtures("scss_plugin")
         plugin2
       end
 
@@ -89,6 +87,20 @@ RSpec.describe Stylesheet::Compiler do
         expect(css).to include("background:")
       end
 
+      context "with the `rtl` option" do
+        it "generates an RTL version of the plugin CSS if the option is true" do
+          css, _ = Stylesheet::Compiler.compile_asset("scss_plugin", theme_id: theme.id, rtl: true)
+          expect(css).to include(".pull-left{float:right}")
+          expect(css).not_to include(".pull-left{float:left}")
+        end
+
+        it "returns an unchanged version of the plugin CSS" do
+          css, _ = Stylesheet::Compiler.compile_asset("scss_plugin", theme_id: theme.id, rtl: false)
+          expect(css).to include(".pull-left{float:left}")
+          expect(css).not_to include(".pull-left{float:right}")
+        end
+      end
+
       it "supports SCSS imports" do
         css, _map = Stylesheet::Compiler.compile_asset("scss_plugin", theme_id: theme.id)
 
@@ -164,13 +176,12 @@ RSpec.describe Stylesheet::Compiler do
 
       expect(css).to include("--header_background: #f8745c")
       expect(css).to include("--header_primary: #88af8e")
-      expect(css).to include("--header_background-rgb: 248,116,92")
+      expect(css).to include("--header_background-rgb: 248, 116, 92")
     end
 
     context "with a plugin" do
       before do
-        plugin = Plugin::Instance.new
-        plugin.path = "#{Rails.root}/spec/fixtures/plugins/color_definition/plugin.rb"
+        plugin = plugin_from_fixtures("color_definition")
         Discourse.plugins << plugin
         plugin.activate!
       end
@@ -214,4 +225,11 @@ RSpec.describe Stylesheet::Compiler do
       expect(refs).to eq([])
     end
   end
+
+  describe ".compile" do
+    it "produces RTL CSS when rtl option is given" do
+      css, _ = Stylesheet::Compiler.compile("a{right:1px}", "test.scss", rtl: true)
+      expect(css).to eq("a{left:1px}")
+    end
+  end
 end
diff --git a/spec/lib/stylesheet/importer_spec.rb b/spec/lib/stylesheet/importer_spec.rb
index e11ccd4e552..96d422ec3e2 100644
--- a/spec/lib/stylesheet/importer_spec.rb
+++ b/spec/lib/stylesheet/importer_spec.rb
@@ -118,7 +118,7 @@ RSpec.describe Stylesheet::Importer do
       styles = Stylesheet::Importer.new({ theme_id: theme.id }).import_color_definitions
       expect(styles).to include("Color definitions from Child Theme")
       expect(styles).to include("--custom-color: red")
-      expect(styles).to include("--custom-color-rgb: 0,0,128")
+      expect(styles).to include("--custom-color-rgb: 0, 0, 128")
     end
 
     it "should include default theme color definitions" do
diff --git a/spec/lib/stylesheet/manager_spec.rb b/spec/lib/stylesheet/manager_spec.rb
index 07fe97df699..b63cbdad9d0 100644
--- a/spec/lib/stylesheet/manager_spec.rb
+++ b/spec/lib/stylesheet/manager_spec.rb
@@ -680,8 +680,8 @@ RSpec.describe Stylesheet::Manager do
           manager: manager,
         ).compile(force: true)
 
-      expect(stylesheet).not_to include("--primary: #c00;")
-      expect(stylesheet).to include("--primary: #222;") # from base scheme
+      expect(stylesheet).not_to include("--primary: #CC0000;")
+      expect(stylesheet).to include("--primary: #222222;") # from base scheme
     end
 
     it "uses the correct scheme when a valid scheme id is used" do
@@ -726,7 +726,7 @@ RSpec.describe Stylesheet::Manager do
       stylesheet2 = builder2.compile
 
       expect(stylesheet).not_to eq(stylesheet2)
-      expect(stylesheet2).to include("--primary: #c00;")
+      expect(stylesheet2).to include("--primary: #CC0000;")
     end
 
     it "includes updated font definitions" do
@@ -877,7 +877,11 @@ RSpec.describe Stylesheet::Manager do
     end
   end
 
-  describe ".precompile css" do
+  describe ".precompile_css" do
+    let(:core_targets) do
+      %w[desktop mobile admin wizard desktop_rtl mobile_rtl admin_rtl wizard_rtl]
+    end
+
     before { STDERR.stubs(:write) }
 
     after do
@@ -888,7 +892,6 @@ RSpec.describe Stylesheet::Manager do
     it "correctly generates precompiled CSS" do
       scheme1 = ColorScheme.create!(name: "scheme1")
       scheme2 = ColorScheme.create!(name: "scheme2")
-      core_targets = %i[desktop mobile desktop_rtl mobile_rtl admin wizard]
       theme_targets = %i[desktop_theme mobile_theme]
 
       Theme.update_all(user_selectable: false)
@@ -922,7 +925,7 @@ RSpec.describe Stylesheet::Manager do
       output = capture_output(:stderr) { Stylesheet::Manager.precompile_css }
 
       results = StylesheetCache.pluck(:target)
-      expect(results.size).to eq(core_targets.size)
+      expect(results).to contain_exactly(*core_targets)
 
       StylesheetCache.destroy_all
 
@@ -937,7 +940,7 @@ RSpec.describe Stylesheet::Manager do
       # themes + core
       Stylesheet::Manager.precompile_css
       results = StylesheetCache.pluck(:target)
-      expect(results.size).to eq(28) # 9 core targets + 9 theme + 10 color schemes
+      expect(results.size).to eq(30) # 11 core targets + 9 theme + 10 color schemes
 
       theme_targets.each do |tar|
         expect(
@@ -952,7 +955,7 @@ RSpec.describe Stylesheet::Manager do
       Stylesheet::Manager.precompile_css
       Stylesheet::Manager.precompile_theme_css
       results = StylesheetCache.pluck(:target)
-      expect(results.size).to eq(28) # 9 core targets + 9 theme + 10 color schemes
+      expect(results.size).to eq(30) # 11 core targets + 9 theme + 10 color schemes
 
       expect(results).to include("color_definitions_#{scheme1.name}_#{scheme1.id}_#{user_theme.id}")
       expect(results).to include(
@@ -969,7 +972,6 @@ RSpec.describe Stylesheet::Manager do
       upload = UploadCreator.new(image, "logo.png").create_for(-1)
 
       scheme = ColorScheme.create!(name: "scheme")
-      core_targets = %i[desktop mobile desktop_rtl mobile_rtl admin wizard]
       theme_targets = %i[desktop_theme mobile_theme]
 
       default_theme =
@@ -1009,6 +1011,69 @@ RSpec.describe Stylesheet::Manager do
       css = File.read(theme_builder.stylesheet_fullpath)
       expect(css).to include("border:3px solid green}")
     end
+
+    context "when there are enabled plugins" do
+      let(:plugin1) do
+        plugin1 = plugin_from_fixtures("my_plugin")
+        plugin1.register_css "body { padding: 1px 2px 3px 4px; }"
+        plugin1
+      end
+
+      let(:plugin2) do
+        plugin2 = plugin_from_fixtures("scss_plugin")
+        plugin2
+      end
+
+      before do
+        Discourse.plugins << plugin1
+        Discourse.plugins << plugin2
+        plugin1.activate!
+        plugin2.activate!
+        Stylesheet::Importer.register_imports!
+        StylesheetCache.destroy_all
+      end
+
+      after do
+        Discourse.plugins.delete(plugin1)
+        Discourse.plugins.delete(plugin2)
+        Stylesheet::Importer.register_imports!
+        DiscoursePluginRegistry.reset!
+      end
+
+      it "generates LTR and RTL CSS for plugins" do
+        output = capture_output(:stderr) { Stylesheet::Manager.precompile_css }
+
+        results = StylesheetCache.pluck(:target)
+        expect(results).to contain_exactly(
+          *core_targets,
+          "my_plugin",
+          "my_plugin_rtl",
+          "scss_plugin",
+          "scss_plugin_rtl",
+        )
+
+        expect(output.scan(/my_plugin$/).length).to eq(1)
+        expect(output.scan(/my_plugin_rtl$/).length).to eq(1)
+        expect(output.scan(/scss_plugin$/).length).to eq(1)
+        expect(output.scan(/scss_plugin_rtl$/).length).to eq(1)
+
+        plugin1_ltr_css = StylesheetCache.where(target: "my_plugin").pluck(:content).first
+        plugin1_rtl_css = StylesheetCache.where(target: "my_plugin_rtl").pluck(:content).first
+
+        expect(plugin1_ltr_css).to include("body{padding:1px 2px 3px 4px}")
+        expect(plugin1_ltr_css).not_to include("body{padding:1px 4px 3px 2px}")
+        expect(plugin1_rtl_css).to include("body{padding:1px 4px 3px 2px}")
+        expect(plugin1_rtl_css).not_to include("body{padding:1px 2px 3px 4px}")
+
+        plugin2_ltr_css = StylesheetCache.where(target: "scss_plugin").pluck(:content).first
+        plugin2_rtl_css = StylesheetCache.where(target: "scss_plugin_rtl").pluck(:content).first
+
+        expect(plugin2_ltr_css).to include(".pull-left{float:left}")
+        expect(plugin2_ltr_css).not_to include(".pull-left{float:right}")
+        expect(plugin2_rtl_css).to include(".pull-left{float:right}")
+        expect(plugin2_rtl_css).not_to include(".pull-left{float:left}")
+      end
+    end
   end
 
   describe ".fs_asset_cachebuster" do
diff --git a/spec/lib/summarization/base_spec.rb b/spec/lib/summarization/base_spec.rb
new file mode 100644
index 00000000000..34021e07445
--- /dev/null
+++ b/spec/lib/summarization/base_spec.rb
@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+describe Summarization::Base do
+  fab!(:user) { Fabricate(:user) }
+  fab!(:group) { Fabricate(:group) }
+  fab!(:topic) { Fabricate(:topic) }
+
+  let(:plugin) { Plugin::Instance.new }
+
+  before do
+    group.add(user)
+
+    strategy = DummyCustomSummarization.new("dummy")
+    plugin.register_summarization_strategy(strategy)
+    SiteSetting.summarization_strategy = strategy.model
+  end
+
+  describe "#can_see_summary?" do
+    context "when the user cannot generate a summary" do
+      before { SiteSetting.custom_summarization_allowed_groups = "" }
+
+      it "returns false" do
+        SiteSetting.custom_summarization_allowed_groups = ""
+
+        expect(described_class.can_see_summary?(topic, user)).to eq(false)
+      end
+
+      it "returns true if there is a cached summary" do
+        SummarySection.create!(
+          target: topic,
+          summarized_text: "test",
+          original_content_sha: "123",
+          algorithm: "test",
+          meta_section_id: nil,
+        )
+
+        expect(described_class.can_see_summary?(topic, user)).to eq(true)
+      end
+    end
+
+    context "when the user can generate a summary" do
+      before { SiteSetting.custom_summarization_allowed_groups = group.id }
+
+      it "returns true if the user group is present in the custom_summarization_allowed_groups_map setting" do
+        expect(described_class.can_see_summary?(topic, user)).to eq(true)
+      end
+    end
+
+    context "when there is no user" do
+      it "returns false for anons" do
+        expect(described_class.can_see_summary?(topic, nil)).to eq(false)
+      end
+
+      it "returns true for anons when there is a cached summary" do
+        SummarySection.create!(
+          target: topic,
+          summarized_text: "test",
+          original_content_sha: "123",
+          algorithm: "test",
+          meta_section_id: nil,
+        )
+
+        expect(described_class.can_see_summary?(topic, nil)).to eq(true)
+      end
+    end
+  end
+end
diff --git a/spec/lib/svg_sprite/svg_sprite_spec.rb b/spec/lib/svg_sprite/svg_sprite_spec.rb
index 26dbf35a670..e928280b7c1 100644
--- a/spec/lib/svg_sprite/svg_sprite_spec.rb
+++ b/spec/lib/svg_sprite/svg_sprite_spec.rb
@@ -3,7 +3,10 @@
 RSpec.describe SvgSprite do
   fab!(:theme) { Fabricate(:theme) }
 
-  before { SvgSprite.expire_cache }
+  before do
+    SvgSprite.clear_plugin_svg_sprite_cache!
+    SvgSprite.expire_cache
+  end
 
   it "can generate a bundle" do
     bundle = SvgSprite.bundle
@@ -181,18 +184,18 @@ RSpec.describe SvgSprite do
       )
       theme.save!
 
-      sprite_files = SvgSprite.custom_svg_sprites(theme.id).join("|")
+      sprite_files = SvgSprite.custom_svgs(theme.id).values.join("|")
       expect(sprite_files).to match(/my-custom-theme-icon/)
 
       SvgSprite.bundle(theme.id)
-      expect(SvgSprite.cache.hash.keys).to include("custom_svg_sprites_#{theme.id}")
+      expect(SvgSprite.cache.hash.keys).to include("theme_svg_sprites_#{theme.id}")
 
       external_copy = Discourse.store.download(upload_s3)
       File.delete external_copy.try(:path)
 
       SvgSprite.bundle(theme.id)
       # after a temp file is missing, bundling still works
-      expect(SvgSprite.cache.hash.keys).to include("custom_svg_sprites_#{theme.id}")
+      expect(SvgSprite.cache.hash.keys).to include("theme_svg_sprites_#{theme.id}")
     end
   end
 
@@ -227,16 +230,15 @@ RSpec.describe SvgSprite do
     expect(SvgSprite.bundle).to match(/far-building/)
   end
 
-  describe "#custom_svg_sprites" do
+  describe "#custom_svgs" do
     it "is empty by default" do
-      expect(SvgSprite.custom_svg_sprites(nil)).to be_empty
+      expect(SvgSprite.custom_svgs(nil)).to be_empty
       expect(SvgSprite.bundle).not_to be_empty
     end
 
     context "with a plugin" do
       let :plugin1 do
-        plugin1 = Plugin::Instance.new
-        plugin1.path = "#{Rails.root}/spec/fixtures/plugins/my_plugin/plugin.rb"
+        plugin1 = plugin_from_fixtures("my_plugin")
         plugin1
       end
 
@@ -251,7 +253,7 @@ RSpec.describe SvgSprite do
       end
 
       it "includes custom icons from plugins" do
-        expect(SvgSprite.custom_svg_sprites(nil).size).to eq(1)
+        expect(SvgSprite.custom_svgs(nil).size).to eq(1)
         expect(SvgSprite.bundle).to match(/custom-icon/)
       end
     end
diff --git a/spec/lib/system_message_spec.rb b/spec/lib/system_message_spec.rb
index 7c9a7c0e27e..7f44290a4d2 100644
--- a/spec/lib/system_message_spec.rb
+++ b/spec/lib/system_message_spec.rb
@@ -83,6 +83,7 @@ RSpec.describe SystemMessage do
       expect(event[:event_name]).to eq(:system_message_sent)
       expect(event[:params].first[:post]).to eq(Post.last)
       expect(event[:params].first[:message_type]).to eq(:tl2_promotion_message)
+      expect(event[:params].first[:recipient]).to eq(user)
     end
 
     it "sends an event before the system message is sent" do
diff --git a/spec/lib/theme_settings_manager_spec.rb b/spec/lib/theme_settings_manager_spec.rb
index f1ec48b6dd5..ac507ad146e 100644
--- a/spec/lib/theme_settings_manager_spec.rb
+++ b/spec/lib/theme_settings_manager_spec.rb
@@ -161,12 +161,30 @@ RSpec.describe ThemeSettingsManager do
       ).to be_truthy
     end
 
-    it "returns the CDN URL" do
-      upload_setting = find_by_name(:upload_setting)
-      upload_setting.value = upload.url
-      theme.reload
+    describe "#value" do
+      context "when it's changed to a custom upload" do
+        it "returns CDN URL" do
+          upload_setting = find_by_name(:upload_setting)
+          upload_setting.value = upload.url
+          theme.reload
 
-      expect(upload_setting.value).to eq(Discourse.store.cdn_url(upload.url))
+          expect(upload_setting.value).to eq(Discourse.store.cdn_url(upload.url))
+        end
+      end
+
+      context "when there's a default upload" do
+        it "returns CDN URL" do
+          theme.set_field(
+            target: :common,
+            name: "default-upload",
+            type: :theme_upload_var,
+            upload_id: upload.id,
+          )
+          theme.save!
+          upload_setting = find_by_name(:upload_setting)
+          expect(upload_setting.value).to eq(Discourse.store.cdn_url(upload.url))
+        end
+      end
     end
   end
 end
diff --git a/spec/lib/topic_query/private_message_lists_spec.rb b/spec/lib/topic_query/private_message_lists_spec.rb
index 402e7a303ef..136548de40f 100644
--- a/spec/lib/topic_query/private_message_lists_spec.rb
+++ b/spec/lib/topic_query/private_message_lists_spec.rb
@@ -320,4 +320,38 @@ RSpec.describe TopicQuery::PrivateMessageLists do
       expect(TopicQuery.new(user_4).private_messages_for(user_4, :all)).to eq([])
     end
   end
+
+  describe "#list_private_messages_direct_and_groups" do
+    it "returns a list of all personal and group private messages for a given user" do
+      expect(
+        TopicQuery.new(user_2).list_private_messages_direct_and_groups(user_2).topics,
+      ).to contain_exactly(private_message, group_message)
+    end
+
+    it "returns a list of personal private messages and user watching group private messages for a given user when the `groups_notification_level` option is set" do
+      expect(
+        TopicQuery
+          .new(user_2)
+          .list_private_messages_direct_and_groups(
+            user_2,
+            groups_messages_notification_level: :watching,
+          )
+          .topics,
+      ).to contain_exactly(private_message, group_message)
+
+      TopicUser.find_by(user: user_2, topic: group_message).update!(
+        notification_level: NotificationLevels.topic_levels[:regular],
+      )
+
+      expect(
+        TopicQuery
+          .new(user_2)
+          .list_private_messages_direct_and_groups(
+            user_2,
+            groups_messages_notification_level: :watching,
+          )
+          .topics,
+      ).to contain_exactly(private_message)
+    end
+  end
 end
diff --git a/spec/lib/topic_query_spec.rb b/spec/lib/topic_query_spec.rb
index 855d7c00275..e3f399ce467 100644
--- a/spec/lib/topic_query_spec.rb
+++ b/spec/lib/topic_query_spec.rb
@@ -16,6 +16,7 @@ RSpec.describe TopicQuery do
   fab!(:creator) { Fabricate(:user) }
   let(:topic_query) { TopicQuery.new(user) }
 
+  fab!(:tl4_user) { Fabricate(:trust_level_4) }
   fab!(:moderator) { Fabricate(:moderator) }
   fab!(:admin) { Fabricate(:admin) }
 
@@ -803,8 +804,11 @@ RSpec.describe TopicQuery do
         # includes the invisible topic if you're a moderator
         expect(TopicQuery.new(moderator).list_latest.topics.include?(invisible_topic)).to eq(true)
 
-        # includes the invisible topic if you're an admin" do
+        # includes the invisible topic if you're an admin
         expect(TopicQuery.new(admin).list_latest.topics.include?(invisible_topic)).to eq(true)
+
+        # includes the invisible topic if you're a TL4 user
+        expect(TopicQuery.new(tl4_user).list_latest.topics.include?(invisible_topic)).to eq(true)
       end
 
       context "with sort_order" do
@@ -1361,7 +1365,7 @@ RSpec.describe TopicQuery do
     end
   end
 
-  describe "suggested_for" do
+  describe "#list_suggested_for" do
     def clear_cache!
       Discourse.redis.keys("random_topic_cache*").each { |k| Discourse.redis.del k }
     end
@@ -1375,6 +1379,10 @@ RSpec.describe TopicQuery do
       it "should return the new topic" do
         expect(TopicQuery.new.list_suggested_for(topic).topics).to eq([new_topic])
       end
+
+      it "should return the nothing when random topics excluded" do
+        expect(TopicQuery.new.list_suggested_for(topic, include_random: false).topics).to eq([])
+      end
     end
 
     context "when anonymously browsing with invisible, closed and archived" do
@@ -1389,12 +1397,175 @@ RSpec.describe TopicQuery do
       end
     end
 
+    context "with a custom suggested provider registered" do
+      let!(:topic1) { Fabricate(:topic) }
+      let!(:topic2) { Fabricate(:topic) }
+      let!(:topic3) { Fabricate(:topic) }
+      let!(:topic4) { Fabricate(:topic) }
+      let!(:topic5) { Fabricate(:topic) }
+      let!(:topic6) { Fabricate(:topic) }
+      let!(:topic7) { Fabricate(:topic) }
+
+      let(:plugin_class) do
+        Class.new(Plugin::Instance) do
+          attr_accessor :enabled
+          def enabled?
+            true
+          end
+
+          def self.custom_suggested_topics(topic, pm_params, topic_query)
+            { result: Topic.order("id desc").limit(1), params: {} }
+          end
+        end
+      end
+
+      let(:plugin) { plugin_class.new }
+
+      it "should return suggested defined by the custom provider" do
+        DiscoursePluginRegistry.register_list_suggested_for_provider(
+          plugin_class.method(:custom_suggested_topics),
+          plugin,
+        )
+
+        expect(TopicQuery.new.list_suggested_for(topic1).topics).to include(Topic.last)
+
+        DiscoursePluginRegistry.reset_register!(:list_suggested_for_providers)
+      end
+    end
+
+    context "when logged in and user is part of the `experimental_new_new_view_groups` site setting groups" do
+      fab!(:group) { Fabricate(:group) }
+      fab!(:topic) { Fabricate(:topic) }
+
+      before do
+        SiteSetting.experimental_new_new_view_groups = group.name
+        group.add(user)
+      end
+
+      after { clear_cache! }
+
+      context "when there are no new topics for user" do
+        it "should return random topics excluding topics that are muted by user and not older than `suggested_topics_max_days_old` site setting" do
+          topic2 = Fabricate(:topic, user: user)
+          topic3 = Fabricate(:topic, user: user)
+          topic4 = Fabricate(:topic, user: user, created_at: 8.days.ago)
+          topic5 = Fabricate(:topic).tap { |t| TopicNotifier.new(t).mute!(user) }
+
+          SiteSetting.suggested_topics_max_days_old = 7
+
+          expect(topic_query.list_suggested_for(topic).topics.map(&:id)).to eq(
+            [topic3.id, topic2.id],
+          )
+        end
+      end
+
+      context "when there are new topics for user" do
+        fab!(:category) { Fabricate(:category) }
+        fab!(:category2) { Fabricate(:category) }
+
+        fab!(:topic_in_category_that_user_created_and_has_partially_read) do
+          Fabricate(:topic, user: user, category:).tap do |t|
+            first_post = Fabricate(:post, topic: t)
+            second_post = Fabricate(:post, topic: t)
+
+            TopicUser.change(
+              user.id,
+              t.id,
+              notification_level: TopicUser.notification_levels[:tracking],
+            )
+
+            TopicUser.update_last_read(user, t.id, second_post.post_number - 1, 1, 1)
+          end
+        end
+
+        fab!(:topic_in_category2_that_user_created_and_has_partially_read) do
+          Fabricate(:topic, user: user, category: category2).tap do |t|
+            first_post = Fabricate(:post, topic: t)
+            second_post = Fabricate(:post, topic: t)
+
+            TopicUser.change(
+              user.id,
+              t.id,
+              notification_level: TopicUser.notification_levels[:tracking],
+            )
+
+            TopicUser.update_last_read(user, t.id, second_post.post_number - 1, 1, 1)
+          end
+        end
+
+        fab!(:topic_in_category_that_user_has_partially_read) do
+          Fabricate(:topic, category:).tap do |t|
+            first_post = Fabricate(:post, topic: t)
+            second_post = Fabricate(:post, topic: t)
+
+            TopicUser.change(
+              user.id,
+              t.id,
+              notification_level: TopicUser.notification_levels[:tracking],
+            )
+
+            TopicUser.update_last_read(user, t.id, second_post.post_number - 1, 1, 1)
+          end
+        end
+
+        fab!(:topic_in_category2_that_user_has_partially_read) do
+          Fabricate(:topic, category: category2).tap do |t|
+            first_post = Fabricate(:post, topic: t)
+            second_post = Fabricate(:post, topic: t)
+
+            TopicUser.change(
+              user.id,
+              t.id,
+              notification_level: TopicUser.notification_levels[:tracking],
+            )
+
+            TopicUser.update_last_read(user, t.id, second_post.post_number - 1, 1, 1)
+          end
+        end
+
+        fab!(:topic_in_category_that_user_has_not_read) { Fabricate(:topic, category:) }
+        fab!(:topic_in_category2_that_user_has_not_read) { Fabricate(:topic, category: category2) }
+
+        before { topic.update!(category:) }
+
+        it "should return new topics for user ordered by topics that user has created first, in the same category as the topic and then topic's bumped at" do
+          expect(
+            topic_query.list_suggested_for(topic, include_random: false).topics.map(&:id),
+          ).to eq(
+            [
+              topic_in_category_that_user_created_and_has_partially_read.id,
+              topic_in_category2_that_user_created_and_has_partially_read.id,
+              topic_in_category_that_user_has_not_read.id,
+              topic_in_category_that_user_has_partially_read.id,
+              topic_in_category2_that_user_has_not_read.id,
+            ],
+          )
+
+          SiteSetting.suggested_topics = 6
+
+          expect(
+            topic_query.list_suggested_for(topic, include_random: false).topics.map(&:id),
+          ).to eq(
+            [
+              topic_in_category_that_user_created_and_has_partially_read.id,
+              topic_in_category2_that_user_created_and_has_partially_read.id,
+              topic_in_category_that_user_has_not_read.id,
+              topic_in_category_that_user_has_partially_read.id,
+              topic_in_category2_that_user_has_not_read.id,
+              topic_in_category2_that_user_has_partially_read.id,
+            ],
+          )
+        end
+      end
+    end
+
     context "when logged in" do
       def suggested_for(topic)
         topic_query.list_suggested_for(topic)&.topics&.map { |t| t.id }
       end
 
       let(:topic) { Fabricate(:topic) }
+
       let(:suggested_topics) do
         tt = topic
         # lets clear cache once category is created - working around caching is hard
@@ -1727,4 +1898,280 @@ RSpec.describe TopicQuery do
       end
     end
   end
+
+  describe "#new_and_unread_results" do
+    fab!(:unread_topic) { Fabricate(:post).topic }
+    fab!(:new_topic) { Fabricate(:post).topic }
+    fab!(:read_topic) { Fabricate(:post).topic }
+
+    before do
+      unread_post = Fabricate(:post, topic: unread_topic)
+      read_post = Fabricate(:post, topic: read_topic)
+
+      TopicUser.change(
+        user.id,
+        unread_topic.id,
+        notification_level: TopicUser.notification_levels[:tracking],
+      )
+      TopicUser.change(
+        user.id,
+        read_topic.id,
+        notification_level: TopicUser.notification_levels[:tracking],
+      )
+      TopicUser.update_last_read(user, unread_topic.id, unread_post.post_number - 1, 1, 1)
+      TopicUser.update_last_read(user, read_topic.id, read_post.post_number, 1, 1)
+    end
+
+    it "includes unread and new topics for the user" do
+      expect(TopicQuery.new(user).new_and_unread_results.pluck(:id)).to contain_exactly(
+        unread_topic.id,
+        new_topic.id,
+      )
+    end
+
+    it "doesn't include deleted topics" do
+      unread_topic.trash!
+      expect(TopicQuery.new(user).new_and_unread_results.pluck(:id)).to contain_exactly(
+        new_topic.id,
+      )
+    end
+
+    it "doesn't include muted topics with unread posts" do
+      TopicUser.change(
+        user.id,
+        unread_topic.id,
+        notification_level: TopicUser.notification_levels[:muted],
+      )
+      expect(TopicQuery.new(user).new_and_unread_results.pluck(:id)).to contain_exactly(
+        new_topic.id,
+      )
+    end
+
+    it "doesn't include muted new topics" do
+      TopicUser.change(
+        user.id,
+        new_topic.id,
+        notification_level: TopicUser.notification_levels[:muted],
+      )
+      expect(TopicQuery.new(user).new_and_unread_results.pluck(:id)).to contain_exactly(
+        unread_topic.id,
+      )
+    end
+
+    it "doesn't include new topics in muted category" do
+      CategoryUser.create!(
+        user_id: user.id,
+        category_id: new_topic.category.id,
+        notification_level: CategoryUser.notification_levels[:muted],
+      )
+      expect(TopicQuery.new(user).new_and_unread_results.pluck(:id)).to contain_exactly(
+        unread_topic.id,
+      )
+    end
+
+    it "includes unread and trakced topics even if they're in a muted category" do
+      new_topic.update!(category: Fabricate(:category))
+      CategoryUser.create!(
+        user_id: user.id,
+        category_id: unread_topic.category.id,
+        notification_level: CategoryUser.notification_levels[:muted],
+      )
+      expect(TopicQuery.new(user).new_and_unread_results.pluck(:id)).to contain_exactly(
+        unread_topic.id,
+        new_topic.id,
+      )
+    end
+
+    it "doesn't include new topics that have a muted tag(s)" do
+      SiteSetting.tagging_enabled = true
+
+      tag = Fabricate(:tag)
+      new_topic.tags << tag
+      new_topic.save!
+
+      TagUser.create!(
+        tag_id: tag.id,
+        user_id: user.id,
+        notification_level: NotificationLevels.all[:muted],
+      )
+      expect(TopicQuery.new(user).new_and_unread_results.pluck(:id)).to contain_exactly(
+        unread_topic.id,
+      )
+    end
+
+    it "includes unread and tracked topics even if they have a muted tag(s)" do
+      SiteSetting.tagging_enabled = true
+
+      tag = Fabricate(:tag)
+      unread_topic.tags << tag
+      unread_topic.save!
+
+      TagUser.create!(
+        tag_id: tag.id,
+        user_id: user.id,
+        notification_level: NotificationLevels.all[:muted],
+      )
+      expect(TopicQuery.new(user).new_and_unread_results.pluck(:id)).to contain_exactly(
+        unread_topic.id,
+        new_topic.id,
+      )
+    end
+
+    it "doesn't include topics in restricted categories that user cannot access" do
+      category = Fabricate(:category_with_definition)
+      group = Fabricate(:group)
+      category.set_permissions(group => :full)
+      category.save!
+
+      unread_topic.update!(category: category)
+      new_topic.update!(category: category)
+
+      expect(TopicQuery.new(user).new_and_unread_results.pluck(:id)).to be_blank
+    end
+
+    it "doesn't include dismissed topics" do
+      DismissedTopicUser.create!(
+        user_id: user.id,
+        topic_id: new_topic.id,
+        created_at: Time.zone.now,
+      )
+      expect(TopicQuery.new(user).new_and_unread_results.pluck(:id)).to contain_exactly(
+        unread_topic.id,
+      )
+    end
+  end
+
+  describe "show_category_definitions_in_topic_lists setting" do
+    fab!(:category) { Fabricate(:category_with_definition) }
+    fab!(:subcategory) { Fabricate(:category_with_definition, parent_category: category) }
+    fab!(:subcategory_regular_topic) { Fabricate(:topic, category: subcategory) }
+
+    it "excludes subcategory definition topics by default" do
+      expect(
+        TopicQuery.new(nil, category: category.id).list_latest.topics.map(&:id),
+      ).to contain_exactly(category.topic_id, subcategory_regular_topic.id)
+    end
+
+    it "works when topic_id is null" do
+      subcategory.topic.destroy!
+      subcategory.update!(topic_id: nil)
+      expect(
+        TopicQuery.new(nil, category: category.id).list_latest.topics.map(&:id),
+      ).to contain_exactly(category.topic_id, subcategory_regular_topic.id)
+    end
+
+    it "includes subcategory definition when setting enabled" do
+      SiteSetting.show_category_definitions_in_topic_lists = true
+      expect(
+        TopicQuery.new(nil, category: category.id).list_latest.topics.map(&:id),
+      ).to contain_exactly(category.topic_id, subcategory.topic_id, subcategory_regular_topic.id)
+    end
+  end
+
+  describe "with topic_query_create_list_topics modifier" do
+    fab!(:topic1) { Fabricate(:topic, created_at: 3.days.ago, bumped_at: 1.hour.ago) }
+    fab!(:topic2) { Fabricate(:topic, created_at: 2.days.ago, bumped_at: 3.hour.ago) }
+
+    after { DiscoursePluginRegistry.clear_modifiers! }
+
+    it "allows changing" do
+      original_topic_query = TopicQuery.new(user)
+
+      Plugin::Instance
+        .new
+        .register_modifier(:topic_query_create_list_topics) do |topics, options, topic_query|
+          expect(topic_query).to eq(topic_query)
+          topic_query.options[:order] = "created"
+          topics
+        end
+
+      expect(original_topic_query.list_latest.topics.map(&:id)).to eq([topic1, topic2].map(&:id))
+
+      DiscoursePluginRegistry.clear_modifiers!
+
+      expect(original_topic_query.list_latest.topics.map(&:id)).to eq([topic2, topic1].map(&:id))
+    end
+  end
+
+  describe "precedence of categories and tag setting" do
+    fab!(:watched_category) do
+      Fabricate(:category).tap do |category|
+        CategoryUser.create!(
+          user: user,
+          category: category,
+          notification_level: CategoryUser.notification_levels[:watching],
+        )
+      end
+    end
+    fab!(:muted_category) do
+      Fabricate(:category).tap do |category|
+        CategoryUser.create!(
+          user: user,
+          category: category,
+          notification_level: CategoryUser.notification_levels[:muted],
+        )
+      end
+    end
+    fab!(:watched_tag) do
+      Fabricate(:tag).tap do |tag|
+        TagUser.create!(
+          user: user,
+          tag: tag,
+          notification_level: TagUser.notification_levels[:watching],
+        )
+      end
+    end
+    fab!(:muted_tag) do
+      Fabricate(:tag).tap do |tag|
+        TagUser.create!(
+          user: user,
+          tag: tag,
+          notification_level: TagUser.notification_levels[:muted],
+        )
+      end
+    end
+    fab!(:topic) { Fabricate(:topic) }
+    fab!(:topic_in_watched_category_and_muted_tag) do
+      Fabricate(:topic, category: watched_category, tags: [muted_tag])
+    end
+    fab!(:topic_in_muted_category_and_watched_tag) do
+      Fabricate(:topic, category: muted_category, tags: [watched_tag])
+    end
+    fab!(:topic_in_watched_and_muted_tag) { Fabricate(:topic, tags: [watched_tag, muted_tag]) }
+    fab!(:topic_in_muted_category) { Fabricate(:topic, category: muted_category) }
+    fab!(:topic_in_muted_tag) { Fabricate(:topic, tags: [muted_tag]) }
+
+    context "when enabled" do
+      it "returns topics even if category or tag is muted but another tag or category is watched" do
+        SiteSetting.watched_precedence_over_muted = true
+        query = TopicQuery.new(user).list_latest
+        expect(query.topics.map(&:id)).to contain_exactly(
+          topic.id,
+          topic_in_watched_category_and_muted_tag.id,
+          topic_in_muted_category_and_watched_tag.id,
+        )
+      end
+    end
+
+    context "when disabled" do
+      it "returns topics without muted category or tag" do
+        SiteSetting.watched_precedence_over_muted = false
+        query = TopicQuery.new(user).list_latest
+        expect(query.topics.map(&:id)).to contain_exactly(topic.id)
+      end
+    end
+
+    context "when disabled but overridden by user" do
+      it "returns topics even if category or tag is muted but another tag or category is watched" do
+        SiteSetting.watched_precedence_over_muted = false
+        user.user_option.update!(watched_precedence_over_muted: true)
+        query = TopicQuery.new(user).list_latest
+        expect(query.topics.map(&:id)).to contain_exactly(
+          topic.id,
+          topic_in_watched_category_and_muted_tag.id,
+          topic_in_muted_category_and_watched_tag.id,
+        )
+      end
+    end
+  end
 end
diff --git a/spec/lib/topic_retriever_spec.rb b/spec/lib/topic_retriever_spec.rb
index 984b28d34f9..7ebf56fae20 100644
--- a/spec/lib/topic_retriever_spec.rb
+++ b/spec/lib/topic_retriever_spec.rb
@@ -2,8 +2,7 @@
 
 RSpec.describe TopicRetriever do
   let(:embed_url) { "http://eviltrout.com/2013/02/10/why-discourse-uses-emberjs.html" }
-  let(:author_username) { "eviltrout" }
-  let(:topic_retriever) { TopicRetriever.new(embed_url, author_username: author_username) }
+  let(:topic_retriever) { TopicRetriever.new(embed_url) }
 
   it "can initialize without optional parameters" do
     t = TopicRetriever.new(embed_url)
diff --git a/spec/lib/topic_upload_security_manager_spec.rb b/spec/lib/topic_upload_security_manager_spec.rb
index 41c4db69a2a..c684444312f 100644
--- a/spec/lib/topic_upload_security_manager_spec.rb
+++ b/spec/lib/topic_upload_security_manager_spec.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 RSpec.describe TopicUploadSecurityManager do
+  subject(:manager) { described_class.new(topic) }
+
   let(:group) { Fabricate(:group) }
   let(:category) { Fabricate(:category) }
   let!(:topic) { Fabricate(:topic, user: user, category: category) }
@@ -10,8 +12,6 @@ RSpec.describe TopicUploadSecurityManager do
   let!(:post3) { Fabricate(:post, topic: topic) }
   let!(:post4) { Fabricate(:post, topic: topic) }
 
-  subject { described_class.new(topic) }
-
   context "when a topic has posts linked to secure uploads" do
     let!(:upload) { Fabricate(:secure_upload) }
     let!(:upload2) { Fabricate(:secure_upload) }
@@ -127,7 +127,7 @@ RSpec.describe TopicUploadSecurityManager do
 
         it "changes the upload secure status to true and changes the ACL and rebakes the post and sets the access control post" do
           Post.any_instance.expects(:rebake!).once
-          subject.run
+          manager.run
           expect(upload3.reload.secure?).to eq(true)
           expect(upload3.reload.access_control_post).to eq(post4)
         end
@@ -136,7 +136,7 @@ RSpec.describe TopicUploadSecurityManager do
           before { SiteSetting.secure_uploads = false }
 
           it "does not change the upload secure status and does not set the access control post" do
-            subject.run
+            manager.run
             expect(upload3.reload.secure?).to eq(false)
             expect(upload3.reload.access_control_post).to eq(nil)
           end
@@ -151,7 +151,7 @@ RSpec.describe TopicUploadSecurityManager do
 
         it "does not change the upload secure status and does not set the access control post" do
           Post.any_instance.expects(:rebake!).never
-          subject.run
+          manager.run
           expect(upload3.reload.secure?).to eq(false)
           expect(upload3.reload.access_control_post).to eq(nil)
         end
@@ -161,14 +161,14 @@ RSpec.describe TopicUploadSecurityManager do
 
   def expect_upload_status_not_to_change
     Post.any_instance.expects(:rebake!).never
-    subject.run
+    manager.run
     expect(upload.reload.secure?).to eq(true)
     expect(upload2.reload.secure?).to eq(true)
   end
 
   def expect_upload_status_to_change_and_rebake
     Post.any_instance.expects(:rebake!).twice
-    subject.run
+    manager.run
     expect(upload.reload.secure?).to eq(false)
     expect(upload2.reload.secure?).to eq(false)
   end
diff --git a/spec/lib/topic_view_spec.rb b/spec/lib/topic_view_spec.rb
index 0a7e518ef18..e05cbcebc53 100644
--- a/spec/lib/topic_view_spec.rb
+++ b/spec/lib/topic_view_spec.rb
@@ -825,6 +825,25 @@ RSpec.describe TopicView do
             it { is_expected.not_to include(tag1.name) }
             it { is_expected.not_to include(tag2.name) }
           end
+
+          context "with restricted tags" do
+            let(:tag_group) { Fabricate.build(:tag_group) }
+            let(:tag_group_permission) do
+              Fabricate.build(:tag_group_permission, tag_group: tag_group)
+            end
+
+            before do
+              SiteSetting.tagging_enabled = true
+              # avoid triggering a `before_create` callback in `TagGroup` which
+              # messes with permissions
+              tag_group.tag_group_permissions << tag_group_permission
+              tag_group.save!
+              tag_group_permission.tag_group.tags << tag2
+            end
+
+            it { is_expected.not_to include(tag2.name) }
+            it { is_expected.to include(tag1.name) }
+          end
         end
       end
     end
@@ -1072,4 +1091,30 @@ RSpec.describe TopicView do
       end
     end
   end
+
+  describe "with topic_view_suggested_topics_options modifier" do
+    let!(:topic1) { Fabricate(:topic) }
+    let!(:topic2) { Fabricate(:topic) }
+
+    after { DiscoursePluginRegistry.clear_modifiers! }
+
+    it "allows disabling of random suggested" do
+      topic_view = TopicView.new(topic1)
+
+      Plugin::Instance
+        .new
+        .register_modifier(
+          :topic_view_suggested_topics_options,
+        ) do |suggested_options, inner_topic_view|
+          expect(inner_topic_view).to eq(topic_view)
+          suggested_options.merge(include_random: false)
+        end
+
+      expect(topic_view.suggested_topics.topics.count).to eq(0)
+
+      DiscoursePluginRegistry.clear_modifiers!
+
+      expect(TopicView.new(topic1).suggested_topics.topics.count).to be > 0
+    end
+  end
 end
diff --git a/spec/lib/topics_filter_spec.rb b/spec/lib/topics_filter_spec.rb
new file mode 100644
index 00000000000..fa4681380bc
--- /dev/null
+++ b/spec/lib/topics_filter_spec.rb
@@ -0,0 +1,1376 @@
+# frozen_string_literal: true
+
+RSpec.describe TopicsFilter do
+  fab!(:user) { Fabricate(:user, username: "username") }
+  fab!(:admin) { Fabricate(:admin) }
+  fab!(:group) { Fabricate(:group) }
+
+  describe "#filter_from_query_string" do
+    describe "when filtering with multiple filters" do
+      fab!(:tag) { Fabricate(:tag, name: "tag1") }
+      fab!(:tag2) { Fabricate(:tag, name: "tag2") }
+      fab!(:topic_with_tag) { Fabricate(:topic, tags: [tag]) }
+      fab!(:closed_topic_with_tag) { Fabricate(:topic, tags: [tag], closed: true) }
+      fab!(:topic_with_tag2) { Fabricate(:topic, tags: [tag2]) }
+      fab!(:closed_topic_with_tag2) { Fabricate(:topic, tags: [tag2], closed: true) }
+
+      it "should return the right topics when query string is `status:closed tags:tag1,tag2`" do
+        expect(
+          TopicsFilter
+            .new(guardian: Guardian.new)
+            .filter_from_query_string("status:closed tags:tag1,tag2")
+            .pluck(:id),
+        ).to contain_exactly(closed_topic_with_tag.id, closed_topic_with_tag2.id)
+      end
+    end
+
+    describe "when filtering with the `in` filter" do
+      fab!(:topic) { Fabricate(:topic) }
+
+      fab!(:pinned_topic) do
+        Fabricate(:topic, pinned_at: Time.zone.now, pinned_until: 1.hour.from_now)
+      end
+
+      fab!(:expired_pinned_topic) do
+        Fabricate(:topic, pinned_at: 2.hour.ago, pinned_until: 1.hour.ago)
+      end
+
+      describe "when query string is `in:pinned`" do
+        it "should return topics that are pinned" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string("in:pinned")
+              .pluck(:id),
+          ).to contain_exactly(pinned_topic.id)
+        end
+
+        it "should not return pinned topics that have expired" do
+          freeze_time(2.hours.from_now) do
+            expect(
+              TopicsFilter
+                .new(guardian: Guardian.new)
+                .filter_from_query_string("in:pinned")
+                .pluck(:id),
+            ).to eq([])
+          end
+        end
+      end
+
+      describe "when query string is `in:bookmarked`" do
+        fab!(:bookmark) do
+          BookmarkManager.new(user).create_for(
+            bookmarkable_id: topic.id,
+            bookmarkable_type: "Topic",
+          )
+        end
+
+        fab!(:bookmark2) do
+          BookmarkManager.new(admin).create_for(
+            bookmarkable_id: topic.id,
+            bookmarkable_type: "Topic",
+          )
+        end
+
+        it "should not return any topics when user is anonymous" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string("in:bookmarked")
+              .pluck(:id),
+          ).to eq([])
+        end
+
+        it "should return topics that are bookmarked" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new(user))
+              .filter_from_query_string("in:bookmarked")
+              .pluck(:id),
+          ).to contain_exactly(topic.id)
+        end
+      end
+
+      describe "when query string is `in:bookmarked in:pinnned`" do
+        it "should return topics that are bookmarked and pinned" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new(user))
+              .filter_from_query_string("in:bookmarked in:pinned")
+              .pluck(:id),
+          ).to eq([])
+
+          BookmarkManager.new(user).create_for(
+            bookmarkable_id: pinned_topic.id,
+            bookmarkable_type: "Topic",
+          )
+
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new(user))
+              .filter_from_query_string("in:bookmarked in:pinned")
+              .pluck(:id),
+          ).to contain_exactly(pinned_topic.id)
+        end
+      end
+
+      TopicUser.notification_levels.keys.each do |notification_level|
+        describe "when query string is `in:#{notification_level}`" do
+          fab!("user_#{notification_level}_topic".to_sym) do
+            Fabricate(:topic).tap do |topic|
+              TopicUser.change(
+                user.id,
+                topic.id,
+                notification_level: TopicUser.notification_levels[notification_level],
+              )
+            end
+          end
+
+          it "should not return any topics if the user is anonymous" do
+            expect(
+              TopicsFilter
+                .new(guardian: Guardian.new)
+                .filter_from_query_string("in:#{notification_level}")
+                .pluck(:id),
+            ).to eq([])
+          end
+
+          it "should return topics that the user has notification level set to #{notification_level}" do
+            expect(
+              TopicsFilter
+                .new(guardian: Guardian.new(user))
+                .filter_from_query_string("in:#{notification_level}")
+                .pluck(:id),
+            ).to contain_exactly(self.public_send("user_#{notification_level}_topic").id)
+          end
+        end
+      end
+
+      describe "when filtering by multiple topic notification levels" do
+        fab!(:user_muted_topic) do
+          Fabricate(:topic).tap do |topic|
+            TopicUser.change(
+              user.id,
+              topic.id,
+              notification_level: TopicUser.notification_levels[:muted],
+            )
+          end
+        end
+
+        fab!(:user_watching_topic) do
+          Fabricate(:topic).tap do |topic|
+            TopicUser.change(
+              user.id,
+              topic.id,
+              notification_level: TopicUser.notification_levels[:watching],
+            )
+          end
+        end
+
+        fab!(:user_tracking_topic) do
+          Fabricate(:topic).tap do |topic|
+            TopicUser.change(
+              user.id,
+              topic.id,
+              notification_level: TopicUser.notification_levels[:tracking],
+            )
+          end
+        end
+
+        describe "when query string is `in:muted,invalid`" do
+          it "should ignore the invalid notification level" do
+            expect(
+              TopicsFilter
+                .new(guardian: Guardian.new(user))
+                .filter_from_query_string("in:muted,invalid")
+                .pluck(:id),
+            ).to contain_exactly(user_muted_topic.id)
+          end
+        end
+
+        describe "when query string is `in:muted in:tracking`" do
+          it "should return topics that the user is tracking or has muted" do
+            expect(
+              TopicsFilter
+                .new(guardian: Guardian.new(user))
+                .filter_from_query_string("in:muted in:tracking")
+                .pluck(:id),
+            ).to contain_exactly(user_muted_topic.id, user_tracking_topic.id)
+          end
+        end
+
+        describe "when query string is `in:muted,tracking" do
+          it "should return topics that the user is tracking or has muted" do
+            expect(
+              TopicsFilter
+                .new(guardian: Guardian.new(user))
+                .filter_from_query_string("in:muted,tracking")
+                .pluck(:id),
+            ).to contain_exactly(user_muted_topic.id, user_tracking_topic.id)
+          end
+        end
+      end
+    end
+
+    describe "when filtering by categories" do
+      fab!(:category) { Fabricate(:category, name: "category") }
+
+      fab!(:category_subcategory) do
+        Fabricate(:category, parent_category: category, name: "category subcategory")
+      end
+
+      fab!(:category2) { Fabricate(:category, name: "category2") }
+
+      fab!(:category2_subcategory) do
+        Fabricate(:category, parent_category: category2, name: "category2 subcategory")
+      end
+
+      fab!(:topic_in_category) { Fabricate(:topic, category: category) }
+      fab!(:topic_in_category_subcategory) { Fabricate(:topic, category: category_subcategory) }
+      fab!(:topic_in_category2) { Fabricate(:topic, category: category2) }
+      fab!(:topic_in_category2_subcategory) { Fabricate(:topic, category: category2_subcategory) }
+
+      describe "when query string is `category:category`" do
+        it "should return topics from specified category and its subcategories" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string("category:category")
+              .pluck(:id),
+          ).to contain_exactly(topic_in_category.id, topic_in_category_subcategory.id)
+        end
+
+        it "should return topics from specified category, its subcategories and sub-subcategories" do
+          SiteSetting.max_category_nesting = 3
+
+          category_subcategory_subcategory =
+            Fabricate(
+              :category,
+              parent_category: category_subcategory,
+              name: "category subcategory subcategory",
+            )
+
+          topic_in_category_subcategory_subcategory =
+            Fabricate(:topic, category: category_subcategory_subcategory)
+
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string("category:category")
+              .pluck(:id),
+          ).to contain_exactly(
+            topic_in_category.id,
+            topic_in_category_subcategory.id,
+            topic_in_category_subcategory_subcategory.id,
+          )
+        end
+      end
+
+      describe "when query string is `category:category,category2`" do
+        it "should return topics from any of the specified categories and its subcategories" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string("category:category,category2")
+              .pluck(:id),
+          ).to contain_exactly(
+            topic_in_category.id,
+            topic_in_category_subcategory.id,
+            topic_in_category2.id,
+            topic_in_category2_subcategory.id,
+          )
+        end
+      end
+
+      describe "when query string is `category:category category:category2`" do
+        it "should return topics from any of the specified categories and its subcategories" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string("category:category category:category2")
+              .pluck(:id),
+          ).to contain_exactly(
+            topic_in_category.id,
+            topic_in_category_subcategory.id,
+            topic_in_category2.id,
+            topic_in_category2_subcategory.id,
+          )
+        end
+      end
+
+      describe "when query string is `category:category =category:category2`" do
+        it "should return topics and subcategory topics from category but only topics from category2" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string("category:category =category:category2")
+              .pluck(:id),
+          ).to contain_exactly(
+            topic_in_category.id,
+            topic_in_category_subcategory.id,
+            topic_in_category2.id,
+          )
+        end
+      end
+
+      describe "when query string is `-category:category`" do
+        it "should not return any topics from specified category or its subcategories" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string("-category:category")
+              .pluck(:id),
+          ).to contain_exactly(topic_in_category2.id, topic_in_category2_subcategory.id)
+        end
+      end
+
+      describe "when query string is `-category:category2,category`" do
+        it "should not return any topics from either specified categories or their subcategories" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string("-category:category2,category")
+              .pluck(:id),
+          ).to eq([])
+        end
+      end
+
+      describe "when query string is `-category:category -category:category2-subcategory`" do
+        it "should not return any topics from either specified category or their subcategories" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string("-category:category -category:category2-subcategory")
+              .pluck(:id),
+          ).to contain_exactly(topic_in_category2.id)
+        end
+      end
+
+      describe "when query string is `-=category:category`" do
+        it "should not return any topics from the specified category only" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string("-=category:category")
+              .pluck(:id),
+          ).to contain_exactly(
+            topic_in_category_subcategory.id,
+            topic_in_category2.id,
+            topic_in_category2_subcategory.id,
+          )
+        end
+      end
+
+      describe "when query string is `-=category:category,category2`" do
+        it "should not return any topics from the specified categories only" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string("-=category:category,category2")
+              .pluck(:id),
+          ).to contain_exactly(topic_in_category_subcategory.id, topic_in_category2_subcategory.id)
+        end
+      end
+
+      describe "when query string is `=category:category`" do
+        it "should not return topics from subcategories`" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string("=category:category")
+              .pluck(:id),
+          ).to contain_exactly(topic_in_category.id)
+        end
+      end
+
+      describe "when query string is `=category:category,category2`" do
+        it "should not return topics from subcategories" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string("=category:category,category2")
+              .pluck(:id),
+          ).to contain_exactly(topic_in_category.id, topic_in_category2.id)
+        end
+      end
+
+      describe "when query string is `category:category2 -=category:category2-subcategory`" do
+        it "should return topics from category2 and its subcategories but not from the category2-subcategory" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string(
+                "category:category2 -=category:category2:category2-subcategory",
+              )
+              .pluck(:id),
+          ).to contain_exactly(topic_in_category2.id)
+        end
+
+        describe "when max category nesting is 3" do
+          fab!(:category2_subcategory_subcategory) do
+            SiteSetting.max_category_nesting = 3
+            Fabricate(:category, parent_category: category2_subcategory, name: "sub-subcategory")
+          end
+
+          fab!(:topic_in_category2_subcategory_subcategory) do
+            Fabricate(:topic, category: category2_subcategory_subcategory)
+          end
+
+          before { SiteSetting.max_category_nesting = 3 }
+
+          it "should return topics from category2, category2's sub-categories and category2's sub-sub-categories but not from the category2-subcategory only" do
+            expect(
+              TopicsFilter
+                .new(guardian: Guardian.new)
+                .filter_from_query_string(
+                  "category:category2 -=category:category2:category2-subcategory",
+                )
+                .pluck(:id),
+            ).to contain_exactly(
+              topic_in_category2.id,
+              topic_in_category2_subcategory_subcategory.id,
+            )
+          end
+        end
+      end
+
+      describe "when `slug_generation_method` site setting is set to encoded" do
+        before do
+          SiteSetting.slug_generation_method = "encoded"
+          category.update!(name: "日本語", slug: "日本語")
+        end
+
+        describe "when query string is `category:日本語`" do
+          it 'should return topics from category with slug "日本語"' do
+            expect(
+              TopicsFilter
+                .new(guardian: Guardian.new)
+                .filter_from_query_string("category:日本語")
+                .pluck(:id),
+            ).to contain_exactly(topic_in_category.id, topic_in_category_subcategory.id)
+          end
+        end
+
+        describe "when query string is `category:日本語:안녕하세요`" do
+          before { category_subcategory.update!(name: "안녕하세요 ", slug: "안녕하세요 ") }
+
+          it "should return topics from category with slug '안녕하세요'" do
+            expect(
+              TopicsFilter
+                .new(guardian: Guardian.new)
+                .filter_from_query_string("category:日本語:안녕하세요")
+                .pluck(:id),
+            ).to contain_exactly(topic_in_category_subcategory.id)
+          end
+        end
+      end
+
+      describe "when multiple categories have subcategories with the same name" do
+        fab!(:category_subcategory) do
+          Fabricate(:category, parent_category: category, name: "subcategory")
+        end
+
+        fab!(:category2_subcategory) do
+          Fabricate(:category, parent_category: category2, name: "subcategory")
+        end
+
+        fab!(:topic_in_category_subcategory) { Fabricate(:topic, category: category_subcategory) }
+        fab!(:topic_in_category2_subcategory) { Fabricate(:topic, category: category2_subcategory) }
+
+        describe "when query string is `category:subcategory`" do
+          it "should return topics from subcategories of both categories" do
+            expect(
+              TopicsFilter
+                .new(guardian: Guardian.new)
+                .filter_from_query_string("category:subcategory")
+                .pluck(:id),
+            ).to contain_exactly(
+              topic_in_category_subcategory.id,
+              topic_in_category2_subcategory.id,
+            )
+          end
+        end
+
+        describe "when query string is `category:category:subcategory`" do
+          it "should return topics from subcategories of the specified category" do
+            expect(
+              TopicsFilter
+                .new(guardian: Guardian.new)
+                .filter_from_query_string("category:category:subcategory")
+                .pluck(:id),
+            ).to contain_exactly(topic_in_category_subcategory.id)
+          end
+        end
+
+        describe "when query string is `category:category2:subcategory`" do
+          it "should return topics from subcategories of the specified category" do
+            expect(
+              TopicsFilter
+                .new(guardian: Guardian.new)
+                .filter_from_query_string("category:category2:subcategory")
+                .pluck(:id),
+            ).to contain_exactly(topic_in_category2_subcategory.id)
+          end
+        end
+
+        describe "when query string is `category:category:subcategory,category2:subcategory`" do
+          it "should return topics from either subcategory" do
+            expect(
+              TopicsFilter
+                .new(guardian: Guardian.new)
+                .filter_from_query_string("category:category:subcategory,category2:subcategory")
+                .pluck(:id),
+            ).to contain_exactly(
+              topic_in_category_subcategory.id,
+              topic_in_category2_subcategory.id,
+            )
+          end
+        end
+
+        describe "when max category nesting is 3" do
+          fab!(:category_subcategory_subcategory) do
+            SiteSetting.max_category_nesting = 3
+            Fabricate(:category, parent_category: category_subcategory, name: "sub-subcategory")
+          end
+
+          fab!(:category2_subcategory_subcategory) do
+            SiteSetting.max_category_nesting = 3
+            Fabricate(:category, parent_category: category2_subcategory, name: "sub-subcategory")
+          end
+
+          fab!(:topic_in_category_subcategory_subcategory) do
+            Fabricate(:topic, category: category_subcategory_subcategory)
+          end
+
+          fab!(:topic_in_category2_subcategory_subcategory) do
+            Fabricate(:topic, category: category2_subcategory_subcategory)
+          end
+
+          before { SiteSetting.max_category_nesting = 3 }
+
+          describe "when query string is `category:category:subcategory:sub-subcategory`" do
+            it "return topics from category with slug 'sub-subcategory' with the category ancestor chain of 'subcategory' and 'category'" do
+              expect(
+                TopicsFilter
+                  .new(guardian: Guardian.new)
+                  .filter_from_query_string("category:category:subcategory:sub-subcategory")
+                  .pluck(:id),
+              ).to contain_exactly(topic_in_category_subcategory_subcategory.id)
+            end
+          end
+
+          describe "when query string is `=category:category2:subcategory`" do
+            it "return topics from category with slug 'subcategory' with the category ancestor chain of 'category2'" do
+              expect(
+                TopicsFilter
+                  .new(guardian: Guardian.new)
+                  .filter_from_query_string("=category:category2:subcategory")
+                  .pluck(:id),
+              ).to contain_exactly(topic_in_category2_subcategory.id)
+            end
+          end
+
+          describe "when query string is `category:category2:subcategory`" do
+            it "return topics and subcategories topics from category with slug 'subcategory' with the category ancestor chain of 'category2'" do
+              category2_subcategory_subcategory2 =
+                Fabricate(
+                  :category,
+                  parent_category: category2_subcategory,
+                  name: "sub-subcategory2",
+                )
+
+              topic_in_category2_subcategory_subcategory2 =
+                Fabricate(:topic, category: category2_subcategory_subcategory2)
+
+              expect(
+                TopicsFilter
+                  .new(guardian: Guardian.new)
+                  .filter_from_query_string("category:category2:subcategory")
+                  .pluck(:id),
+              ).to contain_exactly(
+                topic_in_category2_subcategory.id,
+                topic_in_category2_subcategory_subcategory.id,
+                topic_in_category2_subcategory_subcategory2.id,
+              )
+            end
+          end
+
+          describe "when query string is `category:sub-subcategory`" do
+            it "return topics from either category with slug 'sub-subcategory'" do
+              expect(
+                TopicsFilter
+                  .new(guardian: Guardian.new)
+                  .filter_from_query_string("category:sub-subcategory")
+                  .pluck(:id),
+              ).to contain_exactly(
+                topic_in_category_subcategory_subcategory.id,
+                topic_in_category2_subcategory_subcategory.id,
+              )
+            end
+          end
+        end
+      end
+    end
+
+    describe "when filtering by status" do
+      fab!(:topic) { Fabricate(:topic) }
+      fab!(:closed_topic) { Fabricate(:topic, closed: true) }
+      fab!(:archived_topic) { Fabricate(:topic, archived: true) }
+      fab!(:deleted_topic_id) { Fabricate(:topic, deleted_at: Time.zone.now).id }
+
+      it "should only return topics that have not been closed or archived when query string is `status:open`" do
+        expect(
+          TopicsFilter
+            .new(guardian: Guardian.new)
+            .filter_from_query_string("status:open")
+            .pluck(:id),
+        ).to contain_exactly(topic.id)
+      end
+
+      it "should only return topics that have been deleted when query string is `status:deleted` and user can see deleted topics" do
+        expect(
+          TopicsFilter
+            .new(guardian: Guardian.new(admin))
+            .filter_from_query_string("status:deleted")
+            .pluck(:id),
+        ).to contain_exactly(deleted_topic_id)
+      end
+
+      it "should ignore status filter when query string is `status:deleted` and user cannot see deleted topics" do
+        expect(
+          TopicsFilter
+            .new(guardian: Guardian.new)
+            .filter_from_query_string("status:deleted")
+            .pluck(:id),
+        ).to contain_exactly(topic.id, closed_topic.id, archived_topic.id)
+      end
+
+      it "should only return topics that have been archived when query string is `status:archived`" do
+        expect(
+          TopicsFilter
+            .new(guardian: Guardian.new)
+            .filter_from_query_string("status:archived")
+            .pluck(:id),
+        ).to contain_exactly(archived_topic.id)
+      end
+
+      it "should only return topics that are visible when query string is `status:listed`" do
+        Topic.update_all(visible: false)
+        topic.update!(visible: true)
+
+        expect(
+          TopicsFilter
+            .new(guardian: Guardian.new)
+            .filter_from_query_string("status:listed")
+            .pluck(:id),
+        ).to contain_exactly(topic.id)
+      end
+
+      it "should only return topics that are not visible when query string is `status:unlisted`" do
+        Topic.update_all(visible: true)
+        topic.update!(visible: false)
+
+        expect(
+          TopicsFilter
+            .new(guardian: Guardian.new)
+            .filter_from_query_string("status:unlisted")
+            .pluck(:id),
+        ).to contain_exactly(topic.id)
+      end
+
+      it "should only return topics that are not in any read-restricted category when query string is `status:public`" do
+        private_category = Fabricate(:private_category, group: group)
+        topic_in_private_category = Fabricate(:topic, category: private_category)
+
+        expect(
+          TopicsFilter.new(guardian: Guardian.new).filter_from_query_string("").pluck(:id),
+        ).to include(topic_in_private_category.id)
+
+        expect(
+          TopicsFilter
+            .new(guardian: Guardian.new)
+            .filter_from_query_string("status:public")
+            .pluck(:id),
+        ).not_to include(topic_in_private_category.id)
+      end
+
+      describe "when query string is `status:closed status:unlisted`" do
+        fab!(:closed_and_unlisted_topic) { Fabricate(:topic, closed: true, visible: false) }
+
+        it "should only return topics that have been closed and are not visible" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string("status:closed status:unlisted")
+              .pluck(:id),
+          ).to contain_exactly(closed_and_unlisted_topic.id)
+        end
+      end
+    end
+
+    describe "when filtering by tags" do
+      fab!(:tag) { Fabricate(:tag, name: "tag1") }
+      fab!(:tag2) { Fabricate(:tag, name: "tag2") }
+      fab!(:tag3) { Fabricate(:tag, name: "tag3") }
+
+      fab!(:group_only_tag) { Fabricate(:tag, name: "group-only-tag") }
+      fab!(:group) { Fabricate(:group) }
+
+      let!(:staff_tag_group) do
+        Fabricate(
+          :tag_group,
+          permissions: {
+            group.name => TagGroupPermission.permission_types[:full],
+          },
+          tag_names: [group_only_tag.name],
+        )
+      end
+
+      fab!(:topic_without_tag) { Fabricate(:topic) }
+      fab!(:topic_with_tag) { Fabricate(:topic, tags: [tag]) }
+      fab!(:topic_with_tag_and_tag2) { Fabricate(:topic, tags: [tag, tag2]) }
+      fab!(:topic_with_tag2) { Fabricate(:topic, tags: [tag2]) }
+      fab!(:topic_with_group_only_tag) { Fabricate(:topic, tags: [group_only_tag]) }
+
+      it "should not filter any topics by tags when tagging is disabled" do
+        SiteSetting.tagging_enabled = false
+
+        expect(
+          TopicsFilter
+            .new(guardian: Guardian.new)
+            .filter_from_query_string("tags:#{tag.name}+#{tag2.name}")
+            .pluck(:id),
+        ).to contain_exactly(
+          topic_without_tag.id,
+          topic_with_tag.id,
+          topic_with_tag_and_tag2.id,
+          topic_with_tag2.id,
+          topic_with_group_only_tag.id,
+        )
+      end
+
+      describe "when query string is `tag:tag1+tag2`" do
+        it "should only return topics that are tagged with all of the specified tags" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string("tag:#{tag.name}+#{tag2.name}")
+              .pluck(:id),
+          ).to contain_exactly(topic_with_tag_and_tag2.id)
+        end
+      end
+
+      it "should only return topics that are tagged with all of the specified tags when query string is `tags:tag1+tag2`" do
+        expect(
+          TopicsFilter
+            .new(guardian: Guardian.new)
+            .filter_from_query_string("tags:#{tag.name}+#{tag2.name}")
+            .pluck(:id),
+        ).to contain_exactly(topic_with_tag_and_tag2.id)
+      end
+
+      it "should only return topics that are tagged with tag1 and tag2 when query string is `tags:tag1 tags:tag2`" do
+        topic_with_tag_and_tag2_and_tag3 = Fabricate(:topic, tags: [tag, tag2, tag3])
+
+        expect(
+          TopicsFilter
+            .new(guardian: Guardian.new)
+            .filter_from_query_string("tags:#{tag.name} tags:#{tag2.name}")
+            .pluck(:id),
+        ).to contain_exactly(topic_with_tag_and_tag2.id, topic_with_tag_and_tag2_and_tag3.id)
+      end
+
+      describe "when query string is `tags:tag1,tag2,tag3`" do
+        it "should only return topics that are tagged with either tag1, tag2 or tag3" do
+          topic_with_tag3 = Fabricate(:topic, tags: [tag3])
+
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string("tags:#{tag.name},#{tag2.name},#{tag3.name}")
+              .pluck(:id),
+          ).to contain_exactly(
+            topic_with_tag.id,
+            topic_with_tag_and_tag2.id,
+            topic_with_tag2.id,
+            topic_with_tag3.id,
+          )
+        end
+      end
+
+      describe "when query string is `tags:tag1+tag2+tag3`" do
+        it "should only return topics that are tagged with tag1, tag2 and tag3" do
+          topic_with_tag_tag2_tag3 = Fabricate(:topic, tags: [tag, tag2, tag3])
+
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string("tags:#{tag.name}+#{tag2.name}+#{tag3.name}")
+              .pluck(:id),
+          ).to contain_exactly(topic_with_tag_tag2_tag3.id)
+        end
+      end
+
+      it "should only return topics that are tagged with tag1 and tag2 but not tag3 when query string is `tags:tag1 tags:tag2 -tags:tag3`" do
+        topic_with_tag_and_tag2_and_tag3 = Fabricate(:topic, tags: [tag, tag2, tag3])
+
+        expect(
+          TopicsFilter
+            .new(guardian: Guardian.new)
+            .filter_from_query_string("tags:#{tag.name} tags:#{tag2.name} -tags:tag3")
+            .pluck(:id),
+        ).to contain_exactly(topic_with_tag_and_tag2.id)
+      end
+
+      it "should only return topics that are tagged with any of the specified tags when query string is `tags:tag1,tag2`" do
+        expect(
+          TopicsFilter
+            .new(guardian: Guardian.new)
+            .filter_from_query_string("tags:#{tag.name},#{tag2.name}")
+            .pluck(:id),
+        ).to contain_exactly(topic_with_tag.id, topic_with_tag_and_tag2.id, topic_with_tag2.id)
+      end
+
+      it "should not return any topics when query string is `tags:tag1+tag2+invalid`" do
+        expect(
+          TopicsFilter
+            .new(guardian: Guardian.new)
+            .filter_from_query_string("tags:tag1+tag2+invalid")
+            .pluck(:id),
+        ).to eq([])
+      end
+
+      it "should still filter topics by specificed tags when query string is `tags:tag1,tag2,invalid`" do
+        expect(
+          TopicsFilter
+            .new(guardian: Guardian.new)
+            .filter_from_query_string("tags:tag1,tag2,invalid")
+            .pluck(:id),
+        ).to contain_exactly(topic_with_tag_and_tag2.id, topic_with_tag.id, topic_with_tag2.id)
+      end
+
+      it "should not return any topics when query string is `tags:group-only-tag` because specified tag is hidden to user" do
+        expect(
+          TopicsFilter
+            .new(guardian: Guardian.new)
+            .filter_from_query_string("tags:group-only-tag")
+            .pluck(:id),
+        ).to eq([])
+      end
+
+      it "should return the right topics when query string is `tags:group-only-tag` and user has access to specified tag" do
+        group.add(admin)
+
+        expect(
+          TopicsFilter
+            .new(guardian: Guardian.new(admin))
+            .filter_from_query_string("tags:group-only-tag")
+            .pluck(:id),
+        ).to contain_exactly(topic_with_group_only_tag.id)
+      end
+
+      it "should only return topics that are not tagged with specified tag when query string is `-tags:tag1`" do
+        expect(
+          TopicsFilter
+            .new(guardian: Guardian.new)
+            .filter_from_query_string("-tags:tag1")
+            .pluck(:id),
+        ).to contain_exactly(topic_without_tag.id, topic_with_tag2.id, topic_with_group_only_tag.id)
+      end
+
+      it "should only return topics that are not tagged with all of the specified tags when query string is `-tags:tag1+tag2`" do
+        expect(
+          TopicsFilter
+            .new(guardian: Guardian.new)
+            .filter_from_query_string("-tags:tag1+tag2")
+            .pluck(:id),
+        ).to contain_exactly(
+          topic_without_tag.id,
+          topic_with_tag.id,
+          topic_with_tag2.id,
+          topic_with_group_only_tag.id,
+        )
+      end
+
+      it "should only return topics that are not tagged with any of the specified tags when query string is `-tags:tag1,tag2`" do
+        expect(
+          TopicsFilter
+            .new(guardian: Guardian.new)
+            .filter_from_query_string("-tags:tag1,tag2")
+            .pluck(:id),
+        ).to contain_exactly(topic_without_tag.id, topic_with_group_only_tag.id)
+      end
+
+      describe "when query string is tag:日べé1" do
+        before { tag.update!(name: "日べé1") }
+
+        it "should return topics that are tagged with the specified tag" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string("tag:日べé1")
+              .pluck(:id),
+          ).to contain_exactly(topic_with_tag.id, topic_with_tag_and_tag2.id)
+        end
+      end
+    end
+
+    describe "when filtering by topic author" do
+      fab!(:user2) { Fabricate(:user, username: "username2") }
+      fab!(:topic_by_user) { Fabricate(:topic, user: user) }
+      fab!(:topic2_by_user) { Fabricate(:topic, user: user) }
+      fab!(:topic_by_user2) { Fabricate(:topic, user: user2) }
+
+      describe "when query string is `created-by:@username`" do
+        it "should return the topics created by the specified user" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string("created-by:@#{user.username}")
+              .pluck(:id),
+          ).to contain_exactly(topic_by_user.id, topic2_by_user.id)
+        end
+      end
+
+      describe "when query string is `created-by:@username2`" do
+        it "should return the topics created by the specified user" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string("created-by:@#{user2.username}")
+              .pluck(:id),
+          ).to contain_exactly(topic_by_user2.id)
+        end
+      end
+
+      describe "when query string is `created-by:@username created-by:@username2`" do
+        it "should return the topics created by either of the specified users" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string(
+                "created-by:@#{user.username} created-by:@#{user2.username}",
+              )
+              .pluck(:id),
+          ).to contain_exactly(topic_by_user.id, topic2_by_user.id, topic_by_user2.id)
+        end
+      end
+
+      describe "when query string is `created-by:@username,invalid`" do
+        it "should only return the topics created by the user with the valid username" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string("created-by:@#{user.username},invalid")
+              .pluck(:id),
+          ).to contain_exactly(topic_by_user.id, topic2_by_user.id)
+        end
+      end
+
+      describe "when query string is `created-by:@username,@username2`" do
+        it "should return the topics created by either of the specified users" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string("created-by:@#{user.username},@#{user2.username}")
+              .pluck(:id),
+          ).to contain_exactly(topic_by_user.id, topic2_by_user.id, topic_by_user2.id)
+        end
+      end
+
+      describe "when query string is `created-by:@invalid`" do
+        it "should not return any topics" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string("created-by:@invalid")
+              .pluck(:id),
+          ).to eq([])
+        end
+      end
+    end
+
+    shared_examples "filtering for topics by counts" do |filter|
+      describe "when query string is `#{filter}-min:1`" do
+        it "should only return topics with at least 1 #{filter}" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string("#{filter}-min:1")
+              .pluck(:id),
+          ).to contain_exactly(topic_with_1_count.id, topic_with_2_count.id, topic_with_3_count.id)
+        end
+      end
+
+      describe "when query string is `#{filter}-min:3`" do
+        it "should only return topics with at least 3 #{filter}" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string("#{filter}-min:3")
+              .pluck(:id),
+          ).to contain_exactly(topic_with_3_count.id)
+        end
+      end
+
+      describe "when query string is `#{filter}-max:1`" do
+        it "should only return topics with at most 1 #{filter}" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string("#{filter}-max:1")
+              .pluck(:id),
+          ).to contain_exactly(topic_with_1_count.id)
+        end
+      end
+
+      describe "when query string is `#{filter}-max:3`" do
+        it "should only return topics with at most 3 #{filter}" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string("#{filter}-max:3")
+              .pluck(:id),
+          ).to contain_exactly(topic_with_1_count.id, topic_with_2_count.id, topic_with_3_count.id)
+        end
+      end
+
+      describe "when query string is `#{filter}-min:1 #{filter}-max:2`" do
+        it "should only return topics with at least 1 like and at most 2 #{filter}" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string("#{filter}-min:1 #{filter}-max:2")
+              .pluck(:id),
+          ).to contain_exactly(topic_with_1_count.id, topic_with_2_count.id)
+        end
+      end
+
+      describe "when query string is `#{filter}-min:3 #{filter}-min:2 #{filter}-max:1 #{filter}-max:3`" do
+        it "should only return topics with at least 2 #{filter} and at most 3 #{filter} as it ignores earlier filters which are duplicated" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string(
+                "#{filter}-min:3 #{filter}-min:2 #{filter}-max:1 #{filter}-max:3",
+              )
+              .pluck(:id),
+          ).to contain_exactly(topic_with_2_count.id, topic_with_3_count.id)
+        end
+      end
+
+      describe "when query string is `#{filter}-min:invalid #{filter}-max:invalid`" do
+        it "should ignore the filters with invalid values" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string("#{filter}-min:invalid #{filter}-max:invalid")
+              .pluck(:id),
+          ).to contain_exactly(topic_with_1_count.id, topic_with_2_count.id, topic_with_3_count.id)
+        end
+      end
+    end
+
+    describe "when filtering by number of likes in a topic" do
+      fab!(:topic_with_1_count) { Fabricate(:topic, like_count: 1) }
+      fab!(:topic_with_2_count) { Fabricate(:topic, like_count: 2) }
+      fab!(:topic_with_3_count) { Fabricate(:topic, like_count: 3) }
+
+      include_examples("filtering for topics by counts", "likes")
+    end
+
+    describe "when filtering by number of posters in a topic" do
+      fab!(:topic_with_1_count) { Fabricate(:topic, participant_count: 1) }
+      fab!(:topic_with_2_count) { Fabricate(:topic, participant_count: 2) }
+      fab!(:topic_with_3_count) { Fabricate(:topic, participant_count: 3) }
+
+      include_examples("filtering for topics by counts", "posters")
+    end
+
+    describe "when filtering by number of posts in a topic" do
+      fab!(:topic_with_1_count) { Fabricate(:topic, posts_count: 1) }
+      fab!(:topic_with_2_count) { Fabricate(:topic, posts_count: 2) }
+      fab!(:topic_with_3_count) { Fabricate(:topic, posts_count: 3) }
+
+      include_examples("filtering for topics by counts", "posts")
+    end
+
+    describe "when filtering by number of views in a topic" do
+      fab!(:topic_with_1_count) { Fabricate(:topic, views: 1) }
+      fab!(:topic_with_2_count) { Fabricate(:topic, views: 2) }
+      fab!(:topic_with_3_count) { Fabricate(:topic, views: 3) }
+
+      include_examples("filtering for topics by counts", "views")
+    end
+
+    describe "when filtering by number of likes in the first post of a topic" do
+      fab!(:topic_with_1_count) do
+        post = Fabricate(:post, like_count: 1)
+        post.topic
+      end
+
+      fab!(:topic_with_2_count) do
+        post = Fabricate(:post, like_count: 2)
+        post.topic
+      end
+
+      fab!(:topic_with_3_count) do
+        post = Fabricate(:post, like_count: 3)
+        post.topic
+      end
+
+      include_examples("filtering for topics by counts", "likes-op")
+    end
+
+    shared_examples "filtering for topics by date column" do |filter, column, description|
+      fab!(:topic) { Fabricate(:topic, column => Time.zone.local(2022, 1, 1)) }
+      fab!(:topic2) { Fabricate(:topic, column => Time.zone.local(2023, 5, 12)) }
+
+      describe "when query string is `#{filter}-after:invalid-date-test`" do
+        it "should ignore the filter" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string("#{filter}-after:invalid-date-test")
+              .pluck(:id),
+          ).to contain_exactly(topic.id, topic2.id)
+        end
+      end
+
+      describe "when query string is `#{filter}-after:2022-01-01`" do
+        it "should only return topics with #{description} after 2022-01-01" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string("#{filter}-after:2022-01-01")
+              .pluck(:id),
+          ).to contain_exactly(topic.id, topic2.id)
+        end
+      end
+
+      describe "when query string is `#{filter}-after:2023-01-1`" do
+        it "should only return topics with #{description} after 2023-01-01" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string("#{filter}-after:2023-01-1")
+              .pluck(:id),
+          ).to contain_exactly(topic2.id)
+        end
+      end
+
+      describe "when query string is `#{filter}-after:2023-6-01`" do
+        it "should only return topics with #{description} after 2023-06-01" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string("#{filter}-after:2023-6-01")
+              .pluck(:id),
+          ).to eq([])
+        end
+      end
+
+      describe "when query string is `#{filter}-before:2023-01-01`" do
+        it "should only return topics with #{description} before 2023-01-01" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string("#{filter}-before:2023-01-01")
+              .pluck(:id),
+          ).to contain_exactly(topic.id)
+        end
+      end
+
+      describe "when query string is `#{filter}-before:2023-1-1`" do
+        it "should only return topics with #{description} before 2023-01-01" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string("#{filter}-before:2023-1-1")
+              .pluck(:id),
+          ).to contain_exactly(topic.id)
+        end
+      end
+
+      describe "when query string is `#{filter}-before:2000-01-01`" do
+        it "should only return topics with #{description} before 2000-01-01" do
+          expect(
+            TopicsFilter
+              .new(guardian: Guardian.new)
+              .filter_from_query_string("#{filter}-before:2000-01-01")
+              .pluck(:id),
+          ).to eq([])
+        end
+      end
+    end
+
+    describe "when filtering by activity of topics" do
+      include_examples "filtering for topics by date column", "activity", :bumped_at, "bumped date"
+    end
+
+    describe "when filtering by creation date of topics" do
+      include_examples "filtering for topics by date column", "created", :created_at, "created date"
+    end
+
+    describe "when filtering by last post date of topics" do
+      include_examples "filtering for topics by date column",
+                       "latest-post",
+                       :last_posted_at,
+                       "last posted date"
+    end
+
+    describe "ordering topics filter" do
+      # Requires the fabrication of `topic`, `topic2` and `topic3` such that the order of the topics is `topic2`, `topic1`, `topic3`
+      # when ordered by the given filter in descending order.
+      shared_examples "ordering topics filters" do |order, order_description|
+        describe "when query string is `order:#{order}`" do
+          it "should return topics ordered by #{order_description} in descending order" do
+            expect(
+              TopicsFilter
+                .new(guardian: Guardian.new)
+                .filter_from_query_string("order:#{order}")
+                .pluck(:id),
+            ).to eq([topic2.id, topic.id, topic3.id])
+          end
+        end
+
+        describe "when query string is `order:#{order}-asc`" do
+          it "should return topics ordered by #{order_description} in ascending order" do
+            expect(
+              TopicsFilter
+                .new(guardian: Guardian.new)
+                .filter_from_query_string("order:#{order}-asc")
+                .pluck(:id),
+            ).to eq([topic3.id, topic.id, topic2.id])
+          end
+        end
+
+        describe "when query string is `order:#{order}-invalid`" do
+          it "should return topics ordered by the database's default order" do
+            expect(
+              TopicsFilter
+                .new(guardian: Guardian.new)
+                .filter_from_query_string("order:#{order}-invalid")
+                .pluck(:id),
+            ).to contain_exactly(*Topic.all.pluck(:id))
+          end
+        end
+      end
+
+      describe "when ordering topics by creation date" do
+        fab!(:topic) { Fabricate(:topic, created_at: Time.zone.local(2023, 1, 1)) }
+        fab!(:topic2) { Fabricate(:topic, created_at: Time.zone.local(2024, 1, 1)) }
+        fab!(:topic3) { Fabricate(:topic, created_at: Time.zone.local(2022, 1, 1)) }
+
+        include_examples "ordering topics filters", "created", "creation date"
+      end
+
+      describe "when ordering topics by last activity date" do
+        fab!(:topic) { Fabricate(:topic, bumped_at: Time.zone.local(2023, 1, 1)) }
+        fab!(:topic2) { Fabricate(:topic, bumped_at: Time.zone.local(2024, 1, 1)) }
+        fab!(:topic3) { Fabricate(:topic, bumped_at: Time.zone.local(2022, 1, 1)) }
+
+        include_examples "ordering topics filters", "activity", "bumped date"
+      end
+
+      describe "when ordering topics by number of likes in the topic" do
+        fab!(:topic) { Fabricate(:topic, like_count: 2) }
+        fab!(:topic2) { Fabricate(:topic, like_count: 3) }
+        fab!(:topic3) { Fabricate(:topic, like_count: 1) }
+
+        include_examples "ordering topics filters", "likes", "number of likes in the topic"
+      end
+
+      describe "when ordering topics by number of participants in the topic" do
+        fab!(:topic) { Fabricate(:topic, participant_count: 2) }
+        fab!(:topic2) { Fabricate(:topic, participant_count: 3) }
+        fab!(:topic3) { Fabricate(:topic, participant_count: 1) }
+
+        include_examples "ordering topics filters", "posters", "number of participants in the topic"
+      end
+
+      describe "when ordering topics by number of topics views" do
+        fab!(:topic) { Fabricate(:topic, views: 2) }
+        fab!(:topic2) { Fabricate(:topic, views: 3) }
+        fab!(:topic3) { Fabricate(:topic, views: 1) }
+
+        include_examples "ordering topics filters", "views", "number of views"
+      end
+
+      describe "when ordering topics by latest post creation date" do
+        fab!(:topic) { Fabricate(:topic, last_posted_at: Time.zone.local(2023, 1, 1)) }
+        fab!(:topic2) { Fabricate(:topic, last_posted_at: Time.zone.local(2024, 1, 1)) }
+        fab!(:topic3) { Fabricate(:topic, last_posted_at: Time.zone.local(2022, 1, 1)) }
+
+        include_examples "ordering topics filters", "latest-post", "latest post creation date"
+      end
+
+      describe "when ordering topics by number of likes in the first post" do
+        fab!(:topic) do
+          post = Fabricate(:post, like_count: 2)
+          post.topic
+        end
+
+        fab!(:topic2) do
+          post = Fabricate(:post, like_count: 3)
+          post.topic
+        end
+
+        fab!(:topic3) do
+          post = Fabricate(:post, like_count: 1)
+          post.topic
+        end
+
+        include_examples "ordering topics filters", "likes-op", "number of likes in the first post"
+      end
+
+      describe "when ordering by topics's category name" do
+        fab!(:category) { Fabricate(:category, name: "Category 1") }
+        fab!(:category2) { Fabricate(:category, name: "Category 2") }
+        fab!(:category3) { Fabricate(:category, name: "Category 3") }
+
+        fab!(:topic) { Fabricate(:topic, category: category2) }
+        fab!(:topic2) { Fabricate(:topic, category: category3) }
+        fab!(:topic3) { Fabricate(:topic, category: category) }
+
+        include_examples "ordering topics filters", "category", "category name"
+      end
+
+      describe "when ordering by topics's title" do
+        fab!(:topic3) { Fabricate(:topic, title: "This is topic number 1") }
+        fab!(:topic2) { Fabricate(:topic, title: "This is topic Number 3") }
+        fab!(:topic) { Fabricate(:topic, title: "This is topic number 2") }
+
+        include_examples "ordering topics filters", "title", "topic's title"
+      end
+
+      describe "composing multiple order filters" do
+        fab!(:topic) { Fabricate(:topic, created_at: Time.zone.local(2023, 1, 1), views: 2) }
+        fab!(:topic2) { Fabricate(:topic, created_at: Time.zone.local(2024, 1, 1), views: 2) }
+        fab!(:topic3) { Fabricate(:topic, created_at: Time.zone.local(2024, 1, 1), views: 1) }
+
+        describe "when query string is `order:created,views`" do
+          it "should return topics ordered by creation date in descending order and then number of views in descending order" do
+            expect(
+              TopicsFilter
+                .new(guardian: Guardian.new)
+                .filter_from_query_string("order:created,views")
+                .pluck(:id),
+            ).to eq([topic2.id, topic3.id, topic.id])
+          end
+        end
+
+        describe "when query string is `order:created order:views`" do
+          it "should return topics ordered by creation date in descending order and then number of views in descending order" do
+            expect(
+              TopicsFilter
+                .new(guardian: Guardian.new)
+                .filter_from_query_string("order:created order:views")
+                .pluck(:id),
+            ).to eq([topic2.id, topic3.id, topic.id])
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/lib/trashable_spec.rb b/spec/lib/trashable_spec.rb
index ca5d4e8ac5d..d0657ad15a3 100644
--- a/spec/lib/trashable_spec.rb
+++ b/spec/lib/trashable_spec.rb
@@ -9,4 +9,20 @@ RSpec.describe Trashable do
     expect { p1.trash! }.to change { Post.count }.by(-1)
     expect(Post.with_deleted.count).to eq(Post.count + 1)
   end
+
+  it "can list only deleted items" do
+    p1 = Fabricate(:post)
+    p2 = Fabricate(:post)
+
+    p1.trash!
+    expect(Post.only_deleted.count).to eq(1)
+    expect(Post.only_deleted.first).to eq(p1)
+  end
+
+  it "can recover" do
+    p1 = Fabricate(:post)
+    p1.trash!
+    expect { p1.recover! }.to change { Post.count }.by(1)
+    expect(Post.with_deleted.count).to eq(Post.count)
+  end
 end
diff --git a/spec/lib/upload_creator_spec.rb b/spec/lib/upload_creator_spec.rb
index cdc20d28603..36eb21b2f68 100644
--- a/spec/lib/upload_creator_spec.rb
+++ b/spec/lib/upload_creator_spec.rb
@@ -375,6 +375,18 @@ RSpec.describe UploadCreator do
         expect(stored_upload.url).not_to eq(signed_url)
         expect(signed_url).to match(/Amz-Credential/)
       end
+
+      it "should return CDN URL when enabled" do
+        SiteSetting.s3_use_cdn_url_for_all_uploads = true
+        SiteSetting.authorized_extensions = "pdf"
+        SiteSetting.s3_cdn_url = "https://example-cdn.com"
+
+        upload = UploadCreator.new(pdf_file, pdf_filename, opts).create_for(user.id)
+        stored_upload = Upload.last
+        cdn_url = Discourse.store.url_for(stored_upload)
+
+        expect(cdn_url).to match(/example-cdn\.com/)
+      end
     end
 
     context "when the upload already exists based on the sha1" do
@@ -419,6 +431,18 @@ RSpec.describe UploadCreator do
       end
     end
 
+    context "when the video thumbnail already exists based on the sha1" do
+      let(:filename) { "smallest.png" }
+      let(:file) { file_from_fixtures(filename, "images") }
+      let!(:existing_upload) { Fabricate(:upload, sha1: Upload.generate_digest(file)) }
+      let(:opts) { { type: "thumbnail" } }
+      let(:result) { UploadCreator.new(file, filename, opts).create_for(user.id) }
+
+      it "does not return the existing upload, as duplicate uploads are allowed" do
+        expect(result).not_to eq(existing_upload)
+      end
+    end
+
     context "with secure uploads functionality" do
       let(:filename) { "logo.jpg" }
       let(:file) { file_from_fixtures(filename) }
diff --git a/spec/lib/upload_security_spec.rb b/spec/lib/upload_security_spec.rb
index 8834ff4fc40..7ad9174a757 100644
--- a/spec/lib/upload_security_spec.rb
+++ b/spec/lib/upload_security_spec.rb
@@ -1,16 +1,17 @@
 # frozen_string_literal: true
 
 RSpec.describe UploadSecurity do
+  subject(:security) { described_class.new(upload, opts) }
+
   fab!(:private_category) { Fabricate(:private_category, group: Fabricate(:group)) }
   fab!(:post_in_secure_context) do
     Fabricate(:post, topic: Fabricate(:topic, category: private_category))
   end
   fab!(:upload) { Fabricate(:upload) }
+
   let(:type) { nil }
   let(:opts) { { type: type, creating: creating } }
 
-  subject { described_class.new(upload, opts) }
-
   context "when secure uploads is enabled" do
     before do
       setup_s3
@@ -24,63 +25,63 @@ RSpec.describe UploadSecurity do
         before { SiteSetting.login_required = true }
 
         it "returns true" do
-          expect(subject.should_be_secure?).to eq(true)
+          expect(security.should_be_secure?).to eq(true)
         end
 
         context "when uploading in public context" do
           describe "for a public type badge_image" do
             let(:type) { "badge_image" }
             it "returns false" do
-              expect(subject.should_be_secure?).to eq(false)
+              expect(security.should_be_secure?).to eq(false)
             end
           end
 
           describe "for a public type group_flair" do
             let(:type) { "group_flair" }
             it "returns false" do
-              expect(subject.should_be_secure?).to eq(false)
+              expect(security.should_be_secure?).to eq(false)
             end
           end
 
           describe "for a public type avatar" do
             let(:type) { "avatar" }
             it "returns false" do
-              expect(subject.should_be_secure?).to eq(false)
+              expect(security.should_be_secure?).to eq(false)
             end
           end
 
           describe "for a public type custom_emoji" do
             let(:type) { "custom_emoji" }
             it "returns false" do
-              expect(subject.should_be_secure?).to eq(false)
+              expect(security.should_be_secure?).to eq(false)
             end
           end
 
           describe "for a public type profile_background" do
             let(:type) { "profile_background" }
             it "returns false" do
-              expect(subject.should_be_secure?).to eq(false)
+              expect(security.should_be_secure?).to eq(false)
             end
           end
 
           describe "for a public type avatar" do
             let(:type) { "avatar" }
             it "returns false" do
-              expect(subject.should_be_secure?).to eq(false)
+              expect(security.should_be_secure?).to eq(false)
             end
           end
 
           describe "for a public type category_logo" do
             let(:type) { "category_logo" }
             it "returns false" do
-              expect(subject.should_be_secure?).to eq(false)
+              expect(security.should_be_secure?).to eq(false)
             end
           end
 
           describe "for a public type category_background" do
             let(:type) { "category_background" }
             it "returns false" do
-              expect(subject.should_be_secure?).to eq(false)
+              expect(security.should_be_secure?).to eq(false)
             end
           end
 
@@ -88,12 +89,12 @@ RSpec.describe UploadSecurity do
             let(:type) { "my_custom_type" }
 
             it "returns true if the custom type has not been added" do
-              expect(subject.should_be_secure?).to eq(true)
+              expect(security.should_be_secure?).to eq(true)
             end
 
             it "returns false if the custom type has been added" do
               UploadSecurity.register_custom_public_type(type)
-              expect(subject.should_be_secure?).to eq(false)
+              expect(security.should_be_secure?).to eq(false)
               UploadSecurity.reset_custom_public_types
             end
           end
@@ -102,7 +103,7 @@ RSpec.describe UploadSecurity do
             before { upload.stubs(:for_theme).returns(true) }
 
             it "returns false" do
-              expect(subject.should_be_secure?).to eq(false)
+              expect(security.should_be_secure?).to eq(false)
             end
           end
 
@@ -110,7 +111,7 @@ RSpec.describe UploadSecurity do
             before { upload.stubs(:for_site_setting).returns(true) }
 
             it "returns false" do
-              expect(subject.should_be_secure?).to eq(false)
+              expect(security.should_be_secure?).to eq(false)
             end
           end
 
@@ -118,7 +119,7 @@ RSpec.describe UploadSecurity do
             before { upload.stubs(:for_gravatar).returns(true) }
 
             it "returns false" do
-              expect(subject.should_be_secure?).to eq(false)
+              expect(security.should_be_secure?).to eq(false)
             end
           end
 
@@ -129,7 +130,7 @@ RSpec.describe UploadSecurity do
                   e.url == "/images/emoji/twitter/falafel.png?v=#{Emoji::EMOJI_VERSION}"
                 end
               upload.update!(origin: "http://localhost:3000#{falafel.url}")
-              expect(subject.should_be_secure?).to eq(false)
+              expect(security.should_be_secure?).to eq(false)
             end
           end
         end
@@ -139,14 +140,14 @@ RSpec.describe UploadSecurity do
         before { upload.update(access_control_post_id: post_in_secure_context.id) }
 
         it "returns true" do
-          expect(subject.should_be_secure?).to eq(true)
+          expect(security.should_be_secure?).to eq(true)
         end
 
         context "when the post is deleted" do
           before { post_in_secure_context.trash! }
 
           it "still determines whether the post has secure uploads; returns true" do
-            expect(subject.should_be_secure?).to eq(true)
+            expect(security.should_be_secure?).to eq(true)
           end
         end
       end
@@ -154,28 +155,28 @@ RSpec.describe UploadSecurity do
       context "when uploading in the composer" do
         let(:type) { "composer" }
         it "returns true" do
-          expect(subject.should_be_secure?).to eq(true)
+          expect(security.should_be_secure?).to eq(true)
         end
       end
 
       context "when uploading for a group message" do
         before { upload.stubs(:for_group_message).returns(true) }
         it "returns true" do
-          expect(subject.should_be_secure?).to eq(true)
+          expect(security.should_be_secure?).to eq(true)
         end
       end
 
       context "when uploading for a PM" do
         before { upload.stubs(:for_private_message).returns(true) }
         it "returns true" do
-          expect(subject.should_be_secure?).to eq(true)
+          expect(security.should_be_secure?).to eq(true)
         end
       end
 
       context "when upload is already secure" do
         before { upload.update(secure: true) }
         it "returns true" do
-          expect(subject.should_be_secure?).to eq(true)
+          expect(security.should_be_secure?).to eq(true)
         end
       end
 
@@ -185,7 +186,7 @@ RSpec.describe UploadSecurity do
         context "when the access control post has_secure_uploads?" do
           before { upload.update(access_control_post: post_in_secure_context) }
           it "returns true" do
-            expect(subject.should_be_secure?).to eq(true)
+            expect(security.should_be_secure?).to eq(true)
           end
         end
       end
@@ -213,7 +214,7 @@ RSpec.describe UploadSecurity do
       describe "when the upload is first used for a post in a secure context" do
         it "returns true" do
           create_secure_post_reference
-          expect(subject.should_be_secure?).to eq(true)
+          expect(security.should_be_secure?).to eq(true)
         end
       end
 
@@ -223,7 +224,7 @@ RSpec.describe UploadSecurity do
           post_in_secure_context.trash!
           CustomEmoji.create(name: "meme", upload: upload)
 
-          expect(subject.should_be_secure?).to eq(false)
+          expect(security.should_be_secure?).to eq(false)
         end
       end
 
@@ -231,7 +232,7 @@ RSpec.describe UploadSecurity do
         it "returns false" do
           SiteSetting.favicon = upload
           create_secure_post_reference
-          expect(subject.should_be_secure?).to eq(false)
+          expect(security.should_be_secure?).to eq(false)
         end
       end
 
@@ -239,7 +240,7 @@ RSpec.describe UploadSecurity do
         it "returns false" do
           Fabricate(:theme_field, type_id: ThemeField.types[:theme_upload_var], upload: upload)
           create_secure_post_reference
-          expect(subject.should_be_secure?).to eq(false)
+          expect(security.should_be_secure?).to eq(false)
         end
       end
 
@@ -247,7 +248,7 @@ RSpec.describe UploadSecurity do
         it "returns false" do
           Fabricate(:group, flair_upload: upload)
           create_secure_post_reference
-          expect(subject.should_be_secure?).to eq(false)
+          expect(security.should_be_secure?).to eq(false)
         end
       end
 
@@ -255,7 +256,19 @@ RSpec.describe UploadSecurity do
         it "returns false" do
           CustomEmoji.create(name: "meme", upload: upload)
           create_secure_post_reference
-          expect(subject.should_be_secure?).to eq(false)
+          expect(security.should_be_secure?).to eq(false)
+        end
+
+        context "when the created_at dates for upload references are identical" do
+          it "orders by id as well and returns false" do
+            now = Time.zone.now
+            custom_emoji = CustomEmoji.create(name: "meme", upload: upload)
+            create_secure_post_reference
+
+            UploadReference.find_by(target: custom_emoji).update!(created_at: now)
+            UploadReference.find_by(target: post_in_secure_context).update!(created_at: now)
+            expect(security.should_be_secure?).to eq(false)
+          end
         end
       end
 
@@ -263,7 +276,7 @@ RSpec.describe UploadSecurity do
         it "returns false" do
           Fabricate(:badge, image_upload: upload)
           create_secure_post_reference
-          expect(subject.should_be_secure?).to eq(false)
+          expect(security.should_be_secure?).to eq(false)
         end
       end
 
@@ -271,7 +284,7 @@ RSpec.describe UploadSecurity do
         it "returns false" do
           Fabricate(:category, uploaded_logo: upload)
           create_secure_post_reference
-          expect(subject.should_be_secure?).to eq(false)
+          expect(security.should_be_secure?).to eq(false)
         end
       end
 
@@ -280,7 +293,7 @@ RSpec.describe UploadSecurity do
           user = Fabricate(:user)
           user.user_profile.update!(card_background_upload: upload)
           create_secure_post_reference
-          expect(subject.should_be_secure?).to eq(false)
+          expect(security.should_be_secure?).to eq(false)
         end
       end
 
@@ -288,7 +301,7 @@ RSpec.describe UploadSecurity do
         it "returns false" do
           Fabricate(:user, uploaded_avatar: upload)
           create_secure_post_reference
-          expect(subject.should_be_secure?).to eq(false)
+          expect(security.should_be_secure?).to eq(false)
         end
       end
 
@@ -296,7 +309,7 @@ RSpec.describe UploadSecurity do
         it "returns false" do
           Fabricate(:user_avatar, custom_upload: upload)
           create_secure_post_reference
-          expect(subject.should_be_secure?).to eq(false)
+          expect(security.should_be_secure?).to eq(false)
         end
       end
     end
@@ -308,14 +321,14 @@ RSpec.describe UploadSecurity do
     before { SiteSetting.secure_uploads = false }
 
     it "returns false" do
-      expect(subject.should_be_secure?).to eq(false)
+      expect(security.should_be_secure?).to eq(false)
     end
 
     context "for attachments" do
       before { upload.update(original_filename: "test.pdf") }
 
       it "returns false" do
-        expect(subject.should_be_secure?).to eq(false)
+        expect(security.should_be_secure?).to eq(false)
       end
     end
   end
diff --git a/spec/lib/user_comm_screener_spec.rb b/spec/lib/user_comm_screener_spec.rb
index 4f8b851a58a..1305c3f51e9 100644
--- a/spec/lib/user_comm_screener_spec.rb
+++ b/spec/lib/user_comm_screener_spec.rb
@@ -1,18 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe UserCommScreener do
-  fab!(:target_user1) { Fabricate(:user, username: "bobscreen") }
-  fab!(:target_user2) { Fabricate(:user, username: "hughscreen") }
-  fab!(:target_user3) do
-    user = Fabricate(:user, username: "alicescreen")
-    user.user_option.update(allow_private_messages: false)
-    user
-  end
-  fab!(:target_user4) { Fabricate(:user, username: "janescreen") }
-  fab!(:target_user5) { Fabricate(:user, username: "maryscreen") }
-  fab!(:other_user) { Fabricate(:user) }
-
-  subject do
+  subject(:screener) do
     described_class.new(
       acting_user: acting_user,
       target_user_ids: [
@@ -25,6 +14,17 @@ RSpec.describe UserCommScreener do
     )
   end
 
+  fab!(:target_user1) { Fabricate(:user, username: "bobscreen") }
+  fab!(:target_user2) { Fabricate(:user, username: "hughscreen") }
+  fab!(:target_user3) do
+    user = Fabricate(:user, username: "alicescreen")
+    user.user_option.update(allow_private_messages: false)
+    user
+  end
+  fab!(:target_user4) { Fabricate(:user, username: "janescreen") }
+  fab!(:target_user5) { Fabricate(:user, username: "maryscreen") }
+  fab!(:other_user) { Fabricate(:user) }
+
   it "allows initializing the class with both an acting_user_id and an acting_user" do
     acting_user = Fabricate(:user)
     screener = described_class.new(acting_user: acting_user, target_user_ids: [target_user1.id])
@@ -58,7 +58,7 @@ RSpec.describe UserCommScreener do
 
     describe "#allowing_actor_communication" do
       it "returns the usernames of people not ignoring, muting, or disallowing PMs from the actor" do
-        expect(subject.allowing_actor_communication).to match_array(
+        expect(screener.allowing_actor_communication).to match_array(
           [target_user4.id, target_user5.id],
         )
       end
@@ -66,7 +66,7 @@ RSpec.describe UserCommScreener do
 
     describe "#preventing_actor_communication" do
       it "returns the usernames of people ignoring, muting, or disallowing PMs from the actor" do
-        expect(subject.preventing_actor_communication).to match_array(
+        expect(screener.preventing_actor_communication).to match_array(
           [target_user1.id, target_user2.id, target_user3.id],
         )
       end
@@ -74,23 +74,23 @@ RSpec.describe UserCommScreener do
 
     describe "#ignoring_or_muting_actor?" do
       it "does not raise an error when looking for a user who has no communication preferences" do
-        expect { subject.ignoring_or_muting_actor?(target_user5.id) }.not_to raise_error
+        expect { screener.ignoring_or_muting_actor?(target_user5.id) }.not_to raise_error
       end
 
       it "returns true for a user muting the actor" do
-        expect(subject.ignoring_or_muting_actor?(target_user1.id)).to eq(true)
+        expect(screener.ignoring_or_muting_actor?(target_user1.id)).to eq(true)
       end
 
       it "returns true for a user ignoring the actor" do
-        expect(subject.ignoring_or_muting_actor?(target_user2.id)).to eq(true)
+        expect(screener.ignoring_or_muting_actor?(target_user2.id)).to eq(true)
       end
 
       it "returns false for a user neither ignoring or muting the actor" do
-        expect(subject.ignoring_or_muting_actor?(target_user3.id)).to eq(false)
+        expect(screener.ignoring_or_muting_actor?(target_user3.id)).to eq(false)
       end
 
       it "raises a NotFound error if the user_id passed in is not part of the target users" do
-        expect { subject.ignoring_or_muting_actor?(other_user.id) }.to raise_error(
+        expect { screener.ignoring_or_muting_actor?(other_user.id) }.to raise_error(
           Discourse::NotFound,
         )
       end
@@ -98,34 +98,34 @@ RSpec.describe UserCommScreener do
 
     describe "#disallowing_pms_from_actor?" do
       it "returns true for a user disallowing all PMs" do
-        expect(subject.disallowing_pms_from_actor?(target_user3.id)).to eq(true)
+        expect(screener.disallowing_pms_from_actor?(target_user3.id)).to eq(true)
       end
 
       it "returns true for a user allowing only PMs for certain users but not the actor" do
         target_user4.user_option.update!(enable_allowed_pm_users: true)
-        expect(subject.disallowing_pms_from_actor?(target_user4.id)).to eq(true)
+        expect(screener.disallowing_pms_from_actor?(target_user4.id)).to eq(true)
       end
 
       it "returns false for a user allowing only PMs for certain users which the actor allowed" do
         target_user4.user_option.update!(enable_allowed_pm_users: true)
         AllowedPmUser.create!(user: target_user4, allowed_pm_user: acting_user)
-        expect(subject.disallowing_pms_from_actor?(target_user4.id)).to eq(false)
+        expect(screener.disallowing_pms_from_actor?(target_user4.id)).to eq(false)
       end
 
       it "returns false for a user not disallowing PMs or muting or ignoring" do
-        expect(subject.disallowing_pms_from_actor?(target_user5.id)).to eq(false)
+        expect(screener.disallowing_pms_from_actor?(target_user5.id)).to eq(false)
       end
 
       it "returns true for a user not disallowing PMs but still ignoring" do
-        expect(subject.disallowing_pms_from_actor?(target_user1.id)).to eq(true)
+        expect(screener.disallowing_pms_from_actor?(target_user1.id)).to eq(true)
       end
 
       it "returns true for a user not disallowing PMs but still muting" do
-        expect(subject.disallowing_pms_from_actor?(target_user2.id)).to eq(true)
+        expect(screener.disallowing_pms_from_actor?(target_user2.id)).to eq(true)
       end
 
       it "raises a NotFound error if the user_id passed in is not part of the target users" do
-        expect { subject.disallowing_pms_from_actor?(other_user.id) }.to raise_error(
+        expect { screener.disallowing_pms_from_actor?(other_user.id) }.to raise_error(
           Discourse::NotFound,
         )
       end
@@ -146,7 +146,7 @@ RSpec.describe UserCommScreener do
 
     describe "#allowing_actor_communication" do
       it "returns all usernames since staff can communicate with anyone" do
-        expect(subject.allowing_actor_communication).to match_array(
+        expect(screener.allowing_actor_communication).to match_array(
           [target_user1.id, target_user2.id, target_user3.id, target_user4.id, target_user5.id],
         )
       end
@@ -154,25 +154,25 @@ RSpec.describe UserCommScreener do
 
     describe "#preventing_actor_communication" do
       it "does not return any usernames since no users can prevent staff communicating with them" do
-        expect(subject.preventing_actor_communication).to eq([])
+        expect(screener.preventing_actor_communication).to eq([])
       end
     end
 
     describe "#ignoring_or_muting_actor?" do
       it "returns false for a user muting the staff" do
-        expect(subject.ignoring_or_muting_actor?(target_user1.id)).to eq(false)
+        expect(screener.ignoring_or_muting_actor?(target_user1.id)).to eq(false)
       end
 
       it "returns false for a user ignoring the staff actor" do
-        expect(subject.ignoring_or_muting_actor?(target_user2.id)).to eq(false)
+        expect(screener.ignoring_or_muting_actor?(target_user2.id)).to eq(false)
       end
 
       it "returns false for a user neither ignoring or muting the actor" do
-        expect(subject.ignoring_or_muting_actor?(target_user3.id)).to eq(false)
+        expect(screener.ignoring_or_muting_actor?(target_user3.id)).to eq(false)
       end
 
       it "raises a NotFound error if the user_id passed in is not part of the target users" do
-        expect { subject.ignoring_or_muting_actor?(other_user.id) }.to raise_error(
+        expect { screener.ignoring_or_muting_actor?(other_user.id) }.to raise_error(
           Discourse::NotFound,
         )
       end
@@ -180,28 +180,28 @@ RSpec.describe UserCommScreener do
 
     describe "#disallowing_pms_from_actor?" do
       it "returns false for a user disallowing all PMs" do
-        expect(subject.disallowing_pms_from_actor?(target_user3.id)).to eq(false)
+        expect(screener.disallowing_pms_from_actor?(target_user3.id)).to eq(false)
       end
 
       it "returns false for a user allowing only PMs for certain users but not the actor" do
         target_user4.user_option.update!(enable_allowed_pm_users: true)
-        expect(subject.disallowing_pms_from_actor?(target_user4.id)).to eq(false)
+        expect(screener.disallowing_pms_from_actor?(target_user4.id)).to eq(false)
       end
 
       it "returns false for a user not disallowing PMs or muting or ignoring" do
-        expect(subject.disallowing_pms_from_actor?(target_user5.id)).to eq(false)
+        expect(screener.disallowing_pms_from_actor?(target_user5.id)).to eq(false)
       end
 
       it "returns false for a user not disallowing PMs but still ignoring" do
-        expect(subject.disallowing_pms_from_actor?(target_user1.id)).to eq(false)
+        expect(screener.disallowing_pms_from_actor?(target_user1.id)).to eq(false)
       end
 
       it "returns false for a user not disallowing PMs but still muting" do
-        expect(subject.disallowing_pms_from_actor?(target_user2.id)).to eq(false)
+        expect(screener.disallowing_pms_from_actor?(target_user2.id)).to eq(false)
       end
 
       it "raises a NotFound error if the user_id passed in is not part of the target users" do
-        expect { subject.disallowing_pms_from_actor?(other_user.id) }.to raise_error(
+        expect { screener.disallowing_pms_from_actor?(other_user.id) }.to raise_error(
           Discourse::NotFound,
         )
       end
@@ -232,13 +232,13 @@ RSpec.describe UserCommScreener do
     describe "#actor_preventing_communication" do
       it "returns the user_ids of the users the actor is ignoring, muting, or disallowing PMs from" do
         acting_user.user_option.update!(enable_allowed_pm_users: true)
-        expect(subject.actor_preventing_communication).to match_array(
+        expect(screener.actor_preventing_communication).to match_array(
           [target_user1.id, target_user2.id, target_user3.id, target_user5.id],
         )
       end
 
       it "does not include users the actor is disallowing PMs from if they have not set enable_allowed_pm_users" do
-        expect(subject.actor_preventing_communication).to match_array(
+        expect(screener.actor_preventing_communication).to match_array(
           [target_user1.id, target_user2.id],
         )
       end
@@ -250,7 +250,7 @@ RSpec.describe UserCommScreener do
         end
 
         it "returns an empty array and does not error" do
-          expect(subject.actor_preventing_communication).to match_array([])
+          expect(screener.actor_preventing_communication).to match_array([])
         end
       end
     end
@@ -258,7 +258,7 @@ RSpec.describe UserCommScreener do
     describe "#actor_allowing_communication" do
       it "returns the user_ids of the users who the actor is not ignoring, muting, or disallowing PMs from" do
         acting_user.user_option.update!(enable_allowed_pm_users: true)
-        expect(subject.actor_allowing_communication).to match_array([target_user4.id])
+        expect(screener.actor_allowing_communication).to match_array([target_user4.id])
       end
 
       describe "when the actor has no preferences" do
@@ -268,7 +268,7 @@ RSpec.describe UserCommScreener do
         end
 
         it "returns an array of the target users and does not error" do
-          expect(subject.actor_allowing_communication).to match_array(
+          expect(screener.actor_allowing_communication).to match_array(
             [target_user1.id, target_user2.id, target_user3.id, target_user4.id, target_user5.id],
           )
         end
@@ -277,49 +277,51 @@ RSpec.describe UserCommScreener do
 
     describe "#actor_ignoring?" do
       it "returns true for user ids that the actor is ignoring" do
-        expect(subject.actor_ignoring?(target_user2.id)).to eq(true)
-        expect(subject.actor_ignoring?(target_user4.id)).to eq(false)
+        expect(screener.actor_ignoring?(target_user2.id)).to eq(true)
+        expect(screener.actor_ignoring?(target_user4.id)).to eq(false)
       end
 
       it "raises a NotFound error if the user_id passed in is not part of the target users" do
-        expect { subject.actor_ignoring?(other_user.id) }.to raise_error(Discourse::NotFound)
+        expect { screener.actor_ignoring?(other_user.id) }.to raise_error(Discourse::NotFound)
       end
     end
 
     describe "#actor_muting?" do
       it "returns true for user ids that the actor is muting" do
-        expect(subject.actor_muting?(target_user1.id)).to eq(true)
-        expect(subject.actor_muting?(target_user2.id)).to eq(false)
+        expect(screener.actor_muting?(target_user1.id)).to eq(true)
+        expect(screener.actor_muting?(target_user2.id)).to eq(false)
       end
 
       it "raises a NotFound error if the user_id passed in is not part of the target users" do
-        expect { subject.actor_muting?(other_user.id) }.to raise_error(Discourse::NotFound)
+        expect { screener.actor_muting?(other_user.id) }.to raise_error(Discourse::NotFound)
       end
     end
 
     describe "#actor_disallowing_pms?" do
       it "returns true for user ids that the actor is not explicitly allowing PMs from" do
         acting_user.user_option.update!(enable_allowed_pm_users: true)
-        expect(subject.actor_disallowing_pms?(target_user3.id)).to eq(true)
-        expect(subject.actor_disallowing_pms?(target_user1.id)).to eq(false)
+        expect(screener.actor_disallowing_pms?(target_user3.id)).to eq(true)
+        expect(screener.actor_disallowing_pms?(target_user1.id)).to eq(false)
       end
 
       it "returns true if the actor has disallowed all PMs" do
         acting_user.user_option.update!(allow_private_messages: false)
-        expect(subject.actor_disallowing_pms?(target_user3.id)).to eq(true)
-        expect(subject.actor_disallowing_pms?(target_user1.id)).to eq(true)
+        expect(screener.actor_disallowing_pms?(target_user3.id)).to eq(true)
+        expect(screener.actor_disallowing_pms?(target_user1.id)).to eq(true)
       end
 
       it "raises a NotFound error if the user_id passed in is not part of the target users" do
-        expect { subject.actor_disallowing_pms?(other_user.id) }.to raise_error(Discourse::NotFound)
+        expect { screener.actor_disallowing_pms?(other_user.id) }.to raise_error(
+          Discourse::NotFound,
+        )
       end
     end
 
     describe "#actor_disallowing_all_pms?" do
       it "returns true if the acting user has disabled private messages altogether" do
-        expect(subject.actor_disallowing_all_pms?).to eq(false)
+        expect(screener.actor_disallowing_all_pms?).to eq(false)
         acting_user.user_option.update!(allow_private_messages: false)
-        expect(subject.actor_disallowing_all_pms?).to eq(true)
+        expect(screener.actor_disallowing_all_pms?).to eq(true)
       end
     end
   end
diff --git a/spec/lib/validators/allowed_ip_address_validator_spec.rb b/spec/lib/validators/allowed_ip_address_validator_spec.rb
index 03f176293a4..5f9c31b6166 100644
--- a/spec/lib/validators/allowed_ip_address_validator_spec.rb
+++ b/spec/lib/validators/allowed_ip_address_validator_spec.rb
@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 RSpec.describe AllowedIpAddressValidator do
+  subject(:validate) { validator.validate_each(record, :ip_address, record.ip_address) }
+
   let(:record) { Fabricate.build(:user, trust_level: TrustLevel[0], ip_address: "99.232.23.123") }
   let(:validator) { described_class.new(attributes: :ip_address) }
-  subject(:validate) { validator.validate_each(record, :ip_address, record.ip_address) }
 
   context "when ip address should be blocked" do
     it "should add an error" do
diff --git a/spec/lib/validators/css_color_validator_spec.rb b/spec/lib/validators/css_color_validator_spec.rb
index 115531e40b8..acec8e18920 100644
--- a/spec/lib/validators/css_color_validator_spec.rb
+++ b/spec/lib/validators/css_color_validator_spec.rb
@@ -1,21 +1,21 @@
 # frozen_string_literal: true
 
 RSpec.describe CssColorValidator do
-  subject { described_class.new }
+  subject(:validator) { described_class.new }
 
   it "validates hex colors" do
-    expect(subject.valid_value?("#0")).to eq(false)
-    expect(subject.valid_value?("#00")).to eq(false)
-    expect(subject.valid_value?("#000")).to eq(true)
-    expect(subject.valid_value?("#0000")).to eq(false)
-    expect(subject.valid_value?("#00000")).to eq(false)
-    expect(subject.valid_value?("#000000")).to eq(true)
+    expect(validator.valid_value?("#0")).to eq(false)
+    expect(validator.valid_value?("#00")).to eq(false)
+    expect(validator.valid_value?("#000")).to eq(true)
+    expect(validator.valid_value?("#0000")).to eq(false)
+    expect(validator.valid_value?("#00000")).to eq(false)
+    expect(validator.valid_value?("#000000")).to eq(true)
   end
 
   it "validates css colors" do
-    expect(subject.valid_value?("red")).to eq(true)
-    expect(subject.valid_value?("green")).to eq(true)
-    expect(subject.valid_value?("blue")).to eq(true)
-    expect(subject.valid_value?("hello")).to eq(false)
+    expect(validator.valid_value?("red")).to eq(true)
+    expect(validator.valid_value?("green")).to eq(true)
+    expect(validator.valid_value?("blue")).to eq(true)
+    expect(validator.valid_value?("hello")).to eq(false)
   end
 end
diff --git a/spec/lib/validators/enable_invite_only_validator_spec.rb b/spec/lib/validators/enable_invite_only_validator_spec.rb
deleted file mode 100644
index 24588e2f9d8..00000000000
--- a/spec/lib/validators/enable_invite_only_validator_spec.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe EnableInviteOnlyValidator do
-  subject { described_class.new }
-
-  context "when sso is enabled" do
-    before do
-      SiteSetting.discourse_connect_url = "https://example.com/sso"
-      SiteSetting.enable_discourse_connect = true
-    end
-
-    it "is valid when false" do
-      expect(subject.valid_value?("f")).to eq(true)
-    end
-
-    it "is isn't value for true" do
-      expect(subject.valid_value?("t")).to eq(false)
-      expect(subject.error_message).to eq(
-        I18n.t("site_settings.errors.discourse_connect_invite_only"),
-      )
-    end
-  end
-
-  context "when sso isn't enabled" do
-    it "is valid when true or false" do
-      expect(subject.valid_value?("f")).to eq(true)
-      expect(subject.valid_value?("t")).to eq(true)
-    end
-  end
-end
diff --git a/spec/lib/validators/enable_local_logins_via_email_validator_spec.rb b/spec/lib/validators/enable_local_logins_via_email_validator_spec.rb
index 8469aae93a0..ff68d47a608 100644
--- a/spec/lib/validators/enable_local_logins_via_email_validator_spec.rb
+++ b/spec/lib/validators/enable_local_logins_via_email_validator_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe EnableLocalLoginsViaEmailValidator do
-  subject { described_class.new }
+  subject(:validator) { described_class.new }
 
   describe "#valid_value?" do
     describe "when 'enable_local_logins' is false" do
@@ -9,15 +9,15 @@ RSpec.describe EnableLocalLoginsViaEmailValidator do
 
       describe "when val is false" do
         it "should be valid" do
-          expect(subject.valid_value?("f")).to eq(true)
+          expect(validator.valid_value?("f")).to eq(true)
         end
       end
 
       describe "when value is true" do
         it "should not be valid" do
-          expect(subject.valid_value?("t")).to eq(false)
+          expect(validator.valid_value?("t")).to eq(false)
 
-          expect(subject.error_message).to eq(
+          expect(validator.error_message).to eq(
             I18n.t("site_settings.errors.enable_local_logins_disabled"),
           )
         end
@@ -29,13 +29,13 @@ RSpec.describe EnableLocalLoginsViaEmailValidator do
 
       describe "when val is false" do
         it "should be valid" do
-          expect(subject.valid_value?("f")).to eq(true)
+          expect(validator.valid_value?("f")).to eq(true)
         end
       end
 
       describe "when value is true" do
         it "should be valid" do
-          expect(subject.valid_value?("t")).to eq(true)
+          expect(validator.valid_value?("t")).to eq(true)
         end
       end
     end
diff --git a/spec/lib/validators/enable_sso_validator_spec.rb b/spec/lib/validators/enable_sso_validator_spec.rb
index 1237a0028b8..c6ff325701f 100644
--- a/spec/lib/validators/enable_sso_validator_spec.rb
+++ b/spec/lib/validators/enable_sso_validator_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe EnableSsoValidator do
-  subject { described_class.new }
+  subject(:validator) { described_class.new }
 
   describe "#valid_value?" do
     describe "when 'sso url' is empty" do
@@ -9,51 +9,33 @@ RSpec.describe EnableSsoValidator do
 
       describe "when val is false" do
         it "should be valid" do
-          expect(subject.valid_value?("f")).to eq(true)
+          expect(validator.valid_value?("f")).to eq(true)
         end
       end
 
       describe "when value is true" do
         it "should not be valid" do
-          expect(subject.valid_value?("t")).to eq(false)
+          expect(validator.valid_value?("t")).to eq(false)
 
-          expect(subject.error_message).to eq(
+          expect(validator.error_message).to eq(
             I18n.t("site_settings.errors.discourse_connect_url_is_empty"),
           )
         end
       end
     end
 
-    describe "when invite_only is set" do
-      before do
-        SiteSetting.invite_only = true
-        SiteSetting.discourse_connect_url = "https://example.com/sso"
-      end
-
-      it "allows a false value" do
-        expect(subject.valid_value?("f")).to eq(true)
-      end
-
-      it "doesn't allow true" do
-        expect(subject.valid_value?("t")).to eq(false)
-        expect(subject.error_message).to eq(
-          I18n.t("site_settings.errors.discourse_connect_invite_only"),
-        )
-      end
-    end
-
     describe "when 'sso url' is present" do
       before { SiteSetting.discourse_connect_url = "https://www.example.com/sso" }
 
       describe "when value is false" do
         it "should be valid" do
-          expect(subject.valid_value?("f")).to eq(true)
+          expect(validator.valid_value?("f")).to eq(true)
         end
       end
 
       describe "when value is true" do
         it "should be valid" do
-          expect(subject.valid_value?("t")).to eq(true)
+          expect(validator.valid_value?("t")).to eq(true)
         end
       end
     end
@@ -64,13 +46,13 @@ RSpec.describe EnableSsoValidator do
       it "should be invalid" do
         SiteSetting.enforce_second_factor = "all"
 
-        expect(subject.valid_value?("t")).to eq(false)
+        expect(validator.valid_value?("t")).to eq(false)
       end
 
       it "should be valid" do
         SiteSetting.enforce_second_factor = "no"
 
-        expect(subject.valid_value?("t")).to eq(true)
+        expect(validator.valid_value?("t")).to eq(true)
       end
     end
   end
diff --git a/spec/lib/validators/external_system_avatars_validator_spec.rb b/spec/lib/validators/external_system_avatars_validator_spec.rb
index 526eaa372ce..c949238daf4 100644
--- a/spec/lib/validators/external_system_avatars_validator_spec.rb
+++ b/spec/lib/validators/external_system_avatars_validator_spec.rb
@@ -1,25 +1,25 @@
 # frozen_string_literal: true
 
 RSpec.describe ExternalSystemAvatarsValidator do
-  subject { described_class.new }
+  subject(:validator) { described_class.new }
 
   it "disallows disabling external system avatars when Unicode usernames are enabled" do
     SiteSetting.unicode_usernames = true
 
-    expect(subject.valid_value?("f")).to eq(false)
-    expect(subject.error_message).to eq(I18n.t("site_settings.errors.unicode_usernames_avatars"))
+    expect(validator.valid_value?("f")).to eq(false)
+    expect(validator.error_message).to eq(I18n.t("site_settings.errors.unicode_usernames_avatars"))
 
-    expect(subject.valid_value?("t")).to eq(true)
-    expect(subject.error_message).to be_blank
+    expect(validator.valid_value?("t")).to eq(true)
+    expect(validator.error_message).to be_blank
   end
 
   it "allows disabling external system avatars when Unicode usernames are disabled" do
     SiteSetting.unicode_usernames = false
 
-    expect(subject.valid_value?("t")).to eq(true)
-    expect(subject.error_message).to be_blank
+    expect(validator.valid_value?("t")).to eq(true)
+    expect(validator.error_message).to be_blank
 
-    expect(subject.valid_value?("f")).to eq(true)
-    expect(subject.error_message).to be_blank
+    expect(validator.valid_value?("f")).to eq(true)
+    expect(validator.error_message).to be_blank
   end
 end
diff --git a/spec/lib/validators/ip_address_format_validator_spec.rb b/spec/lib/validators/ip_address_format_validator_spec.rb
index 1e9df7db3cf..d0c5abc71bb 100644
--- a/spec/lib/validators/ip_address_format_validator_spec.rb
+++ b/spec/lib/validators/ip_address_format_validator_spec.rb
@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 RSpec.describe IpAddressFormatValidator do
+  subject(:validate) { validator.validate_each(record, :ip_address, record.ip_address) }
+
   let(:record) { Fabricate.build(:screened_ip_address, ip_address: "99.232.23.123") }
   let(:validator) { described_class.new(attributes: :ip_address) }
-  subject(:validate) { validator.validate_each(record, :ip_address, record.ip_address) }
 
   %w[99.232.23.123 99.232.0.0/16 fd12:db8::ff00:42:8329 fc00::/7].each do |arg|
     it "should not add an error for #{arg}" do
diff --git a/spec/lib/validators/max_username_length_validator_spec.rb b/spec/lib/validators/max_username_length_validator_spec.rb
index 2d64a856469..292dc821a60 100644
--- a/spec/lib/validators/max_username_length_validator_spec.rb
+++ b/spec/lib/validators/max_username_length_validator_spec.rb
@@ -25,16 +25,19 @@ RSpec.describe MaxUsernameLengthValidator do
   end
 
   it "checks for users with short usernames" do
-    user = Fabricate(:user, username: "jackjackjack")
+    username = "jackjackjack"
+    Fabricate(:user, username: username)
 
     validator = described_class.new
-    expect(validator.valid_value?(12)).to eq(true)
+    expect(validator.valid_value?(12)).to eq(true),
+    "Valid as 12 >= #{SiteSetting.min_username_length}"
 
     validator = described_class.new
-    expect(validator.valid_value?(11)).to eq(false)
+    expect(validator.valid_value?(11)).to eq(false),
+    "Invalid as 11 < #{SiteSetting.min_username_length}"
 
     expect(validator.error_message).to eq(
-      I18n.t("site_settings.errors.max_username_length_exists", username: "jackjackjack"),
+      I18n.t("site_settings.errors.max_username_length_exists", username: username),
     )
   end
 end
diff --git a/spec/lib/validators/password_validator_spec.rb b/spec/lib/validators/password_validator_spec.rb
index eb8bc4e590a..ce27c633a8d 100644
--- a/spec/lib/validators/password_validator_spec.rb
+++ b/spec/lib/validators/password_validator_spec.rb
@@ -5,9 +5,10 @@ RSpec.describe PasswordValidator do
     I18n.t("activerecord.errors.models.user.attributes.password.#{key.to_s}")
   end
 
-  let(:validator) { described_class.new(attributes: :password) }
   subject(:validate) { validator.validate_each(record, :password, @password) }
 
+  let(:validator) { described_class.new(attributes: :password) }
+
   describe "password required" do
     let(:record) do
       u = Fabricate.build(:user, password: @password)
diff --git a/spec/lib/validators/regex_presence_validator_spec.rb b/spec/lib/validators/regex_presence_validator_spec.rb
index 416ac83d2cc..cac2332a2aa 100644
--- a/spec/lib/validators/regex_presence_validator_spec.rb
+++ b/spec/lib/validators/regex_presence_validator_spec.rb
@@ -1,28 +1,28 @@
 # frozen_string_literal: true
 
 RSpec.describe RegexPresenceValidator do
-  subject do
+  subject(:validator) do
     described_class.new(regex: "latest", regex_error: "site_settings.errors.must_include_latest")
   end
 
   describe "#valid_value?" do
     describe "when value is present" do
       it "without regex match" do
-        expect(subject.valid_value?("categories|new")).to eq(false)
+        expect(validator.valid_value?("categories|new")).to eq(false)
 
-        expect(subject.error_message).to eq(I18n.t("site_settings.errors.must_include_latest"))
+        expect(validator.error_message).to eq(I18n.t("site_settings.errors.must_include_latest"))
       end
 
       it "with regex match" do
-        expect(subject.valid_value?("latest|categories")).to eq(true)
+        expect(validator.valid_value?("latest|categories")).to eq(true)
       end
     end
 
     describe "when value is empty" do
       it "should not be valid" do
-        expect(subject.valid_value?("")).to eq(false)
+        expect(validator.valid_value?("")).to eq(false)
 
-        expect(subject.error_message).to eq(I18n.t("site_settings.errors.must_include_latest"))
+        expect(validator.error_message).to eq(I18n.t("site_settings.errors.must_include_latest"))
       end
     end
   end
diff --git a/spec/lib/validators/regexp_list_validator_spec.rb b/spec/lib/validators/regexp_list_validator_spec.rb
index fb2f816c414..98f2990f11e 100644
--- a/spec/lib/validators/regexp_list_validator_spec.rb
+++ b/spec/lib/validators/regexp_list_validator_spec.rb
@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
 RSpec.describe RegexpListValidator do
-  subject { described_class.new }
+  subject(:validator) { described_class.new }
 
   it "allows lists of valid regular expressions" do
-    expect(subject.valid_value?('\d+|[0-9]?|\w+')).to eq(true)
+    expect(validator.valid_value?('\d+|[0-9]?|\w+')).to eq(true)
   end
 
   it "does not allow lists of invalid regular expressions do" do
-    expect(subject.valid_value?('\d+|[0-9?|\w+')).to eq(false)
-    expect(subject.error_message).to eq(
+    expect(validator.valid_value?('\d+|[0-9?|\w+')).to eq(false)
+    expect(validator.error_message).to eq(
       I18n.t(
         "site_settings.errors.invalid_regex_with_message",
         regex: "[0-9?",
diff --git a/spec/lib/validators/search_ranking_weights_validator_spec.rb b/spec/lib/validators/search_ranking_weights_validator_spec.rb
new file mode 100644
index 00000000000..8845e3cc55d
--- /dev/null
+++ b/spec/lib/validators/search_ranking_weights_validator_spec.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+RSpec.describe SearchRankingWeightsValidator do
+  it "allows a blank value to be set" do
+    expect { SiteSetting.search_ranking_weights = "" }.not_to raise_error
+  end
+
+  it "raises the right error when value is invalid" do
+    expect { SiteSetting.search_ranking_weights = "test" }.to raise_error(
+      Discourse::InvalidParameters,
+      /#{I18n.t("site_settings.errors.invalid_search_ranking_weights")}/,
+    )
+
+    expect { SiteSetting.search_ranking_weights = "{1.1,0.1,0.2,0.3}" }.to raise_error(
+      Discourse::InvalidParameters,
+      /#{I18n.t("site_settings.errors.invalid_search_ranking_weights")}/,
+    )
+  end
+
+  it "sets the site setting when value is valid" do
+    expect { SiteSetting.search_ranking_weights = "{0.001,0.2,0.003,1.0}" }.to_not raise_error
+  end
+end
diff --git a/spec/lib/validators/sso_overrides_email_validator_spec.rb b/spec/lib/validators/sso_overrides_email_validator_spec.rb
index cb868e6d391..ff5623e7eec 100644
--- a/spec/lib/validators/sso_overrides_email_validator_spec.rb
+++ b/spec/lib/validators/sso_overrides_email_validator_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe SsoOverridesEmailValidator do
-  subject { described_class.new }
+  subject(:validator) { described_class.new }
 
   describe "#valid_value?" do
     describe "when 'email editable' is true" do
@@ -13,15 +13,17 @@ RSpec.describe SsoOverridesEmailValidator do
 
       describe "when val is false" do
         it "should be valid" do
-          expect(subject.valid_value?("f")).to eq(true)
+          expect(validator.valid_value?("f")).to eq(true)
         end
       end
 
       describe "when value is true" do
         it "should not be valid" do
-          expect(subject.valid_value?("t")).to eq(false)
+          expect(validator.valid_value?("t")).to eq(false)
 
-          expect(subject.error_message).to eq(I18n.t("site_settings.errors.email_editable_enabled"))
+          expect(validator.error_message).to eq(
+            I18n.t("site_settings.errors.email_editable_enabled"),
+          )
         end
       end
     end
@@ -35,13 +37,13 @@ RSpec.describe SsoOverridesEmailValidator do
 
       describe "when value is false" do
         it "should be valid" do
-          expect(subject.valid_value?("f")).to eq(true)
+          expect(validator.valid_value?("f")).to eq(true)
         end
       end
 
       describe "when value is true" do
         it "should be valid" do
-          expect(subject.valid_value?("t")).to eq(true)
+          expect(validator.valid_value?("t")).to eq(true)
         end
       end
     end
diff --git a/spec/lib/validators/unicode_username_allowlist_validator_spec.rb b/spec/lib/validators/unicode_username_allowlist_validator_spec.rb
index de53888d05c..60d9d8131a7 100644
--- a/spec/lib/validators/unicode_username_allowlist_validator_spec.rb
+++ b/spec/lib/validators/unicode_username_allowlist_validator_spec.rb
@@ -1,37 +1,37 @@
 # frozen_string_literal: true
 
 RSpec.describe UnicodeUsernameAllowlistValidator do
-  subject { described_class.new }
+  subject(:validator) { described_class.new }
 
   it "allows an empty allowlist" do
-    expect(subject.valid_value?("")).to eq(true)
-    expect(subject.error_message).to be_blank
+    expect(validator.valid_value?("")).to eq(true)
+    expect(validator.error_message).to be_blank
   end
 
   it "disallows leading and trailing slashes" do
     expected_error = I18n.t("site_settings.errors.allowed_unicode_usernames.leading_trailing_slash")
 
-    expect(subject.valid_value?("/foo/")).to eq(false)
-    expect(subject.error_message).to eq(expected_error)
+    expect(validator.valid_value?("/foo/")).to eq(false)
+    expect(validator.error_message).to eq(expected_error)
 
-    expect(subject.valid_value?("foo/")).to eq(true)
-    expect(subject.error_message).to be_blank
+    expect(validator.valid_value?("foo/")).to eq(true)
+    expect(validator.error_message).to be_blank
 
-    expect(subject.valid_value?("/foo")).to eq(true)
-    expect(subject.error_message).to be_blank
+    expect(validator.valid_value?("/foo")).to eq(true)
+    expect(validator.error_message).to be_blank
 
-    expect(subject.valid_value?("f/o/o")).to eq(true)
-    expect(subject.error_message).to be_blank
+    expect(validator.valid_value?("f/o/o")).to eq(true)
+    expect(validator.error_message).to be_blank
 
-    expect(subject.valid_value?("/foo/i")).to eq(false)
-    expect(subject.error_message).to eq(expected_error)
+    expect(validator.valid_value?("/foo/i")).to eq(false)
+    expect(validator.error_message).to eq(expected_error)
   end
 
   it "detects invalid regular expressions" do
     expected_error =
       I18n.t("site_settings.errors.allowed_unicode_usernames.regex_invalid", error: "")
 
-    expect(subject.valid_value?("\\p{Foo}")).to eq(false)
-    expect(subject.error_message).to start_with(expected_error)
+    expect(validator.valid_value?("\\p{Foo}")).to eq(false)
+    expect(validator.error_message).to start_with(expected_error)
   end
 end
diff --git a/spec/lib/validators/unicode_username_validator_spec.rb b/spec/lib/validators/unicode_username_validator_spec.rb
index 23656f0caf4..649fca8632e 100644
--- a/spec/lib/validators/unicode_username_validator_spec.rb
+++ b/spec/lib/validators/unicode_username_validator_spec.rb
@@ -1,25 +1,25 @@
 # frozen_string_literal: true
 
 RSpec.describe UnicodeUsernameValidator do
-  subject { described_class.new }
+  subject(:validator) { described_class.new }
 
   it "disallows Unicode usernames when external system avatars are disabled" do
     SiteSetting.external_system_avatars_enabled = false
 
-    expect(subject.valid_value?("t")).to eq(false)
-    expect(subject.error_message).to eq(I18n.t("site_settings.errors.unicode_usernames_avatars"))
+    expect(validator.valid_value?("t")).to eq(false)
+    expect(validator.error_message).to eq(I18n.t("site_settings.errors.unicode_usernames_avatars"))
 
-    expect(subject.valid_value?("f")).to eq(true)
-    expect(subject.error_message).to be_blank
+    expect(validator.valid_value?("f")).to eq(true)
+    expect(validator.error_message).to be_blank
   end
 
   it "allows Unicode usernames when external system avatars are enabled" do
     SiteSetting.external_system_avatars_enabled = true
 
-    expect(subject.valid_value?("t")).to eq(true)
-    expect(subject.error_message).to be_blank
+    expect(validator.valid_value?("t")).to eq(true)
+    expect(validator.error_message).to be_blank
 
-    expect(subject.valid_value?("f")).to eq(true)
-    expect(subject.error_message).to be_blank
+    expect(validator.valid_value?("f")).to eq(true)
+    expect(validator.error_message).to be_blank
   end
 end
diff --git a/spec/lib/validators/upload_validator_spec.rb b/spec/lib/validators/upload_validator_spec.rb
index 49fec1fef84..3f82ff8ea6c 100644
--- a/spec/lib/validators/upload_validator_spec.rb
+++ b/spec/lib/validators/upload_validator_spec.rb
@@ -45,7 +45,7 @@ RSpec.describe UploadValidator do
             original_filename: "test.png",
             filesize: 2_097_152,
           )
-        subject.validate(upload)
+        validator.validate(upload)
         expect(upload.errors.full_messages.first).to eq(
           "Filesize #{I18n.t("upload.images.too_large_humanized", max_size: "1.5 MB")}",
         )
@@ -62,7 +62,7 @@ RSpec.describe UploadValidator do
             for_private_message: true,
           )
 
-        expect(subject.validate(upload)).to eq(true)
+        expect(validator.validate(upload)).to eq(true)
       end
 
       describe "for a normal user" do
@@ -75,7 +75,7 @@ RSpec.describe UploadValidator do
               for_private_message: true,
             )
 
-          expect(subject.validate(upload)).to eq(nil)
+          expect(validator.validate(upload)).to eq(nil)
         end
       end
     end
@@ -91,13 +91,13 @@ RSpec.describe UploadValidator do
 
       describe "for admin user" do
         it "should allow the upload" do
-          expect(subject.validate(upload)).to eq(true)
+          expect(validator.validate(upload)).to eq(true)
         end
 
         describe "when filename is invalid" do
           it "should not allow the upload" do
             upload.original_filename = "test.txt"
-            expect(subject.validate(upload)).to eq(nil)
+            expect(validator.validate(upload)).to eq(nil)
           end
         end
       end
@@ -106,7 +106,7 @@ RSpec.describe UploadValidator do
         fab!(:user) { Fabricate(:user) }
 
         it "should not allow the upload" do
-          expect(subject.validate(upload)).to eq(nil)
+          expect(validator.validate(upload)).to eq(nil)
         end
       end
     end
diff --git a/spec/lib/validators/url_validator_spec.rb b/spec/lib/validators/url_validator_spec.rb
index 071c3ae939f..1e763f29e77 100644
--- a/spec/lib/validators/url_validator_spec.rb
+++ b/spec/lib/validators/url_validator_spec.rb
@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 RSpec.describe UrlValidator do
+  subject(:validate) { validator.validate_each(record, :website, record.website) }
+
   let(:record) { Fabricate.build(:user_profile, user: Fabricate.build(:user)) }
   let(:validator) { described_class.new(attributes: :website) }
-  subject(:validate) { validator.validate_each(record, :website, record.website) }
 
   [
     "http://https://google.com",
diff --git a/spec/lib/validators/user_full_name_validator_spec.rb b/spec/lib/validators/user_full_name_validator_spec.rb
index c25472fd6b3..9fcbb551ec1 100644
--- a/spec/lib/validators/user_full_name_validator_spec.rb
+++ b/spec/lib/validators/user_full_name_validator_spec.rb
@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
 RSpec.describe UserFullNameValidator do
-  let(:validator) { described_class.new(attributes: :name) }
   subject(:validate) { validator.validate_each(record, :name, @name) }
+
+  let(:validator) { described_class.new(attributes: :name) }
   let(:record) { Fabricate.build(:user, name: @name) }
 
   context "when name is not required" do
diff --git a/spec/lib/webauthn/security_key_authentication_service_spec.rb b/spec/lib/webauthn/security_key_authentication_service_spec.rb
index e159119d061..3ca7e5bc91d 100644
--- a/spec/lib/webauthn/security_key_authentication_service_spec.rb
+++ b/spec/lib/webauthn/security_key_authentication_service_spec.rb
@@ -38,6 +38,8 @@ require "webauthn/security_key_registration_service"
 # The origin params just need to be whatever your localhost URL for Discourse is.
 
 RSpec.describe Webauthn::SecurityKeyAuthenticationService do
+  subject(:service) { described_class.new(current_user, params, challenge_params) }
+
   let(:security_key_user) { current_user }
   let!(:security_key) do
     Fabricate(
@@ -91,24 +93,23 @@ RSpec.describe Webauthn::SecurityKeyAuthenticationService do
   let(:challenge_params_origin) { "http://localhost:3000" }
   let(:challenge_params) { { challenge: challenge, rp_id: rp_id, origin: challenge_params_origin } }
   let(:current_user) { Fabricate(:user) }
-  let(:subject) { described_class.new(current_user, params, challenge_params) }
 
   it "updates last_used when the security key and params are valid" do
-    expect(subject.authenticate_security_key).to eq(true)
+    expect(service.authenticate_security_key).to eq(true)
     expect(security_key.reload.last_used).not_to eq(nil)
   end
 
   context "when params is blank" do
     let(:params) { nil }
     it "returns false with no validation" do
-      expect(subject.authenticate_security_key).to eq(false)
+      expect(service.authenticate_security_key).to eq(false)
     end
   end
 
   context "when params is not blank and not a hash" do
     let(:params) { "test" }
     it "returns false with no validation" do
-      expect(subject.authenticate_security_key).to eq(false)
+      expect(service.authenticate_security_key).to eq(false)
     end
   end
 
@@ -116,7 +117,7 @@ RSpec.describe Webauthn::SecurityKeyAuthenticationService do
     before { security_key.destroy }
 
     it "raises a NotFoundError" do
-      expect { subject.authenticate_security_key }.to raise_error(
+      expect { service.authenticate_security_key }.to raise_error(
         Webauthn::NotFoundError,
         I18n.t("webauthn.validation.not_found_error"),
       )
@@ -127,7 +128,7 @@ RSpec.describe Webauthn::SecurityKeyAuthenticationService do
     let(:security_key_user) { Fabricate(:user) }
 
     it "raises an OwnershipError" do
-      expect { subject.authenticate_security_key }.to raise_error(
+      expect { service.authenticate_security_key }.to raise_error(
         Webauthn::OwnershipError,
         I18n.t("webauthn.validation.ownership_error"),
       )
@@ -138,7 +139,7 @@ RSpec.describe Webauthn::SecurityKeyAuthenticationService do
     let(:client_data_webauthn_type) { "webauthn.explode" }
 
     it "raises an InvalidTypeError" do
-      expect { subject.authenticate_security_key }.to raise_error(
+      expect { service.authenticate_security_key }.to raise_error(
         Webauthn::InvalidTypeError,
         I18n.t("webauthn.validation.invalid_type_error"),
       )
@@ -149,7 +150,7 @@ RSpec.describe Webauthn::SecurityKeyAuthenticationService do
     let(:client_data_challenge) { Base64.strict_encode64("invalid challenge") }
 
     it "raises a ChallengeMismatchError" do
-      expect { subject.authenticate_security_key }.to raise_error(
+      expect { service.authenticate_security_key }.to raise_error(
         Webauthn::ChallengeMismatchError,
         I18n.t("webauthn.validation.challenge_mismatch_error"),
       )
@@ -160,7 +161,7 @@ RSpec.describe Webauthn::SecurityKeyAuthenticationService do
     let(:client_data_origin) { "https://someothersite.com" }
 
     it "raises a InvalidOriginError" do
-      expect { subject.authenticate_security_key }.to raise_error(
+      expect { service.authenticate_security_key }.to raise_error(
         Webauthn::InvalidOriginError,
         I18n.t("webauthn.validation.invalid_origin_error"),
       )
@@ -171,7 +172,7 @@ RSpec.describe Webauthn::SecurityKeyAuthenticationService do
     let(:rp_id) { "bad_rp_id" }
 
     it "raises a InvalidRelyingPartyIdError" do
-      expect { subject.authenticate_security_key }.to raise_error(
+      expect { service.authenticate_security_key }.to raise_error(
         Webauthn::InvalidRelyingPartyIdError,
         I18n.t("webauthn.validation.invalid_relying_party_id_error"),
       )
@@ -182,7 +183,7 @@ RSpec.describe Webauthn::SecurityKeyAuthenticationService do
     let(:signature) { Base64.strict_encode64("badsig") }
 
     it "raises a PublicKeyError" do
-      expect { subject.authenticate_security_key }.to raise_error(
+      expect { service.authenticate_security_key }.to raise_error(
         Webauthn::PublicKeyError,
         I18n.t("webauthn.validation.public_key_error"),
       )
@@ -193,7 +194,7 @@ RSpec.describe Webauthn::SecurityKeyAuthenticationService do
     before { COSE::Algorithm.expects(:find).returns(nil) }
 
     it "raises a UnknownCOSEAlgorithmError" do
-      expect { subject.authenticate_security_key }.to raise_error(
+      expect { service.authenticate_security_key }.to raise_error(
         Webauthn::UnknownCOSEAlgorithmError,
         I18n.t("webauthn.validation.unknown_cose_algorithm_error"),
       )
@@ -230,7 +231,7 @@ RSpec.describe Webauthn::SecurityKeyAuthenticationService do
     end
 
     it "updates last_used when the security key and params are valid" do
-      expect(subject.authenticate_security_key).to eq(true)
+      expect(service.authenticate_security_key).to eq(true)
       expect(security_key.reload.last_used).not_to eq(nil)
     end
   end
diff --git a/spec/lib/webauthn/security_key_registration_service_spec.rb b/spec/lib/webauthn/security_key_registration_service_spec.rb
index 15abc16019e..45d78c516e1 100644
--- a/spec/lib/webauthn/security_key_registration_service_spec.rb
+++ b/spec/lib/webauthn/security_key_registration_service_spec.rb
@@ -3,6 +3,8 @@ require "webauthn"
 require "webauthn/security_key_registration_service"
 
 RSpec.describe Webauthn::SecurityKeyRegistrationService do
+  subject(:service) { described_class.new(current_user, params, challenge_params) }
+
   let(:client_data_challenge) { Base64.encode64(challenge) }
   let(:client_data_webauthn_type) { "webauthn.create" }
   let(:client_data_origin) { "http://localhost:3000" }
@@ -34,13 +36,12 @@ RSpec.describe Webauthn::SecurityKeyRegistrationService do
   let(:challenge_params) { { challenge: challenge, rp_id: rp_id, origin: "http://localhost:3000" } }
   let(:challenge) { "f1e04530f34a1b6a08d032d8550e23eb8330be04e4166008f26c0e1b42ad" }
   let(:current_user) { Fabricate(:user) }
-  let(:subject) { described_class.new(current_user, params, challenge_params) }
 
   context "when the client data webauthn type is not webauthn.create" do
     let(:client_data_webauthn_type) { "webauthn.explode" }
 
     it "raises an InvalidTypeError" do
-      expect { subject.register_second_factor_security_key }.to raise_error(
+      expect { service.register_second_factor_security_key }.to raise_error(
         Webauthn::InvalidTypeError,
         I18n.t("webauthn.validation.invalid_type_error"),
       )
@@ -51,7 +52,7 @@ RSpec.describe Webauthn::SecurityKeyRegistrationService do
     let(:client_data_challenge) { Base64.encode64("invalid challenge") }
 
     it "raises a ChallengeMismatchError" do
-      expect { subject.register_second_factor_security_key }.to raise_error(
+      expect { service.register_second_factor_security_key }.to raise_error(
         Webauthn::ChallengeMismatchError,
         I18n.t("webauthn.validation.challenge_mismatch_error"),
       )
@@ -62,7 +63,7 @@ RSpec.describe Webauthn::SecurityKeyRegistrationService do
     let(:client_data_origin) { "https://someothersite.com" }
 
     it "raises a InvalidOriginError" do
-      expect { subject.register_second_factor_security_key }.to raise_error(
+      expect { service.register_second_factor_security_key }.to raise_error(
         Webauthn::InvalidOriginError,
         I18n.t("webauthn.validation.invalid_origin_error"),
       )
@@ -73,7 +74,7 @@ RSpec.describe Webauthn::SecurityKeyRegistrationService do
     let(:rp_id) { "bad_rp_id" }
 
     it "raises a InvalidRelyingPartyIdError" do
-      expect { subject.register_second_factor_security_key }.to raise_error(
+      expect { service.register_second_factor_security_key }.to raise_error(
         Webauthn::InvalidRelyingPartyIdError,
         I18n.t("webauthn.validation.invalid_relying_party_id_error"),
       )
@@ -87,7 +88,7 @@ RSpec.describe Webauthn::SecurityKeyRegistrationService do
     end
 
     it "raises a UnsupportedPublicKeyAlgorithmError" do
-      expect { subject.register_second_factor_security_key }.to raise_error(
+      expect { service.register_second_factor_security_key }.to raise_error(
         Webauthn::UnsupportedPublicKeyAlgorithmError,
         I18n.t("webauthn.validation.unsupported_public_key_algorithm_error"),
       )
@@ -103,7 +104,7 @@ RSpec.describe Webauthn::SecurityKeyRegistrationService do
     end
 
     it "raises a UnsupportedAttestationFormatError" do
-      expect { subject.register_second_factor_security_key }.to raise_error(
+      expect { service.register_second_factor_security_key }.to raise_error(
         Webauthn::UnsupportedAttestationFormatError,
         I18n.t("webauthn.validation.unsupported_attestation_format_error"),
       )
@@ -117,14 +118,14 @@ RSpec.describe Webauthn::SecurityKeyRegistrationService do
   context "when the credential id is already in use for any user" do
     it "raises a CredentialIdInUseError" do
       # register the key to the current user
-      security_key = subject.register_second_factor_security_key
+      security_key = service.register_second_factor_security_key
 
       # update the key to be on a different user
       other_user = Fabricate(:user)
       security_key.update(user: other_user)
 
       # error!
-      expect { subject.register_second_factor_security_key }.to raise_error(
+      expect { service.register_second_factor_security_key }.to raise_error(
         Webauthn::CredentialIdInUseError,
         I18n.t("webauthn.validation.credential_id_in_use_error"),
       )
@@ -137,7 +138,7 @@ RSpec.describe Webauthn::SecurityKeyRegistrationService do
     end
 
     it "raises a MalformedAttestationError" do
-      expect { subject.register_second_factor_security_key }.to raise_error(
+      expect { service.register_second_factor_security_key }.to raise_error(
         Webauthn::MalformedAttestationError,
         I18n.t("webauthn.validation.malformed_attestation_error"),
       )
diff --git a/spec/lib/wizard/step_updater_spec.rb b/spec/lib/wizard/step_updater_spec.rb
index 4c725b5051a..69648f8e2db 100644
--- a/spec/lib/wizard/step_updater_spec.rb
+++ b/spec/lib/wizard/step_updater_spec.rb
@@ -370,7 +370,7 @@ RSpec.describe Wizard::StepUpdater do
       expect(SiteSetting.contact_email).to eq("eviltrout@example.com")
 
       # Should update the TOS topic
-      raw = Post.where(topic_id: SiteSetting.tos_topic_id, post_number: 1).pluck_first(:raw)
+      raw = Post.where(topic_id: SiteSetting.tos_topic_id, post_number: 1).pick(:raw)
       expect(raw).to eq("ACME, Inc. - New Jersey law - Fairfield, New Jersey template")
 
       # Can update the TOS topic again
@@ -382,13 +382,13 @@ RSpec.describe Wizard::StepUpdater do
           city_for_disputes: "San Francisco, California",
         )
       updater.update
-      raw = Post.where(topic_id: SiteSetting.tos_topic_id, post_number: 1).pluck_first(:raw)
+      raw = Post.where(topic_id: SiteSetting.tos_topic_id, post_number: 1).pick(:raw)
       expect(raw).to eq("Pied Piper Inc - California law - San Francisco, California template")
 
       # Can update the TOS to nothing
       updater = wizard.create_updater("corporate", {})
       updater.update
-      raw = Post.where(topic_id: SiteSetting.tos_topic_id, post_number: 1).pluck_first(:raw)
+      raw = Post.where(topic_id: SiteSetting.tos_topic_id, post_number: 1).pick(:raw)
       expect(raw).to eq("company_name - governing_law - city_for_disputes template")
 
       expect(wizard.completed_steps?("corporate")).to eq(true)
diff --git a/spec/mailers/group_smtp_mailer_spec.rb b/spec/mailers/group_smtp_mailer_spec.rb
index 035ea1b7ef8..ecd6d945099 100644
--- a/spec/mailers/group_smtp_mailer_spec.rb
+++ b/spec/mailers/group_smtp_mailer_spec.rb
@@ -60,6 +60,28 @@ RSpec.describe GroupSmtpMailer do
     SiteSetting.reply_by_email_enabled = true
   end
 
+  it "sends an email for first post when IMAP is disabled" do
+    staged = Fabricate(:staged)
+    group.update(imap_enabled: false)
+
+    PostCreator.create!(
+      user,
+      skip_validations: true,
+      title: "Hello from John",
+      archetype: Archetype.private_message,
+      target_usernames: staged.username,
+      target_group_names: group.name,
+      raw: raw,
+    )
+
+    expect(ActionMailer::Base.deliveries.size).to eq(1)
+
+    sent_mail = ActionMailer::Base.deliveries[0]
+    expect(sent_mail.to).to contain_exactly(staged.email)
+    expect(sent_mail.subject).to eq("Hello from John")
+    expect(sent_mail.to_s).to include(raw)
+  end
+
   it "sends an email as reply" do
     post = PostCreator.create(user, topic_id: receiver.incoming_email.topic.id, raw: raw)
 
diff --git a/spec/mailers/subscription_mailer_spec.rb b/spec/mailers/subscription_mailer_spec.rb
index e61e0657380..fff84e4c534 100644
--- a/spec/mailers/subscription_mailer_spec.rb
+++ b/spec/mailers/subscription_mailer_spec.rb
@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 RSpec.describe SubscriptionMailer do
+  subject(:mail) { SubscriptionMailer.confirm_unsubscribe(user) }
+
   fab!(:user) { Fabricate(:user) }
 
-  subject { SubscriptionMailer.confirm_unsubscribe(user) }
-
   it "contains the right URL" do
-    expect(subject.body).to include(
+    expect(mail.body).to include(
       "#{Discourse.base_url}/email/unsubscribe/#{UnsubscribeKey.last.key}",
     )
   end
diff --git a/spec/mailers/user_notifications_spec.rb b/spec/mailers/user_notifications_spec.rb
index d4eab5c1a3f..1bb09890622 100644
--- a/spec/mailers/user_notifications_spec.rb
+++ b/spec/mailers/user_notifications_spec.rb
@@ -58,24 +58,24 @@ RSpec.describe UserNotifications do
   end
 
   describe ".signup" do
-    subject { UserNotifications.signup(user) }
+    subject(:email) { UserNotifications.signup(user) }
 
     it "works" do
-      expect(subject.to).to eq([user.email])
-      expect(subject.subject).to be_present
-      expect(subject.from).to eq([SiteSetting.notification_email])
-      expect(subject.body).to be_present
+      expect(email.to).to eq([user.email])
+      expect(email.subject).to be_present
+      expect(email.from).to eq([SiteSetting.notification_email])
+      expect(email.body).to be_present
     end
   end
 
   describe ".forgot_password" do
-    subject { UserNotifications.forgot_password(user) }
+    subject(:email) { UserNotifications.forgot_password(user) }
 
     it "works" do
-      expect(subject.to).to eq([user.email])
-      expect(subject.subject).to be_present
-      expect(subject.from).to eq([SiteSetting.notification_email])
-      expect(subject.body).to be_present
+      expect(email.to).to eq([user.email])
+      expect(email.subject).to be_present
+      expect(email.from).to eq([SiteSetting.notification_email])
+      expect(email.body).to be_present
     end
   end
 
@@ -119,20 +119,21 @@ RSpec.describe UserNotifications do
   end
 
   describe ".email_login" do
+    subject(:email) { UserNotifications.email_login(user, email_token: email_token) }
+
     let(:email_token) do
       Fabricate(:email_token, user: user, scope: EmailToken.scopes[:email_login]).token
     end
-    subject { UserNotifications.email_login(user, email_token: email_token) }
 
     it "generates the right email" do
-      expect(subject.to).to eq([user.email])
-      expect(subject.from).to eq([SiteSetting.notification_email])
+      expect(email.to).to eq([user.email])
+      expect(email.from).to eq([SiteSetting.notification_email])
 
-      expect(subject.subject).to eq(
+      expect(email.subject).to eq(
         I18n.t("user_notifications.email_login.subject_template", email_prefix: SiteSetting.title),
       )
 
-      expect(subject.body.to_s).to match(
+      expect(email.body.to_s).to match(
         I18n.t(
           "user_notifications.email_login.text_body_template",
           site_name: SiteSetting.title,
@@ -144,13 +145,13 @@ RSpec.describe UserNotifications do
   end
 
   describe ".digest" do
-    subject { UserNotifications.digest(user) }
+    subject(:email) { UserNotifications.digest(user) }
 
     after { Discourse.redis.keys("summary-new-users:*").each { |key| Discourse.redis.del(key) } }
 
     context "without new topics" do
       it "doesn't send the email" do
-        expect(subject.to).to be_blank
+        expect(email.to).to be_blank
       end
     end
 
@@ -172,8 +173,8 @@ RSpec.describe UserNotifications do
       end
 
       it "returns topics from new users if they're more than 24 hours old" do
-        expect(subject.to).to eq([user.email])
-        html = subject.html_part.body.to_s
+        expect(email.to).to eq([user.email])
+        html = email.html_part.body.to_s
         expect(html).to include(new_yesterday.title)
         expect(html).to_not include(new_today.title)
       end
@@ -185,18 +186,18 @@ RSpec.describe UserNotifications do
       end
 
       it "works" do
-        expect(subject.to).to eq([user.email])
-        expect(subject.subject).to be_present
-        expect(subject.from).to eq([SiteSetting.notification_email])
-        expect(subject.html_part.body.to_s).to be_present
-        expect(subject.text_part.body.to_s).to be_present
-        expect(subject.header["List-Unsubscribe"].to_s).to match(/\/email\/unsubscribe\/\h{64}/)
-        expect(subject.html_part.body.to_s).to include("New Users")
+        expect(email.to).to eq([user.email])
+        expect(email.subject).to be_present
+        expect(email.from).to eq([SiteSetting.notification_email])
+        expect(email.html_part.body.to_s).to be_present
+        expect(email.text_part.body.to_s).to be_present
+        expect(email.header["List-Unsubscribe"].to_s).to match(/\/email\/unsubscribe\/\h{64}/)
+        expect(email.html_part.body.to_s).to include("New Users")
       end
 
       it "doesn't include new user count if digest_after_minutes is low" do
         user.user_option.digest_after_minutes = 60
-        expect(subject.html_part.body.to_s).to_not include("New Users")
+        expect(email.html_part.body.to_s).to_not include("New Users")
       end
 
       it "works with min_date string" do
@@ -210,8 +211,33 @@ RSpec.describe UserNotifications do
         SiteSetting.email_prefix = "Try Discourse"
         SiteSetting.title = "Discourse Meta"
 
-        expect(subject.subject).to match(/Try Discourse/)
-        expect(subject.subject).not_to match(/Discourse Meta/)
+        expect(email.subject).to match(/Try Discourse/)
+        expect(email.subject).not_to match(/Discourse Meta/)
+      end
+
+      it "includes unread likes received count within the since date" do
+        Fabricate(
+          :notification,
+          user: user,
+          notification_type: Notification.types[:liked],
+          created_at: 2.months.ago,
+        )
+        Fabricate(
+          :notification,
+          user: user,
+          notification_type: Notification.types[:liked],
+          read: true,
+        )
+        Fabricate(:notification, user: user, notification_type: Notification.types[:liked])
+        Fabricate(:notification, user: user, notification_type: Notification.types[:liked])
+        digest = UserNotifications.digest(user, since: 1.month.ago.to_date.to_s)
+        parsed_html = Nokogiri::HTML5.fragment(digest.html_part.body.to_s)
+        expect(parsed_html.css(".header-stat-count #likes_received_stat_count strong").text).to eq(
+          "2",
+        )
+        expect(
+          parsed_html.css(".header-stat-description #likes_received_stat_description strong").text,
+        ).to eq("Likes Received")
       end
 
       it "excludes deleted topics and their posts" do
@@ -232,7 +258,7 @@ RSpec.describe UserNotifications do
             created_at: 1.hour.ago,
           )
         deleted.trash!
-        html = subject.html_part.body.to_s
+        html = email.html_part.body.to_s
         expect(html).to_not include deleted.title
         expect(html).to_not include post.raw
       end
@@ -251,7 +277,7 @@ RSpec.describe UserNotifications do
             raw: "secret draft content",
             created_at: 1.hour.ago,
           )
-        html = subject.html_part.body.to_s
+        html = email.html_part.body.to_s
         expect(html).to_not include topic.title
         expect(html).to_not include post.raw
       end
@@ -294,7 +320,7 @@ RSpec.describe UserNotifications do
             post_type: Post.types[:small_action],
             created_at: 1.hour.ago,
           )
-        html = subject.html_part.body.to_s
+        html = email.html_part.body.to_s
         expect(html).to_not include whisper.raw
         expect(html).to_not include mod_action.raw
         expect(html).to_not include small_action.raw
@@ -340,7 +366,7 @@ RSpec.describe UserNotifications do
             user_deleted: true,
             created_at: 1.hour.ago,
           )
-        html = subject.html_part.body.to_s
+        html = email.html_part.body.to_s
         expect(html).to_not include deleted.raw
         expect(html).to_not include hidden.raw
         expect(html).to_not include user_deleted.raw
@@ -364,7 +390,7 @@ RSpec.describe UserNotifications do
             post_number: 1,
             created_at: 1.minute.ago,
           )
-        html = subject.html_part.body.to_s
+        html = email.html_part.body.to_s
         expect(html).to_not include too_new.title
       end
 
@@ -383,20 +409,20 @@ RSpec.describe UserNotifications do
 
         theme.set_default!
 
-        html = subject.html_part.body.to_s
+        html = email.html_part.body.to_s
         expect(html).to include "F0F0F0"
         expect(html).to include "1E1E1E"
       end
 
       it "supports subfolder" do
         set_subfolder "/forum"
-        html = subject.html_part.body.to_s
-        text = subject.text_part.body.to_s
+        html = email.html_part.body.to_s
+        text = email.text_part.body.to_s
         expect(html).to be_present
         expect(text).to be_present
         expect(html).to_not include("/forum/forum")
         expect(text).to_not include("/forum/forum")
-        expect(subject.header["List-Unsubscribe"].to_s).to match(
+        expect(email.header["List-Unsubscribe"].to_s).to match(
           /http:\/\/test.localhost\/forum\/email\/unsubscribe\/\h{64}/,
         )
 
@@ -407,7 +433,7 @@ RSpec.describe UserNotifications do
 
       it "applies lang/xml:lang html attributes" do
         SiteSetting.default_locale = "pl_PL"
-        html = subject.html_part.to_s
+        html = email.html_part.to_s
 
         expect(html).to match(' lang="pl-PL"')
         expect(html).to match(' xml:lang="pl-PL"')
@@ -418,8 +444,9 @@ RSpec.describe UserNotifications do
   describe ".user_replied" do
     let(:response_by_user) { Fabricate(:user, name: "John Doe") }
     let(:category) { Fabricate(:category, name: "India") }
-    let(:tag1) { Fabricate(:tag, name: "Taggo") }
-    let(:tag2) { Fabricate(:tag, name: "Taggie") }
+    let(:tag1) { Fabricate(:tag, name: "Taggo", public_topic_count: 1) }
+    let(:tag2) { Fabricate(:tag, name: "Taggie", public_topic_count: 3) }
+    let(:tag3) { Fabricate(:tag, name: "Teggo", public_topic_count: 2) }
 
     let(:hidden_tag) { Fabricate(:tag, name: "hidden") }
     let!(:hidden_tag_group) do
@@ -430,7 +457,7 @@ RSpec.describe UserNotifications do
       Fabricate(
         :topic,
         category: category,
-        tags: [tag1, tag2, hidden_tag],
+        tags: [tag1, tag2, tag3, hidden_tag],
         title: "Super cool topic",
       )
     end
@@ -533,19 +560,52 @@ RSpec.describe UserNotifications do
       expect(mail_html.scan(/>bobmarley/).count).to eq(1)
     end
 
-    it "the number of tags shown in subject should match max_tags_per_topic" do
-      SiteSetting.email_subject =
-        "[%{site_name}] %{optional_pm}%{optional_cat}%{optional_tags}%{topic_title}"
-      SiteSetting.max_tags_per_topic = 1
-      mail =
-        UserNotifications.user_replied(
-          user,
-          post: response,
-          notification_type: notification.notification_type,
-          notification_data_hash: notification.data_hash,
-        )
-      expect(mail.subject).to match(/Taggo/)
-      expect(mail.subject).not_to match(/Taggie/)
+    describe "number of tags shown in subject line" do
+      describe "max_tags_per_email_subject siteSetting enabled" do
+        before { SiteSetting.enable_max_tags_per_email_subject = true }
+
+        it "should match max_tags_per_email_subject" do
+          SiteSetting.email_subject =
+            "[%{site_name}] %{optional_pm}%{optional_cat}%{optional_tags}%{topic_title}"
+          SiteSetting.max_tags_per_topic = 1
+          SiteSetting.max_tags_per_email_subject = 2
+
+          mail =
+            UserNotifications.user_replied(
+              user,
+              post: response,
+              notification_type: notification.notification_type,
+              notification_data_hash: notification.data_hash,
+            )
+
+          expect(mail.subject).to eq(
+            "[Discourse] [#{category.name}] #{tag2.name} #{tag3.name} #{topic.title}",
+          )
+        end
+      end
+
+      describe "max_tags_per_email_subject siteSetting disabled" do
+        before { SiteSetting.enable_max_tags_per_email_subject = false }
+
+        it "should match max_tags_per_topic" do
+          SiteSetting.email_subject =
+            "[%{site_name}] %{optional_pm}%{optional_cat}%{optional_tags}%{topic_title}"
+          SiteSetting.max_tags_per_topic = 2
+          SiteSetting.max_tags_per_email_subject = 1
+
+          mail =
+            UserNotifications.user_replied(
+              user,
+              post: response,
+              notification_type: notification.notification_type,
+              notification_data_hash: notification.data_hash,
+            )
+
+          expect(mail.subject).to eq(
+            "[Discourse] [#{category.name}] #{tag2.name} #{tag3.name} #{topic.title}",
+          )
+        end
+      end
     end
 
     it "doesn't include details when private_email is enabled" do
diff --git a/spec/mailers/version_mailer_spec.rb b/spec/mailers/version_mailer_spec.rb
index 59c047ba9d4..9e2da3c2203 100644
--- a/spec/mailers/version_mailer_spec.rb
+++ b/spec/mailers/version_mailer_spec.rb
@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 RSpec.describe VersionMailer do
-  subject { VersionMailer.send_notice }
+  subject(:mail) { VersionMailer.send_notice }
 
   context "when contact_email is blank" do
     before { SiteSetting.contact_email = "" }
 
     it "doesn't send the email" do
-      expect(subject.to).to be_blank
+      expect(mail.to).to be_blank
     end
   end
 
@@ -15,10 +15,10 @@ RSpec.describe VersionMailer do
     before { SiteSetting.contact_email = "me@example.com" }
 
     it "works" do
-      expect(subject.to).to eq(["me@example.com"])
-      expect(subject.subject).to be_present
-      expect(subject.from).to eq([SiteSetting.notification_email])
-      expect(subject.body).to be_present
+      expect(mail.to).to eq(["me@example.com"])
+      expect(mail.subject).to be_present
+      expect(mail.from).to eq([SiteSetting.notification_email])
+      expect(mail.body).to be_present
     end
   end
 end
diff --git a/spec/models/about_spec.rb b/spec/models/about_spec.rb
index 0bb92230c25..79c1a1ea4c4 100644
--- a/spec/models/about_spec.rb
+++ b/spec/models/about_spec.rb
@@ -5,12 +5,19 @@ RSpec.describe About do
     include_examples "stats cacheable"
   end
 
-  describe "#stats" do
-    after { About.clear_plugin_stat_groups }
+  def register_about_stat_group(name, stats_block, show_in_ui: true)
+    DiscoursePluginRegistry.register_about_stat_group(
+      { name: name, show_in_ui: show_in_ui, block: stats_block },
+      stub(enabled?: true),
+    )
+  end
 
+  after { DiscoursePluginRegistry.reset! }
+
+  describe "#stats" do
     it "adds plugin stats to the output" do
       stats = { :last_day => 1, "7_days" => 10, "30_days" => 100, :count => 1000 }
-      About.add_plugin_stat_group("some_group", show_in_ui: true) { stats }
+      register_about_stat_group("some_group", Proc.new { stats })
       expect(described_class.new.stats.with_indifferent_access).to match(
         hash_including(
           some_group_last_day: 1,
@@ -23,7 +30,7 @@ RSpec.describe About do
 
     it "does not add plugin stats to the output if they are missing one of the required keys" do
       stats = { "7_days" => 10, "30_days" => 100, :count => 1000 }
-      About.add_plugin_stat_group("some_group", show_in_ui: true) { stats }
+      register_about_stat_group("some_group", Proc.new { stats })
       expect(described_class.new.stats).not_to match(
         hash_including(
           some_group_last_day: 1,
@@ -36,8 +43,8 @@ RSpec.describe About do
 
     it "does not error if any of the plugin stat blocks throw an error and still adds the non-errored stats to output" do
       stats = { :last_day => 1, "7_days" => 10, "30_days" => 100, :count => 1000 }
-      About.add_plugin_stat_group("some_group", show_in_ui: true) { stats }
-      About.add_plugin_stat_group("other_group", show_in_ui: true) { raise StandardError }
+      register_about_stat_group("some_group", Proc.new { stats })
+      register_about_stat_group("other_group", Proc.new { raise StandardError })
       expect(described_class.new.stats.with_indifferent_access).to match(
         hash_including(
           some_group_last_day: 1,
@@ -48,13 +55,6 @@ RSpec.describe About do
       )
       expect { described_class.new.stats.with_indifferent_access }.not_to raise_error
     end
-
-    it "does not allow duplicate displayed stat groups" do
-      stats = { :last_day => 1, "7_days" => 10, "30_days" => 100, :count => 1000 }
-      About.add_plugin_stat_group("some_group", show_in_ui: true) { stats }
-      About.add_plugin_stat_group("some_group", show_in_ui: true) { stats }
-      expect(described_class.displayed_plugin_stat_groups).to eq(["some_group"])
-    end
   end
 
   describe "#category_moderators" do
diff --git a/spec/models/admin_dashboard_data_spec.rb b/spec/models/admin_dashboard_data_spec.rb
index 7dc061cebbc..fec93548322 100644
--- a/spec/models/admin_dashboard_data_spec.rb
+++ b/spec/models/admin_dashboard_data_spec.rb
@@ -45,6 +45,18 @@ RSpec.describe AdminDashboardData do
         expect(problems.map(&:to_s)).to include("a problem was found")
       end
     end
+
+    describe "when `navigation_menu` site setting is `legacy`" do
+      it "should include the right problem message" do
+        SiteSetting.set(:navigation_menu, "legacy")
+
+        problem = AdminDashboardData.fetch_problems.last
+
+        expect(problem.message).to include(
+          I18n.t("dashboard.legacy_navigation_menu_deprecated", base_path: Discourse.base_path),
+        )
+      end
+    end
   end
 
   describe "adding scheduled checks" do
@@ -126,93 +138,93 @@ RSpec.describe AdminDashboardData do
   end
 
   describe "rails_env_check" do
-    subject { described_class.new.rails_env_check }
+    subject(:check) { described_class.new.rails_env_check }
 
     it "returns nil when running in production mode" do
       Rails.stubs(env: ActiveSupport::StringInquirer.new("production"))
-      expect(subject).to be_nil
+      expect(check).to be_nil
     end
 
     it "returns a string when running in development mode" do
       Rails.stubs(env: ActiveSupport::StringInquirer.new("development"))
-      expect(subject).to_not be_nil
+      expect(check).to_not be_nil
     end
 
     it "returns a string when running in test mode" do
       Rails.stubs(env: ActiveSupport::StringInquirer.new("test"))
-      expect(subject).to_not be_nil
+      expect(check).to_not be_nil
     end
   end
 
   describe "host_names_check" do
-    subject { described_class.new.host_names_check }
+    subject(:check) { described_class.new.host_names_check }
 
     it "returns nil when host_names is set" do
       Discourse.stubs(:current_hostname).returns("something.com")
-      expect(subject).to be_nil
+      expect(check).to be_nil
     end
 
     it "returns a string when host_name is localhost" do
       Discourse.stubs(:current_hostname).returns("localhost")
-      expect(subject).to_not be_nil
+      expect(check).to_not be_nil
     end
 
     it "returns a string when host_name is production.localhost" do
       Discourse.stubs(:current_hostname).returns("production.localhost")
-      expect(subject).to_not be_nil
+      expect(check).to_not be_nil
     end
   end
 
   describe "sidekiq_check" do
-    subject { described_class.new.sidekiq_check }
+    subject(:check) { described_class.new.sidekiq_check }
 
     it "returns nil when sidekiq processed a job recently" do
       Jobs.stubs(:last_job_performed_at).returns(1.minute.ago)
       Jobs.stubs(:queued).returns(0)
-      expect(subject).to be_nil
+      expect(check).to be_nil
     end
 
     it "returns nil when last job processed was a long time ago, but no jobs are queued" do
       Jobs.stubs(:last_job_performed_at).returns(7.days.ago)
       Jobs.stubs(:queued).returns(0)
-      expect(subject).to be_nil
+      expect(check).to be_nil
     end
 
     it "returns nil when no jobs have ever been processed, but no jobs are queued" do
       Jobs.stubs(:last_job_performed_at).returns(nil)
       Jobs.stubs(:queued).returns(0)
-      expect(subject).to be_nil
+      expect(check).to be_nil
     end
 
     it "returns a string when no jobs were processed recently and some jobs are queued" do
       Jobs.stubs(:last_job_performed_at).returns(20.minutes.ago)
       Jobs.stubs(:queued).returns(1)
-      expect(subject).to_not be_nil
+      expect(check).to_not be_nil
     end
 
     it "returns a string when no jobs have ever been processed, and some jobs are queued" do
       Jobs.stubs(:last_job_performed_at).returns(nil)
       Jobs.stubs(:queued).returns(1)
-      expect(subject).to_not be_nil
+      expect(check).to_not be_nil
     end
   end
 
   describe "ram_check" do
-    subject { described_class.new.ram_check }
+    subject(:check) { described_class.new.ram_check }
 
     it "returns nil when total ram is 1 GB" do
       MemInfo.any_instance.stubs(:mem_total).returns(1_025_272)
-      expect(subject).to be_nil
+      expect(check).to be_nil
     end
 
     it "returns nil when total ram cannot be determined" do
       MemInfo.any_instance.stubs(:mem_total).returns(nil)
-      expect(subject).to be_nil
+      expect(check).to be_nil
     end
 
     it "returns a string when total ram is less than 1 GB" do
       MemInfo.any_instance.stubs(:mem_total).returns(512_636)
-      expect(subject).to_not be_nil
+      expect(check).to_not be_nil
     end
   end
 
@@ -221,7 +233,7 @@ RSpec.describe AdminDashboardData do
       context "when disabled" do
         it "returns nil" do
           SiteSetting.set(enable_setting, false)
-          expect(subject).to be_nil
+          expect(check).to be_nil
         end
       end
 
@@ -231,31 +243,32 @@ RSpec.describe AdminDashboardData do
         it "returns nil when key and secret are set" do
           SiteSetting.set(key, "12313213")
           SiteSetting.set(secret, "12312313123")
-          expect(subject).to be_nil
+          expect(check).to be_nil
         end
 
         it "returns a string when key is not set" do
           SiteSetting.set(key, "")
           SiteSetting.set(secret, "12312313123")
-          expect(subject).to_not be_nil
+          expect(check).to_not be_nil
         end
 
         it "returns a string when secret is not set" do
           SiteSetting.set(key, "123123")
           SiteSetting.set(secret, "")
-          expect(subject).to_not be_nil
+          expect(check).to_not be_nil
         end
 
         it "returns a string when key and secret are not set" do
           SiteSetting.set(key, "")
           SiteSetting.set(secret, "")
-          expect(subject).to_not be_nil
+          expect(check).to_not be_nil
         end
       end
     end
 
     describe "facebook" do
-      subject { described_class.new.facebook_config_check }
+      subject(:check) { described_class.new.facebook_config_check }
+
       let(:enable_setting) { :enable_facebook_logins }
       let(:key) { :facebook_app_id }
       let(:secret) { :facebook_app_secret }
@@ -263,7 +276,8 @@ RSpec.describe AdminDashboardData do
     end
 
     describe "twitter" do
-      subject { described_class.new.twitter_config_check }
+      subject(:check) { described_class.new.twitter_config_check }
+
       let(:enable_setting) { :enable_twitter_logins }
       let(:key) { :twitter_consumer_key }
       let(:secret) { :twitter_consumer_secret }
@@ -271,7 +285,8 @@ RSpec.describe AdminDashboardData do
     end
 
     describe "github" do
-      subject { described_class.new.github_config_check }
+      subject(:check) { described_class.new.github_config_check }
+
       let(:enable_setting) { :enable_github_logins }
       let(:key) { :github_client_id }
       let(:secret) { :github_client_secret }
@@ -280,28 +295,28 @@ RSpec.describe AdminDashboardData do
   end
 
   describe "force_https_check" do
-    subject { described_class.new(check_force_https: true).force_https_check }
+    subject(:check) { described_class.new(check_force_https: true).force_https_check }
 
     it "returns nil if force_https site setting enabled" do
       SiteSetting.force_https = true
-      expect(subject).to be_nil
+      expect(check).to be_nil
     end
 
     it "returns nil if force_https site setting not enabled" do
       SiteSetting.force_https = false
-      expect(subject).to eq(I18n.t("dashboard.force_https_warning", base_path: Discourse.base_path))
+      expect(check).to eq(I18n.t("dashboard.force_https_warning", base_path: Discourse.base_path))
     end
   end
 
   describe "ignore force_https_check" do
-    subject { described_class.new(check_force_https: false).force_https_check }
+    subject(:check) { described_class.new(check_force_https: false).force_https_check }
 
     it "returns nil" do
       SiteSetting.force_https = true
-      expect(subject).to be_nil
+      expect(check).to be_nil
 
       SiteSetting.force_https = false
-      expect(subject).to be_nil
+      expect(check).to be_nil
     end
   end
 
@@ -342,4 +357,26 @@ RSpec.describe AdminDashboardData do
       expect(dashboard_data.out_of_date_themes).to eq(nil)
     end
   end
+
+  describe "#translation_overrides_check" do
+    subject(:dashboard_data) { described_class.new }
+
+    context "when there are outdated translations" do
+      before { Fabricate(:translation_override, translation_key: "foo.bar", status: "outdated") }
+
+      it "outputs the correct message" do
+        expect(dashboard_data.translation_overrides_check).to eq(
+          I18n.t("dashboard.outdated_translations_warning", base_path: Discourse.base_path),
+        )
+      end
+    end
+
+    context "when there are no outdated translations" do
+      before { Fabricate(:translation_override, status: "up_to_date") }
+
+      it "outputs nothing" do
+        expect(dashboard_data.translation_overrides_check).to eq(nil)
+      end
+    end
+  end
 end
diff --git a/spec/models/api_key_spec.rb b/spec/models/api_key_spec.rb
index 330b4b103cb..caf5c16e9dc 100644
--- a/spec/models/api_key_spec.rb
+++ b/spec/models/api_key_spec.rb
@@ -6,6 +6,7 @@ RSpec.describe ApiKey do
 
   it { is_expected.to belong_to :user }
   it { is_expected.to belong_to :created_by }
+  it { is_expected.to validate_length_of(:description).is_at_most(255) }
 
   it "generates a key when saving" do
     api_key = ApiKey.new
diff --git a/spec/models/badge_grouping_spec.rb b/spec/models/badge_grouping_spec.rb
new file mode 100644
index 00000000000..58b5dbdb343
--- /dev/null
+++ b/spec/models/badge_grouping_spec.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+RSpec.describe BadgeGrouping, type: :model do
+  it { is_expected.to validate_length_of(:name).is_at_most(100) }
+  it { is_expected.to validate_length_of(:description).is_at_most(500) }
+end
diff --git a/spec/models/badge_spec.rb b/spec/models/badge_spec.rb
index 60bd7a2a7a0..c7d4db515ed 100644
--- a/spec/models/badge_spec.rb
+++ b/spec/models/badge_spec.rb
@@ -1,6 +1,17 @@
 # frozen_string_literal: true
 
 RSpec.describe Badge do
+  describe "Validations" do
+    subject(:badge) { Fabricate.build(:badge) }
+
+    it { is_expected.to validate_length_of(:name).is_at_most(100) }
+    it { is_expected.to validate_length_of(:description).is_at_most(500) }
+    it { is_expected.to validate_length_of(:long_description).is_at_most(1000) }
+    it { is_expected.to validate_presence_of(:name) }
+    it { is_expected.to validate_presence_of(:badge_type) }
+    it { is_expected.to validate_uniqueness_of(:name) }
+  end
+
   it "has a valid system attribute for new badges" do
     expect(Badge.create!(name: "test", badge_type_id: 1).system?).to be false
   end
@@ -33,11 +44,17 @@ RSpec.describe Badge do
   end
 
   it "can ensure consistency" do
-    b = Badge.first
+    b = Badge.find_by_name("Basic User")
+
     b.grant_count = 100
     b.save
 
-    UserBadge.create!(user_id: -100, badge_id: b.id, granted_at: 1.minute.ago, granted_by_id: -1)
+    UserBadge.create!(
+      user_id: User.minimum(:id) - 1,
+      badge_id: b.id,
+      granted_at: 1.minute.ago,
+      granted_by_id: -1,
+    )
     UserBadge.create!(
       user_id: User.first.id,
       badge_id: b.id,
diff --git a/spec/models/bookmark_spec.rb b/spec/models/bookmark_spec.rb
index 362c1ee1ead..188a965c47d 100644
--- a/spec/models/bookmark_spec.rb
+++ b/spec/models/bookmark_spec.rb
@@ -4,6 +4,8 @@ RSpec.describe Bookmark do
   fab!(:post) { Fabricate(:post) }
 
   describe "Validations" do
+    after { DiscoursePluginRegistry.reset! }
+
     it "does not allow a user to create a bookmark with only one polymorphic column" do
       user = Fabricate(:user)
       bm = Bookmark.create(bookmarkable_id: post.id, user: user)
diff --git a/spec/models/category_list_spec.rb b/spec/models/category_list_spec.rb
index e712d1ea378..bb341cc2f58 100644
--- a/spec/models/category_list_spec.rb
+++ b/spec/models/category_list_spec.rb
@@ -43,6 +43,13 @@ RSpec.describe CategoryList do
       SiteSetting.default_tags_muted = muted_tag.name
       Fabricate(:topic, category: public_cat, tags: [muted_tag])
 
+      muted_tag_2 = Fabricate(:tag)
+      TagUser.create!(
+        tag: muted_tag_2,
+        user: user,
+        notification_level: TagUser.notification_levels[:muted],
+      )
+
       CategoryFeaturedTopic.feature_topics
 
       expect(
@@ -327,4 +334,27 @@ RSpec.describe CategoryList do
       end
     end
   end
+
+  describe "category_list_find_categories_query modifier" do
+    fab!(:cool_category) { Fabricate(:category, name: "Cool category") }
+    fab!(:boring_category) { Fabricate(:category, name: "Boring category") }
+
+    it "allows changing the query" do
+      prefetched_categories = CategoryList.new(Guardian.new(user)).categories.map { |c| c[:id] }
+      expect(prefetched_categories).to include(cool_category.id, boring_category.id)
+
+      Plugin::Instance
+        .new
+        .register_modifier(:category_list_find_categories_query) do |query|
+          query.where("categories.name LIKE 'Cool%'")
+        end
+
+      prefetched_categories = CategoryList.new(Guardian.new(user)).categories.map { |c| c[:id] }
+
+      expect(prefetched_categories).to include(cool_category.id)
+      expect(prefetched_categories).not_to include(boring_category.id)
+    ensure
+      DiscoursePluginRegistry.clear_modifiers!
+    end
+  end
 end
diff --git a/spec/models/category_setting_spec.rb b/spec/models/category_setting_spec.rb
new file mode 100644
index 00000000000..c9bf1160a7d
--- /dev/null
+++ b/spec/models/category_setting_spec.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+RSpec.describe CategorySetting do
+  it { is_expected.to belong_to(:category) }
+
+  it do
+    is_expected.to validate_numericality_of(:num_auto_bump_daily)
+      .only_integer
+      .is_greater_than_or_equal_to(0)
+      .allow_nil
+  end
+
+  it do
+    is_expected.to validate_numericality_of(:auto_bump_cooldown_days)
+      .only_integer
+      .is_greater_than_or_equal_to(0)
+      .allow_nil
+  end
+end
diff --git a/spec/models/category_spec.rb b/spec/models/category_spec.rb
index da44f31eb4f..8b50208fd04 100644
--- a/spec/models/category_spec.rb
+++ b/spec/models/category_spec.rb
@@ -4,9 +4,17 @@
 RSpec.describe Category do
   fab!(:user) { Fabricate(:user) }
 
+  it_behaves_like "it has custom fields"
+
   it { is_expected.to validate_presence_of :user_id }
   it { is_expected.to validate_presence_of :name }
 
+  it do
+    is_expected.to validate_numericality_of(:default_slow_mode_seconds).is_greater_than(
+      0,
+    ).only_integer
+  end
+
   it "validates uniqueness of name" do
     Fabricate(:category_with_definition)
     is_expected.to validate_uniqueness_of(:name).scoped_to(:parent_category_id).case_insensitive
@@ -31,6 +39,12 @@ RSpec.describe Category do
   end
 
   describe "Associations" do
+    it { is_expected.to have_one(:category_setting).dependent(:destroy) }
+
+    it "automatically creates a category setting" do
+      expect { Fabricate(:category) }.to change { CategorySetting.count }.by(1)
+    end
+
     it "should delete associated sidebar_section_links when category is destroyed" do
       category_sidebar_section_link = Fabricate(:category_sidebar_section_link)
       category_sidebar_section_link_2 =
@@ -39,8 +53,8 @@ RSpec.describe Category do
 
       expect { category_sidebar_section_link.linkable.destroy! }.to change {
         SidebarSectionLink.count
-      }.from(3).to(1)
-      expect(SidebarSectionLink.first).to eq(tag_sidebar_section_link)
+      }.from(12).to(10)
+      expect(SidebarSectionLink.last).to eq(tag_sidebar_section_link)
     end
   end
 
@@ -392,8 +406,8 @@ RSpec.describe Category do
     it "correctly generates text description as needed" do
       c = Category.new
       expect(c.description_text).to be_nil
-      c.description = "&lt;hello <a>test</a>."
-      expect(c.description_text).to eq("&lt;hello test.")
+      c.description = "&lt;hello <a>foo/bar</a>."
+      expect(c.description_text).to eq("&lt;hello foo/bar.")
     end
   end
 
@@ -542,13 +556,13 @@ RSpec.describe Category do
   end
 
   describe "new" do
-    subject { Fabricate.build(:category, user: Fabricate(:user)) }
+    subject(:category) { Fabricate.build(:category, user: Fabricate(:user)) }
 
     it "triggers a extensibility event" do
-      event = DiscourseEvent.track_events { subject.save! }.last
+      event = DiscourseEvent.track_events { category.save! }.last
 
       expect(event[:event_name]).to eq(:category_created)
-      expect(event[:params].first).to eq(subject)
+      expect(event[:params].first).to eq(category)
     end
   end
 
@@ -957,6 +971,40 @@ RSpec.describe Category do
       expect(Category.auto_bump_topic!).to eq(false)
     end
 
+    it "should not auto-bump the same topic within the cooldown" do
+      freeze_time
+      category =
+        Fabricate(
+          :category_with_definition,
+          num_auto_bump_daily: 2,
+          created_at: 1.minute.ago,
+          category_setting_attributes: {
+            auto_bump_cooldown_days: 1,
+          },
+        )
+      category.clear_auto_bump_cache!
+
+      post1 = create_post(category: category, created_at: 15.seconds.ago)
+
+      # no limits on post creation or category creation please
+      RateLimiter.enable
+
+      time = freeze_time 1.month.from_now
+
+      expect(category.auto_bump_topic!).to eq(true)
+      expect(Topic.where(bumped_at: time).count).to eq(1)
+
+      time = freeze_time 13.hours.from_now
+
+      expect(category.auto_bump_topic!).to eq(false)
+      expect(Topic.where(bumped_at: time).count).to eq(0)
+
+      time = freeze_time 13.hours.from_now
+
+      expect(category.auto_bump_topic!).to eq(true)
+      expect(Topic.where(bumped_at: time).count).to eq(1)
+    end
+
     it "should not automatically bump topics with a bump scheduled" do
       freeze_time
       category = Fabricate(:category_with_definition, created_at: 1.second.ago)
@@ -1306,4 +1354,101 @@ RSpec.describe Category do
       expect(SiteSetting.general_category_id).to be < 1
     end
   end
+
+  describe ".ids_from_slugs" do
+    fab!(:category) { Fabricate(:category, slug: "category") }
+    fab!(:category2) { Fabricate(:category, slug: "category2") }
+    fab!(:subcategory) { Fabricate(:category, parent_category: category, slug: "subcategory") }
+    fab!(:subcategory2) { Fabricate(:category, parent_category: category2, slug: "subcategory") }
+
+    it "returns [] when inputs is []" do
+      expect(Category.ids_from_slugs([])).to eq([])
+    end
+
+    it 'returns the ids of category when input is ["category"]' do
+      expect(Category.ids_from_slugs(%w[category])).to contain_exactly(category.id)
+    end
+
+    it 'returns the ids of subcategory when input is ["category:subcategory"]' do
+      expect(Category.ids_from_slugs(%w[category:subcategory])).to contain_exactly(subcategory.id)
+    end
+
+    it 'returns the ids of subcategory2 when input is ["category2:subcategory"]' do
+      expect(Category.ids_from_slugs(%w[category2:subcategory])).to contain_exactly(subcategory2.id)
+    end
+
+    it "returns the ids of category and category2 when input is ['category', 'category2']" do
+      expect(Category.ids_from_slugs(%w[category category2])).to contain_exactly(
+        category.id,
+        category2.id,
+      )
+    end
+
+    it "returns the ids of subcategory and subcategory2 when input is ['category:subcategory', 'category2:subcategory']" do
+      expect(
+        Category.ids_from_slugs(%w[category:subcategory category2:subcategory]),
+      ).to contain_exactly(subcategory.id, subcategory2.id)
+    end
+
+    it "returns the ids of subcategory when input is ['category:subcategory', 'invalid:subcategory']" do
+      expect(
+        Category.ids_from_slugs(%w[category:subcategory invalid:subcategory]),
+      ).to contain_exactly(subcategory.id)
+    end
+
+    it 'returns the ids of sub-subcategory when input is ["category:subcategory:sub-subcategory"] and maximum category nesting is 3' do
+      SiteSetting.max_category_nesting = 3
+      sub_subcategory = Fabricate(:category, parent_category: subcategory, slug: "sub-subcategory")
+
+      expect(Category.ids_from_slugs(%w[category:subcategory:sub-subcategory])).to contain_exactly(
+        sub_subcategory.id,
+      )
+    end
+
+    it 'returns nil when input is ["category:invalid-slug:sub-subcategory"] and maximum category nesting is 3' do
+      SiteSetting.max_category_nesting = 3
+      sub_subcategory = Fabricate(:category, parent_category: subcategory, slug: "sub-subcategory")
+
+      expect(Category.ids_from_slugs(%w[category:invalid-slug:sub-subcategory])).to eq([])
+    end
+
+    it 'returns the ids of subcategory when input is ["category:subcategory:sub-subcategory"] but maximum category nesting is 2' do
+      SiteSetting.max_category_nesting = 2
+
+      expect(Category.ids_from_slugs(%w[category:subcategory:sub-subcategory])).to contain_exactly(
+        subcategory.id,
+      )
+    end
+
+    it 'returns the ids of subcategory and subcategory2 when input is ["subcategory"]' do
+      expect(Category.ids_from_slugs(%w[subcategory])).to contain_exactly(
+        subcategory.id,
+        subcategory2.id,
+      )
+    end
+  end
+
+  describe "allowed_tags=" do
+    let(:category) { Fabricate(:category) }
+    fab!(:tag) { Fabricate(:tag) }
+    fab!(:tag2) { Fabricate(:tag) }
+
+    before { SiteSetting.tagging_enabled = true }
+
+    it "can use existing tags for category tags" do
+      category.allowed_tags = [tag.name]
+      expect_same_tag_names(category.reload.tags, [tag])
+    end
+
+    context "with synonyms" do
+      fab!(:synonym) { Fabricate(:tag, name: "synonym", target_tag: tag) }
+
+      it "can use existing tags for category tags" do
+        category.allowed_tags = [tag.name, synonym.name]
+        category.reload
+        category.allowed_tags = [tag.name, synonym.name, tag2.name]
+        expect_same_tag_names(category.reload.tags, [tag.name, synonym.name, tag2.name])
+      end
+    end
+  end
 end
diff --git a/spec/models/category_tag_stat_spec.rb b/spec/models/category_tag_stat_spec.rb
new file mode 100644
index 00000000000..6a154848dcb
--- /dev/null
+++ b/spec/models/category_tag_stat_spec.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+describe CategoryTagStat do
+  fab!(:category) { Fabricate(:category) }
+  fab!(:tag) { Fabricate(:tag) }
+  fab!(:topic) { Fabricate(:topic, category: category, tags: [tag]) }
+
+  describe "#update_topic_counts" do
+    it "creates new records" do
+      CategoryTagStat.destroy_all
+
+      expect { CategoryTagStat.update_topic_counts }.to change { CategoryTagStat.count }.by(1)
+      category_tag_stat = CategoryTagStat.last
+      expect(category_tag_stat.category_id).to eq(category.id)
+      expect(category_tag_stat.tag_id).to eq(tag.id)
+      expect(category_tag_stat.topic_count).to eq(1)
+    end
+
+    it "updates existing records" do
+      CategoryTagStat.last.update(topic_count: 10)
+
+      expect { CategoryTagStat.update_topic_counts }.not_to change { CategoryTagStat.count }
+      category_tag_stat = CategoryTagStat.last
+      expect(category_tag_stat.category_id).to eq(category.id)
+      expect(category_tag_stat.tag_id).to eq(tag.id)
+      expect(category_tag_stat.topic_count).to eq(1)
+    end
+
+    it "deletes old records" do
+      CategoryTagStat.last.update(tag_id: Fabricate(:tag).id)
+
+      expect { CategoryTagStat.update_topic_counts }.not_to change { CategoryTagStat.count }
+      category_tag_stat = CategoryTagStat.last
+      expect(category_tag_stat.category_id).to eq(category.id)
+      expect(category_tag_stat.tag_id).to eq(tag.id)
+      expect(category_tag_stat.topic_count).to eq(1)
+    end
+  end
+end
diff --git a/spec/models/color_scheme_spec.rb b/spec/models/color_scheme_spec.rb
index 7e1bd06e16a..13cb65d66eb 100644
--- a/spec/models/color_scheme_spec.rb
+++ b/spec/models/color_scheme_spec.rb
@@ -134,4 +134,47 @@ RSpec.describe ColorScheme do
       )
     end
   end
+
+  describe "#resolved_colors" do
+    it "merges database colors with base scheme" do
+      color_scheme = ColorScheme.new
+      color_scheme.color_scheme_colors << ColorSchemeColor.new(name: "primary", hex: "121212")
+      resolved = color_scheme.resolved_colors
+      expect(resolved["primary"]).to eq("121212")
+      expect(resolved["secondary"]).to eq(ColorScheme.base_colors["secondary"])
+    end
+
+    it "falls back to default scheme if base scheme does not have color" do
+      custom_scheme_id = "BaseSchemeWithNoHighlightColor"
+      ColorScheme::CUSTOM_SCHEMES[custom_scheme_id.to_sym] = { "secondary" => "123123" }
+
+      color_scheme = ColorScheme.new(base_scheme_id: custom_scheme_id)
+      color_scheme.color_scheme_colors << ColorSchemeColor.new(name: "primary", hex: "121212")
+
+      resolved = color_scheme.resolved_colors
+      expect(resolved["primary"]).to eq("121212") # From db
+      expect(resolved["secondary"]).to eq("123123") # From custom scheme
+      expect(resolved["tertiary"]).to eq("0088cc") # From `foundation/colors.scss`
+    ensure
+      ColorScheme::CUSTOM_SCHEMES.delete(custom_scheme_id)
+    end
+
+    it "calculates 'hover' and 'selected' from existing db colors in dark mode" do
+      color_scheme = ColorScheme.new
+      color_scheme.color_scheme_colors << ColorSchemeColor.new(name: "primary", hex: "ddd")
+      color_scheme.color_scheme_colors << ColorSchemeColor.new(name: "secondary", hex: "222")
+      resolved = color_scheme.resolved_colors
+      expect(resolved["hover"]).to eq("313131")
+      expect(resolved["selected"]).to eq("2c2c2c")
+    end
+
+    it "calculates 'hover' and 'selected' from existing db colors in light mode" do
+      color_scheme = ColorScheme.new
+      color_scheme.color_scheme_colors << ColorSchemeColor.new(name: "primary", hex: "222")
+      color_scheme.color_scheme_colors << ColorSchemeColor.new(name: "secondary", hex: "fff")
+      resolved = color_scheme.resolved_colors
+      expect(resolved["hover"]).to eq("f2f2f2")
+      expect(resolved["selected"]).to eq("e9e9e9")
+    end
+  end
 end
diff --git a/spec/models/draft_spec.rb b/spec/models/draft_spec.rb
index b34526a1687..c584a9606c1 100644
--- a/spec/models/draft_spec.rb
+++ b/spec/models/draft_spec.rb
@@ -5,6 +5,8 @@ RSpec.describe Draft do
 
   fab!(:post) { Fabricate(:post) }
 
+  it { is_expected.to have_many(:upload_references).dependent(:delete_all) }
+
   describe "system user" do
     it "can not set drafts" do
       # fake a sequence
diff --git a/spec/models/emoji_spec.rb b/spec/models/emoji_spec.rb
index 4c081717bf5..2c48c01cb1d 100644
--- a/spec/models/emoji_spec.rb
+++ b/spec/models/emoji_spec.rb
@@ -23,6 +23,11 @@ RSpec.describe Emoji do
   end
 
   describe ".lookup_unicode" do
+    before do
+      SiteSetting.emoji_deny_list = "peach"
+      Emoji.clear_cache
+    end
+
     it "should return the emoji" do
       expect(Emoji.lookup_unicode("blonde_man")).to eq("👱")
     end
@@ -34,6 +39,10 @@ RSpec.describe Emoji do
     it "should return a skin toned emoji" do
       expect(Emoji.lookup_unicode("blonde_woman:t6")).to eq("👱🏿‍♀️")
     end
+
+    it "should not return a fu emoji when emoji is in emoji deny list site setting" do
+      expect(Emoji.lookup_unicode("peach")).not_to eq("🍑")
+    end
   end
 
   describe ".url_for" do
@@ -76,6 +85,13 @@ RSpec.describe Emoji do
       expect(Emoji.exists?("test")).to be(true)
     end
 
+    it "finds a custom emoji with a name with :t1 in the middle" do
+      CustomEmoji.create!(name: "test:t1:foo", upload_id: 9999)
+      Emoji.clear_cache
+      expect(Emoji.exists?(":test:t1:foo:")).to be(true)
+      expect(Emoji.exists?("test:t1:foo")).to be(true)
+    end
+
     it "doesn’t find non-existing emoji" do
       expect(Emoji.exists?(":foo-bar:")).to be(false)
       expect(Emoji.exists?(":blonde_woman:t7:")).to be(false)
@@ -84,31 +100,6 @@ RSpec.describe Emoji do
     end
   end
 
-  describe "version updates" do
-    it "should correct cache when global emojis cache is stale" do
-      Emoji.global_emoji_cache["blonde_man"] = ["invalid", Emoji.new]
-
-      emoji = Emoji[":blonde_man:t3"]
-
-      expect(emoji.name).to eq("blonde_man")
-      expect(emoji.tonable).to eq(true)
-    end
-
-    it "should correct cache when site emojis cache is stale" do
-      CustomEmoji.create!(name: "test123", upload_id: 9999)
-      Emoji.clear_cache
-
-      Emoji.site_emoji_cache["test123"] = ["invalid", Emoji.new]
-
-      emoji = Emoji[":test123:"]
-
-      expect(emoji.name).to eq("test123")
-      expect(emoji.tonable).to be_falsey
-
-      Emoji.clear_cache
-    end
-  end
-
   describe ".codes_to_img" do
     before { Plugin::CustomEmoji.clear_cache }
     after { Plugin::CustomEmoji.clear_cache }
diff --git a/spec/models/form_template_spec.rb b/spec/models/form_template_spec.rb
new file mode 100644
index 00000000000..d36a8c67ee1
--- /dev/null
+++ b/spec/models/form_template_spec.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+RSpec.describe FormTemplate, type: :model do
+  it "can't have duplicate names" do
+    Fabricate(:form_template, name: "Bug Report", template: "- type: input")
+    t = Fabricate.build(:form_template, name: "Bug Report", template: "- type: input")
+    expect(t.save).to eq(false)
+    t = Fabricate.build(:form_template, name: "Bug Report", template: "- type: input")
+    expect(t.save).to eq(false)
+    expect(described_class.count).to eq(1)
+  end
+
+  it "can't have an invalid yaml template" do
+    template = "- type: checkbox\nattributes; bad"
+    t = Fabricate.build(:form_template, name: "Feature Request", template: template)
+    expect(t.save).to eq(false)
+  end
+
+  it "must have a supported type" do
+    template = "- type: fancy"
+    t = Fabricate.build(:form_template, name: "Fancy Template", template: template)
+    expect(t.save).to eq(false)
+  end
+
+  it "must have a type property" do
+    template = "- hello: world"
+    t = Fabricate.build(:form_template, name: "Basic Template", template: template)
+    expect(t.save).to eq(false)
+  end
+end
diff --git a/spec/models/group_request_spec.rb b/spec/models/group_request_spec.rb
index 3dd9a660a31..9c5d73809b8 100644
--- a/spec/models/group_request_spec.rb
+++ b/spec/models/group_request_spec.rb
@@ -3,8 +3,5 @@
 RSpec.describe GroupRequest do
   it { is_expected.to belong_to :user }
   it { is_expected.to belong_to :group }
-
-  it do
-    is_expected.to validate_length_of(:reason).is_at_most(described_class::REASON_CHARACTER_LIMIT)
-  end
+  it { is_expected.to validate_length_of(:reason).is_at_most(5000) }
 end
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index 349a2240288..4689284a524 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -5,7 +5,17 @@ RSpec.describe Group do
   let(:user) { Fabricate(:user) }
   let(:group) { Fabricate(:group) }
 
+  it_behaves_like "it has custom fields"
+
   describe "Validations" do
+    it { is_expected.to allow_value("#{"a" * 996}.com").for(:automatic_membership_email_domains) }
+    it do
+      is_expected.not_to allow_value("#{"a" * 997}.com").for(:automatic_membership_email_domains)
+    end
+    it { is_expected.to validate_length_of(:bio_raw).is_at_most(3000) }
+    it { is_expected.to validate_length_of(:membership_request_template).is_at_most(5000) }
+    it { is_expected.to validate_length_of(:full_name).is_at_most(100) }
+
     describe "#grant_trust_level" do
       describe "when trust level is not valid" do
         it "should not be valid" do
@@ -253,7 +263,7 @@ RSpec.describe Group do
         tl3_users = Group.find(Group::AUTO_GROUPS[:trust_level_3])
         tl3_users.add(user)
 
-        events = DiscourseEvent.track_events { Group.refresh_automatic_group!(:trust_level_3) }
+        _events = DiscourseEvent.track_events { Group.refresh_automatic_group!(:trust_level_3) }
 
         expect(GroupUser.exists?(group: tl3_users, user: user)).to eq(false)
         publish_event_job_args = Jobs::PublishGroupMembershipUpdates.jobs.last["args"].first
@@ -267,7 +277,7 @@ RSpec.describe Group do
 
         expect(GroupUser.exists?(group: tl0_users, user: user)).to eq(false)
 
-        events = DiscourseEvent.track_events { Group.refresh_automatic_group!(:trust_level_0) }
+        _events = DiscourseEvent.track_events { Group.refresh_automatic_group!(:trust_level_0) }
 
         expect(GroupUser.exists?(group: tl0_users, user: user)).to eq(true)
         publish_event_job_args = Jobs::PublishGroupMembershipUpdates.jobs.last["args"].first
@@ -492,13 +502,13 @@ RSpec.describe Group do
   end
 
   describe "new" do
-    subject { Fabricate.build(:group) }
+    subject(:group) { Fabricate.build(:group) }
 
     it "triggers a extensibility event" do
-      event = DiscourseEvent.track_events { subject.save! }.first
+      event = DiscourseEvent.track_events { group.save! }.first
 
       expect(event[:event_name]).to eq(:group_created)
-      expect(event[:params].first).to eq(subject)
+      expect(event[:params].first).to eq(group)
     end
   end
 
@@ -571,19 +581,42 @@ RSpec.describe Group do
     expect(group.id).to eq Group[group.name.to_sym].id
   end
 
+  it "allows you to lookup a group by integer id" do
+    group = Fabricate(:group)
+    expect(Group.lookup_groups(group_ids: group.id)).to contain_exactly(group)
+  end
+
+  it "allows you to lookup groups by comma separated string" do
+    group1 = Fabricate(:group)
+    group2 = Fabricate(:group)
+    expect(Group.lookup_groups(group_ids: "#{group1.id},#{group2.id}")).to contain_exactly(
+      group1,
+      group2,
+    )
+  end
+
+  it "allows you to lookup groups by array" do
+    group1 = Fabricate(:group)
+    group2 = Fabricate(:group)
+    expect(Group.lookup_groups(group_ids: [group1.id, group2.id])).to contain_exactly(
+      group1,
+      group2,
+    )
+  end
+
   it "can find desired groups correctly" do
-    expect(Group.desired_trust_level_groups(2).sort).to eq [10, 11, 12]
+    expect(Group.desired_trust_level_groups(2)).to contain_exactly(10, 11, 12)
   end
 
   it "correctly handles trust level changes" do
     user = Fabricate(:user, trust_level: 2)
     Group.user_trust_level_change!(user.id, 2)
 
-    expect(user.groups.map(&:name).sort).to eq %w[trust_level_0 trust_level_1 trust_level_2]
+    expect(user.groups.map(&:name)).to match_array %w[trust_level_0 trust_level_1 trust_level_2]
 
     Group.user_trust_level_change!(user.id, 0)
     user.reload
-    expect(user.groups.map(&:name).sort).to eq ["trust_level_0"]
+    expect(user.groups.map(&:name)).to contain_exactly("trust_level_0")
   end
 
   it "generates an event when applying group from trust level change" do
@@ -641,8 +674,8 @@ RSpec.describe Group do
     describe "when a user has qualified for trust level 1" do
       fab!(:user) { Fabricate(:user, trust_level: 1, created_at: Time.zone.now - 10.years) }
 
-      fab!(:group) { Fabricate(:group, grant_trust_level: 1) }
-      fab!(:group2) { Fabricate(:group, grant_trust_level: 0) }
+      fab!(:group) { Fabricate(:group, grant_trust_level: 3) }
+      fab!(:group2) { Fabricate(:group, grant_trust_level: 2) }
 
       before { user.user_stat.update!(topics_entered: 999, posts_read_count: 999, time_read: 999) }
 
@@ -650,11 +683,15 @@ RSpec.describe Group do
         group.add(user)
         group2.add(user)
 
-        expect(user.reload.trust_level).to eq(1)
+        expect(user.reload.trust_level).to eq(3)
 
         group.remove(user)
 
-        expect(user.reload.trust_level).to eq(0)
+        expect(user.reload.trust_level).to eq(2)
+
+        group2.remove(user)
+
+        expect(user.reload.trust_level).to eq(1)
       end
     end
 
@@ -729,6 +766,11 @@ RSpec.describe Group do
       expect(can_view?(logged_on_user, group)).to eq(false)
       expect(can_view?(nil, group)).to eq(false)
 
+      group.add_owner(moderator)
+
+      expect(can_view?(moderator, group)).to eq(true)
+
+      GroupUser.delete_by(group: group, user: moderator)
       group.update_columns(visibility_level: Group.visibility_levels[:staff])
 
       expect(can_view?(admin, group)).to eq(true)
@@ -792,6 +834,11 @@ RSpec.describe Group do
       expect(can_view?(logged_on_user, group)).to eq(false)
       expect(can_view?(nil, group)).to eq(false)
 
+      group.add_owner(moderator)
+
+      expect(can_view?(moderator, group)).to eq(true)
+
+      GroupUser.delete_by(group: group, user: moderator)
       group.update_columns(members_visibility_level: Group.visibility_levels[:staff])
 
       expect(can_view?(admin, group)).to eq(true)
@@ -860,6 +907,20 @@ RSpec.describe Group do
       events = DiscourseEvent.track_events { group.remove(user) }.map { |e| e[:event_name] }
       expect(events).to include(:user_removed_from_group)
     end
+
+    describe "with webhook" do
+      fab!(:group_user_web_hook) { Fabricate(:group_user_web_hook) }
+
+      it "Enqueues webhook events" do
+        group.remove(user)
+        job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+
+        expect(job_args["event_name"]).to eq("user_removed_from_group")
+        payload = JSON.parse(job_args["payload"])
+        expect(payload["group_id"]).to eq(group.id)
+        expect(payload["user_id"]).to eq(user.id)
+      end
+    end
   end
 
   describe "#add" do
@@ -990,7 +1051,45 @@ RSpec.describe Group do
       expect {
         group.bulk_add([user.id, admin.id])
         group.reload
-      }.to change { group.user_count }.by(2)
+      }.to change { group.user_count }.from(0).to(2)
+    end
+  end
+
+  describe "#bulk_remove" do
+    it "removes multiple users from the group and doesn't error with user_ids not present" do
+      group.bulk_add([user.id, admin.id])
+
+      group.bulk_remove([user.id, admin.id, admin.id + 1])
+
+      expect(group.group_users.count).to be_zero
+    end
+
+    it "updates group user count" do
+      group.bulk_add([user.id, admin.id])
+      expect(group.reload.user_count).to eq(2)
+
+      group.bulk_remove([user.id, admin.id])
+      expect(group.reload.user_count).to eq(0)
+    end
+
+    describe "with webhook" do
+      fab!(:group_user_web_hook) { Fabricate(:group_user_web_hook) }
+
+      it "Enqueues user_removed_from_group webhook events for each group_user" do
+        group.bulk_add([user.id, admin.id])
+
+        group.bulk_remove([user.id, admin.id])
+        Jobs::EmitWebHookEvent
+          .jobs
+          .last(2)
+          .each do |event|
+            job_args = event["args"].first
+            expect(job_args["event_name"]).to eq("user_removed_from_group")
+            payload = JSON.parse(job_args["payload"])
+            expect(payload["group_id"]).to eq(group.id)
+            expect([user.id, admin.id]).to include(payload["user_id"])
+          end
+      end
     end
   end
 
diff --git a/spec/models/group_user_spec.rb b/spec/models/group_user_spec.rb
index 0323544f88c..896a0973721 100644
--- a/spec/models/group_user_spec.rb
+++ b/spec/models/group_user_spec.rb
@@ -293,15 +293,16 @@ RSpec.describe GroupUser do
       user = Fabricate(:user)
       expect(user.trust_level).to eq(1)
 
+      user.change_trust_level!(1, log_action_for: Discourse.system_user)
       user.change_trust_level!(2, log_action_for: Discourse.system_user)
-      user.change_trust_level!(3, log_action_for: Discourse.system_user)
       group.update!(grant_trust_level: 4)
 
       group_user = Fabricate(:group_user, group: group, user: user)
       expect(user.reload.trust_level).to eq(4)
 
       group_user.destroy!
-      expect(user.reload.trust_level).to eq(3)
+      # keep in mind that we do not restore tl3, cause reqs can be lost
+      expect(user.reload.trust_level).to eq(2)
     end
   end
 end
diff --git a/spec/models/invite_spec.rb b/spec/models/invite_spec.rb
index 681ebadbf72..03d1df6cd37 100644
--- a/spec/models/invite_spec.rb
+++ b/spec/models/invite_spec.rb
@@ -12,6 +12,7 @@ RSpec.describe Invite do
   describe "Validators" do
     it { is_expected.to validate_presence_of :invited_by_id }
     it { is_expected.to rate_limit }
+    it { is_expected.to validate_length_of(:custom_message).is_at_most(1000) }
 
     it "allows invites with valid emails" do
       invite = Fabricate.build(:invite, email: "test@example.com", invited_by: user)
@@ -220,7 +221,7 @@ RSpec.describe Invite do
           3.times { Invite.generate(user, email: "test@example.com") }
         end
 
-        after { RateLimiter.clear_all! }
+        use_redis_snapshotting
 
         it "raises an error" do
           expect { Invite.generate(user, email: "test@example.com") }.to raise_error(
@@ -477,7 +478,7 @@ RSpec.describe Invite do
     end
   end
 
-  describe "#invalidate_for_email" do
+  describe ".invalidate_for_email" do
     it "returns nil if there is no invite for the given email" do
       invite = Invite.invalidate_for_email("test@example.com")
       expect(invite).to eq(nil)
@@ -599,4 +600,29 @@ RSpec.describe Invite do
       end
     end
   end
+
+  describe "#invalidate!" do
+    subject(:invalidate) { invite.invalidate! }
+
+    fab!(:invite) { Fabricate(:invite) }
+
+    before { freeze_time }
+
+    it "invalidates the invite" do
+      expect { invalidate }.to change { invite.invalidated_at }.to Time.current
+    end
+
+    it "returns the invite" do
+      expect(invalidate).to eq invite
+    end
+
+    context "when the invite is in an invalid state" do
+      before { invite.update_attribute(:custom_message, "a" * 2000) }
+
+      it "still invalidates the invite" do
+        expect(invite).to be_invalid
+        expect { invalidate }.to change { invite.invalidated_at }.to Time.current
+      end
+    end
+  end
 end
diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb
index ee3c09c4d9b..00763bc2aa7 100644
--- a/spec/models/notification_spec.rb
+++ b/spec/models/notification_spec.rb
@@ -159,11 +159,11 @@ RSpec.describe Notification do
         }.to change(user, :total_unread_notifications)
       end
 
-      it "doesn't increase unread_private_messages" do
+      it "doesn't increase unread_high_priority_notifications" do
         expect {
           Fabricate(:notification, user: user)
           user.reload
-        }.not_to change(user, :unread_private_messages)
+        }.not_to change(user, :unread_high_priority_notifications)
       end
     end
 
@@ -182,13 +182,6 @@ RSpec.describe Notification do
         }.to change(user, :total_unread_notifications)
       end
 
-      it "increases unread_private_messages" do
-        expect {
-          Fabricate(:private_message_notification, user: user)
-          user.reload
-        }.to change(user, :unread_private_messages)
-      end
-
       it "increases unread_high_priority_notifications" do
         expect {
           Fabricate(:private_message_notification, user: user)
@@ -277,17 +270,17 @@ RSpec.describe Notification do
       PostAlerter.post_created(@post)
     end
 
-    it "should create and rollup private message notifications" do
+    it "should create and roll up private message notifications" do
       expect(@target.notifications.first.notification_type).to eq(
         Notification.types[:private_message],
       )
       expect(@post.user.unread_notifications).to eq(0)
       expect(@post.user.total_unread_notifications).to eq(0)
-      expect(@target.unread_private_messages).to eq(1)
+      expect(@target.unread_high_priority_notifications).to eq(1)
 
       Fabricate(:post, topic: @topic, user: @topic.user)
       @target.reload
-      expect(@target.unread_private_messages).to eq(1)
+      expect(@target.unread_high_priority_notifications).to eq(1)
     end
   end
 
@@ -351,9 +344,6 @@ RSpec.describe Notification do
 
       expect(user.unread_notifications).to eq(0)
       expect(user.total_unread_notifications).to eq(3)
-      # NOTE: because of deprecation this will be equal to unread_high_priority_notifications,
-      #       to be removed in 2.5
-      expect(user.unread_private_messages).to eq(2)
       expect(user.unread_high_priority_notifications).to eq(2)
     end
   end
diff --git a/spec/models/permalink_spec.rb b/spec/models/permalink_spec.rb
index c22c49d1ad2..6e1d2c53451 100644
--- a/spec/models/permalink_spec.rb
+++ b/spec/models/permalink_spec.rb
@@ -24,12 +24,13 @@ RSpec.describe Permalink do
   end
 
   describe "target_url" do
+    subject(:target_url) { permalink.target_url }
+
     let(:permalink) { Fabricate.build(:permalink) }
     let(:topic) { Fabricate(:topic) }
     let(:post) { Fabricate(:post, topic: topic) }
     let(:category) { Fabricate(:category) }
     let(:tag) { Fabricate(:tag) }
-    subject(:target_url) { permalink.target_url }
 
     it "returns a topic url when topic_id is set" do
       permalink.topic_id = topic.id
diff --git a/spec/models/post_action_spec.rb b/spec/models/post_action_spec.rb
index 74dcfe23f5f..5be13af4f28 100644
--- a/spec/models/post_action_spec.rb
+++ b/spec/models/post_action_spec.rb
@@ -49,13 +49,13 @@ RSpec.describe PostAction do
       expect(topic_user_ids).to include(codinghorror.id)
       expect(topic_user_ids).to include(mod.id)
 
-      expect(topic.topic_users.where(user_id: mod.id).pluck_first(:notification_level)).to eq(
+      expect(topic.topic_users.where(user_id: mod.id).pick(:notification_level)).to eq(
         TopicUser.notification_levels[:tracking],
       )
 
-      expect(
-        topic.topic_users.where(user_id: codinghorror.id).pluck_first(:notification_level),
-      ).to eq(TopicUser.notification_levels[:watching])
+      expect(topic.topic_users.where(user_id: codinghorror.id).pick(:notification_level)).to eq(
+        TopicUser.notification_levels[:watching],
+      )
 
       # reply to PM should not clear flag
       PostCreator.new(
@@ -975,7 +975,8 @@ RSpec.describe PostAction do
       end
 
       it "creates events for ignored" do
-        events = DiscourseEvent.track_events { reviewable.perform(moderator, :ignore) }
+        events =
+          DiscourseEvent.track_events { reviewable.perform(moderator, :ignore_and_do_nothing) }
 
         reviewed_event = events.find { |e| e[:event_name] == :flag_reviewed }
         expect(reviewed_event).to be_present
diff --git a/spec/models/post_mover_spec.rb b/spec/models/post_mover_spec.rb
index 247731f8cfb..1f5a155399a 100644
--- a/spec/models/post_mover_spec.rb
+++ b/spec/models/post_mover_spec.rb
@@ -1286,6 +1286,769 @@ RSpec.describe PostMover do
           end
         end
 
+        context "when moving chronologically to an existing topic" do
+          fab!(:destination_topic) { Fabricate(:topic, user: user) }
+          fab!(:destination_op) do
+            Fabricate(
+              :post,
+              topic: destination_topic,
+              user: user,
+              created_at: p2.created_at + 30.minutes,
+            )
+          end
+
+          it "works correctly with post_number gap in destination" do
+            destination_p6 =
+              Fabricate(
+                :post,
+                topic: destination_topic,
+                user: another_user,
+                created_at: p3.created_at + 5.minutes,
+                post_number: 6,
+                reply_count: 1,
+              )
+            destination_p7 =
+              Fabricate(
+                :post,
+                topic: destination_topic,
+                user: another_user,
+                created_at: p3.created_at + 10.minutes,
+                reply_to_post_number: destination_p6.post_number,
+              )
+            destination_p6.replies << destination_p7
+
+            # after: p2(-2h) destination_op p3(-1h) destination_p6 destination_p7 p4(-45min)
+
+            topic.expects(:add_moderator_post).once
+            moved_to =
+              topic.move_posts(
+                user,
+                [p2.id, p3.id, p4.id],
+                destination_topic_id: destination_topic.id,
+                chronological_order: true,
+              )
+            expect(moved_to).to eq(destination_topic)
+
+            # Check out destination topic
+            moved_to.reload
+            expect(moved_to.posts_count).to eq(6)
+            expect(moved_to.highest_post_number).to eq(8)
+            expect(moved_to.user_id).to eq(p2.user_id)
+            expect(moved_to.like_count).to eq(1)
+            expect(moved_to.category_id).to eq(SiteSetting.uncategorized_category_id)
+            p4.reload
+            expect(moved_to.last_post_user_id).to eq(p4.user_id)
+            expect(moved_to.last_posted_at).to eq_time(p4.created_at)
+
+            # Posts should be re-ordered
+            p2.reload
+            expect(p2.sort_order).to eq(1)
+            expect(p2.post_number).to eq(1)
+            expect(p2.topic_id).to eq(moved_to.id)
+            expect(p2.reply_count).to eq(1)
+            expect(p2.reply_to_post_number).to eq(nil)
+
+            destination_op.reload
+            expect(destination_op.sort_order).to eq(2)
+            expect(destination_op.post_number).to eq(2)
+            expect(destination_op.reply_count).to eq(0)
+            expect(destination_op.reply_to_post_number).to eq(nil)
+
+            p3.reload
+            expect(p3.post_number).to eq(3)
+            expect(p3.sort_order).to eq(3)
+            expect(p3.topic_id).to eq(moved_to.id)
+            expect(p3.reply_count).to eq(0)
+            expect(p3.reply_to_post_number).to eq(nil)
+
+            destination_p6.reload
+            expect(destination_p6.post_number).to eq(6)
+            expect(destination_p6.sort_order).to eq(6)
+            expect(destination_p6.reply_count).to eq(1)
+            expect(destination_p6.reply_to_post_number).to eq(nil)
+
+            destination_p7.reload
+            expect(destination_p7.post_number).to eq(7)
+            expect(destination_p7.sort_order).to eq(7)
+            expect(destination_p7.reply_count).to eq(0)
+            expect(destination_p7.reply_to_post_number).to eq(6)
+
+            p4.reload
+            expect(p4.post_number).to eq(8)
+            expect(p4.sort_order).to eq(8)
+            expect(p4.topic_id).to eq(moved_to.id)
+            expect(p4.reply_count).to eq(0)
+            expect(p4.reply_to_post_number).to eq(1)
+
+            # Check out the original topic
+            topic.reload
+            expect(topic.posts_count).to eq(1)
+            expect(topic.featured_user1_id).to be_blank
+            expect(topic.like_count).to eq(0)
+            expect(topic.posts.by_post_number).to match_array([p1])
+            expect(topic.highest_post_number).to eq(p1.post_number)
+
+            # Should notify correctly
+            notification =
+              p2.user.notifications.where(notification_type: Notification.types[:moved_post]).first
+
+            expect(notification.topic_id).to eq(destination_topic.id)
+            expect(notification.post_number).to eq(p2.post_number)
+
+            # Should update last reads
+            expect(
+              TopicUser.find_by(user_id: user.id, topic_id: topic.id).last_read_post_number,
+            ).to eq(p1.post_number)
+          end
+
+          it "works correctly keeping replies in destination" do
+            destination_p2 =
+              Fabricate(
+                :post,
+                topic: destination_topic,
+                user: another_user,
+                created_at: p3.created_at - 10.minutes,
+                post_number: 2,
+                reply_count: 1,
+              )
+            destination_p3 =
+              Fabricate(
+                :post,
+                topic: destination_topic,
+                user: another_user,
+                created_at: p4.created_at + 5.minutes,
+                reply_to_post_number: destination_p2.post_number,
+                reply_count: 1,
+              )
+            destination_p4 =
+              Fabricate(
+                :post,
+                topic: destination_topic,
+                user: another_user,
+                created_at: p4.created_at + 10.minutes,
+                reply_to_post_number: destination_p3.post_number,
+              )
+            destination_p2.replies << destination_p3
+            destination_p3.replies << destination_p4
+
+            # after: destination_op destination_p2 p3(-1h) p4(-45min) destination_p3 destination_p4
+
+            topic.expects(:add_moderator_post).once
+            moved_to =
+              topic.move_posts(
+                user,
+                [p3.id, p4.id],
+                destination_topic_id: destination_topic.id,
+                chronological_order: true,
+              )
+            expect(moved_to).to eq(destination_topic)
+
+            # Check out destination topic
+            moved_to.reload
+            expect(moved_to.posts_count).to eq(6)
+            expect(moved_to.highest_post_number).to eq(6)
+            expect(moved_to.user_id).to eq(destination_op.user_id)
+            expect(moved_to.like_count).to eq(1)
+            expect(moved_to.category_id).to eq(SiteSetting.uncategorized_category_id)
+
+            # Posts should be re-ordered
+            destination_op.reload
+            expect(destination_op.sort_order).to eq(1)
+            expect(destination_op.post_number).to eq(1)
+
+            destination_p2.reload
+            expect(destination_p2.post_number).to eq(2)
+            expect(destination_p2.sort_order).to eq(2)
+            expect(destination_p2.reply_count).to eq(1)
+            expect(destination_p2.reply_to_post_number).to eq(nil)
+
+            p3.reload
+            expect(p3.post_number).to eq(3)
+            expect(p3.sort_order).to eq(3)
+            expect(p3.topic_id).to eq(moved_to.id)
+            expect(p3.reply_count).to eq(0)
+            expect(p3.reply_to_post_number).to eq(nil)
+
+            p4.reload
+            expect(p4.post_number).to eq(4)
+            expect(p4.sort_order).to eq(4)
+            expect(p4.topic_id).to eq(moved_to.id)
+            expect(p4.reply_count).to eq(0)
+            expect(p4.reply_to_post_number).to eq(nil)
+
+            destination_p3.reload
+            expect(destination_p3.post_number).to eq(5)
+            expect(destination_p3.sort_order).to eq(5)
+            expect(destination_p3.reply_count).to eq(1)
+            expect(destination_p3.reply_to_post_number).to eq(destination_p2.post_number)
+
+            destination_p4.reload
+            expect(destination_p4.post_number).to eq(6)
+            expect(destination_p4.sort_order).to eq(6)
+            expect(destination_p4.reply_count).to eq(0)
+            expect(destination_p4.reply_to_post_number).to eq(destination_p3.post_number)
+
+            # Check out the original topic
+            topic.reload
+            expect(topic.posts_count).to eq(2)
+            expect(topic.featured_user1_id).to eq(p2.user_id)
+            expect(topic.like_count).to eq(0)
+            expect(topic.posts.by_post_number).to match_array([p1, p2])
+            expect(topic.highest_post_number).to eq(p2.post_number)
+
+            # Should update last reads
+            expect(
+              TopicUser.find_by(user_id: user.id, topic_id: topic.id).last_read_post_number,
+            ).to eq(p2.post_number)
+          end
+
+          it "works correctly when moving the first post" do
+            # forcing a different user_id than p1.user_id
+            destination_topic.update_column(:user_id, another_user.id)
+            destination_op.update_column(:user_id, another_user.id)
+
+            # after: p1(-3h) destination_op
+
+            topic.expects(:add_moderator_post).once
+            moved_to =
+              topic.move_posts(
+                user,
+                [p1.id],
+                destination_topic_id: destination_topic.id,
+                chronological_order: true,
+              )
+            expect(moved_to).to eq(destination_topic)
+
+            # Check out destination topic
+            moved_to.reload
+            expect(moved_to.posts_count).to eq(2)
+            expect(moved_to.highest_post_number).to eq(2)
+            expect(moved_to.user_id).to eq(p1.user_id)
+            expect(moved_to.like_count).to eq(0)
+
+            # First post didn't move
+            p1.reload
+            expect(p1.sort_order).to eq(1)
+            expect(p1.post_number).to eq(1)
+            expect(p1.topic_id).to eq(topic.id)
+            expect(p1.reply_count).to eq(2)
+
+            # New first post
+            new_first = moved_to.posts.where(post_number: 1).first
+            expect(new_first.sort_order).to eq(1)
+            expect(new_first.reply_count).to eq(0)
+            expect(new_first.created_at).to eq_time(p1.created_at)
+
+            destination_op.reload
+            expect(destination_op.sort_order).to eq(2)
+            expect(destination_op.post_number).to eq(2)
+
+            # Check out the original topic
+            topic.reload
+            expect(topic.posts_count).to eq(4)
+            expect(topic.featured_user1_id).to eq(p2.user_id)
+            expect(topic.like_count).to eq(1)
+            expect(topic.posts.by_post_number).to match_array([p1, p2, p3, p4])
+            expect(topic.highest_post_number).to eq(p4.post_number)
+          end
+
+          it "correctly remaps quotes for shifted posts on destination topic" do
+            destination_p8 =
+              Fabricate(
+                :post,
+                topic: destination_topic,
+                user: another_user,
+                created_at: p6.created_at + 10.minutes,
+              )
+
+            raw = <<~RAW
+            [quote="dan, post:#{destination_p8.post_number}, topic:#{destination_p8.topic_id}, full:true"]
+            some quote from the other post
+            [/quote]
+
+            the quote above should be updated with new post number and topic id
+            RAW
+
+            p3.update!(raw: raw)
+            p3.rebake!
+
+            expect {
+              topic.move_posts(
+                user,
+                [p6.id],
+                destination_topic_id: destination_topic.id,
+                chronological_order: true,
+              )
+            }.to change { p6.reload.topic_id }.and change {
+                    destination_p8.reload.post_number
+                  }.and change { p3.reload.raw }.and change { p3.baked_version }.to(nil)
+
+            expect(p3.raw).to include(
+              "post:#{destination_p8.post_number}, topic:#{destination_p8.topic_id}",
+            )
+          end
+
+          it "moving all posts will close the topic" do
+            topic.expects(:add_moderator_post).twice
+            posts_to_move = [p1.id, p2.id, p3.id, p4.id]
+            moved_to =
+              topic.move_posts(
+                user,
+                posts_to_move,
+                destination_topic_id: destination_topic.id,
+                chronological_order: true,
+              )
+            expect(moved_to).to be_present
+
+            topic.reload
+            expect(topic).to be_closed
+          end
+
+          it "doesn't close the topic when not all posts were moved" do
+            topic.expects(:add_moderator_post).once
+            posts_to_move = [p2.id, p3.id]
+            moved_to =
+              topic.move_posts(
+                user,
+                posts_to_move,
+                destination_topic_id: destination_topic.id,
+                chronological_order: true,
+              )
+            expect(moved_to).to be_present
+
+            topic.reload
+            expect(topic).to_not be_closed
+          end
+
+          it "doesn't close the topic when all posts except the first one were moved" do
+            topic.expects(:add_moderator_post).once
+            posts_to_move = [p2.id, p3.id, p4.id]
+            moved_to =
+              topic.move_posts(
+                user,
+                posts_to_move,
+                destination_topic_id: destination_topic.id,
+                chronological_order: true,
+              )
+            expect(moved_to).to be_present
+
+            topic.reload
+            expect(topic).to_not be_closed
+          end
+
+          it "schedules topic deleting when all posts were moved" do
+            SiteSetting.delete_merged_stub_topics_after_days = 7
+            freeze_time
+
+            topic.expects(:add_moderator_post).twice
+            posts_to_move = [p1.id, p2.id, p3.id, p4.id]
+            moved_to =
+              topic.move_posts(
+                user,
+                posts_to_move,
+                destination_topic_id: destination_topic.id,
+                chronological_order: true,
+              )
+            expect(moved_to).to be_present
+
+            timer = topic.topic_timers.find_by(status_type: TopicTimer.types[:delete])
+            expect(timer).to be_present
+            expect(timer.execute_at).to eq_time(7.days.from_now)
+          end
+
+          it "doesn't schedule topic deleting when not all posts were moved" do
+            SiteSetting.delete_merged_stub_topics_after_days = 7
+
+            topic.expects(:add_moderator_post).once
+            posts_to_move = [p1.id, p2.id, p3.id]
+            moved_to =
+              topic.move_posts(
+                user,
+                posts_to_move,
+                destination_topic_id: destination_topic.id,
+                chronological_order: true,
+              )
+            expect(moved_to).to be_present
+
+            timer = topic.topic_timers.find_by(status_type: TopicTimer.types[:delete])
+            expect(timer).to be_nil
+          end
+
+          it "doesn't schedule topic deleting when all posts were moved if it's disabled in settings" do
+            SiteSetting.delete_merged_stub_topics_after_days = 0
+
+            topic.expects(:add_moderator_post).twice
+            posts_to_move = [p1.id, p2.id, p3.id, p4.id]
+            moved_to =
+              topic.move_posts(
+                user,
+                posts_to_move,
+                destination_topic_id: destination_topic.id,
+                chronological_order: true,
+              )
+            expect(moved_to).to be_present
+
+            timer = topic.topic_timers.find_by(status_type: TopicTimer.types[:delete])
+            expect(timer).to be_nil
+          end
+
+          it "ignores moderator posts and closes the topic if all regular posts were moved" do
+            add_moderator_post_to topic, Post.types[:moderator_action]
+            add_moderator_post_to topic, Post.types[:small_action]
+
+            posts_to_move = [p1.id, p2.id, p3.id, p4.id]
+            topic.move_posts(
+              user,
+              posts_to_move,
+              destination_topic_id: destination_topic.id,
+              chronological_order: true,
+            )
+
+            topic.reload
+            expect(topic).to be_closed
+          end
+
+          it "does not try to move small action posts" do
+            small_action =
+              Fabricate(
+                :post,
+                topic: topic,
+                raw: "A small action",
+                post_type: Post.types[:small_action],
+              )
+            moved_to =
+              topic.move_posts(
+                user,
+                [p1.id, p2.id, p3.id, p4.id, small_action.id],
+                destination_topic_id: destination_topic.id,
+                chronological_order: true,
+              )
+
+            moved_to.reload
+            expect(moved_to.posts_count).to eq(5)
+            expect(small_action.topic_id).to eq(topic.id)
+
+            moderator_post = topic.posts.find_by(post_number: 2)
+            expect(moderator_post.raw).to include("4 posts were merged")
+          end
+
+          it "updates existing notifications" do
+            n2 = Fabricate(:mentioned_notification, post: p2, user: another_user)
+            n4 = Fabricate(:mentioned_notification, post: p4, user: another_user)
+            dest_nop = Fabricate(:mentioned_notification, post: destination_op, user: another_user)
+
+            moved_to =
+              topic.move_posts(
+                user,
+                [p2.id],
+                destination_topic_id: destination_topic.id,
+                chronological_order: true,
+              )
+
+            n2 = Notification.find(n2.id)
+            expect(n2.topic_id).to eq(moved_to.id)
+            expect(n2.post_number).to eq(1)
+            expect(n2.data_hash[:topic_title]).to eq(moved_to.title)
+
+            n4 = Notification.find(n4.id)
+            expect(n4.topic_id).to eq(topic.id)
+            expect(n4.post_number).to eq(4)
+
+            dest_nop = Notification.find(dest_nop.id)
+            expect(dest_nop.post_number).to eq(2)
+          end
+
+          it "deletes notifications for users not allowed to see the topic" do
+            another_admin = Fabricate(:admin)
+            staff_category = Fabricate(:private_category, group: Group[:staff])
+            user_notification = Fabricate(:mentioned_notification, post: p3, user: another_user)
+            admin_notification = Fabricate(:mentioned_notification, post: p3, user: another_admin)
+
+            destination_topic.update!(category_id: staff_category.id)
+            topic.move_posts(
+              user,
+              [p3.id],
+              destination_topic_id: destination_topic.id,
+              chronological_order: true,
+            )
+
+            expect(Notification.exists?(user_notification.id)).to eq(false)
+            expect(Notification.exists?(admin_notification.id)).to eq(true)
+          end
+
+          context "with post timings" do
+            fab!(:some_user) { Fabricate(:user) }
+
+            it "successfully moves timings" do
+              create_post_timing(p1, some_user, 500)
+              create_post_timing(p2, some_user, 1000)
+              create_post_timing(p3, some_user, 1500)
+              create_post_timing(p4, some_user, 750)
+
+              moved_to =
+                topic.move_posts(
+                  user,
+                  [p1.id, p4.id],
+                  destination_topic_id: destination_topic.id,
+                  chronological_order: true,
+                )
+
+              expect(
+                PostTiming.where(topic_id: topic.id, user_id: some_user.id).pluck(
+                  :post_number,
+                  :msecs,
+                ),
+              ).to contain_exactly([1, 500], [2, 1000], [3, 1500])
+
+              expect(
+                PostTiming.where(topic_id: moved_to.id, user_id: some_user.id).pluck(
+                  :post_number,
+                  :msecs,
+                ),
+              ).to contain_exactly([1, 500], [3, 750])
+            end
+
+            it "moves timings when post timing exists in destination topic" do
+              destination_p2 =
+                Fabricate(
+                  :post,
+                  topic: destination_topic,
+                  user: another_user,
+                  created_at: destination_op.created_at + 10.minutes,
+                  post_number: 2,
+                )
+              destination_p3 =
+                Fabricate(
+                  :post,
+                  topic: destination_topic,
+                  user: another_user,
+                  created_at: destination_op.created_at + 15.minutes,
+                  post_number: 3,
+                )
+              destination_topic.update!(highest_post_number: 3)
+
+              PostTiming.create!(
+                topic_id: destination_topic.id,
+                user_id: some_user.id,
+                post_number: 4,
+                msecs: 800,
+              )
+              create_post_timing(destination_op, some_user, 1500)
+              create_post_timing(destination_p2, some_user, 2000)
+              create_post_timing(destination_p3, some_user, 1250)
+              create_post_timing(p1, some_user, 500)
+
+              moved_to =
+                topic.move_posts(
+                  user,
+                  [p1.id],
+                  destination_topic_id: destination_topic.id,
+                  chronological_order: true,
+                )
+
+              expect(
+                PostTiming.where(topic_id: moved_to.id, user_id: some_user.id).pluck(
+                  :post_number,
+                  :msecs,
+                ),
+              ).to contain_exactly([1, 500], [2, 1500], [3, 2000], [4, 1250])
+            end
+          end
+
+          it "updates topic_user.liked values for both source and destination topics" do
+            expect(TopicUser.find_by(topic: topic, user: user).liked).to eq(false)
+
+            like =
+              Fabricate(
+                :post_action,
+                post: p3,
+                user: user,
+                post_action_type_id: PostActionType.types[:like],
+              )
+            expect(TopicUser.find_by(topic: topic, user: user).liked).to eq(true)
+
+            expect(TopicUser.find_by(topic: destination_topic, user: user)).to eq(nil)
+            topic.move_posts(
+              user,
+              [p3.id],
+              destination_topic_id: destination_topic.id,
+              chronological_order: true,
+            )
+
+            expect(TopicUser.find_by(topic: topic, user: user).liked).to eq(false)
+            expect(TopicUser.find_by(topic: destination_topic, user: user).liked).to eq(true)
+          end
+
+          context "with read state and other stats per user" do
+            def create_topic_user(user, topic, opts = {})
+              notification_level = opts.delete(:notification_level) || :regular
+
+              Fabricate(
+                :topic_user,
+                opts.merge(
+                  notification_level: TopicUser.notification_levels[notification_level],
+                  topic: topic,
+                  user: user,
+                ),
+              )
+            end
+
+            fab!(:user1) { Fabricate(:user) }
+            fab!(:user2) { Fabricate(:user) }
+            fab!(:user3) { Fabricate(:user) }
+            fab!(:admin1) { Fabricate(:admin) }
+            fab!(:admin2) { Fabricate(:admin) }
+
+            it "leaves post numbers unchanged when they were lower then the topic's highest post number" do
+              Fabricate(:post, topic: destination_topic)
+              Fabricate(:whisper, topic: destination_topic)
+
+              destination_topic.reload
+              expect(destination_topic.highest_post_number).to eq(2)
+              expect(destination_topic.highest_staff_post_number).to eq(3)
+
+              create_topic_user(user1, topic, last_read_post_number: 3, last_emailed_post_number: 3)
+              create_topic_user(
+                user1,
+                destination_topic,
+                last_read_post_number: 1,
+                last_emailed_post_number: 1,
+              )
+
+              create_topic_user(user2, topic, last_read_post_number: 3, last_emailed_post_number: 3)
+              create_topic_user(
+                user2,
+                destination_topic,
+                last_read_post_number: 2,
+                last_emailed_post_number: 2,
+              )
+
+              create_topic_user(
+                admin1,
+                topic,
+                last_read_post_number: 3,
+                last_emailed_post_number: 3,
+              )
+              create_topic_user(
+                admin1,
+                destination_topic,
+                last_read_post_number: 2,
+                last_emailed_post_number: 1,
+              )
+
+              create_topic_user(
+                admin2,
+                topic,
+                last_read_post_number: 3,
+                last_emailed_post_number: 3,
+              )
+              create_topic_user(
+                admin2,
+                destination_topic,
+                last_read_post_number: 3,
+                last_emailed_post_number: 3,
+              )
+
+              moved_to_topic =
+                topic.move_posts(
+                  user,
+                  [p1.id, p2.id],
+                  destination_topic_id: destination_topic.id,
+                  chronological_order: true,
+                )
+
+              expect(TopicUser.find_by(topic: moved_to_topic, user: user1)).to have_attributes(
+                last_read_post_number: 1,
+                last_emailed_post_number: 1,
+              )
+
+              expect(TopicUser.find_by(topic: moved_to_topic, user: user2)).to have_attributes(
+                last_read_post_number: 2,
+                last_emailed_post_number: 2,
+              )
+
+              expect(TopicUser.find_by(topic: moved_to_topic, user: admin1)).to have_attributes(
+                last_read_post_number: 2,
+                last_emailed_post_number: 1,
+              )
+
+              expect(TopicUser.find_by(topic: moved_to_topic, user: admin2)).to have_attributes(
+                last_read_post_number: 3,
+                last_emailed_post_number: 3,
+              )
+            end
+
+            it "correctly updates existing topic_user records" do
+              destination_topic.update!(created_at: 1.day.ago)
+
+              original_topic_user1 =
+                create_topic_user(
+                  user1,
+                  topic,
+                  last_read_post_number: 5,
+                  first_visited_at: 5.hours.ago,
+                  last_visited_at: 30.minutes.ago,
+                  notification_level: :tracking,
+                ).reload
+              destination_topic_user1 =
+                create_topic_user(
+                  user1,
+                  destination_topic,
+                  last_read_post_number: 5,
+                  first_visited_at: 7.hours.ago,
+                  last_visited_at: 2.hours.ago,
+                  notification_level: :watching,
+                ).reload
+
+              original_topic_user2 =
+                create_topic_user(
+                  user2,
+                  topic,
+                  last_read_post_number: 5,
+                  first_visited_at: 3.hours.ago,
+                  last_visited_at: 1.hour.ago,
+                  notification_level: :watching,
+                ).reload
+              destination_topic_user2 =
+                create_topic_user(
+                  user2,
+                  destination_topic,
+                  last_read_post_number: 5,
+                  first_visited_at: 2.hours.ago,
+                  last_visited_at: 1.hour.ago,
+                  notification_level: :tracking,
+                ).reload
+
+              new_topic =
+                topic.move_posts(
+                  user,
+                  [p1.id, p2.id],
+                  destination_topic_id: destination_topic.id,
+                  chronological_order: true,
+                )
+
+              expect(TopicUser.find_by(topic: new_topic, user: user)).to have_attributes(
+                notification_level: TopicUser.notification_levels[:tracking],
+                posted: true,
+              )
+
+              expect(TopicUser.find_by(topic: new_topic, user: user1)).to have_attributes(
+                first_visited_at: destination_topic_user1.first_visited_at,
+                last_visited_at: original_topic_user1.last_visited_at,
+                notification_level: destination_topic_user1.notification_level,
+                posted: false,
+              )
+
+              expect(TopicUser.find_by(topic: new_topic, user: user2)).to have_attributes(
+                first_visited_at: original_topic_user2.first_visited_at,
+                last_visited_at: destination_topic_user2.last_visited_at,
+                notification_level: destination_topic_user2.notification_level,
+                posted: false,
+              )
+            end
+          end
+        end
+
         it "skips validations when moving posts" do
           p1.update_attribute(:raw, "foo")
           p2.update_attribute(:raw, "bar")
@@ -1550,6 +2313,102 @@ RSpec.describe PostMover do
           expect(post.raw).to eq(expected_text)
         end
       end
+
+      context "when moving chronologically to existing message" do
+        it "adds post users as topic allowed users" do
+          personal_message.move_posts(
+            admin,
+            [p2.id, p5.id],
+            destination_topic_id: another_personal_message.id,
+            archetype: "private_message",
+            chronological_order: true,
+          )
+
+          p2.reload
+          expect(p2.topic_id).to eq(another_personal_message.id)
+
+          another_personal_message.reload
+          expect(
+            another_personal_message.topic_allowed_users.where(user_id: another_user.id).count,
+          ).to eq(1)
+          expect(
+            another_personal_message.topic_allowed_users.where(user_id: evil_trout.id).count,
+          ).to eq(1)
+        end
+
+        it "can add additional participants" do
+          personal_message.move_posts(
+            admin,
+            [p2.id, p5.id],
+            destination_topic_id: another_personal_message.id,
+            participants: [regular_user.username],
+            archetype: "private_message",
+            chronological_order: true,
+          )
+
+          another_personal_message.reload
+          expect(
+            another_personal_message.topic_allowed_users.where(user_id: another_user.id).count,
+          ).to eq(1)
+          expect(
+            another_personal_message.topic_allowed_users.where(user_id: evil_trout.id).count,
+          ).to eq(1)
+          expect(
+            another_personal_message.topic_allowed_users.where(user_id: regular_user.id).count,
+          ).to eq(1)
+        end
+
+        it "does not allow moving regular topic posts in personal message" do
+          topic = Fabricate(:topic, created_at: 4.hours.ago)
+
+          expect {
+            personal_message.move_posts(
+              admin,
+              [p2.id, p5.id],
+              destination_topic_id: topic.id,
+              chronological_order: true,
+            )
+          }.to raise_error(Discourse::InvalidParameters)
+        end
+
+        it "moving all posts will close the message" do
+          moved_to =
+            personal_message.move_posts(
+              admin,
+              [p1.id, p2.id, p3.id, p4.id, p5.id],
+              destination_topic_id: another_personal_message.id,
+              archetype: "private_message",
+              chronological_order: true,
+            )
+          expect(moved_to).to be_present
+
+          personal_message.reload
+          expect(personal_message.closed).to eq(true)
+          expect(moved_to.posts_count).to eq(6)
+        end
+
+        it "uses the correct small action post" do
+          moved_to =
+            personal_message.move_posts(
+              admin,
+              [p2.id],
+              destination_topic_id: another_personal_message.id,
+              archetype: "private_message",
+              chronological_order: true,
+            )
+          post = Post.find_by(topic_id: personal_message.id, post_type: Post.types[:whisper])
+
+          expected_text =
+            I18n.t(
+              "move_posts.existing_message_moderator_post",
+              count: 1,
+              topic_link: "[#{moved_to.title}](#{moved_to.relative_url})",
+              locale: :en,
+            )
+
+          expect(post.raw).to eq(expected_text)
+        end
+      end
     end
 
     context "with banner topic" do
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index d4327035441..12a46d8f77c 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -3,9 +3,13 @@
 RSpec.describe Post do
   fab!(:coding_horror) { Fabricate(:coding_horror) }
 
+  let(:upload_path) { Discourse.store.upload_path }
+
   before { Oneboxer.stubs :onebox }
 
-  let(:upload_path) { Discourse.store.upload_path }
+  it_behaves_like "it has custom fields"
+
+  it { is_expected.to have_many(:reviewables).dependent(:destroy) }
 
   describe "#hidden_reasons" do
     context "when verifying enum sequence" do
@@ -199,7 +203,7 @@ RSpec.describe Post do
 
     it "is_flagged? is true if flag was deferred" do
       result = PostActionCreator.off_topic(user, post)
-      result.reviewable.perform(admin, :ignore)
+      result.reviewable.perform(admin, :ignore_and_do_nothing)
       expect(post.reload.is_flagged?).to eq(true)
     end
 
@@ -213,7 +217,7 @@ RSpec.describe Post do
       result = PostActionCreator.spam(user, post)
       expect(post.reviewable_flag).to eq(result.reviewable)
 
-      result.reviewable.perform(admin, :ignore)
+      result.reviewable.perform(admin, :ignore_and_do_nothing)
       expect(post.reviewable_flag).to be_nil
     end
 
@@ -1530,6 +1534,78 @@ RSpec.describe Post do
     expect(post.revisions.pluck(:number)).to eq([1, 2])
   end
 
+  describe "video_thumbnails" do
+    fab!(:video_upload) { Fabricate(:upload, extension: "mp4") }
+    fab!(:image_upload) { Fabricate(:upload) }
+    fab!(:image_upload_2) { Fabricate(:upload) }
+    let(:base_url) { "#{Discourse.base_url_no_prefix}#{Discourse.base_path}" }
+    let(:video_url) { "#{base_url}#{video_upload.url}" }
+
+    let(:raw_video) { <<~RAW }
+      <video width="100%" height="100%" controls>
+        <source src="#{video_url}">
+        <a href="#{video_url}">#{video_url}</a>
+      </video>
+      RAW
+
+    let(:post) { Fabricate(:post, raw: raw_video) }
+
+    before { SiteSetting.video_thumbnails_enabled = true }
+
+    it "has a topic thumbnail" do
+      # Thumbnails are tied to a specific video file by using the
+      # video's sha1 as the image filename
+      image_upload.original_filename = "#{video_upload.sha1}.png"
+      image_upload.save!
+      post.link_post_uploads
+
+      post.topic.reload
+      expect(post.topic.topic_thumbnails.length).to eq(1)
+    end
+
+    it "only applies for video uploads" do
+      image_upload.original_filename = "#{image_upload_2.sha1}.png"
+      image_upload.save!
+      post.link_post_uploads
+
+      post.topic.reload
+      expect(post.topic.topic_thumbnails.length).to eq(0)
+    end
+
+    it "does not overwrite existing thumbnails" do
+      image_upload.original_filename = "#{video_upload.sha1}.png"
+      image_upload.save!
+      post.topic.image_upload_id = image_upload_2.id
+      post.topic.save!
+      post.link_post_uploads
+
+      post.topic.reload
+      expect(post.topic.image_upload_id).to eq(image_upload_2.id)
+    end
+
+    it "uses the newest thumbnail" do
+      image_upload.original_filename = "#{video_upload.sha1}.png"
+      image_upload.save!
+      image_upload_2.original_filename = "#{video_upload.sha1}.png"
+      image_upload_2.save!
+      post.link_post_uploads
+
+      post.topic.reload
+      expect(post.topic.topic_thumbnails.length).to eq(1)
+      expect(post.topic.image_upload_id).to eq(image_upload_2.id)
+    end
+
+    it "does not create thumbnails when disabled" do
+      SiteSetting.video_thumbnails_enabled = false
+      image_upload.original_filename = "#{video_upload.sha1}.png"
+      image_upload.save!
+      post.link_post_uploads
+
+      post.topic.reload
+      expect(post.topic.topic_thumbnails.length).to eq(0)
+    end
+  end
+
   describe "uploads" do
     fab!(:video_upload) { Fabricate(:upload, extension: "mp4") }
     fab!(:image_upload) { Fabricate(:upload) }
diff --git a/spec/models/quoted_post_spec.rb b/spec/models/quoted_post_spec.rb
index 96fb2f9742a..970184d7106 100644
--- a/spec/models/quoted_post_spec.rb
+++ b/spec/models/quoted_post_spec.rb
@@ -79,7 +79,6 @@ RSpec.describe QuotedPost do
       </aside>
     HTML
 
-    QuotedPost.create!(post_id: post2.id, quoted_post_id: 999)
     quote = QuotedPost.create!(post_id: post2.id, quoted_post_id: post1.id)
     original_date = quote.created_at
 
diff --git a/spec/models/report_spec.rb b/spec/models/report_spec.rb
index b87064abbde..3efcf065fb8 100644
--- a/spec/models/report_spec.rb
+++ b/spec/models/report_spec.rb
@@ -46,6 +46,8 @@ RSpec.describe Report do
 
   describe "counting" do
     describe "requests" do
+      subject(:json) { Report.find("http_total_reqs").as_json }
+
       before do
         freeze_time DateTime.parse("2017-03-01 12:00")
 
@@ -89,8 +91,6 @@ RSpec.describe Report do
         ApplicationRequest.insert_all(application_requests)
       end
 
-      subject(:json) { Report.find("http_total_reqs").as_json }
-
       it "counts the correct records" do
         expect(json[:data].size).to eq(31) # today and 30 full days
         expect(json[:data][0..-2].sum { |d| d[:y] }).to eq(300)
@@ -193,7 +193,7 @@ RSpec.describe Report do
 
       let(:report) { Report.find(pluralized) }
 
-      context "no #{pluralized}" do
+      context "with no #{pluralized}" do
         it "returns an empty report" do
           expect(report.data).to be_blank
         end
@@ -1309,9 +1309,11 @@ RSpec.describe Report do
       end
 
       after do
+        CachedCounting.reset
         ApplicationRequest.disable
         CachedCounting.disable
       end
+
       it "works" do
         3.times { ApplicationRequest.increment!(:page_view_crawler) }
         2.times { ApplicationRequest.increment!(:page_view_logged_in) }
@@ -1323,13 +1325,13 @@ RSpec.describe Report do
         page_view_logged_in_report = reports.data.find { |r| r[:req] == "page_view_logged_in" }
         page_view_anon_report = reports.data.find { |r| r[:req] == "page_view_anon" }
 
-        expect(page_view_crawler_report[:color]).to eql("rgba(200,0,1,0.75)")
+        expect(page_view_crawler_report[:color]).to eql("#721D8D")
         expect(page_view_crawler_report[:data][0][:y]).to eql(3)
 
-        expect(page_view_logged_in_report[:color]).to eql("rgba(0,136,204,1)")
+        expect(page_view_logged_in_report[:color]).to eql("#1EB8D1")
         expect(page_view_logged_in_report[:data][0][:y]).to eql(2)
 
-        expect(page_view_anon_report[:color]).to eql("#40c8ff")
+        expect(page_view_anon_report[:color]).to eql("#9BC53D")
         expect(page_view_anon_report[:data][0][:y]).to eql(1)
       ensure
       end
@@ -1371,10 +1373,10 @@ RSpec.describe Report do
         api_report = reports.data.find { |r| r[:req] == "api" }
         user_api_report = reports.data.find { |r| r[:req] == "user_api" }
 
-        expect(api_report[:color]).to eql("rgba(0,136,204,1)")
+        expect(api_report[:color]).to eql("#1EB8D1")
         expect(api_report[:data][0][:y]).to eql(2)
 
-        expect(user_api_report[:color]).to eql("rgba(200,0,1,1)")
+        expect(user_api_report[:color]).to eql("#9BC53D")
         expect(user_api_report[:data][0][:y]).to eql(1)
       ensure
       end
diff --git a/spec/models/reviewable_flagged_post_spec.rb b/spec/models/reviewable_flagged_post_spec.rb
index f86d6736be0..c16b93ec4f1 100644
--- a/spec/models/reviewable_flagged_post_spec.rb
+++ b/spec/models/reviewable_flagged_post_spec.rb
@@ -33,7 +33,7 @@ RSpec.describe ReviewableFlaggedPost, type: :model do
         expect(actions.has?(:delete_user)).to eq(true)
         expect(actions.has?(:delete_user_block)).to eq(true)
         expect(actions.has?(:disagree)).to eq(true)
-        expect(actions.has?(:ignore)).to eq(true)
+        expect(actions.has?(:ignore_and_do_nothing)).to eq(true)
         expect(actions.has?(:delete_and_ignore)).to eq(true)
         expect(actions.has?(:delete_and_ignore_replies)).to eq(false)
         expect(actions.has?(:delete_and_agree)).to eq(true)
@@ -67,7 +67,6 @@ RSpec.describe ReviewableFlaggedPost, type: :model do
       it "returns delete replies options if there are replies" do
         post.update(reply_count: 3)
         expect(reviewable.actions_for(guardian).has?(:delete_and_agree_replies)).to eq(true)
-        expect(reviewable.actions_for(guardian).has?(:delete_and_ignore_replies)).to eq(true)
       end
 
       it "returns appropriate actions for a hidden post" do
@@ -168,7 +167,7 @@ RSpec.describe ReviewableFlaggedPost, type: :model do
     end
 
     it "ignores the flags" do
-      reviewable.perform(moderator, :ignore)
+      reviewable.perform(moderator, :ignore_and_do_nothing)
       expect(reviewable).to be_ignored
       expect(score.reload).to be_ignored
     end
@@ -273,7 +272,7 @@ RSpec.describe ReviewableFlaggedPost, type: :model do
       expect(post.hidden).to eq(false)
       expect(post.hidden_at).to be_blank
 
-      reviewable.perform(moderator, :ignore)
+      reviewable.perform(moderator, :ignore_and_do_nothing)
       expect(pending_count).to eq(0)
 
       post.reload
@@ -340,6 +339,11 @@ RSpec.describe ReviewableFlaggedPost, type: :model do
     it "ignores flagged responses" do
       SiteSetting.notify_users_after_responses_deleted_on_flagged_post = true
       flagged_reply = Fabricate(:reviewable_flagged_post, target: reply)
+      Fabricate(
+        :post,
+        reply_to_post_number: flagged_reply.target.post_number,
+        topic: flagged_reply.target.topic,
+      )
       flagged_post.perform(moderator, :delete_and_agree_replies)
 
       expect(flagged_reply.reload).to be_ignored
@@ -366,7 +370,7 @@ RSpec.describe ReviewableFlaggedPost, type: :model do
     let(:reviewable) { Fabricate(:reviewable_flagged_post, score: expected_score) }
 
     it "doesn't recalculate the score after ignore" do
-      reviewable.perform(moderator, :ignore)
+      reviewable.perform(moderator, :ignore_and_do_nothing)
 
       expect(reviewable.score).to eq(expected_score)
     end
diff --git a/spec/models/reviewable_queued_post_spec.rb b/spec/models/reviewable_queued_post_spec.rb
index 8ddf4247e50..ce38df2107c 100644
--- a/spec/models/reviewable_queued_post_spec.rb
+++ b/spec/models/reviewable_queued_post_spec.rb
@@ -63,7 +63,7 @@ RSpec.describe ReviewableQueuedPost, type: :model do
           expect(result.created_post.topic).to eq(topic)
           expect(result.created_post.custom_fields["hello"]).to eq("world")
           expect(result.created_post_topic).to eq(topic)
-          expect(result.created_post.user).to eq(reviewable.created_by)
+          expect(result.created_post.user).to eq(reviewable.target_created_by)
           expect(reviewable.target_id).to eq(result.created_post.id)
 
           expect(Topic.count).to eq(topic_count)
@@ -71,7 +71,7 @@ RSpec.describe ReviewableQueuedPost, type: :model do
 
           notifications =
             Notification.where(
-              user: reviewable.created_by,
+              user: reviewable.target_created_by,
               notification_type: Notification.types[:post_approved],
             )
           expect(notifications).to be_present
@@ -127,15 +127,17 @@ RSpec.describe ReviewableQueuedPost, type: :model do
 
       context "with delete_user" do
         it "deletes the user and rejects the post" do
-          other_reviewable = Fabricate(:reviewable_queued_post, created_by: reviewable.created_by)
+          other_reviewable =
+            Fabricate(:reviewable_queued_post, created_by: reviewable.target_created_by)
 
           result = reviewable.perform(moderator, :delete_user)
           expect(result.success?).to eq(true)
-          expect(User.find_by(id: reviewable.created_by)).to be_blank
+          expect(User.find_by(id: reviewable.target_created_by)).to be_blank
+
           expect(result.remove_reviewable_ids).to include(reviewable.id)
           expect(result.remove_reviewable_ids).to include(other_reviewable.id)
 
-          expect(ReviewableQueuedPost.where(id: reviewable.id)).to be_blank
+          expect(ReviewableQueuedPost.where(id: reviewable.id)).to be_present
           expect(ReviewableQueuedPost.where(id: other_reviewable.id)).to be_blank
         end
       end
@@ -222,7 +224,12 @@ RSpec.describe ReviewableQueuedPost, type: :model do
   describe "Callbacks" do
     context "when creating a new pending reviewable" do
       let(:reviewable) do
-        Fabricate.build(:reviewable_queued_post_topic, category: category, created_by: user)
+        Fabricate.build(
+          :reviewable_queued_post_topic,
+          category: category,
+          created_by: moderator,
+          target_created_by: user,
+        )
       end
       let(:user) { Fabricate(:user) }
       let(:user_stats) { user.user_stat }
@@ -235,7 +242,7 @@ RSpec.describe ReviewableQueuedPost, type: :model do
 
     context "when updating an existing reviewable" do
       let!(:reviewable) { Fabricate(:reviewable_queued_post_topic, category: category) }
-      let(:user_stats) { reviewable.created_by.user_stat }
+      let(:user_stats) { reviewable.target_created_by.user_stat }
 
       context "when status changes from 'pending' to something else" do
         it "updates user stats" do
diff --git a/spec/models/reviewable_spec.rb b/spec/models/reviewable_spec.rb
index 1f9d8e6b0b8..88711fa7916 100644
--- a/spec/models/reviewable_spec.rb
+++ b/spec/models/reviewable_spec.rb
@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
 RSpec.describe Reviewable, type: :model do
+  describe "Validations" do
+    it { is_expected.to validate_length_of(:reject_reason).is_at_most(500) }
+  end
+
   describe ".create" do
     fab!(:admin) { Fabricate(:admin) }
     fab!(:user) { Fabricate(:user) }
@@ -173,7 +177,7 @@ RSpec.describe Reviewable, type: :model do
         it "can filter by who reviewed the flag" do
           reviewable = Fabricate(:reviewable_flagged_post)
           admin = Fabricate(:admin)
-          reviewable.perform(admin, :ignore)
+          reviewable.perform(admin, :ignore_and_do_nothing)
 
           reviewables = Reviewable.list_for(user, status: :all, reviewed_by: admin.username)
 
@@ -394,14 +398,15 @@ RSpec.describe Reviewable, type: :model do
     it "triggers a notification on approve -> reject to update status" do
       reviewable = Fabricate(:reviewable_queued_post, status: Reviewable.statuses[:approved])
 
-      expect do reviewable.perform(moderator, :reject_post) end.to change {
-        Jobs::NotifyReviewable.jobs.size
-      }.by(1)
+      expect { reviewable.perform(moderator, :reject_post) }.to raise_error(
+        Reviewable::InvalidAction,
+      )
+    end
 
-      job = Jobs::NotifyReviewable.jobs.last
+    it "triggers a notification on approve -> edit to update status" do
+      reviewable = Fabricate(:reviewable_queued_post, status: Reviewable.statuses[:approved])
 
-      expect(job["args"].first["reviewable_id"]).to eq(reviewable.id)
-      expect(job["args"].first["updated_reviewable_ids"]).to contain_exactly(reviewable.id)
+      expect { reviewable.perform(moderator, :edit_post) }.to raise_error(Reviewable::InvalidAction)
     end
 
     it "triggers a notification on reject -> approve to update status" do
@@ -437,7 +442,7 @@ RSpec.describe Reviewable, type: :model do
 
     it "increases flags_ignored when ignored" do
       expect(user.user_stat.flags_ignored).to eq(0)
-      reviewable.perform(Discourse.system_user, :ignore)
+      reviewable.perform(Discourse.system_user, :ignore_and_do_nothing)
       expect(user.user_stat.reload.flags_ignored).to eq(1)
     end
 
diff --git a/spec/models/screened_email_spec.rb b/spec/models/screened_email_spec.rb
index 802b9aa83f1..479df6b19bb 100644
--- a/spec/models/screened_email_spec.rb
+++ b/spec/models/screened_email_spec.rb
@@ -52,7 +52,7 @@ RSpec.describe ScreenedEmail do
   end
 
   describe "#should_block?" do
-    subject { ScreenedEmail.should_block?(email) }
+    subject(:should_block) { ScreenedEmail.should_block?(email) }
 
     it "automatically blocks via email canonicalization" do
       SiteSetting.levenshtein_distance_spammer_emails = 0
@@ -63,7 +63,7 @@ RSpec.describe ScreenedEmail do
     end
 
     it "returns false if a record with the email doesn't exist" do
-      expect(subject).to eq(false)
+      expect(should_block).to eq(false)
     end
 
     it "returns true when there is a record with the email" do
@@ -86,7 +86,7 @@ RSpec.describe ScreenedEmail do
     shared_examples "when a ScreenedEmail record matches" do
       it "updates statistics" do
         freeze_time do
-          expect { subject }.to change { screened_email.reload.match_count }.by(1)
+          expect { should_block }.to change { screened_email.reload.match_count }.by(1)
           expect(screened_email.last_match_at).to eq_time(Time.zone.now)
         end
       end
diff --git a/spec/models/screened_ip_address_spec.rb b/spec/models/screened_ip_address_spec.rb
index 4e277a08ccf..12dc678ae33 100644
--- a/spec/models/screened_ip_address_spec.rb
+++ b/spec/models/screened_ip_address_spec.rb
@@ -222,7 +222,7 @@ RSpec.describe ScreenedIpAddress do
       expect(screened_ip_address.reload.match_count).to eq(0)
     end
 
-    it "returns false if a more specific recrord matches and action is :do_nothing" do
+    it "returns false if a more specific record matches and action is :do_nothing" do
       Fabricate(
         :screened_ip_address,
         ip_address: "111.234.23.0/24",
diff --git a/spec/models/screened_url_spec.rb b/spec/models/screened_url_spec.rb
index cfcc685ec50..a6ad06cdb2b 100644
--- a/spec/models/screened_url_spec.rb
+++ b/spec/models/screened_url_spec.rb
@@ -25,27 +25,28 @@ RSpec.describe ScreenedUrl do
   end
 
   describe "normalize" do
-    let(:record) { described_class.new(@params) }
-    subject do
+    subject(:normalized) do
       record.normalize
       record
     end
 
+    let(:record) { described_class.new(@params) }
+
     %w[http:// HTTP:// https:// HTTPS://].each do |prefix|
       it "strips #{prefix}" do
         @params = valid_params.merge(url: url.gsub("http://", prefix))
-        expect(subject.url).to eq(url.gsub("http://", ""))
+        expect(normalized.url).to eq(url.gsub("http://", ""))
       end
     end
 
     it "strips trailing slash" do
       @params = valid_params.merge(url: "silverbullet.in/")
-      expect(subject.url).to eq("silverbullet.in")
+      expect(normalized.url).to eq("silverbullet.in")
     end
 
     it "strips trailing slashes" do
       @params = valid_params.merge(url: "silverbullet.in/buy///")
-      expect(subject.url).to eq("silverbullet.in/buy")
+      expect(normalized.url).to eq("silverbullet.in/buy")
     end
 
     it "downcases domains" do
diff --git a/spec/models/sidebar_section_link_spec.rb b/spec/models/sidebar_section_link_spec.rb
index bc7db7703e4..54128b332c8 100644
--- a/spec/models/sidebar_section_link_spec.rb
+++ b/spec/models/sidebar_section_link_spec.rb
@@ -47,4 +47,28 @@ RSpec.describe SidebarSectionLink do
       end
     end
   end
+
+  it "uses section user for links belonging to private sections" do
+    private_section = Fabricate(:sidebar_section, public: false)
+    sidebar_section_link =
+      Fabricate(
+        :sidebar_section_link,
+        sidebar_section: private_section,
+        linkable_id: 1,
+        linkable_type: "Tag",
+      )
+    expect(sidebar_section_link.user_id).to eq(private_section.user_id)
+  end
+
+  it "uses system user for links belonging to public sections" do
+    public_section = Fabricate(:sidebar_section, public: true)
+    sidebar_section_link =
+      Fabricate(
+        :sidebar_section_link,
+        sidebar_section: public_section,
+        linkable_id: 1,
+        linkable_type: "Tag",
+      )
+    expect(sidebar_section_link.user_id).to eq(Discourse.system_user.id)
+  end
 end
diff --git a/spec/models/sidebar_section_spec.rb b/spec/models/sidebar_section_spec.rb
new file mode 100644
index 00000000000..557e2a3d262
--- /dev/null
+++ b/spec/models/sidebar_section_spec.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+RSpec.describe SidebarSection do
+  fab!(:user) { Fabricate(:user) }
+  fab!(:sidebar_section) { Fabricate(:sidebar_section, user: user) }
+  let(:community_section) do
+    SidebarSection.find_by(section_type: SidebarSection.section_types[:community])
+  end
+
+  it "uses system user for public sections" do
+    expect(sidebar_section.user_id).to eq(user.id)
+    sidebar_section.update!(public: true)
+    expect(sidebar_section.user_id).to eq(Discourse.system_user.id)
+  end
+
+  it "resets Community section to the default state" do
+    community_section.update!(title: "test")
+    community_section.sidebar_section_links.first.linkable.update!(name: "everything edited")
+    community_section.sidebar_section_links.last.destroy!
+    community_section.reset_community!
+
+    expect(community_section.reload.title).to eq("Community")
+
+    expect(community_section.sidebar_section_links.all.map { |link| link.linkable.name }).to eq(
+      ["Topics", "My Posts", "Review", "Admin", "Users", "About", "FAQ", "Groups", "Badges"],
+    )
+  end
+end
diff --git a/spec/models/sidebar_url_spec.rb b/spec/models/sidebar_url_spec.rb
new file mode 100644
index 00000000000..da3423b3c0c
--- /dev/null
+++ b/spec/models/sidebar_url_spec.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+RSpec.describe SidebarUrl do
+  it "validates external URLs" do
+    expect(
+      SidebarUrl.new(
+        icon: "link",
+        name: "external",
+        value: "https://www.test.com/discourse-test",
+      ).valid?,
+    ).to eq(true)
+    expect(
+      SidebarUrl.new(
+        icon: "link",
+        name: "categories",
+        value: "http://#{Discourse.current_hostname}/pub/test",
+      ).valid?,
+    ).to eq(true)
+  end
+
+  it "sets external flag" do
+    expect(
+      SidebarUrl.create!(icon: "link", name: "categories", value: "/categories").external,
+    ).to be false
+    expect(
+      SidebarUrl.create!(
+        icon: "link",
+        name: "categories",
+        value: "http://#{Discourse.current_hostname}/categories",
+      ).external,
+    ).to be false
+    expect(
+      SidebarUrl.create!(
+        icon: "link",
+        name: "categories",
+        value: "https://#{Discourse.current_hostname}/categories",
+      ).external,
+    ).to be false
+    expect(
+      SidebarUrl.create!(
+        icon: "link",
+        name: "categories",
+        value: "https://www.test.com/discourse-test",
+      ).external,
+    ).to be true
+  end
+end
diff --git a/spec/models/site_spec.rb b/spec/models/site_spec.rb
index 0e39591929b..4a5849eaf1d 100644
--- a/spec/models/site_spec.rb
+++ b/spec/models/site_spec.rb
@@ -157,6 +157,32 @@ RSpec.describe Site do
 
       expect(site.categories.map { |c| c[:can_edit] }).to contain_exactly(true, true)
     end
+
+    describe "site_all_categories_cache_query modifier" do
+      fab!(:cool_category) { Fabricate(:category, name: "Cool category") }
+      fab!(:boring_category) { Fabricate(:category, name: "Boring category") }
+
+      it "allows changing the query" do
+        prefetched_categories = Site.new(Guardian.new(user)).categories.map { |c| c[:id] }
+        expect(prefetched_categories).to include(cool_category.id, boring_category.id)
+
+        # we need to clear the cache to ensure that the categories list will be updated
+        Site.clear_cache
+
+        Plugin::Instance
+          .new
+          .register_modifier(:site_all_categories_cache_query) do |query|
+            query.where("categories.name LIKE 'Cool%'")
+          end
+
+        prefetched_categories = Site.new(Guardian.new(user)).categories.map { |c| c[:id] }
+
+        expect(prefetched_categories).to include(cool_category.id)
+        expect(prefetched_categories).not_to include(boring_category.id)
+      ensure
+        DiscoursePluginRegistry.clear_modifiers!
+      end
+    end
   end
 
   it "omits groups user can not see" do
@@ -174,6 +200,31 @@ RSpec.describe Site do
     expect(site.groups.pluck(:name)).to include(staff_group.name, public_group.name, "everyone")
   end
 
+  describe "site_groups_query modifier" do
+    fab!(:user) { Fabricate(:user) }
+    fab!(:cool_group) { Fabricate(:group, name: "cool-group") }
+    fab!(:boring_group) { Fabricate(:group, name: "boring-group") }
+
+    it "allows changing the query" do
+      prefetched_groups = Site.new(Guardian.new(user)).groups.map { |c| c[:id] }
+      expect(prefetched_groups).to include(cool_group.id, boring_group.id)
+
+      # we need to clear the cache to ensure that the groups list will be updated
+      Site.clear_cache
+
+      Plugin::Instance
+        .new
+        .register_modifier(:site_groups_query) { |query| query.where("groups.name LIKE 'cool%'") }
+
+      prefetched_groups = Site.new(Guardian.new(user)).groups.map { |c| c[:id] }
+
+      expect(prefetched_groups).to include(cool_group.id)
+      expect(prefetched_groups).not_to include(boring_group.id)
+    ensure
+      DiscoursePluginRegistry.clear_modifiers!
+    end
+  end
+
   it "includes all enabled authentication providers" do
     SiteSetting.enable_twitter_logins = true
     SiteSetting.enable_facebook_logins = true
@@ -188,67 +239,4 @@ RSpec.describe Site do
     data = JSON.parse(Site.json_for(Guardian.new))
     expect(data["auth_providers"].map { |a| a["name"] }).to contain_exactly("facebook", "twitter")
   end
-
-  describe ".show_welcome_topic_banner?" do
-    it "returns false when the user is not admin" do
-      first_post = Fabricate(:post, created_at: 25.days.ago)
-      SiteSetting.welcome_topic_id = first_post.topic.id
-
-      expect(Site.show_welcome_topic_banner?(Guardian.new(Fabricate(:user)))).to eq(false)
-    end
-
-    it "returns false when the user is not first admin who logs in" do
-      admin = Fabricate(:admin)
-      first_post = Fabricate(:post, created_at: 25.days.ago)
-      SiteSetting.welcome_topic_id = first_post.topic.id
-
-      expect(Site.show_welcome_topic_banner?(Guardian.new(admin))).to eq(false)
-      expect(Discourse.cache.read(Site.welcome_topic_banner_cache_key(admin.id))).to eq(false)
-    end
-
-    it "returns true when welcome topic is less than month old" do
-      admin = Fabricate(:admin)
-      UserAuthToken.generate!(user_id: admin.id)
-
-      first_post = Fabricate(:post, created_at: 25.days.ago)
-      SiteSetting.welcome_topic_id = first_post.topic.id
-
-      expect(Site.show_welcome_topic_banner?(Guardian.new(admin))).to eq(true)
-      expect(Discourse.cache.read(Site.welcome_topic_banner_cache_key(admin.id))).to eq(true)
-    end
-
-    it "returns false when welcome topic is more than month old" do
-      admin = Fabricate(:admin)
-      UserAuthToken.generate!(user_id: admin.id)
-
-      first_post = Fabricate(:post, created_at: 35.days.ago)
-      SiteSetting.welcome_topic_id = first_post.topic.id
-
-      expect(Site.show_welcome_topic_banner?(Guardian.new(admin))).to eq(false)
-      expect(Discourse.cache.read(Site.welcome_topic_banner_cache_key(admin.id))).to eq(false)
-    end
-
-    it "returns false when welcome topic has been edited" do
-      admin = Fabricate(:admin)
-      UserAuthToken.generate!(user_id: admin.id)
-
-      first_post = Fabricate(:post, version: 2, created_at: 25.days.ago)
-      SiteSetting.welcome_topic_id = first_post.topic.id
-
-      expect(Site.show_welcome_topic_banner?(Guardian.new(admin))).to eq(false)
-      expect(Discourse.cache.read(Site.welcome_topic_banner_cache_key(admin.id))).to eq(false)
-    end
-
-    it "returns false when welcome topic has been deleted" do
-      admin = Fabricate(:admin)
-      UserAuthToken.generate!(user_id: admin.id)
-
-      topic = Fabricate(:topic, deleted_at: 1.minute.ago)
-      first_post = Fabricate(:post, topic: topic, created_at: 25.days.ago)
-      SiteSetting.welcome_topic_id = topic.id
-
-      expect(Site.show_welcome_topic_banner?(Guardian.new(admin))).to eq(false)
-      expect(Discourse.cache.read(Site.welcome_topic_banner_cache_key(admin.id))).to eq(false)
-    end
-  end
 end
diff --git a/spec/models/sitemap_spec.rb b/spec/models/sitemap_spec.rb
index 1f922b5805b..254e24127d3 100644
--- a/spec/models/sitemap_spec.rb
+++ b/spec/models/sitemap_spec.rb
@@ -85,7 +85,7 @@ RSpec.describe Sitemap do
         expect(sitemap.topics).to be_empty
       end
 
-      it "returns all the neccessary topic attributes to render a sitemap URL" do
+      it "returns all the necessary topic attributes to render a sitemap URL" do
         topic = Fabricate(:topic)
 
         topics_data = sitemap.topics.first
diff --git a/spec/models/tag_spec.rb b/spec/models/tag_spec.rb
index 402c6c73349..9791733edc9 100644
--- a/spec/models/tag_spec.rb
+++ b/spec/models/tag_spec.rb
@@ -29,19 +29,19 @@ RSpec.describe Tag do
 
       expect { tag_sidebar_section_link.linkable.destroy! }.to change {
         SidebarSectionLink.count
-      }.from(3).to(1)
-      expect(SidebarSectionLink.first).to eq(category_sidebar_section_link)
+      }.from(12).to(10)
+      expect(SidebarSectionLink.last).to eq(category_sidebar_section_link)
     end
   end
 
   describe "new" do
-    subject { Fabricate.build(:tag) }
+    subject(:tag) { Fabricate.build(:tag) }
 
     it "triggers a extensibility event" do
-      event = DiscourseEvent.track_events { subject.save! }.last
+      event = DiscourseEvent.track_events { tag.save! }.last
 
       expect(event[:event_name]).to eq(:tag_created)
-      expect(event[:params].first).to eq(subject)
+      expect(event[:params].first).to eq(tag)
     end
 
     it "prevents case-insensitive duplicates" do
@@ -59,13 +59,13 @@ RSpec.describe Tag do
   end
 
   describe "destroy" do
-    subject { Fabricate(:tag) }
+    subject(:tag) { Fabricate(:tag) }
 
     it "triggers a extensibility event" do
-      event = DiscourseEvent.track_events { subject.destroy! }.last
+      event = DiscourseEvent.track_events { tag.destroy! }.last
 
       expect(event[:event_name]).to eq(:tag_destroyed)
-      expect(event[:params].first).to eq(subject)
+      expect(event[:params].first).to eq(tag)
     end
 
     it "removes it from its tag group" do
diff --git a/spec/models/tag_user_spec.rb b/spec/models/tag_user_spec.rb
index 4c5956aab20..fd03174e3a8 100644
--- a/spec/models/tag_user_spec.rb
+++ b/spec/models/tag_user_spec.rb
@@ -230,6 +230,8 @@ RSpec.describe TagUser do
       end
 
       it "sets notification level to the highest one if there are multiple tags" do
+        SiteSetting.watched_precedence_over_muted = true
+
         TagUser.create!(
           user: user,
           tag: tracked_tag,
diff --git a/spec/models/theme_field_spec.rb b/spec/models/theme_field_spec.rb
index 145d6fd48a3..ba2479d0517 100644
--- a/spec/models/theme_field_spec.rb
+++ b/spec/models/theme_field_spec.rb
@@ -3,7 +3,12 @@
 
 RSpec.describe ThemeField do
   fab!(:theme) { Fabricate(:theme) }
-  before { ThemeJavascriptCompiler.disable_terser! }
+
+  before do
+    SvgSprite.clear_plugin_svg_sprite_cache!
+    ThemeJavascriptCompiler.disable_terser!
+  end
+
   after { ThemeJavascriptCompiler.enable_terser! }
 
   describe "scope: find_by_theme_ids" do
@@ -160,7 +165,7 @@ HTML
     field.value = "@import 'missingfile';"
     field.save!
     field.ensure_baked!
-    expect(field.error).to include("File to import not found or unreadable: missingfile")
+    expect(field.error).to include("Error: Can't find stylesheet to import.")
 
     field.value = "body {color: blue};"
     field.save!
@@ -611,7 +616,24 @@ HTML
   end
 
   describe "SVG sprite theme fields" do
-    let(:upload) { Fabricate(:upload) }
+    let :svg_content do
+      "<svg><symbol id='test'></symbol></svg>"
+    end
+
+    let :upload_file do
+      tmp = Tempfile.new("test.svg")
+      File.write(tmp.path, svg_content)
+      tmp
+    end
+
+    after { upload_file.unlink }
+
+    let(:upload) do
+      UploadCreator.new(upload_file, "test.svg", for_theme: true).create_for(
+        Discourse::SYSTEM_USER_ID,
+      )
+    end
+
     let(:theme) { Fabricate(:theme) }
     let(:theme_field) do
       ThemeField.create!(
@@ -626,19 +648,18 @@ HTML
     end
 
     it "is rebaked when upload changes" do
-      theme_field.update(upload: Fabricate(:upload))
+      fname = "custom-theme-icon-sprite.svg"
+      sprite = UploadCreator.new(file_from_fixtures(fname), fname, for_theme: true).create_for(-1)
+      theme_field.update(upload: sprite)
       expect(theme_field.value_baked).to eq(nil)
     end
 
     it "clears SVG sprite cache when upload is deleted" do
-      fname = "custom-theme-icon-sprite.svg"
-      sprite = UploadCreator.new(file_from_fixtures(fname), fname, for_theme: true).create_for(-1)
-
-      theme_field.update(upload: sprite)
-      expect(SvgSprite.custom_svg_sprites(theme.id).size).to eq(1)
+      theme_field
+      expect(SvgSprite.custom_svgs(theme.id).size).to eq(1)
 
       theme_field.destroy!
-      expect(SvgSprite.custom_svg_sprites(theme.id).size).to eq(0)
+      expect(SvgSprite.custom_svgs(theme.id).size).to eq(0)
     end
 
     it "crashes gracefully when svg is invalid" do
diff --git a/spec/models/theme_svg_sprite_spec.rb b/spec/models/theme_svg_sprite_spec.rb
new file mode 100644
index 00000000000..635cc1fb619
--- /dev/null
+++ b/spec/models/theme_svg_sprite_spec.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+RSpec.describe ThemeSvgSprite do
+  fab!(:theme) { Fabricate(:theme) }
+
+  describe "#refetch!" do
+    context "when an upload exists" do
+      before do
+        fname = "custom-theme-icon-sprite.svg"
+        upload = UploadCreator.new(file_from_fixtures(fname), fname, for_theme: true).create_for(-1)
+
+        theme.set_field(
+          target: :common,
+          name: SvgSprite.theme_sprite_variable_name,
+          upload_id: upload.id,
+          type: :theme_upload_var,
+        )
+
+        theme.save!
+      end
+
+      it "fetches values from the store and puts them in the table" do
+        expect(ThemeSvgSprite.count).to eq(1)
+
+        sprite = ThemeSvgSprite.first
+        original_content = sprite.sprite
+
+        expect(original_content).not_to be_empty
+
+        sprite.update!(sprite: "INVALID")
+
+        ThemeSvgSprite.refetch!
+
+        sprite.reload
+        expect(sprite.sprite).to eq(original_content)
+        expect(ThemeSvgSprite.count).to eq(1)
+      end
+    end
+
+    # It needs to do this since the cache is based on values in this table
+    it "expires the svg sprite cache" do
+      SvgSprite.expects(:expire_cache)
+
+      ThemeSvgSprite.refetch!
+    end
+  end
+end
diff --git a/spec/models/top_topic_spec.rb b/spec/models/top_topic_spec.rb
index f0fa30b4c94..0d057396fa5 100644
--- a/spec/models/top_topic_spec.rb
+++ b/spec/models/top_topic_spec.rb
@@ -62,11 +62,11 @@ RSpec.describe TopTopic do
       TopTopic.refresh!
       top_topics = TopTopic.all
 
-      expect(top_topics.where(topic_id: topic_1.id).pluck_first(:yearly_score)).to eq(27)
-      expect(top_topics.where(topic_id: topic_2.id).pluck_first(:yearly_score)).to be_within(
+      expect(top_topics.where(topic_id: topic_1.id).pick(:yearly_score)).to eq(27)
+      expect(top_topics.where(topic_id: topic_2.id).pick(:yearly_score)).to be_within(
         0.0000000001,
       ).of(18.301029995664)
-      expect(top_topics.where(topic_id: topic_3.id).pluck_first(:yearly_score)).to be_within(
+      expect(top_topics.where(topic_id: topic_3.id).pick(:yearly_score)).to be_within(
         0.0000000001,
       ).of(10.602059991328)
 
@@ -84,11 +84,11 @@ RSpec.describe TopTopic do
       TopTopic.refresh!
       top_topics = TopTopic.all
 
-      expect(top_topics.where(topic_id: topic_1.id).pluck_first(:yearly_score)).to eq(27)
-      expect(top_topics.where(topic_id: topic_2.id).pluck_first(:yearly_score)).to be_within(
+      expect(top_topics.where(topic_id: topic_1.id).pick(:yearly_score)).to eq(27)
+      expect(top_topics.where(topic_id: topic_2.id).pick(:yearly_score)).to be_within(
         0.0000000001,
       ).of(18.301029995664)
-      expect(top_topics.where(topic_id: topic_3.id).pluck_first(:yearly_score)).to be_within(
+      expect(top_topics.where(topic_id: topic_3.id).pick(:yearly_score)).to be_within(
         0.0000000001,
       ).of(11.2041199826559)
 
@@ -106,11 +106,11 @@ RSpec.describe TopTopic do
       TopTopic.refresh!
       top_topics = TopTopic.all
 
-      expect(top_topics.where(topic_id: topic_1.id).pluck_first(:yearly_score)).to eq(69)
-      expect(top_topics.where(topic_id: topic_2.id).pluck_first(:yearly_score)).to be_within(
+      expect(top_topics.where(topic_id: topic_1.id).pick(:yearly_score)).to eq(69)
+      expect(top_topics.where(topic_id: topic_2.id).pick(:yearly_score)).to be_within(
         0.0000000001,
       ).of(33.301029995664)
-      expect(top_topics.where(topic_id: topic_3.id).pluck_first(:yearly_score)).to be_within(
+      expect(top_topics.where(topic_id: topic_3.id).pick(:yearly_score)).to be_within(
         0.0000000001,
       ).of(10.602059991328)
 
@@ -128,11 +128,11 @@ RSpec.describe TopTopic do
       TopTopic.refresh!
       top_topics = TopTopic.all
 
-      expect(top_topics.where(topic_id: topic_1.id).pluck_first(:yearly_score)).to eq(30)
-      expect(top_topics.where(topic_id: topic_2.id).pluck_first(:yearly_score)).to be_within(
+      expect(top_topics.where(topic_id: topic_1.id).pick(:yearly_score)).to eq(30)
+      expect(top_topics.where(topic_id: topic_2.id).pick(:yearly_score)).to be_within(
         0.0000000001,
       ).of(21.301029995664)
-      expect(top_topics.where(topic_id: topic_3.id).pluck_first(:yearly_score)).to be_within(
+      expect(top_topics.where(topic_id: topic_3.id).pick(:yearly_score)).to be_within(
         0.0000000001,
       ).of(10.602059991328)
 
@@ -144,11 +144,11 @@ RSpec.describe TopTopic do
       TopTopic.refresh!
       top_topics = TopTopic.all
 
-      expect(top_topics.where(topic_id: topic_1.id).pluck_first(:yearly_score)).to eq(27)
-      expect(top_topics.where(topic_id: topic_2.id).pluck_first(:yearly_score)).to be_within(
+      expect(top_topics.where(topic_id: topic_1.id).pick(:yearly_score)).to eq(27)
+      expect(top_topics.where(topic_id: topic_2.id).pick(:yearly_score)).to be_within(
         0.0000000001,
       ).of(18.301029995664)
-      expect(top_topics.where(topic_id: topic_3.id).pluck_first(:yearly_score)).to be_within(
+      expect(top_topics.where(topic_id: topic_3.id).pick(:yearly_score)).to be_within(
         0.0000000001,
       ).of(10.602059991328)
     end
diff --git a/spec/models/topic_converter_spec.rb b/spec/models/topic_converter_spec.rb
index 9d8da65a333..380aa63a2df 100644
--- a/spec/models/topic_converter_spec.rb
+++ b/spec/models/topic_converter_spec.rb
@@ -183,8 +183,8 @@ RSpec.describe TopicConverter do
 
       it "invites only users with regular posts" do
         post2 = Fabricate(:post, topic: topic)
-        whipser_post = Fabricate(:post, topic: topic, post_type: Post.types[:whisper])
-        small_action_post = Fabricate(:post, topic: topic, post_type: Post.types[:small_action])
+        Fabricate(:post, topic: topic, post_type: Post.types[:whisper])
+        Fabricate(:post, topic: topic, post_type: Post.types[:small_action])
 
         topic.convert_to_private_message(admin)
 
diff --git a/spec/models/topic_embed_spec.rb b/spec/models/topic_embed_spec.rb
index 66e160385fe..91aa671cb7b 100644
--- a/spec/models/topic_embed_spec.rb
+++ b/spec/models/topic_embed_spec.rb
@@ -23,6 +23,41 @@ RSpec.describe TopicEmbed do
       expect(TopicEmbed.count).to eq(0)
     end
 
+    it "Allows figure and figcaption HTML tags" do
+      html = <<~HTML
+        <html>
+        <head>
+           <title>Some title</title>
+        </head>
+        <body>
+          <div class='content'>
+            <p>some content</p>
+            <figure>
+              <img src="/a.png">
+              <figcaption>Some caption</figcaption>
+            <figure>
+          </div>
+        </body>
+        </html>
+      HTML
+
+      parsed = TopicEmbed.parse_html(html, "https://blog.discourse.com/somepost.html")
+
+      # div inception is inserted by the readability gem
+      expected = <<~HTML
+        <div><div>
+          <div>
+            <p>some content</p>
+            <figure>
+              <img src="https://blog.discourse.com/a.png">
+              <figcaption>Some caption</figcaption>
+            <figure>
+          </figure></figure></div>
+        </div></div>
+      HTML
+      expect(parsed.body.strip).to eq(expected.strip)
+    end
+
     context "when creating a post" do
       let!(:post) { TopicEmbed.import(user, url, title, contents) }
       let(:topic_embed) { TopicEmbed.find_by(post: post) }
diff --git a/spec/models/topic_link_spec.rb b/spec/models/topic_link_spec.rb
index cf837e44bc5..9e5177311f1 100644
--- a/spec/models/topic_link_spec.rb
+++ b/spec/models/topic_link_spec.rb
@@ -53,8 +53,8 @@ RSpec.describe TopicLink do
       TopicLink.extract_from(post)
 
       # we have a special rule for images title where we pull them out of the filename
-      expect(topic.topic_links.where(url: png).pluck_first(:title)).to eq(png_title)
-      expect(topic.topic_links.where(url: non_png).pluck_first(:title)).to eq("amazing")
+      expect(topic.topic_links.where(url: png).pick(:title)).to eq(png_title)
+      expect(topic.topic_links.where(url: non_png).pick(:title)).to eq("amazing")
 
       expect(topic.topic_links.pluck(:url)).to contain_exactly(
         png,
diff --git a/spec/models/topic_participant_groups_summary_spec.rb b/spec/models/topic_participant_groups_summary_spec.rb
new file mode 100644
index 00000000000..d88c1874684
--- /dev/null
+++ b/spec/models/topic_participant_groups_summary_spec.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+RSpec.describe TopicParticipantGroupsSummary do
+  describe "#summary" do
+    fab!(:group1) { Fabricate(:group) }
+    fab!(:group2) { Fabricate(:group) }
+    fab!(:group3) { Fabricate(:group) }
+
+    let(:topic) { Fabricate(:private_message_topic) }
+
+    it "must contain the name of allowed groups" do
+      topic.allowed_group_ids = [group1.id, group2.id, group3.id]
+      expect(described_class.new(topic, group: group1).summary).to eq([group2.name, group3.name])
+      expect(described_class.new(topic, group: group2).summary).to eq([group1.name, group3.name])
+    end
+  end
+end
diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index 95ba3468ade..c47624002eb 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -16,6 +16,8 @@ RSpec.describe Topic do
     Fabricate(:user, trust_level: SiteSetting.min_trust_level_to_allow_invite)
   end
 
+  it_behaves_like "it has custom fields"
+
   describe "Validations" do
     let(:topic) { Fabricate.build(:topic) }
 
@@ -653,8 +655,9 @@ RSpec.describe Topic do
 
     context "with a similar topic" do
       fab!(:post) do
-        SearchIndexer.enable
-        create_post(title: "Evil trout is the dude who posted this topic")
+        with_search_indexer_enabled do
+          create_post(title: "Evil trout is the dude who posted this topic")
+        end
       end
 
       let(:topic) { post.topic }
@@ -786,7 +789,7 @@ RSpec.describe Topic do
         Group.refresh_automatic_groups!
       end
 
-      after { RateLimiter.clear_all! }
+      use_redis_snapshotting
 
       context "when per day" do
         before { SiteSetting.max_topic_invitations_per_day = 1 }
@@ -2681,9 +2684,10 @@ RSpec.describe Topic do
       SiteSetting.stubs(:client_settings_json).returns(SiteSetting.client_settings_json_uncached)
       RateLimiter.stubs(:rate_limit_create_topic).returns(100)
       RateLimiter.enable
-      RateLimiter.clear_all!
     end
 
+    use_redis_snapshotting
+
     it "limits new users to max_topics_in_first_day and max_posts_in_first_day" do
       start = Time.now.tomorrow.beginning_of_day
 
@@ -2735,7 +2739,7 @@ RSpec.describe Topic do
       RateLimiter.enable
     end
 
-    after { RateLimiter.clear_all! }
+    use_redis_snapshotting
 
     it "limits according to max_personal_messages_per_day" do
       Group.refresh_automatic_groups!
@@ -3136,9 +3140,20 @@ RSpec.describe Topic do
 
   describe "#remove_allowed_user" do
     fab!(:topic) { Fabricate(:topic) }
+    fab!(:private_topic) do
+      Fabricate(
+        :private_message_topic,
+        title: "Private message",
+        user: admin,
+        topic_allowed_users: [
+          Fabricate.build(:topic_allowed_user, user: admin),
+          Fabricate.build(:topic_allowed_user, user: user1),
+        ],
+      )
+    end
 
     describe "removing oneself" do
-      it "should remove onself" do
+      it "should remove oneself" do
         topic.allowed_users << user1
 
         expect(topic.remove_allowed_user(user1, user1)).to eq(true)
@@ -3150,6 +3165,12 @@ RSpec.describe Topic do
         expect(post.post_type).to eq(Post.types[:small_action])
         expect(post.action_code).to eq("user_left")
       end
+
+      it "should show a small action when user removes themselves from pm" do
+        expect do private_topic.remove_allowed_user(user1, user1) end.to change {
+          private_topic.posts.where(action_code: "user_left").count
+        }.by(1)
+      end
     end
   end
 
@@ -3496,4 +3517,28 @@ RSpec.describe Topic do
       end
     end
   end
+
+  describe "#group_pm?" do
+    context "when topic is not a private message" do
+      subject(:public_topic) { Fabricate(:topic) }
+
+      it { is_expected.not_to be_a_group_pm }
+    end
+
+    context "when topic is a private message" do
+      subject(:pm_topic) { Fabricate(:private_message_topic) }
+
+      context "when more than two people have access" do
+        let(:other_user) { Fabricate(:user) }
+
+        before { pm_topic.allowed_users << other_user }
+
+        it { is_expected.to be_a_group_pm }
+      end
+
+      context "when no more than two people have access" do
+        it { is_expected.not_to be_a_group_pm }
+      end
+    end
+  end
 end
diff --git a/spec/models/topic_thumbnail_spec.rb b/spec/models/topic_thumbnail_spec.rb
index 1b070e729e0..d529d26f26d 100644
--- a/spec/models/topic_thumbnail_spec.rb
+++ b/spec/models/topic_thumbnail_spec.rb
@@ -20,7 +20,7 @@ RSpec.describe "TopicThumbnail" do
     expect(topic.topic_thumbnails.length).to eq(1)
   end
 
-  it "does not enque job if original image is too large" do
+  it "does not enqueue job if original image is too large" do
     upload2.filesize = SiteSetting.max_image_size_kb.kilobytes + 1
     SiteSetting.create_thumbnails = true
     topic2.generate_thumbnails!(extra_sizes: nil)
@@ -32,7 +32,7 @@ RSpec.describe "TopicThumbnail" do
     expect(Jobs::GenerateTopicThumbnails.jobs.size).to eq(0)
   end
 
-  it "does not enque job if image_upload width is nil" do
+  it "does not enqueue job if image_upload width is nil" do
     SiteSetting.create_thumbnails = true
     topic3.image_url(enqueue_if_missing: true)
 
diff --git a/spec/models/topic_tracking_state_spec.rb b/spec/models/topic_tracking_state_spec.rb
index 154ff98c93c..6e0a692d639 100644
--- a/spec/models/topic_tracking_state_spec.rb
+++ b/spec/models/topic_tracking_state_spec.rb
@@ -788,4 +788,20 @@ RSpec.describe TopicTrackingState do
     include_examples("publishes message to right groups and users", "/destroy", :publish_destroy)
     include_examples("does not publish message for private topics", :publish_destroy)
   end
+
+  describe "#publish_dismiss_new_posts" do
+    it "publishes the right message to the right users" do
+      messages =
+        MessageBus.track_publish(TopicTrackingState.unread_channel_key(user.id)) do
+          TopicTrackingState.publish_dismiss_new_posts(user.id, topic_ids: [topic.id])
+        end
+
+      expect(messages.size).to eq(1)
+
+      message = messages.first
+
+      expect(message.data["payload"]["topic_ids"]).to contain_exactly(topic.id)
+      expect(message.user_ids).to eq([user.id])
+    end
+  end
 end
diff --git a/spec/models/translation_override_spec.rb b/spec/models/translation_override_spec.rb
index 16e94c52192..54e0caceafc 100644
--- a/spec/models/translation_override_spec.rb
+++ b/spec/models/translation_override_spec.rb
@@ -27,6 +27,7 @@ RSpec.describe TranslationOverride do
             I18n.t(
               "activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys",
               keys: "key, omg",
+              count: 2,
             ),
           )
         end
@@ -61,6 +62,7 @@ RSpec.describe TranslationOverride do
                 I18n.t(
                   "activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys",
                   keys: "something",
+                  count: 1,
                 ),
               )
             end
@@ -78,12 +80,26 @@ RSpec.describe TranslationOverride do
               I18n.t(
                 "activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys",
                 keys: "topic_title_url_encoded",
+                count: 1,
               ),
             )
           end
         end
       end
 
+      describe "with valid custom interpolation keys" do
+        it "works" do
+          translation_override =
+            TranslationOverride.upsert!(
+              I18n.locale,
+              "system_messages.welcome_user.text_body_template",
+              "Hello %{name} %{username} %{name_or_username} and welcome to %{site_name}!",
+            )
+
+          expect(translation_override.errors).to be_empty
+        end
+      end
+
       describe "pluralized keys" do
         describe "valid keys" do
           it "converts zero to other" do
@@ -119,6 +135,7 @@ RSpec.describe TranslationOverride do
               I18n.t(
                 "activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys",
                 keys: "key3, key4",
+                count: 2,
               ),
             )
           end
@@ -266,4 +283,65 @@ RSpec.describe TranslationOverride do
       end
     end
   end
+
+  describe "#original_translation_deleted?" do
+    context "when the original translation still exists" do
+      fab!(:translation) { Fabricate(:translation_override, translation_key: "title") }
+
+      it { expect(translation.original_translation_deleted?).to eq(false) }
+    end
+
+    context "when the original translation has been turned into a nested key" do
+      fab!(:translation) { Fabricate(:translation_override, translation_key: "title") }
+
+      before { translation.update_attribute("translation_key", "dates") }
+
+      it { expect(translation.original_translation_deleted?).to eq(true) }
+    end
+
+    context "when the original translation no longer exists" do
+      fab!(:translation) { Fabricate(:translation_override, translation_key: "foo.bar") }
+
+      it { expect(translation.original_translation_deleted?).to eq(true) }
+    end
+  end
+
+  describe "#original_translation_updated?" do
+    context "when the translation is up to date" do
+      fab!(:translation) { Fabricate(:translation_override, translation_key: "title") }
+
+      it { expect(translation.original_translation_updated?).to eq(false) }
+    end
+
+    context "when the translation is outdated" do
+      fab!(:translation) do
+        Fabricate(:translation_override, translation_key: "title", original_translation: "outdated")
+      end
+
+      it { expect(translation.original_translation_updated?).to eq(true) }
+    end
+
+    context "when we can't tell because the translation is too old" do
+      fab!(:translation) do
+        Fabricate(:translation_override, translation_key: "title", original_translation: nil)
+      end
+
+      it { expect(translation.original_translation_updated?).to eq(false) }
+    end
+  end
+
+  describe "invalid_interpolation_keys" do
+    fab!(:translation) do
+      Fabricate(
+        :translation_override,
+        translation_key: "system_messages.welcome_user.subject_template",
+      )
+    end
+
+    it "picks out invalid keys and ignores known and custom keys" do
+      translation.update_attribute("value", "Hello, %{name}! Welcome to %{site_name}. %{foo}")
+
+      expect(translation.invalid_interpolation_keys).to contain_exactly("foo")
+    end
+  end
 end
diff --git a/spec/models/trust_level3_requirements_spec.rb b/spec/models/trust_level3_requirements_spec.rb
index 19bc70b132c..d5abacef6fc 100644
--- a/spec/models/trust_level3_requirements_spec.rb
+++ b/spec/models/trust_level3_requirements_spec.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 RSpec.describe TrustLevel3Requirements do
-  fab!(:user) { Fabricate(:user) }
   subject(:tl3_requirements) { described_class.new(user) }
-  fab!(:moderator) { Fabricate(:moderator) }
 
+  fab!(:user) { Fabricate(:user) }
+  fab!(:moderator) { Fabricate(:moderator) }
   fab!(:topic1) { Fabricate(:topic) }
   fab!(:topic2) { Fabricate(:topic) }
   fab!(:topic3) { Fabricate(:topic) }
diff --git a/spec/models/upload_reference_spec.rb b/spec/models/upload_reference_spec.rb
index 79785d12de9..c7675a4577a 100644
--- a/spec/models/upload_reference_spec.rb
+++ b/spec/models/upload_reference_spec.rb
@@ -127,7 +127,7 @@ RSpec.describe UploadReference do
   describe "theme field uploads" do
     fab!(:upload) { Fabricate(:upload) }
 
-    it "creates upload refererences" do
+    it "creates upload references" do
       theme_field = nil
       expect do
         theme_field =
@@ -152,7 +152,7 @@ RSpec.describe UploadReference do
   describe "theme setting uploads" do
     fab!(:upload) { Fabricate(:upload) }
 
-    it "creates upload refererences" do
+    it "creates upload references" do
       theme_setting = nil
       expect do
         theme_setting =
diff --git a/spec/models/upload_spec.rb b/spec/models/upload_spec.rb
index a29df2e1cbb..ac80783a36c 100644
--- a/spec/models/upload_spec.rb
+++ b/spec/models/upload_spec.rb
@@ -611,6 +611,7 @@ RSpec.describe Upload do
   describe "#dominant_color" do
     let(:white_image) { Fabricate(:image_upload, color: "white") }
     let(:red_image) { Fabricate(:image_upload, color: "red") }
+    let(:high_color_image) { Fabricate(:image_upload, color: "#000A00F00", color_depth: 16) }
     let(:not_an_image) do
       upload = Fabricate(:upload)
 
@@ -640,6 +641,14 @@ RSpec.describe Upload do
       expect(red_image.dominant_color).to eq(nil)
       expect(red_image.dominant_color(calculate_if_missing: true)).to eq("FF0000")
       expect(red_image.dominant_color).to eq("FF0000")
+
+      expect(high_color_image.dominant_color).to eq(nil)
+      # original is: #000A00F00
+      # downsamples to: #009FEF
+      # A00 is closer to 9F than A0
+      # EF is closer to F00 than F0
+      expect(high_color_image.dominant_color(calculate_if_missing: true)).to eq("009FEF")
+      expect(high_color_image.dominant_color).to eq("009FEF")
     end
 
     it "can be backfilled" do
diff --git a/spec/models/user_avatar_spec.rb b/spec/models/user_avatar_spec.rb
index 779babad2a8..2f334c61cd7 100644
--- a/spec/models/user_avatar_spec.rb
+++ b/spec/models/user_avatar_spec.rb
@@ -95,7 +95,7 @@ RSpec.describe UserAvatar do
 
         stub_request(
           :get,
-          "https://www.gravatar.com/avatar/#{avatar.user.email_hash}.png?d=404&reset_cache=5555&s=360",
+          "https://www.gravatar.com/avatar/#{avatar.user.email_hash}.png?d=404&reset_cache=5555&s=#{Discourse.avatar_sizes.max}",
         ).to_return(status: 404, body: "", headers: {})
 
         expect do avatar.update_gravatar! end.to_not change { Upload.count }
@@ -175,15 +175,48 @@ RSpec.describe UserAvatar do
         expect(user.user_avatar.custom_upload_id).to eq(nil)
       end
     end
+
+    it "doesn't error out if the remote request fails" do
+      FileHelper.stubs(:download).raises(FinalDestination::SSRFDetector::LookupFailedError.new)
+
+      expect { UserAvatar.import_url_for_user(anything, user) }.not_to raise_error
+    end
   end
 
   describe "ensure_consistency!" do
+    it "cleans up incorrectly sized avatars" do
+      SiteSetting.avatar_sizes = "10|20|30"
+
+      upload = Fabricate(:upload)
+      user_avatar = Fabricate(:user).user_avatar
+      user_avatar.update_columns(custom_upload_id: upload.id)
+
+      Fabricate(:optimized_image, upload: upload, width: 10, height: 10)
+      Fabricate(:optimized_image, upload: upload, width: 15, height: 15)
+      Fabricate(:optimized_image, upload: upload, width: 20, height: 20)
+
+      UserAvatar.ensure_consistency!
+
+      expect(OptimizedImage.where(upload_id: upload.id).pluck(:width, :height).sort).to eq(
+        [[10, 10], [20, 20]],
+      )
+
+      # will not clean up if referenced
+      Fabricate(:optimized_image, upload: upload, width: 15, height: 15)
+      UploadReference.create!(upload: upload, target: Fabricate(:post))
+
+      UserAvatar.ensure_consistency!
+
+      expect(OptimizedImage.where(upload_id: upload.id).pluck(:width, :height).sort).to eq(
+        [[10, 10], [15, 15], [20, 20]],
+      )
+    end
+
     it "will clean up dangling avatars" do
       upload1 = Fabricate(:upload)
       upload2 = Fabricate(:upload)
 
       user_avatar = Fabricate(:user).user_avatar
-
       user_avatar.update_columns(gravatar_upload_id: upload1.id, custom_upload_id: upload2.id)
 
       upload1.destroy!
diff --git a/spec/models/user_badge_spec.rb b/spec/models/user_badge_spec.rb
index 5d3e2e7a194..eb88b05a66d 100644
--- a/spec/models/user_badge_spec.rb
+++ b/spec/models/user_badge_spec.rb
@@ -31,6 +31,22 @@ RSpec.describe UserBadge do
     end
   end
 
+  describe "#destroy" do
+    it "triggers the 'user_badge_revoked' DiscourseEvent" do
+      user_badge =
+        UserBadge.create(
+          badge: badge,
+          user: user,
+          granted_at: Time.zone.now,
+          granted_by: Discourse.system_user,
+        )
+
+      event = DiscourseEvent.track(:user_badge_revoked) { user_badge.destroy! }
+
+      expect(event).to be_present
+    end
+  end
+
   describe "featured rank" do
     fab!(:user) { Fabricate(:user) }
     fab!(:user_badge_tl1) do
diff --git a/spec/models/user_bookmark_list_spec.rb b/spec/models/user_bookmark_list_spec.rb
index 96d1a62e94a..c6074caff63 100644
--- a/spec/models/user_bookmark_list_spec.rb
+++ b/spec/models/user_bookmark_list_spec.rb
@@ -12,6 +12,8 @@ RSpec.describe UserBookmarkList do
     user_bookmark
   end
 
+  after { DiscoursePluginRegistry.reset! }
+
   let(:post_bookmark) { Fabricate(:bookmark, user: user, bookmarkable: Fabricate(:post)) }
   let(:topic_bookmark) { Fabricate(:bookmark, user: user, bookmarkable: Fabricate(:topic)) }
   let(:user_bookmark) { Fabricate(:bookmark, user: user, bookmarkable: Fabricate(:user)) }
diff --git a/spec/models/user_field_spec.rb b/spec/models/user_field_spec.rb
index f39d3911a29..cf056e5f0b0 100644
--- a/spec/models/user_field_spec.rb
+++ b/spec/models/user_field_spec.rb
@@ -2,12 +2,14 @@
 
 RSpec.describe UserField do
   describe "doesn't validate presence of name if field type is 'confirm'" do
-    subject { described_class.new(field_type: "confirm") }
+    subject(:confirm_field) { described_class.new(field_type: "confirm") }
+
     it { is_expected.not_to validate_presence_of :name }
   end
 
   describe "validates presence of name for other field types" do
-    subject { described_class.new(field_type: "dropdown") }
+    subject(:dropdown_field) { described_class.new(field_type: "dropdown") }
+
     it { is_expected.to validate_presence_of :name }
   end
 
diff --git a/spec/models/user_option_spec.rb b/spec/models/user_option_spec.rb
index c7f3c79d8f7..6ff409eae15 100644
--- a/spec/models/user_option_spec.rb
+++ b/spec/models/user_option_spec.rb
@@ -44,6 +44,30 @@ RSpec.describe UserOption do
       expect(user.user_option.email_digests).to eq(false)
       expect(user.user_option.digest_after_minutes).to eq(0)
     end
+
+    it "should correctly set sidebar_link_to_filtered_list when `default_sidebar_link_to_filtered_list` site setting is enabled" do
+      SiteSetting.default_sidebar_link_to_filtered_list = true
+      user = Fabricate(:user)
+      expect(user.user_option.sidebar_link_to_filtered_list).to eq(true)
+    end
+
+    it "should correctly set sidebar_link_to_filtered_list when `default_sidebar_link_to_filtered_list` site setting is disabled" do
+      SiteSetting.default_sidebar_link_to_filtered_list = false
+      user = Fabricate(:user)
+      expect(user.user_option.sidebar_link_to_filtered_list).to eq(false)
+    end
+
+    it "should correctly set sidebar_show_count_of_new_items when `default_sidebar_show_count_of_new_items` site setting is enabled" do
+      SiteSetting.default_sidebar_show_count_of_new_items = true
+      user = Fabricate(:user)
+      expect(user.user_option.sidebar_show_count_of_new_items).to eq(true)
+    end
+
+    it "should correctly set sidebar_show_count_of_new_items when `default_sidebar_show_count_of_new_items` site setting is disabled" do
+      SiteSetting.default_sidebar_show_count_of_new_items = false
+      user = Fabricate(:user)
+      expect(user.user_option.sidebar_show_count_of_new_items).to eq(false)
+    end
   end
 
   describe "site settings" do
@@ -178,6 +202,13 @@ RSpec.describe UserOption do
           ActiveSupport::TimeZone.find_tzinfo("Europe/Paris"),
         )
       end
+
+      it "works for Europe/Kyiv" do
+        user.user_option.update(timezone: "Europe/Kyiv")
+        expect(UserOption.user_tzinfo(user.id)).to eq(
+          ActiveSupport::TimeZone.find_tzinfo("Europe/Kyiv"),
+        )
+      end
     end
 
     context "with user with invalid timezone given" do
diff --git a/spec/models/user_search_spec.rb b/spec/models/user_search_spec.rb
index e7d58fce44d..bd5f7f05eab 100644
--- a/spec/models/user_search_spec.rb
+++ b/spec/models/user_search_spec.rb
@@ -226,6 +226,18 @@ RSpec.describe UserSearch do
       expect(results).to be_blank
     end
 
+    it "does not show unapproved users when must_approve_users enabled" do
+      SiteSetting.must_approve_users = true
+      unapproved = Fabricate(:user, username: "mrunapproved", active: true, approved: false)
+      approved = Fabricate(:user, username: "mrapproved", active: true, approved: true)
+
+      users = search_for(unapproved.username)
+      expect(users).to be_blank
+
+      users = search_for(approved.username)
+      expect(users).not_to be_blank
+    end
+
     it "prioritises exact matches" do
       results = search_for("mrB")
       expect(results).to eq [mr_b, mr_brown, mr_blue].map(&:username)
@@ -267,4 +279,44 @@ RSpec.describe UserSearch do
       expect(results[2]).to eq("mrorange")
     end
   end
+
+  context "when using SiteSetting.user_search_similar_results" do
+    it "should find the user even with a typo if the setting is enabled" do
+      rafael = Fabricate(:user, username: "rafael", name: "Rafael Silva")
+      codinghorror = Fabricate(:user, username: "codinghorror", name: "Jeff Atwood")
+      pfaffman = Fabricate(:user, username: "pfaffman")
+      zogstrip = Fabricate(:user, username: "zogstrip", name: "Régis Hanol")
+      roman = Fabricate(:user, username: "roman", name: "Roman Rizzi")
+
+      SiteSetting.user_search_similar_results = false
+      expect(UserSearch.new("rafel").search).to be_blank
+      expect(UserSearch.new("codding").search).to be_blank
+      expect(UserSearch.new("pffman").search).to be_blank
+
+      SiteSetting.user_search_similar_results = true
+      expect(UserSearch.new("rafel").search).to include(rafael)
+      expect(UserSearch.new("codding").search).to include(codinghorror)
+      expect(UserSearch.new("pffman").search).to include(pfaffman)
+
+      SiteSetting.user_search_similar_results = false
+      expect(UserSearch.new("silvia").search).to be_blank
+      expect(UserSearch.new("atwod").search).to be_blank
+      expect(UserSearch.new("regis").search).to be_blank
+      expect(UserSearch.new("reg").search).to be_blank
+
+      SiteSetting.user_search_similar_results = true
+      expect(UserSearch.new("silvia").search).to include(rafael)
+      expect(UserSearch.new("atwod").search).to include(codinghorror)
+      expect(UserSearch.new("regis").search).to include(zogstrip)
+      expect(UserSearch.new("reg").search).to include(zogstrip)
+    end
+
+    it "orders the results by similarity" do
+      zogstrip = Fabricate(:user, username: "zogstrip", name: "Régis Hanol")
+      roman = Fabricate(:user, username: "roman", name: "Roman Rizzi")
+      SiteSetting.user_search_similar_results = true
+
+      expect(UserSearch.new("regis").search.first).to eq(zogstrip)
+    end
+  end
 end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index cb3dc8ff234..f0e47e8f8e5 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
 RSpec.describe User do
+  subject(:user) { Fabricate(:user, last_seen_at: 1.day.ago) }
+
   fab!(:group) { Fabricate(:group) }
 
-  subject(:user) { Fabricate(:user, last_seen_at: 1.day.ago) }
+  it_behaves_like "it has custom fields"
 
   def user_error_message(*keys)
     I18n.t(:"activerecord.errors.models.user.attributes.#{keys.join(".")}")
@@ -11,7 +13,7 @@ RSpec.describe User do
 
   it do
     is_expected.to have_many(:pending_posts).class_name("ReviewableQueuedPost").with_foreign_key(
-      :created_by_id,
+      :target_created_by_id,
     )
   end
 
@@ -46,80 +48,22 @@ RSpec.describe User do
       before do
         SiteSetting.navigation_menu = "sidebar"
         SiteSetting.tagging_enabled = true
-        SiteSetting.default_sidebar_categories = "#{category.id}|#{secured_category.id}"
-        SiteSetting.default_sidebar_tags = "#{tag.name}|#{hidden_tag.name}"
+        SiteSetting.default_navigation_menu_categories = "#{category.id}|#{secured_category.id}"
+        SiteSetting.default_navigation_menu_tags = "#{tag.name}|#{hidden_tag.name}"
       end
 
-      it "creates the right sidebar section link records for categories and tags that a user can see" do
+      it "creates sidebar section link records for categories and tags that have been configured as defaults" do
         user = Fabricate(:user)
 
         expect(
           SidebarSectionLink.where(linkable_type: "Category", user_id: user.id).pluck(:linkable_id),
-        ).to contain_exactly(category.id)
-
-        expect(
-          SidebarSectionLink.where(linkable_type: "Tag", user_id: user.id).pluck(:linkable_id),
-        ).to contain_exactly(tag.id)
-
-        admin = Fabricate(:admin)
-
-        expect(
-          SidebarSectionLink.where(linkable_type: "Category", user_id: admin.id).pluck(
-            :linkable_id,
-          ),
         ).to contain_exactly(category.id, secured_category.id)
 
         expect(
-          SidebarSectionLink.where(linkable_type: "Tag", user_id: admin.id).pluck(:linkable_id),
+          SidebarSectionLink.where(linkable_type: "Tag", user_id: user.id).pluck(:linkable_id),
         ).to contain_exactly(tag.id, hidden_tag.id)
       end
 
-      it "should create and remove the right sidebar section link records when user is promoted/demoted as an admin" do
-        user = Fabricate(:user)
-        another_category = Fabricate(:category)
-        another_tag = Fabricate(:tag)
-
-        # User has customized their sidebar categories and tags
-        SidebarSectionLink.where(user: user).delete_all
-        SidebarSectionLinksUpdater.update_category_section_links(
-          user,
-          category_ids: [another_category.id],
-        )
-        SidebarSectionLinksUpdater.update_tag_section_links(user, tag_names: [another_tag.name])
-
-        # A user promoted to admin now has any default categories/tags they didn't previously have access to
-        user.update(admin: true)
-        expect(
-          SidebarSectionLink.where(linkable_type: "Category", user_id: user.id).pluck(:linkable_id),
-        ).to contain_exactly(another_category.id, secured_category.id)
-        expect(
-          SidebarSectionLink.where(linkable_type: "Tag", user_id: user.id).pluck(:linkable_id),
-        ).to contain_exactly(another_tag.id, hidden_tag.id)
-
-        # User still has their customized sidebar categories and tags after demotion
-        user.update(admin: false)
-        expect(
-          SidebarSectionLink.where(linkable_type: "Category", user_id: user.id).pluck(:linkable_id),
-        ).to contain_exactly(another_category.id)
-        expect(
-          SidebarSectionLink.where(linkable_type: "Tag", user_id: user.id).pluck(:linkable_id),
-        ).to contain_exactly(another_tag.id)
-      end
-
-      it "should not receive any new categories w/ suppress secured categories from admin enabled" do
-        SiteSetting.suppress_secured_categories_from_admin = true
-        user = Fabricate(:user)
-        SidebarSectionLink.where(user: user).delete_all # User has customized their sidebar categories
-        user.update(admin: true)
-        expect(
-          SidebarSectionLink.where(linkable_type: "Category", user_id: user.id).pluck(:linkable_id),
-        ).to be_empty
-        user.update(admin: false)
-        expect(
-          SidebarSectionLink.where(linkable_type: "Category", user_id: user.id).pluck(:linkable_id),
-        ).to be_empty
-      end
-
       it "should not create any sidebar section link records when navigation_menu site setting is still legacy" do
         SiteSetting.navigation_menu = "legacy"
 
@@ -131,7 +75,7 @@ RSpec.describe User do
       it "should not create any sidebar section link records for staged users" do
         user = Fabricate(:user, staged: true)
 
-        expect(SidebarSectionLink.exists?).to eq(false)
+        expect(SidebarSectionLink.exists?(user: user)).to eq(false)
       end
 
       it "should create sidebar section link records when user has been unstaged" do
@@ -142,9 +86,10 @@ RSpec.describe User do
       end
 
       it "should not create any sidebar section link records for non human users" do
-        user = Fabricate(:user, id: -Time.now.to_i)
+        id = -Time.now.to_i
+        user = Fabricate(:user, id: id)
 
-        expect(SidebarSectionLink.exists?).to eq(false)
+        expect(SidebarSectionLink.exists?(user: user)).to eq(false)
       end
 
       it "should not create any tag sidebar section link records when tagging is disabled" do
@@ -156,6 +101,19 @@ RSpec.describe User do
         expect(SidebarSectionLink.exists?(linkable_type: "Tag", user_id: user.id)).to eq(false)
       end
     end
+
+    describe "#change_display_name" do
+      it "enqueues a job to retroactively update display name in quotes, etc." do
+        expect_enqueued_with(
+          job: :change_display_name,
+          args: {
+            user_id: user.id,
+            old_name: "Bruce Wayne",
+            new_name: "Batman",
+          },
+        ) { user.update(name: "Batman") }
+      end
+    end
   end
 
   describe "Validations" do
@@ -362,6 +320,23 @@ RSpec.describe User do
             end
           end
         end
+
+        context "when watched words are of type 'link'" do
+          let(:value) { "don't replace me" }
+          let!(:replace_word) do
+            Fabricate(
+              :watched_word,
+              word: "replace",
+              replacement: "touch",
+              action: WatchedWord.actions[:link],
+            )
+          end
+
+          it "does not replace anything" do
+            user.save!
+            expect(user_field_value).to eq value
+          end
+        end
       end
 
       context "when user fields do not contain watched words" do
@@ -572,7 +547,7 @@ RSpec.describe User do
     fab!(:posts) { [post1, post2, post3] }
     fab!(:post_ids) { [post1.id, post2.id, post3.id] }
     let(:guardian) { Guardian.new(Fabricate(:admin)) }
-    fab!(:reviewable_queued_post) { Fabricate(:reviewable_queued_post, created_by: user) }
+    fab!(:reviewable_queued_post) { Fabricate(:reviewable_queued_post, target_created_by: user) }
 
     it "deletes only one batch of posts" do
       post2
@@ -608,35 +583,33 @@ RSpec.describe User do
   end
 
   describe "new" do
-    subject { Fabricate.build(:user) }
+    subject(:user) { Fabricate.build(:user) }
 
     it { is_expected.to be_valid }
     it { is_expected.not_to be_admin }
     it { is_expected.not_to be_approved }
 
     it "is properly initialized" do
-      expect(subject.approved_at).to be_blank
-      expect(subject.approved_by_id).to be_blank
+      expect(user.approved_at).to be_blank
+      expect(user.approved_by_id).to be_blank
     end
 
     it "triggers an extensibility event" do
-      event = DiscourseEvent.track_events { subject.save! }.first
+      event = DiscourseEvent.track_events { user.save! }.first
 
       expect(event[:event_name]).to eq(:user_created)
-      expect(event[:params].first).to eq(subject)
+      expect(event[:params].first).to eq(user)
     end
 
     context "with after_save" do
-      before { subject.save! }
+      before { user.save! }
 
       it "has correct settings" do
-        expect(subject.email_tokens).to be_present
-        expect(subject.user_stat).to be_present
-        expect(subject.user_profile).to be_present
-        expect(subject.user_option.email_messages_level).to eq(
-          UserOption.email_level_types[:always],
-        )
-        expect(subject.user_option.email_level).to eq(UserOption.email_level_types[:only_when_away])
+        expect(user.email_tokens).to be_present
+        expect(user.user_stat).to be_present
+        expect(user.user_profile).to be_present
+        expect(user.user_option.email_messages_level).to eq(UserOption.email_level_types[:always])
+        expect(user.user_option.email_level).to eq(UserOption.email_level_types[:only_when_away])
       end
     end
 
@@ -723,41 +696,37 @@ RSpec.describe User do
   end
 
   describe "staff and regular users" do
-    let(:user) { Fabricate.build(:user) }
+    subject(:user) { Fabricate.build(:user) }
 
     describe "#staff?" do
-      subject { user.staff? }
-
-      it { is_expected.to eq(false) }
+      it { is_expected.not_to be_staff }
 
       context "for a moderator user" do
         before { user.moderator = true }
 
-        it { is_expected.to eq(true) }
+        it { is_expected.to be_staff }
       end
 
       context "for an admin user" do
         before { user.admin = true }
 
-        it { is_expected.to eq(true) }
+        it { is_expected.to be_staff }
       end
     end
 
     describe "#regular?" do
-      subject { user.regular? }
-
-      it { is_expected.to eq(true) }
+      it { is_expected.to be_regular }
 
       context "for a moderator user" do
         before { user.moderator = true }
 
-        it { is_expected.to eq(false) }
+        it { is_expected.not_to be_regular }
       end
 
       context "for an admin user" do
         before { user.admin = true }
 
-        it { is_expected.to eq(false) }
+        it { is_expected.not_to be_regular }
       end
     end
   end
@@ -1342,7 +1311,7 @@ RSpec.describe User do
       describe "after 3 days" do
         it "should log a second visited_at record when we log an update later" do
           user.update_last_seen!
-          future_date = freeze_time(3.days.from_now)
+          freeze_time(3.days.from_now)
           user.update_last_seen!
 
           expect(user.user_visits.count).to eq(2)
@@ -1839,8 +1808,8 @@ RSpec.describe User do
   describe "hash_passwords" do
     let(:too_long) { "x" * (User.max_password_length + 1) }
 
-    def hash(password, salt)
-      User.new.send(:hash_password, password, salt)
+    def hash(password, salt, algorithm = User::TARGET_PASSWORD_ALGORITHM)
+      User.new.send(:hash_password, password, salt, algorithm)
     end
 
     it "returns the same hash for the same password and salt" do
@@ -1858,6 +1827,44 @@ RSpec.describe User do
     it "raises an error when passwords are too long" do
       expect { hash(too_long, "gravy") }.to raise_error(StandardError)
     end
+
+    it "uses the target algorithm for new users" do
+      expect(user.password_algorithm).to eq(User::TARGET_PASSWORD_ALGORITHM)
+    end
+
+    it "can use an older algorithm to verify existing passwords, then upgrade" do
+      old_algorithm = "$pbkdf2-sha256$i=5,l=32$"
+      expect(old_algorithm).not_to eq(User::TARGET_PASSWORD_ALGORITHM)
+
+      password = "poutine"
+      old_hash = hash(password, user.salt, old_algorithm)
+
+      user.update!(password_algorithm: old_algorithm, password_hash: old_hash)
+
+      expect(user.password_algorithm).to eq(old_algorithm)
+      expect(user.password_hash).to eq(old_hash)
+
+      # With an incorrect attempt, should return false with no side effects
+      expect(user.confirm_password?("notthepassword")).to eq(false)
+      expect(user.password_algorithm).to eq(old_algorithm)
+      expect(user.password_hash).to eq(old_hash)
+
+      # Should correctly verify against old algorithm
+      expect(user.confirm_password?(password)).to eq(true)
+
+      # Auto-upgrades to new algorithm
+      expected_new_hash = hash(password, user.salt, User::TARGET_PASSWORD_ALGORITHM)
+      expect(user.password_algorithm).to eq(User::TARGET_PASSWORD_ALGORITHM)
+      expect(user.password_hash).to eq(expected_new_hash)
+
+      # And persists to the db
+      user.reload
+      expect(user.password_algorithm).to eq(User::TARGET_PASSWORD_ALGORITHM)
+      expect(user.password_hash).to eq(expected_new_hash)
+
+      # And can still log in
+      expect(user.confirm_password?(password)).to eq(true)
+    end
   end
 
   describe "automatic group membership" do
@@ -1938,7 +1945,10 @@ RSpec.describe User do
           .perform(moderator, :agree_and_keep)
 
         post_deferred = Fabricate(:post)
-        PostActionCreator.inappropriate(user, post_deferred).reviewable.perform(moderator, :ignore)
+        PostActionCreator
+          .inappropriate(user, post_deferred)
+          .reviewable
+          .perform(moderator, :ignore_and_do_nothing)
 
         post_disagreed = Fabricate(:post)
         PostActionCreator
@@ -1971,29 +1981,64 @@ RSpec.describe User do
 
     describe "#number_of_rejected_posts" do
       it "counts rejected posts" do
-        Fabricate(:reviewable_queued_post, created_by: user, status: Reviewable.statuses[:rejected])
+        Fabricate(
+          :reviewable_queued_post,
+          target_created_by: user,
+          status: Reviewable.statuses[:rejected],
+        )
 
         expect(user.number_of_rejected_posts).to eq(1)
       end
 
       it "ignore non-rejected posts" do
-        Fabricate(:reviewable_queued_post, created_by: user, status: Reviewable.statuses[:approved])
+        Fabricate(
+          :reviewable_queued_post,
+          target_created_by: user,
+          status: Reviewable.statuses[:approved],
+        )
 
         expect(user.number_of_rejected_posts).to eq(0)
       end
     end
 
     describe "#number_of_flagged_posts" do
-      it "counts flagged posts from the user" do
-        Fabricate(:reviewable_flagged_post, target_created_by: user)
+      fab!(:admin) { Fabricate(:admin) }
 
-        expect(user.number_of_flagged_posts).to eq(1)
+      it "counts only approved standard flagged posts from the user" do
+        %i[disagree ignore delete_and_ignore].each do |review_action|
+          PostActionCreator
+            .off_topic(admin, Fabricate(:post, user: user))
+            .reviewable
+            .perform(admin, review_action)
+        end
+        %i[agree_and_keep delete_and_agree].each do |approval_action|
+          PostActionCreator
+            .off_topic(admin, Fabricate(:post, user: user))
+            .reviewable
+            .perform(admin, approval_action)
+        end
+
+        expect(user.number_of_flagged_posts).to eq 2
+      end
+
+      it "ignores custom flags from the user" do
+        PostActionCreator
+          .notify_moderators(admin, Fabricate(:post, user: user))
+          .reviewable
+          .perform(admin, :agree_and_keep)
+        expect(user.number_of_flagged_posts).to be_zero
       end
 
       it "ignores flagged posts from another user" do
-        Fabricate(:reviewable_flagged_post, target_created_by: Fabricate(:user))
+        other_user = Fabricate(:user)
+        %i[disagree ignore delete_and_ignore agree_and_keep].each do |review_action|
+          PostActionCreator
+            .off_topic(admin, Fabricate(:post, user: other_user))
+            .reviewable
+            .perform(admin, review_action)
+        end
 
-        expect(user.number_of_flagged_posts).to eq(0)
+        expect(user.number_of_flagged_posts).to be_zero
       end
     end
   end
@@ -2077,6 +2122,13 @@ RSpec.describe User do
       expect(CategoryUser.lookup(user, :regular).pluck(:category_id)).to eq([category4.id])
     end
 
+    it "does not error on duplicate categories for set_default_categories_preferences" do
+      SiteSetting.default_categories_normal = category4.id.to_s + "|" + category4.id.to_s
+      user = nil
+      expect { user = Fabricate(:user, trust_level: 1) }.not_to raise_error
+      expect(CategoryUser.lookup(user, :normal).pluck(:category_id)).to include(category4.id)
+    end
+
     it "does not set category preferences for staged users" do
       user = Fabricate(:user, staged: true)
       expect(CategoryUser.lookup(user, :watching).pluck(:category_id)).to eq([])
@@ -2133,22 +2185,6 @@ RSpec.describe User do
       end
     end
 
-    describe "when user is trust level 2" do
-      it "should return the right value" do
-        user.update!(trust_level: TrustLevel[2])
-
-        expect(user.read_first_notification?).to eq(true)
-      end
-    end
-
-    describe "when user is an old user" do
-      it "should return the right value" do
-        user.update!(first_seen_at: 1.year.ago)
-
-        expect(user.read_first_notification?).to eq(true)
-      end
-    end
-
     describe "when user skipped new user tips" do
       it "should return the right value" do
         user.user_option.update!(skip_new_user_tips: true)
@@ -2284,15 +2320,15 @@ RSpec.describe User do
     end
 
     it "has the correct counts" do
-      notification = Fabricate(:notification, user: user)
-      notification2 = Fabricate(:notification, user: user, read: true)
-      notification3 =
+      _notification = Fabricate(:notification, user: user)
+      _notification2 = Fabricate(:notification, user: user, read: true)
+      _notification3 =
         Fabricate(
           :notification,
           user: user,
           notification_type: Notification.types[:private_message],
         )
-      notification4 =
+      _notification4 =
         Fabricate(
           :notification,
           user: user,
@@ -2305,15 +2341,12 @@ RSpec.describe User do
           .first
 
       expect(message.data[:unread_notifications]).to eq(1)
-      # NOTE: because of deprecation this will be equal to unread_high_priority_notifications,
-      #       to be removed in 2.5
-      expect(message.data[:unread_private_messages]).to eq(2)
       expect(message.data[:unread_high_priority_notifications]).to eq(2)
     end
 
     it "does not publish to the /notification channel for users who have not been seen in > 30 days" do
-      notification = Fabricate(:notification, user: user)
-      notification2 = Fabricate(:notification, user: user, read: true)
+      _notification = Fabricate(:notification, user: user)
+      _notification2 = Fabricate(:notification, user: user, read: true)
       user.update(last_seen_at: 31.days.ago)
 
       message =
@@ -2644,24 +2677,22 @@ RSpec.describe User do
   describe "#title=" do
     fab!(:badge) { Fabricate(:badge, name: "Badge", allow_title: false) }
 
-    it "sets badge_granted_title correctly" do
+    it "sets granted_title_badge_id correctly" do
       BadgeGranter.grant(badge, user)
 
       user.update!(title: badge.name)
-      expect(user.user_profile.reload.badge_granted_title).to eq(false)
+      expect(user.user_profile.reload.granted_title_badge_id).to be_nil
 
       user.update!(title: "Custom")
-      expect(user.user_profile.reload.badge_granted_title).to eq(false)
+      expect(user.user_profile.reload.granted_title_badge_id).to be_nil
 
       badge.update!(allow_title: true)
       user.badges.reload
       user.update!(title: badge.name)
-      expect(user.user_profile.reload.badge_granted_title).to eq(true)
       expect(user.user_profile.reload.granted_title_badge_id).to eq(badge.id)
 
       user.update!(title: nil)
-      expect(user.user_profile.reload.badge_granted_title).to eq(false)
-      expect(user.user_profile.granted_title_badge_id).to eq(nil)
+      expect(user.user_profile.granted_title_badge_id).to be_nil
     end
 
     context "when a custom badge name has been set and it matches the title" do
@@ -2671,12 +2702,11 @@ RSpec.describe User do
         TranslationOverride.upsert!(I18n.locale, Badge.i18n_key(badge.name), customized_badge_name)
       end
 
-      it "sets badge_granted_title correctly" do
+      it "sets granted_title_badge_id correctly" do
         BadgeGranter.grant(badge, user)
 
         badge.update!(allow_title: true)
         user.update!(title: customized_badge_name)
-        expect(user.user_profile.reload.badge_granted_title).to eq(true)
         expect(user.user_profile.reload.granted_title_badge_id).to eq(badge.id)
       end
 
@@ -2872,7 +2902,7 @@ RSpec.describe User do
       it "only includes enabled totp 2FA" do
         enabled_totp_2fa =
           Fabricate(:user_second_factor_totp, user: user, name: "Enabled TOTP", enabled: true)
-        disabled_totp_2fa =
+        _disabled_totp_2fa =
           Fabricate(:user_second_factor_totp, user: user, name: "Disabled TOTP", enabled: false)
 
         expect(user.totps.map(&:id)).to eq([enabled_totp_2fa.id])
@@ -2888,7 +2918,7 @@ RSpec.describe User do
             name: "Enabled YubiKey",
             enabled: true,
           )
-        disabled_security_key_2fa =
+        _disabled_security_key_2fa =
           Fabricate(
             :user_security_key_with_random_credential,
             user: user,
@@ -3173,7 +3203,7 @@ RSpec.describe User do
     end
 
     it "returns false if no whispers groups exist" do
-      expect(subject.whisperer?).to eq(false)
+      expect(user.whisperer?).to eq(false)
     end
   end
 
@@ -3309,13 +3339,36 @@ RSpec.describe User do
       last_notification = Fabricate(:notification, user: user)
       deleted_notification = Fabricate(:notification, user: user)
       deleted_notification.topic.trash!
-      someone_else_notification = Fabricate(:notification, user: Fabricate(:user))
+      _someone_else_notification = Fabricate(:notification, user: Fabricate(:user))
 
       expect(user.bump_last_seen_notification!).to eq(true)
       expect(user.reload.seen_notification_id).to eq(last_notification.id)
     end
   end
 
+  describe "#secured_sidebar_category_ids" do
+    fab!(:user) { Fabricate(:user) }
+    fab!(:category) { Fabricate(:category) }
+    fab!(:group) { Fabricate(:group) }
+    fab!(:secured_category) { Fabricate(:private_category, group: group) }
+
+    fab!(:category_sidebar_section_link) do
+      Fabricate(:category_sidebar_section_link, user: user, linkable: category)
+    end
+
+    fab!(:secured_category_sidebar_section_link) do
+      Fabricate(:category_sidebar_section_link, user: user, linkable: secured_category)
+    end
+
+    it "should only return the category ids of category sidebar section link records that the user is allowed to see" do
+      expect(user.secured_sidebar_category_ids).to contain_exactly(category.id)
+
+      user.update!(admin: true)
+
+      expect(user.secured_sidebar_category_ids).to contain_exactly(category.id, secured_category.id)
+    end
+  end
+
   describe "#visible_sidebar_tags" do
     fab!(:user) { Fabricate(:user) }
     fab!(:tag) { Fabricate(:tag) }
diff --git a/spec/models/user_stat_spec.rb b/spec/models/user_stat_spec.rb
index 8827061dd25..61ef277c455 100644
--- a/spec/models/user_stat_spec.rb
+++ b/spec/models/user_stat_spec.rb
@@ -284,7 +284,7 @@ RSpec.describe UserStat do
     subject(:update_pending_posts) { stat.update_pending_posts }
 
     let!(:reviewable) { Fabricate(:reviewable_queued_post) }
-    let(:user) { reviewable.created_by }
+    let(:user) { reviewable.target_created_by }
     let(:stat) { user.user_stat }
 
     before do
diff --git a/spec/models/username_validator_spec.rb b/spec/models/username_validator_spec.rb
index e3f9ac92e61..603f12e7bba 100644
--- a/spec/models/username_validator_spec.rb
+++ b/spec/models/username_validator_spec.rb
@@ -201,6 +201,26 @@ RSpec.describe UsernameValidator do
         )
       end
 
+      it "is invalid when the username contains invisible characters" do
+        expect_invalid(
+          "a\u{034F}b",
+          "a\u{115F}b",
+          "a\u{1160}b",
+          "a\u{17B4}b",
+          "a\u{17B5}b",
+          "a\u{180B}b",
+          "a\u{180C}b",
+          "a\u{180D}b",
+          "a\u{3164}b",
+          "a\u{FFA0}b",
+          "a\u{FE00}b",
+          "a\u{FE0F}b",
+          "a\u{E0100}b",
+          "a\u{E01EF}b",
+          error_message: I18n.t(:"user.username.characters"),
+        )
+      end
+
       it "is invalid when the username contains zero width join characters" do
         expect_invalid("ണ്‍", "র‌্যাম", error_message: I18n.t(:"user.username.characters"))
       end
diff --git a/spec/models/web_crawler_request_spec.rb b/spec/models/web_crawler_request_spec.rb
index 12e6b44cfec..afa9870d68c 100644
--- a/spec/models/web_crawler_request_spec.rb
+++ b/spec/models/web_crawler_request_spec.rb
@@ -6,7 +6,10 @@ RSpec.describe WebCrawlerRequest do
     CachedCounting.enable
   end
 
-  after { CachedCounting.disable }
+  after do
+    CachedCounting.reset
+    CachedCounting.disable
+  end
 
   it "can log crawler requests" do
     freeze_time
diff --git a/spec/models/web_hook_spec.rb b/spec/models/web_hook_spec.rb
index 2752997d846..5a6bf1757ab 100644
--- a/spec/models/web_hook_spec.rb
+++ b/spec/models/web_hook_spec.rb
@@ -7,30 +7,30 @@ RSpec.describe WebHook do
   it { is_expected.to validate_presence_of :web_hook_event_types }
 
   describe "#content_types" do
-    subject { WebHook.content_types }
+    subject(:content_types) { WebHook.content_types }
 
     it "'json' (application/json) should be at 1st position" do
-      expect(subject["application/json"]).to eq(1)
+      expect(content_types["application/json"]).to eq(1)
     end
 
     it "'url_encoded' (application/x-www-form-urlencoded) should be at 2st position" do
-      expect(subject["application/x-www-form-urlencoded"]).to eq(2)
+      expect(content_types["application/x-www-form-urlencoded"]).to eq(2)
     end
   end
 
   describe "#last_delivery_statuses" do
-    subject { WebHook.last_delivery_statuses }
+    subject(:statuses) { WebHook.last_delivery_statuses }
 
     it "inactive should be at 1st position" do
-      expect(subject[:inactive]).to eq(1)
+      expect(statuses[:inactive]).to eq(1)
     end
 
     it "failed should be at 2st position" do
-      expect(subject[:failed]).to eq(2)
+      expect(statuses[:failed]).to eq(2)
     end
 
     it "successful should be at 3st position" do
-      expect(subject[:successful]).to eq(3)
+      expect(statuses[:successful]).to eq(3)
     end
   end
 
@@ -219,6 +219,29 @@ RSpec.describe WebHook do
       expect(payload["tags"]).to contain_exactly(tag.name)
     end
 
+    it "should not log a personal message view when processing new topic" do
+      SiteSetting.log_personal_messages_views = true
+      Fabricate(:topic_web_hook)
+
+      post =
+        PostCreator.create!(
+          user,
+          raw: "raw",
+          title: "title",
+          skip_validations: true,
+          archetype: Archetype.private_message,
+          target_usernames: user.username,
+        )
+      topic_id = post.topic.id
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+
+      expect(job_args["event_name"]).to eq("topic_created")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["id"]).to eq(topic_id)
+
+      expect(UserHistory.where(action: UserHistory.actions[:check_personal_message]).count).to eq(0)
+    end
+
     describe "when topic has been deleted" do
       it "should not enqueue a post/topic edited hooks" do
         topic.trash!
@@ -558,7 +581,10 @@ RSpec.describe WebHook do
 
       job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
       expect(job_args["event_name"]).to eq("user_added_to_group")
+      expect(job_args["group_ids"]).to contain_exactly(group.id)
+
       payload = JSON.parse(job_args["payload"])
+
       expect(payload["group_id"]).to eq(group.id)
       expect(payload["user_id"]).to eq(user.id)
       expect(payload["notification_level"]).to eq(group.default_notification_level)
@@ -577,7 +603,10 @@ RSpec.describe WebHook do
 
       job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
       expect(job_args["event_name"]).to eq("user_removed_from_group")
+      expect(job_args["group_ids"]).to contain_exactly(group.id)
+
       payload = JSON.parse(job_args["payload"])
+
       expect(payload["group_id"]).to eq(group.id)
       expect(payload["user_id"]).to eq(user.id)
     end
diff --git a/spec/multisite/request_tracker_spec.rb b/spec/multisite/request_tracker_spec.rb
index 4ca47c3b6c9..29bf7c2513b 100644
--- a/spec/multisite/request_tracker_spec.rb
+++ b/spec/multisite/request_tracker_spec.rb
@@ -5,12 +5,11 @@ RSpec.describe "RequestTracker in multisite", type: :multisite do
     global_setting :skip_per_ip_rate_limit_trust_level, 2
 
     RateLimiter.enable
-
-    test_multisite_connection("default") { RateLimiter.clear_all! }
-    test_multisite_connection("second") { RateLimiter.clear_all! }
     RateLimiter.clear_all_global!
   end
 
+  use_redis_snapshotting
+
   def call(env, &block)
     Middleware::RequestTracker.new(block).call(env)
   end
diff --git a/spec/multisite/s3_store_spec.rb b/spec/multisite/s3_store_spec.rb
index 5765ca89e0f..062bbecde6d 100644
--- a/spec/multisite/s3_store_spec.rb
+++ b/spec/multisite/s3_store_spec.rb
@@ -8,8 +8,14 @@ RSpec.describe "Multisite s3 uploads", type: :multisite do
   let(:upload_sha1) { Digest::SHA1.hexdigest(File.read(uploaded_file)) }
   let(:upload_path) { Discourse.store.upload_path }
 
-  def build_upload
-    Fabricate.build(:upload, sha1: upload_sha1, id: 1, original_filename: original_filename)
+  def build_upload(secure: false)
+    Fabricate.build(
+      :upload,
+      sha1: upload_sha1,
+      id: 1,
+      original_filename: original_filename,
+      secure: secure,
+    )
   end
 
   describe "uploading to s3" do
@@ -196,7 +202,7 @@ RSpec.describe "Multisite s3 uploads", type: :multisite do
     end
   end
 
-  describe "secure uploadss" do
+  describe "secure uploads" do
     let(:store) { FileStore::S3Store.new }
     let(:client) { Aws::S3::Client.new(stub_responses: true) }
     let(:resource) { Aws::S3::Resource.new(client: client) }
@@ -266,36 +272,68 @@ RSpec.describe "Multisite s3 uploads", type: :multisite do
     describe "#update_upload_ACL" do
       it "updates correct file for default and second multisite db" do
         test_multisite_connection("default") do
-          upload = build_upload
-          upload.update!(original_filename: "small.pdf", extension: "pdf", secure: true)
+          upload = build_upload(secure: true)
+          upload.update!(original_filename: "small.pdf", extension: "pdf")
 
           s3_helper.expects(:s3_bucket).returns(s3_bucket).at_least_once
-          s3_bucket
-            .expects(:object)
-            .with("#{upload_path}/original/1X/#{upload.sha1}.pdf")
-            .returns(s3_object)
-          s3_object.expects(:acl).returns(s3_object)
-          s3_object.expects(:put).with(acl: "private").returns(s3_object)
+          expect_upload_acl_update(upload, upload_path)
 
           expect(store.update_upload_ACL(upload)).to be_truthy
         end
 
         test_multisite_connection("second") do
           upload_path = Discourse.store.upload_path
-          upload = build_upload
-          upload.update!(original_filename: "small.pdf", extension: "pdf", secure: true)
+          upload = build_upload(secure: true)
+          upload.update!(original_filename: "small.pdf", extension: "pdf")
 
           s3_helper.expects(:s3_bucket).returns(s3_bucket).at_least_once
-          s3_bucket
-            .expects(:object)
-            .with("#{upload_path}/original/1X/#{upload.sha1}.pdf")
-            .returns(s3_object)
-          s3_object.expects(:acl).returns(s3_object)
-          s3_object.expects(:put).with(acl: "private").returns(s3_object)
+          expect_upload_acl_update(upload, upload_path)
 
           expect(store.update_upload_ACL(upload)).to be_truthy
         end
       end
+
+      describe "optimized images" do
+        it "updates correct file for default and second multisite DB" do
+          test_multisite_connection("default") do
+            upload = build_upload(secure: true)
+            upload_path = Discourse.store.upload_path
+            optimized_image = Fabricate(:optimized_image, upload: upload)
+            s3_helper.expects(:s3_bucket).returns(s3_bucket).at_least_once
+            expect_upload_acl_update(upload, upload_path)
+            expect_optimized_image_acl_update(optimized_image, upload_path)
+
+            expect(store.update_upload_ACL(upload)).to be_truthy
+          end
+
+          test_multisite_connection("second") do
+            upload = build_upload(secure: true)
+            upload_path = Discourse.store.upload_path
+            optimized_image = Fabricate(:optimized_image, upload: upload)
+            s3_helper.expects(:s3_bucket).returns(s3_bucket).at_least_once
+            expect_upload_acl_update(upload, upload_path)
+            expect_optimized_image_acl_update(optimized_image, upload_path)
+
+            expect(store.update_upload_ACL(upload)).to be_truthy
+          end
+        end
+      end
+
+      def expect_upload_acl_update(upload, upload_path)
+        s3_bucket
+          .expects(:object)
+          .with("#{upload_path}/original/1X/#{upload.sha1}.#{upload.extension}")
+          .returns(s3_object)
+        s3_object.expects(:acl).returns(s3_object)
+        s3_object.expects(:put).with(acl: "private").returns(s3_object)
+      end
+
+      def expect_optimized_image_acl_update(optimized_image, upload_path)
+        path = Discourse.store.get_path_for_optimized_image(optimized_image)
+        s3_bucket.expects(:object).with("#{upload_path}/#{path}").returns(s3_object)
+        s3_object.expects(:acl).returns(s3_object)
+        s3_object.expects(:put).with(acl: "private").returns(s3_object)
+      end
     end
   end
 
@@ -363,7 +401,7 @@ RSpec.describe "Multisite s3 uploads", type: :multisite do
         )
       end
 
-      it "presigned url contans the metadata when provided" do
+      it "presigned url contains the metadata when provided" do
         url =
           store.signed_url_for_temporary_upload("test.png", metadata: { "test-meta": "testing" })
         expect(url).to include("&x-amz-meta-test-meta=testing")
diff --git a/spec/multisite/site_settings_spec.rb b/spec/multisite/site_settings_spec.rb
index 45e5caaeff3..7aedfe28d89 100644
--- a/spec/multisite/site_settings_spec.rb
+++ b/spec/multisite/site_settings_spec.rb
@@ -29,4 +29,37 @@ RSpec.describe "Multisite SiteSettings", type: :multisite do
       test_multisite_connection("second") { expect(SiteSetting.default_locale).to eq("zh_TW") }
     end
   end
+
+  describe "transforming defaults from plugin" do
+    class TestFilterPlugInstance < Plugin::Instance
+    end
+
+    let(:plugin_instance) { TestFilterPlugInstance.new }
+
+    it "can change defaults" do
+      test_multisite_connection("default") { expect(SiteSetting.title).to eq("Discourse") }
+
+      plugin_instance.register_modifier(:site_setting_defaults) do |defaults|
+        defaults.merge({ title: "title for #{RailsMultisite::ConnectionManagement.current_db}" })
+      end
+
+      test_multisite_connection("default") do
+        SiteSetting.refresh!
+        expect(SiteSetting.title).to eq("title for default")
+        SiteSetting.title = "overridden default title"
+        expect(SiteSetting.title).to eq("overridden default title")
+      end
+
+      test_multisite_connection("second") do
+        SiteSetting.refresh!
+        expect(SiteSetting.title).to eq("title for second")
+        SiteSetting.title = "overridden second title"
+        expect(SiteSetting.title).to eq("overridden second title")
+      end
+    ensure
+      DiscoursePluginRegistry.reset!
+      test_multisite_connection("default") { SiteSetting.refresh! }
+      test_multisite_connection("second") { SiteSetting.refresh! }
+    end
+  end
 end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 4cf75abb873..2d0550dd8f2 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -80,6 +80,7 @@ end
 Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
 Dir[Rails.root.join("spec/requests/examples/*.rb")].each { |f| require f }
 
+Dir[Rails.root.join("spec/system/helpers/**/*.rb")].each { |f| require f }
 Dir[Rails.root.join("spec/system/page_objects/**/base.rb")].each { |f| require f }
 Dir[Rails.root.join("spec/system/page_objects/**/*.rb")].each { |f| require f }
 
@@ -148,16 +149,18 @@ module TestSetup
     # Don't queue badge grant in test mode
     BadgeGranter.disable_queue
 
-    # Make sure the default Post and Topic bookmarkables are registered
-    Bookmark.reset_bookmarkables
-
     OmniAuth.config.test_mode = false
 
     Middleware::AnonymousCache.disable_anon_cache
   end
 end
 
-TestProf::BeforeAll.configure { |config| config.before(:begin) { TestSetup.test_setup } }
+TestProf::BeforeAll.configure do |config|
+  config.after(:begin) do
+    DB.test_transaction = ActiveRecord::Base.connection.current_transaction
+    TestSetup.test_setup
+  end
+end
 
 if ENV["PREFABRICATION"] == "0"
   module Prefabrication
@@ -171,6 +174,8 @@ else
   TestProf::LetItBe.configure { |config| config.alias_to :fab!, refind: true }
 end
 
+PER_SPEC_TIMEOUT_SECONDS = 30
+
 RSpec.configure do |config|
   config.fail_fast = ENV["RSPEC_FAIL_FAST"] == "1"
   config.silence_filter_announcements = ENV["RSPEC_SILENCE_FILTER_ANNOUNCEMENTS"] == "1"
@@ -190,11 +195,30 @@ RSpec.configure do |config|
   config.order = "random"
   config.infer_spec_type_from_file_location!
 
+  if ENV["GITHUB_ACTIONS"]
+    # Enable color output in GitHub Actions
+    # This eventually will be `config.color_mode = :on` in RSpec 4?
+    config.tty = true
+    config.color = true
+  end
+
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false
   # instead of true.
   config.use_transactional_fixtures = true
 
+  # Sometimes you may have a large string or object that you are comparing
+  # with some expectation, and you want to see the full diff between actual
+  # and expected without rspec truncating 90% of the diff. Setting the
+  # max_formatted_output_length to nil disables this truncation completely.
+  #
+  # c.f. https://www.rubydoc.info/gems/rspec-expectations/RSpec/Expectations/Configuration#max_formatted_output_length=-instance_method
+  if ENV["RSPEC_DISABLE_DIFF_TRUNCATION"]
+    config.expect_with :rspec do |expectation|
+      expectation.max_formatted_output_length = nil
+    end
+  end
+
   # If true, the base class of anonymous controllers will be inferred
   # automatically. This will be the default behavior in future versions of
   # rspec-rails.
@@ -233,73 +257,69 @@ RSpec.configure do |config|
 
     WebMock.disable_net_connect!(allow_localhost: true, allow: [Webdrivers::Chromedriver.base_url])
 
-    if ENV["CAPBYARA_DEFAULT_MAX_WAIT_TIME"].present?
-      Capybara.default_max_wait_time = ENV["CAPBYARA_DEFAULT_MAX_WAIT_TIME"].to_i
+    if ENV["CAPYBARA_DEFAULT_MAX_WAIT_TIME"].present?
+      Capybara.default_max_wait_time = ENV["CAPYBARA_DEFAULT_MAX_WAIT_TIME"].to_i
     end
 
     Capybara.threadsafe = true
     Capybara.disable_animation = true
 
+    # Click offsets is calculated from top left of element
+    Capybara.w3c_click_offset = false
+
     Capybara.configure do |capybara_config|
       capybara_config.server_host = "localhost"
       capybara_config.server_port = 31_337 + ENV["TEST_ENV_NUMBER"].to_i
     end
 
-    # The valid values for SELENIUM_BROWSER_LOG_LEVEL are:
-    #
-    # OFF
-    # SEVERE
-    # WARNING
-    # INFO
-    # DEBUG
-    # ALL
+    module IgnoreUnicornCapturedErrors
+      def raise_server_error!
+        super
+      rescue EOFError, Errno::ECONNRESET, Errno::EPIPE, Errno::ENOTCONN => e
+        # Ignore these exceptions - caused by client. Handled by unicorn in dev/prod
+        # https://github.com/defunkt/unicorn/blob/d947cb91cf/lib/unicorn/http_server.rb#L570-L573
+      end
+    end
+
+    Capybara::Session.class_eval { prepend IgnoreUnicornCapturedErrors }
+
+    # possible values: OFF, SEVERE, WARNING, INFO, DEBUG, ALL
     browser_log_level = ENV["SELENIUM_BROWSER_LOG_LEVEL"] || "SEVERE"
+
     chrome_browser_options =
       Selenium::WebDriver::Chrome::Options
         .new(logging_prefs: { "browser" => browser_log_level, "driver" => "ALL" })
         .tap do |options|
+          apply_base_chrome_options(options)
           options.add_argument("--window-size=1400,1400")
-          options.add_argument("--no-sandbox")
-          options.add_argument("--disable-dev-shm-usage")
-          options.add_argument("--mute-audio")
+          options.add_preference("download.default_directory", Downloads::FOLDER)
         end
 
     Capybara.register_driver :selenium_chrome do |app|
-      Capybara::Selenium::Driver.new(app, browser: :chrome, capabilities: chrome_browser_options)
+      Capybara::Selenium::Driver.new(app, browser: :chrome, options: chrome_browser_options)
     end
 
     Capybara.register_driver :selenium_chrome_headless do |app|
-      chrome_browser_options.add_argument("--headless")
+      chrome_browser_options.add_argument("--headless=new")
 
-      Capybara::Selenium::Driver.new(app, browser: :chrome, capabilities: chrome_browser_options)
+      Capybara::Selenium::Driver.new(app, browser: :chrome, options: chrome_browser_options)
     end
 
     mobile_chrome_browser_options =
       Selenium::WebDriver::Chrome::Options
-        .new(logging_prefs: { "browser" => "INFO", "driver" => "ALL" })
+        .new(logging_prefs: { "browser" => browser_log_level, "driver" => "ALL" })
         .tap do |options|
-          options.add_argument("--window-size=390,950")
-          options.add_argument("--no-sandbox")
-          options.add_argument("--disable-dev-shm-usage")
           options.add_emulation(device_name: "iPhone 12 Pro")
-          options.add_argument("--mute-audio")
+          apply_base_chrome_options(options)
         end
 
     Capybara.register_driver :selenium_mobile_chrome do |app|
-      Capybara::Selenium::Driver.new(
-        app,
-        browser: :chrome,
-        capabilities: mobile_chrome_browser_options,
-      )
+      Capybara::Selenium::Driver.new(app, browser: :chrome, options: mobile_chrome_browser_options)
     end
 
     Capybara.register_driver :selenium_mobile_chrome_headless do |app|
-      mobile_chrome_browser_options.add_argument("--headless")
-      Capybara::Selenium::Driver.new(
-        app,
-        browser: :chrome,
-        capabilities: mobile_chrome_browser_options,
-      )
+      mobile_chrome_browser_options.add_argument("--headless=new")
+      Capybara::Selenium::Driver.new(app, browser: :chrome, options: mobile_chrome_browser_options)
     end
 
     if ENV["ELEVATED_UPLOADS_ID"]
@@ -307,6 +327,9 @@ RSpec.configure do |config|
     else
       DB.exec "SELECT setval('uploads_id_seq', 1)"
     end
+
+    # Prevents 500 errors for site setting URLs pointing to test.localhost in system specs.
+    SiteIconManager.clear_cache!
   end
 
   class TestLocalProcessProvider < SiteSettings::LocalProcessProvider
@@ -331,18 +354,13 @@ RSpec.configure do |config|
 
     unfreeze_time
     ActionMailer::Base.deliveries.clear
-
-    if ActiveRecord::Base.connection_pool.stat[:busy] > 1
-      raise ActiveRecord::Base.connection_pool.stat.inspect
-    end
   end
 
   config.after(:suite) do
-    FileUtils.remove_dir(file_from_fixtures_tmp_folder, true) if SpecSecureRandom.value
+    FileUtils.remove_dir(concurrency_safe_tmp_dir, true) if SpecSecureRandom.value
+    Downloads.clear
   end
 
-  config.before :each, &TestSetup.method(:test_setup)
-
   config.around :each do |example|
     before_event_count = DiscourseEvent.events.values.sum(&:count)
     example.run
@@ -351,24 +369,46 @@ RSpec.configure do |config|
     "DiscourseEvent registrations were not cleaned up"
   end
 
+  if ENV["CI"]
+    class SpecTimeoutError < StandardError
+    end
+
+    config.around do |example|
+      Timeout.timeout(
+        PER_SPEC_TIMEOUT_SECONDS,
+        SpecTimeoutError,
+        "Spec timed out after #{PER_SPEC_TIMEOUT_SECONDS} seconds",
+      ) do
+        example.run
+      rescue SpecTimeoutError
+      end
+    end
+  end
+
+  if ENV["DISCOURSE_RSPEC_PROFILE_EACH_EXAMPLE"]
+    config.around :each do |example|
+      measurement = Benchmark.measure { example.run }
+      RSpec.current_example.metadata[:run_duration_ms] = (measurement.real * 1000).round(2)
+    end
+  end
+
   config.before :each do
     # This allows DB.transaction_open? to work in tests. See lib/mini_sql_multisite_connection.rb
     DB.test_transaction = ActiveRecord::Base.connection.current_transaction
+    TestSetup.test_setup
   end
 
   # Match the request hostname to the value in `database.yml`
-  config.before(:all, type: %i[request multisite system]) { host! "test.localhost" }
   config.before(:each, type: %i[request multisite system]) { host! "test.localhost" }
 
   last_driven_by = nil
   config.before(:each, type: :system) do |example|
-    if example.metadata[:js]
-      driver = [:selenium]
-      driver << :mobile if example.metadata[:mobile]
-      driver << :chrome
-      driver << :headless unless ENV["SELENIUM_HEADLESS"] == "0"
-      driven_by driver.join("_").to_sym
-    end
+    driver = [:selenium]
+    driver << :mobile if example.metadata[:mobile]
+    driver << :chrome
+    driver << :headless unless ENV["SELENIUM_HEADLESS"] == "0"
+    driven_by driver.join("_").to_sym
+
     setup_system_test
   end
 
@@ -404,13 +444,27 @@ RSpec.configure do |config|
           if logs.empty?
             lines << "(no logs)"
           else
-            logs.each { |log| lines << log.message }
+            logs.each do |log|
+              # System specs are full of image load errors that are just noise, no need
+              # to log this.
+              if (
+                   log.message.include?("Failed to load resource: net::ERR_CONNECTION_REFUSED") &&
+                     (log.message.include?("uploads") || log.message.include?("images"))
+                 ) || log.message.include?("favicon.ico")
+                next
+              end
+
+              lines << log.message
+            end
           end
           lines << "~~~~~ END JS LOGS ~~~~~"
         end
       end
     end
 
+    page.execute_script("if (typeof MessageBus !== 'undefined') { MessageBus.stop(); }")
+    Capybara.reset_sessions!
+    Capybara.use_default_driver
     Discourse.redis.flushdb
   end
 
@@ -525,15 +579,27 @@ def unfreeze_time
 end
 
 def file_from_fixtures(filename, directory = "images")
-  SpecSecureRandom.value ||= SecureRandom.hex
-  FileUtils.mkdir_p(file_from_fixtures_tmp_folder) unless Dir.exist?(file_from_fixtures_tmp_folder)
-  tmp_file_path = File.join(file_from_fixtures_tmp_folder, SecureRandom.hex << filename)
+  tmp_file_path = File.join(concurrency_safe_tmp_dir, SecureRandom.hex << filename)
   FileUtils.cp("#{Rails.root}/spec/fixtures/#{directory}/#{filename}", tmp_file_path)
   File.new(tmp_file_path)
 end
 
-def file_from_fixtures_tmp_folder
-  File.join(Dir.tmpdir, "rspec_#{Process.pid}_#{SpecSecureRandom.value}")
+def plugin_from_fixtures(plugin_name)
+  tmp_plugins_dir = File.join(concurrency_safe_tmp_dir, "plugins")
+
+  FileUtils.mkdir(tmp_plugins_dir) if !Dir.exist?(tmp_plugins_dir)
+  FileUtils.cp_r("#{Rails.root}/spec/fixtures/plugins/#{plugin_name}", tmp_plugins_dir)
+
+  plugin = Plugin::Instance.new
+  plugin.path = File.join(tmp_plugins_dir, plugin_name, "plugin.rb")
+  plugin
+end
+
+def concurrency_safe_tmp_dir
+  SpecSecureRandom.value ||= SecureRandom.hex
+  dir_path = File.join(Dir.tmpdir, "rspec_#{Process.pid}_#{SpecSecureRandom.value}")
+  FileUtils.mkdir_p(dir_path) unless Dir.exist?(dir_path)
+  dir_path
 end
 
 def has_trigger?(trigger_name)
@@ -597,6 +663,42 @@ def decrypt_auth_cookie(cookie)
   ].with_indifferent_access
 end
 
+def apply_base_chrome_options(options)
+  # possible values: undocked, bottom, right, left
+  chrome_dev_tools = ENV["CHROME_DEV_TOOLS"]
+
+  if chrome_dev_tools
+    options.add_argument("--auto-open-devtools-for-tabs")
+    options.add_preference(
+      "devtools",
+      "preferences" => {
+        "currentDockState" => "\"#{chrome_dev_tools}\"",
+        "panel-selectedTab" => '"console"',
+      },
+    )
+  end
+
+  options.add_argument("--no-sandbox")
+  options.add_argument("--disable-dev-shm-usage")
+  options.add_argument("--mute-audio")
+
+  # A file that contains just a list of paths like so:
+  #
+  # /home/me/.config/google-chrome/Default/Extensions/bmdblncegkenkacieihfhpjfppoconhi/4.9.1_0
+  #
+  # These paths can be found for each individual extension via the
+  # chrome://extensions/ page.
+  if ENV["CHROME_LOAD_EXTENSIONS_MANIFEST"].present?
+    File
+      .readlines(ENV["CHROME_LOAD_EXTENSIONS_MANIFEST"])
+      .each { |path| options.add_argument("--load-extension=#{path}") }
+  end
+
+  if ENV["CHROME_DISABLE_FORCE_DEVICE_SCALE_FACTOR"].blank?
+    options.add_argument("--force-device-scale-factor=1")
+  end
+end
+
 class SpecSecureRandom
   class << self
     attr_accessor :value
diff --git a/spec/requests/admin/api_controller_spec.rb b/spec/requests/admin/api_controller_spec.rb
index 4f18c46989f..b582558fce9 100644
--- a/spec/requests/admin/api_controller_spec.rb
+++ b/spec/requests/admin/api_controller_spec.rb
@@ -429,13 +429,40 @@ RSpec.describe Admin::ApiController do
           "users",
           "email",
           "posts",
+          "tags",
           "uploads",
           "user_status",
           "global",
           "badges",
+          "groups",
           "categories",
+          "search",
+          "invites",
           "wordpress",
         )
+
+        topic_routes = [
+          "/t/:id (GET)",
+          "/t/external_id/:external_id (GET)",
+          "/t/:slug/:topic_id/print (GET)",
+          "/t/:slug/:topic_id/summary (GET)",
+          "/t/:topic_id/summary (GET)",
+          "/t/:topic_id/:post_number (GET)",
+          "/t/:topic_id/last (GET)",
+          "/t/:slug/:topic_id.rss (GET)",
+          "/t/:slug/:topic_id (GET)",
+          "/t/:slug/:topic_id/:post_number (GET)",
+          "/t/:slug/:topic_id/last (GET)",
+          "/t/:topic_id/posts (GET)",
+          "/latest.rss (GET)",
+        ]
+
+        topic_routes.each do |route|
+          expect(scopes["topics"].any? { |h| h["urls"].include?(route) }).to be_truthy
+        end
+
+        expect(scopes["posts"].any? { |h| h["urls"].include?("/posts (GET)") }).to be_truthy
+        expect(scopes["posts"].any? { |h| h["urls"].include?("/private-posts (GET)") }).to be_truthy
       end
     end
 
diff --git a/spec/requests/admin/backups_controller_spec.rb b/spec/requests/admin/backups_controller_spec.rb
index 6bb5519c5f0..15dda7eb0f6 100644
--- a/spec/requests/admin/backups_controller_spec.rb
+++ b/spec/requests/admin/backups_controller_spec.rb
@@ -154,10 +154,9 @@ RSpec.describe Admin::BackupsController do
       end
 
       context "with rate limiting enabled" do
-        before do
-          RateLimiter.clear_all!
-          RateLimiter.enable
-        end
+        before { RateLimiter.enable }
+
+        use_redis_snapshotting
 
         after { RateLimiter.disable }
 
@@ -595,7 +594,7 @@ RSpec.describe Admin::BackupsController do
           )
         end
 
-        it "works with multiple chunks when the final chunk is just the remaninder" do
+        it "works with multiple chunks when the final chunk is just the remainder" do
           freeze_time
           described_class.any_instance.expects(:has_enough_space_on_disk?).times(3).returns(true)
 
diff --git a/spec/requests/admin/color_schemes_controller_spec.rb b/spec/requests/admin/color_schemes_controller_spec.rb
index 6869fc9f18b..0022a7fd083 100644
--- a/spec/requests/admin/color_schemes_controller_spec.rb
+++ b/spec/requests/admin/color_schemes_controller_spec.rb
@@ -31,6 +31,20 @@ RSpec.describe Admin::ColorSchemesController do
         expect(scheme_colors[0]["name"]).to eq(base_scheme_colors[0].name)
         expect(scheme_colors[0]["hex"]).to eq(base_scheme_colors[0].hex)
       end
+
+      it "serializes default colors even when not present in database" do
+        scheme = ColorScheme.create_from_base({ name: "my color scheme" })
+        scheme.colors.find_by(name: "primary").destroy!
+        scheme_name = scheme.name
+
+        get "/admin/color_schemes.json"
+        expect(response.status).to eq(200)
+
+        serialized_scheme = response.parsed_body.find { |s| s["name"] == "my color scheme" }
+        scheme_colors = serialized_scheme["colors"]
+        expect(scheme_colors[0]["name"]).to eq("primary")
+        expect(scheme_colors[0]["hex"]).to eq(scheme.resolved_colors["primary"])
+      end
     end
 
     shared_examples "color schemes inaccessible" do
diff --git a/spec/requests/admin/email_templates_controller_spec.rb b/spec/requests/admin/email_templates_controller_spec.rb
index e9e15341bfb..0680d982d88 100644
--- a/spec/requests/admin/email_templates_controller_spec.rb
+++ b/spec/requests/admin/email_templates_controller_spec.rb
@@ -165,6 +165,7 @@ RSpec.describe Admin::EmailTemplatesController do
               I18n.t(
                 "activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys",
                 keys: "email_wrongfix",
+                count: 1,
               )
             }",
           ]
@@ -183,6 +184,7 @@ RSpec.describe Admin::EmailTemplatesController do
               I18n.t(
                 "activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys",
                 keys: "invalid",
+                count: 1,
               )
             }",
           ]
@@ -201,12 +203,14 @@ RSpec.describe Admin::EmailTemplatesController do
               I18n.t(
                 "activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys",
                 keys: "invalid",
+                count: 1,
               )
             }",
             "<b>Body</b>: #{
               I18n.t(
                 "activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys",
                 keys: "invalid",
+                count: 1,
               )
             }",
           ]
@@ -446,7 +450,7 @@ RSpec.describe Admin::EmailTemplatesController do
 
   it "uses only existing email templates" do
     Admin::EmailTemplatesController.email_keys.each do |key|
-      expect(I18n.t(key)).to_not include("translation missing")
+      expect(I18n.t(key)).to_not include("Translation missing")
     end
   end
 end
diff --git a/spec/requests/admin/embeddable_hosts_controller_spec.rb b/spec/requests/admin/embeddable_hosts_controller_spec.rb
index b7b557c5352..7d77c8d8a39 100644
--- a/spec/requests/admin/embeddable_hosts_controller_spec.rb
+++ b/spec/requests/admin/embeddable_hosts_controller_spec.rb
@@ -56,7 +56,6 @@ RSpec.describe Admin::EmbeddableHostsController do
             params: {
               embeddable_host: {
                 host: "test.com",
-                class_name: "test-class",
                 category_id: category.id,
               },
             }
@@ -67,7 +66,7 @@ RSpec.describe Admin::EmbeddableHostsController do
           UserHistory.where(
             acting_user_id: admin.id,
             action: UserHistory.actions[:embeddable_host_update],
-            new_value: "category_id: #{category.id}, class_name: test-class, host: test.com",
+            new_value: "category_id: #{category.id}, host: test.com",
           ).exists?
 
         expect(history_exists).to eq(true)
@@ -82,7 +81,6 @@ RSpec.describe Admin::EmbeddableHostsController do
             params: {
               embeddable_host: {
                 host: "test.com",
-                class_name: "test-class",
                 category_id: category.id,
               },
             }
diff --git a/spec/requests/admin/form_templates_controller_spec.rb b/spec/requests/admin/form_templates_controller_spec.rb
new file mode 100644
index 00000000000..c8503cb2563
--- /dev/null
+++ b/spec/requests/admin/form_templates_controller_spec.rb
@@ -0,0 +1,173 @@
+# frozen_string_literal: true
+
+RSpec.describe Admin::FormTemplatesController do
+  fab!(:admin) { Fabricate(:admin) }
+  fab!(:user) { Fabricate(:user) }
+
+  before { SiteSetting.experimental_form_templates = true }
+
+  describe "#index" do
+    fab!(:form_template) { Fabricate(:form_template) }
+
+    context "when logged in as an admin" do
+      before { sign_in(admin) }
+
+      it "should work if you are an admin" do
+        get "/admin/customize/form-templates.json"
+        expect(response.status).to eq(200)
+
+        json = response.parsed_body
+        expect(json["form_templates"]).to be_present
+      end
+    end
+
+    context "when logged in as a non-admin user" do
+      before { sign_in(user) }
+
+      it "should not work if you are not an admin" do
+        get "/admin/customize/form-templates.json"
+
+        expect(response.status).to eq(404)
+      end
+    end
+
+    context "when experimental form templates is disabled" do
+      before do
+        sign_in(admin)
+        SiteSetting.experimental_form_templates = false
+      end
+
+      it "should not work if you are an admin" do
+        get "/admin/customize/form-templates.json"
+
+        expect(response.status).to eq(403)
+      end
+    end
+  end
+
+  describe "#show" do
+    fab!(:form_template) { Fabricate(:form_template) }
+
+    context "when logged in as an admin" do
+      before { sign_in(admin) }
+
+      it "should work if you are an admin" do
+        get "/admin/customize/form-templates/#{form_template.id}.json"
+        expect(response.status).to eq(200)
+
+        json = response.parsed_body
+        current_template = json["form_template"]
+        expect(current_template["id"]).to eq(form_template.id)
+        expect(current_template["name"]).to eq(form_template.name)
+        expect(current_template["template"]).to eq(form_template.template)
+      end
+    end
+  end
+
+  describe "#create" do
+    context "when logged in as an admin" do
+      before { sign_in(admin) }
+
+      it "creates a form template" do
+        expect {
+          post "/admin/customize/form-templates.json",
+               params: {
+                 name: "Bug Reports",
+                 template:
+                   "- type: input\n  attributes:\n    label: Website or apps\n    description: |\n      Which website or app were you using when the bug happened?\n    placeholder: |\n      e.g. website URL, name of the app\n    validations:\n      required: true",
+               }
+
+          expect(response.status).to eq(200)
+        }.to change(FormTemplate, :count).by(1)
+      end
+    end
+
+    context "when logged in as a non-admin user" do
+      before { sign_in(user) }
+
+      it "prevents creation with a 404 response" do
+        expect do
+          post "/admin/customize/form-templates.json",
+               params: {
+                 name: "Feature Requests",
+                 template:
+                   " type: checkbox\n  choices:\n    - \"Option 1\"\n    - \"Option 2\"\n    - \"Option 3\"\n  attributes:\n    label: \"Enter question here\"\n    description: \"Enter description here\"\n    validations:\n      required: true\n- type: input\n  attributes:\n    label: \"Enter input label here\"\n    description: \"Enter input description here\"\n    placeholder: \"Enter input placeholder here\"\n    validations:\n      required: true",
+               }
+        end.not_to change { FormTemplate.count }
+
+        expect(response.status).to eq(404)
+        expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
+      end
+    end
+  end
+
+  describe "#update" do
+    fab!(:form_template) { Fabricate(:form_template) }
+
+    context "when logged in as an admin" do
+      before { sign_in(admin) }
+
+      it "updates a form template" do
+        put "/admin/customize/form-templates/#{form_template.id}.json",
+            params: {
+              id: form_template.id,
+              name: "Updated Template",
+              template: "- type: checkbox",
+            }
+
+        expect(response.status).to eq(200)
+        form_template.reload
+        expect(form_template.name).to eq("Updated Template")
+        expect(form_template.template).to eq("- type: checkbox")
+      end
+    end
+
+    context "when logged in as a non-admin user" do
+      before { sign_in(user) }
+
+      it "prevents update with a 404 response" do
+        form_template.reload
+        original_name = form_template.name
+
+        put "/admin/customize/form-templates/#{form_template.id}.json",
+            params: {
+              name: "Updated Template",
+              template: "New yaml: true",
+            }
+
+        expect(response.status).to eq(404)
+        expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
+
+        form_template.reload
+        expect(form_template.name).to eq(original_name)
+      end
+    end
+  end
+
+  describe "#destroy" do
+    fab!(:form_template) { Fabricate(:form_template) }
+
+    context "when logged in as an admin" do
+      before { sign_in(admin) }
+
+      it "deletes a form template" do
+        expect {
+          delete "/admin/customize/form-templates/#{form_template.id}.json"
+          expect(response.status).to eq(200)
+        }.to change(FormTemplate, :count).by(-1)
+      end
+    end
+
+    context "when logged in as a non-admin user" do
+      before { sign_in(user) }
+      it "prevents deletion with a 404 response" do
+        expect do
+          delete "/admin/customize/form-templates/#{form_template.id}.json"
+        end.not_to change { FormTemplate.count }
+
+        expect(response.status).to eq(404)
+        expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
+      end
+    end
+  end
+end
diff --git a/spec/requests/admin/groups_controller_spec.rb b/spec/requests/admin/groups_controller_spec.rb
index c09142449e2..f36ec50a38c 100644
--- a/spec/requests/admin/groups_controller_spec.rb
+++ b/spec/requests/admin/groups_controller_spec.rb
@@ -76,7 +76,7 @@ RSpec.describe Admin::GroupsController do
       context "with Group.plugin_permitted_params" do
         after { DiscoursePluginRegistry.reset! }
 
-        it "filter unpermitted params" do
+        it "filter non-permitted params" do
           params = group_params
           params[:group].merge!(allow_unknown_sender_topic_replies: true)
 
@@ -146,157 +146,6 @@ RSpec.describe Admin::GroupsController do
     end
   end
 
-  describe "#add_owners" do
-    context "when logged in as an admin" do
-      before { sign_in(admin) }
-
-      it "should work" do
-        put "/admin/groups/#{group.id}/owners.json",
-            params: {
-              group: {
-                usernames: [user.username, admin.username].join(","),
-              },
-            }
-
-        expect(response.status).to eq(200)
-
-        response_body = response.parsed_body
-
-        expect(response_body["usernames"]).to contain_exactly(user.username, admin.username)
-
-        expect(group.group_users.where(owner: true).map(&:user)).to contain_exactly(user, admin)
-      end
-
-      it "returns not-found error when there is no group" do
-        group.destroy!
-
-        put "/admin/groups/#{group.id}/owners.json", params: { group: { usernames: user.username } }
-
-        expect(response.status).to eq(404)
-      end
-
-      it "does not allow adding owners to an automatic group" do
-        group.update!(automatic: true)
-
-        expect do
-          put "/admin/groups/#{group.id}/owners.json",
-              params: {
-                group: {
-                  usernames: user.username,
-                },
-              }
-        end.to_not change { group.group_users.count }
-
-        expect(response.status).to eq(422)
-        expect(response.parsed_body["errors"]).to eq(["You cannot modify an automatic group"])
-      end
-
-      it "does not notify users when the param is not present" do
-        put "/admin/groups/#{group.id}/owners.json", params: { group: { usernames: user.username } }
-        expect(response.status).to eq(200)
-
-        topic =
-          Topic.find_by(
-            title:
-              I18n.t(
-                "system_messages.user_added_to_group_as_owner.subject_template",
-                group_name: group.name,
-              ),
-            archetype: "private_message",
-          )
-        expect(topic.nil?).to eq(true)
-      end
-
-      it "notifies users when the param is present" do
-        put "/admin/groups/#{group.id}/owners.json",
-            params: {
-              group: {
-                usernames: user.username,
-                notify_users: true,
-              },
-            }
-        expect(response.status).to eq(200)
-
-        topic =
-          Topic.find_by(
-            title:
-              I18n.t(
-                "system_messages.user_added_to_group_as_owner.subject_template",
-                group_name: group.name,
-              ),
-            archetype: "private_message",
-          )
-        expect(topic.nil?).to eq(false)
-        expect(topic.topic_users.map(&:user_id)).to include(-1, user.id)
-      end
-    end
-
-    context "when logged in as a moderator" do
-      before { sign_in(moderator) }
-
-      context "with moderators_manage_categories_and_groups enabled" do
-        before { SiteSetting.moderators_manage_categories_and_groups = true }
-
-        it "adds owners" do
-          put "/admin/groups/#{group.id}/owners.json",
-              params: {
-                group: {
-                  usernames: [user.username, admin.username, moderator.username].join(","),
-                },
-              }
-
-          response_body = response.parsed_body
-
-          expect(response.status).to eq(200)
-          expect(response_body["usernames"]).to contain_exactly(
-            user.username,
-            admin.username,
-            moderator.username,
-          )
-          expect(group.group_users.where(owner: true).map(&:user)).to contain_exactly(
-            user,
-            admin,
-            moderator,
-          )
-        end
-      end
-
-      context "with moderators_manage_categories_and_groups disabled" do
-        before { SiteSetting.moderators_manage_categories_and_groups = false }
-
-        it "prevents adding of owners with a 403 response" do
-          put "/admin/groups/#{group.id}/owners.json",
-              params: {
-                group: {
-                  usernames: [user.username, admin.username, moderator.username].join(","),
-                },
-              }
-
-          expect(response.status).to eq(403)
-          expect(response.parsed_body["errors"]).to include(I18n.t("invalid_access"))
-          expect(group.group_users.where(owner: true).map(&:user)).to be_empty
-        end
-      end
-    end
-
-    context "when logged in as a non-staff user" do
-      before { sign_in(user) }
-
-      it "prevents adding of owners with a 404 response" do
-        put "/admin/groups/#{group.id}/owners.json",
-            params: {
-              group: {
-                usernames: [user.username, admin.username].join(","),
-              },
-            }
-
-        expect(response.status).to eq(404)
-        expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
-        expect(group.group_users.where(owner: true).map(&:user)).to be_empty
-      end
-    end
-  end
-
   describe "#remove_owner" do
     let(:user2) { Fabricate(:user) }
     let(:user3) { Fabricate(:user) }
@@ -599,7 +448,7 @@ RSpec.describe Admin::GroupsController do
         expect(response.parsed_body["user_count"]).to eq(2)
       end
 
-      it "doesn't responde with 500 if domain is invalid" do
+      it "doesn't respond with 500 if domain is invalid" do
         group = Fabricate(:group)
 
         put "/admin/groups/automatic_membership_count.json",
diff --git a/spec/requests/admin/site_settings_controller_spec.rb b/spec/requests/admin/site_settings_controller_spec.rb
index 1aabf0deeb0..e0f0a77ea7a 100644
--- a/spec/requests/admin/site_settings_controller_spec.rb
+++ b/spec/requests/admin/site_settings_controller_spec.rb
@@ -48,12 +48,6 @@ RSpec.describe Admin::SiteSettingsController do
     fab!(:staged_user) { Fabricate(:staged) }
     let(:tracking) { NotificationLevels.all[:tracking] }
 
-    before do
-      SiteSetting.setting(:test_setting, "default")
-      SiteSetting.setting(:test_upload, "", type: :upload)
-      SiteSetting.refresh!
-    end
-
     context "when logged in as an admin" do
       before { sign_in(admin) }
 
@@ -75,8 +69,6 @@ RSpec.describe Admin::SiteSettingsController do
             }
 
         expect(response.parsed_body["user_count"]).to eq(User.real.where(staged: false).count - 1)
-
-        SiteSetting.setting(:default_categories_watching, "")
       end
 
       it "should return correct user count for default tags change" do
@@ -97,29 +89,27 @@ RSpec.describe Admin::SiteSettingsController do
             }
 
         expect(response.parsed_body["user_count"]).to eq(User.real.where(staged: false).count - 1)
-
-        SiteSetting.setting(:default_tags_watching, "")
       end
 
       context "for sidebar defaults" do
-        it "returns the right count for the default_sidebar_categories site setting" do
+        it "returns the right count for the default_navigation_menu_categories site setting" do
           category = Fabricate(:category)
 
-          put "/admin/site_settings/default_sidebar_categories/user_count.json",
+          put "/admin/site_settings/default_navigation_menu_categories/user_count.json",
               params: {
-                default_sidebar_categories: "#{category.id}",
+                default_navigation_menu_categories: "#{category.id}",
               }
 
           expect(response.status).to eq(200)
           expect(response.parsed_body["user_count"]).to eq(User.real.not_staged.count)
         end
 
-        it "returns the right count for the default_sidebar_tags site setting" do
+        it "returns the right count for the default_navigation_menu_tags site setting" do
           tag = Fabricate(:tag)
 
-          put "/admin/site_settings/default_sidebar_tags/user_count.json",
+          put "/admin/site_settings/default_navigation_menu_tags/user_count.json",
               params: {
-                default_sidebar_tags: "#{tag.name}",
+                default_navigation_menu_tags: "#{tag.name}",
               }
 
           expect(response.status).to eq(200)
@@ -228,19 +218,13 @@ RSpec.describe Admin::SiteSettingsController do
   end
 
   describe "#update" do
-    before do
-      SiteSetting.setting(:test_setting, "default")
-      SiteSetting.setting(:test_upload, "", type: :upload)
-      SiteSetting.refresh!
-    end
-
     context "when logged in as an admin" do
       before { sign_in(admin) }
 
       it "sets the value when the param is present" do
-        put "/admin/site_settings/test_setting.json", params: { test_setting: "hello" }
+        put "/admin/site_settings/title.json", params: { title: "hello" }
         expect(response.status).to eq(200)
-        expect(SiteSetting.test_setting).to eq("hello")
+        expect(SiteSetting.title).to eq("hello")
       end
 
       it "works for deprecated settings" do
@@ -280,9 +264,9 @@ RSpec.describe Admin::SiteSettingsController do
       end
 
       it "allows value to be a blank string" do
-        put "/admin/site_settings/test_setting.json", params: { test_setting: "" }
+        put "/admin/site_settings/title.json", params: { title: "" }
         expect(response.status).to eq(200)
-        expect(SiteSetting.test_setting).to eq("")
+        expect(SiteSetting.title).to eq("")
       end
 
       context "with default user options" do
@@ -335,32 +319,32 @@ RSpec.describe Admin::SiteSettingsController do
         end
       end
 
-      context "when updating default sidebar categories and tags" do
+      context "when updating default navigation menu categories and tags" do
         it "does not enqueue the backfilling job if update_existing_user param is not present" do
           expect_not_enqueued_with(job: :backfill_sidebar_site_settings) do
-            put "/admin/site_settings/default_sidebar_categories.json",
+            put "/admin/site_settings/default_navigation_menu_categories.json",
                 params: {
-                  default_sidebar_categories: "1|2",
+                  default_navigation_menu_categories: "1|2",
                 }
 
             expect(response.status).to eq(200)
           end
         end
 
-        it "enqueus the backfilling job if update_existing_user param is present when updating default sidebar tags" do
-          SiteSetting.default_sidebar_tags = "tag3"
+        it "enqueues the backfilling job if update_existing_user param is present when updating default navigation menu tags" do
+          SiteSetting.default_navigation_menu_tags = "tag3"
 
           expect_enqueued_with(
             job: :backfill_sidebar_site_settings,
             args: {
-              setting_name: "default_sidebar_tags",
+              setting_name: "default_navigation_menu_tags",
               new_value: "tag1|tag2",
               previous_value: "tag3",
             },
           ) do
-            put "/admin/site_settings/default_sidebar_tags.json",
+            put "/admin/site_settings/default_navigation_menu_tags.json",
                 params: {
-                  default_sidebar_tags: "tag1|tag2",
+                  default_navigation_menu_tags: "tag1|tag2",
                   update_existing_user: true,
                 }
 
@@ -368,20 +352,20 @@ RSpec.describe Admin::SiteSettingsController do
           end
         end
 
-        it "enqueus the backfilling job if update_existing_user param is present when updating default sidebar categories" do
-          SiteSetting.default_sidebar_categories = "3|4"
+        it "enqueues the backfilling job if update_existing_user param is present when updating default navigation_menu categories" do
+          SiteSetting.default_navigation_menu_categories = "3|4"
 
           expect_enqueued_with(
             job: :backfill_sidebar_site_settings,
             args: {
-              setting_name: "default_sidebar_categories",
+              setting_name: "default_navigation_menu_categories",
               new_value: "1|2",
               previous_value: "3|4",
             },
           ) do
-            put "/admin/site_settings/default_sidebar_categories.json",
+            put "/admin/site_settings/default_navigation_menu_categories.json",
                 params: {
-                  default_sidebar_categories: "1|2",
+                  default_navigation_menu_categories: "1|2",
                   update_existing_user: true,
                 }
 
@@ -400,7 +384,8 @@ RSpec.describe Admin::SiteSettingsController do
         let(:category_ids) { 3.times.collect { Fabricate(:category).id } }
 
         before do
-          SiteSetting.setting(:default_categories_watching, category_ids.first(2).join("|"))
+          SiteSetting.default_categories_watching = category_ids.first(2).join("|")
+
           CategoryUser.create!(
             category_id: category_ids.last,
             notification_level: tracking,
@@ -408,8 +393,6 @@ RSpec.describe Admin::SiteSettingsController do
           )
         end
 
-        after { SiteSetting.setting(:default_categories_watching, "") }
-
         it "should update existing users user preference" do
           put "/admin/site_settings/default_categories_watching.json",
               params: {
@@ -515,12 +498,10 @@ RSpec.describe Admin::SiteSettingsController do
         let(:tags) { 3.times.collect { Fabricate(:tag) } }
 
         before do
-          SiteSetting.setting(:default_tags_watching, tags.first(2).pluck(:name).join("|"))
+          SiteSetting.default_tags_watching = tags.first(2).pluck(:name).join("|")
           TagUser.create!(tag_id: tags.last.id, notification_level: tracking, user: user2)
         end
 
-        after { SiteSetting.setting(:default_tags_watching, "") }
-
         it "should update existing users user preference" do
           put "/admin/site_settings/default_tags_watching.json",
               params: {
@@ -550,31 +531,40 @@ RSpec.describe Admin::SiteSettingsController do
 
       context "with upload site settings" do
         it "can remove the site setting" do
-          SiteSetting.test_upload = Fabricate(:upload)
+          SiteSetting.push_notifications_icon = Fabricate(:upload)
 
-          put "/admin/site_settings/test_upload.json", params: { test_upload: nil }
+          put "/admin/site_settings/push_notifications_icon.json",
+              params: {
+                push_notifications_icon: nil,
+              }
 
           expect(response.status).to eq(200)
-          expect(SiteSetting.test_upload).to eq(nil)
+          expect(SiteSetting.push_notifications_icon).to eq(nil)
         end
 
         it "can reset the site setting to the default" do
-          SiteSetting.test_upload = nil
+          SiteSetting.push_notifications_icon = nil
           default_upload = Upload.find(-1)
 
-          put "/admin/site_settings/test_upload.json", params: { test_upload: default_upload.url }
+          put "/admin/site_settings/push_notifications_icon.json",
+              params: {
+                push_notifications_icon: default_upload.url,
+              }
 
           expect(response.status).to eq(200)
-          expect(SiteSetting.test_upload).to eq(default_upload)
+          expect(SiteSetting.push_notifications_icon).to eq(default_upload)
         end
 
         it "can update the site setting" do
           upload = Fabricate(:upload)
 
-          put "/admin/site_settings/test_upload.json", params: { test_upload: upload.url }
+          put "/admin/site_settings/push_notifications_icon.json",
+              params: {
+                push_notifications_icon: upload.url,
+              }
 
           expect(response.status).to eq(200)
-          expect(SiteSetting.test_upload).to eq(upload)
+          expect(SiteSetting.push_notifications_icon).to eq(upload)
 
           user_history = UserHistory.last
 
@@ -586,28 +576,47 @@ RSpec.describe Admin::SiteSettingsController do
       end
 
       it "logs the change" do
-        SiteSetting.test_setting = "previous"
+        SiteSetting.title = "previous"
 
-        expect do
-          put "/admin/site_settings/test_setting.json", params: { test_setting: "hello" }
-        end.to change {
+        expect do put "/admin/site_settings/title.json", params: { title: "hello" } end.to change {
           UserHistory.where(action: UserHistory.actions[:change_site_setting]).count
         }.by(1)
 
         expect(response.status).to eq(200)
-        expect(SiteSetting.test_setting).to eq("hello")
+        expect(SiteSetting.title).to eq("hello")
       end
 
       it "does not allow changing of hidden settings" do
-        SiteSetting.setting(:hidden_setting, "hidden", hidden: true)
-        SiteSetting.refresh!
+        SiteSetting.max_category_nesting = 3
 
-        put "/admin/site_settings/hidden_setting.json", params: { hidden_setting: "not allowed" }
+        put "/admin/site_settings/max_category_nesting.json", params: { max_category_nesting: 2 }
 
-        expect(SiteSetting.hidden_setting).to eq("hidden")
+        expect(SiteSetting.max_category_nesting).to eq(3)
         expect(response.status).to eq(422)
       end
 
+      context "with an plugin" do
+        it "allows changing settings of configurable plugins" do
+          SiteSetting::SAMPLE_TEST_PLUGIN.stubs(:configurable?).returns(true)
+
+          expect(SiteSetting.plugin_setting).to eq("some value")
+
+          put "/admin/site_settings/plugin_setting.json", params: { plugin_setting: "new value" }
+
+          expect(SiteSetting.plugin_setting).to eq("new value")
+          expect(response.status).to eq(200)
+        end
+
+        it "does not allow changing of non-configurable settings" do
+          SiteSetting::SAMPLE_TEST_PLUGIN.stubs(:configurable?).returns(false)
+
+          put "/admin/site_settings/plugin_setting.json", params: { plugin_setting: "not allowed" }
+
+          expect(SiteSetting.plugin_setting).to eq("some value")
+          expect(response.status).to eq(422)
+        end
+      end
+
       it "fails when a setting does not exist" do
         put "/admin/site_settings/provider.json", params: { provider: "gotcha" }
         expect(response.status).to eq(422)
diff --git a/spec/requests/admin/site_texts_controller_spec.rb b/spec/requests/admin/site_texts_controller_spec.rb
index 0bdace38ede..c9336bf827d 100644
--- a/spec/requests/admin/site_texts_controller_spec.rb
+++ b/spec/requests/admin/site_texts_controller_spec.rb
@@ -213,11 +213,24 @@ RSpec.describe Admin::SiteTextsController do
               expected_translations.map do |key, value|
                 overridden =
                   defined?(expected_overridden) ? expected_overridden[key] || false : false
+                interpolation_keys =
+                  (
+                    if defined?(expected_interpolation_keys)
+                      expected_interpolation_keys[key] || []
+                    else
+                      []
+                    end
+                  )
                 {
                   id: "colour.#{key}",
                   value: value,
+                  status: "up_to_date",
+                  old_default: nil,
+                  new_default: nil,
                   can_revert: overridden,
                   overridden: overridden,
+                  interpolation_keys: interpolation_keys,
+                  has_interpolation_keys: interpolation_keys.present?,
                 }
               end
 
@@ -228,6 +241,7 @@ RSpec.describe Admin::SiteTextsController do
         context "with English" do
           let(:locale) { :en }
           let(:expected_translations) { { one: "%{count} colour", other: "%{count} colours" } }
+          let(:expected_interpolation_keys) { { one: ["count"], other: ["count"] } }
 
           include_examples "finds correct plural keys"
         end
@@ -242,6 +256,9 @@ RSpec.describe Admin::SiteTextsController do
               other: "%{count} colours",
             }
           end
+          let(:expected_interpolation_keys) do
+            { one: ["count"], few: ["count"], many: ["count"], other: ["count"] }
+          end
 
           include_examples "finds correct plural keys"
         end
@@ -266,6 +283,9 @@ RSpec.describe Admin::SiteTextsController do
               other: "%{count} colours",
             }
           end
+          let(:expected_interpolation_keys) do
+            { one: ["count"], few: ["count"], many: ["count"], other: ["count"] }
+          end
 
           include_examples "finds correct plural keys"
         end
@@ -287,6 +307,9 @@ RSpec.describe Admin::SiteTextsController do
           let(:expected_translations) do
             { one: "ONE", few: "FEW", many: "%{count} цветов", other: "%{count} colours" }
           end
+          let(:expected_interpolation_keys) do
+            { one: ["count"], few: ["count"], many: ["count"], other: ["count"] }
+          end
           let(:expected_overridden) { { one: true, few: true } }
 
           include_examples "finds correct plural keys"
@@ -425,6 +448,27 @@ RSpec.describe Admin::SiteTextsController do
         expect(site_text["value"]).to eq("education.new-topic override")
       end
 
+      it "includes custom interpolation keys" do
+        TranslationOverride.upsert!(
+          :en,
+          "system_messages.welcome_user.title",
+          "system_messages.welcome_user.title override",
+        )
+
+        get "/admin/customize/site_texts/system_messages.welcome_user.title.json",
+            params: {
+              locale: "en_GB",
+            }
+        expect(response.status).to eq(200)
+        json = response.parsed_body
+
+        expect(json["site_text"]["interpolation_keys"]).to include(
+          "username",
+          "name",
+          "name_or_username",
+        )
+      end
+
       context "with plural keys" do
         before do
           I18n.backend.store_translations(
@@ -580,6 +624,7 @@ RSpec.describe Admin::SiteTextsController do
           I18n.t(
             "activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys",
             keys: "key, omg",
+            count: 2,
           ),
         )
       end
@@ -773,6 +818,70 @@ RSpec.describe Admin::SiteTextsController do
     end
   end
 
+  describe "#dismiss_outdated" do
+    before { sign_in(admin) }
+
+    context "when using a key which isn't overridden" do
+      it "returns a not found error" do
+        put "/admin/customize/site_texts/title/dismiss_outdated.json",
+            params: {
+              locale: default_locale,
+            }
+
+        expect(response.status).to eq(404)
+
+        json = response.parsed_body
+        expect(json["error_type"]).to eq("not_found")
+      end
+    end
+
+    context "when the override isn't outdated" do
+      before do
+        Fabricate(
+          :translation_override,
+          locale: default_locale,
+          translation_key: "title",
+          value: "My Forum",
+        )
+      end
+
+      it "returns an unprocessable entity error" do
+        put "/admin/customize/site_texts/title/dismiss_outdated.json",
+            params: {
+              locale: default_locale,
+            }
+
+        expect(response.status).to eq(422)
+
+        json = response.parsed_body
+        expect(json["failed"]).to eq("FAILED")
+        expect(json["message"]).to eq("Can only dismiss outdated translations")
+      end
+    end
+
+    context "when the override is outdated" do
+      before do
+        Fabricate(
+          :translation_override,
+          locale: default_locale,
+          translation_key: "title",
+          value: "My Forum",
+          status: "outdated",
+        )
+      end
+
+      it "returns success" do
+        put "/admin/customize/site_texts/title/dismiss_outdated.json",
+            params: {
+              locale: default_locale,
+            }
+
+        expect(response.status).to eq(200)
+        expect(response.parsed_body["success"]).to eq("OK")
+      end
+    end
+  end
+
   context "when reseeding" do
     before do
       staff_category = Fabricate(:category, name: "Staff EN", user: Discourse.system_user)
diff --git a/spec/requests/admin/staff_action_logs_controller_spec.rb b/spec/requests/admin/staff_action_logs_controller_spec.rb
index dddf9d30609..4724124869e 100644
--- a/spec/requests/admin/staff_action_logs_controller_spec.rb
+++ b/spec/requests/admin/staff_action_logs_controller_spec.rb
@@ -111,7 +111,8 @@ RSpec.describe Admin::StaffActionLogsController do
         theme.set_field(target: :mobile, name: :scss, value: "body {.up}")
         theme.set_field(target: :common, name: :scss, value: "omit-dupe")
 
-        original_json = ThemeSerializer.new(theme, root: false).to_json
+        original_json =
+          ThemeSerializer.new(theme, root: false, include_theme_field_values: true).to_json
 
         theme.set_field(target: :mobile, name: :scss, value: "body {.down}")
 
diff --git a/spec/requests/admin/themes_controller_spec.rb b/spec/requests/admin/themes_controller_spec.rb
index 5c494c2b395..75571da04f5 100644
--- a/spec/requests/admin/themes_controller_spec.rb
+++ b/spec/requests/admin/themes_controller_spec.rb
@@ -236,7 +236,7 @@ RSpec.describe Admin::ThemesController do
       end
 
       it "fails to import with a failing status" do
-        post "/admin/themes/import.json", params: { remote: "non-existant" }
+        post "/admin/themes/import.json", params: { remote: "non-existent" }
 
         expect(response.status).to eq(422)
       end
@@ -605,12 +605,7 @@ RSpec.describe Admin::ThemesController do
 
         json = response.parsed_body
 
-        fields = json["theme"]["theme_fields"].sort { |a, b| a["value"] <=> b["value"] }
-
-        expect(fields[0]["value"]).to eq("")
-        expect(fields[0]["upload_id"]).to eq(upload.id)
-        expect(fields[1]["value"]).to eq("body{color: blue;}")
-        expect(fields.length).to eq(2)
+        expect(json["theme"]["theme_fields"].length).to eq(2)
         expect(json["theme"]["child_themes"].length).to eq(1)
         expect(UserHistory.where(action: UserHistory.actions[:change_theme]).count).to eq(1)
       end
@@ -673,6 +668,42 @@ RSpec.describe Admin::ThemesController do
         expect(response.status).to eq(403)
       end
 
+      it "creates new theme fields" do
+        expect(theme.theme_fields.count).to eq(0)
+
+        put "/admin/themes/#{theme.id}.json",
+            params: {
+              theme: {
+                theme_fields: [{ name: "scss", target: "common", value: "test" }],
+              },
+            }
+
+        expect(response.status).to eq(200)
+        theme.reload
+        expect(theme.theme_fields.count).to eq(1)
+        theme_field = theme.theme_fields.first
+        expect(theme_field.name).to eq("scss")
+        expect(theme_field.target_id).to eq(Theme.targets[:common])
+        expect(theme_field.value).to eq("test")
+      end
+
+      it "doesn't create theme fields when they don't pass validation" do
+        expect(theme.theme_fields.count).to eq(0)
+
+        put "/admin/themes/#{theme.id}.json",
+            params: {
+              theme: {
+                theme_fields: [
+                  { name: "scss", target: "common", value: "Na " * 1024**2 + "Batman!" },
+                ],
+              },
+            }
+
+        expect(response.status).to eq(422)
+        json = JSON.parse(response.body)
+        expect(json["errors"].first).to include("Value is too long")
+      end
+
       it "allows zip-imported theme fields to be locally edited" do
         r = RemoteTheme.create!(remote_url: "")
         theme.update!(remote_theme_id: r.id)
diff --git a/spec/requests/admin/users_controller_spec.rb b/spec/requests/admin/users_controller_spec.rb
index 87866be1010..6ccabc56a18 100644
--- a/spec/requests/admin/users_controller_spec.rb
+++ b/spec/requests/admin/users_controller_spec.rb
@@ -302,7 +302,7 @@ RSpec.describe Admin::UsersController do
             "user.already_suspended",
             staff: admin.username,
             time_ago:
-              FreedomPatches::Rails4.time_ago_in_words(
+              AgeWords.time_ago_in_words(
                 user.suspend_record.created_at,
                 true,
                 scope: :"datetime.distance_in_words_verbose",
@@ -1430,7 +1430,7 @@ RSpec.describe Admin::UsersController do
     end
 
     shared_examples "user log out not allowed" do
-      it "prevents loging out of user with a 404 response" do
+      it "prevents logging out of user with a 404 response" do
         post "/admin/users/#{reg_user.id}/log_out.json"
 
         expect(response.status).to eq(404)
@@ -1539,7 +1539,7 @@ RSpec.describe Admin::UsersController do
             "user.already_silenced",
             staff: admin.username,
             time_ago:
-              FreedomPatches::Rails4.time_ago_in_words(
+              AgeWords.time_ago_in_words(
                 user.silenced_record.created_at,
                 true,
                 scope: :"datetime.distance_in_words_verbose",
@@ -2265,4 +2265,31 @@ RSpec.describe Admin::UsersController do
       end
     end
   end
+
+  describe "#reset_bounce_score" do
+    before { user.user_stat.update!(bounce_score: 10) }
+
+    context "when logged in as a moderator" do
+      before { sign_in(moderator) }
+
+      it "will reset the bounce score" do
+        post "/admin/users/#{user.id}/reset-bounce-score.json"
+
+        expect(response.status).to eq(200)
+        expect(user.reload.user_stat.bounce_score).to eq(0)
+        expect(UserHistory.last.action).to eq(UserHistory.actions[:reset_bounce_score])
+      end
+    end
+
+    context "when logged in as a non-staff user" do
+      before { sign_in(user) }
+
+      it "prevents resetting the bounce score with a 404 response" do
+        post "/admin/users/#{user.id}/reset-bounce-score.json"
+
+        expect(response.status).to eq(404)
+        expect(user.reload.user_stat.bounce_score).to eq(10)
+      end
+    end
+  end
 end
diff --git a/spec/requests/admin/watched_words_controller_spec.rb b/spec/requests/admin/watched_words_controller_spec.rb
index ef140bbdcf3..12677fbc655 100644
--- a/spec/requests/admin/watched_words_controller_spec.rb
+++ b/spec/requests/admin/watched_words_controller_spec.rb
@@ -6,6 +6,60 @@ RSpec.describe Admin::WatchedWordsController do
   fab!(:admin) { Fabricate(:admin) }
   fab!(:user) { Fabricate(:user) }
 
+  describe "#index" do
+    context "when logged in as non-staff user" do
+      before { sign_in(user) }
+
+      it "does not return watched words" do
+        get "/admin/customize/watched_words.json"
+
+        expect(response.status).to eq(404)
+      end
+    end
+
+    context "when logged in as a staff user" do
+      fab!(:word1) { Fabricate(:watched_word, action: WatchedWord.actions[:block]) }
+      fab!(:word2) { Fabricate(:watched_word, action: WatchedWord.actions[:block]) }
+      fab!(:word3) { Fabricate(:watched_word, action: WatchedWord.actions[:censor]) }
+      fab!(:word4) { Fabricate(:watched_word, action: WatchedWord.actions[:censor]) }
+
+      before { sign_in(admin) }
+
+      it "returns all watched words" do
+        get "/admin/customize/watched_words.json"
+
+        expect(response.status).to eq(200)
+
+        watched_words = response.parsed_body
+
+        expect(watched_words["actions"]).to match_array(WatchedWord.actions.keys.map(&:to_s))
+        expect(watched_words["words"].length).to eq(4)
+        expect(watched_words["words"]).to include(
+          hash_including(
+            "id" => word1.id,
+            "word" => word1.word,
+            "regexp" => WordWatcher.word_to_regexp(word1.word, engine: :js),
+            "case_sensitive" => false,
+            "action" => "block",
+          ),
+          hash_including(
+            "id" => word4.id,
+            "word" => word4.word,
+            "regexp" => WordWatcher.word_to_regexp(word4.word, engine: :js),
+            "case_sensitive" => false,
+            "action" => "censor",
+          ),
+        )
+        expect(watched_words["compiled_regular_expressions"]["block"].first).to eq(
+          WordWatcher
+            .serializable_word_matcher_regexp(:block, engine: :js)
+            .first
+            .deep_stringify_keys,
+        )
+      end
+    end
+  end
+
   describe "#destroy" do
     fab!(:watched_word) { Fabricate(:watched_word) }
 
diff --git a/spec/requests/api/invites_spec.rb b/spec/requests/api/invites_spec.rb
index e80013d8459..28442dbcb74 100644
--- a/spec/requests/api/invites_spec.rb
+++ b/spec/requests/api/invites_spec.rb
@@ -40,13 +40,17 @@ RSpec.describe "invites" do
                     topic_id: {
                       type: :integer,
                     },
-                    group_id: {
-                      type: :integer,
-                      description: "optional, either this or `group_names`",
+                    group_ids: {
+                      type: :string,
+                      description:
+                        "Optional, either this or `group_names`. Comma separated list for multiple ids.",
+                      example: "42,43",
                     },
                     group_names: {
                       type: :string,
-                      description: "optional, either this or `group_id`",
+                      description:
+                        "Optional, either this or `group_ids`. Comma separated list for multiple names.",
+                      example: "foo,bar",
                     },
                     expires_at: {
                       type: :string,
diff --git a/spec/requests/api/posts_spec.rb b/spec/requests/api/posts_spec.rb
index 0662571445e..399079c25c3 100644
--- a/spec/requests/api/posts_spec.rb
+++ b/spec/requests/api/posts_spec.rb
@@ -116,6 +116,9 @@ RSpec.describe "posts" do
                        flair_color: {
                          type: %i[string null],
                        },
+                       flair_group_id: {
+                         type: %i[string null],
+                       },
                        version: {
                          type: :integer,
                        },
@@ -128,6 +131,9 @@ RSpec.describe "posts" do
                        can_recover: {
                          type: :boolean,
                        },
+                       can_see_hidden_post: {
+                         type: :boolean,
+                       },
                        can_wiki: {
                          type: :boolean,
                        },
@@ -229,171 +235,31 @@ RSpec.describe "posts" do
     get "Retrieve a single post" do
       tags "Posts"
       operationId "getPost"
-      parameter name: "Api-Key", in: :header, type: :string, required: true
-      parameter name: "Api-Username", in: :header, type: :string, required: true
+      consumes "application/json"
+      description <<~TEXT
+      This endpoint can be used to get the number of likes on a post using the
+      `actions_summary` property in the response. `actions_summary` responses
+      with the id of `2` signify a `like`. If there are no `actions_summary`
+      items with the id of `2`, that means there are 0 likes. Other ids likely
+      refer to various different flag types.
+      TEXT
+
+      expected_request_schema = nil
       parameter name: :id, in: :path, schema: { type: :string }
 
       produces "application/json"
 
-      response "200", "latest posts" do
-        schema type: :object,
-               properties: {
-                 id: {
-                   type: :integer,
-                 },
-                 name: {
-                   type: %i[string null],
-                 },
-                 username: {
-                   type: :string,
-                 },
-                 avatar_template: {
-                   type: :string,
-                 },
-                 created_at: {
-                   type: :string,
-                 },
-                 cooked: {
-                   type: :string,
-                 },
-                 post_number: {
-                   type: :integer,
-                 },
-                 post_type: {
-                   type: :integer,
-                 },
-                 updated_at: {
-                   type: :string,
-                 },
-                 reply_count: {
-                   type: :integer,
-                 },
-                 reply_to_post_number: {
-                   type: %i[string null],
-                 },
-                 quote_count: {
-                   type: :integer,
-                 },
-                 incoming_link_count: {
-                   type: :integer,
-                 },
-                 reads: {
-                   type: :integer,
-                 },
-                 readers_count: {
-                   type: :integer,
-                 },
-                 score: {
-                   type: :integer,
-                 },
-                 yours: {
-                   type: :boolean,
-                 },
-                 topic_id: {
-                   type: :integer,
-                 },
-                 topic_slug: {
-                   type: :string,
-                 },
-                 display_username: {
-                   type: %i[string null],
-                 },
-                 primary_group_name: {
-                   type: %i[string null],
-                 },
-                 flair_name: {
-                   type: %i[string null],
-                 },
-                 flair_url: {
-                   type: %i[string null],
-                 },
-                 flair_bg_color: {
-                   type: %i[string null],
-                 },
-                 flair_color: {
-                   type: %i[string null],
-                 },
-                 version: {
-                   type: :integer,
-                 },
-                 can_edit: {
-                   type: :boolean,
-                 },
-                 can_delete: {
-                   type: :boolean,
-                 },
-                 can_recover: {
-                   type: :boolean,
-                 },
-                 can_wiki: {
-                   type: :boolean,
-                 },
-                 user_title: {
-                   type: %i[string null],
-                 },
-                 raw: {
-                   type: :string,
-                 },
-                 actions_summary: {
-                   type: :array,
-                   items: {
-                     type: :object,
-                     properties: {
-                       id: {
-                         type: :integer,
-                       },
-                       can_act: {
-                         type: :boolean,
-                       },
-                     },
-                   },
-                 },
-                 moderator: {
-                   type: :boolean,
-                 },
-                 admin: {
-                   type: :boolean,
-                 },
-                 staff: {
-                   type: :boolean,
-                 },
-                 user_id: {
-                   type: :integer,
-                 },
-                 hidden: {
-                   type: :boolean,
-                 },
-                 trust_level: {
-                   type: :integer,
-                 },
-                 deleted_at: {
-                   type: %i[string null],
-                 },
-                 user_deleted: {
-                   type: :boolean,
-                 },
-                 edit_reason: {
-                   type: %i[string null],
-                 },
-                 can_view_edit_history: {
-                   type: :boolean,
-                 },
-                 wiki: {
-                   type: :boolean,
-                 },
-                 reviewable_id: {
-                   type: %i[string null],
-                 },
-                 reviewable_score_count: {
-                   type: :integer,
-                 },
-                 reviewable_score_pending_count: {
-                   type: :integer,
-                 },
-               }
+      response "200", "single post" do
+        expected_response_schema = load_spec_schema("post_show_response")
+        schema expected_response_schema
 
         let(:id) { Fabricate(:post).id }
         run_test!
+
+        it_behaves_like "a JSON endpoint", 200 do
+          let(:expected_response_schema) { expected_response_schema }
+          let(:expected_request_schema) { expected_request_schema }
+        end
       end
     end
 
@@ -401,191 +267,18 @@ RSpec.describe "posts" do
       tags "Posts"
       operationId "updatePost"
       consumes "application/json"
-      parameter name: "Api-Key", in: :header, type: :string, required: true
-      parameter name: "Api-Username", in: :header, type: :string, required: true
+      expected_request_schema = load_spec_schema("post_update_request")
       parameter name: :id, in: :path, schema: { type: :string }
-
-      parameter name: :post_body,
-                in: :body,
-                schema: {
-                  type: :object,
-                  properties: {
-                    post: {
-                      type: :object,
-                      properties: {
-                        raw: {
-                          type: :string,
-                        },
-                        edit_reason: {
-                          type: :string,
-                        },
-                      },
-                      required: ["raw"],
-                    },
-                  },
-                }
+      parameter name: :params, in: :body, schema: expected_request_schema
 
       produces "application/json"
       response "200", "post updated" do
-        schema type: :object,
-               properties: {
-                 post: {
-                   type: :object,
-                   properties: {
-                     id: {
-                       type: :integer,
-                     },
-                     name: {
-                       type: %i[string null],
-                     },
-                     username: {
-                       type: :string,
-                     },
-                     avatar_template: {
-                       type: :string,
-                     },
-                     created_at: {
-                       type: :string,
-                     },
-                     cooked: {
-                       type: :string,
-                     },
-                     post_number: {
-                       type: :integer,
-                     },
-                     post_type: {
-                       type: :integer,
-                     },
-                     updated_at: {
-                       type: :string,
-                     },
-                     reply_count: {
-                       type: :integer,
-                     },
-                     reply_to_post_number: {
-                       type: %i[string null],
-                     },
-                     quote_count: {
-                       type: :integer,
-                     },
-                     incoming_link_count: {
-                       type: :integer,
-                     },
-                     reads: {
-                       type: :integer,
-                     },
-                     readers_count: {
-                       type: :integer,
-                     },
-                     score: {
-                       type: :number,
-                     },
-                     yours: {
-                       type: :boolean,
-                     },
-                     topic_id: {
-                       type: :integer,
-                     },
-                     topic_slug: {
-                       type: :string,
-                     },
-                     display_username: {
-                       type: %i[string null],
-                     },
-                     primary_group_name: {
-                       type: %i[string null],
-                     },
-                     flair_url: {
-                       type: %i[string null],
-                     },
-                     flair_bg_color: {
-                       type: %i[string null],
-                     },
-                     flair_color: {
-                       type: %i[string null],
-                     },
-                     version: {
-                       type: :integer,
-                     },
-                     can_edit: {
-                       type: :boolean,
-                     },
-                     can_delete: {
-                       type: :boolean,
-                     },
-                     can_recover: {
-                       type: :boolean,
-                     },
-                     can_wiki: {
-                       type: :boolean,
-                     },
-                     user_title: {
-                       type: %i[string null],
-                     },
-                     actions_summary: {
-                       type: :array,
-                       items: {
-                         type: :object,
-                         properties: {
-                           id: {
-                             type: :integer,
-                           },
-                           can_act: {
-                             type: :boolean,
-                           },
-                         },
-                       },
-                     },
-                     moderator: {
-                       type: :boolean,
-                     },
-                     admin: {
-                       type: :boolean,
-                     },
-                     staff: {
-                       type: :boolean,
-                     },
-                     user_id: {
-                       type: :integer,
-                     },
-                     draft_sequence: {
-                       type: :integer,
-                     },
-                     hidden: {
-                       type: :boolean,
-                     },
-                     trust_level: {
-                       type: :integer,
-                     },
-                     deleted_at: {
-                       type: %i[string null],
-                     },
-                     user_deleted: {
-                       type: :boolean,
-                     },
-                     edit_reason: {
-                       type: %i[string null],
-                     },
-                     can_view_edit_history: {
-                       type: :boolean,
-                     },
-                     wiki: {
-                       type: :boolean,
-                     },
-                     reviewable_id: {
-                       type: %i[string null],
-                     },
-                     reviewable_score_count: {
-                       type: :integer,
-                     },
-                     reviewable_score_pending_count: {
-                       type: :integer,
-                     },
-                   },
-                 },
-               }
+        expected_response_schema = load_spec_schema("post_update_response")
+        schema expected_response_schema
 
-        let(:post_body) { { post: { raw: "Updated content!", edit_reason: "fixed typo" } } }
+        let(:params) do
+          { "post" => { "raw" => "Updated content!", "edit_reason" => "fixed typo" } }
+        end
         let(:id) { Fabricate(:post).id }
 
         run_test! do |response|
@@ -593,6 +286,11 @@ RSpec.describe "posts" do
           expect(data["post"]["cooked"]).to eq("<p>Updated content!</p>")
           expect(data["post"]["edit_reason"]).to eq("fixed typo")
         end
+
+        it_behaves_like "a JSON endpoint", 200 do
+          let(:expected_response_schema) { expected_response_schema }
+          let(:expected_request_schema) { expected_request_schema }
+        end
       end
     end
 
diff --git a/spec/requests/api/schemas/json/admin_user_response.json b/spec/requests/api/schemas/json/admin_user_response.json
index 9cd73458205..49bfee28274 100644
--- a/spec/requests/api/schemas/json/admin_user_response.json
+++ b/spec/requests/api/schemas/json/admin_user_response.json
@@ -413,6 +413,9 @@
             "flair_color": {
               "type": ["string", "null"]
             },
+            "flair_group_id": {
+              "type": ["string", "null"]
+            },
             "bio_raw": {
               "type": ["string", "null"]
             },
diff --git a/spec/requests/api/schemas/json/category_create_request.json b/spec/requests/api/schemas/json/category_create_request.json
index df67bba74a3..f71b292dc12 100644
--- a/spec/requests/api/schemas/json/category_create_request.json
+++ b/spec/requests/api/schemas/json/category_create_request.json
@@ -39,9 +39,13 @@
     },
     "search_priority": {
       "type": "integer"
+    },
+    "form_template_ids": {
+      "type": "array",
+      "items": {}
     }
   },
   "required": [
     "name"
   ]
-}
+}
\ No newline at end of file
diff --git a/spec/requests/api/schemas/json/category_create_response.json b/spec/requests/api/schemas/json/category_create_response.json
index e13c1642f6a..bc2da289014 100644
--- a/spec/requests/api/schemas/json/category_create_response.json
+++ b/spec/requests/api/schemas/json/category_create_response.json
@@ -74,6 +74,10 @@
             "null"
           ]
         },
+        "form_template_ids": {
+          "type": "array",
+          "items": {}
+        },
         "has_children": {
           "type": [
             "string",
@@ -156,6 +160,12 @@
               ]
             }
         },
+        "category_setting": {
+          "auto_bump_cooldown_days": 1,
+          "num_auto_bump_daily": null,
+          "require_reply_approval": null,
+          "require_topic_approval": null
+        },
         "read_only_banner": {
           "type": [
             "string",
diff --git a/spec/requests/api/schemas/json/category_update_response.json b/spec/requests/api/schemas/json/category_update_response.json
index 402828ec080..9ed80aa85fd 100644
--- a/spec/requests/api/schemas/json/category_update_response.json
+++ b/spec/requests/api/schemas/json/category_update_response.json
@@ -77,6 +77,10 @@
             "null"
           ]
         },
+        "form_template_ids": {
+          "type": "array",
+          "items": {}
+        },
         "has_children": {
           "type": [
             "string",
@@ -159,6 +163,12 @@
               ]
             }
         },
+        "category_setting": {
+          "auto_bump_cooldown_days": 1,
+          "num_auto_bump_daily": null,
+          "require_reply_approval": null,
+          "require_topic_approval": null
+        },
         "read_only_banner": {
           "type": [
             "string",
@@ -273,6 +283,7 @@
         "notification_level",
         "can_edit",
         "topic_template",
+        "form_template_ids",
         "has_children",
         "sort_order",
         "sort_ascending",
diff --git a/spec/requests/api/schemas/json/group_create_response.json b/spec/requests/api/schemas/json/group_create_response.json
index 2d77910bbeb..6c50cb851b9 100644
--- a/spec/requests/api/schemas/json/group_create_response.json
+++ b/spec/requests/api/schemas/json/group_create_response.json
@@ -119,6 +119,9 @@
         "can_admin_group": {
           "type": "boolean"
         },
+        "can_edit_group": {
+          "type": "boolean"
+        },
         "publish_read_state": {
           "type": "boolean"
         }
diff --git a/spec/requests/api/schemas/json/group_response.json b/spec/requests/api/schemas/json/group_response.json
index a663ba0e1b4..9163e33f9dc 100644
--- a/spec/requests/api/schemas/json/group_response.json
+++ b/spec/requests/api/schemas/json/group_response.json
@@ -122,6 +122,9 @@
         "can_admin_group": {
           "type": "boolean"
         },
+        "can_edit_group": {
+          "type": "boolean"
+        },
         "publish_read_state": {
           "type": "boolean"
         },
diff --git a/spec/requests/api/schemas/json/groups_list_response.json b/spec/requests/api/schemas/json/groups_list_response.json
index cea82af0f2a..25fc1ac007b 100644
--- a/spec/requests/api/schemas/json/groups_list_response.json
+++ b/spec/requests/api/schemas/json/groups_list_response.json
@@ -131,6 +131,9 @@
             "can_admin_group": {
               "type": "boolean"
             },
+            "can_edit_group": {
+              "type": "boolean"
+            },
             "publish_read_state": {
               "type": "boolean"
             }
diff --git a/spec/requests/api/schemas/json/post_replies_response.json b/spec/requests/api/schemas/json/post_replies_response.json
index 25e17cea7ae..5e762e15891 100644
--- a/spec/requests/api/schemas/json/post_replies_response.json
+++ b/spec/requests/api/schemas/json/post_replies_response.json
@@ -101,6 +101,12 @@
           "null"
         ]
       },
+      "flair_group_id": {
+        "type": [
+          "string",
+          "null"
+        ]
+      },
       "version": {
         "type": "integer"
       },
@@ -113,6 +119,9 @@
       "can_recover": {
         "type": "boolean"
       },
+      "can_see_hidden_post": {
+        "type": "boolean"
+      },
       "can_wiki": {
         "type": "boolean"
       },
@@ -246,6 +255,7 @@
       "can_edit",
       "can_delete",
       "can_recover",
+      "can_see_hidden_post",
       "can_wiki",
       "user_title",
       "reply_to_user",
diff --git a/spec/requests/api/schemas/json/post_show_response.json b/spec/requests/api/schemas/json/post_show_response.json
new file mode 100644
index 00000000000..fa6f32bc495
--- /dev/null
+++ b/spec/requests/api/schemas/json/post_show_response.json
@@ -0,0 +1,271 @@
+{
+  "additionalProperties": true,
+  "properties": {
+    "id": {
+      "type": "integer"
+    },
+    "username": {
+      "type": "string"
+    },
+    "avatar_template": {
+      "type": "string"
+    },
+    "created_at": {
+      "type": "string"
+    },
+    "cooked": {
+      "type": "string"
+    },
+    "post_number": {
+      "type": "integer"
+    },
+    "post_type": {
+      "type": "integer"
+    },
+    "updated_at": {
+      "type": "string"
+    },
+    "reply_count": {
+      "type": "integer"
+    },
+    "reply_to_post_number": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "quote_count": {
+      "type": "integer"
+    },
+    "incoming_link_count": {
+      "type": "integer"
+    },
+    "reads": {
+      "type": "integer"
+    },
+    "readers_count": {
+      "type": "integer"
+    },
+    "score": {
+      "type": ""
+    },
+    "yours": {
+      "type": "boolean"
+    },
+    "topic_id": {
+      "type": "integer"
+    },
+    "topic_slug": {
+      "type": "string"
+    },
+    "primary_group_name": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "flair_name": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "flair_url": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "flair_bg_color": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "flair_color": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "flair_group_id": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "version": {
+      "type": "integer"
+    },
+    "can_edit": {
+      "type": "boolean"
+    },
+    "can_delete": {
+      "type": "boolean"
+    },
+    "can_recover": {
+      "type": "boolean"
+    },
+    "can_see_hidden_post": {
+      "type": "boolean"
+    },
+    "can_wiki": {
+      "type": "boolean"
+    },
+    "user_title": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "bookmarked": {
+      "type": "boolean"
+    },
+    "raw": {
+      "type": "string"
+    },
+    "actions_summary": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "id": {
+            "type": "integer",
+            "description": "`2`: like, `3`, `4`, `6`, `7`, `8`: flag"
+          },
+          "count": {
+            "type": "integer"
+          },
+          "acted": {
+            "type": "boolean"
+          },
+          "can_undo": {
+            "type": "boolean"
+          },
+          "can_act": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "id"
+        ]
+      }
+    },
+    "moderator": {
+      "type": "boolean"
+    },
+    "admin": {
+      "type": "boolean"
+    },
+    "staff": {
+      "type": "boolean"
+    },
+    "user_id": {
+      "type": "integer"
+    },
+    "hidden": {
+      "type": "boolean"
+    },
+    "trust_level": {
+      "type": "integer"
+    },
+    "deleted_at": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "user_deleted": {
+      "type": "boolean"
+    },
+    "edit_reason": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "can_view_edit_history": {
+      "type": "boolean"
+    },
+    "wiki": {
+      "type": "boolean"
+    },
+    "reviewable_id": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "reviewable_score_count": {
+      "type": "integer"
+    },
+    "reviewable_score_pending_count": {
+      "type": "integer"
+    },
+    "mentioned_users": {
+      "type": "array",
+      "items": {}
+    },
+    "name": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "display_username": {
+      "type": [
+        "string",
+        "null"
+      ]
+    }
+  },
+  "required": [
+    "id",
+    "username",
+    "avatar_template",
+    "created_at",
+    "cooked",
+    "post_number",
+    "post_type",
+    "updated_at",
+    "reply_count",
+    "reply_to_post_number",
+    "quote_count",
+    "incoming_link_count",
+    "reads",
+    "readers_count",
+    "score",
+    "yours",
+    "topic_id",
+    "topic_slug",
+    "primary_group_name",
+    "flair_name",
+    "flair_url",
+    "flair_bg_color",
+    "flair_color",
+    "version",
+    "can_edit",
+    "can_delete",
+    "can_recover",
+    "can_wiki",
+    "user_title",
+    "bookmarked",
+    "raw",
+    "actions_summary",
+    "moderator",
+    "admin",
+    "staff",
+    "user_id",
+    "hidden",
+    "trust_level",
+    "deleted_at",
+    "user_deleted",
+    "edit_reason",
+    "can_view_edit_history",
+    "wiki",
+    "reviewable_id",
+    "reviewable_score_count",
+    "reviewable_score_pending_count"
+  ]
+}
diff --git a/spec/requests/api/schemas/json/post_update_request.json b/spec/requests/api/schemas/json/post_update_request.json
new file mode 100644
index 00000000000..2bdc956c34e
--- /dev/null
+++ b/spec/requests/api/schemas/json/post_update_request.json
@@ -0,0 +1,18 @@
+{
+  "additionalProperties": false,
+  "properties": {
+    "post": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "raw": {
+          "type": "string"
+        },
+        "edit_reason": {
+          "type": "string"
+        }
+      },
+      "required": ["raw"]
+    }
+  }
+}
diff --git a/spec/requests/api/schemas/json/post_update_response.json b/spec/requests/api/schemas/json/post_update_response.json
new file mode 100644
index 00000000000..56a710290c7
--- /dev/null
+++ b/spec/requests/api/schemas/json/post_update_response.json
@@ -0,0 +1,275 @@
+{
+  "additionalProperties": false,
+  "properties": {
+    "post": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "id": {
+          "type": "integer"
+        },
+        "username": {
+          "type": "string"
+        },
+        "avatar_template": {
+          "type": "string"
+        },
+        "created_at": {
+          "type": "string"
+        },
+        "cooked": {
+          "type": "string"
+        },
+        "post_number": {
+          "type": "integer"
+        },
+        "post_type": {
+          "type": "integer"
+        },
+        "updated_at": {
+          "type": "string"
+        },
+        "reply_count": {
+          "type": "integer"
+        },
+        "reply_to_post_number": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "quote_count": {
+          "type": "integer"
+        },
+        "incoming_link_count": {
+          "type": "integer"
+        },
+        "reads": {
+          "type": "integer"
+        },
+        "readers_count": {
+          "type": "integer"
+        },
+        "score": {
+          "type": ""
+        },
+        "yours": {
+          "type": "boolean"
+        },
+        "topic_id": {
+          "type": "integer"
+        },
+        "topic_slug": {
+          "type": "string"
+        },
+        "primary_group_name": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "flair_name": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "flair_url": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "flair_bg_color": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "flair_color": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "flair_group_id": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "version": {
+          "type": "integer"
+        },
+        "can_edit": {
+          "type": "boolean"
+        },
+        "can_delete": {
+          "type": "boolean"
+        },
+        "can_recover": {
+          "type": "boolean"
+        },
+        "can_see_hidden_post": {
+          "type": "boolean"
+        },
+        "can_wiki": {
+          "type": "boolean"
+        },
+        "user_title": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "bookmarked": {
+          "type": "boolean"
+        },
+        "raw": {
+          "type": "string"
+        },
+        "actions_summary": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+              "id": {
+                "type": "integer"
+              },
+              "can_act": {
+                "type": "boolean"
+              }
+            },
+            "required": [
+              "id",
+              "can_act"
+            ]
+          }
+        },
+        "moderator": {
+          "type": "boolean"
+        },
+        "admin": {
+          "type": "boolean"
+        },
+        "staff": {
+          "type": "boolean"
+        },
+        "user_id": {
+          "type": "integer"
+        },
+        "draft_sequence": {
+          "type": "integer"
+        },
+        "hidden": {
+          "type": "boolean"
+        },
+        "trust_level": {
+          "type": "integer"
+        },
+        "deleted_at": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "user_deleted": {
+          "type": "boolean"
+        },
+        "edit_reason": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "can_view_edit_history": {
+          "type": "boolean"
+        },
+        "wiki": {
+          "type": "boolean"
+        },
+        "reviewable_id": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "reviewable_score_count": {
+          "type": "integer"
+        },
+        "reviewable_score_pending_count": {
+          "type": "integer"
+        },
+        "mentioned_users": {
+          "type": "array",
+          "items": {}
+        },
+        "name": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "display_username": {
+          "type": [
+            "string",
+            "null"
+          ]
+        }
+      },
+      "required": [
+        "id",
+        "username",
+        "avatar_template",
+        "created_at",
+        "cooked",
+        "post_number",
+        "post_type",
+        "updated_at",
+        "reply_count",
+        "reply_to_post_number",
+        "quote_count",
+        "incoming_link_count",
+        "reads",
+        "readers_count",
+        "score",
+        "yours",
+        "topic_id",
+        "topic_slug",
+        "primary_group_name",
+        "flair_name",
+        "flair_url",
+        "flair_bg_color",
+        "flair_color",
+        "version",
+        "can_edit",
+        "can_delete",
+        "can_recover",
+        "can_wiki",
+        "user_title",
+        "bookmarked",
+        "raw",
+        "actions_summary",
+        "moderator",
+        "admin",
+        "staff",
+        "user_id",
+        "draft_sequence",
+        "hidden",
+        "trust_level",
+        "deleted_at",
+        "user_deleted",
+        "edit_reason",
+        "can_view_edit_history",
+        "wiki",
+        "reviewable_id",
+        "reviewable_score_count",
+        "reviewable_score_pending_count"
+      ]
+    }
+  },
+  "required": [
+    "post"
+  ]
+}
diff --git a/spec/requests/api/schemas/json/site_response.json b/spec/requests/api/schemas/json/site_response.json
index 09d239f4322..29194ce1c97 100644
--- a/spec/requests/api/schemas/json/site_response.json
+++ b/spec/requests/api/schemas/json/site_response.json
@@ -41,6 +41,9 @@
         "new_features": {
           "type": "integer"
         },
+        "admin_problems": {
+          "type": "integer"
+        },
         "moved_post": {
           "type": "integer"
         },
@@ -127,6 +130,9 @@
         },
         "following_replied": {
           "type": "integer"
+        },
+        "circles_activity": {
+          "type": "integer"
         }
       },
       "required": [
@@ -217,6 +223,38 @@
         "leader"
       ]
     },
+    "user_tips": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "first_notification": {
+          "type": "integer"
+        },
+        "topic_timeline": {
+          "type": "integer"
+        },
+        "post_menu": {
+          "type": "integer"
+        },
+        "topic_notification_levels": {
+          "type": "integer"
+        },
+        "suggested_topics": {
+          "type": "integer"
+        },
+        "admin_guide": {
+          "type": "integer"
+        }
+      },
+      "required": [
+        "first_notification",
+        "topic_timeline",
+        "post_menu",
+        "topic_notification_levels",
+        "suggested_topics",
+        "admin_guide"
+      ]
+    },
     "groups": {
       "type": "array",
       "items":
@@ -490,7 +528,7 @@
       "type": "object"
     },
     "hashtag_icons" : {
-      "type": "array"
+      "type": "object"
     },
     "displayed_about_plugin_stat_groups" : {
       "type": "array"
@@ -675,6 +713,10 @@
             },
             "parent_category_id": {
               "type": "integer"
+            },
+            "form_template_ids": {
+              "type": "array",
+              "items": {}
             }
           },
           "required": [
@@ -714,9 +756,6 @@
           ]
         }
     },
-    "show_welcome_topic_banner": {
-      "type": "boolean"
-    },
     "archetypes": {
       "type": "array",
       "items":
@@ -758,6 +797,12 @@
     },
     "whispers_allowed_groups_names" : {
       "type": "array"
+    },
+    "denied_emojis" : {
+      "type": "array"
+    },
+    "navigation_menu_site_top_tags": {
+      "type": "array"
     }
   },
   "required": [
diff --git a/spec/requests/api/schemas/json/topic_create_request.json b/spec/requests/api/schemas/json/topic_create_request.json
index 710e1933b8d..f2451f5859e 100644
--- a/spec/requests/api/schemas/json/topic_create_request.json
+++ b/spec/requests/api/schemas/json/topic_create_request.json
@@ -34,6 +34,10 @@
     "created_at": {
       "type": "string"
     },
+    "reply_to_post_number": {
+      "type": "integer",
+      "description": "Optional, the post number to reply to inside a topic."
+    },
     "embed_url": {
       "type": "string",
       "description": "Provide a URL from a remote system to associate a forum topic with that URL, typically for using Discourse as a comments system for an external blog."
diff --git a/spec/requests/api/schemas/json/topic_create_response.json b/spec/requests/api/schemas/json/topic_create_response.json
index c933497183e..02038d367b9 100644
--- a/spec/requests/api/schemas/json/topic_create_response.json
+++ b/spec/requests/api/schemas/json/topic_create_response.json
@@ -103,6 +103,12 @@
         "null"
       ]
     },
+    "flair_group_id": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
     "version": {
       "type": "integer"
     },
@@ -115,6 +121,9 @@
     "can_recover": {
       "type": "boolean"
     },
+    "can_see_hidden_post": {
+      "type": "boolean"
+    },
     "can_wiki": {
       "type": "boolean"
     },
diff --git a/spec/requests/api/schemas/json/topic_show_response.json b/spec/requests/api/schemas/json/topic_show_response.json
index 22b0c46233f..11923b92fee 100644
--- a/spec/requests/api/schemas/json/topic_show_response.json
+++ b/spec/requests/api/schemas/json/topic_show_response.json
@@ -117,6 +117,9 @@
                 "can_recover": {
                   "type": "boolean"
                 },
+                "can_see_hidden_post": {
+                  "type": "boolean"
+                },
                 "can_wiki": {
                   "type": "boolean"
                 },
@@ -712,6 +715,9 @@
         "null"
       ]
     },
+    "summarizable": {
+      "type": "boolean"
+    },
     "details": {
       "type": "object",
       "additionalProperties": false,
@@ -828,6 +834,12 @@
                     "null"
                   ]
                 },
+                "flair_group_id": {
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                },
                 "admin": {
                   "type": "boolean"
                 },
@@ -976,6 +988,7 @@
     "show_read_indicator",
     "thumbnails",
     "slow_mode_enabled_until",
+    "summarizable",
     "details"
   ]
 }
diff --git a/spec/requests/api/schemas/json/user_get_response.json b/spec/requests/api/schemas/json/user_get_response.json
index a5e43be2be4..ed539d524f3 100644
--- a/spec/requests/api/schemas/json/user_get_response.json
+++ b/spec/requests/api/schemas/json/user_get_response.json
@@ -771,8 +771,14 @@
             "oldest_search_log_date": {
               "type": ["string", "null"]
             },
-            "sidebar_list_destination": {
-              "type": "string"
+            "sidebar_link_to_filtered_list": {
+              "type": "boolean"
+            },
+            "sidebar_show_count_of_new_items": {
+              "type": "boolean"
+            },
+            "watched_precedence_over_muted": {
+              "type": ["boolean", "null"]
             },
             "seen_popups": {
               "type": ["array", "null"]
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb
index d311267db41..b29a63afb0b 100644
--- a/spec/requests/api/users_spec.rb
+++ b/spec/requests/api/users_spec.rb
@@ -358,6 +358,52 @@ RSpec.describe "users" do
     end
   end
 
+  path "/admin/users/{id}/activate.json" do
+    put "Activate a user" do
+      tags "Users", "Admin"
+      operationId "activateUser"
+      consumes "application/json"
+      expected_request_schema = nil
+      parameter name: :id, in: :path, type: :integer, required: true
+
+      produces "application/json"
+      response "200", "response" do
+        let(:id) { Fabricate(:user, active: false).id }
+
+        expected_response_schema = load_spec_schema("success_ok_response")
+        schema(expected_response_schema)
+
+        it_behaves_like "a JSON endpoint", 200 do
+          let(:expected_response_schema) { expected_response_schema }
+          let(:expected_request_schema) { expected_request_schema }
+        end
+      end
+    end
+  end
+
+  path "/admin/users/{id}/deactivate.json" do
+    put "Deactivate a user" do
+      tags "Users", "Admin"
+      operationId "deactivateUser"
+      consumes "application/json"
+      expected_request_schema = nil
+      parameter name: :id, in: :path, type: :integer, required: true
+
+      produces "application/json"
+      response "200", "response" do
+        let(:id) { Fabricate(:user).id }
+
+        expected_response_schema = load_spec_schema("success_ok_response")
+        schema(expected_response_schema)
+
+        it_behaves_like "a JSON endpoint", 200 do
+          let(:expected_response_schema) { expected_response_schema }
+          let(:expected_request_schema) { expected_request_schema }
+        end
+      end
+    end
+  end
+
   path "/admin/users/{id}/suspend.json" do
     put "Suspend a user" do
       tags "Users", "Admin"
@@ -462,7 +508,7 @@ RSpec.describe "users" do
     before do
       stub_request(
         :get,
-        %r{https://www.gravatar.com/avatar/\w+.png\?d=404&reset_cache=\S+&s=360},
+        %r{https://www.gravatar.com/avatar/\w+.png\?d=404&reset_cache=\S+&s=#{Discourse.avatar_sizes.max}},
       ).with(
         headers: {
           "Accept" => "*/*",
diff --git a/spec/requests/application_controller_spec.rb b/spec/requests/application_controller_spec.rb
index 84b7fed0dec..a2d86582990 100644
--- a/spec/requests/application_controller_spec.rb
+++ b/spec/requests/application_controller_spec.rb
@@ -814,10 +814,9 @@ RSpec.describe ApplicationController do
     after { I18n.reload! }
 
     context "with rate limits" do
-      before do
-        RateLimiter.clear_all!
-        RateLimiter.enable
-      end
+      before { RateLimiter.enable }
+
+      use_redis_snapshotting
 
       it "serves a LimitExceeded error in the preferred locale" do
         SiteSetting.max_likes_per_day = 1
@@ -1032,10 +1031,9 @@ RSpec.describe ApplicationController do
   describe "Discourse-Rate-Limit-Error-Code header" do
     fab!(:admin) { Fabricate(:admin) }
 
-    before do
-      RateLimiter.clear_all!
-      RateLimiter.enable
-    end
+    before { RateLimiter.enable }
+
+    use_redis_snapshotting
 
     it "is included when API key is rate limited" do
       global_setting :max_admin_api_reqs_per_minute, 1
@@ -1079,10 +1077,9 @@ RSpec.describe ApplicationController do
   end
 
   describe "crawlers in slow_down_crawler_user_agents site setting" do
-    before do
-      RateLimiter.enable
-      RateLimiter.clear_all!
-    end
+    before { RateLimiter.enable }
+
+    use_redis_snapshotting
 
     it "are rate limited" do
       SiteSetting.slow_down_crawler_rate = 128
@@ -1194,4 +1191,96 @@ RSpec.describe ApplicationController do
       end
     end
   end
+
+  describe "preloading data" do
+    def preloaded_json
+      JSON.parse(
+        Nokogiri::HTML5.fragment(response.body).css("div#data-preloaded").first["data-preloaded"],
+      )
+    end
+
+    context "when user is anon" do
+      it "preloads the relevant JSON data" do
+        get "/latest"
+        expect(response.status).to eq(200)
+        expect(preloaded_json.keys).to match_array(
+          [
+            "site",
+            "siteSettings",
+            "customHTML",
+            "banner",
+            "customEmoji",
+            "isReadOnly",
+            "isStaffWritesOnly",
+            "activatedThemes",
+            "#{TopicList.new("latest", Fabricate(:anonymous), []).preload_key}",
+          ],
+        )
+      end
+    end
+
+    context "when user is regular user" do
+      fab!(:user) { Fabricate(:user) }
+
+      before { sign_in(user) }
+
+      it "preloads the relevant JSON data" do
+        get "/latest"
+        expect(response.status).to eq(200)
+        expect(preloaded_json.keys).to match_array(
+          [
+            "site",
+            "siteSettings",
+            "customHTML",
+            "banner",
+            "customEmoji",
+            "isReadOnly",
+            "isStaffWritesOnly",
+            "activatedThemes",
+            "#{TopicList.new("latest", Fabricate(:anonymous), []).preload_key}",
+            "currentUser",
+            "topicTrackingStates",
+            "topicTrackingStateMeta",
+          ],
+        )
+      end
+    end
+
+    context "when user is admin" do
+      fab!(:user) { Fabricate(:admin) }
+
+      before { sign_in(user) }
+
+      it "preloads the relevant JSON data" do
+        get "/latest"
+        expect(response.status).to eq(200)
+        expect(preloaded_json.keys).to match_array(
+          [
+            "site",
+            "siteSettings",
+            "customHTML",
+            "banner",
+            "customEmoji",
+            "isReadOnly",
+            "isStaffWritesOnly",
+            "activatedThemes",
+            "#{TopicList.new("latest", Fabricate(:anonymous), []).preload_key}",
+            "currentUser",
+            "topicTrackingStates",
+            "topicTrackingStateMeta",
+            "fontMap",
+          ],
+        )
+      end
+
+      it "generates a fontMap" do
+        get "/latest"
+        expect(response.status).to eq(200)
+        font_map = JSON.parse(preloaded_json["fontMap"])
+        expect(font_map.keys).to match_array(
+          DiscourseFonts.fonts.filter { |f| f[:variants].present? }.map { |f| f[:key] },
+        )
+      end
+    end
+  end
 end
diff --git a/spec/requests/bookmarks_controller_spec.rb b/spec/requests/bookmarks_controller_spec.rb
index 5e359d8aec0..aa7708475ef 100644
--- a/spec/requests/bookmarks_controller_spec.rb
+++ b/spec/requests/bookmarks_controller_spec.rb
@@ -9,10 +9,11 @@ RSpec.describe BookmarksController do
   before { sign_in(current_user) }
 
   describe "#create" do
+    use_redis_snapshotting
+
     it "rate limits creates" do
       SiteSetting.max_bookmarks_per_day = 1
       RateLimiter.enable
-      RateLimiter.clear_all!
 
       post "/bookmarks.json",
            params: {
diff --git a/spec/requests/bootstrap_controller_spec.rb b/spec/requests/bootstrap_controller_spec.rb
index 194fc15659c..e229f47f866 100644
--- a/spec/requests/bootstrap_controller_spec.rb
+++ b/spec/requests/bootstrap_controller_spec.rb
@@ -93,8 +93,7 @@ RSpec.describe BootstrapController do
 
   context "with a plugin asset filter" do
     let :plugin do
-      plugin = Plugin::Instance.new
-      plugin.path = "#{Rails.root}/spec/fixtures/plugins/my_plugin/plugin.rb"
+      plugin = plugin_from_fixtures("my_plugin")
       plugin.register_asset_filter do |type, request|
         next true if request.path == "/mypluginroute"
         false
diff --git a/spec/requests/categories_controller_spec.rb b/spec/requests/categories_controller_spec.rb
index fd01a787fd1..bb5759f813a 100644
--- a/spec/requests/categories_controller_spec.rb
+++ b/spec/requests/categories_controller_spec.rb
@@ -131,10 +131,17 @@ RSpec.describe CategoriesController do
       category_list = response.parsed_body["category_list"]
 
       category_response = category_list["categories"].find { |c| c["id"] == category.id }
-      expect(category_response["topics"].map { |c| c["id"] }).to contain_exactly(topic1.id)
+      expect(category_response["topics"].map { |c| c["id"] }).to contain_exactly(
+        topic1.id,
+        topic2.id,
+        topic3.id,
+      )
 
       subcategory_response = category_response["subcategory_list"][0]
-      expect(subcategory_response["topics"].map { |c| c["id"] }).to contain_exactly(topic2.id)
+      expect(subcategory_response["topics"].map { |c| c["id"] }).to contain_exactly(
+        topic2.id,
+        topic3.id,
+      )
 
       subsubcategory_response = subcategory_response["subcategory_list"][0]
       expect(subsubcategory_response["topics"].map { |c| c["id"] }).to contain_exactly(topic3.id)
@@ -237,6 +244,23 @@ RSpec.describe CategoriesController do
             [topic1.id, topic3.id, topic2.id],
           )
         end
+
+        it "does not include the sort parameter in more_topics_url" do
+          # we need to create more topics for more_topics_url to be serialized
+          SiteSetting.categories_topics = 5
+          Fabricate.times(
+            5,
+            :topic,
+            category: category,
+            created_at: 1.day.ago,
+            bumped_at: 1.day.ago,
+          )
+
+          get "/categories_and_latest.json"
+          expect(response.status).to eq(200)
+          expect(response.parsed_body["topic_list"]["more_topics_url"]).to start_with("/latest")
+          expect(response.parsed_body["topic_list"]["more_topics_url"]).not_to include("sort")
+        end
       end
 
       context "when order is set to created" do
@@ -251,74 +275,23 @@ RSpec.describe CategoriesController do
             [topic3.id, topic2.id, topic1.id],
           )
         end
-      end
-    end
 
-    describe "welcome topic" do
-      fab!(:category) { Fabricate(:category) }
-      fab!(:topic1) do
-        Fabricate(
-          :topic,
-          category: category,
-          created_at: 5.days.ago,
-          updated_at: Time.now,
-          bumped_at: Time.now,
-        )
-      end
-      fab!(:topic2) do
-        Fabricate(:topic, category: category, created_at: 2.days.ago, bumped_at: 2.days.ago)
-      end
-      fab!(:topic3) do
-        Fabricate(:topic, category: category, created_at: 1.day.ago, bumped_at: 1.day.ago)
-      end
-      fab!(:welcome_topic) { Fabricate(:topic) }
-      fab!(:post) { Fabricate(:post, topic: welcome_topic) }
+        it "includes the sort parameter in more_topics_url" do
+          # we need to create more topics for more_topics_url to be serialized
+          SiteSetting.categories_topics = 5
+          Fabricate.times(
+            5,
+            :topic,
+            category: category,
+            created_at: 1.day.ago,
+            bumped_at: 1.day.ago,
+          )
 
-      before do
-        SiteSetting.desktop_category_page_style = "categories_and_latest_topics"
-        SiteSetting.welcome_topic_id = welcome_topic.id
-        SiteSetting.editing_grace_period = 1.minute.to_i
-        SiteSetting.bootstrap_mode_enabled = true
-      end
-
-      it "is hidden for non-admins" do
-        get "/categories_and_latest.json"
-        expect(response.status).to eq(200)
-        expect(response.parsed_body["topic_list"]["topics"].map { |t| t["id"] }).not_to include(
-          welcome_topic.id,
-        )
-      end
-
-      it "is shown to non-admins when there is an edit" do
-        post.revise(post.user, { raw: "#{post.raw}2" }, revised_at: post.updated_at + 2.minutes)
-        post.reload
-        expect(post.version).to eq(2)
-
-        get "/categories_and_latest.json"
-        expect(response.status).to eq(200)
-        expect(response.parsed_body["topic_list"]["topics"].map { |t| t["id"] }).to include(
-          welcome_topic.id,
-        )
-      end
-
-      it "is hidden to admins" do
-        sign_in(admin)
-
-        get "/categories_and_latest.json"
-        expect(response.status).to eq(200)
-        expect(response.parsed_body["topic_list"]["topics"].map { |t| t["id"] }).not_to include(
-          welcome_topic.id,
-        )
-      end
-
-      it "is shown to users when bootstrap mode is disabled" do
-        SiteSetting.bootstrap_mode_enabled = false
-
-        get "/categories_and_latest.json"
-        expect(response.status).to eq(200)
-        expect(response.parsed_body["topic_list"]["topics"].map { |t| t["id"] }).to include(
-          welcome_topic.id,
-        )
+          get "/categories_and_latest.json"
+          expect(response.status).to eq(200)
+          expect(response.parsed_body["topic_list"]["more_topics_url"]).to start_with("/latest")
+          expect(response.parsed_body["topic_list"]["more_topics_url"]).to include("sort=created")
+        end
       end
     end
 
@@ -674,6 +647,8 @@ RSpec.describe CategoriesController do
           readonly = CategoryGroup.permission_types[:readonly]
           create_post = CategoryGroup.permission_types[:create_post]
           tag_group = Fabricate(:tag_group)
+          form_template_1 = Fabricate(:form_template)
+          form_template_2 = Fabricate(:form_template)
 
           put "/categories/#{category.id}.json",
               params: {
@@ -693,6 +668,7 @@ RSpec.describe CategoriesController do
                 minimum_required_tags: "",
                 allow_global_tags: "true",
                 required_tag_groups: [{ name: tag_group.name, min_count: 2 }],
+                form_template_ids: [form_template_1.id, form_template_2.id],
               }
 
           expect(response.status).to eq(200)
@@ -713,6 +689,7 @@ RSpec.describe CategoriesController do
           expect(category.category_required_tag_groups.count).to eq(1)
           expect(category.category_required_tag_groups.first.tag_group.id).to eq(tag_group.id)
           expect(category.category_required_tag_groups.first.min_count).to eq(2)
+          expect(category.form_template_ids).to eq([form_template_1.id, form_template_2.id])
         end
 
         it "logs the changes correctly" do
@@ -839,6 +816,7 @@ RSpec.describe CategoriesController do
           expect(category.tag_groups).to be_blank
           expect(category.category_required_tag_groups).to eq([])
           expect(category.custom_fields).to eq({ "field_1" => "hi" })
+          expect(category.form_template_ids.count).to eq(0)
         end
       end
     end
@@ -941,6 +919,25 @@ RSpec.describe CategoriesController do
       ).not_to include(uncategorized.id)
     end
 
+    it "includes more_topics_url in the response to /categories_and_latest" do
+      SiteSetting.categories_topics = 5
+
+      get "/categories_and_latest.json"
+      expect(response.status).to eq(200)
+      expect(response.parsed_body["topic_list"]["more_topics_url"]).to start_with("/latest")
+    end
+
+    it "includes more_topics_url in the response to /categories_and_top" do
+      SiteSetting.categories_topics = 5
+
+      Fabricate.times(10, :topic, category: category, like_count: 1000, posts_count: 100)
+      TopTopic.refresh!
+
+      get "/categories_and_top.json"
+      expect(response.status).to eq(200)
+      expect(response.parsed_body["topic_list"]["more_topics_url"]).to start_with("/top")
+    end
+
     describe "Showing top topics from private categories" do
       it "returns the top topic from the private category when the user is a member" do
         restricted_group = Fabricate(:group)
diff --git a/spec/requests/directory_columns_controller_spec.rb b/spec/requests/directory_columns_controller_spec.rb
index ff5990ff923..bb4777af615 100644
--- a/spec/requests/directory_columns_controller_spec.rb
+++ b/spec/requests/directory_columns_controller_spec.rb
@@ -16,70 +16,4 @@ RSpec.describe DirectoryColumnsController do
       )
     end
   end
-
-  describe "#edit-index" do
-    fab!(:public_user_field) { Fabricate(:user_field, show_on_profile: true) }
-    fab!(:private_user_field) do
-      Fabricate(:user_field, show_on_profile: false, show_on_user_card: false)
-    end
-
-    it "creates directory column records for public user fields" do
-      sign_in(admin)
-
-      expect { get "/edit-directory-columns.json" }.to change { DirectoryColumn.count }.by(1)
-    end
-
-    it "returns a 403 when not logged in as staff member" do
-      sign_in(user)
-      get "/edit-directory-columns.json"
-
-      expect(response.status).to eq(404)
-    end
-  end
-
-  describe "#update" do
-    let(:first_directory_column_id) { DirectoryColumn.first.id }
-    let(:second_directory_column_id) { DirectoryColumn.second.id }
-    let(:params) do
-      {
-        directory_columns: {
-          "0": {
-            id: first_directory_column_id,
-            enabled: false,
-            position: 1,
-          },
-          "1": {
-            id: second_directory_column_id,
-            enabled: true,
-            position: 1,
-          },
-        },
-      }
-    end
-
-    it "updates exising directory columns" do
-      sign_in(admin)
-
-      expect { put "/edit-directory-columns.json", params: params }.to change {
-        DirectoryColumn.find(first_directory_column_id).enabled
-      }.from(true).to(false)
-    end
-
-    it "does not let all columns be disabled" do
-      sign_in(admin)
-      bad_params = params
-      bad_params[:directory_columns][:"1"][:enabled] = false
-
-      put "/edit-directory-columns.json", params: bad_params
-
-      expect(response.status).to eq(400)
-    end
-
-    it "returns a 404 when not logged in as a staff member" do
-      sign_in(user)
-      put "/edit-directory-columns.json", params: params
-
-      expect(response.status).to eq(404)
-    end
-  end
 end
diff --git a/spec/requests/directory_items_controller_spec.rb b/spec/requests/directory_items_controller_spec.rb
index e56ded8ae20..070c4c32cfe 100644
--- a/spec/requests/directory_items_controller_spec.rb
+++ b/spec/requests/directory_items_controller_spec.rb
@@ -17,6 +17,70 @@ RSpec.describe DirectoryItemsController do
     expect(response).not_to be_successful
   end
 
+  context "with limit parameter" do
+    let!(:users) { Array.new(DirectoryItemsController::PAGE_SIZE + 10) { Fabricate(:user) } }
+
+    before { DirectoryItem.refresh! }
+
+    it "limits the number of returned items" do
+      get "/directory_items.json", params: { period: "all", limit: 2 }
+      expect(response.status).to eq(200)
+      json = response.parsed_body
+
+      expect(json["directory_items"].length).to eq(2)
+    end
+
+    include_examples "invalid limit params", "/directory_items.json", described_class::PAGE_SIZE
+  end
+
+  context "with page parameter" do
+    it "only accepts valid page numbers" do
+      get "/directory_items.json", params: { period: "all", page: -1 }
+      expect(response.status).to eq(400)
+
+      get "/directory_items.json", params: { period: "all", page: 0 }
+      expect(response.status).to eq(200)
+    end
+  end
+
+  context "with exclude_groups parameter" do
+    before { DirectoryItem.refresh! }
+
+    it "excludes users from specified groups" do
+      get "/directory_items.json", params: { period: "all", exclude_groups: group.name }
+      expect(response.status).to eq(200)
+      json = response.parsed_body
+      usernames = json["directory_items"].map { |item| item["user"]["username"] }
+
+      expect(usernames).not_to include("eviltrout", "stage_user")
+    end
+
+    it "handles non-existent group names gracefully" do
+      get "/directory_items.json", params: { period: "all", exclude_groups: "non_existent_group" }
+      expect(response.status).to eq(200)
+      json = response.parsed_body
+
+      user_names = json["directory_items"].map { |item| item["user"]["username"] }
+      expect(user_names).to include("eviltrout")
+    end
+  end
+
+  context "with exclude_groups parameter and current user in the top positions" do
+    before do
+      sign_in(evil_trout)
+      DirectoryItem.refresh!
+    end
+
+    it "doesn't include current user if they are already in the top positions" do
+      get "/directory_items.json", params: { period: "all", exclude_groups: group.name }
+      expect(response.status).to eq(200)
+      json = response.parsed_body
+      usernames = json["directory_items"].map { |item| item["user"]["username"] }
+
+      expect(usernames).not_to include("eviltrout")
+    end
+  end
+
   context "without data" do
     context "with a logged in user" do
       before { sign_in(user) }
diff --git a/spec/requests/drafts_controller_spec.rb b/spec/requests/drafts_controller_spec.rb
index 32db077c325..1d88db0b4a5 100644
--- a/spec/requests/drafts_controller_spec.rb
+++ b/spec/requests/drafts_controller_spec.rb
@@ -241,8 +241,80 @@ RSpec.describe DraftsController do
       sign_in(user)
       Draft.set(user, "xxx", 0, "hi")
       delete "/drafts/xxx.json", params: { sequence: 0 }
+
       expect(response.status).to eq(200)
       expect(Draft.get(user, "xxx", 0)).to eq(nil)
     end
+
+    it "denies attempts to destroy unowned draft" do
+      sign_in(Fabricate(:admin))
+      user = Fabricate(:user)
+      Draft.set(user, "xxx", 0, "hi")
+      delete "/drafts/xxx.json", params: { sequence: 0, username: user.username }
+
+      # Draft is not deleted because request is not via API
+      expect(Draft.get(user, "xxx", 0)).to be_present
+    end
+
+    shared_examples "for a passed user" do
+      it "deletes draft" do
+        api_key = Fabricate(:api_key).key
+        Draft.set(recipient, "xxx", 0, "hi")
+
+        delete "/drafts/xxx.json",
+               params: {
+                 sequence: 0,
+                 username: recipient.username,
+               },
+               headers: {
+                 HTTP_API_USERNAME: caller.username,
+                 HTTP_API_KEY: api_key,
+               }
+
+        expect(response.status).to eq(response_code)
+
+        if draft_deleted
+          expect(Draft.get(recipient, "xxx", 0)).to eq(nil)
+        else
+          expect(Draft.get(recipient, "xxx", 0)).to be_present
+        end
+      end
+    end
+
+    describe "api called by admin" do
+      include_examples "for a passed user" do
+        let(:caller) { Fabricate(:admin) }
+        let(:recipient) { Fabricate(:user) }
+        let(:response_code) { 200 }
+        let(:draft_deleted) { true }
+      end
+    end
+
+    describe "api called by tl4 user" do
+      include_examples "for a passed user" do
+        let(:caller) { Fabricate(:trust_level_4) }
+        let(:recipient) { Fabricate(:user) }
+        let(:response_code) { 403 }
+        let(:draft_deleted) { false }
+      end
+    end
+
+    describe "api called by regular user" do
+      include_examples "for a passed user" do
+        let(:caller) { Fabricate(:user) }
+        let(:recipient) { Fabricate(:user) }
+        let(:response_code) { 403 }
+        let(:draft_deleted) { false }
+      end
+    end
+
+    describe "api called by admin for another admin" do
+      include_examples "for a passed user" do
+        let(:caller) { Fabricate(:admin) }
+        let(:recipient) { Fabricate(:admin) }
+        let(:response_code) { 200 }
+        let(:draft_deleted) { true }
+      end
+    end
   end
 end
diff --git a/spec/requests/edit_directory_columns_controller_spec.rb b/spec/requests/edit_directory_columns_controller_spec.rb
new file mode 100644
index 00000000000..bad4f95b330
--- /dev/null
+++ b/spec/requests/edit_directory_columns_controller_spec.rb
@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+require "rspec"
+
+RSpec.describe EditDirectoryColumnsController do
+  fab!(:admin) { Fabricate(:admin) }
+  fab!(:user) { Fabricate(:user) }
+
+  describe "#update" do
+    let(:first_directory_column_id) { DirectoryColumn.first.id }
+    let(:second_directory_column_id) { DirectoryColumn.second.id }
+    let!(:payload) do
+      {
+        directory_columns: {
+          "0": {
+            id: first_directory_column_id,
+            enabled: "false",
+            position: "2",
+          },
+          "1": {
+            id: second_directory_column_id,
+            enabled: "true",
+            position: "1",
+          },
+        },
+        format: "json",
+      }
+    end
+
+    describe "#update" do
+      describe "when user is an admin or moderator" do
+        before { sign_in(admin) }
+        describe "user saves a new configuration" do
+          it "logs the new information using StaffActionLogger" do
+            expect { put edit_directory_columns_path(params: payload) }.to change {
+              DirectoryColumn.find(first_directory_column_id).enabled
+            }.from(true).to(false)
+
+            staff_log = UserHistory.last
+
+            expect(staff_log.custom_type).to eq("update_directory_columns")
+          end
+
+          it "does not let all columns be disabled" do
+            sign_in(admin)
+            bad_params = payload
+            bad_params[:directory_columns][:"1"][:enabled] = "false"
+
+            put edit_directory_columns_path(params: bad_params)
+
+            expect(response.status).to eq(400)
+          end
+        end
+      end
+    end
+
+    describe "when user is not an admin or moderator" do
+      before { sign_in(user) }
+      describe "user saves a new configuration" do
+        it "does not allow saving" do
+          put edit_directory_columns_path(params: payload)
+
+          expect(response.status).to eq(403)
+        end
+      end
+    end
+  end
+
+  describe "#index" do
+    fab!(:public_user_field) { Fabricate(:user_field, show_on_profile: true) }
+    fab!(:private_user_field) do
+      Fabricate(:user_field, show_on_profile: false, show_on_user_card: false)
+    end
+
+    it "creates directory column records for public user fields" do
+      sign_in(admin)
+
+      expect { get "/edit-directory-columns.json" }.to change { DirectoryColumn.count }.by(1)
+    end
+
+    it "returns a 403 when not logged in as staff member" do
+      sign_in(user)
+      get "/edit-directory-columns.json"
+
+      expect(response.status).to eq(403)
+    end
+  end
+end
diff --git a/spec/requests/email_controller_spec.rb b/spec/requests/email_controller_spec.rb
index 57478f38fe5..c9c29a0d0cb 100644
--- a/spec/requests/email_controller_spec.rb
+++ b/spec/requests/email_controller_spec.rb
@@ -317,6 +317,15 @@ RSpec.describe EmailController do
         expect(response.body).not_to include("unwatch_category")
       end
 
+      it "displays form even if topic is deleted" do
+        post.topic.trash!
+
+        navigate_to_unsubscribe
+
+        expect(response.status).to eq(200)
+        expect(response.body).to include(I18n.t("unsubscribe.all", sitename: SiteSetting.title))
+      end
+
       def create_category_user(notification_level)
         CategoryUser.create!(
           user_id: user.id,
diff --git a/spec/requests/embed_controller_spec.rb b/spec/requests/embed_controller_spec.rb
index 7963526532b..d430bdd657d 100644
--- a/spec/requests/embed_controller_spec.rb
+++ b/spec/requests/embed_controller_spec.rb
@@ -5,32 +5,13 @@ RSpec.describe EmbedController do
   let(:embed_url_secure) { "https://eviltrout.com/2013/02/10/why-discourse-uses-emberjs.html" }
   let(:discourse_username) { "eviltrout" }
 
-  it "is 404 without an embed_url" do
-    get "/embed/comments"
-    expect(response.body).to match(I18n.t("embed.error"))
-  end
-
-  it "raises an error with a missing host" do
-    get "/embed/comments", params: { embed_url: embed_url }
-    expect(response.body).to match(I18n.t("embed.error"))
-  end
-
-  describe "by topic id" do
-    let(:headers) { { "REFERER" => "http://eviltrout.com/some-page" } }
-
-    before { Fabricate(:embeddable_host) }
-
-    it "allows a topic to be embedded by id" do
-      topic = Fabricate(:topic)
-      get "/embed/comments", params: { topic_id: topic.id }, headers: headers
-      expect(response.status).to eq(200)
-    end
-  end
+  fab!(:topic) { Fabricate(:topic) }
 
   describe "#info" do
     context "without api key" do
       it "fails" do
         get "/embed/info.json"
+
         expect(response.body).to match(I18n.t("embed.error"))
       end
     end
@@ -51,10 +32,9 @@ RSpec.describe EmbedController do
                 HTTP_API_USERNAME: "system",
               }
 
-          json = response.parsed_body
-          expect(json["topic_id"]).to eq(topic_embed.topic.id)
-          expect(json["post_id"]).to eq(topic_embed.post.id)
-          expect(json["topic_slug"]).to eq(topic_embed.topic.slug)
+          expect(response.parsed_body["topic_id"]).to eq(topic_embed.topic.id)
+          expect(response.parsed_body["post_id"]).to eq(topic_embed.post.id)
+          expect(response.parsed_body["topic_slug"]).to eq(topic_embed.topic.slug)
         end
       end
 
@@ -79,6 +59,7 @@ RSpec.describe EmbedController do
   describe "#topics" do
     it "raises an error when not enabled" do
       get "/embed/topics?embed_id=de-1234"
+
       expect(response.status).to eq(400)
     end
 
@@ -87,15 +68,16 @@ RSpec.describe EmbedController do
 
       it "raises an error with a weird id" do
         get "/embed/topics?discourse_embed_id=../asdf/-1234", headers: headers
+
         expect(response.status).to eq(400)
       end
 
       it "returns a list of topics" do
-        topic = Fabricate(:topic)
         get "/embed/topics?discourse_embed_id=de-1234",
             headers: {
               "REFERER" => "https://example.com/evil-trout",
             }
+
         expect(response.status).to eq(200)
         expect(response.headers["X-Frame-Options"]).to be_nil
         expect(response.body).to match("data-embed-id=\"de-1234\"")
@@ -104,7 +86,6 @@ RSpec.describe EmbedController do
       end
 
       it "returns a list of top topics" do
-        bad_topic = Fabricate(:topic)
         good_topic = Fabricate(:topic, like_count: 1000, posts_count: 100)
         TopTopic.refresh!
 
@@ -116,13 +97,11 @@ RSpec.describe EmbedController do
         expect(response.headers["X-Frame-Options"]).to be_nil
         expect(response.body).to match("data-embed-id=\"de-1234\"")
         expect(response.body).to match("data-topic-id=\"#{good_topic.id}\"")
-        expect(response.body).not_to match("data-topic-id=\"#{bad_topic.id}\"")
+        expect(response.body).not_to match("data-topic-id=\"#{topic.id}\"")
         expect(response.body).to match("data-referer=\"https://example.com/evil-trout\"")
       end
 
       it "returns a list of topics if the top_period is not valid" do
-        topic1 = Fabricate(:topic)
-        topic2 = Fabricate(:topic)
         good_topic = Fabricate(:topic, like_count: 1000, posts_count: 100)
         TopTopic.refresh!
         TopicQuery.any_instance.expects(:list_top_for).never
@@ -131,21 +110,21 @@ RSpec.describe EmbedController do
             headers: {
               "REFERER" => "https://example.com/evil-trout",
             }
+
         expect(response.status).to eq(200)
         expect(response.headers["X-Frame-Options"]).to be_nil
         expect(response.body).to match("data-embed-id=\"de-1234\"")
         expect(response.body).to match("data-topic-id=\"#{good_topic.id}\"")
-        expect(response.body).to match("data-topic-id=\"#{topic1.id}\"")
-        expect(response.body).to match("data-topic-id=\"#{topic2.id}\"")
+        expect(response.body).to match("data-topic-id=\"#{topic.id}\"")
         expect(response.body).to match("data-referer=\"https://example.com/evil-trout\"")
       end
 
       it "wraps the list in a custom class" do
-        topic = Fabricate(:topic)
         get "/embed/topics?discourse_embed_id=de-1234&embed_class=my-special-class",
             headers: {
               "REFERER" => "https://example.com/evil-trout",
             }
+
         expect(response.status).to eq(200)
         expect(response.headers["X-Frame-Options"]).to be_nil
         expect(response.body).to match("class='topics-list my-special-class'")
@@ -153,198 +132,293 @@ RSpec.describe EmbedController do
 
       it "returns no referer if not supplied" do
         get "/embed/topics?discourse_embed_id=de-1234"
+
         expect(response.status).to eq(200)
         expect(response.body).to match("data-referer=\"\"")
       end
 
       it "returns * for the referer if `embed_any_origin` is set" do
         SiteSetting.embed_any_origin = true
+
         get "/embed/topics?discourse_embed_id=de-1234"
+
         expect(response.status).to eq(200)
         expect(response.body).to match("data-referer=\"\\*\"")
       end
 
       it "disallows indexing the embed topic list" do
-        topic = Fabricate(:topic)
         get "/embed/topics?discourse_embed_id=de-1234",
             headers: {
               "REFERER" => "https://example.com/evil-trout",
             }
+
         expect(response.status).to eq(200)
         expect(response.headers["X-Robots-Tag"]).to match(/noindex/)
       end
     end
   end
 
-  context "with a host" do
-    let!(:embeddable_host) { Fabricate(:embeddable_host) }
-    let(:headers) { { "REFERER" => embed_url } }
+  describe "#comments" do
+    it "is 404 without an embed_url" do
+      get "/embed/comments"
 
-    before { Jobs.run_immediately! }
+      expect(response.body).to match(I18n.t("embed.error"))
+    end
 
-    it "doesn't raises an error with no referer" do
+    it "raises an error with a missing host" do
       get "/embed/comments", params: { embed_url: embed_url }
-      expect(response.body).not_to match(I18n.t("embed.error"))
+
+      expect(response.body).to match(I18n.t("embed.error"))
     end
 
-    it "includes CSS from embedded_scss field" do
-      theme = Fabricate(:theme)
-      theme.set_default!
+    describe "by topic id" do
+      fab!(:embeddable_host) { Fabricate(:embeddable_host) }
 
-      ThemeField.create!(
-        theme_id: theme.id,
-        name: "embedded_scss",
-        target_id: 0,
-        type_id: 1,
-        value: ".test-osama-15 {\n" + "    color: red;\n" + "}\n",
-      )
+      it "allows a topic to be embedded by id" do
+        get "/embed/comments",
+            params: {
+              topic_id: topic.id,
+            },
+            headers: {
+              "REFERER" => "http://eviltrout.com/some-page",
+            }
 
-      topic_embed = Fabricate(:topic_embed, embed_url: embed_url)
-      post = Fabricate(:post, topic: topic_embed.topic)
-
-      get "/embed/comments", params: { embed_url: embed_url }, headers: headers
-
-      html = Nokogiri::HTML5.fragment(response.body)
-      css_link = html.at("link[data-target=embedded_theme]").attribute("href").value
-
-      get css_link
-      expect(response.status).to eq(200)
-      expect(response.body).to include(".test-osama-15")
-    end
-
-    context "with success" do
-      after do
         expect(response.status).to eq(200)
-        expect(response.headers["X-Frame-Options"]).to be_nil
+      end
+    end
+
+    context "with a host" do
+      fab!(:embeddable_host) { Fabricate(:embeddable_host) }
+
+      before { Jobs.run_immediately! }
+
+      it "doesn't raise an error with no referer" do
+        get "/embed/comments", params: { embed_url: embed_url }
+
+        expect(response.body).not_to match(I18n.t("embed.error"))
       end
 
-      it "tells the topic retriever to work when no previous embed is found" do
-        TopicEmbed.expects(:topic_id_for_embed).returns(nil)
-        retriever = mock
-        TopicRetriever.expects(:new).returns(retriever)
-        retriever.expects(:retrieve)
-        get "/embed/comments", params: { embed_url: embed_url }, headers: headers
-      end
+      it "includes CSS from embedded_scss field" do
+        theme = Fabricate(:theme)
+        theme.set_default!
+
+        ThemeField.create!(
+          theme_id: theme.id,
+          name: "embedded_scss",
+          target_id: 0,
+          type_id: 1,
+          value: ".test-osama-15 { color: red }",
+        )
 
-      it "displays the right view" do
         topic_embed = Fabricate(:topic_embed, embed_url: embed_url)
+        Fabricate(:post, topic: topic_embed.topic)
 
-        get "/embed/comments", params: { embed_url: embed_url_secure }, headers: headers
+        get "/embed/comments", params: { embed_url: embed_url }, headers: { "REFERER" => embed_url }
 
-        expect(response.body).to match(I18n.t("embed.start_discussion"))
+        html = Nokogiri::HTML5.fragment(response.body)
+        get html.at("link[data-target=embedded_theme]").attribute("href").value
+        expect(response.status).to eq(200)
+        expect(response.body).to include(".test-osama-15")
       end
 
-      it "creates a topic view when a topic_id is found" do
+      it "includes HTML from embedded_header field" do
+        theme = Fabricate(:theme)
+        theme.set_default!
+
+        ThemeField.create!(
+          theme_id: theme.id,
+          name: "embedded_header",
+          target_id: 0,
+          type_id: 0,
+          value: "<strong class='custom-text'>hey there!</strong>\n",
+        )
+
         topic_embed = Fabricate(:topic_embed, embed_url: embed_url)
         post = Fabricate(:post, topic: topic_embed.topic)
 
         get "/embed/comments", params: { embed_url: embed_url }, headers: headers
 
-        expect(response.body).to match(I18n.t("embed.continue"))
-        expect(response.body).to match(post.cooked)
-        expect(response.body).to match("<span class='replies'>1 reply</span>")
+        html = Nokogiri::HTML5.fragment(response.body)
+        custom_header = html.at(".custom-text")
 
-        small_action = Fabricate(:small_action, topic: topic_embed.topic)
-
-        get "/embed/comments", params: { embed_url: embed_url }, headers: headers
-
-        expect(response.body).not_to match("post-#{small_action.id}")
-        expect(response.body).to match("<span class='replies'>1 reply</span>")
+        expect(custom_header.name).to eq("strong")
+        expect(custom_header.text).to eq("hey there!")
       end
 
-      it "provides the topic retriever with the discourse username when provided" do
-        retriever = mock
-        retriever.expects(:retrieve).returns(nil)
-        TopicRetriever
-          .expects(:new)
-          .with(embed_url, has_entry(author_username: discourse_username))
-          .returns(retriever)
+      context "with success" do
+        it "tells the topic retriever to work when no previous embed is found" do
+          TopicRetriever.any_instance.expects(:retrieve)
 
-        get "/embed/comments",
-            params: {
-              embed_url: embed_url,
-              discourse_username: discourse_username,
-            },
-            headers: headers
-      end
-    end
-  end
+          get "/embed/comments",
+              params: {
+                embed_url: embed_url,
+              },
+              headers: {
+                "REFERER" => embed_url,
+              }
 
-  context "with multiple hosts" do
-    before do
-      Fabricate(:embeddable_host)
-      Fabricate(:embeddable_host, host: "http://discourse.org")
-      Fabricate(:embeddable_host, host: "https://example.com/1234", class_name: "example")
-    end
+          expect(response.status).to eq(200)
+          expect(response.headers["X-Frame-Options"]).to be_nil
+        end
 
-    context "with success" do
-      it "works with the first host" do
-        get "/embed/comments",
-            params: {
-              embed_url: embed_url,
-            },
-            headers: {
-              "REFERER" => "http://eviltrout.com/wat/1-2-3.html",
-            }
+        it "displays the right view" do
+          topic_embed = Fabricate(:topic_embed, embed_url: embed_url)
 
-        expect(response.status).to eq(200)
-      end
+          get "/embed/comments",
+              params: {
+                embed_url: embed_url_secure,
+              },
+              headers: {
+                "REFERER" => embed_url,
+              }
 
-      it "works with the second host" do
-        get "/embed/comments",
-            params: {
-              embed_url: embed_url,
-            },
-            headers: {
-              "REFERER" => "http://eviltrout.com/wat/1-2-3.html",
-            }
+          expect(response.status).to eq(200)
+          expect(response.headers["X-Frame-Options"]).to be_nil
+          expect(response.body).to match(I18n.t("embed.start_discussion"))
+        end
 
-        expect(response.status).to eq(200)
-      end
+        it "creates a topic view when a topic_id is found" do
+          topic_embed = Fabricate(:topic_embed, embed_url: embed_url)
 
-      it "works with a host with a path" do
-        get "/embed/comments",
-            params: {
-              embed_url: embed_url,
-            },
-            headers: {
-              "REFERER" => "https://example.com/some-other-path",
-            }
+          post = Fabricate(:post, topic: topic_embed.topic)
 
-        expect(response.status).to eq(200)
-      end
+          get "/embed/comments",
+              params: {
+                embed_url: embed_url,
+              },
+              headers: {
+                "REFERER" => embed_url,
+              }
 
-      it "contains custom class name" do
-        get "/embed/comments",
-            params: {
-              embed_url: embed_url,
-            },
-            headers: {
-              "REFERER" => "https://example.com/some-other-path",
-            }
+          expect(response.status).to eq(200)
+          expect(response.headers["X-Frame-Options"]).to be_nil
+          expect(response.body).to match(I18n.t("embed.continue"))
+          expect(response.body).to match(post.cooked)
+          expect(response.body).to match("<span class='replies'>1 reply</span>")
 
-        expect(response.body).to match('class="example"')
+          small_action = Fabricate(:small_action, topic: topic_embed.topic)
+
+          get "/embed/comments",
+              params: {
+                embed_url: embed_url,
+              },
+              headers: {
+                "REFERER" => embed_url,
+              }
+
+          expect(response.status).to eq(200)
+          expect(response.headers["X-Frame-Options"]).to be_nil
+          expect(response.body).not_to match("post-#{small_action.id}")
+          expect(response.body).to match("<span class='replies'>1 reply</span>")
+        end
+
+        it "provides the topic retriever with the discourse username when provided" do
+          TopicRetriever.any_instance.expects(:retrieve).returns(nil)
+
+          get "/embed/comments",
+              params: {
+                embed_url: embed_url,
+                discourse_username: discourse_username,
+              },
+              headers: {
+                "REFERER" => embed_url,
+              }
+
+          expect(response.status).to eq(200)
+          expect(response.headers["X-Frame-Options"]).to be_nil
+        end
       end
     end
 
-    context "with CSP frame-ancestors enabled" do
-      before { SiteSetting.content_security_policy_frame_ancestors = true }
+    context "with multiple hosts" do
+      fab!(:embeddable_host_1) { Fabricate(:embeddable_host) }
+      fab!(:embeddable_host_2) { Fabricate(:embeddable_host, host: "http://discourse.org") }
+      fab!(:embeddable_host_3) do
+        Fabricate(:embeddable_host, host: "https://example.com/1234", class_name: "example")
+      end
 
-      it "includes all the hosts" do
-        get "/embed/comments",
-            params: {
-              embed_url: embed_url,
-            },
-            headers: {
-              "REFERER" => "http://eviltrout.com/wat/1-2-3.html",
-            }
+      context "with success" do
+        it "works with the first host" do
+          get "/embed/comments",
+              params: {
+                embed_url: embed_url,
+              },
+              headers: {
+                "REFERER" => "http://eviltrout.com/wat/1-2-3.html",
+              }
 
-        expect(response.headers["Content-Security-Policy"]).to match(
-          %r{frame-ancestors.*https://discourse\.org},
-        )
-        expect(response.headers["Content-Security-Policy"]).to match(
-          %r{frame-ancestors.*https://example\.com},
-        )
+          expect(response.status).to eq(200)
+        end
+
+        it "works with the second host" do
+          get "/embed/comments",
+              params: {
+                embed_url: embed_url,
+              },
+              headers: {
+                "REFERER" => "http://eviltrout.com/wat/1-2-3.html",
+              }
+
+          expect(response.status).to eq(200)
+        end
+
+        it "works with a host with a path" do
+          get "/embed/comments",
+              params: {
+                embed_url: embed_url,
+              },
+              headers: {
+                "REFERER" => "https://example.com/some-other-path",
+              }
+
+          expect(response.status).to eq(200)
+        end
+
+        it "contains custom class name" do
+          get "/embed/comments",
+              params: {
+                embed_url: embed_url,
+              },
+              headers: {
+                "REFERER" => "https://example.com/some-other-path",
+              }
+
+          expect(response.body).to match('class="example"')
+        end
+
+        it "contains custom class name from params" do
+          get "/embed/comments",
+              params: {
+                embed_url: embed_url,
+                class_name: "param-class-name",
+              },
+              headers: {
+                "REFERER" => "https://example.com/some-other-path",
+              }
+
+          expect(response.body).to match('class="param-class-name"')
+        end
+      end
+
+      context "with CSP frame-ancestors enabled" do
+        before { SiteSetting.content_security_policy_frame_ancestors = true }
+
+        it "includes all the hosts" do
+          get "/embed/comments",
+              params: {
+                embed_url: embed_url,
+              },
+              headers: {
+                "REFERER" => "http://eviltrout.com/wat/1-2-3.html",
+              }
+
+          expect(response.headers["Content-Security-Policy"]).to match(
+            %r{frame-ancestors.*https://discourse\.org},
+          )
+          expect(response.headers["Content-Security-Policy"]).to match(
+            %r{frame-ancestors.*https://example\.com},
+          )
+        end
       end
     end
   end
diff --git a/spec/requests/form_templates_controller_spec.rb b/spec/requests/form_templates_controller_spec.rb
new file mode 100644
index 00000000000..f281f01b9b4
--- /dev/null
+++ b/spec/requests/form_templates_controller_spec.rb
@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+RSpec.describe FormTemplatesController do
+  fab!(:user) { Fabricate(:user) }
+
+  before { SiteSetting.experimental_form_templates = true }
+
+  describe "#index" do
+    fab!(:form_template) { Fabricate(:form_template) }
+    fab!(:form_template_2) { Fabricate(:form_template) }
+    fab!(:form_template_3) { Fabricate(:form_template) }
+
+    context "when logged in as a user" do
+      before { sign_in(user) }
+
+      it "should return all form templates ordered by its ids" do
+        get "/form-templates.json"
+        expect(response.status).to eq(200)
+        json = response.parsed_body
+        expect(json["form_templates"]).to be_present
+        expect(json["form_templates"].length).to eq(3)
+
+        templates = json["form_templates"].map { |template| template["id"] }
+        form_templates = [form_template, form_template_2, form_template_3].sort_by(&:id).map(&:id)
+
+        expect(templates).to eq(form_templates)
+      end
+    end
+
+    context "when you are not logged in" do
+      it "should deny access" do
+        get "/form-templates.json"
+        expect(response.status).to eq(403)
+      end
+    end
+
+    context "when experimental form templates is disabled" do
+      before do
+        sign_in(user)
+        SiteSetting.experimental_form_templates = false
+      end
+
+      it "should not work if you are a logged in user" do
+        get "/form-templates.json"
+        expect(response.status).to eq(403)
+      end
+    end
+  end
+
+  describe "#show" do
+    fab!(:form_template) { Fabricate(:form_template) }
+
+    context "when logged in as a user" do
+      before { sign_in(user) }
+
+      it "should return a single template" do
+        get "/form-templates/#{form_template.id}.json"
+        expect(response.status).to eq(200)
+        json = response.parsed_body
+        current_template = json["form_template"]
+        expect(current_template["id"]).to eq(form_template.id)
+        expect(current_template["name"]).to eq(form_template.name)
+        expect(current_template["template"]).to eq(form_template.template)
+      end
+    end
+
+    context "when you are not logged in" do
+      it "should deny access" do
+        get "/form-templates/#{form_template.id}.json"
+        expect(response.status).to eq(403)
+      end
+    end
+
+    context "when experimental form templates is disabled" do
+      before do
+        sign_in(user)
+        SiteSetting.experimental_form_templates = false
+      end
+
+      it "should not work if you are a logged in user" do
+        get "/form-templates/#{form_template.id}.json"
+        expect(response.status).to eq(403)
+      end
+    end
+  end
+end
diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rb
index 5045d59bbca..738545d3609 100644
--- a/spec/requests/groups_controller_spec.rb
+++ b/spec/requests/groups_controller_spec.rb
@@ -38,6 +38,17 @@ RSpec.describe GroupsController do
       expect(body["load_more_groups"]).to eq("/groups?page=2")
     end
 
+    it "only accepts valid page numbers" do
+      get "/groups.json", params: { page: -1 }
+      expect(response.status).to eq(400)
+
+      get "/groups.json", params: { page: 0 }
+      expect(response.status).to eq(200)
+
+      get "/groups.json", params: { page: 1 }
+      expect(response.status).to eq(200)
+    end
+
     context "when group directory is disabled" do
       before { SiteSetting.enable_group_directory = false }
 
@@ -397,6 +408,46 @@ RSpec.describe GroupsController do
         end
       end
     end
+
+    describe "groups_index_query modifier" do
+      fab!(:user) { Fabricate(:user) }
+      fab!(:cool_group) { Fabricate(:group, name: "cool-group") }
+      fab!(:boring_group) { Fabricate(:group, name: "boring-group") }
+
+      it "allows changing the query" do
+        get "/groups.json"
+        expect(response.status).to eq(200)
+        expect(response.parsed_body["groups"].map { |g| g["id"] }).to include(
+          cool_group.id,
+          boring_group.id,
+        )
+
+        get "/groups.json", params: { filter: "cool" }
+        expect(response.status).to eq(200)
+        expect(response.parsed_body["groups"].map { |g| g["id"] }).to include(cool_group.id)
+        expect(response.parsed_body["groups"].map { |g| g["id"] }).not_to include(boring_group.id)
+
+        Plugin::Instance
+          .new
+          .register_modifier(:groups_index_query) do |query|
+            query.where("groups.name LIKE 'cool%'")
+          end
+
+        get "/groups.json"
+        expect(response.status).to eq(200)
+        expect(response.parsed_body["groups"].map { |g| g["id"] }).to include(cool_group.id)
+        expect(response.parsed_body["groups"].map { |g| g["id"] }).not_to include(boring_group.id)
+
+        get "/groups.json", params: { filter: "boring" }
+        expect(response.status).to eq(200)
+        expect(response.parsed_body["groups"].map { |g| g["id"] }).not_to include(
+          cool_group.id,
+          boring_group.id,
+        )
+      ensure
+        DiscoursePluginRegistry.clear_modifiers!
+      end
+    end
   end
 
   describe "#show" do
@@ -1638,6 +1689,164 @@ RSpec.describe GroupsController do
       end
     end
 
+    describe "#add_owners" do
+      context "when logged in as an admin" do
+        before { sign_in(admin) }
+
+        it "should work" do
+          put "/groups/#{group.id}/owners.json",
+              params: {
+                usernames: [user.username, admin.username].join(","),
+              }
+
+          expect(response.status).to eq(200)
+
+          response_body = response.parsed_body
+
+          expect(response_body["usernames"]).to contain_exactly(user.username, admin.username)
+
+          expect(group.group_users.where(owner: true).map(&:user)).to contain_exactly(user, admin)
+        end
+
+        it "returns not-found error when there is no group" do
+          group.destroy!
+
+          put "/groups/#{group.id}/owners.json", params: { usernames: user.username }
+
+          expect(response.status).to eq(404)
+        end
+
+        it "does not allow adding owners to an automatic group" do
+          group.update!(automatic: true)
+
+          expect do
+            put "/groups/#{group.id}/owners.json", params: { usernames: user.username }
+          end.to_not change { group.group_users.count }
+
+          expect(response.status).to eq(422)
+          expect(response.parsed_body["errors"]).to eq(
+            [I18n.t("groups.errors.can_not_modify_automatic")],
+          )
+        end
+
+        it "does not notify users when the param is not present" do
+          put "/groups/#{group.id}/owners.json", params: { usernames: user.username }
+          expect(response.status).to eq(200)
+
+          topic =
+            Topic.find_by(
+              title:
+                I18n.t(
+                  "system_messages.user_added_to_group_as_owner.subject_template",
+                  group_name: group.name,
+                ),
+              archetype: "private_message",
+            )
+          expect(topic.nil?).to eq(true)
+        end
+
+        it "notifies users when the param is present" do
+          put "/groups/#{group.id}/owners.json",
+              params: {
+                usernames: user.username,
+                notify_users: true,
+              }
+          expect(response.status).to eq(200)
+
+          topic =
+            Topic.find_by(
+              title:
+                I18n.t(
+                  "system_messages.user_added_to_group_as_owner.subject_template",
+                  group_name: group.name,
+                ),
+              archetype: "private_message",
+            )
+          expect(topic.nil?).to eq(false)
+          expect(topic.topic_users.map(&:user_id)).to include(-1, user.id)
+        end
+      end
+
+      context "when logged in as a moderator" do
+        before { sign_in(moderator) }
+
+        context "with moderators_manage_categories_and_groups enabled" do
+          before { SiteSetting.moderators_manage_categories_and_groups = true }
+
+          it "adds owners" do
+            put "/groups/#{group.id}/owners.json",
+                params: {
+                  usernames: [user.username, admin.username, moderator.username].join(","),
+                }
+
+            response_body = response.parsed_body
+
+            expect(response.status).to eq(200)
+            expect(response_body["usernames"]).to contain_exactly(
+              user.username,
+              admin.username,
+              moderator.username,
+            )
+            expect(group.group_users.where(owner: true).map(&:user)).to contain_exactly(
+              user,
+              admin,
+              moderator,
+            )
+          end
+        end
+
+        context "with moderators_manage_categories_and_groups disabled" do
+          before { SiteSetting.moderators_manage_categories_and_groups = false }
+
+          it "prevents adding of owners with a 403 response" do
+            put "/groups/#{group.id}/owners.json",
+                params: {
+                  usernames: [user.username, admin.username, moderator.username].join(","),
+                }
+
+            expect(response.status).to eq(403)
+            expect(response.parsed_body["errors"]).to include(I18n.t("invalid_access"))
+            expect(group.group_users.where(owner: true).map(&:user)).to be_empty
+          end
+        end
+      end
+
+      context "when logged in as a non-owner" do
+        before { sign_in(user) }
+
+        it "prevents adding of owners with a 403 response" do
+          put "/groups/#{group.id}/owners.json",
+              params: {
+                usernames: [user.username, admin.username].join(","),
+              }
+
+          expect(response.status).to eq(403)
+          expect(response.parsed_body["errors"]).to include(I18n.t("invalid_access"))
+          expect(group.group_users.where(owner: true).map(&:user)).to be_empty
+        end
+      end
+
+      context "when logged in as an owner" do
+        before { sign_in(user) }
+
+        it "allows adding new owners" do
+          group.add_owner(user)
+
+          put "/groups/#{group.id}/owners.json",
+              params: {
+                usernames: [user.username, admin.username].join(","),
+              }
+
+          expect(response.status).to eq(200)
+          expect(response.parsed_body["usernames"]).to contain_exactly(
+            user.username,
+            admin.username,
+          )
+          expect(group.group_users.where(owner: true).map(&:user)).to contain_exactly(user, admin)
+        end
+      end
+    end
+
     describe "#join" do
       let(:public_group) { Fabricate(:public_group) }
 
@@ -2050,7 +2259,7 @@ RSpec.describe GroupsController do
 
       expect(response.status).to eq(422)
       expect(response.parsed_body["errors"]).to contain_exactly(
-        "Reason is too long (maximum is 280 characters)",
+        "Reason is too long (maximum is 5000 characters)",
       )
     end
 
@@ -2170,6 +2379,36 @@ RSpec.describe GroupsController do
         expect(groups.map { |group| group["id"] }).to contain_exactly(group.id, hidden_group.id)
       end
     end
+
+    describe "groups_search_query modifier" do
+      fab!(:user) { Fabricate(:user) }
+      fab!(:cool_group) { Fabricate(:group, name: "cool-group") }
+      fab!(:boring_group) { Fabricate(:group, name: "boring-group") }
+
+      before { sign_in(user) }
+
+      it "allows changing the query" do
+        get "/groups/search.json", params: { term: "cool" }
+        expect(response.status).to eq(200)
+        expect(response.parsed_body.map { |g| g["id"] }).to include(cool_group.id)
+        expect(response.parsed_body.map { |g| g["id"] }).not_to include(boring_group.id)
+
+        Plugin::Instance
+          .new
+          .register_modifier(:groups_search_query) do |query|
+            query.where("groups.name LIKE 'boring%'")
+          end
+
+        get "/groups/search.json", params: { term: "cool" }
+        expect(response.status).to eq(200)
+        expect(response.parsed_body.map { |g| g["id"] }).not_to include(
+          cool_group.id,
+          boring_group.id,
+        )
+      ensure
+        DiscoursePluginRegistry.clear_modifiers!
+      end
+    end
   end
 
   describe "#new" do
@@ -2380,9 +2619,10 @@ RSpec.describe GroupsController do
       end
 
       context "when rate limited" do
+        use_redis_snapshotting
+
         it "rate limits anon searches per user" do
           RateLimiter.enable
-          RateLimiter.clear_all!
 
           5.times { post "/groups/#{group.id}/test_email_settings.json", params: params }
           post "/groups/#{group.id}/test_email_settings.json", params: params
diff --git a/spec/requests/hashtags_controller_spec.rb b/spec/requests/hashtags_controller_spec.rb
index 2d2b0f3ca67..98b37199a10 100644
--- a/spec/requests/hashtags_controller_spec.rb
+++ b/spec/requests/hashtags_controller_spec.rb
@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
 RSpec.describe HashtagsController do
-  fab!(:category) { Fabricate(:category) }
-  fab!(:tag) { Fabricate(:tag) }
+  fab!(:category) { Fabricate(:category, name: "Random", slug: "random") }
+  fab!(:tag) { Fabricate(:tag, name: "bug") }
 
   fab!(:group) { Fabricate(:group) }
-  fab!(:private_category) { Fabricate(:private_category, group: group) }
+  fab!(:private_category) do
+    Fabricate(:private_category, group: group, name: "Staff", slug: "staff")
+  end
 
   fab!(:hidden_tag) { Fabricate(:tag, name: "hidden") }
   let(:tag_group) do
@@ -14,134 +16,406 @@ RSpec.describe HashtagsController do
 
   before do
     SiteSetting.tagging_enabled = true
-
-    # TODO (martin) Remove when enable_experimental_hashtag_autocomplete is default for all sites
-    SiteSetting.enable_experimental_hashtag_autocomplete = false
-
     tag_group
   end
 
   describe "#lookup" do
-    context "when logged in" do
-      context "as regular user" do
-        before { sign_in(Fabricate(:user)) }
+    context "when enable_experimental_hashtag_autocomplete disabled" do
+      # TODO (martin) Remove when enable_experimental_hashtag_autocomplete is default for all sites
+      before { SiteSetting.enable_experimental_hashtag_autocomplete = false }
+      context "when logged in" do
+        context "as regular user" do
+          before { sign_in(Fabricate(:user)) }
 
-        it "returns only valid categories and tags" do
-          get "/hashtags.json",
-              params: {
-                slugs: [category.slug, private_category.slug, "none", tag.name, hidden_tag.name],
-              }
+          it "returns only valid categories and tags" do
+            get "/hashtags.json",
+                params: {
+                  slugs: [category.slug, private_category.slug, "none", tag.name, hidden_tag.name],
+                }
 
-          expect(response.status).to eq(200)
-          expect(response.parsed_body).to eq(
-            "categories" => {
-              category.slug => category.url,
-            },
-            "tags" => {
-              tag.name => tag.full_url,
-            },
-          )
+            expect(response.status).to eq(200)
+            expect(response.parsed_body).to eq(
+              "categories" => {
+                category.slug => category.url,
+              },
+              "tags" => {
+                tag.name => tag.full_url,
+              },
+            )
+          end
+
+          it "handles tags with the TAG_HASHTAG_POSTFIX" do
+            get "/hashtags.json",
+                params: {
+                  slugs: ["#{tag.name}#{PrettyText::Helpers::TAG_HASHTAG_POSTFIX}"],
+                }
+
+            expect(response.status).to eq(200)
+            expect(response.parsed_body).to eq(
+              "categories" => {
+              },
+              "tags" => {
+                tag.name => tag.full_url,
+              },
+            )
+          end
+
+          it "does not return restricted categories or hidden tags" do
+            get "/hashtags.json", params: { slugs: [private_category.slug, hidden_tag.name] }
+
+            expect(response.status).to eq(200)
+            expect(response.parsed_body).to eq("categories" => {}, "tags" => {})
+          end
         end
 
-        it "handles tags with the TAG_HASHTAG_POSTFIX" do
-          get "/hashtags.json",
-              params: {
-                slugs: ["#{tag.name}#{PrettyText::Helpers::TAG_HASHTAG_POSTFIX}"],
-              }
+        context "as admin" do
+          fab!(:admin) { Fabricate(:admin) }
 
-          expect(response.status).to eq(200)
-          expect(response.parsed_body).to eq(
-            "categories" => {
-            },
-            "tags" => {
-              tag.name => tag.full_url,
-            },
-          )
+          before { sign_in(admin) }
+
+          it "returns restricted categories and hidden tags" do
+            group.add(admin)
+
+            get "/hashtags.json", params: { slugs: [private_category.slug, hidden_tag.name] }
+
+            expect(response.status).to eq(200)
+            expect(response.parsed_body).to eq(
+              "categories" => {
+                private_category.slug => private_category.url,
+              },
+              "tags" => {
+                hidden_tag.name => hidden_tag.full_url,
+              },
+            )
+          end
         end
 
-        it "does not return restricted categories or hidden tags" do
-          get "/hashtags.json", params: { slugs: [private_category.slug, hidden_tag.name] }
+        context "with sub-sub-categories" do
+          before do
+            SiteSetting.max_category_nesting = 3
+            sign_in(Fabricate(:user))
+          end
 
-          expect(response.status).to eq(200)
-          expect(response.parsed_body).to eq("categories" => {}, "tags" => {})
+          it "works" do
+            foo = Fabricate(:category_with_definition, slug: "foo")
+            foobar = Fabricate(:category_with_definition, slug: "bar", parent_category_id: foo.id)
+            foobarbaz =
+              Fabricate(:category_with_definition, slug: "baz", parent_category_id: foobar.id)
+
+            qux = Fabricate(:category_with_definition, slug: "qux")
+            quxbar = Fabricate(:category_with_definition, slug: "bar", parent_category_id: qux.id)
+            quxbarbaz =
+              Fabricate(:category_with_definition, slug: "baz", parent_category_id: quxbar.id)
+
+            invalid_slugs = [":"]
+            child_slugs = %w[bar baz]
+            deeply_nested_slugs = %w[foo:bar:baz qux:bar:baz]
+            get "/hashtags.json",
+                params: {
+                  slugs:
+                    invalid_slugs + child_slugs + deeply_nested_slugs +
+                      %w[foo foo:bar bar:baz qux qux:bar],
+                }
+
+            expect(response.status).to eq(200)
+            expect(response.parsed_body["categories"]).to eq(
+              "foo" => foo.url,
+              "foo:bar" => foobar.url,
+              "bar:baz" => foobarbaz.id < quxbarbaz.id ? foobarbaz.url : quxbarbaz.url,
+              "qux" => qux.url,
+              "qux:bar" => quxbar.url,
+            )
+          end
         end
       end
 
-      context "as admin" do
-        fab!(:admin) { Fabricate(:admin) }
-
-        before { sign_in(admin) }
-
-        it "returns restricted categories and hidden tags" do
-          group.add(admin)
-
-          get "/hashtags.json", params: { slugs: [private_category.slug, hidden_tag.name] }
-
-          expect(response.status).to eq(200)
-          expect(response.parsed_body).to eq(
-            "categories" => {
-              private_category.slug => private_category.url,
-            },
-            "tags" => {
-              hidden_tag.name => hidden_tag.full_url,
-            },
-          )
+      context "when not logged in" do
+        it "returns invalid access" do
+          get "/hashtags.json", params: { slugs: [] }
+          expect(response.status).to eq(403)
         end
       end
+    end
 
-      context "with sub-sub-categories" do
-        before do
-          SiteSetting.max_category_nesting = 3
-          sign_in(Fabricate(:user))
-        end
+    context "when enable_experimental_hashtag_autocomplete enabled" do
+      before { SiteSetting.enable_experimental_hashtag_autocomplete = true }
 
-        it "works" do
-          foo = Fabricate(:category_with_definition, slug: "foo")
-          foobar = Fabricate(:category_with_definition, slug: "bar", parent_category_id: foo.id)
-          foobarbaz =
-            Fabricate(:category_with_definition, slug: "baz", parent_category_id: foobar.id)
+      context "when logged in" do
+        context "as regular user" do
+          before { sign_in(Fabricate(:user)) }
 
-          qux = Fabricate(:category_with_definition, slug: "qux")
-          quxbar = Fabricate(:category_with_definition, slug: "bar", parent_category_id: qux.id)
-          quxbarbaz =
-            Fabricate(:category_with_definition, slug: "baz", parent_category_id: quxbar.id)
+          it "returns only valid categories and tags" do
+            get "/hashtags.json",
+                params: {
+                  slugs: [category.slug, private_category.slug, "none", tag.name, hidden_tag.name],
+                  order: %w[category tag],
+                }
 
-          get "/hashtags.json",
-              params: {
-                slugs: [
-                  ":", # should not work
-                  "foo",
-                  "bar", # should not work
-                  "baz", # should not work
-                  "foo:bar",
-                  "bar:baz",
-                  "foo:bar:baz", # should not work
-                  "qux",
-                  "qux:bar",
-                  "qux:bar:baz", # should not work
+            expect(response.status).to eq(200)
+            expect(response.parsed_body).to eq(
+              {
+                "category" => [
+                  {
+                    "relative_url" => category.url,
+                    "text" => category.name,
+                    "description" => nil,
+                    "icon" => "folder",
+                    "type" => "category",
+                    "ref" => category.slug,
+                    "slug" => category.slug,
+                    "id" => category.id,
+                  },
                 ],
-              }
+                "tag" => [
+                  {
+                    "relative_url" => tag.url,
+                    "text" => tag.name,
+                    "description" => nil,
+                    "icon" => "tag",
+                    "type" => "tag",
+                    "ref" => tag.name,
+                    "slug" => tag.name,
+                    "secondary_text" => "x0",
+                    "id" => tag.id,
+                  },
+                ],
+              },
+            )
+          end
 
-          expect(response.status).to eq(200)
-          expect(response.parsed_body["categories"]).to eq(
-            "foo" => foo.url,
-            "foo:bar" => foobar.url,
-            "bar:baz" => foobarbaz.id < quxbarbaz.id ? foobarbaz.url : quxbarbaz.url,
-            "qux" => qux.url,
-            "qux:bar" => quxbar.url,
-          )
+          it "handles tags with the ::tag type suffix" do
+            get "/hashtags.json", params: { slugs: ["#{tag.name}::tag"], order: %w[category tag] }
+
+            expect(response.status).to eq(200)
+            expect(response.parsed_body).to eq(
+              {
+                "category" => [],
+                "tag" => [
+                  {
+                    "relative_url" => tag.url,
+                    "text" => tag.name,
+                    "description" => nil,
+                    "icon" => "tag",
+                    "type" => "tag",
+                    "ref" => "#{tag.name}::tag",
+                    "slug" => tag.name,
+                    "secondary_text" => "x0",
+                    "id" => tag.id,
+                  },
+                ],
+              },
+            )
+          end
+
+          it "does not return restricted categories or hidden tags" do
+            get "/hashtags.json",
+                params: {
+                  slugs: [private_category.slug, hidden_tag.name],
+                  order: %w[category tag],
+                }
+
+            expect(response.status).to eq(200)
+            expect(response.parsed_body).to eq({ "category" => [], "tag" => [] })
+          end
         end
+
+        context "as admin" do
+          fab!(:admin) { Fabricate(:admin) }
+
+          before { sign_in(admin) }
+
+          it "returns restricted categories and hidden tags" do
+            group.add(admin)
+
+            get "/hashtags.json",
+                params: {
+                  slugs: [private_category.slug, hidden_tag.name],
+                  order: %w[category tag],
+                }
+
+            expect(response.status).to eq(200)
+            expect(response.parsed_body).to eq(
+              {
+                "category" => [
+                  {
+                    "relative_url" => private_category.url,
+                    "text" => private_category.name,
+                    "description" => nil,
+                    "icon" => "folder",
+                    "type" => "category",
+                    "ref" => private_category.slug,
+                    "slug" => private_category.slug,
+                    "id" => private_category.id,
+                  },
+                ],
+                "tag" => [
+                  {
+                    "relative_url" => hidden_tag.url,
+                    "text" => hidden_tag.name,
+                    "description" => nil,
+                    "icon" => "tag",
+                    "type" => "tag",
+                    "ref" => hidden_tag.name,
+                    "slug" => hidden_tag.name,
+                    "secondary_text" => "x0",
+                    "id" => hidden_tag.id,
+                  },
+                ],
+              },
+            )
+          end
+        end
+
+        context "with sub-sub-categories" do
+          before do
+            SiteSetting.max_category_nesting = 3
+            sign_in(Fabricate(:user))
+          end
+
+          it "works" do
+            foo = Fabricate(:category_with_definition, slug: "foo")
+            foobar = Fabricate(:category_with_definition, slug: "bar", parent_category_id: foo.id)
+            foobarbaz =
+              Fabricate(:category_with_definition, slug: "baz", parent_category_id: foobar.id)
+
+            qux = Fabricate(:category_with_definition, slug: "qux")
+            quxbar = Fabricate(:category_with_definition, slug: "bar", parent_category_id: qux.id)
+            quxbarbaz =
+              Fabricate(:category_with_definition, slug: "baz", parent_category_id: quxbar.id)
+
+            invalid_slugs = [":"]
+            child_slugs = %w[bar baz]
+            deeply_nested_slugs = %w[foo:bar:baz qux:bar:baz]
+            get "/hashtags.json",
+                params: {
+                  slugs:
+                    invalid_slugs + child_slugs + deeply_nested_slugs +
+                      %w[foo foo:bar bar:baz qux qux:bar],
+                  order: %w[category tag],
+                }
+
+            expect(response.status).to eq(200)
+            found_categories = response.parsed_body["category"]
+            expect(found_categories.map { |c| c["ref"] }).to match_array(
+              %w[foo foo:bar bar:baz qux qux:bar],
+            )
+            expect(found_categories.find { |c| c["ref"] == "foo" }["relative_url"]).to eq(foo.url)
+            expect(found_categories.find { |c| c["ref"] == "foo:bar" }["relative_url"]).to eq(
+              foobar.url,
+            )
+            expect(found_categories.find { |c| c["ref"] == "bar:baz" }["relative_url"]).to eq(
+              foobarbaz.url,
+            )
+            expect(found_categories.find { |c| c["ref"] == "qux" }["relative_url"]).to eq(qux.url)
+            expect(found_categories.find { |c| c["ref"] == "qux:bar" }["relative_url"]).to eq(
+              quxbar.url,
+            )
+          end
+        end
+      end
+
+      context "when not logged in" do
+        it "returns invalid access" do
+          get "/hashtags.json", params: { slugs: [], order: %w[category tag] }
+          expect(response.status).to eq(403)
+        end
+      end
+    end
+  end
+
+  describe "#search" do
+    fab!(:tag_2) { Fabricate(:tag, name: "random") }
+
+    context "when logged in" do
+      before { sign_in(Fabricate(:user)) }
+
+      it "returns the found category and then tag" do
+        get "/hashtags/search.json", params: { term: "rand", order: %w[category tag] }
+        expect(response.status).to eq(200)
+        expect(response.parsed_body["results"]).to eq(
+          [
+            {
+              "relative_url" => category.url,
+              "text" => category.name,
+              "description" => nil,
+              "icon" => "folder",
+              "type" => "category",
+              "ref" => category.slug,
+              "slug" => category.slug,
+              "id" => category.id,
+            },
+            {
+              "relative_url" => tag_2.url,
+              "text" => tag_2.name,
+              "description" => nil,
+              "icon" => "tag",
+              "type" => "tag",
+              "ref" => "#{tag_2.name}::tag",
+              "slug" => tag_2.name,
+              "secondary_text" => "x0",
+              "id" => tag_2.id,
+            },
+          ],
+        )
+      end
+
+      it "does not return hidden and restricted categories/tags" do
+        get "/hashtags/search.json", params: { term: "staff", order: %w[category tag] }
+        expect(response.status).to eq(200)
+        expect(response.parsed_body["results"]).to eq([])
+
+        get "/hashtags/search.json", params: { term: "hidden", order: %w[category tag] }
+        expect(response.status).to eq(200)
+        expect(response.parsed_body["results"]).to eq([])
+      end
+    end
+
+    context "when logged in as admin" do
+      before { sign_in(Fabricate(:admin)) }
+
+      it "returns hidden and restricted categories/tags" do
+        get "/hashtags/search.json", params: { term: "staff", order: %w[category tag] }
+        expect(response.status).to eq(200)
+        expect(response.parsed_body["results"]).to eq(
+          [
+            {
+              "relative_url" => private_category.url,
+              "text" => private_category.name,
+              "description" => nil,
+              "icon" => "folder",
+              "type" => "category",
+              "ref" => private_category.slug,
+              "slug" => private_category.slug,
+              "id" => private_category.id,
+            },
+          ],
+        )
+
+        get "/hashtags/search.json", params: { term: "hidden", order: %w[category tag] }
+        expect(response.status).to eq(200)
+        expect(response.parsed_body["results"]).to eq(
+          [
+            {
+              "relative_url" => hidden_tag.url,
+              "text" => hidden_tag.name,
+              "description" => nil,
+              "icon" => "tag",
+              "type" => "tag",
+              "ref" => "#{hidden_tag.name}",
+              "slug" => hidden_tag.name,
+              "secondary_text" => "x0",
+              "id" => hidden_tag.id,
+            },
+          ],
+        )
       end
     end
 
     context "when not logged in" do
       it "returns invalid access" do
-        get "/hashtags.json", params: { slugs: [] }
+        get "/hashtags/search.json", params: { term: "rand", order: %w[category tag] }
         expect(response.status).to eq(403)
       end
     end
   end
-
-  # TODO (martin) write a spec here for the new
-  # #lookup behaviour and the new #search behaviour
 end
diff --git a/spec/requests/invites_controller_spec.rb b/spec/requests/invites_controller_spec.rb
index a98fdfb635b..fabf6c1d304 100644
--- a/spec/requests/invites_controller_spec.rb
+++ b/spec/requests/invites_controller_spec.rb
@@ -444,8 +444,8 @@ RSpec.describe InvitesController do
 
           it "doesn’t inform the user" do
             create_invite
-            expect(response).to have_http_status :ok
-            expect(response.parsed_body).to be_blank
+            expect(response).to have_http_status :unprocessable_entity
+            expect(body).to match(/There was a problem with your request./)
           end
         end
       end
@@ -554,20 +554,6 @@ RSpec.describe InvitesController do
         expect(Jobs::InviteEmail.jobs.size).to eq(0)
       end
 
-      it "can send invite email" do
-        sign_in(user)
-        RateLimiter.enable
-        RateLimiter.clear_all!
-
-        invite = Fabricate(:invite, invited_by: user, email: "test@example.com")
-
-        expect { put "/invites/#{invite.id}", params: { send_email: true } }.to change {
-          RateLimiter.new(user, "resend-invite-per-hour", 10, 1.hour).remaining
-        }.by(-1)
-        expect(response.status).to eq(200)
-        expect(Jobs::InviteEmail.jobs.size).to eq(1)
-      end
-
       it "cannot create duplicated invites" do
         Fabricate(:invite, invited_by: admin, email: "test2@example.com")
 
@@ -575,6 +561,24 @@ RSpec.describe InvitesController do
         expect(response.status).to eq(409)
       end
 
+      describe "rate limiting" do
+        before { RateLimiter.enable }
+
+        use_redis_snapshotting
+
+        it "can send invite email" do
+          sign_in(user)
+
+          invite = Fabricate(:invite, invited_by: user, email: "test@example.com")
+
+          expect { put "/invites/#{invite.id}", params: { send_email: true } }.to change {
+            RateLimiter.new(user, "resend-invite-per-hour", 10, 1.hour).remaining
+          }.by(-1)
+          expect(response.status).to eq(200)
+          expect(Jobs::InviteEmail.jobs.size).to eq(1)
+        end
+      end
+
       context "when providing an email belonging to an existing user" do
         subject(:update_invite) { put "/invites/#{invite.id}.json", params: { email: admin.email } }
 
@@ -595,8 +599,8 @@ RSpec.describe InvitesController do
 
           it "doesn't inform the user" do
             update_invite
-            expect(response).to have_http_status :ok
-            expect(response.parsed_body).to be_blank
+            expect(response).to have_http_status :unprocessable_entity
+            expect(body).to match(/There was a problem with your request./)
           end
         end
       end
@@ -1382,7 +1386,12 @@ RSpec.describe InvitesController do
   describe "#resend_all_invites" do
     let(:admin) { Fabricate(:admin) }
 
-    before { SiteSetting.invite_expiry_days = 30 }
+    before do
+      SiteSetting.invite_expiry_days = 30
+      RateLimiter.enable
+    end
+
+    use_redis_snapshotting
 
     it "resends all non-redeemed invites by a user" do
       freeze_time
@@ -1405,8 +1414,6 @@ RSpec.describe InvitesController do
 
     it "errors if admins try to exceed limit of one bulk invite per day" do
       sign_in(admin)
-      RateLimiter.enable
-      RateLimiter.clear_all!
       start = Time.now
 
       freeze_time(start)
diff --git a/spec/requests/list_controller_spec.rb b/spec/requests/list_controller_spec.rb
index b465b449626..e332bdfa85f 100644
--- a/spec/requests/list_controller_spec.rb
+++ b/spec/requests/list_controller_spec.rb
@@ -68,7 +68,7 @@ RSpec.describe ListController do
     end
 
     (Discourse.anonymous_filters - [:categories]).each do |filter|
-      context "#{filter}" do
+      context "with #{filter}" do
         it "succeeds" do
           get "/#{filter}"
           expect(response.status).to eq(200)
@@ -106,6 +106,50 @@ RSpec.describe ListController do
       expect(first_item.css('[itemprop="url"]')[0]["href"]).to eq(topic.url)
     end
 
+    it "does not result in N+1 queries when topics have tags and tagging_enabled site setting is enabled" do
+      SiteSetting.tagging_enabled = true
+      tag = Fabricate(:tag)
+      topic.tags << tag
+
+      # warm up
+      get "/latest.json"
+      expect(response.status).to eq(200)
+
+      initial_sql_queries_count =
+        track_sql_queries do
+          get "/latest.json"
+
+          expect(response.status).to eq(200)
+
+          body = response.parsed_body
+
+          expect(body["topic_list"]["topics"].map { |t| t["id"] }).to contain_exactly(topic.id)
+          expect(body["topic_list"]["topics"][0]["tags"]).to contain_exactly(tag.name)
+        end.count
+
+      tag2 = Fabricate(:tag)
+      topic2 = Fabricate(:topic, tags: [tag2])
+
+      new_sql_queries_count =
+        track_sql_queries do
+          get "/latest.json"
+
+          expect(response.status).to eq(200)
+
+          body = response.parsed_body
+
+          expect(body["topic_list"]["topics"].map { |t| t["id"] }).to contain_exactly(
+            topic.id,
+            topic2.id,
+          )
+
+          expect(body["topic_list"]["topics"][0]["tags"]).to contain_exactly(tag2.name)
+          expect(body["topic_list"]["topics"][1]["tags"]).to contain_exactly(tag.name)
+        end.count
+
+      expect(new_sql_queries_count).to eq(initial_sql_queries_count)
+    end
+
     it "does not N+1 queries when topic featured users have different primary groups" do
       user.update!(primary_group: group)
 
@@ -1056,54 +1100,314 @@ RSpec.describe ListController do
     end
   end
 
-  describe "welcome topic" do
-    fab!(:welcome_topic) { Fabricate(:topic) }
-    fab!(:post) { Fabricate(:post, topic: welcome_topic) }
+  describe "#filter" do
+    fab!(:category) { Fabricate(:category, slug: "category-slug") }
+    fab!(:tag) { Fabricate(:tag, name: "tag1") }
+    fab!(:group) { Fabricate(:group) }
+    fab!(:private_category) { Fabricate(:private_category, group:, slug: "private-category-slug") }
+    fab!(:private_message_topic) { Fabricate(:private_message_topic) }
+    fab!(:topic_in_private_category) { Fabricate(:topic, category: private_category) }
 
-    before do
-      SiteSetting.welcome_topic_id = welcome_topic.id
-      SiteSetting.editing_grace_period = 1.minute.to_i
-      SiteSetting.bootstrap_mode_enabled = true
+    before { SiteSetting.experimental_topics_filter = true }
+
+    it "should not return topics that the user is not allowed to view" do
+      sign_in(user)
+
+      get "/filter.json"
+
+      expect(response.status).to eq(200)
+
+      expect(
+        response.parsed_body["topic_list"]["topics"].map { |topic| topic["id"] },
+      ).to contain_exactly(topic.id)
     end
 
-    it "is hidden for non-admins" do
-      get "/latest.json"
-      expect(response.status).to eq(200)
-      parsed = response.parsed_body
-      expect(parsed["topic_list"]["topics"].length).to eq(1)
-      expect(parsed["topic_list"]["topics"].first["id"]).not_to eq(welcome_topic.id)
+    it "should respond with 403 response code for an anonymous user" do
+      get "/filter.json"
+
+      expect(response.status).to eq(403)
     end
 
-    it "is shown to non-admins when there is an edit" do
-      post.revise(post.user, { raw: "#{post.raw}2" }, revised_at: post.updated_at + 2.minutes)
-      post.reload
-      expect(post.version).to eq(2)
+    it "should respond with 404 response code when `experimental_topics_filter` site setting has not been enabled" do
+      SiteSetting.experimental_topics_filter = false
 
-      get "/latest.json"
-      expect(response.status).to eq(200)
-      parsed = response.parsed_body
-      expect(parsed["topic_list"]["topics"].length).to eq(2)
-      expect(parsed["topic_list"]["topics"].first["id"]).to eq(welcome_topic.id)
+      sign_in(user)
+
+      get "/filter.json"
+
+      expect(response.status).to eq(404)
     end
 
-    it "is hidden to admins" do
-      sign_in(admin)
+    it "returns category definition topics if `show_category_definitions_in_topic_lists` site setting is enabled" do
+      category_topic = Fabricate(:topic, category: category)
+      category.update!(topic: category_topic)
+
+      SiteSetting.show_category_definitions_in_topic_lists = true
+
+      sign_in(user)
+
+      get "/filter.json"
 
-      get "/latest.json"
       expect(response.status).to eq(200)
-      parsed = response.parsed_body
-      expect(parsed["topic_list"]["topics"].length).to eq(1)
-      expect(parsed["topic_list"]["topics"].first["id"]).not_to eq(welcome_topic.id)
+
+      expect(
+        response.parsed_body["topic_list"]["topics"].map { |topic| topic["id"] },
+      ).to contain_exactly(topic.id, category_topic.id)
     end
 
-    it "is shown to users when bootstrap mode is disabled" do
-      SiteSetting.bootstrap_mode_enabled = false
+    it "does not return category definition topics if `show_category_definitions_in_topic_lists` site setting is disabled" do
+      category_topic = Fabricate(:topic, category: category)
+      category.update!(topic: category_topic)
+
+      SiteSetting.show_category_definitions_in_topic_lists = false
+
+      sign_in(user)
+
+      get "/filter.json"
 
-      get "/latest.json"
       expect(response.status).to eq(200)
-      parsed = response.parsed_body
-      expect(parsed["topic_list"]["topics"].length).to eq(2)
-      expect(parsed["topic_list"]["topics"].first["id"]).to eq(welcome_topic.id)
+
+      expect(
+        response.parsed_body["topic_list"]["topics"].map { |topic| topic["id"] },
+      ).to contain_exactly(topic.id)
+    end
+
+    it "should accept the `page` query parameter" do
+      topic_with_tag = Fabricate(:topic, tags: [tag])
+      topic2_with_tag = Fabricate(:topic, tags: [tag])
+
+      stub_const(TopicQuery, "DEFAULT_PER_PAGE_COUNT", 1) do
+        sign_in(user)
+
+        get "/filter.json", params: { q: "tags:tag1" }
+
+        expect(response.status).to eq(200)
+
+        parsed = response.parsed_body
+
+        expect(parsed["topic_list"]["topics"].length).to eq(1)
+        expect(parsed["topic_list"]["topics"].first["id"]).to eq(topic2_with_tag.id)
+
+        get "/filter.json", params: { q: "tags:tag1", page: 1 }
+
+        expect(response.status).to eq(200)
+
+        parsed = response.parsed_body
+
+        expect(parsed["topic_list"]["topics"].length).to eq(1)
+        expect(parsed["topic_list"]["topics"].first["id"]).to eq(topic_with_tag.id)
+      end
+    end
+
+    describe "when filtering with the `created-by:<username>` filter" do
+      fab!(:topic2) { Fabricate(:topic, user: admin) }
+
+      before do
+        topic.update!(user: user)
+        user.update!(username: "username")
+        admin.update!(username: "username2")
+      end
+
+      it "returns only topics created by the user when `q` query param is `created-by:username`" do
+        sign_in(user)
+
+        get "/filter.json", params: { q: "created-by:username" }
+
+        expect(response.status).to eq(200)
+
+        expect(
+          response.parsed_body["topic_list"]["topics"].map { |topic| topic["id"] },
+        ).to contain_exactly(topic.id)
+      end
+
+      it "returns only topics created by either user when `q` query param is `created-by:username,username2`" do
+        sign_in(user)
+
+        get "/filter.json", params: { q: "created-by:username,username2" }
+
+        expect(response.status).to eq(200)
+
+        expect(
+          response.parsed_body["topic_list"]["topics"].map { |topic| topic["id"] },
+        ).to contain_exactly(topic.id, topic2.id)
+      end
+    end
+
+    describe "when filtering with the `category:<category_slug>` filter" do
+      fab!(:topic_in_category) { Fabricate(:topic, category:) }
+
+      it "does not return any topics when `q` query param is `category:private-category-slug` and user is not allowed to see category" do
+        sign_in(user)
+
+        get "/filter.json", params: { q: "category:private-category-slug" }
+
+        expect(response.status).to eq(200)
+        expect(response.parsed_body["topic_list"]["topics"].map { |topic| topic["id"] }).to eq([])
+      end
+
+      it "returns only topics in the category when `q` query param is `category:private-category-slug` and user can see category" do
+        group.add(user)
+
+        sign_in(user)
+
+        get "/filter.json", params: { q: "category:private-category-slug" }
+
+        expect(response.status).to eq(200)
+
+        expect(
+          response.parsed_body["topic_list"]["topics"].map { |topic| topic["id"] },
+        ).to contain_exactly(topic_in_private_category.id)
+      end
+    end
+
+    describe "when filtering with the `in:<topic_notification_level>` filter" do
+      fab!(:user_muted_topic) do
+        Fabricate(:topic).tap do |topic|
+          TopicUser.change(
+            user.id,
+            topic.id,
+            notification_level: TopicUser.notification_levels[:muted],
+          )
+        end
+      end
+
+      fab!(:user_tracking_topic) do
+        Fabricate(:topic).tap do |topic|
+          TopicUser.change(
+            user.id,
+            topic.id,
+            notification_level: TopicUser.notification_levels[:tracking],
+          )
+        end
+      end
+
+      it "does not return topics that are muted by the user when `q` query param does not include `in:muted`" do
+        sign_in(user)
+
+        get "/filter.json", params: { q: "in:tracking" }
+
+        expect(response.status).to eq(200)
+
+        expect(response.parsed_body["topic_list"]["topics"].map { |topic| topic["id"] }).to eq(
+          [user_tracking_topic.id],
+        )
+      end
+
+      it "only return topics that are muted by the user when `q` query param is `in:muted`" do
+        sign_in(user)
+
+        get "/filter.json", params: { q: "in:muted" }
+
+        expect(response.status).to eq(200)
+
+        expect(response.parsed_body["topic_list"]["topics"].map { |topic| topic["id"] }).to eq(
+          [user_muted_topic.id],
+        )
+      end
+    end
+
+    describe "when ordering using the `order:` filter" do
+      fab!(:topic2) { Fabricate(:topic, views: 2) }
+      fab!(:topic3) { Fabricate(:topic, views: 3) }
+      fab!(:topic4) { Fabricate(:topic, views: 1) }
+
+      it "return topics ordered by topic bumped at date in descending order when `q` query param is not present" do
+        sign_in(user)
+
+        get "/filter.json"
+
+        expect(response.status).to eq(200)
+
+        expect(response.parsed_body["topic_list"]["topics"].map { |topic| topic["id"] }).to eq(
+          [topic4.id, topic3.id, topic2.id, topic.id],
+        )
+      end
+
+      it "return topics ordered by views when `q` query param is `order:views`" do
+        sign_in(user)
+
+        get "/filter.json", params: { q: "order:views" }
+
+        expect(response.status).to eq(200)
+
+        expect(response.parsed_body["topic_list"]["topics"].map { |topic| topic["id"] }).to eq(
+          [topic3.id, topic2.id, topic4.id, topic.id],
+        )
+      end
+    end
+
+    describe "when filtering by status" do
+      fab!(:group) { Fabricate(:group) }
+      fab!(:private_category) { Fabricate(:private_category, group: group) }
+      fab!(:topic_in_private_category) { Fabricate(:topic, category: private_category) }
+
+      it "does not return topics that are unlisted when `q` query param is `status:unlisted` for a user that cannot view unlisted topics" do
+        Topic.update_all(deleted_at: true)
+        topic.update!(visible: false)
+
+        sign_in(user)
+
+        get "/filter.json", params: { q: "status:unlisted" }
+
+        expect(response.status).to eq(200)
+        expect(response.parsed_body["topic_list"]["topics"].map { |topic| topic["id"] }).to eq([])
+      end
+
+      it "returns topics that are unlisted when `q` query param is `status:unlisted` for a user that can view unlisted topics" do
+        Topic.update_all(visible: true)
+        topic.update!(visible: false)
+
+        sign_in(admin)
+
+        get "/filter.json", params: { q: "status:unlisted" }
+
+        expect(response.status).to eq(200)
+
+        expect(
+          response.parsed_body["topic_list"]["topics"].map { |topic| topic["id"] },
+        ).to contain_exactly(topic.id)
+      end
+
+      it "ignores the `status` filter for a user that cannot view deleted topics when `q` query param is `status:deleted`" do
+        Topic.update_all(deleted_at: nil)
+        topic.update!(deleted_at: Time.zone.now)
+
+        sign_in(user)
+
+        get "/filter.json", params: { q: "status:deleted" }
+
+        expect(response.status).to eq(200)
+        expect(response.parsed_body["topic_list"]["topics"].map { |topic| topic["id"] }).to eq([])
+      end
+
+      it "returns topics that are deleted when `q` query param is `status:deleted` for a user that can view deleted topics" do
+        Topic.update_all(deleted_at: nil)
+        topic.update!(deleted_at: Time.zone.now)
+
+        sign_in(admin)
+
+        get "/filter.json", params: { q: "status:deleted" }
+
+        expect(response.status).to eq(200)
+
+        expect(
+          response.parsed_body["topic_list"]["topics"].map { |topic| topic["id"] },
+        ).to contain_exactly(topic.id)
+      end
+
+      it "does not return topics from read restricted categories when `q` query param is `status:public`" do
+        group.add(user)
+
+        sign_in(user)
+
+        get "/filter.json", params: { q: "status:public" }
+
+        expect(response.status).to eq(200)
+
+        expect(
+          response.parsed_body["topic_list"]["topics"].map { |topic| topic["id"] },
+        ).to contain_exactly(topic.id)
+      end
     end
   end
 end
diff --git a/spec/requests/notifications_controller_spec.rb b/spec/requests/notifications_controller_spec.rb
index e42b3caec6f..c940bf129b6 100644
--- a/spec/requests/notifications_controller_spec.rb
+++ b/spec/requests/notifications_controller_spec.rb
@@ -181,24 +181,6 @@ RSpec.describe NotificationsController do
             )
           end
 
-          it "gets notifications list with unread high priority notifications at the top when navigation menu is legacy" do
-            SiteSetting.navigation_menu = "legacy"
-
-            get "/notifications.json", params: { recent: true }
-
-            expect(response.status).to eq(200)
-
-            expect(response.parsed_body["notifications"].map { |n| n["id"] }).to eq(
-              [
-                unread_high_priority.id,
-                notification.id,
-                read_regular.id,
-                unread_regular.id,
-                read_high_priority.id,
-              ],
-            )
-          end
-
           it "should not bump last seen reviewable in readonly mode" do
             user.update!(admin: true)
 
@@ -295,16 +277,6 @@ RSpec.describe NotificationsController do
             )
           end
 
-          it "doesn't include reviewables when navigation menu is legacy" do
-            SiteSetting.navigation_menu = "legacy"
-            user.update!(admin: true)
-
-            get "/notifications.json", params: { recent: true }
-
-            expect(response.status).to eq(200)
-            expect(response.parsed_body.key?("pending_reviewables")).to eq(false)
-          end
-
           it "doesn't include reviewables if the user can't see the review queue" do
             user.update!(admin: false)
 
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
index cd46975b108..c641f1b2dd4 100644
--- a/spec/requests/posts_controller_spec.rb
+++ b/spec/requests/posts_controller_spec.rb
@@ -865,6 +865,25 @@ RSpec.describe PostsController do
         expect(response.body).to eq(original)
       end
 
+      it "returns a valid JSON response when the post is enqueued" do
+        SiteSetting.approve_unless_trust_level = 4
+
+        master_key = Fabricate(:api_key).key
+
+        post "/posts.json",
+             params: {
+               raw: "this is test post #{SecureRandom.alphanumeric}",
+               title: "this is a test title #{SecureRandom.alphanumeric}",
+             },
+             headers: {
+               HTTP_API_USERNAME: user.username,
+               HTTP_API_KEY: master_key,
+             }
+
+        expect(response.status).to eq(200)
+        expect(response.parsed_body["action"]).to eq("enqueued")
+      end
+
       it "allows to create posts in import_mode" do
         Jobs.run_immediately!
         NotificationEmailer.enable
@@ -1086,7 +1105,7 @@ RSpec.describe PostsController do
           user.reload
           expect(user).to be_silenced
 
-          rp = ReviewableQueuedPost.find_by(created_by: user)
+          rp = ReviewableQueuedPost.find_by(target_created_by: user)
           expect(rp.payload["typing_duration_msecs"]).to eq(100)
           expect(rp.payload["composer_open_duration_msecs"]).to eq(204)
           expect(rp.payload["reply_to_post_number"]).to eq(123)
@@ -1180,7 +1199,7 @@ RSpec.describe PostsController do
         parsed = response.parsed_body
 
         expect(parsed["action"]).to eq("enqueued")
-        reviewable = ReviewableQueuedPost.find_by(created_by: user)
+        reviewable = ReviewableQueuedPost.find_by(target_created_by: user)
         score = reviewable.reviewable_scores.first
         expect(score.reason).to eq("auto_silence_regex")
 
@@ -1203,7 +1222,7 @@ RSpec.describe PostsController do
         parsed = response.parsed_body
 
         expect(parsed["action"]).to eq("enqueued")
-        reviewable = ReviewableQueuedPost.find_by(created_by: user)
+        reviewable = ReviewableQueuedPost.find_by(target_created_by: user)
         score = reviewable.reviewable_scores.first
         expect(score.reason).to eq("auto_silence_regex")
 
@@ -1578,10 +1597,30 @@ RSpec.describe PostsController do
         end
       end
 
-      context "with mentions" do
+      context "when `enable_user_status` site setting is enabled" do
         fab!(:user_to_mention) { Fabricate(:user) }
 
+        before { SiteSetting.enable_user_status = true }
+
+        it "does not return mentioned users when `enable_user_status` site setting is disabled" do
+          SiteSetting.enable_user_status = false
+
+          post "/posts.json",
+               params: {
+                 raw: "I am mentioning @#{user_to_mention.username}",
+                 topic_id: topic.id,
+               }
+
+          expect(response.status).to eq(200)
+
+          json = response.parsed_body
+
+          expect(json["mentioned_users"]).to eq(nil)
+        end
+
         it "returns mentioned users" do
+          user_to_mention.set_status!("off to dentist", "tooth")
+
           post "/posts.json",
                params: {
                  raw: "I am mentioning @#{user_to_mention.username}",
@@ -1596,6 +1635,11 @@ RSpec.describe PostsController do
           expect(mentioned_user["id"]).to be(user_to_mention.id)
           expect(mentioned_user["name"]).to eq(user_to_mention.name)
           expect(mentioned_user["username"]).to eq(user_to_mention.username)
+
+          status = mentioned_user["status"]
+          expect(status).to be_present
+          expect(status["emoji"]).to eq(user_to_mention.user_status.emoji)
+          expect(status["description"]).to eq(user_to_mention.user_status.description)
         end
 
         it "returns an empty list of mentioned users if nobody was mentioned" do
@@ -1611,43 +1655,6 @@ RSpec.describe PostsController do
           expect(response.status).to eq(200)
           expect(response.parsed_body["mentioned_users"].length).to be(0)
         end
-
-        it "doesn't return user status on mentions by default" do
-          user_to_mention.set_status!("off to dentist", "tooth")
-
-          post "/posts.json",
-               params: {
-                 raw: "I am mentioning @#{user_to_mention.username}",
-                 topic_id: topic.id,
-               }
-
-          expect(response.status).to eq(200)
-          json = response.parsed_body
-          expect(json["mentioned_users"].length).to be(1)
-
-          status = json["mentioned_users"][0]["status"]
-          expect(status).to be_nil
-        end
-
-        it "returns user status on mentions if status is enabled in site settings" do
-          SiteSetting.enable_user_status = true
-          user_to_mention.set_status!("off to dentist", "tooth")
-
-          post "/posts.json",
-               params: {
-                 raw: "I am mentioning @#{user_to_mention.username}",
-                 topic_id: topic.id,
-               }
-
-          expect(response.status).to eq(200)
-          json = response.parsed_body
-          expect(json["mentioned_users"].length).to be(1)
-
-          status = json["mentioned_users"][0]["status"]
-          expect(status).to be_present
-          expect(status["emoji"]).to eq(user_to_mention.user_status.emoji)
-          expect(status["description"]).to eq(user_to_mention.user_status.description)
-        end
       end
     end
 
@@ -1985,7 +1992,7 @@ RSpec.describe PostsController do
       it "throws an exception for users" do
         sign_in(user)
         get "/posts/#{post.id}/revisions/#{post_revision.number}.json"
-        expect(response.status).to eq(404)
+        expect(response.status).to eq(403)
       end
 
       it "works for admins" do
@@ -2049,6 +2056,76 @@ RSpec.describe PostsController do
     end
   end
 
+  describe "#permanently_delete_revisions" do
+    before { SiteSetting.can_permanently_delete = true }
+
+    fab!(:post) do
+      Fabricate(
+        :post,
+        user: Fabricate(:user),
+        raw: "Lorem ipsum dolor sit amet, cu nam libris tractatos, ancillae senserit ius ex",
+      )
+    end
+
+    fab!(:post_with_no_revisions) do
+      Fabricate(
+        :post,
+        user: Fabricate(:user),
+        raw: "Lorem ipsum dolor sit amet, cu nam libris tractatos, ancillae senserit ius ex",
+      )
+    end
+
+    fab!(:post_revision) { Fabricate(:post_revision, post: post) }
+    fab!(:post_revision_2) { Fabricate(:post_revision, post: post) }
+
+    let(:post_id) { post.id }
+
+    describe "when logged in as a regular user" do
+      it "does not delete revisions" do
+        sign_in(user)
+        delete "/posts/#{post_id}/revisions/permanently_delete.json"
+        expect(response).to_not be_successful
+      end
+    end
+
+    describe "when logged in as staff" do
+      before { sign_in(admin) }
+
+      it "fails when post record is not found" do
+        delete "/posts/#{post_id + 1}/revisions/permanently_delete.json"
+        expect(response).to_not be_successful
+      end
+
+      it "fails when no post revisions are found" do
+        delete "/posts/#{post_with_no_revisions.id}/revisions/permanently_delete.json"
+        expect(response).to_not be_successful
+      end
+
+      it "fails when 'can_permanently_delete' setting is false" do
+        SiteSetting.can_permanently_delete = false
+        delete "/posts/#{post_id}/revisions/permanently_delete.json"
+        expect(response).to_not be_successful
+      end
+
+      it "permanently deletes revisions from post and adds a staff log" do
+        delete "/posts/#{post_id}/revisions/permanently_delete.json"
+        expect(response.status).to eq(200)
+
+        # It creates a staff log
+        logs =
+          UserHistory.find_by(
+            action: UserHistory.actions[:permanently_delete_post_revisions],
+            acting_user_id: admin.id,
+            post_id: post_id,
+          )
+        expect(logs).to be_present
+
+        # ensure post revisions are deleted
+        expect(PostRevision.where(post: post)).to eq([])
+      end
+    end
+  end
+
   describe "#revert" do
     include_examples "action requires login", :put, "/posts/123/revisions/2/revert.json"
 
@@ -2165,44 +2242,6 @@ RSpec.describe PostsController do
     end
   end
 
-  describe "#flagged_posts" do
-    include_examples "action requires login", :get, "/posts/system/flagged.json"
-
-    describe "when logged in" do
-      it "raises an error if the user doesn't have permission to see the flagged posts" do
-        sign_in(user)
-        get "/posts/system/flagged.json"
-        expect(response).to be_forbidden
-      end
-
-      it "can see the flagged posts when authorized" do
-        sign_in(moderator)
-        get "/posts/system/flagged.json"
-        expect(response.status).to eq(200)
-      end
-
-      it "only shows agreed and deferred flags" do
-        post_agreed = create_post(user: user)
-        post_deferred = create_post(user: user)
-        post_disagreed = create_post(user: user)
-
-        r0 = PostActionCreator.spam(moderator, post_agreed).reviewable
-        r1 = PostActionCreator.off_topic(moderator, post_deferred).reviewable
-        r2 = PostActionCreator.inappropriate(moderator, post_disagreed).reviewable
-
-        r0.perform(admin, :agree_and_keep)
-        r1.perform(admin, :ignore)
-        r2.perform(admin, :disagree)
-
-        sign_in(Fabricate(:moderator))
-        get "/posts/#{user.username}/flagged.json"
-        expect(response.status).to eq(200)
-
-        expect(response.parsed_body.length).to eq(2)
-      end
-    end
-  end
-
   describe "#deleted_posts" do
     include_examples "action requires login", :get, "/posts/system/deleted.json"
 
diff --git a/spec/requests/reviewables_controller_spec.rb b/spec/requests/reviewables_controller_spec.rb
index 286b86ec398..853750ad2f6 100644
--- a/spec/requests/reviewables_controller_spec.rb
+++ b/spec/requests/reviewables_controller_spec.rb
@@ -300,6 +300,16 @@ RSpec.describe ReviewablesController do
         expect(reviewables[0]["pending"]).to eq(true)
       end
 
+      it "responds with current user's reviewables count" do
+        reviewable = Fabricate(:reviewable)
+
+        get "/review/user-menu-list.json"
+
+        expect(response.status).to eq(200)
+        expect(response.parsed_body["reviewables"].length).to eq(1)
+        expect(response.parsed_body["reviewable_count"]).to eq(1)
+      end
+
       it "responds with pending reviewables only" do
         Fabricate(:reviewable, status: Reviewable.statuses[:approved])
         pending1 = Fabricate(:reviewable, status: Reviewable.statuses[:pending])
@@ -653,6 +663,9 @@ RSpec.describe ReviewablesController do
       fab!(:reviewable_post) { Fabricate(:reviewable_queued_post) }
       fab!(:reviewable_topic) { Fabricate(:reviewable_queued_post_topic) }
       fab!(:moderator) { Fabricate(:moderator) }
+      fab!(:reviewable_approved_post) do
+        Fabricate(:reviewable_queued_post, status: Reviewable.statuses[:approved])
+      end
 
       before { sign_in(moderator) }
 
@@ -730,6 +743,19 @@ RSpec.describe ReviewablesController do
         expect(json["version"] > 0).to eq(true)
       end
 
+      it "prevents you from updating an approved post" do
+        put "/review/#{reviewable_approved_post.id}.json?version=#{reviewable_approved_post.version}",
+            params: {
+              reviewable: {
+                payload: {
+                  raw: "new raw content",
+                },
+              },
+            }
+
+        expect(response.code).to eq("403")
+      end
+
       it "allows you to update a queued post (for new topic)" do
         new_category_id = Fabricate(:category).id
 
@@ -764,25 +790,94 @@ RSpec.describe ReviewablesController do
     describe "#destroy" do
       fab!(:user) { Fabricate(:user) }
 
-      before { sign_in(user) }
-
       it "returns 404 if the reviewable doesn't exist" do
+        sign_in(user)
         delete "/review/1234.json"
         expect(response.code).to eq("404")
       end
 
       it "returns 404 if the user can't see the reviewable" do
+        sign_in(user)
         queued_post = Fabricate(:reviewable_queued_post)
         delete "/review/#{queued_post.id}.json"
         expect(response.code).to eq("404")
       end
 
       it "returns 200 if the user can delete the reviewable" do
+        sign_in(user)
         queued_post = Fabricate(:reviewable_queued_post, created_by: user)
         delete "/review/#{queued_post.id}.json"
         expect(response.code).to eq("200")
         expect(queued_post.reload).to be_deleted
       end
+
+      it "denies attempts to destroy unowned reviewables" do
+        sign_in(admin)
+        queued_post = Fabricate(:reviewable_queued_post, created_by: user)
+        delete "/review/#{queued_post.id}.json"
+        expect(response.status).to eq(404)
+        # Reviewable is not deleted because request is not via API
+        expect(queued_post.reload).to be_present
+      end
+
+      shared_examples "for a passed user" do
+        it "deletes reviewable" do
+          api_key = Fabricate(:api_key).key
+          queued_post = Fabricate(:reviewable_queued_post, created_by: recipient)
+          delete "/review/#{queued_post.id}.json",
+                 params: {
+                   username: recipient.username,
+                 },
+                 headers: {
+                   HTTP_API_USERNAME: caller.username,
+                   HTTP_API_KEY: api_key,
+                 }
+
+          expect(response.status).to eq(response_code)
+
+          if reviewable_deleted
+            expect(queued_post.reload).to be_deleted
+          else
+            expect(queued_post.reload).to be_present
+          end
+        end
+      end
+
+      describe "api called by admin" do
+        include_examples "for a passed user" do
+          let(:caller) { Fabricate(:admin) }
+          let(:recipient) { user }
+          let(:response_code) { 200 }
+          let(:reviewable_deleted) { true }
+        end
+      end
+
+      describe "api called by tl4 user" do
+        include_examples "for a passed user" do
+          let(:caller) { Fabricate(:trust_level_4) }
+          let(:recipient) { user }
+          let(:response_code) { 403 }
+          let(:reviewable_deleted) { false }
+        end
+      end
+
+      describe "api called by regular user" do
+        include_examples "for a passed user" do
+          let(:caller) { user }
+          let(:recipient) { Fabricate(:user) }
+          let(:response_code) { 403 }
+          let(:reviewable_deleted) { false }
+        end
+      end
+
+      describe "api called by admin for another admin" do
+        include_examples "for a passed user" do
+          let(:caller) { Fabricate(:admin) }
+          let(:recipient) { Fabricate(:admin) }
+          let(:response_code) { 200 }
+          let(:reviewable_deleted) { true }
+        end
+      end
     end
 
     describe "#count" do
diff --git a/spec/requests/search_controller_spec.rb b/spec/requests/search_controller_spec.rb
index 52e22e26727..7d35ab71f1d 100644
--- a/spec/requests/search_controller_spec.rb
+++ b/spec/requests/search_controller_spec.rb
@@ -10,20 +10,19 @@ RSpec.describe SearchController do
   end
 
   fab!(:awesome_post) do
-    SearchIndexer.enable
-    Fabricate(:post, topic: awesome_topic, raw: "this is my really awesome post")
+    with_search_indexer_enabled do
+      Fabricate(:post, topic: awesome_topic, raw: "this is my really awesome post")
+    end
   end
 
   fab!(:awesome_post_2) do
-    SearchIndexer.enable
-    Fabricate(:post, raw: "this is my really awesome post 2")
+    with_search_indexer_enabled { Fabricate(:post, raw: "this is my really awesome post 2") }
   end
 
-  fab!(:user) { Fabricate(:user) }
+  fab!(:user) { with_search_indexer_enabled { Fabricate(:user) } }
 
   fab!(:user_post) do
-    SearchIndexer.enable
-    Fabricate(:post, raw: "#{user.username} is a cool person")
+    with_search_indexer_enabled { Fabricate(:post, raw: "#{user.username} is a cool person") }
   end
 
   context "with integration" do
@@ -229,6 +228,10 @@ RSpec.describe SearchController do
     end
 
     context "when rate limited" do
+      before { RateLimiter.enable }
+
+      use_redis_snapshotting
+
       def unlimited_request(ip_address = "1.2.3.4")
         get "/search/query.json", params: { term: "wookie" }, env: { REMOTE_ADDR: ip_address }
 
@@ -247,8 +250,6 @@ RSpec.describe SearchController do
       it "rate limits anon searches per user" do
         SiteSetting.rate_limit_search_anon_user_per_second = 2
         SiteSetting.rate_limit_search_anon_user_per_minute = 3
-        RateLimiter.enable
-        RateLimiter.clear_all!
 
         start = Time.now
         freeze_time start
@@ -269,8 +270,6 @@ RSpec.describe SearchController do
       it "rate limits anon searches globally" do
         SiteSetting.rate_limit_search_anon_global_per_second = 2
         SiteSetting.rate_limit_search_anon_global_per_minute = 3
-        RateLimiter.enable
-        RateLimiter.clear_all!
 
         t = Time.now
         freeze_time t
@@ -290,8 +289,6 @@ RSpec.describe SearchController do
 
         it "rate limits logged in searches" do
           SiteSetting.rate_limit_search_user = 3
-          RateLimiter.enable
-          RateLimiter.clear_all!
 
           3.times do
             get "/search/query.json", params: { term: "wookie" }
@@ -368,6 +365,10 @@ RSpec.describe SearchController do
     end
 
     context "when rate limited" do
+      before { RateLimiter.enable }
+
+      use_redis_snapshotting
+
       def unlimited_request(ip_address = "1.2.3.4")
         get "/search.json", params: { q: "wookie" }, env: { REMOTE_ADDR: ip_address }
 
@@ -386,8 +387,6 @@ RSpec.describe SearchController do
       it "rate limits anon searches per user" do
         SiteSetting.rate_limit_search_anon_user_per_second = 2
         SiteSetting.rate_limit_search_anon_user_per_minute = 3
-        RateLimiter.enable
-        RateLimiter.clear_all!
 
         t = Time.now
         freeze_time t
@@ -406,15 +405,14 @@ RSpec.describe SearchController do
       it "rate limits anon searches globally" do
         SiteSetting.rate_limit_search_anon_global_per_second = 2
         SiteSetting.rate_limit_search_anon_global_per_minute = 3
-        RateLimiter.enable
-        RateLimiter.clear_all!
+
+        t = Time.now
+        freeze_time t
 
         unlimited_request("1.1.1.1")
         unlimited_request("2.2.2.2")
         limited_request("3.3.3.3")
 
-        t = Time.now
-        freeze_time t
         freeze_time(t + 2)
 
         unlimited_request("4.4.4.4")
@@ -426,8 +424,6 @@ RSpec.describe SearchController do
 
         it "rate limits searches" do
           SiteSetting.rate_limit_search_user = 3
-          RateLimiter.enable
-          RateLimiter.clear_all!
 
           3.times do
             get "/search.json", params: { q: "bantha" }
@@ -469,35 +465,37 @@ RSpec.describe SearchController do
     fab!(:very_high_priority_topic) { Fabricate(:topic, category: very_high_priority_category) }
 
     fab!(:very_low_priority_post) do
-      SearchIndexer.enable
-      Fabricate(:post, topic: very_low_priority_topic, raw: "This is a very Low Priority Post")
+      with_search_indexer_enabled do
+        Fabricate(:post, topic: very_low_priority_topic, raw: "This is a very Low Priority Post")
+      end
     end
 
     fab!(:low_priority_post) do
-      SearchIndexer.enable
-
-      Fabricate(
-        :post,
-        topic: low_priority_topic,
-        raw: "This is a Low Priority Post",
-        created_at: 1.day.ago,
-      )
+      with_search_indexer_enabled do
+        Fabricate(
+          :post,
+          topic: low_priority_topic,
+          raw: "This is a Low Priority Post",
+          created_at: 1.day.ago,
+        )
+      end
     end
 
     fab!(:high_priority_post) do
-      SearchIndexer.enable
-      Fabricate(:post, topic: high_priority_topic, raw: "This is a High Priority Post")
+      with_search_indexer_enabled do
+        Fabricate(:post, topic: high_priority_topic, raw: "This is a High Priority Post")
+      end
     end
 
     fab!(:very_high_priority_post) do
-      SearchIndexer.enable
-
-      Fabricate(
-        :post,
-        topic: very_high_priority_topic,
-        raw: "This is a Old but Very High Priority Post",
-        created_at: 2.days.ago,
-      )
+      with_search_indexer_enabled do
+        Fabricate(
+          :post,
+          topic: very_high_priority_topic,
+          raw: "This is a Old but Very High Priority Post",
+          created_at: 2.days.ago,
+        )
+      end
     end
 
     it "sort posts with search priority when search term is empty" do
diff --git a/spec/requests/session_controller_spec.rb b/spec/requests/session_controller_spec.rb
index 38eea176b17..f399c34a647 100644
--- a/spec/requests/session_controller_spec.rb
+++ b/spec/requests/session_controller_spec.rb
@@ -826,7 +826,7 @@ RSpec.describe SessionController do
     end
 
     it "redirects to random url if it is allowed" do
-      SiteSetting.discourse_connect_allows_all_return_paths = true
+      SiteSetting.discourse_connect_allowed_redirect_domains = "gusundtrout.com|foobar.com"
 
       sso = get_sso("https://gusundtrout.com")
       sso.external_id = "666"
@@ -838,6 +838,32 @@ RSpec.describe SessionController do
       expect(response).to redirect_to("https://gusundtrout.com")
     end
 
+    it "allows wildcard character to redirect to any domain" do
+      SiteSetting.discourse_connect_allowed_redirect_domains = "*|foo.com"
+
+      sso = get_sso("https://foobar.com")
+      sso.external_id = "666"
+      sso.email = "bob@bob.com"
+      sso.name = "Sam Saffron"
+      sso.username = "sam"
+
+      get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
+      expect(response).to redirect_to("https://foobar.com")
+    end
+
+    it "does not allow wildcard character in domains" do
+      SiteSetting.discourse_connect_allowed_redirect_domains = "*.foobar.com|foobar.com"
+
+      sso = get_sso("https://sub.foobar.com")
+      sso.external_id = "666"
+      sso.email = "bob@bob.com"
+      sso.name = "Sam Saffron"
+      sso.username = "sam"
+
+      get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
+      expect(response).to redirect_to("/")
+    end
+
     it "redirects to root if the host of the return_path is different" do
       sso = get_sso("//eviltrout.com")
       sso.external_id = "666"
@@ -2324,10 +2350,12 @@ RSpec.describe SessionController do
     end
 
     context "when rate limited" do
+      before { RateLimiter.enable }
+
+      use_redis_snapshotting
+
       it "rate limits login" do
         SiteSetting.max_logins_per_ip_per_hour = 2
-        RateLimiter.enable
-        RateLimiter.clear_all!
         EmailToken.confirm(email_token.token)
 
         2.times do
@@ -2345,9 +2373,6 @@ RSpec.describe SessionController do
       end
 
       it "rate limits second factor attempts by IP" do
-        RateLimiter.enable
-        RateLimiter.clear_all!
-
         6.times do |x|
           post "/session.json",
                params: {
@@ -2374,8 +2399,6 @@ RSpec.describe SessionController do
       end
 
       it "rate limits second factor attempts by login" do
-        RateLimiter.enable
-        RateLimiter.clear_all!
         EmailToken.confirm(email_token.token)
 
         6.times do |x|
@@ -2618,44 +2641,47 @@ RSpec.describe SessionController do
       )
     end
 
-    it "should correctly rate limits" do
-      RateLimiter.enable
-      RateLimiter.clear_all!
+    describe "rate limiting" do
+      before { RateLimiter.enable }
 
-      user = Fabricate(:user)
+      use_redis_snapshotting
+
+      it "should correctly rate limits" do
+        user = Fabricate(:user)
+
+        3.times do
+          post "/session/forgot_password.json", params: { login: user.username }
+          expect(response.status).to eq(200)
+          expect(response.parsed_body["error"]).not_to be_present
+        end
 
-      3.times do
         post "/session/forgot_password.json", params: { login: user.username }
-        expect(response.status).to eq(200)
-        expect(response.parsed_body["error"]).not_to be_present
-      end
+        expect(response.status).to eq(422)
 
-      post "/session/forgot_password.json", params: { login: user.username }
-      expect(response.status).to eq(422)
+        3.times do
+          post "/session/forgot_password.json",
+               params: {
+                 login: user.username,
+               },
+               headers: {
+                 "REMOTE_ADDR" => "10.1.1.1",
+               }
+
+          expect(response.status).to eq(200)
+          expect(response.parsed_body["error"]).not_to be_present
+        end
 
-      3.times do
         post "/session/forgot_password.json",
              params: {
                login: user.username,
              },
              headers: {
-               "REMOTE_ADDR" => "10.1.1.1",
+               "REMOTE_ADDR" => "100.1.1.1",
              }
 
-        expect(response.status).to eq(200)
-        expect(response.parsed_body["error"]).not_to be_present
+        # not allowed, max 6 a day
+        expect(response.status).to eq(422)
       end
-
-      post "/session/forgot_password.json",
-           params: {
-             login: user.username,
-           },
-           headers: {
-             "REMOTE_ADDR" => "100.1.1.1",
-           }
-
-      # not allowed, max 6 a day
-      expect(response.status).to eq(422)
     end
 
     context "for a non existant username" do
diff --git a/spec/requests/sidebar_sections_controller_spec.rb b/spec/requests/sidebar_sections_controller_spec.rb
new file mode 100644
index 00000000000..a8a0bb3764a
--- /dev/null
+++ b/spec/requests/sidebar_sections_controller_spec.rb
@@ -0,0 +1,530 @@
+# frozen_string_literal: true
+
+RSpec.describe SidebarSectionsController do
+  fab!(:user) { Fabricate(:user) }
+  fab!(:admin) { Fabricate(:admin) }
+  fab!(:moderator) { Fabricate(:moderator) }
+
+  describe "#index" do
+    fab!(:sidebar_section) { Fabricate(:sidebar_section, title: "private section", user: user) }
+    fab!(:sidebar_url_1) { Fabricate(:sidebar_url, name: "tags", value: "/tags") }
+    fab!(:sidebar_url_2) { Fabricate(:sidebar_url, name: "categories", value: "/categories") }
+    fab!(:section_link_1) do
+      Fabricate(:sidebar_section_link, sidebar_section: sidebar_section, linkable: sidebar_url_1)
+    end
+    fab!(:sidebar_section_2) { Fabricate(:sidebar_section, title: "public section", public: true) }
+    fab!(:section_link_2) do
+      Fabricate(:sidebar_section_link, sidebar_section: sidebar_section, linkable: sidebar_url_2)
+    end
+
+    it "returns public and private sections" do
+      sign_in(user)
+      get "/sidebar_sections.json"
+      expect(response.status).to eq(200)
+      expect(response.parsed_body["sidebar_sections"].map { |section| section["title"] }).to eq(
+        ["Community", "public section", "private section"],
+      )
+    end
+  end
+
+  describe "#create" do
+    it "is not available for anonymous" do
+      post "/sidebar_sections.json",
+           params: {
+             title: "custom section",
+             links: [
+               { icon: "link", name: "categories", value: "/categories" },
+               { icon: "link", name: "tags", value: "/tags" },
+             ],
+           }
+      expect(response.status).to eq(403)
+    end
+
+    it "creates custom section for user" do
+      sign_in(user)
+      expect(SidebarSection.count).to eq(1)
+
+      post "/sidebar_sections.json",
+           params: {
+             title: "custom section",
+             links: [
+               {
+                 icon: "link",
+                 name: "categories",
+                 value: "http://#{Discourse.current_hostname}/categories",
+               },
+               { icon: "address-book", name: "tags", value: "/tags" },
+               { icon: "external-link-alt", name: "Discourse", value: "https://discourse.org" },
+               { icon: "external-link-alt", name: "My preferences", value: "/my/preferences" },
+             ],
+           }
+
+      expect(response.status).to eq(200)
+
+      expect(SidebarSection.count).to eq(2)
+      sidebar_section = SidebarSection.last
+
+      expect(sidebar_section.title).to eq("custom section")
+      expect(sidebar_section.user).to eq(user)
+      expect(sidebar_section.public).to be false
+      expect(UserHistory.count).to eq(0)
+      expect(sidebar_section.sidebar_urls.count).to eq(4)
+      expect(sidebar_section.sidebar_urls.first.icon).to eq("link")
+      expect(sidebar_section.sidebar_urls.first.name).to eq("categories")
+      expect(sidebar_section.sidebar_urls.first.value).to eq("/categories")
+      expect(sidebar_section.sidebar_urls.first.external).to be false
+      expect(sidebar_section.sidebar_urls.second.icon).to eq("address-book")
+      expect(sidebar_section.sidebar_urls.second.name).to eq("tags")
+      expect(sidebar_section.sidebar_urls.second.value).to eq("/tags")
+      expect(sidebar_section.sidebar_urls.second.external).to be false
+      expect(sidebar_section.sidebar_urls.third.icon).to eq("external-link-alt")
+      expect(sidebar_section.sidebar_urls.third.name).to eq("Discourse")
+      expect(sidebar_section.sidebar_urls.third.value).to eq("https://discourse.org")
+      expect(sidebar_section.sidebar_urls.third.external).to be true
+      expect(sidebar_section.sidebar_urls.fourth.icon).to eq("external-link-alt")
+      expect(sidebar_section.sidebar_urls.fourth.name).to eq("My preferences")
+      expect(sidebar_section.sidebar_urls.fourth.value).to eq("/my/preferences")
+      expect(sidebar_section.sidebar_urls.fourth.external).to be false
+    end
+
+    it "validates max number of links" do
+      SiteSetting.max_sidebar_section_links = 5
+
+      sign_in(user)
+
+      links =
+        6.times.map do
+          { icon: "external-link-alt", name: "My preferences", value: "/my/preferences" }
+        end
+
+      post "/sidebar_sections.json", params: { title: "custom section", links: links }
+
+      expect(response.status).to eq(422)
+      expect(response.parsed_body["errors"]).to eq(
+        ["Maximum 5 records are allowed. Got 6 records instead."],
+      )
+    end
+
+    it "does not allow regular user to create public section" do
+      sign_in(user)
+
+      post "/sidebar_sections.json",
+           params: {
+             title: "custom section",
+             public: true,
+             links: [
+               { icon: "link", name: "categories", value: "/categories" },
+               { icon: "address-book", name: "tags", value: "/tags" },
+             ],
+           }
+
+      expect(response.status).to eq(403)
+    end
+
+    it "does not allow moderator to create public section" do
+      sign_in(moderator)
+
+      post "/sidebar_sections.json",
+           params: {
+             title: "custom section",
+             public: true,
+             links: [
+               { icon: "link", name: "categories", value: "/categories" },
+               { icon: "address-book", name: "tags", value: "/tags" },
+             ],
+           }
+
+      expect(response.status).to eq(403)
+    end
+
+    it "allows admin to create public section" do
+      sign_in(admin)
+
+      post "/sidebar_sections.json",
+           params: {
+             title: "custom section",
+             public: true,
+             links: [
+               { icon: "link", name: "categories", value: "/categories" },
+               { icon: "address-book", name: "tags", value: "/tags" },
+             ],
+           }
+
+      expect(response.status).to eq(200)
+
+      sidebar_section = SidebarSection.last
+      expect(sidebar_section.title).to eq("custom section")
+      expect(sidebar_section.public).to be true
+      expect(sidebar_section.user_id).to be Discourse.system_user.id
+
+      user_history = UserHistory.last
+      expect(user_history.action).to eq(UserHistory.actions[:create_public_sidebar_section])
+      expect(user_history.subject).to eq("custom section")
+      expect(user_history.details).to eq("links: categories - /categories, tags - /tags")
+    end
+  end
+
+  describe "#update" do
+    fab!(:sidebar_section) { Fabricate(:sidebar_section, user: user) }
+    fab!(:sidebar_url_1) { Fabricate(:sidebar_url, name: "tags", value: "/tags") }
+    fab!(:sidebar_url_2) { Fabricate(:sidebar_url, name: "categories", value: "/categories") }
+
+    fab!(:section_link_1) do
+      Fabricate(:sidebar_section_link, sidebar_section: sidebar_section, linkable: sidebar_url_1)
+    end
+
+    fab!(:section_link_2) do
+      Fabricate(:sidebar_section_link, sidebar_section: sidebar_section, linkable: sidebar_url_2)
+    end
+
+    let(:community_section) do
+      SidebarSection.find_by(section_type: SidebarSection.section_types[:community])
+    end
+
+    it "allows user to update their own section and links" do
+      sign_in(user)
+
+      put "/sidebar_sections/#{sidebar_section.id}.json",
+          params: {
+            title: "custom section edited",
+            links: [
+              { icon: "link", id: sidebar_url_1.id, name: "latest", value: "/latest" },
+              { icon: "link", id: sidebar_url_2.id, name: "tags", value: "/tags", _destroy: "1" },
+            ],
+          }
+
+      expect(response.status).to eq(200)
+
+      expect(sidebar_section.reload.title).to eq("custom section edited")
+      expect(UserHistory.count).to eq(0)
+      expect(sidebar_url_1.reload.name).to eq("latest")
+      expect(sidebar_url_1.value).to eq("/latest")
+      expect { section_link_2.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect { sidebar_url_2.reload }.to raise_error(ActiveRecord::RecordNotFound)
+    end
+
+    it "allows admin to update public section and links" do
+      sign_in(admin)
+      sidebar_section.update!(public: true)
+
+      put "/sidebar_sections/#{sidebar_section.id}.json",
+          params: {
+            title: "custom section edited",
+            links: [
+              {
+                icon: "link",
+                name: "meta",
+                value: "https://meta.discourse.org",
+                segment: "primary",
+              },
+              { icon: "link", id: sidebar_url_1.id, name: "latest", value: "/latest" },
+              { icon: "link", id: sidebar_url_2.id, name: "tags", value: "/tags", _destroy: "1" },
+              {
+                icon: "link",
+                name: "homepage",
+                value: "https://discourse.org",
+                segment: "secondary",
+              },
+            ],
+          }
+
+      expect(response.status).to eq(200)
+
+      expect(sidebar_section.reload.title).to eq("custom section edited")
+      expect(sidebar_url_1.reload.name).to eq("latest")
+      expect(sidebar_url_1.value).to eq("/latest")
+      expect { section_link_2.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect { sidebar_url_2.reload }.to raise_error(ActiveRecord::RecordNotFound)
+
+      urls = sidebar_section.sidebar_urls
+      expect(urls[0].name).to eq("meta")
+      expect(urls[0].value).to eq("https://meta.discourse.org")
+      expect(urls[0].segment).to eq("primary")
+      expect(urls[1].name).to eq("latest")
+      expect(urls[1].value).to eq("/latest")
+      expect(urls[2].name).to eq("homepage")
+      expect(urls[2].value).to eq("https://discourse.org")
+      expect(urls[2].segment).to eq("secondary")
+
+      user_history = UserHistory.last
+      expect(user_history.action).to eq(UserHistory.actions[:update_public_sidebar_section])
+      expect(user_history.subject).to eq("custom section edited")
+      expect(user_history.details).to eq(
+        "links: latest - /latest, meta - https://meta.discourse.org, homepage - https://discourse.org",
+      )
+    end
+
+    it "validates limit of links" do
+      SiteSetting.max_sidebar_section_links = 5
+
+      sign_in(user)
+
+      links =
+        6.times.map do
+          { icon: "external-link-alt", name: "My preferences", value: "/my/preferences" }
+        end
+
+      put "/sidebar_sections/#{sidebar_section.id}.json",
+          params: {
+            title: "custom section",
+            links: links,
+          }
+
+      expect(response.status).to eq(422)
+      expect(response.parsed_body["errors"]).to eq(
+        ["Maximum 5 records are allowed. Got 6 records instead."],
+      )
+    end
+
+    it "doesn't allow to edit other's sections" do
+      sidebar_section_2 = Fabricate(:sidebar_section)
+      sidebar_url_3 = Fabricate(:sidebar_url, name: "other_tags", value: "/tags")
+      Fabricate(:sidebar_section_link, sidebar_section: sidebar_section_2, linkable: sidebar_url_3)
+      sign_in(user)
+
+      put "/sidebar_sections/#{sidebar_section_2.id}.json",
+          params: {
+            title: "custom section edited",
+            links: [{ icon: "link", id: sidebar_url_3.id, name: "takeover", value: "/categories" }],
+          }
+
+      expect(response.status).to eq(403)
+    end
+
+    it "doesn't allow to edit public sections" do
+      sign_in(user)
+      sidebar_section.update!(public: true)
+
+      put "/sidebar_sections/#{sidebar_section.id}.json",
+          params: {
+            title: "custom section edited",
+            links: [
+              { icon: "link", id: sidebar_url_1.id, name: "latest", value: "/latest" },
+              { icon: "link", id: sidebar_url_2.id, name: "tags", value: "/tags", _destroy: "1" },
+            ],
+          }
+
+      expect(response.status).to eq(403)
+    end
+
+    it "doesn't allow to edit other's links" do
+      sidebar_url_3 = Fabricate(:sidebar_url, name: "other_tags", value: "/tags")
+
+      Fabricate(
+        :sidebar_section_link,
+        sidebar_section: Fabricate(:sidebar_section),
+        linkable: sidebar_url_3,
+      )
+
+      sign_in(user)
+
+      put "/sidebar_sections/#{sidebar_section.id}.json",
+          params: {
+            title: "custom section edited",
+            links: [{ icon: "link", id: sidebar_url_3.id, name: "takeover", value: "/categories" }],
+          }
+
+      expect(response.status).to eq(404)
+      expect(sidebar_url_3.reload.name).to eq("other_tags")
+    end
+
+    it "doesn't allow users to edit community section" do
+      sign_in(user)
+
+      put "/sidebar_sections/#{community_section.id}.json",
+          params: {
+            title: "custom section edited",
+            links: [],
+          }
+
+      expect(response.status).to eq(403)
+    end
+
+    it "allows admin to edit community section" do
+      sign_in(admin)
+
+      topics_link = community_section.sidebar_urls.find_by(name: "Topics")
+      my_posts_link = community_section.sidebar_urls.find_by(name: "My Posts")
+
+      community_section
+        .sidebar_section_links
+        .where.not(linkable_id: [topics_link.id, my_posts_link.id])
+        .destroy_all
+
+      put "/sidebar_sections/#{community_section.id}.json",
+          params: {
+            title: "community section edited",
+            links: [
+              { icon: "link", id: my_posts_link.id, name: "my posts edited", value: "/my_posts" },
+              { icon: "link", id: topics_link.id, name: "topics edited", value: "/new" },
+            ],
+          }
+
+      expect(response.status).to eq(200)
+
+      expect(community_section.reload.title).to eq("community section edited")
+      expect(community_section.sidebar_urls[0].name).to eq("my posts edited")
+      expect(community_section.sidebar_urls[0].value).to eq("/my_posts")
+      expect(community_section.sidebar_urls[1].name).to eq("topics edited")
+      expect(community_section.sidebar_urls[1].value).to eq("/new")
+    end
+  end
+
+  describe "#reorder" do
+    fab!(:user2) { Fabricate(:user) }
+    fab!(:sidebar_section) { Fabricate(:sidebar_section, user: user) }
+    fab!(:sidebar_url_1) { Fabricate(:sidebar_url, name: "tags", value: "/tags") }
+    fab!(:sidebar_url_2) { Fabricate(:sidebar_url, name: "categories", value: "/categories") }
+    fab!(:sidebar_url_3) { Fabricate(:sidebar_url, name: "topic", value: "/t/1") }
+
+    fab!(:section_link_1) do
+      Fabricate(:sidebar_section_link, sidebar_section: sidebar_section, linkable: sidebar_url_1)
+    end
+
+    fab!(:section_link_2) do
+      Fabricate(:sidebar_section_link, sidebar_section: sidebar_section, linkable: sidebar_url_2)
+    end
+
+    fab!(:section_link_3) do
+      Fabricate(:sidebar_section_link, sidebar_section: sidebar_section, linkable: sidebar_url_3)
+    end
+
+    it "sorts links" do
+      expect(sidebar_section.sidebar_urls.pluck(:id)).to eq(
+        [sidebar_url_1.id, sidebar_url_2.id, sidebar_url_3.id],
+      )
+
+      sign_in(user)
+
+      post "/sidebar_sections/reorder.json",
+           params: {
+             sidebar_section_id: sidebar_section.id,
+             links_order: [sidebar_url_2.id, sidebar_url_3.id, sidebar_url_1.id],
+           }
+
+      expect(response.status).to eq(200)
+
+      expect(sidebar_section.reload.sidebar_urls.pluck(:id)).to eq(
+        [sidebar_url_2.id, sidebar_url_3.id, sidebar_url_1.id],
+      )
+    end
+
+    it "returns 403 when a user tries to reorder a section that doesn't belong to them" do
+      sign_in(user2)
+
+      post "/sidebar_sections/reorder.json",
+           params: {
+             sidebar_section_id: sidebar_section.id,
+             links_order: [sidebar_url_2.id, sidebar_url_3.id, sidebar_url_1.id],
+           }
+
+      expect(response.status).to eq(403)
+
+      expect(sidebar_section.reload.sidebar_urls.pluck(:id)).to eq(
+        [sidebar_url_1.id, sidebar_url_2.id, sidebar_url_3.id],
+      )
+    end
+
+    it "returns 403 for an non user" do
+      post "/sidebar_sections/reorder.json",
+           params: {
+             sidebar_section_id: sidebar_section.id,
+             links_order: [sidebar_url_2.id, sidebar_url_3.id, sidebar_url_1.id],
+           }
+
+      expect(response.status).to eql(403)
+    end
+  end
+
+  describe "#destroy" do
+    fab!(:sidebar_section) { Fabricate(:sidebar_section, user: user) }
+
+    let(:community_section) do
+      SidebarSection.find_by(section_type: SidebarSection.section_types[:community])
+    end
+
+    it "allows user to delete their own section" do
+      sign_in(user)
+      delete "/sidebar_sections/#{sidebar_section.id}.json"
+
+      expect(response.status).to eq(200)
+
+      expect { sidebar_section.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect(UserHistory.count).to eq(0)
+    end
+
+    it "allows admin to delete public section" do
+      sign_in(admin)
+      sidebar_section.update!(public: true)
+      delete "/sidebar_sections/#{sidebar_section.id}.json"
+
+      expect(response.status).to eq(200)
+
+      expect { sidebar_section.reload }.to raise_error(ActiveRecord::RecordNotFound)
+
+      user_history = UserHistory.last
+      expect(user_history.action).to eq(UserHistory.actions[:destroy_public_sidebar_section])
+      expect(user_history.subject).to eq("Sidebar section")
+    end
+
+    it "doesn't allow to delete other's sidebar section" do
+      sidebar_section_2 = Fabricate(:sidebar_section)
+      sign_in(user)
+      delete "/sidebar_sections/#{sidebar_section_2.id}.json"
+
+      expect(response.status).to eq(403)
+    end
+
+    it "doesn't allow to delete public sidebar section" do
+      sign_in(user)
+      sidebar_section.update!(public: true)
+      delete "/sidebar_sections/#{sidebar_section.id}.json"
+
+      expect(response.status).to eq(403)
+    end
+
+    it "doesn't allow moderator to delete public sidebar section" do
+      sign_in(moderator)
+      sidebar_section.update!(public: true)
+      delete "/sidebar_sections/#{sidebar_section.id}.json"
+
+      expect(response.status).to eq(403)
+    end
+  end
+
+  describe "#reset" do
+    let(:community_section) do
+      SidebarSection.find_by(section_type: SidebarSection.section_types[:community])
+    end
+
+    it "doesn't allow user to reset community section" do
+      sign_in(user)
+      SidebarSection.any_instance.expects(:reset_community!).never
+      put "/sidebar_sections/reset/#{community_section.id}.json"
+      expect(response.status).to eq(403)
+    end
+
+    it "doesn't allow staff to reset community section" do
+      sign_in(moderator)
+      SidebarSection.any_instance.expects(:reset_community!).never
+      put "/sidebar_sections/reset/#{community_section.id}.json"
+      expect(response.status).to eq(403)
+    end
+
+    it "allows admins to reset community section to default" do
+      sign_in(admin)
+      SidebarSection.any_instance.expects(:reset_community!).once
+      put "/sidebar_sections/reset/#{community_section.id}.json"
+      expect(response.status).to eq(200)
+      expect(response.parsed_body["sidebar_section"]["id"]).to eq(community_section.id)
+      expect(response.parsed_body["sidebar_section"]["title"]).to eq(community_section.title)
+    end
+
+    it "doesn't allow admin to delete community sidebar section" do
+      sign_in(admin)
+      delete "/sidebar_sections/#{community_section.id}.json"
+
+      expect(response.status).to eq(403)
+    end
+  end
+end
diff --git a/spec/requests/similar_topics_controller_spec.rb b/spec/requests/similar_topics_controller_spec.rb
index b70b90c2742..f71c39cd36c 100644
--- a/spec/requests/similar_topics_controller_spec.rb
+++ b/spec/requests/similar_topics_controller_spec.rb
@@ -18,8 +18,7 @@ RSpec.describe SimilarTopicsController do
     end
 
     def reindex_posts
-      SearchIndexer.enable
-      Jobs::ReindexSearch.new.rebuild_posts
+      with_search_indexer_enabled { Jobs::ReindexSearch.new.rebuild_posts }
     end
 
     it "requires a title param" do
diff --git a/spec/requests/slugs_controller_spec.rb b/spec/requests/slugs_controller_spec.rb
new file mode 100644
index 00000000000..14b9ae53399
--- /dev/null
+++ b/spec/requests/slugs_controller_spec.rb
@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+RSpec.describe SlugsController do
+  fab!(:current_user) { Fabricate(:user, trust_level: TrustLevel[4]) }
+
+  describe "#generate" do
+    let(:name) { "Arts & Media" }
+
+    context "when user not logged in" do
+      it "returns a 403 error" do
+        post "/slugs.json", params: { name: name }
+        expect(response.status).to eq(403)
+      end
+    end
+
+    context "when user is logged in" do
+      before { sign_in(current_user) }
+
+      it "generates a slug from the name" do
+        post "/slugs.json", params: { name: name }
+        expect(response.status).to eq(200)
+        expect(response.parsed_body["slug"]).to eq(Slug.for(name, ""))
+      end
+
+      it "requires name" do
+        post "/slugs.json"
+        expect(response.status).to eq(400)
+      end
+
+      describe "rate limiting" do
+        before { RateLimiter.enable }
+
+        use_redis_snapshotting
+
+        it "rate limits" do
+          stub_const(SlugsController, "MAX_SLUG_GENERATIONS_PER_MINUTE", 1) do
+            post "/slugs.json?name=#{name}"
+            post "/slugs.json?name=#{name}"
+          end
+
+          expect(response.status).to eq(429)
+        end
+      end
+
+      context "when user is not TL4 or higher" do
+        before { current_user.change_trust_level!(1) }
+
+        it "returns a 403 error" do
+          post "/slugs.json?name=#{name}"
+          expect(response.status).to eq(403)
+        end
+      end
+
+      context "when user is admin" do
+        fab!(:current_user) { Fabricate(:admin) }
+
+        it "generates a slug from the name" do
+          post "/slugs.json", params: { name: name }
+          expect(response.status).to eq(200)
+          expect(response.parsed_body["slug"]).to eq(Slug.for(name, ""))
+        end
+      end
+    end
+  end
+end
diff --git a/spec/requests/static_controller_spec.rb b/spec/requests/static_controller_spec.rb
index 0fc1f68f4aa..102ddfa0e6a 100644
--- a/spec/requests/static_controller_spec.rb
+++ b/spec/requests/static_controller_spec.rb
@@ -122,6 +122,22 @@ RSpec.describe StaticController do
         File.delete(file_path)
       end
     end
+
+    it "can serve sourcemaps on adjacent paths" do
+      assets_path = Rails.root.join("public/assets")
+
+      FileUtils.mkdir_p(assets_path)
+
+      file_path = assets_path.join("test.map")
+      File.write(file_path, "fake source map")
+      GlobalSetting.stubs(:cdn_url).returns("https://www.example.com/")
+
+      get "/brotli_asset/test.map"
+
+      expect(response.status).to eq(200)
+    ensure
+      File.delete(file_path)
+    end
   end
 
   describe "#cdn_asset" do
@@ -170,7 +186,7 @@ RSpec.describe StaticController do
       ["tos", :tos_url, I18n.t("js.tos")],
       ["privacy", :privacy_policy_url, I18n.t("js.privacy")],
     ].each do |id, setting_name, text|
-      context "#{id}" do
+      context "with #{id}" do
         context "when #{setting_name} site setting is NOT set" do
           it "renders the #{id} page" do
             get "/#{id}"
@@ -273,9 +289,9 @@ RSpec.describe StaticController do
         Discourse::Application.routes.send(:eval_block, routes)
 
         topic_id = Fabricate(:post, cooked: "contact info").topic_id
-        SiteSetting.setting(:test_contact_topic_id, topic_id)
+        SiteSetting.test_some_topic_id = topic_id
 
-        Plugin::Instance.new.add_topic_static_page("contact", topic_id: "test_contact_topic_id")
+        Plugin::Instance.new.add_topic_static_page("contact", topic_id: "test_some_topic_id")
 
         get "/contact"
 
@@ -285,14 +301,15 @@ RSpec.describe StaticController do
 
       it "replaces existing topic-backed pages" do
         topic_id = Fabricate(:post, cooked: "Regular FAQ").topic_id
-        SiteSetting.setting(:test_faq_topic_id, topic_id)
+        SiteSetting.test_some_topic_id = topic_id
+
         polish_topic_id = Fabricate(:post, cooked: "Polish FAQ").topic_id
-        SiteSetting.setting(:test_polish_faq_topic_id, polish_topic_id)
+        SiteSetting.test_some_other_topic_id = polish_topic_id
 
         Plugin::Instance
           .new
           .add_topic_static_page("faq") do
-            current_user&.locale == "pl" ? "test_polish_faq_topic_id" : "test_faq_topic_id"
+            current_user&.locale == "pl" ? "test_some_other_topic_id" : "test_some_topic_id"
           end
 
         get "/faq"
diff --git a/spec/requests/stylesheets_controller_spec.rb b/spec/requests/stylesheets_controller_spec.rb
index 4622d5e163b..ffaf9e8e3cc 100644
--- a/spec/requests/stylesheets_controller_spec.rb
+++ b/spec/requests/stylesheets_controller_spec.rb
@@ -60,6 +60,62 @@ RSpec.describe StylesheetsController do
     expect(response.status).to eq(200)
   end
 
+  context "when there are enabled plugins" do
+    fab!(:user) { Fabricate(:user) }
+
+    let(:plugin) do
+      plugin = plugin_from_fixtures("my_plugin")
+      plugin.register_css "body { padding: 1px 2px 3px 4px; }"
+      plugin
+    end
+
+    before do
+      Discourse.plugins << plugin
+      plugin.activate!
+      Stylesheet::Importer.register_imports!
+      StylesheetCache.destroy_all
+      SiteSetting.has_login_hint = false
+      SiteSetting.allow_user_locale = true
+      sign_in(user)
+    end
+
+    after do
+      Discourse.plugins.delete(plugin)
+      Stylesheet::Importer.register_imports!
+      DiscoursePluginRegistry.reset!
+    end
+
+    it "can lookup plugin specific css" do
+      get "/"
+
+      html = Nokogiri::HTML5.fragment(response.body)
+      expect(html.at("link[data-target=my_plugin_rtl]")).to eq(nil)
+
+      href = html.at("link[data-target=my_plugin]").attribute("href").value
+      get href
+
+      expect(response.status).to eq(200)
+      expect(response.headers["Content-Type"]).to eq("text/css")
+      expect(response.body).to include("body{padding:1px 2px 3px 4px}")
+      expect(response.body).not_to include("body{padding:1px 4px 3px 2px}")
+
+      user.locale = "ar" # RTL locale
+      user.save!
+      get "/"
+
+      html = Nokogiri::HTML5.fragment(response.body)
+      expect(html.at("link[data-target=my_plugin]")).to eq(nil)
+
+      href = html.at("link[data-target=my_plugin_rtl]").attribute("href").value
+      get href
+
+      expect(response.status).to eq(200)
+      expect(response.headers["Content-Type"]).to eq("text/css")
+      expect(response.body).to include("body{padding:1px 4px 3px 2px}")
+      expect(response.body).not_to include("body{padding:1px 2px 3px 4px}")
+    end
+  end
+
   it "ignores Accept header and does not include Vary header" do
     StylesheetCache.destroy_all
     manager = Stylesheet::Manager.new(theme_id: nil)
diff --git a/spec/requests/svg_sprite_controller_spec.rb b/spec/requests/svg_sprite_controller_spec.rb
index a61634f6e4a..9dd57fe047d 100644
--- a/spec/requests/svg_sprite_controller_spec.rb
+++ b/spec/requests/svg_sprite_controller_spec.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 RSpec.describe SvgSpriteController do
+  fab!(:user) { Fabricate(:user) }
+
   describe "#show" do
     before { SvgSprite.expire_cache }
 
@@ -38,7 +40,7 @@ RSpec.describe SvgSpriteController do
     end
 
     it "should return symbol for FA icon search" do
-      user = sign_in(Fabricate(:user))
+      sign_in(user)
 
       get "/svg-sprite/search/fa-bolt"
       expect(response.status).to eq(200)
@@ -46,7 +48,7 @@ RSpec.describe SvgSpriteController do
     end
 
     it "should return 404 when looking for non-existent FA icon" do
-      user = sign_in(Fabricate(:user))
+      sign_in(user)
 
       get "/svg-sprite/search/fa-not-a-valid-icon"
       expect(response.status).to eq(404)
@@ -68,7 +70,7 @@ RSpec.describe SvgSpriteController do
 
       SiteSetting.default_theme_id = theme.id
 
-      user = sign_in(Fabricate(:user))
+      sign_in(user)
 
       get "/svg-sprite/search/fa-my-custom-theme-icon"
       expect(response.status).to eq(200)
@@ -77,8 +79,14 @@ RSpec.describe SvgSpriteController do
   end
 
   describe "#icon_picker_search" do
+    it "should return 403 for anonymous users" do
+      get "/svg-sprite/picker-search"
+
+      expect(response.status).to eq(403)
+    end
+
     it "should work with no filter and max out at 200 results" do
-      user = sign_in(Fabricate(:user))
+      sign_in(user)
       get "/svg-sprite/picker-search"
 
       expect(response.status).to eq(200)
@@ -89,7 +97,7 @@ RSpec.describe SvgSpriteController do
     end
 
     it "should filter" do
-      user = sign_in(Fabricate(:user))
+      sign_in(user)
 
       get "/svg-sprite/picker-search", params: { filter: "500px" }
 
@@ -99,6 +107,21 @@ RSpec.describe SvgSpriteController do
       expect(data.length).to eq(1)
       expect(data[0]["id"]).to eq("fab-500px")
     end
+
+    it "should display only available" do
+      sign_in(user)
+
+      get "/svg-sprite/picker-search"
+      data = response.parsed_body
+      beer_icon = response.parsed_body.find { |i| i["id"] == "beer" }
+      expect(beer_icon).to be_present
+
+      get "/svg-sprite/picker-search", params: { only_available: "true" }
+      data = response.parsed_body
+      beer_icon = response.parsed_body.find { |i| i["id"] == "beer" }
+      expect(beer_icon).to be nil
+      expect(data.length).to eq(200)
+    end
   end
 
   describe "#svg_icon" do
diff --git a/spec/requests/tags_controller_spec.rb b/spec/requests/tags_controller_spec.rb
index 7d60fae1b1f..5a054498dee 100644
--- a/spec/requests/tags_controller_spec.rb
+++ b/spec/requests/tags_controller_spec.rb
@@ -167,9 +167,10 @@ RSpec.describe TagsController do
 
       it "works for tags in groups" do
         tag_group = Fabricate(:tag_group, tags: [test_tag, topic_tag, synonym])
-        get "/tags.json"
-        expect(response.status).to eq(200)
 
+        get "/tags.json"
+
+        expect(response.status).to eq(200)
         tags = response.parsed_body["tags"]
         expect(tags.length).to eq(0)
         group = response.parsed_body.dig("extras", "tag_groups")&.first
@@ -177,11 +178,143 @@ RSpec.describe TagsController do
         expect(group["tags"].length).to eq(2)
         expect(group["tags"].map { |t| t["id"] }).to contain_exactly(test_tag.name, topic_tag.name)
       end
+
+      it "does not result in N+1 queries with multiple tag_groups" do
+        tag_group1 = Fabricate(:tag_group, tags: [test_tag, topic_tag, synonym])
+
+        # warm up
+        get "/tags.json"
+        expect(response.status).to eq(200)
+
+        initial_sql_queries_count =
+          track_sql_queries do
+            get "/tags.json"
+
+            expect(response.status).to eq(200)
+
+            tag_groups = response.parsed_body.dig("extras", "tag_groups")
+
+            expect(tag_groups.length).to eq(1)
+            expect(tag_groups.map { |tag_group| tag_group["name"] }).to contain_exactly(
+              tag_group1.name,
+            )
+          end.length
+
+        tag_group2 = Fabricate(:tag_group, tags: [topic_tag])
+
+        new_sql_queries_count =
+          track_sql_queries do
+            get "/tags.json"
+
+            expect(response.status).to eq(200)
+
+            tag_groups = response.parsed_body.dig("extras", "tag_groups")
+
+            expect(tag_groups.length).to eq(2)
+            expect(tag_groups.map { |tag_group| tag_group["name"] }).to contain_exactly(
+              tag_group1.name,
+              tag_group2.name,
+            )
+          end.length
+
+        expect(new_sql_queries_count).to be <= initial_sql_queries_count
+      end
     end
 
     context "with tags_listed_by_group disabled" do
       before { SiteSetting.tags_listed_by_group = false }
       include_examples "retrieves the right tags"
+
+      it "returns the right tags and categories tags for admin user" do
+        category.update!(tags: [test_tag])
+
+        sign_in(admin)
+
+        get "/tags.json"
+
+        expect(response.status).to eq(200)
+
+        tags = response.parsed_body["tags"]
+
+        expect(tags.length).to eq(2)
+
+        expect(tags[0]["name"]).to eq(test_tag.name)
+        expect(tags[0]["text"]).to eq(test_tag.name)
+        expect(tags[0]["description"]).to eq(test_tag.description)
+        expect(tags[0]["count"]).to eq(0)
+        expect(tags[0]["pm_count"]).to eq(nil)
+        expect(tags[0]["target_tag"]).to eq(nil)
+
+        expect(tags[1]["name"]).to eq(topic_tag.name)
+
+        categories = response.parsed_body["extras"]["categories"]
+
+        expect(categories[0]["id"]).to eq(category.id)
+        expect(categories[0]["tags"].length).to eq(1)
+        expect(categories[0]["tags"][0]["name"]).to eq(test_tag.name)
+        expect(categories[0]["tags"][0]["text"]).to eq(test_tag.name)
+        expect(categories[0]["tags"][0]["description"]).to eq(test_tag.description)
+        expect(categories[0]["tags"][0]["count"]).to eq(0)
+        expect(categories[0]["tags"][0]["pm_count"]).to eq(nil)
+        expect(categories[0]["tags"][0]["target_tag"]).to eq(nil)
+      end
+
+      it "does not result in N+1 queries when there are multiple categories configured with tags for an admin user" do
+        category.update!(tags: [test_tag])
+
+        sign_in(admin)
+
+        # warm up
+        get "/tags.json"
+        expect(response.status).to eq(200)
+
+        tags = response.parsed_body["tags"]
+
+        expect(tags.length).to eq(2)
+        expect(tags.map { |tag| tag["name"] }).to eq([test_tag.name, topic_tag.name])
+
+        initial_sql_queries_count =
+          track_sql_queries do
+            get "/tags.json"
+
+            expect(response.status).to eq(200)
+
+            tags = response.parsed_body["tags"]
+
+            expect(tags.length).to eq(2)
+            expect(tags.map { |tag| tag["name"] }).to eq([test_tag.name, topic_tag.name])
+
+            categories = response.parsed_body["extras"]["categories"]
+
+            expect(categories.length).to eq(1)
+            expect(categories[0]["id"]).to eq(category.id)
+            expect(categories[0]["tags"].map { |tag| tag["name"] }).to eq([test_tag.name])
+          end.length
+
+        category2 = Fabricate(:category, tags: [topic_tag])
+
+        new_sql_queries_count =
+          track_sql_queries do
+            get "/tags.json"
+
+            expect(response.status).to eq(200)
+
+            tags = response.parsed_body["tags"]
+
+            expect(tags.length).to eq(2)
+            expect(tags.map { |tag| tag["name"] }).to eq([test_tag.name, topic_tag.name])
+
+            categories = response.parsed_body["extras"]["categories"]
+
+            expect(categories.length).to eq(2)
+            expect(categories[0]["id"]).to eq(category.id)
+            expect(categories[0]["tags"].map { |tag| tag["name"] }).to eq([test_tag.name])
+            expect(categories[1]["id"]).to eq(category2.id)
+            expect(categories[1]["tags"].map { |tag| tag["name"] }).to eq([topic_tag.name])
+          end.length
+
+        expect(new_sql_queries_count).to eq(initial_sql_queries_count)
+      end
     end
 
     context "with hidden tags" do
@@ -301,6 +434,28 @@ RSpec.describe TagsController do
       expect(response.status).to eq(200)
     end
 
+    it "can handle additional tags in query params" do
+      tag2 = Fabricate(:tag)
+      topic_with_two_tags = Fabricate(:topic, tags: [tag, tag2])
+
+      get "/tag/test.json?match_all_tags=true&tags[]=#{tag2.name}"
+      expect(response.status).to eq(200)
+      expect(response.parsed_body["topic_list"]["topics"].map { |t| t["id"] }).to contain_exactly(
+        topic_with_two_tags.id,
+      )
+    end
+
+    it "can handle duplicate tags in query params" do
+      tag2 = Fabricate(:tag)
+      topic_with_two_tags = Fabricate(:topic, tags: [tag, tag2])
+
+      get "/tag/test.json?match_all_tags=true&tags[]=test&tags[]=#{tag2.name}"
+      expect(response.status).to eq(200)
+      expect(response.parsed_body["topic_list"]["topics"].map { |t| t["id"] }).to contain_exactly(
+        topic_with_two_tags.id,
+      )
+    end
+
     it "handles special tag 'none'" do
       SiteSetting.pm_tags_allowed_for_groups = "1|2|3"
 
@@ -1180,18 +1335,19 @@ RSpec.describe TagsController do
   end
 
   describe "#destroy_synonym" do
+    subject(:destroy_synonym) { delete("/tag/#{tag.name}/synonyms/#{synonym.name}.json") }
+
     fab!(:tag) { Fabricate(:tag) }
     fab!(:synonym) { Fabricate(:tag, target_tag: tag, name: "synonym") }
-    subject { delete("/tag/#{tag.name}/synonyms/#{synonym.name}.json") }
 
     it "fails if not logged in" do
-      subject
+      destroy_synonym
       expect(response.status).to eq(403)
     end
 
     it "fails if not staff user" do
       sign_in(user)
-      subject
+      destroy_synonym
       expect(response.status).to eq(403)
     end
 
@@ -1200,7 +1356,7 @@ RSpec.describe TagsController do
 
       it "can remove a synonym from a tag" do
         synonym2 = Fabricate(:tag, target_tag: tag, name: "synonym2")
-        expect { subject }.to_not change { Tag.count }
+        expect { destroy_synonym }.to_not change { Tag.count }
         expect_same_tag_names(tag.reload.synonyms, [synonym2])
         expect(synonym.reload).to_not be_synonym
       end
@@ -1273,4 +1429,144 @@ RSpec.describe TagsController do
       expect(tag_user.notification_level).to eq(NotificationLevels.all[:muted])
     end
   end
+
+  describe "#list" do
+    fab!(:tag3) { Fabricate(:tag, name: "tag3") }
+    fab!(:tag2) { Fabricate(:tag, name: "tag2") }
+    fab!(:tag1) { Fabricate(:tag, name: "tag") }
+
+    fab!(:staff_only_tag) { Fabricate(:tag, name: "tag4") }
+
+    let!(:staff_tag_group) do
+      Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [staff_only_tag.name])
+    end
+
+    it "should return 403 for an anonymous user" do
+      get "/tags/list.json"
+
+      expect(response.status).to eq(403)
+    end
+
+    it "should return 404 when tagging is disabled" do
+      SiteSetting.tagging_enabled = false
+
+      sign_in(user)
+
+      get "/tags/list.json"
+
+      expect(response.status).to eq(404)
+    end
+
+    it "should only return tags that are visible to the user for non admin users" do
+      stub_const(TagsController, "LIST_LIMIT", 2) do
+        sign_in(user)
+
+        get "/tags/list.json"
+
+        expect(response.status).to eq(200)
+
+        expect(response.parsed_body["list_tags"].map { |tag| tag["name"] }).to eq(
+          [tag1.name, tag2.name],
+        )
+
+        expect(response.parsed_body["meta"]["total_rows_list_tags"]).to eq(3)
+        expect(response.parsed_body["meta"]["load_more_list_tags"]).to eq(
+          "/tags/list.json?offset=1",
+        )
+
+        get response.parsed_body["meta"]["load_more_list_tags"]
+
+        expect(response.status).to eq(200)
+        expect(response.parsed_body["list_tags"].map { |tag| tag["name"] }).to eq([tag3.name])
+        expect(response.parsed_body["meta"]["total_rows_list_tags"]).to eq(3)
+
+        expect(response.parsed_body["meta"]["load_more_list_tags"]).to eq(
+          "/tags/list.json?offset=2",
+        )
+      end
+    end
+
+    it "should return all tags for admin users" do
+      stub_const(TagsController, "LIST_LIMIT", 2) do
+        sign_in(admin)
+
+        get "/tags/list.json"
+
+        expect(response.status).to eq(200)
+
+        expect(response.parsed_body["list_tags"].map { |tag| tag["name"] }).to eq(
+          [tag1.name, tag2.name],
+        )
+
+        expect(response.parsed_body["meta"]["total_rows_list_tags"]).to eq(4)
+
+        expect(response.parsed_body["meta"]["load_more_list_tags"]).to eq(
+          "/tags/list.json?offset=1",
+        )
+
+        get response.parsed_body["meta"]["load_more_list_tags"]
+
+        expect(response.status).to eq(200)
+
+        expect(response.parsed_body["list_tags"].map { |tag| tag["name"] }).to eq(
+          [tag3.name, staff_only_tag.name],
+        )
+
+        expect(response.parsed_body["meta"]["total_rows_list_tags"]).to eq(4)
+
+        expect(response.parsed_body["meta"]["load_more_list_tags"]).to eq(
+          "/tags/list.json?offset=2",
+        )
+      end
+    end
+
+    it "accepts a `filter` param and filters the tags by tag name" do
+      sign_in(user)
+
+      get "/tags/list.json", params: { filter: "3" }
+
+      expect(response.status).to eq(200)
+
+      expect(response.parsed_body["list_tags"].map { |tag| tag["name"] }).to eq([tag3.name])
+      expect(response.parsed_body["meta"]["total_rows_list_tags"]).to eq(1)
+
+      expect(response.parsed_body["meta"]["load_more_list_tags"]).to eq(
+        "/tags/list.json?offset=1&filter=3",
+      )
+    end
+
+    it "accepts a `only_tags` param and filters the tags by the given tags" do
+      sign_in(user)
+
+      get "/tags/list.json", params: { only_tags: "#{tag1.name},#{tag3.name}" }
+
+      expect(response.status).to eq(200)
+
+      expect(response.parsed_body["list_tags"].map { |tag| tag["name"] }).to eq(
+        [tag1.name, tag3.name],
+      )
+
+      expect(response.parsed_body["meta"]["total_rows_list_tags"]).to eq(2)
+
+      expect(response.parsed_body["meta"]["load_more_list_tags"]).to eq(
+        "/tags/list.json?offset=1&only_tags=#{tag1.name}%2C#{tag3.name}",
+      )
+    end
+
+    it "accepts a `exclude_tags` params and filters tags excluding the given tags" do
+      sign_in(user)
+
+      get "/tags/list.json", params: { exclude_tags: "#{tag1.name},#{tag3.name}" }
+
+      expect(response.status).to eq(200)
+
+      expect(response.parsed_body["list_tags"].map { |tag| tag["name"] }).to eq([tag2.name])
+
+      expect(response.parsed_body["meta"]["total_rows_list_tags"]).to eq(1)
+
+      expect(response.parsed_body["meta"]["load_more_list_tags"]).to eq(
+        "/tags/list.json?offset=1&exclude_tags=#{tag1.name}%2C#{tag3.name}",
+      )
+    end
+  end
 end
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index e729d1207d2..9b19ce1243e 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -36,21 +36,7 @@ RSpec.describe TopicsController do
 
   fab!(:tag) { Fabricate(:tag) }
 
-  before do
-    [
-      user,
-      user_2,
-      post_author1,
-      post_author2,
-      post_author3,
-      post_author4,
-      post_author5,
-      post_author6,
-      trust_level_0,
-      trust_level_1,
-      trust_level_4,
-    ].each { |u| Group.user_trust_level_change!(u.id, u.trust_level) }
-  end
+  before { SiteSetting.personal_message_enabled_groups = Group::AUTO_GROUPS[:everyone] }
 
   describe "#wordpress" do
     before { sign_in(moderator) }
@@ -372,6 +358,29 @@ RSpec.describe TopicsController do
       end
     end
 
+    describe "moving chronologically to an existing topic" do
+      before { sign_in(moderator) }
+
+      fab!(:p1) { Fabricate(:post, user: moderator, created_at: dest_topic.created_at - 1.hour) }
+      fab!(:topic) { p1.topic }
+
+      context "with success" do
+        it "returns success" do
+          post "/t/#{topic.id}/move-posts.json",
+               params: {
+                 post_ids: [p1.id],
+                 destination_topic_id: dest_topic.id,
+                 chronological_order: "true",
+               }
+
+          expect(response.status).to eq(200)
+          result = response.parsed_body
+          expect(result["success"]).to eq(true)
+          expect(result["url"]).to be_present
+        end
+      end
+    end
+
     describe "moving to an existing topic as a group moderator" do
       fab!(:category) { Fabricate(:category, reviewable_by_group: group_user.group) }
       fab!(:topic) { Fabricate(:topic, category: category) }
@@ -423,6 +432,40 @@ RSpec.describe TopicsController do
       end
     end
 
+    describe "moving chronologically to an existing topic as a group moderator" do
+      fab!(:category) { Fabricate(:category, reviewable_by_group: group_user.group) }
+      fab!(:topic) { Fabricate(:topic, category: category) }
+      fab!(:p1) do
+        Fabricate(
+          :post,
+          user: group_user.user,
+          topic: topic,
+          created_at: dest_topic.created_at - 1.hour,
+        )
+      end
+
+      let!(:user) { group_user.user }
+
+      before do
+        sign_in(user)
+        SiteSetting.enable_category_group_moderation = true
+      end
+
+      it "moves the posts" do
+        post "/t/#{topic.id}/move-posts.json",
+             params: {
+               post_ids: [p1.id],
+               destination_topic_id: dest_topic.id,
+               chronological_order: "true",
+             }
+
+        expect(response.status).to eq(200)
+        result = response.parsed_body
+        expect(result["success"]).to eq(true)
+        expect(result["url"]).to be_present
+      end
+    end
+
     describe "moving to a new message" do
       fab!(:message) { pm }
       fab!(:p1) { Fabricate(:post, user: user, post_number: 1, topic: message) }
@@ -565,6 +608,48 @@ RSpec.describe TopicsController do
         end
       end
     end
+
+    describe "moving chronologically to an existing message" do
+      before { sign_in(admin) }
+
+      fab!(:evil_trout) { Fabricate(:evil_trout) }
+      fab!(:message) { pm }
+
+      fab!(:dest_message) do
+        Fabricate(
+          :private_message_topic,
+          user: trust_level_4,
+          topic_allowed_users: [Fabricate.build(:topic_allowed_user, user: evil_trout)],
+        )
+      end
+
+      fab!(:p2) do
+        Fabricate(
+          :post,
+          user: evil_trout,
+          post_number: 2,
+          topic: message,
+          created_at: dest_message.created_at - 1.hour,
+        )
+      end
+
+      context "with success" do
+        it "returns success" do
+          post "/t/#{message.id}/move-posts.json",
+               params: {
+                 post_ids: [p2.id],
+                 destination_topic_id: dest_message.id,
+                 archetype: "private_message",
+                 chronological_order: "true",
+               }
+
+          expect(response.status).to eq(200)
+          result = response.parsed_body
+          expect(result["success"]).to eq(true)
+          expect(result["url"]).to be_present
+        end
+      end
+    end
   end
 
   describe "#merge_topic" do
@@ -602,6 +687,27 @@ RSpec.describe TopicsController do
       end
     end
 
+    describe "merging chronologically into another topic" do
+      fab!(:p1) { Fabricate(:post, user: user, created_at: dest_topic.created_at - 1.hour) }
+      fab!(:topic) { p1.topic }
+
+      context "when moving all the posts to the destination topic" do
+        it "returns success" do
+          sign_in(moderator)
+          post "/t/#{topic.id}/merge-topic.json",
+               params: {
+                 destination_topic_id: dest_topic.id,
+                 chronological_order: "true",
+               }
+
+          expect(response.status).to eq(200)
+          result = response.parsed_body
+          expect(result["success"]).to eq(true)
+          expect(result["url"]).to be_present
+        end
+      end
+    end
+
     describe "merging into another topic as a group moderator" do
       fab!(:category) { Fabricate(:category, reviewable_by_group: group_user.group) }
       fab!(:topic) { Fabricate(:topic, category: category) }
@@ -639,6 +745,47 @@ RSpec.describe TopicsController do
       end
     end
 
+    describe "merging chronologically into another topic as a group moderator" do
+      fab!(:category) { Fabricate(:category, reviewable_by_group: group_user.group) }
+      fab!(:topic) { Fabricate(:topic, category: category) }
+      fab!(:p1) do
+        Fabricate(
+          :post,
+          user: post_author1,
+          post_number: 1,
+          topic: topic,
+          created_at: dest_topic.created_at - 1.hour,
+        )
+      end
+      fab!(:p2) do
+        Fabricate(
+          :post,
+          user: post_author2,
+          post_number: 2,
+          topic: topic,
+          created_at: dest_topic.created_at - 30.minutes,
+        )
+      end
+
+      before do
+        sign_in(group_user.user)
+        SiteSetting.enable_category_group_moderation = true
+      end
+
+      it "moves the posts" do
+        post "/t/#{topic.id}/merge-topic.json",
+             params: {
+               destination_topic_id: dest_topic.id,
+               chronological_order: "true",
+             }
+
+        expect(response.status).to eq(200)
+        result = response.parsed_body
+        expect(result["success"]).to eq(true)
+        expect(result["url"]).to be_present
+      end
+    end
+
     describe "merging into another message" do
       fab!(:message) { Fabricate(:private_message_topic, user: user) }
       fab!(:p1) { Fabricate(:post, topic: message, user: trust_level_4) }
@@ -686,6 +833,53 @@ RSpec.describe TopicsController do
         end
       end
     end
+
+    describe "merging chronologically into another message" do
+      fab!(:message) { Fabricate(:private_message_topic, user: user) }
+
+      fab!(:dest_message) do
+        Fabricate(
+          :private_message_topic,
+          user: trust_level_4,
+          topic_allowed_users: [Fabricate.build(:topic_allowed_user, user: moderator)],
+        )
+      end
+
+      fab!(:p1) do
+        Fabricate(
+          :post,
+          topic: message,
+          user: trust_level_4,
+          created_at: dest_message.created_at - 1.hour,
+        )
+      end
+      fab!(:p2) do
+        Fabricate(
+          :post,
+          topic: message,
+          reply_to_post_number: p1.post_number,
+          user: user,
+          created_at: dest_message.created_at - 30.minutes,
+        )
+      end
+
+      context "when moving all the posts to the destination message" do
+        it "returns success" do
+          sign_in(moderator)
+          post "/t/#{message.id}/merge-topic.json",
+               params: {
+                 destination_topic_id: dest_message.id,
+                 archetype: "private_message",
+                 chronological_order: "true",
+               }
+
+          expect(response.status).to eq(200)
+          result = response.parsed_body
+          expect(result["success"]).to eq(true)
+          expect(result["url"]).to be_present
+        end
+      end
+    end
   end
 
   describe "#change_post_owners" do
@@ -1037,6 +1231,99 @@ RSpec.describe TopicsController do
         expect(topic.posts.last.action_code).to eq("visible.enabled")
       end
     end
+
+    context "with API key" do
+      let(:api_key) { Fabricate(:api_key, user: moderator, created_by: moderator) }
+
+      context "when key scope has restricted params" do
+        before do
+          ApiKeyScope.create(
+            resource: "topics",
+            action: "update",
+            api_key_id: api_key.id,
+            allowed_parameters: {
+              "category_id" => ["#{topic.category_id}"],
+            },
+          )
+        end
+
+        it "fails to update topic status in an unpermitted category" do
+          put "/t/#{topic.id}/status.json",
+              params: {
+                status: "closed",
+                enabled: "true",
+                category_id: tracked_category.id,
+              },
+              headers: {
+                "HTTP_API_KEY" => api_key.key,
+                "HTTP_API_USERNAME" => api_key.user.username,
+              }
+
+          expect(response.status).to eq(403)
+          expect(response.body).to include(I18n.t("invalid_access"))
+          expect(topic.reload.closed).to eq(false)
+        end
+
+        it "fails without a category_id" do
+          put "/t/#{topic.id}/status.json",
+              params: {
+                status: "closed",
+                enabled: "true",
+              },
+              headers: {
+                "HTTP_API_KEY" => api_key.key,
+                "HTTP_API_USERNAME" => api_key.user.username,
+              }
+
+          expect(response.status).to eq(403)
+          expect(response.body).to include(I18n.t("invalid_access"))
+          expect(topic.reload.closed).to eq(false)
+        end
+
+        it "updates topic status in a permitted category" do
+          put "/t/#{topic.id}/status.json",
+              params: {
+                status: "closed",
+                enabled: "true",
+                category_id: topic.category_id,
+              },
+              headers: {
+                "HTTP_API_KEY" => api_key.key,
+                "HTTP_API_USERNAME" => api_key.user.username,
+              }
+
+          expect(response.status).to eq(200)
+          expect(topic.reload.closed).to eq(true)
+        end
+      end
+
+      context "when key scope has no param restrictions" do
+        before do
+          ApiKeyScope.create(
+            resource: "topics",
+            action: "update",
+            api_key_id: api_key.id,
+            allowed_parameters: {
+            },
+          )
+        end
+
+        it "updates topic status" do
+          put "/t/#{topic.id}/status.json",
+              params: {
+                status: "closed",
+                enabled: "true",
+              },
+              headers: {
+                "HTTP_API_KEY" => api_key.key,
+                "HTTP_API_USERNAME" => api_key.user.username,
+              }
+
+          expect(response.status).to eq(200)
+          expect(topic.reload.closed).to eq(true)
+        end
+      end
+    end
   end
 
   describe "#destroy_timings" do
@@ -1312,6 +1599,9 @@ RSpec.describe TopicsController do
         put "/t/#{topic.id}.json", params: { category_id: category.id }
 
         expect(response.status).to eq(403)
+        expect(response.parsed_body["errors"].first).to eq(
+          I18n.t("category.errors.move_topic_to_category_disallowed"),
+        )
         expect(topic.reload.category_id).not_to eq(category.id)
       end
 
@@ -1529,8 +1819,9 @@ RSpec.describe TopicsController do
         end
 
         describe "when first post is locked" do
-          it "blocks non-staff from editing even if 'trusted_users_can_edit_others' is true" do
-            SiteSetting.trusted_users_can_edit_others = true
+          it "blocks user from editing even if they are in 'edit_all_topic_groups' and 'edit_all_post_groups'" do
+            SiteSetting.edit_all_topic_groups = Group::AUTO_GROUPS[:trust_level_3]
+            SiteSetting.edit_all_post_groups = Group::AUTO_GROUPS[:trust_level_4]
             user.update!(trust_level: 3)
             topic.first_post.update!(locked_by_id: admin.id)
 
@@ -2048,6 +2339,7 @@ RSpec.describe TopicsController do
     end
 
     it "does not result in N+1 queries problem when multiple topic participants have primary or flair group configured" do
+      Group.user_trust_level_change!(post_author1.id, post_author1.trust_level)
       user2 = Fabricate(:user)
       user3 = Fabricate(:user)
       post2 = Fabricate(:post, topic: topic, user: user2)
@@ -2414,6 +2706,28 @@ RSpec.describe TopicsController do
         expect(body).to have_tag(:script, src: "/assets/discourse.js")
         expect(body).to have_tag(:meta, with: { name: "fragment" })
       end
+
+      context "with restricted tags" do
+        let(:tag_group) { Fabricate.build(:tag_group) }
+        let(:tag_group_permission) { Fabricate.build(:tag_group_permission, tag_group: tag_group) }
+        let(:restricted_tag) { Fabricate(:tag) }
+        let(:public_tag) { Fabricate(:tag) }
+
+        before do
+          # avoid triggering a `before_create` callback in `TagGroup` which
+          # messes with permissions
+          tag_group.tag_group_permissions << tag_group_permission
+          tag_group.save!
+          tag_group_permission.tag_group.tags << restricted_tag
+          topic.tags << [public_tag, restricted_tag]
+        end
+
+        it "doesn’t expose restricted tags" do
+          get "/t/#{topic.slug}/#{topic.id}/print", headers: { HTTP_USER_AGENT: "Rails Testing" }
+          expect(response.body).to match(public_tag.name)
+          expect(response.body).not_to match(restricted_tag.name)
+        end
+      end
     end
 
     it "records redirects" do
@@ -2711,7 +3025,7 @@ RSpec.describe TopicsController do
       expect(response.status).to eq(200)
     end
 
-    context "with mentions" do
+    context "when `enable_user_status` site setting is enabled" do
       fab!(:post) { Fabricate(:post, user: post_author1) }
       fab!(:topic) { post.topic }
       fab!(:post2) do
@@ -2723,7 +3037,23 @@ RSpec.describe TopicsController do
         )
       end
 
-      it "returns mentions" do
+      before { SiteSetting.enable_user_status = true }
+
+      it "does not return mentions when `enable_user_status` site setting is disabled" do
+        SiteSetting.enable_user_status = false
+
+        get "/t/#{topic.slug}/#{topic.id}.json"
+
+        expect(response.status).to eq(200)
+
+        json = response.parsed_body
+
+        expect(json["post_stream"]["posts"][1]["mentioned_users"]).to eq(nil)
+      end
+
+      it "returns mentions with status" do
+        post_author1.set_status!("off to dentist", "tooth")
+
         get "/t/#{topic.slug}/#{topic.id}.json"
 
         expect(response.status).to eq(200)
@@ -2735,39 +3065,14 @@ RSpec.describe TopicsController do
         expect(mentioned_user["id"]).to be(post_author1.id)
         expect(mentioned_user["name"]).to eq(post_author1.name)
         expect(mentioned_user["username"]).to eq(post_author1.username)
-      end
 
-      it "doesn't return status on mentions by default" do
-        post_author1.set_status!("off to dentist", "tooth")
-
-        get "/t/#{topic.slug}/#{topic.id}.json"
-
-        expect(response.status).to eq(200)
-
-        json = response.parsed_body
-        expect(json["post_stream"]["posts"][1]["mentioned_users"].length).to be(1)
-        status = json["post_stream"]["posts"][1]["mentioned_users"][0]["status"]
-        expect(status).to be_nil
-      end
-
-      it "returns mentions with status if user status is enabled" do
-        SiteSetting.enable_user_status = true
-        post_author1.set_status!("off to dentist", "tooth")
-
-        get "/t/#{topic.slug}/#{topic.id}.json"
-
-        expect(response.status).to eq(200)
-
-        json = response.parsed_body
-        expect(json["post_stream"]["posts"][1]["mentioned_users"].length).to be(1)
-
-        status = json["post_stream"]["posts"][1]["mentioned_users"][0]["status"]
+        status = mentioned_user["status"]
         expect(status).to be_present
         expect(status["emoji"]).to eq(post_author1.user_status.emoji)
         expect(status["description"]).to eq(post_author1.user_status.description)
       end
 
-      it "returns an empty list of mentioned users if there is no mentions in a post" do
+      it "returns an empty list of mentioned users if there are no mentions in a post" do
         Fabricate(:post, user: post_author2, topic: topic, raw: "Post without mentions.")
 
         get "/t/#{topic.slug}/#{topic.id}.json"
@@ -3211,7 +3516,7 @@ RSpec.describe TopicsController do
         expect(response.status).to eq(400)
       end
 
-      it "can mark sub-categories unread" do
+      it "can dismiss sub-categories posts as read" do
         sub = Fabricate(:category, parent_category_id: category.id)
 
         topic.update!(category_id: sub.id)
@@ -3233,6 +3538,31 @@ RSpec.describe TopicsController do
         expect(TopicUser.get(post1.topic, post1.user).last_read_post_number).to eq(2)
       end
 
+      it "can dismiss sub-subcategories posts as read" do
+        SiteSetting.max_category_nesting = 3
+
+        sub_category = Fabricate(:category, parent_category_id: category.id)
+        sub_subcategory = Fabricate(:category, parent_category_id: sub_category.id)
+
+        topic.update!(category_id: sub_subcategory.id)
+
+        post_1 = create_post(user: user, topic_id: topic.id)
+        post_2 = create_post(topic_id: topic.id)
+
+        put "/topics/bulk.json",
+            params: {
+              category_id: category.id,
+              include_subcategories: true,
+              filter: "unread",
+              operation: {
+                type: "dismiss_posts",
+              },
+            }
+
+        expect(response.status).to eq(200)
+        expect(TopicUser.get(post_1.topic, post_1.user).last_read_post_number).to eq(2)
+      end
+
       it "can mark tag topics unread" do
         TopicTag.create!(topic_id: topic.id, tag_id: tag.id)
 
@@ -3549,7 +3879,7 @@ RSpec.describe TopicsController do
 
       context "when tracked is unset" do
         it "updates the `new_since` date" do
-          TopicTrackingState.expects(:publish_dismiss_new)
+          TopicTrackingState.expects(:publish_dismiss_new).never
 
           put "/topics/reset-new.json"
           expect(response.status).to eq(200)
@@ -3667,11 +3997,35 @@ RSpec.describe TopicsController do
 
           put "/topics/reset-new.json?category_id=#{category.id}&include_subcategories=true"
 
+          expect(response.status).to eq(200)
+
           expect(DismissedTopicUser.where(user_id: user.id).pluck(:topic_id).sort).to eq(
             [category_topic.id, subcategory_topic.id].sort,
           )
         end
 
+        it "dismisses topics for main category, subcategories and sub-subcategories" do
+          SiteSetting.max_category_nesting = 3
+
+          sub_subcategory = Fabricate(:category, parent_category_id: subcategory.id)
+          sub_subcategory_topic = Fabricate(:topic, category: sub_subcategory)
+
+          TopicTrackingState.expects(:publish_dismiss_new).with(
+            user.id,
+            topic_ids: [category_topic.id, subcategory_topic.id, sub_subcategory_topic.id],
+          )
+
+          put "/topics/reset-new.json?category_id=#{category.id}&include_subcategories=true"
+
+          expect(response.status).to eq(200)
+
+          expect(DismissedTopicUser.where(user_id: user.id).pluck(:topic_id)).to contain_exactly(
+            category_topic.id,
+            subcategory_topic.id,
+            sub_subcategory_topic.id,
+          )
+        end
+
         context "when the category has private child categories" do
           fab!(:category) { Fabricate(:category) }
           fab!(:group) { Fabricate(:group) }
@@ -3688,16 +4042,17 @@ RSpec.describe TopicsController do
 
           it "doesn't dismiss topics in private child categories that the user can't see" do
             messages =
-              MessageBus.track_publish do
+              MessageBus.track_publish(TopicTrackingState.unread_channel_key(user.id)) do
                 put "/topics/reset-new.json",
                     params: {
                       category_id: category.id,
                       include_subcategories: true,
                     }
+
+                expect(response.status).to eq(200)
               end
-            expect(response.status).to eq(200)
+
             expect(messages.size).to eq(1)
-            expect(messages[0].channel).to eq(TopicTrackingState.unread_channel_key(user.id))
             expect(messages[0].user_ids).to eq([user.id])
             expect(messages[0].data["message_type"]).to eq(
               TopicTrackingState::DISMISS_NEW_MESSAGE_TYPE,
@@ -3712,17 +4067,19 @@ RSpec.describe TopicsController do
 
           it "dismisses topics in private child categories that the user can see" do
             group.add(user)
+
             messages =
-              MessageBus.track_publish do
+              MessageBus.track_publish(TopicTrackingState.unread_channel_key(user.id)) do
                 put "/topics/reset-new.json",
                     params: {
                       category_id: category.id,
                       include_subcategories: true,
                     }
+
+                expect(response.status).to eq(200)
               end
-            expect(response.status).to eq(200)
+
             expect(messages.size).to eq(1)
-            expect(messages[0].channel).to eq(TopicTrackingState.unread_channel_key(user.id))
             expect(messages[0].user_ids).to eq([user.id])
             expect(messages[0].data["message_type"]).to eq(
               TopicTrackingState::DISMISS_NEW_MESSAGE_TYPE,
@@ -3747,15 +4104,10 @@ RSpec.describe TopicsController do
             messages =
               MessageBus.track_publish do
                 put "/topics/reset-new.json", params: { category_id: private_category.id }
+                expect(response.status).to eq(200)
               end
-            expect(response.status).to eq(200)
-            expect(messages.size).to eq(1)
-            expect(messages[0].channel).to eq(TopicTrackingState.unread_channel_key(user.id))
-            expect(messages[0].user_ids).to eq([user.id])
-            expect(messages[0].data["message_type"]).to eq(
-              TopicTrackingState::DISMISS_NEW_MESSAGE_TYPE,
-            )
-            expect(messages[0].data["payload"]["topic_ids"]).to eq([])
+
+            expect(messages.size).to eq(0)
             expect(DismissedTopicUser.where(user_id: user.id).count).to eq(0)
           end
 
@@ -3930,6 +4282,168 @@ RSpec.describe TopicsController do
         end
       end
     end
+
+    describe "new and unread" do
+      fab!(:group) { Fabricate(:group) }
+      fab!(:new_topic) { Fabricate(:topic) }
+      fab!(:unread_topic) { Fabricate(:topic, highest_post_number: 3) }
+      fab!(:topic_user) do
+        Fabricate(
+          :topic_user,
+          topic: unread_topic,
+          user: user,
+          notification_level: NotificationLevels.topic_levels[:tracking],
+          last_read_post_number: 1,
+        )
+      end
+
+      before do
+        create_post(topic: unread_topic)
+        create_post(topic: unread_topic)
+        user.groups << group
+        SiteSetting.experimental_new_new_view_groups = group.id
+        sign_in(user)
+      end
+
+      it "dismisses new topics" do
+        put "/topics/reset-new.json"
+        topics = TopicQuery.new(user).new_and_unread_results(limit: false)
+        expect(topics).to eq([unread_topic, new_topic])
+        expect(response.status).to eq(200)
+        expect(response.parsed_body["topic_ids"]).to eq([])
+
+        put "/topics/reset-new.json", params: { dismiss_topics: true }
+        expect(response.status).to eq(200)
+        expect(response.parsed_body["topic_ids"]).to eq([new_topic.id])
+
+        topics = TopicQuery.new(user).new_and_unread_results(limit: false)
+        expect(topics).to eq([unread_topic])
+        expect(DismissedTopicUser.where(user: user).count).to eq(1)
+        expect(DismissedTopicUser.where(user: user).first.topic_id).to eq(new_topic.id)
+        expect(topic_user.reload.notification_level).to eq(
+          NotificationLevels.topic_levels[:tracking],
+        )
+      end
+
+      it "dismisses unread topics" do
+        put "/topics/reset-new.json"
+        expect(response.status).to eq(200)
+        expect(response.parsed_body["topic_ids"]).to eq([])
+        topics = TopicQuery.new(user).new_and_unread_results(limit: false)
+        expect(topics).to eq([unread_topic, new_topic])
+
+        put "/topics/reset-new.json", params: { dismiss_posts: true }
+        expect(response.status).to eq(200)
+        expect(response.parsed_body["topic_ids"]).to eq([unread_topic.id])
+
+        topics = TopicQuery.new(user).new_and_unread_results(limit: false)
+        expect(topics).to eq([new_topic])
+        expect(DismissedTopicUser.count).to eq(0)
+        expect(topic_user.reload.notification_level).to eq(
+          NotificationLevels.topic_levels[:tracking],
+        )
+      end
+
+      it "untrack topics" do
+        expect(topic_user.notification_level).to eq(NotificationLevels.topic_levels[:tracking])
+        put "/topics/reset-new.json", params: { dismiss_posts: true, untrack: true }
+        expect(response.status).to eq(200)
+        expect(response.parsed_body["topic_ids"]).to eq([unread_topic.id])
+
+        expect(topic_user.reload.notification_level).to eq(
+          NotificationLevels.topic_levels[:regular],
+        )
+      end
+
+      it "dismisses new topics, unread posts and untrack" do
+        put "/topics/reset-new.json",
+            params: {
+              dismiss_topics: true,
+              dismiss_posts: true,
+              untrack: true,
+            }
+        expect(response.status).to eq(200)
+        expect(response.parsed_body["topic_ids"]).to eq([new_topic.id, unread_topic.id])
+
+        topics = TopicQuery.new(user).new_and_unread_results(limit: false)
+        expect(topics).to be_empty
+        expect(DismissedTopicUser.where(user: user).count).to eq(1)
+        expect(DismissedTopicUser.where(user: user).first.topic_id).to eq(new_topic.id)
+
+        expect(user.topic_users.map(&:notification_level).uniq).to eq(
+          [NotificationLevels.topic_levels[:regular]],
+        )
+      end
+
+      context "when category" do
+        fab!(:category) { Fabricate(:category) }
+        fab!(:new_topic_2) { Fabricate(:topic, category: category) }
+        fab!(:unread_topic_2) { Fabricate(:topic, category: category, highest_post_number: 3) }
+        fab!(:topic_user) do
+          Fabricate(
+            :topic_user,
+            topic: unread_topic_2,
+            user: user,
+            notification_level: NotificationLevels.topic_levels[:tracking],
+            last_read_post_number: 1,
+          )
+        end
+
+        it "dismisses new topics, unread posts and untrack for specific category" do
+          topics = TopicQuery.new(user).new_and_unread_results(limit: false)
+          expect(topics).to match_array([new_topic, new_topic_2, unread_topic, unread_topic_2])
+
+          put "/topics/reset-new.json",
+              params: {
+                dismiss_topics: true,
+                dismiss_posts: true,
+                untrack: true,
+                category_id: category.id,
+              }
+          expect(response.status).to eq(200)
+          expect(response.parsed_body["topic_ids"]).to eq([new_topic_2.id, unread_topic_2.id])
+
+          topics = TopicQuery.new(user).new_and_unread_results(limit: false)
+          expect(topics).to match_array([new_topic, unread_topic])
+        end
+      end
+
+      context "when tag" do
+        fab!(:tag) { Fabricate(:tag) }
+        fab!(:new_topic_2) { Fabricate(:topic) }
+        fab!(:unread_topic_2) { Fabricate(:topic, highest_post_number: 3) }
+        fab!(:topic_user) do
+          Fabricate(
+            :topic_user,
+            topic: unread_topic_2,
+            user: user,
+            notification_level: NotificationLevels.topic_levels[:tracking],
+            last_read_post_number: 1,
+          )
+        end
+        fab!(:topic_tag) { Fabricate(:topic_tag, topic: new_topic_2, tag: tag) }
+        fab!(:topic_tag_2) { Fabricate(:topic_tag, topic: unread_topic_2, tag: tag) }
+
+        it "dismisses new topics, unread posts and untrack for specific tag" do
+          topics = TopicQuery.new(user).new_and_unread_results(limit: false)
+          expect(topics).to match_array([new_topic, new_topic_2, unread_topic, unread_topic_2])
+
+          put "/topics/reset-new.json",
+              params: {
+                dismiss_topics: true,
+                dismiss_posts: true,
+                untrack: true,
+                tag_id: tag.name,
+              }
+
+          expect(response.status).to eq(200)
+          expect(response.parsed_body["topic_ids"]).to eq([new_topic_2.id, unread_topic_2.id])
+
+          topics = TopicQuery.new(user).new_and_unread_results(limit: false)
+          expect(topics).to match_array([new_topic, unread_topic])
+        end
+      end
+    end
   end
 
   describe "#feature_stats" do
@@ -4268,6 +4782,7 @@ RSpec.describe TopicsController do
 
       it "allows a category moderator to create a delete timer" do
         user.update!(trust_level: TrustLevel[4])
+        Group.user_trust_level_change!(user.id, user.trust_level)
         topic.category.update!(reviewable_by_group: user.groups.first)
 
         sign_in(user)
@@ -4623,7 +5138,7 @@ RSpec.describe TopicsController do
   describe "crawler" do
     context "when not a crawler" do
       it "renders with the application layout" do
-        get topic.url
+        get topic.relative_url
 
         body = response.body
 
@@ -4656,7 +5171,7 @@ RSpec.describe TopicsController do
 
         user_agent = "Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)"
 
-        get topic.url, env: { "HTTP_USER_AGENT" => user_agent }
+        get topic.relative_url, env: { "HTTP_USER_AGENT" => user_agent }
 
         body = response.body
 
@@ -4669,7 +5184,7 @@ RSpec.describe TopicsController do
 
         expect(response.headers["Last-Modified"]).to eq(page1_time.httpdate)
 
-        get topic.url + "?page=2", env: { "HTTP_USER_AGENT" => user_agent }
+        get topic.relative_url + "?page=2", env: { "HTTP_USER_AGENT" => user_agent }
         body = response.body
 
         expect(response.headers["Last-Modified"]).to eq(page2_time.httpdate)
@@ -4680,7 +5195,7 @@ RSpec.describe TopicsController do
         expect(body).to include('<link rel="prev" href="' + topic.relative_url)
         expect(body).to include('<link rel="next" href="' + topic.relative_url + "?page=3")
 
-        get topic.url + "?page=3", env: { "HTTP_USER_AGENT" => user_agent }
+        get topic.relative_url + "?page=3", env: { "HTTP_USER_AGENT" => user_agent }
         body = response.body
 
         expect(response.headers["Last-Modified"]).to eq(page3_time.httpdate)
@@ -4707,7 +5222,7 @@ RSpec.describe TopicsController do
 
       context "with wayback machine" do
         it "renders crawler layout" do
-          get topic.url,
+          get topic.relative_url,
               env: {
                 "HTTP_USER_AGENT" =>
                   "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36",
@@ -4917,4 +5432,163 @@ RSpec.describe TopicsController do
       expect(body["group_name"]).to eq(group.name)
     end
   end
+
+  describe "#set_notifications" do
+    describe "initiated by admin" do
+      it "can update another user's notification level via API" do
+        api_key = Fabricate(:api_key, user: admin)
+        post "/t/#{topic.id}/notifications",
+             params: {
+               username: user.username,
+               notification_level: NotificationLevels.topic_levels[:watching],
+             },
+             headers: {
+               HTTP_API_KEY: api_key.key,
+               HTTP_API_USERNAME: admin.username,
+             }
+        expect(TopicUser.find_by(user: user, topic: topic).notification_level).to eq(
+          NotificationLevels.topic_levels[:watching],
+        )
+      end
+
+      it "can update own notification level via API" do
+        api_key = Fabricate(:api_key, user: admin)
+        post "/t/#{topic.id}/notifications",
+             params: {
+               notification_level: NotificationLevels.topic_levels[:watching],
+             },
+             headers: {
+               HTTP_API_KEY: api_key.key,
+               HTTP_API_USERNAME: admin.username,
+             }
+        expect(TopicUser.find_by(user: admin, topic: topic).notification_level).to eq(
+          NotificationLevels.topic_levels[:watching],
+        )
+      end
+    end
+
+    describe "initiated by non-admin" do
+      it "only acts on current_user and ignores `username` param" do
+        sign_in(user)
+        TopicUser.create!(
+          user: user,
+          topic: topic,
+          notification_level: NotificationLevels.topic_levels[:tracking],
+        )
+        post "/t/#{topic.id}/notifications.json",
+             params: {
+               username: user_2.username,
+               notification_level: NotificationLevels.topic_levels[:watching],
+             }
+
+        expect(TopicUser.find_by(user: user, topic: topic).notification_level).to eq(
+          NotificationLevels.topic_levels[:watching],
+        )
+        expect(TopicUser.find_by(user: user_2, topic: topic)).to be_blank
+      end
+
+      it "can update own notification level via API" do
+        api_key = Fabricate(:api_key, user: user)
+        post "/t/#{topic.id}/notifications",
+             params: {
+               notification_level: NotificationLevels.topic_levels[:watching],
+             },
+             headers: {
+               HTTP_API_KEY: api_key.key,
+               HTTP_API_USERNAME: user.username,
+             }
+
+        expect(TopicUser.find_by(user: user, topic: topic).notification_level).to eq(
+          NotificationLevels.topic_levels[:watching],
+        )
+      end
+    end
+  end
+
+  describe "#summary" do
+    fab!(:topic) { Fabricate(:topic) }
+    let(:plugin) { Plugin::Instance.new }
+
+    before do
+      strategy = DummyCustomSummarization.new("dummy")
+      plugin.register_summarization_strategy(strategy)
+      SiteSetting.summarization_strategy = strategy.model
+    end
+
+    context "for anons" do
+      it "returns a 404 if there is no cached summary" do
+        get "/t/#{topic.id}/strategy-summary.json"
+
+        expect(response.status).to eq(404)
+      end
+
+      it "returns a cached summary" do
+        section =
+          SummarySection.create!(
+            target: topic,
+            summarized_text: "test",
+            algorithm: "test",
+            original_content_sha: "test",
+          )
+
+        get "/t/#{topic.id}/strategy-summary.json"
+
+        expect(response.status).to eq(200)
+
+        summary = response.parsed_body
+        expect(summary["summary"]).to eq(section.summarized_text)
+      end
+    end
+
+    context "when the user is a member of an allowlisted group" do
+      fab!(:user) { Fabricate(:leader) }
+
+      before { sign_in(user) }
+
+      it "returns a 404 if there is no topic" do
+        invalid_topic_id = 999
+
+        get "/t/#{invalid_topic_id}/strategy-summary.json"
+
+        expect(response.status).to eq(404)
+      end
+
+      it "returns a 403 if not allowed to see the topic" do
+        pm = Fabricate(:private_message_topic)
+
+        get "/t/#{pm.id}/strategy-summary.json"
+
+        expect(response.status).to eq(403)
+      end
+    end
+
+    context "when the user is not a member of an allowlisted group" do
+      fab!(:user) { Fabricate(:user) }
+
+      before { sign_in(user) }
+
+      it "return a 404 if there is no cached summary" do
+        get "/t/#{topic.id}/strategy-summary.json"
+
+        expect(response.status).to eq(404)
+      end
+
+      it "returns a cached summary" do
+        section =
+          SummarySection.create!(
+            target: topic,
+            summarized_text: "test",
+            algorithm: "test",
+            original_content_sha: "test",
+          )
+
+        get "/t/#{topic.id}/strategy-summary.json"
+
+        expect(response.status).to eq(200)
+
+        summary = response.parsed_body
+        expect(summary["summary"]).to eq(section.summarized_text)
+      end
+    end
+  end
 end
diff --git a/spec/requests/uploads_controller_spec.rb b/spec/requests/uploads_controller_spec.rb
index cf0cb8fa23c..e9eb59ea579 100644
--- a/spec/requests/uploads_controller_spec.rb
+++ b/spec/requests/uploads_controller_spec.rb
@@ -776,11 +776,14 @@ RSpec.describe UploadsController do
         expect(result["url"]).not_to include("&x-amz-meta-blah=wontbeincluded")
       end
 
-      it "rate limits" do
-        RateLimiter.enable
-        RateLimiter.clear_all!
+      describe "rate limiting" do
+        before { RateLimiter.enable }
+
+        use_redis_snapshotting
+
+        it "rate limits" do
+          SiteSetting.max_presigned_put_per_minute = 1
 
-        stub_const(ExternalUploadHelpers, "PRESIGNED_PUT_RATE_LIMIT_PER_MINUTE", 1) do
           post "/uploads/generate-presigned-put.json",
                params: {
                  file_name: "test.png",
@@ -793,8 +796,9 @@ RSpec.describe UploadsController do
                  type: "card_background",
                  file_size: 1024,
                }
+
+          expect(response.status).to eq(429)
         end
-        expect(response.status).to eq(429)
       end
     end
 
@@ -853,6 +857,16 @@ RSpec.describe UploadsController do
         )
       end
 
+      it "returns 422 when the file is an gif and it's too big, since gifs cannot be resized on client" do
+        SiteSetting.max_image_size_kb = 1024
+        post "/uploads/create-multipart.json",
+             **{ params: { file_name: "test.gif", file_size: 9_999_999, upload_type: "composer" } }
+        expect(response.status).to eq(422)
+        expect(response.body).to include(
+          I18n.t("upload.images.too_large_humanized", max_size: "1 MB"),
+        )
+      end
+
       it "returns a sensible error if the file size is 0 bytes" do
         SiteSetting.authorized_extensions = "*"
         stub_create_multipart_request
@@ -934,12 +948,15 @@ RSpec.describe UploadsController do
         expect(response.status).to eq(200)
       end
 
-      it "rate limits" do
-        RateLimiter.enable
-        RateLimiter.clear_all!
+      describe "rate limiting" do
+        before { RateLimiter.enable }
 
-        stub_create_multipart_request
-        stub_const(ExternalUploadHelpers, "CREATE_MULTIPART_RATE_LIMIT_PER_MINUTE", 1) do
+        use_redis_snapshotting
+
+        it "rate limits" do
+          SiteSetting.max_create_multipart_per_minute = 1
+
+          stub_create_multipart_request
           post "/uploads/create-multipart.json",
                params: {
                  file_name: "test.png",
@@ -1108,27 +1125,31 @@ RSpec.describe UploadsController do
         )
       end
 
-      it "rate limits" do
-        RateLimiter.enable
-        RateLimiter.clear_all!
-        SiteSetting.max_batch_presign_multipart_per_minute = 1
+      describe "rate limiting" do
+        before { RateLimiter.enable }
 
-        stub_list_multipart_request
-        post "/uploads/batch-presign-multipart-parts.json",
-             params: {
-               unique_identifier: external_upload_stub.unique_identifier,
-               part_numbers: [1, 2, 3],
-             }
+        use_redis_snapshotting
 
-        expect(response.status).to eq(200)
+        it "rate limits" do
+          SiteSetting.max_batch_presign_multipart_per_minute = 1
 
-        post "/uploads/batch-presign-multipart-parts.json",
-             params: {
-               unique_identifier: external_upload_stub.unique_identifier,
-               part_numbers: [1, 2, 3],
-             }
+          stub_list_multipart_request
+          post "/uploads/batch-presign-multipart-parts.json",
+               params: {
+                 unique_identifier: external_upload_stub.unique_identifier,
+                 part_numbers: [1, 2, 3],
+               }
 
-        expect(response.status).to eq(429)
+          expect(response.status).to eq(200)
+
+          post "/uploads/batch-presign-multipart-parts.json",
+               params: {
+                 unique_identifier: external_upload_stub.unique_identifier,
+                 part_numbers: [1, 2, 3],
+               }
+
+          expect(response.status).to eq(429)
+        end
       end
     end
 
@@ -1331,11 +1352,14 @@ RSpec.describe UploadsController do
         expect(result[:upload]).to eq(JSON.parse(UploadSerializer.new(upload).to_json)[:upload])
       end
 
-      it "rate limits" do
-        RateLimiter.enable
-        RateLimiter.clear_all!
+      describe "rate limiting" do
+        before { RateLimiter.enable }
+
+        use_redis_snapshotting
+
+        it "rate limits" do
+          SiteSetting.max_complete_multipart_per_minute = 1
 
-        stub_const(ExternalUploadHelpers, "COMPLETE_MULTIPART_RATE_LIMIT_PER_MINUTE", 1) do
           post "/uploads/complete-multipart.json",
                params: {
                  unique_identifier: "blah",
@@ -1346,8 +1370,9 @@ RSpec.describe UploadsController do
                  unique_identifier: "blah",
                  parts: [{ part_number: 1, etag: "test1" }, { part_number: 2, etag: "test2" }],
                }
+
+          expect(response.status).to eq(429)
         end
-        expect(response.status).to eq(429)
       end
     end
 
diff --git a/spec/requests/user_avatars_controller_spec.rb b/spec/requests/user_avatars_controller_spec.rb
index 45e7851e405..549a184cffb 100644
--- a/spec/requests/user_avatars_controller_spec.rb
+++ b/spec/requests/user_avatars_controller_spec.rb
@@ -60,7 +60,7 @@ RSpec.describe UserAvatarsController do
 
     it "handles non local content correctly" do
       setup_s3
-      SiteSetting.avatar_sizes = "100|49"
+      SiteSetting.avatar_sizes = "100|98|49"
       SiteSetting.unicode_usernames = true
       SiteSetting.s3_cdn_url = "http://cdn.com"
 
@@ -111,7 +111,7 @@ RSpec.describe UserAvatarsController do
     it "redirects to external store when enabled" do
       global_setting :redirect_avatar_requests, true
       setup_s3
-      SiteSetting.avatar_sizes = "100|49"
+      SiteSetting.avatar_sizes = "100|98|49"
       SiteSetting.s3_cdn_url = "https://s3-cdn.example.com"
       set_cdn_url("https://app-cdn.example.com")
 
@@ -139,7 +139,9 @@ RSpec.describe UserAvatarsController do
 
       expect(response.status).to eq(302)
       expect(response.location).to eq("https://s3-cdn.example.com/optimized/path")
-      expect(response.headers["Cache-Control"]).to eq("max-age=3600, public, immutable")
+      expect(response.headers["Cache-Control"]).to eq(
+        "max-age=3600, public, immutable, stale-while-revalidate=86400",
+      )
     end
 
     it "serves new version for old urls" do
diff --git a/spec/requests/user_badges_controller_spec.rb b/spec/requests/user_badges_controller_spec.rb
index 67f585540f1..f21149d02de 100644
--- a/spec/requests/user_badges_controller_spec.rb
+++ b/spec/requests/user_badges_controller_spec.rb
@@ -31,6 +31,14 @@ RSpec.describe UserBadgesController do
       get "/user_badges.json", params: { badge_id: badge.id }
       expect(response.status).to eq(404)
     end
+
+    it "only accepts valid offset params" do
+      get "/user_badges.json", params: { badge_id: badge.id, offset: -1 }
+      expect(response.status).to eq(400)
+
+      get "/user_badges.json", params: { badge_id: badge.id, offset: 100 }
+      expect(response.status).to eq(200)
+    end
   end
 
   describe "#index" do
diff --git a/spec/requests/user_status_controller_spec.rb b/spec/requests/user_status_controller_spec.rb
index 3d77fd93a26..fe97fab704a 100644
--- a/spec/requests/user_status_controller_spec.rb
+++ b/spec/requests/user_status_controller_spec.rb
@@ -75,6 +75,31 @@ RSpec.describe UserStatusController do
         expect(response.status).to eq(400)
       end
 
+      it "validates emoji" do
+        put "/user-status.json",
+            params: {
+              emoji: "invalid_emoji_name",
+              description: "off to dentist",
+            }
+        expect(response.status).to eq(422)
+      end
+
+      it "limits description’s length" do
+        put "/user-status.json",
+            params: {
+              emoji: "tooth",
+              description: "x" * UserStatus::MAX_DESCRIPTION_LENGTH,
+            }
+        expect(response.status).to eq(200)
+
+        put "/user-status.json",
+            params: {
+              emoji: "tooth",
+              description: "x" * (UserStatus::MAX_DESCRIPTION_LENGTH + 1),
+            }
+        expect(response.status).to eq(422)
+      end
+
       it "sets user status" do
         status = "off to dentist"
         status_emoji = "tooth"
@@ -133,11 +158,11 @@ RSpec.describe UserStatusController do
         ends_at = "2100-01-01T18:00:00Z"
 
         messages =
-          MessageBus.track_publish do
+          MessageBus.track_publish("/user-status") do
             put "/user-status.json", params: { description: status, emoji: emoji, ends_at: ends_at }
           end
 
-        expect(messages.size).to eq(1)
+        expect(messages.map(&:channel)).to contain_exactly("/user-status")
         expect(messages[0].channel).to eq("/user-status")
         expect(messages[0].group_ids).to eq([Group::AUTO_GROUPS[:trust_level_0]])
 
@@ -182,7 +207,7 @@ RSpec.describe UserStatusController do
       end
 
       it "publishes to message bus" do
-        messages = MessageBus.track_publish { delete "/user-status.json" }
+        messages = MessageBus.track_publish("/user-status") { delete "/user-status.json" }
 
         expect(messages.size).to eq(1)
         expect(messages[0].channel).to eq("/user-status")
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 3521c3dea63..605588bd063 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -327,10 +327,9 @@ RSpec.describe UsersController do
       end
 
       context "with rate limiting" do
-        before do
-          RateLimiter.clear_all!
-          RateLimiter.enable
-        end
+        before { RateLimiter.enable }
+
+        use_redis_snapshotting
 
         it "rate limits reset passwords" do
           freeze_time
@@ -907,7 +906,7 @@ RSpec.describe UsersController do
           SiteSetting.send_welcome_message = true
           SiteSetting.must_approve_users = true
 
-          #Sidekiq::Client.expects(:enqueue).never
+          # Sidekiq::Client.expects(:enqueue).never
           post "/u.json",
                params: post_user_params.merge(approved: true, active: true),
                headers: {
@@ -1631,6 +1630,33 @@ RSpec.describe UsersController do
         expect(created_user.email).to eq("staged@account.com")
         expect(response.status).to eq(403)
       end
+
+      it "works with custom fields" do
+        tennis_field = Fabricate(:user_field, show_on_profile: true, name: "Favorite tennis player")
+
+        post "/u.json",
+             params:
+               honeypot_magic(
+                 email: staged.email,
+                 username: "dude",
+                 password: "P4ssw0rd$$",
+                 user_fields: {
+                   [tennis_field.id] => "Nadal",
+                 },
+               )
+
+        expect(response.status).to eq(200)
+        result = response.parsed_body
+        expect(result["success"]).to eq(true)
+
+        created_user = User.find_by_email(staged.email)
+        expect(created_user.staged).to eq(false)
+        expect(created_user.active).to eq(false)
+        expect(created_user.registration_ip_address).to be_present
+        expect(!!created_user.custom_fields["from_staged"]).to eq(true)
+
+        expect(created_user.custom_fields["user_field_#{tennis_field.id}"]).to eq("Nadal")
+      end
     end
   end
 
@@ -2555,9 +2581,10 @@ RSpec.describe UsersController do
             end.to change { user.sidebar_section_links.count }.from(1).to(0)
           end
 
-          it "should allow user to modify category sidebar section links" do
+          it "should allow user to only modify category sidebar section links for categories they have access to" do
             category = Fabricate(:category)
-            restricted_category = Fabricate(:category, read_restricted: true)
+            group = Fabricate(:group)
+            restricted_category = Fabricate(:private_category, group: group)
             category_sidebar_section_link = Fabricate(:category_sidebar_section_link, user: user)
 
             put "/u/#{user.username}.json",
@@ -2572,6 +2599,21 @@ RSpec.describe UsersController do
             sidebar_section_link = user.sidebar_section_links.first
 
             expect(sidebar_section_link.linkable).to eq(category)
+
+            group.add(user)
+
+            expect do
+              put "/u/#{user.username}.json",
+                  params: {
+                    sidebar_category_ids: [category.id, restricted_category.id],
+                  }
+
+              expect(response.status).to eq(200)
+            end.to change { user.sidebar_section_links.count }.from(1).to(2)
+
+            expect(SidebarSectionLink.exists?(user: user, linkable: restricted_category)).to eq(
+              true,
+            )
           end
 
           it "should allow user to remove all tag sidebar section links" do
@@ -2597,15 +2639,18 @@ RSpec.describe UsersController do
             expect(user.reload.sidebar_section_links.count).to eq(0)
           end
 
-          it "should allow user to add tag sidebar section links" do
+          it "should allow user to add tag sidebar section links only for tags that are visible to the user" do
             SiteSetting.tagging_enabled = true
 
             tag = Fabricate(:tag)
             tag_sidebar_section_link = Fabricate(:tag_sidebar_section_link, user: user)
 
+            hidden_tag = Fabricate(:tag)
+            Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name])
+
             put "/u/#{user.username}.json",
                 params: {
-                  sidebar_tag_names: [tag.name, "somerandomtag"],
+                  sidebar_tag_names: [tag.name, "somerandomtag", hidden_tag.name],
                 }
 
             expect(response.status).to eq(200)
@@ -2615,6 +2660,19 @@ RSpec.describe UsersController do
             sidebar_section_link = user.sidebar_section_links.first
 
             expect(sidebar_section_link.linkable).to eq(tag)
+
+            user.update!(admin: true)
+
+            expect do
+              put "/u/#{user.username}.json",
+                  params: {
+                    sidebar_tag_names: [tag.name, "somerandomtag", hidden_tag.name],
+                  }
+
+              expect(response.status).to eq(200)
+            end.to change { user.sidebar_section_links.count }.from(1).to(2)
+
+            expect(SidebarSectionLink.exists?(user: user, linkable: hidden_tag)).to eq(true)
           end
         end
       end
@@ -2871,7 +2929,7 @@ RSpec.describe UsersController do
         end
 
         it "doesn't clear user status if it wasn't sent in the payload" do
-          new_status = { emoji: "off to dentist", description: "tooth" }
+          new_status = { emoji: "tooth", description: "off to dentist" }
           user.set_status!(new_status[:description], new_status[:emoji])
           user.reload
 
@@ -2973,6 +3031,32 @@ RSpec.describe UsersController do
         end
       end
     end
+
+    context "when a plugin introduces a users_controller_update_user_params modifier" do
+      before { sign_in(user) }
+
+      after { DiscoursePluginRegistry.clear_modifiers! }
+
+      it "allows the plugin to modify the user params" do
+        block_called = false
+
+        plugin = Plugin::Instance.new
+        plugin.register_modifier(
+          :users_controller_update_user_params,
+        ) do |result, current_user, params|
+          block_called = true
+          expect(current_user.id).to eq(user.id)
+          result[:location] = params[:plugin_location_alias]
+          result
+        end
+
+        put "/u/#{user.username}.json", params: { location: "abc", plugin_location_alias: "xyz" }
+
+        expect(response.status).to eq(200)
+        expect(user.reload.user_profile.location).to eq("xyz")
+        expect(block_called).to eq(true)
+      end
+    end
   end
 
   describe "#badge_title" do
@@ -2996,7 +3080,6 @@ RSpec.describe UsersController do
           }
 
       expect(user1.reload.title).to eq(badge.display_name)
-      expect(user1.user_profile.badge_granted_title).to eq(true)
       expect(user1.user_profile.granted_title_badge_id).to eq(badge.id)
 
       badge.update allow_title: false
@@ -3009,7 +3092,6 @@ RSpec.describe UsersController do
       user1.reload
       user1.user_profile.reload
       expect(user1.title).to eq("")
-      expect(user1.user_profile.badge_granted_title).to eq(false)
       expect(user1.user_profile.granted_title_badge_id).to eq(nil)
     end
 
@@ -4155,6 +4237,8 @@ RSpec.describe UsersController do
     end
 
     context "with a session variable" do
+      use_redis_snapshotting
+
       it "raises an error with an invalid session value" do
         post_user
 
@@ -4226,7 +4310,6 @@ RSpec.describe UsersController do
 
       it "tells the user to slow down after many requests" do
         RateLimiter.enable
-        RateLimiter.clear_all!
         freeze_time
 
         user = post_user
@@ -4328,7 +4411,6 @@ RSpec.describe UsersController do
 
       it "tells the user to slow down after many requests" do
         RateLimiter.enable
-        RateLimiter.clear_all!
         freeze_time
 
         user = inactive_user
@@ -4594,13 +4676,13 @@ RSpec.describe UsersController do
       before { sign_in(user1) }
 
       it "works correctly" do
-        get "/u/#{user1.username}/card.json"
+        get "/u/#{user.username}/card.json"
         expect(response.status).to eq(200)
 
         json = response.parsed_body
 
         expect(json["user"]["associated_accounts"]).to eq(nil) # Not serialized in card
-        expect(json["user"]["username"]).to eq(user1.username)
+        expect(json["user"]["username"]).to eq(user.username)
       end
 
       it "returns not found when the username doesn't exist" do
@@ -4608,9 +4690,23 @@ RSpec.describe UsersController do
         expect(response).not_to be_successful
       end
 
+      it "returns partial response when inactive user" do
+        user.update!(active: false)
+        get "/u/#{user.username}/card.json"
+        expect(response).to be_successful
+        expect(response.parsed_body["user"]["inactive"]).to eq(true)
+      end
+
+      it "returns partial response when hidden users" do
+        user.user_option.update!(hide_profile_and_presence: true)
+        get "/u/#{user.username}/card.json"
+        expect(response).to be_successful
+        expect(response.parsed_body["user"]["profile_hidden"]).to eq(true)
+      end
+
       it "raises an error on invalid access" do
-        Guardian.any_instance.expects(:can_see?).with(user1).returns(false)
-        get "/u/#{user1.username}/card.json"
+        Guardian.any_instance.expects(:can_see?).with(user).returns(false)
+        get "/u/#{user.username}/card.json"
         expect(response).to be_forbidden
       end
     end
@@ -4912,6 +5008,51 @@ RSpec.describe UsersController do
           DiscoursePluginRegistry.reset!
         end
 
+        it "allows plugins to use apply modifiers to the groups filter" do
+          get "/u/search/users.json", params: { include_groups: "true", term: "a" }
+
+          expect(response.status).to eq(200)
+          initial_groups = response.parsed_body["groups"]
+          expect(initial_groups.count).to eq(6)
+
+          Plugin::Instance
+            .new
+            .register_modifier(:groups_for_users_search) do |groups|
+              groups.where(name: initial_groups.first["name"])
+            end
+
+          get "/u/search/users.json", params: { include_groups: "true", term: "a" }
+          expect(response.status).to eq(200)
+          expect(response.parsed_body["groups"].count).to eq(1)
+
+          DiscoursePluginRegistry.reset!
+        end
+
+        it "works when the modifier to the groups filter introduces a join with a conflicting name fields like `id` for example" do
+          %i[
+            include_groups
+            include_mentionable_groups
+            include_messageable_groups
+          ].each do |param_name|
+            get "/u/search/users.json", params: { param_name => "true", :term => "a" }
+
+            expect(response.status).to eq(200)
+
+            Plugin::Instance
+              .new
+              .register_modifier(:groups_for_users_search) do |groups|
+                # a join with a conflicting name field (id) is introduced here
+                # we expect the query to work correctly
+                groups.left_joins(:users).where(users: { admin: true })
+              end
+
+            get "/u/search/users.json", params: { param_name => "true", :term => "a" }
+            expect(response.status).to eq(200) # the conflict would cause a 500 error
+
+            DiscoursePluginRegistry.reset!
+          end
+        end
+
         it "doesn't search for groups" do
           get "/u/search/users.json",
               params: {
@@ -5240,6 +5381,8 @@ RSpec.describe UsersController do
   describe "#enable_second_factor_totp" do
     before { sign_in(user1) }
 
+    use_redis_snapshotting
+
     def create_totp
       stub_secure_session_confirmed
       post "/users/create_second_factor_totp.json"
@@ -5262,7 +5405,6 @@ RSpec.describe UsersController do
 
     it "rate limits by IP address" do
       RateLimiter.enable
-      RateLimiter.clear_all!
 
       create_totp
       staged_totp_key = read_secure_session["staged-totp-#{user1.id}"]
@@ -5281,7 +5423,6 @@ RSpec.describe UsersController do
 
     it "rate limits by username" do
       RateLimiter.enable
-      RateLimiter.clear_all!
 
       create_totp
       staged_totp_key = read_secure_session["staged-totp-#{user1.id}"]
@@ -5634,6 +5775,7 @@ RSpec.describe UsersController do
           Class
             .new(Auth::Authenticator) do
               attr_accessor :can_revoke
+
               def name
                 "testprovider"
               end
@@ -5946,7 +6088,7 @@ RSpec.describe UsersController do
       bookmark3 && bookmark4
     end
 
-    after { Bookmark.registered_bookmarkables = [] }
+    after { DiscoursePluginRegistry.reset! }
 
     let(:bookmark1) { Fabricate(:bookmark, user: user1, bookmarkable: Fabricate(:post)) }
     let(:bookmark2) { Fabricate(:bookmark, user: user1, bookmarkable: Fabricate(:topic)) }
@@ -6535,24 +6677,31 @@ RSpec.describe UsersController do
         )
       end
 
-      it "responds with an array of PM topics that are not associated with any of the unread private_message notifications" do
+      it "responds with an array of personal messages and user watching group messages that are not associated with any of the unread private_message notifications" do
         group_message1.update!(bumped_at: 1.minutes.ago)
         message_without_notification.update!(bumped_at: 3.minutes.ago)
         group_message2.update!(bumped_at: 6.minutes.ago)
         message_with_read_notification.update!(bumped_at: 10.minutes.ago)
         read_group_message_summary_notification.destroy!
 
+        TopicUser.create!(
+          user: user,
+          topic: group_message1,
+          notification_level: TopicUser.notification_levels[:watching],
+        )
+        TopicUser.create!(
+          user: user,
+          topic: group_message2,
+          notification_level: TopicUser.notification_levels[:regular],
+        )
+
         get "/u/#{user.username}/user-menu-private-messages"
         expect(response.status).to eq(200)
 
         topics = response.parsed_body["topics"]
+
         expect(topics.map { |topic| topic["id"] }).to eq(
-          [
-            group_message1.id,
-            message_without_notification.id,
-            group_message2.id,
-            message_with_read_notification.id,
-          ],
+          [group_message1.id, message_without_notification.id, message_with_read_notification.id],
         )
       end
 
diff --git a/spec/requests/users_email_controller_spec.rb b/spec/requests/users_email_controller_spec.rb
index b47c580b598..40b7332e05e 100644
--- a/spec/requests/users_email_controller_spec.rb
+++ b/spec/requests/users_email_controller_spec.rb
@@ -118,10 +118,9 @@ RSpec.describe UsersEmailController do
         end
 
         context "with rate limiting" do
-          before do
-            RateLimiter.clear_all!
-            RateLimiter.enable
-          end
+          before { RateLimiter.enable }
+
+          use_redis_snapshotting
 
           it "rate limits by IP" do
             freeze_time
diff --git a/spec/requests/webhooks_controller_spec.rb b/spec/requests/webhooks_controller_spec.rb
index 8d6050096c6..48f094a7f97 100644
--- a/spec/requests/webhooks_controller_spec.rb
+++ b/spec/requests/webhooks_controller_spec.rb
@@ -105,6 +105,53 @@ RSpec.describe WebhooksController do
       expect(email_log.bounce_error_code).to eq("5.0.0")
       expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.hard_bounce_score)
     end
+
+    it "verifies signatures" do
+      SiteSetting.sendgrid_verification_key =
+        "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE83T4O/n84iotIvIW4mdBgQ/7dAfSmpqIM8kF9mN1flpVKS3GRqe62gw+2fNNRaINXvVpiglSI8eNEc6wEA3F+g=="
+
+      post "/webhooks/sendgrid.json",
+           headers: {
+             "X-Twilio-Email-Event-Webhook-Signature" =>
+               "MEUCIGHQVtGj+Y3LkG9fLcxf3qfI10QysgDWmMOVmxG0u6ZUAiEAyBiXDWzM+uOe5W0JuG+luQAbPIqHh89M15TluLtEZtM=",
+             "X-Twilio-Email-Event-Webhook-Timestamp" => "1600112502",
+           },
+           params:
+             "[{\"email\":\"hello@world.com\",\"event\":\"dropped\",\"reason\":\"Bounced Address\",\"sg_event_id\":\"ZHJvcC0xMDk5NDkxOS1MUnpYbF9OSFN0T0doUTRrb2ZTbV9BLTA\",\"sg_message_id\":\"LRzXl_NHStOGhQ4kofSm_A.filterdrecv-p3mdw1-756b745b58-kmzbl-18-5F5FC76C-9.0\",\"smtp-id\":\"<LRzXl_NHStOGhQ4kofSm_A@ismtpd0039p1iad1.sendgrid.net>\",\"timestamp\":1600112492}]\r\n"
+
+      expect(response.status).to eq(200)
+    end
+
+    it "returns error if signature verification fails" do
+      SiteSetting.sendgrid_verification_key =
+        "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE83T4O/n84iotIvIW4mdBgQ/7dAfSmpqIM8kF9mN1flpVKS3GRqe62gw+2fNNRaINXvVpiglSI8eNEc6wEA3F+g=="
+
+      post "/webhooks/sendgrid.json",
+           headers: {
+             "X-Twilio-Email-Event-Webhook-Signature" =>
+               "MEUCIQCtIHJeH93Y+qpYeWrySphQgpNGNr/U+UyUlBkU6n7RAwIgJTz2C+8a8xonZGi6BpSzoQsbVRamr2nlxFDWYNH3j/0=",
+             "X-Twilio-Email-Event-Webhook-Timestamp" => "1600112502",
+           },
+           params:
+             "[{\"email\":\"hello@world.com\",\"event\":\"dropped\",\"reason\":\"Bounced Address\",\"sg_event_id\":\"ZHJvcC0xMDk5NDkxOS1MUnpYbF9OSFN0T0doUTRrb2ZTbV9BLTA\",\"sg_message_id\":\"LRzXl_NHStOGhQ4kofSm_A.filterdrecv-p3mdw1-756b745b58-kmzbl-18-5F5FC76C-9.0\",\"smtp-id\":\"<LRzXl_NHStOGhQ4kofSm_A@ismtpd0039p1iad1.sendgrid.net>\",\"timestamp\":1600112492}]\r\n"
+
+      expect(response.status).to eq(406)
+    end
+
+    it "returns error if signature is invalid" do
+      SiteSetting.sendgrid_verification_key = "foo"
+
+      post "/webhooks/sendgrid.json",
+           headers: {
+             "X-Twilio-Email-Event-Webhook-Signature" =>
+               "MEUCIQCtIHJeH93Y+qpYeWrySphQgpNGNr/U+UyUlBkU6n7RAwIgJTz2C+8a8xonZGi6BpSzoQsbVRamr2nlxFDWYNH3j/0=",
+             "X-Twilio-Email-Event-Webhook-Timestamp" => "1600112502",
+           },
+           params:
+             "[{\"email\":\"hello@world.com\",\"event\":\"dropped\",\"reason\":\"Bounced Address\",\"sg_event_id\":\"ZHJvcC0xMDk5NDkxOS1MUnpYbF9OSFN0T0doUTRrb2ZTbV9BLTA\",\"sg_message_id\":\"LRzXl_NHStOGhQ4kofSm_A.filterdrecv-p3mdw1-756b745b58-kmzbl-18-5F5FC76C-9.0\",\"smtp-id\":\"<LRzXl_NHStOGhQ4kofSm_A@ismtpd0039p1iad1.sendgrid.net>\",\"timestamp\":1600112492}]\r\n"
+
+      expect(response.status).to eq(406)
+    end
   end
 
   describe "#mailjet" do
@@ -127,9 +174,93 @@ RSpec.describe WebhooksController do
       expect(email_log.bounce_error_code).to eq(nil) # mailjet doesn't give us this
       expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.hard_bounce_score)
     end
+
+    it "verifies signatures" do
+      SiteSetting.mailjet_webhook_token = "foo"
+      user = Fabricate(:user, email: email)
+      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+
+      post "/webhooks/mailjet.json?t=foo",
+           params: {
+             "event" => "bounce",
+             "email" => email,
+             "hard_bounce" => true,
+             "CustomID" => message_id,
+           }
+
+      expect(response.status).to eq(200)
+      expect(email_log.reload.bounced).to eq(true)
+    end
+
+    it "returns error if signature verification fails" do
+      SiteSetting.mailjet_webhook_token = "foo"
+      user = Fabricate(:user, email: email)
+      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+
+      post "/webhooks/mailjet.json?t=bar",
+           params: {
+             "event" => "bounce",
+             "email" => email,
+             "hard_bounce" => true,
+             "CustomID" => message_id,
+           }
+
+      expect(response.status).to eq(406)
+      expect(email_log.reload.bounced).to eq(false)
+    end
+  end
+
+  describe "#mailpace" do
+    it "works" do
+      user = Fabricate(:user, email: email)
+      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+
+      post "/webhooks/mailpace.json",
+           params: {
+             event: "email.bounced",
+             payload: {
+               status: "bounced",
+               to: email,
+               message_id: "<#{message_id}>",
+             },
+           }
+
+      expect(response.status).to eq(200)
+
+      email_log.reload
+      expect(email_log.bounced).to eq(true)
+      expect(email_log.bounce_error_code).to eq(nil) # mailpace doesn't give us this
+      expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.hard_bounce_score)
+    end
+
+    it "soft bounces" do
+      user = Fabricate(:user, email: email)
+      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+
+      post "/webhooks/mailpace.json",
+           params: {
+             event: "email.deferred",
+             payload: {
+               status: "deferred",
+               to: email,
+               message_id: "<#{message_id}>",
+             },
+           }
+
+      expect(response.status).to eq(200)
+
+      email_log.reload
+      expect(email_log.bounced).to eq(true)
+      expect(email_log.bounce_error_code).to eq(nil) # mailpace doesn't give us this
+      expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.soft_bounce_score)
+    end
   end
 
   describe "#mandrill" do
+    let(:payload) do
+      "mandrill_events=%5B%7B%22event%22%3A%22hard_bounce%22%2C%22msg%22%3A%7B%22email%22%3A%22em%40il.com%22%2C%22diag%22%3A%225.1.1%22%2C%22bounce_description%22%3A%22smtp%3B+550-5.1.1+The+email+account+that+you+tried+to+reach+does+not+exist.%22%2C%22metadata%22%3A%7B%22message_id%22%3A%2212345%40il.com%22%7D%7D%7D%5D"
+    end
+
     it "works" do
       user = Fabricate(:user, email: email)
       email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
@@ -159,6 +290,38 @@ RSpec.describe WebhooksController do
       expect(email_log.bounce_error_code).to eq("5.1.1")
       expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.hard_bounce_score)
     end
+
+    it "verifies signatures" do
+      SiteSetting.mandrill_authentication_key = "wr_JeJNO9OI65RFDrvk3Zw"
+
+      post "/webhooks/mandrill.json",
+           headers: {
+             "X-Mandrill-Signature" => "Q5pCb903EjEqRZ99gZrlYKOfvIU=",
+           },
+           params: payload
+
+      expect(response.status).to eq(200)
+    end
+
+    it "returns error if signature verification fails" do
+      SiteSetting.mandrill_authentication_key = "wr_JeJNO9OI65RFDrvk3Zw"
+
+      post "/webhooks/mandrill.json", headers: { "X-Mandrill-Signature" => "foo" }, params: payload
+
+      expect(response.status).to eq(406)
+    end
+
+    it "returns error if signature is invalid" do
+      SiteSetting.mandrill_authentication_key = "foo"
+
+      post "/webhooks/mandrill.json",
+           headers: {
+             "X-Mandrill-Signature" => "Q5pCb903EjEqRZ99gZrlYKOfvIU=",
+           },
+           params: payload
+
+      expect(response.status).to eq(406)
+    end
   end
 
   describe "#mandrill_head" do
@@ -187,6 +350,7 @@ RSpec.describe WebhooksController do
       expect(email_log.bounce_error_code).to eq(nil) # postmark doesn't give us this
       expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.hard_bounce_score)
     end
+
     it "soft bounces" do
       user = Fabricate(:user, email: email)
       email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
@@ -204,6 +368,38 @@ RSpec.describe WebhooksController do
       expect(email_log.bounce_error_code).to eq(nil) # postmark doesn't give us this
       expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.soft_bounce_score)
     end
+
+    it "verifies signatures" do
+      SiteSetting.postmark_webhook_token = "foo"
+      user = Fabricate(:user, email: email)
+      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+
+      post "/webhooks/postmark.json?t=foo",
+           params: {
+             "Type" => "HardBounce",
+             "MessageID" => message_id,
+             "Email" => email,
+           }
+
+      expect(response.status).to eq(200)
+      expect(email_log.reload.bounced).to eq(true)
+    end
+
+    it "returns error if signature verification fails" do
+      SiteSetting.postmark_webhook_token = "foo"
+      user = Fabricate(:user, email: email)
+      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+
+      post "/webhooks/postmark.json?t=bar",
+           params: {
+             "Type" => "HardBounce",
+             "MessageID" => message_id,
+             "Email" => email,
+           }
+
+      expect(response.status).to eq(406)
+      expect(email_log.reload.bounced).to eq(false)
+    end
   end
 
   describe "#sparkpost" do
@@ -235,5 +431,136 @@ RSpec.describe WebhooksController do
       expect(email_log.bounced).to eq(true)
       expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.hard_bounce_score)
     end
+
+    it "verifies signatures" do
+      SiteSetting.sparkpost_webhook_token = "foo"
+      user = Fabricate(:user, email: email)
+      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+
+      post "/webhooks/sparkpost.json?t=foo",
+           params: {
+             "_json" => [
+               {
+                 "msys" => {
+                   "message_event" => {
+                     "bounce_class" => 10,
+                     "error_code" => "554",
+                     "rcpt_to" => email,
+                     "rcpt_meta" => {
+                       "message_id" => message_id,
+                     },
+                   },
+                 },
+               },
+             ],
+           }
+
+      expect(response.status).to eq(200)
+      expect(email_log.reload.bounced).to eq(true)
+    end
+
+    it "returns error if signature verification fails" do
+      SiteSetting.sparkpost_webhook_token = "foo"
+      user = Fabricate(:user, email: email)
+      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+
+      post "/webhooks/sparkpost.json?t=bar",
+           params: {
+             "_json" => [
+               {
+                 "msys" => {
+                   "message_event" => {
+                     "bounce_class" => 10,
+                     "error_code" => "554",
+                     "rcpt_to" => email,
+                     "rcpt_meta" => {
+                       "message_id" => message_id,
+                     },
+                   },
+                 },
+               },
+             ],
+           }
+
+      expect(response.status).to eq(406)
+      expect(email_log.reload.bounced).to eq(false)
+    end
+  end
+
+  describe "#aws" do
+    let(:payload) do
+      {
+        "Type" => "Notification",
+        "Message" => {
+          "notificationType" => "Bounce",
+          :"bounce" => {
+            "bounceType" => "Permanent",
+            "reportingMTA" => "dns; email.example.com",
+            :"bouncedRecipients" => [
+              {
+                "emailAddress" => email,
+                "status" => "5.1.1",
+                "action" => "failed",
+                "diagnosticCode" => "smtp; 550 5.1.1 <#{email}>... User",
+              },
+            ],
+            "bounceSubType" => "General",
+            "timestamp" => "2016-01-27T14:59:38.237Z",
+            "feedbackId" => "00000138111222aa-33322211-cccc-cccc-cccc-ddddaaaa068a-000000",
+            "remoteMtaIp" => "127.0.2.0",
+          },
+          :"mail" => {
+            "timestamp" => "2016-01-27T14:59:38.237Z",
+            "source" => "john@example.com",
+            "sourceArn" => "arn:aws:ses:us-east-1:888888888888:identity/example.com",
+            "sourceIp" => "127.0.3.0",
+            "sendingAccountId" => "123456789012",
+            "callerIdentity" => "IAM_user_or_role_name",
+            "messageId" => message_id,
+            "destination" => [email, "jane@example.com", "mary@example.com", "richard@example.com"],
+            "headersTruncated" => false,
+            "headers" => [
+              { "name" => "From", "value" => "\"John Doe\" <john@example.com>" },
+              {
+                "name" => "To",
+                "value" =>
+                  "\"Test\" <#{email}>, \"Jane Doe\" <jane@example.com>, \"Mary Doe\" <mary@example.com>, \"Richard Doe\" <richard@example.com>",
+              },
+              { "name" => "Message-ID", "value" => message_id },
+              { "name" => "Subject", "value" => "Hello" },
+              { "name" => "Content-Type", "value" => "text/plain; charset=\"UTF-8\"" },
+              { "name" => "Content-Transfer-Encoding", "value" => "base64" },
+              { "name" => "Date", "value" => "Wed, 27 Jan 2016 14:05:45 +0000" },
+            ],
+            "commonHeaders" => {
+              "from" => ["John Doe <john@example.com>"],
+              "date" => "Wed, 27 Jan 2016 14:05:45 +0000",
+              "to" => [
+                "\"Test\" <#{email}>, Jane Doe <jane@example.com>, Mary Doe <mary@example.com>, Richard Doe <richard@example.com>",
+              ],
+              "messageId" => message_id,
+              "subject" => "Hello",
+            },
+          },
+        }.to_json,
+      }.to_json
+    end
+
+    before { Jobs.run_immediately! }
+
+    it "works" do
+      user = Fabricate(:user, email: email)
+      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+
+      require "aws-sdk-sns"
+      Aws::SNS::MessageVerifier.any_instance.stubs(:authentic?).with(payload).returns(true)
+
+      post "/webhooks/aws.json", headers: { "RAW_POST_DATA" => payload }
+      expect(response.status).to eq(200)
+
+      email_log.reload
+      expect(email_log.bounced).to eq(true)
+      expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.hard_bounce_score)
+    end
   end
 end
diff --git a/spec/script/import_scripts/base_spec.rb b/spec/script/import_scripts/base_spec.rb
index 3f637f4d8b1..a90ccf3c03d 100644
--- a/spec/script/import_scripts/base_spec.rb
+++ b/spec/script/import_scripts/base_spec.rb
@@ -54,4 +54,28 @@ RSpec.describe ImportScripts::Base do
     MockSpecImporter.new(import_data).perform
     expect(SiteSetting.purge_unactivated_users_grace_period_days).to eq(0)
   end
+
+  describe "#create_post" do
+    let(:importer) { described_class.new }
+    fab!(:user) { Fabricate(:user) }
+    let(:post_params) do
+      { user_id: user.id, raw: "Test post [b]content[/b]", title: "Test topic for post" }
+    end
+
+    it "creates a Post" do
+      expect { importer.create_post(post_params, 123) }.to change { Post.count }.by(1)
+    end
+
+    if ENV["IMPORT"] == "1"
+      it "uses the ruby-bbcode-to-md gem (conditional Gemfile option)" do
+        expect(String.method_defined?(:bbcode_to_md)).to be true
+      end
+
+      it "converts bbcode to markdown when specified" do
+        importer.instance_variable_set(:@bbcode_to_md, true)
+        importer.create_post(post_params, 123)
+        expect(Post.first.raw).to eq "Test post **content**"
+      end
+    end
+  end
 end
diff --git a/spec/script/import_scripts/vanilla_body_parser_spec.rb b/spec/script/import_scripts/vanilla_body_parser_spec.rb
index 50475c50290..19bfd49bdc5 100644
--- a/spec/script/import_scripts/vanilla_body_parser_spec.rb
+++ b/spec/script/import_scripts/vanilla_body_parser_spec.rb
@@ -96,6 +96,7 @@ this starts with spaces but IS NOT a quote" \
           { "Format" => "Rich", "Body" => rich_bodies[:mention].to_json },
           user_id,
         ).parse
+
       expect(parsed).to eq "@Gandalf The Grey, what do you think?"
     end
 
@@ -107,9 +108,10 @@ this starts with spaces but IS NOT a quote" \
           name: "Gandalf The Grey",
           username: "gandalf_the_grey",
         )
+
       lookup.add_user(mentioned.id.to_s, mentioned)
 
-      body = rich_bodies[:mention].to_json.gsub("666", mentioned.id.to_s)
+      body = rich_bodies[:mention].to_json.gsub("999999999", mentioned.id.to_s)
       parsed = VanillaBodyParser.new({ "Format" => "Rich", "Body" => body }, user_id).parse
       expect(parsed).to eq "@gandalf_the_grey, what do you think?"
     end
@@ -120,6 +122,7 @@ this starts with spaces but IS NOT a quote" \
           { "Format" => "Rich", "Body" => rich_bodies[:links].to_json },
           user_id,
         ).parse
+
       expect(
         parsed,
       ).to eq "We can link to the <a href=\"https:\/\/www.discourse.org\/\">Discourse home page</a> and it works."
diff --git a/spec/serializers/admin_plugin_serializer_spec.rb b/spec/serializers/admin_plugin_serializer_spec.rb
index 0ca42794713..eb2a86bc828 100644
--- a/spec/serializers/admin_plugin_serializer_spec.rb
+++ b/spec/serializers/admin_plugin_serializer_spec.rb
@@ -1,14 +1,28 @@
 # frozen_string_literal: true
 
 RSpec.describe AdminPluginSerializer do
-  let(:instance) { Plugin::Instance.new }
+  subject(:serializer) { described_class.new(instance) }
 
-  subject { described_class.new(instance) }
+  let(:instance) { Plugin::Instance.new }
 
   describe "enabled_setting" do
     it "should return the right value" do
       instance.enabled_site_setting("test")
-      expect(subject.enabled_setting).to eq("test")
+      expect(serializer.enabled_setting).to eq("test")
+    end
+  end
+
+  describe "commit_hash" do
+    it "should return commit_hash and commit_url" do
+      instance = Plugin::Instance.find_all("#{Rails.root}/spec/fixtures/plugins")[0]
+      subject = described_class.new(instance)
+
+      git_repo = instance.git_repo
+      git_repo.stubs(:latest_local_commit).returns("123456")
+      git_repo.stubs(:url).returns("http://github.com/discourse/discourse-plugin")
+
+      expect(subject.commit_hash).to eq("123456")
+      expect(subject.commit_url).to eq("http://github.com/discourse/discourse-plugin/commit/123456")
     end
   end
 end
diff --git a/spec/serializers/basic_group_serializer_spec.rb b/spec/serializers/basic_group_serializer_spec.rb
index 7758fda3ce7..c4800008f52 100644
--- a/spec/serializers/basic_group_serializer_spec.rb
+++ b/spec/serializers/basic_group_serializer_spec.rb
@@ -1,16 +1,17 @@
 # frozen_string_literal: true
 
 RSpec.describe BasicGroupSerializer do
+  subject(:serializer) { described_class.new(group, scope: guardian, root: false) }
+
   let(:guardian) { Guardian.new }
   fab!(:group) { Fabricate(:group) }
-  subject { described_class.new(group, scope: guardian, root: false) }
 
   describe "#display_name" do
     describe "automatic group" do
       let(:group) { Group.find(1) }
 
       it "should include the display name" do
-        expect(subject.display_name).to eq(I18n.t("groups.default_names.admins"))
+        expect(serializer.display_name).to eq(I18n.t("groups.default_names.admins"))
       end
     end
 
@@ -18,22 +19,22 @@ RSpec.describe BasicGroupSerializer do
       fab!(:group) { Fabricate(:group) }
 
       it "should not include the display name" do
-        expect(subject.display_name).to eq(nil)
+        expect(serializer.display_name).to eq(nil)
       end
     end
   end
 
   describe "#bio_raw" do
-    fab!(:group) { Fabricate(:group, bio_raw: "testing :slightly_smiling_face:") }
-
-    subject do
+    subject(:serializer) do
       described_class.new(group, scope: guardian, root: false, owner_group_ids: [group.id])
     end
 
+    fab!(:group) { Fabricate(:group, bio_raw: "testing :slightly_smiling_face:") }
+
     describe "group owner" do
       it "should include bio_raw" do
-        expect(subject.as_json[:bio_raw]).to eq("testing :slightly_smiling_face:")
-        expect(subject.as_json[:bio_excerpt]).to start_with("testing <img")
+        expect(serializer.as_json[:bio_raw]).to eq("testing :slightly_smiling_face:")
+        expect(serializer.as_json[:bio_excerpt]).to start_with("testing <img")
       end
     end
   end
@@ -48,7 +49,7 @@ RSpec.describe BasicGroupSerializer do
 
       it "should be present" do
         Group.refresh_automatic_groups!
-        expect(subject.as_json[:has_messages]).to eq(true)
+        expect(serializer.as_json[:has_messages]).to eq(true)
       end
     end
 
@@ -59,7 +60,7 @@ RSpec.describe BasicGroupSerializer do
       before { group.add(user) }
 
       it "should be present" do
-        expect(subject.as_json[:has_messages]).to eq(true)
+        expect(serializer.as_json[:has_messages]).to eq(true)
       end
     end
 
@@ -67,7 +68,7 @@ RSpec.describe BasicGroupSerializer do
       let(:guardian) { Guardian.new(Fabricate(:user)) }
 
       it "should not be present" do
-        expect(subject.as_json[:has_messages]).to eq(nil)
+        expect(serializer.as_json[:has_messages]).to eq(nil)
       end
     end
   end
@@ -82,7 +83,7 @@ RSpec.describe BasicGroupSerializer do
       before { group.add(user) }
 
       it "should be true" do
-        expect(subject.as_json[:can_see_members]).to eq(true)
+        expect(serializer.as_json[:can_see_members]).to eq(true)
       end
     end
 
@@ -90,7 +91,7 @@ RSpec.describe BasicGroupSerializer do
       let(:guardian) { Guardian.new(Fabricate(:user)) }
 
       it "should be false" do
-        expect(subject.as_json[:can_see_members]).to eq(false)
+        expect(serializer.as_json[:can_see_members]).to eq(false)
       end
     end
   end
diff --git a/spec/serializers/basic_reviewable_flagged_post_serializer_spec.rb b/spec/serializers/basic_reviewable_flagged_post_serializer_spec.rb
index 3e8dfe9ae17..e5ef2c87ff6 100644
--- a/spec/serializers/basic_reviewable_flagged_post_serializer_spec.rb
+++ b/spec/serializers/basic_reviewable_flagged_post_serializer_spec.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 describe BasicReviewableFlaggedPostSerializer do
+  subject(:serializer) { described_class.new(reviewable, root: false).as_json }
+
   fab!(:topic) { Fabricate(:topic, title: "safe title <a> hello world") }
   fab!(:post) { Fabricate(:post, topic: topic) }
 
@@ -12,29 +14,27 @@ describe BasicReviewableFlaggedPostSerializer do
     )
   end
 
-  subject { described_class.new(reviewable, root: false).as_json }
-
   include_examples "basic reviewable attributes"
 
   describe "#post_number" do
     it "equals the post_number of the post" do
-      expect(subject[:post_number]).to eq(post.post_number)
+      expect(serializer[:post_number]).to eq(post.post_number)
     end
 
     it "is not included if the reviewable is associated with no post" do
       reviewable.update!(target: nil)
-      expect(subject.key?(:post_number)).to eq(false)
+      expect(serializer.key?(:post_number)).to eq(false)
     end
   end
 
   describe "#topic_fancy_title" do
     it "equals the fancy_title of the topic" do
-      expect(subject[:topic_fancy_title]).to eq("Safe title &lt;a&gt; hello world")
+      expect(serializer[:topic_fancy_title]).to eq("Safe title &lt;a&gt; hello world")
     end
 
     it "is not included if the reviewable is associated with no topic" do
       reviewable.update!(topic: nil)
-      expect(subject.key?(:topic_fancy_title)).to eq(false)
+      expect(serializer.key?(:topic_fancy_title)).to eq(false)
     end
   end
 end
diff --git a/spec/serializers/basic_reviewable_queued_post_serializer_spec.rb b/spec/serializers/basic_reviewable_queued_post_serializer_spec.rb
index eb332dc8db8..6cb0728a8e3 100644
--- a/spec/serializers/basic_reviewable_queued_post_serializer_spec.rb
+++ b/spec/serializers/basic_reviewable_queued_post_serializer_spec.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 describe BasicReviewableQueuedPostSerializer do
+  subject(:serializer) { described_class.new(reviewable, root: false).as_json }
+
   fab!(:topic) { Fabricate(:topic, title: "safe title <a> existing topic") }
   fab!(:reviewable) do
     ReviewableQueuedPost.create!(
@@ -13,40 +15,38 @@ describe BasicReviewableQueuedPostSerializer do
     )
   end
 
-  subject { described_class.new(reviewable, root: false).as_json }
-
   include_examples "basic reviewable attributes"
 
   describe "#topic_fancy_title" do
     it "equals the topic's fancy_title" do
-      expect(subject[:topic_fancy_title]).to eq("Safe title &lt;a&gt; existing topic")
+      expect(serializer[:topic_fancy_title]).to eq("Safe title &lt;a&gt; existing topic")
     end
 
     it "is not included if the reviewable is associated with no topic" do
       reviewable.update!(topic: nil)
-      expect(subject.key?(:topic_fancy_title)).to eq(false)
+      expect(serializer.key?(:topic_fancy_title)).to eq(false)
     end
   end
 
   describe "#is_new_topic" do
     it "is true if the reviewable's payload has a title attribute" do
-      expect(subject[:is_new_topic]).to eq(true)
+      expect(serializer[:is_new_topic]).to eq(true)
     end
 
     it "is false if the reviewable's payload doesn't have a title attribute" do
       reviewable.update!(payload: { raw: "new post 123" })
-      expect(subject[:is_new_topic]).to eq(false)
+      expect(serializer[:is_new_topic]).to eq(false)
     end
   end
 
   describe "#payload_title" do
     it "equals the title in the reviewable's payload" do
-      expect(subject[:payload_title]).to eq("unsafe title <a>")
+      expect(serializer[:payload_title]).to eq("unsafe title <a>")
     end
 
     it "is not included if the reviewable's payload doesn't have a title attribute" do
       reviewable.update!(payload: { raw: "new post 123" })
-      expect(subject.key?(:payload_title)).to eq(false)
+      expect(serializer.key?(:payload_title)).to eq(false)
     end
   end
 end
diff --git a/spec/serializers/basic_reviewable_user_serializer_spec.rb b/spec/serializers/basic_reviewable_user_serializer_spec.rb
index abf8f6f9106..f16f899b2cd 100644
--- a/spec/serializers/basic_reviewable_user_serializer_spec.rb
+++ b/spec/serializers/basic_reviewable_user_serializer_spec.rb
@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
 describe BasicReviewableUserSerializer do
-  fab!(:user) { Fabricate(:user) }
+  subject(:serializer) { described_class.new(reviewable, root: false).as_json }
 
+  fab!(:user) { Fabricate(:user) }
   fab!(:reviewable) do
     ReviewableUser.needs_review!(
       target: user,
@@ -17,13 +18,11 @@ describe BasicReviewableUserSerializer do
     )
   end
 
-  subject { described_class.new(reviewable, root: false).as_json }
-
   include_examples "basic reviewable attributes"
 
   describe "#username" do
     it "equals the username in the reviewable's payload" do
-      expect(subject[:username]).to eq(user.username)
+      expect(serializer[:username]).to eq(user.username)
     end
   end
 end
diff --git a/spec/serializers/category_upload_serializer_spec.rb b/spec/serializers/category_upload_serializer_spec.rb
index c46b2ad501c..eef9d1f9528 100644
--- a/spec/serializers/category_upload_serializer_spec.rb
+++ b/spec/serializers/category_upload_serializer_spec.rb
@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 RSpec.describe CategoryUploadSerializer do
+  subject(:serializer) { described_class.new(upload, root: false) }
+
   fab!(:upload) { Fabricate(:upload) }
-  let(:subject) { described_class.new(upload, root: false) }
 
   it "should include width and height" do
-    expect(subject.width).to eq(upload.width)
-    expect(subject.height).to eq(upload.height)
+    expect(serializer.width).to eq(upload.width)
+    expect(serializer.height).to eq(upload.height)
   end
 end
diff --git a/spec/serializers/current_user_serializer_spec.rb b/spec/serializers/current_user_serializer_spec.rb
index bb66e5783b7..6a681915eb9 100644
--- a/spec/serializers/current_user_serializer_spec.rb
+++ b/spec/serializers/current_user_serializer_spec.rb
@@ -251,28 +251,6 @@ RSpec.describe CurrentUserSerializer do
     end
   end
 
-  describe "#redesigned_user_page_nav_enabled" do
-    fab!(:group) { Fabricate(:group) }
-    fab!(:group2) { Fabricate(:group) }
-
-    it "is false when enable_new_user_profile_nav_groups site setting has not been set" do
-      expect(serializer.as_json[:redesigned_user_page_nav_enabled]).to eq(false)
-    end
-
-    it "is false if user does not belong to any of the configured groups in the enable_new_user_profile_nav_groups site setting" do
-      SiteSetting.enable_new_user_profile_nav_groups = "#{group.id}|#{group2.id}"
-
-      expect(serializer.as_json[:redesigned_user_page_nav_enabled]).to eq(false)
-    end
-
-    it "is true if user belongs one of the configured groups in the enable_new_user_profile_nav_groups site setting" do
-      SiteSetting.enable_new_user_profile_nav_groups = "#{group.id}|#{group2.id}"
-      group.add(user)
-
-      expect(serializer.as_json[:redesigned_user_page_nav_enabled]).to eq(true)
-    end
-  end
-
   describe "#associated_account_ids" do
     before do
       UserAssociatedAccount.create(
@@ -305,10 +283,10 @@ RSpec.describe CurrentUserSerializer do
       )
     end
 
-    it "isn't included when navigation menu is legacy" do
+    it "is included when navigation menu is legacy" do
       SiteSetting.navigation_menu = "legacy"
 
-      expect(serializer.as_json[:new_personal_messages_notifications_count]).to be_nil
+      expect(serializer.as_json[:new_personal_messages_notifications_count]).to eq(1)
     end
 
     it "is included when sidebar is enabled" do
@@ -319,4 +297,44 @@ RSpec.describe CurrentUserSerializer do
   end
 
   include_examples "User Sidebar Serializer Attributes", described_class
+
+  describe "#sidebar_sections" do
+    fab!(:group) { Fabricate(:group) }
+    fab!(:sidebar_section) { Fabricate(:sidebar_section, user: user) }
+
+    it "eager loads sidebar_urls" do
+      custom_sidebar_section_link_1 =
+        Fabricate(:custom_sidebar_section_link, user: user, sidebar_section: sidebar_section)
+
+      # warmup
+      described_class.new(user, scope: Guardian.new(user), root: false).as_json
+
+      initial_count =
+        track_sql_queries do
+          serialized = described_class.new(user, scope: Guardian.new(user), root: false).as_json
+
+          expect(serialized[:sidebar_sections].count).to eq(2)
+
+          expect(serialized[:sidebar_sections].last.links.map { |link| link.id }).to eq(
+            [custom_sidebar_section_link_1.linkable.id],
+          )
+        end.count
+
+      custom_sidebar_section_link_2 =
+        Fabricate(:custom_sidebar_section_link, user: user, sidebar_section: sidebar_section)
+
+      final_count =
+        track_sql_queries do
+          serialized = described_class.new(user, scope: Guardian.new(user), root: false).as_json
+
+          expect(serialized[:sidebar_sections].count).to eq(2)
+
+          expect(serialized[:sidebar_sections].last.links.map { |link| link.id }).to eq(
+            [custom_sidebar_section_link_1.linkable.id, custom_sidebar_section_link_2.linkable.id],
+          )
+        end.count
+
+      expect(initial_count).to eq(final_count)
+    end
+  end
 end
diff --git a/spec/serializers/emoji_serializer_spec.rb b/spec/serializers/emoji_serializer_spec.rb
index 732e78da1b1..8c9487f542a 100644
--- a/spec/serializers/emoji_serializer_spec.rb
+++ b/spec/serializers/emoji_serializer_spec.rb
@@ -4,16 +4,17 @@ RSpec.describe EmojiSerializer do
   fab!(:custom_emoji) { CustomEmoji.create!(name: "trout", upload: Fabricate(:upload)) }
 
   describe "#url" do
+    subject(:serializer) { described_class.new(emoji, root: false) }
+
     fab!(:emoji) { Emoji.load_custom.first }
-    subject { described_class.new(emoji, root: false) }
 
     it "returns a valid URL" do
-      expect(subject.url).to start_with("/uploads/")
+      expect(serializer.url).to start_with("/uploads/")
     end
 
     it "works with a CDN" do
       set_cdn_url("https://cdn.com")
-      expect(subject.url).to start_with("https://cdn.com")
+      expect(serializer.url).to start_with("https://cdn.com")
     end
   end
 
diff --git a/spec/serializers/found_user_serializer_spec.rb b/spec/serializers/found_user_serializer_spec.rb
index 43db8092196..9793306bf7e 100644
--- a/spec/serializers/found_user_serializer_spec.rb
+++ b/spec/serializers/found_user_serializer_spec.rb
@@ -4,6 +4,14 @@ RSpec.describe FoundUserSerializer do
   fab!(:user) { Fabricate(:user) }
   let(:serializer) { described_class.new(user, root: false) }
 
+  describe "#id" do
+    it "returns user id" do
+      json = serializer.as_json
+      expect(json.keys).to include :id
+      expect(json[:id]).to eq(user.id)
+    end
+  end
+
   describe "#name" do
     it "returns name if enabled in site settings" do
       SiteSetting.enable_names = true
diff --git a/spec/serializers/group_show_serializer_spec.rb b/spec/serializers/group_show_serializer_spec.rb
index b69d37ef5a4..2bd872d0aa5 100644
--- a/spec/serializers/group_show_serializer_spec.rb
+++ b/spec/serializers/group_show_serializer_spec.rb
@@ -59,15 +59,16 @@ RSpec.describe GroupShowSerializer do
   end
 
   describe "admin only fields" do
+    subject(:serializer) { described_class.new(group, scope: guardian, root: false) }
+
     fab!(:group) { Fabricate(:group, email_username: "foo@bar.com", email_password: "pa$$w0rd") }
-    subject { described_class.new(group, scope: guardian, root: false) }
 
     context "for a user" do
       let(:guardian) { Guardian.new(Fabricate(:user)) }
 
       it "are not visible" do
-        expect(subject.as_json[:email_username]).to be_nil
-        expect(subject.as_json[:email_password]).to be_nil
+        expect(serializer.as_json[:email_username]).to be_nil
+        expect(serializer.as_json[:email_password]).to be_nil
       end
     end
 
@@ -75,15 +76,16 @@ RSpec.describe GroupShowSerializer do
       let(:guardian) { Guardian.new(Fabricate(:admin)) }
 
       it "are visible" do
-        expect(subject.as_json[:email_username]).to eq("foo@bar.com")
-        expect(subject.as_json[:email_password]).to eq("pa$$w0rd")
-        expect(subject.as_json[:message_count]).to eq(0)
+        expect(serializer.as_json[:email_username]).to eq("foo@bar.com")
+        expect(serializer.as_json[:email_password]).to eq("pa$$w0rd")
+        expect(serializer.as_json[:message_count]).to eq(0)
       end
     end
   end
 
   describe "default notification settings" do
-    subject { described_class.new(group, scope: guardian, root: false) }
+    subject(:serializer) { described_class.new(group, scope: guardian, root: false) }
+
     let(:category1) { Fabricate(:category) }
     let(:category2) { Fabricate(:category) }
     let(:tag1) { Fabricate(:tag) }
@@ -118,8 +120,10 @@ RSpec.describe GroupShowSerializer do
       let(:guardian) { Guardian.new(Fabricate(:user)) }
 
       it "are not visible" do
-        expect(subject.as_json.keys.select { |k| k.to_s.ends_with?("_category_ids") }).to be_empty
-        expect(subject.as_json.keys.select { |k| k.to_s.ends_with?("_tags") }).to be_empty
+        expect(
+          serializer.as_json.keys.select { |k| k.to_s.ends_with?("_category_ids") },
+        ).to be_empty
+        expect(serializer.as_json.keys.select { |k| k.to_s.ends_with?("_tags") }).to be_empty
       end
     end
 
@@ -127,25 +131,25 @@ RSpec.describe GroupShowSerializer do
       let(:guardian) { Guardian.new(Fabricate(:admin)) }
 
       it "are correct" do
-        expect(subject.as_json[:watching_category_ids]).to eq([category1.id])
-        expect(subject.as_json[:tracking_category_ids]).to eq([category2.id])
-        expect(subject.as_json[:watching_first_post_category_ids]).to eq([])
-        expect(subject.as_json[:regular_category_ids]).to eq([])
-        expect(subject.as_json[:muted_category_ids]).to eq([])
+        expect(serializer.as_json[:watching_category_ids]).to eq([category1.id])
+        expect(serializer.as_json[:tracking_category_ids]).to eq([category2.id])
+        expect(serializer.as_json[:watching_first_post_category_ids]).to eq([])
+        expect(serializer.as_json[:regular_category_ids]).to eq([])
+        expect(serializer.as_json[:muted_category_ids]).to eq([])
 
-        expect(subject.as_json[:watching_tags]).to eq([tag1.name])
-        expect(subject.as_json[:tracking_tags]).to eq([tag2.name])
-        expect(subject.as_json[:watching_first_post_tags]).to eq([])
-        expect(subject.as_json[:regular_tags]).to eq([])
-        expect(subject.as_json[:muted_tags]).to eq([])
+        expect(serializer.as_json[:watching_tags]).to eq([tag1.name])
+        expect(serializer.as_json[:tracking_tags]).to eq([tag2.name])
+        expect(serializer.as_json[:watching_first_post_tags]).to eq([])
+        expect(serializer.as_json[:regular_tags]).to eq([])
+        expect(serializer.as_json[:muted_tags]).to eq([])
       end
 
       it "doesn't include tag fields if tags are disabled" do
         SiteSetting.tagging_enabled = false
-        expect(subject.as_json.keys.select { |k| k.to_s.ends_with?("_category_ids") }.length).to eq(
-          5,
-        )
-        expect(subject.as_json.keys.select { |k| k.to_s.ends_with?("_tags") }).to be_empty
+        expect(
+          serializer.as_json.keys.select { |k| k.to_s.ends_with?("_category_ids") }.length,
+        ).to eq(5)
+        expect(serializer.as_json.keys.select { |k| k.to_s.ends_with?("_tags") }).to be_empty
       end
     end
   end
diff --git a/spec/serializers/invite_serializer_spec.rb b/spec/serializers/invite_serializer_spec.rb
new file mode 100644
index 00000000000..c0a721b733f
--- /dev/null
+++ b/spec/serializers/invite_serializer_spec.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+RSpec.describe InviteSerializer do
+  describe "#can_delete_invite" do
+    fab!(:user) { Fabricate(:user) }
+    fab!(:admin) { Fabricate(:admin) }
+    fab!(:moderator) { Fabricate(:moderator) }
+    fab!(:invite_from_user) { Fabricate(:invite, invited_by: user) }
+    fab!(:invite_from_moderator) { Fabricate(:invite, invited_by: moderator) }
+
+    it "returns true for admin" do
+      serializer = InviteSerializer.new(invite_from_user, scope: Guardian.new(admin), root: false)
+
+      expect(serializer.as_json[:can_delete_invite]).to eq(true)
+    end
+
+    it "returns false for moderator" do
+      serializer =
+        InviteSerializer.new(invite_from_user, scope: Guardian.new(moderator), root: false)
+
+      expect(serializer.as_json[:can_delete_invite]).to eq(false)
+    end
+
+    it "returns true for inviter" do
+      serializer = InviteSerializer.new(invite_from_user, scope: Guardian.new(user), root: false)
+
+      expect(serializer.as_json[:can_delete_invite]).to eq(true)
+    end
+
+    it "returns false for plain user" do
+      serializer =
+        InviteSerializer.new(invite_from_moderator, scope: Guardian.new(user), root: false)
+
+      expect(serializer.as_json[:can_delete_invite]).to eq(false)
+    end
+  end
+end
diff --git a/spec/serializers/post_serializer_spec.rb b/spec/serializers/post_serializer_spec.rb
index b4eaa9ad34f..14e5f175030 100644
--- a/spec/serializers/post_serializer_spec.rb
+++ b/spec/serializers/post_serializer_spec.rb
@@ -68,35 +68,35 @@ RSpec.describe PostSerializer do
   end
 
   context "with a post by a nuked user" do
-    before { post.update!(user_id: nil, deleted_at: Time.zone.now) }
-
-    subject do
+    subject(:serializer) do
       PostSerializer.new(post, scope: Guardian.new(Fabricate(:admin)), root: false).as_json
     end
 
+    before { post.update!(user_id: nil, deleted_at: Time.zone.now) }
+
     it "serializes correctly" do
       %i[name username display_username avatar_template user_title trust_level].each do |attr|
-        expect(subject[attr]).to be_nil
+        expect(serializer[attr]).to be_nil
       end
-      %i[moderator staff yours].each { |attr| expect(subject[attr]).to eq(false) }
+      %i[moderator staff yours].each { |attr| expect(serializer[attr]).to eq(false) }
     end
   end
 
   context "with a post by a suspended user" do
-    def subject
+    def serializer
       PostSerializer.new(post, scope: Guardian.new(Fabricate(:admin)), root: false).as_json
     end
 
     it "serializes correctly" do
-      expect(subject[:user_suspended]).to be_nil
+      expect(serializer[:user_suspended]).to be_nil
 
       post.user.update!(suspended_till: 1.month.from_now)
 
-      expect(subject[:user_suspended]).to eq(true)
+      expect(serializer[:user_suspended]).to eq(true)
 
       freeze_time (2.months.from_now)
 
-      expect(subject[:user_suspended]).to be_nil
+      expect(serializer[:user_suspended]).to be_nil
     end
   end
 
@@ -141,6 +141,13 @@ RSpec.describe PostSerializer do
         )
       end
 
+      it "includes if the user can see it" do
+        expect(serialized_post_for_user(Fabricate(:moderator))[:can_see_hidden_post]).to eq(true)
+        expect(serialized_post_for_user(Fabricate(:admin))[:can_see_hidden_post]).to eq(true)
+        expect(serialized_post_for_user(user)[:can_see_hidden_post]).to eq(true)
+        expect(serialized_post_for_user(Fabricate(:user))[:can_see_hidden_post]).to eq(false)
+      end
+
       it "shows the raw post only if authorized to see it" do
         expect(serialized_post_for_user(nil)[:raw]).to eq(nil)
         expect(serialized_post_for_user(Fabricate(:user))[:raw]).to eq(nil)
@@ -303,6 +310,58 @@ RSpec.describe PostSerializer do
     end
   end
 
+  context "with allow_anonymous_likes enabled" do
+    fab!(:user) { Fabricate(:user) }
+    fab!(:topic) { Fabricate(:topic, user: user) }
+    fab!(:post) { Fabricate(:post, topic: topic, user: topic.user) }
+    fab!(:anonymous_user) { Fabricate(:anonymous) }
+
+    let(:serializer) { PostSerializer.new(post, scope: Guardian.new(anonymous_user), root: false) }
+    let(:post_action) do
+      user.id = anonymous_user.id
+      post.id = 1
+
+      a =
+        PostAction.new(
+          user: anonymous_user,
+          post: post,
+          post_action_type_id: PostActionType.types[:like],
+        )
+      a.created_at = 1.minute.ago
+      a
+    end
+
+    before do
+      SiteSetting.allow_anonymous_posting = true
+      SiteSetting.allow_anonymous_likes = true
+      SiteSetting.post_undo_action_window_mins = 10
+      PostSerializer.any_instance.stubs(:post_actions).returns({ 2 => post_action })
+    end
+
+    context "when post_undo_action_window_mins has not passed" do
+      before { post_action.created_at = 5.minutes.ago }
+
+      it "allows anonymous users to unlike posts" do
+        like_actions_summary =
+          serializer.actions_summary.find { |a| a[:id] == PostActionType.types[:like] }
+
+        #When :can_act is present, the JavaScript allows the user to click the unlike button
+        expect(like_actions_summary[:can_act]).to eq(true)
+      end
+    end
+
+    context "when post_undo_action_window_mins has passed" do
+      before { post_action.created_at = 20.minutes.ago }
+
+      it "disallows anonymous users from unliking posts" do
+        # There are no other post actions available to anonymous users so the action_summary will be an empty array
+        expect(serializer.actions_summary.find { |a| a[:id] == PostActionType.types[:like] }).to eq(
+          nil,
+        )
+      end
+    end
+  end
+
   describe "#user_status" do
     fab!(:user_status) { Fabricate(:user_status) }
     fab!(:user) { Fabricate(:user, user_status: user_status) }
diff --git a/spec/serializers/poster_serializer_spec.rb b/spec/serializers/poster_serializer_spec.rb
new file mode 100644
index 00000000000..d982165fbf6
--- /dev/null
+++ b/spec/serializers/poster_serializer_spec.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+RSpec.describe PosterSerializer do
+  let(:poster) { Fabricate(:user, admin: false, moderator: false) }
+
+  it "serializes the correct attributes" do
+    expect(PosterSerializer.new(poster).attributes.keys).to contain_exactly(
+      :trust_level,
+      :avatar_template,
+      :id,
+      :name,
+      :username,
+    )
+  end
+
+  it "includes group flair attributes when appropriate" do
+    group =
+      Fabricate(
+        :group,
+        name: "Groupster",
+        flair_bg_color: "#111111",
+        flair_color: "#999999",
+        flair_icon: "icon",
+      )
+    groupie = Fabricate(:user, flair_group: group)
+
+    expect(PosterSerializer.new(groupie).attributes.keys).to contain_exactly(
+      :trust_level,
+      :avatar_template,
+      :id,
+      :name,
+      :username,
+      :flair_bg_color,
+      :flair_color,
+      :flair_group_id,
+      :flair_name,
+      :flair_url,
+    )
+  end
+end
diff --git a/spec/serializers/site_serializer_spec.rb b/spec/serializers/site_serializer_spec.rb
index 0fb21110d35..54a1a035c43 100644
--- a/spec/serializers/site_serializer_spec.rb
+++ b/spec/serializers/site_serializer_spec.rb
@@ -15,6 +15,8 @@ RSpec.describe SiteSerializer do
     end
 
     it "is not included if enable_user_tips is disabled" do
+      SiteSetting.enable_user_tips = false
+
       serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
       expect(serialized[:user_tips]).to eq(nil)
     end
@@ -129,24 +131,12 @@ RSpec.describe SiteSerializer do
     expect(serialized[:shared_drafts_category_id]).to eq(nil)
   end
 
-  it "includes show_welcome_topic_banner" do
-    admin = Fabricate(:admin)
-    admin_guardian = Guardian.new(admin)
-    UserAuthToken.generate!(user_id: admin.id)
-
-    first_post = Fabricate(:post, created_at: 25.days.ago)
-    SiteSetting.welcome_topic_id = first_post.topic.id
-
-    serialized =
-      described_class.new(Site.new(admin_guardian), scope: admin_guardian, root: false).as_json
-    expect(serialized[:show_welcome_topic_banner]).to eq(true)
-  end
-
-  describe "#anonymous_default_sidebar_tags" do
+  describe "#anonymous_default_navigation_menu_tags" do
     fab!(:user) { Fabricate(:user) }
-    fab!(:tag) { Fabricate(:tag, name: "dev") }
+    fab!(:tag) { Fabricate(:tag, name: "dev", description: "some description") }
     fab!(:tag2) { Fabricate(:tag, name: "random") }
     fab!(:hidden_tag) { Fabricate(:tag, name: "secret") }
+
     fab!(:staff_tag_group) do
       Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name])
     end
@@ -154,7 +144,7 @@ RSpec.describe SiteSerializer do
     before do
       SiteSetting.navigation_menu = "sidebar"
       SiteSetting.tagging_enabled = true
-      SiteSetting.default_sidebar_tags = "#{tag.name}|#{tag2.name}|#{hidden_tag.name}"
+      SiteSetting.default_navigation_menu_tags = "#{tag.name}|#{tag2.name}|#{hidden_tag.name}"
     end
 
     it "is not included in the serialised object when tagging is not enabled" do
@@ -162,33 +152,101 @@ RSpec.describe SiteSerializer do
       guardian = Guardian.new(user)
 
       serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
-      expect(serialized[:anonymous_default_sidebar_tags]).to eq(nil)
+      expect(serialized[:anonymous_default_navigation_menu_tags]).to eq(nil)
     end
 
     it "is not included in the serialised object when navigation menu is legacy" do
       SiteSetting.navigation_menu = "legacy"
 
       serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
-      expect(serialized[:anonymous_default_sidebar_tags]).to eq(nil)
+      expect(serialized[:anonymous_default_navigation_menu_tags]).to eq(nil)
     end
 
     it "is not included in the serialised object when user is not anonymous" do
       guardian = Guardian.new(user)
 
       serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
-      expect(serialized[:anonymous_default_sidebar_tags]).to eq(nil)
+      expect(serialized[:anonymous_default_navigation_menu_tags]).to eq(nil)
     end
 
     it "is not included in the serialisd object when default sidebar tags have not been configured" do
-      SiteSetting.default_sidebar_tags = ""
+      SiteSetting.default_navigation_menu_tags = ""
 
       serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
-      expect(serialized[:anonymous_default_sidebar_tags]).to eq(nil)
+      expect(serialized[:anonymous_default_navigation_menu_tags]).to eq(nil)
     end
 
     it "includes only tags user can see in the serialised object when user is anonymous" do
       serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
-      expect(serialized[:anonymous_default_sidebar_tags]).to eq(%w[dev random])
+
+      expect(serialized[:anonymous_default_navigation_menu_tags]).to eq(
+        [
+          { name: "dev", description: "some description", pm_only: false },
+          { name: "random", description: tag2.description, pm_only: false },
+        ],
+      )
+    end
+  end
+
+  describe "#anonymous_sidebar_sections" do
+    fab!(:user) { Fabricate(:user) }
+    fab!(:public_sidebar_section) do
+      Fabricate(:sidebar_section, title: "Public section", public: true)
+    end
+    fab!(:private_sidebar_section) do
+      Fabricate(:sidebar_section, title: "Private section", user: user, public: false)
+    end
+
+    it "is not included in the serialised object when user is not anonymous" do
+      guardian = Guardian.new(user)
+
+      serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
+    end
+
+    it "includes only public sidebar sections serialised object when user is anonymous" do
+      serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
+      expect(serialized[:anonymous_sidebar_sections].map(&:title)).to eq(
+        ["Community", "Public section"],
+      )
+    end
+
+    it "eager loads sidebar_urls" do
+      public_section_link =
+        Fabricate(:custom_sidebar_section_link, user: user, sidebar_section: public_sidebar_section)
+      # warmup
+      described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
+
+      initial_count =
+        track_sql_queries do
+          serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
+
+          expect(serialized[:anonymous_sidebar_sections].count).to eq(2)
+
+          expect(serialized[:anonymous_sidebar_sections].last.links.map { |link| link.id }).to eq(
+            [public_section_link.linkable.id],
+          )
+        end.count
+
+      public_section_link_2 =
+        Fabricate(:custom_sidebar_section_link, user: user, sidebar_section: public_sidebar_section)
+      public_section_link_3 =
+        Fabricate(:custom_sidebar_section_link, user: user, sidebar_section: public_sidebar_section)
+
+      final_count =
+        track_sql_queries do
+          serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
+
+          expect(serialized[:anonymous_sidebar_sections].count).to eq(2)
+
+          expect(serialized[:anonymous_sidebar_sections].last.links.map { |link| link.id }).to eq(
+            [
+              public_section_link.linkable.id,
+              public_section_link_2.linkable.id,
+              public_section_link_3.linkable.id,
+            ],
+          )
+        end.count
+      expect(final_count).to eq(initial_count)
     end
   end
 
@@ -248,6 +306,64 @@ RSpec.describe SiteSerializer do
     end
   end
 
+  describe "#navigation_menu_site_top_tags" do
+    fab!(:tag1) do
+      Fabricate(:tag, name: "tag 1").tap { |tag| Fabricate.times(2, :topic, tags: [tag]) }
+    end
+
+    fab!(:tag2) do
+      Fabricate(:tag, name: "tag 2").tap { |tag| Fabricate.times(1, :topic, tags: [tag]) }
+    end
+
+    fab!(:tag3) do
+      Fabricate(:tag, name: "tag 3").tap { |tag| Fabricate.times(3, :topic, tags: [tag]) }
+    end
+
+    fab!(:hidden_tag) do
+      Fabricate(:tag, name: "tag 4").tap { |tag| Fabricate.times(4, :topic, tags: [tag]) }
+    end
+
+    fab!(:staff_tag_group) do
+      Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name])
+    end
+
+    it "should return the site's top tags as the default tags for sidebar" do
+      serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
+
+      expect(serialized[:navigation_menu_site_top_tags]).to eq(
+        [
+          { name: tag3.name, description: tag2.description, pm_only: false },
+          { name: tag1.name, description: tag1.description, pm_only: false },
+          { name: tag2.name, description: tag3.description, pm_only: false },
+        ],
+      )
+    end
+
+    it "should not be serialized if `navigation_menu` site setting is set to `legacy`" do
+      SiteSetting.set(:navigation_menu, "legacy")
+
+      serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
+
+      expect(serialized[:navigation_menu_site_top_tags]).to eq(nil)
+    end
+
+    it "should not be serialized if `tagging_enabled` site setting is set to false" do
+      SiteSetting.set(:tagging_enabled, false)
+
+      serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
+
+      expect(serialized[:navigation_menu_site_top_tags]).to eq(nil)
+    end
+
+    it "should return an empty array if site has no top tags" do
+      Tag.delete_all
+
+      serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
+
+      expect(serialized[:navigation_menu_site_top_tags]).to eq([])
+    end
+  end
+
   describe "#whispers_allowed_groups_names" do
     fab!(:admin) { Fabricate(:admin) }
     fab!(:allowed_user) { Fabricate(:user) }
diff --git a/spec/serializers/suggested_topic_serializer_spec.rb b/spec/serializers/suggested_topic_serializer_spec.rb
index 4627f95c6b0..0d777dc189e 100644
--- a/spec/serializers/suggested_topic_serializer_spec.rb
+++ b/spec/serializers/suggested_topic_serializer_spec.rb
@@ -5,6 +5,10 @@ RSpec.describe SuggestedTopicSerializer do
   let(:admin) { Fabricate(:admin) }
 
   describe "#featured_link and #featured_link_root_domain" do
+    subject(:json) do
+      SuggestedTopicSerializer.new(topic, scope: Guardian.new(user), root: false).as_json
+    end
+
     let(:featured_link) { "http://meta.discourse.org" }
     let(:topic) do
       Fabricate(
@@ -13,9 +17,6 @@ RSpec.describe SuggestedTopicSerializer do
         category: Fabricate(:category, topic_featured_link_allowed: true),
       )
     end
-    subject(:json) do
-      SuggestedTopicSerializer.new(topic, scope: Guardian.new(user), root: false).as_json
-    end
 
     context "when topic featured link is disable" do
       before do
diff --git a/spec/serializers/topic_tracking_state_item_serializer_spec.rb b/spec/serializers/topic_tracking_state_item_serializer_spec.rb
new file mode 100644
index 00000000000..4bd5a46ef97
--- /dev/null
+++ b/spec/serializers/topic_tracking_state_item_serializer_spec.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+RSpec.describe TopicTrackingStateItemSerializer do
+  fab!(:user) { Fabricate(:user) }
+  fab!(:post) { create_post }
+
+  before do
+    SiteSetting.navigation_menu = "legacy"
+    SiteSetting.chat_enabled = false if defined?(::Chat)
+  end
+
+  it "serializes topic tracking state reports" do
+    report = TopicTrackingState.report(user)
+    serialized = described_class.new(report[0], scope: Guardian.new(user), root: false).as_json
+
+    expect(serialized[:topic_id]).to eq(post.topic_id)
+    expect(serialized[:highest_post_number]).to eq(post.topic.highest_post_number)
+    expect(serialized[:last_read_post_number]).to eq(nil)
+    expect(serialized[:created_at]).to be_present
+    expect(serialized[:notification_level]).to eq(nil)
+    expect(serialized[:created_in_new_period]).to eq(true)
+    expect(serialized[:treat_as_new_topic_start_date]).to be_present
+    expect(serialized.has_key?(:tags)).to eq(false)
+  end
+
+  it "includes tags attribute when tags are present" do
+    TopicTrackingState.include_tags_in_report = true
+
+    post.topic.notifier.watch_topic!(post.topic.user_id)
+
+    DiscourseTagging.tag_topic_by_names(
+      post.topic,
+      Guardian.new(Discourse.system_user),
+      %w[bananas apples],
+    )
+
+    report = TopicTrackingState.report(user)
+    serialized = described_class.new(report[0], scope: Guardian.new(user), root: false).as_json
+
+    expect(serialized[:tags]).to contain_exactly("bananas", "apples")
+  ensure
+    TopicTrackingState.include_tags_in_report = false
+  end
+end
diff --git a/spec/serializers/topic_tracking_state_serializer_spec.rb b/spec/serializers/topic_tracking_state_serializer_spec.rb
index cbe093e63f0..bdd2fac78b5 100644
--- a/spec/serializers/topic_tracking_state_serializer_spec.rb
+++ b/spec/serializers/topic_tracking_state_serializer_spec.rb
@@ -4,41 +4,21 @@ RSpec.describe TopicTrackingStateSerializer do
   fab!(:user) { Fabricate(:user) }
   fab!(:post) { create_post }
 
-  before do
-    SiteSetting.navigation_menu = "legacy"
-    SiteSetting.chat_enabled = false if defined?(::Chat)
-  end
-
-  it "serializes topic tracking state reports" do
+  it "serializes topic tracking state report correctly for a normal user" do
     report = TopicTrackingState.report(user)
-    serialized = described_class.new(report[0], scope: Guardian.new(user), root: false).as_json
+    serialized = described_class.new(report, scope: Guardian.new(user), root: false).as_json
 
-    expect(serialized[:topic_id]).to eq(post.topic_id)
-    expect(serialized[:highest_post_number]).to eq(post.topic.highest_post_number)
-    expect(serialized[:last_read_post_number]).to eq(nil)
-    expect(serialized[:created_at]).to be_present
-    expect(serialized[:notification_level]).to eq(nil)
-    expect(serialized[:created_in_new_period]).to eq(true)
-    expect(serialized[:treat_as_new_topic_start_date]).to be_present
-    expect(serialized.has_key?(:tags)).to eq(false)
-  end
+    expect(serialized[:data].length).to eq(1)
+    expect(serialized[:data].first[:topic_id]).to eq(post.topic_id)
 
-  it "includes tags attribute when tags are present" do
-    TopicTrackingState.include_tags_in_report = true
-
-    post.topic.notifier.watch_topic!(post.topic.user_id)
-
-    DiscourseTagging.tag_topic_by_names(
-      post.topic,
-      Guardian.new(Discourse.system_user),
-      %w[bananas apples],
+    expect(serialized[:meta].keys).to contain_exactly(
+      TopicTrackingState::LATEST_MESSAGE_BUS_CHANNEL,
+      TopicTrackingState::RECOVER_MESSAGE_BUS_CHANNEL,
+      TopicTrackingState::DELETE_MESSAGE_BUS_CHANNEL,
+      TopicTrackingState::DESTROY_MESSAGE_BUS_CHANNEL,
+      TopicTrackingState::NEW_MESSAGE_BUS_CHANNEL,
+      TopicTrackingState::UNREAD_MESSAGE_BUS_CHANNEL,
+      TopicTrackingState.unread_channel_key(user.id),
     )
-
-    report = TopicTrackingState.report(user)
-    serialized = described_class.new(report[0], scope: Guardian.new(user), root: false).as_json
-
-    expect(serialized[:tags]).to contain_exactly("bananas", "apples")
-  ensure
-    TopicTrackingState.include_tags_in_report = false
   end
 end
diff --git a/spec/serializers/topic_view_serializer_spec.rb b/spec/serializers/topic_view_serializer_spec.rb
index 015ef3d1f3c..ff38b940932 100644
--- a/spec/serializers/topic_view_serializer_spec.rb
+++ b/spec/serializers/topic_view_serializer_spec.rb
@@ -8,10 +8,8 @@ RSpec.describe TopicViewSerializer do
     JSON.parse(MultiJson.dump(serializer)).deep_symbolize_keys!
   end
 
-  before do
-    # ensure no suggested ids are cached cause that can muck up suggested
-    RandomTopicSelector.clear_cache!
-  end
+  # Ensure no suggested ids are cached cause that can muck up suggested
+  use_redis_snapshotting
 
   fab!(:topic) { Fabricate(:topic) }
   fab!(:user) { Fabricate(:user) }
@@ -359,7 +357,8 @@ RSpec.describe TopicViewSerializer do
           payload: {
             raw: "hello my raw contents",
           },
-          created_by: user,
+          created_by: Discourse.system_user,
+          target_created_by: user,
         )
       end
 
diff --git a/spec/serializers/upload_serializer_spec.rb b/spec/serializers/upload_serializer_spec.rb
index b2734c38822..39c4b6ded49 100644
--- a/spec/serializers/upload_serializer_spec.rb
+++ b/spec/serializers/upload_serializer_spec.rb
@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 RSpec.describe UploadSerializer do
+  subject(:serializer) { UploadSerializer.new(upload, root: false) }
+
   fab!(:upload) { Fabricate(:upload) }
-  let(:subject) { UploadSerializer.new(upload, root: false) }
 
   it "should render without errors" do
-    json_data = JSON.parse(subject.to_json)
+    json_data = JSON.parse(serializer.to_json)
 
     expect(json_data["id"]).to eql upload.id
     expect(json_data["width"]).to eql upload.width
@@ -21,7 +22,7 @@ RSpec.describe UploadSerializer do
     context "when secure uploads is disabled" do
       it "just returns the normal URL, otherwise S3 errors are encountered" do
         UrlHelper.expects(:cook_url).with(upload.url, secure: false)
-        subject.to_json
+        serializer.to_json
       end
     end
 
@@ -33,7 +34,7 @@ RSpec.describe UploadSerializer do
 
       it "returns the cooked URL based on the upload URL" do
         UrlHelper.expects(:cook_url).with(upload.url, secure: true)
-        subject.to_json
+        serializer.to_json
       end
     end
   end
diff --git a/spec/serializers/user_bookmark_list_serializer_spec.rb b/spec/serializers/user_bookmark_list_serializer_spec.rb
index 00d2c368bf9..2ec484cb9dc 100644
--- a/spec/serializers/user_bookmark_list_serializer_spec.rb
+++ b/spec/serializers/user_bookmark_list_serializer_spec.rb
@@ -11,6 +11,8 @@ RSpec.describe UserBookmarkListSerializer do
       user_bookmark
     end
 
+    after { DiscoursePluginRegistry.reset! }
+
     let(:post_bookmark) { Fabricate(:bookmark, user: user, bookmarkable: Fabricate(:post)) }
     let(:topic_bookmark) { Fabricate(:bookmark, user: user, bookmarkable: Fabricate(:topic)) }
     let(:user_bookmark) { Fabricate(:bookmark, user: user, bookmarkable: Fabricate(:user)) }
diff --git a/spec/serializers/user_serializer_spec.rb b/spec/serializers/user_serializer_spec.rb
index f33b71431bb..bfa4ebde243 100644
--- a/spec/serializers/user_serializer_spec.rb
+++ b/spec/serializers/user_serializer_spec.rb
@@ -449,7 +449,6 @@ RSpec.describe UserSerializer do
 
       expect(serializer.as_json[:sidebar_category_ids]).to eq(nil)
       expect(serializer.as_json[:sidebar_tags]).to eq(nil)
-      expect(serializer.as_json[:sidebar_list_destination]).to eq(nil)
       expect(serializer.as_json[:display_sidebar_tags]).to eq(nil)
     end
   end
diff --git a/spec/serializers/web_hook_post_serializer_spec.rb b/spec/serializers/web_hook_post_serializer_spec.rb
index 5e2774451ce..a8c7aa1ea9b 100644
--- a/spec/serializers/web_hook_post_serializer_spec.rb
+++ b/spec/serializers/web_hook_post_serializer_spec.rb
@@ -32,6 +32,7 @@ RSpec.describe WebHookPostSerializer do
       :display_username,
       :primary_group_name,
       :flair_name,
+      :flair_group_id,
       :version,
       :user_title,
       :bookmarked,
diff --git a/spec/services/auto_silence_spec.rb b/spec/services/auto_silence_spec.rb
index cfdac5eb0d8..669d4e5701b 100644
--- a/spec/services/auto_silence_spec.rb
+++ b/spec/services/auto_silence_spec.rb
@@ -9,12 +9,13 @@ RSpec.describe SpamRule::AutoSilence do
   end
 
   describe "perform" do
+    subject(:autosilence) { described_class.new(post.user) }
+
     let(:user) { Fabricate.build(:newuser) }
     let(:post) { Fabricate(:post, user: user) }
-    subject { described_class.new(post.user) }
 
     it "takes no action if user should not be silenced" do
-      subject.perform
+      autosilence.perform
       expect(post.user.reload).not_to be_silenced
     end
 
@@ -23,81 +24,84 @@ RSpec.describe SpamRule::AutoSilence do
       SiteSetting.silence_new_user_sensitivity = Reviewable.sensitivities[:low]
       SiteSetting.num_users_to_silence_new_user = 1
       PostActionCreator.spam(Discourse.system_user, post)
-      subject.perform
+      autosilence.perform
       expect(post.user.reload).to be_silenced
     end
   end
 
   describe "total_spam_score" do
+    subject(:score) { enforcer.user_spam_stats.total_spam_score }
+
     let(:post) { Fabricate(:post) }
     let(:enforcer) { described_class.new(post.user) }
     let(:flagger) { Fabricate(:user) }
-    subject { enforcer.user_spam_stats.total_spam_score }
 
     it "returns 0 when there are no flags" do
-      expect(subject).to eq(0)
+      expect(score).to eq(0)
     end
 
     it "returns 0 when there is one flag that has a reason other than spam" do
       PostActionCreator.off_topic(flagger, post)
-      expect(subject).to eq(0)
+      expect(score).to eq(0)
     end
 
     it "returns the score when there are two flags with spam as the reason" do
       PostActionCreator.spam(Fabricate(:user), post)
       PostActionCreator.spam(Fabricate(:user), post)
-      expect(subject).to eq(4.0)
+      expect(score).to eq(4.0)
     end
 
     it "returns the score when there are two spam flags, each on a different post" do
       PostActionCreator.spam(Fabricate(:user), post)
       PostActionCreator.spam(Fabricate(:user), Fabricate(:post, user: post.user))
-      expect(subject).to eq(4.0)
+      expect(score).to eq(4.0)
     end
   end
 
   describe "spam_user_count" do
+    subject(:count) { enforcer.user_spam_stats.spam_user_count }
+
     let(:post) { Fabricate(:post) }
     let(:enforcer) { described_class.new(post.user) }
-    subject { enforcer.user_spam_stats.spam_user_count }
 
     it "returns 0 when there are no flags" do
-      expect(subject).to eq(0)
+      expect(count).to eq(0)
     end
 
     it "returns 0 when there is one flag that has a reason other than spam" do
       Fabricate(:flag, post: post, post_action_type_id: PostActionType.types[:off_topic])
-      expect(subject).to eq(0)
+      expect(count).to eq(0)
     end
 
     it "returns 1 when there is one spam flag" do
       PostActionCreator.spam(Fabricate(:user), post)
-      expect(subject).to eq(1)
+      expect(count).to eq(1)
     end
 
     it "returns 2 when there are two spam flags from 2 users" do
       PostActionCreator.spam(Fabricate(:user), post)
       PostActionCreator.spam(Fabricate(:user), post)
-      expect(subject).to eq(2)
+      expect(count).to eq(2)
     end
 
     it "returns 1 when there are two spam flags on two different posts from 1 user" do
       flagger = Fabricate(:user)
       PostActionCreator.spam(flagger, post)
       PostActionCreator.spam(flagger, Fabricate(:post, user: post.user))
-      expect(subject).to eq(1)
+      expect(count).to eq(1)
     end
   end
 
   describe "#silence_user" do
+    subject(:autosilence) { described_class.new(user) }
+
     let!(:admin) { Fabricate(:admin) } # needed for SystemMessage
     let(:user) { Fabricate(:user) }
     let!(:post) { Fabricate(:post, user: user) }
-    subject { described_class.new(user) }
 
     context "when user is not silenced" do
       it "prevents the user from making new posts" do
-        subject.silence_user
+        autosilence.silence_user
         expect(user).to be_silenced
         expect(Guardian.new(user).can_create_post?(nil)).to be_falsey
       end
@@ -107,14 +111,14 @@ RSpec.describe SpamRule::AutoSilence do
 
         it "sends private message to moderators" do
           SiteSetting.notify_mods_when_user_silenced = true
-          subject.silence_user
-          expect(subject.group_message).to be_present
+          autosilence.silence_user
+          expect(autosilence.group_message).to be_present
         end
 
         it "doesn't send a pm to moderators if notify_mods_when_user_silenced is false" do
           SiteSetting.notify_mods_when_user_silenced = false
-          subject.silence_user
-          expect(subject.group_message).to be_blank
+          autosilence.silence_user
+          expect(autosilence.group_message).to be_blank
         end
       end
     end
@@ -123,8 +127,8 @@ RSpec.describe SpamRule::AutoSilence do
       before { UserSilencer.silence(user) }
 
       it "doesn't send a pm to moderators if the user is already silenced" do
-        subject.silence_user
-        expect(subject.group_message).to be_blank
+        autosilence.silence_user
+        expect(autosilence.group_message).to be_blank
       end
     end
   end
@@ -167,20 +171,21 @@ RSpec.describe SpamRule::AutoSilence do
     end
 
     context "with new user" do
-      subject { described_class.new(user) }
-      let(:stats) { subject.user_spam_stats }
+      subject(:autosilence) { described_class.new(user) }
+
+      let(:stats) { autosilence.user_spam_stats }
 
       it "returns false if there are no spam flags" do
         expect(stats.total_spam_score).to eq(0)
         expect(stats.spam_user_count).to eq(0)
-        expect(subject.should_autosilence?).to eq(false)
+        expect(autosilence.should_autosilence?).to eq(false)
       end
 
       it "returns false if there are not received enough flags" do
         PostActionCreator.spam(flagger, post)
         expect(stats.total_spam_score).to eq(2.0)
         expect(stats.spam_user_count).to eq(1)
-        expect(subject.should_autosilence?).to eq(false)
+        expect(autosilence.should_autosilence?).to eq(false)
       end
 
       it "returns false if there have not been enough users" do
@@ -188,21 +193,21 @@ RSpec.describe SpamRule::AutoSilence do
         PostActionCreator.spam(flagger, post2)
         expect(stats.total_spam_score).to eq(4.0)
         expect(stats.spam_user_count).to eq(1)
-        expect(subject.should_autosilence?).to eq(false)
+        expect(autosilence.should_autosilence?).to eq(false)
       end
 
       it "returns false if silence_new_user_sensitivity is disabled" do
         SiteSetting.silence_new_user_sensitivity = Reviewable.sensitivities[:disabled]
         PostActionCreator.spam(flagger, post)
         PostActionCreator.spam(flagger2, post)
-        expect(subject.should_autosilence?).to eq(false)
+        expect(autosilence.should_autosilence?).to eq(false)
       end
 
       it "returns false if num_users_to_silence_new_user is 0" do
         SiteSetting.num_users_to_silence_new_user = 0
         PostActionCreator.spam(flagger, post)
         PostActionCreator.spam(flagger2, post)
-        expect(subject.should_autosilence?).to eq(false)
+        expect(autosilence.should_autosilence?).to eq(false)
       end
 
       it "returns true when there are enough flags from enough users" do
@@ -210,16 +215,17 @@ RSpec.describe SpamRule::AutoSilence do
         PostActionCreator.spam(flagger2, post)
         expect(stats.total_spam_score).to eq(4.0)
         expect(stats.spam_user_count).to eq(2)
-        expect(subject.should_autosilence?).to eq(true)
+        expect(autosilence.should_autosilence?).to eq(true)
       end
     end
 
     context "when silenced, but has higher trust level now" do
+      subject(:autosilence) { described_class.new(user) }
+
       let(:user) { Fabricate(:user, silenced_till: 1.year.from_now, trust_level: TrustLevel[1]) }
-      subject { described_class.new(user) }
 
       it "returns false" do
-        expect(subject.should_autosilence?).to eq(false)
+        expect(autosilence.should_autosilence?).to eq(false)
       end
     end
   end
diff --git a/spec/services/badge_granter_spec.rb b/spec/services/badge_granter_spec.rb
index 308b2b83163..95b52f546f7 100644
--- a/spec/services/badge_granter_spec.rb
+++ b/spec/services/badge_granter_spec.rb
@@ -22,14 +22,12 @@ RSpec.describe BadgeGranter do
       BadgeGranter.revoke_ungranted_titles!
       user.reload
       expect(user.title).to eq(badge.name)
-      expect(user.user_profile.badge_granted_title).to eq(true)
       expect(user.user_profile.granted_title_badge_id).to eq(badge.id)
 
       badge.update_column(:allow_title, false)
       BadgeGranter.revoke_ungranted_titles!
       user.reload
       expect(user.title).to be_blank
-      expect(user.user_profile.badge_granted_title).to eq(false)
       expect(user.user_profile.granted_title_badge_id).to be_nil
     end
 
@@ -40,14 +38,12 @@ RSpec.describe BadgeGranter do
       BadgeGranter.revoke_ungranted_titles!
       user.reload
       expect(user.title).to eq(badge.name)
-      expect(user.user_profile.badge_granted_title).to eq(true)
       expect(user.user_profile.granted_title_badge_id).to eq(badge.id)
 
       badge.update_column(:enabled, false)
       BadgeGranter.revoke_ungranted_titles!
       user.reload
       expect(user.title).to be_blank
-      expect(user.user_profile.badge_granted_title).to eq(false)
       expect(user.user_profile.granted_title_badge_id).to be_nil
     end
 
@@ -58,14 +54,12 @@ RSpec.describe BadgeGranter do
       BadgeGranter.revoke_ungranted_titles!
       user.reload
       expect(user.title).to eq(badge.name)
-      expect(user.user_profile.badge_granted_title).to eq(true)
       expect(user.user_profile.granted_title_badge_id).to eq(badge.id)
 
       BadgeGranter.revoke(user.user_badges.first)
       BadgeGranter.revoke_ungranted_titles!
       user.reload
       expect(user.title).to be_blank
-      expect(user.user_profile.badge_granted_title).to eq(false)
       expect(user.user_profile.granted_title_badge_id).to be_nil
     end
 
@@ -91,13 +85,11 @@ RSpec.describe BadgeGranter do
 
       user.reload
       expect(user.title).to eq(badge_name)
-      expect(user.user_profile.badge_granted_title).to eq(true)
       expect(user.user_profile.granted_title_badge_id).to eq(badge.id)
 
       BadgeGranter.revoke_ungranted_titles!
       user.reload
       expect(user.title).to eq(badge_name)
-      expect(user.user_profile.badge_granted_title).to eq(true)
       expect(user.user_profile.granted_title_badge_id).to eq(badge.id)
     end
   end
diff --git a/spec/services/category_hashtag_data_source_spec.rb b/spec/services/category_hashtag_data_source_spec.rb
index 26098e69f8d..5140855158e 100644
--- a/spec/services/category_hashtag_data_source_spec.rb
+++ b/spec/services/category_hashtag_data_source_spec.rb
@@ -40,6 +40,47 @@ RSpec.describe CategoryHashtagDataSource do
       group.add(user)
       expect(described_class.lookup(Guardian.new(user), ["secret"]).first).not_to eq(nil)
     end
+
+    context "with sub-sub-categories" do
+      before { SiteSetting.max_category_nesting = 3 }
+
+      it "returns the first matching grandchild category (ordered by IDs) when there are multiple categories with the same slug" do
+        parent1 = Fabricate(:category, slug: "parent1")
+        parent2 = Fabricate(:category, slug: "parent2")
+
+        parent1_child = Fabricate(:category, slug: "child", parent_category_id: parent1.id)
+        parent1_child_grandchild =
+          Fabricate(:category, slug: "grandchild", parent_category_id: parent1_child.id)
+
+        parent2_child = Fabricate(:category, slug: "child", parent_category_id: parent2.id)
+        parent2_child_grandchild =
+          Fabricate(:category, slug: "grandchild", parent_category_id: parent2_child.id)
+
+        result = described_class.lookup(guardian, ["child:grandchild"])
+        expect(result.map(&:relative_url)).to eq([parent1_child_grandchild.url])
+
+        parent1_child.destroy
+        parent1_child = Fabricate(:category, slug: "child", parent_category_id: parent1.id)
+
+        result = described_class.lookup(guardian, ["child:grandchild"])
+        expect(result.map(&:relative_url)).to eq([parent2_child_grandchild.url])
+      end
+
+      it "returns the correct grandchild category when there are multiple children with the same slug and only one of them has the correct grandchild" do
+        parent1 = Fabricate(:category, slug: "parent1")
+        parent1_child = Fabricate(:category, slug: "child", parent_category_id: parent1.id)
+        parent1_child_grandchild =
+          Fabricate(:category, slug: "another-grandchild", parent_category_id: parent1_child.id)
+
+        parent2 = Fabricate(:category, slug: "parent2")
+        parent2_child = Fabricate(:category, slug: "child", parent_category_id: parent2.id)
+        parent2_child_grandchild =
+          Fabricate(:category, slug: "grandchild", parent_category_id: parent2_child.id)
+
+        result = described_class.lookup(guardian, ["child:grandchild"])
+        expect(result.map(&:relative_url)).to eq([parent2_child_grandchild.url])
+      end
+    end
   end
 
   describe "#search" do
diff --git a/spec/services/email_settings_exception_handler_spec.rb b/spec/services/email_settings_exception_handler_spec.rb
index e70614dd608..1baa084abbc 100644
--- a/spec/services/email_settings_exception_handler_spec.rb
+++ b/spec/services/email_settings_exception_handler_spec.rb
@@ -4,21 +4,21 @@ RSpec.describe EmailSettingsExceptionHandler do
   describe "#friendly_exception_message" do
     it "formats a Net::POPAuthenticationError" do
       exception = Net::POPAuthenticationError.new("invalid credentials")
-      expect(subject.class.friendly_exception_message(exception, "pop.test.com")).to eq(
+      expect(described_class.friendly_exception_message(exception, "pop.test.com")).to eq(
         I18n.t("email_settings.pop3_authentication_error"),
       )
     end
 
     it "formats a Net::IMAP::NoResponseError for invalid credentials" do
       exception = Net::IMAP::NoResponseError.new(stub(data: stub(text: "Invalid credentials")))
-      expect(subject.class.friendly_exception_message(exception, "imap.test.com")).to eq(
+      expect(described_class.friendly_exception_message(exception, "imap.test.com")).to eq(
         I18n.t("email_settings.imap_authentication_error"),
       )
     end
 
     it "formats a general Net::IMAP::NoResponseError" do
       exception = Net::IMAP::NoResponseError.new(stub(data: stub(text: "NO bad problem (Failure)")))
-      expect(subject.class.friendly_exception_message(exception, "imap.test.com")).to eq(
+      expect(described_class.friendly_exception_message(exception, "imap.test.com")).to eq(
         I18n.t("email_settings.imap_no_response_error", message: "NO bad problem"),
       )
     end
@@ -28,14 +28,14 @@ RSpec.describe EmailSettingsExceptionHandler do
         Net::IMAP::NoResponseError.new(
           stub(data: stub(text: "NO Application-specific password required")),
         )
-      expect(subject.class.friendly_exception_message(exception, "imap.gmail.com")).to eq(
+      expect(described_class.friendly_exception_message(exception, "imap.gmail.com")).to eq(
         I18n.t("email_settings.authentication_error_gmail_app_password"),
       )
     end
 
     it "formats a Net::SMTPAuthenticationError" do
       exception = Net::SMTPAuthenticationError.new("invalid credentials")
-      expect(subject.class.friendly_exception_message(exception, "smtp.test.com")).to eq(
+      expect(described_class.friendly_exception_message(exception, "smtp.test.com")).to eq(
         I18n.t("email_settings.smtp_authentication_error"),
       )
     end
@@ -43,58 +43,58 @@ RSpec.describe EmailSettingsExceptionHandler do
     it "formats a Net::SMTPAuthenticationError with application-specific password Gmail error" do
       exception =
         Net::SMTPAuthenticationError.new(nil, message: "Application-specific password required")
-      expect(subject.class.friendly_exception_message(exception, "smtp.gmail.com")).to eq(
+      expect(described_class.friendly_exception_message(exception, "smtp.gmail.com")).to eq(
         I18n.t("email_settings.authentication_error_gmail_app_password"),
       )
     end
 
     it "formats a Net::SMTPServerBusy" do
       exception = Net::SMTPServerBusy.new("call me maybe later")
-      expect(subject.class.friendly_exception_message(exception, "smtp.test.com")).to eq(
+      expect(described_class.friendly_exception_message(exception, "smtp.test.com")).to eq(
         I18n.t("email_settings.smtp_server_busy_error"),
       )
     end
 
     it "formats a Net::SMTPSyntaxError, Net::SMTPFatalError, and Net::SMTPUnknownError" do
       exception = Net::SMTPSyntaxError.new(nil, message: "bad syntax")
-      expect(subject.class.friendly_exception_message(exception, "smtp.test.com")).to eq(
+      expect(described_class.friendly_exception_message(exception, "smtp.test.com")).to eq(
         I18n.t("email_settings.smtp_unhandled_error", message: exception.message),
       )
       exception = Net::SMTPFatalError.new(nil, message: "fatal")
-      expect(subject.class.friendly_exception_message(exception, "smtp.test.com")).to eq(
+      expect(described_class.friendly_exception_message(exception, "smtp.test.com")).to eq(
         I18n.t("email_settings.smtp_unhandled_error", message: exception.message),
       )
       exception = Net::SMTPUnknownError.new(nil, message: "unknown")
-      expect(subject.class.friendly_exception_message(exception, "smtp.test.com")).to eq(
+      expect(described_class.friendly_exception_message(exception, "smtp.test.com")).to eq(
         I18n.t("email_settings.smtp_unhandled_error", message: exception.message),
       )
     end
 
     it "formats a SocketError and Errno::ECONNREFUSED" do
       exception = SocketError.new("bad socket")
-      expect(subject.class.friendly_exception_message(exception, "smtp.test.com")).to eq(
+      expect(described_class.friendly_exception_message(exception, "smtp.test.com")).to eq(
         I18n.t("email_settings.connection_error"),
       )
       exception = Errno::ECONNREFUSED.new("no thanks")
-      expect(subject.class.friendly_exception_message(exception, "smtp.test.com")).to eq(
+      expect(described_class.friendly_exception_message(exception, "smtp.test.com")).to eq(
         I18n.t("email_settings.connection_error"),
       )
     end
 
     it "formats a Net::OpenTimeout and Net::ReadTimeout error" do
       exception = Net::OpenTimeout.new("timed out")
-      expect(subject.class.friendly_exception_message(exception, "smtp.test.com")).to eq(
+      expect(described_class.friendly_exception_message(exception, "smtp.test.com")).to eq(
         I18n.t("email_settings.timeout_error"),
       )
       exception = Net::ReadTimeout.new("timed out")
-      expect(subject.class.friendly_exception_message(exception, "smtp.test.com")).to eq(
+      expect(described_class.friendly_exception_message(exception, "smtp.test.com")).to eq(
         I18n.t("email_settings.timeout_error"),
       )
     end
 
     it "formats unhandled errors" do
       exception = StandardError.new("unknown")
-      expect(subject.class.friendly_exception_message(exception, "smtp.test.com")).to eq(
+      expect(described_class.friendly_exception_message(exception, "smtp.test.com")).to eq(
         I18n.t("email_settings.unhandled_error", message: exception.message),
       )
     end
diff --git a/spec/services/email_settings_validator_spec.rb b/spec/services/email_settings_validator_spec.rb
index 9ba5fb7e6e0..78bc11fcec0 100644
--- a/spec/services/email_settings_validator_spec.rb
+++ b/spec/services/email_settings_validator_spec.rb
@@ -20,7 +20,12 @@ RSpec.describe EmailSettingsValidator do
       net_imap_stub.stubs(:logout).returns(true)
       net_imap_stub.stubs(:disconnect).returns(true)
       expect {
-        subject.class.validate_imap(host: host, port: port, username: username, password: password)
+        described_class.validate_imap(
+          host: host,
+          port: port,
+          username: username,
+          password: password,
+        )
       }.not_to raise_error
     end
 
@@ -30,7 +35,7 @@ RSpec.describe EmailSettingsValidator do
         stub(data: stub(text: "no response")),
       )
       expect {
-        subject.class.validate_imap(
+        described_class.validate_imap(
           host: host,
           port: port,
           username: username,
@@ -51,7 +56,7 @@ RSpec.describe EmailSettingsValidator do
         .with(regexp_matches(/\[EmailSettingsValidator\] Error encountered/))
         .at_least_once
       expect {
-        subject.class.validate_imap(
+        described_class.validate_imap(
           host: host,
           port: port,
           username: username,
@@ -77,14 +82,19 @@ RSpec.describe EmailSettingsValidator do
 
     it "is valid if no error is raised" do
       expect {
-        subject.class.validate_pop3(host: host, port: port, username: username, password: password)
+        described_class.validate_pop3(
+          host: host,
+          port: port,
+          username: username,
+          password: password,
+        )
       }.not_to raise_error
     end
 
     it "is invalid if an error is raised" do
       net_pop3_stub.stubs(:auth_only).raises(Net::POPAuthenticationError, "invalid credentials")
       expect {
-        subject.class.validate_pop3(
+        described_class.validate_pop3(
           host: host,
           port: port,
           username: username,
@@ -102,7 +112,7 @@ RSpec.describe EmailSettingsValidator do
         .at_least_once
       net_pop3_stub.stubs(:auth_only).raises(Net::POPAuthenticationError, "invalid credentials")
       expect {
-        subject.class.validate_pop3(
+        described_class.validate_pop3(
           host: host,
           port: port,
           username: username,
@@ -117,7 +127,12 @@ RSpec.describe EmailSettingsValidator do
       SiteSetting.pop3_polling_openssl_verify = true
       net_pop3_stub.expects(:enable_ssl).with(max_version: OpenSSL::SSL::TLS1_2_VERSION)
       expect {
-        subject.class.validate_pop3(host: host, port: port, username: username, password: password)
+        described_class.validate_pop3(
+          host: host,
+          port: port,
+          username: username,
+          password: password,
+        )
       }.not_to raise_error
     end
 
@@ -126,7 +141,12 @@ RSpec.describe EmailSettingsValidator do
       SiteSetting.pop3_polling_openssl_verify = false
       net_pop3_stub.expects(:enable_ssl).with(OpenSSL::SSL::VERIFY_NONE)
       expect {
-        subject.class.validate_pop3(host: host, port: port, username: username, password: password)
+        described_class.validate_pop3(
+          host: host,
+          port: port,
+          username: username,
+          password: password,
+        )
       }.not_to raise_error
     end
   end
@@ -151,7 +171,7 @@ RSpec.describe EmailSettingsValidator do
 
     it "is valid if no error is raised" do
       expect {
-        subject.class.validate_smtp(
+        described_class.validate_smtp(
           host: host,
           port: port,
           username: username,
@@ -164,7 +184,7 @@ RSpec.describe EmailSettingsValidator do
     it "is invalid if an error is raised" do
       net_smtp_stub.stubs(:start).raises(Net::SMTPAuthenticationError, "invalid credentials")
       expect {
-        subject.class.validate_smtp(
+        described_class.validate_smtp(
           host: host,
           port: port,
           username: username,
@@ -185,7 +205,7 @@ RSpec.describe EmailSettingsValidator do
         stub(message: "invalid credentials"),
       )
       expect {
-        subject.class.validate_smtp(
+        described_class.validate_smtp(
           host: host,
           port: port,
           username: username,
@@ -199,7 +219,7 @@ RSpec.describe EmailSettingsValidator do
     it "uses the correct ssl verify params for enable_tls if those settings are enabled" do
       net_smtp_stub.expects(:enable_tls)
       expect {
-        subject.class.validate_smtp(
+        described_class.validate_smtp(
           host: host,
           port: 465,
           username: username,
@@ -215,7 +235,7 @@ RSpec.describe EmailSettingsValidator do
     it "uses the correct ssl verify params for enable_starttls_auto if those settings are enabled" do
       net_smtp_stub.expects(:enable_starttls_auto)
       expect {
-        subject.class.validate_smtp(
+        described_class.validate_smtp(
           host: host,
           port: 587,
           username: username,
@@ -230,7 +250,7 @@ RSpec.describe EmailSettingsValidator do
 
     it "raises an ArgumentError if both enable_tls is true and enable_starttls_auto is true" do
       expect {
-        subject.class.validate_smtp(
+        described_class.validate_smtp(
           host: host,
           port: port,
           username: username,
@@ -244,7 +264,7 @@ RSpec.describe EmailSettingsValidator do
 
     it "raises an ArgumentError if a bad authentication method is used" do
       expect {
-        subject.class.validate_smtp(
+        described_class.validate_smtp(
           host: host,
           port: port,
           username: username,
@@ -259,7 +279,7 @@ RSpec.describe EmailSettingsValidator do
       let(:domain) { nil }
       it "gets the domain from the host" do
         net_smtp_stub.expects(:start).with("gmail.com", username, password, :plain)
-        subject.class.validate_smtp(
+        described_class.validate_smtp(
           host: host,
           port: port,
           username: username,
@@ -272,7 +292,7 @@ RSpec.describe EmailSettingsValidator do
       it "uses localhost when in development mode" do
         Rails.env.stubs(:development?).returns(true)
         net_smtp_stub.expects(:start).with("localhost", username, password, :plain)
-        subject.class.validate_smtp(
+        described_class.validate_smtp(
           host: host,
           port: port,
           username: username,
diff --git a/spec/services/email_style_updater_spec.rb b/spec/services/email_style_updater_spec.rb
index 77742457b6c..520edc795a4 100644
--- a/spec/services/email_style_updater_spec.rb
+++ b/spec/services/email_style_updater_spec.rb
@@ -47,7 +47,7 @@ RSpec.describe EmailStyleUpdater do
         false,
       )
       expect(updater.errors).to_not be_empty
-      expect(updater.errors.first).to include("Invalid CSS after")
+      expect(updater.errors.first).to include('Error: expected "}".')
       expect_settings_to_be_unset
     end
   end
diff --git a/spec/services/external_upload_manager_spec.rb b/spec/services/external_upload_manager_spec.rb
index 6c4a71a6b91..4ef0304a6f9 100644
--- a/spec/services/external_upload_manager_spec.rb
+++ b/spec/services/external_upload_manager_spec.rb
@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
 RSpec.describe ExternalUploadManager do
+  subject(:manager) { ExternalUploadManager.new(external_upload_stub) }
+
   fab!(:user) { Fabricate(:user) }
+
   let!(:logo_file) { file_from_fixtures("logo.png") }
   let!(:pdf_file) { file_from_fixtures("large.pdf", "pdf") }
   let(:object_size) { 1.megabyte }
@@ -13,8 +16,6 @@ RSpec.describe ExternalUploadManager do
   let!(:external_upload_stub) { Fabricate(:image_external_upload_stub, created_by: user) }
   let(:s3_bucket_name) { SiteSetting.s3_upload_bucket }
 
-  subject { ExternalUploadManager.new(external_upload_stub) }
-
   before do
     SiteSetting.authorized_extensions += "|pdf"
     SiteSetting.max_attachment_size_kb = 210.megabytes / 1000
@@ -40,7 +41,7 @@ RSpec.describe ExternalUploadManager do
   describe "#can_promote?" do
     it "returns false if the external stub status is not created" do
       external_upload_stub.update!(status: ExternalUploadStub.statuses[:uploaded])
-      expect(subject.can_promote?).to eq(false)
+      expect(manager.can_promote?).to eq(false)
     end
   end
 
@@ -56,7 +57,7 @@ RSpec.describe ExternalUploadManager do
         before { FileHelper.stubs(:download).returns(nil) }
 
         it "raises an error" do
-          expect { subject.transform! }.to raise_error(ExternalUploadManager::DownloadFailedError)
+          expect { manager.transform! }.to raise_error(ExternalUploadManager::DownloadFailedError)
         end
       end
 
@@ -64,13 +65,13 @@ RSpec.describe ExternalUploadManager do
         before { external_upload_stub.update!(status: ExternalUploadStub.statuses[:uploaded]) }
 
         it "raises an error" do
-          expect { subject.transform! }.to raise_error(ExternalUploadManager::CannotPromoteError)
+          expect { manager.transform! }.to raise_error(ExternalUploadManager::CannotPromoteError)
         end
       end
 
       context "when the upload does not get changed in UploadCreator (resized etc.)" do
         it "copies the stubbed upload on S3 to its new destination and deletes it" do
-          upload = subject.transform!
+          upload = manager.transform!
 
           bucket = @fake_s3.bucket(SiteSetting.s3_upload_bucket)
           expect(@fake_s3.operation_called?(:copy_object)).to eq(true)
@@ -80,7 +81,7 @@ RSpec.describe ExternalUploadManager do
 
         it "errors if the image upload is too big" do
           SiteSetting.max_image_size_kb = 1
-          upload = subject.transform!
+          upload = manager.transform!
           expect(upload.errors.full_messages).to include(
             "Filesize " +
               I18n.t(
@@ -95,7 +96,7 @@ RSpec.describe ExternalUploadManager do
 
         it "errors if the extension is not supported" do
           SiteSetting.authorized_extensions = ""
-          upload = subject.transform!
+          upload = manager.transform!
           expect(upload.errors.full_messages).to include(
             "Original filename " + I18n.t("upload.unauthorized", authorized_extensions: ""),
           )
@@ -114,7 +115,7 @@ RSpec.describe ExternalUploadManager do
         end
 
         it "creates a new upload in s3 (not copy) and deletes the original stubbed upload" do
-          upload = subject.transform!
+          upload = manager.transform!
 
           bucket = @fake_s3.bucket(SiteSetting.s3_upload_bucket)
           expect(@fake_s3.operation_called?(:copy_object)).to eq(false)
@@ -130,7 +131,7 @@ RSpec.describe ExternalUploadManager do
           let(:client_sha1) { "blahblah" }
 
           it "raises an error, deletes the stub" do
-            expect { subject.transform! }.to raise_error(
+            expect { manager.transform! }.to raise_error(
               ExternalUploadManager::ChecksumMismatchError,
             )
             expect(ExternalUploadStub.exists?(id: external_upload_stub.id)).to eq(false)
@@ -141,7 +142,7 @@ RSpec.describe ExternalUploadManager do
 
           it "does not delete the stub if enable_upload_debug_mode" do
             SiteSetting.enable_upload_debug_mode = true
-            expect { subject.transform! }.to raise_error(
+            expect { manager.transform! }.to raise_error(
               ExternalUploadManager::ChecksumMismatchError,
             )
             external_stub = ExternalUploadStub.find(external_upload_stub.id)
@@ -159,7 +160,7 @@ RSpec.describe ExternalUploadManager do
         after { Discourse.redis.flushdb }
 
         it "raises an error, deletes the file immediately, and prevents the user from uploading external files for a few minutes" do
-          expect { subject.transform! }.to raise_error(ExternalUploadManager::SizeMismatchError)
+          expect { manager.transform! }.to raise_error(ExternalUploadManager::SizeMismatchError)
           expect(ExternalUploadStub.exists?(id: external_upload_stub.id)).to eq(false)
           expect(
             Discourse.redis.get(
@@ -173,7 +174,7 @@ RSpec.describe ExternalUploadManager do
 
         it "does not delete the stub if enable_upload_debug_mode" do
           SiteSetting.enable_upload_debug_mode = true
-          expect { subject.transform! }.to raise_error(ExternalUploadManager::SizeMismatchError)
+          expect { manager.transform! }.to raise_error(ExternalUploadManager::SizeMismatchError)
           external_stub = ExternalUploadStub.find(external_upload_stub.id)
           expect(external_stub.status).to eq(ExternalUploadStub.statuses[:failed])
 
@@ -199,23 +200,23 @@ RSpec.describe ExternalUploadManager do
 
       it "does not try and download the file" do
         FileHelper.expects(:download).never
-        subject.transform!
+        manager.transform!
       end
 
       it "generates a fake sha for the upload record" do
-        upload = subject.transform!
+        upload = manager.transform!
         expect(upload.sha1).not_to eq(sha1)
         expect(upload.original_sha1).to eq(nil)
         expect(upload.filesize).to eq(object_size)
       end
 
       it "marks the stub as uploaded" do
-        subject.transform!
+        manager.transform!
         expect(external_upload_stub.reload.status).to eq(ExternalUploadStub.statuses[:uploaded])
       end
 
       it "copies the stubbed upload on S3 to its new destination and deletes it" do
-        upload = subject.transform!
+        upload = manager.transform!
 
         bucket = @fake_s3.bucket(SiteSetting.s3_upload_bucket)
         expect(bucket.find_object(Discourse.store.get_path_for_upload(upload))).to be_present
@@ -240,28 +241,28 @@ RSpec.describe ExternalUploadManager do
 
       it "does not try and download the file" do
         FileHelper.expects(:download).never
-        subject.transform!
+        manager.transform!
       end
 
       it "raises an error when backups are disabled" do
         SiteSetting.enable_backups = false
-        expect { subject.transform! }.to raise_error(Discourse::InvalidAccess)
+        expect { manager.transform! }.to raise_error(Discourse::InvalidAccess)
       end
 
       it "raises an error when backups are local, not s3" do
         SiteSetting.backup_location = BackupLocationSiteSetting::LOCAL
-        expect { subject.transform! }.to raise_error(Discourse::InvalidAccess)
+        expect { manager.transform! }.to raise_error(Discourse::InvalidAccess)
       end
 
       it "does not create an upload record" do
-        expect { subject.transform! }.not_to change { Upload.count }
+        expect { manager.transform! }.not_to change { Upload.count }
       end
 
       it "copies the stubbed upload on S3 to its new destination and deletes it" do
         bucket = @fake_s3.bucket(SiteSetting.s3_backup_bucket)
         expect(bucket.find_object(external_upload_stub.key)).to be_present
 
-        subject.transform!
+        manager.transform!
 
         expect(
           bucket.find_object(
diff --git a/spec/services/flag_sockpuppets_spec.rb b/spec/services/flag_sockpuppets_spec.rb
index 8e921a72b4c..4f77d79b215 100644
--- a/spec/services/flag_sockpuppets_spec.rb
+++ b/spec/services/flag_sockpuppets_spec.rb
@@ -5,9 +5,10 @@ RSpec.describe SpamRule::FlagSockpuppets do
   fab!(:post1) { Fabricate(:post, user: user1, topic: Fabricate(:topic, user: user1)) }
 
   describe "#perform" do
-    let(:rule) { described_class.new(post1) }
     subject(:perform) { rule.perform }
 
+    let(:rule) { described_class.new(post1) }
+
     it "does nothing if flag_sockpuppets is disabled" do
       SiteSetting.flag_sockpuppets = false
       rule.expects(:reply_is_from_sockpuppet?).never
diff --git a/spec/services/group_action_logger_spec.rb b/spec/services/group_action_logger_spec.rb
index 28eb7865759..6e7b8c07896 100644
--- a/spec/services/group_action_logger_spec.rb
+++ b/spec/services/group_action_logger_spec.rb
@@ -1,17 +1,17 @@
 # frozen_string_literal: true
 
 RSpec.describe GroupActionLogger do
+  subject(:logger) { described_class.new(group_owner, group) }
+
   fab!(:group_owner) { Fabricate(:user) }
   fab!(:group) { Fabricate(:group) }
   fab!(:user) { Fabricate(:user) }
 
-  subject { described_class.new(group_owner, group) }
-
   before { group.add_owner(group_owner) }
 
   describe "#log_make_user_group_owner" do
     it "should create the right record" do
-      subject.log_make_user_group_owner(user)
+      logger.log_make_user_group_owner(user)
 
       group_history = GroupHistory.last
 
@@ -23,7 +23,7 @@ RSpec.describe GroupActionLogger do
 
   describe "#log_remove_user_as_group_owner" do
     it "should create the right record" do
-      subject.log_remove_user_as_group_owner(user)
+      logger.log_remove_user_as_group_owner(user)
 
       group_history = GroupHistory.last
 
@@ -36,7 +36,7 @@ RSpec.describe GroupActionLogger do
   describe "#log_add_user_to_group" do
     context "as a group owner" do
       it "should create the right record" do
-        subject.log_add_user_to_group(user)
+        logger.log_add_user_to_group(user)
 
         group_history = GroupHistory.last
 
@@ -47,12 +47,12 @@ RSpec.describe GroupActionLogger do
     end
 
     context "as a normal user" do
-      subject { described_class.new(user, group) }
+      subject(:logger) { described_class.new(user, group) }
 
       before { group.update!(public_admission: true) }
 
       it "should create the right record" do
-        subject.log_add_user_to_group(user)
+        logger.log_add_user_to_group(user)
 
         group_history = GroupHistory.last
 
@@ -66,7 +66,7 @@ RSpec.describe GroupActionLogger do
   describe "#log_remove_user_from_group" do
     context "as group owner" do
       it "should create the right record" do
-        subject.log_remove_user_from_group(user)
+        logger.log_remove_user_from_group(user)
 
         group_history = GroupHistory.last
 
@@ -77,12 +77,12 @@ RSpec.describe GroupActionLogger do
     end
 
     context "as a normal user" do
-      subject { described_class.new(user, group) }
+      subject(:logger) { described_class.new(user, group) }
 
       before { group.update!(public_exit: true) }
 
       it "should create the right record" do
-        subject.log_remove_user_from_group(user)
+        logger.log_remove_user_from_group(user)
 
         group_history = GroupHistory.last
 
@@ -97,7 +97,7 @@ RSpec.describe GroupActionLogger do
     it "should create the right record" do
       group.update!(public_admission: true, created_at: Time.zone.now)
 
-      expect { subject.log_change_group_settings }.to change { GroupHistory.count }.by(1)
+      expect { logger.log_change_group_settings }.to change { GroupHistory.count }.by(1)
 
       group_history = GroupHistory.last
 
diff --git a/spec/services/group_message_spec.rb b/spec/services/group_message_spec.rb
index 6ff2e5911d5..4cd007becfc 100644
--- a/spec/services/group_message_spec.rb
+++ b/spec/services/group_message_spec.rb
@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
 RSpec.describe GroupMessage do
+  subject(:send_group_message) do
+    GroupMessage.create(moderators_group, :user_automatically_silenced, user: user)
+  end
+
   let(:moderators_group) { Group[:moderators].name }
 
   let!(:admin) { Fabricate.build(:admin, id: 999) }
@@ -8,10 +12,6 @@ RSpec.describe GroupMessage do
 
   before { Discourse.stubs(:system_user).returns(admin) }
 
-  subject(:send_group_message) do
-    GroupMessage.create(moderators_group, :user_automatically_silenced, user: user)
-  end
-
   describe "not sent recently" do
     before { GroupMessage.any_instance.stubs(:sent_recently?).returns(false) }
 
@@ -42,14 +42,17 @@ RSpec.describe GroupMessage do
   end
 
   describe "sent recently" do
+    subject(:group_message) do
+      GroupMessage.create(moderators_group, :user_automatically_silenced, user: user)
+    end
+
     before { GroupMessage.any_instance.stubs(:sent_recently?).returns(true) }
-    subject { GroupMessage.create(moderators_group, :user_automatically_silenced, user: user) }
 
     it { is_expected.to eq(false) }
 
     it "should not send the same notification again" do
       PostCreator.expects(:create).never
-      subject
+      group_message
     end
   end
 
@@ -57,29 +60,35 @@ RSpec.describe GroupMessage do
     let(:user) { Fabricate.build(:user, id: 123_123) }
     shared_examples "common message params for group messages" do
       it "returns the correct params" do
-        expect(subject[:username]).to eq(user.username)
-        expect(subject[:user_url]).to be_present
+        expect(message_params[:username]).to eq(user.username)
+        expect(message_params[:user_url]).to be_present
       end
     end
 
     context "with user_automatically_silenced" do
-      subject do
+      subject(:message_params) do
         GroupMessage.new(moderators_group, :user_automatically_silenced, user: user).message_params
       end
+
       include_examples "common message params for group messages"
     end
 
     context "with spam_post_blocked" do
-      subject { GroupMessage.new(moderators_group, :spam_post_blocked, user: user).message_params }
+      subject(:message_params) do
+        GroupMessage.new(moderators_group, :spam_post_blocked, user: user).message_params
+      end
+
       include_examples "common message params for group messages"
     end
   end
 
   describe "methods that use redis" do
-    let(:user) { Fabricate.build(:user, id: 123_123) }
     subject(:group_message) do
       GroupMessage.new(moderators_group, :user_automatically_silenced, user: user)
     end
+
+    let(:user) { Fabricate.build(:user, id: 123_123) }
+
     before do
       PostCreator.stubs(:create).returns(stub_everything)
       group_message.stubs(:sent_recently_key).returns("the_key")
diff --git a/spec/services/hashtag_autocomplete_service_spec.rb b/spec/services/hashtag_autocomplete_service_spec.rb
index 986124548dd..6419472a2bc 100644
--- a/spec/services/hashtag_autocomplete_service_spec.rb
+++ b/spec/services/hashtag_autocomplete_service_spec.rb
@@ -1,20 +1,29 @@
 # frozen_string_literal: true
 
 RSpec.describe HashtagAutocompleteService do
+  subject(:service) { described_class.new(guardian) }
+
   fab!(:user) { Fabricate(:user) }
   fab!(:category1) { Fabricate(:category, name: "The Book Club", slug: "the-book-club") }
   fab!(:tag1) do
     Fabricate(:tag, name: "great-books", staff_topic_count: 22, public_topic_count: 22)
   end
   fab!(:topic1) { Fabricate(:topic) }
-  let(:guardian) { Guardian.new(user) }
 
-  subject { described_class.new(guardian) }
+  let(:guardian) { Guardian.new(user) }
 
   after { DiscoursePluginRegistry.reset! }
 
+  describe ".enabled_data_sources" do
+    it "only returns data sources that are enabled" do
+      expect(HashtagAutocompleteService.enabled_data_sources).to eq(
+        HashtagAutocompleteService::DEFAULT_DATA_SOURCES,
+      )
+    end
+  end
+
   describe ".contexts_with_ordered_types" do
-    it "returns a hash of all the registrered search contexts and their types in the defined priority order" do
+    it "returns a hash of all the registered search contexts and their types in the defined priority order" do
       expect(HashtagAutocompleteService.contexts_with_ordered_types).to eq(
         { "topic-composer" => %w[category tag] },
       )
@@ -30,34 +39,43 @@ RSpec.describe HashtagAutocompleteService do
         { "topic-composer" => %w[category tag], "awesome-composer" => %w[tag category] },
       )
     end
+
+    it "does not return types which have been disabled" do
+      SiteSetting.tagging_enabled = false
+      expect(HashtagAutocompleteService.contexts_with_ordered_types).to eq(
+        { "topic-composer" => %w[category] },
+      )
+    end
   end
 
-  describe ".data_source_icons" do
+  describe ".data_source_icon_map" do
     it "gets an array for all icons defined by data sources so they can be used for markdown allowlisting" do
-      expect(HashtagAutocompleteService.data_source_icons).to eq(%w[folder tag])
+      expect(HashtagAutocompleteService.data_source_icon_map).to eq(
+        { "category" => "folder", "tag" => "tag" },
+      )
     end
   end
 
   describe "#search" do
     it "returns search results for tags and categories by default" do
-      expect(subject.search("book", %w[category tag]).map(&:text)).to eq(
+      expect(service.search("book", %w[category tag]).map(&:text)).to eq(
         ["The Book Club", "great-books"],
       )
     end
 
     it "respects the types_in_priority_order param" do
-      expect(subject.search("book", %w[tag category]).map(&:text)).to eq(
+      expect(service.search("book", %w[tag category]).map(&:text)).to eq(
         ["great-books", "The Book Club"],
       )
     end
 
     it "respects the limit param" do
-      expect(subject.search("book", %w[tag category], limit: 1).map(&:text)).to eq(["great-books"])
+      expect(service.search("book", %w[tag category], limit: 1).map(&:text)).to eq(["great-books"])
     end
 
     it "does not allow more than SEARCH_MAX_LIMIT results to be specified by the limit param" do
       stub_const(HashtagAutocompleteService, "SEARCH_MAX_LIMIT", 1) do
-        expect(subject.search("book", %w[category tag], limit: 1000).map(&:text)).to eq(
+        expect(service.search("book", %w[category tag], limit: 1000).map(&:text)).to eq(
           ["The Book Club"],
         )
       end
@@ -66,35 +84,35 @@ RSpec.describe HashtagAutocompleteService do
     it "does not search other data sources if the limit is reached by earlier type data sources" do
       # only expected once to try get the exact matches first
       DiscourseTagging.expects(:filter_allowed_tags).never
-      subject.search("the-book", %w[category tag], limit: 1)
+      service.search("the-book", %w[category tag], limit: 1)
     end
 
     it "includes the tag count" do
       tag1.update!(staff_topic_count: 78, public_topic_count: 78)
-      expect(subject.search("book", %w[tag category]).map(&:text)).to eq(
+      expect(service.search("book", %w[tag category]).map(&:text)).to eq(
         ["great-books", "The Book Club"],
       )
     end
 
     it "does case-insensitive search" do
-      expect(subject.search("bOOk", %w[category tag]).map(&:text)).to eq(
+      expect(service.search("bOOk", %w[category tag]).map(&:text)).to eq(
         ["The Book Club", "great-books"],
       )
     end
 
     it "can search categories by name or slug" do
-      expect(subject.search("the-book-club", %w[category]).map(&:text)).to eq(["The Book Club"])
-      expect(subject.search("Book C", %w[category]).map(&:text)).to eq(["The Book Club"])
+      expect(service.search("the-book-club", %w[category]).map(&:text)).to eq(["The Book Club"])
+      expect(service.search("Book C", %w[category]).map(&:text)).to eq(["The Book Club"])
     end
 
     it "does not include categories the user cannot access" do
       category1.update!(read_restricted: true)
-      expect(subject.search("book", %w[tag category]).map(&:text)).to eq(["great-books"])
+      expect(service.search("book", %w[tag category]).map(&:text)).to eq(["great-books"])
     end
 
     it "does not include tags the user cannot access" do
       Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: ["great-books"])
-      expect(subject.search("book", %w[tag]).map(&:text)).to be_empty
+      expect(service.search("book", %w[tag]).map(&:text)).to be_empty
     end
 
     it "includes other data sources" do
@@ -107,7 +125,7 @@ RSpec.describe HashtagAutocompleteService do
         stub(enabled?: true),
       )
 
-      expect(subject.search("book", %w[category tag bookmark]).map(&:text)).to eq(
+      expect(service.search("book", %w[category tag bookmark]).map(&:text)).to eq(
         ["The Book Club", "great-books", "read review of this fantasy book"],
       )
     end
@@ -115,7 +133,7 @@ RSpec.describe HashtagAutocompleteService do
     it "handles refs for categories that have a parent" do
       parent = Fabricate(:category, name: "Hobbies", slug: "hobbies")
       category1.update!(parent_category: parent)
-      expect(subject.search("book", %w[category tag]).map(&:ref)).to eq(
+      expect(service.search("book", %w[category tag]).map(&:ref)).to eq(
         %w[hobbies:the-book-club great-books],
       )
       category1.update!(parent_category: nil)
@@ -123,7 +141,7 @@ RSpec.describe HashtagAutocompleteService do
 
     it "appends type suffixes for the ref on conflicting slugs on items that are not the top priority type" do
       Fabricate(:tag, name: "the-book-club")
-      expect(subject.search("book", %w[category tag]).map(&:ref)).to eq(
+      expect(service.search("book", %w[category tag]).map(&:ref)).to eq(
         %w[the-book-club great-books the-book-club::tag],
       )
 
@@ -135,11 +153,49 @@ RSpec.describe HashtagAutocompleteService do
         stub(enabled?: true),
       )
 
-      expect(subject.search("book", %w[category tag bookmark]).map(&:ref)).to eq(
+      expect(service.search("book", %w[category tag bookmark]).map(&:ref)).to eq(
         %w[book-club the-book-club great-books the-book-club::tag],
       )
     end
 
+    it "does not add a type suffix where
+        1. a subcategory name conflicts with an existing tag name and
+        2. the category is not the top ranked type" do
+      parent = Fabricate(:category, name: "Hobbies", slug: "hobbies")
+      category1.update!(parent_category: parent)
+      Fabricate(:tag, name: "the-book-club")
+
+      Fabricate(:bookmark, user: user, name: "book club")
+      guardian.user.reload
+
+      DiscoursePluginRegistry.register_hashtag_autocomplete_data_source(
+        FakeBookmarkHashtagDataSource,
+        stub(enabled?: true),
+      )
+
+      expect(service.search("book", %w[bookmark category tag]).map(&:ref)).to eq(
+        %w[book-club hobbies:the-book-club great-books the-book-club::tag],
+      )
+    end
+
+    it "handles the type suffix where the top ranked type conflicts with a subcategory" do
+      parent = Fabricate(:category, name: "Hobbies", slug: "hobbies")
+      category1.update!(parent_category: parent)
+      Fabricate(:tag, name: "the-book-club")
+
+      Fabricate(:bookmark, user: user, name: "the book club")
+      guardian.user.reload
+
+      DiscoursePluginRegistry.register_hashtag_autocomplete_data_source(
+        FakeBookmarkHashtagDataSource,
+        stub(enabled?: true),
+      )
+
+      expect(service.search("book", %w[bookmark category tag]).map(&:ref)).to eq(
+        %w[the-book-club hobbies:the-book-club::category great-books the-book-club::tag],
+      )
+    end
+
     it "orders results by (with type ordering within each section):
         1. exact match on slug (ignoring parent/child distinction for categories)
         2. slugs that start with the term
@@ -154,7 +210,7 @@ RSpec.describe HashtagAutocompleteService do
       Fabricate(:tag, name: "bookmania", staff_topic_count: 15, public_topic_count: 15)
       Fabricate(:tag, name: "awful-books", staff_topic_count: 56, public_topic_count: 56)
 
-      expect(subject.search("book", %w[category tag]).map(&:ref)).to eq(
+      expect(service.search("book", %w[category tag]).map(&:ref)).to eq(
         [
           "book-reviews:book", # category exact match on slug, name sorted
           "book-library:book",
@@ -168,7 +224,7 @@ RSpec.describe HashtagAutocompleteService do
           "great-books",
         ],
       )
-      expect(subject.search("book", %w[category tag]).map(&:text)).to eq(
+      expect(service.search("book", %w[category tag]).map(&:text)).to eq(
         [
           "Good Books",
           "Horror",
@@ -193,13 +249,13 @@ RSpec.describe HashtagAutocompleteService do
       fab!(:tag4) { Fabricate(:tag, name: "book") }
 
       it "orders them by name within their type order" do
-        expect(subject.search("book", %w[category tag], limit: 10).map(&:ref)).to eq(
+        expect(service.search("book", %w[category tag], limit: 10).map(&:ref)).to eq(
           %w[book book::tag book-dome book-zone the-book-club great-books mid-books terrible-books],
         )
       end
 
       it "prioritises exact matches to the top of the list" do
-        expect(subject.search("book", %w[category tag], limit: 10).map(&:ref)).to eq(
+        expect(service.search("book", %w[category tag], limit: 10).map(&:ref)).to eq(
           %w[book book::tag book-dome book-zone the-book-club great-books mid-books terrible-books],
         )
       end
@@ -209,7 +265,7 @@ RSpec.describe HashtagAutocompleteService do
       before { SiteSetting.tagging_enabled = false }
 
       it "does not return any tags" do
-        expect(subject.search("book", %w[category tag]).map(&:text)).to eq(["The Book Club"])
+        expect(service.search("book", %w[category tag]).map(&:text)).to eq(["The Book Club"])
       end
     end
 
@@ -230,11 +286,11 @@ RSpec.describe HashtagAutocompleteService do
       end
       fab!(:tag4) { Fabricate(:tag, name: "book", staff_topic_count: 1, public_topic_count: 1) }
 
-      it "returns the 'most polular' categories and tags (based on topic_count) that the user can access" do
+      it "returns the 'most popular' categories and tags (based on topic_count) that the user can access" do
         category1.update!(read_restricted: true)
         Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: ["terrible-books"])
 
-        expect(subject.search(nil, %w[category tag]).map(&:text)).to eq(
+        expect(service.search(nil, %w[category tag]).map(&:text)).to eq(
           [
             "Book Dome",
             "Book Zone",
@@ -247,6 +303,13 @@ RSpec.describe HashtagAutocompleteService do
           ],
         )
       end
+
+      it "does not error if a type provided for priority order has been disabled" do
+        SiteSetting.tagging_enabled = false
+        expect(service.search(nil, %w[category tag]).map(&:ref)).to eq(
+          %w[book-dome book-zone media book uncategorized the-book-club],
+        )
+      end
     end
   end
 
@@ -254,7 +317,7 @@ RSpec.describe HashtagAutocompleteService do
     fab!(:tag2) { Fabricate(:tag, name: "fiction-books") }
 
     it "returns categories and tags in a hash format with the slug and url" do
-      result = subject.lookup_old(%w[the-book-club great-books fiction-books])
+      result = service.lookup_old(%w[the-book-club great-books fiction-books])
       expect(result[:categories]).to eq({ "the-book-club" => "/c/the-book-club/#{category1.id}" })
       expect(result[:tags]).to eq(
         {
@@ -266,18 +329,18 @@ RSpec.describe HashtagAutocompleteService do
 
     it "does not include categories the user cannot access" do
       category1.update!(read_restricted: true)
-      result = subject.lookup_old(%w[the-book-club great-books fiction-books])
+      result = service.lookup_old(%w[the-book-club great-books fiction-books])
       expect(result[:categories]).to eq({})
     end
 
     it "does not include tags the user cannot access" do
       Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: ["great-books"])
-      result = subject.lookup_old(%w[the-book-club great-books fiction-books])
+      result = service.lookup_old(%w[the-book-club great-books fiction-books])
       expect(result[:tags]).to eq({ "fiction-books" => "http://test.localhost/tag/fiction-books" })
     end
 
     it "handles tags which have the ::tag suffix" do
-      result = subject.lookup_old(%w[the-book-club great-books::tag fiction-books])
+      result = service.lookup_old(%w[the-book-club great-books::tag fiction-books])
       expect(result[:tags]).to eq(
         {
           "fiction-books" => "http://test.localhost/tag/fiction-books",
@@ -290,7 +353,7 @@ RSpec.describe HashtagAutocompleteService do
       before { SiteSetting.tagging_enabled = false }
 
       it "does not return tags" do
-        result = subject.lookup_old(%w[the-book-club great-books fiction-books])
+        result = service.lookup_old(%w[the-book-club great-books fiction-books])
         expect(result[:categories]).to eq({ "the-book-club" => "/c/the-book-club/#{category1.id}" })
         expect(result[:tags]).to eq({})
       end
@@ -301,7 +364,7 @@ RSpec.describe HashtagAutocompleteService do
     fab!(:tag2) { Fabricate(:tag, name: "fiction-books") }
 
     it "returns category and tag in a hash format with the slug and url" do
-      result = subject.lookup(%w[the-book-club great-books fiction-books], %w[category tag])
+      result = service.lookup(%w[the-book-club great-books fiction-books], %w[category tag])
       expect(result[:category].map(&:slug)).to eq(["the-book-club"])
       expect(result[:category].map(&:relative_url)).to eq(["/c/the-book-club/#{category1.id}"])
       expect(result[:tag].map(&:slug)).to eq(%w[fiction-books great-books])
@@ -310,20 +373,20 @@ RSpec.describe HashtagAutocompleteService do
 
     it "does not include category the user cannot access" do
       category1.update!(read_restricted: true)
-      result = subject.lookup(%w[the-book-club great-books fiction-books], %w[category tag])
+      result = service.lookup(%w[the-book-club great-books fiction-books], %w[category tag])
       expect(result[:category]).to eq([])
     end
 
     it "does not include tag the user cannot access" do
       Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: ["great-books"])
-      result = subject.lookup(%w[the-book-club great-books fiction-books], %w[category tag])
+      result = service.lookup(%w[the-book-club great-books fiction-books], %w[category tag])
       expect(result[:tag].map(&:slug)).to eq(%w[fiction-books])
       expect(result[:tag].map(&:relative_url)).to eq(["/tag/fiction-books"])
     end
 
     it "handles type suffixes for slugs" do
       result =
-        subject.lookup(%w[the-book-club::category great-books::tag fiction-books], %w[category tag])
+        service.lookup(%w[the-book-club::category great-books::tag fiction-books], %w[category tag])
       expect(result[:category].map(&:slug)).to eq(["the-book-club"])
       expect(result[:category].map(&:relative_url)).to eq(["/c/the-book-club/#{category1.id}"])
       expect(result[:tag].map(&:slug)).to eq(%w[fiction-books great-books])
@@ -333,7 +396,7 @@ RSpec.describe HashtagAutocompleteService do
     it "handles parent:child category lookups" do
       parent_category = Fabricate(:category, name: "Media", slug: "media")
       category1.update!(parent_category: parent_category)
-      result = subject.lookup(%w[media:the-book-club], %w[category tag])
+      result = service.lookup(%w[media:the-book-club], %w[category tag])
       expect(result[:category].map(&:slug)).to eq(["the-book-club"])
       expect(result[:category].map(&:ref)).to eq(["media:the-book-club"])
       expect(result[:category].map(&:relative_url)).to eq(
@@ -342,22 +405,34 @@ RSpec.describe HashtagAutocompleteService do
       category1.update!(parent_category: nil)
     end
 
+    it "handles parent:child category lookups with type suffix" do
+      parent_category = Fabricate(:category, name: "Media", slug: "media")
+      category1.update!(parent_category: parent_category)
+      result = service.lookup(%w[media:the-book-club::category], %w[category tag])
+      expect(result[:category].map(&:slug)).to eq(["the-book-club"])
+      expect(result[:category].map(&:ref)).to eq(["media:the-book-club::category"])
+      expect(result[:category].map(&:relative_url)).to eq(
+        ["/c/media/the-book-club/#{category1.id}"],
+      )
+      category1.update!(parent_category: nil)
+    end
+
     it "does not return the category if the parent does not match the child" do
       parent_category = Fabricate(:category, name: "Media", slug: "media")
       category1.update!(parent_category: parent_category)
-      result = subject.lookup(%w[bad-parent:the-book-club], %w[category tag])
+      result = service.lookup(%w[bad-parent:the-book-club], %w[category tag])
       expect(result[:category]).to be_empty
     end
 
     it "for slugs without a type suffix it falls back in type order until a result is found or types are exhausted" do
-      result = subject.lookup(%w[the-book-club great-books fiction-books], %w[category tag])
+      result = service.lookup(%w[the-book-club great-books fiction-books], %w[category tag])
       expect(result[:category].map(&:slug)).to eq(["the-book-club"])
       expect(result[:category].map(&:relative_url)).to eq(["/c/the-book-club/#{category1.id}"])
       expect(result[:tag].map(&:slug)).to eq(%w[fiction-books great-books])
       expect(result[:tag].map(&:relative_url)).to eq(%w[/tag/fiction-books /tag/great-books])
 
       category2 = Fabricate(:category, name: "Great Books", slug: "great-books")
-      result = subject.lookup(%w[the-book-club great-books fiction-books], %w[category tag])
+      result = service.lookup(%w[the-book-club great-books fiction-books], %w[category tag])
       expect(result[:category].map(&:slug)).to eq(%w[great-books the-book-club])
       expect(result[:category].map(&:relative_url)).to eq(
         ["/c/great-books/#{category2.id}", "/c/the-book-club/#{category1.id}"],
@@ -367,13 +442,13 @@ RSpec.describe HashtagAutocompleteService do
 
       category1.destroy!
       Fabricate(:tag, name: "the-book-club")
-      result = subject.lookup(%w[the-book-club great-books fiction-books], %w[category tag])
+      result = service.lookup(%w[the-book-club great-books fiction-books], %w[category tag])
       expect(result[:category].map(&:slug)).to eq(["great-books"])
       expect(result[:category].map(&:relative_url)).to eq(["/c/great-books/#{category2.id}"])
       expect(result[:tag].map(&:slug)).to eq(%w[fiction-books the-book-club])
       expect(result[:tag].map(&:relative_url)).to eq(%w[/tag/fiction-books /tag/the-book-club])
 
-      result = subject.lookup(%w[the-book-club great-books fiction-books], %w[tag category])
+      result = service.lookup(%w[the-book-club great-books fiction-books], %w[tag category])
       expect(result[:category]).to eq([])
       expect(result[:tag].map(&:slug)).to eq(%w[fiction-books great-books the-book-club])
       expect(result[:tag].map(&:relative_url)).to eq(
@@ -391,14 +466,14 @@ RSpec.describe HashtagAutocompleteService do
         stub(enabled?: true),
       )
 
-      result = subject.lookup(["coolrock"], %w[category tag bookmark])
+      result = service.lookup(["coolrock"], %w[category tag bookmark])
       expect(result[:bookmark].map(&:slug)).to eq(["coolrock"])
     end
 
     it "handles type suffix lookups where there is another type with a conflicting slug that the user cannot access" do
       category1.update!(read_restricted: true)
       Fabricate(:tag, name: "the-book-club")
-      result = subject.lookup(%w[the-book-club::tag the-book-club], %w[category tag])
+      result = service.lookup(%w[the-book-club::tag the-book-club], %w[category tag])
       expect(result[:category].map(&:ref)).to eq([])
       expect(result[:tag].map(&:ref)).to eq(["the-book-club::tag"])
     end
@@ -407,10 +482,10 @@ RSpec.describe HashtagAutocompleteService do
       before { SiteSetting.tagging_enabled = false }
 
       it "does not return tag" do
-        result = subject.lookup(%w[the-book-club great-books fiction-books], %w[category tag])
+        result = service.lookup(%w[the-book-club great-books fiction-books], %w[category tag])
         expect(result[:category].map(&:slug)).to eq(["the-book-club"])
         expect(result[:category].map(&:relative_url)).to eq(["/c/the-book-club/#{category1.id}"])
-        expect(result[:tag]).to eq([])
+        expect(result[:tag]).to eq(nil)
       end
     end
   end
diff --git a/spec/services/notifications/consolidation_planner_spec.rb b/spec/services/notifications/consolidation_planner_spec.rb
index 707d719e4a0..5e9526b4472 100644
--- a/spec/services/notifications/consolidation_planner_spec.rb
+++ b/spec/services/notifications/consolidation_planner_spec.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 RSpec.describe Notifications::ConsolidationPlanner do
+  subject(:planner) { described_class.new }
+
   describe "#consolidate_or_save!" do
     let(:threshold) { 1 }
     fab!(:user) { Fabricate(:user) }
@@ -11,7 +13,7 @@ RSpec.describe Notifications::ConsolidationPlanner do
     it "does nothing it haven't passed the consolidation threshold yet" do
       notification = build_notification(:liked, { display_username: like_user })
 
-      saved_like = subject.consolidate_or_save!(notification)
+      saved_like = planner.consolidate_or_save!(notification)
 
       expect(saved_like.id).to be_present
       expect(saved_like.notification_type).to eq(Notification.types[:liked])
@@ -27,7 +29,7 @@ RSpec.describe Notifications::ConsolidationPlanner do
         )
       notification = build_notification(:liked, { display_username: like_user })
 
-      consolidated_like = subject.consolidate_or_save!(notification)
+      consolidated_like = planner.consolidate_or_save!(notification)
 
       expect(consolidated_like.id).not_to eq(first_notification.id)
       expect(consolidated_like.notification_type).to eq(Notification.types[:liked_consolidated])
@@ -45,7 +47,7 @@ RSpec.describe Notifications::ConsolidationPlanner do
       )
       notification = build_notification(:liked, { display_username: like_user })
 
-      updated = subject.consolidate_or_save!(notification)
+      updated = planner.consolidate_or_save!(notification)
 
       expect { notification.reload }.to raise_error(ActiveRecord::RecordNotFound)
       data = JSON.parse(updated.data)
@@ -63,6 +65,6 @@ RSpec.describe Notifications::ConsolidationPlanner do
   end
 
   def plan_for(notification)
-    subject.plan_for(notification)
+    planner.plan_for(notification)
   end
 end
diff --git a/spec/services/post_action_notifier_spec.rb b/spec/services/post_action_notifier_spec.rb
index 8ac91ea5a68..087f62416da 100644
--- a/spec/services/post_action_notifier_spec.rb
+++ b/spec/services/post_action_notifier_spec.rb
@@ -202,25 +202,24 @@ RSpec.describe PostActionNotifier do
   end
 
   context "with private message" do
+    fab!(:private_message) do
+      Fabricate(:topic, archetype: Archetype.private_message, category_id: nil)
+    end
     fab!(:user) { Fabricate(:user) }
-    fab!(:mention_post) { Fabricate(:post, user: user, raw: "Hello @eviltrout") }
-    let(:topic) do
-      topic = mention_post.topic
-      topic.update_columns archetype: Archetype.private_message, category_id: nil
-      topic
+    fab!(:mention_post) do
+      Fabricate(:post, topic: private_message, user: user, raw: "Hello @eviltrout")
     end
 
     it "won't notify someone who can't see the post" do
-      expect {
-        Guardian.any_instance.expects(:can_see?).with(instance_of(Post)).returns(false)
-        mention_post
-        PostAlerter.post_created(mention_post)
-      }.not_to change(evil_trout.notifications, :count)
+      expect { PostAlerter.post_created(mention_post) }.not_to change(
+        evil_trout.notifications,
+        :count,
+      )
     end
 
     it "creates like notifications" do
       other_user = Fabricate(:user)
-      topic.allowed_users << user << other_user
+      private_message.allowed_users << user << other_user
       expect { PostActionCreator.like(other_user, mention_post) }.to change(
         user.notifications,
         :count,
diff --git a/spec/services/post_alerter_spec.rb b/spec/services/post_alerter_spec.rb
index 793239bd8ab..9cfb9c1350f 100644
--- a/spec/services/post_alerter_spec.rb
+++ b/spec/services/post_alerter_spec.rb
@@ -45,6 +45,15 @@ RSpec.describe PostAlerter do
   fab!(:user) { Fabricate(:user) }
   fab!(:tl2_user) { Fabricate(:user, trust_level: TrustLevel[2]) }
 
+  fab!(:private_category) do
+    Fabricate(
+      :private_category,
+      group: group,
+      email_in: "test@test.com",
+      email_in_allow_strangers: true,
+    )
+  end
+
   def create_post_with_alerts(args = {})
     post = Fabricate(:post, args)
     PostAlerter.post_created(post)
@@ -64,7 +73,7 @@ RSpec.describe PostAlerter do
       PostAlerter.post_created(reply2)
 
       # we get a green notification for a reply
-      expect(Notification.where(user_id: pm.user_id).pluck_first(:notification_type)).to eq(
+      expect(Notification.where(user_id: pm.user_id).pick(:notification_type)).to eq(
         Notification.types[:private_message],
       )
 
@@ -104,7 +113,7 @@ RSpec.describe PostAlerter do
       )
       PostAlerter.post_created(op)
 
-      expect(Notification.where(user_id: user.id).pluck_first(:notification_type)).to eq(
+      expect(Notification.where(user_id: user.id).pick(:notification_type)).to eq(
         Notification.types[:private_message],
       )
     end
@@ -115,6 +124,15 @@ RSpec.describe PostAlerter do
       fab!(:group) do
         Fabricate(:group, users: [user2], name: "TestGroup", default_notification_level: 2)
       end
+      fab!(:watching_first_post_group) do
+        Fabricate(
+          :group,
+          name: "some_group",
+          users: [evil_trout, coding_horror],
+          messageable_level: Group::ALIAS_LEVELS[:everyone],
+          default_notification_level: NotificationLevels.all[:watching_first_post],
+        )
+      end
       fab!(:pm) do
         Fabricate(:topic, archetype: "private_message", category_id: nil, allowed_groups: [group])
       end
@@ -325,6 +343,86 @@ RSpec.describe PostAlerter do
           )
         }.not_to change(user2.notifications, :count)
       end
+
+      context "with watching_first_post notification level" do
+        it "notifies group members of first post" do
+          post =
+            PostCreator.create!(
+              user,
+              title: "Hi there, welcome to my topic",
+              raw: "This is my awesome message",
+              archetype: Archetype.private_message,
+              target_group_names: watching_first_post_group.name,
+            )
+
+          PostAlerter.new.after_save_post(post, true)
+
+          expect(
+            evil_trout
+              .notifications
+              .where(notification_type: Notification.types[:private_message])
+              .count,
+          ).to eq(1)
+          expect(
+            coding_horror
+              .notifications
+              .where(notification_type: Notification.types[:private_message])
+              .count,
+          ).to eq(1)
+        end
+
+        it "doesn't notify group members of replies" do
+          post =
+            PostCreator.create!(
+              user,
+              title: "Hi there, welcome to my topic",
+              raw: "This is my awesome message",
+              archetype: Archetype.private_message,
+              target_group_names: watching_first_post_group.name,
+            )
+
+          expect(
+            evil_trout
+              .notifications
+              .where(notification_type: Notification.types[:private_message])
+              .count,
+          ).to eq(0)
+          expect(
+            coding_horror
+              .notifications
+              .where(notification_type: Notification.types[:private_message])
+              .count,
+          ).to eq(0)
+
+          PostAlerter.new.after_save_post(post, true)
+
+          expect(
+            evil_trout
+              .notifications
+              .where(notification_type: Notification.types[:private_message])
+              .count,
+          ).to eq(1)
+          expect(
+            coding_horror
+              .notifications
+              .where(notification_type: Notification.types[:private_message])
+              .count,
+          ).to eq(1)
+
+          reply =
+            Fabricate(
+              :post,
+              raw: "Reply to PM",
+              user: user,
+              topic: post.topic,
+              reply_to_post_number: post.post_number,
+            )
+
+          expect do PostAlerter.new.after_save_post(reply, false) end.to_not change {
+            Notification.count
+          }
+        end
+      end
     end
   end
 
@@ -609,22 +707,13 @@ RSpec.describe PostAlerter do
       group_member = Fabricate(:user)
       group.add(group_member)
 
-      private_category =
-        Fabricate(
-          :private_category,
-          group: group,
-          email_in: "test@test.com",
-          email_in_allow_strangers: true,
-        )
-
       staged_user_post = create_post(user: staged_user, category: private_category)
 
-      linking =
-        create_post(
-          user: group_member,
-          category: private_category,
-          raw: "my magic topic\n##{Discourse.base_url}#{staged_user_post.url}",
-        )
+      create_post(
+        user: group_member,
+        category: private_category,
+        raw: "my magic topic\n##{Discourse.base_url}#{staged_user_post.url}",
+      )
 
       staged_user.reload
       expect(
@@ -1061,6 +1150,20 @@ RSpec.describe PostAlerter do
         params: [user, type, post, { revision_number: 1 }],
       )
     end
+
+    it "applies modifiers to notification_data" do
+      Plugin::Instance
+        .new
+        .register_modifier(:notification_data) do |notification_data|
+          notification_data[:silly_key] = "silly value"
+          notification_data
+        end
+
+      notification = PostAlerter.new.create_notification(user, type, post)
+      expect(notification.data_hash[:silly_key]).to eq("silly value")
+
+      DiscoursePluginRegistry.clear_modifiers!
+    end
   end
 
   describe ".push_notification" do
@@ -1238,6 +1341,18 @@ RSpec.describe PostAlerter do
         expect(Jobs::SendPushNotification.jobs[0]["at"]).not_to be_nil
       end
 
+      it "delays sending push notification for active online user for the correct delay ammount" do
+        evil_trout.update!(last_seen_at: 5.minutes.ago)
+
+        # SiteSetting.push_notification_time_window_mins is 10
+        # last_seen_at is 5 minutes ago
+        # 10 minutes from now - 5 minutes ago = 5 minutes
+        delay = 5.minutes.from_now.to_f
+
+        expect { mention_post }.to change { Jobs::SendPushNotification.jobs.count }
+        expect(Jobs::SendPushNotification.jobs[0]["at"]).to be_within(30.second).of(delay)
+      end
+
       it "does not delay push notification for inactive offline user" do
         evil_trout.update!(last_seen_at: 40.minutes.ago)
 
@@ -1392,6 +1507,17 @@ RSpec.describe PostAlerter do
       )
     end
 
+    it "does not notify admins when suppress_secured_categories_from_admin is enabled" do
+      SiteSetting.suppress_secured_categories_from_admin = true
+
+      topic = Fabricate(:topic, category: private_category)
+      post = Fabricate(:post, raw: "hello @#{admin.username} how are you today?", topic: topic)
+
+      PostAlerter.post_created(post)
+
+      expect(admin.notifications.count).to eq(0)
+    end
+
     it "doesn't notify regular user about whispered reply" do
       _post = Fabricate(:post, user: user, topic: topic)
 
@@ -1639,14 +1765,6 @@ RSpec.describe PostAlerter do
         group.add(group_member)
         group.add(staged_member)
 
-        private_category =
-          Fabricate(
-            :private_category,
-            group: group,
-            email_in: "test@test.com",
-            email_in_allow_strangers: false,
-          )
-
         level = CategoryUser.notification_levels[:watching]
         CategoryUser.set_notification_level_for_category(group_member, level, private_category.id)
         CategoryUser.set_notification_level_for_category(staged_member, level, private_category.id)
@@ -1753,6 +1871,123 @@ RSpec.describe PostAlerter do
       end
     end
 
+    context "with category and tags" do
+      fab!(:muted_category) do
+        Fabricate(:category).tap do |category|
+          CategoryUser.set_notification_level_for_category(
+            user,
+            CategoryUser.notification_levels[:muted],
+            category.id,
+          )
+        end
+      end
+      fab!(:muted_tag) do
+        Fabricate(:tag).tap do |tag|
+          TagUser.create!(
+            user: user,
+            tag: tag,
+            notification_level: TagUser.notification_levels[:muted],
+          )
+        end
+      end
+      fab!(:watched_tag) do
+        Fabricate(:tag).tap do |tag|
+          TagUser.create!(
+            user: user,
+            tag: tag,
+            notification_level: TagUser.notification_levels[:watching],
+          )
+        end
+      end
+      fab!(:topic_with_muted_tag_and_watched_category) do
+        Fabricate(:topic, category: category, tags: [muted_tag])
+      end
+      fab!(:topic_with_muted_category_and_watched_tag) do
+        Fabricate(:topic, category: muted_category, tags: [watched_tag])
+      end
+      fab!(:directly_watched_topic) do
+        Fabricate(:topic, category: muted_category, tags: [muted_tag])
+      end
+      fab!(:topic_user) do
+        Fabricate(
+          :topic_user,
+          topic: directly_watched_topic,
+          user: user,
+          notification_level: TopicUser.notification_levels[:watching],
+        )
+      end
+      fab!(:topic_with_watched_category) { Fabricate(:topic, category: category) }
+      fab!(:post) { Fabricate(:post, topic: topic_with_muted_tag_and_watched_category) }
+      fab!(:post_2) { Fabricate(:post, topic: topic_with_muted_category_and_watched_tag) }
+      fab!(:post_3) { Fabricate(:post, topic: topic_with_watched_category) }
+      fab!(:post_4) { Fabricate(:post, topic: directly_watched_topic) }
+
+      before do
+        CategoryUser.set_notification_level_for_category(
+          user,
+          CategoryUser.notification_levels[:watching],
+          category.id,
+        )
+      end
+
+      it "adds notification when watched_precedence_over_muted setting is true" do
+        SiteSetting.watched_precedence_over_muted = true
+        expect {
+          PostAlerter.post_created(topic_with_muted_tag_and_watched_category.posts.first)
+        }.to change { Notification.count }.by(1)
+        expect {
+          PostAlerter.post_created(topic_with_muted_category_and_watched_tag.posts.first)
+        }.to change { Notification.count }.by(1)
+        expect { PostAlerter.post_created(directly_watched_topic.posts.first) }.to change {
+          Notification.count
+        }.by(1)
+      end
+
+      it "respects user option even if watched_precedence_over_muted site setting is true" do
+        SiteSetting.watched_precedence_over_muted = true
+        user.user_option.update!(watched_precedence_over_muted: false)
+        expect {
+          PostAlerter.post_created(topic_with_muted_tag_and_watched_category.posts.first)
+        }.not_to change { Notification.count }
+        expect {
+          PostAlerter.post_created(topic_with_muted_category_and_watched_tag.posts.first)
+        }.not_to change { Notification.count }
+        expect { PostAlerter.post_created(directly_watched_topic.posts.first) }.to change {
+          Notification.count
+        }.by(1)
+      end
+
+      it "does not add notification when watched_precedence_over_muted setting is false" do
+        SiteSetting.watched_precedence_over_muted = false
+        expect {
+          PostAlerter.post_created(topic_with_muted_tag_and_watched_category.posts.first)
+        }.not_to change { Notification.count }
+        expect {
+          PostAlerter.post_created(topic_with_muted_category_and_watched_tag.posts.first)
+        }.not_to change { Notification.count }
+        expect { PostAlerter.post_created(topic_with_watched_category.posts.first) }.to change {
+          Notification.count
+        }.by(1)
+        expect { PostAlerter.post_created(directly_watched_topic.posts.first) }.to change {
+          Notification.count
+        }.by(1)
+      end
+
+      it "respects user option even if watched_precedence_over_muted site setting is false" do
+        SiteSetting.watched_precedence_over_muted = false
+        user.user_option.update!(watched_precedence_over_muted: true)
+        expect {
+          PostAlerter.post_created(topic_with_muted_tag_and_watched_category.posts.first)
+        }.to change { Notification.count }.by(1)
+        expect {
+          PostAlerter.post_created(topic_with_muted_category_and_watched_tag.posts.first)
+        }.to change { Notification.count }.by(1)
+        expect { PostAlerter.post_created(directly_watched_topic.posts.first) }.to change {
+          Notification.count
+        }.by(1)
+      end
+    end
+
     context "with on change" do
       fab!(:user) { Fabricate(:user) }
       fab!(:other_tag) { Fabricate(:tag) }
diff --git a/spec/services/post_bookmarkable_spec.rb b/spec/services/post_bookmarkable_spec.rb
index 94fed97f9af..dbd1d8855ca 100644
--- a/spec/services/post_bookmarkable_spec.rb
+++ b/spec/services/post_bookmarkable_spec.rb
@@ -3,10 +3,13 @@
 require "rails_helper"
 
 RSpec.describe PostBookmarkable do
+  subject(:registered_bookmarkable) { RegisteredBookmarkable.new(PostBookmarkable) }
+
   fab!(:user) { Fabricate(:user) }
-  let(:guardian) { Guardian.new(user) }
   fab!(:private_category) { Fabricate(:private_category, group: Fabricate(:group)) }
 
+  let(:guardian) { Guardian.new(user) }
+
   let!(:post1) { Fabricate(:post) }
   let!(:post2) { Fabricate(:post) }
   let!(:bookmark1) do
@@ -17,23 +20,25 @@ RSpec.describe PostBookmarkable do
   let!(:topic_user1) { Fabricate(:topic_user, user: user, topic: post1.topic) }
   let!(:topic_user2) { Fabricate(:topic_user, user: user, topic: post2.topic) }
 
-  subject { RegisteredBookmarkable.new(PostBookmarkable) }
-
   describe "#perform_list_query" do
     it "returns all the user's bookmarks" do
-      expect(subject.perform_list_query(user, guardian).map(&:id)).to match_array(
+      expect(registered_bookmarkable.perform_list_query(user, guardian).map(&:id)).to match_array(
         [bookmark1.id, bookmark2.id],
       )
     end
 
     it "does not return bookmarks for posts where the user does not have access to the topic category" do
       bookmark1.bookmarkable.topic.update(category: private_category)
-      expect(subject.perform_list_query(user, guardian).map(&:id)).to match_array([bookmark2.id])
+      expect(registered_bookmarkable.perform_list_query(user, guardian).map(&:id)).to match_array(
+        [bookmark2.id],
+      )
     end
 
     it "does not return bookmarks for posts where the user does not have access to the private message" do
       bookmark1.bookmarkable.update(topic: Fabricate(:private_message_topic))
-      expect(subject.perform_list_query(user, guardian).map(&:id)).to match_array([bookmark2.id])
+      expect(registered_bookmarkable.perform_list_query(user, guardian).map(&:id)).to match_array(
+        [bookmark2.id],
+      )
     end
   end
 
@@ -43,8 +48,8 @@ RSpec.describe PostBookmarkable do
     it "returns bookmarks that match by name" do
       ts_query = Search.ts_query(term: "gotta", ts_config: "simple")
       expect(
-        subject.perform_search_query(
-          subject.perform_list_query(user, guardian),
+        registered_bookmarkable.perform_search_query(
+          registered_bookmarkable.perform_list_query(user, guardian),
           "%gotta%",
           ts_query,
         ).map(&:id),
@@ -57,8 +62,8 @@ RSpec.describe PostBookmarkable do
 
       ts_query = Search.ts_query(term: "post content", ts_config: "simple")
       expect(
-        subject.perform_search_query(
-          subject.perform_list_query(user, guardian),
+        registered_bookmarkable.perform_search_query(
+          registered_bookmarkable.perform_list_query(user, guardian),
           "%post content%",
           ts_query,
         ).map(&:id),
@@ -66,8 +71,8 @@ RSpec.describe PostBookmarkable do
 
       ts_query = Search.ts_query(term: "great topic", ts_config: "simple")
       expect(
-        subject.perform_search_query(
-          subject.perform_list_query(user, guardian),
+        registered_bookmarkable.perform_search_query(
+          registered_bookmarkable.perform_list_query(user, guardian),
           "%great topic%",
           ts_query,
         ).map(&:id),
@@ -75,8 +80,8 @@ RSpec.describe PostBookmarkable do
 
       ts_query = Search.ts_query(term: "blah", ts_config: "simple")
       expect(
-        subject.perform_search_query(
-          subject.perform_list_query(user, guardian),
+        registered_bookmarkable.perform_search_query(
+          registered_bookmarkable.perform_list_query(user, guardian),
           "%blah%",
           ts_query,
         ).map(&:id),
@@ -86,23 +91,23 @@ RSpec.describe PostBookmarkable do
 
   describe "#can_send_reminder?" do
     it "cannot send reminder if the post or topic is deleted" do
-      expect(subject.can_send_reminder?(bookmark1)).to eq(true)
+      expect(registered_bookmarkable.can_send_reminder?(bookmark1)).to eq(true)
       bookmark1.bookmarkable.trash!
       bookmark1.reload
-      expect(subject.can_send_reminder?(bookmark1)).to eq(false)
+      expect(registered_bookmarkable.can_send_reminder?(bookmark1)).to eq(false)
       Post.with_deleted.find_by(id: bookmark1.bookmarkable_id).recover!
       bookmark1.reload
       bookmark1.bookmarkable.topic.trash!
       bookmark1.reload
-      expect(subject.can_send_reminder?(bookmark1)).to eq(false)
+      expect(registered_bookmarkable.can_send_reminder?(bookmark1)).to eq(false)
     end
   end
 
   describe "#reminder_handler" do
     it "creates a notification for the user with the correct details" do
-      expect { subject.send_reminder_notification(bookmark1) }.to change { Notification.count }.by(
-        1,
-      )
+      expect { registered_bookmarkable.send_reminder_notification(bookmark1) }.to change {
+        Notification.count
+      }.by(1)
       notif = user.notifications.last
       expect(notif.notification_type).to eq(Notification.types[:bookmark_reminder])
       expect(notif.topic_id).to eq(bookmark1.bookmarkable.topic_id)
@@ -121,11 +126,11 @@ RSpec.describe PostBookmarkable do
 
   describe "#can_see?" do
     it "returns false if the post is in a private category or private message the user cannot see" do
-      expect(subject.can_see?(guardian, bookmark1)).to eq(true)
+      expect(registered_bookmarkable.can_see?(guardian, bookmark1)).to eq(true)
       bookmark1.bookmarkable.topic.update(category: private_category)
-      expect(subject.can_see?(guardian, bookmark1)).to eq(false)
+      expect(registered_bookmarkable.can_see?(guardian, bookmark1)).to eq(false)
       bookmark1.bookmarkable.update(topic: Fabricate(:private_message_topic))
-      expect(subject.can_see?(guardian, bookmark1)).to eq(false)
+      expect(registered_bookmarkable.can_see?(guardian, bookmark1)).to eq(false)
     end
   end
 end
diff --git a/spec/services/post_owner_changer_spec.rb b/spec/services/post_owner_changer_spec.rb
index 70eb1bb3808..ecf44e8c41e 100644
--- a/spec/services/post_owner_changer_spec.rb
+++ b/spec/services/post_owner_changer_spec.rb
@@ -171,6 +171,15 @@ RSpec.describe PostOwnerChanger do
     end
 
     context "with integration tests" do
+      subject(:change_owners) do
+        PostOwnerChanger.new(
+          post_ids: [p1.id, p2.id],
+          topic_id: topic.id,
+          new_owner: user_a,
+          acting_user: editor,
+        ).change_owner!
+      end
+
       let(:p1user) { p1.user }
       let(:p2user) { p2.user }
 
@@ -209,15 +218,6 @@ RSpec.describe PostOwnerChanger do
         UserActionManager.enable
       end
 
-      subject(:change_owners) do
-        PostOwnerChanger.new(
-          post_ids: [p1.id, p2.id],
-          topic_id: topic.id,
-          new_owner: user_a,
-          acting_user: editor,
-        ).change_owner!
-      end
-
       it "updates users' topic and post counts" do
         PostActionCreator.like(p2user, p1)
         expect(p1user.user_stat.reload.likes_received).to eq(1)
diff --git a/spec/services/search_indexer_spec.rb b/spec/services/search_indexer_spec.rb
index 75a9e4442eb..f784fcd83cb 100644
--- a/spec/services/search_indexer_spec.rb
+++ b/spec/services/search_indexer_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe SearchIndexer do
 
   it "extract youtube title" do
     html =
-      "<div class=\"lazyYT\" data-youtube-id=\"lmFgeFh2nlw\" data-youtube-title=\"Metallica Mixer Explains Missing Bass on 'And Justice for All' [Exclusive]\" data-width=\"480\" data-height=\"270\" data-parameters=\"feature=oembed&amp;wmode=opaque\"></div>"
+      "<div class=\"lazy-video-container\" data-video-id=\"lmFgeFh2nlw\" data-video-title=\"Metallica Mixer Explains Missing Bass on 'And Justice for All' [Exclusive]\" data-provider-name=\"youtube\"></div>"
     scrubbed = SearchIndexer::HtmlScrubber.scrub(html)
     expect(scrubbed).to eq(
       "Metallica Mixer Explains Missing Bass on 'And Justice for All' [Exclusive]",
@@ -139,6 +139,24 @@ RSpec.describe SearchIndexer do
       }
     end
 
+    it "should work with edge case domain names" do
+      # 00E5A4 stems to 00e5 and a4, which is odd, but by-design
+      # this may cause internal indexing to fail due to indexes not aligning
+      # when stuffing terms for domains
+      post.update!(cooked: <<~HTML)
+        Test.00E5A4.1
+      HTML
+
+      SearchIndexer.update_posts_index(
+        post_id: post.id,
+        topic_title: post.topic.title,
+        category_name: post.topic.category&.name,
+        topic_tags: post.topic.tags.map(&:name).join(" "),
+        cooked: post.cooked,
+        private_message: post.topic.private_message?,
+      )
+    end
+
     it "should work with invalid HTML" do
       post.update!(cooked: "<FD>" * Nokogiri::Gumbo::DEFAULT_MAX_TREE_DEPTH)
 
@@ -169,8 +187,8 @@ RSpec.describe SearchIndexer do
 
       expect(post.post_search_data.raw_data).to eq("https://meta.discourse.org/some.png")
 
-      expect(post.post_search_data.search_data).to eq(
-        "'/some.png':12 'discourse.org':11 'meta.discourse.org':11 'meta.discourse.org/some.png':10 'org':11 'test':8A 'titl':4A 'uncategor':9B",
+      expect(post.post_search_data.search_data).to eq_ts_vector(
+        "'/some.png':12 'discourse.org':11 'meta.discourse.org':11 'meta.discourse.org/some.png':10 'org':11 'test':8A 'titl':4A 'uncategor':9B 'meta':11 'discours':11",
       )
     end
 
@@ -194,8 +212,8 @@ RSpec.describe SearchIndexer do
       topic = Fabricate(:topic, category: category, title: "this is a test topic")
 
       post = Fabricate(:post, topic: topic, raw: <<~RAW)
-      a https://abc.com?bob=1, http://efg.com.au?bill=1 b hij.net/xyz=1
-      www.klm.net/?IGNORE=1 <a href="http://abc.de.nop.co.uk?IGNORE=1&ignore2=2">test</a>
+      a https://car.com?bob=1, http://efg.com.au?bill=1 b hij.net/xyz=1
+      www.klm.net/?IGNORE=1 <a href="http://abc.de.nop.co.uk?IGNORE=1&ignore2=2">test</a> https://cars.com
       RAW
 
       post.rebake!
@@ -208,11 +226,11 @@ RSpec.describe SearchIndexer do
       # more context to say "hey, this part of <a href>...</a> was a guess by autolinker.
       # A blanket treating of non-urls without this logic is risky.
       expect(post.post_search_data.raw_data).to eq(
-        "a https://abc.com , http://efg.com.au b http://hij.net/xyz=1 hij.net/xyz=1 http://www.klm.net/ www.klm.net/?IGNORE=1 http://abc.de.nop.co.uk test",
+        "a https://car.com , http://efg.com.au b http://hij.net/xyz=1 hij.net/xyz=1 http://www.klm.net/ www.klm.net/?IGNORE=1 http://abc.de.nop.co.uk test https://cars.com",
       )
 
-      expect(post.post_search_data.search_data).to eq(
-        "'/?ignore=1':21 '/xyz=1':14,17 'abc.com':9 'abc.de.nop.co.uk':22 'au':10 'awesom':6B 'b':11 'categori':7B 'co.uk':22 'com':9 'com.au':10 'de.nop.co.uk':22 'efg.com.au':10 'hij.net':13,16 'hij.net/xyz=1':12,15 'klm.net':18,20 'net':13,16,18,20 'nop.co.uk':22 'test':4A,23 'topic':5A 'uk':22 'www.klm.net':18,20 'www.klm.net/?ignore=1':19",
+      expect(post.post_search_data.search_data).to eq_ts_vector(
+        "'/?ignore=1':21 '/xyz=1':14,17 'car.com':9 'cars.com':24 'abc.de.nop.co.uk':22 'au':10 'awesom':6B 'b':11 'categori':7B 'co.uk':22 'com':9,10,24 'com.au':10 'de.nop.co.uk':22 'efg.com.au':10 'hij.net':13,16 'hij.net/xyz=1':12,15 'klm.net':18,20 'net':13,16,18,20 'nop.co.uk':22 'test':4A,23 'topic':5A 'uk':22 'www.klm.net':18,20 'www.klm.net/?ignore=1':19 'car':9,24 'co':22 'de':22 'efg':10 'hij':13,16 'klm':18,20 'nop':22 'www':18,20 'abc':22",
       )
     end
 
@@ -260,8 +278,8 @@ RSpec.describe SearchIndexer do
         "link to an external page: https://google.com/ link to an audio file: #{I18n.t("search.audio")} link to a video file: #{I18n.t("search.video")} link to an invalid URL: http:error]",
       )
 
-      expect(post.post_search_data.search_data).to eq(
-        "'/audio.m4a':23 '/content/somethingelse.mov':31 'audio':19 'com':15,22,30 'error':38 'extern':13 'file':20,28 'google.com':15 'http':37 'invalid':35 'link':10,16,24,32 'page':14 'somesite.com':22,30 'somesite.com/audio.m4a':21 'somesite.com/content/somethingelse.mov':29 'test':8A 'titl':4A 'uncategor':9B 'url':36 'video':27",
+      expect(post.post_search_data.search_data).to eq_ts_vector(
+        "'/audio.m4a':23 '/content/somethingelse.mov':31 'audio':19 'com':15,22,30 'error':38 'extern':13 'file':20,28 'google.com':15 'http':37 'invalid':35 'link':10,16,24,32 'page':14 'somesite.com':22,30 'somesite.com/audio.m4a':21 'somesite.com/content/somethingelse.mov':29 'test':8A 'titl':4A 'uncategor':9B 'url':36 'video':27 'googl':15 'somesit':22,30",
       )
     end
 
@@ -303,6 +321,26 @@ RSpec.describe SearchIndexer do
         "unca",
       )
     end
+
+    it "limits number of repeated terms when max_duplicate_search_index_terms site setting has been configured" do
+      SiteSetting.max_duplicate_search_index_terms = 5
+
+      contents = <<~TEXT
+        #{"sam " * 10}
+        <a href="https://something.com/path:path'path?term='hello'">url</a>
+        <a href="https://somethings.com/path:path'path?term='hello'">url</a>
+      TEXT
+
+      post.update!(raw: contents)
+
+      post_search_data = post.post_search_data
+      post_search_data.reload
+
+      terms =
+        "'/path:path''path':22,26 'com':21,25 'sam':10,11,12,13,14 'something.com':21 'something.com/path:path''path':20 'test':8A 'titl':4A 'uncategor':9B 'url':23,27 'someth':21,25 'somethings.com':25 'somethings.com/path:path''path':24"
+
+      expect(post_search_data.search_data).to eq_ts_vector(terms)
+    end
   end
 
   describe ".queue_post_reindex" do
diff --git a/spec/services/sidebar_site_settings_backfiller_spec.rb b/spec/services/sidebar_site_settings_backfiller_spec.rb
index 872a378964b..6a3717f6ca0 100644
--- a/spec/services/sidebar_site_settings_backfiller_spec.rb
+++ b/spec/services/sidebar_site_settings_backfiller_spec.rb
@@ -59,11 +59,11 @@ RSpec.describe SidebarSiteSettingsBackfiller do
   end
 
   describe "#backfill!" do
-    context "for default_sidebar_categories setting" do
+    context "for default_navigation_menu_categories setting" do
       it "deletes the right sidebar section link records when categories are removed" do
         backfiller =
           described_class.new(
-            "default_sidebar_categories",
+            "default_navigation_menu_categories",
             previous_value: "#{category.id}|#{category2.id}|#{category3.id}",
             new_value: "#{category3.id}",
           )
@@ -76,7 +76,7 @@ RSpec.describe SidebarSiteSettingsBackfiller do
       it "creates the right sidebar section link records when categories are added" do
         backfiller =
           described_class.new(
-            "default_sidebar_categories",
+            "default_navigation_menu_categories",
             previous_value: "#{category.id}|#{category2.id}",
             new_value: "#{category.id}|#{category2.id}|#{category3.id}",
           )
@@ -93,7 +93,7 @@ RSpec.describe SidebarSiteSettingsBackfiller do
       it "creates the right sidebar section link records when categories are added" do
         backfiller =
           described_class.new(
-            "default_sidebar_categories",
+            "default_navigation_menu_categories",
             previous_value: "",
             new_value: "#{category.id}|#{category2.id}|#{category3.id}",
           )
@@ -122,7 +122,7 @@ RSpec.describe SidebarSiteSettingsBackfiller do
       it "deletes and creates the right sidebar section link records when categories are added and removed" do
         backfiller =
           described_class.new(
-            "default_sidebar_categories",
+            "default_navigation_menu_categories",
             previous_value: "#{category.id}|#{category2.id}",
             new_value: "#{category3.id}",
           )
@@ -150,11 +150,11 @@ RSpec.describe SidebarSiteSettingsBackfiller do
       end
     end
 
-    context "for default_sidebar_tags setting" do
+    context "for default_navigation_menu_tags setting" do
       it "deletes the right sidebar section link records when tags are removed" do
         backfiller =
           described_class.new(
-            "default_sidebar_tags",
+            "default_navigation_menu_tags",
             previous_value: "#{tag.name}|#{tag2.name}|#{tag3.name}",
             new_value: "#{tag3.name}",
           )
@@ -167,7 +167,7 @@ RSpec.describe SidebarSiteSettingsBackfiller do
       it "creates the right sidebar section link records when tags are added" do
         backfiller =
           described_class.new(
-            "default_sidebar_tags",
+            "default_navigation_menu_tags",
             previous_value: "#{tag.name}|#{tag2.name}",
             new_value: "#{tag.name}|#{tag2.name}|#{tag3.name}",
           )
@@ -182,7 +182,7 @@ RSpec.describe SidebarSiteSettingsBackfiller do
       it "deletes and creates the right sidebar section link records when tags are added and removed" do
         backfiller =
           described_class.new(
-            "default_sidebar_tags",
+            "default_navigation_menu_tags",
             previous_value: "#{tag.name}|#{tag2.name}",
             new_value: "#{tag3.name}",
           )
@@ -207,11 +207,11 @@ RSpec.describe SidebarSiteSettingsBackfiller do
   end
 
   describe "#number_of_users_to_backfill" do
-    context "for default_sidebar_categories setting" do
+    context "for default_navigation_menu_categories setting" do
       it "returns 3 for the user count when a new category for all users is added" do
         backfiller =
           described_class.new(
-            "default_sidebar_categories",
+            "default_navigation_menu_categories",
             previous_value: "",
             new_value: "#{category3.id}",
           )
@@ -222,7 +222,7 @@ RSpec.describe SidebarSiteSettingsBackfiller do
       it "returns 2 for the user count when category which 2 users have configured in sidebar is removed" do
         backfiller =
           described_class.new(
-            "default_sidebar_categories",
+            "default_navigation_menu_categories",
             previous_value: "#{category.id}|#{category2.id}",
             new_value: "#{category2.id}",
           )
@@ -234,7 +234,7 @@ RSpec.describe SidebarSiteSettingsBackfiller do
       it "returns 3 for the user count when a new category is added and a category is removed" do
         backfiller =
           described_class.new(
-            "default_sidebar_categories",
+            "default_navigation_menu_categories",
             previous_value: "#{category.id}|#{category2.id}",
             new_value: "#{category2.id}|#{category3.id}",
           )
@@ -244,16 +244,24 @@ RSpec.describe SidebarSiteSettingsBackfiller do
 
       it "returns 0 for the user count when no new category is added or removed" do
         backfiller =
-          described_class.new("default_sidebar_categories", previous_value: "", new_value: "")
+          described_class.new(
+            "default_navigation_menu_categories",
+            previous_value: "",
+            new_value: "",
+          )
 
         expect(backfiller.number_of_users_to_backfill).to eq(0)
       end
     end
 
-    context "for default_sidebar_tags setting" do
+    context "for default_navigation_menu_tags setting" do
       it "returns 3 for the user count when a new tag for all users is added" do
         backfiller =
-          described_class.new("default_sidebar_tags", previous_value: "", new_value: "#{tag3.name}")
+          described_class.new(
+            "default_navigation_menu_tags",
+            previous_value: "",
+            new_value: "#{tag3.name}",
+          )
 
         expect(backfiller.number_of_users_to_backfill).to eq(3)
       end
@@ -262,7 +270,7 @@ RSpec.describe SidebarSiteSettingsBackfiller do
       it "returns 2 for the user count when tag which 2 users have configured in sidebar is removed" do
         backfiller =
           described_class.new(
-            "default_sidebar_tags",
+            "default_navigation_menu_tags",
             previous_value: "#{tag.name}|#{tag2.name}",
             new_value: "#{tag2.name}",
           )
@@ -274,7 +282,7 @@ RSpec.describe SidebarSiteSettingsBackfiller do
       it "returns 3 for the user count when a new tag is added and a tag is removed" do
         backfiller =
           described_class.new(
-            "default_sidebar_tags",
+            "default_navigation_menu_tags",
             previous_value: "#{tag.name}|#{tag2.name}",
             new_value: "#{tag2.name}|#{tag3.name}",
           )
diff --git a/spec/services/staff_action_logger_spec.rb b/spec/services/staff_action_logger_spec.rb
index 2f535b410f2..b1a9cfa660e 100644
--- a/spec/services/staff_action_logger_spec.rb
+++ b/spec/services/staff_action_logger_spec.rb
@@ -15,10 +15,10 @@ RSpec.describe StaffActionLogger do
   end
 
   describe "log_user_deletion" do
-    fab!(:deleted_user) { Fabricate(:user) }
-
     subject(:log_user_deletion) { described_class.new(admin).log_user_deletion(deleted_user) }
 
+    fab!(:deleted_user) { Fabricate(:user) }
+
     it "raises an error when user is nil" do
       expect { logger.log_user_deletion(nil) }.to raise_error(Discourse::InvalidParameters)
     end
@@ -47,10 +47,10 @@ RSpec.describe StaffActionLogger do
   end
 
   describe "log_post_deletion" do
-    fab!(:deleted_post) { Fabricate(:post) }
-
     subject(:log_post_deletion) { described_class.new(admin).log_post_deletion(deleted_post) }
 
+    fab!(:deleted_post) { Fabricate(:post) }
+
     it "raises an error when post is nil" do
       expect { logger.log_post_deletion(nil) }.to raise_error(Discourse::InvalidParameters)
     end
@@ -116,14 +116,15 @@ RSpec.describe StaffActionLogger do
   end
 
   describe "log_trust_level_change" do
-    fab!(:user) { Fabricate(:user) }
-    let(:old_trust_level) { TrustLevel[0] }
-    let(:new_trust_level) { TrustLevel[1] }
-
     subject(:log_trust_level_change) do
       described_class.new(admin).log_trust_level_change(user, old_trust_level, new_trust_level)
     end
 
+    fab!(:user) { Fabricate(:user) }
+
+    let(:old_trust_level) { TrustLevel[0] }
+    let(:new_trust_level) { TrustLevel[1] }
+
     it "raises an error when user or trust level is nil" do
       expect {
         logger.log_trust_level_change(nil, old_trust_level, new_trust_level)
@@ -371,11 +372,11 @@ RSpec.describe StaffActionLogger do
   end
 
   describe "log_roll_up" do
+    subject(:log_roll_up) { described_class.new(admin).log_roll_up(subnet, ips) }
+
     let(:subnet) { "1.2.3.0/24" }
     let(:ips) { %w[1.2.3.4 1.2.3.100] }
 
-    subject(:log_roll_up) { described_class.new(admin).log_roll_up(subnet, ips) }
-
     it "creates a new UserHistory record" do
       log_record = logger.log_roll_up(subnet, ips)
       expect(log_record).to be_valid
@@ -439,18 +440,18 @@ RSpec.describe StaffActionLogger do
       expect(name_user_history.new_value).to eq("new_name")
     end
 
-    it "does not log permissions changes for category visible to everyone" do
+    it "logs permissions changes even if the category is visible to everyone" do
       attributes = { name: "new_name" }
-      old_permission = category.permissions_params
+      old_permission = { "everyone" => 1 }
       category.update!(attributes)
 
       logger.log_category_settings_change(
         category,
-        attributes.merge(permissions: { "everyone" => 1 }),
+        attributes.merge(permissions: { "trust_level_3" => 1 }),
         old_permissions: old_permission,
       )
 
-      expect(UserHistory.count).to eq(1)
+      expect(UserHistory.count).to eq(2)
       expect(UserHistory.find_by_subject("name").category).to eq(category)
     end
 
@@ -584,12 +585,12 @@ RSpec.describe StaffActionLogger do
   end
 
   describe "log_check_personal_message" do
-    fab!(:personal_message) { Fabricate(:private_message_topic) }
-
     subject(:log_check_personal_message) do
       described_class.new(admin).log_check_personal_message(personal_message)
     end
 
+    fab!(:personal_message) { Fabricate(:private_message_topic) }
+
     it "raises an error when topic is nil" do
       expect { logger.log_check_personal_message(nil) }.to raise_error(Discourse::InvalidParameters)
     end
@@ -604,10 +605,10 @@ RSpec.describe StaffActionLogger do
   end
 
   describe "log_post_approved" do
-    fab!(:approved_post) { Fabricate(:post) }
-
     subject(:log_post_approved) { described_class.new(admin).log_post_approved(approved_post) }
 
+    fab!(:approved_post) { Fabricate(:post) }
+
     it "raises an error when post is nil" do
       expect { logger.log_post_approved(nil) }.to raise_error(Discourse::InvalidParameters)
     end
@@ -622,12 +623,12 @@ RSpec.describe StaffActionLogger do
   end
 
   describe "log_post_rejected" do
-    fab!(:reviewable) { Fabricate(:reviewable_queued_post) }
-
     subject(:log_post_rejected) do
       described_class.new(admin).log_post_rejected(reviewable, DateTime.now)
     end
 
+    fab!(:reviewable) { Fabricate(:reviewable_queued_post) }
+
     it "raises an error when reviewable not supplied" do
       expect { logger.log_post_rejected(nil, DateTime.now) }.to raise_error(
         Discourse::InvalidParameters,
diff --git a/spec/services/tag_hashtag_data_source_spec.rb b/spec/services/tag_hashtag_data_source_spec.rb
index f1475973ac8..a4a30081fda 100644
--- a/spec/services/tag_hashtag_data_source_spec.rb
+++ b/spec/services/tag_hashtag_data_source_spec.rb
@@ -9,6 +9,18 @@ RSpec.describe TagHashtagDataSource do
   fab!(:user) { Fabricate(:user) }
   let(:guardian) { Guardian.new(user) }
 
+  describe "#enabled?" do
+    it "returns false if tagging is disabled" do
+      SiteSetting.tagging_enabled = false
+      expect(described_class.enabled?).to eq(false)
+    end
+
+    it "returns true if tagging is enabled" do
+      SiteSetting.tagging_enabled = true
+      expect(described_class.enabled?).to eq(true)
+    end
+  end
+
   describe "#search" do
     it "orders tag results by exact search match, then public topic count, then name" do
       expect(described_class.search(guardian, "fact", 5).map(&:slug)).to eq(
@@ -37,11 +49,6 @@ RSpec.describe TagHashtagDataSource do
       )
     end
 
-    it "returns nothing if tagging is not enabled" do
-      SiteSetting.tagging_enabled = false
-      expect(described_class.search(guardian, "fact", 5)).to be_empty
-    end
-
     it "returns tags that are children of a TagGroup" do
       parent_tag = Fabricate(:tag, name: "sidebar")
       child_tag = Fabricate(:tag, name: "sidebar-v1")
diff --git a/spec/services/topic_bookmarkable_spec.rb b/spec/services/topic_bookmarkable_spec.rb
index ac2ad2454b4..b5aa7685974 100644
--- a/spec/services/topic_bookmarkable_spec.rb
+++ b/spec/services/topic_bookmarkable_spec.rb
@@ -3,10 +3,13 @@
 require "rails_helper"
 
 RSpec.describe TopicBookmarkable do
+  subject(:registered_bookmarkable) { RegisteredBookmarkable.new(TopicBookmarkable) }
+
   fab!(:user) { Fabricate(:user) }
-  let(:guardian) { Guardian.new(user) }
   fab!(:private_category) { Fabricate(:private_category, group: Fabricate(:group)) }
 
+  let(:guardian) { Guardian.new(user) }
+
   let!(:topic1) { Fabricate(:topic) }
   let!(:topic2) { Fabricate(:topic) }
   let!(:post) { Fabricate(:post, topic: topic1) }
@@ -18,23 +21,25 @@ RSpec.describe TopicBookmarkable do
   let!(:topic_user1) { Fabricate(:topic_user, user: user, topic: topic1) }
   let!(:topic_user2) { Fabricate(:topic_user, user: user, topic: topic2) }
 
-  subject { RegisteredBookmarkable.new(TopicBookmarkable) }
-
   describe "#perform_list_query" do
     it "returns all the user's bookmarks" do
-      expect(subject.perform_list_query(user, guardian).map(&:id)).to match_array(
+      expect(registered_bookmarkable.perform_list_query(user, guardian).map(&:id)).to match_array(
         [bookmark1.id, bookmark2.id],
       )
     end
 
     it "does not return bookmarks for posts where the user does not have access to the topic category" do
       bookmark1.bookmarkable.update!(category: private_category)
-      expect(subject.perform_list_query(user, guardian).map(&:id)).to match_array([bookmark2.id])
+      expect(registered_bookmarkable.perform_list_query(user, guardian).map(&:id)).to match_array(
+        [bookmark2.id],
+      )
     end
 
     it "does not return bookmarks for posts where the user does not have access to the private message" do
       bookmark1.update!(bookmarkable: Fabricate(:private_message_topic))
-      expect(subject.perform_list_query(user, guardian).map(&:id)).to match_array([bookmark2.id])
+      expect(registered_bookmarkable.perform_list_query(user, guardian).map(&:id)).to match_array(
+        [bookmark2.id],
+      )
     end
   end
 
@@ -44,8 +49,8 @@ RSpec.describe TopicBookmarkable do
     it "returns bookmarks that match by name" do
       ts_query = Search.ts_query(term: "gotta", ts_config: "simple")
       expect(
-        subject.perform_search_query(
-          subject.perform_list_query(user, guardian),
+        registered_bookmarkable.perform_search_query(
+          registered_bookmarkable.perform_list_query(user, guardian),
           "%gotta%",
           ts_query,
         ).map(&:id),
@@ -58,8 +63,8 @@ RSpec.describe TopicBookmarkable do
 
       ts_query = Search.ts_query(term: "post content", ts_config: "simple")
       expect(
-        subject.perform_search_query(
-          subject.perform_list_query(user, guardian),
+        registered_bookmarkable.perform_search_query(
+          registered_bookmarkable.perform_list_query(user, guardian),
           "%post content%",
           ts_query,
         ).map(&:id),
@@ -67,8 +72,8 @@ RSpec.describe TopicBookmarkable do
 
       ts_query = Search.ts_query(term: "great topic", ts_config: "simple")
       expect(
-        subject.perform_search_query(
-          subject.perform_list_query(user, guardian),
+        registered_bookmarkable.perform_search_query(
+          registered_bookmarkable.perform_list_query(user, guardian),
           "%great topic%",
           ts_query,
         ).map(&:id),
@@ -76,8 +81,8 @@ RSpec.describe TopicBookmarkable do
 
       ts_query = Search.ts_query(term: "blah", ts_config: "simple")
       expect(
-        subject.perform_search_query(
-          subject.perform_list_query(user, guardian),
+        registered_bookmarkable.perform_search_query(
+          registered_bookmarkable.perform_list_query(user, guardian),
           "%blah%",
           ts_query,
         ).map(&:id),
@@ -87,18 +92,18 @@ RSpec.describe TopicBookmarkable do
 
   describe "#can_send_reminder?" do
     it "cannot send reminder if the topic is deleted" do
-      expect(subject.can_send_reminder?(bookmark1)).to eq(true)
+      expect(registered_bookmarkable.can_send_reminder?(bookmark1)).to eq(true)
       bookmark1.bookmarkable.trash!
       bookmark1.reload
-      expect(subject.can_send_reminder?(bookmark1)).to eq(false)
+      expect(registered_bookmarkable.can_send_reminder?(bookmark1)).to eq(false)
     end
   end
 
   describe "#reminder_handler" do
     it "creates a notification for the user with the correct details" do
-      expect { subject.send_reminder_notification(bookmark1) }.to change { Notification.count }.by(
-        1,
-      )
+      expect { registered_bookmarkable.send_reminder_notification(bookmark1) }.to change {
+        Notification.count
+      }.by(1)
       notif = user.notifications.last
       expect(notif.notification_type).to eq(Notification.types[:bookmark_reminder])
       expect(notif.topic_id).to eq(bookmark1.bookmarkable_id)
@@ -117,11 +122,11 @@ RSpec.describe TopicBookmarkable do
 
   describe "#can_see?" do
     it "returns false if the post is in a private category or private message the user cannot see" do
-      expect(subject.can_see?(guardian, bookmark1)).to eq(true)
+      expect(registered_bookmarkable.can_see?(guardian, bookmark1)).to eq(true)
       bookmark1.bookmarkable.update!(category: private_category)
-      expect(subject.can_see?(guardian, bookmark1)).to eq(false)
+      expect(registered_bookmarkable.can_see?(guardian, bookmark1)).to eq(false)
       bookmark1.update!(bookmarkable: Fabricate(:private_message_topic))
-      expect(subject.can_see?(guardian, bookmark1)).to eq(false)
+      expect(registered_bookmarkable.can_see?(guardian, bookmark1)).to eq(false)
     end
   end
 end
diff --git a/spec/services/topic_summarization_spec.rb b/spec/services/topic_summarization_spec.rb
new file mode 100644
index 00000000000..00ff67c183e
--- /dev/null
+++ b/spec/services/topic_summarization_spec.rb
@@ -0,0 +1,190 @@
+# frozen_string_literal: true
+
+describe TopicSummarization do
+  fab!(:topic) { Fabricate(:topic) }
+  fab!(:user) { Fabricate(:admin) }
+  fab!(:post_1) { Fabricate(:post, topic: topic) }
+  fab!(:post_2) { Fabricate(:post, topic: topic) }
+
+  shared_examples "includes only public-visible topics" do
+    subject { described_class.new(DummyCustomSummarization.new({})) }
+
+    it "only includes visible posts" do
+      topic.first_post.update!(hidden: true)
+
+      posts = subject.summary_targets(topic)
+
+      expect(posts.none?(&:hidden?)).to eq(true)
+    end
+
+    it "doesn't include posts without users" do
+      topic.first_post.user.destroy!
+
+      posts = subject.summary_targets(topic)
+
+      expect(posts.detect { |p| p.id == topic.first_post.id }).to be_nil
+    end
+
+    it "doesn't include deleted posts" do
+      topic.first_post.update!(user_id: nil)
+
+      posts = subject.summary_targets(topic)
+
+      expect(posts.detect { |p| p.id == topic.first_post.id }).to be_nil
+    end
+  end
+
+  describe "#summary_targets" do
+    context "when the topic has a best replies summary" do
+      before { topic.has_summary = true }
+
+      it_behaves_like "includes only public-visible topics"
+    end
+
+    context "when the topic doesn't have a best replies summary" do
+      before { topic.has_summary = false }
+
+      it_behaves_like "includes only public-visible topics"
+    end
+  end
+
+  describe "#summarize" do
+    subject(:summarization) { described_class.new(strategy) }
+
+    let(:strategy) { DummyCustomSummarization.new(summary) }
+
+    def assert_summary_is_cached(topic, summary_response)
+      cached_summary = SummarySection.find_by(target: topic, meta_section_id: nil)
+
+      expect(cached_summary.content_range).to cover(*topic.posts.map(&:post_number))
+      expect(cached_summary.summarized_text).to eq(summary_response[:summary])
+      expect(cached_summary.original_content_sha).to be_present
+      expect(cached_summary.algorithm).to eq(strategy.model)
+    end
+
+    def assert_chunk_is_cached(topic, chunk_response)
+      cached_chunk =
+        SummarySection
+          .where.not(meta_section_id: nil)
+          .find_by(
+            target: topic,
+            content_range: (chunk_response[:ids].min..chunk_response[:ids].max),
+          )
+
+      expect(cached_chunk.summarized_text).to eq(chunk_response[:summary])
+      expect(cached_chunk.original_content_sha).to be_present
+      expect(cached_chunk.algorithm).to eq(strategy.model)
+    end
+
+    context "when the content was summarized in a single chunk" do
+      let(:summary) { { summary: "This is the final summary", chunks: [] } }
+
+      it "caches the summary" do
+        section = summarization.summarize(topic, user)
+
+        expect(section.summarized_text).to eq(summary[:summary])
+
+        assert_summary_is_cached(topic, summary)
+      end
+
+      it "returns the cached version in subsequent calls" do
+        summarization.summarize(topic, user)
+
+        cached_summary_text = "This is a cached summary"
+        cached_summary =
+          SummarySection.find_by(target: topic, meta_section_id: nil).update!(
+            summarized_text: cached_summary_text,
+            updated_at: 24.hours.ago,
+          )
+
+        section = summarization.summarize(topic, user)
+        expect(section.summarized_text).to eq(cached_summary_text)
+      end
+    end
+
+    context "when the content was summarized in multiple chunks" do
+      let(:summary) do
+        {
+          summary: "This is the final summary",
+          chunks: [
+            { ids: [topic.first_post.post_number], summary: "this is the first chunk" },
+            { ids: [post_1.post_number, post_2.post_number], summary: "this is the second chunk" },
+          ],
+        }
+      end
+
+      it "caches the summary and each chunk" do
+        section = summarization.summarize(topic, user)
+
+        expect(section.summarized_text).to eq(summary[:summary])
+
+        assert_summary_is_cached(topic, summary)
+
+        summary[:chunks].each { |c| assert_chunk_is_cached(topic, c) }
+      end
+    end
+
+    describe "invalidating cached summaries" do
+      let(:cached_text) { "This is a cached summary" }
+      let(:summarized_text) { "This is the final summary" }
+      let(:summary) do
+        {
+          summary: summarized_text,
+          chunks: [
+            { ids: [topic.first_post.post_number], summary: "this is the first chunk" },
+            { ids: [post_1.post_number, post_2.post_number], summary: "this is the second chunk" },
+          ],
+        }
+      end
+
+      def cached_summary
+        SummarySection.find_by(target: topic, meta_section_id: nil)
+      end
+
+      before do
+        summarization.summarize(topic, user)
+
+        cached_summary.update!(summarized_text: cached_text, created_at: 24.hours.ago)
+      end
+
+      context "when the user can requests new summaries" do
+        context "when there are no new posts" do
+          it "returns the cached summary" do
+            section = summarization.summarize(topic, user)
+
+            expect(section.summarized_text).to eq(cached_text)
+          end
+        end
+
+        context "when there are new posts" do
+          before { cached_summary.update!(original_content_sha: "outdated_sha") }
+
+          it "returns a new summary" do
+            section = summarization.summarize(topic, user)
+
+            expect(section.summarized_text).to eq(summarized_text)
+          end
+
+          context "when the cached summary is less than one hour old" do
+            before { cached_summary.update!(created_at: 30.minutes.ago) }
+
+            it "returns the cached summary" do
+              cached_summary.update!(created_at: 30.minutes.ago)
+
+              section = summarization.summarize(topic, user)
+
+              expect(section.summarized_text).to eq(cached_text)
+              expect(section.outdated).to eq(true)
+            end
+
+            it "returns a new summary if the skip_age_check flag is passed" do
+              section = summarization.summarize(topic, user, skip_age_check: true)
+
+              expect(section.summarized_text).to eq(summarized_text)
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/services/user_anonymizer_spec.rb b/spec/services/user_anonymizer_spec.rb
index 16c7a141151..d82e2e2c77e 100644
--- a/spec/services/user_anonymizer_spec.rb
+++ b/spec/services/user_anonymizer_spec.rb
@@ -4,11 +4,12 @@ RSpec.describe UserAnonymizer do
   let(:admin) { Fabricate(:admin) }
 
   describe "event" do
-    let(:user) { Fabricate(:user, username: "edward") }
     subject(:make_anonymous) do
       described_class.make_anonymous(user, admin, anonymize_ip: "2.2.2.2")
     end
 
+    let(:user) { Fabricate(:user, username: "edward") }
+
     it "triggers the event" do
       events = DiscourseEvent.track_events { make_anonymous }
 
@@ -22,10 +23,11 @@ RSpec.describe UserAnonymizer do
   end
 
   describe ".make_anonymous" do
+    subject(:make_anonymous) { described_class.make_anonymous(user, admin) }
+
     let(:original_email) { "edward@example.net" }
     let(:user) { Fabricate(:user, username: "edward", email: original_email) }
     fab!(:another_user) { Fabricate(:evil_trout) }
-    subject(:make_anonymous) { described_class.make_anonymous(user, admin) }
 
     it "changes username" do
       make_anonymous
@@ -107,6 +109,15 @@ RSpec.describe UserAnonymizer do
       end
     end
 
+    it "clears existing user status" do
+      user_status = Fabricate(:user_status, user: user)
+
+      expect do
+        make_anonymous
+        user.reload
+      end.to change { user.user_status }.from(user_status).to(nil)
+    end
+
     context "when Site Settings require full name" do
       before { SiteSetting.full_name_required = true }
 
@@ -153,12 +164,12 @@ RSpec.describe UserAnonymizer do
         [/quote]
       RAW
 
-      old_avatar_url = user.avatar_template.gsub("{size}", "40")
+      old_avatar_url = user.avatar_template.gsub("{size}", "48")
       expect(post.cooked).to include(old_avatar_url)
 
       make_anonymous
       post.reload
-      new_avatar_url = user.reload.avatar_template.gsub("{size}", "40")
+      new_avatar_url = user.reload.avatar_template.gsub("{size}", "48")
 
       expect(post.cooked).to_not include(old_avatar_url)
       expect(post.cooked).to include(new_avatar_url)
diff --git a/spec/services/user_destroyer_spec.rb b/spec/services/user_destroyer_spec.rb
index 48210ff932b..46df20a9a75 100644
--- a/spec/services/user_destroyer_spec.rb
+++ b/spec/services/user_destroyer_spec.rb
@@ -75,9 +75,10 @@ RSpec.describe UserDestroyer do
     end
 
     context "when user deletes self" do
-      let(:destroy_opts) { { delete_posts: true, context: "/u/username/preferences/account" } }
       subject(:destroy) { UserDestroyer.new(user).destroy(user, destroy_opts) }
 
+      let(:destroy_opts) { { delete_posts: true, context: "/u/username/preferences/account" } }
+
       include_examples "successfully destroy a user"
 
       it "should log proper context" do
@@ -147,6 +148,7 @@ RSpec.describe UserDestroyer do
 
       context "when delete_posts is false" do
         subject(:destroy) { UserDestroyer.new(admin).destroy(user) }
+
         before do
           user.stubs(:post_count).returns(1)
           user.stubs(:first_post_created_at).returns(Time.zone.now)
@@ -253,18 +255,21 @@ RSpec.describe UserDestroyer do
     end
 
     context "when user has no posts, but user_stats table has post_count > 0" do
+      subject(:destroy) { UserDestroyer.new(user).destroy(user, delete_posts: false) }
+
+      let(:destroy_opts) { {} }
+
       before do
         # out of sync user_stat data shouldn't break UserDestroyer
         user.user_stat.update_attribute(:post_count, 1)
       end
-      let(:destroy_opts) { {} }
-      subject(:destroy) { UserDestroyer.new(user).destroy(user, delete_posts: false) }
 
       include_examples "successfully destroy a user"
     end
 
     context "when user has deleted posts" do
       let!(:deleted_post) { Fabricate(:post, user: user, deleted_at: 1.hour.ago) }
+
       it "should mark the user's deleted posts as belonging to a nuked user" do
         expect { UserDestroyer.new(admin).destroy(user) }.to change { User.count }.by(-1)
         expect(deleted_post.reload.user_id).to eq(nil)
@@ -273,9 +278,10 @@ RSpec.describe UserDestroyer do
 
     context "when user has no posts" do
       context "when destroy succeeds" do
-        let(:destroy_opts) { {} }
         subject(:destroy) { UserDestroyer.new(admin).destroy(user) }
 
+        let(:destroy_opts) { {} }
+
         include_examples "successfully destroy a user"
         include_examples "email block list"
       end
diff --git a/spec/services/user_merger_spec.rb b/spec/services/user_merger_spec.rb
index a38059c728f..9414a984288 100644
--- a/spec/services/user_merger_spec.rb
+++ b/spec/services/user_merger_spec.rb
@@ -233,7 +233,7 @@ RSpec.describe UserMerger do
     [group1, group2, group3].each do |g|
       owner = [group1, group3].include?(g)
       expect(GroupUser.where(group_id: g.id, user_id: target_user.id, owner: owner).count).to eq(1)
-      expect(Group.where(id: g.id).pluck_first(:user_count)).to eq(2)
+      expect(Group.where(id: g.id).pick(:user_count)).to eq(2)
     end
     expect(GroupUser.where(user_id: source_user.id).count).to eq(0)
   end
diff --git a/spec/services/user_silencer_spec.rb b/spec/services/user_silencer_spec.rb
index b637fc6e9db..4a0b548d38e 100644
--- a/spec/services/user_silencer_spec.rb
+++ b/spec/services/user_silencer_spec.rb
@@ -6,9 +6,10 @@ RSpec.describe UserSilencer do
   fab!(:admin) { Fabricate(:admin) }
 
   describe "silence" do
-    let(:silencer) { UserSilencer.new(user) }
     subject(:silence_user) { silencer.silence }
 
+    let(:silencer) { UserSilencer.new(user) }
+
     it "silences the user correctly" do
       expect { UserSilencer.silence(user, admin) }.to change { user.reload.silenced? }
 
diff --git a/spec/services/user_updater_spec.rb b/spec/services/user_updater_spec.rb
index 54de5883b37..7573dd5f99e 100644
--- a/spec/services/user_updater_spec.rb
+++ b/spec/services/user_updater_spec.rb
@@ -46,6 +46,42 @@ RSpec.describe UserUpdater do
       expect(user.reload.name).to eq "Jim Tom"
     end
 
+    describe "the within_user_updater_transaction event" do
+      it "allows plugins to perform additional updates" do
+        update_attributes = { name: "Jimmmy Johnny" }
+        handler =
+          Proc.new do |user, attrs|
+            user.user_profile.update!(bio_raw: "hello world I'm Jimmmy")
+            expect(attrs).to eq(update_attributes)
+          end
+        DiscourseEvent.on(:within_user_updater_transaction, &handler)
+
+        updater = UserUpdater.new(user, user)
+        updater.update(update_attributes)
+
+        expect(user.reload.name).to eq("Jimmmy Johnny")
+        expect(user.user_profile.bio_raw).to eq("hello world I'm Jimmmy")
+      ensure
+        DiscourseEvent.off(:within_user_updater_transaction, &handler)
+      end
+
+      it "can cancel the whole update transaction if a handler raises" do
+        error_class = Class.new(StandardError)
+        handler = Proc.new { raise error_class.new }
+
+        DiscourseEvent.on(:within_user_updater_transaction, &handler)
+
+        old_name = user.name
+        updater = UserUpdater.new(user, user)
+
+        expect { updater.update(name: "Failure McClario") }.to raise_error(error_class)
+
+        expect(user.reload.name).to eq(old_name)
+      ensure
+        DiscourseEvent.off(:within_user_updater_transaction, &handler)
+      end
+    end
+
     it "can update categories and tags" do
       updater = UserUpdater.new(user, user)
       updater.update(watched_tags: "#{tag.name},#{tag2.name}", muted_category_ids: [category.id])
@@ -456,12 +492,12 @@ RSpec.describe UserUpdater do
       context "when badge can be used as a title" do
         before { badge.update(allow_title: true) }
 
-        it "can use as title, sets badge_granted_title" do
+        it "can use as title, sets granted_title_badge_id" do
           BadgeGranter.grant(badge, user)
           updater = UserUpdater.new(user, user)
           updater.update(title: badge.name)
           user.reload
-          expect(user.user_profile.badge_granted_title).to eq(true)
+          expect(user.user_profile.granted_title_badge_id).to eq(badge.id)
         end
 
         it "badge has not been granted, does not change title" do
@@ -470,12 +506,12 @@ RSpec.describe UserUpdater do
           updater.update(title: badge.name)
           user.reload
           expect(user.title).not_to eq(badge.name)
-          expect(user.user_profile.badge_granted_title).to eq(false)
+          expect(user.user_profile.granted_title_badge_id).to be_nil
         end
 
-        it "changing to a title that is not from a badge, unsets badge_granted_title" do
+        it "changing to a title that is not from a badge, unsets granted_title_badge_id" do
           user.update(title: badge.name)
-          user.user_profile.update(badge_granted_title: true)
+          user.user_profile.update(granted_title_badge_id: badge.id)
 
           Guardian.any_instance.stubs(:can_grant_title?).with(user, "Dancer").returns(true)
 
@@ -483,7 +519,7 @@ RSpec.describe UserUpdater do
           updater.update(title: "Dancer")
           user.reload
           expect(user.title).to eq("Dancer")
-          expect(user.user_profile.badge_granted_title).to eq(false)
+          expect(user.user_profile.granted_title_badge_id).to be_nil
         end
       end
 
@@ -493,7 +529,7 @@ RSpec.describe UserUpdater do
         updater.update(title: badge.name)
         user.reload
         expect(user.title).not_to eq(badge.name)
-        expect(user.user_profile.badge_granted_title).to eq(false)
+        expect(user.user_profile.granted_title_badge_id).to be_nil
       end
     end
 
@@ -551,7 +587,7 @@ RSpec.describe UserUpdater do
     context "when skip_new_user_tips is edited" do
       it "updates seen_popups too" do
         messages =
-          MessageBus.track_publish("/user-tips") do
+          MessageBus.track_publish("/user-tips/#{user.id}") do
             UserUpdater.new(Discourse.system_user, user).update(skip_new_user_tips: true)
           end
 
@@ -573,7 +609,7 @@ RSpec.describe UserUpdater do
     context "when seen_popups is edited" do
       it "publishes a message" do
         messages =
-          MessageBus.track_publish("/user-tips") do
+          MessageBus.track_publish("/user-tips/#{user.id}") do
             UserUpdater.new(Discourse.system_user, user).update(seen_popups: [1])
           end
 
diff --git a/spec/services/username_changer_spec.rb b/spec/services/username_changer_spec.rb
index 158b3166e96..3b08f70eaf5 100644
--- a/spec/services/username_changer_spec.rb
+++ b/spec/services/username_changer_spec.rb
@@ -327,6 +327,54 @@ RSpec.describe UsernameChanger do
           )
         end
 
+        it "replaces mentions of oneself in posts" do
+          post = create_post_and_change_username(raw: "Hello @#{user.username}", user: user)
+
+          expect(post.raw).to eq("Hello @bar")
+          expect(post.cooked).to eq(%Q(<p>Hello <a class="mention" href="/u/bar">@bar</a></p>))
+        end
+
+        it "replaces mentions of oneself in revisions" do
+          revisions = [
+            { raw: "Hello Foo" },
+            { title: "new topic title" },
+            { raw: "Hello @#{user.username}!" },
+            { raw: "Hello @#{user.username}!!" },
+          ]
+
+          post =
+            create_post_and_change_username(raw: "Hello @#{user.username}", revisions: revisions)
+
+          expect(post.raw).to eq("Hello @bar!!")
+          expect(post.cooked).to eq(%Q(<p>Hello <a class="mention" href="/u/bar">@bar</a>!!</p>))
+
+          expect(post.revisions.count).to eq(4)
+
+          expect(post.revisions[0].modifications["raw"][0]).to eq("Hello @bar")
+          expect(post.revisions[0].modifications["cooked"][0]).to eq(
+            %Q(<p>Hello <a class="mention" href="/u/bar">@bar</a></p>),
+          )
+          expect(post.revisions[0].modifications["cooked"][1]).to eq("<p>Hello Foo</p>")
+
+          expect(post.revisions[1].modifications).to include("title")
+
+          expect(post.revisions[2].modifications["raw"][0]).to eq("Hello Foo")
+          expect(post.revisions[2].modifications["raw"][1]).to eq("Hello @bar!")
+          expect(post.revisions[2].modifications["cooked"][0]).to eq("<p>Hello Foo</p>")
+          expect(post.revisions[2].modifications["cooked"][1]).to eq(
+            %Q(<p>Hello <a class="mention" href="/u/bar">@bar</a>!</p>),
+          )
+
+          expect(post.revisions[3].modifications["raw"][0]).to eq("Hello @bar!")
+          expect(post.revisions[3].modifications["raw"][1]).to eq("Hello @bar!!")
+          expect(post.revisions[3].modifications["cooked"][0]).to eq(
+            %Q(<p>Hello <a class="mention" href="/u/bar">@bar</a>!</p>),
+          )
+          expect(post.revisions[3].modifications["cooked"][1]).to eq(
+            %Q(<p>Hello <a class="mention" href="/u/bar">@bar</a>!!</p>),
+          )
+        end
+
         context "when using Unicode usernames" do
           before { SiteSetting.unicode_usernames = true }
           let(:user) { Fabricate(:user, username: "թռչուն") }
@@ -377,7 +425,7 @@ RSpec.describe UsernameChanger do
         let(:quoted_post) do
           create_post(user: user, topic: topic, post_number: 1, raw: "quoted post")
         end
-        let(:avatar_url) { user.avatar_template_url.gsub("{size}", "40") }
+        let(:avatar_url) { user.avatar_template_url.gsub("{size}", "48") }
 
         it "replaces the username in quote tags and updates avatar" do
           post = create_post_and_change_username(raw: <<~RAW)
@@ -421,7 +469,7 @@ RSpec.describe UsernameChanger do
             <aside class="quote no-group" data-username="bar" data-post="1" data-topic="#{quoted_post.topic.id}">
             <div class="title">
             <div class="quote-controls"></div>
-            <img loading="lazy" alt='' width="20" height="20" src="#{avatar_url}" class="avatar"> bar:</div>
+            <img loading="lazy" alt='' width="24" height="24" src="#{avatar_url}" class="avatar"> bar:</div>
             <blockquote>
             <p>quoted post</p>
             </blockquote>
@@ -429,7 +477,7 @@ RSpec.describe UsernameChanger do
             <aside class="quote no-group" data-username="bar">
             <div class="title">
             <div class="quote-controls"></div>
-            <img loading="lazy" alt="" width="20" height="20" src="#{avatar_url}" class="avatar"> bar:</div>
+            <img loading="lazy" alt="" width="24" height="24" src="#{avatar_url}" class="avatar"> bar:</div>
             <blockquote>
             <p>quoted post</p>
             </blockquote>
@@ -437,7 +485,42 @@ RSpec.describe UsernameChanger do
             <aside class="quote no-group" data-username="bar" data-post="1" data-topic="#{quoted_post.topic.id}">
             <div class="title">
             <div class="quote-controls"></div>
-            <img loading="lazy" alt="" width="20" height="20" src="#{avatar_url}" class="avatar"> bar:</div>
+            <img loading="lazy" alt="" width="24" height="24" src="#{avatar_url}" class="avatar"> bar:</div>
+            <blockquote>
+            <p>quoted post</p>
+            </blockquote>
+            </aside>
+            <p>dolor sit amet</p>
+          HTML
+        end
+
+        it "replaces the username in new quote format" do
+          post = create_post_and_change_username(raw: <<~RAW)
+            Lorem ipsum
+
+            [quote="Foo Bar, post:1, topic:#{quoted_post.topic.id}, username:foo"]
+            quoted post
+            [/quote]
+
+            dolor sit amet
+          RAW
+
+          expect(post.raw).to eq(<<~RAW.strip)
+            Lorem ipsum
+
+            [quote="Foo Bar, post:1, topic:#{quoted_post.topic.id}, username:bar"]
+            quoted post
+            [/quote]
+
+            dolor sit amet
+          RAW
+
+          expect(post.cooked).to match_html(<<~HTML)
+            <p>Lorem ipsum</p>
+            <aside class="quote no-group" data-username="bar" data-post="1" data-topic="#{quoted_post.topic.id}">
+            <div class="title">
+            <div class="quote-controls"></div>
+            <img loading="lazy" alt="" width="24" height="24" src="//test.localhost/letter_avatar_proxy/v4/letter/b/b77776/48.png" class="avatar"> Foo Bar:</div>
             <blockquote>
             <p>quoted post</p>
             </blockquote>
@@ -468,7 +551,7 @@ RSpec.describe UsernameChanger do
               <aside class="quote no-group" data-username="bar" data-post="1" data-topic="#{quoted_post.topic.id}">
               <div class="title">
               <div class="quote-controls"></div>
-              <img loading="lazy" alt='' width="20" height="20" src="#{avatar_url}" class="avatar"> bar:</div>
+              <img loading="lazy" alt='' width="24" height="24" src="#{avatar_url}" class="avatar"> bar:</div>
               <blockquote>
               <p>quoted</p>
               </blockquote>
@@ -502,7 +585,7 @@ RSpec.describe UsernameChanger do
         end
 
         def user_avatar_url(u)
-          u.avatar_template_url.gsub("{size}", "40")
+          u.avatar_template_url.gsub("{size}", "48")
         end
 
         it "updates avatar for linked topics and posts" do
@@ -514,7 +597,7 @@ RSpec.describe UsernameChanger do
             <aside class="quote" data-post="#{quoted_post.post_number}" data-topic="#{quoted_post.topic.id}">
               <div class="title">
                 <div class="quote-controls"></div>
-                <img loading="lazy" alt="" width="20" height="20" src="#{avatar_url}" class="avatar">
+                <img loading="lazy" alt="" width="24" height="24" src="#{avatar_url}" class="avatar">
                 <a href="#{protocol_relative_url(quoted_post.full_url)}">#{quoted_post.topic.title}</a>
               </div>
               <blockquote>
@@ -525,7 +608,7 @@ RSpec.describe UsernameChanger do
             <aside class="quote" data-post="#{quoted_post.post_number}" data-topic="#{quoted_post.topic.id}">
               <div class="title">
                 <div class="quote-controls"></div>
-                <img loading="lazy" alt="" width="20" height="20" src="#{avatar_url}" class="avatar">
+                <img loading="lazy" alt="" width="24" height="24" src="#{avatar_url}" class="avatar">
                 <a href="#{protocol_relative_url(quoted_post.topic.url)}">#{quoted_post.topic.title}</a>
               </div>
               <blockquote>
@@ -544,18 +627,17 @@ RSpec.describe UsernameChanger do
             <aside class="quote" data-post="#{quoted_post.post_number}" data-topic="#{quoted_post.topic.id}">
               <div class="title">
                 <div class="quote-controls"></div>
-                <img loading="lazy" alt="" width="20" height="20" src="#{avatar_url}" class="avatar">
+                <img loading="lazy" alt="" width="24" height="24" src="#{avatar_url}" class="avatar">
                 <a href="#{protocol_relative_url(quoted_post.full_url)}">#{quoted_post.topic.title}</a>
               </div>
               <blockquote>
                 quoted post
               </blockquote>
             </aside>
-
             <aside class="quote" data-post="#{another_quoted_post.post_number}" data-topic="#{another_quoted_post.topic.id}">
               <div class="title">
                 <div class="quote-controls"></div>
-                <img loading="lazy" alt="" width="20" height="20" src="#{user_avatar_url(evil_trout)}" class="avatar">
+                <img loading="lazy" alt="" width="24" height="24" src="#{user_avatar_url(evil_trout)}" class="avatar">
                 <a href="#{protocol_relative_url(another_quoted_post.full_url)}">#{another_quoted_post.topic.title}</a>
               </div>
               <blockquote>
diff --git a/spec/services/word_watcher_spec.rb b/spec/services/word_watcher_spec.rb
index 653c0d33faa..7749e7964c1 100644
--- a/spec/services/word_watcher_spec.rb
+++ b/spec/services/word_watcher_spec.rb
@@ -21,9 +21,11 @@ RSpec.describe WordWatcher do
       expect(described_class.words_for_action(:block)).to include(
         word1 => {
           case_sensitive: false,
+          word: word1,
         },
         word2 => {
           case_sensitive: true,
+          word: word2,
         },
       )
     end
@@ -40,6 +42,7 @@ RSpec.describe WordWatcher do
         word => {
           case_sensitive: false,
           replacement: "http://test.localhost/",
+          word: word,
         },
       )
     end
@@ -79,8 +82,8 @@ RSpec.describe WordWatcher do
 
         expect(regexps).to be_an(Array)
         expect(regexps.map(&:inspect)).to contain_exactly(
-          "/(?:\\W|^)(#{word1}|#{word2})(?=\\W|$)/i",
-          "/(?:\\W|^)(#{word3}|#{word4})(?=\\W|$)/",
+          "/(?:[^[:word:]]|^)(#{word1}|#{word2})(?=[^[:word:]]|$)/i",
+          "/(?:[^[:word:]]|^)(#{word3}|#{word4})(?=[^[:word:]]|$)/",
         )
       end
 
@@ -361,7 +364,7 @@ RSpec.describe WordWatcher do
     end
   end
 
-  describe ".apply_to_text" do
+  describe "word replacement" do
     fab!(:censored_word) do
       Fabricate(:watched_word, word: "censored", action: WatchedWord.actions[:censor])
     end
@@ -382,36 +385,54 @@ RSpec.describe WordWatcher do
       )
     end
 
-    it "replaces all types of words" do
-      text = "hello censored world to replace https://notdiscourse.org"
-      expected =
-        "hello #{described_class::REPLACEMENT_LETTER * 8} world replaced https://discourse.org"
-      expect(described_class.apply_to_text(text)).to eq(expected)
+    it "censors text" do
+      expect(described_class.censor_text("a censored word")).to eq(
+        "a #{described_class::REPLACEMENT_LETTER * 8} word",
+      )
     end
 
-    context "when watched_words_regular_expressions = true" do
-      it "replaces captured non-word prefix" do
-        SiteSetting.watched_words_regular_expressions = true
-        Fabricate(
-          :watched_word,
-          word: "\\Wplaceholder",
-          replacement: "replacement",
-          action: WatchedWord.actions[:replace],
-        )
+    it "replaces text" do
+      expect(described_class.replace_text("a word to replace meow")).to eq("a word replaced meow")
+    end
 
-        text = "is \tplaceholder in https://notdiscourse.org"
-        expected = "is replacement in https://discourse.org"
+    it "replaces links" do
+      expect(described_class.replace_link("please visit https://notdiscourse.org meow")).to eq(
+        "please visit https://discourse.org meow",
+      )
+    end
+
+    describe ".apply_to_text" do
+      it "replaces all types of words" do
+        text = "hello censored world to replace https://notdiscourse.org"
+        expected =
+          "hello #{described_class::REPLACEMENT_LETTER * 8} world replaced https://discourse.org"
         expect(described_class.apply_to_text(text)).to eq(expected)
       end
-    end
 
-    context "when watched_words_regular_expressions = false" do
-      it "maintains non-word character prefix" do
-        SiteSetting.watched_words_regular_expressions = false
+      context "when watched_words_regular_expressions = true" do
+        it "replaces captured non-word prefix" do
+          SiteSetting.watched_words_regular_expressions = true
+          Fabricate(
+            :watched_word,
+            word: "\\Wplaceholder",
+            replacement: "replacement",
+            action: WatchedWord.actions[:replace],
+          )
 
-        text = "to replace and\thttps://notdiscourse.org"
-        expected = "replaced and\thttps://discourse.org"
-        expect(described_class.apply_to_text(text)).to eq(expected)
+          text = "is \tplaceholder in https://notdiscourse.org"
+          expected = "is replacement in https://discourse.org"
+          expect(described_class.apply_to_text(text)).to eq(expected)
+        end
+      end
+
+      context "when watched_words_regular_expressions = false" do
+        it "maintains non-word character prefix" do
+          SiteSetting.watched_words_regular_expressions = false
+
+          text = "to replace and\thttps://notdiscourse.org"
+          expected = "replaced and\thttps://discourse.org"
+          expect(described_class.apply_to_text(text)).to eq(expected)
+        end
       end
     end
   end
diff --git a/spec/support/bookmarkable_helper.rb b/spec/support/bookmarkable_helper.rb
index 7a9f053fd78..a9644b8d963 100644
--- a/spec/support/bookmarkable_helper.rb
+++ b/spec/support/bookmarkable_helper.rb
@@ -72,6 +72,9 @@ class UserTestBookmarkable < BaseBookmarkable
   end
 end
 
-def register_test_bookmarkable
-  Bookmark.register_bookmarkable(UserTestBookmarkable)
+def register_test_bookmarkable(klass = UserTestBookmarkable)
+  DiscoursePluginRegistry.register_bookmarkable(
+    RegisteredBookmarkable.new(klass),
+    stub(enabled?: true),
+  )
 end
diff --git a/spec/support/concurrency.rb b/spec/support/concurrency.rb
index ceba7f5f4dd..b0f7a514a96 100644
--- a/spec/support/concurrency.rb
+++ b/spec/support/concurrency.rb
@@ -21,7 +21,7 @@ module Concurrency
         def choose(*options)
           raise DeadEnd if options.empty?
 
-          @path << [options.size, 0] unless @index < @path.size
+          @path << [options.size, 0] if @index >= @path.size
 
           pair = @path[@index]
           raise "non-determinism" unless pair[0] == options.size
diff --git a/spec/support/dom_matcher.rb b/spec/support/dom_matcher.rb
new file mode 100644
index 00000000000..08a874f6b6f
--- /dev/null
+++ b/spec/support/dom_matcher.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+include Rails::Dom::Testing::Assertions::DomAssertions
+
+RSpec::Matchers.define :be_same_dom do |expected|
+  match do |actual|
+    begin
+      assert_dom_equal(expected, actual)
+    rescue Minitest::Assertion
+      false
+    end
+  end
+
+  failure_message { |actual| "Expected DOM:\n#{expected}\nto be the same as:\n#{actual}" }
+end
diff --git a/spec/support/dummy_custom_summarization.rb b/spec/support/dummy_custom_summarization.rb
new file mode 100644
index 00000000000..1724a0274f6
--- /dev/null
+++ b/spec/support/dummy_custom_summarization.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class DummyCustomSummarization < Summarization::Base
+  def initialize(summarization_result)
+    @summarization_result = summarization_result
+  end
+
+  def display_name
+    "dummy"
+  end
+
+  def correctly_configured?
+    true
+  end
+
+  def configuration_hint
+    "hint"
+  end
+
+  def model
+    "dummy"
+  end
+
+  def summarize(_content)
+    @summarization_result
+  end
+end
diff --git a/spec/support/fake_bookmark_hashtag_data_source.rb b/spec/support/fake_bookmark_hashtag_data_source.rb
index c6dc9fd3996..1b5d75c2df1 100644
--- a/spec/support/fake_bookmark_hashtag_data_source.rb
+++ b/spec/support/fake_bookmark_hashtag_data_source.rb
@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
 class FakeBookmarkHashtagDataSource
+  def self.enabled?
+    true
+  end
+
   def self.icon
     "bookmark"
   end
diff --git a/spec/support/helpers.rb b/spec/support/helpers.rb
index ff611df35e3..24a9802be02 100644
--- a/spec/support/helpers.rb
+++ b/spec/support/helpers.rb
@@ -149,12 +149,24 @@ module Helpers
     capture_output(:stderr, &block)
   end
 
-  def set_subfolder(f)
-    global_setting :relative_url_root, f
+  def set_subfolder(new_root)
+    global_setting :relative_url_root, new_root
+
     old_root = ActionController::Base.config.relative_url_root
-    ActionController::Base.config.relative_url_root = f
+    ActionController::Base.config.relative_url_root = new_root
+    Rails.application.routes.stubs(:relative_url_root).returns(new_root)
 
     before_next_spec { ActionController::Base.config.relative_url_root = old_root }
+
+    if RSpec.current_example.metadata[:type] == :system
+      Capybara.app.map("/") { run lambda { |env| [404, {}, [""]] } }
+      Capybara.app.map(new_root) { run Rails.application }
+
+      before_next_spec do
+        Capybara.app.map(new_root) { run lambda { |env| [404, {}, [""]] } }
+        Capybara.app.map("/") { run Rails.application }
+      end
+    end
   end
 
   def setup_git_repo(files)
@@ -201,4 +213,11 @@ module Helpers
         ips.map { |ip| Addrinfo.new([IPAddr.new(ip).ipv6? ? "AF_INET6" : "AF_INET", 80, nil, ip]) },
       )
   end
+
+  def with_search_indexer_enabled
+    SearchIndexer.enable
+    yield
+  ensure
+    SearchIndexer.disable
+  end
 end
diff --git a/spec/support/sample_plugin_site_settings.yml b/spec/support/sample_plugin_site_settings.yml
new file mode 100644
index 00000000000..967d8eb209c
--- /dev/null
+++ b/spec/support/sample_plugin_site_settings.yml
@@ -0,0 +1,7 @@
+site_settings:
+  plugin_setting:
+    default: "some value"
+  test_some_topic_id:
+    default: 0
+  test_some_other_topic_id:
+    default: 0
\ No newline at end of file
diff --git a/spec/support/shared_examples_for_custom_fields.rb b/spec/support/shared_examples_for_custom_fields.rb
new file mode 100644
index 00000000000..c3f98f72d74
--- /dev/null
+++ b/spec/support/shared_examples_for_custom_fields.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples_for "it has custom fields" do
+  let(:record) { described_class.new }
+
+  describe "Max number of custom fields" do
+    let(:custom_fields) { (1..101).to_a.product(["value"]).to_h }
+
+    before { record.custom_fields = custom_fields }
+
+    it "can't have more than 100 custom fields" do
+      expect(record).to be_invalid
+      expect(record.errors[:base]).to include(/Maximum number.*\(100\)/)
+    end
+  end
+
+  describe "Max length of a custom field" do
+    let(:bad_value) { "a" * 10_000_001 }
+
+    before { record.custom_fields[:my_custom_field] = bad_value }
+
+    it "can't have more than 10,000,000 characters" do
+      expect(record).to be_invalid
+      expect(record.errors[:base]).to include(/Maximum length.*\(10000000\)/)
+    end
+  end
+end
diff --git a/spec/support/site_settings_helpers.rb b/spec/support/site_settings_helpers.rb
index 52fbe512c45..686749d0ec9 100644
--- a/spec/support/site_settings_helpers.rb
+++ b/spec/support/site_settings_helpers.rb
@@ -8,6 +8,10 @@ module SiteSettingsHelpers
       # so we set listen_for_changes to false
       self.listen_for_changes = false
       self.provider = provider
+
+      def self.setting(*args)
+        super
+      end
     end
   end
 end
diff --git a/spec/support/system_helpers.rb b/spec/support/system_helpers.rb
index 7813ec137e6..5c26342d530 100644
--- a/spec/support/system_helpers.rb
+++ b/spec/support/system_helpers.rb
@@ -2,6 +2,8 @@
 require "highline/import"
 
 module SystemHelpers
+  PLATFORM_KEY_MODIFIER = RUBY_PLATFORM =~ /darwin/i ? :meta : :control
+
   def pause_test
     result =
       ask(
@@ -12,11 +14,16 @@ module SystemHelpers
   end
 
   def sign_in(user)
-    visit "/session/#{user.encoded_username}/become.json?redirect=false"
+    visit File.join(
+            GlobalSetting.relative_url_root || "",
+            "/session/#{user.encoded_username}/become.json?redirect=false",
+          )
+
+    expect(page).to have_content("Signed in to #{user.encoded_username} successfully")
   end
 
   def sign_out
-    delete "/session"
+    delete File.join(GlobalSetting.relative_url_root || "", "/session")
   end
 
   def setup_system_test
@@ -26,19 +33,66 @@ module SystemHelpers
     SiteSetting.port = Capybara.server_port
     SiteSetting.external_system_avatars_enabled = false
     SiteSetting.disable_avatar_education_message = true
+    SiteSetting.enable_user_tips = false
+    SiteSetting.splash_screen = false
   end
 
-  def try_until_success(timeout: 2, frequency: 0.01)
+  def try_until_success(timeout: Capybara.default_max_wait_time, frequency: 0.01)
     start ||= Time.zone.now
     backoff ||= frequency
     yield
-  rescue RSpec::Expectations::ExpectationNotMetError
+  rescue RSpec::Expectations::ExpectationNotMetError,
+         Capybara::ExpectationNotMet,
+         Capybara::ElementNotFound
     raise if Time.zone.now >= start + timeout.seconds
     sleep backoff
     backoff += frequency
     retry
   end
 
+  def wait_for_attribute(
+    element,
+    attribute,
+    value,
+    timeout: Capybara.default_max_wait_time,
+    frequency: 0.01
+  )
+    try_until_success(timeout: timeout, frequency: frequency) do
+      expect(element[attribute.to_sym]).to eq(value)
+    end
+  end
+
+  # Waits for an element to stop animating up to timeout seconds,
+  # then raises a Capybara error if it does not stop.
+  #
+  # This is based on getBoundingClientRect, where Y is the distance
+  # from the top of the element to the top of the viewport, and X
+  # is the distance from the leftmost edge of the element to the
+  # left of the viewport. The viewpoint origin (0, 0) is at the
+  # top left of the page.
+  #
+  # Once X and Y stop changing based on the current vs previous position,
+  # then we know the animation has stopped and the element is stabilised,
+  # at which point we can click on it without fear of Capybara mis-clicking.
+  #
+  # c.f. https://developer.mozilla.org/en-US/docs/Web/API/Element/getBoundingClientRect
+  def wait_for_animation(element, timeout: Capybara.default_max_wait_time)
+    old_element_x = nil
+    old_element_y = nil
+
+    try_until_success(timeout: timeout) do
+      current_element_x = element.rect.x
+      current_element_y = element.rect.y
+
+      stopped_moving = current_element_x == old_element_x && current_element_y == old_element_y
+
+      old_element_x = current_element_x
+      old_element_y = current_element_y
+
+      raise Capybara::ExpectationNotMet if !stopped_moving
+    end
+  end
+
   def resize_window(width: nil, height: nil)
     original_size = page.driver.browser.manage.window.size
     page.driver.browser.manage.window.resize_to(
@@ -55,8 +109,33 @@ module SystemHelpers
 
     ENV["TZ"] = timezone
 
-    Capybara.using_session(timezone) { freeze_time(&example) }
+    using_session(timezone) do |session|
+      freeze_time(&example)
+      session.quit
+    end
 
     ENV["TZ"] = previous_browser_timezone
   end
+
+  # When using parallelism, Capybara's `using_session` method can cause
+  # intermittent failures as two sessions can be created with the same name
+  # in different tests and be run at the same time.
+  def using_session(name, &block)
+    Capybara.using_session(name.to_s + self.method_name, &block)
+  end
+
+  def select_text_range(selector, start = 0, offset = 5)
+    js = <<-JS
+      const node = document.querySelector(arguments[0]).childNodes[0];
+      const selection = window.getSelection();
+      const range = document.createRange();
+      range.selectNodeContents(node);
+      range.setStart(node, arguments[1]);
+      range.setEnd(node, arguments[1] + arguments[2]);
+      selection.removeAllRanges();
+      selection.addRange(range);
+    JS
+
+    page.execute_script(js, selector, start, offset)
+  end
 end
diff --git a/spec/support/time_matcher.rb b/spec/support/time_matcher.rb
index b3e59efde26..762b6d74a05 100644
--- a/spec/support/time_matcher.rb
+++ b/spec/support/time_matcher.rb
@@ -11,7 +11,11 @@ RSpec::Matchers.define :be_within_one_minute_of do |expected_time|
 end
 
 RSpec::Matchers.define :eq_time do |expected_time|
-  match { |actual_time| (actual_time - expected_time).abs < 0.001 }
+  match do |actual_time|
+    return true if expected_time.nil? && actual_time.nil?
+    return false if expected_time.nil? || actual_time.nil?
+    (actual_time - expected_time).abs < 0.001
+  end
   failure_message { |actual_time| "#{actual_time} is not within 1 millisecond of #{expected_time}" }
   failure_message_when_negated do |actual_time|
     "#{actual_time} is within 1 millisecond of #{expected_time}"
diff --git a/spec/support/ts_vector_matcher.rb b/spec/support/ts_vector_matcher.rb
new file mode 100644
index 00000000000..49d5d0da343
--- /dev/null
+++ b/spec/support/ts_vector_matcher.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+RSpec::Matchers.define :eq_ts_vector do |expected_vector|
+  match do |actual_vector|
+    actual = actual_vector.split(" ").sort
+    expected = expected_vector.split(" ").sort
+
+    (expected - actual == []) && (actual - expected == [])
+  end
+  failure_message do |actual_vector|
+    actual = actual_vector.split(" ").sort
+    expected = expected_vector.split(" ").sort
+
+    message = +"ts_vector does not match!\n\n"
+    message << "Additional elements:\n"
+    message << (expected - actual).join("\n")
+    message << "\nMissing elements:\n"
+    message << (actual - expected).join("\n")
+    message
+  end
+end
diff --git a/spec/support/user_sidebar_serializer_attributes.rb b/spec/support/user_sidebar_serializer_attributes.rb
index 9bf6eaa5d5c..3e4b0647beb 100644
--- a/spec/support/user_sidebar_serializer_attributes.rb
+++ b/spec/support/user_sidebar_serializer_attributes.rb
@@ -7,35 +7,20 @@ RSpec.shared_examples "User Sidebar Serializer Attributes" do |serializer_klass|
 
   before { SiteSetting.navigation_menu = "sidebar" }
 
-  describe "#sidebar_list_destination" do
-    it "is not included when navigation menu is legacy" do
-      SiteSetting.navigation_menu = "legacy"
-
-      expect(serializer.as_json[:sidebar_list_destination]).to eq(nil)
-    end
-
-    it "returns choosen value or default" do
-      expect(serializer.as_json[:sidebar_list_destination]).to eq(
-        SiteSetting.default_sidebar_list_destination,
-      )
-
-      user.user_option.update!(sidebar_list_destination: "unread_new")
-
-      expect(serializer.as_json[:sidebar_list_destination]).to eq("unread_new")
-    end
-  end
-
   describe "#sidebar_category_ids" do
     fab!(:group) { Fabricate(:group) }
     fab!(:category) { Fabricate(:category) }
     fab!(:category_2) { Fabricate(:category) }
     fab!(:private_category) { Fabricate(:private_category, group: group) }
+
     fab!(:category_sidebar_section_link) do
       Fabricate(:category_sidebar_section_link, user: user, linkable: category)
     end
+
     fab!(:category_sidebar_section_link_2) do
       Fabricate(:category_sidebar_section_link, user: user, linkable: category_2)
     end
+
     fab!(:category_sidebar_section_link_3) do
       Fabricate(:category_sidebar_section_link, user: user, linkable: private_category)
     end
@@ -64,20 +49,26 @@ RSpec.shared_examples "User Sidebar Serializer Attributes" do |serializer_klass|
   end
 
   describe "#sidebar_tags" do
-    fab!(:tag) { Fabricate(:tag, name: "foo") }
+    fab!(:tag) { Fabricate(:tag, name: "foo", description: "foo tag") }
+
     fab!(:pm_tag) do
       Fabricate(:tag, name: "bar", pm_topic_count: 5, staff_topic_count: 0, public_topic_count: 0)
     end
+
     fab!(:hidden_tag) { Fabricate(:tag, name: "secret") }
+
     fab!(:staff_tag_group) do
       Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: ["secret"])
     end
+
     fab!(:tag_sidebar_section_link) do
       Fabricate(:tag_sidebar_section_link, user: user, linkable: tag)
     end
+
     fab!(:tag_sidebar_section_link_2) do
       Fabricate(:tag_sidebar_section_link, user: user, linkable: pm_tag)
     end
+
     fab!(:tag_sidebar_section_link_3) do
       Fabricate(:tag_sidebar_section_link, user: user, linkable: hidden_tag)
     end
@@ -107,8 +98,8 @@ RSpec.shared_examples "User Sidebar Serializer Attributes" do |serializer_klass|
       json = serializer.as_json
 
       expect(json[:sidebar_tags]).to contain_exactly(
-        { name: tag.name, pm_only: false },
-        { name: pm_tag.name, pm_only: true },
+        { name: tag.name, pm_only: false, description: tag.description },
+        { name: pm_tag.name, pm_only: true, description: nil },
       )
 
       user.update!(admin: true)
@@ -116,9 +107,9 @@ RSpec.shared_examples "User Sidebar Serializer Attributes" do |serializer_klass|
       json = serializer.as_json
 
       expect(json[:sidebar_tags]).to contain_exactly(
-        { name: tag.name, pm_only: false },
-        { name: pm_tag.name, pm_only: true },
-        { name: hidden_tag.name, pm_only: false },
+        { name: tag.name, pm_only: false, description: tag.description },
+        { name: pm_tag.name, pm_only: true, description: nil },
+        { name: hidden_tag.name, pm_only: false, description: nil },
       )
     end
   end
diff --git a/spec/system/admin_customize_form_templates_spec.rb b/spec/system/admin_customize_form_templates_spec.rb
new file mode 100644
index 00000000000..847d7accefd
--- /dev/null
+++ b/spec/system/admin_customize_form_templates_spec.rb
@@ -0,0 +1,207 @@
+# frozen_string_literal: true
+
+describe "Admin Customize Form Templates", type: :system do
+  let(:form_template_page) { PageObjects::Pages::FormTemplate.new }
+  let(:ace_editor) { PageObjects::Components::AceEditor.new }
+
+  fab!(:admin) { Fabricate(:admin) }
+  fab!(:form_template) { Fabricate(:form_template) }
+  fab!(:category) { Fabricate(:category) }
+
+  before do
+    SiteSetting.experimental_form_templates = true
+    sign_in(admin)
+  end
+
+  describe "when visiting the page to customize form templates" do
+    before { category.update!(form_template_ids: [form_template.id]) }
+
+    it "should show the existing form templates in a table" do
+      form_template_page.visit
+
+      expect(form_template_page).to have_form_template_table
+      expect(form_template_page).to have_form_template(form_template.name)
+    end
+
+    it "should show the categories the form template is used in" do
+      form_template_page.visit
+
+      expect(form_template_page).to have_form_template_table
+      expect(form_template_page).to have_category_in_template_row(category.name)
+    end
+
+    it "should show the form template structure in a modal" do
+      form_template_page.visit
+
+      form_template_page.click_view_form_template
+      expect(form_template_page).to have_template_structure("- type: input")
+    end
+
+    it "should show a preview of the template in a modal when toggling the preview" do
+      form_template_page.visit
+
+      form_template_page.click_view_form_template
+      form_template_page.click_toggle_preview
+      expect(form_template_page).to have_input_field("input")
+    end
+  end
+
+  describe "when visiting the page to edit a form template" do
+    it "should prefill form data" do
+      visit("/admin/customize/form-templates/#{form_template.id}")
+      expect(form_template_page).to have_name_value(form_template.name)
+      # TODO(@keegan) difficult to test the ace editor content, todo later
+    end
+  end
+
+  def quick_insertion_test(field_type, content)
+    form_template_page.visit_new
+    form_template_page.type_in_template_name("New Template")
+    form_template_page.click_quick_insert(field_type)
+    expect(ace_editor).to have_text(content)
+  end
+
+  describe "when visiting the page to create a new form template" do
+    it "should allow admin to create a new form template" do
+      form_template_page.visit_new
+
+      sample_name = "My First Template"
+      sample_template = "- type: input"
+
+      form_template_page.type_in_template_name(sample_name)
+      ace_editor.type_input(sample_template)
+      form_template_page.click_save_button
+      expect(form_template_page).to have_form_template(sample_name)
+    end
+
+    it "should disable the save button until form is filled out" do
+      form_template_page.visit_new
+      expect(form_template_page).to have_save_button_with_state(disabled: true)
+      form_template_page.type_in_template_name("New Template")
+      expect(form_template_page).to have_save_button_with_state(disabled: true)
+      ace_editor.type_input("- type: input")
+      expect(form_template_page).to have_save_button_with_state(disabled: false)
+    end
+
+    it "should disable the preview button until form is filled out" do
+      form_template_page.visit_new
+      expect(form_template_page).to have_preview_button_with_state(disabled: true)
+      form_template_page.type_in_template_name("New Template")
+      expect(form_template_page).to have_preview_button_with_state(disabled: true)
+      ace_editor.type_input("- type: input")
+      expect(form_template_page).to have_preview_button_with_state(disabled: false)
+    end
+
+    it "should show validation options in a modal when clicking the validations button" do
+      form_template_page.visit_new
+      form_template_page.click_validations_button
+      expect(form_template_page).to have_validations_modal
+    end
+
+    it "should show a preview of the template in a modal when clicking the preview button" do
+      form_template_page.visit_new
+      form_template_page.type_in_template_name("New Template")
+      ace_editor.type_input("- type: input")
+      form_template_page.click_preview_button
+
+      expect(form_template_page).to have_preview_modal
+      expect(form_template_page).to have_input_field("input")
+    end
+
+    it "should render all the input field types in the preview" do
+      form_template_page.visit_new
+      form_template_page.type_in_template_name("New Template")
+      ace_editor.type_input(
+        "- type: input\n- type: textarea\n- type: checkbox\n- type: dropdown\n- type: upload\n- type: multi-select",
+      )
+      form_template_page.click_preview_button
+      expect(form_template_page).to have_input_field("input")
+      expect(form_template_page).to have_input_field("textarea")
+      expect(form_template_page).to have_input_field("checkbox")
+      expect(form_template_page).to have_input_field("dropdown")
+      expect(form_template_page).to have_input_field("upload")
+      expect(form_template_page).to have_input_field("multi-select")
+    end
+
+    it "should allow quick insertion of checkbox field" do
+      quick_insertion_test(
+        "checkbox",
+        '- type: checkbox
+  attributes:
+    label: "Enter label here"
+  validations:
+    # enter validations here',
+      )
+    end
+
+    it "should allow quick insertion of short answer field" do
+      quick_insertion_test(
+        "input",
+        '- type: input
+  attributes:
+    label: "Enter label here"
+    placeholder: "Enter placeholder here"
+  validations:
+    # enter validations here',
+      )
+    end
+
+    it "should allow quick insertion of long answer field" do
+      quick_insertion_test(
+        "textarea",
+        '- type: textarea
+  attributes:
+    label: "Enter label here"
+    placeholder: "Enter placeholder here"
+  validations:
+    # enter validations here',
+      )
+    end
+
+    it "should allow quick insertion of dropdown field" do
+      quick_insertion_test(
+        "dropdown",
+        '- type: dropdown
+  choices:
+    - "Option 1"
+    - "Option 2"
+    - "Option 3"
+  attributes:
+    none_label: "Select an item"
+    label: "Enter label here"
+    filterable: false
+  validations:
+    # enter validations here',
+      )
+    end
+
+    it "should allow quick insertion of upload field" do
+      quick_insertion_test(
+        "upload",
+        '- type: upload
+  attributes:
+    file_types: ".jpg, .png, .gif"
+    allow_multiple: false
+    label: "Enter label here"
+  validations:
+    # enter validations here',
+      )
+    end
+
+    it "should allow quick insertion of multiple choice field" do
+      quick_insertion_test(
+        "multiselect",
+        '- type: multi-select
+  choices:
+    - "Option 1"
+    - "Option 2"
+    - "Option 3"
+  attributes:
+    none_label: "Select an item"
+    label: "Enter label here"
+  validations:
+    # enter validations here',
+      )
+    end
+  end
+end
diff --git a/spec/system/admin_customize_themes_spec.rb b/spec/system/admin_customize_themes_spec.rb
index 3d74fa27ff7..a699fa2e856 100644
--- a/spec/system/admin_customize_themes_spec.rb
+++ b/spec/system/admin_customize_themes_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe "Admin Customize Themes", type: :system, js: true do
+describe "Admin Customize Themes", type: :system do
   fab!(:color_scheme) { Fabricate(:color_scheme) }
   fab!(:theme) { Fabricate(:theme) }
   fab!(:admin) { Fabricate(:admin) }
@@ -27,4 +27,16 @@ describe "Admin Customize Themes", type: :system, js: true do
       expect(theme.reload.color_scheme_id).to eq(color_scheme.id)
     end
   end
+
+  describe "when editing a local theme" do
+    it "The saved value is present in the editor" do
+      theme.set_field(target: "common", name: "head_tag", value: "console.log('test')", type_id: 0)
+      theme.save!
+
+      visit("/admin/customize/themes/#{theme.id}/common/head_tag/edit")
+
+      ace_content = find(".ace_content")
+      expect(ace_content.text).to eq("console.log('test')")
+    end
+  end
 end
diff --git a/spec/system/bookmarks_spec.rb b/spec/system/bookmarks_spec.rb
index bf349ec4419..732b130c9d1 100644
--- a/spec/system/bookmarks_spec.rb
+++ b/spec/system/bookmarks_spec.rb
@@ -1,15 +1,19 @@
 # frozen_string_literal: true
 
-describe "Bookmarking posts and topics", type: :system, js: true do
+describe "Bookmarking posts and topics", type: :system do
   fab!(:topic) { Fabricate(:topic) }
-  fab!(:user) { Fabricate(:user) }
+  fab!(:current_user) { Fabricate(:user) }
   fab!(:post) { Fabricate(:post, topic: topic, raw: "This is some post to bookmark") }
-  fab!(:post2) { Fabricate(:post, topic: topic, raw: "Some interesting post content") }
+  fab!(:post_2) { Fabricate(:post, topic: topic, raw: "Some interesting post content") }
 
+  let(:timezone) { "Australia/Brisbane" }
   let(:topic_page) { PageObjects::Pages::Topic.new }
   let(:bookmark_modal) { PageObjects::Modals::Bookmark.new }
 
-  before { sign_in user }
+  before do
+    current_user.user_option.update!(timezone: timezone)
+    sign_in(current_user)
+  end
 
   def visit_topic_and_open_bookmark_modal(post)
     topic_page.visit_topic(topic)
@@ -24,15 +28,15 @@ describe "Bookmarking posts and topics", type: :system, js: true do
     bookmark_modal.save
 
     expect(topic_page).to have_post_bookmarked(post)
-    bookmark = Bookmark.find_by(bookmarkable: post, user: user)
+    bookmark = Bookmark.find_by(bookmarkable: post, user: current_user)
     expect(bookmark.name).to eq("something important")
     expect(bookmark.reminder_at).to eq(nil)
 
-    visit_topic_and_open_bookmark_modal(post2)
+    visit_topic_and_open_bookmark_modal(post_2)
 
     bookmark_modal.select_preset_reminder(:tomorrow)
-    expect(topic_page).to have_post_bookmarked(post2)
-    bookmark = Bookmark.find_by(bookmarkable: post2, user: user)
+    expect(topic_page).to have_post_bookmarked(post_2)
+    bookmark = Bookmark.find_by(bookmarkable: post_2, user: current_user)
     expect(bookmark.reminder_at).not_to eq(nil)
     expect(bookmark.reminder_set_at).not_to eq(nil)
   end
@@ -43,8 +47,8 @@ describe "Bookmarking posts and topics", type: :system, js: true do
     bookmark_modal.fill_name("something important")
     bookmark_modal.cancel
 
-    expect(topic_page).not_to have_post_bookmarked(post)
-    expect(Bookmark.exists?(bookmarkable: post, user: user)).to eq(false)
+    expect(topic_page).to have_no_post_bookmarked(post)
+    expect(Bookmark.exists?(bookmarkable: post, user: current_user)).to eq(false)
   end
 
   it "creates a bookmark if the modal is closed by clicking outside the modal window" do
@@ -56,22 +60,109 @@ describe "Bookmarking posts and topics", type: :system, js: true do
     expect(topic_page).to have_post_bookmarked(post)
   end
 
-  it "allows the topic to be bookmarked" do
-    topic_page.visit_topic(topic)
-    topic_page.click_topic_footer_button(:bookmark)
-
-    bookmark_modal.fill_name("something important")
+  it "allows choosing a different auto_delete_preference to the user preference and remembers it when reopening the modal" do
+    current_user.user_option.update!(
+      bookmark_auto_delete_preference: Bookmark.auto_delete_preferences[:on_owner_reply],
+    )
+    visit_topic_and_open_bookmark_modal(post_2)
+    bookmark_modal.open_options_panel
+    expect(bookmark_modal).to have_auto_delete_preference(
+      Bookmark.auto_delete_preferences[:on_owner_reply],
+    )
+    bookmark_modal.select_auto_delete_preference(Bookmark.auto_delete_preferences[:clear_reminder])
     bookmark_modal.save
+    expect(topic_page).to have_post_bookmarked(post_2)
+    topic_page.click_post_action_button(post_2, :bookmark)
+    expect(bookmark_modal).to have_open_options_panel
+    expect(bookmark_modal).to have_auto_delete_preference(
+      Bookmark.auto_delete_preferences[:clear_reminder],
+    )
+  end
 
-    expect(topic_page).to have_topic_bookmarked
-    bookmark =
-      try_until_success { expect(Bookmark.exists?(bookmarkable: topic, user: user)).to eq(true) }
-    expect(bookmark).not_to eq(nil)
+  describe "topic level bookmarks" do
+    it "allows the topic to be bookmarked" do
+      topic_page.visit_topic(topic)
+      topic_page.click_topic_footer_button(:bookmark)
+
+      bookmark_modal.fill_name("something important")
+      bookmark_modal.save
+
+      expect(topic_page).to have_topic_bookmarked
+      expect(Bookmark.exists?(bookmarkable: topic, user: current_user)).to be_truthy
+    end
+
+    it "opens the edit bookmark modal from the topic bookmark button if one post is bookmarked" do
+      bookmark = Fabricate(:bookmark, bookmarkable: post_2, user: current_user)
+      topic_page.visit_topic(topic)
+      topic_page.click_topic_footer_button(:bookmark)
+      expect(bookmark_modal).to be_open
+      expect(bookmark_modal).to be_editing_id(bookmark.id)
+    end
+
+    it "clears all topic bookmarks from the topic bookmark button if more than one post is bookmarked" do
+      Fabricate(:bookmark, bookmarkable: post, user: current_user)
+      Fabricate(:bookmark, bookmarkable: post_2, user: current_user)
+      topic_page.visit_topic(topic)
+      topic_page.click_topic_footer_button(:bookmark)
+      dialog = PageObjects::Components::Dialog.new
+      expect(dialog).to have_content(I18n.t("js.bookmarks.confirm_clear"))
+      dialog.click_yes
+      expect(dialog).to be_closed
+      expect(topic_page).to have_no_bookmarks
+      expect(Bookmark.where(user: current_user).count).to eq(0)
+    end
+  end
+
+  describe "editing existing bookmarks" do
+    fab!(:bookmark) do
+      Fabricate(
+        :bookmark,
+        bookmarkable: post_2,
+        user: current_user,
+        name: "test name",
+        reminder_at: 10.days.from_now,
+      )
+    end
+
+    it "prefills the name of the bookmark and the custom reminder date and time" do
+      topic_page.visit_topic(topic)
+      topic_page.click_post_action_button(post_2, :bookmark)
+      expect(bookmark_modal).to have_open_options_panel
+      expect(bookmark_modal.name.value).to eq("test name")
+      expect(bookmark_modal.existing_reminder_alert).to have_content(
+        bookmark_modal.existing_reminder_alert_message(bookmark),
+      )
+      expect(bookmark_modal.custom_date_picker.value).to eq(
+        bookmark.reminder_at_in_zone(timezone).strftime("%Y-%m-%d"),
+      )
+      expect(bookmark_modal.custom_time_picker.value).to eq(
+        bookmark.reminder_at_in_zone(timezone).strftime("%H:%M"),
+      )
+      expect(bookmark_modal).to have_active_preset("custom")
+    end
+
+    it "can delete the bookmark" do
+      topic_page.visit_topic(topic)
+      topic_page.click_post_action_button(post_2, :bookmark)
+      bookmark_modal.delete
+      bookmark_modal.confirm_delete
+      expect(topic_page).to have_no_post_bookmarked(post_2)
+    end
+
+    it "does not save edits when pressing cancel" do
+      topic_page.visit_topic(topic)
+      topic_page.click_post_action_button(post_2, :bookmark)
+      bookmark_modal.fill_name("something important")
+      bookmark_modal.cancel
+      topic_page.click_post_action_button(post_2, :bookmark)
+      expect(bookmark_modal.name.value).to eq("test name")
+      expect(bookmark.reload.name).to eq("test name")
+    end
   end
 
   context "when the user has a bookmark auto_delete_preference" do
     before do
-      user.user_option.update!(
+      current_user.user_option.update!(
         bookmark_auto_delete_preference: Bookmark.auto_delete_preferences[:on_owner_reply],
       )
     end
@@ -82,7 +173,7 @@ describe "Bookmarking posts and topics", type: :system, js: true do
       bookmark_modal.save
       expect(topic_page).to have_post_bookmarked(post)
 
-      bookmark = Bookmark.find_by(bookmarkable: post, user: user)
+      bookmark = Bookmark.find_by(bookmarkable: post, user: current_user)
       expect(bookmark.auto_delete_preference).to eq(
         Bookmark.auto_delete_preferences[:on_owner_reply],
       )
@@ -94,7 +185,7 @@ describe "Bookmarking posts and topics", type: :system, js: true do
       bookmark_modal.save
       expect(topic_page).to have_post_bookmarked(post)
 
-      bookmark = Bookmark.find_by(bookmarkable: post, user: user)
+      bookmark = Bookmark.find_by(bookmarkable: post, user: current_user)
       expect(bookmark.auto_delete_preference).to eq(
         Bookmark.auto_delete_preferences[:on_owner_reply],
       )
diff --git a/spec/system/category_edit_spec.rb b/spec/system/category_edit_spec.rb
new file mode 100644
index 00000000000..f9d61df7280
--- /dev/null
+++ b/spec/system/category_edit_spec.rb
@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+describe "Edit Category", type: :system do
+  fab!(:color_scheme) { Fabricate(:color_scheme) }
+  fab!(:theme) { Fabricate(:theme) }
+  fab!(:admin) { Fabricate(:admin) }
+  fab!(:form_template) { Fabricate(:form_template) }
+  fab!(:form_template_2) { Fabricate(:form_template) }
+  fab!(:category) do
+    Fabricate(:category, name: "Cool Category", slug: "cool-cat", topic_count: 3234)
+  end
+  let(:category_page) { PageObjects::Pages::Category.new }
+
+  before do
+    SiteSetting.experimental_form_templates = true
+    sign_in(admin)
+  end
+
+  describe "when editing a category with no form templates set" do
+    before { category.update(form_template_ids: []) }
+
+    it "should have form templates disabled and topic template enabled" do
+      category_page.visit_edit_template(category)
+      expect(category_page).not_to have_form_template_enabled
+      expect(category_page).to have_d_editor
+    end
+
+    it "should allow you to select and save a form template" do
+      category_page.visit_edit_template(category)
+      category_page.toggle_form_templates
+      expect(category_page).to have_no_d_editor
+      category_page.select_form_template(form_template.name)
+      expect(category_page).to have_selected_template(form_template.name)
+      category_page.save_settings
+      try_until_success do
+        expect(Category.find_by_id(category.id).form_template_ids).to eq([form_template.id])
+      end
+    end
+
+    it "should allow you to select and save multiple form templates" do
+      category_page.visit_edit_template(category)
+      category_page.toggle_form_templates
+      category_page.select_form_template(form_template.name)
+      category_page.select_form_template(form_template_2.name)
+      category_page.save_settings
+      try_until_success do
+        expect(Category.find_by_id(category.id).form_template_ids).to eq(
+          [form_template.id, form_template_2.id],
+        )
+      end
+    end
+  end
+
+  describe "when editing a category with form templates set" do
+    before { category.update(form_template_ids: [form_template.id, form_template_2.id]) }
+
+    it "should have form templates enabled and showing the selected templates" do
+      category_page.visit_edit_template(category)
+      expect(category_page).to have_form_template_enabled
+      expect(category_page).to have_no_d_editor
+      selected_templates = "#{form_template.name},#{form_template_2.name}"
+      expect(category_page).to have_selected_template(selected_templates)
+    end
+  end
+end
diff --git a/spec/system/category_topics_spec.rb b/spec/system/category_topics_spec.rb
new file mode 100644
index 00000000000..6186b57ad79
--- /dev/null
+++ b/spec/system/category_topics_spec.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+describe "Viewing top topics on categories page", type: :system, js: true do
+  fab!(:user) { Fabricate(:user) }
+  let(:category_list) { PageObjects::Components::CategoryList.new }
+  let(:topic_view) { PageObjects::Components::TopicView.new }
+  fab!(:category) { Fabricate(:category) }
+  fab!(:topic) { Fabricate(:topic, category: category) }
+  fab!(:post) { Fabricate(:post, topic: topic) }
+
+  it "displays and updates new counter" do
+    skip(<<~TEXT)
+    Flaky at the following step:
+
+    expect(category_list).to have_no_new_posts_badge
+       expected `#<PageObjects::Components::CategoryList:0x00007fe27a3d2340>.has_no_new_posts_badge?` to be truthy, got false
+    TEXT
+
+    sign_in(user)
+
+    visit("/categories")
+
+    category_list.click_new_posts_badge(count: 1)
+    category_list.click_topic(topic)
+
+    expect(topic_view).to have_read_post(post)
+
+    category_list.click_logo
+    category_list.click_category_navigation
+
+    expect(category_list).to have_category(category)
+    expect(category_list).to have_no_new_posts_badge
+  end
+end
diff --git a/spec/system/composer/category_templates_spec.rb b/spec/system/composer/category_templates_spec.rb
new file mode 100644
index 00000000000..d8222e8df35
--- /dev/null
+++ b/spec/system/composer/category_templates_spec.rb
@@ -0,0 +1,294 @@
+# frozen_string_literal: true
+
+describe "Composer Form Templates", type: :system do
+  fab!(:user) { Fabricate(:user) }
+  fab!(:form_template_1) do
+    Fabricate(
+      :form_template,
+      name: "Bug Reports",
+      template:
+        "- type: input
+  attributes:
+    label: What is your full name?
+    placeholder: John Doe
+  validations:
+    required: true",
+    )
+  end
+  fab!(:form_template_2) do
+    Fabricate(:form_template, name: "Feature Request", template: "- type: checkbox")
+  end
+  fab!(:form_template_3) do
+    Fabricate(:form_template, name: "Awesome Possum", template: "- type: dropdown")
+  end
+  fab!(:form_template_4) do
+    Fabricate(:form_template, name: "Biography", template: "- type: textarea")
+  end
+  fab!(:form_template_5) do
+    Fabricate(
+      :form_template,
+      name: "Medication",
+      template:
+        %Q(
+        - type: input
+          attributes:
+            label: "What is your name?"
+            placeholder: "John Smith"
+          validations:
+            required: false
+        - type: upload
+          attributes:
+            file_types: ".jpg, .png"
+            allow_multiple: false
+            label: "Upload your prescription"
+            validations:
+            required: true
+        - type: upload
+          attributes:
+            file_types: ".jpg, .png, .pdf, .mp3, .mp4"
+            allow_multiple: true
+            label: "Any additional docs"
+            validations:
+            required: false"),
+    )
+  end
+  fab!(:category_with_template_1) do
+    Fabricate(
+      :category,
+      name: "Reports",
+      slug: "reports",
+      topic_count: 2,
+      form_template_ids: [form_template_1.id],
+    )
+  end
+  fab!(:category_with_template_2) do
+    Fabricate(
+      :category,
+      name: "Features",
+      slug: "features",
+      topic_count: 3,
+      form_template_ids: [form_template_2.id],
+    )
+  end
+  fab!(:category_with_multiple_templates_1) do
+    Fabricate(
+      :category,
+      name: "Multiple",
+      slug: "multiple",
+      topic_count: 10,
+      form_template_ids: [form_template_1.id, form_template_2.id],
+    )
+  end
+  fab!(:category_with_multiple_templates_2) do
+    Fabricate(
+      :category,
+      name: "More Stuff",
+      slug: "more-stuff",
+      topic_count: 10,
+      form_template_ids: [form_template_3.id, form_template_4.id],
+    )
+  end
+  fab!(:category_with_upload_template) do
+    Fabricate(
+      :category,
+      name: "Medical",
+      slug: "medical",
+      topic_count: 2,
+      form_template_ids: [form_template_5.id],
+    )
+  end
+  fab!(:category_no_template) do
+    Fabricate(:category, name: "Staff", slug: "staff", topic_count: 2, form_template_ids: [])
+  end
+  fab!(:category_topic_template) do
+    Fabricate(
+      :category,
+      name: "Random",
+      slug: "random",
+      topic_count: 5,
+      form_template_ids: [],
+      topic_template: "Testing",
+    )
+  end
+
+  let(:category_page) { PageObjects::Pages::Category.new }
+  let(:composer) { PageObjects::Components::Composer.new }
+  let(:form_template_chooser) { PageObjects::Components::SelectKit.new(".form-template-chooser") }
+  let(:topic_page) { PageObjects::Pages::Topic.new }
+
+  before do
+    SiteSetting.experimental_form_templates = true
+    SiteSetting.authorized_extensions = "*"
+    sign_in user
+  end
+
+  it "shows a textarea when no form template is assigned to the category" do
+    category_page.visit(category_no_template)
+    category_page.new_topic_button.click
+    expect(composer).to have_composer_input
+  end
+
+  it "shows a textarea filled in with topic template when a topic template is assigned to the category" do
+    category_page.visit(category_topic_template)
+    category_page.new_topic_button.click
+    expect(composer).to have_composer_input
+    expect(composer).to have_content(category_topic_template.topic_template)
+  end
+
+  it "shows a form when a form template is assigned to the category" do
+    category_page.visit(category_with_template_1)
+    category_page.new_topic_button.click
+    expect(composer).to have_no_composer_input
+    expect(composer).to have_form_template
+    expect(composer).to have_form_template_field("input")
+  end
+
+  it "shows the preview when a category without a form template is selected" do
+    category_page.visit(category_no_template)
+    category_page.new_topic_button.click
+    expect(composer).to have_composer_preview
+    expect(composer).to have_composer_preview_toggle
+  end
+
+  it "hides the preview when a category with a form template is selected" do
+    category_page.visit(category_with_template_1)
+    category_page.new_topic_button.click
+    expect(composer).to have_no_composer_preview
+    expect(composer).to have_no_composer_preview_toggle
+  end
+
+  it "shows the correct template when switching categories" do
+    category_page.visit(category_no_template)
+    category_page.new_topic_button.click
+    # first category has no template
+    expect(composer).to have_composer_input
+    # switch to category with topic template
+    composer.switch_category(category_topic_template.name)
+    expect(composer).to have_composer_input
+    expect(composer).to have_content(category_topic_template.topic_template)
+    # switch to category with form template
+    composer.switch_category(category_with_template_1.name)
+    expect(composer).to have_form_template
+    expect(composer).to have_form_template_field("input")
+    # switch to category with a different form template
+    composer.switch_category(category_with_template_2.name)
+    expect(composer).to have_form_template
+    expect(composer).to have_form_template_field("checkbox")
+  end
+
+  it "does not show form template chooser when a category only has form template" do
+    category_page.visit(category_with_template_1)
+    category_page.new_topic_button.click
+    expect(composer).to have_no_form_template_chooser
+  end
+
+  it "shows form template chooser when a category has multiple form templates" do
+    category_page.visit(category_with_multiple_templates_1)
+    category_page.new_topic_button.click
+    expect(composer).to have_form_template_chooser
+  end
+
+  it "updates the form template when a different template is selected" do
+    category_page.visit(category_with_multiple_templates_1)
+    category_page.new_topic_button.click
+    expect(composer).to have_form_template_field("input")
+    form_template_chooser.select_row_by_name(form_template_2.name)
+    expect(composer).to have_form_template_field("checkbox")
+  end
+
+  it "shows the correct template options when switching categories" do
+    category_page.visit(category_with_multiple_templates_1)
+    category_page.new_topic_button.click
+    expect(composer).to have_form_template_chooser
+    form_template_chooser.expand
+    expect(form_template_chooser).to have_selected_choice_name(form_template_1.name)
+    expect(form_template_chooser).to have_option_name(form_template_2.name)
+    composer.switch_category(category_with_multiple_templates_2.name)
+    form_template_chooser.expand
+    expect(form_template_chooser).to have_selected_choice_name(form_template_3.name)
+    expect(form_template_chooser).to have_option_name(form_template_4.name)
+  end
+
+  it "shows the correct template name in the dropdown header after switching templates" do
+    category_page.visit(category_with_multiple_templates_1)
+    category_page.new_topic_button.click
+    expect(form_template_chooser).to have_selected_name(form_template_1.name)
+    form_template_chooser.select_row_by_name(form_template_2.name)
+    expect(form_template_chooser).to have_selected_name(form_template_2.name)
+  end
+
+  it "forms a post when template fields are filled in" do
+    topic_title = "A topic about Batman"
+
+    category_page.visit(category_with_template_1)
+    category_page.new_topic_button.click
+    composer.fill_title(topic_title)
+    composer.fill_form_template_field("input", "Bruce Wayne")
+    composer.create
+    topic = Topic.where(user: user, title: topic_title)
+    topic_id = Topic.where(user: user, title: topic_title).pluck(:id)
+    post = Post.where(topic_id: topic_id).first
+
+    expect(topic_page).to have_topic_title(topic_title)
+    expect(find("#{topic_page.post_by_number_selector(1)} .cooked p")).to have_content(
+      "Bruce Wayne",
+    )
+  end
+
+  it "creates a post with an upload field" do
+    topic_title = "Bruce Wayne's Medication"
+
+    category_page.visit(category_with_upload_template)
+    category_page.new_topic_button.click
+    attach_file "upload-your-prescription-uploader",
+                "#{Rails.root}/spec/fixtures/images/logo.png",
+                make_visible: true
+    composer.fill_title(topic_title)
+    composer.fill_form_template_field("input", "Bruce Wayne")
+    composer.create
+
+    expect(find("#{topic_page.post_by_number_selector(1)} .cooked")).to have_css(
+      "img[alt='logo.png']",
+    )
+  end
+
+  it "doesn't allow uploading an invalid file type" do
+    topic_title = "Bruce Wayne's Medication"
+
+    category_page.visit(category_with_upload_template)
+    category_page.new_topic_button.click
+    attach_file "upload-your-prescription-uploader",
+                "#{Rails.root}/spec/fixtures/images/animated.gif",
+                make_visible: true
+    expect(find("#dialog-holder .dialog-body p", visible: :all)).to have_content(
+      I18n.t("js.pick_files_button.unsupported_file_picked", { types: ".jpg, .png" }),
+    )
+  end
+
+  it "creates a post with multiple uploads" do
+    topic_title = "Peter Parker's Medication"
+
+    category_page.visit(category_with_upload_template)
+    category_page.new_topic_button.click
+    attach_file "upload-your-prescription-uploader",
+                "#{Rails.root}/spec/fixtures/images/logo.png",
+                make_visible: true
+    attach_file "any-additional-docs-uploader",
+                [
+                  "#{Rails.root}/spec/fixtures/media/small.mp3",
+                  "#{Rails.root}/spec/fixtures/media/small.mp4",
+                  "#{Rails.root}/spec/fixtures/pdf/small.pdf",
+                ],
+                make_visible: true
+    composer.fill_title(topic_title)
+    composer.fill_form_template_field("input", "Peter Parker}")
+    composer.create
+
+    expect(find("#{topic_page.post_by_number_selector(1)} .cooked")).to have_css(
+      "img[alt='logo.png']",
+    )
+    expect(find("#{topic_page.post_by_number_selector(1)} .cooked")).to have_css("a.attachment")
+    expect(find("#{topic_page.post_by_number_selector(1)} .cooked")).to have_css("audio")
+    expect(find("#{topic_page.post_by_number_selector(1)} .cooked")).to have_css("video")
+  end
+end
diff --git a/spec/system/composer/default_to_subcategory_spec.rb b/spec/system/composer/default_to_subcategory_spec.rb
new file mode 100644
index 00000000000..c0ecc724264
--- /dev/null
+++ b/spec/system/composer/default_to_subcategory_spec.rb
@@ -0,0 +1,105 @@
+# frozen_string_literal: true
+
+describe "Default to Subcategory when parent Category doesn't allow posting", type: :system do
+  fab!(:user) { Fabricate(:user) }
+  fab!(:group) { Fabricate(:group) }
+  fab!(:group_user) { Fabricate(:group_user, user: user, group: group) }
+  fab!(:default_latest_category) { Fabricate(:category, name: "General") }
+  fab!(:category) { Fabricate(:private_category, group: group, permission_type: 3) }
+  fab!(:subcategory) do
+    Fabricate(:private_category, parent_category_id: category.id, group: group, permission_type: 1)
+  end
+  fab!(:category_with_no_subcategory) do
+    Fabricate(:category_with_group_and_permission, group: group, permission_type: 3)
+  end
+  let(:category_page) { PageObjects::Pages::Category.new }
+
+  describe "anon user" do
+    it "can visit the category" do
+      category_page.visit(category_with_no_subcategory)
+      select_kit = PageObjects::Components::SelectKit.new(".navigation-container")
+      expect(select_kit).to have_selected_value(category_with_no_subcategory.id)
+    end
+  end
+
+  describe "logged in user" do
+    before { sign_in(user) }
+    describe "default_subcategory_on_read_only_category setting enabled and can't post on parent category" do
+      before { SiteSetting.default_subcategory_on_read_only_category = true }
+
+      describe "default_composer_category set" do
+        before { SiteSetting.default_composer_category = default_latest_category.id }
+        describe "Can't post on parent category" do
+          describe "Category has subcategory" do
+            it "should have 'New Topic' button enabled and default Subcategory set in the composer" do
+              category_page.visit(category)
+              expect(category_page).to have_button("New Topic", disabled: false)
+              category_page.new_topic_button.click
+              select_kit =
+                PageObjects::Components::SelectKit.new("#reply-control.open .category-chooser")
+              expect(select_kit).to have_selected_value(subcategory.id)
+            end
+          end
+          describe "Category does not have subcategory" do
+            it "should have the 'New Topic' button enabled and default Subcategory set to latest default subcategory" do
+              category_page.visit(category_with_no_subcategory)
+              expect(category_page).to have_button("New Topic", disabled: false)
+              category_page.new_topic_button.click
+              select_kit =
+                PageObjects::Components::SelectKit.new("#reply-control.open .category-chooser")
+              expect(select_kit).to have_selected_value(default_latest_category.id)
+            end
+          end
+        end
+        describe "Can post on home page" do
+          it "should have the default category set in the composer" do
+            page.visit("latest")
+            expect(page).to have_button("New Topic", disabled: false)
+            page.find("#create-topic").click
+            select_kit =
+              PageObjects::Components::SelectKit.new("#reply-control.open .category-chooser")
+            expect(select_kit).to have_selected_value(default_latest_category.id)
+          end
+        end
+      end
+
+      describe "default_composer_category not set" do
+        before do
+          SiteSetting.default_composer_category = ""
+          SiteSetting.allow_uncategorized_topics = false
+        end
+        describe "Can't post on parent category" do
+          describe "Category does not have subcategory" do
+            it "should have the 'New Topic' button enabled and default Subcategory not set" do
+              category_page.visit(category_with_no_subcategory)
+              expect(category_page).to have_button("New Topic", disabled: false)
+              category_page.new_topic_button.click
+              select_kit =
+                PageObjects::Components::SelectKit.new("#reply-control.open .category-chooser")
+              expect(select_kit).to have_selected_name("category&hellip;")
+            end
+          end
+        end
+        describe "Can post on home page" do
+          it "composer should open" do
+            page.visit("latest")
+            expect(page).to have_button("New Topic", disabled: false)
+            page.find("#create-topic").click
+
+            select_kit =
+              PageObjects::Components::SelectKit.new("#reply-control.open .category-chooser")
+            expect(select_kit).to have_selected_name("category&hellip;")
+          end
+        end
+      end
+    end
+
+    describe "Setting disabled and can't post on parent category" do
+      before { SiteSetting.default_subcategory_on_read_only_category = false }
+      it "should have 'New Topic' button disabled" do
+        category_page.visit(category)
+        expect(category_page).to have_button("New Topic", disabled: true)
+      end
+    end
+  end
+end
diff --git a/spec/system/composer/dont_feed_the_trolls_popup_spec.rb b/spec/system/composer/dont_feed_the_trolls_popup_spec.rb
new file mode 100644
index 00000000000..2cf764c9333
--- /dev/null
+++ b/spec/system/composer/dont_feed_the_trolls_popup_spec.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+describe "Composer don't feed the trolls popup", type: :system do
+  fab!(:user) { Fabricate(:user) }
+  fab!(:troll) { Fabricate(:user) }
+  fab!(:topic) { Fabricate(:topic, user: user) }
+  fab!(:post) { Fabricate(:post, user: user, topic: topic) }
+  fab!(:reply) { Fabricate(:post, user: troll, topic: topic) }
+  fab!(:flag) { Fabricate(:flag, post: reply, user: user) }
+  let(:topic_page) { PageObjects::Pages::Topic.new }
+
+  before { sign_in user }
+
+  it "shows a popup when about to reply to a troll" do
+    skip(
+      "TGX: This does not work when Capybara.disable_animation is set to true. We're in the midst of fixing this.",
+    )
+
+    SiteSetting.educate_until_posts = 0
+
+    topic_page.visit_topic(topic)
+    topic_page.click_post_action_button(reply, :reply)
+
+    expect(topic_page).to have_composer_popup_content(I18n.t("education.dont_feed_the_trolls"))
+  end
+end
diff --git a/spec/system/composer/preview_spec.rb b/spec/system/composer/preview_spec.rb
new file mode 100644
index 00000000000..271f262fe60
--- /dev/null
+++ b/spec/system/composer/preview_spec.rb
@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+describe "Composer Preview", type: :system do
+  fab!(:user) { Fabricate(:user, username: "bob") }
+  let(:composer) { PageObjects::Components::Composer.new }
+
+  before { sign_in user }
+
+  it "correctly updates code blocks in diffhtml preview" do
+    SiteSetting.enable_diffhtml_preview = true
+
+    visit("/latest")
+    find("#create-topic").click
+
+    expect(composer).to have_composer_input
+    composer.fill_content <<~MD
+      ```rb
+      const = {
+        id: t.name,
+        text: t.name,
+        name: t.name,
+      ```
+    MD
+
+    within(composer.preview) { expect(find("code.language-ruby")).to have_content("const = {") }
+
+    composer.move_cursor_after("const")
+    composer.type_content("ant")
+
+    within(composer.preview) { expect(find("code.language-ruby")).to have_content("constant = {") }
+  end
+
+  it "correctly updates mentions in diffhtml preview" do
+    SiteSetting.enable_diffhtml_preview = true
+
+    visit("/latest")
+    find("#create-topic").click
+
+    expect(composer).to have_composer_input
+    composer.fill_content <<~MD
+      @bob text
+    MD
+
+    within(composer.preview) { expect(page.find("a.mention")).to have_text("@bob") }
+
+    composer.select_all
+    composer.type_content("@system")
+
+    within(composer.preview) { expect(page.find("a.mention")).to have_text("@system") }
+  end
+end
diff --git a/spec/system/composer/review_media_unless_trust_level_spec.rb b/spec/system/composer/review_media_unless_trust_level_spec.rb
new file mode 100644
index 00000000000..487d0beca2d
--- /dev/null
+++ b/spec/system/composer/review_media_unless_trust_level_spec.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+describe "Composer using review_media", type: :system do
+  fab!(:user) { Fabricate(:user) }
+  fab!(:topic) { Fabricate(:topic, category: Category.find(SiteSetting.uncategorized_category_id)) }
+  fab!(:post) { Fabricate(:post, topic: topic) }
+  let(:topic_page) { PageObjects::Pages::Topic.new }
+
+  before do
+    SiteSetting.review_media_unless_trust_level = 3
+    sign_in user
+  end
+
+  it "does not flag a post with an emoji" do
+    topic_page.visit_topic_and_open_composer(topic)
+    topic_page.fill_in_composer(" this one has an emoji: :mask: ")
+
+    within(".d-editor-preview") { expect(page).to have_css(".emoji") }
+    topic_page.send_reply
+
+    expect(topic_page).to have_post_number(2)
+    expect(page).not_to have_css(".post-enqueued-modal")
+  end
+
+  it "flags a post with an image" do
+    topic_page.visit_topic_and_open_composer(topic)
+    topic_page.fill_in_composer(" this one has an upload: ")
+
+    attach_file "file-uploader", "#{Rails.root}/spec/fixtures/images/logo.jpg", make_visible: true
+    within(".d-editor-preview") { expect(page).to have_css("img") }
+    topic_page.send_reply
+
+    expect(page).to have_css(".post-enqueued-modal")
+  end
+end
diff --git a/spec/system/composer/template_validation_spec.rb b/spec/system/composer/template_validation_spec.rb
new file mode 100644
index 00000000000..05a2d62938c
--- /dev/null
+++ b/spec/system/composer/template_validation_spec.rb
@@ -0,0 +1,109 @@
+# frozen_string_literal: true
+
+describe "Composer Form Template Validations", type: :system, js: true do
+  fab!(:user) { Fabricate(:user) }
+  fab!(:form_template) do
+    Fabricate(
+      :form_template,
+      name: "Bug Reports",
+      template:
+        "- type: input
+  attributes:
+    label: What is your full name?
+    placeholder: John Doe
+  validations:
+    required: true
+    type: email
+    min: 10",
+    )
+  end
+
+  fab!(:form_template_2) do
+    Fabricate(
+      :form_template,
+      name: "Websites",
+      template:
+        "- type: input
+  attributes:
+    label: What is your website name?
+    placeholder: https://www.example.com
+  validations:
+    pattern: https?://.+",
+    )
+  end
+  fab!(:category_with_template) do
+    Fabricate(
+      :category,
+      name: "Reports",
+      slug: "reports",
+      topic_count: 2,
+      form_template_ids: [form_template.id],
+    )
+  end
+  fab!(:category_with_template_2) do
+    Fabricate(
+      :category,
+      name: "Websites",
+      slug: "websites",
+      topic_count: 2,
+      form_template_ids: [form_template_2.id],
+    )
+  end
+  let(:category_page) { PageObjects::Pages::Category.new }
+  let(:composer) { PageObjects::Components::Composer.new }
+  let(:topic_title) { "A topic about Batman" }
+
+  before do
+    SiteSetting.experimental_form_templates = true
+    sign_in user
+  end
+
+  it "shows an asterisk on the label of the required fields" do
+    category_page.visit(category_with_template)
+    category_page.new_topic_button.click
+    expect(composer).to have_form_template_field_required_indicator("input")
+  end
+
+  it "shows an error when a required input is not filled in" do
+    category_page.visit(category_with_template)
+    category_page.new_topic_button.click
+    composer.fill_title(topic_title)
+    composer.create
+    expect(composer).to have_form_template_field_error(
+      I18n.t("js.form_templates.errors.valueMissing.default"),
+    )
+  end
+
+  it "shows an error when an input filled doesn't satisfy the type expected" do
+    category_page.visit(category_with_template)
+    category_page.new_topic_button.click
+    composer.fill_title(topic_title)
+    composer.create
+    composer.fill_form_template_field("input", "Bruce Wayne")
+    expect(composer).to have_form_template_field_error(
+      I18n.t("js.form_templates.errors.typeMismatch.email"),
+    )
+  end
+
+  it "shows an error when an input doesn't satisfy the min length expected" do
+    category_page.visit(category_with_template)
+    category_page.new_topic_button.click
+    composer.fill_title(topic_title)
+    composer.create
+    composer.fill_form_template_field("input", "b@b.com")
+    expect(composer).to have_form_template_field_error(
+      I18n.t("js.form_templates.errors.tooShort", minLength: 10),
+    )
+  end
+
+  it "shows an error when an input doesn't satisfy the requested pattern" do
+    category_page.visit(category_with_template_2)
+    category_page.new_topic_button.click
+    composer.fill_title(topic_title)
+    composer.fill_form_template_field("input", "www.example.com")
+    composer.create
+    expect(composer).to have_form_template_field_error(
+      I18n.t("js.form_templates.errors.patternMismatch"),
+    )
+  end
+end
diff --git a/spec/system/csv_exports_spec.rb b/spec/system/csv_exports_spec.rb
new file mode 100644
index 00000000000..9a477bddcd2
--- /dev/null
+++ b/spec/system/csv_exports_spec.rb
@@ -0,0 +1,314 @@
+# frozen_string_literal: true
+
+RSpec.describe "CSV Exports", type: :system do
+  fab!(:admin) { Fabricate(:admin) }
+  let(:csv_export_pm_page) { PageObjects::Pages::CSVExportPM.new }
+
+  time_format = "%Y-%m-%d %H:%M:%S UTC"
+
+  before do
+    Jobs.run_immediately!
+    sign_in(admin)
+  end
+
+  context "with user list" do
+    fab!(:group1) { Fabricate(:group) }
+    fab!(:group2) { Fabricate(:group) }
+    fab!(:user) do
+      Fabricate(
+        :user,
+        title: "dr",
+        last_seen_at: Time.now,
+        last_posted_at: Time.now,
+        last_emailed_at: Time.now,
+        approved: true,
+        suspended_at: Time.now,
+        suspended_till: Time.now,
+        silenced_till: Time.now,
+        admin: true,
+        moderator: true,
+        staged: true,
+        group_ids: [group1.id, group2.id],
+      )
+    end
+    let(:second_email) { "second_email@discourse.org" }
+    let(:third_email) { "third_email@discourse.org" }
+
+    before do
+      user.user_emails.create!(email: second_email)
+      user.user_emails.create!(email: third_email)
+
+      user.user_stat.topics_entered = 111
+      user.user_stat.posts_read_count = 112
+      user.user_stat.time_read = 113
+      user.user_stat.topic_count = 114
+      user.user_stat.post_count = 115
+      user.user_stat.likes_given = 116
+      user.user_stat.likes_received = 117
+      user.user_stat.save!
+
+      user.user_profile.location = "Tbilisi"
+      user.user_profile.website = "https://www.discourse.org"
+      user.user_profile.views = 5
+      user.user_profile.save!
+    end
+
+    xit "exports data" do
+      visit "admin/users/list/active"
+      click_button "Export"
+
+      visit "/u/#{admin.username}/messages"
+      click_link "[User List] Data export complete"
+      expect(csv_export_pm_page).to have_download_link
+      exported_data = csv_export_pm_page.download_and_extract
+
+      expect(exported_data.length).to be(5)
+      expect(exported_data.first).to eq(
+        %w[
+          id
+          name
+          username
+          email
+          title
+          created_at
+          last_seen_at
+          last_posted_at
+          last_emailed_at
+          trust_level
+          approved
+          suspended_at
+          suspended_till
+          silenced_till
+          active
+          admin
+          moderator
+          ip_address
+          staged
+          secondary_emails
+          topics_entered
+          posts_read_count
+          time_read
+          topic_count
+          post_count
+          likes_given
+          likes_received
+          location
+          website
+          views
+          group_names
+        ],
+      )
+      expect(exported_data.last).to eq(
+        [
+          user.id.to_s,
+          user.name,
+          user.username,
+          user.email,
+          user.title,
+          user.created_at.strftime(time_format),
+          user.last_seen_at.strftime(time_format),
+          user.last_posted_at.strftime(time_format),
+          user.last_emailed_at.strftime(time_format),
+          user.trust_level.to_s,
+          user.approved.to_s,
+          user.suspended_at.strftime(time_format),
+          user.suspended_till.strftime(time_format),
+          user.silenced_till.strftime(time_format),
+          user.active.to_s,
+          user.admin.to_s,
+          user.moderator.to_s,
+          user.ip_address.to_s,
+          user.staged.to_s,
+          "#{second_email};#{third_email}",
+          user.user_stat.topics_entered.to_s,
+          user.user_stat.posts_read_count.to_s,
+          user.user_stat.time_read.to_s,
+          user.user_stat.topic_count.to_s,
+          user.user_stat.post_count.to_s,
+          user.user_stat.likes_given.to_s,
+          user.user_stat.likes_received.to_s,
+          user.user_profile.location,
+          user.user_profile.website,
+          user.user_profile.views.to_s,
+          "#{group1.name};#{group2.name}",
+        ],
+      )
+    ensure
+      csv_export_pm_page.clear_downloads
+    end
+  end
+
+  context "with stuff actions log" do
+    fab!(:user_history) do
+      Fabricate(
+        :user_history,
+        acting_user: admin,
+        action: UserHistory.actions[:change_site_setting],
+        subject: "default_trust_level",
+        details: "details",
+        context: "context",
+      )
+    end
+
+    xit "exports data" do
+      visit "admin/logs/staff_action_logs"
+      click_button "Export"
+
+      visit "/u/#{admin.username}/messages"
+      click_link "[Staff Action] Data export complete"
+      expect(csv_export_pm_page).to have_download_link
+      exported_data = csv_export_pm_page.download_and_extract
+
+      expect(exported_data.first).to eq(%w[staff_user action subject created_at details context])
+
+      expect(exported_data.last).to eq(
+        [
+          user_history.acting_user.username,
+          "change_site_setting",
+          user_history.subject,
+          user_history.created_at.strftime(time_format),
+          user_history.details,
+          user_history.context,
+        ],
+      )
+    ensure
+      csv_export_pm_page.clear_downloads
+    end
+  end
+
+  context "with reports" do
+    before do
+      freeze_time # otherwise the test can fail when ran in midnight
+      Fabricate(:bookmark)
+    end
+
+    xit "exports the Bookmarks report" do
+      visit "admin/reports/bookmarks"
+      click_button "Export"
+
+      visit "/u/#{admin.username}/messages"
+      click_link "[Bookmarks] Data export complete"
+      expect(csv_export_pm_page).to have_download_link
+      exported_data = csv_export_pm_page.download_and_extract
+
+      expect(exported_data.length).to be(2)
+      expect(exported_data.first).to eq(%w[Day Count])
+      expect(exported_data.second).to eq([Time.now.strftime("%Y-%m-%d"), "1"])
+    ensure
+      csv_export_pm_page.clear_downloads
+    end
+  end
+
+  context "with screened emails" do
+    fab!(:screened_email) do
+      Fabricate(
+        :screened_email,
+        action_type: ScreenedEmail.actions[:do_nothing],
+        match_count: 5,
+        last_match_at: Time.now,
+        created_at: Time.now,
+        ip_address: "94.99.101.228",
+      )
+    end
+
+    xit "exports data" do
+      visit "admin/logs/screened_emails"
+      click_button "Export"
+
+      visit "/u/#{admin.username}/messages"
+      click_link "[Screened Email] Data export complete"
+      expect(csv_export_pm_page).to have_download_link
+      exported_data = csv_export_pm_page.download_and_extract
+
+      expect(exported_data.length).to be(2)
+      expect(exported_data.first).to eq(
+        %w[email action match_count last_match_at created_at ip_address],
+      )
+      expect(exported_data.second).to eq(
+        [
+          screened_email.email,
+          "do_nothing",
+          screened_email.match_count.to_s,
+          screened_email.last_match_at.strftime(time_format),
+          screened_email.created_at.strftime(time_format),
+          screened_email.ip_address.to_s,
+        ],
+      )
+    ensure
+      csv_export_pm_page.clear_downloads
+    end
+  end
+
+  context "with screened ips" do
+    fab!(:screened_ip) do
+      Fabricate(
+        :screened_ip_address,
+        action_type: ScreenedIpAddress.actions[:do_nothing],
+        match_count: 5,
+        ip_address: "99.232.23.124",
+        last_match_at: Time.now,
+        created_at: Time.now,
+      )
+    end
+
+    xit "exports data" do
+      visit "admin/logs/screened_ip_addresses"
+      click_button "Export"
+
+      visit "/u/#{admin.username}/messages"
+      click_link "[Screened Ip] Data export complete"
+      expect(csv_export_pm_page).to have_download_link
+      exported_data = csv_export_pm_page.download_and_extract
+
+      expect(exported_data.first).to eq(%w[ip_address action match_count last_match_at created_at])
+      expect(exported_data.second).to eq(
+        [
+          screened_ip.ip_address.to_s,
+          "do_nothing",
+          screened_ip.match_count.to_s,
+          screened_ip.last_match_at.strftime(time_format),
+          screened_ip.created_at.strftime(time_format),
+        ],
+      )
+    ensure
+      csv_export_pm_page.clear_downloads
+    end
+  end
+
+  context "with screened urls" do
+    fab!(:screened_url) do
+      Fabricate(
+        :screened_url,
+        action_type: ScreenedUrl.actions[:do_nothing],
+        match_count: 5,
+        domain: "https://discourse.org",
+        last_match_at: Time.now,
+        created_at: Time.now,
+      )
+    end
+
+    xit "exports data" do
+      visit "admin/logs/screened_urls"
+      click_button "Export"
+
+      visit "/u/#{admin.username}/messages"
+      click_link "[Screened Url] Data export complete"
+      expect(csv_export_pm_page).to have_download_link
+      exported_data = csv_export_pm_page.download_and_extract
+
+      expect(exported_data.length).to be(2)
+      expect(exported_data.first).to eq(%w[domain action match_count last_match_at created_at])
+      expect(exported_data.second).to eq(
+        [
+          screened_url.domain,
+          "do nothing",
+          screened_url.match_count.to_s,
+          screened_url.last_match_at.strftime(time_format),
+          screened_url.created_at.strftime(time_format),
+        ],
+      )
+    ensure
+      csv_export_pm_page.clear_downloads
+    end
+  end
+end
diff --git a/spec/system/custom_sidebar_sections_spec.rb b/spec/system/custom_sidebar_sections_spec.rb
new file mode 100644
index 00000000000..b13d448c288
--- /dev/null
+++ b/spec/system/custom_sidebar_sections_spec.rb
@@ -0,0 +1,257 @@
+# frozen_string_literal: true
+
+describe "Custom sidebar sections", type: :system do
+  fab!(:user) { Fabricate(:user) }
+  fab!(:admin) { Fabricate(:admin) }
+  let(:section_modal) { PageObjects::Modals::SidebarSectionForm.new }
+  let(:sidebar) { PageObjects::Components::NavigationMenu::Sidebar.new }
+
+  before { user.user_option.update!(external_links_in_new_tab: true) }
+
+  shared_examples "creating custom sections" do |relative_root_url|
+    it "allows the user to create custom section" do
+      visit("#{relative_root_url}/latest")
+
+      expect(sidebar).to have_no_add_section_button
+
+      sign_in user
+      visit("#{relative_root_url}/latest")
+      sidebar.click_add_section_button
+
+      expect(section_modal).to be_visible
+      expect(section_modal).to have_disabled_save
+      expect(sidebar.custom_section_modal_title).to have_content("Add custom section")
+
+      section_modal.fill_name("My section")
+
+      section_modal.fill_link("Sidebar Tags", "/tags")
+      expect(section_modal).to have_enabled_save
+
+      section_modal.save
+
+      expect(sidebar).to have_section("My section")
+      expect(sidebar).to have_section_link("Sidebar Tags")
+    end
+  end
+
+  include_examples "creating custom sections"
+
+  context "when subfolder install" do
+    before { set_subfolder "/community" }
+
+    include_examples "creating custom sections", "/community"
+  end
+
+  it "allows the user to create custom section with /my link" do
+    sign_in user
+    visit("/latest")
+
+    sidebar.click_add_section_button
+    section_modal.fill_name("My section")
+    section_modal.fill_link("My preferences", "/my/preferences")
+    section_modal.save
+
+    expect(sidebar).to have_section("My section")
+    expect(sidebar).to have_section_link("My preferences", target: "_self")
+  end
+
+  it "allows the user to create custom section with /pub link" do
+    sign_in user
+    visit("/latest")
+
+    sidebar.click_add_section_button
+    section_modal.fill_name("My section")
+    section_modal.fill_link("Published Page", "/pub/test")
+    section_modal.save
+
+    expect(sidebar).to have_section("My section")
+    expect(sidebar).to have_section_link("Published Page", target: "_self")
+  end
+
+  it "allows the user to create custom section with external link" do
+    sign_in user
+    visit("/latest")
+    sidebar.click_add_section_button
+
+    expect(section_modal).to be_visible
+    expect(section_modal).to have_disabled_save
+    expect(sidebar.custom_section_modal_title).to have_content("Add custom section")
+
+    section_modal.fill_name("My section")
+
+    section_modal.fill_link("Discourse Homepage", "htt")
+    expect(section_modal).to have_disabled_save
+
+    section_modal.fill_link("Discourse Homepage", "https://discourse.org")
+    expect(section_modal).to have_enabled_save
+
+    section_modal.save
+
+    expect(sidebar).to have_section("My section")
+    expect(sidebar).to have_section_link(
+      "Discourse Homepage",
+      href: "https://discourse.org",
+      target: "_blank",
+    )
+  end
+
+  it "allows the user to edit custom section" do
+    sidebar_section = Fabricate(:sidebar_section, title: "My section", user: user)
+    sidebar_url_1 = Fabricate(:sidebar_url, name: "Sidebar Tags", value: "/tags")
+    Fabricate(:sidebar_section_link, sidebar_section: sidebar_section, linkable: sidebar_url_1)
+    sidebar_url_2 = Fabricate(:sidebar_url, name: "Sidebar Categories", value: "/categories")
+    Fabricate(:sidebar_section_link, sidebar_section: sidebar_section, linkable: sidebar_url_2)
+
+    sign_in user
+    visit("/latest")
+
+    sidebar.edit_custom_section("My section")
+    expect(find("#discourse-modal-title")).to have_content("Edit custom section")
+
+    section_modal.fill_name("Edited section")
+    section_modal.fill_link("Edited Tags", "/tags")
+    section_modal.remove_last_link
+
+    section_modal.save
+
+    expect(sidebar).to have_section("Edited section")
+    expect(sidebar).to have_section_link("Edited Tags")
+
+    expect(sidebar).to have_no_section_link("Sidebar Categories")
+  end
+
+  it "allows the user to reorder links in custom section" do
+    sidebar_section = Fabricate(:sidebar_section, title: "My section", user: user)
+
+    sidebar_url_1 =
+      Fabricate(:sidebar_url, name: "Sidebar Tags", value: "/tags").tap do |sidebar_url|
+        Fabricate(:sidebar_section_link, sidebar_section: sidebar_section, linkable: sidebar_url)
+      end
+
+    sidebar_url_2 =
+      Fabricate(:sidebar_url, name: "Sidebar Categories", value: "/categories").tap do |sidebar_url|
+        Fabricate(:sidebar_section_link, sidebar_section: sidebar_section, linkable: sidebar_url)
+      end
+
+    sidebar_url_3 =
+      Fabricate(:sidebar_url, name: "Sidebar Latest", value: "/latest").tap do |sidebar_url|
+        Fabricate(:sidebar_section_link, sidebar_section: sidebar_section, linkable: sidebar_url)
+      end
+
+    sign_in user
+
+    visit("/latest")
+
+    expect(sidebar.primary_section_links("my-section")).to eq(
+      ["Sidebar Tags", "Sidebar Categories", "Sidebar Latest"],
+    )
+
+    tags_link = find(".sidebar-section-link[data-link-name='Sidebar Tags']")
+    latest_link = find(".sidebar-section-link[data-link-name='Sidebar Latest']")
+    tags_link.drag_to(latest_link, html5: true, delay: 0.4)
+
+    expect(sidebar.primary_section_links("my-section")).to eq(
+      ["Sidebar Categories", "Sidebar Tags", "Sidebar Latest"],
+    )
+  end
+
+  it "does not allow the user to edit public section" do
+    sidebar_section = Fabricate(:sidebar_section, title: "Public section", public: true)
+    sidebar_url_1 = Fabricate(:sidebar_url, name: "Sidebar Tags", value: "/tags")
+    Fabricate(:sidebar_section_link, sidebar_section: sidebar_section, linkable: sidebar_url_1)
+    sidebar_url_2 = Fabricate(:sidebar_url, name: "Sidebar Categories", value: "/categories")
+    Fabricate(:sidebar_section_link, sidebar_section: sidebar_section, linkable: sidebar_url_2)
+
+    sign_in user
+    visit("/latest")
+
+    expect(sidebar).to have_section("Public section")
+
+    find(".sidebar-section[data-section-name='public-section']").hover
+
+    expect(page).not_to have_css(
+      ".sidebar-section[data-section-name='public-section'] button.sidebar-section-header-button",
+    )
+
+    expect(page).not_to have_css(
+      ".sidebar-section[data-section-name='public-section'] .d-icon-globe",
+    )
+  end
+
+  it "allows the user to delete custom section" do
+    sidebar_section = Fabricate(:sidebar_section, title: "My section", user: user)
+    sidebar_url_1 = Fabricate(:sidebar_url, name: "tags", value: "/tags")
+    Fabricate(:sidebar_section_link, sidebar_section: sidebar_section, linkable: sidebar_url_1)
+
+    sign_in user
+    visit("/latest")
+
+    sidebar.edit_custom_section("My section")
+
+    section_modal.delete
+    section_modal.confirm_delete
+
+    expect(sidebar).to have_no_section("My section")
+  end
+
+  it "allows admin to create, edit and delete public section" do
+    sign_in admin
+    visit("/latest")
+    sidebar.click_add_section_button
+
+    section_modal.fill_name("Public section")
+    section_modal.fill_link("Sidebar Tags", "/tags")
+    section_modal.mark_as_public
+    section_modal.save
+
+    expect(sidebar).to have_section("Public section")
+    expect(sidebar).to have_section_link("Sidebar Tags")
+    expect(page).to have_css(".sidebar-section[data-section-name='public-section'] .d-icon-globe")
+
+    sidebar.edit_custom_section("Public section")
+    section_modal.fill_name("Edited public section")
+    section_modal.save
+
+    expect(sidebar).to have_section("Edited public section")
+
+    sidebar.edit_custom_section("Edited public section")
+    section_modal.delete
+    section_modal.confirm_delete
+
+    expect(sidebar).to have_no_section("Edited public section")
+  end
+
+  it "shows anonymous public sections" do
+    sidebar_section = Fabricate(:sidebar_section, title: "Public section", public: true)
+    sidebar_url_1 = Fabricate(:sidebar_url, name: "Sidebar Tags", value: "/tags")
+    Fabricate(:sidebar_section_link, sidebar_section: sidebar_section, linkable: sidebar_url_1)
+    sidebar_url_2 = Fabricate(:sidebar_url, name: "Sidebar Categories", value: "/categories")
+    Fabricate(:sidebar_section_link, sidebar_section: sidebar_section, linkable: sidebar_url_2)
+
+    visit("/latest")
+    expect(sidebar).to have_section("Public section")
+    expect(sidebar).to have_section_link("Sidebar Tags")
+    expect(sidebar).to have_section_link("Sidebar Categories")
+  end
+
+  it "validates custom section fields" do
+    sign_in user
+    visit("/latest")
+    sidebar.click_add_section_button
+
+    section_modal.fill_name("A" * (SidebarSection::MAX_TITLE_LENGTH + 1))
+    section_modal.fill_link("B" * (SidebarUrl::MAX_NAME_LENGTH + 1), "/wrong-url")
+
+    expect(page.find(".title.warning")).to have_content("Title must be shorter than 30 characters")
+    expect(page.find(".name.warning")).to have_content("Name must be shorter than 80 characters")
+    expect(page.find(".value.warning")).to have_content("Format is invalid")
+
+    section_modal.fill_name("")
+    section_modal.fill_link("", "")
+    expect(page.find(".title.warning")).to have_content("Title cannot be blank")
+    expect(page.find(".name.warning")).to have_content("Name cannot be blank")
+    expect(page.find(".value.warning")).to have_content("Link cannot be blank")
+
+    expect(section_modal).to have_disabled_save
+  end
+end
diff --git a/spec/system/discovery_breadcrumb_navigation_spec.rb b/spec/system/discovery_breadcrumb_navigation_spec.rb
new file mode 100644
index 00000000000..d72fd1f1e43
--- /dev/null
+++ b/spec/system/discovery_breadcrumb_navigation_spec.rb
@@ -0,0 +1,110 @@
+# frozen_string_literal: true
+
+describe "Navigating with breadcrumbs", type: :system do
+  let(:discovery) { PageObjects::Pages::Discovery.new }
+
+  fab!(:category1) { Fabricate(:category) }
+  fab!(:c1_topic) { Fabricate(:topic, category: category1) }
+
+  fab!(:category2) { Fabricate(:category) }
+  fab!(:c2_topic) { Fabricate(:topic, category: category2) }
+  fab!(:category2_child) { Fabricate(:category, parent_category: category2) }
+  fab!(:c2_child_topic) { Fabricate(:topic, category: category2_child) }
+
+  fab!(:category3) { Fabricate(:category, default_list_filter: "none") }
+  fab!(:c3_topic) { Fabricate(:topic, category: category3) }
+  fab!(:category3_child) { Fabricate(:category, parent_category: category3) }
+  fab!(:c3_child_topic) { Fabricate(:topic, category: category3_child) }
+
+  it "can navigate between categories" do
+    visit("/c/#{category1.id}")
+
+    expect(page).to have_current_path("/c/#{category1.slug}/#{category1.id}")
+    expect(discovery.topic_list).to have_topic(c1_topic)
+    expect(discovery.topic_list).to have_topics(count: 1)
+
+    expect(discovery.category_drop).to have_selected_value(category1.id)
+    discovery.category_drop.select_row_by_value(category2.id)
+
+    expect(page).to have_current_path("/c/#{category2.slug}/#{category2.id}")
+    expect(discovery.topic_list).to have_topic(c2_topic)
+    expect(discovery.topic_list).to have_topic(c2_child_topic)
+    expect(discovery.topic_list).to have_topics(count: 2)
+
+    # When using breadcrumbs for navigation, default_list_filter does not apply
+    discovery.category_drop.select_row_by_value(category3.id)
+    expect(discovery.topic_list).to have_topic(c3_topic)
+    expect(discovery.topic_list).to have_topic(c3_child_topic)
+    expect(discovery.topic_list).to have_topics(count: 2)
+
+    expect(discovery.subcategory_drop).to have_selected_value("") # all
+
+    discovery.subcategory_drop.select_row_by_value("no-categories")
+    expect(discovery.topic_list).to have_topic(c3_topic)
+    expect(discovery.topic_list).to have_topics(count: 1)
+
+    discovery.subcategory_drop.select_row_by_value(category3_child.id)
+    expect(discovery.topic_list).to have_topic(c3_child_topic)
+    expect(discovery.topic_list).to have_topics(count: 1)
+  end
+
+  context "with tags" do
+    fab!(:tag) { Fabricate(:tag) }
+    fab!(:c1_topic_tagged) { Fabricate(:topic, category: category1, tags: [tag]) }
+    fab!(:c3_topic_tagged) { Fabricate(:topic, category: category3, tags: [tag]) }
+    fab!(:c3_child_topic_tagged) { Fabricate(:topic, category: category3_child, tags: [tag]) }
+
+    it "can filter by tags" do
+      visit("/c/#{category1.id}")
+      expect(page).to have_current_path("/c/#{category1.slug}/#{category1.id}")
+      expect(discovery.topic_list).to have_topic(c1_topic)
+      expect(discovery.topic_list).to have_topic(c1_topic_tagged)
+      expect(discovery.topic_list).to have_topics(count: 2)
+
+      expect(discovery.tag_drop).to have_selected_name("all tags")
+      discovery.tag_drop.select_row_by_value(tag.name)
+
+      expect(discovery.topic_list).to have_topics(count: 1)
+      expect(discovery.topic_list).to have_topic(c1_topic_tagged)
+    end
+
+    it "maintains no-subcategories option" do
+      visit("/c/#{category3.slug}/#{category3.id}/none")
+      expect(discovery.topic_list).to have_topic(c3_topic)
+      expect(discovery.topic_list).to have_topic(c3_topic_tagged)
+      expect(discovery.topic_list).to have_topics(count: 2)
+
+      expect(discovery.subcategory_drop).to have_selected_name("none")
+      expect(discovery.tag_drop).to have_selected_name("all tags")
+      discovery.tag_drop.select_row_by_value(tag.name)
+
+      expect(page).to have_current_path(
+        "/tags/c/#{category3.slug}/#{category3.id}/none/#{tag.name}",
+      )
+      expect(discovery.topic_list).to have_topics(count: 1)
+      expect(discovery.topic_list).to have_topic(c3_topic_tagged)
+    end
+  end
+
+  describe "initial page loads for no-subcategories" do
+    it "shows correct data for /c/" do
+      visit("/c/#{category3.id}")
+      expect(page).to have_current_path("/c/#{category3.slug}/#{category3.id}/none")
+      expect(discovery.topic_list).to have_topic(c3_topic)
+      expect(discovery.topic_list).to have_topics(count: 1)
+    end
+
+    it "shows correct data for /tags/c/" do
+      tag = Fabricate(:tag)
+      c3_topic.update!(tags: [tag])
+      c3_child_topic.update!(tags: [tag])
+
+      visit("/tags/c/#{category3.slug}/#{category3.id}/#{tag.name}")
+      expect(page).to have_current_path(
+        "/tags/c/#{category3.slug}/#{category3.id}/none/#{tag.name}",
+      )
+      expect(discovery.topic_list).to have_topic(c3_topic)
+      expect(discovery.topic_list).to have_topics(count: 1)
+    end
+  end
+end
diff --git a/spec/system/dismissing_new_spec.rb b/spec/system/dismissing_new_spec.rb
new file mode 100644
index 00000000000..b74166f5aa5
--- /dev/null
+++ b/spec/system/dismissing_new_spec.rb
@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+
+RSpec.describe "Dismissing New", type: :system do
+  fab!(:user) { Fabricate(:user) }
+
+  let(:topic_list_controls) { PageObjects::Components::TopicListControls.new }
+  let(:topic_list) { PageObjects::Components::TopicList.new }
+  let(:dismiss_new_modal) { PageObjects::Modals::DismissNew.new }
+
+  describe "when a user has an unread post" do
+    fab!(:topic) { Fabricate(:topic, user: user) }
+    fab!(:post1) { create_post(user: user, topic: topic) }
+    fab!(:post2) { create_post(topic: topic) }
+
+    it "should remove the unread post across sessions after the user dismisses it" do
+      sign_in(user)
+
+      visit("/unread")
+
+      expect(topic_list_controls).to have_unread(count: 1)
+
+      using_session(:tab_1) do
+        sign_in(user)
+
+        visit("/unread")
+
+        expect(topic_list_controls).to have_unread(count: 1)
+      end
+
+      topic_list_controls.dismiss_unread
+
+      expect(topic_list_controls).to have_unread(count: 0)
+
+      using_session(:tab_1) { expect(topic_list_controls).to have_unread(count: 0) }
+    end
+  end
+
+  describe "when a user has a new topic" do
+    fab!(:topic) { Fabricate(:topic) }
+
+    it "should remove the new topic across sessions after the user dismisses it" do
+      sign_in(user)
+
+      visit("/new")
+
+      expect(topic_list_controls).to have_new(count: 1)
+
+      using_session(:tab_1) do
+        sign_in(user)
+
+        visit("/new")
+
+        expect(topic_list_controls).to have_new(count: 1)
+      end
+
+      topic_list_controls.dismiss_new
+
+      expect(topic_list_controls).to have_new(count: 0)
+
+      using_session(:tab_1) { expect(topic_list_controls).to have_new(count: 0) }
+    end
+  end
+
+  describe "when the `experimental_new_new_view_groups` site setting is enabled" do
+    fab!(:group) { Fabricate(:group).tap { |g| g.add(user) } }
+    fab!(:new_topic) { Fabricate(:topic, user: user) }
+    fab!(:post1) { create_post(user: user) }
+    fab!(:post2) { create_post(topic: post1.topic) }
+
+    before { SiteSetting.experimental_new_new_view_groups = group.name }
+
+    it "should remove the new topic and post across sessions after the user dismisses it" do
+      sign_in(user)
+
+      visit("/new")
+
+      expect(topic_list_controls).to have_new(count: 2)
+
+      using_session(:tab_1) do
+        sign_in(user)
+
+        visit("/new")
+
+        expect(topic_list_controls).to have_new(count: 2)
+      end
+
+      topic_list_controls.dismiss_new
+      dismiss_new_modal.click_dismiss
+
+      expect(topic_list_controls).to have_new(count: 0)
+
+      using_session(:tab_1) { expect(topic_list_controls).to have_new(count: 0) }
+    end
+
+    it "displays confirmation modal with preselected options" do
+      sign_in(user)
+
+      visit("/new")
+
+      expect(topic_list).to have_topic(new_topic)
+      expect(topic_list).to have_topic(post1.topic)
+
+      topic_list_controls.dismiss_new
+
+      expect(dismiss_new_modal).to have_dismiss_topics_checked
+      expect(dismiss_new_modal).to have_dismiss_posts_checked
+      expect(dismiss_new_modal).to have_untrack_unchecked
+
+      dismiss_new_modal.click_dismiss
+
+      expect(topic_list).to have_no_topics
+    end
+  end
+end
diff --git a/spec/system/editing_sidebar_categories_navigation_spec.rb b/spec/system/editing_sidebar_categories_navigation_spec.rb
new file mode 100644
index 00000000000..3f8f1b8e55e
--- /dev/null
+++ b/spec/system/editing_sidebar_categories_navigation_spec.rb
@@ -0,0 +1,275 @@
+# frozen_string_literal: true
+
+RSpec.describe "Editing sidebar categories navigation", type: :system do
+  fab!(:user) { Fabricate(:user) }
+
+  fab!(:category2) { Fabricate(:category, name: "category2") }
+
+  fab!(:category2_subcategory) do
+    Fabricate(:category, parent_category_id: category2.id, name: "category2 subcategory")
+  end
+
+  fab!(:category) { Fabricate(:category, name: "category") }
+
+  fab!(:category_subcategory2) do
+    Fabricate(:category, parent_category_id: category.id, name: "category subcategory 2")
+  end
+
+  fab!(:category_subcategory) do
+    Fabricate(:category, parent_category_id: category.id, name: "category subcategory")
+  end
+
+  let(:sidebar) { PageObjects::Components::NavigationMenu::Sidebar.new }
+
+  before { sign_in(user) }
+
+  shared_examples "a user can edit the sidebar categories navigation" do |mobile|
+    it "allows a user to edit the sidebar categories navigation", mobile: mobile do
+      visit "/latest"
+
+      sidebar.open_on_mobile if mobile
+
+      expect(sidebar).to have_categories_section
+
+      modal = sidebar.click_edit_categories_button
+
+      expect(modal).to have_right_title(I18n.t("js.sidebar.categories_form_modal.title"))
+      try_until_success { expect(modal).to have_focus_on_filter_input }
+      expect(modal).to have_parent_category_color(category)
+      expect(modal).to have_category_description_excerpt(category)
+      expect(modal).to have_parent_category_color(category2)
+      expect(modal).to have_category_description_excerpt(category2)
+      expect(modal).to have_no_reset_to_defaults_button
+
+      expect(modal).to have_categories(
+        [category, category_subcategory, category_subcategory2, category2, category2_subcategory],
+      )
+
+      modal
+        .toggle_category_checkbox(category)
+        .toggle_category_checkbox(category_subcategory2)
+        .toggle_category_checkbox(category2)
+        .save
+
+      expect(modal).to be_closed
+
+      sidebar.open_on_mobile if mobile
+
+      expect(sidebar).to have_section_link(category.name)
+      expect(sidebar).to have_section_link(category_subcategory2.name)
+      expect(sidebar).to have_section_link(category2.name)
+
+      visit "/latest"
+
+      sidebar.open_on_mobile if mobile
+
+      expect(sidebar).to have_categories_section
+      expect(sidebar).to have_section_link(category.name)
+      expect(sidebar).to have_section_link(category_subcategory2.name)
+      expect(sidebar).to have_section_link(category2.name)
+
+      modal = sidebar.click_edit_categories_button
+      modal.toggle_category_checkbox(category_subcategory2).toggle_category_checkbox(category2).save
+
+      expect(modal).to be_closed
+
+      sidebar.open_on_mobile if mobile
+
+      expect(sidebar).to have_section_link(category.name)
+      expect(sidebar).to have_no_section_link(category_subcategory2.name)
+      expect(sidebar).to have_no_section_link(category2.name)
+    end
+  end
+
+  describe "when on desktop" do
+    include_examples "a user can edit the sidebar categories navigation", false
+  end
+
+  describe "when on mobile" do
+    include_examples "a user can edit the sidebar categories navigation", true
+  end
+
+  it "displays the categories in the modal based on the fixed position of the category when `fixed_category_positions` site setting is enabled" do
+    SiteSetting.fixed_category_positions = true
+
+    visit "/latest"
+
+    modal = sidebar.click_edit_categories_button
+
+    expect(modal).to have_categories(
+      [category2, category2_subcategory, category, category_subcategory2, category_subcategory],
+    )
+  end
+
+  it "allows a user to deselect all categories in the modal" do
+    Fabricate(:category_sidebar_section_link, linkable: category, user: user)
+    Fabricate(:category_sidebar_section_link, linkable: category_subcategory2, user: user)
+
+    visit "/latest"
+
+    expect(sidebar).to have_categories_section
+
+    modal = sidebar.click_edit_categories_button
+    modal.deselect_all.save
+
+    expect(sidebar).to have_section_link(category.name)
+    expect(sidebar).to have_no_section_link(category_subcategory2.name)
+    expect(sidebar).to have_section_link(category2.name)
+    expect(sidebar).to have_section_link("Uncategorized")
+  end
+
+  it "allows a user to reset to the default navigation menu categories site setting" do
+    Fabricate(:category_sidebar_section_link, linkable: category, user: user)
+    Fabricate(:category_sidebar_section_link, linkable: category2, user: user)
+
+    SiteSetting.default_navigation_menu_categories =
+      "#{category_subcategory2.id}|#{category2_subcategory.id}"
+
+    visit "/latest"
+
+    expect(sidebar).to have_categories_section
+    expect(sidebar).to have_section_link(category.name)
+    expect(sidebar).to have_section_link(category2.name)
+
+    modal = sidebar.click_edit_categories_button
+    modal.click_reset_to_defaults_button.save
+
+    expect(modal).to be_closed
+
+    expect(sidebar).to have_no_section_link(category.name)
+    expect(sidebar).to have_no_section_link(category2.name)
+    expect(sidebar).to have_section_link(category_subcategory2.name)
+    expect(sidebar).to have_section_link(category2_subcategory.name)
+  end
+
+  it "allows a user to filter the categories in the modal by the category's name" do
+    visit "/latest"
+
+    expect(sidebar).to have_categories_section
+
+    modal = sidebar.click_edit_categories_button
+
+    modal.filter("category subcategory 2")
+
+    expect(modal).to have_categories([category, category_subcategory2])
+
+    modal.filter("2")
+
+    expect(modal).to have_categories(
+      [category, category_subcategory2, category2, category2_subcategory],
+    )
+
+    modal.filter("someinvalidterm")
+
+    expect(modal).to have_no_categories
+  end
+
+  it "allows a user to filter the categories in the modal by selection" do
+    Fabricate(:category_sidebar_section_link, linkable: category_subcategory, user: user)
+    Fabricate(:category_sidebar_section_link, linkable: category2, user: user)
+
+    visit "/latest"
+
+    expect(sidebar).to have_categories_section
+
+    modal = sidebar.click_edit_categories_button
+    modal.filter_by_selected
+
+    expect(modal).to have_categories([category, category_subcategory, category2])
+    expect(modal).to have_checkbox(category, disabled: true)
+    expect(modal).to have_checkbox(category_subcategory)
+    expect(modal).to have_checkbox(category2)
+
+    modal.filter("category subcategory")
+
+    expect(modal).to have_categories([category, category_subcategory])
+    expect(modal).to have_checkbox(category, disabled: true)
+    expect(modal).to have_checkbox(category_subcategory)
+
+    modal.filter("").filter_by_unselected
+
+    expect(modal).to have_categories(
+      [category, category_subcategory2, category2, category2_subcategory],
+    )
+
+    expect(modal).to have_checkbox(category)
+    expect(modal).to have_checkbox(category_subcategory2)
+    expect(modal).to have_checkbox(category2, disabled: true)
+    expect(modal).to have_checkbox(category2_subcategory)
+
+    modal.filter_by_all
+
+    expect(modal).to have_categories(
+      [category, category_subcategory, category_subcategory2, category2, category2_subcategory],
+    )
+
+    expect(modal).to have_checkbox(category)
+    expect(modal).to have_checkbox(category_subcategory)
+    expect(modal).to have_checkbox(category_subcategory2)
+    expect(modal).to have_checkbox(category2)
+    expect(modal).to have_checkbox(category2_subcategory)
+  end
+
+  describe "when max_category_nesting has been set to 3" do
+    before_all { SiteSetting.max_category_nesting = 3 }
+
+    fab!(:category_subcategory_subcategory) do
+      Fabricate(
+        :category,
+        parent_category_id: category_subcategory.id,
+        name: "category subcategory subcategory",
+      )
+    end
+
+    fab!(:category_subcategory_subcategory2) do
+      Fabricate(
+        :category,
+        parent_category_id: category_subcategory.id,
+        name: "category subcategory subcategory 2",
+      )
+    end
+
+    fab!(:category2_subcategory_subcategory) do
+      Fabricate(
+        :category,
+        parent_category_id: category2_subcategory.id,
+        name: "category2 subcategory subcategory",
+      )
+    end
+
+    it "allows a user to edit sub-subcategories to be included in the sidebar categories section" do
+      visit "/latest"
+
+      expect(sidebar).to have_categories_section
+
+      modal = sidebar.click_edit_categories_button
+
+      expect(modal).to have_right_title(I18n.t("js.sidebar.categories_form_modal.title"))
+
+      modal
+        .toggle_category_checkbox(category_subcategory_subcategory)
+        .toggle_category_checkbox(category_subcategory_subcategory2)
+        .toggle_category_checkbox(category2_subcategory_subcategory)
+        .save
+
+      expect(modal).to be_closed
+
+      expect(sidebar).to have_section_link(category_subcategory_subcategory.name)
+      expect(sidebar).to have_section_link(category_subcategory_subcategory2.name)
+      expect(sidebar).to have_section_link(category2_subcategory_subcategory.name)
+    end
+
+    it "allows a user to filter the categories in the modal by the category's name" do
+      visit "/latest"
+
+      expect(sidebar).to have_categories_section
+
+      modal = sidebar.click_edit_categories_button
+      modal.filter("category2 subcategory subcategory")
+
+      expect(modal).to have_categories(
+        [category2, category2_subcategory, category2_subcategory_subcategory],
+      )
+    end
+  end
+end
diff --git a/spec/system/editing_sidebar_community_section_spec.rb b/spec/system/editing_sidebar_community_section_spec.rb
new file mode 100644
index 00000000000..9495aec6cd8
--- /dev/null
+++ b/spec/system/editing_sidebar_community_section_spec.rb
@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+RSpec.describe "Editing Sidebar Community Section", type: :system do
+  fab!(:admin) { Fabricate(:admin) }
+  fab!(:user) { Fabricate(:user) }
+
+  let(:sidebar) { PageObjects::Components::NavigationMenu::Sidebar.new }
+  let(:sidebar_header_dropdown) { PageObjects::Components::NavigationMenu::HeaderDropdown.new }
+
+  it "should not display the edit section button to non admins" do
+    sign_in(user)
+
+    visit("/latest")
+
+    sidebar.click_community_section_more_button
+
+    expect(sidebar).to have_no_customize_community_section_button
+  end
+
+  it "allows admin to edit community section and reset to default" do
+    sign_in(admin)
+
+    visit("/latest")
+
+    expect(sidebar.primary_section_icons("community")).to eq(
+      %w[layer-group user flag wrench ellipsis-v],
+    )
+
+    modal = sidebar.click_community_section_more_button.click_customize_community_section_button
+    modal.fill_link("Topics", "/latest", "paper-plane")
+    modal.topics_link.drag_to(modal.review_link, delay: 0.4)
+    modal.save
+
+    expect(sidebar.primary_section_links("community")).to eq(
+      ["My Posts", "Topics", "Review", "Admin", "More"],
+    )
+
+    expect(sidebar.primary_section_icons("community")).to eq(
+      %w[user paper-plane flag wrench ellipsis-v],
+    )
+
+    modal = sidebar.click_community_section_more_button.click_customize_community_section_button
+    modal.reset
+
+    expect(sidebar).to have_section("Community")
+
+    expect(sidebar.primary_section_links("community")).to eq(
+      ["Topics", "My Posts", "Review", "Admin", "More"],
+    )
+
+    expect(sidebar.primary_section_icons("community")).to eq(
+      %w[layer-group user flag wrench ellipsis-v],
+    )
+  end
+
+  it "should allow admins to open modal to edit the section when `navigation_menu` site setting is `header dropdown`" do
+    SiteSetting.navigation_menu = "header dropdown"
+
+    sign_in(admin)
+
+    visit("/latest")
+
+    modal = sidebar_header_dropdown.open.click_customize_community_section_button
+
+    expect(modal).to be_visible
+  end
+end
diff --git a/spec/system/editing_sidebar_tags_navigation_spec.rb b/spec/system/editing_sidebar_tags_navigation_spec.rb
new file mode 100644
index 00000000000..1c7fa93fe06
--- /dev/null
+++ b/spec/system/editing_sidebar_tags_navigation_spec.rb
@@ -0,0 +1,199 @@
+# frozen_string_literal: true
+
+RSpec.describe "Editing sidebar tags navigation", type: :system do
+  fab!(:user) { Fabricate(:user) }
+  fab!(:tag1) { Fabricate(:tag, name: "tag").tap { |tag| Fabricate.times(3, :topic, tags: [tag]) } }
+
+  fab!(:tag2) do
+    Fabricate(:tag, name: "tag 2").tap { |tag| Fabricate.times(2, :topic, tags: [tag]) }
+  end
+
+  fab!(:tag3) do
+    Fabricate(:tag, name: "tag 3").tap { |tag| Fabricate.times(1, :topic, tags: [tag]) }
+  end
+
+  fab!(:tag4) do
+    Fabricate(:tag, name: "tag 4").tap do |tag|
+      Fabricate.times(1, :topic, tags: [tag])
+
+      # Ensures tags in tag groups are shown as well
+      Fabricate(:tag_group, tags: [tag])
+    end
+  end
+
+  let(:sidebar) { PageObjects::Components::NavigationMenu::Sidebar.new }
+
+  before { sign_in(user) }
+
+  shared_examples "a user can edit the sidebar tags navigation" do |mobile|
+    it "allows a user to edit the sidebar tags navigation", mobile: mobile do
+      visit "/latest"
+
+      sidebar.open_on_mobile if mobile
+
+      expect(sidebar).to have_tags_section
+      expect(sidebar).to have_section_link(tag1.name)
+      expect(sidebar).to have_section_link(tag2.name)
+      expect(sidebar).to have_section_link(tag3.name)
+      expect(sidebar).to have_section_link(tag4.name)
+
+      modal = sidebar.click_edit_tags_button
+
+      expect(modal).to have_right_title(I18n.t("js.sidebar.tags_form_modal.title"))
+      try_until_success { expect(modal).to have_focus_on_filter_input }
+      expect(modal).to have_tag_checkboxes([tag1, tag2, tag3, tag4])
+
+      modal.toggle_tag_checkbox(tag1).toggle_tag_checkbox(tag2).save
+
+      expect(modal).to be_closed
+
+      sidebar.open_on_mobile if mobile
+
+      expect(sidebar).to have_section_link(tag1.name)
+      expect(sidebar).to have_section_link(tag2.name)
+      expect(sidebar).to have_no_section_link(tag3.name)
+      expect(sidebar).to have_no_section_link(tag4.name)
+
+      visit "/latest"
+
+      sidebar.open_on_mobile if mobile
+
+      expect(sidebar).to have_section_link(tag1.name)
+      expect(sidebar).to have_section_link(tag2.name)
+      expect(sidebar).to have_no_section_link(tag3.name)
+      expect(sidebar).to have_no_section_link(tag4.name)
+
+      modal = sidebar.click_edit_tags_button
+      modal.toggle_tag_checkbox(tag2).save
+
+      expect(modal).to be_closed
+
+      sidebar.open_on_mobile if mobile
+
+      expect(sidebar).to have_section_link(tag1.name)
+      expect(sidebar).to have_no_section_link(tag2.name)
+      expect(sidebar).to have_no_section_link(tag3.name)
+      expect(sidebar).to have_no_section_link(tag4.name)
+    end
+  end
+
+  describe "when on desktop" do
+    include_examples "a user can edit the sidebar tags navigation", false
+  end
+
+  describe "when on mobile" do
+    include_examples "a user can edit the sidebar tags navigation", true
+  end
+
+  it "allows a user to filter the tags in the modal by the tag's name" do
+    visit "/latest"
+
+    expect(sidebar).to have_tags_section
+
+    modal = sidebar.click_edit_tags_button
+
+    modal.filter("tag")
+
+    expect(modal).to have_tag_checkboxes([tag1, tag2, tag3, tag4])
+
+    modal.filter("tag 2")
+
+    expect(modal).to have_tag_checkboxes([tag2])
+
+    modal.filter("someinvalidterm")
+
+    expect(modal).to have_no_tag_checkboxes
+  end
+
+  it "allows a user to deselect all tags in the modal which will display the site's top tags" do
+    Fabricate(:tag_sidebar_section_link, user: user, linkable: tag1)
+
+    visit "/latest"
+
+    expect(sidebar).to have_tags_section
+    expect(sidebar).to have_section_link(tag1.name)
+    expect(sidebar).to have_no_section_link(tag2.name)
+    expect(sidebar).to have_no_section_link(tag3.name)
+    expect(sidebar).to have_no_section_link(tag4.name)
+
+    modal = sidebar.click_edit_tags_button
+    modal.deselect_all.save
+
+    expect(sidebar).to have_section_link(tag1.name)
+    expect(sidebar).to have_section_link(tag2.name)
+    expect(sidebar).to have_section_link(tag3.name)
+    expect(sidebar).to have_section_link(tag4.name)
+  end
+
+  it "allows a user to reset to the default navigation menu tags site setting" do
+    Fabricate(:tag_sidebar_section_link, user: user, linkable: tag1)
+
+    SiteSetting.default_navigation_menu_tags = "#{tag2.name}|#{tag3.name}"
+
+    visit "/latest"
+
+    expect(sidebar).to have_tags_section
+    expect(sidebar).to have_section_link(tag1.name)
+    expect(sidebar).to have_no_section_link(tag2.name)
+    expect(sidebar).to have_no_section_link(tag3.name)
+    expect(sidebar).to have_no_section_link(tag4.name)
+
+    modal = sidebar.click_edit_tags_button
+    modal.click_reset_to_defaults_button.save
+
+    expect(modal).to be_closed
+    expect(sidebar).to have_no_section_link(tag1.name)
+    expect(sidebar).to have_section_link(tag2.name)
+    expect(sidebar).to have_section_link(tag3.name)
+    expect(sidebar).to have_no_section_link(tag4.name)
+  end
+
+  it "allows a user to filter the tag in the modal by selection" do
+    Fabricate(:tag_sidebar_section_link, linkable: tag1, user: user)
+    Fabricate(:tag_sidebar_section_link, linkable: tag2, user: user)
+
+    visit "/latest"
+
+    expect(sidebar).to have_tags_section
+
+    modal = sidebar.click_edit_tags_button
+    modal.filter_by_selected
+
+    expect(modal).to have_tag_checkboxes([tag1, tag2])
+
+    modal.filter("tag 2")
+
+    expect(modal).to have_tag_checkboxes([tag2])
+
+    modal.filter("").filter_by_unselected
+
+    expect(modal).to have_tag_checkboxes([tag3, tag4])
+
+    modal.filter_by_all
+
+    expect(modal).to have_tag_checkboxes([tag1, tag2, tag3, tag4])
+  end
+
+  it "loads more tags when the user scrolls views the last tag in the modal and there is more tags to load" do
+    Tag.delete_all
+
+    tags =
+      (TagsController::LIST_LIMIT + 1).times.map.with_index do |index|
+        Fabricate(:tag, name: "Tag #{sprintf("%03d", index)}")
+      end
+
+    visit "/latest"
+
+    expect(sidebar).to have_tags_section
+
+    modal = sidebar.click_edit_tags_button
+
+    first_page_tags = tags.first(TagsController::LIST_LIMIT)
+
+    expect(modal).to have_tag_checkboxes(first_page_tags)
+
+    modal.scroll_to_tag(first_page_tags.last)
+
+    expect(modal).to have_tag_checkboxes(tags)
+  end
+end
diff --git a/spec/system/ember_deprecation_test.rb b/spec/system/ember_deprecation_test.rb
new file mode 100644
index 00000000000..37779bece3f
--- /dev/null
+++ b/spec/system/ember_deprecation_test.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+describe "Production mode debug shims", type: :system do
+  it "can successfully print a deprecation message after applying prod shims" do
+    visit("/latest")
+    expect(find("#main-outlet-wrapper")).to be_visible
+
+    # Intercept console.warn so we can enumerate calls later
+    page.execute_script <<~JS
+      window.intercepted_warnings = [];
+      console.warn = (msg) => window.intercepted_warnings.push([msg, (new Error()).stack])
+    JS
+
+    # Apply deprecate shims. These are applied automatically in production
+    # builds, but running a full production build for system specs would be
+    # too slow
+    page.execute_script <<~JS
+      require("discourse/lib/deprecate-shim").applyShim();
+    JS
+
+    # Trigger a deprecation, then return the console.warn calls
+    warn_calls = page.execute_script <<~JS
+      const { deprecate } = require('@ember/debug');
+      deprecate("Some message", false, { id: "some.id" })
+      return window.intercepted_warnings
+    JS
+
+    expect(warn_calls.size).to eq(1)
+    call, backtrace = warn_calls[0]
+
+    expect(call).to eq("DEPRECATION: Some message [deprecation id: some.id]")
+    expect(backtrace).to include("shimLogDeprecationToConsole")
+  end
+end
diff --git a/spec/system/emojis/emoji_deny_list_spec.rb b/spec/system/emojis/emoji_deny_list_spec.rb
new file mode 100644
index 00000000000..c16f93bf8cc
--- /dev/null
+++ b/spec/system/emojis/emoji_deny_list_spec.rb
@@ -0,0 +1,102 @@
+# frozen_string_literal: true
+
+describe "Emoji deny list", type: :system do
+  let(:topic_page) { PageObjects::Pages::Topic.new }
+  let(:composer) { PageObjects::Components::Composer.new }
+  let(:emoji_picker) { PageObjects::Components::EmojiPicker.new }
+  fab!(:admin) { Fabricate(:admin) }
+
+  before { sign_in(admin) }
+
+  describe "when editing admin settings" do
+    before { SiteSetting.emoji_deny_list = "" }
+    let(:site_settings_page) { PageObjects::Pages::AdminSettings.new }
+
+    it "should allow admin to update emoji deny list" do
+      site_settings_page.visit_category("posting")
+
+      site_settings_page.select_from_emoji_list("emoji_deny_list", "fu", false)
+      site_settings_page.select_from_emoji_list("emoji_deny_list", "poop")
+
+      expect(site_settings_page.values_in_list("emoji_deny_list")).to eq(%w[fu poop])
+    end
+  end
+
+  describe "when visiting topics" do
+    SiteSetting.emoji_deny_list = "monkey"
+    Emoji.clear_cache
+
+    fab!(:topic) { Fabricate(:topic, title: "Time for :monkey: business") }
+    fab!(:post) { Fabricate(:post, topic: topic, raw: "We have no time to :monkey: around!") }
+
+    it "should remove denied emojis from page title, heading and body" do
+      topic_page.visit_topic(topic)
+      expect(page.title).to eq("Time for business - Discourse")
+      expect(topic_page).to have_topic_title("Time for business")
+      expect(page).not_to have_css(".emoji[title=':monkey:']")
+    end
+  end
+
+  describe "when using composer" do
+    before do
+      SiteSetting.enable_emoji = true
+      SiteSetting.emoji_deny_list = "fu|poop"
+      Emoji.clear_cache && Discourse.request_refresh!
+    end
+
+    fab!(:topic) { Fabricate(:topic) }
+    fab!(:post) { Fabricate(:post, topic: topic) }
+
+    xit "should remove denied emojis from emoji picker" do
+      topic_page.visit_topic_and_open_composer(topic)
+      expect(composer).to be_opened
+
+      composer.click_toolbar_button("insert-emoji")
+      expect(composer.emoji_picker).to be_visible
+
+      expect(emoji_picker).to have_no_emoji("fu")
+    end
+
+    it "should not show denied emojis and aliases in emoji autocomplete" do
+      topic_page.visit_topic_and_open_composer(topic)
+
+      composer.type_content(":poop") # shows no results
+      expect(composer).to have_no_emoji_autocomplete
+
+      composer.clear_content
+
+      composer.type_content(":middle") # middle_finger is alias
+      expect(composer).to have_no_emoji_suggestion("fu")
+    end
+
+    it "should not show denied emoji in preview" do
+      topic_page.visit_topic_and_open_composer(topic)
+
+      composer.fill_content(":wave:")
+      expect(composer).to have_emoji_preview("wave")
+
+      composer.clear_content
+
+      composer.fill_content(":fu:")
+      expect(composer).to have_no_emoji_preview("fu")
+    end
+  end
+
+  describe "when using private messages" do
+    before do
+      SiteSetting.emoji_deny_list = "pancakes|monkey"
+      Emoji.clear_cache && Discourse.request_refresh!
+    end
+
+    fab!(:topic) do
+      Fabricate(:private_message_topic, title: "Want to catch up for :pancakes: today?")
+    end
+    fab!(:post) { Fabricate(:post, topic: topic, raw: "Can we use the :monkey: emoji here?") }
+
+    it "should remove denied emojis from message title and body" do
+      topic_page.visit_topic(topic)
+      expect(topic_page).to have_topic_title("Want to catch up for today?")
+      expect(post).not_to have_css(".emoji[title=':monkey:']")
+    end
+  end
+end
diff --git a/spec/system/fast_edit_spec.rb b/spec/system/fast_edit_spec.rb
new file mode 100644
index 00000000000..29afacdff4a
--- /dev/null
+++ b/spec/system/fast_edit_spec.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+describe "Fast edit", type: :system do
+  let(:topic_page) { PageObjects::Pages::Topic.new }
+  let(:fast_editor) { PageObjects::Components::FastEditor.new }
+  fab!(:topic) { Fabricate(:topic) }
+  fab!(:post) { Fabricate(:post, topic: topic) }
+  fab!(:post_2) { Fabricate(:post, topic: topic, raw: "It ‘twas a great’ “time”!") }
+  fab!(:current_user) { Fabricate(:admin) }
+
+  before { sign_in(current_user) }
+
+  context "when text selected it opens contact menu and fast editor" do
+    it "opens context menu and fast edit dialog" do
+      topic_page.visit_topic(topic)
+
+      select_text_range("#{topic_page.post_by_number_selector(1)} .cooked p", 0, 10)
+      expect(topic_page.fast_edit_button).to be_visible
+
+      topic_page.click_fast_edit_button
+      expect(topic_page.fast_edit_input).to be_visible
+    end
+
+    it "edits first paragraph and saves changes" do
+      topic_page.visit_topic(topic)
+
+      select_text_range("#{topic_page.post_by_number_selector(1)} .cooked p", 0, 5)
+      topic_page.click_fast_edit_button
+
+      fast_editor.fill_content("Howdy")
+      fast_editor.save
+
+      within("#post_1 .cooked > p") do |el|
+        expect(el).not_to eq("Hello world")
+        expect(el).to have_content("Howdy")
+      end
+    end
+  end
+
+  context "when editing text that has strange characters" do
+    it "saves when paragraph contains apostrophe" do
+      topic_page.visit_topic(topic)
+
+      select_text_range("#{topic_page.post_by_number_selector(2)} .cooked p", 19, 4)
+      topic_page.click_fast_edit_button
+
+      fast_editor.fill_content("day")
+      fast_editor.save
+
+      expect(page).to have_selector(
+        "#{topic_page.post_by_number_selector(2)} .cooked p",
+        text: "It ‘twas a great’ “day”!",
+      )
+    end
+  end
+end
diff --git a/spec/system/filtering_topics_spec.rb b/spec/system/filtering_topics_spec.rb
new file mode 100644
index 00000000000..a5e4adc0a37
--- /dev/null
+++ b/spec/system/filtering_topics_spec.rb
@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+describe "Filtering topics", type: :system do
+  fab!(:user) { Fabricate(:user) }
+  let(:topic_list) { PageObjects::Components::TopicList.new }
+  let(:topic_query_filter) { PageObjects::Components::TopicQueryFilter.new }
+
+  before { SiteSetting.experimental_topics_filter = true }
+
+  describe "when filtering by status" do
+    fab!(:topic) { Fabricate(:topic) }
+    fab!(:closed_topic) { Fabricate(:topic, closed: true) }
+
+    it "should display the right topics when the status filter is used in the query string" do
+      sign_in(user)
+
+      visit("/filter")
+
+      expect(topic_list).to have_topic(topic)
+      expect(topic_list).to have_topic(closed_topic)
+
+      topic_query_filter.fill_in("status:open")
+
+      expect(topic_list).to have_topic(topic)
+      expect(topic_list).to have_no_topic(closed_topic)
+
+      topic_query_filter.fill_in("status:closed")
+
+      expect(topic_list).to have_no_topic(topic)
+      expect(topic_list).to have_topic(closed_topic)
+    end
+  end
+
+  describe "when filtering by tags" do
+    fab!(:tag) { Fabricate(:tag, name: "tag1") }
+    fab!(:tag2) { Fabricate(:tag, name: "tag2") }
+    fab!(:topic_with_tag) { Fabricate(:topic, tags: [tag]) }
+    fab!(:topic_with_tag2) { Fabricate(:topic, tags: [tag2]) }
+    fab!(:topic_with_tag_and_tag2) { Fabricate(:topic, tags: [tag, tag2]) }
+
+    it "should display the right topics when tags filter is used in the query string" do
+      sign_in(user)
+
+      visit("/filter")
+
+      expect(topic_list).to have_topics(count: 3)
+      expect(topic_list).to have_topic(topic_with_tag)
+      expect(topic_list).to have_topic(topic_with_tag2)
+      expect(topic_list).to have_topic(topic_with_tag_and_tag2)
+
+      topic_query_filter.fill_in("tags:tag1")
+
+      expect(topic_list).to have_topics(count: 2)
+      expect(topic_list).to have_topic(topic_with_tag)
+      expect(topic_list).to have_topic(topic_with_tag_and_tag2)
+      expect(topic_list).to have_no_topic(topic_with_tag2)
+
+      topic_query_filter.fill_in("tags:tag1+tag2")
+
+      expect(topic_list).to have_topics(count: 1)
+      expect(topic_list).to have_no_topic(topic_with_tag)
+      expect(topic_list).to have_no_topic(topic_with_tag2)
+      expect(topic_list).to have_topic(topic_with_tag_and_tag2)
+    end
+  end
+end
diff --git a/spec/system/group_card_spec.rb b/spec/system/group_card_spec.rb
new file mode 100644
index 00000000000..497b55b6003
--- /dev/null
+++ b/spec/system/group_card_spec.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+describe "Group Card", type: :system do
+  fab!(:current_user) { Fabricate(:user) }
+  fab!(:members) { Fabricate.times(12, :user) }
+  fab!(:topic) { Fabricate(:topic) }
+  fab!(:group) { Fabricate(:public_group, users: members) }
+  let(:mention) { "@#{group.name}" }
+  let(:post_with_mention) do
+    PostCreator.create!(current_user, topic_id: topic.id, raw: "Hello #{mention}")
+  end
+  let(:topic_page) { PageObjects::Pages::Topic.new }
+  let(:group_card) { PageObjects::Components::GroupCard.new }
+
+  before do
+    Jobs.run_immediately!
+    sign_in(current_user)
+  end
+
+  context "when joining/leaving a group" do
+    it "shows only highlighted members" do
+      topic_page.visit_topic(topic, post_number: post_with_mention.post_number)
+      topic_page.click_mention(post_with_mention, mention)
+
+      expect(group_card).to have_highlighted_member_count_of(
+        PageObjects::Components::GroupCard::MAX_MEMBER_HIGHLIGHT_COUNT,
+      )
+
+      group_card.click_join_button
+
+      expect(group_card).to have_leave_button
+
+      group.reload
+
+      expect(group.users).to include(current_user)
+      expect(group_card).to have_highlighted_member_count_of(
+        PageObjects::Components::GroupCard::MAX_MEMBER_HIGHLIGHT_COUNT,
+      )
+
+      group_card.click_leave_button
+
+      expect(group_card).to have_join_button
+
+      group.reload
+
+      expect(group.users).not_to include(current_user)
+      expect(group_card).to have_highlighted_member_count_of(
+        PageObjects::Components::GroupCard::MAX_MEMBER_HIGHLIGHT_COUNT,
+      )
+    end
+  end
+end
diff --git a/spec/system/hashtag_autocomplete_spec.rb b/spec/system/hashtag_autocomplete_spec.rb
index 254f6a686c7..960ac099cdd 100644
--- a/spec/system/hashtag_autocomplete_spec.rb
+++ b/spec/system/hashtag_autocomplete_spec.rb
@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
 describe "Using #hashtag autocompletion to search for and lookup categories and tags",
-         type: :system,
-         js: true do
+         type: :system do
   fab!(:user) { Fabricate(:user) }
   fab!(:category) do
     Fabricate(:category, name: "Cool Category", slug: "cool-cat", topic_count: 3234)
@@ -54,40 +53,119 @@ describe "Using #hashtag autocompletion to search for and lookup categories and
     )
   end
 
-  it "cooks the selected hashtag clientside with the correct url and icon" do
+  it "cooks the selected hashtag clientside in the composer preview with the correct url and icon" do
     visit_topic_and_initiate_autocomplete
     hashtag_results = page.all(".hashtag-autocomplete__link", count: 2)
     hashtag_results[0].click
     expect(page).to have_css(".hashtag-cooked")
     cooked_hashtag = page.find(".hashtag-cooked")
-    expected = <<~HTML.chomp
-      <a class=\"hashtag-cooked\" href=\"#{category.url}\" data-type=\"category\" data-slug=\"cool-cat\" tabindex=\"-1\"><svg class=\"fa d-icon d-icon-folder svg-icon svg-node\"><use href=\"#folder\"></use></svg><span>Cool Category</span></a>
-    HTML
-    expect(cooked_hashtag["outerHTML"].squish).to eq(expected)
+
+    expect(cooked_hashtag["outerHTML"]).to have_tag(
+      "a",
+      with: {
+        class: "hashtag-cooked",
+        href: category.url,
+        "data-type": "category",
+        "data-slug": category.slug,
+        "data-id": category.id,
+      },
+    ) do
+      with_tag(
+        "span",
+        with: {
+          class: "hashtag-category-badge hashtag-color--category-#{category.id}",
+        },
+      )
+    end
 
     visit_topic_and_initiate_autocomplete
     hashtag_results = page.all(".hashtag-autocomplete__link", count: 2)
     hashtag_results[1].click
     expect(page).to have_css(".hashtag-cooked")
     cooked_hashtag = page.find(".hashtag-cooked")
-    expect(cooked_hashtag["outerHTML"].squish).to eq(<<~HTML.chomp)
-      <a class=\"hashtag-cooked\" href=\"#{tag.url}\" data-type=\"tag\" data-slug=\"cooltag\" tabindex=\"-1\"><svg class=\"fa d-icon d-icon-tag svg-icon svg-node\"><use href=\"#tag\"></use></svg><span>cooltag</span></a>
-      HTML
+    expect(cooked_hashtag["outerHTML"]).to have_tag(
+      "a",
+      with: {
+        class: "hashtag-cooked",
+        href: tag.url,
+        "data-type": "tag",
+        "data-slug": tag.name,
+        "data-id": tag.id,
+      },
+    ) do
+      with_tag(
+        "svg",
+        with: {
+          class: "fa d-icon d-icon-tag svg-icon hashtag-color--tag-#{tag.id} svg-string",
+        },
+      ) { with_tag("use", with: { href: "#tag" }) }
+    end
   end
 
   it "cooks the hashtags for tag and category correctly serverside when the post is saved to the database" do
     topic_page.visit_topic_and_open_composer(topic)
+
     expect(topic_page).to have_expanded_composer
-    topic_page.type_in_composer("this is a #cool-cat category and a #cooltag tag")
-    topic_page.send_reply
+
+    topic_page.send_reply("this is a #cool-cat category and a #cooltag tag")
+
     expect(topic_page).to have_post_number(2)
+
     cooked_hashtags = page.all(".hashtag-cooked", count: 2)
 
-    expect(cooked_hashtags[0]["outerHTML"]).to eq(<<~HTML.chomp)
-    <a class=\"hashtag-cooked\" href=\"#{category.url}\" data-type=\"category\" data-slug=\"cool-cat\"><svg class=\"fa d-icon d-icon-folder svg-icon svg-node\"><use href=\"#folder\"></use></svg><span>Cool Category</span></a>
-    HTML
-    expect(cooked_hashtags[1]["outerHTML"]).to eq(<<~HTML.chomp)
-    <a class=\"hashtag-cooked\" href=\"#{tag.url}\" data-type=\"tag\" data-slug=\"cooltag\"><svg class=\"fa d-icon d-icon-tag svg-icon svg-node\"><use href=\"#tag\"></use></svg><span>cooltag</span></a>
-    HTML
+    expect(cooked_hashtags[0]["outerHTML"]).to have_tag(
+      "a",
+      with: {
+        class: "hashtag-cooked",
+        href: category.url,
+        "data-type": "category",
+        "data-slug": category.slug,
+        "data-id": category.id,
+        "aria-label": category.name,
+      },
+    ) do
+      with_tag(
+        "span",
+        with: {
+          class: "hashtag-category-badge hashtag-color--category-#{category.id}",
+        },
+      )
+    end
+
+    expect(cooked_hashtags[1]["outerHTML"]).to have_tag(
+      "a",
+      with: {
+        class: "hashtag-cooked",
+        href: tag.url,
+        "data-type": "tag",
+        "data-slug": tag.name,
+        "data-id": tag.id,
+        "aria-label": tag.name,
+      },
+    ) do
+      with_tag(
+        "svg",
+        with: {
+          class: "fa d-icon d-icon-tag svg-icon hashtag-color--tag-#{tag.id} svg-string",
+        },
+      ) { with_tag("use", with: { href: "#tag" }) }
+    end
+  end
+
+  context "when a user cannot access the category for a hashtag cooked in another post" do
+    fab!(:admin) { Fabricate(:admin) }
+    fab!(:manager_group) { Fabricate(:group, name: "Managers") }
+    fab!(:private_category) do
+      Fabricate(:private_category, name: "Management", slug: "management", group: manager_group)
+    end
+    fab!(:admin_group_user) { Fabricate(:group_user, user: admin, group: manager_group) }
+    fab!(:post_with_private_category) do
+      Fabricate(:post, topic: topic, raw: "this is a secret #management category", user: admin)
+    end
+
+    it "shows a default color and css class for the category icon square" do
+      topic_page.visit_topic(topic, post_number: post_with_private_category.post_number)
+      expect(page).to have_css(".hashtag-cooked .hashtag-missing")
+    end
   end
 end
diff --git a/spec/system/helpers/downloads.rb b/spec/system/helpers/downloads.rb
new file mode 100644
index 00000000000..41806d6a8c9
--- /dev/null
+++ b/spec/system/helpers/downloads.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class Downloads
+  FOLDER = Rails.root.join("tmp/downloads")
+  TIMEOUT = 10
+
+  def self.wait_for_download
+    Timeout.timeout(TIMEOUT) { sleep 0.1 until downloaded? }
+  end
+
+  def self.clear
+    FileUtils.rm_rf(FOLDER)
+  end
+
+  private
+
+  def self.downloaded?
+    !downloading? && downloads.any?
+  end
+
+  def self.downloading?
+    downloads.grep(/\.crdownload$/).any?
+  end
+
+  def self.downloads
+    Dir[FOLDER.join("*")]
+  end
+
+  private_class_method :downloaded?, :downloading?, :downloads
+end
diff --git a/spec/system/network_disconnected_spec.rb b/spec/system/network_disconnected_spec.rb
new file mode 100644
index 00000000000..288babbcbd0
--- /dev/null
+++ b/spec/system/network_disconnected_spec.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+RSpec.describe "Network Disconnected", type: :system do
+  def with_network_disconnected
+    begin
+      page.driver.browser.network_conditions = { offline: true }
+      yield
+    ensure
+      page.driver.browser.network_conditions = { offline: false }
+    end
+  end
+
+  it "NetworkConnectivity service adds class to DOM and displays offline indicator" do
+    SiteSetting.enable_offline_indicator = true
+
+    visit("/c")
+
+    expect(page).to have_no_css("html.network-disconnected")
+    expect(page).to have_no_css(".offline-indicator")
+
+    with_network_disconnected do
+      # Message bus connectivity services adds the disconnected class to the DOM
+      expect(page).to have_css("html.network-disconnected")
+
+      # Offline indicator is rendered
+      expect(page).to have_css(".offline-indicator")
+    end
+  end
+end
diff --git a/spec/system/page_objects/cdp.rb b/spec/system/page_objects/cdp.rb
new file mode 100644
index 00000000000..56bf4922f26
--- /dev/null
+++ b/spec/system/page_objects/cdp.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module PageObjects
+  class CDP
+    include Capybara::DSL
+
+    def allow_clipboard
+      cdp_params = {
+        origin: page.server_url,
+        permission: {
+          name: "clipboard-read",
+        },
+        setting: "granted",
+      }
+      page.driver.browser.execute_cdp("Browser.setPermission", **cdp_params)
+
+      cdp_params = {
+        origin: page.server_url,
+        permission: {
+          name: "clipboard-write",
+        },
+        setting: "granted",
+      }
+      page.driver.browser.execute_cdp("Browser.setPermission", **cdp_params)
+    end
+
+    def read_clipboard
+      page.evaluate_async_script("navigator.clipboard.readText().then(arguments[0])")
+    end
+  end
+end
diff --git a/spec/system/page_objects/components/ace_editor.rb b/spec/system/page_objects/components/ace_editor.rb
new file mode 100644
index 00000000000..d7aee298524
--- /dev/null
+++ b/spec/system/page_objects/components/ace_editor.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Components
+    class AceEditor < PageObjects::Components::Base
+      def type_input(content)
+        editor_input.send_keys(content)
+        self
+      end
+
+      def fill_input(content)
+        editor_input.fill_in(with: content)
+        self
+      end
+
+      def clear_input
+        fill_input("")
+      end
+
+      def editor_input
+        find(".ace-wrapper .ace_text-input", visible: false)
+      end
+    end
+  end
+end
diff --git a/spec/system/page_objects/components/base.rb b/spec/system/page_objects/components/base.rb
index cb933c19688..4815a37b240 100644
--- a/spec/system/page_objects/components/base.rb
+++ b/spec/system/page_objects/components/base.rb
@@ -5,6 +5,7 @@ module PageObjects
     class Base
       include Capybara::DSL
       include RSpec::Matchers
+      include SystemHelpers
     end
   end
 end
diff --git a/spec/system/page_objects/components/category_list.rb b/spec/system/page_objects/components/category_list.rb
new file mode 100644
index 00000000000..49e000bf7d7
--- /dev/null
+++ b/spec/system/page_objects/components/category_list.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Components
+    class CategoryList < PageObjects::Components::Base
+      def has_category?(category)
+        page.has_css?("tr[data-category-id='#{category.id}']")
+      end
+
+      def has_topic?(topic)
+        page.has_css?(topic_list_item_class(topic))
+      end
+
+      def has_no_new_posts_badge?
+        page.has_no_css?(".new-posts")
+      end
+
+      def click_category_navigation
+        page.find(".nav-pills .categories").click
+      end
+
+      def click_logo
+        page.find(".title a").click
+      end
+
+      def click_new_posts_badge(count: 1)
+        page.find(".new-posts", text: "#{count} new").click
+      end
+
+      def click_topic(topic)
+        page.find("a", text: topic.title).click
+      end
+    end
+  end
+end
diff --git a/spec/system/page_objects/components/composer.rb b/spec/system/page_objects/components/composer.rb
index 28dd6b88a2d..e6776733a45 100644
--- a/spec/system/page_objects/components/composer.rb
+++ b/spec/system/page_objects/components/composer.rb
@@ -3,10 +3,11 @@
 module PageObjects
   module Components
     class Composer < PageObjects::Components::Base
-      def open_new_topic
-        visit("/latest")
-        find("button#create-topic").click
-        self
+      COMPOSER_ID = "#reply-control"
+      AUTOCOMPLETE_MENU = ".autocomplete.ac-emoji"
+
+      def opened?
+        page.has_css?("#{COMPOSER_ID}.open")
       end
 
       def open_composer_actions
@@ -14,23 +15,50 @@ module PageObjects
         self
       end
 
+      def click_toolbar_button(button_class)
+        find(".d-editor-button-bar button.#{button_class}").click
+        self
+      end
+
       def fill_title(title)
-        find("#reply-control #reply-title").fill_in(with: title)
+        find("#{COMPOSER_ID} #reply-title").fill_in(with: title)
         self
       end
 
       def fill_content(content)
-        find("#reply-control .d-editor-input").fill_in(with: content)
+        composer_input.fill_in(with: content)
         self
       end
 
+      def fill_form_template_field(field, content)
+        form_template_field(field).fill_in(with: content)
+        self
+      end
+
+      def type_content(content)
+        composer_input.send_keys(content)
+        self
+      end
+
+      def clear_content
+        fill_content("")
+      end
+
+      def has_content?(content)
+        composer_input.value == content
+      end
+
+      def has_popup_content?(content)
+        composer_popup.has_content?(content)
+      end
+
       def select_action(action)
         find(action(action)).click
         self
       end
 
       def create
-        find("#reply-control .btn-primary").click
+        find("#{COMPOSER_ID} .btn-primary").click
       end
 
       def action(action_title)
@@ -38,7 +66,140 @@ module PageObjects
       end
 
       def button_label
-        find("#reply-control .btn-primary .d-button-label")
+        find("#{COMPOSER_ID} .btn-primary .d-button-label")
+      end
+
+      def emoji_picker
+        find("#{COMPOSER_ID} .emoji-picker")
+      end
+
+      def emoji_autocomplete
+        find(AUTOCOMPLETE_MENU)
+      end
+
+      def switch_category(category_name)
+        find(".category-chooser").click
+        find(".category-row[data-name='#{category_name}']").click
+      end
+
+      def preview
+        find("#{COMPOSER_ID} .d-editor-preview-wrapper")
+      end
+
+      def has_emoji_autocomplete?
+        has_css?(AUTOCOMPLETE_MENU)
+      end
+
+      def has_no_emoji_autocomplete?
+        has_no_css?(AUTOCOMPLETE_MENU)
+      end
+
+      EMOJI_SUGGESTION_SELECTOR = "#{AUTOCOMPLETE_MENU} .emoji-shortname"
+
+      def has_emoji_suggestion?(emoji)
+        has_css?(EMOJI_SUGGESTION_SELECTOR, text: emoji)
+      end
+
+      def has_no_emoji_suggestion?(emoji)
+        has_no_css?(EMOJI_SUGGESTION_SELECTOR, text: emoji)
+      end
+
+      def has_emoji_preview?(emoji)
+        page.has_css?(emoji_preview_selector(emoji))
+      end
+
+      def has_no_emoji_preview?(emoji)
+        page.has_no_css?(emoji_preview_selector(emoji))
+      end
+
+      COMPOSER_INPUT_SELECTOR = "#{COMPOSER_ID} .d-editor-input"
+
+      def has_no_composer_input?
+        page.has_no_css?(COMPOSER_INPUT_SELECTOR)
+      end
+
+      def has_composer_input?
+        page.has_css?(COMPOSER_INPUT_SELECTOR)
+      end
+
+      def has_composer_preview?
+        page.has_css?("#{COMPOSER_ID} .d-editor-preview-wrapper")
+      end
+
+      def has_no_composer_preview?
+        page.has_no_css?("#{COMPOSER_ID} .d-editor-preview-wrapper")
+      end
+
+      def has_composer_preview_toggle?
+        page.has_css?("#{COMPOSER_ID} .toggle-preview")
+      end
+
+      def has_no_composer_preview_toggle?
+        page.has_no_css?("#{COMPOSER_ID} .toggle-preview")
+      end
+
+      def has_form_template?
+        page.has_css?(".form-template-form__wrapper")
+      end
+
+      def has_form_template_field?(field)
+        page.has_css?(".form-template-field[data-field-type='#{field}']")
+      end
+
+      def has_form_template_field_required_indicator?(field)
+        page.has_css?(
+          ".form-template-field[data-field-type='#{field}'] .form-template-field__required-indicator",
+        )
+      end
+
+      FORM_TEMPLATE_CHOOSER_SELECTOR = ".composer-select-form-template"
+
+      def has_no_form_template_chooser?
+        page.has_no_css?(FORM_TEMPLATE_CHOOSER_SELECTOR)
+      end
+
+      def has_form_template_chooser?
+        page.has_css?(FORM_TEMPLATE_CHOOSER_SELECTOR)
+      end
+
+      def has_form_template_field_error?(error)
+        page.has_css?(".form-template-field__error", text: error)
+      end
+
+      def composer_input
+        find("#{COMPOSER_ID} .d-editor .d-editor-input")
+      end
+
+      def composer_popup
+        find("#{COMPOSER_ID} .composer-popup")
+      end
+
+      def form_template_field(field)
+        find(".form-template-field[data-field-type='#{field}']")
+      end
+
+      def move_cursor_after(text)
+        execute_script(<<~JS, text)
+          const text = arguments[0];
+          const composer = document.querySelector("#{COMPOSER_ID} .d-editor-input");
+          const index = composer.value.indexOf(text);
+          const position = index + text.length;
+
+          composer.setSelectionRange(position, position);
+        JS
+      end
+
+      def select_all
+        execute_script(<<~JS, text)
+          const composer = document.querySelector("#{COMPOSER_ID} .d-editor-input");
+          composer.setSelectionRange(0, composer.value.length);
+        JS
+      end
+
+      private
+
+      def emoji_preview_selector(emoji)
+        ".d-editor-preview .emoji[title=':#{emoji}:']"
       end
     end
   end
diff --git a/spec/system/page_objects/components/dialog.rb b/spec/system/page_objects/components/dialog.rb
new file mode 100644
index 00000000000..ae5e7ea3e08
--- /dev/null
+++ b/spec/system/page_objects/components/dialog.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Components
+    class Dialog < PageObjects::Components::Base
+      def closed?
+        has_no_css?(".dialog-container")
+      end
+
+      def open?
+        has_css?(".dialog-container")
+      end
+
+      def has_content?(content)
+        find(".dialog-container").has_content?(content)
+      end
+
+      def click_yes
+        find(".dialog-footer .btn-primary").click
+      end
+
+      def click_no
+        find(".dialog-footer .btn-default").click
+      end
+    end
+  end
+end
diff --git a/spec/system/page_objects/components/emoji_picker.rb b/spec/system/page_objects/components/emoji_picker.rb
new file mode 100644
index 00000000000..c9a6f6258c6
--- /dev/null
+++ b/spec/system/page_objects/components/emoji_picker.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Components
+    class EmojiPicker < PageObjects::Components::Base
+      def emoji_button_selector(emoji_name)
+        ".emoji-picker .emoji[title='#{emoji_name}']"
+      end
+
+      def select_emoji(emoji_name)
+        find(emoji_button_selector(emoji_name)).click
+      end
+
+      def search_emoji(emoji_name)
+        find(".emoji-picker .search input").fill_in(with: emoji_name)
+      end
+
+      def has_emoji?(emoji_name)
+        page.has_css?(emoji_button_selector(emoji_name))
+      end
+
+      def has_no_emoji?(emoji_name)
+        page.has_no_css?(emoji_button_selector(emoji_name))
+      end
+    end
+  end
+end
diff --git a/spec/system/page_objects/components/fast_editor.rb b/spec/system/page_objects/components/fast_editor.rb
new file mode 100644
index 00000000000..93ff5135a03
--- /dev/null
+++ b/spec/system/page_objects/components/fast_editor.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Components
+    class FastEditor < PageObjects::Components::Base
+      def fill_content(content)
+        fast_edit_input.fill_in(with: content)
+        self
+      end
+
+      def clear_content
+        fill_content("")
+      end
+
+      def has_content?(content)
+        fast_edit_input.value == content
+      end
+
+      def save
+        find(".save-fast-edit").click
+      end
+
+      def fast_edit_input
+        find("#fast-edit-input")
+      end
+    end
+  end
+end
diff --git a/spec/system/page_objects/components/group-card.rb b/spec/system/page_objects/components/group-card.rb
new file mode 100644
index 00000000000..ffba614ea54
--- /dev/null
+++ b/spec/system/page_objects/components/group-card.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Components
+    class GroupCard < PageObjects::Components::Base
+      MAX_MEMBER_HIGHLIGHT_COUNT = 10
+      JOIN_BUTTON_SELECTOR = ".group-details-button .group-index-join"
+      LEAVE_BUTTON_SELECTOR = ".group-details-button .group-index-leave"
+
+      def click_join_button
+        find(JOIN_BUTTON_SELECTOR).click
+      end
+
+      def click_leave_button
+        find(LEAVE_BUTTON_SELECTOR).click
+      end
+
+      def has_highlighted_member_count_of?(expected_count)
+        all(".card-content .members.metadata a.card-tiny-avatar", count: expected_count)
+      end
+
+      def has_join_button?
+        has_css?(JOIN_BUTTON_SELECTOR)
+      end
+
+      def has_leave_button?
+        has_css?(LEAVE_BUTTON_SELECTOR)
+      end
+    end
+  end
+end
diff --git a/spec/system/page_objects/components/legacy_header_dropdown.rb b/spec/system/page_objects/components/legacy_header_dropdown.rb
new file mode 100644
index 00000000000..8273e16940e
--- /dev/null
+++ b/spec/system/page_objects/components/legacy_header_dropdown.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Components
+    class LegacyHeaderDropdown < PageObjects::Components::Base
+      def click
+        page.find(".hamburger-dropdown").click
+      end
+
+      def visible?
+        page.has_css?(".menu-container-general-links")
+      end
+    end
+  end
+end
diff --git a/spec/system/page_objects/components/navigation_menu/base.rb b/spec/system/page_objects/components/navigation_menu/base.rb
new file mode 100644
index 00000000000..a7b1ab7edcd
--- /dev/null
+++ b/spec/system/page_objects/components/navigation_menu/base.rb
@@ -0,0 +1,139 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Components
+    module NavigationMenu
+      class Base < PageObjects::Components::Base
+        def community_section
+          find(".sidebar-section[data-section-name='community']")
+        end
+
+        SIDEBAR_SECTION_LINK_SELECTOR = "sidebar-section-link"
+
+        def click_section_link(name)
+          find(".#{SIDEBAR_SECTION_LINK_SELECTOR}", text: name).click
+        end
+
+        def has_one_active_section_link?
+          has_css?(".#{SIDEBAR_SECTION_LINK_SELECTOR}--active", count: 1)
+        end
+
+        def has_section_link?(name, href: nil, active: false, target: nil)
+          section_link_present?(name, href: href, active: active, target: target, present: true)
+        end
+
+        def has_no_section_link?(name, href: nil, active: false)
+          section_link_present?(name, href: href, active: active, present: false)
+        end
+
+        def has_section?(name)
+          has_css?(".sidebar-sections [data-section-name='#{name.parameterize}']")
+        end
+
+        def has_no_section?(name)
+          has_no_css?(".sidebar-sections [data-section-name='#{name.parameterize}']")
+        end
+
+        def has_categories_section?
+          has_section?("Categories")
+        end
+
+        def has_tags_section?
+          has_section?("Tags")
+        end
+
+        def has_no_tags_section?
+          has_no_section?("Tags")
+        end
+
+        def has_all_tags_section_link?
+          has_section_link?(I18n.t("js.sidebar.all_tags"))
+        end
+
+        def has_tag_section_links?(tags)
+          tag_names = tags.map(&:name)
+
+          tag_section_links =
+            all(
+              ".sidebar-section[data-section-name='tags'] .sidebar-section-link-wrapper[data-tag-name]",
+              count: tag_names.length,
+            )
+
+          expect(tag_section_links.map(&:text)).to eq(tag_names)
+        end
+
+        def has_tag_section_link_with_title?(tag, title)
+          section_link =
+            find(
+              ".sidebar-section[data-section-name='tags'] .sidebar-section-link-wrapper[data-tag-name='#{tag.name}'] .sidebar-section-link",
+            )
+
+          expect(section_link["title"]).to eq(title)
+        end
+
+        def primary_section_links(slug)
+          all("[data-section-name='#{slug}'] .sidebar-section-link-wrapper").map(&:text)
+        end
+
+        def primary_section_icons(slug)
+          all("[data-section-name='#{slug}'] .sidebar-section-link-wrapper use").map do |icon|
+            icon[:href].delete_prefix("#")
+          end
+        end
+
+        def has_category_section_link?(category)
+          page.has_link?(category.name, class: "sidebar-section-link")
+        end
+
+        def click_add_section_button
+          click_button(add_section_button_text)
+        end
+
+        def has_no_add_section_button?
+          page.has_no_button?(add_section_button_text)
+        end
+
+        def click_edit_categories_button
+          within(".sidebar-section[data-section-name='categories']") do
+            click_button(class: "sidebar-section-header-button", visible: false)
+          end
+
+          PageObjects::Modals::SidebarEditCategories.new
+        end
+
+        def click_edit_tags_button
+          within(".sidebar-section[data-section-name='tags']") do
+            click_button(class: "sidebar-section-header-button", visible: false)
+          end
+
+          PageObjects::Modals::SidebarEditTags.new
+        end
+
+        def edit_custom_section(name)
+          name = name.parameterize
+
+          find(".sidebar-section[data-section-name='#{name}']").hover
+
+          find(
+            ".sidebar-section[data-section-name='#{name}'] button.sidebar-section-header-button",
+          ).click
+        end
+
+        private
+
+        def section_link_present?(name, href: nil, active: false, target: nil, present:)
+          attributes = { exact_text: name }
+          attributes[:href] = href if href
+          attributes[:class] = SIDEBAR_SECTION_LINK_SELECTOR
+          attributes[:class] += "--active" if active
+          attributes[:target] = target if target
+          page.public_send(present ? :has_link? : :has_no_link?, **attributes)
+        end
+
+        def add_section_button_text
+          I18n.t("js.sidebar.sections.custom.add")
+        end
+      end
+    end
+  end
+end
diff --git a/spec/system/page_objects/components/navigation_menu/header_dropdown.rb b/spec/system/page_objects/components/navigation_menu/header_dropdown.rb
new file mode 100644
index 00000000000..54bd9e79208
--- /dev/null
+++ b/spec/system/page_objects/components/navigation_menu/header_dropdown.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Components
+    module NavigationMenu
+      class HeaderDropdown < Base
+        def open
+          find(".header-dropdown-toggle.hamburger-dropdown").click
+          expect(page).to have_css(".sidebar-hamburger-dropdown")
+          self
+        end
+
+        def click_customize_community_section_button
+          community_section.click_button(
+            I18n.t("js.sidebar.sections.community.edit_section.header_dropdown"),
+          )
+
+          expect(page).to have_no_css(".sidebar-hamburger-dropdown")
+
+          PageObjects::Modals::SidebarSectionForm.new
+        end
+      end
+    end
+  end
+end
diff --git a/spec/system/page_objects/components/navigation_menu/sidebar.rb b/spec/system/page_objects/components/navigation_menu/sidebar.rb
new file mode 100644
index 00000000000..4e703e0c92d
--- /dev/null
+++ b/spec/system/page_objects/components/navigation_menu/sidebar.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Components
+    module NavigationMenu
+      class Sidebar < Base
+        def open_on_mobile
+          click_button("toggle-hamburger-menu")
+        end
+
+        def visible?
+          page.has_css?("#d-sidebar")
+        end
+
+        def not_visible?
+          page.has_no_css?("#d-sidebar")
+        end
+
+        def has_no_customize_community_section_button?
+          community_section.has_no_button?(class: "sidebar-section-link-button")
+        end
+
+        def click_customize_community_section_button
+          community_section.click_button(
+            I18n.t("js.sidebar.sections.community.edit_section.sidebar"),
+          )
+
+          expect(community_section).to have_no_css(".sidebar-more-section-links-details")
+
+          PageObjects::Modals::SidebarSectionForm.new
+        end
+
+        def click_community_section_more_button
+          community_section.click_button(class: "sidebar-more-section-links-details-summary")
+          expect(community_section).to have_css(".sidebar-more-section-links-details")
+          self
+        end
+
+        def custom_section_modal_title
+          find("#discourse-modal-title")
+        end
+      end
+    end
+  end
+end
diff --git a/spec/system/page_objects/components/select_kit.rb b/spec/system/page_objects/components/select_kit.rb
new file mode 100644
index 00000000000..8228d65b9be
--- /dev/null
+++ b/spec/system/page_objects/components/select_kit.rb
@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Components
+    class SelectKit < PageObjects::Components::Base
+      attr_reader :context
+
+      def initialize(context)
+        @context = context
+      end
+
+      def component
+        find(@context)
+      end
+
+      def expanded_component
+        expand_if_needed
+        find(@context + ".is-expanded")
+      end
+
+      def collapsed_component
+        find(@context + ":not(.is-expanded)")
+      end
+
+      def is_expanded?
+        has_css?(context + ".is-expanded")
+      end
+
+      def is_collapsed?
+        has_css?(context + ":not(.is-expanded)", wait: 0)
+      end
+
+      def has_selected_value?(value)
+        component.find(".select-kit-header[data-value='#{value}']")
+      end
+
+      def has_selected_name?(name)
+        component.find(".select-kit-header[data-name='#{name}']")
+      end
+
+      def has_selected_choice_name?(name)
+        component.find(".selected-choice[data-name='#{name}']")
+      end
+
+      def has_option_name?(name)
+        component.find(".select-kit-collection li[data-name='#{name}']")
+      end
+
+      def expand
+        collapsed_component.find(":not(.is-expanded) .select-kit-header", visible: :all).click
+        expanded_component
+      end
+
+      def collapse
+        expanded_component.find(".is-expanded .select-kit-header").click
+        collapsed_component
+      end
+
+      def search(value = nil)
+        expanded_component.find(".select-kit-filter .filter-input").fill_in(with: value)
+      end
+
+      def select_row_by_value(value)
+        expanded_component.find(".select-kit-row[data-value='#{value}']").click
+      end
+
+      def select_row_by_name(name)
+        expanded_component.find(".select-kit-row[data-name='#{name}']").click
+      end
+
+      def select_row_by_index(index)
+        expanded_component.find(".select-kit-row[data-index='#{index}']").click
+      end
+
+      def expand_if_needed
+        expand if is_collapsed?
+      end
+    end
+  end
+end
diff --git a/spec/system/page_objects/components/sidebar.rb b/spec/system/page_objects/components/sidebar.rb
deleted file mode 100644
index 06fde5dc8cd..00000000000
--- a/spec/system/page_objects/components/sidebar.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module PageObjects
-  module Components
-    class Sidebar < PageObjects::Components::Base
-      def visible?
-        page.has_css?("#d-sidebar")
-      end
-
-      def has_category_section_link?(category)
-        page.has_link?(category.name, class: "sidebar-section-link")
-      end
-    end
-  end
-end
diff --git a/spec/system/page_objects/components/sidebar_header_dropdown.rb b/spec/system/page_objects/components/sidebar_header_dropdown.rb
new file mode 100644
index 00000000000..cd5287074cf
--- /dev/null
+++ b/spec/system/page_objects/components/sidebar_header_dropdown.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Components
+    class SidebarHeaderDropdown < PageObjects::Components::Base
+      def click
+        page.find(".hamburger-dropdown").click
+        wait_for_animation(find(".menu-panel"), timeout: 5)
+        self
+      end
+
+      SIDEBAR_HAMBURGER_DROPDOWN = ".sidebar-hamburger-dropdown"
+
+      def visible?
+        page.has_css?(SIDEBAR_HAMBURGER_DROPDOWN)
+      end
+
+      def hidden?
+        page.has_no_css?(SIDEBAR_HAMBURGER_DROPDOWN)
+      end
+
+      def has_no_keyboard_shortcuts_button?
+        page.has_no_css?(".sidebar-footer-actions-keyboard-shortcuts")
+      end
+
+      def click_categories_header_button
+        page.click_button(
+          I18n.t("js.sidebar.sections.categories.header_action_title"),
+          class: "sidebar-section-header-button",
+        )
+      end
+
+      def click_topics_link
+        find(".sidebar-section-link[data-link-name='everything']").click
+      end
+
+      def click_toggle_to_desktop_view_button
+        page.click_button(
+          I18n.t("js.desktop_view"),
+          class: "sidebar-footer-actions-toggle-mobile-view",
+        )
+      end
+
+      def click_outside
+        width = page.evaluate_script("document.body.clientWidth")
+        page.find("body").click(x: width - 1, y: 1)
+      end
+    end
+  end
+end
diff --git a/spec/system/page_objects/components/topic_list.rb b/spec/system/page_objects/components/topic_list.rb
index 83be6a93c27..4b03dcb3c93 100644
--- a/spec/system/page_objects/components/topic_list.rb
+++ b/spec/system/page_objects/components/topic_list.rb
@@ -3,12 +3,45 @@
 module PageObjects
   module Components
     class TopicList < PageObjects::Components::Base
+      TOPIC_LIST_BODY_SELECTOR = ".topic-list-body"
+      TOPIC_LIST_ITEM_SELECTOR = "#{TOPIC_LIST_BODY_SELECTOR} .topic-list-item"
+
       def topic_list
-        ".topic-list-body"
+        TOPIC_LIST_BODY_SELECTOR
+      end
+
+      def has_topics?(count: nil)
+        if count.nil?
+          page.has_css?(TOPIC_LIST_ITEM_SELECTOR)
+        else
+          page.has_css?(TOPIC_LIST_ITEM_SELECTOR, count: count)
+        end
+      end
+
+      def has_no_topics?
+        page.has_no_css?(TOPIC_LIST_ITEM_SELECTOR)
+      end
+
+      def has_topic?(topic)
+        page.has_css?(topic_list_item_class(topic))
+      end
+
+      def has_no_topic?(topic)
+        page.has_no_css?(topic_list_item_class(topic))
       end
 
       def visit_topic_with_title(title)
-        find(".topic-list-body a", text: title).click
+        find("#{TOPIC_LIST_BODY_SELECTOR} a", text: title).click
+      end
+
+      def visit_topic(topic)
+        find("#{topic_list_item_class(topic)} a.raw-topic-link").click
+      end
+
+      private
+
+      def topic_list_item_class(topic)
+        "#{TOPIC_LIST_ITEM_SELECTOR}[data-topic-id='#{topic.id}']"
       end
     end
   end
diff --git a/spec/system/page_objects/components/topic_list_controls.rb b/spec/system/page_objects/components/topic_list_controls.rb
new file mode 100644
index 00000000000..08090e0e905
--- /dev/null
+++ b/spec/system/page_objects/components/topic_list_controls.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Components
+    class TopicListControls < PageObjects::Components::Base
+      def has_new?(count:)
+        text =
+          if count == 0
+            I18n.t("js.filters.new.title")
+          else
+            I18n.t("js.filters.new.title_with_count", count: count)
+          end
+
+        has_css?(".nav-item_new", text: text)
+      end
+
+      def has_unread?(count:)
+        text =
+          if count == 0
+            I18n.t("js.filters.unread.title")
+          else
+            I18n.t("js.filters.unread.title_with_count", count: count)
+          end
+
+        has_css?(".nav-item_unread", text: text)
+      end
+
+      def dismiss_unread
+        click_button("dismiss-topics-bottom")
+        click_button("dismiss-read-confirm")
+        self
+      end
+
+      def dismiss_new
+        click_button("dismiss-new-bottom")
+        self
+      end
+    end
+  end
+end
diff --git a/spec/system/page_objects/components/topic_query_filter.rb b/spec/system/page_objects/components/topic_query_filter.rb
new file mode 100644
index 00000000000..d99b4d4d52a
--- /dev/null
+++ b/spec/system/page_objects/components/topic_query_filter.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Components
+    class TopicQueryFilter < PageObjects::Components::Base
+      def fill_in(text)
+        page.fill_in(class: "topic-query-filter__filter-term", with: "#{text}\n")
+      end
+    end
+  end
+end
diff --git a/spec/system/page_objects/components/topic_view.rb b/spec/system/page_objects/components/topic_view.rb
new file mode 100644
index 00000000000..6fef55c2362
--- /dev/null
+++ b/spec/system/page_objects/components/topic_view.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Components
+    class TopicView < PageObjects::Components::Base
+      def has_read_post?(post)
+        page.has_css?(
+          "#post_#{post.post_number} .read-state.read",
+          visible: false,
+          wait: Capybara.default_max_wait_time * 2,
+        )
+      end
+    end
+  end
+end
diff --git a/spec/system/page_objects/components/user_menu.rb b/spec/system/page_objects/components/user_menu.rb
new file mode 100644
index 00000000000..7edfebda1b5
--- /dev/null
+++ b/spec/system/page_objects/components/user_menu.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Components
+    class UserMenu < PageObjects::Components::Base
+      def open
+        find(".header-dropdown-toggle.current-user").click
+        has_css?(".user-menu")
+        self
+      end
+
+      def click_replies_notifications_tab
+        click_link("user-menu-button-replies")
+        has_css?("#quick-access-replies")
+        self
+      end
+
+      def has_group_mentioned_notification?(topic, user_that_mentioned_group, group_mentioned)
+        expect(find("#quick-access-replies .group-mentioned").text).to eq(
+          "#{user_that_mentioned_group.username} @#{group_mentioned.name} #{topic.title}",
+        )
+      end
+
+      def has_right_replies_button_count?(count)
+        expect(find("#user-menu-button-replies").text).to eq(count.to_s)
+      end
+    end
+  end
+end
diff --git a/spec/system/page_objects/modals/base.rb b/spec/system/page_objects/modals/base.rb
index 7bad184882c..dbd6cb1622b 100644
--- a/spec/system/page_objects/modals/base.rb
+++ b/spec/system/page_objects/modals/base.rb
@@ -17,6 +17,18 @@ module PageObjects
       def click_outside
         find(".modal-outer-container").click(x: 0, y: 0)
       end
+
+      def click_primary_button
+        find(".modal-footer .btn-primary").click
+      end
+
+      def open?
+        has_css?(".modal.d-modal")
+      end
+
+      def closed?
+        has_no_css?(".modal.d-modal")
+      end
     end
   end
 end
diff --git a/spec/system/page_objects/modals/bookmark.rb b/spec/system/page_objects/modals/bookmark.rb
index c9d3ac6c946..1b4f26a7262 100644
--- a/spec/system/page_objects/modals/bookmark.rb
+++ b/spec/system/page_objects/modals/bookmark.rb
@@ -4,16 +4,90 @@ module PageObjects
   module Modals
     class Bookmark < PageObjects::Modals::Base
       def fill_name(name)
-        fill_in "bookmark-name", with: name
+        fill_in("bookmark-name", with: name)
+      end
+
+      def name
+        find("#bookmark-name")
       end
 
       def select_preset_reminder(identifier)
         find("#tap_tile_#{identifier}").click
       end
 
+      def has_active_preset?(identifier)
+        has_css?("#tap_tile_#{identifier}.tap-tile.active")
+      end
+
+      def has_preset?(identifier)
+        has_css?("#tap_tile_#{identifier}")
+      end
+
+      def has_no_preset?(identifier)
+        has_no_css?("#tap_tile_#{identifier}")
+      end
+
+      def editing_id?(bookmark_id)
+        has_css?(".bookmark-reminder-modal[data-bookmark-id='#{bookmark_id}']")
+      end
+
+      def open_options_panel
+        find(".bookmark-options-button").click
+      end
+
+      def has_open_options_panel?
+        has_css?(".bookmark-options-panel")
+      end
+
+      def select_auto_delete_preference(preference)
+        select_kit = PageObjects::Components::SelectKit.new("#bookmark-auto-delete-preference")
+        select_kit.expand
+        select_kit.select_row_by_value(preference)
+      end
+
+      def has_auto_delete_preference?(preference)
+        select_kit = PageObjects::Components::SelectKit.new("#bookmark-auto-delete-preference")
+        select_kit.has_selected_value?(preference)
+      end
+
+      def custom_date_picker
+        find(".tap-tile-date-input #custom-date .date-picker")
+      end
+
+      def custom_time_picker
+        find(".tap-tile-time-input #custom-time")
+      end
+
       def save
         find("#save-bookmark").click
       end
+
+      def delete
+        find("#delete-bookmark").click
+      end
+
+      def confirm_delete
+        find(".dialog-footer .btn-danger").click
+      end
+
+      def existing_reminder_alert
+        find(".existing-reminder-at-alert")
+      end
+
+      def existing_reminder_alert_message(bookmark)
+        I18n.t(
+          "js.bookmarks.reminders.existing_reminder",
+          at_date_time:
+            I18n.t(
+              "js.bookmarks.reminders.at_time",
+              date_time:
+                bookmark
+                  .reminder_at_in_zone(bookmark.user.user_option&.timezone || "UTC")
+                  .strftime("%b %-d, %Y %l:%M %P")
+                  .gsub("  ", " "), # have to do this because %l adds padding before the hour but not in JS
+            ),
+        )
+      end
     end
   end
 end
diff --git a/spec/system/page_objects/modals/dismiss_new.rb b/spec/system/page_objects/modals/dismiss_new.rb
new file mode 100644
index 00000000000..49a92d60285
--- /dev/null
+++ b/spec/system/page_objects/modals/dismiss_new.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Modals
+    class DismissNew < PageObjects::Modals::Base
+      def has_dismiss_topics_checked?
+        find(".dismiss-topics label").has_checked_field?
+      end
+
+      def has_dismiss_posts_checked?
+        find(".dismiss-posts label").has_checked_field?
+      end
+
+      def has_untrack_unchecked?
+        find(".untrack label").has_no_checked_field?
+      end
+
+      def click_dismiss
+        click_button("dismiss-read-confirm")
+        self
+      end
+    end
+  end
+end
diff --git a/spec/system/page_objects/modals/sidebar_edit_categories.rb b/spec/system/page_objects/modals/sidebar_edit_categories.rb
new file mode 100644
index 00000000000..56d96472175
--- /dev/null
+++ b/spec/system/page_objects/modals/sidebar_edit_categories.rb
@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require_relative "sidebar_edit_navigation_modal"
+
+module PageObjects
+  module Modals
+    class SidebarEditCategories < SidebarEditNavigationModal
+      def has_parent_category_color?(category)
+        has_css?(
+          ".sidebar-categories-form .sidebar-categories-form__row",
+          style: "border-left-color: ##{category.color} ",
+        )
+      end
+
+      def has_category_description_excerpt?(category)
+        has_css?(
+          ".sidebar-categories-form .sidebar-categories-form__category-row",
+          text: category.description_excerpt,
+        )
+      end
+
+      def has_no_categories?
+        has_no_css?(".sidebar-categories-form .sidebar-categories-form__category-row") &&
+          has_css?(
+            ".sidebar-categories-form .sidebar-categories-form__no-categories",
+            text: I18n.t("js.sidebar.categories_form_modal.no_categories"),
+          )
+      end
+
+      def has_categories?(categories)
+        category_names = categories.map(&:name)
+
+        categories =
+          all(
+            ".sidebar-categories-form .sidebar-categories-form__category-row",
+            count: category_names.length,
+          )
+
+        expect(categories.map(&:text)).to eq(category_names)
+      end
+
+      def has_checkbox?(category, disabled: false)
+        has_selector?(
+          ".sidebar-categories-form .sidebar-categories-form__category-row[data-category-id='#{category.id}'] .sidebar-categories-form__input#{disabled ? "[disabled]" : ""}",
+        )
+      end
+
+      def toggle_category_checkbox(category)
+        find(
+          ".sidebar-categories-form .sidebar-categories-form__category-row[data-category-id='#{category.id}'] .sidebar-categories-form__input",
+        ).click
+
+        self
+      end
+
+      def has_checkbox?(category, disabled: false)
+        has_selector?(
+          ".sidebar-categories-form .sidebar-categories-form__category-row[data-category-id='#{category.id}'] .sidebar-categories-form__input#{disabled ? "[disabled]" : ""}",
+        )
+      end
+    end
+  end
+end
diff --git a/spec/system/page_objects/modals/sidebar_edit_navigation_modal.rb b/spec/system/page_objects/modals/sidebar_edit_navigation_modal.rb
new file mode 100644
index 00000000000..786681237d7
--- /dev/null
+++ b/spec/system/page_objects/modals/sidebar_edit_navigation_modal.rb
@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Modals
+    class SidebarEditNavigationModal < PageObjects::Modals::Base
+      def closed?
+        has_no_css?(".sidebar__edit-navigation-menu__modal")
+      end
+
+      def has_right_title?(title)
+        has_css?(".sidebar__edit-navigation-menu__modal .title", text: title)
+      end
+
+      def has_focus_on_filter_input?
+        evaluate_script("document.activeElement").native ==
+          find(".sidebar__edit-navigation-menu__filter-input-field").native
+      end
+
+      def filter(text)
+        find(".sidebar__edit-navigation-menu__filter-input-field").fill_in(with: text)
+        self
+      end
+
+      def click_reset_to_defaults_button
+        click_button(I18n.t("js.sidebar.edit_navigation_modal_form.reset_to_defaults"))
+        self
+      end
+
+      def has_no_reset_to_defaults_button?
+        has_no_button?(I18n.t("js.sidebar.edit_navigation_modal_form.reset_to_defaults"))
+      end
+
+      def save
+        find(".sidebar__edit-navigation-menu__save-button").click
+        self
+      end
+
+      def deselect_all
+        click_button(I18n.t("js.sidebar.edit_navigation_modal_form.deselect_button_text"))
+        self
+      end
+
+      def filter_by_selected
+        dropdown_filter.select_row_by_name(
+          I18n.t("js.sidebar.edit_navigation_modal_form.filter_dropdown.selected"),
+        )
+
+        self
+      end
+
+      def filter_by_unselected
+        dropdown_filter.select_row_by_name(
+          I18n.t("js.sidebar.edit_navigation_modal_form.filter_dropdown.unselected"),
+        )
+
+        self
+      end
+
+      def filter_by_all
+        dropdown_filter.select_row_by_name(
+          I18n.t("js.sidebar.edit_navigation_modal_form.filter_dropdown.all"),
+        )
+
+        self
+      end
+
+      private
+
+      def dropdown_filter
+        PageObjects::Components::SelectKit.new(".sidebar__edit-navigation-menu__filter-dropdown")
+      end
+    end
+  end
+end
diff --git a/spec/system/page_objects/modals/sidebar_edit_tags.rb b/spec/system/page_objects/modals/sidebar_edit_tags.rb
new file mode 100644
index 00000000000..2acbf71cd4e
--- /dev/null
+++ b/spec/system/page_objects/modals/sidebar_edit_tags.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require_relative "sidebar_edit_navigation_modal"
+
+module PageObjects
+  module Modals
+    class SidebarEditTags < SidebarEditNavigationModal
+      def has_tag_checkboxes?(tags)
+        expect(form).to have_content(
+          tags.map { |tag| "#{tag.name} (#{tag.public_topic_count})" }.join("\n"),
+          exact: true,
+        )
+      end
+
+      def has_no_tag_checkboxes?
+        has_no_css?(".sidebar-tags-form .sidebar-tags-form__tag") &&
+          has_css?(
+            ".sidebar-tags-form .sidebar-tags-form__no-tags",
+            text: I18n.t("js.sidebar.tags_form_modal.no_tags"),
+          )
+      end
+
+      def toggle_tag_checkbox(tag)
+        find(
+          ".sidebar-tags-form .sidebar-tags-form__tag[data-tag-name='#{tag.name}'] .sidebar-tags-form__input",
+        ).click
+
+        self
+      end
+
+      def scroll_to_tag(tag)
+        page.execute_script(
+          "document.querySelector('.sidebar-tags-form__tag[data-tag-name=\"#{tag.name}\"]').scrollIntoView()",
+        )
+      end
+
+      private
+
+      def form
+        find(".sidebar-tags-form")
+      end
+    end
+  end
+end
diff --git a/spec/system/page_objects/modals/sidebar_section_form.rb b/spec/system/page_objects/modals/sidebar_section_form.rb
new file mode 100644
index 00000000000..bb3a989e251
--- /dev/null
+++ b/spec/system/page_objects/modals/sidebar_section_form.rb
@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Modals
+    class SidebarSectionForm < PageObjects::Modals::Base
+      def fill_name(name)
+        fill_in "section-name", with: name
+      end
+
+      def fill_link(name, url, icon = "link")
+        fill_in "link-name", with: name, match: :first
+        fill_in "link-url", with: url, match: :first
+        find(".sidebar-section-form-link .select-kit summary", match: :first).click
+        fill_in "filter-input-search", with: icon, match: :first
+        find(".select-kit-row.is-highlighted", match: :first).click
+      end
+
+      def mark_as_public
+        find(".modal .mark-public").click
+      end
+
+      def remove_last_link
+        all(".delete-link").last.click
+      end
+
+      def delete
+        find("#delete-section").click
+      end
+
+      def confirm_delete
+        find(".dialog-container .btn-primary").click
+      end
+
+      def reset
+        find(".reset-link").click
+        find(".dialog-footer .btn-primary").click
+        closed?
+        self
+      end
+
+      def save
+        find("#save-section").click
+        closed?
+        self
+      end
+
+      def visible?
+        page.has_css?(".sidebar-section-form-modal")
+      end
+
+      def closed?
+        page.has_no_css?(".sidebar-section-form-modal")
+      end
+
+      def has_disabled_save?
+        find_button("Save", disabled: true)
+      end
+
+      def has_enabled_save?
+        find_button("Save", disabled: false)
+      end
+
+      def topics_link
+        find(".draggable[data-link-name='Topics']")
+      end
+
+      def review_link
+        find(".draggable[data-link-name='Review']")
+      end
+    end
+  end
+end
diff --git a/spec/system/page_objects/pages/admin_settings.rb b/spec/system/page_objects/pages/admin_settings.rb
index e7187490ee2..c813ec6dd36 100644
--- a/spec/system/page_objects/pages/admin_settings.rb
+++ b/spec/system/page_objects/pages/admin_settings.rb
@@ -8,11 +8,32 @@ module PageObjects
         self
       end
 
+      def visit_category(category)
+        page.visit("/admin/site_settings/category/#{category}")
+        self
+      end
+
       def toggle_setting(setting_name, text = "")
         setting = find(".admin-detail .row.setting[data-setting='#{setting_name}']")
         setting.find(".setting-value span", text: text).click
         setting.find(".setting-controls button.ok").click
       end
+
+      def select_from_emoji_list(setting_name, text = "", save_changes = true)
+        setting = find(".admin-detail .row.setting[data-setting='#{setting_name}']")
+        setting.find(".setting-value .value-list > .value button").click
+        setting.find(".setting-value .emoji-picker .emoji[title='#{text}']").click
+        setting.find(".setting-controls button.ok").click if save_changes
+      end
+
+      def values_in_list(setting_name)
+        vals = []
+        setting = find(".admin-detail .row.setting[data-setting='#{setting_name}']")
+        setting
+          .all(:css, ".setting-value .values .value .value-input span")
+          .map { |e| vals << e.text }
+        vals
+      end
     end
   end
 end
diff --git a/spec/system/page_objects/pages/base.rb b/spec/system/page_objects/pages/base.rb
index 60c2ffb24f2..42d716abb9a 100644
--- a/spec/system/page_objects/pages/base.rb
+++ b/spec/system/page_objects/pages/base.rb
@@ -4,10 +4,8 @@ module PageObjects
   module Pages
     class Base
       include Capybara::DSL
-
-      def setup_component_classes!(component_classes)
-        @component_classes = component_classes
-      end
+      include RSpec::Matchers
+      include SystemHelpers
     end
   end
 end
diff --git a/spec/system/page_objects/pages/category.rb b/spec/system/page_objects/pages/category.rb
index e628812a8b8..c5e863d9894 100644
--- a/spec/system/page_objects/pages/category.rb
+++ b/spec/system/page_objects/pages/category.rb
@@ -15,6 +15,11 @@ module PageObjects
         self
       end
 
+      def visit_edit_template(category)
+        page.visit("/c/#{category.slug}/edit/topic-template")
+        self
+      end
+
       def back_to_category
         find(".edit-category-title-bar span", text: "Back to category").click
         self
@@ -26,9 +31,57 @@ module PageObjects
       end
 
       def toggle_setting(setting, text = "")
-        find(".edit-category-tab .#{setting} label.checkbox-label", text: text).click
+        find(".edit-category-tab .#{setting} label.checkbox-label", text: text, visible: :all).click
         self
       end
+
+      # Edit Category Page
+      def has_form_template_enabled?
+        find(".d-toggle-switch .toggle-template-type", visible: false)["aria-checked"] == "true"
+      end
+
+      D_EDITOR_SELECTOR = ".d-editor"
+
+      def has_d_editor?
+        page.has_selector?(D_EDITOR_SELECTOR)
+      end
+
+      def has_no_d_editor?
+        page.has_no_selector?(D_EDITOR_SELECTOR)
+      end
+
+      def has_selected_template?(template_name)
+        has_css?(".select-category-template .select-kit-header[data-name='#{template_name}']")
+      end
+
+      def toggle_form_templates
+        find(".d-toggle-switch .d-toggle-switch__checkbox-slider").click
+        self
+      end
+
+      def select_form_template(template_name)
+        find(".select-category-template").click
+        find(".select-kit-collection .select-kit-row", text: template_name).click
+        find(".select-category-template").click
+      end
+
+      def new_topic_button
+        find("#create-topic")
+      end
+
+      CATEGORY_NAVIGATION_NEW_NAV_ITEM_SELECTOR = ".category-navigation .nav-item_new"
+
+      def has_no_new_topics?
+        page.has_no_css?(CATEGORY_NAVIGATION_NEW_NAV_ITEM_SELECTOR)
+      end
+
+      def has_new_topics?
+        page.has_css?(CATEGORY_NAVIGATION_NEW_NAV_ITEM_SELECTOR)
+      end
+
+      def click_new
+        page.find(CATEGORY_NAVIGATION_NEW_NAV_ITEM_SELECTOR).click
+      end
     end
   end
 end
diff --git a/spec/system/page_objects/pages/csv_export_pm.rb b/spec/system/page_objects/pages/csv_export_pm.rb
new file mode 100644
index 00000000000..7260ee6e918
--- /dev/null
+++ b/spec/system/page_objects/pages/csv_export_pm.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Pages
+    class CSVExportPM < PageObjects::Pages::Base
+      def initialize
+        super
+        @downloaded_files = []
+      end
+
+      def download_and_extract
+        click_link ".zip"
+        Downloads.wait_for_download
+
+        zip_name = find("a.attachment").text
+        zip_path = File.join(Downloads::FOLDER, zip_name)
+        @downloaded_files << zip_path
+
+        csv_path = unzip(zip_path).first
+        @downloaded_files << csv_path
+        CSV.read(csv_path)
+      end
+
+      def clear_downloads
+        @downloaded_files.each { |file| FileUtils.rm(file) }
+        @downloaded_files = []
+      end
+
+      def has_download_link?
+        find(:link, ".zip").present?
+      end
+
+      private
+
+      def unzip(file)
+        paths = []
+        Zip::File.open(file) do |zip_file|
+          zip_file.each do |f|
+            path = File.join(Downloads::FOLDER, f.name)
+            zip_file.extract(f, path)
+            paths << path
+          end
+        end
+
+        paths
+      end
+    end
+  end
+end
diff --git a/spec/system/page_objects/pages/discovery.rb b/spec/system/page_objects/pages/discovery.rb
new file mode 100644
index 00000000000..e0715e52947
--- /dev/null
+++ b/spec/system/page_objects/pages/discovery.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Pages
+    class Discovery < PageObjects::Pages::Base
+      def topic_list
+        Components::TopicList.new
+      end
+
+      def category_drop
+        Components::SelectKit.new(".category-breadcrumb li:first-of-type .category-drop")
+      end
+
+      def subcategory_drop
+        Components::SelectKit.new(".category-breadcrumb li:nth-of-type(2) .category-drop")
+      end
+
+      def tag_drop
+        Components::SelectKit.new(".category-breadcrumb .tag-drop")
+      end
+    end
+  end
+end
diff --git a/spec/system/page_objects/pages/form_template.rb b/spec/system/page_objects/pages/form_template.rb
new file mode 100644
index 00000000000..3e86ab80e53
--- /dev/null
+++ b/spec/system/page_objects/pages/form_template.rb
@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Pages
+    class FormTemplate < PageObjects::Pages::Base
+      def visit
+        page.visit("/admin/customize/form-templates")
+        self
+      end
+
+      def visit_new
+        page.visit("/admin/customize/form-templates/new")
+        self
+      end
+
+      # Form Template Index
+      def has_form_template_table?
+        page.has_selector?("table.form-templates__table")
+      end
+
+      def click_view_form_template
+        find(".form-templates__table tr:first-child .btn-view-template").click
+      end
+
+      def click_toggle_preview
+        find(".d-toggle-switch .d-toggle-switch__checkbox-slider", visible: false).click
+        self
+      end
+
+      def has_form_template?(name)
+        find(".form-templates__table tbody tr td", text: name).present?
+      end
+
+      def has_category_in_template_row?(category_name)
+        find(".form-templates__table .categories .category-name", text: category_name).present?
+      end
+
+      def has_template_structure?(structure)
+        find("code", text: structure).present?
+      end
+
+      # Form Template new/edit form related
+      def type_in_template_name(input)
+        find(".form-templates__form-name-input").fill_in(with: input)
+        self
+      end
+
+      def click_save_button
+        find(".form-templates__form .footer-buttons .btn-primary:enabled", visible: :all).click
+      end
+
+      def click_quick_insert(field_type)
+        find(".form-templates__form .quick-insert-#{field_type}").click
+      end
+
+      def click_validations_button
+        find(".form-templates__validations-modal-button").click
+      end
+
+      def click_preview_button
+        find(".form-templates__preview-button:enabled").click
+      end
+
+      def has_input_field?(type)
+        find(".form-template-field__#{type}", visible: :all).present?
+      end
+
+      def has_preview_modal?
+        find(".form-template-form-preview-modal").present?
+      end
+
+      def has_validations_modal?
+        find(".admin-form-template-validation-options-modal").present?
+      end
+
+      def has_name_value?(name)
+        find(".form-templates__form-name-input").value == name
+      end
+
+      def has_save_button_with_state?(disabled:)
+        find_button("Save", disabled:)
+      end
+
+      def has_preview_button_with_state?(disabled:)
+        find_button("Preview", disabled:)
+      end
+    end
+  end
+end
diff --git a/spec/system/page_objects/pages/review.rb b/spec/system/page_objects/pages/review.rb
new file mode 100644
index 00000000000..b80e5580fd2
--- /dev/null
+++ b/spec/system/page_objects/pages/review.rb
@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Pages
+    class Review < PageObjects::Pages::Base
+      POST_BODY_TOGGLE_SELECTOR = ".post-body__toggle-btn"
+      POST_BODY_COLLAPSED_SELECTOR = ".post-body.is-collapsed"
+      REVIEWABLE_ACTION_DROPDOWN = ".reviewable-action-dropdown"
+
+      def visit_reviewable(reviewable)
+        page.visit("/review/#{reviewable.id}")
+        self
+      end
+
+      def select_bundled_action(reviewable, value)
+        within(reviewable_by_id(reviewable.id)) do
+          reviewable_action_dropdown.select_row_by_value(value)
+        end
+      end
+
+      def reviewable_by_id(id)
+        find(".reviewable-item[data-reviewable-id=\"#{id}\"]")
+      end
+
+      def click_post_body_toggle
+        find(POST_BODY_TOGGLE_SELECTOR).click
+      end
+
+      def has_post_body_toggle?
+        page.has_css?(POST_BODY_TOGGLE_SELECTOR)
+      end
+
+      def has_no_post_body_toggle?
+        page.has_no_css?(POST_BODY_TOGGLE_SELECTOR)
+      end
+
+      def has_post_body_collapsed?
+        page.has_css?(POST_BODY_COLLAPSED_SELECTOR)
+      end
+
+      def has_no_post_body_collapsed?
+        page.has_no_css?(POST_BODY_COLLAPSED_SELECTOR)
+      end
+
+      def has_reviewable_action_dropdown?
+        page.has_css?(REVIEWABLE_ACTION_DROPDOWN)
+      end
+
+      def has_no_reviewable_action_dropdown?
+        page.has_no_css?(REVIEWABLE_ACTION_DROPDOWN)
+      end
+
+      def has_reviewable_with_pending_status?(reviewable)
+        within(reviewable_by_id(reviewable.id)) { page.has_css?(".status .pending") }
+      end
+
+      def has_reviewable_with_rejected_status?(reviewable)
+        within(reviewable_by_id(reviewable.id)) { page.has_css?(".status .rejected") }
+      end
+
+      def has_error_dialog_visible?
+        page.has_css?(".dialog-container .dialog-content")
+      end
+
+      def has_no_error_dialog_visible?
+        page.has_no_css?("dialog-container .dialog-content")
+      end
+
+      private
+
+      def reviewable_action_dropdown
+        @reviewable_action_dropdown ||=
+          PageObjects::Components::SelectKit.new(REVIEWABLE_ACTION_DROPDOWN)
+      end
+    end
+  end
+end
diff --git a/spec/system/page_objects/pages/search.rb b/spec/system/page_objects/pages/search.rb
index 5e60f76cf67..010314188c3 100644
--- a/spec/system/page_objects/pages/search.rb
+++ b/spec/system/page_objects/pages/search.rb
@@ -29,16 +29,28 @@ module PageObjects
         find(".d-header #search-button").click
       end
 
+      SEARCH_RESULT_SELECTOR = ".search-results .fps-result"
+
       def has_search_result?
-        within(".search-results") { page.has_selector?(".fps-result", visible: true) }
+        page.has_selector?(SEARCH_RESULT_SELECTOR)
+      end
+
+      def has_no_search_result?
+        page.has_no_selector?(SEARCH_RESULT_SELECTOR)
       end
 
       def has_warning_message?
-        within(".search-results") { page.has_selector?(".warning", visible: true) }
+        page.has_selector?(".search-results .warning")
       end
 
-      def is_search_page
-        has_css?("body.search-page")
+      SEARCH_PAGE_SELECTOR = "body.search-page"
+
+      def active?
+        has_css?(SEARCH_PAGE_SELECTOR)
+      end
+
+      def not_active?
+        has_no_css?(SEARCH_PAGE_SELECTOR)
       end
     end
   end
diff --git a/spec/system/page_objects/pages/tag.rb b/spec/system/page_objects/pages/tag.rb
new file mode 100644
index 00000000000..101a8d42e2a
--- /dev/null
+++ b/spec/system/page_objects/pages/tag.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Pages
+    class Tag < PageObjects::Pages::Base
+      def visit_tag(tag)
+        page.visit "/tag/#{tag.name}"
+        self
+      end
+
+      def tag_info_btn
+        find("#show-tag-info")
+      end
+
+      def edit_synonyms_btn
+        find("#edit-synonyms")
+      end
+
+      def add_synonym_btn
+        find(".add-synonyms .ok")
+      end
+
+      def confirm_synonym_btn
+        find(".dialog-footer .btn-primary")
+      end
+
+      def add_synonyms_dropdown
+        PageObjects::Components::SelectKit.new("#add-synonyms")
+      end
+
+      def search_tags(query)
+        add_synonyms_dropdown.search(query)
+      end
+
+      def select_tag(value: nil, index: nil, name: nil)
+        if value
+          add_synonyms_dropdown.select_row_by_value(value)
+        elsif name
+          add_synonyms_dropdown.select_row_by_name(name)
+        elsif index
+          add_synonyms_dropdown.select_row_by_index(index)
+        end
+      end
+
+      def tag_box(tag)
+        find(".tag-box div[data-tag-name='#{tag}']")
+      end
+    end
+  end
+end
diff --git a/spec/system/page_objects/pages/topic.rb b/spec/system/page_objects/pages/topic.rb
index efe278d05cc..8105849e027 100644
--- a/spec/system/page_objects/pages/topic.rb
+++ b/spec/system/page_objects/pages/topic.rb
@@ -4,17 +4,25 @@ module PageObjects
   module Pages
     class Topic < PageObjects::Pages::Base
       def initialize
-        setup_component_classes!(
-          post_show_more_actions: ".show-more-actions",
-          post_action_button_bookmark: ".bookmark.with-reminder",
-          reply_button: ".topic-footer-main-buttons > .create",
-          composer: "#reply-control",
-          composer_textarea: "#reply-control .d-editor .d-editor-input",
-        )
+        @composer_component = PageObjects::Components::Composer.new
+        @fast_edit_component = PageObjects::Components::FastEditor.new
       end
 
-      def visit_topic(topic)
-        page.visit "/t/#{topic.id}"
+      def visit_topic(topic, post_number: nil)
+        url = "/t/#{topic.id}"
+        url += "/#{post_number}" if post_number
+        page.visit url
+        self
+      end
+
+      def open_new_topic
+        page.visit "/"
+        find("button#create-topic").click
+        self
+      end
+
+      def open_new_message
+        page.visit "/new-message"
         self
       end
 
@@ -24,6 +32,10 @@ module PageObjects
         self
       end
 
+      def has_topic_title?(text)
+        has_css?("h1 .fancy-title", text: text)
+      end
+
       def has_post_content?(post)
         post_by_number(post).has_content? post.raw
       end
@@ -48,9 +60,11 @@ module PageObjects
       end
 
       def has_post_bookmarked?(post)
-        within post_by_number(post) do
-          has_css?(".bookmark.with-reminder.bookmarked")
-        end
+        is_post_bookmarked(post, bookmarked: true)
+      end
+
+      def has_no_post_bookmarked?(post)
+        is_post_bookmarked(post, bookmarked: false)
       end
 
       def expand_post_actions(post)
@@ -61,6 +75,8 @@ module PageObjects
         case button
         when :bookmark
           post_by_number(post).find(".bookmark.with-reminder").click
+        when :reply
+          post_by_number(post).find(".post-controls .reply").click
         end
       end
 
@@ -72,6 +88,10 @@ module PageObjects
         has_css?("#{topic_footer_button_id("bookmark")}.bookmarked", text: "Edit Bookmark")
       end
 
+      def has_no_bookmarks?
+        has_no_css?("#{topic_footer_button_id("bookmark")}.bookmarked")
+      end
+
       def find_topic_footer_button(button)
         find(topic_footer_button_id(button))
       end
@@ -85,32 +105,51 @@ module PageObjects
         has_css?("#reply-control.open")
       end
 
-      def find_composer
-        find("#reply-control .d-editor .d-editor-input")
-      end
-
       def type_in_composer(input)
-        find_composer.send_keys(input)
+        @composer_component.type_content(input)
       end
 
       def fill_in_composer(input)
-        find_composer.fill_in(with: input)
+        @composer_component.fill_content(input)
       end
 
       def clear_composer
-        fill_in_composer("")
+        @composer_component.clear_content
       end
 
       def has_composer_content?(content)
-        find_composer.value == content
+        @composer_component.has_content?(content)
       end
 
-      def send_reply
+      def has_composer_popup_content?(content)
+        @composer_component.has_popup_content?(content)
+      end
+
+      def send_reply(content = nil)
+        fill_in_composer(content) if content
         find("#reply-control .save-or-cancel .create").click
       end
 
       def fill_in_composer_title(title)
-        find("#reply-title").fill_in(with: title)
+        @composer_component.fill_title(title)
+      end
+
+      def fast_edit_button
+        find(".quote-button .quote-edit-label")
+      end
+
+      def click_fast_edit_button
+        find(".quote-button .quote-edit-label").click
+      end
+
+      def fast_edit_input
+        @fast_edit_component.fast_edit_input
+      end
+
+      def click_mention(post, mention)
+        within post_by_number(post) do
+          find("a.mention-group", text: mention).click
+        end
       end
 
       private
@@ -118,6 +157,15 @@ module PageObjects
       def topic_footer_button_id(button)
         "#topic-footer-button-#{button}"
       end
+
+      def is_post_bookmarked(post, bookmarked:)
+        within post_by_number(post) do
+          page.public_send(
+            bookmarked ? :has_css? : :has_no_css?,
+            ".bookmark.with-reminder.bookmarked",
+          )
+        end
+      end
     end
   end
 end
diff --git a/spec/system/page_objects/pages/user.rb b/spec/system/page_objects/pages/user.rb
index 4861642c0cf..457336e82f5 100644
--- a/spec/system/page_objects/pages/user.rb
+++ b/spec/system/page_objects/pages/user.rb
@@ -9,28 +9,54 @@ module PageObjects
       end
 
       def find(selector)
-        page.find(".user-content-wrapper #{selector}")
+        page.find(".new-user-wrapper #{selector}")
       end
 
       def active_user_primary_navigation
-        find(".user-primary-navigation li a.active")
+        find(".user-navigation-primary li a.active")
       end
 
       def active_user_secondary_navigation
-        find(".user-secondary-navigation li a.active")
+        find(".user-navigation-secondary li a.active")
       end
 
       def has_warning_messages_path?(user)
         page.has_current_path?("/u/#{user.username}/messages/warnings")
       end
 
-      def click_staff_info_warnings_link(warnings_count: 0)
+      def click_staff_info_warnings_link(user, warnings_count: 0)
         staff_counters = page.find(".staff-counters")
-        staff_counters.click_link(
-          "#{warnings_count} #{I18n.t("js.user.staff_counters.warnings_received")}",
-        )
+        staff_counters.find("a[href='/u/#{user.username}/messages/warnings']").click
         self
       end
+
+      def expand_info_panel
+        button = page.find("button[aria-controls='collapsed-info-panel']")
+        button.click if button["aria-expanded"] == "false"
+        self
+      end
+
+      def has_reviewable_flagged_posts_path?(user)
+        params = {
+          status: "approved",
+          sort_order: "score",
+          type: "ReviewableFlaggedPost",
+          username: user.username,
+        }
+        page.has_current_path?("/review?#{params.to_query}")
+      end
+
+      def staff_info_flagged_posts_counter
+        page.find(".staff-counters .flagged-posts")
+      end
+
+      def has_staff_info_flagged_posts_count?(count:)
+        staff_info_flagged_posts_counter.text.to_i == count
+      end
+
+      def has_no_staff_info_flagged_posts_counter?
+        page.has_no_css?(".staff-counters .flagged-posts")
+      end
     end
   end
 end
diff --git a/spec/system/page_objects/pages/user_preferences.rb b/spec/system/page_objects/pages/user_preferences.rb
index 42bdc016282..f872c973905 100644
--- a/spec/system/page_objects/pages/user_preferences.rb
+++ b/spec/system/page_objects/pages/user_preferences.rb
@@ -8,6 +8,11 @@ module PageObjects
         self
       end
 
+      def click_interface_tab
+        click_link "Interface"
+        self
+      end
+
       def click_secondary_navigation_menu_scroll_right
         find(".horizontal-overflow-nav__scroll-right").click
       end
@@ -16,7 +21,7 @@ module PageObjects
         find(".horizontal-overflow-nav__scroll-left").click
       end
 
-      INTERFACE_LINK_CSS_SELECTOR = ".nav-tracking"
+      INTERFACE_LINK_CSS_SELECTOR = ".user-nav__preferences-tracking"
 
       def has_interface_link_visible?
         horizontal_secondary_link_visible?(INTERFACE_LINK_CSS_SELECTOR, visible: true)
@@ -26,7 +31,7 @@ module PageObjects
         horizontal_secondary_link_visible?(INTERFACE_LINK_CSS_SELECTOR, visible: false)
       end
 
-      ACCOUNT_LINK_CSS_SELECTOR = ".nav-account"
+      ACCOUNT_LINK_CSS_SELECTOR = ".user-nav__preferences-account"
 
       def has_account_link_visible?
         horizontal_secondary_link_visible?(ACCOUNT_LINK_CSS_SELECTOR, visible: true)
diff --git a/spec/system/page_objects/pages/user_preferences_interface.rb b/spec/system/page_objects/pages/user_preferences_interface.rb
new file mode 100644
index 00000000000..d715e62163d
--- /dev/null
+++ b/spec/system/page_objects/pages/user_preferences_interface.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Pages
+    class UserPreferencesInterface < PageObjects::Pages::Base
+      def visit(user)
+        page.visit("/u/#{user.username}/preferences/interface")
+        self
+      end
+
+      def has_bookmark_after_notification_mode?(value)
+        page.has_css?(
+          "#bookmark-after-notification-mode .select-kit-header[data-value=\"#{value}\"]",
+        )
+      end
+
+      def select_bookmark_after_notification_mode(value)
+        page.find("#bookmark-after-notification-mode").click
+        page.find(".select-kit-row[data-value=\"#{value}\"]").click
+        self
+      end
+
+      def save_changes
+        click_button "Save Changes"
+        expect(page).to have_content(I18n.t("js.saved"))
+        self
+      end
+    end
+  end
+end
diff --git a/spec/system/page_objects/pages/user_preferences_navigation_menu.rb b/spec/system/page_objects/pages/user_preferences_navigation_menu.rb
new file mode 100644
index 00000000000..6ea0522abcf
--- /dev/null
+++ b/spec/system/page_objects/pages/user_preferences_navigation_menu.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Pages
+    class UserPreferencesNavigationMenu < PageObjects::Pages::Base
+      def visit(user)
+        page.visit("/u/#{user.username}/preferences/navigation-menu")
+        self
+      end
+
+      def has_navigation_menu_categories_preference?(*categories)
+        category_selector_header = page.find(".category-selector .select-kit-header-wrapper")
+        category_selector_header.has_content?(categories.map(&:name).join(", "))
+      end
+
+      def has_navigation_menu_tags_preference?(*tags)
+        tag_selector_header = page.find(".tag-chooser .select-kit-header-wrapper")
+        tag_selector_header.has_content?(tags.map(&:name).join(", "))
+      end
+
+      def has_navigation_menu_preference_checked?(preference)
+        page.find(".#{preference} input").checked?
+      end
+    end
+  end
+end
diff --git a/spec/system/page_objects/pages/user_preferences_sidebar.rb b/spec/system/page_objects/pages/user_preferences_sidebar.rb
deleted file mode 100644
index c84d5e33170..00000000000
--- a/spec/system/page_objects/pages/user_preferences_sidebar.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-module PageObjects
-  module Pages
-    class UserPreferencesSidebar < PageObjects::Pages::Base
-      def visit(user)
-        page.visit("/u/#{user.username}/preferences/sidebar")
-        self
-      end
-
-      def has_sidebar_categories_preference?(*categories)
-        category_selector_header = page.find(".category-selector .select-kit-header-wrapper")
-        category_selector_header.has_content?(categories.map(&:name).join(", "))
-      end
-
-      def has_sidebar_tags_preference?(*tags)
-        tag_selector_header = page.find(".tag-chooser .select-kit-header-wrapper")
-        tag_selector_header.has_content?(tags.map(&:name).join(", "))
-      end
-
-      def has_sidebar_list_destination_preference?(type)
-        list_selector_header =
-          page.find(
-            ".preferences-sidebar-navigation__list-destination-selector .select-kit-header-wrapper",
-          )
-        list_selector_header.has_content?(
-          I18n.t("js.user.experimental_sidebar.list_destination_#{type}"),
-        )
-      end
-    end
-  end
-end
diff --git a/spec/system/page_objects/pages/user_private_messages.rb b/spec/system/page_objects/pages/user_private_messages.rb
new file mode 100644
index 00000000000..17549a1d379
--- /dev/null
+++ b/spec/system/page_objects/pages/user_private_messages.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Pages
+    class UserPrivateMessages < PageObjects::Pages::Base
+      def visit(user)
+        page.visit "/u/#{user.username}/messages"
+        self
+      end
+
+      def visit_group_inbox(user, group)
+        page.visit "/u/#{user.username}/messages/group/#{group.name}"
+        self
+      end
+
+      def has_right_inbox_dropdown_value?(value)
+        has_css?(".user-nav-messages-dropdown .combo-box-header[data-name='#{value}']")
+      end
+    end
+  end
+end
diff --git a/spec/system/reviewables_spec.rb b/spec/system/reviewables_spec.rb
new file mode 100644
index 00000000000..9c40e4fc8a0
--- /dev/null
+++ b/spec/system/reviewables_spec.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+describe "Reviewables", type: :system do
+  let(:review_page) { PageObjects::Pages::Review.new }
+  fab!(:admin) { Fabricate(:admin) }
+  fab!(:theme) { Fabricate(:theme) }
+  fab!(:long_post) { Fabricate(:post_with_very_long_raw_content) }
+
+  before { sign_in(admin) }
+
+  describe "when there is a reviewable with a long post" do
+    fab!(:long_reviewable) { Fabricate(:reviewable_flagged_post, target: long_post) }
+
+    it "should show a button to expand/collapse the post content" do
+      visit("/review")
+      expect(review_page).to have_post_body_collapsed
+      expect(review_page).to have_post_body_toggle
+      review_page.click_post_body_toggle
+      expect(review_page).to have_no_post_body_collapsed
+      review_page.click_post_body_toggle
+      expect(review_page).to have_post_body_collapsed
+    end
+  end
+
+  describe "when there is a reviewable with a short post" do
+    fab!(:short_reviewable) { Fabricate(:reviewable_flagged_post) }
+
+    it "should not show a button to expand/collapse the post content" do
+      visit("/review")
+      expect(review_page).to have_no_post_body_collapsed
+      expect(review_page).to have_no_post_body_toggle
+    end
+  end
+
+  context "when performing a review action from the show route" do
+    context "with a ReviewableQueuedPost" do
+      fab!(:queued_post_reviewable) { Fabricate(:reviewable_queued_post) }
+
+      it "delete_user does not delete reviewable" do
+        review_page.visit_reviewable(queued_post_reviewable)
+
+        expect(queued_post_reviewable).to be_pending
+        expect(queued_post_reviewable.target_created_by).to be_present
+        expect(review_page).to have_reviewable_action_dropdown
+        expect(review_page).to have_reviewable_with_pending_status(queued_post_reviewable)
+
+        review_page.select_bundled_action(queued_post_reviewable, "delete_user")
+
+        expect(review_page).to have_no_error_dialog_visible
+        expect(review_page).to have_reviewable_with_rejected_status(queued_post_reviewable)
+        expect(review_page).to have_no_reviewable_action_dropdown
+        expect(queued_post_reviewable.reload).to be_rejected
+        expect(queued_post_reviewable.target_created_by).to be_nil
+      end
+    end
+  end
+end
diff --git a/spec/system/scroll_manager_service_spec.rb b/spec/system/scroll_manager_service_spec.rb
new file mode 100644
index 00000000000..eb8a3d57dba
--- /dev/null
+++ b/spec/system/scroll_manager_service_spec.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+describe "Ember route-scroll-manager service", type: :system do
+  before do
+    Fabricate(:admin)
+    Fabricate.times(50, :post)
+  end
+
+  let(:discovery) { PageObjects::Pages::Discovery.new }
+  let(:topic) { PageObjects::Pages::Topic.new }
+
+  def current_scroll_y
+    page.evaluate_script("window.scrollY")
+  end
+
+  it "scrolls to top when navigating to new routes, and remembers scroll position when going back" do
+    visit("/")
+    expect(page).to have_css("body.navigation-topics")
+    expect(discovery.topic_list).to have_topics
+
+    page.execute_script <<~JS
+      document.querySelectorAll('.topic-list-item')[10].scrollIntoView(true);
+    JS
+
+    topic_list_scroll_y = current_scroll_y
+    try_until_success { expect(topic_list_scroll_y).to be > 0 }
+
+    find(".sidebar-section-link[data-link-name='all-categories']").click
+
+    expect(page).to have_css("body.navigation-categories")
+
+    try_until_success { expect(current_scroll_y).to eq(0) }
+
+    page.go_back
+
+    expect(page).to have_css("body.navigation-topics")
+    expect(discovery.topic_list).to have_topics
+
+    try_until_success { expect(current_scroll_y).to eq(topic_list_scroll_y) }
+
+    # Clicking site logo triggers refresh and scrolls to top
+    find("#site-logo").click
+    try_until_success { expect(current_scroll_y).to eq(0) }
+  end
+end
diff --git a/spec/system/search_spec.rb b/spec/system/search_spec.rb
index 9329d819907..10d4a68d299 100644
--- a/spec/system/search_spec.rb
+++ b/spec/system/search_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe "Search", type: :system, js: true do
+describe "Search", type: :system do
   let(:search_page) { PageObjects::Pages::Search.new }
   fab!(:topic) { Fabricate(:topic) }
   fab!(:post) { Fabricate(:post, topic: topic, raw: "This is a test post in a test topic") }
@@ -23,7 +23,7 @@ describe "Search", type: :system, js: true do
       expect(search_page.heading_text).not_to eq("Search")
 
       search_page.click_home_logo
-      expect(search_page.is_search_page).to be_falsey
+      expect(search_page).to be_not_active
 
       page.go_back
       # ensure results are still there when using browser's history
@@ -32,7 +32,7 @@ describe "Search", type: :system, js: true do
       search_page.click_home_logo
       search_page.click_search_icon
 
-      expect(search_page).not_to have_search_result
+      expect(search_page).to have_no_search_result
       expect(search_page.heading_text).to eq("Search")
     end
   end
@@ -47,7 +47,7 @@ describe "Search", type: :system, js: true do
 
     after { SearchIndexer.disable }
 
-    it "rate limits searches for anonymous users" do
+    xit "rate limits searches for anonymous users" do
       queries = %w[one two three four]
 
       visit("/search?expanded=true")
@@ -58,7 +58,7 @@ describe "Search", type: :system, js: true do
         search_page.click_search_button
       end
 
-      # Rate limit error should kick in after 15 queries
+      # Rate limit error should kick in after 4 queries
       expect(search_page).to have_warning_message
     end
   end
diff --git a/spec/system/tag_notification_level_spec.rb b/spec/system/tag_notification_level_spec.rb
new file mode 100644
index 00000000000..8718f696473
--- /dev/null
+++ b/spec/system/tag_notification_level_spec.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+describe "Tag notification level", type: :system do
+  let(:tags_page) { PageObjects::Pages::Tag.new }
+  let(:select_kit) { PageObjects::Components::SelectKit.new(".tag-notifications-button") }
+
+  fab!(:tag_1) { Fabricate(:tag) }
+  fab!(:current_user) { Fabricate(:admin) }
+
+  before { sign_in(current_user) }
+
+  describe "when changing a tag's notification level" do
+    it "should change instantly" do
+      tags_page.visit_tag(tag_1)
+      expect(select_kit).to have_selected_name("regular")
+
+      select_kit.select_row_by_name("watching")
+
+      expect(select_kit).to have_selected_name("watching")
+    end
+  end
+end
diff --git a/spec/system/tag_synonyms_spec.rb b/spec/system/tag_synonyms_spec.rb
new file mode 100644
index 00000000000..10fc6ac5b22
--- /dev/null
+++ b/spec/system/tag_synonyms_spec.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+describe "Tag synonyms", type: :system do
+  let(:tags_page) { PageObjects::Pages::Tag.new }
+  fab!(:tag_1) { Fabricate(:tag, name: "design") }
+  fab!(:tag_2) { Fabricate(:tag, name: "art") }
+  fab!(:current_user) { Fabricate(:admin) }
+
+  before { sign_in(current_user) }
+
+  describe "when visiting edit tag page" do
+    it "allows an admin to add existing tag as a synonym" do
+      tags_page.visit_tag(tag_1)
+      tags_page.tag_info_btn.click
+      tags_page.edit_synonyms_btn.click
+      tags_page.select_tag(index: 0)
+      tags_page.add_synonym_btn.click
+
+      expect(tags_page.confirm_synonym_btn).to be_visible
+
+      tags_page.confirm_synonym_btn.click
+
+      expect(tags_page.tag_box(tag_2.name)).to be_visible
+    end
+
+    it "allows an admin to create a new tag as synonym when tag does not exist" do
+      tags_page.visit_tag(tag_1)
+      tags_page.tag_info_btn.click
+      tags_page.edit_synonyms_btn.click
+      # searched tag doesn't exist but will show option to create tag
+      tags_page.search_tags("graphics")
+      tags_page.select_tag(value: "graphics")
+      tags_page.add_synonym_btn.click
+      tags_page.confirm_synonym_btn.click
+
+      expect(tags_page.tag_box("graphics")).to be_visible
+    end
+  end
+end
diff --git a/spec/system/topic_list_focus_spec.rb b/spec/system/topic_list_focus_spec.rb
new file mode 100644
index 00000000000..228fcd4e303
--- /dev/null
+++ b/spec/system/topic_list_focus_spec.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+describe "Topic list focus", type: :system do
+  let!(:topics) { Fabricate.times(10, :post).map(&:topic) }
+
+  before { Fabricate(:admin) }
+
+  let(:discovery) { PageObjects::Pages::Discovery.new }
+  let(:topic) { PageObjects::Pages::Topic.new }
+
+  def focussed_topic_id
+    page.evaluate_script(
+      "document.activeElement.closest('.topic-list-item')?.dataset.topicId",
+    )&.to_i
+  end
+
+  it "refocusses last clicked topic when going back to topic list" do
+    visit("/")
+    expect(page).to have_css("body.navigation-topics")
+    expect(discovery.topic_list).to have_topics
+
+    # Click a topic
+    discovery.topic_list.visit_topic(topics[5])
+    expect(topic).to have_topic_title(topics[5].title)
+
+    # Going back to the topic-list should re-focus
+    page.go_back
+    expect(page).to have_css("body.navigation-topics")
+    expect(focussed_topic_id).to eq(topics[5].id)
+
+    # Click topic again
+    discovery.topic_list.visit_topic(topics[5])
+    expect(topic).to have_topic_title(topics[5].title)
+
+    # Visiting a topic list another way should not focus
+    find(".sidebar-section-link[data-link-name='everything']").click
+    expect(page).to have_css("body.navigation-topics")
+    expect(focussed_topic_id).to eq(nil)
+  end
+end
diff --git a/spec/system/topic_page_spec.rb b/spec/system/topic_page_spec.rb
new file mode 100644
index 00000000000..a4e8c26a145
--- /dev/null
+++ b/spec/system/topic_page_spec.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+describe "Topic page", type: :system do
+  fab!(:topic) { Fabricate(:topic) }
+
+  before { Fabricate(:post, topic: topic, cooked: <<~HTML) }
+    <h2 dir="ltr" id="toc-h2-testing" data-d-toc="toc-h2-testing" class="d-toc-post-heading">
+      <a name="toc-h2-testing" class="anchor" href="#toc-h2-testing">x</a>
+      Testing
+    </h2>
+    HTML
+
+  it "allows TOC anchor navigation" do
+    visit("/t/#{topic.slug}/#{topic.id}")
+
+    find("#toc-h2-testing .anchor", visible: :all).click
+
+    try_until_success do
+      expect(current_url).to match("/t/#{topic.slug}/#{topic.id}#toc-h2-testing")
+    end
+  end
+
+  context "with a subfolder setup" do
+    before { set_subfolder "/forum" }
+
+    it "allows TOC anchor navigation" do
+      visit("/forum/t/#{topic.slug}/#{topic.id}")
+
+      find("#toc-h2-testing .anchor", visible: :all).click
+
+      try_until_success do
+        expect(current_url).to match("/forum/t/#{topic.slug}/#{topic.id}#toc-h2-testing")
+      end
+    end
+  end
+end
diff --git a/spec/system/topic_summarization_spec.rb b/spec/system/topic_summarization_spec.rb
new file mode 100644
index 00000000000..368e3b1d92e
--- /dev/null
+++ b/spec/system/topic_summarization_spec.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+RSpec.describe "Topic summarization", type: :system, js: true do
+  fab!(:user) { Fabricate(:admin) }
+
+  # has_summary to force topic map to be present.
+  fab!(:topic) { Fabricate(:topic, has_summary: true) }
+  fab!(:post_1) { Fabricate(:post, topic: topic) }
+  fab!(:post_2) { Fabricate(:post, topic: topic) }
+
+  let(:plugin) { Plugin::Instance.new }
+
+  let(:expected_summary) { "This is a summary" }
+  let(:summarization_result) { { summary: expected_summary, chunks: [] } }
+
+  before do
+    sign_in(user)
+    strategy = DummyCustomSummarization.new(summarization_result)
+    plugin.register_summarization_strategy(strategy)
+    SiteSetting.summarization_strategy = strategy.model
+  end
+
+  it "returns a summary using the selected timeframe" do
+    visit("/t/-/#{topic.id}")
+
+    find(".topic-strategy-summarization").click
+
+    summary = find(".summary-box .generated-summary p").text
+
+    expect(summary).to eq(expected_summary)
+  end
+end
diff --git a/spec/system/user_page/staff_info_spec.rb b/spec/system/user_page/staff_info_spec.rb
index 1ffa8ac8273..c9a642391ec 100644
--- a/spec/system/user_page/staff_info_spec.rb
+++ b/spec/system/user_page/staff_info_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe "Viewing user staff info as an admin", type: :system, js: true do
+describe "Viewing user staff info as an admin", type: :system do
   fab!(:user) { Fabricate(:user) }
   fab!(:admin) { Fabricate(:admin) }
   let(:user_page) { PageObjects::Pages::User.new }
@@ -12,9 +12,48 @@ describe "Viewing user staff info as an admin", type: :system, js: true do
     fab!(:user_warning) { UserWarning.create!(user: user, created_by: admin, topic: topic) }
 
     it "should display the right link to user's warnings with the right count in text" do
-      user_page.visit(user).click_staff_info_warnings_link(warnings_count: 1)
+      user_page.visit(user).click_staff_info_warnings_link(user, warnings_count: 1)
 
       expect(user_page).to have_warning_messages_path(user)
     end
   end
+
+  context "for flagged posts" do
+    before do
+      %i[disagree ignore delete_and_ignore].each do |review_action|
+        PostActionCreator
+          .off_topic(admin, Fabricate(:post, user: user))
+          .reviewable
+          .perform(admin, review_action)
+      end
+    end
+
+    context "when there are no approved flagged posts" do
+      it "should not display a flagged-posts staff counter" do
+        user_page.visit(user)
+        expect(user_page).to have_no_staff_info_flagged_posts_counter
+      end
+    end
+
+    context "when there are approved flagged posts" do
+      before do
+        2.times do
+          PostActionCreator
+            .off_topic(admin, Fabricate(:post, user: user))
+            .reviewable
+            .perform(admin, :agree_and_keep)
+        end
+      end
+
+      it "should display a flagged-posts staff counter with the right count and link to user's flagged posts" do
+        user_page.visit(user)
+
+        expect(user_page).to have_staff_info_flagged_posts_count(count: 2)
+
+        user_page.staff_info_flagged_posts_counter.click
+
+        expect(user_page).to have_reviewable_flagged_posts_path(user)
+      end
+    end
+  end
 end
diff --git a/spec/system/user_page/user_profile_info_panel_spec.rb b/spec/system/user_page/user_profile_info_panel_spec.rb
new file mode 100644
index 00000000000..395e6212ce5
--- /dev/null
+++ b/spec/system/user_page/user_profile_info_panel_spec.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+RSpec.describe "User Profile Info Panel", system: true do
+  let(:user_page) { PageObjects::Pages::User.new }
+
+  describe "trust level" do
+    TrustLevel.levels.values.each do |trust_level|
+      context "when user has trust level #{trust_level}" do
+        fab!(:user) { Fabricate(:user, trust_level: trust_level) }
+        before { sign_in(user) }
+
+        it "displays the correct trust level element" do
+          user_page.visit(user).expand_info_panel
+          expect(user_page).to have_css("dd.trust-level", text: TrustLevel.name(trust_level))
+        end
+      end
+    end
+  end
+end
diff --git a/spec/system/user_preferences_interface_spec.rb b/spec/system/user_preferences_interface_spec.rb
index d6a25c1a332..e12b2f22019 100644
--- a/spec/system/user_preferences_interface_spec.rb
+++ b/spec/system/user_preferences_interface_spec.rb
@@ -1,29 +1,27 @@
 # frozen_string_literal: true
 
-describe "User preferences for Interface", type: :system, js: true do
+describe "User preferences for Interface", type: :system do
   fab!(:user) { Fabricate(:user) }
   let(:user_preferences_page) { PageObjects::Pages::UserPreferences.new }
+  let(:user_preferences_interface_page) { PageObjects::Pages::UserPreferencesInterface.new }
 
   before { sign_in(user) }
 
   describe "Bookmarks" do
     it "changes the bookmark after notification preference" do
       user_preferences_page.visit(user)
-      click_link "Interface"
+      click_link(I18n.t("js.user.preferences_nav.interface"))
+
+      dropdown = PageObjects::Components::SelectKit.new("#bookmark-after-notification-mode")
 
       # preselects the default user_option.bookmark_auto_delete_preference value of 3 (clear_reminder)
-      expect(page).to have_css(
-        "#boookmark-after-notification-mode .select-kit-header[data-value='#{Bookmark.auto_delete_preferences[:clear_reminder]}']",
-      )
-      page.find("#boookmark-after-notification-mode").click
-      page.find(
-        ".select-kit-row[data-value=\"#{Bookmark.auto_delete_preferences[:when_reminder_sent]}\"]",
-      ).click
+      expect(dropdown).to have_selected_value(Bookmark.auto_delete_preferences[:clear_reminder])
 
-      click_button "Save Changes"
+      dropdown.select_row_by_value(Bookmark.auto_delete_preferences[:when_reminder_sent])
+      click_button(I18n.t("js.save"))
 
       # the preference page reloads after saving, so we need to poll the db
-      try_until_success do
+      try_until_success(timeout: 20) do
         expect(
           UserOption.exists?(
             user_id: user.id,
diff --git a/spec/system/user_preferences_navigation_spec.rb b/spec/system/user_preferences_navigation_spec.rb
index 54d1de874be..3868bdbd7b9 100644
--- a/spec/system/user_preferences_navigation_spec.rb
+++ b/spec/system/user_preferences_navigation_spec.rb
@@ -1,15 +1,12 @@
 # frozen_string_literal: true
 
-describe "Redesigned user page navigation menu", type: :system, js: true do
+describe "User page navigation menu", type: :system do
   fab!(:user) { Fabricate(:user) }
   let(:everyone_group) { Group[:everyone] }
   let(:user_preferences_page) { PageObjects::Pages::UserPreferences.new }
 
-  describe "when visiting the user's preferences page with redesigned user page nav enabled" do
+  describe "when visiting the user's preferences page" do
     it "should allow the user to scroll the horizontal navigation menu when window width is narrow" do
-      everyone_group.add(user)
-      SiteSetting.enable_new_user_profile_nav_groups = everyone_group.name
-
       resize_window(width: 400) do
         sign_in(user)
 
diff --git a/spec/system/user_selector_spec.rb b/spec/system/user_selector_spec.rb
new file mode 100644
index 00000000000..b798a5fbecc
--- /dev/null
+++ b/spec/system/user_selector_spec.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+describe "User selector", type: :system do
+  fab!(:topic) { Fabricate(:topic) }
+  fab!(:post) { Fabricate(:post, topic: topic) }
+  fab!(:current_user) { Fabricate(:admin) }
+  fab!(:user) { with_search_indexer_enabled { Fabricate(:user, username: "someone") } }
+
+  before do
+    current_user.activate
+    sign_in(current_user)
+  end
+
+  context "when autocompleting a username" do
+    it "correctly shows the user" do
+      visit("/t/-/#{topic.id}")
+      find(".btn-primary.create").click
+      find(".d-editor-input").fill_in(with: "Hello @som")
+
+      within(".autocomplete.ac-user") do |el|
+        expect(el).to have_selector(".selected .avatar[title=someone]")
+        expect(el.find(".selected .username")).to have_content("someone")
+      end
+    end
+  end
+
+  context "when autocompleting a group" do
+    it "correctly shows the user" do
+      visit("/t/-/#{topic.id}")
+      find(".btn-primary.create").click
+      find(".d-editor-input").fill_in(with: "Hello @adm")
+
+      within(".autocomplete.ac-user") do |el|
+        expect(el).to have_selector(".selected .d-icon-users")
+        expect(el.find(".selected .username")).to have_content("admins")
+      end
+    end
+  end
+end
diff --git a/spec/system/viewing_category_spec.rb b/spec/system/viewing_category_spec.rb
new file mode 100644
index 00000000000..b7fd68e74f0
--- /dev/null
+++ b/spec/system/viewing_category_spec.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+RSpec.describe "Viewing a category", type: :system do
+  fab!(:category) { Fabricate(:category) }
+  fab!(:user) { Fabricate(:user) }
+  let(:category_page) { PageObjects::Pages::Category.new }
+  let(:topic_list) { PageObjects::Components::TopicList.new }
+
+  describe "when a new child category is created with a new category topic" do
+    fab!(:child_category) { Fabricate(:category, parent_category: category) }
+
+    fab!(:child_category_topic) do
+      Fabricate(:topic, category: child_category).tap do |topic|
+        child_category.update!(topic: topic)
+      end
+    end
+
+    it "should show a new count on the parent and child category when 'show_category_definitions_in_topic_lists' is true" do
+      SiteSetting.show_category_definitions_in_topic_lists = true
+
+      sign_in(user)
+
+      category_page.visit(category)
+      category_page.click_new
+
+      expect(topic_list).to have_topics(count: 1)
+      expect(topic_list).to have_topic(child_category_topic)
+
+      category_page.visit(child_category)
+      category_page.click_new
+
+      expect(topic_list).to have_topics(count: 1)
+      expect(topic_list).to have_topic(child_category_topic)
+    end
+
+    it "should only show a new count on the child category when 'show_category_definitions_in_topic_lists' site setting is false" do
+      SiteSetting.show_category_definitions_in_topic_lists = false
+
+      sign_in(user)
+
+      category_page.visit(category)
+
+      expect(category_page).to have_no_new_topics
+
+      category_page.visit(child_category)
+
+      expect(category_page).to have_new_topics
+
+      category_page.click_new
+
+      expect(topic_list).to have_topics(count: 1)
+      expect(topic_list).to have_topic(child_category_topic)
+    end
+  end
+end
diff --git a/spec/system/viewing_navigation_menu_preferences_spec.rb b/spec/system/viewing_navigation_menu_preferences_spec.rb
new file mode 100644
index 00000000000..b8acc1a3ce9
--- /dev/null
+++ b/spec/system/viewing_navigation_menu_preferences_spec.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+describe "Viewing sidebar preferences", type: :system do
+  let(:user_preferences_navigation_menu_page) do
+    PageObjects::Pages::UserPreferencesNavigationMenu.new
+  end
+
+  before { SiteSetting.navigation_menu = "sidebar" }
+
+  context "as an admin" do
+    fab!(:admin) { Fabricate(:admin) }
+    fab!(:user) { Fabricate(:user) }
+
+    before { sign_in(admin) }
+
+    it "should be able to view navigation menu preferences of another user" do
+      user.user_option.update!(
+        sidebar_link_to_filtered_list: true,
+        sidebar_show_count_of_new_items: true,
+      )
+
+      user_preferences_navigation_menu_page.visit(user)
+
+      expect(user_preferences_navigation_menu_page).to have_navigation_menu_preference_checked(
+        "pref-show-count-new-items",
+      )
+      expect(user_preferences_navigation_menu_page).to have_navigation_menu_preference_checked(
+        "pref-link-to-filtered-list",
+      )
+    end
+  end
+end
diff --git a/spec/system/viewing_sidebar_as_anonymous_user_spec.rb b/spec/system/viewing_sidebar_as_anonymous_user_spec.rb
new file mode 100644
index 00000000000..bac2805e04a
--- /dev/null
+++ b/spec/system/viewing_sidebar_as_anonymous_user_spec.rb
@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+describe "Viewing sidebar as anonymous user", type: :system do
+  let(:sidebar) { PageObjects::Components::NavigationMenu::Sidebar.new }
+
+  describe "when viewing the tags section" do
+    fab!(:tag1) do
+      Fabricate(:tag, name: "tag 1", description: "tag 1 description <script>").tap do |tag|
+        Fabricate.times(1, :topic, tags: [tag])
+      end
+    end
+
+    fab!(:tag2) do
+      Fabricate(:tag, name: "tag 2").tap { |tag| Fabricate.times(2, :topic, tags: [tag]) }
+    end
+
+    fab!(:tag3) do
+      Fabricate(:tag, name: "tag 3", description: "tag 3 description").tap do |tag|
+        Fabricate.times(3, :topic, tags: [tag])
+      end
+    end
+
+    fab!(:tag4) do
+      Fabricate(:tag, name: "tag 4").tap { |tag| Fabricate.times(2, :topic, tags: [tag]) }
+    end
+
+    fab!(:tag5) do
+      Fabricate(:tag, name: "tag 5").tap { |tag| Fabricate.times(2, :topic, tags: [tag]) }
+    end
+
+    fab!(:tag6) do
+      Fabricate(:tag, name: "tag 6").tap { |tag| Fabricate.times(1, :topic, tags: [tag]) }
+    end
+
+    it "should not display the tags section when tagging has been disabled" do
+      SiteSetting.tagging_enabled = false
+
+      visit("/latest")
+
+      expect(sidebar).to have_no_tags_section
+    end
+
+    it "should not display the tags section when site has no top tags and `default_navigation_menu_tags` site setting has not been set" do
+      Tag.delete_all
+
+      visit("/latest")
+
+      expect(sidebar).to have_no_tags_section
+    end
+
+    it "should display the site's top tags when `default_navigation_menu_tags` site setting has not been set" do
+      visit("/latest")
+
+      expect(sidebar).to have_tags_section
+      expect(sidebar).to have_all_tags_section_link
+      expect(sidebar).to have_tag_section_links([tag3, tag2, tag4, tag5, tag1])
+      expect(sidebar).to have_tag_section_link_with_title(tag1, "tag 1 description &lt;script&gt;")
+    end
+
+    it "should display the site's top tags when `default_navigation_menu_tags` site setting has been set but the tags configured are hidden to the user" do
+      SiteSetting.default_navigation_menu_tags = "#{tag5.name}"
+      Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [tag5.name])
+
+      visit("/latest")
+
+      expect(sidebar).to have_tags_section
+      expect(sidebar).to have_all_tags_section_link
+      expect(sidebar).to have_tag_section_links([tag3, tag2, tag4, tag1, tag6])
+      expect(sidebar).to have_tag_section_link_with_title(tag1, "tag 1 description &lt;script&gt;")
+    end
+
+    it "should display the tags configured in `default_navigation_menu_tags` site setting when it has been set" do
+      SiteSetting.default_navigation_menu_tags = "#{tag3.name}|#{tag4.name}"
+
+      visit("/latest")
+
+      expect(sidebar).to have_tags_section
+      expect(sidebar).to have_all_tags_section_link
+      expect(sidebar).to have_tag_section_links([tag3, tag4])
+      expect(sidebar).to have_tag_section_link_with_title(tag3, "tag 3 description")
+    end
+  end
+end
diff --git a/spec/system/viewing_sidebar_mobile_spec.rb b/spec/system/viewing_sidebar_mobile_spec.rb
new file mode 100644
index 00000000000..585d897f29e
--- /dev/null
+++ b/spec/system/viewing_sidebar_mobile_spec.rb
@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+describe "Viewing sidebar mobile", type: :system, mobile: true do
+  fab!(:user) { Fabricate(:user) }
+  let(:sidebar_dropdown) { PageObjects::Components::SidebarHeaderDropdown.new }
+  let(:composer) { PageObjects::Components::Composer.new }
+
+  before { sign_in(user) }
+
+  it "does not display the sidebar by default" do
+    visit("/latest")
+
+    expect(sidebar_dropdown).to be_hidden
+  end
+
+  it "does not display the keyboard shortcuts button" do
+    visit("/latest")
+
+    sidebar_dropdown.click
+
+    expect(sidebar_dropdown).to be_visible
+    expect(sidebar_dropdown).to have_no_keyboard_shortcuts_button
+  end
+
+  it "collapses the sidebar when clicking outside of it" do
+    visit("/latest")
+
+    sidebar_dropdown.click
+
+    expect(sidebar_dropdown).to be_visible
+
+    sidebar_dropdown.click_outside
+
+    expect(sidebar_dropdown).to be_hidden
+  end
+
+  it "collapses the sidebar when clicking on a link in the sidebar" do
+    visit("/latest")
+
+    sidebar_dropdown.click
+
+    expect(sidebar_dropdown).to be_visible
+
+    sidebar_dropdown.click_topics_link
+
+    expect(sidebar_dropdown).to be_hidden
+  end
+
+  it "collapses the sidebar when clicking on a button in the sidebar" do
+    visit("/latest")
+
+    sidebar_dropdown.click
+
+    expect(sidebar_dropdown).to be_visible
+
+    sidebar_dropdown.click_categories_header_button
+
+    expect(sidebar_dropdown).to be_hidden
+  end
+
+  it "toggles to desktop view after clicking on the toggle to desktop view button" do
+    visit ("/latest")
+
+    expect(page).to have_css(".mobile-view")
+
+    sidebar_dropdown.click
+    sidebar_dropdown.click_toggle_to_desktop_view_button
+
+    visit ("/latest")
+
+    expect(page).to have_css(".desktop-view")
+  end
+end
diff --git a/spec/system/viewing_sidebar_preferences_spec.rb b/spec/system/viewing_sidebar_preferences_spec.rb
deleted file mode 100644
index 6edf9113880..00000000000
--- a/spec/system/viewing_sidebar_preferences_spec.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-describe "Viewing sidebar preferences", type: :system, js: true do
-  let(:user_preferences_sidebar_page) { PageObjects::Pages::UserPreferencesSidebar.new }
-
-  before { SiteSetting.navigation_menu = "sidebar" }
-
-  context "as an admin" do
-    fab!(:admin) { Fabricate(:admin) }
-    fab!(:user) { Fabricate(:user) }
-    fab!(:category) { Fabricate(:category) }
-    fab!(:category2) { Fabricate(:category) }
-    fab!(:category_sidebar_section_link) do
-      Fabricate(:category_sidebar_section_link, user: user, linkable: category)
-    end
-    fab!(:category2_sidebar_section_link) do
-      Fabricate(:category_sidebar_section_link, user: user, linkable: category2)
-    end
-    fab!(:tag) { Fabricate(:tag) }
-    fab!(:tag2) { Fabricate(:tag) }
-    fab!(:tag_sidebar_section_link) do
-      Fabricate(:tag_sidebar_section_link, user: user, linkable: tag)
-    end
-    fab!(:tag2_sidebar_section_link) do
-      Fabricate(:tag_sidebar_section_link, user: user, linkable: tag2)
-    end
-
-    before { sign_in(admin) }
-
-    it "should be able to view sidebar preferences of another user" do
-      user.user_option.update!(sidebar_list_destination: "unread_new")
-
-      user_preferences_sidebar_page.visit(user)
-
-      expect(user_preferences_sidebar_page).to have_sidebar_categories_preference(
-        category,
-        category2,
-      )
-      expect(user_preferences_sidebar_page).to have_sidebar_tags_preference(tag, tag2)
-      expect(user_preferences_sidebar_page).to have_sidebar_list_destination_preference(
-        "unread_new",
-      )
-    end
-  end
-end
diff --git a/spec/system/viewing_sidebar_spec.rb b/spec/system/viewing_sidebar_spec.rb
index 4b9da86e9c4..aaeaf75c75e 100644
--- a/spec/system/viewing_sidebar_spec.rb
+++ b/spec/system/viewing_sidebar_spec.rb
@@ -1,22 +1,184 @@
 # frozen_string_literal: true
 
-describe "Viewing sidebar", type: :system, js: true do
+describe "Viewing sidebar as logged in user", type: :system do
   fab!(:admin) { Fabricate(:admin) }
   fab!(:user) { Fabricate(:user) }
   fab!(:category_sidebar_section_link) { Fabricate(:category_sidebar_section_link, user: user) }
 
+  let(:sidebar) { PageObjects::Components::NavigationMenu::Sidebar.new }
+
+  before { sign_in(user) }
+
   describe "when using the legacy navigation menu" do
     before { SiteSetting.navigation_menu = "legacy" }
 
-    it "should display the sidebar when `enable_sidebar` query param is '1'" do
-      sign_in(user)
-
-      visit("/latest?enable_sidebar=1")
-
-      sidebar = PageObjects::Components::Sidebar.new
+    it "should display the sidebar when `navigation_menu` query param is 'sidebar'" do
+      visit("/latest?navigation_menu=sidebar")
 
       expect(sidebar).to be_visible
       expect(sidebar).to have_category_section_link(category_sidebar_section_link.linkable)
+      expect(page).not_to have_css(".hamburger-dropdown")
+    end
+
+    it "should display the sidebar dropdown menu when `navigation_menu` query param is 'header_dropdown'" do
+      visit("/latest?navigation_menu=header_dropdown")
+
+      expect(sidebar).to be_not_visible
+
+      header_dropdown = PageObjects::Components::SidebarHeaderDropdown.new
+      header_dropdown.click
+
+      expect(header_dropdown).to be_visible
+    end
+  end
+
+  describe "when using the header dropdown navigation menu" do
+    before { SiteSetting.navigation_menu = "header dropdown" }
+
+    it "should display the sidebar when `navigation_menu` query param is 'sidebar'" do
+      visit("/latest?navigation_menu=sidebar")
+
+      expect(sidebar).to be_visible
+      expect(page).not_to have_css(".hamburger-dropdown")
+    end
+
+    it "should display the legacy dropdown menu when `navigation_menu` query param is 'legacy'" do
+      visit("/latest?navigation_menu=legacy")
+
+      expect(sidebar).to be_not_visible
+
+      legacy_header_dropdown = PageObjects::Components::LegacyHeaderDropdown.new
+      legacy_header_dropdown.click
+
+      expect(legacy_header_dropdown).to be_visible
+    end
+  end
+
+  describe "when using the sidebar navigation menu" do
+    before { SiteSetting.navigation_menu = "sidebar" }
+
+    it "should display the legacy dropdown menu when `navigation_menu` query param is 'legacy'" do
+      visit("/latest?navigation_menu=legacy")
+
+      expect(sidebar).to be_not_visible
+
+      legacy_header_dropdown = PageObjects::Components::LegacyHeaderDropdown.new
+      legacy_header_dropdown.click
+
+      expect(legacy_header_dropdown).to be_visible
+    end
+
+    it "should display the sidebar dropdown menu when `navigation_menu` query param is 'header_dropdown'" do
+      visit("/latest?navigation_menu=header_dropdown")
+
+      expect(sidebar).to be_not_visible
+
+      header_dropdown = PageObjects::Components::SidebarHeaderDropdown.new
+      header_dropdown.click
+
+      expect(header_dropdown).to be_visible
+    end
+  end
+
+  describe "Community sidebar section", type: :system do
+    fab!(:user) { Fabricate(:user, locale: "pl_PL") }
+    fab!(:translation_override) do
+      TranslationOverride.create!(
+        locale: "pl_PL",
+        translation_key: "js.sidebar.sections.community.links.topics.content",
+        value: "Tematy",
+      )
+      TranslationOverride.create!(
+        locale: "pl_PL",
+        translation_key: "js.sidebar.sections.community.links.topics.title",
+        value: "Wszystkie tematy",
+      )
+    end
+
+    before { SiteSetting.allow_user_locale = true }
+
+    it "has correct translations" do
+      sign_in user
+      visit("/latest")
+      links = page.all("#sidebar-section-content-community .sidebar-section-link-wrapper a")
+      expect(links.map(&:text)).to eq(%w[Tematy Wysłane])
+      expect(links.map { |link| link[:title] }).to eq(
+        ["Wszystkie tematy", "Moja ostatnia aktywność w temacie"],
+      )
+    end
+  end
+
+  describe "when viewing the tags section" do
+    fab!(:tag1) do
+      Fabricate(:tag, name: "tag 1", description: "tag 1 description <script>").tap do |tag|
+        Fabricate.times(1, :topic, tags: [tag])
+      end
+    end
+
+    fab!(:tag2) do
+      Fabricate(:tag, name: "tag 2").tap { |tag| Fabricate.times(2, :topic, tags: [tag]) }
+    end
+
+    fab!(:tag3) do
+      Fabricate(:tag, name: "tag 3", description: "tag 3 description").tap do |tag|
+        Fabricate.times(3, :topic, tags: [tag])
+      end
+    end
+
+    fab!(:tag4) do
+      Fabricate(:tag, name: "tag 4").tap { |tag| Fabricate.times(2, :topic, tags: [tag]) }
+    end
+
+    fab!(:tag5) do
+      Fabricate(:tag, name: "tag 5").tap { |tag| Fabricate.times(2, :topic, tags: [tag]) }
+    end
+
+    fab!(:tag6) do
+      Fabricate(:tag, name: "tag 6").tap { |tag| Fabricate.times(1, :topic, tags: [tag]) }
+    end
+
+    it "should not display the tags section when tagging is disabled" do
+      SiteSetting.tagging_enabled = false
+
+      visit("/latest")
+
+      expect(sidebar).to be_visible
+      expect(sidebar).to have_no_tags_section
+    end
+
+    it "should not display the tags section when there are no tags that a user can see" do
+      Tag.delete_all
+
+      visit("/latest")
+
+      expect(sidebar).to be_visible
+      expect(sidebar).to have_no_tags_section
+    end
+
+    it "should display the site's top tags in the tags section when user has not configured any tags" do
+      visit("/latest")
+
+      expect(sidebar).to be_visible
+      expect(sidebar).to have_tags_section
+      expect(sidebar).to have_tag_section_links([tag3, tag2, tag4, tag5, tag1])
+      expect(sidebar).to have_tag_section_link_with_title(tag3, "tag 3 description")
+      expect(sidebar).to have_tag_section_link_with_title(tag1, "tag 1 description &lt;script&gt;")
+      expect(sidebar).to have_all_tags_section_link
+    end
+
+    it "should display the tags configured by the user in alphabetical order" do
+      Fabricate(:sidebar_section_link, linkable: tag3, user: user)
+      Fabricate(:sidebar_section_link, linkable: tag1, user: user)
+      Fabricate(:sidebar_section_link, linkable: tag2, user: user)
+
+      visit("/latest")
+
+      expect(sidebar).to be_visible
+      expect(sidebar).to have_tags_section
+      expect(sidebar).to have_tag_section_links([tag1, tag2, tag3])
+      expect(sidebar).to have_tag_section_link_with_title(tag3, "tag 3 description")
+      expect(sidebar).to have_tag_section_link_with_title(tag1, "tag 1 description &lt;script&gt;")
+      expect(sidebar).to have_all_tags_section_link
     end
   end
 end
diff --git a/spec/system/viewing_user_menu_spec.rb b/spec/system/viewing_user_menu_spec.rb
new file mode 100644
index 00000000000..71d3689f9c5
--- /dev/null
+++ b/spec/system/viewing_user_menu_spec.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+RSpec.describe "Viewing User Menu", system: true do
+  fab!(:user) { Fabricate(:user) }
+
+  let(:user_menu) { PageObjects::Components::UserMenu.new }
+
+  describe "when viewing replies notifications tab" do
+    fab!(:topic) { Fabricate(:topic) }
+
+    it "should display group mentioned notifications in the tab" do
+      Jobs.run_immediately!
+
+      mentionable_group = Fabricate(:group, mentionable_level: Group::ALIAS_LEVELS[:everyone])
+      user_in_mentionable_group = Fabricate(:user).tap { |user| mentionable_group.add(user) }
+
+      _post_with_group_mention =
+        PostCreator.create!(user, topic_id: topic.id, raw: "Hello @#{mentionable_group.name}")
+
+      sign_in(user_in_mentionable_group)
+
+      visit("/latest")
+
+      user_menu.open
+
+      expect(user_menu).to have_right_replies_button_count(1)
+
+      user_menu.click_replies_notifications_tab
+
+      expect(user_menu).to have_group_mentioned_notification(topic, user, mentionable_group)
+    end
+  end
+end
diff --git a/spec/system/viewing_user_private_messages_spec.rb b/spec/system/viewing_user_private_messages_spec.rb
new file mode 100644
index 00000000000..41345168d22
--- /dev/null
+++ b/spec/system/viewing_user_private_messages_spec.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+describe "Viewing user private messages", type: :system do
+  fab!(:user) { Fabricate(:user, username: "mIxed_caSE_usERNAME") }
+  fab!(:user2) { Fabricate(:user) }
+
+  let(:user_private_messages_page) { PageObjects::Pages::UserPrivateMessages.new }
+
+  before { sign_in(user) }
+
+  describe "when the user has group messages" do
+    fab!(:group) do
+      Fabricate(:group, name: "miXeD_caSE_name", has_messages: true).tap { |g| g.add(user) }
+    end
+
+    before { SiteSetting.personal_message_enabled_groups = Group::AUTO_GROUPS[:everyone] }
+
+    it "allows the user to view the default messages inbox" do
+      user_private_messages_page.visit(user)
+
+      expect(user_private_messages_page).to have_right_inbox_dropdown_value("Inbox")
+    end
+
+    it "allows the user to view the group messages inbox of a group" do
+      user_private_messages_page.visit_group_inbox(user, group)
+
+      expect(user_private_messages_page).to have_right_inbox_dropdown_value("miXeD_caSE_name")
+    end
+  end
+end
diff --git a/spec/tasks/hashtags_spec.rb b/spec/tasks/hashtags_spec.rb
new file mode 100644
index 00000000000..679f3e0e563
--- /dev/null
+++ b/spec/tasks/hashtags_spec.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+RSpec.describe "tasks/hashtags" do
+  before do
+    Rake::Task.clear
+    Discourse::Application.load_tasks
+  end
+
+  describe "hashtag:mark_old_format_for_rebake" do
+    fab!(:category) { Fabricate(:category, slug: "support") }
+
+    before { SiteSetting.enable_experimental_hashtag_autocomplete = false }
+
+    it "sets the baked_version to 0 for matching posts" do
+      post_1 = Fabricate(:post, raw: "This is a cool #support hashtag")
+      post_2 =
+        Fabricate(
+          :post,
+          raw:
+            "Some other thing which will not match <a class=\"hashtag-wow\">some weird custom thing</a>",
+        )
+
+      SiteSetting.enable_experimental_hashtag_autocomplete = true
+      post_3 = Fabricate(:post, raw: "This is a cool #support hashtag")
+      SiteSetting.enable_experimental_hashtag_autocomplete = false
+
+      capture_stdout { Rake::Task["hashtags:mark_old_format_for_rebake"].invoke }
+
+      [post_1, post_2, post_3].each(&:reload)
+
+      expect(post_1.baked_version).to eq(0)
+      expect(post_2.baked_version).to eq(Post::BAKED_VERSION)
+      expect(post_3.baked_version).to eq(Post::BAKED_VERSION)
+    end
+  end
+end
diff --git a/spec/tasks/version_bump_spec.rb b/spec/tasks/version_bump_spec.rb
new file mode 100644
index 00000000000..b40cc63fccb
--- /dev/null
+++ b/spec/tasks/version_bump_spec.rb
@@ -0,0 +1,225 @@
+# frozen_string_literal: true
+
+def run(*args)
+  out, err, status = Open3.capture3(*args)
+  raise "Command failed: #{args.inspect}\n#{out}\n#{err}" unless status.success?
+  out
+end
+
+def fake_version_rb(version)
+  File.read("#{Rails.root}/lib/version.rb").sub(/STRING = ".*"/, "STRING = \"#{version}\"")
+end
+
+RSpec.describe "tasks/version_bump" do
+  let(:tmpdir) { Dir.mktmpdir }
+  let(:origin_path) { "#{tmpdir}/origin-repo" }
+  let(:local_path) { "#{tmpdir}/local-repo" }
+
+  before do
+    ENV["RUNNING_VERSION_BUMP_IN_RSPEC_TESTS"] = "1"
+
+    Rake::Task.clear
+    Discourse::Application.load_tasks
+
+    FileUtils.mkdir_p origin_path
+
+    Dir.chdir(origin_path) do
+      FileUtils.mkdir_p "lib"
+      FileUtils.mkdir_p "tmp"
+
+      File.write(".gitignore", "tmp\n")
+      File.write("lib/version.rb", fake_version_rb("3.2.0.beta1-dev"))
+
+      run "git", "init"
+      run "git", "checkout", "-b", "main"
+      run "git", "add", "."
+      run "git", "commit", "-m", "Initial commit"
+
+      run "git", "checkout", "-b", "stable"
+      File.write("#{origin_path}/lib/version.rb", fake_version_rb("3.1.2"))
+      run "git", "add", "."
+      run "git", "commit", "-m", "Previous stable version bump"
+
+      run "git", "checkout", "main"
+      run "git", "config", "receive.denyCurrentBranch", "ignore"
+    end
+
+    run "git", "clone", "-b", "main", origin_path, local_path
+  end
+
+  after do
+    FileUtils.remove_entry(tmpdir)
+    ENV.delete("RUNNING_VERSION_BUMP_IN_RSPEC_TESTS")
+  end
+
+  it "can bump the beta version with version_bump:beta" do
+    Dir.chdir(local_path) { capture_stdout { Rake::Task["version_bump:beta"].invoke } }
+
+    Dir.chdir(origin_path) do
+      # Commits are present with correct messages
+      expect(run("git", "log", "--pretty=%s").lines.map(&:strip)).to eq(
+        ["Bump version to v3.2.0.beta2-dev", "Bump version to v3.2.0.beta1", "Initial commit"],
+      )
+
+      # Expected tags present
+      expect(run("git", "tag").lines.map(&:strip)).to contain_exactly(
+        "latest-release",
+        "beta",
+        "v3.2.0.beta1",
+      )
+
+      # Tags are all present and attached to the correct commit
+      %w[latest-release beta v3.2.0.beta1].each do |tag_name|
+        expect(run("git", "log", "--pretty=%s", "-1", tag_name).strip).to eq(
+          "Bump version to v3.2.0.beta1",
+        )
+      end
+
+      # Version numbers in version.rb are correct at all commits
+      expect(run "git", "show", "HEAD", "lib/version.rb").to include('STRING = "3.2.0.beta2-dev"')
+      expect(run "git", "show", "HEAD~1", "lib/version.rb").to include('STRING = "3.2.0.beta1"')
+      expect(run "git", "show", "HEAD~2", "lib/version.rb").to include('STRING = "3.2.0.beta1-dev"')
+    end
+  end
+
+  it "can perform a minor stable bump with version_bump:minor_stable" do
+    Dir.chdir(local_path) { capture_stdout { Rake::Task["version_bump:minor_stable"].invoke } }
+
+    Dir.chdir(origin_path) do
+      # No commits on main branch
+      expect(run("git", "log", "--pretty=%s").lines.map(&:strip)).to eq(["Initial commit"])
+
+      # Expected tags present
+      expect(run("git", "tag").lines.map(&:strip)).to eq(["v3.1.3"])
+
+      run "git", "checkout", "stable"
+
+      # Correct commits on stable branch
+      expect(run("git", "log", "--pretty=%s").lines.map(&:strip)).to eq(
+        ["Bump version to v3.1.3", "Previous stable version bump", "Initial commit"],
+      )
+
+      # Tag points to correct commit
+      expect(run("git", "log", "--pretty=%s", "-1", "v3.1.3").strip).to eq("Bump version to v3.1.3")
+
+      # Version numbers in version.rb are correct at all commits
+      expect(run "git", "show", "HEAD", "lib/version.rb").to include('STRING = "3.1.3"')
+      expect(run "git", "show", "HEAD~1", "lib/version.rb").to include('STRING = "3.1.2"')
+    end
+  end
+
+  it "can prepare a major stable bump with version_bump:major_stable_prepare" do
+    Dir.chdir(local_path) do
+      capture_stdout { Rake::Task["version_bump:major_stable_prepare"].invoke("3.3.0") }
+    end
+
+    Dir.chdir(origin_path) do
+      # Commits are present with correct messages
+      expect(run("git", "log", "--pretty=%s").lines.map(&:strip)).to eq(
+        ["Bump version to v3.3.0.beta1-dev", "Bump version to v3.2.0.beta1", "Initial commit"],
+      )
+
+      # Expected tags present
+      expect(run("git", "tag").lines.map(&:strip)).to contain_exactly(
+        "latest-release",
+        "beta",
+        "v3.2.0.beta1",
+      )
+
+      # Tags are all present and attached to the correct commit
+      %w[latest-release beta v3.2.0.beta1].each do |tag_name|
+        expect(run("git", "log", "--pretty=%s", "-1", tag_name).strip).to eq(
+          "Bump version to v3.2.0.beta1",
+        )
+      end
+
+      # Version numbers in version.rb are correct at all commits
+      expect(run "git", "show", "HEAD:lib/version.rb").to include('STRING = "3.3.0.beta1-dev"')
+      expect(run "git", "show", "HEAD~1:lib/version.rb").to include('STRING = "3.2.0.beta1"')
+      expect(run "git", "show", "HEAD~2:lib/version.rb").to include('STRING = "3.2.0.beta1-dev"')
+
+      # No changes to stable branch
+      expect(run("git", "log", "--pretty=%s", "stable").lines.map(&:strip)).to eq(
+        ["Previous stable version bump", "Initial commit"],
+      )
+    end
+  end
+
+  it "can merge a stable release commit into the stable branch with version_bump:major_stable_merge" do
+    Dir.chdir(local_path) do
+      # Prepare first, and find sha1 in output
+      output = capture_stdout { Rake::Task["version_bump:major_stable_prepare"].invoke("3.3.0") }
+      stable_bump_commit = output[/major_stable_merge\[(.*)\]/, 1]
+      capture_stdout { Rake::Task["version_bump:major_stable_merge"].invoke(stable_bump_commit) }
+    end
+
+    Dir.chdir(origin_path) do
+      # Commits on stable branch are present with correct messages
+      expect(run("git", "log", "--pretty=%s", "stable").lines.map(&:strip)).to contain_exactly(
+        "Merge v3.2.0.beta1 into stable",
+        "Bump version to v3.2.0",
+        "Previous stable version bump",
+        "Bump version to v3.2.0.beta1",
+        "Initial commit",
+      )
+
+      # Most recent commit is the version bump
+      expect(run("git", "log", "--pretty=%s", "-1", "stable").strip).to eq("Bump version to v3.2.0")
+
+      # Second most recent commit is a merge commit
+      parents = run("git", "log", "--pretty=%P", "-n", "1", "stable~1").split(/\s+/).map(&:strip)
+      expect(parents.length).to eq(2)
+
+      # With correct parents
+      parent_commit_messages = parents.map { |p| run("git", "log", "--pretty=%s", "-1", p).strip }
+      expect(parent_commit_messages).to contain_exactly(
+        "Bump version to v3.2.0.beta1",
+        "Previous stable version bump",
+      )
+
+      # Tag is applied to stable version bump commit
+      expect(run("git", "log", "--pretty=%s", "-1", "v3.2.0").strip).to eq("Bump version to v3.2.0")
+    end
+  end
+
+  it "can stage a PR of multiple security fixes using version_bump:stage_security_fixes" do
+    Dir.chdir(origin_path) do
+      run "git", "checkout", "-b", "security-fix-one"
+
+      File.write("firstfile.txt", "contents")
+      run "git", "add", "firstfile.txt"
+      run "git", "commit", "-m", "security fix one, commit one"
+      File.write("secondfile.txt", "contents")
+      run "git", "add", "secondfile.txt"
+      run "git", "commit", "-m", "security fix one, commit two"
+
+      run "git", "checkout", "main"
+      run "git", "checkout", "-b", "security-fix-two"
+      File.write("somefile.txt", "contents")
+      run "git", "add", "somefile.txt"
+      run "git", "commit", "-m", "security fix two"
+    end
+
+    Dir.chdir(local_path) do
+      output =
+        capture_stdout do
+          ENV["SECURITY_FIX_REFS"] = "origin/security-fix-one,origin/security-fix-two"
+          Rake::Task["version_bump:stage_security_fixes"].invoke("main")
+        ensure
+          ENV.delete("SECURITY_FIX_REFS")
+        end
+    end
+
+    Dir.chdir(origin_path) do
+      # Check each fix has been added as a single commit, with the message matching the first commit on the branch
+      expect(run("git", "log", "--pretty=%s", "main").lines.map(&:strip)).to eq(
+        ["security fix two", "security fix one, commit one", "Initial commit"],
+      )
+
+      # Check all the files from both fixes are present
+      expect(run("git", "show", "main:somefile.txt")).to eq("contents")
+      expect(run("git", "show", "main:firstfile.txt")).to eq("contents")
+      expect(run("git", "show", "main:secondfile.txt")).to eq("contents")
+    end
+  end
+end
diff --git a/spec/views/list/list.erb_spec.rb b/spec/views/list/list.erb_spec.rb
index e83def6a3e4..8b8ebfb9a70 100644
--- a/spec/views/list/list.erb_spec.rb
+++ b/spec/views/list/list.erb_spec.rb
@@ -18,7 +18,7 @@ RSpec.describe "list/list.erb" do
     )
   end
 
-  it "adds sturctured data" do
+  it "adds structured data" do
     view.stubs(:include_crawler_content?).returns(true)
     topic.posters = []
     assign(:list, OpenStruct.new(topics: [topic]))
diff --git a/spec/views/topics/show.html.erb_spec.rb b/spec/views/topics/show.html.erb_spec.rb
index d5353e80f7f..d99be622c30 100644
--- a/spec/views/topics/show.html.erb_spec.rb
+++ b/spec/views/topics/show.html.erb_spec.rb
@@ -12,10 +12,53 @@ RSpec.describe "topics/show.html.erb" do
     view.stubs(:crawler_layout?).returns(false)
     view.stubs(:url_for).returns("https://www.example.com/test.rss")
     view.instance_variable_set("@topic_view", topic_view)
+    assign(:tags, [])
+
     render template: "topics/show", formats: [:html]
 
     expect(view.content_for(:head)).to match(
       %r{<link rel="alternate nofollow" type="application/rss\+xml" title="[^"]+" href="https://www.example.com/test\.rss" />},
     )
   end
+
+  it "adds structured data" do
+    view.stubs(:include_crawler_content?).returns(true)
+    post = Fabricate(:post, topic: topic)
+    TopicLink.create!(
+      topic_id: post.topic_id,
+      post_id: post.id,
+      user_id: post.user_id,
+      url: "https://example.com/",
+      domain: "example.com",
+      link_topic_id: Fabricate(:topic).id,
+      reflection: true,
+    )
+    assign(:topic_view, TopicView.new(topic))
+    assign(:tags, [])
+
+    render template: "topics/show", formats: [:html]
+
+    links_list = Nokogiri::HTML5.fragment(rendered).css(".crawler-linkback-list")
+    first_item = links_list.css('[itemprop="itemListElement"]')
+    expect(first_item.css('[itemprop="position"]')[0]["content"]).to eq("1")
+    expect(first_item.css('[itemprop="url"]')[0]["href"]).to eq("https://example.com/")
+  end
+
+  it "uses comment scheme type for replies" do
+    view.stubs(:crawler_layout?).returns(true)
+    view.stubs(:include_crawler_content?).returns(true)
+    Fabricate(:post, topic: topic)
+    Fabricate(:post, topic: topic)
+    Fabricate(:post, topic: topic)
+    assign(:topic_view, TopicView.new(topic))
+    assign(:tags, [])
+
+    render template: "topics/show", formats: [:html]
+
+    doc = Nokogiri::HTML5.fragment(rendered)
+    topic_schema = doc.css('[itemtype="http://schema.org/DiscussionForumPosting"]')
+    expect(topic_schema.size).to eq(1)
+    expect(topic_schema.css('[itemtype="http://schema.org/Comment"]').size).to eq(2)
+    expect(topic_schema.css('[itemprop="articleSection"]')[0]["content"]).to eq(topic.category.name)
+  end
 end
diff --git a/test/run-qunit.js b/test/run-qunit.js
index 77fe4b5b582..bd26d62dc34 100644
--- a/test/run-qunit.js
+++ b/test/run-qunit.js
@@ -37,7 +37,7 @@ async function runAllTests() {
     const options = {
       chromeFlags: [
         "--disable-gpu",
-        "--headless",
+        "--headless=new",
         "--no-sandbox",
         "--disable-dev-shm-usage",
         "--mute-audio",
@@ -213,8 +213,6 @@ function logQUnit() {
 
   console.log("\nRunning: " + JSON.stringify(QUnit.urlParams) + "\n");
 
-  QUnit.config.testTimeout = 10000;
-
   let durations = {};
 
   let inTest = false;
diff --git a/vendor/assets/javascripts/highlightjs/es/core.js b/vendor/assets/javascripts/highlightjs/es/core.js
index 3eea73ee614..3cd1781b372 100644
--- a/vendor/assets/javascripts/highlightjs/es/core.js
+++ b/vendor/assets/javascripts/highlightjs/es/core.js
@@ -1,39 +1,43 @@
 /*!
-  Highlight.js v11.6.0 (git: bed790f3f3)
-  (c) 2006-2022 undefined and other contributors
+  Highlight.js v11.8.0 (git: 65687a907b)
+  (c) 2006-2023 undefined and other contributors
   License: BSD-3-Clause
  */
-var deepFreezeEs6 = {exports: {}};
+/* eslint-disable no-multi-assign */
 
 function deepFreeze(obj) {
-    if (obj instanceof Map) {
-        obj.clear = obj.delete = obj.set = function () {
-            throw new Error('map is read-only');
+  if (obj instanceof Map) {
+    obj.clear =
+      obj.delete =
+      obj.set =
+        function () {
+          throw new Error('map is read-only');
         };
-    } else if (obj instanceof Set) {
-        obj.add = obj.clear = obj.delete = function () {
-            throw new Error('set is read-only');
+  } else if (obj instanceof Set) {
+    obj.add =
+      obj.clear =
+      obj.delete =
+        function () {
+          throw new Error('set is read-only');
         };
+  }
+
+  // Freeze self
+  Object.freeze(obj);
+
+  Object.getOwnPropertyNames(obj).forEach((name) => {
+    const prop = obj[name];
+    const type = typeof prop;
+
+    // Freeze prop if it is an object or function and also not already frozen
+    if ((type === 'object' || type === 'function') && !Object.isFrozen(prop)) {
+      deepFreeze(prop);
     }
+  });
 
-    // Freeze self
-    Object.freeze(obj);
-
-    Object.getOwnPropertyNames(obj).forEach(function (name) {
-        var prop = obj[name];
-
-        // Freeze prop if it is an object
-        if (typeof prop == 'object' && !Object.isFrozen(prop)) {
-            deepFreeze(prop);
-        }
-    });
-
-    return obj;
+  return obj;
 }
 
-deepFreezeEs6.exports = deepFreeze;
-deepFreezeEs6.exports.default = deepFreeze;
-
 /** @typedef {import('highlight.js').CallbackResponse} CallbackResponse */
 /** @typedef {import('highlight.js').CompiledMode} CompiledMode */
 /** @implements CallbackResponse */
@@ -112,7 +116,7 @@ const SPAN_CLOSE = '</span>';
 const emitsWrappingTags = (node) => {
   // rarely we can have a sublanguage where language is undefined
   // TODO: track down why
-  return !!node.scope || (node.sublanguage && node.language);
+  return !!node.scope;
 };
 
 /**
@@ -121,6 +125,11 @@ const emitsWrappingTags = (node) => {
  * @param {{prefix:string}} options
  */
 const scopeToCSSClass = (name, { prefix }) => {
+  // sub-language
+  if (name.startsWith("language:")) {
+    return name.replace("language:", "language-");
+  }
+  // tiered scope: comment.line
   if (name.includes(".")) {
     const pieces = name.split(".");
     return [
@@ -128,6 +137,7 @@ const scopeToCSSClass = (name, { prefix }) => {
       ...(pieces.map((x, i) => `${x}${"_".repeat(i + 1)}`))
     ].join(" ");
   }
+  // simple scope
   return `${prefix}${name}`;
 };
 
@@ -160,12 +170,8 @@ class HTMLRenderer {
   openNode(node) {
     if (!emitsWrappingTags(node)) return;
 
-    let className = "";
-    if (node.sublanguage) {
-      className = `language-${node.language}`;
-    } else {
-      className = scopeToCSSClass(node.scope, { prefix: this.classPrefix });
-    }
+    const className = scopeToCSSClass(node.scope,
+      { prefix: this.classPrefix });
     this.span(className);
   }
 
@@ -303,13 +309,11 @@ class TokenTree {
 
   Minimal interface:
 
-  - addKeyword(text, scope)
   - addText(text)
-  - addSublanguage(emitter, subLanguageName)
+  - __addSublanguage(emitter, subLanguageName)
+  - startScope(scope)
+  - endScope()
   - finalize()
-  - openNode(scope)
-  - closeNode()
-  - closeAllNodes()
   - toHTML()
 
 */
@@ -326,18 +330,6 @@ class TokenTreeEmitter extends TokenTree {
     this.options = options;
   }
 
-  /**
-   * @param {string} text
-   * @param {string} scope
-   */
-  addKeyword(text, scope) {
-    if (text === "") { return; }
-
-    this.openNode(scope);
-    this.addText(text);
-    this.closeNode();
-  }
-
   /**
    * @param {string} text
    */
@@ -347,15 +339,24 @@ class TokenTreeEmitter extends TokenTree {
     this.add(text);
   }
 
+  /** @param {string} scope */
+  startScope(scope) {
+    this.openNode(scope);
+  }
+
+  endScope() {
+    this.closeNode();
+  }
+
   /**
    * @param {Emitter & {root: DataNode}} emitter
    * @param {string} name
    */
-  addSublanguage(emitter, name) {
+  __addSublanguage(emitter, name) {
     /** @type DataNode */
     const node = emitter.root;
-    node.sublanguage = true;
-    node.language = name;
+    if (name) node.scope = `language:${name}`;
+
     this.add(node);
   }
 
@@ -365,6 +366,7 @@ class TokenTreeEmitter extends TokenTree {
   }
 
   finalize() {
+    this.closeAllNodes();
     return true;
   }
 }
@@ -726,31 +728,31 @@ const END_SAME_AS_BEGIN = function(mode) {
 };
 
 var MODES = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    MATCH_NOTHING_RE: MATCH_NOTHING_RE,
-    IDENT_RE: IDENT_RE,
-    UNDERSCORE_IDENT_RE: UNDERSCORE_IDENT_RE,
-    NUMBER_RE: NUMBER_RE,
-    C_NUMBER_RE: C_NUMBER_RE,
-    BINARY_NUMBER_RE: BINARY_NUMBER_RE,
-    RE_STARTERS_RE: RE_STARTERS_RE,
-    SHEBANG: SHEBANG,
-    BACKSLASH_ESCAPE: BACKSLASH_ESCAPE,
-    APOS_STRING_MODE: APOS_STRING_MODE,
-    QUOTE_STRING_MODE: QUOTE_STRING_MODE,
-    PHRASAL_WORDS_MODE: PHRASAL_WORDS_MODE,
-    COMMENT: COMMENT,
-    C_LINE_COMMENT_MODE: C_LINE_COMMENT_MODE,
-    C_BLOCK_COMMENT_MODE: C_BLOCK_COMMENT_MODE,
-    HASH_COMMENT_MODE: HASH_COMMENT_MODE,
-    NUMBER_MODE: NUMBER_MODE,
-    C_NUMBER_MODE: C_NUMBER_MODE,
-    BINARY_NUMBER_MODE: BINARY_NUMBER_MODE,
-    REGEXP_MODE: REGEXP_MODE,
-    TITLE_MODE: TITLE_MODE,
-    UNDERSCORE_TITLE_MODE: UNDERSCORE_TITLE_MODE,
-    METHOD_GUARD: METHOD_GUARD,
-    END_SAME_AS_BEGIN: END_SAME_AS_BEGIN
+  __proto__: null,
+  MATCH_NOTHING_RE: MATCH_NOTHING_RE,
+  IDENT_RE: IDENT_RE,
+  UNDERSCORE_IDENT_RE: UNDERSCORE_IDENT_RE,
+  NUMBER_RE: NUMBER_RE,
+  C_NUMBER_RE: C_NUMBER_RE,
+  BINARY_NUMBER_RE: BINARY_NUMBER_RE,
+  RE_STARTERS_RE: RE_STARTERS_RE,
+  SHEBANG: SHEBANG,
+  BACKSLASH_ESCAPE: BACKSLASH_ESCAPE,
+  APOS_STRING_MODE: APOS_STRING_MODE,
+  QUOTE_STRING_MODE: QUOTE_STRING_MODE,
+  PHRASAL_WORDS_MODE: PHRASAL_WORDS_MODE,
+  COMMENT: COMMENT,
+  C_LINE_COMMENT_MODE: C_LINE_COMMENT_MODE,
+  C_BLOCK_COMMENT_MODE: C_BLOCK_COMMENT_MODE,
+  HASH_COMMENT_MODE: HASH_COMMENT_MODE,
+  NUMBER_MODE: NUMBER_MODE,
+  C_NUMBER_MODE: C_NUMBER_MODE,
+  BINARY_NUMBER_MODE: BINARY_NUMBER_MODE,
+  REGEXP_MODE: REGEXP_MODE,
+  TITLE_MODE: TITLE_MODE,
+  UNDERSCORE_TITLE_MODE: UNDERSCORE_TITLE_MODE,
+  METHOD_GUARD: METHOD_GUARD,
+  END_SAME_AS_BEGIN: END_SAME_AS_BEGIN
 });
 
 /**
@@ -904,7 +906,7 @@ const DEFAULT_KEYWORD_SCOPE = "keyword";
  * @param {boolean} caseInsensitive
  */
 function compileKeywords(rawKeywords, caseInsensitive, scopeName = DEFAULT_KEYWORD_SCOPE) {
-  /** @type KeywordDict */
+  /** @type {import("highlight.js/private").KeywordDict} */
   const compiledKeywords = Object.create(null);
 
   // input can be a string of keywords, an array of keywords, or a object with
@@ -1563,7 +1565,7 @@ function expandOrCloneMode(mode) {
   return mode;
 }
 
-var version = "11.6.0";
+var version = "11.8.0";
 
 class HTMLInjectionError extends Error {
   constructor(reason, html) {
@@ -1578,6 +1580,7 @@ Syntax highlighting with language autodetection.
 https://highlightjs.org/
 */
 
+
 /**
 @typedef {import('highlight.js').Mode} Mode
 @typedef {import('highlight.js').CompiledMode} CompiledMode
@@ -1787,7 +1790,7 @@ const HLJS = function(hljs) {
             buf += match[0];
           } else {
             const cssClass = language.classNameAliases[kind] || kind;
-            emitter.addKeyword(match[0], cssClass);
+            emitKeyword(match[0], cssClass);
           }
         } else {
           buf += match[0];
@@ -1822,7 +1825,7 @@ const HLJS = function(hljs) {
       if (top.relevance > 0) {
         relevance += result.relevance;
       }
-      emitter.addSublanguage(result._emitter, result.language);
+      emitter.__addSublanguage(result._emitter, result.language);
     }
 
     function processBuffer() {
@@ -1834,6 +1837,18 @@ const HLJS = function(hljs) {
       modeBuffer = '';
     }
 
+    /**
+     * @param {string} text
+     * @param {string} scope
+     */
+    function emitKeyword(keyword, scope) {
+      if (keyword === "") return;
+
+      emitter.startScope(scope);
+      emitter.addText(keyword);
+      emitter.endScope();
+    }
+
     /**
      * @param {CompiledScope} scope
      * @param {RegExpMatchArray} match
@@ -1846,7 +1861,7 @@ const HLJS = function(hljs) {
         const klass = language.classNameAliases[scope[i]] || scope[i];
         const text = match[i];
         if (klass) {
-          emitter.addKeyword(text, klass);
+          emitKeyword(text, klass);
         } else {
           modeBuffer = text;
           processKeywords();
@@ -1867,7 +1882,7 @@ const HLJS = function(hljs) {
       if (mode.beginScope) {
         // beginScope just wraps the begin match itself in a scope
         if (mode.beginScope._wrap) {
-          emitter.addKeyword(modeBuffer, language.classNameAliases[mode.beginScope._wrap] || mode.beginScope._wrap);
+          emitKeyword(modeBuffer, language.classNameAliases[mode.beginScope._wrap] || mode.beginScope._wrap);
           modeBuffer = "";
         } else if (mode.beginScope._multi) {
           // at this point modeBuffer should just be the match
@@ -1978,7 +1993,7 @@ const HLJS = function(hljs) {
       const origin = top;
       if (top.endScope && top.endScope._wrap) {
         processBuffer();
-        emitter.addKeyword(lexeme, top.endScope._wrap);
+        emitKeyword(lexeme, top.endScope._wrap);
       } else if (top.endScope && top.endScope._multi) {
         processBuffer();
         emitMultiClass(top.endScope, match);
@@ -2121,37 +2136,41 @@ const HLJS = function(hljs) {
     let resumeScanAtSamePosition = false;
 
     try {
-      top.matcher.considerAll();
+      if (!language.__emitTokens) {
+        top.matcher.considerAll();
 
-      for (;;) {
-        iterations++;
-        if (resumeScanAtSamePosition) {
-          // only regexes not matched previously will now be
-          // considered for a potential match
-          resumeScanAtSamePosition = false;
-        } else {
-          top.matcher.considerAll();
+        for (;;) {
+          iterations++;
+          if (resumeScanAtSamePosition) {
+            // only regexes not matched previously will now be
+            // considered for a potential match
+            resumeScanAtSamePosition = false;
+          } else {
+            top.matcher.considerAll();
+          }
+          top.matcher.lastIndex = index;
+
+          const match = top.matcher.exec(codeToHighlight);
+          // console.log("match", match[0], match.rule && match.rule.begin)
+
+          if (!match) break;
+
+          const beforeMatch = codeToHighlight.substring(index, match.index);
+          const processedCount = processLexeme(beforeMatch, match);
+          index = match.index + processedCount;
         }
-        top.matcher.lastIndex = index;
-
-        const match = top.matcher.exec(codeToHighlight);
-        // console.log("match", match[0], match.rule && match.rule.begin)
-
-        if (!match) break;
-
-        const beforeMatch = codeToHighlight.substring(index, match.index);
-        const processedCount = processLexeme(beforeMatch, match);
-        index = match.index + processedCount;
+        processLexeme(codeToHighlight.substring(index));
+      } else {
+        language.__emitTokens(codeToHighlight, emitter);
       }
-      processLexeme(codeToHighlight.substring(index));
-      emitter.closeAllNodes();
+
       emitter.finalize();
       result = emitter.toHTML();
 
       return {
         language: languageName,
         value: result,
-        relevance: relevance,
+        relevance,
         illegal: false,
         _emitter: emitter,
         _top: top
@@ -2165,7 +2184,7 @@ const HLJS = function(hljs) {
           relevance: 0,
           _illegalBy: {
             message: err.message,
-            index: index,
+            index,
             context: codeToHighlight.slice(index - 100, index + 100),
             mode: err.mode,
             resultSoFar: result
@@ -2287,7 +2306,7 @@ const HLJS = function(hljs) {
     if (shouldNotHighlight(language)) return;
 
     fire("before:highlightElement",
-      { el: element, language: language });
+      { el: element, language });
 
     // we should be all text, no child nodes (unescaped HTML) - this is possibly
     // an HTML injection attack - it's likely too late if this is already in
@@ -2491,6 +2510,16 @@ const HLJS = function(hljs) {
     plugins.push(plugin);
   }
 
+  /**
+   * @param {HLJSPlugin} plugin
+   */
+  function removePlugin(plugin) {
+    const index = plugins.indexOf(plugin);
+    if (index !== -1) {
+      plugins.splice(index, 1);
+    }
+  }
+
   /**
    *
    * @param {PluginEvent} event
@@ -2534,7 +2563,8 @@ const HLJS = function(hljs) {
     registerAliases,
     autoDetection,
     inherit,
-    addPlugin
+    addPlugin,
+    removePlugin
   });
 
   hljs.debugMode = function() { SAFE_MODE = false; };
@@ -2553,7 +2583,7 @@ const HLJS = function(hljs) {
     // @ts-ignore
     if (typeof MODES[key] === "object") {
       // @ts-ignore
-      deepFreezeEs6.exports(MODES[key]);
+      deepFreeze(MODES[key]);
     }
   }
 
@@ -2563,7 +2593,11 @@ const HLJS = function(hljs) {
   return hljs;
 };
 
-// export an "instance" of the highlighter
-var highlight = HLJS({});
+// Other names for the variable may break build script
+const highlight = HLJS({});
+
+// returns a new instance of the highlighter to be used for extensions
+// check https://github.com/wooorm/lowlight/issues/47
+highlight.newInstance = () => HLJS({});
 
 export { highlight as default };
diff --git a/vendor/assets/javascripts/highlightjs/es/core.min.js b/vendor/assets/javascripts/highlightjs/es/core.min.js
index 988cfde603a..f7b115bf1cb 100644
--- a/vendor/assets/javascripts/highlightjs/es/core.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/core.min.js
@@ -1,33 +1,32 @@
 /*!
-  Highlight.js v11.6.0 (git: bed790f3f3)
-  (c) 2006-2022 undefined and other contributors
+  Highlight.js v11.8.0 (git: 65687a907b)
+  (c) 2006-2023 undefined and other contributors
   License: BSD-3-Clause
  */
-var e={exports:{}};function t(e){
-return e instanceof Map?e.clear=e.delete=e.set=()=>{
-throw Error("map is read-only")}:e instanceof Set&&(e.add=e.clear=e.delete=()=>{
+function e(t){return t instanceof Map?t.clear=t.delete=t.set=()=>{
+throw Error("map is read-only")}:t instanceof Set&&(t.add=t.clear=t.delete=()=>{
 throw Error("set is read-only")
-}),Object.freeze(e),Object.getOwnPropertyNames(e).forEach((n=>{var i=e[n]
-;"object"!=typeof i||Object.isFrozen(i)||t(i)})),e}
-e.exports=t,e.exports.default=t;class n{constructor(e){
+}),Object.freeze(t),Object.getOwnPropertyNames(t).forEach((n=>{
+const i=t[n],s=typeof i;"object"!==s&&"function"!==s||Object.isFrozen(i)||e(i)
+})),t}class t{constructor(e){
 void 0===e.data&&(e.data={}),this.data=e.data,this.isMatchIgnored=!1}
-ignoreMatch(){this.isMatchIgnored=!0}}function i(e){
+ignoreMatch(){this.isMatchIgnored=!0}}function n(e){
 return e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#x27;")
-}function r(e,...t){const n=Object.create(null);for(const t in e)n[t]=e[t]
-;return t.forEach((e=>{for(const t in e)n[t]=e[t]})),n}
-const s=e=>!!e.scope||e.sublanguage&&e.language;class o{constructor(e,t){
+}function i(e,...t){const n=Object.create(null);for(const t in e)n[t]=e[t]
+;return t.forEach((e=>{for(const t in e)n[t]=e[t]})),n}const s=e=>!!e.scope
+;class r{constructor(e,t){
 this.buffer="",this.classPrefix=t.classPrefix,e.walk(this)}addText(e){
-this.buffer+=i(e)}openNode(e){if(!s(e))return;let t=""
-;t=e.sublanguage?"language-"+e.language:((e,{prefix:t})=>{if(e.includes(".")){
-const n=e.split(".")
+this.buffer+=n(e)}openNode(e){if(!s(e))return;const t=((e,{prefix:t})=>{
+if(e.startsWith("language:"))return e.replace("language:","language-")
+;if(e.includes(".")){const n=e.split(".")
 ;return[`${t}${n.shift()}`,...n.map(((e,t)=>`${e}${"_".repeat(t+1)}`))].join(" ")
-}return`${t}${e}`})(e.scope,{prefix:this.classPrefix}),this.span(t)}
+}return`${t}${e}`})(e.scope,{prefix:this.classPrefix});this.span(t)}
 closeNode(e){s(e)&&(this.buffer+="</span>")}value(){return this.buffer}span(e){
-this.buffer+=`<span class="${e}">`}}const a=(e={})=>{const t={children:[]}
-;return Object.assign(t,e),t};class c{constructor(){
-this.rootNode=a(),this.stack=[this.rootNode]}get top(){
+this.buffer+=`<span class="${e}">`}}const o=(e={})=>{const t={children:[]}
+;return Object.assign(t,e),t};class a{constructor(){
+this.rootNode=o(),this.stack=[this.rootNode]}get top(){
 return this.stack[this.stack.length-1]}get root(){return this.rootNode}add(e){
-this.top.children.push(e)}openNode(e){const t=a({scope:e})
+this.top.children.push(e)}openNode(e){const t=o({scope:e})
 ;this.add(t),this.stack.push(t)}closeNode(){
 if(this.stack.length>1)return this.stack.pop()}closeAllNodes(){
 for(;this.closeNode(););}toJSON(){return JSON.stringify(this.rootNode,null,4)}
@@ -35,106 +34,105 @@ walk(e){return this.constructor._walk(e,this.rootNode)}static _walk(e,t){
 return"string"==typeof t?e.addText(t):t.children&&(e.openNode(t),
 t.children.forEach((t=>this._walk(e,t))),e.closeNode(t)),e}static _collapse(e){
 "string"!=typeof e&&e.children&&(e.children.every((e=>"string"==typeof e))?e.children=[e.children.join("")]:e.children.forEach((e=>{
-c._collapse(e)})))}}class l extends c{constructor(e){super(),this.options=e}
-addKeyword(e,t){""!==e&&(this.openNode(t),this.addText(e),this.closeNode())}
-addText(e){""!==e&&this.add(e)}addSublanguage(e,t){const n=e.root
-;n.sublanguage=!0,n.language=t,this.add(n)}toHTML(){
-return new o(this,this.options).value()}finalize(){return!0}}function g(e){
-return e?"string"==typeof e?e:e.source:null}function d(e){return p("(?=",e,")")}
-function u(e){return p("(?:",e,")*")}function h(e){return p("(?:",e,")?")}
-function p(...e){return e.map((e=>g(e))).join("")}function f(...e){const t=(e=>{
+a._collapse(e)})))}}class c extends a{constructor(e){super(),this.options=e}
+addText(e){""!==e&&this.add(e)}startScope(e){this.openNode(e)}endScope(){
+this.closeNode()}__addSublanguage(e,t){const n=e.root
+;t&&(n.scope="language:"+t),this.add(n)}toHTML(){
+return new r(this,this.options).value()}finalize(){
+return this.closeAllNodes(),!0}}function l(e){
+return e?"string"==typeof e?e:e.source:null}function g(e){return h("(?=",e,")")}
+function u(e){return h("(?:",e,")*")}function d(e){return h("(?:",e,")?")}
+function h(...e){return e.map((e=>l(e))).join("")}function f(...e){const t=(e=>{
 const t=e[e.length-1]
 ;return"object"==typeof t&&t.constructor===Object?(e.splice(e.length-1,1),t):{}
-})(e);return"("+(t.capture?"":"?:")+e.map((e=>g(e))).join("|")+")"}
-function b(e){return RegExp(e.toString()+"|").exec("").length-1}
-const m=/\[(?:[^\\\]]|\\.)*\]|\(\??|\\([1-9][0-9]*)|\\./
-;function E(e,{joinWith:t}){let n=0;return e.map((e=>{n+=1;const t=n
-;let i=g(e),r="";for(;i.length>0;){const e=m.exec(i);if(!e){r+=i;break}
-r+=i.substring(0,e.index),
-i=i.substring(e.index+e[0].length),"\\"===e[0][0]&&e[1]?r+="\\"+(Number(e[1])+t):(r+=e[0],
-"("===e[0]&&n++)}return r})).map((e=>`(${e})`)).join(t)}
-const x="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",w={
-begin:"\\\\[\\s\\S]",relevance:0},y={scope:"string",begin:"'",end:"'",
-illegal:"\\n",contains:[w]},_={scope:"string",begin:'"',end:'"',illegal:"\\n",
-contains:[w]},O=(e,t,n={})=>{const i=r({scope:"comment",begin:e,end:t,
-contains:[]},n);i.contains.push({scope:"doctag",
+})(e);return"("+(t.capture?"":"?:")+e.map((e=>l(e))).join("|")+")"}
+function p(e){return RegExp(e.toString()+"|").exec("").length-1}
+const b=/\[(?:[^\\\]]|\\.)*\]|\(\??|\\([1-9][0-9]*)|\\./
+;function m(e,{joinWith:t}){let n=0;return e.map((e=>{n+=1;const t=n
+;let i=l(e),s="";for(;i.length>0;){const e=b.exec(i);if(!e){s+=i;break}
+s+=i.substring(0,e.index),
+i=i.substring(e.index+e[0].length),"\\"===e[0][0]&&e[1]?s+="\\"+(Number(e[1])+t):(s+=e[0],
+"("===e[0]&&n++)}return s})).map((e=>`(${e})`)).join(t)}
+const E="[a-zA-Z]\\w*",x="[a-zA-Z_]\\w*",w="\\b\\d+(\\.\\d+)?",_="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",y="\\b(0b[01]+)",O={
+begin:"\\\\[\\s\\S]",relevance:0},k={scope:"string",begin:"'",end:"'",
+illegal:"\\n",contains:[O]},N={scope:"string",begin:'"',end:'"',illegal:"\\n",
+contains:[O]},S=(e,t,n={})=>{const s=i({scope:"comment",begin:e,end:t,
+contains:[]},n);s.contains.push({scope:"doctag",
 begin:"[ ]*(?=(TODO|FIXME|NOTE|BUG|OPTIMIZE|HACK|XXX):)",
 end:/(TODO|FIXME|NOTE|BUG|OPTIMIZE|HACK|XXX):/,excludeBegin:!0,relevance:0})
-;const s=f("I","a","is","so","us","to","at","if","in","it","on",/[A-Za-z]+['](d|ve|re|ll|t|s|n)/,/[A-Za-z]+[-][a-z]+/,/[A-Za-z][a-z]{2,}/)
-;return i.contains.push({begin:p(/[ ]+/,"(",s,/[.]?[:]?([.][ ]|[ ])/,"){3}")}),i
-},v=O("//","$"),N=O("/\\*","\\*/"),k=O("#","$");var M=Object.freeze({
-__proto__:null,MATCH_NOTHING_RE:/\b\B/,IDENT_RE:"[a-zA-Z]\\w*",
-UNDERSCORE_IDENT_RE:"[a-zA-Z_]\\w*",NUMBER_RE:"\\b\\d+(\\.\\d+)?",C_NUMBER_RE:x,
-BINARY_NUMBER_RE:"\\b(0b[01]+)",
+;const r=f("I","a","is","so","us","to","at","if","in","it","on",/[A-Za-z]+['](d|ve|re|ll|t|s|n)/,/[A-Za-z]+[-][a-z]+/,/[A-Za-z][a-z]{2,}/)
+;return s.contains.push({begin:h(/[ ]+/,"(",r,/[.]?[:]?([.][ ]|[ ])/,"){3}")}),s
+},v=S("//","$"),M=S("/\\*","\\*/"),R=S("#","$");var A=Object.freeze({
+__proto__:null,MATCH_NOTHING_RE:/\b\B/,IDENT_RE:E,UNDERSCORE_IDENT_RE:x,
+NUMBER_RE:w,C_NUMBER_RE:_,BINARY_NUMBER_RE:y,
 RE_STARTERS_RE:"!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",
 SHEBANG:(e={})=>{const t=/^#![ ]*\//
-;return e.binary&&(e.begin=p(t,/.*\b/,e.binary,/\b.*/)),r({scope:"meta",begin:t,
+;return e.binary&&(e.begin=h(t,/.*\b/,e.binary,/\b.*/)),i({scope:"meta",begin:t,
 end:/$/,relevance:0,"on:begin":(e,t)=>{0!==e.index&&t.ignoreMatch()}},e)},
-BACKSLASH_ESCAPE:w,APOS_STRING_MODE:y,QUOTE_STRING_MODE:_,PHRASAL_WORDS_MODE:{
+BACKSLASH_ESCAPE:O,APOS_STRING_MODE:k,QUOTE_STRING_MODE:N,PHRASAL_WORDS_MODE:{
 begin:/\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|they|like|more)\b/
-},COMMENT:O,C_LINE_COMMENT_MODE:v,C_BLOCK_COMMENT_MODE:N,HASH_COMMENT_MODE:k,
-NUMBER_MODE:{scope:"number",begin:"\\b\\d+(\\.\\d+)?",relevance:0},
-C_NUMBER_MODE:{scope:"number",begin:x,relevance:0},BINARY_NUMBER_MODE:{
-scope:"number",begin:"\\b(0b[01]+)",relevance:0},REGEXP_MODE:{
-begin:/(?=\/[^/\n]*\/)/,contains:[{scope:"regexp",begin:/\//,end:/\/[gimuy]*/,
-illegal:/\n/,contains:[w,{begin:/\[/,end:/\]/,relevance:0,contains:[w]}]}]},
-TITLE_MODE:{scope:"title",begin:"[a-zA-Z]\\w*",relevance:0},
-UNDERSCORE_TITLE_MODE:{scope:"title",begin:"[a-zA-Z_]\\w*",relevance:0},
-METHOD_GUARD:{begin:"\\.\\s*[a-zA-Z_]\\w*",relevance:0},
-END_SAME_AS_BEGIN:e=>Object.assign(e,{"on:begin":(e,t)=>{t.data._beginMatch=e[1]
-},"on:end":(e,t)=>{t.data._beginMatch!==e[1]&&t.ignoreMatch()}})})
-;function S(e,t){"."===e.input[e.index-1]&&t.ignoreMatch()}function R(e,t){
-void 0!==e.className&&(e.scope=e.className,delete e.className)}function A(e,t){
+},COMMENT:S,C_LINE_COMMENT_MODE:v,C_BLOCK_COMMENT_MODE:M,HASH_COMMENT_MODE:R,
+NUMBER_MODE:{scope:"number",begin:w,relevance:0},C_NUMBER_MODE:{scope:"number",
+begin:_,relevance:0},BINARY_NUMBER_MODE:{scope:"number",begin:y,relevance:0},
+REGEXP_MODE:{begin:/(?=\/[^/\n]*\/)/,contains:[{scope:"regexp",begin:/\//,
+end:/\/[gimuy]*/,illegal:/\n/,contains:[O,{begin:/\[/,end:/\]/,relevance:0,
+contains:[O]}]}]},TITLE_MODE:{scope:"title",begin:E,relevance:0},
+UNDERSCORE_TITLE_MODE:{scope:"title",begin:x,relevance:0},METHOD_GUARD:{
+begin:"\\.\\s*"+x,relevance:0},END_SAME_AS_BEGIN:e=>Object.assign(e,{
+"on:begin":(e,t)=>{t.data._beginMatch=e[1]},"on:end":(e,t)=>{
+t.data._beginMatch!==e[1]&&t.ignoreMatch()}})});function j(e,t){
+"."===e.input[e.index-1]&&t.ignoreMatch()}function I(e,t){
+void 0!==e.className&&(e.scope=e.className,delete e.className)}function T(e,t){
 t&&e.beginKeywords&&(e.begin="\\b("+e.beginKeywords.split(" ").join("|")+")(?!\\.)(?=\\b|\\s)",
-e.__beforeBegin=S,e.keywords=e.keywords||e.beginKeywords,delete e.beginKeywords,
-void 0===e.relevance&&(e.relevance=0))}function j(e,t){
-Array.isArray(e.illegal)&&(e.illegal=f(...e.illegal))}function I(e,t){
+e.__beforeBegin=j,e.keywords=e.keywords||e.beginKeywords,delete e.beginKeywords,
+void 0===e.relevance&&(e.relevance=0))}function L(e,t){
+Array.isArray(e.illegal)&&(e.illegal=f(...e.illegal))}function B(e,t){
 if(e.match){
 if(e.begin||e.end)throw Error("begin & end are not supported with match")
-;e.begin=e.match,delete e.match}}function T(e,t){
-void 0===e.relevance&&(e.relevance=1)}const L=(e,t)=>{if(!e.beforeMatch)return
+;e.begin=e.match,delete e.match}}function P(e,t){
+void 0===e.relevance&&(e.relevance=1)}const D=(e,t)=>{if(!e.beforeMatch)return
 ;if(e.starts)throw Error("beforeMatch cannot be used with starts")
 ;const n=Object.assign({},e);Object.keys(e).forEach((t=>{delete e[t]
-})),e.keywords=n.keywords,e.begin=p(n.beforeMatch,d(n.begin)),e.starts={
+})),e.keywords=n.keywords,e.begin=h(n.beforeMatch,g(n.begin)),e.starts={
 relevance:0,contains:[Object.assign(n,{endsParent:!0})]
 },e.relevance=0,delete n.beforeMatch
-},B=["of","and","for","in","not","or","if","then","parent","list","value"]
-;function D(e,t,n="keyword"){const i=Object.create(null)
-;return"string"==typeof e?r(n,e.split(" ")):Array.isArray(e)?r(n,e):Object.keys(e).forEach((n=>{
-Object.assign(i,D(e[n],t,n))})),i;function r(e,n){
+},H=["of","and","for","in","not","or","if","then","parent","list","value"],C="keyword"
+;function $(e,t,n=C){const i=Object.create(null)
+;return"string"==typeof e?s(n,e.split(" ")):Array.isArray(e)?s(n,e):Object.keys(e).forEach((n=>{
+Object.assign(i,$(e[n],t,n))})),i;function s(e,n){
 t&&(n=n.map((e=>e.toLowerCase()))),n.forEach((t=>{const n=t.split("|")
-;i[n[0]]=[e,H(n[0],n[1])]}))}}function H(e,t){
-return t?Number(t):(e=>B.includes(e.toLowerCase()))(e)?0:1}const P={},C=e=>{
-console.error(e)},$=(e,...t)=>{console.log("WARN: "+e,...t)},U=(e,t)=>{
-P[`${e}/${t}`]||(console.log(`Deprecated as of ${e}. ${t}`),P[`${e}/${t}`]=!0)
-},z=Error();function K(e,t,{key:n}){let i=0;const r=e[n],s={},o={}
-;for(let e=1;e<=t.length;e++)o[e+i]=r[e],s[e+i]=!0,i+=b(t[e-1])
-;e[n]=o,e[n]._emit=s,e[n]._multi=!0}function W(e){(e=>{
+;i[n[0]]=[e,U(n[0],n[1])]}))}}function U(e,t){
+return t?Number(t):(e=>H.includes(e.toLowerCase()))(e)?0:1}const z={},W=e=>{
+console.error(e)},X=(e,...t)=>{console.log("WARN: "+e,...t)},G=(e,t)=>{
+z[`${e}/${t}`]||(console.log(`Deprecated as of ${e}. ${t}`),z[`${e}/${t}`]=!0)
+},K=Error();function F(e,t,{key:n}){let i=0;const s=e[n],r={},o={}
+;for(let e=1;e<=t.length;e++)o[e+i]=s[e],r[e+i]=!0,i+=p(t[e-1])
+;e[n]=o,e[n]._emit=r,e[n]._multi=!0}function Z(e){(e=>{
 e.scope&&"object"==typeof e.scope&&null!==e.scope&&(e.beginScope=e.scope,
 delete e.scope)})(e),"string"==typeof e.beginScope&&(e.beginScope={
 _wrap:e.beginScope}),"string"==typeof e.endScope&&(e.endScope={_wrap:e.endScope
 }),(e=>{if(Array.isArray(e.begin)){
-if(e.skip||e.excludeBegin||e.returnBegin)throw C("skip, excludeBegin, returnBegin not compatible with beginScope: {}"),
-z
-;if("object"!=typeof e.beginScope||null===e.beginScope)throw C("beginScope must be object"),
-z;K(e,e.begin,{key:"beginScope"}),e.begin=E(e.begin,{joinWith:""})}})(e),(e=>{
+if(e.skip||e.excludeBegin||e.returnBegin)throw W("skip, excludeBegin, returnBegin not compatible with beginScope: {}"),
+K
+;if("object"!=typeof e.beginScope||null===e.beginScope)throw W("beginScope must be object"),
+K;F(e,e.begin,{key:"beginScope"}),e.begin=m(e.begin,{joinWith:""})}})(e),(e=>{
 if(Array.isArray(e.end)){
-if(e.skip||e.excludeEnd||e.returnEnd)throw C("skip, excludeEnd, returnEnd not compatible with endScope: {}"),
-z
-;if("object"!=typeof e.endScope||null===e.endScope)throw C("endScope must be object"),
-z;K(e,e.end,{key:"endScope"}),e.end=E(e.end,{joinWith:""})}})(e)}function X(e){
+if(e.skip||e.excludeEnd||e.returnEnd)throw W("skip, excludeEnd, returnEnd not compatible with endScope: {}"),
+K
+;if("object"!=typeof e.endScope||null===e.endScope)throw W("endScope must be object"),
+K;F(e,e.end,{key:"endScope"}),e.end=m(e.end,{joinWith:""})}})(e)}function V(e){
 function t(t,n){
-return RegExp(g(t),"m"+(e.case_insensitive?"i":"")+(e.unicodeRegex?"u":"")+(n?"g":""))
+return RegExp(l(t),"m"+(e.case_insensitive?"i":"")+(e.unicodeRegex?"u":"")+(n?"g":""))
 }class n{constructor(){
 this.matchIndexes={},this.regexes=[],this.matchAt=1,this.position=0}
 addRule(e,t){
 t.position=this.position++,this.matchIndexes[this.matchAt]=t,this.regexes.push([t,e]),
-this.matchAt+=b(e)+1}compile(){0===this.regexes.length&&(this.exec=()=>null)
-;const e=this.regexes.map((e=>e[1]));this.matcherRe=t(E(e,{joinWith:"|"
+this.matchAt+=p(e)+1}compile(){0===this.regexes.length&&(this.exec=()=>null)
+;const e=this.regexes.map((e=>e[1]));this.matcherRe=t(m(e,{joinWith:"|"
 }),!0),this.lastIndex=0}exec(e){this.matcherRe.lastIndex=this.lastIndex
 ;const t=this.matcherRe.exec(e);if(!t)return null
 ;const n=t.findIndex(((e,t)=>t>0&&void 0!==e)),i=this.matchIndexes[n]
-;return t.splice(0,n),Object.assign(t,i)}}class i{constructor(){
+;return t.splice(0,n),Object.assign(t,i)}}class s{constructor(){
 this.rules=[],this.multiRegexes=[],
 this.count=0,this.lastIndex=0,this.regexIndex=0}getMatcher(e){
 if(this.multiRegexes[e])return this.multiRegexes[e];const t=new n
@@ -150,157 +148,159 @@ return n&&(this.regexIndex+=n.position+1,
 this.regexIndex===this.count&&this.considerAll()),n}}
 if(e.compilerExtensions||(e.compilerExtensions=[]),
 e.contains&&e.contains.includes("self"))throw Error("ERR: contains `self` is not supported at the top-level of a language.  See documentation.")
-;return e.classNameAliases=r(e.classNameAliases||{}),function n(s,o){const a=s
-;if(s.isCompiled)return a
-;[R,I,W,L].forEach((e=>e(s,o))),e.compilerExtensions.forEach((e=>e(s,o))),
-s.__beforeBegin=null,[A,j,T].forEach((e=>e(s,o))),s.isCompiled=!0;let c=null
-;return"object"==typeof s.keywords&&s.keywords.$pattern&&(s.keywords=Object.assign({},s.keywords),
-c=s.keywords.$pattern,
-delete s.keywords.$pattern),c=c||/\w+/,s.keywords&&(s.keywords=D(s.keywords,e.case_insensitive)),
+;return e.classNameAliases=i(e.classNameAliases||{}),function n(r,o){const a=r
+;if(r.isCompiled)return a
+;[I,B,Z,D].forEach((e=>e(r,o))),e.compilerExtensions.forEach((e=>e(r,o))),
+r.__beforeBegin=null,[T,L,P].forEach((e=>e(r,o))),r.isCompiled=!0;let c=null
+;return"object"==typeof r.keywords&&r.keywords.$pattern&&(r.keywords=Object.assign({},r.keywords),
+c=r.keywords.$pattern,
+delete r.keywords.$pattern),c=c||/\w+/,r.keywords&&(r.keywords=$(r.keywords,e.case_insensitive)),
 a.keywordPatternRe=t(c,!0),
-o&&(s.begin||(s.begin=/\B|\b/),a.beginRe=t(a.begin),s.end||s.endsWithParent||(s.end=/\B|\b/),
-s.end&&(a.endRe=t(a.end)),
-a.terminatorEnd=g(a.end)||"",s.endsWithParent&&o.terminatorEnd&&(a.terminatorEnd+=(s.end?"|":"")+o.terminatorEnd)),
-s.illegal&&(a.illegalRe=t(s.illegal)),
-s.contains||(s.contains=[]),s.contains=[].concat(...s.contains.map((e=>(e=>(e.variants&&!e.cachedVariants&&(e.cachedVariants=e.variants.map((t=>r(e,{
-variants:null},t)))),e.cachedVariants?e.cachedVariants:Z(e)?r(e,{
-starts:e.starts?r(e.starts):null
-}):Object.isFrozen(e)?r(e):e))("self"===e?s:e)))),s.contains.forEach((e=>{n(e,a)
-})),s.starts&&n(s.starts,o),a.matcher=(e=>{const t=new i
+o&&(r.begin||(r.begin=/\B|\b/),a.beginRe=t(a.begin),r.end||r.endsWithParent||(r.end=/\B|\b/),
+r.end&&(a.endRe=t(a.end)),
+a.terminatorEnd=l(a.end)||"",r.endsWithParent&&o.terminatorEnd&&(a.terminatorEnd+=(r.end?"|":"")+o.terminatorEnd)),
+r.illegal&&(a.illegalRe=t(r.illegal)),
+r.contains||(r.contains=[]),r.contains=[].concat(...r.contains.map((e=>(e=>(e.variants&&!e.cachedVariants&&(e.cachedVariants=e.variants.map((t=>i(e,{
+variants:null},t)))),e.cachedVariants?e.cachedVariants:q(e)?i(e,{
+starts:e.starts?i(e.starts):null
+}):Object.isFrozen(e)?i(e):e))("self"===e?r:e)))),r.contains.forEach((e=>{n(e,a)
+})),r.starts&&n(r.starts,o),a.matcher=(e=>{const t=new s
 ;return e.contains.forEach((e=>t.addRule(e.begin,{rule:e,type:"begin"
 }))),e.terminatorEnd&&t.addRule(e.terminatorEnd,{type:"end"
-}),e.illegal&&t.addRule(e.illegal,{type:"illegal"}),t})(a),a}(e)}function Z(e){
-return!!e&&(e.endsWithParent||Z(e.starts))}class G extends Error{
+}),e.illegal&&t.addRule(e.illegal,{type:"illegal"}),t})(a),a}(e)}function q(e){
+return!!e&&(e.endsWithParent||q(e.starts))}class J extends Error{
 constructor(e,t){super(e),this.name="HTMLInjectionError",this.html=t}}
-const F=i,V=r,q=Symbol("nomatch");var J=(t=>{
-const i=Object.create(null),r=Object.create(null),s=[];let o=!0
-;const a="Could not find the language '{}', did you forget to load/include a language module?",c={
-disableAutodetect:!0,name:"Plain text",contains:[]};let g={
+const Y=n,Q=i,ee=Symbol("nomatch"),te=n=>{
+const i=Object.create(null),s=Object.create(null),r=[];let o=!0
+;const a="Could not find the language '{}', did you forget to load/include a language module?",l={
+disableAutodetect:!0,name:"Plain text",contains:[]};let p={
 ignoreUnescapedHTML:!1,throwUnescapedHTML:!1,noHighlightRe:/^(no-?highlight)$/i,
 languageDetectRe:/\blang(?:uage)?-([\w-]+)\b/i,classPrefix:"hljs-",
-cssSelector:"pre code",languages:null,__emitter:l};function b(e){
-return g.noHighlightRe.test(e)}function m(e,t,n){let i="",r=""
+cssSelector:"pre code",languages:null,__emitter:c};function b(e){
+return p.noHighlightRe.test(e)}function m(e,t,n){let i="",s=""
 ;"object"==typeof t?(i=e,
-n=t.ignoreIllegals,r=t.language):(U("10.7.0","highlight(lang, code, ...args) has been deprecated."),
-U("10.7.0","Please use highlight(code, options) instead.\nhttps://github.com/highlightjs/highlight.js/issues/2277"),
-r=e,i=t),void 0===n&&(n=!0);const s={code:i,language:r};k("before:highlight",s)
-;const o=s.result?s.result:E(s.language,s.code,n)
-;return o.code=s.code,k("after:highlight",o),o}function E(e,t,r,s){
-const c=Object.create(null);function l(){if(!N.keywords)return void M.addText(S)
-;let e=0;N.keywordPatternRe.lastIndex=0;let t=N.keywordPatternRe.exec(S),n=""
-;for(;t;){n+=S.substring(e,t.index)
-;const r=y.case_insensitive?t[0].toLowerCase():t[0],s=(i=r,N.keywords[i]);if(s){
-const[e,i]=s
-;if(M.addText(n),n="",c[r]=(c[r]||0)+1,c[r]<=7&&(R+=i),e.startsWith("_"))n+=t[0];else{
-const n=y.classNameAliases[e]||e;M.addKeyword(t[0],n)}}else n+=t[0]
-;e=N.keywordPatternRe.lastIndex,t=N.keywordPatternRe.exec(S)}var i
-;n+=S.substring(e),M.addText(n)}function d(){null!=N.subLanguage?(()=>{
-if(""===S)return;let e=null;if("string"==typeof N.subLanguage){
-if(!i[N.subLanguage])return void M.addText(S)
-;e=E(N.subLanguage,S,!0,k[N.subLanguage]),k[N.subLanguage]=e._top
-}else e=x(S,N.subLanguage.length?N.subLanguage:null)
-;N.relevance>0&&(R+=e.relevance),M.addSublanguage(e._emitter,e.language)
-})():l(),S=""}function u(e,t){let n=1;const i=t.length-1;for(;n<=i;){
-if(!e._emit[n]){n++;continue}const i=y.classNameAliases[e[n]]||e[n],r=t[n]
-;i?M.addKeyword(r,i):(S=r,l(),S=""),n++}}function h(e,t){
+n=t.ignoreIllegals,s=t.language):(G("10.7.0","highlight(lang, code, ...args) has been deprecated."),
+G("10.7.0","Please use highlight(code, options) instead.\nhttps://github.com/highlightjs/highlight.js/issues/2277"),
+s=e,i=t),void 0===n&&(n=!0);const r={code:i,language:s};S("before:highlight",r)
+;const o=r.result?r.result:E(r.language,r.code,n)
+;return o.code=r.code,S("after:highlight",o),o}function E(e,n,s,r){
+const c=Object.create(null);function l(){if(!S.keywords)return void M.addText(R)
+;let e=0;S.keywordPatternRe.lastIndex=0;let t=S.keywordPatternRe.exec(R),n=""
+;for(;t;){n+=R.substring(e,t.index)
+;const s=y.case_insensitive?t[0].toLowerCase():t[0],r=(i=s,S.keywords[i]);if(r){
+const[e,i]=r
+;if(M.addText(n),n="",c[s]=(c[s]||0)+1,c[s]<=7&&(A+=i),e.startsWith("_"))n+=t[0];else{
+const n=y.classNameAliases[e]||e;u(t[0],n)}}else n+=t[0]
+;e=S.keywordPatternRe.lastIndex,t=S.keywordPatternRe.exec(R)}var i
+;n+=R.substring(e),M.addText(n)}function g(){null!=S.subLanguage?(()=>{
+if(""===R)return;let e=null;if("string"==typeof S.subLanguage){
+if(!i[S.subLanguage])return void M.addText(R)
+;e=E(S.subLanguage,R,!0,v[S.subLanguage]),v[S.subLanguage]=e._top
+}else e=x(R,S.subLanguage.length?S.subLanguage:null)
+;S.relevance>0&&(A+=e.relevance),M.__addSublanguage(e._emitter,e.language)
+})():l(),R=""}function u(e,t){
+""!==e&&(M.startScope(t),M.addText(e),M.endScope())}function d(e,t){let n=1
+;const i=t.length-1;for(;n<=i;){if(!e._emit[n]){n++;continue}
+const i=y.classNameAliases[e[n]]||e[n],s=t[n];i?u(s,i):(R=s,l(),R=""),n++}}
+function h(e,t){
 return e.scope&&"string"==typeof e.scope&&M.openNode(y.classNameAliases[e.scope]||e.scope),
-e.beginScope&&(e.beginScope._wrap?(M.addKeyword(S,y.classNameAliases[e.beginScope._wrap]||e.beginScope._wrap),
-S=""):e.beginScope._multi&&(u(e.beginScope,t),S="")),N=Object.create(e,{parent:{
-value:N}}),N}function p(e,t,i){let r=((e,t)=>{const n=e&&e.exec(t)
-;return n&&0===n.index})(e.endRe,i);if(r){if(e["on:end"]){const i=new n(e)
-;e["on:end"](t,i),i.isMatchIgnored&&(r=!1)}if(r){
+e.beginScope&&(e.beginScope._wrap?(u(R,y.classNameAliases[e.beginScope._wrap]||e.beginScope._wrap),
+R=""):e.beginScope._multi&&(d(e.beginScope,t),R="")),S=Object.create(e,{parent:{
+value:S}}),S}function f(e,n,i){let s=((e,t)=>{const n=e&&e.exec(t)
+;return n&&0===n.index})(e.endRe,i);if(s){if(e["on:end"]){const i=new t(e)
+;e["on:end"](n,i),i.isMatchIgnored&&(s=!1)}if(s){
 for(;e.endsParent&&e.parent;)e=e.parent;return e}}
-if(e.endsWithParent)return p(e.parent,t,i)}function f(e){
-return 0===N.matcher.regexIndex?(S+=e[0],1):(I=!0,0)}function b(e){
-const n=e[0],i=t.substring(e.index),r=p(N,e,i);if(!r)return q;const s=N
-;N.endScope&&N.endScope._wrap?(d(),
-M.addKeyword(n,N.endScope._wrap)):N.endScope&&N.endScope._multi?(d(),
-u(N.endScope,e)):s.skip?S+=n:(s.returnEnd||s.excludeEnd||(S+=n),
-d(),s.excludeEnd&&(S=n));do{
-N.scope&&M.closeNode(),N.skip||N.subLanguage||(R+=N.relevance),N=N.parent
-}while(N!==r.parent);return r.starts&&h(r.starts,e),s.returnEnd?0:n.length}
-let m={};function w(i,s){const a=s&&s[0];if(S+=i,null==a)return d(),0
-;if("begin"===m.type&&"end"===s.type&&m.index===s.index&&""===a){
-if(S+=t.slice(s.index,s.index+1),!o){const t=Error(`0 width match regex (${e})`)
-;throw t.languageName=e,t.badRule=m.rule,t}return 1}
-if(m=s,"begin"===s.type)return(e=>{
-const t=e[0],i=e.rule,r=new n(i),s=[i.__beforeBegin,i["on:begin"]]
-;for(const n of s)if(n&&(n(e,r),r.isMatchIgnored))return f(t)
-;return i.skip?S+=t:(i.excludeBegin&&(S+=t),
-d(),i.returnBegin||i.excludeBegin||(S=t)),h(i,e),i.returnBegin?0:t.length})(s)
-;if("illegal"===s.type&&!r){
-const e=Error('Illegal lexeme "'+a+'" for mode "'+(N.scope||"<unnamed>")+'"')
-;throw e.mode=N,e}if("end"===s.type){const e=b(s);if(e!==q)return e}
-if("illegal"===s.type&&""===a)return 1
-;if(j>1e5&&j>3*s.index)throw Error("potential infinite loop, way more iterations than matches")
-;return S+=a,a.length}const y=O(e)
-;if(!y)throw C(a.replace("{}",e)),Error('Unknown language: "'+e+'"')
-;const _=X(y);let v="",N=s||_;const k={},M=new g.__emitter(g);(()=>{const e=[]
-;for(let t=N;t!==y;t=t.parent)t.scope&&e.unshift(t.scope)
-;e.forEach((e=>M.openNode(e)))})();let S="",R=0,A=0,j=0,I=!1;try{
-for(N.matcher.considerAll();;){
-j++,I?I=!1:N.matcher.considerAll(),N.matcher.lastIndex=A
-;const e=N.matcher.exec(t);if(!e)break;const n=w(t.substring(A,e.index),e)
-;A=e.index+n}
-return w(t.substring(A)),M.closeAllNodes(),M.finalize(),v=M.toHTML(),{
-language:e,value:v,relevance:R,illegal:!1,_emitter:M,_top:N}}catch(n){
-if(n.message&&n.message.includes("Illegal"))return{language:e,value:F(t),
-illegal:!0,relevance:0,_illegalBy:{message:n.message,index:A,
-context:t.slice(A-100,A+100),mode:n.mode,resultSoFar:v},_emitter:M};if(o)return{
-language:e,value:F(t),illegal:!1,relevance:0,errorRaised:n,_emitter:M,_top:N}
-;throw n}}function x(e,t){t=t||g.languages||Object.keys(i);const n=(e=>{
-const t={value:F(e),illegal:!1,relevance:0,_top:c,_emitter:new g.__emitter(g)}
-;return t._emitter.addText(e),t})(e),r=t.filter(O).filter(N).map((t=>E(t,e,!1)))
-;r.unshift(n);const s=r.sort(((e,t)=>{
+if(e.endsWithParent)return f(e.parent,n,i)}function b(e){
+return 0===S.matcher.regexIndex?(R+=e[0],1):(T=!0,0)}function m(e){
+const t=e[0],i=n.substring(e.index),s=f(S,e,i);if(!s)return ee;const r=S
+;S.endScope&&S.endScope._wrap?(g(),
+u(t,S.endScope._wrap)):S.endScope&&S.endScope._multi?(g(),
+d(S.endScope,e)):r.skip?R+=t:(r.returnEnd||r.excludeEnd||(R+=t),
+g(),r.excludeEnd&&(R=t));do{
+S.scope&&M.closeNode(),S.skip||S.subLanguage||(A+=S.relevance),S=S.parent
+}while(S!==s.parent);return s.starts&&h(s.starts,e),r.returnEnd?0:t.length}
+let w={};function _(i,r){const a=r&&r[0];if(R+=i,null==a)return g(),0
+;if("begin"===w.type&&"end"===r.type&&w.index===r.index&&""===a){
+if(R+=n.slice(r.index,r.index+1),!o){const t=Error(`0 width match regex (${e})`)
+;throw t.languageName=e,t.badRule=w.rule,t}return 1}
+if(w=r,"begin"===r.type)return(e=>{
+const n=e[0],i=e.rule,s=new t(i),r=[i.__beforeBegin,i["on:begin"]]
+;for(const t of r)if(t&&(t(e,s),s.isMatchIgnored))return b(n)
+;return i.skip?R+=n:(i.excludeBegin&&(R+=n),
+g(),i.returnBegin||i.excludeBegin||(R=n)),h(i,e),i.returnBegin?0:n.length})(r)
+;if("illegal"===r.type&&!s){
+const e=Error('Illegal lexeme "'+a+'" for mode "'+(S.scope||"<unnamed>")+'"')
+;throw e.mode=S,e}if("end"===r.type){const e=m(r);if(e!==ee)return e}
+if("illegal"===r.type&&""===a)return 1
+;if(I>1e5&&I>3*r.index)throw Error("potential infinite loop, way more iterations than matches")
+;return R+=a,a.length}const y=O(e)
+;if(!y)throw W(a.replace("{}",e)),Error('Unknown language: "'+e+'"')
+;const k=V(y);let N="",S=r||k;const v={},M=new p.__emitter(p);(()=>{const e=[]
+;for(let t=S;t!==y;t=t.parent)t.scope&&e.unshift(t.scope)
+;e.forEach((e=>M.openNode(e)))})();let R="",A=0,j=0,I=0,T=!1;try{
+if(y.__emitTokens)y.__emitTokens(n,M);else{for(S.matcher.considerAll();;){
+I++,T?T=!1:S.matcher.considerAll(),S.matcher.lastIndex=j
+;const e=S.matcher.exec(n);if(!e)break;const t=_(n.substring(j,e.index),e)
+;j=e.index+t}_(n.substring(j))}return M.finalize(),N=M.toHTML(),{language:e,
+value:N,relevance:A,illegal:!1,_emitter:M,_top:S}}catch(t){
+if(t.message&&t.message.includes("Illegal"))return{language:e,value:Y(n),
+illegal:!0,relevance:0,_illegalBy:{message:t.message,index:j,
+context:n.slice(j-100,j+100),mode:t.mode,resultSoFar:N},_emitter:M};if(o)return{
+language:e,value:Y(n),illegal:!1,relevance:0,errorRaised:t,_emitter:M,_top:S}
+;throw t}}function x(e,t){t=t||p.languages||Object.keys(i);const n=(e=>{
+const t={value:Y(e),illegal:!1,relevance:0,_top:l,_emitter:new p.__emitter(p)}
+;return t._emitter.addText(e),t})(e),s=t.filter(O).filter(N).map((t=>E(t,e,!1)))
+;s.unshift(n);const r=s.sort(((e,t)=>{
 if(e.relevance!==t.relevance)return t.relevance-e.relevance
 ;if(e.language&&t.language){if(O(e.language).supersetOf===t.language)return 1
-;if(O(t.language).supersetOf===e.language)return-1}return 0})),[o,a]=s,l=o
-;return l.secondBest=a,l}function w(e){let t=null;const n=(e=>{
+;if(O(t.language).supersetOf===e.language)return-1}return 0})),[o,a]=r,c=o
+;return c.secondBest=a,c}function w(e){let t=null;const n=(e=>{
 let t=e.className+" ";t+=e.parentNode?e.parentNode.className:""
-;const n=g.languageDetectRe.exec(t);if(n){const t=O(n[1])
-;return t||($(a.replace("{}",n[1])),
-$("Falling back to no-highlight mode for this block.",e)),t?n[1]:"no-highlight"}
+;const n=p.languageDetectRe.exec(t);if(n){const t=O(n[1])
+;return t||(X(a.replace("{}",n[1])),
+X("Falling back to no-highlight mode for this block.",e)),t?n[1]:"no-highlight"}
 return t.split(/\s+/).find((e=>b(e)||O(e)))})(e);if(b(n))return
-;if(k("before:highlightElement",{el:e,language:n
-}),e.children.length>0&&(g.ignoreUnescapedHTML||(console.warn("One of your code blocks includes unescaped HTML. This is a potentially serious security risk."),
+;if(S("before:highlightElement",{el:e,language:n
+}),e.children.length>0&&(p.ignoreUnescapedHTML||(console.warn("One of your code blocks includes unescaped HTML. This is a potentially serious security risk."),
 console.warn("https://github.com/highlightjs/highlight.js/wiki/security"),
 console.warn("The element with unescaped HTML:"),
-console.warn(e)),g.throwUnescapedHTML))throw new G("One of your code blocks includes unescaped HTML.",e.innerHTML)
-;t=e;const i=t.textContent,s=n?m(i,{language:n,ignoreIllegals:!0}):x(i)
-;e.innerHTML=s.value,((e,t,n)=>{const i=t&&r[t]||n
+console.warn(e)),p.throwUnescapedHTML))throw new J("One of your code blocks includes unescaped HTML.",e.innerHTML)
+;t=e;const i=t.textContent,r=n?m(i,{language:n,ignoreIllegals:!0}):x(i)
+;e.innerHTML=r.value,((e,t,n)=>{const i=t&&s[t]||n
 ;e.classList.add("hljs"),e.classList.add("language-"+i)
-})(e,n,s.language),e.result={language:s.language,re:s.relevance,
-relevance:s.relevance},s.secondBest&&(e.secondBest={
-language:s.secondBest.language,relevance:s.secondBest.relevance
-}),k("after:highlightElement",{el:e,result:s,text:i})}let y=!1;function _(){
-"loading"!==document.readyState?document.querySelectorAll(g.cssSelector).forEach(w):y=!0
-}function O(e){return e=(e||"").toLowerCase(),i[e]||i[r[e]]}
-function v(e,{languageName:t}){"string"==typeof e&&(e=[e]),e.forEach((e=>{
-r[e.toLowerCase()]=t}))}function N(e){const t=O(e)
-;return t&&!t.disableAutodetect}function k(e,t){const n=e;s.forEach((e=>{
+})(e,n,r.language),e.result={language:r.language,re:r.relevance,
+relevance:r.relevance},r.secondBest&&(e.secondBest={
+language:r.secondBest.language,relevance:r.secondBest.relevance
+}),S("after:highlightElement",{el:e,result:r,text:i})}let _=!1;function y(){
+"loading"!==document.readyState?document.querySelectorAll(p.cssSelector).forEach(w):_=!0
+}function O(e){return e=(e||"").toLowerCase(),i[e]||i[s[e]]}
+function k(e,{languageName:t}){"string"==typeof e&&(e=[e]),e.forEach((e=>{
+s[e.toLowerCase()]=t}))}function N(e){const t=O(e)
+;return t&&!t.disableAutodetect}function S(e,t){const n=e;r.forEach((e=>{
 e[n]&&e[n](t)}))}
 "undefined"!=typeof window&&window.addEventListener&&window.addEventListener("DOMContentLoaded",(()=>{
-y&&_()}),!1),Object.assign(t,{highlight:m,highlightAuto:x,highlightAll:_,
+_&&y()}),!1),Object.assign(n,{highlight:m,highlightAuto:x,highlightAll:y,
 highlightElement:w,
-highlightBlock:e=>(U("10.7.0","highlightBlock will be removed entirely in v12.0"),
-U("10.7.0","Please use highlightElement now."),w(e)),configure:e=>{g=V(g,e)},
+highlightBlock:e=>(G("10.7.0","highlightBlock will be removed entirely in v12.0"),
+G("10.7.0","Please use highlightElement now."),w(e)),configure:e=>{p=Q(p,e)},
 initHighlighting:()=>{
-_(),U("10.6.0","initHighlighting() deprecated.  Use highlightAll() now.")},
+y(),G("10.6.0","initHighlighting() deprecated.  Use highlightAll() now.")},
 initHighlightingOnLoad:()=>{
-_(),U("10.6.0","initHighlightingOnLoad() deprecated.  Use highlightAll() now.")
-},registerLanguage:(e,n)=>{let r=null;try{r=n(t)}catch(t){
-if(C("Language definition for '{}' could not be registered.".replace("{}",e)),
-!o)throw t;C(t),r=c}
-r.name||(r.name=e),i[e]=r,r.rawDefinition=n.bind(null,t),r.aliases&&v(r.aliases,{
+y(),G("10.6.0","initHighlightingOnLoad() deprecated.  Use highlightAll() now.")
+},registerLanguage:(e,t)=>{let s=null;try{s=t(n)}catch(t){
+if(W("Language definition for '{}' could not be registered.".replace("{}",e)),
+!o)throw t;W(t),s=l}
+s.name||(s.name=e),i[e]=s,s.rawDefinition=t.bind(null,n),s.aliases&&k(s.aliases,{
 languageName:e})},unregisterLanguage:e=>{delete i[e]
-;for(const t of Object.keys(r))r[t]===e&&delete r[t]},
-listLanguages:()=>Object.keys(i),getLanguage:O,registerAliases:v,
-autoDetection:N,inherit:V,addPlugin:e=>{(e=>{
+;for(const t of Object.keys(s))s[t]===e&&delete s[t]},
+listLanguages:()=>Object.keys(i),getLanguage:O,registerAliases:k,
+autoDetection:N,inherit:Q,addPlugin:e=>{(e=>{
 e["before:highlightBlock"]&&!e["before:highlightElement"]&&(e["before:highlightElement"]=t=>{
 e["before:highlightBlock"](Object.assign({block:t.el},t))
 }),e["after:highlightBlock"]&&!e["after:highlightElement"]&&(e["after:highlightElement"]=t=>{
-e["after:highlightBlock"](Object.assign({block:t.el},t))})})(e),s.push(e)}
-}),t.debugMode=()=>{o=!1},t.safeMode=()=>{o=!0
-},t.versionString="11.6.0",t.regex={concat:p,lookahead:d,either:f,optional:h,
-anyNumberOfTimes:u};for(const t in M)"object"==typeof M[t]&&e.exports(M[t])
-;return Object.assign(t,M),t})({});export{J as default};
\ No newline at end of file
+e["after:highlightBlock"](Object.assign({block:t.el},t))})})(e),r.push(e)},
+removePlugin:e=>{const t=r.indexOf(e);-1!==t&&r.splice(t,1)}}),n.debugMode=()=>{
+o=!1},n.safeMode=()=>{o=!0},n.versionString="11.8.0",n.regex={concat:h,
+lookahead:g,either:f,optional:d,anyNumberOfTimes:u}
+;for(const t in A)"object"==typeof A[t]&&e(A[t]);return Object.assign(n,A),n
+},ne=te({});ne.newInstance=()=>te({});export{ne as default};
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/es/highlight.js b/vendor/assets/javascripts/highlightjs/es/highlight.js
index cdb6d90d6e1..900f0ddecae 100644
--- a/vendor/assets/javascripts/highlightjs/es/highlight.js
+++ b/vendor/assets/javascripts/highlightjs/es/highlight.js
@@ -1,39 +1,43 @@
 /*!
-  Highlight.js v11.6.0 (git: bed790f3f3)
-  (c) 2006-2022 undefined and other contributors
+  Highlight.js v11.8.0 (git: 65687a907b)
+  (c) 2006-2023 undefined and other contributors
   License: BSD-3-Clause
  */
-var deepFreezeEs6 = {exports: {}};
+/* eslint-disable no-multi-assign */
 
 function deepFreeze(obj) {
-    if (obj instanceof Map) {
-        obj.clear = obj.delete = obj.set = function () {
-            throw new Error('map is read-only');
+  if (obj instanceof Map) {
+    obj.clear =
+      obj.delete =
+      obj.set =
+        function () {
+          throw new Error('map is read-only');
         };
-    } else if (obj instanceof Set) {
-        obj.add = obj.clear = obj.delete = function () {
-            throw new Error('set is read-only');
+  } else if (obj instanceof Set) {
+    obj.add =
+      obj.clear =
+      obj.delete =
+        function () {
+          throw new Error('set is read-only');
         };
+  }
+
+  // Freeze self
+  Object.freeze(obj);
+
+  Object.getOwnPropertyNames(obj).forEach((name) => {
+    const prop = obj[name];
+    const type = typeof prop;
+
+    // Freeze prop if it is an object or function and also not already frozen
+    if ((type === 'object' || type === 'function') && !Object.isFrozen(prop)) {
+      deepFreeze(prop);
     }
+  });
 
-    // Freeze self
-    Object.freeze(obj);
-
-    Object.getOwnPropertyNames(obj).forEach(function (name) {
-        var prop = obj[name];
-
-        // Freeze prop if it is an object
-        if (typeof prop == 'object' && !Object.isFrozen(prop)) {
-            deepFreeze(prop);
-        }
-    });
-
-    return obj;
+  return obj;
 }
 
-deepFreezeEs6.exports = deepFreeze;
-deepFreezeEs6.exports.default = deepFreeze;
-
 /** @typedef {import('highlight.js').CallbackResponse} CallbackResponse */
 /** @typedef {import('highlight.js').CompiledMode} CompiledMode */
 /** @implements CallbackResponse */
@@ -112,7 +116,7 @@ const SPAN_CLOSE = '</span>';
 const emitsWrappingTags = (node) => {
   // rarely we can have a sublanguage where language is undefined
   // TODO: track down why
-  return !!node.scope || (node.sublanguage && node.language);
+  return !!node.scope;
 };
 
 /**
@@ -121,6 +125,11 @@ const emitsWrappingTags = (node) => {
  * @param {{prefix:string}} options
  */
 const scopeToCSSClass = (name, { prefix }) => {
+  // sub-language
+  if (name.startsWith("language:")) {
+    return name.replace("language:", "language-");
+  }
+  // tiered scope: comment.line
   if (name.includes(".")) {
     const pieces = name.split(".");
     return [
@@ -128,6 +137,7 @@ const scopeToCSSClass = (name, { prefix }) => {
       ...(pieces.map((x, i) => `${x}${"_".repeat(i + 1)}`))
     ].join(" ");
   }
+  // simple scope
   return `${prefix}${name}`;
 };
 
@@ -160,12 +170,8 @@ class HTMLRenderer {
   openNode(node) {
     if (!emitsWrappingTags(node)) return;
 
-    let className = "";
-    if (node.sublanguage) {
-      className = `language-${node.language}`;
-    } else {
-      className = scopeToCSSClass(node.scope, { prefix: this.classPrefix });
-    }
+    const className = scopeToCSSClass(node.scope,
+      { prefix: this.classPrefix });
     this.span(className);
   }
 
@@ -303,13 +309,11 @@ class TokenTree {
 
   Minimal interface:
 
-  - addKeyword(text, scope)
   - addText(text)
-  - addSublanguage(emitter, subLanguageName)
+  - __addSublanguage(emitter, subLanguageName)
+  - startScope(scope)
+  - endScope()
   - finalize()
-  - openNode(scope)
-  - closeNode()
-  - closeAllNodes()
   - toHTML()
 
 */
@@ -326,18 +330,6 @@ class TokenTreeEmitter extends TokenTree {
     this.options = options;
   }
 
-  /**
-   * @param {string} text
-   * @param {string} scope
-   */
-  addKeyword(text, scope) {
-    if (text === "") { return; }
-
-    this.openNode(scope);
-    this.addText(text);
-    this.closeNode();
-  }
-
   /**
    * @param {string} text
    */
@@ -347,15 +339,24 @@ class TokenTreeEmitter extends TokenTree {
     this.add(text);
   }
 
+  /** @param {string} scope */
+  startScope(scope) {
+    this.openNode(scope);
+  }
+
+  endScope() {
+    this.closeNode();
+  }
+
   /**
    * @param {Emitter & {root: DataNode}} emitter
    * @param {string} name
    */
-  addSublanguage(emitter, name) {
+  __addSublanguage(emitter, name) {
     /** @type DataNode */
     const node = emitter.root;
-    node.sublanguage = true;
-    node.language = name;
+    if (name) node.scope = `language:${name}`;
+
     this.add(node);
   }
 
@@ -365,6 +366,7 @@ class TokenTreeEmitter extends TokenTree {
   }
 
   finalize() {
+    this.closeAllNodes();
     return true;
   }
 }
@@ -726,31 +728,31 @@ const END_SAME_AS_BEGIN = function(mode) {
 };
 
 var MODES$1 = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    MATCH_NOTHING_RE: MATCH_NOTHING_RE,
-    IDENT_RE: IDENT_RE$1,
-    UNDERSCORE_IDENT_RE: UNDERSCORE_IDENT_RE,
-    NUMBER_RE: NUMBER_RE,
-    C_NUMBER_RE: C_NUMBER_RE,
-    BINARY_NUMBER_RE: BINARY_NUMBER_RE,
-    RE_STARTERS_RE: RE_STARTERS_RE,
-    SHEBANG: SHEBANG,
-    BACKSLASH_ESCAPE: BACKSLASH_ESCAPE,
-    APOS_STRING_MODE: APOS_STRING_MODE,
-    QUOTE_STRING_MODE: QUOTE_STRING_MODE,
-    PHRASAL_WORDS_MODE: PHRASAL_WORDS_MODE,
-    COMMENT: COMMENT,
-    C_LINE_COMMENT_MODE: C_LINE_COMMENT_MODE,
-    C_BLOCK_COMMENT_MODE: C_BLOCK_COMMENT_MODE,
-    HASH_COMMENT_MODE: HASH_COMMENT_MODE,
-    NUMBER_MODE: NUMBER_MODE,
-    C_NUMBER_MODE: C_NUMBER_MODE,
-    BINARY_NUMBER_MODE: BINARY_NUMBER_MODE,
-    REGEXP_MODE: REGEXP_MODE,
-    TITLE_MODE: TITLE_MODE,
-    UNDERSCORE_TITLE_MODE: UNDERSCORE_TITLE_MODE,
-    METHOD_GUARD: METHOD_GUARD,
-    END_SAME_AS_BEGIN: END_SAME_AS_BEGIN
+  __proto__: null,
+  MATCH_NOTHING_RE: MATCH_NOTHING_RE,
+  IDENT_RE: IDENT_RE$1,
+  UNDERSCORE_IDENT_RE: UNDERSCORE_IDENT_RE,
+  NUMBER_RE: NUMBER_RE,
+  C_NUMBER_RE: C_NUMBER_RE,
+  BINARY_NUMBER_RE: BINARY_NUMBER_RE,
+  RE_STARTERS_RE: RE_STARTERS_RE,
+  SHEBANG: SHEBANG,
+  BACKSLASH_ESCAPE: BACKSLASH_ESCAPE,
+  APOS_STRING_MODE: APOS_STRING_MODE,
+  QUOTE_STRING_MODE: QUOTE_STRING_MODE,
+  PHRASAL_WORDS_MODE: PHRASAL_WORDS_MODE,
+  COMMENT: COMMENT,
+  C_LINE_COMMENT_MODE: C_LINE_COMMENT_MODE,
+  C_BLOCK_COMMENT_MODE: C_BLOCK_COMMENT_MODE,
+  HASH_COMMENT_MODE: HASH_COMMENT_MODE,
+  NUMBER_MODE: NUMBER_MODE,
+  C_NUMBER_MODE: C_NUMBER_MODE,
+  BINARY_NUMBER_MODE: BINARY_NUMBER_MODE,
+  REGEXP_MODE: REGEXP_MODE,
+  TITLE_MODE: TITLE_MODE,
+  UNDERSCORE_TITLE_MODE: UNDERSCORE_TITLE_MODE,
+  METHOD_GUARD: METHOD_GUARD,
+  END_SAME_AS_BEGIN: END_SAME_AS_BEGIN
 });
 
 /**
@@ -904,7 +906,7 @@ const DEFAULT_KEYWORD_SCOPE = "keyword";
  * @param {boolean} caseInsensitive
  */
 function compileKeywords(rawKeywords, caseInsensitive, scopeName = DEFAULT_KEYWORD_SCOPE) {
-  /** @type KeywordDict */
+  /** @type {import("highlight.js/private").KeywordDict} */
   const compiledKeywords = Object.create(null);
 
   // input can be a string of keywords, an array of keywords, or a object with
@@ -1563,7 +1565,7 @@ function expandOrCloneMode(mode) {
   return mode;
 }
 
-var version = "11.6.0";
+var version = "11.8.0";
 
 class HTMLInjectionError extends Error {
   constructor(reason, html) {
@@ -1578,6 +1580,7 @@ Syntax highlighting with language autodetection.
 https://highlightjs.org/
 */
 
+
 /**
 @typedef {import('highlight.js').Mode} Mode
 @typedef {import('highlight.js').CompiledMode} CompiledMode
@@ -1787,7 +1790,7 @@ const HLJS = function(hljs) {
             buf += match[0];
           } else {
             const cssClass = language.classNameAliases[kind] || kind;
-            emitter.addKeyword(match[0], cssClass);
+            emitKeyword(match[0], cssClass);
           }
         } else {
           buf += match[0];
@@ -1822,7 +1825,7 @@ const HLJS = function(hljs) {
       if (top.relevance > 0) {
         relevance += result.relevance;
       }
-      emitter.addSublanguage(result._emitter, result.language);
+      emitter.__addSublanguage(result._emitter, result.language);
     }
 
     function processBuffer() {
@@ -1834,6 +1837,18 @@ const HLJS = function(hljs) {
       modeBuffer = '';
     }
 
+    /**
+     * @param {string} text
+     * @param {string} scope
+     */
+    function emitKeyword(keyword, scope) {
+      if (keyword === "") return;
+
+      emitter.startScope(scope);
+      emitter.addText(keyword);
+      emitter.endScope();
+    }
+
     /**
      * @param {CompiledScope} scope
      * @param {RegExpMatchArray} match
@@ -1846,7 +1861,7 @@ const HLJS = function(hljs) {
         const klass = language.classNameAliases[scope[i]] || scope[i];
         const text = match[i];
         if (klass) {
-          emitter.addKeyword(text, klass);
+          emitKeyword(text, klass);
         } else {
           modeBuffer = text;
           processKeywords();
@@ -1867,7 +1882,7 @@ const HLJS = function(hljs) {
       if (mode.beginScope) {
         // beginScope just wraps the begin match itself in a scope
         if (mode.beginScope._wrap) {
-          emitter.addKeyword(modeBuffer, language.classNameAliases[mode.beginScope._wrap] || mode.beginScope._wrap);
+          emitKeyword(modeBuffer, language.classNameAliases[mode.beginScope._wrap] || mode.beginScope._wrap);
           modeBuffer = "";
         } else if (mode.beginScope._multi) {
           // at this point modeBuffer should just be the match
@@ -1978,7 +1993,7 @@ const HLJS = function(hljs) {
       const origin = top;
       if (top.endScope && top.endScope._wrap) {
         processBuffer();
-        emitter.addKeyword(lexeme, top.endScope._wrap);
+        emitKeyword(lexeme, top.endScope._wrap);
       } else if (top.endScope && top.endScope._multi) {
         processBuffer();
         emitMultiClass(top.endScope, match);
@@ -2121,37 +2136,41 @@ const HLJS = function(hljs) {
     let resumeScanAtSamePosition = false;
 
     try {
-      top.matcher.considerAll();
+      if (!language.__emitTokens) {
+        top.matcher.considerAll();
 
-      for (;;) {
-        iterations++;
-        if (resumeScanAtSamePosition) {
-          // only regexes not matched previously will now be
-          // considered for a potential match
-          resumeScanAtSamePosition = false;
-        } else {
-          top.matcher.considerAll();
+        for (;;) {
+          iterations++;
+          if (resumeScanAtSamePosition) {
+            // only regexes not matched previously will now be
+            // considered for a potential match
+            resumeScanAtSamePosition = false;
+          } else {
+            top.matcher.considerAll();
+          }
+          top.matcher.lastIndex = index;
+
+          const match = top.matcher.exec(codeToHighlight);
+          // console.log("match", match[0], match.rule && match.rule.begin)
+
+          if (!match) break;
+
+          const beforeMatch = codeToHighlight.substring(index, match.index);
+          const processedCount = processLexeme(beforeMatch, match);
+          index = match.index + processedCount;
         }
-        top.matcher.lastIndex = index;
-
-        const match = top.matcher.exec(codeToHighlight);
-        // console.log("match", match[0], match.rule && match.rule.begin)
-
-        if (!match) break;
-
-        const beforeMatch = codeToHighlight.substring(index, match.index);
-        const processedCount = processLexeme(beforeMatch, match);
-        index = match.index + processedCount;
+        processLexeme(codeToHighlight.substring(index));
+      } else {
+        language.__emitTokens(codeToHighlight, emitter);
       }
-      processLexeme(codeToHighlight.substring(index));
-      emitter.closeAllNodes();
+
       emitter.finalize();
       result = emitter.toHTML();
 
       return {
         language: languageName,
         value: result,
-        relevance: relevance,
+        relevance,
         illegal: false,
         _emitter: emitter,
         _top: top
@@ -2165,7 +2184,7 @@ const HLJS = function(hljs) {
           relevance: 0,
           _illegalBy: {
             message: err.message,
-            index: index,
+            index,
             context: codeToHighlight.slice(index - 100, index + 100),
             mode: err.mode,
             resultSoFar: result
@@ -2287,7 +2306,7 @@ const HLJS = function(hljs) {
     if (shouldNotHighlight(language)) return;
 
     fire("before:highlightElement",
-      { el: element, language: language });
+      { el: element, language });
 
     // we should be all text, no child nodes (unescaped HTML) - this is possibly
     // an HTML injection attack - it's likely too late if this is already in
@@ -2491,6 +2510,16 @@ const HLJS = function(hljs) {
     plugins.push(plugin);
   }
 
+  /**
+   * @param {HLJSPlugin} plugin
+   */
+  function removePlugin(plugin) {
+    const index = plugins.indexOf(plugin);
+    if (index !== -1) {
+      plugins.splice(index, 1);
+    }
+  }
+
   /**
    *
    * @param {PluginEvent} event
@@ -2534,7 +2563,8 @@ const HLJS = function(hljs) {
     registerAliases,
     autoDetection,
     inherit,
-    addPlugin
+    addPlugin,
+    removePlugin
   });
 
   hljs.debugMode = function() { SAFE_MODE = false; };
@@ -2553,7 +2583,7 @@ const HLJS = function(hljs) {
     // @ts-ignore
     if (typeof MODES$1[key] === "object") {
       // @ts-ignore
-      deepFreezeEs6.exports(MODES$1[key]);
+      deepFreeze(MODES$1[key]);
     }
   }
 
@@ -2563,8 +2593,15 @@ const HLJS = function(hljs) {
   return hljs;
 };
 
+// Other names for the variable may break build script
+const highlight = HLJS({});
+
+// returns a new instance of the highlighter to be used for extensions
+// check https://github.com/wooorm/lowlight/issues/47
+highlight.newInstance = () => HLJS({});
+
 // export an "instance" of the highlighter
-var HighlightJS = HLJS({});
+var HighlightJS = highlight;
 
 /*
 Language: Bash
@@ -2638,7 +2675,7 @@ function bash(hljs) {
     end: /'/
   };
   const ARITHMETIC = {
-    begin: /\$\(\(/,
+    begin: /\$?\(\(/,
     end: /\)\)/,
     contains: [
       {
@@ -2680,12 +2717,14 @@ function bash(hljs) {
     "fi",
     "for",
     "while",
+    "until",
     "in",
     "do",
     "done",
     "case",
     "esac",
-    "function"
+    "function",
+    "select"
   ];
 
   const LITERALS = [
@@ -5479,7 +5518,9 @@ function java(hljs) {
     'requires',
     'exports',
     'do',
-    'sealed'
+    'sealed',
+    'yield',
+    'permits'
   ];
 
   const BUILT_INS = [
@@ -5804,6 +5845,7 @@ const BUILT_IN_VARIABLES = [
   "window",
   "document",
   "localStorage",
+  "sessionStorage",
   "module",
   "global" // Node.js
 ];
@@ -5861,7 +5903,8 @@ function javascript(hljs) {
         nextChar === "<" ||
         // the , gives away that this is not HTML
         // `<T, A extends keyof T, V>`
-        nextChar === ",") {
+        nextChar === ","
+        ) {
         response.ignoreMatch();
         return;
       }
@@ -5879,10 +5922,18 @@ function javascript(hljs) {
       // `<blah />` (self-closing)
       // handled by simpleSelfClosing rule
 
-      // `<From extends string>`
-      // technically this could be HTML, but it smells like a type
       let m;
       const afterMatch = match.input.substring(afterMatchIndex);
+
+      // some more template typing stuff
+      //  <T = any>(key?: string) => Modify<
+      if ((m = afterMatch.match(/^\s*=/))) {
+        response.ignoreMatch();
+        return;
+      }
+
+      // `<From extends string>`
+      // technically this could be HTML, but it smells like a type
       // NOTE: This is ugh, but added specifically for https://github.com/highlightjs/highlight.js/issues/3276
       if ((m = afterMatch.match(/^\s+extends\s+/))) {
         if (m.index === 0) {
@@ -5963,6 +6014,19 @@ function javascript(hljs) {
       subLanguage: 'css'
     }
   };
+  const GRAPHQL_TEMPLATE = {
+    begin: 'gql`',
+    end: '',
+    starts: {
+      end: '`',
+      returnEnd: false,
+      contains: [
+        hljs.BACKSLASH_ESCAPE,
+        SUBST
+      ],
+      subLanguage: 'graphql'
+    }
+  };
   const TEMPLATE_STRING = {
     className: 'string',
     begin: '`',
@@ -6024,7 +6088,10 @@ function javascript(hljs) {
     hljs.QUOTE_STRING_MODE,
     HTML_TEMPLATE,
     CSS_TEMPLATE,
+    GRAPHQL_TEMPLATE,
     TEMPLATE_STRING,
+    // Skip numbers when they are part of a variable name
+    { match: /\$\d+/ },
     NUMBER,
     // This is intentional:
     // See https://github.com/highlightjs/highlight.js/issues/3288
@@ -6174,7 +6241,8 @@ function javascript(hljs) {
       /\b/,
       noneOf([
         ...BUILT_IN_GLOBALS,
-        "super"
+        "super",
+        "import"
       ]),
       IDENT_RE$1, regex.lookahead(/\(/)),
     className: "title.function",
@@ -6238,7 +6306,7 @@ function javascript(hljs) {
   };
 
   return {
-    name: 'Javascript',
+    name: 'JavaScript',
     aliases: ['js', 'jsx', 'mjs', 'cjs'],
     keywords: KEYWORDS$1,
     // this will be extended by TypeScript
@@ -6255,8 +6323,11 @@ function javascript(hljs) {
       hljs.QUOTE_STRING_MODE,
       HTML_TEMPLATE,
       CSS_TEMPLATE,
+      GRAPHQL_TEMPLATE,
       TEMPLATE_STRING,
       COMMENT,
+      // Skip numbers when they are part of a variable name
+      { match: /\$\d+/ },
       NUMBER,
       CLASS_REFERENCE,
       {
@@ -7469,11 +7540,11 @@ function markdown(hljs) {
     contains: [], // defined later
     variants: [
       {
-        begin: /_{2}/,
+        begin: /_{2}(?!\s)/,
         end: /_{2}/
       },
       {
-        begin: /\*{2}/,
+        begin: /\*{2}(?!\s)/,
         end: /\*{2}/
       }
     ]
@@ -7483,11 +7554,11 @@ function markdown(hljs) {
     contains: [], // defined later
     variants: [
       {
-        begin: /\*(?!\*)/,
+        begin: /\*(?![*\s])/,
         end: /\*/
       },
       {
-        begin: /_(?!_)/,
+        begin: /_(?![_\s])/,
         end: /_/,
         relevance: 0
       }
@@ -8344,10 +8415,18 @@ function php(hljs) {
     illegal: null,
     contains: hljs.QUOTE_STRING_MODE.contains.concat(SUBST),
   });
-  const HEREDOC = hljs.END_SAME_AS_BEGIN({
-    begin: /<<<[ \t]*(\w+)\n/,
+
+  const HEREDOC = {
+    begin: /<<<[ \t]*(?:(\w+)|"(\w+)")\n/,
     end: /[ \t]*(\w+)\b/,
     contains: hljs.QUOTE_STRING_MODE.contains.concat(SUBST),
+    'on:begin': (m, resp) => { resp.data._beginMatch = m[1] || m[2]; },
+    'on:end': (m, resp) => { if (resp.data._beginMatch !== m[1]) resp.ignoreMatch(); },
+  };
+
+  const NOWDOC = hljs.END_SAME_AS_BEGIN({
+    begin: /<<<[ \t]*'(\w+)'\n/,
+    end: /[ \t]*(\w+)\b/,
   });
   // list of valid whitespaces because non-breaking space might be part of a IDENT_RE
   const WHITESPACE = '[ \t\n]';
@@ -8356,7 +8435,8 @@ function php(hljs) {
     variants: [
       DOUBLE_QUOTED,
       SINGLE_QUOTED,
-      HEREDOC
+      HEREDOC,
+      NOWDOC
     ]
   };
   const NUMBER = {
@@ -9334,7 +9414,7 @@ function python(hljs) {
     ],
     unicodeRegex: true,
     keywords: KEYWORDS,
-    illegal: /(<\/|->|\?)|=>/,
+    illegal: /(<\/|\?)|=>/,
     contains: [
       PROMPT,
       NUMBER,
@@ -9705,10 +9785,23 @@ function ruby(hljs) {
   )
   ;
   const CLASS_NAME_WITH_NAMESPACE_RE = regex.concat(CLASS_NAME_RE, /(::\w+)*/);
+  // very popular ruby built-ins that one might even assume
+  // are actual keywords (despite that not being the case)
+  const PSEUDO_KWS = [
+    "include",
+    "extend",
+    "prepend",
+    "public",
+    "private",
+    "protected",
+    "raise",
+    "throw"
+  ];
   const RUBY_KEYWORDS = {
     "variable.constant": [
       "__FILE__",
-      "__LINE__"
+      "__LINE__",
+      "__ENCODING__"
     ],
     "variable.language": [
       "self",
@@ -9717,9 +9810,6 @@ function ruby(hljs) {
     keyword: [
       "alias",
       "and",
-      "attr_accessor",
-      "attr_reader",
-      "attr_writer",
       "begin",
       "BEGIN",
       "break",
@@ -9735,7 +9825,6 @@ function ruby(hljs) {
       "for",
       "if",
       "in",
-      "include",
       "module",
       "next",
       "not",
@@ -9752,10 +9841,17 @@ function ruby(hljs) {
       "when",
       "while",
       "yield",
+      ...PSEUDO_KWS
     ],
     built_in: [
       "proc",
-      "lambda"
+      "lambda",
+      "attr_accessor",
+      "attr_reader",
+      "attr_writer",
+      "define_method",
+      "private_constant",
+      "module_function"
     ],
     literal: [
       "true",
@@ -9914,6 +10010,17 @@ function ruby(hljs) {
     ]
   };
 
+  const INCLUDE_EXTEND = {
+    match: [
+      /(include|extend)\s+/,
+      CLASS_NAME_WITH_NAMESPACE_RE
+    ],
+    scope: {
+      2: "title.class"
+    },
+    keywords: RUBY_KEYWORDS
+  };
+
   const CLASS_DEFINITION = {
     variants: [
       {
@@ -9926,7 +10033,7 @@ function ruby(hljs) {
       },
       {
         match: [
-          /class\s+/,
+          /\b(class|module)\s+/,
           CLASS_NAME_WITH_NAMESPACE_RE
         ]
       }
@@ -9962,18 +10069,27 @@ function ruby(hljs) {
     relevance: 0,
     match: [
       CLASS_NAME_WITH_NAMESPACE_RE,
-      /\.new[ (]/
+      /\.new[. (]/
     ],
     scope: {
       1: "title.class"
     }
   };
 
+  // CamelCase
+  const CLASS_REFERENCE = {
+    relevance: 0,
+    match: CLASS_NAME_RE,
+    scope: "title.class"
+  };
+
   const RUBY_DEFAULT_CONTAINS = [
     STRING,
     CLASS_DEFINITION,
+    INCLUDE_EXTEND,
     OBJECT_CREATION,
     UPPER_CASE_CONSTANT,
+    CLASS_REFERENCE,
     METHOD_DEFINITION,
     {
       // swallow namespace qualifiers before symbols
@@ -11165,7 +11281,7 @@ function sql(hljs) {
 
   const VARIABLE = {
     className: "variable",
-    begin: /@[a-z0-9]+/,
+    begin: /@[a-z0-9][a-z0-9_]*/,
   };
 
   const OPERATOR = {
@@ -12134,7 +12250,9 @@ function typescript(hljs) {
     name: 'TypeScript',
     aliases: [
       'ts',
-      'tsx'
+      'tsx',
+      'mts',
+      'cts'
     ]
   });
 
@@ -12629,43 +12747,43 @@ function yaml(hljs) {
 }
 
 var builtIns = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    grmr_bash: bash,
-    grmr_c: c,
-    grmr_cpp: cpp,
-    grmr_csharp: csharp,
-    grmr_css: css,
-    grmr_diff: diff,
-    grmr_go: go,
-    grmr_graphql: graphql,
-    grmr_ini: ini,
-    grmr_java: java,
-    grmr_javascript: javascript,
-    grmr_json: json,
-    grmr_kotlin: kotlin,
-    grmr_less: less,
-    grmr_lua: lua,
-    grmr_makefile: makefile,
-    grmr_xml: xml,
-    grmr_markdown: markdown,
-    grmr_objectivec: objectivec,
-    grmr_perl: perl,
-    grmr_php: php,
-    grmr_php_template: phpTemplate,
-    grmr_plaintext: plaintext,
-    grmr_python: python,
-    grmr_python_repl: pythonRepl,
-    grmr_r: r,
-    grmr_ruby: ruby,
-    grmr_rust: rust,
-    grmr_scss: scss,
-    grmr_shell: shell,
-    grmr_sql: sql,
-    grmr_swift: swift,
-    grmr_typescript: typescript,
-    grmr_vbnet: vbnet,
-    grmr_wasm: wasm,
-    grmr_yaml: yaml
+  __proto__: null,
+  grmr_bash: bash,
+  grmr_c: c,
+  grmr_cpp: cpp,
+  grmr_csharp: csharp,
+  grmr_css: css,
+  grmr_diff: diff,
+  grmr_go: go,
+  grmr_graphql: graphql,
+  grmr_ini: ini,
+  grmr_java: java,
+  grmr_javascript: javascript,
+  grmr_json: json,
+  grmr_kotlin: kotlin,
+  grmr_less: less,
+  grmr_lua: lua,
+  grmr_makefile: makefile,
+  grmr_xml: xml,
+  grmr_markdown: markdown,
+  grmr_objectivec: objectivec,
+  grmr_perl: perl,
+  grmr_php: php,
+  grmr_php_template: phpTemplate,
+  grmr_plaintext: plaintext,
+  grmr_python: python,
+  grmr_python_repl: pythonRepl,
+  grmr_r: r,
+  grmr_ruby: ruby,
+  grmr_rust: rust,
+  grmr_scss: scss,
+  grmr_shell: shell,
+  grmr_sql: sql,
+  grmr_swift: swift,
+  grmr_typescript: typescript,
+  grmr_vbnet: vbnet,
+  grmr_wasm: wasm,
+  grmr_yaml: yaml
 });
 
 const hljs = HighlightJS;
diff --git a/vendor/assets/javascripts/highlightjs/es/highlight.min.js b/vendor/assets/javascripts/highlightjs/es/highlight.min.js
index f8e517c3859..3b497199dd7 100644
--- a/vendor/assets/javascripts/highlightjs/es/highlight.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/highlight.min.js
@@ -1,33 +1,32 @@
 /*!
-  Highlight.js v11.6.0 (git: bed790f3f3)
-  (c) 2006-2022 undefined and other contributors
+  Highlight.js v11.8.0 (git: 65687a907b)
+  (c) 2006-2023 undefined and other contributors
   License: BSD-3-Clause
  */
-var e={exports:{}};function n(e){
-return e instanceof Map?e.clear=e.delete=e.set=()=>{
-throw Error("map is read-only")}:e instanceof Set&&(e.add=e.clear=e.delete=()=>{
+function e(n){return n instanceof Map?n.clear=n.delete=n.set=()=>{
+throw Error("map is read-only")}:n instanceof Set&&(n.add=n.clear=n.delete=()=>{
 throw Error("set is read-only")
-}),Object.freeze(e),Object.getOwnPropertyNames(e).forEach((t=>{var a=e[t]
-;"object"!=typeof a||Object.isFrozen(a)||n(a)})),e}
-e.exports=n,e.exports.default=n;class t{constructor(e){
+}),Object.freeze(n),Object.getOwnPropertyNames(n).forEach((t=>{
+const a=n[t],i=typeof a;"object"!==i&&"function"!==i||Object.isFrozen(a)||e(a)
+})),n}class n{constructor(e){
 void 0===e.data&&(e.data={}),this.data=e.data,this.isMatchIgnored=!1}
-ignoreMatch(){this.isMatchIgnored=!0}}function a(e){
+ignoreMatch(){this.isMatchIgnored=!0}}function t(e){
 return e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#x27;")
-}function i(e,...n){const t=Object.create(null);for(const n in e)t[n]=e[n]
-;return n.forEach((e=>{for(const n in e)t[n]=e[n]})),t}
-const r=e=>!!e.scope||e.sublanguage&&e.language;class s{constructor(e,n){
+}function a(e,...n){const t=Object.create(null);for(const n in e)t[n]=e[n]
+;return n.forEach((e=>{for(const n in e)t[n]=e[n]})),t}const i=e=>!!e.scope
+;class r{constructor(e,n){
 this.buffer="",this.classPrefix=n.classPrefix,e.walk(this)}addText(e){
-this.buffer+=a(e)}openNode(e){if(!r(e))return;let n=""
-;n=e.sublanguage?"language-"+e.language:((e,{prefix:n})=>{if(e.includes(".")){
-const t=e.split(".")
+this.buffer+=t(e)}openNode(e){if(!i(e))return;const n=((e,{prefix:n})=>{
+if(e.startsWith("language:"))return e.replace("language:","language-")
+;if(e.includes(".")){const t=e.split(".")
 ;return[`${n}${t.shift()}`,...t.map(((e,n)=>`${e}${"_".repeat(n+1)}`))].join(" ")
-}return`${n}${e}`})(e.scope,{prefix:this.classPrefix}),this.span(n)}
-closeNode(e){r(e)&&(this.buffer+="</span>")}value(){return this.buffer}span(e){
-this.buffer+=`<span class="${e}">`}}const o=(e={})=>{const n={children:[]}
-;return Object.assign(n,e),n};class l{constructor(){
-this.rootNode=o(),this.stack=[this.rootNode]}get top(){
+}return`${n}${e}`})(e.scope,{prefix:this.classPrefix});this.span(n)}
+closeNode(e){i(e)&&(this.buffer+="</span>")}value(){return this.buffer}span(e){
+this.buffer+=`<span class="${e}">`}}const s=(e={})=>{const n={children:[]}
+;return Object.assign(n,e),n};class o{constructor(){
+this.rootNode=s(),this.stack=[this.rootNode]}get top(){
 return this.stack[this.stack.length-1]}get root(){return this.rootNode}add(e){
-this.top.children.push(e)}openNode(e){const n=o({scope:e})
+this.top.children.push(e)}openNode(e){const n=s({scope:e})
 ;this.add(n),this.stack.push(n)}closeNode(){
 if(this.stack.length>1)return this.stack.pop()}closeAllNodes(){
 for(;this.closeNode(););}toJSON(){return JSON.stringify(this.rootNode,null,4)}
@@ -35,106 +34,105 @@ walk(e){return this.constructor._walk(e,this.rootNode)}static _walk(e,n){
 return"string"==typeof n?e.addText(n):n.children&&(e.openNode(n),
 n.children.forEach((n=>this._walk(e,n))),e.closeNode(n)),e}static _collapse(e){
 "string"!=typeof e&&e.children&&(e.children.every((e=>"string"==typeof e))?e.children=[e.children.join("")]:e.children.forEach((e=>{
-l._collapse(e)})))}}class c extends l{constructor(e){super(),this.options=e}
-addKeyword(e,n){""!==e&&(this.openNode(n),this.addText(e),this.closeNode())}
-addText(e){""!==e&&this.add(e)}addSublanguage(e,n){const t=e.root
-;t.sublanguage=!0,t.language=n,this.add(t)}toHTML(){
-return new s(this,this.options).value()}finalize(){return!0}}function d(e){
-return e?"string"==typeof e?e:e.source:null}function g(e){return m("(?=",e,")")}
-function u(e){return m("(?:",e,")*")}function b(e){return m("(?:",e,")?")}
-function m(...e){return e.map((e=>d(e))).join("")}function p(...e){const n=(e=>{
+o._collapse(e)})))}}class l extends o{constructor(e){super(),this.options=e}
+addText(e){""!==e&&this.add(e)}startScope(e){this.openNode(e)}endScope(){
+this.closeNode()}__addSublanguage(e,n){const t=e.root
+;n&&(t.scope="language:"+n),this.add(t)}toHTML(){
+return new r(this,this.options).value()}finalize(){
+return this.closeAllNodes(),!0}}function c(e){
+return e?"string"==typeof e?e:e.source:null}function d(e){return b("(?=",e,")")}
+function g(e){return b("(?:",e,")*")}function u(e){return b("(?:",e,")?")}
+function b(...e){return e.map((e=>c(e))).join("")}function m(...e){const n=(e=>{
 const n=e[e.length-1]
 ;return"object"==typeof n&&n.constructor===Object?(e.splice(e.length-1,1),n):{}
-})(e);return"("+(n.capture?"":"?:")+e.map((e=>d(e))).join("|")+")"}
-function _(e){return RegExp(e.toString()+"|").exec("").length-1}
-const h=/\[(?:[^\\\]]|\\.)*\]|\(\??|\\([1-9][0-9]*)|\\./
-;function f(e,{joinWith:n}){let t=0;return e.map((e=>{t+=1;const n=t
-;let a=d(e),i="";for(;a.length>0;){const e=h.exec(a);if(!e){i+=a;break}
+})(e);return"("+(n.capture?"":"?:")+e.map((e=>c(e))).join("|")+")"}
+function p(e){return RegExp(e.toString()+"|").exec("").length-1}
+const _=/\[(?:[^\\\]]|\\.)*\]|\(\??|\\([1-9][0-9]*)|\\./
+;function h(e,{joinWith:n}){let t=0;return e.map((e=>{t+=1;const n=t
+;let a=c(e),i="";for(;a.length>0;){const e=_.exec(a);if(!e){i+=a;break}
 i+=a.substring(0,e.index),
 a=a.substring(e.index+e[0].length),"\\"===e[0][0]&&e[1]?i+="\\"+(Number(e[1])+n):(i+=e[0],
 "("===e[0]&&t++)}return i})).map((e=>`(${e})`)).join(n)}
-const E="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",y={
-begin:"\\\\[\\s\\S]",relevance:0},w={scope:"string",begin:"'",end:"'",
-illegal:"\\n",contains:[y]},N={scope:"string",begin:'"',end:'"',illegal:"\\n",
-contains:[y]},v=(e,n,t={})=>{const a=i({scope:"comment",begin:e,end:n,
-contains:[]},t);a.contains.push({scope:"doctag",
+const f="[a-zA-Z]\\w*",E="[a-zA-Z_]\\w*",y="\\b\\d+(\\.\\d+)?",N="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",w="\\b(0b[01]+)",v={
+begin:"\\\\[\\s\\S]",relevance:0},O={scope:"string",begin:"'",end:"'",
+illegal:"\\n",contains:[v]},k={scope:"string",begin:'"',end:'"',illegal:"\\n",
+contains:[v]},x=(e,n,t={})=>{const i=a({scope:"comment",begin:e,end:n,
+contains:[]},t);i.contains.push({scope:"doctag",
 begin:"[ ]*(?=(TODO|FIXME|NOTE|BUG|OPTIMIZE|HACK|XXX):)",
 end:/(TODO|FIXME|NOTE|BUG|OPTIMIZE|HACK|XXX):/,excludeBegin:!0,relevance:0})
-;const r=p("I","a","is","so","us","to","at","if","in","it","on",/[A-Za-z]+['](d|ve|re|ll|t|s|n)/,/[A-Za-z]+[-][a-z]+/,/[A-Za-z][a-z]{2,}/)
-;return a.contains.push({begin:m(/[ ]+/,"(",r,/[.]?[:]?([.][ ]|[ ])/,"){3}")}),a
-},O=v("//","$"),k=v("/\\*","\\*/"),x=v("#","$");var M=Object.freeze({
-__proto__:null,MATCH_NOTHING_RE:/\b\B/,IDENT_RE:"[a-zA-Z]\\w*",
-UNDERSCORE_IDENT_RE:"[a-zA-Z_]\\w*",NUMBER_RE:"\\b\\d+(\\.\\d+)?",C_NUMBER_RE:E,
-BINARY_NUMBER_RE:"\\b(0b[01]+)",
+;const r=m("I","a","is","so","us","to","at","if","in","it","on",/[A-Za-z]+['](d|ve|re|ll|t|s|n)/,/[A-Za-z]+[-][a-z]+/,/[A-Za-z][a-z]{2,}/)
+;return i.contains.push({begin:b(/[ ]+/,"(",r,/[.]?[:]?([.][ ]|[ ])/,"){3}")}),i
+},M=x("//","$"),S=x("/\\*","\\*/"),A=x("#","$");var C=Object.freeze({
+__proto__:null,MATCH_NOTHING_RE:/\b\B/,IDENT_RE:f,UNDERSCORE_IDENT_RE:E,
+NUMBER_RE:y,C_NUMBER_RE:N,BINARY_NUMBER_RE:w,
 RE_STARTERS_RE:"!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",
 SHEBANG:(e={})=>{const n=/^#![ ]*\//
-;return e.binary&&(e.begin=m(n,/.*\b/,e.binary,/\b.*/)),i({scope:"meta",begin:n,
+;return e.binary&&(e.begin=b(n,/.*\b/,e.binary,/\b.*/)),a({scope:"meta",begin:n,
 end:/$/,relevance:0,"on:begin":(e,n)=>{0!==e.index&&n.ignoreMatch()}},e)},
-BACKSLASH_ESCAPE:y,APOS_STRING_MODE:w,QUOTE_STRING_MODE:N,PHRASAL_WORDS_MODE:{
+BACKSLASH_ESCAPE:v,APOS_STRING_MODE:O,QUOTE_STRING_MODE:k,PHRASAL_WORDS_MODE:{
 begin:/\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|they|like|more)\b/
-},COMMENT:v,C_LINE_COMMENT_MODE:O,C_BLOCK_COMMENT_MODE:k,HASH_COMMENT_MODE:x,
-NUMBER_MODE:{scope:"number",begin:"\\b\\d+(\\.\\d+)?",relevance:0},
-C_NUMBER_MODE:{scope:"number",begin:E,relevance:0},BINARY_NUMBER_MODE:{
-scope:"number",begin:"\\b(0b[01]+)",relevance:0},REGEXP_MODE:{
-begin:/(?=\/[^/\n]*\/)/,contains:[{scope:"regexp",begin:/\//,end:/\/[gimuy]*/,
-illegal:/\n/,contains:[y,{begin:/\[/,end:/\]/,relevance:0,contains:[y]}]}]},
-TITLE_MODE:{scope:"title",begin:"[a-zA-Z]\\w*",relevance:0},
-UNDERSCORE_TITLE_MODE:{scope:"title",begin:"[a-zA-Z_]\\w*",relevance:0},
-METHOD_GUARD:{begin:"\\.\\s*[a-zA-Z_]\\w*",relevance:0},
-END_SAME_AS_BEGIN:e=>Object.assign(e,{"on:begin":(e,n)=>{n.data._beginMatch=e[1]
-},"on:end":(e,n)=>{n.data._beginMatch!==e[1]&&n.ignoreMatch()}})})
-;function S(e,n){"."===e.input[e.index-1]&&n.ignoreMatch()}function A(e,n){
-void 0!==e.className&&(e.scope=e.className,delete e.className)}function C(e,n){
+},COMMENT:x,C_LINE_COMMENT_MODE:M,C_BLOCK_COMMENT_MODE:S,HASH_COMMENT_MODE:A,
+NUMBER_MODE:{scope:"number",begin:y,relevance:0},C_NUMBER_MODE:{scope:"number",
+begin:N,relevance:0},BINARY_NUMBER_MODE:{scope:"number",begin:w,relevance:0},
+REGEXP_MODE:{begin:/(?=\/[^/\n]*\/)/,contains:[{scope:"regexp",begin:/\//,
+end:/\/[gimuy]*/,illegal:/\n/,contains:[v,{begin:/\[/,end:/\]/,relevance:0,
+contains:[v]}]}]},TITLE_MODE:{scope:"title",begin:f,relevance:0},
+UNDERSCORE_TITLE_MODE:{scope:"title",begin:E,relevance:0},METHOD_GUARD:{
+begin:"\\.\\s*"+E,relevance:0},END_SAME_AS_BEGIN:e=>Object.assign(e,{
+"on:begin":(e,n)=>{n.data._beginMatch=e[1]},"on:end":(e,n)=>{
+n.data._beginMatch!==e[1]&&n.ignoreMatch()}})});function T(e,n){
+"."===e.input[e.index-1]&&n.ignoreMatch()}function R(e,n){
+void 0!==e.className&&(e.scope=e.className,delete e.className)}function D(e,n){
 n&&e.beginKeywords&&(e.begin="\\b("+e.beginKeywords.split(" ").join("|")+")(?!\\.)(?=\\b|\\s)",
-e.__beforeBegin=S,e.keywords=e.keywords||e.beginKeywords,delete e.beginKeywords,
-void 0===e.relevance&&(e.relevance=0))}function T(e,n){
-Array.isArray(e.illegal)&&(e.illegal=p(...e.illegal))}function R(e,n){
+e.__beforeBegin=T,e.keywords=e.keywords||e.beginKeywords,delete e.beginKeywords,
+void 0===e.relevance&&(e.relevance=0))}function I(e,n){
+Array.isArray(e.illegal)&&(e.illegal=m(...e.illegal))}function L(e,n){
 if(e.match){
 if(e.begin||e.end)throw Error("begin & end are not supported with match")
-;e.begin=e.match,delete e.match}}function D(e,n){
-void 0===e.relevance&&(e.relevance=1)}const I=(e,n)=>{if(!e.beforeMatch)return
+;e.begin=e.match,delete e.match}}function B(e,n){
+void 0===e.relevance&&(e.relevance=1)}const $=(e,n)=>{if(!e.beforeMatch)return
 ;if(e.starts)throw Error("beforeMatch cannot be used with starts")
 ;const t=Object.assign({},e);Object.keys(e).forEach((n=>{delete e[n]
-})),e.keywords=t.keywords,e.begin=m(t.beforeMatch,g(t.begin)),e.starts={
+})),e.keywords=t.keywords,e.begin=b(t.beforeMatch,d(t.begin)),e.starts={
 relevance:0,contains:[Object.assign(t,{endsParent:!0})]
 },e.relevance=0,delete t.beforeMatch
-},L=["of","and","for","in","not","or","if","then","parent","list","value"]
-;function B(e,n,t="keyword"){const a=Object.create(null)
+},z=["of","and","for","in","not","or","if","then","parent","list","value"],F="keyword"
+;function U(e,n,t=F){const a=Object.create(null)
 ;return"string"==typeof e?i(t,e.split(" ")):Array.isArray(e)?i(t,e):Object.keys(e).forEach((t=>{
-Object.assign(a,B(e[t],n,t))})),a;function i(e,t){
+Object.assign(a,U(e[t],n,t))})),a;function i(e,t){
 n&&(t=t.map((e=>e.toLowerCase()))),t.forEach((n=>{const t=n.split("|")
-;a[t[0]]=[e,$(t[0],t[1])]}))}}function $(e,n){
-return n?Number(n):(e=>L.includes(e.toLowerCase()))(e)?0:1}const z={},F=e=>{
-console.error(e)},U=(e,...n)=>{console.log("WARN: "+e,...n)},j=(e,n)=>{
-z[`${e}/${n}`]||(console.log(`Deprecated as of ${e}. ${n}`),z[`${e}/${n}`]=!0)
-},P=Error();function K(e,n,{key:t}){let a=0;const i=e[t],r={},s={}
-;for(let e=1;e<=n.length;e++)s[e+a]=i[e],r[e+a]=!0,a+=_(n[e-1])
-;e[t]=s,e[t]._emit=r,e[t]._multi=!0}function H(e){(e=>{
+;a[t[0]]=[e,j(t[0],t[1])]}))}}function j(e,n){
+return n?Number(n):(e=>z.includes(e.toLowerCase()))(e)?0:1}const P={},K=e=>{
+console.error(e)},q=(e,...n)=>{console.log("WARN: "+e,...n)},H=(e,n)=>{
+P[`${e}/${n}`]||(console.log(`Deprecated as of ${e}. ${n}`),P[`${e}/${n}`]=!0)
+},G=Error();function Z(e,n,{key:t}){let a=0;const i=e[t],r={},s={}
+;for(let e=1;e<=n.length;e++)s[e+a]=i[e],r[e+a]=!0,a+=p(n[e-1])
+;e[t]=s,e[t]._emit=r,e[t]._multi=!0}function W(e){(e=>{
 e.scope&&"object"==typeof e.scope&&null!==e.scope&&(e.beginScope=e.scope,
 delete e.scope)})(e),"string"==typeof e.beginScope&&(e.beginScope={
 _wrap:e.beginScope}),"string"==typeof e.endScope&&(e.endScope={_wrap:e.endScope
 }),(e=>{if(Array.isArray(e.begin)){
-if(e.skip||e.excludeBegin||e.returnBegin)throw F("skip, excludeBegin, returnBegin not compatible with beginScope: {}"),
-P
-;if("object"!=typeof e.beginScope||null===e.beginScope)throw F("beginScope must be object"),
-P;K(e,e.begin,{key:"beginScope"}),e.begin=f(e.begin,{joinWith:""})}})(e),(e=>{
+if(e.skip||e.excludeBegin||e.returnBegin)throw K("skip, excludeBegin, returnBegin not compatible with beginScope: {}"),
+G
+;if("object"!=typeof e.beginScope||null===e.beginScope)throw K("beginScope must be object"),
+G;Z(e,e.begin,{key:"beginScope"}),e.begin=h(e.begin,{joinWith:""})}})(e),(e=>{
 if(Array.isArray(e.end)){
-if(e.skip||e.excludeEnd||e.returnEnd)throw F("skip, excludeEnd, returnEnd not compatible with endScope: {}"),
-P
-;if("object"!=typeof e.endScope||null===e.endScope)throw F("endScope must be object"),
-P;K(e,e.end,{key:"endScope"}),e.end=f(e.end,{joinWith:""})}})(e)}function q(e){
+if(e.skip||e.excludeEnd||e.returnEnd)throw K("skip, excludeEnd, returnEnd not compatible with endScope: {}"),
+G
+;if("object"!=typeof e.endScope||null===e.endScope)throw K("endScope must be object"),
+G;Z(e,e.end,{key:"endScope"}),e.end=h(e.end,{joinWith:""})}})(e)}function Q(e){
 function n(n,t){
-return RegExp(d(n),"m"+(e.case_insensitive?"i":"")+(e.unicodeRegex?"u":"")+(t?"g":""))
+return RegExp(c(n),"m"+(e.case_insensitive?"i":"")+(e.unicodeRegex?"u":"")+(t?"g":""))
 }class t{constructor(){
 this.matchIndexes={},this.regexes=[],this.matchAt=1,this.position=0}
 addRule(e,n){
 n.position=this.position++,this.matchIndexes[this.matchAt]=n,this.regexes.push([n,e]),
-this.matchAt+=_(e)+1}compile(){0===this.regexes.length&&(this.exec=()=>null)
-;const e=this.regexes.map((e=>e[1]));this.matcherRe=n(f(e,{joinWith:"|"
+this.matchAt+=p(e)+1}compile(){0===this.regexes.length&&(this.exec=()=>null)
+;const e=this.regexes.map((e=>e[1]));this.matcherRe=n(h(e,{joinWith:"|"
 }),!0),this.lastIndex=0}exec(e){this.matcherRe.lastIndex=this.lastIndex
 ;const n=this.matcherRe.exec(e);if(!n)return null
 ;const t=n.findIndex(((e,n)=>n>0&&void 0!==e)),a=this.matchIndexes[t]
-;return n.splice(0,t),Object.assign(n,a)}}class a{constructor(){
+;return n.splice(0,t),Object.assign(n,a)}}class i{constructor(){
 this.rules=[],this.multiRegexes=[],
 this.count=0,this.lastIndex=0,this.regexIndex=0}getMatcher(e){
 if(this.multiRegexes[e])return this.multiRegexes[e];const n=new t
@@ -150,161 +148,163 @@ return t&&(this.regexIndex+=t.position+1,
 this.regexIndex===this.count&&this.considerAll()),t}}
 if(e.compilerExtensions||(e.compilerExtensions=[]),
 e.contains&&e.contains.includes("self"))throw Error("ERR: contains `self` is not supported at the top-level of a language.  See documentation.")
-;return e.classNameAliases=i(e.classNameAliases||{}),function t(r,s){const o=r
+;return e.classNameAliases=a(e.classNameAliases||{}),function t(r,s){const o=r
 ;if(r.isCompiled)return o
-;[A,R,H,I].forEach((e=>e(r,s))),e.compilerExtensions.forEach((e=>e(r,s))),
-r.__beforeBegin=null,[C,T,D].forEach((e=>e(r,s))),r.isCompiled=!0;let l=null
+;[R,L,W,$].forEach((e=>e(r,s))),e.compilerExtensions.forEach((e=>e(r,s))),
+r.__beforeBegin=null,[D,I,B].forEach((e=>e(r,s))),r.isCompiled=!0;let l=null
 ;return"object"==typeof r.keywords&&r.keywords.$pattern&&(r.keywords=Object.assign({},r.keywords),
 l=r.keywords.$pattern,
-delete r.keywords.$pattern),l=l||/\w+/,r.keywords&&(r.keywords=B(r.keywords,e.case_insensitive)),
+delete r.keywords.$pattern),l=l||/\w+/,r.keywords&&(r.keywords=U(r.keywords,e.case_insensitive)),
 o.keywordPatternRe=n(l,!0),
 s&&(r.begin||(r.begin=/\B|\b/),o.beginRe=n(o.begin),r.end||r.endsWithParent||(r.end=/\B|\b/),
 r.end&&(o.endRe=n(o.end)),
-o.terminatorEnd=d(o.end)||"",r.endsWithParent&&s.terminatorEnd&&(o.terminatorEnd+=(r.end?"|":"")+s.terminatorEnd)),
+o.terminatorEnd=c(o.end)||"",r.endsWithParent&&s.terminatorEnd&&(o.terminatorEnd+=(r.end?"|":"")+s.terminatorEnd)),
 r.illegal&&(o.illegalRe=n(r.illegal)),
-r.contains||(r.contains=[]),r.contains=[].concat(...r.contains.map((e=>(e=>(e.variants&&!e.cachedVariants&&(e.cachedVariants=e.variants.map((n=>i(e,{
-variants:null},n)))),e.cachedVariants?e.cachedVariants:Z(e)?i(e,{
-starts:e.starts?i(e.starts):null
-}):Object.isFrozen(e)?i(e):e))("self"===e?r:e)))),r.contains.forEach((e=>{t(e,o)
-})),r.starts&&t(r.starts,s),o.matcher=(e=>{const n=new a
+r.contains||(r.contains=[]),r.contains=[].concat(...r.contains.map((e=>(e=>(e.variants&&!e.cachedVariants&&(e.cachedVariants=e.variants.map((n=>a(e,{
+variants:null},n)))),e.cachedVariants?e.cachedVariants:X(e)?a(e,{
+starts:e.starts?a(e.starts):null
+}):Object.isFrozen(e)?a(e):e))("self"===e?r:e)))),r.contains.forEach((e=>{t(e,o)
+})),r.starts&&t(r.starts,s),o.matcher=(e=>{const n=new i
 ;return e.contains.forEach((e=>n.addRule(e.begin,{rule:e,type:"begin"
 }))),e.terminatorEnd&&n.addRule(e.terminatorEnd,{type:"end"
-}),e.illegal&&n.addRule(e.illegal,{type:"illegal"}),n})(o),o}(e)}function Z(e){
-return!!e&&(e.endsWithParent||Z(e.starts))}class G extends Error{
+}),e.illegal&&n.addRule(e.illegal,{type:"illegal"}),n})(o),o}(e)}function X(e){
+return!!e&&(e.endsWithParent||X(e.starts))}class V extends Error{
 constructor(e,n){super(e),this.name="HTMLInjectionError",this.html=n}}
-const W=a,Q=i,X=Symbol("nomatch");var V=(n=>{
+const J=t,Y=a,ee=Symbol("nomatch"),ne=t=>{
 const a=Object.create(null),i=Object.create(null),r=[];let s=!0
-;const o="Could not find the language '{}', did you forget to load/include a language module?",l={
-disableAutodetect:!0,name:"Plain text",contains:[]};let d={
+;const o="Could not find the language '{}', did you forget to load/include a language module?",c={
+disableAutodetect:!0,name:"Plain text",contains:[]};let p={
 ignoreUnescapedHTML:!1,throwUnescapedHTML:!1,noHighlightRe:/^(no-?highlight)$/i,
 languageDetectRe:/\blang(?:uage)?-([\w-]+)\b/i,classPrefix:"hljs-",
-cssSelector:"pre code",languages:null,__emitter:c};function _(e){
-return d.noHighlightRe.test(e)}function h(e,n,t){let a="",i=""
+cssSelector:"pre code",languages:null,__emitter:l};function _(e){
+return p.noHighlightRe.test(e)}function h(e,n,t){let a="",i=""
 ;"object"==typeof n?(a=e,
-t=n.ignoreIllegals,i=n.language):(j("10.7.0","highlight(lang, code, ...args) has been deprecated."),
-j("10.7.0","Please use highlight(code, options) instead.\nhttps://github.com/highlightjs/highlight.js/issues/2277"),
+t=n.ignoreIllegals,i=n.language):(H("10.7.0","highlight(lang, code, ...args) has been deprecated."),
+H("10.7.0","Please use highlight(code, options) instead.\nhttps://github.com/highlightjs/highlight.js/issues/2277"),
 i=e,a=n),void 0===t&&(t=!0);const r={code:a,language:i};x("before:highlight",r)
 ;const s=r.result?r.result:f(r.language,r.code,t)
-;return s.code=r.code,x("after:highlight",s),s}function f(e,n,i,r){
-const l=Object.create(null);function c(){if(!k.keywords)return void M.addText(S)
-;let e=0;k.keywordPatternRe.lastIndex=0;let n=k.keywordPatternRe.exec(S),t=""
-;for(;n;){t+=S.substring(e,n.index)
-;const i=w.case_insensitive?n[0].toLowerCase():n[0],r=(a=i,k.keywords[a]);if(r){
+;return s.code=r.code,x("after:highlight",s),s}function f(e,t,i,r){
+const l=Object.create(null);function c(){if(!x.keywords)return void S.addText(A)
+;let e=0;x.keywordPatternRe.lastIndex=0;let n=x.keywordPatternRe.exec(A),t=""
+;for(;n;){t+=A.substring(e,n.index)
+;const i=w.case_insensitive?n[0].toLowerCase():n[0],r=(a=i,x.keywords[a]);if(r){
 const[e,a]=r
-;if(M.addText(t),t="",l[i]=(l[i]||0)+1,l[i]<=7&&(A+=a),e.startsWith("_"))t+=n[0];else{
-const t=w.classNameAliases[e]||e;M.addKeyword(n[0],t)}}else t+=n[0]
-;e=k.keywordPatternRe.lastIndex,n=k.keywordPatternRe.exec(S)}var a
-;t+=S.substring(e),M.addText(t)}function g(){null!=k.subLanguage?(()=>{
-if(""===S)return;let e=null;if("string"==typeof k.subLanguage){
-if(!a[k.subLanguage])return void M.addText(S)
-;e=f(k.subLanguage,S,!0,x[k.subLanguage]),x[k.subLanguage]=e._top
-}else e=E(S,k.subLanguage.length?k.subLanguage:null)
-;k.relevance>0&&(A+=e.relevance),M.addSublanguage(e._emitter,e.language)
-})():c(),S=""}function u(e,n){let t=1;const a=n.length-1;for(;t<=a;){
-if(!e._emit[t]){t++;continue}const a=w.classNameAliases[e[t]]||e[t],i=n[t]
-;a?M.addKeyword(i,a):(S=i,c(),S=""),t++}}function b(e,n){
-return e.scope&&"string"==typeof e.scope&&M.openNode(w.classNameAliases[e.scope]||e.scope),
-e.beginScope&&(e.beginScope._wrap?(M.addKeyword(S,w.classNameAliases[e.beginScope._wrap]||e.beginScope._wrap),
-S=""):e.beginScope._multi&&(u(e.beginScope,n),S="")),k=Object.create(e,{parent:{
-value:k}}),k}function m(e,n,a){let i=((e,n)=>{const t=e&&e.exec(n)
-;return t&&0===t.index})(e.endRe,a);if(i){if(e["on:end"]){const a=new t(e)
-;e["on:end"](n,a),a.isMatchIgnored&&(i=!1)}if(i){
+;if(S.addText(t),t="",l[i]=(l[i]||0)+1,l[i]<=7&&(C+=a),e.startsWith("_"))t+=n[0];else{
+const t=w.classNameAliases[e]||e;g(n[0],t)}}else t+=n[0]
+;e=x.keywordPatternRe.lastIndex,n=x.keywordPatternRe.exec(A)}var a
+;t+=A.substring(e),S.addText(t)}function d(){null!=x.subLanguage?(()=>{
+if(""===A)return;let e=null;if("string"==typeof x.subLanguage){
+if(!a[x.subLanguage])return void S.addText(A)
+;e=f(x.subLanguage,A,!0,M[x.subLanguage]),M[x.subLanguage]=e._top
+}else e=E(A,x.subLanguage.length?x.subLanguage:null)
+;x.relevance>0&&(C+=e.relevance),S.__addSublanguage(e._emitter,e.language)
+})():c(),A=""}function g(e,n){
+""!==e&&(S.startScope(n),S.addText(e),S.endScope())}function u(e,n){let t=1
+;const a=n.length-1;for(;t<=a;){if(!e._emit[t]){t++;continue}
+const a=w.classNameAliases[e[t]]||e[t],i=n[t];a?g(i,a):(A=i,c(),A=""),t++}}
+function b(e,n){
+return e.scope&&"string"==typeof e.scope&&S.openNode(w.classNameAliases[e.scope]||e.scope),
+e.beginScope&&(e.beginScope._wrap?(g(A,w.classNameAliases[e.beginScope._wrap]||e.beginScope._wrap),
+A=""):e.beginScope._multi&&(u(e.beginScope,n),A="")),x=Object.create(e,{parent:{
+value:x}}),x}function m(e,t,a){let i=((e,n)=>{const t=e&&e.exec(n)
+;return t&&0===t.index})(e.endRe,a);if(i){if(e["on:end"]){const a=new n(e)
+;e["on:end"](t,a),a.isMatchIgnored&&(i=!1)}if(i){
 for(;e.endsParent&&e.parent;)e=e.parent;return e}}
-if(e.endsWithParent)return m(e.parent,n,a)}function p(e){
-return 0===k.matcher.regexIndex?(S+=e[0],1):(R=!0,0)}function _(e){
-const t=e[0],a=n.substring(e.index),i=m(k,e,a);if(!i)return X;const r=k
-;k.endScope&&k.endScope._wrap?(g(),
-M.addKeyword(t,k.endScope._wrap)):k.endScope&&k.endScope._multi?(g(),
-u(k.endScope,e)):r.skip?S+=t:(r.returnEnd||r.excludeEnd||(S+=t),
-g(),r.excludeEnd&&(S=t));do{
-k.scope&&M.closeNode(),k.skip||k.subLanguage||(A+=k.relevance),k=k.parent
-}while(k!==i.parent);return i.starts&&b(i.starts,e),r.returnEnd?0:t.length}
-let h={};function y(a,r){const o=r&&r[0];if(S+=a,null==o)return g(),0
-;if("begin"===h.type&&"end"===r.type&&h.index===r.index&&""===o){
-if(S+=n.slice(r.index,r.index+1),!s){const n=Error(`0 width match regex (${e})`)
-;throw n.languageName=e,n.badRule=h.rule,n}return 1}
-if(h=r,"begin"===r.type)return(e=>{
-const n=e[0],a=e.rule,i=new t(a),r=[a.__beforeBegin,a["on:begin"]]
-;for(const t of r)if(t&&(t(e,i),i.isMatchIgnored))return p(n)
-;return a.skip?S+=n:(a.excludeBegin&&(S+=n),
-g(),a.returnBegin||a.excludeBegin||(S=n)),b(a,e),a.returnBegin?0:n.length})(r)
+if(e.endsWithParent)return m(e.parent,t,a)}function _(e){
+return 0===x.matcher.regexIndex?(A+=e[0],1):(D=!0,0)}function h(e){
+const n=e[0],a=t.substring(e.index),i=m(x,e,a);if(!i)return ee;const r=x
+;x.endScope&&x.endScope._wrap?(d(),
+g(n,x.endScope._wrap)):x.endScope&&x.endScope._multi?(d(),
+u(x.endScope,e)):r.skip?A+=n:(r.returnEnd||r.excludeEnd||(A+=n),
+d(),r.excludeEnd&&(A=n));do{
+x.scope&&S.closeNode(),x.skip||x.subLanguage||(C+=x.relevance),x=x.parent
+}while(x!==i.parent);return i.starts&&b(i.starts,e),r.returnEnd?0:n.length}
+let y={};function N(a,r){const o=r&&r[0];if(A+=a,null==o)return d(),0
+;if("begin"===y.type&&"end"===r.type&&y.index===r.index&&""===o){
+if(A+=t.slice(r.index,r.index+1),!s){const n=Error(`0 width match regex (${e})`)
+;throw n.languageName=e,n.badRule=y.rule,n}return 1}
+if(y=r,"begin"===r.type)return(e=>{
+const t=e[0],a=e.rule,i=new n(a),r=[a.__beforeBegin,a["on:begin"]]
+;for(const n of r)if(n&&(n(e,i),i.isMatchIgnored))return _(t)
+;return a.skip?A+=t:(a.excludeBegin&&(A+=t),
+d(),a.returnBegin||a.excludeBegin||(A=t)),b(a,e),a.returnBegin?0:t.length})(r)
 ;if("illegal"===r.type&&!i){
-const e=Error('Illegal lexeme "'+o+'" for mode "'+(k.scope||"<unnamed>")+'"')
-;throw e.mode=k,e}if("end"===r.type){const e=_(r);if(e!==X)return e}
+const e=Error('Illegal lexeme "'+o+'" for mode "'+(x.scope||"<unnamed>")+'"')
+;throw e.mode=x,e}if("end"===r.type){const e=h(r);if(e!==ee)return e}
 if("illegal"===r.type&&""===o)return 1
-;if(T>1e5&&T>3*r.index)throw Error("potential infinite loop, way more iterations than matches")
-;return S+=o,o.length}const w=v(e)
-;if(!w)throw F(o.replace("{}",e)),Error('Unknown language: "'+e+'"')
-;const N=q(w);let O="",k=r||N;const x={},M=new d.__emitter(d);(()=>{const e=[]
-;for(let n=k;n!==w;n=n.parent)n.scope&&e.unshift(n.scope)
-;e.forEach((e=>M.openNode(e)))})();let S="",A=0,C=0,T=0,R=!1;try{
-for(k.matcher.considerAll();;){
-T++,R?R=!1:k.matcher.considerAll(),k.matcher.lastIndex=C
-;const e=k.matcher.exec(n);if(!e)break;const t=y(n.substring(C,e.index),e)
-;C=e.index+t}
-return y(n.substring(C)),M.closeAllNodes(),M.finalize(),O=M.toHTML(),{
-language:e,value:O,relevance:A,illegal:!1,_emitter:M,_top:k}}catch(t){
-if(t.message&&t.message.includes("Illegal"))return{language:e,value:W(n),
-illegal:!0,relevance:0,_illegalBy:{message:t.message,index:C,
-context:n.slice(C-100,C+100),mode:t.mode,resultSoFar:O},_emitter:M};if(s)return{
-language:e,value:W(n),illegal:!1,relevance:0,errorRaised:t,_emitter:M,_top:k}
-;throw t}}function E(e,n){n=n||d.languages||Object.keys(a);const t=(e=>{
-const n={value:W(e),illegal:!1,relevance:0,_top:l,_emitter:new d.__emitter(d)}
+;if(R>1e5&&R>3*r.index)throw Error("potential infinite loop, way more iterations than matches")
+;return A+=o,o.length}const w=v(e)
+;if(!w)throw K(o.replace("{}",e)),Error('Unknown language: "'+e+'"')
+;const O=Q(w);let k="",x=r||O;const M={},S=new p.__emitter(p);(()=>{const e=[]
+;for(let n=x;n!==w;n=n.parent)n.scope&&e.unshift(n.scope)
+;e.forEach((e=>S.openNode(e)))})();let A="",C=0,T=0,R=0,D=!1;try{
+if(w.__emitTokens)w.__emitTokens(t,S);else{for(x.matcher.considerAll();;){
+R++,D?D=!1:x.matcher.considerAll(),x.matcher.lastIndex=T
+;const e=x.matcher.exec(t);if(!e)break;const n=N(t.substring(T,e.index),e)
+;T=e.index+n}N(t.substring(T))}return S.finalize(),k=S.toHTML(),{language:e,
+value:k,relevance:C,illegal:!1,_emitter:S,_top:x}}catch(n){
+if(n.message&&n.message.includes("Illegal"))return{language:e,value:J(t),
+illegal:!0,relevance:0,_illegalBy:{message:n.message,index:T,
+context:t.slice(T-100,T+100),mode:n.mode,resultSoFar:k},_emitter:S};if(s)return{
+language:e,value:J(t),illegal:!1,relevance:0,errorRaised:n,_emitter:S,_top:x}
+;throw n}}function E(e,n){n=n||p.languages||Object.keys(a);const t=(e=>{
+const n={value:J(e),illegal:!1,relevance:0,_top:c,_emitter:new p.__emitter(p)}
 ;return n._emitter.addText(e),n})(e),i=n.filter(v).filter(k).map((n=>f(n,e,!1)))
 ;i.unshift(t);const r=i.sort(((e,n)=>{
 if(e.relevance!==n.relevance)return n.relevance-e.relevance
 ;if(e.language&&n.language){if(v(e.language).supersetOf===n.language)return 1
-;if(v(n.language).supersetOf===e.language)return-1}return 0})),[s,o]=r,c=s
-;return c.secondBest=o,c}function y(e){let n=null;const t=(e=>{
+;if(v(n.language).supersetOf===e.language)return-1}return 0})),[s,o]=r,l=s
+;return l.secondBest=o,l}function y(e){let n=null;const t=(e=>{
 let n=e.className+" ";n+=e.parentNode?e.parentNode.className:""
-;const t=d.languageDetectRe.exec(n);if(t){const n=v(t[1])
-;return n||(U(o.replace("{}",t[1])),
-U("Falling back to no-highlight mode for this block.",e)),n?t[1]:"no-highlight"}
+;const t=p.languageDetectRe.exec(n);if(t){const n=v(t[1])
+;return n||(q(o.replace("{}",t[1])),
+q("Falling back to no-highlight mode for this block.",e)),n?t[1]:"no-highlight"}
 return n.split(/\s+/).find((e=>_(e)||v(e)))})(e);if(_(t))return
 ;if(x("before:highlightElement",{el:e,language:t
-}),e.children.length>0&&(d.ignoreUnescapedHTML||(console.warn("One of your code blocks includes unescaped HTML. This is a potentially serious security risk."),
+}),e.children.length>0&&(p.ignoreUnescapedHTML||(console.warn("One of your code blocks includes unescaped HTML. This is a potentially serious security risk."),
 console.warn("https://github.com/highlightjs/highlight.js/wiki/security"),
 console.warn("The element with unescaped HTML:"),
-console.warn(e)),d.throwUnescapedHTML))throw new G("One of your code blocks includes unescaped HTML.",e.innerHTML)
+console.warn(e)),p.throwUnescapedHTML))throw new V("One of your code blocks includes unescaped HTML.",e.innerHTML)
 ;n=e;const a=n.textContent,r=t?h(a,{language:t,ignoreIllegals:!0}):E(a)
 ;e.innerHTML=r.value,((e,n,t)=>{const a=n&&i[n]||t
 ;e.classList.add("hljs"),e.classList.add("language-"+a)
 })(e,t,r.language),e.result={language:r.language,re:r.relevance,
 relevance:r.relevance},r.secondBest&&(e.secondBest={
 language:r.secondBest.language,relevance:r.secondBest.relevance
-}),x("after:highlightElement",{el:e,result:r,text:a})}let w=!1;function N(){
-"loading"!==document.readyState?document.querySelectorAll(d.cssSelector).forEach(y):w=!0
+}),x("after:highlightElement",{el:e,result:r,text:a})}let N=!1;function w(){
+"loading"!==document.readyState?document.querySelectorAll(p.cssSelector).forEach(y):N=!0
 }function v(e){return e=(e||"").toLowerCase(),a[e]||a[i[e]]}
 function O(e,{languageName:n}){"string"==typeof e&&(e=[e]),e.forEach((e=>{
 i[e.toLowerCase()]=n}))}function k(e){const n=v(e)
 ;return n&&!n.disableAutodetect}function x(e,n){const t=e;r.forEach((e=>{
 e[t]&&e[t](n)}))}
 "undefined"!=typeof window&&window.addEventListener&&window.addEventListener("DOMContentLoaded",(()=>{
-w&&N()}),!1),Object.assign(n,{highlight:h,highlightAuto:E,highlightAll:N,
+N&&w()}),!1),Object.assign(t,{highlight:h,highlightAuto:E,highlightAll:w,
 highlightElement:y,
-highlightBlock:e=>(j("10.7.0","highlightBlock will be removed entirely in v12.0"),
-j("10.7.0","Please use highlightElement now."),y(e)),configure:e=>{d=Q(d,e)},
+highlightBlock:e=>(H("10.7.0","highlightBlock will be removed entirely in v12.0"),
+H("10.7.0","Please use highlightElement now."),y(e)),configure:e=>{p=Y(p,e)},
 initHighlighting:()=>{
-N(),j("10.6.0","initHighlighting() deprecated.  Use highlightAll() now.")},
+w(),H("10.6.0","initHighlighting() deprecated.  Use highlightAll() now.")},
 initHighlightingOnLoad:()=>{
-N(),j("10.6.0","initHighlightingOnLoad() deprecated.  Use highlightAll() now.")
-},registerLanguage:(e,t)=>{let i=null;try{i=t(n)}catch(n){
-if(F("Language definition for '{}' could not be registered.".replace("{}",e)),
-!s)throw n;F(n),i=l}
-i.name||(i.name=e),a[e]=i,i.rawDefinition=t.bind(null,n),i.aliases&&O(i.aliases,{
+w(),H("10.6.0","initHighlightingOnLoad() deprecated.  Use highlightAll() now.")
+},registerLanguage:(e,n)=>{let i=null;try{i=n(t)}catch(n){
+if(K("Language definition for '{}' could not be registered.".replace("{}",e)),
+!s)throw n;K(n),i=c}
+i.name||(i.name=e),a[e]=i,i.rawDefinition=n.bind(null,t),i.aliases&&O(i.aliases,{
 languageName:e})},unregisterLanguage:e=>{delete a[e]
 ;for(const n of Object.keys(i))i[n]===e&&delete i[n]},
 listLanguages:()=>Object.keys(a),getLanguage:v,registerAliases:O,
-autoDetection:k,inherit:Q,addPlugin:e=>{(e=>{
+autoDetection:k,inherit:Y,addPlugin:e=>{(e=>{
 e["before:highlightBlock"]&&!e["before:highlightElement"]&&(e["before:highlightElement"]=n=>{
 e["before:highlightBlock"](Object.assign({block:n.el},n))
 }),e["after:highlightBlock"]&&!e["after:highlightElement"]&&(e["after:highlightElement"]=n=>{
-e["after:highlightBlock"](Object.assign({block:n.el},n))})})(e),r.push(e)}
-}),n.debugMode=()=>{s=!1},n.safeMode=()=>{s=!0
-},n.versionString="11.6.0",n.regex={concat:m,lookahead:g,either:p,optional:b,
-anyNumberOfTimes:u};for(const n in M)"object"==typeof M[n]&&e.exports(M[n])
-;return Object.assign(n,M),n})({});const J=e=>({IMPORTANT:{scope:"meta",
-begin:"!important"},BLOCK_COMMENT:e.C_BLOCK_COMMENT_MODE,HEXCOLOR:{
+e["after:highlightBlock"](Object.assign({block:n.el},n))})})(e),r.push(e)},
+removePlugin:e=>{const n=r.indexOf(e);-1!==n&&r.splice(n,1)}}),t.debugMode=()=>{
+s=!1},t.safeMode=()=>{s=!0},t.versionString="11.8.0",t.regex={concat:b,
+lookahead:d,either:m,optional:u,anyNumberOfTimes:g}
+;for(const n in C)"object"==typeof C[n]&&e(C[n]);return Object.assign(t,C),t
+},te=ne({});te.newInstance=()=>ne({});var ae=te;const ie=e=>({IMPORTANT:{
+scope:"meta",begin:"!important"},BLOCK_COMMENT:e.C_BLOCK_COMMENT_MODE,HEXCOLOR:{
 scope:"number",begin:/#(([0-9a-fA-F]{3,4})|(([0-9a-fA-F]{2}){3,4}))\b/},
 FUNCTION_DISPATCH:{className:"built_in",begin:/[\w-]+(?=\()/},
 ATTRIBUTE_SELECTOR_MODE:{scope:"selector-attr",begin:/\[/,end:/\]/,illegal:"$",
@@ -312,190 +312,192 @@ contains:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]},CSS_NUMBER_MODE:{
 scope:"number",
 begin:e.NUMBER_RE+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",
 relevance:0},CSS_VARIABLE:{className:"attr",begin:/--[A-Za-z][A-Za-z0-9_-]*/}
-}),Y=["a","abbr","address","article","aside","audio","b","blockquote","body","button","canvas","caption","cite","code","dd","del","details","dfn","div","dl","dt","em","fieldset","figcaption","figure","footer","form","h1","h2","h3","h4","h5","h6","header","hgroup","html","i","iframe","img","input","ins","kbd","label","legend","li","main","mark","menu","nav","object","ol","p","q","quote","samp","section","span","strong","summary","sup","table","tbody","td","textarea","tfoot","th","thead","time","tr","ul","var","video"],ee=["any-hover","any-pointer","aspect-ratio","color","color-gamut","color-index","device-aspect-ratio","device-height","device-width","display-mode","forced-colors","grid","height","hover","inverted-colors","monochrome","orientation","overflow-block","overflow-inline","pointer","prefers-color-scheme","prefers-contrast","prefers-reduced-motion","prefers-reduced-transparency","resolution","scan","scripting","update","width","min-width","max-width","min-height","max-height"],ne=["active","any-link","blank","checked","current","default","defined","dir","disabled","drop","empty","enabled","first","first-child","first-of-type","fullscreen","future","focus","focus-visible","focus-within","has","host","host-context","hover","indeterminate","in-range","invalid","is","lang","last-child","last-of-type","left","link","local-link","not","nth-child","nth-col","nth-last-child","nth-last-col","nth-last-of-type","nth-of-type","only-child","only-of-type","optional","out-of-range","past","placeholder-shown","read-only","read-write","required","right","root","scope","target","target-within","user-invalid","valid","visited","where"],te=["after","backdrop","before","cue","cue-region","first-letter","first-line","grammar-error","marker","part","placeholder","selection","slotted","spelling-error"],ae=["align-content","align-items","align-self","all","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","backface-visibility","background","background-attachment","background-blend-mode","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","block-size","border","border-block","border-block-color","border-block-end","border-block-end-color","border-block-end-style","border-block-end-width","border-block-start","border-block-start-color","border-block-start-style","border-block-start-width","border-block-style","border-block-width","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-inline","border-inline-color","border-inline-end","border-inline-end-color","border-inline-end-style","border-inline-end-width","border-inline-start","border-inline-start-color","border-inline-start-style","border-inline-start-width","border-inline-style","border-inline-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","caret-color","clear","clip","clip-path","clip-rule","color","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","contain","content","content-visibility","counter-increment","counter-reset","cue","cue-after","cue-before","cursor","direction","display","empty-cells","filter","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","flow","font","font-display","font-family","font-feature-settings","font-kerning","font-language-override","font-size","font-size-adjust","font-smoothing","font-stretch","font-style","font-synthesis","font-variant","font-variant-caps","font-variant-east-asian","font-variant-ligatures","font-variant-numeric","font-variant-position","font-variation-settings","font-weight","gap","glyph-orientation-vertical","grid","grid-area","grid-auto-columns","grid-auto-flow","grid-auto-rows","grid-column","grid-column-end","grid-column-start","grid-gap","grid-row","grid-row-end","grid-row-start","grid-template","grid-template-areas","grid-template-columns","grid-template-rows","hanging-punctuation","height","hyphens","icon","image-orientation","image-rendering","image-resolution","ime-mode","inline-size","isolation","justify-content","left","letter-spacing","line-break","line-height","list-style","list-style-image","list-style-position","list-style-type","margin","margin-block","margin-block-end","margin-block-start","margin-bottom","margin-inline","margin-inline-end","margin-inline-start","margin-left","margin-right","margin-top","marks","mask","mask-border","mask-border-mode","mask-border-outset","mask-border-repeat","mask-border-slice","mask-border-source","mask-border-width","mask-clip","mask-composite","mask-image","mask-mode","mask-origin","mask-position","mask-repeat","mask-size","mask-type","max-block-size","max-height","max-inline-size","max-width","min-block-size","min-height","min-inline-size","min-width","mix-blend-mode","nav-down","nav-index","nav-left","nav-right","nav-up","none","normal","object-fit","object-position","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-wrap","overflow-x","overflow-y","padding","padding-block","padding-block-end","padding-block-start","padding-bottom","padding-inline","padding-inline-end","padding-inline-start","padding-left","padding-right","padding-top","page-break-after","page-break-before","page-break-inside","pause","pause-after","pause-before","perspective","perspective-origin","pointer-events","position","quotes","resize","rest","rest-after","rest-before","right","row-gap","scroll-margin","scroll-margin-block","scroll-margin-block-end","scroll-margin-block-start","scroll-margin-bottom","scroll-margin-inline","scroll-margin-inline-end","scroll-margin-inline-start","scroll-margin-left","scroll-margin-right","scroll-margin-top","scroll-padding","scroll-padding-block","scroll-padding-block-end","scroll-padding-block-start","scroll-padding-bottom","scroll-padding-inline","scroll-padding-inline-end","scroll-padding-inline-start","scroll-padding-left","scroll-padding-right","scroll-padding-top","scroll-snap-align","scroll-snap-stop","scroll-snap-type","scrollbar-color","scrollbar-gutter","scrollbar-width","shape-image-threshold","shape-margin","shape-outside","speak","speak-as","src","tab-size","table-layout","text-align","text-align-all","text-align-last","text-combine-upright","text-decoration","text-decoration-color","text-decoration-line","text-decoration-style","text-emphasis","text-emphasis-color","text-emphasis-position","text-emphasis-style","text-indent","text-justify","text-orientation","text-overflow","text-rendering","text-shadow","text-transform","text-underline-position","top","transform","transform-box","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","vertical-align","visibility","voice-balance","voice-duration","voice-family","voice-pitch","voice-range","voice-rate","voice-stress","voice-volume","white-space","widows","width","will-change","word-break","word-spacing","word-wrap","writing-mode","z-index"].reverse(),ie=ne.concat(te)
-;var re="\\.([0-9](_*[0-9])*)",se="[0-9a-fA-F](_*[0-9a-fA-F])*",oe={
+}),re=["a","abbr","address","article","aside","audio","b","blockquote","body","button","canvas","caption","cite","code","dd","del","details","dfn","div","dl","dt","em","fieldset","figcaption","figure","footer","form","h1","h2","h3","h4","h5","h6","header","hgroup","html","i","iframe","img","input","ins","kbd","label","legend","li","main","mark","menu","nav","object","ol","p","q","quote","samp","section","span","strong","summary","sup","table","tbody","td","textarea","tfoot","th","thead","time","tr","ul","var","video"],se=["any-hover","any-pointer","aspect-ratio","color","color-gamut","color-index","device-aspect-ratio","device-height","device-width","display-mode","forced-colors","grid","height","hover","inverted-colors","monochrome","orientation","overflow-block","overflow-inline","pointer","prefers-color-scheme","prefers-contrast","prefers-reduced-motion","prefers-reduced-transparency","resolution","scan","scripting","update","width","min-width","max-width","min-height","max-height"],oe=["active","any-link","blank","checked","current","default","defined","dir","disabled","drop","empty","enabled","first","first-child","first-of-type","fullscreen","future","focus","focus-visible","focus-within","has","host","host-context","hover","indeterminate","in-range","invalid","is","lang","last-child","last-of-type","left","link","local-link","not","nth-child","nth-col","nth-last-child","nth-last-col","nth-last-of-type","nth-of-type","only-child","only-of-type","optional","out-of-range","past","placeholder-shown","read-only","read-write","required","right","root","scope","target","target-within","user-invalid","valid","visited","where"],le=["after","backdrop","before","cue","cue-region","first-letter","first-line","grammar-error","marker","part","placeholder","selection","slotted","spelling-error"],ce=["align-content","align-items","align-self","all","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","backface-visibility","background","background-attachment","background-blend-mode","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","block-size","border","border-block","border-block-color","border-block-end","border-block-end-color","border-block-end-style","border-block-end-width","border-block-start","border-block-start-color","border-block-start-style","border-block-start-width","border-block-style","border-block-width","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-inline","border-inline-color","border-inline-end","border-inline-end-color","border-inline-end-style","border-inline-end-width","border-inline-start","border-inline-start-color","border-inline-start-style","border-inline-start-width","border-inline-style","border-inline-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","caret-color","clear","clip","clip-path","clip-rule","color","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","contain","content","content-visibility","counter-increment","counter-reset","cue","cue-after","cue-before","cursor","direction","display","empty-cells","filter","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","flow","font","font-display","font-family","font-feature-settings","font-kerning","font-language-override","font-size","font-size-adjust","font-smoothing","font-stretch","font-style","font-synthesis","font-variant","font-variant-caps","font-variant-east-asian","font-variant-ligatures","font-variant-numeric","font-variant-position","font-variation-settings","font-weight","gap","glyph-orientation-vertical","grid","grid-area","grid-auto-columns","grid-auto-flow","grid-auto-rows","grid-column","grid-column-end","grid-column-start","grid-gap","grid-row","grid-row-end","grid-row-start","grid-template","grid-template-areas","grid-template-columns","grid-template-rows","hanging-punctuation","height","hyphens","icon","image-orientation","image-rendering","image-resolution","ime-mode","inline-size","isolation","justify-content","left","letter-spacing","line-break","line-height","list-style","list-style-image","list-style-position","list-style-type","margin","margin-block","margin-block-end","margin-block-start","margin-bottom","margin-inline","margin-inline-end","margin-inline-start","margin-left","margin-right","margin-top","marks","mask","mask-border","mask-border-mode","mask-border-outset","mask-border-repeat","mask-border-slice","mask-border-source","mask-border-width","mask-clip","mask-composite","mask-image","mask-mode","mask-origin","mask-position","mask-repeat","mask-size","mask-type","max-block-size","max-height","max-inline-size","max-width","min-block-size","min-height","min-inline-size","min-width","mix-blend-mode","nav-down","nav-index","nav-left","nav-right","nav-up","none","normal","object-fit","object-position","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-wrap","overflow-x","overflow-y","padding","padding-block","padding-block-end","padding-block-start","padding-bottom","padding-inline","padding-inline-end","padding-inline-start","padding-left","padding-right","padding-top","page-break-after","page-break-before","page-break-inside","pause","pause-after","pause-before","perspective","perspective-origin","pointer-events","position","quotes","resize","rest","rest-after","rest-before","right","row-gap","scroll-margin","scroll-margin-block","scroll-margin-block-end","scroll-margin-block-start","scroll-margin-bottom","scroll-margin-inline","scroll-margin-inline-end","scroll-margin-inline-start","scroll-margin-left","scroll-margin-right","scroll-margin-top","scroll-padding","scroll-padding-block","scroll-padding-block-end","scroll-padding-block-start","scroll-padding-bottom","scroll-padding-inline","scroll-padding-inline-end","scroll-padding-inline-start","scroll-padding-left","scroll-padding-right","scroll-padding-top","scroll-snap-align","scroll-snap-stop","scroll-snap-type","scrollbar-color","scrollbar-gutter","scrollbar-width","shape-image-threshold","shape-margin","shape-outside","speak","speak-as","src","tab-size","table-layout","text-align","text-align-all","text-align-last","text-combine-upright","text-decoration","text-decoration-color","text-decoration-line","text-decoration-style","text-emphasis","text-emphasis-color","text-emphasis-position","text-emphasis-style","text-indent","text-justify","text-orientation","text-overflow","text-rendering","text-shadow","text-transform","text-underline-position","top","transform","transform-box","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","vertical-align","visibility","voice-balance","voice-duration","voice-family","voice-pitch","voice-range","voice-rate","voice-stress","voice-volume","white-space","widows","width","will-change","word-break","word-spacing","word-wrap","writing-mode","z-index"].reverse(),de=oe.concat(le)
+;var ge="[0-9](_*[0-9])*",ue=`\\.(${ge})`,be="[0-9a-fA-F](_*[0-9a-fA-F])*",me={
 className:"number",variants:[{
-begin:`(\\b([0-9](_*[0-9])*)((${re})|\\.)?|(${re}))[eE][+-]?([0-9](_*[0-9])*)[fFdD]?\\b`
-},{begin:`\\b([0-9](_*[0-9])*)((${re})[fFdD]?\\b|\\.([fFdD]\\b)?)`},{
-begin:`(${re})[fFdD]?\\b`},{begin:"\\b([0-9](_*[0-9])*)[fFdD]\\b"},{
-begin:`\\b0[xX]((${se})\\.?|(${se})?\\.(${se}))[pP][+-]?([0-9](_*[0-9])*)[fFdD]?\\b`
-},{begin:"\\b(0|[1-9](_*[0-9])*)[lL]?\\b"},{begin:`\\b0[xX](${se})[lL]?\\b`},{
+begin:`(\\b(${ge})((${ue})|\\.)?|(${ue}))[eE][+-]?(${ge})[fFdD]?\\b`},{
+begin:`\\b(${ge})((${ue})[fFdD]?\\b|\\.([fFdD]\\b)?)`},{
+begin:`(${ue})[fFdD]?\\b`},{begin:`\\b(${ge})[fFdD]\\b`},{
+begin:`\\b0[xX]((${be})\\.?|(${be})?\\.(${be}))[pP][+-]?(${ge})[fFdD]?\\b`},{
+begin:"\\b(0|[1-9](_*[0-9])*)[lL]?\\b"},{begin:`\\b0[xX](${be})[lL]?\\b`},{
 begin:"\\b0(_*[0-7])*[lL]?\\b"},{begin:"\\b0[bB][01](_*[01])*[lL]?\\b"}],
-relevance:0};function le(e,n,t){return-1===t?"":e.replace(n,(a=>le(e,n,t-1)))}
-const ce="[A-Za-z$_][0-9A-Za-z$_]*",de=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],ge=["true","false","null","undefined","NaN","Infinity"],ue=["Object","Function","Boolean","Symbol","Math","Date","Number","BigInt","String","RegExp","Array","Float32Array","Float64Array","Int8Array","Uint8Array","Uint8ClampedArray","Int16Array","Int32Array","Uint16Array","Uint32Array","BigInt64Array","BigUint64Array","Set","Map","WeakSet","WeakMap","ArrayBuffer","SharedArrayBuffer","Atomics","DataView","JSON","Promise","Generator","GeneratorFunction","AsyncFunction","Reflect","Proxy","Intl","WebAssembly"],be=["Error","EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"],me=["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],pe=["arguments","this","super","console","window","document","localStorage","module","global"],_e=[].concat(me,ue,be)
-;function he(e){const n=e.regex,t=ce,a={begin:/<[A-Za-z0-9\\._:-]+/,
+relevance:0};function pe(e,n,t){return-1===t?"":e.replace(n,(a=>pe(e,n,t-1)))}
+const _e="[A-Za-z$_][0-9A-Za-z$_]*",he=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],fe=["true","false","null","undefined","NaN","Infinity"],Ee=["Object","Function","Boolean","Symbol","Math","Date","Number","BigInt","String","RegExp","Array","Float32Array","Float64Array","Int8Array","Uint8Array","Uint8ClampedArray","Int16Array","Int32Array","Uint16Array","Uint32Array","BigInt64Array","BigUint64Array","Set","Map","WeakSet","WeakMap","ArrayBuffer","SharedArrayBuffer","Atomics","DataView","JSON","Promise","Generator","GeneratorFunction","AsyncFunction","Reflect","Proxy","Intl","WebAssembly"],ye=["Error","EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"],Ne=["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],we=["arguments","this","super","console","window","document","localStorage","sessionStorage","module","global"],ve=[].concat(Ne,Ee,ye)
+;function Oe(e){const n=e.regex,t=_e,a={begin:/<[A-Za-z0-9\\._:-]+/,
 end:/\/[A-Za-z0-9\\._:-]+>|\/>/,isTrulyOpeningTag:(e,n)=>{
 const t=e[0].length+e.index,a=e.input[t]
 ;if("<"===a||","===a)return void n.ignoreMatch();let i
 ;">"===a&&(((e,{after:n})=>{const t="</"+e[0].slice(1)
-;return-1!==e.input.indexOf(t,n)})(e,{after:t
-})||n.ignoreMatch()),(i=e.input.substring(t).match(/^\s+extends\s+/))&&0===i.index&&n.ignoreMatch()
-}},i={$pattern:ce,keyword:de,literal:ge,built_in:_e,"variable.language":pe
-},r="\\.([0-9](_?[0-9])*)",s="0|[1-9](_?[0-9])*|0[0-7]*[89][0-9]*",o={
+;return-1!==e.input.indexOf(t,n)})(e,{after:t})||n.ignoreMatch())
+;const r=e.input.substring(t)
+;((i=r.match(/^\s*=/))||(i=r.match(/^\s+extends\s+/))&&0===i.index)&&n.ignoreMatch()
+}},i={$pattern:_e,keyword:he,literal:fe,built_in:ve,"variable.language":we
+},r="[0-9](_?[0-9])*",s=`\\.(${r})`,o="0|[1-9](_?[0-9])*|0[0-7]*[89][0-9]*",l={
 className:"number",variants:[{
-begin:`(\\b(${s})((${r})|\\.)?|(${r}))[eE][+-]?([0-9](_?[0-9])*)\\b`},{
-begin:`\\b(${s})\\b((${r})\\b|\\.)?|(${r})\\b`},{
+begin:`(\\b(${o})((${s})|\\.)?|(${s}))[eE][+-]?(${r})\\b`},{
+begin:`\\b(${o})\\b((${s})\\b|\\.)?|(${s})\\b`},{
 begin:"\\b(0|[1-9](_?[0-9])*)n\\b"},{
 begin:"\\b0[xX][0-9a-fA-F](_?[0-9a-fA-F])*n?\\b"},{
 begin:"\\b0[bB][0-1](_?[0-1])*n?\\b"},{begin:"\\b0[oO][0-7](_?[0-7])*n?\\b"},{
-begin:"\\b0[0-7]+n?\\b"}],relevance:0},l={className:"subst",begin:"\\$\\{",
-end:"\\}",keywords:i,contains:[]},c={begin:"html`",end:"",starts:{end:"`",
-returnEnd:!1,contains:[e.BACKSLASH_ESCAPE,l],subLanguage:"xml"}},d={
+begin:"\\b0[0-7]+n?\\b"}],relevance:0},c={className:"subst",begin:"\\$\\{",
+end:"\\}",keywords:i,contains:[]},d={begin:"html`",end:"",starts:{end:"`",
+returnEnd:!1,contains:[e.BACKSLASH_ESCAPE,c],subLanguage:"xml"}},g={
 begin:"css`",end:"",starts:{end:"`",returnEnd:!1,
-contains:[e.BACKSLASH_ESCAPE,l],subLanguage:"css"}},g={className:"string",
-begin:"`",end:"`",contains:[e.BACKSLASH_ESCAPE,l]},u={className:"comment",
+contains:[e.BACKSLASH_ESCAPE,c],subLanguage:"css"}},u={begin:"gql`",end:"",
+starts:{end:"`",returnEnd:!1,contains:[e.BACKSLASH_ESCAPE,c],
+subLanguage:"graphql"}},b={className:"string",begin:"`",end:"`",
+contains:[e.BACKSLASH_ESCAPE,c]},m={className:"comment",
 variants:[e.COMMENT(/\/\*\*(?!\/)/,"\\*/",{relevance:0,contains:[{
 begin:"(?=@[A-Za-z]+)",relevance:0,contains:[{className:"doctag",
 begin:"@[A-Za-z]+"},{className:"type",begin:"\\{",end:"\\}",excludeEnd:!0,
 excludeBegin:!0,relevance:0},{className:"variable",begin:t+"(?=\\s*(-)|$)",
 endsParent:!0,relevance:0},{begin:/(?=[^\n])\s/,relevance:0}]}]
 }),e.C_BLOCK_COMMENT_MODE,e.C_LINE_COMMENT_MODE]
-},b=[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,c,d,g,o];l.contains=b.concat({
-begin:/\{/,end:/\}/,keywords:i,contains:["self"].concat(b)})
-;const m=[].concat(u,l.contains),p=m.concat([{begin:/\(/,end:/\)/,keywords:i,
-contains:["self"].concat(m)}]),_={className:"params",begin:/\(/,end:/\)/,
-excludeBegin:!0,excludeEnd:!0,keywords:i,contains:p},h={variants:[{
+},p=[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,d,g,u,b,{match:/\$\d+/},l]
+;c.contains=p.concat({begin:/\{/,end:/\}/,keywords:i,contains:["self"].concat(p)
+});const _=[].concat(m,c.contains),h=_.concat([{begin:/\(/,end:/\)/,keywords:i,
+contains:["self"].concat(_)}]),f={className:"params",begin:/\(/,end:/\)/,
+excludeBegin:!0,excludeEnd:!0,keywords:i,contains:h},E={variants:[{
 match:[/class/,/\s+/,t,/\s+/,/extends/,/\s+/,n.concat(t,"(",n.concat(/\./,t),")*")],
 scope:{1:"keyword",3:"title.class",5:"keyword",7:"title.class.inherited"}},{
-match:[/class/,/\s+/,t],scope:{1:"keyword",3:"title.class"}}]},f={relevance:0,
+match:[/class/,/\s+/,t],scope:{1:"keyword",3:"title.class"}}]},y={relevance:0,
 match:n.either(/\bJSON/,/\b[A-Z][a-z]+([A-Z][a-z]*|\d)*/,/\b[A-Z]{2,}([A-Z][a-z]+|\d)+([A-Z][a-z]*)*/,/\b[A-Z]{2,}[a-z]+([A-Z][a-z]+|\d)*([A-Z][a-z]*)*/),
-className:"title.class",keywords:{_:[...ue,...be]}},E={variants:[{
+className:"title.class",keywords:{_:[...Ee,...ye]}},N={variants:[{
 match:[/function/,/\s+/,t,/(?=\s*\()/]},{match:[/function/,/\s*(?=\()/]}],
-className:{1:"keyword",3:"title.function"},label:"func.def",contains:[_],
-illegal:/%/},y={
-match:n.concat(/\b/,(w=[...me,"super"],n.concat("(?!",w.join("|"),")")),t,n.lookahead(/\(/)),
-className:"title.function",relevance:0};var w;const N={
+className:{1:"keyword",3:"title.function"},label:"func.def",contains:[f],
+illegal:/%/},w={
+match:n.concat(/\b/,(v=[...Ne,"super","import"],n.concat("(?!",v.join("|"),")")),t,n.lookahead(/\(/)),
+className:"title.function",relevance:0};var v;const O={
 begin:n.concat(/\./,n.lookahead(n.concat(t,/(?![0-9A-Za-z$_(])/))),end:t,
-excludeBegin:!0,keywords:"prototype",className:"property",relevance:0},v={
+excludeBegin:!0,keywords:"prototype",className:"property",relevance:0},k={
 match:[/get|set/,/\s+/,t,/(?=\()/],className:{1:"keyword",3:"title.function"},
-contains:[{begin:/\(\)/},_]
-},O="(\\([^()]*(\\([^()]*(\\([^()]*\\)[^()]*)*\\)[^()]*)*\\)|"+e.UNDERSCORE_IDENT_RE+")\\s*=>",k={
-match:[/const|var|let/,/\s+/,t,/\s*/,/=\s*/,/(async\s*)?/,n.lookahead(O)],
-keywords:"async",className:{1:"keyword",3:"title.function"},contains:[_]}
-;return{name:"Javascript",aliases:["js","jsx","mjs","cjs"],keywords:i,exports:{
-PARAMS_CONTAINS:p,CLASS_REFERENCE:f},illegal:/#(?![$_A-z])/,
+contains:[{begin:/\(\)/},f]
+},x="(\\([^()]*(\\([^()]*(\\([^()]*\\)[^()]*)*\\)[^()]*)*\\)|"+e.UNDERSCORE_IDENT_RE+")\\s*=>",M={
+match:[/const|var|let/,/\s+/,t,/\s*/,/=\s*/,/(async\s*)?/,n.lookahead(x)],
+keywords:"async",className:{1:"keyword",3:"title.function"},contains:[f]}
+;return{name:"JavaScript",aliases:["js","jsx","mjs","cjs"],keywords:i,exports:{
+PARAMS_CONTAINS:h,CLASS_REFERENCE:y},illegal:/#(?![$_A-z])/,
 contains:[e.SHEBANG({label:"shebang",binary:"node",relevance:5}),{
 label:"use_strict",className:"meta",relevance:10,
 begin:/^\s*['"]use (strict|asm)['"]/
-},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,c,d,g,u,o,f,{className:"attr",
-begin:t+n.lookahead(":"),relevance:0},k,{
+},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,d,g,u,b,m,{match:/\$\d+/},l,y,{
+className:"attr",begin:t+n.lookahead(":"),relevance:0},M,{
 begin:"("+e.RE_STARTERS_RE+"|\\b(case|return|throw)\\b)\\s*",
-keywords:"return throw case",relevance:0,contains:[u,e.REGEXP_MODE,{
-className:"function",begin:O,returnBegin:!0,end:"\\s*=>",contains:[{
+keywords:"return throw case",relevance:0,contains:[m,e.REGEXP_MODE,{
+className:"function",begin:x,returnBegin:!0,end:"\\s*=>",contains:[{
 className:"params",variants:[{begin:e.UNDERSCORE_IDENT_RE,relevance:0},{
 className:null,begin:/\(\s*\)/,skip:!0},{begin:/\(/,end:/\)/,excludeBegin:!0,
-excludeEnd:!0,keywords:i,contains:p}]}]},{begin:/,/,relevance:0},{match:/\s+/,
+excludeEnd:!0,keywords:i,contains:h}]}]},{begin:/,/,relevance:0},{match:/\s+/,
 relevance:0},{variants:[{begin:"<>",end:"</>"},{
 match:/<[A-Za-z0-9\\._:-]+\s*\/>/},{begin:a.begin,
 "on:begin":a.isTrulyOpeningTag,end:a.end}],subLanguage:"xml",contains:[{
-begin:a.begin,end:a.end,skip:!0,contains:["self"]}]}]},E,{
+begin:a.begin,end:a.end,skip:!0,contains:["self"]}]}]},N,{
 beginKeywords:"while if switch catch for"},{
 begin:"\\b(?!function)"+e.UNDERSCORE_IDENT_RE+"\\([^()]*(\\([^()]*(\\([^()]*\\)[^()]*)*\\)[^()]*)*\\)\\s*\\{",
-returnBegin:!0,label:"func.def",contains:[_,e.inherit(e.TITLE_MODE,{begin:t,
-className:"title.function"})]},{match:/\.\.\./,relevance:0},N,{match:"\\$"+t,
+returnBegin:!0,label:"func.def",contains:[f,e.inherit(e.TITLE_MODE,{begin:t,
+className:"title.function"})]},{match:/\.\.\./,relevance:0},O,{match:"\\$"+t,
 relevance:0},{match:[/\bconstructor(?=\s*\()/],className:{1:"title.function"},
-contains:[_]},y,{relevance:0,match:/\b[A-Z][A-Z_0-9]+\b/,
-className:"variable.constant"},h,v,{match:/\$[(.]/}]}}
-const fe=e=>m(/\b/,e,/\w$/.test(e)?/\b/:/\B/),Ee=["Protocol","Type"].map(fe),ye=["init","self"].map(fe),we=["Any","Self"],Ne=["actor","any","associatedtype","async","await",/as\?/,/as!/,"as","break","case","catch","class","continue","convenience","default","defer","deinit","didSet","distributed","do","dynamic","else","enum","extension","fallthrough",/fileprivate\(set\)/,"fileprivate","final","for","func","get","guard","if","import","indirect","infix",/init\?/,/init!/,"inout",/internal\(set\)/,"internal","in","is","isolated","nonisolated","lazy","let","mutating","nonmutating",/open\(set\)/,"open","operator","optional","override","postfix","precedencegroup","prefix",/private\(set\)/,"private","protocol",/public\(set\)/,"public","repeat","required","rethrows","return","set","some","static","struct","subscript","super","switch","throws","throw",/try\?/,/try!/,"try","typealias",/unowned\(safe\)/,/unowned\(unsafe\)/,"unowned","var","weak","where","while","willSet"],ve=["false","nil","true"],Oe=["assignment","associativity","higherThan","left","lowerThan","none","right"],ke=["#colorLiteral","#column","#dsohandle","#else","#elseif","#endif","#error","#file","#fileID","#fileLiteral","#filePath","#function","#if","#imageLiteral","#keyPath","#line","#selector","#sourceLocation","#warn_unqualified_access","#warning"],xe=["abs","all","any","assert","assertionFailure","debugPrint","dump","fatalError","getVaList","isKnownUniquelyReferenced","max","min","numericCast","pointwiseMax","pointwiseMin","precondition","preconditionFailure","print","readLine","repeatElement","sequence","stride","swap","swift_unboxFromSwiftValueWithType","transcode","type","unsafeBitCast","unsafeDowncast","withExtendedLifetime","withUnsafeMutablePointer","withUnsafePointer","withVaList","withoutActuallyEscaping","zip"],Me=p(/[/=\-+!*%<>&|^~?]/,/[\u00A1-\u00A7]/,/[\u00A9\u00AB]/,/[\u00AC\u00AE]/,/[\u00B0\u00B1]/,/[\u00B6\u00BB\u00BF\u00D7\u00F7]/,/[\u2016-\u2017]/,/[\u2020-\u2027]/,/[\u2030-\u203E]/,/[\u2041-\u2053]/,/[\u2055-\u205E]/,/[\u2190-\u23FF]/,/[\u2500-\u2775]/,/[\u2794-\u2BFF]/,/[\u2E00-\u2E7F]/,/[\u3001-\u3003]/,/[\u3008-\u3020]/,/[\u3030]/),Se=p(Me,/[\u0300-\u036F]/,/[\u1DC0-\u1DFF]/,/[\u20D0-\u20FF]/,/[\uFE00-\uFE0F]/,/[\uFE20-\uFE2F]/),Ae=m(Me,Se,"*"),Ce=p(/[a-zA-Z_]/,/[\u00A8\u00AA\u00AD\u00AF\u00B2-\u00B5\u00B7-\u00BA]/,/[\u00BC-\u00BE\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF]/,/[\u0100-\u02FF\u0370-\u167F\u1681-\u180D\u180F-\u1DBF]/,/[\u1E00-\u1FFF]/,/[\u200B-\u200D\u202A-\u202E\u203F-\u2040\u2054\u2060-\u206F]/,/[\u2070-\u20CF\u2100-\u218F\u2460-\u24FF\u2776-\u2793]/,/[\u2C00-\u2DFF\u2E80-\u2FFF]/,/[\u3004-\u3007\u3021-\u302F\u3031-\u303F\u3040-\uD7FF]/,/[\uF900-\uFD3D\uFD40-\uFDCF\uFDF0-\uFE1F\uFE30-\uFE44]/,/[\uFE47-\uFEFE\uFF00-\uFFFD]/),Te=p(Ce,/\d/,/[\u0300-\u036F\u1DC0-\u1DFF\u20D0-\u20FF\uFE20-\uFE2F]/),Re=m(Ce,Te,"*"),De=m(/[A-Z]/,Te,"*"),Ie=["autoclosure",m(/convention\(/,p("swift","block","c"),/\)/),"discardableResult","dynamicCallable","dynamicMemberLookup","escaping","frozen","GKInspectable","IBAction","IBDesignable","IBInspectable","IBOutlet","IBSegueAction","inlinable","main","nonobjc","NSApplicationMain","NSCopying","NSManaged",m(/objc\(/,Re,/\)/),"objc","objcMembers","propertyWrapper","requires_stored_property_inits","resultBuilder","testable","UIApplicationMain","unknown","usableFromInline"],Le=["iOS","iOSApplicationExtension","macOS","macOSApplicationExtension","macCatalyst","macCatalystApplicationExtension","watchOS","watchOSApplicationExtension","tvOS","tvOSApplicationExtension","swift"]
-;var Be=Object.freeze({__proto__:null,grmr_bash:e=>{const n=e.regex,t={},a={
+contains:[f]},w,{relevance:0,match:/\b[A-Z][A-Z_0-9]+\b/,
+className:"variable.constant"},E,k,{match:/\$[(.]/}]}}
+const ke=e=>b(/\b/,e,/\w$/.test(e)?/\b/:/\B/),xe=["Protocol","Type"].map(ke),Me=["init","self"].map(ke),Se=["Any","Self"],Ae=["actor","any","associatedtype","async","await",/as\?/,/as!/,"as","break","case","catch","class","continue","convenience","default","defer","deinit","didSet","distributed","do","dynamic","else","enum","extension","fallthrough",/fileprivate\(set\)/,"fileprivate","final","for","func","get","guard","if","import","indirect","infix",/init\?/,/init!/,"inout",/internal\(set\)/,"internal","in","is","isolated","nonisolated","lazy","let","mutating","nonmutating",/open\(set\)/,"open","operator","optional","override","postfix","precedencegroup","prefix",/private\(set\)/,"private","protocol",/public\(set\)/,"public","repeat","required","rethrows","return","set","some","static","struct","subscript","super","switch","throws","throw",/try\?/,/try!/,"try","typealias",/unowned\(safe\)/,/unowned\(unsafe\)/,"unowned","var","weak","where","while","willSet"],Ce=["false","nil","true"],Te=["assignment","associativity","higherThan","left","lowerThan","none","right"],Re=["#colorLiteral","#column","#dsohandle","#else","#elseif","#endif","#error","#file","#fileID","#fileLiteral","#filePath","#function","#if","#imageLiteral","#keyPath","#line","#selector","#sourceLocation","#warn_unqualified_access","#warning"],De=["abs","all","any","assert","assertionFailure","debugPrint","dump","fatalError","getVaList","isKnownUniquelyReferenced","max","min","numericCast","pointwiseMax","pointwiseMin","precondition","preconditionFailure","print","readLine","repeatElement","sequence","stride","swap","swift_unboxFromSwiftValueWithType","transcode","type","unsafeBitCast","unsafeDowncast","withExtendedLifetime","withUnsafeMutablePointer","withUnsafePointer","withVaList","withoutActuallyEscaping","zip"],Ie=m(/[/=\-+!*%<>&|^~?]/,/[\u00A1-\u00A7]/,/[\u00A9\u00AB]/,/[\u00AC\u00AE]/,/[\u00B0\u00B1]/,/[\u00B6\u00BB\u00BF\u00D7\u00F7]/,/[\u2016-\u2017]/,/[\u2020-\u2027]/,/[\u2030-\u203E]/,/[\u2041-\u2053]/,/[\u2055-\u205E]/,/[\u2190-\u23FF]/,/[\u2500-\u2775]/,/[\u2794-\u2BFF]/,/[\u2E00-\u2E7F]/,/[\u3001-\u3003]/,/[\u3008-\u3020]/,/[\u3030]/),Le=m(Ie,/[\u0300-\u036F]/,/[\u1DC0-\u1DFF]/,/[\u20D0-\u20FF]/,/[\uFE00-\uFE0F]/,/[\uFE20-\uFE2F]/),Be=b(Ie,Le,"*"),$e=m(/[a-zA-Z_]/,/[\u00A8\u00AA\u00AD\u00AF\u00B2-\u00B5\u00B7-\u00BA]/,/[\u00BC-\u00BE\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF]/,/[\u0100-\u02FF\u0370-\u167F\u1681-\u180D\u180F-\u1DBF]/,/[\u1E00-\u1FFF]/,/[\u200B-\u200D\u202A-\u202E\u203F-\u2040\u2054\u2060-\u206F]/,/[\u2070-\u20CF\u2100-\u218F\u2460-\u24FF\u2776-\u2793]/,/[\u2C00-\u2DFF\u2E80-\u2FFF]/,/[\u3004-\u3007\u3021-\u302F\u3031-\u303F\u3040-\uD7FF]/,/[\uF900-\uFD3D\uFD40-\uFDCF\uFDF0-\uFE1F\uFE30-\uFE44]/,/[\uFE47-\uFEFE\uFF00-\uFFFD]/),ze=m($e,/\d/,/[\u0300-\u036F\u1DC0-\u1DFF\u20D0-\u20FF\uFE20-\uFE2F]/),Fe=b($e,ze,"*"),Ue=b(/[A-Z]/,ze,"*"),je=["autoclosure",b(/convention\(/,m("swift","block","c"),/\)/),"discardableResult","dynamicCallable","dynamicMemberLookup","escaping","frozen","GKInspectable","IBAction","IBDesignable","IBInspectable","IBOutlet","IBSegueAction","inlinable","main","nonobjc","NSApplicationMain","NSCopying","NSManaged",b(/objc\(/,Fe,/\)/),"objc","objcMembers","propertyWrapper","requires_stored_property_inits","resultBuilder","testable","UIApplicationMain","unknown","usableFromInline"],Pe=["iOS","iOSApplicationExtension","macOS","macOSApplicationExtension","macCatalyst","macCatalystApplicationExtension","watchOS","watchOSApplicationExtension","tvOS","tvOSApplicationExtension","swift"]
+;var Ke=Object.freeze({__proto__:null,grmr_bash:e=>{const n=e.regex,t={},a={
 begin:/\$\{/,end:/\}/,contains:["self",{begin:/:-/,contains:[t]}]}
 ;Object.assign(t,{className:"variable",variants:[{
 begin:n.concat(/\$[\w\d#@][\w\d_]*/,"(?![\\w\\d])(?![$])")},a]});const i={
 className:"subst",begin:/\$\(/,end:/\)/,contains:[e.BACKSLASH_ESCAPE]},r={
 begin:/<<-?\s*(?=\w+)/,starts:{contains:[e.END_SAME_AS_BEGIN({begin:/(\w+)/,
 end:/(\w+)/,className:"string"})]}},s={className:"string",begin:/"/,end:/"/,
-contains:[e.BACKSLASH_ESCAPE,t,i]};i.contains.push(s);const o={begin:/\$\(\(/,
+contains:[e.BACKSLASH_ESCAPE,t,i]};i.contains.push(s);const o={begin:/\$?\(\(/,
 end:/\)\)/,contains:[{begin:/\d+#[0-9a-f]+/,className:"number"},e.NUMBER_MODE,t]
 },l=e.SHEBANG({binary:"(fish|bash|zsh|sh|csh|ksh|tcsh|dash|scsh)",relevance:10
 }),c={className:"function",begin:/\w[\w\d_]*\s*\(\s*\)\s*\{/,returnBegin:!0,
 contains:[e.inherit(e.TITLE_MODE,{begin:/\w[\w\d_]*/})],relevance:0};return{
 name:"Bash",aliases:["sh"],keywords:{$pattern:/\b[a-z][a-z0-9._-]+\b/,
-keyword:["if","then","else","elif","fi","for","while","in","do","done","case","esac","function"],
+keyword:["if","then","else","elif","fi","for","while","until","in","do","done","case","esac","function","select"],
 literal:["true","false"],
 built_in:["break","cd","continue","eval","exec","exit","export","getopts","hash","pwd","readonly","return","shift","test","times","trap","umask","unset","alias","bind","builtin","caller","command","declare","echo","enable","help","let","local","logout","mapfile","printf","read","readarray","source","type","typeset","ulimit","unalias","set","shopt","autoload","bg","bindkey","bye","cap","chdir","clone","comparguments","compcall","compctl","compdescribe","compfiles","compgroups","compquote","comptags","comptry","compvalues","dirs","disable","disown","echotc","echoti","emulate","fc","fg","float","functions","getcap","getln","history","integer","jobs","kill","limit","log","noglob","popd","print","pushd","pushln","rehash","sched","setcap","setopt","stat","suspend","ttyctl","unfunction","unhash","unlimit","unsetopt","vared","wait","whence","where","which","zcompile","zformat","zftp","zle","zmodload","zparseopts","zprof","zpty","zregexparse","zsocket","zstyle","ztcp","chcon","chgrp","chown","chmod","cp","dd","df","dir","dircolors","ln","ls","mkdir","mkfifo","mknod","mktemp","mv","realpath","rm","rmdir","shred","sync","touch","truncate","vdir","b2sum","base32","base64","cat","cksum","comm","csplit","cut","expand","fmt","fold","head","join","md5sum","nl","numfmt","od","paste","ptx","pr","sha1sum","sha224sum","sha256sum","sha384sum","sha512sum","shuf","sort","split","sum","tac","tail","tr","tsort","unexpand","uniq","wc","arch","basename","chroot","date","dirname","du","echo","env","expr","factor","groups","hostid","id","link","logname","nice","nohup","nproc","pathchk","pinky","printenv","printf","pwd","readlink","runcon","seq","sleep","stat","stdbuf","stty","tee","test","timeout","tty","uname","unlink","uptime","users","who","whoami","yes"]
 },contains:[l,e.SHEBANG(),c,o,e.HASH_COMMENT_MODE,r,{match:/(\/[a-z._-]+)+/},s,{
 className:"",begin:/\\"/},{className:"string",begin:/'/,end:/'/},t]}},
 grmr_c:e=>{const n=e.regex,t=e.COMMENT("//","$",{contains:[{begin:/\\\n/}]
-}),a="[a-zA-Z_]\\w*::",i="(decltype\\(auto\\)|"+n.optional(a)+"[a-zA-Z_]\\w*"+n.optional("<[^<>]+>")+")",r={
+}),a="decltype\\(auto\\)",i="[a-zA-Z_]\\w*::",r="("+a+"|"+n.optional(i)+"[a-zA-Z_]\\w*"+n.optional("<[^<>]+>")+")",s={
 className:"type",variants:[{begin:"\\b[a-z\\d_]*_t\\b"},{
-match:/\batomic_[a-z]{3,6}\b/}]},s={className:"string",variants:[{
+match:/\batomic_[a-z]{3,6}\b/}]},o={className:"string",variants:[{
 begin:'(u8?|U|L)?"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE]},{
 begin:"(u8?|U|L)?'(\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4,8}|[0-7]{3}|\\S)|.)",
 end:"'",illegal:"."},e.END_SAME_AS_BEGIN({
-begin:/(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,end:/\)([^()\\ ]{0,16})"/})]},o={
+begin:/(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,end:/\)([^()\\ ]{0,16})"/})]},l={
 className:"number",variants:[{begin:"\\b(0b[01']+)"},{
 begin:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)((ll|LL|l|L)(u|U)?|(u|U)(ll|LL|l|L)?|f|F|b|B)"
 },{
 begin:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"
-}],relevance:0},l={className:"meta",begin:/#\s*[a-z]+\b/,end:/$/,keywords:{
+}],relevance:0},c={className:"meta",begin:/#\s*[a-z]+\b/,end:/$/,keywords:{
 keyword:"if else elif endif define undef warning error line pragma _Pragma ifdef ifndef include"
-},contains:[{begin:/\\\n/,relevance:0},e.inherit(s,{className:"string"}),{
-className:"string",begin:/<.*?>/},t,e.C_BLOCK_COMMENT_MODE]},c={
-className:"title",begin:n.optional(a)+e.IDENT_RE,relevance:0
-},d=n.optional(a)+e.IDENT_RE+"\\s*\\(",g={
+},contains:[{begin:/\\\n/,relevance:0},e.inherit(o,{className:"string"}),{
+className:"string",begin:/<.*?>/},t,e.C_BLOCK_COMMENT_MODE]},d={
+className:"title",begin:n.optional(i)+e.IDENT_RE,relevance:0
+},g=n.optional(i)+e.IDENT_RE+"\\s*\\(",u={
 keyword:["asm","auto","break","case","continue","default","do","else","enum","extern","for","fortran","goto","if","inline","register","restrict","return","sizeof","struct","switch","typedef","union","volatile","while","_Alignas","_Alignof","_Atomic","_Generic","_Noreturn","_Static_assert","_Thread_local","alignas","alignof","noreturn","static_assert","thread_local","_Pragma"],
 type:["float","double","signed","unsigned","int","short","long","char","void","_Bool","_Complex","_Imaginary","_Decimal32","_Decimal64","_Decimal128","const","static","complex","bool","imaginary"],
 literal:"true false NULL",
 built_in:"std string wstring cin cout cerr clog stdin stdout stderr stringstream istringstream ostringstream auto_ptr deque list queue stack vector map set pair bitset multiset multimap unordered_set unordered_map unordered_multiset unordered_multimap priority_queue make_pair array shared_ptr abort terminate abs acos asin atan2 atan calloc ceil cosh cos exit exp fabs floor fmod fprintf fputs free frexp fscanf future isalnum isalpha iscntrl isdigit isgraph islower isprint ispunct isspace isupper isxdigit tolower toupper labs ldexp log10 log malloc realloc memchr memcmp memcpy memset modf pow printf putchar puts scanf sinh sin snprintf sprintf sqrt sscanf strcat strchr strcmp strcpy strcspn strlen strncat strncmp strncpy strpbrk strrchr strspn strstr tanh tan vfprintf vprintf vsprintf endl initializer_list unique_ptr"
-},u=[l,r,t,e.C_BLOCK_COMMENT_MODE,o,s],b={variants:[{begin:/=/,end:/;/},{
+},b=[c,s,t,e.C_BLOCK_COMMENT_MODE,l,o],m={variants:[{begin:/=/,end:/;/},{
 begin:/\(/,end:/\)/},{beginKeywords:"new throw return else",end:/;/}],
-keywords:g,contains:u.concat([{begin:/\(/,end:/\)/,keywords:g,
-contains:u.concat(["self"]),relevance:0}]),relevance:0},m={
-begin:"("+i+"[\\*&\\s]+)+"+d,returnBegin:!0,end:/[{;=]/,excludeEnd:!0,
-keywords:g,illegal:/[^\w\s\*&:<>.]/,contains:[{begin:"decltype\\(auto\\)",
-keywords:g,relevance:0},{begin:d,returnBegin:!0,contains:[e.inherit(c,{
-className:"title.function"})],relevance:0},{relevance:0,match:/,/},{
-className:"params",begin:/\(/,end:/\)/,keywords:g,relevance:0,
-contains:[t,e.C_BLOCK_COMMENT_MODE,s,o,r,{begin:/\(/,end:/\)/,keywords:g,
-relevance:0,contains:["self",t,e.C_BLOCK_COMMENT_MODE,s,o,r]}]
-},r,t,e.C_BLOCK_COMMENT_MODE,l]};return{name:"C",aliases:["h"],keywords:g,
-disableAutodetect:!0,illegal:"</",contains:[].concat(b,m,u,[l,{
-begin:e.IDENT_RE+"::",keywords:g},{className:"class",
+keywords:u,contains:b.concat([{begin:/\(/,end:/\)/,keywords:u,
+contains:b.concat(["self"]),relevance:0}]),relevance:0},p={
+begin:"("+r+"[\\*&\\s]+)+"+g,returnBegin:!0,end:/[{;=]/,excludeEnd:!0,
+keywords:u,illegal:/[^\w\s\*&:<>.]/,contains:[{begin:a,keywords:u,relevance:0},{
+begin:g,returnBegin:!0,contains:[e.inherit(d,{className:"title.function"})],
+relevance:0},{relevance:0,match:/,/},{className:"params",begin:/\(/,end:/\)/,
+keywords:u,relevance:0,contains:[t,e.C_BLOCK_COMMENT_MODE,o,l,s,{begin:/\(/,
+end:/\)/,keywords:u,relevance:0,contains:["self",t,e.C_BLOCK_COMMENT_MODE,o,l,s]
+}]},s,t,e.C_BLOCK_COMMENT_MODE,c]};return{name:"C",aliases:["h"],keywords:u,
+disableAutodetect:!0,illegal:"</",contains:[].concat(m,p,b,[c,{
+begin:e.IDENT_RE+"::",keywords:u},{className:"class",
 beginKeywords:"enum class struct union",end:/[{;:<>=]/,contains:[{
-beginKeywords:"final class struct"},e.TITLE_MODE]}]),exports:{preprocessor:l,
-strings:s,keywords:g}}},grmr_cpp:e=>{const n=e.regex,t=e.COMMENT("//","$",{
+beginKeywords:"final class struct"},e.TITLE_MODE]}]),exports:{preprocessor:c,
+strings:o,keywords:u}}},grmr_cpp:e=>{const n=e.regex,t=e.COMMENT("//","$",{
 contains:[{begin:/\\\n/}]
-}),a="[a-zA-Z_]\\w*::",i="(?!struct)(decltype\\(auto\\)|"+n.optional(a)+"[a-zA-Z_]\\w*"+n.optional("<[^<>]+>")+")",r={
-className:"type",begin:"\\b[a-z\\d_]*_t\\b"},s={className:"string",variants:[{
+}),a="decltype\\(auto\\)",i="[a-zA-Z_]\\w*::",r="(?!struct)("+a+"|"+n.optional(i)+"[a-zA-Z_]\\w*"+n.optional("<[^<>]+>")+")",s={
+className:"type",begin:"\\b[a-z\\d_]*_t\\b"},o={className:"string",variants:[{
 begin:'(u8?|U|L)?"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE]},{
 begin:"(u8?|U|L)?'(\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4,8}|[0-7]{3}|\\S)|.)",
 end:"'",illegal:"."},e.END_SAME_AS_BEGIN({
-begin:/(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,end:/\)([^()\\ ]{0,16})"/})]},o={
+begin:/(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,end:/\)([^()\\ ]{0,16})"/})]},l={
 className:"number",variants:[{begin:"\\b(0b[01']+)"},{
 begin:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)((ll|LL|l|L)(u|U)?|(u|U)(ll|LL|l|L)?|f|F|b|B)"
 },{
 begin:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"
-}],relevance:0},l={className:"meta",begin:/#\s*[a-z]+\b/,end:/$/,keywords:{
+}],relevance:0},c={className:"meta",begin:/#\s*[a-z]+\b/,end:/$/,keywords:{
 keyword:"if else elif endif define undef warning error line pragma _Pragma ifdef ifndef include"
-},contains:[{begin:/\\\n/,relevance:0},e.inherit(s,{className:"string"}),{
-className:"string",begin:/<.*?>/},t,e.C_BLOCK_COMMENT_MODE]},c={
-className:"title",begin:n.optional(a)+e.IDENT_RE,relevance:0
-},d=n.optional(a)+e.IDENT_RE+"\\s*\\(",g={
+},contains:[{begin:/\\\n/,relevance:0},e.inherit(o,{className:"string"}),{
+className:"string",begin:/<.*?>/},t,e.C_BLOCK_COMMENT_MODE]},d={
+className:"title",begin:n.optional(i)+e.IDENT_RE,relevance:0
+},g=n.optional(i)+e.IDENT_RE+"\\s*\\(",u={
 type:["bool","char","char16_t","char32_t","char8_t","double","float","int","long","short","void","wchar_t","unsigned","signed","const","static"],
 keyword:["alignas","alignof","and","and_eq","asm","atomic_cancel","atomic_commit","atomic_noexcept","auto","bitand","bitor","break","case","catch","class","co_await","co_return","co_yield","compl","concept","const_cast|10","consteval","constexpr","constinit","continue","decltype","default","delete","do","dynamic_cast|10","else","enum","explicit","export","extern","false","final","for","friend","goto","if","import","inline","module","mutable","namespace","new","noexcept","not","not_eq","nullptr","operator","or","or_eq","override","private","protected","public","reflexpr","register","reinterpret_cast|10","requires","return","sizeof","static_assert","static_cast|10","struct","switch","synchronized","template","this","thread_local","throw","transaction_safe","transaction_safe_dynamic","true","try","typedef","typeid","typename","union","using","virtual","volatile","while","xor","xor_eq"],
 literal:["NULL","false","nullopt","nullptr","true"],built_in:["_Pragma"],
 _type_hints:["any","auto_ptr","barrier","binary_semaphore","bitset","complex","condition_variable","condition_variable_any","counting_semaphore","deque","false_type","future","imaginary","initializer_list","istringstream","jthread","latch","lock_guard","multimap","multiset","mutex","optional","ostringstream","packaged_task","pair","promise","priority_queue","queue","recursive_mutex","recursive_timed_mutex","scoped_lock","set","shared_future","shared_lock","shared_mutex","shared_timed_mutex","shared_ptr","stack","string_view","stringstream","timed_mutex","thread","true_type","tuple","unique_lock","unique_ptr","unordered_map","unordered_multimap","unordered_multiset","unordered_set","variant","vector","weak_ptr","wstring","wstring_view"]
-},u={className:"function.dispatch",relevance:0,keywords:{
+},b={className:"function.dispatch",relevance:0,keywords:{
 _hint:["abort","abs","acos","apply","as_const","asin","atan","atan2","calloc","ceil","cerr","cin","clog","cos","cosh","cout","declval","endl","exchange","exit","exp","fabs","floor","fmod","forward","fprintf","fputs","free","frexp","fscanf","future","invoke","isalnum","isalpha","iscntrl","isdigit","isgraph","islower","isprint","ispunct","isspace","isupper","isxdigit","labs","launder","ldexp","log","log10","make_pair","make_shared","make_shared_for_overwrite","make_tuple","make_unique","malloc","memchr","memcmp","memcpy","memset","modf","move","pow","printf","putchar","puts","realloc","scanf","sin","sinh","snprintf","sprintf","sqrt","sscanf","std","stderr","stdin","stdout","strcat","strchr","strcmp","strcpy","strcspn","strlen","strncat","strncmp","strncpy","strpbrk","strrchr","strspn","strstr","swap","tan","tanh","terminate","to_underlying","tolower","toupper","vfprintf","visit","vprintf","vsprintf"]
 },
 begin:n.concat(/\b/,/(?!decltype)/,/(?!if)/,/(?!for)/,/(?!switch)/,/(?!while)/,e.IDENT_RE,n.lookahead(/(<[^<>]+>|)\s*\(/))
-},b=[u,l,r,t,e.C_BLOCK_COMMENT_MODE,o,s],m={variants:[{begin:/=/,end:/;/},{
+},m=[b,c,s,t,e.C_BLOCK_COMMENT_MODE,l,o],p={variants:[{begin:/=/,end:/;/},{
 begin:/\(/,end:/\)/},{beginKeywords:"new throw return else",end:/;/}],
-keywords:g,contains:b.concat([{begin:/\(/,end:/\)/,keywords:g,
-contains:b.concat(["self"]),relevance:0}]),relevance:0},p={className:"function",
-begin:"("+i+"[\\*&\\s]+)+"+d,returnBegin:!0,end:/[{;=]/,excludeEnd:!0,
-keywords:g,illegal:/[^\w\s\*&:<>.]/,contains:[{begin:"decltype\\(auto\\)",
-keywords:g,relevance:0},{begin:d,returnBegin:!0,contains:[c],relevance:0},{
-begin:/::/,relevance:0},{begin:/:/,endsWithParent:!0,contains:[s,o]},{
-relevance:0,match:/,/},{className:"params",begin:/\(/,end:/\)/,keywords:g,
-relevance:0,contains:[t,e.C_BLOCK_COMMENT_MODE,s,o,r,{begin:/\(/,end:/\)/,
-keywords:g,relevance:0,contains:["self",t,e.C_BLOCK_COMMENT_MODE,s,o,r]}]
-},r,t,e.C_BLOCK_COMMENT_MODE,l]};return{name:"C++",
-aliases:["cc","c++","h++","hpp","hh","hxx","cxx"],keywords:g,illegal:"</",
+keywords:u,contains:m.concat([{begin:/\(/,end:/\)/,keywords:u,
+contains:m.concat(["self"]),relevance:0}]),relevance:0},_={className:"function",
+begin:"("+r+"[\\*&\\s]+)+"+g,returnBegin:!0,end:/[{;=]/,excludeEnd:!0,
+keywords:u,illegal:/[^\w\s\*&:<>.]/,contains:[{begin:a,keywords:u,relevance:0},{
+begin:g,returnBegin:!0,contains:[d],relevance:0},{begin:/::/,relevance:0},{
+begin:/:/,endsWithParent:!0,contains:[o,l]},{relevance:0,match:/,/},{
+className:"params",begin:/\(/,end:/\)/,keywords:u,relevance:0,
+contains:[t,e.C_BLOCK_COMMENT_MODE,o,l,s,{begin:/\(/,end:/\)/,keywords:u,
+relevance:0,contains:["self",t,e.C_BLOCK_COMMENT_MODE,o,l,s]}]
+},s,t,e.C_BLOCK_COMMENT_MODE,c]};return{name:"C++",
+aliases:["cc","c++","h++","hpp","hh","hxx","cxx"],keywords:u,illegal:"</",
 classNameAliases:{"function.dispatch":"built_in"},
-contains:[].concat(m,p,u,b,[l,{
+contains:[].concat(p,_,b,m,[c,{
 begin:"\\b(deque|list|queue|priority_queue|pair|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array|tuple|optional|variant|function)\\s*<(?!<)",
-end:">",keywords:g,contains:["self",r]},{begin:e.IDENT_RE+"::",keywords:g},{
+end:">",keywords:u,contains:["self",s]},{begin:e.IDENT_RE+"::",keywords:u},{
 match:[/\b(?:enum(?:\s+(?:class|struct))?|class|struct|union)/,/\s+/,/\w+/],
 className:{1:"keyword",3:"title.class"}}])}},grmr_csharp:e=>{const n={
 keyword:["abstract","as","base","break","case","catch","class","const","continue","do","else","event","explicit","extern","finally","fixed","for","foreach","goto","if","implicit","in","interface","internal","is","lock","namespace","new","operator","out","override","params","private","protected","public","readonly","record","ref","return","scoped","sealed","sizeof","stackalloc","static","struct","switch","this","throw","try","typeof","unchecked","unsafe","using","virtual","void","volatile","while"].concat(["add","alias","and","ascending","async","await","by","descending","equals","from","get","global","group","init","into","join","let","nameof","not","notnull","on","or","orderby","partial","remove","select","set","unmanaged","value|0","var","when","where","with","yield"]),
@@ -542,15 +544,15 @@ contains:[e.TITLE_MODE,u],relevance:0},{match:/\(\)/},{className:"params",
 begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:n,relevance:0,
 contains:[g,a,e.C_BLOCK_COMMENT_MODE]
 },e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},m]}},grmr_css:e=>{
-const n=e.regex,t=J(e),a=[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE];return{
+const n=e.regex,t=ie(e),a=[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE];return{
 name:"CSS",case_insensitive:!0,illegal:/[=|'\$]/,keywords:{
 keyframePosition:"from to"},classNameAliases:{keyframePosition:"selector-tag"},
 contains:[t.BLOCK_COMMENT,{begin:/-(webkit|moz|ms|o)-(?=[a-z])/
 },t.CSS_NUMBER_MODE,{className:"selector-id",begin:/#[A-Za-z0-9_-]+/,relevance:0
 },{className:"selector-class",begin:"\\.[a-zA-Z-][a-zA-Z0-9_-]*",relevance:0
 },t.ATTRIBUTE_SELECTOR_MODE,{className:"selector-pseudo",variants:[{
-begin:":("+ne.join("|")+")"},{begin:":(:)?("+te.join("|")+")"}]
-},t.CSS_VARIABLE,{className:"attribute",begin:"\\b("+ae.join("|")+")\\b"},{
+begin:":("+oe.join("|")+")"},{begin:":(:)?("+le.join("|")+")"}]
+},t.CSS_VARIABLE,{className:"attribute",begin:"\\b("+ce.join("|")+")\\b"},{
 begin:/:/,end:/[;}{]/,
 contains:[t.BLOCK_COMMENT,t.HEXCOLOR,t.IMPORTANT,t.CSS_NUMBER_MODE,...a,{
 begin:/(url|data-uri)\(/,end:/\)/,relevance:0,keywords:{built_in:"url data-uri"
@@ -558,9 +560,9 @@ begin:/(url|data-uri)\(/,end:/\)/,relevance:0,keywords:{built_in:"url data-uri"
 excludeEnd:!0}]},t.FUNCTION_DISPATCH]},{begin:n.lookahead(/@/),end:"[{;]",
 relevance:0,illegal:/:/,contains:[{className:"keyword",begin:/@-?\w[\w]*(-\w+)*/
 },{begin:/\s/,endsWithParent:!0,excludeEnd:!0,relevance:0,keywords:{
-$pattern:/[a-z-]+/,keyword:"and or not only",attribute:ee.join(" ")},contains:[{
+$pattern:/[a-z-]+/,keyword:"and or not only",attribute:se.join(" ")},contains:[{
 begin:/[a-z-]+(?=:)/,className:"attribute"},...a,t.CSS_NUMBER_MODE]}]},{
-className:"selector-tag",begin:"\\b("+Y.join("|")+")\\b"}]}},grmr_diff:e=>{
+className:"selector-tag",begin:"\\b("+re.join("|")+")\\b"}]}},grmr_diff:e=>{
 const n=e.regex;return{name:"Diff",aliases:["patch"],contains:[{
 className:"meta",relevance:10,
 match:n.either(/^@@ +-\d+,\d+ +\+\d+,\d+ +@@/,/^\*\*\* +\d+,\d+ +\*\*\*\*$/,/^--- +\d+,\d+ +----$/)
@@ -603,8 +605,8 @@ name:"TOML, also INI",aliases:["toml"],case_insensitive:!0,illegal:/\S/,
 contains:[a,{className:"section",begin:/\[+/,end:/\]+/},{
 begin:n.concat(l,"(\\s*\\.\\s*",l,")*",n.lookahead(/\s*=\s*[^#\s]/)),
 className:"attr",starts:{end:/$/,contains:[a,o,r,i,s,t]}}]}},grmr_java:e=>{
-const n=e.regex,t="[\xc0-\u02b8a-zA-Z_$][\xc0-\u02b8a-zA-Z_$0-9]*",a=t+le("(?:<"+t+"~~~(?:\\s*,\\s*"+t+"~~~)*>)?",/~~~/g,2),i={
-keyword:["synchronized","abstract","private","var","static","if","const ","for","while","strictfp","finally","protected","import","native","final","void","enum","else","break","transient","catch","instanceof","volatile","case","assert","package","default","public","try","switch","continue","throws","protected","public","private","module","requires","exports","do","sealed"],
+const n=e.regex,t="[\xc0-\u02b8a-zA-Z_$][\xc0-\u02b8a-zA-Z_$0-9]*",a=t+pe("(?:<"+t+"~~~(?:\\s*,\\s*"+t+"~~~)*>)?",/~~~/g,2),i={
+keyword:["synchronized","abstract","private","var","static","if","const ","for","while","strictfp","finally","protected","import","native","final","void","enum","else","break","transient","catch","instanceof","volatile","case","assert","package","default","public","try","switch","continue","throws","protected","public","private","module","requires","exports","do","sealed","yield","permits"],
 literal:["false","true","null"],
 type:["char","boolean","long","float","int","byte","short","double"],
 built_in:["super","this"]},r={className:"meta",begin:"@"+t,contains:[{
@@ -626,8 +628,8 @@ beginKeywords:"new throw return else",relevance:0},{
 begin:["(?:"+a+"\\s+)",e.UNDERSCORE_IDENT_RE,/\s*(?=\()/],className:{
 2:"title.function"},keywords:i,contains:[{className:"params",begin:/\(/,
 end:/\)/,keywords:i,relevance:0,
-contains:[r,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,oe,e.C_BLOCK_COMMENT_MODE]
-},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},oe,r]}},grmr_javascript:he,
+contains:[r,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,me,e.C_BLOCK_COMMENT_MODE]
+},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},me,r]}},grmr_javascript:Oe,
 grmr_json:e=>{const n=["true","false","null"],t={scope:"literal",
 beginKeywords:n.join(" ")};return{name:"JSON",keywords:{literal:n},contains:[{
 className:"attr",begin:/"(\\.|[^\\"\r\n])*"(?=\s*:)/,relevance:1.01},{
@@ -646,7 +648,7 @@ className:"meta",
 begin:"@(?:file|property|field|get|set|receiver|param|setparam|delegate)\\s*:(?:\\s*"+e.UNDERSCORE_IDENT_RE+")?"
 },o={className:"meta",begin:"@"+e.UNDERSCORE_IDENT_RE,contains:[{begin:/\(/,
 end:/\)/,contains:[e.inherit(r,{className:"string"}),"self"]}]
-},l=oe,c=e.COMMENT("/\\*","\\*/",{contains:[e.C_BLOCK_COMMENT_MODE]}),d={
+},l=me,c=e.COMMENT("/\\*","\\*/",{contains:[e.C_BLOCK_COMMENT_MODE]}),d={
 variants:[{className:"type",begin:e.UNDERSCORE_IDENT_RE},{begin:/\(/,end:/\)/,
 contains:[]}]},g=d;return g.variants[1].contains=[d],d.variants[1].contains=[g],
 {name:"Kotlin",aliases:["kt","kts"],keywords:n,
@@ -669,41 +671,41 @@ beginKeywords:"public protected internal private constructor"
 excludeEnd:!0,relevance:0},{className:"type",begin:/[,:]\s*/,end:/[<\(,){\s]|$/,
 excludeBegin:!0,returnEnd:!0},s,o]},r,{className:"meta",begin:"^#!/usr/bin/env",
 end:"$",illegal:"\n"},l]}},grmr_less:e=>{
-const n=J(e),t=ie,a="([\\w-]+|@\\{[\\w-]+\\})",i=[],r=[],s=e=>({
-className:"string",begin:"~?"+e+".*?"+e}),o=(e,n,t)=>({className:e,begin:n,
-relevance:t}),l={$pattern:/[a-z-]+/,keyword:"and or not only",
-attribute:ee.join(" ")},c={begin:"\\(",end:"\\)",contains:r,keywords:l,
+const n=ie(e),t=de,a="[\\w-]+",i="("+a+"|@\\{"+a+"\\})",r=[],s=[],o=e=>({
+className:"string",begin:"~?"+e+".*?"+e}),l=(e,n,t)=>({className:e,begin:n,
+relevance:t}),c={$pattern:/[a-z-]+/,keyword:"and or not only",
+attribute:se.join(" ")},d={begin:"\\(",end:"\\)",contains:s,keywords:c,
 relevance:0}
-;r.push(e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,s("'"),s('"'),n.CSS_NUMBER_MODE,{
+;s.push(e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,o("'"),o('"'),n.CSS_NUMBER_MODE,{
 begin:"(url|data-uri)\\(",starts:{className:"string",end:"[\\)\\n]",
 excludeEnd:!0}
-},n.HEXCOLOR,c,o("variable","@@?[\\w-]+",10),o("variable","@\\{[\\w-]+\\}"),o("built_in","~?`[^`]*?`"),{
-className:"attribute",begin:"[\\w-]+\\s*:",end:":",returnBegin:!0,excludeEnd:!0
-},n.IMPORTANT,{beginKeywords:"and not"},n.FUNCTION_DISPATCH);const d=r.concat({
-begin:/\{/,end:/\}/,contains:i}),g={beginKeywords:"when",endsWithParent:!0,
-contains:[{beginKeywords:"and not"}].concat(r)},u={begin:a+"\\s*:",
+},n.HEXCOLOR,d,l("variable","@@?"+a,10),l("variable","@\\{"+a+"\\}"),l("built_in","~?`[^`]*?`"),{
+className:"attribute",begin:a+"\\s*:",end:":",returnBegin:!0,excludeEnd:!0
+},n.IMPORTANT,{beginKeywords:"and not"},n.FUNCTION_DISPATCH);const g=s.concat({
+begin:/\{/,end:/\}/,contains:r}),u={beginKeywords:"when",endsWithParent:!0,
+contains:[{beginKeywords:"and not"}].concat(s)},b={begin:i+"\\s*:",
 returnBegin:!0,end:/[;}]/,relevance:0,contains:[{begin:/-(webkit|moz|ms|o)-/
-},n.CSS_VARIABLE,{className:"attribute",begin:"\\b("+ae.join("|")+")\\b",
-end:/(?=:)/,starts:{endsWithParent:!0,illegal:"[<=$]",relevance:0,contains:r}}]
-},b={className:"keyword",
+},n.CSS_VARIABLE,{className:"attribute",begin:"\\b("+ce.join("|")+")\\b",
+end:/(?=:)/,starts:{endsWithParent:!0,illegal:"[<=$]",relevance:0,contains:s}}]
+},m={className:"keyword",
 begin:"@(import|media|charset|font-face|(-[a-z]+-)?keyframes|supports|document|namespace|page|viewport|host)\\b",
-starts:{end:"[;{}]",keywords:l,returnEnd:!0,contains:r,relevance:0}},m={
-className:"variable",variants:[{begin:"@[\\w-]+\\s*:",relevance:15},{
-begin:"@[\\w-]+"}],starts:{end:"[;}]",returnEnd:!0,contains:d}},p={variants:[{
-begin:"[\\.#:&\\[>]",end:"[;{}]"},{begin:a,end:/\{/}],returnBegin:!0,
+starts:{end:"[;{}]",keywords:c,returnEnd:!0,contains:s,relevance:0}},p={
+className:"variable",variants:[{begin:"@"+a+"\\s*:",relevance:15},{begin:"@"+a
+}],starts:{end:"[;}]",returnEnd:!0,contains:g}},_={variants:[{
+begin:"[\\.#:&\\[>]",end:"[;{}]"},{begin:i,end:/\{/}],returnBegin:!0,
 returnEnd:!0,illegal:"[<='$\"]",relevance:0,
-contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,g,o("keyword","all\\b"),o("variable","@\\{[\\w-]+\\}"),{
-begin:"\\b("+Y.join("|")+")\\b",className:"selector-tag"
-},n.CSS_NUMBER_MODE,o("selector-tag",a,0),o("selector-id","#"+a),o("selector-class","\\."+a,0),o("selector-tag","&",0),n.ATTRIBUTE_SELECTOR_MODE,{
-className:"selector-pseudo",begin:":("+ne.join("|")+")"},{
-className:"selector-pseudo",begin:":(:)?("+te.join("|")+")"},{begin:/\(/,
-end:/\)/,relevance:0,contains:d},{begin:"!important"},n.FUNCTION_DISPATCH]},_={
-begin:`[\\w-]+:(:)?(${t.join("|")})`,returnBegin:!0,contains:[p]}
-;return i.push(e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,b,m,_,u,p,g,n.FUNCTION_DISPATCH),
-{name:"Less",case_insensitive:!0,illegal:"[=>'/<($\"]",contains:i}},
+contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,u,l("keyword","all\\b"),l("variable","@\\{"+a+"\\}"),{
+begin:"\\b("+re.join("|")+")\\b",className:"selector-tag"
+},n.CSS_NUMBER_MODE,l("selector-tag",i,0),l("selector-id","#"+i),l("selector-class","\\."+i,0),l("selector-tag","&",0),n.ATTRIBUTE_SELECTOR_MODE,{
+className:"selector-pseudo",begin:":("+oe.join("|")+")"},{
+className:"selector-pseudo",begin:":(:)?("+le.join("|")+")"},{begin:/\(/,
+end:/\)/,relevance:0,contains:g},{begin:"!important"},n.FUNCTION_DISPATCH]},h={
+begin:a+":(:)?"+`(${t.join("|")})`,returnBegin:!0,contains:[_]}
+;return r.push(e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,m,p,h,b,_,u,n.FUNCTION_DISPATCH),
+{name:"Less",case_insensitive:!0,illegal:"[=>'/<($\"]",contains:r}},
 grmr_lua:e=>{const n="\\[=*\\[",t="\\]=*\\]",a={begin:n,end:t,contains:["self"]
-},i=[e.COMMENT("--(?!\\[=*\\[)","$"),e.COMMENT("--\\[=*\\[",t,{contains:[a],
-relevance:10})];return{name:"Lua",keywords:{$pattern:e.UNDERSCORE_IDENT_RE,
+},i=[e.COMMENT("--(?!"+n+")","$"),e.COMMENT("--"+n,t,{contains:[a],relevance:10
+})];return{name:"Lua",keywords:{$pattern:e.UNDERSCORE_IDENT_RE,
 literal:"true false nil",
 keyword:"and break do else elseif end for goto if in local not or repeat return then until while",
 built_in:"_G _ENV _VERSION __index __newindex __mode __call __metatable __tostring __len __gc __add __sub __mul __div __mod __pow __concat __unm __eq __lt __le assert collectgarbage dofile error getfenv getmetatable ipairs load loadfile loadstring module next pairs pcall print rawequal rawget rawset require select setfenv setmetatable tonumber tostring type unpack xpcall arg self coroutine resume yield status wrap create running debug getupvalue debug sethook getmetatable gethook setmetatable setlocal traceback setfenv getinfo setupvalue getlocal getregistry getfenv io lines write close flush open output type read stderr stdin input stdout popen tmpfile math log max acos huge ldexp pi cos tanh pow deg tan cosh sinh random randomseed frexp ceil floor rad abs sqrt modf asin min mod fmod log10 atan2 exp sin atan os exit setlocale date getenv difftime remove time clock tmpname rename execute package preload loadlib loaded loaders cpath config path seeall string sub upper len gfind rep find match char dump gmatch reverse byte format gsub lower table setn insert getn foreachi maxn foreach concat sort remove"
@@ -761,9 +763,9 @@ begin:/\[.*?\]\(.*?\)/,relevance:0}],returnBegin:!0,contains:[{match:/\[(?=\])/
 returnEnd:!0},{className:"link",relevance:0,begin:"\\]\\(",end:"\\)",
 excludeBegin:!0,excludeEnd:!0},{className:"symbol",relevance:0,begin:"\\]\\[",
 end:"\\]",excludeBegin:!0,excludeEnd:!0}]},a={className:"strong",contains:[],
-variants:[{begin:/_{2}/,end:/_{2}/},{begin:/\*{2}/,end:/\*{2}/}]},i={
-className:"emphasis",contains:[],variants:[{begin:/\*(?!\*)/,end:/\*/},{
-begin:/_(?!_)/,end:/_/,relevance:0}]},r=e.inherit(a,{contains:[]
+variants:[{begin:/_{2}(?!\s)/,end:/_{2}/},{begin:/\*{2}(?!\s)/,end:/\*{2}/}]
+},i={className:"emphasis",contains:[],variants:[{begin:/\*(?![*\s])/,end:/\*/},{
+begin:/_(?![_\s])/,end:/_/,relevance:0}]},r=e.inherit(a,{contains:[]
 }),s=e.inherit(i,{contains:[]});a.contains.push(s),i.contains.push(r)
 ;let o=[n,t];return[a,i,r,s].forEach((e=>{e.contains=e.contains.concat(o)
 })),o=o.concat(a,i),{name:"Markdown",aliases:["md","mkdown","mkd"],contains:[{
@@ -837,11 +839,13 @@ const n=e.regex,t=/(?![A-Za-z0-9])(?![$])/,a=n.concat(/[a-zA-Z_\x7f-\xff][a-zA-Z
 scope:"variable",match:"\\$+"+a},s={scope:"subst",variants:[{begin:/\$\w+/},{
 begin:/\{\$/,end:/\}/}]},o=e.inherit(e.APOS_STRING_MODE,{illegal:null
 }),l="[ \t\n]",c={scope:"string",variants:[e.inherit(e.QUOTE_STRING_MODE,{
-illegal:null,contains:e.QUOTE_STRING_MODE.contains.concat(s)
-}),o,e.END_SAME_AS_BEGIN({begin:/<<<[ \t]*(\w+)\n/,end:/[ \t]*(\w+)\b/,
-contains:e.QUOTE_STRING_MODE.contains.concat(s)})]},d={scope:"number",
-variants:[{begin:"\\b0[bB][01]+(?:_[01]+)*\\b"},{
-begin:"\\b0[oO][0-7]+(?:_[0-7]+)*\\b"},{
+illegal:null,contains:e.QUOTE_STRING_MODE.contains.concat(s)}),o,{
+begin:/<<<[ \t]*(?:(\w+)|"(\w+)")\n/,end:/[ \t]*(\w+)\b/,
+contains:e.QUOTE_STRING_MODE.contains.concat(s),"on:begin":(e,n)=>{
+n.data._beginMatch=e[1]||e[2]},"on:end":(e,n)=>{
+n.data._beginMatch!==e[1]&&n.ignoreMatch()}},e.END_SAME_AS_BEGIN({
+begin:/<<<[ \t]*'(\w+)'\n/,end:/[ \t]*(\w+)\b/})]},d={scope:"number",variants:[{
+begin:"\\b0[bB][01]+(?:_[01]+)*\\b"},{begin:"\\b0[oO][0-7]+(?:_[0-7]+)*\\b"},{
 begin:"\\b0[xX][\\da-fA-F]+(?:_[\\da-fA-F]+)*\\b"},{
 begin:"(?:\\b\\d+(?:_\\d+)*(\\.(?:\\d+(?:_\\d+)*))?|\\B\\.\\d+)(?:[eE][+-]?\\d+)?"
 }],relevance:0
@@ -859,20 +863,20 @@ scope:{1:"title.class"}},{match:[i,/::/,/class/],scope:{1:"title.class",
 3:"variable.language"}}]},E={scope:"attr",
 match:n.concat(a,n.lookahead(":"),n.lookahead(/(?!::)/))},y={relevance:0,
 begin:/\(/,end:/\)/,keywords:m,contains:[E,r,f,e.C_BLOCK_COMMENT_MODE,c,d,_]
-},w={relevance:0,
+},N={relevance:0,
 match:[/\b/,n.concat("(?!fn\\b|function\\b|",p(u).join("\\b|"),"|",p(b).join("\\b|"),"\\b)"),a,n.concat(l,"*"),n.lookahead(/(?=\()/)],
-scope:{3:"title.function.invoke"},contains:[y]};y.contains.push(w)
-;const N=[E,f,e.C_BLOCK_COMMENT_MODE,c,d,_];return{case_insensitive:!1,
+scope:{3:"title.function.invoke"},contains:[y]};y.contains.push(N)
+;const w=[E,f,e.C_BLOCK_COMMENT_MODE,c,d,_];return{case_insensitive:!1,
 keywords:m,contains:[{begin:n.concat(/#\[\s*/,i),beginScope:"meta",end:/]/,
 endScope:"meta",keywords:{literal:g,keyword:["new","array"]},contains:[{
 begin:/\[/,end:/]/,keywords:{literal:g,keyword:["new","array"]},
-contains:["self",...N]},...N,{scope:"meta",match:i}]
+contains:["self",...w]},...w,{scope:"meta",match:i}]
 },e.HASH_COMMENT_MODE,e.COMMENT("//","$"),e.COMMENT("/\\*","\\*/",{contains:[{
 scope:"doctag",match:"@[A-Za-z]+"}]}),{match:/__halt_compiler\(\);/,
 keywords:"__halt_compiler",starts:{scope:"comment",end:e.MATCH_NOTHING_RE,
 contains:[{match:/\?>/,scope:"meta",endsParent:!0}]}},{scope:"meta",variants:[{
 begin:/<\?php/,relevance:10},{begin:/<\?=/},{begin:/<\?/,relevance:.1},{
-begin:/\?>/}]},{scope:"variable.language",match:/\$this\b/},r,w,f,{
+begin:/\?>/}]},{scope:"variable.language",match:/\$this\b/},r,N,f,{
 match:[/const/,/\s/,a],scope:{1:"keyword",3:"variable.constant"}},_,{
 scope:"function",relevance:0,beginKeywords:"fn function",end:/[;{]/,
 excludeEnd:!0,illegal:"[$%\\[]",contains:[{beginKeywords:"use"
@@ -925,7 +929,7 @@ className:"params",variants:[{className:"",begin:/\(\s*\)/,skip:!0},{begin:/\(/,
 end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:i,
 contains:["self",r,u,l,e.HASH_COMMENT_MODE]}]};return s.contains=[l,u,r],{
 name:"Python",aliases:["py","gyp","ipython"],unicodeRegex:!0,keywords:i,
-illegal:/(<\/|->|\?)|=>/,contains:[r,u,{begin:/\bself\b/},{beginKeywords:"if",
+illegal:/(<\/|\?)|=>/,contains:[r,u,{begin:/\bself\b/},{beginKeywords:"if",
 relevance:0},l,b,e.HASH_COMMENT_MODE,{match:[/\bdef/,/\s+/,t],scope:{
 1:"keyword",3:"title.function"},contains:[m]},{variants:[{
 match:[/\bclass/,/\s+/,t,/\s*/,/\(\s*/,t,/\s*\)/]},{match:[/\bclass/,/\s+/,t]}],
@@ -959,19 +963,20 @@ match:[t,/\s+/,/<-/,/\s+/]},{scope:"operator",relevance:0,variants:[{match:i},{
 match:/%[^%]*%/}]},{scope:"punctuation",relevance:0,match:r},{begin:"`",end:"`",
 contains:[{begin:/\\./}]}]}},grmr_ruby:e=>{
 const n=e.regex,t="([a-zA-Z_]\\w*[!?=]?|[-+~]@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?)",a=n.either(/\b([A-Z]+[a-z0-9]+)+/,/\b([A-Z]+[a-z0-9]+)+[A-Z]+/),i=n.concat(a,/(::\w+)*/),r={
-"variable.constant":["__FILE__","__LINE__"],
+"variable.constant":["__FILE__","__LINE__","__ENCODING__"],
 "variable.language":["self","super"],
-keyword:["alias","and","attr_accessor","attr_reader","attr_writer","begin","BEGIN","break","case","class","defined","do","else","elsif","end","END","ensure","for","if","in","include","module","next","not","or","redo","require","rescue","retry","return","then","undef","unless","until","when","while","yield"],
-built_in:["proc","lambda"],literal:["true","false","nil"]},s={
-className:"doctag",begin:"@[A-Za-z]+"},o={begin:"#<",end:">"
-},l=[e.COMMENT("#","$",{contains:[s]}),e.COMMENT("^=begin","^=end",{
-contains:[s],relevance:10}),e.COMMENT("^__END__",e.MATCH_NOTHING_RE)],c={
-className:"subst",begin:/#\{/,end:/\}/,keywords:r},d={className:"string",
-contains:[e.BACKSLASH_ESCAPE,c],variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/
-},{begin:/`/,end:/`/},{begin:/%[qQwWx]?\(/,end:/\)/},{begin:/%[qQwWx]?\[/,
-end:/\]/},{begin:/%[qQwWx]?\{/,end:/\}/},{begin:/%[qQwWx]?</,end:/>/},{
-begin:/%[qQwWx]?\//,end:/\//},{begin:/%[qQwWx]?%/,end:/%/},{begin:/%[qQwWx]?-/,
-end:/-/},{begin:/%[qQwWx]?\|/,end:/\|/},{begin:/\B\?(\\\d{1,3})/},{
+keyword:["alias","and","begin","BEGIN","break","case","class","defined","do","else","elsif","end","END","ensure","for","if","in","module","next","not","or","redo","require","rescue","retry","return","then","undef","unless","until","when","while","yield","include","extend","prepend","public","private","protected","raise","throw"],
+built_in:["proc","lambda","attr_accessor","attr_reader","attr_writer","define_method","private_constant","module_function"],
+literal:["true","false","nil"]},s={className:"doctag",begin:"@[A-Za-z]+"},o={
+begin:"#<",end:">"},l=[e.COMMENT("#","$",{contains:[s]
+}),e.COMMENT("^=begin","^=end",{contains:[s],relevance:10
+}),e.COMMENT("^__END__",e.MATCH_NOTHING_RE)],c={className:"subst",begin:/#\{/,
+end:/\}/,keywords:r},d={className:"string",contains:[e.BACKSLASH_ESCAPE,c],
+variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/},{begin:/`/,end:/`/},{
+begin:/%[qQwWx]?\(/,end:/\)/},{begin:/%[qQwWx]?\[/,end:/\]/},{
+begin:/%[qQwWx]?\{/,end:/\}/},{begin:/%[qQwWx]?</,end:/>/},{begin:/%[qQwWx]?\//,
+end:/\//},{begin:/%[qQwWx]?%/,end:/%/},{begin:/%[qQwWx]?-/,end:/-/},{
+begin:/%[qQwWx]?\|/,end:/\|/},{begin:/\B\?(\\\d{1,3})/},{
 begin:/\B\?(\\x[A-Fa-f0-9]{1,2})/},{begin:/\B\?(\\u\{?[A-Fa-f0-9]{1,6}\}?)/},{
 begin:/\B\?(\\M-\\C-|\\M-\\c|\\c\\M-|\\M-|\\C-\\M-)[\x20-\x7e]/},{
 begin:/\B\?\\(c|C-)[\x20-\x7e]/},{begin:/\B\?\\?\S/},{
@@ -986,9 +991,11 @@ begin:"\\b0[xX][0-9a-fA-F](_?[0-9a-fA-F])*r?i?\\b"},{
 begin:"\\b0(_?[0-7])+r?i?\\b"}]},b={variants:[{match:/\(\)/},{
 className:"params",begin:/\(/,end:/(?=\))/,excludeBegin:!0,endsParent:!0,
 keywords:r}]},m=[d,{variants:[{match:[/class\s+/,i,/\s+<\s+/,i]},{
-match:[/class\s+/,i]}],scope:{2:"title.class",4:"title.class.inherited"},
-keywords:r},{relevance:0,match:[i,/\.new[ (]/],scope:{1:"title.class"}},{
-relevance:0,match:/\b[A-Z][A-Z_0-9]+\b/,className:"variable.constant"},{
+match:[/\b(class|module)\s+/,i]}],scope:{2:"title.class",
+4:"title.class.inherited"},keywords:r},{match:[/(include|extend)\s+/,i],scope:{
+2:"title.class"},keywords:r},{relevance:0,match:[i,/\.new[. (]/],scope:{
+1:"title.class"}},{relevance:0,match:/\b[A-Z][A-Z_0-9]+\b/,
+className:"variable.constant"},{relevance:0,match:a,scope:"title.class"},{
 match:[/def/,/\s+/,t],scope:{1:"keyword",3:"title.function"},contains:[b]},{
 begin:e.IDENT_RE+"::"},{className:"symbol",
 begin:e.UNDERSCORE_IDENT_RE+"(!|\\?)?:",relevance:0},{className:"symbol",
@@ -1031,24 +1038,24 @@ className:{1:"keyword",3:"title.class"}},{
 begin:[/(?:trait|enum|struct|union|impl|for)/,/\s+/,e.UNDERSCORE_IDENT_RE],
 className:{1:"keyword",3:"title.class"}},{begin:e.IDENT_RE+"::",keywords:{
 keyword:"Self",built_in:i,type:r}},{className:"punctuation",begin:"->"},t]}},
-grmr_scss:e=>{const n=J(e),t=te,a=ne,i="@[a-z-]+",r={className:"variable",
+grmr_scss:e=>{const n=ie(e),t=le,a=oe,i="@[a-z-]+",r={className:"variable",
 begin:"(\\$[a-zA-Z-][a-zA-Z0-9_-]*)\\b",relevance:0};return{name:"SCSS",
 case_insensitive:!0,illegal:"[=/|']",
 contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,n.CSS_NUMBER_MODE,{
 className:"selector-id",begin:"#[A-Za-z0-9_-]+",relevance:0},{
 className:"selector-class",begin:"\\.[A-Za-z0-9_-]+",relevance:0
 },n.ATTRIBUTE_SELECTOR_MODE,{className:"selector-tag",
-begin:"\\b("+Y.join("|")+")\\b",relevance:0},{className:"selector-pseudo",
+begin:"\\b("+re.join("|")+")\\b",relevance:0},{className:"selector-pseudo",
 begin:":("+a.join("|")+")"},{className:"selector-pseudo",
 begin:":(:)?("+t.join("|")+")"},r,{begin:/\(/,end:/\)/,
 contains:[n.CSS_NUMBER_MODE]},n.CSS_VARIABLE,{className:"attribute",
-begin:"\\b("+ae.join("|")+")\\b"},{
+begin:"\\b("+ce.join("|")+")\\b"},{
 begin:"\\b(whitespace|wait|w-resize|visible|vertical-text|vertical-ideographic|uppercase|upper-roman|upper-alpha|underline|transparent|top|thin|thick|text|text-top|text-bottom|tb-rl|table-header-group|table-footer-group|sw-resize|super|strict|static|square|solid|small-caps|separate|se-resize|scroll|s-resize|rtl|row-resize|ridge|right|repeat|repeat-y|repeat-x|relative|progress|pointer|overline|outside|outset|oblique|nowrap|not-allowed|normal|none|nw-resize|no-repeat|no-drop|newspaper|ne-resize|n-resize|move|middle|medium|ltr|lr-tb|lowercase|lower-roman|lower-alpha|loose|list-item|line|line-through|line-edge|lighter|left|keep-all|justify|italic|inter-word|inter-ideograph|inside|inset|inline|inline-block|inherit|inactive|ideograph-space|ideograph-parenthesis|ideograph-numeric|ideograph-alpha|horizontal|hidden|help|hand|groove|fixed|ellipsis|e-resize|double|dotted|distribute|distribute-space|distribute-letter|distribute-all-lines|disc|disabled|default|decimal|dashed|crosshair|collapse|col-resize|circle|char|center|capitalize|break-word|break-all|bottom|both|bolder|bold|block|bidi-override|below|baseline|auto|always|all-scroll|absolute|table|table-cell)\\b"
 },{begin:/:/,end:/[;}{]/,relevance:0,
 contains:[n.BLOCK_COMMENT,r,n.HEXCOLOR,n.CSS_NUMBER_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,n.IMPORTANT,n.FUNCTION_DISPATCH]
 },{begin:"@(page|font-face)",keywords:{$pattern:i,keyword:"@page @font-face"}},{
 begin:"@",end:"[{;]",returnBegin:!0,keywords:{$pattern:/[a-z-]+/,
-keyword:"and or not only",attribute:ee.join(" ")},contains:[{begin:i,
+keyword:"and or not only",attribute:se.join(" ")},contains:[{begin:i,
 className:"keyword"},{begin:/[a-z-]+(?=:)/,className:"attribute"
 },r,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,n.HEXCOLOR,n.CSS_NUMBER_MODE]
 },n.FUNCTION_DISPATCH]}},grmr_shell:e=>({name:"Shell Session",
@@ -1065,78 +1072,77 @@ built_in:["current_catalog","current_date","current_default_transform_group","cu
 },contains:[{begin:n.either(...s),relevance:0,keywords:{$pattern:/[\w\.]+/,
 keyword:l.concat(s),literal:a,type:i}},{className:"type",
 begin:n.either("double precision","large object","with timezone","without timezone")
-},c,{className:"variable",begin:/@[a-z0-9]+/},{className:"string",variants:[{
-begin:/'/,end:/'/,contains:[{begin:/''/}]}]},{begin:/"/,end:/"/,contains:[{
-begin:/""/}]},e.C_NUMBER_MODE,e.C_BLOCK_COMMENT_MODE,t,{className:"operator",
-begin:/[-+*/=%^~]|&&?|\|\|?|!=?|<(?:=>?|<|>)?|>[>=]?/,relevance:0}]}},
-grmr_swift:e=>{const n={match:/\s+/,relevance:0},t=e.COMMENT("/\\*","\\*/",{
-contains:["self"]}),a=[e.C_LINE_COMMENT_MODE,t],i={match:[/\./,p(...Ee,...ye)],
-className:{2:"keyword"}},r={match:m(/\./,p(...Ne)),relevance:0
-},s=Ne.filter((e=>"string"==typeof e)).concat(["_|0"]),o={variants:[{
+},c,{className:"variable",begin:/@[a-z0-9][a-z0-9_]*/},{className:"string",
+variants:[{begin:/'/,end:/'/,contains:[{begin:/''/}]}]},{begin:/"/,end:/"/,
+contains:[{begin:/""/}]},e.C_NUMBER_MODE,e.C_BLOCK_COMMENT_MODE,t,{
+className:"operator",begin:/[-+*/=%^~]|&&?|\|\|?|!=?|<(?:=>?|<|>)?|>[>=]?/,
+relevance:0}]}},grmr_swift:e=>{const n={match:/\s+/,relevance:0
+},t=e.COMMENT("/\\*","\\*/",{contains:["self"]}),a=[e.C_LINE_COMMENT_MODE,t],i={
+match:[/\./,m(...xe,...Me)],className:{2:"keyword"}},r={match:b(/\./,m(...Ae)),
+relevance:0},s=Ae.filter((e=>"string"==typeof e)).concat(["_|0"]),o={variants:[{
 className:"keyword",
-match:p(...Ne.filter((e=>"string"!=typeof e)).concat(we).map(fe),...ye)}]},l={
-$pattern:p(/\b\w+/,/#\w+/),keyword:s.concat(ke),literal:ve},c=[i,r,o],d=[{
-match:m(/\./,p(...xe)),relevance:0},{className:"built_in",
-match:m(/\b/,p(...xe),/(?=\()/)}],u={match:/->/,relevance:0},b=[u,{
-className:"operator",relevance:0,variants:[{match:Ae},{match:`\\.(\\.|${Se})+`}]
-}],_="([0-9a-fA-F]_*)+",h={className:"number",relevance:0,variants:[{
-match:"\\b(([0-9]_*)+)(\\.(([0-9]_*)+))?([eE][+-]?(([0-9]_*)+))?\\b"},{
-match:`\\b0x(${_})(\\.(${_}))?([pP][+-]?(([0-9]_*)+))?\\b`},{
-match:/\b0o([0-7]_*)+\b/},{match:/\b0b([01]_*)+\b/}]},f=(e="")=>({
-className:"subst",variants:[{match:m(/\\/,e,/[0\\tnr"']/)},{
-match:m(/\\/,e,/u\{[0-9a-fA-F]{1,8}\}/)}]}),E=(e="")=>({className:"subst",
-match:m(/\\/,e,/[\t ]*(?:[\r\n]|\r\n)/)}),y=(e="")=>({className:"subst",
-label:"interpol",begin:m(/\\/,e,/\(/),end:/\)/}),w=(e="")=>({begin:m(e,/"""/),
-end:m(/"""/,e),contains:[f(e),E(e),y(e)]}),N=(e="")=>({begin:m(e,/"/),
-end:m(/"/,e),contains:[f(e),y(e)]}),v={className:"string",
-variants:[w(),w("#"),w("##"),w("###"),N(),N("#"),N("##"),N("###")]},O={
-match:m(/`/,Re,/`/)},k=[O,{className:"variable",match:/\$\d+/},{
-className:"variable",match:`\\$${Te}+`}],x=[{match:/(@|#(un)?)available/,
-className:"keyword",starts:{contains:[{begin:/\(/,end:/\)/,keywords:Le,
-contains:[...b,h,v]}]}},{className:"keyword",match:m(/@/,p(...Ie))},{
-className:"meta",match:m(/@/,Re)}],M={match:g(/\b[A-Z]/),relevance:0,contains:[{
+match:m(...Ae.filter((e=>"string"!=typeof e)).concat(Se).map(ke),...Me)}]},l={
+$pattern:m(/\b\w+/,/#\w+/),keyword:s.concat(Re),literal:Ce},c=[i,r,o],g=[{
+match:b(/\./,m(...De)),relevance:0},{className:"built_in",
+match:b(/\b/,m(...De),/(?=\()/)}],u={match:/->/,relevance:0},p=[u,{
+className:"operator",relevance:0,variants:[{match:Be},{match:`\\.(\\.|${Le})+`}]
+}],_="([0-9]_*)+",h="([0-9a-fA-F]_*)+",f={className:"number",relevance:0,
+variants:[{match:`\\b(${_})(\\.(${_}))?([eE][+-]?(${_}))?\\b`},{
+match:`\\b0x(${h})(\\.(${h}))?([pP][+-]?(${_}))?\\b`},{match:/\b0o([0-7]_*)+\b/
+},{match:/\b0b([01]_*)+\b/}]},E=(e="")=>({className:"subst",variants:[{
+match:b(/\\/,e,/[0\\tnr"']/)},{match:b(/\\/,e,/u\{[0-9a-fA-F]{1,8}\}/)}]
+}),y=(e="")=>({className:"subst",match:b(/\\/,e,/[\t ]*(?:[\r\n]|\r\n)/)
+}),N=(e="")=>({className:"subst",label:"interpol",begin:b(/\\/,e,/\(/),end:/\)/
+}),w=(e="")=>({begin:b(e,/"""/),end:b(/"""/,e),contains:[E(e),y(e),N(e)]
+}),v=(e="")=>({begin:b(e,/"/),end:b(/"/,e),contains:[E(e),N(e)]}),O={
+className:"string",
+variants:[w(),w("#"),w("##"),w("###"),v(),v("#"),v("##"),v("###")]},k={
+match:b(/`/,Fe,/`/)},x=[k,{className:"variable",match:/\$\d+/},{
+className:"variable",match:`\\$${ze}+`}],M=[{match:/(@|#(un)?)available/,
+className:"keyword",starts:{contains:[{begin:/\(/,end:/\)/,keywords:Pe,
+contains:[...p,f,O]}]}},{className:"keyword",match:b(/@/,m(...je))},{
+className:"meta",match:b(/@/,Fe)}],S={match:d(/\b[A-Z]/),relevance:0,contains:[{
 className:"type",
-match:m(/(AV|CA|CF|CG|CI|CL|CM|CN|CT|MK|MP|MTK|MTL|NS|SCN|SK|UI|WK|XC)/,Te,"+")
-},{className:"type",match:De,relevance:0},{match:/[?!]+/,relevance:0},{
-match:/\.\.\./,relevance:0},{match:m(/\s+&\s+/,g(De)),relevance:0}]},S={
-begin:/</,end:/>/,keywords:l,contains:[...a,...c,...x,u,M]};M.contains.push(S)
-;const A={begin:/\(/,end:/\)/,relevance:0,keywords:l,contains:["self",{
-match:m(Re,/\s*:/),keywords:"_|0",relevance:0
-},...a,...c,...d,...b,h,v,...k,...x,M]},C={begin:/</,end:/>/,contains:[...a,M]
-},T={begin:/\(/,end:/\)/,keywords:l,contains:[{
-begin:p(g(m(Re,/\s*:/)),g(m(Re,/\s+/,Re,/\s*:/))),end:/:/,relevance:0,
-contains:[{className:"keyword",match:/\b_\b/},{className:"params",match:Re}]
-},...a,...c,...b,h,v,...x,M,A],endsParent:!0,illegal:/["']/},R={
-match:[/func/,/\s+/,p(O.match,Re,Ae)],className:{1:"keyword",3:"title.function"
-},contains:[C,T,n],illegal:[/\[/,/%/]},D={
+match:b(/(AV|CA|CF|CG|CI|CL|CM|CN|CT|MK|MP|MTK|MTL|NS|SCN|SK|UI|WK|XC)/,ze,"+")
+},{className:"type",match:Ue,relevance:0},{match:/[?!]+/,relevance:0},{
+match:/\.\.\./,relevance:0},{match:b(/\s+&\s+/,d(Ue)),relevance:0}]},A={
+begin:/</,end:/>/,keywords:l,contains:[...a,...c,...M,u,S]};S.contains.push(A)
+;const C={begin:/\(/,end:/\)/,relevance:0,keywords:l,contains:["self",{
+match:b(Fe,/\s*:/),keywords:"_|0",relevance:0
+},...a,...c,...g,...p,f,O,...x,...M,S]},T={begin:/</,end:/>/,contains:[...a,S]
+},R={begin:/\(/,end:/\)/,keywords:l,contains:[{
+begin:m(d(b(Fe,/\s*:/)),d(b(Fe,/\s+/,Fe,/\s*:/))),end:/:/,relevance:0,
+contains:[{className:"keyword",match:/\b_\b/},{className:"params",match:Fe}]
+},...a,...c,...p,f,O,...M,S,C],endsParent:!0,illegal:/["']/},D={
+match:[/func/,/\s+/,m(k.match,Fe,Be)],className:{1:"keyword",3:"title.function"
+},contains:[T,R,n],illegal:[/\[/,/%/]},I={
 match:[/\b(?:subscript|init[?!]?)/,/\s*(?=[<(])/],className:{1:"keyword"},
-contains:[C,T,n],illegal:/\[|%/},I={match:[/operator/,/\s+/,Ae],className:{
-1:"keyword",3:"title"}},L={begin:[/precedencegroup/,/\s+/,De],className:{
-1:"keyword",3:"title"},contains:[M],keywords:[...Oe,...ve],end:/}/}
-;for(const e of v.variants){const n=e.contains.find((e=>"interpol"===e.label))
-;n.keywords=l;const t=[...c,...d,...b,h,v,...k];n.contains=[...t,{begin:/\(/,
+contains:[T,R,n],illegal:/\[|%/},L={match:[/operator/,/\s+/,Be],className:{
+1:"keyword",3:"title"}},B={begin:[/precedencegroup/,/\s+/,Ue],className:{
+1:"keyword",3:"title"},contains:[S],keywords:[...Te,...Ce],end:/}/}
+;for(const e of O.variants){const n=e.contains.find((e=>"interpol"===e.label))
+;n.keywords=l;const t=[...c,...g,...p,f,O,...x];n.contains=[...t,{begin:/\(/,
 end:/\)/,contains:["self",...t]}]}return{name:"Swift",keywords:l,
-contains:[...a,R,D,{beginKeywords:"struct protocol class extension enum actor",
+contains:[...a,D,I,{beginKeywords:"struct protocol class extension enum actor",
 end:"\\{",excludeEnd:!0,keywords:l,contains:[e.inherit(e.TITLE_MODE,{
 className:"title.class",begin:/[A-Za-z$_][\u00C0-\u02B80-9A-Za-z$_]*/}),...c]
-},I,L,{beginKeywords:"import",end:/$/,contains:[...a],relevance:0
-},...c,...d,...b,h,v,...k,...x,M,A]}},grmr_typescript:e=>{
-const n=he(e),t=["any","void","number","boolean","string","object","never","symbol","bigint","unknown"],a={
+},L,B,{beginKeywords:"import",end:/$/,contains:[...a],relevance:0
+},...c,...g,...p,f,O,...x,...M,S,C]}},grmr_typescript:e=>{
+const n=Oe(e),t=_e,a=["any","void","number","boolean","string","object","never","symbol","bigint","unknown"],i={
 beginKeywords:"namespace",end:/\{/,excludeEnd:!0,
-contains:[n.exports.CLASS_REFERENCE]},i={beginKeywords:"interface",end:/\{/,
-excludeEnd:!0,keywords:{keyword:"interface extends",built_in:t},
-contains:[n.exports.CLASS_REFERENCE]},r={$pattern:ce,
-keyword:de.concat(["type","namespace","interface","public","private","protected","implements","declare","abstract","readonly","enum","override"]),
-literal:ge,built_in:_e.concat(t),"variable.language":pe},s={className:"meta",
-begin:"@[A-Za-z$_][0-9A-Za-z$_]*"},o=(e,n,t)=>{
-const a=e.contains.findIndex((e=>e.label===n))
+contains:[n.exports.CLASS_REFERENCE]},r={beginKeywords:"interface",end:/\{/,
+excludeEnd:!0,keywords:{keyword:"interface extends",built_in:a},
+contains:[n.exports.CLASS_REFERENCE]},s={$pattern:_e,
+keyword:he.concat(["type","namespace","interface","public","private","protected","implements","declare","abstract","readonly","enum","override"]),
+literal:fe,built_in:ve.concat(a),"variable.language":we},o={className:"meta",
+begin:"@"+t},l=(e,n,t)=>{const a=e.contains.findIndex((e=>e.label===n))
 ;if(-1===a)throw Error("can not find mode to replace");e.contains.splice(a,1,t)}
-;return Object.assign(n.keywords,r),
-n.exports.PARAMS_CONTAINS.push(s),n.contains=n.contains.concat([s,a,i]),
-o(n,"shebang",e.SHEBANG()),o(n,"use_strict",{className:"meta",relevance:10,
+;return Object.assign(n.keywords,s),
+n.exports.PARAMS_CONTAINS.push(o),n.contains=n.contains.concat([o,i,r]),
+l(n,"shebang",e.SHEBANG()),l(n,"use_strict",{className:"meta",relevance:10,
 begin:/^\s*['"]use strict['"]/
 }),n.contains.find((e=>"func.def"===e.label)).relevance=0,Object.assign(n,{
-name:"TypeScript",aliases:["ts","tsx"]}),n},grmr_vbnet:e=>{
+name:"TypeScript",aliases:["ts","tsx","mts","cts"]}),n},grmr_vbnet:e=>{
 const n=e.regex,t=/\d{1,2}\/\d{1,2}\/\d{4}/,a=/\d{4}-\d{1,2}-\d{1,2}/,i=/(\d|1[012])(:\d+){0,2} *(AM|PM)/,r=/\d{1,2}(:\d{1,2}){1,2}/,s={
 className:"literal",variants:[{begin:n.concat(/# */,n.either(a,t),/ *#/)},{
 begin:n.concat(/# */,r,/ *#/)},{begin:n.concat(/# */,i,/ *#/)},{
@@ -1194,6 +1200,6 @@ className:"number",
 begin:"\\b[0-9]{4}(-[0-9][0-9]){0,2}([Tt \\t][0-9][0-9]?(:[0-9][0-9]){2})?(\\.[0-9]*)?([ \\t])*(Z|[-+][0-9][0-9]?(:[0-9][0-9])?)?\\b"
 },{className:"number",begin:e.C_NUMBER_RE+"\\b",relevance:0},s,o,a],c=[...l]
 ;return c.pop(),c.push(i),r.contains=c,{name:"YAML",case_insensitive:!0,
-aliases:["yml"],contains:l}}});const $e=V;for(const e of Object.keys(Be)){
-const n=e.replace("grmr_","").replace("_","-");$e.registerLanguage(n,Be[e])}
-export{$e as default};
\ No newline at end of file
+aliases:["yml"],contains:l}}});const qe=ae;for(const e of Object.keys(Ke)){
+const n=e.replace("grmr_","").replace("_","-");qe.registerLanguage(n,Ke[e])}
+export{qe as default};
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/1c.min.js b/vendor/assets/javascripts/highlightjs/es/languages/1c.min.js
index c175dac1de7..99a247a49bf 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/1c.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/1c.min.js
@@ -1,4 +1,4 @@
-/*! `1c` grammar compiled for Highlight.js 11.6.0 */
+/*! `1c` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return s=>{
 const x="[A-Za-z\u0410-\u042f\u0430-\u044f\u0451\u0401_][A-Za-z\u0410-\u042f\u0430-\u044f\u0451\u0401_0-9]+",n="\u0434\u0430\u043b\u0435\u0435 \u0432\u043e\u0437\u0432\u0440\u0430\u0442 \u0432\u044b\u0437\u0432\u0430\u0442\u044c\u0438\u0441\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u044c \u0434\u043b\u044f \u0435\u0441\u043b\u0438 \u0438 \u0438\u0437 \u0438\u043b\u0438 \u0438\u043d\u0430\u0447\u0435 \u0438\u043d\u0430\u0447\u0435\u0435\u0441\u043b\u0438 \u0438\u0441\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u043a\u0430\u0436\u0434\u043e\u0433\u043e \u043a\u043e\u043d\u0435\u0446\u0435\u0441\u043b\u0438 \u043a\u043e\u043d\u0435\u0446\u043f\u043e\u043f\u044b\u0442\u043a\u0438 \u043a\u043e\u043d\u0435\u0446\u0446\u0438\u043a\u043b\u0430 \u043d\u0435 \u043d\u043e\u0432\u044b\u0439 \u043f\u0435\u0440\u0435\u0439\u0442\u0438 \u043f\u0435\u0440\u0435\u043c \u043f\u043e \u043f\u043e\u043a\u0430 \u043f\u043e\u043f\u044b\u0442\u043a\u0430 \u043f\u0440\u0435\u0440\u0432\u0430\u0442\u044c \u043f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u044c \u0442\u043e\u0433\u0434\u0430 \u0446\u0438\u043a\u043b \u044d\u043a\u0441\u043f\u043e\u0440\u0442 ",e="null \u0438\u0441\u0442\u0438\u043d\u0430 \u043b\u043e\u0436\u044c \u043d\u0435\u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u043e",o=s.inherit(s.NUMBER_MODE),t={
 className:"string",begin:'"|\\|',end:'"|$',contains:[{begin:'""'}]},a={
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/abnf.min.js b/vendor/assets/javascripts/highlightjs/es/languages/abnf.min.js
index ad18f227056..00d1d471a38 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/abnf.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/abnf.min.js
@@ -1,4 +1,4 @@
-/*! `abnf` grammar compiled for Highlight.js 11.6.0 */
+/*! `abnf` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return a=>{
 const e=a.regex,s=a.COMMENT(/;/,/$/);return{name:"Augmented Backus-Naur Form",
 illegal:/[!@#$^&',?+~`|:]/,
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/accesslog.min.js b/vendor/assets/javascripts/highlightjs/es/languages/accesslog.min.js
index df20efe73a7..cbfcf00e847 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/accesslog.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/accesslog.min.js
@@ -1,4 +1,4 @@
-/*! `accesslog` grammar compiled for Highlight.js 11.6.0 */
+/*! `accesslog` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const n=e.regex,a=["GET","POST","HEAD","PUT","DELETE","CONNECT","OPTIONS","PATCH","TRACE"]
 ;return{name:"Apache Access Log",contains:[{className:"number",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/actionscript.min.js b/vendor/assets/javascripts/highlightjs/es/languages/actionscript.min.js
index 4cece9e7dac..4b7d8eb8c64 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/actionscript.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/actionscript.min.js
@@ -1,4 +1,4 @@
-/*! `actionscript` grammar compiled for Highlight.js 11.6.0 */
+/*! `actionscript` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const a=e.regex,t=/[a-zA-Z_$][a-zA-Z0-9_$]*/,n=a.concat(t,a.concat("(\\.",t,")*")),s={
 className:"rest_arg",begin:/[.]{3}/,end:t,relevance:10};return{
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/ada.min.js b/vendor/assets/javascripts/highlightjs/es/languages/ada.min.js
index 8ef6ba31bc9..341066d8212 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/ada.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/ada.min.js
@@ -1,26 +1,25 @@
-/*! `ada` grammar compiled for Highlight.js 11.6.0 */
+/*! `ada` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
-const n="[A-Za-z](_?[A-Za-z0-9.])*",s="[]\\{\\}%#'\"",a=e.COMMENT("--","$"),r={
-begin:"\\s+:\\s+",end:"\\s*(:=|;|\\)|=>|$)",illegal:s,contains:[{
+const n="\\d(_|\\d)*",s="[eE][-+]?"+n,a="\\b("+n+"#\\w+(\\.\\w+)?#("+s+")?|"+n+"(\\."+n+")?("+s+")?)",r="[A-Za-z](_?[A-Za-z0-9.])*",i="[]\\{\\}%#'\"",t=e.COMMENT("--","$"),l={
+begin:"\\s+:\\s+",end:"\\s*(:=|;|\\)|=>|$)",illegal:i,contains:[{
 beginKeywords:"loop for declare others",endsParent:!0},{className:"keyword",
 beginKeywords:"not null constant access function procedure in out aliased exception"
-},{className:"type",begin:n,endsParent:!0,relevance:0}]};return{name:"Ada",
+},{className:"type",begin:r,endsParent:!0,relevance:0}]};return{name:"Ada",
 case_insensitive:!0,keywords:{
 keyword:["abort","else","new","return","abs","elsif","not","reverse","abstract","end","accept","entry","select","access","exception","of","separate","aliased","exit","or","some","all","others","subtype","and","for","out","synchronized","array","function","overriding","at","tagged","generic","package","task","begin","goto","pragma","terminate","body","private","then","if","procedure","type","case","in","protected","constant","interface","is","raise","use","declare","range","delay","limited","record","when","delta","loop","rem","while","digits","renames","with","do","mod","requeue","xor"],
-literal:["True","False"]},contains:[a,{className:"string",begin:/"/,end:/"/,
+literal:["True","False"]},contains:[t,{className:"string",begin:/"/,end:/"/,
 contains:[{begin:/""/,relevance:0}]},{className:"string",begin:/'.'/},{
-className:"number",
-begin:"\\b(\\d(_|\\d)*#\\w+(\\.\\w+)?#([eE][-+]?\\d(_|\\d)*)?|\\d(_|\\d)*(\\.\\d(_|\\d)*)?([eE][-+]?\\d(_|\\d)*)?)",
-relevance:0},{className:"symbol",begin:"'"+n},{className:"title",
+className:"number",begin:a,relevance:0},{className:"symbol",begin:"'"+r},{
+className:"title",
 begin:"(\\bwith\\s+)?(\\bprivate\\s+)?\\bpackage\\s+(\\bbody\\s+)?",
-end:"(is|$)",keywords:"package body",excludeBegin:!0,excludeEnd:!0,illegal:s},{
+end:"(is|$)",keywords:"package body",excludeBegin:!0,excludeEnd:!0,illegal:i},{
 begin:"(\\b(with|overriding)\\s+)?\\b(function|procedure)\\s+",
 end:"(\\bis|\\bwith|\\brenames|\\)\\s*;)",
 keywords:"overriding function procedure with is renames return",returnBegin:!0,
-contains:[a,{className:"title",
+contains:[t,{className:"title",
 begin:"(\\bwith\\s+)?\\b(function|procedure)\\s+",end:"(\\(|\\s+|$)",
-excludeBegin:!0,excludeEnd:!0,illegal:s},r,{className:"type",
+excludeBegin:!0,excludeEnd:!0,illegal:i},l,{className:"type",
 begin:"\\breturn\\s+",end:"(\\s+|;|$)",keywords:"return",excludeBegin:!0,
-excludeEnd:!0,endsParent:!0,illegal:s}]},{className:"type",
-begin:"\\b(sub)?type\\s+",end:"\\s+",keywords:"type",excludeBegin:!0,illegal:s
-},r]}}})();export default hljsGrammar;
\ No newline at end of file
+excludeEnd:!0,endsParent:!0,illegal:i}]},{className:"type",
+begin:"\\b(sub)?type\\s+",end:"\\s+",keywords:"type",excludeBegin:!0,illegal:i
+},l]}}})();export default hljsGrammar;
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/angelscript.min.js b/vendor/assets/javascripts/highlightjs/es/languages/angelscript.min.js
index c7a6c370c74..3de322271a8 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/angelscript.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/angelscript.min.js
@@ -1,4 +1,4 @@
-/*! `angelscript` grammar compiled for Highlight.js 11.6.0 */
+/*! `angelscript` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const n={className:"built_in",
 begin:"\\b(void|bool|int8|int16|int32|int64|int|uint8|uint16|uint32|uint64|uint|string|ref|array|double|float|auto|dictionary)"
 },a={className:"symbol",begin:"[a-zA-Z0-9_]+@"},i={className:"keyword",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/apache.min.js b/vendor/assets/javascripts/highlightjs/es/languages/apache.min.js
index ac01da2e8ee..d5ccc0c6a7b 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/apache.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/apache.min.js
@@ -1,4 +1,4 @@
-/*! `apache` grammar compiled for Highlight.js 11.6.0 */
+/*! `apache` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const a={className:"number",
 begin:/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(:\d{1,5})?/};return{
 name:"Apache config",aliases:["apacheconf"],case_insensitive:!0,
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/applescript.min.js b/vendor/assets/javascripts/highlightjs/es/languages/applescript.min.js
index e3efff2b569..bfc4c30ff46 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/applescript.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/applescript.min.js
@@ -1,4 +1,4 @@
-/*! `applescript` grammar compiled for Highlight.js 11.6.0 */
+/*! `applescript` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const t=e.regex,r=e.inherit(e.QUOTE_STRING_MODE,{illegal:null}),a={
 className:"params",begin:/\(/,end:/\)/,contains:["self",e.C_NUMBER_MODE,r]
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/arcade.min.js b/vendor/assets/javascripts/highlightjs/es/languages/arcade.min.js
index a2b6a259fc2..e9f1864b481 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/arcade.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/arcade.min.js
@@ -1,4 +1,4 @@
-/*! `arcade` grammar compiled for Highlight.js 11.6.0 */
+/*! `arcade` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const n="[A-Za-z_][0-9A-Za-z_]*",a={
 keyword:["if","for","while","var","new","function","do","return","void","else","break"],
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/arduino.min.js b/vendor/assets/javascripts/highlightjs/es/languages/arduino.min.js
index 2339e12fd53..02aff3f4834 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/arduino.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/arduino.min.js
@@ -1,51 +1,51 @@
-/*! `arduino` grammar compiled for Highlight.js 11.6.0 */
+/*! `arduino` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const t={
 type:["boolean","byte","word","String"],
 built_in:["KeyboardController","MouseController","SoftwareSerial","EthernetServer","EthernetClient","LiquidCrystal","RobotControl","GSMVoiceCall","EthernetUDP","EsploraTFT","HttpClient","RobotMotor","WiFiClient","GSMScanner","FileSystem","Scheduler","GSMServer","YunClient","YunServer","IPAddress","GSMClient","GSMModem","Keyboard","Ethernet","Console","GSMBand","Esplora","Stepper","Process","WiFiUDP","GSM_SMS","Mailbox","USBHost","Firmata","PImage","Client","Server","GSMPIN","FileIO","Bridge","Serial","EEPROM","Stream","Mouse","Audio","Servo","File","Task","GPRS","WiFi","Wire","TFT","GSM","SPI","SD"],
 _hints:["setup","loop","runShellCommandAsynchronously","analogWriteResolution","retrieveCallingNumber","printFirmwareVersion","analogReadResolution","sendDigitalPortPair","noListenOnLocalhost","readJoystickButton","setFirmwareVersion","readJoystickSwitch","scrollDisplayRight","getVoiceCallStatus","scrollDisplayLeft","writeMicroseconds","delayMicroseconds","beginTransmission","getSignalStrength","runAsynchronously","getAsynchronously","listenOnLocalhost","getCurrentCarrier","readAccelerometer","messageAvailable","sendDigitalPorts","lineFollowConfig","countryNameWrite","runShellCommand","readStringUntil","rewindDirectory","readTemperature","setClockDivider","readLightSensor","endTransmission","analogReference","detachInterrupt","countryNameRead","attachInterrupt","encryptionType","readBytesUntil","robotNameWrite","readMicrophone","robotNameRead","cityNameWrite","userNameWrite","readJoystickY","readJoystickX","mouseReleased","openNextFile","scanNetworks","noInterrupts","digitalWrite","beginSpeaker","mousePressed","isActionDone","mouseDragged","displayLogos","noAutoscroll","addParameter","remoteNumber","getModifiers","keyboardRead","userNameRead","waitContinue","processInput","parseCommand","printVersion","readNetworks","writeMessage","blinkVersion","cityNameRead","readMessage","setDataMode","parsePacket","isListening","setBitOrder","beginPacket","isDirectory","motorsWrite","drawCompass","digitalRead","clearScreen","serialEvent","rightToLeft","setTextSize","leftToRight","requestFrom","keyReleased","compassRead","analogWrite","interrupts","WiFiServer","disconnect","playMelody","parseFloat","autoscroll","getPINUsed","setPINUsed","setTimeout","sendAnalog","readSlider","analogRead","beginWrite","createChar","motorsStop","keyPressed","tempoWrite","readButton","subnetMask","debugPrint","macAddress","writeGreen","randomSeed","attachGPRS","readString","sendString","remotePort","releaseAll","mouseMoved","background","getXChange","getYChange","answerCall","getResult","voiceCall","endPacket","constrain","getSocket","writeJSON","getButton","available","connected","findUntil","readBytes","exitValue","readGreen","writeBlue","startLoop","IPAddress","isPressed","sendSysex","pauseMode","gatewayIP","setCursor","getOemKey","tuneWrite","noDisplay","loadImage","switchPIN","onRequest","onReceive","changePIN","playFile","noBuffer","parseInt","overflow","checkPIN","knobRead","beginTFT","bitClear","updateIR","bitWrite","position","writeRGB","highByte","writeRed","setSpeed","readBlue","noStroke","remoteIP","transfer","shutdown","hangCall","beginSMS","endWrite","attached","maintain","noCursor","checkReg","checkPUK","shiftOut","isValid","shiftIn","pulseIn","connect","println","localIP","pinMode","getIMEI","display","noBlink","process","getBand","running","beginSD","drawBMP","lowByte","setBand","release","bitRead","prepare","pointTo","readRed","setMode","noFill","remove","listen","stroke","detach","attach","noTone","exists","buffer","height","bitSet","circle","config","cursor","random","IRread","setDNS","endSMS","getKey","micros","millis","begin","print","write","ready","flush","width","isPIN","blink","clear","press","mkdir","rmdir","close","point","yield","image","BSSID","click","delay","read","text","move","peek","beep","rect","line","open","seek","fill","size","turn","stop","home","find","step","tone","sqrt","RSSI","SSID","end","bit","tan","cos","sin","pow","map","abs","max","min","get","run","put"],
 literal:["DIGITAL_MESSAGE","FIRMATA_STRING","ANALOG_MESSAGE","REPORT_DIGITAL","REPORT_ANALOG","INPUT_PULLUP","SET_PIN_MODE","INTERNAL2V56","SYSTEM_RESET","LED_BUILTIN","INTERNAL1V1","SYSEX_START","INTERNAL","EXTERNAL","DEFAULT","OUTPUT","INPUT","HIGH","LOW"]
 },r=(e=>{const t=e.regex,r=e.COMMENT("//","$",{contains:[{begin:/\\\n/}]
-}),a="[a-zA-Z_]\\w*::",n="(?!struct)(decltype\\(auto\\)|"+t.optional(a)+"[a-zA-Z_]\\w*"+t.optional("<[^<>]+>")+")",i={
-className:"type",begin:"\\b[a-z\\d_]*_t\\b"},s={className:"string",variants:[{
+}),a="decltype\\(auto\\)",n="[a-zA-Z_]\\w*::",i="(?!struct)("+a+"|"+t.optional(n)+"[a-zA-Z_]\\w*"+t.optional("<[^<>]+>")+")",s={
+className:"type",begin:"\\b[a-z\\d_]*_t\\b"},o={className:"string",variants:[{
 begin:'(u8?|U|L)?"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE]},{
 begin:"(u8?|U|L)?'(\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4,8}|[0-7]{3}|\\S)|.)",
 end:"'",illegal:"."},e.END_SAME_AS_BEGIN({
-begin:/(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,end:/\)([^()\\ ]{0,16})"/})]},o={
+begin:/(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,end:/\)([^()\\ ]{0,16})"/})]},l={
 className:"number",variants:[{begin:"\\b(0b[01']+)"},{
 begin:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)((ll|LL|l|L)(u|U)?|(u|U)(ll|LL|l|L)?|f|F|b|B)"
 },{
 begin:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"
-}],relevance:0},l={className:"meta",begin:/#\s*[a-z]+\b/,end:/$/,keywords:{
+}],relevance:0},c={className:"meta",begin:/#\s*[a-z]+\b/,end:/$/,keywords:{
 keyword:"if else elif endif define undef warning error line pragma _Pragma ifdef ifndef include"
-},contains:[{begin:/\\\n/,relevance:0},e.inherit(s,{className:"string"}),{
-className:"string",begin:/<.*?>/},r,e.C_BLOCK_COMMENT_MODE]},c={
-className:"title",begin:t.optional(a)+e.IDENT_RE,relevance:0
-},d=t.optional(a)+e.IDENT_RE+"\\s*\\(",u={
+},contains:[{begin:/\\\n/,relevance:0},e.inherit(o,{className:"string"}),{
+className:"string",begin:/<.*?>/},r,e.C_BLOCK_COMMENT_MODE]},d={
+className:"title",begin:t.optional(n)+e.IDENT_RE,relevance:0
+},u=t.optional(n)+e.IDENT_RE+"\\s*\\(",p={
 type:["bool","char","char16_t","char32_t","char8_t","double","float","int","long","short","void","wchar_t","unsigned","signed","const","static"],
 keyword:["alignas","alignof","and","and_eq","asm","atomic_cancel","atomic_commit","atomic_noexcept","auto","bitand","bitor","break","case","catch","class","co_await","co_return","co_yield","compl","concept","const_cast|10","consteval","constexpr","constinit","continue","decltype","default","delete","do","dynamic_cast|10","else","enum","explicit","export","extern","false","final","for","friend","goto","if","import","inline","module","mutable","namespace","new","noexcept","not","not_eq","nullptr","operator","or","or_eq","override","private","protected","public","reflexpr","register","reinterpret_cast|10","requires","return","sizeof","static_assert","static_cast|10","struct","switch","synchronized","template","this","thread_local","throw","transaction_safe","transaction_safe_dynamic","true","try","typedef","typeid","typename","union","using","virtual","volatile","while","xor","xor_eq"],
 literal:["NULL","false","nullopt","nullptr","true"],built_in:["_Pragma"],
 _type_hints:["any","auto_ptr","barrier","binary_semaphore","bitset","complex","condition_variable","condition_variable_any","counting_semaphore","deque","false_type","future","imaginary","initializer_list","istringstream","jthread","latch","lock_guard","multimap","multiset","mutex","optional","ostringstream","packaged_task","pair","promise","priority_queue","queue","recursive_mutex","recursive_timed_mutex","scoped_lock","set","shared_future","shared_lock","shared_mutex","shared_timed_mutex","shared_ptr","stack","string_view","stringstream","timed_mutex","thread","true_type","tuple","unique_lock","unique_ptr","unordered_map","unordered_multimap","unordered_multiset","unordered_set","variant","vector","weak_ptr","wstring","wstring_view"]
-},p={className:"function.dispatch",relevance:0,keywords:{
+},m={className:"function.dispatch",relevance:0,keywords:{
 _hint:["abort","abs","acos","apply","as_const","asin","atan","atan2","calloc","ceil","cerr","cin","clog","cos","cosh","cout","declval","endl","exchange","exit","exp","fabs","floor","fmod","forward","fprintf","fputs","free","frexp","fscanf","future","invoke","isalnum","isalpha","iscntrl","isdigit","isgraph","islower","isprint","ispunct","isspace","isupper","isxdigit","labs","launder","ldexp","log","log10","make_pair","make_shared","make_shared_for_overwrite","make_tuple","make_unique","malloc","memchr","memcmp","memcpy","memset","modf","move","pow","printf","putchar","puts","realloc","scanf","sin","sinh","snprintf","sprintf","sqrt","sscanf","std","stderr","stdin","stdout","strcat","strchr","strcmp","strcpy","strcspn","strlen","strncat","strncmp","strncpy","strpbrk","strrchr","strspn","strstr","swap","tan","tanh","terminate","to_underlying","tolower","toupper","vfprintf","visit","vprintf","vsprintf"]
 },
 begin:t.concat(/\b/,/(?!decltype)/,/(?!if)/,/(?!for)/,/(?!switch)/,/(?!while)/,e.IDENT_RE,t.lookahead(/(<[^<>]+>|)\s*\(/))
-},m=[p,l,i,r,e.C_BLOCK_COMMENT_MODE,o,s],g={variants:[{begin:/=/,end:/;/},{
+},g=[m,c,s,r,e.C_BLOCK_COMMENT_MODE,l,o],_={variants:[{begin:/=/,end:/;/},{
 begin:/\(/,end:/\)/},{beginKeywords:"new throw return else",end:/;/}],
-keywords:u,contains:m.concat([{begin:/\(/,end:/\)/,keywords:u,
-contains:m.concat(["self"]),relevance:0}]),relevance:0},_={className:"function",
-begin:"("+n+"[\\*&\\s]+)+"+d,returnBegin:!0,end:/[{;=]/,excludeEnd:!0,
-keywords:u,illegal:/[^\w\s\*&:<>.]/,contains:[{begin:"decltype\\(auto\\)",
-keywords:u,relevance:0},{begin:d,returnBegin:!0,contains:[c],relevance:0},{
-begin:/::/,relevance:0},{begin:/:/,endsWithParent:!0,contains:[s,o]},{
-relevance:0,match:/,/},{className:"params",begin:/\(/,end:/\)/,keywords:u,
-relevance:0,contains:[r,e.C_BLOCK_COMMENT_MODE,s,o,i,{begin:/\(/,end:/\)/,
-keywords:u,relevance:0,contains:["self",r,e.C_BLOCK_COMMENT_MODE,s,o,i]}]
-},i,r,e.C_BLOCK_COMMENT_MODE,l]};return{name:"C++",
-aliases:["cc","c++","h++","hpp","hh","hxx","cxx"],keywords:u,illegal:"</",
+keywords:p,contains:g.concat([{begin:/\(/,end:/\)/,keywords:p,
+contains:g.concat(["self"]),relevance:0}]),relevance:0},h={className:"function",
+begin:"("+i+"[\\*&\\s]+)+"+u,returnBegin:!0,end:/[{;=]/,excludeEnd:!0,
+keywords:p,illegal:/[^\w\s\*&:<>.]/,contains:[{begin:a,keywords:p,relevance:0},{
+begin:u,returnBegin:!0,contains:[d],relevance:0},{begin:/::/,relevance:0},{
+begin:/:/,endsWithParent:!0,contains:[o,l]},{relevance:0,match:/,/},{
+className:"params",begin:/\(/,end:/\)/,keywords:p,relevance:0,
+contains:[r,e.C_BLOCK_COMMENT_MODE,o,l,s,{begin:/\(/,end:/\)/,keywords:p,
+relevance:0,contains:["self",r,e.C_BLOCK_COMMENT_MODE,o,l,s]}]
+},s,r,e.C_BLOCK_COMMENT_MODE,c]};return{name:"C++",
+aliases:["cc","c++","h++","hpp","hh","hxx","cxx"],keywords:p,illegal:"</",
 classNameAliases:{"function.dispatch":"built_in"},
-contains:[].concat(g,_,p,m,[l,{
+contains:[].concat(_,h,m,g,[c,{
 begin:"\\b(deque|list|queue|priority_queue|pair|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array|tuple|optional|variant|function)\\s*<(?!<)",
-end:">",keywords:u,contains:["self",i]},{begin:e.IDENT_RE+"::",keywords:u},{
+end:">",keywords:p,contains:["self",s]},{begin:e.IDENT_RE+"::",keywords:p},{
 match:[/\b(?:enum(?:\s+(?:class|struct))?|class|struct|union)/,/\s+/,/\w+/],
 className:{1:"keyword",3:"title.class"}}])}})(e),a=r.keywords
 ;return a.type=[...a.type,...t.type],
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/armasm.min.js b/vendor/assets/javascripts/highlightjs/es/languages/armasm.min.js
index fd3c3d11fb1..80abfdd8905 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/armasm.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/armasm.min.js
@@ -1,4 +1,4 @@
-/*! `armasm` grammar compiled for Highlight.js 11.6.0 */
+/*! `armasm` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return s=>{const r={
 variants:[s.COMMENT("^[ \\t]*(?=#)","$",{relevance:0,excludeBegin:!0
 }),s.COMMENT("[;@]","$",{relevance:0
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/asciidoc.min.js b/vendor/assets/javascripts/highlightjs/es/languages/asciidoc.min.js
index ae5df1ee55a..a8804b7845a 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/asciidoc.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/asciidoc.min.js
@@ -1,4 +1,4 @@
-/*! `asciidoc` grammar compiled for Highlight.js 11.6.0 */
+/*! `asciidoc` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const n=e.regex,a=[{
 className:"strong",begin:/\*{2}([^\n]+?)\*{2}/},{className:"strong",
 begin:n.concat(/\*\*/,/((\*(?!\*)|\\[^\n]|[^*\n\\])+\n)+/,/(\*(?!\*)|\\[^\n]|[^*\n\\])*/,/\*\*/),
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/aspectj.min.js b/vendor/assets/javascripts/highlightjs/es/languages/aspectj.min.js
index bddb7eb9cf7..6e773dc5fe1 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/aspectj.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/aspectj.min.js
@@ -1,4 +1,4 @@
-/*! `aspectj` grammar compiled for Highlight.js 11.6.0 */
+/*! `aspectj` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const n=e.regex,t=["false","synchronized","int","abstract","float","private","char","boolean","static","null","if","const","for","true","while","long","throw","strictfp","finally","protected","import","native","final","return","void","enum","else","extends","implements","break","transient","new","catch","instanceof","byte","super","volatile","case","assert","short","package","default","double","public","try","this","switch","continue","throws","privileged","aspectOf","adviceexecution","proceed","cflowbelow","cflow","initialization","preinitialization","staticinitialization","withincode","target","within","execution","getWithinTypeName","handler","thisJoinPoint","thisJoinPointStaticPart","thisEnclosingJoinPointStaticPart","declare","parents","warning","error","soft","precedence","thisAspectInstance"],i=["get","set","args","call"]
 ;return{name:"AspectJ",keywords:t,illegal:/<\/|#/,
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/autohotkey.min.js b/vendor/assets/javascripts/highlightjs/es/languages/autohotkey.min.js
index 66a9488eb03..1c5a8c14aa6 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/autohotkey.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/autohotkey.min.js
@@ -1,4 +1,4 @@
-/*! `autohotkey` grammar compiled for Highlight.js 11.6.0 */
+/*! `autohotkey` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const a={begin:"`[\\s\\S]"}
 ;return{name:"AutoHotkey",case_insensitive:!0,aliases:["ahk"],keywords:{
 keyword:"Break Continue Critical Exit ExitApp Gosub Goto New OnExit Pause return SetBatchLines SetTimer Suspend Thread Throw Until ahk_id ahk_class ahk_pid ahk_exe ahk_group",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/autoit.min.js b/vendor/assets/javascripts/highlightjs/es/languages/autoit.min.js
index fb54cc05c09..88d10d43ac2 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/autoit.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/autoit.min.js
@@ -1,4 +1,4 @@
-/*! `autoit` grammar compiled for Highlight.js 11.6.0 */
+/*! `autoit` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const t={
 variants:[e.COMMENT(";","$",{relevance:0
 }),e.COMMENT("#cs","#ce"),e.COMMENT("#comments-start","#comments-end")]},r={
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/avrasm.min.js b/vendor/assets/javascripts/highlightjs/es/languages/avrasm.min.js
index 972170fc04b..09d8132b5c6 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/avrasm.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/avrasm.min.js
@@ -1,4 +1,4 @@
-/*! `avrasm` grammar compiled for Highlight.js 11.6.0 */
+/*! `avrasm` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return r=>({name:"AVR Assembly",
 case_insensitive:!0,keywords:{$pattern:"\\.?"+r.IDENT_RE,
 keyword:"adc add adiw and andi asr bclr bld brbc brbs brcc brcs break breq brge brhc brhs brid brie brlo brlt brmi brne brpl brsh brtc brts brvc brvs bset bst call cbi cbr clc clh cli cln clr cls clt clv clz com cp cpc cpi cpse dec eicall eijmp elpm eor fmul fmuls fmulsu icall ijmp in inc jmp ld ldd ldi lds lpm lsl lsr mov movw mul muls mulsu neg nop or ori out pop push rcall ret reti rjmp rol ror sbc sbr sbrc sbrs sec seh sbi sbci sbic sbis sbiw sei sen ser ses set sev sez sleep spm st std sts sub subi swap tst wdr",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/awk.min.js b/vendor/assets/javascripts/highlightjs/es/languages/awk.min.js
index 6f2ca67622f..453d73483de 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/awk.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/awk.min.js
@@ -1,4 +1,4 @@
-/*! `awk` grammar compiled for Highlight.js 11.6.0 */
+/*! `awk` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"Awk",keywords:{
 keyword:"BEGIN END if else while do for in break continue delete next nextfile function func exit|10"
 },contains:[{className:"variable",variants:[{begin:/\$[\w\d#@][\w\d_]*/},{
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/axapta.min.js b/vendor/assets/javascripts/highlightjs/es/languages/axapta.min.js
index 3ffce927854..69d1cde6a7c 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/axapta.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/axapta.min.js
@@ -1,4 +1,4 @@
-/*! `axapta` grammar compiled for Highlight.js 11.6.0 */
+/*! `axapta` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const t=e.UNDERSCORE_IDENT_RE,s={
 keyword:["abstract","as","asc","avg","break","breakpoint","by","byref","case","catch","changecompany","class","client","client","common","const","continue","count","crosscompany","delegate","delete_from","desc","display","div","do","edit","else","eventhandler","exists","extends","final","finally","firstfast","firstonly","firstonly1","firstonly10","firstonly100","firstonly1000","flush","for","forceliterals","forcenestedloop","forceplaceholders","forceselectorder","forupdate","from","generateonly","group","hint","if","implements","in","index","insert_recordset","interface","internal","is","join","like","maxof","minof","mod","namespace","new","next","nofetch","notexists","optimisticlock","order","outer","pessimisticlock","print","private","protected","public","readonly","repeatableread","retry","return","reverse","select","server","setting","static","sum","super","switch","this","throw","try","ttsabort","ttsbegin","ttscommit","unchecked","update_recordset","using","validtimestate","void","where","while"],
 built_in:["anytype","boolean","byte","char","container","date","double","enum","guid","int","int64","long","real","short","str","utcdatetime","var"],
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/bash.min.js b/vendor/assets/javascripts/highlightjs/es/languages/bash.min.js
index 2fa608f93f4..efd2c5337ba 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/bash.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/bash.min.js
@@ -1,4 +1,4 @@
-/*! `bash` grammar compiled for Highlight.js 11.6.0 */
+/*! `bash` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const s=e.regex,t={},a={
 begin:/\$\{/,end:/\}/,contains:["self",{begin:/:-/,contains:[t]}]}
 ;Object.assign(t,{className:"variable",variants:[{
@@ -6,13 +6,13 @@ begin:s.concat(/\$[\w\d#@][\w\d_]*/,"(?![\\w\\d])(?![$])")},a]});const n={
 className:"subst",begin:/\$\(/,end:/\)/,contains:[e.BACKSLASH_ESCAPE]},i={
 begin:/<<-?\s*(?=\w+)/,starts:{contains:[e.END_SAME_AS_BEGIN({begin:/(\w+)/,
 end:/(\w+)/,className:"string"})]}},c={className:"string",begin:/"/,end:/"/,
-contains:[e.BACKSLASH_ESCAPE,t,n]};n.contains.push(c);const o={begin:/\$\(\(/,
+contains:[e.BACKSLASH_ESCAPE,t,n]};n.contains.push(c);const o={begin:/\$?\(\(/,
 end:/\)\)/,contains:[{begin:/\d+#[0-9a-f]+/,className:"number"},e.NUMBER_MODE,t]
 },r=e.SHEBANG({binary:"(fish|bash|zsh|sh|csh|ksh|tcsh|dash|scsh)",relevance:10
 }),l={className:"function",begin:/\w[\w\d_]*\s*\(\s*\)\s*\{/,returnBegin:!0,
 contains:[e.inherit(e.TITLE_MODE,{begin:/\w[\w\d_]*/})],relevance:0};return{
 name:"Bash",aliases:["sh"],keywords:{$pattern:/\b[a-z][a-z0-9._-]+\b/,
-keyword:["if","then","else","elif","fi","for","while","in","do","done","case","esac","function"],
+keyword:["if","then","else","elif","fi","for","while","until","in","do","done","case","esac","function","select"],
 literal:["true","false"],
 built_in:["break","cd","continue","eval","exec","exit","export","getopts","hash","pwd","readonly","return","shift","test","times","trap","umask","unset","alias","bind","builtin","caller","command","declare","echo","enable","help","let","local","logout","mapfile","printf","read","readarray","source","type","typeset","ulimit","unalias","set","shopt","autoload","bg","bindkey","bye","cap","chdir","clone","comparguments","compcall","compctl","compdescribe","compfiles","compgroups","compquote","comptags","comptry","compvalues","dirs","disable","disown","echotc","echoti","emulate","fc","fg","float","functions","getcap","getln","history","integer","jobs","kill","limit","log","noglob","popd","print","pushd","pushln","rehash","sched","setcap","setopt","stat","suspend","ttyctl","unfunction","unhash","unlimit","unsetopt","vared","wait","whence","where","which","zcompile","zformat","zftp","zle","zmodload","zparseopts","zprof","zpty","zregexparse","zsocket","zstyle","ztcp","chcon","chgrp","chown","chmod","cp","dd","df","dir","dircolors","ln","ls","mkdir","mkfifo","mknod","mktemp","mv","realpath","rm","rmdir","shred","sync","touch","truncate","vdir","b2sum","base32","base64","cat","cksum","comm","csplit","cut","expand","fmt","fold","head","join","md5sum","nl","numfmt","od","paste","ptx","pr","sha1sum","sha224sum","sha256sum","sha384sum","sha512sum","shuf","sort","split","sum","tac","tail","tr","tsort","unexpand","uniq","wc","arch","basename","chroot","date","dirname","du","echo","env","expr","factor","groups","hostid","id","link","logname","nice","nohup","nproc","pathchk","pinky","printenv","printf","pwd","readlink","runcon","seq","sleep","stat","stdbuf","stty","tee","test","timeout","tty","uname","unlink","uptime","users","who","whoami","yes"]
 },contains:[r,e.SHEBANG(),l,o,e.HASH_COMMENT_MODE,i,{match:/(\/[a-z._-]+)+/},c,{
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/basic.min.js b/vendor/assets/javascripts/highlightjs/es/languages/basic.min.js
index 1d0b821463d..d0acc047463 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/basic.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/basic.min.js
@@ -1,4 +1,4 @@
-/*! `basic` grammar compiled for Highlight.js 11.6.0 */
+/*! `basic` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return E=>({name:"BASIC",case_insensitive:!0,
 illegal:"^.",keywords:{$pattern:"[a-zA-Z][a-zA-Z0-9_$%!#]*",
 keyword:["ABS","ASC","AND","ATN","AUTO|0","BEEP","BLOAD|10","BSAVE|10","CALL","CALLS","CDBL","CHAIN","CHDIR","CHR$|10","CINT","CIRCLE","CLEAR","CLOSE","CLS","COLOR","COM","COMMON","CONT","COS","CSNG","CSRLIN","CVD","CVI","CVS","DATA","DATE$","DEFDBL","DEFINT","DEFSNG","DEFSTR","DEF|0","SEG","USR","DELETE","DIM","DRAW","EDIT","END","ENVIRON","ENVIRON$","EOF","EQV","ERASE","ERDEV","ERDEV$","ERL","ERR","ERROR","EXP","FIELD","FILES","FIX","FOR|0","FRE","GET","GOSUB|10","GOTO","HEX$","IF","THEN","ELSE|0","INKEY$","INP","INPUT","INPUT#","INPUT$","INSTR","IMP","INT","IOCTL","IOCTL$","KEY","ON","OFF","LIST","KILL","LEFT$","LEN","LET","LINE","LLIST","LOAD","LOC","LOCATE","LOF","LOG","LPRINT","USING","LSET","MERGE","MID$","MKDIR","MKD$","MKI$","MKS$","MOD","NAME","NEW","NEXT","NOISE","NOT","OCT$","ON","OR","PEN","PLAY","STRIG","OPEN","OPTION","BASE","OUT","PAINT","PALETTE","PCOPY","PEEK","PMAP","POINT","POKE","POS","PRINT","PRINT]","PSET","PRESET","PUT","RANDOMIZE","READ","REM","RENUM","RESET|0","RESTORE","RESUME","RETURN|0","RIGHT$","RMDIR","RND","RSET","RUN","SAVE","SCREEN","SGN","SHELL","SIN","SOUND","SPACE$","SPC","SQR","STEP","STICK","STOP","STR$","STRING$","SWAP","SYSTEM","TAB","TAN","TIME$","TIMER","TROFF","TRON","TO","USR","VAL","VARPTR","VARPTR$","VIEW","WAIT","WHILE","WEND","WIDTH","WINDOW","WRITE","XOR"]
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/bnf.min.js b/vendor/assets/javascripts/highlightjs/es/languages/bnf.min.js
index b49d0a2faaf..7def4b0af64 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/bnf.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/bnf.min.js
@@ -1,4 +1,4 @@
-/*! `bnf` grammar compiled for Highlight.js 11.6.0 */
+/*! `bnf` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return a=>({name:"Backus\u2013Naur Form",
 contains:[{className:"attribute",begin:/</,end:/>/},{begin:/::=/,end:/$/,
 contains:[{begin:/</,end:/>/
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/brainfuck.min.js b/vendor/assets/javascripts/highlightjs/es/languages/brainfuck.min.js
index 294a792c075..16a2a11a8d6 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/brainfuck.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/brainfuck.min.js
@@ -1,4 +1,4 @@
-/*! `brainfuck` grammar compiled for Highlight.js 11.6.0 */
+/*! `brainfuck` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const a={className:"literal",
 begin:/[+-]+/,relevance:0};return{name:"Brainfuck",aliases:["bf"],
 contains:[e.COMMENT(/[^\[\]\.,\+\-<> \r\n]/,/[\[\]\.,\+\-<> \r\n]/,{contains:[{
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/c.min.js b/vendor/assets/javascripts/highlightjs/es/languages/c.min.js
index df6a3911b02..5839c0bc44e 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/c.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/c.min.js
@@ -1,41 +1,40 @@
-/*! `c` grammar compiled for Highlight.js 11.6.0 */
+/*! `c` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const n=e.regex,t=e.COMMENT("//","$",{contains:[{begin:/\\\n/}]
-}),a="[a-zA-Z_]\\w*::",s="(decltype\\(auto\\)|"+n.optional(a)+"[a-zA-Z_]\\w*"+n.optional("<[^<>]+>")+")",r={
+}),s="decltype\\(auto\\)",a="[a-zA-Z_]\\w*::",r="("+s+"|"+n.optional(a)+"[a-zA-Z_]\\w*"+n.optional("<[^<>]+>")+")",i={
 className:"type",variants:[{begin:"\\b[a-z\\d_]*_t\\b"},{
-match:/\batomic_[a-z]{3,6}\b/}]},i={className:"string",variants:[{
+match:/\batomic_[a-z]{3,6}\b/}]},l={className:"string",variants:[{
 begin:'(u8?|U|L)?"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE]},{
 begin:"(u8?|U|L)?'(\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4,8}|[0-7]{3}|\\S)|.)",
 end:"'",illegal:"."},e.END_SAME_AS_BEGIN({
-begin:/(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,end:/\)([^()\\ ]{0,16})"/})]},l={
+begin:/(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,end:/\)([^()\\ ]{0,16})"/})]},o={
 className:"number",variants:[{begin:"\\b(0b[01']+)"},{
 begin:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)((ll|LL|l|L)(u|U)?|(u|U)(ll|LL|l|L)?|f|F|b|B)"
 },{
 begin:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"
-}],relevance:0},o={className:"meta",begin:/#\s*[a-z]+\b/,end:/$/,keywords:{
+}],relevance:0},c={className:"meta",begin:/#\s*[a-z]+\b/,end:/$/,keywords:{
 keyword:"if else elif endif define undef warning error line pragma _Pragma ifdef ifndef include"
-},contains:[{begin:/\\\n/,relevance:0},e.inherit(i,{className:"string"}),{
-className:"string",begin:/<.*?>/},t,e.C_BLOCK_COMMENT_MODE]},c={
+},contains:[{begin:/\\\n/,relevance:0},e.inherit(l,{className:"string"}),{
+className:"string",begin:/<.*?>/},t,e.C_BLOCK_COMMENT_MODE]},d={
 className:"title",begin:n.optional(a)+e.IDENT_RE,relevance:0
-},d=n.optional(a)+e.IDENT_RE+"\\s*\\(",u={
+},u=n.optional(a)+e.IDENT_RE+"\\s*\\(",m={
 keyword:["asm","auto","break","case","continue","default","do","else","enum","extern","for","fortran","goto","if","inline","register","restrict","return","sizeof","struct","switch","typedef","union","volatile","while","_Alignas","_Alignof","_Atomic","_Generic","_Noreturn","_Static_assert","_Thread_local","alignas","alignof","noreturn","static_assert","thread_local","_Pragma"],
 type:["float","double","signed","unsigned","int","short","long","char","void","_Bool","_Complex","_Imaginary","_Decimal32","_Decimal64","_Decimal128","const","static","complex","bool","imaginary"],
 literal:"true false NULL",
 built_in:"std string wstring cin cout cerr clog stdin stdout stderr stringstream istringstream ostringstream auto_ptr deque list queue stack vector map set pair bitset multiset multimap unordered_set unordered_map unordered_multiset unordered_multimap priority_queue make_pair array shared_ptr abort terminate abs acos asin atan2 atan calloc ceil cosh cos exit exp fabs floor fmod fprintf fputs free frexp fscanf future isalnum isalpha iscntrl isdigit isgraph islower isprint ispunct isspace isupper isxdigit tolower toupper labs ldexp log10 log malloc realloc memchr memcmp memcpy memset modf pow printf putchar puts scanf sinh sin snprintf sprintf sqrt sscanf strcat strchr strcmp strcpy strcspn strlen strncat strncmp strncpy strpbrk strrchr strspn strstr tanh tan vfprintf vprintf vsprintf endl initializer_list unique_ptr"
-},m=[o,r,t,e.C_BLOCK_COMMENT_MODE,l,i],g={variants:[{begin:/=/,end:/;/},{
+},g=[c,i,t,e.C_BLOCK_COMMENT_MODE,o,l],p={variants:[{begin:/=/,end:/;/},{
 begin:/\(/,end:/\)/},{beginKeywords:"new throw return else",end:/;/}],
-keywords:u,contains:m.concat([{begin:/\(/,end:/\)/,keywords:u,
-contains:m.concat(["self"]),relevance:0}]),relevance:0},p={
-begin:"("+s+"[\\*&\\s]+)+"+d,returnBegin:!0,end:/[{;=]/,excludeEnd:!0,
-keywords:u,illegal:/[^\w\s\*&:<>.]/,contains:[{begin:"decltype\\(auto\\)",
-keywords:u,relevance:0},{begin:d,returnBegin:!0,contains:[e.inherit(c,{
-className:"title.function"})],relevance:0},{relevance:0,match:/,/},{
-className:"params",begin:/\(/,end:/\)/,keywords:u,relevance:0,
-contains:[t,e.C_BLOCK_COMMENT_MODE,i,l,r,{begin:/\(/,end:/\)/,keywords:u,
-relevance:0,contains:["self",t,e.C_BLOCK_COMMENT_MODE,i,l,r]}]
-},r,t,e.C_BLOCK_COMMENT_MODE,o]};return{name:"C",aliases:["h"],keywords:u,
-disableAutodetect:!0,illegal:"</",contains:[].concat(g,p,m,[o,{
-begin:e.IDENT_RE+"::",keywords:u},{className:"class",
+keywords:m,contains:g.concat([{begin:/\(/,end:/\)/,keywords:m,
+contains:g.concat(["self"]),relevance:0}]),relevance:0},_={
+begin:"("+r+"[\\*&\\s]+)+"+u,returnBegin:!0,end:/[{;=]/,excludeEnd:!0,
+keywords:m,illegal:/[^\w\s\*&:<>.]/,contains:[{begin:s,keywords:m,relevance:0},{
+begin:u,returnBegin:!0,contains:[e.inherit(d,{className:"title.function"})],
+relevance:0},{relevance:0,match:/,/},{className:"params",begin:/\(/,end:/\)/,
+keywords:m,relevance:0,contains:[t,e.C_BLOCK_COMMENT_MODE,l,o,i,{begin:/\(/,
+end:/\)/,keywords:m,relevance:0,contains:["self",t,e.C_BLOCK_COMMENT_MODE,l,o,i]
+}]},i,t,e.C_BLOCK_COMMENT_MODE,c]};return{name:"C",aliases:["h"],keywords:m,
+disableAutodetect:!0,illegal:"</",contains:[].concat(p,_,g,[c,{
+begin:e.IDENT_RE+"::",keywords:m},{className:"class",
 beginKeywords:"enum class struct union",end:/[{;:<>=]/,contains:[{
-beginKeywords:"final class struct"},e.TITLE_MODE]}]),exports:{preprocessor:o,
-strings:i,keywords:u}}}})();export default hljsGrammar;
\ No newline at end of file
+beginKeywords:"final class struct"},e.TITLE_MODE]}]),exports:{preprocessor:c,
+strings:l,keywords:m}}}})();export default hljsGrammar;
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/cal.min.js b/vendor/assets/javascripts/highlightjs/es/languages/cal.min.js
index a4beb647eb2..61ade358d2b 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/cal.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/cal.min.js
@@ -1,4 +1,4 @@
-/*! `cal` grammar compiled for Highlight.js 11.6.0 */
+/*! `cal` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const r=e.regex,a=["div","mod","in","and","or","not","xor","asserterror","begin","case","do","downto","else","end","exit","for","local","if","of","repeat","then","to","until","while","with","var"],n=[e.C_LINE_COMMENT_MODE,e.COMMENT(/\{/,/\}/,{
 relevance:0}),e.COMMENT(/\(\*/,/\*\)/,{relevance:10})],t={className:"string",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/capnproto.min.js b/vendor/assets/javascripts/highlightjs/es/languages/capnproto.min.js
index 03bc209984c..5fa4e893e9d 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/capnproto.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/capnproto.min.js
@@ -1,4 +1,4 @@
-/*! `capnproto` grammar compiled for Highlight.js 11.6.0 */
+/*! `capnproto` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return t=>{const n={variants:[{
 match:[/(struct|enum|interface)/,/\s+/,t.IDENT_RE]},{
 match:[/extends/,/\s*\(/,t.IDENT_RE,/\s*\)/]}],scope:{1:"keyword",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/ceylon.min.js b/vendor/assets/javascripts/highlightjs/es/languages/ceylon.min.js
index 68574aec2ee..9d76ab9bc16 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/ceylon.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/ceylon.min.js
@@ -1,4 +1,4 @@
-/*! `ceylon` grammar compiled for Highlight.js 11.6.0 */
+/*! `ceylon` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const a=["assembly","module","package","import","alias","class","interface","object","given","value","assign","void","function","new","of","extends","satisfies","abstracts","in","out","return","break","continue","throw","assert","dynamic","if","else","switch","case","for","while","try","catch","finally","then","let","this","outer","super","is","exists","nonempty"],s={
 className:"subst",excludeBegin:!0,excludeEnd:!0,begin:/``/,end:/``/,keywords:a,
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/clean.min.js b/vendor/assets/javascripts/highlightjs/es/languages/clean.min.js
index 0acc473fe49..1a34ef2bdba 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/clean.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/clean.min.js
@@ -1,4 +1,4 @@
-/*! `clean` grammar compiled for Highlight.js 11.6.0 */
+/*! `clean` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"Clean",
 aliases:["icl","dcl"],keywords:{
 keyword:["if","let","in","with","where","case","of","class","instance","otherwise","implementation","definition","system","module","from","import","qualified","as","special","code","inline","foreign","export","ccall","stdcall","generic","derive","infix","infixl","infixr"],
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/clojure-repl.min.js b/vendor/assets/javascripts/highlightjs/es/languages/clojure-repl.min.js
index 824bba75bc7..25835d64bbc 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/clojure-repl.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/clojure-repl.min.js
@@ -1,4 +1,4 @@
-/*! `clojure-repl` grammar compiled for Highlight.js 11.6.0 */
+/*! `clojure-repl` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return a=>({name:"Clojure REPL",contains:[{
 className:"meta.prompt",begin:/^([\w.-]+|\s*#_)?=>/,starts:{end:/$/,
 subLanguage:"clojure"}}]})})();export default hljsGrammar;
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/clojure.min.js b/vendor/assets/javascripts/highlightjs/es/languages/clojure.min.js
index b578f77169d..ee0f3433c2f 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/clojure.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/clojure.min.js
@@ -1,4 +1,4 @@
-/*! `clojure` grammar compiled for Highlight.js 11.6.0 */
+/*! `clojure` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const t="a-zA-Z_\\-!.?+*=<>&'",n="[#]?["+t+"]["+t+"0-9/;:$#]*",a="def defonce defprotocol defstruct defmulti defmethod defn- defn defmacro deftype defrecord",r={
 $pattern:n,
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/cmake.min.js b/vendor/assets/javascripts/highlightjs/es/languages/cmake.min.js
index d700d884f3e..ead700e305c 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/cmake.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/cmake.min.js
@@ -1,7 +1,7 @@
-/*! `cmake` grammar compiled for Highlight.js 11.6.0 */
+/*! `cmake` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"CMake",
 aliases:["cmake.in"],case_insensitive:!0,keywords:{
 keyword:"break cmake_host_system_information cmake_minimum_required cmake_parse_arguments cmake_policy configure_file continue elseif else endforeach endfunction endif endmacro endwhile execute_process file find_file find_library find_package find_path find_program foreach function get_cmake_property get_directory_property get_filename_component get_property if include include_guard list macro mark_as_advanced math message option return separate_arguments set_directory_properties set_property set site_name string unset variable_watch while add_compile_definitions add_compile_options add_custom_command add_custom_target add_definitions add_dependencies add_executable add_library add_link_options add_subdirectory add_test aux_source_directory build_command create_test_sourcelist define_property enable_language enable_testing export fltk_wrap_ui get_source_file_property get_target_property get_test_property include_directories include_external_msproject include_regular_expression install link_directories link_libraries load_cache project qt_wrap_cpp qt_wrap_ui remove_definitions set_source_files_properties set_target_properties set_tests_properties source_group target_compile_definitions target_compile_features target_compile_options target_include_directories target_link_directories target_link_libraries target_link_options target_sources try_compile try_run ctest_build ctest_configure ctest_coverage ctest_empty_binary_directory ctest_memcheck ctest_read_custom_files ctest_run_script ctest_sleep ctest_start ctest_submit ctest_test ctest_update ctest_upload build_name exec_program export_library_dependencies install_files install_programs install_targets load_command make_directory output_required_files remove subdir_depends subdirs use_mangled_mesa utility_source variable_requires write_file qt5_use_modules qt5_use_package qt5_wrap_cpp on off true false and or not command policy target test exists is_newer_than is_directory is_symlink is_absolute matches less greater equal less_equal greater_equal strless strgreater strequal strless_equal strgreater_equal version_less version_greater version_equal version_less_equal version_greater_equal in_list defined"
 },contains:[{className:"variable",begin:/\$\{/,end:/\}/
-},e.HASH_COMMENT_MODE,e.QUOTE_STRING_MODE,e.NUMBER_MODE]})})()
-;export default hljsGrammar;
\ No newline at end of file
+},e.COMMENT(/#\[\[/,/]]/),e.HASH_COMMENT_MODE,e.QUOTE_STRING_MODE,e.NUMBER_MODE]
+})})();export default hljsGrammar;
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/coffeescript.min.js b/vendor/assets/javascripts/highlightjs/es/languages/coffeescript.min.js
index 674bbc414b4..7ad3591359f 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/coffeescript.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/coffeescript.min.js
@@ -1,4 +1,4 @@
-/*! `coffeescript` grammar compiled for Highlight.js 11.6.0 */
+/*! `coffeescript` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict"
 ;const e=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],n=["true","false","null","undefined","NaN","Infinity"],r=[].concat(["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],["Object","Function","Boolean","Symbol","Math","Date","Number","BigInt","String","RegExp","Array","Float32Array","Float64Array","Int8Array","Uint8Array","Uint8ClampedArray","Int16Array","Int32Array","Uint16Array","Uint32Array","BigInt64Array","BigUint64Array","Set","Map","WeakSet","WeakMap","ArrayBuffer","SharedArrayBuffer","Atomics","DataView","JSON","Promise","Generator","GeneratorFunction","AsyncFunction","Reflect","Proxy","Intl","WebAssembly"],["Error","EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"])
 ;return a=>{const t={
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/coq.min.js b/vendor/assets/javascripts/highlightjs/es/languages/coq.min.js
index 48b7fe81976..09adca676d7 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/coq.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/coq.min.js
@@ -1,4 +1,4 @@
-/*! `coq` grammar compiled for Highlight.js 11.6.0 */
+/*! `coq` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"Coq",keywords:{
 keyword:["_|0","as","at","cofix","else","end","exists","exists2","fix","for","forall","fun","if","IF","in","let","match","mod","Prop","return","Set","then","Type","using","where","with","Abort","About","Add","Admit","Admitted","All","Arguments","Assumptions","Axiom","Back","BackTo","Backtrack","Bind","Blacklist","Canonical","Cd","Check","Class","Classes","Close","Coercion","Coercions","CoFixpoint","CoInductive","Collection","Combined","Compute","Conjecture","Conjectures","Constant","constr","Constraint","Constructors","Context","Corollary","CreateHintDb","Cut","Declare","Defined","Definition","Delimit","Dependencies","Dependent","Derive","Drop","eauto","End","Equality","Eval","Example","Existential","Existentials","Existing","Export","exporting","Extern","Extract","Extraction","Fact","Field","Fields","File","Fixpoint","Focus","for","From","Function","Functional","Generalizable","Global","Goal","Grab","Grammar","Graph","Guarded","Heap","Hint","HintDb","Hints","Hypotheses","Hypothesis","ident","Identity","If","Immediate","Implicit","Import","Include","Inductive","Infix","Info","Initial","Inline","Inspect","Instance","Instances","Intro","Intros","Inversion","Inversion_clear","Language","Left","Lemma","Let","Libraries","Library","Load","LoadPath","Local","Locate","Ltac","ML","Mode","Module","Modules","Monomorphic","Morphism","Next","NoInline","Notation","Obligation","Obligations","Opaque","Open","Optimize","Options","Parameter","Parameters","Parametric","Path","Paths","pattern","Polymorphic","Preterm","Print","Printing","Program","Projections","Proof","Proposition","Pwd","Qed","Quit","Rec","Record","Recursive","Redirect","Relation","Remark","Remove","Require","Reserved","Reset","Resolve","Restart","Rewrite","Right","Ring","Rings","Save","Scheme","Scope","Scopes","Script","Search","SearchAbout","SearchHead","SearchPattern","SearchRewrite","Section","Separate","Set","Setoid","Show","Solve","Sorted","Step","Strategies","Strategy","Structure","SubClass","Table","Tables","Tactic","Term","Test","Theorem","Time","Timeout","Transparent","Type","Typeclasses","Types","Undelimit","Undo","Unfocus","Unfocused","Unfold","Universe","Universes","Unset","Unshelve","using","Variable","Variables","Variant","Verbose","Visibility","where","with"],
 built_in:["abstract","absurd","admit","after","apply","as","assert","assumption","at","auto","autorewrite","autounfold","before","bottom","btauto","by","case","case_eq","cbn","cbv","change","classical_left","classical_right","clear","clearbody","cofix","compare","compute","congruence","constr_eq","constructor","contradict","contradiction","cut","cutrewrite","cycle","decide","decompose","dependent","destruct","destruction","dintuition","discriminate","discrR","do","double","dtauto","eapply","eassumption","eauto","ecase","econstructor","edestruct","ediscriminate","eelim","eexact","eexists","einduction","einjection","eleft","elim","elimtype","enough","equality","erewrite","eright","esimplify_eq","esplit","evar","exact","exactly_once","exfalso","exists","f_equal","fail","field","field_simplify","field_simplify_eq","first","firstorder","fix","fold","fourier","functional","generalize","generalizing","gfail","give_up","has_evar","hnf","idtac","in","induction","injection","instantiate","intro","intro_pattern","intros","intuition","inversion","inversion_clear","is_evar","is_var","lapply","lazy","left","lia","lra","move","native_compute","nia","nsatz","omega","once","pattern","pose","progress","proof","psatz","quote","record","red","refine","reflexivity","remember","rename","repeat","replace","revert","revgoals","rewrite","rewrite_strat","right","ring","ring_simplify","rtauto","set","setoid_reflexivity","setoid_replace","setoid_rewrite","setoid_symmetry","setoid_transitivity","shelve","shelve_unifiable","simpl","simple","simplify_eq","solve","specialize","split","split_Rabs","split_Rmult","stepl","stepr","subst","sum","swap","symmetry","tactic","tauto","time","timeout","top","transitivity","trivial","try","tryif","unfold","unify","until","using","vm_compute","with"]
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/cos.min.js b/vendor/assets/javascripts/highlightjs/es/languages/cos.min.js
index f1e7f7afe85..7e674853d54 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/cos.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/cos.min.js
@@ -1,4 +1,4 @@
-/*! `cos` grammar compiled for Highlight.js 11.6.0 */
+/*! `cos` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"Cach\xe9 Object Script",
 case_insensitive:!0,aliases:["cls"],
 keywords:"property parameter class classmethod clientmethod extends as break catch close continue do d|0 else elseif for goto halt hang h|0 if job j|0 kill k|0 lock l|0 merge new open quit q|0 read r|0 return set s|0 tcommit throw trollback try tstart use view while write w|0 xecute x|0 zkill znspace zn ztrap zwrite zw zzdump zzwrite print zbreak zinsert zload zprint zremove zsave zzprint mv mvcall mvcrt mvdim mvprint zquit zsync ascii",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/cpp.min.js b/vendor/assets/javascripts/highlightjs/es/languages/cpp.min.js
index c6230375438..d4124de1554 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/cpp.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/cpp.min.js
@@ -1,46 +1,46 @@
-/*! `cpp` grammar compiled for Highlight.js 11.6.0 */
+/*! `cpp` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const t=e.regex,a=e.COMMENT("//","$",{contains:[{begin:/\\\n/}]
-}),n="[a-zA-Z_]\\w*::",r="(?!struct)(decltype\\(auto\\)|"+t.optional(n)+"[a-zA-Z_]\\w*"+t.optional("<[^<>]+>")+")",i={
-className:"type",begin:"\\b[a-z\\d_]*_t\\b"},s={className:"string",variants:[{
+}),n="decltype\\(auto\\)",r="[a-zA-Z_]\\w*::",i="(?!struct)("+n+"|"+t.optional(r)+"[a-zA-Z_]\\w*"+t.optional("<[^<>]+>")+")",s={
+className:"type",begin:"\\b[a-z\\d_]*_t\\b"},c={className:"string",variants:[{
 begin:'(u8?|U|L)?"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE]},{
 begin:"(u8?|U|L)?'(\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4,8}|[0-7]{3}|\\S)|.)",
 end:"'",illegal:"."},e.END_SAME_AS_BEGIN({
-begin:/(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,end:/\)([^()\\ ]{0,16})"/})]},c={
+begin:/(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,end:/\)([^()\\ ]{0,16})"/})]},o={
 className:"number",variants:[{begin:"\\b(0b[01']+)"},{
 begin:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)((ll|LL|l|L)(u|U)?|(u|U)(ll|LL|l|L)?|f|F|b|B)"
 },{
 begin:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"
-}],relevance:0},o={className:"meta",begin:/#\s*[a-z]+\b/,end:/$/,keywords:{
+}],relevance:0},l={className:"meta",begin:/#\s*[a-z]+\b/,end:/$/,keywords:{
 keyword:"if else elif endif define undef warning error line pragma _Pragma ifdef ifndef include"
-},contains:[{begin:/\\\n/,relevance:0},e.inherit(s,{className:"string"}),{
-className:"string",begin:/<.*?>/},a,e.C_BLOCK_COMMENT_MODE]},l={
-className:"title",begin:t.optional(n)+e.IDENT_RE,relevance:0
-},d=t.optional(n)+e.IDENT_RE+"\\s*\\(",u={
+},contains:[{begin:/\\\n/,relevance:0},e.inherit(c,{className:"string"}),{
+className:"string",begin:/<.*?>/},a,e.C_BLOCK_COMMENT_MODE]},d={
+className:"title",begin:t.optional(r)+e.IDENT_RE,relevance:0
+},u=t.optional(r)+e.IDENT_RE+"\\s*\\(",p={
 type:["bool","char","char16_t","char32_t","char8_t","double","float","int","long","short","void","wchar_t","unsigned","signed","const","static"],
 keyword:["alignas","alignof","and","and_eq","asm","atomic_cancel","atomic_commit","atomic_noexcept","auto","bitand","bitor","break","case","catch","class","co_await","co_return","co_yield","compl","concept","const_cast|10","consteval","constexpr","constinit","continue","decltype","default","delete","do","dynamic_cast|10","else","enum","explicit","export","extern","false","final","for","friend","goto","if","import","inline","module","mutable","namespace","new","noexcept","not","not_eq","nullptr","operator","or","or_eq","override","private","protected","public","reflexpr","register","reinterpret_cast|10","requires","return","sizeof","static_assert","static_cast|10","struct","switch","synchronized","template","this","thread_local","throw","transaction_safe","transaction_safe_dynamic","true","try","typedef","typeid","typename","union","using","virtual","volatile","while","xor","xor_eq"],
 literal:["NULL","false","nullopt","nullptr","true"],built_in:["_Pragma"],
 _type_hints:["any","auto_ptr","barrier","binary_semaphore","bitset","complex","condition_variable","condition_variable_any","counting_semaphore","deque","false_type","future","imaginary","initializer_list","istringstream","jthread","latch","lock_guard","multimap","multiset","mutex","optional","ostringstream","packaged_task","pair","promise","priority_queue","queue","recursive_mutex","recursive_timed_mutex","scoped_lock","set","shared_future","shared_lock","shared_mutex","shared_timed_mutex","shared_ptr","stack","string_view","stringstream","timed_mutex","thread","true_type","tuple","unique_lock","unique_ptr","unordered_map","unordered_multimap","unordered_multiset","unordered_set","variant","vector","weak_ptr","wstring","wstring_view"]
-},p={className:"function.dispatch",relevance:0,keywords:{
+},_={className:"function.dispatch",relevance:0,keywords:{
 _hint:["abort","abs","acos","apply","as_const","asin","atan","atan2","calloc","ceil","cerr","cin","clog","cos","cosh","cout","declval","endl","exchange","exit","exp","fabs","floor","fmod","forward","fprintf","fputs","free","frexp","fscanf","future","invoke","isalnum","isalpha","iscntrl","isdigit","isgraph","islower","isprint","ispunct","isspace","isupper","isxdigit","labs","launder","ldexp","log","log10","make_pair","make_shared","make_shared_for_overwrite","make_tuple","make_unique","malloc","memchr","memcmp","memcpy","memset","modf","move","pow","printf","putchar","puts","realloc","scanf","sin","sinh","snprintf","sprintf","sqrt","sscanf","std","stderr","stdin","stdout","strcat","strchr","strcmp","strcpy","strcspn","strlen","strncat","strncmp","strncpy","strpbrk","strrchr","strspn","strstr","swap","tan","tanh","terminate","to_underlying","tolower","toupper","vfprintf","visit","vprintf","vsprintf"]
 },
 begin:t.concat(/\b/,/(?!decltype)/,/(?!if)/,/(?!for)/,/(?!switch)/,/(?!while)/,e.IDENT_RE,t.lookahead(/(<[^<>]+>|)\s*\(/))
-},_=[p,o,i,a,e.C_BLOCK_COMMENT_MODE,c,s],m={variants:[{begin:/=/,end:/;/},{
+},m=[_,l,s,a,e.C_BLOCK_COMMENT_MODE,o,c],g={variants:[{begin:/=/,end:/;/},{
 begin:/\(/,end:/\)/},{beginKeywords:"new throw return else",end:/;/}],
-keywords:u,contains:_.concat([{begin:/\(/,end:/\)/,keywords:u,
-contains:_.concat(["self"]),relevance:0}]),relevance:0},g={className:"function",
-begin:"("+r+"[\\*&\\s]+)+"+d,returnBegin:!0,end:/[{;=]/,excludeEnd:!0,
-keywords:u,illegal:/[^\w\s\*&:<>.]/,contains:[{begin:"decltype\\(auto\\)",
-keywords:u,relevance:0},{begin:d,returnBegin:!0,contains:[l],relevance:0},{
-begin:/::/,relevance:0},{begin:/:/,endsWithParent:!0,contains:[s,c]},{
-relevance:0,match:/,/},{className:"params",begin:/\(/,end:/\)/,keywords:u,
-relevance:0,contains:[a,e.C_BLOCK_COMMENT_MODE,s,c,i,{begin:/\(/,end:/\)/,
-keywords:u,relevance:0,contains:["self",a,e.C_BLOCK_COMMENT_MODE,s,c,i]}]
-},i,a,e.C_BLOCK_COMMENT_MODE,o]};return{name:"C++",
-aliases:["cc","c++","h++","hpp","hh","hxx","cxx"],keywords:u,illegal:"</",
+keywords:p,contains:m.concat([{begin:/\(/,end:/\)/,keywords:p,
+contains:m.concat(["self"]),relevance:0}]),relevance:0},f={className:"function",
+begin:"("+i+"[\\*&\\s]+)+"+u,returnBegin:!0,end:/[{;=]/,excludeEnd:!0,
+keywords:p,illegal:/[^\w\s\*&:<>.]/,contains:[{begin:n,keywords:p,relevance:0},{
+begin:u,returnBegin:!0,contains:[d],relevance:0},{begin:/::/,relevance:0},{
+begin:/:/,endsWithParent:!0,contains:[c,o]},{relevance:0,match:/,/},{
+className:"params",begin:/\(/,end:/\)/,keywords:p,relevance:0,
+contains:[a,e.C_BLOCK_COMMENT_MODE,c,o,s,{begin:/\(/,end:/\)/,keywords:p,
+relevance:0,contains:["self",a,e.C_BLOCK_COMMENT_MODE,c,o,s]}]
+},s,a,e.C_BLOCK_COMMENT_MODE,l]};return{name:"C++",
+aliases:["cc","c++","h++","hpp","hh","hxx","cxx"],keywords:p,illegal:"</",
 classNameAliases:{"function.dispatch":"built_in"},
-contains:[].concat(m,g,p,_,[o,{
+contains:[].concat(g,f,_,m,[l,{
 begin:"\\b(deque|list|queue|priority_queue|pair|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array|tuple|optional|variant|function)\\s*<(?!<)",
-end:">",keywords:u,contains:["self",i]},{begin:e.IDENT_RE+"::",keywords:u},{
+end:">",keywords:p,contains:["self",s]},{begin:e.IDENT_RE+"::",keywords:p},{
 match:[/\b(?:enum(?:\s+(?:class|struct))?|class|struct|union)/,/\s+/,/\w+/],
 className:{1:"keyword",3:"title.class"}}])}}})();export default hljsGrammar;
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/crmsh.min.js b/vendor/assets/javascripts/highlightjs/es/languages/crmsh.min.js
index f6454a76271..6d0c1e3695d 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/crmsh.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/crmsh.min.js
@@ -1,4 +1,4 @@
-/*! `crmsh` grammar compiled for Highlight.js 11.6.0 */
+/*! `crmsh` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const t="group clone ms master location colocation order fencing_topology rsc_ticket acl_target acl_group user role tag xml"
 ;return{name:"crmsh",aliases:["crm","pcmk"],case_insensitive:!0,keywords:{
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/crystal.min.js b/vendor/assets/javascripts/highlightjs/es/languages/crystal.min.js
index 01f9a93fe66..19e86a10c83 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/crystal.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/crystal.min.js
@@ -1,4 +1,4 @@
-/*! `crystal` grammar compiled for Highlight.js 11.6.0 */
+/*! `crystal` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const n="(_?[ui](8|16|32|64|128))?",i="[a-zA-Z_]\\w*[!?=]?|[-+~]@|<<|>>|[=!]~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~|]|//|//=|&[-+*]=?|&\\*\\*|\\[\\][=?]?",a="[A-Za-z_]\\w*(::\\w+)*(\\?|!)?",s={
 $pattern:"[a-zA-Z_]\\w*[!?=]?",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/csharp.min.js b/vendor/assets/javascripts/highlightjs/es/languages/csharp.min.js
index ef1ec4da816..7617399e0f1 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/csharp.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/csharp.min.js
@@ -1,4 +1,4 @@
-/*! `csharp` grammar compiled for Highlight.js 11.6.0 */
+/*! `csharp` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const n={
 keyword:["abstract","as","base","break","case","catch","class","const","continue","do","else","event","explicit","extern","finally","fixed","for","foreach","goto","if","implicit","in","interface","internal","is","lock","namespace","new","operator","out","override","params","private","protected","public","readonly","record","ref","return","scoped","sealed","sizeof","stackalloc","static","struct","switch","this","throw","try","typeof","unchecked","unsafe","using","virtual","void","volatile","while"].concat(["add","alias","and","ascending","async","await","by","descending","equals","from","get","global","group","init","into","join","let","nameof","not","notnull","on","or","orderby","partial","remove","select","set","unmanaged","value|0","var","when","where","with","yield"]),
 built_in:["bool","byte","char","decimal","delegate","double","dynamic","enum","float","int","long","nint","nuint","object","sbyte","short","string","ulong","uint","ushort"],
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/csp.min.js b/vendor/assets/javascripts/highlightjs/es/languages/csp.min.js
index e88dc4c475a..02722a5e352 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/csp.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/csp.min.js
@@ -1,4 +1,4 @@
-/*! `csp` grammar compiled for Highlight.js 11.6.0 */
+/*! `csp` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return s=>({name:"CSP",case_insensitive:!1,
 keywords:{$pattern:"[a-zA-Z][a-zA-Z0-9_-]*",
 keyword:["base-uri","child-src","connect-src","default-src","font-src","form-action","frame-ancestors","frame-src","img-src","manifest-src","media-src","object-src","plugin-types","report-uri","sandbox","script-src","style-src","trusted-types","unsafe-hashes","worker-src"]
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/css.min.js b/vendor/assets/javascripts/highlightjs/es/languages/css.min.js
index 84c273d3e2c..87f10e308e0 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/css.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/css.min.js
@@ -1,4 +1,4 @@
-/*! `css` grammar compiled for Highlight.js 11.6.0 */
+/*! `css` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict"
 ;const e=["a","abbr","address","article","aside","audio","b","blockquote","body","button","canvas","caption","cite","code","dd","del","details","dfn","div","dl","dt","em","fieldset","figcaption","figure","footer","form","h1","h2","h3","h4","h5","h6","header","hgroup","html","i","iframe","img","input","ins","kbd","label","legend","li","main","mark","menu","nav","object","ol","p","q","quote","samp","section","span","strong","summary","sup","table","tbody","td","textarea","tfoot","th","thead","time","tr","ul","var","video"],r=["any-hover","any-pointer","aspect-ratio","color","color-gamut","color-index","device-aspect-ratio","device-height","device-width","display-mode","forced-colors","grid","height","hover","inverted-colors","monochrome","orientation","overflow-block","overflow-inline","pointer","prefers-color-scheme","prefers-contrast","prefers-reduced-motion","prefers-reduced-transparency","resolution","scan","scripting","update","width","min-width","max-width","min-height","max-height"],i=["active","any-link","blank","checked","current","default","defined","dir","disabled","drop","empty","enabled","first","first-child","first-of-type","fullscreen","future","focus","focus-visible","focus-within","has","host","host-context","hover","indeterminate","in-range","invalid","is","lang","last-child","last-of-type","left","link","local-link","not","nth-child","nth-col","nth-last-child","nth-last-col","nth-last-of-type","nth-of-type","only-child","only-of-type","optional","out-of-range","past","placeholder-shown","read-only","read-write","required","right","root","scope","target","target-within","user-invalid","valid","visited","where"],t=["after","backdrop","before","cue","cue-region","first-letter","first-line","grammar-error","marker","part","placeholder","selection","slotted","spelling-error"],o=["align-content","align-items","align-self","all","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","backface-visibility","background","background-attachment","background-blend-mode","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","block-size","border","border-block","border-block-color","border-block-end","border-block-end-color","border-block-end-style","border-block-end-width","border-block-start","border-block-start-color","border-block-start-style","border-block-start-width","border-block-style","border-block-width","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-inline","border-inline-color","border-inline-end","border-inline-end-color","border-inline-end-style","border-inline-end-width","border-inline-start","border-inline-start-color","border-inline-start-style","border-inline-start-width","border-inline-style","border-inline-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","caret-color","clear","clip","clip-path","clip-rule","color","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","contain","content","content-visibility","counter-increment","counter-reset","cue","cue-after","cue-before","cursor","direction","display","empty-cells","filter","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","flow","font","font-display","font-family","font-feature-settings","font-kerning","font-language-override","font-size","font-size-adjust","font-smoothing","font-stretch","font-style","font-synthesis","font-variant","font-variant-caps","font-variant-east-asian","font-variant-ligatures","font-variant-numeric","font-variant-position","font-variation-settings","font-weight","gap","glyph-orientation-vertical","grid","grid-area","grid-auto-columns","grid-auto-flow","grid-auto-rows","grid-column","grid-column-end","grid-column-start","grid-gap","grid-row","grid-row-end","grid-row-start","grid-template","grid-template-areas","grid-template-columns","grid-template-rows","hanging-punctuation","height","hyphens","icon","image-orientation","image-rendering","image-resolution","ime-mode","inline-size","isolation","justify-content","left","letter-spacing","line-break","line-height","list-style","list-style-image","list-style-position","list-style-type","margin","margin-block","margin-block-end","margin-block-start","margin-bottom","margin-inline","margin-inline-end","margin-inline-start","margin-left","margin-right","margin-top","marks","mask","mask-border","mask-border-mode","mask-border-outset","mask-border-repeat","mask-border-slice","mask-border-source","mask-border-width","mask-clip","mask-composite","mask-image","mask-mode","mask-origin","mask-position","mask-repeat","mask-size","mask-type","max-block-size","max-height","max-inline-size","max-width","min-block-size","min-height","min-inline-size","min-width","mix-blend-mode","nav-down","nav-index","nav-left","nav-right","nav-up","none","normal","object-fit","object-position","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-wrap","overflow-x","overflow-y","padding","padding-block","padding-block-end","padding-block-start","padding-bottom","padding-inline","padding-inline-end","padding-inline-start","padding-left","padding-right","padding-top","page-break-after","page-break-before","page-break-inside","pause","pause-after","pause-before","perspective","perspective-origin","pointer-events","position","quotes","resize","rest","rest-after","rest-before","right","row-gap","scroll-margin","scroll-margin-block","scroll-margin-block-end","scroll-margin-block-start","scroll-margin-bottom","scroll-margin-inline","scroll-margin-inline-end","scroll-margin-inline-start","scroll-margin-left","scroll-margin-right","scroll-margin-top","scroll-padding","scroll-padding-block","scroll-padding-block-end","scroll-padding-block-start","scroll-padding-bottom","scroll-padding-inline","scroll-padding-inline-end","scroll-padding-inline-start","scroll-padding-left","scroll-padding-right","scroll-padding-top","scroll-snap-align","scroll-snap-stop","scroll-snap-type","scrollbar-color","scrollbar-gutter","scrollbar-width","shape-image-threshold","shape-margin","shape-outside","speak","speak-as","src","tab-size","table-layout","text-align","text-align-all","text-align-last","text-combine-upright","text-decoration","text-decoration-color","text-decoration-line","text-decoration-style","text-emphasis","text-emphasis-color","text-emphasis-position","text-emphasis-style","text-indent","text-justify","text-orientation","text-overflow","text-rendering","text-shadow","text-transform","text-underline-position","top","transform","transform-box","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","vertical-align","visibility","voice-balance","voice-duration","voice-family","voice-pitch","voice-range","voice-rate","voice-stress","voice-volume","white-space","widows","width","will-change","word-break","word-spacing","word-wrap","writing-mode","z-index"].reverse()
 ;return n=>{const a=n.regex,l=(e=>({IMPORTANT:{scope:"meta",begin:"!important"},
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/d.min.js b/vendor/assets/javascripts/highlightjs/es/languages/d.min.js
index 584e982af80..6ff75240164 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/d.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/d.min.js
@@ -1,20 +1,20 @@
-/*! `d` grammar compiled for Highlight.js 11.6.0 */
+/*! `d` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const a={
 $pattern:e.UNDERSCORE_IDENT_RE,
 keyword:"abstract alias align asm assert auto body break byte case cast catch class const continue debug default delete deprecated do else enum export extern final finally for foreach foreach_reverse|10 goto if immutable import in inout int interface invariant is lazy macro mixin module new nothrow out override package pragma private protected public pure ref return scope shared static struct super switch synchronized template this throw try typedef typeid typeof union unittest version void volatile while with __FILE__ __LINE__ __gshared|10 __thread __traits __DATE__ __EOF__ __TIME__ __TIMESTAMP__ __VENDOR__ __VERSION__",
 built_in:"bool cdouble cent cfloat char creal dchar delegate double dstring float function idouble ifloat ireal long real short string ubyte ucent uint ulong ushort wchar wstring",
 literal:"false null true"
-},d="((0|[1-9][\\d_]*)|0[bB][01_]+|0[xX]([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*))",t="\\\\(['\"\\?\\\\abfnrtv]|u[\\dA-Fa-f]{4}|[0-7]{1,3}|x[\\dA-Fa-f]{2}|U[\\dA-Fa-f]{8})|&[a-zA-Z\\d]{2,};",n={
-className:"number",begin:"\\b"+d+"(L|u|U|Lu|LU|uL|UL)?",relevance:0},r={
+},t="(0|[1-9][\\d_]*)",n="(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)",r="([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*)",i="([eE][+-]?"+n+")",s="("+t+"|0[bB][01_]+|0[xX]"+r+")",l="\\\\(['\"\\?\\\\abfnrtv]|u[\\dA-Fa-f]{4}|[0-7]{1,3}|x[\\dA-Fa-f]{2}|U[\\dA-Fa-f]{8})|&[a-zA-Z\\d]{2,};",c={
+className:"number",begin:"\\b"+s+"(L|u|U|Lu|LU|uL|UL)?",relevance:0},_={
 className:"number",
-begin:"\\b(((0[xX](([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*)\\.([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*)|\\.?([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*))[pP][+-]?(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d))|((0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)(\\.\\d*|([eE][+-]?(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)))|\\d+\\.(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)|\\.(0|[1-9][\\d_]*)([eE][+-]?(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d))?))([fF]|L|i|[fF]i|Li)?|"+d+"(i|[fF]i|Li))",
-relevance:0},_={className:"string",begin:"'("+t+"|.)",end:"'",illegal:"."},i={
-className:"string",begin:'"',contains:[{begin:t,relevance:0}],end:'"[cwd]?'
-},s=e.COMMENT("\\/\\+","\\+\\/",{contains:["self"],relevance:10});return{
-name:"D",keywords:a,contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,s,{
-className:"string",begin:'x"[\\da-fA-F\\s\\n\\r]*"[cwd]?',relevance:10},i,{
+begin:"\\b(((0[xX]("+r+"\\."+r+"|\\.?"+r+")[pP][+-]?"+n+")|("+n+"(\\.\\d*|"+i+")|\\d+\\."+n+"|\\."+t+i+"?))([fF]|L|i|[fF]i|Li)?|"+s+"(i|[fF]i|Li))",
+relevance:0},d={className:"string",begin:"'("+l+"|.)",end:"'",illegal:"."},o={
+className:"string",begin:'"',contains:[{begin:l,relevance:0}],end:'"[cwd]?'
+},u=e.COMMENT("\\/\\+","\\+\\/",{contains:["self"],relevance:10});return{
+name:"D",keywords:a,contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,u,{
+className:"string",begin:'x"[\\da-fA-F\\s\\n\\r]*"[cwd]?',relevance:10},o,{
 className:"string",begin:'[rq]"',end:'"[cwd]?',relevance:5},{className:"string",
-begin:"`",end:"`[cwd]?"},{className:"string",begin:'q"\\{',end:'\\}"'},r,n,_,{
+begin:"`",end:"`[cwd]?"},{className:"string",begin:'q"\\{',end:'\\}"'},_,c,d,{
 className:"meta",begin:"^#!",end:"$",relevance:5},{className:"meta",
 begin:"#(line)",end:"$",relevance:5},{className:"keyword",
 begin:"@[a-zA-Z_][a-zA-Z_\\d]*"}]}}})();export default hljsGrammar;
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/dart.min.js b/vendor/assets/javascripts/highlightjs/es/languages/dart.min.js
index b076829d3e1..abc27ac9f8c 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/dart.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/dart.min.js
@@ -1,4 +1,4 @@
-/*! `dart` grammar compiled for Highlight.js 11.6.0 */
+/*! `dart` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const n={className:"subst",
 variants:[{begin:"\\$[A-Za-z0-9_]+"}]},a={className:"subst",variants:[{
 begin:/\$\{/,end:/\}/}],keywords:"true false null this is new super"},t={
@@ -10,7 +10,7 @@ contains:[e.BACKSLASH_ESCAPE,n,a]},{begin:'"',end:'"',illegal:"\\n",
 contains:[e.BACKSLASH_ESCAPE,n,a]}]};a.contains=[e.C_NUMBER_MODE,t]
 ;const i=["Comparable","DateTime","Duration","Function","Iterable","Iterator","List","Map","Match","Object","Pattern","RegExp","Set","Stopwatch","String","StringBuffer","StringSink","Symbol","Type","Uri","bool","double","int","num","Element","ElementList"],r=i.map((e=>e+"?"))
 ;return{name:"Dart",keywords:{
-keyword:["abstract","as","assert","async","await","break","case","catch","class","const","continue","covariant","default","deferred","do","dynamic","else","enum","export","extends","extension","external","factory","false","final","finally","for","Function","get","hide","if","implements","import","in","inferface","is","late","library","mixin","new","null","on","operator","part","required","rethrow","return","set","show","static","super","switch","sync","this","throw","true","try","typedef","var","void","while","with","yield"],
+keyword:["abstract","as","assert","async","await","base","break","case","catch","class","const","continue","covariant","default","deferred","do","dynamic","else","enum","export","extends","extension","external","factory","false","final","finally","for","Function","get","hide","if","implements","import","in","interface","is","late","library","mixin","new","null","on","operator","part","required","rethrow","return","sealed","set","show","static","super","switch","sync","this","throw","true","try","typedef","var","void","when","while","with","yield"],
 built_in:i.concat(r).concat(["Never","Null","dynamic","print","document","querySelector","querySelectorAll","window"]),
 $pattern:/[A-Za-z][A-Za-z0-9_]*\??/},
 contains:[t,e.COMMENT(/\/\*\*(?!\/)/,/\*\//,{subLanguage:"markdown",relevance:0
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/delphi.min.js b/vendor/assets/javascripts/highlightjs/es/languages/delphi.min.js
index f03dc9e37d2..1d0c6a1b730 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/delphi.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/delphi.min.js
@@ -1,4 +1,4 @@
-/*! `delphi` grammar compiled for Highlight.js 11.6.0 */
+/*! `delphi` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const r=["exports","register","file","shl","array","record","property","for","mod","while","set","ally","label","uses","raise","not","stored","class","safecall","var","interface","or","private","static","exit","index","inherited","to","else","stdcall","override","shr","asm","far","resourcestring","finalization","packed","virtual","out","and","protected","library","do","xorwrite","goto","near","function","end","div","overload","object","unit","begin","string","on","inline","repeat","until","destructor","write","message","program","with","read","initialization","except","default","nil","if","case","cdecl","in","downto","threadvar","of","try","pascal","const","external","constructor","type","public","then","implementation","finally","published","procedure","absolute","reintroduce","operator","as","is","abstract","alias","assembler","bitpacked","break","continue","cppdecl","cvar","enumerator","experimental","platform","deprecated","unimplemented","dynamic","export","far16","forward","generic","helper","implements","interrupt","iochecks","local","name","nodefault","noreturn","nostackframe","oldfpccall","otherwise","saveregisters","softfloat","specialize","strict","unaligned","varargs"],a=[e.C_LINE_COMMENT_MODE,e.COMMENT(/\{/,/\}/,{
 relevance:0}),e.COMMENT(/\(\*/,/\*\)/,{relevance:10})],t={className:"meta",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/diff.min.js b/vendor/assets/javascripts/highlightjs/es/languages/diff.min.js
index 4c1c73f5039..e865bfb40d4 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/diff.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/diff.min.js
@@ -1,4 +1,4 @@
-/*! `diff` grammar compiled for Highlight.js 11.6.0 */
+/*! `diff` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const a=e.regex;return{
 name:"Diff",aliases:["patch"],contains:[{className:"meta",relevance:10,
 match:a.either(/^@@ +-\d+,\d+ +\+\d+,\d+ +@@/,/^\*\*\* +\d+,\d+ +\*\*\*\*$/,/^--- +\d+,\d+ +----$/)
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/django.min.js b/vendor/assets/javascripts/highlightjs/es/languages/django.min.js
index 64e00bb4701..f461b7a9b70 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/django.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/django.min.js
@@ -1,4 +1,4 @@
-/*! `django` grammar compiled for Highlight.js 11.6.0 */
+/*! `django` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const a={begin:/\|[A-Za-z]+:?/,
 keywords:{
 name:"truncatewords removetags linebreaksbr yesno get_digit timesince random striptags filesizeformat escape linebreaks length_is ljust rjust cut urlize fix_ampersands title floatformat capfirst pprint divisibleby add make_list unordered_list urlencode timeuntil urlizetrunc wordcount stringformat linenumbers slice date dictsort dictsortreversed default_if_none pluralize lower join center default truncatewords_html upper length phone2numeric wordwrap time addslashes slugify first escapejs force_escape iriencode last safe safeseq truncatechars localize unlocalize localtime utc timezone"
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/dns.min.js b/vendor/assets/javascripts/highlightjs/es/languages/dns.min.js
index 2e12d4bed4c..443c0ad0069 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/dns.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/dns.min.js
@@ -1,4 +1,4 @@
-/*! `dns` grammar compiled for Highlight.js 11.6.0 */
+/*! `dns` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return d=>({name:"DNS Zone",
 aliases:["bind","zone"],
 keywords:["IN","A","AAAA","AFSDB","APL","CAA","CDNSKEY","CDS","CERT","CNAME","DHCID","DLV","DNAME","DNSKEY","DS","HIP","IPSECKEY","KEY","KX","LOC","MX","NAPTR","NS","NSEC","NSEC3","NSEC3PARAM","PTR","RRSIG","RP","SIG","SOA","SRV","SSHFP","TA","TKEY","TLSA","TSIG","TXT"],
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/dockerfile.min.js b/vendor/assets/javascripts/highlightjs/es/languages/dockerfile.min.js
index 3fdc9ee0367..663364f9c1e 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/dockerfile.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/dockerfile.min.js
@@ -1,4 +1,4 @@
-/*! `dockerfile` grammar compiled for Highlight.js 11.6.0 */
+/*! `dockerfile` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"Dockerfile",
 aliases:["docker"],case_insensitive:!0,
 keywords:["from","maintainer","expose","env","arg","user","onbuild","stopsignal"],
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/dos.min.js b/vendor/assets/javascripts/highlightjs/es/languages/dos.min.js
index 9678933cb63..480a46bf1c3 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/dos.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/dos.min.js
@@ -1,4 +1,4 @@
-/*! `dos` grammar compiled for Highlight.js 11.6.0 */
+/*! `dos` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const r=e.COMMENT(/^\s*@?rem\b/,/$/,{relevance:10});return{
 name:"Batch file (DOS)",aliases:["bat","cmd"],case_insensitive:!0,
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/dsconfig.min.js b/vendor/assets/javascripts/highlightjs/es/languages/dsconfig.min.js
index 00bd9f319cf..4245baffac0 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/dsconfig.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/dsconfig.min.js
@@ -1,4 +1,4 @@
-/*! `dsconfig` grammar compiled for Highlight.js 11.6.0 */
+/*! `dsconfig` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({keywords:"dsconfig",contains:[{
 className:"keyword",begin:"^dsconfig",end:/\s/,excludeEnd:!0,relevance:10},{
 className:"built_in",begin:/(list|create|get|set|delete)-(\w+)/,end:/\s/,
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/dts.min.js b/vendor/assets/javascripts/highlightjs/es/languages/dts.min.js
index 2773608a303..e9bff6854c8 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/dts.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/dts.min.js
@@ -1,4 +1,4 @@
-/*! `dts` grammar compiled for Highlight.js 11.6.0 */
+/*! `dts` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const a={className:"string",
 variants:[e.inherit(e.QUOTE_STRING_MODE,{begin:'((u8?|U)|L)?"'}),{
 begin:'(u8?|U)?R"',end:'"',contains:[e.BACKSLASH_ESCAPE]},{begin:"'\\\\?.",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/dust.min.js b/vendor/assets/javascripts/highlightjs/es/languages/dust.min.js
index c8373e64929..e401bfba53b 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/dust.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/dust.min.js
@@ -1,4 +1,4 @@
-/*! `dust` grammar compiled for Highlight.js 11.6.0 */
+/*! `dust` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"Dust",aliases:["dst"],
 case_insensitive:!0,subLanguage:"xml",contains:[{className:"template-tag",
 begin:/\{[#\/]/,end:/\}/,illegal:/;/,contains:[{className:"name",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/ebnf.min.js b/vendor/assets/javascripts/highlightjs/es/languages/ebnf.min.js
index 69aef4f3880..53cfc600b9a 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/ebnf.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/ebnf.min.js
@@ -1,4 +1,4 @@
-/*! `ebnf` grammar compiled for Highlight.js 11.6.0 */
+/*! `ebnf` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return a=>{const e=a.COMMENT(/\(\*/,/\*\)/)
 ;return{name:"Extended Backus-Naur Form",illegal:/\S/,contains:[e,{
 className:"attribute",begin:/^[ ]*[a-zA-Z]+([\s_-]+[a-zA-Z]+)*/},{begin:/=/,
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/elixir.min.js b/vendor/assets/javascripts/highlightjs/es/languages/elixir.min.js
index 9c4205a1437..6ad9047ccb0 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/elixir.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/elixir.min.js
@@ -1,34 +1,34 @@
-/*! `elixir` grammar compiled for Highlight.js 11.6.0 */
+/*! `elixir` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const n=e.regex,a="[a-zA-Z_][a-zA-Z0-9_.]*(!|\\?)?",i={$pattern:a,
 keyword:["after","alias","and","case","catch","cond","defstruct","defguard","do","else","end","fn","for","if","import","in","not","or","quote","raise","receive","require","reraise","rescue","try","unless","unquote","unquote_splicing","use","when","with|0"],
 literal:["false","nil","true"]},s={className:"subst",begin:/#\{/,end:/\}/,
-keywords:i},c={match:/\\[\s\S]/,scope:"char.escape",relevance:0},r=[{begin:/"/,
-end:/"/},{begin:/'/,end:/'/},{begin:/\//,end:/\//},{begin:/\|/,end:/\|/},{
-begin:/\(/,end:/\)/},{begin:/\[/,end:/\]/},{begin:/\{/,end:/\}/},{begin:/</,
-end:/>/}],t=e=>({scope:"char.escape",begin:n.concat(/\\/,e),relevance:0}),d={
-className:"string",begin:"~[a-z](?=[/|([{<\"'])",
-contains:r.map((n=>e.inherit(n,{contains:[t(n.end),c,s]})))},o={
-className:"string",begin:"~[A-Z](?=[/|([{<\"'])",
-contains:r.map((n=>e.inherit(n,{contains:[t(n.end)]})))},b={className:"regex",
-variants:[{begin:"~r(?=[/|([{<\"'])",contains:r.map((a=>e.inherit(a,{
-end:n.concat(a.end,/[uismxfU]{0,7}/),contains:[t(a.end),c,s]})))},{
-begin:"~R(?=[/|([{<\"'])",contains:r.map((a=>e.inherit(a,{
-end:n.concat(a.end,/[uismxfU]{0,7}/),contains:[t(a.end)]})))}]},l={
+keywords:i},c={match:/\\[\s\S]/,scope:"char.escape",relevance:0
+},r="[/|([{<\"']",t=[{begin:/"/,end:/"/},{begin:/'/,end:/'/},{begin:/\//,
+end:/\//},{begin:/\|/,end:/\|/},{begin:/\(/,end:/\)/},{begin:/\[/,end:/\]/},{
+begin:/\{/,end:/\}/},{begin:/</,end:/>/}],d=e=>({scope:"char.escape",
+begin:n.concat(/\\/,e),relevance:0}),o={className:"string",
+begin:"~[a-z](?="+r+")",contains:t.map((n=>e.inherit(n,{contains:[d(n.end),c,s]
+})))},b={className:"string",begin:"~[A-Z](?="+r+")",
+contains:t.map((n=>e.inherit(n,{contains:[d(n.end)]})))},l={className:"regex",
+variants:[{begin:"~r(?="+r+")",contains:t.map((a=>e.inherit(a,{
+end:n.concat(a.end,/[uismxfU]{0,7}/),contains:[d(a.end),c,s]})))},{
+begin:"~R(?="+r+")",contains:t.map((a=>e.inherit(a,{
+end:n.concat(a.end,/[uismxfU]{0,7}/),contains:[d(a.end)]})))}]},g={
 className:"string",contains:[e.BACKSLASH_ESCAPE,s],variants:[{begin:/"""/,
 end:/"""/},{begin:/'''/,end:/'''/},{begin:/~S"""/,end:/"""/,contains:[]},{
 begin:/~S"/,end:/"/,contains:[]},{begin:/~S'''/,end:/'''/,contains:[]},{
-begin:/~S'/,end:/'/,contains:[]},{begin:/'/,end:/'/},{begin:/"/,end:/"/}]},g={
+begin:/~S'/,end:/'/,contains:[]},{begin:/'/,end:/'/},{begin:/"/,end:/"/}]},m={
 className:"function",beginKeywords:"def defp defmacro defmacrop",end:/\B\b/,
-contains:[e.inherit(e.TITLE_MODE,{begin:a,endsParent:!0})]},m=e.inherit(g,{
+contains:[e.inherit(e.TITLE_MODE,{begin:a,endsParent:!0})]},u=e.inherit(m,{
 className:"class",beginKeywords:"defimpl defmodule defprotocol defrecord",
-end:/\bdo\b|$|;/}),u=[l,b,o,d,e.HASH_COMMENT_MODE,m,g,{begin:"::"},{
-className:"symbol",begin:":(?![\\s:])",contains:[l,{
+end:/\bdo\b|$|;/}),f=[g,l,b,o,e.HASH_COMMENT_MODE,u,m,{begin:"::"},{
+className:"symbol",begin:":(?![\\s:])",contains:[g,{
 begin:"[a-zA-Z_]\\w*[!?=]?|[-+~]@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?"
 }],relevance:0},{className:"symbol",begin:a+":(?!:)",relevance:0},{
 className:"title.class",begin:/(\b[A-Z][a-zA-Z0-9_]+)/,relevance:0},{
 className:"number",
 begin:"(\\b0o[0-7_]+)|(\\b0b[01_]+)|(\\b0x[0-9a-fA-F_]+)|(-?\\b[0-9][0-9_]*(\\.[0-9_]+([eE][-+]?[0-9]+)?)?)",
 relevance:0},{className:"variable",begin:"(\\$\\W)|((\\$|@@?)(\\w+))"}]
-;return s.contains=u,{name:"Elixir",aliases:["ex","exs"],keywords:i,contains:u}}
+;return s.contains=f,{name:"Elixir",aliases:["ex","exs"],keywords:i,contains:f}}
 })();export default hljsGrammar;
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/elm.min.js b/vendor/assets/javascripts/highlightjs/es/languages/elm.min.js
index ac0d220bc05..de5010f581f 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/elm.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/elm.min.js
@@ -1,4 +1,4 @@
-/*! `elm` grammar compiled for Highlight.js 11.6.0 */
+/*! `elm` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const n={
 variants:[e.COMMENT("--","$"),e.COMMENT(/\{-/,/-\}/,{contains:["self"]})]},i={
 className:"type",begin:"\\b[A-Z][\\w']*",relevance:0},s={begin:"\\(",end:"\\)",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/erb.min.js b/vendor/assets/javascripts/highlightjs/es/languages/erb.min.js
index df0ea6585a0..c44088e6df0 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/erb.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/erb.min.js
@@ -1,4 +1,4 @@
-/*! `erb` grammar compiled for Highlight.js 11.6.0 */
+/*! `erb` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"ERB",subLanguage:"xml",
 contains:[e.COMMENT("<%#","%>"),{begin:"<%[%=-]?",end:"[%-]?%>",
 subLanguage:"ruby",excludeBegin:!0,excludeEnd:!0}]})})()
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/erlang-repl.min.js b/vendor/assets/javascripts/highlightjs/es/languages/erlang-repl.min.js
index 2188436c650..92a4cfbd90d 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/erlang-repl.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/erlang-repl.min.js
@@ -1,4 +1,4 @@
-/*! `erlang-repl` grammar compiled for Highlight.js 11.6.0 */
+/*! `erlang-repl` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const a=e.regex;return{
 name:"Erlang REPL",keywords:{built_in:"spawn spawn_link self",
 keyword:"after and andalso|10 band begin bnot bor bsl bsr bxor case catch cond div end fun if let not of or orelse|10 query receive rem try when xor"
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/erlang.min.js b/vendor/assets/javascripts/highlightjs/es/languages/erlang.min.js
index ace717ad920..97d56cdab19 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/erlang.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/erlang.min.js
@@ -1,4 +1,4 @@
-/*! `erlang` grammar compiled for Highlight.js 11.6.0 */
+/*! `erlang` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const n="[a-z'][a-zA-Z0-9_']*",r="("+n+":"+n+"|"+n+")",a={
 keyword:"after and andalso|10 band begin bnot bor bsl bzr bxor case catch cond div end fun if let not of orelse|10 query receive rem try when xor",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/excel.min.js b/vendor/assets/javascripts/highlightjs/es/languages/excel.min.js
index c6737264bea..bccc3721537 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/excel.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/excel.min.js
@@ -1,4 +1,4 @@
-/*! `excel` grammar compiled for Highlight.js 11.6.0 */
+/*! `excel` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return E=>({name:"Excel formulae",
 aliases:["xlsx","xls"],case_insensitive:!0,keywords:{$pattern:/[a-zA-Z][\w\.]*/,
 built_in:["ABS","ACCRINT","ACCRINTM","ACOS","ACOSH","ACOT","ACOTH","AGGREGATE","ADDRESS","AMORDEGRC","AMORLINC","AND","ARABIC","AREAS","ASC","ASIN","ASINH","ATAN","ATAN2","ATANH","AVEDEV","AVERAGE","AVERAGEA","AVERAGEIF","AVERAGEIFS","BAHTTEXT","BASE","BESSELI","BESSELJ","BESSELK","BESSELY","BETADIST","BETA.DIST","BETAINV","BETA.INV","BIN2DEC","BIN2HEX","BIN2OCT","BINOMDIST","BINOM.DIST","BINOM.DIST.RANGE","BINOM.INV","BITAND","BITLSHIFT","BITOR","BITRSHIFT","BITXOR","CALL","CEILING","CEILING.MATH","CEILING.PRECISE","CELL","CHAR","CHIDIST","CHIINV","CHITEST","CHISQ.DIST","CHISQ.DIST.RT","CHISQ.INV","CHISQ.INV.RT","CHISQ.TEST","CHOOSE","CLEAN","CODE","COLUMN","COLUMNS","COMBIN","COMBINA","COMPLEX","CONCAT","CONCATENATE","CONFIDENCE","CONFIDENCE.NORM","CONFIDENCE.T","CONVERT","CORREL","COS","COSH","COT","COTH","COUNT","COUNTA","COUNTBLANK","COUNTIF","COUNTIFS","COUPDAYBS","COUPDAYS","COUPDAYSNC","COUPNCD","COUPNUM","COUPPCD","COVAR","COVARIANCE.P","COVARIANCE.S","CRITBINOM","CSC","CSCH","CUBEKPIMEMBER","CUBEMEMBER","CUBEMEMBERPROPERTY","CUBERANKEDMEMBER","CUBESET","CUBESETCOUNT","CUBEVALUE","CUMIPMT","CUMPRINC","DATE","DATEDIF","DATEVALUE","DAVERAGE","DAY","DAYS","DAYS360","DB","DBCS","DCOUNT","DCOUNTA","DDB","DEC2BIN","DEC2HEX","DEC2OCT","DECIMAL","DEGREES","DELTA","DEVSQ","DGET","DISC","DMAX","DMIN","DOLLAR","DOLLARDE","DOLLARFR","DPRODUCT","DSTDEV","DSTDEVP","DSUM","DURATION","DVAR","DVARP","EDATE","EFFECT","ENCODEURL","EOMONTH","ERF","ERF.PRECISE","ERFC","ERFC.PRECISE","ERROR.TYPE","EUROCONVERT","EVEN","EXACT","EXP","EXPON.DIST","EXPONDIST","FACT","FACTDOUBLE","FALSE|0","F.DIST","FDIST","F.DIST.RT","FILTERXML","FIND","FINDB","F.INV","F.INV.RT","FINV","FISHER","FISHERINV","FIXED","FLOOR","FLOOR.MATH","FLOOR.PRECISE","FORECAST","FORECAST.ETS","FORECAST.ETS.CONFINT","FORECAST.ETS.SEASONALITY","FORECAST.ETS.STAT","FORECAST.LINEAR","FORMULATEXT","FREQUENCY","F.TEST","FTEST","FV","FVSCHEDULE","GAMMA","GAMMA.DIST","GAMMADIST","GAMMA.INV","GAMMAINV","GAMMALN","GAMMALN.PRECISE","GAUSS","GCD","GEOMEAN","GESTEP","GETPIVOTDATA","GROWTH","HARMEAN","HEX2BIN","HEX2DEC","HEX2OCT","HLOOKUP","HOUR","HYPERLINK","HYPGEOM.DIST","HYPGEOMDIST","IF","IFERROR","IFNA","IFS","IMABS","IMAGINARY","IMARGUMENT","IMCONJUGATE","IMCOS","IMCOSH","IMCOT","IMCSC","IMCSCH","IMDIV","IMEXP","IMLN","IMLOG10","IMLOG2","IMPOWER","IMPRODUCT","IMREAL","IMSEC","IMSECH","IMSIN","IMSINH","IMSQRT","IMSUB","IMSUM","IMTAN","INDEX","INDIRECT","INFO","INT","INTERCEPT","INTRATE","IPMT","IRR","ISBLANK","ISERR","ISERROR","ISEVEN","ISFORMULA","ISLOGICAL","ISNA","ISNONTEXT","ISNUMBER","ISODD","ISREF","ISTEXT","ISO.CEILING","ISOWEEKNUM","ISPMT","JIS","KURT","LARGE","LCM","LEFT","LEFTB","LEN","LENB","LINEST","LN","LOG","LOG10","LOGEST","LOGINV","LOGNORM.DIST","LOGNORMDIST","LOGNORM.INV","LOOKUP","LOWER","MATCH","MAX","MAXA","MAXIFS","MDETERM","MDURATION","MEDIAN","MID","MIDBs","MIN","MINIFS","MINA","MINUTE","MINVERSE","MIRR","MMULT","MOD","MODE","MODE.MULT","MODE.SNGL","MONTH","MROUND","MULTINOMIAL","MUNIT","N","NA","NEGBINOM.DIST","NEGBINOMDIST","NETWORKDAYS","NETWORKDAYS.INTL","NOMINAL","NORM.DIST","NORMDIST","NORMINV","NORM.INV","NORM.S.DIST","NORMSDIST","NORM.S.INV","NORMSINV","NOT","NOW","NPER","NPV","NUMBERVALUE","OCT2BIN","OCT2DEC","OCT2HEX","ODD","ODDFPRICE","ODDFYIELD","ODDLPRICE","ODDLYIELD","OFFSET","OR","PDURATION","PEARSON","PERCENTILE.EXC","PERCENTILE.INC","PERCENTILE","PERCENTRANK.EXC","PERCENTRANK.INC","PERCENTRANK","PERMUT","PERMUTATIONA","PHI","PHONETIC","PI","PMT","POISSON.DIST","POISSON","POWER","PPMT","PRICE","PRICEDISC","PRICEMAT","PROB","PRODUCT","PROPER","PV","QUARTILE","QUARTILE.EXC","QUARTILE.INC","QUOTIENT","RADIANS","RAND","RANDBETWEEN","RANK.AVG","RANK.EQ","RANK","RATE","RECEIVED","REGISTER.ID","REPLACE","REPLACEB","REPT","RIGHT","RIGHTB","ROMAN","ROUND","ROUNDDOWN","ROUNDUP","ROW","ROWS","RRI","RSQ","RTD","SEARCH","SEARCHB","SEC","SECH","SECOND","SERIESSUM","SHEET","SHEETS","SIGN","SIN","SINH","SKEW","SKEW.P","SLN","SLOPE","SMALL","SQL.REQUEST","SQRT","SQRTPI","STANDARDIZE","STDEV","STDEV.P","STDEV.S","STDEVA","STDEVP","STDEVPA","STEYX","SUBSTITUTE","SUBTOTAL","SUM","SUMIF","SUMIFS","SUMPRODUCT","SUMSQ","SUMX2MY2","SUMX2PY2","SUMXMY2","SWITCH","SYD","T","TAN","TANH","TBILLEQ","TBILLPRICE","TBILLYIELD","T.DIST","T.DIST.2T","T.DIST.RT","TDIST","TEXT","TEXTJOIN","TIME","TIMEVALUE","T.INV","T.INV.2T","TINV","TODAY","TRANSPOSE","TREND","TRIM","TRIMMEAN","TRUE|0","TRUNC","T.TEST","TTEST","TYPE","UNICHAR","UNICODE","UPPER","VALUE","VAR","VAR.P","VAR.S","VARA","VARP","VARPA","VDB","VLOOKUP","WEBSERVICE","WEEKDAY","WEEKNUM","WEIBULL","WEIBULL.DIST","WORKDAY","WORKDAY.INTL","XIRR","XNPV","XOR","YEAR","YEARFRAC","YIELD","YIELDDISC","YIELDMAT","Z.TEST","ZTEST"]
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/fix.min.js b/vendor/assets/javascripts/highlightjs/es/languages/fix.min.js
index 9ea0892dc35..7975ff7ea02 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/fix.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/fix.min.js
@@ -1,4 +1,4 @@
-/*! `fix` grammar compiled for Highlight.js 11.6.0 */
+/*! `fix` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"FIX",contains:[{
 begin:/[^\u2401\u0001]+/,end:/[\u2401\u0001]/,excludeEnd:!0,returnBegin:!0,
 returnEnd:!1,contains:[{begin:/([^\u2401\u0001=]+)/,end:/=([^\u2401\u0001=]+)/,
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/flix.min.js b/vendor/assets/javascripts/highlightjs/es/languages/flix.min.js
index 6a386128d90..516c9e07c9b 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/flix.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/flix.min.js
@@ -1,4 +1,4 @@
-/*! `flix` grammar compiled for Highlight.js 11.6.0 */
+/*! `flix` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"Flix",keywords:{
 keyword:["case","class","def","else","enum","if","impl","import","in","lat","rel","index","let","match","namespace","switch","type","yield","with"],
 literal:["true","false"]},
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/fortran.min.js b/vendor/assets/javascripts/highlightjs/es/languages/fortran.min.js
index c234cd5328f..c31ae1ad4e2 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/fortran.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/fortran.min.js
@@ -1,4 +1,4 @@
-/*! `fortran` grammar compiled for Highlight.js 11.6.0 */
+/*! `fortran` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const n=e.regex,a={
 variants:[e.COMMENT("!","$",{relevance:0}),e.COMMENT("^C[ ]","$",{relevance:0
 }),e.COMMENT("^C$","$",{relevance:0})]
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/fsharp.min.js b/vendor/assets/javascripts/highlightjs/es/languages/fsharp.min.js
index b7abc0f63a2..cbf97387223 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/fsharp.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/fsharp.min.js
@@ -1,4 +1,4 @@
-/*! `fsharp` grammar compiled for Highlight.js 11.6.0 */
+/*! `fsharp` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";function e(e){
 return RegExp(e.replace(/[-/\\^$*+?.()|[\]{}]/g,"\\$&"),"m")}function n(e){
 return e?"string"==typeof e?e:e.source:null}function t(e){return i("(?=",e,")")}
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/gams.min.js b/vendor/assets/javascripts/highlightjs/es/languages/gams.min.js
index 39971fcf30a..1cb7f734575 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/gams.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/gams.min.js
@@ -1,4 +1,4 @@
-/*! `gams` grammar compiled for Highlight.js 11.6.0 */
+/*! `gams` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const a=e.regex,n={
 keyword:"abort acronym acronyms alias all and assign binary card diag display else eq file files for free ge gt if integer le loop lt maximizing minimizing model models ne negative no not option options or ord positive prod put putpage puttl repeat sameas semicont semiint smax smin solve sos1 sos2 sum system table then until using while xor yes",
 literal:"eps inf na",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/gauss.min.js b/vendor/assets/javascripts/highlightjs/es/languages/gauss.min.js
index c499f1df9e7..e89cc472f40 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/gauss.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/gauss.min.js
@@ -1,4 +1,4 @@
-/*! `gauss` grammar compiled for Highlight.js 11.6.0 */
+/*! `gauss` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const t={
 keyword:"bool break call callexe checkinterrupt clear clearg closeall cls comlog compile continue create debug declare delete disable dlibrary dllcall do dos ed edit else elseif enable end endfor endif endp endo errorlog errorlogat expr external fn for format goto gosub graph if keyword let lib library line load loadarray loadexe loadf loadk loadm loadp loads loadx local locate loopnextindex lprint lpwidth lshow matrix msym ndpclex new open output outwidth plot plotsym pop prcsn print printdos proc push retp return rndcon rndmod rndmult rndseed run save saveall screen scroll setarray show sparse stop string struct system trace trap threadfor threadendfor threadbegin threadjoin threadstat threadend until use while winprint ne ge le gt lt and xor or not eq eqv",
 built_in:"abs acf aconcat aeye amax amean AmericanBinomCall AmericanBinomCall_Greeks AmericanBinomCall_ImpVol AmericanBinomPut AmericanBinomPut_Greeks AmericanBinomPut_ImpVol AmericanBSCall AmericanBSCall_Greeks AmericanBSCall_ImpVol AmericanBSPut AmericanBSPut_Greeks AmericanBSPut_ImpVol amin amult annotationGetDefaults annotationSetBkd annotationSetFont annotationSetLineColor annotationSetLineStyle annotationSetLineThickness annualTradingDays arccos arcsin areshape arrayalloc arrayindex arrayinit arraytomat asciiload asclabel astd astds asum atan atan2 atranspose axmargin balance band bandchol bandcholsol bandltsol bandrv bandsolpd bar base10 begwind besselj bessely beta box boxcox cdfBeta cdfBetaInv cdfBinomial cdfBinomialInv cdfBvn cdfBvn2 cdfBvn2e cdfCauchy cdfCauchyInv cdfChic cdfChii cdfChinc cdfChincInv cdfExp cdfExpInv cdfFc cdfFnc cdfFncInv cdfGam cdfGenPareto cdfHyperGeo cdfLaplace cdfLaplaceInv cdfLogistic cdfLogisticInv cdfmControlCreate cdfMvn cdfMvn2e cdfMvnce cdfMvne cdfMvt2e cdfMvtce cdfMvte cdfN cdfN2 cdfNc cdfNegBinomial cdfNegBinomialInv cdfNi cdfPoisson cdfPoissonInv cdfRayleigh cdfRayleighInv cdfTc cdfTci cdfTnc cdfTvn cdfWeibull cdfWeibullInv cdir ceil ChangeDir chdir chiBarSquare chol choldn cholsol cholup chrs close code cols colsf combinate combinated complex con cond conj cons ConScore contour conv convertsatostr convertstrtosa corrm corrms corrvc corrx corrxs cos cosh counts countwts crossprd crout croutp csrcol csrlin csvReadM csvReadSA cumprodc cumsumc curve cvtos datacreate datacreatecomplex datalist dataload dataloop dataopen datasave date datestr datestring datestrymd dayinyr dayofweek dbAddDatabase dbClose dbCommit dbCreateQuery dbExecQuery dbGetConnectOptions dbGetDatabaseName dbGetDriverName dbGetDrivers dbGetHostName dbGetLastErrorNum dbGetLastErrorText dbGetNumericalPrecPolicy dbGetPassword dbGetPort dbGetTableHeaders dbGetTables dbGetUserName dbHasFeature dbIsDriverAvailable dbIsOpen dbIsOpenError dbOpen dbQueryBindValue dbQueryClear dbQueryCols dbQueryExecPrepared dbQueryFetchAllM dbQueryFetchAllSA dbQueryFetchOneM dbQueryFetchOneSA dbQueryFinish dbQueryGetBoundValue dbQueryGetBoundValues dbQueryGetField dbQueryGetLastErrorNum dbQueryGetLastErrorText dbQueryGetLastInsertID dbQueryGetLastQuery dbQueryGetPosition dbQueryIsActive dbQueryIsForwardOnly dbQueryIsNull dbQueryIsSelect dbQueryIsValid dbQueryPrepare dbQueryRows dbQuerySeek dbQuerySeekFirst dbQuerySeekLast dbQuerySeekNext dbQuerySeekPrevious dbQuerySetForwardOnly dbRemoveDatabase dbRollback dbSetConnectOptions dbSetDatabaseName dbSetHostName dbSetNumericalPrecPolicy dbSetPort dbSetUserName dbTransaction DeleteFile delif delrows denseToSp denseToSpRE denToZero design det detl dfft dffti diag diagrv digamma doswin DOSWinCloseall DOSWinOpen dotfeq dotfeqmt dotfge dotfgemt dotfgt dotfgtmt dotfle dotflemt dotflt dotfltmt dotfne dotfnemt draw drop dsCreate dstat dstatmt dstatmtControlCreate dtdate dtday dttime dttodtv dttostr dttoutc dtvnormal dtvtodt dtvtoutc dummy dummybr dummydn eig eigh eighv eigv elapsedTradingDays endwind envget eof eqSolve eqSolvemt eqSolvemtControlCreate eqSolvemtOutCreate eqSolveset erf erfc erfccplx erfcplx error etdays ethsec etstr EuropeanBinomCall EuropeanBinomCall_Greeks EuropeanBinomCall_ImpVol EuropeanBinomPut EuropeanBinomPut_Greeks EuropeanBinomPut_ImpVol EuropeanBSCall EuropeanBSCall_Greeks EuropeanBSCall_ImpVol EuropeanBSPut EuropeanBSPut_Greeks EuropeanBSPut_ImpVol exctsmpl exec execbg exp extern eye fcheckerr fclearerr feq feqmt fflush fft ffti fftm fftmi fftn fge fgemt fgets fgetsa fgetsat fgetst fgt fgtmt fileinfo filesa fle flemt floor flt fltmt fmod fne fnemt fonts fopen formatcv formatnv fputs fputst fseek fstrerror ftell ftocv ftos ftostrC gamma gammacplx gammaii gausset gdaAppend gdaCreate gdaDStat gdaDStatMat gdaGetIndex gdaGetName gdaGetNames gdaGetOrders gdaGetType gdaGetTypes gdaGetVarInfo gdaIsCplx gdaLoad gdaPack gdaRead gdaReadByIndex gdaReadSome gdaReadSparse gdaReadStruct gdaReportVarInfo gdaSave gdaUpdate gdaUpdateAndPack gdaVars gdaWrite gdaWrite32 gdaWriteSome getarray getdims getf getGAUSShome getmatrix getmatrix4D getname getnamef getNextTradingDay getNextWeekDay getnr getorders getpath getPreviousTradingDay getPreviousWeekDay getRow getscalar3D getscalar4D getTrRow getwind glm gradcplx gradMT gradMTm gradMTT gradMTTm gradp graphprt graphset hasimag header headermt hess hessMT hessMTg hessMTgw hessMTm hessMTmw hessMTT hessMTTg hessMTTgw hessMTTm hessMTw hessp hist histf histp hsec imag indcv indexcat indices indices2 indicesf indicesfn indnv indsav integrate1d integrateControlCreate intgrat2 intgrat3 inthp1 inthp2 inthp3 inthp4 inthpControlCreate intquad1 intquad2 intquad3 intrleav intrleavsa intrsect intsimp inv invpd invswp iscplx iscplxf isden isinfnanmiss ismiss key keyav keyw lag lag1 lagn lapEighb lapEighi lapEighvb lapEighvi lapgEig lapgEigh lapgEighv lapgEigv lapgSchur lapgSvdcst lapgSvds lapgSvdst lapSvdcusv lapSvds lapSvdusv ldlp ldlsol linSolve listwise ln lncdfbvn lncdfbvn2 lncdfmvn lncdfn lncdfn2 lncdfnc lnfact lngammacplx lnpdfmvn lnpdfmvt lnpdfn lnpdft loadd loadstruct loadwind loess loessmt loessmtControlCreate log loglog logx logy lower lowmat lowmat1 ltrisol lu lusol machEpsilon make makevars makewind margin matalloc matinit mattoarray maxbytes maxc maxindc maxv maxvec mbesselei mbesselei0 mbesselei1 mbesseli mbesseli0 mbesseli1 meanc median mergeby mergevar minc minindc minv miss missex missrv moment momentd movingave movingaveExpwgt movingaveWgt nextindex nextn nextnevn nextwind ntos null null1 numCombinations ols olsmt olsmtControlCreate olsqr olsqr2 olsqrmt ones optn optnevn orth outtyp pacf packedToSp packr parse pause pdfCauchy pdfChi pdfExp pdfGenPareto pdfHyperGeo pdfLaplace pdfLogistic pdfn pdfPoisson pdfRayleigh pdfWeibull pi pinv pinvmt plotAddArrow plotAddBar plotAddBox plotAddHist plotAddHistF plotAddHistP plotAddPolar plotAddScatter plotAddShape plotAddTextbox plotAddTS plotAddXY plotArea plotBar plotBox plotClearLayout plotContour plotCustomLayout plotGetDefaults plotHist plotHistF plotHistP plotLayout plotLogLog plotLogX plotLogY plotOpenWindow plotPolar plotSave plotScatter plotSetAxesPen plotSetBar plotSetBarFill plotSetBarStacked plotSetBkdColor plotSetFill plotSetGrid plotSetLegend plotSetLineColor plotSetLineStyle plotSetLineSymbol plotSetLineThickness plotSetNewWindow plotSetTitle plotSetWhichYAxis plotSetXAxisShow plotSetXLabel plotSetXRange plotSetXTicInterval plotSetXTicLabel plotSetYAxisShow plotSetYLabel plotSetYRange plotSetZAxisShow plotSetZLabel plotSurface plotTS plotXY polar polychar polyeval polygamma polyint polymake polymat polymroot polymult polyroot pqgwin previousindex princomp printfm printfmt prodc psi putarray putf putvals pvCreate pvGetIndex pvGetParNames pvGetParVector pvLength pvList pvPack pvPacki pvPackm pvPackmi pvPacks pvPacksi pvPacksm pvPacksmi pvPutParVector pvTest pvUnpack QNewton QNewtonmt QNewtonmtControlCreate QNewtonmtOutCreate QNewtonSet QProg QProgmt QProgmtInCreate qqr qqre qqrep qr qre qrep qrsol qrtsol qtyr qtyre qtyrep quantile quantiled qyr qyre qyrep qz rank rankindx readr real reclassify reclassifyCuts recode recserar recsercp recserrc rerun rescale reshape rets rev rfft rffti rfftip rfftn rfftnp rfftp rndBernoulli rndBeta rndBinomial rndCauchy rndChiSquare rndCon rndCreateState rndExp rndGamma rndGeo rndGumbel rndHyperGeo rndi rndKMbeta rndKMgam rndKMi rndKMn rndKMnb rndKMp rndKMu rndKMvm rndLaplace rndLCbeta rndLCgam rndLCi rndLCn rndLCnb rndLCp rndLCu rndLCvm rndLogNorm rndMTu rndMVn rndMVt rndn rndnb rndNegBinomial rndp rndPoisson rndRayleigh rndStateSkip rndu rndvm rndWeibull rndWishart rotater round rows rowsf rref sampleData satostrC saved saveStruct savewind scale scale3d scalerr scalinfnanmiss scalmiss schtoc schur searchsourcepath seekr select selif seqa seqm setdif setdifsa setvars setvwrmode setwind shell shiftr sin singleindex sinh sleep solpd sortc sortcc sortd sorthc sorthcc sortind sortindc sortmc sortr sortrc spBiconjGradSol spChol spConjGradSol spCreate spDenseSubmat spDiagRvMat spEigv spEye spLDL spline spLU spNumNZE spOnes spreadSheetReadM spreadSheetReadSA spreadSheetWrite spScale spSubmat spToDense spTrTDense spTScalar spZeros sqpSolve sqpSolveMT sqpSolveMTControlCreate sqpSolveMTlagrangeCreate sqpSolveMToutCreate sqpSolveSet sqrt statements stdc stdsc stocv stof strcombine strindx strlen strput strrindx strsect strsplit strsplitPad strtodt strtof strtofcplx strtriml strtrimr strtrunc strtruncl strtruncpad strtruncr submat subscat substute subvec sumc sumr surface svd svd1 svd2 svdcusv svds svdusv sysstate tab tan tanh tempname time timedt timestr timeutc title tkf2eps tkf2ps tocart todaydt toeplitz token topolar trapchk trigamma trimr trunc type typecv typef union unionsa uniqindx uniqindxsa unique uniquesa upmat upmat1 upper utctodt utctodtv utrisol vals varCovMS varCovXS varget vargetl varmall varmares varput varputl vartypef vcm vcms vcx vcxs vec vech vecr vector vget view viewxyz vlist vnamecv volume vput vread vtypecv wait waitc walkindex where window writer xlabel xlsGetSheetCount xlsGetSheetSize xlsGetSheetTypes xlsMakeRange xlsReadM xlsReadSA xlsWrite xlsWriteM xlsWriteSA xpnd xtics xy xyz ylabel ytics zeros zeta zlabel ztics cdfEmpirical dot h5create h5open h5read h5readAttribute h5write h5writeAttribute ldl plotAddErrorBar plotAddSurface plotCDFEmpirical plotSetColormap plotSetContourLabels plotSetLegendFont plotSetTextInterpreter plotSetXTicCount plotSetYTicCount plotSetZLevels powerm strjoin sylvester strtrim",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/gcode.min.js b/vendor/assets/javascripts/highlightjs/es/languages/gcode.min.js
index 4ce31913c6a..11fa0fcc12a 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/gcode.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/gcode.min.js
@@ -1,4 +1,4 @@
-/*! `gcode` grammar compiled for Highlight.js 11.6.0 */
+/*! `gcode` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const a=e.inherit(e.C_NUMBER_MODE,{
 begin:"([-+]?((\\.\\d+)|(\\d+)(\\.\\d*)?))|"+e.C_NUMBER_RE
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/gherkin.min.js b/vendor/assets/javascripts/highlightjs/es/languages/gherkin.min.js
index 4547324aec7..e88ea984f16 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/gherkin.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/gherkin.min.js
@@ -1,4 +1,4 @@
-/*! `gherkin` grammar compiled for Highlight.js 11.6.0 */
+/*! `gherkin` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"Gherkin",
 aliases:["feature"],
 keywords:"Feature Background Ability Business Need Scenario Scenarios Scenario Outline Scenario Template Examples Given And Then But When",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/glsl.min.js b/vendor/assets/javascripts/highlightjs/es/languages/glsl.min.js
index 1eb692c5ed4..4ff74b2d9a5 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/glsl.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/glsl.min.js
@@ -1,4 +1,4 @@
-/*! `glsl` grammar compiled for Highlight.js 11.6.0 */
+/*! `glsl` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"GLSL",keywords:{
 keyword:"break continue discard do else for if return while switch case default attribute binding buffer ccw centroid centroid varying coherent column_major const cw depth_any depth_greater depth_less depth_unchanged early_fragment_tests equal_spacing flat fractional_even_spacing fractional_odd_spacing highp in index inout invariant invocations isolines layout line_strip lines lines_adjacency local_size_x local_size_y local_size_z location lowp max_vertices mediump noperspective offset origin_upper_left out packed patch pixel_center_integer point_mode points precise precision quads r11f_g11f_b10f r16 r16_snorm r16f r16i r16ui r32f r32i r32ui r8 r8_snorm r8i r8ui readonly restrict rg16 rg16_snorm rg16f rg16i rg16ui rg32f rg32i rg32ui rg8 rg8_snorm rg8i rg8ui rgb10_a2 rgb10_a2ui rgba16 rgba16_snorm rgba16f rgba16i rgba16ui rgba32f rgba32i rgba32ui rgba8 rgba8_snorm rgba8i rgba8ui row_major sample shared smooth std140 std430 stream triangle_strip triangles triangles_adjacency uniform varying vertices volatile writeonly",
 type:"atomic_uint bool bvec2 bvec3 bvec4 dmat2 dmat2x2 dmat2x3 dmat2x4 dmat3 dmat3x2 dmat3x3 dmat3x4 dmat4 dmat4x2 dmat4x3 dmat4x4 double dvec2 dvec3 dvec4 float iimage1D iimage1DArray iimage2D iimage2DArray iimage2DMS iimage2DMSArray iimage2DRect iimage3D iimageBuffer iimageCube iimageCubeArray image1D image1DArray image2D image2DArray image2DMS image2DMSArray image2DRect image3D imageBuffer imageCube imageCubeArray int isampler1D isampler1DArray isampler2D isampler2DArray isampler2DMS isampler2DMSArray isampler2DRect isampler3D isamplerBuffer isamplerCube isamplerCubeArray ivec2 ivec3 ivec4 mat2 mat2x2 mat2x3 mat2x4 mat3 mat3x2 mat3x3 mat3x4 mat4 mat4x2 mat4x3 mat4x4 sampler1D sampler1DArray sampler1DArrayShadow sampler1DShadow sampler2D sampler2DArray sampler2DArrayShadow sampler2DMS sampler2DMSArray sampler2DRect sampler2DRectShadow sampler2DShadow sampler3D samplerBuffer samplerCube samplerCubeArray samplerCubeArrayShadow samplerCubeShadow image1D uimage1DArray uimage2D uimage2DArray uimage2DMS uimage2DMSArray uimage2DRect uimage3D uimageBuffer uimageCube uimageCubeArray uint usampler1D usampler1DArray usampler2D usampler2DArray usampler2DMS usampler2DMSArray usampler2DRect usampler3D samplerBuffer usamplerCube usamplerCubeArray uvec2 uvec3 uvec4 vec2 vec3 vec4 void",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/gml.min.js b/vendor/assets/javascripts/highlightjs/es/languages/gml.min.js
index 9afaeb24aa8..f09dbd9685b 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/gml.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/gml.min.js
@@ -1,4 +1,4 @@
-/*! `gml` grammar compiled for Highlight.js 11.6.0 */
+/*! `gml` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"GML",case_insensitive:!1,
 keywords:{
 keyword:["#endregion","#macro","#region","and","begin","break","case","constructor","continue","default","delete","div","do","else","end","enum","exit","for","function","globalvar","if","mod","not","or","repeat","return","switch","then","until","var","while","with","xor"],
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/go.min.js b/vendor/assets/javascripts/highlightjs/es/languages/go.min.js
index c7f9f51e503..3d420dffd29 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/go.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/go.min.js
@@ -1,4 +1,4 @@
-/*! `go` grammar compiled for Highlight.js 11.6.0 */
+/*! `go` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const n={
 keyword:["break","case","chan","const","continue","default","defer","else","fallthrough","for","func","go","goto","if","import","interface","map","package","range","return","select","struct","switch","type","var"],
 type:["bool","byte","complex64","complex128","error","float32","float64","int8","int16","int32","int64","string","uint8","uint16","uint32","uint64","int","uint","uintptr","rune"],
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/golo.min.js b/vendor/assets/javascripts/highlightjs/es/languages/golo.min.js
index 71600afe124..3416ea7af2c 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/golo.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/golo.min.js
@@ -1,4 +1,4 @@
-/*! `golo` grammar compiled for Highlight.js 11.6.0 */
+/*! `golo` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"Golo",keywords:{
 keyword:["println","readln","print","import","module","function","local","return","let","var","while","for","foreach","times","in","case","when","match","with","break","continue","augment","augmentation","each","find","filter","reduce","if","then","else","otherwise","try","catch","finally","raise","throw","orIfNull","DynamicObject|10","DynamicVariable","struct","Observable","map","set","vector","list","array"],
 literal:["true","false","null"]},
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/gradle.min.js b/vendor/assets/javascripts/highlightjs/es/languages/gradle.min.js
index e1ea7e145b3..99b1b4ec5e7 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/gradle.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/gradle.min.js
@@ -1,4 +1,4 @@
-/*! `gradle` grammar compiled for Highlight.js 11.6.0 */
+/*! `gradle` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"Gradle",
 case_insensitive:!0,
 keywords:["task","project","allprojects","subprojects","artifacts","buildscript","configurations","dependencies","repositories","sourceSets","description","delete","from","into","include","exclude","source","classpath","destinationDir","includes","options","sourceCompatibility","targetCompatibility","group","flatDir","doLast","doFirst","flatten","todir","fromdir","ant","def","abstract","break","case","catch","continue","default","do","else","extends","final","finally","for","if","implements","instanceof","native","new","private","protected","public","return","static","switch","synchronized","throw","throws","transient","try","volatile","while","strictfp","package","import","false","null","super","this","true","antlrtask","checkstyle","codenarc","copy","boolean","byte","char","class","double","float","int","interface","long","short","void","compile","runTime","file","fileTree","abs","any","append","asList","asWritable","call","collect","compareTo","count","div","dump","each","eachByte","eachFile","eachLine","every","find","findAll","flatten","getAt","getErr","getIn","getOut","getText","grep","immutable","inject","inspect","intersect","invokeMethods","isCase","join","leftShift","minus","multiply","newInputStream","newOutputStream","newPrintWriter","newReader","newWriter","next","plus","pop","power","previous","print","println","push","putAt","read","readBytes","readLines","reverse","reverseEach","round","size","sort","splitEachLine","step","subMap","times","toInteger","toList","tokenize","upto","waitForOrKill","withPrintWriter","withReader","withStream","withWriter","withWriterAppend","write","writeLine"],
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/graphql.min.js b/vendor/assets/javascripts/highlightjs/es/languages/graphql.min.js
index 903f8d3ad4f..a228df9608f 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/graphql.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/graphql.min.js
@@ -1,4 +1,4 @@
-/*! `graphql` grammar compiled for Highlight.js 11.6.0 */
+/*! `graphql` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const a=e.regex;return{
 name:"GraphQL",aliases:["gql"],case_insensitive:!0,disableAutodetect:!1,
 keywords:{
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/groovy.min.js b/vendor/assets/javascripts/highlightjs/es/languages/groovy.min.js
index 75edd08f1ba..6c686ab5ecb 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/groovy.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/groovy.min.js
@@ -1,4 +1,4 @@
-/*! `groovy` grammar compiled for Highlight.js 11.6.0 */
+/*! `groovy` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";function e(e,a={}){return a.variants=e,a}
 return a=>{
 const n=a.regex,t="[A-Za-z0-9_$]+",r=e([a.C_LINE_COMMENT_MODE,a.C_BLOCK_COMMENT_MODE,a.COMMENT("/\\*\\*","\\*/",{
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/haml.min.js b/vendor/assets/javascripts/highlightjs/es/languages/haml.min.js
index c2d5e929b76..ca1b92f6e4d 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/haml.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/haml.min.js
@@ -1,4 +1,4 @@
-/*! `haml` grammar compiled for Highlight.js 11.6.0 */
+/*! `haml` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"HAML",case_insensitive:!0,
 contains:[{className:"meta",
 begin:"^!!!( (5|1\\.1|Strict|Frameset|Basic|Mobile|RDFa|XML\\b.*))?$",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/handlebars.min.js b/vendor/assets/javascripts/highlightjs/es/languages/handlebars.min.js
index dc0eb6ae2a1..8d646641c87 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/handlebars.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/handlebars.min.js
@@ -1,4 +1,4 @@
-/*! `handlebars` grammar compiled for Highlight.js 11.6.0 */
+/*! `handlebars` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const a=e.regex,n={
 $pattern:/[\w.\/]+/,
 built_in:["action","bindattr","collection","component","concat","debugger","each","each-in","get","hash","if","in","input","link-to","loc","log","lookup","mut","outlet","partial","query-params","render","template","textarea","unbound","unless","view","with","yield"]
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/haskell.min.js b/vendor/assets/javascripts/highlightjs/es/languages/haskell.min.js
index 861f21c8494..f4cb795e29f 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/haskell.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/haskell.min.js
@@ -1,29 +1,30 @@
-/*! `haskell` grammar compiled for Highlight.js 11.6.0 */
+/*! `haskell` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const n={
 variants:[e.COMMENT("--","$"),e.COMMENT(/\{-/,/-\}/,{contains:["self"]})]},a={
-className:"meta",begin:/\{-#/,end:/#-\}/},i={className:"meta",begin:"^#",end:"$"
-},s={className:"type",begin:"\\b[A-Z][\\w']*",relevance:0},l={begin:"\\(",
-end:"\\)",illegal:'"',contains:[a,i,{className:"type",
+className:"meta",begin:/\{-#/,end:/#-\}/},s={className:"meta",begin:"^#",end:"$"
+},i={className:"type",begin:"\\b[A-Z][\\w']*",relevance:0},t={begin:"\\(",
+end:"\\)",illegal:'"',contains:[a,s,{className:"type",
 begin:"\\b[A-Z][\\w]*(\\((\\.\\.|,|\\w+)\\))?"},e.inherit(e.TITLE_MODE,{
-begin:"[_a-z][\\w']*"}),n]},t="([0-9a-fA-F]_*)+",r={className:"number",
-relevance:0,variants:[{
-match:"\\b(([0-9]_*)+)(\\.(([0-9]_*)+))?([eE][+-]?(([0-9]_*)+))?\\b"},{
-match:`\\b0[xX]_*(${t})(\\.(${t}))?([pP][+-]?(([0-9]_*)+))?\\b`},{
+begin:"[_a-z][\\w']*"}),n]},l="([0-9]_*)+",c="([0-9a-fA-F]_*)+",r={
+className:"number",relevance:0,variants:[{
+match:`\\b(${l})(\\.(${l}))?([eE][+-]?(${l}))?\\b`},{
+match:`\\b0[xX]_*(${c})(\\.(${c}))?([pP][+-]?(${l}))?\\b`},{
 match:"\\b0[oO](([0-7]_*)+)\\b"},{match:"\\b0[bB](([01]_*)+)\\b"}]};return{
 name:"Haskell",aliases:["hs"],
 keywords:"let in if then else case of where do module import hiding qualified type data newtype deriving class instance as default infix infixl infixr foreign export ccall stdcall cplusplus jvm dotnet safe unsafe family forall mdo proc rec",
 contains:[{beginKeywords:"module",end:"where",keywords:"module where",
-contains:[l,n],illegal:"\\W\\.|;"},{begin:"\\bimport\\b",end:"$",
-keywords:"import qualified as hiding",contains:[l,n],illegal:"\\W\\.|;"},{
+contains:[t,n],illegal:"\\W\\.|;"},{begin:"\\bimport\\b",end:"$",
+keywords:"import qualified as hiding",contains:[t,n],illegal:"\\W\\.|;"},{
 className:"class",begin:"^(\\s*)?(class|instance)\\b",end:"where",
-keywords:"class family instance where",contains:[s,l,n]},{className:"class",
+keywords:"class family instance where",contains:[i,t,n]},{className:"class",
 begin:"\\b(data|(new)?type)\\b",end:"$",
-keywords:"data family type newtype deriving",contains:[a,s,l,{begin:/\{/,
-end:/\}/,contains:l.contains},n]},{beginKeywords:"default",end:"$",
-contains:[s,l,n]},{beginKeywords:"infix infixl infixr",end:"$",
+keywords:"data family type newtype deriving",contains:[a,i,t,{begin:/\{/,
+end:/\}/,contains:t.contains},n]},{beginKeywords:"default",end:"$",
+contains:[i,t,n]},{beginKeywords:"infix infixl infixr",end:"$",
 contains:[e.C_NUMBER_MODE,n]},{begin:"\\bforeign\\b",end:"$",
 keywords:"foreign import export ccall stdcall cplusplus jvm dotnet safe unsafe",
-contains:[s,e.QUOTE_STRING_MODE,n]},{className:"meta",
-begin:"#!\\/usr\\/bin\\/env runhaskell",end:"$"
-},a,i,e.QUOTE_STRING_MODE,r,s,e.inherit(e.TITLE_MODE,{begin:"^[_a-z][\\w']*"
-}),n,{begin:"->|<-"}]}}})();export default hljsGrammar;
\ No newline at end of file
+contains:[i,e.QUOTE_STRING_MODE,n]},{className:"meta",
+begin:"#!\\/usr\\/bin\\/env runhaskell",end:"$"},a,s,{scope:"string",
+begin:/'(?=\\?.')/,end:/'/,contains:[{scope:"char.escape",match:/\\./}]
+},e.QUOTE_STRING_MODE,r,i,e.inherit(e.TITLE_MODE,{begin:"^[_a-z][\\w']*"}),n,{
+begin:"->|<-"}]}}})();export default hljsGrammar;
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/haxe.min.js b/vendor/assets/javascripts/highlightjs/es/languages/haxe.min.js
index e4fd29d3012..c146217560a 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/haxe.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/haxe.min.js
@@ -1,4 +1,4 @@
-/*! `haxe` grammar compiled for Highlight.js 11.6.0 */
+/*! `haxe` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"Haxe",aliases:["hx"],
 keywords:{
 keyword:"break case cast catch continue default do dynamic else enum extern for function here if import in inline never new override package private get set public return static super switch this throw trace try typedef untyped using var while Int Float String Bool Dynamic Void Array ",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/hsp.min.js b/vendor/assets/javascripts/highlightjs/es/languages/hsp.min.js
index 51402ce5b13..590d1094d0b 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/hsp.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/hsp.min.js
@@ -1,4 +1,4 @@
-/*! `hsp` grammar compiled for Highlight.js 11.6.0 */
+/*! `hsp` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"HSP",case_insensitive:!0,
 keywords:{$pattern:/[\w._]+/,
 keyword:"goto gosub return break repeat loop continue wait await dim sdim foreach dimtype dup dupptr end stop newmod delmod mref run exgoto on mcall assert logmes newlab resume yield onexit onerror onkey onclick oncmd exist delete mkdir chdir dirlist bload bsave bcopy memfile if else poke wpoke lpoke getstr chdpm memexpand memcpy memset notesel noteadd notedel noteload notesave randomize noteunsel noteget split strrep setease button chgdisp exec dialog mmload mmplay mmstop mci pset pget syscolor mes print title pos circle cls font sysfont objsize picload color palcolor palette redraw width gsel gcopy gzoom gmode bmpsave hsvcolor getkey listbox chkbox combox input mesbox buffer screen bgscr mouse objsel groll line clrobj boxf objprm objmode stick grect grotate gsquare gradf objimage objskip objenable celload celdiv celput newcom querycom delcom cnvstow comres axobj winobj sendmsg comevent comevarg sarrayconv callfunc cnvwtos comevdisp libptr system hspstat hspver stat cnt err strsize looplev sublev iparam wparam lparam refstr refdval int rnd strlen length length2 length3 length4 vartype gettime peek wpeek lpeek varptr varuse noteinfo instr abs limit getease str strmid strf getpath strtrim sin cos tan atan sqrt double absf expf logf limitf powf geteasef mousex mousey mousew hwnd hinstance hdc ginfo objinfo dirinfo sysinfo thismod __hspver__ __hsp30__ __date__ __time__ __line__ __file__ _debug __hspdef__ and or xor not screen_normal screen_palette screen_hide screen_fixedsize screen_tool screen_frame gmode_gdi gmode_mem gmode_rgb0 gmode_alpha gmode_rgb0alpha gmode_add gmode_sub gmode_pixela ginfo_mx ginfo_my ginfo_act ginfo_sel ginfo_wx1 ginfo_wy1 ginfo_wx2 ginfo_wy2 ginfo_vx ginfo_vy ginfo_sizex ginfo_sizey ginfo_winx ginfo_winy ginfo_mesx ginfo_mesy ginfo_r ginfo_g ginfo_b ginfo_paluse ginfo_dispx ginfo_dispy ginfo_cx ginfo_cy ginfo_intid ginfo_newid ginfo_sx ginfo_sy objinfo_mode objinfo_bmscr objinfo_hwnd notemax notesize dir_cur dir_exe dir_win dir_sys dir_cmdline dir_desktop dir_mydoc dir_tv font_normal font_bold font_italic font_underline font_strikeout font_antialias objmode_normal objmode_guifont objmode_usefont gsquare_grad msgothic msmincho do until while wend for next _break _continue switch case default swbreak swend ddim ldim alloc m_pi rad2deg deg2rad ease_linear ease_quad_in ease_quad_out ease_quad_inout ease_cubic_in ease_cubic_out ease_cubic_inout ease_quartic_in ease_quartic_out ease_quartic_inout ease_bounce_in ease_bounce_out ease_bounce_inout ease_shake_in ease_shake_out ease_shake_inout ease_loop"
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/http.min.js b/vendor/assets/javascripts/highlightjs/es/languages/http.min.js
index bb341e3279b..88e8be8174a 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/http.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/http.min.js
@@ -1,5 +1,5 @@
-/*! `http` grammar compiled for Highlight.js 11.6.0 */
-var hljsGrammar=(()=>{"use strict";return e=>{const a="HTTP/(2|1\\.[01])",n={
+/*! `http` grammar compiled for Highlight.js 11.8.0 */
+var hljsGrammar=(()=>{"use strict";return e=>{const a="HTTP/([32]|1\\.[01])",n={
 className:"attribute",
 begin:e.regex.concat("^",/[A-Za-z][A-Za-z0-9-]*/,"(?=\\:\\s)"),starts:{
 contains:[{className:"punctuation",begin:/: /,relevance:0,starts:{end:"$",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/hy.min.js b/vendor/assets/javascripts/highlightjs/es/languages/hy.min.js
index ed3a3766b94..5f6fe0b90da 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/hy.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/hy.min.js
@@ -1,4 +1,4 @@
-/*! `hy` grammar compiled for Highlight.js 11.6.0 */
+/*! `hy` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const a="a-zA-Z_\\-!.?+*=<>&#'",t="["+a+"]["+a+"0-9/;:]*",i={$pattern:t,
 built_in:"!= % %= & &= * ** **= *= *map + += , --build-class-- --import-- -= . / // //= /= < << <<= <= = > >= >> >>= @ @= ^ ^= abs accumulate all and any ap-compose ap-dotimes ap-each ap-each-while ap-filter ap-first ap-if ap-last ap-map ap-map-when ap-pipe ap-reduce ap-reject apply as-> ascii assert assoc bin break butlast callable calling-module-name car case cdr chain chr coll? combinations compile compress cond cons cons? continue count curry cut cycle dec def default-method defclass defmacro defmacro-alias defmacro/g! defmain defmethod defmulti defn defn-alias defnc defnr defreader defseq del delattr delete-route dict-comp dir disassemble dispatch-reader-macro distinct divmod do doto drop drop-last drop-while empty? end-sequence eval eval-and-compile eval-when-compile even? every? except exec filter first flatten float? fn fnc fnr for for* format fraction genexpr gensym get getattr global globals group-by hasattr hash hex id identity if if* if-not if-python2 import in inc input instance? integer integer-char? integer? interleave interpose is is-coll is-cons is-empty is-even is-every is-float is-instance is-integer is-integer-char is-iterable is-iterator is-keyword is-neg is-none is-not is-numeric is-odd is-pos is-string is-symbol is-zero isinstance islice issubclass iter iterable? iterate iterator? keyword keyword? lambda last len let lif lif-not list* list-comp locals loop macro-error macroexpand macroexpand-1 macroexpand-all map max merge-with method-decorator min multi-decorator multicombinations name neg? next none? nonlocal not not-in not? nth numeric? oct odd? open or ord partition permutations pos? post-route postwalk pow prewalk print product profile/calls profile/cpu put-route quasiquote quote raise range read read-str recursive-replace reduce remove repeat repeatedly repr require rest round route route-with-methods rwm second seq set-comp setattr setv some sorted string string? sum switch symbol? take take-nth take-while tee try unless unquote unquote-splicing vars walk when while with with* with-decorator with-gensyms xi xor yield yield-from zero? zip zip-longest | |= ~"
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/inform7.min.js b/vendor/assets/javascripts/highlightjs/es/languages/inform7.min.js
index 041b021c5fb..d137768a61a 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/inform7.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/inform7.min.js
@@ -1,4 +1,4 @@
-/*! `inform7` grammar compiled for Highlight.js 11.6.0 */
+/*! `inform7` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"Inform 7",aliases:["i7"],
 case_insensitive:!0,keywords:{
 keyword:"thing room person man woman animal container supporter backdrop door scenery open closed locked inside gender is are say understand kind of rule"
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/ini.min.js b/vendor/assets/javascripts/highlightjs/es/languages/ini.min.js
index be18e194bfa..52807521612 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/ini.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/ini.min.js
@@ -1,4 +1,4 @@
-/*! `ini` grammar compiled for Highlight.js 11.6.0 */
+/*! `ini` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const n=e.regex,a={
 className:"number",relevance:0,variants:[{begin:/([+-]+)?[\d]+_[\d_]+/},{
 begin:e.NUMBER_RE}]},s=e.COMMENT();s.variants=[{begin:/;/,end:/$/},{begin:/#/,
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/irpf90.min.js b/vendor/assets/javascripts/highlightjs/es/languages/irpf90.min.js
index 3c661a7d62d..a5d4f60a344 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/irpf90.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/irpf90.min.js
@@ -1,4 +1,4 @@
-/*! `irpf90` grammar compiled for Highlight.js 11.6.0 */
+/*! `irpf90` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const n=e.regex,t=/(_[a-z_\d]+)?/,a=/([de][+-]?\d+)?/,i={className:"number",
 variants:[{begin:n.concat(/\b\d+/,/\.(\d*)/,a,t)},{begin:n.concat(/\b\d+/,a,t)
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/isbl.min.js b/vendor/assets/javascripts/highlightjs/es/languages/isbl.min.js
index 4d417bb1a78..8ddf6bf7ce5 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/isbl.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/isbl.min.js
@@ -1,4 +1,4 @@
-/*! `isbl` grammar compiled for Highlight.js 11.6.0 */
+/*! `isbl` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return S=>{
 const E="[A-Za-z\u0410-\u042f\u0430-\u044f\u0451\u0401_!][A-Za-z\u0410-\u042f\u0430-\u044f\u0451\u0401_0-9]*",_={
 className:"number",begin:S.NUMBER_RE,relevance:0},T={className:"string",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/java.min.js b/vendor/assets/javascripts/highlightjs/es/languages/java.min.js
index de1f65287d5..609835977d6 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/java.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/java.min.js
@@ -1,20 +1,20 @@
-/*! `java` grammar compiled for Highlight.js 11.6.0 */
+/*! `java` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict"
-;var e="\\.([0-9](_*[0-9])*)",a="[0-9a-fA-F](_*[0-9a-fA-F])*",n={
+;var e="[0-9](_*[0-9])*",a=`\\.(${e})`,n="[0-9a-fA-F](_*[0-9a-fA-F])*",s={
 className:"number",variants:[{
-begin:`(\\b([0-9](_*[0-9])*)((${e})|\\.)?|(${e}))[eE][+-]?([0-9](_*[0-9])*)[fFdD]?\\b`
-},{begin:`\\b([0-9](_*[0-9])*)((${e})[fFdD]?\\b|\\.([fFdD]\\b)?)`},{
-begin:`(${e})[fFdD]?\\b`},{begin:"\\b([0-9](_*[0-9])*)[fFdD]\\b"},{
-begin:`\\b0[xX]((${a})\\.?|(${a})?\\.(${a}))[pP][+-]?([0-9](_*[0-9])*)[fFdD]?\\b`
-},{begin:"\\b(0|[1-9](_*[0-9])*)[lL]?\\b"},{begin:`\\b0[xX](${a})[lL]?\\b`},{
+begin:`(\\b(${e})((${a})|\\.)?|(${a}))[eE][+-]?(${e})[fFdD]?\\b`},{
+begin:`\\b(${e})((${a})[fFdD]?\\b|\\.([fFdD]\\b)?)`},{begin:`(${a})[fFdD]?\\b`
+},{begin:`\\b(${e})[fFdD]\\b`},{
+begin:`\\b0[xX]((${n})\\.?|(${n})?\\.(${n}))[pP][+-]?(${e})[fFdD]?\\b`},{
+begin:"\\b(0|[1-9](_*[0-9])*)[lL]?\\b"},{begin:`\\b0[xX](${n})[lL]?\\b`},{
 begin:"\\b0(_*[0-7])*[lL]?\\b"},{begin:"\\b0[bB][01](_*[01])*[lL]?\\b"}],
-relevance:0};function s(e,a,n){return-1===n?"":e.replace(a,(t=>s(e,a,n-1)))}
+relevance:0};function t(e,a,n){return-1===n?"":e.replace(a,(s=>t(e,a,n-1)))}
 return e=>{
-const a=e.regex,t="[\xc0-\u02b8a-zA-Z_$][\xc0-\u02b8a-zA-Z_$0-9]*",r=t+s("(?:<"+t+"~~~(?:\\s*,\\s*"+t+"~~~)*>)?",/~~~/g,2),i={
-keyword:["synchronized","abstract","private","var","static","if","const ","for","while","strictfp","finally","protected","import","native","final","void","enum","else","break","transient","catch","instanceof","volatile","case","assert","package","default","public","try","switch","continue","throws","protected","public","private","module","requires","exports","do","sealed"],
+const a=e.regex,n="[\xc0-\u02b8a-zA-Z_$][\xc0-\u02b8a-zA-Z_$0-9]*",r=n+t("(?:<"+n+"~~~(?:\\s*,\\s*"+n+"~~~)*>)?",/~~~/g,2),i={
+keyword:["synchronized","abstract","private","var","static","if","const ","for","while","strictfp","finally","protected","import","native","final","void","enum","else","break","transient","catch","instanceof","volatile","case","assert","package","default","public","try","switch","continue","throws","protected","public","private","module","requires","exports","do","sealed","yield","permits"],
 literal:["false","true","null"],
 type:["char","boolean","long","float","int","byte","short","double"],
-built_in:["super","this"]},l={className:"meta",begin:"@"+t,contains:[{
+built_in:["super","this"]},l={className:"meta",begin:"@"+n,contains:[{
 begin:/\(/,end:/\)/,contains:["self"]}]},c={className:"params",begin:/\(/,
 end:/\)/,keywords:i,relevance:0,contains:[e.C_BLOCK_COMMENT_MODE],endsParent:!0}
 ;return{name:"Java",aliases:["jsp"],keywords:i,illegal:/<\/|#/,
@@ -24,15 +24,15 @@ begin:/import java\.[a-z]+\./,keywords:"import",relevance:2
 },e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{begin:/"""/,end:/"""/,
 className:"string",contains:[e.BACKSLASH_ESCAPE]
 },e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{
-match:[/\b(?:class|interface|enum|extends|implements|new)/,/\s+/,t],className:{
+match:[/\b(?:class|interface|enum|extends|implements|new)/,/\s+/,n],className:{
 1:"keyword",3:"title.class"}},{match:/non-sealed/,scope:"keyword"},{
-begin:[a.concat(/(?!else)/,t),/\s+/,t,/\s+/,/=(?!=)/],className:{1:"type",
-3:"variable",5:"operator"}},{begin:[/record/,/\s+/,t],className:{1:"keyword",
+begin:[a.concat(/(?!else)/,n),/\s+/,n,/\s+/,/=(?!=)/],className:{1:"type",
+3:"variable",5:"operator"}},{begin:[/record/,/\s+/,n],className:{1:"keyword",
 3:"title.class"},contains:[c,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{
 beginKeywords:"new throw return else",relevance:0},{
 begin:["(?:"+r+"\\s+)",e.UNDERSCORE_IDENT_RE,/\s*(?=\()/],className:{
 2:"title.function"},keywords:i,contains:[{className:"params",begin:/\(/,
 end:/\)/,keywords:i,relevance:0,
-contains:[l,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,n,e.C_BLOCK_COMMENT_MODE]
-},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},n,l]}}})()
+contains:[l,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,s,e.C_BLOCK_COMMENT_MODE]
+},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},s,l]}}})()
 ;export default hljsGrammar;
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/javascript.min.js b/vendor/assets/javascripts/highlightjs/es/languages/javascript.min.js
index ac8ee08e719..30b511a2ebe 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/javascript.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/javascript.min.js
@@ -1,77 +1,80 @@
-/*! `javascript` grammar compiled for Highlight.js 11.6.0 */
+/*! `javascript` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict"
-;const e="[A-Za-z$_][0-9A-Za-z$_]*",n=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],a=["true","false","null","undefined","NaN","Infinity"],t=["Object","Function","Boolean","Symbol","Math","Date","Number","BigInt","String","RegExp","Array","Float32Array","Float64Array","Int8Array","Uint8Array","Uint8ClampedArray","Int16Array","Int32Array","Uint16Array","Uint32Array","BigInt64Array","BigUint64Array","Set","Map","WeakSet","WeakMap","ArrayBuffer","SharedArrayBuffer","Atomics","DataView","JSON","Promise","Generator","GeneratorFunction","AsyncFunction","Reflect","Proxy","Intl","WebAssembly"],s=["Error","EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"],r=["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],c=["arguments","this","super","console","window","document","localStorage","module","global"],i=[].concat(r,t,s)
-;return o=>{const l=o.regex,b=e,d={begin:/<[A-Za-z0-9\\._:-]+/,
+;const e="[A-Za-z$_][0-9A-Za-z$_]*",n=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],a=["true","false","null","undefined","NaN","Infinity"],t=["Object","Function","Boolean","Symbol","Math","Date","Number","BigInt","String","RegExp","Array","Float32Array","Float64Array","Int8Array","Uint8Array","Uint8ClampedArray","Int16Array","Int32Array","Uint16Array","Uint32Array","BigInt64Array","BigUint64Array","Set","Map","WeakSet","WeakMap","ArrayBuffer","SharedArrayBuffer","Atomics","DataView","JSON","Promise","Generator","GeneratorFunction","AsyncFunction","Reflect","Proxy","Intl","WebAssembly"],s=["Error","EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"],r=["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],c=["arguments","this","super","console","window","document","localStorage","sessionStorage","module","global"],i=[].concat(r,t,s)
+;return o=>{const l=o.regex,d=e,b={begin:/<[A-Za-z0-9\\._:-]+/,
 end:/\/[A-Za-z0-9\\._:-]+>|\/>/,isTrulyOpeningTag:(e,n)=>{
 const a=e[0].length+e.index,t=e.input[a]
 ;if("<"===t||","===t)return void n.ignoreMatch();let s
 ;">"===t&&(((e,{after:n})=>{const a="</"+e[0].slice(1)
-;return-1!==e.input.indexOf(a,n)})(e,{after:a
-})||n.ignoreMatch()),(s=e.input.substring(a).match(/^\s+extends\s+/))&&0===s.index&&n.ignoreMatch()
+;return-1!==e.input.indexOf(a,n)})(e,{after:a})||n.ignoreMatch())
+;const r=e.input.substring(a)
+;((s=r.match(/^\s*=/))||(s=r.match(/^\s+extends\s+/))&&0===s.index)&&n.ignoreMatch()
 }},g={$pattern:e,keyword:n,literal:a,built_in:i,"variable.language":c
-},u="\\.([0-9](_?[0-9])*)",m="0|[1-9](_?[0-9])*|0[0-7]*[89][0-9]*",E={
+},u="[0-9](_?[0-9])*",m=`\\.(${u})`,E="0|[1-9](_?[0-9])*|0[0-7]*[89][0-9]*",A={
 className:"number",variants:[{
-begin:`(\\b(${m})((${u})|\\.)?|(${u}))[eE][+-]?([0-9](_?[0-9])*)\\b`},{
-begin:`\\b(${m})\\b((${u})\\b|\\.)?|(${u})\\b`},{
+begin:`(\\b(${E})((${m})|\\.)?|(${m}))[eE][+-]?(${u})\\b`},{
+begin:`\\b(${E})\\b((${m})\\b|\\.)?|(${m})\\b`},{
 begin:"\\b(0|[1-9](_?[0-9])*)n\\b"},{
 begin:"\\b0[xX][0-9a-fA-F](_?[0-9a-fA-F])*n?\\b"},{
 begin:"\\b0[bB][0-1](_?[0-1])*n?\\b"},{begin:"\\b0[oO][0-7](_?[0-7])*n?\\b"},{
-begin:"\\b0[0-7]+n?\\b"}],relevance:0},A={className:"subst",begin:"\\$\\{",
-end:"\\}",keywords:g,contains:[]},y={begin:"html`",end:"",starts:{end:"`",
-returnEnd:!1,contains:[o.BACKSLASH_ESCAPE,A],subLanguage:"xml"}},N={
+begin:"\\b0[0-7]+n?\\b"}],relevance:0},y={className:"subst",begin:"\\$\\{",
+end:"\\}",keywords:g,contains:[]},h={begin:"html`",end:"",starts:{end:"`",
+returnEnd:!1,contains:[o.BACKSLASH_ESCAPE,y],subLanguage:"xml"}},N={
 begin:"css`",end:"",starts:{end:"`",returnEnd:!1,
-contains:[o.BACKSLASH_ESCAPE,A],subLanguage:"css"}},_={className:"string",
-begin:"`",end:"`",contains:[o.BACKSLASH_ESCAPE,A]},f={className:"comment",
+contains:[o.BACKSLASH_ESCAPE,y],subLanguage:"css"}},_={begin:"gql`",end:"",
+starts:{end:"`",returnEnd:!1,contains:[o.BACKSLASH_ESCAPE,y],
+subLanguage:"graphql"}},f={className:"string",begin:"`",end:"`",
+contains:[o.BACKSLASH_ESCAPE,y]},p={className:"comment",
 variants:[o.COMMENT(/\/\*\*(?!\/)/,"\\*/",{relevance:0,contains:[{
 begin:"(?=@[A-Za-z]+)",relevance:0,contains:[{className:"doctag",
 begin:"@[A-Za-z]+"},{className:"type",begin:"\\{",end:"\\}",excludeEnd:!0,
-excludeBegin:!0,relevance:0},{className:"variable",begin:b+"(?=\\s*(-)|$)",
+excludeBegin:!0,relevance:0},{className:"variable",begin:d+"(?=\\s*(-)|$)",
 endsParent:!0,relevance:0},{begin:/(?=[^\n])\s/,relevance:0}]}]
 }),o.C_BLOCK_COMMENT_MODE,o.C_LINE_COMMENT_MODE]
-},h=[o.APOS_STRING_MODE,o.QUOTE_STRING_MODE,y,N,_,E];A.contains=h.concat({
-begin:/\{/,end:/\}/,keywords:g,contains:["self"].concat(h)})
-;const v=[].concat(f,A.contains),p=v.concat([{begin:/\(/,end:/\)/,keywords:g,
-contains:["self"].concat(v)}]),S={className:"params",begin:/\(/,end:/\)/,
-excludeBegin:!0,excludeEnd:!0,keywords:g,contains:p},w={variants:[{
-match:[/class/,/\s+/,b,/\s+/,/extends/,/\s+/,l.concat(b,"(",l.concat(/\./,b),")*")],
+},v=[o.APOS_STRING_MODE,o.QUOTE_STRING_MODE,h,N,_,f,{match:/\$\d+/},A]
+;y.contains=v.concat({begin:/\{/,end:/\}/,keywords:g,contains:["self"].concat(v)
+});const S=[].concat(p,y.contains),w=S.concat([{begin:/\(/,end:/\)/,keywords:g,
+contains:["self"].concat(S)}]),R={className:"params",begin:/\(/,end:/\)/,
+excludeBegin:!0,excludeEnd:!0,keywords:g,contains:w},O={variants:[{
+match:[/class/,/\s+/,d,/\s+/,/extends/,/\s+/,l.concat(d,"(",l.concat(/\./,d),")*")],
 scope:{1:"keyword",3:"title.class",5:"keyword",7:"title.class.inherited"}},{
-match:[/class/,/\s+/,b],scope:{1:"keyword",3:"title.class"}}]},R={relevance:0,
+match:[/class/,/\s+/,d],scope:{1:"keyword",3:"title.class"}}]},k={relevance:0,
 match:l.either(/\bJSON/,/\b[A-Z][a-z]+([A-Z][a-z]*|\d)*/,/\b[A-Z]{2,}([A-Z][a-z]+|\d)+([A-Z][a-z]*)*/,/\b[A-Z]{2,}[a-z]+([A-Z][a-z]+|\d)*([A-Z][a-z]*)*/),
-className:"title.class",keywords:{_:[...t,...s]}},O={variants:[{
-match:[/function/,/\s+/,b,/(?=\s*\()/]},{match:[/function/,/\s*(?=\()/]}],
-className:{1:"keyword",3:"title.function"},label:"func.def",contains:[S],
-illegal:/%/},k={
-match:l.concat(/\b/,(I=[...r,"super"],l.concat("(?!",I.join("|"),")")),b,l.lookahead(/\(/)),
-className:"title.function",relevance:0};var I;const x={
-begin:l.concat(/\./,l.lookahead(l.concat(b,/(?![0-9A-Za-z$_(])/))),end:b,
-excludeBegin:!0,keywords:"prototype",className:"property",relevance:0},T={
-match:[/get|set/,/\s+/,b,/(?=\()/],className:{1:"keyword",3:"title.function"},
-contains:[{begin:/\(\)/},S]
-},C="(\\([^()]*(\\([^()]*(\\([^()]*\\)[^()]*)*\\)[^()]*)*\\)|"+o.UNDERSCORE_IDENT_RE+")\\s*=>",M={
-match:[/const|var|let/,/\s+/,b,/\s*/,/=\s*/,/(async\s*)?/,l.lookahead(C)],
-keywords:"async",className:{1:"keyword",3:"title.function"},contains:[S]}
-;return{name:"Javascript",aliases:["js","jsx","mjs","cjs"],keywords:g,exports:{
-PARAMS_CONTAINS:p,CLASS_REFERENCE:R},illegal:/#(?![$_A-z])/,
+className:"title.class",keywords:{_:[...t,...s]}},I={variants:[{
+match:[/function/,/\s+/,d,/(?=\s*\()/]},{match:[/function/,/\s*(?=\()/]}],
+className:{1:"keyword",3:"title.function"},label:"func.def",contains:[R],
+illegal:/%/},x={
+match:l.concat(/\b/,(T=[...r,"super","import"],l.concat("(?!",T.join("|"),")")),d,l.lookahead(/\(/)),
+className:"title.function",relevance:0};var T;const C={
+begin:l.concat(/\./,l.lookahead(l.concat(d,/(?![0-9A-Za-z$_(])/))),end:d,
+excludeBegin:!0,keywords:"prototype",className:"property",relevance:0},M={
+match:[/get|set/,/\s+/,d,/(?=\()/],className:{1:"keyword",3:"title.function"},
+contains:[{begin:/\(\)/},R]
+},B="(\\([^()]*(\\([^()]*(\\([^()]*\\)[^()]*)*\\)[^()]*)*\\)|"+o.UNDERSCORE_IDENT_RE+")\\s*=>",$={
+match:[/const|var|let/,/\s+/,d,/\s*/,/=\s*/,/(async\s*)?/,l.lookahead(B)],
+keywords:"async",className:{1:"keyword",3:"title.function"},contains:[R]}
+;return{name:"JavaScript",aliases:["js","jsx","mjs","cjs"],keywords:g,exports:{
+PARAMS_CONTAINS:w,CLASS_REFERENCE:k},illegal:/#(?![$_A-z])/,
 contains:[o.SHEBANG({label:"shebang",binary:"node",relevance:5}),{
 label:"use_strict",className:"meta",relevance:10,
 begin:/^\s*['"]use (strict|asm)['"]/
-},o.APOS_STRING_MODE,o.QUOTE_STRING_MODE,y,N,_,f,E,R,{className:"attr",
-begin:b+l.lookahead(":"),relevance:0},M,{
+},o.APOS_STRING_MODE,o.QUOTE_STRING_MODE,h,N,_,f,p,{match:/\$\d+/},A,k,{
+className:"attr",begin:d+l.lookahead(":"),relevance:0},$,{
 begin:"("+o.RE_STARTERS_RE+"|\\b(case|return|throw)\\b)\\s*",
-keywords:"return throw case",relevance:0,contains:[f,o.REGEXP_MODE,{
-className:"function",begin:C,returnBegin:!0,end:"\\s*=>",contains:[{
+keywords:"return throw case",relevance:0,contains:[p,o.REGEXP_MODE,{
+className:"function",begin:B,returnBegin:!0,end:"\\s*=>",contains:[{
 className:"params",variants:[{begin:o.UNDERSCORE_IDENT_RE,relevance:0},{
 className:null,begin:/\(\s*\)/,skip:!0},{begin:/\(/,end:/\)/,excludeBegin:!0,
-excludeEnd:!0,keywords:g,contains:p}]}]},{begin:/,/,relevance:0},{match:/\s+/,
+excludeEnd:!0,keywords:g,contains:w}]}]},{begin:/,/,relevance:0},{match:/\s+/,
 relevance:0},{variants:[{begin:"<>",end:"</>"},{
-match:/<[A-Za-z0-9\\._:-]+\s*\/>/},{begin:d.begin,
-"on:begin":d.isTrulyOpeningTag,end:d.end}],subLanguage:"xml",contains:[{
-begin:d.begin,end:d.end,skip:!0,contains:["self"]}]}]},O,{
+match:/<[A-Za-z0-9\\._:-]+\s*\/>/},{begin:b.begin,
+"on:begin":b.isTrulyOpeningTag,end:b.end}],subLanguage:"xml",contains:[{
+begin:b.begin,end:b.end,skip:!0,contains:["self"]}]}]},I,{
 beginKeywords:"while if switch catch for"},{
 begin:"\\b(?!function)"+o.UNDERSCORE_IDENT_RE+"\\([^()]*(\\([^()]*(\\([^()]*\\)[^()]*)*\\)[^()]*)*\\)\\s*\\{",
-returnBegin:!0,label:"func.def",contains:[S,o.inherit(o.TITLE_MODE,{begin:b,
-className:"title.function"})]},{match:/\.\.\./,relevance:0},x,{match:"\\$"+b,
+returnBegin:!0,label:"func.def",contains:[R,o.inherit(o.TITLE_MODE,{begin:d,
+className:"title.function"})]},{match:/\.\.\./,relevance:0},C,{match:"\\$"+d,
 relevance:0},{match:[/\bconstructor(?=\s*\()/],className:{1:"title.function"},
-contains:[S]},k,{relevance:0,match:/\b[A-Z][A-Z_0-9]+\b/,
-className:"variable.constant"},w,T,{match:/\$[(.]/}]}}})()
+contains:[R]},x,{relevance:0,match:/\b[A-Z][A-Z_0-9]+\b/,
+className:"variable.constant"},O,M,{match:/\$[(.]/}]}}})()
 ;export default hljsGrammar;
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/jboss-cli.min.js b/vendor/assets/javascripts/highlightjs/es/languages/jboss-cli.min.js
index d17c7847d78..2c3d24c583c 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/jboss-cli.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/jboss-cli.min.js
@@ -1,4 +1,4 @@
-/*! `jboss-cli` grammar compiled for Highlight.js 11.6.0 */
+/*! `jboss-cli` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"JBoss CLI",
 aliases:["wildfly-cli"],keywords:{$pattern:"[a-z-]+",
 keyword:"alias batch cd clear command connect connection-factory connection-info data-source deploy deployment-info deployment-overlay echo echo-dmr help history if jdbc-driver-info jms-queue|20 jms-topic|20 ls patch pwd quit read-attribute read-operation reload rollout-plan run-batch set shutdown try unalias undeploy unset version xa-data-source",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/json.min.js b/vendor/assets/javascripts/highlightjs/es/languages/json.min.js
index 9231023dbd3..2cdec3bd166 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/json.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/json.min.js
@@ -1,4 +1,4 @@
-/*! `json` grammar compiled for Highlight.js 11.6.0 */
+/*! `json` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const a=["true","false","null"],r={scope:"literal",beginKeywords:a.join(" ")}
 ;return{name:"JSON",keywords:{literal:a},contains:[{className:"attr",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/julia-repl.min.js b/vendor/assets/javascripts/highlightjs/es/languages/julia-repl.min.js
index a0efa7c2824..20b84befa8b 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/julia-repl.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/julia-repl.min.js
@@ -1,4 +1,4 @@
-/*! `julia-repl` grammar compiled for Highlight.js 11.6.0 */
+/*! `julia-repl` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return a=>({name:"Julia REPL",contains:[{
 className:"meta.prompt",begin:/^julia>/,relevance:10,starts:{end:/^(?![ ]{6})/,
 subLanguage:"julia"}}],aliases:["jldoctest"]})})();export default hljsGrammar;
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/julia.min.js b/vendor/assets/javascripts/highlightjs/es/languages/julia.min.js
index 7ea89c321f0..dfa99d44cf4 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/julia.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/julia.min.js
@@ -1,4 +1,4 @@
-/*! `julia` grammar compiled for Highlight.js 11.6.0 */
+/*! `julia` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const r="[A-Za-z_\\u00A1-\\uFFFF][A-Za-z_0-9\\u00A1-\\uFFFF]*",t={$pattern:r,
 keyword:["baremodule","begin","break","catch","ccall","const","continue","do","else","elseif","end","export","false","finally","for","function","global","if","import","in","isa","let","local","macro","module","quote","return","true","try","using","where","while"],
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/kotlin.min.js b/vendor/assets/javascripts/highlightjs/es/languages/kotlin.min.js
index d6ab534d5d8..32f1eb0dc20 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/kotlin.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/kotlin.min.js
@@ -1,17 +1,17 @@
-/*! `kotlin` grammar compiled for Highlight.js 11.6.0 */
+/*! `kotlin` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict"
-;var e="\\.([0-9](_*[0-9])*)",n="[0-9a-fA-F](_*[0-9a-fA-F])*",a={
+;var e="[0-9](_*[0-9])*",n=`\\.(${e})`,a="[0-9a-fA-F](_*[0-9a-fA-F])*",i={
 className:"number",variants:[{
-begin:`(\\b([0-9](_*[0-9])*)((${e})|\\.)?|(${e}))[eE][+-]?([0-9](_*[0-9])*)[fFdD]?\\b`
-},{begin:`\\b([0-9](_*[0-9])*)((${e})[fFdD]?\\b|\\.([fFdD]\\b)?)`},{
-begin:`(${e})[fFdD]?\\b`},{begin:"\\b([0-9](_*[0-9])*)[fFdD]\\b"},{
-begin:`\\b0[xX]((${n})\\.?|(${n})?\\.(${n}))[pP][+-]?([0-9](_*[0-9])*)[fFdD]?\\b`
-},{begin:"\\b(0|[1-9](_*[0-9])*)[lL]?\\b"},{begin:`\\b0[xX](${n})[lL]?\\b`},{
+begin:`(\\b(${e})((${n})|\\.)?|(${n}))[eE][+-]?(${e})[fFdD]?\\b`},{
+begin:`\\b(${e})((${n})[fFdD]?\\b|\\.([fFdD]\\b)?)`},{begin:`(${n})[fFdD]?\\b`
+},{begin:`\\b(${e})[fFdD]\\b`},{
+begin:`\\b0[xX]((${a})\\.?|(${a})?\\.(${a}))[pP][+-]?(${e})[fFdD]?\\b`},{
+begin:"\\b(0|[1-9](_*[0-9])*)[lL]?\\b"},{begin:`\\b0[xX](${a})[lL]?\\b`},{
 begin:"\\b0(_*[0-7])*[lL]?\\b"},{begin:"\\b0[bB][01](_*[01])*[lL]?\\b"}],
 relevance:0};return e=>{const n={
 keyword:"abstract as val var vararg get set class object open private protected public noinline crossinline dynamic final enum if else do while for when throw try catch finally import package is in fun override companion reified inline lateinit init interface annotation data sealed internal infix operator out by constructor super tailrec where const inner suspend typealias external expect actual",
 built_in:"Byte Short Char Int Long Boolean Float Double Void Unit Nothing",
-literal:"true false null"},i={className:"symbol",begin:e.UNDERSCORE_IDENT_RE+"@"
+literal:"true false null"},a={className:"symbol",begin:e.UNDERSCORE_IDENT_RE+"@"
 },s={className:"subst",begin:/\$\{/,end:/\}/,contains:[e.C_NUMBER_MODE]},t={
 className:"variable",begin:"\\$"+e.UNDERSCORE_IDENT_RE},r={className:"string",
 variants:[{begin:'"""',end:'"""(?=[^"])',contains:[t,s]},{begin:"'",end:"'",
@@ -21,14 +21,14 @@ className:"meta",
 begin:"@(?:file|property|field|get|set|receiver|param|setparam|delegate)\\s*:(?:\\s*"+e.UNDERSCORE_IDENT_RE+")?"
 },c={className:"meta",begin:"@"+e.UNDERSCORE_IDENT_RE,contains:[{begin:/\(/,
 end:/\)/,contains:[e.inherit(r,{className:"string"}),"self"]}]
-},o=a,b=e.COMMENT("/\\*","\\*/",{contains:[e.C_BLOCK_COMMENT_MODE]}),E={
+},o=i,b=e.COMMENT("/\\*","\\*/",{contains:[e.C_BLOCK_COMMENT_MODE]}),E={
 variants:[{className:"type",begin:e.UNDERSCORE_IDENT_RE},{begin:/\(/,end:/\)/,
 contains:[]}]},d=E;return d.variants[1].contains=[E],E.variants[1].contains=[d],
 {name:"Kotlin",aliases:["kt","kts"],keywords:n,
 contains:[e.COMMENT("/\\*\\*","\\*/",{relevance:0,contains:[{className:"doctag",
 begin:"@[A-Za-z]+"}]}),e.C_LINE_COMMENT_MODE,b,{className:"keyword",
 begin:/\b(break|continue|return|this)\b/,starts:{contains:[{className:"symbol",
-begin:/@\w+/}]}},i,l,c,{className:"function",beginKeywords:"fun",end:"[(]|$",
+begin:/@\w+/}]}},a,l,c,{className:"function",beginKeywords:"fun",end:"[(]|$",
 returnBegin:!0,excludeEnd:!0,keywords:n,relevance:5,contains:[{
 begin:e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,relevance:0,
 contains:[e.UNDERSCORE_TITLE_MODE]},{className:"type",begin:/</,end:/>/,
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/lasso.min.js b/vendor/assets/javascripts/highlightjs/es/languages/lasso.min.js
index 5d3587c7b21..b62d931f9d2 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/lasso.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/lasso.min.js
@@ -1,29 +1,28 @@
-/*! `lasso` grammar compiled for Highlight.js 11.6.0 */
+/*! `lasso` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
-const a="<\\?(lasso(script)?|=)",n="\\]|\\?>",r={
-$pattern:"[a-zA-Z_][\\w.]*|&[lg]t;",
+const a="[a-zA-Z_][\\w.]*",n="<\\?(lasso(script)?|=)",r="\\]|\\?>",t={
+$pattern:a+"|&[lg]t;",
 literal:"true false none minimal full all void and or not bw nbw ew new cn ncn lt lte gt gte eq neq rx nrx ft",
 built_in:"array date decimal duration integer map pair string tag xml null boolean bytes keyword list locale queue set stack staticarray local var variable global data self inherited currentcapture givenblock",
 keyword:"cache database_names database_schemanames database_tablenames define_tag define_type email_batch encode_set html_comment handle handle_error header if inline iterate ljax_target link link_currentaction link_currentgroup link_currentrecord link_detail link_firstgroup link_firstrecord link_lastgroup link_lastrecord link_nextgroup link_nextrecord link_prevgroup link_prevrecord log loop namespace_using output_none portal private protect records referer referrer repeating resultset rows search_args search_arguments select sort_args sort_arguments thread_atomic value_list while abort case else fail_if fail_ifnot fail if_empty if_false if_null if_true loop_abort loop_continue loop_count params params_up return return_value run_children soap_definetag soap_lastrequest soap_lastresponse tag_name ascending average by define descending do equals frozen group handle_failure import in into join let match max min on order parent protected provide public require returnhome skip split_thread sum take thread to trait type where with yield yieldhome"
-},t=e.COMMENT("\x3c!--","--\x3e",{relevance:0}),s={className:"meta",
-begin:"\\[noprocess\\]",starts:{end:"\\[/noprocess\\]",returnEnd:!0,contains:[t]
-}},i={className:"meta",begin:"\\[/noprocess|"+a
-},l=[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.inherit(e.C_NUMBER_MODE,{
+},s=e.COMMENT("\x3c!--","--\x3e",{relevance:0}),i={className:"meta",
+begin:"\\[noprocess\\]",starts:{end:"\\[/noprocess\\]",returnEnd:!0,contains:[s]
+}},l={className:"meta",begin:"\\[/noprocess|"+n},o={className:"symbol",
+begin:"'"+a+"'"
+},c=[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.inherit(e.C_NUMBER_MODE,{
 begin:e.C_NUMBER_RE+"|(-?infinity|NaN)\\b"}),e.inherit(e.APOS_STRING_MODE,{
 illegal:null}),e.inherit(e.QUOTE_STRING_MODE,{illegal:null}),{
-className:"string",begin:"`",end:"`"},{variants:[{begin:"[#$][a-zA-Z_][\\w.]*"
-},{begin:"#",end:"\\d+",illegal:"\\W"}]},{className:"type",begin:"::\\s*",
-end:"[a-zA-Z_][\\w.]*",illegal:"\\W"},{className:"params",variants:[{
-begin:"-(?!infinity)[a-zA-Z_][\\w.]*",relevance:0},{begin:"(\\.\\.\\.)"}]},{
-begin:/(->|\.)\s*/,relevance:0,contains:[{className:"symbol",
-begin:"'[a-zA-Z_][\\w.]*'"}]},{className:"class",beginKeywords:"define",
-returnEnd:!0,end:"\\(|=>",contains:[e.inherit(e.TITLE_MODE,{
-begin:"[a-zA-Z_][\\w.]*(=(?!>))?|[-+*/%](?!>)"})]}];return{name:"Lasso",
-aliases:["ls","lassoscript"],case_insensitive:!0,keywords:r,contains:[{
-className:"meta",begin:n,relevance:0,starts:{end:"\\[|"+a,returnEnd:!0,
-relevance:0,contains:[t]}},s,i,{className:"meta",begin:"\\[no_square_brackets",
-starts:{end:"\\[/no_square_brackets\\]",keywords:r,contains:[{className:"meta",
-begin:n,relevance:0,starts:{end:"\\[noprocess\\]|"+a,returnEnd:!0,contains:[t]}
-},s,i].concat(l)}},{className:"meta",begin:"\\[",relevance:0},{className:"meta",
-begin:"^#!",end:"lasso9$",relevance:10}].concat(l)}}})()
-;export default hljsGrammar;
\ No newline at end of file
+className:"string",begin:"`",end:"`"},{variants:[{begin:"[#$]"+a},{begin:"#",
+end:"\\d+",illegal:"\\W"}]},{className:"type",begin:"::\\s*",end:a,illegal:"\\W"
+},{className:"params",variants:[{begin:"-(?!infinity)"+a,relevance:0},{
+begin:"(\\.\\.\\.)"}]},{begin:/(->|\.)\s*/,relevance:0,contains:[o]},{
+className:"class",beginKeywords:"define",returnEnd:!0,end:"\\(|=>",
+contains:[e.inherit(e.TITLE_MODE,{begin:a+"(=(?!>))?|[-+*/%](?!>)"})]}];return{
+name:"Lasso",aliases:["ls","lassoscript"],case_insensitive:!0,keywords:t,
+contains:[{className:"meta",begin:r,relevance:0,starts:{end:"\\[|"+n,
+returnEnd:!0,relevance:0,contains:[s]}},i,l,{className:"meta",
+begin:"\\[no_square_brackets",starts:{end:"\\[/no_square_brackets\\]",
+keywords:t,contains:[{className:"meta",begin:r,relevance:0,starts:{
+end:"\\[noprocess\\]|"+n,returnEnd:!0,contains:[s]}},i,l].concat(c)}},{
+className:"meta",begin:"\\[",relevance:0},{className:"meta",begin:"^#!",
+end:"lasso9$",relevance:10}].concat(c)}}})();export default hljsGrammar;
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/latex.min.js b/vendor/assets/javascripts/highlightjs/es/languages/latex.min.js
index bb63fa146f3..2c943039469 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/latex.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/latex.min.js
@@ -1,4 +1,4 @@
-/*! `latex` grammar compiled for Highlight.js 11.6.0 */
+/*! `latex` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const a=[{begin:/\^{6}[0-9a-f]{6}/
 },{begin:/\^{5}[0-9a-f]{5}/},{begin:/\^{4}[0-9a-f]{4}/},{
 begin:/\^{3}[0-9a-f]{3}/},{begin:/\^{2}[0-9a-f]{2}/},{
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/ldif.min.js b/vendor/assets/javascripts/highlightjs/es/languages/ldif.min.js
index 91bf490dc44..3bde52418ce 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/ldif.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/ldif.min.js
@@ -1,4 +1,4 @@
-/*! `ldif` grammar compiled for Highlight.js 11.6.0 */
+/*! `ldif` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return a=>({name:"LDIF",contains:[{
 className:"attribute",match:"^dn(?=:)",relevance:10},{className:"attribute",
 match:"^\\w+(?=:)"},{className:"literal",match:"^-"},a.HASH_COMMENT_MODE]})})()
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/leaf.min.js b/vendor/assets/javascripts/highlightjs/es/languages/leaf.min.js
index 8fc51eb189f..a43a7c20cce 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/leaf.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/leaf.min.js
@@ -1,4 +1,4 @@
-/*! `leaf` grammar compiled for Highlight.js 11.6.0 */
+/*! `leaf` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return a=>({name:"Leaf",contains:[{
 className:"function",begin:"#+[A-Za-z_0-9]*\\(",end:/ \{/,returnBegin:!0,
 excludeEnd:!0,contains:[{className:"keyword",begin:"#+"},{className:"title",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/less.min.js b/vendor/assets/javascripts/highlightjs/es/languages/less.min.js
index a1a812482a9..f1206c16adb 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/less.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/less.min.js
@@ -1,4 +1,4 @@
-/*! `less` grammar compiled for Highlight.js 11.6.0 */
+/*! `less` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict"
 ;const e=["a","abbr","address","article","aside","audio","b","blockquote","body","button","canvas","caption","cite","code","dd","del","details","dfn","div","dl","dt","em","fieldset","figcaption","figure","footer","form","h1","h2","h3","h4","h5","h6","header","hgroup","html","i","iframe","img","input","ins","kbd","label","legend","li","main","mark","menu","nav","object","ol","p","q","quote","samp","section","span","strong","summary","sup","table","tbody","td","textarea","tfoot","th","thead","time","tr","ul","var","video"],r=["any-hover","any-pointer","aspect-ratio","color","color-gamut","color-index","device-aspect-ratio","device-height","device-width","display-mode","forced-colors","grid","height","hover","inverted-colors","monochrome","orientation","overflow-block","overflow-inline","pointer","prefers-color-scheme","prefers-contrast","prefers-reduced-motion","prefers-reduced-transparency","resolution","scan","scripting","update","width","min-width","max-width","min-height","max-height"],t=["active","any-link","blank","checked","current","default","defined","dir","disabled","drop","empty","enabled","first","first-child","first-of-type","fullscreen","future","focus","focus-visible","focus-within","has","host","host-context","hover","indeterminate","in-range","invalid","is","lang","last-child","last-of-type","left","link","local-link","not","nth-child","nth-col","nth-last-child","nth-last-col","nth-last-of-type","nth-of-type","only-child","only-of-type","optional","out-of-range","past","placeholder-shown","read-only","read-write","required","right","root","scope","target","target-within","user-invalid","valid","visited","where"],i=["after","backdrop","before","cue","cue-region","first-letter","first-line","grammar-error","marker","part","placeholder","selection","slotted","spelling-error"],o=["align-content","align-items","align-self","all","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","backface-visibility","background","background-attachment","background-blend-mode","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","block-size","border","border-block","border-block-color","border-block-end","border-block-end-color","border-block-end-style","border-block-end-width","border-block-start","border-block-start-color","border-block-start-style","border-block-start-width","border-block-style","border-block-width","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-inline","border-inline-color","border-inline-end","border-inline-end-color","border-inline-end-style","border-inline-end-width","border-inline-start","border-inline-start-color","border-inline-start-style","border-inline-start-width","border-inline-style","border-inline-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","caret-color","clear","clip","clip-path","clip-rule","color","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","contain","content","content-visibility","counter-increment","counter-reset","cue","cue-after","cue-before","cursor","direction","display","empty-cells","filter","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","flow","font","font-display","font-family","font-feature-settings","font-kerning","font-language-override","font-size","font-size-adjust","font-smoothing","font-stretch","font-style","font-synthesis","font-variant","font-variant-caps","font-variant-east-asian","font-variant-ligatures","font-variant-numeric","font-variant-position","font-variation-settings","font-weight","gap","glyph-orientation-vertical","grid","grid-area","grid-auto-columns","grid-auto-flow","grid-auto-rows","grid-column","grid-column-end","grid-column-start","grid-gap","grid-row","grid-row-end","grid-row-start","grid-template","grid-template-areas","grid-template-columns","grid-template-rows","hanging-punctuation","height","hyphens","icon","image-orientation","image-rendering","image-resolution","ime-mode","inline-size","isolation","justify-content","left","letter-spacing","line-break","line-height","list-style","list-style-image","list-style-position","list-style-type","margin","margin-block","margin-block-end","margin-block-start","margin-bottom","margin-inline","margin-inline-end","margin-inline-start","margin-left","margin-right","margin-top","marks","mask","mask-border","mask-border-mode","mask-border-outset","mask-border-repeat","mask-border-slice","mask-border-source","mask-border-width","mask-clip","mask-composite","mask-image","mask-mode","mask-origin","mask-position","mask-repeat","mask-size","mask-type","max-block-size","max-height","max-inline-size","max-width","min-block-size","min-height","min-inline-size","min-width","mix-blend-mode","nav-down","nav-index","nav-left","nav-right","nav-up","none","normal","object-fit","object-position","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-wrap","overflow-x","overflow-y","padding","padding-block","padding-block-end","padding-block-start","padding-bottom","padding-inline","padding-inline-end","padding-inline-start","padding-left","padding-right","padding-top","page-break-after","page-break-before","page-break-inside","pause","pause-after","pause-before","perspective","perspective-origin","pointer-events","position","quotes","resize","rest","rest-after","rest-before","right","row-gap","scroll-margin","scroll-margin-block","scroll-margin-block-end","scroll-margin-block-start","scroll-margin-bottom","scroll-margin-inline","scroll-margin-inline-end","scroll-margin-inline-start","scroll-margin-left","scroll-margin-right","scroll-margin-top","scroll-padding","scroll-padding-block","scroll-padding-block-end","scroll-padding-block-start","scroll-padding-bottom","scroll-padding-inline","scroll-padding-inline-end","scroll-padding-inline-start","scroll-padding-left","scroll-padding-right","scroll-padding-top","scroll-snap-align","scroll-snap-stop","scroll-snap-type","scrollbar-color","scrollbar-gutter","scrollbar-width","shape-image-threshold","shape-margin","shape-outside","speak","speak-as","src","tab-size","table-layout","text-align","text-align-all","text-align-last","text-combine-upright","text-decoration","text-decoration-color","text-decoration-line","text-decoration-style","text-emphasis","text-emphasis-color","text-emphasis-position","text-emphasis-style","text-indent","text-justify","text-orientation","text-overflow","text-rendering","text-shadow","text-transform","text-underline-position","top","transform","transform-box","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","vertical-align","visibility","voice-balance","voice-duration","voice-family","voice-pitch","voice-range","voice-rate","voice-stress","voice-volume","white-space","widows","width","will-change","word-break","word-spacing","word-wrap","writing-mode","z-index"].reverse(),n=t.concat(i)
 ;return a=>{const l=(e=>({IMPORTANT:{scope:"meta",begin:"!important"},
@@ -10,35 +10,36 @@ contains:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]},CSS_NUMBER_MODE:{
 scope:"number",
 begin:e.NUMBER_RE+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",
 relevance:0},CSS_VARIABLE:{className:"attr",begin:/--[A-Za-z][A-Za-z0-9_-]*/}
-}))(a),s=n,d="([\\w-]+|@\\{[\\w-]+\\})",c=[],b=[],g=e=>({className:"string",
-begin:"~?"+e+".*?"+e}),m=(e,r,t)=>({className:e,begin:r,relevance:t}),p={
-$pattern:/[a-z-]+/,keyword:"and or not only",attribute:r.join(" ")},u={
-begin:"\\(",end:"\\)",contains:b,keywords:p,relevance:0}
-;b.push(a.C_LINE_COMMENT_MODE,a.C_BLOCK_COMMENT_MODE,g("'"),g('"'),l.CSS_NUMBER_MODE,{
+}))(a),s=n,d="[\\w-]+",c="("+d+"|@\\{"+d+"\\})",b=[],g=[],m=e=>({
+className:"string",begin:"~?"+e+".*?"+e}),p=(e,r,t)=>({className:e,begin:r,
+relevance:t}),u={$pattern:/[a-z-]+/,keyword:"and or not only",
+attribute:r.join(" ")},h={begin:"\\(",end:"\\)",contains:g,keywords:u,
+relevance:0}
+;g.push(a.C_LINE_COMMENT_MODE,a.C_BLOCK_COMMENT_MODE,m("'"),m('"'),l.CSS_NUMBER_MODE,{
 begin:"(url|data-uri)\\(",starts:{className:"string",end:"[\\)\\n]",
 excludeEnd:!0}
-},l.HEXCOLOR,u,m("variable","@@?[\\w-]+",10),m("variable","@\\{[\\w-]+\\}"),m("built_in","~?`[^`]*?`"),{
-className:"attribute",begin:"[\\w-]+\\s*:",end:":",returnBegin:!0,excludeEnd:!0
-},l.IMPORTANT,{beginKeywords:"and not"},l.FUNCTION_DISPATCH);const h=b.concat({
-begin:/\{/,end:/\}/,contains:c}),f={beginKeywords:"when",endsWithParent:!0,
-contains:[{beginKeywords:"and not"}].concat(b)},k={begin:d+"\\s*:",
+},l.HEXCOLOR,h,p("variable","@@?"+d,10),p("variable","@\\{"+d+"\\}"),p("built_in","~?`[^`]*?`"),{
+className:"attribute",begin:d+"\\s*:",end:":",returnBegin:!0,excludeEnd:!0
+},l.IMPORTANT,{beginKeywords:"and not"},l.FUNCTION_DISPATCH);const f=g.concat({
+begin:/\{/,end:/\}/,contains:b}),k={beginKeywords:"when",endsWithParent:!0,
+contains:[{beginKeywords:"and not"}].concat(g)},v={begin:c+"\\s*:",
 returnBegin:!0,end:/[;}]/,relevance:0,contains:[{begin:/-(webkit|moz|ms|o)-/
 },l.CSS_VARIABLE,{className:"attribute",begin:"\\b("+o.join("|")+")\\b",
-end:/(?=:)/,starts:{endsWithParent:!0,illegal:"[<=$]",relevance:0,contains:b}}]
+end:/(?=:)/,starts:{endsWithParent:!0,illegal:"[<=$]",relevance:0,contains:g}}]
 },w={className:"keyword",
 begin:"@(import|media|charset|font-face|(-[a-z]+-)?keyframes|supports|document|namespace|page|viewport|host)\\b",
-starts:{end:"[;{}]",keywords:p,returnEnd:!0,contains:b,relevance:0}},v={
-className:"variable",variants:[{begin:"@[\\w-]+\\s*:",relevance:15},{
-begin:"@[\\w-]+"}],starts:{end:"[;}]",returnEnd:!0,contains:h}},y={variants:[{
-begin:"[\\.#:&\\[>]",end:"[;{}]"},{begin:d,end:/\{/}],returnBegin:!0,
+starts:{end:"[;{}]",keywords:u,returnEnd:!0,contains:g,relevance:0}},y={
+className:"variable",variants:[{begin:"@"+d+"\\s*:",relevance:15},{begin:"@"+d
+}],starts:{end:"[;}]",returnEnd:!0,contains:f}},x={variants:[{
+begin:"[\\.#:&\\[>]",end:"[;{}]"},{begin:c,end:/\{/}],returnBegin:!0,
 returnEnd:!0,illegal:"[<='$\"]",relevance:0,
-contains:[a.C_LINE_COMMENT_MODE,a.C_BLOCK_COMMENT_MODE,f,m("keyword","all\\b"),m("variable","@\\{[\\w-]+\\}"),{
+contains:[a.C_LINE_COMMENT_MODE,a.C_BLOCK_COMMENT_MODE,k,p("keyword","all\\b"),p("variable","@\\{"+d+"\\}"),{
 begin:"\\b("+e.join("|")+")\\b",className:"selector-tag"
-},l.CSS_NUMBER_MODE,m("selector-tag",d,0),m("selector-id","#"+d),m("selector-class","\\."+d,0),m("selector-tag","&",0),l.ATTRIBUTE_SELECTOR_MODE,{
+},l.CSS_NUMBER_MODE,p("selector-tag",c,0),p("selector-id","#"+c),p("selector-class","\\."+c,0),p("selector-tag","&",0),l.ATTRIBUTE_SELECTOR_MODE,{
 className:"selector-pseudo",begin:":("+t.join("|")+")"},{
 className:"selector-pseudo",begin:":(:)?("+i.join("|")+")"},{begin:/\(/,
-end:/\)/,relevance:0,contains:h},{begin:"!important"},l.FUNCTION_DISPATCH]},x={
-begin:`[\\w-]+:(:)?(${s.join("|")})`,returnBegin:!0,contains:[y]}
-;return c.push(a.C_LINE_COMMENT_MODE,a.C_BLOCK_COMMENT_MODE,w,v,x,k,y,f,l.FUNCTION_DISPATCH),
-{name:"Less",case_insensitive:!0,illegal:"[=>'/<($\"]",contains:c}}})()
+end:/\)/,relevance:0,contains:f},{begin:"!important"},l.FUNCTION_DISPATCH]},_={
+begin:d+":(:)?"+`(${s.join("|")})`,returnBegin:!0,contains:[x]}
+;return b.push(a.C_LINE_COMMENT_MODE,a.C_BLOCK_COMMENT_MODE,w,y,_,v,x,k,l.FUNCTION_DISPATCH),
+{name:"Less",case_insensitive:!0,illegal:"[=>'/<($\"]",contains:b}}})()
 ;export default hljsGrammar;
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/lisp.min.js b/vendor/assets/javascripts/highlightjs/es/languages/lisp.min.js
index 0255882d493..6079ae66668 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/lisp.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/lisp.min.js
@@ -1,4 +1,4 @@
-/*! `lisp` grammar compiled for Highlight.js 11.6.0 */
+/*! `lisp` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const n="[a-zA-Z_\\-+\\*\\/<=>&#][a-zA-Z0-9_\\-+*\\/<=>&#!]*",a="\\|[^]*?\\|",i="(-|\\+)?\\d+(\\.\\d+|\\/\\d+)?((d|e|f|l|s|D|E|F|L|S)(\\+|-)?\\d+)?",s={
 className:"literal",begin:"\\b(t{1}|nil)\\b"},l={className:"number",variants:[{
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/livecodeserver.min.js b/vendor/assets/javascripts/highlightjs/es/languages/livecodeserver.min.js
index 456fee8184a..790b6242c65 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/livecodeserver.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/livecodeserver.min.js
@@ -1,4 +1,4 @@
-/*! `livecodeserver` grammar compiled for Highlight.js 11.6.0 */
+/*! `livecodeserver` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const r={className:"variable",
 variants:[{begin:"\\b([gtps][A-Z]{1}[a-zA-Z0-9]*)(\\[.+\\])?(?:\\s*?)"},{
 begin:"\\$_[A-Z]+"}],relevance:0
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/livescript.min.js b/vendor/assets/javascripts/highlightjs/es/languages/livescript.min.js
index 22fa990c6bf..38d80398af0 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/livescript.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/livescript.min.js
@@ -1,4 +1,4 @@
-/*! `livescript` grammar compiled for Highlight.js 11.6.0 */
+/*! `livescript` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict"
 ;const e=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],n=["true","false","null","undefined","NaN","Infinity"],a=[].concat(["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],["Object","Function","Boolean","Symbol","Math","Date","Number","BigInt","String","RegExp","Array","Float32Array","Float64Array","Int8Array","Uint8Array","Uint8ClampedArray","Int16Array","Int32Array","Uint16Array","Uint32Array","BigInt64Array","BigUint64Array","Set","Map","WeakSet","WeakMap","ArrayBuffer","SharedArrayBuffer","Atomics","DataView","JSON","Promise","Generator","GeneratorFunction","AsyncFunction","Reflect","Proxy","Intl","WebAssembly"],["Error","EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"])
 ;return r=>{const t={
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/llvm.min.js b/vendor/assets/javascripts/highlightjs/es/languages/llvm.min.js
index 26bc1267b04..842b3ff32bf 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/llvm.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/llvm.min.js
@@ -1,4 +1,4 @@
-/*! `llvm` grammar compiled for Highlight.js 11.6.0 */
+/*! `llvm` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const a=e.regex,n=/([-a-zA-Z$._][\w$.-]*)/,t={className:"variable",variants:[{
 begin:a.concat(/%/,n)},{begin:/%\d+/},{begin:/#\d+/}]},i={className:"title",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/lsl.min.js b/vendor/assets/javascripts/highlightjs/es/languages/lsl.min.js
index edadbc60401..92d5aeb6ca2 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/lsl.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/lsl.min.js
@@ -1,4 +1,4 @@
-/*! `lsl` grammar compiled for Highlight.js 11.6.0 */
+/*! `lsl` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return E=>{const T={className:"number",
 relevance:0,begin:E.C_NUMBER_RE};return{name:"LSL (Linden Scripting Language)",
 illegal:":",contains:[{className:"string",begin:'"',end:'"',contains:[{
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/lua.min.js b/vendor/assets/javascripts/highlightjs/es/languages/lua.min.js
index b73fbbbce62..d2c179b6ceb 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/lua.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/lua.min.js
@@ -1,8 +1,8 @@
-/*! `lua` grammar compiled for Highlight.js 11.6.0 */
+/*! `lua` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const t="\\[=*\\[",a="\\]=*\\]",n={begin:t,end:a,contains:["self"]
-},r=[e.COMMENT("--(?!\\[=*\\[)","$"),e.COMMENT("--\\[=*\\[",a,{contains:[n],
-relevance:10})];return{name:"Lua",keywords:{$pattern:e.UNDERSCORE_IDENT_RE,
+},r=[e.COMMENT("--(?!"+t+")","$"),e.COMMENT("--"+t,a,{contains:[n],relevance:10
+})];return{name:"Lua",keywords:{$pattern:e.UNDERSCORE_IDENT_RE,
 literal:"true false nil",
 keyword:"and break do else elseif end for goto if in local not or repeat return then until while",
 built_in:"_G _ENV _VERSION __index __newindex __mode __call __metatable __tostring __len __gc __add __sub __mul __div __mod __pow __concat __unm __eq __lt __le assert collectgarbage dofile error getfenv getmetatable ipairs load loadfile loadstring module next pairs pcall print rawequal rawget rawset require select setfenv setmetatable tonumber tostring type unpack xpcall arg self coroutine resume yield status wrap create running debug getupvalue debug sethook getmetatable gethook setmetatable setlocal traceback setfenv getinfo setupvalue getlocal getregistry getfenv io lines write close flush open output type read stderr stdin input stdout popen tmpfile math log max acos huge ldexp pi cos tanh pow deg tan cosh sinh random randomseed frexp ceil floor rad abs sqrt modf asin min mod fmod log10 atan2 exp sin atan os exit setlocale date getenv difftime remove time clock tmpname rename execute package preload loadlib loaded loaders cpath config path seeall string sub upper len gfind rep find match char dump gmatch reverse byte format gsub lower table setn insert getn foreachi maxn foreach concat sort remove"
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/makefile.min.js b/vendor/assets/javascripts/highlightjs/es/languages/makefile.min.js
index d728749d302..944dc7401db 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/makefile.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/makefile.min.js
@@ -1,4 +1,4 @@
-/*! `makefile` grammar compiled for Highlight.js 11.6.0 */
+/*! `makefile` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const a={className:"variable",
 variants:[{begin:"\\$\\("+e.UNDERSCORE_IDENT_RE+"\\)",
 contains:[e.BACKSLASH_ESCAPE]},{begin:/\$[@%<?\^\+\*]/}]},i={className:"string",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/markdown.min.js b/vendor/assets/javascripts/highlightjs/es/languages/markdown.min.js
index 1b055f3ee44..f7598536206 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/markdown.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/markdown.min.js
@@ -1,4 +1,4 @@
-/*! `markdown` grammar compiled for Highlight.js 11.6.0 */
+/*! `markdown` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const n={begin:/<\/?[A-Za-z_]/,
 end:">",subLanguage:"xml",relevance:0},a={variants:[{begin:/\[.+?\]\[.*?\]/,
 relevance:0},{
@@ -11,9 +11,9 @@ begin:/\[.*?\]\(.*?\)/,relevance:0}],returnBegin:!0,contains:[{match:/\[(?=\])/
 returnEnd:!0},{className:"link",relevance:0,begin:"\\]\\(",end:"\\)",
 excludeBegin:!0,excludeEnd:!0},{className:"symbol",relevance:0,begin:"\\]\\[",
 end:"\\]",excludeBegin:!0,excludeEnd:!0}]},i={className:"strong",contains:[],
-variants:[{begin:/_{2}/,end:/_{2}/},{begin:/\*{2}/,end:/\*{2}/}]},s={
-className:"emphasis",contains:[],variants:[{begin:/\*(?!\*)/,end:/\*/},{
-begin:/_(?!_)/,end:/_/,relevance:0}]},c=e.inherit(i,{contains:[]
+variants:[{begin:/_{2}(?!\s)/,end:/_{2}/},{begin:/\*{2}(?!\s)/,end:/\*{2}/}]
+},s={className:"emphasis",contains:[],variants:[{begin:/\*(?![*\s])/,end:/\*/},{
+begin:/_(?![_\s])/,end:/_/,relevance:0}]},c=e.inherit(i,{contains:[]
 }),t=e.inherit(s,{contains:[]});i.contains.push(t),s.contains.push(c)
 ;let l=[n,a];return[i,s,c,t].forEach((e=>{e.contains=e.contains.concat(l)
 })),l=l.concat(i,s),{name:"Markdown",aliases:["md","mkdown","mkd"],contains:[{
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/mathematica.min.js b/vendor/assets/javascripts/highlightjs/es/languages/mathematica.min.js
index 04ee2dcfc5b..ee10059cc22 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/mathematica.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/mathematica.min.js
@@ -1,6 +1,6 @@
-/*! `mathematica` grammar compiled for Highlight.js 11.6.0 */
+/*! `mathematica` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict"
-;const e=["AASTriangle","AbelianGroup","Abort","AbortKernels","AbortProtect","AbortScheduledTask","Above","Abs","AbsArg","AbsArgPlot","Absolute","AbsoluteCorrelation","AbsoluteCorrelationFunction","AbsoluteCurrentValue","AbsoluteDashing","AbsoluteFileName","AbsoluteOptions","AbsolutePointSize","AbsoluteThickness","AbsoluteTime","AbsoluteTiming","AcceptanceThreshold","AccountingForm","Accumulate","Accuracy","AccuracyGoal","ActionDelay","ActionMenu","ActionMenuBox","ActionMenuBoxOptions","Activate","Active","ActiveClassification","ActiveClassificationObject","ActiveItem","ActivePrediction","ActivePredictionObject","ActiveStyle","AcyclicGraphQ","AddOnHelpPath","AddSides","AddTo","AddToSearchIndex","AddUsers","AdjacencyGraph","AdjacencyList","AdjacencyMatrix","AdjacentMeshCells","AdjustmentBox","AdjustmentBoxOptions","AdjustTimeSeriesForecast","AdministrativeDivisionData","AffineHalfSpace","AffineSpace","AffineStateSpaceModel","AffineTransform","After","AggregatedEntityClass","AggregationLayer","AircraftData","AirportData","AirPressureData","AirTemperatureData","AiryAi","AiryAiPrime","AiryAiZero","AiryBi","AiryBiPrime","AiryBiZero","AlgebraicIntegerQ","AlgebraicNumber","AlgebraicNumberDenominator","AlgebraicNumberNorm","AlgebraicNumberPolynomial","AlgebraicNumberTrace","AlgebraicRules","AlgebraicRulesData","Algebraics","AlgebraicUnitQ","Alignment","AlignmentMarker","AlignmentPoint","All","AllowAdultContent","AllowedCloudExtraParameters","AllowedCloudParameterExtensions","AllowedDimensions","AllowedFrequencyRange","AllowedHeads","AllowGroupClose","AllowIncomplete","AllowInlineCells","AllowKernelInitialization","AllowLooseGrammar","AllowReverseGroupClose","AllowScriptLevelChange","AllowVersionUpdate","AllTrue","Alphabet","AlphabeticOrder","AlphabeticSort","AlphaChannel","AlternateImage","AlternatingFactorial","AlternatingGroup","AlternativeHypothesis","Alternatives","AltitudeMethod","AmbientLight","AmbiguityFunction","AmbiguityList","Analytic","AnatomyData","AnatomyForm","AnatomyPlot3D","AnatomySkinStyle","AnatomyStyling","AnchoredSearch","And","AndersonDarlingTest","AngerJ","AngleBisector","AngleBracket","AnglePath","AnglePath3D","AngleVector","AngularGauge","Animate","AnimationCycleOffset","AnimationCycleRepetitions","AnimationDirection","AnimationDisplayTime","AnimationRate","AnimationRepetitions","AnimationRunning","AnimationRunTime","AnimationTimeIndex","Animator","AnimatorBox","AnimatorBoxOptions","AnimatorElements","Annotate","Annotation","AnnotationDelete","AnnotationKeys","AnnotationRules","AnnotationValue","Annuity","AnnuityDue","Annulus","AnomalyDetection","AnomalyDetector","AnomalyDetectorFunction","Anonymous","Antialiasing","AntihermitianMatrixQ","Antisymmetric","AntisymmetricMatrixQ","Antonyms","AnyOrder","AnySubset","AnyTrue","Apart","ApartSquareFree","APIFunction","Appearance","AppearanceElements","AppearanceRules","AppellF1","Append","AppendCheck","AppendLayer","AppendTo","Apply","ApplySides","ArcCos","ArcCosh","ArcCot","ArcCoth","ArcCsc","ArcCsch","ArcCurvature","ARCHProcess","ArcLength","ArcSec","ArcSech","ArcSin","ArcSinDistribution","ArcSinh","ArcTan","ArcTanh","Area","Arg","ArgMax","ArgMin","ArgumentCountQ","ARIMAProcess","ArithmeticGeometricMean","ARMAProcess","Around","AroundReplace","ARProcess","Array","ArrayComponents","ArrayDepth","ArrayFilter","ArrayFlatten","ArrayMesh","ArrayPad","ArrayPlot","ArrayQ","ArrayResample","ArrayReshape","ArrayRules","Arrays","Arrow","Arrow3DBox","ArrowBox","Arrowheads","ASATriangle","Ask","AskAppend","AskConfirm","AskDisplay","AskedQ","AskedValue","AskFunction","AskState","AskTemplateDisplay","AspectRatio","AspectRatioFixed","Assert","AssociateTo","Association","AssociationFormat","AssociationMap","AssociationQ","AssociationThread","AssumeDeterministic","Assuming","Assumptions","AstronomicalData","Asymptotic","AsymptoticDSolveValue","AsymptoticEqual","AsymptoticEquivalent","AsymptoticGreater","AsymptoticGreaterEqual","AsymptoticIntegrate","AsymptoticLess","AsymptoticLessEqual","AsymptoticOutputTracker","AsymptoticProduct","AsymptoticRSolveValue","AsymptoticSolve","AsymptoticSum","Asynchronous","AsynchronousTaskObject","AsynchronousTasks","Atom","AtomCoordinates","AtomCount","AtomDiagramCoordinates","AtomList","AtomQ","AttentionLayer","Attributes","Audio","AudioAmplify","AudioAnnotate","AudioAnnotationLookup","AudioBlockMap","AudioCapture","AudioChannelAssignment","AudioChannelCombine","AudioChannelMix","AudioChannels","AudioChannelSeparate","AudioData","AudioDelay","AudioDelete","AudioDevice","AudioDistance","AudioEncoding","AudioFade","AudioFrequencyShift","AudioGenerator","AudioIdentify","AudioInputDevice","AudioInsert","AudioInstanceQ","AudioIntervals","AudioJoin","AudioLabel","AudioLength","AudioLocalMeasurements","AudioLooping","AudioLoudness","AudioMeasurements","AudioNormalize","AudioOutputDevice","AudioOverlay","AudioPad","AudioPan","AudioPartition","AudioPause","AudioPitchShift","AudioPlay","AudioPlot","AudioQ","AudioRecord","AudioReplace","AudioResample","AudioReverb","AudioReverse","AudioSampleRate","AudioSpectralMap","AudioSpectralTransformation","AudioSplit","AudioStop","AudioStream","AudioStreams","AudioTimeStretch","AudioTracks","AudioTrim","AudioType","AugmentedPolyhedron","AugmentedSymmetricPolynomial","Authenticate","Authentication","AuthenticationDialog","AutoAction","Autocomplete","AutocompletionFunction","AutoCopy","AutocorrelationTest","AutoDelete","AutoEvaluateEvents","AutoGeneratedPackage","AutoIndent","AutoIndentSpacings","AutoItalicWords","AutoloadPath","AutoMatch","Automatic","AutomaticImageSize","AutoMultiplicationSymbol","AutoNumberFormatting","AutoOpenNotebooks","AutoOpenPalettes","AutoQuoteCharacters","AutoRefreshed","AutoRemove","AutorunSequencing","AutoScaling","AutoScroll","AutoSpacing","AutoStyleOptions","AutoStyleWords","AutoSubmitting","Axes","AxesEdge","AxesLabel","AxesOrigin","AxesStyle","AxiomaticTheory","Axis","BabyMonsterGroupB","Back","Background","BackgroundAppearance","BackgroundTasksSettings","Backslash","Backsubstitution","Backward","Ball","Band","BandpassFilter","BandstopFilter","BarabasiAlbertGraphDistribution","BarChart","BarChart3D","BarcodeImage","BarcodeRecognize","BaringhausHenzeTest","BarLegend","BarlowProschanImportance","BarnesG","BarOrigin","BarSpacing","BartlettHannWindow","BartlettWindow","BaseDecode","BaseEncode","BaseForm","Baseline","BaselinePosition","BaseStyle","BasicRecurrentLayer","BatchNormalizationLayer","BatchSize","BatesDistribution","BattleLemarieWavelet","BayesianMaximization","BayesianMaximizationObject","BayesianMinimization","BayesianMinimizationObject","Because","BeckmannDistribution","Beep","Before","Begin","BeginDialogPacket","BeginFrontEndInteractionPacket","BeginPackage","BellB","BellY","Below","BenfordDistribution","BeniniDistribution","BenktanderGibratDistribution","BenktanderWeibullDistribution","BernoulliB","BernoulliDistribution","BernoulliGraphDistribution","BernoulliProcess","BernsteinBasis","BesselFilterModel","BesselI","BesselJ","BesselJZero","BesselK","BesselY","BesselYZero","Beta","BetaBinomialDistribution","BetaDistribution","BetaNegativeBinomialDistribution","BetaPrimeDistribution","BetaRegularized","Between","BetweennessCentrality","BeveledPolyhedron","BezierCurve","BezierCurve3DBox","BezierCurve3DBoxOptions","BezierCurveBox","BezierCurveBoxOptions","BezierFunction","BilateralFilter","Binarize","BinaryDeserialize","BinaryDistance","BinaryFormat","BinaryImageQ","BinaryRead","BinaryReadList","BinarySerialize","BinaryWrite","BinCounts","BinLists","Binomial","BinomialDistribution","BinomialProcess","BinormalDistribution","BiorthogonalSplineWavelet","BipartiteGraphQ","BiquadraticFilterModel","BirnbaumImportance","BirnbaumSaundersDistribution","BitAnd","BitClear","BitGet","BitLength","BitNot","BitOr","BitSet","BitShiftLeft","BitShiftRight","BitXor","BiweightLocation","BiweightMidvariance","Black","BlackmanHarrisWindow","BlackmanNuttallWindow","BlackmanWindow","Blank","BlankForm","BlankNullSequence","BlankSequence","Blend","Block","BlockchainAddressData","BlockchainBase","BlockchainBlockData","BlockchainContractValue","BlockchainData","BlockchainGet","BlockchainKeyEncode","BlockchainPut","BlockchainTokenData","BlockchainTransaction","BlockchainTransactionData","BlockchainTransactionSign","BlockchainTransactionSubmit","BlockMap","BlockRandom","BlomqvistBeta","BlomqvistBetaTest","Blue","Blur","BodePlot","BohmanWindow","Bold","Bond","BondCount","BondList","BondQ","Bookmarks","Boole","BooleanConsecutiveFunction","BooleanConvert","BooleanCountingFunction","BooleanFunction","BooleanGraph","BooleanMaxterms","BooleanMinimize","BooleanMinterms","BooleanQ","BooleanRegion","Booleans","BooleanStrings","BooleanTable","BooleanVariables","BorderDimensions","BorelTannerDistribution","Bottom","BottomHatTransform","BoundaryDiscretizeGraphics","BoundaryDiscretizeRegion","BoundaryMesh","BoundaryMeshRegion","BoundaryMeshRegionQ","BoundaryStyle","BoundedRegionQ","BoundingRegion","Bounds","Box","BoxBaselineShift","BoxData","BoxDimensions","Boxed","Boxes","BoxForm","BoxFormFormatTypes","BoxFrame","BoxID","BoxMargins","BoxMatrix","BoxObject","BoxRatios","BoxRotation","BoxRotationPoint","BoxStyle","BoxWhiskerChart","Bra","BracketingBar","BraKet","BrayCurtisDistance","BreadthFirstScan","Break","BridgeData","BrightnessEqualize","BroadcastStationData","Brown","BrownForsytheTest","BrownianBridgeProcess","BrowserCategory","BSplineBasis","BSplineCurve","BSplineCurve3DBox","BSplineCurve3DBoxOptions","BSplineCurveBox","BSplineCurveBoxOptions","BSplineFunction","BSplineSurface","BSplineSurface3DBox","BSplineSurface3DBoxOptions","BubbleChart","BubbleChart3D","BubbleScale","BubbleSizes","BuildingData","BulletGauge","BusinessDayQ","ButterflyGraph","ButterworthFilterModel","Button","ButtonBar","ButtonBox","ButtonBoxOptions","ButtonCell","ButtonContents","ButtonData","ButtonEvaluator","ButtonExpandable","ButtonFrame","ButtonFunction","ButtonMargins","ButtonMinHeight","ButtonNote","ButtonNotebook","ButtonSource","ButtonStyle","ButtonStyleMenuListing","Byte","ByteArray","ByteArrayFormat","ByteArrayQ","ByteArrayToString","ByteCount","ByteOrdering","C","CachedValue","CacheGraphics","CachePersistence","CalendarConvert","CalendarData","CalendarType","Callout","CalloutMarker","CalloutStyle","CallPacket","CanberraDistance","Cancel","CancelButton","CandlestickChart","CanonicalGraph","CanonicalizePolygon","CanonicalizePolyhedron","CanonicalName","CanonicalWarpingCorrespondence","CanonicalWarpingDistance","CantorMesh","CantorStaircase","Cap","CapForm","CapitalDifferentialD","Capitalize","CapsuleShape","CaptureRunning","CardinalBSplineBasis","CarlemanLinearize","CarmichaelLambda","CaseOrdering","Cases","CaseSensitive","Cashflow","Casoratian","Catalan","CatalanNumber","Catch","CategoricalDistribution","Catenate","CatenateLayer","CauchyDistribution","CauchyWindow","CayleyGraph","CDF","CDFDeploy","CDFInformation","CDFWavelet","Ceiling","CelestialSystem","Cell","CellAutoOverwrite","CellBaseline","CellBoundingBox","CellBracketOptions","CellChangeTimes","CellContents","CellContext","CellDingbat","CellDynamicExpression","CellEditDuplicate","CellElementsBoundingBox","CellElementSpacings","CellEpilog","CellEvaluationDuplicate","CellEvaluationFunction","CellEvaluationLanguage","CellEventActions","CellFrame","CellFrameColor","CellFrameLabelMargins","CellFrameLabels","CellFrameMargins","CellGroup","CellGroupData","CellGrouping","CellGroupingRules","CellHorizontalScrolling","CellID","CellLabel","CellLabelAutoDelete","CellLabelMargins","CellLabelPositioning","CellLabelStyle","CellLabelTemplate","CellMargins","CellObject","CellOpen","CellPrint","CellProlog","Cells","CellSize","CellStyle","CellTags","CellularAutomaton","CensoredDistribution","Censoring","Center","CenterArray","CenterDot","CentralFeature","CentralMoment","CentralMomentGeneratingFunction","Cepstrogram","CepstrogramArray","CepstrumArray","CForm","ChampernowneNumber","ChangeOptions","ChannelBase","ChannelBrokerAction","ChannelDatabin","ChannelHistoryLength","ChannelListen","ChannelListener","ChannelListeners","ChannelListenerWait","ChannelObject","ChannelPreSendFunction","ChannelReceiverFunction","ChannelSend","ChannelSubscribers","ChanVeseBinarize","Character","CharacterCounts","CharacterEncoding","CharacterEncodingsPath","CharacteristicFunction","CharacteristicPolynomial","CharacterName","CharacterNormalize","CharacterRange","Characters","ChartBaseStyle","ChartElementData","ChartElementDataFunction","ChartElementFunction","ChartElements","ChartLabels","ChartLayout","ChartLegends","ChartStyle","Chebyshev1FilterModel","Chebyshev2FilterModel","ChebyshevDistance","ChebyshevT","ChebyshevU","Check","CheckAbort","CheckAll","Checkbox","CheckboxBar","CheckboxBox","CheckboxBoxOptions","ChemicalData","ChessboardDistance","ChiDistribution","ChineseRemainder","ChiSquareDistribution","ChoiceButtons","ChoiceDialog","CholeskyDecomposition","Chop","ChromaticityPlot","ChromaticityPlot3D","ChromaticPolynomial","Circle","CircleBox","CircleDot","CircleMinus","CirclePlus","CirclePoints","CircleThrough","CircleTimes","CirculantGraph","CircularOrthogonalMatrixDistribution","CircularQuaternionMatrixDistribution","CircularRealMatrixDistribution","CircularSymplecticMatrixDistribution","CircularUnitaryMatrixDistribution","Circumsphere","CityData","ClassifierFunction","ClassifierInformation","ClassifierMeasurements","ClassifierMeasurementsObject","Classify","ClassPriors","Clear","ClearAll","ClearAttributes","ClearCookies","ClearPermissions","ClearSystemCache","ClebschGordan","ClickPane","Clip","ClipboardNotebook","ClipFill","ClippingStyle","ClipPlanes","ClipPlanesStyle","ClipRange","Clock","ClockGauge","ClockwiseContourIntegral","Close","Closed","CloseKernels","ClosenessCentrality","Closing","ClosingAutoSave","ClosingEvent","ClosingSaveDialog","CloudAccountData","CloudBase","CloudConnect","CloudConnections","CloudDeploy","CloudDirectory","CloudDisconnect","CloudEvaluate","CloudExport","CloudExpression","CloudExpressions","CloudFunction","CloudGet","CloudImport","CloudLoggingData","CloudObject","CloudObjectInformation","CloudObjectInformationData","CloudObjectNameFormat","CloudObjects","CloudObjectURLType","CloudPublish","CloudPut","CloudRenderingMethod","CloudSave","CloudShare","CloudSubmit","CloudSymbol","CloudUnshare","CloudUserID","ClusterClassify","ClusterDissimilarityFunction","ClusteringComponents","ClusteringTree","CMYKColor","Coarse","CodeAssistOptions","Coefficient","CoefficientArrays","CoefficientDomain","CoefficientList","CoefficientRules","CoifletWavelet","Collect","Colon","ColonForm","ColorBalance","ColorCombine","ColorConvert","ColorCoverage","ColorData","ColorDataFunction","ColorDetect","ColorDistance","ColorFunction","ColorFunctionScaling","Colorize","ColorNegate","ColorOutput","ColorProfileData","ColorQ","ColorQuantize","ColorReplace","ColorRules","ColorSelectorSettings","ColorSeparate","ColorSetter","ColorSetterBox","ColorSetterBoxOptions","ColorSlider","ColorsNear","ColorSpace","ColorToneMapping","Column","ColumnAlignments","ColumnBackgrounds","ColumnForm","ColumnLines","ColumnsEqual","ColumnSpacings","ColumnWidths","CombinedEntityClass","CombinerFunction","CometData","CommonDefaultFormatTypes","Commonest","CommonestFilter","CommonName","CommonUnits","CommunityBoundaryStyle","CommunityGraphPlot","CommunityLabels","CommunityRegionStyle","CompanyData","CompatibleUnitQ","CompilationOptions","CompilationTarget","Compile","Compiled","CompiledCodeFunction","CompiledFunction","CompilerOptions","Complement","ComplementedEntityClass","CompleteGraph","CompleteGraphQ","CompleteKaryTree","CompletionsListPacket","Complex","ComplexContourPlot","Complexes","ComplexExpand","ComplexInfinity","ComplexityFunction","ComplexListPlot","ComplexPlot","ComplexPlot3D","ComplexRegionPlot","ComplexStreamPlot","ComplexVectorPlot","ComponentMeasurements","ComponentwiseContextMenu","Compose","ComposeList","ComposeSeries","CompositeQ","Composition","CompoundElement","CompoundExpression","CompoundPoissonDistribution","CompoundPoissonProcess","CompoundRenewalProcess","Compress","CompressedData","CompressionLevel","ComputeUncertainty","Condition","ConditionalExpression","Conditioned","Cone","ConeBox","ConfidenceLevel","ConfidenceRange","ConfidenceTransform","ConfigurationPath","ConformAudio","ConformImages","Congruent","ConicHullRegion","ConicHullRegion3DBox","ConicHullRegionBox","ConicOptimization","Conjugate","ConjugateTranspose","Conjunction","Connect","ConnectedComponents","ConnectedGraphComponents","ConnectedGraphQ","ConnectedMeshComponents","ConnectedMoleculeComponents","ConnectedMoleculeQ","ConnectionSettings","ConnectLibraryCallbackFunction","ConnectSystemModelComponents","ConnesWindow","ConoverTest","ConsoleMessage","ConsoleMessagePacket","Constant","ConstantArray","ConstantArrayLayer","ConstantImage","ConstantPlusLayer","ConstantRegionQ","Constants","ConstantTimesLayer","ConstellationData","ConstrainedMax","ConstrainedMin","Construct","Containing","ContainsAll","ContainsAny","ContainsExactly","ContainsNone","ContainsOnly","ContentFieldOptions","ContentLocationFunction","ContentObject","ContentPadding","ContentsBoundingBox","ContentSelectable","ContentSize","Context","ContextMenu","Contexts","ContextToFileName","Continuation","Continue","ContinuedFraction","ContinuedFractionK","ContinuousAction","ContinuousMarkovProcess","ContinuousTask","ContinuousTimeModelQ","ContinuousWaveletData","ContinuousWaveletTransform","ContourDetect","ContourGraphics","ContourIntegral","ContourLabels","ContourLines","ContourPlot","ContourPlot3D","Contours","ContourShading","ContourSmoothing","ContourStyle","ContraharmonicMean","ContrastiveLossLayer","Control","ControlActive","ControlAlignment","ControlGroupContentsBox","ControllabilityGramian","ControllabilityMatrix","ControllableDecomposition","ControllableModelQ","ControllerDuration","ControllerInformation","ControllerInformationData","ControllerLinking","ControllerManipulate","ControllerMethod","ControllerPath","ControllerState","ControlPlacement","ControlsRendering","ControlType","Convergents","ConversionOptions","ConversionRules","ConvertToBitmapPacket","ConvertToPostScript","ConvertToPostScriptPacket","ConvexHullMesh","ConvexPolygonQ","ConvexPolyhedronQ","ConvolutionLayer","Convolve","ConwayGroupCo1","ConwayGroupCo2","ConwayGroupCo3","CookieFunction","Cookies","CoordinateBoundingBox","CoordinateBoundingBoxArray","CoordinateBounds","CoordinateBoundsArray","CoordinateChartData","CoordinatesToolOptions","CoordinateTransform","CoordinateTransformData","CoprimeQ","Coproduct","CopulaDistribution","Copyable","CopyDatabin","CopyDirectory","CopyFile","CopyTag","CopyToClipboard","CornerFilter","CornerNeighbors","Correlation","CorrelationDistance","CorrelationFunction","CorrelationTest","Cos","Cosh","CoshIntegral","CosineDistance","CosineWindow","CosIntegral","Cot","Coth","Count","CountDistinct","CountDistinctBy","CounterAssignments","CounterBox","CounterBoxOptions","CounterClockwiseContourIntegral","CounterEvaluator","CounterFunction","CounterIncrements","CounterStyle","CounterStyleMenuListing","CountRoots","CountryData","Counts","CountsBy","Covariance","CovarianceEstimatorFunction","CovarianceFunction","CoxianDistribution","CoxIngersollRossProcess","CoxModel","CoxModelFit","CramerVonMisesTest","CreateArchive","CreateCellID","CreateChannel","CreateCloudExpression","CreateDatabin","CreateDataStructure","CreateDataSystemModel","CreateDialog","CreateDirectory","CreateDocument","CreateFile","CreateIntermediateDirectories","CreateManagedLibraryExpression","CreateNotebook","CreatePacletArchive","CreatePalette","CreatePalettePacket","CreatePermissionsGroup","CreateScheduledTask","CreateSearchIndex","CreateSystemModel","CreateTemporary","CreateUUID","CreateWindow","CriterionFunction","CriticalityFailureImportance","CriticalitySuccessImportance","CriticalSection","Cross","CrossEntropyLossLayer","CrossingCount","CrossingDetect","CrossingPolygon","CrossMatrix","Csc","Csch","CTCLossLayer","Cube","CubeRoot","Cubics","Cuboid","CuboidBox","Cumulant","CumulantGeneratingFunction","Cup","CupCap","Curl","CurlyDoubleQuote","CurlyQuote","CurrencyConvert","CurrentDate","CurrentImage","CurrentlySpeakingPacket","CurrentNotebookImage","CurrentScreenImage","CurrentValue","Curry","CurryApplied","CurvatureFlowFilter","CurveClosed","Cyan","CycleGraph","CycleIndexPolynomial","Cycles","CyclicGroup","Cyclotomic","Cylinder","CylinderBox","CylindricalDecomposition","D","DagumDistribution","DamData","DamerauLevenshteinDistance","DampingFactor","Darker","Dashed","Dashing","DatabaseConnect","DatabaseDisconnect","DatabaseReference","Databin","DatabinAdd","DatabinRemove","Databins","DatabinUpload","DataCompression","DataDistribution","DataRange","DataReversed","Dataset","DatasetDisplayPanel","DataStructure","DataStructureQ","Date","DateBounds","Dated","DateDelimiters","DateDifference","DatedUnit","DateFormat","DateFunction","DateHistogram","DateInterval","DateList","DateListLogPlot","DateListPlot","DateListStepPlot","DateObject","DateObjectQ","DateOverlapsQ","DatePattern","DatePlus","DateRange","DateReduction","DateString","DateTicksFormat","DateValue","DateWithinQ","DaubechiesWavelet","DavisDistribution","DawsonF","DayCount","DayCountConvention","DayHemisphere","DaylightQ","DayMatchQ","DayName","DayNightTerminator","DayPlus","DayRange","DayRound","DeBruijnGraph","DeBruijnSequence","Debug","DebugTag","Decapitalize","Decimal","DecimalForm","DeclareKnownSymbols","DeclarePackage","Decompose","DeconvolutionLayer","Decrement","Decrypt","DecryptFile","DedekindEta","DeepSpaceProbeData","Default","DefaultAxesStyle","DefaultBaseStyle","DefaultBoxStyle","DefaultButton","DefaultColor","DefaultControlPlacement","DefaultDuplicateCellStyle","DefaultDuration","DefaultElement","DefaultFaceGridsStyle","DefaultFieldHintStyle","DefaultFont","DefaultFontProperties","DefaultFormatType","DefaultFormatTypeForStyle","DefaultFrameStyle","DefaultFrameTicksStyle","DefaultGridLinesStyle","DefaultInlineFormatType","DefaultInputFormatType","DefaultLabelStyle","DefaultMenuStyle","DefaultNaturalLanguage","DefaultNewCellStyle","DefaultNewInlineCellStyle","DefaultNotebook","DefaultOptions","DefaultOutputFormatType","DefaultPrintPrecision","DefaultStyle","DefaultStyleDefinitions","DefaultTextFormatType","DefaultTextInlineFormatType","DefaultTicksStyle","DefaultTooltipStyle","DefaultValue","DefaultValues","Defer","DefineExternal","DefineInputStreamMethod","DefineOutputStreamMethod","DefineResourceFunction","Definition","Degree","DegreeCentrality","DegreeGraphDistribution","DegreeLexicographic","DegreeReverseLexicographic","DEigensystem","DEigenvalues","Deinitialization","Del","DelaunayMesh","Delayed","Deletable","Delete","DeleteAnomalies","DeleteBorderComponents","DeleteCases","DeleteChannel","DeleteCloudExpression","DeleteContents","DeleteDirectory","DeleteDuplicates","DeleteDuplicatesBy","DeleteFile","DeleteMissing","DeleteObject","DeletePermissionsKey","DeleteSearchIndex","DeleteSmallComponents","DeleteStopwords","DeleteWithContents","DeletionWarning","DelimitedArray","DelimitedSequence","Delimiter","DelimiterFlashTime","DelimiterMatching","Delimiters","DeliveryFunction","Dendrogram","Denominator","DensityGraphics","DensityHistogram","DensityPlot","DensityPlot3D","DependentVariables","Deploy","Deployed","Depth","DepthFirstScan","Derivative","DerivativeFilter","DerivedKey","DescriptorStateSpace","DesignMatrix","DestroyAfterEvaluation","Det","DeviceClose","DeviceConfigure","DeviceExecute","DeviceExecuteAsynchronous","DeviceObject","DeviceOpen","DeviceOpenQ","DeviceRead","DeviceReadBuffer","DeviceReadLatest","DeviceReadList","DeviceReadTimeSeries","Devices","DeviceStreams","DeviceWrite","DeviceWriteBuffer","DGaussianWavelet","DiacriticalPositioning","Diagonal","DiagonalizableMatrixQ","DiagonalMatrix","DiagonalMatrixQ","Dialog","DialogIndent","DialogInput","DialogLevel","DialogNotebook","DialogProlog","DialogReturn","DialogSymbols","Diamond","DiamondMatrix","DiceDissimilarity","DictionaryLookup","DictionaryWordQ","DifferenceDelta","DifferenceOrder","DifferenceQuotient","DifferenceRoot","DifferenceRootReduce","Differences","DifferentialD","DifferentialRoot","DifferentialRootReduce","DifferentiatorFilter","DigitalSignature","DigitBlock","DigitBlockMinimum","DigitCharacter","DigitCount","DigitQ","DihedralAngle","DihedralGroup","Dilation","DimensionalCombinations","DimensionalMeshComponents","DimensionReduce","DimensionReducerFunction","DimensionReduction","Dimensions","DiracComb","DiracDelta","DirectedEdge","DirectedEdges","DirectedGraph","DirectedGraphQ","DirectedInfinity","Direction","Directive","Directory","DirectoryName","DirectoryQ","DirectoryStack","DirichletBeta","DirichletCharacter","DirichletCondition","DirichletConvolve","DirichletDistribution","DirichletEta","DirichletL","DirichletLambda","DirichletTransform","DirichletWindow","DisableConsolePrintPacket","DisableFormatting","DiscreteAsymptotic","DiscreteChirpZTransform","DiscreteConvolve","DiscreteDelta","DiscreteHadamardTransform","DiscreteIndicator","DiscreteLimit","DiscreteLQEstimatorGains","DiscreteLQRegulatorGains","DiscreteLyapunovSolve","DiscreteMarkovProcess","DiscreteMaxLimit","DiscreteMinLimit","DiscretePlot","DiscretePlot3D","DiscreteRatio","DiscreteRiccatiSolve","DiscreteShift","DiscreteTimeModelQ","DiscreteUniformDistribution","DiscreteVariables","DiscreteWaveletData","DiscreteWaveletPacketTransform","DiscreteWaveletTransform","DiscretizeGraphics","DiscretizeRegion","Discriminant","DisjointQ","Disjunction","Disk","DiskBox","DiskMatrix","DiskSegment","Dispatch","DispatchQ","DispersionEstimatorFunction","Display","DisplayAllSteps","DisplayEndPacket","DisplayFlushImagePacket","DisplayForm","DisplayFunction","DisplayPacket","DisplayRules","DisplaySetSizePacket","DisplayString","DisplayTemporary","DisplayWith","DisplayWithRef","DisplayWithVariable","DistanceFunction","DistanceMatrix","DistanceTransform","Distribute","Distributed","DistributedContexts","DistributeDefinitions","DistributionChart","DistributionDomain","DistributionFitTest","DistributionParameterAssumptions","DistributionParameterQ","Dithering","Div","Divergence","Divide","DivideBy","Dividers","DivideSides","Divisible","Divisors","DivisorSigma","DivisorSum","DMSList","DMSString","Do","DockedCells","DocumentGenerator","DocumentGeneratorInformation","DocumentGeneratorInformationData","DocumentGenerators","DocumentNotebook","DocumentWeightingRules","Dodecahedron","DomainRegistrationInformation","DominantColors","DOSTextFormat","Dot","DotDashed","DotEqual","DotLayer","DotPlusLayer","Dotted","DoubleBracketingBar","DoubleContourIntegral","DoubleDownArrow","DoubleLeftArrow","DoubleLeftRightArrow","DoubleLeftTee","DoubleLongLeftArrow","DoubleLongLeftRightArrow","DoubleLongRightArrow","DoubleRightArrow","DoubleRightTee","DoubleUpArrow","DoubleUpDownArrow","DoubleVerticalBar","DoublyInfinite","Down","DownArrow","DownArrowBar","DownArrowUpArrow","DownLeftRightVector","DownLeftTeeVector","DownLeftVector","DownLeftVectorBar","DownRightTeeVector","DownRightVector","DownRightVectorBar","Downsample","DownTee","DownTeeArrow","DownValues","DragAndDrop","DrawEdges","DrawFrontFaces","DrawHighlighted","Drop","DropoutLayer","DSolve","DSolveValue","Dt","DualLinearProgramming","DualPolyhedron","DualSystemsModel","DumpGet","DumpSave","DuplicateFreeQ","Duration","Dynamic","DynamicBox","DynamicBoxOptions","DynamicEvaluationTimeout","DynamicGeoGraphics","DynamicImage","DynamicLocation","DynamicModule","DynamicModuleBox","DynamicModuleBoxOptions","DynamicModuleParent","DynamicModuleValues","DynamicName","DynamicNamespace","DynamicReference","DynamicSetting","DynamicUpdating","DynamicWrapper","DynamicWrapperBox","DynamicWrapperBoxOptions","E","EarthImpactData","EarthquakeData","EccentricityCentrality","Echo","EchoFunction","EclipseType","EdgeAdd","EdgeBetweennessCentrality","EdgeCapacity","EdgeCapForm","EdgeColor","EdgeConnectivity","EdgeContract","EdgeCost","EdgeCount","EdgeCoverQ","EdgeCycleMatrix","EdgeDashing","EdgeDelete","EdgeDetect","EdgeForm","EdgeIndex","EdgeJoinForm","EdgeLabeling","EdgeLabels","EdgeLabelStyle","EdgeList","EdgeOpacity","EdgeQ","EdgeRenderingFunction","EdgeRules","EdgeShapeFunction","EdgeStyle","EdgeTaggedGraph","EdgeTaggedGraphQ","EdgeTags","EdgeThickness","EdgeWeight","EdgeWeightedGraphQ","Editable","EditButtonSettings","EditCellTagsSettings","EditDistance","EffectiveInterest","Eigensystem","Eigenvalues","EigenvectorCentrality","Eigenvectors","Element","ElementData","ElementwiseLayer","ElidedForms","Eliminate","EliminationOrder","Ellipsoid","EllipticE","EllipticExp","EllipticExpPrime","EllipticF","EllipticFilterModel","EllipticK","EllipticLog","EllipticNomeQ","EllipticPi","EllipticReducedHalfPeriods","EllipticTheta","EllipticThetaPrime","EmbedCode","EmbeddedHTML","EmbeddedService","EmbeddingLayer","EmbeddingObject","EmitSound","EmphasizeSyntaxErrors","EmpiricalDistribution","Empty","EmptyGraphQ","EmptyRegion","EnableConsolePrintPacket","Enabled","Encode","Encrypt","EncryptedObject","EncryptFile","End","EndAdd","EndDialogPacket","EndFrontEndInteractionPacket","EndOfBuffer","EndOfFile","EndOfLine","EndOfString","EndPackage","EngineEnvironment","EngineeringForm","Enter","EnterExpressionPacket","EnterTextPacket","Entity","EntityClass","EntityClassList","EntityCopies","EntityFunction","EntityGroup","EntityInstance","EntityList","EntityPrefetch","EntityProperties","EntityProperty","EntityPropertyClass","EntityRegister","EntityStore","EntityStores","EntityTypeName","EntityUnregister","EntityValue","Entropy","EntropyFilter","Environment","Epilog","EpilogFunction","Equal","EqualColumns","EqualRows","EqualTilde","EqualTo","EquatedTo","Equilibrium","EquirippleFilterKernel","Equivalent","Erf","Erfc","Erfi","ErlangB","ErlangC","ErlangDistribution","Erosion","ErrorBox","ErrorBoxOptions","ErrorNorm","ErrorPacket","ErrorsDialogSettings","EscapeRadius","EstimatedBackground","EstimatedDistribution","EstimatedProcess","EstimatorGains","EstimatorRegulator","EuclideanDistance","EulerAngles","EulerCharacteristic","EulerE","EulerGamma","EulerianGraphQ","EulerMatrix","EulerPhi","Evaluatable","Evaluate","Evaluated","EvaluatePacket","EvaluateScheduledTask","EvaluationBox","EvaluationCell","EvaluationCompletionAction","EvaluationData","EvaluationElements","EvaluationEnvironment","EvaluationMode","EvaluationMonitor","EvaluationNotebook","EvaluationObject","EvaluationOrder","Evaluator","EvaluatorNames","EvenQ","EventData","EventEvaluator","EventHandler","EventHandlerTag","EventLabels","EventSeries","ExactBlackmanWindow","ExactNumberQ","ExactRootIsolation","ExampleData","Except","ExcludedForms","ExcludedLines","ExcludedPhysicalQuantities","ExcludePods","Exclusions","ExclusionsStyle","Exists","Exit","ExitDialog","ExoplanetData","Exp","Expand","ExpandAll","ExpandDenominator","ExpandFileName","ExpandNumerator","Expectation","ExpectationE","ExpectedValue","ExpGammaDistribution","ExpIntegralE","ExpIntegralEi","ExpirationDate","Exponent","ExponentFunction","ExponentialDistribution","ExponentialFamily","ExponentialGeneratingFunction","ExponentialMovingAverage","ExponentialPowerDistribution","ExponentPosition","ExponentStep","Export","ExportAutoReplacements","ExportByteArray","ExportForm","ExportPacket","ExportString","Expression","ExpressionCell","ExpressionGraph","ExpressionPacket","ExpressionUUID","ExpToTrig","ExtendedEntityClass","ExtendedGCD","Extension","ExtentElementFunction","ExtentMarkers","ExtentSize","ExternalBundle","ExternalCall","ExternalDataCharacterEncoding","ExternalEvaluate","ExternalFunction","ExternalFunctionName","ExternalIdentifier","ExternalObject","ExternalOptions","ExternalSessionObject","ExternalSessions","ExternalStorageBase","ExternalStorageDownload","ExternalStorageGet","ExternalStorageObject","ExternalStoragePut","ExternalStorageUpload","ExternalTypeSignature","ExternalValue","Extract","ExtractArchive","ExtractLayer","ExtractPacletArchive","ExtremeValueDistribution","FaceAlign","FaceForm","FaceGrids","FaceGridsStyle","FacialFeatures","Factor","FactorComplete","Factorial","Factorial2","FactorialMoment","FactorialMomentGeneratingFunction","FactorialPower","FactorInteger","FactorList","FactorSquareFree","FactorSquareFreeList","FactorTerms","FactorTermsList","Fail","Failure","FailureAction","FailureDistribution","FailureQ","False","FareySequence","FARIMAProcess","FeatureDistance","FeatureExtract","FeatureExtraction","FeatureExtractor","FeatureExtractorFunction","FeatureNames","FeatureNearest","FeatureSpacePlot","FeatureSpacePlot3D","FeatureTypes","FEDisableConsolePrintPacket","FeedbackLinearize","FeedbackSector","FeedbackSectorStyle","FeedbackType","FEEnableConsolePrintPacket","FetalGrowthData","Fibonacci","Fibonorial","FieldCompletionFunction","FieldHint","FieldHintStyle","FieldMasked","FieldSize","File","FileBaseName","FileByteCount","FileConvert","FileDate","FileExistsQ","FileExtension","FileFormat","FileHandler","FileHash","FileInformation","FileName","FileNameDepth","FileNameDialogSettings","FileNameDrop","FileNameForms","FileNameJoin","FileNames","FileNameSetter","FileNameSplit","FileNameTake","FilePrint","FileSize","FileSystemMap","FileSystemScan","FileTemplate","FileTemplateApply","FileType","FilledCurve","FilledCurveBox","FilledCurveBoxOptions","Filling","FillingStyle","FillingTransform","FilteredEntityClass","FilterRules","FinancialBond","FinancialData","FinancialDerivative","FinancialIndicator","Find","FindAnomalies","FindArgMax","FindArgMin","FindChannels","FindClique","FindClusters","FindCookies","FindCurvePath","FindCycle","FindDevices","FindDistribution","FindDistributionParameters","FindDivisions","FindEdgeCover","FindEdgeCut","FindEdgeIndependentPaths","FindEquationalProof","FindEulerianCycle","FindExternalEvaluators","FindFaces","FindFile","FindFit","FindFormula","FindFundamentalCycles","FindGeneratingFunction","FindGeoLocation","FindGeometricConjectures","FindGeometricTransform","FindGraphCommunities","FindGraphIsomorphism","FindGraphPartition","FindHamiltonianCycle","FindHamiltonianPath","FindHiddenMarkovStates","FindImageText","FindIndependentEdgeSet","FindIndependentVertexSet","FindInstance","FindIntegerNullVector","FindKClan","FindKClique","FindKClub","FindKPlex","FindLibrary","FindLinearRecurrence","FindList","FindMatchingColor","FindMaximum","FindMaximumCut","FindMaximumFlow","FindMaxValue","FindMeshDefects","FindMinimum","FindMinimumCostFlow","FindMinimumCut","FindMinValue","FindMoleculeSubstructure","FindPath","FindPeaks","FindPermutation","FindPostmanTour","FindProcessParameters","FindRepeat","FindRoot","FindSequenceFunction","FindSettings","FindShortestPath","FindShortestTour","FindSpanningTree","FindSystemModelEquilibrium","FindTextualAnswer","FindThreshold","FindTransientRepeat","FindVertexCover","FindVertexCut","FindVertexIndependentPaths","Fine","FinishDynamic","FiniteAbelianGroupCount","FiniteGroupCount","FiniteGroupData","First","FirstCase","FirstPassageTimeDistribution","FirstPosition","FischerGroupFi22","FischerGroupFi23","FischerGroupFi24Prime","FisherHypergeometricDistribution","FisherRatioTest","FisherZDistribution","Fit","FitAll","FitRegularization","FittedModel","FixedOrder","FixedPoint","FixedPointList","FlashSelection","Flat","Flatten","FlattenAt","FlattenLayer","FlatTopWindow","FlipView","Floor","FlowPolynomial","FlushPrintOutputPacket","Fold","FoldList","FoldPair","FoldPairList","FollowRedirects","Font","FontColor","FontFamily","FontForm","FontName","FontOpacity","FontPostScriptName","FontProperties","FontReencoding","FontSize","FontSlant","FontSubstitutions","FontTracking","FontVariations","FontWeight","For","ForAll","ForceVersionInstall","Format","FormatRules","FormatType","FormatTypeAutoConvert","FormatValues","FormBox","FormBoxOptions","FormControl","FormFunction","FormLayoutFunction","FormObject","FormPage","FormTheme","FormulaData","FormulaLookup","FortranForm","Forward","ForwardBackward","Fourier","FourierCoefficient","FourierCosCoefficient","FourierCosSeries","FourierCosTransform","FourierDCT","FourierDCTFilter","FourierDCTMatrix","FourierDST","FourierDSTMatrix","FourierMatrix","FourierParameters","FourierSequenceTransform","FourierSeries","FourierSinCoefficient","FourierSinSeries","FourierSinTransform","FourierTransform","FourierTrigSeries","FractionalBrownianMotionProcess","FractionalGaussianNoiseProcess","FractionalPart","FractionBox","FractionBoxOptions","FractionLine","Frame","FrameBox","FrameBoxOptions","Framed","FrameInset","FrameLabel","Frameless","FrameMargins","FrameRate","FrameStyle","FrameTicks","FrameTicksStyle","FRatioDistribution","FrechetDistribution","FreeQ","FrenetSerretSystem","FrequencySamplingFilterKernel","FresnelC","FresnelF","FresnelG","FresnelS","Friday","FrobeniusNumber","FrobeniusSolve","FromAbsoluteTime","FromCharacterCode","FromCoefficientRules","FromContinuedFraction","FromDate","FromDigits","FromDMS","FromEntity","FromJulianDate","FromLetterNumber","FromPolarCoordinates","FromRomanNumeral","FromSphericalCoordinates","FromUnixTime","Front","FrontEndDynamicExpression","FrontEndEventActions","FrontEndExecute","FrontEndObject","FrontEndResource","FrontEndResourceString","FrontEndStackSize","FrontEndToken","FrontEndTokenExecute","FrontEndValueCache","FrontEndVersion","FrontFaceColor","FrontFaceOpacity","Full","FullAxes","FullDefinition","FullForm","FullGraphics","FullInformationOutputRegulator","FullOptions","FullRegion","FullSimplify","Function","FunctionCompile","FunctionCompileExport","FunctionCompileExportByteArray","FunctionCompileExportLibrary","FunctionCompileExportString","FunctionDomain","FunctionExpand","FunctionInterpolation","FunctionPeriod","FunctionRange","FunctionSpace","FussellVeselyImportance","GaborFilter","GaborMatrix","GaborWavelet","GainMargins","GainPhaseMargins","GalaxyData","GalleryView","Gamma","GammaDistribution","GammaRegularized","GapPenalty","GARCHProcess","GatedRecurrentLayer","Gather","GatherBy","GaugeFaceElementFunction","GaugeFaceStyle","GaugeFrameElementFunction","GaugeFrameSize","GaugeFrameStyle","GaugeLabels","GaugeMarkers","GaugeStyle","GaussianFilter","GaussianIntegers","GaussianMatrix","GaussianOrthogonalMatrixDistribution","GaussianSymplecticMatrixDistribution","GaussianUnitaryMatrixDistribution","GaussianWindow","GCD","GegenbauerC","General","GeneralizedLinearModelFit","GenerateAsymmetricKeyPair","GenerateConditions","GeneratedCell","GeneratedDocumentBinding","GenerateDerivedKey","GenerateDigitalSignature","GenerateDocument","GeneratedParameters","GeneratedQuantityMagnitudes","GenerateFileSignature","GenerateHTTPResponse","GenerateSecuredAuthenticationKey","GenerateSymmetricKey","GeneratingFunction","GeneratorDescription","GeneratorHistoryLength","GeneratorOutputType","Generic","GenericCylindricalDecomposition","GenomeData","GenomeLookup","GeoAntipode","GeoArea","GeoArraySize","GeoBackground","GeoBoundingBox","GeoBounds","GeoBoundsRegion","GeoBubbleChart","GeoCenter","GeoCircle","GeoContourPlot","GeoDensityPlot","GeodesicClosing","GeodesicDilation","GeodesicErosion","GeodesicOpening","GeoDestination","GeodesyData","GeoDirection","GeoDisk","GeoDisplacement","GeoDistance","GeoDistanceList","GeoElevationData","GeoEntities","GeoGraphics","GeogravityModelData","GeoGridDirectionDifference","GeoGridLines","GeoGridLinesStyle","GeoGridPosition","GeoGridRange","GeoGridRangePadding","GeoGridUnitArea","GeoGridUnitDistance","GeoGridVector","GeoGroup","GeoHemisphere","GeoHemisphereBoundary","GeoHistogram","GeoIdentify","GeoImage","GeoLabels","GeoLength","GeoListPlot","GeoLocation","GeologicalPeriodData","GeomagneticModelData","GeoMarker","GeometricAssertion","GeometricBrownianMotionProcess","GeometricDistribution","GeometricMean","GeometricMeanFilter","GeometricOptimization","GeometricScene","GeometricTransformation","GeometricTransformation3DBox","GeometricTransformation3DBoxOptions","GeometricTransformationBox","GeometricTransformationBoxOptions","GeoModel","GeoNearest","GeoPath","GeoPosition","GeoPositionENU","GeoPositionXYZ","GeoProjection","GeoProjectionData","GeoRange","GeoRangePadding","GeoRegionValuePlot","GeoResolution","GeoScaleBar","GeoServer","GeoSmoothHistogram","GeoStreamPlot","GeoStyling","GeoStylingImageFunction","GeoVariant","GeoVector","GeoVectorENU","GeoVectorPlot","GeoVectorXYZ","GeoVisibleRegion","GeoVisibleRegionBoundary","GeoWithinQ","GeoZoomLevel","GestureHandler","GestureHandlerTag","Get","GetBoundingBoxSizePacket","GetContext","GetEnvironment","GetFileName","GetFrontEndOptionsDataPacket","GetLinebreakInformationPacket","GetMenusPacket","GetPageBreakInformationPacket","Glaisher","GlobalClusteringCoefficient","GlobalPreferences","GlobalSession","Glow","GoldenAngle","GoldenRatio","GompertzMakehamDistribution","GoochShading","GoodmanKruskalGamma","GoodmanKruskalGammaTest","Goto","Grad","Gradient","GradientFilter","GradientOrientationFilter","GrammarApply","GrammarRules","GrammarToken","Graph","Graph3D","GraphAssortativity","GraphAutomorphismGroup","GraphCenter","GraphComplement","GraphData","GraphDensity","GraphDiameter","GraphDifference","GraphDisjointUnion","GraphDistance","GraphDistanceMatrix","GraphElementData","GraphEmbedding","GraphHighlight","GraphHighlightStyle","GraphHub","Graphics","Graphics3D","Graphics3DBox","Graphics3DBoxOptions","GraphicsArray","GraphicsBaseline","GraphicsBox","GraphicsBoxOptions","GraphicsColor","GraphicsColumn","GraphicsComplex","GraphicsComplex3DBox","GraphicsComplex3DBoxOptions","GraphicsComplexBox","GraphicsComplexBoxOptions","GraphicsContents","GraphicsData","GraphicsGrid","GraphicsGridBox","GraphicsGroup","GraphicsGroup3DBox","GraphicsGroup3DBoxOptions","GraphicsGroupBox","GraphicsGroupBoxOptions","GraphicsGrouping","GraphicsHighlightColor","GraphicsRow","GraphicsSpacing","GraphicsStyle","GraphIntersection","GraphLayout","GraphLinkEfficiency","GraphPeriphery","GraphPlot","GraphPlot3D","GraphPower","GraphPropertyDistribution","GraphQ","GraphRadius","GraphReciprocity","GraphRoot","GraphStyle","GraphUnion","Gray","GrayLevel","Greater","GreaterEqual","GreaterEqualLess","GreaterEqualThan","GreaterFullEqual","GreaterGreater","GreaterLess","GreaterSlantEqual","GreaterThan","GreaterTilde","Green","GreenFunction","Grid","GridBaseline","GridBox","GridBoxAlignment","GridBoxBackground","GridBoxDividers","GridBoxFrame","GridBoxItemSize","GridBoxItemStyle","GridBoxOptions","GridBoxSpacings","GridCreationSettings","GridDefaultElement","GridElementStyleOptions","GridFrame","GridFrameMargins","GridGraph","GridLines","GridLinesStyle","GroebnerBasis","GroupActionBase","GroupBy","GroupCentralizer","GroupElementFromWord","GroupElementPosition","GroupElementQ","GroupElements","GroupElementToWord","GroupGenerators","Groupings","GroupMultiplicationTable","GroupOrbits","GroupOrder","GroupPageBreakWithin","GroupSetwiseStabilizer","GroupStabilizer","GroupStabilizerChain","GroupTogetherGrouping","GroupTogetherNestedGrouping","GrowCutComponents","Gudermannian","GuidedFilter","GumbelDistribution","HaarWavelet","HadamardMatrix","HalfLine","HalfNormalDistribution","HalfPlane","HalfSpace","HalftoneShading","HamiltonianGraphQ","HammingDistance","HammingWindow","HandlerFunctions","HandlerFunctionsKeys","HankelH1","HankelH2","HankelMatrix","HankelTransform","HannPoissonWindow","HannWindow","HaradaNortonGroupHN","HararyGraph","HarmonicMean","HarmonicMeanFilter","HarmonicNumber","Hash","HatchFilling","HatchShading","Haversine","HazardFunction","Head","HeadCompose","HeaderAlignment","HeaderBackground","HeaderDisplayFunction","HeaderLines","HeaderSize","HeaderStyle","Heads","HeavisideLambda","HeavisidePi","HeavisideTheta","HeldGroupHe","HeldPart","HelpBrowserLookup","HelpBrowserNotebook","HelpBrowserSettings","Here","HermiteDecomposition","HermiteH","HermitianMatrixQ","HessenbergDecomposition","Hessian","HeunB","HeunBPrime","HeunC","HeunCPrime","HeunD","HeunDPrime","HeunG","HeunGPrime","HeunT","HeunTPrime","HexadecimalCharacter","Hexahedron","HexahedronBox","HexahedronBoxOptions","HiddenItems","HiddenMarkovProcess","HiddenSurface","Highlighted","HighlightGraph","HighlightImage","HighlightMesh","HighpassFilter","HigmanSimsGroupHS","HilbertCurve","HilbertFilter","HilbertMatrix","Histogram","Histogram3D","HistogramDistribution","HistogramList","HistogramTransform","HistogramTransformInterpolation","HistoricalPeriodData","HitMissTransform","HITSCentrality","HjorthDistribution","HodgeDual","HoeffdingD","HoeffdingDTest","Hold","HoldAll","HoldAllComplete","HoldComplete","HoldFirst","HoldForm","HoldPattern","HoldRest","HolidayCalendar","HomeDirectory","HomePage","Horizontal","HorizontalForm","HorizontalGauge","HorizontalScrollPosition","HornerForm","HostLookup","HotellingTSquareDistribution","HoytDistribution","HTMLSave","HTTPErrorResponse","HTTPRedirect","HTTPRequest","HTTPRequestData","HTTPResponse","Hue","HumanGrowthData","HumpDownHump","HumpEqual","HurwitzLerchPhi","HurwitzZeta","HyperbolicDistribution","HypercubeGraph","HyperexponentialDistribution","Hyperfactorial","Hypergeometric0F1","Hypergeometric0F1Regularized","Hypergeometric1F1","Hypergeometric1F1Regularized","Hypergeometric2F1","Hypergeometric2F1Regularized","HypergeometricDistribution","HypergeometricPFQ","HypergeometricPFQRegularized","HypergeometricU","Hyperlink","HyperlinkAction","HyperlinkCreationSettings","Hyperplane","Hyphenation","HyphenationOptions","HypoexponentialDistribution","HypothesisTestData","I","IconData","Iconize","IconizedObject","IconRules","Icosahedron","Identity","IdentityMatrix","If","IgnoreCase","IgnoreDiacritics","IgnorePunctuation","IgnoreSpellCheck","IgnoringInactive","Im","Image","Image3D","Image3DProjection","Image3DSlices","ImageAccumulate","ImageAdd","ImageAdjust","ImageAlign","ImageApply","ImageApplyIndexed","ImageAspectRatio","ImageAssemble","ImageAugmentationLayer","ImageBoundingBoxes","ImageCache","ImageCacheValid","ImageCapture","ImageCaptureFunction","ImageCases","ImageChannels","ImageClip","ImageCollage","ImageColorSpace","ImageCompose","ImageContainsQ","ImageContents","ImageConvolve","ImageCooccurrence","ImageCorners","ImageCorrelate","ImageCorrespondingPoints","ImageCrop","ImageData","ImageDeconvolve","ImageDemosaic","ImageDifference","ImageDimensions","ImageDisplacements","ImageDistance","ImageEffect","ImageExposureCombine","ImageFeatureTrack","ImageFileApply","ImageFileFilter","ImageFileScan","ImageFilter","ImageFocusCombine","ImageForestingComponents","ImageFormattingWidth","ImageForwardTransformation","ImageGraphics","ImageHistogram","ImageIdentify","ImageInstanceQ","ImageKeypoints","ImageLabels","ImageLegends","ImageLevels","ImageLines","ImageMargins","ImageMarker","ImageMarkers","ImageMeasurements","ImageMesh","ImageMultiply","ImageOffset","ImagePad","ImagePadding","ImagePartition","ImagePeriodogram","ImagePerspectiveTransformation","ImagePosition","ImagePreviewFunction","ImagePyramid","ImagePyramidApply","ImageQ","ImageRangeCache","ImageRecolor","ImageReflect","ImageRegion","ImageResize","ImageResolution","ImageRestyle","ImageRotate","ImageRotated","ImageSaliencyFilter","ImageScaled","ImageScan","ImageSize","ImageSizeAction","ImageSizeCache","ImageSizeMultipliers","ImageSizeRaw","ImageSubtract","ImageTake","ImageTransformation","ImageTrim","ImageType","ImageValue","ImageValuePositions","ImagingDevice","ImplicitRegion","Implies","Import","ImportAutoReplacements","ImportByteArray","ImportOptions","ImportString","ImprovementImportance","In","Inactivate","Inactive","IncidenceGraph","IncidenceList","IncidenceMatrix","IncludeAromaticBonds","IncludeConstantBasis","IncludeDefinitions","IncludeDirectories","IncludeFileExtension","IncludeGeneratorTasks","IncludeHydrogens","IncludeInflections","IncludeMetaInformation","IncludePods","IncludeQuantities","IncludeRelatedTables","IncludeSingularTerm","IncludeWindowTimes","Increment","IndefiniteMatrixQ","Indent","IndentingNewlineSpacings","IndentMaxFraction","IndependenceTest","IndependentEdgeSetQ","IndependentPhysicalQuantity","IndependentUnit","IndependentUnitDimension","IndependentVertexSetQ","Indeterminate","IndeterminateThreshold","IndexCreationOptions","Indexed","IndexEdgeTaggedGraph","IndexGraph","IndexTag","Inequality","InexactNumberQ","InexactNumbers","InfiniteFuture","InfiniteLine","InfinitePast","InfinitePlane","Infinity","Infix","InflationAdjust","InflationMethod","Information","InformationData","InformationDataGrid","Inherited","InheritScope","InhomogeneousPoissonProcess","InitialEvaluationHistory","Initialization","InitializationCell","InitializationCellEvaluation","InitializationCellWarning","InitializationObjects","InitializationValue","Initialize","InitialSeeding","InlineCounterAssignments","InlineCounterIncrements","InlineRules","Inner","InnerPolygon","InnerPolyhedron","Inpaint","Input","InputAliases","InputAssumptions","InputAutoReplacements","InputField","InputFieldBox","InputFieldBoxOptions","InputForm","InputGrouping","InputNamePacket","InputNotebook","InputPacket","InputSettings","InputStream","InputString","InputStringPacket","InputToBoxFormPacket","Insert","InsertionFunction","InsertionPointObject","InsertLinebreaks","InsertResults","Inset","Inset3DBox","Inset3DBoxOptions","InsetBox","InsetBoxOptions","Insphere","Install","InstallService","InstanceNormalizationLayer","InString","Integer","IntegerDigits","IntegerExponent","IntegerLength","IntegerName","IntegerPart","IntegerPartitions","IntegerQ","IntegerReverse","Integers","IntegerString","Integral","Integrate","Interactive","InteractiveTradingChart","Interlaced","Interleaving","InternallyBalancedDecomposition","InterpolatingFunction","InterpolatingPolynomial","Interpolation","InterpolationOrder","InterpolationPoints","InterpolationPrecision","Interpretation","InterpretationBox","InterpretationBoxOptions","InterpretationFunction","Interpreter","InterpretTemplate","InterquartileRange","Interrupt","InterruptSettings","IntersectedEntityClass","IntersectingQ","Intersection","Interval","IntervalIntersection","IntervalMarkers","IntervalMarkersStyle","IntervalMemberQ","IntervalSlider","IntervalUnion","Into","Inverse","InverseBetaRegularized","InverseCDF","InverseChiSquareDistribution","InverseContinuousWaveletTransform","InverseDistanceTransform","InverseEllipticNomeQ","InverseErf","InverseErfc","InverseFourier","InverseFourierCosTransform","InverseFourierSequenceTransform","InverseFourierSinTransform","InverseFourierTransform","InverseFunction","InverseFunctions","InverseGammaDistribution","InverseGammaRegularized","InverseGaussianDistribution","InverseGudermannian","InverseHankelTransform","InverseHaversine","InverseImagePyramid","InverseJacobiCD","InverseJacobiCN","InverseJacobiCS","InverseJacobiDC","InverseJacobiDN","InverseJacobiDS","InverseJacobiNC","InverseJacobiND","InverseJacobiNS","InverseJacobiSC","InverseJacobiSD","InverseJacobiSN","InverseLaplaceTransform","InverseMellinTransform","InversePermutation","InverseRadon","InverseRadonTransform","InverseSeries","InverseShortTimeFourier","InverseSpectrogram","InverseSurvivalFunction","InverseTransformedRegion","InverseWaveletTransform","InverseWeierstrassP","InverseWishartMatrixDistribution","InverseZTransform","Invisible","InvisibleApplication","InvisibleTimes","IPAddress","IrreduciblePolynomialQ","IslandData","IsolatingInterval","IsomorphicGraphQ","IsotopeData","Italic","Item","ItemAspectRatio","ItemBox","ItemBoxOptions","ItemDisplayFunction","ItemSize","ItemStyle","ItoProcess","JaccardDissimilarity","JacobiAmplitude","Jacobian","JacobiCD","JacobiCN","JacobiCS","JacobiDC","JacobiDN","JacobiDS","JacobiNC","JacobiND","JacobiNS","JacobiP","JacobiSC","JacobiSD","JacobiSN","JacobiSymbol","JacobiZeta","JankoGroupJ1","JankoGroupJ2","JankoGroupJ3","JankoGroupJ4","JarqueBeraALMTest","JohnsonDistribution","Join","JoinAcross","Joined","JoinedCurve","JoinedCurveBox","JoinedCurveBoxOptions","JoinForm","JordanDecomposition","JordanModelDecomposition","JulianDate","JuliaSetBoettcher","JuliaSetIterationCount","JuliaSetPlot","JuliaSetPoints","K","KagiChart","KaiserBesselWindow","KaiserWindow","KalmanEstimator","KalmanFilter","KarhunenLoeveDecomposition","KaryTree","KatzCentrality","KCoreComponents","KDistribution","KEdgeConnectedComponents","KEdgeConnectedGraphQ","KeepExistingVersion","KelvinBei","KelvinBer","KelvinKei","KelvinKer","KendallTau","KendallTauTest","KernelExecute","KernelFunction","KernelMixtureDistribution","KernelObject","Kernels","Ket","Key","KeyCollisionFunction","KeyComplement","KeyDrop","KeyDropFrom","KeyExistsQ","KeyFreeQ","KeyIntersection","KeyMap","KeyMemberQ","KeypointStrength","Keys","KeySelect","KeySort","KeySortBy","KeyTake","KeyUnion","KeyValueMap","KeyValuePattern","Khinchin","KillProcess","KirchhoffGraph","KirchhoffMatrix","KleinInvariantJ","KnapsackSolve","KnightTourGraph","KnotData","KnownUnitQ","KochCurve","KolmogorovSmirnovTest","KroneckerDelta","KroneckerModelDecomposition","KroneckerProduct","KroneckerSymbol","KuiperTest","KumaraswamyDistribution","Kurtosis","KuwaharaFilter","KVertexConnectedComponents","KVertexConnectedGraphQ","LABColor","Label","Labeled","LabeledSlider","LabelingFunction","LabelingSize","LabelStyle","LabelVisibility","LaguerreL","LakeData","LambdaComponents","LambertW","LaminaData","LanczosWindow","LandauDistribution","Language","LanguageCategory","LanguageData","LanguageIdentify","LanguageOptions","LaplaceDistribution","LaplaceTransform","Laplacian","LaplacianFilter","LaplacianGaussianFilter","Large","Larger","Last","Latitude","LatitudeLongitude","LatticeData","LatticeReduce","Launch","LaunchKernels","LayeredGraphPlot","LayerSizeFunction","LayoutInformation","LCHColor","LCM","LeaderSize","LeafCount","LeapYearQ","LearnDistribution","LearnedDistribution","LearningRate","LearningRateMultipliers","LeastSquares","LeastSquaresFilterKernel","Left","LeftArrow","LeftArrowBar","LeftArrowRightArrow","LeftDownTeeVector","LeftDownVector","LeftDownVectorBar","LeftRightArrow","LeftRightVector","LeftTee","LeftTeeArrow","LeftTeeVector","LeftTriangle","LeftTriangleBar","LeftTriangleEqual","LeftUpDownVector","LeftUpTeeVector","LeftUpVector","LeftUpVectorBar","LeftVector","LeftVectorBar","LegendAppearance","Legended","LegendFunction","LegendLabel","LegendLayout","LegendMargins","LegendMarkers","LegendMarkerSize","LegendreP","LegendreQ","LegendreType","Length","LengthWhile","LerchPhi","Less","LessEqual","LessEqualGreater","LessEqualThan","LessFullEqual","LessGreater","LessLess","LessSlantEqual","LessThan","LessTilde","LetterCharacter","LetterCounts","LetterNumber","LetterQ","Level","LeveneTest","LeviCivitaTensor","LevyDistribution","Lexicographic","LibraryDataType","LibraryFunction","LibraryFunctionError","LibraryFunctionInformation","LibraryFunctionLoad","LibraryFunctionUnload","LibraryLoad","LibraryUnload","LicenseID","LiftingFilterData","LiftingWaveletTransform","LightBlue","LightBrown","LightCyan","Lighter","LightGray","LightGreen","Lighting","LightingAngle","LightMagenta","LightOrange","LightPink","LightPurple","LightRed","LightSources","LightYellow","Likelihood","Limit","LimitsPositioning","LimitsPositioningTokens","LindleyDistribution","Line","Line3DBox","Line3DBoxOptions","LinearFilter","LinearFractionalOptimization","LinearFractionalTransform","LinearGradientImage","LinearizingTransformationData","LinearLayer","LinearModelFit","LinearOffsetFunction","LinearOptimization","LinearProgramming","LinearRecurrence","LinearSolve","LinearSolveFunction","LineBox","LineBoxOptions","LineBreak","LinebreakAdjustments","LineBreakChart","LinebreakSemicolonWeighting","LineBreakWithin","LineColor","LineGraph","LineIndent","LineIndentMaxFraction","LineIntegralConvolutionPlot","LineIntegralConvolutionScale","LineLegend","LineOpacity","LineSpacing","LineWrapParts","LinkActivate","LinkClose","LinkConnect","LinkConnectedQ","LinkCreate","LinkError","LinkFlush","LinkFunction","LinkHost","LinkInterrupt","LinkLaunch","LinkMode","LinkObject","LinkOpen","LinkOptions","LinkPatterns","LinkProtocol","LinkRankCentrality","LinkRead","LinkReadHeld","LinkReadyQ","Links","LinkService","LinkWrite","LinkWriteHeld","LiouvilleLambda","List","Listable","ListAnimate","ListContourPlot","ListContourPlot3D","ListConvolve","ListCorrelate","ListCurvePathPlot","ListDeconvolve","ListDensityPlot","ListDensityPlot3D","Listen","ListFormat","ListFourierSequenceTransform","ListInterpolation","ListLineIntegralConvolutionPlot","ListLinePlot","ListLogLinearPlot","ListLogLogPlot","ListLogPlot","ListPicker","ListPickerBox","ListPickerBoxBackground","ListPickerBoxOptions","ListPlay","ListPlot","ListPlot3D","ListPointPlot3D","ListPolarPlot","ListQ","ListSliceContourPlot3D","ListSliceDensityPlot3D","ListSliceVectorPlot3D","ListStepPlot","ListStreamDensityPlot","ListStreamPlot","ListSurfacePlot3D","ListVectorDensityPlot","ListVectorPlot","ListVectorPlot3D","ListZTransform","Literal","LiteralSearch","LocalAdaptiveBinarize","LocalCache","LocalClusteringCoefficient","LocalizeDefinitions","LocalizeVariables","LocalObject","LocalObjects","LocalResponseNormalizationLayer","LocalSubmit","LocalSymbol","LocalTime","LocalTimeZone","LocationEquivalenceTest","LocationTest","Locator","LocatorAutoCreate","LocatorBox","LocatorBoxOptions","LocatorCentering","LocatorPane","LocatorPaneBox","LocatorPaneBoxOptions","LocatorRegion","Locked","Log","Log10","Log2","LogBarnesG","LogGamma","LogGammaDistribution","LogicalExpand","LogIntegral","LogisticDistribution","LogisticSigmoid","LogitModelFit","LogLikelihood","LogLinearPlot","LogLogisticDistribution","LogLogPlot","LogMultinormalDistribution","LogNormalDistribution","LogPlot","LogRankTest","LogSeriesDistribution","LongEqual","Longest","LongestCommonSequence","LongestCommonSequencePositions","LongestCommonSubsequence","LongestCommonSubsequencePositions","LongestMatch","LongestOrderedSequence","LongForm","Longitude","LongLeftArrow","LongLeftRightArrow","LongRightArrow","LongShortTermMemoryLayer","Lookup","Loopback","LoopFreeGraphQ","Looping","LossFunction","LowerCaseQ","LowerLeftArrow","LowerRightArrow","LowerTriangularize","LowerTriangularMatrixQ","LowpassFilter","LQEstimatorGains","LQGRegulator","LQOutputRegulatorGains","LQRegulatorGains","LUBackSubstitution","LucasL","LuccioSamiComponents","LUDecomposition","LunarEclipse","LUVColor","LyapunovSolve","LyonsGroupLy","MachineID","MachineName","MachineNumberQ","MachinePrecision","MacintoshSystemPageSetup","Magenta","Magnification","Magnify","MailAddressValidation","MailExecute","MailFolder","MailItem","MailReceiverFunction","MailResponseFunction","MailSearch","MailServerConnect","MailServerConnection","MailSettings","MainSolve","MaintainDynamicCaches","Majority","MakeBoxes","MakeExpression","MakeRules","ManagedLibraryExpressionID","ManagedLibraryExpressionQ","MandelbrotSetBoettcher","MandelbrotSetDistance","MandelbrotSetIterationCount","MandelbrotSetMemberQ","MandelbrotSetPlot","MangoldtLambda","ManhattanDistance","Manipulate","Manipulator","MannedSpaceMissionData","MannWhitneyTest","MantissaExponent","Manual","Map","MapAll","MapAt","MapIndexed","MAProcess","MapThread","MarchenkoPasturDistribution","MarcumQ","MardiaCombinedTest","MardiaKurtosisTest","MardiaSkewnessTest","MarginalDistribution","MarkovProcessProperties","Masking","MatchingDissimilarity","MatchLocalNameQ","MatchLocalNames","MatchQ","Material","MathematicalFunctionData","MathematicaNotation","MathieuC","MathieuCharacteristicA","MathieuCharacteristicB","MathieuCharacteristicExponent","MathieuCPrime","MathieuGroupM11","MathieuGroupM12","MathieuGroupM22","MathieuGroupM23","MathieuGroupM24","MathieuS","MathieuSPrime","MathMLForm","MathMLText","Matrices","MatrixExp","MatrixForm","MatrixFunction","MatrixLog","MatrixNormalDistribution","MatrixPlot","MatrixPower","MatrixPropertyDistribution","MatrixQ","MatrixRank","MatrixTDistribution","Max","MaxBend","MaxCellMeasure","MaxColorDistance","MaxDate","MaxDetect","MaxDuration","MaxExtraBandwidths","MaxExtraConditions","MaxFeatureDisplacement","MaxFeatures","MaxFilter","MaximalBy","Maximize","MaxItems","MaxIterations","MaxLimit","MaxMemoryUsed","MaxMixtureKernels","MaxOverlapFraction","MaxPlotPoints","MaxPoints","MaxRecursion","MaxStableDistribution","MaxStepFraction","MaxSteps","MaxStepSize","MaxTrainingRounds","MaxValue","MaxwellDistribution","MaxWordGap","McLaughlinGroupMcL","Mean","MeanAbsoluteLossLayer","MeanAround","MeanClusteringCoefficient","MeanDegreeConnectivity","MeanDeviation","MeanFilter","MeanGraphDistance","MeanNeighborDegree","MeanShift","MeanShiftFilter","MeanSquaredLossLayer","Median","MedianDeviation","MedianFilter","MedicalTestData","Medium","MeijerG","MeijerGReduce","MeixnerDistribution","MellinConvolve","MellinTransform","MemberQ","MemoryAvailable","MemoryConstrained","MemoryConstraint","MemoryInUse","MengerMesh","Menu","MenuAppearance","MenuCommandKey","MenuEvaluator","MenuItem","MenuList","MenuPacket","MenuSortingValue","MenuStyle","MenuView","Merge","MergeDifferences","MergingFunction","MersennePrimeExponent","MersennePrimeExponentQ","Mesh","MeshCellCentroid","MeshCellCount","MeshCellHighlight","MeshCellIndex","MeshCellLabel","MeshCellMarker","MeshCellMeasure","MeshCellQuality","MeshCells","MeshCellShapeFunction","MeshCellStyle","MeshConnectivityGraph","MeshCoordinates","MeshFunctions","MeshPrimitives","MeshQualityGoal","MeshRange","MeshRefinementFunction","MeshRegion","MeshRegionQ","MeshShading","MeshStyle","Message","MessageDialog","MessageList","MessageName","MessageObject","MessageOptions","MessagePacket","Messages","MessagesNotebook","MetaCharacters","MetaInformation","MeteorShowerData","Method","MethodOptions","MexicanHatWavelet","MeyerWavelet","Midpoint","Min","MinColorDistance","MinDate","MinDetect","MineralData","MinFilter","MinimalBy","MinimalPolynomial","MinimalStateSpaceModel","Minimize","MinimumTimeIncrement","MinIntervalSize","MinkowskiQuestionMark","MinLimit","MinMax","MinorPlanetData","Minors","MinRecursion","MinSize","MinStableDistribution","Minus","MinusPlus","MinValue","Missing","MissingBehavior","MissingDataMethod","MissingDataRules","MissingQ","MissingString","MissingStyle","MissingValuePattern","MittagLefflerE","MixedFractionParts","MixedGraphQ","MixedMagnitude","MixedRadix","MixedRadixQuantity","MixedUnit","MixtureDistribution","Mod","Modal","Mode","Modular","ModularInverse","ModularLambda","Module","Modulus","MoebiusMu","Molecule","MoleculeContainsQ","MoleculeEquivalentQ","MoleculeGraph","MoleculeModify","MoleculePattern","MoleculePlot","MoleculePlot3D","MoleculeProperty","MoleculeQ","MoleculeRecognize","MoleculeValue","Moment","Momentary","MomentConvert","MomentEvaluate","MomentGeneratingFunction","MomentOfInertia","Monday","Monitor","MonomialList","MonomialOrder","MonsterGroupM","MoonPhase","MoonPosition","MorletWavelet","MorphologicalBinarize","MorphologicalBranchPoints","MorphologicalComponents","MorphologicalEulerNumber","MorphologicalGraph","MorphologicalPerimeter","MorphologicalTransform","MortalityData","Most","MountainData","MouseAnnotation","MouseAppearance","MouseAppearanceTag","MouseButtons","Mouseover","MousePointerNote","MousePosition","MovieData","MovingAverage","MovingMap","MovingMedian","MoyalDistribution","Multicolumn","MultiedgeStyle","MultigraphQ","MultilaunchWarning","MultiLetterItalics","MultiLetterStyle","MultilineFunction","Multinomial","MultinomialDistribution","MultinormalDistribution","MultiplicativeOrder","Multiplicity","MultiplySides","Multiselection","MultivariateHypergeometricDistribution","MultivariatePoissonDistribution","MultivariateTDistribution","N","NakagamiDistribution","NameQ","Names","NamespaceBox","NamespaceBoxOptions","Nand","NArgMax","NArgMin","NBernoulliB","NBodySimulation","NBodySimulationData","NCache","NDEigensystem","NDEigenvalues","NDSolve","NDSolveValue","Nearest","NearestFunction","NearestMeshCells","NearestNeighborGraph","NearestTo","NebulaData","NeedCurrentFrontEndPackagePacket","NeedCurrentFrontEndSymbolsPacket","NeedlemanWunschSimilarity","Needs","Negative","NegativeBinomialDistribution","NegativeDefiniteMatrixQ","NegativeIntegers","NegativeMultinomialDistribution","NegativeRationals","NegativeReals","NegativeSemidefiniteMatrixQ","NeighborhoodData","NeighborhoodGraph","Nest","NestedGreaterGreater","NestedLessLess","NestedScriptRules","NestGraph","NestList","NestWhile","NestWhileList","NetAppend","NetBidirectionalOperator","NetChain","NetDecoder","NetDelete","NetDrop","NetEncoder","NetEvaluationMode","NetExtract","NetFlatten","NetFoldOperator","NetGANOperator","NetGraph","NetInformation","NetInitialize","NetInsert","NetInsertSharedArrays","NetJoin","NetMapOperator","NetMapThreadOperator","NetMeasurements","NetModel","NetNestOperator","NetPairEmbeddingOperator","NetPort","NetPortGradient","NetPrepend","NetRename","NetReplace","NetReplacePart","NetSharedArray","NetStateObject","NetTake","NetTrain","NetTrainResultsObject","NetworkPacketCapture","NetworkPacketRecording","NetworkPacketRecordingDuring","NetworkPacketTrace","NeumannValue","NevilleThetaC","NevilleThetaD","NevilleThetaN","NevilleThetaS","NewPrimitiveStyle","NExpectation","Next","NextCell","NextDate","NextPrime","NextScheduledTaskTime","NHoldAll","NHoldFirst","NHoldRest","NicholsGridLines","NicholsPlot","NightHemisphere","NIntegrate","NMaximize","NMaxValue","NMinimize","NMinValue","NominalVariables","NonAssociative","NoncentralBetaDistribution","NoncentralChiSquareDistribution","NoncentralFRatioDistribution","NoncentralStudentTDistribution","NonCommutativeMultiply","NonConstants","NondimensionalizationTransform","None","NoneTrue","NonlinearModelFit","NonlinearStateSpaceModel","NonlocalMeansFilter","NonNegative","NonNegativeIntegers","NonNegativeRationals","NonNegativeReals","NonPositive","NonPositiveIntegers","NonPositiveRationals","NonPositiveReals","Nor","NorlundB","Norm","Normal","NormalDistribution","NormalGrouping","NormalizationLayer","Normalize","Normalized","NormalizedSquaredEuclideanDistance","NormalMatrixQ","NormalsFunction","NormFunction","Not","NotCongruent","NotCupCap","NotDoubleVerticalBar","Notebook","NotebookApply","NotebookAutoSave","NotebookClose","NotebookConvertSettings","NotebookCreate","NotebookCreateReturnObject","NotebookDefault","NotebookDelete","NotebookDirectory","NotebookDynamicExpression","NotebookEvaluate","NotebookEventActions","NotebookFileName","NotebookFind","NotebookFindReturnObject","NotebookGet","NotebookGetLayoutInformationPacket","NotebookGetMisspellingsPacket","NotebookImport","NotebookInformation","NotebookInterfaceObject","NotebookLocate","NotebookObject","NotebookOpen","NotebookOpenReturnObject","NotebookPath","NotebookPrint","NotebookPut","NotebookPutReturnObject","NotebookRead","NotebookResetGeneratedCells","Notebooks","NotebookSave","NotebookSaveAs","NotebookSelection","NotebookSetupLayoutInformationPacket","NotebooksMenu","NotebookTemplate","NotebookWrite","NotElement","NotEqualTilde","NotExists","NotGreater","NotGreaterEqual","NotGreaterFullEqual","NotGreaterGreater","NotGreaterLess","NotGreaterSlantEqual","NotGreaterTilde","Nothing","NotHumpDownHump","NotHumpEqual","NotificationFunction","NotLeftTriangle","NotLeftTriangleBar","NotLeftTriangleEqual","NotLess","NotLessEqual","NotLessFullEqual","NotLessGreater","NotLessLess","NotLessSlantEqual","NotLessTilde","NotNestedGreaterGreater","NotNestedLessLess","NotPrecedes","NotPrecedesEqual","NotPrecedesSlantEqual","NotPrecedesTilde","NotReverseElement","NotRightTriangle","NotRightTriangleBar","NotRightTriangleEqual","NotSquareSubset","NotSquareSubsetEqual","NotSquareSuperset","NotSquareSupersetEqual","NotSubset","NotSubsetEqual","NotSucceeds","NotSucceedsEqual","NotSucceedsSlantEqual","NotSucceedsTilde","NotSuperset","NotSupersetEqual","NotTilde","NotTildeEqual","NotTildeFullEqual","NotTildeTilde","NotVerticalBar","Now","NoWhitespace","NProbability","NProduct","NProductFactors","NRoots","NSolve","NSum","NSumTerms","NuclearExplosionData","NuclearReactorData","Null","NullRecords","NullSpace","NullWords","Number","NumberCompose","NumberDecompose","NumberExpand","NumberFieldClassNumber","NumberFieldDiscriminant","NumberFieldFundamentalUnits","NumberFieldIntegralBasis","NumberFieldNormRepresentatives","NumberFieldRegulator","NumberFieldRootsOfUnity","NumberFieldSignature","NumberForm","NumberFormat","NumberLinePlot","NumberMarks","NumberMultiplier","NumberPadding","NumberPoint","NumberQ","NumberSeparator","NumberSigns","NumberString","Numerator","NumeratorDenominator","NumericalOrder","NumericalSort","NumericArray","NumericArrayQ","NumericArrayType","NumericFunction","NumericQ","NuttallWindow","NValues","NyquistGridLines","NyquistPlot","O","ObservabilityGramian","ObservabilityMatrix","ObservableDecomposition","ObservableModelQ","OceanData","Octahedron","OddQ","Off","Offset","OLEData","On","ONanGroupON","Once","OneIdentity","Opacity","OpacityFunction","OpacityFunctionScaling","Open","OpenAppend","Opener","OpenerBox","OpenerBoxOptions","OpenerView","OpenFunctionInspectorPacket","Opening","OpenRead","OpenSpecialOptions","OpenTemporary","OpenWrite","Operate","OperatingSystem","OperatorApplied","OptimumFlowData","Optional","OptionalElement","OptionInspectorSettings","OptionQ","Options","OptionsPacket","OptionsPattern","OptionValue","OptionValueBox","OptionValueBoxOptions","Or","Orange","Order","OrderDistribution","OrderedQ","Ordering","OrderingBy","OrderingLayer","Orderless","OrderlessPatternSequence","OrnsteinUhlenbeckProcess","Orthogonalize","OrthogonalMatrixQ","Out","Outer","OuterPolygon","OuterPolyhedron","OutputAutoOverwrite","OutputControllabilityMatrix","OutputControllableModelQ","OutputForm","OutputFormData","OutputGrouping","OutputMathEditExpression","OutputNamePacket","OutputResponse","OutputSizeLimit","OutputStream","Over","OverBar","OverDot","Overflow","OverHat","Overlaps","Overlay","OverlayBox","OverlayBoxOptions","Overscript","OverscriptBox","OverscriptBoxOptions","OverTilde","OverVector","OverwriteTarget","OwenT","OwnValues","Package","PackingMethod","PackPaclet","PacletDataRebuild","PacletDirectoryAdd","PacletDirectoryLoad","PacletDirectoryRemove","PacletDirectoryUnload","PacletDisable","PacletEnable","PacletFind","PacletFindRemote","PacletInformation","PacletInstall","PacletInstallSubmit","PacletNewerQ","PacletObject","PacletObjectQ","PacletSite","PacletSiteObject","PacletSiteRegister","PacletSites","PacletSiteUnregister","PacletSiteUpdate","PacletUninstall","PacletUpdate","PaddedForm","Padding","PaddingLayer","PaddingSize","PadeApproximant","PadLeft","PadRight","PageBreakAbove","PageBreakBelow","PageBreakWithin","PageFooterLines","PageFooters","PageHeaderLines","PageHeaders","PageHeight","PageRankCentrality","PageTheme","PageWidth","Pagination","PairedBarChart","PairedHistogram","PairedSmoothHistogram","PairedTTest","PairedZTest","PaletteNotebook","PalettePath","PalindromeQ","Pane","PaneBox","PaneBoxOptions","Panel","PanelBox","PanelBoxOptions","Paneled","PaneSelector","PaneSelectorBox","PaneSelectorBoxOptions","PaperWidth","ParabolicCylinderD","ParagraphIndent","ParagraphSpacing","ParallelArray","ParallelCombine","ParallelDo","Parallelepiped","ParallelEvaluate","Parallelization","Parallelize","ParallelMap","ParallelNeeds","Parallelogram","ParallelProduct","ParallelSubmit","ParallelSum","ParallelTable","ParallelTry","Parameter","ParameterEstimator","ParameterMixtureDistribution","ParameterVariables","ParametricFunction","ParametricNDSolve","ParametricNDSolveValue","ParametricPlot","ParametricPlot3D","ParametricRampLayer","ParametricRegion","ParentBox","ParentCell","ParentConnect","ParentDirectory","ParentForm","Parenthesize","ParentList","ParentNotebook","ParetoDistribution","ParetoPickandsDistribution","ParkData","Part","PartBehavior","PartialCorrelationFunction","PartialD","ParticleAcceleratorData","ParticleData","Partition","PartitionGranularity","PartitionsP","PartitionsQ","PartLayer","PartOfSpeech","PartProtection","ParzenWindow","PascalDistribution","PassEventsDown","PassEventsUp","Paste","PasteAutoQuoteCharacters","PasteBoxFormInlineCells","PasteButton","Path","PathGraph","PathGraphQ","Pattern","PatternFilling","PatternSequence","PatternTest","PauliMatrix","PaulWavelet","Pause","PausedTime","PDF","PeakDetect","PeanoCurve","PearsonChiSquareTest","PearsonCorrelationTest","PearsonDistribution","PercentForm","PerfectNumber","PerfectNumberQ","PerformanceGoal","Perimeter","PeriodicBoundaryCondition","PeriodicInterpolation","Periodogram","PeriodogramArray","Permanent","Permissions","PermissionsGroup","PermissionsGroupMemberQ","PermissionsGroups","PermissionsKey","PermissionsKeys","PermutationCycles","PermutationCyclesQ","PermutationGroup","PermutationLength","PermutationList","PermutationListQ","PermutationMax","PermutationMin","PermutationOrder","PermutationPower","PermutationProduct","PermutationReplace","Permutations","PermutationSupport","Permute","PeronaMalikFilter","Perpendicular","PerpendicularBisector","PersistenceLocation","PersistenceTime","PersistentObject","PersistentObjects","PersistentValue","PersonData","PERTDistribution","PetersenGraph","PhaseMargins","PhaseRange","PhysicalSystemData","Pi","Pick","PIDData","PIDDerivativeFilter","PIDFeedforward","PIDTune","Piecewise","PiecewiseExpand","PieChart","PieChart3D","PillaiTrace","PillaiTraceTest","PingTime","Pink","PitchRecognize","Pivoting","PixelConstrained","PixelValue","PixelValuePositions","Placed","Placeholder","PlaceholderReplace","Plain","PlanarAngle","PlanarGraph","PlanarGraphQ","PlanckRadiationLaw","PlaneCurveData","PlanetaryMoonData","PlanetData","PlantData","Play","PlayRange","Plot","Plot3D","Plot3Matrix","PlotDivision","PlotJoined","PlotLabel","PlotLabels","PlotLayout","PlotLegends","PlotMarkers","PlotPoints","PlotRange","PlotRangeClipping","PlotRangeClipPlanesStyle","PlotRangePadding","PlotRegion","PlotStyle","PlotTheme","Pluralize","Plus","PlusMinus","Pochhammer","PodStates","PodWidth","Point","Point3DBox","Point3DBoxOptions","PointBox","PointBoxOptions","PointFigureChart","PointLegend","PointSize","PoissonConsulDistribution","PoissonDistribution","PoissonProcess","PoissonWindow","PolarAxes","PolarAxesOrigin","PolarGridLines","PolarPlot","PolarTicks","PoleZeroMarkers","PolyaAeppliDistribution","PolyGamma","Polygon","Polygon3DBox","Polygon3DBoxOptions","PolygonalNumber","PolygonAngle","PolygonBox","PolygonBoxOptions","PolygonCoordinates","PolygonDecomposition","PolygonHoleScale","PolygonIntersections","PolygonScale","Polyhedron","PolyhedronAngle","PolyhedronCoordinates","PolyhedronData","PolyhedronDecomposition","PolyhedronGenus","PolyLog","PolynomialExtendedGCD","PolynomialForm","PolynomialGCD","PolynomialLCM","PolynomialMod","PolynomialQ","PolynomialQuotient","PolynomialQuotientRemainder","PolynomialReduce","PolynomialRemainder","Polynomials","PoolingLayer","PopupMenu","PopupMenuBox","PopupMenuBoxOptions","PopupView","PopupWindow","Position","PositionIndex","Positive","PositiveDefiniteMatrixQ","PositiveIntegers","PositiveRationals","PositiveReals","PositiveSemidefiniteMatrixQ","PossibleZeroQ","Postfix","PostScript","Power","PowerDistribution","PowerExpand","PowerMod","PowerModList","PowerRange","PowerSpectralDensity","PowersRepresentations","PowerSymmetricPolynomial","Precedence","PrecedenceForm","Precedes","PrecedesEqual","PrecedesSlantEqual","PrecedesTilde","Precision","PrecisionGoal","PreDecrement","Predict","PredictionRoot","PredictorFunction","PredictorInformation","PredictorMeasurements","PredictorMeasurementsObject","PreemptProtect","PreferencesPath","Prefix","PreIncrement","Prepend","PrependLayer","PrependTo","PreprocessingRules","PreserveColor","PreserveImageOptions","Previous","PreviousCell","PreviousDate","PriceGraphDistribution","PrimaryPlaceholder","Prime","PrimeNu","PrimeOmega","PrimePi","PrimePowerQ","PrimeQ","Primes","PrimeZetaP","PrimitivePolynomialQ","PrimitiveRoot","PrimitiveRootList","PrincipalComponents","PrincipalValue","Print","PrintableASCIIQ","PrintAction","PrintForm","PrintingCopies","PrintingOptions","PrintingPageRange","PrintingStartingPageNumber","PrintingStyleEnvironment","Printout3D","Printout3DPreviewer","PrintPrecision","PrintTemporary","Prism","PrismBox","PrismBoxOptions","PrivateCellOptions","PrivateEvaluationOptions","PrivateFontOptions","PrivateFrontEndOptions","PrivateKey","PrivateNotebookOptions","PrivatePaths","Probability","ProbabilityDistribution","ProbabilityPlot","ProbabilityPr","ProbabilityScalePlot","ProbitModelFit","ProcessConnection","ProcessDirectory","ProcessEnvironment","Processes","ProcessEstimator","ProcessInformation","ProcessObject","ProcessParameterAssumptions","ProcessParameterQ","ProcessStateDomain","ProcessStatus","ProcessTimeDomain","Product","ProductDistribution","ProductLog","ProgressIndicator","ProgressIndicatorBox","ProgressIndicatorBoxOptions","Projection","Prolog","PromptForm","ProofObject","Properties","Property","PropertyList","PropertyValue","Proportion","Proportional","Protect","Protected","ProteinData","Pruning","PseudoInverse","PsychrometricPropertyData","PublicKey","PublisherID","PulsarData","PunctuationCharacter","Purple","Put","PutAppend","Pyramid","PyramidBox","PyramidBoxOptions","QBinomial","QFactorial","QGamma","QHypergeometricPFQ","QnDispersion","QPochhammer","QPolyGamma","QRDecomposition","QuadraticIrrationalQ","QuadraticOptimization","Quantile","QuantilePlot","Quantity","QuantityArray","QuantityDistribution","QuantityForm","QuantityMagnitude","QuantityQ","QuantityUnit","QuantityVariable","QuantityVariableCanonicalUnit","QuantityVariableDimensions","QuantityVariableIdentifier","QuantityVariablePhysicalQuantity","Quartics","QuartileDeviation","Quartiles","QuartileSkewness","Query","QueueingNetworkProcess","QueueingProcess","QueueProperties","Quiet","Quit","Quotient","QuotientRemainder","RadialGradientImage","RadialityCentrality","RadicalBox","RadicalBoxOptions","RadioButton","RadioButtonBar","RadioButtonBox","RadioButtonBoxOptions","Radon","RadonTransform","RamanujanTau","RamanujanTauL","RamanujanTauTheta","RamanujanTauZ","Ramp","Random","RandomChoice","RandomColor","RandomComplex","RandomEntity","RandomFunction","RandomGeoPosition","RandomGraph","RandomImage","RandomInstance","RandomInteger","RandomPermutation","RandomPoint","RandomPolygon","RandomPolyhedron","RandomPrime","RandomReal","RandomSample","RandomSeed","RandomSeeding","RandomVariate","RandomWalkProcess","RandomWord","Range","RangeFilter","RangeSpecification","RankedMax","RankedMin","RarerProbability","Raster","Raster3D","Raster3DBox","Raster3DBoxOptions","RasterArray","RasterBox","RasterBoxOptions","Rasterize","RasterSize","Rational","RationalFunctions","Rationalize","Rationals","Ratios","RawArray","RawBoxes","RawData","RawMedium","RayleighDistribution","Re","Read","ReadByteArray","ReadLine","ReadList","ReadProtected","ReadString","Real","RealAbs","RealBlockDiagonalForm","RealDigits","RealExponent","Reals","RealSign","Reap","RebuildPacletData","RecognitionPrior","RecognitionThreshold","Record","RecordLists","RecordSeparators","Rectangle","RectangleBox","RectangleBoxOptions","RectangleChart","RectangleChart3D","RectangularRepeatingElement","RecurrenceFilter","RecurrenceTable","RecurringDigitsForm","Red","Reduce","RefBox","ReferenceLineStyle","ReferenceMarkers","ReferenceMarkerStyle","Refine","ReflectionMatrix","ReflectionTransform","Refresh","RefreshRate","Region","RegionBinarize","RegionBoundary","RegionBoundaryStyle","RegionBounds","RegionCentroid","RegionDifference","RegionDimension","RegionDisjoint","RegionDistance","RegionDistanceFunction","RegionEmbeddingDimension","RegionEqual","RegionFillingStyle","RegionFunction","RegionImage","RegionIntersection","RegionMeasure","RegionMember","RegionMemberFunction","RegionMoment","RegionNearest","RegionNearestFunction","RegionPlot","RegionPlot3D","RegionProduct","RegionQ","RegionResize","RegionSize","RegionSymmetricDifference","RegionUnion","RegionWithin","RegisterExternalEvaluator","RegularExpression","Regularization","RegularlySampledQ","RegularPolygon","ReIm","ReImLabels","ReImPlot","ReImStyle","Reinstall","RelationalDatabase","RelationGraph","Release","ReleaseHold","ReliabilityDistribution","ReliefImage","ReliefPlot","RemoteAuthorizationCaching","RemoteConnect","RemoteConnectionObject","RemoteFile","RemoteRun","RemoteRunProcess","Remove","RemoveAlphaChannel","RemoveAsynchronousTask","RemoveAudioStream","RemoveBackground","RemoveChannelListener","RemoveChannelSubscribers","Removed","RemoveDiacritics","RemoveInputStreamMethod","RemoveOutputStreamMethod","RemoveProperty","RemoveScheduledTask","RemoveUsers","RemoveVideoStream","RenameDirectory","RenameFile","RenderAll","RenderingOptions","RenewalProcess","RenkoChart","RepairMesh","Repeated","RepeatedNull","RepeatedString","RepeatedTiming","RepeatingElement","Replace","ReplaceAll","ReplaceHeldPart","ReplaceImageValue","ReplaceList","ReplacePart","ReplacePixelValue","ReplaceRepeated","ReplicateLayer","RequiredPhysicalQuantities","Resampling","ResamplingAlgorithmData","ResamplingMethod","Rescale","RescalingTransform","ResetDirectory","ResetMenusPacket","ResetScheduledTask","ReshapeLayer","Residue","ResizeLayer","Resolve","ResourceAcquire","ResourceData","ResourceFunction","ResourceObject","ResourceRegister","ResourceRemove","ResourceSearch","ResourceSubmissionObject","ResourceSubmit","ResourceSystemBase","ResourceSystemPath","ResourceUpdate","ResourceVersion","ResponseForm","Rest","RestartInterval","Restricted","Resultant","ResumePacket","Return","ReturnEntersInput","ReturnExpressionPacket","ReturnInputFormPacket","ReturnPacket","ReturnReceiptFunction","ReturnTextPacket","Reverse","ReverseApplied","ReverseBiorthogonalSplineWavelet","ReverseElement","ReverseEquilibrium","ReverseGraph","ReverseSort","ReverseSortBy","ReverseUpEquilibrium","RevolutionAxis","RevolutionPlot3D","RGBColor","RiccatiSolve","RiceDistribution","RidgeFilter","RiemannR","RiemannSiegelTheta","RiemannSiegelZ","RiemannXi","Riffle","Right","RightArrow","RightArrowBar","RightArrowLeftArrow","RightComposition","RightCosetRepresentative","RightDownTeeVector","RightDownVector","RightDownVectorBar","RightTee","RightTeeArrow","RightTeeVector","RightTriangle","RightTriangleBar","RightTriangleEqual","RightUpDownVector","RightUpTeeVector","RightUpVector","RightUpVectorBar","RightVector","RightVectorBar","RiskAchievementImportance","RiskReductionImportance","RogersTanimotoDissimilarity","RollPitchYawAngles","RollPitchYawMatrix","RomanNumeral","Root","RootApproximant","RootIntervals","RootLocusPlot","RootMeanSquare","RootOfUnityQ","RootReduce","Roots","RootSum","Rotate","RotateLabel","RotateLeft","RotateRight","RotationAction","RotationBox","RotationBoxOptions","RotationMatrix","RotationTransform","Round","RoundImplies","RoundingRadius","Row","RowAlignments","RowBackgrounds","RowBox","RowHeights","RowLines","RowMinHeight","RowReduce","RowsEqual","RowSpacings","RSolve","RSolveValue","RudinShapiro","RudvalisGroupRu","Rule","RuleCondition","RuleDelayed","RuleForm","RulePlot","RulerUnits","Run","RunProcess","RunScheduledTask","RunThrough","RuntimeAttributes","RuntimeOptions","RussellRaoDissimilarity","SameQ","SameTest","SameTestProperties","SampledEntityClass","SampleDepth","SampledSoundFunction","SampledSoundList","SampleRate","SamplingPeriod","SARIMAProcess","SARMAProcess","SASTriangle","SatelliteData","SatisfiabilityCount","SatisfiabilityInstances","SatisfiableQ","Saturday","Save","Saveable","SaveAutoDelete","SaveConnection","SaveDefinitions","SavitzkyGolayMatrix","SawtoothWave","Scale","Scaled","ScaleDivisions","ScaledMousePosition","ScaleOrigin","ScalePadding","ScaleRanges","ScaleRangeStyle","ScalingFunctions","ScalingMatrix","ScalingTransform","Scan","ScheduledTask","ScheduledTaskActiveQ","ScheduledTaskInformation","ScheduledTaskInformationData","ScheduledTaskObject","ScheduledTasks","SchurDecomposition","ScientificForm","ScientificNotationThreshold","ScorerGi","ScorerGiPrime","ScorerHi","ScorerHiPrime","ScreenRectangle","ScreenStyleEnvironment","ScriptBaselineShifts","ScriptForm","ScriptLevel","ScriptMinSize","ScriptRules","ScriptSizeMultipliers","Scrollbars","ScrollingOptions","ScrollPosition","SearchAdjustment","SearchIndexObject","SearchIndices","SearchQueryString","SearchResultObject","Sec","Sech","SechDistribution","SecondOrderConeOptimization","SectionGrouping","SectorChart","SectorChart3D","SectorOrigin","SectorSpacing","SecuredAuthenticationKey","SecuredAuthenticationKeys","SeedRandom","Select","Selectable","SelectComponents","SelectedCells","SelectedNotebook","SelectFirst","Selection","SelectionAnimate","SelectionCell","SelectionCellCreateCell","SelectionCellDefaultStyle","SelectionCellParentStyle","SelectionCreateCell","SelectionDebuggerTag","SelectionDuplicateCell","SelectionEvaluate","SelectionEvaluateCreateCell","SelectionMove","SelectionPlaceholder","SelectionSetStyle","SelectWithContents","SelfLoops","SelfLoopStyle","SemanticImport","SemanticImportString","SemanticInterpretation","SemialgebraicComponentInstances","SemidefiniteOptimization","SendMail","SendMessage","Sequence","SequenceAlignment","SequenceAttentionLayer","SequenceCases","SequenceCount","SequenceFold","SequenceFoldList","SequenceForm","SequenceHold","SequenceLastLayer","SequenceMostLayer","SequencePosition","SequencePredict","SequencePredictorFunction","SequenceReplace","SequenceRestLayer","SequenceReverseLayer","SequenceSplit","Series","SeriesCoefficient","SeriesData","SeriesTermGoal","ServiceConnect","ServiceDisconnect","ServiceExecute","ServiceObject","ServiceRequest","ServiceResponse","ServiceSubmit","SessionSubmit","SessionTime","Set","SetAccuracy","SetAlphaChannel","SetAttributes","Setbacks","SetBoxFormNamesPacket","SetCloudDirectory","SetCookies","SetDelayed","SetDirectory","SetEnvironment","SetEvaluationNotebook","SetFileDate","SetFileLoadingContext","SetNotebookStatusLine","SetOptions","SetOptionsPacket","SetPermissions","SetPrecision","SetProperty","SetSecuredAuthenticationKey","SetSelectedNotebook","SetSharedFunction","SetSharedVariable","SetSpeechParametersPacket","SetStreamPosition","SetSystemModel","SetSystemOptions","Setter","SetterBar","SetterBox","SetterBoxOptions","Setting","SetUsers","SetValue","Shading","Shallow","ShannonWavelet","ShapiroWilkTest","Share","SharingList","Sharpen","ShearingMatrix","ShearingTransform","ShellRegion","ShenCastanMatrix","ShiftedGompertzDistribution","ShiftRegisterSequence","Short","ShortDownArrow","Shortest","ShortestMatch","ShortestPathFunction","ShortLeftArrow","ShortRightArrow","ShortTimeFourier","ShortTimeFourierData","ShortUpArrow","Show","ShowAutoConvert","ShowAutoSpellCheck","ShowAutoStyles","ShowCellBracket","ShowCellLabel","ShowCellTags","ShowClosedCellArea","ShowCodeAssist","ShowContents","ShowControls","ShowCursorTracker","ShowGroupOpenCloseIcon","ShowGroupOpener","ShowInvisibleCharacters","ShowPageBreaks","ShowPredictiveInterface","ShowSelection","ShowShortBoxForm","ShowSpecialCharacters","ShowStringCharacters","ShowSyntaxStyles","ShrinkingDelay","ShrinkWrapBoundingBox","SiderealTime","SiegelTheta","SiegelTukeyTest","SierpinskiCurve","SierpinskiMesh","Sign","Signature","SignedRankTest","SignedRegionDistance","SignificanceLevel","SignPadding","SignTest","SimilarityRules","SimpleGraph","SimpleGraphQ","SimplePolygonQ","SimplePolyhedronQ","Simplex","Simplify","Sin","Sinc","SinghMaddalaDistribution","SingleEvaluation","SingleLetterItalics","SingleLetterStyle","SingularValueDecomposition","SingularValueList","SingularValuePlot","SingularValues","Sinh","SinhIntegral","SinIntegral","SixJSymbol","Skeleton","SkeletonTransform","SkellamDistribution","Skewness","SkewNormalDistribution","SkinStyle","Skip","SliceContourPlot3D","SliceDensityPlot3D","SliceDistribution","SliceVectorPlot3D","Slider","Slider2D","Slider2DBox","Slider2DBoxOptions","SliderBox","SliderBoxOptions","SlideView","Slot","SlotSequence","Small","SmallCircle","Smaller","SmithDecomposition","SmithDelayCompensator","SmithWatermanSimilarity","SmoothDensityHistogram","SmoothHistogram","SmoothHistogram3D","SmoothKernelDistribution","SnDispersion","Snippet","SnubPolyhedron","SocialMediaData","Socket","SocketConnect","SocketListen","SocketListener","SocketObject","SocketOpen","SocketReadMessage","SocketReadyQ","Sockets","SocketWaitAll","SocketWaitNext","SoftmaxLayer","SokalSneathDissimilarity","SolarEclipse","SolarSystemFeatureData","SolidAngle","SolidData","SolidRegionQ","Solve","SolveAlways","SolveDelayed","Sort","SortBy","SortedBy","SortedEntityClass","Sound","SoundAndGraphics","SoundNote","SoundVolume","SourceLink","Sow","Space","SpaceCurveData","SpaceForm","Spacer","Spacings","Span","SpanAdjustments","SpanCharacterRounding","SpanFromAbove","SpanFromBoth","SpanFromLeft","SpanLineThickness","SpanMaxSize","SpanMinSize","SpanningCharacters","SpanSymmetric","SparseArray","SpatialGraphDistribution","SpatialMedian","SpatialTransformationLayer","Speak","SpeakerMatchQ","SpeakTextPacket","SpearmanRankTest","SpearmanRho","SpeciesData","SpecificityGoal","SpectralLineData","Spectrogram","SpectrogramArray","Specularity","SpeechCases","SpeechInterpreter","SpeechRecognize","SpeechSynthesize","SpellingCorrection","SpellingCorrectionList","SpellingDictionaries","SpellingDictionariesPath","SpellingOptions","SpellingSuggestionsPacket","Sphere","SphereBox","SpherePoints","SphericalBesselJ","SphericalBesselY","SphericalHankelH1","SphericalHankelH2","SphericalHarmonicY","SphericalPlot3D","SphericalRegion","SphericalShell","SpheroidalEigenvalue","SpheroidalJoiningFactor","SpheroidalPS","SpheroidalPSPrime","SpheroidalQS","SpheroidalQSPrime","SpheroidalRadialFactor","SpheroidalS1","SpheroidalS1Prime","SpheroidalS2","SpheroidalS2Prime","Splice","SplicedDistribution","SplineClosed","SplineDegree","SplineKnots","SplineWeights","Split","SplitBy","SpokenString","Sqrt","SqrtBox","SqrtBoxOptions","Square","SquaredEuclideanDistance","SquareFreeQ","SquareIntersection","SquareMatrixQ","SquareRepeatingElement","SquaresR","SquareSubset","SquareSubsetEqual","SquareSuperset","SquareSupersetEqual","SquareUnion","SquareWave","SSSTriangle","StabilityMargins","StabilityMarginsStyle","StableDistribution","Stack","StackBegin","StackComplete","StackedDateListPlot","StackedListPlot","StackInhibit","StadiumShape","StandardAtmosphereData","StandardDeviation","StandardDeviationFilter","StandardForm","Standardize","Standardized","StandardOceanData","StandbyDistribution","Star","StarClusterData","StarData","StarGraph","StartAsynchronousTask","StartExternalSession","StartingStepSize","StartOfLine","StartOfString","StartProcess","StartScheduledTask","StartupSound","StartWebSession","StateDimensions","StateFeedbackGains","StateOutputEstimator","StateResponse","StateSpaceModel","StateSpaceRealization","StateSpaceTransform","StateTransformationLinearize","StationaryDistribution","StationaryWaveletPacketTransform","StationaryWaveletTransform","StatusArea","StatusCentrality","StepMonitor","StereochemistryElements","StieltjesGamma","StippleShading","StirlingS1","StirlingS2","StopAsynchronousTask","StoppingPowerData","StopScheduledTask","StrataVariables","StratonovichProcess","StreamColorFunction","StreamColorFunctionScaling","StreamDensityPlot","StreamMarkers","StreamPlot","StreamPoints","StreamPosition","Streams","StreamScale","StreamStyle","String","StringBreak","StringByteCount","StringCases","StringContainsQ","StringCount","StringDelete","StringDrop","StringEndsQ","StringExpression","StringExtract","StringForm","StringFormat","StringFreeQ","StringInsert","StringJoin","StringLength","StringMatchQ","StringPadLeft","StringPadRight","StringPart","StringPartition","StringPosition","StringQ","StringRepeat","StringReplace","StringReplaceList","StringReplacePart","StringReverse","StringRiffle","StringRotateLeft","StringRotateRight","StringSkeleton","StringSplit","StringStartsQ","StringTake","StringTemplate","StringToByteArray","StringToStream","StringTrim","StripBoxes","StripOnInput","StripWrapperBoxes","StrokeForm","StructuralImportance","StructuredArray","StructuredArrayHeadQ","StructuredSelection","StruveH","StruveL","Stub","StudentTDistribution","Style","StyleBox","StyleBoxAutoDelete","StyleData","StyleDefinitions","StyleForm","StyleHints","StyleKeyMapping","StyleMenuListing","StyleNameDialogSettings","StyleNames","StylePrint","StyleSheetPath","Subdivide","Subfactorial","Subgraph","SubMinus","SubPlus","SubresultantPolynomialRemainders","SubresultantPolynomials","Subresultants","Subscript","SubscriptBox","SubscriptBoxOptions","Subscripted","Subsequences","Subset","SubsetCases","SubsetCount","SubsetEqual","SubsetMap","SubsetPosition","SubsetQ","SubsetReplace","Subsets","SubStar","SubstitutionSystem","Subsuperscript","SubsuperscriptBox","SubsuperscriptBoxOptions","SubtitleEncoding","SubtitleTracks","Subtract","SubtractFrom","SubtractSides","SubValues","Succeeds","SucceedsEqual","SucceedsSlantEqual","SucceedsTilde","Success","SuchThat","Sum","SumConvergence","SummationLayer","Sunday","SunPosition","Sunrise","Sunset","SuperDagger","SuperMinus","SupernovaData","SuperPlus","Superscript","SuperscriptBox","SuperscriptBoxOptions","Superset","SupersetEqual","SuperStar","Surd","SurdForm","SurfaceAppearance","SurfaceArea","SurfaceColor","SurfaceData","SurfaceGraphics","SurvivalDistribution","SurvivalFunction","SurvivalModel","SurvivalModelFit","SuspendPacket","SuzukiDistribution","SuzukiGroupSuz","SwatchLegend","Switch","Symbol","SymbolName","SymletWavelet","Symmetric","SymmetricGroup","SymmetricKey","SymmetricMatrixQ","SymmetricPolynomial","SymmetricReduction","Symmetrize","SymmetrizedArray","SymmetrizedArrayRules","SymmetrizedDependentComponents","SymmetrizedIndependentComponents","SymmetrizedReplacePart","SynchronousInitialization","SynchronousUpdating","Synonyms","Syntax","SyntaxForm","SyntaxInformation","SyntaxLength","SyntaxPacket","SyntaxQ","SynthesizeMissingValues","SystemCredential","SystemCredentialData","SystemCredentialKey","SystemCredentialKeys","SystemCredentialStoreObject","SystemDialogInput","SystemException","SystemGet","SystemHelpPath","SystemInformation","SystemInformationData","SystemInstall","SystemModel","SystemModeler","SystemModelExamples","SystemModelLinearize","SystemModelParametricSimulate","SystemModelPlot","SystemModelProgressReporting","SystemModelReliability","SystemModels","SystemModelSimulate","SystemModelSimulateSensitivity","SystemModelSimulationData","SystemOpen","SystemOptions","SystemProcessData","SystemProcesses","SystemsConnectionsModel","SystemsModelDelay","SystemsModelDelayApproximate","SystemsModelDelete","SystemsModelDimensions","SystemsModelExtract","SystemsModelFeedbackConnect","SystemsModelLabels","SystemsModelLinearity","SystemsModelMerge","SystemsModelOrder","SystemsModelParallelConnect","SystemsModelSeriesConnect","SystemsModelStateFeedbackConnect","SystemsModelVectorRelativeOrders","SystemStub","SystemTest","Tab","TabFilling","Table","TableAlignments","TableDepth","TableDirections","TableForm","TableHeadings","TableSpacing","TableView","TableViewBox","TableViewBoxBackground","TableViewBoxItemSize","TableViewBoxOptions","TabSpacings","TabView","TabViewBox","TabViewBoxOptions","TagBox","TagBoxNote","TagBoxOptions","TaggingRules","TagSet","TagSetDelayed","TagStyle","TagUnset","Take","TakeDrop","TakeLargest","TakeLargestBy","TakeList","TakeSmallest","TakeSmallestBy","TakeWhile","Tally","Tan","Tanh","TargetDevice","TargetFunctions","TargetSystem","TargetUnits","TaskAbort","TaskExecute","TaskObject","TaskRemove","TaskResume","Tasks","TaskSuspend","TaskWait","TautologyQ","TelegraphProcess","TemplateApply","TemplateArgBox","TemplateBox","TemplateBoxOptions","TemplateEvaluate","TemplateExpression","TemplateIf","TemplateObject","TemplateSequence","TemplateSlot","TemplateSlotSequence","TemplateUnevaluated","TemplateVerbatim","TemplateWith","TemporalData","TemporalRegularity","Temporary","TemporaryVariable","TensorContract","TensorDimensions","TensorExpand","TensorProduct","TensorQ","TensorRank","TensorReduce","TensorSymmetry","TensorTranspose","TensorWedge","TestID","TestReport","TestReportObject","TestResultObject","Tetrahedron","TetrahedronBox","TetrahedronBoxOptions","TeXForm","TeXSave","Text","Text3DBox","Text3DBoxOptions","TextAlignment","TextBand","TextBoundingBox","TextBox","TextCases","TextCell","TextClipboardType","TextContents","TextData","TextElement","TextForm","TextGrid","TextJustification","TextLine","TextPacket","TextParagraph","TextPosition","TextRecognize","TextSearch","TextSearchReport","TextSentences","TextString","TextStructure","TextStyle","TextTranslation","Texture","TextureCoordinateFunction","TextureCoordinateScaling","TextWords","Therefore","ThermodynamicData","ThermometerGauge","Thick","Thickness","Thin","Thinning","ThisLink","ThompsonGroupTh","Thread","ThreadingLayer","ThreeJSymbol","Threshold","Through","Throw","ThueMorse","Thumbnail","Thursday","Ticks","TicksStyle","TideData","Tilde","TildeEqual","TildeFullEqual","TildeTilde","TimeConstrained","TimeConstraint","TimeDirection","TimeFormat","TimeGoal","TimelinePlot","TimeObject","TimeObjectQ","TimeRemaining","Times","TimesBy","TimeSeries","TimeSeriesAggregate","TimeSeriesForecast","TimeSeriesInsert","TimeSeriesInvertibility","TimeSeriesMap","TimeSeriesMapThread","TimeSeriesModel","TimeSeriesModelFit","TimeSeriesResample","TimeSeriesRescale","TimeSeriesShift","TimeSeriesThread","TimeSeriesWindow","TimeUsed","TimeValue","TimeWarpingCorrespondence","TimeWarpingDistance","TimeZone","TimeZoneConvert","TimeZoneOffset","Timing","Tiny","TitleGrouping","TitsGroupT","ToBoxes","ToCharacterCode","ToColor","ToContinuousTimeModel","ToDate","Today","ToDiscreteTimeModel","ToEntity","ToeplitzMatrix","ToExpression","ToFileName","Together","Toggle","ToggleFalse","Toggler","TogglerBar","TogglerBox","TogglerBoxOptions","ToHeldExpression","ToInvertibleTimeSeries","TokenWords","Tolerance","ToLowerCase","Tomorrow","ToNumberField","TooBig","Tooltip","TooltipBox","TooltipBoxOptions","TooltipDelay","TooltipStyle","ToonShading","Top","TopHatTransform","ToPolarCoordinates","TopologicalSort","ToRadicals","ToRules","ToSphericalCoordinates","ToString","Total","TotalHeight","TotalLayer","TotalVariationFilter","TotalWidth","TouchPosition","TouchscreenAutoZoom","TouchscreenControlPlacement","ToUpperCase","Tr","Trace","TraceAbove","TraceAction","TraceBackward","TraceDepth","TraceDialog","TraceForward","TraceInternal","TraceLevel","TraceOff","TraceOn","TraceOriginal","TracePrint","TraceScan","TrackedSymbols","TrackingFunction","TracyWidomDistribution","TradingChart","TraditionalForm","TraditionalFunctionNotation","TraditionalNotation","TraditionalOrder","TrainingProgressCheckpointing","TrainingProgressFunction","TrainingProgressMeasurements","TrainingProgressReporting","TrainingStoppingCriterion","TrainingUpdateSchedule","TransferFunctionCancel","TransferFunctionExpand","TransferFunctionFactor","TransferFunctionModel","TransferFunctionPoles","TransferFunctionTransform","TransferFunctionZeros","TransformationClass","TransformationFunction","TransformationFunctions","TransformationMatrix","TransformedDistribution","TransformedField","TransformedProcess","TransformedRegion","TransitionDirection","TransitionDuration","TransitionEffect","TransitiveClosureGraph","TransitiveReductionGraph","Translate","TranslationOptions","TranslationTransform","Transliterate","Transparent","TransparentColor","Transpose","TransposeLayer","TrapSelection","TravelDirections","TravelDirectionsData","TravelDistance","TravelDistanceList","TravelMethod","TravelTime","TreeForm","TreeGraph","TreeGraphQ","TreePlot","TrendStyle","Triangle","TriangleCenter","TriangleConstruct","TriangleMeasurement","TriangleWave","TriangularDistribution","TriangulateMesh","Trig","TrigExpand","TrigFactor","TrigFactorList","Trigger","TrigReduce","TrigToExp","TrimmedMean","TrimmedVariance","TropicalStormData","True","TrueQ","TruncatedDistribution","TruncatedPolyhedron","TsallisQExponentialDistribution","TsallisQGaussianDistribution","TTest","Tube","TubeBezierCurveBox","TubeBezierCurveBoxOptions","TubeBox","TubeBoxOptions","TubeBSplineCurveBox","TubeBSplineCurveBoxOptions","Tuesday","TukeyLambdaDistribution","TukeyWindow","TunnelData","Tuples","TuranGraph","TuringMachine","TuttePolynomial","TwoWayRule","Typed","TypeSpecifier","UnateQ","Uncompress","UnconstrainedParameters","Undefined","UnderBar","Underflow","Underlined","Underoverscript","UnderoverscriptBox","UnderoverscriptBoxOptions","Underscript","UnderscriptBox","UnderscriptBoxOptions","UnderseaFeatureData","UndirectedEdge","UndirectedGraph","UndirectedGraphQ","UndoOptions","UndoTrackedVariables","Unequal","UnequalTo","Unevaluated","UniformDistribution","UniformGraphDistribution","UniformPolyhedron","UniformSumDistribution","Uninstall","Union","UnionedEntityClass","UnionPlus","Unique","UnitaryMatrixQ","UnitBox","UnitConvert","UnitDimensions","Unitize","UnitRootTest","UnitSimplify","UnitStep","UnitSystem","UnitTriangle","UnitVector","UnitVectorLayer","UnityDimensions","UniverseModelData","UniversityData","UnixTime","Unprotect","UnregisterExternalEvaluator","UnsameQ","UnsavedVariables","Unset","UnsetShared","UntrackedVariables","Up","UpArrow","UpArrowBar","UpArrowDownArrow","Update","UpdateDynamicObjects","UpdateDynamicObjectsSynchronous","UpdateInterval","UpdatePacletSites","UpdateSearchIndex","UpDownArrow","UpEquilibrium","UpperCaseQ","UpperLeftArrow","UpperRightArrow","UpperTriangularize","UpperTriangularMatrixQ","Upsample","UpSet","UpSetDelayed","UpTee","UpTeeArrow","UpTo","UpValues","URL","URLBuild","URLDecode","URLDispatcher","URLDownload","URLDownloadSubmit","URLEncode","URLExecute","URLExpand","URLFetch","URLFetchAsynchronous","URLParse","URLQueryDecode","URLQueryEncode","URLRead","URLResponseTime","URLSave","URLSaveAsynchronous","URLShorten","URLSubmit","UseGraphicsRange","UserDefinedWavelet","Using","UsingFrontEnd","UtilityFunction","V2Get","ValenceErrorHandling","ValidationLength","ValidationSet","Value","ValueBox","ValueBoxOptions","ValueDimensions","ValueForm","ValuePreprocessingFunction","ValueQ","Values","ValuesData","Variables","Variance","VarianceEquivalenceTest","VarianceEstimatorFunction","VarianceGammaDistribution","VarianceTest","VectorAngle","VectorAround","VectorAspectRatio","VectorColorFunction","VectorColorFunctionScaling","VectorDensityPlot","VectorGlyphData","VectorGreater","VectorGreaterEqual","VectorLess","VectorLessEqual","VectorMarkers","VectorPlot","VectorPlot3D","VectorPoints","VectorQ","VectorRange","Vectors","VectorScale","VectorScaling","VectorSizes","VectorStyle","Vee","Verbatim","Verbose","VerboseConvertToPostScriptPacket","VerificationTest","VerifyConvergence","VerifyDerivedKey","VerifyDigitalSignature","VerifyFileSignature","VerifyInterpretation","VerifySecurityCertificates","VerifySolutions","VerifyTestAssumptions","Version","VersionedPreferences","VersionNumber","VertexAdd","VertexCapacity","VertexColors","VertexComponent","VertexConnectivity","VertexContract","VertexCoordinateRules","VertexCoordinates","VertexCorrelationSimilarity","VertexCosineSimilarity","VertexCount","VertexCoverQ","VertexDataCoordinates","VertexDegree","VertexDelete","VertexDiceSimilarity","VertexEccentricity","VertexInComponent","VertexInDegree","VertexIndex","VertexJaccardSimilarity","VertexLabeling","VertexLabels","VertexLabelStyle","VertexList","VertexNormals","VertexOutComponent","VertexOutDegree","VertexQ","VertexRenderingFunction","VertexReplace","VertexShape","VertexShapeFunction","VertexSize","VertexStyle","VertexTextureCoordinates","VertexWeight","VertexWeightedGraphQ","Vertical","VerticalBar","VerticalForm","VerticalGauge","VerticalSeparator","VerticalSlider","VerticalTilde","Video","VideoEncoding","VideoExtractFrames","VideoFrameList","VideoFrameMap","VideoPause","VideoPlay","VideoQ","VideoStop","VideoStream","VideoStreams","VideoTimeSeries","VideoTracks","VideoTrim","ViewAngle","ViewCenter","ViewMatrix","ViewPoint","ViewPointSelectorSettings","ViewPort","ViewProjection","ViewRange","ViewVector","ViewVertical","VirtualGroupData","Visible","VisibleCell","VoiceStyleData","VoigtDistribution","VolcanoData","Volume","VonMisesDistribution","VoronoiMesh","WaitAll","WaitAsynchronousTask","WaitNext","WaitUntil","WakebyDistribution","WalleniusHypergeometricDistribution","WaringYuleDistribution","WarpingCorrespondence","WarpingDistance","WatershedComponents","WatsonUSquareTest","WattsStrogatzGraphDistribution","WaveletBestBasis","WaveletFilterCoefficients","WaveletImagePlot","WaveletListPlot","WaveletMapIndexed","WaveletMatrixPlot","WaveletPhi","WaveletPsi","WaveletScale","WaveletScalogram","WaveletThreshold","WeaklyConnectedComponents","WeaklyConnectedGraphComponents","WeaklyConnectedGraphQ","WeakStationarity","WeatherData","WeatherForecastData","WebAudioSearch","WebElementObject","WeberE","WebExecute","WebImage","WebImageSearch","WebSearch","WebSessionObject","WebSessions","WebWindowObject","Wedge","Wednesday","WeibullDistribution","WeierstrassE1","WeierstrassE2","WeierstrassE3","WeierstrassEta1","WeierstrassEta2","WeierstrassEta3","WeierstrassHalfPeriods","WeierstrassHalfPeriodW1","WeierstrassHalfPeriodW2","WeierstrassHalfPeriodW3","WeierstrassInvariantG2","WeierstrassInvariantG3","WeierstrassInvariants","WeierstrassP","WeierstrassPPrime","WeierstrassSigma","WeierstrassZeta","WeightedAdjacencyGraph","WeightedAdjacencyMatrix","WeightedData","WeightedGraphQ","Weights","WelchWindow","WheelGraph","WhenEvent","Which","While","White","WhiteNoiseProcess","WhitePoint","Whitespace","WhitespaceCharacter","WhittakerM","WhittakerW","WienerFilter","WienerProcess","WignerD","WignerSemicircleDistribution","WikidataData","WikidataSearch","WikipediaData","WikipediaSearch","WilksW","WilksWTest","WindDirectionData","WindingCount","WindingPolygon","WindowClickSelect","WindowElements","WindowFloating","WindowFrame","WindowFrameElements","WindowMargins","WindowMovable","WindowOpacity","WindowPersistentStyles","WindowSelected","WindowSize","WindowStatusArea","WindowTitle","WindowToolbars","WindowWidth","WindSpeedData","WindVectorData","WinsorizedMean","WinsorizedVariance","WishartMatrixDistribution","With","WolframAlpha","WolframAlphaDate","WolframAlphaQuantity","WolframAlphaResult","WolframLanguageData","Word","WordBoundary","WordCharacter","WordCloud","WordCount","WordCounts","WordData","WordDefinition","WordFrequency","WordFrequencyData","WordList","WordOrientation","WordSearch","WordSelectionFunction","WordSeparators","WordSpacings","WordStem","WordTranslation","WorkingPrecision","WrapAround","Write","WriteLine","WriteString","Wronskian","XMLElement","XMLObject","XMLTemplate","Xnor","Xor","XYZColor","Yellow","Yesterday","YuleDissimilarity","ZernikeR","ZeroSymmetric","ZeroTest","ZeroWidthTimes","Zeta","ZetaZero","ZIPCodeData","ZipfDistribution","ZoomCenter","ZoomFactor","ZTest","ZTransform","$Aborted","$ActivationGroupID","$ActivationKey","$ActivationUserRegistered","$AddOnsDirectory","$AllowDataUpdates","$AllowExternalChannelFunctions","$AllowInternet","$AssertFunction","$Assumptions","$AsynchronousTask","$AudioDecoders","$AudioEncoders","$AudioInputDevices","$AudioOutputDevices","$BaseDirectory","$BasePacletsDirectory","$BatchInput","$BatchOutput","$BlockchainBase","$BoxForms","$ByteOrdering","$CacheBaseDirectory","$Canceled","$ChannelBase","$CharacterEncoding","$CharacterEncodings","$CloudAccountName","$CloudBase","$CloudConnected","$CloudConnection","$CloudCreditsAvailable","$CloudEvaluation","$CloudExpressionBase","$CloudObjectNameFormat","$CloudObjectURLType","$CloudRootDirectory","$CloudSymbolBase","$CloudUserID","$CloudUserUUID","$CloudVersion","$CloudVersionNumber","$CloudWolframEngineVersionNumber","$CommandLine","$CompilationTarget","$ConditionHold","$ConfiguredKernels","$Context","$ContextPath","$ControlActiveSetting","$Cookies","$CookieStore","$CreationDate","$CurrentLink","$CurrentTask","$CurrentWebSession","$DataStructures","$DateStringFormat","$DefaultAudioInputDevice","$DefaultAudioOutputDevice","$DefaultFont","$DefaultFrontEnd","$DefaultImagingDevice","$DefaultLocalBase","$DefaultMailbox","$DefaultNetworkInterface","$DefaultPath","$DefaultProxyRules","$DefaultSystemCredentialStore","$Display","$DisplayFunction","$DistributedContexts","$DynamicEvaluation","$Echo","$EmbedCodeEnvironments","$EmbeddableServices","$EntityStores","$Epilog","$EvaluationCloudBase","$EvaluationCloudObject","$EvaluationEnvironment","$ExportFormats","$ExternalIdentifierTypes","$ExternalStorageBase","$Failed","$FinancialDataSource","$FontFamilies","$FormatType","$FrontEnd","$FrontEndSession","$GeoEntityTypes","$GeoLocation","$GeoLocationCity","$GeoLocationCountry","$GeoLocationPrecision","$GeoLocationSource","$HistoryLength","$HomeDirectory","$HTMLExportRules","$HTTPCookies","$HTTPRequest","$IgnoreEOF","$ImageFormattingWidth","$ImageResolution","$ImagingDevice","$ImagingDevices","$ImportFormats","$IncomingMailSettings","$InitialDirectory","$Initialization","$InitializationContexts","$Input","$InputFileName","$InputStreamMethods","$Inspector","$InstallationDate","$InstallationDirectory","$InterfaceEnvironment","$InterpreterTypes","$IterationLimit","$KernelCount","$KernelID","$Language","$LaunchDirectory","$LibraryPath","$LicenseExpirationDate","$LicenseID","$LicenseProcesses","$LicenseServer","$LicenseSubprocesses","$LicenseType","$Line","$Linked","$LinkSupported","$LoadedFiles","$LocalBase","$LocalSymbolBase","$MachineAddresses","$MachineDomain","$MachineDomains","$MachineEpsilon","$MachineID","$MachineName","$MachinePrecision","$MachineType","$MaxExtraPrecision","$MaxLicenseProcesses","$MaxLicenseSubprocesses","$MaxMachineNumber","$MaxNumber","$MaxPiecewiseCases","$MaxPrecision","$MaxRootDegree","$MessageGroups","$MessageList","$MessagePrePrint","$Messages","$MinMachineNumber","$MinNumber","$MinorReleaseNumber","$MinPrecision","$MobilePhone","$ModuleNumber","$NetworkConnected","$NetworkInterfaces","$NetworkLicense","$NewMessage","$NewSymbol","$NotebookInlineStorageLimit","$Notebooks","$NoValue","$NumberMarks","$Off","$OperatingSystem","$Output","$OutputForms","$OutputSizeLimit","$OutputStreamMethods","$Packages","$ParentLink","$ParentProcessID","$PasswordFile","$PatchLevelID","$Path","$PathnameSeparator","$PerformanceGoal","$Permissions","$PermissionsGroupBase","$PersistenceBase","$PersistencePath","$PipeSupported","$PlotTheme","$Post","$Pre","$PreferencesDirectory","$PreInitialization","$PrePrint","$PreRead","$PrintForms","$PrintLiteral","$Printout3DPreviewer","$ProcessID","$ProcessorCount","$ProcessorType","$ProductInformation","$ProgramName","$PublisherID","$RandomState","$RecursionLimit","$RegisteredDeviceClasses","$RegisteredUserName","$ReleaseNumber","$RequesterAddress","$RequesterWolframID","$RequesterWolframUUID","$RootDirectory","$ScheduledTask","$ScriptCommandLine","$ScriptInputString","$SecuredAuthenticationKeyTokens","$ServiceCreditsAvailable","$Services","$SessionID","$SetParentLink","$SharedFunctions","$SharedVariables","$SoundDisplay","$SoundDisplayFunction","$SourceLink","$SSHAuthentication","$SubtitleDecoders","$SubtitleEncoders","$SummaryBoxDataSizeLimit","$SuppressInputFormHeads","$SynchronousEvaluation","$SyntaxHandler","$System","$SystemCharacterEncoding","$SystemCredentialStore","$SystemID","$SystemMemory","$SystemShell","$SystemTimeZone","$SystemWordLength","$TemplatePath","$TemporaryDirectory","$TemporaryPrefix","$TestFileName","$TextStyle","$TimedOut","$TimeUnit","$TimeZone","$TimeZoneEntity","$TopDirectory","$TraceOff","$TraceOn","$TracePattern","$TracePostAction","$TracePreAction","$UnitSystem","$Urgent","$UserAddOnsDirectory","$UserAgentLanguages","$UserAgentMachine","$UserAgentName","$UserAgentOperatingSystem","$UserAgentString","$UserAgentVersion","$UserBaseDirectory","$UserBasePacletsDirectory","$UserDocumentsDirectory","$Username","$UserName","$UserURLBase","$Version","$VersionNumber","$VideoDecoders","$VideoEncoders","$VoiceStyles","$WolframDocumentsDirectory","$WolframID","$WolframUUID"]
+;const e=["AASTriangle","AbelianGroup","Abort","AbortKernels","AbortProtect","AbortScheduledTask","Above","Abs","AbsArg","AbsArgPlot","Absolute","AbsoluteCorrelation","AbsoluteCorrelationFunction","AbsoluteCurrentValue","AbsoluteDashing","AbsoluteFileName","AbsoluteOptions","AbsolutePointSize","AbsoluteThickness","AbsoluteTime","AbsoluteTiming","AcceptanceThreshold","AccountingForm","Accumulate","Accuracy","AccuracyGoal","AcousticAbsorbingValue","AcousticImpedanceValue","AcousticNormalVelocityValue","AcousticPDEComponent","AcousticPressureCondition","AcousticRadiationValue","AcousticSoundHardValue","AcousticSoundSoftCondition","ActionDelay","ActionMenu","ActionMenuBox","ActionMenuBoxOptions","Activate","Active","ActiveClassification","ActiveClassificationObject","ActiveItem","ActivePrediction","ActivePredictionObject","ActiveStyle","AcyclicGraphQ","AddOnHelpPath","AddSides","AddTo","AddToSearchIndex","AddUsers","AdjacencyGraph","AdjacencyList","AdjacencyMatrix","AdjacentMeshCells","Adjugate","AdjustmentBox","AdjustmentBoxOptions","AdjustTimeSeriesForecast","AdministrativeDivisionData","AffineHalfSpace","AffineSpace","AffineStateSpaceModel","AffineTransform","After","AggregatedEntityClass","AggregationLayer","AircraftData","AirportData","AirPressureData","AirSoundAttenuation","AirTemperatureData","AiryAi","AiryAiPrime","AiryAiZero","AiryBi","AiryBiPrime","AiryBiZero","AlgebraicIntegerQ","AlgebraicNumber","AlgebraicNumberDenominator","AlgebraicNumberNorm","AlgebraicNumberPolynomial","AlgebraicNumberTrace","AlgebraicRules","AlgebraicRulesData","Algebraics","AlgebraicUnitQ","Alignment","AlignmentMarker","AlignmentPoint","All","AllowAdultContent","AllowChatServices","AllowedCloudExtraParameters","AllowedCloudParameterExtensions","AllowedDimensions","AllowedFrequencyRange","AllowedHeads","AllowGroupClose","AllowIncomplete","AllowInlineCells","AllowKernelInitialization","AllowLooseGrammar","AllowReverseGroupClose","AllowScriptLevelChange","AllowVersionUpdate","AllTrue","Alphabet","AlphabeticOrder","AlphabeticSort","AlphaChannel","AlternateImage","AlternatingFactorial","AlternatingGroup","AlternativeHypothesis","Alternatives","AltitudeMethod","AmbientLight","AmbiguityFunction","AmbiguityList","Analytic","AnatomyData","AnatomyForm","AnatomyPlot3D","AnatomySkinStyle","AnatomyStyling","AnchoredSearch","And","AndersonDarlingTest","AngerJ","AngleBisector","AngleBracket","AnglePath","AnglePath3D","AngleVector","AngularGauge","Animate","AnimatedImage","AnimationCycleOffset","AnimationCycleRepetitions","AnimationDirection","AnimationDisplayTime","AnimationRate","AnimationRepetitions","AnimationRunning","AnimationRunTime","AnimationTimeIndex","AnimationVideo","Animator","AnimatorBox","AnimatorBoxOptions","AnimatorElements","Annotate","Annotation","AnnotationDelete","AnnotationKeys","AnnotationRules","AnnotationValue","Annuity","AnnuityDue","Annulus","AnomalyDetection","AnomalyDetector","AnomalyDetectorFunction","Anonymous","Antialiasing","Antihermitian","AntihermitianMatrixQ","Antisymmetric","AntisymmetricMatrixQ","Antonyms","AnyOrder","AnySubset","AnyTrue","Apart","ApartSquareFree","APIFunction","Appearance","AppearanceElements","AppearanceRules","AppellF1","Append","AppendCheck","AppendLayer","AppendTo","Application","Apply","ApplyReaction","ApplySides","ApplyTo","ArcCos","ArcCosh","ArcCot","ArcCoth","ArcCsc","ArcCsch","ArcCurvature","ARCHProcess","ArcLength","ArcSec","ArcSech","ArcSin","ArcSinDistribution","ArcSinh","ArcTan","ArcTanh","Area","Arg","ArgMax","ArgMin","ArgumentCountQ","ArgumentsOptions","ARIMAProcess","ArithmeticGeometricMean","ARMAProcess","Around","AroundReplace","ARProcess","Array","ArrayComponents","ArrayDepth","ArrayFilter","ArrayFlatten","ArrayMesh","ArrayPad","ArrayPlot","ArrayPlot3D","ArrayQ","ArrayReduce","ArrayResample","ArrayReshape","ArrayRules","Arrays","Arrow","Arrow3DBox","ArrowBox","Arrowheads","ASATriangle","Ask","AskAppend","AskConfirm","AskDisplay","AskedQ","AskedValue","AskFunction","AskState","AskTemplateDisplay","AspectRatio","AspectRatioFixed","Assert","AssessmentFunction","AssessmentResultObject","AssociateTo","Association","AssociationFormat","AssociationMap","AssociationQ","AssociationThread","AssumeDeterministic","Assuming","Assumptions","AstroAngularSeparation","AstroBackground","AstroCenter","AstroDistance","AstroGraphics","AstroGridLines","AstroGridLinesStyle","AstronomicalData","AstroPosition","AstroProjection","AstroRange","AstroRangePadding","AstroReferenceFrame","AstroStyling","AstroZoomLevel","Asymptotic","AsymptoticDSolveValue","AsymptoticEqual","AsymptoticEquivalent","AsymptoticExpectation","AsymptoticGreater","AsymptoticGreaterEqual","AsymptoticIntegrate","AsymptoticLess","AsymptoticLessEqual","AsymptoticOutputTracker","AsymptoticProbability","AsymptoticProduct","AsymptoticRSolveValue","AsymptoticSolve","AsymptoticSum","Asynchronous","AsynchronousTaskObject","AsynchronousTasks","Atom","AtomCoordinates","AtomCount","AtomDiagramCoordinates","AtomLabels","AtomLabelStyle","AtomList","AtomQ","AttachCell","AttachedCell","AttentionLayer","Attributes","Audio","AudioAmplify","AudioAnnotate","AudioAnnotationLookup","AudioBlockMap","AudioCapture","AudioChannelAssignment","AudioChannelCombine","AudioChannelMix","AudioChannels","AudioChannelSeparate","AudioData","AudioDelay","AudioDelete","AudioDevice","AudioDistance","AudioEncoding","AudioFade","AudioFrequencyShift","AudioGenerator","AudioIdentify","AudioInputDevice","AudioInsert","AudioInstanceQ","AudioIntervals","AudioJoin","AudioLabel","AudioLength","AudioLocalMeasurements","AudioLooping","AudioLoudness","AudioMeasurements","AudioNormalize","AudioOutputDevice","AudioOverlay","AudioPad","AudioPan","AudioPartition","AudioPause","AudioPitchShift","AudioPlay","AudioPlot","AudioQ","AudioRecord","AudioReplace","AudioResample","AudioReverb","AudioReverse","AudioSampleRate","AudioSpectralMap","AudioSpectralTransformation","AudioSplit","AudioStop","AudioStream","AudioStreams","AudioTimeStretch","AudioTrackApply","AudioTrackSelection","AudioTrim","AudioType","AugmentedPolyhedron","AugmentedSymmetricPolynomial","Authenticate","Authentication","AuthenticationDialog","AutoAction","Autocomplete","AutocompletionFunction","AutoCopy","AutocorrelationTest","AutoDelete","AutoEvaluateEvents","AutoGeneratedPackage","AutoIndent","AutoIndentSpacings","AutoItalicWords","AutoloadPath","AutoMatch","Automatic","AutomaticImageSize","AutoMultiplicationSymbol","AutoNumberFormatting","AutoOpenNotebooks","AutoOpenPalettes","AutoOperatorRenderings","AutoQuoteCharacters","AutoRefreshed","AutoRemove","AutorunSequencing","AutoScaling","AutoScroll","AutoSpacing","AutoStyleOptions","AutoStyleWords","AutoSubmitting","Axes","AxesEdge","AxesLabel","AxesOrigin","AxesStyle","AxiomaticTheory","Axis","Axis3DBox","Axis3DBoxOptions","AxisBox","AxisBoxOptions","AxisLabel","AxisObject","AxisStyle","BabyMonsterGroupB","Back","BackFaceColor","BackFaceGlowColor","BackFaceOpacity","BackFaceSpecularColor","BackFaceSpecularExponent","BackFaceSurfaceAppearance","BackFaceTexture","Background","BackgroundAppearance","BackgroundTasksSettings","Backslash","Backsubstitution","Backward","Ball","Band","BandpassFilter","BandstopFilter","BarabasiAlbertGraphDistribution","BarChart","BarChart3D","BarcodeImage","BarcodeRecognize","BaringhausHenzeTest","BarLegend","BarlowProschanImportance","BarnesG","BarOrigin","BarSpacing","BartlettHannWindow","BartlettWindow","BaseDecode","BaseEncode","BaseForm","Baseline","BaselinePosition","BaseStyle","BasicRecurrentLayer","BatchNormalizationLayer","BatchSize","BatesDistribution","BattleLemarieWavelet","BayesianMaximization","BayesianMaximizationObject","BayesianMinimization","BayesianMinimizationObject","Because","BeckmannDistribution","Beep","Before","Begin","BeginDialogPacket","BeginPackage","BellB","BellY","Below","BenfordDistribution","BeniniDistribution","BenktanderGibratDistribution","BenktanderWeibullDistribution","BernoulliB","BernoulliDistribution","BernoulliGraphDistribution","BernoulliProcess","BernsteinBasis","BesagL","BesselFilterModel","BesselI","BesselJ","BesselJZero","BesselK","BesselY","BesselYZero","Beta","BetaBinomialDistribution","BetaDistribution","BetaNegativeBinomialDistribution","BetaPrimeDistribution","BetaRegularized","Between","BetweennessCentrality","Beveled","BeveledPolyhedron","BezierCurve","BezierCurve3DBox","BezierCurve3DBoxOptions","BezierCurveBox","BezierCurveBoxOptions","BezierFunction","BilateralFilter","BilateralLaplaceTransform","BilateralZTransform","Binarize","BinaryDeserialize","BinaryDistance","BinaryFormat","BinaryImageQ","BinaryRead","BinaryReadList","BinarySerialize","BinaryWrite","BinCounts","BinLists","BinnedVariogramList","Binomial","BinomialDistribution","BinomialPointProcess","BinomialProcess","BinormalDistribution","BiorthogonalSplineWavelet","BioSequence","BioSequenceBackTranslateList","BioSequenceComplement","BioSequenceInstances","BioSequenceModify","BioSequencePlot","BioSequenceQ","BioSequenceReverseComplement","BioSequenceTranscribe","BioSequenceTranslate","BipartiteGraphQ","BiquadraticFilterModel","BirnbaumImportance","BirnbaumSaundersDistribution","BitAnd","BitClear","BitGet","BitLength","BitNot","BitOr","BitRate","BitSet","BitShiftLeft","BitShiftRight","BitXor","BiweightLocation","BiweightMidvariance","Black","BlackmanHarrisWindow","BlackmanNuttallWindow","BlackmanWindow","Blank","BlankForm","BlankNullSequence","BlankSequence","Blend","Block","BlockchainAddressData","BlockchainBase","BlockchainBlockData","BlockchainContractValue","BlockchainData","BlockchainGet","BlockchainKeyEncode","BlockchainPut","BlockchainTokenData","BlockchainTransaction","BlockchainTransactionData","BlockchainTransactionSign","BlockchainTransactionSubmit","BlockDiagonalMatrix","BlockLowerTriangularMatrix","BlockMap","BlockRandom","BlockUpperTriangularMatrix","BlomqvistBeta","BlomqvistBetaTest","Blue","Blur","Blurring","BodePlot","BohmanWindow","Bold","Bond","BondCount","BondLabels","BondLabelStyle","BondList","BondQ","Bookmarks","Boole","BooleanConsecutiveFunction","BooleanConvert","BooleanCountingFunction","BooleanFunction","BooleanGraph","BooleanMaxterms","BooleanMinimize","BooleanMinterms","BooleanQ","BooleanRegion","Booleans","BooleanStrings","BooleanTable","BooleanVariables","BorderDimensions","BorelTannerDistribution","Bottom","BottomHatTransform","BoundaryDiscretizeGraphics","BoundaryDiscretizeRegion","BoundaryMesh","BoundaryMeshRegion","BoundaryMeshRegionQ","BoundaryStyle","BoundedRegionQ","BoundingRegion","Bounds","Box","BoxBaselineShift","BoxData","BoxDimensions","Boxed","Boxes","BoxForm","BoxFormFormatTypes","BoxFrame","BoxID","BoxMargins","BoxMatrix","BoxObject","BoxRatios","BoxRotation","BoxRotationPoint","BoxStyle","BoxWhiskerChart","Bra","BracketingBar","BraKet","BrayCurtisDistance","BreadthFirstScan","Break","BridgeData","BrightnessEqualize","BroadcastStationData","Brown","BrownForsytheTest","BrownianBridgeProcess","BrowserCategory","BSplineBasis","BSplineCurve","BSplineCurve3DBox","BSplineCurve3DBoxOptions","BSplineCurveBox","BSplineCurveBoxOptions","BSplineFunction","BSplineSurface","BSplineSurface3DBox","BSplineSurface3DBoxOptions","BubbleChart","BubbleChart3D","BubbleScale","BubbleSizes","BuckyballGraph","BuildCompiledComponent","BuildingData","BulletGauge","BusinessDayQ","ButterflyGraph","ButterworthFilterModel","Button","ButtonBar","ButtonBox","ButtonBoxOptions","ButtonCell","ButtonContents","ButtonData","ButtonEvaluator","ButtonExpandable","ButtonFrame","ButtonFunction","ButtonMargins","ButtonMinHeight","ButtonNote","ButtonNotebook","ButtonSource","ButtonStyle","ButtonStyleMenuListing","Byte","ByteArray","ByteArrayFormat","ByteArrayFormatQ","ByteArrayQ","ByteArrayToString","ByteCount","ByteOrdering","C","CachedValue","CacheGraphics","CachePersistence","CalendarConvert","CalendarData","CalendarType","Callout","CalloutMarker","CalloutStyle","CallPacket","CanberraDistance","Cancel","CancelButton","CandlestickChart","CanonicalGraph","CanonicalizePolygon","CanonicalizePolyhedron","CanonicalizeRegion","CanonicalName","CanonicalWarpingCorrespondence","CanonicalWarpingDistance","CantorMesh","CantorStaircase","Canvas","Cap","CapForm","CapitalDifferentialD","Capitalize","CapsuleShape","CaptureRunning","CaputoD","CardinalBSplineBasis","CarlemanLinearize","CarlsonRC","CarlsonRD","CarlsonRE","CarlsonRF","CarlsonRG","CarlsonRJ","CarlsonRK","CarlsonRM","CarmichaelLambda","CaseOrdering","Cases","CaseSensitive","Cashflow","Casoratian","Cast","Catalan","CatalanNumber","Catch","CategoricalDistribution","Catenate","CatenateLayer","CauchyDistribution","CauchyMatrix","CauchyPointProcess","CauchyWindow","CayleyGraph","CDF","CDFDeploy","CDFInformation","CDFWavelet","Ceiling","CelestialSystem","Cell","CellAutoOverwrite","CellBaseline","CellBoundingBox","CellBracketOptions","CellChangeTimes","CellContents","CellContext","CellDingbat","CellDingbatMargin","CellDynamicExpression","CellEditDuplicate","CellElementsBoundingBox","CellElementSpacings","CellEpilog","CellEvaluationDuplicate","CellEvaluationFunction","CellEvaluationLanguage","CellEventActions","CellFrame","CellFrameColor","CellFrameLabelMargins","CellFrameLabels","CellFrameMargins","CellFrameStyle","CellGroup","CellGroupData","CellGrouping","CellGroupingRules","CellHorizontalScrolling","CellID","CellInsertionPointCell","CellLabel","CellLabelAutoDelete","CellLabelMargins","CellLabelPositioning","CellLabelStyle","CellLabelTemplate","CellMargins","CellObject","CellOpen","CellPrint","CellProlog","Cells","CellSize","CellStyle","CellTags","CellTrayPosition","CellTrayWidgets","CellularAutomaton","CensoredDistribution","Censoring","Center","CenterArray","CenterDot","CenteredInterval","CentralFeature","CentralMoment","CentralMomentGeneratingFunction","Cepstrogram","CepstrogramArray","CepstrumArray","CForm","ChampernowneNumber","ChangeOptions","ChannelBase","ChannelBrokerAction","ChannelDatabin","ChannelHistoryLength","ChannelListen","ChannelListener","ChannelListeners","ChannelListenerWait","ChannelObject","ChannelPreSendFunction","ChannelReceiverFunction","ChannelSend","ChannelSubscribers","ChanVeseBinarize","Character","CharacterCounts","CharacterEncoding","CharacterEncodingsPath","CharacteristicFunction","CharacteristicPolynomial","CharacterName","CharacterNormalize","CharacterRange","Characters","ChartBaseStyle","ChartElementData","ChartElementDataFunction","ChartElementFunction","ChartElements","ChartLabels","ChartLayout","ChartLegends","ChartStyle","Chebyshev1FilterModel","Chebyshev2FilterModel","ChebyshevDistance","ChebyshevT","ChebyshevU","Check","CheckAbort","CheckAll","CheckArguments","Checkbox","CheckboxBar","CheckboxBox","CheckboxBoxOptions","ChemicalConvert","ChemicalData","ChemicalFormula","ChemicalInstance","ChemicalReaction","ChessboardDistance","ChiDistribution","ChineseRemainder","ChiSquareDistribution","ChoiceButtons","ChoiceDialog","CholeskyDecomposition","Chop","ChromaticityPlot","ChromaticityPlot3D","ChromaticPolynomial","Circle","CircleBox","CircleDot","CircleMinus","CirclePlus","CirclePoints","CircleThrough","CircleTimes","CirculantGraph","CircularArcThrough","CircularOrthogonalMatrixDistribution","CircularQuaternionMatrixDistribution","CircularRealMatrixDistribution","CircularSymplecticMatrixDistribution","CircularUnitaryMatrixDistribution","Circumsphere","CityData","ClassifierFunction","ClassifierInformation","ClassifierMeasurements","ClassifierMeasurementsObject","Classify","ClassPriors","Clear","ClearAll","ClearAttributes","ClearCookies","ClearPermissions","ClearSystemCache","ClebschGordan","ClickPane","ClickToCopy","ClickToCopyEnabled","Clip","ClipboardNotebook","ClipFill","ClippingStyle","ClipPlanes","ClipPlanesStyle","ClipRange","Clock","ClockGauge","ClockwiseContourIntegral","Close","Closed","CloseKernels","ClosenessCentrality","Closing","ClosingAutoSave","ClosingEvent","CloudAccountData","CloudBase","CloudConnect","CloudConnections","CloudDeploy","CloudDirectory","CloudDisconnect","CloudEvaluate","CloudExport","CloudExpression","CloudExpressions","CloudFunction","CloudGet","CloudImport","CloudLoggingData","CloudObject","CloudObjectInformation","CloudObjectInformationData","CloudObjectNameFormat","CloudObjects","CloudObjectURLType","CloudPublish","CloudPut","CloudRenderingMethod","CloudSave","CloudShare","CloudSubmit","CloudSymbol","CloudUnshare","CloudUserID","ClusterClassify","ClusterDissimilarityFunction","ClusteringComponents","ClusteringMeasurements","ClusteringTree","CMYKColor","Coarse","CodeAssistOptions","Coefficient","CoefficientArrays","CoefficientDomain","CoefficientList","CoefficientRules","CoifletWavelet","Collect","CollinearPoints","Colon","ColonForm","ColorBalance","ColorCombine","ColorConvert","ColorCoverage","ColorData","ColorDataFunction","ColorDetect","ColorDistance","ColorFunction","ColorFunctionBinning","ColorFunctionScaling","Colorize","ColorNegate","ColorOutput","ColorProfileData","ColorQ","ColorQuantize","ColorReplace","ColorRules","ColorSelectorSettings","ColorSeparate","ColorSetter","ColorSetterBox","ColorSetterBoxOptions","ColorSlider","ColorsNear","ColorSpace","ColorToneMapping","Column","ColumnAlignments","ColumnBackgrounds","ColumnForm","ColumnLines","ColumnsEqual","ColumnSpacings","ColumnWidths","CombinatorB","CombinatorC","CombinatorI","CombinatorK","CombinatorS","CombinatorW","CombinatorY","CombinedEntityClass","CombinerFunction","CometData","CommonDefaultFormatTypes","Commonest","CommonestFilter","CommonName","CommonUnits","CommunityBoundaryStyle","CommunityGraphPlot","CommunityLabels","CommunityRegionStyle","CompanyData","CompatibleUnitQ","CompilationOptions","CompilationTarget","Compile","Compiled","CompiledCodeFunction","CompiledComponent","CompiledExpressionDeclaration","CompiledFunction","CompiledLayer","CompilerCallback","CompilerEnvironment","CompilerEnvironmentAppend","CompilerEnvironmentAppendTo","CompilerEnvironmentObject","CompilerOptions","Complement","ComplementedEntityClass","CompleteGraph","CompleteGraphQ","CompleteIntegral","CompleteKaryTree","CompletionsListPacket","Complex","ComplexArrayPlot","ComplexContourPlot","Complexes","ComplexExpand","ComplexInfinity","ComplexityFunction","ComplexListPlot","ComplexPlot","ComplexPlot3D","ComplexRegionPlot","ComplexStreamPlot","ComplexVectorPlot","ComponentMeasurements","ComponentwiseContextMenu","Compose","ComposeList","ComposeSeries","CompositeQ","Composition","CompoundElement","CompoundExpression","CompoundPoissonDistribution","CompoundPoissonProcess","CompoundRenewalProcess","Compress","CompressedData","CompressionLevel","ComputeUncertainty","ConcaveHullMesh","Condition","ConditionalExpression","Conditioned","Cone","ConeBox","ConfidenceLevel","ConfidenceRange","ConfidenceTransform","ConfigurationPath","Confirm","ConfirmAssert","ConfirmBy","ConfirmMatch","ConfirmQuiet","ConformationMethod","ConformAudio","ConformImages","Congruent","ConicGradientFilling","ConicHullRegion","ConicHullRegion3DBox","ConicHullRegion3DBoxOptions","ConicHullRegionBox","ConicHullRegionBoxOptions","ConicOptimization","Conjugate","ConjugateTranspose","Conjunction","Connect","ConnectedComponents","ConnectedGraphComponents","ConnectedGraphQ","ConnectedMeshComponents","ConnectedMoleculeComponents","ConnectedMoleculeQ","ConnectionSettings","ConnectLibraryCallbackFunction","ConnectSystemModelComponents","ConnectSystemModelController","ConnesWindow","ConoverTest","ConservativeConvectionPDETerm","ConsoleMessage","Constant","ConstantArray","ConstantArrayLayer","ConstantImage","ConstantPlusLayer","ConstantRegionQ","Constants","ConstantTimesLayer","ConstellationData","ConstrainedMax","ConstrainedMin","Construct","Containing","ContainsAll","ContainsAny","ContainsExactly","ContainsNone","ContainsOnly","ContentDetectorFunction","ContentFieldOptions","ContentLocationFunction","ContentObject","ContentPadding","ContentsBoundingBox","ContentSelectable","ContentSize","Context","ContextMenu","Contexts","ContextToFileName","Continuation","Continue","ContinuedFraction","ContinuedFractionK","ContinuousAction","ContinuousMarkovProcess","ContinuousTask","ContinuousTimeModelQ","ContinuousWaveletData","ContinuousWaveletTransform","ContourDetect","ContourGraphics","ContourIntegral","ContourLabels","ContourLines","ContourPlot","ContourPlot3D","Contours","ContourShading","ContourSmoothing","ContourStyle","ContraharmonicMean","ContrastiveLossLayer","Control","ControlActive","ControlAlignment","ControlGroupContentsBox","ControllabilityGramian","ControllabilityMatrix","ControllableDecomposition","ControllableModelQ","ControllerDuration","ControllerInformation","ControllerInformationData","ControllerLinking","ControllerManipulate","ControllerMethod","ControllerPath","ControllerState","ControlPlacement","ControlsRendering","ControlType","ConvectionPDETerm","Convergents","ConversionOptions","ConversionRules","ConvertToPostScript","ConvertToPostScriptPacket","ConvexHullMesh","ConvexHullRegion","ConvexOptimization","ConvexPolygonQ","ConvexPolyhedronQ","ConvexRegionQ","ConvolutionLayer","Convolve","ConwayGroupCo1","ConwayGroupCo2","ConwayGroupCo3","CookieFunction","Cookies","CoordinateBoundingBox","CoordinateBoundingBoxArray","CoordinateBounds","CoordinateBoundsArray","CoordinateChartData","CoordinatesToolOptions","CoordinateTransform","CoordinateTransformData","CoplanarPoints","CoprimeQ","Coproduct","CopulaDistribution","Copyable","CopyDatabin","CopyDirectory","CopyFile","CopyFunction","CopyTag","CopyToClipboard","CoreNilpotentDecomposition","CornerFilter","CornerNeighbors","Correlation","CorrelationDistance","CorrelationFunction","CorrelationTest","Cos","Cosh","CoshIntegral","CosineDistance","CosineWindow","CosIntegral","Cot","Coth","CoulombF","CoulombG","CoulombH1","CoulombH2","Count","CountDistinct","CountDistinctBy","CounterAssignments","CounterBox","CounterBoxOptions","CounterClockwiseContourIntegral","CounterEvaluator","CounterFunction","CounterIncrements","CounterStyle","CounterStyleMenuListing","CountRoots","CountryData","Counts","CountsBy","Covariance","CovarianceEstimatorFunction","CovarianceFunction","CoxianDistribution","CoxIngersollRossProcess","CoxModel","CoxModelFit","CramerVonMisesTest","CreateArchive","CreateCellID","CreateChannel","CreateCloudExpression","CreateCompilerEnvironment","CreateDatabin","CreateDataStructure","CreateDataSystemModel","CreateDialog","CreateDirectory","CreateDocument","CreateFile","CreateIntermediateDirectories","CreateLicenseEntitlement","CreateManagedLibraryExpression","CreateNotebook","CreatePacletArchive","CreatePalette","CreatePermissionsGroup","CreateScheduledTask","CreateSearchIndex","CreateSystemModel","CreateTemporary","CreateTypeInstance","CreateUUID","CreateWindow","CriterionFunction","CriticalityFailureImportance","CriticalitySuccessImportance","CriticalSection","Cross","CrossEntropyLossLayer","CrossingCount","CrossingDetect","CrossingPolygon","CrossMatrix","Csc","Csch","CSGRegion","CSGRegionQ","CSGRegionTree","CTCLossLayer","Cube","CubeRoot","Cubics","Cuboid","CuboidBox","CuboidBoxOptions","Cumulant","CumulantGeneratingFunction","CumulativeFeatureImpactPlot","Cup","CupCap","Curl","CurlyDoubleQuote","CurlyQuote","CurrencyConvert","CurrentDate","CurrentImage","CurrentNotebookImage","CurrentScreenImage","CurrentValue","Curry","CurryApplied","CurvatureFlowFilter","CurveClosed","Cyan","CycleGraph","CycleIndexPolynomial","Cycles","CyclicGroup","Cyclotomic","Cylinder","CylinderBox","CylinderBoxOptions","CylindricalDecomposition","CylindricalDecompositionFunction","D","DagumDistribution","DamData","DamerauLevenshteinDistance","DampingFactor","Darker","Dashed","Dashing","DatabaseConnect","DatabaseDisconnect","DatabaseReference","Databin","DatabinAdd","DatabinRemove","Databins","DatabinSubmit","DatabinUpload","DataCompression","DataDistribution","DataRange","DataReversed","Dataset","DatasetDisplayPanel","DatasetTheme","DataStructure","DataStructureQ","Date","DateBounds","Dated","DateDelimiters","DateDifference","DatedUnit","DateFormat","DateFunction","DateGranularity","DateHistogram","DateInterval","DateList","DateListLogPlot","DateListPlot","DateListStepPlot","DateObject","DateObjectQ","DateOverlapsQ","DatePattern","DatePlus","DateRange","DateReduction","DateScale","DateSelect","DateString","DateTicksFormat","DateValue","DateWithinQ","DaubechiesWavelet","DavisDistribution","DawsonF","DayCount","DayCountConvention","DayHemisphere","DaylightQ","DayMatchQ","DayName","DayNightTerminator","DayPlus","DayRange","DayRound","DeBruijnGraph","DeBruijnSequence","Debug","DebugTag","Decapitalize","Decimal","DecimalForm","DeclareCompiledComponent","DeclareKnownSymbols","DeclarePackage","Decompose","DeconvolutionLayer","Decrement","Decrypt","DecryptFile","DedekindEta","DeepSpaceProbeData","Default","Default2DTool","Default3DTool","DefaultAttachedCellStyle","DefaultAxesStyle","DefaultBaseStyle","DefaultBoxStyle","DefaultButton","DefaultColor","DefaultControlPlacement","DefaultDockedCellStyle","DefaultDuplicateCellStyle","DefaultDuration","DefaultElement","DefaultFaceGridsStyle","DefaultFieldHintStyle","DefaultFont","DefaultFontProperties","DefaultFormatType","DefaultFrameStyle","DefaultFrameTicksStyle","DefaultGridLinesStyle","DefaultInlineFormatType","DefaultInputFormatType","DefaultLabelStyle","DefaultMenuStyle","DefaultNaturalLanguage","DefaultNewCellStyle","DefaultNewInlineCellStyle","DefaultNotebook","DefaultOptions","DefaultOutputFormatType","DefaultPrintPrecision","DefaultStyle","DefaultStyleDefinitions","DefaultTextFormatType","DefaultTextInlineFormatType","DefaultTicksStyle","DefaultTooltipStyle","DefaultValue","DefaultValues","Defer","DefineExternal","DefineInputStreamMethod","DefineOutputStreamMethod","DefineResourceFunction","Definition","Degree","DegreeCentrality","DegreeGraphDistribution","DegreeLexicographic","DegreeReverseLexicographic","DEigensystem","DEigenvalues","Deinitialization","Del","DelaunayMesh","Delayed","Deletable","Delete","DeleteAdjacentDuplicates","DeleteAnomalies","DeleteBorderComponents","DeleteCases","DeleteChannel","DeleteCloudExpression","DeleteContents","DeleteDirectory","DeleteDuplicates","DeleteDuplicatesBy","DeleteElements","DeleteFile","DeleteMissing","DeleteObject","DeletePermissionsKey","DeleteSearchIndex","DeleteSmallComponents","DeleteStopwords","DeleteWithContents","DeletionWarning","DelimitedArray","DelimitedSequence","Delimiter","DelimiterAutoMatching","DelimiterFlashTime","DelimiterMatching","Delimiters","DeliveryFunction","Dendrogram","Denominator","DensityGraphics","DensityHistogram","DensityPlot","DensityPlot3D","DependentVariables","Deploy","Deployed","Depth","DepthFirstScan","Derivative","DerivativeFilter","DerivativePDETerm","DerivedKey","DescriptorStateSpace","DesignMatrix","DestroyAfterEvaluation","Det","DeviceClose","DeviceConfigure","DeviceExecute","DeviceExecuteAsynchronous","DeviceObject","DeviceOpen","DeviceOpenQ","DeviceRead","DeviceReadBuffer","DeviceReadLatest","DeviceReadList","DeviceReadTimeSeries","Devices","DeviceStreams","DeviceWrite","DeviceWriteBuffer","DGaussianWavelet","DiacriticalPositioning","Diagonal","DiagonalizableMatrixQ","DiagonalMatrix","DiagonalMatrixQ","Dialog","DialogIndent","DialogInput","DialogLevel","DialogNotebook","DialogProlog","DialogReturn","DialogSymbols","Diamond","DiamondMatrix","DiceDissimilarity","DictionaryLookup","DictionaryWordQ","DifferenceDelta","DifferenceOrder","DifferenceQuotient","DifferenceRoot","DifferenceRootReduce","Differences","DifferentialD","DifferentialRoot","DifferentialRootReduce","DifferentiatorFilter","DiffusionPDETerm","DiggleGatesPointProcess","DiggleGrattonPointProcess","DigitalSignature","DigitBlock","DigitBlockMinimum","DigitCharacter","DigitCount","DigitQ","DihedralAngle","DihedralGroup","Dilation","DimensionalCombinations","DimensionalMeshComponents","DimensionReduce","DimensionReducerFunction","DimensionReduction","Dimensions","DiracComb","DiracDelta","DirectedEdge","DirectedEdges","DirectedGraph","DirectedGraphQ","DirectedInfinity","Direction","DirectionalLight","Directive","Directory","DirectoryName","DirectoryQ","DirectoryStack","DirichletBeta","DirichletCharacter","DirichletCondition","DirichletConvolve","DirichletDistribution","DirichletEta","DirichletL","DirichletLambda","DirichletTransform","DirichletWindow","DisableConsolePrintPacket","DisableFormatting","DiscreteAsymptotic","DiscreteChirpZTransform","DiscreteConvolve","DiscreteDelta","DiscreteHadamardTransform","DiscreteIndicator","DiscreteInputOutputModel","DiscreteLimit","DiscreteLQEstimatorGains","DiscreteLQRegulatorGains","DiscreteLyapunovSolve","DiscreteMarkovProcess","DiscreteMaxLimit","DiscreteMinLimit","DiscretePlot","DiscretePlot3D","DiscreteRatio","DiscreteRiccatiSolve","DiscreteShift","DiscreteTimeModelQ","DiscreteUniformDistribution","DiscreteVariables","DiscreteWaveletData","DiscreteWaveletPacketTransform","DiscreteWaveletTransform","DiscretizeGraphics","DiscretizeRegion","Discriminant","DisjointQ","Disjunction","Disk","DiskBox","DiskBoxOptions","DiskMatrix","DiskSegment","Dispatch","DispatchQ","DispersionEstimatorFunction","Display","DisplayAllSteps","DisplayEndPacket","DisplayForm","DisplayFunction","DisplayPacket","DisplayRules","DisplayString","DisplayTemporary","DisplayWith","DisplayWithRef","DisplayWithVariable","DistanceFunction","DistanceMatrix","DistanceTransform","Distribute","Distributed","DistributedContexts","DistributeDefinitions","DistributionChart","DistributionDomain","DistributionFitTest","DistributionParameterAssumptions","DistributionParameterQ","Dithering","Div","Divergence","Divide","DivideBy","Dividers","DivideSides","Divisible","Divisors","DivisorSigma","DivisorSum","DMSList","DMSString","Do","DockedCell","DockedCells","DocumentGenerator","DocumentGeneratorInformation","DocumentGeneratorInformationData","DocumentGenerators","DocumentNotebook","DocumentWeightingRules","Dodecahedron","DomainRegistrationInformation","DominantColors","DominatorTreeGraph","DominatorVertexList","DOSTextFormat","Dot","DotDashed","DotEqual","DotLayer","DotPlusLayer","Dotted","DoubleBracketingBar","DoubleContourIntegral","DoubleDownArrow","DoubleLeftArrow","DoubleLeftRightArrow","DoubleLeftTee","DoubleLongLeftArrow","DoubleLongLeftRightArrow","DoubleLongRightArrow","DoubleRightArrow","DoubleRightTee","DoubleUpArrow","DoubleUpDownArrow","DoubleVerticalBar","DoublyInfinite","Down","DownArrow","DownArrowBar","DownArrowUpArrow","DownLeftRightVector","DownLeftTeeVector","DownLeftVector","DownLeftVectorBar","DownRightTeeVector","DownRightVector","DownRightVectorBar","Downsample","DownTee","DownTeeArrow","DownValues","DownValuesFunction","DragAndDrop","DrawBackFaces","DrawEdges","DrawFrontFaces","DrawHighlighted","DrazinInverse","Drop","DropoutLayer","DropShadowing","DSolve","DSolveChangeVariables","DSolveValue","Dt","DualLinearProgramming","DualPlanarGraph","DualPolyhedron","DualSystemsModel","DumpGet","DumpSave","DuplicateFreeQ","Duration","Dynamic","DynamicBox","DynamicBoxOptions","DynamicEvaluationTimeout","DynamicGeoGraphics","DynamicImage","DynamicLocation","DynamicModule","DynamicModuleBox","DynamicModuleBoxOptions","DynamicModuleParent","DynamicModuleValues","DynamicName","DynamicNamespace","DynamicReference","DynamicSetting","DynamicUpdating","DynamicWrapper","DynamicWrapperBox","DynamicWrapperBoxOptions","E","EarthImpactData","EarthquakeData","EccentricityCentrality","Echo","EchoEvaluation","EchoFunction","EchoLabel","EchoTiming","EclipseType","EdgeAdd","EdgeBetweennessCentrality","EdgeCapacity","EdgeCapForm","EdgeChromaticNumber","EdgeColor","EdgeConnectivity","EdgeContract","EdgeCost","EdgeCount","EdgeCoverQ","EdgeCycleMatrix","EdgeDashing","EdgeDelete","EdgeDetect","EdgeForm","EdgeIndex","EdgeJoinForm","EdgeLabeling","EdgeLabels","EdgeLabelStyle","EdgeList","EdgeOpacity","EdgeQ","EdgeRenderingFunction","EdgeRules","EdgeShapeFunction","EdgeStyle","EdgeTaggedGraph","EdgeTaggedGraphQ","EdgeTags","EdgeThickness","EdgeTransitiveGraphQ","EdgeValueRange","EdgeValueSizes","EdgeWeight","EdgeWeightedGraphQ","Editable","EditButtonSettings","EditCellTagsSettings","EditDistance","EffectiveInterest","Eigensystem","Eigenvalues","EigenvectorCentrality","Eigenvectors","Element","ElementData","ElementwiseLayer","ElidedForms","Eliminate","EliminationOrder","Ellipsoid","EllipticE","EllipticExp","EllipticExpPrime","EllipticF","EllipticFilterModel","EllipticK","EllipticLog","EllipticNomeQ","EllipticPi","EllipticReducedHalfPeriods","EllipticTheta","EllipticThetaPrime","EmbedCode","EmbeddedHTML","EmbeddedService","EmbeddedSQLEntityClass","EmbeddedSQLExpression","EmbeddingLayer","EmbeddingObject","EmitSound","EmphasizeSyntaxErrors","EmpiricalDistribution","Empty","EmptyGraphQ","EmptyRegion","EmptySpaceF","EnableConsolePrintPacket","Enabled","Enclose","Encode","Encrypt","EncryptedObject","EncryptFile","End","EndAdd","EndDialogPacket","EndOfBuffer","EndOfFile","EndOfLine","EndOfString","EndPackage","EngineEnvironment","EngineeringForm","Enter","EnterExpressionPacket","EnterTextPacket","Entity","EntityClass","EntityClassList","EntityCopies","EntityFunction","EntityGroup","EntityInstance","EntityList","EntityPrefetch","EntityProperties","EntityProperty","EntityPropertyClass","EntityRegister","EntityStore","EntityStores","EntityTypeName","EntityUnregister","EntityValue","Entropy","EntropyFilter","Environment","Epilog","EpilogFunction","Equal","EqualColumns","EqualRows","EqualTilde","EqualTo","EquatedTo","Equilibrium","EquirippleFilterKernel","Equivalent","Erf","Erfc","Erfi","ErlangB","ErlangC","ErlangDistribution","Erosion","ErrorBox","ErrorBoxOptions","ErrorNorm","ErrorPacket","ErrorsDialogSettings","EscapeRadius","EstimatedBackground","EstimatedDistribution","EstimatedPointNormals","EstimatedPointProcess","EstimatedProcess","EstimatedVariogramModel","EstimatorGains","EstimatorRegulator","EuclideanDistance","EulerAngles","EulerCharacteristic","EulerE","EulerGamma","EulerianGraphQ","EulerMatrix","EulerPhi","Evaluatable","Evaluate","Evaluated","EvaluatePacket","EvaluateScheduledTask","EvaluationBox","EvaluationCell","EvaluationCompletionAction","EvaluationData","EvaluationElements","EvaluationEnvironment","EvaluationMode","EvaluationMonitor","EvaluationNotebook","EvaluationObject","EvaluationOrder","EvaluationPrivileges","EvaluationRateLimit","Evaluator","EvaluatorNames","EvenQ","EventData","EventEvaluator","EventHandler","EventHandlerTag","EventLabels","EventSeries","ExactBlackmanWindow","ExactNumberQ","ExactRootIsolation","ExampleData","Except","ExcludedContexts","ExcludedForms","ExcludedLines","ExcludedPhysicalQuantities","ExcludePods","Exclusions","ExclusionsStyle","Exists","Exit","ExitDialog","ExoplanetData","Exp","Expand","ExpandAll","ExpandDenominator","ExpandFileName","ExpandNumerator","Expectation","ExpectationE","ExpectedValue","ExpGammaDistribution","ExpIntegralE","ExpIntegralEi","ExpirationDate","Exponent","ExponentFunction","ExponentialDistribution","ExponentialFamily","ExponentialGeneratingFunction","ExponentialMovingAverage","ExponentialPowerDistribution","ExponentPosition","ExponentStep","Export","ExportAutoReplacements","ExportByteArray","ExportForm","ExportPacket","ExportString","Expression","ExpressionCell","ExpressionGraph","ExpressionPacket","ExpressionTree","ExpressionUUID","ExpToTrig","ExtendedEntityClass","ExtendedGCD","Extension","ExtentElementFunction","ExtentMarkers","ExtentSize","ExternalBundle","ExternalCall","ExternalDataCharacterEncoding","ExternalEvaluate","ExternalFunction","ExternalFunctionName","ExternalIdentifier","ExternalObject","ExternalOptions","ExternalSessionObject","ExternalSessions","ExternalStorageBase","ExternalStorageDownload","ExternalStorageGet","ExternalStorageObject","ExternalStoragePut","ExternalStorageUpload","ExternalTypeSignature","ExternalValue","Extract","ExtractArchive","ExtractLayer","ExtractPacletArchive","ExtremeValueDistribution","FaceAlign","FaceForm","FaceGrids","FaceGridsStyle","FaceRecognize","FacialFeatures","Factor","FactorComplete","Factorial","Factorial2","FactorialMoment","FactorialMomentGeneratingFunction","FactorialPower","FactorInteger","FactorList","FactorSquareFree","FactorSquareFreeList","FactorTerms","FactorTermsList","Fail","Failure","FailureAction","FailureDistribution","FailureQ","False","FareySequence","FARIMAProcess","FeatureDistance","FeatureExtract","FeatureExtraction","FeatureExtractor","FeatureExtractorFunction","FeatureImpactPlot","FeatureNames","FeatureNearest","FeatureSpacePlot","FeatureSpacePlot3D","FeatureTypes","FeatureValueDependencyPlot","FeatureValueImpactPlot","FEDisableConsolePrintPacket","FeedbackLinearize","FeedbackSector","FeedbackSectorStyle","FeedbackType","FEEnableConsolePrintPacket","FetalGrowthData","Fibonacci","Fibonorial","FieldCompletionFunction","FieldHint","FieldHintStyle","FieldMasked","FieldSize","File","FileBaseName","FileByteCount","FileConvert","FileDate","FileExistsQ","FileExtension","FileFormat","FileFormatProperties","FileFormatQ","FileHandler","FileHash","FileInformation","FileName","FileNameDepth","FileNameDialogSettings","FileNameDrop","FileNameForms","FileNameJoin","FileNames","FileNameSetter","FileNameSplit","FileNameTake","FileNameToFormatList","FilePrint","FileSize","FileSystemMap","FileSystemScan","FileSystemTree","FileTemplate","FileTemplateApply","FileType","FilledCurve","FilledCurveBox","FilledCurveBoxOptions","FilledTorus","FillForm","Filling","FillingStyle","FillingTransform","FilteredEntityClass","FilterRules","FinancialBond","FinancialData","FinancialDerivative","FinancialIndicator","Find","FindAnomalies","FindArgMax","FindArgMin","FindChannels","FindClique","FindClusters","FindCookies","FindCurvePath","FindCycle","FindDevices","FindDistribution","FindDistributionParameters","FindDivisions","FindEdgeColoring","FindEdgeCover","FindEdgeCut","FindEdgeIndependentPaths","FindEquationalProof","FindEulerianCycle","FindExternalEvaluators","FindFaces","FindFile","FindFit","FindFormula","FindFundamentalCycles","FindGeneratingFunction","FindGeoLocation","FindGeometricConjectures","FindGeometricTransform","FindGraphCommunities","FindGraphIsomorphism","FindGraphPartition","FindHamiltonianCycle","FindHamiltonianPath","FindHiddenMarkovStates","FindImageText","FindIndependentEdgeSet","FindIndependentVertexSet","FindInstance","FindIntegerNullVector","FindIsomers","FindIsomorphicSubgraph","FindKClan","FindKClique","FindKClub","FindKPlex","FindLibrary","FindLinearRecurrence","FindList","FindMatchingColor","FindMaximum","FindMaximumCut","FindMaximumFlow","FindMaxValue","FindMeshDefects","FindMinimum","FindMinimumCostFlow","FindMinimumCut","FindMinValue","FindMoleculeSubstructure","FindPath","FindPeaks","FindPermutation","FindPlanarColoring","FindPointProcessParameters","FindPostmanTour","FindProcessParameters","FindRegionTransform","FindRepeat","FindRoot","FindSequenceFunction","FindSettings","FindShortestPath","FindShortestTour","FindSpanningTree","FindSubgraphIsomorphism","FindSystemModelEquilibrium","FindTextualAnswer","FindThreshold","FindTransientRepeat","FindVertexColoring","FindVertexCover","FindVertexCut","FindVertexIndependentPaths","Fine","FinishDynamic","FiniteAbelianGroupCount","FiniteGroupCount","FiniteGroupData","First","FirstCase","FirstPassageTimeDistribution","FirstPosition","FischerGroupFi22","FischerGroupFi23","FischerGroupFi24Prime","FisherHypergeometricDistribution","FisherRatioTest","FisherZDistribution","Fit","FitAll","FitRegularization","FittedModel","FixedOrder","FixedPoint","FixedPointList","FlashSelection","Flat","FlatShading","Flatten","FlattenAt","FlattenLayer","FlatTopWindow","FlightData","FlipView","Floor","FlowPolynomial","Fold","FoldList","FoldPair","FoldPairList","FoldWhile","FoldWhileList","FollowRedirects","Font","FontColor","FontFamily","FontForm","FontName","FontOpacity","FontPostScriptName","FontProperties","FontReencoding","FontSize","FontSlant","FontSubstitutions","FontTracking","FontVariations","FontWeight","For","ForAll","ForAllType","ForceVersionInstall","Format","FormatRules","FormatType","FormatTypeAutoConvert","FormatValues","FormBox","FormBoxOptions","FormControl","FormFunction","FormLayoutFunction","FormObject","FormPage","FormProtectionMethod","FormTheme","FormulaData","FormulaLookup","FortranForm","Forward","ForwardBackward","ForwardCloudCredentials","Fourier","FourierCoefficient","FourierCosCoefficient","FourierCosSeries","FourierCosTransform","FourierDCT","FourierDCTFilter","FourierDCTMatrix","FourierDST","FourierDSTMatrix","FourierMatrix","FourierParameters","FourierSequenceTransform","FourierSeries","FourierSinCoefficient","FourierSinSeries","FourierSinTransform","FourierTransform","FourierTrigSeries","FoxH","FoxHReduce","FractionalBrownianMotionProcess","FractionalD","FractionalGaussianNoiseProcess","FractionalPart","FractionBox","FractionBoxOptions","FractionLine","Frame","FrameBox","FrameBoxOptions","Framed","FrameInset","FrameLabel","Frameless","FrameListVideo","FrameMargins","FrameRate","FrameStyle","FrameTicks","FrameTicksStyle","FRatioDistribution","FrechetDistribution","FreeQ","FrenetSerretSystem","FrequencySamplingFilterKernel","FresnelC","FresnelF","FresnelG","FresnelS","Friday","FrobeniusNumber","FrobeniusSolve","FromAbsoluteTime","FromCharacterCode","FromCoefficientRules","FromContinuedFraction","FromDate","FromDateString","FromDigits","FromDMS","FromEntity","FromJulianDate","FromLetterNumber","FromPolarCoordinates","FromRawPointer","FromRomanNumeral","FromSphericalCoordinates","FromUnixTime","Front","FrontEndDynamicExpression","FrontEndEventActions","FrontEndExecute","FrontEndObject","FrontEndResource","FrontEndResourceString","FrontEndStackSize","FrontEndToken","FrontEndTokenExecute","FrontEndValueCache","FrontEndVersion","FrontFaceColor","FrontFaceGlowColor","FrontFaceOpacity","FrontFaceSpecularColor","FrontFaceSpecularExponent","FrontFaceSurfaceAppearance","FrontFaceTexture","Full","FullAxes","FullDefinition","FullForm","FullGraphics","FullInformationOutputRegulator","FullOptions","FullRegion","FullSimplify","Function","FunctionAnalytic","FunctionBijective","FunctionCompile","FunctionCompileExport","FunctionCompileExportByteArray","FunctionCompileExportLibrary","FunctionCompileExportString","FunctionContinuous","FunctionConvexity","FunctionDeclaration","FunctionDiscontinuities","FunctionDomain","FunctionExpand","FunctionInjective","FunctionInterpolation","FunctionLayer","FunctionMeromorphic","FunctionMonotonicity","FunctionPeriod","FunctionPoles","FunctionRange","FunctionSign","FunctionSingularities","FunctionSpace","FunctionSurjective","FussellVeselyImportance","GaborFilter","GaborMatrix","GaborWavelet","GainMargins","GainPhaseMargins","GalaxyData","GalleryView","Gamma","GammaDistribution","GammaRegularized","GapPenalty","GARCHProcess","GatedRecurrentLayer","Gather","GatherBy","GaugeFaceElementFunction","GaugeFaceStyle","GaugeFrameElementFunction","GaugeFrameSize","GaugeFrameStyle","GaugeLabels","GaugeMarkers","GaugeStyle","GaussianFilter","GaussianIntegers","GaussianMatrix","GaussianOrthogonalMatrixDistribution","GaussianSymplecticMatrixDistribution","GaussianUnitaryMatrixDistribution","GaussianWindow","GCD","GegenbauerC","General","GeneralizedLinearModelFit","GenerateAsymmetricKeyPair","GenerateConditions","GeneratedAssetFormat","GeneratedAssetLocation","GeneratedCell","GeneratedCellStyles","GeneratedDocumentBinding","GenerateDerivedKey","GenerateDigitalSignature","GenerateDocument","GeneratedParameters","GeneratedQuantityMagnitudes","GenerateFileSignature","GenerateHTTPResponse","GenerateSecuredAuthenticationKey","GenerateSymmetricKey","GeneratingFunction","GeneratorDescription","GeneratorHistoryLength","GeneratorOutputType","Generic","GenericCylindricalDecomposition","GenomeData","GenomeLookup","GeoAntipode","GeoArea","GeoArraySize","GeoBackground","GeoBoundary","GeoBoundingBox","GeoBounds","GeoBoundsRegion","GeoBoundsRegionBoundary","GeoBubbleChart","GeoCenter","GeoCircle","GeoContourPlot","GeoDensityPlot","GeodesicClosing","GeodesicDilation","GeodesicErosion","GeodesicOpening","GeodesicPolyhedron","GeoDestination","GeodesyData","GeoDirection","GeoDisk","GeoDisplacement","GeoDistance","GeoDistanceList","GeoElevationData","GeoEntities","GeoGraphics","GeoGraphPlot","GeoGraphValuePlot","GeogravityModelData","GeoGridDirectionDifference","GeoGridLines","GeoGridLinesStyle","GeoGridPosition","GeoGridRange","GeoGridRangePadding","GeoGridUnitArea","GeoGridUnitDistance","GeoGridVector","GeoGroup","GeoHemisphere","GeoHemisphereBoundary","GeoHistogram","GeoIdentify","GeoImage","GeoLabels","GeoLength","GeoListPlot","GeoLocation","GeologicalPeriodData","GeomagneticModelData","GeoMarker","GeometricAssertion","GeometricBrownianMotionProcess","GeometricDistribution","GeometricMean","GeometricMeanFilter","GeometricOptimization","GeometricScene","GeometricStep","GeometricStylingRules","GeometricTest","GeometricTransformation","GeometricTransformation3DBox","GeometricTransformation3DBoxOptions","GeometricTransformationBox","GeometricTransformationBoxOptions","GeoModel","GeoNearest","GeoOrientationData","GeoPath","GeoPolygon","GeoPosition","GeoPositionENU","GeoPositionXYZ","GeoProjection","GeoProjectionData","GeoRange","GeoRangePadding","GeoRegionValuePlot","GeoResolution","GeoScaleBar","GeoServer","GeoSmoothHistogram","GeoStreamPlot","GeoStyling","GeoStylingImageFunction","GeoVariant","GeoVector","GeoVectorENU","GeoVectorPlot","GeoVectorXYZ","GeoVisibleRegion","GeoVisibleRegionBoundary","GeoWithinQ","GeoZoomLevel","GestureHandler","GestureHandlerTag","Get","GetContext","GetEnvironment","GetFileName","GetLinebreakInformationPacket","GibbsPointProcess","Glaisher","GlobalClusteringCoefficient","GlobalPreferences","GlobalSession","Glow","GoldenAngle","GoldenRatio","GompertzMakehamDistribution","GoochShading","GoodmanKruskalGamma","GoodmanKruskalGammaTest","Goto","GouraudShading","Grad","Gradient","GradientFilter","GradientFittedMesh","GradientOrientationFilter","GrammarApply","GrammarRules","GrammarToken","Graph","Graph3D","GraphAssortativity","GraphAutomorphismGroup","GraphCenter","GraphComplement","GraphData","GraphDensity","GraphDiameter","GraphDifference","GraphDisjointUnion","GraphDistance","GraphDistanceMatrix","GraphEmbedding","GraphHighlight","GraphHighlightStyle","GraphHub","Graphics","Graphics3D","Graphics3DBox","Graphics3DBoxOptions","GraphicsArray","GraphicsBaseline","GraphicsBox","GraphicsBoxOptions","GraphicsColor","GraphicsColumn","GraphicsComplex","GraphicsComplex3DBox","GraphicsComplex3DBoxOptions","GraphicsComplexBox","GraphicsComplexBoxOptions","GraphicsContents","GraphicsData","GraphicsGrid","GraphicsGridBox","GraphicsGroup","GraphicsGroup3DBox","GraphicsGroup3DBoxOptions","GraphicsGroupBox","GraphicsGroupBoxOptions","GraphicsGrouping","GraphicsHighlightColor","GraphicsRow","GraphicsSpacing","GraphicsStyle","GraphIntersection","GraphJoin","GraphLayerLabels","GraphLayers","GraphLayerStyle","GraphLayout","GraphLinkEfficiency","GraphPeriphery","GraphPlot","GraphPlot3D","GraphPower","GraphProduct","GraphPropertyDistribution","GraphQ","GraphRadius","GraphReciprocity","GraphRoot","GraphStyle","GraphSum","GraphTree","GraphUnion","Gray","GrayLevel","Greater","GreaterEqual","GreaterEqualLess","GreaterEqualThan","GreaterFullEqual","GreaterGreater","GreaterLess","GreaterSlantEqual","GreaterThan","GreaterTilde","GreekStyle","Green","GreenFunction","Grid","GridBaseline","GridBox","GridBoxAlignment","GridBoxBackground","GridBoxDividers","GridBoxFrame","GridBoxItemSize","GridBoxItemStyle","GridBoxOptions","GridBoxSpacings","GridCreationSettings","GridDefaultElement","GridElementStyleOptions","GridFrame","GridFrameMargins","GridGraph","GridLines","GridLinesStyle","GridVideo","GroebnerBasis","GroupActionBase","GroupBy","GroupCentralizer","GroupElementFromWord","GroupElementPosition","GroupElementQ","GroupElements","GroupElementToWord","GroupGenerators","Groupings","GroupMultiplicationTable","GroupOpenerColor","GroupOpenerInsideFrame","GroupOrbits","GroupOrder","GroupPageBreakWithin","GroupSetwiseStabilizer","GroupStabilizer","GroupStabilizerChain","GroupTogetherGrouping","GroupTogetherNestedGrouping","GrowCutComponents","Gudermannian","GuidedFilter","GumbelDistribution","HaarWavelet","HadamardMatrix","HalfLine","HalfNormalDistribution","HalfPlane","HalfSpace","HalftoneShading","HamiltonianGraphQ","HammingDistance","HammingWindow","HandlerFunctions","HandlerFunctionsKeys","HankelH1","HankelH2","HankelMatrix","HankelTransform","HannPoissonWindow","HannWindow","HaradaNortonGroupHN","HararyGraph","HardcorePointProcess","HarmonicMean","HarmonicMeanFilter","HarmonicNumber","Hash","HatchFilling","HatchShading","Haversine","HazardFunction","Head","HeadCompose","HeaderAlignment","HeaderBackground","HeaderDisplayFunction","HeaderLines","Headers","HeaderSize","HeaderStyle","Heads","HeatFluxValue","HeatInsulationValue","HeatOutflowValue","HeatRadiationValue","HeatSymmetryValue","HeatTemperatureCondition","HeatTransferPDEComponent","HeatTransferValue","HeavisideLambda","HeavisidePi","HeavisideTheta","HeldGroupHe","HeldPart","HelmholtzPDEComponent","HelpBrowserLookup","HelpBrowserNotebook","HelpBrowserSettings","HelpViewerSettings","Here","HermiteDecomposition","HermiteH","Hermitian","HermitianMatrixQ","HessenbergDecomposition","Hessian","HeunB","HeunBPrime","HeunC","HeunCPrime","HeunD","HeunDPrime","HeunG","HeunGPrime","HeunT","HeunTPrime","HexadecimalCharacter","Hexahedron","HexahedronBox","HexahedronBoxOptions","HiddenItems","HiddenMarkovProcess","HiddenSurface","Highlighted","HighlightGraph","HighlightImage","HighlightMesh","HighlightString","HighpassFilter","HigmanSimsGroupHS","HilbertCurve","HilbertFilter","HilbertMatrix","Histogram","Histogram3D","HistogramDistribution","HistogramList","HistogramPointDensity","HistogramTransform","HistogramTransformInterpolation","HistoricalPeriodData","HitMissTransform","HITSCentrality","HjorthDistribution","HodgeDual","HoeffdingD","HoeffdingDTest","Hold","HoldAll","HoldAllComplete","HoldComplete","HoldFirst","HoldForm","HoldPattern","HoldRest","HolidayCalendar","HomeDirectory","HomePage","Horizontal","HorizontalForm","HorizontalGauge","HorizontalScrollPosition","HornerForm","HostLookup","HotellingTSquareDistribution","HoytDistribution","HTMLSave","HTTPErrorResponse","HTTPRedirect","HTTPRequest","HTTPRequestData","HTTPResponse","Hue","HumanGrowthData","HumpDownHump","HumpEqual","HurwitzLerchPhi","HurwitzZeta","HyperbolicDistribution","HypercubeGraph","HyperexponentialDistribution","Hyperfactorial","Hypergeometric0F1","Hypergeometric0F1Regularized","Hypergeometric1F1","Hypergeometric1F1Regularized","Hypergeometric2F1","Hypergeometric2F1Regularized","HypergeometricDistribution","HypergeometricPFQ","HypergeometricPFQRegularized","HypergeometricU","Hyperlink","HyperlinkAction","HyperlinkCreationSettings","Hyperplane","Hyphenation","HyphenationOptions","HypoexponentialDistribution","HypothesisTestData","I","IconData","Iconize","IconizedObject","IconRules","Icosahedron","Identity","IdentityMatrix","If","IfCompiled","IgnoreCase","IgnoreDiacritics","IgnoreIsotopes","IgnorePunctuation","IgnoreSpellCheck","IgnoreStereochemistry","IgnoringInactive","Im","Image","Image3D","Image3DProjection","Image3DSlices","ImageAccumulate","ImageAdd","ImageAdjust","ImageAlign","ImageApply","ImageApplyIndexed","ImageAspectRatio","ImageAssemble","ImageAugmentationLayer","ImageBoundingBoxes","ImageCache","ImageCacheValid","ImageCapture","ImageCaptureFunction","ImageCases","ImageChannels","ImageClip","ImageCollage","ImageColorSpace","ImageCompose","ImageContainsQ","ImageContents","ImageConvolve","ImageCooccurrence","ImageCorners","ImageCorrelate","ImageCorrespondingPoints","ImageCrop","ImageData","ImageDeconvolve","ImageDemosaic","ImageDifference","ImageDimensions","ImageDisplacements","ImageDistance","ImageEditMode","ImageEffect","ImageExposureCombine","ImageFeatureTrack","ImageFileApply","ImageFileFilter","ImageFileScan","ImageFilter","ImageFocusCombine","ImageForestingComponents","ImageFormattingWidth","ImageForwardTransformation","ImageGraphics","ImageHistogram","ImageIdentify","ImageInstanceQ","ImageKeypoints","ImageLabels","ImageLegends","ImageLevels","ImageLines","ImageMargins","ImageMarker","ImageMarkers","ImageMeasurements","ImageMesh","ImageMultiply","ImageOffset","ImagePad","ImagePadding","ImagePartition","ImagePeriodogram","ImagePerspectiveTransformation","ImagePosition","ImagePreviewFunction","ImagePyramid","ImagePyramidApply","ImageQ","ImageRangeCache","ImageRecolor","ImageReflect","ImageRegion","ImageResize","ImageResolution","ImageRestyle","ImageRotate","ImageRotated","ImageSaliencyFilter","ImageScaled","ImageScan","ImageSize","ImageSizeAction","ImageSizeCache","ImageSizeMultipliers","ImageSizeRaw","ImageStitch","ImageSubtract","ImageTake","ImageTransformation","ImageTrim","ImageType","ImageValue","ImageValuePositions","ImageVectorscopePlot","ImageWaveformPlot","ImagingDevice","ImplicitD","ImplicitRegion","Implies","Import","ImportAutoReplacements","ImportByteArray","ImportedObject","ImportOptions","ImportString","ImprovementImportance","In","Inactivate","Inactive","InactiveStyle","IncidenceGraph","IncidenceList","IncidenceMatrix","IncludeAromaticBonds","IncludeConstantBasis","IncludedContexts","IncludeDefinitions","IncludeDirectories","IncludeFileExtension","IncludeGeneratorTasks","IncludeHydrogens","IncludeInflections","IncludeMetaInformation","IncludePods","IncludeQuantities","IncludeRelatedTables","IncludeSingularSolutions","IncludeSingularTerm","IncludeWindowTimes","Increment","IndefiniteMatrixQ","Indent","IndentingNewlineSpacings","IndentMaxFraction","IndependenceTest","IndependentEdgeSetQ","IndependentPhysicalQuantity","IndependentUnit","IndependentUnitDimension","IndependentVertexSetQ","Indeterminate","IndeterminateThreshold","IndexCreationOptions","Indexed","IndexEdgeTaggedGraph","IndexGraph","IndexTag","Inequality","InertEvaluate","InertExpression","InexactNumberQ","InexactNumbers","InfiniteFuture","InfiniteLine","InfiniteLineThrough","InfinitePast","InfinitePlane","Infinity","Infix","InflationAdjust","InflationMethod","Information","InformationData","InformationDataGrid","Inherited","InheritScope","InhomogeneousPoissonPointProcess","InhomogeneousPoissonProcess","InitialEvaluationHistory","Initialization","InitializationCell","InitializationCellEvaluation","InitializationCellWarning","InitializationObject","InitializationObjects","InitializationValue","Initialize","InitialSeeding","InlineCounterAssignments","InlineCounterIncrements","InlineRules","Inner","InnerPolygon","InnerPolyhedron","Inpaint","Input","InputAliases","InputAssumptions","InputAutoReplacements","InputField","InputFieldBox","InputFieldBoxOptions","InputForm","InputGrouping","InputNamePacket","InputNotebook","InputPacket","InputPorts","InputSettings","InputStream","InputString","InputStringPacket","InputToBoxFormPacket","Insert","InsertionFunction","InsertionPointObject","InsertLinebreaks","InsertResults","Inset","Inset3DBox","Inset3DBoxOptions","InsetBox","InsetBoxOptions","Insphere","Install","InstallService","InstanceNormalizationLayer","InString","Integer","IntegerDigits","IntegerExponent","IntegerLength","IntegerName","IntegerPart","IntegerPartitions","IntegerQ","IntegerReverse","Integers","IntegerString","Integral","Integrate","IntegrateChangeVariables","Interactive","InteractiveTradingChart","InterfaceSwitched","Interlaced","Interleaving","InternallyBalancedDecomposition","InterpolatingFunction","InterpolatingPolynomial","Interpolation","InterpolationOrder","InterpolationPoints","InterpolationPrecision","Interpretation","InterpretationBox","InterpretationBoxOptions","InterpretationFunction","Interpreter","InterpretTemplate","InterquartileRange","Interrupt","InterruptSettings","IntersectedEntityClass","IntersectingQ","Intersection","Interval","IntervalIntersection","IntervalMarkers","IntervalMarkersStyle","IntervalMemberQ","IntervalSlider","IntervalUnion","Into","Inverse","InverseBetaRegularized","InverseBilateralLaplaceTransform","InverseBilateralZTransform","InverseCDF","InverseChiSquareDistribution","InverseContinuousWaveletTransform","InverseDistanceTransform","InverseEllipticNomeQ","InverseErf","InverseErfc","InverseFourier","InverseFourierCosTransform","InverseFourierSequenceTransform","InverseFourierSinTransform","InverseFourierTransform","InverseFunction","InverseFunctions","InverseGammaDistribution","InverseGammaRegularized","InverseGaussianDistribution","InverseGudermannian","InverseHankelTransform","InverseHaversine","InverseImagePyramid","InverseJacobiCD","InverseJacobiCN","InverseJacobiCS","InverseJacobiDC","InverseJacobiDN","InverseJacobiDS","InverseJacobiNC","InverseJacobiND","InverseJacobiNS","InverseJacobiSC","InverseJacobiSD","InverseJacobiSN","InverseLaplaceTransform","InverseMellinTransform","InversePermutation","InverseRadon","InverseRadonTransform","InverseSeries","InverseShortTimeFourier","InverseSpectrogram","InverseSurvivalFunction","InverseTransformedRegion","InverseWaveletTransform","InverseWeierstrassP","InverseWishartMatrixDistribution","InverseZTransform","Invisible","InvisibleApplication","InvisibleTimes","IPAddress","IrreduciblePolynomialQ","IslandData","IsolatingInterval","IsomorphicGraphQ","IsomorphicSubgraphQ","IsotopeData","Italic","Item","ItemAspectRatio","ItemBox","ItemBoxOptions","ItemDisplayFunction","ItemSize","ItemStyle","ItoProcess","JaccardDissimilarity","JacobiAmplitude","Jacobian","JacobiCD","JacobiCN","JacobiCS","JacobiDC","JacobiDN","JacobiDS","JacobiEpsilon","JacobiNC","JacobiND","JacobiNS","JacobiP","JacobiSC","JacobiSD","JacobiSN","JacobiSymbol","JacobiZeta","JacobiZN","JankoGroupJ1","JankoGroupJ2","JankoGroupJ3","JankoGroupJ4","JarqueBeraALMTest","JohnsonDistribution","Join","JoinAcross","Joined","JoinedCurve","JoinedCurveBox","JoinedCurveBoxOptions","JoinForm","JordanDecomposition","JordanModelDecomposition","JulianDate","JuliaSetBoettcher","JuliaSetIterationCount","JuliaSetPlot","JuliaSetPoints","K","KagiChart","KaiserBesselWindow","KaiserWindow","KalmanEstimator","KalmanFilter","KarhunenLoeveDecomposition","KaryTree","KatzCentrality","KCoreComponents","KDistribution","KEdgeConnectedComponents","KEdgeConnectedGraphQ","KeepExistingVersion","KelvinBei","KelvinBer","KelvinKei","KelvinKer","KendallTau","KendallTauTest","KernelConfiguration","KernelExecute","KernelFunction","KernelMixtureDistribution","KernelObject","Kernels","Ket","Key","KeyCollisionFunction","KeyComplement","KeyDrop","KeyDropFrom","KeyExistsQ","KeyFreeQ","KeyIntersection","KeyMap","KeyMemberQ","KeypointStrength","Keys","KeySelect","KeySort","KeySortBy","KeyTake","KeyUnion","KeyValueMap","KeyValuePattern","Khinchin","KillProcess","KirchhoffGraph","KirchhoffMatrix","KleinInvariantJ","KnapsackSolve","KnightTourGraph","KnotData","KnownUnitQ","KochCurve","KolmogorovSmirnovTest","KroneckerDelta","KroneckerModelDecomposition","KroneckerProduct","KroneckerSymbol","KuiperTest","KumaraswamyDistribution","Kurtosis","KuwaharaFilter","KVertexConnectedComponents","KVertexConnectedGraphQ","LABColor","Label","Labeled","LabeledSlider","LabelingFunction","LabelingSize","LabelStyle","LabelVisibility","LaguerreL","LakeData","LambdaComponents","LambertW","LameC","LameCPrime","LameEigenvalueA","LameEigenvalueB","LameS","LameSPrime","LaminaData","LanczosWindow","LandauDistribution","Language","LanguageCategory","LanguageData","LanguageIdentify","LanguageOptions","LaplaceDistribution","LaplaceTransform","Laplacian","LaplacianFilter","LaplacianGaussianFilter","LaplacianPDETerm","Large","Larger","Last","Latitude","LatitudeLongitude","LatticeData","LatticeReduce","Launch","LaunchKernels","LayeredGraphPlot","LayeredGraphPlot3D","LayerSizeFunction","LayoutInformation","LCHColor","LCM","LeaderSize","LeafCount","LeapVariant","LeapYearQ","LearnDistribution","LearnedDistribution","LearningRate","LearningRateMultipliers","LeastSquares","LeastSquaresFilterKernel","Left","LeftArrow","LeftArrowBar","LeftArrowRightArrow","LeftDownTeeVector","LeftDownVector","LeftDownVectorBar","LeftRightArrow","LeftRightVector","LeftTee","LeftTeeArrow","LeftTeeVector","LeftTriangle","LeftTriangleBar","LeftTriangleEqual","LeftUpDownVector","LeftUpTeeVector","LeftUpVector","LeftUpVectorBar","LeftVector","LeftVectorBar","LegendAppearance","Legended","LegendFunction","LegendLabel","LegendLayout","LegendMargins","LegendMarkers","LegendMarkerSize","LegendreP","LegendreQ","LegendreType","Length","LengthWhile","LerchPhi","Less","LessEqual","LessEqualGreater","LessEqualThan","LessFullEqual","LessGreater","LessLess","LessSlantEqual","LessThan","LessTilde","LetterCharacter","LetterCounts","LetterNumber","LetterQ","Level","LeveneTest","LeviCivitaTensor","LevyDistribution","Lexicographic","LexicographicOrder","LexicographicSort","LibraryDataType","LibraryFunction","LibraryFunctionDeclaration","LibraryFunctionError","LibraryFunctionInformation","LibraryFunctionLoad","LibraryFunctionUnload","LibraryLoad","LibraryUnload","LicenseEntitlementObject","LicenseEntitlements","LicenseID","LicensingSettings","LiftingFilterData","LiftingWaveletTransform","LightBlue","LightBrown","LightCyan","Lighter","LightGray","LightGreen","Lighting","LightingAngle","LightMagenta","LightOrange","LightPink","LightPurple","LightRed","LightSources","LightYellow","Likelihood","Limit","LimitsPositioning","LimitsPositioningTokens","LindleyDistribution","Line","Line3DBox","Line3DBoxOptions","LinearFilter","LinearFractionalOptimization","LinearFractionalTransform","LinearGradientFilling","LinearGradientImage","LinearizingTransformationData","LinearLayer","LinearModelFit","LinearOffsetFunction","LinearOptimization","LinearProgramming","LinearRecurrence","LinearSolve","LinearSolveFunction","LineBox","LineBoxOptions","LineBreak","LinebreakAdjustments","LineBreakChart","LinebreakSemicolonWeighting","LineBreakWithin","LineColor","LineGraph","LineIndent","LineIndentMaxFraction","LineIntegralConvolutionPlot","LineIntegralConvolutionScale","LineLegend","LineOpacity","LineSpacing","LineWrapParts","LinkActivate","LinkClose","LinkConnect","LinkConnectedQ","LinkCreate","LinkError","LinkFlush","LinkFunction","LinkHost","LinkInterrupt","LinkLaunch","LinkMode","LinkObject","LinkOpen","LinkOptions","LinkPatterns","LinkProtocol","LinkRankCentrality","LinkRead","LinkReadHeld","LinkReadyQ","Links","LinkService","LinkWrite","LinkWriteHeld","LiouvilleLambda","List","Listable","ListAnimate","ListContourPlot","ListContourPlot3D","ListConvolve","ListCorrelate","ListCurvePathPlot","ListDeconvolve","ListDensityPlot","ListDensityPlot3D","Listen","ListFormat","ListFourierSequenceTransform","ListInterpolation","ListLineIntegralConvolutionPlot","ListLinePlot","ListLinePlot3D","ListLogLinearPlot","ListLogLogPlot","ListLogPlot","ListPicker","ListPickerBox","ListPickerBoxBackground","ListPickerBoxOptions","ListPlay","ListPlot","ListPlot3D","ListPointPlot3D","ListPolarPlot","ListQ","ListSliceContourPlot3D","ListSliceDensityPlot3D","ListSliceVectorPlot3D","ListStepPlot","ListStreamDensityPlot","ListStreamPlot","ListStreamPlot3D","ListSurfacePlot3D","ListVectorDensityPlot","ListVectorDisplacementPlot","ListVectorDisplacementPlot3D","ListVectorPlot","ListVectorPlot3D","ListZTransform","Literal","LiteralSearch","LiteralType","LoadCompiledComponent","LocalAdaptiveBinarize","LocalCache","LocalClusteringCoefficient","LocalEvaluate","LocalizeDefinitions","LocalizeVariables","LocalObject","LocalObjects","LocalResponseNormalizationLayer","LocalSubmit","LocalSymbol","LocalTime","LocalTimeZone","LocationEquivalenceTest","LocationTest","Locator","LocatorAutoCreate","LocatorBox","LocatorBoxOptions","LocatorCentering","LocatorPane","LocatorPaneBox","LocatorPaneBoxOptions","LocatorRegion","Locked","Log","Log10","Log2","LogBarnesG","LogGamma","LogGammaDistribution","LogicalExpand","LogIntegral","LogisticDistribution","LogisticSigmoid","LogitModelFit","LogLikelihood","LogLinearPlot","LogLogisticDistribution","LogLogPlot","LogMultinormalDistribution","LogNormalDistribution","LogPlot","LogRankTest","LogSeriesDistribution","LongEqual","Longest","LongestCommonSequence","LongestCommonSequencePositions","LongestCommonSubsequence","LongestCommonSubsequencePositions","LongestMatch","LongestOrderedSequence","LongForm","Longitude","LongLeftArrow","LongLeftRightArrow","LongRightArrow","LongShortTermMemoryLayer","Lookup","Loopback","LoopFreeGraphQ","Looping","LossFunction","LowerCaseQ","LowerLeftArrow","LowerRightArrow","LowerTriangularize","LowerTriangularMatrix","LowerTriangularMatrixQ","LowpassFilter","LQEstimatorGains","LQGRegulator","LQOutputRegulatorGains","LQRegulatorGains","LUBackSubstitution","LucasL","LuccioSamiComponents","LUDecomposition","LunarEclipse","LUVColor","LyapunovSolve","LyonsGroupLy","MachineID","MachineName","MachineNumberQ","MachinePrecision","MacintoshSystemPageSetup","Magenta","Magnification","Magnify","MailAddressValidation","MailExecute","MailFolder","MailItem","MailReceiverFunction","MailResponseFunction","MailSearch","MailServerConnect","MailServerConnection","MailSettings","MainSolve","MaintainDynamicCaches","Majority","MakeBoxes","MakeExpression","MakeRules","ManagedLibraryExpressionID","ManagedLibraryExpressionQ","MandelbrotSetBoettcher","MandelbrotSetDistance","MandelbrotSetIterationCount","MandelbrotSetMemberQ","MandelbrotSetPlot","MangoldtLambda","ManhattanDistance","Manipulate","Manipulator","MannedSpaceMissionData","MannWhitneyTest","MantissaExponent","Manual","Map","MapAll","MapApply","MapAt","MapIndexed","MAProcess","MapThread","MarchenkoPasturDistribution","MarcumQ","MardiaCombinedTest","MardiaKurtosisTest","MardiaSkewnessTest","MarginalDistribution","MarkovProcessProperties","Masking","MassConcentrationCondition","MassFluxValue","MassImpermeableBoundaryValue","MassOutflowValue","MassSymmetryValue","MassTransferValue","MassTransportPDEComponent","MatchingDissimilarity","MatchLocalNameQ","MatchLocalNames","MatchQ","Material","MaterialShading","MaternPointProcess","MathematicalFunctionData","MathematicaNotation","MathieuC","MathieuCharacteristicA","MathieuCharacteristicB","MathieuCharacteristicExponent","MathieuCPrime","MathieuGroupM11","MathieuGroupM12","MathieuGroupM22","MathieuGroupM23","MathieuGroupM24","MathieuS","MathieuSPrime","MathMLForm","MathMLText","Matrices","MatrixExp","MatrixForm","MatrixFunction","MatrixLog","MatrixNormalDistribution","MatrixPlot","MatrixPower","MatrixPropertyDistribution","MatrixQ","MatrixRank","MatrixTDistribution","Max","MaxBend","MaxCellMeasure","MaxColorDistance","MaxDate","MaxDetect","MaxDisplayedChildren","MaxDuration","MaxExtraBandwidths","MaxExtraConditions","MaxFeatureDisplacement","MaxFeatures","MaxFilter","MaximalBy","Maximize","MaxItems","MaxIterations","MaxLimit","MaxMemoryUsed","MaxMixtureKernels","MaxOverlapFraction","MaxPlotPoints","MaxPoints","MaxRecursion","MaxStableDistribution","MaxStepFraction","MaxSteps","MaxStepSize","MaxTrainingRounds","MaxValue","MaxwellDistribution","MaxWordGap","McLaughlinGroupMcL","Mean","MeanAbsoluteLossLayer","MeanAround","MeanClusteringCoefficient","MeanDegreeConnectivity","MeanDeviation","MeanFilter","MeanGraphDistance","MeanNeighborDegree","MeanPointDensity","MeanShift","MeanShiftFilter","MeanSquaredLossLayer","Median","MedianDeviation","MedianFilter","MedicalTestData","Medium","MeijerG","MeijerGReduce","MeixnerDistribution","MellinConvolve","MellinTransform","MemberQ","MemoryAvailable","MemoryConstrained","MemoryConstraint","MemoryInUse","MengerMesh","Menu","MenuAppearance","MenuCommandKey","MenuEvaluator","MenuItem","MenuList","MenuPacket","MenuSortingValue","MenuStyle","MenuView","Merge","MergeDifferences","MergingFunction","MersennePrimeExponent","MersennePrimeExponentQ","Mesh","MeshCellCentroid","MeshCellCount","MeshCellHighlight","MeshCellIndex","MeshCellLabel","MeshCellMarker","MeshCellMeasure","MeshCellQuality","MeshCells","MeshCellShapeFunction","MeshCellStyle","MeshConnectivityGraph","MeshCoordinates","MeshFunctions","MeshPrimitives","MeshQualityGoal","MeshRange","MeshRefinementFunction","MeshRegion","MeshRegionQ","MeshShading","MeshStyle","Message","MessageDialog","MessageList","MessageName","MessageObject","MessageOptions","MessagePacket","Messages","MessagesNotebook","MetaCharacters","MetaInformation","MeteorShowerData","Method","MethodOptions","MexicanHatWavelet","MeyerWavelet","Midpoint","MIMETypeToFormatList","Min","MinColorDistance","MinDate","MinDetect","MineralData","MinFilter","MinimalBy","MinimalPolynomial","MinimalStateSpaceModel","Minimize","MinimumTimeIncrement","MinIntervalSize","MinkowskiQuestionMark","MinLimit","MinMax","MinorPlanetData","Minors","MinPointSeparation","MinRecursion","MinSize","MinStableDistribution","Minus","MinusPlus","MinValue","Missing","MissingBehavior","MissingDataMethod","MissingDataRules","MissingQ","MissingString","MissingStyle","MissingValuePattern","MissingValueSynthesis","MittagLefflerE","MixedFractionParts","MixedGraphQ","MixedMagnitude","MixedRadix","MixedRadixQuantity","MixedUnit","MixtureDistribution","Mod","Modal","Mode","ModelPredictiveController","Modular","ModularInverse","ModularLambda","Module","Modulus","MoebiusMu","Molecule","MoleculeAlign","MoleculeContainsQ","MoleculeDraw","MoleculeEquivalentQ","MoleculeFreeQ","MoleculeGraph","MoleculeMatchQ","MoleculeMaximumCommonSubstructure","MoleculeModify","MoleculeName","MoleculePattern","MoleculePlot","MoleculePlot3D","MoleculeProperty","MoleculeQ","MoleculeRecognize","MoleculeSubstructureCount","MoleculeValue","Moment","MomentConvert","MomentEvaluate","MomentGeneratingFunction","MomentOfInertia","Monday","Monitor","MonomialList","MonomialOrder","MonsterGroupM","MoonPhase","MoonPosition","MorletWavelet","MorphologicalBinarize","MorphologicalBranchPoints","MorphologicalComponents","MorphologicalEulerNumber","MorphologicalGraph","MorphologicalPerimeter","MorphologicalTransform","MortalityData","Most","MountainData","MouseAnnotation","MouseAppearance","MouseAppearanceTag","MouseButtons","Mouseover","MousePointerNote","MousePosition","MovieData","MovingAverage","MovingMap","MovingMedian","MoyalDistribution","MultiaxisArrangement","Multicolumn","MultiedgeStyle","MultigraphQ","MultilaunchWarning","MultiLetterItalics","MultiLetterStyle","MultilineFunction","Multinomial","MultinomialDistribution","MultinormalDistribution","MultiplicativeOrder","Multiplicity","MultiplySides","MultiscriptBoxOptions","Multiselection","MultivariateHypergeometricDistribution","MultivariatePoissonDistribution","MultivariateTDistribution","N","NakagamiDistribution","NameQ","Names","NamespaceBox","NamespaceBoxOptions","Nand","NArgMax","NArgMin","NBernoulliB","NBodySimulation","NBodySimulationData","NCache","NCaputoD","NDEigensystem","NDEigenvalues","NDSolve","NDSolveValue","Nearest","NearestFunction","NearestMeshCells","NearestNeighborG","NearestNeighborGraph","NearestTo","NebulaData","NeedlemanWunschSimilarity","Needs","Negative","NegativeBinomialDistribution","NegativeDefiniteMatrixQ","NegativeIntegers","NegativelyOrientedPoints","NegativeMultinomialDistribution","NegativeRationals","NegativeReals","NegativeSemidefiniteMatrixQ","NeighborhoodData","NeighborhoodGraph","Nest","NestedGreaterGreater","NestedLessLess","NestedScriptRules","NestGraph","NestList","NestTree","NestWhile","NestWhileList","NetAppend","NetArray","NetArrayLayer","NetBidirectionalOperator","NetChain","NetDecoder","NetDelete","NetDrop","NetEncoder","NetEvaluationMode","NetExternalObject","NetExtract","NetFlatten","NetFoldOperator","NetGANOperator","NetGraph","NetInformation","NetInitialize","NetInsert","NetInsertSharedArrays","NetJoin","NetMapOperator","NetMapThreadOperator","NetMeasurements","NetModel","NetNestOperator","NetPairEmbeddingOperator","NetPort","NetPortGradient","NetPrepend","NetRename","NetReplace","NetReplacePart","NetSharedArray","NetStateObject","NetTake","NetTrain","NetTrainResultsObject","NetUnfold","NetworkPacketCapture","NetworkPacketRecording","NetworkPacketRecordingDuring","NetworkPacketTrace","NeumannValue","NevilleThetaC","NevilleThetaD","NevilleThetaN","NevilleThetaS","NewPrimitiveStyle","NExpectation","Next","NextCell","NextDate","NextPrime","NextScheduledTaskTime","NeymanScottPointProcess","NFractionalD","NHoldAll","NHoldFirst","NHoldRest","NicholsGridLines","NicholsPlot","NightHemisphere","NIntegrate","NMaximize","NMaxValue","NMinimize","NMinValue","NominalScale","NominalVariables","NonAssociative","NoncentralBetaDistribution","NoncentralChiSquareDistribution","NoncentralFRatioDistribution","NoncentralStudentTDistribution","NonCommutativeMultiply","NonConstants","NondimensionalizationTransform","None","NoneTrue","NonlinearModelFit","NonlinearStateSpaceModel","NonlocalMeansFilter","NonNegative","NonNegativeIntegers","NonNegativeRationals","NonNegativeReals","NonPositive","NonPositiveIntegers","NonPositiveRationals","NonPositiveReals","Nor","NorlundB","Norm","Normal","NormalDistribution","NormalGrouping","NormalizationLayer","Normalize","Normalized","NormalizedSquaredEuclideanDistance","NormalMatrixQ","NormalsFunction","NormFunction","Not","NotCongruent","NotCupCap","NotDoubleVerticalBar","Notebook","NotebookApply","NotebookAutoSave","NotebookBrowseDirectory","NotebookClose","NotebookConvertSettings","NotebookCreate","NotebookDefault","NotebookDelete","NotebookDirectory","NotebookDynamicExpression","NotebookEvaluate","NotebookEventActions","NotebookFileName","NotebookFind","NotebookGet","NotebookImport","NotebookInformation","NotebookInterfaceObject","NotebookLocate","NotebookObject","NotebookOpen","NotebookPath","NotebookPrint","NotebookPut","NotebookRead","Notebooks","NotebookSave","NotebookSelection","NotebooksMenu","NotebookTemplate","NotebookWrite","NotElement","NotEqualTilde","NotExists","NotGreater","NotGreaterEqual","NotGreaterFullEqual","NotGreaterGreater","NotGreaterLess","NotGreaterSlantEqual","NotGreaterTilde","Nothing","NotHumpDownHump","NotHumpEqual","NotificationFunction","NotLeftTriangle","NotLeftTriangleBar","NotLeftTriangleEqual","NotLess","NotLessEqual","NotLessFullEqual","NotLessGreater","NotLessLess","NotLessSlantEqual","NotLessTilde","NotNestedGreaterGreater","NotNestedLessLess","NotPrecedes","NotPrecedesEqual","NotPrecedesSlantEqual","NotPrecedesTilde","NotReverseElement","NotRightTriangle","NotRightTriangleBar","NotRightTriangleEqual","NotSquareSubset","NotSquareSubsetEqual","NotSquareSuperset","NotSquareSupersetEqual","NotSubset","NotSubsetEqual","NotSucceeds","NotSucceedsEqual","NotSucceedsSlantEqual","NotSucceedsTilde","NotSuperset","NotSupersetEqual","NotTilde","NotTildeEqual","NotTildeFullEqual","NotTildeTilde","NotVerticalBar","Now","NoWhitespace","NProbability","NProduct","NProductFactors","NRoots","NSolve","NSolveValues","NSum","NSumTerms","NuclearExplosionData","NuclearReactorData","Null","NullRecords","NullSpace","NullWords","Number","NumberCompose","NumberDecompose","NumberDigit","NumberExpand","NumberFieldClassNumber","NumberFieldDiscriminant","NumberFieldFundamentalUnits","NumberFieldIntegralBasis","NumberFieldNormRepresentatives","NumberFieldRegulator","NumberFieldRootsOfUnity","NumberFieldSignature","NumberForm","NumberFormat","NumberLinePlot","NumberMarks","NumberMultiplier","NumberPadding","NumberPoint","NumberQ","NumberSeparator","NumberSigns","NumberString","Numerator","NumeratorDenominator","NumericalOrder","NumericalSort","NumericArray","NumericArrayQ","NumericArrayType","NumericFunction","NumericQ","NuttallWindow","NValues","NyquistGridLines","NyquistPlot","O","ObjectExistsQ","ObservabilityGramian","ObservabilityMatrix","ObservableDecomposition","ObservableModelQ","OceanData","Octahedron","OddQ","Off","Offset","OLEData","On","ONanGroupON","Once","OneIdentity","Opacity","OpacityFunction","OpacityFunctionScaling","Open","OpenAppend","Opener","OpenerBox","OpenerBoxOptions","OpenerView","OpenFunctionInspectorPacket","Opening","OpenRead","OpenSpecialOptions","OpenTemporary","OpenWrite","Operate","OperatingSystem","OperatorApplied","OptimumFlowData","Optional","OptionalElement","OptionInspectorSettings","OptionQ","Options","OptionsPacket","OptionsPattern","OptionValue","OptionValueBox","OptionValueBoxOptions","Or","Orange","Order","OrderDistribution","OrderedQ","Ordering","OrderingBy","OrderingLayer","Orderless","OrderlessPatternSequence","OrdinalScale","OrnsteinUhlenbeckProcess","Orthogonalize","OrthogonalMatrixQ","Out","Outer","OuterPolygon","OuterPolyhedron","OutputAutoOverwrite","OutputControllabilityMatrix","OutputControllableModelQ","OutputForm","OutputFormData","OutputGrouping","OutputMathEditExpression","OutputNamePacket","OutputPorts","OutputResponse","OutputSizeLimit","OutputStream","Over","OverBar","OverDot","Overflow","OverHat","Overlaps","Overlay","OverlayBox","OverlayBoxOptions","OverlayVideo","Overscript","OverscriptBox","OverscriptBoxOptions","OverTilde","OverVector","OverwriteTarget","OwenT","OwnValues","Package","PackingMethod","PackPaclet","PacletDataRebuild","PacletDirectoryAdd","PacletDirectoryLoad","PacletDirectoryRemove","PacletDirectoryUnload","PacletDisable","PacletEnable","PacletFind","PacletFindRemote","PacletInformation","PacletInstall","PacletInstallSubmit","PacletNewerQ","PacletObject","PacletObjectQ","PacletSite","PacletSiteObject","PacletSiteRegister","PacletSites","PacletSiteUnregister","PacletSiteUpdate","PacletSymbol","PacletUninstall","PacletUpdate","PaddedForm","Padding","PaddingLayer","PaddingSize","PadeApproximant","PadLeft","PadRight","PageBreakAbove","PageBreakBelow","PageBreakWithin","PageFooterLines","PageFooters","PageHeaderLines","PageHeaders","PageHeight","PageRankCentrality","PageTheme","PageWidth","Pagination","PairCorrelationG","PairedBarChart","PairedHistogram","PairedSmoothHistogram","PairedTTest","PairedZTest","PaletteNotebook","PalettePath","PalettesMenuSettings","PalindromeQ","Pane","PaneBox","PaneBoxOptions","Panel","PanelBox","PanelBoxOptions","Paneled","PaneSelector","PaneSelectorBox","PaneSelectorBoxOptions","PaperWidth","ParabolicCylinderD","ParagraphIndent","ParagraphSpacing","ParallelArray","ParallelAxisPlot","ParallelCombine","ParallelDo","Parallelepiped","ParallelEvaluate","Parallelization","Parallelize","ParallelKernels","ParallelMap","ParallelNeeds","Parallelogram","ParallelProduct","ParallelSubmit","ParallelSum","ParallelTable","ParallelTry","Parameter","ParameterEstimator","ParameterMixtureDistribution","ParameterVariables","ParametricConvexOptimization","ParametricFunction","ParametricNDSolve","ParametricNDSolveValue","ParametricPlot","ParametricPlot3D","ParametricRampLayer","ParametricRegion","ParentBox","ParentCell","ParentConnect","ParentDirectory","ParentEdgeLabel","ParentEdgeLabelFunction","ParentEdgeLabelStyle","ParentEdgeShapeFunction","ParentEdgeStyle","ParentEdgeStyleFunction","ParentForm","Parenthesize","ParentList","ParentNotebook","ParetoDistribution","ParetoPickandsDistribution","ParkData","Part","PartBehavior","PartialCorrelationFunction","PartialD","ParticleAcceleratorData","ParticleData","Partition","PartitionGranularity","PartitionsP","PartitionsQ","PartLayer","PartOfSpeech","PartProtection","ParzenWindow","PascalDistribution","PassEventsDown","PassEventsUp","Paste","PasteAutoQuoteCharacters","PasteBoxFormInlineCells","PasteButton","Path","PathGraph","PathGraphQ","Pattern","PatternFilling","PatternReaction","PatternSequence","PatternTest","PauliMatrix","PaulWavelet","Pause","PausedTime","PDF","PeakDetect","PeanoCurve","PearsonChiSquareTest","PearsonCorrelationTest","PearsonDistribution","PenttinenPointProcess","PercentForm","PerfectNumber","PerfectNumberQ","PerformanceGoal","Perimeter","PeriodicBoundaryCondition","PeriodicInterpolation","Periodogram","PeriodogramArray","Permanent","Permissions","PermissionsGroup","PermissionsGroupMemberQ","PermissionsGroups","PermissionsKey","PermissionsKeys","PermutationCycles","PermutationCyclesQ","PermutationGroup","PermutationLength","PermutationList","PermutationListQ","PermutationMatrix","PermutationMax","PermutationMin","PermutationOrder","PermutationPower","PermutationProduct","PermutationReplace","Permutations","PermutationSupport","Permute","PeronaMalikFilter","Perpendicular","PerpendicularBisector","PersistenceLocation","PersistenceTime","PersistentObject","PersistentObjects","PersistentSymbol","PersistentValue","PersonData","PERTDistribution","PetersenGraph","PhaseMargins","PhaseRange","PhongShading","PhysicalSystemData","Pi","Pick","PickedElements","PickMode","PIDData","PIDDerivativeFilter","PIDFeedforward","PIDTune","Piecewise","PiecewiseExpand","PieChart","PieChart3D","PillaiTrace","PillaiTraceTest","PingTime","Pink","PitchRecognize","Pivoting","PixelConstrained","PixelValue","PixelValuePositions","Placed","Placeholder","PlaceholderLayer","PlaceholderReplace","Plain","PlanarAngle","PlanarFaceList","PlanarGraph","PlanarGraphQ","PlanckRadiationLaw","PlaneCurveData","PlanetaryMoonData","PlanetData","PlantData","Play","PlaybackSettings","PlayRange","Plot","Plot3D","Plot3Matrix","PlotDivision","PlotJoined","PlotLabel","PlotLabels","PlotLayout","PlotLegends","PlotMarkers","PlotPoints","PlotRange","PlotRangeClipping","PlotRangeClipPlanesStyle","PlotRangePadding","PlotRegion","PlotStyle","PlotTheme","Pluralize","Plus","PlusMinus","Pochhammer","PodStates","PodWidth","Point","Point3DBox","Point3DBoxOptions","PointBox","PointBoxOptions","PointCountDistribution","PointDensity","PointDensityFunction","PointFigureChart","PointLegend","PointLight","PointProcessEstimator","PointProcessFitTest","PointProcessParameterAssumptions","PointProcessParameterQ","PointSize","PointStatisticFunction","PointValuePlot","PoissonConsulDistribution","PoissonDistribution","PoissonPDEComponent","PoissonPointProcess","PoissonProcess","PoissonWindow","PolarAxes","PolarAxesOrigin","PolarGridLines","PolarPlot","PolarTicks","PoleZeroMarkers","PolyaAeppliDistribution","PolyGamma","Polygon","Polygon3DBox","Polygon3DBoxOptions","PolygonalNumber","PolygonAngle","PolygonBox","PolygonBoxOptions","PolygonCoordinates","PolygonDecomposition","PolygonHoleScale","PolygonIntersections","PolygonScale","Polyhedron","PolyhedronAngle","PolyhedronBox","PolyhedronBoxOptions","PolyhedronCoordinates","PolyhedronData","PolyhedronDecomposition","PolyhedronGenus","PolyLog","PolynomialExpressionQ","PolynomialExtendedGCD","PolynomialForm","PolynomialGCD","PolynomialLCM","PolynomialMod","PolynomialQ","PolynomialQuotient","PolynomialQuotientRemainder","PolynomialReduce","PolynomialRemainder","Polynomials","PolynomialSumOfSquaresList","PoolingLayer","PopupMenu","PopupMenuBox","PopupMenuBoxOptions","PopupView","PopupWindow","Position","PositionIndex","PositionLargest","PositionSmallest","Positive","PositiveDefiniteMatrixQ","PositiveIntegers","PositivelyOrientedPoints","PositiveRationals","PositiveReals","PositiveSemidefiniteMatrixQ","PossibleZeroQ","Postfix","PostScript","Power","PowerDistribution","PowerExpand","PowerMod","PowerModList","PowerRange","PowerSpectralDensity","PowersRepresentations","PowerSymmetricPolynomial","Precedence","PrecedenceForm","Precedes","PrecedesEqual","PrecedesSlantEqual","PrecedesTilde","Precision","PrecisionGoal","PreDecrement","Predict","PredictionRoot","PredictorFunction","PredictorInformation","PredictorMeasurements","PredictorMeasurementsObject","PreemptProtect","PreferencesPath","PreferencesSettings","Prefix","PreIncrement","Prepend","PrependLayer","PrependTo","PreprocessingRules","PreserveColor","PreserveImageOptions","Previous","PreviousCell","PreviousDate","PriceGraphDistribution","PrimaryPlaceholder","Prime","PrimeNu","PrimeOmega","PrimePi","PrimePowerQ","PrimeQ","Primes","PrimeZetaP","PrimitivePolynomialQ","PrimitiveRoot","PrimitiveRootList","PrincipalComponents","PrincipalValue","Print","PrintableASCIIQ","PrintAction","PrintForm","PrintingCopies","PrintingOptions","PrintingPageRange","PrintingStartingPageNumber","PrintingStyleEnvironment","Printout3D","Printout3DPreviewer","PrintPrecision","PrintTemporary","Prism","PrismBox","PrismBoxOptions","PrivateCellOptions","PrivateEvaluationOptions","PrivateFontOptions","PrivateFrontEndOptions","PrivateKey","PrivateNotebookOptions","PrivatePaths","Probability","ProbabilityDistribution","ProbabilityPlot","ProbabilityPr","ProbabilityScalePlot","ProbitModelFit","ProcessConnection","ProcessDirectory","ProcessEnvironment","Processes","ProcessEstimator","ProcessInformation","ProcessObject","ProcessParameterAssumptions","ProcessParameterQ","ProcessStateDomain","ProcessStatus","ProcessTimeDomain","Product","ProductDistribution","ProductLog","ProgressIndicator","ProgressIndicatorBox","ProgressIndicatorBoxOptions","ProgressReporting","Projection","Prolog","PromptForm","ProofObject","PropagateAborts","Properties","Property","PropertyList","PropertyValue","Proportion","Proportional","Protect","Protected","ProteinData","Pruning","PseudoInverse","PsychrometricPropertyData","PublicKey","PublisherID","PulsarData","PunctuationCharacter","Purple","Put","PutAppend","Pyramid","PyramidBox","PyramidBoxOptions","QBinomial","QFactorial","QGamma","QHypergeometricPFQ","QnDispersion","QPochhammer","QPolyGamma","QRDecomposition","QuadraticIrrationalQ","QuadraticOptimization","Quantile","QuantilePlot","Quantity","QuantityArray","QuantityDistribution","QuantityForm","QuantityMagnitude","QuantityQ","QuantityUnit","QuantityVariable","QuantityVariableCanonicalUnit","QuantityVariableDimensions","QuantityVariableIdentifier","QuantityVariablePhysicalQuantity","Quartics","QuartileDeviation","Quartiles","QuartileSkewness","Query","QuestionGenerator","QuestionInterface","QuestionObject","QuestionSelector","QueueingNetworkProcess","QueueingProcess","QueueProperties","Quiet","QuietEcho","Quit","Quotient","QuotientRemainder","RadialAxisPlot","RadialGradientFilling","RadialGradientImage","RadialityCentrality","RadicalBox","RadicalBoxOptions","RadioButton","RadioButtonBar","RadioButtonBox","RadioButtonBoxOptions","Radon","RadonTransform","RamanujanTau","RamanujanTauL","RamanujanTauTheta","RamanujanTauZ","Ramp","Random","RandomArrayLayer","RandomChoice","RandomColor","RandomComplex","RandomDate","RandomEntity","RandomFunction","RandomGeneratorState","RandomGeoPosition","RandomGraph","RandomImage","RandomInstance","RandomInteger","RandomPermutation","RandomPoint","RandomPointConfiguration","RandomPolygon","RandomPolyhedron","RandomPrime","RandomReal","RandomSample","RandomSeed","RandomSeeding","RandomTime","RandomTree","RandomVariate","RandomWalkProcess","RandomWord","Range","RangeFilter","RangeSpecification","RankedMax","RankedMin","RarerProbability","Raster","Raster3D","Raster3DBox","Raster3DBoxOptions","RasterArray","RasterBox","RasterBoxOptions","Rasterize","RasterSize","Rational","RationalExpressionQ","RationalFunctions","Rationalize","Rationals","Ratios","RawArray","RawBoxes","RawData","RawMedium","RayleighDistribution","Re","ReactionBalance","ReactionBalancedQ","ReactionPDETerm","Read","ReadByteArray","ReadLine","ReadList","ReadProtected","ReadString","Real","RealAbs","RealBlockDiagonalForm","RealDigits","RealExponent","Reals","RealSign","Reap","RebuildPacletData","RecalibrationFunction","RecognitionPrior","RecognitionThreshold","ReconstructionMesh","Record","RecordLists","RecordSeparators","Rectangle","RectangleBox","RectangleBoxOptions","RectangleChart","RectangleChart3D","RectangularRepeatingElement","RecurrenceFilter","RecurrenceTable","RecurringDigitsForm","Red","Reduce","RefBox","ReferenceLineStyle","ReferenceMarkers","ReferenceMarkerStyle","Refine","ReflectionMatrix","ReflectionTransform","Refresh","RefreshRate","Region","RegionBinarize","RegionBoundary","RegionBoundaryStyle","RegionBounds","RegionCentroid","RegionCongruent","RegionConvert","RegionDifference","RegionDilation","RegionDimension","RegionDisjoint","RegionDistance","RegionDistanceFunction","RegionEmbeddingDimension","RegionEqual","RegionErosion","RegionFillingStyle","RegionFit","RegionFunction","RegionImage","RegionIntersection","RegionMeasure","RegionMember","RegionMemberFunction","RegionMoment","RegionNearest","RegionNearestFunction","RegionPlot","RegionPlot3D","RegionProduct","RegionQ","RegionResize","RegionSimilar","RegionSize","RegionSymmetricDifference","RegionUnion","RegionWithin","RegisterExternalEvaluator","RegularExpression","Regularization","RegularlySampledQ","RegularPolygon","ReIm","ReImLabels","ReImPlot","ReImStyle","Reinstall","RelationalDatabase","RelationGraph","Release","ReleaseHold","ReliabilityDistribution","ReliefImage","ReliefPlot","RemoteAuthorizationCaching","RemoteBatchJobAbort","RemoteBatchJobObject","RemoteBatchJobs","RemoteBatchMapSubmit","RemoteBatchSubmissionEnvironment","RemoteBatchSubmit","RemoteConnect","RemoteConnectionObject","RemoteEvaluate","RemoteFile","RemoteInputFiles","RemoteKernelObject","RemoteProviderSettings","RemoteRun","RemoteRunProcess","RemovalConditions","Remove","RemoveAlphaChannel","RemoveAsynchronousTask","RemoveAudioStream","RemoveBackground","RemoveChannelListener","RemoveChannelSubscribers","Removed","RemoveDiacritics","RemoveInputStreamMethod","RemoveOutputStreamMethod","RemoveProperty","RemoveScheduledTask","RemoveUsers","RemoveVideoStream","RenameDirectory","RenameFile","RenderAll","RenderingOptions","RenewalProcess","RenkoChart","RepairMesh","Repeated","RepeatedNull","RepeatedString","RepeatedTiming","RepeatingElement","Replace","ReplaceAll","ReplaceAt","ReplaceHeldPart","ReplaceImageValue","ReplaceList","ReplacePart","ReplacePixelValue","ReplaceRepeated","ReplicateLayer","RequiredPhysicalQuantities","Resampling","ResamplingAlgorithmData","ResamplingMethod","Rescale","RescalingTransform","ResetDirectory","ResetScheduledTask","ReshapeLayer","Residue","ResidueSum","ResizeLayer","Resolve","ResolveContextAliases","ResourceAcquire","ResourceData","ResourceFunction","ResourceObject","ResourceRegister","ResourceRemove","ResourceSearch","ResourceSubmissionObject","ResourceSubmit","ResourceSystemBase","ResourceSystemPath","ResourceUpdate","ResourceVersion","ResponseForm","Rest","RestartInterval","Restricted","Resultant","ResumePacket","Return","ReturnCreatesNewCell","ReturnEntersInput","ReturnExpressionPacket","ReturnInputFormPacket","ReturnPacket","ReturnReceiptFunction","ReturnTextPacket","Reverse","ReverseApplied","ReverseBiorthogonalSplineWavelet","ReverseElement","ReverseEquilibrium","ReverseGraph","ReverseSort","ReverseSortBy","ReverseUpEquilibrium","RevolutionAxis","RevolutionPlot3D","RGBColor","RiccatiSolve","RiceDistribution","RidgeFilter","RiemannR","RiemannSiegelTheta","RiemannSiegelZ","RiemannXi","Riffle","Right","RightArrow","RightArrowBar","RightArrowLeftArrow","RightComposition","RightCosetRepresentative","RightDownTeeVector","RightDownVector","RightDownVectorBar","RightTee","RightTeeArrow","RightTeeVector","RightTriangle","RightTriangleBar","RightTriangleEqual","RightUpDownVector","RightUpTeeVector","RightUpVector","RightUpVectorBar","RightVector","RightVectorBar","RipleyK","RipleyRassonRegion","RiskAchievementImportance","RiskReductionImportance","RobustConvexOptimization","RogersTanimotoDissimilarity","RollPitchYawAngles","RollPitchYawMatrix","RomanNumeral","Root","RootApproximant","RootIntervals","RootLocusPlot","RootMeanSquare","RootOfUnityQ","RootReduce","Roots","RootSum","RootTree","Rotate","RotateLabel","RotateLeft","RotateRight","RotationAction","RotationBox","RotationBoxOptions","RotationMatrix","RotationTransform","Round","RoundImplies","RoundingRadius","Row","RowAlignments","RowBackgrounds","RowBox","RowHeights","RowLines","RowMinHeight","RowReduce","RowsEqual","RowSpacings","RSolve","RSolveValue","RudinShapiro","RudvalisGroupRu","Rule","RuleCondition","RuleDelayed","RuleForm","RulePlot","RulerUnits","RulesTree","Run","RunProcess","RunScheduledTask","RunThrough","RuntimeAttributes","RuntimeOptions","RussellRaoDissimilarity","SameAs","SameQ","SameTest","SameTestProperties","SampledEntityClass","SampleDepth","SampledSoundFunction","SampledSoundList","SampleRate","SamplingPeriod","SARIMAProcess","SARMAProcess","SASTriangle","SatelliteData","SatisfiabilityCount","SatisfiabilityInstances","SatisfiableQ","Saturday","Save","Saveable","SaveAutoDelete","SaveConnection","SaveDefinitions","SavitzkyGolayMatrix","SawtoothWave","Scale","Scaled","ScaleDivisions","ScaledMousePosition","ScaleOrigin","ScalePadding","ScaleRanges","ScaleRangeStyle","ScalingFunctions","ScalingMatrix","ScalingTransform","Scan","ScheduledTask","ScheduledTaskActiveQ","ScheduledTaskInformation","ScheduledTaskInformationData","ScheduledTaskObject","ScheduledTasks","SchurDecomposition","ScientificForm","ScientificNotationThreshold","ScorerGi","ScorerGiPrime","ScorerHi","ScorerHiPrime","ScreenRectangle","ScreenStyleEnvironment","ScriptBaselineShifts","ScriptForm","ScriptLevel","ScriptMinSize","ScriptRules","ScriptSizeMultipliers","Scrollbars","ScrollingOptions","ScrollPosition","SearchAdjustment","SearchIndexObject","SearchIndices","SearchQueryString","SearchResultObject","Sec","Sech","SechDistribution","SecondOrderConeOptimization","SectionGrouping","SectorChart","SectorChart3D","SectorOrigin","SectorSpacing","SecuredAuthenticationKey","SecuredAuthenticationKeys","SecurityCertificate","SeedRandom","Select","Selectable","SelectComponents","SelectedCells","SelectedNotebook","SelectFirst","Selection","SelectionAnimate","SelectionCell","SelectionCellCreateCell","SelectionCellDefaultStyle","SelectionCellParentStyle","SelectionCreateCell","SelectionDebuggerTag","SelectionEvaluate","SelectionEvaluateCreateCell","SelectionMove","SelectionPlaceholder","SelectWithContents","SelfLoops","SelfLoopStyle","SemanticImport","SemanticImportString","SemanticInterpretation","SemialgebraicComponentInstances","SemidefiniteOptimization","SendMail","SendMessage","Sequence","SequenceAlignment","SequenceAttentionLayer","SequenceCases","SequenceCount","SequenceFold","SequenceFoldList","SequenceForm","SequenceHold","SequenceIndicesLayer","SequenceLastLayer","SequenceMostLayer","SequencePosition","SequencePredict","SequencePredictorFunction","SequenceReplace","SequenceRestLayer","SequenceReverseLayer","SequenceSplit","Series","SeriesCoefficient","SeriesData","SeriesTermGoal","ServiceConnect","ServiceDisconnect","ServiceExecute","ServiceObject","ServiceRequest","ServiceResponse","ServiceSubmit","SessionSubmit","SessionTime","Set","SetAccuracy","SetAlphaChannel","SetAttributes","Setbacks","SetCloudDirectory","SetCookies","SetDelayed","SetDirectory","SetEnvironment","SetFileDate","SetFileFormatProperties","SetOptions","SetOptionsPacket","SetPermissions","SetPrecision","SetProperty","SetSecuredAuthenticationKey","SetSelectedNotebook","SetSharedFunction","SetSharedVariable","SetStreamPosition","SetSystemModel","SetSystemOptions","Setter","SetterBar","SetterBox","SetterBoxOptions","Setting","SetUsers","Shading","Shallow","ShannonWavelet","ShapiroWilkTest","Share","SharingList","Sharpen","ShearingMatrix","ShearingTransform","ShellRegion","ShenCastanMatrix","ShiftedGompertzDistribution","ShiftRegisterSequence","Short","ShortDownArrow","Shortest","ShortestMatch","ShortestPathFunction","ShortLeftArrow","ShortRightArrow","ShortTimeFourier","ShortTimeFourierData","ShortUpArrow","Show","ShowAutoConvert","ShowAutoSpellCheck","ShowAutoStyles","ShowCellBracket","ShowCellLabel","ShowCellTags","ShowClosedCellArea","ShowCodeAssist","ShowContents","ShowControls","ShowCursorTracker","ShowGroupOpenCloseIcon","ShowGroupOpener","ShowInvisibleCharacters","ShowPageBreaks","ShowPredictiveInterface","ShowSelection","ShowShortBoxForm","ShowSpecialCharacters","ShowStringCharacters","ShowSyntaxStyles","ShrinkingDelay","ShrinkWrapBoundingBox","SiderealTime","SiegelTheta","SiegelTukeyTest","SierpinskiCurve","SierpinskiMesh","Sign","Signature","SignedRankTest","SignedRegionDistance","SignificanceLevel","SignPadding","SignTest","SimilarityRules","SimpleGraph","SimpleGraphQ","SimplePolygonQ","SimplePolyhedronQ","Simplex","Simplify","Sin","Sinc","SinghMaddalaDistribution","SingleEvaluation","SingleLetterItalics","SingleLetterStyle","SingularValueDecomposition","SingularValueList","SingularValuePlot","SingularValues","Sinh","SinhIntegral","SinIntegral","SixJSymbol","Skeleton","SkeletonTransform","SkellamDistribution","Skewness","SkewNormalDistribution","SkinStyle","Skip","SliceContourPlot3D","SliceDensityPlot3D","SliceDistribution","SliceVectorPlot3D","Slider","Slider2D","Slider2DBox","Slider2DBoxOptions","SliderBox","SliderBoxOptions","SlideShowVideo","SlideView","Slot","SlotSequence","Small","SmallCircle","Smaller","SmithDecomposition","SmithDelayCompensator","SmithWatermanSimilarity","SmoothDensityHistogram","SmoothHistogram","SmoothHistogram3D","SmoothKernelDistribution","SmoothPointDensity","SnDispersion","Snippet","SnippetsVideo","SnubPolyhedron","SocialMediaData","Socket","SocketConnect","SocketListen","SocketListener","SocketObject","SocketOpen","SocketReadMessage","SocketReadyQ","Sockets","SocketWaitAll","SocketWaitNext","SoftmaxLayer","SokalSneathDissimilarity","SolarEclipse","SolarSystemFeatureData","SolarTime","SolidAngle","SolidBoundaryLoadValue","SolidData","SolidDisplacementCondition","SolidFixedCondition","SolidMechanicsPDEComponent","SolidMechanicsStrain","SolidMechanicsStress","SolidRegionQ","Solve","SolveAlways","SolveDelayed","SolveValues","Sort","SortBy","SortedBy","SortedEntityClass","Sound","SoundAndGraphics","SoundNote","SoundVolume","SourceLink","SourcePDETerm","Sow","Space","SpaceCurveData","SpaceForm","Spacer","Spacings","Span","SpanAdjustments","SpanCharacterRounding","SpanFromAbove","SpanFromBoth","SpanFromLeft","SpanLineThickness","SpanMaxSize","SpanMinSize","SpanningCharacters","SpanSymmetric","SparseArray","SparseArrayQ","SpatialBinnedPointData","SpatialBoundaryCorrection","SpatialEstimate","SpatialEstimatorFunction","SpatialGraphDistribution","SpatialJ","SpatialMedian","SpatialNoiseLevel","SpatialObservationRegionQ","SpatialPointData","SpatialPointSelect","SpatialRandomnessTest","SpatialTransformationLayer","SpatialTrendFunction","Speak","SpeakerMatchQ","SpearmanRankTest","SpearmanRho","SpeciesData","SpecificityGoal","SpectralLineData","Spectrogram","SpectrogramArray","Specularity","SpeechCases","SpeechInterpreter","SpeechRecognize","SpeechSynthesize","SpellingCorrection","SpellingCorrectionList","SpellingDictionaries","SpellingDictionariesPath","SpellingOptions","Sphere","SphereBox","SphereBoxOptions","SpherePoints","SphericalBesselJ","SphericalBesselY","SphericalHankelH1","SphericalHankelH2","SphericalHarmonicY","SphericalPlot3D","SphericalRegion","SphericalShell","SpheroidalEigenvalue","SpheroidalJoiningFactor","SpheroidalPS","SpheroidalPSPrime","SpheroidalQS","SpheroidalQSPrime","SpheroidalRadialFactor","SpheroidalS1","SpheroidalS1Prime","SpheroidalS2","SpheroidalS2Prime","Splice","SplicedDistribution","SplineClosed","SplineDegree","SplineKnots","SplineWeights","Split","SplitBy","SpokenString","SpotLight","Sqrt","SqrtBox","SqrtBoxOptions","Square","SquaredEuclideanDistance","SquareFreeQ","SquareIntersection","SquareMatrixQ","SquareRepeatingElement","SquaresR","SquareSubset","SquareSubsetEqual","SquareSuperset","SquareSupersetEqual","SquareUnion","SquareWave","SSSTriangle","StabilityMargins","StabilityMarginsStyle","StableDistribution","Stack","StackBegin","StackComplete","StackedDateListPlot","StackedListPlot","StackInhibit","StadiumShape","StandardAtmosphereData","StandardDeviation","StandardDeviationFilter","StandardForm","Standardize","Standardized","StandardOceanData","StandbyDistribution","Star","StarClusterData","StarData","StarGraph","StartAsynchronousTask","StartExternalSession","StartingStepSize","StartOfLine","StartOfString","StartProcess","StartScheduledTask","StartupSound","StartWebSession","StateDimensions","StateFeedbackGains","StateOutputEstimator","StateResponse","StateSpaceModel","StateSpaceRealization","StateSpaceTransform","StateTransformationLinearize","StationaryDistribution","StationaryWaveletPacketTransform","StationaryWaveletTransform","StatusArea","StatusCentrality","StepMonitor","StereochemistryElements","StieltjesGamma","StippleShading","StirlingS1","StirlingS2","StopAsynchronousTask","StoppingPowerData","StopScheduledTask","StrataVariables","StratonovichProcess","StraussHardcorePointProcess","StraussPointProcess","StreamColorFunction","StreamColorFunctionScaling","StreamDensityPlot","StreamMarkers","StreamPlot","StreamPlot3D","StreamPoints","StreamPosition","Streams","StreamScale","StreamStyle","StrictInequalities","String","StringBreak","StringByteCount","StringCases","StringContainsQ","StringCount","StringDelete","StringDrop","StringEndsQ","StringExpression","StringExtract","StringForm","StringFormat","StringFormatQ","StringFreeQ","StringInsert","StringJoin","StringLength","StringMatchQ","StringPadLeft","StringPadRight","StringPart","StringPartition","StringPosition","StringQ","StringRepeat","StringReplace","StringReplaceList","StringReplacePart","StringReverse","StringRiffle","StringRotateLeft","StringRotateRight","StringSkeleton","StringSplit","StringStartsQ","StringTake","StringTakeDrop","StringTemplate","StringToByteArray","StringToStream","StringTrim","StripBoxes","StripOnInput","StripStyleOnPaste","StripWrapperBoxes","StrokeForm","Struckthrough","StructuralImportance","StructuredArray","StructuredArrayHeadQ","StructuredSelection","StruveH","StruveL","Stub","StudentTDistribution","Style","StyleBox","StyleBoxAutoDelete","StyleData","StyleDefinitions","StyleForm","StyleHints","StyleKeyMapping","StyleMenuListing","StyleNameDialogSettings","StyleNames","StylePrint","StyleSheetPath","Subdivide","Subfactorial","Subgraph","SubMinus","SubPlus","SubresultantPolynomialRemainders","SubresultantPolynomials","Subresultants","Subscript","SubscriptBox","SubscriptBoxOptions","Subscripted","Subsequences","Subset","SubsetCases","SubsetCount","SubsetEqual","SubsetMap","SubsetPosition","SubsetQ","SubsetReplace","Subsets","SubStar","SubstitutionSystem","Subsuperscript","SubsuperscriptBox","SubsuperscriptBoxOptions","SubtitleEncoding","SubtitleTrackSelection","Subtract","SubtractFrom","SubtractSides","SubValues","Succeeds","SucceedsEqual","SucceedsSlantEqual","SucceedsTilde","Success","SuchThat","Sum","SumConvergence","SummationLayer","Sunday","SunPosition","Sunrise","Sunset","SuperDagger","SuperMinus","SupernovaData","SuperPlus","Superscript","SuperscriptBox","SuperscriptBoxOptions","Superset","SupersetEqual","SuperStar","Surd","SurdForm","SurfaceAppearance","SurfaceArea","SurfaceColor","SurfaceData","SurfaceGraphics","SurvivalDistribution","SurvivalFunction","SurvivalModel","SurvivalModelFit","SuspendPacket","SuzukiDistribution","SuzukiGroupSuz","SwatchLegend","Switch","Symbol","SymbolName","SymletWavelet","Symmetric","SymmetricDifference","SymmetricGroup","SymmetricKey","SymmetricMatrixQ","SymmetricPolynomial","SymmetricReduction","Symmetrize","SymmetrizedArray","SymmetrizedArrayRules","SymmetrizedDependentComponents","SymmetrizedIndependentComponents","SymmetrizedReplacePart","SynchronousInitialization","SynchronousUpdating","Synonyms","Syntax","SyntaxForm","SyntaxInformation","SyntaxLength","SyntaxPacket","SyntaxQ","SynthesizeMissingValues","SystemCredential","SystemCredentialData","SystemCredentialKey","SystemCredentialKeys","SystemCredentialStoreObject","SystemDialogInput","SystemException","SystemGet","SystemHelpPath","SystemInformation","SystemInformationData","SystemInstall","SystemModel","SystemModeler","SystemModelExamples","SystemModelLinearize","SystemModelMeasurements","SystemModelParametricSimulate","SystemModelPlot","SystemModelProgressReporting","SystemModelReliability","SystemModels","SystemModelSimulate","SystemModelSimulateSensitivity","SystemModelSimulationData","SystemOpen","SystemOptions","SystemProcessData","SystemProcesses","SystemsConnectionsModel","SystemsModelControllerData","SystemsModelDelay","SystemsModelDelayApproximate","SystemsModelDelete","SystemsModelDimensions","SystemsModelExtract","SystemsModelFeedbackConnect","SystemsModelLabels","SystemsModelLinearity","SystemsModelMerge","SystemsModelOrder","SystemsModelParallelConnect","SystemsModelSeriesConnect","SystemsModelStateFeedbackConnect","SystemsModelVectorRelativeOrders","SystemStub","SystemTest","Tab","TabFilling","Table","TableAlignments","TableDepth","TableDirections","TableForm","TableHeadings","TableSpacing","TableView","TableViewBox","TableViewBoxAlignment","TableViewBoxBackground","TableViewBoxHeaders","TableViewBoxItemSize","TableViewBoxItemStyle","TableViewBoxOptions","TabSpacings","TabView","TabViewBox","TabViewBoxOptions","TagBox","TagBoxNote","TagBoxOptions","TaggingRules","TagSet","TagSetDelayed","TagStyle","TagUnset","Take","TakeDrop","TakeLargest","TakeLargestBy","TakeList","TakeSmallest","TakeSmallestBy","TakeWhile","Tally","Tan","Tanh","TargetDevice","TargetFunctions","TargetSystem","TargetUnits","TaskAbort","TaskExecute","TaskObject","TaskRemove","TaskResume","Tasks","TaskSuspend","TaskWait","TautologyQ","TelegraphProcess","TemplateApply","TemplateArgBox","TemplateBox","TemplateBoxOptions","TemplateEvaluate","TemplateExpression","TemplateIf","TemplateObject","TemplateSequence","TemplateSlot","TemplateSlotSequence","TemplateUnevaluated","TemplateVerbatim","TemplateWith","TemporalData","TemporalRegularity","Temporary","TemporaryVariable","TensorContract","TensorDimensions","TensorExpand","TensorProduct","TensorQ","TensorRank","TensorReduce","TensorSymmetry","TensorTranspose","TensorWedge","TerminatedEvaluation","TernaryListPlot","TernaryPlotCorners","TestID","TestReport","TestReportObject","TestResultObject","Tetrahedron","TetrahedronBox","TetrahedronBoxOptions","TeXForm","TeXSave","Text","Text3DBox","Text3DBoxOptions","TextAlignment","TextBand","TextBoundingBox","TextBox","TextCases","TextCell","TextClipboardType","TextContents","TextData","TextElement","TextForm","TextGrid","TextJustification","TextLine","TextPacket","TextParagraph","TextPosition","TextRecognize","TextSearch","TextSearchReport","TextSentences","TextString","TextStructure","TextStyle","TextTranslation","Texture","TextureCoordinateFunction","TextureCoordinateScaling","TextWords","Therefore","ThermodynamicData","ThermometerGauge","Thick","Thickness","Thin","Thinning","ThisLink","ThomasPointProcess","ThompsonGroupTh","Thread","Threaded","ThreadingLayer","ThreeJSymbol","Threshold","Through","Throw","ThueMorse","Thumbnail","Thursday","TickDirection","TickLabelOrientation","TickLabelPositioning","TickLabels","TickLengths","TickPositions","Ticks","TicksStyle","TideData","Tilde","TildeEqual","TildeFullEqual","TildeTilde","TimeConstrained","TimeConstraint","TimeDirection","TimeFormat","TimeGoal","TimelinePlot","TimeObject","TimeObjectQ","TimeRemaining","Times","TimesBy","TimeSeries","TimeSeriesAggregate","TimeSeriesForecast","TimeSeriesInsert","TimeSeriesInvertibility","TimeSeriesMap","TimeSeriesMapThread","TimeSeriesModel","TimeSeriesModelFit","TimeSeriesResample","TimeSeriesRescale","TimeSeriesShift","TimeSeriesThread","TimeSeriesWindow","TimeSystem","TimeSystemConvert","TimeUsed","TimeValue","TimeWarpingCorrespondence","TimeWarpingDistance","TimeZone","TimeZoneConvert","TimeZoneOffset","Timing","Tiny","TitleGrouping","TitsGroupT","ToBoxes","ToCharacterCode","ToColor","ToContinuousTimeModel","ToDate","Today","ToDiscreteTimeModel","ToEntity","ToeplitzMatrix","ToExpression","ToFileName","Together","Toggle","ToggleFalse","Toggler","TogglerBar","TogglerBox","TogglerBoxOptions","ToHeldExpression","ToInvertibleTimeSeries","TokenWords","Tolerance","ToLowerCase","Tomorrow","ToNumberField","TooBig","Tooltip","TooltipBox","TooltipBoxOptions","TooltipDelay","TooltipStyle","ToonShading","Top","TopHatTransform","ToPolarCoordinates","TopologicalSort","ToRadicals","ToRawPointer","ToRules","Torus","TorusGraph","ToSphericalCoordinates","ToString","Total","TotalHeight","TotalLayer","TotalVariationFilter","TotalWidth","TouchPosition","TouchscreenAutoZoom","TouchscreenControlPlacement","ToUpperCase","TourVideo","Tr","Trace","TraceAbove","TraceAction","TraceBackward","TraceDepth","TraceDialog","TraceForward","TraceInternal","TraceLevel","TraceOff","TraceOn","TraceOriginal","TracePrint","TraceScan","TrackCellChangeTimes","TrackedSymbols","TrackingFunction","TracyWidomDistribution","TradingChart","TraditionalForm","TraditionalFunctionNotation","TraditionalNotation","TraditionalOrder","TrainImageContentDetector","TrainingProgressCheckpointing","TrainingProgressFunction","TrainingProgressMeasurements","TrainingProgressReporting","TrainingStoppingCriterion","TrainingUpdateSchedule","TrainTextContentDetector","TransferFunctionCancel","TransferFunctionExpand","TransferFunctionFactor","TransferFunctionModel","TransferFunctionPoles","TransferFunctionTransform","TransferFunctionZeros","TransformationClass","TransformationFunction","TransformationFunctions","TransformationMatrix","TransformedDistribution","TransformedField","TransformedProcess","TransformedRegion","TransitionDirection","TransitionDuration","TransitionEffect","TransitiveClosureGraph","TransitiveReductionGraph","Translate","TranslationOptions","TranslationTransform","Transliterate","Transparent","TransparentColor","Transpose","TransposeLayer","TrapEnterKey","TrapSelection","TravelDirections","TravelDirectionsData","TravelDistance","TravelDistanceList","TravelMethod","TravelTime","Tree","TreeCases","TreeChildren","TreeCount","TreeData","TreeDelete","TreeDepth","TreeElementCoordinates","TreeElementLabel","TreeElementLabelFunction","TreeElementLabelStyle","TreeElementShape","TreeElementShapeFunction","TreeElementSize","TreeElementSizeFunction","TreeElementStyle","TreeElementStyleFunction","TreeExpression","TreeExtract","TreeFold","TreeForm","TreeGraph","TreeGraphQ","TreeInsert","TreeLayout","TreeLeafCount","TreeLeafQ","TreeLeaves","TreeLevel","TreeMap","TreeMapAt","TreeOutline","TreePlot","TreePosition","TreeQ","TreeReplacePart","TreeRules","TreeScan","TreeSelect","TreeSize","TreeTraversalOrder","TrendStyle","Triangle","TriangleCenter","TriangleConstruct","TriangleMeasurement","TriangleWave","TriangularDistribution","TriangulateMesh","Trig","TrigExpand","TrigFactor","TrigFactorList","Trigger","TrigReduce","TrigToExp","TrimmedMean","TrimmedVariance","TropicalStormData","True","TrueQ","TruncatedDistribution","TruncatedPolyhedron","TsallisQExponentialDistribution","TsallisQGaussianDistribution","TTest","Tube","TubeBezierCurveBox","TubeBezierCurveBoxOptions","TubeBox","TubeBoxOptions","TubeBSplineCurveBox","TubeBSplineCurveBoxOptions","Tuesday","TukeyLambdaDistribution","TukeyWindow","TunnelData","Tuples","TuranGraph","TuringMachine","TuttePolynomial","TwoWayRule","Typed","TypeDeclaration","TypeEvaluate","TypeHint","TypeOf","TypeSpecifier","UnateQ","Uncompress","UnconstrainedParameters","Undefined","UnderBar","Underflow","Underlined","Underoverscript","UnderoverscriptBox","UnderoverscriptBoxOptions","Underscript","UnderscriptBox","UnderscriptBoxOptions","UnderseaFeatureData","UndirectedEdge","UndirectedGraph","UndirectedGraphQ","UndoOptions","UndoTrackedVariables","Unequal","UnequalTo","Unevaluated","UniformDistribution","UniformGraphDistribution","UniformPolyhedron","UniformSumDistribution","Uninstall","Union","UnionedEntityClass","UnionPlus","Unique","UniqueElements","UnitaryMatrixQ","UnitBox","UnitConvert","UnitDimensions","Unitize","UnitRootTest","UnitSimplify","UnitStep","UnitSystem","UnitTriangle","UnitVector","UnitVectorLayer","UnityDimensions","UniverseModelData","UniversityData","UnixTime","UnlabeledTree","UnmanageObject","Unprotect","UnregisterExternalEvaluator","UnsameQ","UnsavedVariables","Unset","UnsetShared","Until","UntrackedVariables","Up","UpArrow","UpArrowBar","UpArrowDownArrow","Update","UpdateDynamicObjects","UpdateDynamicObjectsSynchronous","UpdateInterval","UpdatePacletSites","UpdateSearchIndex","UpDownArrow","UpEquilibrium","UpperCaseQ","UpperLeftArrow","UpperRightArrow","UpperTriangularize","UpperTriangularMatrix","UpperTriangularMatrixQ","Upsample","UpSet","UpSetDelayed","UpTee","UpTeeArrow","UpTo","UpValues","URL","URLBuild","URLDecode","URLDispatcher","URLDownload","URLDownloadSubmit","URLEncode","URLExecute","URLExpand","URLFetch","URLFetchAsynchronous","URLParse","URLQueryDecode","URLQueryEncode","URLRead","URLResponseTime","URLSave","URLSaveAsynchronous","URLShorten","URLSubmit","UseEmbeddedLibrary","UseGraphicsRange","UserDefinedWavelet","Using","UsingFrontEnd","UtilityFunction","V2Get","ValenceErrorHandling","ValenceFilling","ValidationLength","ValidationSet","ValueBox","ValueBoxOptions","ValueDimensions","ValueForm","ValuePreprocessingFunction","ValueQ","Values","ValuesData","VandermondeMatrix","Variables","Variance","VarianceEquivalenceTest","VarianceEstimatorFunction","VarianceGammaDistribution","VarianceGammaPointProcess","VarianceTest","VariogramFunction","VariogramModel","VectorAngle","VectorAround","VectorAspectRatio","VectorColorFunction","VectorColorFunctionScaling","VectorDensityPlot","VectorDisplacementPlot","VectorDisplacementPlot3D","VectorGlyphData","VectorGreater","VectorGreaterEqual","VectorLess","VectorLessEqual","VectorMarkers","VectorPlot","VectorPlot3D","VectorPoints","VectorQ","VectorRange","Vectors","VectorScale","VectorScaling","VectorSizes","VectorStyle","Vee","Verbatim","Verbose","VerificationTest","VerifyConvergence","VerifyDerivedKey","VerifyDigitalSignature","VerifyFileSignature","VerifyInterpretation","VerifySecurityCertificates","VerifySolutions","VerifyTestAssumptions","VersionedPreferences","VertexAdd","VertexCapacity","VertexChromaticNumber","VertexColors","VertexComponent","VertexConnectivity","VertexContract","VertexCoordinateRules","VertexCoordinates","VertexCorrelationSimilarity","VertexCosineSimilarity","VertexCount","VertexCoverQ","VertexDataCoordinates","VertexDegree","VertexDelete","VertexDiceSimilarity","VertexEccentricity","VertexInComponent","VertexInComponentGraph","VertexInDegree","VertexIndex","VertexJaccardSimilarity","VertexLabeling","VertexLabels","VertexLabelStyle","VertexList","VertexNormals","VertexOutComponent","VertexOutComponentGraph","VertexOutDegree","VertexQ","VertexRenderingFunction","VertexReplace","VertexShape","VertexShapeFunction","VertexSize","VertexStyle","VertexTextureCoordinates","VertexTransitiveGraphQ","VertexWeight","VertexWeightedGraphQ","Vertical","VerticalBar","VerticalForm","VerticalGauge","VerticalSeparator","VerticalSlider","VerticalTilde","Video","VideoCapture","VideoCombine","VideoDelete","VideoEncoding","VideoExtractFrames","VideoFrameList","VideoFrameMap","VideoGenerator","VideoInsert","VideoIntervals","VideoJoin","VideoMap","VideoMapList","VideoMapTimeSeries","VideoPadding","VideoPause","VideoPlay","VideoQ","VideoRecord","VideoReplace","VideoScreenCapture","VideoSplit","VideoStop","VideoStream","VideoStreams","VideoTimeStretch","VideoTrackSelection","VideoTranscode","VideoTransparency","VideoTrim","ViewAngle","ViewCenter","ViewMatrix","ViewPoint","ViewPointSelectorSettings","ViewPort","ViewProjection","ViewRange","ViewVector","ViewVertical","VirtualGroupData","Visible","VisibleCell","VoiceStyleData","VoigtDistribution","VolcanoData","Volume","VonMisesDistribution","VoronoiMesh","WaitAll","WaitAsynchronousTask","WaitNext","WaitUntil","WakebyDistribution","WalleniusHypergeometricDistribution","WaringYuleDistribution","WarpingCorrespondence","WarpingDistance","WatershedComponents","WatsonUSquareTest","WattsStrogatzGraphDistribution","WaveletBestBasis","WaveletFilterCoefficients","WaveletImagePlot","WaveletListPlot","WaveletMapIndexed","WaveletMatrixPlot","WaveletPhi","WaveletPsi","WaveletScale","WaveletScalogram","WaveletThreshold","WavePDEComponent","WeaklyConnectedComponents","WeaklyConnectedGraphComponents","WeaklyConnectedGraphQ","WeakStationarity","WeatherData","WeatherForecastData","WebAudioSearch","WebColumn","WebElementObject","WeberE","WebExecute","WebImage","WebImageSearch","WebItem","WebPageMetaInformation","WebRow","WebSearch","WebSessionObject","WebSessions","WebWindowObject","Wedge","Wednesday","WeibullDistribution","WeierstrassE1","WeierstrassE2","WeierstrassE3","WeierstrassEta1","WeierstrassEta2","WeierstrassEta3","WeierstrassHalfPeriods","WeierstrassHalfPeriodW1","WeierstrassHalfPeriodW2","WeierstrassHalfPeriodW3","WeierstrassInvariantG2","WeierstrassInvariantG3","WeierstrassInvariants","WeierstrassP","WeierstrassPPrime","WeierstrassSigma","WeierstrassZeta","WeightedAdjacencyGraph","WeightedAdjacencyMatrix","WeightedData","WeightedGraphQ","Weights","WelchWindow","WheelGraph","WhenEvent","Which","While","White","WhiteNoiseProcess","WhitePoint","Whitespace","WhitespaceCharacter","WhittakerM","WhittakerW","WholeCellGroupOpener","WienerFilter","WienerProcess","WignerD","WignerSemicircleDistribution","WikidataData","WikidataSearch","WikipediaData","WikipediaSearch","WilksW","WilksWTest","WindDirectionData","WindingCount","WindingPolygon","WindowClickSelect","WindowElements","WindowFloating","WindowFrame","WindowFrameElements","WindowMargins","WindowMovable","WindowOpacity","WindowPersistentStyles","WindowSelected","WindowSize","WindowStatusArea","WindowTitle","WindowToolbars","WindowWidth","WindSpeedData","WindVectorData","WinsorizedMean","WinsorizedVariance","WishartMatrixDistribution","With","WithCleanup","WithLock","WolframAlpha","WolframAlphaDate","WolframAlphaQuantity","WolframAlphaResult","WolframCloudSettings","WolframLanguageData","Word","WordBoundary","WordCharacter","WordCloud","WordCount","WordCounts","WordData","WordDefinition","WordFrequency","WordFrequencyData","WordList","WordOrientation","WordSearch","WordSelectionFunction","WordSeparators","WordSpacings","WordStem","WordTranslation","WorkingPrecision","WrapAround","Write","WriteLine","WriteString","Wronskian","XMLElement","XMLObject","XMLTemplate","Xnor","Xor","XYZColor","Yellow","Yesterday","YuleDissimilarity","ZernikeR","ZeroSymmetric","ZeroTest","ZeroWidthTimes","Zeta","ZetaZero","ZIPCodeData","ZipfDistribution","ZoomCenter","ZoomFactor","ZTest","ZTransform","$Aborted","$ActivationGroupID","$ActivationKey","$ActivationUserRegistered","$AddOnsDirectory","$AllowDataUpdates","$AllowExternalChannelFunctions","$AllowInternet","$AssertFunction","$Assumptions","$AsynchronousTask","$AudioDecoders","$AudioEncoders","$AudioInputDevices","$AudioOutputDevices","$BaseDirectory","$BasePacletsDirectory","$BatchInput","$BatchOutput","$BlockchainBase","$BoxForms","$ByteOrdering","$CacheBaseDirectory","$Canceled","$ChannelBase","$CharacterEncoding","$CharacterEncodings","$CloudAccountName","$CloudBase","$CloudConnected","$CloudConnection","$CloudCreditsAvailable","$CloudEvaluation","$CloudExpressionBase","$CloudObjectNameFormat","$CloudObjectURLType","$CloudRootDirectory","$CloudSymbolBase","$CloudUserID","$CloudUserUUID","$CloudVersion","$CloudVersionNumber","$CloudWolframEngineVersionNumber","$CommandLine","$CompilationTarget","$CompilerEnvironment","$ConditionHold","$ConfiguredKernels","$Context","$ContextAliases","$ContextPath","$ControlActiveSetting","$Cookies","$CookieStore","$CreationDate","$CryptographicEllipticCurveNames","$CurrentLink","$CurrentTask","$CurrentWebSession","$DataStructures","$DateStringFormat","$DefaultAudioInputDevice","$DefaultAudioOutputDevice","$DefaultFont","$DefaultFrontEnd","$DefaultImagingDevice","$DefaultKernels","$DefaultLocalBase","$DefaultLocalKernel","$DefaultMailbox","$DefaultNetworkInterface","$DefaultPath","$DefaultProxyRules","$DefaultRemoteBatchSubmissionEnvironment","$DefaultRemoteKernel","$DefaultSystemCredentialStore","$Display","$DisplayFunction","$DistributedContexts","$DynamicEvaluation","$Echo","$EmbedCodeEnvironments","$EmbeddableServices","$EntityStores","$Epilog","$EvaluationCloudBase","$EvaluationCloudObject","$EvaluationEnvironment","$ExportFormats","$ExternalIdentifierTypes","$ExternalStorageBase","$Failed","$FinancialDataSource","$FontFamilies","$FormatType","$FrontEnd","$FrontEndSession","$GeneratedAssetLocation","$GeoEntityTypes","$GeoLocation","$GeoLocationCity","$GeoLocationCountry","$GeoLocationPrecision","$GeoLocationSource","$HistoryLength","$HomeDirectory","$HTMLExportRules","$HTTPCookies","$HTTPRequest","$IgnoreEOF","$ImageFormattingWidth","$ImageResolution","$ImagingDevice","$ImagingDevices","$ImportFormats","$IncomingMailSettings","$InitialDirectory","$Initialization","$InitializationContexts","$Input","$InputFileName","$InputStreamMethods","$Inspector","$InstallationDate","$InstallationDirectory","$InterfaceEnvironment","$InterpreterTypes","$IterationLimit","$KernelCount","$KernelID","$Language","$LaunchDirectory","$LibraryPath","$LicenseExpirationDate","$LicenseID","$LicenseProcesses","$LicenseServer","$LicenseSubprocesses","$LicenseType","$Line","$Linked","$LinkSupported","$LoadedFiles","$LocalBase","$LocalSymbolBase","$MachineAddresses","$MachineDomain","$MachineDomains","$MachineEpsilon","$MachineID","$MachineName","$MachinePrecision","$MachineType","$MaxDisplayedChildren","$MaxExtraPrecision","$MaxLicenseProcesses","$MaxLicenseSubprocesses","$MaxMachineNumber","$MaxNumber","$MaxPiecewiseCases","$MaxPrecision","$MaxRootDegree","$MessageGroups","$MessageList","$MessagePrePrint","$Messages","$MinMachineNumber","$MinNumber","$MinorReleaseNumber","$MinPrecision","$MobilePhone","$ModuleNumber","$NetworkConnected","$NetworkInterfaces","$NetworkLicense","$NewMessage","$NewSymbol","$NotebookInlineStorageLimit","$Notebooks","$NoValue","$NumberMarks","$Off","$OperatingSystem","$Output","$OutputForms","$OutputSizeLimit","$OutputStreamMethods","$Packages","$ParentLink","$ParentProcessID","$PasswordFile","$PatchLevelID","$Path","$PathnameSeparator","$PerformanceGoal","$Permissions","$PermissionsGroupBase","$PersistenceBase","$PersistencePath","$PipeSupported","$PlotTheme","$Post","$Pre","$PreferencesDirectory","$PreInitialization","$PrePrint","$PreRead","$PrintForms","$PrintLiteral","$Printout3DPreviewer","$ProcessID","$ProcessorCount","$ProcessorType","$ProductInformation","$ProgramName","$ProgressReporting","$PublisherID","$RandomGeneratorState","$RandomState","$RecursionLimit","$RegisteredDeviceClasses","$RegisteredUserName","$ReleaseNumber","$RequesterAddress","$RequesterCloudUserID","$RequesterCloudUserUUID","$RequesterWolframID","$RequesterWolframUUID","$ResourceSystemBase","$ResourceSystemPath","$RootDirectory","$ScheduledTask","$ScriptCommandLine","$ScriptInputString","$SecuredAuthenticationKeyTokens","$ServiceCreditsAvailable","$Services","$SessionID","$SetParentLink","$SharedFunctions","$SharedVariables","$SoundDisplay","$SoundDisplayFunction","$SourceLink","$SSHAuthentication","$SubtitleDecoders","$SubtitleEncoders","$SummaryBoxDataSizeLimit","$SuppressInputFormHeads","$SynchronousEvaluation","$SyntaxHandler","$System","$SystemCharacterEncoding","$SystemCredentialStore","$SystemID","$SystemMemory","$SystemShell","$SystemTimeZone","$SystemWordLength","$TargetSystems","$TemplatePath","$TemporaryDirectory","$TemporaryPrefix","$TestFileName","$TextStyle","$TimedOut","$TimeUnit","$TimeZone","$TimeZoneEntity","$TopDirectory","$TraceOff","$TraceOn","$TracePattern","$TracePostAction","$TracePreAction","$UnitSystem","$Urgent","$UserAddOnsDirectory","$UserAgentLanguages","$UserAgentMachine","$UserAgentName","$UserAgentOperatingSystem","$UserAgentString","$UserAgentVersion","$UserBaseDirectory","$UserBasePacletsDirectory","$UserDocumentsDirectory","$Username","$UserName","$UserURLBase","$Version","$VersionNumber","$VideoDecoders","$VideoEncoders","$VoiceStyles","$WolframDocumentsDirectory","$WolframID","$WolframUUID"]
 ;return t=>{
 const i=t.regex,o=i.either(i.concat(/([2-9]|[1-2]\d|[3][0-5])\^\^/,/(\w*\.\w+|\w+\.\w*|\w+)/),/(\d*\.\d+|\d+\.\d*|\d+)/),a=i.either(/``[+-]?(\d*\.\d+|\d+\.\d*|\d+)/,/`([+-]?(\d*\.\d+|\d+\.\d*|\d+))?/),n={
 className:"number",relevance:0,
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/matlab.min.js b/vendor/assets/javascripts/highlightjs/es/languages/matlab.min.js
index e27718ae2fa..52b011be004 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/matlab.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/matlab.min.js
@@ -1,15 +1,15 @@
-/*! `matlab` grammar compiled for Highlight.js 11.6.0 */
-var hljsGrammar=(()=>{"use strict";return e=>{const a={relevance:0,contains:[{
-begin:"('|\\.')+"}]};return{name:"Matlab",keywords:{
+/*! `matlab` grammar compiled for Highlight.js 11.8.0 */
+var hljsGrammar=(()=>{"use strict";return e=>{const a="('|\\.')+",s={
+relevance:0,contains:[{begin:a}]};return{name:"Matlab",keywords:{
 keyword:"arguments break case catch classdef continue else elseif end enumeration events for function global if methods otherwise parfor persistent properties return spmd switch try while",
 built_in:"sin sind sinh asin asind asinh cos cosd cosh acos acosd acosh tan tand tanh atan atand atan2 atanh sec secd sech asec asecd asech csc cscd csch acsc acscd acsch cot cotd coth acot acotd acoth hypot exp expm1 log log1p log10 log2 pow2 realpow reallog realsqrt sqrt nthroot nextpow2 abs angle complex conj imag real unwrap isreal cplxpair fix floor ceil round mod rem sign airy besselj bessely besselh besseli besselk beta betainc betaln ellipj ellipke erf erfc erfcx erfinv expint gamma gammainc gammaln psi legendre cross dot factor isprime primes gcd lcm rat rats perms nchoosek factorial cart2sph cart2pol pol2cart sph2cart hsv2rgb rgb2hsv zeros ones eye repmat rand randn linspace logspace freqspace meshgrid accumarray size length ndims numel disp isempty isequal isequalwithequalnans cat reshape diag blkdiag tril triu fliplr flipud flipdim rot90 find sub2ind ind2sub bsxfun ndgrid permute ipermute shiftdim circshift squeeze isscalar isvector ans eps realmax realmin pi i|0 inf nan isnan isinf isfinite j|0 why compan gallery hadamard hankel hilb invhilb magic pascal rosser toeplitz vander wilkinson max min nanmax nanmin mean nanmean type table readtable writetable sortrows sort figure plot plot3 scatter scatter3 cellfun legend intersect ismember procrustes hold num2cell "
 },illegal:'(//|"|#|/\\*|\\s+/\\w+)',contains:[{className:"function",
 beginKeywords:"function",end:"$",contains:[e.UNDERSCORE_TITLE_MODE,{
 className:"params",variants:[{begin:"\\(",end:"\\)"},{begin:"\\[",end:"\\]"}]}]
-},{className:"built_in",begin:/true|false/,relevance:0,starts:a},{
-begin:"[a-zA-Z][a-zA-Z_0-9]*('|\\.')+",relevance:0},{className:"number",
-begin:e.C_NUMBER_RE,relevance:0,starts:a},{className:"string",begin:"'",end:"'",
-contains:[{begin:"''"}]},{begin:/\]|\}|\)/,relevance:0,starts:a},{
-className:"string",begin:'"',end:'"',contains:[{begin:'""'}],starts:a
+},{className:"built_in",begin:/true|false/,relevance:0,starts:s},{
+begin:"[a-zA-Z][a-zA-Z_0-9]*"+a,relevance:0},{className:"number",
+begin:e.C_NUMBER_RE,relevance:0,starts:s},{className:"string",begin:"'",end:"'",
+contains:[{begin:"''"}]},{begin:/\]|\}|\)/,relevance:0,starts:s},{
+className:"string",begin:'"',end:'"',contains:[{begin:'""'}],starts:s
 },e.COMMENT("^\\s*%\\{\\s*$","^\\s*%\\}\\s*$"),e.COMMENT("%","$")]}}})()
 ;export default hljsGrammar;
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/maxima.min.js b/vendor/assets/javascripts/highlightjs/es/languages/maxima.min.js
index 1562d09fe24..ec47f3723bc 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/maxima.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/maxima.min.js
@@ -1,4 +1,4 @@
-/*! `maxima` grammar compiled for Highlight.js 11.6.0 */
+/*! `maxima` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"Maxima",keywords:{
 $pattern:"[A-Za-z_%][0-9A-Za-z_%]*",
 keyword:"if then else elseif for thru do while unless step in and or not",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/mel.min.js b/vendor/assets/javascripts/highlightjs/es/languages/mel.min.js
index 2bbde85a4d2..8aef51a35ad 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/mel.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/mel.min.js
@@ -1,4 +1,4 @@
-/*! `mel` grammar compiled for Highlight.js 11.6.0 */
+/*! `mel` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"MEL",
 keywords:"int float string vector matrix if else switch case default while do for in break continue global proc return about abs addAttr addAttributeEditorNodeHelp addDynamic addNewShelfTab addPP addPanelCategory addPrefixToName advanceToNextDrivenKey affectedNet affects aimConstraint air alias aliasAttr align alignCtx alignCurve alignSurface allViewFit ambientLight angle angleBetween animCone animCurveEditor animDisplay animView annotate appendStringArray applicationName applyAttrPreset applyTake arcLenDimContext arcLengthDimension arclen arrayMapper art3dPaintCtx artAttrCtx artAttrPaintVertexCtx artAttrSkinPaintCtx artAttrTool artBuildPaintMenu artFluidAttrCtx artPuttyCtx artSelectCtx artSetPaintCtx artUserPaintCtx assignCommand assignInputDevice assignViewportFactories attachCurve attachDeviceAttr attachSurface attrColorSliderGrp attrCompatibility attrControlGrp attrEnumOptionMenu attrEnumOptionMenuGrp attrFieldGrp attrFieldSliderGrp attrNavigationControlGrp attrPresetEditWin attributeExists attributeInfo attributeMenu attributeQuery autoKeyframe autoPlace bakeClip bakeFluidShading bakePartialHistory bakeResults bakeSimulation basename basenameEx batchRender bessel bevel bevelPlus binMembership bindSkin blend2 blendShape blendShapeEditor blendShapePanel blendTwoAttr blindDataType boneLattice boundary boxDollyCtx boxZoomCtx bufferCurve buildBookmarkMenu buildKeyframeMenu button buttonManip CBG cacheFile cacheFileCombine cacheFileMerge cacheFileTrack camera cameraView canCreateManip canvas capitalizeString catch catchQuiet ceil changeSubdivComponentDisplayLevel changeSubdivRegion channelBox character characterMap characterOutlineEditor characterize chdir checkBox checkBoxGrp checkDefaultRenderGlobals choice circle circularFillet clamp clear clearCache clip clipEditor clipEditorCurrentTimeCtx clipSchedule clipSchedulerOutliner clipTrimBefore closeCurve closeSurface cluster cmdFileOutput cmdScrollFieldExecuter cmdScrollFieldReporter cmdShell coarsenSubdivSelectionList collision color colorAtPoint colorEditor colorIndex colorIndexSliderGrp colorSliderButtonGrp colorSliderGrp columnLayout commandEcho commandLine commandPort compactHairSystem componentEditor compositingInterop computePolysetVolume condition cone confirmDialog connectAttr connectControl connectDynamic connectJoint connectionInfo constrain constrainValue constructionHistory container containsMultibyte contextInfo control convertFromOldLayers convertIffToPsd convertLightmap convertSolidTx convertTessellation convertUnit copyArray copyFlexor copyKey copySkinWeights cos cpButton cpCache cpClothSet cpCollision cpConstraint cpConvClothToMesh cpForces cpGetSolverAttr cpPanel cpProperty cpRigidCollisionFilter cpSeam cpSetEdit cpSetSolverAttr cpSolver cpSolverTypes cpTool cpUpdateClothUVs createDisplayLayer createDrawCtx createEditor createLayeredPsdFile createMotionField createNewShelf createNode createRenderLayer createSubdivRegion cross crossProduct ctxAbort ctxCompletion ctxEditMode ctxTraverse currentCtx currentTime currentTimeCtx currentUnit curve curveAddPtCtx curveCVCtx curveEPCtx curveEditorCtx curveIntersect curveMoveEPCtx curveOnSurface curveSketchCtx cutKey cycleCheck cylinder dagPose date defaultLightListCheckBox defaultNavigation defineDataServer defineVirtualDevice deformer deg_to_rad delete deleteAttr deleteShadingGroupsAndMaterials deleteShelfTab deleteUI deleteUnusedBrushes delrandstr detachCurve detachDeviceAttr detachSurface deviceEditor devicePanel dgInfo dgdirty dgeval dgtimer dimWhen directKeyCtx directionalLight dirmap dirname disable disconnectAttr disconnectJoint diskCache displacementToPoly displayAffected displayColor displayCull displayLevelOfDetail displayPref displayRGBColor displaySmoothness displayStats displayString displaySurface distanceDimContext distanceDimension doBlur dolly dollyCtx dopeSheetEditor dot dotProduct doubleProfileBirailSurface drag dragAttrContext draggerContext dropoffLocator duplicate duplicateCurve duplicateSurface dynCache dynControl dynExport dynExpression dynGlobals dynPaintEditor dynParticleCtx dynPref dynRelEdPanel dynRelEditor dynamicLoad editAttrLimits editDisplayLayerGlobals editDisplayLayerMembers editRenderLayerAdjustment editRenderLayerGlobals editRenderLayerMembers editor editorTemplate effector emit emitter enableDevice encodeString endString endsWith env equivalent equivalentTol erf error eval evalDeferred evalEcho event exactWorldBoundingBox exclusiveLightCheckBox exec executeForEachObject exists exp expression expressionEditorListen extendCurve extendSurface extrude fcheck fclose feof fflush fgetline fgetword file fileBrowserDialog fileDialog fileExtension fileInfo filetest filletCurve filter filterCurve filterExpand filterStudioImport findAllIntersections findAnimCurves findKeyframe findMenuItem findRelatedSkinCluster finder firstParentOf fitBspline flexor floatEq floatField floatFieldGrp floatScrollBar floatSlider floatSlider2 floatSliderButtonGrp floatSliderGrp floor flow fluidCacheInfo fluidEmitter fluidVoxelInfo flushUndo fmod fontDialog fopen formLayout format fprint frameLayout fread freeFormFillet frewind fromNativePath fwrite gamma gauss geometryConstraint getApplicationVersionAsFloat getAttr getClassification getDefaultBrush getFileList getFluidAttr getInputDeviceRange getMayaPanelTypes getModifiers getPanel getParticleAttr getPluginResource getenv getpid glRender glRenderEditor globalStitch gmatch goal gotoBindPose grabColor gradientControl gradientControlNoAttr graphDollyCtx graphSelectContext graphTrackCtx gravity grid gridLayout group groupObjectsByName HfAddAttractorToAS HfAssignAS HfBuildEqualMap HfBuildFurFiles HfBuildFurImages HfCancelAFR HfConnectASToHF HfCreateAttractor HfDeleteAS HfEditAS HfPerformCreateAS HfRemoveAttractorFromAS HfSelectAttached HfSelectAttractors HfUnAssignAS hardenPointCurve hardware hardwareRenderPanel headsUpDisplay headsUpMessage help helpLine hermite hide hilite hitTest hotBox hotkey hotkeyCheck hsv_to_rgb hudButton hudSlider hudSliderButton hwReflectionMap hwRender hwRenderLoad hyperGraph hyperPanel hyperShade hypot iconTextButton iconTextCheckBox iconTextRadioButton iconTextRadioCollection iconTextScrollList iconTextStaticLabel ikHandle ikHandleCtx ikHandleDisplayScale ikSolver ikSplineHandleCtx ikSystem ikSystemInfo ikfkDisplayMethod illustratorCurves image imfPlugins inheritTransform insertJoint insertJointCtx insertKeyCtx insertKnotCurve insertKnotSurface instance instanceable instancer intField intFieldGrp intScrollBar intSlider intSliderGrp interToUI internalVar intersect iprEngine isAnimCurve isConnected isDirty isParentOf isSameObject isTrue isValidObjectName isValidString isValidUiName isolateSelect itemFilter itemFilterAttr itemFilterRender itemFilterType joint jointCluster jointCtx jointDisplayScale jointLattice keyTangent keyframe keyframeOutliner keyframeRegionCurrentTimeCtx keyframeRegionDirectKeyCtx keyframeRegionDollyCtx keyframeRegionInsertKeyCtx keyframeRegionMoveKeyCtx keyframeRegionScaleKeyCtx keyframeRegionSelectKeyCtx keyframeRegionSetKeyCtx keyframeRegionTrackCtx keyframeStats lassoContext lattice latticeDeformKeyCtx launch launchImageEditor layerButton layeredShaderPort layeredTexturePort layout layoutDialog lightList lightListEditor lightListPanel lightlink lineIntersection linearPrecision linstep listAnimatable listAttr listCameras listConnections listDeviceAttachments listHistory listInputDeviceAxes listInputDeviceButtons listInputDevices listMenuAnnotation listNodeTypes listPanelCategories listRelatives listSets listTransforms listUnselected listerEditor loadFluid loadNewShelf loadPlugin loadPluginLanguageResources loadPrefObjects localizedPanelLabel lockNode loft log longNameOf lookThru ls lsThroughFilter lsType lsUI Mayatomr mag makeIdentity makeLive makePaintable makeRoll makeSingleSurface makeTubeOn makebot manipMoveContext manipMoveLimitsCtx manipOptions manipRotateContext manipRotateLimitsCtx manipScaleContext manipScaleLimitsCtx marker match max memory menu menuBarLayout menuEditor menuItem menuItemToShelf menuSet menuSetPref messageLine min minimizeApp mirrorJoint modelCurrentTimeCtx modelEditor modelPanel mouse movIn movOut move moveIKtoFK moveKeyCtx moveVertexAlongDirection multiProfileBirailSurface mute nParticle nameCommand nameField namespace namespaceInfo newPanelItems newton nodeCast nodeIconButton nodeOutliner nodePreset nodeType noise nonLinear normalConstraint normalize nurbsBoolean nurbsCopyUVSet nurbsCube nurbsEditUV nurbsPlane nurbsSelect nurbsSquare nurbsToPoly nurbsToPolygonsPref nurbsToSubdiv nurbsToSubdivPref nurbsUVSet nurbsViewDirectionVector objExists objectCenter objectLayer objectType objectTypeUI obsoleteProc oceanNurbsPreviewPlane offsetCurve offsetCurveOnSurface offsetSurface openGLExtension openMayaPref optionMenu optionMenuGrp optionVar orbit orbitCtx orientConstraint outlinerEditor outlinerPanel overrideModifier paintEffectsDisplay pairBlend palettePort paneLayout panel panelConfiguration panelHistory paramDimContext paramDimension paramLocator parent parentConstraint particle particleExists particleInstancer particleRenderInfo partition pasteKey pathAnimation pause pclose percent performanceOptions pfxstrokes pickWalk picture pixelMove planarSrf plane play playbackOptions playblast plugAttr plugNode pluginInfo pluginResourceUtil pointConstraint pointCurveConstraint pointLight pointMatrixMult pointOnCurve pointOnSurface pointPosition poleVectorConstraint polyAppend polyAppendFacetCtx polyAppendVertex polyAutoProjection polyAverageNormal polyAverageVertex polyBevel polyBlendColor polyBlindData polyBoolOp polyBridgeEdge polyCacheMonitor polyCheck polyChipOff polyClipboard polyCloseBorder polyCollapseEdge polyCollapseFacet polyColorBlindData polyColorDel polyColorPerVertex polyColorSet polyCompare polyCone polyCopyUV polyCrease polyCreaseCtx polyCreateFacet polyCreateFacetCtx polyCube polyCut polyCutCtx polyCylinder polyCylindricalProjection polyDelEdge polyDelFacet polyDelVertex polyDuplicateAndConnect polyDuplicateEdge polyEditUV polyEditUVShell polyEvaluate polyExtrudeEdge polyExtrudeFacet polyExtrudeVertex polyFlipEdge polyFlipUV polyForceUV polyGeoSampler polyHelix polyInfo polyInstallAction polyLayoutUV polyListComponentConversion polyMapCut polyMapDel polyMapSew polyMapSewMove polyMergeEdge polyMergeEdgeCtx polyMergeFacet polyMergeFacetCtx polyMergeUV polyMergeVertex polyMirrorFace polyMoveEdge polyMoveFacet polyMoveFacetUV polyMoveUV polyMoveVertex polyNormal polyNormalPerVertex polyNormalizeUV polyOptUvs polyOptions polyOutput polyPipe polyPlanarProjection polyPlane polyPlatonicSolid polyPoke polyPrimitive polyPrism polyProjection polyPyramid polyQuad polyQueryBlindData polyReduce polySelect polySelectConstraint polySelectConstraintMonitor polySelectCtx polySelectEditCtx polySeparate polySetToFaceNormal polySewEdge polyShortestPathCtx polySmooth polySoftEdge polySphere polySphericalProjection polySplit polySplitCtx polySplitEdge polySplitRing polySplitVertex polyStraightenUVBorder polySubdivideEdge polySubdivideFacet polyToSubdiv polyTorus polyTransfer polyTriangulate polyUVSet polyUnite polyWedgeFace popen popupMenu pose pow preloadRefEd print progressBar progressWindow projFileViewer projectCurve projectTangent projectionContext projectionManip promptDialog propModCtx propMove psdChannelOutliner psdEditTextureFile psdExport psdTextureFile putenv pwd python querySubdiv quit rad_to_deg radial radioButton radioButtonGrp radioCollection radioMenuItemCollection rampColorPort rand randomizeFollicles randstate rangeControl readTake rebuildCurve rebuildSurface recordAttr recordDevice redo reference referenceEdit referenceQuery refineSubdivSelectionList refresh refreshAE registerPluginResource rehash reloadImage removeJoint removeMultiInstance removePanelCategory rename renameAttr renameSelectionList renameUI render renderGlobalsNode renderInfo renderLayerButton renderLayerParent renderLayerPostProcess renderLayerUnparent renderManip renderPartition renderQualityNode renderSettings renderThumbnailUpdate renderWindowEditor renderWindowSelectContext renderer reorder reorderDeformers requires reroot resampleFluid resetAE resetPfxToPolyCamera resetTool resolutionNode retarget reverseCurve reverseSurface revolve rgb_to_hsv rigidBody rigidSolver roll rollCtx rootOf rot rotate rotationInterpolation roundConstantRadius rowColumnLayout rowLayout runTimeCommand runup sampleImage saveAllShelves saveAttrPreset saveFluid saveImage saveInitialState saveMenu savePrefObjects savePrefs saveShelf saveToolSettings scale scaleBrushBrightness scaleComponents scaleConstraint scaleKey scaleKeyCtx sceneEditor sceneUIReplacement scmh scriptCtx scriptEditorInfo scriptJob scriptNode scriptTable scriptToShelf scriptedPanel scriptedPanelType scrollField scrollLayout sculpt searchPathArray seed selLoadSettings select selectContext selectCurveCV selectKey selectKeyCtx selectKeyframeRegionCtx selectMode selectPref selectPriority selectType selectedNodes selectionConnection separator setAttr setAttrEnumResource setAttrMapping setAttrNiceNameResource setConstraintRestPosition setDefaultShadingGroup setDrivenKeyframe setDynamic setEditCtx setEditor setFluidAttr setFocus setInfinity setInputDeviceMapping setKeyCtx setKeyPath setKeyframe setKeyframeBlendshapeTargetWts setMenuMode setNodeNiceNameResource setNodeTypeFlag setParent setParticleAttr setPfxToPolyCamera setPluginResource setProject setStampDensity setStartupMessage setState setToolTo setUITemplate setXformManip sets shadingConnection shadingGeometryRelCtx shadingLightRelCtx shadingNetworkCompare shadingNode shapeCompare shelfButton shelfLayout shelfTabLayout shellField shortNameOf showHelp showHidden showManipCtx showSelectionInTitle showShadingGroupAttrEditor showWindow sign simplify sin singleProfileBirailSurface size sizeBytes skinCluster skinPercent smoothCurve smoothTangentSurface smoothstep snap2to2 snapKey snapMode snapTogetherCtx snapshot soft softMod softModCtx sort sound soundControl source spaceLocator sphere sphrand spotLight spotLightPreviewPort spreadSheetEditor spring sqrt squareSurface srtContext stackTrace startString startsWith stitchAndExplodeShell stitchSurface stitchSurfacePoints strcmp stringArrayCatenate stringArrayContains stringArrayCount stringArrayInsertAtIndex stringArrayIntersector stringArrayRemove stringArrayRemoveAtIndex stringArrayRemoveDuplicates stringArrayRemoveExact stringArrayToString stringToStringArray strip stripPrefixFromName stroke subdAutoProjection subdCleanTopology subdCollapse subdDuplicateAndConnect subdEditUV subdListComponentConversion subdMapCut subdMapSewMove subdMatchTopology subdMirror subdToBlind subdToPoly subdTransferUVsToCache subdiv subdivCrease subdivDisplaySmoothness substitute substituteAllString substituteGeometry substring surface surfaceSampler surfaceShaderList swatchDisplayPort switchTable symbolButton symbolCheckBox sysFile system tabLayout tan tangentConstraint texLatticeDeformContext texManipContext texMoveContext texMoveUVShellContext texRotateContext texScaleContext texSelectContext texSelectShortestPathCtx texSmudgeUVContext texWinToolCtx text textCurves textField textFieldButtonGrp textFieldGrp textManip textScrollList textToShelf textureDisplacePlane textureHairColor texturePlacementContext textureWindow threadCount threePointArcCtx timeControl timePort timerX toNativePath toggle toggleAxis toggleWindowVisibility tokenize tokenizeList tolerance tolower toolButton toolCollection toolDropped toolHasOptions toolPropertyWindow torus toupper trace track trackCtx transferAttributes transformCompare transformLimits translator trim trunc truncateFluidCache truncateHairCache tumble tumbleCtx turbulence twoPointArcCtx uiRes uiTemplate unassignInputDevice undo undoInfo ungroup uniform unit unloadPlugin untangleUV untitledFileName untrim upAxis updateAE userCtx uvLink uvSnapshot validateShelfName vectorize view2dToolCtx viewCamera viewClipPlane viewFit viewHeadOn viewLookAt viewManip viewPlace viewSet visor volumeAxis vortex waitCursor warning webBrowser webBrowserPrefs whatIs window windowPref wire wireContext workspace wrinkle wrinkleContext writeTake xbmLangPathList xform",
 illegal:"</",contains:[e.C_NUMBER_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/mercury.min.js b/vendor/assets/javascripts/highlightjs/es/languages/mercury.min.js
index a1d2ac61faf..fed086714ec 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/mercury.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/mercury.min.js
@@ -1,4 +1,4 @@
-/*! `mercury` grammar compiled for Highlight.js 11.6.0 */
+/*! `mercury` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const i=e.COMMENT("%","$"),n=e.inherit(e.APOS_STRING_MODE,{relevance:0
 }),r=e.inherit(e.QUOTE_STRING_MODE,{relevance:0})
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/mipsasm.min.js b/vendor/assets/javascripts/highlightjs/es/languages/mipsasm.min.js
index b4423396daa..16d9aa1400b 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/mipsasm.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/mipsasm.min.js
@@ -1,4 +1,4 @@
-/*! `mipsasm` grammar compiled for Highlight.js 11.6.0 */
+/*! `mipsasm` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"MIPS Assembly",
 case_insensitive:!0,aliases:["mips"],keywords:{$pattern:"\\.?"+e.IDENT_RE,
 meta:".2byte .4byte .align .ascii .asciz .balign .byte .code .data .else .end .endif .endm .endr .equ .err .exitm .extern .global .hword .if .ifdef .ifndef .include .irp .long .macro .rept .req .section .set .skip .space .text .word .ltorg ",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/mizar.min.js b/vendor/assets/javascripts/highlightjs/es/languages/mizar.min.js
index 17d7baf4c17..6ec5daaeeaa 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/mizar.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/mizar.min.js
@@ -1,4 +1,4 @@
-/*! `mizar` grammar compiled for Highlight.js 11.6.0 */
+/*! `mizar` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"Mizar",
 keywords:"environ vocabularies notations constructors definitions registrations theorems schemes requirements begin end definition registration cluster existence pred func defpred deffunc theorem proof let take assume then thus hence ex for st holds consider reconsider such that and in provided of as from be being by means equals implies iff redefine define now not or attr is mode suppose per cases set thesis contradiction scheme reserve struct correctness compatibility coherence symmetry assymetry reflexivity irreflexivity connectedness uniqueness commutativity idempotence involutiveness projectivity",
 contains:[e.COMMENT("::","$")]})})();export default hljsGrammar;
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/mojolicious.min.js b/vendor/assets/javascripts/highlightjs/es/languages/mojolicious.min.js
index c5be5a4647f..3433efc809f 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/mojolicious.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/mojolicious.min.js
@@ -1,4 +1,4 @@
-/*! `mojolicious` grammar compiled for Highlight.js 11.6.0 */
+/*! `mojolicious` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"Mojolicious",
 subLanguage:"xml",contains:[{className:"meta",begin:"^__(END|DATA)__$"},{
 begin:"^\\s*%{1,2}={0,2}",end:"$",subLanguage:"perl"},{begin:"<%{1,2}={0,2}",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/monkey.min.js b/vendor/assets/javascripts/highlightjs/es/languages/monkey.min.js
index e14e70d8fa3..bd3eb5c534d 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/monkey.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/monkey.min.js
@@ -1,4 +1,4 @@
-/*! `monkey` grammar compiled for Highlight.js 11.6.0 */
+/*! `monkey` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const n={className:"number",
 relevance:0,variants:[{begin:"[$][a-fA-F0-9]+"},e.NUMBER_MODE]},a={variants:[{
 match:[/(function|method)/,/\s+/,e.UNDERSCORE_IDENT_RE]}],scope:{1:"keyword",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/moonscript.min.js b/vendor/assets/javascripts/highlightjs/es/languages/moonscript.min.js
index b25b3d64fb1..51577dd5387 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/moonscript.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/moonscript.min.js
@@ -1,4 +1,4 @@
-/*! `moonscript` grammar compiled for Highlight.js 11.6.0 */
+/*! `moonscript` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const n={
 keyword:"if then not for in while do return else elseif break continue switch and or unless when class extends super local import export from using",
 literal:"true false nil",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/n1ql.min.js b/vendor/assets/javascripts/highlightjs/es/languages/n1ql.min.js
index 3dc6c1646af..64f1713f0d1 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/n1ql.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/n1ql.min.js
@@ -1,4 +1,4 @@
-/*! `n1ql` grammar compiled for Highlight.js 11.6.0 */
+/*! `n1ql` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"N1QL",case_insensitive:!0,
 contains:[{
 beginKeywords:"build create index delete drop explain infer|10 insert merge prepare select update upsert|10",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/nestedtext.min.js b/vendor/assets/javascripts/highlightjs/es/languages/nestedtext.min.js
index fdecd2e1bc6..28f249a9566 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/nestedtext.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/nestedtext.min.js
@@ -1,4 +1,4 @@
-/*! `nestedtext` grammar compiled for Highlight.js 11.6.0 */
+/*! `nestedtext` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return t=>({name:"Nested Text",
 aliases:["nt"],contains:[t.inherit(t.HASH_COMMENT_MODE,{begin:/^\s*(?=#)/,
 excludeBegin:!0}),{variants:[{match:[/^\s*/,/-/,/[ ]/,/.*$/]},{
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/nginx.min.js b/vendor/assets/javascripts/highlightjs/es/languages/nginx.min.js
index 4fe5cc9d96c..5c15a58aa17 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/nginx.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/nginx.min.js
@@ -1,4 +1,4 @@
-/*! `nginx` grammar compiled for Highlight.js 11.6.0 */
+/*! `nginx` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const n=e.regex,a={
 className:"variable",variants:[{begin:/\$\d+/},{begin:/\$\{\w+\}/},{
 begin:n.concat(/[$@]/,e.UNDERSCORE_IDENT_RE)}]},s={endsWithParent:!0,keywords:{
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/nim.min.js b/vendor/assets/javascripts/highlightjs/es/languages/nim.min.js
index a15ad5f74f9..cb9b6cbd83c 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/nim.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/nim.min.js
@@ -1,4 +1,4 @@
-/*! `nim` grammar compiled for Highlight.js 11.6.0 */
+/*! `nim` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"Nim",keywords:{
 keyword:["addr","and","as","asm","bind","block","break","case","cast","const","continue","converter","discard","distinct","div","do","elif","else","end","enum","except","export","finally","for","from","func","generic","guarded","if","import","in","include","interface","is","isnot","iterator","let","macro","method","mixin","mod","nil","not","notin","object","of","or","out","proc","ptr","raise","ref","return","shared","shl","shr","static","template","try","tuple","type","using","var","when","while","with","without","xor","yield"],
 literal:["true","false"],
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/nix.min.js b/vendor/assets/javascripts/highlightjs/es/languages/nix.min.js
index e33ab6e2806..29f9aef8eb3 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/nix.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/nix.min.js
@@ -1,11 +1,12 @@
-/*! `nix` grammar compiled for Highlight.js 11.6.0 */
-var hljsGrammar=(()=>{"use strict";return e=>{const n={
+/*! `nix` grammar compiled for Highlight.js 11.8.0 */
+var hljsGrammar=(()=>{"use strict";return e=>{const a={
 keyword:["rec","with","let","in","inherit","assert","if","else","then"],
 literal:["true","false","or","and","null"],
 built_in:["import","abort","baseNameOf","dirOf","isNull","builtins","map","removeAttrs","throw","toString","derivation"]
-},r={className:"subst",begin:/\$\{/,end:/\}/,keywords:n},a={className:"string",
-contains:[r],variants:[{begin:"''",end:"''"},{begin:'"',end:'"'}]
-},t=[e.NUMBER_MODE,e.HASH_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,a,{
+},n={className:"subst",begin:/\$\{/,end:/\}/,keywords:a},r={className:"string",
+contains:[{className:"char.escape",begin:/''\$/},n],variants:[{begin:"''",
+end:"''"},{begin:'"',end:'"'}]
+},s=[e.NUMBER_MODE,e.HASH_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,r,{
 begin:/[a-zA-Z0-9-_]+(\s*=)/,returnBegin:!0,relevance:0,contains:[{
-className:"attr",begin:/\S+/,relevance:.2}]}];return r.contains=t,{name:"Nix",
-aliases:["nixos"],keywords:n,contains:t}}})();export default hljsGrammar;
\ No newline at end of file
+className:"attr",begin:/\S+/,relevance:.2}]}];return n.contains=s,{name:"Nix",
+aliases:["nixos"],keywords:a,contains:s}}})();export default hljsGrammar;
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/node-repl.min.js b/vendor/assets/javascripts/highlightjs/es/languages/node-repl.min.js
index f3ba6d1a371..bcb03c1180e 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/node-repl.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/node-repl.min.js
@@ -1,4 +1,4 @@
-/*! `node-repl` grammar compiled for Highlight.js 11.6.0 */
+/*! `node-repl` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return a=>({name:"Node REPL",contains:[{
 className:"meta.prompt",starts:{end:/ |$/,starts:{end:"$",
 subLanguage:"javascript"}},variants:[{begin:/^>(?=[ ]|$)/},{
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/nsis.min.js b/vendor/assets/javascripts/highlightjs/es/languages/nsis.min.js
index 4b89ccd317b..51c1c84de67 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/nsis.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/nsis.min.js
@@ -1,4 +1,4 @@
-/*! `nsis` grammar compiled for Highlight.js 11.6.0 */
+/*! `nsis` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const t=e.regex,n={
 className:"variable.constant",
 begin:t.concat(/\$/,t.either("ADMINTOOLS","APPDATA","CDBURN_AREA","CMDLINE","COMMONFILES32","COMMONFILES64","COMMONFILES","COOKIES","DESKTOP","DOCUMENTS","EXEDIR","EXEFILE","EXEPATH","FAVORITES","FONTS","HISTORY","HWNDPARENT","INSTDIR","INTERNET_CACHE","LANGUAGE","LOCALAPPDATA","MUSIC","NETHOOD","OUTDIR","PICTURES","PLUGINSDIR","PRINTHOOD","PROFILE","PROGRAMFILES32","PROGRAMFILES64","PROGRAMFILES","QUICKLAUNCH","RECENT","RESOURCES_LOCALIZED","RESOURCES","SENDTO","SMPROGRAMS","SMSTARTUP","STARTMENU","SYSDIR","TEMP","TEMPLATES","VIDEOS","WINDIR"))
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/objectivec.min.js b/vendor/assets/javascripts/highlightjs/es/languages/objectivec.min.js
index c5a09d01426..9f95a649b4d 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/objectivec.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/objectivec.min.js
@@ -1,4 +1,4 @@
-/*! `objectivec` grammar compiled for Highlight.js 11.6.0 */
+/*! `objectivec` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const _=/[a-zA-Z@][a-zA-Z0-9_]*/,n={$pattern:_,
 keyword:["@interface","@class","@protocol","@implementation"]};return{
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/ocaml.min.js b/vendor/assets/javascripts/highlightjs/es/languages/ocaml.min.js
index 65e45dcbe10..693e7781e2c 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/ocaml.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/ocaml.min.js
@@ -1,4 +1,4 @@
-/*! `ocaml` grammar compiled for Highlight.js 11.6.0 */
+/*! `ocaml` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"OCaml",aliases:["ml"],
 keywords:{$pattern:"[a-z_]\\w*!?",
 keyword:"and as assert asr begin class constraint do done downto else end exception external for fun function functor if in include inherit! inherit initializer land lazy let lor lsl lsr lxor match method!|10 method mod module mutable new object of open! open or private rec sig struct then to try type val! val virtual when while with parser value",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/openscad.min.js b/vendor/assets/javascripts/highlightjs/es/languages/openscad.min.js
index 44d49aa7fab..686a58b64a4 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/openscad.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/openscad.min.js
@@ -1,4 +1,4 @@
-/*! `openscad` grammar compiled for Highlight.js 11.6.0 */
+/*! `openscad` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const n={className:"keyword",
 begin:"\\$(f[asn]|t|vp[rtd]|children)"},r={className:"number",
 begin:"\\b\\d+(\\.\\d+)?(e-?\\d+)?",relevance:0
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/oxygene.min.js b/vendor/assets/javascripts/highlightjs/es/languages/oxygene.min.js
index 2d37eb7e4ec..fd0645ea19a 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/oxygene.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/oxygene.min.js
@@ -1,4 +1,4 @@
-/*! `oxygene` grammar compiled for Highlight.js 11.6.0 */
+/*! `oxygene` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const r={$pattern:/\.?\w+/,
 keyword:"abstract add and array as asc aspect assembly async begin break block by case class concat const copy constructor continue create default delegate desc distinct div do downto dynamic each else empty end ensure enum equals event except exit extension external false final finalize finalizer finally flags for forward from function future global group has if implementation implements implies in index inherited inline interface into invariants is iterator join locked locking loop matching method mod module namespace nested new nil not notify nullable of old on operator or order out override parallel params partial pinned private procedure property protected public queryable raise read readonly record reintroduce remove repeat require result reverse sealed select self sequence set shl shr skip static step soft take then to true try tuple type union unit unsafe until uses using var virtual raises volatile where while with write xor yield await mapped deprecated stdcall cdecl pascal register safecall overload library platform reference packed strict published autoreleasepool selector strong weak unretained"
 },t=e.COMMENT(/\{/,/\}/,{relevance:0}),a=e.COMMENT("\\(\\*","\\*\\)",{
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/parser3.min.js b/vendor/assets/javascripts/highlightjs/es/languages/parser3.min.js
index d3c6feb5b78..b127127a6a2 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/parser3.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/parser3.min.js
@@ -1,4 +1,4 @@
-/*! `parser3` grammar compiled for Highlight.js 11.6.0 */
+/*! `parser3` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const a=e.COMMENT(/\{/,/\}/,{
 contains:["self"]});return{name:"Parser3",subLanguage:"xml",relevance:0,
 contains:[e.COMMENT("^#","$"),e.COMMENT(/\^rem\{/,/\}/,{relevance:10,
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/perl.min.js b/vendor/assets/javascripts/highlightjs/es/languages/perl.min.js
index 442866e8e1c..ed22234e780 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/perl.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/perl.min.js
@@ -1,4 +1,4 @@
-/*! `perl` grammar compiled for Highlight.js 11.6.0 */
+/*! `perl` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const n=e.regex,t=/[dualxmsipngr]{0,12}/,r={$pattern:/[\w.]+/,
 keyword:"abs accept alarm and atan2 bind binmode bless break caller chdir chmod chomp chop chown chr chroot close closedir connect continue cos crypt dbmclose dbmopen defined delete die do dump each else elsif endgrent endhostent endnetent endprotoent endpwent endservent eof eval exec exists exit exp fcntl fileno flock for foreach fork format formline getc getgrent getgrgid getgrnam gethostbyaddr gethostbyname gethostent getlogin getnetbyaddr getnetbyname getnetent getpeername getpgrp getpriority getprotobyname getprotobynumber getprotoent getpwent getpwnam getpwuid getservbyname getservbyport getservent getsockname getsockopt given glob gmtime goto grep gt hex if index int ioctl join keys kill last lc lcfirst length link listen local localtime log lstat lt ma map mkdir msgctl msgget msgrcv msgsnd my ne next no not oct open opendir or ord our pack package pipe pop pos print printf prototype push q|0 qq quotemeta qw qx rand read readdir readline readlink readpipe recv redo ref rename require reset return reverse rewinddir rindex rmdir say scalar seek seekdir select semctl semget semop send setgrent sethostent setnetent setpgrp setpriority setprotoent setpwent setservent setsockopt shift shmctl shmget shmread shmwrite shutdown sin sleep socket socketpair sort splice split sprintf sqrt srand stat state study sub substr symlink syscall sysopen sysread sysseek system syswrite tell telldir tie tied time times tr truncate uc ucfirst umask undef unless unlink unpack unshift untie until use utime values vec wait waitpid wantarray warn when while write x|0 xor y|0"
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/pf.min.js b/vendor/assets/javascripts/highlightjs/es/languages/pf.min.js
index 32eb1008f99..fdc33fa1e4f 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/pf.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/pf.min.js
@@ -1,4 +1,4 @@
-/*! `pf` grammar compiled for Highlight.js 11.6.0 */
+/*! `pf` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return t=>({name:"Packet Filter config",
 aliases:["pf.conf"],keywords:{$pattern:/[a-z0-9_<>-]+/,
 built_in:"block match pass load anchor|5 antispoof|10 set table",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/pgsql.min.js b/vendor/assets/javascripts/highlightjs/es/languages/pgsql.min.js
index 01c4322b7a8..c119f98036c 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/pgsql.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/pgsql.min.js
@@ -1,4 +1,4 @@
-/*! `pgsql` grammar compiled for Highlight.js 11.6.0 */
+/*! `pgsql` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return E=>{
 const T=E.COMMENT("--","$"),N="\\$([a-zA-Z_]?|[a-zA-Z_][a-zA-Z_0-9]*)\\$",A="BIGINT INT8 BIGSERIAL SERIAL8 BIT VARYING VARBIT BOOLEAN BOOL BOX BYTEA CHARACTER CHAR VARCHAR CIDR CIRCLE DATE DOUBLE PRECISION FLOAT8 FLOAT INET INTEGER INT INT4 INTERVAL JSON JSONB LINE LSEG|10 MACADDR MACADDR8 MONEY NUMERIC DEC DECIMAL PATH POINT POLYGON REAL FLOAT4 SMALLINT INT2 SMALLSERIAL|10 SERIAL2|10 SERIAL|10 SERIAL4|10 TEXT TIME ZONE TIMETZ|10 TIMESTAMP TIMESTAMPTZ|10 TSQUERY|10 TSVECTOR|10 TXID_SNAPSHOT|10 UUID XML NATIONAL NCHAR INT4RANGE|10 INT8RANGE|10 NUMRANGE|10 TSRANGE|10 TSTZRANGE|10 DATERANGE|10 ANYELEMENT ANYARRAY ANYNONARRAY ANYENUM ANYRANGE CSTRING INTERNAL RECORD PG_DDL_COMMAND VOID UNKNOWN OPAQUE REFCURSOR NAME OID REGPROC|10 REGPROCEDURE|10 REGOPER|10 REGOPERATOR|10 REGCLASS|10 REGTYPE|10 REGROLE|10 REGNAMESPACE|10 REGCONFIG|10 REGDICTIONARY|10 ",R=A.trim().split(" ").map((E=>E.split("|")[0])).join("|"),I="ARRAY_AGG AVG BIT_AND BIT_OR BOOL_AND BOOL_OR COUNT EVERY JSON_AGG JSONB_AGG JSON_OBJECT_AGG JSONB_OBJECT_AGG MAX MIN MODE STRING_AGG SUM XMLAGG CORR COVAR_POP COVAR_SAMP REGR_AVGX REGR_AVGY REGR_COUNT REGR_INTERCEPT REGR_R2 REGR_SLOPE REGR_SXX REGR_SXY REGR_SYY STDDEV STDDEV_POP STDDEV_SAMP VARIANCE VAR_POP VAR_SAMP PERCENTILE_CONT PERCENTILE_DISC ROW_NUMBER RANK DENSE_RANK PERCENT_RANK CUME_DIST NTILE LAG LEAD FIRST_VALUE LAST_VALUE NTH_VALUE NUM_NONNULLS NUM_NULLS ABS CBRT CEIL CEILING DEGREES DIV EXP FLOOR LN LOG MOD PI POWER RADIANS ROUND SCALE SIGN SQRT TRUNC WIDTH_BUCKET RANDOM SETSEED ACOS ACOSD ASIN ASIND ATAN ATAND ATAN2 ATAN2D COS COSD COT COTD SIN SIND TAN TAND BIT_LENGTH CHAR_LENGTH CHARACTER_LENGTH LOWER OCTET_LENGTH OVERLAY POSITION SUBSTRING TREAT TRIM UPPER ASCII BTRIM CHR CONCAT CONCAT_WS CONVERT CONVERT_FROM CONVERT_TO DECODE ENCODE INITCAP LEFT LENGTH LPAD LTRIM MD5 PARSE_IDENT PG_CLIENT_ENCODING QUOTE_IDENT|10 QUOTE_LITERAL|10 QUOTE_NULLABLE|10 REGEXP_MATCH REGEXP_MATCHES REGEXP_REPLACE REGEXP_SPLIT_TO_ARRAY REGEXP_SPLIT_TO_TABLE REPEAT REPLACE REVERSE RIGHT RPAD RTRIM SPLIT_PART STRPOS SUBSTR TO_ASCII TO_HEX TRANSLATE OCTET_LENGTH GET_BIT GET_BYTE SET_BIT SET_BYTE TO_CHAR TO_DATE TO_NUMBER TO_TIMESTAMP AGE CLOCK_TIMESTAMP|10 DATE_PART DATE_TRUNC ISFINITE JUSTIFY_DAYS JUSTIFY_HOURS JUSTIFY_INTERVAL MAKE_DATE MAKE_INTERVAL|10 MAKE_TIME MAKE_TIMESTAMP|10 MAKE_TIMESTAMPTZ|10 NOW STATEMENT_TIMESTAMP|10 TIMEOFDAY TRANSACTION_TIMESTAMP|10 ENUM_FIRST ENUM_LAST ENUM_RANGE AREA CENTER DIAMETER HEIGHT ISCLOSED ISOPEN NPOINTS PCLOSE POPEN RADIUS WIDTH BOX BOUND_BOX CIRCLE LINE LSEG PATH POLYGON ABBREV BROADCAST HOST HOSTMASK MASKLEN NETMASK NETWORK SET_MASKLEN TEXT INET_SAME_FAMILY INET_MERGE MACADDR8_SET7BIT ARRAY_TO_TSVECTOR GET_CURRENT_TS_CONFIG NUMNODE PLAINTO_TSQUERY PHRASETO_TSQUERY WEBSEARCH_TO_TSQUERY QUERYTREE SETWEIGHT STRIP TO_TSQUERY TO_TSVECTOR JSON_TO_TSVECTOR JSONB_TO_TSVECTOR TS_DELETE TS_FILTER TS_HEADLINE TS_RANK TS_RANK_CD TS_REWRITE TSQUERY_PHRASE TSVECTOR_TO_ARRAY TSVECTOR_UPDATE_TRIGGER TSVECTOR_UPDATE_TRIGGER_COLUMN XMLCOMMENT XMLCONCAT XMLELEMENT XMLFOREST XMLPI XMLROOT XMLEXISTS XML_IS_WELL_FORMED XML_IS_WELL_FORMED_DOCUMENT XML_IS_WELL_FORMED_CONTENT XPATH XPATH_EXISTS XMLTABLE XMLNAMESPACES TABLE_TO_XML TABLE_TO_XMLSCHEMA TABLE_TO_XML_AND_XMLSCHEMA QUERY_TO_XML QUERY_TO_XMLSCHEMA QUERY_TO_XML_AND_XMLSCHEMA CURSOR_TO_XML CURSOR_TO_XMLSCHEMA SCHEMA_TO_XML SCHEMA_TO_XMLSCHEMA SCHEMA_TO_XML_AND_XMLSCHEMA DATABASE_TO_XML DATABASE_TO_XMLSCHEMA DATABASE_TO_XML_AND_XMLSCHEMA XMLATTRIBUTES TO_JSON TO_JSONB ARRAY_TO_JSON ROW_TO_JSON JSON_BUILD_ARRAY JSONB_BUILD_ARRAY JSON_BUILD_OBJECT JSONB_BUILD_OBJECT JSON_OBJECT JSONB_OBJECT JSON_ARRAY_LENGTH JSONB_ARRAY_LENGTH JSON_EACH JSONB_EACH JSON_EACH_TEXT JSONB_EACH_TEXT JSON_EXTRACT_PATH JSONB_EXTRACT_PATH JSON_OBJECT_KEYS JSONB_OBJECT_KEYS JSON_POPULATE_RECORD JSONB_POPULATE_RECORD JSON_POPULATE_RECORDSET JSONB_POPULATE_RECORDSET JSON_ARRAY_ELEMENTS JSONB_ARRAY_ELEMENTS JSON_ARRAY_ELEMENTS_TEXT JSONB_ARRAY_ELEMENTS_TEXT JSON_TYPEOF JSONB_TYPEOF JSON_TO_RECORD JSONB_TO_RECORD JSON_TO_RECORDSET JSONB_TO_RECORDSET JSON_STRIP_NULLS JSONB_STRIP_NULLS JSONB_SET JSONB_INSERT JSONB_PRETTY CURRVAL LASTVAL NEXTVAL SETVAL COALESCE NULLIF GREATEST LEAST ARRAY_APPEND ARRAY_CAT ARRAY_NDIMS ARRAY_DIMS ARRAY_FILL ARRAY_LENGTH ARRAY_LOWER ARRAY_POSITION ARRAY_POSITIONS ARRAY_PREPEND ARRAY_REMOVE ARRAY_REPLACE ARRAY_TO_STRING ARRAY_UPPER CARDINALITY STRING_TO_ARRAY UNNEST ISEMPTY LOWER_INC UPPER_INC LOWER_INF UPPER_INF RANGE_MERGE GENERATE_SERIES GENERATE_SUBSCRIPTS CURRENT_DATABASE CURRENT_QUERY CURRENT_SCHEMA|10 CURRENT_SCHEMAS|10 INET_CLIENT_ADDR INET_CLIENT_PORT INET_SERVER_ADDR INET_SERVER_PORT ROW_SECURITY_ACTIVE FORMAT_TYPE TO_REGCLASS TO_REGPROC TO_REGPROCEDURE TO_REGOPER TO_REGOPERATOR TO_REGTYPE TO_REGNAMESPACE TO_REGROLE COL_DESCRIPTION OBJ_DESCRIPTION SHOBJ_DESCRIPTION TXID_CURRENT TXID_CURRENT_IF_ASSIGNED TXID_CURRENT_SNAPSHOT TXID_SNAPSHOT_XIP TXID_SNAPSHOT_XMAX TXID_SNAPSHOT_XMIN TXID_VISIBLE_IN_SNAPSHOT TXID_STATUS CURRENT_SETTING SET_CONFIG BRIN_SUMMARIZE_NEW_VALUES BRIN_SUMMARIZE_RANGE BRIN_DESUMMARIZE_RANGE GIN_CLEAN_PENDING_LIST SUPPRESS_REDUNDANT_UPDATES_TRIGGER LO_FROM_BYTEA LO_PUT LO_GET LO_CREAT LO_CREATE LO_UNLINK LO_IMPORT LO_EXPORT LOREAD LOWRITE GROUPING CAST".split(" ").map((E=>E.split("|")[0])).join("|")
 ;return{name:"PostgreSQL",aliases:["postgres","postgresql"],supersetOf:"sql",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/php-template.min.js b/vendor/assets/javascripts/highlightjs/es/languages/php-template.min.js
index dbf54f4ee0b..98ed11e2872 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/php-template.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/php-template.min.js
@@ -1,4 +1,4 @@
-/*! `php-template` grammar compiled for Highlight.js 11.6.0 */
+/*! `php-template` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return n=>({name:"PHP template",
 subLanguage:"xml",contains:[{begin:/<\?(php|=)?/,end:/\?>/,subLanguage:"php",
 contains:[{begin:"/\\*",end:"\\*/",skip:!0},{begin:'b"',end:'"',skip:!0},{
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/php.min.js b/vendor/assets/javascripts/highlightjs/es/languages/php.min.js
index 8e4f4bffd62..d2e1daeeec6 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/php.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/php.min.js
@@ -1,14 +1,16 @@
-/*! `php` grammar compiled for Highlight.js 11.6.0 */
+/*! `php` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const t=e.regex,a=/(?![A-Za-z0-9])(?![$])/,r=t.concat(/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/,a),n=t.concat(/(\\?[A-Z][a-z0-9_\x7f-\xff]+|\\?[A-Z]+(?=[A-Z][a-z0-9_\x7f-\xff])){1,}/,a),o={
 scope:"variable",match:"\\$+"+r},c={scope:"subst",variants:[{begin:/\$\w+/},{
 begin:/\{\$/,end:/\}/}]},i=e.inherit(e.APOS_STRING_MODE,{illegal:null
 }),s="[ \t\n]",l={scope:"string",variants:[e.inherit(e.QUOTE_STRING_MODE,{
-illegal:null,contains:e.QUOTE_STRING_MODE.contains.concat(c)
-}),i,e.END_SAME_AS_BEGIN({begin:/<<<[ \t]*(\w+)\n/,end:/[ \t]*(\w+)\b/,
-contains:e.QUOTE_STRING_MODE.contains.concat(c)})]},d={scope:"number",
-variants:[{begin:"\\b0[bB][01]+(?:_[01]+)*\\b"},{
-begin:"\\b0[oO][0-7]+(?:_[0-7]+)*\\b"},{
+illegal:null,contains:e.QUOTE_STRING_MODE.contains.concat(c)}),i,{
+begin:/<<<[ \t]*(?:(\w+)|"(\w+)")\n/,end:/[ \t]*(\w+)\b/,
+contains:e.QUOTE_STRING_MODE.contains.concat(c),"on:begin":(e,t)=>{
+t.data._beginMatch=e[1]||e[2]},"on:end":(e,t)=>{
+t.data._beginMatch!==e[1]&&t.ignoreMatch()}},e.END_SAME_AS_BEGIN({
+begin:/<<<[ \t]*'(\w+)'\n/,end:/[ \t]*(\w+)\b/})]},d={scope:"number",variants:[{
+begin:"\\b0[bB][01]+(?:_[01]+)*\\b"},{begin:"\\b0[oO][0-7]+(?:_[0-7]+)*\\b"},{
 begin:"\\b0[xX][\\da-fA-F]+(?:_[\\da-fA-F]+)*\\b"},{
 begin:"(?:\\b\\d+(?:_\\d+)*(\\.(?:\\d+(?:_\\d+)*))?|\\B\\.\\d+)(?:[eE][+-]?\\d+)?"
 }],relevance:0
@@ -17,19 +19,19 @@ keyword:p,literal:(e=>{const t=[];return e.forEach((e=>{
 t.push(e),e.toLowerCase()===e?t.push(e.toUpperCase()):t.push(e.toLowerCase())
 })),t})(_),built_in:b},u=e=>e.map((e=>e.replace(/\|\d+$/,""))),g={variants:[{
 match:[/new/,t.concat(s,"+"),t.concat("(?!",u(b).join("\\b|"),"\\b)"),n],scope:{
-1:"keyword",4:"title.class"}}]},m=t.concat(r,"\\b(?!\\()"),h={variants:[{
-match:[t.concat(/::/,t.lookahead(/(?!class\b)/)),m],scope:{2:"variable.constant"
+1:"keyword",4:"title.class"}}]},h=t.concat(r,"\\b(?!\\()"),m={variants:[{
+match:[t.concat(/::/,t.lookahead(/(?!class\b)/)),h],scope:{2:"variable.constant"
 }},{match:[/::/,/class/],scope:{2:"variable.language"}},{
-match:[n,t.concat(/::/,t.lookahead(/(?!class\b)/)),m],scope:{1:"title.class",
+match:[n,t.concat(/::/,t.lookahead(/(?!class\b)/)),h],scope:{1:"title.class",
 3:"variable.constant"}},{match:[n,t.concat("::",t.lookahead(/(?!class\b)/))],
 scope:{1:"title.class"}},{match:[n,/::/,/class/],scope:{1:"title.class",
 3:"variable.language"}}]},f={scope:"attr",
 match:t.concat(r,t.lookahead(":"),t.lookahead(/(?!::)/))},I={relevance:0,
-begin:/\(/,end:/\)/,keywords:E,contains:[f,o,h,e.C_BLOCK_COMMENT_MODE,l,d,g]
+begin:/\(/,end:/\)/,keywords:E,contains:[f,o,m,e.C_BLOCK_COMMENT_MODE,l,d,g]
 },O={relevance:0,
 match:[/\b/,t.concat("(?!fn\\b|function\\b|",u(p).join("\\b|"),"|",u(b).join("\\b|"),"\\b)"),r,t.concat(s,"*"),t.lookahead(/(?=\()/)],
 scope:{3:"title.function.invoke"},contains:[I]};I.contains.push(O)
-;const v=[f,h,e.C_BLOCK_COMMENT_MODE,l,d,g];return{case_insensitive:!1,
+;const v=[f,m,e.C_BLOCK_COMMENT_MODE,l,d,g];return{case_insensitive:!1,
 keywords:E,contains:[{begin:t.concat(/#\[\s*/,n),beginScope:"meta",end:/]/,
 endScope:"meta",keywords:{literal:_,keyword:["new","array"]},contains:[{
 begin:/\[/,end:/]/,keywords:{literal:_,keyword:["new","array"]},
@@ -39,13 +41,13 @@ scope:"doctag",match:"@[A-Za-z]+"}]}),{match:/__halt_compiler\(\);/,
 keywords:"__halt_compiler",starts:{scope:"comment",end:e.MATCH_NOTHING_RE,
 contains:[{match:/\?>/,scope:"meta",endsParent:!0}]}},{scope:"meta",variants:[{
 begin:/<\?php/,relevance:10},{begin:/<\?=/},{begin:/<\?/,relevance:.1},{
-begin:/\?>/}]},{scope:"variable.language",match:/\$this\b/},o,O,h,{
+begin:/\?>/}]},{scope:"variable.language",match:/\$this\b/},o,O,m,{
 match:[/const/,/\s/,r],scope:{1:"keyword",3:"variable.constant"}},g,{
 scope:"function",relevance:0,beginKeywords:"fn function",end:/[;{]/,
 excludeEnd:!0,illegal:"[$%\\[]",contains:[{beginKeywords:"use"
 },e.UNDERSCORE_TITLE_MODE,{begin:"=>",endsParent:!0},{scope:"params",
 begin:"\\(",end:"\\)",excludeBegin:!0,excludeEnd:!0,keywords:E,
-contains:["self",o,h,e.C_BLOCK_COMMENT_MODE,l,d]}]},{scope:"class",variants:[{
+contains:["self",o,m,e.C_BLOCK_COMMENT_MODE,l,d]}]},{scope:"class",variants:[{
 beginKeywords:"enum",illegal:/[($"]/},{beginKeywords:"class interface trait",
 illegal:/[:($"]/}],relevance:0,end:/\{/,excludeEnd:!0,contains:[{
 beginKeywords:"extends implements"},e.UNDERSCORE_TITLE_MODE]},{
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/plaintext.min.js b/vendor/assets/javascripts/highlightjs/es/languages/plaintext.min.js
index 2b113529c7a..ac1868c8b87 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/plaintext.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/plaintext.min.js
@@ -1,3 +1,3 @@
-/*! `plaintext` grammar compiled for Highlight.js 11.6.0 */
+/*! `plaintext` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return t=>({name:"Plain text",
 aliases:["text","txt"],disableAutodetect:!0})})();export default hljsGrammar;
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/pony.min.js b/vendor/assets/javascripts/highlightjs/es/languages/pony.min.js
index 5a745bc95dd..d64eafabf4e 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/pony.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/pony.min.js
@@ -1,4 +1,4 @@
-/*! `pony` grammar compiled for Highlight.js 11.6.0 */
+/*! `pony` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"Pony",keywords:{
 keyword:"actor addressof and as be break class compile_error compile_intrinsic consume continue delegate digestof do else elseif embed end error for fun if ifdef in interface is isnt lambda let match new not object or primitive recover repeat return struct then trait try type until use var where while with xor",
 meta:"iso val tag trn box ref",literal:"this false true"},contains:[{
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/powershell.min.js b/vendor/assets/javascripts/highlightjs/es/languages/powershell.min.js
index 59d3e4c9310..5002dd8ab76 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/powershell.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/powershell.min.js
@@ -1,4 +1,4 @@
-/*! `powershell` grammar compiled for Highlight.js 11.6.0 */
+/*! `powershell` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const n={
 $pattern:/-?[A-z\.\-]+\b/,
 keyword:"if else foreach return do while until elseif begin for trap data dynamicparam end break throw param continue finally in switch exit filter try process catch hidden static parameter",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/processing.min.js b/vendor/assets/javascripts/highlightjs/es/languages/processing.min.js
index 5e5a9a5c977..144644eb878 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/processing.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/processing.min.js
@@ -1,4 +1,4 @@
-/*! `processing` grammar compiled for Highlight.js 11.6.0 */
+/*! `processing` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const t=e.regex,a=["displayHeight","displayWidth","mouseY","mouseX","mousePressed","pmouseX","pmouseY","key","keyCode","pixels","focused","frameCount","frameRate","height","width","size","createGraphics","beginDraw","createShape","loadShape","PShape","arc","ellipse","line","point","quad","rect","triangle","bezier","bezierDetail","bezierPoint","bezierTangent","curve","curveDetail","curvePoint","curveTangent","curveTightness","shape","shapeMode","beginContour","beginShape","bezierVertex","curveVertex","endContour","endShape","quadraticVertex","vertex","ellipseMode","noSmooth","rectMode","smooth","strokeCap","strokeJoin","strokeWeight","mouseClicked","mouseDragged","mouseMoved","mousePressed","mouseReleased","mouseWheel","keyPressed","keyPressedkeyReleased","keyTyped","print","println","save","saveFrame","day","hour","millis","minute","month","second","year","background","clear","colorMode","fill","noFill","noStroke","stroke","alpha","blue","brightness","color","green","hue","lerpColor","red","saturation","modelX","modelY","modelZ","screenX","screenY","screenZ","ambient","emissive","shininess","specular","add","createImage","beginCamera","camera","endCamera","frustum","ortho","perspective","printCamera","printProjection","cursor","frameRate","noCursor","exit","loop","noLoop","popStyle","pushStyle","redraw","binary","boolean","byte","char","float","hex","int","str","unbinary","unhex","join","match","matchAll","nf","nfc","nfp","nfs","split","splitTokens","trim","append","arrayCopy","concat","expand","reverse","shorten","sort","splice","subset","box","sphere","sphereDetail","createInput","createReader","loadBytes","loadJSONArray","loadJSONObject","loadStrings","loadTable","loadXML","open","parseXML","saveTable","selectFolder","selectInput","beginRaw","beginRecord","createOutput","createWriter","endRaw","endRecord","PrintWritersaveBytes","saveJSONArray","saveJSONObject","saveStream","saveStrings","saveXML","selectOutput","popMatrix","printMatrix","pushMatrix","resetMatrix","rotate","rotateX","rotateY","rotateZ","scale","shearX","shearY","translate","ambientLight","directionalLight","lightFalloff","lights","lightSpecular","noLights","normal","pointLight","spotLight","image","imageMode","loadImage","noTint","requestImage","tint","texture","textureMode","textureWrap","blend","copy","filter","get","loadPixels","set","updatePixels","blendMode","loadShader","PShaderresetShader","shader","createFont","loadFont","text","textFont","textAlign","textLeading","textMode","textSize","textWidth","textAscent","textDescent","abs","ceil","constrain","dist","exp","floor","lerp","log","mag","map","max","min","norm","pow","round","sq","sqrt","acos","asin","atan","atan2","cos","degrees","radians","sin","tan","noise","noiseDetail","noiseSeed","random","randomGaussian","randomSeed"],r=e.IDENT_RE,s={
 variants:[{match:t.concat(t.either(...a),t.lookahead(/\s*\(/)),
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/profile.min.js b/vendor/assets/javascripts/highlightjs/es/languages/profile.min.js
index 42ab1284101..0c4d86ddf27 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/profile.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/profile.min.js
@@ -1,4 +1,4 @@
-/*! `profile` grammar compiled for Highlight.js 11.6.0 */
+/*! `profile` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"Python profiler",
 contains:[e.C_NUMBER_MODE,{begin:"[a-zA-Z_][\\da-zA-Z_]+\\.[\\da-zA-Z_]{1,3}",
 end:":",excludeEnd:!0},{begin:"(ncalls|tottime|cumtime)",end:"$",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/prolog.min.js b/vendor/assets/javascripts/highlightjs/es/languages/prolog.min.js
index 11626cd91cf..a3c5d9d01e4 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/prolog.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/prolog.min.js
@@ -1,4 +1,4 @@
-/*! `prolog` grammar compiled for Highlight.js 11.6.0 */
+/*! `prolog` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return n=>{const e={begin:/\(/,end:/\)/,
 relevance:0},a={begin:/\[/,end:/\]/},s={className:"comment",begin:/%/,end:/$/,
 contains:[n.PHRASAL_WORDS_MODE]},i={className:"string",begin:/`/,end:/`/,
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/properties.min.js b/vendor/assets/javascripts/highlightjs/es/languages/properties.min.js
index c84d1595292..a7a8a7578a5 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/properties.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/properties.min.js
@@ -1,11 +1,9 @@
-/*! `properties` grammar compiled for Highlight.js 11.6.0 */
+/*! `properties` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
-const t="[ \\t\\f]*",n="([^\\\\:= \\t\\f\\n]|\\\\.)+";return{name:".properties",
+const n="[ \\t\\f]*",t=n+"[:=]"+n,a="[ \\t\\f]+",s="([^\\\\:= \\t\\f\\n]|\\\\.)+",r={
+end:"("+t+"|"+a+")",relevance:0,starts:{className:"string",end:/$/,relevance:0,
+contains:[{begin:"\\\\\\\\"},{begin:"\\\\\\n"}]}};return{name:".properties",
 disableAutodetect:!0,case_insensitive:!0,illegal:/\S/,
-contains:[e.COMMENT("^\\s*[!#]","$"),{returnBegin:!0,variants:[{
-begin:n+"[ \\t\\f]*[:=][ \\t\\f]*"},{begin:n+"[ \\t\\f]+"}],contains:[{
-className:"attr",begin:n,endsParent:!0}],starts:{
-end:"([ \\t\\f]*[:=][ \\t\\f]*|[ \\t\\f]+)",relevance:0,starts:{
-className:"string",end:/$/,relevance:0,contains:[{begin:"\\\\\\\\"},{
-begin:"\\\\\\n"}]}}},{className:"attr",begin:n+t+"$"}]}}})()
-;export default hljsGrammar;
\ No newline at end of file
+contains:[e.COMMENT("^\\s*[!#]","$"),{returnBegin:!0,variants:[{begin:s+t},{
+begin:s+a}],contains:[{className:"attr",begin:s,endsParent:!0}],starts:r},{
+className:"attr",begin:s+n+"$"}]}}})();export default hljsGrammar;
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/protobuf.min.js b/vendor/assets/javascripts/highlightjs/es/languages/protobuf.min.js
index 93c080f7517..852d79b771d 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/protobuf.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/protobuf.min.js
@@ -1,7 +1,7 @@
-/*! `protobuf` grammar compiled for Highlight.js 11.6.0 */
+/*! `protobuf` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const r={
 match:[/(message|enum|service)\s+/,e.IDENT_RE],scope:{1:"keyword",
-2:"title.class"}};return{name:"Protocol Buffers",keywords:{
+2:"title.class"}};return{name:"Protocol Buffers",aliases:["proto"],keywords:{
 keyword:["package","import","option","optional","required","repeated","group","oneof"],
 type:["double","float","int32","int64","uint32","uint64","sint32","sint64","fixed32","fixed64","sfixed32","sfixed64","bool","string","bytes"],
 literal:["true","false"]},
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/puppet.min.js b/vendor/assets/javascripts/highlightjs/es/languages/puppet.min.js
index b1e56440ffc..3e8f7ac2579 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/puppet.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/puppet.min.js
@@ -1,4 +1,4 @@
-/*! `puppet` grammar compiled for Highlight.js 11.6.0 */
+/*! `puppet` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const s=e.COMMENT("#","$"),r="([A-Za-z_]|::)(\\w|::)*",a=e.inherit(e.TITLE_MODE,{
 begin:r}),n={className:"variable",begin:"\\$"+r},i={className:"string",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/purebasic.min.js b/vendor/assets/javascripts/highlightjs/es/languages/purebasic.min.js
index 31615b60f1c..069f2e3a8ae 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/purebasic.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/purebasic.min.js
@@ -1,4 +1,4 @@
-/*! `purebasic` grammar compiled for Highlight.js 11.6.0 */
+/*! `purebasic` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"PureBASIC",
 aliases:["pb","pbi"],
 keywords:"Align And Array As Break CallDebugger Case CompilerCase CompilerDefault CompilerElse CompilerElseIf CompilerEndIf CompilerEndSelect CompilerError CompilerIf CompilerSelect CompilerWarning Continue Data DataSection Debug DebugLevel Declare DeclareC DeclareCDLL DeclareDLL DeclareModule Default Define Dim DisableASM DisableDebugger DisableExplicit Else ElseIf EnableASM EnableDebugger EnableExplicit End EndDataSection EndDeclareModule EndEnumeration EndIf EndImport EndInterface EndMacro EndModule EndProcedure EndSelect EndStructure EndStructureUnion EndWith Enumeration EnumerationBinary Extends FakeReturn For ForEach ForEver Global Gosub Goto If Import ImportC IncludeBinary IncludeFile IncludePath Interface List Macro MacroExpandedCount Map Module NewList NewMap Next Not Or Procedure ProcedureC ProcedureCDLL ProcedureDLL ProcedureReturn Protected Prototype PrototypeC ReDim Read Repeat Restore Return Runtime Select Shared Static Step Structure StructureUnion Swap Threaded To UndefineMacro Until Until  UnuseModule UseModule Wend While With XIncludeFile XOr",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/python-repl.min.js b/vendor/assets/javascripts/highlightjs/es/languages/python-repl.min.js
index 4bd839bc818..b7828add26b 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/python-repl.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/python-repl.min.js
@@ -1,4 +1,4 @@
-/*! `python-repl` grammar compiled for Highlight.js 11.6.0 */
+/*! `python-repl` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return a=>({aliases:["pycon"],contains:[{
 className:"meta.prompt",starts:{end:/ |$/,starts:{end:"$",subLanguage:"python"}
 },variants:[{begin:/^>>>(?=[ ]|$)/},{begin:/^\.\.\.(?=[ ]|$)/}]}]})})()
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/python.min.js b/vendor/assets/javascripts/highlightjs/es/languages/python.min.js
index 2ef6b471336..d390399cd68 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/python.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/python.min.js
@@ -1,4 +1,4 @@
-/*! `python` grammar compiled for Highlight.js 11.6.0 */
+/*! `python` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const n=e.regex,a=/[\p{XID_Start}_]\p{XID_Continue}*/u,s=["and","as","assert","async","await","break","case","class","continue","def","del","elif","else","except","finally","for","from","global","if","import","in","is","lambda","match","nonlocal|10","not","or","pass","raise","return","try","while","with","yield"],i={
 $pattern:/[A-Za-z]\w+|__\w+__/,keyword:s,
@@ -32,7 +32,7 @@ className:"params",variants:[{className:"",begin:/\(\s*\)/,skip:!0},{begin:/\(/,
 end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:i,
 contains:["self",t,m,b,e.HASH_COMMENT_MODE]}]};return r.contains=[b,m,t],{
 name:"Python",aliases:["py","gyp","ipython"],unicodeRegex:!0,keywords:i,
-illegal:/(<\/|->|\?)|=>/,contains:[t,m,{begin:/\bself\b/},{beginKeywords:"if",
+illegal:/(<\/|\?)|=>/,contains:[t,m,{begin:/\bself\b/},{beginKeywords:"if",
 relevance:0},b,g,e.HASH_COMMENT_MODE,{match:[/\bdef/,/\s+/,a],scope:{
 1:"keyword",3:"title.function"},contains:[p]},{variants:[{
 match:[/\bclass/,/\s+/,a,/\s*/,/\(\s*/,a,/\s*\)/]},{match:[/\bclass/,/\s+/,a]}],
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/q.min.js b/vendor/assets/javascripts/highlightjs/es/languages/q.min.js
index 2e7a00966dc..e9395e65d47 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/q.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/q.min.js
@@ -1,4 +1,4 @@
-/*! `q` grammar compiled for Highlight.js 11.6.0 */
+/*! `q` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"Q",aliases:["k","kdb"],
 keywords:{$pattern:/(`?)[A-Za-z0-9_]+\b/,
 keyword:"do while select delete by update from",literal:"0b 1b",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/qml.min.js b/vendor/assets/javascripts/highlightjs/es/languages/qml.min.js
index 0528fffcffe..f6653ef1ab4 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/qml.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/qml.min.js
@@ -1,4 +1,4 @@
-/*! `qml` grammar compiled for Highlight.js 11.6.0 */
+/*! `qml` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const n="[a-zA-Z_][a-zA-Z0-9\\._]*",r={className:"attribute",begin:"\\bid\\s*:",
 starts:{className:"string",end:n,returnEnd:!1}},a={begin:n+"\\s*:",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/r.min.js b/vendor/assets/javascripts/highlightjs/es/languages/r.min.js
index 4cd3c036b67..dd9e98c332f 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/r.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/r.min.js
@@ -1,4 +1,4 @@
-/*! `r` grammar compiled for Highlight.js 11.6.0 */
+/*! `r` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const a=e.regex,n=/(?:(?:[a-zA-Z]|\.[._a-zA-Z])[._a-zA-Z0-9]*)|\.(?!\d)/,s=a.either(/0[xX][0-9a-fA-F]+\.[0-9a-fA-F]*[pP][+-]?\d+i?/,/0[xX][0-9a-fA-F]+(?:[pP][+-]?\d+)?[Li]?/,/(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?[Li]?/),i=/[=!<>:]=|\|\||&&|:::?|<-|<<-|->>|->|\|>|[-+*\/?!$&|:<=>@^~]|\*\*/,t=a.either(/[()]/,/[{}]/,/\[\[/,/[[\]]/,/\\/,/,/)
 ;return{name:"R",keywords:{$pattern:n,
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/reasonml.min.js b/vendor/assets/javascripts/highlightjs/es/languages/reasonml.min.js
index 0014d3da567..ffda438242d 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/reasonml.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/reasonml.min.js
@@ -1,43 +1,41 @@
-/*! `reasonml` grammar compiled for Highlight.js 11.6.0 */
+/*! `reasonml` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
-const n="~?[a-z$_][0-9a-zA-Z$_]*",a="`?[A-Z$_][0-9a-zA-Z$_]*",s="("+["||","++","**","+.","*","/","*.","/.","..."].map((e=>e.split("").map((e=>"\\"+e)).join(""))).join("|")+"|\\|>|&&|==|===)",i="\\s+"+s+"\\s+",r={
+const n="~?[a-z$_][0-9a-zA-Z$_]*",a="`?[A-Z$_][0-9a-zA-Z$_]*",s="'?[a-z$_][0-9a-z$_]*",i=n+"(\\s*:\\s*[a-z$_][0-9a-z$_]*(\\(\\s*("+s+"\\s*(,"+s+"\\s*)*)?\\))?){0,2}",r="("+["||","++","**","+.","*","/","*.","/.","..."].map((e=>e.split("").map((e=>"\\"+e)).join(""))).join("|")+"|\\|>|&&|==|===)",l="\\s+"+r+"\\s+",t={
 keyword:"and as asr assert begin class constraint do done downto else end exception external for fun function functor if in include inherit initializer land lazy let lor lsl lsr lxor match method mod module mutable new nonrec object of open or private rec sig struct then to try type val virtual when while with",
 built_in:"array bool bytes char exn|5 float int int32 int64 list lazy_t|5 nativeint|5 ref string unit ",
 literal:"true false"
-},l="\\b(0[xX][a-fA-F0-9_]+[Lln]?|0[oO][0-7_]+[Lln]?|0[bB][01_]+[Lln]?|[0-9][0-9_]*([Lln]|(\\.[0-9_]*)?([eE][-+]?[0-9_]+)?)?)",t={
-className:"number",relevance:0,variants:[{begin:l},{begin:"\\(-"+l+"\\)"}]},c={
-className:"operator",relevance:0,begin:s},o=[{className:"identifier",
-relevance:0,begin:n},c,t],g=[e.QUOTE_STRING_MODE,c,{className:"module",
+},c="\\b(0[xX][a-fA-F0-9_]+[Lln]?|0[oO][0-7_]+[Lln]?|0[bB][01_]+[Lln]?|[0-9][0-9_]*([Lln]|(\\.[0-9_]*)?([eE][-+]?[0-9_]+)?)?)",o={
+className:"number",relevance:0,variants:[{begin:c},{begin:"\\(-"+c+"\\)"}]},g={
+className:"operator",relevance:0,begin:r},b=[{className:"identifier",
+relevance:0,begin:n},g,o],m=[e.QUOTE_STRING_MODE,g,{className:"module",
 begin:"\\b"+a,returnBegin:!0,relevance:0,end:".",contains:[{
-className:"identifier",begin:a,relevance:0}]}],b=[{className:"module",
+className:"identifier",begin:a,relevance:0}]}],d=[{className:"module",
 begin:"\\b"+a,returnBegin:!0,end:".",relevance:0,contains:[{
-className:"identifier",begin:a,relevance:0}]}],m={className:"function",
-relevance:0,keywords:r,variants:[{begin:"\\s(\\(\\.?.*?\\)|"+n+")\\s*=>",
+className:"identifier",begin:a,relevance:0}]}],u={className:"function",
+relevance:0,keywords:t,variants:[{begin:"\\s(\\(\\.?.*?\\)|"+n+")\\s*=>",
 end:"\\s*=>",returnBegin:!0,relevance:0,contains:[{className:"params",
-variants:[{begin:n},{
-begin:"~?[a-z$_][0-9a-zA-Z$_]*(\\s*:\\s*[a-z$_][0-9a-z$_]*(\\(\\s*('?[a-z$_][0-9a-z$_]*\\s*(,'?[a-z$_][0-9a-z$_]*\\s*)*)?\\))?){0,2}"
-},{begin:/\(\s*\)/}]}]},{begin:"\\s\\(\\.?[^;\\|]*\\)\\s*=>",end:"\\s=>",
-returnBegin:!0,relevance:0,contains:[{className:"params",relevance:0,variants:[{
-begin:n,end:"(,|\\n|\\))",relevance:0,contains:[c,{className:"typing",begin:":",
-end:"(,|\\n)",returnBegin:!0,relevance:0,contains:b}]}]}]},{
-begin:"\\(\\.\\s"+n+"\\)\\s*=>"}]};g.push(m);const d={className:"constructor",
-begin:a+"\\(",end:"\\)",illegal:"\\n",keywords:r,
-contains:[e.QUOTE_STRING_MODE,c,{className:"params",begin:"\\b"+n}]},u={
-className:"pattern-match",begin:"\\|",returnBegin:!0,keywords:r,end:"=>",
-relevance:0,contains:[d,c,{relevance:0,className:"constructor",begin:a}]},v={
-className:"module-access",keywords:r,returnBegin:!0,variants:[{
-begin:"\\b("+a+"\\.)+"+n},{begin:"\\b("+a+"\\.)+\\(",end:"\\)",returnBegin:!0,
-contains:[m,{begin:"\\(",end:"\\)",relevance:0,skip:!0}].concat(g)},{
-begin:"\\b("+a+"\\.)+\\{",end:/\}/}],contains:g};return b.push(v),{
-name:"ReasonML",aliases:["re"],keywords:r,illegal:"(:-|:=|\\$\\{|\\+=)",
-contains:[e.COMMENT("/\\*","\\*/",{illegal:"^(#,\\/\\/)"}),{
-className:"character",begin:"'(\\\\[^']+|[^'])'",illegal:"\\n",relevance:0
-},e.QUOTE_STRING_MODE,{className:"literal",begin:"\\(\\)",relevance:0},{
-className:"literal",begin:"\\[\\|",end:"\\|\\]",relevance:0,contains:o},{
-className:"literal",begin:"\\[",end:"\\]",relevance:0,contains:o},d,{
-className:"operator",begin:i,illegal:"--\x3e",relevance:0
-},t,e.C_LINE_COMMENT_MODE,u,m,{className:"module-def",
+variants:[{begin:n},{begin:i},{begin:/\(\s*\)/}]}]},{
+begin:"\\s\\(\\.?[^;\\|]*\\)\\s*=>",end:"\\s=>",returnBegin:!0,relevance:0,
+contains:[{className:"params",relevance:0,variants:[{begin:n,end:"(,|\\n|\\))",
+relevance:0,contains:[g,{className:"typing",begin:":",end:"(,|\\n)",
+returnBegin:!0,relevance:0,contains:d}]}]}]},{begin:"\\(\\.\\s"+n+"\\)\\s*=>"}]}
+;m.push(u);const v={className:"constructor",begin:a+"\\(",end:"\\)",
+illegal:"\\n",keywords:t,contains:[e.QUOTE_STRING_MODE,g,{className:"params",
+begin:"\\b"+n}]},N={className:"pattern-match",begin:"\\|",returnBegin:!0,
+keywords:t,end:"=>",relevance:0,contains:[v,g,{relevance:0,
+className:"constructor",begin:a}]},_={className:"module-access",keywords:t,
+returnBegin:!0,variants:[{begin:"\\b("+a+"\\.)+"+n},{begin:"\\b("+a+"\\.)+\\(",
+end:"\\)",returnBegin:!0,contains:[u,{begin:"\\(",end:"\\)",relevance:0,skip:!0
+}].concat(m)},{begin:"\\b("+a+"\\.)+\\{",end:/\}/}],contains:m}
+;return d.push(_),{name:"ReasonML",aliases:["re"],keywords:t,
+illegal:"(:-|:=|\\$\\{|\\+=)",contains:[e.COMMENT("/\\*","\\*/",{
+illegal:"^(#,\\/\\/)"}),{className:"character",begin:"'(\\\\[^']+|[^'])'",
+illegal:"\\n",relevance:0},e.QUOTE_STRING_MODE,{className:"literal",
+begin:"\\(\\)",relevance:0},{className:"literal",begin:"\\[\\|",end:"\\|\\]",
+relevance:0,contains:b},{className:"literal",begin:"\\[",end:"\\]",relevance:0,
+contains:b},v,{className:"operator",begin:l,illegal:"--\x3e",relevance:0
+},o,e.C_LINE_COMMENT_MODE,N,u,{className:"module-def",
 begin:"\\bmodule\\s+"+n+"\\s+"+a+"\\s+=\\s+\\{",end:/\}/,returnBegin:!0,
-keywords:r,relevance:0,contains:[{className:"module",relevance:0,begin:a},{
-begin:/\{/,end:/\}/,relevance:0,skip:!0}].concat(g)},v]}}})()
+keywords:t,relevance:0,contains:[{className:"module",relevance:0,begin:a},{
+begin:/\{/,end:/\}/,relevance:0,skip:!0}].concat(m)},_]}}})()
 ;export default hljsGrammar;
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/rib.min.js b/vendor/assets/javascripts/highlightjs/es/languages/rib.min.js
index 9d91273b0e8..18389d00c11 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/rib.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/rib.min.js
@@ -1,4 +1,4 @@
-/*! `rib` grammar compiled for Highlight.js 11.6.0 */
+/*! `rib` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"RenderMan RIB",
 keywords:"ArchiveRecord AreaLightSource Atmosphere Attribute AttributeBegin AttributeEnd Basis Begin Blobby Bound Clipping ClippingPlane Color ColorSamples ConcatTransform Cone CoordinateSystem CoordSysTransform CropWindow Curves Cylinder DepthOfField Detail DetailRange Disk Displacement Display End ErrorHandler Exposure Exterior Format FrameAspectRatio FrameBegin FrameEnd GeneralPolygon GeometricApproximation Geometry Hider Hyperboloid Identity Illuminate Imager Interior LightSource MakeCubeFaceEnvironment MakeLatLongEnvironment MakeShadow MakeTexture Matte MotionBegin MotionEnd NuPatch ObjectBegin ObjectEnd ObjectInstance Opacity Option Orientation Paraboloid Patch PatchMesh Perspective PixelFilter PixelSamples PixelVariance Points PointsGeneralPolygons PointsPolygons Polygon Procedural Projection Quantize ReadArchive RelativeDetail ReverseOrientation Rotate Scale ScreenWindow ShadingInterpolation ShadingRate Shutter Sides Skew SolidBegin SolidEnd Sphere SubdivisionMesh Surface TextureCoordinates Torus Transform TransformBegin TransformEnd TransformPoints Translate TrimCurve WorldBegin WorldEnd",
 illegal:"</",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/roboconf.min.js b/vendor/assets/javascripts/highlightjs/es/languages/roboconf.min.js
index 5e3a050de14..119b4a9731b 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/roboconf.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/roboconf.min.js
@@ -1,4 +1,4 @@
-/*! `roboconf` grammar compiled for Highlight.js 11.6.0 */
+/*! `roboconf` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const n="[a-zA-Z-_][^\\n{]+\\{",a={className:"attribute",begin:/[a-zA-Z-_]+/,
 end:/\s*:/,excludeEnd:!0,starts:{end:";",relevance:0,contains:[{
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/routeros.min.js b/vendor/assets/javascripts/highlightjs/es/languages/routeros.min.js
index cab1fd2f95f..043a7fafbed 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/routeros.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/routeros.min.js
@@ -1,10 +1,10 @@
-/*! `routeros` grammar compiled for Highlight.js 11.6.0 */
+/*! `routeros` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const r="foreach do while for if from to step else on-error and or not in",n="true false yes no nothing nil null",i={
 className:"variable",variants:[{begin:/\$[\w\d#@][\w\d_]*/},{begin:/\$\{(.*?)\}/
 }]},s={className:"string",begin:/"/,end:/"/,contains:[e.BACKSLASH_ESCAPE,i,{
 className:"variable",begin:/\$\(/,end:/\)/,contains:[e.BACKSLASH_ESCAPE]}]},a={
-className:"string",begin:/'/,end:/'/};return{name:"Microtik RouterOS script",
+className:"string",begin:/'/,end:/'/};return{name:"MikroTik RouterOS script",
 aliases:["mikrotik"],case_insensitive:!0,keywords:{$pattern:/:?[\w-]+/,
 literal:n,
 keyword:r+" :"+r.split(" ").join(" :")+" :"+"global local beep delay put len typeof pick log time set find environment terminal error execute parse resolve toarray tobool toid toip toip6 tonum tostr totime".split(" ").join(" :")
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/rsl.min.js b/vendor/assets/javascripts/highlightjs/es/languages/rsl.min.js
index 34d678812c3..e207f8e92b6 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/rsl.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/rsl.min.js
@@ -1,4 +1,4 @@
-/*! `rsl` grammar compiled for Highlight.js 11.6.0 */
+/*! `rsl` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const t={
 match:[/(surface|displacement|light|volume|imager)/,/\s+/,e.IDENT_RE],scope:{
 1:"keyword",3:"title.class"}};return{name:"RenderMan RSL",keywords:{
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/ruby.min.js b/vendor/assets/javascripts/highlightjs/es/languages/ruby.min.js
index 964a7014f26..d32e566454b 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/ruby.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/ruby.min.js
@@ -1,51 +1,54 @@
-/*! `ruby` grammar compiled for Highlight.js 11.6.0 */
+/*! `ruby` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
-const n=e.regex,a="([a-zA-Z_]\\w*[!?=]?|[-+~]@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?)",s=n.either(/\b([A-Z]+[a-z0-9]+)+/,/\b([A-Z]+[a-z0-9]+)+[A-Z]+/),i=n.concat(s,/(::\w+)*/),r={
-"variable.constant":["__FILE__","__LINE__"],
+const n=e.regex,a="([a-zA-Z_]\\w*[!?=]?|[-+~]@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?)",s=n.either(/\b([A-Z]+[a-z0-9]+)+/,/\b([A-Z]+[a-z0-9]+)+[A-Z]+/),i=n.concat(s,/(::\w+)*/),t={
+"variable.constant":["__FILE__","__LINE__","__ENCODING__"],
 "variable.language":["self","super"],
-keyword:["alias","and","attr_accessor","attr_reader","attr_writer","begin","BEGIN","break","case","class","defined","do","else","elsif","end","END","ensure","for","if","in","include","module","next","not","or","redo","require","rescue","retry","return","then","undef","unless","until","when","while","yield"],
-built_in:["proc","lambda"],literal:["true","false","nil"]},c={
-className:"doctag",begin:"@[A-Za-z]+"},t={begin:"#<",end:">"
-},b=[e.COMMENT("#","$",{contains:[c]}),e.COMMENT("^=begin","^=end",{
-contains:[c],relevance:10}),e.COMMENT("^__END__",e.MATCH_NOTHING_RE)],l={
-className:"subst",begin:/#\{/,end:/\}/,keywords:r},d={className:"string",
-contains:[e.BACKSLASH_ESCAPE,l],variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/
-},{begin:/`/,end:/`/},{begin:/%[qQwWx]?\(/,end:/\)/},{begin:/%[qQwWx]?\[/,
-end:/\]/},{begin:/%[qQwWx]?\{/,end:/\}/},{begin:/%[qQwWx]?</,end:/>/},{
-begin:/%[qQwWx]?\//,end:/\//},{begin:/%[qQwWx]?%/,end:/%/},{begin:/%[qQwWx]?-/,
-end:/-/},{begin:/%[qQwWx]?\|/,end:/\|/},{begin:/\B\?(\\\d{1,3})/},{
+keyword:["alias","and","begin","BEGIN","break","case","class","defined","do","else","elsif","end","END","ensure","for","if","in","module","next","not","or","redo","require","rescue","retry","return","then","undef","unless","until","when","while","yield","include","extend","prepend","public","private","protected","raise","throw"],
+built_in:["proc","lambda","attr_accessor","attr_reader","attr_writer","define_method","private_constant","module_function"],
+literal:["true","false","nil"]},c={className:"doctag",begin:"@[A-Za-z]+"},r={
+begin:"#<",end:">"},b=[e.COMMENT("#","$",{contains:[c]
+}),e.COMMENT("^=begin","^=end",{contains:[c],relevance:10
+}),e.COMMENT("^__END__",e.MATCH_NOTHING_RE)],l={className:"subst",begin:/#\{/,
+end:/\}/,keywords:t},d={className:"string",contains:[e.BACKSLASH_ESCAPE,l],
+variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/},{begin:/`/,end:/`/},{
+begin:/%[qQwWx]?\(/,end:/\)/},{begin:/%[qQwWx]?\[/,end:/\]/},{
+begin:/%[qQwWx]?\{/,end:/\}/},{begin:/%[qQwWx]?</,end:/>/},{begin:/%[qQwWx]?\//,
+end:/\//},{begin:/%[qQwWx]?%/,end:/%/},{begin:/%[qQwWx]?-/,end:/-/},{
+begin:/%[qQwWx]?\|/,end:/\|/},{begin:/\B\?(\\\d{1,3})/},{
 begin:/\B\?(\\x[A-Fa-f0-9]{1,2})/},{begin:/\B\?(\\u\{?[A-Fa-f0-9]{1,6}\}?)/},{
 begin:/\B\?(\\M-\\C-|\\M-\\c|\\c\\M-|\\M-|\\C-\\M-)[\x20-\x7e]/},{
 begin:/\B\?\\(c|C-)[\x20-\x7e]/},{begin:/\B\?\\?\S/},{
 begin:n.concat(/<<[-~]?'?/,n.lookahead(/(\w+)(?=\W)[^\n]*\n(?:[^\n]*\n)*?\s*\1\b/)),
 contains:[e.END_SAME_AS_BEGIN({begin:/(\w+)/,end:/(\w+)/,
-contains:[e.BACKSLASH_ESCAPE,l]})]}]},g="[0-9](_?[0-9])*",o={className:"number",
+contains:[e.BACKSLASH_ESCAPE,l]})]}]},o="[0-9](_?[0-9])*",g={className:"number",
 relevance:0,variants:[{
-begin:`\\b([1-9](_?[0-9])*|0)(\\.(${g}))?([eE][+-]?(${g})|r)?i?\\b`},{
+begin:`\\b([1-9](_?[0-9])*|0)(\\.(${o}))?([eE][+-]?(${o})|r)?i?\\b`},{
 begin:"\\b0[dD][0-9](_?[0-9])*r?i?\\b"},{begin:"\\b0[bB][0-1](_?[0-1])*r?i?\\b"
 },{begin:"\\b0[oO][0-7](_?[0-7])*r?i?\\b"},{
 begin:"\\b0[xX][0-9a-fA-F](_?[0-9a-fA-F])*r?i?\\b"},{
 begin:"\\b0(_?[0-7])+r?i?\\b"}]},_={variants:[{match:/\(\)/},{
 className:"params",begin:/\(/,end:/(?=\))/,excludeBegin:!0,endsParent:!0,
-keywords:r}]},m=[d,{variants:[{match:[/class\s+/,i,/\s+<\s+/,i]},{
-match:[/class\s+/,i]}],scope:{2:"title.class",4:"title.class.inherited"},
-keywords:r},{relevance:0,match:[i,/\.new[ (]/],scope:{1:"title.class"}},{
-relevance:0,match:/\b[A-Z][A-Z_0-9]+\b/,className:"variable.constant"},{
+keywords:t}]},m=[d,{variants:[{match:[/class\s+/,i,/\s+<\s+/,i]},{
+match:[/\b(class|module)\s+/,i]}],scope:{2:"title.class",
+4:"title.class.inherited"},keywords:t},{match:[/(include|extend)\s+/,i],scope:{
+2:"title.class"},keywords:t},{relevance:0,match:[i,/\.new[. (]/],scope:{
+1:"title.class"}},{relevance:0,match:/\b[A-Z][A-Z_0-9]+\b/,
+className:"variable.constant"},{relevance:0,match:s,scope:"title.class"},{
 match:[/def/,/\s+/,a],scope:{1:"keyword",3:"title.function"},contains:[_]},{
 begin:e.IDENT_RE+"::"},{className:"symbol",
 begin:e.UNDERSCORE_IDENT_RE+"(!|\\?)?:",relevance:0},{className:"symbol",
-begin:":(?!\\s)",contains:[d,{begin:a}],relevance:0},o,{className:"variable",
+begin:":(?!\\s)",contains:[d,{begin:a}],relevance:0},g,{className:"variable",
 begin:"(\\$\\W)|((\\$|@@?)(\\w+))(?=[^@$?])(?![A-Za-z])(?![@$?'])"},{
 className:"params",begin:/\|/,end:/\|/,excludeBegin:!0,excludeEnd:!0,
-relevance:0,keywords:r},{begin:"("+e.RE_STARTERS_RE+"|unless)\\s*",
+relevance:0,keywords:t},{begin:"("+e.RE_STARTERS_RE+"|unless)\\s*",
 keywords:"unless",contains:[{className:"regexp",contains:[e.BACKSLASH_ESCAPE,l],
 illegal:/\n/,variants:[{begin:"/",end:"/[a-z]*"},{begin:/%r\{/,end:/\}[a-z]*/},{
 begin:"%r\\(",end:"\\)[a-z]*"},{begin:"%r!",end:"![a-z]*"},{begin:"%r\\[",
-end:"\\][a-z]*"}]}].concat(t,b),relevance:0}].concat(t,b)
-;l.contains=m,_.contains=m;const w=[{begin:/^\s*=>/,starts:{end:"$",contains:m}
+end:"\\][a-z]*"}]}].concat(r,b),relevance:0}].concat(r,b)
+;l.contains=m,_.contains=m;const u=[{begin:/^\s*=>/,starts:{end:"$",contains:m}
 },{className:"meta.prompt",
 begin:"^([>?]>|[\\w#]+\\(\\w+\\):\\d+:\\d+[>*]|(\\w+-)?\\d+\\.\\d+\\.\\d+(p\\d+)?[^\\d][^>]+>)(?=[ ])",
-starts:{end:"$",keywords:r,contains:m}}];return b.unshift(t),{name:"Ruby",
-aliases:["rb","gemspec","podspec","thor","irb"],keywords:r,illegal:/\/\*/,
-contains:[e.SHEBANG({binary:"ruby"})].concat(w).concat(b).concat(m)}}})()
+starts:{end:"$",keywords:t,contains:m}}];return b.unshift(r),{name:"Ruby",
+aliases:["rb","gemspec","podspec","thor","irb"],keywords:t,illegal:/\/\*/,
+contains:[e.SHEBANG({binary:"ruby"})].concat(u).concat(b).concat(m)}}})()
 ;export default hljsGrammar;
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/ruleslanguage.min.js b/vendor/assets/javascripts/highlightjs/es/languages/ruleslanguage.min.js
index a3decc78896..87fe0616664 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/ruleslanguage.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/ruleslanguage.min.js
@@ -1,4 +1,4 @@
-/*! `ruleslanguage` grammar compiled for Highlight.js 11.6.0 */
+/*! `ruleslanguage` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return T=>({name:"Oracle Rules Language",
 keywords:{
 keyword:"BILL_PERIOD BILL_START BILL_STOP RS_EFFECTIVE_START RS_EFFECTIVE_STOP RS_JURIS_CODE RS_OPCO_CODE INTDADDATTRIBUTE|5 INTDADDVMSG|5 INTDBLOCKOP|5 INTDBLOCKOPNA|5 INTDCLOSE|5 INTDCOUNT|5 INTDCOUNTSTATUSCODE|5 INTDCREATEMASK|5 INTDCREATEDAYMASK|5 INTDCREATEFACTORMASK|5 INTDCREATEHANDLE|5 INTDCREATEOVERRIDEDAYMASK|5 INTDCREATEOVERRIDEMASK|5 INTDCREATESTATUSCODEMASK|5 INTDCREATETOUPERIOD|5 INTDDELETE|5 INTDDIPTEST|5 INTDEXPORT|5 INTDGETERRORCODE|5 INTDGETERRORMESSAGE|5 INTDISEQUAL|5 INTDJOIN|5 INTDLOAD|5 INTDLOADACTUALCUT|5 INTDLOADDATES|5 INTDLOADHIST|5 INTDLOADLIST|5 INTDLOADLISTDATES|5 INTDLOADLISTENERGY|5 INTDLOADLISTHIST|5 INTDLOADRELATEDCHANNEL|5 INTDLOADSP|5 INTDLOADSTAGING|5 INTDLOADUOM|5 INTDLOADUOMDATES|5 INTDLOADUOMHIST|5 INTDLOADVERSION|5 INTDOPEN|5 INTDREADFIRST|5 INTDREADNEXT|5 INTDRECCOUNT|5 INTDRELEASE|5 INTDREPLACE|5 INTDROLLAVG|5 INTDROLLPEAK|5 INTDSCALAROP|5 INTDSCALE|5 INTDSETATTRIBUTE|5 INTDSETDSTPARTICIPANT|5 INTDSETSTRING|5 INTDSETVALUE|5 INTDSETVALUESTATUS|5 INTDSHIFTSTARTTIME|5 INTDSMOOTH|5 INTDSORT|5 INTDSPIKETEST|5 INTDSUBSET|5 INTDTOU|5 INTDTOURELEASE|5 INTDTOUVALUE|5 INTDUPDATESTATS|5 INTDVALUE|5 STDEV INTDDELETEEX|5 INTDLOADEXACTUAL|5 INTDLOADEXCUT|5 INTDLOADEXDATES|5 INTDLOADEX|5 INTDLOADEXRELATEDCHANNEL|5 INTDSAVEEX|5 MVLOAD|5 MVLOADACCT|5 MVLOADACCTDATES|5 MVLOADACCTHIST|5 MVLOADDATES|5 MVLOADHIST|5 MVLOADLIST|5 MVLOADLISTDATES|5 MVLOADLISTHIST|5 IF FOR NEXT DONE SELECT END CALL ABORT CLEAR CHANNEL FACTOR LIST NUMBER OVERRIDE SET WEEK DISTRIBUTIONNODE ELSE WHEN THEN OTHERWISE IENUM CSV INCLUDE LEAVE RIDER SAVE DELETE NOVALUE SECTION WARN SAVE_UPDATE DETERMINANT LABEL REPORT REVENUE EACH IN FROM TOTAL CHARGE BLOCK AND OR CSV_FILE RATE_CODE AUXILIARY_DEMAND UIDACCOUNT RS BILL_PERIOD_SELECT HOURS_PER_MONTH INTD_ERROR_STOP SEASON_SCHEDULE_NAME ACCOUNTFACTOR ARRAYUPPERBOUND CALLSTOREDPROC GETADOCONNECTION GETCONNECT GETDATASOURCE GETQUALIFIER GETUSERID HASVALUE LISTCOUNT LISTOP LISTUPDATE LISTVALUE PRORATEFACTOR RSPRORATE SETBINPATH SETDBMONITOR WQ_OPEN BILLINGHOURS DATE DATEFROMFLOAT DATETIMEFROMSTRING DATETIMETOSTRING DATETOFLOAT DAY DAYDIFF DAYNAME DBDATETIME HOUR MINUTE MONTH MONTHDIFF MONTHHOURS MONTHNAME ROUNDDATE SAMEWEEKDAYLASTYEAR SECOND WEEKDAY WEEKDIFF YEAR YEARDAY YEARSTR COMPSUM HISTCOUNT HISTMAX HISTMIN HISTMINNZ HISTVALUE MAXNRANGE MAXRANGE MINRANGE COMPIKVA COMPKVA COMPKVARFROMKQKW COMPLF IDATTR FLAG LF2KW LF2KWH MAXKW POWERFACTOR READING2USAGE AVGSEASON MAXSEASON MONTHLYMERGE SEASONVALUE SUMSEASON ACCTREADDATES ACCTTABLELOAD CONFIGADD CONFIGGET CREATEOBJECT CREATEREPORT EMAILCLIENT EXPBLKMDMUSAGE EXPMDMUSAGE EXPORT_USAGE FACTORINEFFECT GETUSERSPECIFIEDSTOP INEFFECT ISHOLIDAY RUNRATE SAVE_PROFILE SETREPORTTITLE USEREXIT WATFORRUNRATE TO TABLE ACOS ASIN ATAN ATAN2 BITAND CEIL COS COSECANT COSH COTANGENT DIVQUOT DIVREM EXP FABS FLOOR FMOD FREPM FREXPN LOG LOG10 MAX MAXN MIN MINNZ MODF POW ROUND ROUND2VALUE ROUNDINT SECANT SIN SINH SQROOT TAN TANH FLOAT2STRING FLOAT2STRINGNC INSTR LEFT LEN LTRIM MID RIGHT RTRIM STRING STRINGNC TOLOWER TOUPPER TRIM NUMDAYS READ_DATE STAGING",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/rust.min.js b/vendor/assets/javascripts/highlightjs/es/languages/rust.min.js
index 33e972178de..6cf1983cde6 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/rust.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/rust.min.js
@@ -1,4 +1,4 @@
-/*! `rust` grammar compiled for Highlight.js 11.6.0 */
+/*! `rust` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const t=e.regex,a={
 className:"title.function.invoke",relevance:0,
 begin:t.concat(/\b/,/(?!let\b)/,e.IDENT_RE,t.lookahead(/\s*\(/))
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/sas.min.js b/vendor/assets/javascripts/highlightjs/es/languages/sas.min.js
index 9b1c42f9fb6..30a8c491be3 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/sas.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/sas.min.js
@@ -1,4 +1,4 @@
-/*! `sas` grammar compiled for Highlight.js 11.6.0 */
+/*! `sas` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const t=e.regex;return{name:"SAS",
 case_insensitive:!0,keywords:{
 literal:["null","missing","_all_","_automatic_","_character_","_infile_","_n_","_name_","_null_","_numeric_","_user_","_webout_"],
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/scala.min.js b/vendor/assets/javascripts/highlightjs/es/languages/scala.min.js
index 774094bfb80..1114af4db46 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/scala.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/scala.min.js
@@ -1,4 +1,4 @@
-/*! `scala` grammar compiled for Highlight.js 11.6.0 */
+/*! `scala` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const n=e.regex,a={
 className:"subst",variants:[{begin:"\\$[A-Za-z0-9_]+"},{begin:/\$\{/,end:/\}/}]
 },s={className:"string",variants:[{begin:'"""',end:'"""'},{begin:'"',end:'"',
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/scheme.min.js b/vendor/assets/javascripts/highlightjs/es/languages/scheme.min.js
index c30d90d0447..6a44a3e2c79 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/scheme.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/scheme.min.js
@@ -1,19 +1,19 @@
-/*! `scheme` grammar compiled for Highlight.js 11.6.0 */
+/*! `scheme` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
-const t="[^\\(\\)\\[\\]\\{\\}\",'`;#|\\\\\\s]+",n={$pattern:t,
+const t="[^\\(\\)\\[\\]\\{\\}\",'`;#|\\\\\\s]+",n="(-|\\+)?\\d+([./]\\d+)?",r={
+$pattern:t,
 built_in:"case-lambda call/cc class define-class exit-handler field import inherit init-field interface let*-values let-values let/ec mixin opt-lambda override protect provide public rename require require-for-syntax syntax syntax-case syntax-error unit/sig unless when with-syntax and begin call-with-current-continuation call-with-input-file call-with-output-file case cond define define-syntax delay do dynamic-wind else for-each if lambda let let* let-syntax letrec letrec-syntax map or syntax-rules ' * + , ,@ - ... / ; < <= = => > >= ` abs acos angle append apply asin assoc assq assv atan boolean? caar cadr call-with-input-file call-with-output-file call-with-values car cdddar cddddr cdr ceiling char->integer char-alphabetic? char-ci<=? char-ci<? char-ci=? char-ci>=? char-ci>? char-downcase char-lower-case? char-numeric? char-ready? char-upcase char-upper-case? char-whitespace? char<=? char<? char=? char>=? char>? char? close-input-port close-output-port complex? cons cos current-input-port current-output-port denominator display eof-object? eq? equal? eqv? eval even? exact->inexact exact? exp expt floor force gcd imag-part inexact->exact inexact? input-port? integer->char integer? interaction-environment lcm length list list->string list->vector list-ref list-tail list? load log magnitude make-polar make-rectangular make-string make-vector max member memq memv min modulo negative? newline not null-environment null? number->string number? numerator odd? open-input-file open-output-file output-port? pair? peek-char port? positive? procedure? quasiquote quote quotient rational? rationalize read read-char real-part real? remainder reverse round scheme-report-environment set! set-car! set-cdr! sin sqrt string string->list string->number string->symbol string-append string-ci<=? string-ci<? string-ci=? string-ci>=? string-ci>? string-copy string-fill! string-length string-ref string-set! string<=? string<? string=? string>=? string>? string? substring symbol->string symbol? tan transcript-off transcript-on truncate values vector vector->list vector-fill! vector-length vector-ref vector-set! with-input-from-file with-output-to-file write write-char zero?"
-},r={className:"literal",begin:"(#t|#f|#\\\\"+t+"|#\\\\.)"},a={
-className:"number",variants:[{begin:"(-|\\+)?\\d+([./]\\d+)?",relevance:0},{
-begin:"(-|\\+)?\\d+([./]\\d+)?[+\\-](-|\\+)?\\d+([./]\\d+)?i",relevance:0},{
-begin:"#b[0-1]+(/[0-1]+)?"},{begin:"#o[0-7]+(/[0-7]+)?"},{
-begin:"#x[0-9a-f]+(/[0-9a-f]+)?"}]},i=e.QUOTE_STRING_MODE,c=[e.COMMENT(";","$",{
-relevance:0}),e.COMMENT("#\\|","\\|#")],s={begin:t,relevance:0},l={
-className:"symbol",begin:"'"+t},o={endsWithParent:!0,relevance:0},u={variants:[{
+},a={className:"literal",begin:"(#t|#f|#\\\\"+t+"|#\\\\.)"},i={
+className:"number",variants:[{begin:n,relevance:0},{begin:n+"[+\\-]"+n+"i",
+relevance:0},{begin:"#b[0-1]+(/[0-1]+)?"},{begin:"#o[0-7]+(/[0-7]+)?"},{
+begin:"#x[0-9a-f]+(/[0-9a-f]+)?"}]},c=e.QUOTE_STRING_MODE,s=[e.COMMENT(";","$",{
+relevance:0}),e.COMMENT("#\\|","\\|#")],l={begin:t,relevance:0},o={
+className:"symbol",begin:"'"+t},u={endsWithParent:!0,relevance:0},g={variants:[{
 begin:/'/},{begin:"`"}],contains:[{begin:"\\(",end:"\\)",
-contains:["self",r,i,a,s,l]}]},d={className:"name",relevance:0,begin:t,
-keywords:n},g={variants:[{begin:"\\(",end:"\\)"},{begin:"\\[",end:"\\]"}],
+contains:["self",a,c,i,l,o]}]},d={className:"name",relevance:0,begin:t,
+keywords:r},p={variants:[{begin:"\\(",end:"\\)"},{begin:"\\[",end:"\\]"}],
 contains:[{begin:/lambda/,endsWithParent:!0,returnBegin:!0,contains:[d,{
 endsParent:!0,variants:[{begin:/\(/,end:/\)/},{begin:/\[/,end:/\]/}],
-contains:[s]}]},d,o]};return o.contains=[r,a,i,s,l,u,g].concat(c),{
-name:"Scheme",illegal:/\S/,contains:[e.SHEBANG(),a,i,l,u,g].concat(c)}}})()
-;export default hljsGrammar;
\ No newline at end of file
+contains:[l]}]},d,u]};return u.contains=[a,i,c,l,o,g,p].concat(s),{
+name:"Scheme",aliases:["scm"],illegal:/\S/,
+contains:[e.SHEBANG(),i,c,o,g,p].concat(s)}}})();export default hljsGrammar;
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/scilab.min.js b/vendor/assets/javascripts/highlightjs/es/languages/scilab.min.js
index 7b6c0497ec7..8ee56eaa224 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/scilab.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/scilab.min.js
@@ -1,4 +1,4 @@
-/*! `scilab` grammar compiled for Highlight.js 11.6.0 */
+/*! `scilab` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const n=[e.C_NUMBER_MODE,{
 className:"string",begin:"'|\"",end:"'|\"",contains:[e.BACKSLASH_ESCAPE,{
 begin:"''"}]}];return{name:"Scilab",aliases:["sci"],keywords:{$pattern:/%?\w+/,
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/scss.min.js b/vendor/assets/javascripts/highlightjs/es/languages/scss.min.js
index 359b57846b2..4c8e6a92480 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/scss.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/scss.min.js
@@ -1,4 +1,4 @@
-/*! `scss` grammar compiled for Highlight.js 11.6.0 */
+/*! `scss` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict"
 ;const e=["a","abbr","address","article","aside","audio","b","blockquote","body","button","canvas","caption","cite","code","dd","del","details","dfn","div","dl","dt","em","fieldset","figcaption","figure","footer","form","h1","h2","h3","h4","h5","h6","header","hgroup","html","i","iframe","img","input","ins","kbd","label","legend","li","main","mark","menu","nav","object","ol","p","q","quote","samp","section","span","strong","summary","sup","table","tbody","td","textarea","tfoot","th","thead","time","tr","ul","var","video"],r=["any-hover","any-pointer","aspect-ratio","color","color-gamut","color-index","device-aspect-ratio","device-height","device-width","display-mode","forced-colors","grid","height","hover","inverted-colors","monochrome","orientation","overflow-block","overflow-inline","pointer","prefers-color-scheme","prefers-contrast","prefers-reduced-motion","prefers-reduced-transparency","resolution","scan","scripting","update","width","min-width","max-width","min-height","max-height"],i=["active","any-link","blank","checked","current","default","defined","dir","disabled","drop","empty","enabled","first","first-child","first-of-type","fullscreen","future","focus","focus-visible","focus-within","has","host","host-context","hover","indeterminate","in-range","invalid","is","lang","last-child","last-of-type","left","link","local-link","not","nth-child","nth-col","nth-last-child","nth-last-col","nth-last-of-type","nth-of-type","only-child","only-of-type","optional","out-of-range","past","placeholder-shown","read-only","read-write","required","right","root","scope","target","target-within","user-invalid","valid","visited","where"],t=["after","backdrop","before","cue","cue-region","first-letter","first-line","grammar-error","marker","part","placeholder","selection","slotted","spelling-error"],o=["align-content","align-items","align-self","all","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","backface-visibility","background","background-attachment","background-blend-mode","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","block-size","border","border-block","border-block-color","border-block-end","border-block-end-color","border-block-end-style","border-block-end-width","border-block-start","border-block-start-color","border-block-start-style","border-block-start-width","border-block-style","border-block-width","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-inline","border-inline-color","border-inline-end","border-inline-end-color","border-inline-end-style","border-inline-end-width","border-inline-start","border-inline-start-color","border-inline-start-style","border-inline-start-width","border-inline-style","border-inline-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","caret-color","clear","clip","clip-path","clip-rule","color","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","contain","content","content-visibility","counter-increment","counter-reset","cue","cue-after","cue-before","cursor","direction","display","empty-cells","filter","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","flow","font","font-display","font-family","font-feature-settings","font-kerning","font-language-override","font-size","font-size-adjust","font-smoothing","font-stretch","font-style","font-synthesis","font-variant","font-variant-caps","font-variant-east-asian","font-variant-ligatures","font-variant-numeric","font-variant-position","font-variation-settings","font-weight","gap","glyph-orientation-vertical","grid","grid-area","grid-auto-columns","grid-auto-flow","grid-auto-rows","grid-column","grid-column-end","grid-column-start","grid-gap","grid-row","grid-row-end","grid-row-start","grid-template","grid-template-areas","grid-template-columns","grid-template-rows","hanging-punctuation","height","hyphens","icon","image-orientation","image-rendering","image-resolution","ime-mode","inline-size","isolation","justify-content","left","letter-spacing","line-break","line-height","list-style","list-style-image","list-style-position","list-style-type","margin","margin-block","margin-block-end","margin-block-start","margin-bottom","margin-inline","margin-inline-end","margin-inline-start","margin-left","margin-right","margin-top","marks","mask","mask-border","mask-border-mode","mask-border-outset","mask-border-repeat","mask-border-slice","mask-border-source","mask-border-width","mask-clip","mask-composite","mask-image","mask-mode","mask-origin","mask-position","mask-repeat","mask-size","mask-type","max-block-size","max-height","max-inline-size","max-width","min-block-size","min-height","min-inline-size","min-width","mix-blend-mode","nav-down","nav-index","nav-left","nav-right","nav-up","none","normal","object-fit","object-position","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-wrap","overflow-x","overflow-y","padding","padding-block","padding-block-end","padding-block-start","padding-bottom","padding-inline","padding-inline-end","padding-inline-start","padding-left","padding-right","padding-top","page-break-after","page-break-before","page-break-inside","pause","pause-after","pause-before","perspective","perspective-origin","pointer-events","position","quotes","resize","rest","rest-after","rest-before","right","row-gap","scroll-margin","scroll-margin-block","scroll-margin-block-end","scroll-margin-block-start","scroll-margin-bottom","scroll-margin-inline","scroll-margin-inline-end","scroll-margin-inline-start","scroll-margin-left","scroll-margin-right","scroll-margin-top","scroll-padding","scroll-padding-block","scroll-padding-block-end","scroll-padding-block-start","scroll-padding-bottom","scroll-padding-inline","scroll-padding-inline-end","scroll-padding-inline-start","scroll-padding-left","scroll-padding-right","scroll-padding-top","scroll-snap-align","scroll-snap-stop","scroll-snap-type","scrollbar-color","scrollbar-gutter","scrollbar-width","shape-image-threshold","shape-margin","shape-outside","speak","speak-as","src","tab-size","table-layout","text-align","text-align-all","text-align-last","text-combine-upright","text-decoration","text-decoration-color","text-decoration-line","text-decoration-style","text-emphasis","text-emphasis-color","text-emphasis-position","text-emphasis-style","text-indent","text-justify","text-orientation","text-overflow","text-rendering","text-shadow","text-transform","text-underline-position","top","transform","transform-box","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","vertical-align","visibility","voice-balance","voice-duration","voice-family","voice-pitch","voice-range","voice-rate","voice-stress","voice-volume","white-space","widows","width","will-change","word-break","word-spacing","word-wrap","writing-mode","z-index"].reverse()
 ;return n=>{const a=(e=>({IMPORTANT:{scope:"meta",begin:"!important"},
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/shell.min.js b/vendor/assets/javascripts/highlightjs/es/languages/shell.min.js
index 7cfbb15c698..0c21711b883 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/shell.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/shell.min.js
@@ -1,4 +1,4 @@
-/*! `shell` grammar compiled for Highlight.js 11.6.0 */
+/*! `shell` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return s=>({name:"Shell Session",
 aliases:["console","shellsession"],contains:[{className:"meta.prompt",
 begin:/^\s{0,3}[/~\w\d[\]()@-]*[>%$#][ ]?/,starts:{end:/[^\\](?=\s*$)/,
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/smali.min.js b/vendor/assets/javascripts/highlightjs/es/languages/smali.min.js
index 60ef5eeb8c5..7af123838c2 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/smali.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/smali.min.js
@@ -1,4 +1,4 @@
-/*! `smali` grammar compiled for Highlight.js 11.6.0 */
+/*! `smali` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const a=["add","and","cmp","cmpg","cmpl","const","div","double","float","goto","if","int","long","move","mul","neg","new","nop","not","or","rem","return","shl","shr","sput","sub","throw","ushr","xor"]
 ;return{name:"Smali",contains:[{className:"string",begin:'"',end:'"',relevance:0
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/smalltalk.min.js b/vendor/assets/javascripts/highlightjs/es/languages/smalltalk.min.js
index 54c687542c6..0818420d76f 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/smalltalk.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/smalltalk.min.js
@@ -1,4 +1,4 @@
-/*! `smalltalk` grammar compiled for Highlight.js 11.6.0 */
+/*! `smalltalk` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const a="[a-z][a-zA-Z0-9_]*",n={
 className:"string",begin:"\\$.{1}"},s={className:"symbol",
 begin:"#"+e.UNDERSCORE_IDENT_RE};return{name:"Smalltalk",aliases:["st"],
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/sml.min.js b/vendor/assets/javascripts/highlightjs/es/languages/sml.min.js
index 789dcfcdf83..889827ec672 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/sml.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/sml.min.js
@@ -1,4 +1,4 @@
-/*! `sml` grammar compiled for Highlight.js 11.6.0 */
+/*! `sml` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"SML (Standard ML)",
 aliases:["ml"],keywords:{$pattern:"[a-z_]\\w*!?",
 keyword:"abstype and andalso as case datatype do else end eqtype exception fn fun functor handle if in include infix infixr let local nonfix of op open orelse raise rec sharing sig signature struct structure then type val with withtype where while",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/sqf.min.js b/vendor/assets/javascripts/highlightjs/es/languages/sqf.min.js
index 99295b8f418..63fbd55e6dd 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/sqf.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/sqf.min.js
@@ -1,17 +1,17 @@
-/*! `sqf` grammar compiled for Highlight.js 11.6.0 */
+/*! `sqf` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const t={className:"string",
 variants:[{begin:'"',end:'"',contains:[{begin:'""',relevance:0}]},{begin:"'",
 end:"'",contains:[{begin:"''",relevance:0}]}]},a={className:"meta",
-begin:/#\s*[a-z]+\b/,end:/$/,keywords:{
-keyword:"define undef ifdef ifndef else endif include"},contains:[{begin:/\\\n/,
-relevance:0},e.inherit(t,{className:"string"}),{className:"string",
-begin:/<[^\n>]*>/,end:/$/,illegal:"\\n"
-},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]};return{name:"SQF",
-case_insensitive:!0,keywords:{
-keyword:["case","catch","default","do","else","exit","exitWith","for","forEach","from","if","private","switch","then","throw","to","try","waitUntil","while","with"],
-built_in:["abs","accTime","acos","action","actionIDs","actionKeys","actionKeysImages","actionKeysNames","actionKeysNamesArray","actionName","actionParams","activateAddons","activatedAddons","activateKey","add3DENConnection","add3DENEventHandler","add3DENLayer","addAction","addBackpack","addBackpackCargo","addBackpackCargoGlobal","addBackpackGlobal","addBinocularItem","addCamShake","addCuratorAddons","addCuratorCameraArea","addCuratorEditableObjects","addCuratorEditingArea","addCuratorPoints","addEditorObject","addEventHandler","addForce","addForceGeneratorRTD","addGoggles","addGroupIcon","addHandgunItem","addHeadgear","addItem","addItemCargo","addItemCargoGlobal","addItemPool","addItemToBackpack","addItemToUniform","addItemToVest","addLiveStats","addMagazine","addMagazineAmmoCargo","addMagazineCargo","addMagazineCargoGlobal","addMagazineGlobal","addMagazinePool","addMagazines","addMagazineTurret","addMenu","addMenuItem","addMissionEventHandler","addMPEventHandler","addMusicEventHandler","addonFiles","addOwnedMine","addPlayerScores","addPrimaryWeaponItem","addPublicVariableEventHandler","addRating","addResources","addScore","addScoreSide","addSecondaryWeaponItem","addSwitchableUnit","addTeamMember","addToRemainsCollector","addTorque","addUniform","addVehicle","addVest","addWaypoint","addWeapon","addWeaponCargo","addWeaponCargoGlobal","addWeaponGlobal","addWeaponItem","addWeaponPool","addWeaponTurret","addWeaponWithAttachmentsCargo","addWeaponWithAttachmentsCargoGlobal","admin","agent","agents","AGLToASL","aimedAtTarget","aimPos","airDensityCurveRTD","airDensityRTD","airplaneThrottle","airportSide","AISFinishHeal","alive","all3DENEntities","allActiveTitleEffects","allAddonsInfo","allAirports","allControls","allCurators","allCutLayers","allDead","allDeadMen","allDiarySubjects","allDisplays","allGroups","allMapMarkers","allMines","allMissionObjects","allow3DMode","allowCrewInImmobile","allowCuratorLogicIgnoreAreas","allowDamage","allowDammage","allowFileOperations","allowFleeing","allowGetIn","allowSprint","allPlayers","allSimpleObjects","allSites","allTurrets","allUnits","allUnitsUAV","allVariables","ammo","ammoOnPylon","and","animate","animateBay","animateDoor","animatePylon","animateSource","animationNames","animationPhase","animationSourcePhase","animationState","apertureParams","append","apply","armoryPoints","arrayIntersect","asin","ASLToAGL","ASLToATL","assert","assignAsCargo","assignAsCargoIndex","assignAsCommander","assignAsDriver","assignAsGunner","assignAsTurret","assignCurator","assignedCargo","assignedCommander","assignedDriver","assignedGunner","assignedItems","assignedTarget","assignedTeam","assignedVehicle","assignedVehicleRole","assignItem","assignTeam","assignToAirport","atan","atan2","atg","ATLToASL","attachedObject","attachedObjects","attachedTo","attachObject","attachTo","attackEnabled","backpack","backpackCargo","backpackContainer","backpackItems","backpackMagazines","backpackSpaceFor","batteryChargeRTD","behaviour","benchmark","bezierInterpolation","binocular","binocularItems","binocularMagazine","boundingBox","boundingBoxReal","boundingCenter","break","breakOut","breakTo","breakWith","briefingName","buildingExit","buildingPos","buldozer_EnableRoadDiag","buldozer_IsEnabledRoadDiag","buldozer_LoadNewRoads","buldozer_reloadOperMap","buttonAction","buttonSetAction","cadetMode","calculatePath","calculatePlayerVisibilityByFriendly","call","callExtension","camCommand","camCommit","camCommitPrepared","camCommitted","camConstuctionSetParams","camCreate","camDestroy","cameraEffect","cameraEffectEnableHUD","cameraInterest","cameraOn","cameraView","campaignConfigFile","camPreload","camPreloaded","camPrepareBank","camPrepareDir","camPrepareDive","camPrepareFocus","camPrepareFov","camPrepareFovRange","camPreparePos","camPrepareRelPos","camPrepareTarget","camSetBank","camSetDir","camSetDive","camSetFocus","camSetFov","camSetFovRange","camSetPos","camSetRelPos","camSetTarget","camTarget","camUseNVG","canAdd","canAddItemToBackpack","canAddItemToUniform","canAddItemToVest","cancelSimpleTaskDestination","canFire","canMove","canSlingLoad","canStand","canSuspend","canTriggerDynamicSimulation","canUnloadInCombat","canVehicleCargo","captive","captiveNum","cbChecked","cbSetChecked","ceil","channelEnabled","cheatsEnabled","checkAIFeature","checkVisibility","className","clear3DENAttribute","clear3DENInventory","clearAllItemsFromBackpack","clearBackpackCargo","clearBackpackCargoGlobal","clearForcesRTD","clearGroupIcons","clearItemCargo","clearItemCargoGlobal","clearItemPool","clearMagazineCargo","clearMagazineCargoGlobal","clearMagazinePool","clearOverlay","clearRadio","clearVehicleInit","clearWeaponCargo","clearWeaponCargoGlobal","clearWeaponPool","clientOwner","closeDialog","closeDisplay","closeOverlay","collapseObjectTree","collect3DENHistory","collectiveRTD","combatBehaviour","combatMode","commandArtilleryFire","commandChat","commander","commandFire","commandFollow","commandFSM","commandGetOut","commandingMenu","commandMove","commandRadio","commandStop","commandSuppressiveFire","commandTarget","commandWatch","comment","commitOverlay","compile","compileFinal","compileScript","completedFSM","composeText","configClasses","configFile","configHierarchy","configName","configOf","configProperties","configSourceAddonList","configSourceMod","configSourceModList","confirmSensorTarget","connectTerminalToUAV","connectToServer","continue","continueWith","controlsGroupCtrl","copyFromClipboard","copyToClipboard","copyWaypoints","cos","count","countEnemy","countFriendly","countSide","countType","countUnknown","create3DENComposition","create3DENEntity","createAgent","createCenter","createDialog","createDiaryLink","createDiaryRecord","createDiarySubject","createDisplay","createGearDialog","createGroup","createGuardedPoint","createHashMap","createHashMapFromArray","createLocation","createMarker","createMarkerLocal","createMenu","createMine","createMissionDisplay","createMPCampaignDisplay","createSimpleObject","createSimpleTask","createSite","createSoundSource","createTarget","createTask","createTeam","createTrigger","createUnit","createVehicle","createVehicleCrew","createVehicleLocal","crew","ctAddHeader","ctAddRow","ctClear","ctCurSel","ctData","ctFindHeaderRows","ctFindRowHeader","ctHeaderControls","ctHeaderCount","ctRemoveHeaders","ctRemoveRows","ctrlActivate","ctrlAddEventHandler","ctrlAngle","ctrlAnimateModel","ctrlAnimationPhaseModel","ctrlAutoScrollDelay","ctrlAutoScrollRewind","ctrlAutoScrollSpeed","ctrlChecked","ctrlClassName","ctrlCommit","ctrlCommitted","ctrlCreate","ctrlDelete","ctrlEnable","ctrlEnabled","ctrlFade","ctrlFontHeight","ctrlHTMLLoaded","ctrlIDC","ctrlIDD","ctrlMapAnimAdd","ctrlMapAnimClear","ctrlMapAnimCommit","ctrlMapAnimDone","ctrlMapCursor","ctrlMapMouseOver","ctrlMapScale","ctrlMapScreenToWorld","ctrlMapWorldToScreen","ctrlModel","ctrlModelDirAndUp","ctrlModelScale","ctrlMousePosition","ctrlParent","ctrlParentControlsGroup","ctrlPosition","ctrlRemoveAllEventHandlers","ctrlRemoveEventHandler","ctrlScale","ctrlScrollValues","ctrlSetActiveColor","ctrlSetAngle","ctrlSetAutoScrollDelay","ctrlSetAutoScrollRewind","ctrlSetAutoScrollSpeed","ctrlSetBackgroundColor","ctrlSetChecked","ctrlSetDisabledColor","ctrlSetEventHandler","ctrlSetFade","ctrlSetFocus","ctrlSetFont","ctrlSetFontH1","ctrlSetFontH1B","ctrlSetFontH2","ctrlSetFontH2B","ctrlSetFontH3","ctrlSetFontH3B","ctrlSetFontH4","ctrlSetFontH4B","ctrlSetFontH5","ctrlSetFontH5B","ctrlSetFontH6","ctrlSetFontH6B","ctrlSetFontHeight","ctrlSetFontHeightH1","ctrlSetFontHeightH2","ctrlSetFontHeightH3","ctrlSetFontHeightH4","ctrlSetFontHeightH5","ctrlSetFontHeightH6","ctrlSetFontHeightSecondary","ctrlSetFontP","ctrlSetFontPB","ctrlSetFontSecondary","ctrlSetForegroundColor","ctrlSetModel","ctrlSetModelDirAndUp","ctrlSetModelScale","ctrlSetMousePosition","ctrlSetPixelPrecision","ctrlSetPosition","ctrlSetPositionH","ctrlSetPositionW","ctrlSetPositionX","ctrlSetPositionY","ctrlSetScale","ctrlSetScrollValues","ctrlSetStructuredText","ctrlSetText","ctrlSetTextColor","ctrlSetTextColorSecondary","ctrlSetTextSecondary","ctrlSetTextSelection","ctrlSetTooltip","ctrlSetTooltipColorBox","ctrlSetTooltipColorShade","ctrlSetTooltipColorText","ctrlSetURL","ctrlShow","ctrlShown","ctrlStyle","ctrlText","ctrlTextColor","ctrlTextHeight","ctrlTextSecondary","ctrlTextSelection","ctrlTextWidth","ctrlTooltip","ctrlType","ctrlURL","ctrlVisible","ctRowControls","ctRowCount","ctSetCurSel","ctSetData","ctSetHeaderTemplate","ctSetRowTemplate","ctSetValue","ctValue","curatorAddons","curatorCamera","curatorCameraArea","curatorCameraAreaCeiling","curatorCoef","curatorEditableObjects","curatorEditingArea","curatorEditingAreaType","curatorMouseOver","curatorPoints","curatorRegisteredObjects","curatorSelected","curatorWaypointCost","current3DENOperation","currentChannel","currentCommand","currentMagazine","currentMagazineDetail","currentMagazineDetailTurret","currentMagazineTurret","currentMuzzle","currentNamespace","currentPilot","currentTask","currentTasks","currentThrowable","currentVisionMode","currentWaypoint","currentWeapon","currentWeaponMode","currentWeaponTurret","currentZeroing","cursorObject","cursorTarget","customChat","customRadio","customWaypointPosition","cutFadeOut","cutObj","cutRsc","cutText","damage","date","dateToNumber","daytime","deActivateKey","debriefingText","debugFSM","debugLog","decayGraphValues","deg","delete3DENEntities","deleteAt","deleteCenter","deleteCollection","deleteEditorObject","deleteGroup","deleteGroupWhenEmpty","deleteIdentity","deleteLocation","deleteMarker","deleteMarkerLocal","deleteRange","deleteResources","deleteSite","deleteStatus","deleteTarget","deleteTeam","deleteVehicle","deleteVehicleCrew","deleteWaypoint","detach","detectedMines","diag_activeMissionFSMs","diag_activeScripts","diag_activeSQSScripts","diag_captureFrameToFile","diag_captureSlowFrame","diag_deltaTime","diag_drawMode","diag_enable","diag_enabled","diag_fps","diag_fpsMin","diag_frameNo","diag_list","diag_mergeConfigFile","diag_scope","diag_activeSQFScripts","diag_allMissionEventHandlers","diag_captureFrame","diag_codePerformance","diag_dumpCalltraceToLog","diag_dumpTerrainSynth","diag_dynamicSimulationEnd","diag_exportConfig","diag_exportTerrainSVG","diag_lightNewLoad","diag_localized","diag_log","diag_logSlowFrame","diag_recordTurretLimits","diag_resetShapes","diag_setLightNew","diag_tickTime","diag_toggle","dialog","diaryRecordNull","diarySubjectExists","didJIP","didJIPOwner","difficulty","difficultyEnabled","difficultyEnabledRTD","difficultyOption","direction","directSay","disableAI","disableCollisionWith","disableConversation","disableDebriefingStats","disableMapIndicators","disableNVGEquipment","disableRemoteSensors","disableSerialization","disableTIEquipment","disableUAVConnectability","disableUserInput","displayAddEventHandler","displayCtrl","displayParent","displayRemoveAllEventHandlers","displayRemoveEventHandler","displaySetEventHandler","dissolveTeam","distance","distance2D","distanceSqr","distributionRegion","do3DENAction","doArtilleryFire","doFire","doFollow","doFSM","doGetOut","doMove","doorPhase","doStop","doSuppressiveFire","doTarget","doWatch","drawArrow","drawEllipse","drawIcon","drawIcon3D","drawLine","drawLine3D","drawLink","drawLocation","drawPolygon","drawRectangle","drawTriangle","driver","drop","dynamicSimulationDistance","dynamicSimulationDistanceCoef","dynamicSimulationEnabled","dynamicSimulationSystemEnabled","echo","edit3DENMissionAttributes","editObject","editorSetEventHandler","effectiveCommander","elevatePeriscope","emptyPositions","enableAI","enableAIFeature","enableAimPrecision","enableAttack","enableAudioFeature","enableAutoStartUpRTD","enableAutoTrimRTD","enableCamShake","enableCaustics","enableChannel","enableCollisionWith","enableCopilot","enableDebriefingStats","enableDiagLegend","enableDynamicSimulation","enableDynamicSimulationSystem","enableEndDialog","enableEngineArtillery","enableEnvironment","enableFatigue","enableGunLights","enableInfoPanelComponent","enableIRLasers","enableMimics","enablePersonTurret","enableRadio","enableReload","enableRopeAttach","enableSatNormalOnDetail","enableSaving","enableSentences","enableSimulation","enableSimulationGlobal","enableStamina","enableStressDamage","enableTeamSwitch","enableTraffic","enableUAVConnectability","enableUAVWaypoints","enableVehicleCargo","enableVehicleSensor","enableWeaponDisassembly","endLoadingScreen","endMission","enemy","engineOn","enginesIsOnRTD","enginesPowerRTD","enginesRpmRTD","enginesTorqueRTD","entities","environmentEnabled","environmentVolume","estimatedEndServerTime","estimatedTimeLeft","evalObjectArgument","everyBackpack","everyContainer","exec","execEditorScript","execFSM","execVM","exp","expectedDestination","exportJIPMessages","exportLandscapeXYZ","eyeDirection","eyePos","face","faction","fadeEnvironment","fadeMusic","fadeRadio","fadeSound","fadeSpeech","failMission","fileExists","fillWeaponsFromPool","find","findCover","findDisplay","findEditorObject","findEmptyPosition","findEmptyPositionReady","findIf","findNearestEnemy","finishMissionInit","finite","fire","fireAtTarget","firstBackpack","flag","flagAnimationPhase","flagOwner","flagSide","flagTexture","flatten","fleeing","floor","flyInHeight","flyInHeightASL","focusedCtrl","fog","fogForecast","fogParams","forceAddUniform","forceAtPositionRTD","forceCadetDifficulty","forcedMap","forceEnd","forceFlagTexture","forceFollowRoad","forceGeneratorRTD","forceMap","forceRespawn","forceSpeed","forceUnicode","forceWalk","forceWeaponFire","forceWeatherChange","forEachMember","forEachMemberAgent","forEachMemberTeam","forgetTarget","format","formation","formationDirection","formationLeader","formationMembers","formationPosition","formationTask","formatText","formLeader","freeLook","friendly","fromEditor","fuel","fullCrew","gearIDCAmmoCount","gearSlotAmmoCount","gearSlotData","get","get3DENActionState","get3DENAttribute","get3DENCamera","get3DENConnections","get3DENEntity","get3DENEntityID","get3DENGrid","get3DENIconsVisible","get3DENLayerEntities","get3DENLinesVisible","get3DENMissionAttribute","get3DENMouseOver","get3DENSelected","getAimingCoef","getAllEnvSoundControllers","getAllHitPointsDamage","getAllOwnedMines","getAllPylonsInfo","getAllSoundControllers","getAllUnitTraits","getAmmoCargo","getAnimAimPrecision","getAnimSpeedCoef","getArray","getArtilleryAmmo","getArtilleryComputerSettings","getArtilleryETA","getAssetDLCInfo","getAssignedCuratorLogic","getAssignedCuratorUnit","getAttackTarget","getAudioOptionVolumes","getBackpackCargo","getBleedingRemaining","getBurningValue","getCalculatePlayerVisibilityByFriendly","getCameraViewDirection","getCargoIndex","getCenterOfMass","getClientState","getClientStateNumber","getCompatiblePylonMagazines","getConnectedUAV","getContainerMaxLoad","getCursorObjectParams","getCustomAimCoef","getCustomSoundController","getCustomSoundControllerCount","getDammage","getDescription","getDir","getDirVisual","getDiverState","getDLCAssetsUsage","getDLCAssetsUsageByName","getDLCs","getDLCUsageTime","getEditorCamera","getEditorMode","getEditorObjectScope","getElevationOffset","getEnvSoundController","getFatigue","getFieldManualStartPage","getForcedFlagTexture","getFriend","getFSMVariable","getFuelCargo","getGraphValues","getGroupIcon","getGroupIconParams","getGroupIcons","getHideFrom","getHit","getHitIndex","getHitPointDamage","getItemCargo","getLighting","getLightingAt","getLoadedModsInfo","getMagazineCargo","getMarkerColor","getMarkerPos","getMarkerSize","getMarkerType","getMass","getMissionConfig","getMissionConfigValue","getMissionDLCs","getMissionLayerEntities","getMissionLayers","getMissionPath","getModelInfo","getMousePosition","getMusicPlayedTime","getNumber","getObjectArgument","getObjectChildren","getObjectDLC","getObjectFOV","getObjectMaterials","getObjectProxy","getObjectScale","getObjectTextures","getObjectType","getObjectViewDistance","getOrDefault","getOxygenRemaining","getPersonUsedDLCs","getPilotCameraDirection","getPilotCameraPosition","getPilotCameraRotation","getPilotCameraTarget","getPlateNumber","getPlayerChannel","getPlayerID","getPlayerScores","getPlayerUID","getPlayerUIDOld","getPlayerVoNVolume","getPos","getPosASL","getPosASLVisual","getPosASLW","getPosATL","getPosATLVisual","getPosVisual","getPosWorld","getPosWorldVisual","getPylonMagazines","getRelDir","getRelPos","getRemoteSensorsDisabled","getRepairCargo","getResolution","getRoadInfo","getRotorBrakeRTD","getShadowDistance","getShotParents","getSlingLoad","getSoundController","getSoundControllerResult","getSpeed","getStamina","getStatValue","getSteamFriendsServers","getSubtitleOptions","getSuppression","getTerrainGrid","getTerrainHeightASL","getText","getTextRaw","getTextWidth","getTotalDLCUsageTime","getTrimOffsetRTD","getUnitLoadout","getUnitTrait","getUserMFDText","getUserMFDValue","getVariable","getVehicleCargo","getVehicleTIPars","getWeaponCargo","getWeaponSway","getWingsOrientationRTD","getWingsPositionRTD","getWorld","getWPPos","glanceAt","globalChat","globalRadio","goggles","goto","group","groupChat","groupFromNetId","groupIconSelectable","groupIconsVisible","groupId","groupOwner","groupRadio","groupSelectedUnits","groupSelectUnit","gunner","gusts","halt","handgunItems","handgunMagazine","handgunWeapon","handsHit","hasInterface","hasPilotCamera","hasWeapon","hcAllGroups","hcGroupParams","hcLeader","hcRemoveAllGroups","hcRemoveGroup","hcSelected","hcSelectGroup","hcSetGroup","hcShowBar","hcShownBar","headgear","hideBehindScripted","hideBody","hideObject","hideObjectGlobal","hideSelection","hierarchyObjectsCount","hint","hintC","hintCadet","hintSilent","hmd","hostMission","htmlLoad","HUDMovementLevels","humidity","image","importAllGroups","importance","in","inArea","inAreaArray","incapacitatedState","inflame","inflamed","infoPanel","infoPanelComponentEnabled","infoPanelComponents","infoPanels","inGameUISetEventHandler","inheritsFrom","initAmbientLife","inPolygon","inputAction","inRangeOfArtillery","insert","insertEditorObject","intersect","is3DEN","is3DENMultiplayer","is3DENPreview","isAbleToBreathe","isActionMenuVisible","isAgent","isAimPrecisionEnabled","isArray","isAutoHoverOn","isAutonomous","isAutoStartUpEnabledRTD","isAutotest","isAutoTrimOnRTD","isBleeding","isBurning","isClass","isCollisionLightOn","isCopilotEnabled","isDamageAllowed","isDedicated","isDLCAvailable","isEngineOn","isEqualTo","isEqualType","isEqualTypeAll","isEqualTypeAny","isEqualTypeArray","isEqualTypeParams","isFilePatchingEnabled","isFinal","isFlashlightOn","isFlatEmpty","isForcedWalk","isFormationLeader","isGameFocused","isGamePaused","isGroupDeletedWhenEmpty","isHidden","isHideBehindScripted","isInRemainsCollector","isInstructorFigureEnabled","isIRLaserOn","isKeyActive","isKindOf","isLaserOn","isLightOn","isLocalized","isManualFire","isMarkedForCollection","isMultiplayer","isMultiplayerSolo","isNil","isNotEqualTo","isNull","isNumber","isObjectHidden","isObjectRTD","isOnRoad","isPiPEnabled","isPlayer","isRealTime","isRemoteExecuted","isRemoteExecutedJIP","isSensorTargetConfirmed","isServer","isShowing3DIcons","isSimpleObject","isSprintAllowed","isStaminaEnabled","isSteamMission","isStreamFriendlyUIEnabled","isStressDamageEnabled","isText","isTouchingGround","isTurnedOut","isTutHintsEnabled","isUAVConnectable","isUAVConnected","isUIContext","isUniformAllowed","isVehicleCargo","isVehicleRadarOn","isVehicleSensorEnabled","isWalking","isWeaponDeployed","isWeaponRested","itemCargo","items","itemsWithMagazines","join","joinAs","joinAsSilent","joinSilent","joinString","kbAddDatabase","kbAddDatabaseTargets","kbAddTopic","kbHasTopic","kbReact","kbRemoveTopic","kbTell","kbWasSaid","keyImage","keyName","keys","knowsAbout","land","landAt","landResult","language","laserTarget","lbAdd","lbClear","lbColor","lbColorRight","lbCurSel","lbData","lbDelete","lbIsSelected","lbPicture","lbPictureRight","lbSelection","lbSetColor","lbSetColorRight","lbSetCurSel","lbSetData","lbSetPicture","lbSetPictureColor","lbSetPictureColorDisabled","lbSetPictureColorSelected","lbSetPictureRight","lbSetPictureRightColor","lbSetPictureRightColorDisabled","lbSetPictureRightColorSelected","lbSetSelectColor","lbSetSelectColorRight","lbSetSelected","lbSetText","lbSetTextRight","lbSetTooltip","lbSetValue","lbSize","lbSort","lbSortByValue","lbText","lbTextRight","lbValue","leader","leaderboardDeInit","leaderboardGetRows","leaderboardInit","leaderboardRequestRowsFriends","leaderboardRequestRowsGlobal","leaderboardRequestRowsGlobalAroundUser","leaderboardsRequestUploadScore","leaderboardsRequestUploadScoreKeepBest","leaderboardState","leaveVehicle","libraryCredits","libraryDisclaimers","lifeState","lightAttachObject","lightDetachObject","lightIsOn","lightnings","limitSpeed","linearConversion","lineIntersects","lineIntersectsObjs","lineIntersectsSurfaces","lineIntersectsWith","linkItem","list","listObjects","listRemoteTargets","listVehicleSensors","ln","lnbAddArray","lnbAddColumn","lnbAddRow","lnbClear","lnbColor","lnbColorRight","lnbCurSelRow","lnbData","lnbDeleteColumn","lnbDeleteRow","lnbGetColumnsPosition","lnbPicture","lnbPictureRight","lnbSetColor","lnbSetColorRight","lnbSetColumnsPos","lnbSetCurSelRow","lnbSetData","lnbSetPicture","lnbSetPictureColor","lnbSetPictureColorRight","lnbSetPictureColorSelected","lnbSetPictureColorSelectedRight","lnbSetPictureRight","lnbSetText","lnbSetTextRight","lnbSetTooltip","lnbSetValue","lnbSize","lnbSort","lnbSortByValue","lnbText","lnbTextRight","lnbValue","load","loadAbs","loadBackpack","loadFile","loadGame","loadIdentity","loadMagazine","loadOverlay","loadStatus","loadUniform","loadVest","local","localize","localNamespace","locationPosition","lock","lockCameraTo","lockCargo","lockDriver","locked","lockedCargo","lockedDriver","lockedInventory","lockedTurret","lockIdentity","lockInventory","lockTurret","lockWP","log","logEntities","logNetwork","logNetworkTerminate","lookAt","lookAtPos","magazineCargo","magazines","magazinesAllTurrets","magazinesAmmo","magazinesAmmoCargo","magazinesAmmoFull","magazinesDetail","magazinesDetailBackpack","magazinesDetailUniform","magazinesDetailVest","magazinesTurret","magazineTurretAmmo","mapAnimAdd","mapAnimClear","mapAnimCommit","mapAnimDone","mapCenterOnCamera","mapGridPosition","markAsFinishedOnSteam","markerAlpha","markerBrush","markerChannel","markerColor","markerDir","markerPolyline","markerPos","markerShadow","markerShape","markerSize","markerText","markerType","matrixMultiply","matrixTranspose","max","members","menuAction","menuAdd","menuChecked","menuClear","menuCollapse","menuData","menuDelete","menuEnable","menuEnabled","menuExpand","menuHover","menuPicture","menuSetAction","menuSetCheck","menuSetData","menuSetPicture","menuSetShortcut","menuSetText","menuSetURL","menuSetValue","menuShortcut","menuShortcutText","menuSize","menuSort","menuText","menuURL","menuValue","merge","min","mineActive","mineDetectedBy","missileTarget","missileTargetPos","missionConfigFile","missionDifficulty","missionName","missionNameSource","missionNamespace","missionStart","missionVersion","mod","modelToWorld","modelToWorldVisual","modelToWorldVisualWorld","modelToWorldWorld","modParams","moonIntensity","moonPhase","morale","move","move3DENCamera","moveInAny","moveInCargo","moveInCommander","moveInDriver","moveInGunner","moveInTurret","moveObjectToEnd","moveOut","moveTarget","moveTime","moveTo","moveToCompleted","moveToFailed","musicVolume","name","namedProperties","nameSound","nearEntities","nearestBuilding","nearestLocation","nearestLocations","nearestLocationWithDubbing","nearestObject","nearestObjects","nearestTerrainObjects","nearObjects","nearObjectsReady","nearRoads","nearSupplies","nearTargets","needReload","netId","netObjNull","newOverlay","nextMenuItemIndex","nextWeatherChange","nMenuItems","not","numberOfEnginesRTD","numberToDate","object","objectCurators","objectFromNetId","objectParent","objStatus","onBriefingGear","onBriefingGroup","onBriefingNotes","onBriefingPlan","onBriefingTeamSwitch","onCommandModeChanged","onDoubleClick","onEachFrame","onGroupIconClick","onGroupIconOverEnter","onGroupIconOverLeave","onHCGroupSelectionChanged","onMapSingleClick","onPlayerConnected","onPlayerDisconnected","onPreloadFinished","onPreloadStarted","onShowNewObject","onTeamSwitch","openCuratorInterface","openDLCPage","openDSInterface","openGPS","openMap","openSteamApp","openYoutubeVideo","or","orderGetIn","overcast","overcastForecast","owner","param","params","parseNumber","parseSimpleArray","parseText","parsingNamespace","particlesQuality","periscopeElevation","pickWeaponPool","pitch","pixelGrid","pixelGridBase","pixelGridNoUIScale","pixelH","pixelW","playableSlotsNumber","playableUnits","playAction","playActionNow","player","playerRespawnTime","playerSide","playersNumber","playGesture","playMission","playMove","playMoveNow","playMusic","playScriptedMission","playSound","playSound3D","position","positionCameraToWorld","posScreenToWorld","posWorldToScreen","ppEffectAdjust","ppEffectCommit","ppEffectCommitted","ppEffectCreate","ppEffectDestroy","ppEffectEnable","ppEffectEnabled","ppEffectForceInNVG","precision","preloadCamera","preloadObject","preloadSound","preloadTitleObj","preloadTitleRsc","preprocessFile","preprocessFileLineNumbers","primaryWeapon","primaryWeaponItems","primaryWeaponMagazine","priority","processDiaryLink","processInitCommands","productVersion","profileName","profileNamespace","profileNameSteam","progressLoadingScreen","progressPosition","progressSetPosition","publicVariable","publicVariableClient","publicVariableServer","pushBack","pushBackUnique","putWeaponPool","queryItemsPool","queryMagazinePool","queryWeaponPool","rad","radioChannelAdd","radioChannelCreate","radioChannelInfo","radioChannelRemove","radioChannelSetCallSign","radioChannelSetLabel","radioVolume","rain","rainbow","random","rank","rankId","rating","rectangular","registeredTasks","registerTask","reload","reloadEnabled","remoteControl","remoteExec","remoteExecCall","remoteExecutedOwner","remove3DENConnection","remove3DENEventHandler","remove3DENLayer","removeAction","removeAll3DENEventHandlers","removeAllActions","removeAllAssignedItems","removeAllBinocularItems","removeAllContainers","removeAllCuratorAddons","removeAllCuratorCameraAreas","removeAllCuratorEditingAreas","removeAllEventHandlers","removeAllHandgunItems","removeAllItems","removeAllItemsWithMagazines","removeAllMissionEventHandlers","removeAllMPEventHandlers","removeAllMusicEventHandlers","removeAllOwnedMines","removeAllPrimaryWeaponItems","removeAllSecondaryWeaponItems","removeAllWeapons","removeBackpack","removeBackpackGlobal","removeBinocularItem","removeClothing","removeCuratorAddons","removeCuratorCameraArea","removeCuratorEditableObjects","removeCuratorEditingArea","removeDiaryRecord","removeDiarySubject","removeDrawIcon","removeDrawLinks","removeEventHandler","removeFromRemainsCollector","removeGoggles","removeGroupIcon","removeHandgunItem","removeHeadgear","removeItem","removeItemFromBackpack","removeItemFromUniform","removeItemFromVest","removeItems","removeMagazine","removeMagazineGlobal","removeMagazines","removeMagazinesTurret","removeMagazineTurret","removeMenuItem","removeMissionEventHandler","removeMPEventHandler","removeMusicEventHandler","removeOwnedMine","removePrimaryWeaponItem","removeSecondaryWeaponItem","removeSimpleTask","removeSwitchableUnit","removeTeamMember","removeUniform","removeVest","removeWeapon","removeWeaponAttachmentCargo","removeWeaponCargo","removeWeaponGlobal","removeWeaponTurret","reportRemoteTarget","requiredVersion","resetCamShake","resetSubgroupDirection","resize","resources","respawnVehicle","restartEditorCamera","reveal","revealMine","reverse","reversedMouseY","roadAt","roadsConnectedTo","roleDescription","ropeAttachedObjects","ropeAttachedTo","ropeAttachEnabled","ropeAttachTo","ropeCreate","ropeCut","ropeDestroy","ropeDetach","ropeEndPosition","ropeLength","ropes","ropeSegments","ropeSetCargoMass","ropeUnwind","ropeUnwound","rotorsForcesRTD","rotorsRpmRTD","round","runInitScript","safeZoneH","safeZoneW","safeZoneWAbs","safeZoneX","safeZoneXAbs","safeZoneY","save3DENInventory","saveGame","saveIdentity","saveJoysticks","saveOverlay","saveProfileNamespace","saveStatus","saveVar","savingEnabled","say","say2D","say3D","scopeName","score","scoreSide","screenshot","screenToWorld","scriptDone","scriptName","scudState","secondaryWeapon","secondaryWeaponItems","secondaryWeaponMagazine","select","selectBestPlaces","selectDiarySubject","selectedEditorObjects","selectEditorObject","selectionNames","selectionPosition","selectLeader","selectMax","selectMin","selectNoPlayer","selectPlayer","selectRandom","selectRandomWeighted","selectWeapon","selectWeaponTurret","sendAUMessage","sendSimpleCommand","sendTask","sendTaskResult","sendUDPMessage","serverCommand","serverCommandAvailable","serverCommandExecutable","serverName","serverTime","set","set3DENAttribute","set3DENAttributes","set3DENGrid","set3DENIconsVisible","set3DENLayer","set3DENLinesVisible","set3DENLogicType","set3DENMissionAttribute","set3DENMissionAttributes","set3DENModelsVisible","set3DENObjectType","set3DENSelected","setAccTime","setActualCollectiveRTD","setAirplaneThrottle","setAirportSide","setAmmo","setAmmoCargo","setAmmoOnPylon","setAnimSpeedCoef","setAperture","setApertureNew","setAPURTD","setArmoryPoints","setAttributes","setAutonomous","setBatteryChargeRTD","setBatteryRTD","setBehaviour","setBehaviourStrong","setBleedingRemaining","setBrakesRTD","setCameraEffect","setCameraInterest","setCamShakeDefParams","setCamShakeParams","setCamUseTI","setCaptive","setCenterOfMass","setCollisionLight","setCombatBehaviour","setCombatMode","setCompassOscillation","setConvoySeparation","setCuratorCameraAreaCeiling","setCuratorCoef","setCuratorEditingAreaType","setCuratorWaypointCost","setCurrentChannel","setCurrentTask","setCurrentWaypoint","setCustomAimCoef","setCustomMissionData","setCustomSoundController","setCustomWeightRTD","setDamage","setDammage","setDate","setDebriefingText","setDefaultCamera","setDestination","setDetailMapBlendPars","setDiaryRecordText","setDiarySubjectPicture","setDir","setDirection","setDrawIcon","setDriveOnPath","setDropInterval","setDynamicSimulationDistance","setDynamicSimulationDistanceCoef","setEditorMode","setEditorObjectScope","setEffectCondition","setEffectiveCommander","setEngineRPMRTD","setEngineRpmRTD","setFace","setFaceAnimation","setFatigue","setFeatureType","setFlagAnimationPhase","setFlagOwner","setFlagSide","setFlagTexture","setFog","setForceGeneratorRTD","setFormation","setFormationTask","setFormDir","setFriend","setFromEditor","setFSMVariable","setFuel","setFuelCargo","setGroupIcon","setGroupIconParams","setGroupIconsSelectable","setGroupIconsVisible","setGroupId","setGroupIdGlobal","setGroupOwner","setGusts","setHideBehind","setHit","setHitIndex","setHitPointDamage","setHorizonParallaxCoef","setHUDMovementLevels","setIdentity","setImportance","setInfoPanel","setLeader","setLightAmbient","setLightAttenuation","setLightBrightness","setLightColor","setLightDayLight","setLightFlareMaxDistance","setLightFlareSize","setLightIntensity","setLightnings","setLightUseFlare","setLocalWindParams","setMagazineTurretAmmo","setMarkerAlpha","setMarkerAlphaLocal","setMarkerBrush","setMarkerBrushLocal","setMarkerColor","setMarkerColorLocal","setMarkerDir","setMarkerDirLocal","setMarkerPolyline","setMarkerPolylineLocal","setMarkerPos","setMarkerPosLocal","setMarkerShadow","setMarkerShadowLocal","setMarkerShape","setMarkerShapeLocal","setMarkerSize","setMarkerSizeLocal","setMarkerText","setMarkerTextLocal","setMarkerType","setMarkerTypeLocal","setMass","setMimic","setMissileTarget","setMissileTargetPos","setMousePosition","setMusicEffect","setMusicEventHandler","setName","setNameSound","setObjectArguments","setObjectMaterial","setObjectMaterialGlobal","setObjectProxy","setObjectScale","setObjectTexture","setObjectTextureGlobal","setObjectViewDistance","setOvercast","setOwner","setOxygenRemaining","setParticleCircle","setParticleClass","setParticleFire","setParticleParams","setParticleRandom","setPilotCameraDirection","setPilotCameraRotation","setPilotCameraTarget","setPilotLight","setPiPEffect","setPitch","setPlateNumber","setPlayable","setPlayerRespawnTime","setPlayerVoNVolume","setPos","setPosASL","setPosASL2","setPosASLW","setPosATL","setPosition","setPosWorld","setPylonLoadout","setPylonsPriority","setRadioMsg","setRain","setRainbow","setRandomLip","setRank","setRectangular","setRepairCargo","setRotorBrakeRTD","setShadowDistance","setShotParents","setSide","setSimpleTaskAlwaysVisible","setSimpleTaskCustomData","setSimpleTaskDescription","setSimpleTaskDestination","setSimpleTaskTarget","setSimpleTaskType","setSimulWeatherLayers","setSize","setSkill","setSlingLoad","setSoundEffect","setSpeaker","setSpeech","setSpeedMode","setStamina","setStaminaScheme","setStarterRTD","setStatValue","setSuppression","setSystemOfUnits","setTargetAge","setTaskMarkerOffset","setTaskResult","setTaskState","setTerrainGrid","setText","setThrottleRTD","setTimeMultiplier","setTitleEffect","setToneMapping","setToneMappingParams","setTrafficDensity","setTrafficDistance","setTrafficGap","setTrafficSpeed","setTriggerActivation","setTriggerArea","setTriggerInterval","setTriggerStatements","setTriggerText","setTriggerTimeout","setTriggerType","setType","setUnconscious","setUnitAbility","setUnitCombatMode","setUnitLoadout","setUnitPos","setUnitPosWeak","setUnitRank","setUnitRecoilCoefficient","setUnitTrait","setUnloadInCombat","setUserActionText","setUserMFDText","setUserMFDValue","setVariable","setVectorDir","setVectorDirAndUp","setVectorUp","setVehicleAmmo","setVehicleAmmoDef","setVehicleArmor","setVehicleCargo","setVehicleId","setVehicleInit","setVehicleLock","setVehiclePosition","setVehicleRadar","setVehicleReceiveRemoteTargets","setVehicleReportOwnPosition","setVehicleReportRemoteTargets","setVehicleTIPars","setVehicleVarName","setVelocity","setVelocityModelSpace","setVelocityTransformation","setViewDistance","setVisibleIfTreeCollapsed","setWantedRPMRTD","setWaves","setWaypointBehaviour","setWaypointCombatMode","setWaypointCompletionRadius","setWaypointDescription","setWaypointForceBehaviour","setWaypointFormation","setWaypointHousePosition","setWaypointLoiterAltitude","setWaypointLoiterRadius","setWaypointLoiterType","setWaypointName","setWaypointPosition","setWaypointScript","setWaypointSpeed","setWaypointStatements","setWaypointTimeout","setWaypointType","setWaypointVisible","setWeaponReloadingTime","setWeaponZeroing","setWind","setWindDir","setWindForce","setWindStr","setWingForceScaleRTD","setWPPos","show3DIcons","showChat","showCinemaBorder","showCommandingMenu","showCompass","showCuratorCompass","showGPS","showHUD","showLegend","showMap","shownArtilleryComputer","shownChat","shownCompass","shownCuratorCompass","showNewEditorObject","shownGPS","shownHUD","shownMap","shownPad","shownRadio","shownScoretable","shownUAVFeed","shownWarrant","shownWatch","showPad","showRadio","showScoretable","showSubtitles","showUAVFeed","showWarrant","showWatch","showWaypoint","showWaypoints","side","sideChat","sideEmpty","sideEnemy","sideFriendly","sideRadio","simpleTasks","simulationEnabled","simulCloudDensity","simulCloudOcclusion","simulInClouds","simulSetHumidity","simulWeatherSync","sin","size","sizeOf","skill","skillFinal","skipTime","sleep","sliderPosition","sliderRange","sliderSetPosition","sliderSetRange","sliderSetSpeed","sliderSpeed","slingLoadAssistantShown","soldierMagazines","someAmmo","sort","soundVolume","spawn","speaker","speechVolume","speed","speedMode","splitString","sqrt","squadParams","stance","startLoadingScreen","step","stop","stopEngineRTD","stopped","str","sunOrMoon","supportInfo","suppressFor","surfaceIsWater","surfaceNormal","surfaceTexture","surfaceType","swimInDepth","switchableUnits","switchAction","switchCamera","switchGesture","switchLight","switchMove","synchronizedObjects","synchronizedTriggers","synchronizedWaypoints","synchronizeObjectsAdd","synchronizeObjectsRemove","synchronizeTrigger","synchronizeWaypoint","systemChat","systemOfUnits","systemTime","systemTimeUTC","tan","targetKnowledge","targets","targetsAggregate","targetsQuery","taskAlwaysVisible","taskChildren","taskCompleted","taskCustomData","taskDescription","taskDestination","taskHint","taskMarkerOffset","taskName","taskParent","taskResult","taskState","taskType","teamMember","teamName","teams","teamSwitch","teamSwitchEnabled","teamType","terminate","terrainIntersect","terrainIntersectASL","terrainIntersectAtASL","text","textLog","textLogFormat","tg","throttleRTD","time","timeMultiplier","titleCut","titleFadeOut","titleObj","titleRsc","titleText","toArray","toFixed","toLower","toLowerANSI","toString","toUpper","toUpperANSI","triggerActivated","triggerActivation","triggerAmmo","triggerArea","triggerAttachedVehicle","triggerAttachObject","triggerAttachVehicle","triggerDynamicSimulation","triggerInterval","triggerStatements","triggerText","triggerTimeout","triggerTimeoutCurrent","triggerType","trim","turretLocal","turretOwner","turretUnit","tvAdd","tvClear","tvCollapse","tvCollapseAll","tvCount","tvCurSel","tvData","tvDelete","tvExpand","tvExpandAll","tvIsSelected","tvPicture","tvPictureRight","tvSelection","tvSetColor","tvSetCurSel","tvSetData","tvSetPicture","tvSetPictureColor","tvSetPictureColorDisabled","tvSetPictureColorSelected","tvSetPictureRight","tvSetPictureRightColor","tvSetPictureRightColorDisabled","tvSetPictureRightColorSelected","tvSetSelectColor","tvSetSelected","tvSetText","tvSetTooltip","tvSetValue","tvSort","tvSortAll","tvSortByValue","tvSortByValueAll","tvText","tvTooltip","tvValue","type","typeName","typeOf","UAVControl","uiNamespace","uiSleep","unassignCurator","unassignItem","unassignTeam","unassignVehicle","underwater","uniform","uniformContainer","uniformItems","uniformMagazines","unitAddons","unitAimPosition","unitAimPositionVisual","unitBackpack","unitCombatMode","unitIsUAV","unitPos","unitReady","unitRecoilCoefficient","units","unitsBelowHeight","unitTurret","unlinkItem","unlockAchievement","unregisterTask","updateDrawIcon","updateMenuItem","updateObjectTree","useAIOperMapObstructionTest","useAISteeringComponent","useAudioTimeForMoves","userInputDisabled","vectorAdd","vectorCos","vectorCrossProduct","vectorDiff","vectorDir","vectorDirVisual","vectorDistance","vectorDistanceSqr","vectorDotProduct","vectorFromTo","vectorLinearConversion","vectorMagnitude","vectorMagnitudeSqr","vectorModelToWorld","vectorModelToWorldVisual","vectorMultiply","vectorNormalized","vectorUp","vectorUpVisual","vectorWorldToModel","vectorWorldToModelVisual","vehicle","vehicleCargoEnabled","vehicleChat","vehicleMoveInfo","vehicleRadio","vehicleReceiveRemoteTargets","vehicleReportOwnPosition","vehicleReportRemoteTargets","vehicles","vehicleVarName","velocity","velocityModelSpace","verifySignature","vest","vestContainer","vestItems","vestMagazines","viewDistance","visibleCompass","visibleGPS","visibleMap","visiblePosition","visiblePositionASL","visibleScoretable","visibleWatch","waves","waypointAttachedObject","waypointAttachedVehicle","waypointAttachObject","waypointAttachVehicle","waypointBehaviour","waypointCombatMode","waypointCompletionRadius","waypointDescription","waypointForceBehaviour","waypointFormation","waypointHousePosition","waypointLoiterAltitude","waypointLoiterRadius","waypointLoiterType","waypointName","waypointPosition","waypoints","waypointScript","waypointsEnabledUAV","waypointShow","waypointSpeed","waypointStatements","waypointTimeout","waypointTimeoutCurrent","waypointType","waypointVisible","weaponAccessories","weaponAccessoriesCargo","weaponCargo","weaponDirection","weaponInertia","weaponLowered","weapons","weaponsItems","weaponsItemsCargo","weaponState","weaponsTurret","weightRTD","WFSideText","wind","windDir","windRTD","windStr","wingsForcesRTD","worldName","worldSize","worldToModel","worldToModelVisual","worldToScreen"],
-literal:["blufor","civilian","configNull","controlNull","displayNull","east","endl","false","grpNull","independent","lineBreak","locationNull","nil","objNull","opfor","pi","resistance","scriptNull","sideAmbientLife","sideEmpty","sideLogic","sideUnknown","taskNull","teamMemberNull","true","west"]
+begin:/#\s*[a-z]+\b/,end:/$/,
+keywords:"define undef ifdef ifndef else endif include if",contains:[{
+begin:/\\\n/,relevance:0},e.inherit(t,{className:"string"}),{begin:/<[^\n>]*>/,
+end:/$/,illegal:"\\n"},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]};return{
+name:"SQF",case_insensitive:!0,keywords:{
+keyword:["break","breakWith","breakOut","breakTo","case","catch","continue","continueWith","default","do","else","exit","exitWith","for","forEach","from","if","local","private","switch","step","then","throw","to","try","waitUntil","while","with"],
+built_in:["abs","accTime","acos","action","actionIDs","actionKeys","actionKeysEx","actionKeysImages","actionKeysNames","actionKeysNamesArray","actionName","actionParams","activateAddons","activatedAddons","activateKey","activeTitleEffectParams","add3DENConnection","add3DENEventHandler","add3DENLayer","addAction","addBackpack","addBackpackCargo","addBackpackCargoGlobal","addBackpackGlobal","addBinocularItem","addCamShake","addCuratorAddons","addCuratorCameraArea","addCuratorEditableObjects","addCuratorEditingArea","addCuratorPoints","addEditorObject","addEventHandler","addForce","addForceGeneratorRTD","addGoggles","addGroupIcon","addHandgunItem","addHeadgear","addItem","addItemCargo","addItemCargoGlobal","addItemPool","addItemToBackpack","addItemToUniform","addItemToVest","addLiveStats","addMagazine","addMagazineAmmoCargo","addMagazineCargo","addMagazineCargoGlobal","addMagazineGlobal","addMagazinePool","addMagazines","addMagazineTurret","addMenu","addMenuItem","addMissionEventHandler","addMPEventHandler","addMusicEventHandler","addonFiles","addOwnedMine","addPlayerScores","addPrimaryWeaponItem","addPublicVariableEventHandler","addRating","addResources","addScore","addScoreSide","addSecondaryWeaponItem","addSwitchableUnit","addTeamMember","addToRemainsCollector","addTorque","addUniform","addUserActionEventHandler","addVehicle","addVest","addWaypoint","addWeapon","addWeaponCargo","addWeaponCargoGlobal","addWeaponGlobal","addWeaponItem","addWeaponPool","addWeaponTurret","addWeaponWithAttachmentsCargo","addWeaponWithAttachmentsCargoGlobal","admin","agent","agents","AGLToASL","aimedAtTarget","aimPos","airDensityCurveRTD","airDensityRTD","airplaneThrottle","airportSide","AISFinishHeal","alive","all3DENEntities","allActiveTitleEffects","allAddonsInfo","allAirports","allControls","allCurators","allCutLayers","allDead","allDeadMen","allDiaryRecords","allDiarySubjects","allDisplays","allEnv3DSoundSources","allGroups","allLODs","allMapMarkers","allMines","allMissionObjects","allObjects","allow3DMode","allowCrewInImmobile","allowCuratorLogicIgnoreAreas","allowDamage","allowDammage","allowedService","allowFileOperations","allowFleeing","allowGetIn","allowService","allowSprint","allPlayers","allSimpleObjects","allSites","allTurrets","allUnits","allUnitsUAV","allUsers","allVariables","ambientTemperature","ammo","ammoOnPylon","and","animate","animateBay","animateDoor","animatePylon","animateSource","animationNames","animationPhase","animationSourcePhase","animationState","apertureParams","append","apply","armoryPoints","arrayIntersect","asin","ASLToAGL","ASLToATL","assert","assignAsCargo","assignAsCargoIndex","assignAsCommander","assignAsDriver","assignAsGunner","assignAsTurret","assignCurator","assignedCargo","assignedCommander","assignedDriver","assignedGroup","assignedGunner","assignedItems","assignedTarget","assignedTeam","assignedVehicle","assignedVehicleRole","assignedVehicles","assignItem","assignTeam","assignToAirport","atan","atan2","atg","ATLToASL","attachedObject","attachedObjects","attachedTo","attachObject","attachTo","attackEnabled","awake","backpack","backpackCargo","backpackContainer","backpackItems","backpackMagazines","backpackSpaceFor","behaviour","benchmark","bezierInterpolation","binocular","binocularItems","binocularMagazine","boundingBox","boundingBoxReal","boundingCenter","brakesDisabled","briefingName","buildingExit","buildingPos","buldozer_EnableRoadDiag","buldozer_IsEnabledRoadDiag","buldozer_LoadNewRoads","buldozer_reloadOperMap","buttonAction","buttonSetAction","cadetMode","calculatePath","calculatePlayerVisibilityByFriendly","call","callExtension","camCommand","camCommit","camCommitPrepared","camCommitted","camConstuctionSetParams","camCreate","camDestroy","cameraEffect","cameraEffectEnableHUD","cameraInterest","cameraOn","cameraView","campaignConfigFile","camPreload","camPreloaded","camPrepareBank","camPrepareDir","camPrepareDive","camPrepareFocus","camPrepareFov","camPrepareFovRange","camPreparePos","camPrepareRelPos","camPrepareTarget","camSetBank","camSetDir","camSetDive","camSetFocus","camSetFov","camSetFovRange","camSetPos","camSetRelPos","camSetTarget","camTarget","camUseNVG","canAdd","canAddItemToBackpack","canAddItemToUniform","canAddItemToVest","cancelSimpleTaskDestination","canDeployWeapon","canFire","canMove","canSlingLoad","canStand","canSuspend","canTriggerDynamicSimulation","canUnloadInCombat","canVehicleCargo","captive","captiveNum","cbChecked","cbSetChecked","ceil","channelEnabled","cheatsEnabled","checkAIFeature","checkVisibility","className","clear3DENAttribute","clear3DENInventory","clearAllItemsFromBackpack","clearBackpackCargo","clearBackpackCargoGlobal","clearForcesRTD","clearGroupIcons","clearItemCargo","clearItemCargoGlobal","clearItemPool","clearMagazineCargo","clearMagazineCargoGlobal","clearMagazinePool","clearOverlay","clearRadio","clearWeaponCargo","clearWeaponCargoGlobal","clearWeaponPool","clientOwner","closeDialog","closeDisplay","closeOverlay","collapseObjectTree","collect3DENHistory","collectiveRTD","collisionDisabledWith","combatBehaviour","combatMode","commandArtilleryFire","commandChat","commander","commandFire","commandFollow","commandFSM","commandGetOut","commandingMenu","commandMove","commandRadio","commandStop","commandSuppressiveFire","commandTarget","commandWatch","comment","commitOverlay","compatibleItems","compatibleMagazines","compile","compileFinal","compileScript","completedFSM","composeText","configClasses","configFile","configHierarchy","configName","configOf","configProperties","configSourceAddonList","configSourceMod","configSourceModList","confirmSensorTarget","connectTerminalToUAV","connectToServer","controlsGroupCtrl","conversationDisabled","copyFromClipboard","copyToClipboard","copyWaypoints","cos","count","countEnemy","countFriendly","countSide","countType","countUnknown","create3DENComposition","create3DENEntity","createAgent","createCenter","createDialog","createDiaryLink","createDiaryRecord","createDiarySubject","createDisplay","createGearDialog","createGroup","createGuardedPoint","createHashMap","createHashMapFromArray","createLocation","createMarker","createMarkerLocal","createMenu","createMine","createMissionDisplay","createMPCampaignDisplay","createSimpleObject","createSimpleTask","createSite","createSoundSource","createTask","createTeam","createTrigger","createUnit","createVehicle","createVehicleCrew","createVehicleLocal","crew","ctAddHeader","ctAddRow","ctClear","ctCurSel","ctData","ctFindHeaderRows","ctFindRowHeader","ctHeaderControls","ctHeaderCount","ctRemoveHeaders","ctRemoveRows","ctrlActivate","ctrlAddEventHandler","ctrlAngle","ctrlAnimateModel","ctrlAnimationPhaseModel","ctrlAt","ctrlAutoScrollDelay","ctrlAutoScrollRewind","ctrlAutoScrollSpeed","ctrlBackgroundColor","ctrlChecked","ctrlClassName","ctrlCommit","ctrlCommitted","ctrlCreate","ctrlDelete","ctrlEnable","ctrlEnabled","ctrlFade","ctrlFontHeight","ctrlForegroundColor","ctrlHTMLLoaded","ctrlIDC","ctrlIDD","ctrlMapAnimAdd","ctrlMapAnimClear","ctrlMapAnimCommit","ctrlMapAnimDone","ctrlMapCursor","ctrlMapMouseOver","ctrlMapPosition","ctrlMapScale","ctrlMapScreenToWorld","ctrlMapSetPosition","ctrlMapWorldToScreen","ctrlModel","ctrlModelDirAndUp","ctrlModelScale","ctrlMousePosition","ctrlParent","ctrlParentControlsGroup","ctrlPosition","ctrlRemoveAllEventHandlers","ctrlRemoveEventHandler","ctrlScale","ctrlScrollValues","ctrlSetActiveColor","ctrlSetAngle","ctrlSetAutoScrollDelay","ctrlSetAutoScrollRewind","ctrlSetAutoScrollSpeed","ctrlSetBackgroundColor","ctrlSetChecked","ctrlSetDisabledColor","ctrlSetEventHandler","ctrlSetFade","ctrlSetFocus","ctrlSetFont","ctrlSetFontH1","ctrlSetFontH1B","ctrlSetFontH2","ctrlSetFontH2B","ctrlSetFontH3","ctrlSetFontH3B","ctrlSetFontH4","ctrlSetFontH4B","ctrlSetFontH5","ctrlSetFontH5B","ctrlSetFontH6","ctrlSetFontH6B","ctrlSetFontHeight","ctrlSetFontHeightH1","ctrlSetFontHeightH2","ctrlSetFontHeightH3","ctrlSetFontHeightH4","ctrlSetFontHeightH5","ctrlSetFontHeightH6","ctrlSetFontHeightSecondary","ctrlSetFontP","ctrlSetFontPB","ctrlSetFontSecondary","ctrlSetForegroundColor","ctrlSetModel","ctrlSetModelDirAndUp","ctrlSetModelScale","ctrlSetMousePosition","ctrlSetPixelPrecision","ctrlSetPosition","ctrlSetPositionH","ctrlSetPositionW","ctrlSetPositionX","ctrlSetPositionY","ctrlSetScale","ctrlSetScrollValues","ctrlSetShadow","ctrlSetStructuredText","ctrlSetText","ctrlSetTextColor","ctrlSetTextColorSecondary","ctrlSetTextSecondary","ctrlSetTextSelection","ctrlSetTooltip","ctrlSetTooltipColorBox","ctrlSetTooltipColorShade","ctrlSetTooltipColorText","ctrlSetTooltipMaxWidth","ctrlSetURL","ctrlSetURLOverlayMode","ctrlShadow","ctrlShow","ctrlShown","ctrlStyle","ctrlText","ctrlTextColor","ctrlTextHeight","ctrlTextSecondary","ctrlTextSelection","ctrlTextWidth","ctrlTooltip","ctrlType","ctrlURL","ctrlURLOverlayMode","ctrlVisible","ctRowControls","ctRowCount","ctSetCurSel","ctSetData","ctSetHeaderTemplate","ctSetRowTemplate","ctSetValue","ctValue","curatorAddons","curatorCamera","curatorCameraArea","curatorCameraAreaCeiling","curatorCoef","curatorEditableObjects","curatorEditingArea","curatorEditingAreaType","curatorMouseOver","curatorPoints","curatorRegisteredObjects","curatorSelected","curatorWaypointCost","current3DENOperation","currentChannel","currentCommand","currentMagazine","currentMagazineDetail","currentMagazineDetailTurret","currentMagazineTurret","currentMuzzle","currentNamespace","currentPilot","currentTask","currentTasks","currentThrowable","currentVisionMode","currentWaypoint","currentWeapon","currentWeaponMode","currentWeaponTurret","currentZeroing","cursorObject","cursorTarget","customChat","customRadio","customWaypointPosition","cutFadeOut","cutObj","cutRsc","cutText","damage","date","dateToNumber","dayTime","deActivateKey","debriefingText","debugFSM","debugLog","decayGraphValues","deg","delete3DENEntities","deleteAt","deleteCenter","deleteCollection","deleteEditorObject","deleteGroup","deleteGroupWhenEmpty","deleteIdentity","deleteLocation","deleteMarker","deleteMarkerLocal","deleteRange","deleteResources","deleteSite","deleteStatus","deleteTeam","deleteVehicle","deleteVehicleCrew","deleteWaypoint","detach","detectedMines","diag_activeMissionFSMs","diag_activeScripts","diag_activeSQFScripts","diag_activeSQSScripts","diag_allMissionEventHandlers","diag_captureFrame","diag_captureFrameToFile","diag_captureSlowFrame","diag_codePerformance","diag_deltaTime","diag_drawmode","diag_dumpCalltraceToLog","diag_dumpScriptAssembly","diag_dumpTerrainSynth","diag_dynamicSimulationEnd","diag_enable","diag_enabled","diag_exportConfig","diag_exportTerrainSVG","diag_fps","diag_fpsmin","diag_frameno","diag_getTerrainSegmentOffset","diag_lightNewLoad","diag_list","diag_localized","diag_log","diag_logSlowFrame","diag_mergeConfigFile","diag_recordTurretLimits","diag_resetFSM","diag_resetshapes","diag_scope","diag_setLightNew","diag_stacktrace","diag_tickTime","diag_toggle","dialog","diarySubjectExists","didJIP","didJIPOwner","difficulty","difficultyEnabled","difficultyEnabledRTD","difficultyOption","direction","directionStabilizationEnabled","directSay","disableAI","disableBrakes","disableCollisionWith","disableConversation","disableDebriefingStats","disableMapIndicators","disableNVGEquipment","disableRemoteSensors","disableSerialization","disableTIEquipment","disableUAVConnectability","disableUserInput","displayAddEventHandler","displayChild","displayCtrl","displayParent","displayRemoveAllEventHandlers","displayRemoveEventHandler","displaySetEventHandler","displayUniqueName","displayUpdate","dissolveTeam","distance","distance2D","distanceSqr","distributionRegion","do3DENAction","doArtilleryFire","doFire","doFollow","doFSM","doGetOut","doMove","doorPhase","doStop","doSuppressiveFire","doTarget","doWatch","drawArrow","drawEllipse","drawIcon","drawIcon3D","drawLaser","drawLine","drawLine3D","drawLink","drawLocation","drawPolygon","drawRectangle","drawTriangle","driver","drop","dynamicSimulationDistance","dynamicSimulationDistanceCoef","dynamicSimulationEnabled","dynamicSimulationSystemEnabled","echo","edit3DENMissionAttributes","editObject","editorSetEventHandler","effectiveCommander","elevatePeriscope","emptyPositions","enableAI","enableAIFeature","enableAimPrecision","enableAttack","enableAudioFeature","enableAutoStartUpRTD","enableAutoTrimRTD","enableCamShake","enableCaustics","enableChannel","enableCollisionWith","enableCopilot","enableDebriefingStats","enableDiagLegend","enableDirectionStabilization","enableDynamicSimulation","enableDynamicSimulationSystem","enableEndDialog","enableEngineArtillery","enableEnvironment","enableFatigue","enableGunLights","enableInfoPanelComponent","enableIRLasers","enableMimics","enablePersonTurret","enableRadio","enableReload","enableRopeAttach","enableSatNormalOnDetail","enableSaving","enableSentences","enableSimulation","enableSimulationGlobal","enableStamina","enableStressDamage","enableTeamSwitch","enableTraffic","enableUAVConnectability","enableUAVWaypoints","enableVehicleCargo","enableVehicleSensor","enableWeaponDisassembly","endLoadingScreen","endMission","engineOn","enginesIsOnRTD","enginesPowerRTD","enginesRpmRTD","enginesTorqueRTD","entities","environmentEnabled","environmentVolume","equipmentDisabled","estimatedEndServerTime","estimatedTimeLeft","evalObjectArgument","everyBackpack","everyContainer","exec","execEditorScript","execFSM","execVM","exp","expectedDestination","exportJIPMessages","eyeDirection","eyePos","face","faction","fadeEnvironment","fadeMusic","fadeRadio","fadeSound","fadeSpeech","failMission","fileExists","fillWeaponsFromPool","find","findAny","findCover","findDisplay","findEditorObject","findEmptyPosition","findEmptyPositionReady","findIf","findNearestEnemy","finishMissionInit","finite","fire","fireAtTarget","firstBackpack","flag","flagAnimationPhase","flagOwner","flagSide","flagTexture","flatten","fleeing","floor","flyInHeight","flyInHeightASL","focusedCtrl","fog","fogForecast","fogParams","forceAddUniform","forceAtPositionRTD","forceCadetDifficulty","forcedMap","forceEnd","forceFlagTexture","forceFollowRoad","forceGeneratorRTD","forceMap","forceRespawn","forceSpeed","forceUnicode","forceWalk","forceWeaponFire","forceWeatherChange","forEachMember","forEachMemberAgent","forEachMemberTeam","forgetTarget","format","formation","formationDirection","formationLeader","formationMembers","formationPosition","formationTask","formatText","formLeader","freeExtension","freeLook","fromEditor","fuel","fullCrew","gearIDCAmmoCount","gearSlotAmmoCount","gearSlotData","gestureState","get","get3DENActionState","get3DENAttribute","get3DENCamera","get3DENConnections","get3DENEntity","get3DENEntityID","get3DENGrid","get3DENIconsVisible","get3DENLayerEntities","get3DENLinesVisible","get3DENMissionAttribute","get3DENMouseOver","get3DENSelected","getAimingCoef","getAllEnv3DSoundControllers","getAllEnvSoundControllers","getAllHitPointsDamage","getAllOwnedMines","getAllPylonsInfo","getAllSoundControllers","getAllUnitTraits","getAmmoCargo","getAnimAimPrecision","getAnimSpeedCoef","getArray","getArtilleryAmmo","getArtilleryComputerSettings","getArtilleryETA","getAssetDLCInfo","getAssignedCuratorLogic","getAssignedCuratorUnit","getAttackTarget","getAudioOptionVolumes","getBackpackCargo","getBleedingRemaining","getBurningValue","getCalculatePlayerVisibilityByFriendly","getCameraViewDirection","getCargoIndex","getCenterOfMass","getClientState","getClientStateNumber","getCompatiblePylonMagazines","getConnectedUAV","getConnectedUAVUnit","getContainerMaxLoad","getCorpse","getCruiseControl","getCursorObjectParams","getCustomAimCoef","getCustomSoundController","getCustomSoundControllerCount","getDammage","getDebriefingText","getDescription","getDir","getDirVisual","getDiverState","getDLCAssetsUsage","getDLCAssetsUsageByName","getDLCs","getDLCUsageTime","getEditorCamera","getEditorMode","getEditorObjectScope","getElevationOffset","getEngineTargetRPMRTD","getEnv3DSoundController","getEnvSoundController","getEventHandlerInfo","getFatigue","getFieldManualStartPage","getForcedFlagTexture","getForcedSpeed","getFriend","getFSMVariable","getFuelCargo","getGraphValues","getGroupIcon","getGroupIconParams","getGroupIcons","getHideFrom","getHit","getHitIndex","getHitPointDamage","getItemCargo","getLighting","getLightingAt","getLoadedModsInfo","getMagazineCargo","getMarkerColor","getMarkerPos","getMarkerSize","getMarkerType","getMass","getMissionConfig","getMissionConfigValue","getMissionDLCs","getMissionLayerEntities","getMissionLayers","getMissionPath","getModelInfo","getMousePosition","getMusicPlayedTime","getNumber","getObjectArgument","getObjectChildren","getObjectDLC","getObjectFOV","getObjectID","getObjectMaterials","getObjectProxy","getObjectScale","getObjectTextures","getObjectType","getObjectViewDistance","getOpticsMode","getOrDefault","getOrDefaultCall","getOxygenRemaining","getPersonUsedDLCs","getPilotCameraDirection","getPilotCameraPosition","getPilotCameraRotation","getPilotCameraTarget","getPiPViewDistance","getPlateNumber","getPlayerChannel","getPlayerID","getPlayerScores","getPlayerUID","getPlayerVoNVolume","getPos","getPosASL","getPosASLVisual","getPosASLW","getPosATL","getPosATLVisual","getPosVisual","getPosWorld","getPosWorldVisual","getPylonMagazines","getRelDir","getRelPos","getRemoteSensorsDisabled","getRepairCargo","getResolution","getRoadInfo","getRotorBrakeRTD","getSensorTargets","getSensorThreats","getShadowDistance","getShotParents","getSlingLoad","getSoundController","getSoundControllerResult","getSpeed","getStamina","getStatValue","getSteamFriendsServers","getSubtitleOptions","getSuppression","getTerrainGrid","getTerrainHeight","getTerrainHeightASL","getTerrainInfo","getText","getTextRaw","getTextureInfo","getTextWidth","getTiParameters","getTotalDLCUsageTime","getTrimOffsetRTD","getTurretLimits","getTurretOpticsMode","getUnitFreefallInfo","getUnitLoadout","getUnitTrait","getUnloadInCombat","getUserInfo","getUserMFDText","getUserMFDValue","getVariable","getVehicleCargo","getVehicleTiPars","getWeaponCargo","getWeaponSway","getWingsOrientationRTD","getWingsPositionRTD","getWPPos","glanceAt","globalChat","globalRadio","goggles","goto","group","groupChat","groupFromNetId","groupIconSelectable","groupIconsVisible","groupID","groupOwner","groupRadio","groups","groupSelectedUnits","groupSelectUnit","gunner","gusts","halt","handgunItems","handgunMagazine","handgunWeapon","handsHit","hashValue","hasInterface","hasPilotCamera","hasWeapon","hcAllGroups","hcGroupParams","hcLeader","hcRemoveAllGroups","hcRemoveGroup","hcSelected","hcSelectGroup","hcSetGroup","hcShowBar","hcShownBar","headgear","hideBody","hideObject","hideObjectGlobal","hideSelection","hint","hintC","hintCadet","hintSilent","hmd","hostMission","htmlLoad","HUDMovementLevels","humidity","image","importAllGroups","importance","in","inArea","inAreaArray","incapacitatedState","inflame","inflamed","infoPanel","infoPanelComponentEnabled","infoPanelComponents","infoPanels","inGameUISetEventHandler","inheritsFrom","initAmbientLife","inPolygon","inputAction","inputController","inputMouse","inRangeOfArtillery","insert","insertEditorObject","intersect","is3DEN","is3DENMultiplayer","is3DENPreview","isAbleToBreathe","isActionMenuVisible","isAgent","isAimPrecisionEnabled","isAllowedCrewInImmobile","isArray","isAutoHoverOn","isAutonomous","isAutoStartUpEnabledRTD","isAutotest","isAutoTrimOnRTD","isAwake","isBleeding","isBurning","isClass","isCollisionLightOn","isCopilotEnabled","isDamageAllowed","isDedicated","isDLCAvailable","isEngineOn","isEqualRef","isEqualTo","isEqualType","isEqualTypeAll","isEqualTypeAny","isEqualTypeArray","isEqualTypeParams","isFilePatchingEnabled","isFinal","isFlashlightOn","isFlatEmpty","isForcedWalk","isFormationLeader","isGameFocused","isGamePaused","isGroupDeletedWhenEmpty","isHidden","isInRemainsCollector","isInstructorFigureEnabled","isIRLaserOn","isKeyActive","isKindOf","isLaserOn","isLightOn","isLocalized","isManualFire","isMarkedForCollection","isMissionProfileNamespaceLoaded","isMultiplayer","isMultiplayerSolo","isNil","isNotEqualRef","isNotEqualTo","isNull","isNumber","isObjectHidden","isObjectRTD","isOnRoad","isPiPEnabled","isPlayer","isRealTime","isRemoteExecuted","isRemoteExecutedJIP","isSaving","isSensorTargetConfirmed","isServer","isShowing3DIcons","isSimpleObject","isSprintAllowed","isStaminaEnabled","isSteamMission","isSteamOverlayEnabled","isStreamFriendlyUIEnabled","isStressDamageEnabled","isText","isTouchingGround","isTurnedOut","isTutHintsEnabled","isUAVConnectable","isUAVConnected","isUIContext","isUniformAllowed","isVehicleCargo","isVehicleRadarOn","isVehicleSensorEnabled","isWalking","isWeaponDeployed","isWeaponRested","itemCargo","items","itemsWithMagazines","join","joinAs","joinAsSilent","joinSilent","joinString","kbAddDatabase","kbAddDatabaseTargets","kbAddTopic","kbHasTopic","kbReact","kbRemoveTopic","kbTell","kbWasSaid","keyImage","keyName","keys","knowsAbout","land","landAt","landResult","language","laserTarget","lbAdd","lbClear","lbColor","lbColorRight","lbCurSel","lbData","lbDelete","lbIsSelected","lbPicture","lbPictureRight","lbSelection","lbSetColor","lbSetColorRight","lbSetCurSel","lbSetData","lbSetPicture","lbSetPictureColor","lbSetPictureColorDisabled","lbSetPictureColorSelected","lbSetPictureRight","lbSetPictureRightColor","lbSetPictureRightColorDisabled","lbSetPictureRightColorSelected","lbSetSelectColor","lbSetSelectColorRight","lbSetSelected","lbSetText","lbSetTextRight","lbSetTooltip","lbSetValue","lbSize","lbSort","lbSortBy","lbSortByValue","lbText","lbTextRight","lbTooltip","lbValue","leader","leaderboardDeInit","leaderboardGetRows","leaderboardInit","leaderboardRequestRowsFriends","leaderboardRequestRowsGlobal","leaderboardRequestRowsGlobalAroundUser","leaderboardsRequestUploadScore","leaderboardsRequestUploadScoreKeepBest","leaderboardState","leaveVehicle","libraryCredits","libraryDisclaimers","lifeState","lightAttachObject","lightDetachObject","lightIsOn","lightnings","limitSpeed","linearConversion","lineIntersects","lineIntersectsObjs","lineIntersectsSurfaces","lineIntersectsWith","linkItem","list","listObjects","listRemoteTargets","listVehicleSensors","ln","lnbAddArray","lnbAddColumn","lnbAddRow","lnbClear","lnbColor","lnbColorRight","lnbCurSelRow","lnbData","lnbDeleteColumn","lnbDeleteRow","lnbGetColumnsPosition","lnbPicture","lnbPictureRight","lnbSetColor","lnbSetColorRight","lnbSetColumnsPos","lnbSetCurSelRow","lnbSetData","lnbSetPicture","lnbSetPictureColor","lnbSetPictureColorRight","lnbSetPictureColorSelected","lnbSetPictureColorSelectedRight","lnbSetPictureRight","lnbSetText","lnbSetTextRight","lnbSetTooltip","lnbSetValue","lnbSize","lnbSort","lnbSortBy","lnbSortByValue","lnbText","lnbTextRight","lnbValue","load","loadAbs","loadBackpack","loadConfig","loadFile","loadGame","loadIdentity","loadMagazine","loadOverlay","loadStatus","loadUniform","loadVest","localize","localNamespace","locationPosition","lock","lockCameraTo","lockCargo","lockDriver","locked","lockedCameraTo","lockedCargo","lockedDriver","lockedInventory","lockedTurret","lockIdentity","lockInventory","lockTurret","lockWp","log","logEntities","logNetwork","logNetworkTerminate","lookAt","lookAtPos","magazineCargo","magazines","magazinesAllTurrets","magazinesAmmo","magazinesAmmoCargo","magazinesAmmoFull","magazinesDetail","magazinesDetailBackpack","magazinesDetailUniform","magazinesDetailVest","magazinesTurret","magazineTurretAmmo","mapAnimAdd","mapAnimClear","mapAnimCommit","mapAnimDone","mapCenterOnCamera","mapGridPosition","markAsFinishedOnSteam","markerAlpha","markerBrush","markerChannel","markerColor","markerDir","markerPolyline","markerPos","markerShadow","markerShape","markerSize","markerText","markerType","matrixMultiply","matrixTranspose","max","maxLoad","members","menuAction","menuAdd","menuChecked","menuClear","menuCollapse","menuData","menuDelete","menuEnable","menuEnabled","menuExpand","menuHover","menuPicture","menuSetAction","menuSetCheck","menuSetData","menuSetPicture","menuSetShortcut","menuSetText","menuSetURL","menuSetValue","menuShortcut","menuShortcutText","menuSize","menuSort","menuText","menuURL","menuValue","merge","min","mineActive","mineDetectedBy","missileTarget","missileTargetPos","missionConfigFile","missionDifficulty","missionEnd","missionName","missionNameSource","missionNamespace","missionProfileNamespace","missionStart","missionVersion","mod","modelToWorld","modelToWorldVisual","modelToWorldVisualWorld","modelToWorldWorld","modParams","moonIntensity","moonPhase","morale","move","move3DENCamera","moveInAny","moveInCargo","moveInCommander","moveInDriver","moveInGunner","moveInTurret","moveObjectToEnd","moveOut","moveTime","moveTo","moveToCompleted","moveToFailed","musicVolume","name","namedProperties","nameSound","nearEntities","nearestBuilding","nearestLocation","nearestLocations","nearestLocationWithDubbing","nearestMines","nearestObject","nearestObjects","nearestTerrainObjects","nearObjects","nearObjectsReady","nearRoads","nearSupplies","nearTargets","needReload","needService","netId","netObjNull","newOverlay","nextMenuItemIndex","nextWeatherChange","nMenuItems","not","numberOfEnginesRTD","numberToDate","objectCurators","objectFromNetId","objectParent","objStatus","onBriefingGroup","onBriefingNotes","onBriefingPlan","onBriefingTeamSwitch","onCommandModeChanged","onDoubleClick","onEachFrame","onGroupIconClick","onGroupIconOverEnter","onGroupIconOverLeave","onHCGroupSelectionChanged","onMapSingleClick","onPlayerConnected","onPlayerDisconnected","onPreloadFinished","onPreloadStarted","onShowNewObject","onTeamSwitch","openCuratorInterface","openDLCPage","openGPS","openMap","openSteamApp","openYoutubeVideo","or","orderGetIn","overcast","overcastForecast","owner","param","params","parseNumber","parseSimpleArray","parseText","parsingNamespace","particlesQuality","periscopeElevation","pickWeaponPool","pitch","pixelGrid","pixelGridBase","pixelGridNoUIScale","pixelH","pixelW","playableSlotsNumber","playableUnits","playAction","playActionNow","player","playerRespawnTime","playerSide","playersNumber","playGesture","playMission","playMove","playMoveNow","playMusic","playScriptedMission","playSound","playSound3D","playSoundUI","pose","position","positionCameraToWorld","posScreenToWorld","posWorldToScreen","ppEffectAdjust","ppEffectCommit","ppEffectCommitted","ppEffectCreate","ppEffectDestroy","ppEffectEnable","ppEffectEnabled","ppEffectForceInNVG","precision","preloadCamera","preloadObject","preloadSound","preloadTitleObj","preloadTitleRsc","preprocessFile","preprocessFileLineNumbers","primaryWeapon","primaryWeaponItems","primaryWeaponMagazine","priority","processDiaryLink","productVersion","profileName","profileNamespace","profileNameSteam","progressLoadingScreen","progressPosition","progressSetPosition","publicVariable","publicVariableClient","publicVariableServer","pushBack","pushBackUnique","putWeaponPool","queryItemsPool","queryMagazinePool","queryWeaponPool","rad","radioChannelAdd","radioChannelCreate","radioChannelInfo","radioChannelRemove","radioChannelSetCallSign","radioChannelSetLabel","radioEnabled","radioVolume","rain","rainbow","rainParams","random","rank","rankId","rating","rectangular","regexFind","regexMatch","regexReplace","registeredTasks","registerTask","reload","reloadEnabled","remoteControl","remoteExec","remoteExecCall","remoteExecutedOwner","remove3DENConnection","remove3DENEventHandler","remove3DENLayer","removeAction","removeAll3DENEventHandlers","removeAllActions","removeAllAssignedItems","removeAllBinocularItems","removeAllContainers","removeAllCuratorAddons","removeAllCuratorCameraAreas","removeAllCuratorEditingAreas","removeAllEventHandlers","removeAllHandgunItems","removeAllItems","removeAllItemsWithMagazines","removeAllMissionEventHandlers","removeAllMPEventHandlers","removeAllMusicEventHandlers","removeAllOwnedMines","removeAllPrimaryWeaponItems","removeAllSecondaryWeaponItems","removeAllUserActionEventHandlers","removeAllWeapons","removeBackpack","removeBackpackGlobal","removeBinocularItem","removeCuratorAddons","removeCuratorCameraArea","removeCuratorEditableObjects","removeCuratorEditingArea","removeDiaryRecord","removeDiarySubject","removeDrawIcon","removeDrawLinks","removeEventHandler","removeFromRemainsCollector","removeGoggles","removeGroupIcon","removeHandgunItem","removeHeadgear","removeItem","removeItemFromBackpack","removeItemFromUniform","removeItemFromVest","removeItems","removeMagazine","removeMagazineGlobal","removeMagazines","removeMagazinesTurret","removeMagazineTurret","removeMenuItem","removeMissionEventHandler","removeMPEventHandler","removeMusicEventHandler","removeOwnedMine","removePrimaryWeaponItem","removeSecondaryWeaponItem","removeSimpleTask","removeSwitchableUnit","removeTeamMember","removeUniform","removeUserActionEventHandler","removeVest","removeWeapon","removeWeaponAttachmentCargo","removeWeaponCargo","removeWeaponGlobal","removeWeaponTurret","reportRemoteTarget","requiredVersion","resetCamShake","resetSubgroupDirection","resize","resources","respawnVehicle","restartEditorCamera","reveal","revealMine","reverse","reversedMouseY","roadAt","roadsConnectedTo","roleDescription","ropeAttachedObjects","ropeAttachedTo","ropeAttachEnabled","ropeAttachTo","ropeCreate","ropeCut","ropeDestroy","ropeDetach","ropeEndPosition","ropeLength","ropes","ropesAttachedTo","ropeSegments","ropeUnwind","ropeUnwound","rotorsForcesRTD","rotorsRpmRTD","round","runInitScript","safeZoneH","safeZoneW","safeZoneWAbs","safeZoneX","safeZoneXAbs","safeZoneY","save3DENInventory","saveGame","saveIdentity","saveJoysticks","saveMissionProfileNamespace","saveOverlay","saveProfileNamespace","saveStatus","saveVar","savingEnabled","say","say2D","say3D","scopeName","score","scoreSide","screenshot","screenToWorld","scriptDone","scriptName","scudState","secondaryWeapon","secondaryWeaponItems","secondaryWeaponMagazine","select","selectBestPlaces","selectDiarySubject","selectedEditorObjects","selectEditorObject","selectionNames","selectionPosition","selectionVectorDirAndUp","selectLeader","selectMax","selectMin","selectNoPlayer","selectPlayer","selectRandom","selectRandomWeighted","selectWeapon","selectWeaponTurret","sendAUMessage","sendSimpleCommand","sendTask","sendTaskResult","sendUDPMessage","sentencesEnabled","serverCommand","serverCommandAvailable","serverCommandExecutable","serverName","serverNamespace","serverTime","set","set3DENAttribute","set3DENAttributes","set3DENGrid","set3DENIconsVisible","set3DENLayer","set3DENLinesVisible","set3DENLogicType","set3DENMissionAttribute","set3DENMissionAttributes","set3DENModelsVisible","set3DENObjectType","set3DENSelected","setAccTime","setActualCollectiveRTD","setAirplaneThrottle","setAirportSide","setAmmo","setAmmoCargo","setAmmoOnPylon","setAnimSpeedCoef","setAperture","setApertureNew","setArmoryPoints","setAttributes","setAutonomous","setBehaviour","setBehaviourStrong","setBleedingRemaining","setBrakesRTD","setCameraInterest","setCamShakeDefParams","setCamShakeParams","setCamUseTi","setCaptive","setCenterOfMass","setCollisionLight","setCombatBehaviour","setCombatMode","setCompassOscillation","setConvoySeparation","setCruiseControl","setCuratorCameraAreaCeiling","setCuratorCoef","setCuratorEditingAreaType","setCuratorWaypointCost","setCurrentChannel","setCurrentTask","setCurrentWaypoint","setCustomAimCoef","SetCustomMissionData","setCustomSoundController","setCustomWeightRTD","setDamage","setDammage","setDate","setDebriefingText","setDefaultCamera","setDestination","setDetailMapBlendPars","setDiaryRecordText","setDiarySubjectPicture","setDir","setDirection","setDrawIcon","setDriveOnPath","setDropInterval","setDynamicSimulationDistance","setDynamicSimulationDistanceCoef","setEditorMode","setEditorObjectScope","setEffectCondition","setEffectiveCommander","setEngineRpmRTD","setFace","setFaceanimation","setFatigue","setFeatureType","setFlagAnimationPhase","setFlagOwner","setFlagSide","setFlagTexture","setFog","setForceGeneratorRTD","setFormation","setFormationTask","setFormDir","setFriend","setFromEditor","setFSMVariable","setFuel","setFuelCargo","setGroupIcon","setGroupIconParams","setGroupIconsSelectable","setGroupIconsVisible","setGroupid","setGroupIdGlobal","setGroupOwner","setGusts","setHideBehind","setHit","setHitIndex","setHitPointDamage","setHorizonParallaxCoef","setHUDMovementLevels","setHumidity","setIdentity","setImportance","setInfoPanel","setLeader","setLightAmbient","setLightAttenuation","setLightBrightness","setLightColor","setLightConePars","setLightDayLight","setLightFlareMaxDistance","setLightFlareSize","setLightIntensity","setLightIR","setLightnings","setLightUseFlare","setLightVolumeShape","setLocalWindParams","setMagazineTurretAmmo","setMarkerAlpha","setMarkerAlphaLocal","setMarkerBrush","setMarkerBrushLocal","setMarkerColor","setMarkerColorLocal","setMarkerDir","setMarkerDirLocal","setMarkerPolyline","setMarkerPolylineLocal","setMarkerPos","setMarkerPosLocal","setMarkerShadow","setMarkerShadowLocal","setMarkerShape","setMarkerShapeLocal","setMarkerSize","setMarkerSizeLocal","setMarkerText","setMarkerTextLocal","setMarkerType","setMarkerTypeLocal","setMass","setMaxLoad","setMimic","setMissileTarget","setMissileTargetPos","setMousePosition","setMusicEffect","setMusicEventHandler","setName","setNameSound","setObjectArguments","setObjectMaterial","setObjectMaterialGlobal","setObjectProxy","setObjectScale","setObjectTexture","setObjectTextureGlobal","setObjectViewDistance","setOpticsMode","setOvercast","setOwner","setOxygenRemaining","setParticleCircle","setParticleClass","setParticleFire","setParticleParams","setParticleRandom","setPilotCameraDirection","setPilotCameraRotation","setPilotCameraTarget","setPilotLight","setPiPEffect","setPiPViewDistance","setPitch","setPlateNumber","setPlayable","setPlayerRespawnTime","setPlayerVoNVolume","setPos","setPosASL","setPosASL2","setPosASLW","setPosATL","setPosition","setPosWorld","setPylonLoadout","setPylonsPriority","setRadioMsg","setRain","setRainbow","setRandomLip","setRank","setRectangular","setRepairCargo","setRotorBrakeRTD","setShadowDistance","setShotParents","setSide","setSimpleTaskAlwaysVisible","setSimpleTaskCustomData","setSimpleTaskDescription","setSimpleTaskDestination","setSimpleTaskTarget","setSimpleTaskType","setSimulWeatherLayers","setSize","setSkill","setSlingLoad","setSoundEffect","setSpeaker","setSpeech","setSpeedMode","setStamina","setStaminaScheme","setStatValue","setSuppression","setSystemOfUnits","setTargetAge","setTaskMarkerOffset","setTaskResult","setTaskState","setTerrainGrid","setTerrainHeight","setText","setTimeMultiplier","setTiParameter","setTitleEffect","setTowParent","setTrafficDensity","setTrafficDistance","setTrafficGap","setTrafficSpeed","setTriggerActivation","setTriggerArea","setTriggerInterval","setTriggerStatements","setTriggerText","setTriggerTimeout","setTriggerType","setTurretLimits","setTurretOpticsMode","setType","setUnconscious","setUnitAbility","setUnitCombatMode","setUnitFreefallHeight","setUnitLoadout","setUnitPos","setUnitPosWeak","setUnitRank","setUnitRecoilCoefficient","setUnitTrait","setUnloadInCombat","setUserActionText","setUserMFDText","setUserMFDValue","setVariable","setVectorDir","setVectorDirAndUp","setVectorUp","setVehicleAmmo","setVehicleAmmoDef","setVehicleArmor","setVehicleCargo","setVehicleId","setVehicleLock","setVehiclePosition","setVehicleRadar","setVehicleReceiveRemoteTargets","setVehicleReportOwnPosition","setVehicleReportRemoteTargets","setVehicleTiPars","setVehicleVarName","setVelocity","setVelocityModelSpace","setVelocityTransformation","setViewDistance","setVisibleIfTreeCollapsed","setWantedRPMRTD","setWaves","setWaypointBehaviour","setWaypointCombatMode","setWaypointCompletionRadius","setWaypointDescription","setWaypointForceBehaviour","setWaypointFormation","setWaypointHousePosition","setWaypointLoiterAltitude","setWaypointLoiterRadius","setWaypointLoiterType","setWaypointName","setWaypointPosition","setWaypointScript","setWaypointSpeed","setWaypointStatements","setWaypointTimeout","setWaypointType","setWaypointVisible","setWeaponReloadingTime","setWeaponZeroing","setWind","setWindDir","setWindForce","setWindStr","setWingForceScaleRTD","setWPPos","show3DIcons","showChat","showCinemaBorder","showCommandingMenu","showCompass","showCuratorCompass","showGps","showHUD","showLegend","showMap","shownArtilleryComputer","shownChat","shownCompass","shownCuratorCompass","showNewEditorObject","shownGps","shownHUD","shownMap","shownPad","shownRadio","shownScoretable","shownSubtitles","shownUAVFeed","shownWarrant","shownWatch","showPad","showRadio","showScoretable","showSubtitles","showUAVFeed","showWarrant","showWatch","showWaypoint","showWaypoints","side","sideChat","sideRadio","simpleTasks","simulationEnabled","simulCloudDensity","simulCloudOcclusion","simulInClouds","simulWeatherSync","sin","size","sizeOf","skill","skillFinal","skipTime","sleep","sliderPosition","sliderRange","sliderSetPosition","sliderSetRange","sliderSetSpeed","sliderSpeed","slingLoadAssistantShown","soldierMagazines","someAmmo","sort","soundVolume","spawn","speaker","speechVolume","speed","speedMode","splitString","sqrt","squadParams","stance","startLoadingScreen","stop","stopEngineRTD","stopped","str","sunOrMoon","supportInfo","suppressFor","surfaceIsWater","surfaceNormal","surfaceTexture","surfaceType","swimInDepth","switchableUnits","switchAction","switchCamera","switchGesture","switchLight","switchMove","synchronizedObjects","synchronizedTriggers","synchronizedWaypoints","synchronizeObjectsAdd","synchronizeObjectsRemove","synchronizeTrigger","synchronizeWaypoint","systemChat","systemOfUnits","systemTime","systemTimeUTC","tan","targetKnowledge","targets","targetsAggregate","targetsQuery","taskAlwaysVisible","taskChildren","taskCompleted","taskCustomData","taskDescription","taskDestination","taskHint","taskMarkerOffset","taskName","taskParent","taskResult","taskState","taskType","teamMember","teamName","teams","teamSwitch","teamSwitchEnabled","teamType","terminate","terrainIntersect","terrainIntersectASL","terrainIntersectAtASL","text","textLog","textLogFormat","tg","time","timeMultiplier","titleCut","titleFadeOut","titleObj","titleRsc","titleText","toArray","toFixed","toLower","toLowerANSI","toString","toUpper","toUpperANSI","triggerActivated","triggerActivation","triggerAmmo","triggerArea","triggerAttachedVehicle","triggerAttachObject","triggerAttachVehicle","triggerDynamicSimulation","triggerInterval","triggerStatements","triggerText","triggerTimeout","triggerTimeoutCurrent","triggerType","trim","turretLocal","turretOwner","turretUnit","tvAdd","tvClear","tvCollapse","tvCollapseAll","tvCount","tvCurSel","tvData","tvDelete","tvExpand","tvExpandAll","tvIsSelected","tvPicture","tvPictureRight","tvSelection","tvSetColor","tvSetCurSel","tvSetData","tvSetPicture","tvSetPictureColor","tvSetPictureColorDisabled","tvSetPictureColorSelected","tvSetPictureRight","tvSetPictureRightColor","tvSetPictureRightColorDisabled","tvSetPictureRightColorSelected","tvSetSelectColor","tvSetSelected","tvSetText","tvSetTooltip","tvSetValue","tvSort","tvSortAll","tvSortByValue","tvSortByValueAll","tvText","tvTooltip","tvValue","type","typeName","typeOf","UAVControl","uiNamespace","uiSleep","unassignCurator","unassignItem","unassignTeam","unassignVehicle","underwater","uniform","uniformContainer","uniformItems","uniformMagazines","uniqueUnitItems","unitAddons","unitAimPosition","unitAimPositionVisual","unitBackpack","unitCombatMode","unitIsUAV","unitPos","unitReady","unitRecoilCoefficient","units","unitsBelowHeight","unitTurret","unlinkItem","unlockAchievement","unregisterTask","updateDrawIcon","updateMenuItem","updateObjectTree","useAIOperMapObstructionTest","useAISteeringComponent","useAudioTimeForMoves","userInputDisabled","values","vectorAdd","vectorCos","vectorCrossProduct","vectorDiff","vectorDir","vectorDirVisual","vectorDistance","vectorDistanceSqr","vectorDotProduct","vectorFromTo","vectorLinearConversion","vectorMagnitude","vectorMagnitudeSqr","vectorModelToWorld","vectorModelToWorldVisual","vectorMultiply","vectorNormalized","vectorUp","vectorUpVisual","vectorWorldToModel","vectorWorldToModelVisual","vehicle","vehicleCargoEnabled","vehicleChat","vehicleMoveInfo","vehicleRadio","vehicleReceiveRemoteTargets","vehicleReportOwnPosition","vehicleReportRemoteTargets","vehicles","vehicleVarName","velocity","velocityModelSpace","verifySignature","vest","vestContainer","vestItems","vestMagazines","viewDistance","visibleCompass","visibleGps","visibleMap","visiblePosition","visiblePositionASL","visibleScoretable","visibleWatch","waves","waypointAttachedObject","waypointAttachedVehicle","waypointAttachObject","waypointAttachVehicle","waypointBehaviour","waypointCombatMode","waypointCompletionRadius","waypointDescription","waypointForceBehaviour","waypointFormation","waypointHousePosition","waypointLoiterAltitude","waypointLoiterRadius","waypointLoiterType","waypointName","waypointPosition","waypoints","waypointScript","waypointsEnabledUAV","waypointShow","waypointSpeed","waypointStatements","waypointTimeout","waypointTimeoutCurrent","waypointType","waypointVisible","weaponAccessories","weaponAccessoriesCargo","weaponCargo","weaponDirection","weaponInertia","weaponLowered","weaponReloadingTime","weapons","weaponsInfo","weaponsItems","weaponsItemsCargo","weaponState","weaponsTurret","weightRTD","WFSideText","wind","windDir","windRTD","windStr","wingsForcesRTD","worldName","worldSize","worldToModel","worldToModelVisual","worldToScreen"],
+literal:["blufor","civilian","configNull","controlNull","displayNull","diaryRecordNull","east","endl","false","grpNull","independent","lineBreak","locationNull","nil","objNull","opfor","pi","resistance","scriptNull","sideAmbientLife","sideEmpty","sideEnemy","sideFriendly","sideLogic","sideUnknown","taskNull","teamMemberNull","true","west"]
 },contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.NUMBER_MODE,{
 className:"variable",begin:/\b_+[a-zA-Z]\w*/},{className:"title",
-begin:/[a-zA-Z]\w+_fnc_\w+/},t,a],illegal:/#|^\$ /}}})()
-;export default hljsGrammar;
\ No newline at end of file
+begin:/[a-zA-Z][a-zA-Z_0-9]*_fnc_[a-zA-Z_0-9]+/},t,a],
+illegal:[/\$[^a-fA-F0-9]/,/\w\$/,/\?/,/@/,/ \| /,/[a-zA-Z_]\./,/\:\=/,/\[\:/]}}
+})();export default hljsGrammar;
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/sql.min.js b/vendor/assets/javascripts/highlightjs/es/languages/sql.min.js
index a0e8c7fe7d0..e549738922b 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/sql.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/sql.min.js
@@ -1,4 +1,4 @@
-/*! `sql` grammar compiled for Highlight.js 11.6.0 */
+/*! `sql` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const r=e.regex,t=e.COMMENT("--","$"),a=["true","false","unknown"],n=["bigint","binary","blob","boolean","char","character","clob","date","dec","decfloat","decimal","float","int","integer","interval","nchar","nclob","national","numeric","real","row","smallint","time","timestamp","varchar","varying","varbinary"],i=["abs","acos","array_agg","asin","atan","avg","cast","ceil","ceiling","coalesce","corr","cos","cosh","count","covar_pop","covar_samp","cume_dist","dense_rank","deref","element","exp","extract","first_value","floor","json_array","json_arrayagg","json_exists","json_object","json_objectagg","json_query","json_table","json_table_primitive","json_value","lag","last_value","lead","listagg","ln","log","log10","lower","max","min","mod","nth_value","ntile","nullif","percent_rank","percentile_cont","percentile_disc","position","position_regex","power","rank","regr_avgx","regr_avgy","regr_count","regr_intercept","regr_r2","regr_slope","regr_sxx","regr_sxy","regr_syy","row_number","sin","sinh","sqrt","stddev_pop","stddev_samp","substring","substring_regex","sum","tan","tanh","translate","translate_regex","treat","trim","trim_array","unnest","upper","value_of","var_pop","var_samp","width_bucket"],s=["create table","insert into","primary key","foreign key","not null","alter table","add constraint","grouping sets","on overflow","character set","respect nulls","ignore nulls","nulls first","nulls last","depth first","breadth first"],o=i,c=["abs","acos","all","allocate","alter","and","any","are","array","array_agg","array_max_cardinality","as","asensitive","asin","asymmetric","at","atan","atomic","authorization","avg","begin","begin_frame","begin_partition","between","bigint","binary","blob","boolean","both","by","call","called","cardinality","cascaded","case","cast","ceil","ceiling","char","char_length","character","character_length","check","classifier","clob","close","coalesce","collate","collect","column","commit","condition","connect","constraint","contains","convert","copy","corr","corresponding","cos","cosh","count","covar_pop","covar_samp","create","cross","cube","cume_dist","current","current_catalog","current_date","current_default_transform_group","current_path","current_role","current_row","current_schema","current_time","current_timestamp","current_path","current_role","current_transform_group_for_type","current_user","cursor","cycle","date","day","deallocate","dec","decimal","decfloat","declare","default","define","delete","dense_rank","deref","describe","deterministic","disconnect","distinct","double","drop","dynamic","each","element","else","empty","end","end_frame","end_partition","end-exec","equals","escape","every","except","exec","execute","exists","exp","external","extract","false","fetch","filter","first_value","float","floor","for","foreign","frame_row","free","from","full","function","fusion","get","global","grant","group","grouping","groups","having","hold","hour","identity","in","indicator","initial","inner","inout","insensitive","insert","int","integer","intersect","intersection","interval","into","is","join","json_array","json_arrayagg","json_exists","json_object","json_objectagg","json_query","json_table","json_table_primitive","json_value","lag","language","large","last_value","lateral","lead","leading","left","like","like_regex","listagg","ln","local","localtime","localtimestamp","log","log10","lower","match","match_number","match_recognize","matches","max","member","merge","method","min","minute","mod","modifies","module","month","multiset","national","natural","nchar","nclob","new","no","none","normalize","not","nth_value","ntile","null","nullif","numeric","octet_length","occurrences_regex","of","offset","old","omit","on","one","only","open","or","order","out","outer","over","overlaps","overlay","parameter","partition","pattern","per","percent","percent_rank","percentile_cont","percentile_disc","period","portion","position","position_regex","power","precedes","precision","prepare","primary","procedure","ptf","range","rank","reads","real","recursive","ref","references","referencing","regr_avgx","regr_avgy","regr_count","regr_intercept","regr_r2","regr_slope","regr_sxx","regr_sxy","regr_syy","release","result","return","returns","revoke","right","rollback","rollup","row","row_number","rows","running","savepoint","scope","scroll","search","second","seek","select","sensitive","session_user","set","show","similar","sin","sinh","skip","smallint","some","specific","specifictype","sql","sqlexception","sqlstate","sqlwarning","sqrt","start","static","stddev_pop","stddev_samp","submultiset","subset","substring","substring_regex","succeeds","sum","symmetric","system","system_time","system_user","table","tablesample","tan","tanh","then","time","timestamp","timezone_hour","timezone_minute","to","trailing","translate","translate_regex","translation","treat","trigger","trim","trim_array","true","truncate","uescape","union","unique","unknown","unnest","update","upper","user","using","value","values","value_of","var_pop","var_samp","varbinary","varchar","varying","versioning","when","whenever","where","width_bucket","window","with","within","without","year","add","asc","collation","desc","final","first","last","view"].filter((e=>!i.includes(e))),l={
 begin:r.concat(/\b/,r.either(...o),/\s*\(/),relevance:0,keywords:{built_in:o}}
@@ -10,8 +10,8 @@ built_in:["current_catalog","current_date","current_default_transform_group","cu
 },contains:[{begin:r.either(...s),relevance:0,keywords:{$pattern:/[\w\.]+/,
 keyword:c.concat(s),literal:a,type:n}},{className:"type",
 begin:r.either("double precision","large object","with timezone","without timezone")
-},l,{className:"variable",begin:/@[a-z0-9]+/},{className:"string",variants:[{
-begin:/'/,end:/'/,contains:[{begin:/''/}]}]},{begin:/"/,end:/"/,contains:[{
-begin:/""/}]},e.C_NUMBER_MODE,e.C_BLOCK_COMMENT_MODE,t,{className:"operator",
-begin:/[-+*/=%^~]|&&?|\|\|?|!=?|<(?:=>?|<|>)?|>[>=]?/,relevance:0}]}}})()
-;export default hljsGrammar;
\ No newline at end of file
+},l,{className:"variable",begin:/@[a-z0-9][a-z0-9_]*/},{className:"string",
+variants:[{begin:/'/,end:/'/,contains:[{begin:/''/}]}]},{begin:/"/,end:/"/,
+contains:[{begin:/""/}]},e.C_NUMBER_MODE,e.C_BLOCK_COMMENT_MODE,t,{
+className:"operator",begin:/[-+*/=%^~]|&&?|\|\|?|!=?|<(?:=>?|<|>)?|>[>=]?/,
+relevance:0}]}}})();export default hljsGrammar;
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/stan.min.js b/vendor/assets/javascripts/highlightjs/es/languages/stan.min.js
index 7c10180801d..07321bfea01 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/stan.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/stan.min.js
@@ -1,4 +1,4 @@
-/*! `stan` grammar compiled for Highlight.js 11.6.0 */
+/*! `stan` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const _=e.regex,o=["bernoulli","bernoulli_logit","bernoulli_logit_glm","beta","beta_binomial","beta_proportion","binomial","binomial_logit","categorical","categorical_logit","categorical_logit_glm","cauchy","chi_square","dirichlet","discrete_range","double_exponential","exp_mod_normal","exponential","frechet","gamma","gaussian_dlm_obs","gumbel","hmm_latent","hypergeometric","inv_chi_square","inv_gamma","inv_wishart","lkj_corr","lkj_corr_cholesky","logistic","lognormal","multi_gp","multi_gp_cholesky","multi_normal","multi_normal_cholesky","multi_normal_prec","multi_student_t","multinomial","multinomial_logit","neg_binomial","neg_binomial_2","neg_binomial_2_log","neg_binomial_2_log_glm","normal","normal_id_glm","ordered_logistic","ordered_logistic_glm","ordered_probit","pareto","pareto_type_2","poisson","poisson_log","poisson_log_glm","rayleigh","scaled_inv_chi_square","skew_double_exponential","skew_normal","std_normal","student_t","uniform","von_mises","weibull","wiener","wishart"],r=e.COMMENT(/\/\*/,/\*\//,{
 relevance:0,contains:[{scope:"doctag",match:/@(return|param)/}]}),i={
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/stata.min.js b/vendor/assets/javascripts/highlightjs/es/languages/stata.min.js
index 72947f3391f..9f77e221a57 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/stata.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/stata.min.js
@@ -1,4 +1,4 @@
-/*! `stata` grammar compiled for Highlight.js 11.6.0 */
+/*! `stata` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"Stata",
 aliases:["do","ado"],case_insensitive:!0,
 keywords:"if else in foreach for forv forva forval forvalu forvalue forvalues by bys bysort xi quietly qui capture about ac ac_7 acprplot acprplot_7 adjust ado adopath adoupdate alpha ameans an ano anov anova anova_estat anova_terms anovadef aorder ap app appe appen append arch arch_dr arch_estat arch_p archlm areg areg_p args arima arima_dr arima_estat arima_p as asmprobit asmprobit_estat asmprobit_lf asmprobit_mfx__dlg asmprobit_p ass asse asser assert avplot avplot_7 avplots avplots_7 bcskew0 bgodfrey bias binreg bip0_lf biplot bipp_lf bipr_lf bipr_p biprobit bitest bitesti bitowt blogit bmemsize boot bootsamp bootstrap bootstrap_8 boxco_l boxco_p boxcox boxcox_6 boxcox_p bprobit br break brier bro brow brows browse brr brrstat bs bs_7 bsampl_w bsample bsample_7 bsqreg bstat bstat_7 bstat_8 bstrap bstrap_7 bubble bubbleplot ca ca_estat ca_p cabiplot camat canon canon_8 canon_8_p canon_estat canon_p cap caprojection capt captu captur capture cat cc cchart cchart_7 cci cd censobs_table centile cf char chdir checkdlgfiles checkestimationsample checkhlpfiles checksum chelp ci cii cl class classutil clear cli clis clist clo clog clog_lf clog_p clogi clogi_sw clogit clogit_lf clogit_p clogitp clogl_sw cloglog clonevar clslistarray cluster cluster_measures cluster_stop cluster_tree cluster_tree_8 clustermat cmdlog cnr cnre cnreg cnreg_p cnreg_sw cnsreg codebook collaps4 collapse colormult_nb colormult_nw compare compress conf confi confir confirm conren cons const constr constra constrai constrain constraint continue contract copy copyright copysource cor corc corr corr2data corr_anti corr_kmo corr_smc corre correl correla correlat correlate corrgram cou coun count cox cox_p cox_sw coxbase coxhaz coxvar cprplot cprplot_7 crc cret cretu cretur creturn cross cs cscript cscript_log csi ct ct_is ctset ctst_5 ctst_st cttost cumsp cumsp_7 cumul cusum cusum_7 cutil d|0 datasig datasign datasigna datasignat datasignatu datasignatur datasignature datetof db dbeta de dec deco decod decode deff des desc descr descri describ describe destring dfbeta dfgls dfuller di di_g dir dirstats dis discard disp disp_res disp_s displ displa display distinct do doe doed doedi doedit dotplot dotplot_7 dprobit drawnorm drop ds ds_util dstdize duplicates durbina dwstat dydx e|0 ed edi edit egen eivreg emdef en enc enco encod encode eq erase ereg ereg_lf ereg_p ereg_sw ereghet ereghet_glf ereghet_glf_sh ereghet_gp ereghet_ilf ereghet_ilf_sh ereghet_ip eret eretu eretur ereturn err erro error esize est est_cfexist est_cfname est_clickable est_expand est_hold est_table est_unhold est_unholdok estat estat_default estat_summ estat_vce_only esti estimates etodow etof etomdy ex exi exit expand expandcl fac fact facto factor factor_estat factor_p factor_pca_rotated factor_rotate factormat fcast fcast_compute fcast_graph fdades fdadesc fdadescr fdadescri fdadescrib fdadescribe fdasav fdasave fdause fh_st file open file read file close file filefilter fillin find_hlp_file findfile findit findit_7 fit fl fli flis flist for5_0 forest forestplot form forma format fpredict frac_154 frac_adj frac_chk frac_cox frac_ddp frac_dis frac_dv frac_in frac_mun frac_pp frac_pq frac_pv frac_wgt frac_xo fracgen fracplot fracplot_7 fracpoly fracpred fron_ex fron_hn fron_p fron_tn fron_tn2 frontier ftodate ftoe ftomdy ftowdate funnel funnelplot g|0 gamhet_glf gamhet_gp gamhet_ilf gamhet_ip gamma gamma_d2 gamma_p gamma_sw gammahet gdi_hexagon gdi_spokes ge gen gene gener genera generat generate genrank genstd genvmean gettoken gl gladder gladder_7 glim_l01 glim_l02 glim_l03 glim_l04 glim_l05 glim_l06 glim_l07 glim_l08 glim_l09 glim_l10 glim_l11 glim_l12 glim_lf glim_mu glim_nw1 glim_nw2 glim_nw3 glim_p glim_v1 glim_v2 glim_v3 glim_v4 glim_v5 glim_v6 glim_v7 glm glm_6 glm_p glm_sw glmpred glo glob globa global glogit glogit_8 glogit_p gmeans gnbre_lf gnbreg gnbreg_5 gnbreg_p gomp_lf gompe_sw gomper_p gompertz gompertzhet gomphet_glf gomphet_glf_sh gomphet_gp gomphet_ilf gomphet_ilf_sh gomphet_ip gphdot gphpen gphprint gprefs gprobi_p gprobit gprobit_8 gr gr7 gr_copy gr_current gr_db gr_describe gr_dir gr_draw gr_draw_replay gr_drop gr_edit gr_editviewopts gr_example gr_example2 gr_export gr_print gr_qscheme gr_query gr_read gr_rename gr_replay gr_save gr_set gr_setscheme gr_table gr_undo gr_use graph graph7 grebar greigen greigen_7 greigen_8 grmeanby grmeanby_7 gs_fileinfo gs_filetype gs_graphinfo gs_stat gsort gwood h|0 hadimvo hareg hausman haver he heck_d2 heckma_p heckman heckp_lf heckpr_p heckprob hel help hereg hetpr_lf hetpr_p hetprob hettest hexdump hilite hist hist_7 histogram hlogit hlu hmeans hotel hotelling hprobit hreg hsearch icd9 icd9_ff icd9p iis impute imtest inbase include inf infi infil infile infix inp inpu input ins insheet insp inspe inspec inspect integ inten intreg intreg_7 intreg_p intrg2_ll intrg_ll intrg_ll2 ipolate iqreg ir irf irf_create irfm iri is_svy is_svysum isid istdize ivprob_1_lf ivprob_lf ivprobit ivprobit_p ivreg ivreg_footnote ivtob_1_lf ivtob_lf ivtobit ivtobit_p jackknife jacknife jknife jknife_6 jknife_8 jkstat joinby kalarma1 kap kap_3 kapmeier kappa kapwgt kdensity kdensity_7 keep ksm ksmirnov ktau kwallis l|0 la lab labbe labbeplot labe label labelbook ladder levels levelsof leverage lfit lfit_p li lincom line linktest lis list lloghet_glf lloghet_glf_sh lloghet_gp lloghet_ilf lloghet_ilf_sh lloghet_ip llogi_sw llogis_p llogist llogistic llogistichet lnorm_lf lnorm_sw lnorma_p lnormal lnormalhet lnormhet_glf lnormhet_glf_sh lnormhet_gp lnormhet_ilf lnormhet_ilf_sh lnormhet_ip lnskew0 loadingplot loc loca local log logi logis_lf logistic logistic_p logit logit_estat logit_p loglogs logrank loneway lookfor lookup lowess lowess_7 lpredict lrecomp lroc lroc_7 lrtest ls lsens lsens_7 lsens_x lstat ltable ltable_7 ltriang lv lvr2plot lvr2plot_7 m|0 ma mac macr macro makecns man manova manova_estat manova_p manovatest mantel mark markin markout marksample mat mat_capp mat_order mat_put_rr mat_rapp mata mata_clear mata_describe mata_drop mata_matdescribe mata_matsave mata_matuse mata_memory mata_mlib mata_mosave mata_rename mata_which matalabel matcproc matlist matname matr matri matrix matrix_input__dlg matstrik mcc mcci md0_ md1_ md1debug_ md2_ md2debug_ mds mds_estat mds_p mdsconfig mdslong mdsmat mdsshepard mdytoe mdytof me_derd mean means median memory memsize menl meqparse mer merg merge meta mfp mfx mhelp mhodds minbound mixed_ll mixed_ll_reparm mkassert mkdir mkmat mkspline ml ml_5 ml_adjs ml_bhhhs ml_c_d ml_check ml_clear ml_cnt ml_debug ml_defd ml_e0 ml_e0_bfgs ml_e0_cycle ml_e0_dfp ml_e0i ml_e1 ml_e1_bfgs ml_e1_bhhh ml_e1_cycle ml_e1_dfp ml_e2 ml_e2_cycle ml_ebfg0 ml_ebfr0 ml_ebfr1 ml_ebh0q ml_ebhh0 ml_ebhr0 ml_ebr0i ml_ecr0i ml_edfp0 ml_edfr0 ml_edfr1 ml_edr0i ml_eds ml_eer0i ml_egr0i ml_elf ml_elf_bfgs ml_elf_bhhh ml_elf_cycle ml_elf_dfp ml_elfi ml_elfs ml_enr0i ml_enrr0 ml_erdu0 ml_erdu0_bfgs ml_erdu0_bhhh ml_erdu0_bhhhq ml_erdu0_cycle ml_erdu0_dfp ml_erdu0_nrbfgs ml_exde ml_footnote ml_geqnr ml_grad0 ml_graph ml_hbhhh ml_hd0 ml_hold ml_init ml_inv ml_log ml_max ml_mlout ml_mlout_8 ml_model ml_nb0 ml_opt ml_p ml_plot ml_query ml_rdgrd ml_repor ml_s_e ml_score ml_searc ml_technique ml_unhold mleval mlf_ mlmatbysum mlmatsum mlog mlogi mlogit mlogit_footnote mlogit_p mlopts mlsum mlvecsum mnl0_ mor more mov move mprobit mprobit_lf mprobit_p mrdu0_ mrdu1_ mvdecode mvencode mvreg mvreg_estat n|0 nbreg nbreg_al nbreg_lf nbreg_p nbreg_sw nestreg net newey newey_7 newey_p news nl nl_7 nl_9 nl_9_p nl_p nl_p_7 nlcom nlcom_p nlexp2 nlexp2_7 nlexp2a nlexp2a_7 nlexp3 nlexp3_7 nlgom3 nlgom3_7 nlgom4 nlgom4_7 nlinit nllog3 nllog3_7 nllog4 nllog4_7 nlog_rd nlogit nlogit_p nlogitgen nlogittree nlpred no nobreak noi nois noisi noisil noisily note notes notes_dlg nptrend numlabel numlist odbc old_ver olo olog ologi ologi_sw ologit ologit_p ologitp on one onew onewa oneway op_colnm op_comp op_diff op_inv op_str opr opro oprob oprob_sw oprobi oprobi_p oprobit oprobitp opts_exclusive order orthog orthpoly ou out outf outfi outfil outfile outs outsh outshe outshee outsheet ovtest pac pac_7 palette parse parse_dissim pause pca pca_8 pca_display pca_estat pca_p pca_rotate pcamat pchart pchart_7 pchi pchi_7 pcorr pctile pentium pergram pergram_7 permute permute_8 personal peto_st pkcollapse pkcross pkequiv pkexamine pkexamine_7 pkshape pksumm pksumm_7 pl plo plot plugin pnorm pnorm_7 poisgof poiss_lf poiss_sw poisso_p poisson poisson_estat post postclose postfile postutil pperron pr prais prais_e prais_e2 prais_p predict predictnl preserve print pro prob probi probit probit_estat probit_p proc_time procoverlay procrustes procrustes_estat procrustes_p profiler prog progr progra program prop proportion prtest prtesti pwcorr pwd q\\s qby qbys qchi qchi_7 qladder qladder_7 qnorm qnorm_7 qqplot qqplot_7 qreg qreg_c qreg_p qreg_sw qu quadchk quantile quantile_7 que quer query range ranksum ratio rchart rchart_7 rcof recast reclink recode reg reg3 reg3_p regdw regr regre regre_p2 regres regres_p regress regress_estat regriv_p remap ren rena renam rename renpfix repeat replace report reshape restore ret retu retur return rm rmdir robvar roccomp roccomp_7 roccomp_8 rocf_lf rocfit rocfit_8 rocgold rocplot rocplot_7 roctab roctab_7 rolling rologit rologit_p rot rota rotat rotate rotatemat rreg rreg_p ru run runtest rvfplot rvfplot_7 rvpplot rvpplot_7 sa safesum sample sampsi sav save savedresults saveold sc sca scal scala scalar scatter scm_mine sco scob_lf scob_p scobi_sw scobit scor score scoreplot scoreplot_help scree screeplot screeplot_help sdtest sdtesti se search separate seperate serrbar serrbar_7 serset set set_defaults sfrancia sh she shel shell shewhart shewhart_7 signestimationsample signrank signtest simul simul_7 simulate simulate_8 sktest sleep slogit slogit_d2 slogit_p smooth snapspan so sor sort spearman spikeplot spikeplot_7 spikeplt spline_x split sqreg sqreg_p sret sretu sretur sreturn ssc st st_ct st_hc st_hcd st_hcd_sh st_is st_issys st_note st_promo st_set st_show st_smpl st_subid stack statsby statsby_8 stbase stci stci_7 stcox stcox_estat stcox_fr stcox_fr_ll stcox_p stcox_sw stcoxkm stcoxkm_7 stcstat stcurv stcurve stcurve_7 stdes stem stepwise stereg stfill stgen stir stjoin stmc stmh stphplot stphplot_7 stphtest stphtest_7 stptime strate strate_7 streg streg_sw streset sts sts_7 stset stsplit stsum sttocc sttoct stvary stweib su suest suest_8 sum summ summa summar summari summariz summarize sunflower sureg survcurv survsum svar svar_p svmat svy svy_disp svy_dreg svy_est svy_est_7 svy_estat svy_get svy_gnbreg_p svy_head svy_header svy_heckman_p svy_heckprob_p svy_intreg_p svy_ivreg_p svy_logistic_p svy_logit_p svy_mlogit_p svy_nbreg_p svy_ologit_p svy_oprobit_p svy_poisson_p svy_probit_p svy_regress_p svy_sub svy_sub_7 svy_x svy_x_7 svy_x_p svydes svydes_8 svygen svygnbreg svyheckman svyheckprob svyintreg svyintreg_7 svyintrg svyivreg svylc svylog_p svylogit svymarkout svymarkout_8 svymean svymlog svymlogit svynbreg svyolog svyologit svyoprob svyoprobit svyopts svypois svypois_7 svypoisson svyprobit svyprobt svyprop svyprop_7 svyratio svyreg svyreg_p svyregress svyset svyset_7 svyset_8 svytab svytab_7 svytest svytotal sw sw_8 swcnreg swcox swereg swilk swlogis swlogit swologit swoprbt swpois swprobit swqreg swtobit swweib symmetry symmi symplot symplot_7 syntax sysdescribe sysdir sysuse szroeter ta tab tab1 tab2 tab_or tabd tabdi tabdis tabdisp tabi table tabodds tabodds_7 tabstat tabu tabul tabula tabulat tabulate te tempfile tempname tempvar tes test testnl testparm teststd tetrachoric time_it timer tis tob tobi tobit tobit_p tobit_sw token tokeni tokeniz tokenize tostring total translate translator transmap treat_ll treatr_p treatreg trim trimfill trnb_cons trnb_mean trpoiss_d2 trunc_ll truncr_p truncreg tsappend tset tsfill tsline tsline_ex tsreport tsrevar tsrline tsset tssmooth tsunab ttest ttesti tut_chk tut_wait tutorial tw tware_st two twoway twoway__fpfit_serset twoway__function_gen twoway__histogram_gen twoway__ipoint_serset twoway__ipoints_serset twoway__kdensity_gen twoway__lfit_serset twoway__normgen_gen twoway__pci_serset twoway__qfit_serset twoway__scatteri_serset twoway__sunflower_gen twoway_ksm_serset ty typ type typeof u|0 unab unabbrev unabcmd update us use uselabel var var_mkcompanion var_p varbasic varfcast vargranger varirf varirf_add varirf_cgraph varirf_create varirf_ctable varirf_describe varirf_dir varirf_drop varirf_erase varirf_graph varirf_ograph varirf_rename varirf_set varirf_table varlist varlmar varnorm varsoc varstable varstable_w varstable_w2 varwle vce vec vec_fevd vec_mkphi vec_p vec_p_w vecirf_create veclmar veclmar_w vecnorm vecnorm_w vecrank vecstable verinst vers versi versio version view viewsource vif vwls wdatetof webdescribe webseek webuse weib1_lf weib2_lf weib_lf weib_lf0 weibhet_glf weibhet_glf_sh weibhet_glfa weibhet_glfa_sh weibhet_gp weibhet_ilf weibhet_ilf_sh weibhet_ilfa weibhet_ilfa_sh weibhet_ip weibu_sw weibul_p weibull weibull_c weibull_s weibullhet wh whelp whi which whil while wilc_st wilcoxon win wind windo window winexec wntestb wntestb_7 wntestq xchart xchart_7 xcorr xcorr_7 xi xi_6 xmlsav xmlsave xmluse xpose xsh xshe xshel xshell xt_iis xt_tis xtab_p xtabond xtbin_p xtclog xtcloglog xtcloglog_8 xtcloglog_d2 xtcloglog_pa_p xtcloglog_re_p xtcnt_p xtcorr xtdata xtdes xtfront_p xtfrontier xtgee xtgee_elink xtgee_estat xtgee_makeivar xtgee_p xtgee_plink xtgls xtgls_p xthaus xthausman xtht_p xthtaylor xtile xtint_p xtintreg xtintreg_8 xtintreg_d2 xtintreg_p xtivp_1 xtivp_2 xtivreg xtline xtline_ex xtlogit xtlogit_8 xtlogit_d2 xtlogit_fe_p xtlogit_pa_p xtlogit_re_p xtmixed xtmixed_estat xtmixed_p xtnb_fe xtnb_lf xtnbreg xtnbreg_pa_p xtnbreg_refe_p xtpcse xtpcse_p xtpois xtpoisson xtpoisson_d2 xtpoisson_pa_p xtpoisson_refe_p xtpred xtprobit xtprobit_8 xtprobit_d2 xtprobit_re_p xtps_fe xtps_lf xtps_ren xtps_ren_8 xtrar_p xtrc xtrc_p xtrchh xtrefe_p xtreg xtreg_be xtreg_fe xtreg_ml xtreg_pa_p xtreg_re xtregar xtrere_p xtset xtsf_ll xtsf_llti xtsum xttab xttest0 xttobit xttobit_8 xttobit_p xttrans yx yxview__barlike_draw yxview_area_draw yxview_bar_draw yxview_dot_draw yxview_dropline_draw yxview_function_draw yxview_iarrow_draw yxview_ilabels_draw yxview_normal_draw yxview_pcarrow_draw yxview_pcbarrow_draw yxview_pccapsym_draw yxview_pcscatter_draw yxview_pcspike_draw yxview_rarea_draw yxview_rbar_draw yxview_rbarm_draw yxview_rcap_draw yxview_rcapsym_draw yxview_rconnected_draw yxview_rline_draw yxview_rscatter_draw yxview_rspike_draw yxview_spike_draw yxview_sunflower_draw zap_s zinb zinb_llf zinb_plf zip zip_llf zip_p zip_plf zt_ct_5 zt_hc_5 zt_hcd_5 zt_is_5 zt_iss_5 zt_sho_5 zt_smp_5 ztbase_5 ztcox_5 ztdes_5 ztereg_5 ztfill_5 ztgen_5 ztir_5 ztjoin_5 ztnb ztnb_p ztp ztp_p zts_5 ztset_5 ztspli_5 ztsum_5 zttoct_5 ztvary_5 ztweib_5",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/step21.min.js b/vendor/assets/javascripts/highlightjs/es/languages/step21.min.js
index 6e41aede473..024b045785f 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/step21.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/step21.min.js
@@ -1,4 +1,4 @@
-/*! `step21` grammar compiled for Highlight.js 11.6.0 */
+/*! `step21` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"STEP Part 21",
 aliases:["p21","step","stp"],case_insensitive:!0,keywords:{
 $pattern:"[A-Z_][A-Z0-9_.]*",keyword:["HEADER","ENDSEC","DATA"]},contains:[{
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/stylus.min.js b/vendor/assets/javascripts/highlightjs/es/languages/stylus.min.js
index fddd16a66c8..04ac6e2e956 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/stylus.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/stylus.min.js
@@ -1,4 +1,4 @@
-/*! `stylus` grammar compiled for Highlight.js 11.6.0 */
+/*! `stylus` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict"
 ;const e=["a","abbr","address","article","aside","audio","b","blockquote","body","button","canvas","caption","cite","code","dd","del","details","dfn","div","dl","dt","em","fieldset","figcaption","figure","footer","form","h1","h2","h3","h4","h5","h6","header","hgroup","html","i","iframe","img","input","ins","kbd","label","legend","li","main","mark","menu","nav","object","ol","p","q","quote","samp","section","span","strong","summary","sup","table","tbody","td","textarea","tfoot","th","thead","time","tr","ul","var","video"],i=["any-hover","any-pointer","aspect-ratio","color","color-gamut","color-index","device-aspect-ratio","device-height","device-width","display-mode","forced-colors","grid","height","hover","inverted-colors","monochrome","orientation","overflow-block","overflow-inline","pointer","prefers-color-scheme","prefers-contrast","prefers-reduced-motion","prefers-reduced-transparency","resolution","scan","scripting","update","width","min-width","max-width","min-height","max-height"],r=["active","any-link","blank","checked","current","default","defined","dir","disabled","drop","empty","enabled","first","first-child","first-of-type","fullscreen","future","focus","focus-visible","focus-within","has","host","host-context","hover","indeterminate","in-range","invalid","is","lang","last-child","last-of-type","left","link","local-link","not","nth-child","nth-col","nth-last-child","nth-last-col","nth-last-of-type","nth-of-type","only-child","only-of-type","optional","out-of-range","past","placeholder-shown","read-only","read-write","required","right","root","scope","target","target-within","user-invalid","valid","visited","where"],t=["after","backdrop","before","cue","cue-region","first-letter","first-line","grammar-error","marker","part","placeholder","selection","slotted","spelling-error"],o=["align-content","align-items","align-self","all","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","backface-visibility","background","background-attachment","background-blend-mode","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","block-size","border","border-block","border-block-color","border-block-end","border-block-end-color","border-block-end-style","border-block-end-width","border-block-start","border-block-start-color","border-block-start-style","border-block-start-width","border-block-style","border-block-width","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-inline","border-inline-color","border-inline-end","border-inline-end-color","border-inline-end-style","border-inline-end-width","border-inline-start","border-inline-start-color","border-inline-start-style","border-inline-start-width","border-inline-style","border-inline-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","caret-color","clear","clip","clip-path","clip-rule","color","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","contain","content","content-visibility","counter-increment","counter-reset","cue","cue-after","cue-before","cursor","direction","display","empty-cells","filter","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","flow","font","font-display","font-family","font-feature-settings","font-kerning","font-language-override","font-size","font-size-adjust","font-smoothing","font-stretch","font-style","font-synthesis","font-variant","font-variant-caps","font-variant-east-asian","font-variant-ligatures","font-variant-numeric","font-variant-position","font-variation-settings","font-weight","gap","glyph-orientation-vertical","grid","grid-area","grid-auto-columns","grid-auto-flow","grid-auto-rows","grid-column","grid-column-end","grid-column-start","grid-gap","grid-row","grid-row-end","grid-row-start","grid-template","grid-template-areas","grid-template-columns","grid-template-rows","hanging-punctuation","height","hyphens","icon","image-orientation","image-rendering","image-resolution","ime-mode","inline-size","isolation","justify-content","left","letter-spacing","line-break","line-height","list-style","list-style-image","list-style-position","list-style-type","margin","margin-block","margin-block-end","margin-block-start","margin-bottom","margin-inline","margin-inline-end","margin-inline-start","margin-left","margin-right","margin-top","marks","mask","mask-border","mask-border-mode","mask-border-outset","mask-border-repeat","mask-border-slice","mask-border-source","mask-border-width","mask-clip","mask-composite","mask-image","mask-mode","mask-origin","mask-position","mask-repeat","mask-size","mask-type","max-block-size","max-height","max-inline-size","max-width","min-block-size","min-height","min-inline-size","min-width","mix-blend-mode","nav-down","nav-index","nav-left","nav-right","nav-up","none","normal","object-fit","object-position","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-wrap","overflow-x","overflow-y","padding","padding-block","padding-block-end","padding-block-start","padding-bottom","padding-inline","padding-inline-end","padding-inline-start","padding-left","padding-right","padding-top","page-break-after","page-break-before","page-break-inside","pause","pause-after","pause-before","perspective","perspective-origin","pointer-events","position","quotes","resize","rest","rest-after","rest-before","right","row-gap","scroll-margin","scroll-margin-block","scroll-margin-block-end","scroll-margin-block-start","scroll-margin-bottom","scroll-margin-inline","scroll-margin-inline-end","scroll-margin-inline-start","scroll-margin-left","scroll-margin-right","scroll-margin-top","scroll-padding","scroll-padding-block","scroll-padding-block-end","scroll-padding-block-start","scroll-padding-bottom","scroll-padding-inline","scroll-padding-inline-end","scroll-padding-inline-start","scroll-padding-left","scroll-padding-right","scroll-padding-top","scroll-snap-align","scroll-snap-stop","scroll-snap-type","scrollbar-color","scrollbar-gutter","scrollbar-width","shape-image-threshold","shape-margin","shape-outside","speak","speak-as","src","tab-size","table-layout","text-align","text-align-all","text-align-last","text-combine-upright","text-decoration","text-decoration-color","text-decoration-line","text-decoration-style","text-emphasis","text-emphasis-color","text-emphasis-position","text-emphasis-style","text-indent","text-justify","text-orientation","text-overflow","text-rendering","text-shadow","text-transform","text-underline-position","top","transform","transform-box","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","vertical-align","visibility","voice-balance","voice-duration","voice-family","voice-pitch","voice-range","voice-rate","voice-stress","voice-volume","white-space","widows","width","will-change","word-break","word-spacing","word-wrap","writing-mode","z-index"].reverse()
 ;return n=>{const a=(e=>({IMPORTANT:{scope:"meta",begin:"!important"},
@@ -15,8 +15,8 @@ relevance:0},CSS_VARIABLE:{className:"attr",begin:/--[A-Za-z][A-Za-z0-9_-]*/}
 keywords:"if else for in",
 illegal:"(\\?|(\\bReturn\\b)|(\\bEnd\\b)|(\\bend\\b)|(\\bdef\\b)|;|#\\s|\\*\\s|===\\s|\\||%)",
 contains:[n.QUOTE_STRING_MODE,n.APOS_STRING_MODE,n.C_LINE_COMMENT_MODE,n.C_BLOCK_COMMENT_MODE,a.HEXCOLOR,{
-begin:"\\.[a-zA-Z][a-zA-Z0-9_-]*(?=[.\\s\\n[:,(])",className:"selector-class"},{
-begin:"#[a-zA-Z][a-zA-Z0-9_-]*(?=[.\\s\\n[:,(])",className:"selector-id"},{
+begin:"\\.[a-zA-Z][a-zA-Z0-9_-]*"+s,className:"selector-class"},{
+begin:"#[a-zA-Z][a-zA-Z0-9_-]*"+s,className:"selector-id"},{
 begin:"\\b("+e.join("|")+")"+s,className:"selector-tag"},{
 className:"selector-pseudo",begin:"&?:("+r.join("|")+")"+s},{
 className:"selector-pseudo",begin:"&?:(:)?("+t.join("|")+")"+s
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/subunit.min.js b/vendor/assets/javascripts/highlightjs/es/languages/subunit.min.js
index aad90b507c1..e5f64f8a46e 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/subunit.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/subunit.min.js
@@ -1,4 +1,4 @@
-/*! `subunit` grammar compiled for Highlight.js 11.6.0 */
+/*! `subunit` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return s=>({name:"SubUnit",
 case_insensitive:!0,contains:[{className:"string",begin:"\\[\n(multipart)?",
 end:"\\]\n"},{className:"string",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/swift.min.js b/vendor/assets/javascripts/highlightjs/es/languages/swift.min.js
index b57d890155d..a251c6c9e65 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/swift.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/swift.min.js
@@ -1,4 +1,4 @@
-/*! `swift` grammar compiled for Highlight.js 11.6.0 */
+/*! `swift` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";function e(e){
 return e?"string"==typeof e?e:e.source:null}function a(e){return t("(?=",e,")")}
 function t(...a){return a.map((a=>e(a))).join("")}function n(...a){const t=(e=>{
@@ -16,45 +16,45 @@ $pattern:n(/\b\w+/,/#\w+/),keyword:C.concat(m),literal:o},B=[A,N,D],_=[{
 match:t(/\./,n(...p)),relevance:0},{className:"built_in",
 match:t(/\b/,n(...p),/(?=\()/)}],S={match:/->/,relevance:0},M=[S,{
 className:"operator",relevance:0,variants:[{match:b},{match:`\\.(\\.|${F})+`}]
-}],x="([0-9a-fA-F]_*)+",I={className:"number",relevance:0,variants:[{
-match:"\\b(([0-9]_*)+)(\\.(([0-9]_*)+))?([eE][+-]?(([0-9]_*)+))?\\b"},{
-match:`\\b0x(${x})(\\.(${x}))?([pP][+-]?(([0-9]_*)+))?\\b`},{
-match:/\b0o([0-7]_*)+\b/},{match:/\b0b([01]_*)+\b/}]},O=(e="")=>({
-className:"subst",variants:[{match:t(/\\/,e,/[0\\tnr"']/)},{
-match:t(/\\/,e,/u\{[0-9a-fA-F]{1,8}\}/)}]}),L=(e="")=>({className:"subst",
-match:t(/\\/,e,/[\t ]*(?:[\r\n]|\r\n)/)}),T=(e="")=>({className:"subst",
-label:"interpol",begin:t(/\\/,e,/\(/),end:/\)/}),$=(e="")=>({begin:t(e,/"""/),
-end:t(/"""/,e),contains:[O(e),L(e),T(e)]}),j=(e="")=>({begin:t(e,/"/),
-end:t(/"/,e),contains:[O(e),T(e)]}),P={className:"string",
-variants:[$(),$("#"),$("##"),$("###"),j(),j("#"),j("##"),j("###")]},K={
-match:t(/`/,w,/`/)},z=[K,{className:"variable",match:/\$\d+/},{
-className:"variable",match:`\\$${f}+`}],q=[{match:/(@|#(un)?)available/,
+}],x="([0-9]_*)+",$="([0-9a-fA-F]_*)+",I={className:"number",relevance:0,
+variants:[{match:`\\b(${x})(\\.(${x}))?([eE][+-]?(${x}))?\\b`},{
+match:`\\b0x(${$})(\\.(${$}))?([pP][+-]?(${x}))?\\b`},{match:/\b0o([0-7]_*)+\b/
+},{match:/\b0b([01]_*)+\b/}]},O=(e="")=>({className:"subst",variants:[{
+match:t(/\\/,e,/[0\\tnr"']/)},{match:t(/\\/,e,/u\{[0-9a-fA-F]{1,8}\}/)}]
+}),L=(e="")=>({className:"subst",match:t(/\\/,e,/[\t ]*(?:[\r\n]|\r\n)/)
+}),T=(e="")=>({className:"subst",label:"interpol",begin:t(/\\/,e,/\(/),end:/\)/
+}),j=(e="")=>({begin:t(e,/"""/),end:t(/"""/,e),contains:[O(e),L(e),T(e)]
+}),P=(e="")=>({begin:t(e,/"/),end:t(/"/,e),contains:[O(e),T(e)]}),K={
+className:"string",
+variants:[j(),j("#"),j("##"),j("###"),P(),P("#"),P("##"),P("###")]},z={
+match:t(/`/,w,/`/)},q=[z,{className:"variable",match:/\$\d+/},{
+className:"variable",match:`\\$${f}+`}],U=[{match:/(@|#(un)?)available/,
 className:"keyword",starts:{contains:[{begin:/\(/,end:/\)/,keywords:E,
-contains:[...M,I,P]}]}},{className:"keyword",match:t(/@/,n(...g))},{
-className:"meta",match:t(/@/,w)}],U={match:a(/\b[A-Z]/),relevance:0,contains:[{
+contains:[...M,I,K]}]}},{className:"keyword",match:t(/@/,n(...g))},{
+className:"meta",match:t(/@/,w)}],Z={match:a(/\b[A-Z]/),relevance:0,contains:[{
 className:"type",
 match:t(/(AV|CA|CF|CG|CI|CL|CM|CN|CT|MK|MP|MTK|MTL|NS|SCN|SK|UI|WK|XC)/,f,"+")
 },{className:"type",match:y,relevance:0},{match:/[?!]+/,relevance:0},{
-match:/\.\.\./,relevance:0},{match:t(/\s+&\s+/,a(y)),relevance:0}]},Z={
-begin:/</,end:/>/,keywords:k,contains:[...v,...B,...q,S,U]};U.contains.push(Z)
-;const G={begin:/\(/,end:/\)/,relevance:0,keywords:k,contains:["self",{
+match:/\.\.\./,relevance:0},{match:t(/\s+&\s+/,a(y)),relevance:0}]},G={
+begin:/</,end:/>/,keywords:k,contains:[...v,...B,...U,S,Z]};Z.contains.push(G)
+;const V={begin:/\(/,end:/\)/,relevance:0,keywords:k,contains:["self",{
 match:t(w,/\s*:/),keywords:"_|0",relevance:0
-},...v,...B,..._,...M,I,P,...z,...q,U]},V={begin:/</,end:/>/,contains:[...v,U]
-},W={begin:/\(/,end:/\)/,keywords:k,contains:[{
+},...v,...B,..._,...M,I,K,...q,...U,Z]},W={begin:/</,end:/>/,contains:[...v,Z]
+},R={begin:/\(/,end:/\)/,keywords:k,contains:[{
 begin:n(a(t(w,/\s*:/)),a(t(w,/\s+/,w,/\s*:/))),end:/:/,relevance:0,contains:[{
 className:"keyword",match:/\b_\b/},{className:"params",match:w}]
-},...v,...B,...M,I,P,...q,U,G],endsParent:!0,illegal:/["']/},R={
-match:[/func/,/\s+/,n(K.match,w,b)],className:{1:"keyword",3:"title.function"},
-contains:[V,W,d],illegal:[/\[/,/%/]},X={
+},...v,...B,...M,I,K,...U,Z,V],endsParent:!0,illegal:/["']/},X={
+match:[/func/,/\s+/,n(z.match,w,b)],className:{1:"keyword",3:"title.function"},
+contains:[W,R,d],illegal:[/\[/,/%/]},H={
 match:[/\b(?:subscript|init[?!]?)/,/\s*(?=[<(])/],className:{1:"keyword"},
-contains:[V,W,d],illegal:/\[|%/},H={match:[/operator/,/\s+/,b],className:{
-1:"keyword",3:"title"}},J={begin:[/precedencegroup/,/\s+/,y],className:{
-1:"keyword",3:"title"},contains:[U],keywords:[...l,...o],end:/}/}
-;for(const e of P.variants){const a=e.contains.find((e=>"interpol"===e.label))
-;a.keywords=k;const t=[...B,..._,...M,I,P,...z];a.contains=[...t,{begin:/\(/,
+contains:[W,R,d],illegal:/\[|%/},J={match:[/operator/,/\s+/,b],className:{
+1:"keyword",3:"title"}},Q={begin:[/precedencegroup/,/\s+/,y],className:{
+1:"keyword",3:"title"},contains:[Z],keywords:[...l,...o],end:/}/}
+;for(const e of K.variants){const a=e.contains.find((e=>"interpol"===e.label))
+;a.keywords=k;const t=[...B,..._,...M,I,K,...q];a.contains=[...t,{begin:/\(/,
 end:/\)/,contains:["self",...t]}]}return{name:"Swift",keywords:k,
-contains:[...v,R,X,{beginKeywords:"struct protocol class extension enum actor",
+contains:[...v,X,H,{beginKeywords:"struct protocol class extension enum actor",
 end:"\\{",excludeEnd:!0,keywords:k,contains:[e.inherit(e.TITLE_MODE,{
 className:"title.class",begin:/[A-Za-z$_][\u00C0-\u02B80-9A-Za-z$_]*/}),...B]
-},H,J,{beginKeywords:"import",end:/$/,contains:[...v],relevance:0
-},...B,..._,...M,I,P,...z,...q,U,G]}}})();export default hljsGrammar;
\ No newline at end of file
+},J,Q,{beginKeywords:"import",end:/$/,contains:[...v],relevance:0
+},...B,..._,...M,I,K,...q,...U,Z,V]}}})();export default hljsGrammar;
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/taggerscript.min.js b/vendor/assets/javascripts/highlightjs/es/languages/taggerscript.min.js
index 56f09dc9223..ec885c23b63 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/taggerscript.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/taggerscript.min.js
@@ -1,4 +1,4 @@
-/*! `taggerscript` grammar compiled for Highlight.js 11.6.0 */
+/*! `taggerscript` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"Tagger Script",contains:[{
 className:"comment",begin:/\$noop\(/,end:/\)/,contains:[{begin:/\\[()]/},{
 begin:/\(/,end:/\)/,contains:[{begin:/\\[()]/},"self"]}],relevance:10},{
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/tap.min.js b/vendor/assets/javascripts/highlightjs/es/languages/tap.min.js
index 3661260ff09..de5c555e52e 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/tap.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/tap.min.js
@@ -1,4 +1,4 @@
-/*! `tap` grammar compiled for Highlight.js 11.6.0 */
+/*! `tap` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"Test Anything Protocol",
 case_insensitive:!0,contains:[e.HASH_COMMENT_MODE,{className:"meta",variants:[{
 begin:"^TAP version (\\d+)$"},{begin:"^1\\.\\.(\\d+)$"}]},{begin:/---$/,
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/tcl.min.js b/vendor/assets/javascripts/highlightjs/es/languages/tcl.min.js
index c0dda69ea11..2d791502256 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/tcl.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/tcl.min.js
@@ -1,4 +1,4 @@
-/*! `tcl` grammar compiled for Highlight.js 11.6.0 */
+/*! `tcl` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const a=e.regex,t=/[a-zA-Z_][a-zA-Z0-9_]*/,r={className:"number",
 variants:[e.BINARY_NUMBER_MODE,e.C_NUMBER_MODE]};return{name:"Tcl",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/thrift.min.js b/vendor/assets/javascripts/highlightjs/es/languages/thrift.min.js
index c3c89bb70e7..f0e45caddb0 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/thrift.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/thrift.min.js
@@ -1,4 +1,4 @@
-/*! `thrift` grammar compiled for Highlight.js 11.6.0 */
+/*! `thrift` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const t=["bool","byte","i16","i32","i64","double","string","binary"];return{
 name:"Thrift",keywords:{
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/tp.min.js b/vendor/assets/javascripts/highlightjs/es/languages/tp.min.js
index 74ff138dd48..fa38c378914 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/tp.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/tp.min.js
@@ -1,4 +1,4 @@
-/*! `tp` grammar compiled for Highlight.js 11.6.0 */
+/*! `tp` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return O=>{const e={className:"number",
 begin:"[1-9][0-9]*",relevance:0},R={className:"symbol",begin:":[^\\]]+"};return{
 name:"TP",keywords:{
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/twig.min.js b/vendor/assets/javascripts/highlightjs/es/languages/twig.min.js
index bdc2d648ae0..72cb6e2dedf 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/twig.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/twig.min.js
@@ -1,4 +1,4 @@
-/*! `twig` grammar compiled for Highlight.js 11.6.0 */
+/*! `twig` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const a=e.regex,t=["absolute_url","asset|0","asset_version","attribute","block","constant","controller|0","country_timezones","csrf_token","cycle","date","dump","expression","form|0","form_end","form_errors","form_help","form_label","form_rest","form_row","form_start","form_widget","html_classes","include","is_granted","logout_path","logout_url","max","min","parent","path|0","random","range","relative_path","render","render_esi","source","template_from_string","url|0"]
 ;let r=["apply","autoescape","block","cache","deprecated","do","embed","extends","filter","flush","for","form_theme","from","if","import","include","macro","sandbox","set","stopwatch","trans","trans_default_domain","transchoice","use","verbatim","with"]
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/typescript.min.js b/vendor/assets/javascripts/highlightjs/es/languages/typescript.min.js
index 934ce673d55..1a0bd7ff7a5 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/typescript.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/typescript.min.js
@@ -1,92 +1,95 @@
-/*! `typescript` grammar compiled for Highlight.js 11.6.0 */
+/*! `typescript` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict"
-;const e="[A-Za-z$_][0-9A-Za-z$_]*",n=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],a=["true","false","null","undefined","NaN","Infinity"],t=["Object","Function","Boolean","Symbol","Math","Date","Number","BigInt","String","RegExp","Array","Float32Array","Float64Array","Int8Array","Uint8Array","Uint8ClampedArray","Int16Array","Int32Array","Uint16Array","Uint32Array","BigInt64Array","BigUint64Array","Set","Map","WeakSet","WeakMap","ArrayBuffer","SharedArrayBuffer","Atomics","DataView","JSON","Promise","Generator","GeneratorFunction","AsyncFunction","Reflect","Proxy","Intl","WebAssembly"],s=["Error","EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"],r=["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],c=["arguments","this","super","console","window","document","localStorage","module","global"],i=[].concat(r,t,s)
+;const e="[A-Za-z$_][0-9A-Za-z$_]*",n=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],a=["true","false","null","undefined","NaN","Infinity"],t=["Object","Function","Boolean","Symbol","Math","Date","Number","BigInt","String","RegExp","Array","Float32Array","Float64Array","Int8Array","Uint8Array","Uint8ClampedArray","Int16Array","Int32Array","Uint16Array","Uint32Array","BigInt64Array","BigUint64Array","Set","Map","WeakSet","WeakMap","ArrayBuffer","SharedArrayBuffer","Atomics","DataView","JSON","Promise","Generator","GeneratorFunction","AsyncFunction","Reflect","Proxy","Intl","WebAssembly"],s=["Error","EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"],r=["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],c=["arguments","this","super","console","window","document","localStorage","sessionStorage","module","global"],i=[].concat(r,t,s)
 ;function o(o){const l=o.regex,d=e,b={begin:/<[A-Za-z0-9\\._:-]+/,
 end:/\/[A-Za-z0-9\\._:-]+>|\/>/,isTrulyOpeningTag:(e,n)=>{
 const a=e[0].length+e.index,t=e.input[a]
 ;if("<"===t||","===t)return void n.ignoreMatch();let s
 ;">"===t&&(((e,{after:n})=>{const a="</"+e[0].slice(1)
-;return-1!==e.input.indexOf(a,n)})(e,{after:a
-})||n.ignoreMatch()),(s=e.input.substring(a).match(/^\s+extends\s+/))&&0===s.index&&n.ignoreMatch()
+;return-1!==e.input.indexOf(a,n)})(e,{after:a})||n.ignoreMatch())
+;const r=e.input.substring(a)
+;((s=r.match(/^\s*=/))||(s=r.match(/^\s+extends\s+/))&&0===s.index)&&n.ignoreMatch()
 }},g={$pattern:e,keyword:n,literal:a,built_in:i,"variable.language":c
-},u="\\.([0-9](_?[0-9])*)",m="0|[1-9](_?[0-9])*|0[0-7]*[89][0-9]*",E={
+},u="[0-9](_?[0-9])*",m=`\\.(${u})`,E="0|[1-9](_?[0-9])*|0[0-7]*[89][0-9]*",A={
 className:"number",variants:[{
-begin:`(\\b(${m})((${u})|\\.)?|(${u}))[eE][+-]?([0-9](_?[0-9])*)\\b`},{
-begin:`\\b(${m})\\b((${u})\\b|\\.)?|(${u})\\b`},{
+begin:`(\\b(${E})((${m})|\\.)?|(${m}))[eE][+-]?(${u})\\b`},{
+begin:`\\b(${E})\\b((${m})\\b|\\.)?|(${m})\\b`},{
 begin:"\\b(0|[1-9](_?[0-9])*)n\\b"},{
 begin:"\\b0[xX][0-9a-fA-F](_?[0-9a-fA-F])*n?\\b"},{
 begin:"\\b0[bB][0-1](_?[0-1])*n?\\b"},{begin:"\\b0[oO][0-7](_?[0-7])*n?\\b"},{
 begin:"\\b0[0-7]+n?\\b"}],relevance:0},y={className:"subst",begin:"\\$\\{",
-end:"\\}",keywords:g,contains:[]},A={begin:"html`",end:"",starts:{end:"`",
-returnEnd:!1,contains:[o.BACKSLASH_ESCAPE,y],subLanguage:"xml"}},_={
+end:"\\}",keywords:g,contains:[]},p={begin:"html`",end:"",starts:{end:"`",
+returnEnd:!1,contains:[o.BACKSLASH_ESCAPE,y],subLanguage:"xml"}},f={
 begin:"css`",end:"",starts:{end:"`",returnEnd:!1,
-contains:[o.BACKSLASH_ESCAPE,y],subLanguage:"css"}},f={className:"string",
-begin:"`",end:"`",contains:[o.BACKSLASH_ESCAPE,y]},N={className:"comment",
+contains:[o.BACKSLASH_ESCAPE,y],subLanguage:"css"}},N={begin:"gql`",end:"",
+starts:{end:"`",returnEnd:!1,contains:[o.BACKSLASH_ESCAPE,y],
+subLanguage:"graphql"}},_={className:"string",begin:"`",end:"`",
+contains:[o.BACKSLASH_ESCAPE,y]},h={className:"comment",
 variants:[o.COMMENT(/\/\*\*(?!\/)/,"\\*/",{relevance:0,contains:[{
 begin:"(?=@[A-Za-z]+)",relevance:0,contains:[{className:"doctag",
 begin:"@[A-Za-z]+"},{className:"type",begin:"\\{",end:"\\}",excludeEnd:!0,
 excludeBegin:!0,relevance:0},{className:"variable",begin:d+"(?=\\s*(-)|$)",
 endsParent:!0,relevance:0},{begin:/(?=[^\n])\s/,relevance:0}]}]
 }),o.C_BLOCK_COMMENT_MODE,o.C_LINE_COMMENT_MODE]
-},p=[o.APOS_STRING_MODE,o.QUOTE_STRING_MODE,A,_,f,E];y.contains=p.concat({
-begin:/\{/,end:/\}/,keywords:g,contains:["self"].concat(p)})
-;const h=[].concat(N,y.contains),v=h.concat([{begin:/\(/,end:/\)/,keywords:g,
-contains:["self"].concat(h)}]),S={className:"params",begin:/\(/,end:/\)/,
-excludeBegin:!0,excludeEnd:!0,keywords:g,contains:v},w={variants:[{
+},S=[o.APOS_STRING_MODE,o.QUOTE_STRING_MODE,p,f,N,_,{match:/\$\d+/},A]
+;y.contains=S.concat({begin:/\{/,end:/\}/,keywords:g,contains:["self"].concat(S)
+});const v=[].concat(h,y.contains),w=v.concat([{begin:/\(/,end:/\)/,keywords:g,
+contains:["self"].concat(v)}]),R={className:"params",begin:/\(/,end:/\)/,
+excludeBegin:!0,excludeEnd:!0,keywords:g,contains:w},x={variants:[{
 match:[/class/,/\s+/,d,/\s+/,/extends/,/\s+/,l.concat(d,"(",l.concat(/\./,d),")*")],
 scope:{1:"keyword",3:"title.class",5:"keyword",7:"title.class.inherited"}},{
-match:[/class/,/\s+/,d],scope:{1:"keyword",3:"title.class"}}]},R={relevance:0,
+match:[/class/,/\s+/,d],scope:{1:"keyword",3:"title.class"}}]},k={relevance:0,
 match:l.either(/\bJSON/,/\b[A-Z][a-z]+([A-Z][a-z]*|\d)*/,/\b[A-Z]{2,}([A-Z][a-z]+|\d)+([A-Z][a-z]*)*/,/\b[A-Z]{2,}[a-z]+([A-Z][a-z]+|\d)*([A-Z][a-z]*)*/),
-className:"title.class",keywords:{_:[...t,...s]}},x={variants:[{
+className:"title.class",keywords:{_:[...t,...s]}},O={variants:[{
 match:[/function/,/\s+/,d,/(?=\s*\()/]},{match:[/function/,/\s*(?=\()/]}],
-className:{1:"keyword",3:"title.function"},label:"func.def",contains:[S],
-illegal:/%/},k={
-match:l.concat(/\b/,(O=[...r,"super"],l.concat("(?!",O.join("|"),")")),d,l.lookahead(/\(/)),
-className:"title.function",relevance:0};var O;const I={
+className:{1:"keyword",3:"title.function"},label:"func.def",contains:[R],
+illegal:/%/},C={
+match:l.concat(/\b/,(I=[...r,"super","import"],l.concat("(?!",I.join("|"),")")),d,l.lookahead(/\(/)),
+className:"title.function",relevance:0};var I;const T={
 begin:l.concat(/\./,l.lookahead(l.concat(d,/(?![0-9A-Za-z$_(])/))),end:d,
-excludeBegin:!0,keywords:"prototype",className:"property",relevance:0},C={
+excludeBegin:!0,keywords:"prototype",className:"property",relevance:0},M={
 match:[/get|set/,/\s+/,d,/(?=\()/],className:{1:"keyword",3:"title.function"},
-contains:[{begin:/\(\)/},S]
-},T="(\\([^()]*(\\([^()]*(\\([^()]*\\)[^()]*)*\\)[^()]*)*\\)|"+o.UNDERSCORE_IDENT_RE+")\\s*=>",M={
-match:[/const|var|let/,/\s+/,d,/\s*/,/=\s*/,/(async\s*)?/,l.lookahead(T)],
-keywords:"async",className:{1:"keyword",3:"title.function"},contains:[S]}
-;return{name:"Javascript",aliases:["js","jsx","mjs","cjs"],keywords:g,exports:{
-PARAMS_CONTAINS:v,CLASS_REFERENCE:R},illegal:/#(?![$_A-z])/,
+contains:[{begin:/\(\)/},R]
+},B="(\\([^()]*(\\([^()]*(\\([^()]*\\)[^()]*)*\\)[^()]*)*\\)|"+o.UNDERSCORE_IDENT_RE+")\\s*=>",$={
+match:[/const|var|let/,/\s+/,d,/\s*/,/=\s*/,/(async\s*)?/,l.lookahead(B)],
+keywords:"async",className:{1:"keyword",3:"title.function"},contains:[R]}
+;return{name:"JavaScript",aliases:["js","jsx","mjs","cjs"],keywords:g,exports:{
+PARAMS_CONTAINS:w,CLASS_REFERENCE:k},illegal:/#(?![$_A-z])/,
 contains:[o.SHEBANG({label:"shebang",binary:"node",relevance:5}),{
 label:"use_strict",className:"meta",relevance:10,
 begin:/^\s*['"]use (strict|asm)['"]/
-},o.APOS_STRING_MODE,o.QUOTE_STRING_MODE,A,_,f,N,E,R,{className:"attr",
-begin:d+l.lookahead(":"),relevance:0},M,{
+},o.APOS_STRING_MODE,o.QUOTE_STRING_MODE,p,f,N,_,h,{match:/\$\d+/},A,k,{
+className:"attr",begin:d+l.lookahead(":"),relevance:0},$,{
 begin:"("+o.RE_STARTERS_RE+"|\\b(case|return|throw)\\b)\\s*",
-keywords:"return throw case",relevance:0,contains:[N,o.REGEXP_MODE,{
-className:"function",begin:T,returnBegin:!0,end:"\\s*=>",contains:[{
+keywords:"return throw case",relevance:0,contains:[h,o.REGEXP_MODE,{
+className:"function",begin:B,returnBegin:!0,end:"\\s*=>",contains:[{
 className:"params",variants:[{begin:o.UNDERSCORE_IDENT_RE,relevance:0},{
 className:null,begin:/\(\s*\)/,skip:!0},{begin:/\(/,end:/\)/,excludeBegin:!0,
-excludeEnd:!0,keywords:g,contains:v}]}]},{begin:/,/,relevance:0},{match:/\s+/,
+excludeEnd:!0,keywords:g,contains:w}]}]},{begin:/,/,relevance:0},{match:/\s+/,
 relevance:0},{variants:[{begin:"<>",end:"</>"},{
 match:/<[A-Za-z0-9\\._:-]+\s*\/>/},{begin:b.begin,
 "on:begin":b.isTrulyOpeningTag,end:b.end}],subLanguage:"xml",contains:[{
-begin:b.begin,end:b.end,skip:!0,contains:["self"]}]}]},x,{
+begin:b.begin,end:b.end,skip:!0,contains:["self"]}]}]},O,{
 beginKeywords:"while if switch catch for"},{
 begin:"\\b(?!function)"+o.UNDERSCORE_IDENT_RE+"\\([^()]*(\\([^()]*(\\([^()]*\\)[^()]*)*\\)[^()]*)*\\)\\s*\\{",
-returnBegin:!0,label:"func.def",contains:[S,o.inherit(o.TITLE_MODE,{begin:d,
-className:"title.function"})]},{match:/\.\.\./,relevance:0},I,{match:"\\$"+d,
+returnBegin:!0,label:"func.def",contains:[R,o.inherit(o.TITLE_MODE,{begin:d,
+className:"title.function"})]},{match:/\.\.\./,relevance:0},T,{match:"\\$"+d,
 relevance:0},{match:[/\bconstructor(?=\s*\()/],className:{1:"title.function"},
-contains:[S]},k,{relevance:0,match:/\b[A-Z][A-Z_0-9]+\b/,
-className:"variable.constant"},w,C,{match:/\$[(.]/}]}}return t=>{
-const s=o(t),r=["any","void","number","boolean","string","object","never","symbol","bigint","unknown"],l={
+contains:[R]},C,{relevance:0,match:/\b[A-Z][A-Z_0-9]+\b/,
+className:"variable.constant"},x,M,{match:/\$[(.]/}]}}return t=>{
+const s=o(t),r=e,l=["any","void","number","boolean","string","object","never","symbol","bigint","unknown"],d={
 beginKeywords:"namespace",end:/\{/,excludeEnd:!0,
-contains:[s.exports.CLASS_REFERENCE]},d={beginKeywords:"interface",end:/\{/,
-excludeEnd:!0,keywords:{keyword:"interface extends",built_in:r},
-contains:[s.exports.CLASS_REFERENCE]},b={$pattern:e,
+contains:[s.exports.CLASS_REFERENCE]},b={beginKeywords:"interface",end:/\{/,
+excludeEnd:!0,keywords:{keyword:"interface extends",built_in:l},
+contains:[s.exports.CLASS_REFERENCE]},g={$pattern:e,
 keyword:n.concat(["type","namespace","interface","public","private","protected","implements","declare","abstract","readonly","enum","override"]),
-literal:a,built_in:i.concat(r),"variable.language":c},g={className:"meta",
-begin:"@[A-Za-z$_][0-9A-Za-z$_]*"},u=(e,n,a)=>{
-const t=e.contains.findIndex((e=>e.label===n))
+literal:a,built_in:i.concat(l),"variable.language":c},u={className:"meta",
+begin:"@"+r},m=(e,n,a)=>{const t=e.contains.findIndex((e=>e.label===n))
 ;if(-1===t)throw Error("can not find mode to replace");e.contains.splice(t,1,a)}
-;return Object.assign(s.keywords,b),
-s.exports.PARAMS_CONTAINS.push(g),s.contains=s.contains.concat([g,l,d]),
-u(s,"shebang",t.SHEBANG()),u(s,"use_strict",{className:"meta",relevance:10,
+;return Object.assign(s.keywords,g),
+s.exports.PARAMS_CONTAINS.push(u),s.contains=s.contains.concat([u,d,b]),
+m(s,"shebang",t.SHEBANG()),m(s,"use_strict",{className:"meta",relevance:10,
 begin:/^\s*['"]use strict['"]/
 }),s.contains.find((e=>"func.def"===e.label)).relevance=0,Object.assign(s,{
-name:"TypeScript",aliases:["ts","tsx"]}),s}})();export default hljsGrammar;
\ No newline at end of file
+name:"TypeScript",aliases:["ts","tsx","mts","cts"]}),s}})()
+;export default hljsGrammar;
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/vala.min.js b/vendor/assets/javascripts/highlightjs/es/languages/vala.min.js
index 55f5fddf836..aa2425d3bab 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/vala.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/vala.min.js
@@ -1,4 +1,4 @@
-/*! `vala` grammar compiled for Highlight.js 11.6.0 */
+/*! `vala` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"Vala",keywords:{
 keyword:"char uchar unichar int uint long ulong short ushort int8 int16 int32 int64 uint8 uint16 uint32 uint64 float double bool struct enum string void weak unowned owned async signal static abstract interface override virtual delegate if while do for foreach else switch case break default return try catch public private protected internal using new this get set const stdout stdin stderr var",
 built_in:"DBus GLib CCode Gee Object Gtk Posix",literal:"false true null"},
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/vbnet.min.js b/vendor/assets/javascripts/highlightjs/es/languages/vbnet.min.js
index e824c5f8b7b..a9a8876d441 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/vbnet.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/vbnet.min.js
@@ -1,4 +1,4 @@
-/*! `vbnet` grammar compiled for Highlight.js 11.6.0 */
+/*! `vbnet` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const a=e.regex,n=/\d{1,2}\/\d{1,2}\/\d{4}/,t=/\d{4}-\d{1,2}-\d{1,2}/,i=/(\d|1[012])(:\d+){0,2} *(AM|PM)/,s=/\d{1,2}(:\d{1,2}){1,2}/,r={
 className:"literal",variants:[{begin:a.concat(/# */,a.either(t,n),/ *#/)},{
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/vbscript-html.min.js b/vendor/assets/javascripts/highlightjs/es/languages/vbscript-html.min.js
index 7eef52b5077..337e997ec5e 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/vbscript-html.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/vbscript-html.min.js
@@ -1,4 +1,4 @@
-/*! `vbscript-html` grammar compiled for Highlight.js 11.6.0 */
+/*! `vbscript-html` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return a=>({name:"VBScript in HTML",
 subLanguage:"xml",contains:[{begin:"<%",end:"%>",subLanguage:"vbscript"}]})})()
 ;export default hljsGrammar;
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/vbscript.min.js b/vendor/assets/javascripts/highlightjs/es/languages/vbscript.min.js
index d4b2ca90eb9..4ddf826a2f9 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/vbscript.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/vbscript.min.js
@@ -1,4 +1,4 @@
-/*! `vbscript` grammar compiled for Highlight.js 11.6.0 */
+/*! `vbscript` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const t=e.regex,r=["lcase","month","vartype","instrrev","ubound","setlocale","getobject","rgb","getref","string","weekdayname","rnd","dateadd","monthname","now","day","minute","isarray","cbool","round","formatcurrency","conversions","csng","timevalue","second","year","space","abs","clng","timeserial","fixs","len","asc","isempty","maths","dateserial","atn","timer","isobject","filter","weekday","datevalue","ccur","isdate","instr","datediff","formatdatetime","replace","isnull","right","sgn","array","snumeric","log","cdbl","hex","chr","lbound","msgbox","ucase","getlocale","cos","cdate","cbyte","rtrim","join","hour","oct","typename","trim","strcomp","int","createobject","loadpicture","tan","formatnumber","mid","split","cint","sin","datepart","ltrim","sqr","time","derived","eval","date","formatpercent","exp","inputbox","left","ascw","chrw","regexp","cstr","err"]
 ;return{name:"VBScript",aliases:["vbs"],case_insensitive:!0,keywords:{
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/verilog.min.js b/vendor/assets/javascripts/highlightjs/es/languages/verilog.min.js
index 15b33c8e5c1..be835a82986 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/verilog.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/verilog.min.js
@@ -1,4 +1,4 @@
-/*! `verilog` grammar compiled for Highlight.js 11.6.0 */
+/*! `verilog` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const n=e.regex,t=["begin_keywords","celldefine","default_nettype","default_decay_time","default_trireg_strength","define","delay_mode_distributed","delay_mode_path","delay_mode_unit","delay_mode_zero","else","elsif","end_keywords","endcelldefine","endif","ifdef","ifndef","include","line","nounconnected_drive","pragma","resetall","timescale","unconnected_drive","undef","undefineall"]
 ;return{name:"Verilog",aliases:["v","sv","svh"],case_insensitive:!1,keywords:{
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/vhdl.min.js b/vendor/assets/javascripts/highlightjs/es/languages/vhdl.min.js
index b8d85e15575..e7e841c1c6e 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/vhdl.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/vhdl.min.js
@@ -1,14 +1,13 @@
-/*! `vhdl` grammar compiled for Highlight.js 11.6.0 */
-var hljsGrammar=(()=>{"use strict";return e=>({name:"VHDL",case_insensitive:!0,
-keywords:{
+/*! `vhdl` grammar compiled for Highlight.js 11.8.0 */
+var hljsGrammar=(()=>{"use strict";return e=>{
+const r="\\d(_|\\d)*",t="[eE][-+]?"+r,n="\\b("+r+"#\\w+(\\.\\w+)?#("+t+")?|"+r+"(\\."+r+")?("+t+")?)"
+;return{name:"VHDL",case_insensitive:!0,keywords:{
 keyword:["abs","access","after","alias","all","and","architecture","array","assert","assume","assume_guarantee","attribute","begin","block","body","buffer","bus","case","component","configuration","constant","context","cover","disconnect","downto","default","else","elsif","end","entity","exit","fairness","file","for","force","function","generate","generic","group","guarded","if","impure","in","inertial","inout","is","label","library","linkage","literal","loop","map","mod","nand","new","next","nor","not","null","of","on","open","or","others","out","package","parameter","port","postponed","procedure","process","property","protected","pure","range","record","register","reject","release","rem","report","restrict","restrict_guarantee","return","rol","ror","select","sequence","severity","shared","signal","sla","sll","sra","srl","strong","subtype","then","to","transport","type","unaffected","units","until","use","variable","view","vmode","vprop","vunit","wait","when","while","with","xnor","xor"],
 built_in:["boolean","bit","character","integer","time","delay_length","natural","positive","string","bit_vector","file_open_kind","file_open_status","std_logic","std_logic_vector","unsigned","signed","boolean_vector","integer_vector","std_ulogic","std_ulogic_vector","unresolved_unsigned","u_unsigned","unresolved_signed","u_signed","real_vector","time_vector"],
 literal:["false","true","note","warning","error","failure","line","text","side","width"]
 },illegal:/\{/,
 contains:[e.C_BLOCK_COMMENT_MODE,e.COMMENT("--","$"),e.QUOTE_STRING_MODE,{
-className:"number",
-begin:"\\b(\\d(_|\\d)*#\\w+(\\.\\w+)?#([eE][-+]?\\d(_|\\d)*)?|\\d(_|\\d)*(\\.\\d(_|\\d)*)?([eE][-+]?\\d(_|\\d)*)?)",
-relevance:0},{className:"string",begin:"'(U|X|0|1|Z|W|L|H|-)'",
-contains:[e.BACKSLASH_ESCAPE]},{className:"symbol",
-begin:"'[A-Za-z](_?[A-Za-z0-9])*",contains:[e.BACKSLASH_ESCAPE]}]})})()
-;export default hljsGrammar;
\ No newline at end of file
+className:"number",begin:n,relevance:0},{className:"string",
+begin:"'(U|X|0|1|Z|W|L|H|-)'",contains:[e.BACKSLASH_ESCAPE]},{
+className:"symbol",begin:"'[A-Za-z](_?[A-Za-z0-9])*",
+contains:[e.BACKSLASH_ESCAPE]}]}}})();export default hljsGrammar;
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/vim.min.js b/vendor/assets/javascripts/highlightjs/es/languages/vim.min.js
index 0ce0c1f97a6..ad7ee6e5c50 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/vim.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/vim.min.js
@@ -1,4 +1,4 @@
-/*! `vim` grammar compiled for Highlight.js 11.6.0 */
+/*! `vim` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"Vim Script",keywords:{
 $pattern:/[!#@\w]+/,
 keyword:"N|0 P|0 X|0 a|0 ab abc abo al am an|0 ar arga argd arge argdo argg argl argu as au aug aun b|0 bN ba bad bd be bel bf bl bm bn bo bp br brea breaka breakd breakl bro bufdo buffers bun bw c|0 cN cNf ca cabc caddb cad caddf cal cat cb cc ccl cd ce cex cf cfir cgetb cgete cg changes chd che checkt cl cla clo cm cmapc cme cn cnew cnf cno cnorea cnoreme co col colo com comc comp con conf cope cp cpf cq cr cs cst cu cuna cunme cw delm deb debugg delc delf dif diffg diffo diffp diffpu diffs diffthis dig di dl dell dj dli do doautoa dp dr ds dsp e|0 ea ec echoe echoh echom echon el elsei em en endfo endf endt endw ene ex exe exi exu f|0 files filet fin fina fini fir fix fo foldc foldd folddoc foldo for fu go gr grepa gu gv ha helpf helpg helpt hi hid his ia iabc if ij il im imapc ime ino inorea inoreme int is isp iu iuna iunme j|0 ju k|0 keepa kee keepj lN lNf l|0 lad laddb laddf la lan lat lb lc lch lcl lcs le lefta let lex lf lfir lgetb lgete lg lgr lgrepa lh ll lla lli lmak lm lmapc lne lnew lnf ln loadk lo loc lockv lol lope lp lpf lr ls lt lu lua luad luaf lv lvimgrepa lw m|0 ma mak map mapc marks mat me menut mes mk mks mksp mkv mkvie mod mz mzf nbc nb nbs new nm nmapc nme nn nnoreme noa no noh norea noreme norm nu nun nunme ol o|0 om omapc ome on ono onoreme opt ou ounme ow p|0 profd prof pro promptr pc ped pe perld po popu pp pre prev ps pt ptN ptf ptj ptl ptn ptp ptr pts pu pw py3 python3 py3d py3f py pyd pyf quita qa rec red redi redr redraws reg res ret retu rew ri rightb rub rubyd rubyf rund ru rv sN san sa sal sav sb sbN sba sbf sbl sbm sbn sbp sbr scrip scripte scs se setf setg setl sf sfir sh sim sig sil sl sla sm smap smapc sme sn sni sno snor snoreme sor so spelld spe spelli spellr spellu spellw sp spr sre st sta startg startr star stopi stj sts sun sunm sunme sus sv sw sy synti sync tN tabN tabc tabdo tabe tabf tabfir tabl tabm tabnew tabn tabo tabp tabr tabs tab ta tags tc tcld tclf te tf th tj tl tm tn to tp tr try ts tu u|0 undoj undol una unh unl unlo unm unme uns up ve verb vert vim vimgrepa vi viu vie vm vmapc vme vne vn vnoreme vs vu vunme windo w|0 wN wa wh wi winc winp wn wp wq wqa ws wu wv x|0 xa xmapc xm xme xn xnoreme xu xunme y|0 z|0 ~ Next Print append abbreviate abclear aboveleft all amenu anoremenu args argadd argdelete argedit argglobal arglocal argument ascii autocmd augroup aunmenu buffer bNext ball badd bdelete behave belowright bfirst blast bmodified bnext botright bprevious brewind break breakadd breakdel breaklist browse bunload bwipeout change cNext cNfile cabbrev cabclear caddbuffer caddexpr caddfile call catch cbuffer cclose center cexpr cfile cfirst cgetbuffer cgetexpr cgetfile chdir checkpath checktime clist clast close cmap cmapclear cmenu cnext cnewer cnfile cnoremap cnoreabbrev cnoremenu copy colder colorscheme command comclear compiler continue confirm copen cprevious cpfile cquit crewind cscope cstag cunmap cunabbrev cunmenu cwindow delete delmarks debug debuggreedy delcommand delfunction diffupdate diffget diffoff diffpatch diffput diffsplit digraphs display deletel djump dlist doautocmd doautoall deletep drop dsearch dsplit edit earlier echo echoerr echohl echomsg else elseif emenu endif endfor endfunction endtry endwhile enew execute exit exusage file filetype find finally finish first fixdel fold foldclose folddoopen folddoclosed foldopen function global goto grep grepadd gui gvim hardcopy help helpfind helpgrep helptags highlight hide history insert iabbrev iabclear ijump ilist imap imapclear imenu inoremap inoreabbrev inoremenu intro isearch isplit iunmap iunabbrev iunmenu join jumps keepalt keepmarks keepjumps lNext lNfile list laddexpr laddbuffer laddfile last language later lbuffer lcd lchdir lclose lcscope left leftabove lexpr lfile lfirst lgetbuffer lgetexpr lgetfile lgrep lgrepadd lhelpgrep llast llist lmake lmap lmapclear lnext lnewer lnfile lnoremap loadkeymap loadview lockmarks lockvar lolder lopen lprevious lpfile lrewind ltag lunmap luado luafile lvimgrep lvimgrepadd lwindow move mark make mapclear match menu menutranslate messages mkexrc mksession mkspell mkvimrc mkview mode mzscheme mzfile nbclose nbkey nbsart next nmap nmapclear nmenu nnoremap nnoremenu noautocmd noremap nohlsearch noreabbrev noremenu normal number nunmap nunmenu oldfiles open omap omapclear omenu only onoremap onoremenu options ounmap ounmenu ownsyntax print profdel profile promptfind promptrepl pclose pedit perl perldo pop popup ppop preserve previous psearch ptag ptNext ptfirst ptjump ptlast ptnext ptprevious ptrewind ptselect put pwd py3do py3file python pydo pyfile quit quitall qall read recover redo redir redraw redrawstatus registers resize retab return rewind right rightbelow ruby rubydo rubyfile rundo runtime rviminfo substitute sNext sandbox sargument sall saveas sbuffer sbNext sball sbfirst sblast sbmodified sbnext sbprevious sbrewind scriptnames scriptencoding scscope set setfiletype setglobal setlocal sfind sfirst shell simalt sign silent sleep slast smagic smapclear smenu snext sniff snomagic snoremap snoremenu sort source spelldump spellgood spellinfo spellrepall spellundo spellwrong split sprevious srewind stop stag startgreplace startreplace startinsert stopinsert stjump stselect sunhide sunmap sunmenu suspend sview swapname syntax syntime syncbind tNext tabNext tabclose tabedit tabfind tabfirst tablast tabmove tabnext tabonly tabprevious tabrewind tag tcl tcldo tclfile tearoff tfirst throw tjump tlast tmenu tnext topleft tprevious trewind tselect tunmenu undo undojoin undolist unabbreviate unhide unlet unlockvar unmap unmenu unsilent update vglobal version verbose vertical vimgrep vimgrepadd visual viusage view vmap vmapclear vmenu vnew vnoremap vnoremenu vsplit vunmap vunmenu write wNext wall while winsize wincmd winpos wnext wprevious wqall wsverb wundo wviminfo xit xall xmapclear xmap xmenu xnoremap xnoremenu xunmap xunmenu yank",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/wasm.min.js b/vendor/assets/javascripts/highlightjs/es/languages/wasm.min.js
index b815dcea1a3..dbc44bf09f6 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/wasm.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/wasm.min.js
@@ -1,4 +1,4 @@
-/*! `wasm` grammar compiled for Highlight.js 11.6.0 */
+/*! `wasm` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{e.regex
 ;const a=e.COMMENT(/\(;/,/;\)/);return a.contains.push("self"),{
 name:"WebAssembly",keywords:{$pattern:/[\w.]+/,
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/wren.min.js b/vendor/assets/javascripts/highlightjs/es/languages/wren.min.js
index 30c7e693659..3ddac222ea4 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/wren.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/wren.min.js
@@ -1,4 +1,4 @@
-/*! `wren` grammar compiled for Highlight.js 11.6.0 */
+/*! `wren` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const a=e.regex,s=/[a-zA-Z]\w*/,t=["as","break","class","construct","continue","else","for","foreign","if","import","in","is","return","static","var","while"],c=["true","false","null"],n=["this","super"],r=["-","~",/\*/,"%",/\.\.\./,/\.\./,/\+/,"<<",">>",">=","<=","<",">",/\^/,/!=/,/!/,/\bis\b/,"==","&&","&",/\|\|/,/\|/,/\?:/,"="],i={
 relevance:0,match:a.concat(/\b(?!(if|while|for|else|super)\b)/,s,/(?=\s*[({])/),
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/x86asm.min.js b/vendor/assets/javascripts/highlightjs/es/languages/x86asm.min.js
index 51275257908..20cc08f3f74 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/x86asm.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/x86asm.min.js
@@ -1,4 +1,4 @@
-/*! `x86asm` grammar compiled for Highlight.js 11.6.0 */
+/*! `x86asm` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return s=>({name:"Intel x86 Assembly",
 case_insensitive:!0,keywords:{$pattern:"[.%]?"+s.IDENT_RE,
 keyword:"lock rep repe repz repne repnz xaquire xrelease bnd nobnd aaa aad aam aas adc add and arpl bb0_reset bb1_reset bound bsf bsr bswap bt btc btr bts call cbw cdq cdqe clc cld cli clts cmc cmp cmpsb cmpsd cmpsq cmpsw cmpxchg cmpxchg486 cmpxchg8b cmpxchg16b cpuid cpu_read cpu_write cqo cwd cwde daa das dec div dmint emms enter equ f2xm1 fabs fadd faddp fbld fbstp fchs fclex fcmovb fcmovbe fcmove fcmovnb fcmovnbe fcmovne fcmovnu fcmovu fcom fcomi fcomip fcomp fcompp fcos fdecstp fdisi fdiv fdivp fdivr fdivrp femms feni ffree ffreep fiadd ficom ficomp fidiv fidivr fild fimul fincstp finit fist fistp fisttp fisub fisubr fld fld1 fldcw fldenv fldl2e fldl2t fldlg2 fldln2 fldpi fldz fmul fmulp fnclex fndisi fneni fninit fnop fnsave fnstcw fnstenv fnstsw fpatan fprem fprem1 fptan frndint frstor fsave fscale fsetpm fsin fsincos fsqrt fst fstcw fstenv fstp fstsw fsub fsubp fsubr fsubrp ftst fucom fucomi fucomip fucomp fucompp fxam fxch fxtract fyl2x fyl2xp1 hlt ibts icebp idiv imul in inc incbin insb insd insw int int01 int1 int03 int3 into invd invpcid invlpg invlpga iret iretd iretq iretw jcxz jecxz jrcxz jmp jmpe lahf lar lds lea leave les lfence lfs lgdt lgs lidt lldt lmsw loadall loadall286 lodsb lodsd lodsq lodsw loop loope loopne loopnz loopz lsl lss ltr mfence monitor mov movd movq movsb movsd movsq movsw movsx movsxd movzx mul mwait neg nop not or out outsb outsd outsw packssdw packsswb packuswb paddb paddd paddsb paddsiw paddsw paddusb paddusw paddw pand pandn pause paveb pavgusb pcmpeqb pcmpeqd pcmpeqw pcmpgtb pcmpgtd pcmpgtw pdistib pf2id pfacc pfadd pfcmpeq pfcmpge pfcmpgt pfmax pfmin pfmul pfrcp pfrcpit1 pfrcpit2 pfrsqit1 pfrsqrt pfsub pfsubr pi2fd pmachriw pmaddwd pmagw pmulhriw pmulhrwa pmulhrwc pmulhw pmullw pmvgezb pmvlzb pmvnzb pmvzb pop popa popad popaw popf popfd popfq popfw por prefetch prefetchw pslld psllq psllw psrad psraw psrld psrlq psrlw psubb psubd psubsb psubsiw psubsw psubusb psubusw psubw punpckhbw punpckhdq punpckhwd punpcklbw punpckldq punpcklwd push pusha pushad pushaw pushf pushfd pushfq pushfw pxor rcl rcr rdshr rdmsr rdpmc rdtsc rdtscp ret retf retn rol ror rdm rsdc rsldt rsm rsts sahf sal salc sar sbb scasb scasd scasq scasw sfence sgdt shl shld shr shrd sidt sldt skinit smi smint smintold smsw stc std sti stosb stosd stosq stosw str sub svdc svldt svts swapgs syscall sysenter sysexit sysret test ud0 ud1 ud2b ud2 ud2a umov verr verw fwait wbinvd wrshr wrmsr xadd xbts xchg xlatb xlat xor cmove cmovz cmovne cmovnz cmova cmovnbe cmovae cmovnb cmovb cmovnae cmovbe cmovna cmovg cmovnle cmovge cmovnl cmovl cmovnge cmovle cmovng cmovc cmovnc cmovo cmovno cmovs cmovns cmovp cmovpe cmovnp cmovpo je jz jne jnz ja jnbe jae jnb jb jnae jbe jna jg jnle jge jnl jl jnge jle jng jc jnc jo jno js jns jpo jnp jpe jp sete setz setne setnz seta setnbe setae setnb setnc setb setnae setcset setbe setna setg setnle setge setnl setl setnge setle setng sets setns seto setno setpe setp setpo setnp addps addss andnps andps cmpeqps cmpeqss cmpleps cmpless cmpltps cmpltss cmpneqps cmpneqss cmpnleps cmpnless cmpnltps cmpnltss cmpordps cmpordss cmpunordps cmpunordss cmpps cmpss comiss cvtpi2ps cvtps2pi cvtsi2ss cvtss2si cvttps2pi cvttss2si divps divss ldmxcsr maxps maxss minps minss movaps movhps movlhps movlps movhlps movmskps movntps movss movups mulps mulss orps rcpps rcpss rsqrtps rsqrtss shufps sqrtps sqrtss stmxcsr subps subss ucomiss unpckhps unpcklps xorps fxrstor fxrstor64 fxsave fxsave64 xgetbv xsetbv xsave xsave64 xsaveopt xsaveopt64 xrstor xrstor64 prefetchnta prefetcht0 prefetcht1 prefetcht2 maskmovq movntq pavgb pavgw pextrw pinsrw pmaxsw pmaxub pminsw pminub pmovmskb pmulhuw psadbw pshufw pf2iw pfnacc pfpnacc pi2fw pswapd maskmovdqu clflush movntdq movnti movntpd movdqa movdqu movdq2q movq2dq paddq pmuludq pshufd pshufhw pshuflw pslldq psrldq psubq punpckhqdq punpcklqdq addpd addsd andnpd andpd cmpeqpd cmpeqsd cmplepd cmplesd cmpltpd cmpltsd cmpneqpd cmpneqsd cmpnlepd cmpnlesd cmpnltpd cmpnltsd cmpordpd cmpordsd cmpunordpd cmpunordsd cmppd comisd cvtdq2pd cvtdq2ps cvtpd2dq cvtpd2pi cvtpd2ps cvtpi2pd cvtps2dq cvtps2pd cvtsd2si cvtsd2ss cvtsi2sd cvtss2sd cvttpd2pi cvttpd2dq cvttps2dq cvttsd2si divpd divsd maxpd maxsd minpd minsd movapd movhpd movlpd movmskpd movupd mulpd mulsd orpd shufpd sqrtpd sqrtsd subpd subsd ucomisd unpckhpd unpcklpd xorpd addsubpd addsubps haddpd haddps hsubpd hsubps lddqu movddup movshdup movsldup clgi stgi vmcall vmclear vmfunc vmlaunch vmload vmmcall vmptrld vmptrst vmread vmresume vmrun vmsave vmwrite vmxoff vmxon invept invvpid pabsb pabsw pabsd palignr phaddw phaddd phaddsw phsubw phsubd phsubsw pmaddubsw pmulhrsw pshufb psignb psignw psignd extrq insertq movntsd movntss lzcnt blendpd blendps blendvpd blendvps dppd dpps extractps insertps movntdqa mpsadbw packusdw pblendvb pblendw pcmpeqq pextrb pextrd pextrq phminposuw pinsrb pinsrd pinsrq pmaxsb pmaxsd pmaxud pmaxuw pminsb pminsd pminud pminuw pmovsxbw pmovsxbd pmovsxbq pmovsxwd pmovsxwq pmovsxdq pmovzxbw pmovzxbd pmovzxbq pmovzxwd pmovzxwq pmovzxdq pmuldq pmulld ptest roundpd roundps roundsd roundss crc32 pcmpestri pcmpestrm pcmpistri pcmpistrm pcmpgtq popcnt getsec pfrcpv pfrsqrtv movbe aesenc aesenclast aesdec aesdeclast aesimc aeskeygenassist vaesenc vaesenclast vaesdec vaesdeclast vaesimc vaeskeygenassist vaddpd vaddps vaddsd vaddss vaddsubpd vaddsubps vandpd vandps vandnpd vandnps vblendpd vblendps vblendvpd vblendvps vbroadcastss vbroadcastsd vbroadcastf128 vcmpeq_ospd vcmpeqpd vcmplt_ospd vcmpltpd vcmple_ospd vcmplepd vcmpunord_qpd vcmpunordpd vcmpneq_uqpd vcmpneqpd vcmpnlt_uspd vcmpnltpd vcmpnle_uspd vcmpnlepd vcmpord_qpd vcmpordpd vcmpeq_uqpd vcmpnge_uspd vcmpngepd vcmpngt_uspd vcmpngtpd vcmpfalse_oqpd vcmpfalsepd vcmpneq_oqpd vcmpge_ospd vcmpgepd vcmpgt_ospd vcmpgtpd vcmptrue_uqpd vcmptruepd vcmplt_oqpd vcmple_oqpd vcmpunord_spd vcmpneq_uspd vcmpnlt_uqpd vcmpnle_uqpd vcmpord_spd vcmpeq_uspd vcmpnge_uqpd vcmpngt_uqpd vcmpfalse_ospd vcmpneq_ospd vcmpge_oqpd vcmpgt_oqpd vcmptrue_uspd vcmppd vcmpeq_osps vcmpeqps vcmplt_osps vcmpltps vcmple_osps vcmpleps vcmpunord_qps vcmpunordps vcmpneq_uqps vcmpneqps vcmpnlt_usps vcmpnltps vcmpnle_usps vcmpnleps vcmpord_qps vcmpordps vcmpeq_uqps vcmpnge_usps vcmpngeps vcmpngt_usps vcmpngtps vcmpfalse_oqps vcmpfalseps vcmpneq_oqps vcmpge_osps vcmpgeps vcmpgt_osps vcmpgtps vcmptrue_uqps vcmptrueps vcmplt_oqps vcmple_oqps vcmpunord_sps vcmpneq_usps vcmpnlt_uqps vcmpnle_uqps vcmpord_sps vcmpeq_usps vcmpnge_uqps vcmpngt_uqps vcmpfalse_osps vcmpneq_osps vcmpge_oqps vcmpgt_oqps vcmptrue_usps vcmpps vcmpeq_ossd vcmpeqsd vcmplt_ossd vcmpltsd vcmple_ossd vcmplesd vcmpunord_qsd vcmpunordsd vcmpneq_uqsd vcmpneqsd vcmpnlt_ussd vcmpnltsd vcmpnle_ussd vcmpnlesd vcmpord_qsd vcmpordsd vcmpeq_uqsd vcmpnge_ussd vcmpngesd vcmpngt_ussd vcmpngtsd vcmpfalse_oqsd vcmpfalsesd vcmpneq_oqsd vcmpge_ossd vcmpgesd vcmpgt_ossd vcmpgtsd vcmptrue_uqsd vcmptruesd vcmplt_oqsd vcmple_oqsd vcmpunord_ssd vcmpneq_ussd vcmpnlt_uqsd vcmpnle_uqsd vcmpord_ssd vcmpeq_ussd vcmpnge_uqsd vcmpngt_uqsd vcmpfalse_ossd vcmpneq_ossd vcmpge_oqsd vcmpgt_oqsd vcmptrue_ussd vcmpsd vcmpeq_osss vcmpeqss vcmplt_osss vcmpltss vcmple_osss vcmpless vcmpunord_qss vcmpunordss vcmpneq_uqss vcmpneqss vcmpnlt_usss vcmpnltss vcmpnle_usss vcmpnless vcmpord_qss vcmpordss vcmpeq_uqss vcmpnge_usss vcmpngess vcmpngt_usss vcmpngtss vcmpfalse_oqss vcmpfalsess vcmpneq_oqss vcmpge_osss vcmpgess vcmpgt_osss vcmpgtss vcmptrue_uqss vcmptruess vcmplt_oqss vcmple_oqss vcmpunord_sss vcmpneq_usss vcmpnlt_uqss vcmpnle_uqss vcmpord_sss vcmpeq_usss vcmpnge_uqss vcmpngt_uqss vcmpfalse_osss vcmpneq_osss vcmpge_oqss vcmpgt_oqss vcmptrue_usss vcmpss vcomisd vcomiss vcvtdq2pd vcvtdq2ps vcvtpd2dq vcvtpd2ps vcvtps2dq vcvtps2pd vcvtsd2si vcvtsd2ss vcvtsi2sd vcvtsi2ss vcvtss2sd vcvtss2si vcvttpd2dq vcvttps2dq vcvttsd2si vcvttss2si vdivpd vdivps vdivsd vdivss vdppd vdpps vextractf128 vextractps vhaddpd vhaddps vhsubpd vhsubps vinsertf128 vinsertps vlddqu vldqqu vldmxcsr vmaskmovdqu vmaskmovps vmaskmovpd vmaxpd vmaxps vmaxsd vmaxss vminpd vminps vminsd vminss vmovapd vmovaps vmovd vmovq vmovddup vmovdqa vmovqqa vmovdqu vmovqqu vmovhlps vmovhpd vmovhps vmovlhps vmovlpd vmovlps vmovmskpd vmovmskps vmovntdq vmovntqq vmovntdqa vmovntpd vmovntps vmovsd vmovshdup vmovsldup vmovss vmovupd vmovups vmpsadbw vmulpd vmulps vmulsd vmulss vorpd vorps vpabsb vpabsw vpabsd vpacksswb vpackssdw vpackuswb vpackusdw vpaddb vpaddw vpaddd vpaddq vpaddsb vpaddsw vpaddusb vpaddusw vpalignr vpand vpandn vpavgb vpavgw vpblendvb vpblendw vpcmpestri vpcmpestrm vpcmpistri vpcmpistrm vpcmpeqb vpcmpeqw vpcmpeqd vpcmpeqq vpcmpgtb vpcmpgtw vpcmpgtd vpcmpgtq vpermilpd vpermilps vperm2f128 vpextrb vpextrw vpextrd vpextrq vphaddw vphaddd vphaddsw vphminposuw vphsubw vphsubd vphsubsw vpinsrb vpinsrw vpinsrd vpinsrq vpmaddwd vpmaddubsw vpmaxsb vpmaxsw vpmaxsd vpmaxub vpmaxuw vpmaxud vpminsb vpminsw vpminsd vpminub vpminuw vpminud vpmovmskb vpmovsxbw vpmovsxbd vpmovsxbq vpmovsxwd vpmovsxwq vpmovsxdq vpmovzxbw vpmovzxbd vpmovzxbq vpmovzxwd vpmovzxwq vpmovzxdq vpmulhuw vpmulhrsw vpmulhw vpmullw vpmulld vpmuludq vpmuldq vpor vpsadbw vpshufb vpshufd vpshufhw vpshuflw vpsignb vpsignw vpsignd vpslldq vpsrldq vpsllw vpslld vpsllq vpsraw vpsrad vpsrlw vpsrld vpsrlq vptest vpsubb vpsubw vpsubd vpsubq vpsubsb vpsubsw vpsubusb vpsubusw vpunpckhbw vpunpckhwd vpunpckhdq vpunpckhqdq vpunpcklbw vpunpcklwd vpunpckldq vpunpcklqdq vpxor vrcpps vrcpss vrsqrtps vrsqrtss vroundpd vroundps vroundsd vroundss vshufpd vshufps vsqrtpd vsqrtps vsqrtsd vsqrtss vstmxcsr vsubpd vsubps vsubsd vsubss vtestps vtestpd vucomisd vucomiss vunpckhpd vunpckhps vunpcklpd vunpcklps vxorpd vxorps vzeroall vzeroupper pclmullqlqdq pclmulhqlqdq pclmullqhqdq pclmulhqhqdq pclmulqdq vpclmullqlqdq vpclmulhqlqdq vpclmullqhqdq vpclmulhqhqdq vpclmulqdq vfmadd132ps vfmadd132pd vfmadd312ps vfmadd312pd vfmadd213ps vfmadd213pd vfmadd123ps vfmadd123pd vfmadd231ps vfmadd231pd vfmadd321ps vfmadd321pd vfmaddsub132ps vfmaddsub132pd vfmaddsub312ps vfmaddsub312pd vfmaddsub213ps vfmaddsub213pd vfmaddsub123ps vfmaddsub123pd vfmaddsub231ps vfmaddsub231pd vfmaddsub321ps vfmaddsub321pd vfmsub132ps vfmsub132pd vfmsub312ps vfmsub312pd vfmsub213ps vfmsub213pd vfmsub123ps vfmsub123pd vfmsub231ps vfmsub231pd vfmsub321ps vfmsub321pd vfmsubadd132ps vfmsubadd132pd vfmsubadd312ps vfmsubadd312pd vfmsubadd213ps vfmsubadd213pd vfmsubadd123ps vfmsubadd123pd vfmsubadd231ps vfmsubadd231pd vfmsubadd321ps vfmsubadd321pd vfnmadd132ps vfnmadd132pd vfnmadd312ps vfnmadd312pd vfnmadd213ps vfnmadd213pd vfnmadd123ps vfnmadd123pd vfnmadd231ps vfnmadd231pd vfnmadd321ps vfnmadd321pd vfnmsub132ps vfnmsub132pd vfnmsub312ps vfnmsub312pd vfnmsub213ps vfnmsub213pd vfnmsub123ps vfnmsub123pd vfnmsub231ps vfnmsub231pd vfnmsub321ps vfnmsub321pd vfmadd132ss vfmadd132sd vfmadd312ss vfmadd312sd vfmadd213ss vfmadd213sd vfmadd123ss vfmadd123sd vfmadd231ss vfmadd231sd vfmadd321ss vfmadd321sd vfmsub132ss vfmsub132sd vfmsub312ss vfmsub312sd vfmsub213ss vfmsub213sd vfmsub123ss vfmsub123sd vfmsub231ss vfmsub231sd vfmsub321ss vfmsub321sd vfnmadd132ss vfnmadd132sd vfnmadd312ss vfnmadd312sd vfnmadd213ss vfnmadd213sd vfnmadd123ss vfnmadd123sd vfnmadd231ss vfnmadd231sd vfnmadd321ss vfnmadd321sd vfnmsub132ss vfnmsub132sd vfnmsub312ss vfnmsub312sd vfnmsub213ss vfnmsub213sd vfnmsub123ss vfnmsub123sd vfnmsub231ss vfnmsub231sd vfnmsub321ss vfnmsub321sd rdfsbase rdgsbase rdrand wrfsbase wrgsbase vcvtph2ps vcvtps2ph adcx adox rdseed clac stac xstore xcryptecb xcryptcbc xcryptctr xcryptcfb xcryptofb montmul xsha1 xsha256 llwpcb slwpcb lwpval lwpins vfmaddpd vfmaddps vfmaddsd vfmaddss vfmaddsubpd vfmaddsubps vfmsubaddpd vfmsubaddps vfmsubpd vfmsubps vfmsubsd vfmsubss vfnmaddpd vfnmaddps vfnmaddsd vfnmaddss vfnmsubpd vfnmsubps vfnmsubsd vfnmsubss vfrczpd vfrczps vfrczsd vfrczss vpcmov vpcomb vpcomd vpcomq vpcomub vpcomud vpcomuq vpcomuw vpcomw vphaddbd vphaddbq vphaddbw vphadddq vphaddubd vphaddubq vphaddubw vphaddudq vphadduwd vphadduwq vphaddwd vphaddwq vphsubbw vphsubdq vphsubwd vpmacsdd vpmacsdqh vpmacsdql vpmacssdd vpmacssdqh vpmacssdql vpmacsswd vpmacssww vpmacswd vpmacsww vpmadcsswd vpmadcswd vpperm vprotb vprotd vprotq vprotw vpshab vpshad vpshaq vpshaw vpshlb vpshld vpshlq vpshlw vbroadcasti128 vpblendd vpbroadcastb vpbroadcastw vpbroadcastd vpbroadcastq vpermd vpermpd vpermps vpermq vperm2i128 vextracti128 vinserti128 vpmaskmovd vpmaskmovq vpsllvd vpsllvq vpsravd vpsrlvd vpsrlvq vgatherdpd vgatherqpd vgatherdps vgatherqps vpgatherdd vpgatherqd vpgatherdq vpgatherqq xabort xbegin xend xtest andn bextr blci blcic blsi blsic blcfill blsfill blcmsk blsmsk blsr blcs bzhi mulx pdep pext rorx sarx shlx shrx tzcnt tzmsk t1mskc valignd valignq vblendmpd vblendmps vbroadcastf32x4 vbroadcastf64x4 vbroadcasti32x4 vbroadcasti64x4 vcompresspd vcompressps vcvtpd2udq vcvtps2udq vcvtsd2usi vcvtss2usi vcvttpd2udq vcvttps2udq vcvttsd2usi vcvttss2usi vcvtudq2pd vcvtudq2ps vcvtusi2sd vcvtusi2ss vexpandpd vexpandps vextractf32x4 vextractf64x4 vextracti32x4 vextracti64x4 vfixupimmpd vfixupimmps vfixupimmsd vfixupimmss vgetexppd vgetexpps vgetexpsd vgetexpss vgetmantpd vgetmantps vgetmantsd vgetmantss vinsertf32x4 vinsertf64x4 vinserti32x4 vinserti64x4 vmovdqa32 vmovdqa64 vmovdqu32 vmovdqu64 vpabsq vpandd vpandnd vpandnq vpandq vpblendmd vpblendmq vpcmpltd vpcmpled vpcmpneqd vpcmpnltd vpcmpnled vpcmpd vpcmpltq vpcmpleq vpcmpneqq vpcmpnltq vpcmpnleq vpcmpq vpcmpequd vpcmpltud vpcmpleud vpcmpnequd vpcmpnltud vpcmpnleud vpcmpud vpcmpequq vpcmpltuq vpcmpleuq vpcmpnequq vpcmpnltuq vpcmpnleuq vpcmpuq vpcompressd vpcompressq vpermi2d vpermi2pd vpermi2ps vpermi2q vpermt2d vpermt2pd vpermt2ps vpermt2q vpexpandd vpexpandq vpmaxsq vpmaxuq vpminsq vpminuq vpmovdb vpmovdw vpmovqb vpmovqd vpmovqw vpmovsdb vpmovsdw vpmovsqb vpmovsqd vpmovsqw vpmovusdb vpmovusdw vpmovusqb vpmovusqd vpmovusqw vpord vporq vprold vprolq vprolvd vprolvq vprord vprorq vprorvd vprorvq vpscatterdd vpscatterdq vpscatterqd vpscatterqq vpsraq vpsravq vpternlogd vpternlogq vptestmd vptestmq vptestnmd vptestnmq vpxord vpxorq vrcp14pd vrcp14ps vrcp14sd vrcp14ss vrndscalepd vrndscaleps vrndscalesd vrndscaless vrsqrt14pd vrsqrt14ps vrsqrt14sd vrsqrt14ss vscalefpd vscalefps vscalefsd vscalefss vscatterdpd vscatterdps vscatterqpd vscatterqps vshuff32x4 vshuff64x2 vshufi32x4 vshufi64x2 kandnw kandw kmovw knotw kortestw korw kshiftlw kshiftrw kunpckbw kxnorw kxorw vpbroadcastmb2q vpbroadcastmw2d vpconflictd vpconflictq vplzcntd vplzcntq vexp2pd vexp2ps vrcp28pd vrcp28ps vrcp28sd vrcp28ss vrsqrt28pd vrsqrt28ps vrsqrt28sd vrsqrt28ss vgatherpf0dpd vgatherpf0dps vgatherpf0qpd vgatherpf0qps vgatherpf1dpd vgatherpf1dps vgatherpf1qpd vgatherpf1qps vscatterpf0dpd vscatterpf0dps vscatterpf0qpd vscatterpf0qps vscatterpf1dpd vscatterpf1dps vscatterpf1qpd vscatterpf1qps prefetchwt1 bndmk bndcl bndcu bndcn bndmov bndldx bndstx sha1rnds4 sha1nexte sha1msg1 sha1msg2 sha256rnds2 sha256msg1 sha256msg2 hint_nop0 hint_nop1 hint_nop2 hint_nop3 hint_nop4 hint_nop5 hint_nop6 hint_nop7 hint_nop8 hint_nop9 hint_nop10 hint_nop11 hint_nop12 hint_nop13 hint_nop14 hint_nop15 hint_nop16 hint_nop17 hint_nop18 hint_nop19 hint_nop20 hint_nop21 hint_nop22 hint_nop23 hint_nop24 hint_nop25 hint_nop26 hint_nop27 hint_nop28 hint_nop29 hint_nop30 hint_nop31 hint_nop32 hint_nop33 hint_nop34 hint_nop35 hint_nop36 hint_nop37 hint_nop38 hint_nop39 hint_nop40 hint_nop41 hint_nop42 hint_nop43 hint_nop44 hint_nop45 hint_nop46 hint_nop47 hint_nop48 hint_nop49 hint_nop50 hint_nop51 hint_nop52 hint_nop53 hint_nop54 hint_nop55 hint_nop56 hint_nop57 hint_nop58 hint_nop59 hint_nop60 hint_nop61 hint_nop62 hint_nop63",
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/xl.min.js b/vendor/assets/javascripts/highlightjs/es/languages/xl.min.js
index ee171b9809b..c0089b413b8 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/xl.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/xl.min.js
@@ -1,4 +1,4 @@
-/*! `xl` grammar compiled for Highlight.js 11.6.0 */
+/*! `xl` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const t={
 $pattern:/[a-zA-Z][a-zA-Z0-9_?]*/,
 keyword:["if","then","else","do","while","until","for","loop","import","with","is","as","where","when","by","data","constant","integer","real","text","name","boolean","symbol","infix","prefix","postfix","block","tree"],
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/xml.min.js b/vendor/assets/javascripts/highlightjs/es/languages/xml.min.js
index 2dbbb6e7cb4..46f6e38e674 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/xml.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/xml.min.js
@@ -1,4 +1,4 @@
-/*! `xml` grammar compiled for Highlight.js 11.6.0 */
+/*! `xml` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const a=e.regex,n=a.concat(/[\p{L}_]/u,a.optional(/[\p{L}0-9_.-]*:/u),/[\p{L}0-9_.-]*/u),s={
 className:"symbol",begin:/&[a-z]+;|&#[0-9]+;|&#x[a-f0-9]+;/},t={begin:/\s/,
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/xquery.min.js b/vendor/assets/javascripts/highlightjs/es/languages/xquery.min.js
index d9197abb898..27d32d89216 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/xquery.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/xquery.min.js
@@ -1,4 +1,4 @@
-/*! `xquery` grammar compiled for Highlight.js 11.6.0 */
+/*! `xquery` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>({name:"XQuery",
 aliases:["xpath","xq"],case_insensitive:!1,
 illegal:/(proc)|(abstract)|(extends)|(until)|(#)/,keywords:{
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/yaml.min.js b/vendor/assets/javascripts/highlightjs/es/languages/yaml.min.js
index 6a1d69b5ac6..2add82f1e69 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/yaml.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/yaml.min.js
@@ -1,4 +1,4 @@
-/*! `yaml` grammar compiled for Highlight.js 11.6.0 */
+/*! `yaml` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{
 const n="true false yes no null",a="[\\w#;/?:@&=+$,.~*'()[\\]]+",s={
 className:"string",relevance:0,variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/
diff --git a/vendor/assets/javascripts/highlightjs/es/languages/zephir.min.js b/vendor/assets/javascripts/highlightjs/es/languages/zephir.min.js
index 1e07d66ea5d..8818affb956 100644
--- a/vendor/assets/javascripts/highlightjs/es/languages/zephir.min.js
+++ b/vendor/assets/javascripts/highlightjs/es/languages/zephir.min.js
@@ -1,4 +1,4 @@
-/*! `zephir` grammar compiled for Highlight.js 11.6.0 */
+/*! `zephir` grammar compiled for Highlight.js 11.8.0 */
 var hljsGrammar=(()=>{"use strict";return e=>{const n={className:"string",
 contains:[e.BACKSLASH_ESCAPE],variants:[e.inherit(e.APOS_STRING_MODE,{
 illegal:null}),e.inherit(e.QUOTE_STRING_MODE,{illegal:null})]
diff --git a/vendor/assets/javascripts/highlightjs/highlight-test-bundle.min.js b/vendor/assets/javascripts/highlightjs/highlight-test-bundle.min.js
index 25bd922304d..43482e35e15 100644
--- a/vendor/assets/javascripts/highlightjs/highlight-test-bundle.min.js
+++ b/vendor/assets/javascripts/highlightjs/highlight-test-bundle.min.js
@@ -1195,149 +1195,4 @@ begin:"\\b[0-9]{4}(-[0-9][0-9]){0,2}([Tt \\t][0-9][0-9]?(:[0-9][0-9]){2})?(\\.[0
 aliases:["yml"],contains:l}}});const je=ne;for(const e of Object.keys(Ue)){
 const n=e.replace("grmr_","").replace("_","-");je.registerLanguage(n,Ue[e])}
 return je}()
-;"object"==typeof exports&&"undefined"!=typeof module&&(module.exports=hljs);
-/*! `javascript` grammar compiled for Highlight.js 11.6.0 */
-(()=>{var e=(()=>{"use strict"
-;const e="[A-Za-z$_][0-9A-Za-z$_]*",n=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],a=["true","false","null","undefined","NaN","Infinity"],t=["Object","Function","Boolean","Symbol","Math","Date","Number","BigInt","String","RegExp","Array","Float32Array","Float64Array","Int8Array","Uint8Array","Uint8ClampedArray","Int16Array","Int32Array","Uint16Array","Uint32Array","BigInt64Array","BigUint64Array","Set","Map","WeakSet","WeakMap","ArrayBuffer","SharedArrayBuffer","Atomics","DataView","JSON","Promise","Generator","GeneratorFunction","AsyncFunction","Reflect","Proxy","Intl","WebAssembly"],s=["Error","EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"],r=["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],c=["arguments","this","super","console","window","document","localStorage","module","global"],i=[].concat(r,t,s)
-;return o=>{const l=o.regex,b=e,d={begin:/<[A-Za-z0-9\\._:-]+/,
-end:/\/[A-Za-z0-9\\._:-]+>|\/>/,isTrulyOpeningTag:(e,n)=>{
-const a=e[0].length+e.index,t=e.input[a]
-;if("<"===t||","===t)return void n.ignoreMatch();let s
-;">"===t&&(((e,{after:n})=>{const a="</"+e[0].slice(1)
-;return-1!==e.input.indexOf(a,n)})(e,{after:a
-})||n.ignoreMatch()),(s=e.input.substring(a).match(/^\s+extends\s+/))&&0===s.index&&n.ignoreMatch()
-}},g={$pattern:e,keyword:n,literal:a,built_in:i,"variable.language":c
-},u="\\.([0-9](_?[0-9])*)",m="0|[1-9](_?[0-9])*|0[0-7]*[89][0-9]*",E={
-className:"number",variants:[{
-begin:`(\\b(${m})((${u})|\\.)?|(${u}))[eE][+-]?([0-9](_?[0-9])*)\\b`},{
-begin:`\\b(${m})\\b((${u})\\b|\\.)?|(${u})\\b`},{
-begin:"\\b(0|[1-9](_?[0-9])*)n\\b"},{
-begin:"\\b0[xX][0-9a-fA-F](_?[0-9a-fA-F])*n?\\b"},{
-begin:"\\b0[bB][0-1](_?[0-1])*n?\\b"},{begin:"\\b0[oO][0-7](_?[0-7])*n?\\b"},{
-begin:"\\b0[0-7]+n?\\b"}],relevance:0},A={className:"subst",begin:"\\$\\{",
-end:"\\}",keywords:g,contains:[]},y={begin:"html`",end:"",starts:{end:"`",
-returnEnd:!1,contains:[o.BACKSLASH_ESCAPE,A],subLanguage:"xml"}},N={
-begin:"css`",end:"",starts:{end:"`",returnEnd:!1,
-contains:[o.BACKSLASH_ESCAPE,A],subLanguage:"css"}},_={className:"string",
-begin:"`",end:"`",contains:[o.BACKSLASH_ESCAPE,A]},f={className:"comment",
-variants:[o.COMMENT(/\/\*\*(?!\/)/,"\\*/",{relevance:0,contains:[{
-begin:"(?=@[A-Za-z]+)",relevance:0,contains:[{className:"doctag",
-begin:"@[A-Za-z]+"},{className:"type",begin:"\\{",end:"\\}",excludeEnd:!0,
-excludeBegin:!0,relevance:0},{className:"variable",begin:b+"(?=\\s*(-)|$)",
-endsParent:!0,relevance:0},{begin:/(?=[^\n])\s/,relevance:0}]}]
-}),o.C_BLOCK_COMMENT_MODE,o.C_LINE_COMMENT_MODE]
-},h=[o.APOS_STRING_MODE,o.QUOTE_STRING_MODE,y,N,_,E];A.contains=h.concat({
-begin:/\{/,end:/\}/,keywords:g,contains:["self"].concat(h)})
-;const v=[].concat(f,A.contains),p=v.concat([{begin:/\(/,end:/\)/,keywords:g,
-contains:["self"].concat(v)}]),S={className:"params",begin:/\(/,end:/\)/,
-excludeBegin:!0,excludeEnd:!0,keywords:g,contains:p},w={variants:[{
-match:[/class/,/\s+/,b,/\s+/,/extends/,/\s+/,l.concat(b,"(",l.concat(/\./,b),")*")],
-scope:{1:"keyword",3:"title.class",5:"keyword",7:"title.class.inherited"}},{
-match:[/class/,/\s+/,b],scope:{1:"keyword",3:"title.class"}}]},R={relevance:0,
-match:l.either(/\bJSON/,/\b[A-Z][a-z]+([A-Z][a-z]*|\d)*/,/\b[A-Z]{2,}([A-Z][a-z]+|\d)+([A-Z][a-z]*)*/,/\b[A-Z]{2,}[a-z]+([A-Z][a-z]+|\d)*([A-Z][a-z]*)*/),
-className:"title.class",keywords:{_:[...t,...s]}},O={variants:[{
-match:[/function/,/\s+/,b,/(?=\s*\()/]},{match:[/function/,/\s*(?=\()/]}],
-className:{1:"keyword",3:"title.function"},label:"func.def",contains:[S],
-illegal:/%/},k={
-match:l.concat(/\b/,(I=[...r,"super"],l.concat("(?!",I.join("|"),")")),b,l.lookahead(/\(/)),
-className:"title.function",relevance:0};var I;const x={
-begin:l.concat(/\./,l.lookahead(l.concat(b,/(?![0-9A-Za-z$_(])/))),end:b,
-excludeBegin:!0,keywords:"prototype",className:"property",relevance:0},T={
-match:[/get|set/,/\s+/,b,/(?=\()/],className:{1:"keyword",3:"title.function"},
-contains:[{begin:/\(\)/},S]
-},C="(\\([^()]*(\\([^()]*(\\([^()]*\\)[^()]*)*\\)[^()]*)*\\)|"+o.UNDERSCORE_IDENT_RE+")\\s*=>",M={
-match:[/const|var|let/,/\s+/,b,/\s*/,/=\s*/,/(async\s*)?/,l.lookahead(C)],
-keywords:"async",className:{1:"keyword",3:"title.function"},contains:[S]}
-;return{name:"Javascript",aliases:["js","jsx","mjs","cjs"],keywords:g,exports:{
-PARAMS_CONTAINS:p,CLASS_REFERENCE:R},illegal:/#(?![$_A-z])/,
-contains:[o.SHEBANG({label:"shebang",binary:"node",relevance:5}),{
-label:"use_strict",className:"meta",relevance:10,
-begin:/^\s*['"]use (strict|asm)['"]/
-},o.APOS_STRING_MODE,o.QUOTE_STRING_MODE,y,N,_,f,E,R,{className:"attr",
-begin:b+l.lookahead(":"),relevance:0},M,{
-begin:"("+o.RE_STARTERS_RE+"|\\b(case|return|throw)\\b)\\s*",
-keywords:"return throw case",relevance:0,contains:[f,o.REGEXP_MODE,{
-className:"function",begin:C,returnBegin:!0,end:"\\s*=>",contains:[{
-className:"params",variants:[{begin:o.UNDERSCORE_IDENT_RE,relevance:0},{
-className:null,begin:/\(\s*\)/,skip:!0},{begin:/\(/,end:/\)/,excludeBegin:!0,
-excludeEnd:!0,keywords:g,contains:p}]}]},{begin:/,/,relevance:0},{match:/\s+/,
-relevance:0},{variants:[{begin:"<>",end:"</>"},{
-match:/<[A-Za-z0-9\\._:-]+\s*\/>/},{begin:d.begin,
-"on:begin":d.isTrulyOpeningTag,end:d.end}],subLanguage:"xml",contains:[{
-begin:d.begin,end:d.end,skip:!0,contains:["self"]}]}]},O,{
-beginKeywords:"while if switch catch for"},{
-begin:"\\b(?!function)"+o.UNDERSCORE_IDENT_RE+"\\([^()]*(\\([^()]*(\\([^()]*\\)[^()]*)*\\)[^()]*)*\\)\\s*\\{",
-returnBegin:!0,label:"func.def",contains:[S,o.inherit(o.TITLE_MODE,{begin:b,
-className:"title.function"})]},{match:/\.\.\./,relevance:0},x,{match:"\\$"+b,
-relevance:0},{match:[/\bconstructor(?=\s*\()/],className:{1:"title.function"},
-contains:[S]},k,{relevance:0,match:/\b[A-Z][A-Z_0-9]+\b/,
-className:"variable.constant"},w,T,{match:/\$[(.]/}]}}})()
-;hljs.registerLanguage("javascript",e)})();
-/*! `sql` grammar compiled for Highlight.js 11.6.0 */
-(()=>{var e=(()=>{"use strict";return e=>{
-const r=e.regex,t=e.COMMENT("--","$"),n=["true","false","unknown"],a=["bigint","binary","blob","boolean","char","character","clob","date","dec","decfloat","decimal","float","int","integer","interval","nchar","nclob","national","numeric","real","row","smallint","time","timestamp","varchar","varying","varbinary"],i=["abs","acos","array_agg","asin","atan","avg","cast","ceil","ceiling","coalesce","corr","cos","cosh","count","covar_pop","covar_samp","cume_dist","dense_rank","deref","element","exp","extract","first_value","floor","json_array","json_arrayagg","json_exists","json_object","json_objectagg","json_query","json_table","json_table_primitive","json_value","lag","last_value","lead","listagg","ln","log","log10","lower","max","min","mod","nth_value","ntile","nullif","percent_rank","percentile_cont","percentile_disc","position","position_regex","power","rank","regr_avgx","regr_avgy","regr_count","regr_intercept","regr_r2","regr_slope","regr_sxx","regr_sxy","regr_syy","row_number","sin","sinh","sqrt","stddev_pop","stddev_samp","substring","substring_regex","sum","tan","tanh","translate","translate_regex","treat","trim","trim_array","unnest","upper","value_of","var_pop","var_samp","width_bucket"],s=["create table","insert into","primary key","foreign key","not null","alter table","add constraint","grouping sets","on overflow","character set","respect nulls","ignore nulls","nulls first","nulls last","depth first","breadth first"],o=i,c=["abs","acos","all","allocate","alter","and","any","are","array","array_agg","array_max_cardinality","as","asensitive","asin","asymmetric","at","atan","atomic","authorization","avg","begin","begin_frame","begin_partition","between","bigint","binary","blob","boolean","both","by","call","called","cardinality","cascaded","case","cast","ceil","ceiling","char","char_length","character","character_length","check","classifier","clob","close","coalesce","collate","collect","column","commit","condition","connect","constraint","contains","convert","copy","corr","corresponding","cos","cosh","count","covar_pop","covar_samp","create","cross","cube","cume_dist","current","current_catalog","current_date","current_default_transform_group","current_path","current_role","current_row","current_schema","current_time","current_timestamp","current_path","current_role","current_transform_group_for_type","current_user","cursor","cycle","date","day","deallocate","dec","decimal","decfloat","declare","default","define","delete","dense_rank","deref","describe","deterministic","disconnect","distinct","double","drop","dynamic","each","element","else","empty","end","end_frame","end_partition","end-exec","equals","escape","every","except","exec","execute","exists","exp","external","extract","false","fetch","filter","first_value","float","floor","for","foreign","frame_row","free","from","full","function","fusion","get","global","grant","group","grouping","groups","having","hold","hour","identity","in","indicator","initial","inner","inout","insensitive","insert","int","integer","intersect","intersection","interval","into","is","join","json_array","json_arrayagg","json_exists","json_object","json_objectagg","json_query","json_table","json_table_primitive","json_value","lag","language","large","last_value","lateral","lead","leading","left","like","like_regex","listagg","ln","local","localtime","localtimestamp","log","log10","lower","match","match_number","match_recognize","matches","max","member","merge","method","min","minute","mod","modifies","module","month","multiset","national","natural","nchar","nclob","new","no","none","normalize","not","nth_value","ntile","null","nullif","numeric","octet_length","occurrences_regex","of","offset","old","omit","on","one","only","open","or","order","out","outer","over","overlaps","overlay","parameter","partition","pattern","per","percent","percent_rank","percentile_cont","percentile_disc","period","portion","position","position_regex","power","precedes","precision","prepare","primary","procedure","ptf","range","rank","reads","real","recursive","ref","references","referencing","regr_avgx","regr_avgy","regr_count","regr_intercept","regr_r2","regr_slope","regr_sxx","regr_sxy","regr_syy","release","result","return","returns","revoke","right","rollback","rollup","row","row_number","rows","running","savepoint","scope","scroll","search","second","seek","select","sensitive","session_user","set","show","similar","sin","sinh","skip","smallint","some","specific","specifictype","sql","sqlexception","sqlstate","sqlwarning","sqrt","start","static","stddev_pop","stddev_samp","submultiset","subset","substring","substring_regex","succeeds","sum","symmetric","system","system_time","system_user","table","tablesample","tan","tanh","then","time","timestamp","timezone_hour","timezone_minute","to","trailing","translate","translate_regex","translation","treat","trigger","trim","trim_array","true","truncate","uescape","union","unique","unknown","unnest","update","upper","user","using","value","values","value_of","var_pop","var_samp","varbinary","varchar","varying","versioning","when","whenever","where","width_bucket","window","with","within","without","year","add","asc","collation","desc","final","first","last","view"].filter((e=>!i.includes(e))),l={
-begin:r.concat(/\b/,r.either(...o),/\s*\(/),relevance:0,keywords:{built_in:o}}
-;return{name:"SQL",case_insensitive:!0,illegal:/[{}]|<\//,keywords:{
-$pattern:/\b[\w\.]+/,keyword:((e,{exceptions:r,when:t}={})=>{const n=t
-;return r=r||[],e.map((e=>e.match(/\|\d+$/)||r.includes(e)?e:n(e)?e+"|0":e))
-})(c,{when:e=>e.length<3}),literal:n,type:a,
-built_in:["current_catalog","current_date","current_default_transform_group","current_path","current_role","current_schema","current_transform_group_for_type","current_user","session_user","system_time","system_user","current_time","localtime","current_timestamp","localtimestamp"]
-},contains:[{begin:r.either(...s),relevance:0,keywords:{$pattern:/[\w\.]+/,
-keyword:c.concat(s),literal:n,type:a}},{className:"type",
-begin:r.either("double precision","large object","with timezone","without timezone")
-},l,{className:"variable",begin:/@[a-z0-9]+/},{className:"string",variants:[{
-begin:/'/,end:/'/,contains:[{begin:/''/}]}]},{begin:/"/,end:/"/,contains:[{
-begin:/""/}]},e.C_NUMBER_MODE,e.C_BLOCK_COMMENT_MODE,t,{className:"operator",
-begin:/[-+*/=%^~]|&&?|\|\|?|!=?|<(?:=>?|<|>)?|>[>=]?/,relevance:0}]}}})()
-;hljs.registerLanguage("sql",e)})();
-/*! `ruby` grammar compiled for Highlight.js 11.6.0 */
-(()=>{var e=(()=>{"use strict";return e=>{
-const n=e.regex,a="([a-zA-Z_]\\w*[!?=]?|[-+~]@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?)",s=n.either(/\b([A-Z]+[a-z0-9]+)+/,/\b([A-Z]+[a-z0-9]+)+[A-Z]+/),i=n.concat(s,/(::\w+)*/),r={
-"variable.constant":["__FILE__","__LINE__"],
-"variable.language":["self","super"],
-keyword:["alias","and","attr_accessor","attr_reader","attr_writer","begin","BEGIN","break","case","class","defined","do","else","elsif","end","END","ensure","for","if","in","include","module","next","not","or","redo","require","rescue","retry","return","then","undef","unless","until","when","while","yield"],
-built_in:["proc","lambda"],literal:["true","false","nil"]},c={
-className:"doctag",begin:"@[A-Za-z]+"},t={begin:"#<",end:">"
-},b=[e.COMMENT("#","$",{contains:[c]}),e.COMMENT("^=begin","^=end",{
-contains:[c],relevance:10}),e.COMMENT("^__END__",e.MATCH_NOTHING_RE)],l={
-className:"subst",begin:/#\{/,end:/\}/,keywords:r},d={className:"string",
-contains:[e.BACKSLASH_ESCAPE,l],variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/
-},{begin:/`/,end:/`/},{begin:/%[qQwWx]?\(/,end:/\)/},{begin:/%[qQwWx]?\[/,
-end:/\]/},{begin:/%[qQwWx]?\{/,end:/\}/},{begin:/%[qQwWx]?</,end:/>/},{
-begin:/%[qQwWx]?\//,end:/\//},{begin:/%[qQwWx]?%/,end:/%/},{begin:/%[qQwWx]?-/,
-end:/-/},{begin:/%[qQwWx]?\|/,end:/\|/},{begin:/\B\?(\\\d{1,3})/},{
-begin:/\B\?(\\x[A-Fa-f0-9]{1,2})/},{begin:/\B\?(\\u\{?[A-Fa-f0-9]{1,6}\}?)/},{
-begin:/\B\?(\\M-\\C-|\\M-\\c|\\c\\M-|\\M-|\\C-\\M-)[\x20-\x7e]/},{
-begin:/\B\?\\(c|C-)[\x20-\x7e]/},{begin:/\B\?\\?\S/},{
-begin:n.concat(/<<[-~]?'?/,n.lookahead(/(\w+)(?=\W)[^\n]*\n(?:[^\n]*\n)*?\s*\1\b/)),
-contains:[e.END_SAME_AS_BEGIN({begin:/(\w+)/,end:/(\w+)/,
-contains:[e.BACKSLASH_ESCAPE,l]})]}]},g="[0-9](_?[0-9])*",o={className:"number",
-relevance:0,variants:[{
-begin:`\\b([1-9](_?[0-9])*|0)(\\.(${g}))?([eE][+-]?(${g})|r)?i?\\b`},{
-begin:"\\b0[dD][0-9](_?[0-9])*r?i?\\b"},{begin:"\\b0[bB][0-1](_?[0-1])*r?i?\\b"
-},{begin:"\\b0[oO][0-7](_?[0-7])*r?i?\\b"},{
-begin:"\\b0[xX][0-9a-fA-F](_?[0-9a-fA-F])*r?i?\\b"},{
-begin:"\\b0(_?[0-7])+r?i?\\b"}]},_={variants:[{match:/\(\)/},{
-className:"params",begin:/\(/,end:/(?=\))/,excludeBegin:!0,endsParent:!0,
-keywords:r}]},u=[d,{variants:[{match:[/class\s+/,i,/\s+<\s+/,i]},{
-match:[/class\s+/,i]}],scope:{2:"title.class",4:"title.class.inherited"},
-keywords:r},{relevance:0,match:[i,/\.new[ (]/],scope:{1:"title.class"}},{
-relevance:0,match:/\b[A-Z][A-Z_0-9]+\b/,className:"variable.constant"},{
-match:[/def/,/\s+/,a],scope:{1:"keyword",3:"title.function"},contains:[_]},{
-begin:e.IDENT_RE+"::"},{className:"symbol",
-begin:e.UNDERSCORE_IDENT_RE+"(!|\\?)?:",relevance:0},{className:"symbol",
-begin:":(?!\\s)",contains:[d,{begin:a}],relevance:0},o,{className:"variable",
-begin:"(\\$\\W)|((\\$|@@?)(\\w+))(?=[^@$?])(?![A-Za-z])(?![@$?'])"},{
-className:"params",begin:/\|/,end:/\|/,excludeBegin:!0,excludeEnd:!0,
-relevance:0,keywords:r},{begin:"("+e.RE_STARTERS_RE+"|unless)\\s*",
-keywords:"unless",contains:[{className:"regexp",contains:[e.BACKSLASH_ESCAPE,l],
-illegal:/\n/,variants:[{begin:"/",end:"/[a-z]*"},{begin:/%r\{/,end:/\}[a-z]*/},{
-begin:"%r\\(",end:"\\)[a-z]*"},{begin:"%r!",end:"![a-z]*"},{begin:"%r\\[",
-end:"\\][a-z]*"}]}].concat(t,b),relevance:0}].concat(t,b)
-;l.contains=u,_.contains=u;const w=[{begin:/^\s*=>/,starts:{end:"$",contains:u}
-},{className:"meta.prompt",
-begin:"^([>?]>|[\\w#]+\\(\\w+\\):\\d+:\\d+[>*]|(\\w+-)?\\d+\\.\\d+\\.\\d+(p\\d+)?[^\\d][^>]+>)(?=[ ])",
-starts:{end:"$",keywords:r,contains:u}}];return b.unshift(t),{name:"Ruby",
-aliases:["rb","gemspec","podspec","thor","irb"],keywords:r,illegal:/\/\*/,
-contains:[e.SHEBANG({binary:"ruby"})].concat(w).concat(b).concat(u)}}})()
-;hljs.registerLanguage("ruby",e)})();
\ No newline at end of file
+;"object"==typeof exports&&"undefined"!=typeof module&&(module.exports=hljs);
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/highlight.js b/vendor/assets/javascripts/highlightjs/highlight.js
index 74e9ed1911c..af5ed77ab6e 100644
--- a/vendor/assets/javascripts/highlightjs/highlight.js
+++ b/vendor/assets/javascripts/highlightjs/highlight.js
@@ -1,2129 +1,2145 @@
 /*!
-  Highlight.js v11.6.0 (git: bed790f3f3)
-  (c) 2006-2022 undefined and other contributors
+  Highlight.js v11.8.0 (git: 65687a907b)
+  (c) 2006-2023 undefined and other contributors
   License: BSD-3-Clause
  */
 var hljs = (function () {
-    'use strict';
+  'use strict';
 
-    var deepFreezeEs6 = {exports: {}};
+  /* eslint-disable no-multi-assign */
 
-    function deepFreeze(obj) {
-        if (obj instanceof Map) {
-            obj.clear = obj.delete = obj.set = function () {
-                throw new Error('map is read-only');
-            };
-        } else if (obj instanceof Set) {
-            obj.add = obj.clear = obj.delete = function () {
-                throw new Error('set is read-only');
-            };
-        }
-
-        // Freeze self
-        Object.freeze(obj);
-
-        Object.getOwnPropertyNames(obj).forEach(function (name) {
-            var prop = obj[name];
-
-            // Freeze prop if it is an object
-            if (typeof prop == 'object' && !Object.isFrozen(prop)) {
-                deepFreeze(prop);
-            }
-        });
-
-        return obj;
+  function deepFreeze(obj) {
+    if (obj instanceof Map) {
+      obj.clear =
+        obj.delete =
+        obj.set =
+          function () {
+            throw new Error('map is read-only');
+          };
+    } else if (obj instanceof Set) {
+      obj.add =
+        obj.clear =
+        obj.delete =
+          function () {
+            throw new Error('set is read-only');
+          };
     }
 
-    deepFreezeEs6.exports = deepFreeze;
-    deepFreezeEs6.exports.default = deepFreeze;
+    // Freeze self
+    Object.freeze(obj);
 
-    /** @typedef {import('highlight.js').CallbackResponse} CallbackResponse */
-    /** @typedef {import('highlight.js').CompiledMode} CompiledMode */
-    /** @implements CallbackResponse */
+    Object.getOwnPropertyNames(obj).forEach((name) => {
+      const prop = obj[name];
+      const type = typeof prop;
 
-    class Response {
-      /**
-       * @param {CompiledMode} mode
-       */
-      constructor(mode) {
-        // eslint-disable-next-line no-undefined
-        if (mode.data === undefined) mode.data = {};
-
-        this.data = mode.data;
-        this.isMatchIgnored = false;
+      // Freeze prop if it is an object or function and also not already frozen
+      if ((type === 'object' || type === 'function') && !Object.isFrozen(prop)) {
+        deepFreeze(prop);
       }
+    });
 
-      ignoreMatch() {
-        this.isMatchIgnored = true;
-      }
-    }
+    return obj;
+  }
 
+  /** @typedef {import('highlight.js').CallbackResponse} CallbackResponse */
+  /** @typedef {import('highlight.js').CompiledMode} CompiledMode */
+  /** @implements CallbackResponse */
+
+  class Response {
     /**
-     * @param {string} value
-     * @returns {string}
+     * @param {CompiledMode} mode
      */
-    function escapeHTML(value) {
-      return value
-        .replace(/&/g, '&amp;')
-        .replace(/</g, '&lt;')
-        .replace(/>/g, '&gt;')
-        .replace(/"/g, '&quot;')
-        .replace(/'/g, '&#x27;');
+    constructor(mode) {
+      // eslint-disable-next-line no-undefined
+      if (mode.data === undefined) mode.data = {};
+
+      this.data = mode.data;
+      this.isMatchIgnored = false;
     }
 
+    ignoreMatch() {
+      this.isMatchIgnored = true;
+    }
+  }
+
+  /**
+   * @param {string} value
+   * @returns {string}
+   */
+  function escapeHTML(value) {
+    return value
+      .replace(/&/g, '&amp;')
+      .replace(/</g, '&lt;')
+      .replace(/>/g, '&gt;')
+      .replace(/"/g, '&quot;')
+      .replace(/'/g, '&#x27;');
+  }
+
+  /**
+   * performs a shallow merge of multiple objects into one
+   *
+   * @template T
+   * @param {T} original
+   * @param {Record<string,any>[]} objects
+   * @returns {T} a single new object
+   */
+  function inherit$1(original, ...objects) {
+    /** @type Record<string,any> */
+    const result = Object.create(null);
+
+    for (const key in original) {
+      result[key] = original[key];
+    }
+    objects.forEach(function(obj) {
+      for (const key in obj) {
+        result[key] = obj[key];
+      }
+    });
+    return /** @type {T} */ (result);
+  }
+
+  /**
+   * @typedef {object} Renderer
+   * @property {(text: string) => void} addText
+   * @property {(node: Node) => void} openNode
+   * @property {(node: Node) => void} closeNode
+   * @property {() => string} value
+   */
+
+  /** @typedef {{scope?: string, language?: string, sublanguage?: boolean}} Node */
+  /** @typedef {{walk: (r: Renderer) => void}} Tree */
+  /** */
+
+  const SPAN_CLOSE = '</span>';
+
+  /**
+   * Determines if a node needs to be wrapped in <span>
+   *
+   * @param {Node} node */
+  const emitsWrappingTags = (node) => {
+    // rarely we can have a sublanguage where language is undefined
+    // TODO: track down why
+    return !!node.scope;
+  };
+
+  /**
+   *
+   * @param {string} name
+   * @param {{prefix:string}} options
+   */
+  const scopeToCSSClass = (name, { prefix }) => {
+    // sub-language
+    if (name.startsWith("language:")) {
+      return name.replace("language:", "language-");
+    }
+    // tiered scope: comment.line
+    if (name.includes(".")) {
+      const pieces = name.split(".");
+      return [
+        `${prefix}${pieces.shift()}`,
+        ...(pieces.map((x, i) => `${x}${"_".repeat(i + 1)}`))
+      ].join(" ");
+    }
+    // simple scope
+    return `${prefix}${name}`;
+  };
+
+  /** @type {Renderer} */
+  class HTMLRenderer {
     /**
-     * performs a shallow merge of multiple objects into one
+     * Creates a new HTMLRenderer
      *
-     * @template T
-     * @param {T} original
-     * @param {Record<string,any>[]} objects
-     * @returns {T} a single new object
+     * @param {Tree} parseTree - the parse tree (must support `walk` API)
+     * @param {{classPrefix: string}} options
      */
-    function inherit$1(original, ...objects) {
-      /** @type Record<string,any> */
-      const result = Object.create(null);
-
-      for (const key in original) {
-        result[key] = original[key];
-      }
-      objects.forEach(function(obj) {
-        for (const key in obj) {
-          result[key] = obj[key];
-        }
-      });
-      return /** @type {T} */ (result);
+    constructor(parseTree, options) {
+      this.buffer = "";
+      this.classPrefix = options.classPrefix;
+      parseTree.walk(this);
     }
 
     /**
-     * @typedef {object} Renderer
-     * @property {(text: string) => void} addText
-     * @property {(node: Node) => void} openNode
-     * @property {(node: Node) => void} closeNode
-     * @property {() => string} value
-     */
-
-    /** @typedef {{scope?: string, language?: string, sublanguage?: boolean}} Node */
-    /** @typedef {{walk: (r: Renderer) => void}} Tree */
-    /** */
-
-    const SPAN_CLOSE = '</span>';
+     * Adds texts to the output stream
+     *
+     * @param {string} text */
+    addText(text) {
+      this.buffer += escapeHTML(text);
+    }
 
     /**
-     * Determines if a node needs to be wrapped in <span>
+     * Adds a node open to the output stream (if needed)
      *
      * @param {Node} node */
-    const emitsWrappingTags = (node) => {
-      // rarely we can have a sublanguage where language is undefined
-      // TODO: track down why
-      return !!node.scope || (node.sublanguage && node.language);
-    };
+    openNode(node) {
+      if (!emitsWrappingTags(node)) return;
+
+      const className = scopeToCSSClass(node.scope,
+        { prefix: this.classPrefix });
+      this.span(className);
+    }
 
     /**
+     * Adds a node close to the output stream (if needed)
      *
-     * @param {string} name
-     * @param {{prefix:string}} options
-     */
-    const scopeToCSSClass = (name, { prefix }) => {
-      if (name.includes(".")) {
-        const pieces = name.split(".");
-        return [
-          `${prefix}${pieces.shift()}`,
-          ...(pieces.map((x, i) => `${x}${"_".repeat(i + 1)}`))
-        ].join(" ");
-      }
-      return `${prefix}${name}`;
-    };
+     * @param {Node} node */
+    closeNode(node) {
+      if (!emitsWrappingTags(node)) return;
 
-    /** @type {Renderer} */
-    class HTMLRenderer {
-      /**
-       * Creates a new HTMLRenderer
-       *
-       * @param {Tree} parseTree - the parse tree (must support `walk` API)
-       * @param {{classPrefix: string}} options
-       */
-      constructor(parseTree, options) {
-        this.buffer = "";
-        this.classPrefix = options.classPrefix;
-        parseTree.walk(this);
-      }
-
-      /**
-       * Adds texts to the output stream
-       *
-       * @param {string} text */
-      addText(text) {
-        this.buffer += escapeHTML(text);
-      }
-
-      /**
-       * Adds a node open to the output stream (if needed)
-       *
-       * @param {Node} node */
-      openNode(node) {
-        if (!emitsWrappingTags(node)) return;
-
-        let className = "";
-        if (node.sublanguage) {
-          className = `language-${node.language}`;
-        } else {
-          className = scopeToCSSClass(node.scope, { prefix: this.classPrefix });
-        }
-        this.span(className);
-      }
-
-      /**
-       * Adds a node close to the output stream (if needed)
-       *
-       * @param {Node} node */
-      closeNode(node) {
-        if (!emitsWrappingTags(node)) return;
-
-        this.buffer += SPAN_CLOSE;
-      }
-
-      /**
-       * returns the accumulated buffer
-      */
-      value() {
-        return this.buffer;
-      }
-
-      // helpers
-
-      /**
-       * Builds a span element
-       *
-       * @param {string} className */
-      span(className) {
-        this.buffer += `<span class="${className}">`;
-      }
-    }
-
-    /** @typedef {{scope?: string, language?: string, sublanguage?: boolean, children: Node[]} | string} Node */
-    /** @typedef {{scope?: string, language?: string, sublanguage?: boolean, children: Node[]} } DataNode */
-    /** @typedef {import('highlight.js').Emitter} Emitter */
-    /**  */
-
-    /** @returns {DataNode} */
-    const newNode = (opts = {}) => {
-      /** @type DataNode */
-      const result = { children: [] };
-      Object.assign(result, opts);
-      return result;
-    };
-
-    class TokenTree {
-      constructor() {
-        /** @type DataNode */
-        this.rootNode = newNode();
-        this.stack = [this.rootNode];
-      }
-
-      get top() {
-        return this.stack[this.stack.length - 1];
-      }
-
-      get root() { return this.rootNode; }
-
-      /** @param {Node} node */
-      add(node) {
-        this.top.children.push(node);
-      }
-
-      /** @param {string} scope */
-      openNode(scope) {
-        /** @type Node */
-        const node = newNode({ scope });
-        this.add(node);
-        this.stack.push(node);
-      }
-
-      closeNode() {
-        if (this.stack.length > 1) {
-          return this.stack.pop();
-        }
-        // eslint-disable-next-line no-undefined
-        return undefined;
-      }
-
-      closeAllNodes() {
-        while (this.closeNode());
-      }
-
-      toJSON() {
-        return JSON.stringify(this.rootNode, null, 4);
-      }
-
-      /**
-       * @typedef { import("./html_renderer").Renderer } Renderer
-       * @param {Renderer} builder
-       */
-      walk(builder) {
-        // this does not
-        return this.constructor._walk(builder, this.rootNode);
-        // this works
-        // return TokenTree._walk(builder, this.rootNode);
-      }
-
-      /**
-       * @param {Renderer} builder
-       * @param {Node} node
-       */
-      static _walk(builder, node) {
-        if (typeof node === "string") {
-          builder.addText(node);
-        } else if (node.children) {
-          builder.openNode(node);
-          node.children.forEach((child) => this._walk(builder, child));
-          builder.closeNode(node);
-        }
-        return builder;
-      }
-
-      /**
-       * @param {Node} node
-       */
-      static _collapse(node) {
-        if (typeof node === "string") return;
-        if (!node.children) return;
-
-        if (node.children.every(el => typeof el === "string")) {
-          // node.text = node.children.join("");
-          // delete node.children;
-          node.children = [node.children.join("")];
-        } else {
-          node.children.forEach((child) => {
-            TokenTree._collapse(child);
-          });
-        }
-      }
+      this.buffer += SPAN_CLOSE;
     }
 
     /**
-      Currently this is all private API, but this is the minimal API necessary
-      that an Emitter must implement to fully support the parser.
-
-      Minimal interface:
-
-      - addKeyword(text, scope)
-      - addText(text)
-      - addSublanguage(emitter, subLanguageName)
-      - finalize()
-      - openNode(scope)
-      - closeNode()
-      - closeAllNodes()
-      - toHTML()
-
+     * returns the accumulated buffer
     */
+    value() {
+      return this.buffer;
+    }
+
+    // helpers
 
     /**
-     * @implements {Emitter}
+     * Builds a span element
+     *
+     * @param {string} className */
+    span(className) {
+      this.buffer += `<span class="${className}">`;
+    }
+  }
+
+  /** @typedef {{scope?: string, language?: string, sublanguage?: boolean, children: Node[]} | string} Node */
+  /** @typedef {{scope?: string, language?: string, sublanguage?: boolean, children: Node[]} } DataNode */
+  /** @typedef {import('highlight.js').Emitter} Emitter */
+  /**  */
+
+  /** @returns {DataNode} */
+  const newNode = (opts = {}) => {
+    /** @type DataNode */
+    const result = { children: [] };
+    Object.assign(result, opts);
+    return result;
+  };
+
+  class TokenTree {
+    constructor() {
+      /** @type DataNode */
+      this.rootNode = newNode();
+      this.stack = [this.rootNode];
+    }
+
+    get top() {
+      return this.stack[this.stack.length - 1];
+    }
+
+    get root() { return this.rootNode; }
+
+    /** @param {Node} node */
+    add(node) {
+      this.top.children.push(node);
+    }
+
+    /** @param {string} scope */
+    openNode(scope) {
+      /** @type Node */
+      const node = newNode({ scope });
+      this.add(node);
+      this.stack.push(node);
+    }
+
+    closeNode() {
+      if (this.stack.length > 1) {
+        return this.stack.pop();
+      }
+      // eslint-disable-next-line no-undefined
+      return undefined;
+    }
+
+    closeAllNodes() {
+      while (this.closeNode());
+    }
+
+    toJSON() {
+      return JSON.stringify(this.rootNode, null, 4);
+    }
+
+    /**
+     * @typedef { import("./html_renderer").Renderer } Renderer
+     * @param {Renderer} builder
      */
-    class TokenTreeEmitter extends TokenTree {
+    walk(builder) {
+      // this does not
+      return this.constructor._walk(builder, this.rootNode);
+      // this works
+      // return TokenTree._walk(builder, this.rootNode);
+    }
+
+    /**
+     * @param {Renderer} builder
+     * @param {Node} node
+     */
+    static _walk(builder, node) {
+      if (typeof node === "string") {
+        builder.addText(node);
+      } else if (node.children) {
+        builder.openNode(node);
+        node.children.forEach((child) => this._walk(builder, child));
+        builder.closeNode(node);
+      }
+      return builder;
+    }
+
+    /**
+     * @param {Node} node
+     */
+    static _collapse(node) {
+      if (typeof node === "string") return;
+      if (!node.children) return;
+
+      if (node.children.every(el => typeof el === "string")) {
+        // node.text = node.children.join("");
+        // delete node.children;
+        node.children = [node.children.join("")];
+      } else {
+        node.children.forEach((child) => {
+          TokenTree._collapse(child);
+        });
+      }
+    }
+  }
+
+  /**
+    Currently this is all private API, but this is the minimal API necessary
+    that an Emitter must implement to fully support the parser.
+
+    Minimal interface:
+
+    - addText(text)
+    - __addSublanguage(emitter, subLanguageName)
+    - startScope(scope)
+    - endScope()
+    - finalize()
+    - toHTML()
+
+  */
+
+  /**
+   * @implements {Emitter}
+   */
+  class TokenTreeEmitter extends TokenTree {
+    /**
+     * @param {*} options
+     */
+    constructor(options) {
+      super();
+      this.options = options;
+    }
+
+    /**
+     * @param {string} text
+     */
+    addText(text) {
+      if (text === "") { return; }
+
+      this.add(text);
+    }
+
+    /** @param {string} scope */
+    startScope(scope) {
+      this.openNode(scope);
+    }
+
+    endScope() {
+      this.closeNode();
+    }
+
+    /**
+     * @param {Emitter & {root: DataNode}} emitter
+     * @param {string} name
+     */
+    __addSublanguage(emitter, name) {
+      /** @type DataNode */
+      const node = emitter.root;
+      if (name) node.scope = `language:${name}`;
+
+      this.add(node);
+    }
+
+    toHTML() {
+      const renderer = new HTMLRenderer(this, this.options);
+      return renderer.value();
+    }
+
+    finalize() {
+      this.closeAllNodes();
+      return true;
+    }
+  }
+
+  /**
+   * @param {string} value
+   * @returns {RegExp}
+   * */
+
+  /**
+   * @param {RegExp | string } re
+   * @returns {string}
+   */
+  function source(re) {
+    if (!re) return null;
+    if (typeof re === "string") return re;
+
+    return re.source;
+  }
+
+  /**
+   * @param {RegExp | string } re
+   * @returns {string}
+   */
+  function lookahead(re) {
+    return concat('(?=', re, ')');
+  }
+
+  /**
+   * @param {RegExp | string } re
+   * @returns {string}
+   */
+  function anyNumberOfTimes(re) {
+    return concat('(?:', re, ')*');
+  }
+
+  /**
+   * @param {RegExp | string } re
+   * @returns {string}
+   */
+  function optional(re) {
+    return concat('(?:', re, ')?');
+  }
+
+  /**
+   * @param {...(RegExp | string) } args
+   * @returns {string}
+   */
+  function concat(...args) {
+    const joined = args.map((x) => source(x)).join("");
+    return joined;
+  }
+
+  /**
+   * @param { Array<string | RegExp | Object> } args
+   * @returns {object}
+   */
+  function stripOptionsFromArgs(args) {
+    const opts = args[args.length - 1];
+
+    if (typeof opts === 'object' && opts.constructor === Object) {
+      args.splice(args.length - 1, 1);
+      return opts;
+    } else {
+      return {};
+    }
+  }
+
+  /** @typedef { {capture?: boolean} } RegexEitherOptions */
+
+  /**
+   * Any of the passed expresssions may match
+   *
+   * Creates a huge this | this | that | that match
+   * @param {(RegExp | string)[] | [...(RegExp | string)[], RegexEitherOptions]} args
+   * @returns {string}
+   */
+  function either(...args) {
+    /** @type { object & {capture?: boolean} }  */
+    const opts = stripOptionsFromArgs(args);
+    const joined = '('
+      + (opts.capture ? "" : "?:")
+      + args.map((x) => source(x)).join("|") + ")";
+    return joined;
+  }
+
+  /**
+   * @param {RegExp | string} re
+   * @returns {number}
+   */
+  function countMatchGroups(re) {
+    return (new RegExp(re.toString() + '|')).exec('').length - 1;
+  }
+
+  /**
+   * Does lexeme start with a regular expression match at the beginning
+   * @param {RegExp} re
+   * @param {string} lexeme
+   */
+  function startsWith(re, lexeme) {
+    const match = re && re.exec(lexeme);
+    return match && match.index === 0;
+  }
+
+  // BACKREF_RE matches an open parenthesis or backreference. To avoid
+  // an incorrect parse, it additionally matches the following:
+  // - [...] elements, where the meaning of parentheses and escapes change
+  // - other escape sequences, so we do not misparse escape sequences as
+  //   interesting elements
+  // - non-matching or lookahead parentheses, which do not capture. These
+  //   follow the '(' with a '?'.
+  const BACKREF_RE = /\[(?:[^\\\]]|\\.)*\]|\(\??|\\([1-9][0-9]*)|\\./;
+
+  // **INTERNAL** Not intended for outside usage
+  // join logically computes regexps.join(separator), but fixes the
+  // backreferences so they continue to match.
+  // it also places each individual regular expression into it's own
+  // match group, keeping track of the sequencing of those match groups
+  // is currently an exercise for the caller. :-)
+  /**
+   * @param {(string | RegExp)[]} regexps
+   * @param {{joinWith: string}} opts
+   * @returns {string}
+   */
+  function _rewriteBackreferences(regexps, { joinWith }) {
+    let numCaptures = 0;
+
+    return regexps.map((regex) => {
+      numCaptures += 1;
+      const offset = numCaptures;
+      let re = source(regex);
+      let out = '';
+
+      while (re.length > 0) {
+        const match = BACKREF_RE.exec(re);
+        if (!match) {
+          out += re;
+          break;
+        }
+        out += re.substring(0, match.index);
+        re = re.substring(match.index + match[0].length);
+        if (match[0][0] === '\\' && match[1]) {
+          // Adjust the backreference.
+          out += '\\' + String(Number(match[1]) + offset);
+        } else {
+          out += match[0];
+          if (match[0] === '(') {
+            numCaptures++;
+          }
+        }
+      }
+      return out;
+    }).map(re => `(${re})`).join(joinWith);
+  }
+
+  /** @typedef {import('highlight.js').Mode} Mode */
+  /** @typedef {import('highlight.js').ModeCallback} ModeCallback */
+
+  // Common regexps
+  const MATCH_NOTHING_RE = /\b\B/;
+  const IDENT_RE$1 = '[a-zA-Z]\\w*';
+  const UNDERSCORE_IDENT_RE = '[a-zA-Z_]\\w*';
+  const NUMBER_RE = '\\b\\d+(\\.\\d+)?';
+  const C_NUMBER_RE = '(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)'; // 0x..., 0..., decimal, float
+  const BINARY_NUMBER_RE = '\\b(0b[01]+)'; // 0b...
+  const RE_STARTERS_RE = '!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~';
+
+  /**
+  * @param { Partial<Mode> & {binary?: string | RegExp} } opts
+  */
+  const SHEBANG = (opts = {}) => {
+    const beginShebang = /^#![ ]*\//;
+    if (opts.binary) {
+      opts.begin = concat(
+        beginShebang,
+        /.*\b/,
+        opts.binary,
+        /\b.*/);
+    }
+    return inherit$1({
+      scope: 'meta',
+      begin: beginShebang,
+      end: /$/,
+      relevance: 0,
+      /** @type {ModeCallback} */
+      "on:begin": (m, resp) => {
+        if (m.index !== 0) resp.ignoreMatch();
+      }
+    }, opts);
+  };
+
+  // Common modes
+  const BACKSLASH_ESCAPE = {
+    begin: '\\\\[\\s\\S]', relevance: 0
+  };
+  const APOS_STRING_MODE = {
+    scope: 'string',
+    begin: '\'',
+    end: '\'',
+    illegal: '\\n',
+    contains: [BACKSLASH_ESCAPE]
+  };
+  const QUOTE_STRING_MODE = {
+    scope: 'string',
+    begin: '"',
+    end: '"',
+    illegal: '\\n',
+    contains: [BACKSLASH_ESCAPE]
+  };
+  const PHRASAL_WORDS_MODE = {
+    begin: /\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|they|like|more)\b/
+  };
+  /**
+   * Creates a comment mode
+   *
+   * @param {string | RegExp} begin
+   * @param {string | RegExp} end
+   * @param {Mode | {}} [modeOptions]
+   * @returns {Partial<Mode>}
+   */
+  const COMMENT = function(begin, end, modeOptions = {}) {
+    const mode = inherit$1(
+      {
+        scope: 'comment',
+        begin,
+        end,
+        contains: []
+      },
+      modeOptions
+    );
+    mode.contains.push({
+      scope: 'doctag',
+      // hack to avoid the space from being included. the space is necessary to
+      // match here to prevent the plain text rule below from gobbling up doctags
+      begin: '[ ]*(?=(TODO|FIXME|NOTE|BUG|OPTIMIZE|HACK|XXX):)',
+      end: /(TODO|FIXME|NOTE|BUG|OPTIMIZE|HACK|XXX):/,
+      excludeBegin: true,
+      relevance: 0
+    });
+    const ENGLISH_WORD = either(
+      // list of common 1 and 2 letter words in English
+      "I",
+      "a",
+      "is",
+      "so",
+      "us",
+      "to",
+      "at",
+      "if",
+      "in",
+      "it",
+      "on",
+      // note: this is not an exhaustive list of contractions, just popular ones
+      /[A-Za-z]+['](d|ve|re|ll|t|s|n)/, // contractions - can't we'd they're let's, etc
+      /[A-Za-z]+[-][a-z]+/, // `no-way`, etc.
+      /[A-Za-z][a-z]{2,}/ // allow capitalized words at beginning of sentences
+    );
+    // looking like plain text, more likely to be a comment
+    mode.contains.push(
+      {
+        // TODO: how to include ", (, ) without breaking grammars that use these for
+        // comment delimiters?
+        // begin: /[ ]+([()"]?([A-Za-z'-]{3,}|is|a|I|so|us|[tT][oO]|at|if|in|it|on)[.]?[()":]?([.][ ]|[ ]|\))){3}/
+        // ---
+
+        // this tries to find sequences of 3 english words in a row (without any
+        // "programming" type syntax) this gives us a strong signal that we've
+        // TRULY found a comment - vs perhaps scanning with the wrong language.
+        // It's possible to find something that LOOKS like the start of the
+        // comment - but then if there is no readable text - good chance it is a
+        // false match and not a comment.
+        //
+        // for a visual example please see:
+        // https://github.com/highlightjs/highlight.js/issues/2827
+
+        begin: concat(
+          /[ ]+/, // necessary to prevent us gobbling up doctags like /* @author Bob Mcgill */
+          '(',
+          ENGLISH_WORD,
+          /[.]?[:]?([.][ ]|[ ])/,
+          '){3}') // look for 3 words in a row
+      }
+    );
+    return mode;
+  };
+  const C_LINE_COMMENT_MODE = COMMENT('//', '$');
+  const C_BLOCK_COMMENT_MODE = COMMENT('/\\*', '\\*/');
+  const HASH_COMMENT_MODE = COMMENT('#', '$');
+  const NUMBER_MODE = {
+    scope: 'number',
+    begin: NUMBER_RE,
+    relevance: 0
+  };
+  const C_NUMBER_MODE = {
+    scope: 'number',
+    begin: C_NUMBER_RE,
+    relevance: 0
+  };
+  const BINARY_NUMBER_MODE = {
+    scope: 'number',
+    begin: BINARY_NUMBER_RE,
+    relevance: 0
+  };
+  const REGEXP_MODE = {
+    // this outer rule makes sure we actually have a WHOLE regex and not simply
+    // an expression such as:
+    //
+    //     3 / something
+    //
+    // (which will then blow up when regex's `illegal` sees the newline)
+    begin: /(?=\/[^/\n]*\/)/,
+    contains: [{
+      scope: 'regexp',
+      begin: /\//,
+      end: /\/[gimuy]*/,
+      illegal: /\n/,
+      contains: [
+        BACKSLASH_ESCAPE,
+        {
+          begin: /\[/,
+          end: /\]/,
+          relevance: 0,
+          contains: [BACKSLASH_ESCAPE]
+        }
+      ]
+    }]
+  };
+  const TITLE_MODE = {
+    scope: 'title',
+    begin: IDENT_RE$1,
+    relevance: 0
+  };
+  const UNDERSCORE_TITLE_MODE = {
+    scope: 'title',
+    begin: UNDERSCORE_IDENT_RE,
+    relevance: 0
+  };
+  const METHOD_GUARD = {
+    // excludes method names from keyword processing
+    begin: '\\.\\s*' + UNDERSCORE_IDENT_RE,
+    relevance: 0
+  };
+
+  /**
+   * Adds end same as begin mechanics to a mode
+   *
+   * Your mode must include at least a single () match group as that first match
+   * group is what is used for comparison
+   * @param {Partial<Mode>} mode
+   */
+  const END_SAME_AS_BEGIN = function(mode) {
+    return Object.assign(mode,
+      {
+        /** @type {ModeCallback} */
+        'on:begin': (m, resp) => { resp.data._beginMatch = m[1]; },
+        /** @type {ModeCallback} */
+        'on:end': (m, resp) => { if (resp.data._beginMatch !== m[1]) resp.ignoreMatch(); }
+      });
+  };
+
+  var MODES$1 = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    MATCH_NOTHING_RE: MATCH_NOTHING_RE,
+    IDENT_RE: IDENT_RE$1,
+    UNDERSCORE_IDENT_RE: UNDERSCORE_IDENT_RE,
+    NUMBER_RE: NUMBER_RE,
+    C_NUMBER_RE: C_NUMBER_RE,
+    BINARY_NUMBER_RE: BINARY_NUMBER_RE,
+    RE_STARTERS_RE: RE_STARTERS_RE,
+    SHEBANG: SHEBANG,
+    BACKSLASH_ESCAPE: BACKSLASH_ESCAPE,
+    APOS_STRING_MODE: APOS_STRING_MODE,
+    QUOTE_STRING_MODE: QUOTE_STRING_MODE,
+    PHRASAL_WORDS_MODE: PHRASAL_WORDS_MODE,
+    COMMENT: COMMENT,
+    C_LINE_COMMENT_MODE: C_LINE_COMMENT_MODE,
+    C_BLOCK_COMMENT_MODE: C_BLOCK_COMMENT_MODE,
+    HASH_COMMENT_MODE: HASH_COMMENT_MODE,
+    NUMBER_MODE: NUMBER_MODE,
+    C_NUMBER_MODE: C_NUMBER_MODE,
+    BINARY_NUMBER_MODE: BINARY_NUMBER_MODE,
+    REGEXP_MODE: REGEXP_MODE,
+    TITLE_MODE: TITLE_MODE,
+    UNDERSCORE_TITLE_MODE: UNDERSCORE_TITLE_MODE,
+    METHOD_GUARD: METHOD_GUARD,
+    END_SAME_AS_BEGIN: END_SAME_AS_BEGIN
+  });
+
+  /**
+  @typedef {import('highlight.js').CallbackResponse} CallbackResponse
+  @typedef {import('highlight.js').CompilerExt} CompilerExt
+  */
+
+  // Grammar extensions / plugins
+  // See: https://github.com/highlightjs/highlight.js/issues/2833
+
+  // Grammar extensions allow "syntactic sugar" to be added to the grammar modes
+  // without requiring any underlying changes to the compiler internals.
+
+  // `compileMatch` being the perfect small example of now allowing a grammar
+  // author to write `match` when they desire to match a single expression rather
+  // than being forced to use `begin`.  The extension then just moves `match` into
+  // `begin` when it runs.  Ie, no features have been added, but we've just made
+  // the experience of writing (and reading grammars) a little bit nicer.
+
+  // ------
+
+  // TODO: We need negative look-behind support to do this properly
+  /**
+   * Skip a match if it has a preceding dot
+   *
+   * This is used for `beginKeywords` to prevent matching expressions such as
+   * `bob.keyword.do()`. The mode compiler automatically wires this up as a
+   * special _internal_ 'on:begin' callback for modes with `beginKeywords`
+   * @param {RegExpMatchArray} match
+   * @param {CallbackResponse} response
+   */
+  function skipIfHasPrecedingDot(match, response) {
+    const before = match.input[match.index - 1];
+    if (before === ".") {
+      response.ignoreMatch();
+    }
+  }
+
+  /**
+   *
+   * @type {CompilerExt}
+   */
+  function scopeClassName(mode, _parent) {
+    // eslint-disable-next-line no-undefined
+    if (mode.className !== undefined) {
+      mode.scope = mode.className;
+      delete mode.className;
+    }
+  }
+
+  /**
+   * `beginKeywords` syntactic sugar
+   * @type {CompilerExt}
+   */
+  function beginKeywords(mode, parent) {
+    if (!parent) return;
+    if (!mode.beginKeywords) return;
+
+    // for languages with keywords that include non-word characters checking for
+    // a word boundary is not sufficient, so instead we check for a word boundary
+    // or whitespace - this does no harm in any case since our keyword engine
+    // doesn't allow spaces in keywords anyways and we still check for the boundary
+    // first
+    mode.begin = '\\b(' + mode.beginKeywords.split(' ').join('|') + ')(?!\\.)(?=\\b|\\s)';
+    mode.__beforeBegin = skipIfHasPrecedingDot;
+    mode.keywords = mode.keywords || mode.beginKeywords;
+    delete mode.beginKeywords;
+
+    // prevents double relevance, the keywords themselves provide
+    // relevance, the mode doesn't need to double it
+    // eslint-disable-next-line no-undefined
+    if (mode.relevance === undefined) mode.relevance = 0;
+  }
+
+  /**
+   * Allow `illegal` to contain an array of illegal values
+   * @type {CompilerExt}
+   */
+  function compileIllegal(mode, _parent) {
+    if (!Array.isArray(mode.illegal)) return;
+
+    mode.illegal = either(...mode.illegal);
+  }
+
+  /**
+   * `match` to match a single expression for readability
+   * @type {CompilerExt}
+   */
+  function compileMatch(mode, _parent) {
+    if (!mode.match) return;
+    if (mode.begin || mode.end) throw new Error("begin & end are not supported with match");
+
+    mode.begin = mode.match;
+    delete mode.match;
+  }
+
+  /**
+   * provides the default 1 relevance to all modes
+   * @type {CompilerExt}
+   */
+  function compileRelevance(mode, _parent) {
+    // eslint-disable-next-line no-undefined
+    if (mode.relevance === undefined) mode.relevance = 1;
+  }
+
+  // allow beforeMatch to act as a "qualifier" for the match
+  // the full match begin must be [beforeMatch][begin]
+  const beforeMatchExt = (mode, parent) => {
+    if (!mode.beforeMatch) return;
+    // starts conflicts with endsParent which we need to make sure the child
+    // rule is not matched multiple times
+    if (mode.starts) throw new Error("beforeMatch cannot be used with starts");
+
+    const originalMode = Object.assign({}, mode);
+    Object.keys(mode).forEach((key) => { delete mode[key]; });
+
+    mode.keywords = originalMode.keywords;
+    mode.begin = concat(originalMode.beforeMatch, lookahead(originalMode.begin));
+    mode.starts = {
+      relevance: 0,
+      contains: [
+        Object.assign(originalMode, { endsParent: true })
+      ]
+    };
+    mode.relevance = 0;
+
+    delete originalMode.beforeMatch;
+  };
+
+  // keywords that should have no default relevance value
+  const COMMON_KEYWORDS = [
+    'of',
+    'and',
+    'for',
+    'in',
+    'not',
+    'or',
+    'if',
+    'then',
+    'parent', // common variable name
+    'list', // common variable name
+    'value' // common variable name
+  ];
+
+  const DEFAULT_KEYWORD_SCOPE = "keyword";
+
+  /**
+   * Given raw keywords from a language definition, compile them.
+   *
+   * @param {string | Record<string,string|string[]> | Array<string>} rawKeywords
+   * @param {boolean} caseInsensitive
+   */
+  function compileKeywords(rawKeywords, caseInsensitive, scopeName = DEFAULT_KEYWORD_SCOPE) {
+    /** @type {import("highlight.js/private").KeywordDict} */
+    const compiledKeywords = Object.create(null);
+
+    // input can be a string of keywords, an array of keywords, or a object with
+    // named keys representing scopeName (which can then point to a string or array)
+    if (typeof rawKeywords === 'string') {
+      compileList(scopeName, rawKeywords.split(" "));
+    } else if (Array.isArray(rawKeywords)) {
+      compileList(scopeName, rawKeywords);
+    } else {
+      Object.keys(rawKeywords).forEach(function(scopeName) {
+        // collapse all our objects back into the parent object
+        Object.assign(
+          compiledKeywords,
+          compileKeywords(rawKeywords[scopeName], caseInsensitive, scopeName)
+        );
+      });
+    }
+    return compiledKeywords;
+
+    // ---
+
+    /**
+     * Compiles an individual list of keywords
+     *
+     * Ex: "for if when while|5"
+     *
+     * @param {string} scopeName
+     * @param {Array<string>} keywordList
+     */
+    function compileList(scopeName, keywordList) {
+      if (caseInsensitive) {
+        keywordList = keywordList.map(x => x.toLowerCase());
+      }
+      keywordList.forEach(function(keyword) {
+        const pair = keyword.split('|');
+        compiledKeywords[pair[0]] = [scopeName, scoreForKeyword(pair[0], pair[1])];
+      });
+    }
+  }
+
+  /**
+   * Returns the proper score for a given keyword
+   *
+   * Also takes into account comment keywords, which will be scored 0 UNLESS
+   * another score has been manually assigned.
+   * @param {string} keyword
+   * @param {string} [providedScore]
+   */
+  function scoreForKeyword(keyword, providedScore) {
+    // manual scores always win over common keywords
+    // so you can force a score of 1 if you really insist
+    if (providedScore) {
+      return Number(providedScore);
+    }
+
+    return commonKeyword(keyword) ? 0 : 1;
+  }
+
+  /**
+   * Determines if a given keyword is common or not
+   *
+   * @param {string} keyword */
+  function commonKeyword(keyword) {
+    return COMMON_KEYWORDS.includes(keyword.toLowerCase());
+  }
+
+  /*
+
+  For the reasoning behind this please see:
+  https://github.com/highlightjs/highlight.js/issues/2880#issuecomment-747275419
+
+  */
+
+  /**
+   * @type {Record<string, boolean>}
+   */
+  const seenDeprecations = {};
+
+  /**
+   * @param {string} message
+   */
+  const error = (message) => {
+    console.error(message);
+  };
+
+  /**
+   * @param {string} message
+   * @param {any} args
+   */
+  const warn = (message, ...args) => {
+    console.log(`WARN: ${message}`, ...args);
+  };
+
+  /**
+   * @param {string} version
+   * @param {string} message
+   */
+  const deprecated = (version, message) => {
+    if (seenDeprecations[`${version}/${message}`]) return;
+
+    console.log(`Deprecated as of ${version}. ${message}`);
+    seenDeprecations[`${version}/${message}`] = true;
+  };
+
+  /* eslint-disable no-throw-literal */
+
+  /**
+  @typedef {import('highlight.js').CompiledMode} CompiledMode
+  */
+
+  const MultiClassError = new Error();
+
+  /**
+   * Renumbers labeled scope names to account for additional inner match
+   * groups that otherwise would break everything.
+   *
+   * Lets say we 3 match scopes:
+   *
+   *   { 1 => ..., 2 => ..., 3 => ... }
+   *
+   * So what we need is a clean match like this:
+   *
+   *   (a)(b)(c) => [ "a", "b", "c" ]
+   *
+   * But this falls apart with inner match groups:
+   *
+   * (a)(((b)))(c) => ["a", "b", "b", "b", "c" ]
+   *
+   * Our scopes are now "out of alignment" and we're repeating `b` 3 times.
+   * What needs to happen is the numbers are remapped:
+   *
+   *   { 1 => ..., 2 => ..., 5 => ... }
+   *
+   * We also need to know that the ONLY groups that should be output
+   * are 1, 2, and 5.  This function handles this behavior.
+   *
+   * @param {CompiledMode} mode
+   * @param {Array<RegExp | string>} regexes
+   * @param {{key: "beginScope"|"endScope"}} opts
+   */
+  function remapScopeNames(mode, regexes, { key }) {
+    let offset = 0;
+    const scopeNames = mode[key];
+    /** @type Record<number,boolean> */
+    const emit = {};
+    /** @type Record<number,string> */
+    const positions = {};
+
+    for (let i = 1; i <= regexes.length; i++) {
+      positions[i + offset] = scopeNames[i];
+      emit[i + offset] = true;
+      offset += countMatchGroups(regexes[i - 1]);
+    }
+    // we use _emit to keep track of which match groups are "top-level" to avoid double
+    // output from inside match groups
+    mode[key] = positions;
+    mode[key]._emit = emit;
+    mode[key]._multi = true;
+  }
+
+  /**
+   * @param {CompiledMode} mode
+   */
+  function beginMultiClass(mode) {
+    if (!Array.isArray(mode.begin)) return;
+
+    if (mode.skip || mode.excludeBegin || mode.returnBegin) {
+      error("skip, excludeBegin, returnBegin not compatible with beginScope: {}");
+      throw MultiClassError;
+    }
+
+    if (typeof mode.beginScope !== "object" || mode.beginScope === null) {
+      error("beginScope must be object");
+      throw MultiClassError;
+    }
+
+    remapScopeNames(mode, mode.begin, { key: "beginScope" });
+    mode.begin = _rewriteBackreferences(mode.begin, { joinWith: "" });
+  }
+
+  /**
+   * @param {CompiledMode} mode
+   */
+  function endMultiClass(mode) {
+    if (!Array.isArray(mode.end)) return;
+
+    if (mode.skip || mode.excludeEnd || mode.returnEnd) {
+      error("skip, excludeEnd, returnEnd not compatible with endScope: {}");
+      throw MultiClassError;
+    }
+
+    if (typeof mode.endScope !== "object" || mode.endScope === null) {
+      error("endScope must be object");
+      throw MultiClassError;
+    }
+
+    remapScopeNames(mode, mode.end, { key: "endScope" });
+    mode.end = _rewriteBackreferences(mode.end, { joinWith: "" });
+  }
+
+  /**
+   * this exists only to allow `scope: {}` to be used beside `match:`
+   * Otherwise `beginScope` would necessary and that would look weird
+
+    {
+      match: [ /def/, /\w+/ ]
+      scope: { 1: "keyword" , 2: "title" }
+    }
+
+   * @param {CompiledMode} mode
+   */
+  function scopeSugar(mode) {
+    if (mode.scope && typeof mode.scope === "object" && mode.scope !== null) {
+      mode.beginScope = mode.scope;
+      delete mode.scope;
+    }
+  }
+
+  /**
+   * @param {CompiledMode} mode
+   */
+  function MultiClass(mode) {
+    scopeSugar(mode);
+
+    if (typeof mode.beginScope === "string") {
+      mode.beginScope = { _wrap: mode.beginScope };
+    }
+    if (typeof mode.endScope === "string") {
+      mode.endScope = { _wrap: mode.endScope };
+    }
+
+    beginMultiClass(mode);
+    endMultiClass(mode);
+  }
+
+  /**
+  @typedef {import('highlight.js').Mode} Mode
+  @typedef {import('highlight.js').CompiledMode} CompiledMode
+  @typedef {import('highlight.js').Language} Language
+  @typedef {import('highlight.js').HLJSPlugin} HLJSPlugin
+  @typedef {import('highlight.js').CompiledLanguage} CompiledLanguage
+  */
+
+  // compilation
+
+  /**
+   * Compiles a language definition result
+   *
+   * Given the raw result of a language definition (Language), compiles this so
+   * that it is ready for highlighting code.
+   * @param {Language} language
+   * @returns {CompiledLanguage}
+   */
+  function compileLanguage(language) {
+    /**
+     * Builds a regex with the case sensitivity of the current language
+     *
+     * @param {RegExp | string} value
+     * @param {boolean} [global]
+     */
+    function langRe(value, global) {
+      return new RegExp(
+        source(value),
+        'm'
+        + (language.case_insensitive ? 'i' : '')
+        + (language.unicodeRegex ? 'u' : '')
+        + (global ? 'g' : '')
+      );
+    }
+
+    /**
+      Stores multiple regular expressions and allows you to quickly search for
+      them all in a string simultaneously - returning the first match.  It does
+      this by creating a huge (a|b|c) regex - each individual item wrapped with ()
+      and joined by `|` - using match groups to track position.  When a match is
+      found checking which position in the array has content allows us to figure
+      out which of the original regexes / match groups triggered the match.
+
+      The match object itself (the result of `Regex.exec`) is returned but also
+      enhanced by merging in any meta-data that was registered with the regex.
+      This is how we keep track of which mode matched, and what type of rule
+      (`illegal`, `begin`, end, etc).
+    */
+    class MultiRegex {
+      constructor() {
+        this.matchIndexes = {};
+        // @ts-ignore
+        this.regexes = [];
+        this.matchAt = 1;
+        this.position = 0;
+      }
+
+      // @ts-ignore
+      addRule(re, opts) {
+        opts.position = this.position++;
+        // @ts-ignore
+        this.matchIndexes[this.matchAt] = opts;
+        this.regexes.push([opts, re]);
+        this.matchAt += countMatchGroups(re) + 1;
+      }
+
+      compile() {
+        if (this.regexes.length === 0) {
+          // avoids the need to check length every time exec is called
+          // @ts-ignore
+          this.exec = () => null;
+        }
+        const terminators = this.regexes.map(el => el[1]);
+        this.matcherRe = langRe(_rewriteBackreferences(terminators, { joinWith: '|' }), true);
+        this.lastIndex = 0;
+      }
+
+      /** @param {string} s */
+      exec(s) {
+        this.matcherRe.lastIndex = this.lastIndex;
+        const match = this.matcherRe.exec(s);
+        if (!match) { return null; }
+
+        // eslint-disable-next-line no-undefined
+        const i = match.findIndex((el, i) => i > 0 && el !== undefined);
+        // @ts-ignore
+        const matchData = this.matchIndexes[i];
+        // trim off any earlier non-relevant match groups (ie, the other regex
+        // match groups that make up the multi-matcher)
+        match.splice(0, i);
+
+        return Object.assign(match, matchData);
+      }
+    }
+
+    /*
+      Created to solve the key deficiently with MultiRegex - there is no way to
+      test for multiple matches at a single location.  Why would we need to do
+      that?  In the future a more dynamic engine will allow certain matches to be
+      ignored.  An example: if we matched say the 3rd regex in a large group but
+      decided to ignore it - we'd need to started testing again at the 4th
+      regex... but MultiRegex itself gives us no real way to do that.
+
+      So what this class creates MultiRegexs on the fly for whatever search
+      position they are needed.
+
+      NOTE: These additional MultiRegex objects are created dynamically.  For most
+      grammars most of the time we will never actually need anything more than the
+      first MultiRegex - so this shouldn't have too much overhead.
+
+      Say this is our search group, and we match regex3, but wish to ignore it.
+
+        regex1 | regex2 | regex3 | regex4 | regex5    ' ie, startAt = 0
+
+      What we need is a new MultiRegex that only includes the remaining
+      possibilities:
+
+        regex4 | regex5                               ' ie, startAt = 3
+
+      This class wraps all that complexity up in a simple API... `startAt` decides
+      where in the array of expressions to start doing the matching. It
+      auto-increments, so if a match is found at position 2, then startAt will be
+      set to 3.  If the end is reached startAt will return to 0.
+
+      MOST of the time the parser will be setting startAt manually to 0.
+    */
+    class ResumableMultiRegex {
+      constructor() {
+        // @ts-ignore
+        this.rules = [];
+        // @ts-ignore
+        this.multiRegexes = [];
+        this.count = 0;
+
+        this.lastIndex = 0;
+        this.regexIndex = 0;
+      }
+
+      // @ts-ignore
+      getMatcher(index) {
+        if (this.multiRegexes[index]) return this.multiRegexes[index];
+
+        const matcher = new MultiRegex();
+        this.rules.slice(index).forEach(([re, opts]) => matcher.addRule(re, opts));
+        matcher.compile();
+        this.multiRegexes[index] = matcher;
+        return matcher;
+      }
+
+      resumingScanAtSamePosition() {
+        return this.regexIndex !== 0;
+      }
+
+      considerAll() {
+        this.regexIndex = 0;
+      }
+
+      // @ts-ignore
+      addRule(re, opts) {
+        this.rules.push([re, opts]);
+        if (opts.type === "begin") this.count++;
+      }
+
+      /** @param {string} s */
+      exec(s) {
+        const m = this.getMatcher(this.regexIndex);
+        m.lastIndex = this.lastIndex;
+        let result = m.exec(s);
+
+        // The following is because we have no easy way to say "resume scanning at the
+        // existing position but also skip the current rule ONLY". What happens is
+        // all prior rules are also skipped which can result in matching the wrong
+        // thing. Example of matching "booger":
+
+        // our matcher is [string, "booger", number]
+        //
+        // ....booger....
+
+        // if "booger" is ignored then we'd really need a regex to scan from the
+        // SAME position for only: [string, number] but ignoring "booger" (if it
+        // was the first match), a simple resume would scan ahead who knows how
+        // far looking only for "number", ignoring potential string matches (or
+        // future "booger" matches that might be valid.)
+
+        // So what we do: We execute two matchers, one resuming at the same
+        // position, but the second full matcher starting at the position after:
+
+        //     /--- resume first regex match here (for [number])
+        //     |/---- full match here for [string, "booger", number]
+        //     vv
+        // ....booger....
+
+        // Which ever results in a match first is then used. So this 3-4 step
+        // process essentially allows us to say "match at this position, excluding
+        // a prior rule that was ignored".
+        //
+        // 1. Match "booger" first, ignore. Also proves that [string] does non match.
+        // 2. Resume matching for [number]
+        // 3. Match at index + 1 for [string, "booger", number]
+        // 4. If #2 and #3 result in matches, which came first?
+        if (this.resumingScanAtSamePosition()) {
+          if (result && result.index === this.lastIndex) ; else { // use the second matcher result
+            const m2 = this.getMatcher(0);
+            m2.lastIndex = this.lastIndex + 1;
+            result = m2.exec(s);
+          }
+        }
+
+        if (result) {
+          this.regexIndex += result.position + 1;
+          if (this.regexIndex === this.count) {
+            // wrap-around to considering all matches again
+            this.considerAll();
+          }
+        }
+
+        return result;
+      }
+    }
+
+    /**
+     * Given a mode, builds a huge ResumableMultiRegex that can be used to walk
+     * the content and find matches.
+     *
+     * @param {CompiledMode} mode
+     * @returns {ResumableMultiRegex}
+     */
+    function buildModeRegex(mode) {
+      const mm = new ResumableMultiRegex();
+
+      mode.contains.forEach(term => mm.addRule(term.begin, { rule: term, type: "begin" }));
+
+      if (mode.terminatorEnd) {
+        mm.addRule(mode.terminatorEnd, { type: "end" });
+      }
+      if (mode.illegal) {
+        mm.addRule(mode.illegal, { type: "illegal" });
+      }
+
+      return mm;
+    }
+
+    /** skip vs abort vs ignore
+     *
+     * @skip   - The mode is still entered and exited normally (and contains rules apply),
+     *           but all content is held and added to the parent buffer rather than being
+     *           output when the mode ends.  Mostly used with `sublanguage` to build up
+     *           a single large buffer than can be parsed by sublanguage.
+     *
+     *             - The mode begin ands ends normally.
+     *             - Content matched is added to the parent mode buffer.
+     *             - The parser cursor is moved forward normally.
+     *
+     * @abort  - A hack placeholder until we have ignore.  Aborts the mode (as if it
+     *           never matched) but DOES NOT continue to match subsequent `contains`
+     *           modes.  Abort is bad/suboptimal because it can result in modes
+     *           farther down not getting applied because an earlier rule eats the
+     *           content but then aborts.
+     *
+     *             - The mode does not begin.
+     *             - Content matched by `begin` is added to the mode buffer.
+     *             - The parser cursor is moved forward accordingly.
+     *
+     * @ignore - Ignores the mode (as if it never matched) and continues to match any
+     *           subsequent `contains` modes.  Ignore isn't technically possible with
+     *           the current parser implementation.
+     *
+     *             - The mode does not begin.
+     *             - Content matched by `begin` is ignored.
+     *             - The parser cursor is not moved forward.
+     */
+
+    /**
+     * Compiles an individual mode
+     *
+     * This can raise an error if the mode contains certain detectable known logic
+     * issues.
+     * @param {Mode} mode
+     * @param {CompiledMode | null} [parent]
+     * @returns {CompiledMode | never}
+     */
+    function compileMode(mode, parent) {
+      const cmode = /** @type CompiledMode */ (mode);
+      if (mode.isCompiled) return cmode;
+
+      [
+        scopeClassName,
+        // do this early so compiler extensions generally don't have to worry about
+        // the distinction between match/begin
+        compileMatch,
+        MultiClass,
+        beforeMatchExt
+      ].forEach(ext => ext(mode, parent));
+
+      language.compilerExtensions.forEach(ext => ext(mode, parent));
+
+      // __beforeBegin is considered private API, internal use only
+      mode.__beforeBegin = null;
+
+      [
+        beginKeywords,
+        // do this later so compiler extensions that come earlier have access to the
+        // raw array if they wanted to perhaps manipulate it, etc.
+        compileIllegal,
+        // default to 1 relevance if not specified
+        compileRelevance
+      ].forEach(ext => ext(mode, parent));
+
+      mode.isCompiled = true;
+
+      let keywordPattern = null;
+      if (typeof mode.keywords === "object" && mode.keywords.$pattern) {
+        // we need a copy because keywords might be compiled multiple times
+        // so we can't go deleting $pattern from the original on the first
+        // pass
+        mode.keywords = Object.assign({}, mode.keywords);
+        keywordPattern = mode.keywords.$pattern;
+        delete mode.keywords.$pattern;
+      }
+      keywordPattern = keywordPattern || /\w+/;
+
+      if (mode.keywords) {
+        mode.keywords = compileKeywords(mode.keywords, language.case_insensitive);
+      }
+
+      cmode.keywordPatternRe = langRe(keywordPattern, true);
+
+      if (parent) {
+        if (!mode.begin) mode.begin = /\B|\b/;
+        cmode.beginRe = langRe(cmode.begin);
+        if (!mode.end && !mode.endsWithParent) mode.end = /\B|\b/;
+        if (mode.end) cmode.endRe = langRe(cmode.end);
+        cmode.terminatorEnd = source(cmode.end) || '';
+        if (mode.endsWithParent && parent.terminatorEnd) {
+          cmode.terminatorEnd += (mode.end ? '|' : '') + parent.terminatorEnd;
+        }
+      }
+      if (mode.illegal) cmode.illegalRe = langRe(/** @type {RegExp | string} */ (mode.illegal));
+      if (!mode.contains) mode.contains = [];
+
+      mode.contains = [].concat(...mode.contains.map(function(c) {
+        return expandOrCloneMode(c === 'self' ? mode : c);
+      }));
+      mode.contains.forEach(function(c) { compileMode(/** @type Mode */ (c), cmode); });
+
+      if (mode.starts) {
+        compileMode(mode.starts, parent);
+      }
+
+      cmode.matcher = buildModeRegex(cmode);
+      return cmode;
+    }
+
+    if (!language.compilerExtensions) language.compilerExtensions = [];
+
+    // self is not valid at the top-level
+    if (language.contains && language.contains.includes('self')) {
+      throw new Error("ERR: contains `self` is not supported at the top-level of a language.  See documentation.");
+    }
+
+    // we need a null object, which inherit will guarantee
+    language.classNameAliases = inherit$1(language.classNameAliases || {});
+
+    return compileMode(/** @type Mode */ (language));
+  }
+
+  /**
+   * Determines if a mode has a dependency on it's parent or not
+   *
+   * If a mode does have a parent dependency then often we need to clone it if
+   * it's used in multiple places so that each copy points to the correct parent,
+   * where-as modes without a parent can often safely be re-used at the bottom of
+   * a mode chain.
+   *
+   * @param {Mode | null} mode
+   * @returns {boolean} - is there a dependency on the parent?
+   * */
+  function dependencyOnParent(mode) {
+    if (!mode) return false;
+
+    return mode.endsWithParent || dependencyOnParent(mode.starts);
+  }
+
+  /**
+   * Expands a mode or clones it if necessary
+   *
+   * This is necessary for modes with parental dependenceis (see notes on
+   * `dependencyOnParent`) and for nodes that have `variants` - which must then be
+   * exploded into their own individual modes at compile time.
+   *
+   * @param {Mode} mode
+   * @returns {Mode | Mode[]}
+   * */
+  function expandOrCloneMode(mode) {
+    if (mode.variants && !mode.cachedVariants) {
+      mode.cachedVariants = mode.variants.map(function(variant) {
+        return inherit$1(mode, { variants: null }, variant);
+      });
+    }
+
+    // EXPAND
+    // if we have variants then essentially "replace" the mode with the variants
+    // this happens in compileMode, where this function is called from
+    if (mode.cachedVariants) {
+      return mode.cachedVariants;
+    }
+
+    // CLONE
+    // if we have dependencies on parents then we need a unique
+    // instance of ourselves, so we can be reused with many
+    // different parents without issue
+    if (dependencyOnParent(mode)) {
+      return inherit$1(mode, { starts: mode.starts ? inherit$1(mode.starts) : null });
+    }
+
+    if (Object.isFrozen(mode)) {
+      return inherit$1(mode);
+    }
+
+    // no special dependency issues, just return ourselves
+    return mode;
+  }
+
+  var version = "11.8.0";
+
+  class HTMLInjectionError extends Error {
+    constructor(reason, html) {
+      super(reason);
+      this.name = "HTMLInjectionError";
+      this.html = html;
+    }
+  }
+
+  /*
+  Syntax highlighting with language autodetection.
+  https://highlightjs.org/
+  */
+
+
+  /**
+  @typedef {import('highlight.js').Mode} Mode
+  @typedef {import('highlight.js').CompiledMode} CompiledMode
+  @typedef {import('highlight.js').CompiledScope} CompiledScope
+  @typedef {import('highlight.js').Language} Language
+  @typedef {import('highlight.js').HLJSApi} HLJSApi
+  @typedef {import('highlight.js').HLJSPlugin} HLJSPlugin
+  @typedef {import('highlight.js').PluginEvent} PluginEvent
+  @typedef {import('highlight.js').HLJSOptions} HLJSOptions
+  @typedef {import('highlight.js').LanguageFn} LanguageFn
+  @typedef {import('highlight.js').HighlightedHTMLElement} HighlightedHTMLElement
+  @typedef {import('highlight.js').BeforeHighlightContext} BeforeHighlightContext
+  @typedef {import('highlight.js/private').MatchType} MatchType
+  @typedef {import('highlight.js/private').KeywordData} KeywordData
+  @typedef {import('highlight.js/private').EnhancedMatch} EnhancedMatch
+  @typedef {import('highlight.js/private').AnnotatedError} AnnotatedError
+  @typedef {import('highlight.js').AutoHighlightResult} AutoHighlightResult
+  @typedef {import('highlight.js').HighlightOptions} HighlightOptions
+  @typedef {import('highlight.js').HighlightResult} HighlightResult
+  */
+
+
+  const escape = escapeHTML;
+  const inherit = inherit$1;
+  const NO_MATCH = Symbol("nomatch");
+  const MAX_KEYWORD_HITS = 7;
+
+  /**
+   * @param {any} hljs - object that is extended (legacy)
+   * @returns {HLJSApi}
+   */
+  const HLJS = function(hljs) {
+    // Global internal variables used within the highlight.js library.
+    /** @type {Record<string, Language>} */
+    const languages = Object.create(null);
+    /** @type {Record<string, string>} */
+    const aliases = Object.create(null);
+    /** @type {HLJSPlugin[]} */
+    const plugins = [];
+
+    // safe/production mode - swallows more errors, tries to keep running
+    // even if a single syntax or parse hits a fatal error
+    let SAFE_MODE = true;
+    const LANGUAGE_NOT_FOUND = "Could not find the language '{}', did you forget to load/include a language module?";
+    /** @type {Language} */
+    const PLAINTEXT_LANGUAGE = { disableAutodetect: true, name: 'Plain text', contains: [] };
+
+    // Global options used when within external APIs. This is modified when
+    // calling the `hljs.configure` function.
+    /** @type HLJSOptions */
+    let options = {
+      ignoreUnescapedHTML: false,
+      throwUnescapedHTML: false,
+      noHighlightRe: /^(no-?highlight)$/i,
+      languageDetectRe: /\blang(?:uage)?-([\w-]+)\b/i,
+      classPrefix: 'hljs-',
+      cssSelector: 'pre code',
+      languages: null,
+      // beta configuration options, subject to change, welcome to discuss
+      // https://github.com/highlightjs/highlight.js/issues/1086
+      __emitter: TokenTreeEmitter
+    };
+
+    /* Utility functions */
+
+    /**
+     * Tests a language name to see if highlighting should be skipped
+     * @param {string} languageName
+     */
+    function shouldNotHighlight(languageName) {
+      return options.noHighlightRe.test(languageName);
+    }
+
+    /**
+     * @param {HighlightedHTMLElement} block - the HTML element to determine language for
+     */
+    function blockLanguage(block) {
+      let classes = block.className + ' ';
+
+      classes += block.parentNode ? block.parentNode.className : '';
+
+      // language-* takes precedence over non-prefixed class names.
+      const match = options.languageDetectRe.exec(classes);
+      if (match) {
+        const language = getLanguage(match[1]);
+        if (!language) {
+          warn(LANGUAGE_NOT_FOUND.replace("{}", match[1]));
+          warn("Falling back to no-highlight mode for this block.", block);
+        }
+        return language ? match[1] : 'no-highlight';
+      }
+
+      return classes
+        .split(/\s+/)
+        .find((_class) => shouldNotHighlight(_class) || getLanguage(_class));
+    }
+
+    /**
+     * Core highlighting function.
+     *
+     * OLD API
+     * highlight(lang, code, ignoreIllegals, continuation)
+     *
+     * NEW API
+     * highlight(code, {lang, ignoreIllegals})
+     *
+     * @param {string} codeOrLanguageName - the language to use for highlighting
+     * @param {string | HighlightOptions} optionsOrCode - the code to highlight
+     * @param {boolean} [ignoreIllegals] - whether to ignore illegal matches, default is to bail
+     *
+     * @returns {HighlightResult} Result - an object that represents the result
+     * @property {string} language - the language name
+     * @property {number} relevance - the relevance score
+     * @property {string} value - the highlighted HTML code
+     * @property {string} code - the original raw code
+     * @property {CompiledMode} top - top of the current mode stack
+     * @property {boolean} illegal - indicates whether any illegal matches were found
+    */
+    function highlight(codeOrLanguageName, optionsOrCode, ignoreIllegals) {
+      let code = "";
+      let languageName = "";
+      if (typeof optionsOrCode === "object") {
+        code = codeOrLanguageName;
+        ignoreIllegals = optionsOrCode.ignoreIllegals;
+        languageName = optionsOrCode.language;
+      } else {
+        // old API
+        deprecated("10.7.0", "highlight(lang, code, ...args) has been deprecated.");
+        deprecated("10.7.0", "Please use highlight(code, options) instead.\nhttps://github.com/highlightjs/highlight.js/issues/2277");
+        languageName = codeOrLanguageName;
+        code = optionsOrCode;
+      }
+
+      // https://github.com/highlightjs/highlight.js/issues/3149
+      // eslint-disable-next-line no-undefined
+      if (ignoreIllegals === undefined) { ignoreIllegals = true; }
+
+      /** @type {BeforeHighlightContext} */
+      const context = {
+        code,
+        language: languageName
+      };
+      // the plugin can change the desired language or the code to be highlighted
+      // just be changing the object it was passed
+      fire("before:highlight", context);
+
+      // a before plugin can usurp the result completely by providing it's own
+      // in which case we don't even need to call highlight
+      const result = context.result
+        ? context.result
+        : _highlight(context.language, context.code, ignoreIllegals);
+
+      result.code = context.code;
+      // the plugin can change anything in result to suite it
+      fire("after:highlight", result);
+
+      return result;
+    }
+
+    /**
+     * private highlight that's used internally and does not fire callbacks
+     *
+     * @param {string} languageName - the language to use for highlighting
+     * @param {string} codeToHighlight - the code to highlight
+     * @param {boolean?} [ignoreIllegals] - whether to ignore illegal matches, default is to bail
+     * @param {CompiledMode?} [continuation] - current continuation mode, if any
+     * @returns {HighlightResult} - result of the highlight operation
+    */
+    function _highlight(languageName, codeToHighlight, ignoreIllegals, continuation) {
+      const keywordHits = Object.create(null);
+
       /**
-       * @param {*} options
+       * Return keyword data if a match is a keyword
+       * @param {CompiledMode} mode - current mode
+       * @param {string} matchText - the textual match
+       * @returns {KeywordData | false}
        */
-      constructor(options) {
-        super();
-        this.options = options;
+      function keywordData(mode, matchText) {
+        return mode.keywords[matchText];
+      }
+
+      function processKeywords() {
+        if (!top.keywords) {
+          emitter.addText(modeBuffer);
+          return;
+        }
+
+        let lastIndex = 0;
+        top.keywordPatternRe.lastIndex = 0;
+        let match = top.keywordPatternRe.exec(modeBuffer);
+        let buf = "";
+
+        while (match) {
+          buf += modeBuffer.substring(lastIndex, match.index);
+          const word = language.case_insensitive ? match[0].toLowerCase() : match[0];
+          const data = keywordData(top, word);
+          if (data) {
+            const [kind, keywordRelevance] = data;
+            emitter.addText(buf);
+            buf = "";
+
+            keywordHits[word] = (keywordHits[word] || 0) + 1;
+            if (keywordHits[word] <= MAX_KEYWORD_HITS) relevance += keywordRelevance;
+            if (kind.startsWith("_")) {
+              // _ implied for relevance only, do not highlight
+              // by applying a class name
+              buf += match[0];
+            } else {
+              const cssClass = language.classNameAliases[kind] || kind;
+              emitKeyword(match[0], cssClass);
+            }
+          } else {
+            buf += match[0];
+          }
+          lastIndex = top.keywordPatternRe.lastIndex;
+          match = top.keywordPatternRe.exec(modeBuffer);
+        }
+        buf += modeBuffer.substring(lastIndex);
+        emitter.addText(buf);
+      }
+
+      function processSubLanguage() {
+        if (modeBuffer === "") return;
+        /** @type HighlightResult */
+        let result = null;
+
+        if (typeof top.subLanguage === 'string') {
+          if (!languages[top.subLanguage]) {
+            emitter.addText(modeBuffer);
+            return;
+          }
+          result = _highlight(top.subLanguage, modeBuffer, true, continuations[top.subLanguage]);
+          continuations[top.subLanguage] = /** @type {CompiledMode} */ (result._top);
+        } else {
+          result = highlightAuto(modeBuffer, top.subLanguage.length ? top.subLanguage : null);
+        }
+
+        // Counting embedded language score towards the host language may be disabled
+        // with zeroing the containing mode relevance. Use case in point is Markdown that
+        // allows XML everywhere and makes every XML snippet to have a much larger Markdown
+        // score.
+        if (top.relevance > 0) {
+          relevance += result.relevance;
+        }
+        emitter.__addSublanguage(result._emitter, result.language);
+      }
+
+      function processBuffer() {
+        if (top.subLanguage != null) {
+          processSubLanguage();
+        } else {
+          processKeywords();
+        }
+        modeBuffer = '';
       }
 
       /**
        * @param {string} text
        * @param {string} scope
        */
-      addKeyword(text, scope) {
-        if (text === "") { return; }
+      function emitKeyword(keyword, scope) {
+        if (keyword === "") return;
 
-        this.openNode(scope);
-        this.addText(text);
-        this.closeNode();
+        emitter.startScope(scope);
+        emitter.addText(keyword);
+        emitter.endScope();
       }
 
       /**
-       * @param {string} text
+       * @param {CompiledScope} scope
+       * @param {RegExpMatchArray} match
        */
-      addText(text) {
-        if (text === "") { return; }
-
-        this.add(text);
-      }
-
-      /**
-       * @param {Emitter & {root: DataNode}} emitter
-       * @param {string} name
-       */
-      addSublanguage(emitter, name) {
-        /** @type DataNode */
-        const node = emitter.root;
-        node.sublanguage = true;
-        node.language = name;
-        this.add(node);
-      }
-
-      toHTML() {
-        const renderer = new HTMLRenderer(this, this.options);
-        return renderer.value();
-      }
-
-      finalize() {
-        return true;
-      }
-    }
-
-    /**
-     * @param {string} value
-     * @returns {RegExp}
-     * */
-
-    /**
-     * @param {RegExp | string } re
-     * @returns {string}
-     */
-    function source(re) {
-      if (!re) return null;
-      if (typeof re === "string") return re;
-
-      return re.source;
-    }
-
-    /**
-     * @param {RegExp | string } re
-     * @returns {string}
-     */
-    function lookahead(re) {
-      return concat('(?=', re, ')');
-    }
-
-    /**
-     * @param {RegExp | string } re
-     * @returns {string}
-     */
-    function anyNumberOfTimes(re) {
-      return concat('(?:', re, ')*');
-    }
-
-    /**
-     * @param {RegExp | string } re
-     * @returns {string}
-     */
-    function optional(re) {
-      return concat('(?:', re, ')?');
-    }
-
-    /**
-     * @param {...(RegExp | string) } args
-     * @returns {string}
-     */
-    function concat(...args) {
-      const joined = args.map((x) => source(x)).join("");
-      return joined;
-    }
-
-    /**
-     * @param { Array<string | RegExp | Object> } args
-     * @returns {object}
-     */
-    function stripOptionsFromArgs(args) {
-      const opts = args[args.length - 1];
-
-      if (typeof opts === 'object' && opts.constructor === Object) {
-        args.splice(args.length - 1, 1);
-        return opts;
-      } else {
-        return {};
-      }
-    }
-
-    /** @typedef { {capture?: boolean} } RegexEitherOptions */
-
-    /**
-     * Any of the passed expresssions may match
-     *
-     * Creates a huge this | this | that | that match
-     * @param {(RegExp | string)[] | [...(RegExp | string)[], RegexEitherOptions]} args
-     * @returns {string}
-     */
-    function either(...args) {
-      /** @type { object & {capture?: boolean} }  */
-      const opts = stripOptionsFromArgs(args);
-      const joined = '('
-        + (opts.capture ? "" : "?:")
-        + args.map((x) => source(x)).join("|") + ")";
-      return joined;
-    }
-
-    /**
-     * @param {RegExp | string} re
-     * @returns {number}
-     */
-    function countMatchGroups(re) {
-      return (new RegExp(re.toString() + '|')).exec('').length - 1;
-    }
-
-    /**
-     * Does lexeme start with a regular expression match at the beginning
-     * @param {RegExp} re
-     * @param {string} lexeme
-     */
-    function startsWith(re, lexeme) {
-      const match = re && re.exec(lexeme);
-      return match && match.index === 0;
-    }
-
-    // BACKREF_RE matches an open parenthesis or backreference. To avoid
-    // an incorrect parse, it additionally matches the following:
-    // - [...] elements, where the meaning of parentheses and escapes change
-    // - other escape sequences, so we do not misparse escape sequences as
-    //   interesting elements
-    // - non-matching or lookahead parentheses, which do not capture. These
-    //   follow the '(' with a '?'.
-    const BACKREF_RE = /\[(?:[^\\\]]|\\.)*\]|\(\??|\\([1-9][0-9]*)|\\./;
-
-    // **INTERNAL** Not intended for outside usage
-    // join logically computes regexps.join(separator), but fixes the
-    // backreferences so they continue to match.
-    // it also places each individual regular expression into it's own
-    // match group, keeping track of the sequencing of those match groups
-    // is currently an exercise for the caller. :-)
-    /**
-     * @param {(string | RegExp)[]} regexps
-     * @param {{joinWith: string}} opts
-     * @returns {string}
-     */
-    function _rewriteBackreferences(regexps, { joinWith }) {
-      let numCaptures = 0;
-
-      return regexps.map((regex) => {
-        numCaptures += 1;
-        const offset = numCaptures;
-        let re = source(regex);
-        let out = '';
-
-        while (re.length > 0) {
-          const match = BACKREF_RE.exec(re);
-          if (!match) {
-            out += re;
-            break;
-          }
-          out += re.substring(0, match.index);
-          re = re.substring(match.index + match[0].length);
-          if (match[0][0] === '\\' && match[1]) {
-            // Adjust the backreference.
-            out += '\\' + String(Number(match[1]) + offset);
-          } else {
-            out += match[0];
-            if (match[0] === '(') {
-              numCaptures++;
-            }
-          }
-        }
-        return out;
-      }).map(re => `(${re})`).join(joinWith);
-    }
-
-    /** @typedef {import('highlight.js').Mode} Mode */
-    /** @typedef {import('highlight.js').ModeCallback} ModeCallback */
-
-    // Common regexps
-    const MATCH_NOTHING_RE = /\b\B/;
-    const IDENT_RE$1 = '[a-zA-Z]\\w*';
-    const UNDERSCORE_IDENT_RE = '[a-zA-Z_]\\w*';
-    const NUMBER_RE = '\\b\\d+(\\.\\d+)?';
-    const C_NUMBER_RE = '(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)'; // 0x..., 0..., decimal, float
-    const BINARY_NUMBER_RE = '\\b(0b[01]+)'; // 0b...
-    const RE_STARTERS_RE = '!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~';
-
-    /**
-    * @param { Partial<Mode> & {binary?: string | RegExp} } opts
-    */
-    const SHEBANG = (opts = {}) => {
-      const beginShebang = /^#![ ]*\//;
-      if (opts.binary) {
-        opts.begin = concat(
-          beginShebang,
-          /.*\b/,
-          opts.binary,
-          /\b.*/);
-      }
-      return inherit$1({
-        scope: 'meta',
-        begin: beginShebang,
-        end: /$/,
-        relevance: 0,
-        /** @type {ModeCallback} */
-        "on:begin": (m, resp) => {
-          if (m.index !== 0) resp.ignoreMatch();
-        }
-      }, opts);
-    };
-
-    // Common modes
-    const BACKSLASH_ESCAPE = {
-      begin: '\\\\[\\s\\S]', relevance: 0
-    };
-    const APOS_STRING_MODE = {
-      scope: 'string',
-      begin: '\'',
-      end: '\'',
-      illegal: '\\n',
-      contains: [BACKSLASH_ESCAPE]
-    };
-    const QUOTE_STRING_MODE = {
-      scope: 'string',
-      begin: '"',
-      end: '"',
-      illegal: '\\n',
-      contains: [BACKSLASH_ESCAPE]
-    };
-    const PHRASAL_WORDS_MODE = {
-      begin: /\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|they|like|more)\b/
-    };
-    /**
-     * Creates a comment mode
-     *
-     * @param {string | RegExp} begin
-     * @param {string | RegExp} end
-     * @param {Mode | {}} [modeOptions]
-     * @returns {Partial<Mode>}
-     */
-    const COMMENT = function(begin, end, modeOptions = {}) {
-      const mode = inherit$1(
-        {
-          scope: 'comment',
-          begin,
-          end,
-          contains: []
-        },
-        modeOptions
-      );
-      mode.contains.push({
-        scope: 'doctag',
-        // hack to avoid the space from being included. the space is necessary to
-        // match here to prevent the plain text rule below from gobbling up doctags
-        begin: '[ ]*(?=(TODO|FIXME|NOTE|BUG|OPTIMIZE|HACK|XXX):)',
-        end: /(TODO|FIXME|NOTE|BUG|OPTIMIZE|HACK|XXX):/,
-        excludeBegin: true,
-        relevance: 0
-      });
-      const ENGLISH_WORD = either(
-        // list of common 1 and 2 letter words in English
-        "I",
-        "a",
-        "is",
-        "so",
-        "us",
-        "to",
-        "at",
-        "if",
-        "in",
-        "it",
-        "on",
-        // note: this is not an exhaustive list of contractions, just popular ones
-        /[A-Za-z]+['](d|ve|re|ll|t|s|n)/, // contractions - can't we'd they're let's, etc
-        /[A-Za-z]+[-][a-z]+/, // `no-way`, etc.
-        /[A-Za-z][a-z]{2,}/ // allow capitalized words at beginning of sentences
-      );
-      // looking like plain text, more likely to be a comment
-      mode.contains.push(
-        {
-          // TODO: how to include ", (, ) without breaking grammars that use these for
-          // comment delimiters?
-          // begin: /[ ]+([()"]?([A-Za-z'-]{3,}|is|a|I|so|us|[tT][oO]|at|if|in|it|on)[.]?[()":]?([.][ ]|[ ]|\))){3}/
-          // ---
-
-          // this tries to find sequences of 3 english words in a row (without any
-          // "programming" type syntax) this gives us a strong signal that we've
-          // TRULY found a comment - vs perhaps scanning with the wrong language.
-          // It's possible to find something that LOOKS like the start of the
-          // comment - but then if there is no readable text - good chance it is a
-          // false match and not a comment.
-          //
-          // for a visual example please see:
-          // https://github.com/highlightjs/highlight.js/issues/2827
-
-          begin: concat(
-            /[ ]+/, // necessary to prevent us gobbling up doctags like /* @author Bob Mcgill */
-            '(',
-            ENGLISH_WORD,
-            /[.]?[:]?([.][ ]|[ ])/,
-            '){3}') // look for 3 words in a row
-        }
-      );
-      return mode;
-    };
-    const C_LINE_COMMENT_MODE = COMMENT('//', '$');
-    const C_BLOCK_COMMENT_MODE = COMMENT('/\\*', '\\*/');
-    const HASH_COMMENT_MODE = COMMENT('#', '$');
-    const NUMBER_MODE = {
-      scope: 'number',
-      begin: NUMBER_RE,
-      relevance: 0
-    };
-    const C_NUMBER_MODE = {
-      scope: 'number',
-      begin: C_NUMBER_RE,
-      relevance: 0
-    };
-    const BINARY_NUMBER_MODE = {
-      scope: 'number',
-      begin: BINARY_NUMBER_RE,
-      relevance: 0
-    };
-    const REGEXP_MODE = {
-      // this outer rule makes sure we actually have a WHOLE regex and not simply
-      // an expression such as:
-      //
-      //     3 / something
-      //
-      // (which will then blow up when regex's `illegal` sees the newline)
-      begin: /(?=\/[^/\n]*\/)/,
-      contains: [{
-        scope: 'regexp',
-        begin: /\//,
-        end: /\/[gimuy]*/,
-        illegal: /\n/,
-        contains: [
-          BACKSLASH_ESCAPE,
-          {
-            begin: /\[/,
-            end: /\]/,
-            relevance: 0,
-            contains: [BACKSLASH_ESCAPE]
-          }
-        ]
-      }]
-    };
-    const TITLE_MODE = {
-      scope: 'title',
-      begin: IDENT_RE$1,
-      relevance: 0
-    };
-    const UNDERSCORE_TITLE_MODE = {
-      scope: 'title',
-      begin: UNDERSCORE_IDENT_RE,
-      relevance: 0
-    };
-    const METHOD_GUARD = {
-      // excludes method names from keyword processing
-      begin: '\\.\\s*' + UNDERSCORE_IDENT_RE,
-      relevance: 0
-    };
-
-    /**
-     * Adds end same as begin mechanics to a mode
-     *
-     * Your mode must include at least a single () match group as that first match
-     * group is what is used for comparison
-     * @param {Partial<Mode>} mode
-     */
-    const END_SAME_AS_BEGIN = function(mode) {
-      return Object.assign(mode,
-        {
-          /** @type {ModeCallback} */
-          'on:begin': (m, resp) => { resp.data._beginMatch = m[1]; },
-          /** @type {ModeCallback} */
-          'on:end': (m, resp) => { if (resp.data._beginMatch !== m[1]) resp.ignoreMatch(); }
-        });
-    };
-
-    var MODES$1 = /*#__PURE__*/Object.freeze({
-        __proto__: null,
-        MATCH_NOTHING_RE: MATCH_NOTHING_RE,
-        IDENT_RE: IDENT_RE$1,
-        UNDERSCORE_IDENT_RE: UNDERSCORE_IDENT_RE,
-        NUMBER_RE: NUMBER_RE,
-        C_NUMBER_RE: C_NUMBER_RE,
-        BINARY_NUMBER_RE: BINARY_NUMBER_RE,
-        RE_STARTERS_RE: RE_STARTERS_RE,
-        SHEBANG: SHEBANG,
-        BACKSLASH_ESCAPE: BACKSLASH_ESCAPE,
-        APOS_STRING_MODE: APOS_STRING_MODE,
-        QUOTE_STRING_MODE: QUOTE_STRING_MODE,
-        PHRASAL_WORDS_MODE: PHRASAL_WORDS_MODE,
-        COMMENT: COMMENT,
-        C_LINE_COMMENT_MODE: C_LINE_COMMENT_MODE,
-        C_BLOCK_COMMENT_MODE: C_BLOCK_COMMENT_MODE,
-        HASH_COMMENT_MODE: HASH_COMMENT_MODE,
-        NUMBER_MODE: NUMBER_MODE,
-        C_NUMBER_MODE: C_NUMBER_MODE,
-        BINARY_NUMBER_MODE: BINARY_NUMBER_MODE,
-        REGEXP_MODE: REGEXP_MODE,
-        TITLE_MODE: TITLE_MODE,
-        UNDERSCORE_TITLE_MODE: UNDERSCORE_TITLE_MODE,
-        METHOD_GUARD: METHOD_GUARD,
-        END_SAME_AS_BEGIN: END_SAME_AS_BEGIN
-    });
-
-    /**
-    @typedef {import('highlight.js').CallbackResponse} CallbackResponse
-    @typedef {import('highlight.js').CompilerExt} CompilerExt
-    */
-
-    // Grammar extensions / plugins
-    // See: https://github.com/highlightjs/highlight.js/issues/2833
-
-    // Grammar extensions allow "syntactic sugar" to be added to the grammar modes
-    // without requiring any underlying changes to the compiler internals.
-
-    // `compileMatch` being the perfect small example of now allowing a grammar
-    // author to write `match` when they desire to match a single expression rather
-    // than being forced to use `begin`.  The extension then just moves `match` into
-    // `begin` when it runs.  Ie, no features have been added, but we've just made
-    // the experience of writing (and reading grammars) a little bit nicer.
-
-    // ------
-
-    // TODO: We need negative look-behind support to do this properly
-    /**
-     * Skip a match if it has a preceding dot
-     *
-     * This is used for `beginKeywords` to prevent matching expressions such as
-     * `bob.keyword.do()`. The mode compiler automatically wires this up as a
-     * special _internal_ 'on:begin' callback for modes with `beginKeywords`
-     * @param {RegExpMatchArray} match
-     * @param {CallbackResponse} response
-     */
-    function skipIfHasPrecedingDot(match, response) {
-      const before = match.input[match.index - 1];
-      if (before === ".") {
-        response.ignoreMatch();
-      }
-    }
-
-    /**
-     *
-     * @type {CompilerExt}
-     */
-    function scopeClassName(mode, _parent) {
-      // eslint-disable-next-line no-undefined
-      if (mode.className !== undefined) {
-        mode.scope = mode.className;
-        delete mode.className;
-      }
-    }
-
-    /**
-     * `beginKeywords` syntactic sugar
-     * @type {CompilerExt}
-     */
-    function beginKeywords(mode, parent) {
-      if (!parent) return;
-      if (!mode.beginKeywords) return;
-
-      // for languages with keywords that include non-word characters checking for
-      // a word boundary is not sufficient, so instead we check for a word boundary
-      // or whitespace - this does no harm in any case since our keyword engine
-      // doesn't allow spaces in keywords anyways and we still check for the boundary
-      // first
-      mode.begin = '\\b(' + mode.beginKeywords.split(' ').join('|') + ')(?!\\.)(?=\\b|\\s)';
-      mode.__beforeBegin = skipIfHasPrecedingDot;
-      mode.keywords = mode.keywords || mode.beginKeywords;
-      delete mode.beginKeywords;
-
-      // prevents double relevance, the keywords themselves provide
-      // relevance, the mode doesn't need to double it
-      // eslint-disable-next-line no-undefined
-      if (mode.relevance === undefined) mode.relevance = 0;
-    }
-
-    /**
-     * Allow `illegal` to contain an array of illegal values
-     * @type {CompilerExt}
-     */
-    function compileIllegal(mode, _parent) {
-      if (!Array.isArray(mode.illegal)) return;
-
-      mode.illegal = either(...mode.illegal);
-    }
-
-    /**
-     * `match` to match a single expression for readability
-     * @type {CompilerExt}
-     */
-    function compileMatch(mode, _parent) {
-      if (!mode.match) return;
-      if (mode.begin || mode.end) throw new Error("begin & end are not supported with match");
-
-      mode.begin = mode.match;
-      delete mode.match;
-    }
-
-    /**
-     * provides the default 1 relevance to all modes
-     * @type {CompilerExt}
-     */
-    function compileRelevance(mode, _parent) {
-      // eslint-disable-next-line no-undefined
-      if (mode.relevance === undefined) mode.relevance = 1;
-    }
-
-    // allow beforeMatch to act as a "qualifier" for the match
-    // the full match begin must be [beforeMatch][begin]
-    const beforeMatchExt = (mode, parent) => {
-      if (!mode.beforeMatch) return;
-      // starts conflicts with endsParent which we need to make sure the child
-      // rule is not matched multiple times
-      if (mode.starts) throw new Error("beforeMatch cannot be used with starts");
-
-      const originalMode = Object.assign({}, mode);
-      Object.keys(mode).forEach((key) => { delete mode[key]; });
-
-      mode.keywords = originalMode.keywords;
-      mode.begin = concat(originalMode.beforeMatch, lookahead(originalMode.begin));
-      mode.starts = {
-        relevance: 0,
-        contains: [
-          Object.assign(originalMode, { endsParent: true })
-        ]
-      };
-      mode.relevance = 0;
-
-      delete originalMode.beforeMatch;
-    };
-
-    // keywords that should have no default relevance value
-    const COMMON_KEYWORDS = [
-      'of',
-      'and',
-      'for',
-      'in',
-      'not',
-      'or',
-      'if',
-      'then',
-      'parent', // common variable name
-      'list', // common variable name
-      'value' // common variable name
-    ];
-
-    const DEFAULT_KEYWORD_SCOPE = "keyword";
-
-    /**
-     * Given raw keywords from a language definition, compile them.
-     *
-     * @param {string | Record<string,string|string[]> | Array<string>} rawKeywords
-     * @param {boolean} caseInsensitive
-     */
-    function compileKeywords(rawKeywords, caseInsensitive, scopeName = DEFAULT_KEYWORD_SCOPE) {
-      /** @type KeywordDict */
-      const compiledKeywords = Object.create(null);
-
-      // input can be a string of keywords, an array of keywords, or a object with
-      // named keys representing scopeName (which can then point to a string or array)
-      if (typeof rawKeywords === 'string') {
-        compileList(scopeName, rawKeywords.split(" "));
-      } else if (Array.isArray(rawKeywords)) {
-        compileList(scopeName, rawKeywords);
-      } else {
-        Object.keys(rawKeywords).forEach(function(scopeName) {
-          // collapse all our objects back into the parent object
-          Object.assign(
-            compiledKeywords,
-            compileKeywords(rawKeywords[scopeName], caseInsensitive, scopeName)
-          );
-        });
-      }
-      return compiledKeywords;
-
-      // ---
-
-      /**
-       * Compiles an individual list of keywords
-       *
-       * Ex: "for if when while|5"
-       *
-       * @param {string} scopeName
-       * @param {Array<string>} keywordList
-       */
-      function compileList(scopeName, keywordList) {
-        if (caseInsensitive) {
-          keywordList = keywordList.map(x => x.toLowerCase());
-        }
-        keywordList.forEach(function(keyword) {
-          const pair = keyword.split('|');
-          compiledKeywords[pair[0]] = [scopeName, scoreForKeyword(pair[0], pair[1])];
-        });
-      }
-    }
-
-    /**
-     * Returns the proper score for a given keyword
-     *
-     * Also takes into account comment keywords, which will be scored 0 UNLESS
-     * another score has been manually assigned.
-     * @param {string} keyword
-     * @param {string} [providedScore]
-     */
-    function scoreForKeyword(keyword, providedScore) {
-      // manual scores always win over common keywords
-      // so you can force a score of 1 if you really insist
-      if (providedScore) {
-        return Number(providedScore);
-      }
-
-      return commonKeyword(keyword) ? 0 : 1;
-    }
-
-    /**
-     * Determines if a given keyword is common or not
-     *
-     * @param {string} keyword */
-    function commonKeyword(keyword) {
-      return COMMON_KEYWORDS.includes(keyword.toLowerCase());
-    }
-
-    /*
-
-    For the reasoning behind this please see:
-    https://github.com/highlightjs/highlight.js/issues/2880#issuecomment-747275419
-
-    */
-
-    /**
-     * @type {Record<string, boolean>}
-     */
-    const seenDeprecations = {};
-
-    /**
-     * @param {string} message
-     */
-    const error = (message) => {
-      console.error(message);
-    };
-
-    /**
-     * @param {string} message
-     * @param {any} args
-     */
-    const warn = (message, ...args) => {
-      console.log(`WARN: ${message}`, ...args);
-    };
-
-    /**
-     * @param {string} version
-     * @param {string} message
-     */
-    const deprecated = (version, message) => {
-      if (seenDeprecations[`${version}/${message}`]) return;
-
-      console.log(`Deprecated as of ${version}. ${message}`);
-      seenDeprecations[`${version}/${message}`] = true;
-    };
-
-    /* eslint-disable no-throw-literal */
-
-    /**
-    @typedef {import('highlight.js').CompiledMode} CompiledMode
-    */
-
-    const MultiClassError = new Error();
-
-    /**
-     * Renumbers labeled scope names to account for additional inner match
-     * groups that otherwise would break everything.
-     *
-     * Lets say we 3 match scopes:
-     *
-     *   { 1 => ..., 2 => ..., 3 => ... }
-     *
-     * So what we need is a clean match like this:
-     *
-     *   (a)(b)(c) => [ "a", "b", "c" ]
-     *
-     * But this falls apart with inner match groups:
-     *
-     * (a)(((b)))(c) => ["a", "b", "b", "b", "c" ]
-     *
-     * Our scopes are now "out of alignment" and we're repeating `b` 3 times.
-     * What needs to happen is the numbers are remapped:
-     *
-     *   { 1 => ..., 2 => ..., 5 => ... }
-     *
-     * We also need to know that the ONLY groups that should be output
-     * are 1, 2, and 5.  This function handles this behavior.
-     *
-     * @param {CompiledMode} mode
-     * @param {Array<RegExp | string>} regexes
-     * @param {{key: "beginScope"|"endScope"}} opts
-     */
-    function remapScopeNames(mode, regexes, { key }) {
-      let offset = 0;
-      const scopeNames = mode[key];
-      /** @type Record<number,boolean> */
-      const emit = {};
-      /** @type Record<number,string> */
-      const positions = {};
-
-      for (let i = 1; i <= regexes.length; i++) {
-        positions[i + offset] = scopeNames[i];
-        emit[i + offset] = true;
-        offset += countMatchGroups(regexes[i - 1]);
-      }
-      // we use _emit to keep track of which match groups are "top-level" to avoid double
-      // output from inside match groups
-      mode[key] = positions;
-      mode[key]._emit = emit;
-      mode[key]._multi = true;
-    }
-
-    /**
-     * @param {CompiledMode} mode
-     */
-    function beginMultiClass(mode) {
-      if (!Array.isArray(mode.begin)) return;
-
-      if (mode.skip || mode.excludeBegin || mode.returnBegin) {
-        error("skip, excludeBegin, returnBegin not compatible with beginScope: {}");
-        throw MultiClassError;
-      }
-
-      if (typeof mode.beginScope !== "object" || mode.beginScope === null) {
-        error("beginScope must be object");
-        throw MultiClassError;
-      }
-
-      remapScopeNames(mode, mode.begin, { key: "beginScope" });
-      mode.begin = _rewriteBackreferences(mode.begin, { joinWith: "" });
-    }
-
-    /**
-     * @param {CompiledMode} mode
-     */
-    function endMultiClass(mode) {
-      if (!Array.isArray(mode.end)) return;
-
-      if (mode.skip || mode.excludeEnd || mode.returnEnd) {
-        error("skip, excludeEnd, returnEnd not compatible with endScope: {}");
-        throw MultiClassError;
-      }
-
-      if (typeof mode.endScope !== "object" || mode.endScope === null) {
-        error("endScope must be object");
-        throw MultiClassError;
-      }
-
-      remapScopeNames(mode, mode.end, { key: "endScope" });
-      mode.end = _rewriteBackreferences(mode.end, { joinWith: "" });
-    }
-
-    /**
-     * this exists only to allow `scope: {}` to be used beside `match:`
-     * Otherwise `beginScope` would necessary and that would look weird
-
-      {
-        match: [ /def/, /\w+/ ]
-        scope: { 1: "keyword" , 2: "title" }
-      }
-
-     * @param {CompiledMode} mode
-     */
-    function scopeSugar(mode) {
-      if (mode.scope && typeof mode.scope === "object" && mode.scope !== null) {
-        mode.beginScope = mode.scope;
-        delete mode.scope;
-      }
-    }
-
-    /**
-     * @param {CompiledMode} mode
-     */
-    function MultiClass(mode) {
-      scopeSugar(mode);
-
-      if (typeof mode.beginScope === "string") {
-        mode.beginScope = { _wrap: mode.beginScope };
-      }
-      if (typeof mode.endScope === "string") {
-        mode.endScope = { _wrap: mode.endScope };
-      }
-
-      beginMultiClass(mode);
-      endMultiClass(mode);
-    }
-
-    /**
-    @typedef {import('highlight.js').Mode} Mode
-    @typedef {import('highlight.js').CompiledMode} CompiledMode
-    @typedef {import('highlight.js').Language} Language
-    @typedef {import('highlight.js').HLJSPlugin} HLJSPlugin
-    @typedef {import('highlight.js').CompiledLanguage} CompiledLanguage
-    */
-
-    // compilation
-
-    /**
-     * Compiles a language definition result
-     *
-     * Given the raw result of a language definition (Language), compiles this so
-     * that it is ready for highlighting code.
-     * @param {Language} language
-     * @returns {CompiledLanguage}
-     */
-    function compileLanguage(language) {
-      /**
-       * Builds a regex with the case sensitivity of the current language
-       *
-       * @param {RegExp | string} value
-       * @param {boolean} [global]
-       */
-      function langRe(value, global) {
-        return new RegExp(
-          source(value),
-          'm'
-          + (language.case_insensitive ? 'i' : '')
-          + (language.unicodeRegex ? 'u' : '')
-          + (global ? 'g' : '')
-        );
-      }
-
-      /**
-        Stores multiple regular expressions and allows you to quickly search for
-        them all in a string simultaneously - returning the first match.  It does
-        this by creating a huge (a|b|c) regex - each individual item wrapped with ()
-        and joined by `|` - using match groups to track position.  When a match is
-        found checking which position in the array has content allows us to figure
-        out which of the original regexes / match groups triggered the match.
-
-        The match object itself (the result of `Regex.exec`) is returned but also
-        enhanced by merging in any meta-data that was registered with the regex.
-        This is how we keep track of which mode matched, and what type of rule
-        (`illegal`, `begin`, end, etc).
-      */
-      class MultiRegex {
-        constructor() {
-          this.matchIndexes = {};
-          // @ts-ignore
-          this.regexes = [];
-          this.matchAt = 1;
-          this.position = 0;
-        }
-
-        // @ts-ignore
-        addRule(re, opts) {
-          opts.position = this.position++;
-          // @ts-ignore
-          this.matchIndexes[this.matchAt] = opts;
-          this.regexes.push([opts, re]);
-          this.matchAt += countMatchGroups(re) + 1;
-        }
-
-        compile() {
-          if (this.regexes.length === 0) {
-            // avoids the need to check length every time exec is called
-            // @ts-ignore
-            this.exec = () => null;
-          }
-          const terminators = this.regexes.map(el => el[1]);
-          this.matcherRe = langRe(_rewriteBackreferences(terminators, { joinWith: '|' }), true);
-          this.lastIndex = 0;
-        }
-
-        /** @param {string} s */
-        exec(s) {
-          this.matcherRe.lastIndex = this.lastIndex;
-          const match = this.matcherRe.exec(s);
-          if (!match) { return null; }
-
-          // eslint-disable-next-line no-undefined
-          const i = match.findIndex((el, i) => i > 0 && el !== undefined);
-          // @ts-ignore
-          const matchData = this.matchIndexes[i];
-          // trim off any earlier non-relevant match groups (ie, the other regex
-          // match groups that make up the multi-matcher)
-          match.splice(0, i);
-
-          return Object.assign(match, matchData);
-        }
-      }
-
-      /*
-        Created to solve the key deficiently with MultiRegex - there is no way to
-        test for multiple matches at a single location.  Why would we need to do
-        that?  In the future a more dynamic engine will allow certain matches to be
-        ignored.  An example: if we matched say the 3rd regex in a large group but
-        decided to ignore it - we'd need to started testing again at the 4th
-        regex... but MultiRegex itself gives us no real way to do that.
-
-        So what this class creates MultiRegexs on the fly for whatever search
-        position they are needed.
-
-        NOTE: These additional MultiRegex objects are created dynamically.  For most
-        grammars most of the time we will never actually need anything more than the
-        first MultiRegex - so this shouldn't have too much overhead.
-
-        Say this is our search group, and we match regex3, but wish to ignore it.
-
-          regex1 | regex2 | regex3 | regex4 | regex5    ' ie, startAt = 0
-
-        What we need is a new MultiRegex that only includes the remaining
-        possibilities:
-
-          regex4 | regex5                               ' ie, startAt = 3
-
-        This class wraps all that complexity up in a simple API... `startAt` decides
-        where in the array of expressions to start doing the matching. It
-        auto-increments, so if a match is found at position 2, then startAt will be
-        set to 3.  If the end is reached startAt will return to 0.
-
-        MOST of the time the parser will be setting startAt manually to 0.
-      */
-      class ResumableMultiRegex {
-        constructor() {
-          // @ts-ignore
-          this.rules = [];
-          // @ts-ignore
-          this.multiRegexes = [];
-          this.count = 0;
-
-          this.lastIndex = 0;
-          this.regexIndex = 0;
-        }
-
-        // @ts-ignore
-        getMatcher(index) {
-          if (this.multiRegexes[index]) return this.multiRegexes[index];
-
-          const matcher = new MultiRegex();
-          this.rules.slice(index).forEach(([re, opts]) => matcher.addRule(re, opts));
-          matcher.compile();
-          this.multiRegexes[index] = matcher;
-          return matcher;
-        }
-
-        resumingScanAtSamePosition() {
-          return this.regexIndex !== 0;
-        }
-
-        considerAll() {
-          this.regexIndex = 0;
-        }
-
-        // @ts-ignore
-        addRule(re, opts) {
-          this.rules.push([re, opts]);
-          if (opts.type === "begin") this.count++;
-        }
-
-        /** @param {string} s */
-        exec(s) {
-          const m = this.getMatcher(this.regexIndex);
-          m.lastIndex = this.lastIndex;
-          let result = m.exec(s);
-
-          // The following is because we have no easy way to say "resume scanning at the
-          // existing position but also skip the current rule ONLY". What happens is
-          // all prior rules are also skipped which can result in matching the wrong
-          // thing. Example of matching "booger":
-
-          // our matcher is [string, "booger", number]
-          //
-          // ....booger....
-
-          // if "booger" is ignored then we'd really need a regex to scan from the
-          // SAME position for only: [string, number] but ignoring "booger" (if it
-          // was the first match), a simple resume would scan ahead who knows how
-          // far looking only for "number", ignoring potential string matches (or
-          // future "booger" matches that might be valid.)
-
-          // So what we do: We execute two matchers, one resuming at the same
-          // position, but the second full matcher starting at the position after:
-
-          //     /--- resume first regex match here (for [number])
-          //     |/---- full match here for [string, "booger", number]
-          //     vv
-          // ....booger....
-
-          // Which ever results in a match first is then used. So this 3-4 step
-          // process essentially allows us to say "match at this position, excluding
-          // a prior rule that was ignored".
-          //
-          // 1. Match "booger" first, ignore. Also proves that [string] does non match.
-          // 2. Resume matching for [number]
-          // 3. Match at index + 1 for [string, "booger", number]
-          // 4. If #2 and #3 result in matches, which came first?
-          if (this.resumingScanAtSamePosition()) {
-            if (result && result.index === this.lastIndex) ; else { // use the second matcher result
-              const m2 = this.getMatcher(0);
-              m2.lastIndex = this.lastIndex + 1;
-              result = m2.exec(s);
-            }
-          }
-
-          if (result) {
-            this.regexIndex += result.position + 1;
-            if (this.regexIndex === this.count) {
-              // wrap-around to considering all matches again
-              this.considerAll();
-            }
-          }
-
-          return result;
-        }
-      }
-
-      /**
-       * Given a mode, builds a huge ResumableMultiRegex that can be used to walk
-       * the content and find matches.
-       *
-       * @param {CompiledMode} mode
-       * @returns {ResumableMultiRegex}
-       */
-      function buildModeRegex(mode) {
-        const mm = new ResumableMultiRegex();
-
-        mode.contains.forEach(term => mm.addRule(term.begin, { rule: term, type: "begin" }));
-
-        if (mode.terminatorEnd) {
-          mm.addRule(mode.terminatorEnd, { type: "end" });
-        }
-        if (mode.illegal) {
-          mm.addRule(mode.illegal, { type: "illegal" });
-        }
-
-        return mm;
-      }
-
-      /** skip vs abort vs ignore
-       *
-       * @skip   - The mode is still entered and exited normally (and contains rules apply),
-       *           but all content is held and added to the parent buffer rather than being
-       *           output when the mode ends.  Mostly used with `sublanguage` to build up
-       *           a single large buffer than can be parsed by sublanguage.
-       *
-       *             - The mode begin ands ends normally.
-       *             - Content matched is added to the parent mode buffer.
-       *             - The parser cursor is moved forward normally.
-       *
-       * @abort  - A hack placeholder until we have ignore.  Aborts the mode (as if it
-       *           never matched) but DOES NOT continue to match subsequent `contains`
-       *           modes.  Abort is bad/suboptimal because it can result in modes
-       *           farther down not getting applied because an earlier rule eats the
-       *           content but then aborts.
-       *
-       *             - The mode does not begin.
-       *             - Content matched by `begin` is added to the mode buffer.
-       *             - The parser cursor is moved forward accordingly.
-       *
-       * @ignore - Ignores the mode (as if it never matched) and continues to match any
-       *           subsequent `contains` modes.  Ignore isn't technically possible with
-       *           the current parser implementation.
-       *
-       *             - The mode does not begin.
-       *             - Content matched by `begin` is ignored.
-       *             - The parser cursor is not moved forward.
-       */
-
-      /**
-       * Compiles an individual mode
-       *
-       * This can raise an error if the mode contains certain detectable known logic
-       * issues.
-       * @param {Mode} mode
-       * @param {CompiledMode | null} [parent]
-       * @returns {CompiledMode | never}
-       */
-      function compileMode(mode, parent) {
-        const cmode = /** @type CompiledMode */ (mode);
-        if (mode.isCompiled) return cmode;
-
-        [
-          scopeClassName,
-          // do this early so compiler extensions generally don't have to worry about
-          // the distinction between match/begin
-          compileMatch,
-          MultiClass,
-          beforeMatchExt
-        ].forEach(ext => ext(mode, parent));
-
-        language.compilerExtensions.forEach(ext => ext(mode, parent));
-
-        // __beforeBegin is considered private API, internal use only
-        mode.__beforeBegin = null;
-
-        [
-          beginKeywords,
-          // do this later so compiler extensions that come earlier have access to the
-          // raw array if they wanted to perhaps manipulate it, etc.
-          compileIllegal,
-          // default to 1 relevance if not specified
-          compileRelevance
-        ].forEach(ext => ext(mode, parent));
-
-        mode.isCompiled = true;
-
-        let keywordPattern = null;
-        if (typeof mode.keywords === "object" && mode.keywords.$pattern) {
-          // we need a copy because keywords might be compiled multiple times
-          // so we can't go deleting $pattern from the original on the first
-          // pass
-          mode.keywords = Object.assign({}, mode.keywords);
-          keywordPattern = mode.keywords.$pattern;
-          delete mode.keywords.$pattern;
-        }
-        keywordPattern = keywordPattern || /\w+/;
-
-        if (mode.keywords) {
-          mode.keywords = compileKeywords(mode.keywords, language.case_insensitive);
-        }
-
-        cmode.keywordPatternRe = langRe(keywordPattern, true);
-
-        if (parent) {
-          if (!mode.begin) mode.begin = /\B|\b/;
-          cmode.beginRe = langRe(cmode.begin);
-          if (!mode.end && !mode.endsWithParent) mode.end = /\B|\b/;
-          if (mode.end) cmode.endRe = langRe(cmode.end);
-          cmode.terminatorEnd = source(cmode.end) || '';
-          if (mode.endsWithParent && parent.terminatorEnd) {
-            cmode.terminatorEnd += (mode.end ? '|' : '') + parent.terminatorEnd;
-          }
-        }
-        if (mode.illegal) cmode.illegalRe = langRe(/** @type {RegExp | string} */ (mode.illegal));
-        if (!mode.contains) mode.contains = [];
-
-        mode.contains = [].concat(...mode.contains.map(function(c) {
-          return expandOrCloneMode(c === 'self' ? mode : c);
-        }));
-        mode.contains.forEach(function(c) { compileMode(/** @type Mode */ (c), cmode); });
-
-        if (mode.starts) {
-          compileMode(mode.starts, parent);
-        }
-
-        cmode.matcher = buildModeRegex(cmode);
-        return cmode;
-      }
-
-      if (!language.compilerExtensions) language.compilerExtensions = [];
-
-      // self is not valid at the top-level
-      if (language.contains && language.contains.includes('self')) {
-        throw new Error("ERR: contains `self` is not supported at the top-level of a language.  See documentation.");
-      }
-
-      // we need a null object, which inherit will guarantee
-      language.classNameAliases = inherit$1(language.classNameAliases || {});
-
-      return compileMode(/** @type Mode */ (language));
-    }
-
-    /**
-     * Determines if a mode has a dependency on it's parent or not
-     *
-     * If a mode does have a parent dependency then often we need to clone it if
-     * it's used in multiple places so that each copy points to the correct parent,
-     * where-as modes without a parent can often safely be re-used at the bottom of
-     * a mode chain.
-     *
-     * @param {Mode | null} mode
-     * @returns {boolean} - is there a dependency on the parent?
-     * */
-    function dependencyOnParent(mode) {
-      if (!mode) return false;
-
-      return mode.endsWithParent || dependencyOnParent(mode.starts);
-    }
-
-    /**
-     * Expands a mode or clones it if necessary
-     *
-     * This is necessary for modes with parental dependenceis (see notes on
-     * `dependencyOnParent`) and for nodes that have `variants` - which must then be
-     * exploded into their own individual modes at compile time.
-     *
-     * @param {Mode} mode
-     * @returns {Mode | Mode[]}
-     * */
-    function expandOrCloneMode(mode) {
-      if (mode.variants && !mode.cachedVariants) {
-        mode.cachedVariants = mode.variants.map(function(variant) {
-          return inherit$1(mode, { variants: null }, variant);
-        });
-      }
-
-      // EXPAND
-      // if we have variants then essentially "replace" the mode with the variants
-      // this happens in compileMode, where this function is called from
-      if (mode.cachedVariants) {
-        return mode.cachedVariants;
-      }
-
-      // CLONE
-      // if we have dependencies on parents then we need a unique
-      // instance of ourselves, so we can be reused with many
-      // different parents without issue
-      if (dependencyOnParent(mode)) {
-        return inherit$1(mode, { starts: mode.starts ? inherit$1(mode.starts) : null });
-      }
-
-      if (Object.isFrozen(mode)) {
-        return inherit$1(mode);
-      }
-
-      // no special dependency issues, just return ourselves
-      return mode;
-    }
-
-    var version = "11.6.0";
-
-    class HTMLInjectionError extends Error {
-      constructor(reason, html) {
-        super(reason);
-        this.name = "HTMLInjectionError";
-        this.html = html;
-      }
-    }
-
-    /*
-    Syntax highlighting with language autodetection.
-    https://highlightjs.org/
-    */
-
-    /**
-    @typedef {import('highlight.js').Mode} Mode
-    @typedef {import('highlight.js').CompiledMode} CompiledMode
-    @typedef {import('highlight.js').CompiledScope} CompiledScope
-    @typedef {import('highlight.js').Language} Language
-    @typedef {import('highlight.js').HLJSApi} HLJSApi
-    @typedef {import('highlight.js').HLJSPlugin} HLJSPlugin
-    @typedef {import('highlight.js').PluginEvent} PluginEvent
-    @typedef {import('highlight.js').HLJSOptions} HLJSOptions
-    @typedef {import('highlight.js').LanguageFn} LanguageFn
-    @typedef {import('highlight.js').HighlightedHTMLElement} HighlightedHTMLElement
-    @typedef {import('highlight.js').BeforeHighlightContext} BeforeHighlightContext
-    @typedef {import('highlight.js/private').MatchType} MatchType
-    @typedef {import('highlight.js/private').KeywordData} KeywordData
-    @typedef {import('highlight.js/private').EnhancedMatch} EnhancedMatch
-    @typedef {import('highlight.js/private').AnnotatedError} AnnotatedError
-    @typedef {import('highlight.js').AutoHighlightResult} AutoHighlightResult
-    @typedef {import('highlight.js').HighlightOptions} HighlightOptions
-    @typedef {import('highlight.js').HighlightResult} HighlightResult
-    */
-
-
-    const escape = escapeHTML;
-    const inherit = inherit$1;
-    const NO_MATCH = Symbol("nomatch");
-    const MAX_KEYWORD_HITS = 7;
-
-    /**
-     * @param {any} hljs - object that is extended (legacy)
-     * @returns {HLJSApi}
-     */
-    const HLJS = function(hljs) {
-      // Global internal variables used within the highlight.js library.
-      /** @type {Record<string, Language>} */
-      const languages = Object.create(null);
-      /** @type {Record<string, string>} */
-      const aliases = Object.create(null);
-      /** @type {HLJSPlugin[]} */
-      const plugins = [];
-
-      // safe/production mode - swallows more errors, tries to keep running
-      // even if a single syntax or parse hits a fatal error
-      let SAFE_MODE = true;
-      const LANGUAGE_NOT_FOUND = "Could not find the language '{}', did you forget to load/include a language module?";
-      /** @type {Language} */
-      const PLAINTEXT_LANGUAGE = { disableAutodetect: true, name: 'Plain text', contains: [] };
-
-      // Global options used when within external APIs. This is modified when
-      // calling the `hljs.configure` function.
-      /** @type HLJSOptions */
-      let options = {
-        ignoreUnescapedHTML: false,
-        throwUnescapedHTML: false,
-        noHighlightRe: /^(no-?highlight)$/i,
-        languageDetectRe: /\blang(?:uage)?-([\w-]+)\b/i,
-        classPrefix: 'hljs-',
-        cssSelector: 'pre code',
-        languages: null,
-        // beta configuration options, subject to change, welcome to discuss
-        // https://github.com/highlightjs/highlight.js/issues/1086
-        __emitter: TokenTreeEmitter
-      };
-
-      /* Utility functions */
-
-      /**
-       * Tests a language name to see if highlighting should be skipped
-       * @param {string} languageName
-       */
-      function shouldNotHighlight(languageName) {
-        return options.noHighlightRe.test(languageName);
-      }
-
-      /**
-       * @param {HighlightedHTMLElement} block - the HTML element to determine language for
-       */
-      function blockLanguage(block) {
-        let classes = block.className + ' ';
-
-        classes += block.parentNode ? block.parentNode.className : '';
-
-        // language-* takes precedence over non-prefixed class names.
-        const match = options.languageDetectRe.exec(classes);
-        if (match) {
-          const language = getLanguage(match[1]);
-          if (!language) {
-            warn(LANGUAGE_NOT_FOUND.replace("{}", match[1]));
-            warn("Falling back to no-highlight mode for this block.", block);
-          }
-          return language ? match[1] : 'no-highlight';
-        }
-
-        return classes
-          .split(/\s+/)
-          .find((_class) => shouldNotHighlight(_class) || getLanguage(_class));
-      }
-
-      /**
-       * Core highlighting function.
-       *
-       * OLD API
-       * highlight(lang, code, ignoreIllegals, continuation)
-       *
-       * NEW API
-       * highlight(code, {lang, ignoreIllegals})
-       *
-       * @param {string} codeOrLanguageName - the language to use for highlighting
-       * @param {string | HighlightOptions} optionsOrCode - the code to highlight
-       * @param {boolean} [ignoreIllegals] - whether to ignore illegal matches, default is to bail
-       *
-       * @returns {HighlightResult} Result - an object that represents the result
-       * @property {string} language - the language name
-       * @property {number} relevance - the relevance score
-       * @property {string} value - the highlighted HTML code
-       * @property {string} code - the original raw code
-       * @property {CompiledMode} top - top of the current mode stack
-       * @property {boolean} illegal - indicates whether any illegal matches were found
-      */
-      function highlight(codeOrLanguageName, optionsOrCode, ignoreIllegals) {
-        let code = "";
-        let languageName = "";
-        if (typeof optionsOrCode === "object") {
-          code = codeOrLanguageName;
-          ignoreIllegals = optionsOrCode.ignoreIllegals;
-          languageName = optionsOrCode.language;
-        } else {
-          // old API
-          deprecated("10.7.0", "highlight(lang, code, ...args) has been deprecated.");
-          deprecated("10.7.0", "Please use highlight(code, options) instead.\nhttps://github.com/highlightjs/highlight.js/issues/2277");
-          languageName = codeOrLanguageName;
-          code = optionsOrCode;
-        }
-
-        // https://github.com/highlightjs/highlight.js/issues/3149
-        // eslint-disable-next-line no-undefined
-        if (ignoreIllegals === undefined) { ignoreIllegals = true; }
-
-        /** @type {BeforeHighlightContext} */
-        const context = {
-          code,
-          language: languageName
-        };
-        // the plugin can change the desired language or the code to be highlighted
-        // just be changing the object it was passed
-        fire("before:highlight", context);
-
-        // a before plugin can usurp the result completely by providing it's own
-        // in which case we don't even need to call highlight
-        const result = context.result
-          ? context.result
-          : _highlight(context.language, context.code, ignoreIllegals);
-
-        result.code = context.code;
-        // the plugin can change anything in result to suite it
-        fire("after:highlight", result);
-
-        return result;
-      }
-
-      /**
-       * private highlight that's used internally and does not fire callbacks
-       *
-       * @param {string} languageName - the language to use for highlighting
-       * @param {string} codeToHighlight - the code to highlight
-       * @param {boolean?} [ignoreIllegals] - whether to ignore illegal matches, default is to bail
-       * @param {CompiledMode?} [continuation] - current continuation mode, if any
-       * @returns {HighlightResult} - result of the highlight operation
-      */
-      function _highlight(languageName, codeToHighlight, ignoreIllegals, continuation) {
-        const keywordHits = Object.create(null);
-
-        /**
-         * Return keyword data if a match is a keyword
-         * @param {CompiledMode} mode - current mode
-         * @param {string} matchText - the textual match
-         * @returns {KeywordData | false}
-         */
-        function keywordData(mode, matchText) {
-          return mode.keywords[matchText];
-        }
-
-        function processKeywords() {
-          if (!top.keywords) {
-            emitter.addText(modeBuffer);
-            return;
-          }
-
-          let lastIndex = 0;
-          top.keywordPatternRe.lastIndex = 0;
-          let match = top.keywordPatternRe.exec(modeBuffer);
-          let buf = "";
-
-          while (match) {
-            buf += modeBuffer.substring(lastIndex, match.index);
-            const word = language.case_insensitive ? match[0].toLowerCase() : match[0];
-            const data = keywordData(top, word);
-            if (data) {
-              const [kind, keywordRelevance] = data;
-              emitter.addText(buf);
-              buf = "";
-
-              keywordHits[word] = (keywordHits[word] || 0) + 1;
-              if (keywordHits[word] <= MAX_KEYWORD_HITS) relevance += keywordRelevance;
-              if (kind.startsWith("_")) {
-                // _ implied for relevance only, do not highlight
-                // by applying a class name
-                buf += match[0];
-              } else {
-                const cssClass = language.classNameAliases[kind] || kind;
-                emitter.addKeyword(match[0], cssClass);
-              }
-            } else {
-              buf += match[0];
-            }
-            lastIndex = top.keywordPatternRe.lastIndex;
-            match = top.keywordPatternRe.exec(modeBuffer);
-          }
-          buf += modeBuffer.substring(lastIndex);
-          emitter.addText(buf);
-        }
-
-        function processSubLanguage() {
-          if (modeBuffer === "") return;
-          /** @type HighlightResult */
-          let result = null;
-
-          if (typeof top.subLanguage === 'string') {
-            if (!languages[top.subLanguage]) {
-              emitter.addText(modeBuffer);
-              return;
-            }
-            result = _highlight(top.subLanguage, modeBuffer, true, continuations[top.subLanguage]);
-            continuations[top.subLanguage] = /** @type {CompiledMode} */ (result._top);
-          } else {
-            result = highlightAuto(modeBuffer, top.subLanguage.length ? top.subLanguage : null);
-          }
-
-          // Counting embedded language score towards the host language may be disabled
-          // with zeroing the containing mode relevance. Use case in point is Markdown that
-          // allows XML everywhere and makes every XML snippet to have a much larger Markdown
-          // score.
-          if (top.relevance > 0) {
-            relevance += result.relevance;
-          }
-          emitter.addSublanguage(result._emitter, result.language);
-        }
-
-        function processBuffer() {
-          if (top.subLanguage != null) {
-            processSubLanguage();
+      function emitMultiClass(scope, match) {
+        let i = 1;
+        const max = match.length - 1;
+        while (i <= max) {
+          if (!scope._emit[i]) { i++; continue; }
+          const klass = language.classNameAliases[scope[i]] || scope[i];
+          const text = match[i];
+          if (klass) {
+            emitKeyword(text, klass);
           } else {
+            modeBuffer = text;
             processKeywords();
+            modeBuffer = "";
           }
-          modeBuffer = '';
+          i++;
         }
+      }
 
-        /**
-         * @param {CompiledScope} scope
-         * @param {RegExpMatchArray} match
-         */
-        function emitMultiClass(scope, match) {
-          let i = 1;
-          const max = match.length - 1;
-          while (i <= max) {
-            if (!scope._emit[i]) { i++; continue; }
-            const klass = language.classNameAliases[scope[i]] || scope[i];
-            const text = match[i];
-            if (klass) {
-              emitter.addKeyword(text, klass);
-            } else {
-              modeBuffer = text;
-              processKeywords();
-              modeBuffer = "";
-            }
-            i++;
+      /**
+       * @param {CompiledMode} mode - new mode to start
+       * @param {RegExpMatchArray} match
+       */
+      function startNewMode(mode, match) {
+        if (mode.scope && typeof mode.scope === "string") {
+          emitter.openNode(language.classNameAliases[mode.scope] || mode.scope);
+        }
+        if (mode.beginScope) {
+          // beginScope just wraps the begin match itself in a scope
+          if (mode.beginScope._wrap) {
+            emitKeyword(modeBuffer, language.classNameAliases[mode.beginScope._wrap] || mode.beginScope._wrap);
+            modeBuffer = "";
+          } else if (mode.beginScope._multi) {
+            // at this point modeBuffer should just be the match
+            emitMultiClass(mode.beginScope, match);
+            modeBuffer = "";
           }
         }
 
-        /**
-         * @param {CompiledMode} mode - new mode to start
-         * @param {RegExpMatchArray} match
-         */
-        function startNewMode(mode, match) {
-          if (mode.scope && typeof mode.scope === "string") {
-            emitter.openNode(language.classNameAliases[mode.scope] || mode.scope);
-          }
-          if (mode.beginScope) {
-            // beginScope just wraps the begin match itself in a scope
-            if (mode.beginScope._wrap) {
-              emitter.addKeyword(modeBuffer, language.classNameAliases[mode.beginScope._wrap] || mode.beginScope._wrap);
-              modeBuffer = "";
-            } else if (mode.beginScope._multi) {
-              // at this point modeBuffer should just be the match
-              emitMultiClass(mode.beginScope, match);
-              modeBuffer = "";
-            }
-          }
+        top = Object.create(mode, { parent: { value: top } });
+        return top;
+      }
 
-          top = Object.create(mode, { parent: { value: top } });
-          return top;
-        }
+      /**
+       * @param {CompiledMode } mode - the mode to potentially end
+       * @param {RegExpMatchArray} match - the latest match
+       * @param {string} matchPlusRemainder - match plus remainder of content
+       * @returns {CompiledMode | void} - the next mode, or if void continue on in current mode
+       */
+      function endOfMode(mode, match, matchPlusRemainder) {
+        let matched = startsWith(mode.endRe, matchPlusRemainder);
 
-        /**
-         * @param {CompiledMode } mode - the mode to potentially end
-         * @param {RegExpMatchArray} match - the latest match
-         * @param {string} matchPlusRemainder - match plus remainder of content
-         * @returns {CompiledMode | void} - the next mode, or if void continue on in current mode
-         */
-        function endOfMode(mode, match, matchPlusRemainder) {
-          let matched = startsWith(mode.endRe, matchPlusRemainder);
+        if (matched) {
+          if (mode["on:end"]) {
+            const resp = new Response(mode);
+            mode["on:end"](match, resp);
+            if (resp.isMatchIgnored) matched = false;
+          }
 
           if (matched) {
-            if (mode["on:end"]) {
-              const resp = new Response(mode);
-              mode["on:end"](match, resp);
-              if (resp.isMatchIgnored) matched = false;
+            while (mode.endsParent && mode.parent) {
+              mode = mode.parent;
             }
-
-            if (matched) {
-              while (mode.endsParent && mode.parent) {
-                mode = mode.parent;
-              }
-              return mode;
-            }
-          }
-          // even if on:end fires an `ignore` it's still possible
-          // that we might trigger the end node because of a parent mode
-          if (mode.endsWithParent) {
-            return endOfMode(mode.parent, match, matchPlusRemainder);
+            return mode;
           }
         }
+        // even if on:end fires an `ignore` it's still possible
+        // that we might trigger the end node because of a parent mode
+        if (mode.endsWithParent) {
+          return endOfMode(mode.parent, match, matchPlusRemainder);
+        }
+      }
 
-        /**
-         * Handle matching but then ignoring a sequence of text
-         *
-         * @param {string} lexeme - string containing full match text
-         */
-        function doIgnore(lexeme) {
-          if (top.matcher.regexIndex === 0) {
-            // no more regexes to potentially match here, so we move the cursor forward one
-            // space
-            modeBuffer += lexeme[0];
-            return 1;
-          } else {
-            // no need to move the cursor, we still have additional regexes to try and
-            // match at this very spot
-            resumeScanAtSamePosition = true;
-            return 0;
-          }
+      /**
+       * Handle matching but then ignoring a sequence of text
+       *
+       * @param {string} lexeme - string containing full match text
+       */
+      function doIgnore(lexeme) {
+        if (top.matcher.regexIndex === 0) {
+          // no more regexes to potentially match here, so we move the cursor forward one
+          // space
+          modeBuffer += lexeme[0];
+          return 1;
+        } else {
+          // no need to move the cursor, we still have additional regexes to try and
+          // match at this very spot
+          resumeScanAtSamePosition = true;
+          return 0;
+        }
+      }
+
+      /**
+       * Handle the start of a new potential mode match
+       *
+       * @param {EnhancedMatch} match - the current match
+       * @returns {number} how far to advance the parse cursor
+       */
+      function doBeginMatch(match) {
+        const lexeme = match[0];
+        const newMode = match.rule;
+
+        const resp = new Response(newMode);
+        // first internal before callbacks, then the public ones
+        const beforeCallbacks = [newMode.__beforeBegin, newMode["on:begin"]];
+        for (const cb of beforeCallbacks) {
+          if (!cb) continue;
+          cb(match, resp);
+          if (resp.isMatchIgnored) return doIgnore(lexeme);
         }
 
-        /**
-         * Handle the start of a new potential mode match
-         *
-         * @param {EnhancedMatch} match - the current match
-         * @returns {number} how far to advance the parse cursor
-         */
-        function doBeginMatch(match) {
-          const lexeme = match[0];
-          const newMode = match.rule;
-
-          const resp = new Response(newMode);
-          // first internal before callbacks, then the public ones
-          const beforeCallbacks = [newMode.__beforeBegin, newMode["on:begin"]];
-          for (const cb of beforeCallbacks) {
-            if (!cb) continue;
-            cb(match, resp);
-            if (resp.isMatchIgnored) return doIgnore(lexeme);
-          }
-
-          if (newMode.skip) {
-            modeBuffer += lexeme;
-          } else {
-            if (newMode.excludeBegin) {
-              modeBuffer += lexeme;
-            }
-            processBuffer();
-            if (!newMode.returnBegin && !newMode.excludeBegin) {
-              modeBuffer = lexeme;
-            }
-          }
-          startNewMode(newMode, match);
-          return newMode.returnBegin ? 0 : lexeme.length;
-        }
-
-        /**
-         * Handle the potential end of mode
-         *
-         * @param {RegExpMatchArray} match - the current match
-         */
-        function doEndMatch(match) {
-          const lexeme = match[0];
-          const matchPlusRemainder = codeToHighlight.substring(match.index);
-
-          const endMode = endOfMode(top, match, matchPlusRemainder);
-          if (!endMode) { return NO_MATCH; }
-
-          const origin = top;
-          if (top.endScope && top.endScope._wrap) {
-            processBuffer();
-            emitter.addKeyword(lexeme, top.endScope._wrap);
-          } else if (top.endScope && top.endScope._multi) {
-            processBuffer();
-            emitMultiClass(top.endScope, match);
-          } else if (origin.skip) {
-            modeBuffer += lexeme;
-          } else {
-            if (!(origin.returnEnd || origin.excludeEnd)) {
-              modeBuffer += lexeme;
-            }
-            processBuffer();
-            if (origin.excludeEnd) {
-              modeBuffer = lexeme;
-            }
-          }
-          do {
-            if (top.scope) {
-              emitter.closeNode();
-            }
-            if (!top.skip && !top.subLanguage) {
-              relevance += top.relevance;
-            }
-            top = top.parent;
-          } while (top !== endMode.parent);
-          if (endMode.starts) {
-            startNewMode(endMode.starts, match);
-          }
-          return origin.returnEnd ? 0 : lexeme.length;
-        }
-
-        function processContinuations() {
-          const list = [];
-          for (let current = top; current !== language; current = current.parent) {
-            if (current.scope) {
-              list.unshift(current.scope);
-            }
-          }
-          list.forEach(item => emitter.openNode(item));
-        }
-
-        /** @type {{type?: MatchType, index?: number, rule?: Mode}}} */
-        let lastMatch = {};
-
-        /**
-         *  Process an individual match
-         *
-         * @param {string} textBeforeMatch - text preceding the match (since the last match)
-         * @param {EnhancedMatch} [match] - the match itself
-         */
-        function processLexeme(textBeforeMatch, match) {
-          const lexeme = match && match[0];
-
-          // add non-matched text to the current mode buffer
-          modeBuffer += textBeforeMatch;
-
-          if (lexeme == null) {
-            processBuffer();
-            return 0;
-          }
-
-          // we've found a 0 width match and we're stuck, so we need to advance
-          // this happens when we have badly behaved rules that have optional matchers to the degree that
-          // sometimes they can end up matching nothing at all
-          // Ref: https://github.com/highlightjs/highlight.js/issues/2140
-          if (lastMatch.type === "begin" && match.type === "end" && lastMatch.index === match.index && lexeme === "") {
-            // spit the "skipped" character that our regex choked on back into the output sequence
-            modeBuffer += codeToHighlight.slice(match.index, match.index + 1);
-            if (!SAFE_MODE) {
-              /** @type {AnnotatedError} */
-              const err = new Error(`0 width match regex (${languageName})`);
-              err.languageName = languageName;
-              err.badRule = lastMatch.rule;
-              throw err;
-            }
-            return 1;
-          }
-          lastMatch = match;
-
-          if (match.type === "begin") {
-            return doBeginMatch(match);
-          } else if (match.type === "illegal" && !ignoreIllegals) {
-            // illegal match, we do not continue processing
-            /** @type {AnnotatedError} */
-            const err = new Error('Illegal lexeme "' + lexeme + '" for mode "' + (top.scope || '<unnamed>') + '"');
-            err.mode = top;
-            throw err;
-          } else if (match.type === "end") {
-            const processed = doEndMatch(match);
-            if (processed !== NO_MATCH) {
-              return processed;
-            }
-          }
-
-          // edge case for when illegal matches $ (end of line) which is technically
-          // a 0 width match but not a begin/end match so it's not caught by the
-          // first handler (when ignoreIllegals is true)
-          if (match.type === "illegal" && lexeme === "") {
-            // advance so we aren't stuck in an infinite loop
-            return 1;
-          }
-
-          // infinite loops are BAD, this is a last ditch catch all. if we have a
-          // decent number of iterations yet our index (cursor position in our
-          // parsing) still 3x behind our index then something is very wrong
-          // so we bail
-          if (iterations > 100000 && iterations > match.index * 3) {
-            const err = new Error('potential infinite loop, way more iterations than matches');
-            throw err;
-          }
-
-          /*
-          Why might be find ourselves here?  An potential end match that was
-          triggered but could not be completed.  IE, `doEndMatch` returned NO_MATCH.
-          (this could be because a callback requests the match be ignored, etc)
-
-          This causes no real harm other than stopping a few times too many.
-          */
-
+        if (newMode.skip) {
           modeBuffer += lexeme;
-          return lexeme.length;
+        } else {
+          if (newMode.excludeBegin) {
+            modeBuffer += lexeme;
+          }
+          processBuffer();
+          if (!newMode.returnBegin && !newMode.excludeBegin) {
+            modeBuffer = lexeme;
+          }
+        }
+        startNewMode(newMode, match);
+        return newMode.returnBegin ? 0 : lexeme.length;
+      }
+
+      /**
+       * Handle the potential end of mode
+       *
+       * @param {RegExpMatchArray} match - the current match
+       */
+      function doEndMatch(match) {
+        const lexeme = match[0];
+        const matchPlusRemainder = codeToHighlight.substring(match.index);
+
+        const endMode = endOfMode(top, match, matchPlusRemainder);
+        if (!endMode) { return NO_MATCH; }
+
+        const origin = top;
+        if (top.endScope && top.endScope._wrap) {
+          processBuffer();
+          emitKeyword(lexeme, top.endScope._wrap);
+        } else if (top.endScope && top.endScope._multi) {
+          processBuffer();
+          emitMultiClass(top.endScope, match);
+        } else if (origin.skip) {
+          modeBuffer += lexeme;
+        } else {
+          if (!(origin.returnEnd || origin.excludeEnd)) {
+            modeBuffer += lexeme;
+          }
+          processBuffer();
+          if (origin.excludeEnd) {
+            modeBuffer = lexeme;
+          }
+        }
+        do {
+          if (top.scope) {
+            emitter.closeNode();
+          }
+          if (!top.skip && !top.subLanguage) {
+            relevance += top.relevance;
+          }
+          top = top.parent;
+        } while (top !== endMode.parent);
+        if (endMode.starts) {
+          startNewMode(endMode.starts, match);
+        }
+        return origin.returnEnd ? 0 : lexeme.length;
+      }
+
+      function processContinuations() {
+        const list = [];
+        for (let current = top; current !== language; current = current.parent) {
+          if (current.scope) {
+            list.unshift(current.scope);
+          }
+        }
+        list.forEach(item => emitter.openNode(item));
+      }
+
+      /** @type {{type?: MatchType, index?: number, rule?: Mode}}} */
+      let lastMatch = {};
+
+      /**
+       *  Process an individual match
+       *
+       * @param {string} textBeforeMatch - text preceding the match (since the last match)
+       * @param {EnhancedMatch} [match] - the match itself
+       */
+      function processLexeme(textBeforeMatch, match) {
+        const lexeme = match && match[0];
+
+        // add non-matched text to the current mode buffer
+        modeBuffer += textBeforeMatch;
+
+        if (lexeme == null) {
+          processBuffer();
+          return 0;
         }
 
-        const language = getLanguage(languageName);
-        if (!language) {
-          error(LANGUAGE_NOT_FOUND.replace("{}", languageName));
-          throw new Error('Unknown language: "' + languageName + '"');
+        // we've found a 0 width match and we're stuck, so we need to advance
+        // this happens when we have badly behaved rules that have optional matchers to the degree that
+        // sometimes they can end up matching nothing at all
+        // Ref: https://github.com/highlightjs/highlight.js/issues/2140
+        if (lastMatch.type === "begin" && match.type === "end" && lastMatch.index === match.index && lexeme === "") {
+          // spit the "skipped" character that our regex choked on back into the output sequence
+          modeBuffer += codeToHighlight.slice(match.index, match.index + 1);
+          if (!SAFE_MODE) {
+            /** @type {AnnotatedError} */
+            const err = new Error(`0 width match regex (${languageName})`);
+            err.languageName = languageName;
+            err.badRule = lastMatch.rule;
+            throw err;
+          }
+          return 1;
+        }
+        lastMatch = match;
+
+        if (match.type === "begin") {
+          return doBeginMatch(match);
+        } else if (match.type === "illegal" && !ignoreIllegals) {
+          // illegal match, we do not continue processing
+          /** @type {AnnotatedError} */
+          const err = new Error('Illegal lexeme "' + lexeme + '" for mode "' + (top.scope || '<unnamed>') + '"');
+          err.mode = top;
+          throw err;
+        } else if (match.type === "end") {
+          const processed = doEndMatch(match);
+          if (processed !== NO_MATCH) {
+            return processed;
+          }
         }
 
-        const md = compileLanguage(language);
-        let result = '';
-        /** @type {CompiledMode} */
-        let top = continuation || md;
-        /** @type Record<string,CompiledMode> */
-        const continuations = {}; // keep continuations for sub-languages
-        const emitter = new options.__emitter(options);
-        processContinuations();
-        let modeBuffer = '';
-        let relevance = 0;
-        let index = 0;
-        let iterations = 0;
-        let resumeScanAtSamePosition = false;
+        // edge case for when illegal matches $ (end of line) which is technically
+        // a 0 width match but not a begin/end match so it's not caught by the
+        // first handler (when ignoreIllegals is true)
+        if (match.type === "illegal" && lexeme === "") {
+          // advance so we aren't stuck in an infinite loop
+          return 1;
+        }
 
-        try {
+        // infinite loops are BAD, this is a last ditch catch all. if we have a
+        // decent number of iterations yet our index (cursor position in our
+        // parsing) still 3x behind our index then something is very wrong
+        // so we bail
+        if (iterations > 100000 && iterations > match.index * 3) {
+          const err = new Error('potential infinite loop, way more iterations than matches');
+          throw err;
+        }
+
+        /*
+        Why might be find ourselves here?  An potential end match that was
+        triggered but could not be completed.  IE, `doEndMatch` returned NO_MATCH.
+        (this could be because a callback requests the match be ignored, etc)
+
+        This causes no real harm other than stopping a few times too many.
+        */
+
+        modeBuffer += lexeme;
+        return lexeme.length;
+      }
+
+      const language = getLanguage(languageName);
+      if (!language) {
+        error(LANGUAGE_NOT_FOUND.replace("{}", languageName));
+        throw new Error('Unknown language: "' + languageName + '"');
+      }
+
+      const md = compileLanguage(language);
+      let result = '';
+      /** @type {CompiledMode} */
+      let top = continuation || md;
+      /** @type Record<string,CompiledMode> */
+      const continuations = {}; // keep continuations for sub-languages
+      const emitter = new options.__emitter(options);
+      processContinuations();
+      let modeBuffer = '';
+      let relevance = 0;
+      let index = 0;
+      let iterations = 0;
+      let resumeScanAtSamePosition = false;
+
+      try {
+        if (!language.__emitTokens) {
           top.matcher.considerAll();
 
           for (;;) {
@@ -2147,10363 +2163,7742 @@ var hljs = (function () {
             index = match.index + processedCount;
           }
           processLexeme(codeToHighlight.substring(index));
-          emitter.closeAllNodes();
-          emitter.finalize();
-          result = emitter.toHTML();
+        } else {
+          language.__emitTokens(codeToHighlight, emitter);
+        }
 
+        emitter.finalize();
+        result = emitter.toHTML();
+
+        return {
+          language: languageName,
+          value: result,
+          relevance,
+          illegal: false,
+          _emitter: emitter,
+          _top: top
+        };
+      } catch (err) {
+        if (err.message && err.message.includes('Illegal')) {
           return {
             language: languageName,
-            value: result,
-            relevance: relevance,
+            value: escape(codeToHighlight),
+            illegal: true,
+            relevance: 0,
+            _illegalBy: {
+              message: err.message,
+              index,
+              context: codeToHighlight.slice(index - 100, index + 100),
+              mode: err.mode,
+              resultSoFar: result
+            },
+            _emitter: emitter
+          };
+        } else if (SAFE_MODE) {
+          return {
+            language: languageName,
+            value: escape(codeToHighlight),
             illegal: false,
+            relevance: 0,
+            errorRaised: err,
             _emitter: emitter,
             _top: top
           };
-        } catch (err) {
-          if (err.message && err.message.includes('Illegal')) {
-            return {
-              language: languageName,
-              value: escape(codeToHighlight),
-              illegal: true,
-              relevance: 0,
-              _illegalBy: {
-                message: err.message,
-                index: index,
-                context: codeToHighlight.slice(index - 100, index + 100),
-                mode: err.mode,
-                resultSoFar: result
-              },
-              _emitter: emitter
-            };
-          } else if (SAFE_MODE) {
-            return {
-              language: languageName,
-              value: escape(codeToHighlight),
-              illegal: false,
-              relevance: 0,
-              errorRaised: err,
-              _emitter: emitter,
-              _top: top
-            };
-          } else {
-            throw err;
-          }
+        } else {
+          throw err;
         }
       }
-
-      /**
-       * returns a valid highlight result, without actually doing any actual work,
-       * auto highlight starts with this and it's possible for small snippets that
-       * auto-detection may not find a better match
-       * @param {string} code
-       * @returns {HighlightResult}
-       */
-      function justTextHighlightResult(code) {
-        const result = {
-          value: escape(code),
-          illegal: false,
-          relevance: 0,
-          _top: PLAINTEXT_LANGUAGE,
-          _emitter: new options.__emitter(options)
-        };
-        result._emitter.addText(code);
-        return result;
-      }
-
-      /**
-      Highlighting with language detection. Accepts a string with the code to
-      highlight. Returns an object with the following properties:
-
-      - language (detected language)
-      - relevance (int)
-      - value (an HTML string with highlighting markup)
-      - secondBest (object with the same structure for second-best heuristically
-        detected language, may be absent)
-
-        @param {string} code
-        @param {Array<string>} [languageSubset]
-        @returns {AutoHighlightResult}
-      */
-      function highlightAuto(code, languageSubset) {
-        languageSubset = languageSubset || options.languages || Object.keys(languages);
-        const plaintext = justTextHighlightResult(code);
-
-        const results = languageSubset.filter(getLanguage).filter(autoDetection).map(name =>
-          _highlight(name, code, false)
-        );
-        results.unshift(plaintext); // plaintext is always an option
-
-        const sorted = results.sort((a, b) => {
-          // sort base on relevance
-          if (a.relevance !== b.relevance) return b.relevance - a.relevance;
-
-          // always award the tie to the base language
-          // ie if C++ and Arduino are tied, it's more likely to be C++
-          if (a.language && b.language) {
-            if (getLanguage(a.language).supersetOf === b.language) {
-              return 1;
-            } else if (getLanguage(b.language).supersetOf === a.language) {
-              return -1;
-            }
-          }
-
-          // otherwise say they are equal, which has the effect of sorting on
-          // relevance while preserving the original ordering - which is how ties
-          // have historically been settled, ie the language that comes first always
-          // wins in the case of a tie
-          return 0;
-        });
-
-        const [best, secondBest] = sorted;
-
-        /** @type {AutoHighlightResult} */
-        const result = best;
-        result.secondBest = secondBest;
-
-        return result;
-      }
-
-      /**
-       * Builds new class name for block given the language name
-       *
-       * @param {HTMLElement} element
-       * @param {string} [currentLang]
-       * @param {string} [resultLang]
-       */
-      function updateClassName(element, currentLang, resultLang) {
-        const language = (currentLang && aliases[currentLang]) || resultLang;
-
-        element.classList.add("hljs");
-        element.classList.add(`language-${language}`);
-      }
-
-      /**
-       * Applies highlighting to a DOM node containing code.
-       *
-       * @param {HighlightedHTMLElement} element - the HTML element to highlight
-      */
-      function highlightElement(element) {
-        /** @type HTMLElement */
-        let node = null;
-        const language = blockLanguage(element);
-
-        if (shouldNotHighlight(language)) return;
-
-        fire("before:highlightElement",
-          { el: element, language: language });
-
-        // we should be all text, no child nodes (unescaped HTML) - this is possibly
-        // an HTML injection attack - it's likely too late if this is already in
-        // production (the code has likely already done its damage by the time
-        // we're seeing it)... but we yell loudly about this so that hopefully it's
-        // more likely to be caught in development before making it to production
-        if (element.children.length > 0) {
-          if (!options.ignoreUnescapedHTML) {
-            console.warn("One of your code blocks includes unescaped HTML. This is a potentially serious security risk.");
-            console.warn("https://github.com/highlightjs/highlight.js/wiki/security");
-            console.warn("The element with unescaped HTML:");
-            console.warn(element);
-          }
-          if (options.throwUnescapedHTML) {
-            const err = new HTMLInjectionError(
-              "One of your code blocks includes unescaped HTML.",
-              element.innerHTML
-            );
-            throw err;
-          }
-        }
-
-        node = element;
-        const text = node.textContent;
-        const result = language ? highlight(text, { language, ignoreIllegals: true }) : highlightAuto(text);
-
-        element.innerHTML = result.value;
-        updateClassName(element, language, result.language);
-        element.result = {
-          language: result.language,
-          // TODO: remove with version 11.0
-          re: result.relevance,
-          relevance: result.relevance
-        };
-        if (result.secondBest) {
-          element.secondBest = {
-            language: result.secondBest.language,
-            relevance: result.secondBest.relevance
-          };
-        }
-
-        fire("after:highlightElement", { el: element, result, text });
-      }
-
-      /**
-       * Updates highlight.js global options with the passed options
-       *
-       * @param {Partial<HLJSOptions>} userOptions
-       */
-      function configure(userOptions) {
-        options = inherit(options, userOptions);
-      }
-
-      // TODO: remove v12, deprecated
-      const initHighlighting = () => {
-        highlightAll();
-        deprecated("10.6.0", "initHighlighting() deprecated.  Use highlightAll() now.");
-      };
-
-      // TODO: remove v12, deprecated
-      function initHighlightingOnLoad() {
-        highlightAll();
-        deprecated("10.6.0", "initHighlightingOnLoad() deprecated.  Use highlightAll() now.");
-      }
-
-      let wantsHighlight = false;
-
-      /**
-       * auto-highlights all pre>code elements on the page
-       */
-      function highlightAll() {
-        // if we are called too early in the loading process
-        if (document.readyState === "loading") {
-          wantsHighlight = true;
-          return;
-        }
-
-        const blocks = document.querySelectorAll(options.cssSelector);
-        blocks.forEach(highlightElement);
-      }
-
-      function boot() {
-        // if a highlight was requested before DOM was loaded, do now
-        if (wantsHighlight) highlightAll();
-      }
-
-      // make sure we are in the browser environment
-      if (typeof window !== 'undefined' && window.addEventListener) {
-        window.addEventListener('DOMContentLoaded', boot, false);
-      }
-
-      /**
-       * Register a language grammar module
-       *
-       * @param {string} languageName
-       * @param {LanguageFn} languageDefinition
-       */
-      function registerLanguage(languageName, languageDefinition) {
-        let lang = null;
-        try {
-          lang = languageDefinition(hljs);
-        } catch (error$1) {
-          error("Language definition for '{}' could not be registered.".replace("{}", languageName));
-          // hard or soft error
-          if (!SAFE_MODE) { throw error$1; } else { error(error$1); }
-          // languages that have serious errors are replaced with essentially a
-          // "plaintext" stand-in so that the code blocks will still get normal
-          // css classes applied to them - and one bad language won't break the
-          // entire highlighter
-          lang = PLAINTEXT_LANGUAGE;
-        }
-        // give it a temporary name if it doesn't have one in the meta-data
-        if (!lang.name) lang.name = languageName;
-        languages[languageName] = lang;
-        lang.rawDefinition = languageDefinition.bind(null, hljs);
-
-        if (lang.aliases) {
-          registerAliases(lang.aliases, { languageName });
-        }
-      }
-
-      /**
-       * Remove a language grammar module
-       *
-       * @param {string} languageName
-       */
-      function unregisterLanguage(languageName) {
-        delete languages[languageName];
-        for (const alias of Object.keys(aliases)) {
-          if (aliases[alias] === languageName) {
-            delete aliases[alias];
-          }
-        }
-      }
-
-      /**
-       * @returns {string[]} List of language internal names
-       */
-      function listLanguages() {
-        return Object.keys(languages);
-      }
-
-      /**
-       * @param {string} name - name of the language to retrieve
-       * @returns {Language | undefined}
-       */
-      function getLanguage(name) {
-        name = (name || '').toLowerCase();
-        return languages[name] || languages[aliases[name]];
-      }
-
-      /**
-       *
-       * @param {string|string[]} aliasList - single alias or list of aliases
-       * @param {{languageName: string}} opts
-       */
-      function registerAliases(aliasList, { languageName }) {
-        if (typeof aliasList === 'string') {
-          aliasList = [aliasList];
-        }
-        aliasList.forEach(alias => { aliases[alias.toLowerCase()] = languageName; });
-      }
-
-      /**
-       * Determines if a given language has auto-detection enabled
-       * @param {string} name - name of the language
-       */
-      function autoDetection(name) {
-        const lang = getLanguage(name);
-        return lang && !lang.disableAutodetect;
-      }
-
-      /**
-       * Upgrades the old highlightBlock plugins to the new
-       * highlightElement API
-       * @param {HLJSPlugin} plugin
-       */
-      function upgradePluginAPI(plugin) {
-        // TODO: remove with v12
-        if (plugin["before:highlightBlock"] && !plugin["before:highlightElement"]) {
-          plugin["before:highlightElement"] = (data) => {
-            plugin["before:highlightBlock"](
-              Object.assign({ block: data.el }, data)
-            );
-          };
-        }
-        if (plugin["after:highlightBlock"] && !plugin["after:highlightElement"]) {
-          plugin["after:highlightElement"] = (data) => {
-            plugin["after:highlightBlock"](
-              Object.assign({ block: data.el }, data)
-            );
-          };
-        }
-      }
-
-      /**
-       * @param {HLJSPlugin} plugin
-       */
-      function addPlugin(plugin) {
-        upgradePluginAPI(plugin);
-        plugins.push(plugin);
-      }
-
-      /**
-       *
-       * @param {PluginEvent} event
-       * @param {any} args
-       */
-      function fire(event, args) {
-        const cb = event;
-        plugins.forEach(function(plugin) {
-          if (plugin[cb]) {
-            plugin[cb](args);
-          }
-        });
-      }
-
-      /**
-       * DEPRECATED
-       * @param {HighlightedHTMLElement} el
-       */
-      function deprecateHighlightBlock(el) {
-        deprecated("10.7.0", "highlightBlock will be removed entirely in v12.0");
-        deprecated("10.7.0", "Please use highlightElement now.");
-
-        return highlightElement(el);
-      }
-
-      /* Interface definition */
-      Object.assign(hljs, {
-        highlight,
-        highlightAuto,
-        highlightAll,
-        highlightElement,
-        // TODO: Remove with v12 API
-        highlightBlock: deprecateHighlightBlock,
-        configure,
-        initHighlighting,
-        initHighlightingOnLoad,
-        registerLanguage,
-        unregisterLanguage,
-        listLanguages,
-        getLanguage,
-        registerAliases,
-        autoDetection,
-        inherit,
-        addPlugin
-      });
-
-      hljs.debugMode = function() { SAFE_MODE = false; };
-      hljs.safeMode = function() { SAFE_MODE = true; };
-      hljs.versionString = version;
-
-      hljs.regex = {
-        concat: concat,
-        lookahead: lookahead,
-        either: either,
-        optional: optional,
-        anyNumberOfTimes: anyNumberOfTimes
-      };
-
-      for (const key in MODES$1) {
-        // @ts-ignore
-        if (typeof MODES$1[key] === "object") {
-          // @ts-ignore
-          deepFreezeEs6.exports(MODES$1[key]);
-        }
-      }
-
-      // merge all the modes/regexes into our main object
-      Object.assign(hljs, MODES$1);
-
-      return hljs;
-    };
-
-    // export an "instance" of the highlighter
-    var HighlightJS = HLJS({});
-
-    /*
-    Language: Bash
-    Author: vah <vahtenberg@gmail.com>
-    Contributrors: Benjamin Pannell <contact@sierrasoftworks.com>
-    Website: https://www.gnu.org/software/bash/
-    Category: common
-    */
-
-    /** @type LanguageFn */
-    function bash(hljs) {
-      const regex = hljs.regex;
-      const VAR = {};
-      const BRACED_VAR = {
-        begin: /\$\{/,
-        end: /\}/,
-        contains: [
-          "self",
-          {
-            begin: /:-/,
-            contains: [ VAR ]
-          } // default values
-        ]
-      };
-      Object.assign(VAR, {
-        className: 'variable',
-        variants: [
-          { begin: regex.concat(/\$[\w\d#@][\w\d_]*/,
-            // negative look-ahead tries to avoid matching patterns that are not
-            // Perl at all like $ident$, @ident@, etc.
-            `(?![\\w\\d])(?![$])`) },
-          BRACED_VAR
-        ]
-      });
-
-      const SUBST = {
-        className: 'subst',
-        begin: /\$\(/,
-        end: /\)/,
-        contains: [ hljs.BACKSLASH_ESCAPE ]
-      };
-      const HERE_DOC = {
-        begin: /<<-?\s*(?=\w+)/,
-        starts: { contains: [
-          hljs.END_SAME_AS_BEGIN({
-            begin: /(\w+)/,
-            end: /(\w+)/,
-            className: 'string'
-          })
-        ] }
-      };
-      const QUOTE_STRING = {
-        className: 'string',
-        begin: /"/,
-        end: /"/,
-        contains: [
-          hljs.BACKSLASH_ESCAPE,
-          VAR,
-          SUBST
-        ]
-      };
-      SUBST.contains.push(QUOTE_STRING);
-      const ESCAPED_QUOTE = {
-        className: '',
-        begin: /\\"/
-
-      };
-      const APOS_STRING = {
-        className: 'string',
-        begin: /'/,
-        end: /'/
-      };
-      const ARITHMETIC = {
-        begin: /\$\(\(/,
-        end: /\)\)/,
-        contains: [
-          {
-            begin: /\d+#[0-9a-f]+/,
-            className: "number"
-          },
-          hljs.NUMBER_MODE,
-          VAR
-        ]
-      };
-      const SH_LIKE_SHELLS = [
-        "fish",
-        "bash",
-        "zsh",
-        "sh",
-        "csh",
-        "ksh",
-        "tcsh",
-        "dash",
-        "scsh",
-      ];
-      const KNOWN_SHEBANG = hljs.SHEBANG({
-        binary: `(${SH_LIKE_SHELLS.join("|")})`,
-        relevance: 10
-      });
-      const FUNCTION = {
-        className: 'function',
-        begin: /\w[\w\d_]*\s*\(\s*\)\s*\{/,
-        returnBegin: true,
-        contains: [ hljs.inherit(hljs.TITLE_MODE, { begin: /\w[\w\d_]*/ }) ],
-        relevance: 0
-      };
-
-      const KEYWORDS = [
-        "if",
-        "then",
-        "else",
-        "elif",
-        "fi",
-        "for",
-        "while",
-        "in",
-        "do",
-        "done",
-        "case",
-        "esac",
-        "function"
-      ];
-
-      const LITERALS = [
-        "true",
-        "false"
-      ];
-
-      // to consume paths to prevent keyword matches inside them
-      const PATH_MODE = { match: /(\/[a-z._-]+)+/ };
-
-      // http://www.gnu.org/software/bash/manual/html_node/Shell-Builtin-Commands.html
-      const SHELL_BUILT_INS = [
-        "break",
-        "cd",
-        "continue",
-        "eval",
-        "exec",
-        "exit",
-        "export",
-        "getopts",
-        "hash",
-        "pwd",
-        "readonly",
-        "return",
-        "shift",
-        "test",
-        "times",
-        "trap",
-        "umask",
-        "unset"
-      ];
-
-      const BASH_BUILT_INS = [
-        "alias",
-        "bind",
-        "builtin",
-        "caller",
-        "command",
-        "declare",
-        "echo",
-        "enable",
-        "help",
-        "let",
-        "local",
-        "logout",
-        "mapfile",
-        "printf",
-        "read",
-        "readarray",
-        "source",
-        "type",
-        "typeset",
-        "ulimit",
-        "unalias"
-      ];
-
-      const ZSH_BUILT_INS = [
-        "autoload",
-        "bg",
-        "bindkey",
-        "bye",
-        "cap",
-        "chdir",
-        "clone",
-        "comparguments",
-        "compcall",
-        "compctl",
-        "compdescribe",
-        "compfiles",
-        "compgroups",
-        "compquote",
-        "comptags",
-        "comptry",
-        "compvalues",
-        "dirs",
-        "disable",
-        "disown",
-        "echotc",
-        "echoti",
-        "emulate",
-        "fc",
-        "fg",
-        "float",
-        "functions",
-        "getcap",
-        "getln",
-        "history",
-        "integer",
-        "jobs",
-        "kill",
-        "limit",
-        "log",
-        "noglob",
-        "popd",
-        "print",
-        "pushd",
-        "pushln",
-        "rehash",
-        "sched",
-        "setcap",
-        "setopt",
-        "stat",
-        "suspend",
-        "ttyctl",
-        "unfunction",
-        "unhash",
-        "unlimit",
-        "unsetopt",
-        "vared",
-        "wait",
-        "whence",
-        "where",
-        "which",
-        "zcompile",
-        "zformat",
-        "zftp",
-        "zle",
-        "zmodload",
-        "zparseopts",
-        "zprof",
-        "zpty",
-        "zregexparse",
-        "zsocket",
-        "zstyle",
-        "ztcp"
-      ];
-
-      const GNU_CORE_UTILS = [
-        "chcon",
-        "chgrp",
-        "chown",
-        "chmod",
-        "cp",
-        "dd",
-        "df",
-        "dir",
-        "dircolors",
-        "ln",
-        "ls",
-        "mkdir",
-        "mkfifo",
-        "mknod",
-        "mktemp",
-        "mv",
-        "realpath",
-        "rm",
-        "rmdir",
-        "shred",
-        "sync",
-        "touch",
-        "truncate",
-        "vdir",
-        "b2sum",
-        "base32",
-        "base64",
-        "cat",
-        "cksum",
-        "comm",
-        "csplit",
-        "cut",
-        "expand",
-        "fmt",
-        "fold",
-        "head",
-        "join",
-        "md5sum",
-        "nl",
-        "numfmt",
-        "od",
-        "paste",
-        "ptx",
-        "pr",
-        "sha1sum",
-        "sha224sum",
-        "sha256sum",
-        "sha384sum",
-        "sha512sum",
-        "shuf",
-        "sort",
-        "split",
-        "sum",
-        "tac",
-        "tail",
-        "tr",
-        "tsort",
-        "unexpand",
-        "uniq",
-        "wc",
-        "arch",
-        "basename",
-        "chroot",
-        "date",
-        "dirname",
-        "du",
-        "echo",
-        "env",
-        "expr",
-        "factor",
-        // "false", // keyword literal already
-        "groups",
-        "hostid",
-        "id",
-        "link",
-        "logname",
-        "nice",
-        "nohup",
-        "nproc",
-        "pathchk",
-        "pinky",
-        "printenv",
-        "printf",
-        "pwd",
-        "readlink",
-        "runcon",
-        "seq",
-        "sleep",
-        "stat",
-        "stdbuf",
-        "stty",
-        "tee",
-        "test",
-        "timeout",
-        // "true", // keyword literal already
-        "tty",
-        "uname",
-        "unlink",
-        "uptime",
-        "users",
-        "who",
-        "whoami",
-        "yes"
-      ];
-
-      return {
-        name: 'Bash',
-        aliases: [ 'sh' ],
-        keywords: {
-          $pattern: /\b[a-z][a-z0-9._-]+\b/,
-          keyword: KEYWORDS,
-          literal: LITERALS,
-          built_in: [
-            ...SHELL_BUILT_INS,
-            ...BASH_BUILT_INS,
-            // Shell modifiers
-            "set",
-            "shopt",
-            ...ZSH_BUILT_INS,
-            ...GNU_CORE_UTILS
-          ]
-        },
-        contains: [
-          KNOWN_SHEBANG, // to catch known shells and boost relevancy
-          hljs.SHEBANG(), // to catch unknown shells but still highlight the shebang
-          FUNCTION,
-          ARITHMETIC,
-          hljs.HASH_COMMENT_MODE,
-          HERE_DOC,
-          PATH_MODE,
-          QUOTE_STRING,
-          ESCAPED_QUOTE,
-          APOS_STRING,
-          VAR
-        ]
-      };
     }
 
-    /*
-    Language: C
-    Category: common, system
-    Website: https://en.wikipedia.org/wiki/C_(programming_language)
+    /**
+     * returns a valid highlight result, without actually doing any actual work,
+     * auto highlight starts with this and it's possible for small snippets that
+     * auto-detection may not find a better match
+     * @param {string} code
+     * @returns {HighlightResult}
+     */
+    function justTextHighlightResult(code) {
+      const result = {
+        value: escape(code),
+        illegal: false,
+        relevance: 0,
+        _top: PLAINTEXT_LANGUAGE,
+        _emitter: new options.__emitter(options)
+      };
+      result._emitter.addText(code);
+      return result;
+    }
+
+    /**
+    Highlighting with language detection. Accepts a string with the code to
+    highlight. Returns an object with the following properties:
+
+    - language (detected language)
+    - relevance (int)
+    - value (an HTML string with highlighting markup)
+    - secondBest (object with the same structure for second-best heuristically
+      detected language, may be absent)
+
+      @param {string} code
+      @param {Array<string>} [languageSubset]
+      @returns {AutoHighlightResult}
     */
+    function highlightAuto(code, languageSubset) {
+      languageSubset = languageSubset || options.languages || Object.keys(languages);
+      const plaintext = justTextHighlightResult(code);
 
-    /** @type LanguageFn */
-    function c(hljs) {
-      const regex = hljs.regex;
-      // added for historic reasons because `hljs.C_LINE_COMMENT_MODE` does
-      // not include such support nor can we be sure all the grammars depending
-      // on it would desire this behavior
-      const C_LINE_COMMENT_MODE = hljs.COMMENT('//', '$', { contains: [ { begin: /\\\n/ } ] });
-      const DECLTYPE_AUTO_RE = 'decltype\\(auto\\)';
-      const NAMESPACE_RE = '[a-zA-Z_]\\w*::';
-      const TEMPLATE_ARGUMENT_RE = '<[^<>]+>';
-      const FUNCTION_TYPE_RE = '('
-        + DECLTYPE_AUTO_RE + '|'
-        + regex.optional(NAMESPACE_RE)
-        + '[a-zA-Z_]\\w*' + regex.optional(TEMPLATE_ARGUMENT_RE)
-      + ')';
+      const results = languageSubset.filter(getLanguage).filter(autoDetection).map(name =>
+        _highlight(name, code, false)
+      );
+      results.unshift(plaintext); // plaintext is always an option
 
+      const sorted = results.sort((a, b) => {
+        // sort base on relevance
+        if (a.relevance !== b.relevance) return b.relevance - a.relevance;
 
-      const TYPES = {
-        className: 'type',
-        variants: [
-          { begin: '\\b[a-z\\d_]*_t\\b' },
-          { match: /\batomic_[a-z]{3,6}\b/ }
+        // always award the tie to the base language
+        // ie if C++ and Arduino are tied, it's more likely to be C++
+        if (a.language && b.language) {
+          if (getLanguage(a.language).supersetOf === b.language) {
+            return 1;
+          } else if (getLanguage(b.language).supersetOf === a.language) {
+            return -1;
+          }
+        }
+
+        // otherwise say they are equal, which has the effect of sorting on
+        // relevance while preserving the original ordering - which is how ties
+        // have historically been settled, ie the language that comes first always
+        // wins in the case of a tie
+        return 0;
+      });
+
+      const [best, secondBest] = sorted;
+
+      /** @type {AutoHighlightResult} */
+      const result = best;
+      result.secondBest = secondBest;
+
+      return result;
+    }
+
+    /**
+     * Builds new class name for block given the language name
+     *
+     * @param {HTMLElement} element
+     * @param {string} [currentLang]
+     * @param {string} [resultLang]
+     */
+    function updateClassName(element, currentLang, resultLang) {
+      const language = (currentLang && aliases[currentLang]) || resultLang;
+
+      element.classList.add("hljs");
+      element.classList.add(`language-${language}`);
+    }
+
+    /**
+     * Applies highlighting to a DOM node containing code.
+     *
+     * @param {HighlightedHTMLElement} element - the HTML element to highlight
+    */
+    function highlightElement(element) {
+      /** @type HTMLElement */
+      let node = null;
+      const language = blockLanguage(element);
+
+      if (shouldNotHighlight(language)) return;
+
+      fire("before:highlightElement",
+        { el: element, language });
+
+      // we should be all text, no child nodes (unescaped HTML) - this is possibly
+      // an HTML injection attack - it's likely too late if this is already in
+      // production (the code has likely already done its damage by the time
+      // we're seeing it)... but we yell loudly about this so that hopefully it's
+      // more likely to be caught in development before making it to production
+      if (element.children.length > 0) {
+        if (!options.ignoreUnescapedHTML) {
+          console.warn("One of your code blocks includes unescaped HTML. This is a potentially serious security risk.");
+          console.warn("https://github.com/highlightjs/highlight.js/wiki/security");
+          console.warn("The element with unescaped HTML:");
+          console.warn(element);
+        }
+        if (options.throwUnescapedHTML) {
+          const err = new HTMLInjectionError(
+            "One of your code blocks includes unescaped HTML.",
+            element.innerHTML
+          );
+          throw err;
+        }
+      }
+
+      node = element;
+      const text = node.textContent;
+      const result = language ? highlight(text, { language, ignoreIllegals: true }) : highlightAuto(text);
+
+      element.innerHTML = result.value;
+      updateClassName(element, language, result.language);
+      element.result = {
+        language: result.language,
+        // TODO: remove with version 11.0
+        re: result.relevance,
+        relevance: result.relevance
+      };
+      if (result.secondBest) {
+        element.secondBest = {
+          language: result.secondBest.language,
+          relevance: result.secondBest.relevance
+        };
+      }
+
+      fire("after:highlightElement", { el: element, result, text });
+    }
+
+    /**
+     * Updates highlight.js global options with the passed options
+     *
+     * @param {Partial<HLJSOptions>} userOptions
+     */
+    function configure(userOptions) {
+      options = inherit(options, userOptions);
+    }
+
+    // TODO: remove v12, deprecated
+    const initHighlighting = () => {
+      highlightAll();
+      deprecated("10.6.0", "initHighlighting() deprecated.  Use highlightAll() now.");
+    };
+
+    // TODO: remove v12, deprecated
+    function initHighlightingOnLoad() {
+      highlightAll();
+      deprecated("10.6.0", "initHighlightingOnLoad() deprecated.  Use highlightAll() now.");
+    }
+
+    let wantsHighlight = false;
+
+    /**
+     * auto-highlights all pre>code elements on the page
+     */
+    function highlightAll() {
+      // if we are called too early in the loading process
+      if (document.readyState === "loading") {
+        wantsHighlight = true;
+        return;
+      }
+
+      const blocks = document.querySelectorAll(options.cssSelector);
+      blocks.forEach(highlightElement);
+    }
+
+    function boot() {
+      // if a highlight was requested before DOM was loaded, do now
+      if (wantsHighlight) highlightAll();
+    }
+
+    // make sure we are in the browser environment
+    if (typeof window !== 'undefined' && window.addEventListener) {
+      window.addEventListener('DOMContentLoaded', boot, false);
+    }
+
+    /**
+     * Register a language grammar module
+     *
+     * @param {string} languageName
+     * @param {LanguageFn} languageDefinition
+     */
+    function registerLanguage(languageName, languageDefinition) {
+      let lang = null;
+      try {
+        lang = languageDefinition(hljs);
+      } catch (error$1) {
+        error("Language definition for '{}' could not be registered.".replace("{}", languageName));
+        // hard or soft error
+        if (!SAFE_MODE) { throw error$1; } else { error(error$1); }
+        // languages that have serious errors are replaced with essentially a
+        // "plaintext" stand-in so that the code blocks will still get normal
+        // css classes applied to them - and one bad language won't break the
+        // entire highlighter
+        lang = PLAINTEXT_LANGUAGE;
+      }
+      // give it a temporary name if it doesn't have one in the meta-data
+      if (!lang.name) lang.name = languageName;
+      languages[languageName] = lang;
+      lang.rawDefinition = languageDefinition.bind(null, hljs);
+
+      if (lang.aliases) {
+        registerAliases(lang.aliases, { languageName });
+      }
+    }
+
+    /**
+     * Remove a language grammar module
+     *
+     * @param {string} languageName
+     */
+    function unregisterLanguage(languageName) {
+      delete languages[languageName];
+      for (const alias of Object.keys(aliases)) {
+        if (aliases[alias] === languageName) {
+          delete aliases[alias];
+        }
+      }
+    }
+
+    /**
+     * @returns {string[]} List of language internal names
+     */
+    function listLanguages() {
+      return Object.keys(languages);
+    }
+
+    /**
+     * @param {string} name - name of the language to retrieve
+     * @returns {Language | undefined}
+     */
+    function getLanguage(name) {
+      name = (name || '').toLowerCase();
+      return languages[name] || languages[aliases[name]];
+    }
+
+    /**
+     *
+     * @param {string|string[]} aliasList - single alias or list of aliases
+     * @param {{languageName: string}} opts
+     */
+    function registerAliases(aliasList, { languageName }) {
+      if (typeof aliasList === 'string') {
+        aliasList = [aliasList];
+      }
+      aliasList.forEach(alias => { aliases[alias.toLowerCase()] = languageName; });
+    }
+
+    /**
+     * Determines if a given language has auto-detection enabled
+     * @param {string} name - name of the language
+     */
+    function autoDetection(name) {
+      const lang = getLanguage(name);
+      return lang && !lang.disableAutodetect;
+    }
+
+    /**
+     * Upgrades the old highlightBlock plugins to the new
+     * highlightElement API
+     * @param {HLJSPlugin} plugin
+     */
+    function upgradePluginAPI(plugin) {
+      // TODO: remove with v12
+      if (plugin["before:highlightBlock"] && !plugin["before:highlightElement"]) {
+        plugin["before:highlightElement"] = (data) => {
+          plugin["before:highlightBlock"](
+            Object.assign({ block: data.el }, data)
+          );
+        };
+      }
+      if (plugin["after:highlightBlock"] && !plugin["after:highlightElement"]) {
+        plugin["after:highlightElement"] = (data) => {
+          plugin["after:highlightBlock"](
+            Object.assign({ block: data.el }, data)
+          );
+        };
+      }
+    }
+
+    /**
+     * @param {HLJSPlugin} plugin
+     */
+    function addPlugin(plugin) {
+      upgradePluginAPI(plugin);
+      plugins.push(plugin);
+    }
+
+    /**
+     * @param {HLJSPlugin} plugin
+     */
+    function removePlugin(plugin) {
+      const index = plugins.indexOf(plugin);
+      if (index !== -1) {
+        plugins.splice(index, 1);
+      }
+    }
+
+    /**
+     *
+     * @param {PluginEvent} event
+     * @param {any} args
+     */
+    function fire(event, args) {
+      const cb = event;
+      plugins.forEach(function(plugin) {
+        if (plugin[cb]) {
+          plugin[cb](args);
+        }
+      });
+    }
+
+    /**
+     * DEPRECATED
+     * @param {HighlightedHTMLElement} el
+     */
+    function deprecateHighlightBlock(el) {
+      deprecated("10.7.0", "highlightBlock will be removed entirely in v12.0");
+      deprecated("10.7.0", "Please use highlightElement now.");
+
+      return highlightElement(el);
+    }
+
+    /* Interface definition */
+    Object.assign(hljs, {
+      highlight,
+      highlightAuto,
+      highlightAll,
+      highlightElement,
+      // TODO: Remove with v12 API
+      highlightBlock: deprecateHighlightBlock,
+      configure,
+      initHighlighting,
+      initHighlightingOnLoad,
+      registerLanguage,
+      unregisterLanguage,
+      listLanguages,
+      getLanguage,
+      registerAliases,
+      autoDetection,
+      inherit,
+      addPlugin,
+      removePlugin
+    });
+
+    hljs.debugMode = function() { SAFE_MODE = false; };
+    hljs.safeMode = function() { SAFE_MODE = true; };
+    hljs.versionString = version;
+
+    hljs.regex = {
+      concat: concat,
+      lookahead: lookahead,
+      either: either,
+      optional: optional,
+      anyNumberOfTimes: anyNumberOfTimes
+    };
+
+    for (const key in MODES$1) {
+      // @ts-ignore
+      if (typeof MODES$1[key] === "object") {
+        // @ts-ignore
+        deepFreeze(MODES$1[key]);
+      }
+    }
+
+    // merge all the modes/regexes into our main object
+    Object.assign(hljs, MODES$1);
+
+    return hljs;
+  };
+
+  // Other names for the variable may break build script
+  const highlight = HLJS({});
+
+  // returns a new instance of the highlighter to be used for extensions
+  // check https://github.com/wooorm/lowlight/issues/47
+  highlight.newInstance = () => HLJS({});
+
+  // export an "instance" of the highlighter
+  var HighlightJS = highlight;
+
+  /*
+  Language: Bash
+  Author: vah <vahtenberg@gmail.com>
+  Contributrors: Benjamin Pannell <contact@sierrasoftworks.com>
+  Website: https://www.gnu.org/software/bash/
+  Category: common
+  */
+
+  /** @type LanguageFn */
+  function bash(hljs) {
+    const regex = hljs.regex;
+    const VAR = {};
+    const BRACED_VAR = {
+      begin: /\$\{/,
+      end: /\}/,
+      contains: [
+        "self",
+        {
+          begin: /:-/,
+          contains: [ VAR ]
+        } // default values
+      ]
+    };
+    Object.assign(VAR, {
+      className: 'variable',
+      variants: [
+        { begin: regex.concat(/\$[\w\d#@][\w\d_]*/,
+          // negative look-ahead tries to avoid matching patterns that are not
+          // Perl at all like $ident$, @ident@, etc.
+          `(?![\\w\\d])(?![$])`) },
+        BRACED_VAR
+      ]
+    });
+
+    const SUBST = {
+      className: 'subst',
+      begin: /\$\(/,
+      end: /\)/,
+      contains: [ hljs.BACKSLASH_ESCAPE ]
+    };
+    const HERE_DOC = {
+      begin: /<<-?\s*(?=\w+)/,
+      starts: { contains: [
+        hljs.END_SAME_AS_BEGIN({
+          begin: /(\w+)/,
+          end: /(\w+)/,
+          className: 'string'
+        })
+      ] }
+    };
+    const QUOTE_STRING = {
+      className: 'string',
+      begin: /"/,
+      end: /"/,
+      contains: [
+        hljs.BACKSLASH_ESCAPE,
+        VAR,
+        SUBST
+      ]
+    };
+    SUBST.contains.push(QUOTE_STRING);
+    const ESCAPED_QUOTE = {
+      className: '',
+      begin: /\\"/
+
+    };
+    const APOS_STRING = {
+      className: 'string',
+      begin: /'/,
+      end: /'/
+    };
+    const ARITHMETIC = {
+      begin: /\$?\(\(/,
+      end: /\)\)/,
+      contains: [
+        {
+          begin: /\d+#[0-9a-f]+/,
+          className: "number"
+        },
+        hljs.NUMBER_MODE,
+        VAR
+      ]
+    };
+    const SH_LIKE_SHELLS = [
+      "fish",
+      "bash",
+      "zsh",
+      "sh",
+      "csh",
+      "ksh",
+      "tcsh",
+      "dash",
+      "scsh",
+    ];
+    const KNOWN_SHEBANG = hljs.SHEBANG({
+      binary: `(${SH_LIKE_SHELLS.join("|")})`,
+      relevance: 10
+    });
+    const FUNCTION = {
+      className: 'function',
+      begin: /\w[\w\d_]*\s*\(\s*\)\s*\{/,
+      returnBegin: true,
+      contains: [ hljs.inherit(hljs.TITLE_MODE, { begin: /\w[\w\d_]*/ }) ],
+      relevance: 0
+    };
+
+    const KEYWORDS = [
+      "if",
+      "then",
+      "else",
+      "elif",
+      "fi",
+      "for",
+      "while",
+      "until",
+      "in",
+      "do",
+      "done",
+      "case",
+      "esac",
+      "function",
+      "select"
+    ];
+
+    const LITERALS = [
+      "true",
+      "false"
+    ];
+
+    // to consume paths to prevent keyword matches inside them
+    const PATH_MODE = { match: /(\/[a-z._-]+)+/ };
+
+    // http://www.gnu.org/software/bash/manual/html_node/Shell-Builtin-Commands.html
+    const SHELL_BUILT_INS = [
+      "break",
+      "cd",
+      "continue",
+      "eval",
+      "exec",
+      "exit",
+      "export",
+      "getopts",
+      "hash",
+      "pwd",
+      "readonly",
+      "return",
+      "shift",
+      "test",
+      "times",
+      "trap",
+      "umask",
+      "unset"
+    ];
+
+    const BASH_BUILT_INS = [
+      "alias",
+      "bind",
+      "builtin",
+      "caller",
+      "command",
+      "declare",
+      "echo",
+      "enable",
+      "help",
+      "let",
+      "local",
+      "logout",
+      "mapfile",
+      "printf",
+      "read",
+      "readarray",
+      "source",
+      "type",
+      "typeset",
+      "ulimit",
+      "unalias"
+    ];
+
+    const ZSH_BUILT_INS = [
+      "autoload",
+      "bg",
+      "bindkey",
+      "bye",
+      "cap",
+      "chdir",
+      "clone",
+      "comparguments",
+      "compcall",
+      "compctl",
+      "compdescribe",
+      "compfiles",
+      "compgroups",
+      "compquote",
+      "comptags",
+      "comptry",
+      "compvalues",
+      "dirs",
+      "disable",
+      "disown",
+      "echotc",
+      "echoti",
+      "emulate",
+      "fc",
+      "fg",
+      "float",
+      "functions",
+      "getcap",
+      "getln",
+      "history",
+      "integer",
+      "jobs",
+      "kill",
+      "limit",
+      "log",
+      "noglob",
+      "popd",
+      "print",
+      "pushd",
+      "pushln",
+      "rehash",
+      "sched",
+      "setcap",
+      "setopt",
+      "stat",
+      "suspend",
+      "ttyctl",
+      "unfunction",
+      "unhash",
+      "unlimit",
+      "unsetopt",
+      "vared",
+      "wait",
+      "whence",
+      "where",
+      "which",
+      "zcompile",
+      "zformat",
+      "zftp",
+      "zle",
+      "zmodload",
+      "zparseopts",
+      "zprof",
+      "zpty",
+      "zregexparse",
+      "zsocket",
+      "zstyle",
+      "ztcp"
+    ];
+
+    const GNU_CORE_UTILS = [
+      "chcon",
+      "chgrp",
+      "chown",
+      "chmod",
+      "cp",
+      "dd",
+      "df",
+      "dir",
+      "dircolors",
+      "ln",
+      "ls",
+      "mkdir",
+      "mkfifo",
+      "mknod",
+      "mktemp",
+      "mv",
+      "realpath",
+      "rm",
+      "rmdir",
+      "shred",
+      "sync",
+      "touch",
+      "truncate",
+      "vdir",
+      "b2sum",
+      "base32",
+      "base64",
+      "cat",
+      "cksum",
+      "comm",
+      "csplit",
+      "cut",
+      "expand",
+      "fmt",
+      "fold",
+      "head",
+      "join",
+      "md5sum",
+      "nl",
+      "numfmt",
+      "od",
+      "paste",
+      "ptx",
+      "pr",
+      "sha1sum",
+      "sha224sum",
+      "sha256sum",
+      "sha384sum",
+      "sha512sum",
+      "shuf",
+      "sort",
+      "split",
+      "sum",
+      "tac",
+      "tail",
+      "tr",
+      "tsort",
+      "unexpand",
+      "uniq",
+      "wc",
+      "arch",
+      "basename",
+      "chroot",
+      "date",
+      "dirname",
+      "du",
+      "echo",
+      "env",
+      "expr",
+      "factor",
+      // "false", // keyword literal already
+      "groups",
+      "hostid",
+      "id",
+      "link",
+      "logname",
+      "nice",
+      "nohup",
+      "nproc",
+      "pathchk",
+      "pinky",
+      "printenv",
+      "printf",
+      "pwd",
+      "readlink",
+      "runcon",
+      "seq",
+      "sleep",
+      "stat",
+      "stdbuf",
+      "stty",
+      "tee",
+      "test",
+      "timeout",
+      // "true", // keyword literal already
+      "tty",
+      "uname",
+      "unlink",
+      "uptime",
+      "users",
+      "who",
+      "whoami",
+      "yes"
+    ];
+
+    return {
+      name: 'Bash',
+      aliases: [ 'sh' ],
+      keywords: {
+        $pattern: /\b[a-z][a-z0-9._-]+\b/,
+        keyword: KEYWORDS,
+        literal: LITERALS,
+        built_in: [
+          ...SHELL_BUILT_INS,
+          ...BASH_BUILT_INS,
+          // Shell modifiers
+          "set",
+          "shopt",
+          ...ZSH_BUILT_INS,
+          ...GNU_CORE_UTILS
         ]
+      },
+      contains: [
+        KNOWN_SHEBANG, // to catch known shells and boost relevancy
+        hljs.SHEBANG(), // to catch unknown shells but still highlight the shebang
+        FUNCTION,
+        ARITHMETIC,
+        hljs.HASH_COMMENT_MODE,
+        HERE_DOC,
+        PATH_MODE,
+        QUOTE_STRING,
+        ESCAPED_QUOTE,
+        APOS_STRING,
+        VAR
+      ]
+    };
+  }
 
-      };
+  /*
+  Language: C
+  Category: common, system
+  Website: https://en.wikipedia.org/wiki/C_(programming_language)
+  */
 
-      // https://en.cppreference.com/w/cpp/language/escape
-      // \\ \x \xFF \u2837 \u00323747 \374
-      const CHARACTER_ESCAPES = '\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4,8}|[0-7]{3}|\\S)';
-      const STRINGS = {
-        className: 'string',
-        variants: [
-          {
-            begin: '(u8?|U|L)?"',
-            end: '"',
-            illegal: '\\n',
-            contains: [ hljs.BACKSLASH_ESCAPE ]
-          },
-          {
-            begin: '(u8?|U|L)?\'(' + CHARACTER_ESCAPES + "|.)",
-            end: '\'',
-            illegal: '.'
-          },
-          hljs.END_SAME_AS_BEGIN({
-            begin: /(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,
-            end: /\)([^()\\ ]{0,16})"/
-          })
-        ]
-      };
+  /** @type LanguageFn */
+  function c(hljs) {
+    const regex = hljs.regex;
+    // added for historic reasons because `hljs.C_LINE_COMMENT_MODE` does
+    // not include such support nor can we be sure all the grammars depending
+    // on it would desire this behavior
+    const C_LINE_COMMENT_MODE = hljs.COMMENT('//', '$', { contains: [ { begin: /\\\n/ } ] });
+    const DECLTYPE_AUTO_RE = 'decltype\\(auto\\)';
+    const NAMESPACE_RE = '[a-zA-Z_]\\w*::';
+    const TEMPLATE_ARGUMENT_RE = '<[^<>]+>';
+    const FUNCTION_TYPE_RE = '('
+      + DECLTYPE_AUTO_RE + '|'
+      + regex.optional(NAMESPACE_RE)
+      + '[a-zA-Z_]\\w*' + regex.optional(TEMPLATE_ARGUMENT_RE)
+    + ')';
 
-      const NUMBERS = {
-        className: 'number',
-        variants: [
-          { begin: '\\b(0b[01\']+)' },
-          { begin: '(-?)\\b([\\d\']+(\\.[\\d\']*)?|\\.[\\d\']+)((ll|LL|l|L)(u|U)?|(u|U)(ll|LL|l|L)?|f|F|b|B)' },
-          { begin: '(-?)(\\b0[xX][a-fA-F0-9\']+|(\\b[\\d\']+(\\.[\\d\']*)?|\\.[\\d\']+)([eE][-+]?[\\d\']+)?)' }
-        ],
-        relevance: 0
-      };
 
-      const PREPROCESSOR = {
-        className: 'meta',
-        begin: /#\s*[a-z]+\b/,
-        end: /$/,
-        keywords: { keyword:
-            'if else elif endif define undef warning error line '
-            + 'pragma _Pragma ifdef ifndef include' },
-        contains: [
-          {
-            begin: /\\\n/,
-            relevance: 0
-          },
-          hljs.inherit(STRINGS, { className: 'string' }),
-          {
-            className: 'string',
-            begin: /<.*?>/
-          },
-          C_LINE_COMMENT_MODE,
-          hljs.C_BLOCK_COMMENT_MODE
-        ]
-      };
+    const TYPES = {
+      className: 'type',
+      variants: [
+        { begin: '\\b[a-z\\d_]*_t\\b' },
+        { match: /\batomic_[a-z]{3,6}\b/ }
+      ]
 
-      const TITLE_MODE = {
-        className: 'title',
-        begin: regex.optional(NAMESPACE_RE) + hljs.IDENT_RE,
-        relevance: 0
-      };
+    };
 
-      const FUNCTION_TITLE = regex.optional(NAMESPACE_RE) + hljs.IDENT_RE + '\\s*\\(';
+    // https://en.cppreference.com/w/cpp/language/escape
+    // \\ \x \xFF \u2837 \u00323747 \374
+    const CHARACTER_ESCAPES = '\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4,8}|[0-7]{3}|\\S)';
+    const STRINGS = {
+      className: 'string',
+      variants: [
+        {
+          begin: '(u8?|U|L)?"',
+          end: '"',
+          illegal: '\\n',
+          contains: [ hljs.BACKSLASH_ESCAPE ]
+        },
+        {
+          begin: '(u8?|U|L)?\'(' + CHARACTER_ESCAPES + "|.)",
+          end: '\'',
+          illegal: '.'
+        },
+        hljs.END_SAME_AS_BEGIN({
+          begin: /(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,
+          end: /\)([^()\\ ]{0,16})"/
+        })
+      ]
+    };
 
-      const C_KEYWORDS = [
-        "asm",
-        "auto",
-        "break",
-        "case",
-        "continue",
-        "default",
-        "do",
-        "else",
-        "enum",
-        "extern",
-        "for",
-        "fortran",
-        "goto",
-        "if",
-        "inline",
-        "register",
-        "restrict",
-        "return",
-        "sizeof",
-        "struct",
-        "switch",
-        "typedef",
-        "union",
-        "volatile",
-        "while",
-        "_Alignas",
-        "_Alignof",
-        "_Atomic",
-        "_Generic",
-        "_Noreturn",
-        "_Static_assert",
-        "_Thread_local",
-        // aliases
-        "alignas",
-        "alignof",
-        "noreturn",
-        "static_assert",
-        "thread_local",
-        // not a C keyword but is, for all intents and purposes, treated exactly like one.
-        "_Pragma"
-      ];
+    const NUMBERS = {
+      className: 'number',
+      variants: [
+        { begin: '\\b(0b[01\']+)' },
+        { begin: '(-?)\\b([\\d\']+(\\.[\\d\']*)?|\\.[\\d\']+)((ll|LL|l|L)(u|U)?|(u|U)(ll|LL|l|L)?|f|F|b|B)' },
+        { begin: '(-?)(\\b0[xX][a-fA-F0-9\']+|(\\b[\\d\']+(\\.[\\d\']*)?|\\.[\\d\']+)([eE][-+]?[\\d\']+)?)' }
+      ],
+      relevance: 0
+    };
 
-      const C_TYPES = [
-        "float",
-        "double",
-        "signed",
-        "unsigned",
-        "int",
-        "short",
-        "long",
-        "char",
-        "void",
-        "_Bool",
-        "_Complex",
-        "_Imaginary",
-        "_Decimal32",
-        "_Decimal64",
-        "_Decimal128",
-        // modifiers
-        "const",
-        "static",
-        // aliases
-        "complex",
-        "bool",
-        "imaginary"
-      ];
+    const PREPROCESSOR = {
+      className: 'meta',
+      begin: /#\s*[a-z]+\b/,
+      end: /$/,
+      keywords: { keyword:
+          'if else elif endif define undef warning error line '
+          + 'pragma _Pragma ifdef ifndef include' },
+      contains: [
+        {
+          begin: /\\\n/,
+          relevance: 0
+        },
+        hljs.inherit(STRINGS, { className: 'string' }),
+        {
+          className: 'string',
+          begin: /<.*?>/
+        },
+        C_LINE_COMMENT_MODE,
+        hljs.C_BLOCK_COMMENT_MODE
+      ]
+    };
 
-      const KEYWORDS = {
-        keyword: C_KEYWORDS,
-        type: C_TYPES,
-        literal: 'true false NULL',
-        // TODO: apply hinting work similar to what was done in cpp.js
-        built_in: 'std string wstring cin cout cerr clog stdin stdout stderr stringstream istringstream ostringstream '
-          + 'auto_ptr deque list queue stack vector map set pair bitset multiset multimap unordered_set '
-          + 'unordered_map unordered_multiset unordered_multimap priority_queue make_pair array shared_ptr abort terminate abs acos '
-          + 'asin atan2 atan calloc ceil cosh cos exit exp fabs floor fmod fprintf fputs free frexp '
-          + 'fscanf future isalnum isalpha iscntrl isdigit isgraph islower isprint ispunct isspace isupper '
-          + 'isxdigit tolower toupper labs ldexp log10 log malloc realloc memchr memcmp memcpy memset modf pow '
-          + 'printf putchar puts scanf sinh sin snprintf sprintf sqrt sscanf strcat strchr strcmp '
-          + 'strcpy strcspn strlen strncat strncmp strncpy strpbrk strrchr strspn strstr tanh tan '
-          + 'vfprintf vprintf vsprintf endl initializer_list unique_ptr',
-      };
+    const TITLE_MODE = {
+      className: 'title',
+      begin: regex.optional(NAMESPACE_RE) + hljs.IDENT_RE,
+      relevance: 0
+    };
 
-      const EXPRESSION_CONTAINS = [
-        PREPROCESSOR,
+    const FUNCTION_TITLE = regex.optional(NAMESPACE_RE) + hljs.IDENT_RE + '\\s*\\(';
+
+    const C_KEYWORDS = [
+      "asm",
+      "auto",
+      "break",
+      "case",
+      "continue",
+      "default",
+      "do",
+      "else",
+      "enum",
+      "extern",
+      "for",
+      "fortran",
+      "goto",
+      "if",
+      "inline",
+      "register",
+      "restrict",
+      "return",
+      "sizeof",
+      "struct",
+      "switch",
+      "typedef",
+      "union",
+      "volatile",
+      "while",
+      "_Alignas",
+      "_Alignof",
+      "_Atomic",
+      "_Generic",
+      "_Noreturn",
+      "_Static_assert",
+      "_Thread_local",
+      // aliases
+      "alignas",
+      "alignof",
+      "noreturn",
+      "static_assert",
+      "thread_local",
+      // not a C keyword but is, for all intents and purposes, treated exactly like one.
+      "_Pragma"
+    ];
+
+    const C_TYPES = [
+      "float",
+      "double",
+      "signed",
+      "unsigned",
+      "int",
+      "short",
+      "long",
+      "char",
+      "void",
+      "_Bool",
+      "_Complex",
+      "_Imaginary",
+      "_Decimal32",
+      "_Decimal64",
+      "_Decimal128",
+      // modifiers
+      "const",
+      "static",
+      // aliases
+      "complex",
+      "bool",
+      "imaginary"
+    ];
+
+    const KEYWORDS = {
+      keyword: C_KEYWORDS,
+      type: C_TYPES,
+      literal: 'true false NULL',
+      // TODO: apply hinting work similar to what was done in cpp.js
+      built_in: 'std string wstring cin cout cerr clog stdin stdout stderr stringstream istringstream ostringstream '
+        + 'auto_ptr deque list queue stack vector map set pair bitset multiset multimap unordered_set '
+        + 'unordered_map unordered_multiset unordered_multimap priority_queue make_pair array shared_ptr abort terminate abs acos '
+        + 'asin atan2 atan calloc ceil cosh cos exit exp fabs floor fmod fprintf fputs free frexp '
+        + 'fscanf future isalnum isalpha iscntrl isdigit isgraph islower isprint ispunct isspace isupper '
+        + 'isxdigit tolower toupper labs ldexp log10 log malloc realloc memchr memcmp memcpy memset modf pow '
+        + 'printf putchar puts scanf sinh sin snprintf sprintf sqrt sscanf strcat strchr strcmp '
+        + 'strcpy strcspn strlen strncat strncmp strncpy strpbrk strrchr strspn strstr tanh tan '
+        + 'vfprintf vprintf vsprintf endl initializer_list unique_ptr',
+    };
+
+    const EXPRESSION_CONTAINS = [
+      PREPROCESSOR,
+      TYPES,
+      C_LINE_COMMENT_MODE,
+      hljs.C_BLOCK_COMMENT_MODE,
+      NUMBERS,
+      STRINGS
+    ];
+
+    const EXPRESSION_CONTEXT = {
+      // This mode covers expression context where we can't expect a function
+      // definition and shouldn't highlight anything that looks like one:
+      // `return some()`, `else if()`, `(x*sum(1, 2))`
+      variants: [
+        {
+          begin: /=/,
+          end: /;/
+        },
+        {
+          begin: /\(/,
+          end: /\)/
+        },
+        {
+          beginKeywords: 'new throw return else',
+          end: /;/
+        }
+      ],
+      keywords: KEYWORDS,
+      contains: EXPRESSION_CONTAINS.concat([
+        {
+          begin: /\(/,
+          end: /\)/,
+          keywords: KEYWORDS,
+          contains: EXPRESSION_CONTAINS.concat([ 'self' ]),
+          relevance: 0
+        }
+      ]),
+      relevance: 0
+    };
+
+    const FUNCTION_DECLARATION = {
+      begin: '(' + FUNCTION_TYPE_RE + '[\\*&\\s]+)+' + FUNCTION_TITLE,
+      returnBegin: true,
+      end: /[{;=]/,
+      excludeEnd: true,
+      keywords: KEYWORDS,
+      illegal: /[^\w\s\*&:<>.]/,
+      contains: [
+        { // to prevent it from being confused as the function title
+          begin: DECLTYPE_AUTO_RE,
+          keywords: KEYWORDS,
+          relevance: 0
+        },
+        {
+          begin: FUNCTION_TITLE,
+          returnBegin: true,
+          contains: [ hljs.inherit(TITLE_MODE, { className: "title.function" }) ],
+          relevance: 0
+        },
+        // allow for multiple declarations, e.g.:
+        // extern void f(int), g(char);
+        {
+          relevance: 0,
+          match: /,/
+        },
+        {
+          className: 'params',
+          begin: /\(/,
+          end: /\)/,
+          keywords: KEYWORDS,
+          relevance: 0,
+          contains: [
+            C_LINE_COMMENT_MODE,
+            hljs.C_BLOCK_COMMENT_MODE,
+            STRINGS,
+            NUMBERS,
+            TYPES,
+            // Count matching parentheses.
+            {
+              begin: /\(/,
+              end: /\)/,
+              keywords: KEYWORDS,
+              relevance: 0,
+              contains: [
+                'self',
+                C_LINE_COMMENT_MODE,
+                hljs.C_BLOCK_COMMENT_MODE,
+                STRINGS,
+                NUMBERS,
+                TYPES
+              ]
+            }
+          ]
+        },
         TYPES,
         C_LINE_COMMENT_MODE,
         hljs.C_BLOCK_COMMENT_MODE,
-        NUMBERS,
-        STRINGS
-      ];
+        PREPROCESSOR
+      ]
+    };
 
-      const EXPRESSION_CONTEXT = {
-        // This mode covers expression context where we can't expect a function
-        // definition and shouldn't highlight anything that looks like one:
-        // `return some()`, `else if()`, `(x*sum(1, 2))`
-        variants: [
+    return {
+      name: "C",
+      aliases: [ 'h' ],
+      keywords: KEYWORDS,
+      // Until differentiations are added between `c` and `cpp`, `c` will
+      // not be auto-detected to avoid auto-detect conflicts between C and C++
+      disableAutodetect: true,
+      illegal: '</',
+      contains: [].concat(
+        EXPRESSION_CONTEXT,
+        FUNCTION_DECLARATION,
+        EXPRESSION_CONTAINS,
+        [
+          PREPROCESSOR,
           {
-            begin: /=/,
-            end: /;/
+            begin: hljs.IDENT_RE + '::',
+            keywords: KEYWORDS
           },
           {
-            begin: /\(/,
-            end: /\)/
-          },
-          {
-            beginKeywords: 'new throw return else',
-            end: /;/
-          }
-        ],
-        keywords: KEYWORDS,
-        contains: EXPRESSION_CONTAINS.concat([
-          {
-            begin: /\(/,
-            end: /\)/,
-            keywords: KEYWORDS,
-            contains: EXPRESSION_CONTAINS.concat([ 'self' ]),
-            relevance: 0
+            className: 'class',
+            beginKeywords: 'enum class struct union',
+            end: /[{;:<>=]/,
+            contains: [
+              { beginKeywords: "final class struct" },
+              hljs.TITLE_MODE
+            ]
           }
         ]),
-        relevance: 0
-      };
+      exports: {
+        preprocessor: PREPROCESSOR,
+        strings: STRINGS,
+        keywords: KEYWORDS
+      }
+    };
+  }
 
-      const FUNCTION_DECLARATION = {
-        begin: '(' + FUNCTION_TYPE_RE + '[\\*&\\s]+)+' + FUNCTION_TITLE,
-        returnBegin: true,
-        end: /[{;=]/,
-        excludeEnd: true,
-        keywords: KEYWORDS,
-        illegal: /[^\w\s\*&:<>.]/,
-        contains: [
-          { // to prevent it from being confused as the function title
-            begin: DECLTYPE_AUTO_RE,
-            keywords: KEYWORDS,
-            relevance: 0
-          },
-          {
-            begin: FUNCTION_TITLE,
-            returnBegin: true,
-            contains: [ hljs.inherit(TITLE_MODE, { className: "title.function" }) ],
-            relevance: 0
-          },
-          // allow for multiple declarations, e.g.:
-          // extern void f(int), g(char);
-          {
-            relevance: 0,
-            match: /,/
-          },
-          {
-            className: 'params',
-            begin: /\(/,
-            end: /\)/,
-            keywords: KEYWORDS,
-            relevance: 0,
-            contains: [
-              C_LINE_COMMENT_MODE,
-              hljs.C_BLOCK_COMMENT_MODE,
-              STRINGS,
-              NUMBERS,
-              TYPES,
-              // Count matching parentheses.
-              {
-                begin: /\(/,
-                end: /\)/,
-                keywords: KEYWORDS,
-                relevance: 0,
-                contains: [
-                  'self',
-                  C_LINE_COMMENT_MODE,
-                  hljs.C_BLOCK_COMMENT_MODE,
-                  STRINGS,
-                  NUMBERS,
-                  TYPES
-                ]
-              }
-            ]
-          },
-          TYPES,
-          C_LINE_COMMENT_MODE,
-          hljs.C_BLOCK_COMMENT_MODE,
-          PREPROCESSOR
-        ]
-      };
+  /*
+  Language: C++
+  Category: common, system
+  Website: https://isocpp.org
+  */
 
-      return {
-        name: "C",
-        aliases: [ 'h' ],
-        keywords: KEYWORDS,
-        // Until differentiations are added between `c` and `cpp`, `c` will
-        // not be auto-detected to avoid auto-detect conflicts between C and C++
-        disableAutodetect: true,
-        illegal: '</',
-        contains: [].concat(
-          EXPRESSION_CONTEXT,
-          FUNCTION_DECLARATION,
-          EXPRESSION_CONTAINS,
-          [
-            PREPROCESSOR,
+  /** @type LanguageFn */
+  function cpp(hljs) {
+    const regex = hljs.regex;
+    // added for historic reasons because `hljs.C_LINE_COMMENT_MODE` does
+    // not include such support nor can we be sure all the grammars depending
+    // on it would desire this behavior
+    const C_LINE_COMMENT_MODE = hljs.COMMENT('//', '$', { contains: [ { begin: /\\\n/ } ] });
+    const DECLTYPE_AUTO_RE = 'decltype\\(auto\\)';
+    const NAMESPACE_RE = '[a-zA-Z_]\\w*::';
+    const TEMPLATE_ARGUMENT_RE = '<[^<>]+>';
+    const FUNCTION_TYPE_RE = '(?!struct)('
+      + DECLTYPE_AUTO_RE + '|'
+      + regex.optional(NAMESPACE_RE)
+      + '[a-zA-Z_]\\w*' + regex.optional(TEMPLATE_ARGUMENT_RE)
+    + ')';
+
+    const CPP_PRIMITIVE_TYPES = {
+      className: 'type',
+      begin: '\\b[a-z\\d_]*_t\\b'
+    };
+
+    // https://en.cppreference.com/w/cpp/language/escape
+    // \\ \x \xFF \u2837 \u00323747 \374
+    const CHARACTER_ESCAPES = '\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4,8}|[0-7]{3}|\\S)';
+    const STRINGS = {
+      className: 'string',
+      variants: [
+        {
+          begin: '(u8?|U|L)?"',
+          end: '"',
+          illegal: '\\n',
+          contains: [ hljs.BACKSLASH_ESCAPE ]
+        },
+        {
+          begin: '(u8?|U|L)?\'(' + CHARACTER_ESCAPES + '|.)',
+          end: '\'',
+          illegal: '.'
+        },
+        hljs.END_SAME_AS_BEGIN({
+          begin: /(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,
+          end: /\)([^()\\ ]{0,16})"/
+        })
+      ]
+    };
+
+    const NUMBERS = {
+      className: 'number',
+      variants: [
+        { begin: '\\b(0b[01\']+)' },
+        { begin: '(-?)\\b([\\d\']+(\\.[\\d\']*)?|\\.[\\d\']+)((ll|LL|l|L)(u|U)?|(u|U)(ll|LL|l|L)?|f|F|b|B)' },
+        { begin: '(-?)(\\b0[xX][a-fA-F0-9\']+|(\\b[\\d\']+(\\.[\\d\']*)?|\\.[\\d\']+)([eE][-+]?[\\d\']+)?)' }
+      ],
+      relevance: 0
+    };
+
+    const PREPROCESSOR = {
+      className: 'meta',
+      begin: /#\s*[a-z]+\b/,
+      end: /$/,
+      keywords: { keyword:
+          'if else elif endif define undef warning error line '
+          + 'pragma _Pragma ifdef ifndef include' },
+      contains: [
+        {
+          begin: /\\\n/,
+          relevance: 0
+        },
+        hljs.inherit(STRINGS, { className: 'string' }),
+        {
+          className: 'string',
+          begin: /<.*?>/
+        },
+        C_LINE_COMMENT_MODE,
+        hljs.C_BLOCK_COMMENT_MODE
+      ]
+    };
+
+    const TITLE_MODE = {
+      className: 'title',
+      begin: regex.optional(NAMESPACE_RE) + hljs.IDENT_RE,
+      relevance: 0
+    };
+
+    const FUNCTION_TITLE = regex.optional(NAMESPACE_RE) + hljs.IDENT_RE + '\\s*\\(';
+
+    // https://en.cppreference.com/w/cpp/keyword
+    const RESERVED_KEYWORDS = [
+      'alignas',
+      'alignof',
+      'and',
+      'and_eq',
+      'asm',
+      'atomic_cancel',
+      'atomic_commit',
+      'atomic_noexcept',
+      'auto',
+      'bitand',
+      'bitor',
+      'break',
+      'case',
+      'catch',
+      'class',
+      'co_await',
+      'co_return',
+      'co_yield',
+      'compl',
+      'concept',
+      'const_cast|10',
+      'consteval',
+      'constexpr',
+      'constinit',
+      'continue',
+      'decltype',
+      'default',
+      'delete',
+      'do',
+      'dynamic_cast|10',
+      'else',
+      'enum',
+      'explicit',
+      'export',
+      'extern',
+      'false',
+      'final',
+      'for',
+      'friend',
+      'goto',
+      'if',
+      'import',
+      'inline',
+      'module',
+      'mutable',
+      'namespace',
+      'new',
+      'noexcept',
+      'not',
+      'not_eq',
+      'nullptr',
+      'operator',
+      'or',
+      'or_eq',
+      'override',
+      'private',
+      'protected',
+      'public',
+      'reflexpr',
+      'register',
+      'reinterpret_cast|10',
+      'requires',
+      'return',
+      'sizeof',
+      'static_assert',
+      'static_cast|10',
+      'struct',
+      'switch',
+      'synchronized',
+      'template',
+      'this',
+      'thread_local',
+      'throw',
+      'transaction_safe',
+      'transaction_safe_dynamic',
+      'true',
+      'try',
+      'typedef',
+      'typeid',
+      'typename',
+      'union',
+      'using',
+      'virtual',
+      'volatile',
+      'while',
+      'xor',
+      'xor_eq'
+    ];
+
+    // https://en.cppreference.com/w/cpp/keyword
+    const RESERVED_TYPES = [
+      'bool',
+      'char',
+      'char16_t',
+      'char32_t',
+      'char8_t',
+      'double',
+      'float',
+      'int',
+      'long',
+      'short',
+      'void',
+      'wchar_t',
+      'unsigned',
+      'signed',
+      'const',
+      'static'
+    ];
+
+    const TYPE_HINTS = [
+      'any',
+      'auto_ptr',
+      'barrier',
+      'binary_semaphore',
+      'bitset',
+      'complex',
+      'condition_variable',
+      'condition_variable_any',
+      'counting_semaphore',
+      'deque',
+      'false_type',
+      'future',
+      'imaginary',
+      'initializer_list',
+      'istringstream',
+      'jthread',
+      'latch',
+      'lock_guard',
+      'multimap',
+      'multiset',
+      'mutex',
+      'optional',
+      'ostringstream',
+      'packaged_task',
+      'pair',
+      'promise',
+      'priority_queue',
+      'queue',
+      'recursive_mutex',
+      'recursive_timed_mutex',
+      'scoped_lock',
+      'set',
+      'shared_future',
+      'shared_lock',
+      'shared_mutex',
+      'shared_timed_mutex',
+      'shared_ptr',
+      'stack',
+      'string_view',
+      'stringstream',
+      'timed_mutex',
+      'thread',
+      'true_type',
+      'tuple',
+      'unique_lock',
+      'unique_ptr',
+      'unordered_map',
+      'unordered_multimap',
+      'unordered_multiset',
+      'unordered_set',
+      'variant',
+      'vector',
+      'weak_ptr',
+      'wstring',
+      'wstring_view'
+    ];
+
+    const FUNCTION_HINTS = [
+      'abort',
+      'abs',
+      'acos',
+      'apply',
+      'as_const',
+      'asin',
+      'atan',
+      'atan2',
+      'calloc',
+      'ceil',
+      'cerr',
+      'cin',
+      'clog',
+      'cos',
+      'cosh',
+      'cout',
+      'declval',
+      'endl',
+      'exchange',
+      'exit',
+      'exp',
+      'fabs',
+      'floor',
+      'fmod',
+      'forward',
+      'fprintf',
+      'fputs',
+      'free',
+      'frexp',
+      'fscanf',
+      'future',
+      'invoke',
+      'isalnum',
+      'isalpha',
+      'iscntrl',
+      'isdigit',
+      'isgraph',
+      'islower',
+      'isprint',
+      'ispunct',
+      'isspace',
+      'isupper',
+      'isxdigit',
+      'labs',
+      'launder',
+      'ldexp',
+      'log',
+      'log10',
+      'make_pair',
+      'make_shared',
+      'make_shared_for_overwrite',
+      'make_tuple',
+      'make_unique',
+      'malloc',
+      'memchr',
+      'memcmp',
+      'memcpy',
+      'memset',
+      'modf',
+      'move',
+      'pow',
+      'printf',
+      'putchar',
+      'puts',
+      'realloc',
+      'scanf',
+      'sin',
+      'sinh',
+      'snprintf',
+      'sprintf',
+      'sqrt',
+      'sscanf',
+      'std',
+      'stderr',
+      'stdin',
+      'stdout',
+      'strcat',
+      'strchr',
+      'strcmp',
+      'strcpy',
+      'strcspn',
+      'strlen',
+      'strncat',
+      'strncmp',
+      'strncpy',
+      'strpbrk',
+      'strrchr',
+      'strspn',
+      'strstr',
+      'swap',
+      'tan',
+      'tanh',
+      'terminate',
+      'to_underlying',
+      'tolower',
+      'toupper',
+      'vfprintf',
+      'visit',
+      'vprintf',
+      'vsprintf'
+    ];
+
+    const LITERALS = [
+      'NULL',
+      'false',
+      'nullopt',
+      'nullptr',
+      'true'
+    ];
+
+    // https://en.cppreference.com/w/cpp/keyword
+    const BUILT_IN = [ '_Pragma' ];
+
+    const CPP_KEYWORDS = {
+      type: RESERVED_TYPES,
+      keyword: RESERVED_KEYWORDS,
+      literal: LITERALS,
+      built_in: BUILT_IN,
+      _type_hints: TYPE_HINTS
+    };
+
+    const FUNCTION_DISPATCH = {
+      className: 'function.dispatch',
+      relevance: 0,
+      keywords: {
+        // Only for relevance, not highlighting.
+        _hint: FUNCTION_HINTS },
+      begin: regex.concat(
+        /\b/,
+        /(?!decltype)/,
+        /(?!if)/,
+        /(?!for)/,
+        /(?!switch)/,
+        /(?!while)/,
+        hljs.IDENT_RE,
+        regex.lookahead(/(<[^<>]+>|)\s*\(/))
+    };
+
+    const EXPRESSION_CONTAINS = [
+      FUNCTION_DISPATCH,
+      PREPROCESSOR,
+      CPP_PRIMITIVE_TYPES,
+      C_LINE_COMMENT_MODE,
+      hljs.C_BLOCK_COMMENT_MODE,
+      NUMBERS,
+      STRINGS
+    ];
+
+    const EXPRESSION_CONTEXT = {
+      // This mode covers expression context where we can't expect a function
+      // definition and shouldn't highlight anything that looks like one:
+      // `return some()`, `else if()`, `(x*sum(1, 2))`
+      variants: [
+        {
+          begin: /=/,
+          end: /;/
+        },
+        {
+          begin: /\(/,
+          end: /\)/
+        },
+        {
+          beginKeywords: 'new throw return else',
+          end: /;/
+        }
+      ],
+      keywords: CPP_KEYWORDS,
+      contains: EXPRESSION_CONTAINS.concat([
+        {
+          begin: /\(/,
+          end: /\)/,
+          keywords: CPP_KEYWORDS,
+          contains: EXPRESSION_CONTAINS.concat([ 'self' ]),
+          relevance: 0
+        }
+      ]),
+      relevance: 0
+    };
+
+    const FUNCTION_DECLARATION = {
+      className: 'function',
+      begin: '(' + FUNCTION_TYPE_RE + '[\\*&\\s]+)+' + FUNCTION_TITLE,
+      returnBegin: true,
+      end: /[{;=]/,
+      excludeEnd: true,
+      keywords: CPP_KEYWORDS,
+      illegal: /[^\w\s\*&:<>.]/,
+      contains: [
+        { // to prevent it from being confused as the function title
+          begin: DECLTYPE_AUTO_RE,
+          keywords: CPP_KEYWORDS,
+          relevance: 0
+        },
+        {
+          begin: FUNCTION_TITLE,
+          returnBegin: true,
+          contains: [ TITLE_MODE ],
+          relevance: 0
+        },
+        // needed because we do not have look-behind on the below rule
+        // to prevent it from grabbing the final : in a :: pair
+        {
+          begin: /::/,
+          relevance: 0
+        },
+        // initializers
+        {
+          begin: /:/,
+          endsWithParent: true,
+          contains: [
+            STRINGS,
+            NUMBERS
+          ]
+        },
+        // allow for multiple declarations, e.g.:
+        // extern void f(int), g(char);
+        {
+          relevance: 0,
+          match: /,/
+        },
+        {
+          className: 'params',
+          begin: /\(/,
+          end: /\)/,
+          keywords: CPP_KEYWORDS,
+          relevance: 0,
+          contains: [
+            C_LINE_COMMENT_MODE,
+            hljs.C_BLOCK_COMMENT_MODE,
+            STRINGS,
+            NUMBERS,
+            CPP_PRIMITIVE_TYPES,
+            // Count matching parentheses.
             {
-              begin: hljs.IDENT_RE + '::',
-              keywords: KEYWORDS
-            },
-            {
-              className: 'class',
-              beginKeywords: 'enum class struct union',
-              end: /[{;:<>=]/,
+              begin: /\(/,
+              end: /\)/,
+              keywords: CPP_KEYWORDS,
+              relevance: 0,
               contains: [
-                { beginKeywords: "final class struct" },
-                hljs.TITLE_MODE
+                'self',
+                C_LINE_COMMENT_MODE,
+                hljs.C_BLOCK_COMMENT_MODE,
+                STRINGS,
+                NUMBERS,
+                CPP_PRIMITIVE_TYPES
               ]
             }
-          ]),
-        exports: {
-          preprocessor: PREPROCESSOR,
-          strings: STRINGS,
-          keywords: KEYWORDS
-        }
-      };
-    }
-
-    /*
-    Language: C++
-    Category: common, system
-    Website: https://isocpp.org
-    */
-
-    /** @type LanguageFn */
-    function cpp(hljs) {
-      const regex = hljs.regex;
-      // added for historic reasons because `hljs.C_LINE_COMMENT_MODE` does
-      // not include such support nor can we be sure all the grammars depending
-      // on it would desire this behavior
-      const C_LINE_COMMENT_MODE = hljs.COMMENT('//', '$', { contains: [ { begin: /\\\n/ } ] });
-      const DECLTYPE_AUTO_RE = 'decltype\\(auto\\)';
-      const NAMESPACE_RE = '[a-zA-Z_]\\w*::';
-      const TEMPLATE_ARGUMENT_RE = '<[^<>]+>';
-      const FUNCTION_TYPE_RE = '(?!struct)('
-        + DECLTYPE_AUTO_RE + '|'
-        + regex.optional(NAMESPACE_RE)
-        + '[a-zA-Z_]\\w*' + regex.optional(TEMPLATE_ARGUMENT_RE)
-      + ')';
-
-      const CPP_PRIMITIVE_TYPES = {
-        className: 'type',
-        begin: '\\b[a-z\\d_]*_t\\b'
-      };
-
-      // https://en.cppreference.com/w/cpp/language/escape
-      // \\ \x \xFF \u2837 \u00323747 \374
-      const CHARACTER_ESCAPES = '\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4,8}|[0-7]{3}|\\S)';
-      const STRINGS = {
-        className: 'string',
-        variants: [
-          {
-            begin: '(u8?|U|L)?"',
-            end: '"',
-            illegal: '\\n',
-            contains: [ hljs.BACKSLASH_ESCAPE ]
-          },
-          {
-            begin: '(u8?|U|L)?\'(' + CHARACTER_ESCAPES + '|.)',
-            end: '\'',
-            illegal: '.'
-          },
-          hljs.END_SAME_AS_BEGIN({
-            begin: /(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,
-            end: /\)([^()\\ ]{0,16})"/
-          })
-        ]
-      };
-
-      const NUMBERS = {
-        className: 'number',
-        variants: [
-          { begin: '\\b(0b[01\']+)' },
-          { begin: '(-?)\\b([\\d\']+(\\.[\\d\']*)?|\\.[\\d\']+)((ll|LL|l|L)(u|U)?|(u|U)(ll|LL|l|L)?|f|F|b|B)' },
-          { begin: '(-?)(\\b0[xX][a-fA-F0-9\']+|(\\b[\\d\']+(\\.[\\d\']*)?|\\.[\\d\']+)([eE][-+]?[\\d\']+)?)' }
-        ],
-        relevance: 0
-      };
-
-      const PREPROCESSOR = {
-        className: 'meta',
-        begin: /#\s*[a-z]+\b/,
-        end: /$/,
-        keywords: { keyword:
-            'if else elif endif define undef warning error line '
-            + 'pragma _Pragma ifdef ifndef include' },
-        contains: [
-          {
-            begin: /\\\n/,
-            relevance: 0
-          },
-          hljs.inherit(STRINGS, { className: 'string' }),
-          {
-            className: 'string',
-            begin: /<.*?>/
-          },
-          C_LINE_COMMENT_MODE,
-          hljs.C_BLOCK_COMMENT_MODE
-        ]
-      };
-
-      const TITLE_MODE = {
-        className: 'title',
-        begin: regex.optional(NAMESPACE_RE) + hljs.IDENT_RE,
-        relevance: 0
-      };
-
-      const FUNCTION_TITLE = regex.optional(NAMESPACE_RE) + hljs.IDENT_RE + '\\s*\\(';
-
-      // https://en.cppreference.com/w/cpp/keyword
-      const RESERVED_KEYWORDS = [
-        'alignas',
-        'alignof',
-        'and',
-        'and_eq',
-        'asm',
-        'atomic_cancel',
-        'atomic_commit',
-        'atomic_noexcept',
-        'auto',
-        'bitand',
-        'bitor',
-        'break',
-        'case',
-        'catch',
-        'class',
-        'co_await',
-        'co_return',
-        'co_yield',
-        'compl',
-        'concept',
-        'const_cast|10',
-        'consteval',
-        'constexpr',
-        'constinit',
-        'continue',
-        'decltype',
-        'default',
-        'delete',
-        'do',
-        'dynamic_cast|10',
-        'else',
-        'enum',
-        'explicit',
-        'export',
-        'extern',
-        'false',
-        'final',
-        'for',
-        'friend',
-        'goto',
-        'if',
-        'import',
-        'inline',
-        'module',
-        'mutable',
-        'namespace',
-        'new',
-        'noexcept',
-        'not',
-        'not_eq',
-        'nullptr',
-        'operator',
-        'or',
-        'or_eq',
-        'override',
-        'private',
-        'protected',
-        'public',
-        'reflexpr',
-        'register',
-        'reinterpret_cast|10',
-        'requires',
-        'return',
-        'sizeof',
-        'static_assert',
-        'static_cast|10',
-        'struct',
-        'switch',
-        'synchronized',
-        'template',
-        'this',
-        'thread_local',
-        'throw',
-        'transaction_safe',
-        'transaction_safe_dynamic',
-        'true',
-        'try',
-        'typedef',
-        'typeid',
-        'typename',
-        'union',
-        'using',
-        'virtual',
-        'volatile',
-        'while',
-        'xor',
-        'xor_eq'
-      ];
-
-      // https://en.cppreference.com/w/cpp/keyword
-      const RESERVED_TYPES = [
-        'bool',
-        'char',
-        'char16_t',
-        'char32_t',
-        'char8_t',
-        'double',
-        'float',
-        'int',
-        'long',
-        'short',
-        'void',
-        'wchar_t',
-        'unsigned',
-        'signed',
-        'const',
-        'static'
-      ];
-
-      const TYPE_HINTS = [
-        'any',
-        'auto_ptr',
-        'barrier',
-        'binary_semaphore',
-        'bitset',
-        'complex',
-        'condition_variable',
-        'condition_variable_any',
-        'counting_semaphore',
-        'deque',
-        'false_type',
-        'future',
-        'imaginary',
-        'initializer_list',
-        'istringstream',
-        'jthread',
-        'latch',
-        'lock_guard',
-        'multimap',
-        'multiset',
-        'mutex',
-        'optional',
-        'ostringstream',
-        'packaged_task',
-        'pair',
-        'promise',
-        'priority_queue',
-        'queue',
-        'recursive_mutex',
-        'recursive_timed_mutex',
-        'scoped_lock',
-        'set',
-        'shared_future',
-        'shared_lock',
-        'shared_mutex',
-        'shared_timed_mutex',
-        'shared_ptr',
-        'stack',
-        'string_view',
-        'stringstream',
-        'timed_mutex',
-        'thread',
-        'true_type',
-        'tuple',
-        'unique_lock',
-        'unique_ptr',
-        'unordered_map',
-        'unordered_multimap',
-        'unordered_multiset',
-        'unordered_set',
-        'variant',
-        'vector',
-        'weak_ptr',
-        'wstring',
-        'wstring_view'
-      ];
-
-      const FUNCTION_HINTS = [
-        'abort',
-        'abs',
-        'acos',
-        'apply',
-        'as_const',
-        'asin',
-        'atan',
-        'atan2',
-        'calloc',
-        'ceil',
-        'cerr',
-        'cin',
-        'clog',
-        'cos',
-        'cosh',
-        'cout',
-        'declval',
-        'endl',
-        'exchange',
-        'exit',
-        'exp',
-        'fabs',
-        'floor',
-        'fmod',
-        'forward',
-        'fprintf',
-        'fputs',
-        'free',
-        'frexp',
-        'fscanf',
-        'future',
-        'invoke',
-        'isalnum',
-        'isalpha',
-        'iscntrl',
-        'isdigit',
-        'isgraph',
-        'islower',
-        'isprint',
-        'ispunct',
-        'isspace',
-        'isupper',
-        'isxdigit',
-        'labs',
-        'launder',
-        'ldexp',
-        'log',
-        'log10',
-        'make_pair',
-        'make_shared',
-        'make_shared_for_overwrite',
-        'make_tuple',
-        'make_unique',
-        'malloc',
-        'memchr',
-        'memcmp',
-        'memcpy',
-        'memset',
-        'modf',
-        'move',
-        'pow',
-        'printf',
-        'putchar',
-        'puts',
-        'realloc',
-        'scanf',
-        'sin',
-        'sinh',
-        'snprintf',
-        'sprintf',
-        'sqrt',
-        'sscanf',
-        'std',
-        'stderr',
-        'stdin',
-        'stdout',
-        'strcat',
-        'strchr',
-        'strcmp',
-        'strcpy',
-        'strcspn',
-        'strlen',
-        'strncat',
-        'strncmp',
-        'strncpy',
-        'strpbrk',
-        'strrchr',
-        'strspn',
-        'strstr',
-        'swap',
-        'tan',
-        'tanh',
-        'terminate',
-        'to_underlying',
-        'tolower',
-        'toupper',
-        'vfprintf',
-        'visit',
-        'vprintf',
-        'vsprintf'
-      ];
-
-      const LITERALS = [
-        'NULL',
-        'false',
-        'nullopt',
-        'nullptr',
-        'true'
-      ];
-
-      // https://en.cppreference.com/w/cpp/keyword
-      const BUILT_IN = [ '_Pragma' ];
-
-      const CPP_KEYWORDS = {
-        type: RESERVED_TYPES,
-        keyword: RESERVED_KEYWORDS,
-        literal: LITERALS,
-        built_in: BUILT_IN,
-        _type_hints: TYPE_HINTS
-      };
-
-      const FUNCTION_DISPATCH = {
-        className: 'function.dispatch',
-        relevance: 0,
-        keywords: {
-          // Only for relevance, not highlighting.
-          _hint: FUNCTION_HINTS },
-        begin: regex.concat(
-          /\b/,
-          /(?!decltype)/,
-          /(?!if)/,
-          /(?!for)/,
-          /(?!switch)/,
-          /(?!while)/,
-          hljs.IDENT_RE,
-          regex.lookahead(/(<[^<>]+>|)\s*\(/))
-      };
-
-      const EXPRESSION_CONTAINS = [
-        FUNCTION_DISPATCH,
-        PREPROCESSOR,
+          ]
+        },
         CPP_PRIMITIVE_TYPES,
         C_LINE_COMMENT_MODE,
         hljs.C_BLOCK_COMMENT_MODE,
-        NUMBERS,
-        STRINGS
-      ];
+        PREPROCESSOR
+      ]
+    };
 
-      const EXPRESSION_CONTEXT = {
-        // This mode covers expression context where we can't expect a function
-        // definition and shouldn't highlight anything that looks like one:
-        // `return some()`, `else if()`, `(x*sum(1, 2))`
-        variants: [
-          {
-            begin: /=/,
-            end: /;/
-          },
-          {
-            begin: /\(/,
-            end: /\)/
-          },
-          {
-            beginKeywords: 'new throw return else',
-            end: /;/
-          }
-        ],
-        keywords: CPP_KEYWORDS,
-        contains: EXPRESSION_CONTAINS.concat([
-          {
-            begin: /\(/,
-            end: /\)/,
+    return {
+      name: 'C++',
+      aliases: [
+        'cc',
+        'c++',
+        'h++',
+        'hpp',
+        'hh',
+        'hxx',
+        'cxx'
+      ],
+      keywords: CPP_KEYWORDS,
+      illegal: '</',
+      classNameAliases: { 'function.dispatch': 'built_in' },
+      contains: [].concat(
+        EXPRESSION_CONTEXT,
+        FUNCTION_DECLARATION,
+        FUNCTION_DISPATCH,
+        EXPRESSION_CONTAINS,
+        [
+          PREPROCESSOR,
+          { // containers: ie, `vector <int> rooms (9);`
+            begin: '\\b(deque|list|queue|priority_queue|pair|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array|tuple|optional|variant|function)\\s*<(?!<)',
+            end: '>',
             keywords: CPP_KEYWORDS,
-            contains: EXPRESSION_CONTAINS.concat([ 'self' ]),
-            relevance: 0
-          }
-        ]),
-        relevance: 0
-      };
-
-      const FUNCTION_DECLARATION = {
-        className: 'function',
-        begin: '(' + FUNCTION_TYPE_RE + '[\\*&\\s]+)+' + FUNCTION_TITLE,
-        returnBegin: true,
-        end: /[{;=]/,
-        excludeEnd: true,
-        keywords: CPP_KEYWORDS,
-        illegal: /[^\w\s\*&:<>.]/,
-        contains: [
-          { // to prevent it from being confused as the function title
-            begin: DECLTYPE_AUTO_RE,
-            keywords: CPP_KEYWORDS,
-            relevance: 0
-          },
-          {
-            begin: FUNCTION_TITLE,
-            returnBegin: true,
-            contains: [ TITLE_MODE ],
-            relevance: 0
-          },
-          // needed because we do not have look-behind on the below rule
-          // to prevent it from grabbing the final : in a :: pair
-          {
-            begin: /::/,
-            relevance: 0
-          },
-          // initializers
-          {
-            begin: /:/,
-            endsWithParent: true,
             contains: [
-              STRINGS,
-              NUMBERS
+              'self',
+              CPP_PRIMITIVE_TYPES
             ]
           },
-          // allow for multiple declarations, e.g.:
-          // extern void f(int), g(char);
           {
-            relevance: 0,
-            match: /,/
+            begin: hljs.IDENT_RE + '::',
+            keywords: CPP_KEYWORDS
           },
           {
-            className: 'params',
-            begin: /\(/,
-            end: /\)/,
-            keywords: CPP_KEYWORDS,
-            relevance: 0,
+            match: [
+              // extra complexity to deal with `enum class` and `enum struct`
+              /\b(?:enum(?:\s+(?:class|struct))?|class|struct|union)/,
+              /\s+/,
+              /\w+/
+            ],
+            className: {
+              1: 'keyword',
+              3: 'title.class'
+            }
+          }
+        ])
+    };
+  }
+
+  /*
+  Language: C#
+  Author: Jason Diamond <jason@diamond.name>
+  Contributor: Nicolas LLOBERA <nllobera@gmail.com>, Pieter Vantorre <pietervantorre@gmail.com>, David Pine <david.pine@microsoft.com>
+  Website: https://docs.microsoft.com/dotnet/csharp/
+  Category: common
+  */
+
+  /** @type LanguageFn */
+  function csharp(hljs) {
+    const BUILT_IN_KEYWORDS = [
+      'bool',
+      'byte',
+      'char',
+      'decimal',
+      'delegate',
+      'double',
+      'dynamic',
+      'enum',
+      'float',
+      'int',
+      'long',
+      'nint',
+      'nuint',
+      'object',
+      'sbyte',
+      'short',
+      'string',
+      'ulong',
+      'uint',
+      'ushort'
+    ];
+    const FUNCTION_MODIFIERS = [
+      'public',
+      'private',
+      'protected',
+      'static',
+      'internal',
+      'protected',
+      'abstract',
+      'async',
+      'extern',
+      'override',
+      'unsafe',
+      'virtual',
+      'new',
+      'sealed',
+      'partial'
+    ];
+    const LITERAL_KEYWORDS = [
+      'default',
+      'false',
+      'null',
+      'true'
+    ];
+    const NORMAL_KEYWORDS = [
+      'abstract',
+      'as',
+      'base',
+      'break',
+      'case',
+      'catch',
+      'class',
+      'const',
+      'continue',
+      'do',
+      'else',
+      'event',
+      'explicit',
+      'extern',
+      'finally',
+      'fixed',
+      'for',
+      'foreach',
+      'goto',
+      'if',
+      'implicit',
+      'in',
+      'interface',
+      'internal',
+      'is',
+      'lock',
+      'namespace',
+      'new',
+      'operator',
+      'out',
+      'override',
+      'params',
+      'private',
+      'protected',
+      'public',
+      'readonly',
+      'record',
+      'ref',
+      'return',
+      'scoped',
+      'sealed',
+      'sizeof',
+      'stackalloc',
+      'static',
+      'struct',
+      'switch',
+      'this',
+      'throw',
+      'try',
+      'typeof',
+      'unchecked',
+      'unsafe',
+      'using',
+      'virtual',
+      'void',
+      'volatile',
+      'while'
+    ];
+    const CONTEXTUAL_KEYWORDS = [
+      'add',
+      'alias',
+      'and',
+      'ascending',
+      'async',
+      'await',
+      'by',
+      'descending',
+      'equals',
+      'from',
+      'get',
+      'global',
+      'group',
+      'init',
+      'into',
+      'join',
+      'let',
+      'nameof',
+      'not',
+      'notnull',
+      'on',
+      'or',
+      'orderby',
+      'partial',
+      'remove',
+      'select',
+      'set',
+      'unmanaged',
+      'value|0',
+      'var',
+      'when',
+      'where',
+      'with',
+      'yield'
+    ];
+
+    const KEYWORDS = {
+      keyword: NORMAL_KEYWORDS.concat(CONTEXTUAL_KEYWORDS),
+      built_in: BUILT_IN_KEYWORDS,
+      literal: LITERAL_KEYWORDS
+    };
+    const TITLE_MODE = hljs.inherit(hljs.TITLE_MODE, { begin: '[a-zA-Z](\\.?\\w)*' });
+    const NUMBERS = {
+      className: 'number',
+      variants: [
+        { begin: '\\b(0b[01\']+)' },
+        { begin: '(-?)\\b([\\d\']+(\\.[\\d\']*)?|\\.[\\d\']+)(u|U|l|L|ul|UL|f|F|b|B)' },
+        { begin: '(-?)(\\b0[xX][a-fA-F0-9\']+|(\\b[\\d\']+(\\.[\\d\']*)?|\\.[\\d\']+)([eE][-+]?[\\d\']+)?)' }
+      ],
+      relevance: 0
+    };
+    const VERBATIM_STRING = {
+      className: 'string',
+      begin: '@"',
+      end: '"',
+      contains: [ { begin: '""' } ]
+    };
+    const VERBATIM_STRING_NO_LF = hljs.inherit(VERBATIM_STRING, { illegal: /\n/ });
+    const SUBST = {
+      className: 'subst',
+      begin: /\{/,
+      end: /\}/,
+      keywords: KEYWORDS
+    };
+    const SUBST_NO_LF = hljs.inherit(SUBST, { illegal: /\n/ });
+    const INTERPOLATED_STRING = {
+      className: 'string',
+      begin: /\$"/,
+      end: '"',
+      illegal: /\n/,
+      contains: [
+        { begin: /\{\{/ },
+        { begin: /\}\}/ },
+        hljs.BACKSLASH_ESCAPE,
+        SUBST_NO_LF
+      ]
+    };
+    const INTERPOLATED_VERBATIM_STRING = {
+      className: 'string',
+      begin: /\$@"/,
+      end: '"',
+      contains: [
+        { begin: /\{\{/ },
+        { begin: /\}\}/ },
+        { begin: '""' },
+        SUBST
+      ]
+    };
+    const INTERPOLATED_VERBATIM_STRING_NO_LF = hljs.inherit(INTERPOLATED_VERBATIM_STRING, {
+      illegal: /\n/,
+      contains: [
+        { begin: /\{\{/ },
+        { begin: /\}\}/ },
+        { begin: '""' },
+        SUBST_NO_LF
+      ]
+    });
+    SUBST.contains = [
+      INTERPOLATED_VERBATIM_STRING,
+      INTERPOLATED_STRING,
+      VERBATIM_STRING,
+      hljs.APOS_STRING_MODE,
+      hljs.QUOTE_STRING_MODE,
+      NUMBERS,
+      hljs.C_BLOCK_COMMENT_MODE
+    ];
+    SUBST_NO_LF.contains = [
+      INTERPOLATED_VERBATIM_STRING_NO_LF,
+      INTERPOLATED_STRING,
+      VERBATIM_STRING_NO_LF,
+      hljs.APOS_STRING_MODE,
+      hljs.QUOTE_STRING_MODE,
+      NUMBERS,
+      hljs.inherit(hljs.C_BLOCK_COMMENT_MODE, { illegal: /\n/ })
+    ];
+    const STRING = { variants: [
+      INTERPOLATED_VERBATIM_STRING,
+      INTERPOLATED_STRING,
+      VERBATIM_STRING,
+      hljs.APOS_STRING_MODE,
+      hljs.QUOTE_STRING_MODE
+    ] };
+
+    const GENERIC_MODIFIER = {
+      begin: "<",
+      end: ">",
+      contains: [
+        { beginKeywords: "in out" },
+        TITLE_MODE
+      ]
+    };
+    const TYPE_IDENT_RE = hljs.IDENT_RE + '(<' + hljs.IDENT_RE + '(\\s*,\\s*' + hljs.IDENT_RE + ')*>)?(\\[\\])?';
+    const AT_IDENTIFIER = {
+      // prevents expressions like `@class` from incorrect flagging
+      // `class` as a keyword
+      begin: "@" + hljs.IDENT_RE,
+      relevance: 0
+    };
+
+    return {
+      name: 'C#',
+      aliases: [
+        'cs',
+        'c#'
+      ],
+      keywords: KEYWORDS,
+      illegal: /::/,
+      contains: [
+        hljs.COMMENT(
+          '///',
+          '$',
+          {
+            returnBegin: true,
             contains: [
-              C_LINE_COMMENT_MODE,
-              hljs.C_BLOCK_COMMENT_MODE,
-              STRINGS,
-              NUMBERS,
-              CPP_PRIMITIVE_TYPES,
-              // Count matching parentheses.
               {
-                begin: /\(/,
-                end: /\)/,
-                keywords: CPP_KEYWORDS,
-                relevance: 0,
-                contains: [
-                  'self',
-                  C_LINE_COMMENT_MODE,
-                  hljs.C_BLOCK_COMMENT_MODE,
-                  STRINGS,
-                  NUMBERS,
-                  CPP_PRIMITIVE_TYPES
+                className: 'doctag',
+                variants: [
+                  {
+                    begin: '///',
+                    relevance: 0
+                  },
+                  { begin: '<!--|-->' },
+                  {
+                    begin: '</?',
+                    end: '>'
+                  }
                 ]
               }
             ]
-          },
-          CPP_PRIMITIVE_TYPES,
-          C_LINE_COMMENT_MODE,
-          hljs.C_BLOCK_COMMENT_MODE,
-          PREPROCESSOR
-        ]
-      };
-
-      return {
-        name: 'C++',
-        aliases: [
-          'cc',
-          'c++',
-          'h++',
-          'hpp',
-          'hh',
-          'hxx',
-          'cxx'
-        ],
-        keywords: CPP_KEYWORDS,
-        illegal: '</',
-        classNameAliases: { 'function.dispatch': 'built_in' },
-        contains: [].concat(
-          EXPRESSION_CONTEXT,
-          FUNCTION_DECLARATION,
-          FUNCTION_DISPATCH,
-          EXPRESSION_CONTAINS,
-          [
-            PREPROCESSOR,
-            { // containers: ie, `vector <int> rooms (9);`
-              begin: '\\b(deque|list|queue|priority_queue|pair|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array|tuple|optional|variant|function)\\s*<(?!<)',
-              end: '>',
-              keywords: CPP_KEYWORDS,
-              contains: [
-                'self',
-                CPP_PRIMITIVE_TYPES
-              ]
-            },
+          }
+        ),
+        hljs.C_LINE_COMMENT_MODE,
+        hljs.C_BLOCK_COMMENT_MODE,
+        {
+          className: 'meta',
+          begin: '#',
+          end: '$',
+          keywords: { keyword: 'if else elif endif define undef warning error line region endregion pragma checksum' }
+        },
+        STRING,
+        NUMBERS,
+        {
+          beginKeywords: 'class interface',
+          relevance: 0,
+          end: /[{;=]/,
+          illegal: /[^\s:,]/,
+          contains: [
+            { beginKeywords: "where class" },
+            TITLE_MODE,
+            GENERIC_MODIFIER,
+            hljs.C_LINE_COMMENT_MODE,
+            hljs.C_BLOCK_COMMENT_MODE
+          ]
+        },
+        {
+          beginKeywords: 'namespace',
+          relevance: 0,
+          end: /[{;=]/,
+          illegal: /[^\s:]/,
+          contains: [
+            TITLE_MODE,
+            hljs.C_LINE_COMMENT_MODE,
+            hljs.C_BLOCK_COMMENT_MODE
+          ]
+        },
+        {
+          beginKeywords: 'record',
+          relevance: 0,
+          end: /[{;=]/,
+          illegal: /[^\s:]/,
+          contains: [
+            TITLE_MODE,
+            GENERIC_MODIFIER,
+            hljs.C_LINE_COMMENT_MODE,
+            hljs.C_BLOCK_COMMENT_MODE
+          ]
+        },
+        {
+          // [Attributes("")]
+          className: 'meta',
+          begin: '^\\s*\\[(?=[\\w])',
+          excludeBegin: true,
+          end: '\\]',
+          excludeEnd: true,
+          contains: [
             {
-              begin: hljs.IDENT_RE + '::',
-              keywords: CPP_KEYWORDS
-            },
-            {
-              match: [
-                // extra complexity to deal with `enum class` and `enum struct`
-                /\b(?:enum(?:\s+(?:class|struct))?|class|struct|union)/,
-                /\s+/,
-                /\w+/
-              ],
-              className: {
-                1: 'keyword',
-                3: 'title.class'
-              }
+              className: 'string',
+              begin: /"/,
+              end: /"/
             }
-          ])
-      };
-    }
-
-    /*
-    Language: C#
-    Author: Jason Diamond <jason@diamond.name>
-    Contributor: Nicolas LLOBERA <nllobera@gmail.com>, Pieter Vantorre <pietervantorre@gmail.com>, David Pine <david.pine@microsoft.com>
-    Website: https://docs.microsoft.com/dotnet/csharp/
-    Category: common
-    */
-
-    /** @type LanguageFn */
-    function csharp(hljs) {
-      const BUILT_IN_KEYWORDS = [
-        'bool',
-        'byte',
-        'char',
-        'decimal',
-        'delegate',
-        'double',
-        'dynamic',
-        'enum',
-        'float',
-        'int',
-        'long',
-        'nint',
-        'nuint',
-        'object',
-        'sbyte',
-        'short',
-        'string',
-        'ulong',
-        'uint',
-        'ushort'
-      ];
-      const FUNCTION_MODIFIERS = [
-        'public',
-        'private',
-        'protected',
-        'static',
-        'internal',
-        'protected',
-        'abstract',
-        'async',
-        'extern',
-        'override',
-        'unsafe',
-        'virtual',
-        'new',
-        'sealed',
-        'partial'
-      ];
-      const LITERAL_KEYWORDS = [
-        'default',
-        'false',
-        'null',
-        'true'
-      ];
-      const NORMAL_KEYWORDS = [
-        'abstract',
-        'as',
-        'base',
-        'break',
-        'case',
-        'catch',
-        'class',
-        'const',
-        'continue',
-        'do',
-        'else',
-        'event',
-        'explicit',
-        'extern',
-        'finally',
-        'fixed',
-        'for',
-        'foreach',
-        'goto',
-        'if',
-        'implicit',
-        'in',
-        'interface',
-        'internal',
-        'is',
-        'lock',
-        'namespace',
-        'new',
-        'operator',
-        'out',
-        'override',
-        'params',
-        'private',
-        'protected',
-        'public',
-        'readonly',
-        'record',
-        'ref',
-        'return',
-        'scoped',
-        'sealed',
-        'sizeof',
-        'stackalloc',
-        'static',
-        'struct',
-        'switch',
-        'this',
-        'throw',
-        'try',
-        'typeof',
-        'unchecked',
-        'unsafe',
-        'using',
-        'virtual',
-        'void',
-        'volatile',
-        'while'
-      ];
-      const CONTEXTUAL_KEYWORDS = [
-        'add',
-        'alias',
-        'and',
-        'ascending',
-        'async',
-        'await',
-        'by',
-        'descending',
-        'equals',
-        'from',
-        'get',
-        'global',
-        'group',
-        'init',
-        'into',
-        'join',
-        'let',
-        'nameof',
-        'not',
-        'notnull',
-        'on',
-        'or',
-        'orderby',
-        'partial',
-        'remove',
-        'select',
-        'set',
-        'unmanaged',
-        'value|0',
-        'var',
-        'when',
-        'where',
-        'with',
-        'yield'
-      ];
-
-      const KEYWORDS = {
-        keyword: NORMAL_KEYWORDS.concat(CONTEXTUAL_KEYWORDS),
-        built_in: BUILT_IN_KEYWORDS,
-        literal: LITERAL_KEYWORDS
-      };
-      const TITLE_MODE = hljs.inherit(hljs.TITLE_MODE, { begin: '[a-zA-Z](\\.?\\w)*' });
-      const NUMBERS = {
-        className: 'number',
-        variants: [
-          { begin: '\\b(0b[01\']+)' },
-          { begin: '(-?)\\b([\\d\']+(\\.[\\d\']*)?|\\.[\\d\']+)(u|U|l|L|ul|UL|f|F|b|B)' },
-          { begin: '(-?)(\\b0[xX][a-fA-F0-9\']+|(\\b[\\d\']+(\\.[\\d\']*)?|\\.[\\d\']+)([eE][-+]?[\\d\']+)?)' }
-        ],
-        relevance: 0
-      };
-      const VERBATIM_STRING = {
-        className: 'string',
-        begin: '@"',
-        end: '"',
-        contains: [ { begin: '""' } ]
-      };
-      const VERBATIM_STRING_NO_LF = hljs.inherit(VERBATIM_STRING, { illegal: /\n/ });
-      const SUBST = {
-        className: 'subst',
-        begin: /\{/,
-        end: /\}/,
-        keywords: KEYWORDS
-      };
-      const SUBST_NO_LF = hljs.inherit(SUBST, { illegal: /\n/ });
-      const INTERPOLATED_STRING = {
-        className: 'string',
-        begin: /\$"/,
-        end: '"',
-        illegal: /\n/,
-        contains: [
-          { begin: /\{\{/ },
-          { begin: /\}\}/ },
-          hljs.BACKSLASH_ESCAPE,
-          SUBST_NO_LF
-        ]
-      };
-      const INTERPOLATED_VERBATIM_STRING = {
-        className: 'string',
-        begin: /\$@"/,
-        end: '"',
-        contains: [
-          { begin: /\{\{/ },
-          { begin: /\}\}/ },
-          { begin: '""' },
-          SUBST
-        ]
-      };
-      const INTERPOLATED_VERBATIM_STRING_NO_LF = hljs.inherit(INTERPOLATED_VERBATIM_STRING, {
-        illegal: /\n/,
-        contains: [
-          { begin: /\{\{/ },
-          { begin: /\}\}/ },
-          { begin: '""' },
-          SUBST_NO_LF
-        ]
-      });
-      SUBST.contains = [
-        INTERPOLATED_VERBATIM_STRING,
-        INTERPOLATED_STRING,
-        VERBATIM_STRING,
-        hljs.APOS_STRING_MODE,
-        hljs.QUOTE_STRING_MODE,
-        NUMBERS,
-        hljs.C_BLOCK_COMMENT_MODE
-      ];
-      SUBST_NO_LF.contains = [
-        INTERPOLATED_VERBATIM_STRING_NO_LF,
-        INTERPOLATED_STRING,
-        VERBATIM_STRING_NO_LF,
-        hljs.APOS_STRING_MODE,
-        hljs.QUOTE_STRING_MODE,
-        NUMBERS,
-        hljs.inherit(hljs.C_BLOCK_COMMENT_MODE, { illegal: /\n/ })
-      ];
-      const STRING = { variants: [
-        INTERPOLATED_VERBATIM_STRING,
-        INTERPOLATED_STRING,
-        VERBATIM_STRING,
-        hljs.APOS_STRING_MODE,
-        hljs.QUOTE_STRING_MODE
-      ] };
-
-      const GENERIC_MODIFIER = {
-        begin: "<",
-        end: ">",
-        contains: [
-          { beginKeywords: "in out" },
-          TITLE_MODE
-        ]
-      };
-      const TYPE_IDENT_RE = hljs.IDENT_RE + '(<' + hljs.IDENT_RE + '(\\s*,\\s*' + hljs.IDENT_RE + ')*>)?(\\[\\])?';
-      const AT_IDENTIFIER = {
-        // prevents expressions like `@class` from incorrect flagging
-        // `class` as a keyword
-        begin: "@" + hljs.IDENT_RE,
-        relevance: 0
-      };
-
-      return {
-        name: 'C#',
-        aliases: [
-          'cs',
-          'c#'
-        ],
-        keywords: KEYWORDS,
-        illegal: /::/,
-        contains: [
-          hljs.COMMENT(
-            '///',
-            '$',
+          ]
+        },
+        {
+          // Expression keywords prevent 'keyword Name(...)' from being
+          // recognized as a function definition
+          beginKeywords: 'new return throw await else',
+          relevance: 0
+        },
+        {
+          className: 'function',
+          begin: '(' + TYPE_IDENT_RE + '\\s+)+' + hljs.IDENT_RE + '\\s*(<[^=]+>\\s*)?\\(',
+          returnBegin: true,
+          end: /\s*[{;=]/,
+          excludeEnd: true,
+          keywords: KEYWORDS,
+          contains: [
+            // prevents these from being highlighted `title`
             {
+              beginKeywords: FUNCTION_MODIFIERS.join(" "),
+              relevance: 0
+            },
+            {
+              begin: hljs.IDENT_RE + '\\s*(<[^=]+>\\s*)?\\(',
               returnBegin: true,
               contains: [
+                hljs.TITLE_MODE,
+                GENERIC_MODIFIER
+              ],
+              relevance: 0
+            },
+            { match: /\(\)/ },
+            {
+              className: 'params',
+              begin: /\(/,
+              end: /\)/,
+              excludeBegin: true,
+              excludeEnd: true,
+              keywords: KEYWORDS,
+              relevance: 0,
+              contains: [
+                STRING,
+                NUMBERS,
+                hljs.C_BLOCK_COMMENT_MODE
+              ]
+            },
+            hljs.C_LINE_COMMENT_MODE,
+            hljs.C_BLOCK_COMMENT_MODE
+          ]
+        },
+        AT_IDENTIFIER
+      ]
+    };
+  }
+
+  const MODES = (hljs) => {
+    return {
+      IMPORTANT: {
+        scope: 'meta',
+        begin: '!important'
+      },
+      BLOCK_COMMENT: hljs.C_BLOCK_COMMENT_MODE,
+      HEXCOLOR: {
+        scope: 'number',
+        begin: /#(([0-9a-fA-F]{3,4})|(([0-9a-fA-F]{2}){3,4}))\b/
+      },
+      FUNCTION_DISPATCH: {
+        className: "built_in",
+        begin: /[\w-]+(?=\()/
+      },
+      ATTRIBUTE_SELECTOR_MODE: {
+        scope: 'selector-attr',
+        begin: /\[/,
+        end: /\]/,
+        illegal: '$',
+        contains: [
+          hljs.APOS_STRING_MODE,
+          hljs.QUOTE_STRING_MODE
+        ]
+      },
+      CSS_NUMBER_MODE: {
+        scope: 'number',
+        begin: hljs.NUMBER_RE + '(' +
+          '%|em|ex|ch|rem' +
+          '|vw|vh|vmin|vmax' +
+          '|cm|mm|in|pt|pc|px' +
+          '|deg|grad|rad|turn' +
+          '|s|ms' +
+          '|Hz|kHz' +
+          '|dpi|dpcm|dppx' +
+          ')?',
+        relevance: 0
+      },
+      CSS_VARIABLE: {
+        className: "attr",
+        begin: /--[A-Za-z][A-Za-z0-9_-]*/
+      }
+    };
+  };
+
+  const TAGS = [
+    'a',
+    'abbr',
+    'address',
+    'article',
+    'aside',
+    'audio',
+    'b',
+    'blockquote',
+    'body',
+    'button',
+    'canvas',
+    'caption',
+    'cite',
+    'code',
+    'dd',
+    'del',
+    'details',
+    'dfn',
+    'div',
+    'dl',
+    'dt',
+    'em',
+    'fieldset',
+    'figcaption',
+    'figure',
+    'footer',
+    'form',
+    'h1',
+    'h2',
+    'h3',
+    'h4',
+    'h5',
+    'h6',
+    'header',
+    'hgroup',
+    'html',
+    'i',
+    'iframe',
+    'img',
+    'input',
+    'ins',
+    'kbd',
+    'label',
+    'legend',
+    'li',
+    'main',
+    'mark',
+    'menu',
+    'nav',
+    'object',
+    'ol',
+    'p',
+    'q',
+    'quote',
+    'samp',
+    'section',
+    'span',
+    'strong',
+    'summary',
+    'sup',
+    'table',
+    'tbody',
+    'td',
+    'textarea',
+    'tfoot',
+    'th',
+    'thead',
+    'time',
+    'tr',
+    'ul',
+    'var',
+    'video'
+  ];
+
+  const MEDIA_FEATURES = [
+    'any-hover',
+    'any-pointer',
+    'aspect-ratio',
+    'color',
+    'color-gamut',
+    'color-index',
+    'device-aspect-ratio',
+    'device-height',
+    'device-width',
+    'display-mode',
+    'forced-colors',
+    'grid',
+    'height',
+    'hover',
+    'inverted-colors',
+    'monochrome',
+    'orientation',
+    'overflow-block',
+    'overflow-inline',
+    'pointer',
+    'prefers-color-scheme',
+    'prefers-contrast',
+    'prefers-reduced-motion',
+    'prefers-reduced-transparency',
+    'resolution',
+    'scan',
+    'scripting',
+    'update',
+    'width',
+    // TODO: find a better solution?
+    'min-width',
+    'max-width',
+    'min-height',
+    'max-height'
+  ];
+
+  // https://developer.mozilla.org/en-US/docs/Web/CSS/Pseudo-classes
+  const PSEUDO_CLASSES = [
+    'active',
+    'any-link',
+    'blank',
+    'checked',
+    'current',
+    'default',
+    'defined',
+    'dir', // dir()
+    'disabled',
+    'drop',
+    'empty',
+    'enabled',
+    'first',
+    'first-child',
+    'first-of-type',
+    'fullscreen',
+    'future',
+    'focus',
+    'focus-visible',
+    'focus-within',
+    'has', // has()
+    'host', // host or host()
+    'host-context', // host-context()
+    'hover',
+    'indeterminate',
+    'in-range',
+    'invalid',
+    'is', // is()
+    'lang', // lang()
+    'last-child',
+    'last-of-type',
+    'left',
+    'link',
+    'local-link',
+    'not', // not()
+    'nth-child', // nth-child()
+    'nth-col', // nth-col()
+    'nth-last-child', // nth-last-child()
+    'nth-last-col', // nth-last-col()
+    'nth-last-of-type', //nth-last-of-type()
+    'nth-of-type', //nth-of-type()
+    'only-child',
+    'only-of-type',
+    'optional',
+    'out-of-range',
+    'past',
+    'placeholder-shown',
+    'read-only',
+    'read-write',
+    'required',
+    'right',
+    'root',
+    'scope',
+    'target',
+    'target-within',
+    'user-invalid',
+    'valid',
+    'visited',
+    'where' // where()
+  ];
+
+  // https://developer.mozilla.org/en-US/docs/Web/CSS/Pseudo-elements
+  const PSEUDO_ELEMENTS = [
+    'after',
+    'backdrop',
+    'before',
+    'cue',
+    'cue-region',
+    'first-letter',
+    'first-line',
+    'grammar-error',
+    'marker',
+    'part',
+    'placeholder',
+    'selection',
+    'slotted',
+    'spelling-error'
+  ];
+
+  const ATTRIBUTES = [
+    'align-content',
+    'align-items',
+    'align-self',
+    'all',
+    'animation',
+    'animation-delay',
+    'animation-direction',
+    'animation-duration',
+    'animation-fill-mode',
+    'animation-iteration-count',
+    'animation-name',
+    'animation-play-state',
+    'animation-timing-function',
+    'backface-visibility',
+    'background',
+    'background-attachment',
+    'background-blend-mode',
+    'background-clip',
+    'background-color',
+    'background-image',
+    'background-origin',
+    'background-position',
+    'background-repeat',
+    'background-size',
+    'block-size',
+    'border',
+    'border-block',
+    'border-block-color',
+    'border-block-end',
+    'border-block-end-color',
+    'border-block-end-style',
+    'border-block-end-width',
+    'border-block-start',
+    'border-block-start-color',
+    'border-block-start-style',
+    'border-block-start-width',
+    'border-block-style',
+    'border-block-width',
+    'border-bottom',
+    'border-bottom-color',
+    'border-bottom-left-radius',
+    'border-bottom-right-radius',
+    'border-bottom-style',
+    'border-bottom-width',
+    'border-collapse',
+    'border-color',
+    'border-image',
+    'border-image-outset',
+    'border-image-repeat',
+    'border-image-slice',
+    'border-image-source',
+    'border-image-width',
+    'border-inline',
+    'border-inline-color',
+    'border-inline-end',
+    'border-inline-end-color',
+    'border-inline-end-style',
+    'border-inline-end-width',
+    'border-inline-start',
+    'border-inline-start-color',
+    'border-inline-start-style',
+    'border-inline-start-width',
+    'border-inline-style',
+    'border-inline-width',
+    'border-left',
+    'border-left-color',
+    'border-left-style',
+    'border-left-width',
+    'border-radius',
+    'border-right',
+    'border-right-color',
+    'border-right-style',
+    'border-right-width',
+    'border-spacing',
+    'border-style',
+    'border-top',
+    'border-top-color',
+    'border-top-left-radius',
+    'border-top-right-radius',
+    'border-top-style',
+    'border-top-width',
+    'border-width',
+    'bottom',
+    'box-decoration-break',
+    'box-shadow',
+    'box-sizing',
+    'break-after',
+    'break-before',
+    'break-inside',
+    'caption-side',
+    'caret-color',
+    'clear',
+    'clip',
+    'clip-path',
+    'clip-rule',
+    'color',
+    'column-count',
+    'column-fill',
+    'column-gap',
+    'column-rule',
+    'column-rule-color',
+    'column-rule-style',
+    'column-rule-width',
+    'column-span',
+    'column-width',
+    'columns',
+    'contain',
+    'content',
+    'content-visibility',
+    'counter-increment',
+    'counter-reset',
+    'cue',
+    'cue-after',
+    'cue-before',
+    'cursor',
+    'direction',
+    'display',
+    'empty-cells',
+    'filter',
+    'flex',
+    'flex-basis',
+    'flex-direction',
+    'flex-flow',
+    'flex-grow',
+    'flex-shrink',
+    'flex-wrap',
+    'float',
+    'flow',
+    'font',
+    'font-display',
+    'font-family',
+    'font-feature-settings',
+    'font-kerning',
+    'font-language-override',
+    'font-size',
+    'font-size-adjust',
+    'font-smoothing',
+    'font-stretch',
+    'font-style',
+    'font-synthesis',
+    'font-variant',
+    'font-variant-caps',
+    'font-variant-east-asian',
+    'font-variant-ligatures',
+    'font-variant-numeric',
+    'font-variant-position',
+    'font-variation-settings',
+    'font-weight',
+    'gap',
+    'glyph-orientation-vertical',
+    'grid',
+    'grid-area',
+    'grid-auto-columns',
+    'grid-auto-flow',
+    'grid-auto-rows',
+    'grid-column',
+    'grid-column-end',
+    'grid-column-start',
+    'grid-gap',
+    'grid-row',
+    'grid-row-end',
+    'grid-row-start',
+    'grid-template',
+    'grid-template-areas',
+    'grid-template-columns',
+    'grid-template-rows',
+    'hanging-punctuation',
+    'height',
+    'hyphens',
+    'icon',
+    'image-orientation',
+    'image-rendering',
+    'image-resolution',
+    'ime-mode',
+    'inline-size',
+    'isolation',
+    'justify-content',
+    'left',
+    'letter-spacing',
+    'line-break',
+    'line-height',
+    'list-style',
+    'list-style-image',
+    'list-style-position',
+    'list-style-type',
+    'margin',
+    'margin-block',
+    'margin-block-end',
+    'margin-block-start',
+    'margin-bottom',
+    'margin-inline',
+    'margin-inline-end',
+    'margin-inline-start',
+    'margin-left',
+    'margin-right',
+    'margin-top',
+    'marks',
+    'mask',
+    'mask-border',
+    'mask-border-mode',
+    'mask-border-outset',
+    'mask-border-repeat',
+    'mask-border-slice',
+    'mask-border-source',
+    'mask-border-width',
+    'mask-clip',
+    'mask-composite',
+    'mask-image',
+    'mask-mode',
+    'mask-origin',
+    'mask-position',
+    'mask-repeat',
+    'mask-size',
+    'mask-type',
+    'max-block-size',
+    'max-height',
+    'max-inline-size',
+    'max-width',
+    'min-block-size',
+    'min-height',
+    'min-inline-size',
+    'min-width',
+    'mix-blend-mode',
+    'nav-down',
+    'nav-index',
+    'nav-left',
+    'nav-right',
+    'nav-up',
+    'none',
+    'normal',
+    'object-fit',
+    'object-position',
+    'opacity',
+    'order',
+    'orphans',
+    'outline',
+    'outline-color',
+    'outline-offset',
+    'outline-style',
+    'outline-width',
+    'overflow',
+    'overflow-wrap',
+    'overflow-x',
+    'overflow-y',
+    'padding',
+    'padding-block',
+    'padding-block-end',
+    'padding-block-start',
+    'padding-bottom',
+    'padding-inline',
+    'padding-inline-end',
+    'padding-inline-start',
+    'padding-left',
+    'padding-right',
+    'padding-top',
+    'page-break-after',
+    'page-break-before',
+    'page-break-inside',
+    'pause',
+    'pause-after',
+    'pause-before',
+    'perspective',
+    'perspective-origin',
+    'pointer-events',
+    'position',
+    'quotes',
+    'resize',
+    'rest',
+    'rest-after',
+    'rest-before',
+    'right',
+    'row-gap',
+    'scroll-margin',
+    'scroll-margin-block',
+    'scroll-margin-block-end',
+    'scroll-margin-block-start',
+    'scroll-margin-bottom',
+    'scroll-margin-inline',
+    'scroll-margin-inline-end',
+    'scroll-margin-inline-start',
+    'scroll-margin-left',
+    'scroll-margin-right',
+    'scroll-margin-top',
+    'scroll-padding',
+    'scroll-padding-block',
+    'scroll-padding-block-end',
+    'scroll-padding-block-start',
+    'scroll-padding-bottom',
+    'scroll-padding-inline',
+    'scroll-padding-inline-end',
+    'scroll-padding-inline-start',
+    'scroll-padding-left',
+    'scroll-padding-right',
+    'scroll-padding-top',
+    'scroll-snap-align',
+    'scroll-snap-stop',
+    'scroll-snap-type',
+    'scrollbar-color',
+    'scrollbar-gutter',
+    'scrollbar-width',
+    'shape-image-threshold',
+    'shape-margin',
+    'shape-outside',
+    'speak',
+    'speak-as',
+    'src', // @font-face
+    'tab-size',
+    'table-layout',
+    'text-align',
+    'text-align-all',
+    'text-align-last',
+    'text-combine-upright',
+    'text-decoration',
+    'text-decoration-color',
+    'text-decoration-line',
+    'text-decoration-style',
+    'text-emphasis',
+    'text-emphasis-color',
+    'text-emphasis-position',
+    'text-emphasis-style',
+    'text-indent',
+    'text-justify',
+    'text-orientation',
+    'text-overflow',
+    'text-rendering',
+    'text-shadow',
+    'text-transform',
+    'text-underline-position',
+    'top',
+    'transform',
+    'transform-box',
+    'transform-origin',
+    'transform-style',
+    'transition',
+    'transition-delay',
+    'transition-duration',
+    'transition-property',
+    'transition-timing-function',
+    'unicode-bidi',
+    'vertical-align',
+    'visibility',
+    'voice-balance',
+    'voice-duration',
+    'voice-family',
+    'voice-pitch',
+    'voice-range',
+    'voice-rate',
+    'voice-stress',
+    'voice-volume',
+    'white-space',
+    'widows',
+    'width',
+    'will-change',
+    'word-break',
+    'word-spacing',
+    'word-wrap',
+    'writing-mode',
+    'z-index'
+    // reverse makes sure longer attributes `font-weight` are matched fully
+    // instead of getting false positives on say `font`
+  ].reverse();
+
+  // some grammars use them all as a single group
+  const PSEUDO_SELECTORS = PSEUDO_CLASSES.concat(PSEUDO_ELEMENTS);
+
+  /*
+  Language: CSS
+  Category: common, css, web
+  Website: https://developer.mozilla.org/en-US/docs/Web/CSS
+  */
+
+  /** @type LanguageFn */
+  function css(hljs) {
+    const regex = hljs.regex;
+    const modes = MODES(hljs);
+    const VENDOR_PREFIX = { begin: /-(webkit|moz|ms|o)-(?=[a-z])/ };
+    const AT_MODIFIERS = "and or not only";
+    const AT_PROPERTY_RE = /@-?\w[\w]*(-\w+)*/; // @-webkit-keyframes
+    const IDENT_RE = '[a-zA-Z-][a-zA-Z0-9_-]*';
+    const STRINGS = [
+      hljs.APOS_STRING_MODE,
+      hljs.QUOTE_STRING_MODE
+    ];
+
+    return {
+      name: 'CSS',
+      case_insensitive: true,
+      illegal: /[=|'\$]/,
+      keywords: { keyframePosition: "from to" },
+      classNameAliases: {
+        // for visual continuity with `tag {}` and because we
+        // don't have a great class for this?
+        keyframePosition: "selector-tag" },
+      contains: [
+        modes.BLOCK_COMMENT,
+        VENDOR_PREFIX,
+        // to recognize keyframe 40% etc which are outside the scope of our
+        // attribute value mode
+        modes.CSS_NUMBER_MODE,
+        {
+          className: 'selector-id',
+          begin: /#[A-Za-z0-9_-]+/,
+          relevance: 0
+        },
+        {
+          className: 'selector-class',
+          begin: '\\.' + IDENT_RE,
+          relevance: 0
+        },
+        modes.ATTRIBUTE_SELECTOR_MODE,
+        {
+          className: 'selector-pseudo',
+          variants: [
+            { begin: ':(' + PSEUDO_CLASSES.join('|') + ')' },
+            { begin: ':(:)?(' + PSEUDO_ELEMENTS.join('|') + ')' }
+          ]
+        },
+        // we may actually need this (12/2020)
+        // { // pseudo-selector params
+        //   begin: /\(/,
+        //   end: /\)/,
+        //   contains: [ hljs.CSS_NUMBER_MODE ]
+        // },
+        modes.CSS_VARIABLE,
+        {
+          className: 'attribute',
+          begin: '\\b(' + ATTRIBUTES.join('|') + ')\\b'
+        },
+        // attribute values
+        {
+          begin: /:/,
+          end: /[;}{]/,
+          contains: [
+            modes.BLOCK_COMMENT,
+            modes.HEXCOLOR,
+            modes.IMPORTANT,
+            modes.CSS_NUMBER_MODE,
+            ...STRINGS,
+            // needed to highlight these as strings and to avoid issues with
+            // illegal characters that might be inside urls that would tigger the
+            // languages illegal stack
+            {
+              begin: /(url|data-uri)\(/,
+              end: /\)/,
+              relevance: 0, // from keywords
+              keywords: { built_in: "url data-uri" },
+              contains: [
+                ...STRINGS,
                 {
-                  className: 'doctag',
+                  className: "string",
+                  // any character other than `)` as in `url()` will be the start
+                  // of a string, which ends with `)` (from the parent mode)
+                  begin: /[^)]/,
+                  endsWithParent: true,
+                  excludeEnd: true
+                }
+              ]
+            },
+            modes.FUNCTION_DISPATCH
+          ]
+        },
+        {
+          begin: regex.lookahead(/@/),
+          end: '[{;]',
+          relevance: 0,
+          illegal: /:/, // break on Less variables @var: ...
+          contains: [
+            {
+              className: 'keyword',
+              begin: AT_PROPERTY_RE
+            },
+            {
+              begin: /\s/,
+              endsWithParent: true,
+              excludeEnd: true,
+              relevance: 0,
+              keywords: {
+                $pattern: /[a-z-]+/,
+                keyword: AT_MODIFIERS,
+                attribute: MEDIA_FEATURES.join(" ")
+              },
+              contains: [
+                {
+                  begin: /[a-z-]+(?=:)/,
+                  className: "attribute"
+                },
+                ...STRINGS,
+                modes.CSS_NUMBER_MODE
+              ]
+            }
+          ]
+        },
+        {
+          className: 'selector-tag',
+          begin: '\\b(' + TAGS.join('|') + ')\\b'
+        }
+      ]
+    };
+  }
+
+  /*
+  Language: Diff
+  Description: Unified and context diff
+  Author: Vasily Polovnyov <vast@whiteants.net>
+  Website: https://www.gnu.org/software/diffutils/
+  Category: common
+  */
+
+  /** @type LanguageFn */
+  function diff(hljs) {
+    const regex = hljs.regex;
+    return {
+      name: 'Diff',
+      aliases: [ 'patch' ],
+      contains: [
+        {
+          className: 'meta',
+          relevance: 10,
+          match: regex.either(
+            /^@@ +-\d+,\d+ +\+\d+,\d+ +@@/,
+            /^\*\*\* +\d+,\d+ +\*\*\*\*$/,
+            /^--- +\d+,\d+ +----$/
+          )
+        },
+        {
+          className: 'comment',
+          variants: [
+            {
+              begin: regex.either(
+                /Index: /,
+                /^index/,
+                /={3,}/,
+                /^-{3}/,
+                /^\*{3} /,
+                /^\+{3}/,
+                /^diff --git/
+              ),
+              end: /$/
+            },
+            { match: /^\*{15}$/ }
+          ]
+        },
+        {
+          className: 'addition',
+          begin: /^\+/,
+          end: /$/
+        },
+        {
+          className: 'deletion',
+          begin: /^-/,
+          end: /$/
+        },
+        {
+          className: 'addition',
+          begin: /^!/,
+          end: /$/
+        }
+      ]
+    };
+  }
+
+  /*
+  Language: Go
+  Author: Stephan Kountso aka StepLg <steplg@gmail.com>
+  Contributors: Evgeny Stepanischev <imbolk@gmail.com>
+  Description: Google go language (golang). For info about language
+  Website: http://golang.org/
+  Category: common, system
+  */
+
+  function go(hljs) {
+    const LITERALS = [
+      "true",
+      "false",
+      "iota",
+      "nil"
+    ];
+    const BUILT_INS = [
+      "append",
+      "cap",
+      "close",
+      "complex",
+      "copy",
+      "imag",
+      "len",
+      "make",
+      "new",
+      "panic",
+      "print",
+      "println",
+      "real",
+      "recover",
+      "delete"
+    ];
+    const TYPES = [
+      "bool",
+      "byte",
+      "complex64",
+      "complex128",
+      "error",
+      "float32",
+      "float64",
+      "int8",
+      "int16",
+      "int32",
+      "int64",
+      "string",
+      "uint8",
+      "uint16",
+      "uint32",
+      "uint64",
+      "int",
+      "uint",
+      "uintptr",
+      "rune"
+    ];
+    const KWS = [
+      "break",
+      "case",
+      "chan",
+      "const",
+      "continue",
+      "default",
+      "defer",
+      "else",
+      "fallthrough",
+      "for",
+      "func",
+      "go",
+      "goto",
+      "if",
+      "import",
+      "interface",
+      "map",
+      "package",
+      "range",
+      "return",
+      "select",
+      "struct",
+      "switch",
+      "type",
+      "var",
+    ];
+    const KEYWORDS = {
+      keyword: KWS,
+      type: TYPES,
+      literal: LITERALS,
+      built_in: BUILT_INS
+    };
+    return {
+      name: 'Go',
+      aliases: [ 'golang' ],
+      keywords: KEYWORDS,
+      illegal: '</',
+      contains: [
+        hljs.C_LINE_COMMENT_MODE,
+        hljs.C_BLOCK_COMMENT_MODE,
+        {
+          className: 'string',
+          variants: [
+            hljs.QUOTE_STRING_MODE,
+            hljs.APOS_STRING_MODE,
+            {
+              begin: '`',
+              end: '`'
+            }
+          ]
+        },
+        {
+          className: 'number',
+          variants: [
+            {
+              begin: hljs.C_NUMBER_RE + '[i]',
+              relevance: 1
+            },
+            hljs.C_NUMBER_MODE
+          ]
+        },
+        { begin: /:=/ // relevance booster
+        },
+        {
+          className: 'function',
+          beginKeywords: 'func',
+          end: '\\s*(\\{|$)',
+          excludeEnd: true,
+          contains: [
+            hljs.TITLE_MODE,
+            {
+              className: 'params',
+              begin: /\(/,
+              end: /\)/,
+              endsParent: true,
+              keywords: KEYWORDS,
+              illegal: /["']/
+            }
+          ]
+        }
+      ]
+    };
+  }
+
+  /*
+   Language: GraphQL
+   Author: John Foster (GH jf990), and others
+   Description: GraphQL is a query language for APIs
+   Category: web, common
+  */
+
+  /** @type LanguageFn */
+  function graphql(hljs) {
+    const regex = hljs.regex;
+    const GQL_NAME = /[_A-Za-z][_0-9A-Za-z]*/;
+    return {
+      name: "GraphQL",
+      aliases: [ "gql" ],
+      case_insensitive: true,
+      disableAutodetect: false,
+      keywords: {
+        keyword: [
+          "query",
+          "mutation",
+          "subscription",
+          "type",
+          "input",
+          "schema",
+          "directive",
+          "interface",
+          "union",
+          "scalar",
+          "fragment",
+          "enum",
+          "on"
+        ],
+        literal: [
+          "true",
+          "false",
+          "null"
+        ]
+      },
+      contains: [
+        hljs.HASH_COMMENT_MODE,
+        hljs.QUOTE_STRING_MODE,
+        hljs.NUMBER_MODE,
+        {
+          scope: "punctuation",
+          match: /[.]{3}/,
+          relevance: 0
+        },
+        {
+          scope: "punctuation",
+          begin: /[\!\(\)\:\=\[\]\{\|\}]{1}/,
+          relevance: 0
+        },
+        {
+          scope: "variable",
+          begin: /\$/,
+          end: /\W/,
+          excludeEnd: true,
+          relevance: 0
+        },
+        {
+          scope: "meta",
+          match: /@\w+/,
+          excludeEnd: true
+        },
+        {
+          scope: "symbol",
+          begin: regex.concat(GQL_NAME, regex.lookahead(/\s*:/)),
+          relevance: 0
+        }
+      ],
+      illegal: [
+        /[;<']/,
+        /BEGIN/
+      ]
+    };
+  }
+
+  /*
+  Language: TOML, also INI
+  Description: TOML aims to be a minimal configuration file format that's easy to read due to obvious semantics.
+  Contributors: Guillaume Gomez <guillaume1.gomez@gmail.com>
+  Category: common, config
+  Website: https://github.com/toml-lang/toml
+  */
+
+  function ini(hljs) {
+    const regex = hljs.regex;
+    const NUMBERS = {
+      className: 'number',
+      relevance: 0,
+      variants: [
+        { begin: /([+-]+)?[\d]+_[\d_]+/ },
+        { begin: hljs.NUMBER_RE }
+      ]
+    };
+    const COMMENTS = hljs.COMMENT();
+    COMMENTS.variants = [
+      {
+        begin: /;/,
+        end: /$/
+      },
+      {
+        begin: /#/,
+        end: /$/
+      }
+    ];
+    const VARIABLES = {
+      className: 'variable',
+      variants: [
+        { begin: /\$[\w\d"][\w\d_]*/ },
+        { begin: /\$\{(.*?)\}/ }
+      ]
+    };
+    const LITERALS = {
+      className: 'literal',
+      begin: /\bon|off|true|false|yes|no\b/
+    };
+    const STRINGS = {
+      className: "string",
+      contains: [ hljs.BACKSLASH_ESCAPE ],
+      variants: [
+        {
+          begin: "'''",
+          end: "'''",
+          relevance: 10
+        },
+        {
+          begin: '"""',
+          end: '"""',
+          relevance: 10
+        },
+        {
+          begin: '"',
+          end: '"'
+        },
+        {
+          begin: "'",
+          end: "'"
+        }
+      ]
+    };
+    const ARRAY = {
+      begin: /\[/,
+      end: /\]/,
+      contains: [
+        COMMENTS,
+        LITERALS,
+        VARIABLES,
+        STRINGS,
+        NUMBERS,
+        'self'
+      ],
+      relevance: 0
+    };
+
+    const BARE_KEY = /[A-Za-z0-9_-]+/;
+    const QUOTED_KEY_DOUBLE_QUOTE = /"(\\"|[^"])*"/;
+    const QUOTED_KEY_SINGLE_QUOTE = /'[^']*'/;
+    const ANY_KEY = regex.either(
+      BARE_KEY, QUOTED_KEY_DOUBLE_QUOTE, QUOTED_KEY_SINGLE_QUOTE
+    );
+    const DOTTED_KEY = regex.concat(
+      ANY_KEY, '(\\s*\\.\\s*', ANY_KEY, ')*',
+      regex.lookahead(/\s*=\s*[^#\s]/)
+    );
+
+    return {
+      name: 'TOML, also INI',
+      aliases: [ 'toml' ],
+      case_insensitive: true,
+      illegal: /\S/,
+      contains: [
+        COMMENTS,
+        {
+          className: 'section',
+          begin: /\[+/,
+          end: /\]+/
+        },
+        {
+          begin: DOTTED_KEY,
+          className: 'attr',
+          starts: {
+            end: /$/,
+            contains: [
+              COMMENTS,
+              ARRAY,
+              LITERALS,
+              VARIABLES,
+              STRINGS,
+              NUMBERS
+            ]
+          }
+        }
+      ]
+    };
+  }
+
+  // https://docs.oracle.com/javase/specs/jls/se15/html/jls-3.html#jls-3.10
+  var decimalDigits = '[0-9](_*[0-9])*';
+  var frac = `\\.(${decimalDigits})`;
+  var hexDigits = '[0-9a-fA-F](_*[0-9a-fA-F])*';
+  var NUMERIC = {
+    className: 'number',
+    variants: [
+      // DecimalFloatingPointLiteral
+      // including ExponentPart
+      { begin: `(\\b(${decimalDigits})((${frac})|\\.)?|(${frac}))` +
+        `[eE][+-]?(${decimalDigits})[fFdD]?\\b` },
+      // excluding ExponentPart
+      { begin: `\\b(${decimalDigits})((${frac})[fFdD]?\\b|\\.([fFdD]\\b)?)` },
+      { begin: `(${frac})[fFdD]?\\b` },
+      { begin: `\\b(${decimalDigits})[fFdD]\\b` },
+
+      // HexadecimalFloatingPointLiteral
+      { begin: `\\b0[xX]((${hexDigits})\\.?|(${hexDigits})?\\.(${hexDigits}))` +
+        `[pP][+-]?(${decimalDigits})[fFdD]?\\b` },
+
+      // DecimalIntegerLiteral
+      { begin: '\\b(0|[1-9](_*[0-9])*)[lL]?\\b' },
+
+      // HexIntegerLiteral
+      { begin: `\\b0[xX](${hexDigits})[lL]?\\b` },
+
+      // OctalIntegerLiteral
+      { begin: '\\b0(_*[0-7])*[lL]?\\b' },
+
+      // BinaryIntegerLiteral
+      { begin: '\\b0[bB][01](_*[01])*[lL]?\\b' },
+    ],
+    relevance: 0
+  };
+
+  /*
+  Language: Java
+  Author: Vsevolod Solovyov <vsevolod.solovyov@gmail.com>
+  Category: common, enterprise
+  Website: https://www.java.com/
+  */
+
+  /**
+   * Allows recursive regex expressions to a given depth
+   *
+   * ie: recurRegex("(abc~~~)", /~~~/g, 2) becomes:
+   * (abc(abc(abc)))
+   *
+   * @param {string} re
+   * @param {RegExp} substitution (should be a g mode regex)
+   * @param {number} depth
+   * @returns {string}``
+   */
+  function recurRegex(re, substitution, depth) {
+    if (depth === -1) return "";
+
+    return re.replace(substitution, _ => {
+      return recurRegex(re, substitution, depth - 1);
+    });
+  }
+
+  /** @type LanguageFn */
+  function java(hljs) {
+    const regex = hljs.regex;
+    const JAVA_IDENT_RE = '[\u00C0-\u02B8a-zA-Z_$][\u00C0-\u02B8a-zA-Z_$0-9]*';
+    const GENERIC_IDENT_RE = JAVA_IDENT_RE
+      + recurRegex('(?:<' + JAVA_IDENT_RE + '~~~(?:\\s*,\\s*' + JAVA_IDENT_RE + '~~~)*>)?', /~~~/g, 2);
+    const MAIN_KEYWORDS = [
+      'synchronized',
+      'abstract',
+      'private',
+      'var',
+      'static',
+      'if',
+      'const ',
+      'for',
+      'while',
+      'strictfp',
+      'finally',
+      'protected',
+      'import',
+      'native',
+      'final',
+      'void',
+      'enum',
+      'else',
+      'break',
+      'transient',
+      'catch',
+      'instanceof',
+      'volatile',
+      'case',
+      'assert',
+      'package',
+      'default',
+      'public',
+      'try',
+      'switch',
+      'continue',
+      'throws',
+      'protected',
+      'public',
+      'private',
+      'module',
+      'requires',
+      'exports',
+      'do',
+      'sealed',
+      'yield',
+      'permits'
+    ];
+
+    const BUILT_INS = [
+      'super',
+      'this'
+    ];
+
+    const LITERALS = [
+      'false',
+      'true',
+      'null'
+    ];
+
+    const TYPES = [
+      'char',
+      'boolean',
+      'long',
+      'float',
+      'int',
+      'byte',
+      'short',
+      'double'
+    ];
+
+    const KEYWORDS = {
+      keyword: MAIN_KEYWORDS,
+      literal: LITERALS,
+      type: TYPES,
+      built_in: BUILT_INS
+    };
+
+    const ANNOTATION = {
+      className: 'meta',
+      begin: '@' + JAVA_IDENT_RE,
+      contains: [
+        {
+          begin: /\(/,
+          end: /\)/,
+          contains: [ "self" ] // allow nested () inside our annotation
+        }
+      ]
+    };
+    const PARAMS = {
+      className: 'params',
+      begin: /\(/,
+      end: /\)/,
+      keywords: KEYWORDS,
+      relevance: 0,
+      contains: [ hljs.C_BLOCK_COMMENT_MODE ],
+      endsParent: true
+    };
+
+    return {
+      name: 'Java',
+      aliases: [ 'jsp' ],
+      keywords: KEYWORDS,
+      illegal: /<\/|#/,
+      contains: [
+        hljs.COMMENT(
+          '/\\*\\*',
+          '\\*/',
+          {
+            relevance: 0,
+            contains: [
+              {
+                // eat up @'s in emails to prevent them to be recognized as doctags
+                begin: /\w+@/,
+                relevance: 0
+              },
+              {
+                className: 'doctag',
+                begin: '@[A-Za-z]+'
+              }
+            ]
+          }
+        ),
+        // relevance boost
+        {
+          begin: /import java\.[a-z]+\./,
+          keywords: "import",
+          relevance: 2
+        },
+        hljs.C_LINE_COMMENT_MODE,
+        hljs.C_BLOCK_COMMENT_MODE,
+        {
+          begin: /"""/,
+          end: /"""/,
+          className: "string",
+          contains: [ hljs.BACKSLASH_ESCAPE ]
+        },
+        hljs.APOS_STRING_MODE,
+        hljs.QUOTE_STRING_MODE,
+        {
+          match: [
+            /\b(?:class|interface|enum|extends|implements|new)/,
+            /\s+/,
+            JAVA_IDENT_RE
+          ],
+          className: {
+            1: "keyword",
+            3: "title.class"
+          }
+        },
+        {
+          // Exceptions for hyphenated keywords
+          match: /non-sealed/,
+          scope: "keyword"
+        },
+        {
+          begin: [
+            regex.concat(/(?!else)/, JAVA_IDENT_RE),
+            /\s+/,
+            JAVA_IDENT_RE,
+            /\s+/,
+            /=(?!=)/
+          ],
+          className: {
+            1: "type",
+            3: "variable",
+            5: "operator"
+          }
+        },
+        {
+          begin: [
+            /record/,
+            /\s+/,
+            JAVA_IDENT_RE
+          ],
+          className: {
+            1: "keyword",
+            3: "title.class"
+          },
+          contains: [
+            PARAMS,
+            hljs.C_LINE_COMMENT_MODE,
+            hljs.C_BLOCK_COMMENT_MODE
+          ]
+        },
+        {
+          // Expression keywords prevent 'keyword Name(...)' from being
+          // recognized as a function definition
+          beginKeywords: 'new throw return else',
+          relevance: 0
+        },
+        {
+          begin: [
+            '(?:' + GENERIC_IDENT_RE + '\\s+)',
+            hljs.UNDERSCORE_IDENT_RE,
+            /\s*(?=\()/
+          ],
+          className: { 2: "title.function" },
+          keywords: KEYWORDS,
+          contains: [
+            {
+              className: 'params',
+              begin: /\(/,
+              end: /\)/,
+              keywords: KEYWORDS,
+              relevance: 0,
+              contains: [
+                ANNOTATION,
+                hljs.APOS_STRING_MODE,
+                hljs.QUOTE_STRING_MODE,
+                NUMERIC,
+                hljs.C_BLOCK_COMMENT_MODE
+              ]
+            },
+            hljs.C_LINE_COMMENT_MODE,
+            hljs.C_BLOCK_COMMENT_MODE
+          ]
+        },
+        NUMERIC,
+        ANNOTATION
+      ]
+    };
+  }
+
+  const IDENT_RE = '[A-Za-z$_][0-9A-Za-z$_]*';
+  const KEYWORDS = [
+    "as", // for exports
+    "in",
+    "of",
+    "if",
+    "for",
+    "while",
+    "finally",
+    "var",
+    "new",
+    "function",
+    "do",
+    "return",
+    "void",
+    "else",
+    "break",
+    "catch",
+    "instanceof",
+    "with",
+    "throw",
+    "case",
+    "default",
+    "try",
+    "switch",
+    "continue",
+    "typeof",
+    "delete",
+    "let",
+    "yield",
+    "const",
+    "class",
+    // JS handles these with a special rule
+    // "get",
+    // "set",
+    "debugger",
+    "async",
+    "await",
+    "static",
+    "import",
+    "from",
+    "export",
+    "extends"
+  ];
+  const LITERALS = [
+    "true",
+    "false",
+    "null",
+    "undefined",
+    "NaN",
+    "Infinity"
+  ];
+
+  // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects
+  const TYPES = [
+    // Fundamental objects
+    "Object",
+    "Function",
+    "Boolean",
+    "Symbol",
+    // numbers and dates
+    "Math",
+    "Date",
+    "Number",
+    "BigInt",
+    // text
+    "String",
+    "RegExp",
+    // Indexed collections
+    "Array",
+    "Float32Array",
+    "Float64Array",
+    "Int8Array",
+    "Uint8Array",
+    "Uint8ClampedArray",
+    "Int16Array",
+    "Int32Array",
+    "Uint16Array",
+    "Uint32Array",
+    "BigInt64Array",
+    "BigUint64Array",
+    // Keyed collections
+    "Set",
+    "Map",
+    "WeakSet",
+    "WeakMap",
+    // Structured data
+    "ArrayBuffer",
+    "SharedArrayBuffer",
+    "Atomics",
+    "DataView",
+    "JSON",
+    // Control abstraction objects
+    "Promise",
+    "Generator",
+    "GeneratorFunction",
+    "AsyncFunction",
+    // Reflection
+    "Reflect",
+    "Proxy",
+    // Internationalization
+    "Intl",
+    // WebAssembly
+    "WebAssembly"
+  ];
+
+  const ERROR_TYPES = [
+    "Error",
+    "EvalError",
+    "InternalError",
+    "RangeError",
+    "ReferenceError",
+    "SyntaxError",
+    "TypeError",
+    "URIError"
+  ];
+
+  const BUILT_IN_GLOBALS = [
+    "setInterval",
+    "setTimeout",
+    "clearInterval",
+    "clearTimeout",
+
+    "require",
+    "exports",
+
+    "eval",
+    "isFinite",
+    "isNaN",
+    "parseFloat",
+    "parseInt",
+    "decodeURI",
+    "decodeURIComponent",
+    "encodeURI",
+    "encodeURIComponent",
+    "escape",
+    "unescape"
+  ];
+
+  const BUILT_IN_VARIABLES = [
+    "arguments",
+    "this",
+    "super",
+    "console",
+    "window",
+    "document",
+    "localStorage",
+    "sessionStorage",
+    "module",
+    "global" // Node.js
+  ];
+
+  const BUILT_INS = [].concat(
+    BUILT_IN_GLOBALS,
+    TYPES,
+    ERROR_TYPES
+  );
+
+  /*
+  Language: JavaScript
+  Description: JavaScript (JS) is a lightweight, interpreted, or just-in-time compiled programming language with first-class functions.
+  Category: common, scripting, web
+  Website: https://developer.mozilla.org/en-US/docs/Web/JavaScript
+  */
+
+  /** @type LanguageFn */
+  function javascript(hljs) {
+    const regex = hljs.regex;
+    /**
+     * Takes a string like "<Booger" and checks to see
+     * if we can find a matching "</Booger" later in the
+     * content.
+     * @param {RegExpMatchArray} match
+     * @param {{after:number}} param1
+     */
+    const hasClosingTag = (match, { after }) => {
+      const tag = "</" + match[0].slice(1);
+      const pos = match.input.indexOf(tag, after);
+      return pos !== -1;
+    };
+
+    const IDENT_RE$1 = IDENT_RE;
+    const FRAGMENT = {
+      begin: '<>',
+      end: '</>'
+    };
+    // to avoid some special cases inside isTrulyOpeningTag
+    const XML_SELF_CLOSING = /<[A-Za-z0-9\\._:-]+\s*\/>/;
+    const XML_TAG = {
+      begin: /<[A-Za-z0-9\\._:-]+/,
+      end: /\/[A-Za-z0-9\\._:-]+>|\/>/,
+      /**
+       * @param {RegExpMatchArray} match
+       * @param {CallbackResponse} response
+       */
+      isTrulyOpeningTag: (match, response) => {
+        const afterMatchIndex = match[0].length + match.index;
+        const nextChar = match.input[afterMatchIndex];
+        if (
+          // HTML should not include another raw `<` inside a tag
+          // nested type?
+          // `<Array<Array<number>>`, etc.
+          nextChar === "<" ||
+          // the , gives away that this is not HTML
+          // `<T, A extends keyof T, V>`
+          nextChar === ","
+          ) {
+          response.ignoreMatch();
+          return;
+        }
+
+        // `<something>`
+        // Quite possibly a tag, lets look for a matching closing tag...
+        if (nextChar === ">") {
+          // if we cannot find a matching closing tag, then we
+          // will ignore it
+          if (!hasClosingTag(match, { after: afterMatchIndex })) {
+            response.ignoreMatch();
+          }
+        }
+
+        // `<blah />` (self-closing)
+        // handled by simpleSelfClosing rule
+
+        let m;
+        const afterMatch = match.input.substring(afterMatchIndex);
+
+        // some more template typing stuff
+        //  <T = any>(key?: string) => Modify<
+        if ((m = afterMatch.match(/^\s*=/))) {
+          response.ignoreMatch();
+          return;
+        }
+
+        // `<From extends string>`
+        // technically this could be HTML, but it smells like a type
+        // NOTE: This is ugh, but added specifically for https://github.com/highlightjs/highlight.js/issues/3276
+        if ((m = afterMatch.match(/^\s+extends\s+/))) {
+          if (m.index === 0) {
+            response.ignoreMatch();
+            // eslint-disable-next-line no-useless-return
+            return;
+          }
+        }
+      }
+    };
+    const KEYWORDS$1 = {
+      $pattern: IDENT_RE,
+      keyword: KEYWORDS,
+      literal: LITERALS,
+      built_in: BUILT_INS,
+      "variable.language": BUILT_IN_VARIABLES
+    };
+
+    // https://tc39.es/ecma262/#sec-literals-numeric-literals
+    const decimalDigits = '[0-9](_?[0-9])*';
+    const frac = `\\.(${decimalDigits})`;
+    // DecimalIntegerLiteral, including Annex B NonOctalDecimalIntegerLiteral
+    // https://tc39.es/ecma262/#sec-additional-syntax-numeric-literals
+    const decimalInteger = `0|[1-9](_?[0-9])*|0[0-7]*[89][0-9]*`;
+    const NUMBER = {
+      className: 'number',
+      variants: [
+        // DecimalLiteral
+        { begin: `(\\b(${decimalInteger})((${frac})|\\.)?|(${frac}))` +
+          `[eE][+-]?(${decimalDigits})\\b` },
+        { begin: `\\b(${decimalInteger})\\b((${frac})\\b|\\.)?|(${frac})\\b` },
+
+        // DecimalBigIntegerLiteral
+        { begin: `\\b(0|[1-9](_?[0-9])*)n\\b` },
+
+        // NonDecimalIntegerLiteral
+        { begin: "\\b0[xX][0-9a-fA-F](_?[0-9a-fA-F])*n?\\b" },
+        { begin: "\\b0[bB][0-1](_?[0-1])*n?\\b" },
+        { begin: "\\b0[oO][0-7](_?[0-7])*n?\\b" },
+
+        // LegacyOctalIntegerLiteral (does not include underscore separators)
+        // https://tc39.es/ecma262/#sec-additional-syntax-numeric-literals
+        { begin: "\\b0[0-7]+n?\\b" },
+      ],
+      relevance: 0
+    };
+
+    const SUBST = {
+      className: 'subst',
+      begin: '\\$\\{',
+      end: '\\}',
+      keywords: KEYWORDS$1,
+      contains: [] // defined later
+    };
+    const HTML_TEMPLATE = {
+      begin: 'html`',
+      end: '',
+      starts: {
+        end: '`',
+        returnEnd: false,
+        contains: [
+          hljs.BACKSLASH_ESCAPE,
+          SUBST
+        ],
+        subLanguage: 'xml'
+      }
+    };
+    const CSS_TEMPLATE = {
+      begin: 'css`',
+      end: '',
+      starts: {
+        end: '`',
+        returnEnd: false,
+        contains: [
+          hljs.BACKSLASH_ESCAPE,
+          SUBST
+        ],
+        subLanguage: 'css'
+      }
+    };
+    const GRAPHQL_TEMPLATE = {
+      begin: 'gql`',
+      end: '',
+      starts: {
+        end: '`',
+        returnEnd: false,
+        contains: [
+          hljs.BACKSLASH_ESCAPE,
+          SUBST
+        ],
+        subLanguage: 'graphql'
+      }
+    };
+    const TEMPLATE_STRING = {
+      className: 'string',
+      begin: '`',
+      end: '`',
+      contains: [
+        hljs.BACKSLASH_ESCAPE,
+        SUBST
+      ]
+    };
+    const JSDOC_COMMENT = hljs.COMMENT(
+      /\/\*\*(?!\/)/,
+      '\\*/',
+      {
+        relevance: 0,
+        contains: [
+          {
+            begin: '(?=@[A-Za-z]+)',
+            relevance: 0,
+            contains: [
+              {
+                className: 'doctag',
+                begin: '@[A-Za-z]+'
+              },
+              {
+                className: 'type',
+                begin: '\\{',
+                end: '\\}',
+                excludeEnd: true,
+                excludeBegin: true,
+                relevance: 0
+              },
+              {
+                className: 'variable',
+                begin: IDENT_RE$1 + '(?=\\s*(-)|$)',
+                endsParent: true,
+                relevance: 0
+              },
+              // eat spaces (not newlines) so we can find
+              // types or variables
+              {
+                begin: /(?=[^\n])\s/,
+                relevance: 0
+              }
+            ]
+          }
+        ]
+      }
+    );
+    const COMMENT = {
+      className: "comment",
+      variants: [
+        JSDOC_COMMENT,
+        hljs.C_BLOCK_COMMENT_MODE,
+        hljs.C_LINE_COMMENT_MODE
+      ]
+    };
+    const SUBST_INTERNALS = [
+      hljs.APOS_STRING_MODE,
+      hljs.QUOTE_STRING_MODE,
+      HTML_TEMPLATE,
+      CSS_TEMPLATE,
+      GRAPHQL_TEMPLATE,
+      TEMPLATE_STRING,
+      // Skip numbers when they are part of a variable name
+      { match: /\$\d+/ },
+      NUMBER,
+      // This is intentional:
+      // See https://github.com/highlightjs/highlight.js/issues/3288
+      // hljs.REGEXP_MODE
+    ];
+    SUBST.contains = SUBST_INTERNALS
+      .concat({
+        // we need to pair up {} inside our subst to prevent
+        // it from ending too early by matching another }
+        begin: /\{/,
+        end: /\}/,
+        keywords: KEYWORDS$1,
+        contains: [
+          "self"
+        ].concat(SUBST_INTERNALS)
+      });
+    const SUBST_AND_COMMENTS = [].concat(COMMENT, SUBST.contains);
+    const PARAMS_CONTAINS = SUBST_AND_COMMENTS.concat([
+      // eat recursive parens in sub expressions
+      {
+        begin: /\(/,
+        end: /\)/,
+        keywords: KEYWORDS$1,
+        contains: ["self"].concat(SUBST_AND_COMMENTS)
+      }
+    ]);
+    const PARAMS = {
+      className: 'params',
+      begin: /\(/,
+      end: /\)/,
+      excludeBegin: true,
+      excludeEnd: true,
+      keywords: KEYWORDS$1,
+      contains: PARAMS_CONTAINS
+    };
+
+    // ES6 classes
+    const CLASS_OR_EXTENDS = {
+      variants: [
+        // class Car extends vehicle
+        {
+          match: [
+            /class/,
+            /\s+/,
+            IDENT_RE$1,
+            /\s+/,
+            /extends/,
+            /\s+/,
+            regex.concat(IDENT_RE$1, "(", regex.concat(/\./, IDENT_RE$1), ")*")
+          ],
+          scope: {
+            1: "keyword",
+            3: "title.class",
+            5: "keyword",
+            7: "title.class.inherited"
+          }
+        },
+        // class Car
+        {
+          match: [
+            /class/,
+            /\s+/,
+            IDENT_RE$1
+          ],
+          scope: {
+            1: "keyword",
+            3: "title.class"
+          }
+        },
+
+      ]
+    };
+
+    const CLASS_REFERENCE = {
+      relevance: 0,
+      match:
+      regex.either(
+        // Hard coded exceptions
+        /\bJSON/,
+        // Float32Array, OutT
+        /\b[A-Z][a-z]+([A-Z][a-z]*|\d)*/,
+        // CSSFactory, CSSFactoryT
+        /\b[A-Z]{2,}([A-Z][a-z]+|\d)+([A-Z][a-z]*)*/,
+        // FPs, FPsT
+        /\b[A-Z]{2,}[a-z]+([A-Z][a-z]+|\d)*([A-Z][a-z]*)*/,
+        // P
+        // single letters are not highlighted
+        // BLAH
+        // this will be flagged as a UPPER_CASE_CONSTANT instead
+      ),
+      className: "title.class",
+      keywords: {
+        _: [
+          // se we still get relevance credit for JS library classes
+          ...TYPES,
+          ...ERROR_TYPES
+        ]
+      }
+    };
+
+    const USE_STRICT = {
+      label: "use_strict",
+      className: 'meta',
+      relevance: 10,
+      begin: /^\s*['"]use (strict|asm)['"]/
+    };
+
+    const FUNCTION_DEFINITION = {
+      variants: [
+        {
+          match: [
+            /function/,
+            /\s+/,
+            IDENT_RE$1,
+            /(?=\s*\()/
+          ]
+        },
+        // anonymous function
+        {
+          match: [
+            /function/,
+            /\s*(?=\()/
+          ]
+        }
+      ],
+      className: {
+        1: "keyword",
+        3: "title.function"
+      },
+      label: "func.def",
+      contains: [ PARAMS ],
+      illegal: /%/
+    };
+
+    const UPPER_CASE_CONSTANT = {
+      relevance: 0,
+      match: /\b[A-Z][A-Z_0-9]+\b/,
+      className: "variable.constant"
+    };
+
+    function noneOf(list) {
+      return regex.concat("(?!", list.join("|"), ")");
+    }
+
+    const FUNCTION_CALL = {
+      match: regex.concat(
+        /\b/,
+        noneOf([
+          ...BUILT_IN_GLOBALS,
+          "super",
+          "import"
+        ]),
+        IDENT_RE$1, regex.lookahead(/\(/)),
+      className: "title.function",
+      relevance: 0
+    };
+
+    const PROPERTY_ACCESS = {
+      begin: regex.concat(/\./, regex.lookahead(
+        regex.concat(IDENT_RE$1, /(?![0-9A-Za-z$_(])/)
+      )),
+      end: IDENT_RE$1,
+      excludeBegin: true,
+      keywords: "prototype",
+      className: "property",
+      relevance: 0
+    };
+
+    const GETTER_OR_SETTER = {
+      match: [
+        /get|set/,
+        /\s+/,
+        IDENT_RE$1,
+        /(?=\()/
+      ],
+      className: {
+        1: "keyword",
+        3: "title.function"
+      },
+      contains: [
+        { // eat to avoid empty params
+          begin: /\(\)/
+        },
+        PARAMS
+      ]
+    };
+
+    const FUNC_LEAD_IN_RE = '(\\(' +
+      '[^()]*(\\(' +
+      '[^()]*(\\(' +
+      '[^()]*' +
+      '\\)[^()]*)*' +
+      '\\)[^()]*)*' +
+      '\\)|' + hljs.UNDERSCORE_IDENT_RE + ')\\s*=>';
+
+    const FUNCTION_VARIABLE = {
+      match: [
+        /const|var|let/, /\s+/,
+        IDENT_RE$1, /\s*/,
+        /=\s*/,
+        /(async\s*)?/, // async is optional
+        regex.lookahead(FUNC_LEAD_IN_RE)
+      ],
+      keywords: "async",
+      className: {
+        1: "keyword",
+        3: "title.function"
+      },
+      contains: [
+        PARAMS
+      ]
+    };
+
+    return {
+      name: 'JavaScript',
+      aliases: ['js', 'jsx', 'mjs', 'cjs'],
+      keywords: KEYWORDS$1,
+      // this will be extended by TypeScript
+      exports: { PARAMS_CONTAINS, CLASS_REFERENCE },
+      illegal: /#(?![$_A-z])/,
+      contains: [
+        hljs.SHEBANG({
+          label: "shebang",
+          binary: "node",
+          relevance: 5
+        }),
+        USE_STRICT,
+        hljs.APOS_STRING_MODE,
+        hljs.QUOTE_STRING_MODE,
+        HTML_TEMPLATE,
+        CSS_TEMPLATE,
+        GRAPHQL_TEMPLATE,
+        TEMPLATE_STRING,
+        COMMENT,
+        // Skip numbers when they are part of a variable name
+        { match: /\$\d+/ },
+        NUMBER,
+        CLASS_REFERENCE,
+        {
+          className: 'attr',
+          begin: IDENT_RE$1 + regex.lookahead(':'),
+          relevance: 0
+        },
+        FUNCTION_VARIABLE,
+        { // "value" container
+          begin: '(' + hljs.RE_STARTERS_RE + '|\\b(case|return|throw)\\b)\\s*',
+          keywords: 'return throw case',
+          relevance: 0,
+          contains: [
+            COMMENT,
+            hljs.REGEXP_MODE,
+            {
+              className: 'function',
+              // we have to count the parens to make sure we actually have the
+              // correct bounding ( ) before the =>.  There could be any number of
+              // sub-expressions inside also surrounded by parens.
+              begin: FUNC_LEAD_IN_RE,
+              returnBegin: true,
+              end: '\\s*=>',
+              contains: [
+                {
+                  className: 'params',
                   variants: [
                     {
-                      begin: '///',
+                      begin: hljs.UNDERSCORE_IDENT_RE,
                       relevance: 0
                     },
-                    { begin: '<!--|-->' },
                     {
-                      begin: '</?',
-                      end: '>'
+                      className: null,
+                      begin: /\(\s*\)/,
+                      skip: true
+                    },
+                    {
+                      begin: /\(/,
+                      end: /\)/,
+                      excludeBegin: true,
+                      excludeEnd: true,
+                      keywords: KEYWORDS$1,
+                      contains: PARAMS_CONTAINS
                     }
                   ]
                 }
               ]
+            },
+            { // could be a comma delimited list of params to a function call
+              begin: /,/,
+              relevance: 0
+            },
+            {
+              match: /\s+/,
+              relevance: 0
+            },
+            { // JSX
+              variants: [
+                { begin: FRAGMENT.begin, end: FRAGMENT.end },
+                { match: XML_SELF_CLOSING },
+                {
+                  begin: XML_TAG.begin,
+                  // we carefully check the opening tag to see if it truly
+                  // is a tag and not a false positive
+                  'on:begin': XML_TAG.isTrulyOpeningTag,
+                  end: XML_TAG.end
+                }
+              ],
+              subLanguage: 'xml',
+              contains: [
+                {
+                  begin: XML_TAG.begin,
+                  end: XML_TAG.end,
+                  skip: true,
+                  contains: ['self']
+                }
+              ]
             }
-          ),
-          hljs.C_LINE_COMMENT_MODE,
-          hljs.C_BLOCK_COMMENT_MODE,
-          {
-            className: 'meta',
-            begin: '#',
-            end: '$',
-            keywords: { keyword: 'if else elif endif define undef warning error line region endregion pragma checksum' }
-          },
-          STRING,
-          NUMBERS,
-          {
-            beginKeywords: 'class interface',
-            relevance: 0,
-            end: /[{;=]/,
-            illegal: /[^\s:,]/,
-            contains: [
-              { beginKeywords: "where class" },
-              TITLE_MODE,
-              GENERIC_MODIFIER,
-              hljs.C_LINE_COMMENT_MODE,
-              hljs.C_BLOCK_COMMENT_MODE
-            ]
-          },
-          {
-            beginKeywords: 'namespace',
-            relevance: 0,
-            end: /[{;=]/,
-            illegal: /[^\s:]/,
-            contains: [
-              TITLE_MODE,
-              hljs.C_LINE_COMMENT_MODE,
-              hljs.C_BLOCK_COMMENT_MODE
-            ]
-          },
-          {
-            beginKeywords: 'record',
-            relevance: 0,
-            end: /[{;=]/,
-            illegal: /[^\s:]/,
-            contains: [
-              TITLE_MODE,
-              GENERIC_MODIFIER,
-              hljs.C_LINE_COMMENT_MODE,
-              hljs.C_BLOCK_COMMENT_MODE
-            ]
-          },
-          {
-            // [Attributes("")]
-            className: 'meta',
-            begin: '^\\s*\\[(?=[\\w])',
-            excludeBegin: true,
-            end: '\\]',
-            excludeEnd: true,
-            contains: [
-              {
-                className: 'string',
-                begin: /"/,
-                end: /"/
-              }
-            ]
-          },
-          {
-            // Expression keywords prevent 'keyword Name(...)' from being
-            // recognized as a function definition
-            beginKeywords: 'new return throw await else',
-            relevance: 0
-          },
-          {
-            className: 'function',
-            begin: '(' + TYPE_IDENT_RE + '\\s+)+' + hljs.IDENT_RE + '\\s*(<[^=]+>\\s*)?\\(',
-            returnBegin: true,
-            end: /\s*[{;=]/,
-            excludeEnd: true,
-            keywords: KEYWORDS,
-            contains: [
-              // prevents these from being highlighted `title`
-              {
-                beginKeywords: FUNCTION_MODIFIERS.join(" "),
-                relevance: 0
-              },
-              {
-                begin: hljs.IDENT_RE + '\\s*(<[^=]+>\\s*)?\\(',
-                returnBegin: true,
-                contains: [
-                  hljs.TITLE_MODE,
-                  GENERIC_MODIFIER
-                ],
-                relevance: 0
-              },
-              { match: /\(\)/ },
-              {
-                className: 'params',
-                begin: /\(/,
-                end: /\)/,
-                excludeBegin: true,
-                excludeEnd: true,
-                keywords: KEYWORDS,
-                relevance: 0,
-                contains: [
-                  STRING,
-                  NUMBERS,
-                  hljs.C_BLOCK_COMMENT_MODE
-                ]
-              },
-              hljs.C_LINE_COMMENT_MODE,
-              hljs.C_BLOCK_COMMENT_MODE
-            ]
-          },
-          AT_IDENTIFIER
-        ]
-      };
-    }
-
-    const MODES = (hljs) => {
-      return {
-        IMPORTANT: {
-          scope: 'meta',
-          begin: '!important'
+          ],
         },
-        BLOCK_COMMENT: hljs.C_BLOCK_COMMENT_MODE,
-        HEXCOLOR: {
-          scope: 'number',
-          begin: /#(([0-9a-fA-F]{3,4})|(([0-9a-fA-F]{2}){3,4}))\b/
+        FUNCTION_DEFINITION,
+        {
+          // prevent this from getting swallowed up by function
+          // since they appear "function like"
+          beginKeywords: "while if switch catch for"
         },
-        FUNCTION_DISPATCH: {
-          className: "built_in",
-          begin: /[\w-]+(?=\()/
-        },
-        ATTRIBUTE_SELECTOR_MODE: {
-          scope: 'selector-attr',
-          begin: /\[/,
-          end: /\]/,
-          illegal: '$',
+        {
+          // we have to count the parens to make sure we actually have the correct
+          // bounding ( ).  There could be any number of sub-expressions inside
+          // also surrounded by parens.
+          begin: '\\b(?!function)' + hljs.UNDERSCORE_IDENT_RE +
+            '\\(' + // first parens
+            '[^()]*(\\(' +
+              '[^()]*(\\(' +
+                '[^()]*' +
+              '\\)[^()]*)*' +
+            '\\)[^()]*)*' +
+            '\\)\\s*\\{', // end parens
+          returnBegin:true,
+          label: "func.def",
           contains: [
-            hljs.APOS_STRING_MODE,
-            hljs.QUOTE_STRING_MODE
+            PARAMS,
+            hljs.inherit(hljs.TITLE_MODE, { begin: IDENT_RE$1, className: "title.function" })
           ]
         },
-        CSS_NUMBER_MODE: {
-          scope: 'number',
-          begin: hljs.NUMBER_RE + '(' +
-            '%|em|ex|ch|rem' +
-            '|vw|vh|vmin|vmax' +
-            '|cm|mm|in|pt|pc|px' +
-            '|deg|grad|rad|turn' +
-            '|s|ms' +
-            '|Hz|kHz' +
-            '|dpi|dpcm|dppx' +
-            ')?',
+        // catch ... so it won't trigger the property rule below
+        {
+          match: /\.\.\./,
           relevance: 0
         },
-        CSS_VARIABLE: {
-          className: "attr",
-          begin: /--[A-Za-z][A-Za-z0-9_-]*/
+        PROPERTY_ACCESS,
+        // hack: prevents detection of keywords in some circumstances
+        // .keyword()
+        // $keyword = x
+        {
+          match: '\\$' + IDENT_RE$1,
+          relevance: 0
+        },
+        {
+          match: [ /\bconstructor(?=\s*\()/ ],
+          className: { 1: "title.function" },
+          contains: [ PARAMS ]
+        },
+        FUNCTION_CALL,
+        UPPER_CASE_CONSTANT,
+        CLASS_OR_EXTENDS,
+        GETTER_OR_SETTER,
+        {
+          match: /\$[(.]/ // relevance booster for a pattern common to JS libs: `$(something)` and `$.something`
         }
+      ]
+    };
+  }
+
+  /*
+  Language: JSON
+  Description: JSON (JavaScript Object Notation) is a lightweight data-interchange format.
+  Author: Ivan Sagalaev <maniac@softwaremaniacs.org>
+  Website: http://www.json.org
+  Category: common, protocols, web
+  */
+
+  function json(hljs) {
+    const ATTRIBUTE = {
+      className: 'attr',
+      begin: /"(\\.|[^\\"\r\n])*"(?=\s*:)/,
+      relevance: 1.01
+    };
+    const PUNCTUATION = {
+      match: /[{}[\],:]/,
+      className: "punctuation",
+      relevance: 0
+    };
+    const LITERALS = [
+      "true",
+      "false",
+      "null"
+    ];
+    // NOTE: normally we would rely on `keywords` for this but using a mode here allows us
+    // - to use the very tight `illegal: \S` rule later to flag any other character
+    // - as illegal indicating that despite looking like JSON we do not truly have
+    // - JSON and thus improve false-positively greatly since JSON will try and claim
+    // - all sorts of JSON looking stuff
+    const LITERALS_MODE = {
+      scope: "literal",
+      beginKeywords: LITERALS.join(" "),
+    };
+
+    return {
+      name: 'JSON',
+      keywords:{
+        literal: LITERALS,
+      },
+      contains: [
+        ATTRIBUTE,
+        PUNCTUATION,
+        hljs.QUOTE_STRING_MODE,
+        LITERALS_MODE,
+        hljs.C_NUMBER_MODE,
+        hljs.C_LINE_COMMENT_MODE,
+        hljs.C_BLOCK_COMMENT_MODE
+      ],
+      illegal: '\\S'
+    };
+  }
+
+  /*
+   Language: Kotlin
+   Description: Kotlin is an OSS statically typed programming language that targets the JVM, Android, JavaScript and Native.
+   Author: Sergey Mashkov <cy6erGn0m@gmail.com>
+   Website: https://kotlinlang.org
+   Category: common
+   */
+
+  function kotlin(hljs) {
+    const KEYWORDS = {
+      keyword:
+        'abstract as val var vararg get set class object open private protected public noinline '
+        + 'crossinline dynamic final enum if else do while for when throw try catch finally '
+        + 'import package is in fun override companion reified inline lateinit init '
+        + 'interface annotation data sealed internal infix operator out by constructor super '
+        + 'tailrec where const inner suspend typealias external expect actual',
+      built_in:
+        'Byte Short Char Int Long Boolean Float Double Void Unit Nothing',
+      literal:
+        'true false null'
+    };
+    const KEYWORDS_WITH_LABEL = {
+      className: 'keyword',
+      begin: /\b(break|continue|return|this)\b/,
+      starts: { contains: [
+        {
+          className: 'symbol',
+          begin: /@\w+/
+        }
+      ] }
+    };
+    const LABEL = {
+      className: 'symbol',
+      begin: hljs.UNDERSCORE_IDENT_RE + '@'
+    };
+
+    // for string templates
+    const SUBST = {
+      className: 'subst',
+      begin: /\$\{/,
+      end: /\}/,
+      contains: [ hljs.C_NUMBER_MODE ]
+    };
+    const VARIABLE = {
+      className: 'variable',
+      begin: '\\$' + hljs.UNDERSCORE_IDENT_RE
+    };
+    const STRING = {
+      className: 'string',
+      variants: [
+        {
+          begin: '"""',
+          end: '"""(?=[^"])',
+          contains: [
+            VARIABLE,
+            SUBST
+          ]
+        },
+        // Can't use built-in modes easily, as we want to use STRING in the meta
+        // context as 'meta-string' and there's no syntax to remove explicitly set
+        // classNames in built-in modes.
+        {
+          begin: '\'',
+          end: '\'',
+          illegal: /\n/,
+          contains: [ hljs.BACKSLASH_ESCAPE ]
+        },
+        {
+          begin: '"',
+          end: '"',
+          illegal: /\n/,
+          contains: [
+            hljs.BACKSLASH_ESCAPE,
+            VARIABLE,
+            SUBST
+          ]
+        }
+      ]
+    };
+    SUBST.contains.push(STRING);
+
+    const ANNOTATION_USE_SITE = {
+      className: 'meta',
+      begin: '@(?:file|property|field|get|set|receiver|param|setparam|delegate)\\s*:(?:\\s*' + hljs.UNDERSCORE_IDENT_RE + ')?'
+    };
+    const ANNOTATION = {
+      className: 'meta',
+      begin: '@' + hljs.UNDERSCORE_IDENT_RE,
+      contains: [
+        {
+          begin: /\(/,
+          end: /\)/,
+          contains: [
+            hljs.inherit(STRING, { className: 'string' }),
+            "self"
+          ]
+        }
+      ]
+    };
+
+    // https://kotlinlang.org/docs/reference/whatsnew11.html#underscores-in-numeric-literals
+    // According to the doc above, the number mode of kotlin is the same as java 8,
+    // so the code below is copied from java.js
+    const KOTLIN_NUMBER_MODE = NUMERIC;
+    const KOTLIN_NESTED_COMMENT = hljs.COMMENT(
+      '/\\*', '\\*/',
+      { contains: [ hljs.C_BLOCK_COMMENT_MODE ] }
+    );
+    const KOTLIN_PAREN_TYPE = { variants: [
+      {
+        className: 'type',
+        begin: hljs.UNDERSCORE_IDENT_RE
+      },
+      {
+        begin: /\(/,
+        end: /\)/,
+        contains: [] // defined later
+      }
+    ] };
+    const KOTLIN_PAREN_TYPE2 = KOTLIN_PAREN_TYPE;
+    KOTLIN_PAREN_TYPE2.variants[1].contains = [ KOTLIN_PAREN_TYPE ];
+    KOTLIN_PAREN_TYPE.variants[1].contains = [ KOTLIN_PAREN_TYPE2 ];
+
+    return {
+      name: 'Kotlin',
+      aliases: [
+        'kt',
+        'kts'
+      ],
+      keywords: KEYWORDS,
+      contains: [
+        hljs.COMMENT(
+          '/\\*\\*',
+          '\\*/',
+          {
+            relevance: 0,
+            contains: [
+              {
+                className: 'doctag',
+                begin: '@[A-Za-z]+'
+              }
+            ]
+          }
+        ),
+        hljs.C_LINE_COMMENT_MODE,
+        KOTLIN_NESTED_COMMENT,
+        KEYWORDS_WITH_LABEL,
+        LABEL,
+        ANNOTATION_USE_SITE,
+        ANNOTATION,
+        {
+          className: 'function',
+          beginKeywords: 'fun',
+          end: '[(]|$',
+          returnBegin: true,
+          excludeEnd: true,
+          keywords: KEYWORDS,
+          relevance: 5,
+          contains: [
+            {
+              begin: hljs.UNDERSCORE_IDENT_RE + '\\s*\\(',
+              returnBegin: true,
+              relevance: 0,
+              contains: [ hljs.UNDERSCORE_TITLE_MODE ]
+            },
+            {
+              className: 'type',
+              begin: /</,
+              end: />/,
+              keywords: 'reified',
+              relevance: 0
+            },
+            {
+              className: 'params',
+              begin: /\(/,
+              end: /\)/,
+              endsParent: true,
+              keywords: KEYWORDS,
+              relevance: 0,
+              contains: [
+                {
+                  begin: /:/,
+                  end: /[=,\/]/,
+                  endsWithParent: true,
+                  contains: [
+                    KOTLIN_PAREN_TYPE,
+                    hljs.C_LINE_COMMENT_MODE,
+                    KOTLIN_NESTED_COMMENT
+                  ],
+                  relevance: 0
+                },
+                hljs.C_LINE_COMMENT_MODE,
+                KOTLIN_NESTED_COMMENT,
+                ANNOTATION_USE_SITE,
+                ANNOTATION,
+                STRING,
+                hljs.C_NUMBER_MODE
+              ]
+            },
+            KOTLIN_NESTED_COMMENT
+          ]
+        },
+        {
+          begin: [
+            /class|interface|trait/,
+            /\s+/,
+            hljs.UNDERSCORE_IDENT_RE
+          ],
+          beginScope: {
+            3: "title.class"
+          },
+          keywords: 'class interface trait',
+          end: /[:\{(]|$/,
+          excludeEnd: true,
+          illegal: 'extends implements',
+          contains: [
+            { beginKeywords: 'public protected internal private constructor' },
+            hljs.UNDERSCORE_TITLE_MODE,
+            {
+              className: 'type',
+              begin: /</,
+              end: />/,
+              excludeBegin: true,
+              excludeEnd: true,
+              relevance: 0
+            },
+            {
+              className: 'type',
+              begin: /[,:]\s*/,
+              end: /[<\(,){\s]|$/,
+              excludeBegin: true,
+              returnEnd: true
+            },
+            ANNOTATION_USE_SITE,
+            ANNOTATION
+          ]
+        },
+        STRING,
+        {
+          className: 'meta',
+          begin: "^#!/usr/bin/env",
+          end: '$',
+          illegal: '\n'
+        },
+        KOTLIN_NUMBER_MODE
+      ]
+    };
+  }
+
+  /*
+  Language: Less
+  Description: It's CSS, with just a little more.
+  Author:   Max Mikhailov <seven.phases.max@gmail.com>
+  Website: http://lesscss.org
+  Category: common, css, web
+  */
+
+  /** @type LanguageFn */
+  function less(hljs) {
+    const modes = MODES(hljs);
+    const PSEUDO_SELECTORS$1 = PSEUDO_SELECTORS;
+
+    const AT_MODIFIERS = "and or not only";
+    const IDENT_RE = '[\\w-]+'; // yes, Less identifiers may begin with a digit
+    const INTERP_IDENT_RE = '(' + IDENT_RE + '|@\\{' + IDENT_RE + '\\})';
+
+    /* Generic Modes */
+
+    const RULES = []; const VALUE_MODES = []; // forward def. for recursive modes
+
+    const STRING_MODE = function(c) {
+      return {
+      // Less strings are not multiline (also include '~' for more consistent coloring of "escaped" strings)
+        className: 'string',
+        begin: '~?' + c + '.*?' + c
       };
     };
 
-    const TAGS = [
-      'a',
-      'abbr',
-      'address',
-      'article',
-      'aside',
-      'audio',
-      'b',
-      'blockquote',
-      'body',
-      'button',
-      'canvas',
-      'caption',
-      'cite',
-      'code',
-      'dd',
-      'del',
-      'details',
-      'dfn',
-      'div',
-      'dl',
-      'dt',
-      'em',
-      'fieldset',
-      'figcaption',
-      'figure',
-      'footer',
-      'form',
-      'h1',
-      'h2',
-      'h3',
-      'h4',
-      'h5',
-      'h6',
-      'header',
-      'hgroup',
-      'html',
-      'i',
-      'iframe',
-      'img',
-      'input',
-      'ins',
-      'kbd',
-      'label',
-      'legend',
-      'li',
-      'main',
-      'mark',
-      'menu',
-      'nav',
-      'object',
-      'ol',
-      'p',
-      'q',
-      'quote',
-      'samp',
-      'section',
-      'span',
-      'strong',
-      'summary',
-      'sup',
-      'table',
-      'tbody',
-      'td',
-      'textarea',
-      'tfoot',
-      'th',
-      'thead',
-      'time',
-      'tr',
-      'ul',
-      'var',
-      'video'
-    ];
-
-    const MEDIA_FEATURES = [
-      'any-hover',
-      'any-pointer',
-      'aspect-ratio',
-      'color',
-      'color-gamut',
-      'color-index',
-      'device-aspect-ratio',
-      'device-height',
-      'device-width',
-      'display-mode',
-      'forced-colors',
-      'grid',
-      'height',
-      'hover',
-      'inverted-colors',
-      'monochrome',
-      'orientation',
-      'overflow-block',
-      'overflow-inline',
-      'pointer',
-      'prefers-color-scheme',
-      'prefers-contrast',
-      'prefers-reduced-motion',
-      'prefers-reduced-transparency',
-      'resolution',
-      'scan',
-      'scripting',
-      'update',
-      'width',
-      // TODO: find a better solution?
-      'min-width',
-      'max-width',
-      'min-height',
-      'max-height'
-    ];
-
-    // https://developer.mozilla.org/en-US/docs/Web/CSS/Pseudo-classes
-    const PSEUDO_CLASSES = [
-      'active',
-      'any-link',
-      'blank',
-      'checked',
-      'current',
-      'default',
-      'defined',
-      'dir', // dir()
-      'disabled',
-      'drop',
-      'empty',
-      'enabled',
-      'first',
-      'first-child',
-      'first-of-type',
-      'fullscreen',
-      'future',
-      'focus',
-      'focus-visible',
-      'focus-within',
-      'has', // has()
-      'host', // host or host()
-      'host-context', // host-context()
-      'hover',
-      'indeterminate',
-      'in-range',
-      'invalid',
-      'is', // is()
-      'lang', // lang()
-      'last-child',
-      'last-of-type',
-      'left',
-      'link',
-      'local-link',
-      'not', // not()
-      'nth-child', // nth-child()
-      'nth-col', // nth-col()
-      'nth-last-child', // nth-last-child()
-      'nth-last-col', // nth-last-col()
-      'nth-last-of-type', //nth-last-of-type()
-      'nth-of-type', //nth-of-type()
-      'only-child',
-      'only-of-type',
-      'optional',
-      'out-of-range',
-      'past',
-      'placeholder-shown',
-      'read-only',
-      'read-write',
-      'required',
-      'right',
-      'root',
-      'scope',
-      'target',
-      'target-within',
-      'user-invalid',
-      'valid',
-      'visited',
-      'where' // where()
-    ];
-
-    // https://developer.mozilla.org/en-US/docs/Web/CSS/Pseudo-elements
-    const PSEUDO_ELEMENTS = [
-      'after',
-      'backdrop',
-      'before',
-      'cue',
-      'cue-region',
-      'first-letter',
-      'first-line',
-      'grammar-error',
-      'marker',
-      'part',
-      'placeholder',
-      'selection',
-      'slotted',
-      'spelling-error'
-    ];
-
-    const ATTRIBUTES = [
-      'align-content',
-      'align-items',
-      'align-self',
-      'all',
-      'animation',
-      'animation-delay',
-      'animation-direction',
-      'animation-duration',
-      'animation-fill-mode',
-      'animation-iteration-count',
-      'animation-name',
-      'animation-play-state',
-      'animation-timing-function',
-      'backface-visibility',
-      'background',
-      'background-attachment',
-      'background-blend-mode',
-      'background-clip',
-      'background-color',
-      'background-image',
-      'background-origin',
-      'background-position',
-      'background-repeat',
-      'background-size',
-      'block-size',
-      'border',
-      'border-block',
-      'border-block-color',
-      'border-block-end',
-      'border-block-end-color',
-      'border-block-end-style',
-      'border-block-end-width',
-      'border-block-start',
-      'border-block-start-color',
-      'border-block-start-style',
-      'border-block-start-width',
-      'border-block-style',
-      'border-block-width',
-      'border-bottom',
-      'border-bottom-color',
-      'border-bottom-left-radius',
-      'border-bottom-right-radius',
-      'border-bottom-style',
-      'border-bottom-width',
-      'border-collapse',
-      'border-color',
-      'border-image',
-      'border-image-outset',
-      'border-image-repeat',
-      'border-image-slice',
-      'border-image-source',
-      'border-image-width',
-      'border-inline',
-      'border-inline-color',
-      'border-inline-end',
-      'border-inline-end-color',
-      'border-inline-end-style',
-      'border-inline-end-width',
-      'border-inline-start',
-      'border-inline-start-color',
-      'border-inline-start-style',
-      'border-inline-start-width',
-      'border-inline-style',
-      'border-inline-width',
-      'border-left',
-      'border-left-color',
-      'border-left-style',
-      'border-left-width',
-      'border-radius',
-      'border-right',
-      'border-right-color',
-      'border-right-style',
-      'border-right-width',
-      'border-spacing',
-      'border-style',
-      'border-top',
-      'border-top-color',
-      'border-top-left-radius',
-      'border-top-right-radius',
-      'border-top-style',
-      'border-top-width',
-      'border-width',
-      'bottom',
-      'box-decoration-break',
-      'box-shadow',
-      'box-sizing',
-      'break-after',
-      'break-before',
-      'break-inside',
-      'caption-side',
-      'caret-color',
-      'clear',
-      'clip',
-      'clip-path',
-      'clip-rule',
-      'color',
-      'column-count',
-      'column-fill',
-      'column-gap',
-      'column-rule',
-      'column-rule-color',
-      'column-rule-style',
-      'column-rule-width',
-      'column-span',
-      'column-width',
-      'columns',
-      'contain',
-      'content',
-      'content-visibility',
-      'counter-increment',
-      'counter-reset',
-      'cue',
-      'cue-after',
-      'cue-before',
-      'cursor',
-      'direction',
-      'display',
-      'empty-cells',
-      'filter',
-      'flex',
-      'flex-basis',
-      'flex-direction',
-      'flex-flow',
-      'flex-grow',
-      'flex-shrink',
-      'flex-wrap',
-      'float',
-      'flow',
-      'font',
-      'font-display',
-      'font-family',
-      'font-feature-settings',
-      'font-kerning',
-      'font-language-override',
-      'font-size',
-      'font-size-adjust',
-      'font-smoothing',
-      'font-stretch',
-      'font-style',
-      'font-synthesis',
-      'font-variant',
-      'font-variant-caps',
-      'font-variant-east-asian',
-      'font-variant-ligatures',
-      'font-variant-numeric',
-      'font-variant-position',
-      'font-variation-settings',
-      'font-weight',
-      'gap',
-      'glyph-orientation-vertical',
-      'grid',
-      'grid-area',
-      'grid-auto-columns',
-      'grid-auto-flow',
-      'grid-auto-rows',
-      'grid-column',
-      'grid-column-end',
-      'grid-column-start',
-      'grid-gap',
-      'grid-row',
-      'grid-row-end',
-      'grid-row-start',
-      'grid-template',
-      'grid-template-areas',
-      'grid-template-columns',
-      'grid-template-rows',
-      'hanging-punctuation',
-      'height',
-      'hyphens',
-      'icon',
-      'image-orientation',
-      'image-rendering',
-      'image-resolution',
-      'ime-mode',
-      'inline-size',
-      'isolation',
-      'justify-content',
-      'left',
-      'letter-spacing',
-      'line-break',
-      'line-height',
-      'list-style',
-      'list-style-image',
-      'list-style-position',
-      'list-style-type',
-      'margin',
-      'margin-block',
-      'margin-block-end',
-      'margin-block-start',
-      'margin-bottom',
-      'margin-inline',
-      'margin-inline-end',
-      'margin-inline-start',
-      'margin-left',
-      'margin-right',
-      'margin-top',
-      'marks',
-      'mask',
-      'mask-border',
-      'mask-border-mode',
-      'mask-border-outset',
-      'mask-border-repeat',
-      'mask-border-slice',
-      'mask-border-source',
-      'mask-border-width',
-      'mask-clip',
-      'mask-composite',
-      'mask-image',
-      'mask-mode',
-      'mask-origin',
-      'mask-position',
-      'mask-repeat',
-      'mask-size',
-      'mask-type',
-      'max-block-size',
-      'max-height',
-      'max-inline-size',
-      'max-width',
-      'min-block-size',
-      'min-height',
-      'min-inline-size',
-      'min-width',
-      'mix-blend-mode',
-      'nav-down',
-      'nav-index',
-      'nav-left',
-      'nav-right',
-      'nav-up',
-      'none',
-      'normal',
-      'object-fit',
-      'object-position',
-      'opacity',
-      'order',
-      'orphans',
-      'outline',
-      'outline-color',
-      'outline-offset',
-      'outline-style',
-      'outline-width',
-      'overflow',
-      'overflow-wrap',
-      'overflow-x',
-      'overflow-y',
-      'padding',
-      'padding-block',
-      'padding-block-end',
-      'padding-block-start',
-      'padding-bottom',
-      'padding-inline',
-      'padding-inline-end',
-      'padding-inline-start',
-      'padding-left',
-      'padding-right',
-      'padding-top',
-      'page-break-after',
-      'page-break-before',
-      'page-break-inside',
-      'pause',
-      'pause-after',
-      'pause-before',
-      'perspective',
-      'perspective-origin',
-      'pointer-events',
-      'position',
-      'quotes',
-      'resize',
-      'rest',
-      'rest-after',
-      'rest-before',
-      'right',
-      'row-gap',
-      'scroll-margin',
-      'scroll-margin-block',
-      'scroll-margin-block-end',
-      'scroll-margin-block-start',
-      'scroll-margin-bottom',
-      'scroll-margin-inline',
-      'scroll-margin-inline-end',
-      'scroll-margin-inline-start',
-      'scroll-margin-left',
-      'scroll-margin-right',
-      'scroll-margin-top',
-      'scroll-padding',
-      'scroll-padding-block',
-      'scroll-padding-block-end',
-      'scroll-padding-block-start',
-      'scroll-padding-bottom',
-      'scroll-padding-inline',
-      'scroll-padding-inline-end',
-      'scroll-padding-inline-start',
-      'scroll-padding-left',
-      'scroll-padding-right',
-      'scroll-padding-top',
-      'scroll-snap-align',
-      'scroll-snap-stop',
-      'scroll-snap-type',
-      'scrollbar-color',
-      'scrollbar-gutter',
-      'scrollbar-width',
-      'shape-image-threshold',
-      'shape-margin',
-      'shape-outside',
-      'speak',
-      'speak-as',
-      'src', // @font-face
-      'tab-size',
-      'table-layout',
-      'text-align',
-      'text-align-all',
-      'text-align-last',
-      'text-combine-upright',
-      'text-decoration',
-      'text-decoration-color',
-      'text-decoration-line',
-      'text-decoration-style',
-      'text-emphasis',
-      'text-emphasis-color',
-      'text-emphasis-position',
-      'text-emphasis-style',
-      'text-indent',
-      'text-justify',
-      'text-orientation',
-      'text-overflow',
-      'text-rendering',
-      'text-shadow',
-      'text-transform',
-      'text-underline-position',
-      'top',
-      'transform',
-      'transform-box',
-      'transform-origin',
-      'transform-style',
-      'transition',
-      'transition-delay',
-      'transition-duration',
-      'transition-property',
-      'transition-timing-function',
-      'unicode-bidi',
-      'vertical-align',
-      'visibility',
-      'voice-balance',
-      'voice-duration',
-      'voice-family',
-      'voice-pitch',
-      'voice-range',
-      'voice-rate',
-      'voice-stress',
-      'voice-volume',
-      'white-space',
-      'widows',
-      'width',
-      'will-change',
-      'word-break',
-      'word-spacing',
-      'word-wrap',
-      'writing-mode',
-      'z-index'
-      // reverse makes sure longer attributes `font-weight` are matched fully
-      // instead of getting false positives on say `font`
-    ].reverse();
-
-    // some grammars use them all as a single group
-    const PSEUDO_SELECTORS = PSEUDO_CLASSES.concat(PSEUDO_ELEMENTS);
-
-    /*
-    Language: CSS
-    Category: common, css, web
-    Website: https://developer.mozilla.org/en-US/docs/Web/CSS
-    */
-
-    /** @type LanguageFn */
-    function css(hljs) {
-      const regex = hljs.regex;
-      const modes = MODES(hljs);
-      const VENDOR_PREFIX = { begin: /-(webkit|moz|ms|o)-(?=[a-z])/ };
-      const AT_MODIFIERS = "and or not only";
-      const AT_PROPERTY_RE = /@-?\w[\w]*(-\w+)*/; // @-webkit-keyframes
-      const IDENT_RE = '[a-zA-Z-][a-zA-Z0-9_-]*';
-      const STRINGS = [
-        hljs.APOS_STRING_MODE,
-        hljs.QUOTE_STRING_MODE
-      ];
-
+    const IDENT_MODE = function(name, begin, relevance) {
       return {
-        name: 'CSS',
-        case_insensitive: true,
-        illegal: /[=|'\$]/,
-        keywords: { keyframePosition: "from to" },
-        classNameAliases: {
-          // for visual continuity with `tag {}` and because we
-          // don't have a great class for this?
-          keyframePosition: "selector-tag" },
-        contains: [
-          modes.BLOCK_COMMENT,
-          VENDOR_PREFIX,
-          // to recognize keyframe 40% etc which are outside the scope of our
-          // attribute value mode
-          modes.CSS_NUMBER_MODE,
-          {
-            className: 'selector-id',
-            begin: /#[A-Za-z0-9_-]+/,
-            relevance: 0
-          },
-          {
-            className: 'selector-class',
-            begin: '\\.' + IDENT_RE,
-            relevance: 0
-          },
-          modes.ATTRIBUTE_SELECTOR_MODE,
-          {
-            className: 'selector-pseudo',
-            variants: [
-              { begin: ':(' + PSEUDO_CLASSES.join('|') + ')' },
-              { begin: ':(:)?(' + PSEUDO_ELEMENTS.join('|') + ')' }
-            ]
-          },
-          // we may actually need this (12/2020)
-          // { // pseudo-selector params
-          //   begin: /\(/,
-          //   end: /\)/,
-          //   contains: [ hljs.CSS_NUMBER_MODE ]
-          // },
-          modes.CSS_VARIABLE,
-          {
-            className: 'attribute',
-            begin: '\\b(' + ATTRIBUTES.join('|') + ')\\b'
-          },
-          // attribute values
-          {
-            begin: /:/,
-            end: /[;}{]/,
-            contains: [
-              modes.BLOCK_COMMENT,
-              modes.HEXCOLOR,
-              modes.IMPORTANT,
-              modes.CSS_NUMBER_MODE,
-              ...STRINGS,
-              // needed to highlight these as strings and to avoid issues with
-              // illegal characters that might be inside urls that would tigger the
-              // languages illegal stack
-              {
-                begin: /(url|data-uri)\(/,
-                end: /\)/,
-                relevance: 0, // from keywords
-                keywords: { built_in: "url data-uri" },
-                contains: [
-                  ...STRINGS,
-                  {
-                    className: "string",
-                    // any character other than `)` as in `url()` will be the start
-                    // of a string, which ends with `)` (from the parent mode)
-                    begin: /[^)]/,
-                    endsWithParent: true,
-                    excludeEnd: true
-                  }
-                ]
-              },
-              modes.FUNCTION_DISPATCH
-            ]
-          },
-          {
-            begin: regex.lookahead(/@/),
-            end: '[{;]',
+        className: name,
+        begin: begin,
+        relevance: relevance
+      };
+    };
+
+    const AT_KEYWORDS = {
+      $pattern: /[a-z-]+/,
+      keyword: AT_MODIFIERS,
+      attribute: MEDIA_FEATURES.join(" ")
+    };
+
+    const PARENS_MODE = {
+      // used only to properly balance nested parens inside mixin call, def. arg list
+      begin: '\\(',
+      end: '\\)',
+      contains: VALUE_MODES,
+      keywords: AT_KEYWORDS,
+      relevance: 0
+    };
+
+    // generic Less highlighter (used almost everywhere except selectors):
+    VALUE_MODES.push(
+      hljs.C_LINE_COMMENT_MODE,
+      hljs.C_BLOCK_COMMENT_MODE,
+      STRING_MODE("'"),
+      STRING_MODE('"'),
+      modes.CSS_NUMBER_MODE, // fixme: it does not include dot for numbers like .5em :(
+      {
+        begin: '(url|data-uri)\\(',
+        starts: {
+          className: 'string',
+          end: '[\\)\\n]',
+          excludeEnd: true
+        }
+      },
+      modes.HEXCOLOR,
+      PARENS_MODE,
+      IDENT_MODE('variable', '@@?' + IDENT_RE, 10),
+      IDENT_MODE('variable', '@\\{' + IDENT_RE + '\\}'),
+      IDENT_MODE('built_in', '~?`[^`]*?`'), // inline javascript (or whatever host language) *multiline* string
+      { // @media features (it’s here to not duplicate things in AT_RULE_MODE with extra PARENS_MODE overriding):
+        className: 'attribute',
+        begin: IDENT_RE + '\\s*:',
+        end: ':',
+        returnBegin: true,
+        excludeEnd: true
+      },
+      modes.IMPORTANT,
+      { beginKeywords: 'and not' },
+      modes.FUNCTION_DISPATCH
+    );
+
+    const VALUE_WITH_RULESETS = VALUE_MODES.concat({
+      begin: /\{/,
+      end: /\}/,
+      contains: RULES
+    });
+
+    const MIXIN_GUARD_MODE = {
+      beginKeywords: 'when',
+      endsWithParent: true,
+      contains: [ { beginKeywords: 'and not' } ].concat(VALUE_MODES) // using this form to override VALUE’s 'function' match
+    };
+
+    /* Rule-Level Modes */
+
+    const RULE_MODE = {
+      begin: INTERP_IDENT_RE + '\\s*:',
+      returnBegin: true,
+      end: /[;}]/,
+      relevance: 0,
+      contains: [
+        { begin: /-(webkit|moz|ms|o)-/ },
+        modes.CSS_VARIABLE,
+        {
+          className: 'attribute',
+          begin: '\\b(' + ATTRIBUTES.join('|') + ')\\b',
+          end: /(?=:)/,
+          starts: {
+            endsWithParent: true,
+            illegal: '[<=$]',
             relevance: 0,
-            illegal: /:/, // break on Less variables @var: ...
-            contains: [
-              {
-                className: 'keyword',
-                begin: AT_PROPERTY_RE
-              },
-              {
-                begin: /\s/,
-                endsWithParent: true,
-                excludeEnd: true,
-                relevance: 0,
-                keywords: {
-                  $pattern: /[a-z-]+/,
-                  keyword: AT_MODIFIERS,
-                  attribute: MEDIA_FEATURES.join(" ")
+            contains: VALUE_MODES
+          }
+        }
+      ]
+    };
+
+    const AT_RULE_MODE = {
+      className: 'keyword',
+      begin: '@(import|media|charset|font-face|(-[a-z]+-)?keyframes|supports|document|namespace|page|viewport|host)\\b',
+      starts: {
+        end: '[;{}]',
+        keywords: AT_KEYWORDS,
+        returnEnd: true,
+        contains: VALUE_MODES,
+        relevance: 0
+      }
+    };
+
+    // variable definitions and calls
+    const VAR_RULE_MODE = {
+      className: 'variable',
+      variants: [
+        // using more strict pattern for higher relevance to increase chances of Less detection.
+        // this is *the only* Less specific statement used in most of the sources, so...
+        // (we’ll still often loose to the css-parser unless there's '//' comment,
+        // simply because 1 variable just can't beat 99 properties :)
+        {
+          begin: '@' + IDENT_RE + '\\s*:',
+          relevance: 15
+        },
+        { begin: '@' + IDENT_RE }
+      ],
+      starts: {
+        end: '[;}]',
+        returnEnd: true,
+        contains: VALUE_WITH_RULESETS
+      }
+    };
+
+    const SELECTOR_MODE = {
+      // first parse unambiguous selectors (i.e. those not starting with tag)
+      // then fall into the scary lookahead-discriminator variant.
+      // this mode also handles mixin definitions and calls
+      variants: [
+        {
+          begin: '[\\.#:&\\[>]',
+          end: '[;{}]' // mixin calls end with ';'
+        },
+        {
+          begin: INTERP_IDENT_RE,
+          end: /\{/
+        }
+      ],
+      returnBegin: true,
+      returnEnd: true,
+      illegal: '[<=\'$"]',
+      relevance: 0,
+      contains: [
+        hljs.C_LINE_COMMENT_MODE,
+        hljs.C_BLOCK_COMMENT_MODE,
+        MIXIN_GUARD_MODE,
+        IDENT_MODE('keyword', 'all\\b'),
+        IDENT_MODE('variable', '@\\{' + IDENT_RE + '\\}'), // otherwise it’s identified as tag
+        
+        {
+          begin: '\\b(' + TAGS.join('|') + ')\\b',
+          className: 'selector-tag'
+        },
+        modes.CSS_NUMBER_MODE,
+        IDENT_MODE('selector-tag', INTERP_IDENT_RE, 0),
+        IDENT_MODE('selector-id', '#' + INTERP_IDENT_RE),
+        IDENT_MODE('selector-class', '\\.' + INTERP_IDENT_RE, 0),
+        IDENT_MODE('selector-tag', '&', 0),
+        modes.ATTRIBUTE_SELECTOR_MODE,
+        {
+          className: 'selector-pseudo',
+          begin: ':(' + PSEUDO_CLASSES.join('|') + ')'
+        },
+        {
+          className: 'selector-pseudo',
+          begin: ':(:)?(' + PSEUDO_ELEMENTS.join('|') + ')'
+        },
+        {
+          begin: /\(/,
+          end: /\)/,
+          relevance: 0,
+          contains: VALUE_WITH_RULESETS
+        }, // argument list of parametric mixins
+        { begin: '!important' }, // eat !important after mixin call or it will be colored as tag
+        modes.FUNCTION_DISPATCH
+      ]
+    };
+
+    const PSEUDO_SELECTOR_MODE = {
+      begin: IDENT_RE + ':(:)?' + `(${PSEUDO_SELECTORS$1.join('|')})`,
+      returnBegin: true,
+      contains: [ SELECTOR_MODE ]
+    };
+
+    RULES.push(
+      hljs.C_LINE_COMMENT_MODE,
+      hljs.C_BLOCK_COMMENT_MODE,
+      AT_RULE_MODE,
+      VAR_RULE_MODE,
+      PSEUDO_SELECTOR_MODE,
+      RULE_MODE,
+      SELECTOR_MODE,
+      MIXIN_GUARD_MODE,
+      modes.FUNCTION_DISPATCH
+    );
+
+    return {
+      name: 'Less',
+      case_insensitive: true,
+      illegal: '[=>\'/<($"]',
+      contains: RULES
+    };
+  }
+
+  /*
+  Language: Lua
+  Description: Lua is a powerful, efficient, lightweight, embeddable scripting language.
+  Author: Andrew Fedorov <dmmdrs@mail.ru>
+  Category: common, scripting
+  Website: https://www.lua.org
+  */
+
+  function lua(hljs) {
+    const OPENING_LONG_BRACKET = '\\[=*\\[';
+    const CLOSING_LONG_BRACKET = '\\]=*\\]';
+    const LONG_BRACKETS = {
+      begin: OPENING_LONG_BRACKET,
+      end: CLOSING_LONG_BRACKET,
+      contains: [ 'self' ]
+    };
+    const COMMENTS = [
+      hljs.COMMENT('--(?!' + OPENING_LONG_BRACKET + ')', '$'),
+      hljs.COMMENT(
+        '--' + OPENING_LONG_BRACKET,
+        CLOSING_LONG_BRACKET,
+        {
+          contains: [ LONG_BRACKETS ],
+          relevance: 10
+        }
+      )
+    ];
+    return {
+      name: 'Lua',
+      keywords: {
+        $pattern: hljs.UNDERSCORE_IDENT_RE,
+        literal: "true false nil",
+        keyword: "and break do else elseif end for goto if in local not or repeat return then until while",
+        built_in:
+          // Metatags and globals:
+          '_G _ENV _VERSION __index __newindex __mode __call __metatable __tostring __len '
+          + '__gc __add __sub __mul __div __mod __pow __concat __unm __eq __lt __le assert '
+          // Standard methods and properties:
+          + 'collectgarbage dofile error getfenv getmetatable ipairs load loadfile loadstring '
+          + 'module next pairs pcall print rawequal rawget rawset require select setfenv '
+          + 'setmetatable tonumber tostring type unpack xpcall arg self '
+          // Library methods and properties (one line per library):
+          + 'coroutine resume yield status wrap create running debug getupvalue '
+          + 'debug sethook getmetatable gethook setmetatable setlocal traceback setfenv getinfo setupvalue getlocal getregistry getfenv '
+          + 'io lines write close flush open output type read stderr stdin input stdout popen tmpfile '
+          + 'math log max acos huge ldexp pi cos tanh pow deg tan cosh sinh random randomseed frexp ceil floor rad abs sqrt modf asin min mod fmod log10 atan2 exp sin atan '
+          + 'os exit setlocale date getenv difftime remove time clock tmpname rename execute package preload loadlib loaded loaders cpath config path seeall '
+          + 'string sub upper len gfind rep find match char dump gmatch reverse byte format gsub lower '
+          + 'table setn insert getn foreachi maxn foreach concat sort remove'
+      },
+      contains: COMMENTS.concat([
+        {
+          className: 'function',
+          beginKeywords: 'function',
+          end: '\\)',
+          contains: [
+            hljs.inherit(hljs.TITLE_MODE, { begin: '([_a-zA-Z]\\w*\\.)*([_a-zA-Z]\\w*:)?[_a-zA-Z]\\w*' }),
+            {
+              className: 'params',
+              begin: '\\(',
+              endsWithParent: true,
+              contains: COMMENTS
+            }
+          ].concat(COMMENTS)
+        },
+        hljs.C_NUMBER_MODE,
+        hljs.APOS_STRING_MODE,
+        hljs.QUOTE_STRING_MODE,
+        {
+          className: 'string',
+          begin: OPENING_LONG_BRACKET,
+          end: CLOSING_LONG_BRACKET,
+          contains: [ LONG_BRACKETS ],
+          relevance: 5
+        }
+      ])
+    };
+  }
+
+  /*
+  Language: Makefile
+  Author: Ivan Sagalaev <maniac@softwaremaniacs.org>
+  Contributors: Joël Porquet <joel@porquet.org>
+  Website: https://www.gnu.org/software/make/manual/html_node/Introduction.html
+  Category: common
+  */
+
+  function makefile(hljs) {
+    /* Variables: simple (eg $(var)) and special (eg $@) */
+    const VARIABLE = {
+      className: 'variable',
+      variants: [
+        {
+          begin: '\\$\\(' + hljs.UNDERSCORE_IDENT_RE + '\\)',
+          contains: [ hljs.BACKSLASH_ESCAPE ]
+        },
+        { begin: /\$[@%<?\^\+\*]/ }
+      ]
+    };
+    /* Quoted string with variables inside */
+    const QUOTE_STRING = {
+      className: 'string',
+      begin: /"/,
+      end: /"/,
+      contains: [
+        hljs.BACKSLASH_ESCAPE,
+        VARIABLE
+      ]
+    };
+    /* Function: $(func arg,...) */
+    const FUNC = {
+      className: 'variable',
+      begin: /\$\([\w-]+\s/,
+      end: /\)/,
+      keywords: { built_in:
+          'subst patsubst strip findstring filter filter-out sort '
+          + 'word wordlist firstword lastword dir notdir suffix basename '
+          + 'addsuffix addprefix join wildcard realpath abspath error warning '
+          + 'shell origin flavor foreach if or and call eval file value' },
+      contains: [ VARIABLE ]
+    };
+    /* Variable assignment */
+    const ASSIGNMENT = { begin: '^' + hljs.UNDERSCORE_IDENT_RE + '\\s*(?=[:+?]?=)' };
+    /* Meta targets (.PHONY) */
+    const META = {
+      className: 'meta',
+      begin: /^\.PHONY:/,
+      end: /$/,
+      keywords: {
+        $pattern: /[\.\w]+/,
+        keyword: '.PHONY'
+      }
+    };
+    /* Targets */
+    const TARGET = {
+      className: 'section',
+      begin: /^[^\s]+:/,
+      end: /$/,
+      contains: [ VARIABLE ]
+    };
+    return {
+      name: 'Makefile',
+      aliases: [
+        'mk',
+        'mak',
+        'make',
+      ],
+      keywords: {
+        $pattern: /[\w-]+/,
+        keyword: 'define endef undefine ifdef ifndef ifeq ifneq else endif '
+        + 'include -include sinclude override export unexport private vpath'
+      },
+      contains: [
+        hljs.HASH_COMMENT_MODE,
+        VARIABLE,
+        QUOTE_STRING,
+        FUNC,
+        ASSIGNMENT,
+        META,
+        TARGET
+      ]
+    };
+  }
+
+  /*
+  Language: HTML, XML
+  Website: https://www.w3.org/XML/
+  Category: common, web
+  Audit: 2020
+  */
+
+  /** @type LanguageFn */
+  function xml(hljs) {
+    const regex = hljs.regex;
+    // XML names can have the following additional letters: https://www.w3.org/TR/xml/#NT-NameChar
+    // OTHER_NAME_CHARS = /[:\-.0-9\u00B7\u0300-\u036F\u203F-\u2040]/;
+    // Element names start with NAME_START_CHAR followed by optional other Unicode letters, ASCII digits, hyphens, underscores, and periods
+    // const TAG_NAME_RE = regex.concat(/[A-Z_a-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD]/, regex.optional(/[A-Z_a-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD\-.0-9\u00B7\u0300-\u036F\u203F-\u2040]*:/), /[A-Z_a-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD\-.0-9\u00B7\u0300-\u036F\u203F-\u2040]*/);;
+    // const XML_IDENT_RE = /[A-Z_a-z:\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD\-.0-9\u00B7\u0300-\u036F\u203F-\u2040]+/;
+    // const TAG_NAME_RE = regex.concat(/[A-Z_a-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD]/, regex.optional(/[A-Z_a-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD\-.0-9\u00B7\u0300-\u036F\u203F-\u2040]*:/), /[A-Z_a-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD\-.0-9\u00B7\u0300-\u036F\u203F-\u2040]*/);
+    // however, to cater for performance and more Unicode support rely simply on the Unicode letter class
+    const TAG_NAME_RE = regex.concat(/[\p{L}_]/u, regex.optional(/[\p{L}0-9_.-]*:/u), /[\p{L}0-9_.-]*/u);
+    const XML_IDENT_RE = /[\p{L}0-9._:-]+/u;
+    const XML_ENTITIES = {
+      className: 'symbol',
+      begin: /&[a-z]+;|&#[0-9]+;|&#x[a-f0-9]+;/
+    };
+    const XML_META_KEYWORDS = {
+      begin: /\s/,
+      contains: [
+        {
+          className: 'keyword',
+          begin: /#?[a-z_][a-z1-9_-]+/,
+          illegal: /\n/
+        }
+      ]
+    };
+    const XML_META_PAR_KEYWORDS = hljs.inherit(XML_META_KEYWORDS, {
+      begin: /\(/,
+      end: /\)/
+    });
+    const APOS_META_STRING_MODE = hljs.inherit(hljs.APOS_STRING_MODE, { className: 'string' });
+    const QUOTE_META_STRING_MODE = hljs.inherit(hljs.QUOTE_STRING_MODE, { className: 'string' });
+    const TAG_INTERNALS = {
+      endsWithParent: true,
+      illegal: /</,
+      relevance: 0,
+      contains: [
+        {
+          className: 'attr',
+          begin: XML_IDENT_RE,
+          relevance: 0
+        },
+        {
+          begin: /=\s*/,
+          relevance: 0,
+          contains: [
+            {
+              className: 'string',
+              endsParent: true,
+              variants: [
+                {
+                  begin: /"/,
+                  end: /"/,
+                  contains: [ XML_ENTITIES ]
                 },
-                contains: [
-                  {
-                    begin: /[a-z-]+(?=:)/,
-                    className: "attribute"
-                  },
-                  ...STRINGS,
-                  modes.CSS_NUMBER_MODE
-                ]
-              }
-            ]
-          },
-          {
-            className: 'selector-tag',
-            begin: '\\b(' + TAGS.join('|') + ')\\b'
-          }
-        ]
-      };
-    }
-
-    /*
-    Language: Diff
-    Description: Unified and context diff
-    Author: Vasily Polovnyov <vast@whiteants.net>
-    Website: https://www.gnu.org/software/diffutils/
-    Category: common
-    */
-
-    /** @type LanguageFn */
-    function diff(hljs) {
-      const regex = hljs.regex;
-      return {
-        name: 'Diff',
-        aliases: [ 'patch' ],
-        contains: [
-          {
-            className: 'meta',
-            relevance: 10,
-            match: regex.either(
-              /^@@ +-\d+,\d+ +\+\d+,\d+ +@@/,
-              /^\*\*\* +\d+,\d+ +\*\*\*\*$/,
-              /^--- +\d+,\d+ +----$/
-            )
-          },
-          {
-            className: 'comment',
-            variants: [
-              {
-                begin: regex.either(
-                  /Index: /,
-                  /^index/,
-                  /={3,}/,
-                  /^-{3}/,
-                  /^\*{3} /,
-                  /^\+{3}/,
-                  /^diff --git/
-                ),
-                end: /$/
-              },
-              { match: /^\*{15}$/ }
-            ]
-          },
-          {
-            className: 'addition',
-            begin: /^\+/,
-            end: /$/
-          },
-          {
-            className: 'deletion',
-            begin: /^-/,
-            end: /$/
-          },
-          {
-            className: 'addition',
-            begin: /^!/,
-            end: /$/
-          }
-        ]
-      };
-    }
-
-    /*
-    Language: Go
-    Author: Stephan Kountso aka StepLg <steplg@gmail.com>
-    Contributors: Evgeny Stepanischev <imbolk@gmail.com>
-    Description: Google go language (golang). For info about language
-    Website: http://golang.org/
-    Category: common, system
-    */
-
-    function go(hljs) {
-      const LITERALS = [
-        "true",
-        "false",
-        "iota",
-        "nil"
-      ];
-      const BUILT_INS = [
-        "append",
-        "cap",
-        "close",
-        "complex",
-        "copy",
-        "imag",
-        "len",
-        "make",
-        "new",
-        "panic",
-        "print",
-        "println",
-        "real",
-        "recover",
-        "delete"
-      ];
-      const TYPES = [
-        "bool",
-        "byte",
-        "complex64",
-        "complex128",
-        "error",
-        "float32",
-        "float64",
-        "int8",
-        "int16",
-        "int32",
-        "int64",
-        "string",
-        "uint8",
-        "uint16",
-        "uint32",
-        "uint64",
-        "int",
-        "uint",
-        "uintptr",
-        "rune"
-      ];
-      const KWS = [
-        "break",
-        "case",
-        "chan",
-        "const",
-        "continue",
-        "default",
-        "defer",
-        "else",
-        "fallthrough",
-        "for",
-        "func",
-        "go",
-        "goto",
-        "if",
-        "import",
-        "interface",
-        "map",
-        "package",
-        "range",
-        "return",
-        "select",
-        "struct",
-        "switch",
-        "type",
-        "var",
-      ];
-      const KEYWORDS = {
-        keyword: KWS,
-        type: TYPES,
-        literal: LITERALS,
-        built_in: BUILT_INS
-      };
-      return {
-        name: 'Go',
-        aliases: [ 'golang' ],
-        keywords: KEYWORDS,
-        illegal: '</',
-        contains: [
-          hljs.C_LINE_COMMENT_MODE,
-          hljs.C_BLOCK_COMMENT_MODE,
-          {
-            className: 'string',
-            variants: [
-              hljs.QUOTE_STRING_MODE,
-              hljs.APOS_STRING_MODE,
-              {
-                begin: '`',
-                end: '`'
-              }
-            ]
-          },
-          {
-            className: 'number',
-            variants: [
-              {
-                begin: hljs.C_NUMBER_RE + '[i]',
-                relevance: 1
-              },
-              hljs.C_NUMBER_MODE
-            ]
-          },
-          { begin: /:=/ // relevance booster
-          },
-          {
-            className: 'function',
-            beginKeywords: 'func',
-            end: '\\s*(\\{|$)',
-            excludeEnd: true,
-            contains: [
-              hljs.TITLE_MODE,
-              {
-                className: 'params',
-                begin: /\(/,
-                end: /\)/,
-                endsParent: true,
-                keywords: KEYWORDS,
-                illegal: /["']/
-              }
-            ]
-          }
-        ]
-      };
-    }
-
-    /*
-     Language: GraphQL
-     Author: John Foster (GH jf990), and others
-     Description: GraphQL is a query language for APIs
-     Category: web, common
-    */
-
-    /** @type LanguageFn */
-    function graphql(hljs) {
-      const regex = hljs.regex;
-      const GQL_NAME = /[_A-Za-z][_0-9A-Za-z]*/;
-      return {
-        name: "GraphQL",
-        aliases: [ "gql" ],
-        case_insensitive: true,
-        disableAutodetect: false,
-        keywords: {
-          keyword: [
-            "query",
-            "mutation",
-            "subscription",
-            "type",
-            "input",
-            "schema",
-            "directive",
-            "interface",
-            "union",
-            "scalar",
-            "fragment",
-            "enum",
-            "on"
-          ],
-          literal: [
-            "true",
-            "false",
-            "null"
+                {
+                  begin: /'/,
+                  end: /'/,
+                  contains: [ XML_ENTITIES ]
+                },
+                { begin: /[^\s"'=<>`]+/ }
+              ]
+            }
+          ]
+        }
+      ]
+    };
+    return {
+      name: 'HTML, XML',
+      aliases: [
+        'html',
+        'xhtml',
+        'rss',
+        'atom',
+        'xjb',
+        'xsd',
+        'xsl',
+        'plist',
+        'wsf',
+        'svg'
+      ],
+      case_insensitive: true,
+      unicodeRegex: true,
+      contains: [
+        {
+          className: 'meta',
+          begin: /<![a-z]/,
+          end: />/,
+          relevance: 10,
+          contains: [
+            XML_META_KEYWORDS,
+            QUOTE_META_STRING_MODE,
+            APOS_META_STRING_MODE,
+            XML_META_PAR_KEYWORDS,
+            {
+              begin: /\[/,
+              end: /\]/,
+              contains: [
+                {
+                  className: 'meta',
+                  begin: /<![a-z]/,
+                  end: />/,
+                  contains: [
+                    XML_META_KEYWORDS,
+                    XML_META_PAR_KEYWORDS,
+                    QUOTE_META_STRING_MODE,
+                    APOS_META_STRING_MODE
+                  ]
+                }
+              ]
+            }
           ]
         },
-        contains: [
-          hljs.HASH_COMMENT_MODE,
-          hljs.QUOTE_STRING_MODE,
-          hljs.NUMBER_MODE,
-          {
-            scope: "punctuation",
-            match: /[.]{3}/,
-            relevance: 0
-          },
-          {
-            scope: "punctuation",
-            begin: /[\!\(\)\:\=\[\]\{\|\}]{1}/,
-            relevance: 0
-          },
-          {
-            scope: "variable",
-            begin: /\$/,
-            end: /\W/,
-            excludeEnd: true,
-            relevance: 0
-          },
-          {
-            scope: "meta",
-            match: /@\w+/,
-            excludeEnd: true
-          },
-          {
-            scope: "symbol",
-            begin: regex.concat(GQL_NAME, regex.lookahead(/\s*:/)),
-            relevance: 0
-          }
-        ],
-        illegal: [
-          /[;<']/,
-          /BEGIN/
-        ]
-      };
-    }
-
-    /*
-    Language: TOML, also INI
-    Description: TOML aims to be a minimal configuration file format that's easy to read due to obvious semantics.
-    Contributors: Guillaume Gomez <guillaume1.gomez@gmail.com>
-    Category: common, config
-    Website: https://github.com/toml-lang/toml
-    */
-
-    function ini(hljs) {
-      const regex = hljs.regex;
-      const NUMBERS = {
-        className: 'number',
-        relevance: 0,
-        variants: [
-          { begin: /([+-]+)?[\d]+_[\d_]+/ },
-          { begin: hljs.NUMBER_RE }
-        ]
-      };
-      const COMMENTS = hljs.COMMENT();
-      COMMENTS.variants = [
+        hljs.COMMENT(
+          /<!--/,
+          /-->/,
+          { relevance: 10 }
+        ),
         {
-          begin: /;/,
-          end: /$/
+          begin: /<!\[CDATA\[/,
+          end: /\]\]>/,
+          relevance: 10
+        },
+        XML_ENTITIES,
+        // xml processing instructions
+        {
+          className: 'meta',
+          end: /\?>/,
+          variants: [
+            {
+              begin: /<\?xml/,
+              relevance: 10,
+              contains: [
+                QUOTE_META_STRING_MODE
+              ]
+            },
+            {
+              begin: /<\?[a-z][a-z0-9]+/,
+            }
+          ]
+
         },
         {
-          begin: /#/,
-          end: /$/
+          className: 'tag',
+          /*
+          The lookahead pattern (?=...) ensures that 'begin' only matches
+          '<style' as a single word, followed by a whitespace or an
+          ending bracket.
+          */
+          begin: /<style(?=\s|>)/,
+          end: />/,
+          keywords: { name: 'style' },
+          contains: [ TAG_INTERNALS ],
+          starts: {
+            end: /<\/style>/,
+            returnEnd: true,
+            subLanguage: [
+              'css',
+              'xml'
+            ]
+          }
+        },
+        {
+          className: 'tag',
+          // See the comment in the <style tag about the lookahead pattern
+          begin: /<script(?=\s|>)/,
+          end: />/,
+          keywords: { name: 'script' },
+          contains: [ TAG_INTERNALS ],
+          starts: {
+            end: /<\/script>/,
+            returnEnd: true,
+            subLanguage: [
+              'javascript',
+              'handlebars',
+              'xml'
+            ]
+          }
+        },
+        // we need this for now for jSX
+        {
+          className: 'tag',
+          begin: /<>|<\/>/
+        },
+        // open tag
+        {
+          className: 'tag',
+          begin: regex.concat(
+            /</,
+            regex.lookahead(regex.concat(
+              TAG_NAME_RE,
+              // <tag/>
+              // <tag>
+              // <tag ...
+              regex.either(/\/>/, />/, /\s/)
+            ))
+          ),
+          end: /\/?>/,
+          contains: [
+            {
+              className: 'name',
+              begin: TAG_NAME_RE,
+              relevance: 0,
+              starts: TAG_INTERNALS
+            }
+          ]
+        },
+        // close tag
+        {
+          className: 'tag',
+          begin: regex.concat(
+            /<\//,
+            regex.lookahead(regex.concat(
+              TAG_NAME_RE, />/
+            ))
+          ),
+          contains: [
+            {
+              className: 'name',
+              begin: TAG_NAME_RE,
+              relevance: 0
+            },
+            {
+              begin: />/,
+              relevance: 0,
+              endsParent: true
+            }
+          ]
         }
-      ];
-      const VARIABLES = {
-        className: 'variable',
-        variants: [
-          { begin: /\$[\w\d"][\w\d_]*/ },
-          { begin: /\$\{(.*?)\}/ }
-        ]
-      };
-      const LITERALS = {
-        className: 'literal',
-        begin: /\bon|off|true|false|yes|no\b/
-      };
-      const STRINGS = {
-        className: "string",
-        contains: [ hljs.BACKSLASH_ESCAPE ],
+      ]
+    };
+  }
+
+  /*
+  Language: Markdown
+  Requires: xml.js
+  Author: John Crepezzi <john.crepezzi@gmail.com>
+  Website: https://daringfireball.net/projects/markdown/
+  Category: common, markup
+  */
+
+  function markdown(hljs) {
+    const regex = hljs.regex;
+    const INLINE_HTML = {
+      begin: /<\/?[A-Za-z_]/,
+      end: '>',
+      subLanguage: 'xml',
+      relevance: 0
+    };
+    const HORIZONTAL_RULE = {
+      begin: '^[-\\*]{3,}',
+      end: '$'
+    };
+    const CODE = {
+      className: 'code',
+      variants: [
+        // TODO: fix to allow these to work with sublanguage also
+        { begin: '(`{3,})[^`](.|\\n)*?\\1`*[ ]*' },
+        { begin: '(~{3,})[^~](.|\\n)*?\\1~*[ ]*' },
+        // needed to allow markdown as a sublanguage to work
+        {
+          begin: '```',
+          end: '```+[ ]*$'
+        },
+        {
+          begin: '~~~',
+          end: '~~~+[ ]*$'
+        },
+        { begin: '`.+?`' },
+        {
+          begin: '(?=^( {4}|\\t))',
+          // use contains to gobble up multiple lines to allow the block to be whatever size
+          // but only have a single open/close tag vs one per line
+          contains: [
+            {
+              begin: '^( {4}|\\t)',
+              end: '(\\n)$'
+            }
+          ],
+          relevance: 0
+        }
+      ]
+    };
+    const LIST = {
+      className: 'bullet',
+      begin: '^[ \t]*([*+-]|(\\d+\\.))(?=\\s+)',
+      end: '\\s+',
+      excludeEnd: true
+    };
+    const LINK_REFERENCE = {
+      begin: /^\[[^\n]+\]:/,
+      returnBegin: true,
+      contains: [
+        {
+          className: 'symbol',
+          begin: /\[/,
+          end: /\]/,
+          excludeBegin: true,
+          excludeEnd: true
+        },
+        {
+          className: 'link',
+          begin: /:\s*/,
+          end: /$/,
+          excludeBegin: true
+        }
+      ]
+    };
+    const URL_SCHEME = /[A-Za-z][A-Za-z0-9+.-]*/;
+    const LINK = {
+      variants: [
+        // too much like nested array access in so many languages
+        // to have any real relevance
+        {
+          begin: /\[.+?\]\[.*?\]/,
+          relevance: 0
+        },
+        // popular internet URLs
+        {
+          begin: /\[.+?\]\(((data|javascript|mailto):|(?:http|ftp)s?:\/\/).*?\)/,
+          relevance: 2
+        },
+        {
+          begin: regex.concat(/\[.+?\]\(/, URL_SCHEME, /:\/\/.*?\)/),
+          relevance: 2
+        },
+        // relative urls
+        {
+          begin: /\[.+?\]\([./?&#].*?\)/,
+          relevance: 1
+        },
+        // whatever else, lower relevance (might not be a link at all)
+        {
+          begin: /\[.*?\]\(.*?\)/,
+          relevance: 0
+        }
+      ],
+      returnBegin: true,
+      contains: [
+        {
+          // empty strings for alt or link text
+          match: /\[(?=\])/ },
+        {
+          className: 'string',
+          relevance: 0,
+          begin: '\\[',
+          end: '\\]',
+          excludeBegin: true,
+          returnEnd: true
+        },
+        {
+          className: 'link',
+          relevance: 0,
+          begin: '\\]\\(',
+          end: '\\)',
+          excludeBegin: true,
+          excludeEnd: true
+        },
+        {
+          className: 'symbol',
+          relevance: 0,
+          begin: '\\]\\[',
+          end: '\\]',
+          excludeBegin: true,
+          excludeEnd: true
+        }
+      ]
+    };
+    const BOLD = {
+      className: 'strong',
+      contains: [], // defined later
+      variants: [
+        {
+          begin: /_{2}(?!\s)/,
+          end: /_{2}/
+        },
+        {
+          begin: /\*{2}(?!\s)/,
+          end: /\*{2}/
+        }
+      ]
+    };
+    const ITALIC = {
+      className: 'emphasis',
+      contains: [], // defined later
+      variants: [
+        {
+          begin: /\*(?![*\s])/,
+          end: /\*/
+        },
+        {
+          begin: /_(?![_\s])/,
+          end: /_/,
+          relevance: 0
+        }
+      ]
+    };
+
+    // 3 level deep nesting is not allowed because it would create confusion
+    // in cases like `***testing***` because where we don't know if the last
+    // `***` is starting a new bold/italic or finishing the last one
+    const BOLD_WITHOUT_ITALIC = hljs.inherit(BOLD, { contains: [] });
+    const ITALIC_WITHOUT_BOLD = hljs.inherit(ITALIC, { contains: [] });
+    BOLD.contains.push(ITALIC_WITHOUT_BOLD);
+    ITALIC.contains.push(BOLD_WITHOUT_ITALIC);
+
+    let CONTAINABLE = [
+      INLINE_HTML,
+      LINK
+    ];
+
+    [
+      BOLD,
+      ITALIC,
+      BOLD_WITHOUT_ITALIC,
+      ITALIC_WITHOUT_BOLD
+    ].forEach(m => {
+      m.contains = m.contains.concat(CONTAINABLE);
+    });
+
+    CONTAINABLE = CONTAINABLE.concat(BOLD, ITALIC);
+
+    const HEADER = {
+      className: 'section',
+      variants: [
+        {
+          begin: '^#{1,6}',
+          end: '$',
+          contains: CONTAINABLE
+        },
+        {
+          begin: '(?=^.+?\\n[=-]{2,}$)',
+          contains: [
+            { begin: '^[=-]*$' },
+            {
+              begin: '^',
+              end: "\\n",
+              contains: CONTAINABLE
+            }
+          ]
+        }
+      ]
+    };
+
+    const BLOCKQUOTE = {
+      className: 'quote',
+      begin: '^>\\s+',
+      contains: CONTAINABLE,
+      end: '$'
+    };
+
+    return {
+      name: 'Markdown',
+      aliases: [
+        'md',
+        'mkdown',
+        'mkd'
+      ],
+      contains: [
+        HEADER,
+        INLINE_HTML,
+        LIST,
+        BOLD,
+        ITALIC,
+        BLOCKQUOTE,
+        CODE,
+        HORIZONTAL_RULE,
+        LINK,
+        LINK_REFERENCE
+      ]
+    };
+  }
+
+  /*
+  Language: Objective-C
+  Author: Valerii Hiora <valerii.hiora@gmail.com>
+  Contributors: Angel G. Olloqui <angelgarcia.mail@gmail.com>, Matt Diephouse <matt@diephouse.com>, Andrew Farmer <ahfarmer@gmail.com>, Minh Nguyễn <mxn@1ec5.org>
+  Website: https://developer.apple.com/documentation/objectivec
+  Category: common
+  */
+
+  function objectivec(hljs) {
+    const API_CLASS = {
+      className: 'built_in',
+      begin: '\\b(AV|CA|CF|CG|CI|CL|CM|CN|CT|MK|MP|MTK|MTL|NS|SCN|SK|UI|WK|XC)\\w+'
+    };
+    const IDENTIFIER_RE = /[a-zA-Z@][a-zA-Z0-9_]*/;
+    const TYPES = [
+      "int",
+      "float",
+      "char",
+      "unsigned",
+      "signed",
+      "short",
+      "long",
+      "double",
+      "wchar_t",
+      "unichar",
+      "void",
+      "bool",
+      "BOOL",
+      "id|0",
+      "_Bool"
+    ];
+    const KWS = [
+      "while",
+      "export",
+      "sizeof",
+      "typedef",
+      "const",
+      "struct",
+      "for",
+      "union",
+      "volatile",
+      "static",
+      "mutable",
+      "if",
+      "do",
+      "return",
+      "goto",
+      "enum",
+      "else",
+      "break",
+      "extern",
+      "asm",
+      "case",
+      "default",
+      "register",
+      "explicit",
+      "typename",
+      "switch",
+      "continue",
+      "inline",
+      "readonly",
+      "assign",
+      "readwrite",
+      "self",
+      "@synchronized",
+      "id",
+      "typeof",
+      "nonatomic",
+      "IBOutlet",
+      "IBAction",
+      "strong",
+      "weak",
+      "copy",
+      "in",
+      "out",
+      "inout",
+      "bycopy",
+      "byref",
+      "oneway",
+      "__strong",
+      "__weak",
+      "__block",
+      "__autoreleasing",
+      "@private",
+      "@protected",
+      "@public",
+      "@try",
+      "@property",
+      "@end",
+      "@throw",
+      "@catch",
+      "@finally",
+      "@autoreleasepool",
+      "@synthesize",
+      "@dynamic",
+      "@selector",
+      "@optional",
+      "@required",
+      "@encode",
+      "@package",
+      "@import",
+      "@defs",
+      "@compatibility_alias",
+      "__bridge",
+      "__bridge_transfer",
+      "__bridge_retained",
+      "__bridge_retain",
+      "__covariant",
+      "__contravariant",
+      "__kindof",
+      "_Nonnull",
+      "_Nullable",
+      "_Null_unspecified",
+      "__FUNCTION__",
+      "__PRETTY_FUNCTION__",
+      "__attribute__",
+      "getter",
+      "setter",
+      "retain",
+      "unsafe_unretained",
+      "nonnull",
+      "nullable",
+      "null_unspecified",
+      "null_resettable",
+      "class",
+      "instancetype",
+      "NS_DESIGNATED_INITIALIZER",
+      "NS_UNAVAILABLE",
+      "NS_REQUIRES_SUPER",
+      "NS_RETURNS_INNER_POINTER",
+      "NS_INLINE",
+      "NS_AVAILABLE",
+      "NS_DEPRECATED",
+      "NS_ENUM",
+      "NS_OPTIONS",
+      "NS_SWIFT_UNAVAILABLE",
+      "NS_ASSUME_NONNULL_BEGIN",
+      "NS_ASSUME_NONNULL_END",
+      "NS_REFINED_FOR_SWIFT",
+      "NS_SWIFT_NAME",
+      "NS_SWIFT_NOTHROW",
+      "NS_DURING",
+      "NS_HANDLER",
+      "NS_ENDHANDLER",
+      "NS_VALUERETURN",
+      "NS_VOIDRETURN"
+    ];
+    const LITERALS = [
+      "false",
+      "true",
+      "FALSE",
+      "TRUE",
+      "nil",
+      "YES",
+      "NO",
+      "NULL"
+    ];
+    const BUILT_INS = [
+      "dispatch_once_t",
+      "dispatch_queue_t",
+      "dispatch_sync",
+      "dispatch_async",
+      "dispatch_once"
+    ];
+    const KEYWORDS = {
+      "variable.language": [
+        "this",
+        "super"
+      ],
+      $pattern: IDENTIFIER_RE,
+      keyword: KWS,
+      literal: LITERALS,
+      built_in: BUILT_INS,
+      type: TYPES
+    };
+    const CLASS_KEYWORDS = {
+      $pattern: IDENTIFIER_RE,
+      keyword: [
+        "@interface",
+        "@class",
+        "@protocol",
+        "@implementation"
+      ]
+    };
+    return {
+      name: 'Objective-C',
+      aliases: [
+        'mm',
+        'objc',
+        'obj-c',
+        'obj-c++',
+        'objective-c++'
+      ],
+      keywords: KEYWORDS,
+      illegal: '</',
+      contains: [
+        API_CLASS,
+        hljs.C_LINE_COMMENT_MODE,
+        hljs.C_BLOCK_COMMENT_MODE,
+        hljs.C_NUMBER_MODE,
+        hljs.QUOTE_STRING_MODE,
+        hljs.APOS_STRING_MODE,
+        {
+          className: 'string',
+          variants: [
+            {
+              begin: '@"',
+              end: '"',
+              illegal: '\\n',
+              contains: [ hljs.BACKSLASH_ESCAPE ]
+            }
+          ]
+        },
+        {
+          className: 'meta',
+          begin: /#\s*[a-z]+\b/,
+          end: /$/,
+          keywords: { keyword:
+              'if else elif endif define undef warning error line '
+              + 'pragma ifdef ifndef include' },
+          contains: [
+            {
+              begin: /\\\n/,
+              relevance: 0
+            },
+            hljs.inherit(hljs.QUOTE_STRING_MODE, { className: 'string' }),
+            {
+              className: 'string',
+              begin: /<.*?>/,
+              end: /$/,
+              illegal: '\\n'
+            },
+            hljs.C_LINE_COMMENT_MODE,
+            hljs.C_BLOCK_COMMENT_MODE
+          ]
+        },
+        {
+          className: 'class',
+          begin: '(' + CLASS_KEYWORDS.keyword.join('|') + ')\\b',
+          end: /(\{|$)/,
+          excludeEnd: true,
+          keywords: CLASS_KEYWORDS,
+          contains: [ hljs.UNDERSCORE_TITLE_MODE ]
+        },
+        {
+          begin: '\\.' + hljs.UNDERSCORE_IDENT_RE,
+          relevance: 0
+        }
+      ]
+    };
+  }
+
+  /*
+  Language: Perl
+  Author: Peter Leonov <gojpeg@yandex.ru>
+  Website: https://www.perl.org
+  Category: common
+  */
+
+  /** @type LanguageFn */
+  function perl(hljs) {
+    const regex = hljs.regex;
+    const KEYWORDS = [
+      'abs',
+      'accept',
+      'alarm',
+      'and',
+      'atan2',
+      'bind',
+      'binmode',
+      'bless',
+      'break',
+      'caller',
+      'chdir',
+      'chmod',
+      'chomp',
+      'chop',
+      'chown',
+      'chr',
+      'chroot',
+      'close',
+      'closedir',
+      'connect',
+      'continue',
+      'cos',
+      'crypt',
+      'dbmclose',
+      'dbmopen',
+      'defined',
+      'delete',
+      'die',
+      'do',
+      'dump',
+      'each',
+      'else',
+      'elsif',
+      'endgrent',
+      'endhostent',
+      'endnetent',
+      'endprotoent',
+      'endpwent',
+      'endservent',
+      'eof',
+      'eval',
+      'exec',
+      'exists',
+      'exit',
+      'exp',
+      'fcntl',
+      'fileno',
+      'flock',
+      'for',
+      'foreach',
+      'fork',
+      'format',
+      'formline',
+      'getc',
+      'getgrent',
+      'getgrgid',
+      'getgrnam',
+      'gethostbyaddr',
+      'gethostbyname',
+      'gethostent',
+      'getlogin',
+      'getnetbyaddr',
+      'getnetbyname',
+      'getnetent',
+      'getpeername',
+      'getpgrp',
+      'getpriority',
+      'getprotobyname',
+      'getprotobynumber',
+      'getprotoent',
+      'getpwent',
+      'getpwnam',
+      'getpwuid',
+      'getservbyname',
+      'getservbyport',
+      'getservent',
+      'getsockname',
+      'getsockopt',
+      'given',
+      'glob',
+      'gmtime',
+      'goto',
+      'grep',
+      'gt',
+      'hex',
+      'if',
+      'index',
+      'int',
+      'ioctl',
+      'join',
+      'keys',
+      'kill',
+      'last',
+      'lc',
+      'lcfirst',
+      'length',
+      'link',
+      'listen',
+      'local',
+      'localtime',
+      'log',
+      'lstat',
+      'lt',
+      'ma',
+      'map',
+      'mkdir',
+      'msgctl',
+      'msgget',
+      'msgrcv',
+      'msgsnd',
+      'my',
+      'ne',
+      'next',
+      'no',
+      'not',
+      'oct',
+      'open',
+      'opendir',
+      'or',
+      'ord',
+      'our',
+      'pack',
+      'package',
+      'pipe',
+      'pop',
+      'pos',
+      'print',
+      'printf',
+      'prototype',
+      'push',
+      'q|0',
+      'qq',
+      'quotemeta',
+      'qw',
+      'qx',
+      'rand',
+      'read',
+      'readdir',
+      'readline',
+      'readlink',
+      'readpipe',
+      'recv',
+      'redo',
+      'ref',
+      'rename',
+      'require',
+      'reset',
+      'return',
+      'reverse',
+      'rewinddir',
+      'rindex',
+      'rmdir',
+      'say',
+      'scalar',
+      'seek',
+      'seekdir',
+      'select',
+      'semctl',
+      'semget',
+      'semop',
+      'send',
+      'setgrent',
+      'sethostent',
+      'setnetent',
+      'setpgrp',
+      'setpriority',
+      'setprotoent',
+      'setpwent',
+      'setservent',
+      'setsockopt',
+      'shift',
+      'shmctl',
+      'shmget',
+      'shmread',
+      'shmwrite',
+      'shutdown',
+      'sin',
+      'sleep',
+      'socket',
+      'socketpair',
+      'sort',
+      'splice',
+      'split',
+      'sprintf',
+      'sqrt',
+      'srand',
+      'stat',
+      'state',
+      'study',
+      'sub',
+      'substr',
+      'symlink',
+      'syscall',
+      'sysopen',
+      'sysread',
+      'sysseek',
+      'system',
+      'syswrite',
+      'tell',
+      'telldir',
+      'tie',
+      'tied',
+      'time',
+      'times',
+      'tr',
+      'truncate',
+      'uc',
+      'ucfirst',
+      'umask',
+      'undef',
+      'unless',
+      'unlink',
+      'unpack',
+      'unshift',
+      'untie',
+      'until',
+      'use',
+      'utime',
+      'values',
+      'vec',
+      'wait',
+      'waitpid',
+      'wantarray',
+      'warn',
+      'when',
+      'while',
+      'write',
+      'x|0',
+      'xor',
+      'y|0'
+    ];
+
+    // https://perldoc.perl.org/perlre#Modifiers
+    const REGEX_MODIFIERS = /[dualxmsipngr]{0,12}/; // aa and xx are valid, making max length 12
+    const PERL_KEYWORDS = {
+      $pattern: /[\w.]+/,
+      keyword: KEYWORDS.join(" ")
+    };
+    const SUBST = {
+      className: 'subst',
+      begin: '[$@]\\{',
+      end: '\\}',
+      keywords: PERL_KEYWORDS
+    };
+    const METHOD = {
+      begin: /->\{/,
+      end: /\}/
+      // contains defined later
+    };
+    const VAR = { variants: [
+      { begin: /\$\d/ },
+      { begin: regex.concat(
+        /[$%@](\^\w\b|#\w+(::\w+)*|\{\w+\}|\w+(::\w*)*)/,
+        // negative look-ahead tries to avoid matching patterns that are not
+        // Perl at all like $ident$, @ident@, etc.
+        `(?![A-Za-z])(?![@$%])`
+      ) },
+      {
+        begin: /[$%@][^\s\w{]/,
+        relevance: 0
+      }
+    ] };
+    const STRING_CONTAINS = [
+      hljs.BACKSLASH_ESCAPE,
+      SUBST,
+      VAR
+    ];
+    const REGEX_DELIMS = [
+      /!/,
+      /\//,
+      /\|/,
+      /\?/,
+      /'/,
+      /"/, // valid but infrequent and weird
+      /#/ // valid but infrequent and weird
+    ];
+    /**
+     * @param {string|RegExp} prefix
+     * @param {string|RegExp} open
+     * @param {string|RegExp} close
+     */
+    const PAIRED_DOUBLE_RE = (prefix, open, close = '\\1') => {
+      const middle = (close === '\\1')
+        ? close
+        : regex.concat(close, open);
+      return regex.concat(
+        regex.concat("(?:", prefix, ")"),
+        open,
+        /(?:\\.|[^\\\/])*?/,
+        middle,
+        /(?:\\.|[^\\\/])*?/,
+        close,
+        REGEX_MODIFIERS
+      );
+    };
+    /**
+     * @param {string|RegExp} prefix
+     * @param {string|RegExp} open
+     * @param {string|RegExp} close
+     */
+    const PAIRED_RE = (prefix, open, close) => {
+      return regex.concat(
+        regex.concat("(?:", prefix, ")"),
+        open,
+        /(?:\\.|[^\\\/])*?/,
+        close,
+        REGEX_MODIFIERS
+      );
+    };
+    const PERL_DEFAULT_CONTAINS = [
+      VAR,
+      hljs.HASH_COMMENT_MODE,
+      hljs.COMMENT(
+        /^=\w/,
+        /=cut/,
+        { endsWithParent: true }
+      ),
+      METHOD,
+      {
+        className: 'string',
+        contains: STRING_CONTAINS,
         variants: [
           {
-            begin: "'''",
-            end: "'''",
-            relevance: 10
+            begin: 'q[qwxr]?\\s*\\(',
+            end: '\\)',
+            relevance: 5
           },
           {
-            begin: '"""',
-            end: '"""',
-            relevance: 10
+            begin: 'q[qwxr]?\\s*\\[',
+            end: '\\]',
+            relevance: 5
+          },
+          {
+            begin: 'q[qwxr]?\\s*\\{',
+            end: '\\}',
+            relevance: 5
+          },
+          {
+            begin: 'q[qwxr]?\\s*\\|',
+            end: '\\|',
+            relevance: 5
+          },
+          {
+            begin: 'q[qwxr]?\\s*<',
+            end: '>',
+            relevance: 5
+          },
+          {
+            begin: 'qw\\s+q',
+            end: 'q',
+            relevance: 5
+          },
+          {
+            begin: '\'',
+            end: '\'',
+            contains: [ hljs.BACKSLASH_ESCAPE ]
           },
           {
             begin: '"',
             end: '"'
           },
           {
-            begin: "'",
-            end: "'"
-          }
-        ]
-      };
-      const ARRAY = {
-        begin: /\[/,
-        end: /\]/,
-        contains: [
-          COMMENTS,
-          LITERALS,
-          VARIABLES,
-          STRINGS,
-          NUMBERS,
-          'self'
-        ],
-        relevance: 0
-      };
-
-      const BARE_KEY = /[A-Za-z0-9_-]+/;
-      const QUOTED_KEY_DOUBLE_QUOTE = /"(\\"|[^"])*"/;
-      const QUOTED_KEY_SINGLE_QUOTE = /'[^']*'/;
-      const ANY_KEY = regex.either(
-        BARE_KEY, QUOTED_KEY_DOUBLE_QUOTE, QUOTED_KEY_SINGLE_QUOTE
-      );
-      const DOTTED_KEY = regex.concat(
-        ANY_KEY, '(\\s*\\.\\s*', ANY_KEY, ')*',
-        regex.lookahead(/\s*=\s*[^#\s]/)
-      );
-
-      return {
-        name: 'TOML, also INI',
-        aliases: [ 'toml' ],
-        case_insensitive: true,
-        illegal: /\S/,
-        contains: [
-          COMMENTS,
-          {
-            className: 'section',
-            begin: /\[+/,
-            end: /\]+/
+            begin: '`',
+            end: '`',
+            contains: [ hljs.BACKSLASH_ESCAPE ]
           },
           {
-            begin: DOTTED_KEY,
-            className: 'attr',
-            starts: {
-              end: /$/,
-              contains: [
-                COMMENTS,
-                ARRAY,
-                LITERALS,
-                VARIABLES,
-                STRINGS,
-                NUMBERS
-              ]
-            }
+            begin: /\{\w+\}/,
+            relevance: 0
+          },
+          {
+            begin: '-?\\w+\\s*=>',
+            relevance: 0
           }
         ]
-      };
-    }
+      },
+      {
+        className: 'number',
+        begin: '(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b',
+        relevance: 0
+      },
+      { // regexp container
+        begin: '(\\/\\/|' + hljs.RE_STARTERS_RE + '|\\b(split|return|print|reverse|grep)\\b)\\s*',
+        keywords: 'split return print reverse grep',
+        relevance: 0,
+        contains: [
+          hljs.HASH_COMMENT_MODE,
+          {
+            className: 'regexp',
+            variants: [
+              // allow matching common delimiters
+              { begin: PAIRED_DOUBLE_RE("s|tr|y", regex.either(...REGEX_DELIMS, { capture: true })) },
+              // and then paired delmis
+              { begin: PAIRED_DOUBLE_RE("s|tr|y", "\\(", "\\)") },
+              { begin: PAIRED_DOUBLE_RE("s|tr|y", "\\[", "\\]") },
+              { begin: PAIRED_DOUBLE_RE("s|tr|y", "\\{", "\\}") }
+            ],
+            relevance: 2
+          },
+          {
+            className: 'regexp',
+            variants: [
+              {
+                // could be a comment in many languages so do not count
+                // as relevant
+                begin: /(m|qr)\/\//,
+                relevance: 0
+              },
+              // prefix is optional with /regex/
+              { begin: PAIRED_RE("(?:m|qr)?", /\//, /\//) },
+              // allow matching common delimiters
+              { begin: PAIRED_RE("m|qr", regex.either(...REGEX_DELIMS, { capture: true }), /\1/) },
+              // allow common paired delmins
+              { begin: PAIRED_RE("m|qr", /\(/, /\)/) },
+              { begin: PAIRED_RE("m|qr", /\[/, /\]/) },
+              { begin: PAIRED_RE("m|qr", /\{/, /\}/) }
+            ]
+          }
+        ]
+      },
+      {
+        className: 'function',
+        beginKeywords: 'sub',
+        end: '(\\s*\\(.*?\\))?[;{]',
+        excludeEnd: true,
+        relevance: 5,
+        contains: [ hljs.TITLE_MODE ]
+      },
+      {
+        begin: '-\\w\\b',
+        relevance: 0
+      },
+      {
+        begin: "^__DATA__$",
+        end: "^__END__$",
+        subLanguage: 'mojolicious',
+        contains: [
+          {
+            begin: "^@@.*",
+            end: "$",
+            className: "comment"
+          }
+        ]
+      }
+    ];
+    SUBST.contains = PERL_DEFAULT_CONTAINS;
+    METHOD.contains = PERL_DEFAULT_CONTAINS;
 
-    // https://docs.oracle.com/javase/specs/jls/se15/html/jls-3.html#jls-3.10
-    var decimalDigits = '[0-9](_*[0-9])*';
-    var frac = `\\.(${decimalDigits})`;
-    var hexDigits = '[0-9a-fA-F](_*[0-9a-fA-F])*';
-    var NUMERIC = {
-      className: 'number',
+    return {
+      name: 'Perl',
+      aliases: [
+        'pl',
+        'pm'
+      ],
+      keywords: PERL_KEYWORDS,
+      contains: PERL_DEFAULT_CONTAINS
+    };
+  }
+
+  /*
+  Language: PHP
+  Author: Victor Karamzin <Victor.Karamzin@enterra-inc.com>
+  Contributors: Evgeny Stepanischev <imbolk@gmail.com>, Ivan Sagalaev <maniac@softwaremaniacs.org>
+  Website: https://www.php.net
+  Category: common
+  */
+
+  /**
+   * @param {HLJSApi} hljs
+   * @returns {LanguageDetail}
+   * */
+  function php(hljs) {
+    const regex = hljs.regex;
+    // negative look-ahead tries to avoid matching patterns that are not
+    // Perl at all like $ident$, @ident@, etc.
+    const NOT_PERL_ETC = /(?![A-Za-z0-9])(?![$])/;
+    const IDENT_RE = regex.concat(
+      /[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/,
+      NOT_PERL_ETC);
+    // Will not detect camelCase classes
+    const PASCAL_CASE_CLASS_NAME_RE = regex.concat(
+      /(\\?[A-Z][a-z0-9_\x7f-\xff]+|\\?[A-Z]+(?=[A-Z][a-z0-9_\x7f-\xff])){1,}/,
+      NOT_PERL_ETC);
+    const VARIABLE = {
+      scope: 'variable',
+      match: '\\$+' + IDENT_RE,
+    };
+    const PREPROCESSOR = {
+      scope: 'meta',
       variants: [
-        // DecimalFloatingPointLiteral
-        // including ExponentPart
-        { begin: `(\\b(${decimalDigits})((${frac})|\\.)?|(${frac}))` +
-          `[eE][+-]?(${decimalDigits})[fFdD]?\\b` },
-        // excluding ExponentPart
-        { begin: `\\b(${decimalDigits})((${frac})[fFdD]?\\b|\\.([fFdD]\\b)?)` },
-        { begin: `(${frac})[fFdD]?\\b` },
-        { begin: `\\b(${decimalDigits})[fFdD]\\b` },
+        { begin: /<\?php/, relevance: 10 }, // boost for obvious PHP
+        { begin: /<\?=/ },
+        // less relevant per PSR-1 which says not to use short-tags
+        { begin: /<\?/, relevance: 0.1 },
+        { begin: /\?>/ } // end php tag
+      ]
+    };
+    const SUBST = {
+      scope: 'subst',
+      variants: [
+        { begin: /\$\w+/ },
+        {
+          begin: /\{\$/,
+          end: /\}/
+        }
+      ]
+    };
+    const SINGLE_QUOTED = hljs.inherit(hljs.APOS_STRING_MODE, { illegal: null, });
+    const DOUBLE_QUOTED = hljs.inherit(hljs.QUOTE_STRING_MODE, {
+      illegal: null,
+      contains: hljs.QUOTE_STRING_MODE.contains.concat(SUBST),
+    });
 
-        // HexadecimalFloatingPointLiteral
-        { begin: `\\b0[xX]((${hexDigits})\\.?|(${hexDigits})?\\.(${hexDigits}))` +
-          `[pP][+-]?(${decimalDigits})[fFdD]?\\b` },
+    const HEREDOC = {
+      begin: /<<<[ \t]*(?:(\w+)|"(\w+)")\n/,
+      end: /[ \t]*(\w+)\b/,
+      contains: hljs.QUOTE_STRING_MODE.contains.concat(SUBST),
+      'on:begin': (m, resp) => { resp.data._beginMatch = m[1] || m[2]; },
+      'on:end': (m, resp) => { if (resp.data._beginMatch !== m[1]) resp.ignoreMatch(); },
+    };
 
-        // DecimalIntegerLiteral
-        { begin: '\\b(0|[1-9](_*[0-9])*)[lL]?\\b' },
-
-        // HexIntegerLiteral
-        { begin: `\\b0[xX](${hexDigits})[lL]?\\b` },
-
-        // OctalIntegerLiteral
-        { begin: '\\b0(_*[0-7])*[lL]?\\b' },
-
-        // BinaryIntegerLiteral
-        { begin: '\\b0[bB][01](_*[01])*[lL]?\\b' },
+    const NOWDOC = hljs.END_SAME_AS_BEGIN({
+      begin: /<<<[ \t]*'(\w+)'\n/,
+      end: /[ \t]*(\w+)\b/,
+    });
+    // list of valid whitespaces because non-breaking space might be part of a IDENT_RE
+    const WHITESPACE = '[ \t\n]';
+    const STRING = {
+      scope: 'string',
+      variants: [
+        DOUBLE_QUOTED,
+        SINGLE_QUOTED,
+        HEREDOC,
+        NOWDOC
+      ]
+    };
+    const NUMBER = {
+      scope: 'number',
+      variants: [
+        { begin: `\\b0[bB][01]+(?:_[01]+)*\\b` }, // Binary w/ underscore support
+        { begin: `\\b0[oO][0-7]+(?:_[0-7]+)*\\b` }, // Octals w/ underscore support
+        { begin: `\\b0[xX][\\da-fA-F]+(?:_[\\da-fA-F]+)*\\b` }, // Hex w/ underscore support
+        // Decimals w/ underscore support, with optional fragments and scientific exponent (e) suffix.
+        { begin: `(?:\\b\\d+(?:_\\d+)*(\\.(?:\\d+(?:_\\d+)*))?|\\B\\.\\d+)(?:[eE][+-]?\\d+)?` }
       ],
       relevance: 0
     };
-
-    /*
-    Language: Java
-    Author: Vsevolod Solovyov <vsevolod.solovyov@gmail.com>
-    Category: common, enterprise
-    Website: https://www.java.com/
-    */
-
-    /**
-     * Allows recursive regex expressions to a given depth
-     *
-     * ie: recurRegex("(abc~~~)", /~~~/g, 2) becomes:
-     * (abc(abc(abc)))
-     *
-     * @param {string} re
-     * @param {RegExp} substitution (should be a g mode regex)
-     * @param {number} depth
-     * @returns {string}``
-     */
-    function recurRegex(re, substitution, depth) {
-      if (depth === -1) return "";
-
-      return re.replace(substitution, _ => {
-        return recurRegex(re, substitution, depth - 1);
-      });
-    }
-
-    /** @type LanguageFn */
-    function java(hljs) {
-      const regex = hljs.regex;
-      const JAVA_IDENT_RE = '[\u00C0-\u02B8a-zA-Z_$][\u00C0-\u02B8a-zA-Z_$0-9]*';
-      const GENERIC_IDENT_RE = JAVA_IDENT_RE
-        + recurRegex('(?:<' + JAVA_IDENT_RE + '~~~(?:\\s*,\\s*' + JAVA_IDENT_RE + '~~~)*>)?', /~~~/g, 2);
-      const MAIN_KEYWORDS = [
-        'synchronized',
-        'abstract',
-        'private',
-        'var',
-        'static',
-        'if',
-        'const ',
-        'for',
-        'while',
-        'strictfp',
-        'finally',
-        'protected',
-        'import',
-        'native',
-        'final',
-        'void',
-        'enum',
-        'else',
-        'break',
-        'transient',
-        'catch',
-        'instanceof',
-        'volatile',
-        'case',
-        'assert',
-        'package',
-        'default',
-        'public',
-        'try',
-        'switch',
-        'continue',
-        'throws',
-        'protected',
-        'public',
-        'private',
-        'module',
-        'requires',
-        'exports',
-        'do',
-        'sealed'
-      ];
-
-      const BUILT_INS = [
-        'super',
-        'this'
-      ];
-
-      const LITERALS = [
-        'false',
-        'true',
-        'null'
-      ];
-
-      const TYPES = [
-        'char',
-        'boolean',
-        'long',
-        'float',
-        'int',
-        'byte',
-        'short',
-        'double'
-      ];
-
-      const KEYWORDS = {
-        keyword: MAIN_KEYWORDS,
-        literal: LITERALS,
-        type: TYPES,
-        built_in: BUILT_INS
-      };
-
-      const ANNOTATION = {
-        className: 'meta',
-        begin: '@' + JAVA_IDENT_RE,
-        contains: [
-          {
-            begin: /\(/,
-            end: /\)/,
-            contains: [ "self" ] // allow nested () inside our annotation
-          }
-        ]
-      };
-      const PARAMS = {
-        className: 'params',
-        begin: /\(/,
-        end: /\)/,
-        keywords: KEYWORDS,
-        relevance: 0,
-        contains: [ hljs.C_BLOCK_COMMENT_MODE ],
-        endsParent: true
-      };
-
-      return {
-        name: 'Java',
-        aliases: [ 'jsp' ],
-        keywords: KEYWORDS,
-        illegal: /<\/|#/,
-        contains: [
-          hljs.COMMENT(
-            '/\\*\\*',
-            '\\*/',
-            {
-              relevance: 0,
-              contains: [
-                {
-                  // eat up @'s in emails to prevent them to be recognized as doctags
-                  begin: /\w+@/,
-                  relevance: 0
-                },
-                {
-                  className: 'doctag',
-                  begin: '@[A-Za-z]+'
-                }
-              ]
-            }
-          ),
-          // relevance boost
-          {
-            begin: /import java\.[a-z]+\./,
-            keywords: "import",
-            relevance: 2
-          },
-          hljs.C_LINE_COMMENT_MODE,
-          hljs.C_BLOCK_COMMENT_MODE,
-          {
-            begin: /"""/,
-            end: /"""/,
-            className: "string",
-            contains: [ hljs.BACKSLASH_ESCAPE ]
-          },
-          hljs.APOS_STRING_MODE,
-          hljs.QUOTE_STRING_MODE,
-          {
-            match: [
-              /\b(?:class|interface|enum|extends|implements|new)/,
-              /\s+/,
-              JAVA_IDENT_RE
-            ],
-            className: {
-              1: "keyword",
-              3: "title.class"
-            }
-          },
-          {
-            // Exceptions for hyphenated keywords
-            match: /non-sealed/,
-            scope: "keyword"
-          },
-          {
-            begin: [
-              regex.concat(/(?!else)/, JAVA_IDENT_RE),
-              /\s+/,
-              JAVA_IDENT_RE,
-              /\s+/,
-              /=(?!=)/
-            ],
-            className: {
-              1: "type",
-              3: "variable",
-              5: "operator"
-            }
-          },
-          {
-            begin: [
-              /record/,
-              /\s+/,
-              JAVA_IDENT_RE
-            ],
-            className: {
-              1: "keyword",
-              3: "title.class"
-            },
-            contains: [
-              PARAMS,
-              hljs.C_LINE_COMMENT_MODE,
-              hljs.C_BLOCK_COMMENT_MODE
-            ]
-          },
-          {
-            // Expression keywords prevent 'keyword Name(...)' from being
-            // recognized as a function definition
-            beginKeywords: 'new throw return else',
-            relevance: 0
-          },
-          {
-            begin: [
-              '(?:' + GENERIC_IDENT_RE + '\\s+)',
-              hljs.UNDERSCORE_IDENT_RE,
-              /\s*(?=\()/
-            ],
-            className: { 2: "title.function" },
-            keywords: KEYWORDS,
-            contains: [
-              {
-                className: 'params',
-                begin: /\(/,
-                end: /\)/,
-                keywords: KEYWORDS,
-                relevance: 0,
-                contains: [
-                  ANNOTATION,
-                  hljs.APOS_STRING_MODE,
-                  hljs.QUOTE_STRING_MODE,
-                  NUMERIC,
-                  hljs.C_BLOCK_COMMENT_MODE
-                ]
-              },
-              hljs.C_LINE_COMMENT_MODE,
-              hljs.C_BLOCK_COMMENT_MODE
-            ]
-          },
-          NUMERIC,
-          ANNOTATION
-        ]
-      };
-    }
-
-    const IDENT_RE = '[A-Za-z$_][0-9A-Za-z$_]*';
-    const KEYWORDS = [
-      "as", // for exports
-      "in",
-      "of",
-      "if",
-      "for",
-      "while",
-      "finally",
-      "var",
-      "new",
-      "function",
-      "do",
-      "return",
-      "void",
-      "else",
-      "break",
-      "catch",
-      "instanceof",
-      "with",
-      "throw",
-      "case",
-      "default",
-      "try",
-      "switch",
-      "continue",
-      "typeof",
-      "delete",
-      "let",
-      "yield",
-      "const",
-      "class",
-      // JS handles these with a special rule
-      // "get",
-      // "set",
-      "debugger",
-      "async",
-      "await",
-      "static",
-      "import",
-      "from",
-      "export",
-      "extends"
-    ];
     const LITERALS = [
-      "true",
       "false",
       "null",
-      "undefined",
-      "NaN",
-      "Infinity"
+      "true"
     ];
-
-    // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects
-    const TYPES = [
-      // Fundamental objects
-      "Object",
-      "Function",
-      "Boolean",
-      "Symbol",
-      // numbers and dates
-      "Math",
-      "Date",
-      "Number",
-      "BigInt",
-      // text
-      "String",
-      "RegExp",
-      // Indexed collections
-      "Array",
-      "Float32Array",
-      "Float64Array",
-      "Int8Array",
-      "Uint8Array",
-      "Uint8ClampedArray",
-      "Int16Array",
-      "Int32Array",
-      "Uint16Array",
-      "Uint32Array",
-      "BigInt64Array",
-      "BigUint64Array",
-      // Keyed collections
-      "Set",
-      "Map",
-      "WeakSet",
-      "WeakMap",
-      // Structured data
-      "ArrayBuffer",
-      "SharedArrayBuffer",
-      "Atomics",
-      "DataView",
-      "JSON",
-      // Control abstraction objects
-      "Promise",
-      "Generator",
-      "GeneratorFunction",
-      "AsyncFunction",
-      // Reflection
-      "Reflect",
-      "Proxy",
-      // Internationalization
-      "Intl",
-      // WebAssembly
-      "WebAssembly"
-    ];
-
-    const ERROR_TYPES = [
-      "Error",
-      "EvalError",
-      "InternalError",
-      "RangeError",
-      "ReferenceError",
-      "SyntaxError",
-      "TypeError",
-      "URIError"
-    ];
-
-    const BUILT_IN_GLOBALS = [
-      "setInterval",
-      "setTimeout",
-      "clearInterval",
-      "clearTimeout",
-
+    const KWS = [
+      // Magic constants:
+      // <https://www.php.net/manual/en/language.constants.predefined.php>
+      "__CLASS__",
+      "__DIR__",
+      "__FILE__",
+      "__FUNCTION__",
+      "__COMPILER_HALT_OFFSET__",
+      "__LINE__",
+      "__METHOD__",
+      "__NAMESPACE__",
+      "__TRAIT__",
+      // Function that look like language construct or language construct that look like function:
+      // List of keywords that may not require parenthesis
+      "die",
+      "echo",
+      "exit",
+      "include",
+      "include_once",
+      "print",
       "require",
-      "exports",
-
+      "require_once",
+      // These are not language construct (function) but operate on the currently-executing function and can access the current symbol table
+      // 'compact extract func_get_arg func_get_args func_num_args get_called_class get_parent_class ' +
+      // Other keywords:
+      // <https://www.php.net/manual/en/reserved.php>
+      // <https://www.php.net/manual/en/language.types.type-juggling.php>
+      "array",
+      "abstract",
+      "and",
+      "as",
+      "binary",
+      "bool",
+      "boolean",
+      "break",
+      "callable",
+      "case",
+      "catch",
+      "class",
+      "clone",
+      "const",
+      "continue",
+      "declare",
+      "default",
+      "do",
+      "double",
+      "else",
+      "elseif",
+      "empty",
+      "enddeclare",
+      "endfor",
+      "endforeach",
+      "endif",
+      "endswitch",
+      "endwhile",
+      "enum",
       "eval",
-      "isFinite",
-      "isNaN",
-      "parseFloat",
-      "parseInt",
-      "decodeURI",
-      "decodeURIComponent",
-      "encodeURI",
-      "encodeURIComponent",
-      "escape",
-      "unescape"
+      "extends",
+      "final",
+      "finally",
+      "float",
+      "for",
+      "foreach",
+      "from",
+      "global",
+      "goto",
+      "if",
+      "implements",
+      "instanceof",
+      "insteadof",
+      "int",
+      "integer",
+      "interface",
+      "isset",
+      "iterable",
+      "list",
+      "match|0",
+      "mixed",
+      "new",
+      "never",
+      "object",
+      "or",
+      "private",
+      "protected",
+      "public",
+      "readonly",
+      "real",
+      "return",
+      "string",
+      "switch",
+      "throw",
+      "trait",
+      "try",
+      "unset",
+      "use",
+      "var",
+      "void",
+      "while",
+      "xor",
+      "yield"
     ];
 
-    const BUILT_IN_VARIABLES = [
-      "arguments",
-      "this",
-      "super",
-      "console",
-      "window",
-      "document",
-      "localStorage",
-      "module",
-      "global" // Node.js
+    const BUILT_INS = [
+      // Standard PHP library:
+      // <https://www.php.net/manual/en/book.spl.php>
+      "Error|0",
+      "AppendIterator",
+      "ArgumentCountError",
+      "ArithmeticError",
+      "ArrayIterator",
+      "ArrayObject",
+      "AssertionError",
+      "BadFunctionCallException",
+      "BadMethodCallException",
+      "CachingIterator",
+      "CallbackFilterIterator",
+      "CompileError",
+      "Countable",
+      "DirectoryIterator",
+      "DivisionByZeroError",
+      "DomainException",
+      "EmptyIterator",
+      "ErrorException",
+      "Exception",
+      "FilesystemIterator",
+      "FilterIterator",
+      "GlobIterator",
+      "InfiniteIterator",
+      "InvalidArgumentException",
+      "IteratorIterator",
+      "LengthException",
+      "LimitIterator",
+      "LogicException",
+      "MultipleIterator",
+      "NoRewindIterator",
+      "OutOfBoundsException",
+      "OutOfRangeException",
+      "OuterIterator",
+      "OverflowException",
+      "ParentIterator",
+      "ParseError",
+      "RangeException",
+      "RecursiveArrayIterator",
+      "RecursiveCachingIterator",
+      "RecursiveCallbackFilterIterator",
+      "RecursiveDirectoryIterator",
+      "RecursiveFilterIterator",
+      "RecursiveIterator",
+      "RecursiveIteratorIterator",
+      "RecursiveRegexIterator",
+      "RecursiveTreeIterator",
+      "RegexIterator",
+      "RuntimeException",
+      "SeekableIterator",
+      "SplDoublyLinkedList",
+      "SplFileInfo",
+      "SplFileObject",
+      "SplFixedArray",
+      "SplHeap",
+      "SplMaxHeap",
+      "SplMinHeap",
+      "SplObjectStorage",
+      "SplObserver",
+      "SplPriorityQueue",
+      "SplQueue",
+      "SplStack",
+      "SplSubject",
+      "SplTempFileObject",
+      "TypeError",
+      "UnderflowException",
+      "UnexpectedValueException",
+      "UnhandledMatchError",
+      // Reserved interfaces:
+      // <https://www.php.net/manual/en/reserved.interfaces.php>
+      "ArrayAccess",
+      "BackedEnum",
+      "Closure",
+      "Fiber",
+      "Generator",
+      "Iterator",
+      "IteratorAggregate",
+      "Serializable",
+      "Stringable",
+      "Throwable",
+      "Traversable",
+      "UnitEnum",
+      "WeakReference",
+      "WeakMap",
+      // Reserved classes:
+      // <https://www.php.net/manual/en/reserved.classes.php>
+      "Directory",
+      "__PHP_Incomplete_Class",
+      "parent",
+      "php_user_filter",
+      "self",
+      "static",
+      "stdClass"
     ];
 
-    const BUILT_INS = [].concat(
-      BUILT_IN_GLOBALS,
-      TYPES,
-      ERROR_TYPES
-    );
-
-    /*
-    Language: JavaScript
-    Description: JavaScript (JS) is a lightweight, interpreted, or just-in-time compiled programming language with first-class functions.
-    Category: common, scripting, web
-    Website: https://developer.mozilla.org/en-US/docs/Web/JavaScript
-    */
-
-    /** @type LanguageFn */
-    function javascript(hljs) {
-      const regex = hljs.regex;
-      /**
-       * Takes a string like "<Booger" and checks to see
-       * if we can find a matching "</Booger" later in the
-       * content.
-       * @param {RegExpMatchArray} match
-       * @param {{after:number}} param1
-       */
-      const hasClosingTag = (match, { after }) => {
-        const tag = "</" + match[0].slice(1);
-        const pos = match.input.indexOf(tag, after);
-        return pos !== -1;
-      };
-
-      const IDENT_RE$1 = IDENT_RE;
-      const FRAGMENT = {
-        begin: '<>',
-        end: '</>'
-      };
-      // to avoid some special cases inside isTrulyOpeningTag
-      const XML_SELF_CLOSING = /<[A-Za-z0-9\\._:-]+\s*\/>/;
-      const XML_TAG = {
-        begin: /<[A-Za-z0-9\\._:-]+/,
-        end: /\/[A-Za-z0-9\\._:-]+>|\/>/,
-        /**
-         * @param {RegExpMatchArray} match
-         * @param {CallbackResponse} response
-         */
-        isTrulyOpeningTag: (match, response) => {
-          const afterMatchIndex = match[0].length + match.index;
-          const nextChar = match.input[afterMatchIndex];
-          if (
-            // HTML should not include another raw `<` inside a tag
-            // nested type?
-            // `<Array<Array<number>>`, etc.
-            nextChar === "<" ||
-            // the , gives away that this is not HTML
-            // `<T, A extends keyof T, V>`
-            nextChar === ",") {
-            response.ignoreMatch();
-            return;
-          }
-
-          // `<something>`
-          // Quite possibly a tag, lets look for a matching closing tag...
-          if (nextChar === ">") {
-            // if we cannot find a matching closing tag, then we
-            // will ignore it
-            if (!hasClosingTag(match, { after: afterMatchIndex })) {
-              response.ignoreMatch();
-            }
-          }
-
-          // `<blah />` (self-closing)
-          // handled by simpleSelfClosing rule
-
-          // `<From extends string>`
-          // technically this could be HTML, but it smells like a type
-          let m;
-          const afterMatch = match.input.substring(afterMatchIndex);
-          // NOTE: This is ugh, but added specifically for https://github.com/highlightjs/highlight.js/issues/3276
-          if ((m = afterMatch.match(/^\s+extends\s+/))) {
-            if (m.index === 0) {
-              response.ignoreMatch();
-              // eslint-disable-next-line no-useless-return
-              return;
-            }
-          }
+    /** Dual-case keywords
+     *
+     * ["then","FILE"] =>
+     *     ["then", "THEN", "FILE", "file"]
+     *
+     * @param {string[]} items */
+    const dualCase = (items) => {
+      /** @type string[] */
+      const result = [];
+      items.forEach(item => {
+        result.push(item);
+        if (item.toLowerCase() === item) {
+          result.push(item.toUpperCase());
+        } else {
+          result.push(item.toLowerCase());
         }
-      };
-      const KEYWORDS$1 = {
-        $pattern: IDENT_RE,
-        keyword: KEYWORDS,
-        literal: LITERALS,
-        built_in: BUILT_INS,
-        "variable.language": BUILT_IN_VARIABLES
-      };
-
-      // https://tc39.es/ecma262/#sec-literals-numeric-literals
-      const decimalDigits = '[0-9](_?[0-9])*';
-      const frac = `\\.(${decimalDigits})`;
-      // DecimalIntegerLiteral, including Annex B NonOctalDecimalIntegerLiteral
-      // https://tc39.es/ecma262/#sec-additional-syntax-numeric-literals
-      const decimalInteger = `0|[1-9](_?[0-9])*|0[0-7]*[89][0-9]*`;
-      const NUMBER = {
-        className: 'number',
-        variants: [
-          // DecimalLiteral
-          { begin: `(\\b(${decimalInteger})((${frac})|\\.)?|(${frac}))` +
-            `[eE][+-]?(${decimalDigits})\\b` },
-          { begin: `\\b(${decimalInteger})\\b((${frac})\\b|\\.)?|(${frac})\\b` },
-
-          // DecimalBigIntegerLiteral
-          { begin: `\\b(0|[1-9](_?[0-9])*)n\\b` },
-
-          // NonDecimalIntegerLiteral
-          { begin: "\\b0[xX][0-9a-fA-F](_?[0-9a-fA-F])*n?\\b" },
-          { begin: "\\b0[bB][0-1](_?[0-1])*n?\\b" },
-          { begin: "\\b0[oO][0-7](_?[0-7])*n?\\b" },
-
-          // LegacyOctalIntegerLiteral (does not include underscore separators)
-          // https://tc39.es/ecma262/#sec-additional-syntax-numeric-literals
-          { begin: "\\b0[0-7]+n?\\b" },
-        ],
-        relevance: 0
-      };
-
-      const SUBST = {
-        className: 'subst',
-        begin: '\\$\\{',
-        end: '\\}',
-        keywords: KEYWORDS$1,
-        contains: [] // defined later
-      };
-      const HTML_TEMPLATE = {
-        begin: 'html`',
-        end: '',
-        starts: {
-          end: '`',
-          returnEnd: false,
-          contains: [
-            hljs.BACKSLASH_ESCAPE,
-            SUBST
-          ],
-          subLanguage: 'xml'
-        }
-      };
-      const CSS_TEMPLATE = {
-        begin: 'css`',
-        end: '',
-        starts: {
-          end: '`',
-          returnEnd: false,
-          contains: [
-            hljs.BACKSLASH_ESCAPE,
-            SUBST
-          ],
-          subLanguage: 'css'
-        }
-      };
-      const TEMPLATE_STRING = {
-        className: 'string',
-        begin: '`',
-        end: '`',
-        contains: [
-          hljs.BACKSLASH_ESCAPE,
-          SUBST
-        ]
-      };
-      const JSDOC_COMMENT = hljs.COMMENT(
-        /\/\*\*(?!\/)/,
-        '\\*/',
-        {
-          relevance: 0,
-          contains: [
-            {
-              begin: '(?=@[A-Za-z]+)',
-              relevance: 0,
-              contains: [
-                {
-                  className: 'doctag',
-                  begin: '@[A-Za-z]+'
-                },
-                {
-                  className: 'type',
-                  begin: '\\{',
-                  end: '\\}',
-                  excludeEnd: true,
-                  excludeBegin: true,
-                  relevance: 0
-                },
-                {
-                  className: 'variable',
-                  begin: IDENT_RE$1 + '(?=\\s*(-)|$)',
-                  endsParent: true,
-                  relevance: 0
-                },
-                // eat spaces (not newlines) so we can find
-                // types or variables
-                {
-                  begin: /(?=[^\n])\s/,
-                  relevance: 0
-                }
-              ]
-            }
-          ]
-        }
-      );
-      const COMMENT = {
-        className: "comment",
-        variants: [
-          JSDOC_COMMENT,
-          hljs.C_BLOCK_COMMENT_MODE,
-          hljs.C_LINE_COMMENT_MODE
-        ]
-      };
-      const SUBST_INTERNALS = [
-        hljs.APOS_STRING_MODE,
-        hljs.QUOTE_STRING_MODE,
-        HTML_TEMPLATE,
-        CSS_TEMPLATE,
-        TEMPLATE_STRING,
-        NUMBER,
-        // This is intentional:
-        // See https://github.com/highlightjs/highlight.js/issues/3288
-        // hljs.REGEXP_MODE
-      ];
-      SUBST.contains = SUBST_INTERNALS
-        .concat({
-          // we need to pair up {} inside our subst to prevent
-          // it from ending too early by matching another }
-          begin: /\{/,
-          end: /\}/,
-          keywords: KEYWORDS$1,
-          contains: [
-            "self"
-          ].concat(SUBST_INTERNALS)
-        });
-      const SUBST_AND_COMMENTS = [].concat(COMMENT, SUBST.contains);
-      const PARAMS_CONTAINS = SUBST_AND_COMMENTS.concat([
-        // eat recursive parens in sub expressions
-        {
-          begin: /\(/,
-          end: /\)/,
-          keywords: KEYWORDS$1,
-          contains: ["self"].concat(SUBST_AND_COMMENTS)
-        }
-      ]);
-      const PARAMS = {
-        className: 'params',
-        begin: /\(/,
-        end: /\)/,
-        excludeBegin: true,
-        excludeEnd: true,
-        keywords: KEYWORDS$1,
-        contains: PARAMS_CONTAINS
-      };
-
-      // ES6 classes
-      const CLASS_OR_EXTENDS = {
-        variants: [
-          // class Car extends vehicle
-          {
-            match: [
-              /class/,
-              /\s+/,
-              IDENT_RE$1,
-              /\s+/,
-              /extends/,
-              /\s+/,
-              regex.concat(IDENT_RE$1, "(", regex.concat(/\./, IDENT_RE$1), ")*")
-            ],
-            scope: {
-              1: "keyword",
-              3: "title.class",
-              5: "keyword",
-              7: "title.class.inherited"
-            }
-          },
-          // class Car
-          {
-            match: [
-              /class/,
-              /\s+/,
-              IDENT_RE$1
-            ],
-            scope: {
-              1: "keyword",
-              3: "title.class"
-            }
-          },
-
-        ]
-      };
-
-      const CLASS_REFERENCE = {
-        relevance: 0,
-        match:
-        regex.either(
-          // Hard coded exceptions
-          /\bJSON/,
-          // Float32Array, OutT
-          /\b[A-Z][a-z]+([A-Z][a-z]*|\d)*/,
-          // CSSFactory, CSSFactoryT
-          /\b[A-Z]{2,}([A-Z][a-z]+|\d)+([A-Z][a-z]*)*/,
-          // FPs, FPsT
-          /\b[A-Z]{2,}[a-z]+([A-Z][a-z]+|\d)*([A-Z][a-z]*)*/,
-          // P
-          // single letters are not highlighted
-          // BLAH
-          // this will be flagged as a UPPER_CASE_CONSTANT instead
-        ),
-        className: "title.class",
-        keywords: {
-          _: [
-            // se we still get relevance credit for JS library classes
-            ...TYPES,
-            ...ERROR_TYPES
-          ]
-        }
-      };
-
-      const USE_STRICT = {
-        label: "use_strict",
-        className: 'meta',
-        relevance: 10,
-        begin: /^\s*['"]use (strict|asm)['"]/
-      };
-
-      const FUNCTION_DEFINITION = {
-        variants: [
-          {
-            match: [
-              /function/,
-              /\s+/,
-              IDENT_RE$1,
-              /(?=\s*\()/
-            ]
-          },
-          // anonymous function
-          {
-            match: [
-              /function/,
-              /\s*(?=\()/
-            ]
-          }
-        ],
-        className: {
-          1: "keyword",
-          3: "title.function"
-        },
-        label: "func.def",
-        contains: [ PARAMS ],
-        illegal: /%/
-      };
-
-      const UPPER_CASE_CONSTANT = {
-        relevance: 0,
-        match: /\b[A-Z][A-Z_0-9]+\b/,
-        className: "variable.constant"
-      };
-
-      function noneOf(list) {
-        return regex.concat("(?!", list.join("|"), ")");
-      }
-
-      const FUNCTION_CALL = {
-        match: regex.concat(
-          /\b/,
-          noneOf([
-            ...BUILT_IN_GLOBALS,
-            "super"
-          ]),
-          IDENT_RE$1, regex.lookahead(/\(/)),
-        className: "title.function",
-        relevance: 0
-      };
-
-      const PROPERTY_ACCESS = {
-        begin: regex.concat(/\./, regex.lookahead(
-          regex.concat(IDENT_RE$1, /(?![0-9A-Za-z$_(])/)
-        )),
-        end: IDENT_RE$1,
-        excludeBegin: true,
-        keywords: "prototype",
-        className: "property",
-        relevance: 0
-      };
-
-      const GETTER_OR_SETTER = {
-        match: [
-          /get|set/,
-          /\s+/,
-          IDENT_RE$1,
-          /(?=\()/
-        ],
-        className: {
-          1: "keyword",
-          3: "title.function"
-        },
-        contains: [
-          { // eat to avoid empty params
-            begin: /\(\)/
-          },
-          PARAMS
-        ]
-      };
-
-      const FUNC_LEAD_IN_RE = '(\\(' +
-        '[^()]*(\\(' +
-        '[^()]*(\\(' +
-        '[^()]*' +
-        '\\)[^()]*)*' +
-        '\\)[^()]*)*' +
-        '\\)|' + hljs.UNDERSCORE_IDENT_RE + ')\\s*=>';
-
-      const FUNCTION_VARIABLE = {
-        match: [
-          /const|var|let/, /\s+/,
-          IDENT_RE$1, /\s*/,
-          /=\s*/,
-          /(async\s*)?/, // async is optional
-          regex.lookahead(FUNC_LEAD_IN_RE)
-        ],
-        keywords: "async",
-        className: {
-          1: "keyword",
-          3: "title.function"
-        },
-        contains: [
-          PARAMS
-        ]
-      };
-
-      return {
-        name: 'Javascript',
-        aliases: ['js', 'jsx', 'mjs', 'cjs'],
-        keywords: KEYWORDS$1,
-        // this will be extended by TypeScript
-        exports: { PARAMS_CONTAINS, CLASS_REFERENCE },
-        illegal: /#(?![$_A-z])/,
-        contains: [
-          hljs.SHEBANG({
-            label: "shebang",
-            binary: "node",
-            relevance: 5
-          }),
-          USE_STRICT,
-          hljs.APOS_STRING_MODE,
-          hljs.QUOTE_STRING_MODE,
-          HTML_TEMPLATE,
-          CSS_TEMPLATE,
-          TEMPLATE_STRING,
-          COMMENT,
-          NUMBER,
-          CLASS_REFERENCE,
-          {
-            className: 'attr',
-            begin: IDENT_RE$1 + regex.lookahead(':'),
-            relevance: 0
-          },
-          FUNCTION_VARIABLE,
-          { // "value" container
-            begin: '(' + hljs.RE_STARTERS_RE + '|\\b(case|return|throw)\\b)\\s*',
-            keywords: 'return throw case',
-            relevance: 0,
-            contains: [
-              COMMENT,
-              hljs.REGEXP_MODE,
-              {
-                className: 'function',
-                // we have to count the parens to make sure we actually have the
-                // correct bounding ( ) before the =>.  There could be any number of
-                // sub-expressions inside also surrounded by parens.
-                begin: FUNC_LEAD_IN_RE,
-                returnBegin: true,
-                end: '\\s*=>',
-                contains: [
-                  {
-                    className: 'params',
-                    variants: [
-                      {
-                        begin: hljs.UNDERSCORE_IDENT_RE,
-                        relevance: 0
-                      },
-                      {
-                        className: null,
-                        begin: /\(\s*\)/,
-                        skip: true
-                      },
-                      {
-                        begin: /\(/,
-                        end: /\)/,
-                        excludeBegin: true,
-                        excludeEnd: true,
-                        keywords: KEYWORDS$1,
-                        contains: PARAMS_CONTAINS
-                      }
-                    ]
-                  }
-                ]
-              },
-              { // could be a comma delimited list of params to a function call
-                begin: /,/,
-                relevance: 0
-              },
-              {
-                match: /\s+/,
-                relevance: 0
-              },
-              { // JSX
-                variants: [
-                  { begin: FRAGMENT.begin, end: FRAGMENT.end },
-                  { match: XML_SELF_CLOSING },
-                  {
-                    begin: XML_TAG.begin,
-                    // we carefully check the opening tag to see if it truly
-                    // is a tag and not a false positive
-                    'on:begin': XML_TAG.isTrulyOpeningTag,
-                    end: XML_TAG.end
-                  }
-                ],
-                subLanguage: 'xml',
-                contains: [
-                  {
-                    begin: XML_TAG.begin,
-                    end: XML_TAG.end,
-                    skip: true,
-                    contains: ['self']
-                  }
-                ]
-              }
-            ],
-          },
-          FUNCTION_DEFINITION,
-          {
-            // prevent this from getting swallowed up by function
-            // since they appear "function like"
-            beginKeywords: "while if switch catch for"
-          },
-          {
-            // we have to count the parens to make sure we actually have the correct
-            // bounding ( ).  There could be any number of sub-expressions inside
-            // also surrounded by parens.
-            begin: '\\b(?!function)' + hljs.UNDERSCORE_IDENT_RE +
-              '\\(' + // first parens
-              '[^()]*(\\(' +
-                '[^()]*(\\(' +
-                  '[^()]*' +
-                '\\)[^()]*)*' +
-              '\\)[^()]*)*' +
-              '\\)\\s*\\{', // end parens
-            returnBegin:true,
-            label: "func.def",
-            contains: [
-              PARAMS,
-              hljs.inherit(hljs.TITLE_MODE, { begin: IDENT_RE$1, className: "title.function" })
-            ]
-          },
-          // catch ... so it won't trigger the property rule below
-          {
-            match: /\.\.\./,
-            relevance: 0
-          },
-          PROPERTY_ACCESS,
-          // hack: prevents detection of keywords in some circumstances
-          // .keyword()
-          // $keyword = x
-          {
-            match: '\\$' + IDENT_RE$1,
-            relevance: 0
-          },
-          {
-            match: [ /\bconstructor(?=\s*\()/ ],
-            className: { 1: "title.function" },
-            contains: [ PARAMS ]
-          },
-          FUNCTION_CALL,
-          UPPER_CASE_CONSTANT,
-          CLASS_OR_EXTENDS,
-          GETTER_OR_SETTER,
-          {
-            match: /\$[(.]/ // relevance booster for a pattern common to JS libs: `$(something)` and `$.something`
-          }
-        ]
-      };
-    }
-
-    /*
-    Language: JSON
-    Description: JSON (JavaScript Object Notation) is a lightweight data-interchange format.
-    Author: Ivan Sagalaev <maniac@softwaremaniacs.org>
-    Website: http://www.json.org
-    Category: common, protocols, web
-    */
-
-    function json(hljs) {
-      const ATTRIBUTE = {
-        className: 'attr',
-        begin: /"(\\.|[^\\"\r\n])*"(?=\s*:)/,
-        relevance: 1.01
-      };
-      const PUNCTUATION = {
-        match: /[{}[\],:]/,
-        className: "punctuation",
-        relevance: 0
-      };
-      const LITERALS = [
-        "true",
-        "false",
-        "null"
-      ];
-      // NOTE: normally we would rely on `keywords` for this but using a mode here allows us
-      // - to use the very tight `illegal: \S` rule later to flag any other character
-      // - as illegal indicating that despite looking like JSON we do not truly have
-      // - JSON and thus improve false-positively greatly since JSON will try and claim
-      // - all sorts of JSON looking stuff
-      const LITERALS_MODE = {
-        scope: "literal",
-        beginKeywords: LITERALS.join(" "),
-      };
-
-      return {
-        name: 'JSON',
-        keywords:{
-          literal: LITERALS,
-        },
-        contains: [
-          ATTRIBUTE,
-          PUNCTUATION,
-          hljs.QUOTE_STRING_MODE,
-          LITERALS_MODE,
-          hljs.C_NUMBER_MODE,
-          hljs.C_LINE_COMMENT_MODE,
-          hljs.C_BLOCK_COMMENT_MODE
-        ],
-        illegal: '\\S'
-      };
-    }
-
-    /*
-     Language: Kotlin
-     Description: Kotlin is an OSS statically typed programming language that targets the JVM, Android, JavaScript and Native.
-     Author: Sergey Mashkov <cy6erGn0m@gmail.com>
-     Website: https://kotlinlang.org
-     Category: common
-     */
-
-    function kotlin(hljs) {
-      const KEYWORDS = {
-        keyword:
-          'abstract as val var vararg get set class object open private protected public noinline '
-          + 'crossinline dynamic final enum if else do while for when throw try catch finally '
-          + 'import package is in fun override companion reified inline lateinit init '
-          + 'interface annotation data sealed internal infix operator out by constructor super '
-          + 'tailrec where const inner suspend typealias external expect actual',
-        built_in:
-          'Byte Short Char Int Long Boolean Float Double Void Unit Nothing',
-        literal:
-          'true false null'
-      };
-      const KEYWORDS_WITH_LABEL = {
-        className: 'keyword',
-        begin: /\b(break|continue|return|this)\b/,
-        starts: { contains: [
-          {
-            className: 'symbol',
-            begin: /@\w+/
-          }
-        ] }
-      };
-      const LABEL = {
-        className: 'symbol',
-        begin: hljs.UNDERSCORE_IDENT_RE + '@'
-      };
-
-      // for string templates
-      const SUBST = {
-        className: 'subst',
-        begin: /\$\{/,
-        end: /\}/,
-        contains: [ hljs.C_NUMBER_MODE ]
-      };
-      const VARIABLE = {
-        className: 'variable',
-        begin: '\\$' + hljs.UNDERSCORE_IDENT_RE
-      };
-      const STRING = {
-        className: 'string',
-        variants: [
-          {
-            begin: '"""',
-            end: '"""(?=[^"])',
-            contains: [
-              VARIABLE,
-              SUBST
-            ]
-          },
-          // Can't use built-in modes easily, as we want to use STRING in the meta
-          // context as 'meta-string' and there's no syntax to remove explicitly set
-          // classNames in built-in modes.
-          {
-            begin: '\'',
-            end: '\'',
-            illegal: /\n/,
-            contains: [ hljs.BACKSLASH_ESCAPE ]
-          },
-          {
-            begin: '"',
-            end: '"',
-            illegal: /\n/,
-            contains: [
-              hljs.BACKSLASH_ESCAPE,
-              VARIABLE,
-              SUBST
-            ]
-          }
-        ]
-      };
-      SUBST.contains.push(STRING);
-
-      const ANNOTATION_USE_SITE = {
-        className: 'meta',
-        begin: '@(?:file|property|field|get|set|receiver|param|setparam|delegate)\\s*:(?:\\s*' + hljs.UNDERSCORE_IDENT_RE + ')?'
-      };
-      const ANNOTATION = {
-        className: 'meta',
-        begin: '@' + hljs.UNDERSCORE_IDENT_RE,
-        contains: [
-          {
-            begin: /\(/,
-            end: /\)/,
-            contains: [
-              hljs.inherit(STRING, { className: 'string' }),
-              "self"
-            ]
-          }
-        ]
-      };
-
-      // https://kotlinlang.org/docs/reference/whatsnew11.html#underscores-in-numeric-literals
-      // According to the doc above, the number mode of kotlin is the same as java 8,
-      // so the code below is copied from java.js
-      const KOTLIN_NUMBER_MODE = NUMERIC;
-      const KOTLIN_NESTED_COMMENT = hljs.COMMENT(
-        '/\\*', '\\*/',
-        { contains: [ hljs.C_BLOCK_COMMENT_MODE ] }
-      );
-      const KOTLIN_PAREN_TYPE = { variants: [
-        {
-          className: 'type',
-          begin: hljs.UNDERSCORE_IDENT_RE
-        },
-        {
-          begin: /\(/,
-          end: /\)/,
-          contains: [] // defined later
-        }
-      ] };
-      const KOTLIN_PAREN_TYPE2 = KOTLIN_PAREN_TYPE;
-      KOTLIN_PAREN_TYPE2.variants[1].contains = [ KOTLIN_PAREN_TYPE ];
-      KOTLIN_PAREN_TYPE.variants[1].contains = [ KOTLIN_PAREN_TYPE2 ];
-
-      return {
-        name: 'Kotlin',
-        aliases: [
-          'kt',
-          'kts'
-        ],
-        keywords: KEYWORDS,
-        contains: [
-          hljs.COMMENT(
-            '/\\*\\*',
-            '\\*/',
-            {
-              relevance: 0,
-              contains: [
-                {
-                  className: 'doctag',
-                  begin: '@[A-Za-z]+'
-                }
-              ]
-            }
-          ),
-          hljs.C_LINE_COMMENT_MODE,
-          KOTLIN_NESTED_COMMENT,
-          KEYWORDS_WITH_LABEL,
-          LABEL,
-          ANNOTATION_USE_SITE,
-          ANNOTATION,
-          {
-            className: 'function',
-            beginKeywords: 'fun',
-            end: '[(]|$',
-            returnBegin: true,
-            excludeEnd: true,
-            keywords: KEYWORDS,
-            relevance: 5,
-            contains: [
-              {
-                begin: hljs.UNDERSCORE_IDENT_RE + '\\s*\\(',
-                returnBegin: true,
-                relevance: 0,
-                contains: [ hljs.UNDERSCORE_TITLE_MODE ]
-              },
-              {
-                className: 'type',
-                begin: /</,
-                end: />/,
-                keywords: 'reified',
-                relevance: 0
-              },
-              {
-                className: 'params',
-                begin: /\(/,
-                end: /\)/,
-                endsParent: true,
-                keywords: KEYWORDS,
-                relevance: 0,
-                contains: [
-                  {
-                    begin: /:/,
-                    end: /[=,\/]/,
-                    endsWithParent: true,
-                    contains: [
-                      KOTLIN_PAREN_TYPE,
-                      hljs.C_LINE_COMMENT_MODE,
-                      KOTLIN_NESTED_COMMENT
-                    ],
-                    relevance: 0
-                  },
-                  hljs.C_LINE_COMMENT_MODE,
-                  KOTLIN_NESTED_COMMENT,
-                  ANNOTATION_USE_SITE,
-                  ANNOTATION,
-                  STRING,
-                  hljs.C_NUMBER_MODE
-                ]
-              },
-              KOTLIN_NESTED_COMMENT
-            ]
-          },
-          {
-            begin: [
-              /class|interface|trait/,
-              /\s+/,
-              hljs.UNDERSCORE_IDENT_RE
-            ],
-            beginScope: {
-              3: "title.class"
-            },
-            keywords: 'class interface trait',
-            end: /[:\{(]|$/,
-            excludeEnd: true,
-            illegal: 'extends implements',
-            contains: [
-              { beginKeywords: 'public protected internal private constructor' },
-              hljs.UNDERSCORE_TITLE_MODE,
-              {
-                className: 'type',
-                begin: /</,
-                end: />/,
-                excludeBegin: true,
-                excludeEnd: true,
-                relevance: 0
-              },
-              {
-                className: 'type',
-                begin: /[,:]\s*/,
-                end: /[<\(,){\s]|$/,
-                excludeBegin: true,
-                returnEnd: true
-              },
-              ANNOTATION_USE_SITE,
-              ANNOTATION
-            ]
-          },
-          STRING,
-          {
-            className: 'meta',
-            begin: "^#!/usr/bin/env",
-            end: '$',
-            illegal: '\n'
-          },
-          KOTLIN_NUMBER_MODE
-        ]
-      };
-    }
-
-    /*
-    Language: Less
-    Description: It's CSS, with just a little more.
-    Author:   Max Mikhailov <seven.phases.max@gmail.com>
-    Website: http://lesscss.org
-    Category: common, css, web
-    */
-
-    /** @type LanguageFn */
-    function less(hljs) {
-      const modes = MODES(hljs);
-      const PSEUDO_SELECTORS$1 = PSEUDO_SELECTORS;
-
-      const AT_MODIFIERS = "and or not only";
-      const IDENT_RE = '[\\w-]+'; // yes, Less identifiers may begin with a digit
-      const INTERP_IDENT_RE = '(' + IDENT_RE + '|@\\{' + IDENT_RE + '\\})';
-
-      /* Generic Modes */
-
-      const RULES = []; const VALUE_MODES = []; // forward def. for recursive modes
-
-      const STRING_MODE = function(c) {
-        return {
-        // Less strings are not multiline (also include '~' for more consistent coloring of "escaped" strings)
-          className: 'string',
-          begin: '~?' + c + '.*?' + c
-        };
-      };
-
-      const IDENT_MODE = function(name, begin, relevance) {
-        return {
-          className: name,
-          begin: begin,
-          relevance: relevance
-        };
-      };
-
-      const AT_KEYWORDS = {
-        $pattern: /[a-z-]+/,
-        keyword: AT_MODIFIERS,
-        attribute: MEDIA_FEATURES.join(" ")
-      };
-
-      const PARENS_MODE = {
-        // used only to properly balance nested parens inside mixin call, def. arg list
-        begin: '\\(',
-        end: '\\)',
-        contains: VALUE_MODES,
-        keywords: AT_KEYWORDS,
-        relevance: 0
-      };
-
-      // generic Less highlighter (used almost everywhere except selectors):
-      VALUE_MODES.push(
-        hljs.C_LINE_COMMENT_MODE,
-        hljs.C_BLOCK_COMMENT_MODE,
-        STRING_MODE("'"),
-        STRING_MODE('"'),
-        modes.CSS_NUMBER_MODE, // fixme: it does not include dot for numbers like .5em :(
-        {
-          begin: '(url|data-uri)\\(',
-          starts: {
-            className: 'string',
-            end: '[\\)\\n]',
-            excludeEnd: true
-          }
-        },
-        modes.HEXCOLOR,
-        PARENS_MODE,
-        IDENT_MODE('variable', '@@?' + IDENT_RE, 10),
-        IDENT_MODE('variable', '@\\{' + IDENT_RE + '\\}'),
-        IDENT_MODE('built_in', '~?`[^`]*?`'), // inline javascript (or whatever host language) *multiline* string
-        { // @media features (it’s here to not duplicate things in AT_RULE_MODE with extra PARENS_MODE overriding):
-          className: 'attribute',
-          begin: IDENT_RE + '\\s*:',
-          end: ':',
-          returnBegin: true,
-          excludeEnd: true
-        },
-        modes.IMPORTANT,
-        { beginKeywords: 'and not' },
-        modes.FUNCTION_DISPATCH
-      );
-
-      const VALUE_WITH_RULESETS = VALUE_MODES.concat({
-        begin: /\{/,
-        end: /\}/,
-        contains: RULES
       });
+      return result;
+    };
 
-      const MIXIN_GUARD_MODE = {
-        beginKeywords: 'when',
-        endsWithParent: true,
-        contains: [ { beginKeywords: 'and not' } ].concat(VALUE_MODES) // using this form to override VALUE’s 'function' match
-      };
-
-      /* Rule-Level Modes */
-
-      const RULE_MODE = {
-        begin: INTERP_IDENT_RE + '\\s*:',
-        returnBegin: true,
-        end: /[;}]/,
-        relevance: 0,
-        contains: [
-          { begin: /-(webkit|moz|ms|o)-/ },
-          modes.CSS_VARIABLE,
-          {
-            className: 'attribute',
-            begin: '\\b(' + ATTRIBUTES.join('|') + ')\\b',
-            end: /(?=:)/,
-            starts: {
-              endsWithParent: true,
-              illegal: '[<=$]',
-              relevance: 0,
-              contains: VALUE_MODES
-            }
-          }
-        ]
-      };
-
-      const AT_RULE_MODE = {
-        className: 'keyword',
-        begin: '@(import|media|charset|font-face|(-[a-z]+-)?keyframes|supports|document|namespace|page|viewport|host)\\b',
-        starts: {
-          end: '[;{}]',
-          keywords: AT_KEYWORDS,
-          returnEnd: true,
-          contains: VALUE_MODES,
-          relevance: 0
-        }
-      };
-
-      // variable definitions and calls
-      const VAR_RULE_MODE = {
-        className: 'variable',
-        variants: [
-          // using more strict pattern for higher relevance to increase chances of Less detection.
-          // this is *the only* Less specific statement used in most of the sources, so...
-          // (we’ll still often loose to the css-parser unless there's '//' comment,
-          // simply because 1 variable just can't beat 99 properties :)
-          {
-            begin: '@' + IDENT_RE + '\\s*:',
-            relevance: 15
-          },
-          { begin: '@' + IDENT_RE }
-        ],
-        starts: {
-          end: '[;}]',
-          returnEnd: true,
-          contains: VALUE_WITH_RULESETS
-        }
-      };
-
-      const SELECTOR_MODE = {
-        // first parse unambiguous selectors (i.e. those not starting with tag)
-        // then fall into the scary lookahead-discriminator variant.
-        // this mode also handles mixin definitions and calls
-        variants: [
-          {
-            begin: '[\\.#:&\\[>]',
-            end: '[;{}]' // mixin calls end with ';'
-          },
-          {
-            begin: INTERP_IDENT_RE,
-            end: /\{/
-          }
-        ],
-        returnBegin: true,
-        returnEnd: true,
-        illegal: '[<=\'$"]',
-        relevance: 0,
-        contains: [
-          hljs.C_LINE_COMMENT_MODE,
-          hljs.C_BLOCK_COMMENT_MODE,
-          MIXIN_GUARD_MODE,
-          IDENT_MODE('keyword', 'all\\b'),
-          IDENT_MODE('variable', '@\\{' + IDENT_RE + '\\}'), // otherwise it’s identified as tag
-          
-          {
-            begin: '\\b(' + TAGS.join('|') + ')\\b',
-            className: 'selector-tag'
-          },
-          modes.CSS_NUMBER_MODE,
-          IDENT_MODE('selector-tag', INTERP_IDENT_RE, 0),
-          IDENT_MODE('selector-id', '#' + INTERP_IDENT_RE),
-          IDENT_MODE('selector-class', '\\.' + INTERP_IDENT_RE, 0),
-          IDENT_MODE('selector-tag', '&', 0),
-          modes.ATTRIBUTE_SELECTOR_MODE,
-          {
-            className: 'selector-pseudo',
-            begin: ':(' + PSEUDO_CLASSES.join('|') + ')'
-          },
-          {
-            className: 'selector-pseudo',
-            begin: ':(:)?(' + PSEUDO_ELEMENTS.join('|') + ')'
-          },
-          {
-            begin: /\(/,
-            end: /\)/,
-            relevance: 0,
-            contains: VALUE_WITH_RULESETS
-          }, // argument list of parametric mixins
-          { begin: '!important' }, // eat !important after mixin call or it will be colored as tag
-          modes.FUNCTION_DISPATCH
-        ]
-      };
-
-      const PSEUDO_SELECTOR_MODE = {
-        begin: IDENT_RE + ':(:)?' + `(${PSEUDO_SELECTORS$1.join('|')})`,
-        returnBegin: true,
-        contains: [ SELECTOR_MODE ]
-      };
-
-      RULES.push(
-        hljs.C_LINE_COMMENT_MODE,
-        hljs.C_BLOCK_COMMENT_MODE,
-        AT_RULE_MODE,
-        VAR_RULE_MODE,
-        PSEUDO_SELECTOR_MODE,
-        RULE_MODE,
-        SELECTOR_MODE,
-        MIXIN_GUARD_MODE,
-        modes.FUNCTION_DISPATCH
-      );
-
-      return {
-        name: 'Less',
-        case_insensitive: true,
-        illegal: '[=>\'/<($"]',
-        contains: RULES
-      };
-    }
-
-    /*
-    Language: Lua
-    Description: Lua is a powerful, efficient, lightweight, embeddable scripting language.
-    Author: Andrew Fedorov <dmmdrs@mail.ru>
-    Category: common, scripting
-    Website: https://www.lua.org
-    */
-
-    function lua(hljs) {
-      const OPENING_LONG_BRACKET = '\\[=*\\[';
-      const CLOSING_LONG_BRACKET = '\\]=*\\]';
-      const LONG_BRACKETS = {
-        begin: OPENING_LONG_BRACKET,
-        end: CLOSING_LONG_BRACKET,
-        contains: [ 'self' ]
-      };
-      const COMMENTS = [
-        hljs.COMMENT('--(?!' + OPENING_LONG_BRACKET + ')', '$'),
-        hljs.COMMENT(
-          '--' + OPENING_LONG_BRACKET,
-          CLOSING_LONG_BRACKET,
-          {
-            contains: [ LONG_BRACKETS ],
-            relevance: 10
-          }
-        )
-      ];
-      return {
-        name: 'Lua',
-        keywords: {
-          $pattern: hljs.UNDERSCORE_IDENT_RE,
-          literal: "true false nil",
-          keyword: "and break do else elseif end for goto if in local not or repeat return then until while",
-          built_in:
-            // Metatags and globals:
-            '_G _ENV _VERSION __index __newindex __mode __call __metatable __tostring __len '
-            + '__gc __add __sub __mul __div __mod __pow __concat __unm __eq __lt __le assert '
-            // Standard methods and properties:
-            + 'collectgarbage dofile error getfenv getmetatable ipairs load loadfile loadstring '
-            + 'module next pairs pcall print rawequal rawget rawset require select setfenv '
-            + 'setmetatable tonumber tostring type unpack xpcall arg self '
-            // Library methods and properties (one line per library):
-            + 'coroutine resume yield status wrap create running debug getupvalue '
-            + 'debug sethook getmetatable gethook setmetatable setlocal traceback setfenv getinfo setupvalue getlocal getregistry getfenv '
-            + 'io lines write close flush open output type read stderr stdin input stdout popen tmpfile '
-            + 'math log max acos huge ldexp pi cos tanh pow deg tan cosh sinh random randomseed frexp ceil floor rad abs sqrt modf asin min mod fmod log10 atan2 exp sin atan '
-            + 'os exit setlocale date getenv difftime remove time clock tmpname rename execute package preload loadlib loaded loaders cpath config path seeall '
-            + 'string sub upper len gfind rep find match char dump gmatch reverse byte format gsub lower '
-            + 'table setn insert getn foreachi maxn foreach concat sort remove'
-        },
-        contains: COMMENTS.concat([
-          {
-            className: 'function',
-            beginKeywords: 'function',
-            end: '\\)',
-            contains: [
-              hljs.inherit(hljs.TITLE_MODE, { begin: '([_a-zA-Z]\\w*\\.)*([_a-zA-Z]\\w*:)?[_a-zA-Z]\\w*' }),
-              {
-                className: 'params',
-                begin: '\\(',
-                endsWithParent: true,
-                contains: COMMENTS
-              }
-            ].concat(COMMENTS)
-          },
-          hljs.C_NUMBER_MODE,
-          hljs.APOS_STRING_MODE,
-          hljs.QUOTE_STRING_MODE,
-          {
-            className: 'string',
-            begin: OPENING_LONG_BRACKET,
-            end: CLOSING_LONG_BRACKET,
-            contains: [ LONG_BRACKETS ],
-            relevance: 5
-          }
-        ])
-      };
-    }
-
-    /*
-    Language: Makefile
-    Author: Ivan Sagalaev <maniac@softwaremaniacs.org>
-    Contributors: Joël Porquet <joel@porquet.org>
-    Website: https://www.gnu.org/software/make/manual/html_node/Introduction.html
-    Category: common
-    */
-
-    function makefile(hljs) {
-      /* Variables: simple (eg $(var)) and special (eg $@) */
-      const VARIABLE = {
-        className: 'variable',
-        variants: [
-          {
-            begin: '\\$\\(' + hljs.UNDERSCORE_IDENT_RE + '\\)',
-            contains: [ hljs.BACKSLASH_ESCAPE ]
-          },
-          { begin: /\$[@%<?\^\+\*]/ }
-        ]
-      };
-      /* Quoted string with variables inside */
-      const QUOTE_STRING = {
-        className: 'string',
-        begin: /"/,
-        end: /"/,
-        contains: [
-          hljs.BACKSLASH_ESCAPE,
-          VARIABLE
-        ]
-      };
-      /* Function: $(func arg,...) */
-      const FUNC = {
-        className: 'variable',
-        begin: /\$\([\w-]+\s/,
-        end: /\)/,
-        keywords: { built_in:
-            'subst patsubst strip findstring filter filter-out sort '
-            + 'word wordlist firstword lastword dir notdir suffix basename '
-            + 'addsuffix addprefix join wildcard realpath abspath error warning '
-            + 'shell origin flavor foreach if or and call eval file value' },
-        contains: [ VARIABLE ]
-      };
-      /* Variable assignment */
-      const ASSIGNMENT = { begin: '^' + hljs.UNDERSCORE_IDENT_RE + '\\s*(?=[:+?]?=)' };
-      /* Meta targets (.PHONY) */
-      const META = {
-        className: 'meta',
-        begin: /^\.PHONY:/,
-        end: /$/,
-        keywords: {
-          $pattern: /[\.\w]+/,
-          keyword: '.PHONY'
-        }
-      };
-      /* Targets */
-      const TARGET = {
-        className: 'section',
-        begin: /^[^\s]+:/,
-        end: /$/,
-        contains: [ VARIABLE ]
-      };
-      return {
-        name: 'Makefile',
-        aliases: [
-          'mk',
-          'mak',
-          'make',
-        ],
-        keywords: {
-          $pattern: /[\w-]+/,
-          keyword: 'define endef undefine ifdef ifndef ifeq ifneq else endif '
-          + 'include -include sinclude override export unexport private vpath'
-        },
-        contains: [
-          hljs.HASH_COMMENT_MODE,
-          VARIABLE,
-          QUOTE_STRING,
-          FUNC,
-          ASSIGNMENT,
-          META,
-          TARGET
-        ]
-      };
-    }
-
-    /*
-    Language: HTML, XML
-    Website: https://www.w3.org/XML/
-    Category: common, web
-    Audit: 2020
-    */
-
-    /** @type LanguageFn */
-    function xml(hljs) {
-      const regex = hljs.regex;
-      // XML names can have the following additional letters: https://www.w3.org/TR/xml/#NT-NameChar
-      // OTHER_NAME_CHARS = /[:\-.0-9\u00B7\u0300-\u036F\u203F-\u2040]/;
-      // Element names start with NAME_START_CHAR followed by optional other Unicode letters, ASCII digits, hyphens, underscores, and periods
-      // const TAG_NAME_RE = regex.concat(/[A-Z_a-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD]/, regex.optional(/[A-Z_a-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD\-.0-9\u00B7\u0300-\u036F\u203F-\u2040]*:/), /[A-Z_a-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD\-.0-9\u00B7\u0300-\u036F\u203F-\u2040]*/);;
-      // const XML_IDENT_RE = /[A-Z_a-z:\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD\-.0-9\u00B7\u0300-\u036F\u203F-\u2040]+/;
-      // const TAG_NAME_RE = regex.concat(/[A-Z_a-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD]/, regex.optional(/[A-Z_a-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD\-.0-9\u00B7\u0300-\u036F\u203F-\u2040]*:/), /[A-Z_a-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD\-.0-9\u00B7\u0300-\u036F\u203F-\u2040]*/);
-      // however, to cater for performance and more Unicode support rely simply on the Unicode letter class
-      const TAG_NAME_RE = regex.concat(/[\p{L}_]/u, regex.optional(/[\p{L}0-9_.-]*:/u), /[\p{L}0-9_.-]*/u);
-      const XML_IDENT_RE = /[\p{L}0-9._:-]+/u;
-      const XML_ENTITIES = {
-        className: 'symbol',
-        begin: /&[a-z]+;|&#[0-9]+;|&#x[a-f0-9]+;/
-      };
-      const XML_META_KEYWORDS = {
-        begin: /\s/,
-        contains: [
-          {
-            className: 'keyword',
-            begin: /#?[a-z_][a-z1-9_-]+/,
-            illegal: /\n/
-          }
-        ]
-      };
-      const XML_META_PAR_KEYWORDS = hljs.inherit(XML_META_KEYWORDS, {
-        begin: /\(/,
-        end: /\)/
-      });
-      const APOS_META_STRING_MODE = hljs.inherit(hljs.APOS_STRING_MODE, { className: 'string' });
-      const QUOTE_META_STRING_MODE = hljs.inherit(hljs.QUOTE_STRING_MODE, { className: 'string' });
-      const TAG_INTERNALS = {
-        endsWithParent: true,
-        illegal: /</,
-        relevance: 0,
-        contains: [
-          {
-            className: 'attr',
-            begin: XML_IDENT_RE,
-            relevance: 0
-          },
-          {
-            begin: /=\s*/,
-            relevance: 0,
-            contains: [
-              {
-                className: 'string',
-                endsParent: true,
-                variants: [
-                  {
-                    begin: /"/,
-                    end: /"/,
-                    contains: [ XML_ENTITIES ]
-                  },
-                  {
-                    begin: /'/,
-                    end: /'/,
-                    contains: [ XML_ENTITIES ]
-                  },
-                  { begin: /[^\s"'=<>`]+/ }
-                ]
-              }
-            ]
-          }
-        ]
-      };
-      return {
-        name: 'HTML, XML',
-        aliases: [
-          'html',
-          'xhtml',
-          'rss',
-          'atom',
-          'xjb',
-          'xsd',
-          'xsl',
-          'plist',
-          'wsf',
-          'svg'
-        ],
-        case_insensitive: true,
-        unicodeRegex: true,
-        contains: [
-          {
-            className: 'meta',
-            begin: /<![a-z]/,
-            end: />/,
-            relevance: 10,
-            contains: [
-              XML_META_KEYWORDS,
-              QUOTE_META_STRING_MODE,
-              APOS_META_STRING_MODE,
-              XML_META_PAR_KEYWORDS,
-              {
-                begin: /\[/,
-                end: /\]/,
-                contains: [
-                  {
-                    className: 'meta',
-                    begin: /<![a-z]/,
-                    end: />/,
-                    contains: [
-                      XML_META_KEYWORDS,
-                      XML_META_PAR_KEYWORDS,
-                      QUOTE_META_STRING_MODE,
-                      APOS_META_STRING_MODE
-                    ]
-                  }
-                ]
-              }
-            ]
-          },
-          hljs.COMMENT(
-            /<!--/,
-            /-->/,
-            { relevance: 10 }
-          ),
-          {
-            begin: /<!\[CDATA\[/,
-            end: /\]\]>/,
-            relevance: 10
-          },
-          XML_ENTITIES,
-          // xml processing instructions
-          {
-            className: 'meta',
-            end: /\?>/,
-            variants: [
-              {
-                begin: /<\?xml/,
-                relevance: 10,
-                contains: [
-                  QUOTE_META_STRING_MODE
-                ]
-              },
-              {
-                begin: /<\?[a-z][a-z0-9]+/,
-              }
-            ]
-
-          },
-          {
-            className: 'tag',
-            /*
-            The lookahead pattern (?=...) ensures that 'begin' only matches
-            '<style' as a single word, followed by a whitespace or an
-            ending bracket.
-            */
-            begin: /<style(?=\s|>)/,
-            end: />/,
-            keywords: { name: 'style' },
-            contains: [ TAG_INTERNALS ],
-            starts: {
-              end: /<\/style>/,
-              returnEnd: true,
-              subLanguage: [
-                'css',
-                'xml'
-              ]
-            }
-          },
-          {
-            className: 'tag',
-            // See the comment in the <style tag about the lookahead pattern
-            begin: /<script(?=\s|>)/,
-            end: />/,
-            keywords: { name: 'script' },
-            contains: [ TAG_INTERNALS ],
-            starts: {
-              end: /<\/script>/,
-              returnEnd: true,
-              subLanguage: [
-                'javascript',
-                'handlebars',
-                'xml'
-              ]
-            }
-          },
-          // we need this for now for jSX
-          {
-            className: 'tag',
-            begin: /<>|<\/>/
-          },
-          // open tag
-          {
-            className: 'tag',
-            begin: regex.concat(
-              /</,
-              regex.lookahead(regex.concat(
-                TAG_NAME_RE,
-                // <tag/>
-                // <tag>
-                // <tag ...
-                regex.either(/\/>/, />/, /\s/)
-              ))
-            ),
-            end: /\/?>/,
-            contains: [
-              {
-                className: 'name',
-                begin: TAG_NAME_RE,
-                relevance: 0,
-                starts: TAG_INTERNALS
-              }
-            ]
-          },
-          // close tag
-          {
-            className: 'tag',
-            begin: regex.concat(
-              /<\//,
-              regex.lookahead(regex.concat(
-                TAG_NAME_RE, />/
-              ))
-            ),
-            contains: [
-              {
-                className: 'name',
-                begin: TAG_NAME_RE,
-                relevance: 0
-              },
-              {
-                begin: />/,
-                relevance: 0,
-                endsParent: true
-              }
-            ]
-          }
-        ]
-      };
-    }
-
-    /*
-    Language: Markdown
-    Requires: xml.js
-    Author: John Crepezzi <john.crepezzi@gmail.com>
-    Website: https://daringfireball.net/projects/markdown/
-    Category: common, markup
-    */
-
-    function markdown(hljs) {
-      const regex = hljs.regex;
-      const INLINE_HTML = {
-        begin: /<\/?[A-Za-z_]/,
-        end: '>',
-        subLanguage: 'xml',
-        relevance: 0
-      };
-      const HORIZONTAL_RULE = {
-        begin: '^[-\\*]{3,}',
-        end: '$'
-      };
-      const CODE = {
-        className: 'code',
-        variants: [
-          // TODO: fix to allow these to work with sublanguage also
-          { begin: '(`{3,})[^`](.|\\n)*?\\1`*[ ]*' },
-          { begin: '(~{3,})[^~](.|\\n)*?\\1~*[ ]*' },
-          // needed to allow markdown as a sublanguage to work
-          {
-            begin: '```',
-            end: '```+[ ]*$'
-          },
-          {
-            begin: '~~~',
-            end: '~~~+[ ]*$'
-          },
-          { begin: '`.+?`' },
-          {
-            begin: '(?=^( {4}|\\t))',
-            // use contains to gobble up multiple lines to allow the block to be whatever size
-            // but only have a single open/close tag vs one per line
-            contains: [
-              {
-                begin: '^( {4}|\\t)',
-                end: '(\\n)$'
-              }
-            ],
-            relevance: 0
-          }
-        ]
-      };
-      const LIST = {
-        className: 'bullet',
-        begin: '^[ \t]*([*+-]|(\\d+\\.))(?=\\s+)',
-        end: '\\s+',
-        excludeEnd: true
-      };
-      const LINK_REFERENCE = {
-        begin: /^\[[^\n]+\]:/,
-        returnBegin: true,
-        contains: [
-          {
-            className: 'symbol',
-            begin: /\[/,
-            end: /\]/,
-            excludeBegin: true,
-            excludeEnd: true
-          },
-          {
-            className: 'link',
-            begin: /:\s*/,
-            end: /$/,
-            excludeBegin: true
-          }
-        ]
-      };
-      const URL_SCHEME = /[A-Za-z][A-Za-z0-9+.-]*/;
-      const LINK = {
-        variants: [
-          // too much like nested array access in so many languages
-          // to have any real relevance
-          {
-            begin: /\[.+?\]\[.*?\]/,
-            relevance: 0
-          },
-          // popular internet URLs
-          {
-            begin: /\[.+?\]\(((data|javascript|mailto):|(?:http|ftp)s?:\/\/).*?\)/,
-            relevance: 2
-          },
-          {
-            begin: regex.concat(/\[.+?\]\(/, URL_SCHEME, /:\/\/.*?\)/),
-            relevance: 2
-          },
-          // relative urls
-          {
-            begin: /\[.+?\]\([./?&#].*?\)/,
-            relevance: 1
-          },
-          // whatever else, lower relevance (might not be a link at all)
-          {
-            begin: /\[.*?\]\(.*?\)/,
-            relevance: 0
-          }
-        ],
-        returnBegin: true,
-        contains: [
-          {
-            // empty strings for alt or link text
-            match: /\[(?=\])/ },
-          {
-            className: 'string',
-            relevance: 0,
-            begin: '\\[',
-            end: '\\]',
-            excludeBegin: true,
-            returnEnd: true
-          },
-          {
-            className: 'link',
-            relevance: 0,
-            begin: '\\]\\(',
-            end: '\\)',
-            excludeBegin: true,
-            excludeEnd: true
-          },
-          {
-            className: 'symbol',
-            relevance: 0,
-            begin: '\\]\\[',
-            end: '\\]',
-            excludeBegin: true,
-            excludeEnd: true
-          }
-        ]
-      };
-      const BOLD = {
-        className: 'strong',
-        contains: [], // defined later
-        variants: [
-          {
-            begin: /_{2}/,
-            end: /_{2}/
-          },
-          {
-            begin: /\*{2}/,
-            end: /\*{2}/
-          }
-        ]
-      };
-      const ITALIC = {
-        className: 'emphasis',
-        contains: [], // defined later
-        variants: [
-          {
-            begin: /\*(?!\*)/,
-            end: /\*/
-          },
-          {
-            begin: /_(?!_)/,
-            end: /_/,
-            relevance: 0
-          }
-        ]
-      };
-
-      // 3 level deep nesting is not allowed because it would create confusion
-      // in cases like `***testing***` because where we don't know if the last
-      // `***` is starting a new bold/italic or finishing the last one
-      const BOLD_WITHOUT_ITALIC = hljs.inherit(BOLD, { contains: [] });
-      const ITALIC_WITHOUT_BOLD = hljs.inherit(ITALIC, { contains: [] });
-      BOLD.contains.push(ITALIC_WITHOUT_BOLD);
-      ITALIC.contains.push(BOLD_WITHOUT_ITALIC);
-
-      let CONTAINABLE = [
-        INLINE_HTML,
-        LINK
-      ];
-
-      [
-        BOLD,
-        ITALIC,
-        BOLD_WITHOUT_ITALIC,
-        ITALIC_WITHOUT_BOLD
-      ].forEach(m => {
-        m.contains = m.contains.concat(CONTAINABLE);
-      });
-
-      CONTAINABLE = CONTAINABLE.concat(BOLD, ITALIC);
-
-      const HEADER = {
-        className: 'section',
-        variants: [
-          {
-            begin: '^#{1,6}',
-            end: '$',
-            contains: CONTAINABLE
-          },
-          {
-            begin: '(?=^.+?\\n[=-]{2,}$)',
-            contains: [
-              { begin: '^[=-]*$' },
-              {
-                begin: '^',
-                end: "\\n",
-                contains: CONTAINABLE
-              }
-            ]
-          }
-        ]
-      };
-
-      const BLOCKQUOTE = {
-        className: 'quote',
-        begin: '^>\\s+',
-        contains: CONTAINABLE,
-        end: '$'
-      };
-
-      return {
-        name: 'Markdown',
-        aliases: [
-          'md',
-          'mkdown',
-          'mkd'
-        ],
-        contains: [
-          HEADER,
-          INLINE_HTML,
-          LIST,
-          BOLD,
-          ITALIC,
-          BLOCKQUOTE,
-          CODE,
-          HORIZONTAL_RULE,
-          LINK,
-          LINK_REFERENCE
-        ]
-      };
-    }
-
-    /*
-    Language: Objective-C
-    Author: Valerii Hiora <valerii.hiora@gmail.com>
-    Contributors: Angel G. Olloqui <angelgarcia.mail@gmail.com>, Matt Diephouse <matt@diephouse.com>, Andrew Farmer <ahfarmer@gmail.com>, Minh Nguyễn <mxn@1ec5.org>
-    Website: https://developer.apple.com/documentation/objectivec
-    Category: common
-    */
-
-    function objectivec(hljs) {
-      const API_CLASS = {
-        className: 'built_in',
-        begin: '\\b(AV|CA|CF|CG|CI|CL|CM|CN|CT|MK|MP|MTK|MTL|NS|SCN|SK|UI|WK|XC)\\w+'
-      };
-      const IDENTIFIER_RE = /[a-zA-Z@][a-zA-Z0-9_]*/;
-      const TYPES = [
-        "int",
-        "float",
-        "char",
-        "unsigned",
-        "signed",
-        "short",
-        "long",
-        "double",
-        "wchar_t",
-        "unichar",
-        "void",
-        "bool",
-        "BOOL",
-        "id|0",
-        "_Bool"
-      ];
-      const KWS = [
-        "while",
-        "export",
-        "sizeof",
-        "typedef",
-        "const",
-        "struct",
-        "for",
-        "union",
-        "volatile",
-        "static",
-        "mutable",
-        "if",
-        "do",
-        "return",
-        "goto",
-        "enum",
-        "else",
-        "break",
-        "extern",
-        "asm",
-        "case",
-        "default",
-        "register",
-        "explicit",
-        "typename",
-        "switch",
-        "continue",
-        "inline",
-        "readonly",
-        "assign",
-        "readwrite",
-        "self",
-        "@synchronized",
-        "id",
-        "typeof",
-        "nonatomic",
-        "IBOutlet",
-        "IBAction",
-        "strong",
-        "weak",
-        "copy",
-        "in",
-        "out",
-        "inout",
-        "bycopy",
-        "byref",
-        "oneway",
-        "__strong",
-        "__weak",
-        "__block",
-        "__autoreleasing",
-        "@private",
-        "@protected",
-        "@public",
-        "@try",
-        "@property",
-        "@end",
-        "@throw",
-        "@catch",
-        "@finally",
-        "@autoreleasepool",
-        "@synthesize",
-        "@dynamic",
-        "@selector",
-        "@optional",
-        "@required",
-        "@encode",
-        "@package",
-        "@import",
-        "@defs",
-        "@compatibility_alias",
-        "__bridge",
-        "__bridge_transfer",
-        "__bridge_retained",
-        "__bridge_retain",
-        "__covariant",
-        "__contravariant",
-        "__kindof",
-        "_Nonnull",
-        "_Nullable",
-        "_Null_unspecified",
-        "__FUNCTION__",
-        "__PRETTY_FUNCTION__",
-        "__attribute__",
-        "getter",
-        "setter",
-        "retain",
-        "unsafe_unretained",
-        "nonnull",
-        "nullable",
-        "null_unspecified",
-        "null_resettable",
-        "class",
-        "instancetype",
-        "NS_DESIGNATED_INITIALIZER",
-        "NS_UNAVAILABLE",
-        "NS_REQUIRES_SUPER",
-        "NS_RETURNS_INNER_POINTER",
-        "NS_INLINE",
-        "NS_AVAILABLE",
-        "NS_DEPRECATED",
-        "NS_ENUM",
-        "NS_OPTIONS",
-        "NS_SWIFT_UNAVAILABLE",
-        "NS_ASSUME_NONNULL_BEGIN",
-        "NS_ASSUME_NONNULL_END",
-        "NS_REFINED_FOR_SWIFT",
-        "NS_SWIFT_NAME",
-        "NS_SWIFT_NOTHROW",
-        "NS_DURING",
-        "NS_HANDLER",
-        "NS_ENDHANDLER",
-        "NS_VALUERETURN",
-        "NS_VOIDRETURN"
-      ];
-      const LITERALS = [
-        "false",
-        "true",
-        "FALSE",
-        "TRUE",
-        "nil",
-        "YES",
-        "NO",
-        "NULL"
-      ];
-      const BUILT_INS = [
-        "dispatch_once_t",
-        "dispatch_queue_t",
-        "dispatch_sync",
-        "dispatch_async",
-        "dispatch_once"
-      ];
-      const KEYWORDS = {
-        "variable.language": [
-          "this",
-          "super"
-        ],
-        $pattern: IDENTIFIER_RE,
-        keyword: KWS,
-        literal: LITERALS,
-        built_in: BUILT_INS,
-        type: TYPES
-      };
-      const CLASS_KEYWORDS = {
-        $pattern: IDENTIFIER_RE,
-        keyword: [
-          "@interface",
-          "@class",
-          "@protocol",
-          "@implementation"
-        ]
-      };
-      return {
-        name: 'Objective-C',
-        aliases: [
-          'mm',
-          'objc',
-          'obj-c',
-          'obj-c++',
-          'objective-c++'
-        ],
-        keywords: KEYWORDS,
-        illegal: '</',
-        contains: [
-          API_CLASS,
-          hljs.C_LINE_COMMENT_MODE,
-          hljs.C_BLOCK_COMMENT_MODE,
-          hljs.C_NUMBER_MODE,
-          hljs.QUOTE_STRING_MODE,
-          hljs.APOS_STRING_MODE,
-          {
-            className: 'string',
-            variants: [
-              {
-                begin: '@"',
-                end: '"',
-                illegal: '\\n',
-                contains: [ hljs.BACKSLASH_ESCAPE ]
-              }
-            ]
-          },
-          {
-            className: 'meta',
-            begin: /#\s*[a-z]+\b/,
-            end: /$/,
-            keywords: { keyword:
-                'if else elif endif define undef warning error line '
-                + 'pragma ifdef ifndef include' },
-            contains: [
-              {
-                begin: /\\\n/,
-                relevance: 0
-              },
-              hljs.inherit(hljs.QUOTE_STRING_MODE, { className: 'string' }),
-              {
-                className: 'string',
-                begin: /<.*?>/,
-                end: /$/,
-                illegal: '\\n'
-              },
-              hljs.C_LINE_COMMENT_MODE,
-              hljs.C_BLOCK_COMMENT_MODE
-            ]
-          },
-          {
-            className: 'class',
-            begin: '(' + CLASS_KEYWORDS.keyword.join('|') + ')\\b',
-            end: /(\{|$)/,
-            excludeEnd: true,
-            keywords: CLASS_KEYWORDS,
-            contains: [ hljs.UNDERSCORE_TITLE_MODE ]
-          },
-          {
-            begin: '\\.' + hljs.UNDERSCORE_IDENT_RE,
-            relevance: 0
-          }
-        ]
-      };
-    }
-
-    /*
-    Language: Perl
-    Author: Peter Leonov <gojpeg@yandex.ru>
-    Website: https://www.perl.org
-    Category: common
-    */
-
-    /** @type LanguageFn */
-    function perl(hljs) {
-      const regex = hljs.regex;
-      const KEYWORDS = [
-        'abs',
-        'accept',
-        'alarm',
-        'and',
-        'atan2',
-        'bind',
-        'binmode',
-        'bless',
-        'break',
-        'caller',
-        'chdir',
-        'chmod',
-        'chomp',
-        'chop',
-        'chown',
-        'chr',
-        'chroot',
-        'close',
-        'closedir',
-        'connect',
-        'continue',
-        'cos',
-        'crypt',
-        'dbmclose',
-        'dbmopen',
-        'defined',
-        'delete',
-        'die',
-        'do',
-        'dump',
-        'each',
-        'else',
-        'elsif',
-        'endgrent',
-        'endhostent',
-        'endnetent',
-        'endprotoent',
-        'endpwent',
-        'endservent',
-        'eof',
-        'eval',
-        'exec',
-        'exists',
-        'exit',
-        'exp',
-        'fcntl',
-        'fileno',
-        'flock',
-        'for',
-        'foreach',
-        'fork',
-        'format',
-        'formline',
-        'getc',
-        'getgrent',
-        'getgrgid',
-        'getgrnam',
-        'gethostbyaddr',
-        'gethostbyname',
-        'gethostent',
-        'getlogin',
-        'getnetbyaddr',
-        'getnetbyname',
-        'getnetent',
-        'getpeername',
-        'getpgrp',
-        'getpriority',
-        'getprotobyname',
-        'getprotobynumber',
-        'getprotoent',
-        'getpwent',
-        'getpwnam',
-        'getpwuid',
-        'getservbyname',
-        'getservbyport',
-        'getservent',
-        'getsockname',
-        'getsockopt',
-        'given',
-        'glob',
-        'gmtime',
-        'goto',
-        'grep',
-        'gt',
-        'hex',
-        'if',
-        'index',
-        'int',
-        'ioctl',
-        'join',
-        'keys',
-        'kill',
-        'last',
-        'lc',
-        'lcfirst',
-        'length',
-        'link',
-        'listen',
-        'local',
-        'localtime',
-        'log',
-        'lstat',
-        'lt',
-        'ma',
-        'map',
-        'mkdir',
-        'msgctl',
-        'msgget',
-        'msgrcv',
-        'msgsnd',
-        'my',
-        'ne',
-        'next',
-        'no',
-        'not',
-        'oct',
-        'open',
-        'opendir',
-        'or',
-        'ord',
-        'our',
-        'pack',
-        'package',
-        'pipe',
-        'pop',
-        'pos',
-        'print',
-        'printf',
-        'prototype',
-        'push',
-        'q|0',
-        'qq',
-        'quotemeta',
-        'qw',
-        'qx',
-        'rand',
-        'read',
-        'readdir',
-        'readline',
-        'readlink',
-        'readpipe',
-        'recv',
-        'redo',
-        'ref',
-        'rename',
-        'require',
-        'reset',
-        'return',
-        'reverse',
-        'rewinddir',
-        'rindex',
-        'rmdir',
-        'say',
-        'scalar',
-        'seek',
-        'seekdir',
-        'select',
-        'semctl',
-        'semget',
-        'semop',
-        'send',
-        'setgrent',
-        'sethostent',
-        'setnetent',
-        'setpgrp',
-        'setpriority',
-        'setprotoent',
-        'setpwent',
-        'setservent',
-        'setsockopt',
-        'shift',
-        'shmctl',
-        'shmget',
-        'shmread',
-        'shmwrite',
-        'shutdown',
-        'sin',
-        'sleep',
-        'socket',
-        'socketpair',
-        'sort',
-        'splice',
-        'split',
-        'sprintf',
-        'sqrt',
-        'srand',
-        'stat',
-        'state',
-        'study',
-        'sub',
-        'substr',
-        'symlink',
-        'syscall',
-        'sysopen',
-        'sysread',
-        'sysseek',
-        'system',
-        'syswrite',
-        'tell',
-        'telldir',
-        'tie',
-        'tied',
-        'time',
-        'times',
-        'tr',
-        'truncate',
-        'uc',
-        'ucfirst',
-        'umask',
-        'undef',
-        'unless',
-        'unlink',
-        'unpack',
-        'unshift',
-        'untie',
-        'until',
-        'use',
-        'utime',
-        'values',
-        'vec',
-        'wait',
-        'waitpid',
-        'wantarray',
-        'warn',
-        'when',
-        'while',
-        'write',
-        'x|0',
-        'xor',
-        'y|0'
-      ];
-
-      // https://perldoc.perl.org/perlre#Modifiers
-      const REGEX_MODIFIERS = /[dualxmsipngr]{0,12}/; // aa and xx are valid, making max length 12
-      const PERL_KEYWORDS = {
-        $pattern: /[\w.]+/,
-        keyword: KEYWORDS.join(" ")
-      };
-      const SUBST = {
-        className: 'subst',
-        begin: '[$@]\\{',
-        end: '\\}',
-        keywords: PERL_KEYWORDS
-      };
-      const METHOD = {
-        begin: /->\{/,
-        end: /\}/
-        // contains defined later
-      };
-      const VAR = { variants: [
-        { begin: /\$\d/ },
-        { begin: regex.concat(
-          /[$%@](\^\w\b|#\w+(::\w+)*|\{\w+\}|\w+(::\w*)*)/,
-          // negative look-ahead tries to avoid matching patterns that are not
-          // Perl at all like $ident$, @ident@, etc.
-          `(?![A-Za-z])(?![@$%])`
-        ) },
-        {
-          begin: /[$%@][^\s\w{]/,
-          relevance: 0
-        }
-      ] };
-      const STRING_CONTAINS = [
-        hljs.BACKSLASH_ESCAPE,
-        SUBST,
-        VAR
-      ];
-      const REGEX_DELIMS = [
-        /!/,
-        /\//,
-        /\|/,
-        /\?/,
-        /'/,
-        /"/, // valid but infrequent and weird
-        /#/ // valid but infrequent and weird
-      ];
-      /**
-       * @param {string|RegExp} prefix
-       * @param {string|RegExp} open
-       * @param {string|RegExp} close
-       */
-      const PAIRED_DOUBLE_RE = (prefix, open, close = '\\1') => {
-        const middle = (close === '\\1')
-          ? close
-          : regex.concat(close, open);
-        return regex.concat(
-          regex.concat("(?:", prefix, ")"),
-          open,
-          /(?:\\.|[^\\\/])*?/,
-          middle,
-          /(?:\\.|[^\\\/])*?/,
-          close,
-          REGEX_MODIFIERS
-        );
-      };
-      /**
-       * @param {string|RegExp} prefix
-       * @param {string|RegExp} open
-       * @param {string|RegExp} close
-       */
-      const PAIRED_RE = (prefix, open, close) => {
-        return regex.concat(
-          regex.concat("(?:", prefix, ")"),
-          open,
-          /(?:\\.|[^\\\/])*?/,
-          close,
-          REGEX_MODIFIERS
-        );
-      };
-      const PERL_DEFAULT_CONTAINS = [
-        VAR,
-        hljs.HASH_COMMENT_MODE,
-        hljs.COMMENT(
-          /^=\w/,
-          /=cut/,
-          { endsWithParent: true }
-        ),
-        METHOD,
-        {
-          className: 'string',
-          contains: STRING_CONTAINS,
-          variants: [
-            {
-              begin: 'q[qwxr]?\\s*\\(',
-              end: '\\)',
-              relevance: 5
-            },
-            {
-              begin: 'q[qwxr]?\\s*\\[',
-              end: '\\]',
-              relevance: 5
-            },
-            {
-              begin: 'q[qwxr]?\\s*\\{',
-              end: '\\}',
-              relevance: 5
-            },
-            {
-              begin: 'q[qwxr]?\\s*\\|',
-              end: '\\|',
-              relevance: 5
-            },
-            {
-              begin: 'q[qwxr]?\\s*<',
-              end: '>',
-              relevance: 5
-            },
-            {
-              begin: 'qw\\s+q',
-              end: 'q',
-              relevance: 5
-            },
-            {
-              begin: '\'',
-              end: '\'',
-              contains: [ hljs.BACKSLASH_ESCAPE ]
-            },
-            {
-              begin: '"',
-              end: '"'
-            },
-            {
-              begin: '`',
-              end: '`',
-              contains: [ hljs.BACKSLASH_ESCAPE ]
-            },
-            {
-              begin: /\{\w+\}/,
-              relevance: 0
-            },
-            {
-              begin: '-?\\w+\\s*=>',
-              relevance: 0
-            }
-          ]
-        },
-        {
-          className: 'number',
-          begin: '(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b',
-          relevance: 0
-        },
-        { // regexp container
-          begin: '(\\/\\/|' + hljs.RE_STARTERS_RE + '|\\b(split|return|print|reverse|grep)\\b)\\s*',
-          keywords: 'split return print reverse grep',
-          relevance: 0,
-          contains: [
-            hljs.HASH_COMMENT_MODE,
-            {
-              className: 'regexp',
-              variants: [
-                // allow matching common delimiters
-                { begin: PAIRED_DOUBLE_RE("s|tr|y", regex.either(...REGEX_DELIMS, { capture: true })) },
-                // and then paired delmis
-                { begin: PAIRED_DOUBLE_RE("s|tr|y", "\\(", "\\)") },
-                { begin: PAIRED_DOUBLE_RE("s|tr|y", "\\[", "\\]") },
-                { begin: PAIRED_DOUBLE_RE("s|tr|y", "\\{", "\\}") }
-              ],
-              relevance: 2
-            },
-            {
-              className: 'regexp',
-              variants: [
-                {
-                  // could be a comment in many languages so do not count
-                  // as relevant
-                  begin: /(m|qr)\/\//,
-                  relevance: 0
-                },
-                // prefix is optional with /regex/
-                { begin: PAIRED_RE("(?:m|qr)?", /\//, /\//) },
-                // allow matching common delimiters
-                { begin: PAIRED_RE("m|qr", regex.either(...REGEX_DELIMS, { capture: true }), /\1/) },
-                // allow common paired delmins
-                { begin: PAIRED_RE("m|qr", /\(/, /\)/) },
-                { begin: PAIRED_RE("m|qr", /\[/, /\]/) },
-                { begin: PAIRED_RE("m|qr", /\{/, /\}/) }
-              ]
-            }
-          ]
-        },
-        {
-          className: 'function',
-          beginKeywords: 'sub',
-          end: '(\\s*\\(.*?\\))?[;{]',
-          excludeEnd: true,
-          relevance: 5,
-          contains: [ hljs.TITLE_MODE ]
-        },
-        {
-          begin: '-\\w\\b',
-          relevance: 0
-        },
-        {
-          begin: "^__DATA__$",
-          end: "^__END__$",
-          subLanguage: 'mojolicious',
-          contains: [
-            {
-              begin: "^@@.*",
-              end: "$",
-              className: "comment"
-            }
-          ]
-        }
-      ];
-      SUBST.contains = PERL_DEFAULT_CONTAINS;
-      METHOD.contains = PERL_DEFAULT_CONTAINS;
-
-      return {
-        name: 'Perl',
-        aliases: [
-          'pl',
-          'pm'
-        ],
-        keywords: PERL_KEYWORDS,
-        contains: PERL_DEFAULT_CONTAINS
-      };
-    }
-
-    /*
-    Language: PHP
-    Author: Victor Karamzin <Victor.Karamzin@enterra-inc.com>
-    Contributors: Evgeny Stepanischev <imbolk@gmail.com>, Ivan Sagalaev <maniac@softwaremaniacs.org>
-    Website: https://www.php.net
-    Category: common
-    */
+    const KEYWORDS = {
+      keyword: KWS,
+      literal: dualCase(LITERALS),
+      built_in: BUILT_INS,
+    };
 
     /**
-     * @param {HLJSApi} hljs
-     * @returns {LanguageDetail}
-     * */
-    function php(hljs) {
-      const regex = hljs.regex;
-      // negative look-ahead tries to avoid matching patterns that are not
-      // Perl at all like $ident$, @ident@, etc.
-      const NOT_PERL_ETC = /(?![A-Za-z0-9])(?![$])/;
-      const IDENT_RE = regex.concat(
-        /[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/,
-        NOT_PERL_ETC);
-      // Will not detect camelCase classes
-      const PASCAL_CASE_CLASS_NAME_RE = regex.concat(
-        /(\\?[A-Z][a-z0-9_\x7f-\xff]+|\\?[A-Z]+(?=[A-Z][a-z0-9_\x7f-\xff])){1,}/,
-        NOT_PERL_ETC);
-      const VARIABLE = {
-        scope: 'variable',
-        match: '\\$+' + IDENT_RE,
-      };
-      const PREPROCESSOR = {
-        scope: 'meta',
-        variants: [
-          { begin: /<\?php/, relevance: 10 }, // boost for obvious PHP
-          { begin: /<\?=/ },
-          // less relevant per PSR-1 which says not to use short-tags
-          { begin: /<\?/, relevance: 0.1 },
-          { begin: /\?>/ } // end php tag
-        ]
-      };
-      const SUBST = {
-        scope: 'subst',
-        variants: [
-          { begin: /\$\w+/ },
-          {
-            begin: /\{\$/,
-            end: /\}/
-          }
-        ]
-      };
-      const SINGLE_QUOTED = hljs.inherit(hljs.APOS_STRING_MODE, { illegal: null, });
-      const DOUBLE_QUOTED = hljs.inherit(hljs.QUOTE_STRING_MODE, {
-        illegal: null,
-        contains: hljs.QUOTE_STRING_MODE.contains.concat(SUBST),
+     * @param {string[]} items */
+    const normalizeKeywords = (items) => {
+      return items.map(item => {
+        return item.replace(/\|\d+$/, "");
       });
-      const HEREDOC = hljs.END_SAME_AS_BEGIN({
-        begin: /<<<[ \t]*(\w+)\n/,
-        end: /[ \t]*(\w+)\b/,
-        contains: hljs.QUOTE_STRING_MODE.contains.concat(SUBST),
-      });
-      // list of valid whitespaces because non-breaking space might be part of a IDENT_RE
-      const WHITESPACE = '[ \t\n]';
-      const STRING = {
-        scope: 'string',
-        variants: [
-          DOUBLE_QUOTED,
-          SINGLE_QUOTED,
-          HEREDOC
-        ]
-      };
-      const NUMBER = {
-        scope: 'number',
-        variants: [
-          { begin: `\\b0[bB][01]+(?:_[01]+)*\\b` }, // Binary w/ underscore support
-          { begin: `\\b0[oO][0-7]+(?:_[0-7]+)*\\b` }, // Octals w/ underscore support
-          { begin: `\\b0[xX][\\da-fA-F]+(?:_[\\da-fA-F]+)*\\b` }, // Hex w/ underscore support
-          // Decimals w/ underscore support, with optional fragments and scientific exponent (e) suffix.
-          { begin: `(?:\\b\\d+(?:_\\d+)*(\\.(?:\\d+(?:_\\d+)*))?|\\B\\.\\d+)(?:[eE][+-]?\\d+)?` }
-        ],
-        relevance: 0
-      };
-      const LITERALS = [
-        "false",
-        "null",
-        "true"
-      ];
-      const KWS = [
-        // Magic constants:
-        // <https://www.php.net/manual/en/language.constants.predefined.php>
-        "__CLASS__",
-        "__DIR__",
-        "__FILE__",
-        "__FUNCTION__",
-        "__COMPILER_HALT_OFFSET__",
-        "__LINE__",
-        "__METHOD__",
-        "__NAMESPACE__",
-        "__TRAIT__",
-        // Function that look like language construct or language construct that look like function:
-        // List of keywords that may not require parenthesis
-        "die",
-        "echo",
-        "exit",
-        "include",
-        "include_once",
-        "print",
-        "require",
-        "require_once",
-        // These are not language construct (function) but operate on the currently-executing function and can access the current symbol table
-        // 'compact extract func_get_arg func_get_args func_num_args get_called_class get_parent_class ' +
-        // Other keywords:
-        // <https://www.php.net/manual/en/reserved.php>
-        // <https://www.php.net/manual/en/language.types.type-juggling.php>
-        "array",
-        "abstract",
-        "and",
-        "as",
-        "binary",
-        "bool",
-        "boolean",
-        "break",
-        "callable",
-        "case",
-        "catch",
-        "class",
-        "clone",
-        "const",
-        "continue",
-        "declare",
-        "default",
-        "do",
-        "double",
-        "else",
-        "elseif",
-        "empty",
-        "enddeclare",
-        "endfor",
-        "endforeach",
-        "endif",
-        "endswitch",
-        "endwhile",
-        "enum",
-        "eval",
-        "extends",
-        "final",
-        "finally",
-        "float",
-        "for",
-        "foreach",
-        "from",
-        "global",
-        "goto",
-        "if",
-        "implements",
-        "instanceof",
-        "insteadof",
-        "int",
-        "integer",
-        "interface",
-        "isset",
-        "iterable",
-        "list",
-        "match|0",
-        "mixed",
-        "new",
-        "never",
-        "object",
-        "or",
-        "private",
-        "protected",
-        "public",
-        "readonly",
-        "real",
-        "return",
-        "string",
-        "switch",
-        "throw",
-        "trait",
-        "try",
-        "unset",
-        "use",
-        "var",
-        "void",
-        "while",
-        "xor",
-        "yield"
-      ];
+    };
 
-      const BUILT_INS = [
-        // Standard PHP library:
-        // <https://www.php.net/manual/en/book.spl.php>
-        "Error|0",
-        "AppendIterator",
-        "ArgumentCountError",
-        "ArithmeticError",
-        "ArrayIterator",
-        "ArrayObject",
-        "AssertionError",
-        "BadFunctionCallException",
-        "BadMethodCallException",
-        "CachingIterator",
-        "CallbackFilterIterator",
-        "CompileError",
-        "Countable",
-        "DirectoryIterator",
-        "DivisionByZeroError",
-        "DomainException",
-        "EmptyIterator",
-        "ErrorException",
-        "Exception",
-        "FilesystemIterator",
-        "FilterIterator",
-        "GlobIterator",
-        "InfiniteIterator",
-        "InvalidArgumentException",
-        "IteratorIterator",
-        "LengthException",
-        "LimitIterator",
-        "LogicException",
-        "MultipleIterator",
-        "NoRewindIterator",
-        "OutOfBoundsException",
-        "OutOfRangeException",
-        "OuterIterator",
-        "OverflowException",
-        "ParentIterator",
-        "ParseError",
-        "RangeException",
-        "RecursiveArrayIterator",
-        "RecursiveCachingIterator",
-        "RecursiveCallbackFilterIterator",
-        "RecursiveDirectoryIterator",
-        "RecursiveFilterIterator",
-        "RecursiveIterator",
-        "RecursiveIteratorIterator",
-        "RecursiveRegexIterator",
-        "RecursiveTreeIterator",
-        "RegexIterator",
-        "RuntimeException",
-        "SeekableIterator",
-        "SplDoublyLinkedList",
-        "SplFileInfo",
-        "SplFileObject",
-        "SplFixedArray",
-        "SplHeap",
-        "SplMaxHeap",
-        "SplMinHeap",
-        "SplObjectStorage",
-        "SplObserver",
-        "SplPriorityQueue",
-        "SplQueue",
-        "SplStack",
-        "SplSubject",
-        "SplTempFileObject",
-        "TypeError",
-        "UnderflowException",
-        "UnexpectedValueException",
-        "UnhandledMatchError",
-        // Reserved interfaces:
-        // <https://www.php.net/manual/en/reserved.interfaces.php>
-        "ArrayAccess",
-        "BackedEnum",
-        "Closure",
-        "Fiber",
-        "Generator",
-        "Iterator",
-        "IteratorAggregate",
-        "Serializable",
-        "Stringable",
-        "Throwable",
-        "Traversable",
-        "UnitEnum",
-        "WeakReference",
-        "WeakMap",
-        // Reserved classes:
-        // <https://www.php.net/manual/en/reserved.classes.php>
-        "Directory",
-        "__PHP_Incomplete_Class",
-        "parent",
-        "php_user_filter",
-        "self",
-        "static",
-        "stdClass"
-      ];
-
-      /** Dual-case keywords
-       *
-       * ["then","FILE"] =>
-       *     ["then", "THEN", "FILE", "file"]
-       *
-       * @param {string[]} items */
-      const dualCase = (items) => {
-        /** @type string[] */
-        const result = [];
-        items.forEach(item => {
-          result.push(item);
-          if (item.toLowerCase() === item) {
-            result.push(item.toUpperCase());
-          } else {
-            result.push(item.toLowerCase());
-          }
-        });
-        return result;
-      };
-
-      const KEYWORDS = {
-        keyword: KWS,
-        literal: dualCase(LITERALS),
-        built_in: BUILT_INS,
-      };
-
-      /**
-       * @param {string[]} items */
-      const normalizeKeywords = (items) => {
-        return items.map(item => {
-          return item.replace(/\|\d+$/, "");
-        });
-      };
-
-      const CONSTRUCTOR_CALL = { variants: [
-        {
-          match: [
-            /new/,
-            regex.concat(WHITESPACE, "+"),
-            // to prevent built ins from being confused as the class constructor call
-            regex.concat("(?!", normalizeKeywords(BUILT_INS).join("\\b|"), "\\b)"),
-            PASCAL_CASE_CLASS_NAME_RE,
-          ],
-          scope: {
-            1: "keyword",
-            4: "title.class",
-          },
-        }
-      ] };
-
-      const CONSTANT_REFERENCE = regex.concat(IDENT_RE, "\\b(?!\\()");
-
-      const LEFT_AND_RIGHT_SIDE_OF_DOUBLE_COLON = { variants: [
-        {
-          match: [
-            regex.concat(
-              /::/,
-              regex.lookahead(/(?!class\b)/)
-            ),
-            CONSTANT_REFERENCE,
-          ],
-          scope: { 2: "variable.constant", },
-        },
-        {
-          match: [
-            /::/,
-            /class/,
-          ],
-          scope: { 2: "variable.language", },
-        },
-        {
-          match: [
-            PASCAL_CASE_CLASS_NAME_RE,
-            regex.concat(
-              /::/,
-              regex.lookahead(/(?!class\b)/)
-            ),
-            CONSTANT_REFERENCE,
-          ],
-          scope: {
-            1: "title.class",
-            3: "variable.constant",
-          },
-        },
-        {
-          match: [
-            PASCAL_CASE_CLASS_NAME_RE,
-            regex.concat(
-              "::",
-              regex.lookahead(/(?!class\b)/)
-            ),
-          ],
-          scope: { 1: "title.class", },
-        },
-        {
-          match: [
-            PASCAL_CASE_CLASS_NAME_RE,
-            /::/,
-            /class/,
-          ],
-          scope: {
-            1: "title.class",
-            3: "variable.language",
-          },
-        }
-      ] };
-
-      const NAMED_ARGUMENT = {
-        scope: 'attr',
-        match: regex.concat(IDENT_RE, regex.lookahead(':'), regex.lookahead(/(?!::)/)),
-      };
-      const PARAMS_MODE = {
-        relevance: 0,
-        begin: /\(/,
-        end: /\)/,
-        keywords: KEYWORDS,
-        contains: [
-          NAMED_ARGUMENT,
-          VARIABLE,
-          LEFT_AND_RIGHT_SIDE_OF_DOUBLE_COLON,
-          hljs.C_BLOCK_COMMENT_MODE,
-          STRING,
-          NUMBER,
-          CONSTRUCTOR_CALL,
-        ],
-      };
-      const FUNCTION_INVOKE = {
-        relevance: 0,
+    const CONSTRUCTOR_CALL = { variants: [
+      {
         match: [
-          /\b/,
-          // to prevent keywords from being confused as the function title
-          regex.concat("(?!fn\\b|function\\b|", normalizeKeywords(KWS).join("\\b|"), "|", normalizeKeywords(BUILT_INS).join("\\b|"), "\\b)"),
-          IDENT_RE,
-          regex.concat(WHITESPACE, "*"),
-          regex.lookahead(/(?=\()/)
+          /new/,
+          regex.concat(WHITESPACE, "+"),
+          // to prevent built ins from being confused as the class constructor call
+          regex.concat("(?!", normalizeKeywords(BUILT_INS).join("\\b|"), "\\b)"),
+          PASCAL_CASE_CLASS_NAME_RE,
         ],
-        scope: { 3: "title.function.invoke", },
-        contains: [ PARAMS_MODE ]
-      };
-      PARAMS_MODE.contains.push(FUNCTION_INVOKE);
+        scope: {
+          1: "keyword",
+          4: "title.class",
+        },
+      }
+    ] };
 
-      const ATTRIBUTE_CONTAINS = [
+    const CONSTANT_REFERENCE = regex.concat(IDENT_RE, "\\b(?!\\()");
+
+    const LEFT_AND_RIGHT_SIDE_OF_DOUBLE_COLON = { variants: [
+      {
+        match: [
+          regex.concat(
+            /::/,
+            regex.lookahead(/(?!class\b)/)
+          ),
+          CONSTANT_REFERENCE,
+        ],
+        scope: { 2: "variable.constant", },
+      },
+      {
+        match: [
+          /::/,
+          /class/,
+        ],
+        scope: { 2: "variable.language", },
+      },
+      {
+        match: [
+          PASCAL_CASE_CLASS_NAME_RE,
+          regex.concat(
+            /::/,
+            regex.lookahead(/(?!class\b)/)
+          ),
+          CONSTANT_REFERENCE,
+        ],
+        scope: {
+          1: "title.class",
+          3: "variable.constant",
+        },
+      },
+      {
+        match: [
+          PASCAL_CASE_CLASS_NAME_RE,
+          regex.concat(
+            "::",
+            regex.lookahead(/(?!class\b)/)
+          ),
+        ],
+        scope: { 1: "title.class", },
+      },
+      {
+        match: [
+          PASCAL_CASE_CLASS_NAME_RE,
+          /::/,
+          /class/,
+        ],
+        scope: {
+          1: "title.class",
+          3: "variable.language",
+        },
+      }
+    ] };
+
+    const NAMED_ARGUMENT = {
+      scope: 'attr',
+      match: regex.concat(IDENT_RE, regex.lookahead(':'), regex.lookahead(/(?!::)/)),
+    };
+    const PARAMS_MODE = {
+      relevance: 0,
+      begin: /\(/,
+      end: /\)/,
+      keywords: KEYWORDS,
+      contains: [
         NAMED_ARGUMENT,
+        VARIABLE,
         LEFT_AND_RIGHT_SIDE_OF_DOUBLE_COLON,
         hljs.C_BLOCK_COMMENT_MODE,
         STRING,
         NUMBER,
         CONSTRUCTOR_CALL,
-      ];
+      ],
+    };
+    const FUNCTION_INVOKE = {
+      relevance: 0,
+      match: [
+        /\b/,
+        // to prevent keywords from being confused as the function title
+        regex.concat("(?!fn\\b|function\\b|", normalizeKeywords(KWS).join("\\b|"), "|", normalizeKeywords(BUILT_INS).join("\\b|"), "\\b)"),
+        IDENT_RE,
+        regex.concat(WHITESPACE, "*"),
+        regex.lookahead(/(?=\()/)
+      ],
+      scope: { 3: "title.function.invoke", },
+      contains: [ PARAMS_MODE ]
+    };
+    PARAMS_MODE.contains.push(FUNCTION_INVOKE);
 
-      const ATTRIBUTES = {
-        begin: regex.concat(/#\[\s*/, PASCAL_CASE_CLASS_NAME_RE),
-        beginScope: "meta",
-        end: /]/,
-        endScope: "meta",
-        keywords: {
-          literal: LITERALS,
-          keyword: [
-            'new',
-            'array',
+    const ATTRIBUTE_CONTAINS = [
+      NAMED_ARGUMENT,
+      LEFT_AND_RIGHT_SIDE_OF_DOUBLE_COLON,
+      hljs.C_BLOCK_COMMENT_MODE,
+      STRING,
+      NUMBER,
+      CONSTRUCTOR_CALL,
+    ];
+
+    const ATTRIBUTES = {
+      begin: regex.concat(/#\[\s*/, PASCAL_CASE_CLASS_NAME_RE),
+      beginScope: "meta",
+      end: /]/,
+      endScope: "meta",
+      keywords: {
+        literal: LITERALS,
+        keyword: [
+          'new',
+          'array',
+        ]
+      },
+      contains: [
+        {
+          begin: /\[/,
+          end: /]/,
+          keywords: {
+            literal: LITERALS,
+            keyword: [
+              'new',
+              'array',
+            ]
+          },
+          contains: [
+            'self',
+            ...ATTRIBUTE_CONTAINS,
           ]
         },
-        contains: [
-          {
-            begin: /\[/,
-            end: /]/,
-            keywords: {
-              literal: LITERALS,
-              keyword: [
-                'new',
-                'array',
-              ]
-            },
-            contains: [
-              'self',
-              ...ATTRIBUTE_CONTAINS,
-            ]
-          },
-          ...ATTRIBUTE_CONTAINS,
-          {
-            scope: 'meta',
-            match: PASCAL_CASE_CLASS_NAME_RE
-          }
-        ]
-      };
-
-      return {
-        case_insensitive: false,
-        keywords: KEYWORDS,
-        contains: [
-          ATTRIBUTES,
-          hljs.HASH_COMMENT_MODE,
-          hljs.COMMENT('//', '$'),
-          hljs.COMMENT(
-            '/\\*',
-            '\\*/',
-            { contains: [
-              {
-                scope: 'doctag',
-                match: '@[A-Za-z]+'
-              }
-            ] }
-          ),
-          {
-            match: /__halt_compiler\(\);/,
-            keywords: '__halt_compiler',
-            starts: {
-              scope: "comment",
-              end: hljs.MATCH_NOTHING_RE,
-              contains: [
-                {
-                  match: /\?>/,
-                  scope: "meta",
-                  endsParent: true
-                }
-              ]
-            }
-          },
-          PREPROCESSOR,
-          {
-            scope: 'variable.language',
-            match: /\$this\b/
-          },
-          VARIABLE,
-          FUNCTION_INVOKE,
-          LEFT_AND_RIGHT_SIDE_OF_DOUBLE_COLON,
-          {
-            match: [
-              /const/,
-              /\s/,
-              IDENT_RE,
-            ],
-            scope: {
-              1: "keyword",
-              3: "variable.constant",
-            },
-          },
-          CONSTRUCTOR_CALL,
-          {
-            scope: 'function',
-            relevance: 0,
-            beginKeywords: 'fn function',
-            end: /[;{]/,
-            excludeEnd: true,
-            illegal: '[$%\\[]',
-            contains: [
-              { beginKeywords: 'use', },
-              hljs.UNDERSCORE_TITLE_MODE,
-              {
-                begin: '=>', // No markup, just a relevance booster
-                endsParent: true
-              },
-              {
-                scope: 'params',
-                begin: '\\(',
-                end: '\\)',
-                excludeBegin: true,
-                excludeEnd: true,
-                keywords: KEYWORDS,
-                contains: [
-                  'self',
-                  VARIABLE,
-                  LEFT_AND_RIGHT_SIDE_OF_DOUBLE_COLON,
-                  hljs.C_BLOCK_COMMENT_MODE,
-                  STRING,
-                  NUMBER
-                ]
-              },
-            ]
-          },
-          {
-            scope: 'class',
-            variants: [
-              {
-                beginKeywords: "enum",
-                illegal: /[($"]/
-              },
-              {
-                beginKeywords: "class interface trait",
-                illegal: /[:($"]/
-              }
-            ],
-            relevance: 0,
-            end: /\{/,
-            excludeEnd: true,
-            contains: [
-              { beginKeywords: 'extends implements' },
-              hljs.UNDERSCORE_TITLE_MODE
-            ]
-          },
-          // both use and namespace still use "old style" rules (vs multi-match)
-          // because the namespace name can include `\` and we still want each
-          // element to be treated as its own *individual* title
-          {
-            beginKeywords: 'namespace',
-            relevance: 0,
-            end: ';',
-            illegal: /[.']/,
-            contains: [ hljs.inherit(hljs.UNDERSCORE_TITLE_MODE, { scope: "title.class" }) ]
-          },
-          {
-            beginKeywords: 'use',
-            relevance: 0,
-            end: ';',
-            contains: [
-              // TODO: title.function vs title.class
-              {
-                match: /\b(as|const|function)\b/,
-                scope: "keyword"
-              },
-              // TODO: could be title.class or title.function
-              hljs.UNDERSCORE_TITLE_MODE
-            ]
-          },
-          STRING,
-          NUMBER,
-        ]
-      };
-    }
-
-    /*
-    Language: PHP Template
-    Requires: xml.js, php.js
-    Author: Josh Goebel <hello@joshgoebel.com>
-    Website: https://www.php.net
-    Category: common
-    */
-
-    function phpTemplate(hljs) {
-      return {
-        name: "PHP template",
-        subLanguage: 'xml',
-        contains: [
-          {
-            begin: /<\?(php|=)?/,
-            end: /\?>/,
-            subLanguage: 'php',
-            contains: [
-              // We don't want the php closing tag ?> to close the PHP block when
-              // inside any of the following blocks:
-              {
-                begin: '/\\*',
-                end: '\\*/',
-                skip: true
-              },
-              {
-                begin: 'b"',
-                end: '"',
-                skip: true
-              },
-              {
-                begin: 'b\'',
-                end: '\'',
-                skip: true
-              },
-              hljs.inherit(hljs.APOS_STRING_MODE, {
-                illegal: null,
-                className: null,
-                contains: null,
-                skip: true
-              }),
-              hljs.inherit(hljs.QUOTE_STRING_MODE, {
-                illegal: null,
-                className: null,
-                contains: null,
-                skip: true
-              })
-            ]
-          }
-        ]
-      };
-    }
-
-    /*
-    Language: Plain text
-    Author: Egor Rogov (e.rogov@postgrespro.ru)
-    Description: Plain text without any highlighting.
-    Category: common
-    */
-
-    function plaintext(hljs) {
-      return {
-        name: 'Plain text',
-        aliases: [
-          'text',
-          'txt'
-        ],
-        disableAutodetect: true
-      };
-    }
-
-    /*
-    Language: Python
-    Description: Python is an interpreted, object-oriented, high-level programming language with dynamic semantics.
-    Website: https://www.python.org
-    Category: common
-    */
-
-    function python(hljs) {
-      const regex = hljs.regex;
-      const IDENT_RE = /[\p{XID_Start}_]\p{XID_Continue}*/u;
-      const RESERVED_WORDS = [
-        'and',
-        'as',
-        'assert',
-        'async',
-        'await',
-        'break',
-        'case',
-        'class',
-        'continue',
-        'def',
-        'del',
-        'elif',
-        'else',
-        'except',
-        'finally',
-        'for',
-        'from',
-        'global',
-        'if',
-        'import',
-        'in',
-        'is',
-        'lambda',
-        'match',
-        'nonlocal|10',
-        'not',
-        'or',
-        'pass',
-        'raise',
-        'return',
-        'try',
-        'while',
-        'with',
-        'yield'
-      ];
-
-      const BUILT_INS = [
-        '__import__',
-        'abs',
-        'all',
-        'any',
-        'ascii',
-        'bin',
-        'bool',
-        'breakpoint',
-        'bytearray',
-        'bytes',
-        'callable',
-        'chr',
-        'classmethod',
-        'compile',
-        'complex',
-        'delattr',
-        'dict',
-        'dir',
-        'divmod',
-        'enumerate',
-        'eval',
-        'exec',
-        'filter',
-        'float',
-        'format',
-        'frozenset',
-        'getattr',
-        'globals',
-        'hasattr',
-        'hash',
-        'help',
-        'hex',
-        'id',
-        'input',
-        'int',
-        'isinstance',
-        'issubclass',
-        'iter',
-        'len',
-        'list',
-        'locals',
-        'map',
-        'max',
-        'memoryview',
-        'min',
-        'next',
-        'object',
-        'oct',
-        'open',
-        'ord',
-        'pow',
-        'print',
-        'property',
-        'range',
-        'repr',
-        'reversed',
-        'round',
-        'set',
-        'setattr',
-        'slice',
-        'sorted',
-        'staticmethod',
-        'str',
-        'sum',
-        'super',
-        'tuple',
-        'type',
-        'vars',
-        'zip'
-      ];
-
-      const LITERALS = [
-        '__debug__',
-        'Ellipsis',
-        'False',
-        'None',
-        'NotImplemented',
-        'True'
-      ];
-
-      // https://docs.python.org/3/library/typing.html
-      // TODO: Could these be supplemented by a CamelCase matcher in certain
-      // contexts, leaving these remaining only for relevance hinting?
-      const TYPES = [
-        "Any",
-        "Callable",
-        "Coroutine",
-        "Dict",
-        "List",
-        "Literal",
-        "Generic",
-        "Optional",
-        "Sequence",
-        "Set",
-        "Tuple",
-        "Type",
-        "Union"
-      ];
-
-      const KEYWORDS = {
-        $pattern: /[A-Za-z]\w+|__\w+__/,
-        keyword: RESERVED_WORDS,
-        built_in: BUILT_INS,
-        literal: LITERALS,
-        type: TYPES
-      };
-
-      const PROMPT = {
-        className: 'meta',
-        begin: /^(>>>|\.\.\.) /
-      };
-
-      const SUBST = {
-        className: 'subst',
-        begin: /\{/,
-        end: /\}/,
-        keywords: KEYWORDS,
-        illegal: /#/
-      };
-
-      const LITERAL_BRACKET = {
-        begin: /\{\{/,
-        relevance: 0
-      };
-
-      const STRING = {
-        className: 'string',
-        contains: [ hljs.BACKSLASH_ESCAPE ],
-        variants: [
-          {
-            begin: /([uU]|[bB]|[rR]|[bB][rR]|[rR][bB])?'''/,
-            end: /'''/,
-            contains: [
-              hljs.BACKSLASH_ESCAPE,
-              PROMPT
-            ],
-            relevance: 10
-          },
-          {
-            begin: /([uU]|[bB]|[rR]|[bB][rR]|[rR][bB])?"""/,
-            end: /"""/,
-            contains: [
-              hljs.BACKSLASH_ESCAPE,
-              PROMPT
-            ],
-            relevance: 10
-          },
-          {
-            begin: /([fF][rR]|[rR][fF]|[fF])'''/,
-            end: /'''/,
-            contains: [
-              hljs.BACKSLASH_ESCAPE,
-              PROMPT,
-              LITERAL_BRACKET,
-              SUBST
-            ]
-          },
-          {
-            begin: /([fF][rR]|[rR][fF]|[fF])"""/,
-            end: /"""/,
-            contains: [
-              hljs.BACKSLASH_ESCAPE,
-              PROMPT,
-              LITERAL_BRACKET,
-              SUBST
-            ]
-          },
-          {
-            begin: /([uU]|[rR])'/,
-            end: /'/,
-            relevance: 10
-          },
-          {
-            begin: /([uU]|[rR])"/,
-            end: /"/,
-            relevance: 10
-          },
-          {
-            begin: /([bB]|[bB][rR]|[rR][bB])'/,
-            end: /'/
-          },
-          {
-            begin: /([bB]|[bB][rR]|[rR][bB])"/,
-            end: /"/
-          },
-          {
-            begin: /([fF][rR]|[rR][fF]|[fF])'/,
-            end: /'/,
-            contains: [
-              hljs.BACKSLASH_ESCAPE,
-              LITERAL_BRACKET,
-              SUBST
-            ]
-          },
-          {
-            begin: /([fF][rR]|[rR][fF]|[fF])"/,
-            end: /"/,
-            contains: [
-              hljs.BACKSLASH_ESCAPE,
-              LITERAL_BRACKET,
-              SUBST
-            ]
-          },
-          hljs.APOS_STRING_MODE,
-          hljs.QUOTE_STRING_MODE
-        ]
-      };
-
-      // https://docs.python.org/3.9/reference/lexical_analysis.html#numeric-literals
-      const digitpart = '[0-9](_?[0-9])*';
-      const pointfloat = `(\\b(${digitpart}))?\\.(${digitpart})|\\b(${digitpart})\\.`;
-      // Whitespace after a number (or any lexical token) is needed only if its absence
-      // would change the tokenization
-      // https://docs.python.org/3.9/reference/lexical_analysis.html#whitespace-between-tokens
-      // We deviate slightly, requiring a word boundary or a keyword
-      // to avoid accidentally recognizing *prefixes* (e.g., `0` in `0x41` or `08` or `0__1`)
-      const lookahead = `\\b|${RESERVED_WORDS.join('|')}`;
-      const NUMBER = {
-        className: 'number',
-        relevance: 0,
-        variants: [
-          // exponentfloat, pointfloat
-          // https://docs.python.org/3.9/reference/lexical_analysis.html#floating-point-literals
-          // optionally imaginary
-          // https://docs.python.org/3.9/reference/lexical_analysis.html#imaginary-literals
-          // Note: no leading \b because floats can start with a decimal point
-          // and we don't want to mishandle e.g. `fn(.5)`,
-          // no trailing \b for pointfloat because it can end with a decimal point
-          // and we don't want to mishandle e.g. `0..hex()`; this should be safe
-          // because both MUST contain a decimal point and so cannot be confused with
-          // the interior part of an identifier
-          {
-            begin: `(\\b(${digitpart})|(${pointfloat}))[eE][+-]?(${digitpart})[jJ]?(?=${lookahead})`
-          },
-          {
-            begin: `(${pointfloat})[jJ]?`
-          },
-
-          // decinteger, bininteger, octinteger, hexinteger
-          // https://docs.python.org/3.9/reference/lexical_analysis.html#integer-literals
-          // optionally "long" in Python 2
-          // https://docs.python.org/2.7/reference/lexical_analysis.html#integer-and-long-integer-literals
-          // decinteger is optionally imaginary
-          // https://docs.python.org/3.9/reference/lexical_analysis.html#imaginary-literals
-          {
-            begin: `\\b([1-9](_?[0-9])*|0+(_?0)*)[lLjJ]?(?=${lookahead})`
-          },
-          {
-            begin: `\\b0[bB](_?[01])+[lL]?(?=${lookahead})`
-          },
-          {
-            begin: `\\b0[oO](_?[0-7])+[lL]?(?=${lookahead})`
-          },
-          {
-            begin: `\\b0[xX](_?[0-9a-fA-F])+[lL]?(?=${lookahead})`
-          },
-
-          // imagnumber (digitpart-based)
-          // https://docs.python.org/3.9/reference/lexical_analysis.html#imaginary-literals
-          {
-            begin: `\\b(${digitpart})[jJ](?=${lookahead})`
-          }
-        ]
-      };
-      const COMMENT_TYPE = {
-        className: "comment",
-        begin: regex.lookahead(/# type:/),
-        end: /$/,
-        keywords: KEYWORDS,
-        contains: [
-          { // prevent keywords from coloring `type`
-            begin: /# type:/
-          },
-          // comment within a datatype comment includes no keywords
-          {
-            begin: /#/,
-            end: /\b\B/,
-            endsWithParent: true
-          }
-        ]
-      };
-      const PARAMS = {
-        className: 'params',
-        variants: [
-          // Exclude params in functions without params
-          {
-            className: "",
-            begin: /\(\s*\)/,
-            skip: true
-          },
-          {
-            begin: /\(/,
-            end: /\)/,
-            excludeBegin: true,
-            excludeEnd: true,
-            keywords: KEYWORDS,
-            contains: [
-              'self',
-              PROMPT,
-              NUMBER,
-              STRING,
-              hljs.HASH_COMMENT_MODE
-            ]
-          }
-        ]
-      };
-      SUBST.contains = [
-        STRING,
-        NUMBER,
-        PROMPT
-      ];
-
-      return {
-        name: 'Python',
-        aliases: [
-          'py',
-          'gyp',
-          'ipython'
-        ],
-        unicodeRegex: true,
-        keywords: KEYWORDS,
-        illegal: /(<\/|->|\?)|=>/,
-        contains: [
-          PROMPT,
-          NUMBER,
-          {
-            // very common convention
-            begin: /\bself\b/
-          },
-          {
-            // eat "if" prior to string so that it won't accidentally be
-            // labeled as an f-string
-            beginKeywords: "if",
-            relevance: 0
-          },
-          STRING,
-          COMMENT_TYPE,
-          hljs.HASH_COMMENT_MODE,
-          {
-            match: [
-              /\bdef/, /\s+/,
-              IDENT_RE,
-            ],
-            scope: {
-              1: "keyword",
-              3: "title.function"
-            },
-            contains: [ PARAMS ]
-          },
-          {
-            variants: [
-              {
-                match: [
-                  /\bclass/, /\s+/,
-                  IDENT_RE, /\s*/,
-                  /\(\s*/, IDENT_RE,/\s*\)/
-                ],
-              },
-              {
-                match: [
-                  /\bclass/, /\s+/,
-                  IDENT_RE
-                ],
-              }
-            ],
-            scope: {
-              1: "keyword",
-              3: "title.class",
-              6: "title.class.inherited",
-            }
-          },
-          {
-            className: 'meta',
-            begin: /^[\t ]*@/,
-            end: /(?=#)|$/,
-            contains: [
-              NUMBER,
-              PARAMS,
-              STRING
-            ]
-          }
-        ]
-      };
-    }
-
-    /*
-    Language: Python REPL
-    Requires: python.js
-    Author: Josh Goebel <hello@joshgoebel.com>
-    Category: common
-    */
-
-    function pythonRepl(hljs) {
-      return {
-        aliases: [ 'pycon' ],
-        contains: [
-          {
-            className: 'meta.prompt',
-            starts: {
-              // a space separates the REPL prefix from the actual code
-              // this is purely for cleaner HTML output
-              end: / |$/,
-              starts: {
-                end: '$',
-                subLanguage: 'python'
-              }
-            },
-            variants: [
-              { begin: /^>>>(?=[ ]|$)/ },
-              { begin: /^\.\.\.(?=[ ]|$)/ }
-            ]
-          }
-        ]
-      };
-    }
-
-    /*
-    Language: R
-    Description: R is a free software environment for statistical computing and graphics.
-    Author: Joe Cheng <joe@rstudio.org>
-    Contributors: Konrad Rudolph <konrad.rudolph@gmail.com>
-    Website: https://www.r-project.org
-    Category: common,scientific
-    */
-
-    /** @type LanguageFn */
-    function r(hljs) {
-      const regex = hljs.regex;
-      // Identifiers in R cannot start with `_`, but they can start with `.` if it
-      // is not immediately followed by a digit.
-      // R also supports quoted identifiers, which are near-arbitrary sequences
-      // delimited by backticks (`…`), which may contain escape sequences. These are
-      // handled in a separate mode. See `test/markup/r/names.txt` for examples.
-      // FIXME: Support Unicode identifiers.
-      const IDENT_RE = /(?:(?:[a-zA-Z]|\.[._a-zA-Z])[._a-zA-Z0-9]*)|\.(?!\d)/;
-      const NUMBER_TYPES_RE = regex.either(
-        // Special case: only hexadecimal binary powers can contain fractions
-        /0[xX][0-9a-fA-F]+\.[0-9a-fA-F]*[pP][+-]?\d+i?/,
-        // Hexadecimal numbers without fraction and optional binary power
-        /0[xX][0-9a-fA-F]+(?:[pP][+-]?\d+)?[Li]?/,
-        // Decimal numbers
-        /(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?[Li]?/
-      );
-      const OPERATORS_RE = /[=!<>:]=|\|\||&&|:::?|<-|<<-|->>|->|\|>|[-+*\/?!$&|:<=>@^~]|\*\*/;
-      const PUNCTUATION_RE = regex.either(
-        /[()]/,
-        /[{}]/,
-        /\[\[/,
-        /[[\]]/,
-        /\\/,
-        /,/
-      );
-
-      return {
-        name: 'R',
-
-        keywords: {
-          $pattern: IDENT_RE,
-          keyword:
-            'function if in break next repeat else for while',
-          literal:
-            'NULL NA TRUE FALSE Inf NaN NA_integer_|10 NA_real_|10 '
-            + 'NA_character_|10 NA_complex_|10',
-          built_in:
-            // Builtin constants
-            'LETTERS letters month.abb month.name pi T F '
-            // Primitive functions
-            // These are all the functions in `base` that are implemented as a
-            // `.Primitive`, minus those functions that are also keywords.
-            + 'abs acos acosh all any anyNA Arg as.call as.character '
-            + 'as.complex as.double as.environment as.integer as.logical '
-            + 'as.null.default as.numeric as.raw asin asinh atan atanh attr '
-            + 'attributes baseenv browser c call ceiling class Conj cos cosh '
-            + 'cospi cummax cummin cumprod cumsum digamma dim dimnames '
-            + 'emptyenv exp expression floor forceAndCall gamma gc.time '
-            + 'globalenv Im interactive invisible is.array is.atomic is.call '
-            + 'is.character is.complex is.double is.environment is.expression '
-            + 'is.finite is.function is.infinite is.integer is.language '
-            + 'is.list is.logical is.matrix is.na is.name is.nan is.null '
-            + 'is.numeric is.object is.pairlist is.raw is.recursive is.single '
-            + 'is.symbol lazyLoadDBfetch length lgamma list log max min '
-            + 'missing Mod names nargs nzchar oldClass on.exit pos.to.env '
-            + 'proc.time prod quote range Re rep retracemem return round '
-            + 'seq_along seq_len seq.int sign signif sin sinh sinpi sqrt '
-            + 'standardGeneric substitute sum switch tan tanh tanpi tracemem '
-            + 'trigamma trunc unclass untracemem UseMethod xtfrm',
-        },
-
-        contains: [
-          // Roxygen comments
-          hljs.COMMENT(
-            /#'/,
-            /$/,
-            { contains: [
-              {
-                // Handle `@examples` separately to cause all subsequent code
-                // until the next `@`-tag on its own line to be kept as-is,
-                // preventing highlighting. This code is example R code, so nested
-                // doctags shouldn’t be treated as such. See
-                // `test/markup/r/roxygen.txt` for an example.
-                scope: 'doctag',
-                match: /@examples/,
-                starts: {
-                  end: regex.lookahead(regex.either(
-                    // end if another doc comment
-                    /\n^#'\s*(?=@[a-zA-Z]+)/,
-                    // or a line with no comment
-                    /\n^(?!#')/
-                  )),
-                  endsParent: true
-                }
-              },
-              {
-                // Handle `@param` to highlight the parameter name following
-                // after.
-                scope: 'doctag',
-                begin: '@param',
-                end: /$/,
-                contains: [
-                  {
-                    scope: 'variable',
-                    variants: [
-                      { match: IDENT_RE },
-                      { match: /`(?:\\.|[^`\\])+`/ }
-                    ],
-                    endsParent: true
-                  }
-                ]
-              },
-              {
-                scope: 'doctag',
-                match: /@[a-zA-Z]+/
-              },
-              {
-                scope: 'keyword',
-                match: /\\[a-zA-Z]+/
-              }
-            ] }
-          ),
-
-          hljs.HASH_COMMENT_MODE,
-
-          {
-            scope: 'string',
-            contains: [ hljs.BACKSLASH_ESCAPE ],
-            variants: [
-              hljs.END_SAME_AS_BEGIN({
-                begin: /[rR]"(-*)\(/,
-                end: /\)(-*)"/
-              }),
-              hljs.END_SAME_AS_BEGIN({
-                begin: /[rR]"(-*)\{/,
-                end: /\}(-*)"/
-              }),
-              hljs.END_SAME_AS_BEGIN({
-                begin: /[rR]"(-*)\[/,
-                end: /\](-*)"/
-              }),
-              hljs.END_SAME_AS_BEGIN({
-                begin: /[rR]'(-*)\(/,
-                end: /\)(-*)'/
-              }),
-              hljs.END_SAME_AS_BEGIN({
-                begin: /[rR]'(-*)\{/,
-                end: /\}(-*)'/
-              }),
-              hljs.END_SAME_AS_BEGIN({
-                begin: /[rR]'(-*)\[/,
-                end: /\](-*)'/
-              }),
-              {
-                begin: '"',
-                end: '"',
-                relevance: 0
-              },
-              {
-                begin: "'",
-                end: "'",
-                relevance: 0
-              }
-            ],
-          },
-
-          // Matching numbers immediately following punctuation and operators is
-          // tricky since we need to look at the character ahead of a number to
-          // ensure the number is not part of an identifier, and we cannot use
-          // negative look-behind assertions. So instead we explicitly handle all
-          // possible combinations of (operator|punctuation), number.
-          // TODO: replace with negative look-behind when available
-          // { begin: /(?<![a-zA-Z0-9._])0[xX][0-9a-fA-F]+\.[0-9a-fA-F]*[pP][+-]?\d+i?/ },
-          // { begin: /(?<![a-zA-Z0-9._])0[xX][0-9a-fA-F]+([pP][+-]?\d+)?[Li]?/ },
-          // { begin: /(?<![a-zA-Z0-9._])(\d+(\.\d*)?|\.\d+)([eE][+-]?\d+)?[Li]?/ }
-          {
-            relevance: 0,
-            variants: [
-              {
-                scope: {
-                  1: 'operator',
-                  2: 'number'
-                },
-                match: [
-                  OPERATORS_RE,
-                  NUMBER_TYPES_RE
-                ]
-              },
-              {
-                scope: {
-                  1: 'operator',
-                  2: 'number'
-                },
-                match: [
-                  /%[^%]*%/,
-                  NUMBER_TYPES_RE
-                ]
-              },
-              {
-                scope: {
-                  1: 'punctuation',
-                  2: 'number'
-                },
-                match: [
-                  PUNCTUATION_RE,
-                  NUMBER_TYPES_RE
-                ]
-              },
-              {
-                scope: { 2: 'number' },
-                match: [
-                  /[^a-zA-Z0-9._]|^/, // not part of an identifier, or start of document
-                  NUMBER_TYPES_RE
-                ]
-              }
-            ]
-          },
-
-          // Operators/punctuation when they're not directly followed by numbers
-          {
-            // Relevance boost for the most common assignment form.
-            scope: { 3: 'operator' },
-            match: [
-              IDENT_RE,
-              /\s+/,
-              /<-/,
-              /\s+/
-            ]
-          },
-
-          {
-            scope: 'operator',
-            relevance: 0,
-            variants: [
-              { match: OPERATORS_RE },
-              { match: /%[^%]*%/ }
-            ]
-          },
-
-          {
-            scope: 'punctuation',
-            relevance: 0,
-            match: PUNCTUATION_RE
-          },
-
-          {
-            // Escaped identifier
-            begin: '`',
-            end: '`',
-            contains: [ { begin: /\\./ } ]
-          }
-        ]
-      };
-    }
-
-    /*
-    Language: Ruby
-    Description: Ruby is a dynamic, open source programming language with a focus on simplicity and productivity.
-    Website: https://www.ruby-lang.org/
-    Author: Anton Kovalyov <anton@kovalyov.net>
-    Contributors: Peter Leonov <gojpeg@yandex.ru>, Vasily Polovnyov <vast@whiteants.net>, Loren Segal <lsegal@soen.ca>, Pascal Hurni <phi@ruby-reactive.org>, Cedric Sohrauer <sohrauer@googlemail.com>
-    Category: common
-    */
-
-    function ruby(hljs) {
-      const regex = hljs.regex;
-      const RUBY_METHOD_RE = '([a-zA-Z_]\\w*[!?=]?|[-+~]@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?)';
-      // TODO: move concepts like CAMEL_CASE into `modes.js`
-      const CLASS_NAME_RE = regex.either(
-        /\b([A-Z]+[a-z0-9]+)+/,
-        // ends in caps
-        /\b([A-Z]+[a-z0-9]+)+[A-Z]+/,
-      )
-      ;
-      const CLASS_NAME_WITH_NAMESPACE_RE = regex.concat(CLASS_NAME_RE, /(::\w+)*/);
-      const RUBY_KEYWORDS = {
-        "variable.constant": [
-          "__FILE__",
-          "__LINE__"
-        ],
-        "variable.language": [
-          "self",
-          "super",
-        ],
-        keyword: [
-          "alias",
-          "and",
-          "attr_accessor",
-          "attr_reader",
-          "attr_writer",
-          "begin",
-          "BEGIN",
-          "break",
-          "case",
-          "class",
-          "defined",
-          "do",
-          "else",
-          "elsif",
-          "end",
-          "END",
-          "ensure",
-          "for",
-          "if",
-          "in",
-          "include",
-          "module",
-          "next",
-          "not",
-          "or",
-          "redo",
-          "require",
-          "rescue",
-          "retry",
-          "return",
-          "then",
-          "undef",
-          "unless",
-          "until",
-          "when",
-          "while",
-          "yield",
-        ],
-        built_in: [
-          "proc",
-          "lambda"
-        ],
-        literal: [
-          "true",
-          "false",
-          "nil"
-        ]
-      };
-      const YARDOCTAG = {
-        className: 'doctag',
-        begin: '@[A-Za-z]+'
-      };
-      const IRB_OBJECT = {
-        begin: '#<',
-        end: '>'
-      };
-      const COMMENT_MODES = [
-        hljs.COMMENT(
-          '#',
-          '$',
-          { contains: [ YARDOCTAG ] }
-        ),
-        hljs.COMMENT(
-          '^=begin',
-          '^=end',
-          {
-            contains: [ YARDOCTAG ],
-            relevance: 10
-          }
-        ),
-        hljs.COMMENT('^__END__', hljs.MATCH_NOTHING_RE)
-      ];
-      const SUBST = {
-        className: 'subst',
-        begin: /#\{/,
-        end: /\}/,
-        keywords: RUBY_KEYWORDS
-      };
-      const STRING = {
-        className: 'string',
-        contains: [
-          hljs.BACKSLASH_ESCAPE,
-          SUBST
-        ],
-        variants: [
-          {
-            begin: /'/,
-            end: /'/
-          },
-          {
-            begin: /"/,
-            end: /"/
-          },
-          {
-            begin: /`/,
-            end: /`/
-          },
-          {
-            begin: /%[qQwWx]?\(/,
-            end: /\)/
-          },
-          {
-            begin: /%[qQwWx]?\[/,
-            end: /\]/
-          },
-          {
-            begin: /%[qQwWx]?\{/,
-            end: /\}/
-          },
-          {
-            begin: /%[qQwWx]?</,
-            end: />/
-          },
-          {
-            begin: /%[qQwWx]?\//,
-            end: /\//
-          },
-          {
-            begin: /%[qQwWx]?%/,
-            end: /%/
-          },
-          {
-            begin: /%[qQwWx]?-/,
-            end: /-/
-          },
-          {
-            begin: /%[qQwWx]?\|/,
-            end: /\|/
-          },
-          // in the following expressions, \B in the beginning suppresses recognition of ?-sequences
-          // where ? is the last character of a preceding identifier, as in: `func?4`
-          { begin: /\B\?(\\\d{1,3})/ },
-          { begin: /\B\?(\\x[A-Fa-f0-9]{1,2})/ },
-          { begin: /\B\?(\\u\{?[A-Fa-f0-9]{1,6}\}?)/ },
-          { begin: /\B\?(\\M-\\C-|\\M-\\c|\\c\\M-|\\M-|\\C-\\M-)[\x20-\x7e]/ },
-          { begin: /\B\?\\(c|C-)[\x20-\x7e]/ },
-          { begin: /\B\?\\?\S/ },
-          // heredocs
-          {
-            // this guard makes sure that we have an entire heredoc and not a false
-            // positive (auto-detect, etc.)
-            begin: regex.concat(
-              /<<[-~]?'?/,
-              regex.lookahead(/(\w+)(?=\W)[^\n]*\n(?:[^\n]*\n)*?\s*\1\b/)
-            ),
-            contains: [
-              hljs.END_SAME_AS_BEGIN({
-                begin: /(\w+)/,
-                end: /(\w+)/,
-                contains: [
-                  hljs.BACKSLASH_ESCAPE,
-                  SUBST
-                ]
-              })
-            ]
-          }
-        ]
-      };
-
-      // Ruby syntax is underdocumented, but this grammar seems to be accurate
-      // as of version 2.7.2 (confirmed with (irb and `Ripper.sexp(...)`)
-      // https://docs.ruby-lang.org/en/2.7.0/doc/syntax/literals_rdoc.html#label-Numbers
-      const decimal = '[1-9](_?[0-9])*|0';
-      const digits = '[0-9](_?[0-9])*';
-      const NUMBER = {
-        className: 'number',
-        relevance: 0,
-        variants: [
-          // decimal integer/float, optionally exponential or rational, optionally imaginary
-          { begin: `\\b(${decimal})(\\.(${digits}))?([eE][+-]?(${digits})|r)?i?\\b` },
-
-          // explicit decimal/binary/octal/hexadecimal integer,
-          // optionally rational and/or imaginary
-          { begin: "\\b0[dD][0-9](_?[0-9])*r?i?\\b" },
-          { begin: "\\b0[bB][0-1](_?[0-1])*r?i?\\b" },
-          { begin: "\\b0[oO][0-7](_?[0-7])*r?i?\\b" },
-          { begin: "\\b0[xX][0-9a-fA-F](_?[0-9a-fA-F])*r?i?\\b" },
-
-          // 0-prefixed implicit octal integer, optionally rational and/or imaginary
-          { begin: "\\b0(_?[0-7])+r?i?\\b" }
-        ]
-      };
-
-      const PARAMS = {
-        variants: [
-          {
-            match: /\(\)/,
-          },
-          {
-            className: 'params',
-            begin: /\(/,
-            end: /(?=\))/,
-            excludeBegin: true,
-            endsParent: true,
-            keywords: RUBY_KEYWORDS,
-          }
-        ]
-      };
-
-      const CLASS_DEFINITION = {
-        variants: [
-          {
-            match: [
-              /class\s+/,
-              CLASS_NAME_WITH_NAMESPACE_RE,
-              /\s+<\s+/,
-              CLASS_NAME_WITH_NAMESPACE_RE
-            ]
-          },
-          {
-            match: [
-              /class\s+/,
-              CLASS_NAME_WITH_NAMESPACE_RE
-            ]
-          }
-        ],
-        scope: {
-          2: "title.class",
-          4: "title.class.inherited"
-        },
-        keywords: RUBY_KEYWORDS
-      };
-
-      const UPPER_CASE_CONSTANT = {
-        relevance: 0,
-        match: /\b[A-Z][A-Z_0-9]+\b/,
-        className: "variable.constant"
-      };
-
-      const METHOD_DEFINITION = {
-        match: [
-          /def/, /\s+/,
-          RUBY_METHOD_RE
-        ],
-        scope: {
-          1: "keyword",
-          3: "title.function"
-        },
-        contains: [
-          PARAMS
-        ]
-      };
-
-      const OBJECT_CREATION = {
-        relevance: 0,
-        match: [
-          CLASS_NAME_WITH_NAMESPACE_RE,
-          /\.new[ (]/
-        ],
-        scope: {
-          1: "title.class"
+        ...ATTRIBUTE_CONTAINS,
+        {
+          scope: 'meta',
+          match: PASCAL_CASE_CLASS_NAME_RE
         }
-      };
+      ]
+    };
 
-      const RUBY_DEFAULT_CONTAINS = [
-        STRING,
-        CLASS_DEFINITION,
-        OBJECT_CREATION,
-        UPPER_CASE_CONSTANT,
-        METHOD_DEFINITION,
-        {
-          // swallow namespace qualifiers before symbols
-          begin: hljs.IDENT_RE + '::' },
-        {
-          className: 'symbol',
-          begin: hljs.UNDERSCORE_IDENT_RE + '(!|\\?)?:',
-          relevance: 0
-        },
-        {
-          className: 'symbol',
-          begin: ':(?!\\s)',
-          contains: [
-            STRING,
-            { begin: RUBY_METHOD_RE }
-          ],
-          relevance: 0
-        },
-        NUMBER,
-        {
-          // negative-look forward attempts to prevent false matches like:
-          // @ident@ or $ident$ that might indicate this is not ruby at all
-          className: "variable",
-          begin: '(\\$\\W)|((\\$|@@?)(\\w+))(?=[^@$?])' + `(?![A-Za-z])(?![@$?'])`
-        },
-        {
-          className: 'params',
-          begin: /\|/,
-          end: /\|/,
-          excludeBegin: true,
-          excludeEnd: true,
-          relevance: 0, // this could be a lot of things (in other languages) other than params
-          keywords: RUBY_KEYWORDS
-        },
-        { // regexp container
-          begin: '(' + hljs.RE_STARTERS_RE + '|unless)\\s*',
-          keywords: 'unless',
-          contains: [
+    return {
+      case_insensitive: false,
+      keywords: KEYWORDS,
+      contains: [
+        ATTRIBUTES,
+        hljs.HASH_COMMENT_MODE,
+        hljs.COMMENT('//', '$'),
+        hljs.COMMENT(
+          '/\\*',
+          '\\*/',
+          { contains: [
             {
-              className: 'regexp',
-              contains: [
-                hljs.BACKSLASH_ESCAPE,
-                SUBST
-              ],
-              illegal: /\n/,
-              variants: [
-                {
-                  begin: '/',
-                  end: '/[a-z]*'
-                },
-                {
-                  begin: /%r\{/,
-                  end: /\}[a-z]*/
-                },
-                {
-                  begin: '%r\\(',
-                  end: '\\)[a-z]*'
-                },
-                {
-                  begin: '%r!',
-                  end: '![a-z]*'
-                },
-                {
-                  begin: '%r\\[',
-                  end: '\\][a-z]*'
-                }
-              ]
+              scope: 'doctag',
+              match: '@[A-Za-z]+'
             }
-          ].concat(IRB_OBJECT, COMMENT_MODES),
-          relevance: 0
-        }
-      ].concat(IRB_OBJECT, COMMENT_MODES);
-
-      SUBST.contains = RUBY_DEFAULT_CONTAINS;
-      PARAMS.contains = RUBY_DEFAULT_CONTAINS;
-
-      // >>
-      // ?>
-      const SIMPLE_PROMPT = "[>?]>";
-      // irb(main):001:0>
-      const DEFAULT_PROMPT = "[\\w#]+\\(\\w+\\):\\d+:\\d+[>*]";
-      const RVM_PROMPT = "(\\w+-)?\\d+\\.\\d+\\.\\d+(p\\d+)?[^\\d][^>]+>";
-
-      const IRB_DEFAULT = [
+          ] }
+        ),
         {
-          begin: /^\s*=>/,
+          match: /__halt_compiler\(\);/,
+          keywords: '__halt_compiler',
           starts: {
-            end: '$',
-            contains: RUBY_DEFAULT_CONTAINS
-          }
-        },
-        {
-          className: 'meta.prompt',
-          begin: '^(' + SIMPLE_PROMPT + "|" + DEFAULT_PROMPT + '|' + RVM_PROMPT + ')(?=[ ])',
-          starts: {
-            end: '$',
-            keywords: RUBY_KEYWORDS,
-            contains: RUBY_DEFAULT_CONTAINS
-          }
-        }
-      ];
-
-      COMMENT_MODES.unshift(IRB_OBJECT);
-
-      return {
-        name: 'Ruby',
-        aliases: [
-          'rb',
-          'gemspec',
-          'podspec',
-          'thor',
-          'irb'
-        ],
-        keywords: RUBY_KEYWORDS,
-        illegal: /\/\*/,
-        contains: [ hljs.SHEBANG({ binary: "ruby" }) ]
-          .concat(IRB_DEFAULT)
-          .concat(COMMENT_MODES)
-          .concat(RUBY_DEFAULT_CONTAINS)
-      };
-    }
-
-    /*
-    Language: Rust
-    Author: Andrey Vlasovskikh <andrey.vlasovskikh@gmail.com>
-    Contributors: Roman Shmatov <romanshmatov@gmail.com>, Kasper Andersen <kma_untrusted@protonmail.com>
-    Website: https://www.rust-lang.org
-    Category: common, system
-    */
-
-    /** @type LanguageFn */
-    function rust(hljs) {
-      const regex = hljs.regex;
-      const FUNCTION_INVOKE = {
-        className: "title.function.invoke",
-        relevance: 0,
-        begin: regex.concat(
-          /\b/,
-          /(?!let\b)/,
-          hljs.IDENT_RE,
-          regex.lookahead(/\s*\(/))
-      };
-      const NUMBER_SUFFIX = '([ui](8|16|32|64|128|size)|f(32|64))\?';
-      const KEYWORDS = [
-        "abstract",
-        "as",
-        "async",
-        "await",
-        "become",
-        "box",
-        "break",
-        "const",
-        "continue",
-        "crate",
-        "do",
-        "dyn",
-        "else",
-        "enum",
-        "extern",
-        "false",
-        "final",
-        "fn",
-        "for",
-        "if",
-        "impl",
-        "in",
-        "let",
-        "loop",
-        "macro",
-        "match",
-        "mod",
-        "move",
-        "mut",
-        "override",
-        "priv",
-        "pub",
-        "ref",
-        "return",
-        "self",
-        "Self",
-        "static",
-        "struct",
-        "super",
-        "trait",
-        "true",
-        "try",
-        "type",
-        "typeof",
-        "unsafe",
-        "unsized",
-        "use",
-        "virtual",
-        "where",
-        "while",
-        "yield"
-      ];
-      const LITERALS = [
-        "true",
-        "false",
-        "Some",
-        "None",
-        "Ok",
-        "Err"
-      ];
-      const BUILTINS = [
-        // functions
-        'drop ',
-        // traits
-        "Copy",
-        "Send",
-        "Sized",
-        "Sync",
-        "Drop",
-        "Fn",
-        "FnMut",
-        "FnOnce",
-        "ToOwned",
-        "Clone",
-        "Debug",
-        "PartialEq",
-        "PartialOrd",
-        "Eq",
-        "Ord",
-        "AsRef",
-        "AsMut",
-        "Into",
-        "From",
-        "Default",
-        "Iterator",
-        "Extend",
-        "IntoIterator",
-        "DoubleEndedIterator",
-        "ExactSizeIterator",
-        "SliceConcatExt",
-        "ToString",
-        // macros
-        "assert!",
-        "assert_eq!",
-        "bitflags!",
-        "bytes!",
-        "cfg!",
-        "col!",
-        "concat!",
-        "concat_idents!",
-        "debug_assert!",
-        "debug_assert_eq!",
-        "env!",
-        "panic!",
-        "file!",
-        "format!",
-        "format_args!",
-        "include_bytes!",
-        "include_str!",
-        "line!",
-        "local_data_key!",
-        "module_path!",
-        "option_env!",
-        "print!",
-        "println!",
-        "select!",
-        "stringify!",
-        "try!",
-        "unimplemented!",
-        "unreachable!",
-        "vec!",
-        "write!",
-        "writeln!",
-        "macro_rules!",
-        "assert_ne!",
-        "debug_assert_ne!"
-      ];
-      const TYPES = [
-        "i8",
-        "i16",
-        "i32",
-        "i64",
-        "i128",
-        "isize",
-        "u8",
-        "u16",
-        "u32",
-        "u64",
-        "u128",
-        "usize",
-        "f32",
-        "f64",
-        "str",
-        "char",
-        "bool",
-        "Box",
-        "Option",
-        "Result",
-        "String",
-        "Vec"
-      ];
-      return {
-        name: 'Rust',
-        aliases: [ 'rs' ],
-        keywords: {
-          $pattern: hljs.IDENT_RE + '!?',
-          type: TYPES,
-          keyword: KEYWORDS,
-          literal: LITERALS,
-          built_in: BUILTINS
-        },
-        illegal: '</',
-        contains: [
-          hljs.C_LINE_COMMENT_MODE,
-          hljs.COMMENT('/\\*', '\\*/', { contains: [ 'self' ] }),
-          hljs.inherit(hljs.QUOTE_STRING_MODE, {
-            begin: /b?"/,
-            illegal: null
-          }),
-          {
-            className: 'string',
-            variants: [
-              { begin: /b?r(#*)"(.|\n)*?"\1(?!#)/ },
-              { begin: /b?'\\?(x\w{2}|u\w{4}|U\w{8}|.)'/ }
-            ]
-          },
-          {
-            className: 'symbol',
-            begin: /'[a-zA-Z_][a-zA-Z0-9_]*/
-          },
-          {
-            className: 'number',
-            variants: [
-              { begin: '\\b0b([01_]+)' + NUMBER_SUFFIX },
-              { begin: '\\b0o([0-7_]+)' + NUMBER_SUFFIX },
-              { begin: '\\b0x([A-Fa-f0-9_]+)' + NUMBER_SUFFIX },
-              { begin: '\\b(\\d[\\d_]*(\\.[0-9_]+)?([eE][+-]?[0-9_]+)?)'
-                       + NUMBER_SUFFIX }
-            ],
-            relevance: 0
-          },
-          {
-            begin: [
-              /fn/,
-              /\s+/,
-              hljs.UNDERSCORE_IDENT_RE
-            ],
-            className: {
-              1: "keyword",
-              3: "title.function"
-            }
-          },
-          {
-            className: 'meta',
-            begin: '#!?\\[',
-            end: '\\]',
+            scope: "comment",
+            end: hljs.MATCH_NOTHING_RE,
             contains: [
               {
-                className: 'string',
-                begin: /"/,
-                end: /"/
+                match: /\?>/,
+                scope: "meta",
+                endsParent: true
               }
             ]
-          },
-          {
-            begin: [
-              /let/,
-              /\s+/,
-              /(?:mut\s+)?/,
-              hljs.UNDERSCORE_IDENT_RE
-            ],
-            className: {
-              1: "keyword",
-              3: "keyword",
-              4: "variable"
-            }
-          },
-          // must come before impl/for rule later
-          {
-            begin: [
-              /for/,
-              /\s+/,
-              hljs.UNDERSCORE_IDENT_RE,
-              /\s+/,
-              /in/
-            ],
-            className: {
-              1: "keyword",
-              3: "variable",
-              5: "keyword"
-            }
-          },
-          {
-            begin: [
-              /type/,
-              /\s+/,
-              hljs.UNDERSCORE_IDENT_RE
-            ],
-            className: {
-              1: "keyword",
-              3: "title.class"
-            }
-          },
-          {
-            begin: [
-              /(?:trait|enum|struct|union|impl|for)/,
-              /\s+/,
-              hljs.UNDERSCORE_IDENT_RE
-            ],
-            className: {
-              1: "keyword",
-              3: "title.class"
-            }
-          },
-          {
-            begin: hljs.IDENT_RE + '::',
-            keywords: {
-              keyword: "Self",
-              built_in: BUILTINS,
-              type: TYPES
-            }
-          },
-          {
-            className: "punctuation",
-            begin: '->'
-          },
-          FUNCTION_INVOKE
-        ]
-      };
-    }
-
-    /*
-    Language: SCSS
-    Description: Scss is an extension of the syntax of CSS.
-    Author: Kurt Emch <kurt@kurtemch.com>
-    Website: https://sass-lang.com
-    Category: common, css, web
-    */
-
-    /** @type LanguageFn */
-    function scss(hljs) {
-      const modes = MODES(hljs);
-      const PSEUDO_ELEMENTS$1 = PSEUDO_ELEMENTS;
-      const PSEUDO_CLASSES$1 = PSEUDO_CLASSES;
-
-      const AT_IDENTIFIER = '@[a-z-]+'; // @font-face
-      const AT_MODIFIERS = "and or not only";
-      const IDENT_RE = '[a-zA-Z-][a-zA-Z0-9_-]*';
-      const VARIABLE = {
-        className: 'variable',
-        begin: '(\\$' + IDENT_RE + ')\\b',
-        relevance: 0
-      };
-
-      return {
-        name: 'SCSS',
-        case_insensitive: true,
-        illegal: '[=/|\']',
-        contains: [
-          hljs.C_LINE_COMMENT_MODE,
-          hljs.C_BLOCK_COMMENT_MODE,
-          // to recognize keyframe 40% etc which are outside the scope of our
-          // attribute value mode
-          modes.CSS_NUMBER_MODE,
-          {
-            className: 'selector-id',
-            begin: '#[A-Za-z0-9_-]+',
-            relevance: 0
-          },
-          {
-            className: 'selector-class',
-            begin: '\\.[A-Za-z0-9_-]+',
-            relevance: 0
-          },
-          modes.ATTRIBUTE_SELECTOR_MODE,
-          {
-            className: 'selector-tag',
-            begin: '\\b(' + TAGS.join('|') + ')\\b',
-            // was there, before, but why?
-            relevance: 0
-          },
-          {
-            className: 'selector-pseudo',
-            begin: ':(' + PSEUDO_CLASSES$1.join('|') + ')'
-          },
-          {
-            className: 'selector-pseudo',
-            begin: ':(:)?(' + PSEUDO_ELEMENTS$1.join('|') + ')'
-          },
-          VARIABLE,
-          { // pseudo-selector params
-            begin: /\(/,
-            end: /\)/,
-            contains: [ modes.CSS_NUMBER_MODE ]
-          },
-          modes.CSS_VARIABLE,
-          {
-            className: 'attribute',
-            begin: '\\b(' + ATTRIBUTES.join('|') + ')\\b'
-          },
-          { begin: '\\b(whitespace|wait|w-resize|visible|vertical-text|vertical-ideographic|uppercase|upper-roman|upper-alpha|underline|transparent|top|thin|thick|text|text-top|text-bottom|tb-rl|table-header-group|table-footer-group|sw-resize|super|strict|static|square|solid|small-caps|separate|se-resize|scroll|s-resize|rtl|row-resize|ridge|right|repeat|repeat-y|repeat-x|relative|progress|pointer|overline|outside|outset|oblique|nowrap|not-allowed|normal|none|nw-resize|no-repeat|no-drop|newspaper|ne-resize|n-resize|move|middle|medium|ltr|lr-tb|lowercase|lower-roman|lower-alpha|loose|list-item|line|line-through|line-edge|lighter|left|keep-all|justify|italic|inter-word|inter-ideograph|inside|inset|inline|inline-block|inherit|inactive|ideograph-space|ideograph-parenthesis|ideograph-numeric|ideograph-alpha|horizontal|hidden|help|hand|groove|fixed|ellipsis|e-resize|double|dotted|distribute|distribute-space|distribute-letter|distribute-all-lines|disc|disabled|default|decimal|dashed|crosshair|collapse|col-resize|circle|char|center|capitalize|break-word|break-all|bottom|both|bolder|bold|block|bidi-override|below|baseline|auto|always|all-scroll|absolute|table|table-cell)\\b' },
-          {
-            begin: /:/,
-            end: /[;}{]/,
-            relevance: 0,
-            contains: [
-              modes.BLOCK_COMMENT,
-              VARIABLE,
-              modes.HEXCOLOR,
-              modes.CSS_NUMBER_MODE,
-              hljs.QUOTE_STRING_MODE,
-              hljs.APOS_STRING_MODE,
-              modes.IMPORTANT,
-              modes.FUNCTION_DISPATCH
-            ]
-          },
-          // matching these here allows us to treat them more like regular CSS
-          // rules so everything between the {} gets regular rule highlighting,
-          // which is what we want for page and font-face
-          {
-            begin: '@(page|font-face)',
-            keywords: {
-              $pattern: AT_IDENTIFIER,
-              keyword: '@page @font-face'
-            }
-          },
-          {
-            begin: '@',
-            end: '[{;]',
-            returnBegin: true,
-            keywords: {
-              $pattern: /[a-z-]+/,
-              keyword: AT_MODIFIERS,
-              attribute: MEDIA_FEATURES.join(" ")
-            },
-            contains: [
-              {
-                begin: AT_IDENTIFIER,
-                className: "keyword"
-              },
-              {
-                begin: /[a-z-]+(?=:)/,
-                className: "attribute"
-              },
-              VARIABLE,
-              hljs.QUOTE_STRING_MODE,
-              hljs.APOS_STRING_MODE,
-              modes.HEXCOLOR,
-              modes.CSS_NUMBER_MODE
-            ]
-          },
-          modes.FUNCTION_DISPATCH
-        ]
-      };
-    }
-
-    /*
-    Language: Shell Session
-    Requires: bash.js
-    Author: TSUYUSATO Kitsune <make.just.on@gmail.com>
-    Category: common
-    Audit: 2020
-    */
-
-    /** @type LanguageFn */
-    function shell(hljs) {
-      return {
-        name: 'Shell Session',
-        aliases: [
-          'console',
-          'shellsession'
-        ],
-        contains: [
-          {
-            className: 'meta.prompt',
-            // We cannot add \s (spaces) in the regular expression otherwise it will be too broad and produce unexpected result.
-            // For instance, in the following example, it would match "echo /path/to/home >" as a prompt:
-            // echo /path/to/home > t.exe
-            begin: /^\s{0,3}[/~\w\d[\]()@-]*[>%$#][ ]?/,
-            starts: {
-              end: /[^\\](?=\s*$)/,
-              subLanguage: 'bash'
-            }
           }
-        ]
-      };
-    }
-
-    /*
-     Language: SQL
-     Website: https://en.wikipedia.org/wiki/SQL
-     Category: common, database
-     */
-
-    /*
-
-    Goals:
-
-    SQL is intended to highlight basic/common SQL keywords and expressions
-
-    - If pretty much every single SQL server includes supports, then it's a canidate.
-    - It is NOT intended to include tons of vendor specific keywords (Oracle, MySQL,
-      PostgreSQL) although the list of data types is purposely a bit more expansive.
-    - For more specific SQL grammars please see:
-      - PostgreSQL and PL/pgSQL - core
-      - T-SQL - https://github.com/highlightjs/highlightjs-tsql
-      - sql_more (core)
-
-     */
-
-    function sql(hljs) {
-      const regex = hljs.regex;
-      const COMMENT_MODE = hljs.COMMENT('--', '$');
-      const STRING = {
-        className: 'string',
-        variants: [
-          {
-            begin: /'/,
-            end: /'/,
-            contains: [ { begin: /''/ } ]
-          }
-        ]
-      };
-      const QUOTED_IDENTIFIER = {
-        begin: /"/,
-        end: /"/,
-        contains: [ { begin: /""/ } ]
-      };
-
-      const LITERALS = [
-        "true",
-        "false",
-        // Not sure it's correct to call NULL literal, and clauses like IS [NOT] NULL look strange that way.
-        // "null",
-        "unknown"
-      ];
-
-      const MULTI_WORD_TYPES = [
-        "double precision",
-        "large object",
-        "with timezone",
-        "without timezone"
-      ];
-
-      const TYPES = [
-        'bigint',
-        'binary',
-        'blob',
-        'boolean',
-        'char',
-        'character',
-        'clob',
-        'date',
-        'dec',
-        'decfloat',
-        'decimal',
-        'float',
-        'int',
-        'integer',
-        'interval',
-        'nchar',
-        'nclob',
-        'national',
-        'numeric',
-        'real',
-        'row',
-        'smallint',
-        'time',
-        'timestamp',
-        'varchar',
-        'varying', // modifier (character varying)
-        'varbinary'
-      ];
-
-      const NON_RESERVED_WORDS = [
-        "add",
-        "asc",
-        "collation",
-        "desc",
-        "final",
-        "first",
-        "last",
-        "view"
-      ];
-
-      // https://jakewheat.github.io/sql-overview/sql-2016-foundation-grammar.html#reserved-word
-      const RESERVED_WORDS = [
-        "abs",
-        "acos",
-        "all",
-        "allocate",
-        "alter",
-        "and",
-        "any",
-        "are",
-        "array",
-        "array_agg",
-        "array_max_cardinality",
-        "as",
-        "asensitive",
-        "asin",
-        "asymmetric",
-        "at",
-        "atan",
-        "atomic",
-        "authorization",
-        "avg",
-        "begin",
-        "begin_frame",
-        "begin_partition",
-        "between",
-        "bigint",
-        "binary",
-        "blob",
-        "boolean",
-        "both",
-        "by",
-        "call",
-        "called",
-        "cardinality",
-        "cascaded",
-        "case",
-        "cast",
-        "ceil",
-        "ceiling",
-        "char",
-        "char_length",
-        "character",
-        "character_length",
-        "check",
-        "classifier",
-        "clob",
-        "close",
-        "coalesce",
-        "collate",
-        "collect",
-        "column",
-        "commit",
-        "condition",
-        "connect",
-        "constraint",
-        "contains",
-        "convert",
-        "copy",
-        "corr",
-        "corresponding",
-        "cos",
-        "cosh",
-        "count",
-        "covar_pop",
-        "covar_samp",
-        "create",
-        "cross",
-        "cube",
-        "cume_dist",
-        "current",
-        "current_catalog",
-        "current_date",
-        "current_default_transform_group",
-        "current_path",
-        "current_role",
-        "current_row",
-        "current_schema",
-        "current_time",
-        "current_timestamp",
-        "current_path",
-        "current_role",
-        "current_transform_group_for_type",
-        "current_user",
-        "cursor",
-        "cycle",
-        "date",
-        "day",
-        "deallocate",
-        "dec",
-        "decimal",
-        "decfloat",
-        "declare",
-        "default",
-        "define",
-        "delete",
-        "dense_rank",
-        "deref",
-        "describe",
-        "deterministic",
-        "disconnect",
-        "distinct",
-        "double",
-        "drop",
-        "dynamic",
-        "each",
-        "element",
-        "else",
-        "empty",
-        "end",
-        "end_frame",
-        "end_partition",
-        "end-exec",
-        "equals",
-        "escape",
-        "every",
-        "except",
-        "exec",
-        "execute",
-        "exists",
-        "exp",
-        "external",
-        "extract",
-        "false",
-        "fetch",
-        "filter",
-        "first_value",
-        "float",
-        "floor",
-        "for",
-        "foreign",
-        "frame_row",
-        "free",
-        "from",
-        "full",
-        "function",
-        "fusion",
-        "get",
-        "global",
-        "grant",
-        "group",
-        "grouping",
-        "groups",
-        "having",
-        "hold",
-        "hour",
-        "identity",
-        "in",
-        "indicator",
-        "initial",
-        "inner",
-        "inout",
-        "insensitive",
-        "insert",
-        "int",
-        "integer",
-        "intersect",
-        "intersection",
-        "interval",
-        "into",
-        "is",
-        "join",
-        "json_array",
-        "json_arrayagg",
-        "json_exists",
-        "json_object",
-        "json_objectagg",
-        "json_query",
-        "json_table",
-        "json_table_primitive",
-        "json_value",
-        "lag",
-        "language",
-        "large",
-        "last_value",
-        "lateral",
-        "lead",
-        "leading",
-        "left",
-        "like",
-        "like_regex",
-        "listagg",
-        "ln",
-        "local",
-        "localtime",
-        "localtimestamp",
-        "log",
-        "log10",
-        "lower",
-        "match",
-        "match_number",
-        "match_recognize",
-        "matches",
-        "max",
-        "member",
-        "merge",
-        "method",
-        "min",
-        "minute",
-        "mod",
-        "modifies",
-        "module",
-        "month",
-        "multiset",
-        "national",
-        "natural",
-        "nchar",
-        "nclob",
-        "new",
-        "no",
-        "none",
-        "normalize",
-        "not",
-        "nth_value",
-        "ntile",
-        "null",
-        "nullif",
-        "numeric",
-        "octet_length",
-        "occurrences_regex",
-        "of",
-        "offset",
-        "old",
-        "omit",
-        "on",
-        "one",
-        "only",
-        "open",
-        "or",
-        "order",
-        "out",
-        "outer",
-        "over",
-        "overlaps",
-        "overlay",
-        "parameter",
-        "partition",
-        "pattern",
-        "per",
-        "percent",
-        "percent_rank",
-        "percentile_cont",
-        "percentile_disc",
-        "period",
-        "portion",
-        "position",
-        "position_regex",
-        "power",
-        "precedes",
-        "precision",
-        "prepare",
-        "primary",
-        "procedure",
-        "ptf",
-        "range",
-        "rank",
-        "reads",
-        "real",
-        "recursive",
-        "ref",
-        "references",
-        "referencing",
-        "regr_avgx",
-        "regr_avgy",
-        "regr_count",
-        "regr_intercept",
-        "regr_r2",
-        "regr_slope",
-        "regr_sxx",
-        "regr_sxy",
-        "regr_syy",
-        "release",
-        "result",
-        "return",
-        "returns",
-        "revoke",
-        "right",
-        "rollback",
-        "rollup",
-        "row",
-        "row_number",
-        "rows",
-        "running",
-        "savepoint",
-        "scope",
-        "scroll",
-        "search",
-        "second",
-        "seek",
-        "select",
-        "sensitive",
-        "session_user",
-        "set",
-        "show",
-        "similar",
-        "sin",
-        "sinh",
-        "skip",
-        "smallint",
-        "some",
-        "specific",
-        "specifictype",
-        "sql",
-        "sqlexception",
-        "sqlstate",
-        "sqlwarning",
-        "sqrt",
-        "start",
-        "static",
-        "stddev_pop",
-        "stddev_samp",
-        "submultiset",
-        "subset",
-        "substring",
-        "substring_regex",
-        "succeeds",
-        "sum",
-        "symmetric",
-        "system",
-        "system_time",
-        "system_user",
-        "table",
-        "tablesample",
-        "tan",
-        "tanh",
-        "then",
-        "time",
-        "timestamp",
-        "timezone_hour",
-        "timezone_minute",
-        "to",
-        "trailing",
-        "translate",
-        "translate_regex",
-        "translation",
-        "treat",
-        "trigger",
-        "trim",
-        "trim_array",
-        "true",
-        "truncate",
-        "uescape",
-        "union",
-        "unique",
-        "unknown",
-        "unnest",
-        "update",
-        "upper",
-        "user",
-        "using",
-        "value",
-        "values",
-        "value_of",
-        "var_pop",
-        "var_samp",
-        "varbinary",
-        "varchar",
-        "varying",
-        "versioning",
-        "when",
-        "whenever",
-        "where",
-        "width_bucket",
-        "window",
-        "with",
-        "within",
-        "without",
-        "year",
-      ];
-
-      // these are reserved words we have identified to be functions
-      // and should only be highlighted in a dispatch-like context
-      // ie, array_agg(...), etc.
-      const RESERVED_FUNCTIONS = [
-        "abs",
-        "acos",
-        "array_agg",
-        "asin",
-        "atan",
-        "avg",
-        "cast",
-        "ceil",
-        "ceiling",
-        "coalesce",
-        "corr",
-        "cos",
-        "cosh",
-        "count",
-        "covar_pop",
-        "covar_samp",
-        "cume_dist",
-        "dense_rank",
-        "deref",
-        "element",
-        "exp",
-        "extract",
-        "first_value",
-        "floor",
-        "json_array",
-        "json_arrayagg",
-        "json_exists",
-        "json_object",
-        "json_objectagg",
-        "json_query",
-        "json_table",
-        "json_table_primitive",
-        "json_value",
-        "lag",
-        "last_value",
-        "lead",
-        "listagg",
-        "ln",
-        "log",
-        "log10",
-        "lower",
-        "max",
-        "min",
-        "mod",
-        "nth_value",
-        "ntile",
-        "nullif",
-        "percent_rank",
-        "percentile_cont",
-        "percentile_disc",
-        "position",
-        "position_regex",
-        "power",
-        "rank",
-        "regr_avgx",
-        "regr_avgy",
-        "regr_count",
-        "regr_intercept",
-        "regr_r2",
-        "regr_slope",
-        "regr_sxx",
-        "regr_sxy",
-        "regr_syy",
-        "row_number",
-        "sin",
-        "sinh",
-        "sqrt",
-        "stddev_pop",
-        "stddev_samp",
-        "substring",
-        "substring_regex",
-        "sum",
-        "tan",
-        "tanh",
-        "translate",
-        "translate_regex",
-        "treat",
-        "trim",
-        "trim_array",
-        "unnest",
-        "upper",
-        "value_of",
-        "var_pop",
-        "var_samp",
-        "width_bucket",
-      ];
-
-      // these functions can
-      const POSSIBLE_WITHOUT_PARENS = [
-        "current_catalog",
-        "current_date",
-        "current_default_transform_group",
-        "current_path",
-        "current_role",
-        "current_schema",
-        "current_transform_group_for_type",
-        "current_user",
-        "session_user",
-        "system_time",
-        "system_user",
-        "current_time",
-        "localtime",
-        "current_timestamp",
-        "localtimestamp"
-      ];
-
-      // those exist to boost relevance making these very
-      // "SQL like" keyword combos worth +1 extra relevance
-      const COMBOS = [
-        "create table",
-        "insert into",
-        "primary key",
-        "foreign key",
-        "not null",
-        "alter table",
-        "add constraint",
-        "grouping sets",
-        "on overflow",
-        "character set",
-        "respect nulls",
-        "ignore nulls",
-        "nulls first",
-        "nulls last",
-        "depth first",
-        "breadth first"
-      ];
-
-      const FUNCTIONS = RESERVED_FUNCTIONS;
-
-      const KEYWORDS = [
-        ...RESERVED_WORDS,
-        ...NON_RESERVED_WORDS
-      ].filter((keyword) => {
-        return !RESERVED_FUNCTIONS.includes(keyword);
-      });
-
-      const VARIABLE = {
-        className: "variable",
-        begin: /@[a-z0-9]+/,
-      };
-
-      const OPERATOR = {
-        className: "operator",
-        begin: /[-+*/=%^~]|&&?|\|\|?|!=?|<(?:=>?|<|>)?|>[>=]?/,
-        relevance: 0,
-      };
-
-      const FUNCTION_CALL = {
-        begin: regex.concat(/\b/, regex.either(...FUNCTIONS), /\s*\(/),
-        relevance: 0,
-        keywords: { built_in: FUNCTIONS }
-      };
-
-      // keywords with less than 3 letters are reduced in relevancy
-      function reduceRelevancy(list, {
-        exceptions, when
-      } = {}) {
-        const qualifyFn = when;
-        exceptions = exceptions || [];
-        return list.map((item) => {
-          if (item.match(/\|\d+$/) || exceptions.includes(item)) {
-            return item;
-          } else if (qualifyFn(item)) {
-            return `${item}|0`;
-          } else {
-            return item;
-          }
-        });
-      }
-
-      return {
-        name: 'SQL',
-        case_insensitive: true,
-        // does not include {} or HTML tags `</`
-        illegal: /[{}]|<\//,
-        keywords: {
-          $pattern: /\b[\w\.]+/,
-          keyword:
-            reduceRelevancy(KEYWORDS, { when: (x) => x.length < 3 }),
-          literal: LITERALS,
-          type: TYPES,
-          built_in: POSSIBLE_WITHOUT_PARENS
         },
-        contains: [
-          {
-            begin: regex.either(...COMBOS),
-            relevance: 0,
-            keywords: {
-              $pattern: /[\w\.]+/,
-              keyword: KEYWORDS.concat(COMBOS),
-              literal: LITERALS,
-              type: TYPES
+        PREPROCESSOR,
+        {
+          scope: 'variable.language',
+          match: /\$this\b/
+        },
+        VARIABLE,
+        FUNCTION_INVOKE,
+        LEFT_AND_RIGHT_SIDE_OF_DOUBLE_COLON,
+        {
+          match: [
+            /const/,
+            /\s/,
+            IDENT_RE,
+          ],
+          scope: {
+            1: "keyword",
+            3: "variable.constant",
+          },
+        },
+        CONSTRUCTOR_CALL,
+        {
+          scope: 'function',
+          relevance: 0,
+          beginKeywords: 'fn function',
+          end: /[;{]/,
+          excludeEnd: true,
+          illegal: '[$%\\[]',
+          contains: [
+            { beginKeywords: 'use', },
+            hljs.UNDERSCORE_TITLE_MODE,
+            {
+              begin: '=>', // No markup, just a relevance booster
+              endsParent: true
             },
-          },
-          {
-            className: "type",
-            begin: regex.either(...MULTI_WORD_TYPES)
-          },
-          FUNCTION_CALL,
-          VARIABLE,
-          STRING,
-          QUOTED_IDENTIFIER,
-          hljs.C_NUMBER_MODE,
-          hljs.C_BLOCK_COMMENT_MODE,
-          COMMENT_MODE,
-          OPERATOR
-        ]
-      };
-    }
+            {
+              scope: 'params',
+              begin: '\\(',
+              end: '\\)',
+              excludeBegin: true,
+              excludeEnd: true,
+              keywords: KEYWORDS,
+              contains: [
+                'self',
+                VARIABLE,
+                LEFT_AND_RIGHT_SIDE_OF_DOUBLE_COLON,
+                hljs.C_BLOCK_COMMENT_MODE,
+                STRING,
+                NUMBER
+              ]
+            },
+          ]
+        },
+        {
+          scope: 'class',
+          variants: [
+            {
+              beginKeywords: "enum",
+              illegal: /[($"]/
+            },
+            {
+              beginKeywords: "class interface trait",
+              illegal: /[:($"]/
+            }
+          ],
+          relevance: 0,
+          end: /\{/,
+          excludeEnd: true,
+          contains: [
+            { beginKeywords: 'extends implements' },
+            hljs.UNDERSCORE_TITLE_MODE
+          ]
+        },
+        // both use and namespace still use "old style" rules (vs multi-match)
+        // because the namespace name can include `\` and we still want each
+        // element to be treated as its own *individual* title
+        {
+          beginKeywords: 'namespace',
+          relevance: 0,
+          end: ';',
+          illegal: /[.']/,
+          contains: [ hljs.inherit(hljs.UNDERSCORE_TITLE_MODE, { scope: "title.class" }) ]
+        },
+        {
+          beginKeywords: 'use',
+          relevance: 0,
+          end: ';',
+          contains: [
+            // TODO: title.function vs title.class
+            {
+              match: /\b(as|const|function)\b/,
+              scope: "keyword"
+            },
+            // TODO: could be title.class or title.function
+            hljs.UNDERSCORE_TITLE_MODE
+          ]
+        },
+        STRING,
+        NUMBER,
+      ]
+    };
+  }
 
-    const keywordWrapper = keyword => concat(
-      /\b/,
-      keyword,
-      /\w$/.test(keyword) ? /\b/ : /\B/
-    );
+  /*
+  Language: PHP Template
+  Requires: xml.js, php.js
+  Author: Josh Goebel <hello@joshgoebel.com>
+  Website: https://www.php.net
+  Category: common
+  */
 
-    // Keywords that require a leading dot.
-    const dotKeywords = [
-      'Protocol', // contextual
-      'Type' // contextual
-    ].map(keywordWrapper);
+  function phpTemplate(hljs) {
+    return {
+      name: "PHP template",
+      subLanguage: 'xml',
+      contains: [
+        {
+          begin: /<\?(php|=)?/,
+          end: /\?>/,
+          subLanguage: 'php',
+          contains: [
+            // We don't want the php closing tag ?> to close the PHP block when
+            // inside any of the following blocks:
+            {
+              begin: '/\\*',
+              end: '\\*/',
+              skip: true
+            },
+            {
+              begin: 'b"',
+              end: '"',
+              skip: true
+            },
+            {
+              begin: 'b\'',
+              end: '\'',
+              skip: true
+            },
+            hljs.inherit(hljs.APOS_STRING_MODE, {
+              illegal: null,
+              className: null,
+              contains: null,
+              skip: true
+            }),
+            hljs.inherit(hljs.QUOTE_STRING_MODE, {
+              illegal: null,
+              className: null,
+              contains: null,
+              skip: true
+            })
+          ]
+        }
+      ]
+    };
+  }
 
-    // Keywords that may have a leading dot.
-    const optionalDotKeywords = [
-      'init',
-      'self'
-    ].map(keywordWrapper);
+  /*
+  Language: Plain text
+  Author: Egor Rogov (e.rogov@postgrespro.ru)
+  Description: Plain text without any highlighting.
+  Category: common
+  */
 
-    // should register as keyword, not type
-    const keywordTypes = [
-      'Any',
-      'Self'
-    ];
+  function plaintext(hljs) {
+    return {
+      name: 'Plain text',
+      aliases: [
+        'text',
+        'txt'
+      ],
+      disableAutodetect: true
+    };
+  }
 
-    // Regular keywords and literals.
-    const keywords = [
-      // strings below will be fed into the regular `keywords` engine while regex
-      // will result in additional modes being created to scan for those keywords to
-      // avoid conflicts with other rules
-      'actor',
-      'any', // contextual
-      'associatedtype',
+  /*
+  Language: Python
+  Description: Python is an interpreted, object-oriented, high-level programming language with dynamic semantics.
+  Website: https://www.python.org
+  Category: common
+  */
+
+  function python(hljs) {
+    const regex = hljs.regex;
+    const IDENT_RE = /[\p{XID_Start}_]\p{XID_Continue}*/u;
+    const RESERVED_WORDS = [
+      'and',
+      'as',
+      'assert',
       'async',
       'await',
-      /as\?/, // operator
-      /as!/, // operator
-      'as', // operator
       'break',
       'case',
-      'catch',
       'class',
       'continue',
-      'convenience', // contextual
-      'default',
-      'defer',
-      'deinit',
-      'didSet', // contextual
-      'distributed',
-      'do',
-      'dynamic', // contextual
+      'def',
+      'del',
+      'elif',
       'else',
-      'enum',
-      'extension',
-      'fallthrough',
-      /fileprivate\(set\)/,
-      'fileprivate',
-      'final', // contextual
+      'except',
+      'finally',
       'for',
-      'func',
-      'get', // contextual
-      'guard',
+      'from',
+      'global',
       'if',
       'import',
-      'indirect', // contextual
-      'infix', // contextual
-      /init\?/,
-      /init!/,
-      'inout',
-      /internal\(set\)/,
-      'internal',
       'in',
-      'is', // operator
-      'isolated', // contextual
-      'nonisolated', // contextual
-      'lazy', // contextual
-      'let',
-      'mutating', // contextual
-      'nonmutating', // contextual
-      /open\(set\)/, // contextual
-      'open', // contextual
-      'operator',
-      'optional', // contextual
-      'override', // contextual
-      'postfix', // contextual
-      'precedencegroup',
-      'prefix', // contextual
-      /private\(set\)/,
-      'private',
-      'protocol',
-      /public\(set\)/,
-      'public',
-      'repeat',
-      'required', // contextual
-      'rethrows',
+      'is',
+      'lambda',
+      'match',
+      'nonlocal|10',
+      'not',
+      'or',
+      'pass',
+      'raise',
       'return',
-      'set', // contextual
-      'some', // contextual
-      'static',
-      'struct',
-      'subscript',
-      'super',
-      'switch',
-      'throws',
-      'throw',
-      /try\?/, // operator
-      /try!/, // operator
-      'try', // operator
-      'typealias',
-      /unowned\(safe\)/, // contextual
-      /unowned\(unsafe\)/, // contextual
-      'unowned', // contextual
-      'var',
-      'weak', // contextual
-      'where',
+      'try',
       'while',
-      'willSet' // contextual
+      'with',
+      'yield'
     ];
 
-    // NOTE: Contextual keywords are reserved only in specific contexts.
-    // Ideally, these should be matched using modes to avoid false positives.
-
-    // Literals.
-    const literals = [
-      'false',
-      'nil',
-      'true'
-    ];
-
-    // Keywords used in precedence groups.
-    const precedencegroupKeywords = [
-      'assignment',
-      'associativity',
-      'higherThan',
-      'left',
-      'lowerThan',
-      'none',
-      'right'
-    ];
-
-    // Keywords that start with a number sign (#).
-    // #(un)available is handled separately.
-    const numberSignKeywords = [
-      '#colorLiteral',
-      '#column',
-      '#dsohandle',
-      '#else',
-      '#elseif',
-      '#endif',
-      '#error',
-      '#file',
-      '#fileID',
-      '#fileLiteral',
-      '#filePath',
-      '#function',
-      '#if',
-      '#imageLiteral',
-      '#keyPath',
-      '#line',
-      '#selector',
-      '#sourceLocation',
-      '#warn_unqualified_access',
-      '#warning'
-    ];
-
-    // Global functions in the Standard Library.
-    const builtIns$1 = [
+    const BUILT_INS = [
+      '__import__',
       'abs',
       'all',
       'any',
-      'assert',
-      'assertionFailure',
-      'debugPrint',
-      'dump',
-      'fatalError',
-      'getVaList',
-      'isKnownUniquelyReferenced',
+      'ascii',
+      'bin',
+      'bool',
+      'breakpoint',
+      'bytearray',
+      'bytes',
+      'callable',
+      'chr',
+      'classmethod',
+      'compile',
+      'complex',
+      'delattr',
+      'dict',
+      'dir',
+      'divmod',
+      'enumerate',
+      'eval',
+      'exec',
+      'filter',
+      'float',
+      'format',
+      'frozenset',
+      'getattr',
+      'globals',
+      'hasattr',
+      'hash',
+      'help',
+      'hex',
+      'id',
+      'input',
+      'int',
+      'isinstance',
+      'issubclass',
+      'iter',
+      'len',
+      'list',
+      'locals',
+      'map',
       'max',
+      'memoryview',
       'min',
-      'numericCast',
-      'pointwiseMax',
-      'pointwiseMin',
-      'precondition',
-      'preconditionFailure',
+      'next',
+      'object',
+      'oct',
+      'open',
+      'ord',
+      'pow',
       'print',
-      'readLine',
-      'repeatElement',
-      'sequence',
-      'stride',
-      'swap',
-      'swift_unboxFromSwiftValueWithType',
-      'transcode',
+      'property',
+      'range',
+      'repr',
+      'reversed',
+      'round',
+      'set',
+      'setattr',
+      'slice',
+      'sorted',
+      'staticmethod',
+      'str',
+      'sum',
+      'super',
+      'tuple',
       'type',
-      'unsafeBitCast',
-      'unsafeDowncast',
-      'withExtendedLifetime',
-      'withUnsafeMutablePointer',
-      'withUnsafePointer',
-      'withVaList',
-      'withoutActuallyEscaping',
+      'vars',
       'zip'
     ];
 
-    // Valid first characters for operators.
-    const operatorHead = either(
-      /[/=\-+!*%<>&|^~?]/,
-      /[\u00A1-\u00A7]/,
-      /[\u00A9\u00AB]/,
-      /[\u00AC\u00AE]/,
-      /[\u00B0\u00B1]/,
-      /[\u00B6\u00BB\u00BF\u00D7\u00F7]/,
-      /[\u2016-\u2017]/,
-      /[\u2020-\u2027]/,
-      /[\u2030-\u203E]/,
-      /[\u2041-\u2053]/,
-      /[\u2055-\u205E]/,
-      /[\u2190-\u23FF]/,
-      /[\u2500-\u2775]/,
-      /[\u2794-\u2BFF]/,
-      /[\u2E00-\u2E7F]/,
-      /[\u3001-\u3003]/,
-      /[\u3008-\u3020]/,
-      /[\u3030]/
-    );
-
-    // Valid characters for operators.
-    const operatorCharacter = either(
-      operatorHead,
-      /[\u0300-\u036F]/,
-      /[\u1DC0-\u1DFF]/,
-      /[\u20D0-\u20FF]/,
-      /[\uFE00-\uFE0F]/,
-      /[\uFE20-\uFE2F]/
-      // TODO: The following characters are also allowed, but the regex isn't supported yet.
-      // /[\u{E0100}-\u{E01EF}]/u
-    );
-
-    // Valid operator.
-    const operator = concat(operatorHead, operatorCharacter, '*');
-
-    // Valid first characters for identifiers.
-    const identifierHead = either(
-      /[a-zA-Z_]/,
-      /[\u00A8\u00AA\u00AD\u00AF\u00B2-\u00B5\u00B7-\u00BA]/,
-      /[\u00BC-\u00BE\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF]/,
-      /[\u0100-\u02FF\u0370-\u167F\u1681-\u180D\u180F-\u1DBF]/,
-      /[\u1E00-\u1FFF]/,
-      /[\u200B-\u200D\u202A-\u202E\u203F-\u2040\u2054\u2060-\u206F]/,
-      /[\u2070-\u20CF\u2100-\u218F\u2460-\u24FF\u2776-\u2793]/,
-      /[\u2C00-\u2DFF\u2E80-\u2FFF]/,
-      /[\u3004-\u3007\u3021-\u302F\u3031-\u303F\u3040-\uD7FF]/,
-      /[\uF900-\uFD3D\uFD40-\uFDCF\uFDF0-\uFE1F\uFE30-\uFE44]/,
-      /[\uFE47-\uFEFE\uFF00-\uFFFD]/ // Should be /[\uFE47-\uFFFD]/, but we have to exclude FEFF.
-      // The following characters are also allowed, but the regexes aren't supported yet.
-      // /[\u{10000}-\u{1FFFD}\u{20000-\u{2FFFD}\u{30000}-\u{3FFFD}\u{40000}-\u{4FFFD}]/u,
-      // /[\u{50000}-\u{5FFFD}\u{60000-\u{6FFFD}\u{70000}-\u{7FFFD}\u{80000}-\u{8FFFD}]/u,
-      // /[\u{90000}-\u{9FFFD}\u{A0000-\u{AFFFD}\u{B0000}-\u{BFFFD}\u{C0000}-\u{CFFFD}]/u,
-      // /[\u{D0000}-\u{DFFFD}\u{E0000-\u{EFFFD}]/u
-    );
-
-    // Valid characters for identifiers.
-    const identifierCharacter = either(
-      identifierHead,
-      /\d/,
-      /[\u0300-\u036F\u1DC0-\u1DFF\u20D0-\u20FF\uFE20-\uFE2F]/
-    );
-
-    // Valid identifier.
-    const identifier = concat(identifierHead, identifierCharacter, '*');
-
-    // Valid type identifier.
-    const typeIdentifier = concat(/[A-Z]/, identifierCharacter, '*');
-
-    // Built-in attributes, which are highlighted as keywords.
-    // @available is handled separately.
-    const keywordAttributes = [
-      'autoclosure',
-      concat(/convention\(/, either('swift', 'block', 'c'), /\)/),
-      'discardableResult',
-      'dynamicCallable',
-      'dynamicMemberLookup',
-      'escaping',
-      'frozen',
-      'GKInspectable',
-      'IBAction',
-      'IBDesignable',
-      'IBInspectable',
-      'IBOutlet',
-      'IBSegueAction',
-      'inlinable',
-      'main',
-      'nonobjc',
-      'NSApplicationMain',
-      'NSCopying',
-      'NSManaged',
-      concat(/objc\(/, identifier, /\)/),
-      'objc',
-      'objcMembers',
-      'propertyWrapper',
-      'requires_stored_property_inits',
-      'resultBuilder',
-      'testable',
-      'UIApplicationMain',
-      'unknown',
-      'usableFromInline'
+    const LITERALS = [
+      '__debug__',
+      'Ellipsis',
+      'False',
+      'None',
+      'NotImplemented',
+      'True'
     ];
 
-    // Contextual keywords used in @available and #(un)available.
-    const availabilityKeywords = [
-      'iOS',
-      'iOSApplicationExtension',
-      'macOS',
-      'macOSApplicationExtension',
-      'macCatalyst',
-      'macCatalystApplicationExtension',
-      'watchOS',
-      'watchOSApplicationExtension',
-      'tvOS',
-      'tvOSApplicationExtension',
-      'swift'
+    // https://docs.python.org/3/library/typing.html
+    // TODO: Could these be supplemented by a CamelCase matcher in certain
+    // contexts, leaving these remaining only for relevance hinting?
+    const TYPES = [
+      "Any",
+      "Callable",
+      "Coroutine",
+      "Dict",
+      "List",
+      "Literal",
+      "Generic",
+      "Optional",
+      "Sequence",
+      "Set",
+      "Tuple",
+      "Type",
+      "Union"
     ];
 
-    /*
-    Language: Swift
-    Description: Swift is a general-purpose programming language built using a modern approach to safety, performance, and software design patterns.
-    Author: Steven Van Impe <steven.vanimpe@icloud.com>
-    Contributors: Chris Eidhof <chris@eidhof.nl>, Nate Cook <natecook@gmail.com>, Alexander Lichter <manniL@gmx.net>, Richard Gibson <gibson042@github>
-    Website: https://swift.org
-    Category: common, system
-    */
+    const KEYWORDS = {
+      $pattern: /[A-Za-z]\w+|__\w+__/,
+      keyword: RESERVED_WORDS,
+      built_in: BUILT_INS,
+      literal: LITERALS,
+      type: TYPES
+    };
 
-    /** @type LanguageFn */
-    function swift(hljs) {
-      const WHITESPACE = {
-        match: /\s+/,
-        relevance: 0
-      };
-      // https://docs.swift.org/swift-book/ReferenceManual/LexicalStructure.html#ID411
-      const BLOCK_COMMENT = hljs.COMMENT(
-        '/\\*',
-        '\\*/',
-        { contains: [ 'self' ] }
-      );
-      const COMMENTS = [
-        hljs.C_LINE_COMMENT_MODE,
-        BLOCK_COMMENT
-      ];
+    const PROMPT = {
+      className: 'meta',
+      begin: /^(>>>|\.\.\.) /
+    };
 
-      // https://docs.swift.org/swift-book/ReferenceManual/LexicalStructure.html#ID413
-      // https://docs.swift.org/swift-book/ReferenceManual/zzSummaryOfTheGrammar.html
-      const DOT_KEYWORD = {
-        match: [
-          /\./,
-          either(...dotKeywords, ...optionalDotKeywords)
-        ],
-        className: { 2: "keyword" }
-      };
-      const KEYWORD_GUARD = {
-        // Consume .keyword to prevent highlighting properties and methods as keywords.
-        match: concat(/\./, either(...keywords)),
-        relevance: 0
-      };
-      const PLAIN_KEYWORDS = keywords
-        .filter(kw => typeof kw === 'string')
-        .concat([ "_|0" ]); // seems common, so 0 relevance
-      const REGEX_KEYWORDS = keywords
-        .filter(kw => typeof kw !== 'string') // find regex
-        .concat(keywordTypes)
-        .map(keywordWrapper);
-      const KEYWORD = { variants: [
+    const SUBST = {
+      className: 'subst',
+      begin: /\{/,
+      end: /\}/,
+      keywords: KEYWORDS,
+      illegal: /#/
+    };
+
+    const LITERAL_BRACKET = {
+      begin: /\{\{/,
+      relevance: 0
+    };
+
+    const STRING = {
+      className: 'string',
+      contains: [ hljs.BACKSLASH_ESCAPE ],
+      variants: [
         {
-          className: 'keyword',
-          match: either(...REGEX_KEYWORDS, ...optionalDotKeywords)
+          begin: /([uU]|[bB]|[rR]|[bB][rR]|[rR][bB])?'''/,
+          end: /'''/,
+          contains: [
+            hljs.BACKSLASH_ESCAPE,
+            PROMPT
+          ],
+          relevance: 10
+        },
+        {
+          begin: /([uU]|[bB]|[rR]|[bB][rR]|[rR][bB])?"""/,
+          end: /"""/,
+          contains: [
+            hljs.BACKSLASH_ESCAPE,
+            PROMPT
+          ],
+          relevance: 10
+        },
+        {
+          begin: /([fF][rR]|[rR][fF]|[fF])'''/,
+          end: /'''/,
+          contains: [
+            hljs.BACKSLASH_ESCAPE,
+            PROMPT,
+            LITERAL_BRACKET,
+            SUBST
+          ]
+        },
+        {
+          begin: /([fF][rR]|[rR][fF]|[fF])"""/,
+          end: /"""/,
+          contains: [
+            hljs.BACKSLASH_ESCAPE,
+            PROMPT,
+            LITERAL_BRACKET,
+            SUBST
+          ]
+        },
+        {
+          begin: /([uU]|[rR])'/,
+          end: /'/,
+          relevance: 10
+        },
+        {
+          begin: /([uU]|[rR])"/,
+          end: /"/,
+          relevance: 10
+        },
+        {
+          begin: /([bB]|[bB][rR]|[rR][bB])'/,
+          end: /'/
+        },
+        {
+          begin: /([bB]|[bB][rR]|[rR][bB])"/,
+          end: /"/
+        },
+        {
+          begin: /([fF][rR]|[rR][fF]|[fF])'/,
+          end: /'/,
+          contains: [
+            hljs.BACKSLASH_ESCAPE,
+            LITERAL_BRACKET,
+            SUBST
+          ]
+        },
+        {
+          begin: /([fF][rR]|[rR][fF]|[fF])"/,
+          end: /"/,
+          contains: [
+            hljs.BACKSLASH_ESCAPE,
+            LITERAL_BRACKET,
+            SUBST
+          ]
+        },
+        hljs.APOS_STRING_MODE,
+        hljs.QUOTE_STRING_MODE
+      ]
+    };
+
+    // https://docs.python.org/3.9/reference/lexical_analysis.html#numeric-literals
+    const digitpart = '[0-9](_?[0-9])*';
+    const pointfloat = `(\\b(${digitpart}))?\\.(${digitpart})|\\b(${digitpart})\\.`;
+    // Whitespace after a number (or any lexical token) is needed only if its absence
+    // would change the tokenization
+    // https://docs.python.org/3.9/reference/lexical_analysis.html#whitespace-between-tokens
+    // We deviate slightly, requiring a word boundary or a keyword
+    // to avoid accidentally recognizing *prefixes* (e.g., `0` in `0x41` or `08` or `0__1`)
+    const lookahead = `\\b|${RESERVED_WORDS.join('|')}`;
+    const NUMBER = {
+      className: 'number',
+      relevance: 0,
+      variants: [
+        // exponentfloat, pointfloat
+        // https://docs.python.org/3.9/reference/lexical_analysis.html#floating-point-literals
+        // optionally imaginary
+        // https://docs.python.org/3.9/reference/lexical_analysis.html#imaginary-literals
+        // Note: no leading \b because floats can start with a decimal point
+        // and we don't want to mishandle e.g. `fn(.5)`,
+        // no trailing \b for pointfloat because it can end with a decimal point
+        // and we don't want to mishandle e.g. `0..hex()`; this should be safe
+        // because both MUST contain a decimal point and so cannot be confused with
+        // the interior part of an identifier
+        {
+          begin: `(\\b(${digitpart})|(${pointfloat}))[eE][+-]?(${digitpart})[jJ]?(?=${lookahead})`
+        },
+        {
+          begin: `(${pointfloat})[jJ]?`
+        },
+
+        // decinteger, bininteger, octinteger, hexinteger
+        // https://docs.python.org/3.9/reference/lexical_analysis.html#integer-literals
+        // optionally "long" in Python 2
+        // https://docs.python.org/2.7/reference/lexical_analysis.html#integer-and-long-integer-literals
+        // decinteger is optionally imaginary
+        // https://docs.python.org/3.9/reference/lexical_analysis.html#imaginary-literals
+        {
+          begin: `\\b([1-9](_?[0-9])*|0+(_?0)*)[lLjJ]?(?=${lookahead})`
+        },
+        {
+          begin: `\\b0[bB](_?[01])+[lL]?(?=${lookahead})`
+        },
+        {
+          begin: `\\b0[oO](_?[0-7])+[lL]?(?=${lookahead})`
+        },
+        {
+          begin: `\\b0[xX](_?[0-9a-fA-F])+[lL]?(?=${lookahead})`
+        },
+
+        // imagnumber (digitpart-based)
+        // https://docs.python.org/3.9/reference/lexical_analysis.html#imaginary-literals
+        {
+          begin: `\\b(${digitpart})[jJ](?=${lookahead})`
         }
-      ] };
-      // find all the regular keywords
-      const KEYWORDS = {
-        $pattern: either(
-          /\b\w+/, // regular keywords
-          /#\w+/ // number keywords
-        ),
-        keyword: PLAIN_KEYWORDS
-          .concat(numberSignKeywords),
-        literal: literals
-      };
-      const KEYWORD_MODES = [
-        DOT_KEYWORD,
-        KEYWORD_GUARD,
-        KEYWORD
-      ];
-
-      // https://github.com/apple/swift/tree/main/stdlib/public/core
-      const BUILT_IN_GUARD = {
-        // Consume .built_in to prevent highlighting properties and methods.
-        match: concat(/\./, either(...builtIns$1)),
-        relevance: 0
-      };
-      const BUILT_IN = {
-        className: 'built_in',
-        match: concat(/\b/, either(...builtIns$1), /(?=\()/)
-      };
-      const BUILT_INS = [
-        BUILT_IN_GUARD,
-        BUILT_IN
-      ];
-
-      // https://docs.swift.org/swift-book/ReferenceManual/LexicalStructure.html#ID418
-      const OPERATOR_GUARD = {
-        // Prevent -> from being highlighting as an operator.
-        match: /->/,
-        relevance: 0
-      };
-      const OPERATOR = {
-        className: 'operator',
-        relevance: 0,
-        variants: [
-          { match: operator },
-          {
-            // dot-operator: only operators that start with a dot are allowed to use dots as
-            // characters (..., ...<, .*, etc). So there rule here is: a dot followed by one or more
-            // characters that may also include dots.
-            match: `\\.(\\.|${operatorCharacter})+` }
-        ]
-      };
-      const OPERATORS = [
-        OPERATOR_GUARD,
-        OPERATOR
-      ];
-
-      // https://docs.swift.org/swift-book/ReferenceManual/LexicalStructure.html#grammar_numeric-literal
-      // TODO: Update for leading `-` after lookbehind is supported everywhere
-      const decimalDigits = '([0-9]_*)+';
-      const hexDigits = '([0-9a-fA-F]_*)+';
-      const NUMBER = {
-        className: 'number',
-        relevance: 0,
-        variants: [
-          // decimal floating-point-literal (subsumes decimal-literal)
-          { match: `\\b(${decimalDigits})(\\.(${decimalDigits}))?` + `([eE][+-]?(${decimalDigits}))?\\b` },
-          // hexadecimal floating-point-literal (subsumes hexadecimal-literal)
-          { match: `\\b0x(${hexDigits})(\\.(${hexDigits}))?` + `([pP][+-]?(${decimalDigits}))?\\b` },
-          // octal-literal
-          { match: /\b0o([0-7]_*)+\b/ },
-          // binary-literal
-          { match: /\b0b([01]_*)+\b/ }
-        ]
-      };
-
-      // https://docs.swift.org/swift-book/ReferenceManual/LexicalStructure.html#grammar_string-literal
-      const ESCAPED_CHARACTER = (rawDelimiter = "") => ({
-        className: 'subst',
-        variants: [
-          { match: concat(/\\/, rawDelimiter, /[0\\tnr"']/) },
-          { match: concat(/\\/, rawDelimiter, /u\{[0-9a-fA-F]{1,8}\}/) }
-        ]
-      });
-      const ESCAPED_NEWLINE = (rawDelimiter = "") => ({
-        className: 'subst',
-        match: concat(/\\/, rawDelimiter, /[\t ]*(?:[\r\n]|\r\n)/)
-      });
-      const INTERPOLATION = (rawDelimiter = "") => ({
-        className: 'subst',
-        label: "interpol",
-        begin: concat(/\\/, rawDelimiter, /\(/),
-        end: /\)/
-      });
-      const MULTILINE_STRING = (rawDelimiter = "") => ({
-        begin: concat(rawDelimiter, /"""/),
-        end: concat(/"""/, rawDelimiter),
-        contains: [
-          ESCAPED_CHARACTER(rawDelimiter),
-          ESCAPED_NEWLINE(rawDelimiter),
-          INTERPOLATION(rawDelimiter)
-        ]
-      });
-      const SINGLE_LINE_STRING = (rawDelimiter = "") => ({
-        begin: concat(rawDelimiter, /"/),
-        end: concat(/"/, rawDelimiter),
-        contains: [
-          ESCAPED_CHARACTER(rawDelimiter),
-          INTERPOLATION(rawDelimiter)
-        ]
-      });
-      const STRING = {
-        className: 'string',
-        variants: [
-          MULTILINE_STRING(),
-          MULTILINE_STRING("#"),
-          MULTILINE_STRING("##"),
-          MULTILINE_STRING("###"),
-          SINGLE_LINE_STRING(),
-          SINGLE_LINE_STRING("#"),
-          SINGLE_LINE_STRING("##"),
-          SINGLE_LINE_STRING("###")
-        ]
-      };
-
-      // https://docs.swift.org/swift-book/ReferenceManual/LexicalStructure.html#ID412
-      const QUOTED_IDENTIFIER = { match: concat(/`/, identifier, /`/) };
-      const IMPLICIT_PARAMETER = {
-        className: 'variable',
-        match: /\$\d+/
-      };
-      const PROPERTY_WRAPPER_PROJECTION = {
-        className: 'variable',
-        match: `\\$${identifierCharacter}+`
-      };
-      const IDENTIFIERS = [
-        QUOTED_IDENTIFIER,
-        IMPLICIT_PARAMETER,
-        PROPERTY_WRAPPER_PROJECTION
-      ];
-
-      // https://docs.swift.org/swift-book/ReferenceManual/Attributes.html
-      const AVAILABLE_ATTRIBUTE = {
-        match: /(@|#(un)?)available/,
-        className: "keyword",
-        starts: { contains: [
-          {
-            begin: /\(/,
-            end: /\)/,
-            keywords: availabilityKeywords,
-            contains: [
-              ...OPERATORS,
-              NUMBER,
-              STRING
-            ]
-          }
-        ] }
-      };
-      const KEYWORD_ATTRIBUTE = {
-        className: 'keyword',
-        match: concat(/@/, either(...keywordAttributes))
-      };
-      const USER_DEFINED_ATTRIBUTE = {
-        className: 'meta',
-        match: concat(/@/, identifier)
-      };
-      const ATTRIBUTES = [
-        AVAILABLE_ATTRIBUTE,
-        KEYWORD_ATTRIBUTE,
-        USER_DEFINED_ATTRIBUTE
-      ];
-
-      // https://docs.swift.org/swift-book/ReferenceManual/Types.html
-      const TYPE = {
-        match: lookahead(/\b[A-Z]/),
-        relevance: 0,
-        contains: [
-          { // Common Apple frameworks, for relevance boost
-            className: 'type',
-            match: concat(/(AV|CA|CF|CG|CI|CL|CM|CN|CT|MK|MP|MTK|MTL|NS|SCN|SK|UI|WK|XC)/, identifierCharacter, '+')
-          },
-          { // Type identifier
-            className: 'type',
-            match: typeIdentifier,
-            relevance: 0
-          },
-          { // Optional type
-            match: /[?!]+/,
-            relevance: 0
-          },
-          { // Variadic parameter
-            match: /\.\.\./,
-            relevance: 0
-          },
-          { // Protocol composition
-            match: concat(/\s+&\s+/, lookahead(typeIdentifier)),
-            relevance: 0
-          }
-        ]
-      };
-      const GENERIC_ARGUMENTS = {
-        begin: /</,
-        end: />/,
-        keywords: KEYWORDS,
-        contains: [
-          ...COMMENTS,
-          ...KEYWORD_MODES,
-          ...ATTRIBUTES,
-          OPERATOR_GUARD,
-          TYPE
-        ]
-      };
-      TYPE.contains.push(GENERIC_ARGUMENTS);
-
-      // https://docs.swift.org/swift-book/ReferenceManual/Expressions.html#ID552
-      // Prevents element names from being highlighted as keywords.
-      const TUPLE_ELEMENT_NAME = {
-        match: concat(identifier, /\s*:/),
-        keywords: "_|0",
-        relevance: 0
-      };
-      // Matches tuples as well as the parameter list of a function type.
-      const TUPLE = {
-        begin: /\(/,
-        end: /\)/,
-        relevance: 0,
-        keywords: KEYWORDS,
-        contains: [
-          'self',
-          TUPLE_ELEMENT_NAME,
-          ...COMMENTS,
-          ...KEYWORD_MODES,
-          ...BUILT_INS,
-          ...OPERATORS,
-          NUMBER,
-          STRING,
-          ...IDENTIFIERS,
-          ...ATTRIBUTES,
-          TYPE
-        ]
-      };
-
-      const GENERIC_PARAMETERS = {
-        begin: /</,
-        end: />/,
-        contains: [
-          ...COMMENTS,
-          TYPE
-        ]
-      };
-      const FUNCTION_PARAMETER_NAME = {
-        begin: either(
-          lookahead(concat(identifier, /\s*:/)),
-          lookahead(concat(identifier, /\s+/, identifier, /\s*:/))
-        ),
-        end: /:/,
-        relevance: 0,
-        contains: [
-          {
-            className: 'keyword',
-            match: /\b_\b/
-          },
-          {
-            className: 'params',
-            match: identifier
-          }
-        ]
-      };
-      const FUNCTION_PARAMETERS = {
-        begin: /\(/,
-        end: /\)/,
-        keywords: KEYWORDS,
-        contains: [
-          FUNCTION_PARAMETER_NAME,
-          ...COMMENTS,
-          ...KEYWORD_MODES,
-          ...OPERATORS,
-          NUMBER,
-          STRING,
-          ...ATTRIBUTES,
-          TYPE,
-          TUPLE
-        ],
-        endsParent: true,
-        illegal: /["']/
-      };
-      // https://docs.swift.org/swift-book/ReferenceManual/Declarations.html#ID362
-      const FUNCTION = {
-        match: [
-          /func/,
-          /\s+/,
-          either(QUOTED_IDENTIFIER.match, identifier, operator)
-        ],
-        className: {
-          1: "keyword",
-          3: "title.function"
+      ]
+    };
+    const COMMENT_TYPE = {
+      className: "comment",
+      begin: regex.lookahead(/# type:/),
+      end: /$/,
+      keywords: KEYWORDS,
+      contains: [
+        { // prevent keywords from coloring `type`
+          begin: /# type:/
         },
-        contains: [
-          GENERIC_PARAMETERS,
-          FUNCTION_PARAMETERS,
-          WHITESPACE
-        ],
-        illegal: [
-          /\[/,
-          /%/
-        ]
-      };
-
-      // https://docs.swift.org/swift-book/ReferenceManual/Declarations.html#ID375
-      // https://docs.swift.org/swift-book/ReferenceManual/Declarations.html#ID379
-      const INIT_SUBSCRIPT = {
-        match: [
-          /\b(?:subscript|init[?!]?)/,
-          /\s*(?=[<(])/,
-        ],
-        className: { 1: "keyword" },
-        contains: [
-          GENERIC_PARAMETERS,
-          FUNCTION_PARAMETERS,
-          WHITESPACE
-        ],
-        illegal: /\[|%/
-      };
-      // https://docs.swift.org/swift-book/ReferenceManual/Declarations.html#ID380
-      const OPERATOR_DECLARATION = {
-        match: [
-          /operator/,
-          /\s+/,
-          operator
-        ],
-        className: {
-          1: "keyword",
-          3: "title"
+        // comment within a datatype comment includes no keywords
+        {
+          begin: /#/,
+          end: /\b\B/,
+          endsWithParent: true
         }
-      };
-
-      // https://docs.swift.org/swift-book/ReferenceManual/Declarations.html#ID550
-      const PRECEDENCEGROUP = {
-        begin: [
-          /precedencegroup/,
-          /\s+/,
-          typeIdentifier
-        ],
-        className: {
-          1: "keyword",
-          3: "title"
+      ]
+    };
+    const PARAMS = {
+      className: 'params',
+      variants: [
+        // Exclude params in functions without params
+        {
+          className: "",
+          begin: /\(\s*\)/,
+          skip: true
         },
-        contains: [ TYPE ],
-        keywords: [
-          ...precedencegroupKeywords,
-          ...literals
-        ],
-        end: /}/
-      };
+        {
+          begin: /\(/,
+          end: /\)/,
+          excludeBegin: true,
+          excludeEnd: true,
+          keywords: KEYWORDS,
+          contains: [
+            'self',
+            PROMPT,
+            NUMBER,
+            STRING,
+            hljs.HASH_COMMENT_MODE
+          ]
+        }
+      ]
+    };
+    SUBST.contains = [
+      STRING,
+      NUMBER,
+      PROMPT
+    ];
 
-      // Add supported submodes to string interpolation.
-      for (const variant of STRING.variants) {
-        const interpolation = variant.contains.find(mode => mode.label === "interpol");
-        // TODO: Interpolation can contain any expression, so there's room for improvement here.
-        interpolation.keywords = KEYWORDS;
-        const submodes = [
-          ...KEYWORD_MODES,
-          ...BUILT_INS,
-          ...OPERATORS,
-          NUMBER,
-          STRING,
-          ...IDENTIFIERS
-        ];
-        interpolation.contains = [
-          ...submodes,
-          {
-            begin: /\(/,
-            end: /\)/,
-            contains: [
-              'self',
-              ...submodes
-            ]
+    return {
+      name: 'Python',
+      aliases: [
+        'py',
+        'gyp',
+        'ipython'
+      ],
+      unicodeRegex: true,
+      keywords: KEYWORDS,
+      illegal: /(<\/|\?)|=>/,
+      contains: [
+        PROMPT,
+        NUMBER,
+        {
+          // very common convention
+          begin: /\bself\b/
+        },
+        {
+          // eat "if" prior to string so that it won't accidentally be
+          // labeled as an f-string
+          beginKeywords: "if",
+          relevance: 0
+        },
+        STRING,
+        COMMENT_TYPE,
+        hljs.HASH_COMMENT_MODE,
+        {
+          match: [
+            /\bdef/, /\s+/,
+            IDENT_RE,
+          ],
+          scope: {
+            1: "keyword",
+            3: "title.function"
+          },
+          contains: [ PARAMS ]
+        },
+        {
+          variants: [
+            {
+              match: [
+                /\bclass/, /\s+/,
+                IDENT_RE, /\s*/,
+                /\(\s*/, IDENT_RE,/\s*\)/
+              ],
+            },
+            {
+              match: [
+                /\bclass/, /\s+/,
+                IDENT_RE
+              ],
+            }
+          ],
+          scope: {
+            1: "keyword",
+            3: "title.class",
+            6: "title.class.inherited",
           }
-        ];
-      }
-
-      return {
-        name: 'Swift',
-        keywords: KEYWORDS,
-        contains: [
-          ...COMMENTS,
-          FUNCTION,
-          INIT_SUBSCRIPT,
-          {
-            beginKeywords: 'struct protocol class extension enum actor',
-            end: '\\{',
-            excludeEnd: true,
-            keywords: KEYWORDS,
-            contains: [
-              hljs.inherit(hljs.TITLE_MODE, {
-                className: "title.class",
-                begin: /[A-Za-z$_][\u00C0-\u02B80-9A-Za-z$_]*/
-              }),
-              ...KEYWORD_MODES
-            ]
-          },
-          OPERATOR_DECLARATION,
-          PRECEDENCEGROUP,
-          {
-            beginKeywords: 'import',
-            end: /$/,
-            contains: [ ...COMMENTS ],
-            relevance: 0
-          },
-          ...KEYWORD_MODES,
-          ...BUILT_INS,
-          ...OPERATORS,
-          NUMBER,
-          STRING,
-          ...IDENTIFIERS,
-          ...ATTRIBUTES,
-          TYPE,
-          TUPLE
-        ]
-      };
-    }
-
-    /*
-    Language: TypeScript
-    Author: Panu Horsmalahti <panu.horsmalahti@iki.fi>
-    Contributors: Ike Ku <dempfi@yahoo.com>
-    Description: TypeScript is a strict superset of JavaScript
-    Website: https://www.typescriptlang.org
-    Category: common, scripting
-    */
-
-    /** @type LanguageFn */
-    function typescript(hljs) {
-      const tsLanguage = javascript(hljs);
-
-      const IDENT_RE$1 = IDENT_RE;
-      const TYPES = [
-        "any",
-        "void",
-        "number",
-        "boolean",
-        "string",
-        "object",
-        "never",
-        "symbol",
-        "bigint",
-        "unknown"
-      ];
-      const NAMESPACE = {
-        beginKeywords: 'namespace',
-        end: /\{/,
-        excludeEnd: true,
-        contains: [ tsLanguage.exports.CLASS_REFERENCE ]
-      };
-      const INTERFACE = {
-        beginKeywords: 'interface',
-        end: /\{/,
-        excludeEnd: true,
-        keywords: {
-          keyword: 'interface extends',
-          built_in: TYPES
         },
-        contains: [ tsLanguage.exports.CLASS_REFERENCE ]
-      };
-      const USE_STRICT = {
-        className: 'meta',
-        relevance: 10,
-        begin: /^\s*['"]use strict['"]/
-      };
-      const TS_SPECIFIC_KEYWORDS = [
-        "type",
-        "namespace",
-        "interface",
-        "public",
-        "private",
-        "protected",
-        "implements",
-        "declare",
-        "abstract",
-        "readonly",
-        "enum",
-        "override"
-      ];
-      const KEYWORDS$1 = {
+        {
+          className: 'meta',
+          begin: /^[\t ]*@/,
+          end: /(?=#)|$/,
+          contains: [
+            NUMBER,
+            PARAMS,
+            STRING
+          ]
+        }
+      ]
+    };
+  }
+
+  /*
+  Language: Python REPL
+  Requires: python.js
+  Author: Josh Goebel <hello@joshgoebel.com>
+  Category: common
+  */
+
+  function pythonRepl(hljs) {
+    return {
+      aliases: [ 'pycon' ],
+      contains: [
+        {
+          className: 'meta.prompt',
+          starts: {
+            // a space separates the REPL prefix from the actual code
+            // this is purely for cleaner HTML output
+            end: / |$/,
+            starts: {
+              end: '$',
+              subLanguage: 'python'
+            }
+          },
+          variants: [
+            { begin: /^>>>(?=[ ]|$)/ },
+            { begin: /^\.\.\.(?=[ ]|$)/ }
+          ]
+        }
+      ]
+    };
+  }
+
+  /*
+  Language: R
+  Description: R is a free software environment for statistical computing and graphics.
+  Author: Joe Cheng <joe@rstudio.org>
+  Contributors: Konrad Rudolph <konrad.rudolph@gmail.com>
+  Website: https://www.r-project.org
+  Category: common,scientific
+  */
+
+  /** @type LanguageFn */
+  function r(hljs) {
+    const regex = hljs.regex;
+    // Identifiers in R cannot start with `_`, but they can start with `.` if it
+    // is not immediately followed by a digit.
+    // R also supports quoted identifiers, which are near-arbitrary sequences
+    // delimited by backticks (`…`), which may contain escape sequences. These are
+    // handled in a separate mode. See `test/markup/r/names.txt` for examples.
+    // FIXME: Support Unicode identifiers.
+    const IDENT_RE = /(?:(?:[a-zA-Z]|\.[._a-zA-Z])[._a-zA-Z0-9]*)|\.(?!\d)/;
+    const NUMBER_TYPES_RE = regex.either(
+      // Special case: only hexadecimal binary powers can contain fractions
+      /0[xX][0-9a-fA-F]+\.[0-9a-fA-F]*[pP][+-]?\d+i?/,
+      // Hexadecimal numbers without fraction and optional binary power
+      /0[xX][0-9a-fA-F]+(?:[pP][+-]?\d+)?[Li]?/,
+      // Decimal numbers
+      /(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?[Li]?/
+    );
+    const OPERATORS_RE = /[=!<>:]=|\|\||&&|:::?|<-|<<-|->>|->|\|>|[-+*\/?!$&|:<=>@^~]|\*\*/;
+    const PUNCTUATION_RE = regex.either(
+      /[()]/,
+      /[{}]/,
+      /\[\[/,
+      /[[\]]/,
+      /\\/,
+      /,/
+    );
+
+    return {
+      name: 'R',
+
+      keywords: {
         $pattern: IDENT_RE,
-        keyword: KEYWORDS.concat(TS_SPECIFIC_KEYWORDS),
-        literal: LITERALS,
-        built_in: BUILT_INS.concat(TYPES),
-        "variable.language": BUILT_IN_VARIABLES
-      };
-      const DECORATOR = {
-        className: 'meta',
-        begin: '@' + IDENT_RE$1,
-      };
+        keyword:
+          'function if in break next repeat else for while',
+        literal:
+          'NULL NA TRUE FALSE Inf NaN NA_integer_|10 NA_real_|10 '
+          + 'NA_character_|10 NA_complex_|10',
+        built_in:
+          // Builtin constants
+          'LETTERS letters month.abb month.name pi T F '
+          // Primitive functions
+          // These are all the functions in `base` that are implemented as a
+          // `.Primitive`, minus those functions that are also keywords.
+          + 'abs acos acosh all any anyNA Arg as.call as.character '
+          + 'as.complex as.double as.environment as.integer as.logical '
+          + 'as.null.default as.numeric as.raw asin asinh atan atanh attr '
+          + 'attributes baseenv browser c call ceiling class Conj cos cosh '
+          + 'cospi cummax cummin cumprod cumsum digamma dim dimnames '
+          + 'emptyenv exp expression floor forceAndCall gamma gc.time '
+          + 'globalenv Im interactive invisible is.array is.atomic is.call '
+          + 'is.character is.complex is.double is.environment is.expression '
+          + 'is.finite is.function is.infinite is.integer is.language '
+          + 'is.list is.logical is.matrix is.na is.name is.nan is.null '
+          + 'is.numeric is.object is.pairlist is.raw is.recursive is.single '
+          + 'is.symbol lazyLoadDBfetch length lgamma list log max min '
+          + 'missing Mod names nargs nzchar oldClass on.exit pos.to.env '
+          + 'proc.time prod quote range Re rep retracemem return round '
+          + 'seq_along seq_len seq.int sign signif sin sinh sinpi sqrt '
+          + 'standardGeneric substitute sum switch tan tanh tanpi tracemem '
+          + 'trigamma trunc unclass untracemem UseMethod xtfrm',
+      },
 
-      const swapMode = (mode, label, replacement) => {
-        const indx = mode.contains.findIndex(m => m.label === label);
-        if (indx === -1) { throw new Error("can not find mode to replace"); }
+      contains: [
+        // Roxygen comments
+        hljs.COMMENT(
+          /#'/,
+          /$/,
+          { contains: [
+            {
+              // Handle `@examples` separately to cause all subsequent code
+              // until the next `@`-tag on its own line to be kept as-is,
+              // preventing highlighting. This code is example R code, so nested
+              // doctags shouldn’t be treated as such. See
+              // `test/markup/r/roxygen.txt` for an example.
+              scope: 'doctag',
+              match: /@examples/,
+              starts: {
+                end: regex.lookahead(regex.either(
+                  // end if another doc comment
+                  /\n^#'\s*(?=@[a-zA-Z]+)/,
+                  // or a line with no comment
+                  /\n^(?!#')/
+                )),
+                endsParent: true
+              }
+            },
+            {
+              // Handle `@param` to highlight the parameter name following
+              // after.
+              scope: 'doctag',
+              begin: '@param',
+              end: /$/,
+              contains: [
+                {
+                  scope: 'variable',
+                  variants: [
+                    { match: IDENT_RE },
+                    { match: /`(?:\\.|[^`\\])+`/ }
+                  ],
+                  endsParent: true
+                }
+              ]
+            },
+            {
+              scope: 'doctag',
+              match: /@[a-zA-Z]+/
+            },
+            {
+              scope: 'keyword',
+              match: /\\[a-zA-Z]+/
+            }
+          ] }
+        ),
 
-        mode.contains.splice(indx, 1, replacement);
-      };
+        hljs.HASH_COMMENT_MODE,
 
-
-      // this should update anywhere keywords is used since
-      // it will be the same actual JS object
-      Object.assign(tsLanguage.keywords, KEYWORDS$1);
-
-      tsLanguage.exports.PARAMS_CONTAINS.push(DECORATOR);
-      tsLanguage.contains = tsLanguage.contains.concat([
-        DECORATOR,
-        NAMESPACE,
-        INTERFACE,
-      ]);
-
-      // TS gets a simpler shebang rule than JS
-      swapMode(tsLanguage, "shebang", hljs.SHEBANG());
-      // JS use strict rule purposely excludes `asm` which makes no sense
-      swapMode(tsLanguage, "use_strict", USE_STRICT);
-
-      const functionDeclaration = tsLanguage.contains.find(m => m.label === "func.def");
-      functionDeclaration.relevance = 0; // () => {} is more typical in TypeScript
-
-      Object.assign(tsLanguage, {
-        name: 'TypeScript',
-        aliases: [
-          'ts',
-          'tsx'
-        ]
-      });
-
-      return tsLanguage;
-    }
-
-    /*
-    Language: Visual Basic .NET
-    Description: Visual Basic .NET (VB.NET) is a multi-paradigm, object-oriented programming language, implemented on the .NET Framework.
-    Authors: Poren Chiang <ren.chiang@gmail.com>, Jan Pilzer
-    Website: https://docs.microsoft.com/dotnet/visual-basic/getting-started
-    Category: common
-    */
-
-    /** @type LanguageFn */
-    function vbnet(hljs) {
-      const regex = hljs.regex;
-      /**
-       * Character Literal
-       * Either a single character ("a"C) or an escaped double quote (""""C).
-       */
-      const CHARACTER = {
-        className: 'string',
-        begin: /"(""|[^/n])"C\b/
-      };
-
-      const STRING = {
-        className: 'string',
-        begin: /"/,
-        end: /"/,
-        illegal: /\n/,
-        contains: [
-          {
-            // double quote escape
-            begin: /""/ }
-        ]
-      };
-
-      /** Date Literals consist of a date, a time, or both separated by whitespace, surrounded by # */
-      const MM_DD_YYYY = /\d{1,2}\/\d{1,2}\/\d{4}/;
-      const YYYY_MM_DD = /\d{4}-\d{1,2}-\d{1,2}/;
-      const TIME_12H = /(\d|1[012])(:\d+){0,2} *(AM|PM)/;
-      const TIME_24H = /\d{1,2}(:\d{1,2}){1,2}/;
-      const DATE = {
-        className: 'literal',
-        variants: [
-          {
-            // #YYYY-MM-DD# (ISO-Date) or #M/D/YYYY# (US-Date)
-            begin: regex.concat(/# */, regex.either(YYYY_MM_DD, MM_DD_YYYY), / *#/) },
-          {
-            // #H:mm[:ss]# (24h Time)
-            begin: regex.concat(/# */, TIME_24H, / *#/) },
-          {
-            // #h[:mm[:ss]] A# (12h Time)
-            begin: regex.concat(/# */, TIME_12H, / *#/) },
-          {
-            // date plus time
-            begin: regex.concat(
-              /# */,
-              regex.either(YYYY_MM_DD, MM_DD_YYYY),
-              / +/,
-              regex.either(TIME_12H, TIME_24H),
-              / *#/
-            ) }
-        ]
-      };
-
-      const NUMBER = {
-        className: 'number',
-        relevance: 0,
-        variants: [
-          {
-            // Float
-            begin: /\b\d[\d_]*((\.[\d_]+(E[+-]?[\d_]+)?)|(E[+-]?[\d_]+))[RFD@!#]?/ },
-          {
-            // Integer (base 10)
-            begin: /\b\d[\d_]*((U?[SIL])|[%&])?/ },
-          {
-            // Integer (base 16)
-            begin: /&H[\dA-F_]+((U?[SIL])|[%&])?/ },
-          {
-            // Integer (base 8)
-            begin: /&O[0-7_]+((U?[SIL])|[%&])?/ },
-          {
-            // Integer (base 2)
-            begin: /&B[01_]+((U?[SIL])|[%&])?/ }
-        ]
-      };
-
-      const LABEL = {
-        className: 'label',
-        begin: /^\w+:/
-      };
-
-      const DOC_COMMENT = hljs.COMMENT(/'''/, /$/, { contains: [
         {
-          className: 'doctag',
-          begin: /<\/?/,
-          end: />/
-        }
-      ] });
-
-      const COMMENT = hljs.COMMENT(null, /$/, { variants: [
-        { begin: /'/ },
-        {
-          // TODO: Use multi-class for leading spaces
-          begin: /([\t ]|^)REM(?=\s)/ }
-      ] });
-
-      const DIRECTIVES = {
-        className: 'meta',
-        // TODO: Use multi-class for indentation once available
-        begin: /[\t ]*#(const|disable|else|elseif|enable|end|externalsource|if|region)\b/,
-        end: /$/,
-        keywords: { keyword:
-            'const disable else elseif enable end externalsource if region then' },
-        contains: [ COMMENT ]
-      };
-
-      return {
-        name: 'Visual Basic .NET',
-        aliases: [ 'vb' ],
-        case_insensitive: true,
-        classNameAliases: { label: 'symbol' },
-        keywords: {
-          keyword:
-            'addhandler alias aggregate ansi as async assembly auto binary by byref byval ' /* a-b */
-            + 'call case catch class compare const continue custom declare default delegate dim distinct do ' /* c-d */
-            + 'each equals else elseif end enum erase error event exit explicit finally for friend from function ' /* e-f */
-            + 'get global goto group handles if implements imports in inherits interface into iterator ' /* g-i */
-            + 'join key let lib loop me mid module mustinherit mustoverride mybase myclass ' /* j-m */
-            + 'namespace narrowing new next notinheritable notoverridable ' /* n */
-            + 'of off on operator option optional order overloads overridable overrides ' /* o */
-            + 'paramarray partial preserve private property protected public ' /* p */
-            + 'raiseevent readonly redim removehandler resume return ' /* r */
-            + 'select set shadows shared skip static step stop structure strict sub synclock ' /* s */
-            + 'take text then throw to try unicode until using when where while widening with withevents writeonly yield' /* t-y */,
-          built_in:
-            // Operators https://docs.microsoft.com/dotnet/visual-basic/language-reference/operators
-            'addressof and andalso await directcast gettype getxmlnamespace is isfalse isnot istrue like mod nameof new not or orelse trycast typeof xor '
-            // Type Conversion Functions https://docs.microsoft.com/dotnet/visual-basic/language-reference/functions/type-conversion-functions
-            + 'cbool cbyte cchar cdate cdbl cdec cint clng cobj csbyte cshort csng cstr cuint culng cushort',
-          type:
-            // Data types https://docs.microsoft.com/dotnet/visual-basic/language-reference/data-types
-            'boolean byte char date decimal double integer long object sbyte short single string uinteger ulong ushort',
-          literal: 'true false nothing'
+          scope: 'string',
+          contains: [ hljs.BACKSLASH_ESCAPE ],
+          variants: [
+            hljs.END_SAME_AS_BEGIN({
+              begin: /[rR]"(-*)\(/,
+              end: /\)(-*)"/
+            }),
+            hljs.END_SAME_AS_BEGIN({
+              begin: /[rR]"(-*)\{/,
+              end: /\}(-*)"/
+            }),
+            hljs.END_SAME_AS_BEGIN({
+              begin: /[rR]"(-*)\[/,
+              end: /\](-*)"/
+            }),
+            hljs.END_SAME_AS_BEGIN({
+              begin: /[rR]'(-*)\(/,
+              end: /\)(-*)'/
+            }),
+            hljs.END_SAME_AS_BEGIN({
+              begin: /[rR]'(-*)\{/,
+              end: /\}(-*)'/
+            }),
+            hljs.END_SAME_AS_BEGIN({
+              begin: /[rR]'(-*)\[/,
+              end: /\](-*)'/
+            }),
+            {
+              begin: '"',
+              end: '"',
+              relevance: 0
+            },
+            {
+              begin: "'",
+              end: "'",
+              relevance: 0
+            }
+          ],
         },
-        illegal:
-          '//|\\{|\\}|endif|gosub|variant|wend|^\\$ ' /* reserved deprecated keywords */,
-        contains: [
-          CHARACTER,
-          STRING,
-          DATE,
-          NUMBER,
-          LABEL,
-          DOC_COMMENT,
-          COMMENT,
-          DIRECTIVES
-        ]
-      };
-    }
 
-    /*
-    Language: WebAssembly
-    Website: https://webassembly.org
-    Description:  Wasm is designed as a portable compilation target for programming languages, enabling deployment on the web for client and server applications.
-    Category: web, common
-    Audit: 2020
-    */
+        // Matching numbers immediately following punctuation and operators is
+        // tricky since we need to look at the character ahead of a number to
+        // ensure the number is not part of an identifier, and we cannot use
+        // negative look-behind assertions. So instead we explicitly handle all
+        // possible combinations of (operator|punctuation), number.
+        // TODO: replace with negative look-behind when available
+        // { begin: /(?<![a-zA-Z0-9._])0[xX][0-9a-fA-F]+\.[0-9a-fA-F]*[pP][+-]?\d+i?/ },
+        // { begin: /(?<![a-zA-Z0-9._])0[xX][0-9a-fA-F]+([pP][+-]?\d+)?[Li]?/ },
+        // { begin: /(?<![a-zA-Z0-9._])(\d+(\.\d*)?|\.\d+)([eE][+-]?\d+)?[Li]?/ }
+        {
+          relevance: 0,
+          variants: [
+            {
+              scope: {
+                1: 'operator',
+                2: 'number'
+              },
+              match: [
+                OPERATORS_RE,
+                NUMBER_TYPES_RE
+              ]
+            },
+            {
+              scope: {
+                1: 'operator',
+                2: 'number'
+              },
+              match: [
+                /%[^%]*%/,
+                NUMBER_TYPES_RE
+              ]
+            },
+            {
+              scope: {
+                1: 'punctuation',
+                2: 'number'
+              },
+              match: [
+                PUNCTUATION_RE,
+                NUMBER_TYPES_RE
+              ]
+            },
+            {
+              scope: { 2: 'number' },
+              match: [
+                /[^a-zA-Z0-9._]|^/, // not part of an identifier, or start of document
+                NUMBER_TYPES_RE
+              ]
+            }
+          ]
+        },
 
-    /** @type LanguageFn */
-    function wasm(hljs) {
-      hljs.regex;
-      const BLOCK_COMMENT = hljs.COMMENT(/\(;/, /;\)/);
-      BLOCK_COMMENT.contains.push("self");
-      const LINE_COMMENT = hljs.COMMENT(/;;/, /$/);
+        // Operators/punctuation when they're not directly followed by numbers
+        {
+          // Relevance boost for the most common assignment form.
+          scope: { 3: 'operator' },
+          match: [
+            IDENT_RE,
+            /\s+/,
+            /<-/,
+            /\s+/
+          ]
+        },
 
-      const KWS = [
-        "anyfunc",
-        "block",
-        "br",
-        "br_if",
-        "br_table",
-        "call",
-        "call_indirect",
-        "data",
-        "drop",
-        "elem",
+        {
+          scope: 'operator',
+          relevance: 0,
+          variants: [
+            { match: OPERATORS_RE },
+            { match: /%[^%]*%/ }
+          ]
+        },
+
+        {
+          scope: 'punctuation',
+          relevance: 0,
+          match: PUNCTUATION_RE
+        },
+
+        {
+          // Escaped identifier
+          begin: '`',
+          end: '`',
+          contains: [ { begin: /\\./ } ]
+        }
+      ]
+    };
+  }
+
+  /*
+  Language: Ruby
+  Description: Ruby is a dynamic, open source programming language with a focus on simplicity and productivity.
+  Website: https://www.ruby-lang.org/
+  Author: Anton Kovalyov <anton@kovalyov.net>
+  Contributors: Peter Leonov <gojpeg@yandex.ru>, Vasily Polovnyov <vast@whiteants.net>, Loren Segal <lsegal@soen.ca>, Pascal Hurni <phi@ruby-reactive.org>, Cedric Sohrauer <sohrauer@googlemail.com>
+  Category: common
+  */
+
+  function ruby(hljs) {
+    const regex = hljs.regex;
+    const RUBY_METHOD_RE = '([a-zA-Z_]\\w*[!?=]?|[-+~]@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?)';
+    // TODO: move concepts like CAMEL_CASE into `modes.js`
+    const CLASS_NAME_RE = regex.either(
+      /\b([A-Z]+[a-z0-9]+)+/,
+      // ends in caps
+      /\b([A-Z]+[a-z0-9]+)+[A-Z]+/,
+    )
+    ;
+    const CLASS_NAME_WITH_NAMESPACE_RE = regex.concat(CLASS_NAME_RE, /(::\w+)*/);
+    // very popular ruby built-ins that one might even assume
+    // are actual keywords (despite that not being the case)
+    const PSEUDO_KWS = [
+      "include",
+      "extend",
+      "prepend",
+      "public",
+      "private",
+      "protected",
+      "raise",
+      "throw"
+    ];
+    const RUBY_KEYWORDS = {
+      "variable.constant": [
+        "__FILE__",
+        "__LINE__",
+        "__ENCODING__"
+      ],
+      "variable.language": [
+        "self",
+        "super",
+      ],
+      keyword: [
+        "alias",
+        "and",
+        "begin",
+        "BEGIN",
+        "break",
+        "case",
+        "class",
+        "defined",
+        "do",
         "else",
+        "elsif",
         "end",
-        "export",
-        "func",
-        "global.get",
-        "global.set",
-        "local.get",
-        "local.set",
-        "local.tee",
-        "get_global",
-        "get_local",
-        "global",
+        "END",
+        "ensure",
+        "for",
         "if",
-        "import",
-        "local",
-        "loop",
-        "memory",
-        "memory.grow",
-        "memory.size",
+        "in",
         "module",
-        "mut",
-        "nop",
-        "offset",
-        "param",
-        "result",
+        "next",
+        "not",
+        "or",
+        "redo",
+        "require",
+        "rescue",
+        "retry",
         "return",
-        "select",
-        "set_global",
-        "set_local",
-        "start",
-        "table",
-        "tee_local",
         "then",
-        "type",
-        "unreachable"
-      ];
-
-      const FUNCTION_REFERENCE = {
-        begin: [
-          /(?:func|call|call_indirect)/,
-          /\s+/,
-          /\$[^\s)]+/
-        ],
-        className: {
-          1: "keyword",
-          3: "title.function"
+        "undef",
+        "unless",
+        "until",
+        "when",
+        "while",
+        "yield",
+        ...PSEUDO_KWS
+      ],
+      built_in: [
+        "proc",
+        "lambda",
+        "attr_accessor",
+        "attr_reader",
+        "attr_writer",
+        "define_method",
+        "private_constant",
+        "module_function"
+      ],
+      literal: [
+        "true",
+        "false",
+        "nil"
+      ]
+    };
+    const YARDOCTAG = {
+      className: 'doctag',
+      begin: '@[A-Za-z]+'
+    };
+    const IRB_OBJECT = {
+      begin: '#<',
+      end: '>'
+    };
+    const COMMENT_MODES = [
+      hljs.COMMENT(
+        '#',
+        '$',
+        { contains: [ YARDOCTAG ] }
+      ),
+      hljs.COMMENT(
+        '^=begin',
+        '^=end',
+        {
+          contains: [ YARDOCTAG ],
+          relevance: 10
         }
-      };
-
-      const ARGUMENT = {
-        className: "variable",
-        begin: /\$[\w_]+/
-      };
-
-      const PARENS = {
-        match: /(\((?!;)|\))+/,
-        className: "punctuation",
-        relevance: 0
-      };
-
-      const NUMBER = {
-        className: "number",
-        relevance: 0,
-        // borrowed from Prism, TODO: split out into variants
-        match: /[+-]?\b(?:\d(?:_?\d)*(?:\.\d(?:_?\d)*)?(?:[eE][+-]?\d(?:_?\d)*)?|0x[\da-fA-F](?:_?[\da-fA-F])*(?:\.[\da-fA-F](?:_?[\da-fA-D])*)?(?:[pP][+-]?\d(?:_?\d)*)?)\b|\binf\b|\bnan(?::0x[\da-fA-F](?:_?[\da-fA-D])*)?\b/
-      };
-
-      const TYPE = {
-        // look-ahead prevents us from gobbling up opcodes
-        match: /(i32|i64|f32|f64)(?!\.)/,
-        className: "type"
-      };
-
-      const MATH_OPERATIONS = {
-        className: "keyword",
-        // borrowed from Prism, TODO: split out into variants
-        match: /\b(f32|f64|i32|i64)(?:\.(?:abs|add|and|ceil|clz|const|convert_[su]\/i(?:32|64)|copysign|ctz|demote\/f64|div(?:_[su])?|eqz?|extend_[su]\/i32|floor|ge(?:_[su])?|gt(?:_[su])?|le(?:_[su])?|load(?:(?:8|16|32)_[su])?|lt(?:_[su])?|max|min|mul|nearest|neg?|or|popcnt|promote\/f32|reinterpret\/[fi](?:32|64)|rem_[su]|rot[lr]|shl|shr_[su]|store(?:8|16|32)?|sqrt|sub|trunc(?:_[su]\/f(?:32|64))?|wrap\/i64|xor))\b/
-      };
-
-      const OFFSET_ALIGN = {
-        match: [
-          /(?:offset|align)/,
-          /\s*/,
-          /=/
-        ],
-        className: {
-          1: "keyword",
-          3: "operator"
-        }
-      };
-
-      return {
-        name: 'WebAssembly',
-        keywords: {
-          $pattern: /[\w.]+/,
-          keyword: KWS
-        },
-        contains: [
-          LINE_COMMENT,
-          BLOCK_COMMENT,
-          OFFSET_ALIGN,
-          ARGUMENT,
-          PARENS,
-          FUNCTION_REFERENCE,
-          hljs.QUOTE_STRING_MODE,
-          TYPE,
-          MATH_OPERATIONS,
-          NUMBER
-        ]
-      };
-    }
-
-    /*
-    Language: YAML
-    Description: Yet Another Markdown Language
-    Author: Stefan Wienert <stwienert@gmail.com>
-    Contributors: Carl Baxter <carl@cbax.tech>
-    Requires: ruby.js
-    Website: https://yaml.org
-    Category: common, config
-    */
-    function yaml(hljs) {
-      const LITERALS = 'true false yes no null';
-
-      // YAML spec allows non-reserved URI characters in tags.
-      const URI_CHARACTERS = '[\\w#;/?:@&=+$,.~*\'()[\\]]+';
-
-      // Define keys as starting with a word character
-      // ...containing word chars, spaces, colons, forward-slashes, hyphens and periods
-      // ...and ending with a colon followed immediately by a space, tab or newline.
-      // The YAML spec allows for much more than this, but this covers most use-cases.
-      const KEY = {
-        className: 'attr',
-        variants: [
-          { begin: '\\w[\\w :\\/.-]*:(?=[ \t]|$)' },
-          { // double quoted keys
-            begin: '"\\w[\\w :\\/.-]*":(?=[ \t]|$)' },
-          { // single quoted keys
-            begin: '\'\\w[\\w :\\/.-]*\':(?=[ \t]|$)' }
-        ]
-      };
-
-      const TEMPLATE_VARIABLES = {
-        className: 'template-variable',
-        variants: [
-          { // jinja templates Ansible
-            begin: /\{\{/,
-            end: /\}\}/
-          },
-          { // Ruby i18n
-            begin: /%\{/,
-            end: /\}/
-          }
-        ]
-      };
-      const STRING = {
-        className: 'string',
-        relevance: 0,
-        variants: [
-          {
-            begin: /'/,
-            end: /'/
-          },
-          {
-            begin: /"/,
-            end: /"/
-          },
-          { begin: /\S+/ }
-        ],
-        contains: [
-          hljs.BACKSLASH_ESCAPE,
-          TEMPLATE_VARIABLES
-        ]
-      };
-
-      // Strings inside of value containers (objects) can't contain braces,
-      // brackets, or commas
-      const CONTAINER_STRING = hljs.inherit(STRING, { variants: [
+      ),
+      hljs.COMMENT('^__END__', hljs.MATCH_NOTHING_RE)
+    ];
+    const SUBST = {
+      className: 'subst',
+      begin: /#\{/,
+      end: /\}/,
+      keywords: RUBY_KEYWORDS
+    };
+    const STRING = {
+      className: 'string',
+      contains: [
+        hljs.BACKSLASH_ESCAPE,
+        SUBST
+      ],
+      variants: [
         {
           begin: /'/,
           end: /'/
@@ -12512,177 +9907,2900 @@ var hljs = (function () {
           begin: /"/,
           end: /"/
         },
-        { begin: /[^\s,{}[\]]+/ }
-      ] });
-
-      const DATE_RE = '[0-9]{4}(-[0-9][0-9]){0,2}';
-      const TIME_RE = '([Tt \\t][0-9][0-9]?(:[0-9][0-9]){2})?';
-      const FRACTION_RE = '(\\.[0-9]*)?';
-      const ZONE_RE = '([ \\t])*(Z|[-+][0-9][0-9]?(:[0-9][0-9])?)?';
-      const TIMESTAMP = {
-        className: 'number',
-        begin: '\\b' + DATE_RE + TIME_RE + FRACTION_RE + ZONE_RE + '\\b'
-      };
-
-      const VALUE_CONTAINER = {
-        end: ',',
-        endsWithParent: true,
-        excludeEnd: true,
-        keywords: LITERALS,
-        relevance: 0
-      };
-      const OBJECT = {
-        begin: /\{/,
-        end: /\}/,
-        contains: [ VALUE_CONTAINER ],
-        illegal: '\\n',
-        relevance: 0
-      };
-      const ARRAY = {
-        begin: '\\[',
-        end: '\\]',
-        contains: [ VALUE_CONTAINER ],
-        illegal: '\\n',
-        relevance: 0
-      };
-
-      const MODES = [
-        KEY,
         {
-          className: 'meta',
-          begin: '^---\\s*$',
-          relevance: 10
+          begin: /`/,
+          end: /`/
         },
-        { // multi line string
-          // Blocks start with a | or > followed by a newline
-          //
-          // Indentation of subsequent lines must be the same to
-          // be considered part of the block
-          className: 'string',
-          begin: '[\\|>]([1-9]?[+-])?[ ]*\\n( +)[^ ][^\\n]*\\n(\\2[^\\n]+\\n?)*'
+        {
+          begin: /%[qQwWx]?\(/,
+          end: /\)/
         },
-        { // Ruby/Rails erb
-          begin: '<%[%=-]?',
-          end: '[%-]?%>',
-          subLanguage: 'ruby',
+        {
+          begin: /%[qQwWx]?\[/,
+          end: /\]/
+        },
+        {
+          begin: /%[qQwWx]?\{/,
+          end: /\}/
+        },
+        {
+          begin: /%[qQwWx]?</,
+          end: />/
+        },
+        {
+          begin: /%[qQwWx]?\//,
+          end: /\//
+        },
+        {
+          begin: /%[qQwWx]?%/,
+          end: /%/
+        },
+        {
+          begin: /%[qQwWx]?-/,
+          end: /-/
+        },
+        {
+          begin: /%[qQwWx]?\|/,
+          end: /\|/
+        },
+        // in the following expressions, \B in the beginning suppresses recognition of ?-sequences
+        // where ? is the last character of a preceding identifier, as in: `func?4`
+        { begin: /\B\?(\\\d{1,3})/ },
+        { begin: /\B\?(\\x[A-Fa-f0-9]{1,2})/ },
+        { begin: /\B\?(\\u\{?[A-Fa-f0-9]{1,6}\}?)/ },
+        { begin: /\B\?(\\M-\\C-|\\M-\\c|\\c\\M-|\\M-|\\C-\\M-)[\x20-\x7e]/ },
+        { begin: /\B\?\\(c|C-)[\x20-\x7e]/ },
+        { begin: /\B\?\\?\S/ },
+        // heredocs
+        {
+          // this guard makes sure that we have an entire heredoc and not a false
+          // positive (auto-detect, etc.)
+          begin: regex.concat(
+            /<<[-~]?'?/,
+            regex.lookahead(/(\w+)(?=\W)[^\n]*\n(?:[^\n]*\n)*?\s*\1\b/)
+          ),
+          contains: [
+            hljs.END_SAME_AS_BEGIN({
+              begin: /(\w+)/,
+              end: /(\w+)/,
+              contains: [
+                hljs.BACKSLASH_ESCAPE,
+                SUBST
+              ]
+            })
+          ]
+        }
+      ]
+    };
+
+    // Ruby syntax is underdocumented, but this grammar seems to be accurate
+    // as of version 2.7.2 (confirmed with (irb and `Ripper.sexp(...)`)
+    // https://docs.ruby-lang.org/en/2.7.0/doc/syntax/literals_rdoc.html#label-Numbers
+    const decimal = '[1-9](_?[0-9])*|0';
+    const digits = '[0-9](_?[0-9])*';
+    const NUMBER = {
+      className: 'number',
+      relevance: 0,
+      variants: [
+        // decimal integer/float, optionally exponential or rational, optionally imaginary
+        { begin: `\\b(${decimal})(\\.(${digits}))?([eE][+-]?(${digits})|r)?i?\\b` },
+
+        // explicit decimal/binary/octal/hexadecimal integer,
+        // optionally rational and/or imaginary
+        { begin: "\\b0[dD][0-9](_?[0-9])*r?i?\\b" },
+        { begin: "\\b0[bB][0-1](_?[0-1])*r?i?\\b" },
+        { begin: "\\b0[oO][0-7](_?[0-7])*r?i?\\b" },
+        { begin: "\\b0[xX][0-9a-fA-F](_?[0-9a-fA-F])*r?i?\\b" },
+
+        // 0-prefixed implicit octal integer, optionally rational and/or imaginary
+        { begin: "\\b0(_?[0-7])+r?i?\\b" }
+      ]
+    };
+
+    const PARAMS = {
+      variants: [
+        {
+          match: /\(\)/,
+        },
+        {
+          className: 'params',
+          begin: /\(/,
+          end: /(?=\))/,
           excludeBegin: true,
-          excludeEnd: true,
-          relevance: 0
-        },
-        { // named tags
-          className: 'type',
-          begin: '!\\w+!' + URI_CHARACTERS
-        },
-        // https://yaml.org/spec/1.2/spec.html#id2784064
-        { // verbatim tags
-          className: 'type',
-          begin: '!<' + URI_CHARACTERS + ">"
-        },
-        { // primary tags
-          className: 'type',
-          begin: '!' + URI_CHARACTERS
-        },
-        { // secondary tags
-          className: 'type',
-          begin: '!!' + URI_CHARACTERS
-        },
-        { // fragment id &ref
-          className: 'meta',
-          begin: '&' + hljs.UNDERSCORE_IDENT_RE + '$'
-        },
-        { // fragment reference *ref
-          className: 'meta',
-          begin: '\\*' + hljs.UNDERSCORE_IDENT_RE + '$'
-        },
-        { // array listing
-          className: 'bullet',
-          // TODO: remove |$ hack when we have proper look-ahead support
-          begin: '-(?=[ ]|$)',
-          relevance: 0
-        },
-        hljs.HASH_COMMENT_MODE,
+          endsParent: true,
+          keywords: RUBY_KEYWORDS,
+        }
+      ]
+    };
+
+    const INCLUDE_EXTEND = {
+      match: [
+        /(include|extend)\s+/,
+        CLASS_NAME_WITH_NAMESPACE_RE
+      ],
+      scope: {
+        2: "title.class"
+      },
+      keywords: RUBY_KEYWORDS
+    };
+
+    const CLASS_DEFINITION = {
+      variants: [
         {
-          beginKeywords: LITERALS,
-          keywords: { literal: LITERALS }
+          match: [
+            /class\s+/,
+            CLASS_NAME_WITH_NAMESPACE_RE,
+            /\s+<\s+/,
+            CLASS_NAME_WITH_NAMESPACE_RE
+          ]
+        },
+        {
+          match: [
+            /\b(class|module)\s+/,
+            CLASS_NAME_WITH_NAMESPACE_RE
+          ]
+        }
+      ],
+      scope: {
+        2: "title.class",
+        4: "title.class.inherited"
+      },
+      keywords: RUBY_KEYWORDS
+    };
+
+    const UPPER_CASE_CONSTANT = {
+      relevance: 0,
+      match: /\b[A-Z][A-Z_0-9]+\b/,
+      className: "variable.constant"
+    };
+
+    const METHOD_DEFINITION = {
+      match: [
+        /def/, /\s+/,
+        RUBY_METHOD_RE
+      ],
+      scope: {
+        1: "keyword",
+        3: "title.function"
+      },
+      contains: [
+        PARAMS
+      ]
+    };
+
+    const OBJECT_CREATION = {
+      relevance: 0,
+      match: [
+        CLASS_NAME_WITH_NAMESPACE_RE,
+        /\.new[. (]/
+      ],
+      scope: {
+        1: "title.class"
+      }
+    };
+
+    // CamelCase
+    const CLASS_REFERENCE = {
+      relevance: 0,
+      match: CLASS_NAME_RE,
+      scope: "title.class"
+    };
+
+    const RUBY_DEFAULT_CONTAINS = [
+      STRING,
+      CLASS_DEFINITION,
+      INCLUDE_EXTEND,
+      OBJECT_CREATION,
+      UPPER_CASE_CONSTANT,
+      CLASS_REFERENCE,
+      METHOD_DEFINITION,
+      {
+        // swallow namespace qualifiers before symbols
+        begin: hljs.IDENT_RE + '::' },
+      {
+        className: 'symbol',
+        begin: hljs.UNDERSCORE_IDENT_RE + '(!|\\?)?:',
+        relevance: 0
+      },
+      {
+        className: 'symbol',
+        begin: ':(?!\\s)',
+        contains: [
+          STRING,
+          { begin: RUBY_METHOD_RE }
+        ],
+        relevance: 0
+      },
+      NUMBER,
+      {
+        // negative-look forward attempts to prevent false matches like:
+        // @ident@ or $ident$ that might indicate this is not ruby at all
+        className: "variable",
+        begin: '(\\$\\W)|((\\$|@@?)(\\w+))(?=[^@$?])' + `(?![A-Za-z])(?![@$?'])`
+      },
+      {
+        className: 'params',
+        begin: /\|/,
+        end: /\|/,
+        excludeBegin: true,
+        excludeEnd: true,
+        relevance: 0, // this could be a lot of things (in other languages) other than params
+        keywords: RUBY_KEYWORDS
+      },
+      { // regexp container
+        begin: '(' + hljs.RE_STARTERS_RE + '|unless)\\s*',
+        keywords: 'unless',
+        contains: [
+          {
+            className: 'regexp',
+            contains: [
+              hljs.BACKSLASH_ESCAPE,
+              SUBST
+            ],
+            illegal: /\n/,
+            variants: [
+              {
+                begin: '/',
+                end: '/[a-z]*'
+              },
+              {
+                begin: /%r\{/,
+                end: /\}[a-z]*/
+              },
+              {
+                begin: '%r\\(',
+                end: '\\)[a-z]*'
+              },
+              {
+                begin: '%r!',
+                end: '![a-z]*'
+              },
+              {
+                begin: '%r\\[',
+                end: '\\][a-z]*'
+              }
+            ]
+          }
+        ].concat(IRB_OBJECT, COMMENT_MODES),
+        relevance: 0
+      }
+    ].concat(IRB_OBJECT, COMMENT_MODES);
+
+    SUBST.contains = RUBY_DEFAULT_CONTAINS;
+    PARAMS.contains = RUBY_DEFAULT_CONTAINS;
+
+    // >>
+    // ?>
+    const SIMPLE_PROMPT = "[>?]>";
+    // irb(main):001:0>
+    const DEFAULT_PROMPT = "[\\w#]+\\(\\w+\\):\\d+:\\d+[>*]";
+    const RVM_PROMPT = "(\\w+-)?\\d+\\.\\d+\\.\\d+(p\\d+)?[^\\d][^>]+>";
+
+    const IRB_DEFAULT = [
+      {
+        begin: /^\s*=>/,
+        starts: {
+          end: '$',
+          contains: RUBY_DEFAULT_CONTAINS
+        }
+      },
+      {
+        className: 'meta.prompt',
+        begin: '^(' + SIMPLE_PROMPT + "|" + DEFAULT_PROMPT + '|' + RVM_PROMPT + ')(?=[ ])',
+        starts: {
+          end: '$',
+          keywords: RUBY_KEYWORDS,
+          contains: RUBY_DEFAULT_CONTAINS
+        }
+      }
+    ];
+
+    COMMENT_MODES.unshift(IRB_OBJECT);
+
+    return {
+      name: 'Ruby',
+      aliases: [
+        'rb',
+        'gemspec',
+        'podspec',
+        'thor',
+        'irb'
+      ],
+      keywords: RUBY_KEYWORDS,
+      illegal: /\/\*/,
+      contains: [ hljs.SHEBANG({ binary: "ruby" }) ]
+        .concat(IRB_DEFAULT)
+        .concat(COMMENT_MODES)
+        .concat(RUBY_DEFAULT_CONTAINS)
+    };
+  }
+
+  /*
+  Language: Rust
+  Author: Andrey Vlasovskikh <andrey.vlasovskikh@gmail.com>
+  Contributors: Roman Shmatov <romanshmatov@gmail.com>, Kasper Andersen <kma_untrusted@protonmail.com>
+  Website: https://www.rust-lang.org
+  Category: common, system
+  */
+
+  /** @type LanguageFn */
+  function rust(hljs) {
+    const regex = hljs.regex;
+    const FUNCTION_INVOKE = {
+      className: "title.function.invoke",
+      relevance: 0,
+      begin: regex.concat(
+        /\b/,
+        /(?!let\b)/,
+        hljs.IDENT_RE,
+        regex.lookahead(/\s*\(/))
+    };
+    const NUMBER_SUFFIX = '([ui](8|16|32|64|128|size)|f(32|64))\?';
+    const KEYWORDS = [
+      "abstract",
+      "as",
+      "async",
+      "await",
+      "become",
+      "box",
+      "break",
+      "const",
+      "continue",
+      "crate",
+      "do",
+      "dyn",
+      "else",
+      "enum",
+      "extern",
+      "false",
+      "final",
+      "fn",
+      "for",
+      "if",
+      "impl",
+      "in",
+      "let",
+      "loop",
+      "macro",
+      "match",
+      "mod",
+      "move",
+      "mut",
+      "override",
+      "priv",
+      "pub",
+      "ref",
+      "return",
+      "self",
+      "Self",
+      "static",
+      "struct",
+      "super",
+      "trait",
+      "true",
+      "try",
+      "type",
+      "typeof",
+      "unsafe",
+      "unsized",
+      "use",
+      "virtual",
+      "where",
+      "while",
+      "yield"
+    ];
+    const LITERALS = [
+      "true",
+      "false",
+      "Some",
+      "None",
+      "Ok",
+      "Err"
+    ];
+    const BUILTINS = [
+      // functions
+      'drop ',
+      // traits
+      "Copy",
+      "Send",
+      "Sized",
+      "Sync",
+      "Drop",
+      "Fn",
+      "FnMut",
+      "FnOnce",
+      "ToOwned",
+      "Clone",
+      "Debug",
+      "PartialEq",
+      "PartialOrd",
+      "Eq",
+      "Ord",
+      "AsRef",
+      "AsMut",
+      "Into",
+      "From",
+      "Default",
+      "Iterator",
+      "Extend",
+      "IntoIterator",
+      "DoubleEndedIterator",
+      "ExactSizeIterator",
+      "SliceConcatExt",
+      "ToString",
+      // macros
+      "assert!",
+      "assert_eq!",
+      "bitflags!",
+      "bytes!",
+      "cfg!",
+      "col!",
+      "concat!",
+      "concat_idents!",
+      "debug_assert!",
+      "debug_assert_eq!",
+      "env!",
+      "panic!",
+      "file!",
+      "format!",
+      "format_args!",
+      "include_bytes!",
+      "include_str!",
+      "line!",
+      "local_data_key!",
+      "module_path!",
+      "option_env!",
+      "print!",
+      "println!",
+      "select!",
+      "stringify!",
+      "try!",
+      "unimplemented!",
+      "unreachable!",
+      "vec!",
+      "write!",
+      "writeln!",
+      "macro_rules!",
+      "assert_ne!",
+      "debug_assert_ne!"
+    ];
+    const TYPES = [
+      "i8",
+      "i16",
+      "i32",
+      "i64",
+      "i128",
+      "isize",
+      "u8",
+      "u16",
+      "u32",
+      "u64",
+      "u128",
+      "usize",
+      "f32",
+      "f64",
+      "str",
+      "char",
+      "bool",
+      "Box",
+      "Option",
+      "Result",
+      "String",
+      "Vec"
+    ];
+    return {
+      name: 'Rust',
+      aliases: [ 'rs' ],
+      keywords: {
+        $pattern: hljs.IDENT_RE + '!?',
+        type: TYPES,
+        keyword: KEYWORDS,
+        literal: LITERALS,
+        built_in: BUILTINS
+      },
+      illegal: '</',
+      contains: [
+        hljs.C_LINE_COMMENT_MODE,
+        hljs.COMMENT('/\\*', '\\*/', { contains: [ 'self' ] }),
+        hljs.inherit(hljs.QUOTE_STRING_MODE, {
+          begin: /b?"/,
+          illegal: null
+        }),
+        {
+          className: 'string',
+          variants: [
+            { begin: /b?r(#*)"(.|\n)*?"\1(?!#)/ },
+            { begin: /b?'\\?(x\w{2}|u\w{4}|U\w{8}|.)'/ }
+          ]
+        },
+        {
+          className: 'symbol',
+          begin: /'[a-zA-Z_][a-zA-Z0-9_]*/
         },
-        TIMESTAMP,
-        // numbers are any valid C-style number that
-        // sit isolated from other words
         {
           className: 'number',
-          begin: hljs.C_NUMBER_RE + '\\b',
+          variants: [
+            { begin: '\\b0b([01_]+)' + NUMBER_SUFFIX },
+            { begin: '\\b0o([0-7_]+)' + NUMBER_SUFFIX },
+            { begin: '\\b0x([A-Fa-f0-9_]+)' + NUMBER_SUFFIX },
+            { begin: '\\b(\\d[\\d_]*(\\.[0-9_]+)?([eE][+-]?[0-9_]+)?)'
+                     + NUMBER_SUFFIX }
+          ],
           relevance: 0
         },
-        OBJECT,
-        ARRAY,
-        STRING
-      ];
+        {
+          begin: [
+            /fn/,
+            /\s+/,
+            hljs.UNDERSCORE_IDENT_RE
+          ],
+          className: {
+            1: "keyword",
+            3: "title.function"
+          }
+        },
+        {
+          className: 'meta',
+          begin: '#!?\\[',
+          end: '\\]',
+          contains: [
+            {
+              className: 'string',
+              begin: /"/,
+              end: /"/
+            }
+          ]
+        },
+        {
+          begin: [
+            /let/,
+            /\s+/,
+            /(?:mut\s+)?/,
+            hljs.UNDERSCORE_IDENT_RE
+          ],
+          className: {
+            1: "keyword",
+            3: "keyword",
+            4: "variable"
+          }
+        },
+        // must come before impl/for rule later
+        {
+          begin: [
+            /for/,
+            /\s+/,
+            hljs.UNDERSCORE_IDENT_RE,
+            /\s+/,
+            /in/
+          ],
+          className: {
+            1: "keyword",
+            3: "variable",
+            5: "keyword"
+          }
+        },
+        {
+          begin: [
+            /type/,
+            /\s+/,
+            hljs.UNDERSCORE_IDENT_RE
+          ],
+          className: {
+            1: "keyword",
+            3: "title.class"
+          }
+        },
+        {
+          begin: [
+            /(?:trait|enum|struct|union|impl|for)/,
+            /\s+/,
+            hljs.UNDERSCORE_IDENT_RE
+          ],
+          className: {
+            1: "keyword",
+            3: "title.class"
+          }
+        },
+        {
+          begin: hljs.IDENT_RE + '::',
+          keywords: {
+            keyword: "Self",
+            built_in: BUILTINS,
+            type: TYPES
+          }
+        },
+        {
+          className: "punctuation",
+          begin: '->'
+        },
+        FUNCTION_INVOKE
+      ]
+    };
+  }
 
-      const VALUE_MODES = [ ...MODES ];
-      VALUE_MODES.pop();
-      VALUE_MODES.push(CONTAINER_STRING);
-      VALUE_CONTAINER.contains = VALUE_MODES;
+  /*
+  Language: SCSS
+  Description: Scss is an extension of the syntax of CSS.
+  Author: Kurt Emch <kurt@kurtemch.com>
+  Website: https://sass-lang.com
+  Category: common, css, web
+  */
 
-      return {
-        name: 'YAML',
-        case_insensitive: true,
-        aliases: [ 'yml' ],
-        contains: MODES
-      };
-    }
+  /** @type LanguageFn */
+  function scss(hljs) {
+    const modes = MODES(hljs);
+    const PSEUDO_ELEMENTS$1 = PSEUDO_ELEMENTS;
+    const PSEUDO_CLASSES$1 = PSEUDO_CLASSES;
 
-    var builtIns = /*#__PURE__*/Object.freeze({
-        __proto__: null,
-        grmr_bash: bash,
-        grmr_c: c,
-        grmr_cpp: cpp,
-        grmr_csharp: csharp,
-        grmr_css: css,
-        grmr_diff: diff,
-        grmr_go: go,
-        grmr_graphql: graphql,
-        grmr_ini: ini,
-        grmr_java: java,
-        grmr_javascript: javascript,
-        grmr_json: json,
-        grmr_kotlin: kotlin,
-        grmr_less: less,
-        grmr_lua: lua,
-        grmr_makefile: makefile,
-        grmr_xml: xml,
-        grmr_markdown: markdown,
-        grmr_objectivec: objectivec,
-        grmr_perl: perl,
-        grmr_php: php,
-        grmr_php_template: phpTemplate,
-        grmr_plaintext: plaintext,
-        grmr_python: python,
-        grmr_python_repl: pythonRepl,
-        grmr_r: r,
-        grmr_ruby: ruby,
-        grmr_rust: rust,
-        grmr_scss: scss,
-        grmr_shell: shell,
-        grmr_sql: sql,
-        grmr_swift: swift,
-        grmr_typescript: typescript,
-        grmr_vbnet: vbnet,
-        grmr_wasm: wasm,
-        grmr_yaml: yaml
+    const AT_IDENTIFIER = '@[a-z-]+'; // @font-face
+    const AT_MODIFIERS = "and or not only";
+    const IDENT_RE = '[a-zA-Z-][a-zA-Z0-9_-]*';
+    const VARIABLE = {
+      className: 'variable',
+      begin: '(\\$' + IDENT_RE + ')\\b',
+      relevance: 0
+    };
+
+    return {
+      name: 'SCSS',
+      case_insensitive: true,
+      illegal: '[=/|\']',
+      contains: [
+        hljs.C_LINE_COMMENT_MODE,
+        hljs.C_BLOCK_COMMENT_MODE,
+        // to recognize keyframe 40% etc which are outside the scope of our
+        // attribute value mode
+        modes.CSS_NUMBER_MODE,
+        {
+          className: 'selector-id',
+          begin: '#[A-Za-z0-9_-]+',
+          relevance: 0
+        },
+        {
+          className: 'selector-class',
+          begin: '\\.[A-Za-z0-9_-]+',
+          relevance: 0
+        },
+        modes.ATTRIBUTE_SELECTOR_MODE,
+        {
+          className: 'selector-tag',
+          begin: '\\b(' + TAGS.join('|') + ')\\b',
+          // was there, before, but why?
+          relevance: 0
+        },
+        {
+          className: 'selector-pseudo',
+          begin: ':(' + PSEUDO_CLASSES$1.join('|') + ')'
+        },
+        {
+          className: 'selector-pseudo',
+          begin: ':(:)?(' + PSEUDO_ELEMENTS$1.join('|') + ')'
+        },
+        VARIABLE,
+        { // pseudo-selector params
+          begin: /\(/,
+          end: /\)/,
+          contains: [ modes.CSS_NUMBER_MODE ]
+        },
+        modes.CSS_VARIABLE,
+        {
+          className: 'attribute',
+          begin: '\\b(' + ATTRIBUTES.join('|') + ')\\b'
+        },
+        { begin: '\\b(whitespace|wait|w-resize|visible|vertical-text|vertical-ideographic|uppercase|upper-roman|upper-alpha|underline|transparent|top|thin|thick|text|text-top|text-bottom|tb-rl|table-header-group|table-footer-group|sw-resize|super|strict|static|square|solid|small-caps|separate|se-resize|scroll|s-resize|rtl|row-resize|ridge|right|repeat|repeat-y|repeat-x|relative|progress|pointer|overline|outside|outset|oblique|nowrap|not-allowed|normal|none|nw-resize|no-repeat|no-drop|newspaper|ne-resize|n-resize|move|middle|medium|ltr|lr-tb|lowercase|lower-roman|lower-alpha|loose|list-item|line|line-through|line-edge|lighter|left|keep-all|justify|italic|inter-word|inter-ideograph|inside|inset|inline|inline-block|inherit|inactive|ideograph-space|ideograph-parenthesis|ideograph-numeric|ideograph-alpha|horizontal|hidden|help|hand|groove|fixed|ellipsis|e-resize|double|dotted|distribute|distribute-space|distribute-letter|distribute-all-lines|disc|disabled|default|decimal|dashed|crosshair|collapse|col-resize|circle|char|center|capitalize|break-word|break-all|bottom|both|bolder|bold|block|bidi-override|below|baseline|auto|always|all-scroll|absolute|table|table-cell)\\b' },
+        {
+          begin: /:/,
+          end: /[;}{]/,
+          relevance: 0,
+          contains: [
+            modes.BLOCK_COMMENT,
+            VARIABLE,
+            modes.HEXCOLOR,
+            modes.CSS_NUMBER_MODE,
+            hljs.QUOTE_STRING_MODE,
+            hljs.APOS_STRING_MODE,
+            modes.IMPORTANT,
+            modes.FUNCTION_DISPATCH
+          ]
+        },
+        // matching these here allows us to treat them more like regular CSS
+        // rules so everything between the {} gets regular rule highlighting,
+        // which is what we want for page and font-face
+        {
+          begin: '@(page|font-face)',
+          keywords: {
+            $pattern: AT_IDENTIFIER,
+            keyword: '@page @font-face'
+          }
+        },
+        {
+          begin: '@',
+          end: '[{;]',
+          returnBegin: true,
+          keywords: {
+            $pattern: /[a-z-]+/,
+            keyword: AT_MODIFIERS,
+            attribute: MEDIA_FEATURES.join(" ")
+          },
+          contains: [
+            {
+              begin: AT_IDENTIFIER,
+              className: "keyword"
+            },
+            {
+              begin: /[a-z-]+(?=:)/,
+              className: "attribute"
+            },
+            VARIABLE,
+            hljs.QUOTE_STRING_MODE,
+            hljs.APOS_STRING_MODE,
+            modes.HEXCOLOR,
+            modes.CSS_NUMBER_MODE
+          ]
+        },
+        modes.FUNCTION_DISPATCH
+      ]
+    };
+  }
+
+  /*
+  Language: Shell Session
+  Requires: bash.js
+  Author: TSUYUSATO Kitsune <make.just.on@gmail.com>
+  Category: common
+  Audit: 2020
+  */
+
+  /** @type LanguageFn */
+  function shell(hljs) {
+    return {
+      name: 'Shell Session',
+      aliases: [
+        'console',
+        'shellsession'
+      ],
+      contains: [
+        {
+          className: 'meta.prompt',
+          // We cannot add \s (spaces) in the regular expression otherwise it will be too broad and produce unexpected result.
+          // For instance, in the following example, it would match "echo /path/to/home >" as a prompt:
+          // echo /path/to/home > t.exe
+          begin: /^\s{0,3}[/~\w\d[\]()@-]*[>%$#][ ]?/,
+          starts: {
+            end: /[^\\](?=\s*$)/,
+            subLanguage: 'bash'
+          }
+        }
+      ]
+    };
+  }
+
+  /*
+   Language: SQL
+   Website: https://en.wikipedia.org/wiki/SQL
+   Category: common, database
+   */
+
+  /*
+
+  Goals:
+
+  SQL is intended to highlight basic/common SQL keywords and expressions
+
+  - If pretty much every single SQL server includes supports, then it's a canidate.
+  - It is NOT intended to include tons of vendor specific keywords (Oracle, MySQL,
+    PostgreSQL) although the list of data types is purposely a bit more expansive.
+  - For more specific SQL grammars please see:
+    - PostgreSQL and PL/pgSQL - core
+    - T-SQL - https://github.com/highlightjs/highlightjs-tsql
+    - sql_more (core)
+
+   */
+
+  function sql(hljs) {
+    const regex = hljs.regex;
+    const COMMENT_MODE = hljs.COMMENT('--', '$');
+    const STRING = {
+      className: 'string',
+      variants: [
+        {
+          begin: /'/,
+          end: /'/,
+          contains: [ { begin: /''/ } ]
+        }
+      ]
+    };
+    const QUOTED_IDENTIFIER = {
+      begin: /"/,
+      end: /"/,
+      contains: [ { begin: /""/ } ]
+    };
+
+    const LITERALS = [
+      "true",
+      "false",
+      // Not sure it's correct to call NULL literal, and clauses like IS [NOT] NULL look strange that way.
+      // "null",
+      "unknown"
+    ];
+
+    const MULTI_WORD_TYPES = [
+      "double precision",
+      "large object",
+      "with timezone",
+      "without timezone"
+    ];
+
+    const TYPES = [
+      'bigint',
+      'binary',
+      'blob',
+      'boolean',
+      'char',
+      'character',
+      'clob',
+      'date',
+      'dec',
+      'decfloat',
+      'decimal',
+      'float',
+      'int',
+      'integer',
+      'interval',
+      'nchar',
+      'nclob',
+      'national',
+      'numeric',
+      'real',
+      'row',
+      'smallint',
+      'time',
+      'timestamp',
+      'varchar',
+      'varying', // modifier (character varying)
+      'varbinary'
+    ];
+
+    const NON_RESERVED_WORDS = [
+      "add",
+      "asc",
+      "collation",
+      "desc",
+      "final",
+      "first",
+      "last",
+      "view"
+    ];
+
+    // https://jakewheat.github.io/sql-overview/sql-2016-foundation-grammar.html#reserved-word
+    const RESERVED_WORDS = [
+      "abs",
+      "acos",
+      "all",
+      "allocate",
+      "alter",
+      "and",
+      "any",
+      "are",
+      "array",
+      "array_agg",
+      "array_max_cardinality",
+      "as",
+      "asensitive",
+      "asin",
+      "asymmetric",
+      "at",
+      "atan",
+      "atomic",
+      "authorization",
+      "avg",
+      "begin",
+      "begin_frame",
+      "begin_partition",
+      "between",
+      "bigint",
+      "binary",
+      "blob",
+      "boolean",
+      "both",
+      "by",
+      "call",
+      "called",
+      "cardinality",
+      "cascaded",
+      "case",
+      "cast",
+      "ceil",
+      "ceiling",
+      "char",
+      "char_length",
+      "character",
+      "character_length",
+      "check",
+      "classifier",
+      "clob",
+      "close",
+      "coalesce",
+      "collate",
+      "collect",
+      "column",
+      "commit",
+      "condition",
+      "connect",
+      "constraint",
+      "contains",
+      "convert",
+      "copy",
+      "corr",
+      "corresponding",
+      "cos",
+      "cosh",
+      "count",
+      "covar_pop",
+      "covar_samp",
+      "create",
+      "cross",
+      "cube",
+      "cume_dist",
+      "current",
+      "current_catalog",
+      "current_date",
+      "current_default_transform_group",
+      "current_path",
+      "current_role",
+      "current_row",
+      "current_schema",
+      "current_time",
+      "current_timestamp",
+      "current_path",
+      "current_role",
+      "current_transform_group_for_type",
+      "current_user",
+      "cursor",
+      "cycle",
+      "date",
+      "day",
+      "deallocate",
+      "dec",
+      "decimal",
+      "decfloat",
+      "declare",
+      "default",
+      "define",
+      "delete",
+      "dense_rank",
+      "deref",
+      "describe",
+      "deterministic",
+      "disconnect",
+      "distinct",
+      "double",
+      "drop",
+      "dynamic",
+      "each",
+      "element",
+      "else",
+      "empty",
+      "end",
+      "end_frame",
+      "end_partition",
+      "end-exec",
+      "equals",
+      "escape",
+      "every",
+      "except",
+      "exec",
+      "execute",
+      "exists",
+      "exp",
+      "external",
+      "extract",
+      "false",
+      "fetch",
+      "filter",
+      "first_value",
+      "float",
+      "floor",
+      "for",
+      "foreign",
+      "frame_row",
+      "free",
+      "from",
+      "full",
+      "function",
+      "fusion",
+      "get",
+      "global",
+      "grant",
+      "group",
+      "grouping",
+      "groups",
+      "having",
+      "hold",
+      "hour",
+      "identity",
+      "in",
+      "indicator",
+      "initial",
+      "inner",
+      "inout",
+      "insensitive",
+      "insert",
+      "int",
+      "integer",
+      "intersect",
+      "intersection",
+      "interval",
+      "into",
+      "is",
+      "join",
+      "json_array",
+      "json_arrayagg",
+      "json_exists",
+      "json_object",
+      "json_objectagg",
+      "json_query",
+      "json_table",
+      "json_table_primitive",
+      "json_value",
+      "lag",
+      "language",
+      "large",
+      "last_value",
+      "lateral",
+      "lead",
+      "leading",
+      "left",
+      "like",
+      "like_regex",
+      "listagg",
+      "ln",
+      "local",
+      "localtime",
+      "localtimestamp",
+      "log",
+      "log10",
+      "lower",
+      "match",
+      "match_number",
+      "match_recognize",
+      "matches",
+      "max",
+      "member",
+      "merge",
+      "method",
+      "min",
+      "minute",
+      "mod",
+      "modifies",
+      "module",
+      "month",
+      "multiset",
+      "national",
+      "natural",
+      "nchar",
+      "nclob",
+      "new",
+      "no",
+      "none",
+      "normalize",
+      "not",
+      "nth_value",
+      "ntile",
+      "null",
+      "nullif",
+      "numeric",
+      "octet_length",
+      "occurrences_regex",
+      "of",
+      "offset",
+      "old",
+      "omit",
+      "on",
+      "one",
+      "only",
+      "open",
+      "or",
+      "order",
+      "out",
+      "outer",
+      "over",
+      "overlaps",
+      "overlay",
+      "parameter",
+      "partition",
+      "pattern",
+      "per",
+      "percent",
+      "percent_rank",
+      "percentile_cont",
+      "percentile_disc",
+      "period",
+      "portion",
+      "position",
+      "position_regex",
+      "power",
+      "precedes",
+      "precision",
+      "prepare",
+      "primary",
+      "procedure",
+      "ptf",
+      "range",
+      "rank",
+      "reads",
+      "real",
+      "recursive",
+      "ref",
+      "references",
+      "referencing",
+      "regr_avgx",
+      "regr_avgy",
+      "regr_count",
+      "regr_intercept",
+      "regr_r2",
+      "regr_slope",
+      "regr_sxx",
+      "regr_sxy",
+      "regr_syy",
+      "release",
+      "result",
+      "return",
+      "returns",
+      "revoke",
+      "right",
+      "rollback",
+      "rollup",
+      "row",
+      "row_number",
+      "rows",
+      "running",
+      "savepoint",
+      "scope",
+      "scroll",
+      "search",
+      "second",
+      "seek",
+      "select",
+      "sensitive",
+      "session_user",
+      "set",
+      "show",
+      "similar",
+      "sin",
+      "sinh",
+      "skip",
+      "smallint",
+      "some",
+      "specific",
+      "specifictype",
+      "sql",
+      "sqlexception",
+      "sqlstate",
+      "sqlwarning",
+      "sqrt",
+      "start",
+      "static",
+      "stddev_pop",
+      "stddev_samp",
+      "submultiset",
+      "subset",
+      "substring",
+      "substring_regex",
+      "succeeds",
+      "sum",
+      "symmetric",
+      "system",
+      "system_time",
+      "system_user",
+      "table",
+      "tablesample",
+      "tan",
+      "tanh",
+      "then",
+      "time",
+      "timestamp",
+      "timezone_hour",
+      "timezone_minute",
+      "to",
+      "trailing",
+      "translate",
+      "translate_regex",
+      "translation",
+      "treat",
+      "trigger",
+      "trim",
+      "trim_array",
+      "true",
+      "truncate",
+      "uescape",
+      "union",
+      "unique",
+      "unknown",
+      "unnest",
+      "update",
+      "upper",
+      "user",
+      "using",
+      "value",
+      "values",
+      "value_of",
+      "var_pop",
+      "var_samp",
+      "varbinary",
+      "varchar",
+      "varying",
+      "versioning",
+      "when",
+      "whenever",
+      "where",
+      "width_bucket",
+      "window",
+      "with",
+      "within",
+      "without",
+      "year",
+    ];
+
+    // these are reserved words we have identified to be functions
+    // and should only be highlighted in a dispatch-like context
+    // ie, array_agg(...), etc.
+    const RESERVED_FUNCTIONS = [
+      "abs",
+      "acos",
+      "array_agg",
+      "asin",
+      "atan",
+      "avg",
+      "cast",
+      "ceil",
+      "ceiling",
+      "coalesce",
+      "corr",
+      "cos",
+      "cosh",
+      "count",
+      "covar_pop",
+      "covar_samp",
+      "cume_dist",
+      "dense_rank",
+      "deref",
+      "element",
+      "exp",
+      "extract",
+      "first_value",
+      "floor",
+      "json_array",
+      "json_arrayagg",
+      "json_exists",
+      "json_object",
+      "json_objectagg",
+      "json_query",
+      "json_table",
+      "json_table_primitive",
+      "json_value",
+      "lag",
+      "last_value",
+      "lead",
+      "listagg",
+      "ln",
+      "log",
+      "log10",
+      "lower",
+      "max",
+      "min",
+      "mod",
+      "nth_value",
+      "ntile",
+      "nullif",
+      "percent_rank",
+      "percentile_cont",
+      "percentile_disc",
+      "position",
+      "position_regex",
+      "power",
+      "rank",
+      "regr_avgx",
+      "regr_avgy",
+      "regr_count",
+      "regr_intercept",
+      "regr_r2",
+      "regr_slope",
+      "regr_sxx",
+      "regr_sxy",
+      "regr_syy",
+      "row_number",
+      "sin",
+      "sinh",
+      "sqrt",
+      "stddev_pop",
+      "stddev_samp",
+      "substring",
+      "substring_regex",
+      "sum",
+      "tan",
+      "tanh",
+      "translate",
+      "translate_regex",
+      "treat",
+      "trim",
+      "trim_array",
+      "unnest",
+      "upper",
+      "value_of",
+      "var_pop",
+      "var_samp",
+      "width_bucket",
+    ];
+
+    // these functions can
+    const POSSIBLE_WITHOUT_PARENS = [
+      "current_catalog",
+      "current_date",
+      "current_default_transform_group",
+      "current_path",
+      "current_role",
+      "current_schema",
+      "current_transform_group_for_type",
+      "current_user",
+      "session_user",
+      "system_time",
+      "system_user",
+      "current_time",
+      "localtime",
+      "current_timestamp",
+      "localtimestamp"
+    ];
+
+    // those exist to boost relevance making these very
+    // "SQL like" keyword combos worth +1 extra relevance
+    const COMBOS = [
+      "create table",
+      "insert into",
+      "primary key",
+      "foreign key",
+      "not null",
+      "alter table",
+      "add constraint",
+      "grouping sets",
+      "on overflow",
+      "character set",
+      "respect nulls",
+      "ignore nulls",
+      "nulls first",
+      "nulls last",
+      "depth first",
+      "breadth first"
+    ];
+
+    const FUNCTIONS = RESERVED_FUNCTIONS;
+
+    const KEYWORDS = [
+      ...RESERVED_WORDS,
+      ...NON_RESERVED_WORDS
+    ].filter((keyword) => {
+      return !RESERVED_FUNCTIONS.includes(keyword);
     });
 
-    const hljs = HighlightJS;
+    const VARIABLE = {
+      className: "variable",
+      begin: /@[a-z0-9][a-z0-9_]*/,
+    };
 
-    for (const key of Object.keys(builtIns)) {
-      // our builtInLanguages Rollup plugin has to use `_` to allow identifiers to be
-      // compatible with `export` naming conventions, so we need to convert the
-      // identifiers back into the more typical dash style that we use for language
-      // naming via the API
-      const languageName = key.replace("grmr_", "").replace("_", "-");
-      hljs.registerLanguage(languageName, builtIns[key]);
+    const OPERATOR = {
+      className: "operator",
+      begin: /[-+*/=%^~]|&&?|\|\|?|!=?|<(?:=>?|<|>)?|>[>=]?/,
+      relevance: 0,
+    };
+
+    const FUNCTION_CALL = {
+      begin: regex.concat(/\b/, regex.either(...FUNCTIONS), /\s*\(/),
+      relevance: 0,
+      keywords: { built_in: FUNCTIONS }
+    };
+
+    // keywords with less than 3 letters are reduced in relevancy
+    function reduceRelevancy(list, {
+      exceptions, when
+    } = {}) {
+      const qualifyFn = when;
+      exceptions = exceptions || [];
+      return list.map((item) => {
+        if (item.match(/\|\d+$/) || exceptions.includes(item)) {
+          return item;
+        } else if (qualifyFn(item)) {
+          return `${item}|0`;
+        } else {
+          return item;
+        }
+      });
     }
 
-    return hljs;
+    return {
+      name: 'SQL',
+      case_insensitive: true,
+      // does not include {} or HTML tags `</`
+      illegal: /[{}]|<\//,
+      keywords: {
+        $pattern: /\b[\w\.]+/,
+        keyword:
+          reduceRelevancy(KEYWORDS, { when: (x) => x.length < 3 }),
+        literal: LITERALS,
+        type: TYPES,
+        built_in: POSSIBLE_WITHOUT_PARENS
+      },
+      contains: [
+        {
+          begin: regex.either(...COMBOS),
+          relevance: 0,
+          keywords: {
+            $pattern: /[\w\.]+/,
+            keyword: KEYWORDS.concat(COMBOS),
+            literal: LITERALS,
+            type: TYPES
+          },
+        },
+        {
+          className: "type",
+          begin: regex.either(...MULTI_WORD_TYPES)
+        },
+        FUNCTION_CALL,
+        VARIABLE,
+        STRING,
+        QUOTED_IDENTIFIER,
+        hljs.C_NUMBER_MODE,
+        hljs.C_BLOCK_COMMENT_MODE,
+        COMMENT_MODE,
+        OPERATOR
+      ]
+    };
+  }
+
+  const keywordWrapper = keyword => concat(
+    /\b/,
+    keyword,
+    /\w$/.test(keyword) ? /\b/ : /\B/
+  );
+
+  // Keywords that require a leading dot.
+  const dotKeywords = [
+    'Protocol', // contextual
+    'Type' // contextual
+  ].map(keywordWrapper);
+
+  // Keywords that may have a leading dot.
+  const optionalDotKeywords = [
+    'init',
+    'self'
+  ].map(keywordWrapper);
+
+  // should register as keyword, not type
+  const keywordTypes = [
+    'Any',
+    'Self'
+  ];
+
+  // Regular keywords and literals.
+  const keywords = [
+    // strings below will be fed into the regular `keywords` engine while regex
+    // will result in additional modes being created to scan for those keywords to
+    // avoid conflicts with other rules
+    'actor',
+    'any', // contextual
+    'associatedtype',
+    'async',
+    'await',
+    /as\?/, // operator
+    /as!/, // operator
+    'as', // operator
+    'break',
+    'case',
+    'catch',
+    'class',
+    'continue',
+    'convenience', // contextual
+    'default',
+    'defer',
+    'deinit',
+    'didSet', // contextual
+    'distributed',
+    'do',
+    'dynamic', // contextual
+    'else',
+    'enum',
+    'extension',
+    'fallthrough',
+    /fileprivate\(set\)/,
+    'fileprivate',
+    'final', // contextual
+    'for',
+    'func',
+    'get', // contextual
+    'guard',
+    'if',
+    'import',
+    'indirect', // contextual
+    'infix', // contextual
+    /init\?/,
+    /init!/,
+    'inout',
+    /internal\(set\)/,
+    'internal',
+    'in',
+    'is', // operator
+    'isolated', // contextual
+    'nonisolated', // contextual
+    'lazy', // contextual
+    'let',
+    'mutating', // contextual
+    'nonmutating', // contextual
+    /open\(set\)/, // contextual
+    'open', // contextual
+    'operator',
+    'optional', // contextual
+    'override', // contextual
+    'postfix', // contextual
+    'precedencegroup',
+    'prefix', // contextual
+    /private\(set\)/,
+    'private',
+    'protocol',
+    /public\(set\)/,
+    'public',
+    'repeat',
+    'required', // contextual
+    'rethrows',
+    'return',
+    'set', // contextual
+    'some', // contextual
+    'static',
+    'struct',
+    'subscript',
+    'super',
+    'switch',
+    'throws',
+    'throw',
+    /try\?/, // operator
+    /try!/, // operator
+    'try', // operator
+    'typealias',
+    /unowned\(safe\)/, // contextual
+    /unowned\(unsafe\)/, // contextual
+    'unowned', // contextual
+    'var',
+    'weak', // contextual
+    'where',
+    'while',
+    'willSet' // contextual
+  ];
+
+  // NOTE: Contextual keywords are reserved only in specific contexts.
+  // Ideally, these should be matched using modes to avoid false positives.
+
+  // Literals.
+  const literals = [
+    'false',
+    'nil',
+    'true'
+  ];
+
+  // Keywords used in precedence groups.
+  const precedencegroupKeywords = [
+    'assignment',
+    'associativity',
+    'higherThan',
+    'left',
+    'lowerThan',
+    'none',
+    'right'
+  ];
+
+  // Keywords that start with a number sign (#).
+  // #(un)available is handled separately.
+  const numberSignKeywords = [
+    '#colorLiteral',
+    '#column',
+    '#dsohandle',
+    '#else',
+    '#elseif',
+    '#endif',
+    '#error',
+    '#file',
+    '#fileID',
+    '#fileLiteral',
+    '#filePath',
+    '#function',
+    '#if',
+    '#imageLiteral',
+    '#keyPath',
+    '#line',
+    '#selector',
+    '#sourceLocation',
+    '#warn_unqualified_access',
+    '#warning'
+  ];
+
+  // Global functions in the Standard Library.
+  const builtIns$1 = [
+    'abs',
+    'all',
+    'any',
+    'assert',
+    'assertionFailure',
+    'debugPrint',
+    'dump',
+    'fatalError',
+    'getVaList',
+    'isKnownUniquelyReferenced',
+    'max',
+    'min',
+    'numericCast',
+    'pointwiseMax',
+    'pointwiseMin',
+    'precondition',
+    'preconditionFailure',
+    'print',
+    'readLine',
+    'repeatElement',
+    'sequence',
+    'stride',
+    'swap',
+    'swift_unboxFromSwiftValueWithType',
+    'transcode',
+    'type',
+    'unsafeBitCast',
+    'unsafeDowncast',
+    'withExtendedLifetime',
+    'withUnsafeMutablePointer',
+    'withUnsafePointer',
+    'withVaList',
+    'withoutActuallyEscaping',
+    'zip'
+  ];
+
+  // Valid first characters for operators.
+  const operatorHead = either(
+    /[/=\-+!*%<>&|^~?]/,
+    /[\u00A1-\u00A7]/,
+    /[\u00A9\u00AB]/,
+    /[\u00AC\u00AE]/,
+    /[\u00B0\u00B1]/,
+    /[\u00B6\u00BB\u00BF\u00D7\u00F7]/,
+    /[\u2016-\u2017]/,
+    /[\u2020-\u2027]/,
+    /[\u2030-\u203E]/,
+    /[\u2041-\u2053]/,
+    /[\u2055-\u205E]/,
+    /[\u2190-\u23FF]/,
+    /[\u2500-\u2775]/,
+    /[\u2794-\u2BFF]/,
+    /[\u2E00-\u2E7F]/,
+    /[\u3001-\u3003]/,
+    /[\u3008-\u3020]/,
+    /[\u3030]/
+  );
+
+  // Valid characters for operators.
+  const operatorCharacter = either(
+    operatorHead,
+    /[\u0300-\u036F]/,
+    /[\u1DC0-\u1DFF]/,
+    /[\u20D0-\u20FF]/,
+    /[\uFE00-\uFE0F]/,
+    /[\uFE20-\uFE2F]/
+    // TODO: The following characters are also allowed, but the regex isn't supported yet.
+    // /[\u{E0100}-\u{E01EF}]/u
+  );
+
+  // Valid operator.
+  const operator = concat(operatorHead, operatorCharacter, '*');
+
+  // Valid first characters for identifiers.
+  const identifierHead = either(
+    /[a-zA-Z_]/,
+    /[\u00A8\u00AA\u00AD\u00AF\u00B2-\u00B5\u00B7-\u00BA]/,
+    /[\u00BC-\u00BE\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF]/,
+    /[\u0100-\u02FF\u0370-\u167F\u1681-\u180D\u180F-\u1DBF]/,
+    /[\u1E00-\u1FFF]/,
+    /[\u200B-\u200D\u202A-\u202E\u203F-\u2040\u2054\u2060-\u206F]/,
+    /[\u2070-\u20CF\u2100-\u218F\u2460-\u24FF\u2776-\u2793]/,
+    /[\u2C00-\u2DFF\u2E80-\u2FFF]/,
+    /[\u3004-\u3007\u3021-\u302F\u3031-\u303F\u3040-\uD7FF]/,
+    /[\uF900-\uFD3D\uFD40-\uFDCF\uFDF0-\uFE1F\uFE30-\uFE44]/,
+    /[\uFE47-\uFEFE\uFF00-\uFFFD]/ // Should be /[\uFE47-\uFFFD]/, but we have to exclude FEFF.
+    // The following characters are also allowed, but the regexes aren't supported yet.
+    // /[\u{10000}-\u{1FFFD}\u{20000-\u{2FFFD}\u{30000}-\u{3FFFD}\u{40000}-\u{4FFFD}]/u,
+    // /[\u{50000}-\u{5FFFD}\u{60000-\u{6FFFD}\u{70000}-\u{7FFFD}\u{80000}-\u{8FFFD}]/u,
+    // /[\u{90000}-\u{9FFFD}\u{A0000-\u{AFFFD}\u{B0000}-\u{BFFFD}\u{C0000}-\u{CFFFD}]/u,
+    // /[\u{D0000}-\u{DFFFD}\u{E0000-\u{EFFFD}]/u
+  );
+
+  // Valid characters for identifiers.
+  const identifierCharacter = either(
+    identifierHead,
+    /\d/,
+    /[\u0300-\u036F\u1DC0-\u1DFF\u20D0-\u20FF\uFE20-\uFE2F]/
+  );
+
+  // Valid identifier.
+  const identifier = concat(identifierHead, identifierCharacter, '*');
+
+  // Valid type identifier.
+  const typeIdentifier = concat(/[A-Z]/, identifierCharacter, '*');
+
+  // Built-in attributes, which are highlighted as keywords.
+  // @available is handled separately.
+  const keywordAttributes = [
+    'autoclosure',
+    concat(/convention\(/, either('swift', 'block', 'c'), /\)/),
+    'discardableResult',
+    'dynamicCallable',
+    'dynamicMemberLookup',
+    'escaping',
+    'frozen',
+    'GKInspectable',
+    'IBAction',
+    'IBDesignable',
+    'IBInspectable',
+    'IBOutlet',
+    'IBSegueAction',
+    'inlinable',
+    'main',
+    'nonobjc',
+    'NSApplicationMain',
+    'NSCopying',
+    'NSManaged',
+    concat(/objc\(/, identifier, /\)/),
+    'objc',
+    'objcMembers',
+    'propertyWrapper',
+    'requires_stored_property_inits',
+    'resultBuilder',
+    'testable',
+    'UIApplicationMain',
+    'unknown',
+    'usableFromInline'
+  ];
+
+  // Contextual keywords used in @available and #(un)available.
+  const availabilityKeywords = [
+    'iOS',
+    'iOSApplicationExtension',
+    'macOS',
+    'macOSApplicationExtension',
+    'macCatalyst',
+    'macCatalystApplicationExtension',
+    'watchOS',
+    'watchOSApplicationExtension',
+    'tvOS',
+    'tvOSApplicationExtension',
+    'swift'
+  ];
+
+  /*
+  Language: Swift
+  Description: Swift is a general-purpose programming language built using a modern approach to safety, performance, and software design patterns.
+  Author: Steven Van Impe <steven.vanimpe@icloud.com>
+  Contributors: Chris Eidhof <chris@eidhof.nl>, Nate Cook <natecook@gmail.com>, Alexander Lichter <manniL@gmx.net>, Richard Gibson <gibson042@github>
+  Website: https://swift.org
+  Category: common, system
+  */
+
+  /** @type LanguageFn */
+  function swift(hljs) {
+    const WHITESPACE = {
+      match: /\s+/,
+      relevance: 0
+    };
+    // https://docs.swift.org/swift-book/ReferenceManual/LexicalStructure.html#ID411
+    const BLOCK_COMMENT = hljs.COMMENT(
+      '/\\*',
+      '\\*/',
+      { contains: [ 'self' ] }
+    );
+    const COMMENTS = [
+      hljs.C_LINE_COMMENT_MODE,
+      BLOCK_COMMENT
+    ];
+
+    // https://docs.swift.org/swift-book/ReferenceManual/LexicalStructure.html#ID413
+    // https://docs.swift.org/swift-book/ReferenceManual/zzSummaryOfTheGrammar.html
+    const DOT_KEYWORD = {
+      match: [
+        /\./,
+        either(...dotKeywords, ...optionalDotKeywords)
+      ],
+      className: { 2: "keyword" }
+    };
+    const KEYWORD_GUARD = {
+      // Consume .keyword to prevent highlighting properties and methods as keywords.
+      match: concat(/\./, either(...keywords)),
+      relevance: 0
+    };
+    const PLAIN_KEYWORDS = keywords
+      .filter(kw => typeof kw === 'string')
+      .concat([ "_|0" ]); // seems common, so 0 relevance
+    const REGEX_KEYWORDS = keywords
+      .filter(kw => typeof kw !== 'string') // find regex
+      .concat(keywordTypes)
+      .map(keywordWrapper);
+    const KEYWORD = { variants: [
+      {
+        className: 'keyword',
+        match: either(...REGEX_KEYWORDS, ...optionalDotKeywords)
+      }
+    ] };
+    // find all the regular keywords
+    const KEYWORDS = {
+      $pattern: either(
+        /\b\w+/, // regular keywords
+        /#\w+/ // number keywords
+      ),
+      keyword: PLAIN_KEYWORDS
+        .concat(numberSignKeywords),
+      literal: literals
+    };
+    const KEYWORD_MODES = [
+      DOT_KEYWORD,
+      KEYWORD_GUARD,
+      KEYWORD
+    ];
+
+    // https://github.com/apple/swift/tree/main/stdlib/public/core
+    const BUILT_IN_GUARD = {
+      // Consume .built_in to prevent highlighting properties and methods.
+      match: concat(/\./, either(...builtIns$1)),
+      relevance: 0
+    };
+    const BUILT_IN = {
+      className: 'built_in',
+      match: concat(/\b/, either(...builtIns$1), /(?=\()/)
+    };
+    const BUILT_INS = [
+      BUILT_IN_GUARD,
+      BUILT_IN
+    ];
+
+    // https://docs.swift.org/swift-book/ReferenceManual/LexicalStructure.html#ID418
+    const OPERATOR_GUARD = {
+      // Prevent -> from being highlighting as an operator.
+      match: /->/,
+      relevance: 0
+    };
+    const OPERATOR = {
+      className: 'operator',
+      relevance: 0,
+      variants: [
+        { match: operator },
+        {
+          // dot-operator: only operators that start with a dot are allowed to use dots as
+          // characters (..., ...<, .*, etc). So there rule here is: a dot followed by one or more
+          // characters that may also include dots.
+          match: `\\.(\\.|${operatorCharacter})+` }
+      ]
+    };
+    const OPERATORS = [
+      OPERATOR_GUARD,
+      OPERATOR
+    ];
+
+    // https://docs.swift.org/swift-book/ReferenceManual/LexicalStructure.html#grammar_numeric-literal
+    // TODO: Update for leading `-` after lookbehind is supported everywhere
+    const decimalDigits = '([0-9]_*)+';
+    const hexDigits = '([0-9a-fA-F]_*)+';
+    const NUMBER = {
+      className: 'number',
+      relevance: 0,
+      variants: [
+        // decimal floating-point-literal (subsumes decimal-literal)
+        { match: `\\b(${decimalDigits})(\\.(${decimalDigits}))?` + `([eE][+-]?(${decimalDigits}))?\\b` },
+        // hexadecimal floating-point-literal (subsumes hexadecimal-literal)
+        { match: `\\b0x(${hexDigits})(\\.(${hexDigits}))?` + `([pP][+-]?(${decimalDigits}))?\\b` },
+        // octal-literal
+        { match: /\b0o([0-7]_*)+\b/ },
+        // binary-literal
+        { match: /\b0b([01]_*)+\b/ }
+      ]
+    };
+
+    // https://docs.swift.org/swift-book/ReferenceManual/LexicalStructure.html#grammar_string-literal
+    const ESCAPED_CHARACTER = (rawDelimiter = "") => ({
+      className: 'subst',
+      variants: [
+        { match: concat(/\\/, rawDelimiter, /[0\\tnr"']/) },
+        { match: concat(/\\/, rawDelimiter, /u\{[0-9a-fA-F]{1,8}\}/) }
+      ]
+    });
+    const ESCAPED_NEWLINE = (rawDelimiter = "") => ({
+      className: 'subst',
+      match: concat(/\\/, rawDelimiter, /[\t ]*(?:[\r\n]|\r\n)/)
+    });
+    const INTERPOLATION = (rawDelimiter = "") => ({
+      className: 'subst',
+      label: "interpol",
+      begin: concat(/\\/, rawDelimiter, /\(/),
+      end: /\)/
+    });
+    const MULTILINE_STRING = (rawDelimiter = "") => ({
+      begin: concat(rawDelimiter, /"""/),
+      end: concat(/"""/, rawDelimiter),
+      contains: [
+        ESCAPED_CHARACTER(rawDelimiter),
+        ESCAPED_NEWLINE(rawDelimiter),
+        INTERPOLATION(rawDelimiter)
+      ]
+    });
+    const SINGLE_LINE_STRING = (rawDelimiter = "") => ({
+      begin: concat(rawDelimiter, /"/),
+      end: concat(/"/, rawDelimiter),
+      contains: [
+        ESCAPED_CHARACTER(rawDelimiter),
+        INTERPOLATION(rawDelimiter)
+      ]
+    });
+    const STRING = {
+      className: 'string',
+      variants: [
+        MULTILINE_STRING(),
+        MULTILINE_STRING("#"),
+        MULTILINE_STRING("##"),
+        MULTILINE_STRING("###"),
+        SINGLE_LINE_STRING(),
+        SINGLE_LINE_STRING("#"),
+        SINGLE_LINE_STRING("##"),
+        SINGLE_LINE_STRING("###")
+      ]
+    };
+
+    // https://docs.swift.org/swift-book/ReferenceManual/LexicalStructure.html#ID412
+    const QUOTED_IDENTIFIER = { match: concat(/`/, identifier, /`/) };
+    const IMPLICIT_PARAMETER = {
+      className: 'variable',
+      match: /\$\d+/
+    };
+    const PROPERTY_WRAPPER_PROJECTION = {
+      className: 'variable',
+      match: `\\$${identifierCharacter}+`
+    };
+    const IDENTIFIERS = [
+      QUOTED_IDENTIFIER,
+      IMPLICIT_PARAMETER,
+      PROPERTY_WRAPPER_PROJECTION
+    ];
+
+    // https://docs.swift.org/swift-book/ReferenceManual/Attributes.html
+    const AVAILABLE_ATTRIBUTE = {
+      match: /(@|#(un)?)available/,
+      className: "keyword",
+      starts: { contains: [
+        {
+          begin: /\(/,
+          end: /\)/,
+          keywords: availabilityKeywords,
+          contains: [
+            ...OPERATORS,
+            NUMBER,
+            STRING
+          ]
+        }
+      ] }
+    };
+    const KEYWORD_ATTRIBUTE = {
+      className: 'keyword',
+      match: concat(/@/, either(...keywordAttributes))
+    };
+    const USER_DEFINED_ATTRIBUTE = {
+      className: 'meta',
+      match: concat(/@/, identifier)
+    };
+    const ATTRIBUTES = [
+      AVAILABLE_ATTRIBUTE,
+      KEYWORD_ATTRIBUTE,
+      USER_DEFINED_ATTRIBUTE
+    ];
+
+    // https://docs.swift.org/swift-book/ReferenceManual/Types.html
+    const TYPE = {
+      match: lookahead(/\b[A-Z]/),
+      relevance: 0,
+      contains: [
+        { // Common Apple frameworks, for relevance boost
+          className: 'type',
+          match: concat(/(AV|CA|CF|CG|CI|CL|CM|CN|CT|MK|MP|MTK|MTL|NS|SCN|SK|UI|WK|XC)/, identifierCharacter, '+')
+        },
+        { // Type identifier
+          className: 'type',
+          match: typeIdentifier,
+          relevance: 0
+        },
+        { // Optional type
+          match: /[?!]+/,
+          relevance: 0
+        },
+        { // Variadic parameter
+          match: /\.\.\./,
+          relevance: 0
+        },
+        { // Protocol composition
+          match: concat(/\s+&\s+/, lookahead(typeIdentifier)),
+          relevance: 0
+        }
+      ]
+    };
+    const GENERIC_ARGUMENTS = {
+      begin: /</,
+      end: />/,
+      keywords: KEYWORDS,
+      contains: [
+        ...COMMENTS,
+        ...KEYWORD_MODES,
+        ...ATTRIBUTES,
+        OPERATOR_GUARD,
+        TYPE
+      ]
+    };
+    TYPE.contains.push(GENERIC_ARGUMENTS);
+
+    // https://docs.swift.org/swift-book/ReferenceManual/Expressions.html#ID552
+    // Prevents element names from being highlighted as keywords.
+    const TUPLE_ELEMENT_NAME = {
+      match: concat(identifier, /\s*:/),
+      keywords: "_|0",
+      relevance: 0
+    };
+    // Matches tuples as well as the parameter list of a function type.
+    const TUPLE = {
+      begin: /\(/,
+      end: /\)/,
+      relevance: 0,
+      keywords: KEYWORDS,
+      contains: [
+        'self',
+        TUPLE_ELEMENT_NAME,
+        ...COMMENTS,
+        ...KEYWORD_MODES,
+        ...BUILT_INS,
+        ...OPERATORS,
+        NUMBER,
+        STRING,
+        ...IDENTIFIERS,
+        ...ATTRIBUTES,
+        TYPE
+      ]
+    };
+
+    const GENERIC_PARAMETERS = {
+      begin: /</,
+      end: />/,
+      contains: [
+        ...COMMENTS,
+        TYPE
+      ]
+    };
+    const FUNCTION_PARAMETER_NAME = {
+      begin: either(
+        lookahead(concat(identifier, /\s*:/)),
+        lookahead(concat(identifier, /\s+/, identifier, /\s*:/))
+      ),
+      end: /:/,
+      relevance: 0,
+      contains: [
+        {
+          className: 'keyword',
+          match: /\b_\b/
+        },
+        {
+          className: 'params',
+          match: identifier
+        }
+      ]
+    };
+    const FUNCTION_PARAMETERS = {
+      begin: /\(/,
+      end: /\)/,
+      keywords: KEYWORDS,
+      contains: [
+        FUNCTION_PARAMETER_NAME,
+        ...COMMENTS,
+        ...KEYWORD_MODES,
+        ...OPERATORS,
+        NUMBER,
+        STRING,
+        ...ATTRIBUTES,
+        TYPE,
+        TUPLE
+      ],
+      endsParent: true,
+      illegal: /["']/
+    };
+    // https://docs.swift.org/swift-book/ReferenceManual/Declarations.html#ID362
+    const FUNCTION = {
+      match: [
+        /func/,
+        /\s+/,
+        either(QUOTED_IDENTIFIER.match, identifier, operator)
+      ],
+      className: {
+        1: "keyword",
+        3: "title.function"
+      },
+      contains: [
+        GENERIC_PARAMETERS,
+        FUNCTION_PARAMETERS,
+        WHITESPACE
+      ],
+      illegal: [
+        /\[/,
+        /%/
+      ]
+    };
+
+    // https://docs.swift.org/swift-book/ReferenceManual/Declarations.html#ID375
+    // https://docs.swift.org/swift-book/ReferenceManual/Declarations.html#ID379
+    const INIT_SUBSCRIPT = {
+      match: [
+        /\b(?:subscript|init[?!]?)/,
+        /\s*(?=[<(])/,
+      ],
+      className: { 1: "keyword" },
+      contains: [
+        GENERIC_PARAMETERS,
+        FUNCTION_PARAMETERS,
+        WHITESPACE
+      ],
+      illegal: /\[|%/
+    };
+    // https://docs.swift.org/swift-book/ReferenceManual/Declarations.html#ID380
+    const OPERATOR_DECLARATION = {
+      match: [
+        /operator/,
+        /\s+/,
+        operator
+      ],
+      className: {
+        1: "keyword",
+        3: "title"
+      }
+    };
+
+    // https://docs.swift.org/swift-book/ReferenceManual/Declarations.html#ID550
+    const PRECEDENCEGROUP = {
+      begin: [
+        /precedencegroup/,
+        /\s+/,
+        typeIdentifier
+      ],
+      className: {
+        1: "keyword",
+        3: "title"
+      },
+      contains: [ TYPE ],
+      keywords: [
+        ...precedencegroupKeywords,
+        ...literals
+      ],
+      end: /}/
+    };
+
+    // Add supported submodes to string interpolation.
+    for (const variant of STRING.variants) {
+      const interpolation = variant.contains.find(mode => mode.label === "interpol");
+      // TODO: Interpolation can contain any expression, so there's room for improvement here.
+      interpolation.keywords = KEYWORDS;
+      const submodes = [
+        ...KEYWORD_MODES,
+        ...BUILT_INS,
+        ...OPERATORS,
+        NUMBER,
+        STRING,
+        ...IDENTIFIERS
+      ];
+      interpolation.contains = [
+        ...submodes,
+        {
+          begin: /\(/,
+          end: /\)/,
+          contains: [
+            'self',
+            ...submodes
+          ]
+        }
+      ];
+    }
+
+    return {
+      name: 'Swift',
+      keywords: KEYWORDS,
+      contains: [
+        ...COMMENTS,
+        FUNCTION,
+        INIT_SUBSCRIPT,
+        {
+          beginKeywords: 'struct protocol class extension enum actor',
+          end: '\\{',
+          excludeEnd: true,
+          keywords: KEYWORDS,
+          contains: [
+            hljs.inherit(hljs.TITLE_MODE, {
+              className: "title.class",
+              begin: /[A-Za-z$_][\u00C0-\u02B80-9A-Za-z$_]*/
+            }),
+            ...KEYWORD_MODES
+          ]
+        },
+        OPERATOR_DECLARATION,
+        PRECEDENCEGROUP,
+        {
+          beginKeywords: 'import',
+          end: /$/,
+          contains: [ ...COMMENTS ],
+          relevance: 0
+        },
+        ...KEYWORD_MODES,
+        ...BUILT_INS,
+        ...OPERATORS,
+        NUMBER,
+        STRING,
+        ...IDENTIFIERS,
+        ...ATTRIBUTES,
+        TYPE,
+        TUPLE
+      ]
+    };
+  }
+
+  /*
+  Language: TypeScript
+  Author: Panu Horsmalahti <panu.horsmalahti@iki.fi>
+  Contributors: Ike Ku <dempfi@yahoo.com>
+  Description: TypeScript is a strict superset of JavaScript
+  Website: https://www.typescriptlang.org
+  Category: common, scripting
+  */
+
+  /** @type LanguageFn */
+  function typescript(hljs) {
+    const tsLanguage = javascript(hljs);
+
+    const IDENT_RE$1 = IDENT_RE;
+    const TYPES = [
+      "any",
+      "void",
+      "number",
+      "boolean",
+      "string",
+      "object",
+      "never",
+      "symbol",
+      "bigint",
+      "unknown"
+    ];
+    const NAMESPACE = {
+      beginKeywords: 'namespace',
+      end: /\{/,
+      excludeEnd: true,
+      contains: [ tsLanguage.exports.CLASS_REFERENCE ]
+    };
+    const INTERFACE = {
+      beginKeywords: 'interface',
+      end: /\{/,
+      excludeEnd: true,
+      keywords: {
+        keyword: 'interface extends',
+        built_in: TYPES
+      },
+      contains: [ tsLanguage.exports.CLASS_REFERENCE ]
+    };
+    const USE_STRICT = {
+      className: 'meta',
+      relevance: 10,
+      begin: /^\s*['"]use strict['"]/
+    };
+    const TS_SPECIFIC_KEYWORDS = [
+      "type",
+      "namespace",
+      "interface",
+      "public",
+      "private",
+      "protected",
+      "implements",
+      "declare",
+      "abstract",
+      "readonly",
+      "enum",
+      "override"
+    ];
+    const KEYWORDS$1 = {
+      $pattern: IDENT_RE,
+      keyword: KEYWORDS.concat(TS_SPECIFIC_KEYWORDS),
+      literal: LITERALS,
+      built_in: BUILT_INS.concat(TYPES),
+      "variable.language": BUILT_IN_VARIABLES
+    };
+    const DECORATOR = {
+      className: 'meta',
+      begin: '@' + IDENT_RE$1,
+    };
+
+    const swapMode = (mode, label, replacement) => {
+      const indx = mode.contains.findIndex(m => m.label === label);
+      if (indx === -1) { throw new Error("can not find mode to replace"); }
+
+      mode.contains.splice(indx, 1, replacement);
+    };
+
+
+    // this should update anywhere keywords is used since
+    // it will be the same actual JS object
+    Object.assign(tsLanguage.keywords, KEYWORDS$1);
+
+    tsLanguage.exports.PARAMS_CONTAINS.push(DECORATOR);
+    tsLanguage.contains = tsLanguage.contains.concat([
+      DECORATOR,
+      NAMESPACE,
+      INTERFACE,
+    ]);
+
+    // TS gets a simpler shebang rule than JS
+    swapMode(tsLanguage, "shebang", hljs.SHEBANG());
+    // JS use strict rule purposely excludes `asm` which makes no sense
+    swapMode(tsLanguage, "use_strict", USE_STRICT);
+
+    const functionDeclaration = tsLanguage.contains.find(m => m.label === "func.def");
+    functionDeclaration.relevance = 0; // () => {} is more typical in TypeScript
+
+    Object.assign(tsLanguage, {
+      name: 'TypeScript',
+      aliases: [
+        'ts',
+        'tsx',
+        'mts',
+        'cts'
+      ]
+    });
+
+    return tsLanguage;
+  }
+
+  /*
+  Language: Visual Basic .NET
+  Description: Visual Basic .NET (VB.NET) is a multi-paradigm, object-oriented programming language, implemented on the .NET Framework.
+  Authors: Poren Chiang <ren.chiang@gmail.com>, Jan Pilzer
+  Website: https://docs.microsoft.com/dotnet/visual-basic/getting-started
+  Category: common
+  */
+
+  /** @type LanguageFn */
+  function vbnet(hljs) {
+    const regex = hljs.regex;
+    /**
+     * Character Literal
+     * Either a single character ("a"C) or an escaped double quote (""""C).
+     */
+    const CHARACTER = {
+      className: 'string',
+      begin: /"(""|[^/n])"C\b/
+    };
+
+    const STRING = {
+      className: 'string',
+      begin: /"/,
+      end: /"/,
+      illegal: /\n/,
+      contains: [
+        {
+          // double quote escape
+          begin: /""/ }
+      ]
+    };
+
+    /** Date Literals consist of a date, a time, or both separated by whitespace, surrounded by # */
+    const MM_DD_YYYY = /\d{1,2}\/\d{1,2}\/\d{4}/;
+    const YYYY_MM_DD = /\d{4}-\d{1,2}-\d{1,2}/;
+    const TIME_12H = /(\d|1[012])(:\d+){0,2} *(AM|PM)/;
+    const TIME_24H = /\d{1,2}(:\d{1,2}){1,2}/;
+    const DATE = {
+      className: 'literal',
+      variants: [
+        {
+          // #YYYY-MM-DD# (ISO-Date) or #M/D/YYYY# (US-Date)
+          begin: regex.concat(/# */, regex.either(YYYY_MM_DD, MM_DD_YYYY), / *#/) },
+        {
+          // #H:mm[:ss]# (24h Time)
+          begin: regex.concat(/# */, TIME_24H, / *#/) },
+        {
+          // #h[:mm[:ss]] A# (12h Time)
+          begin: regex.concat(/# */, TIME_12H, / *#/) },
+        {
+          // date plus time
+          begin: regex.concat(
+            /# */,
+            regex.either(YYYY_MM_DD, MM_DD_YYYY),
+            / +/,
+            regex.either(TIME_12H, TIME_24H),
+            / *#/
+          ) }
+      ]
+    };
+
+    const NUMBER = {
+      className: 'number',
+      relevance: 0,
+      variants: [
+        {
+          // Float
+          begin: /\b\d[\d_]*((\.[\d_]+(E[+-]?[\d_]+)?)|(E[+-]?[\d_]+))[RFD@!#]?/ },
+        {
+          // Integer (base 10)
+          begin: /\b\d[\d_]*((U?[SIL])|[%&])?/ },
+        {
+          // Integer (base 16)
+          begin: /&H[\dA-F_]+((U?[SIL])|[%&])?/ },
+        {
+          // Integer (base 8)
+          begin: /&O[0-7_]+((U?[SIL])|[%&])?/ },
+        {
+          // Integer (base 2)
+          begin: /&B[01_]+((U?[SIL])|[%&])?/ }
+      ]
+    };
+
+    const LABEL = {
+      className: 'label',
+      begin: /^\w+:/
+    };
+
+    const DOC_COMMENT = hljs.COMMENT(/'''/, /$/, { contains: [
+      {
+        className: 'doctag',
+        begin: /<\/?/,
+        end: />/
+      }
+    ] });
+
+    const COMMENT = hljs.COMMENT(null, /$/, { variants: [
+      { begin: /'/ },
+      {
+        // TODO: Use multi-class for leading spaces
+        begin: /([\t ]|^)REM(?=\s)/ }
+    ] });
+
+    const DIRECTIVES = {
+      className: 'meta',
+      // TODO: Use multi-class for indentation once available
+      begin: /[\t ]*#(const|disable|else|elseif|enable|end|externalsource|if|region)\b/,
+      end: /$/,
+      keywords: { keyword:
+          'const disable else elseif enable end externalsource if region then' },
+      contains: [ COMMENT ]
+    };
+
+    return {
+      name: 'Visual Basic .NET',
+      aliases: [ 'vb' ],
+      case_insensitive: true,
+      classNameAliases: { label: 'symbol' },
+      keywords: {
+        keyword:
+          'addhandler alias aggregate ansi as async assembly auto binary by byref byval ' /* a-b */
+          + 'call case catch class compare const continue custom declare default delegate dim distinct do ' /* c-d */
+          + 'each equals else elseif end enum erase error event exit explicit finally for friend from function ' /* e-f */
+          + 'get global goto group handles if implements imports in inherits interface into iterator ' /* g-i */
+          + 'join key let lib loop me mid module mustinherit mustoverride mybase myclass ' /* j-m */
+          + 'namespace narrowing new next notinheritable notoverridable ' /* n */
+          + 'of off on operator option optional order overloads overridable overrides ' /* o */
+          + 'paramarray partial preserve private property protected public ' /* p */
+          + 'raiseevent readonly redim removehandler resume return ' /* r */
+          + 'select set shadows shared skip static step stop structure strict sub synclock ' /* s */
+          + 'take text then throw to try unicode until using when where while widening with withevents writeonly yield' /* t-y */,
+        built_in:
+          // Operators https://docs.microsoft.com/dotnet/visual-basic/language-reference/operators
+          'addressof and andalso await directcast gettype getxmlnamespace is isfalse isnot istrue like mod nameof new not or orelse trycast typeof xor '
+          // Type Conversion Functions https://docs.microsoft.com/dotnet/visual-basic/language-reference/functions/type-conversion-functions
+          + 'cbool cbyte cchar cdate cdbl cdec cint clng cobj csbyte cshort csng cstr cuint culng cushort',
+        type:
+          // Data types https://docs.microsoft.com/dotnet/visual-basic/language-reference/data-types
+          'boolean byte char date decimal double integer long object sbyte short single string uinteger ulong ushort',
+        literal: 'true false nothing'
+      },
+      illegal:
+        '//|\\{|\\}|endif|gosub|variant|wend|^\\$ ' /* reserved deprecated keywords */,
+      contains: [
+        CHARACTER,
+        STRING,
+        DATE,
+        NUMBER,
+        LABEL,
+        DOC_COMMENT,
+        COMMENT,
+        DIRECTIVES
+      ]
+    };
+  }
+
+  /*
+  Language: WebAssembly
+  Website: https://webassembly.org
+  Description:  Wasm is designed as a portable compilation target for programming languages, enabling deployment on the web for client and server applications.
+  Category: web, common
+  Audit: 2020
+  */
+
+  /** @type LanguageFn */
+  function wasm(hljs) {
+    hljs.regex;
+    const BLOCK_COMMENT = hljs.COMMENT(/\(;/, /;\)/);
+    BLOCK_COMMENT.contains.push("self");
+    const LINE_COMMENT = hljs.COMMENT(/;;/, /$/);
+
+    const KWS = [
+      "anyfunc",
+      "block",
+      "br",
+      "br_if",
+      "br_table",
+      "call",
+      "call_indirect",
+      "data",
+      "drop",
+      "elem",
+      "else",
+      "end",
+      "export",
+      "func",
+      "global.get",
+      "global.set",
+      "local.get",
+      "local.set",
+      "local.tee",
+      "get_global",
+      "get_local",
+      "global",
+      "if",
+      "import",
+      "local",
+      "loop",
+      "memory",
+      "memory.grow",
+      "memory.size",
+      "module",
+      "mut",
+      "nop",
+      "offset",
+      "param",
+      "result",
+      "return",
+      "select",
+      "set_global",
+      "set_local",
+      "start",
+      "table",
+      "tee_local",
+      "then",
+      "type",
+      "unreachable"
+    ];
+
+    const FUNCTION_REFERENCE = {
+      begin: [
+        /(?:func|call|call_indirect)/,
+        /\s+/,
+        /\$[^\s)]+/
+      ],
+      className: {
+        1: "keyword",
+        3: "title.function"
+      }
+    };
+
+    const ARGUMENT = {
+      className: "variable",
+      begin: /\$[\w_]+/
+    };
+
+    const PARENS = {
+      match: /(\((?!;)|\))+/,
+      className: "punctuation",
+      relevance: 0
+    };
+
+    const NUMBER = {
+      className: "number",
+      relevance: 0,
+      // borrowed from Prism, TODO: split out into variants
+      match: /[+-]?\b(?:\d(?:_?\d)*(?:\.\d(?:_?\d)*)?(?:[eE][+-]?\d(?:_?\d)*)?|0x[\da-fA-F](?:_?[\da-fA-F])*(?:\.[\da-fA-F](?:_?[\da-fA-D])*)?(?:[pP][+-]?\d(?:_?\d)*)?)\b|\binf\b|\bnan(?::0x[\da-fA-F](?:_?[\da-fA-D])*)?\b/
+    };
+
+    const TYPE = {
+      // look-ahead prevents us from gobbling up opcodes
+      match: /(i32|i64|f32|f64)(?!\.)/,
+      className: "type"
+    };
+
+    const MATH_OPERATIONS = {
+      className: "keyword",
+      // borrowed from Prism, TODO: split out into variants
+      match: /\b(f32|f64|i32|i64)(?:\.(?:abs|add|and|ceil|clz|const|convert_[su]\/i(?:32|64)|copysign|ctz|demote\/f64|div(?:_[su])?|eqz?|extend_[su]\/i32|floor|ge(?:_[su])?|gt(?:_[su])?|le(?:_[su])?|load(?:(?:8|16|32)_[su])?|lt(?:_[su])?|max|min|mul|nearest|neg?|or|popcnt|promote\/f32|reinterpret\/[fi](?:32|64)|rem_[su]|rot[lr]|shl|shr_[su]|store(?:8|16|32)?|sqrt|sub|trunc(?:_[su]\/f(?:32|64))?|wrap\/i64|xor))\b/
+    };
+
+    const OFFSET_ALIGN = {
+      match: [
+        /(?:offset|align)/,
+        /\s*/,
+        /=/
+      ],
+      className: {
+        1: "keyword",
+        3: "operator"
+      }
+    };
+
+    return {
+      name: 'WebAssembly',
+      keywords: {
+        $pattern: /[\w.]+/,
+        keyword: KWS
+      },
+      contains: [
+        LINE_COMMENT,
+        BLOCK_COMMENT,
+        OFFSET_ALIGN,
+        ARGUMENT,
+        PARENS,
+        FUNCTION_REFERENCE,
+        hljs.QUOTE_STRING_MODE,
+        TYPE,
+        MATH_OPERATIONS,
+        NUMBER
+      ]
+    };
+  }
+
+  /*
+  Language: YAML
+  Description: Yet Another Markdown Language
+  Author: Stefan Wienert <stwienert@gmail.com>
+  Contributors: Carl Baxter <carl@cbax.tech>
+  Requires: ruby.js
+  Website: https://yaml.org
+  Category: common, config
+  */
+  function yaml(hljs) {
+    const LITERALS = 'true false yes no null';
+
+    // YAML spec allows non-reserved URI characters in tags.
+    const URI_CHARACTERS = '[\\w#;/?:@&=+$,.~*\'()[\\]]+';
+
+    // Define keys as starting with a word character
+    // ...containing word chars, spaces, colons, forward-slashes, hyphens and periods
+    // ...and ending with a colon followed immediately by a space, tab or newline.
+    // The YAML spec allows for much more than this, but this covers most use-cases.
+    const KEY = {
+      className: 'attr',
+      variants: [
+        { begin: '\\w[\\w :\\/.-]*:(?=[ \t]|$)' },
+        { // double quoted keys
+          begin: '"\\w[\\w :\\/.-]*":(?=[ \t]|$)' },
+        { // single quoted keys
+          begin: '\'\\w[\\w :\\/.-]*\':(?=[ \t]|$)' }
+      ]
+    };
+
+    const TEMPLATE_VARIABLES = {
+      className: 'template-variable',
+      variants: [
+        { // jinja templates Ansible
+          begin: /\{\{/,
+          end: /\}\}/
+        },
+        { // Ruby i18n
+          begin: /%\{/,
+          end: /\}/
+        }
+      ]
+    };
+    const STRING = {
+      className: 'string',
+      relevance: 0,
+      variants: [
+        {
+          begin: /'/,
+          end: /'/
+        },
+        {
+          begin: /"/,
+          end: /"/
+        },
+        { begin: /\S+/ }
+      ],
+      contains: [
+        hljs.BACKSLASH_ESCAPE,
+        TEMPLATE_VARIABLES
+      ]
+    };
+
+    // Strings inside of value containers (objects) can't contain braces,
+    // brackets, or commas
+    const CONTAINER_STRING = hljs.inherit(STRING, { variants: [
+      {
+        begin: /'/,
+        end: /'/
+      },
+      {
+        begin: /"/,
+        end: /"/
+      },
+      { begin: /[^\s,{}[\]]+/ }
+    ] });
+
+    const DATE_RE = '[0-9]{4}(-[0-9][0-9]){0,2}';
+    const TIME_RE = '([Tt \\t][0-9][0-9]?(:[0-9][0-9]){2})?';
+    const FRACTION_RE = '(\\.[0-9]*)?';
+    const ZONE_RE = '([ \\t])*(Z|[-+][0-9][0-9]?(:[0-9][0-9])?)?';
+    const TIMESTAMP = {
+      className: 'number',
+      begin: '\\b' + DATE_RE + TIME_RE + FRACTION_RE + ZONE_RE + '\\b'
+    };
+
+    const VALUE_CONTAINER = {
+      end: ',',
+      endsWithParent: true,
+      excludeEnd: true,
+      keywords: LITERALS,
+      relevance: 0
+    };
+    const OBJECT = {
+      begin: /\{/,
+      end: /\}/,
+      contains: [ VALUE_CONTAINER ],
+      illegal: '\\n',
+      relevance: 0
+    };
+    const ARRAY = {
+      begin: '\\[',
+      end: '\\]',
+      contains: [ VALUE_CONTAINER ],
+      illegal: '\\n',
+      relevance: 0
+    };
+
+    const MODES = [
+      KEY,
+      {
+        className: 'meta',
+        begin: '^---\\s*$',
+        relevance: 10
+      },
+      { // multi line string
+        // Blocks start with a | or > followed by a newline
+        //
+        // Indentation of subsequent lines must be the same to
+        // be considered part of the block
+        className: 'string',
+        begin: '[\\|>]([1-9]?[+-])?[ ]*\\n( +)[^ ][^\\n]*\\n(\\2[^\\n]+\\n?)*'
+      },
+      { // Ruby/Rails erb
+        begin: '<%[%=-]?',
+        end: '[%-]?%>',
+        subLanguage: 'ruby',
+        excludeBegin: true,
+        excludeEnd: true,
+        relevance: 0
+      },
+      { // named tags
+        className: 'type',
+        begin: '!\\w+!' + URI_CHARACTERS
+      },
+      // https://yaml.org/spec/1.2/spec.html#id2784064
+      { // verbatim tags
+        className: 'type',
+        begin: '!<' + URI_CHARACTERS + ">"
+      },
+      { // primary tags
+        className: 'type',
+        begin: '!' + URI_CHARACTERS
+      },
+      { // secondary tags
+        className: 'type',
+        begin: '!!' + URI_CHARACTERS
+      },
+      { // fragment id &ref
+        className: 'meta',
+        begin: '&' + hljs.UNDERSCORE_IDENT_RE + '$'
+      },
+      { // fragment reference *ref
+        className: 'meta',
+        begin: '\\*' + hljs.UNDERSCORE_IDENT_RE + '$'
+      },
+      { // array listing
+        className: 'bullet',
+        // TODO: remove |$ hack when we have proper look-ahead support
+        begin: '-(?=[ ]|$)',
+        relevance: 0
+      },
+      hljs.HASH_COMMENT_MODE,
+      {
+        beginKeywords: LITERALS,
+        keywords: { literal: LITERALS }
+      },
+      TIMESTAMP,
+      // numbers are any valid C-style number that
+      // sit isolated from other words
+      {
+        className: 'number',
+        begin: hljs.C_NUMBER_RE + '\\b',
+        relevance: 0
+      },
+      OBJECT,
+      ARRAY,
+      STRING
+    ];
+
+    const VALUE_MODES = [ ...MODES ];
+    VALUE_MODES.pop();
+    VALUE_MODES.push(CONTAINER_STRING);
+    VALUE_CONTAINER.contains = VALUE_MODES;
+
+    return {
+      name: 'YAML',
+      case_insensitive: true,
+      aliases: [ 'yml' ],
+      contains: MODES
+    };
+  }
+
+  var builtIns = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    grmr_bash: bash,
+    grmr_c: c,
+    grmr_cpp: cpp,
+    grmr_csharp: csharp,
+    grmr_css: css,
+    grmr_diff: diff,
+    grmr_go: go,
+    grmr_graphql: graphql,
+    grmr_ini: ini,
+    grmr_java: java,
+    grmr_javascript: javascript,
+    grmr_json: json,
+    grmr_kotlin: kotlin,
+    grmr_less: less,
+    grmr_lua: lua,
+    grmr_makefile: makefile,
+    grmr_xml: xml,
+    grmr_markdown: markdown,
+    grmr_objectivec: objectivec,
+    grmr_perl: perl,
+    grmr_php: php,
+    grmr_php_template: phpTemplate,
+    grmr_plaintext: plaintext,
+    grmr_python: python,
+    grmr_python_repl: pythonRepl,
+    grmr_r: r,
+    grmr_ruby: ruby,
+    grmr_rust: rust,
+    grmr_scss: scss,
+    grmr_shell: shell,
+    grmr_sql: sql,
+    grmr_swift: swift,
+    grmr_typescript: typescript,
+    grmr_vbnet: vbnet,
+    grmr_wasm: wasm,
+    grmr_yaml: yaml
+  });
+
+  const hljs = HighlightJS;
+
+  for (const key of Object.keys(builtIns)) {
+    // our builtInLanguages Rollup plugin has to use `_` to allow identifiers to be
+    // compatible with `export` naming conventions, so we need to convert the
+    // identifiers back into the more typical dash style that we use for language
+    // naming via the API
+    const languageName = key.replace("grmr_", "").replace("_", "-");
+    hljs.registerLanguage(languageName, builtIns[key]);
+  }
+
+  return hljs;
 
 })();
 if (typeof exports === 'object' && typeof module !== 'undefined') { module.exports = hljs; }
diff --git a/vendor/assets/javascripts/highlightjs/highlight.min.js b/vendor/assets/javascripts/highlightjs/highlight.min.js
index 43482e35e15..cf572403f0c 100644
--- a/vendor/assets/javascripts/highlightjs/highlight.min.js
+++ b/vendor/assets/javascripts/highlightjs/highlight.min.js
@@ -1,33 +1,33 @@
 /*!
-  Highlight.js v11.6.0 (git: bed790f3f3)
-  (c) 2006-2022 undefined and other contributors
+  Highlight.js v11.8.0 (git: 65687a907b)
+  (c) 2006-2023 undefined and other contributors
   License: BSD-3-Clause
  */
-var hljs=function(){"use strict";var e={exports:{}};function n(e){
-return e instanceof Map?e.clear=e.delete=e.set=()=>{
-throw Error("map is read-only")}:e instanceof Set&&(e.add=e.clear=e.delete=()=>{
+var hljs=function(){"use strict";function e(n){
+return n instanceof Map?n.clear=n.delete=n.set=()=>{
+throw Error("map is read-only")}:n instanceof Set&&(n.add=n.clear=n.delete=()=>{
 throw Error("set is read-only")
-}),Object.freeze(e),Object.getOwnPropertyNames(e).forEach((t=>{var a=e[t]
-;"object"!=typeof a||Object.isFrozen(a)||n(a)})),e}
-e.exports=n,e.exports.default=n;class t{constructor(e){
+}),Object.freeze(n),Object.getOwnPropertyNames(n).forEach((t=>{
+const a=n[t],i=typeof a;"object"!==i&&"function"!==i||Object.isFrozen(a)||e(a)
+})),n}class n{constructor(e){
 void 0===e.data&&(e.data={}),this.data=e.data,this.isMatchIgnored=!1}
-ignoreMatch(){this.isMatchIgnored=!0}}function a(e){
+ignoreMatch(){this.isMatchIgnored=!0}}function t(e){
 return e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#x27;")
-}function i(e,...n){const t=Object.create(null);for(const n in e)t[n]=e[n]
-;return n.forEach((e=>{for(const n in e)t[n]=e[n]})),t}
-const r=e=>!!e.scope||e.sublanguage&&e.language;class s{constructor(e,n){
+}function a(e,...n){const t=Object.create(null);for(const n in e)t[n]=e[n]
+;return n.forEach((e=>{for(const n in e)t[n]=e[n]})),t}const i=e=>!!e.scope
+;class r{constructor(e,n){
 this.buffer="",this.classPrefix=n.classPrefix,e.walk(this)}addText(e){
-this.buffer+=a(e)}openNode(e){if(!r(e))return;let n=""
-;n=e.sublanguage?"language-"+e.language:((e,{prefix:n})=>{if(e.includes(".")){
-const t=e.split(".")
+this.buffer+=t(e)}openNode(e){if(!i(e))return;const n=((e,{prefix:n})=>{
+if(e.startsWith("language:"))return e.replace("language:","language-")
+;if(e.includes(".")){const t=e.split(".")
 ;return[`${n}${t.shift()}`,...t.map(((e,n)=>`${e}${"_".repeat(n+1)}`))].join(" ")
-}return`${n}${e}`})(e.scope,{prefix:this.classPrefix}),this.span(n)}
-closeNode(e){r(e)&&(this.buffer+="</span>")}value(){return this.buffer}span(e){
-this.buffer+=`<span class="${e}">`}}const o=(e={})=>{const n={children:[]}
-;return Object.assign(n,e),n};class l{constructor(){
-this.rootNode=o(),this.stack=[this.rootNode]}get top(){
+}return`${n}${e}`})(e.scope,{prefix:this.classPrefix});this.span(n)}
+closeNode(e){i(e)&&(this.buffer+="</span>")}value(){return this.buffer}span(e){
+this.buffer+=`<span class="${e}">`}}const s=(e={})=>{const n={children:[]}
+;return Object.assign(n,e),n};class o{constructor(){
+this.rootNode=s(),this.stack=[this.rootNode]}get top(){
 return this.stack[this.stack.length-1]}get root(){return this.rootNode}add(e){
-this.top.children.push(e)}openNode(e){const n=o({scope:e})
+this.top.children.push(e)}openNode(e){const n=s({scope:e})
 ;this.add(n),this.stack.push(n)}closeNode(){
 if(this.stack.length>1)return this.stack.pop()}closeAllNodes(){
 for(;this.closeNode(););}toJSON(){return JSON.stringify(this.rootNode,null,4)}
@@ -35,104 +35,105 @@ walk(e){return this.constructor._walk(e,this.rootNode)}static _walk(e,n){
 return"string"==typeof n?e.addText(n):n.children&&(e.openNode(n),
 n.children.forEach((n=>this._walk(e,n))),e.closeNode(n)),e}static _collapse(e){
 "string"!=typeof e&&e.children&&(e.children.every((e=>"string"==typeof e))?e.children=[e.children.join("")]:e.children.forEach((e=>{
-l._collapse(e)})))}}class c extends l{constructor(e){super(),this.options=e}
-addKeyword(e,n){""!==e&&(this.openNode(n),this.addText(e),this.closeNode())}
-addText(e){""!==e&&this.add(e)}addSublanguage(e,n){const t=e.root
-;t.sublanguage=!0,t.language=n,this.add(t)}toHTML(){
-return new s(this,this.options).value()}finalize(){return!0}}function d(e){
-return e?"string"==typeof e?e:e.source:null}function g(e){return m("(?=",e,")")}
-function u(e){return m("(?:",e,")*")}function b(e){return m("(?:",e,")?")}
-function m(...e){return e.map((e=>d(e))).join("")}function p(...e){const n=(e=>{
+o._collapse(e)})))}}class l extends o{constructor(e){super(),this.options=e}
+addText(e){""!==e&&this.add(e)}startScope(e){this.openNode(e)}endScope(){
+this.closeNode()}__addSublanguage(e,n){const t=e.root
+;n&&(t.scope="language:"+n),this.add(t)}toHTML(){
+return new r(this,this.options).value()}finalize(){
+return this.closeAllNodes(),!0}}function c(e){
+return e?"string"==typeof e?e:e.source:null}function d(e){return b("(?=",e,")")}
+function g(e){return b("(?:",e,")*")}function u(e){return b("(?:",e,")?")}
+function b(...e){return e.map((e=>c(e))).join("")}function m(...e){const n=(e=>{
 const n=e[e.length-1]
 ;return"object"==typeof n&&n.constructor===Object?(e.splice(e.length-1,1),n):{}
-})(e);return"("+(n.capture?"":"?:")+e.map((e=>d(e))).join("|")+")"}
-function _(e){return RegExp(e.toString()+"|").exec("").length-1}
-const h=/\[(?:[^\\\]]|\\.)*\]|\(\??|\\([1-9][0-9]*)|\\./
-;function f(e,{joinWith:n}){let t=0;return e.map((e=>{t+=1;const n=t
-;let a=d(e),i="";for(;a.length>0;){const e=h.exec(a);if(!e){i+=a;break}
+})(e);return"("+(n.capture?"":"?:")+e.map((e=>c(e))).join("|")+")"}
+function p(e){return RegExp(e.toString()+"|").exec("").length-1}
+const _=/\[(?:[^\\\]]|\\.)*\]|\(\??|\\([1-9][0-9]*)|\\./
+;function h(e,{joinWith:n}){let t=0;return e.map((e=>{t+=1;const n=t
+;let a=c(e),i="";for(;a.length>0;){const e=_.exec(a);if(!e){i+=a;break}
 i+=a.substring(0,e.index),
 a=a.substring(e.index+e[0].length),"\\"===e[0][0]&&e[1]?i+="\\"+(Number(e[1])+n):(i+=e[0],
 "("===e[0]&&t++)}return i})).map((e=>`(${e})`)).join(n)}
-const E="[a-zA-Z]\\w*",y="[a-zA-Z_]\\w*",w="\\b\\d+(\\.\\d+)?",N="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",v="\\b(0b[01]+)",O={
-begin:"\\\\[\\s\\S]",relevance:0},k={scope:"string",begin:"'",end:"'",
-illegal:"\\n",contains:[O]},x={scope:"string",begin:'"',end:'"',illegal:"\\n",
-contains:[O]},M=(e,n,t={})=>{const a=i({scope:"comment",begin:e,end:n,
-contains:[]},t);a.contains.push({scope:"doctag",
+const f="[a-zA-Z]\\w*",E="[a-zA-Z_]\\w*",y="\\b\\d+(\\.\\d+)?",N="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",w="\\b(0b[01]+)",v={
+begin:"\\\\[\\s\\S]",relevance:0},O={scope:"string",begin:"'",end:"'",
+illegal:"\\n",contains:[v]},k={scope:"string",begin:'"',end:'"',illegal:"\\n",
+contains:[v]},x=(e,n,t={})=>{const i=a({scope:"comment",begin:e,end:n,
+contains:[]},t);i.contains.push({scope:"doctag",
 begin:"[ ]*(?=(TODO|FIXME|NOTE|BUG|OPTIMIZE|HACK|XXX):)",
 end:/(TODO|FIXME|NOTE|BUG|OPTIMIZE|HACK|XXX):/,excludeBegin:!0,relevance:0})
-;const r=p("I","a","is","so","us","to","at","if","in","it","on",/[A-Za-z]+['](d|ve|re|ll|t|s|n)/,/[A-Za-z]+[-][a-z]+/,/[A-Za-z][a-z]{2,}/)
-;return a.contains.push({begin:m(/[ ]+/,"(",r,/[.]?[:]?([.][ ]|[ ])/,"){3}")}),a
-},S=M("//","$"),A=M("/\\*","\\*/"),C=M("#","$");var T=Object.freeze({
-__proto__:null,MATCH_NOTHING_RE:/\b\B/,IDENT_RE:E,UNDERSCORE_IDENT_RE:y,
-NUMBER_RE:w,C_NUMBER_RE:N,BINARY_NUMBER_RE:v,
+;const r=m("I","a","is","so","us","to","at","if","in","it","on",/[A-Za-z]+['](d|ve|re|ll|t|s|n)/,/[A-Za-z]+[-][a-z]+/,/[A-Za-z][a-z]{2,}/)
+;return i.contains.push({begin:b(/[ ]+/,"(",r,/[.]?[:]?([.][ ]|[ ])/,"){3}")}),i
+},M=x("//","$"),S=x("/\\*","\\*/"),A=x("#","$");var C=Object.freeze({
+__proto__:null,MATCH_NOTHING_RE:/\b\B/,IDENT_RE:f,UNDERSCORE_IDENT_RE:E,
+NUMBER_RE:y,C_NUMBER_RE:N,BINARY_NUMBER_RE:w,
 RE_STARTERS_RE:"!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",
 SHEBANG:(e={})=>{const n=/^#![ ]*\//
-;return e.binary&&(e.begin=m(n,/.*\b/,e.binary,/\b.*/)),i({scope:"meta",begin:n,
+;return e.binary&&(e.begin=b(n,/.*\b/,e.binary,/\b.*/)),a({scope:"meta",begin:n,
 end:/$/,relevance:0,"on:begin":(e,n)=>{0!==e.index&&n.ignoreMatch()}},e)},
-BACKSLASH_ESCAPE:O,APOS_STRING_MODE:k,QUOTE_STRING_MODE:x,PHRASAL_WORDS_MODE:{
+BACKSLASH_ESCAPE:v,APOS_STRING_MODE:O,QUOTE_STRING_MODE:k,PHRASAL_WORDS_MODE:{
 begin:/\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|they|like|more)\b/
-},COMMENT:M,C_LINE_COMMENT_MODE:S,C_BLOCK_COMMENT_MODE:A,HASH_COMMENT_MODE:C,
-NUMBER_MODE:{scope:"number",begin:w,relevance:0},C_NUMBER_MODE:{scope:"number",
-begin:N,relevance:0},BINARY_NUMBER_MODE:{scope:"number",begin:v,relevance:0},
+},COMMENT:x,C_LINE_COMMENT_MODE:M,C_BLOCK_COMMENT_MODE:S,HASH_COMMENT_MODE:A,
+NUMBER_MODE:{scope:"number",begin:y,relevance:0},C_NUMBER_MODE:{scope:"number",
+begin:N,relevance:0},BINARY_NUMBER_MODE:{scope:"number",begin:w,relevance:0},
 REGEXP_MODE:{begin:/(?=\/[^/\n]*\/)/,contains:[{scope:"regexp",begin:/\//,
-end:/\/[gimuy]*/,illegal:/\n/,contains:[O,{begin:/\[/,end:/\]/,relevance:0,
-contains:[O]}]}]},TITLE_MODE:{scope:"title",begin:E,relevance:0},
-UNDERSCORE_TITLE_MODE:{scope:"title",begin:y,relevance:0},METHOD_GUARD:{
-begin:"\\.\\s*[a-zA-Z_]\\w*",relevance:0},END_SAME_AS_BEGIN:e=>Object.assign(e,{
+end:/\/[gimuy]*/,illegal:/\n/,contains:[v,{begin:/\[/,end:/\]/,relevance:0,
+contains:[v]}]}]},TITLE_MODE:{scope:"title",begin:f,relevance:0},
+UNDERSCORE_TITLE_MODE:{scope:"title",begin:E,relevance:0},METHOD_GUARD:{
+begin:"\\.\\s*"+E,relevance:0},END_SAME_AS_BEGIN:e=>Object.assign(e,{
 "on:begin":(e,n)=>{n.data._beginMatch=e[1]},"on:end":(e,n)=>{
-n.data._beginMatch!==e[1]&&n.ignoreMatch()}})});function R(e,n){
-"."===e.input[e.index-1]&&n.ignoreMatch()}function D(e,n){
-void 0!==e.className&&(e.scope=e.className,delete e.className)}function I(e,n){
+n.data._beginMatch!==e[1]&&n.ignoreMatch()}})});function T(e,n){
+"."===e.input[e.index-1]&&n.ignoreMatch()}function R(e,n){
+void 0!==e.className&&(e.scope=e.className,delete e.className)}function D(e,n){
 n&&e.beginKeywords&&(e.begin="\\b("+e.beginKeywords.split(" ").join("|")+")(?!\\.)(?=\\b|\\s)",
-e.__beforeBegin=R,e.keywords=e.keywords||e.beginKeywords,delete e.beginKeywords,
-void 0===e.relevance&&(e.relevance=0))}function L(e,n){
-Array.isArray(e.illegal)&&(e.illegal=p(...e.illegal))}function B(e,n){
+e.__beforeBegin=T,e.keywords=e.keywords||e.beginKeywords,delete e.beginKeywords,
+void 0===e.relevance&&(e.relevance=0))}function I(e,n){
+Array.isArray(e.illegal)&&(e.illegal=m(...e.illegal))}function L(e,n){
 if(e.match){
 if(e.begin||e.end)throw Error("begin & end are not supported with match")
-;e.begin=e.match,delete e.match}}function $(e,n){
-void 0===e.relevance&&(e.relevance=1)}const z=(e,n)=>{if(!e.beforeMatch)return
+;e.begin=e.match,delete e.match}}function B(e,n){
+void 0===e.relevance&&(e.relevance=1)}const $=(e,n)=>{if(!e.beforeMatch)return
 ;if(e.starts)throw Error("beforeMatch cannot be used with starts")
 ;const t=Object.assign({},e);Object.keys(e).forEach((n=>{delete e[n]
-})),e.keywords=t.keywords,e.begin=m(t.beforeMatch,g(t.begin)),e.starts={
+})),e.keywords=t.keywords,e.begin=b(t.beforeMatch,d(t.begin)),e.starts={
 relevance:0,contains:[Object.assign(t,{endsParent:!0})]
 },e.relevance=0,delete t.beforeMatch
-},F=["of","and","for","in","not","or","if","then","parent","list","value"]
-;function U(e,n,t="keyword"){const a=Object.create(null)
+},z=["of","and","for","in","not","or","if","then","parent","list","value"],F="keyword"
+;function U(e,n,t=F){const a=Object.create(null)
 ;return"string"==typeof e?i(t,e.split(" ")):Array.isArray(e)?i(t,e):Object.keys(e).forEach((t=>{
 Object.assign(a,U(e[t],n,t))})),a;function i(e,t){
 n&&(t=t.map((e=>e.toLowerCase()))),t.forEach((n=>{const t=n.split("|")
 ;a[t[0]]=[e,j(t[0],t[1])]}))}}function j(e,n){
-return n?Number(n):(e=>F.includes(e.toLowerCase()))(e)?0:1}const P={},K=e=>{
-console.error(e)},H=(e,...n)=>{console.log("WARN: "+e,...n)},q=(e,n)=>{
+return n?Number(n):(e=>z.includes(e.toLowerCase()))(e)?0:1}const P={},K=e=>{
+console.error(e)},q=(e,...n)=>{console.log("WARN: "+e,...n)},H=(e,n)=>{
 P[`${e}/${n}`]||(console.log(`Deprecated as of ${e}. ${n}`),P[`${e}/${n}`]=!0)
-},Z=Error();function G(e,n,{key:t}){let a=0;const i=e[t],r={},s={}
-;for(let e=1;e<=n.length;e++)s[e+a]=i[e],r[e+a]=!0,a+=_(n[e-1])
+},G=Error();function Z(e,n,{key:t}){let a=0;const i=e[t],r={},s={}
+;for(let e=1;e<=n.length;e++)s[e+a]=i[e],r[e+a]=!0,a+=p(n[e-1])
 ;e[t]=s,e[t]._emit=r,e[t]._multi=!0}function W(e){(e=>{
 e.scope&&"object"==typeof e.scope&&null!==e.scope&&(e.beginScope=e.scope,
 delete e.scope)})(e),"string"==typeof e.beginScope&&(e.beginScope={
 _wrap:e.beginScope}),"string"==typeof e.endScope&&(e.endScope={_wrap:e.endScope
 }),(e=>{if(Array.isArray(e.begin)){
 if(e.skip||e.excludeBegin||e.returnBegin)throw K("skip, excludeBegin, returnBegin not compatible with beginScope: {}"),
-Z
+G
 ;if("object"!=typeof e.beginScope||null===e.beginScope)throw K("beginScope must be object"),
-Z;G(e,e.begin,{key:"beginScope"}),e.begin=f(e.begin,{joinWith:""})}})(e),(e=>{
+G;Z(e,e.begin,{key:"beginScope"}),e.begin=h(e.begin,{joinWith:""})}})(e),(e=>{
 if(Array.isArray(e.end)){
 if(e.skip||e.excludeEnd||e.returnEnd)throw K("skip, excludeEnd, returnEnd not compatible with endScope: {}"),
-Z
+G
 ;if("object"!=typeof e.endScope||null===e.endScope)throw K("endScope must be object"),
-Z;G(e,e.end,{key:"endScope"}),e.end=f(e.end,{joinWith:""})}})(e)}function Q(e){
+G;Z(e,e.end,{key:"endScope"}),e.end=h(e.end,{joinWith:""})}})(e)}function Q(e){
 function n(n,t){
-return RegExp(d(n),"m"+(e.case_insensitive?"i":"")+(e.unicodeRegex?"u":"")+(t?"g":""))
+return RegExp(c(n),"m"+(e.case_insensitive?"i":"")+(e.unicodeRegex?"u":"")+(t?"g":""))
 }class t{constructor(){
 this.matchIndexes={},this.regexes=[],this.matchAt=1,this.position=0}
 addRule(e,n){
 n.position=this.position++,this.matchIndexes[this.matchAt]=n,this.regexes.push([n,e]),
-this.matchAt+=_(e)+1}compile(){0===this.regexes.length&&(this.exec=()=>null)
-;const e=this.regexes.map((e=>e[1]));this.matcherRe=n(f(e,{joinWith:"|"
+this.matchAt+=p(e)+1}compile(){0===this.regexes.length&&(this.exec=()=>null)
+;const e=this.regexes.map((e=>e[1]));this.matcherRe=n(h(e,{joinWith:"|"
 }),!0),this.lastIndex=0}exec(e){this.matcherRe.lastIndex=this.lastIndex
 ;const n=this.matcherRe.exec(e);if(!n)return null
 ;const t=n.findIndex(((e,n)=>n>0&&void 0!==e)),a=this.matchIndexes[t]
-;return n.splice(0,t),Object.assign(n,a)}}class a{constructor(){
+;return n.splice(0,t),Object.assign(n,a)}}class i{constructor(){
 this.rules=[],this.multiRegexes=[],
 this.count=0,this.lastIndex=0,this.regexIndex=0}getMatcher(e){
 if(this.multiRegexes[e])return this.multiRegexes[e];const n=new t
@@ -148,148 +149,149 @@ return t&&(this.regexIndex+=t.position+1,
 this.regexIndex===this.count&&this.considerAll()),t}}
 if(e.compilerExtensions||(e.compilerExtensions=[]),
 e.contains&&e.contains.includes("self"))throw Error("ERR: contains `self` is not supported at the top-level of a language.  See documentation.")
-;return e.classNameAliases=i(e.classNameAliases||{}),function t(r,s){const o=r
+;return e.classNameAliases=a(e.classNameAliases||{}),function t(r,s){const o=r
 ;if(r.isCompiled)return o
-;[D,B,W,z].forEach((e=>e(r,s))),e.compilerExtensions.forEach((e=>e(r,s))),
-r.__beforeBegin=null,[I,L,$].forEach((e=>e(r,s))),r.isCompiled=!0;let l=null
+;[R,L,W,$].forEach((e=>e(r,s))),e.compilerExtensions.forEach((e=>e(r,s))),
+r.__beforeBegin=null,[D,I,B].forEach((e=>e(r,s))),r.isCompiled=!0;let l=null
 ;return"object"==typeof r.keywords&&r.keywords.$pattern&&(r.keywords=Object.assign({},r.keywords),
 l=r.keywords.$pattern,
 delete r.keywords.$pattern),l=l||/\w+/,r.keywords&&(r.keywords=U(r.keywords,e.case_insensitive)),
 o.keywordPatternRe=n(l,!0),
 s&&(r.begin||(r.begin=/\B|\b/),o.beginRe=n(o.begin),r.end||r.endsWithParent||(r.end=/\B|\b/),
 r.end&&(o.endRe=n(o.end)),
-o.terminatorEnd=d(o.end)||"",r.endsWithParent&&s.terminatorEnd&&(o.terminatorEnd+=(r.end?"|":"")+s.terminatorEnd)),
+o.terminatorEnd=c(o.end)||"",r.endsWithParent&&s.terminatorEnd&&(o.terminatorEnd+=(r.end?"|":"")+s.terminatorEnd)),
 r.illegal&&(o.illegalRe=n(r.illegal)),
-r.contains||(r.contains=[]),r.contains=[].concat(...r.contains.map((e=>(e=>(e.variants&&!e.cachedVariants&&(e.cachedVariants=e.variants.map((n=>i(e,{
-variants:null},n)))),e.cachedVariants?e.cachedVariants:X(e)?i(e,{
-starts:e.starts?i(e.starts):null
-}):Object.isFrozen(e)?i(e):e))("self"===e?r:e)))),r.contains.forEach((e=>{t(e,o)
-})),r.starts&&t(r.starts,s),o.matcher=(e=>{const n=new a
+r.contains||(r.contains=[]),r.contains=[].concat(...r.contains.map((e=>(e=>(e.variants&&!e.cachedVariants&&(e.cachedVariants=e.variants.map((n=>a(e,{
+variants:null},n)))),e.cachedVariants?e.cachedVariants:X(e)?a(e,{
+starts:e.starts?a(e.starts):null
+}):Object.isFrozen(e)?a(e):e))("self"===e?r:e)))),r.contains.forEach((e=>{t(e,o)
+})),r.starts&&t(r.starts,s),o.matcher=(e=>{const n=new i
 ;return e.contains.forEach((e=>n.addRule(e.begin,{rule:e,type:"begin"
 }))),e.terminatorEnd&&n.addRule(e.terminatorEnd,{type:"end"
 }),e.illegal&&n.addRule(e.illegal,{type:"illegal"}),n})(o),o}(e)}function X(e){
 return!!e&&(e.endsWithParent||X(e.starts))}class V extends Error{
 constructor(e,n){super(e),this.name="HTMLInjectionError",this.html=n}}
-const J=a,Y=i,ee=Symbol("nomatch");var ne=(n=>{
+const J=t,Y=a,ee=Symbol("nomatch"),ne=t=>{
 const a=Object.create(null),i=Object.create(null),r=[];let s=!0
-;const o="Could not find the language '{}', did you forget to load/include a language module?",l={
-disableAutodetect:!0,name:"Plain text",contains:[]};let d={
+;const o="Could not find the language '{}', did you forget to load/include a language module?",c={
+disableAutodetect:!0,name:"Plain text",contains:[]};let p={
 ignoreUnescapedHTML:!1,throwUnescapedHTML:!1,noHighlightRe:/^(no-?highlight)$/i,
 languageDetectRe:/\blang(?:uage)?-([\w-]+)\b/i,classPrefix:"hljs-",
-cssSelector:"pre code",languages:null,__emitter:c};function _(e){
-return d.noHighlightRe.test(e)}function h(e,n,t){let a="",i=""
+cssSelector:"pre code",languages:null,__emitter:l};function _(e){
+return p.noHighlightRe.test(e)}function h(e,n,t){let a="",i=""
 ;"object"==typeof n?(a=e,
-t=n.ignoreIllegals,i=n.language):(q("10.7.0","highlight(lang, code, ...args) has been deprecated."),
-q("10.7.0","Please use highlight(code, options) instead.\nhttps://github.com/highlightjs/highlight.js/issues/2277"),
+t=n.ignoreIllegals,i=n.language):(H("10.7.0","highlight(lang, code, ...args) has been deprecated."),
+H("10.7.0","Please use highlight(code, options) instead.\nhttps://github.com/highlightjs/highlight.js/issues/2277"),
 i=e,a=n),void 0===t&&(t=!0);const r={code:a,language:i};x("before:highlight",r)
 ;const s=r.result?r.result:f(r.language,r.code,t)
-;return s.code=r.code,x("after:highlight",s),s}function f(e,n,i,r){
-const l=Object.create(null);function c(){if(!k.keywords)return void M.addText(S)
-;let e=0;k.keywordPatternRe.lastIndex=0;let n=k.keywordPatternRe.exec(S),t=""
-;for(;n;){t+=S.substring(e,n.index)
-;const i=w.case_insensitive?n[0].toLowerCase():n[0],r=(a=i,k.keywords[a]);if(r){
+;return s.code=r.code,x("after:highlight",s),s}function f(e,t,i,r){
+const l=Object.create(null);function c(){if(!x.keywords)return void S.addText(A)
+;let e=0;x.keywordPatternRe.lastIndex=0;let n=x.keywordPatternRe.exec(A),t=""
+;for(;n;){t+=A.substring(e,n.index)
+;const i=w.case_insensitive?n[0].toLowerCase():n[0],r=(a=i,x.keywords[a]);if(r){
 const[e,a]=r
-;if(M.addText(t),t="",l[i]=(l[i]||0)+1,l[i]<=7&&(A+=a),e.startsWith("_"))t+=n[0];else{
-const t=w.classNameAliases[e]||e;M.addKeyword(n[0],t)}}else t+=n[0]
-;e=k.keywordPatternRe.lastIndex,n=k.keywordPatternRe.exec(S)}var a
-;t+=S.substring(e),M.addText(t)}function g(){null!=k.subLanguage?(()=>{
-if(""===S)return;let e=null;if("string"==typeof k.subLanguage){
-if(!a[k.subLanguage])return void M.addText(S)
-;e=f(k.subLanguage,S,!0,x[k.subLanguage]),x[k.subLanguage]=e._top
-}else e=E(S,k.subLanguage.length?k.subLanguage:null)
-;k.relevance>0&&(A+=e.relevance),M.addSublanguage(e._emitter,e.language)
-})():c(),S=""}function u(e,n){let t=1;const a=n.length-1;for(;t<=a;){
-if(!e._emit[t]){t++;continue}const a=w.classNameAliases[e[t]]||e[t],i=n[t]
-;a?M.addKeyword(i,a):(S=i,c(),S=""),t++}}function b(e,n){
-return e.scope&&"string"==typeof e.scope&&M.openNode(w.classNameAliases[e.scope]||e.scope),
-e.beginScope&&(e.beginScope._wrap?(M.addKeyword(S,w.classNameAliases[e.beginScope._wrap]||e.beginScope._wrap),
-S=""):e.beginScope._multi&&(u(e.beginScope,n),S="")),k=Object.create(e,{parent:{
-value:k}}),k}function m(e,n,a){let i=((e,n)=>{const t=e&&e.exec(n)
-;return t&&0===t.index})(e.endRe,a);if(i){if(e["on:end"]){const a=new t(e)
-;e["on:end"](n,a),a.isMatchIgnored&&(i=!1)}if(i){
+;if(S.addText(t),t="",l[i]=(l[i]||0)+1,l[i]<=7&&(C+=a),e.startsWith("_"))t+=n[0];else{
+const t=w.classNameAliases[e]||e;g(n[0],t)}}else t+=n[0]
+;e=x.keywordPatternRe.lastIndex,n=x.keywordPatternRe.exec(A)}var a
+;t+=A.substring(e),S.addText(t)}function d(){null!=x.subLanguage?(()=>{
+if(""===A)return;let e=null;if("string"==typeof x.subLanguage){
+if(!a[x.subLanguage])return void S.addText(A)
+;e=f(x.subLanguage,A,!0,M[x.subLanguage]),M[x.subLanguage]=e._top
+}else e=E(A,x.subLanguage.length?x.subLanguage:null)
+;x.relevance>0&&(C+=e.relevance),S.__addSublanguage(e._emitter,e.language)
+})():c(),A=""}function g(e,n){
+""!==e&&(S.startScope(n),S.addText(e),S.endScope())}function u(e,n){let t=1
+;const a=n.length-1;for(;t<=a;){if(!e._emit[t]){t++;continue}
+const a=w.classNameAliases[e[t]]||e[t],i=n[t];a?g(i,a):(A=i,c(),A=""),t++}}
+function b(e,n){
+return e.scope&&"string"==typeof e.scope&&S.openNode(w.classNameAliases[e.scope]||e.scope),
+e.beginScope&&(e.beginScope._wrap?(g(A,w.classNameAliases[e.beginScope._wrap]||e.beginScope._wrap),
+A=""):e.beginScope._multi&&(u(e.beginScope,n),A="")),x=Object.create(e,{parent:{
+value:x}}),x}function m(e,t,a){let i=((e,n)=>{const t=e&&e.exec(n)
+;return t&&0===t.index})(e.endRe,a);if(i){if(e["on:end"]){const a=new n(e)
+;e["on:end"](t,a),a.isMatchIgnored&&(i=!1)}if(i){
 for(;e.endsParent&&e.parent;)e=e.parent;return e}}
-if(e.endsWithParent)return m(e.parent,n,a)}function p(e){
-return 0===k.matcher.regexIndex?(S+=e[0],1):(R=!0,0)}function _(e){
-const t=e[0],a=n.substring(e.index),i=m(k,e,a);if(!i)return ee;const r=k
-;k.endScope&&k.endScope._wrap?(g(),
-M.addKeyword(t,k.endScope._wrap)):k.endScope&&k.endScope._multi?(g(),
-u(k.endScope,e)):r.skip?S+=t:(r.returnEnd||r.excludeEnd||(S+=t),
-g(),r.excludeEnd&&(S=t));do{
-k.scope&&M.closeNode(),k.skip||k.subLanguage||(A+=k.relevance),k=k.parent
-}while(k!==i.parent);return i.starts&&b(i.starts,e),r.returnEnd?0:t.length}
-let h={};function y(a,r){const o=r&&r[0];if(S+=a,null==o)return g(),0
-;if("begin"===h.type&&"end"===r.type&&h.index===r.index&&""===o){
-if(S+=n.slice(r.index,r.index+1),!s){const n=Error(`0 width match regex (${e})`)
-;throw n.languageName=e,n.badRule=h.rule,n}return 1}
-if(h=r,"begin"===r.type)return(e=>{
-const n=e[0],a=e.rule,i=new t(a),r=[a.__beforeBegin,a["on:begin"]]
-;for(const t of r)if(t&&(t(e,i),i.isMatchIgnored))return p(n)
-;return a.skip?S+=n:(a.excludeBegin&&(S+=n),
-g(),a.returnBegin||a.excludeBegin||(S=n)),b(a,e),a.returnBegin?0:n.length})(r)
+if(e.endsWithParent)return m(e.parent,t,a)}function _(e){
+return 0===x.matcher.regexIndex?(A+=e[0],1):(D=!0,0)}function h(e){
+const n=e[0],a=t.substring(e.index),i=m(x,e,a);if(!i)return ee;const r=x
+;x.endScope&&x.endScope._wrap?(d(),
+g(n,x.endScope._wrap)):x.endScope&&x.endScope._multi?(d(),
+u(x.endScope,e)):r.skip?A+=n:(r.returnEnd||r.excludeEnd||(A+=n),
+d(),r.excludeEnd&&(A=n));do{
+x.scope&&S.closeNode(),x.skip||x.subLanguage||(C+=x.relevance),x=x.parent
+}while(x!==i.parent);return i.starts&&b(i.starts,e),r.returnEnd?0:n.length}
+let y={};function N(a,r){const o=r&&r[0];if(A+=a,null==o)return d(),0
+;if("begin"===y.type&&"end"===r.type&&y.index===r.index&&""===o){
+if(A+=t.slice(r.index,r.index+1),!s){const n=Error(`0 width match regex (${e})`)
+;throw n.languageName=e,n.badRule=y.rule,n}return 1}
+if(y=r,"begin"===r.type)return(e=>{
+const t=e[0],a=e.rule,i=new n(a),r=[a.__beforeBegin,a["on:begin"]]
+;for(const n of r)if(n&&(n(e,i),i.isMatchIgnored))return _(t)
+;return a.skip?A+=t:(a.excludeBegin&&(A+=t),
+d(),a.returnBegin||a.excludeBegin||(A=t)),b(a,e),a.returnBegin?0:t.length})(r)
 ;if("illegal"===r.type&&!i){
-const e=Error('Illegal lexeme "'+o+'" for mode "'+(k.scope||"<unnamed>")+'"')
-;throw e.mode=k,e}if("end"===r.type){const e=_(r);if(e!==ee)return e}
+const e=Error('Illegal lexeme "'+o+'" for mode "'+(x.scope||"<unnamed>")+'"')
+;throw e.mode=x,e}if("end"===r.type){const e=h(r);if(e!==ee)return e}
 if("illegal"===r.type&&""===o)return 1
-;if(T>1e5&&T>3*r.index)throw Error("potential infinite loop, way more iterations than matches")
-;return S+=o,o.length}const w=v(e)
+;if(R>1e5&&R>3*r.index)throw Error("potential infinite loop, way more iterations than matches")
+;return A+=o,o.length}const w=v(e)
 ;if(!w)throw K(o.replace("{}",e)),Error('Unknown language: "'+e+'"')
-;const N=Q(w);let O="",k=r||N;const x={},M=new d.__emitter(d);(()=>{const e=[]
-;for(let n=k;n!==w;n=n.parent)n.scope&&e.unshift(n.scope)
-;e.forEach((e=>M.openNode(e)))})();let S="",A=0,C=0,T=0,R=!1;try{
-for(k.matcher.considerAll();;){
-T++,R?R=!1:k.matcher.considerAll(),k.matcher.lastIndex=C
-;const e=k.matcher.exec(n);if(!e)break;const t=y(n.substring(C,e.index),e)
-;C=e.index+t}
-return y(n.substring(C)),M.closeAllNodes(),M.finalize(),O=M.toHTML(),{
-language:e,value:O,relevance:A,illegal:!1,_emitter:M,_top:k}}catch(t){
-if(t.message&&t.message.includes("Illegal"))return{language:e,value:J(n),
-illegal:!0,relevance:0,_illegalBy:{message:t.message,index:C,
-context:n.slice(C-100,C+100),mode:t.mode,resultSoFar:O},_emitter:M};if(s)return{
-language:e,value:J(n),illegal:!1,relevance:0,errorRaised:t,_emitter:M,_top:k}
-;throw t}}function E(e,n){n=n||d.languages||Object.keys(a);const t=(e=>{
-const n={value:J(e),illegal:!1,relevance:0,_top:l,_emitter:new d.__emitter(d)}
+;const O=Q(w);let k="",x=r||O;const M={},S=new p.__emitter(p);(()=>{const e=[]
+;for(let n=x;n!==w;n=n.parent)n.scope&&e.unshift(n.scope)
+;e.forEach((e=>S.openNode(e)))})();let A="",C=0,T=0,R=0,D=!1;try{
+if(w.__emitTokens)w.__emitTokens(t,S);else{for(x.matcher.considerAll();;){
+R++,D?D=!1:x.matcher.considerAll(),x.matcher.lastIndex=T
+;const e=x.matcher.exec(t);if(!e)break;const n=N(t.substring(T,e.index),e)
+;T=e.index+n}N(t.substring(T))}return S.finalize(),k=S.toHTML(),{language:e,
+value:k,relevance:C,illegal:!1,_emitter:S,_top:x}}catch(n){
+if(n.message&&n.message.includes("Illegal"))return{language:e,value:J(t),
+illegal:!0,relevance:0,_illegalBy:{message:n.message,index:T,
+context:t.slice(T-100,T+100),mode:n.mode,resultSoFar:k},_emitter:S};if(s)return{
+language:e,value:J(t),illegal:!1,relevance:0,errorRaised:n,_emitter:S,_top:x}
+;throw n}}function E(e,n){n=n||p.languages||Object.keys(a);const t=(e=>{
+const n={value:J(e),illegal:!1,relevance:0,_top:c,_emitter:new p.__emitter(p)}
 ;return n._emitter.addText(e),n})(e),i=n.filter(v).filter(k).map((n=>f(n,e,!1)))
 ;i.unshift(t);const r=i.sort(((e,n)=>{
 if(e.relevance!==n.relevance)return n.relevance-e.relevance
 ;if(e.language&&n.language){if(v(e.language).supersetOf===n.language)return 1
-;if(v(n.language).supersetOf===e.language)return-1}return 0})),[s,o]=r,c=s
-;return c.secondBest=o,c}function y(e){let n=null;const t=(e=>{
+;if(v(n.language).supersetOf===e.language)return-1}return 0})),[s,o]=r,l=s
+;return l.secondBest=o,l}function y(e){let n=null;const t=(e=>{
 let n=e.className+" ";n+=e.parentNode?e.parentNode.className:""
-;const t=d.languageDetectRe.exec(n);if(t){const n=v(t[1])
-;return n||(H(o.replace("{}",t[1])),
-H("Falling back to no-highlight mode for this block.",e)),n?t[1]:"no-highlight"}
+;const t=p.languageDetectRe.exec(n);if(t){const n=v(t[1])
+;return n||(q(o.replace("{}",t[1])),
+q("Falling back to no-highlight mode for this block.",e)),n?t[1]:"no-highlight"}
 return n.split(/\s+/).find((e=>_(e)||v(e)))})(e);if(_(t))return
 ;if(x("before:highlightElement",{el:e,language:t
-}),e.children.length>0&&(d.ignoreUnescapedHTML||(console.warn("One of your code blocks includes unescaped HTML. This is a potentially serious security risk."),
+}),e.children.length>0&&(p.ignoreUnescapedHTML||(console.warn("One of your code blocks includes unescaped HTML. This is a potentially serious security risk."),
 console.warn("https://github.com/highlightjs/highlight.js/wiki/security"),
 console.warn("The element with unescaped HTML:"),
-console.warn(e)),d.throwUnescapedHTML))throw new V("One of your code blocks includes unescaped HTML.",e.innerHTML)
+console.warn(e)),p.throwUnescapedHTML))throw new V("One of your code blocks includes unescaped HTML.",e.innerHTML)
 ;n=e;const a=n.textContent,r=t?h(a,{language:t,ignoreIllegals:!0}):E(a)
 ;e.innerHTML=r.value,((e,n,t)=>{const a=n&&i[n]||t
 ;e.classList.add("hljs"),e.classList.add("language-"+a)
 })(e,t,r.language),e.result={language:r.language,re:r.relevance,
 relevance:r.relevance},r.secondBest&&(e.secondBest={
 language:r.secondBest.language,relevance:r.secondBest.relevance
-}),x("after:highlightElement",{el:e,result:r,text:a})}let w=!1;function N(){
-"loading"!==document.readyState?document.querySelectorAll(d.cssSelector).forEach(y):w=!0
+}),x("after:highlightElement",{el:e,result:r,text:a})}let N=!1;function w(){
+"loading"!==document.readyState?document.querySelectorAll(p.cssSelector).forEach(y):N=!0
 }function v(e){return e=(e||"").toLowerCase(),a[e]||a[i[e]]}
 function O(e,{languageName:n}){"string"==typeof e&&(e=[e]),e.forEach((e=>{
 i[e.toLowerCase()]=n}))}function k(e){const n=v(e)
 ;return n&&!n.disableAutodetect}function x(e,n){const t=e;r.forEach((e=>{
 e[t]&&e[t](n)}))}
 "undefined"!=typeof window&&window.addEventListener&&window.addEventListener("DOMContentLoaded",(()=>{
-w&&N()}),!1),Object.assign(n,{highlight:h,highlightAuto:E,highlightAll:N,
+N&&w()}),!1),Object.assign(t,{highlight:h,highlightAuto:E,highlightAll:w,
 highlightElement:y,
-highlightBlock:e=>(q("10.7.0","highlightBlock will be removed entirely in v12.0"),
-q("10.7.0","Please use highlightElement now."),y(e)),configure:e=>{d=Y(d,e)},
+highlightBlock:e=>(H("10.7.0","highlightBlock will be removed entirely in v12.0"),
+H("10.7.0","Please use highlightElement now."),y(e)),configure:e=>{p=Y(p,e)},
 initHighlighting:()=>{
-N(),q("10.6.0","initHighlighting() deprecated.  Use highlightAll() now.")},
+w(),H("10.6.0","initHighlighting() deprecated.  Use highlightAll() now.")},
 initHighlightingOnLoad:()=>{
-N(),q("10.6.0","initHighlightingOnLoad() deprecated.  Use highlightAll() now.")
-},registerLanguage:(e,t)=>{let i=null;try{i=t(n)}catch(n){
+w(),H("10.6.0","initHighlightingOnLoad() deprecated.  Use highlightAll() now.")
+},registerLanguage:(e,n)=>{let i=null;try{i=n(t)}catch(n){
 if(K("Language definition for '{}' could not be registered.".replace("{}",e)),
-!s)throw n;K(n),i=l}
-i.name||(i.name=e),a[e]=i,i.rawDefinition=t.bind(null,n),i.aliases&&O(i.aliases,{
+!s)throw n;K(n),i=c}
+i.name||(i.name=e),a[e]=i,i.rawDefinition=n.bind(null,t),i.aliases&&O(i.aliases,{
 languageName:e})},unregisterLanguage:e=>{delete a[e]
 ;for(const n of Object.keys(i))i[n]===e&&delete i[n]},
 listLanguages:()=>Object.keys(a),getLanguage:v,registerAliases:O,
@@ -297,12 +299,13 @@ autoDetection:k,inherit:Y,addPlugin:e=>{(e=>{
 e["before:highlightBlock"]&&!e["before:highlightElement"]&&(e["before:highlightElement"]=n=>{
 e["before:highlightBlock"](Object.assign({block:n.el},n))
 }),e["after:highlightBlock"]&&!e["after:highlightElement"]&&(e["after:highlightElement"]=n=>{
-e["after:highlightBlock"](Object.assign({block:n.el},n))})})(e),r.push(e)}
-}),n.debugMode=()=>{s=!1},n.safeMode=()=>{s=!0
-},n.versionString="11.6.0",n.regex={concat:m,lookahead:g,either:p,optional:b,
-anyNumberOfTimes:u};for(const n in T)"object"==typeof T[n]&&e.exports(T[n])
-;return Object.assign(n,T),n})({});const te=e=>({IMPORTANT:{scope:"meta",
-begin:"!important"},BLOCK_COMMENT:e.C_BLOCK_COMMENT_MODE,HEXCOLOR:{
+e["after:highlightBlock"](Object.assign({block:n.el},n))})})(e),r.push(e)},
+removePlugin:e=>{const n=r.indexOf(e);-1!==n&&r.splice(n,1)}}),t.debugMode=()=>{
+s=!1},t.safeMode=()=>{s=!0},t.versionString="11.8.0",t.regex={concat:b,
+lookahead:d,either:m,optional:u,anyNumberOfTimes:g}
+;for(const n in C)"object"==typeof C[n]&&e(C[n]);return Object.assign(t,C),t
+},te=ne({});te.newInstance=()=>ne({});var ae=te;const ie=e=>({IMPORTANT:{
+scope:"meta",begin:"!important"},BLOCK_COMMENT:e.C_BLOCK_COMMENT_MODE,HEXCOLOR:{
 scope:"number",begin:/#(([0-9a-fA-F]{3,4})|(([0-9a-fA-F]{2}){3,4}))\b/},
 FUNCTION_DISPATCH:{className:"built_in",begin:/[\w-]+(?=\()/},
 ATTRIBUTE_SELECTOR_MODE:{scope:"selector-attr",begin:/\[/,end:/\]/,illegal:"$",
@@ -310,190 +313,192 @@ contains:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]},CSS_NUMBER_MODE:{
 scope:"number",
 begin:e.NUMBER_RE+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",
 relevance:0},CSS_VARIABLE:{className:"attr",begin:/--[A-Za-z][A-Za-z0-9_-]*/}
-}),ae=["a","abbr","address","article","aside","audio","b","blockquote","body","button","canvas","caption","cite","code","dd","del","details","dfn","div","dl","dt","em","fieldset","figcaption","figure","footer","form","h1","h2","h3","h4","h5","h6","header","hgroup","html","i","iframe","img","input","ins","kbd","label","legend","li","main","mark","menu","nav","object","ol","p","q","quote","samp","section","span","strong","summary","sup","table","tbody","td","textarea","tfoot","th","thead","time","tr","ul","var","video"],ie=["any-hover","any-pointer","aspect-ratio","color","color-gamut","color-index","device-aspect-ratio","device-height","device-width","display-mode","forced-colors","grid","height","hover","inverted-colors","monochrome","orientation","overflow-block","overflow-inline","pointer","prefers-color-scheme","prefers-contrast","prefers-reduced-motion","prefers-reduced-transparency","resolution","scan","scripting","update","width","min-width","max-width","min-height","max-height"],re=["active","any-link","blank","checked","current","default","defined","dir","disabled","drop","empty","enabled","first","first-child","first-of-type","fullscreen","future","focus","focus-visible","focus-within","has","host","host-context","hover","indeterminate","in-range","invalid","is","lang","last-child","last-of-type","left","link","local-link","not","nth-child","nth-col","nth-last-child","nth-last-col","nth-last-of-type","nth-of-type","only-child","only-of-type","optional","out-of-range","past","placeholder-shown","read-only","read-write","required","right","root","scope","target","target-within","user-invalid","valid","visited","where"],se=["after","backdrop","before","cue","cue-region","first-letter","first-line","grammar-error","marker","part","placeholder","selection","slotted","spelling-error"],oe=["align-content","align-items","align-self","all","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","backface-visibility","background","background-attachment","background-blend-mode","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","block-size","border","border-block","border-block-color","border-block-end","border-block-end-color","border-block-end-style","border-block-end-width","border-block-start","border-block-start-color","border-block-start-style","border-block-start-width","border-block-style","border-block-width","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-inline","border-inline-color","border-inline-end","border-inline-end-color","border-inline-end-style","border-inline-end-width","border-inline-start","border-inline-start-color","border-inline-start-style","border-inline-start-width","border-inline-style","border-inline-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","caret-color","clear","clip","clip-path","clip-rule","color","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","contain","content","content-visibility","counter-increment","counter-reset","cue","cue-after","cue-before","cursor","direction","display","empty-cells","filter","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","flow","font","font-display","font-family","font-feature-settings","font-kerning","font-language-override","font-size","font-size-adjust","font-smoothing","font-stretch","font-style","font-synthesis","font-variant","font-variant-caps","font-variant-east-asian","font-variant-ligatures","font-variant-numeric","font-variant-position","font-variation-settings","font-weight","gap","glyph-orientation-vertical","grid","grid-area","grid-auto-columns","grid-auto-flow","grid-auto-rows","grid-column","grid-column-end","grid-column-start","grid-gap","grid-row","grid-row-end","grid-row-start","grid-template","grid-template-areas","grid-template-columns","grid-template-rows","hanging-punctuation","height","hyphens","icon","image-orientation","image-rendering","image-resolution","ime-mode","inline-size","isolation","justify-content","left","letter-spacing","line-break","line-height","list-style","list-style-image","list-style-position","list-style-type","margin","margin-block","margin-block-end","margin-block-start","margin-bottom","margin-inline","margin-inline-end","margin-inline-start","margin-left","margin-right","margin-top","marks","mask","mask-border","mask-border-mode","mask-border-outset","mask-border-repeat","mask-border-slice","mask-border-source","mask-border-width","mask-clip","mask-composite","mask-image","mask-mode","mask-origin","mask-position","mask-repeat","mask-size","mask-type","max-block-size","max-height","max-inline-size","max-width","min-block-size","min-height","min-inline-size","min-width","mix-blend-mode","nav-down","nav-index","nav-left","nav-right","nav-up","none","normal","object-fit","object-position","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-wrap","overflow-x","overflow-y","padding","padding-block","padding-block-end","padding-block-start","padding-bottom","padding-inline","padding-inline-end","padding-inline-start","padding-left","padding-right","padding-top","page-break-after","page-break-before","page-break-inside","pause","pause-after","pause-before","perspective","perspective-origin","pointer-events","position","quotes","resize","rest","rest-after","rest-before","right","row-gap","scroll-margin","scroll-margin-block","scroll-margin-block-end","scroll-margin-block-start","scroll-margin-bottom","scroll-margin-inline","scroll-margin-inline-end","scroll-margin-inline-start","scroll-margin-left","scroll-margin-right","scroll-margin-top","scroll-padding","scroll-padding-block","scroll-padding-block-end","scroll-padding-block-start","scroll-padding-bottom","scroll-padding-inline","scroll-padding-inline-end","scroll-padding-inline-start","scroll-padding-left","scroll-padding-right","scroll-padding-top","scroll-snap-align","scroll-snap-stop","scroll-snap-type","scrollbar-color","scrollbar-gutter","scrollbar-width","shape-image-threshold","shape-margin","shape-outside","speak","speak-as","src","tab-size","table-layout","text-align","text-align-all","text-align-last","text-combine-upright","text-decoration","text-decoration-color","text-decoration-line","text-decoration-style","text-emphasis","text-emphasis-color","text-emphasis-position","text-emphasis-style","text-indent","text-justify","text-orientation","text-overflow","text-rendering","text-shadow","text-transform","text-underline-position","top","transform","transform-box","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","vertical-align","visibility","voice-balance","voice-duration","voice-family","voice-pitch","voice-range","voice-rate","voice-stress","voice-volume","white-space","widows","width","will-change","word-break","word-spacing","word-wrap","writing-mode","z-index"].reverse(),le=re.concat(se)
-;var ce="\\.([0-9](_*[0-9])*)",de="[0-9a-fA-F](_*[0-9a-fA-F])*",ge={
+}),re=["a","abbr","address","article","aside","audio","b","blockquote","body","button","canvas","caption","cite","code","dd","del","details","dfn","div","dl","dt","em","fieldset","figcaption","figure","footer","form","h1","h2","h3","h4","h5","h6","header","hgroup","html","i","iframe","img","input","ins","kbd","label","legend","li","main","mark","menu","nav","object","ol","p","q","quote","samp","section","span","strong","summary","sup","table","tbody","td","textarea","tfoot","th","thead","time","tr","ul","var","video"],se=["any-hover","any-pointer","aspect-ratio","color","color-gamut","color-index","device-aspect-ratio","device-height","device-width","display-mode","forced-colors","grid","height","hover","inverted-colors","monochrome","orientation","overflow-block","overflow-inline","pointer","prefers-color-scheme","prefers-contrast","prefers-reduced-motion","prefers-reduced-transparency","resolution","scan","scripting","update","width","min-width","max-width","min-height","max-height"],oe=["active","any-link","blank","checked","current","default","defined","dir","disabled","drop","empty","enabled","first","first-child","first-of-type","fullscreen","future","focus","focus-visible","focus-within","has","host","host-context","hover","indeterminate","in-range","invalid","is","lang","last-child","last-of-type","left","link","local-link","not","nth-child","nth-col","nth-last-child","nth-last-col","nth-last-of-type","nth-of-type","only-child","only-of-type","optional","out-of-range","past","placeholder-shown","read-only","read-write","required","right","root","scope","target","target-within","user-invalid","valid","visited","where"],le=["after","backdrop","before","cue","cue-region","first-letter","first-line","grammar-error","marker","part","placeholder","selection","slotted","spelling-error"],ce=["align-content","align-items","align-self","all","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","backface-visibility","background","background-attachment","background-blend-mode","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","block-size","border","border-block","border-block-color","border-block-end","border-block-end-color","border-block-end-style","border-block-end-width","border-block-start","border-block-start-color","border-block-start-style","border-block-start-width","border-block-style","border-block-width","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-inline","border-inline-color","border-inline-end","border-inline-end-color","border-inline-end-style","border-inline-end-width","border-inline-start","border-inline-start-color","border-inline-start-style","border-inline-start-width","border-inline-style","border-inline-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","caret-color","clear","clip","clip-path","clip-rule","color","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","contain","content","content-visibility","counter-increment","counter-reset","cue","cue-after","cue-before","cursor","direction","display","empty-cells","filter","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","flow","font","font-display","font-family","font-feature-settings","font-kerning","font-language-override","font-size","font-size-adjust","font-smoothing","font-stretch","font-style","font-synthesis","font-variant","font-variant-caps","font-variant-east-asian","font-variant-ligatures","font-variant-numeric","font-variant-position","font-variation-settings","font-weight","gap","glyph-orientation-vertical","grid","grid-area","grid-auto-columns","grid-auto-flow","grid-auto-rows","grid-column","grid-column-end","grid-column-start","grid-gap","grid-row","grid-row-end","grid-row-start","grid-template","grid-template-areas","grid-template-columns","grid-template-rows","hanging-punctuation","height","hyphens","icon","image-orientation","image-rendering","image-resolution","ime-mode","inline-size","isolation","justify-content","left","letter-spacing","line-break","line-height","list-style","list-style-image","list-style-position","list-style-type","margin","margin-block","margin-block-end","margin-block-start","margin-bottom","margin-inline","margin-inline-end","margin-inline-start","margin-left","margin-right","margin-top","marks","mask","mask-border","mask-border-mode","mask-border-outset","mask-border-repeat","mask-border-slice","mask-border-source","mask-border-width","mask-clip","mask-composite","mask-image","mask-mode","mask-origin","mask-position","mask-repeat","mask-size","mask-type","max-block-size","max-height","max-inline-size","max-width","min-block-size","min-height","min-inline-size","min-width","mix-blend-mode","nav-down","nav-index","nav-left","nav-right","nav-up","none","normal","object-fit","object-position","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-wrap","overflow-x","overflow-y","padding","padding-block","padding-block-end","padding-block-start","padding-bottom","padding-inline","padding-inline-end","padding-inline-start","padding-left","padding-right","padding-top","page-break-after","page-break-before","page-break-inside","pause","pause-after","pause-before","perspective","perspective-origin","pointer-events","position","quotes","resize","rest","rest-after","rest-before","right","row-gap","scroll-margin","scroll-margin-block","scroll-margin-block-end","scroll-margin-block-start","scroll-margin-bottom","scroll-margin-inline","scroll-margin-inline-end","scroll-margin-inline-start","scroll-margin-left","scroll-margin-right","scroll-margin-top","scroll-padding","scroll-padding-block","scroll-padding-block-end","scroll-padding-block-start","scroll-padding-bottom","scroll-padding-inline","scroll-padding-inline-end","scroll-padding-inline-start","scroll-padding-left","scroll-padding-right","scroll-padding-top","scroll-snap-align","scroll-snap-stop","scroll-snap-type","scrollbar-color","scrollbar-gutter","scrollbar-width","shape-image-threshold","shape-margin","shape-outside","speak","speak-as","src","tab-size","table-layout","text-align","text-align-all","text-align-last","text-combine-upright","text-decoration","text-decoration-color","text-decoration-line","text-decoration-style","text-emphasis","text-emphasis-color","text-emphasis-position","text-emphasis-style","text-indent","text-justify","text-orientation","text-overflow","text-rendering","text-shadow","text-transform","text-underline-position","top","transform","transform-box","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","vertical-align","visibility","voice-balance","voice-duration","voice-family","voice-pitch","voice-range","voice-rate","voice-stress","voice-volume","white-space","widows","width","will-change","word-break","word-spacing","word-wrap","writing-mode","z-index"].reverse(),de=oe.concat(le)
+;var ge="[0-9](_*[0-9])*",ue=`\\.(${ge})`,be="[0-9a-fA-F](_*[0-9a-fA-F])*",me={
 className:"number",variants:[{
-begin:`(\\b([0-9](_*[0-9])*)((${ce})|\\.)?|(${ce}))[eE][+-]?([0-9](_*[0-9])*)[fFdD]?\\b`
-},{begin:`\\b([0-9](_*[0-9])*)((${ce})[fFdD]?\\b|\\.([fFdD]\\b)?)`},{
-begin:`(${ce})[fFdD]?\\b`},{begin:"\\b([0-9](_*[0-9])*)[fFdD]\\b"},{
-begin:`\\b0[xX]((${de})\\.?|(${de})?\\.(${de}))[pP][+-]?([0-9](_*[0-9])*)[fFdD]?\\b`
-},{begin:"\\b(0|[1-9](_*[0-9])*)[lL]?\\b"},{begin:`\\b0[xX](${de})[lL]?\\b`},{
+begin:`(\\b(${ge})((${ue})|\\.)?|(${ue}))[eE][+-]?(${ge})[fFdD]?\\b`},{
+begin:`\\b(${ge})((${ue})[fFdD]?\\b|\\.([fFdD]\\b)?)`},{
+begin:`(${ue})[fFdD]?\\b`},{begin:`\\b(${ge})[fFdD]\\b`},{
+begin:`\\b0[xX]((${be})\\.?|(${be})?\\.(${be}))[pP][+-]?(${ge})[fFdD]?\\b`},{
+begin:"\\b(0|[1-9](_*[0-9])*)[lL]?\\b"},{begin:`\\b0[xX](${be})[lL]?\\b`},{
 begin:"\\b0(_*[0-7])*[lL]?\\b"},{begin:"\\b0[bB][01](_*[01])*[lL]?\\b"}],
-relevance:0};function ue(e,n,t){return-1===t?"":e.replace(n,(a=>ue(e,n,t-1)))}
-const be="[A-Za-z$_][0-9A-Za-z$_]*",me=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],pe=["true","false","null","undefined","NaN","Infinity"],_e=["Object","Function","Boolean","Symbol","Math","Date","Number","BigInt","String","RegExp","Array","Float32Array","Float64Array","Int8Array","Uint8Array","Uint8ClampedArray","Int16Array","Int32Array","Uint16Array","Uint32Array","BigInt64Array","BigUint64Array","Set","Map","WeakSet","WeakMap","ArrayBuffer","SharedArrayBuffer","Atomics","DataView","JSON","Promise","Generator","GeneratorFunction","AsyncFunction","Reflect","Proxy","Intl","WebAssembly"],he=["Error","EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"],fe=["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],Ee=["arguments","this","super","console","window","document","localStorage","module","global"],ye=[].concat(fe,_e,he)
-;function we(e){const n=e.regex,t=be,a={begin:/<[A-Za-z0-9\\._:-]+/,
+relevance:0};function pe(e,n,t){return-1===t?"":e.replace(n,(a=>pe(e,n,t-1)))}
+const _e="[A-Za-z$_][0-9A-Za-z$_]*",he=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],fe=["true","false","null","undefined","NaN","Infinity"],Ee=["Object","Function","Boolean","Symbol","Math","Date","Number","BigInt","String","RegExp","Array","Float32Array","Float64Array","Int8Array","Uint8Array","Uint8ClampedArray","Int16Array","Int32Array","Uint16Array","Uint32Array","BigInt64Array","BigUint64Array","Set","Map","WeakSet","WeakMap","ArrayBuffer","SharedArrayBuffer","Atomics","DataView","JSON","Promise","Generator","GeneratorFunction","AsyncFunction","Reflect","Proxy","Intl","WebAssembly"],ye=["Error","EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"],Ne=["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],we=["arguments","this","super","console","window","document","localStorage","sessionStorage","module","global"],ve=[].concat(Ne,Ee,ye)
+;function Oe(e){const n=e.regex,t=_e,a={begin:/<[A-Za-z0-9\\._:-]+/,
 end:/\/[A-Za-z0-9\\._:-]+>|\/>/,isTrulyOpeningTag:(e,n)=>{
 const t=e[0].length+e.index,a=e.input[t]
 ;if("<"===a||","===a)return void n.ignoreMatch();let i
 ;">"===a&&(((e,{after:n})=>{const t="</"+e[0].slice(1)
-;return-1!==e.input.indexOf(t,n)})(e,{after:t
-})||n.ignoreMatch()),(i=e.input.substring(t).match(/^\s+extends\s+/))&&0===i.index&&n.ignoreMatch()
-}},i={$pattern:be,keyword:me,literal:pe,built_in:ye,"variable.language":Ee
-},r="\\.([0-9](_?[0-9])*)",s="0|[1-9](_?[0-9])*|0[0-7]*[89][0-9]*",o={
+;return-1!==e.input.indexOf(t,n)})(e,{after:t})||n.ignoreMatch())
+;const r=e.input.substring(t)
+;((i=r.match(/^\s*=/))||(i=r.match(/^\s+extends\s+/))&&0===i.index)&&n.ignoreMatch()
+}},i={$pattern:_e,keyword:he,literal:fe,built_in:ve,"variable.language":we
+},r="[0-9](_?[0-9])*",s=`\\.(${r})`,o="0|[1-9](_?[0-9])*|0[0-7]*[89][0-9]*",l={
 className:"number",variants:[{
-begin:`(\\b(${s})((${r})|\\.)?|(${r}))[eE][+-]?([0-9](_?[0-9])*)\\b`},{
-begin:`\\b(${s})\\b((${r})\\b|\\.)?|(${r})\\b`},{
+begin:`(\\b(${o})((${s})|\\.)?|(${s}))[eE][+-]?(${r})\\b`},{
+begin:`\\b(${o})\\b((${s})\\b|\\.)?|(${s})\\b`},{
 begin:"\\b(0|[1-9](_?[0-9])*)n\\b"},{
 begin:"\\b0[xX][0-9a-fA-F](_?[0-9a-fA-F])*n?\\b"},{
 begin:"\\b0[bB][0-1](_?[0-1])*n?\\b"},{begin:"\\b0[oO][0-7](_?[0-7])*n?\\b"},{
-begin:"\\b0[0-7]+n?\\b"}],relevance:0},l={className:"subst",begin:"\\$\\{",
-end:"\\}",keywords:i,contains:[]},c={begin:"html`",end:"",starts:{end:"`",
-returnEnd:!1,contains:[e.BACKSLASH_ESCAPE,l],subLanguage:"xml"}},d={
+begin:"\\b0[0-7]+n?\\b"}],relevance:0},c={className:"subst",begin:"\\$\\{",
+end:"\\}",keywords:i,contains:[]},d={begin:"html`",end:"",starts:{end:"`",
+returnEnd:!1,contains:[e.BACKSLASH_ESCAPE,c],subLanguage:"xml"}},g={
 begin:"css`",end:"",starts:{end:"`",returnEnd:!1,
-contains:[e.BACKSLASH_ESCAPE,l],subLanguage:"css"}},g={className:"string",
-begin:"`",end:"`",contains:[e.BACKSLASH_ESCAPE,l]},u={className:"comment",
+contains:[e.BACKSLASH_ESCAPE,c],subLanguage:"css"}},u={begin:"gql`",end:"",
+starts:{end:"`",returnEnd:!1,contains:[e.BACKSLASH_ESCAPE,c],
+subLanguage:"graphql"}},b={className:"string",begin:"`",end:"`",
+contains:[e.BACKSLASH_ESCAPE,c]},m={className:"comment",
 variants:[e.COMMENT(/\/\*\*(?!\/)/,"\\*/",{relevance:0,contains:[{
 begin:"(?=@[A-Za-z]+)",relevance:0,contains:[{className:"doctag",
 begin:"@[A-Za-z]+"},{className:"type",begin:"\\{",end:"\\}",excludeEnd:!0,
 excludeBegin:!0,relevance:0},{className:"variable",begin:t+"(?=\\s*(-)|$)",
 endsParent:!0,relevance:0},{begin:/(?=[^\n])\s/,relevance:0}]}]
 }),e.C_BLOCK_COMMENT_MODE,e.C_LINE_COMMENT_MODE]
-},b=[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,c,d,g,o];l.contains=b.concat({
-begin:/\{/,end:/\}/,keywords:i,contains:["self"].concat(b)})
-;const m=[].concat(u,l.contains),p=m.concat([{begin:/\(/,end:/\)/,keywords:i,
-contains:["self"].concat(m)}]),_={className:"params",begin:/\(/,end:/\)/,
-excludeBegin:!0,excludeEnd:!0,keywords:i,contains:p},h={variants:[{
+},p=[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,d,g,u,b,{match:/\$\d+/},l]
+;c.contains=p.concat({begin:/\{/,end:/\}/,keywords:i,contains:["self"].concat(p)
+});const _=[].concat(m,c.contains),h=_.concat([{begin:/\(/,end:/\)/,keywords:i,
+contains:["self"].concat(_)}]),f={className:"params",begin:/\(/,end:/\)/,
+excludeBegin:!0,excludeEnd:!0,keywords:i,contains:h},E={variants:[{
 match:[/class/,/\s+/,t,/\s+/,/extends/,/\s+/,n.concat(t,"(",n.concat(/\./,t),")*")],
 scope:{1:"keyword",3:"title.class",5:"keyword",7:"title.class.inherited"}},{
-match:[/class/,/\s+/,t],scope:{1:"keyword",3:"title.class"}}]},f={relevance:0,
+match:[/class/,/\s+/,t],scope:{1:"keyword",3:"title.class"}}]},y={relevance:0,
 match:n.either(/\bJSON/,/\b[A-Z][a-z]+([A-Z][a-z]*|\d)*/,/\b[A-Z]{2,}([A-Z][a-z]+|\d)+([A-Z][a-z]*)*/,/\b[A-Z]{2,}[a-z]+([A-Z][a-z]+|\d)*([A-Z][a-z]*)*/),
-className:"title.class",keywords:{_:[..._e,...he]}},E={variants:[{
+className:"title.class",keywords:{_:[...Ee,...ye]}},N={variants:[{
 match:[/function/,/\s+/,t,/(?=\s*\()/]},{match:[/function/,/\s*(?=\()/]}],
-className:{1:"keyword",3:"title.function"},label:"func.def",contains:[_],
-illegal:/%/},y={
-match:n.concat(/\b/,(w=[...fe,"super"],n.concat("(?!",w.join("|"),")")),t,n.lookahead(/\(/)),
-className:"title.function",relevance:0};var w;const N={
+className:{1:"keyword",3:"title.function"},label:"func.def",contains:[f],
+illegal:/%/},w={
+match:n.concat(/\b/,(v=[...Ne,"super","import"],n.concat("(?!",v.join("|"),")")),t,n.lookahead(/\(/)),
+className:"title.function",relevance:0};var v;const O={
 begin:n.concat(/\./,n.lookahead(n.concat(t,/(?![0-9A-Za-z$_(])/))),end:t,
-excludeBegin:!0,keywords:"prototype",className:"property",relevance:0},v={
+excludeBegin:!0,keywords:"prototype",className:"property",relevance:0},k={
 match:[/get|set/,/\s+/,t,/(?=\()/],className:{1:"keyword",3:"title.function"},
-contains:[{begin:/\(\)/},_]
-},O="(\\([^()]*(\\([^()]*(\\([^()]*\\)[^()]*)*\\)[^()]*)*\\)|"+e.UNDERSCORE_IDENT_RE+")\\s*=>",k={
-match:[/const|var|let/,/\s+/,t,/\s*/,/=\s*/,/(async\s*)?/,n.lookahead(O)],
-keywords:"async",className:{1:"keyword",3:"title.function"},contains:[_]}
-;return{name:"Javascript",aliases:["js","jsx","mjs","cjs"],keywords:i,exports:{
-PARAMS_CONTAINS:p,CLASS_REFERENCE:f},illegal:/#(?![$_A-z])/,
+contains:[{begin:/\(\)/},f]
+},x="(\\([^()]*(\\([^()]*(\\([^()]*\\)[^()]*)*\\)[^()]*)*\\)|"+e.UNDERSCORE_IDENT_RE+")\\s*=>",M={
+match:[/const|var|let/,/\s+/,t,/\s*/,/=\s*/,/(async\s*)?/,n.lookahead(x)],
+keywords:"async",className:{1:"keyword",3:"title.function"},contains:[f]}
+;return{name:"JavaScript",aliases:["js","jsx","mjs","cjs"],keywords:i,exports:{
+PARAMS_CONTAINS:h,CLASS_REFERENCE:y},illegal:/#(?![$_A-z])/,
 contains:[e.SHEBANG({label:"shebang",binary:"node",relevance:5}),{
 label:"use_strict",className:"meta",relevance:10,
 begin:/^\s*['"]use (strict|asm)['"]/
-},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,c,d,g,u,o,f,{className:"attr",
-begin:t+n.lookahead(":"),relevance:0},k,{
+},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,d,g,u,b,m,{match:/\$\d+/},l,y,{
+className:"attr",begin:t+n.lookahead(":"),relevance:0},M,{
 begin:"("+e.RE_STARTERS_RE+"|\\b(case|return|throw)\\b)\\s*",
-keywords:"return throw case",relevance:0,contains:[u,e.REGEXP_MODE,{
-className:"function",begin:O,returnBegin:!0,end:"\\s*=>",contains:[{
+keywords:"return throw case",relevance:0,contains:[m,e.REGEXP_MODE,{
+className:"function",begin:x,returnBegin:!0,end:"\\s*=>",contains:[{
 className:"params",variants:[{begin:e.UNDERSCORE_IDENT_RE,relevance:0},{
 className:null,begin:/\(\s*\)/,skip:!0},{begin:/\(/,end:/\)/,excludeBegin:!0,
-excludeEnd:!0,keywords:i,contains:p}]}]},{begin:/,/,relevance:0},{match:/\s+/,
+excludeEnd:!0,keywords:i,contains:h}]}]},{begin:/,/,relevance:0},{match:/\s+/,
 relevance:0},{variants:[{begin:"<>",end:"</>"},{
 match:/<[A-Za-z0-9\\._:-]+\s*\/>/},{begin:a.begin,
 "on:begin":a.isTrulyOpeningTag,end:a.end}],subLanguage:"xml",contains:[{
-begin:a.begin,end:a.end,skip:!0,contains:["self"]}]}]},E,{
+begin:a.begin,end:a.end,skip:!0,contains:["self"]}]}]},N,{
 beginKeywords:"while if switch catch for"},{
 begin:"\\b(?!function)"+e.UNDERSCORE_IDENT_RE+"\\([^()]*(\\([^()]*(\\([^()]*\\)[^()]*)*\\)[^()]*)*\\)\\s*\\{",
-returnBegin:!0,label:"func.def",contains:[_,e.inherit(e.TITLE_MODE,{begin:t,
-className:"title.function"})]},{match:/\.\.\./,relevance:0},N,{match:"\\$"+t,
+returnBegin:!0,label:"func.def",contains:[f,e.inherit(e.TITLE_MODE,{begin:t,
+className:"title.function"})]},{match:/\.\.\./,relevance:0},O,{match:"\\$"+t,
 relevance:0},{match:[/\bconstructor(?=\s*\()/],className:{1:"title.function"},
-contains:[_]},y,{relevance:0,match:/\b[A-Z][A-Z_0-9]+\b/,
-className:"variable.constant"},h,v,{match:/\$[(.]/}]}}
-const Ne=e=>m(/\b/,e,/\w$/.test(e)?/\b/:/\B/),ve=["Protocol","Type"].map(Ne),Oe=["init","self"].map(Ne),ke=["Any","Self"],xe=["actor","any","associatedtype","async","await",/as\?/,/as!/,"as","break","case","catch","class","continue","convenience","default","defer","deinit","didSet","distributed","do","dynamic","else","enum","extension","fallthrough",/fileprivate\(set\)/,"fileprivate","final","for","func","get","guard","if","import","indirect","infix",/init\?/,/init!/,"inout",/internal\(set\)/,"internal","in","is","isolated","nonisolated","lazy","let","mutating","nonmutating",/open\(set\)/,"open","operator","optional","override","postfix","precedencegroup","prefix",/private\(set\)/,"private","protocol",/public\(set\)/,"public","repeat","required","rethrows","return","set","some","static","struct","subscript","super","switch","throws","throw",/try\?/,/try!/,"try","typealias",/unowned\(safe\)/,/unowned\(unsafe\)/,"unowned","var","weak","where","while","willSet"],Me=["false","nil","true"],Se=["assignment","associativity","higherThan","left","lowerThan","none","right"],Ae=["#colorLiteral","#column","#dsohandle","#else","#elseif","#endif","#error","#file","#fileID","#fileLiteral","#filePath","#function","#if","#imageLiteral","#keyPath","#line","#selector","#sourceLocation","#warn_unqualified_access","#warning"],Ce=["abs","all","any","assert","assertionFailure","debugPrint","dump","fatalError","getVaList","isKnownUniquelyReferenced","max","min","numericCast","pointwiseMax","pointwiseMin","precondition","preconditionFailure","print","readLine","repeatElement","sequence","stride","swap","swift_unboxFromSwiftValueWithType","transcode","type","unsafeBitCast","unsafeDowncast","withExtendedLifetime","withUnsafeMutablePointer","withUnsafePointer","withVaList","withoutActuallyEscaping","zip"],Te=p(/[/=\-+!*%<>&|^~?]/,/[\u00A1-\u00A7]/,/[\u00A9\u00AB]/,/[\u00AC\u00AE]/,/[\u00B0\u00B1]/,/[\u00B6\u00BB\u00BF\u00D7\u00F7]/,/[\u2016-\u2017]/,/[\u2020-\u2027]/,/[\u2030-\u203E]/,/[\u2041-\u2053]/,/[\u2055-\u205E]/,/[\u2190-\u23FF]/,/[\u2500-\u2775]/,/[\u2794-\u2BFF]/,/[\u2E00-\u2E7F]/,/[\u3001-\u3003]/,/[\u3008-\u3020]/,/[\u3030]/),Re=p(Te,/[\u0300-\u036F]/,/[\u1DC0-\u1DFF]/,/[\u20D0-\u20FF]/,/[\uFE00-\uFE0F]/,/[\uFE20-\uFE2F]/),De=m(Te,Re,"*"),Ie=p(/[a-zA-Z_]/,/[\u00A8\u00AA\u00AD\u00AF\u00B2-\u00B5\u00B7-\u00BA]/,/[\u00BC-\u00BE\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF]/,/[\u0100-\u02FF\u0370-\u167F\u1681-\u180D\u180F-\u1DBF]/,/[\u1E00-\u1FFF]/,/[\u200B-\u200D\u202A-\u202E\u203F-\u2040\u2054\u2060-\u206F]/,/[\u2070-\u20CF\u2100-\u218F\u2460-\u24FF\u2776-\u2793]/,/[\u2C00-\u2DFF\u2E80-\u2FFF]/,/[\u3004-\u3007\u3021-\u302F\u3031-\u303F\u3040-\uD7FF]/,/[\uF900-\uFD3D\uFD40-\uFDCF\uFDF0-\uFE1F\uFE30-\uFE44]/,/[\uFE47-\uFEFE\uFF00-\uFFFD]/),Le=p(Ie,/\d/,/[\u0300-\u036F\u1DC0-\u1DFF\u20D0-\u20FF\uFE20-\uFE2F]/),Be=m(Ie,Le,"*"),$e=m(/[A-Z]/,Le,"*"),ze=["autoclosure",m(/convention\(/,p("swift","block","c"),/\)/),"discardableResult","dynamicCallable","dynamicMemberLookup","escaping","frozen","GKInspectable","IBAction","IBDesignable","IBInspectable","IBOutlet","IBSegueAction","inlinable","main","nonobjc","NSApplicationMain","NSCopying","NSManaged",m(/objc\(/,Be,/\)/),"objc","objcMembers","propertyWrapper","requires_stored_property_inits","resultBuilder","testable","UIApplicationMain","unknown","usableFromInline"],Fe=["iOS","iOSApplicationExtension","macOS","macOSApplicationExtension","macCatalyst","macCatalystApplicationExtension","watchOS","watchOSApplicationExtension","tvOS","tvOSApplicationExtension","swift"]
-;var Ue=Object.freeze({__proto__:null,grmr_bash:e=>{const n=e.regex,t={},a={
+contains:[f]},w,{relevance:0,match:/\b[A-Z][A-Z_0-9]+\b/,
+className:"variable.constant"},E,k,{match:/\$[(.]/}]}}
+const ke=e=>b(/\b/,e,/\w$/.test(e)?/\b/:/\B/),xe=["Protocol","Type"].map(ke),Me=["init","self"].map(ke),Se=["Any","Self"],Ae=["actor","any","associatedtype","async","await",/as\?/,/as!/,"as","break","case","catch","class","continue","convenience","default","defer","deinit","didSet","distributed","do","dynamic","else","enum","extension","fallthrough",/fileprivate\(set\)/,"fileprivate","final","for","func","get","guard","if","import","indirect","infix",/init\?/,/init!/,"inout",/internal\(set\)/,"internal","in","is","isolated","nonisolated","lazy","let","mutating","nonmutating",/open\(set\)/,"open","operator","optional","override","postfix","precedencegroup","prefix",/private\(set\)/,"private","protocol",/public\(set\)/,"public","repeat","required","rethrows","return","set","some","static","struct","subscript","super","switch","throws","throw",/try\?/,/try!/,"try","typealias",/unowned\(safe\)/,/unowned\(unsafe\)/,"unowned","var","weak","where","while","willSet"],Ce=["false","nil","true"],Te=["assignment","associativity","higherThan","left","lowerThan","none","right"],Re=["#colorLiteral","#column","#dsohandle","#else","#elseif","#endif","#error","#file","#fileID","#fileLiteral","#filePath","#function","#if","#imageLiteral","#keyPath","#line","#selector","#sourceLocation","#warn_unqualified_access","#warning"],De=["abs","all","any","assert","assertionFailure","debugPrint","dump","fatalError","getVaList","isKnownUniquelyReferenced","max","min","numericCast","pointwiseMax","pointwiseMin","precondition","preconditionFailure","print","readLine","repeatElement","sequence","stride","swap","swift_unboxFromSwiftValueWithType","transcode","type","unsafeBitCast","unsafeDowncast","withExtendedLifetime","withUnsafeMutablePointer","withUnsafePointer","withVaList","withoutActuallyEscaping","zip"],Ie=m(/[/=\-+!*%<>&|^~?]/,/[\u00A1-\u00A7]/,/[\u00A9\u00AB]/,/[\u00AC\u00AE]/,/[\u00B0\u00B1]/,/[\u00B6\u00BB\u00BF\u00D7\u00F7]/,/[\u2016-\u2017]/,/[\u2020-\u2027]/,/[\u2030-\u203E]/,/[\u2041-\u2053]/,/[\u2055-\u205E]/,/[\u2190-\u23FF]/,/[\u2500-\u2775]/,/[\u2794-\u2BFF]/,/[\u2E00-\u2E7F]/,/[\u3001-\u3003]/,/[\u3008-\u3020]/,/[\u3030]/),Le=m(Ie,/[\u0300-\u036F]/,/[\u1DC0-\u1DFF]/,/[\u20D0-\u20FF]/,/[\uFE00-\uFE0F]/,/[\uFE20-\uFE2F]/),Be=b(Ie,Le,"*"),$e=m(/[a-zA-Z_]/,/[\u00A8\u00AA\u00AD\u00AF\u00B2-\u00B5\u00B7-\u00BA]/,/[\u00BC-\u00BE\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF]/,/[\u0100-\u02FF\u0370-\u167F\u1681-\u180D\u180F-\u1DBF]/,/[\u1E00-\u1FFF]/,/[\u200B-\u200D\u202A-\u202E\u203F-\u2040\u2054\u2060-\u206F]/,/[\u2070-\u20CF\u2100-\u218F\u2460-\u24FF\u2776-\u2793]/,/[\u2C00-\u2DFF\u2E80-\u2FFF]/,/[\u3004-\u3007\u3021-\u302F\u3031-\u303F\u3040-\uD7FF]/,/[\uF900-\uFD3D\uFD40-\uFDCF\uFDF0-\uFE1F\uFE30-\uFE44]/,/[\uFE47-\uFEFE\uFF00-\uFFFD]/),ze=m($e,/\d/,/[\u0300-\u036F\u1DC0-\u1DFF\u20D0-\u20FF\uFE20-\uFE2F]/),Fe=b($e,ze,"*"),Ue=b(/[A-Z]/,ze,"*"),je=["autoclosure",b(/convention\(/,m("swift","block","c"),/\)/),"discardableResult","dynamicCallable","dynamicMemberLookup","escaping","frozen","GKInspectable","IBAction","IBDesignable","IBInspectable","IBOutlet","IBSegueAction","inlinable","main","nonobjc","NSApplicationMain","NSCopying","NSManaged",b(/objc\(/,Fe,/\)/),"objc","objcMembers","propertyWrapper","requires_stored_property_inits","resultBuilder","testable","UIApplicationMain","unknown","usableFromInline"],Pe=["iOS","iOSApplicationExtension","macOS","macOSApplicationExtension","macCatalyst","macCatalystApplicationExtension","watchOS","watchOSApplicationExtension","tvOS","tvOSApplicationExtension","swift"]
+;var Ke=Object.freeze({__proto__:null,grmr_bash:e=>{const n=e.regex,t={},a={
 begin:/\$\{/,end:/\}/,contains:["self",{begin:/:-/,contains:[t]}]}
 ;Object.assign(t,{className:"variable",variants:[{
 begin:n.concat(/\$[\w\d#@][\w\d_]*/,"(?![\\w\\d])(?![$])")},a]});const i={
 className:"subst",begin:/\$\(/,end:/\)/,contains:[e.BACKSLASH_ESCAPE]},r={
 begin:/<<-?\s*(?=\w+)/,starts:{contains:[e.END_SAME_AS_BEGIN({begin:/(\w+)/,
 end:/(\w+)/,className:"string"})]}},s={className:"string",begin:/"/,end:/"/,
-contains:[e.BACKSLASH_ESCAPE,t,i]};i.contains.push(s);const o={begin:/\$\(\(/,
+contains:[e.BACKSLASH_ESCAPE,t,i]};i.contains.push(s);const o={begin:/\$?\(\(/,
 end:/\)\)/,contains:[{begin:/\d+#[0-9a-f]+/,className:"number"},e.NUMBER_MODE,t]
 },l=e.SHEBANG({binary:"(fish|bash|zsh|sh|csh|ksh|tcsh|dash|scsh)",relevance:10
 }),c={className:"function",begin:/\w[\w\d_]*\s*\(\s*\)\s*\{/,returnBegin:!0,
 contains:[e.inherit(e.TITLE_MODE,{begin:/\w[\w\d_]*/})],relevance:0};return{
 name:"Bash",aliases:["sh"],keywords:{$pattern:/\b[a-z][a-z0-9._-]+\b/,
-keyword:["if","then","else","elif","fi","for","while","in","do","done","case","esac","function"],
+keyword:["if","then","else","elif","fi","for","while","until","in","do","done","case","esac","function","select"],
 literal:["true","false"],
 built_in:["break","cd","continue","eval","exec","exit","export","getopts","hash","pwd","readonly","return","shift","test","times","trap","umask","unset","alias","bind","builtin","caller","command","declare","echo","enable","help","let","local","logout","mapfile","printf","read","readarray","source","type","typeset","ulimit","unalias","set","shopt","autoload","bg","bindkey","bye","cap","chdir","clone","comparguments","compcall","compctl","compdescribe","compfiles","compgroups","compquote","comptags","comptry","compvalues","dirs","disable","disown","echotc","echoti","emulate","fc","fg","float","functions","getcap","getln","history","integer","jobs","kill","limit","log","noglob","popd","print","pushd","pushln","rehash","sched","setcap","setopt","stat","suspend","ttyctl","unfunction","unhash","unlimit","unsetopt","vared","wait","whence","where","which","zcompile","zformat","zftp","zle","zmodload","zparseopts","zprof","zpty","zregexparse","zsocket","zstyle","ztcp","chcon","chgrp","chown","chmod","cp","dd","df","dir","dircolors","ln","ls","mkdir","mkfifo","mknod","mktemp","mv","realpath","rm","rmdir","shred","sync","touch","truncate","vdir","b2sum","base32","base64","cat","cksum","comm","csplit","cut","expand","fmt","fold","head","join","md5sum","nl","numfmt","od","paste","ptx","pr","sha1sum","sha224sum","sha256sum","sha384sum","sha512sum","shuf","sort","split","sum","tac","tail","tr","tsort","unexpand","uniq","wc","arch","basename","chroot","date","dirname","du","echo","env","expr","factor","groups","hostid","id","link","logname","nice","nohup","nproc","pathchk","pinky","printenv","printf","pwd","readlink","runcon","seq","sleep","stat","stdbuf","stty","tee","test","timeout","tty","uname","unlink","uptime","users","who","whoami","yes"]
 },contains:[l,e.SHEBANG(),c,o,e.HASH_COMMENT_MODE,r,{match:/(\/[a-z._-]+)+/},s,{
 className:"",begin:/\\"/},{className:"string",begin:/'/,end:/'/},t]}},
 grmr_c:e=>{const n=e.regex,t=e.COMMENT("//","$",{contains:[{begin:/\\\n/}]
-}),a="[a-zA-Z_]\\w*::",i="(decltype\\(auto\\)|"+n.optional(a)+"[a-zA-Z_]\\w*"+n.optional("<[^<>]+>")+")",r={
+}),a="decltype\\(auto\\)",i="[a-zA-Z_]\\w*::",r="("+a+"|"+n.optional(i)+"[a-zA-Z_]\\w*"+n.optional("<[^<>]+>")+")",s={
 className:"type",variants:[{begin:"\\b[a-z\\d_]*_t\\b"},{
-match:/\batomic_[a-z]{3,6}\b/}]},s={className:"string",variants:[{
+match:/\batomic_[a-z]{3,6}\b/}]},o={className:"string",variants:[{
 begin:'(u8?|U|L)?"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE]},{
 begin:"(u8?|U|L)?'(\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4,8}|[0-7]{3}|\\S)|.)",
 end:"'",illegal:"."},e.END_SAME_AS_BEGIN({
-begin:/(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,end:/\)([^()\\ ]{0,16})"/})]},o={
+begin:/(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,end:/\)([^()\\ ]{0,16})"/})]},l={
 className:"number",variants:[{begin:"\\b(0b[01']+)"},{
 begin:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)((ll|LL|l|L)(u|U)?|(u|U)(ll|LL|l|L)?|f|F|b|B)"
 },{
 begin:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"
-}],relevance:0},l={className:"meta",begin:/#\s*[a-z]+\b/,end:/$/,keywords:{
+}],relevance:0},c={className:"meta",begin:/#\s*[a-z]+\b/,end:/$/,keywords:{
 keyword:"if else elif endif define undef warning error line pragma _Pragma ifdef ifndef include"
-},contains:[{begin:/\\\n/,relevance:0},e.inherit(s,{className:"string"}),{
-className:"string",begin:/<.*?>/},t,e.C_BLOCK_COMMENT_MODE]},c={
-className:"title",begin:n.optional(a)+e.IDENT_RE,relevance:0
-},d=n.optional(a)+e.IDENT_RE+"\\s*\\(",g={
+},contains:[{begin:/\\\n/,relevance:0},e.inherit(o,{className:"string"}),{
+className:"string",begin:/<.*?>/},t,e.C_BLOCK_COMMENT_MODE]},d={
+className:"title",begin:n.optional(i)+e.IDENT_RE,relevance:0
+},g=n.optional(i)+e.IDENT_RE+"\\s*\\(",u={
 keyword:["asm","auto","break","case","continue","default","do","else","enum","extern","for","fortran","goto","if","inline","register","restrict","return","sizeof","struct","switch","typedef","union","volatile","while","_Alignas","_Alignof","_Atomic","_Generic","_Noreturn","_Static_assert","_Thread_local","alignas","alignof","noreturn","static_assert","thread_local","_Pragma"],
 type:["float","double","signed","unsigned","int","short","long","char","void","_Bool","_Complex","_Imaginary","_Decimal32","_Decimal64","_Decimal128","const","static","complex","bool","imaginary"],
 literal:"true false NULL",
 built_in:"std string wstring cin cout cerr clog stdin stdout stderr stringstream istringstream ostringstream auto_ptr deque list queue stack vector map set pair bitset multiset multimap unordered_set unordered_map unordered_multiset unordered_multimap priority_queue make_pair array shared_ptr abort terminate abs acos asin atan2 atan calloc ceil cosh cos exit exp fabs floor fmod fprintf fputs free frexp fscanf future isalnum isalpha iscntrl isdigit isgraph islower isprint ispunct isspace isupper isxdigit tolower toupper labs ldexp log10 log malloc realloc memchr memcmp memcpy memset modf pow printf putchar puts scanf sinh sin snprintf sprintf sqrt sscanf strcat strchr strcmp strcpy strcspn strlen strncat strncmp strncpy strpbrk strrchr strspn strstr tanh tan vfprintf vprintf vsprintf endl initializer_list unique_ptr"
-},u=[l,r,t,e.C_BLOCK_COMMENT_MODE,o,s],b={variants:[{begin:/=/,end:/;/},{
+},b=[c,s,t,e.C_BLOCK_COMMENT_MODE,l,o],m={variants:[{begin:/=/,end:/;/},{
 begin:/\(/,end:/\)/},{beginKeywords:"new throw return else",end:/;/}],
-keywords:g,contains:u.concat([{begin:/\(/,end:/\)/,keywords:g,
-contains:u.concat(["self"]),relevance:0}]),relevance:0},m={
-begin:"("+i+"[\\*&\\s]+)+"+d,returnBegin:!0,end:/[{;=]/,excludeEnd:!0,
-keywords:g,illegal:/[^\w\s\*&:<>.]/,contains:[{begin:"decltype\\(auto\\)",
-keywords:g,relevance:0},{begin:d,returnBegin:!0,contains:[e.inherit(c,{
-className:"title.function"})],relevance:0},{relevance:0,match:/,/},{
-className:"params",begin:/\(/,end:/\)/,keywords:g,relevance:0,
-contains:[t,e.C_BLOCK_COMMENT_MODE,s,o,r,{begin:/\(/,end:/\)/,keywords:g,
-relevance:0,contains:["self",t,e.C_BLOCK_COMMENT_MODE,s,o,r]}]
-},r,t,e.C_BLOCK_COMMENT_MODE,l]};return{name:"C",aliases:["h"],keywords:g,
-disableAutodetect:!0,illegal:"</",contains:[].concat(b,m,u,[l,{
-begin:e.IDENT_RE+"::",keywords:g},{className:"class",
+keywords:u,contains:b.concat([{begin:/\(/,end:/\)/,keywords:u,
+contains:b.concat(["self"]),relevance:0}]),relevance:0},p={
+begin:"("+r+"[\\*&\\s]+)+"+g,returnBegin:!0,end:/[{;=]/,excludeEnd:!0,
+keywords:u,illegal:/[^\w\s\*&:<>.]/,contains:[{begin:a,keywords:u,relevance:0},{
+begin:g,returnBegin:!0,contains:[e.inherit(d,{className:"title.function"})],
+relevance:0},{relevance:0,match:/,/},{className:"params",begin:/\(/,end:/\)/,
+keywords:u,relevance:0,contains:[t,e.C_BLOCK_COMMENT_MODE,o,l,s,{begin:/\(/,
+end:/\)/,keywords:u,relevance:0,contains:["self",t,e.C_BLOCK_COMMENT_MODE,o,l,s]
+}]},s,t,e.C_BLOCK_COMMENT_MODE,c]};return{name:"C",aliases:["h"],keywords:u,
+disableAutodetect:!0,illegal:"</",contains:[].concat(m,p,b,[c,{
+begin:e.IDENT_RE+"::",keywords:u},{className:"class",
 beginKeywords:"enum class struct union",end:/[{;:<>=]/,contains:[{
-beginKeywords:"final class struct"},e.TITLE_MODE]}]),exports:{preprocessor:l,
-strings:s,keywords:g}}},grmr_cpp:e=>{const n=e.regex,t=e.COMMENT("//","$",{
+beginKeywords:"final class struct"},e.TITLE_MODE]}]),exports:{preprocessor:c,
+strings:o,keywords:u}}},grmr_cpp:e=>{const n=e.regex,t=e.COMMENT("//","$",{
 contains:[{begin:/\\\n/}]
-}),a="[a-zA-Z_]\\w*::",i="(?!struct)(decltype\\(auto\\)|"+n.optional(a)+"[a-zA-Z_]\\w*"+n.optional("<[^<>]+>")+")",r={
-className:"type",begin:"\\b[a-z\\d_]*_t\\b"},s={className:"string",variants:[{
+}),a="decltype\\(auto\\)",i="[a-zA-Z_]\\w*::",r="(?!struct)("+a+"|"+n.optional(i)+"[a-zA-Z_]\\w*"+n.optional("<[^<>]+>")+")",s={
+className:"type",begin:"\\b[a-z\\d_]*_t\\b"},o={className:"string",variants:[{
 begin:'(u8?|U|L)?"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE]},{
 begin:"(u8?|U|L)?'(\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4,8}|[0-7]{3}|\\S)|.)",
 end:"'",illegal:"."},e.END_SAME_AS_BEGIN({
-begin:/(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,end:/\)([^()\\ ]{0,16})"/})]},o={
+begin:/(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,end:/\)([^()\\ ]{0,16})"/})]},l={
 className:"number",variants:[{begin:"\\b(0b[01']+)"},{
 begin:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)((ll|LL|l|L)(u|U)?|(u|U)(ll|LL|l|L)?|f|F|b|B)"
 },{
 begin:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"
-}],relevance:0},l={className:"meta",begin:/#\s*[a-z]+\b/,end:/$/,keywords:{
+}],relevance:0},c={className:"meta",begin:/#\s*[a-z]+\b/,end:/$/,keywords:{
 keyword:"if else elif endif define undef warning error line pragma _Pragma ifdef ifndef include"
-},contains:[{begin:/\\\n/,relevance:0},e.inherit(s,{className:"string"}),{
-className:"string",begin:/<.*?>/},t,e.C_BLOCK_COMMENT_MODE]},c={
-className:"title",begin:n.optional(a)+e.IDENT_RE,relevance:0
-},d=n.optional(a)+e.IDENT_RE+"\\s*\\(",g={
+},contains:[{begin:/\\\n/,relevance:0},e.inherit(o,{className:"string"}),{
+className:"string",begin:/<.*?>/},t,e.C_BLOCK_COMMENT_MODE]},d={
+className:"title",begin:n.optional(i)+e.IDENT_RE,relevance:0
+},g=n.optional(i)+e.IDENT_RE+"\\s*\\(",u={
 type:["bool","char","char16_t","char32_t","char8_t","double","float","int","long","short","void","wchar_t","unsigned","signed","const","static"],
 keyword:["alignas","alignof","and","and_eq","asm","atomic_cancel","atomic_commit","atomic_noexcept","auto","bitand","bitor","break","case","catch","class","co_await","co_return","co_yield","compl","concept","const_cast|10","consteval","constexpr","constinit","continue","decltype","default","delete","do","dynamic_cast|10","else","enum","explicit","export","extern","false","final","for","friend","goto","if","import","inline","module","mutable","namespace","new","noexcept","not","not_eq","nullptr","operator","or","or_eq","override","private","protected","public","reflexpr","register","reinterpret_cast|10","requires","return","sizeof","static_assert","static_cast|10","struct","switch","synchronized","template","this","thread_local","throw","transaction_safe","transaction_safe_dynamic","true","try","typedef","typeid","typename","union","using","virtual","volatile","while","xor","xor_eq"],
 literal:["NULL","false","nullopt","nullptr","true"],built_in:["_Pragma"],
 _type_hints:["any","auto_ptr","barrier","binary_semaphore","bitset","complex","condition_variable","condition_variable_any","counting_semaphore","deque","false_type","future","imaginary","initializer_list","istringstream","jthread","latch","lock_guard","multimap","multiset","mutex","optional","ostringstream","packaged_task","pair","promise","priority_queue","queue","recursive_mutex","recursive_timed_mutex","scoped_lock","set","shared_future","shared_lock","shared_mutex","shared_timed_mutex","shared_ptr","stack","string_view","stringstream","timed_mutex","thread","true_type","tuple","unique_lock","unique_ptr","unordered_map","unordered_multimap","unordered_multiset","unordered_set","variant","vector","weak_ptr","wstring","wstring_view"]
-},u={className:"function.dispatch",relevance:0,keywords:{
+},b={className:"function.dispatch",relevance:0,keywords:{
 _hint:["abort","abs","acos","apply","as_const","asin","atan","atan2","calloc","ceil","cerr","cin","clog","cos","cosh","cout","declval","endl","exchange","exit","exp","fabs","floor","fmod","forward","fprintf","fputs","free","frexp","fscanf","future","invoke","isalnum","isalpha","iscntrl","isdigit","isgraph","islower","isprint","ispunct","isspace","isupper","isxdigit","labs","launder","ldexp","log","log10","make_pair","make_shared","make_shared_for_overwrite","make_tuple","make_unique","malloc","memchr","memcmp","memcpy","memset","modf","move","pow","printf","putchar","puts","realloc","scanf","sin","sinh","snprintf","sprintf","sqrt","sscanf","std","stderr","stdin","stdout","strcat","strchr","strcmp","strcpy","strcspn","strlen","strncat","strncmp","strncpy","strpbrk","strrchr","strspn","strstr","swap","tan","tanh","terminate","to_underlying","tolower","toupper","vfprintf","visit","vprintf","vsprintf"]
 },
 begin:n.concat(/\b/,/(?!decltype)/,/(?!if)/,/(?!for)/,/(?!switch)/,/(?!while)/,e.IDENT_RE,n.lookahead(/(<[^<>]+>|)\s*\(/))
-},b=[u,l,r,t,e.C_BLOCK_COMMENT_MODE,o,s],m={variants:[{begin:/=/,end:/;/},{
+},m=[b,c,s,t,e.C_BLOCK_COMMENT_MODE,l,o],p={variants:[{begin:/=/,end:/;/},{
 begin:/\(/,end:/\)/},{beginKeywords:"new throw return else",end:/;/}],
-keywords:g,contains:b.concat([{begin:/\(/,end:/\)/,keywords:g,
-contains:b.concat(["self"]),relevance:0}]),relevance:0},p={className:"function",
-begin:"("+i+"[\\*&\\s]+)+"+d,returnBegin:!0,end:/[{;=]/,excludeEnd:!0,
-keywords:g,illegal:/[^\w\s\*&:<>.]/,contains:[{begin:"decltype\\(auto\\)",
-keywords:g,relevance:0},{begin:d,returnBegin:!0,contains:[c],relevance:0},{
-begin:/::/,relevance:0},{begin:/:/,endsWithParent:!0,contains:[s,o]},{
-relevance:0,match:/,/},{className:"params",begin:/\(/,end:/\)/,keywords:g,
-relevance:0,contains:[t,e.C_BLOCK_COMMENT_MODE,s,o,r,{begin:/\(/,end:/\)/,
-keywords:g,relevance:0,contains:["self",t,e.C_BLOCK_COMMENT_MODE,s,o,r]}]
-},r,t,e.C_BLOCK_COMMENT_MODE,l]};return{name:"C++",
-aliases:["cc","c++","h++","hpp","hh","hxx","cxx"],keywords:g,illegal:"</",
+keywords:u,contains:m.concat([{begin:/\(/,end:/\)/,keywords:u,
+contains:m.concat(["self"]),relevance:0}]),relevance:0},_={className:"function",
+begin:"("+r+"[\\*&\\s]+)+"+g,returnBegin:!0,end:/[{;=]/,excludeEnd:!0,
+keywords:u,illegal:/[^\w\s\*&:<>.]/,contains:[{begin:a,keywords:u,relevance:0},{
+begin:g,returnBegin:!0,contains:[d],relevance:0},{begin:/::/,relevance:0},{
+begin:/:/,endsWithParent:!0,contains:[o,l]},{relevance:0,match:/,/},{
+className:"params",begin:/\(/,end:/\)/,keywords:u,relevance:0,
+contains:[t,e.C_BLOCK_COMMENT_MODE,o,l,s,{begin:/\(/,end:/\)/,keywords:u,
+relevance:0,contains:["self",t,e.C_BLOCK_COMMENT_MODE,o,l,s]}]
+},s,t,e.C_BLOCK_COMMENT_MODE,c]};return{name:"C++",
+aliases:["cc","c++","h++","hpp","hh","hxx","cxx"],keywords:u,illegal:"</",
 classNameAliases:{"function.dispatch":"built_in"},
-contains:[].concat(m,p,u,b,[l,{
+contains:[].concat(p,_,b,m,[c,{
 begin:"\\b(deque|list|queue|priority_queue|pair|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array|tuple|optional|variant|function)\\s*<(?!<)",
-end:">",keywords:g,contains:["self",r]},{begin:e.IDENT_RE+"::",keywords:g},{
+end:">",keywords:u,contains:["self",s]},{begin:e.IDENT_RE+"::",keywords:u},{
 match:[/\b(?:enum(?:\s+(?:class|struct))?|class|struct|union)/,/\s+/,/\w+/],
 className:{1:"keyword",3:"title.class"}}])}},grmr_csharp:e=>{const n={
 keyword:["abstract","as","base","break","case","catch","class","const","continue","do","else","event","explicit","extern","finally","fixed","for","foreach","goto","if","implicit","in","interface","internal","is","lock","namespace","new","operator","out","override","params","private","protected","public","readonly","record","ref","return","scoped","sealed","sizeof","stackalloc","static","struct","switch","this","throw","try","typeof","unchecked","unsafe","using","virtual","void","volatile","while"].concat(["add","alias","and","ascending","async","await","by","descending","equals","from","get","global","group","init","into","join","let","nameof","not","notnull","on","or","orderby","partial","remove","select","set","unmanaged","value|0","var","when","where","with","yield"]),
@@ -540,15 +545,15 @@ contains:[e.TITLE_MODE,u],relevance:0},{match:/\(\)/},{className:"params",
 begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:n,relevance:0,
 contains:[g,a,e.C_BLOCK_COMMENT_MODE]
 },e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},m]}},grmr_css:e=>{
-const n=e.regex,t=te(e),a=[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE];return{
+const n=e.regex,t=ie(e),a=[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE];return{
 name:"CSS",case_insensitive:!0,illegal:/[=|'\$]/,keywords:{
 keyframePosition:"from to"},classNameAliases:{keyframePosition:"selector-tag"},
 contains:[t.BLOCK_COMMENT,{begin:/-(webkit|moz|ms|o)-(?=[a-z])/
 },t.CSS_NUMBER_MODE,{className:"selector-id",begin:/#[A-Za-z0-9_-]+/,relevance:0
 },{className:"selector-class",begin:"\\.[a-zA-Z-][a-zA-Z0-9_-]*",relevance:0
 },t.ATTRIBUTE_SELECTOR_MODE,{className:"selector-pseudo",variants:[{
-begin:":("+re.join("|")+")"},{begin:":(:)?("+se.join("|")+")"}]
-},t.CSS_VARIABLE,{className:"attribute",begin:"\\b("+oe.join("|")+")\\b"},{
+begin:":("+oe.join("|")+")"},{begin:":(:)?("+le.join("|")+")"}]
+},t.CSS_VARIABLE,{className:"attribute",begin:"\\b("+ce.join("|")+")\\b"},{
 begin:/:/,end:/[;}{]/,
 contains:[t.BLOCK_COMMENT,t.HEXCOLOR,t.IMPORTANT,t.CSS_NUMBER_MODE,...a,{
 begin:/(url|data-uri)\(/,end:/\)/,relevance:0,keywords:{built_in:"url data-uri"
@@ -556,9 +561,9 @@ begin:/(url|data-uri)\(/,end:/\)/,relevance:0,keywords:{built_in:"url data-uri"
 excludeEnd:!0}]},t.FUNCTION_DISPATCH]},{begin:n.lookahead(/@/),end:"[{;]",
 relevance:0,illegal:/:/,contains:[{className:"keyword",begin:/@-?\w[\w]*(-\w+)*/
 },{begin:/\s/,endsWithParent:!0,excludeEnd:!0,relevance:0,keywords:{
-$pattern:/[a-z-]+/,keyword:"and or not only",attribute:ie.join(" ")},contains:[{
+$pattern:/[a-z-]+/,keyword:"and or not only",attribute:se.join(" ")},contains:[{
 begin:/[a-z-]+(?=:)/,className:"attribute"},...a,t.CSS_NUMBER_MODE]}]},{
-className:"selector-tag",begin:"\\b("+ae.join("|")+")\\b"}]}},grmr_diff:e=>{
+className:"selector-tag",begin:"\\b("+re.join("|")+")\\b"}]}},grmr_diff:e=>{
 const n=e.regex;return{name:"Diff",aliases:["patch"],contains:[{
 className:"meta",relevance:10,
 match:n.either(/^@@ +-\d+,\d+ +\+\d+,\d+ +@@/,/^\*\*\* +\d+,\d+ +\*\*\*\*$/,/^--- +\d+,\d+ +----$/)
@@ -601,8 +606,8 @@ name:"TOML, also INI",aliases:["toml"],case_insensitive:!0,illegal:/\S/,
 contains:[a,{className:"section",begin:/\[+/,end:/\]+/},{
 begin:n.concat(l,"(\\s*\\.\\s*",l,")*",n.lookahead(/\s*=\s*[^#\s]/)),
 className:"attr",starts:{end:/$/,contains:[a,o,r,i,s,t]}}]}},grmr_java:e=>{
-const n=e.regex,t="[\xc0-\u02b8a-zA-Z_$][\xc0-\u02b8a-zA-Z_$0-9]*",a=t+ue("(?:<"+t+"~~~(?:\\s*,\\s*"+t+"~~~)*>)?",/~~~/g,2),i={
-keyword:["synchronized","abstract","private","var","static","if","const ","for","while","strictfp","finally","protected","import","native","final","void","enum","else","break","transient","catch","instanceof","volatile","case","assert","package","default","public","try","switch","continue","throws","protected","public","private","module","requires","exports","do","sealed"],
+const n=e.regex,t="[\xc0-\u02b8a-zA-Z_$][\xc0-\u02b8a-zA-Z_$0-9]*",a=t+pe("(?:<"+t+"~~~(?:\\s*,\\s*"+t+"~~~)*>)?",/~~~/g,2),i={
+keyword:["synchronized","abstract","private","var","static","if","const ","for","while","strictfp","finally","protected","import","native","final","void","enum","else","break","transient","catch","instanceof","volatile","case","assert","package","default","public","try","switch","continue","throws","protected","public","private","module","requires","exports","do","sealed","yield","permits"],
 literal:["false","true","null"],
 type:["char","boolean","long","float","int","byte","short","double"],
 built_in:["super","this"]},r={className:"meta",begin:"@"+t,contains:[{
@@ -624,8 +629,8 @@ beginKeywords:"new throw return else",relevance:0},{
 begin:["(?:"+a+"\\s+)",e.UNDERSCORE_IDENT_RE,/\s*(?=\()/],className:{
 2:"title.function"},keywords:i,contains:[{className:"params",begin:/\(/,
 end:/\)/,keywords:i,relevance:0,
-contains:[r,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,ge,e.C_BLOCK_COMMENT_MODE]
-},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},ge,r]}},grmr_javascript:we,
+contains:[r,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,me,e.C_BLOCK_COMMENT_MODE]
+},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},me,r]}},grmr_javascript:Oe,
 grmr_json:e=>{const n=["true","false","null"],t={scope:"literal",
 beginKeywords:n.join(" ")};return{name:"JSON",keywords:{literal:n},contains:[{
 className:"attr",begin:/"(\\.|[^\\"\r\n])*"(?=\s*:)/,relevance:1.01},{
@@ -644,7 +649,7 @@ className:"meta",
 begin:"@(?:file|property|field|get|set|receiver|param|setparam|delegate)\\s*:(?:\\s*"+e.UNDERSCORE_IDENT_RE+")?"
 },o={className:"meta",begin:"@"+e.UNDERSCORE_IDENT_RE,contains:[{begin:/\(/,
 end:/\)/,contains:[e.inherit(r,{className:"string"}),"self"]}]
-},l=ge,c=e.COMMENT("/\\*","\\*/",{contains:[e.C_BLOCK_COMMENT_MODE]}),d={
+},l=me,c=e.COMMENT("/\\*","\\*/",{contains:[e.C_BLOCK_COMMENT_MODE]}),d={
 variants:[{className:"type",begin:e.UNDERSCORE_IDENT_RE},{begin:/\(/,end:/\)/,
 contains:[]}]},g=d;return g.variants[1].contains=[d],d.variants[1].contains=[g],
 {name:"Kotlin",aliases:["kt","kts"],keywords:n,
@@ -667,41 +672,41 @@ beginKeywords:"public protected internal private constructor"
 excludeEnd:!0,relevance:0},{className:"type",begin:/[,:]\s*/,end:/[<\(,){\s]|$/,
 excludeBegin:!0,returnEnd:!0},s,o]},r,{className:"meta",begin:"^#!/usr/bin/env",
 end:"$",illegal:"\n"},l]}},grmr_less:e=>{
-const n=te(e),t=le,a="([\\w-]+|@\\{[\\w-]+\\})",i=[],r=[],s=e=>({
-className:"string",begin:"~?"+e+".*?"+e}),o=(e,n,t)=>({className:e,begin:n,
-relevance:t}),l={$pattern:/[a-z-]+/,keyword:"and or not only",
-attribute:ie.join(" ")},c={begin:"\\(",end:"\\)",contains:r,keywords:l,
+const n=ie(e),t=de,a="[\\w-]+",i="("+a+"|@\\{"+a+"\\})",r=[],s=[],o=e=>({
+className:"string",begin:"~?"+e+".*?"+e}),l=(e,n,t)=>({className:e,begin:n,
+relevance:t}),c={$pattern:/[a-z-]+/,keyword:"and or not only",
+attribute:se.join(" ")},d={begin:"\\(",end:"\\)",contains:s,keywords:c,
 relevance:0}
-;r.push(e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,s("'"),s('"'),n.CSS_NUMBER_MODE,{
+;s.push(e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,o("'"),o('"'),n.CSS_NUMBER_MODE,{
 begin:"(url|data-uri)\\(",starts:{className:"string",end:"[\\)\\n]",
 excludeEnd:!0}
-},n.HEXCOLOR,c,o("variable","@@?[\\w-]+",10),o("variable","@\\{[\\w-]+\\}"),o("built_in","~?`[^`]*?`"),{
-className:"attribute",begin:"[\\w-]+\\s*:",end:":",returnBegin:!0,excludeEnd:!0
-},n.IMPORTANT,{beginKeywords:"and not"},n.FUNCTION_DISPATCH);const d=r.concat({
-begin:/\{/,end:/\}/,contains:i}),g={beginKeywords:"when",endsWithParent:!0,
-contains:[{beginKeywords:"and not"}].concat(r)},u={begin:a+"\\s*:",
+},n.HEXCOLOR,d,l("variable","@@?"+a,10),l("variable","@\\{"+a+"\\}"),l("built_in","~?`[^`]*?`"),{
+className:"attribute",begin:a+"\\s*:",end:":",returnBegin:!0,excludeEnd:!0
+},n.IMPORTANT,{beginKeywords:"and not"},n.FUNCTION_DISPATCH);const g=s.concat({
+begin:/\{/,end:/\}/,contains:r}),u={beginKeywords:"when",endsWithParent:!0,
+contains:[{beginKeywords:"and not"}].concat(s)},b={begin:i+"\\s*:",
 returnBegin:!0,end:/[;}]/,relevance:0,contains:[{begin:/-(webkit|moz|ms|o)-/
-},n.CSS_VARIABLE,{className:"attribute",begin:"\\b("+oe.join("|")+")\\b",
-end:/(?=:)/,starts:{endsWithParent:!0,illegal:"[<=$]",relevance:0,contains:r}}]
-},b={className:"keyword",
+},n.CSS_VARIABLE,{className:"attribute",begin:"\\b("+ce.join("|")+")\\b",
+end:/(?=:)/,starts:{endsWithParent:!0,illegal:"[<=$]",relevance:0,contains:s}}]
+},m={className:"keyword",
 begin:"@(import|media|charset|font-face|(-[a-z]+-)?keyframes|supports|document|namespace|page|viewport|host)\\b",
-starts:{end:"[;{}]",keywords:l,returnEnd:!0,contains:r,relevance:0}},m={
-className:"variable",variants:[{begin:"@[\\w-]+\\s*:",relevance:15},{
-begin:"@[\\w-]+"}],starts:{end:"[;}]",returnEnd:!0,contains:d}},p={variants:[{
-begin:"[\\.#:&\\[>]",end:"[;{}]"},{begin:a,end:/\{/}],returnBegin:!0,
+starts:{end:"[;{}]",keywords:c,returnEnd:!0,contains:s,relevance:0}},p={
+className:"variable",variants:[{begin:"@"+a+"\\s*:",relevance:15},{begin:"@"+a
+}],starts:{end:"[;}]",returnEnd:!0,contains:g}},_={variants:[{
+begin:"[\\.#:&\\[>]",end:"[;{}]"},{begin:i,end:/\{/}],returnBegin:!0,
 returnEnd:!0,illegal:"[<='$\"]",relevance:0,
-contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,g,o("keyword","all\\b"),o("variable","@\\{[\\w-]+\\}"),{
-begin:"\\b("+ae.join("|")+")\\b",className:"selector-tag"
-},n.CSS_NUMBER_MODE,o("selector-tag",a,0),o("selector-id","#"+a),o("selector-class","\\."+a,0),o("selector-tag","&",0),n.ATTRIBUTE_SELECTOR_MODE,{
-className:"selector-pseudo",begin:":("+re.join("|")+")"},{
-className:"selector-pseudo",begin:":(:)?("+se.join("|")+")"},{begin:/\(/,
-end:/\)/,relevance:0,contains:d},{begin:"!important"},n.FUNCTION_DISPATCH]},_={
-begin:`[\\w-]+:(:)?(${t.join("|")})`,returnBegin:!0,contains:[p]}
-;return i.push(e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,b,m,_,u,p,g,n.FUNCTION_DISPATCH),
-{name:"Less",case_insensitive:!0,illegal:"[=>'/<($\"]",contains:i}},
+contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,u,l("keyword","all\\b"),l("variable","@\\{"+a+"\\}"),{
+begin:"\\b("+re.join("|")+")\\b",className:"selector-tag"
+},n.CSS_NUMBER_MODE,l("selector-tag",i,0),l("selector-id","#"+i),l("selector-class","\\."+i,0),l("selector-tag","&",0),n.ATTRIBUTE_SELECTOR_MODE,{
+className:"selector-pseudo",begin:":("+oe.join("|")+")"},{
+className:"selector-pseudo",begin:":(:)?("+le.join("|")+")"},{begin:/\(/,
+end:/\)/,relevance:0,contains:g},{begin:"!important"},n.FUNCTION_DISPATCH]},h={
+begin:a+":(:)?"+`(${t.join("|")})`,returnBegin:!0,contains:[_]}
+;return r.push(e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,m,p,h,b,_,u,n.FUNCTION_DISPATCH),
+{name:"Less",case_insensitive:!0,illegal:"[=>'/<($\"]",contains:r}},
 grmr_lua:e=>{const n="\\[=*\\[",t="\\]=*\\]",a={begin:n,end:t,contains:["self"]
-},i=[e.COMMENT("--(?!\\[=*\\[)","$"),e.COMMENT("--\\[=*\\[",t,{contains:[a],
-relevance:10})];return{name:"Lua",keywords:{$pattern:e.UNDERSCORE_IDENT_RE,
+},i=[e.COMMENT("--(?!"+n+")","$"),e.COMMENT("--"+n,t,{contains:[a],relevance:10
+})];return{name:"Lua",keywords:{$pattern:e.UNDERSCORE_IDENT_RE,
 literal:"true false nil",
 keyword:"and break do else elseif end for goto if in local not or repeat return then until while",
 built_in:"_G _ENV _VERSION __index __newindex __mode __call __metatable __tostring __len __gc __add __sub __mul __div __mod __pow __concat __unm __eq __lt __le assert collectgarbage dofile error getfenv getmetatable ipairs load loadfile loadstring module next pairs pcall print rawequal rawget rawset require select setfenv setmetatable tonumber tostring type unpack xpcall arg self coroutine resume yield status wrap create running debug getupvalue debug sethook getmetatable gethook setmetatable setlocal traceback setfenv getinfo setupvalue getlocal getregistry getfenv io lines write close flush open output type read stderr stdin input stdout popen tmpfile math log max acos huge ldexp pi cos tanh pow deg tan cosh sinh random randomseed frexp ceil floor rad abs sqrt modf asin min mod fmod log10 atan2 exp sin atan os exit setlocale date getenv difftime remove time clock tmpname rename execute package preload loadlib loaded loaders cpath config path seeall string sub upper len gfind rep find match char dump gmatch reverse byte format gsub lower table setn insert getn foreachi maxn foreach concat sort remove"
@@ -759,9 +764,9 @@ begin:/\[.*?\]\(.*?\)/,relevance:0}],returnBegin:!0,contains:[{match:/\[(?=\])/
 returnEnd:!0},{className:"link",relevance:0,begin:"\\]\\(",end:"\\)",
 excludeBegin:!0,excludeEnd:!0},{className:"symbol",relevance:0,begin:"\\]\\[",
 end:"\\]",excludeBegin:!0,excludeEnd:!0}]},a={className:"strong",contains:[],
-variants:[{begin:/_{2}/,end:/_{2}/},{begin:/\*{2}/,end:/\*{2}/}]},i={
-className:"emphasis",contains:[],variants:[{begin:/\*(?!\*)/,end:/\*/},{
-begin:/_(?!_)/,end:/_/,relevance:0}]},r=e.inherit(a,{contains:[]
+variants:[{begin:/_{2}(?!\s)/,end:/_{2}/},{begin:/\*{2}(?!\s)/,end:/\*{2}/}]
+},i={className:"emphasis",contains:[],variants:[{begin:/\*(?![*\s])/,end:/\*/},{
+begin:/_(?![_\s])/,end:/_/,relevance:0}]},r=e.inherit(a,{contains:[]
 }),s=e.inherit(i,{contains:[]});a.contains.push(s),i.contains.push(r)
 ;let o=[n,t];return[a,i,r,s].forEach((e=>{e.contains=e.contains.concat(o)
 })),o=o.concat(a,i),{name:"Markdown",aliases:["md","mkdown","mkd"],contains:[{
@@ -835,11 +840,13 @@ const n=e.regex,t=/(?![A-Za-z0-9])(?![$])/,a=n.concat(/[a-zA-Z_\x7f-\xff][a-zA-Z
 scope:"variable",match:"\\$+"+a},s={scope:"subst",variants:[{begin:/\$\w+/},{
 begin:/\{\$/,end:/\}/}]},o=e.inherit(e.APOS_STRING_MODE,{illegal:null
 }),l="[ \t\n]",c={scope:"string",variants:[e.inherit(e.QUOTE_STRING_MODE,{
-illegal:null,contains:e.QUOTE_STRING_MODE.contains.concat(s)
-}),o,e.END_SAME_AS_BEGIN({begin:/<<<[ \t]*(\w+)\n/,end:/[ \t]*(\w+)\b/,
-contains:e.QUOTE_STRING_MODE.contains.concat(s)})]},d={scope:"number",
-variants:[{begin:"\\b0[bB][01]+(?:_[01]+)*\\b"},{
-begin:"\\b0[oO][0-7]+(?:_[0-7]+)*\\b"},{
+illegal:null,contains:e.QUOTE_STRING_MODE.contains.concat(s)}),o,{
+begin:/<<<[ \t]*(?:(\w+)|"(\w+)")\n/,end:/[ \t]*(\w+)\b/,
+contains:e.QUOTE_STRING_MODE.contains.concat(s),"on:begin":(e,n)=>{
+n.data._beginMatch=e[1]||e[2]},"on:end":(e,n)=>{
+n.data._beginMatch!==e[1]&&n.ignoreMatch()}},e.END_SAME_AS_BEGIN({
+begin:/<<<[ \t]*'(\w+)'\n/,end:/[ \t]*(\w+)\b/})]},d={scope:"number",variants:[{
+begin:"\\b0[bB][01]+(?:_[01]+)*\\b"},{begin:"\\b0[oO][0-7]+(?:_[0-7]+)*\\b"},{
 begin:"\\b0[xX][\\da-fA-F]+(?:_[\\da-fA-F]+)*\\b"},{
 begin:"(?:\\b\\d+(?:_\\d+)*(\\.(?:\\d+(?:_\\d+)*))?|\\B\\.\\d+)(?:[eE][+-]?\\d+)?"
 }],relevance:0
@@ -857,20 +864,20 @@ scope:{1:"title.class"}},{match:[i,/::/,/class/],scope:{1:"title.class",
 3:"variable.language"}}]},E={scope:"attr",
 match:n.concat(a,n.lookahead(":"),n.lookahead(/(?!::)/))},y={relevance:0,
 begin:/\(/,end:/\)/,keywords:m,contains:[E,r,f,e.C_BLOCK_COMMENT_MODE,c,d,_]
-},w={relevance:0,
+},N={relevance:0,
 match:[/\b/,n.concat("(?!fn\\b|function\\b|",p(u).join("\\b|"),"|",p(b).join("\\b|"),"\\b)"),a,n.concat(l,"*"),n.lookahead(/(?=\()/)],
-scope:{3:"title.function.invoke"},contains:[y]};y.contains.push(w)
-;const N=[E,f,e.C_BLOCK_COMMENT_MODE,c,d,_];return{case_insensitive:!1,
+scope:{3:"title.function.invoke"},contains:[y]};y.contains.push(N)
+;const w=[E,f,e.C_BLOCK_COMMENT_MODE,c,d,_];return{case_insensitive:!1,
 keywords:m,contains:[{begin:n.concat(/#\[\s*/,i),beginScope:"meta",end:/]/,
 endScope:"meta",keywords:{literal:g,keyword:["new","array"]},contains:[{
 begin:/\[/,end:/]/,keywords:{literal:g,keyword:["new","array"]},
-contains:["self",...N]},...N,{scope:"meta",match:i}]
+contains:["self",...w]},...w,{scope:"meta",match:i}]
 },e.HASH_COMMENT_MODE,e.COMMENT("//","$"),e.COMMENT("/\\*","\\*/",{contains:[{
 scope:"doctag",match:"@[A-Za-z]+"}]}),{match:/__halt_compiler\(\);/,
 keywords:"__halt_compiler",starts:{scope:"comment",end:e.MATCH_NOTHING_RE,
 contains:[{match:/\?>/,scope:"meta",endsParent:!0}]}},{scope:"meta",variants:[{
 begin:/<\?php/,relevance:10},{begin:/<\?=/},{begin:/<\?/,relevance:.1},{
-begin:/\?>/}]},{scope:"variable.language",match:/\$this\b/},r,w,f,{
+begin:/\?>/}]},{scope:"variable.language",match:/\$this\b/},r,N,f,{
 match:[/const/,/\s/,a],scope:{1:"keyword",3:"variable.constant"}},_,{
 scope:"function",relevance:0,beginKeywords:"fn function",end:/[;{]/,
 excludeEnd:!0,illegal:"[$%\\[]",contains:[{beginKeywords:"use"
@@ -923,7 +930,7 @@ className:"params",variants:[{className:"",begin:/\(\s*\)/,skip:!0},{begin:/\(/,
 end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:i,
 contains:["self",r,u,l,e.HASH_COMMENT_MODE]}]};return s.contains=[l,u,r],{
 name:"Python",aliases:["py","gyp","ipython"],unicodeRegex:!0,keywords:i,
-illegal:/(<\/|->|\?)|=>/,contains:[r,u,{begin:/\bself\b/},{beginKeywords:"if",
+illegal:/(<\/|\?)|=>/,contains:[r,u,{begin:/\bself\b/},{beginKeywords:"if",
 relevance:0},l,b,e.HASH_COMMENT_MODE,{match:[/\bdef/,/\s+/,t],scope:{
 1:"keyword",3:"title.function"},contains:[m]},{variants:[{
 match:[/\bclass/,/\s+/,t,/\s*/,/\(\s*/,t,/\s*\)/]},{match:[/\bclass/,/\s+/,t]}],
@@ -957,19 +964,20 @@ match:[t,/\s+/,/<-/,/\s+/]},{scope:"operator",relevance:0,variants:[{match:i},{
 match:/%[^%]*%/}]},{scope:"punctuation",relevance:0,match:r},{begin:"`",end:"`",
 contains:[{begin:/\\./}]}]}},grmr_ruby:e=>{
 const n=e.regex,t="([a-zA-Z_]\\w*[!?=]?|[-+~]@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?)",a=n.either(/\b([A-Z]+[a-z0-9]+)+/,/\b([A-Z]+[a-z0-9]+)+[A-Z]+/),i=n.concat(a,/(::\w+)*/),r={
-"variable.constant":["__FILE__","__LINE__"],
+"variable.constant":["__FILE__","__LINE__","__ENCODING__"],
 "variable.language":["self","super"],
-keyword:["alias","and","attr_accessor","attr_reader","attr_writer","begin","BEGIN","break","case","class","defined","do","else","elsif","end","END","ensure","for","if","in","include","module","next","not","or","redo","require","rescue","retry","return","then","undef","unless","until","when","while","yield"],
-built_in:["proc","lambda"],literal:["true","false","nil"]},s={
-className:"doctag",begin:"@[A-Za-z]+"},o={begin:"#<",end:">"
-},l=[e.COMMENT("#","$",{contains:[s]}),e.COMMENT("^=begin","^=end",{
-contains:[s],relevance:10}),e.COMMENT("^__END__",e.MATCH_NOTHING_RE)],c={
-className:"subst",begin:/#\{/,end:/\}/,keywords:r},d={className:"string",
-contains:[e.BACKSLASH_ESCAPE,c],variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/
-},{begin:/`/,end:/`/},{begin:/%[qQwWx]?\(/,end:/\)/},{begin:/%[qQwWx]?\[/,
-end:/\]/},{begin:/%[qQwWx]?\{/,end:/\}/},{begin:/%[qQwWx]?</,end:/>/},{
-begin:/%[qQwWx]?\//,end:/\//},{begin:/%[qQwWx]?%/,end:/%/},{begin:/%[qQwWx]?-/,
-end:/-/},{begin:/%[qQwWx]?\|/,end:/\|/},{begin:/\B\?(\\\d{1,3})/},{
+keyword:["alias","and","begin","BEGIN","break","case","class","defined","do","else","elsif","end","END","ensure","for","if","in","module","next","not","or","redo","require","rescue","retry","return","then","undef","unless","until","when","while","yield","include","extend","prepend","public","private","protected","raise","throw"],
+built_in:["proc","lambda","attr_accessor","attr_reader","attr_writer","define_method","private_constant","module_function"],
+literal:["true","false","nil"]},s={className:"doctag",begin:"@[A-Za-z]+"},o={
+begin:"#<",end:">"},l=[e.COMMENT("#","$",{contains:[s]
+}),e.COMMENT("^=begin","^=end",{contains:[s],relevance:10
+}),e.COMMENT("^__END__",e.MATCH_NOTHING_RE)],c={className:"subst",begin:/#\{/,
+end:/\}/,keywords:r},d={className:"string",contains:[e.BACKSLASH_ESCAPE,c],
+variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/},{begin:/`/,end:/`/},{
+begin:/%[qQwWx]?\(/,end:/\)/},{begin:/%[qQwWx]?\[/,end:/\]/},{
+begin:/%[qQwWx]?\{/,end:/\}/},{begin:/%[qQwWx]?</,end:/>/},{begin:/%[qQwWx]?\//,
+end:/\//},{begin:/%[qQwWx]?%/,end:/%/},{begin:/%[qQwWx]?-/,end:/-/},{
+begin:/%[qQwWx]?\|/,end:/\|/},{begin:/\B\?(\\\d{1,3})/},{
 begin:/\B\?(\\x[A-Fa-f0-9]{1,2})/},{begin:/\B\?(\\u\{?[A-Fa-f0-9]{1,6}\}?)/},{
 begin:/\B\?(\\M-\\C-|\\M-\\c|\\c\\M-|\\M-|\\C-\\M-)[\x20-\x7e]/},{
 begin:/\B\?\\(c|C-)[\x20-\x7e]/},{begin:/\B\?\\?\S/},{
@@ -984,9 +992,11 @@ begin:"\\b0[xX][0-9a-fA-F](_?[0-9a-fA-F])*r?i?\\b"},{
 begin:"\\b0(_?[0-7])+r?i?\\b"}]},b={variants:[{match:/\(\)/},{
 className:"params",begin:/\(/,end:/(?=\))/,excludeBegin:!0,endsParent:!0,
 keywords:r}]},m=[d,{variants:[{match:[/class\s+/,i,/\s+<\s+/,i]},{
-match:[/class\s+/,i]}],scope:{2:"title.class",4:"title.class.inherited"},
-keywords:r},{relevance:0,match:[i,/\.new[ (]/],scope:{1:"title.class"}},{
-relevance:0,match:/\b[A-Z][A-Z_0-9]+\b/,className:"variable.constant"},{
+match:[/\b(class|module)\s+/,i]}],scope:{2:"title.class",
+4:"title.class.inherited"},keywords:r},{match:[/(include|extend)\s+/,i],scope:{
+2:"title.class"},keywords:r},{relevance:0,match:[i,/\.new[. (]/],scope:{
+1:"title.class"}},{relevance:0,match:/\b[A-Z][A-Z_0-9]+\b/,
+className:"variable.constant"},{relevance:0,match:a,scope:"title.class"},{
 match:[/def/,/\s+/,t],scope:{1:"keyword",3:"title.function"},contains:[b]},{
 begin:e.IDENT_RE+"::"},{className:"symbol",
 begin:e.UNDERSCORE_IDENT_RE+"(!|\\?)?:",relevance:0},{className:"symbol",
@@ -1029,24 +1039,24 @@ className:{1:"keyword",3:"title.class"}},{
 begin:[/(?:trait|enum|struct|union|impl|for)/,/\s+/,e.UNDERSCORE_IDENT_RE],
 className:{1:"keyword",3:"title.class"}},{begin:e.IDENT_RE+"::",keywords:{
 keyword:"Self",built_in:i,type:r}},{className:"punctuation",begin:"->"},t]}},
-grmr_scss:e=>{const n=te(e),t=se,a=re,i="@[a-z-]+",r={className:"variable",
+grmr_scss:e=>{const n=ie(e),t=le,a=oe,i="@[a-z-]+",r={className:"variable",
 begin:"(\\$[a-zA-Z-][a-zA-Z0-9_-]*)\\b",relevance:0};return{name:"SCSS",
 case_insensitive:!0,illegal:"[=/|']",
 contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,n.CSS_NUMBER_MODE,{
 className:"selector-id",begin:"#[A-Za-z0-9_-]+",relevance:0},{
 className:"selector-class",begin:"\\.[A-Za-z0-9_-]+",relevance:0
 },n.ATTRIBUTE_SELECTOR_MODE,{className:"selector-tag",
-begin:"\\b("+ae.join("|")+")\\b",relevance:0},{className:"selector-pseudo",
+begin:"\\b("+re.join("|")+")\\b",relevance:0},{className:"selector-pseudo",
 begin:":("+a.join("|")+")"},{className:"selector-pseudo",
 begin:":(:)?("+t.join("|")+")"},r,{begin:/\(/,end:/\)/,
 contains:[n.CSS_NUMBER_MODE]},n.CSS_VARIABLE,{className:"attribute",
-begin:"\\b("+oe.join("|")+")\\b"},{
+begin:"\\b("+ce.join("|")+")\\b"},{
 begin:"\\b(whitespace|wait|w-resize|visible|vertical-text|vertical-ideographic|uppercase|upper-roman|upper-alpha|underline|transparent|top|thin|thick|text|text-top|text-bottom|tb-rl|table-header-group|table-footer-group|sw-resize|super|strict|static|square|solid|small-caps|separate|se-resize|scroll|s-resize|rtl|row-resize|ridge|right|repeat|repeat-y|repeat-x|relative|progress|pointer|overline|outside|outset|oblique|nowrap|not-allowed|normal|none|nw-resize|no-repeat|no-drop|newspaper|ne-resize|n-resize|move|middle|medium|ltr|lr-tb|lowercase|lower-roman|lower-alpha|loose|list-item|line|line-through|line-edge|lighter|left|keep-all|justify|italic|inter-word|inter-ideograph|inside|inset|inline|inline-block|inherit|inactive|ideograph-space|ideograph-parenthesis|ideograph-numeric|ideograph-alpha|horizontal|hidden|help|hand|groove|fixed|ellipsis|e-resize|double|dotted|distribute|distribute-space|distribute-letter|distribute-all-lines|disc|disabled|default|decimal|dashed|crosshair|collapse|col-resize|circle|char|center|capitalize|break-word|break-all|bottom|both|bolder|bold|block|bidi-override|below|baseline|auto|always|all-scroll|absolute|table|table-cell)\\b"
 },{begin:/:/,end:/[;}{]/,relevance:0,
 contains:[n.BLOCK_COMMENT,r,n.HEXCOLOR,n.CSS_NUMBER_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,n.IMPORTANT,n.FUNCTION_DISPATCH]
 },{begin:"@(page|font-face)",keywords:{$pattern:i,keyword:"@page @font-face"}},{
 begin:"@",end:"[{;]",returnBegin:!0,keywords:{$pattern:/[a-z-]+/,
-keyword:"and or not only",attribute:ie.join(" ")},contains:[{begin:i,
+keyword:"and or not only",attribute:se.join(" ")},contains:[{begin:i,
 className:"keyword"},{begin:/[a-z-]+(?=:)/,className:"attribute"
 },r,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,n.HEXCOLOR,n.CSS_NUMBER_MODE]
 },n.FUNCTION_DISPATCH]}},grmr_shell:e=>({name:"Shell Session",
@@ -1063,78 +1073,77 @@ built_in:["current_catalog","current_date","current_default_transform_group","cu
 },contains:[{begin:n.either(...s),relevance:0,keywords:{$pattern:/[\w\.]+/,
 keyword:l.concat(s),literal:a,type:i}},{className:"type",
 begin:n.either("double precision","large object","with timezone","without timezone")
-},c,{className:"variable",begin:/@[a-z0-9]+/},{className:"string",variants:[{
-begin:/'/,end:/'/,contains:[{begin:/''/}]}]},{begin:/"/,end:/"/,contains:[{
-begin:/""/}]},e.C_NUMBER_MODE,e.C_BLOCK_COMMENT_MODE,t,{className:"operator",
-begin:/[-+*/=%^~]|&&?|\|\|?|!=?|<(?:=>?|<|>)?|>[>=]?/,relevance:0}]}},
-grmr_swift:e=>{const n={match:/\s+/,relevance:0},t=e.COMMENT("/\\*","\\*/",{
-contains:["self"]}),a=[e.C_LINE_COMMENT_MODE,t],i={match:[/\./,p(...ve,...Oe)],
-className:{2:"keyword"}},r={match:m(/\./,p(...xe)),relevance:0
-},s=xe.filter((e=>"string"==typeof e)).concat(["_|0"]),o={variants:[{
+},c,{className:"variable",begin:/@[a-z0-9][a-z0-9_]*/},{className:"string",
+variants:[{begin:/'/,end:/'/,contains:[{begin:/''/}]}]},{begin:/"/,end:/"/,
+contains:[{begin:/""/}]},e.C_NUMBER_MODE,e.C_BLOCK_COMMENT_MODE,t,{
+className:"operator",begin:/[-+*/=%^~]|&&?|\|\|?|!=?|<(?:=>?|<|>)?|>[>=]?/,
+relevance:0}]}},grmr_swift:e=>{const n={match:/\s+/,relevance:0
+},t=e.COMMENT("/\\*","\\*/",{contains:["self"]}),a=[e.C_LINE_COMMENT_MODE,t],i={
+match:[/\./,m(...xe,...Me)],className:{2:"keyword"}},r={match:b(/\./,m(...Ae)),
+relevance:0},s=Ae.filter((e=>"string"==typeof e)).concat(["_|0"]),o={variants:[{
 className:"keyword",
-match:p(...xe.filter((e=>"string"!=typeof e)).concat(ke).map(Ne),...Oe)}]},l={
-$pattern:p(/\b\w+/,/#\w+/),keyword:s.concat(Ae),literal:Me},c=[i,r,o],d=[{
-match:m(/\./,p(...Ce)),relevance:0},{className:"built_in",
-match:m(/\b/,p(...Ce),/(?=\()/)}],u={match:/->/,relevance:0},b=[u,{
-className:"operator",relevance:0,variants:[{match:De},{match:`\\.(\\.|${Re})+`}]
-}],_="([0-9a-fA-F]_*)+",h={className:"number",relevance:0,variants:[{
-match:"\\b(([0-9]_*)+)(\\.(([0-9]_*)+))?([eE][+-]?(([0-9]_*)+))?\\b"},{
-match:`\\b0x(${_})(\\.(${_}))?([pP][+-]?(([0-9]_*)+))?\\b`},{
-match:/\b0o([0-7]_*)+\b/},{match:/\b0b([01]_*)+\b/}]},f=(e="")=>({
-className:"subst",variants:[{match:m(/\\/,e,/[0\\tnr"']/)},{
-match:m(/\\/,e,/u\{[0-9a-fA-F]{1,8}\}/)}]}),E=(e="")=>({className:"subst",
-match:m(/\\/,e,/[\t ]*(?:[\r\n]|\r\n)/)}),y=(e="")=>({className:"subst",
-label:"interpol",begin:m(/\\/,e,/\(/),end:/\)/}),w=(e="")=>({begin:m(e,/"""/),
-end:m(/"""/,e),contains:[f(e),E(e),y(e)]}),N=(e="")=>({begin:m(e,/"/),
-end:m(/"/,e),contains:[f(e),y(e)]}),v={className:"string",
-variants:[w(),w("#"),w("##"),w("###"),N(),N("#"),N("##"),N("###")]},O={
-match:m(/`/,Be,/`/)},k=[O,{className:"variable",match:/\$\d+/},{
-className:"variable",match:`\\$${Le}+`}],x=[{match:/(@|#(un)?)available/,
-className:"keyword",starts:{contains:[{begin:/\(/,end:/\)/,keywords:Fe,
-contains:[...b,h,v]}]}},{className:"keyword",match:m(/@/,p(...ze))},{
-className:"meta",match:m(/@/,Be)}],M={match:g(/\b[A-Z]/),relevance:0,contains:[{
+match:m(...Ae.filter((e=>"string"!=typeof e)).concat(Se).map(ke),...Me)}]},l={
+$pattern:m(/\b\w+/,/#\w+/),keyword:s.concat(Re),literal:Ce},c=[i,r,o],g=[{
+match:b(/\./,m(...De)),relevance:0},{className:"built_in",
+match:b(/\b/,m(...De),/(?=\()/)}],u={match:/->/,relevance:0},p=[u,{
+className:"operator",relevance:0,variants:[{match:Be},{match:`\\.(\\.|${Le})+`}]
+}],_="([0-9]_*)+",h="([0-9a-fA-F]_*)+",f={className:"number",relevance:0,
+variants:[{match:`\\b(${_})(\\.(${_}))?([eE][+-]?(${_}))?\\b`},{
+match:`\\b0x(${h})(\\.(${h}))?([pP][+-]?(${_}))?\\b`},{match:/\b0o([0-7]_*)+\b/
+},{match:/\b0b([01]_*)+\b/}]},E=(e="")=>({className:"subst",variants:[{
+match:b(/\\/,e,/[0\\tnr"']/)},{match:b(/\\/,e,/u\{[0-9a-fA-F]{1,8}\}/)}]
+}),y=(e="")=>({className:"subst",match:b(/\\/,e,/[\t ]*(?:[\r\n]|\r\n)/)
+}),N=(e="")=>({className:"subst",label:"interpol",begin:b(/\\/,e,/\(/),end:/\)/
+}),w=(e="")=>({begin:b(e,/"""/),end:b(/"""/,e),contains:[E(e),y(e),N(e)]
+}),v=(e="")=>({begin:b(e,/"/),end:b(/"/,e),contains:[E(e),N(e)]}),O={
+className:"string",
+variants:[w(),w("#"),w("##"),w("###"),v(),v("#"),v("##"),v("###")]},k={
+match:b(/`/,Fe,/`/)},x=[k,{className:"variable",match:/\$\d+/},{
+className:"variable",match:`\\$${ze}+`}],M=[{match:/(@|#(un)?)available/,
+className:"keyword",starts:{contains:[{begin:/\(/,end:/\)/,keywords:Pe,
+contains:[...p,f,O]}]}},{className:"keyword",match:b(/@/,m(...je))},{
+className:"meta",match:b(/@/,Fe)}],S={match:d(/\b[A-Z]/),relevance:0,contains:[{
 className:"type",
-match:m(/(AV|CA|CF|CG|CI|CL|CM|CN|CT|MK|MP|MTK|MTL|NS|SCN|SK|UI|WK|XC)/,Le,"+")
-},{className:"type",match:$e,relevance:0},{match:/[?!]+/,relevance:0},{
-match:/\.\.\./,relevance:0},{match:m(/\s+&\s+/,g($e)),relevance:0}]},S={
-begin:/</,end:/>/,keywords:l,contains:[...a,...c,...x,u,M]};M.contains.push(S)
-;const A={begin:/\(/,end:/\)/,relevance:0,keywords:l,contains:["self",{
-match:m(Be,/\s*:/),keywords:"_|0",relevance:0
-},...a,...c,...d,...b,h,v,...k,...x,M]},C={begin:/</,end:/>/,contains:[...a,M]
-},T={begin:/\(/,end:/\)/,keywords:l,contains:[{
-begin:p(g(m(Be,/\s*:/)),g(m(Be,/\s+/,Be,/\s*:/))),end:/:/,relevance:0,
-contains:[{className:"keyword",match:/\b_\b/},{className:"params",match:Be}]
-},...a,...c,...b,h,v,...x,M,A],endsParent:!0,illegal:/["']/},R={
-match:[/func/,/\s+/,p(O.match,Be,De)],className:{1:"keyword",3:"title.function"
-},contains:[C,T,n],illegal:[/\[/,/%/]},D={
+match:b(/(AV|CA|CF|CG|CI|CL|CM|CN|CT|MK|MP|MTK|MTL|NS|SCN|SK|UI|WK|XC)/,ze,"+")
+},{className:"type",match:Ue,relevance:0},{match:/[?!]+/,relevance:0},{
+match:/\.\.\./,relevance:0},{match:b(/\s+&\s+/,d(Ue)),relevance:0}]},A={
+begin:/</,end:/>/,keywords:l,contains:[...a,...c,...M,u,S]};S.contains.push(A)
+;const C={begin:/\(/,end:/\)/,relevance:0,keywords:l,contains:["self",{
+match:b(Fe,/\s*:/),keywords:"_|0",relevance:0
+},...a,...c,...g,...p,f,O,...x,...M,S]},T={begin:/</,end:/>/,contains:[...a,S]
+},R={begin:/\(/,end:/\)/,keywords:l,contains:[{
+begin:m(d(b(Fe,/\s*:/)),d(b(Fe,/\s+/,Fe,/\s*:/))),end:/:/,relevance:0,
+contains:[{className:"keyword",match:/\b_\b/},{className:"params",match:Fe}]
+},...a,...c,...p,f,O,...M,S,C],endsParent:!0,illegal:/["']/},D={
+match:[/func/,/\s+/,m(k.match,Fe,Be)],className:{1:"keyword",3:"title.function"
+},contains:[T,R,n],illegal:[/\[/,/%/]},I={
 match:[/\b(?:subscript|init[?!]?)/,/\s*(?=[<(])/],className:{1:"keyword"},
-contains:[C,T,n],illegal:/\[|%/},I={match:[/operator/,/\s+/,De],className:{
-1:"keyword",3:"title"}},L={begin:[/precedencegroup/,/\s+/,$e],className:{
-1:"keyword",3:"title"},contains:[M],keywords:[...Se,...Me],end:/}/}
-;for(const e of v.variants){const n=e.contains.find((e=>"interpol"===e.label))
-;n.keywords=l;const t=[...c,...d,...b,h,v,...k];n.contains=[...t,{begin:/\(/,
+contains:[T,R,n],illegal:/\[|%/},L={match:[/operator/,/\s+/,Be],className:{
+1:"keyword",3:"title"}},B={begin:[/precedencegroup/,/\s+/,Ue],className:{
+1:"keyword",3:"title"},contains:[S],keywords:[...Te,...Ce],end:/}/}
+;for(const e of O.variants){const n=e.contains.find((e=>"interpol"===e.label))
+;n.keywords=l;const t=[...c,...g,...p,f,O,...x];n.contains=[...t,{begin:/\(/,
 end:/\)/,contains:["self",...t]}]}return{name:"Swift",keywords:l,
-contains:[...a,R,D,{beginKeywords:"struct protocol class extension enum actor",
+contains:[...a,D,I,{beginKeywords:"struct protocol class extension enum actor",
 end:"\\{",excludeEnd:!0,keywords:l,contains:[e.inherit(e.TITLE_MODE,{
 className:"title.class",begin:/[A-Za-z$_][\u00C0-\u02B80-9A-Za-z$_]*/}),...c]
-},I,L,{beginKeywords:"import",end:/$/,contains:[...a],relevance:0
-},...c,...d,...b,h,v,...k,...x,M,A]}},grmr_typescript:e=>{
-const n=we(e),t=["any","void","number","boolean","string","object","never","symbol","bigint","unknown"],a={
+},L,B,{beginKeywords:"import",end:/$/,contains:[...a],relevance:0
+},...c,...g,...p,f,O,...x,...M,S,C]}},grmr_typescript:e=>{
+const n=Oe(e),t=_e,a=["any","void","number","boolean","string","object","never","symbol","bigint","unknown"],i={
 beginKeywords:"namespace",end:/\{/,excludeEnd:!0,
-contains:[n.exports.CLASS_REFERENCE]},i={beginKeywords:"interface",end:/\{/,
-excludeEnd:!0,keywords:{keyword:"interface extends",built_in:t},
-contains:[n.exports.CLASS_REFERENCE]},r={$pattern:be,
-keyword:me.concat(["type","namespace","interface","public","private","protected","implements","declare","abstract","readonly","enum","override"]),
-literal:pe,built_in:ye.concat(t),"variable.language":Ee},s={className:"meta",
-begin:"@[A-Za-z$_][0-9A-Za-z$_]*"},o=(e,n,t)=>{
-const a=e.contains.findIndex((e=>e.label===n))
+contains:[n.exports.CLASS_REFERENCE]},r={beginKeywords:"interface",end:/\{/,
+excludeEnd:!0,keywords:{keyword:"interface extends",built_in:a},
+contains:[n.exports.CLASS_REFERENCE]},s={$pattern:_e,
+keyword:he.concat(["type","namespace","interface","public","private","protected","implements","declare","abstract","readonly","enum","override"]),
+literal:fe,built_in:ve.concat(a),"variable.language":we},o={className:"meta",
+begin:"@"+t},l=(e,n,t)=>{const a=e.contains.findIndex((e=>e.label===n))
 ;if(-1===a)throw Error("can not find mode to replace");e.contains.splice(a,1,t)}
-;return Object.assign(n.keywords,r),
-n.exports.PARAMS_CONTAINS.push(s),n.contains=n.contains.concat([s,a,i]),
-o(n,"shebang",e.SHEBANG()),o(n,"use_strict",{className:"meta",relevance:10,
+;return Object.assign(n.keywords,s),
+n.exports.PARAMS_CONTAINS.push(o),n.contains=n.contains.concat([o,i,r]),
+l(n,"shebang",e.SHEBANG()),l(n,"use_strict",{className:"meta",relevance:10,
 begin:/^\s*['"]use strict['"]/
 }),n.contains.find((e=>"func.def"===e.label)).relevance=0,Object.assign(n,{
-name:"TypeScript",aliases:["ts","tsx"]}),n},grmr_vbnet:e=>{
+name:"TypeScript",aliases:["ts","tsx","mts","cts"]}),n},grmr_vbnet:e=>{
 const n=e.regex,t=/\d{1,2}\/\d{1,2}\/\d{4}/,a=/\d{4}-\d{1,2}-\d{1,2}/,i=/(\d|1[012])(:\d+){0,2} *(AM|PM)/,r=/\d{1,2}(:\d{1,2}){1,2}/,s={
 className:"literal",variants:[{begin:n.concat(/# */,n.either(a,t),/ *#/)},{
 begin:n.concat(/# */,r,/ *#/)},{begin:n.concat(/# */,i,/ *#/)},{
@@ -1192,7 +1201,7 @@ className:"number",
 begin:"\\b[0-9]{4}(-[0-9][0-9]){0,2}([Tt \\t][0-9][0-9]?(:[0-9][0-9]){2})?(\\.[0-9]*)?([ \\t])*(Z|[-+][0-9][0-9]?(:[0-9][0-9])?)?\\b"
 },{className:"number",begin:e.C_NUMBER_RE+"\\b",relevance:0},s,o,a],c=[...l]
 ;return c.pop(),c.push(i),r.contains=c,{name:"YAML",case_insensitive:!0,
-aliases:["yml"],contains:l}}});const je=ne;for(const e of Object.keys(Ue)){
-const n=e.replace("grmr_","").replace("_","-");je.registerLanguage(n,Ue[e])}
-return je}()
+aliases:["yml"],contains:l}}});const qe=ae;for(const e of Object.keys(Ke)){
+const n=e.replace("grmr_","").replace("_","-");qe.registerLanguage(n,Ke[e])}
+return qe}()
 ;"object"==typeof exports&&"undefined"!=typeof module&&(module.exports=hljs);
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/1c.min.js b/vendor/assets/javascripts/highlightjs/languages/1c.min.js
index d4eef4d7dd7..ab4b2c45216 100644
--- a/vendor/assets/javascripts/highlightjs/languages/1c.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/1c.min.js
@@ -1,4 +1,4 @@
-/*! `1c` grammar compiled for Highlight.js 11.6.0 */
+/*! `1c` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var s=(()=>{"use strict";return s=>{
 const x="[A-Za-z\u0410-\u042f\u0430-\u044f\u0451\u0401_][A-Za-z\u0410-\u042f\u0430-\u044f\u0451\u0401_0-9]+",n="\u0434\u0430\u043b\u0435\u0435 \u0432\u043e\u0437\u0432\u0440\u0430\u0442 \u0432\u044b\u0437\u0432\u0430\u0442\u044c\u0438\u0441\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u044c \u0434\u043b\u044f \u0435\u0441\u043b\u0438 \u0438 \u0438\u0437 \u0438\u043b\u0438 \u0438\u043d\u0430\u0447\u0435 \u0438\u043d\u0430\u0447\u0435\u0435\u0441\u043b\u0438 \u0438\u0441\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u043a\u0430\u0436\u0434\u043e\u0433\u043e \u043a\u043e\u043d\u0435\u0446\u0435\u0441\u043b\u0438 \u043a\u043e\u043d\u0435\u0446\u043f\u043e\u043f\u044b\u0442\u043a\u0438 \u043a\u043e\u043d\u0435\u0446\u0446\u0438\u043a\u043b\u0430 \u043d\u0435 \u043d\u043e\u0432\u044b\u0439 \u043f\u0435\u0440\u0435\u0439\u0442\u0438 \u043f\u0435\u0440\u0435\u043c \u043f\u043e \u043f\u043e\u043a\u0430 \u043f\u043e\u043f\u044b\u0442\u043a\u0430 \u043f\u0440\u0435\u0440\u0432\u0430\u0442\u044c \u043f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u044c \u0442\u043e\u0433\u0434\u0430 \u0446\u0438\u043a\u043b \u044d\u043a\u0441\u043f\u043e\u0440\u0442 ",e="null \u0438\u0441\u0442\u0438\u043d\u0430 \u043b\u043e\u0436\u044c \u043d\u0435\u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u043e",o=s.inherit(s.NUMBER_MODE),t={
 className:"string",begin:'"|\\|',end:'"|$',contains:[{begin:'""'}]},a={
diff --git a/vendor/assets/javascripts/highlightjs/languages/abnf.min.js b/vendor/assets/javascripts/highlightjs/languages/abnf.min.js
index 69760482979..136da8d7913 100644
--- a/vendor/assets/javascripts/highlightjs/languages/abnf.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/abnf.min.js
@@ -1,4 +1,4 @@
-/*! `abnf` grammar compiled for Highlight.js 11.6.0 */
+/*! `abnf` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const a=e.regex,s=e.COMMENT(/;/,/$/)
 ;return{name:"Augmented Backus-Naur Form",illegal:/[!@#$^&',?+~`|:]/,
 keywords:["ALPHA","BIT","CHAR","CR","CRLF","CTL","DIGIT","DQUOTE","HEXDIG","HTAB","LF","LWSP","OCTET","SP","VCHAR","WSP"],
diff --git a/vendor/assets/javascripts/highlightjs/languages/accesslog.min.js b/vendor/assets/javascripts/highlightjs/languages/accesslog.min.js
index b9a39628e75..621ca115e9f 100644
--- a/vendor/assets/javascripts/highlightjs/languages/accesslog.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/accesslog.min.js
@@ -1,4 +1,4 @@
-/*! `accesslog` grammar compiled for Highlight.js 11.6.0 */
+/*! `accesslog` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const n=e.regex,a=["GET","POST","HEAD","PUT","DELETE","CONNECT","OPTIONS","PATCH","TRACE"]
 ;return{name:"Apache Access Log",contains:[{className:"number",
diff --git a/vendor/assets/javascripts/highlightjs/languages/actionscript.min.js b/vendor/assets/javascripts/highlightjs/languages/actionscript.min.js
index 228e60ef397..c8ecc32cbd4 100644
--- a/vendor/assets/javascripts/highlightjs/languages/actionscript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/actionscript.min.js
@@ -1,4 +1,4 @@
-/*! `actionscript` grammar compiled for Highlight.js 11.6.0 */
+/*! `actionscript` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const a=e.regex,t=/[a-zA-Z_$][a-zA-Z0-9_$]*/,n=a.concat(t,a.concat("(\\.",t,")*")),s={
 className:"rest_arg",begin:/[.]{3}/,end:t,relevance:10};return{
diff --git a/vendor/assets/javascripts/highlightjs/languages/ada.min.js b/vendor/assets/javascripts/highlightjs/languages/ada.min.js
index cb136d2d932..9c1adb923ca 100644
--- a/vendor/assets/javascripts/highlightjs/languages/ada.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/ada.min.js
@@ -1,26 +1,25 @@
-/*! `ada` grammar compiled for Highlight.js 11.6.0 */
+/*! `ada` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
-const n="[A-Za-z](_?[A-Za-z0-9.])*",s="[]\\{\\}%#'\"",a=e.COMMENT("--","$"),r={
-begin:"\\s+:\\s+",end:"\\s*(:=|;|\\)|=>|$)",illegal:s,contains:[{
+const n="\\d(_|\\d)*",s="[eE][-+]?"+n,a="\\b("+n+"#\\w+(\\.\\w+)?#("+s+")?|"+n+"(\\."+n+")?("+s+")?)",r="[A-Za-z](_?[A-Za-z0-9.])*",i="[]\\{\\}%#'\"",t=e.COMMENT("--","$"),c={
+begin:"\\s+:\\s+",end:"\\s*(:=|;|\\)|=>|$)",illegal:i,contains:[{
 beginKeywords:"loop for declare others",endsParent:!0},{className:"keyword",
 beginKeywords:"not null constant access function procedure in out aliased exception"
-},{className:"type",begin:n,endsParent:!0,relevance:0}]};return{name:"Ada",
+},{className:"type",begin:r,endsParent:!0,relevance:0}]};return{name:"Ada",
 case_insensitive:!0,keywords:{
 keyword:["abort","else","new","return","abs","elsif","not","reverse","abstract","end","accept","entry","select","access","exception","of","separate","aliased","exit","or","some","all","others","subtype","and","for","out","synchronized","array","function","overriding","at","tagged","generic","package","task","begin","goto","pragma","terminate","body","private","then","if","procedure","type","case","in","protected","constant","interface","is","raise","use","declare","range","delay","limited","record","when","delta","loop","rem","while","digits","renames","with","do","mod","requeue","xor"],
-literal:["True","False"]},contains:[a,{className:"string",begin:/"/,end:/"/,
+literal:["True","False"]},contains:[t,{className:"string",begin:/"/,end:/"/,
 contains:[{begin:/""/,relevance:0}]},{className:"string",begin:/'.'/},{
-className:"number",
-begin:"\\b(\\d(_|\\d)*#\\w+(\\.\\w+)?#([eE][-+]?\\d(_|\\d)*)?|\\d(_|\\d)*(\\.\\d(_|\\d)*)?([eE][-+]?\\d(_|\\d)*)?)",
-relevance:0},{className:"symbol",begin:"'"+n},{className:"title",
+className:"number",begin:a,relevance:0},{className:"symbol",begin:"'"+r},{
+className:"title",
 begin:"(\\bwith\\s+)?(\\bprivate\\s+)?\\bpackage\\s+(\\bbody\\s+)?",
-end:"(is|$)",keywords:"package body",excludeBegin:!0,excludeEnd:!0,illegal:s},{
+end:"(is|$)",keywords:"package body",excludeBegin:!0,excludeEnd:!0,illegal:i},{
 begin:"(\\b(with|overriding)\\s+)?\\b(function|procedure)\\s+",
 end:"(\\bis|\\bwith|\\brenames|\\)\\s*;)",
 keywords:"overriding function procedure with is renames return",returnBegin:!0,
-contains:[a,{className:"title",
+contains:[t,{className:"title",
 begin:"(\\bwith\\s+)?\\b(function|procedure)\\s+",end:"(\\(|\\s+|$)",
-excludeBegin:!0,excludeEnd:!0,illegal:s},r,{className:"type",
+excludeBegin:!0,excludeEnd:!0,illegal:i},c,{className:"type",
 begin:"\\breturn\\s+",end:"(\\s+|;|$)",keywords:"return",excludeBegin:!0,
-excludeEnd:!0,endsParent:!0,illegal:s}]},{className:"type",
-begin:"\\b(sub)?type\\s+",end:"\\s+",keywords:"type",excludeBegin:!0,illegal:s
-},r]}}})();hljs.registerLanguage("ada",e)})();
\ No newline at end of file
+excludeEnd:!0,endsParent:!0,illegal:i}]},{className:"type",
+begin:"\\b(sub)?type\\s+",end:"\\s+",keywords:"type",excludeBegin:!0,illegal:i
+},c]}}})();hljs.registerLanguage("ada",e)})();
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/angelscript.min.js b/vendor/assets/javascripts/highlightjs/languages/angelscript.min.js
index 73834017831..9522274892f 100644
--- a/vendor/assets/javascripts/highlightjs/languages/angelscript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/angelscript.min.js
@@ -1,4 +1,4 @@
-/*! `angelscript` grammar compiled for Highlight.js 11.6.0 */
+/*! `angelscript` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const n={className:"built_in",
 begin:"\\b(void|bool|int8|int16|int32|int64|int|uint8|uint16|uint32|uint64|uint|string|ref|array|double|float|auto|dictionary)"
 },a={className:"symbol",begin:"[a-zA-Z0-9_]+@"},i={className:"keyword",
diff --git a/vendor/assets/javascripts/highlightjs/languages/apache.min.js b/vendor/assets/javascripts/highlightjs/languages/apache.min.js
index 451738b495d..78d1aa65889 100644
--- a/vendor/assets/javascripts/highlightjs/languages/apache.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/apache.min.js
@@ -1,4 +1,4 @@
-/*! `apache` grammar compiled for Highlight.js 11.6.0 */
+/*! `apache` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const n={className:"number",
 begin:/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(:\d{1,5})?/};return{
 name:"Apache config",aliases:["apacheconf"],case_insensitive:!0,
diff --git a/vendor/assets/javascripts/highlightjs/languages/applescript.min.js b/vendor/assets/javascripts/highlightjs/languages/applescript.min.js
index 2792c6889f4..991fbfc6a3e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/applescript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/applescript.min.js
@@ -1,4 +1,4 @@
-/*! `applescript` grammar compiled for Highlight.js 11.6.0 */
+/*! `applescript` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const t=e.regex,r=e.inherit(e.QUOTE_STRING_MODE,{illegal:null}),i={
 className:"params",begin:/\(/,end:/\)/,contains:["self",e.C_NUMBER_MODE,r]
diff --git a/vendor/assets/javascripts/highlightjs/languages/arcade.min.js b/vendor/assets/javascripts/highlightjs/languages/arcade.min.js
index d93a03de3ae..0c450734091 100644
--- a/vendor/assets/javascripts/highlightjs/languages/arcade.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/arcade.min.js
@@ -1,4 +1,4 @@
-/*! `arcade` grammar compiled for Highlight.js 11.6.0 */
+/*! `arcade` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const n="[A-Za-z_][0-9A-Za-z_]*",a={
 keyword:["if","for","while","var","new","function","do","return","void","else","break"],
 literal:["BackSlash","DoubleQuote","false","ForwardSlash","Infinity","NaN","NewLine","null","PI","SingleQuote","Tab","TextFormatting","true","undefined"],
diff --git a/vendor/assets/javascripts/highlightjs/languages/arduino.min.js b/vendor/assets/javascripts/highlightjs/languages/arduino.min.js
index 9882f1fe619..ff9c7dccf14 100644
--- a/vendor/assets/javascripts/highlightjs/languages/arduino.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/arduino.min.js
@@ -1,51 +1,51 @@
-/*! `arduino` grammar compiled for Highlight.js 11.6.0 */
+/*! `arduino` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const t={
 type:["boolean","byte","word","String"],
 built_in:["KeyboardController","MouseController","SoftwareSerial","EthernetServer","EthernetClient","LiquidCrystal","RobotControl","GSMVoiceCall","EthernetUDP","EsploraTFT","HttpClient","RobotMotor","WiFiClient","GSMScanner","FileSystem","Scheduler","GSMServer","YunClient","YunServer","IPAddress","GSMClient","GSMModem","Keyboard","Ethernet","Console","GSMBand","Esplora","Stepper","Process","WiFiUDP","GSM_SMS","Mailbox","USBHost","Firmata","PImage","Client","Server","GSMPIN","FileIO","Bridge","Serial","EEPROM","Stream","Mouse","Audio","Servo","File","Task","GPRS","WiFi","Wire","TFT","GSM","SPI","SD"],
 _hints:["setup","loop","runShellCommandAsynchronously","analogWriteResolution","retrieveCallingNumber","printFirmwareVersion","analogReadResolution","sendDigitalPortPair","noListenOnLocalhost","readJoystickButton","setFirmwareVersion","readJoystickSwitch","scrollDisplayRight","getVoiceCallStatus","scrollDisplayLeft","writeMicroseconds","delayMicroseconds","beginTransmission","getSignalStrength","runAsynchronously","getAsynchronously","listenOnLocalhost","getCurrentCarrier","readAccelerometer","messageAvailable","sendDigitalPorts","lineFollowConfig","countryNameWrite","runShellCommand","readStringUntil","rewindDirectory","readTemperature","setClockDivider","readLightSensor","endTransmission","analogReference","detachInterrupt","countryNameRead","attachInterrupt","encryptionType","readBytesUntil","robotNameWrite","readMicrophone","robotNameRead","cityNameWrite","userNameWrite","readJoystickY","readJoystickX","mouseReleased","openNextFile","scanNetworks","noInterrupts","digitalWrite","beginSpeaker","mousePressed","isActionDone","mouseDragged","displayLogos","noAutoscroll","addParameter","remoteNumber","getModifiers","keyboardRead","userNameRead","waitContinue","processInput","parseCommand","printVersion","readNetworks","writeMessage","blinkVersion","cityNameRead","readMessage","setDataMode","parsePacket","isListening","setBitOrder","beginPacket","isDirectory","motorsWrite","drawCompass","digitalRead","clearScreen","serialEvent","rightToLeft","setTextSize","leftToRight","requestFrom","keyReleased","compassRead","analogWrite","interrupts","WiFiServer","disconnect","playMelody","parseFloat","autoscroll","getPINUsed","setPINUsed","setTimeout","sendAnalog","readSlider","analogRead","beginWrite","createChar","motorsStop","keyPressed","tempoWrite","readButton","subnetMask","debugPrint","macAddress","writeGreen","randomSeed","attachGPRS","readString","sendString","remotePort","releaseAll","mouseMoved","background","getXChange","getYChange","answerCall","getResult","voiceCall","endPacket","constrain","getSocket","writeJSON","getButton","available","connected","findUntil","readBytes","exitValue","readGreen","writeBlue","startLoop","IPAddress","isPressed","sendSysex","pauseMode","gatewayIP","setCursor","getOemKey","tuneWrite","noDisplay","loadImage","switchPIN","onRequest","onReceive","changePIN","playFile","noBuffer","parseInt","overflow","checkPIN","knobRead","beginTFT","bitClear","updateIR","bitWrite","position","writeRGB","highByte","writeRed","setSpeed","readBlue","noStroke","remoteIP","transfer","shutdown","hangCall","beginSMS","endWrite","attached","maintain","noCursor","checkReg","checkPUK","shiftOut","isValid","shiftIn","pulseIn","connect","println","localIP","pinMode","getIMEI","display","noBlink","process","getBand","running","beginSD","drawBMP","lowByte","setBand","release","bitRead","prepare","pointTo","readRed","setMode","noFill","remove","listen","stroke","detach","attach","noTone","exists","buffer","height","bitSet","circle","config","cursor","random","IRread","setDNS","endSMS","getKey","micros","millis","begin","print","write","ready","flush","width","isPIN","blink","clear","press","mkdir","rmdir","close","point","yield","image","BSSID","click","delay","read","text","move","peek","beep","rect","line","open","seek","fill","size","turn","stop","home","find","step","tone","sqrt","RSSI","SSID","end","bit","tan","cos","sin","pow","map","abs","max","min","get","run","put"],
 literal:["DIGITAL_MESSAGE","FIRMATA_STRING","ANALOG_MESSAGE","REPORT_DIGITAL","REPORT_ANALOG","INPUT_PULLUP","SET_PIN_MODE","INTERNAL2V56","SYSTEM_RESET","LED_BUILTIN","INTERNAL1V1","SYSEX_START","INTERNAL","EXTERNAL","DEFAULT","OUTPUT","INPUT","HIGH","LOW"]
 },r=(e=>{const t=e.regex,r=e.COMMENT("//","$",{contains:[{begin:/\\\n/}]
-}),n="[a-zA-Z_]\\w*::",a="(?!struct)(decltype\\(auto\\)|"+t.optional(n)+"[a-zA-Z_]\\w*"+t.optional("<[^<>]+>")+")",i={
-className:"type",begin:"\\b[a-z\\d_]*_t\\b"},s={className:"string",variants:[{
+}),n="decltype\\(auto\\)",a="[a-zA-Z_]\\w*::",i="(?!struct)("+n+"|"+t.optional(a)+"[a-zA-Z_]\\w*"+t.optional("<[^<>]+>")+")",s={
+className:"type",begin:"\\b[a-z\\d_]*_t\\b"},o={className:"string",variants:[{
 begin:'(u8?|U|L)?"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE]},{
 begin:"(u8?|U|L)?'(\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4,8}|[0-7]{3}|\\S)|.)",
 end:"'",illegal:"."},e.END_SAME_AS_BEGIN({
-begin:/(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,end:/\)([^()\\ ]{0,16})"/})]},o={
+begin:/(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,end:/\)([^()\\ ]{0,16})"/})]},l={
 className:"number",variants:[{begin:"\\b(0b[01']+)"},{
 begin:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)((ll|LL|l|L)(u|U)?|(u|U)(ll|LL|l|L)?|f|F|b|B)"
 },{
 begin:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"
-}],relevance:0},l={className:"meta",begin:/#\s*[a-z]+\b/,end:/$/,keywords:{
+}],relevance:0},c={className:"meta",begin:/#\s*[a-z]+\b/,end:/$/,keywords:{
 keyword:"if else elif endif define undef warning error line pragma _Pragma ifdef ifndef include"
-},contains:[{begin:/\\\n/,relevance:0},e.inherit(s,{className:"string"}),{
-className:"string",begin:/<.*?>/},r,e.C_BLOCK_COMMENT_MODE]},c={
-className:"title",begin:t.optional(n)+e.IDENT_RE,relevance:0
-},d=t.optional(n)+e.IDENT_RE+"\\s*\\(",u={
+},contains:[{begin:/\\\n/,relevance:0},e.inherit(o,{className:"string"}),{
+className:"string",begin:/<.*?>/},r,e.C_BLOCK_COMMENT_MODE]},d={
+className:"title",begin:t.optional(a)+e.IDENT_RE,relevance:0
+},u=t.optional(a)+e.IDENT_RE+"\\s*\\(",p={
 type:["bool","char","char16_t","char32_t","char8_t","double","float","int","long","short","void","wchar_t","unsigned","signed","const","static"],
 keyword:["alignas","alignof","and","and_eq","asm","atomic_cancel","atomic_commit","atomic_noexcept","auto","bitand","bitor","break","case","catch","class","co_await","co_return","co_yield","compl","concept","const_cast|10","consteval","constexpr","constinit","continue","decltype","default","delete","do","dynamic_cast|10","else","enum","explicit","export","extern","false","final","for","friend","goto","if","import","inline","module","mutable","namespace","new","noexcept","not","not_eq","nullptr","operator","or","or_eq","override","private","protected","public","reflexpr","register","reinterpret_cast|10","requires","return","sizeof","static_assert","static_cast|10","struct","switch","synchronized","template","this","thread_local","throw","transaction_safe","transaction_safe_dynamic","true","try","typedef","typeid","typename","union","using","virtual","volatile","while","xor","xor_eq"],
 literal:["NULL","false","nullopt","nullptr","true"],built_in:["_Pragma"],
 _type_hints:["any","auto_ptr","barrier","binary_semaphore","bitset","complex","condition_variable","condition_variable_any","counting_semaphore","deque","false_type","future","imaginary","initializer_list","istringstream","jthread","latch","lock_guard","multimap","multiset","mutex","optional","ostringstream","packaged_task","pair","promise","priority_queue","queue","recursive_mutex","recursive_timed_mutex","scoped_lock","set","shared_future","shared_lock","shared_mutex","shared_timed_mutex","shared_ptr","stack","string_view","stringstream","timed_mutex","thread","true_type","tuple","unique_lock","unique_ptr","unordered_map","unordered_multimap","unordered_multiset","unordered_set","variant","vector","weak_ptr","wstring","wstring_view"]
-},p={className:"function.dispatch",relevance:0,keywords:{
+},m={className:"function.dispatch",relevance:0,keywords:{
 _hint:["abort","abs","acos","apply","as_const","asin","atan","atan2","calloc","ceil","cerr","cin","clog","cos","cosh","cout","declval","endl","exchange","exit","exp","fabs","floor","fmod","forward","fprintf","fputs","free","frexp","fscanf","future","invoke","isalnum","isalpha","iscntrl","isdigit","isgraph","islower","isprint","ispunct","isspace","isupper","isxdigit","labs","launder","ldexp","log","log10","make_pair","make_shared","make_shared_for_overwrite","make_tuple","make_unique","malloc","memchr","memcmp","memcpy","memset","modf","move","pow","printf","putchar","puts","realloc","scanf","sin","sinh","snprintf","sprintf","sqrt","sscanf","std","stderr","stdin","stdout","strcat","strchr","strcmp","strcpy","strcspn","strlen","strncat","strncmp","strncpy","strpbrk","strrchr","strspn","strstr","swap","tan","tanh","terminate","to_underlying","tolower","toupper","vfprintf","visit","vprintf","vsprintf"]
 },
 begin:t.concat(/\b/,/(?!decltype)/,/(?!if)/,/(?!for)/,/(?!switch)/,/(?!while)/,e.IDENT_RE,t.lookahead(/(<[^<>]+>|)\s*\(/))
-},m=[p,l,i,r,e.C_BLOCK_COMMENT_MODE,o,s],g={variants:[{begin:/=/,end:/;/},{
+},g=[m,c,s,r,e.C_BLOCK_COMMENT_MODE,l,o],_={variants:[{begin:/=/,end:/;/},{
 begin:/\(/,end:/\)/},{beginKeywords:"new throw return else",end:/;/}],
-keywords:u,contains:m.concat([{begin:/\(/,end:/\)/,keywords:u,
-contains:m.concat(["self"]),relevance:0}]),relevance:0},_={className:"function",
-begin:"("+a+"[\\*&\\s]+)+"+d,returnBegin:!0,end:/[{;=]/,excludeEnd:!0,
-keywords:u,illegal:/[^\w\s\*&:<>.]/,contains:[{begin:"decltype\\(auto\\)",
-keywords:u,relevance:0},{begin:d,returnBegin:!0,contains:[c],relevance:0},{
-begin:/::/,relevance:0},{begin:/:/,endsWithParent:!0,contains:[s,o]},{
-relevance:0,match:/,/},{className:"params",begin:/\(/,end:/\)/,keywords:u,
-relevance:0,contains:[r,e.C_BLOCK_COMMENT_MODE,s,o,i,{begin:/\(/,end:/\)/,
-keywords:u,relevance:0,contains:["self",r,e.C_BLOCK_COMMENT_MODE,s,o,i]}]
-},i,r,e.C_BLOCK_COMMENT_MODE,l]};return{name:"C++",
-aliases:["cc","c++","h++","hpp","hh","hxx","cxx"],keywords:u,illegal:"</",
+keywords:p,contains:g.concat([{begin:/\(/,end:/\)/,keywords:p,
+contains:g.concat(["self"]),relevance:0}]),relevance:0},h={className:"function",
+begin:"("+i+"[\\*&\\s]+)+"+u,returnBegin:!0,end:/[{;=]/,excludeEnd:!0,
+keywords:p,illegal:/[^\w\s\*&:<>.]/,contains:[{begin:n,keywords:p,relevance:0},{
+begin:u,returnBegin:!0,contains:[d],relevance:0},{begin:/::/,relevance:0},{
+begin:/:/,endsWithParent:!0,contains:[o,l]},{relevance:0,match:/,/},{
+className:"params",begin:/\(/,end:/\)/,keywords:p,relevance:0,
+contains:[r,e.C_BLOCK_COMMENT_MODE,o,l,s,{begin:/\(/,end:/\)/,keywords:p,
+relevance:0,contains:["self",r,e.C_BLOCK_COMMENT_MODE,o,l,s]}]
+},s,r,e.C_BLOCK_COMMENT_MODE,c]};return{name:"C++",
+aliases:["cc","c++","h++","hpp","hh","hxx","cxx"],keywords:p,illegal:"</",
 classNameAliases:{"function.dispatch":"built_in"},
-contains:[].concat(g,_,p,m,[l,{
+contains:[].concat(_,h,m,g,[c,{
 begin:"\\b(deque|list|queue|priority_queue|pair|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array|tuple|optional|variant|function)\\s*<(?!<)",
-end:">",keywords:u,contains:["self",i]},{begin:e.IDENT_RE+"::",keywords:u},{
+end:">",keywords:p,contains:["self",s]},{begin:e.IDENT_RE+"::",keywords:p},{
 match:[/\b(?:enum(?:\s+(?:class|struct))?|class|struct|union)/,/\s+/,/\w+/],
 className:{1:"keyword",3:"title.class"}}])}})(e),n=r.keywords
 ;return n.type=[...n.type,...t.type],
diff --git a/vendor/assets/javascripts/highlightjs/languages/armasm.min.js b/vendor/assets/javascripts/highlightjs/languages/armasm.min.js
index e8236010157..31f6661acc0 100644
--- a/vendor/assets/javascripts/highlightjs/languages/armasm.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/armasm.min.js
@@ -1,4 +1,4 @@
-/*! `armasm` grammar compiled for Highlight.js 11.6.0 */
+/*! `armasm` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var s=(()=>{"use strict";return s=>{const e={
 variants:[s.COMMENT("^[ \\t]*(?=#)","$",{relevance:0,excludeBegin:!0
 }),s.COMMENT("[;@]","$",{relevance:0
diff --git a/vendor/assets/javascripts/highlightjs/languages/asciidoc.min.js b/vendor/assets/javascripts/highlightjs/languages/asciidoc.min.js
index c1f94619d48..e0c8a40373c 100644
--- a/vendor/assets/javascripts/highlightjs/languages/asciidoc.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/asciidoc.min.js
@@ -1,4 +1,4 @@
-/*! `asciidoc` grammar compiled for Highlight.js 11.6.0 */
+/*! `asciidoc` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const n=e.regex,a=[{
 className:"strong",begin:/\*{2}([^\n]+?)\*{2}/},{className:"strong",
 begin:n.concat(/\*\*/,/((\*(?!\*)|\\[^\n]|[^*\n\\])+\n)+/,/(\*(?!\*)|\\[^\n]|[^*\n\\])*/,/\*\*/),
diff --git a/vendor/assets/javascripts/highlightjs/languages/aspectj.min.js b/vendor/assets/javascripts/highlightjs/languages/aspectj.min.js
index 6cb1b0e061d..e9f9400f6df 100644
--- a/vendor/assets/javascripts/highlightjs/languages/aspectj.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/aspectj.min.js
@@ -1,4 +1,4 @@
-/*! `aspectj` grammar compiled for Highlight.js 11.6.0 */
+/*! `aspectj` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const n=e.regex,t=["false","synchronized","int","abstract","float","private","char","boolean","static","null","if","const","for","true","while","long","throw","strictfp","finally","protected","import","native","final","return","void","enum","else","extends","implements","break","transient","new","catch","instanceof","byte","super","volatile","case","assert","short","package","default","double","public","try","this","switch","continue","throws","privileged","aspectOf","adviceexecution","proceed","cflowbelow","cflow","initialization","preinitialization","staticinitialization","withincode","target","within","execution","getWithinTypeName","handler","thisJoinPoint","thisJoinPointStaticPart","thisEnclosingJoinPointStaticPart","declare","parents","warning","error","soft","precedence","thisAspectInstance"],i=["get","set","args","call"]
 ;return{name:"AspectJ",keywords:t,illegal:/<\/|#/,
diff --git a/vendor/assets/javascripts/highlightjs/languages/autohotkey.min.js b/vendor/assets/javascripts/highlightjs/languages/autohotkey.min.js
index b4d71e451c2..86c682decdb 100644
--- a/vendor/assets/javascripts/highlightjs/languages/autohotkey.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/autohotkey.min.js
@@ -1,4 +1,4 @@
-/*! `autohotkey` grammar compiled for Highlight.js 11.6.0 */
+/*! `autohotkey` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const a={begin:"`[\\s\\S]"};return{
 name:"AutoHotkey",case_insensitive:!0,aliases:["ahk"],keywords:{
 keyword:"Break Continue Critical Exit ExitApp Gosub Goto New OnExit Pause return SetBatchLines SetTimer Suspend Thread Throw Until ahk_id ahk_class ahk_pid ahk_exe ahk_group",
diff --git a/vendor/assets/javascripts/highlightjs/languages/autoit.min.js b/vendor/assets/javascripts/highlightjs/languages/autoit.min.js
index 9bb9c0522ae..cb337ef18e3 100644
--- a/vendor/assets/javascripts/highlightjs/languages/autoit.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/autoit.min.js
@@ -1,4 +1,4 @@
-/*! `autoit` grammar compiled for Highlight.js 11.6.0 */
+/*! `autoit` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const t={variants:[e.COMMENT(";","$",{
 relevance:0
 }),e.COMMENT("#cs","#ce"),e.COMMENT("#comments-start","#comments-end")]},r={
diff --git a/vendor/assets/javascripts/highlightjs/languages/avrasm.min.js b/vendor/assets/javascripts/highlightjs/languages/avrasm.min.js
index 5050468f5f4..48d04ad6775 100644
--- a/vendor/assets/javascripts/highlightjs/languages/avrasm.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/avrasm.min.js
@@ -1,4 +1,4 @@
-/*! `avrasm` grammar compiled for Highlight.js 11.6.0 */
+/*! `avrasm` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var r=(()=>{"use strict";return r=>({name:"AVR Assembly",
 case_insensitive:!0,keywords:{$pattern:"\\.?"+r.IDENT_RE,
 keyword:"adc add adiw and andi asr bclr bld brbc brbs brcc brcs break breq brge brhc brhs brid brie brlo brlt brmi brne brpl brsh brtc brts brvc brvs bset bst call cbi cbr clc clh cli cln clr cls clt clv clz com cp cpc cpi cpse dec eicall eijmp elpm eor fmul fmuls fmulsu icall ijmp in inc jmp ld ldd ldi lds lpm lsl lsr mov movw mul muls mulsu neg nop or ori out pop push rcall ret reti rjmp rol ror sbc sbr sbrc sbrs sec seh sbi sbci sbic sbis sbiw sei sen ser ses set sev sez sleep spm st std sts sub subi swap tst wdr",
diff --git a/vendor/assets/javascripts/highlightjs/languages/awk.min.js b/vendor/assets/javascripts/highlightjs/languages/awk.min.js
index ef725d59e33..c1f7978f980 100644
--- a/vendor/assets/javascripts/highlightjs/languages/awk.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/awk.min.js
@@ -1,4 +1,4 @@
-/*! `awk` grammar compiled for Highlight.js 11.6.0 */
+/*! `awk` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"Awk",keywords:{
 keyword:"BEGIN END if else while do for in break continue delete next nextfile function func exit|10"
 },contains:[{className:"variable",variants:[{begin:/\$[\w\d#@][\w\d_]*/},{
diff --git a/vendor/assets/javascripts/highlightjs/languages/axapta.min.js b/vendor/assets/javascripts/highlightjs/languages/axapta.min.js
index 66a5d045f8c..71a6a0c9211 100644
--- a/vendor/assets/javascripts/highlightjs/languages/axapta.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/axapta.min.js
@@ -1,4 +1,4 @@
-/*! `axapta` grammar compiled for Highlight.js 11.6.0 */
+/*! `axapta` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const t=e.UNDERSCORE_IDENT_RE,s={
 keyword:["abstract","as","asc","avg","break","breakpoint","by","byref","case","catch","changecompany","class","client","client","common","const","continue","count","crosscompany","delegate","delete_from","desc","display","div","do","edit","else","eventhandler","exists","extends","final","finally","firstfast","firstonly","firstonly1","firstonly10","firstonly100","firstonly1000","flush","for","forceliterals","forcenestedloop","forceplaceholders","forceselectorder","forupdate","from","generateonly","group","hint","if","implements","in","index","insert_recordset","interface","internal","is","join","like","maxof","minof","mod","namespace","new","next","nofetch","notexists","optimisticlock","order","outer","pessimisticlock","print","private","protected","public","readonly","repeatableread","retry","return","reverse","select","server","setting","static","sum","super","switch","this","throw","try","ttsabort","ttsbegin","ttscommit","unchecked","update_recordset","using","validtimestate","void","where","while"],
 built_in:["anytype","boolean","byte","char","container","date","double","enum","guid","int","int64","long","real","short","str","utcdatetime","var"],
diff --git a/vendor/assets/javascripts/highlightjs/languages/bash.min.js b/vendor/assets/javascripts/highlightjs/languages/bash.min.js
index c3b5ef53f89..9f6c48a69b5 100644
--- a/vendor/assets/javascripts/highlightjs/languages/bash.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/bash.min.js
@@ -1,4 +1,4 @@
-/*! `bash` grammar compiled for Highlight.js 11.6.0 */
+/*! `bash` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const s=e.regex,t={},n={begin:/\$\{/,
 end:/\}/,contains:["self",{begin:/:-/,contains:[t]}]};Object.assign(t,{
 className:"variable",variants:[{
@@ -6,13 +6,13 @@ begin:s.concat(/\$[\w\d#@][\w\d_]*/,"(?![\\w\\d])(?![$])")},n]});const a={
 className:"subst",begin:/\$\(/,end:/\)/,contains:[e.BACKSLASH_ESCAPE]},i={
 begin:/<<-?\s*(?=\w+)/,starts:{contains:[e.END_SAME_AS_BEGIN({begin:/(\w+)/,
 end:/(\w+)/,className:"string"})]}},c={className:"string",begin:/"/,end:/"/,
-contains:[e.BACKSLASH_ESCAPE,t,a]};a.contains.push(c);const o={begin:/\$\(\(/,
+contains:[e.BACKSLASH_ESCAPE,t,a]};a.contains.push(c);const o={begin:/\$?\(\(/,
 end:/\)\)/,contains:[{begin:/\d+#[0-9a-f]+/,className:"number"},e.NUMBER_MODE,t]
 },r=e.SHEBANG({binary:"(fish|bash|zsh|sh|csh|ksh|tcsh|dash|scsh)",relevance:10
 }),l={className:"function",begin:/\w[\w\d_]*\s*\(\s*\)\s*\{/,returnBegin:!0,
 contains:[e.inherit(e.TITLE_MODE,{begin:/\w[\w\d_]*/})],relevance:0};return{
 name:"Bash",aliases:["sh"],keywords:{$pattern:/\b[a-z][a-z0-9._-]+\b/,
-keyword:["if","then","else","elif","fi","for","while","in","do","done","case","esac","function"],
+keyword:["if","then","else","elif","fi","for","while","until","in","do","done","case","esac","function","select"],
 literal:["true","false"],
 built_in:["break","cd","continue","eval","exec","exit","export","getopts","hash","pwd","readonly","return","shift","test","times","trap","umask","unset","alias","bind","builtin","caller","command","declare","echo","enable","help","let","local","logout","mapfile","printf","read","readarray","source","type","typeset","ulimit","unalias","set","shopt","autoload","bg","bindkey","bye","cap","chdir","clone","comparguments","compcall","compctl","compdescribe","compfiles","compgroups","compquote","comptags","comptry","compvalues","dirs","disable","disown","echotc","echoti","emulate","fc","fg","float","functions","getcap","getln","history","integer","jobs","kill","limit","log","noglob","popd","print","pushd","pushln","rehash","sched","setcap","setopt","stat","suspend","ttyctl","unfunction","unhash","unlimit","unsetopt","vared","wait","whence","where","which","zcompile","zformat","zftp","zle","zmodload","zparseopts","zprof","zpty","zregexparse","zsocket","zstyle","ztcp","chcon","chgrp","chown","chmod","cp","dd","df","dir","dircolors","ln","ls","mkdir","mkfifo","mknod","mktemp","mv","realpath","rm","rmdir","shred","sync","touch","truncate","vdir","b2sum","base32","base64","cat","cksum","comm","csplit","cut","expand","fmt","fold","head","join","md5sum","nl","numfmt","od","paste","ptx","pr","sha1sum","sha224sum","sha256sum","sha384sum","sha512sum","shuf","sort","split","sum","tac","tail","tr","tsort","unexpand","uniq","wc","arch","basename","chroot","date","dirname","du","echo","env","expr","factor","groups","hostid","id","link","logname","nice","nohup","nproc","pathchk","pinky","printenv","printf","pwd","readlink","runcon","seq","sleep","stat","stdbuf","stty","tee","test","timeout","tty","uname","unlink","uptime","users","who","whoami","yes"]
 },contains:[r,e.SHEBANG(),l,o,e.HASH_COMMENT_MODE,i,{match:/(\/[a-z._-]+)+/},c,{
diff --git a/vendor/assets/javascripts/highlightjs/languages/basic.min.js b/vendor/assets/javascripts/highlightjs/languages/basic.min.js
index 209f4af7818..b6cd61b47c9 100644
--- a/vendor/assets/javascripts/highlightjs/languages/basic.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/basic.min.js
@@ -1,4 +1,4 @@
-/*! `basic` grammar compiled for Highlight.js 11.6.0 */
+/*! `basic` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var E=(()=>{"use strict";return E=>({name:"BASIC",case_insensitive:!0,
 illegal:"^.",keywords:{$pattern:"[a-zA-Z][a-zA-Z0-9_$%!#]*",
 keyword:["ABS","ASC","AND","ATN","AUTO|0","BEEP","BLOAD|10","BSAVE|10","CALL","CALLS","CDBL","CHAIN","CHDIR","CHR$|10","CINT","CIRCLE","CLEAR","CLOSE","CLS","COLOR","COM","COMMON","CONT","COS","CSNG","CSRLIN","CVD","CVI","CVS","DATA","DATE$","DEFDBL","DEFINT","DEFSNG","DEFSTR","DEF|0","SEG","USR","DELETE","DIM","DRAW","EDIT","END","ENVIRON","ENVIRON$","EOF","EQV","ERASE","ERDEV","ERDEV$","ERL","ERR","ERROR","EXP","FIELD","FILES","FIX","FOR|0","FRE","GET","GOSUB|10","GOTO","HEX$","IF","THEN","ELSE|0","INKEY$","INP","INPUT","INPUT#","INPUT$","INSTR","IMP","INT","IOCTL","IOCTL$","KEY","ON","OFF","LIST","KILL","LEFT$","LEN","LET","LINE","LLIST","LOAD","LOC","LOCATE","LOF","LOG","LPRINT","USING","LSET","MERGE","MID$","MKDIR","MKD$","MKI$","MKS$","MOD","NAME","NEW","NEXT","NOISE","NOT","OCT$","ON","OR","PEN","PLAY","STRIG","OPEN","OPTION","BASE","OUT","PAINT","PALETTE","PCOPY","PEEK","PMAP","POINT","POKE","POS","PRINT","PRINT]","PSET","PRESET","PUT","RANDOMIZE","READ","REM","RENUM","RESET|0","RESTORE","RESUME","RETURN|0","RIGHT$","RMDIR","RND","RSET","RUN","SAVE","SCREEN","SGN","SHELL","SIN","SOUND","SPACE$","SPC","SQR","STEP","STICK","STOP","STR$","STRING$","SWAP","SYSTEM","TAB","TAN","TIME$","TIMER","TROFF","TRON","TO","USR","VAL","VARPTR","VARPTR$","VIEW","WAIT","WHILE","WEND","WIDTH","WINDOW","WRITE","XOR"]
diff --git a/vendor/assets/javascripts/highlightjs/languages/bnf.min.js b/vendor/assets/javascripts/highlightjs/languages/bnf.min.js
index 546ea1d5758..f2d9efd91fc 100644
--- a/vendor/assets/javascripts/highlightjs/languages/bnf.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/bnf.min.js
@@ -1,4 +1,4 @@
-/*! `bnf` grammar compiled for Highlight.js 11.6.0 */
+/*! `bnf` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"Backus\u2013Naur Form",
 contains:[{className:"attribute",begin:/</,end:/>/},{begin:/::=/,end:/$/,
 contains:[{begin:/</,end:/>/
diff --git a/vendor/assets/javascripts/highlightjs/languages/brainfuck.min.js b/vendor/assets/javascripts/highlightjs/languages/brainfuck.min.js
index 8a97cc2ab15..f8777134429 100644
--- a/vendor/assets/javascripts/highlightjs/languages/brainfuck.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/brainfuck.min.js
@@ -1,4 +1,4 @@
-/*! `brainfuck` grammar compiled for Highlight.js 11.6.0 */
+/*! `brainfuck` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const n={className:"literal",
 begin:/[+-]+/,relevance:0};return{name:"Brainfuck",aliases:["bf"],
 contains:[e.COMMENT(/[^\[\]\.,\+\-<> \r\n]/,/[\[\]\.,\+\-<> \r\n]/,{contains:[{
diff --git a/vendor/assets/javascripts/highlightjs/languages/c.min.js b/vendor/assets/javascripts/highlightjs/languages/c.min.js
index b56cd373138..3742334abca 100644
--- a/vendor/assets/javascripts/highlightjs/languages/c.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/c.min.js
@@ -1,41 +1,40 @@
-/*! `c` grammar compiled for Highlight.js 11.6.0 */
+/*! `c` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const n=e.regex,t=e.COMMENT("//","$",{
 contains:[{begin:/\\\n/}]
-}),s="[a-zA-Z_]\\w*::",a="(decltype\\(auto\\)|"+n.optional(s)+"[a-zA-Z_]\\w*"+n.optional("<[^<>]+>")+")",r={
+}),s="decltype\\(auto\\)",a="[a-zA-Z_]\\w*::",r="("+s+"|"+n.optional(a)+"[a-zA-Z_]\\w*"+n.optional("<[^<>]+>")+")",i={
 className:"type",variants:[{begin:"\\b[a-z\\d_]*_t\\b"},{
-match:/\batomic_[a-z]{3,6}\b/}]},i={className:"string",variants:[{
+match:/\batomic_[a-z]{3,6}\b/}]},l={className:"string",variants:[{
 begin:'(u8?|U|L)?"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE]},{
 begin:"(u8?|U|L)?'(\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4,8}|[0-7]{3}|\\S)|.)",
 end:"'",illegal:"."},e.END_SAME_AS_BEGIN({
-begin:/(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,end:/\)([^()\\ ]{0,16})"/})]},l={
+begin:/(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,end:/\)([^()\\ ]{0,16})"/})]},o={
 className:"number",variants:[{begin:"\\b(0b[01']+)"},{
 begin:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)((ll|LL|l|L)(u|U)?|(u|U)(ll|LL|l|L)?|f|F|b|B)"
 },{
 begin:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"
-}],relevance:0},o={className:"meta",begin:/#\s*[a-z]+\b/,end:/$/,keywords:{
+}],relevance:0},c={className:"meta",begin:/#\s*[a-z]+\b/,end:/$/,keywords:{
 keyword:"if else elif endif define undef warning error line pragma _Pragma ifdef ifndef include"
-},contains:[{begin:/\\\n/,relevance:0},e.inherit(i,{className:"string"}),{
-className:"string",begin:/<.*?>/},t,e.C_BLOCK_COMMENT_MODE]},c={
-className:"title",begin:n.optional(s)+e.IDENT_RE,relevance:0
-},d=n.optional(s)+e.IDENT_RE+"\\s*\\(",u={
+},contains:[{begin:/\\\n/,relevance:0},e.inherit(l,{className:"string"}),{
+className:"string",begin:/<.*?>/},t,e.C_BLOCK_COMMENT_MODE]},d={
+className:"title",begin:n.optional(a)+e.IDENT_RE,relevance:0
+},g=n.optional(a)+e.IDENT_RE+"\\s*\\(",u={
 keyword:["asm","auto","break","case","continue","default","do","else","enum","extern","for","fortran","goto","if","inline","register","restrict","return","sizeof","struct","switch","typedef","union","volatile","while","_Alignas","_Alignof","_Atomic","_Generic","_Noreturn","_Static_assert","_Thread_local","alignas","alignof","noreturn","static_assert","thread_local","_Pragma"],
 type:["float","double","signed","unsigned","int","short","long","char","void","_Bool","_Complex","_Imaginary","_Decimal32","_Decimal64","_Decimal128","const","static","complex","bool","imaginary"],
 literal:"true false NULL",
 built_in:"std string wstring cin cout cerr clog stdin stdout stderr stringstream istringstream ostringstream auto_ptr deque list queue stack vector map set pair bitset multiset multimap unordered_set unordered_map unordered_multiset unordered_multimap priority_queue make_pair array shared_ptr abort terminate abs acos asin atan2 atan calloc ceil cosh cos exit exp fabs floor fmod fprintf fputs free frexp fscanf future isalnum isalpha iscntrl isdigit isgraph islower isprint ispunct isspace isupper isxdigit tolower toupper labs ldexp log10 log malloc realloc memchr memcmp memcpy memset modf pow printf putchar puts scanf sinh sin snprintf sprintf sqrt sscanf strcat strchr strcmp strcpy strcspn strlen strncat strncmp strncpy strpbrk strrchr strspn strstr tanh tan vfprintf vprintf vsprintf endl initializer_list unique_ptr"
-},g=[o,r,t,e.C_BLOCK_COMMENT_MODE,l,i],m={variants:[{begin:/=/,end:/;/},{
+},m=[c,i,t,e.C_BLOCK_COMMENT_MODE,o,l],_={variants:[{begin:/=/,end:/;/},{
 begin:/\(/,end:/\)/},{beginKeywords:"new throw return else",end:/;/}],
-keywords:u,contains:g.concat([{begin:/\(/,end:/\)/,keywords:u,
-contains:g.concat(["self"]),relevance:0}]),relevance:0},p={
-begin:"("+a+"[\\*&\\s]+)+"+d,returnBegin:!0,end:/[{;=]/,excludeEnd:!0,
-keywords:u,illegal:/[^\w\s\*&:<>.]/,contains:[{begin:"decltype\\(auto\\)",
-keywords:u,relevance:0},{begin:d,returnBegin:!0,contains:[e.inherit(c,{
-className:"title.function"})],relevance:0},{relevance:0,match:/,/},{
-className:"params",begin:/\(/,end:/\)/,keywords:u,relevance:0,
-contains:[t,e.C_BLOCK_COMMENT_MODE,i,l,r,{begin:/\(/,end:/\)/,keywords:u,
-relevance:0,contains:["self",t,e.C_BLOCK_COMMENT_MODE,i,l,r]}]
-},r,t,e.C_BLOCK_COMMENT_MODE,o]};return{name:"C",aliases:["h"],keywords:u,
-disableAutodetect:!0,illegal:"</",contains:[].concat(m,p,g,[o,{
+keywords:u,contains:m.concat([{begin:/\(/,end:/\)/,keywords:u,
+contains:m.concat(["self"]),relevance:0}]),relevance:0},p={
+begin:"("+r+"[\\*&\\s]+)+"+g,returnBegin:!0,end:/[{;=]/,excludeEnd:!0,
+keywords:u,illegal:/[^\w\s\*&:<>.]/,contains:[{begin:s,keywords:u,relevance:0},{
+begin:g,returnBegin:!0,contains:[e.inherit(d,{className:"title.function"})],
+relevance:0},{relevance:0,match:/,/},{className:"params",begin:/\(/,end:/\)/,
+keywords:u,relevance:0,contains:[t,e.C_BLOCK_COMMENT_MODE,l,o,i,{begin:/\(/,
+end:/\)/,keywords:u,relevance:0,contains:["self",t,e.C_BLOCK_COMMENT_MODE,l,o,i]
+}]},i,t,e.C_BLOCK_COMMENT_MODE,c]};return{name:"C",aliases:["h"],keywords:u,
+disableAutodetect:!0,illegal:"</",contains:[].concat(_,p,m,[c,{
 begin:e.IDENT_RE+"::",keywords:u},{className:"class",
 beginKeywords:"enum class struct union",end:/[{;:<>=]/,contains:[{
-beginKeywords:"final class struct"},e.TITLE_MODE]}]),exports:{preprocessor:o,
-strings:i,keywords:u}}}})();hljs.registerLanguage("c",e)})();
\ No newline at end of file
+beginKeywords:"final class struct"},e.TITLE_MODE]}]),exports:{preprocessor:c,
+strings:l,keywords:u}}}})();hljs.registerLanguage("c",e)})();
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/cal.min.js b/vendor/assets/javascripts/highlightjs/languages/cal.min.js
index c0c8e075a9d..f187ecef86d 100644
--- a/vendor/assets/javascripts/highlightjs/languages/cal.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/cal.min.js
@@ -1,4 +1,4 @@
-/*! `cal` grammar compiled for Highlight.js 11.6.0 */
+/*! `cal` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const n=e.regex,a=["div","mod","in","and","or","not","xor","asserterror","begin","case","do","downto","else","end","exit","for","local","if","of","repeat","then","to","until","while","with","var"],r=[e.C_LINE_COMMENT_MODE,e.COMMENT(/\{/,/\}/,{
 relevance:0}),e.COMMENT(/\(\*/,/\*\)/,{relevance:10})],t={className:"string",
diff --git a/vendor/assets/javascripts/highlightjs/languages/capnproto.min.js b/vendor/assets/javascripts/highlightjs/languages/capnproto.min.js
index ace90a02d92..c80d2f2a9b7 100644
--- a/vendor/assets/javascripts/highlightjs/languages/capnproto.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/capnproto.min.js
@@ -1,4 +1,4 @@
-/*! `capnproto` grammar compiled for Highlight.js 11.6.0 */
+/*! `capnproto` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var t=(()=>{"use strict";return t=>{const n={variants:[{
 match:[/(struct|enum|interface)/,/\s+/,t.IDENT_RE]},{
 match:[/extends/,/\s*\(/,t.IDENT_RE,/\s*\)/]}],scope:{1:"keyword",
diff --git a/vendor/assets/javascripts/highlightjs/languages/ceylon.min.js b/vendor/assets/javascripts/highlightjs/languages/ceylon.min.js
index 059be78519f..03db0d2121f 100644
--- a/vendor/assets/javascripts/highlightjs/languages/ceylon.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/ceylon.min.js
@@ -1,4 +1,4 @@
-/*! `ceylon` grammar compiled for Highlight.js 11.6.0 */
+/*! `ceylon` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const a=["assembly","module","package","import","alias","class","interface","object","given","value","assign","void","function","new","of","extends","satisfies","abstracts","in","out","return","break","continue","throw","assert","dynamic","if","else","switch","case","for","while","try","catch","finally","then","let","this","outer","super","is","exists","nonempty"],s={
 className:"subst",excludeBegin:!0,excludeEnd:!0,begin:/``/,end:/``/,keywords:a,
diff --git a/vendor/assets/javascripts/highlightjs/languages/clean.min.js b/vendor/assets/javascripts/highlightjs/languages/clean.min.js
index 41e2907a63a..fa2412995da 100644
--- a/vendor/assets/javascripts/highlightjs/languages/clean.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/clean.min.js
@@ -1,4 +1,4 @@
-/*! `clean` grammar compiled for Highlight.js 11.6.0 */
+/*! `clean` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"Clean",aliases:["icl","dcl"],
 keywords:{
 keyword:["if","let","in","with","where","case","of","class","instance","otherwise","implementation","definition","system","module","from","import","qualified","as","special","code","inline","foreign","export","ccall","stdcall","generic","derive","infix","infixl","infixr"],
diff --git a/vendor/assets/javascripts/highlightjs/languages/clojure-repl.min.js b/vendor/assets/javascripts/highlightjs/languages/clojure-repl.min.js
index add495badf0..f70994891cb 100644
--- a/vendor/assets/javascripts/highlightjs/languages/clojure-repl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/clojure-repl.min.js
@@ -1,4 +1,4 @@
-/*! `clojure-repl` grammar compiled for Highlight.js 11.6.0 */
+/*! `clojure-repl` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"Clojure REPL",contains:[{
 className:"meta.prompt",begin:/^([\w.-]+|\s*#_)?=>/,starts:{end:/$/,
 subLanguage:"clojure"}}]})})();hljs.registerLanguage("clojure-repl",e)})();
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/clojure.min.js b/vendor/assets/javascripts/highlightjs/languages/clojure.min.js
index a54bec45dcb..f39ad7130d1 100644
--- a/vendor/assets/javascripts/highlightjs/languages/clojure.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/clojure.min.js
@@ -1,4 +1,4 @@
-/*! `clojure` grammar compiled for Highlight.js 11.6.0 */
+/*! `clojure` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const t="a-zA-Z_\\-!.?+*=<>&'",n="[#]?["+t+"]["+t+"0-9/;:$#]*",a="def defonce defprotocol defstruct defmulti defmethod defn- defn defmacro deftype defrecord",r={
 $pattern:n,
diff --git a/vendor/assets/javascripts/highlightjs/languages/cmake.min.js b/vendor/assets/javascripts/highlightjs/languages/cmake.min.js
index 8a207931243..75ddfe7d5e4 100644
--- a/vendor/assets/javascripts/highlightjs/languages/cmake.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/cmake.min.js
@@ -1,7 +1,7 @@
-/*! `cmake` grammar compiled for Highlight.js 11.6.0 */
+/*! `cmake` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"CMake",aliases:["cmake.in"],
 case_insensitive:!0,keywords:{
 keyword:"break cmake_host_system_information cmake_minimum_required cmake_parse_arguments cmake_policy configure_file continue elseif else endforeach endfunction endif endmacro endwhile execute_process file find_file find_library find_package find_path find_program foreach function get_cmake_property get_directory_property get_filename_component get_property if include include_guard list macro mark_as_advanced math message option return separate_arguments set_directory_properties set_property set site_name string unset variable_watch while add_compile_definitions add_compile_options add_custom_command add_custom_target add_definitions add_dependencies add_executable add_library add_link_options add_subdirectory add_test aux_source_directory build_command create_test_sourcelist define_property enable_language enable_testing export fltk_wrap_ui get_source_file_property get_target_property get_test_property include_directories include_external_msproject include_regular_expression install link_directories link_libraries load_cache project qt_wrap_cpp qt_wrap_ui remove_definitions set_source_files_properties set_target_properties set_tests_properties source_group target_compile_definitions target_compile_features target_compile_options target_include_directories target_link_directories target_link_libraries target_link_options target_sources try_compile try_run ctest_build ctest_configure ctest_coverage ctest_empty_binary_directory ctest_memcheck ctest_read_custom_files ctest_run_script ctest_sleep ctest_start ctest_submit ctest_test ctest_update ctest_upload build_name exec_program export_library_dependencies install_files install_programs install_targets load_command make_directory output_required_files remove subdir_depends subdirs use_mangled_mesa utility_source variable_requires write_file qt5_use_modules qt5_use_package qt5_wrap_cpp on off true false and or not command policy target test exists is_newer_than is_directory is_symlink is_absolute matches less greater equal less_equal greater_equal strless strgreater strequal strless_equal strgreater_equal version_less version_greater version_equal version_less_equal version_greater_equal in_list defined"
 },contains:[{className:"variable",begin:/\$\{/,end:/\}/
-},e.HASH_COMMENT_MODE,e.QUOTE_STRING_MODE,e.NUMBER_MODE]})})()
-;hljs.registerLanguage("cmake",e)})();
\ No newline at end of file
+},e.COMMENT(/#\[\[/,/]]/),e.HASH_COMMENT_MODE,e.QUOTE_STRING_MODE,e.NUMBER_MODE]
+})})();hljs.registerLanguage("cmake",e)})();
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/coffeescript.min.js b/vendor/assets/javascripts/highlightjs/languages/coffeescript.min.js
index c9f7c8b02c7..021b96da7c1 100644
--- a/vendor/assets/javascripts/highlightjs/languages/coffeescript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/coffeescript.min.js
@@ -1,4 +1,4 @@
-/*! `coffeescript` grammar compiled for Highlight.js 11.6.0 */
+/*! `coffeescript` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict"
 ;const e=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],n=["true","false","null","undefined","NaN","Infinity"],r=[].concat(["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],["Object","Function","Boolean","Symbol","Math","Date","Number","BigInt","String","RegExp","Array","Float32Array","Float64Array","Int8Array","Uint8Array","Uint8ClampedArray","Int16Array","Int32Array","Uint16Array","Uint32Array","BigInt64Array","BigUint64Array","Set","Map","WeakSet","WeakMap","ArrayBuffer","SharedArrayBuffer","Atomics","DataView","JSON","Promise","Generator","GeneratorFunction","AsyncFunction","Reflect","Proxy","Intl","WebAssembly"],["Error","EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"])
 ;return t=>{const a={
diff --git a/vendor/assets/javascripts/highlightjs/languages/coq.min.js b/vendor/assets/javascripts/highlightjs/languages/coq.min.js
index bea26715511..fc6a8f8150e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/coq.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/coq.min.js
@@ -1,4 +1,4 @@
-/*! `coq` grammar compiled for Highlight.js 11.6.0 */
+/*! `coq` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"Coq",keywords:{
 keyword:["_|0","as","at","cofix","else","end","exists","exists2","fix","for","forall","fun","if","IF","in","let","match","mod","Prop","return","Set","then","Type","using","where","with","Abort","About","Add","Admit","Admitted","All","Arguments","Assumptions","Axiom","Back","BackTo","Backtrack","Bind","Blacklist","Canonical","Cd","Check","Class","Classes","Close","Coercion","Coercions","CoFixpoint","CoInductive","Collection","Combined","Compute","Conjecture","Conjectures","Constant","constr","Constraint","Constructors","Context","Corollary","CreateHintDb","Cut","Declare","Defined","Definition","Delimit","Dependencies","Dependent","Derive","Drop","eauto","End","Equality","Eval","Example","Existential","Existentials","Existing","Export","exporting","Extern","Extract","Extraction","Fact","Field","Fields","File","Fixpoint","Focus","for","From","Function","Functional","Generalizable","Global","Goal","Grab","Grammar","Graph","Guarded","Heap","Hint","HintDb","Hints","Hypotheses","Hypothesis","ident","Identity","If","Immediate","Implicit","Import","Include","Inductive","Infix","Info","Initial","Inline","Inspect","Instance","Instances","Intro","Intros","Inversion","Inversion_clear","Language","Left","Lemma","Let","Libraries","Library","Load","LoadPath","Local","Locate","Ltac","ML","Mode","Module","Modules","Monomorphic","Morphism","Next","NoInline","Notation","Obligation","Obligations","Opaque","Open","Optimize","Options","Parameter","Parameters","Parametric","Path","Paths","pattern","Polymorphic","Preterm","Print","Printing","Program","Projections","Proof","Proposition","Pwd","Qed","Quit","Rec","Record","Recursive","Redirect","Relation","Remark","Remove","Require","Reserved","Reset","Resolve","Restart","Rewrite","Right","Ring","Rings","Save","Scheme","Scope","Scopes","Script","Search","SearchAbout","SearchHead","SearchPattern","SearchRewrite","Section","Separate","Set","Setoid","Show","Solve","Sorted","Step","Strategies","Strategy","Structure","SubClass","Table","Tables","Tactic","Term","Test","Theorem","Time","Timeout","Transparent","Type","Typeclasses","Types","Undelimit","Undo","Unfocus","Unfocused","Unfold","Universe","Universes","Unset","Unshelve","using","Variable","Variables","Variant","Verbose","Visibility","where","with"],
 built_in:["abstract","absurd","admit","after","apply","as","assert","assumption","at","auto","autorewrite","autounfold","before","bottom","btauto","by","case","case_eq","cbn","cbv","change","classical_left","classical_right","clear","clearbody","cofix","compare","compute","congruence","constr_eq","constructor","contradict","contradiction","cut","cutrewrite","cycle","decide","decompose","dependent","destruct","destruction","dintuition","discriminate","discrR","do","double","dtauto","eapply","eassumption","eauto","ecase","econstructor","edestruct","ediscriminate","eelim","eexact","eexists","einduction","einjection","eleft","elim","elimtype","enough","equality","erewrite","eright","esimplify_eq","esplit","evar","exact","exactly_once","exfalso","exists","f_equal","fail","field","field_simplify","field_simplify_eq","first","firstorder","fix","fold","fourier","functional","generalize","generalizing","gfail","give_up","has_evar","hnf","idtac","in","induction","injection","instantiate","intro","intro_pattern","intros","intuition","inversion","inversion_clear","is_evar","is_var","lapply","lazy","left","lia","lra","move","native_compute","nia","nsatz","omega","once","pattern","pose","progress","proof","psatz","quote","record","red","refine","reflexivity","remember","rename","repeat","replace","revert","revgoals","rewrite","rewrite_strat","right","ring","ring_simplify","rtauto","set","setoid_reflexivity","setoid_replace","setoid_rewrite","setoid_symmetry","setoid_transitivity","shelve","shelve_unifiable","simpl","simple","simplify_eq","solve","specialize","split","split_Rabs","split_Rmult","stepl","stepr","subst","sum","swap","symmetry","tactic","tauto","time","timeout","top","transitivity","trivial","try","tryif","unfold","unify","until","using","vm_compute","with"]
diff --git a/vendor/assets/javascripts/highlightjs/languages/cos.min.js b/vendor/assets/javascripts/highlightjs/languages/cos.min.js
index 05167a0b4e4..6b773e1bee7 100644
--- a/vendor/assets/javascripts/highlightjs/languages/cos.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/cos.min.js
@@ -1,4 +1,4 @@
-/*! `cos` grammar compiled for Highlight.js 11.6.0 */
+/*! `cos` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"Cach\xe9 Object Script",
 case_insensitive:!0,aliases:["cls"],
 keywords:"property parameter class classmethod clientmethod extends as break catch close continue do d|0 else elseif for goto halt hang h|0 if job j|0 kill k|0 lock l|0 merge new open quit q|0 read r|0 return set s|0 tcommit throw trollback try tstart use view while write w|0 xecute x|0 zkill znspace zn ztrap zwrite zw zzdump zzwrite print zbreak zinsert zload zprint zremove zsave zzprint mv mvcall mvcrt mvdim mvprint zquit zsync ascii",
diff --git a/vendor/assets/javascripts/highlightjs/languages/cpp.min.js b/vendor/assets/javascripts/highlightjs/languages/cpp.min.js
index a35f629362f..e4a53db394e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/cpp.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/cpp.min.js
@@ -1,47 +1,47 @@
-/*! `cpp` grammar compiled for Highlight.js 11.6.0 */
+/*! `cpp` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const t=e.regex,a=e.COMMENT("//","$",{
 contains:[{begin:/\\\n/}]
-}),n="[a-zA-Z_]\\w*::",r="(?!struct)(decltype\\(auto\\)|"+t.optional(n)+"[a-zA-Z_]\\w*"+t.optional("<[^<>]+>")+")",i={
-className:"type",begin:"\\b[a-z\\d_]*_t\\b"},s={className:"string",variants:[{
+}),n="decltype\\(auto\\)",r="[a-zA-Z_]\\w*::",i="(?!struct)("+n+"|"+t.optional(r)+"[a-zA-Z_]\\w*"+t.optional("<[^<>]+>")+")",s={
+className:"type",begin:"\\b[a-z\\d_]*_t\\b"},c={className:"string",variants:[{
 begin:'(u8?|U|L)?"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE]},{
 begin:"(u8?|U|L)?'(\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4,8}|[0-7]{3}|\\S)|.)",
 end:"'",illegal:"."},e.END_SAME_AS_BEGIN({
-begin:/(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,end:/\)([^()\\ ]{0,16})"/})]},c={
+begin:/(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,end:/\)([^()\\ ]{0,16})"/})]},o={
 className:"number",variants:[{begin:"\\b(0b[01']+)"},{
 begin:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)((ll|LL|l|L)(u|U)?|(u|U)(ll|LL|l|L)?|f|F|b|B)"
 },{
 begin:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"
-}],relevance:0},o={className:"meta",begin:/#\s*[a-z]+\b/,end:/$/,keywords:{
+}],relevance:0},l={className:"meta",begin:/#\s*[a-z]+\b/,end:/$/,keywords:{
 keyword:"if else elif endif define undef warning error line pragma _Pragma ifdef ifndef include"
-},contains:[{begin:/\\\n/,relevance:0},e.inherit(s,{className:"string"}),{
-className:"string",begin:/<.*?>/},a,e.C_BLOCK_COMMENT_MODE]},l={
-className:"title",begin:t.optional(n)+e.IDENT_RE,relevance:0
-},d=t.optional(n)+e.IDENT_RE+"\\s*\\(",u={
+},contains:[{begin:/\\\n/,relevance:0},e.inherit(c,{className:"string"}),{
+className:"string",begin:/<.*?>/},a,e.C_BLOCK_COMMENT_MODE]},d={
+className:"title",begin:t.optional(r)+e.IDENT_RE,relevance:0
+},u=t.optional(r)+e.IDENT_RE+"\\s*\\(",p={
 type:["bool","char","char16_t","char32_t","char8_t","double","float","int","long","short","void","wchar_t","unsigned","signed","const","static"],
 keyword:["alignas","alignof","and","and_eq","asm","atomic_cancel","atomic_commit","atomic_noexcept","auto","bitand","bitor","break","case","catch","class","co_await","co_return","co_yield","compl","concept","const_cast|10","consteval","constexpr","constinit","continue","decltype","default","delete","do","dynamic_cast|10","else","enum","explicit","export","extern","false","final","for","friend","goto","if","import","inline","module","mutable","namespace","new","noexcept","not","not_eq","nullptr","operator","or","or_eq","override","private","protected","public","reflexpr","register","reinterpret_cast|10","requires","return","sizeof","static_assert","static_cast|10","struct","switch","synchronized","template","this","thread_local","throw","transaction_safe","transaction_safe_dynamic","true","try","typedef","typeid","typename","union","using","virtual","volatile","while","xor","xor_eq"],
 literal:["NULL","false","nullopt","nullptr","true"],built_in:["_Pragma"],
 _type_hints:["any","auto_ptr","barrier","binary_semaphore","bitset","complex","condition_variable","condition_variable_any","counting_semaphore","deque","false_type","future","imaginary","initializer_list","istringstream","jthread","latch","lock_guard","multimap","multiset","mutex","optional","ostringstream","packaged_task","pair","promise","priority_queue","queue","recursive_mutex","recursive_timed_mutex","scoped_lock","set","shared_future","shared_lock","shared_mutex","shared_timed_mutex","shared_ptr","stack","string_view","stringstream","timed_mutex","thread","true_type","tuple","unique_lock","unique_ptr","unordered_map","unordered_multimap","unordered_multiset","unordered_set","variant","vector","weak_ptr","wstring","wstring_view"]
-},p={className:"function.dispatch",relevance:0,keywords:{
+},_={className:"function.dispatch",relevance:0,keywords:{
 _hint:["abort","abs","acos","apply","as_const","asin","atan","atan2","calloc","ceil","cerr","cin","clog","cos","cosh","cout","declval","endl","exchange","exit","exp","fabs","floor","fmod","forward","fprintf","fputs","free","frexp","fscanf","future","invoke","isalnum","isalpha","iscntrl","isdigit","isgraph","islower","isprint","ispunct","isspace","isupper","isxdigit","labs","launder","ldexp","log","log10","make_pair","make_shared","make_shared_for_overwrite","make_tuple","make_unique","malloc","memchr","memcmp","memcpy","memset","modf","move","pow","printf","putchar","puts","realloc","scanf","sin","sinh","snprintf","sprintf","sqrt","sscanf","std","stderr","stdin","stdout","strcat","strchr","strcmp","strcpy","strcspn","strlen","strncat","strncmp","strncpy","strpbrk","strrchr","strspn","strstr","swap","tan","tanh","terminate","to_underlying","tolower","toupper","vfprintf","visit","vprintf","vsprintf"]
 },
 begin:t.concat(/\b/,/(?!decltype)/,/(?!if)/,/(?!for)/,/(?!switch)/,/(?!while)/,e.IDENT_RE,t.lookahead(/(<[^<>]+>|)\s*\(/))
-},_=[p,o,i,a,e.C_BLOCK_COMMENT_MODE,c,s],m={variants:[{begin:/=/,end:/;/},{
+},m=[_,l,s,a,e.C_BLOCK_COMMENT_MODE,o,c],g={variants:[{begin:/=/,end:/;/},{
 begin:/\(/,end:/\)/},{beginKeywords:"new throw return else",end:/;/}],
-keywords:u,contains:_.concat([{begin:/\(/,end:/\)/,keywords:u,
-contains:_.concat(["self"]),relevance:0}]),relevance:0},g={className:"function",
-begin:"("+r+"[\\*&\\s]+)+"+d,returnBegin:!0,end:/[{;=]/,excludeEnd:!0,
-keywords:u,illegal:/[^\w\s\*&:<>.]/,contains:[{begin:"decltype\\(auto\\)",
-keywords:u,relevance:0},{begin:d,returnBegin:!0,contains:[l],relevance:0},{
-begin:/::/,relevance:0},{begin:/:/,endsWithParent:!0,contains:[s,c]},{
-relevance:0,match:/,/},{className:"params",begin:/\(/,end:/\)/,keywords:u,
-relevance:0,contains:[a,e.C_BLOCK_COMMENT_MODE,s,c,i,{begin:/\(/,end:/\)/,
-keywords:u,relevance:0,contains:["self",a,e.C_BLOCK_COMMENT_MODE,s,c,i]}]
-},i,a,e.C_BLOCK_COMMENT_MODE,o]};return{name:"C++",
-aliases:["cc","c++","h++","hpp","hh","hxx","cxx"],keywords:u,illegal:"</",
+keywords:p,contains:m.concat([{begin:/\(/,end:/\)/,keywords:p,
+contains:m.concat(["self"]),relevance:0}]),relevance:0},f={className:"function",
+begin:"("+i+"[\\*&\\s]+)+"+u,returnBegin:!0,end:/[{;=]/,excludeEnd:!0,
+keywords:p,illegal:/[^\w\s\*&:<>.]/,contains:[{begin:n,keywords:p,relevance:0},{
+begin:u,returnBegin:!0,contains:[d],relevance:0},{begin:/::/,relevance:0},{
+begin:/:/,endsWithParent:!0,contains:[c,o]},{relevance:0,match:/,/},{
+className:"params",begin:/\(/,end:/\)/,keywords:p,relevance:0,
+contains:[a,e.C_BLOCK_COMMENT_MODE,c,o,s,{begin:/\(/,end:/\)/,keywords:p,
+relevance:0,contains:["self",a,e.C_BLOCK_COMMENT_MODE,c,o,s]}]
+},s,a,e.C_BLOCK_COMMENT_MODE,l]};return{name:"C++",
+aliases:["cc","c++","h++","hpp","hh","hxx","cxx"],keywords:p,illegal:"</",
 classNameAliases:{"function.dispatch":"built_in"},
-contains:[].concat(m,g,p,_,[o,{
+contains:[].concat(g,f,_,m,[l,{
 begin:"\\b(deque|list|queue|priority_queue|pair|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array|tuple|optional|variant|function)\\s*<(?!<)",
-end:">",keywords:u,contains:["self",i]},{begin:e.IDENT_RE+"::",keywords:u},{
+end:">",keywords:p,contains:["self",s]},{begin:e.IDENT_RE+"::",keywords:p},{
 match:[/\b(?:enum(?:\s+(?:class|struct))?|class|struct|union)/,/\s+/,/\w+/],
 className:{1:"keyword",3:"title.class"}}])}}})();hljs.registerLanguage("cpp",e)
 })();
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/crmsh.min.js b/vendor/assets/javascripts/highlightjs/languages/crmsh.min.js
index cc156fe8237..4b313628593 100644
--- a/vendor/assets/javascripts/highlightjs/languages/crmsh.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/crmsh.min.js
@@ -1,4 +1,4 @@
-/*! `crmsh` grammar compiled for Highlight.js 11.6.0 */
+/*! `crmsh` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const t="group clone ms master location colocation order fencing_topology rsc_ticket acl_target acl_group user role tag xml"
 ;return{name:"crmsh",aliases:["crm","pcmk"],case_insensitive:!0,keywords:{
diff --git a/vendor/assets/javascripts/highlightjs/languages/crystal.min.js b/vendor/assets/javascripts/highlightjs/languages/crystal.min.js
index cb1b81f0b83..3121a363654 100644
--- a/vendor/assets/javascripts/highlightjs/languages/crystal.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/crystal.min.js
@@ -1,4 +1,4 @@
-/*! `crystal` grammar compiled for Highlight.js 11.6.0 */
+/*! `crystal` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const n="(_?[ui](8|16|32|64|128))?",i="[a-zA-Z_]\\w*[!?=]?|[-+~]@|<<|>>|[=!]~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~|]|//|//=|&[-+*]=?|&\\*\\*|\\[\\][=?]?",s="[A-Za-z_]\\w*(::\\w+)*(\\?|!)?",a={
 $pattern:"[a-zA-Z_]\\w*[!?=]?",
diff --git a/vendor/assets/javascripts/highlightjs/languages/csharp.min.js b/vendor/assets/javascripts/highlightjs/languages/csharp.min.js
index 898bcf9017c..46e43fe58fa 100644
--- a/vendor/assets/javascripts/highlightjs/languages/csharp.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/csharp.min.js
@@ -1,4 +1,4 @@
-/*! `csharp` grammar compiled for Highlight.js 11.6.0 */
+/*! `csharp` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const n={
 keyword:["abstract","as","base","break","case","catch","class","const","continue","do","else","event","explicit","extern","finally","fixed","for","foreach","goto","if","implicit","in","interface","internal","is","lock","namespace","new","operator","out","override","params","private","protected","public","readonly","record","ref","return","scoped","sealed","sizeof","stackalloc","static","struct","switch","this","throw","try","typeof","unchecked","unsafe","using","virtual","void","volatile","while"].concat(["add","alias","and","ascending","async","await","by","descending","equals","from","get","global","group","init","into","join","let","nameof","not","notnull","on","or","orderby","partial","remove","select","set","unmanaged","value|0","var","when","where","with","yield"]),
 built_in:["bool","byte","char","decimal","delegate","double","dynamic","enum","float","int","long","nint","nuint","object","sbyte","short","string","ulong","uint","ushort"],
diff --git a/vendor/assets/javascripts/highlightjs/languages/csp.min.js b/vendor/assets/javascripts/highlightjs/languages/csp.min.js
index d8fbf412683..e7c97abc8ce 100644
--- a/vendor/assets/javascripts/highlightjs/languages/csp.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/csp.min.js
@@ -1,4 +1,4 @@
-/*! `csp` grammar compiled for Highlight.js 11.6.0 */
+/*! `csp` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var s=(()=>{"use strict";return s=>({name:"CSP",case_insensitive:!1,
 keywords:{$pattern:"[a-zA-Z][a-zA-Z0-9_-]*",
 keyword:["base-uri","child-src","connect-src","default-src","font-src","form-action","frame-ancestors","frame-src","img-src","manifest-src","media-src","object-src","plugin-types","report-uri","sandbox","script-src","style-src","trusted-types","unsafe-hashes","worker-src"]
diff --git a/vendor/assets/javascripts/highlightjs/languages/css.min.js b/vendor/assets/javascripts/highlightjs/languages/css.min.js
index 7d1a8e12762..74ca70f5692 100644
--- a/vendor/assets/javascripts/highlightjs/languages/css.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/css.min.js
@@ -1,4 +1,4 @@
-/*! `css` grammar compiled for Highlight.js 11.6.0 */
+/*! `css` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict"
 ;const e=["a","abbr","address","article","aside","audio","b","blockquote","body","button","canvas","caption","cite","code","dd","del","details","dfn","div","dl","dt","em","fieldset","figcaption","figure","footer","form","h1","h2","h3","h4","h5","h6","header","hgroup","html","i","iframe","img","input","ins","kbd","label","legend","li","main","mark","menu","nav","object","ol","p","q","quote","samp","section","span","strong","summary","sup","table","tbody","td","textarea","tfoot","th","thead","time","tr","ul","var","video"],i=["any-hover","any-pointer","aspect-ratio","color","color-gamut","color-index","device-aspect-ratio","device-height","device-width","display-mode","forced-colors","grid","height","hover","inverted-colors","monochrome","orientation","overflow-block","overflow-inline","pointer","prefers-color-scheme","prefers-contrast","prefers-reduced-motion","prefers-reduced-transparency","resolution","scan","scripting","update","width","min-width","max-width","min-height","max-height"],r=["active","any-link","blank","checked","current","default","defined","dir","disabled","drop","empty","enabled","first","first-child","first-of-type","fullscreen","future","focus","focus-visible","focus-within","has","host","host-context","hover","indeterminate","in-range","invalid","is","lang","last-child","last-of-type","left","link","local-link","not","nth-child","nth-col","nth-last-child","nth-last-col","nth-last-of-type","nth-of-type","only-child","only-of-type","optional","out-of-range","past","placeholder-shown","read-only","read-write","required","right","root","scope","target","target-within","user-invalid","valid","visited","where"],t=["after","backdrop","before","cue","cue-region","first-letter","first-line","grammar-error","marker","part","placeholder","selection","slotted","spelling-error"],o=["align-content","align-items","align-self","all","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","backface-visibility","background","background-attachment","background-blend-mode","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","block-size","border","border-block","border-block-color","border-block-end","border-block-end-color","border-block-end-style","border-block-end-width","border-block-start","border-block-start-color","border-block-start-style","border-block-start-width","border-block-style","border-block-width","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-inline","border-inline-color","border-inline-end","border-inline-end-color","border-inline-end-style","border-inline-end-width","border-inline-start","border-inline-start-color","border-inline-start-style","border-inline-start-width","border-inline-style","border-inline-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","caret-color","clear","clip","clip-path","clip-rule","color","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","contain","content","content-visibility","counter-increment","counter-reset","cue","cue-after","cue-before","cursor","direction","display","empty-cells","filter","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","flow","font","font-display","font-family","font-feature-settings","font-kerning","font-language-override","font-size","font-size-adjust","font-smoothing","font-stretch","font-style","font-synthesis","font-variant","font-variant-caps","font-variant-east-asian","font-variant-ligatures","font-variant-numeric","font-variant-position","font-variation-settings","font-weight","gap","glyph-orientation-vertical","grid","grid-area","grid-auto-columns","grid-auto-flow","grid-auto-rows","grid-column","grid-column-end","grid-column-start","grid-gap","grid-row","grid-row-end","grid-row-start","grid-template","grid-template-areas","grid-template-columns","grid-template-rows","hanging-punctuation","height","hyphens","icon","image-orientation","image-rendering","image-resolution","ime-mode","inline-size","isolation","justify-content","left","letter-spacing","line-break","line-height","list-style","list-style-image","list-style-position","list-style-type","margin","margin-block","margin-block-end","margin-block-start","margin-bottom","margin-inline","margin-inline-end","margin-inline-start","margin-left","margin-right","margin-top","marks","mask","mask-border","mask-border-mode","mask-border-outset","mask-border-repeat","mask-border-slice","mask-border-source","mask-border-width","mask-clip","mask-composite","mask-image","mask-mode","mask-origin","mask-position","mask-repeat","mask-size","mask-type","max-block-size","max-height","max-inline-size","max-width","min-block-size","min-height","min-inline-size","min-width","mix-blend-mode","nav-down","nav-index","nav-left","nav-right","nav-up","none","normal","object-fit","object-position","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-wrap","overflow-x","overflow-y","padding","padding-block","padding-block-end","padding-block-start","padding-bottom","padding-inline","padding-inline-end","padding-inline-start","padding-left","padding-right","padding-top","page-break-after","page-break-before","page-break-inside","pause","pause-after","pause-before","perspective","perspective-origin","pointer-events","position","quotes","resize","rest","rest-after","rest-before","right","row-gap","scroll-margin","scroll-margin-block","scroll-margin-block-end","scroll-margin-block-start","scroll-margin-bottom","scroll-margin-inline","scroll-margin-inline-end","scroll-margin-inline-start","scroll-margin-left","scroll-margin-right","scroll-margin-top","scroll-padding","scroll-padding-block","scroll-padding-block-end","scroll-padding-block-start","scroll-padding-bottom","scroll-padding-inline","scroll-padding-inline-end","scroll-padding-inline-start","scroll-padding-left","scroll-padding-right","scroll-padding-top","scroll-snap-align","scroll-snap-stop","scroll-snap-type","scrollbar-color","scrollbar-gutter","scrollbar-width","shape-image-threshold","shape-margin","shape-outside","speak","speak-as","src","tab-size","table-layout","text-align","text-align-all","text-align-last","text-combine-upright","text-decoration","text-decoration-color","text-decoration-line","text-decoration-style","text-emphasis","text-emphasis-color","text-emphasis-position","text-emphasis-style","text-indent","text-justify","text-orientation","text-overflow","text-rendering","text-shadow","text-transform","text-underline-position","top","transform","transform-box","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","vertical-align","visibility","voice-balance","voice-duration","voice-family","voice-pitch","voice-range","voice-rate","voice-stress","voice-volume","white-space","widows","width","will-change","word-break","word-spacing","word-wrap","writing-mode","z-index"].reverse()
 ;return n=>{const a=n.regex,l=(e=>({IMPORTANT:{scope:"meta",begin:"!important"},
diff --git a/vendor/assets/javascripts/highlightjs/languages/d.min.js b/vendor/assets/javascripts/highlightjs/languages/d.min.js
index f0bba141501..ecc846fd391 100644
--- a/vendor/assets/javascripts/highlightjs/languages/d.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/d.min.js
@@ -1,20 +1,20 @@
-/*! `d` grammar compiled for Highlight.js 11.6.0 */
+/*! `d` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const a={
 $pattern:e.UNDERSCORE_IDENT_RE,
 keyword:"abstract alias align asm assert auto body break byte case cast catch class const continue debug default delete deprecated do else enum export extern final finally for foreach foreach_reverse|10 goto if immutable import in inout int interface invariant is lazy macro mixin module new nothrow out override package pragma private protected public pure ref return scope shared static struct super switch synchronized template this throw try typedef typeid typeof union unittest version void volatile while with __FILE__ __LINE__ __gshared|10 __thread __traits __DATE__ __EOF__ __TIME__ __TIMESTAMP__ __VENDOR__ __VERSION__",
 built_in:"bool cdouble cent cfloat char creal dchar delegate double dstring float function idouble ifloat ireal long real short string ubyte ucent uint ulong ushort wchar wstring",
 literal:"false null true"
-},d="((0|[1-9][\\d_]*)|0[bB][01_]+|0[xX]([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*))",n="\\\\(['\"\\?\\\\abfnrtv]|u[\\dA-Fa-f]{4}|[0-7]{1,3}|x[\\dA-Fa-f]{2}|U[\\dA-Fa-f]{8})|&[a-zA-Z\\d]{2,};",t={
-className:"number",begin:"\\b"+d+"(L|u|U|Lu|LU|uL|UL)?",relevance:0},_={
+},n="(0|[1-9][\\d_]*)",t="(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)",r="([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*)",i="([eE][+-]?"+t+")",s="("+n+"|0[bB][01_]+|0[xX]"+r+")",l="\\\\(['\"\\?\\\\abfnrtv]|u[\\dA-Fa-f]{4}|[0-7]{1,3}|x[\\dA-Fa-f]{2}|U[\\dA-Fa-f]{8})|&[a-zA-Z\\d]{2,};",c={
+className:"number",begin:"\\b"+s+"(L|u|U|Lu|LU|uL|UL)?",relevance:0},_={
 className:"number",
-begin:"\\b(((0[xX](([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*)\\.([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*)|\\.?([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*))[pP][+-]?(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d))|((0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)(\\.\\d*|([eE][+-]?(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)))|\\d+\\.(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)|\\.(0|[1-9][\\d_]*)([eE][+-]?(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d))?))([fF]|L|i|[fF]i|Li)?|"+d+"(i|[fF]i|Li))",
-relevance:0},r={className:"string",begin:"'("+n+"|.)",end:"'",illegal:"."},i={
-className:"string",begin:'"',contains:[{begin:n,relevance:0}],end:'"[cwd]?'
-},s=e.COMMENT("\\/\\+","\\+\\/",{contains:["self"],relevance:10});return{
-name:"D",keywords:a,contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,s,{
-className:"string",begin:'x"[\\da-fA-F\\s\\n\\r]*"[cwd]?',relevance:10},i,{
+begin:"\\b(((0[xX]("+r+"\\."+r+"|\\.?"+r+")[pP][+-]?"+t+")|("+t+"(\\.\\d*|"+i+")|\\d+\\."+t+"|\\."+n+i+"?))([fF]|L|i|[fF]i|Li)?|"+s+"(i|[fF]i|Li))",
+relevance:0},d={className:"string",begin:"'("+l+"|.)",end:"'",illegal:"."},o={
+className:"string",begin:'"',contains:[{begin:l,relevance:0}],end:'"[cwd]?'
+},u=e.COMMENT("\\/\\+","\\+\\/",{contains:["self"],relevance:10});return{
+name:"D",keywords:a,contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,u,{
+className:"string",begin:'x"[\\da-fA-F\\s\\n\\r]*"[cwd]?',relevance:10},o,{
 className:"string",begin:'[rq]"',end:'"[cwd]?',relevance:5},{className:"string",
-begin:"`",end:"`[cwd]?"},{className:"string",begin:'q"\\{',end:'\\}"'},_,t,r,{
+begin:"`",end:"`[cwd]?"},{className:"string",begin:'q"\\{',end:'\\}"'},_,c,d,{
 className:"meta",begin:"^#!",end:"$",relevance:5},{className:"meta",
 begin:"#(line)",end:"$",relevance:5},{className:"keyword",
 begin:"@[a-zA-Z_][a-zA-Z_\\d]*"}]}}})();hljs.registerLanguage("d",e)})();
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/dart.min.js b/vendor/assets/javascripts/highlightjs/languages/dart.min.js
index 7de6698ea5f..5f37af592ad 100644
--- a/vendor/assets/javascripts/highlightjs/languages/dart.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/dart.min.js
@@ -1,4 +1,4 @@
-/*! `dart` grammar compiled for Highlight.js 11.6.0 */
+/*! `dart` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const n={className:"subst",variants:[{
 begin:"\\$[A-Za-z0-9_]+"}]},a={className:"subst",variants:[{begin:/\$\{/,
 end:/\}/}],keywords:"true false null this is new super"},t={className:"string",
@@ -10,7 +10,7 @@ contains:[e.BACKSLASH_ESCAPE,n,a]},{begin:'"',end:'"',illegal:"\\n",
 contains:[e.BACKSLASH_ESCAPE,n,a]}]};a.contains=[e.C_NUMBER_MODE,t]
 ;const i=["Comparable","DateTime","Duration","Function","Iterable","Iterator","List","Map","Match","Object","Pattern","RegExp","Set","Stopwatch","String","StringBuffer","StringSink","Symbol","Type","Uri","bool","double","int","num","Element","ElementList"],r=i.map((e=>e+"?"))
 ;return{name:"Dart",keywords:{
-keyword:["abstract","as","assert","async","await","break","case","catch","class","const","continue","covariant","default","deferred","do","dynamic","else","enum","export","extends","extension","external","factory","false","final","finally","for","Function","get","hide","if","implements","import","in","inferface","is","late","library","mixin","new","null","on","operator","part","required","rethrow","return","set","show","static","super","switch","sync","this","throw","true","try","typedef","var","void","while","with","yield"],
+keyword:["abstract","as","assert","async","await","base","break","case","catch","class","const","continue","covariant","default","deferred","do","dynamic","else","enum","export","extends","extension","external","factory","false","final","finally","for","Function","get","hide","if","implements","import","in","interface","is","late","library","mixin","new","null","on","operator","part","required","rethrow","return","sealed","set","show","static","super","switch","sync","this","throw","true","try","typedef","var","void","when","while","with","yield"],
 built_in:i.concat(r).concat(["Never","Null","dynamic","print","document","querySelector","querySelectorAll","window"]),
 $pattern:/[A-Za-z][A-Za-z0-9_]*\??/},
 contains:[t,e.COMMENT(/\/\*\*(?!\/)/,/\*\//,{subLanguage:"markdown",relevance:0
diff --git a/vendor/assets/javascripts/highlightjs/languages/delphi.min.js b/vendor/assets/javascripts/highlightjs/languages/delphi.min.js
index f52d290620a..884862b245a 100644
--- a/vendor/assets/javascripts/highlightjs/languages/delphi.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/delphi.min.js
@@ -1,4 +1,4 @@
-/*! `delphi` grammar compiled for Highlight.js 11.6.0 */
+/*! `delphi` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const r=["exports","register","file","shl","array","record","property","for","mod","while","set","ally","label","uses","raise","not","stored","class","safecall","var","interface","or","private","static","exit","index","inherited","to","else","stdcall","override","shr","asm","far","resourcestring","finalization","packed","virtual","out","and","protected","library","do","xorwrite","goto","near","function","end","div","overload","object","unit","begin","string","on","inline","repeat","until","destructor","write","message","program","with","read","initialization","except","default","nil","if","case","cdecl","in","downto","threadvar","of","try","pascal","const","external","constructor","type","public","then","implementation","finally","published","procedure","absolute","reintroduce","operator","as","is","abstract","alias","assembler","bitpacked","break","continue","cppdecl","cvar","enumerator","experimental","platform","deprecated","unimplemented","dynamic","export","far16","forward","generic","helper","implements","interrupt","iochecks","local","name","nodefault","noreturn","nostackframe","oldfpccall","otherwise","saveregisters","softfloat","specialize","strict","unaligned","varargs"],a=[e.C_LINE_COMMENT_MODE,e.COMMENT(/\{/,/\}/,{
 relevance:0}),e.COMMENT(/\(\*/,/\*\)/,{relevance:10})],t={className:"meta",
diff --git a/vendor/assets/javascripts/highlightjs/languages/diff.min.js b/vendor/assets/javascripts/highlightjs/languages/diff.min.js
index 8ce10bad388..cc77e0c8f0e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/diff.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/diff.min.js
@@ -1,4 +1,4 @@
-/*! `diff` grammar compiled for Highlight.js 11.6.0 */
+/*! `diff` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const a=e.regex;return{name:"Diff",
 aliases:["patch"],contains:[{className:"meta",relevance:10,
 match:a.either(/^@@ +-\d+,\d+ +\+\d+,\d+ +@@/,/^\*\*\* +\d+,\d+ +\*\*\*\*$/,/^--- +\d+,\d+ +----$/)
diff --git a/vendor/assets/javascripts/highlightjs/languages/django.min.js b/vendor/assets/javascripts/highlightjs/languages/django.min.js
index ce7223ef4f3..8b002c9b660 100644
--- a/vendor/assets/javascripts/highlightjs/languages/django.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/django.min.js
@@ -1,4 +1,4 @@
-/*! `django` grammar compiled for Highlight.js 11.6.0 */
+/*! `django` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const t={begin:/\|[A-Za-z]+:?/,
 keywords:{
 name:"truncatewords removetags linebreaksbr yesno get_digit timesince random striptags filesizeformat escape linebreaks length_is ljust rjust cut urlize fix_ampersands title floatformat capfirst pprint divisibleby add make_list unordered_list urlencode timeuntil urlizetrunc wordcount stringformat linenumbers slice date dictsort dictsortreversed default_if_none pluralize lower join center default truncatewords_html upper length phone2numeric wordwrap time addslashes slugify first escapejs force_escape iriencode last safe safeseq truncatechars localize unlocalize localtime utc timezone"
diff --git a/vendor/assets/javascripts/highlightjs/languages/dns.min.js b/vendor/assets/javascripts/highlightjs/languages/dns.min.js
index 17257eb543d..a932b2baad6 100644
--- a/vendor/assets/javascripts/highlightjs/languages/dns.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/dns.min.js
@@ -1,4 +1,4 @@
-/*! `dns` grammar compiled for Highlight.js 11.6.0 */
+/*! `dns` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var d=(()=>{"use strict";return d=>({name:"DNS Zone",
 aliases:["bind","zone"],
 keywords:["IN","A","AAAA","AFSDB","APL","CAA","CDNSKEY","CDS","CERT","CNAME","DHCID","DLV","DNAME","DNSKEY","DS","HIP","IPSECKEY","KEY","KX","LOC","MX","NAPTR","NS","NSEC","NSEC3","NSEC3PARAM","PTR","RRSIG","RP","SIG","SOA","SRV","SSHFP","TA","TKEY","TLSA","TSIG","TXT"],
diff --git a/vendor/assets/javascripts/highlightjs/languages/dockerfile.min.js b/vendor/assets/javascripts/highlightjs/languages/dockerfile.min.js
index 1819fe08f61..0fa2e7e5ae0 100644
--- a/vendor/assets/javascripts/highlightjs/languages/dockerfile.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/dockerfile.min.js
@@ -1,4 +1,4 @@
-/*! `dockerfile` grammar compiled for Highlight.js 11.6.0 */
+/*! `dockerfile` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"Dockerfile",aliases:["docker"],
 case_insensitive:!0,
 keywords:["from","maintainer","expose","env","arg","user","onbuild","stopsignal"],
diff --git a/vendor/assets/javascripts/highlightjs/languages/dos.min.js b/vendor/assets/javascripts/highlightjs/languages/dos.min.js
index 1bd453b3aeb..65f1c44b197 100644
--- a/vendor/assets/javascripts/highlightjs/languages/dos.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/dos.min.js
@@ -1,4 +1,4 @@
-/*! `dos` grammar compiled for Highlight.js 11.6.0 */
+/*! `dos` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const r=e.COMMENT(/^\s*@?rem\b/,/$/,{
 relevance:10});return{name:"Batch file (DOS)",aliases:["bat","cmd"],
 case_insensitive:!0,illegal:/\/\*/,keywords:{
diff --git a/vendor/assets/javascripts/highlightjs/languages/dsconfig.min.js b/vendor/assets/javascripts/highlightjs/languages/dsconfig.min.js
index 6d44ec9a2ab..8e4a5728a6c 100644
--- a/vendor/assets/javascripts/highlightjs/languages/dsconfig.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/dsconfig.min.js
@@ -1,4 +1,4 @@
-/*! `dsconfig` grammar compiled for Highlight.js 11.6.0 */
+/*! `dsconfig` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({keywords:"dsconfig",contains:[{
 className:"keyword",begin:"^dsconfig",end:/\s/,excludeEnd:!0,relevance:10},{
 className:"built_in",begin:/(list|create|get|set|delete)-(\w+)/,end:/\s/,
diff --git a/vendor/assets/javascripts/highlightjs/languages/dts.min.js b/vendor/assets/javascripts/highlightjs/languages/dts.min.js
index 56172fbaa06..d1a2e3243a5 100644
--- a/vendor/assets/javascripts/highlightjs/languages/dts.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/dts.min.js
@@ -1,4 +1,4 @@
-/*! `dts` grammar compiled for Highlight.js 11.6.0 */
+/*! `dts` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const a={className:"string",
 variants:[e.inherit(e.QUOTE_STRING_MODE,{begin:'((u8?|U)|L)?"'}),{
 begin:'(u8?|U)?R"',end:'"',contains:[e.BACKSLASH_ESCAPE]},{begin:"'\\\\?.",
diff --git a/vendor/assets/javascripts/highlightjs/languages/dust.min.js b/vendor/assets/javascripts/highlightjs/languages/dust.min.js
index 9bf6e9cf3b5..03b6abf3c73 100644
--- a/vendor/assets/javascripts/highlightjs/languages/dust.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/dust.min.js
@@ -1,4 +1,4 @@
-/*! `dust` grammar compiled for Highlight.js 11.6.0 */
+/*! `dust` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"Dust",aliases:["dst"],
 case_insensitive:!0,subLanguage:"xml",contains:[{className:"template-tag",
 begin:/\{[#\/]/,end:/\}/,illegal:/;/,contains:[{className:"name",
diff --git a/vendor/assets/javascripts/highlightjs/languages/ebnf.min.js b/vendor/assets/javascripts/highlightjs/languages/ebnf.min.js
index e370dc60485..50547a72863 100644
--- a/vendor/assets/javascripts/highlightjs/languages/ebnf.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/ebnf.min.js
@@ -1,4 +1,4 @@
-/*! `ebnf` grammar compiled for Highlight.js 11.6.0 */
+/*! `ebnf` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const a=e.COMMENT(/\(\*/,/\*\)/)
 ;return{name:"Extended Backus-Naur Form",illegal:/\S/,contains:[a,{
 className:"attribute",begin:/^[ ]*[a-zA-Z]+([\s_-]+[a-zA-Z]+)*/},{begin:/=/,
diff --git a/vendor/assets/javascripts/highlightjs/languages/elixir.min.js b/vendor/assets/javascripts/highlightjs/languages/elixir.min.js
index 85c72151048..0cb2b48f93e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/elixir.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/elixir.min.js
@@ -1,34 +1,34 @@
-/*! `elixir` grammar compiled for Highlight.js 11.6.0 */
+/*! `elixir` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const n=e.regex,a="[a-zA-Z_][a-zA-Z0-9_.]*(!|\\?)?",i={$pattern:a,
 keyword:["after","alias","and","case","catch","cond","defstruct","defguard","do","else","end","fn","for","if","import","in","not","or","quote","raise","receive","require","reraise","rescue","try","unless","unquote","unquote_splicing","use","when","with|0"],
 literal:["false","nil","true"]},s={className:"subst",begin:/#\{/,end:/\}/,
-keywords:i},c={match:/\\[\s\S]/,scope:"char.escape",relevance:0},r=[{begin:/"/,
-end:/"/},{begin:/'/,end:/'/},{begin:/\//,end:/\//},{begin:/\|/,end:/\|/},{
-begin:/\(/,end:/\)/},{begin:/\[/,end:/\]/},{begin:/\{/,end:/\}/},{begin:/</,
-end:/>/}],t=e=>({scope:"char.escape",begin:n.concat(/\\/,e),relevance:0}),d={
-className:"string",begin:"~[a-z](?=[/|([{<\"'])",
-contains:r.map((n=>e.inherit(n,{contains:[t(n.end),c,s]})))},o={
-className:"string",begin:"~[A-Z](?=[/|([{<\"'])",
-contains:r.map((n=>e.inherit(n,{contains:[t(n.end)]})))},b={className:"regex",
-variants:[{begin:"~r(?=[/|([{<\"'])",contains:r.map((a=>e.inherit(a,{
-end:n.concat(a.end,/[uismxfU]{0,7}/),contains:[t(a.end),c,s]})))},{
-begin:"~R(?=[/|([{<\"'])",contains:r.map((a=>e.inherit(a,{
-end:n.concat(a.end,/[uismxfU]{0,7}/),contains:[t(a.end)]})))}]},g={
+keywords:i},c={match:/\\[\s\S]/,scope:"char.escape",relevance:0
+},r="[/|([{<\"']",t=[{begin:/"/,end:/"/},{begin:/'/,end:/'/},{begin:/\//,
+end:/\//},{begin:/\|/,end:/\|/},{begin:/\(/,end:/\)/},{begin:/\[/,end:/\]/},{
+begin:/\{/,end:/\}/},{begin:/</,end:/>/}],d=e=>({scope:"char.escape",
+begin:n.concat(/\\/,e),relevance:0}),o={className:"string",
+begin:"~[a-z](?="+r+")",contains:t.map((n=>e.inherit(n,{contains:[d(n.end),c,s]
+})))},b={className:"string",begin:"~[A-Z](?="+r+")",
+contains:t.map((n=>e.inherit(n,{contains:[d(n.end)]})))},g={className:"regex",
+variants:[{begin:"~r(?="+r+")",contains:t.map((a=>e.inherit(a,{
+end:n.concat(a.end,/[uismxfU]{0,7}/),contains:[d(a.end),c,s]})))},{
+begin:"~R(?="+r+")",contains:t.map((a=>e.inherit(a,{
+end:n.concat(a.end,/[uismxfU]{0,7}/),contains:[d(a.end)]})))}]},l={
 className:"string",contains:[e.BACKSLASH_ESCAPE,s],variants:[{begin:/"""/,
 end:/"""/},{begin:/'''/,end:/'''/},{begin:/~S"""/,end:/"""/,contains:[]},{
 begin:/~S"/,end:/"/,contains:[]},{begin:/~S'''/,end:/'''/,contains:[]},{
-begin:/~S'/,end:/'/,contains:[]},{begin:/'/,end:/'/},{begin:/"/,end:/"/}]},l={
+begin:/~S'/,end:/'/,contains:[]},{begin:/'/,end:/'/},{begin:/"/,end:/"/}]},m={
 className:"function",beginKeywords:"def defp defmacro defmacrop",end:/\B\b/,
-contains:[e.inherit(e.TITLE_MODE,{begin:a,endsParent:!0})]},m=e.inherit(l,{
+contains:[e.inherit(e.TITLE_MODE,{begin:a,endsParent:!0})]},u=e.inherit(m,{
 className:"class",beginKeywords:"defimpl defmodule defprotocol defrecord",
-end:/\bdo\b|$|;/}),u=[g,b,o,d,e.HASH_COMMENT_MODE,m,l,{begin:"::"},{
-className:"symbol",begin:":(?![\\s:])",contains:[g,{
+end:/\bdo\b|$|;/}),f=[l,g,b,o,e.HASH_COMMENT_MODE,u,m,{begin:"::"},{
+className:"symbol",begin:":(?![\\s:])",contains:[l,{
 begin:"[a-zA-Z_]\\w*[!?=]?|[-+~]@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?"
 }],relevance:0},{className:"symbol",begin:a+":(?!:)",relevance:0},{
 className:"title.class",begin:/(\b[A-Z][a-zA-Z0-9_]+)/,relevance:0},{
 className:"number",
 begin:"(\\b0o[0-7_]+)|(\\b0b[01_]+)|(\\b0x[0-9a-fA-F_]+)|(-?\\b[0-9][0-9_]*(\\.[0-9_]+([eE][-+]?[0-9]+)?)?)",
 relevance:0},{className:"variable",begin:"(\\$\\W)|((\\$|@@?)(\\w+))"}]
-;return s.contains=u,{name:"Elixir",aliases:["ex","exs"],keywords:i,contains:u}}
+;return s.contains=f,{name:"Elixir",aliases:["ex","exs"],keywords:i,contains:f}}
 })();hljs.registerLanguage("elixir",e)})();
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/elm.min.js b/vendor/assets/javascripts/highlightjs/languages/elm.min.js
index 8960249eadf..4638f2a79fc 100644
--- a/vendor/assets/javascripts/highlightjs/languages/elm.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/elm.min.js
@@ -1,4 +1,4 @@
-/*! `elm` grammar compiled for Highlight.js 11.6.0 */
+/*! `elm` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const n={
 variants:[e.COMMENT("--","$"),e.COMMENT(/\{-/,/-\}/,{contains:["self"]})]},i={
 className:"type",begin:"\\b[A-Z][\\w']*",relevance:0},s={begin:"\\(",end:"\\)",
diff --git a/vendor/assets/javascripts/highlightjs/languages/erb.min.js b/vendor/assets/javascripts/highlightjs/languages/erb.min.js
index 2c968489c3f..11ea8b39b91 100644
--- a/vendor/assets/javascripts/highlightjs/languages/erb.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/erb.min.js
@@ -1,4 +1,4 @@
-/*! `erb` grammar compiled for Highlight.js 11.6.0 */
+/*! `erb` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"ERB",subLanguage:"xml",
 contains:[e.COMMENT("<%#","%>"),{begin:"<%[%=-]?",end:"[%-]?%>",
 subLanguage:"ruby",excludeBegin:!0,excludeEnd:!0}]})})()
diff --git a/vendor/assets/javascripts/highlightjs/languages/erlang-repl.min.js b/vendor/assets/javascripts/highlightjs/languages/erlang-repl.min.js
index 5e5268ebb5a..66c48345dfd 100644
--- a/vendor/assets/javascripts/highlightjs/languages/erlang-repl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/erlang-repl.min.js
@@ -1,4 +1,4 @@
-/*! `erlang-repl` grammar compiled for Highlight.js 11.6.0 */
+/*! `erlang-repl` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const n=e.regex;return{
 name:"Erlang REPL",keywords:{built_in:"spawn spawn_link self",
 keyword:"after and andalso|10 band begin bnot bor bsl bsr bxor case catch cond div end fun if let not of or orelse|10 query receive rem try when xor"
diff --git a/vendor/assets/javascripts/highlightjs/languages/erlang.min.js b/vendor/assets/javascripts/highlightjs/languages/erlang.min.js
index 8a494a0acd3..fd18f6747c8 100644
--- a/vendor/assets/javascripts/highlightjs/languages/erlang.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/erlang.min.js
@@ -1,4 +1,4 @@
-/*! `erlang` grammar compiled for Highlight.js 11.6.0 */
+/*! `erlang` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const n="[a-z'][a-zA-Z0-9_']*",r="("+n+":"+n+"|"+n+")",a={
 keyword:"after and andalso|10 band begin bnot bor bsl bzr bxor case catch cond div end fun if let not of orelse|10 query receive rem try when xor",
diff --git a/vendor/assets/javascripts/highlightjs/languages/excel.min.js b/vendor/assets/javascripts/highlightjs/languages/excel.min.js
index cacbfe486a7..76030fc791a 100644
--- a/vendor/assets/javascripts/highlightjs/languages/excel.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/excel.min.js
@@ -1,4 +1,4 @@
-/*! `excel` grammar compiled for Highlight.js 11.6.0 */
+/*! `excel` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var E=(()=>{"use strict";return E=>({name:"Excel formulae",
 aliases:["xlsx","xls"],case_insensitive:!0,keywords:{$pattern:/[a-zA-Z][\w\.]*/,
 built_in:["ABS","ACCRINT","ACCRINTM","ACOS","ACOSH","ACOT","ACOTH","AGGREGATE","ADDRESS","AMORDEGRC","AMORLINC","AND","ARABIC","AREAS","ASC","ASIN","ASINH","ATAN","ATAN2","ATANH","AVEDEV","AVERAGE","AVERAGEA","AVERAGEIF","AVERAGEIFS","BAHTTEXT","BASE","BESSELI","BESSELJ","BESSELK","BESSELY","BETADIST","BETA.DIST","BETAINV","BETA.INV","BIN2DEC","BIN2HEX","BIN2OCT","BINOMDIST","BINOM.DIST","BINOM.DIST.RANGE","BINOM.INV","BITAND","BITLSHIFT","BITOR","BITRSHIFT","BITXOR","CALL","CEILING","CEILING.MATH","CEILING.PRECISE","CELL","CHAR","CHIDIST","CHIINV","CHITEST","CHISQ.DIST","CHISQ.DIST.RT","CHISQ.INV","CHISQ.INV.RT","CHISQ.TEST","CHOOSE","CLEAN","CODE","COLUMN","COLUMNS","COMBIN","COMBINA","COMPLEX","CONCAT","CONCATENATE","CONFIDENCE","CONFIDENCE.NORM","CONFIDENCE.T","CONVERT","CORREL","COS","COSH","COT","COTH","COUNT","COUNTA","COUNTBLANK","COUNTIF","COUNTIFS","COUPDAYBS","COUPDAYS","COUPDAYSNC","COUPNCD","COUPNUM","COUPPCD","COVAR","COVARIANCE.P","COVARIANCE.S","CRITBINOM","CSC","CSCH","CUBEKPIMEMBER","CUBEMEMBER","CUBEMEMBERPROPERTY","CUBERANKEDMEMBER","CUBESET","CUBESETCOUNT","CUBEVALUE","CUMIPMT","CUMPRINC","DATE","DATEDIF","DATEVALUE","DAVERAGE","DAY","DAYS","DAYS360","DB","DBCS","DCOUNT","DCOUNTA","DDB","DEC2BIN","DEC2HEX","DEC2OCT","DECIMAL","DEGREES","DELTA","DEVSQ","DGET","DISC","DMAX","DMIN","DOLLAR","DOLLARDE","DOLLARFR","DPRODUCT","DSTDEV","DSTDEVP","DSUM","DURATION","DVAR","DVARP","EDATE","EFFECT","ENCODEURL","EOMONTH","ERF","ERF.PRECISE","ERFC","ERFC.PRECISE","ERROR.TYPE","EUROCONVERT","EVEN","EXACT","EXP","EXPON.DIST","EXPONDIST","FACT","FACTDOUBLE","FALSE|0","F.DIST","FDIST","F.DIST.RT","FILTERXML","FIND","FINDB","F.INV","F.INV.RT","FINV","FISHER","FISHERINV","FIXED","FLOOR","FLOOR.MATH","FLOOR.PRECISE","FORECAST","FORECAST.ETS","FORECAST.ETS.CONFINT","FORECAST.ETS.SEASONALITY","FORECAST.ETS.STAT","FORECAST.LINEAR","FORMULATEXT","FREQUENCY","F.TEST","FTEST","FV","FVSCHEDULE","GAMMA","GAMMA.DIST","GAMMADIST","GAMMA.INV","GAMMAINV","GAMMALN","GAMMALN.PRECISE","GAUSS","GCD","GEOMEAN","GESTEP","GETPIVOTDATA","GROWTH","HARMEAN","HEX2BIN","HEX2DEC","HEX2OCT","HLOOKUP","HOUR","HYPERLINK","HYPGEOM.DIST","HYPGEOMDIST","IF","IFERROR","IFNA","IFS","IMABS","IMAGINARY","IMARGUMENT","IMCONJUGATE","IMCOS","IMCOSH","IMCOT","IMCSC","IMCSCH","IMDIV","IMEXP","IMLN","IMLOG10","IMLOG2","IMPOWER","IMPRODUCT","IMREAL","IMSEC","IMSECH","IMSIN","IMSINH","IMSQRT","IMSUB","IMSUM","IMTAN","INDEX","INDIRECT","INFO","INT","INTERCEPT","INTRATE","IPMT","IRR","ISBLANK","ISERR","ISERROR","ISEVEN","ISFORMULA","ISLOGICAL","ISNA","ISNONTEXT","ISNUMBER","ISODD","ISREF","ISTEXT","ISO.CEILING","ISOWEEKNUM","ISPMT","JIS","KURT","LARGE","LCM","LEFT","LEFTB","LEN","LENB","LINEST","LN","LOG","LOG10","LOGEST","LOGINV","LOGNORM.DIST","LOGNORMDIST","LOGNORM.INV","LOOKUP","LOWER","MATCH","MAX","MAXA","MAXIFS","MDETERM","MDURATION","MEDIAN","MID","MIDBs","MIN","MINIFS","MINA","MINUTE","MINVERSE","MIRR","MMULT","MOD","MODE","MODE.MULT","MODE.SNGL","MONTH","MROUND","MULTINOMIAL","MUNIT","N","NA","NEGBINOM.DIST","NEGBINOMDIST","NETWORKDAYS","NETWORKDAYS.INTL","NOMINAL","NORM.DIST","NORMDIST","NORMINV","NORM.INV","NORM.S.DIST","NORMSDIST","NORM.S.INV","NORMSINV","NOT","NOW","NPER","NPV","NUMBERVALUE","OCT2BIN","OCT2DEC","OCT2HEX","ODD","ODDFPRICE","ODDFYIELD","ODDLPRICE","ODDLYIELD","OFFSET","OR","PDURATION","PEARSON","PERCENTILE.EXC","PERCENTILE.INC","PERCENTILE","PERCENTRANK.EXC","PERCENTRANK.INC","PERCENTRANK","PERMUT","PERMUTATIONA","PHI","PHONETIC","PI","PMT","POISSON.DIST","POISSON","POWER","PPMT","PRICE","PRICEDISC","PRICEMAT","PROB","PRODUCT","PROPER","PV","QUARTILE","QUARTILE.EXC","QUARTILE.INC","QUOTIENT","RADIANS","RAND","RANDBETWEEN","RANK.AVG","RANK.EQ","RANK","RATE","RECEIVED","REGISTER.ID","REPLACE","REPLACEB","REPT","RIGHT","RIGHTB","ROMAN","ROUND","ROUNDDOWN","ROUNDUP","ROW","ROWS","RRI","RSQ","RTD","SEARCH","SEARCHB","SEC","SECH","SECOND","SERIESSUM","SHEET","SHEETS","SIGN","SIN","SINH","SKEW","SKEW.P","SLN","SLOPE","SMALL","SQL.REQUEST","SQRT","SQRTPI","STANDARDIZE","STDEV","STDEV.P","STDEV.S","STDEVA","STDEVP","STDEVPA","STEYX","SUBSTITUTE","SUBTOTAL","SUM","SUMIF","SUMIFS","SUMPRODUCT","SUMSQ","SUMX2MY2","SUMX2PY2","SUMXMY2","SWITCH","SYD","T","TAN","TANH","TBILLEQ","TBILLPRICE","TBILLYIELD","T.DIST","T.DIST.2T","T.DIST.RT","TDIST","TEXT","TEXTJOIN","TIME","TIMEVALUE","T.INV","T.INV.2T","TINV","TODAY","TRANSPOSE","TREND","TRIM","TRIMMEAN","TRUE|0","TRUNC","T.TEST","TTEST","TYPE","UNICHAR","UNICODE","UPPER","VALUE","VAR","VAR.P","VAR.S","VARA","VARP","VARPA","VDB","VLOOKUP","WEBSERVICE","WEEKDAY","WEEKNUM","WEIBULL","WEIBULL.DIST","WORKDAY","WORKDAY.INTL","XIRR","XNPV","XOR","YEAR","YEARFRAC","YIELD","YIELDDISC","YIELDMAT","Z.TEST","ZTEST"]
diff --git a/vendor/assets/javascripts/highlightjs/languages/fix.min.js b/vendor/assets/javascripts/highlightjs/languages/fix.min.js
index 29494c89244..04d16462faa 100644
--- a/vendor/assets/javascripts/highlightjs/languages/fix.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/fix.min.js
@@ -1,4 +1,4 @@
-/*! `fix` grammar compiled for Highlight.js 11.6.0 */
+/*! `fix` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"FIX",contains:[{
 begin:/[^\u2401\u0001]+/,end:/[\u2401\u0001]/,excludeEnd:!0,returnBegin:!0,
 returnEnd:!1,contains:[{begin:/([^\u2401\u0001=]+)/,end:/=([^\u2401\u0001=]+)/,
diff --git a/vendor/assets/javascripts/highlightjs/languages/flix.min.js b/vendor/assets/javascripts/highlightjs/languages/flix.min.js
index 8fc39e17963..4f1bad36d4c 100644
--- a/vendor/assets/javascripts/highlightjs/languages/flix.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/flix.min.js
@@ -1,4 +1,4 @@
-/*! `flix` grammar compiled for Highlight.js 11.6.0 */
+/*! `flix` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"Flix",keywords:{
 keyword:["case","class","def","else","enum","if","impl","import","in","lat","rel","index","let","match","namespace","switch","type","yield","with"],
 literal:["true","false"]},
diff --git a/vendor/assets/javascripts/highlightjs/languages/fortran.min.js b/vendor/assets/javascripts/highlightjs/languages/fortran.min.js
index 53461bd39f7..719ba884352 100644
--- a/vendor/assets/javascripts/highlightjs/languages/fortran.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/fortran.min.js
@@ -1,4 +1,4 @@
-/*! `fortran` grammar compiled for Highlight.js 11.6.0 */
+/*! `fortran` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const n=e.regex,a={
 variants:[e.COMMENT("!","$",{relevance:0}),e.COMMENT("^C[ ]","$",{relevance:0
 }),e.COMMENT("^C$","$",{relevance:0})]
diff --git a/vendor/assets/javascripts/highlightjs/languages/fsharp.min.js b/vendor/assets/javascripts/highlightjs/languages/fsharp.min.js
index da2ff229b31..1e2ef43d43a 100644
--- a/vendor/assets/javascripts/highlightjs/languages/fsharp.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/fsharp.min.js
@@ -1,4 +1,4 @@
-/*! `fsharp` grammar compiled for Highlight.js 11.6.0 */
+/*! `fsharp` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";function e(e){
 return RegExp(e.replace(/[-/\\^$*+?.()|[\]{}]/g,"\\$&"),"m")}function n(e){
 return e?"string"==typeof e?e:e.source:null}function t(e){return i("(?=",e,")")}
diff --git a/vendor/assets/javascripts/highlightjs/languages/gams.min.js b/vendor/assets/javascripts/highlightjs/languages/gams.min.js
index 29f9287bdc0..2d51cbb8ecc 100644
--- a/vendor/assets/javascripts/highlightjs/languages/gams.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/gams.min.js
@@ -1,4 +1,4 @@
-/*! `gams` grammar compiled for Highlight.js 11.6.0 */
+/*! `gams` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const a=e.regex,n={
 keyword:"abort acronym acronyms alias all and assign binary card diag display else eq file files for free ge gt if integer le loop lt maximizing minimizing model models ne negative no not option options or ord positive prod put putpage puttl repeat sameas semicont semiint smax smin solve sos1 sos2 sum system table then until using while xor yes",
 literal:"eps inf na",
diff --git a/vendor/assets/javascripts/highlightjs/languages/gauss.min.js b/vendor/assets/javascripts/highlightjs/languages/gauss.min.js
index 0e3418f2519..2c12ba69f4a 100644
--- a/vendor/assets/javascripts/highlightjs/languages/gauss.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/gauss.min.js
@@ -1,4 +1,4 @@
-/*! `gauss` grammar compiled for Highlight.js 11.6.0 */
+/*! `gauss` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const t={
 keyword:"bool break call callexe checkinterrupt clear clearg closeall cls comlog compile continue create debug declare delete disable dlibrary dllcall do dos ed edit else elseif enable end endfor endif endp endo errorlog errorlogat expr external fn for format goto gosub graph if keyword let lib library line load loadarray loadexe loadf loadk loadm loadp loads loadx local locate loopnextindex lprint lpwidth lshow matrix msym ndpclex new open output outwidth plot plotsym pop prcsn print printdos proc push retp return rndcon rndmod rndmult rndseed run save saveall screen scroll setarray show sparse stop string struct system trace trap threadfor threadendfor threadbegin threadjoin threadstat threadend until use while winprint ne ge le gt lt and xor or not eq eqv",
 built_in:"abs acf aconcat aeye amax amean AmericanBinomCall AmericanBinomCall_Greeks AmericanBinomCall_ImpVol AmericanBinomPut AmericanBinomPut_Greeks AmericanBinomPut_ImpVol AmericanBSCall AmericanBSCall_Greeks AmericanBSCall_ImpVol AmericanBSPut AmericanBSPut_Greeks AmericanBSPut_ImpVol amin amult annotationGetDefaults annotationSetBkd annotationSetFont annotationSetLineColor annotationSetLineStyle annotationSetLineThickness annualTradingDays arccos arcsin areshape arrayalloc arrayindex arrayinit arraytomat asciiload asclabel astd astds asum atan atan2 atranspose axmargin balance band bandchol bandcholsol bandltsol bandrv bandsolpd bar base10 begwind besselj bessely beta box boxcox cdfBeta cdfBetaInv cdfBinomial cdfBinomialInv cdfBvn cdfBvn2 cdfBvn2e cdfCauchy cdfCauchyInv cdfChic cdfChii cdfChinc cdfChincInv cdfExp cdfExpInv cdfFc cdfFnc cdfFncInv cdfGam cdfGenPareto cdfHyperGeo cdfLaplace cdfLaplaceInv cdfLogistic cdfLogisticInv cdfmControlCreate cdfMvn cdfMvn2e cdfMvnce cdfMvne cdfMvt2e cdfMvtce cdfMvte cdfN cdfN2 cdfNc cdfNegBinomial cdfNegBinomialInv cdfNi cdfPoisson cdfPoissonInv cdfRayleigh cdfRayleighInv cdfTc cdfTci cdfTnc cdfTvn cdfWeibull cdfWeibullInv cdir ceil ChangeDir chdir chiBarSquare chol choldn cholsol cholup chrs close code cols colsf combinate combinated complex con cond conj cons ConScore contour conv convertsatostr convertstrtosa corrm corrms corrvc corrx corrxs cos cosh counts countwts crossprd crout croutp csrcol csrlin csvReadM csvReadSA cumprodc cumsumc curve cvtos datacreate datacreatecomplex datalist dataload dataloop dataopen datasave date datestr datestring datestrymd dayinyr dayofweek dbAddDatabase dbClose dbCommit dbCreateQuery dbExecQuery dbGetConnectOptions dbGetDatabaseName dbGetDriverName dbGetDrivers dbGetHostName dbGetLastErrorNum dbGetLastErrorText dbGetNumericalPrecPolicy dbGetPassword dbGetPort dbGetTableHeaders dbGetTables dbGetUserName dbHasFeature dbIsDriverAvailable dbIsOpen dbIsOpenError dbOpen dbQueryBindValue dbQueryClear dbQueryCols dbQueryExecPrepared dbQueryFetchAllM dbQueryFetchAllSA dbQueryFetchOneM dbQueryFetchOneSA dbQueryFinish dbQueryGetBoundValue dbQueryGetBoundValues dbQueryGetField dbQueryGetLastErrorNum dbQueryGetLastErrorText dbQueryGetLastInsertID dbQueryGetLastQuery dbQueryGetPosition dbQueryIsActive dbQueryIsForwardOnly dbQueryIsNull dbQueryIsSelect dbQueryIsValid dbQueryPrepare dbQueryRows dbQuerySeek dbQuerySeekFirst dbQuerySeekLast dbQuerySeekNext dbQuerySeekPrevious dbQuerySetForwardOnly dbRemoveDatabase dbRollback dbSetConnectOptions dbSetDatabaseName dbSetHostName dbSetNumericalPrecPolicy dbSetPort dbSetUserName dbTransaction DeleteFile delif delrows denseToSp denseToSpRE denToZero design det detl dfft dffti diag diagrv digamma doswin DOSWinCloseall DOSWinOpen dotfeq dotfeqmt dotfge dotfgemt dotfgt dotfgtmt dotfle dotflemt dotflt dotfltmt dotfne dotfnemt draw drop dsCreate dstat dstatmt dstatmtControlCreate dtdate dtday dttime dttodtv dttostr dttoutc dtvnormal dtvtodt dtvtoutc dummy dummybr dummydn eig eigh eighv eigv elapsedTradingDays endwind envget eof eqSolve eqSolvemt eqSolvemtControlCreate eqSolvemtOutCreate eqSolveset erf erfc erfccplx erfcplx error etdays ethsec etstr EuropeanBinomCall EuropeanBinomCall_Greeks EuropeanBinomCall_ImpVol EuropeanBinomPut EuropeanBinomPut_Greeks EuropeanBinomPut_ImpVol EuropeanBSCall EuropeanBSCall_Greeks EuropeanBSCall_ImpVol EuropeanBSPut EuropeanBSPut_Greeks EuropeanBSPut_ImpVol exctsmpl exec execbg exp extern eye fcheckerr fclearerr feq feqmt fflush fft ffti fftm fftmi fftn fge fgemt fgets fgetsa fgetsat fgetst fgt fgtmt fileinfo filesa fle flemt floor flt fltmt fmod fne fnemt fonts fopen formatcv formatnv fputs fputst fseek fstrerror ftell ftocv ftos ftostrC gamma gammacplx gammaii gausset gdaAppend gdaCreate gdaDStat gdaDStatMat gdaGetIndex gdaGetName gdaGetNames gdaGetOrders gdaGetType gdaGetTypes gdaGetVarInfo gdaIsCplx gdaLoad gdaPack gdaRead gdaReadByIndex gdaReadSome gdaReadSparse gdaReadStruct gdaReportVarInfo gdaSave gdaUpdate gdaUpdateAndPack gdaVars gdaWrite gdaWrite32 gdaWriteSome getarray getdims getf getGAUSShome getmatrix getmatrix4D getname getnamef getNextTradingDay getNextWeekDay getnr getorders getpath getPreviousTradingDay getPreviousWeekDay getRow getscalar3D getscalar4D getTrRow getwind glm gradcplx gradMT gradMTm gradMTT gradMTTm gradp graphprt graphset hasimag header headermt hess hessMT hessMTg hessMTgw hessMTm hessMTmw hessMTT hessMTTg hessMTTgw hessMTTm hessMTw hessp hist histf histp hsec imag indcv indexcat indices indices2 indicesf indicesfn indnv indsav integrate1d integrateControlCreate intgrat2 intgrat3 inthp1 inthp2 inthp3 inthp4 inthpControlCreate intquad1 intquad2 intquad3 intrleav intrleavsa intrsect intsimp inv invpd invswp iscplx iscplxf isden isinfnanmiss ismiss key keyav keyw lag lag1 lagn lapEighb lapEighi lapEighvb lapEighvi lapgEig lapgEigh lapgEighv lapgEigv lapgSchur lapgSvdcst lapgSvds lapgSvdst lapSvdcusv lapSvds lapSvdusv ldlp ldlsol linSolve listwise ln lncdfbvn lncdfbvn2 lncdfmvn lncdfn lncdfn2 lncdfnc lnfact lngammacplx lnpdfmvn lnpdfmvt lnpdfn lnpdft loadd loadstruct loadwind loess loessmt loessmtControlCreate log loglog logx logy lower lowmat lowmat1 ltrisol lu lusol machEpsilon make makevars makewind margin matalloc matinit mattoarray maxbytes maxc maxindc maxv maxvec mbesselei mbesselei0 mbesselei1 mbesseli mbesseli0 mbesseli1 meanc median mergeby mergevar minc minindc minv miss missex missrv moment momentd movingave movingaveExpwgt movingaveWgt nextindex nextn nextnevn nextwind ntos null null1 numCombinations ols olsmt olsmtControlCreate olsqr olsqr2 olsqrmt ones optn optnevn orth outtyp pacf packedToSp packr parse pause pdfCauchy pdfChi pdfExp pdfGenPareto pdfHyperGeo pdfLaplace pdfLogistic pdfn pdfPoisson pdfRayleigh pdfWeibull pi pinv pinvmt plotAddArrow plotAddBar plotAddBox plotAddHist plotAddHistF plotAddHistP plotAddPolar plotAddScatter plotAddShape plotAddTextbox plotAddTS plotAddXY plotArea plotBar plotBox plotClearLayout plotContour plotCustomLayout plotGetDefaults plotHist plotHistF plotHistP plotLayout plotLogLog plotLogX plotLogY plotOpenWindow plotPolar plotSave plotScatter plotSetAxesPen plotSetBar plotSetBarFill plotSetBarStacked plotSetBkdColor plotSetFill plotSetGrid plotSetLegend plotSetLineColor plotSetLineStyle plotSetLineSymbol plotSetLineThickness plotSetNewWindow plotSetTitle plotSetWhichYAxis plotSetXAxisShow plotSetXLabel plotSetXRange plotSetXTicInterval plotSetXTicLabel plotSetYAxisShow plotSetYLabel plotSetYRange plotSetZAxisShow plotSetZLabel plotSurface plotTS plotXY polar polychar polyeval polygamma polyint polymake polymat polymroot polymult polyroot pqgwin previousindex princomp printfm printfmt prodc psi putarray putf putvals pvCreate pvGetIndex pvGetParNames pvGetParVector pvLength pvList pvPack pvPacki pvPackm pvPackmi pvPacks pvPacksi pvPacksm pvPacksmi pvPutParVector pvTest pvUnpack QNewton QNewtonmt QNewtonmtControlCreate QNewtonmtOutCreate QNewtonSet QProg QProgmt QProgmtInCreate qqr qqre qqrep qr qre qrep qrsol qrtsol qtyr qtyre qtyrep quantile quantiled qyr qyre qyrep qz rank rankindx readr real reclassify reclassifyCuts recode recserar recsercp recserrc rerun rescale reshape rets rev rfft rffti rfftip rfftn rfftnp rfftp rndBernoulli rndBeta rndBinomial rndCauchy rndChiSquare rndCon rndCreateState rndExp rndGamma rndGeo rndGumbel rndHyperGeo rndi rndKMbeta rndKMgam rndKMi rndKMn rndKMnb rndKMp rndKMu rndKMvm rndLaplace rndLCbeta rndLCgam rndLCi rndLCn rndLCnb rndLCp rndLCu rndLCvm rndLogNorm rndMTu rndMVn rndMVt rndn rndnb rndNegBinomial rndp rndPoisson rndRayleigh rndStateSkip rndu rndvm rndWeibull rndWishart rotater round rows rowsf rref sampleData satostrC saved saveStruct savewind scale scale3d scalerr scalinfnanmiss scalmiss schtoc schur searchsourcepath seekr select selif seqa seqm setdif setdifsa setvars setvwrmode setwind shell shiftr sin singleindex sinh sleep solpd sortc sortcc sortd sorthc sorthcc sortind sortindc sortmc sortr sortrc spBiconjGradSol spChol spConjGradSol spCreate spDenseSubmat spDiagRvMat spEigv spEye spLDL spline spLU spNumNZE spOnes spreadSheetReadM spreadSheetReadSA spreadSheetWrite spScale spSubmat spToDense spTrTDense spTScalar spZeros sqpSolve sqpSolveMT sqpSolveMTControlCreate sqpSolveMTlagrangeCreate sqpSolveMToutCreate sqpSolveSet sqrt statements stdc stdsc stocv stof strcombine strindx strlen strput strrindx strsect strsplit strsplitPad strtodt strtof strtofcplx strtriml strtrimr strtrunc strtruncl strtruncpad strtruncr submat subscat substute subvec sumc sumr surface svd svd1 svd2 svdcusv svds svdusv sysstate tab tan tanh tempname time timedt timestr timeutc title tkf2eps tkf2ps tocart todaydt toeplitz token topolar trapchk trigamma trimr trunc type typecv typef union unionsa uniqindx uniqindxsa unique uniquesa upmat upmat1 upper utctodt utctodtv utrisol vals varCovMS varCovXS varget vargetl varmall varmares varput varputl vartypef vcm vcms vcx vcxs vec vech vecr vector vget view viewxyz vlist vnamecv volume vput vread vtypecv wait waitc walkindex where window writer xlabel xlsGetSheetCount xlsGetSheetSize xlsGetSheetTypes xlsMakeRange xlsReadM xlsReadSA xlsWrite xlsWriteM xlsWriteSA xpnd xtics xy xyz ylabel ytics zeros zeta zlabel ztics cdfEmpirical dot h5create h5open h5read h5readAttribute h5write h5writeAttribute ldl plotAddErrorBar plotAddSurface plotCDFEmpirical plotSetColormap plotSetContourLabels plotSetLegendFont plotSetTextInterpreter plotSetXTicCount plotSetYTicCount plotSetZLevels powerm strjoin sylvester strtrim",
diff --git a/vendor/assets/javascripts/highlightjs/languages/gcode.min.js b/vendor/assets/javascripts/highlightjs/languages/gcode.min.js
index e1608cdfd8b..838ce3d3dc5 100644
--- a/vendor/assets/javascripts/highlightjs/languages/gcode.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/gcode.min.js
@@ -1,4 +1,4 @@
-/*! `gcode` grammar compiled for Highlight.js 11.6.0 */
+/*! `gcode` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const a=e.inherit(e.C_NUMBER_MODE,{
 begin:"([-+]?((\\.\\d+)|(\\d+)(\\.\\d*)?))|"+e.C_NUMBER_RE
 }),n=[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.COMMENT(/\(/,/\)/),a,e.inherit(e.APOS_STRING_MODE,{
diff --git a/vendor/assets/javascripts/highlightjs/languages/gherkin.min.js b/vendor/assets/javascripts/highlightjs/languages/gherkin.min.js
index db30d32ba0c..d434a932600 100644
--- a/vendor/assets/javascripts/highlightjs/languages/gherkin.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/gherkin.min.js
@@ -1,4 +1,4 @@
-/*! `gherkin` grammar compiled for Highlight.js 11.6.0 */
+/*! `gherkin` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"Gherkin",aliases:["feature"],
 keywords:"Feature Background Ability Business Need Scenario Scenarios Scenario Outline Scenario Template Examples Given And Then But When",
 contains:[{className:"symbol",begin:"\\*",relevance:0},{className:"meta",
diff --git a/vendor/assets/javascripts/highlightjs/languages/glsl.min.js b/vendor/assets/javascripts/highlightjs/languages/glsl.min.js
index c226b31c564..d62c7b44df4 100644
--- a/vendor/assets/javascripts/highlightjs/languages/glsl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/glsl.min.js
@@ -1,4 +1,4 @@
-/*! `glsl` grammar compiled for Highlight.js 11.6.0 */
+/*! `glsl` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"GLSL",keywords:{
 keyword:"break continue discard do else for if return while switch case default attribute binding buffer ccw centroid centroid varying coherent column_major const cw depth_any depth_greater depth_less depth_unchanged early_fragment_tests equal_spacing flat fractional_even_spacing fractional_odd_spacing highp in index inout invariant invocations isolines layout line_strip lines lines_adjacency local_size_x local_size_y local_size_z location lowp max_vertices mediump noperspective offset origin_upper_left out packed patch pixel_center_integer point_mode points precise precision quads r11f_g11f_b10f r16 r16_snorm r16f r16i r16ui r32f r32i r32ui r8 r8_snorm r8i r8ui readonly restrict rg16 rg16_snorm rg16f rg16i rg16ui rg32f rg32i rg32ui rg8 rg8_snorm rg8i rg8ui rgb10_a2 rgb10_a2ui rgba16 rgba16_snorm rgba16f rgba16i rgba16ui rgba32f rgba32i rgba32ui rgba8 rgba8_snorm rgba8i rgba8ui row_major sample shared smooth std140 std430 stream triangle_strip triangles triangles_adjacency uniform varying vertices volatile writeonly",
 type:"atomic_uint bool bvec2 bvec3 bvec4 dmat2 dmat2x2 dmat2x3 dmat2x4 dmat3 dmat3x2 dmat3x3 dmat3x4 dmat4 dmat4x2 dmat4x3 dmat4x4 double dvec2 dvec3 dvec4 float iimage1D iimage1DArray iimage2D iimage2DArray iimage2DMS iimage2DMSArray iimage2DRect iimage3D iimageBuffer iimageCube iimageCubeArray image1D image1DArray image2D image2DArray image2DMS image2DMSArray image2DRect image3D imageBuffer imageCube imageCubeArray int isampler1D isampler1DArray isampler2D isampler2DArray isampler2DMS isampler2DMSArray isampler2DRect isampler3D isamplerBuffer isamplerCube isamplerCubeArray ivec2 ivec3 ivec4 mat2 mat2x2 mat2x3 mat2x4 mat3 mat3x2 mat3x3 mat3x4 mat4 mat4x2 mat4x3 mat4x4 sampler1D sampler1DArray sampler1DArrayShadow sampler1DShadow sampler2D sampler2DArray sampler2DArrayShadow sampler2DMS sampler2DMSArray sampler2DRect sampler2DRectShadow sampler2DShadow sampler3D samplerBuffer samplerCube samplerCubeArray samplerCubeArrayShadow samplerCubeShadow image1D uimage1DArray uimage2D uimage2DArray uimage2DMS uimage2DMSArray uimage2DRect uimage3D uimageBuffer uimageCube uimageCubeArray uint usampler1D usampler1DArray usampler2D usampler2DArray usampler2DMS usampler2DMSArray usampler2DRect usampler3D samplerBuffer usamplerCube usamplerCubeArray uvec2 uvec3 uvec4 vec2 vec3 vec4 void",
diff --git a/vendor/assets/javascripts/highlightjs/languages/gml.min.js b/vendor/assets/javascripts/highlightjs/languages/gml.min.js
index 3e392cd2b3a..619140f2a74 100644
--- a/vendor/assets/javascripts/highlightjs/languages/gml.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/gml.min.js
@@ -1,4 +1,4 @@
-/*! `gml` grammar compiled for Highlight.js 11.6.0 */
+/*! `gml` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"GML",case_insensitive:!1,
 keywords:{
 keyword:["#endregion","#macro","#region","and","begin","break","case","constructor","continue","default","delete","div","do","else","end","enum","exit","for","function","globalvar","if","mod","not","or","repeat","return","switch","then","until","var","while","with","xor"],
diff --git a/vendor/assets/javascripts/highlightjs/languages/go.min.js b/vendor/assets/javascripts/highlightjs/languages/go.min.js
index 1801d1b3574..8efbcffef78 100644
--- a/vendor/assets/javascripts/highlightjs/languages/go.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/go.min.js
@@ -1,4 +1,4 @@
-/*! `go` grammar compiled for Highlight.js 11.6.0 */
+/*! `go` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const n={
 keyword:["break","case","chan","const","continue","default","defer","else","fallthrough","for","func","go","goto","if","import","interface","map","package","range","return","select","struct","switch","type","var"],
 type:["bool","byte","complex64","complex128","error","float32","float64","int8","int16","int32","int64","string","uint8","uint16","uint32","uint64","int","uint","uintptr","rune"],
diff --git a/vendor/assets/javascripts/highlightjs/languages/golo.min.js b/vendor/assets/javascripts/highlightjs/languages/golo.min.js
index 6ef6787fd8b..b69e5ce2c7c 100644
--- a/vendor/assets/javascripts/highlightjs/languages/golo.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/golo.min.js
@@ -1,4 +1,4 @@
-/*! `golo` grammar compiled for Highlight.js 11.6.0 */
+/*! `golo` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"Golo",keywords:{
 keyword:["println","readln","print","import","module","function","local","return","let","var","while","for","foreach","times","in","case","when","match","with","break","continue","augment","augmentation","each","find","filter","reduce","if","then","else","otherwise","try","catch","finally","raise","throw","orIfNull","DynamicObject|10","DynamicVariable","struct","Observable","map","set","vector","list","array"],
 literal:["true","false","null"]},
diff --git a/vendor/assets/javascripts/highlightjs/languages/gradle.min.js b/vendor/assets/javascripts/highlightjs/languages/gradle.min.js
index 3d6866e4f01..a96146f6a2f 100644
--- a/vendor/assets/javascripts/highlightjs/languages/gradle.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/gradle.min.js
@@ -1,4 +1,4 @@
-/*! `gradle` grammar compiled for Highlight.js 11.6.0 */
+/*! `gradle` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"Gradle",case_insensitive:!0,
 keywords:["task","project","allprojects","subprojects","artifacts","buildscript","configurations","dependencies","repositories","sourceSets","description","delete","from","into","include","exclude","source","classpath","destinationDir","includes","options","sourceCompatibility","targetCompatibility","group","flatDir","doLast","doFirst","flatten","todir","fromdir","ant","def","abstract","break","case","catch","continue","default","do","else","extends","final","finally","for","if","implements","instanceof","native","new","private","protected","public","return","static","switch","synchronized","throw","throws","transient","try","volatile","while","strictfp","package","import","false","null","super","this","true","antlrtask","checkstyle","codenarc","copy","boolean","byte","char","class","double","float","int","interface","long","short","void","compile","runTime","file","fileTree","abs","any","append","asList","asWritable","call","collect","compareTo","count","div","dump","each","eachByte","eachFile","eachLine","every","find","findAll","flatten","getAt","getErr","getIn","getOut","getText","grep","immutable","inject","inspect","intersect","invokeMethods","isCase","join","leftShift","minus","multiply","newInputStream","newOutputStream","newPrintWriter","newReader","newWriter","next","plus","pop","power","previous","print","println","push","putAt","read","readBytes","readLines","reverse","reverseEach","round","size","sort","splitEachLine","step","subMap","times","toInteger","toList","tokenize","upto","waitForOrKill","withPrintWriter","withReader","withStream","withWriter","withWriterAppend","write","writeLine"],
 contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.NUMBER_MODE,e.REGEXP_MODE]
diff --git a/vendor/assets/javascripts/highlightjs/languages/graphql.min.js b/vendor/assets/javascripts/highlightjs/languages/graphql.min.js
index a973a822c5e..874780c62cd 100644
--- a/vendor/assets/javascripts/highlightjs/languages/graphql.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/graphql.min.js
@@ -1,4 +1,4 @@
-/*! `graphql` grammar compiled for Highlight.js 11.6.0 */
+/*! `graphql` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const a=e.regex;return{name:"GraphQL",
 aliases:["gql"],case_insensitive:!0,disableAutodetect:!1,keywords:{
 keyword:["query","mutation","subscription","type","input","schema","directive","interface","union","scalar","fragment","enum","on"],
diff --git a/vendor/assets/javascripts/highlightjs/languages/groovy.min.js b/vendor/assets/javascripts/highlightjs/languages/groovy.min.js
index 032973615d9..252d886bcef 100644
--- a/vendor/assets/javascripts/highlightjs/languages/groovy.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/groovy.min.js
@@ -1,4 +1,4 @@
-/*! `groovy` grammar compiled for Highlight.js 11.6.0 */
+/*! `groovy` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";function e(e,a={}){return a.variants=e,a}
 return a=>{
 const n=a.regex,t="[A-Za-z0-9_$]+",r=e([a.C_LINE_COMMENT_MODE,a.C_BLOCK_COMMENT_MODE,a.COMMENT("/\\*\\*","\\*/",{
diff --git a/vendor/assets/javascripts/highlightjs/languages/haml.min.js b/vendor/assets/javascripts/highlightjs/languages/haml.min.js
index 8b82dbbafcc..3bee9feba8b 100644
--- a/vendor/assets/javascripts/highlightjs/languages/haml.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/haml.min.js
@@ -1,4 +1,4 @@
-/*! `haml` grammar compiled for Highlight.js 11.6.0 */
+/*! `haml` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"HAML",case_insensitive:!0,
 contains:[{className:"meta",
 begin:"^!!!( (5|1\\.1|Strict|Frameset|Basic|Mobile|RDFa|XML\\b.*))?$",
diff --git a/vendor/assets/javascripts/highlightjs/languages/handlebars.min.js b/vendor/assets/javascripts/highlightjs/languages/handlebars.min.js
index d502bad213b..45c0ddcc278 100644
--- a/vendor/assets/javascripts/highlightjs/languages/handlebars.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/handlebars.min.js
@@ -1,4 +1,4 @@
-/*! `handlebars` grammar compiled for Highlight.js 11.6.0 */
+/*! `handlebars` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const a=e.regex,n={
 $pattern:/[\w.\/]+/,
 built_in:["action","bindattr","collection","component","concat","debugger","each","each-in","get","hash","if","in","input","link-to","loc","log","lookup","mut","outlet","partial","query-params","render","template","textarea","unbound","unless","view","with","yield"]
diff --git a/vendor/assets/javascripts/highlightjs/languages/haskell.min.js b/vendor/assets/javascripts/highlightjs/languages/haskell.min.js
index 59b1355ff72..028db6f61e2 100644
--- a/vendor/assets/javascripts/highlightjs/languages/haskell.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/haskell.min.js
@@ -1,14 +1,14 @@
-/*! `haskell` grammar compiled for Highlight.js 11.6.0 */
+/*! `haskell` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const n={
 variants:[e.COMMENT("--","$"),e.COMMENT(/\{-/,/-\}/,{contains:["self"]})]},a={
-className:"meta",begin:/\{-#/,end:/#-\}/},i={className:"meta",begin:"^#",end:"$"
-},s={className:"type",begin:"\\b[A-Z][\\w']*",relevance:0},l={begin:"\\(",
-end:"\\)",illegal:'"',contains:[a,i,{className:"type",
+className:"meta",begin:/\{-#/,end:/#-\}/},s={className:"meta",begin:"^#",end:"$"
+},i={className:"type",begin:"\\b[A-Z][\\w']*",relevance:0},l={begin:"\\(",
+end:"\\)",illegal:'"',contains:[a,s,{className:"type",
 begin:"\\b[A-Z][\\w]*(\\((\\.\\.|,|\\w+)\\))?"},e.inherit(e.TITLE_MODE,{
-begin:"[_a-z][\\w']*"}),n]},t="([0-9a-fA-F]_*)+",c={className:"number",
-relevance:0,variants:[{
-match:"\\b(([0-9]_*)+)(\\.(([0-9]_*)+))?([eE][+-]?(([0-9]_*)+))?\\b"},{
-match:`\\b0[xX]_*(${t})(\\.(${t}))?([pP][+-]?(([0-9]_*)+))?\\b`},{
+begin:"[_a-z][\\w']*"}),n]},t="([0-9]_*)+",c="([0-9a-fA-F]_*)+",r={
+className:"number",relevance:0,variants:[{
+match:`\\b(${t})(\\.(${t}))?([eE][+-]?(${t}))?\\b`},{
+match:`\\b0[xX]_*(${c})(\\.(${c}))?([pP][+-]?(${t}))?\\b`},{
 match:"\\b0[oO](([0-7]_*)+)\\b"},{match:"\\b0[bB](([01]_*)+)\\b"}]};return{
 name:"Haskell",aliases:["hs"],
 keywords:"let in if then else case of where do module import hiding qualified type data newtype deriving class instance as default infix infixl infixr foreign export ccall stdcall cplusplus jvm dotnet safe unsafe family forall mdo proc rec",
@@ -16,14 +16,15 @@ contains:[{beginKeywords:"module",end:"where",keywords:"module where",
 contains:[l,n],illegal:"\\W\\.|;"},{begin:"\\bimport\\b",end:"$",
 keywords:"import qualified as hiding",contains:[l,n],illegal:"\\W\\.|;"},{
 className:"class",begin:"^(\\s*)?(class|instance)\\b",end:"where",
-keywords:"class family instance where",contains:[s,l,n]},{className:"class",
+keywords:"class family instance where",contains:[i,l,n]},{className:"class",
 begin:"\\b(data|(new)?type)\\b",end:"$",
-keywords:"data family type newtype deriving",contains:[a,s,l,{begin:/\{/,
+keywords:"data family type newtype deriving",contains:[a,i,l,{begin:/\{/,
 end:/\}/,contains:l.contains},n]},{beginKeywords:"default",end:"$",
-contains:[s,l,n]},{beginKeywords:"infix infixl infixr",end:"$",
+contains:[i,l,n]},{beginKeywords:"infix infixl infixr",end:"$",
 contains:[e.C_NUMBER_MODE,n]},{begin:"\\bforeign\\b",end:"$",
 keywords:"foreign import export ccall stdcall cplusplus jvm dotnet safe unsafe",
-contains:[s,e.QUOTE_STRING_MODE,n]},{className:"meta",
-begin:"#!\\/usr\\/bin\\/env runhaskell",end:"$"
-},a,i,e.QUOTE_STRING_MODE,c,s,e.inherit(e.TITLE_MODE,{begin:"^[_a-z][\\w']*"
-}),n,{begin:"->|<-"}]}}})();hljs.registerLanguage("haskell",e)})();
\ No newline at end of file
+contains:[i,e.QUOTE_STRING_MODE,n]},{className:"meta",
+begin:"#!\\/usr\\/bin\\/env runhaskell",end:"$"},a,s,{scope:"string",
+begin:/'(?=\\?.')/,end:/'/,contains:[{scope:"char.escape",match:/\\./}]
+},e.QUOTE_STRING_MODE,r,i,e.inherit(e.TITLE_MODE,{begin:"^[_a-z][\\w']*"}),n,{
+begin:"->|<-"}]}}})();hljs.registerLanguage("haskell",e)})();
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/haxe.min.js b/vendor/assets/javascripts/highlightjs/languages/haxe.min.js
index 5be4b061c01..6e5b37f58a3 100644
--- a/vendor/assets/javascripts/highlightjs/languages/haxe.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/haxe.min.js
@@ -1,4 +1,4 @@
-/*! `haxe` grammar compiled for Highlight.js 11.6.0 */
+/*! `haxe` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"Haxe",aliases:["hx"],keywords:{
 keyword:"break case cast catch continue default do dynamic else enum extern for function here if import in inline never new override package private get set public return static super switch this throw trace try typedef untyped using var while Int Float String Bool Dynamic Void Array ",
 built_in:"trace this",literal:"true false null _"},contains:[{
diff --git a/vendor/assets/javascripts/highlightjs/languages/hsp.min.js b/vendor/assets/javascripts/highlightjs/languages/hsp.min.js
index 23df83671f1..2aca60a63c8 100644
--- a/vendor/assets/javascripts/highlightjs/languages/hsp.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/hsp.min.js
@@ -1,4 +1,4 @@
-/*! `hsp` grammar compiled for Highlight.js 11.6.0 */
+/*! `hsp` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"HSP",case_insensitive:!0,
 keywords:{$pattern:/[\w._]+/,
 keyword:"goto gosub return break repeat loop continue wait await dim sdim foreach dimtype dup dupptr end stop newmod delmod mref run exgoto on mcall assert logmes newlab resume yield onexit onerror onkey onclick oncmd exist delete mkdir chdir dirlist bload bsave bcopy memfile if else poke wpoke lpoke getstr chdpm memexpand memcpy memset notesel noteadd notedel noteload notesave randomize noteunsel noteget split strrep setease button chgdisp exec dialog mmload mmplay mmstop mci pset pget syscolor mes print title pos circle cls font sysfont objsize picload color palcolor palette redraw width gsel gcopy gzoom gmode bmpsave hsvcolor getkey listbox chkbox combox input mesbox buffer screen bgscr mouse objsel groll line clrobj boxf objprm objmode stick grect grotate gsquare gradf objimage objskip objenable celload celdiv celput newcom querycom delcom cnvstow comres axobj winobj sendmsg comevent comevarg sarrayconv callfunc cnvwtos comevdisp libptr system hspstat hspver stat cnt err strsize looplev sublev iparam wparam lparam refstr refdval int rnd strlen length length2 length3 length4 vartype gettime peek wpeek lpeek varptr varuse noteinfo instr abs limit getease str strmid strf getpath strtrim sin cos tan atan sqrt double absf expf logf limitf powf geteasef mousex mousey mousew hwnd hinstance hdc ginfo objinfo dirinfo sysinfo thismod __hspver__ __hsp30__ __date__ __time__ __line__ __file__ _debug __hspdef__ and or xor not screen_normal screen_palette screen_hide screen_fixedsize screen_tool screen_frame gmode_gdi gmode_mem gmode_rgb0 gmode_alpha gmode_rgb0alpha gmode_add gmode_sub gmode_pixela ginfo_mx ginfo_my ginfo_act ginfo_sel ginfo_wx1 ginfo_wy1 ginfo_wx2 ginfo_wy2 ginfo_vx ginfo_vy ginfo_sizex ginfo_sizey ginfo_winx ginfo_winy ginfo_mesx ginfo_mesy ginfo_r ginfo_g ginfo_b ginfo_paluse ginfo_dispx ginfo_dispy ginfo_cx ginfo_cy ginfo_intid ginfo_newid ginfo_sx ginfo_sy objinfo_mode objinfo_bmscr objinfo_hwnd notemax notesize dir_cur dir_exe dir_win dir_sys dir_cmdline dir_desktop dir_mydoc dir_tv font_normal font_bold font_italic font_underline font_strikeout font_antialias objmode_normal objmode_guifont objmode_usefont gsquare_grad msgothic msmincho do until while wend for next _break _continue switch case default swbreak swend ddim ldim alloc m_pi rad2deg deg2rad ease_linear ease_quad_in ease_quad_out ease_quad_inout ease_cubic_in ease_cubic_out ease_cubic_inout ease_quartic_in ease_quartic_out ease_quartic_inout ease_bounce_in ease_bounce_out ease_bounce_inout ease_shake_in ease_shake_out ease_shake_inout ease_loop"
diff --git a/vendor/assets/javascripts/highlightjs/languages/http.min.js b/vendor/assets/javascripts/highlightjs/languages/http.min.js
index bc061ed52f9..cd76e98928e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/http.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/http.min.js
@@ -1,5 +1,5 @@
-/*! `http` grammar compiled for Highlight.js 11.6.0 */
-(()=>{var e=(()=>{"use strict";return e=>{const n="HTTP/(2|1\\.[01])",a={
+/*! `http` grammar compiled for Highlight.js 11.8.0 */
+(()=>{var e=(()=>{"use strict";return e=>{const n="HTTP/([32]|1\\.[01])",a={
 className:"attribute",
 begin:e.regex.concat("^",/[A-Za-z][A-Za-z0-9-]*/,"(?=\\:\\s)"),starts:{
 contains:[{className:"punctuation",begin:/: /,relevance:0,starts:{end:"$",
diff --git a/vendor/assets/javascripts/highlightjs/languages/hy.min.js b/vendor/assets/javascripts/highlightjs/languages/hy.min.js
index 6f905310f06..02e3af0543e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/hy.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/hy.min.js
@@ -1,4 +1,4 @@
-/*! `hy` grammar compiled for Highlight.js 11.6.0 */
+/*! `hy` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const a="a-zA-Z_\\-!.?+*=<>&#'",t="["+a+"]["+a+"0-9/;:]*",i={$pattern:t,
 built_in:"!= % %= & &= * ** **= *= *map + += , --build-class-- --import-- -= . / // //= /= < << <<= <= = > >= >> >>= @ @= ^ ^= abs accumulate all and any ap-compose ap-dotimes ap-each ap-each-while ap-filter ap-first ap-if ap-last ap-map ap-map-when ap-pipe ap-reduce ap-reject apply as-> ascii assert assoc bin break butlast callable calling-module-name car case cdr chain chr coll? combinations compile compress cond cons cons? continue count curry cut cycle dec def default-method defclass defmacro defmacro-alias defmacro/g! defmain defmethod defmulti defn defn-alias defnc defnr defreader defseq del delattr delete-route dict-comp dir disassemble dispatch-reader-macro distinct divmod do doto drop drop-last drop-while empty? end-sequence eval eval-and-compile eval-when-compile even? every? except exec filter first flatten float? fn fnc fnr for for* format fraction genexpr gensym get getattr global globals group-by hasattr hash hex id identity if if* if-not if-python2 import in inc input instance? integer integer-char? integer? interleave interpose is is-coll is-cons is-empty is-even is-every is-float is-instance is-integer is-integer-char is-iterable is-iterator is-keyword is-neg is-none is-not is-numeric is-odd is-pos is-string is-symbol is-zero isinstance islice issubclass iter iterable? iterate iterator? keyword keyword? lambda last len let lif lif-not list* list-comp locals loop macro-error macroexpand macroexpand-1 macroexpand-all map max merge-with method-decorator min multi-decorator multicombinations name neg? next none? nonlocal not not-in not? nth numeric? oct odd? open or ord partition permutations pos? post-route postwalk pow prewalk print product profile/calls profile/cpu put-route quasiquote quote raise range read read-str recursive-replace reduce remove repeat repeatedly repr require rest round route route-with-methods rwm second seq set-comp setattr setv some sorted string string? sum switch symbol? take take-nth take-while tee try unless unquote unquote-splicing vars walk when while with with* with-decorator with-gensyms xi xor yield yield-from zero? zip zip-longest | |= ~"
diff --git a/vendor/assets/javascripts/highlightjs/languages/inform7.min.js b/vendor/assets/javascripts/highlightjs/languages/inform7.min.js
index d9339357777..feb2e367031 100644
--- a/vendor/assets/javascripts/highlightjs/languages/inform7.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/inform7.min.js
@@ -1,4 +1,4 @@
-/*! `inform7` grammar compiled for Highlight.js 11.6.0 */
+/*! `inform7` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"Inform 7",aliases:["i7"],
 case_insensitive:!0,keywords:{
 keyword:"thing room person man woman animal container supporter backdrop door scenery open closed locked inside gender is are say understand kind of rule"
diff --git a/vendor/assets/javascripts/highlightjs/languages/ini.min.js b/vendor/assets/javascripts/highlightjs/languages/ini.min.js
index eaff7983bf2..4479fc64d4c 100644
--- a/vendor/assets/javascripts/highlightjs/languages/ini.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/ini.min.js
@@ -1,4 +1,4 @@
-/*! `ini` grammar compiled for Highlight.js 11.6.0 */
+/*! `ini` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const n=e.regex,a={className:"number",
 relevance:0,variants:[{begin:/([+-]+)?[\d]+_[\d_]+/},{begin:e.NUMBER_RE}]
 },s=e.COMMENT();s.variants=[{begin:/;/,end:/$/},{begin:/#/,end:/$/}];const i={
diff --git a/vendor/assets/javascripts/highlightjs/languages/irpf90.min.js b/vendor/assets/javascripts/highlightjs/languages/irpf90.min.js
index 3d77498c3ec..4c0ca130fc8 100644
--- a/vendor/assets/javascripts/highlightjs/languages/irpf90.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/irpf90.min.js
@@ -1,4 +1,4 @@
-/*! `irpf90` grammar compiled for Highlight.js 11.6.0 */
+/*! `irpf90` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const n=e.regex,t=/(_[a-z_\d]+)?/,a=/([de][+-]?\d+)?/,i={className:"number",
 variants:[{begin:n.concat(/\b\d+/,/\.(\d*)/,a,t)},{begin:n.concat(/\b\d+/,a,t)
diff --git a/vendor/assets/javascripts/highlightjs/languages/isbl.min.js b/vendor/assets/javascripts/highlightjs/languages/isbl.min.js
index e3c3c1f8176..911d8349966 100644
--- a/vendor/assets/javascripts/highlightjs/languages/isbl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/isbl.min.js
@@ -1,4 +1,4 @@
-/*! `isbl` grammar compiled for Highlight.js 11.6.0 */
+/*! `isbl` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var S=(()=>{"use strict";return S=>{
 const E="[A-Za-z\u0410-\u042f\u0430-\u044f\u0451\u0401_!][A-Za-z\u0410-\u042f\u0430-\u044f\u0451\u0401_0-9]*",_={
 className:"number",begin:S.NUMBER_RE,relevance:0},T={className:"string",
diff --git a/vendor/assets/javascripts/highlightjs/languages/java.min.js b/vendor/assets/javascripts/highlightjs/languages/java.min.js
index c9fa8ba7fcb..8873d311f73 100644
--- a/vendor/assets/javascripts/highlightjs/languages/java.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/java.min.js
@@ -1,20 +1,20 @@
-/*! `java` grammar compiled for Highlight.js 11.6.0 */
+/*! `java` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict"
-;var e="\\.([0-9](_*[0-9])*)",a="[0-9a-fA-F](_*[0-9a-fA-F])*",n={
+;var e="[0-9](_*[0-9])*",a=`\\.(${e})`,n="[0-9a-fA-F](_*[0-9a-fA-F])*",s={
 className:"number",variants:[{
-begin:`(\\b([0-9](_*[0-9])*)((${e})|\\.)?|(${e}))[eE][+-]?([0-9](_*[0-9])*)[fFdD]?\\b`
-},{begin:`\\b([0-9](_*[0-9])*)((${e})[fFdD]?\\b|\\.([fFdD]\\b)?)`},{
-begin:`(${e})[fFdD]?\\b`},{begin:"\\b([0-9](_*[0-9])*)[fFdD]\\b"},{
-begin:`\\b0[xX]((${a})\\.?|(${a})?\\.(${a}))[pP][+-]?([0-9](_*[0-9])*)[fFdD]?\\b`
-},{begin:"\\b(0|[1-9](_*[0-9])*)[lL]?\\b"},{begin:`\\b0[xX](${a})[lL]?\\b`},{
+begin:`(\\b(${e})((${a})|\\.)?|(${a}))[eE][+-]?(${e})[fFdD]?\\b`},{
+begin:`\\b(${e})((${a})[fFdD]?\\b|\\.([fFdD]\\b)?)`},{begin:`(${a})[fFdD]?\\b`
+},{begin:`\\b(${e})[fFdD]\\b`},{
+begin:`\\b0[xX]((${n})\\.?|(${n})?\\.(${n}))[pP][+-]?(${e})[fFdD]?\\b`},{
+begin:"\\b(0|[1-9](_*[0-9])*)[lL]?\\b"},{begin:`\\b0[xX](${n})[lL]?\\b`},{
 begin:"\\b0(_*[0-7])*[lL]?\\b"},{begin:"\\b0[bB][01](_*[01])*[lL]?\\b"}],
-relevance:0};function s(e,a,n){return-1===n?"":e.replace(a,(t=>s(e,a,n-1)))}
+relevance:0};function t(e,a,n){return-1===n?"":e.replace(a,(s=>t(e,a,n-1)))}
 return e=>{
-const a=e.regex,t="[\xc0-\u02b8a-zA-Z_$][\xc0-\u02b8a-zA-Z_$0-9]*",i=t+s("(?:<"+t+"~~~(?:\\s*,\\s*"+t+"~~~)*>)?",/~~~/g,2),r={
-keyword:["synchronized","abstract","private","var","static","if","const ","for","while","strictfp","finally","protected","import","native","final","void","enum","else","break","transient","catch","instanceof","volatile","case","assert","package","default","public","try","switch","continue","throws","protected","public","private","module","requires","exports","do","sealed"],
+const a=e.regex,n="[\xc0-\u02b8a-zA-Z_$][\xc0-\u02b8a-zA-Z_$0-9]*",i=n+t("(?:<"+n+"~~~(?:\\s*,\\s*"+n+"~~~)*>)?",/~~~/g,2),r={
+keyword:["synchronized","abstract","private","var","static","if","const ","for","while","strictfp","finally","protected","import","native","final","void","enum","else","break","transient","catch","instanceof","volatile","case","assert","package","default","public","try","switch","continue","throws","protected","public","private","module","requires","exports","do","sealed","yield","permits"],
 literal:["false","true","null"],
 type:["char","boolean","long","float","int","byte","short","double"],
-built_in:["super","this"]},l={className:"meta",begin:"@"+t,contains:[{
+built_in:["super","this"]},l={className:"meta",begin:"@"+n,contains:[{
 begin:/\(/,end:/\)/,contains:["self"]}]},c={className:"params",begin:/\(/,
 end:/\)/,keywords:r,relevance:0,contains:[e.C_BLOCK_COMMENT_MODE],endsParent:!0}
 ;return{name:"Java",aliases:["jsp"],keywords:r,illegal:/<\/|#/,
@@ -24,15 +24,15 @@ begin:/import java\.[a-z]+\./,keywords:"import",relevance:2
 },e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{begin:/"""/,end:/"""/,
 className:"string",contains:[e.BACKSLASH_ESCAPE]
 },e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{
-match:[/\b(?:class|interface|enum|extends|implements|new)/,/\s+/,t],className:{
+match:[/\b(?:class|interface|enum|extends|implements|new)/,/\s+/,n],className:{
 1:"keyword",3:"title.class"}},{match:/non-sealed/,scope:"keyword"},{
-begin:[a.concat(/(?!else)/,t),/\s+/,t,/\s+/,/=(?!=)/],className:{1:"type",
-3:"variable",5:"operator"}},{begin:[/record/,/\s+/,t],className:{1:"keyword",
+begin:[a.concat(/(?!else)/,n),/\s+/,n,/\s+/,/=(?!=)/],className:{1:"type",
+3:"variable",5:"operator"}},{begin:[/record/,/\s+/,n],className:{1:"keyword",
 3:"title.class"},contains:[c,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{
 beginKeywords:"new throw return else",relevance:0},{
 begin:["(?:"+i+"\\s+)",e.UNDERSCORE_IDENT_RE,/\s*(?=\()/],className:{
 2:"title.function"},keywords:r,contains:[{className:"params",begin:/\(/,
 end:/\)/,keywords:r,relevance:0,
-contains:[l,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,n,e.C_BLOCK_COMMENT_MODE]
-},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},n,l]}}})()
+contains:[l,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,s,e.C_BLOCK_COMMENT_MODE]
+},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},s,l]}}})()
 ;hljs.registerLanguage("java",e)})();
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/javascript.min.js b/vendor/assets/javascripts/highlightjs/languages/javascript.min.js
index 865c1106d88..e5b1bafe880 100644
--- a/vendor/assets/javascripts/highlightjs/languages/javascript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/javascript.min.js
@@ -1,77 +1,80 @@
-/*! `javascript` grammar compiled for Highlight.js 11.6.0 */
+/*! `javascript` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict"
-;const e="[A-Za-z$_][0-9A-Za-z$_]*",n=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],a=["true","false","null","undefined","NaN","Infinity"],t=["Object","Function","Boolean","Symbol","Math","Date","Number","BigInt","String","RegExp","Array","Float32Array","Float64Array","Int8Array","Uint8Array","Uint8ClampedArray","Int16Array","Int32Array","Uint16Array","Uint32Array","BigInt64Array","BigUint64Array","Set","Map","WeakSet","WeakMap","ArrayBuffer","SharedArrayBuffer","Atomics","DataView","JSON","Promise","Generator","GeneratorFunction","AsyncFunction","Reflect","Proxy","Intl","WebAssembly"],s=["Error","EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"],r=["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],c=["arguments","this","super","console","window","document","localStorage","module","global"],i=[].concat(r,t,s)
+;const e="[A-Za-z$_][0-9A-Za-z$_]*",n=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],a=["true","false","null","undefined","NaN","Infinity"],t=["Object","Function","Boolean","Symbol","Math","Date","Number","BigInt","String","RegExp","Array","Float32Array","Float64Array","Int8Array","Uint8Array","Uint8ClampedArray","Int16Array","Int32Array","Uint16Array","Uint32Array","BigInt64Array","BigUint64Array","Set","Map","WeakSet","WeakMap","ArrayBuffer","SharedArrayBuffer","Atomics","DataView","JSON","Promise","Generator","GeneratorFunction","AsyncFunction","Reflect","Proxy","Intl","WebAssembly"],s=["Error","EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"],r=["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],c=["arguments","this","super","console","window","document","localStorage","sessionStorage","module","global"],i=[].concat(r,t,s)
 ;return o=>{const l=o.regex,b=e,d={begin:/<[A-Za-z0-9\\._:-]+/,
 end:/\/[A-Za-z0-9\\._:-]+>|\/>/,isTrulyOpeningTag:(e,n)=>{
 const a=e[0].length+e.index,t=e.input[a]
 ;if("<"===t||","===t)return void n.ignoreMatch();let s
 ;">"===t&&(((e,{after:n})=>{const a="</"+e[0].slice(1)
-;return-1!==e.input.indexOf(a,n)})(e,{after:a
-})||n.ignoreMatch()),(s=e.input.substring(a).match(/^\s+extends\s+/))&&0===s.index&&n.ignoreMatch()
+;return-1!==e.input.indexOf(a,n)})(e,{after:a})||n.ignoreMatch())
+;const r=e.input.substring(a)
+;((s=r.match(/^\s*=/))||(s=r.match(/^\s+extends\s+/))&&0===s.index)&&n.ignoreMatch()
 }},g={$pattern:e,keyword:n,literal:a,built_in:i,"variable.language":c
-},u="\\.([0-9](_?[0-9])*)",m="0|[1-9](_?[0-9])*|0[0-7]*[89][0-9]*",E={
+},u="[0-9](_?[0-9])*",m=`\\.(${u})`,E="0|[1-9](_?[0-9])*|0[0-7]*[89][0-9]*",A={
 className:"number",variants:[{
-begin:`(\\b(${m})((${u})|\\.)?|(${u}))[eE][+-]?([0-9](_?[0-9])*)\\b`},{
-begin:`\\b(${m})\\b((${u})\\b|\\.)?|(${u})\\b`},{
+begin:`(\\b(${E})((${m})|\\.)?|(${m}))[eE][+-]?(${u})\\b`},{
+begin:`\\b(${E})\\b((${m})\\b|\\.)?|(${m})\\b`},{
 begin:"\\b(0|[1-9](_?[0-9])*)n\\b"},{
 begin:"\\b0[xX][0-9a-fA-F](_?[0-9a-fA-F])*n?\\b"},{
 begin:"\\b0[bB][0-1](_?[0-1])*n?\\b"},{begin:"\\b0[oO][0-7](_?[0-7])*n?\\b"},{
-begin:"\\b0[0-7]+n?\\b"}],relevance:0},A={className:"subst",begin:"\\$\\{",
-end:"\\}",keywords:g,contains:[]},y={begin:"html`",end:"",starts:{end:"`",
-returnEnd:!1,contains:[o.BACKSLASH_ESCAPE,A],subLanguage:"xml"}},N={
+begin:"\\b0[0-7]+n?\\b"}],relevance:0},y={className:"subst",begin:"\\$\\{",
+end:"\\}",keywords:g,contains:[]},h={begin:"html`",end:"",starts:{end:"`",
+returnEnd:!1,contains:[o.BACKSLASH_ESCAPE,y],subLanguage:"xml"}},N={
 begin:"css`",end:"",starts:{end:"`",returnEnd:!1,
-contains:[o.BACKSLASH_ESCAPE,A],subLanguage:"css"}},_={className:"string",
-begin:"`",end:"`",contains:[o.BACKSLASH_ESCAPE,A]},f={className:"comment",
+contains:[o.BACKSLASH_ESCAPE,y],subLanguage:"css"}},_={begin:"gql`",end:"",
+starts:{end:"`",returnEnd:!1,contains:[o.BACKSLASH_ESCAPE,y],
+subLanguage:"graphql"}},f={className:"string",begin:"`",end:"`",
+contains:[o.BACKSLASH_ESCAPE,y]},v={className:"comment",
 variants:[o.COMMENT(/\/\*\*(?!\/)/,"\\*/",{relevance:0,contains:[{
 begin:"(?=@[A-Za-z]+)",relevance:0,contains:[{className:"doctag",
 begin:"@[A-Za-z]+"},{className:"type",begin:"\\{",end:"\\}",excludeEnd:!0,
 excludeBegin:!0,relevance:0},{className:"variable",begin:b+"(?=\\s*(-)|$)",
 endsParent:!0,relevance:0},{begin:/(?=[^\n])\s/,relevance:0}]}]
 }),o.C_BLOCK_COMMENT_MODE,o.C_LINE_COMMENT_MODE]
-},h=[o.APOS_STRING_MODE,o.QUOTE_STRING_MODE,y,N,_,E];A.contains=h.concat({
-begin:/\{/,end:/\}/,keywords:g,contains:["self"].concat(h)})
-;const v=[].concat(f,A.contains),p=v.concat([{begin:/\(/,end:/\)/,keywords:g,
-contains:["self"].concat(v)}]),S={className:"params",begin:/\(/,end:/\)/,
-excludeBegin:!0,excludeEnd:!0,keywords:g,contains:p},w={variants:[{
+},p=[o.APOS_STRING_MODE,o.QUOTE_STRING_MODE,h,N,_,f,{match:/\$\d+/},A]
+;y.contains=p.concat({begin:/\{/,end:/\}/,keywords:g,contains:["self"].concat(p)
+});const S=[].concat(v,y.contains),w=S.concat([{begin:/\(/,end:/\)/,keywords:g,
+contains:["self"].concat(S)}]),R={className:"params",begin:/\(/,end:/\)/,
+excludeBegin:!0,excludeEnd:!0,keywords:g,contains:w},O={variants:[{
 match:[/class/,/\s+/,b,/\s+/,/extends/,/\s+/,l.concat(b,"(",l.concat(/\./,b),")*")],
 scope:{1:"keyword",3:"title.class",5:"keyword",7:"title.class.inherited"}},{
-match:[/class/,/\s+/,b],scope:{1:"keyword",3:"title.class"}}]},R={relevance:0,
+match:[/class/,/\s+/,b],scope:{1:"keyword",3:"title.class"}}]},k={relevance:0,
 match:l.either(/\bJSON/,/\b[A-Z][a-z]+([A-Z][a-z]*|\d)*/,/\b[A-Z]{2,}([A-Z][a-z]+|\d)+([A-Z][a-z]*)*/,/\b[A-Z]{2,}[a-z]+([A-Z][a-z]+|\d)*([A-Z][a-z]*)*/),
-className:"title.class",keywords:{_:[...t,...s]}},O={variants:[{
+className:"title.class",keywords:{_:[...t,...s]}},I={variants:[{
 match:[/function/,/\s+/,b,/(?=\s*\()/]},{match:[/function/,/\s*(?=\()/]}],
-className:{1:"keyword",3:"title.function"},label:"func.def",contains:[S],
-illegal:/%/},k={
-match:l.concat(/\b/,(I=[...r,"super"],l.concat("(?!",I.join("|"),")")),b,l.lookahead(/\(/)),
-className:"title.function",relevance:0};var I;const x={
+className:{1:"keyword",3:"title.function"},label:"func.def",contains:[R],
+illegal:/%/},x={
+match:l.concat(/\b/,(T=[...r,"super","import"],l.concat("(?!",T.join("|"),")")),b,l.lookahead(/\(/)),
+className:"title.function",relevance:0};var T;const C={
 begin:l.concat(/\./,l.lookahead(l.concat(b,/(?![0-9A-Za-z$_(])/))),end:b,
-excludeBegin:!0,keywords:"prototype",className:"property",relevance:0},T={
+excludeBegin:!0,keywords:"prototype",className:"property",relevance:0},M={
 match:[/get|set/,/\s+/,b,/(?=\()/],className:{1:"keyword",3:"title.function"},
-contains:[{begin:/\(\)/},S]
-},C="(\\([^()]*(\\([^()]*(\\([^()]*\\)[^()]*)*\\)[^()]*)*\\)|"+o.UNDERSCORE_IDENT_RE+")\\s*=>",M={
-match:[/const|var|let/,/\s+/,b,/\s*/,/=\s*/,/(async\s*)?/,l.lookahead(C)],
-keywords:"async",className:{1:"keyword",3:"title.function"},contains:[S]}
-;return{name:"Javascript",aliases:["js","jsx","mjs","cjs"],keywords:g,exports:{
-PARAMS_CONTAINS:p,CLASS_REFERENCE:R},illegal:/#(?![$_A-z])/,
+contains:[{begin:/\(\)/},R]
+},B="(\\([^()]*(\\([^()]*(\\([^()]*\\)[^()]*)*\\)[^()]*)*\\)|"+o.UNDERSCORE_IDENT_RE+")\\s*=>",$={
+match:[/const|var|let/,/\s+/,b,/\s*/,/=\s*/,/(async\s*)?/,l.lookahead(B)],
+keywords:"async",className:{1:"keyword",3:"title.function"},contains:[R]}
+;return{name:"JavaScript",aliases:["js","jsx","mjs","cjs"],keywords:g,exports:{
+PARAMS_CONTAINS:w,CLASS_REFERENCE:k},illegal:/#(?![$_A-z])/,
 contains:[o.SHEBANG({label:"shebang",binary:"node",relevance:5}),{
 label:"use_strict",className:"meta",relevance:10,
 begin:/^\s*['"]use (strict|asm)['"]/
-},o.APOS_STRING_MODE,o.QUOTE_STRING_MODE,y,N,_,f,E,R,{className:"attr",
-begin:b+l.lookahead(":"),relevance:0},M,{
+},o.APOS_STRING_MODE,o.QUOTE_STRING_MODE,h,N,_,f,v,{match:/\$\d+/},A,k,{
+className:"attr",begin:b+l.lookahead(":"),relevance:0},$,{
 begin:"("+o.RE_STARTERS_RE+"|\\b(case|return|throw)\\b)\\s*",
-keywords:"return throw case",relevance:0,contains:[f,o.REGEXP_MODE,{
-className:"function",begin:C,returnBegin:!0,end:"\\s*=>",contains:[{
+keywords:"return throw case",relevance:0,contains:[v,o.REGEXP_MODE,{
+className:"function",begin:B,returnBegin:!0,end:"\\s*=>",contains:[{
 className:"params",variants:[{begin:o.UNDERSCORE_IDENT_RE,relevance:0},{
 className:null,begin:/\(\s*\)/,skip:!0},{begin:/\(/,end:/\)/,excludeBegin:!0,
-excludeEnd:!0,keywords:g,contains:p}]}]},{begin:/,/,relevance:0},{match:/\s+/,
+excludeEnd:!0,keywords:g,contains:w}]}]},{begin:/,/,relevance:0},{match:/\s+/,
 relevance:0},{variants:[{begin:"<>",end:"</>"},{
 match:/<[A-Za-z0-9\\._:-]+\s*\/>/},{begin:d.begin,
 "on:begin":d.isTrulyOpeningTag,end:d.end}],subLanguage:"xml",contains:[{
-begin:d.begin,end:d.end,skip:!0,contains:["self"]}]}]},O,{
+begin:d.begin,end:d.end,skip:!0,contains:["self"]}]}]},I,{
 beginKeywords:"while if switch catch for"},{
 begin:"\\b(?!function)"+o.UNDERSCORE_IDENT_RE+"\\([^()]*(\\([^()]*(\\([^()]*\\)[^()]*)*\\)[^()]*)*\\)\\s*\\{",
-returnBegin:!0,label:"func.def",contains:[S,o.inherit(o.TITLE_MODE,{begin:b,
-className:"title.function"})]},{match:/\.\.\./,relevance:0},x,{match:"\\$"+b,
+returnBegin:!0,label:"func.def",contains:[R,o.inherit(o.TITLE_MODE,{begin:b,
+className:"title.function"})]},{match:/\.\.\./,relevance:0},C,{match:"\\$"+b,
 relevance:0},{match:[/\bconstructor(?=\s*\()/],className:{1:"title.function"},
-contains:[S]},k,{relevance:0,match:/\b[A-Z][A-Z_0-9]+\b/,
-className:"variable.constant"},w,T,{match:/\$[(.]/}]}}})()
+contains:[R]},x,{relevance:0,match:/\b[A-Z][A-Z_0-9]+\b/,
+className:"variable.constant"},O,M,{match:/\$[(.]/}]}}})()
 ;hljs.registerLanguage("javascript",e)})();
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/jboss-cli.min.js b/vendor/assets/javascripts/highlightjs/languages/jboss-cli.min.js
index 780f5f99658..76dbf01803c 100644
--- a/vendor/assets/javascripts/highlightjs/languages/jboss-cli.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/jboss-cli.min.js
@@ -1,4 +1,4 @@
-/*! `jboss-cli` grammar compiled for Highlight.js 11.6.0 */
+/*! `jboss-cli` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"JBoss CLI",
 aliases:["wildfly-cli"],keywords:{$pattern:"[a-z-]+",
 keyword:"alias batch cd clear command connect connection-factory connection-info data-source deploy deployment-info deployment-overlay echo echo-dmr help history if jdbc-driver-info jms-queue|20 jms-topic|20 ls patch pwd quit read-attribute read-operation reload rollout-plan run-batch set shutdown try unalias undeploy unset version xa-data-source",
diff --git a/vendor/assets/javascripts/highlightjs/languages/json.min.js b/vendor/assets/javascripts/highlightjs/languages/json.min.js
index 80be9076d1e..5777b2604ef 100644
--- a/vendor/assets/javascripts/highlightjs/languages/json.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/json.min.js
@@ -1,4 +1,4 @@
-/*! `json` grammar compiled for Highlight.js 11.6.0 */
+/*! `json` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const a=["true","false","null"],n={
 scope:"literal",beginKeywords:a.join(" ")};return{name:"JSON",keywords:{
 literal:a},contains:[{className:"attr",begin:/"(\\.|[^\\"\r\n])*"(?=\s*:)/,
diff --git a/vendor/assets/javascripts/highlightjs/languages/julia-repl.min.js b/vendor/assets/javascripts/highlightjs/languages/julia-repl.min.js
index 78ebec82755..b230f8ac988 100644
--- a/vendor/assets/javascripts/highlightjs/languages/julia-repl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/julia-repl.min.js
@@ -1,4 +1,4 @@
-/*! `julia-repl` grammar compiled for Highlight.js 11.6.0 */
+/*! `julia-repl` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var a=(()=>{"use strict";return a=>({name:"Julia REPL",contains:[{
 className:"meta.prompt",begin:/^julia>/,relevance:10,starts:{end:/^(?![ ]{6})/,
 subLanguage:"julia"}}],aliases:["jldoctest"]})})()
diff --git a/vendor/assets/javascripts/highlightjs/languages/julia.min.js b/vendor/assets/javascripts/highlightjs/languages/julia.min.js
index 72dd8b5fbdc..b1b4ad6f120 100644
--- a/vendor/assets/javascripts/highlightjs/languages/julia.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/julia.min.js
@@ -1,4 +1,4 @@
-/*! `julia` grammar compiled for Highlight.js 11.6.0 */
+/*! `julia` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const r="[A-Za-z_\\u00A1-\\uFFFF][A-Za-z_0-9\\u00A1-\\uFFFF]*",t={$pattern:r,
 keyword:["baremodule","begin","break","catch","ccall","const","continue","do","else","elseif","end","export","false","finally","for","function","global","if","import","in","isa","let","local","macro","module","quote","return","true","try","using","where","while"],
diff --git a/vendor/assets/javascripts/highlightjs/languages/kotlin.min.js b/vendor/assets/javascripts/highlightjs/languages/kotlin.min.js
index 9f5fe7701af..d201e5cab36 100644
--- a/vendor/assets/javascripts/highlightjs/languages/kotlin.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/kotlin.min.js
@@ -1,17 +1,17 @@
-/*! `kotlin` grammar compiled for Highlight.js 11.6.0 */
+/*! `kotlin` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict"
-;var e="\\.([0-9](_*[0-9])*)",n="[0-9a-fA-F](_*[0-9a-fA-F])*",a={
+;var e="[0-9](_*[0-9])*",n=`\\.(${e})`,a="[0-9a-fA-F](_*[0-9a-fA-F])*",i={
 className:"number",variants:[{
-begin:`(\\b([0-9](_*[0-9])*)((${e})|\\.)?|(${e}))[eE][+-]?([0-9](_*[0-9])*)[fFdD]?\\b`
-},{begin:`\\b([0-9](_*[0-9])*)((${e})[fFdD]?\\b|\\.([fFdD]\\b)?)`},{
-begin:`(${e})[fFdD]?\\b`},{begin:"\\b([0-9](_*[0-9])*)[fFdD]\\b"},{
-begin:`\\b0[xX]((${n})\\.?|(${n})?\\.(${n}))[pP][+-]?([0-9](_*[0-9])*)[fFdD]?\\b`
-},{begin:"\\b(0|[1-9](_*[0-9])*)[lL]?\\b"},{begin:`\\b0[xX](${n})[lL]?\\b`},{
+begin:`(\\b(${e})((${n})|\\.)?|(${n}))[eE][+-]?(${e})[fFdD]?\\b`},{
+begin:`\\b(${e})((${n})[fFdD]?\\b|\\.([fFdD]\\b)?)`},{begin:`(${n})[fFdD]?\\b`
+},{begin:`\\b(${e})[fFdD]\\b`},{
+begin:`\\b0[xX]((${a})\\.?|(${a})?\\.(${a}))[pP][+-]?(${e})[fFdD]?\\b`},{
+begin:"\\b(0|[1-9](_*[0-9])*)[lL]?\\b"},{begin:`\\b0[xX](${a})[lL]?\\b`},{
 begin:"\\b0(_*[0-7])*[lL]?\\b"},{begin:"\\b0[bB][01](_*[01])*[lL]?\\b"}],
 relevance:0};return e=>{const n={
 keyword:"abstract as val var vararg get set class object open private protected public noinline crossinline dynamic final enum if else do while for when throw try catch finally import package is in fun override companion reified inline lateinit init interface annotation data sealed internal infix operator out by constructor super tailrec where const inner suspend typealias external expect actual",
 built_in:"Byte Short Char Int Long Boolean Float Double Void Unit Nothing",
-literal:"true false null"},i={className:"symbol",begin:e.UNDERSCORE_IDENT_RE+"@"
+literal:"true false null"},a={className:"symbol",begin:e.UNDERSCORE_IDENT_RE+"@"
 },s={className:"subst",begin:/\$\{/,end:/\}/,contains:[e.C_NUMBER_MODE]},t={
 className:"variable",begin:"\\$"+e.UNDERSCORE_IDENT_RE},r={className:"string",
 variants:[{begin:'"""',end:'"""(?=[^"])',contains:[t,s]},{begin:"'",end:"'",
@@ -21,14 +21,14 @@ className:"meta",
 begin:"@(?:file|property|field|get|set|receiver|param|setparam|delegate)\\s*:(?:\\s*"+e.UNDERSCORE_IDENT_RE+")?"
 },c={className:"meta",begin:"@"+e.UNDERSCORE_IDENT_RE,contains:[{begin:/\(/,
 end:/\)/,contains:[e.inherit(r,{className:"string"}),"self"]}]
-},o=a,b=e.COMMENT("/\\*","\\*/",{contains:[e.C_BLOCK_COMMENT_MODE]}),E={
+},o=i,b=e.COMMENT("/\\*","\\*/",{contains:[e.C_BLOCK_COMMENT_MODE]}),E={
 variants:[{className:"type",begin:e.UNDERSCORE_IDENT_RE},{begin:/\(/,end:/\)/,
 contains:[]}]},d=E;return d.variants[1].contains=[E],E.variants[1].contains=[d],
 {name:"Kotlin",aliases:["kt","kts"],keywords:n,
 contains:[e.COMMENT("/\\*\\*","\\*/",{relevance:0,contains:[{className:"doctag",
 begin:"@[A-Za-z]+"}]}),e.C_LINE_COMMENT_MODE,b,{className:"keyword",
 begin:/\b(break|continue|return|this)\b/,starts:{contains:[{className:"symbol",
-begin:/@\w+/}]}},i,l,c,{className:"function",beginKeywords:"fun",end:"[(]|$",
+begin:/@\w+/}]}},a,l,c,{className:"function",beginKeywords:"fun",end:"[(]|$",
 returnBegin:!0,excludeEnd:!0,keywords:n,relevance:5,contains:[{
 begin:e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,relevance:0,
 contains:[e.UNDERSCORE_TITLE_MODE]},{className:"type",begin:/</,end:/>/,
diff --git a/vendor/assets/javascripts/highlightjs/languages/lasso.min.js b/vendor/assets/javascripts/highlightjs/languages/lasso.min.js
index ed73d390a86..75ed69f950b 100644
--- a/vendor/assets/javascripts/highlightjs/languages/lasso.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/lasso.min.js
@@ -1,29 +1,29 @@
-/*! `lasso` grammar compiled for Highlight.js 11.6.0 */
+/*! `lasso` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
-const a="<\\?(lasso(script)?|=)",n="\\]|\\?>",r={
-$pattern:"[a-zA-Z_][\\w.]*|&[lg]t;",
+const a="[a-zA-Z_][\\w.]*",n="<\\?(lasso(script)?|=)",r="\\]|\\?>",t={
+$pattern:a+"|&[lg]t;",
 literal:"true false none minimal full all void and or not bw nbw ew new cn ncn lt lte gt gte eq neq rx nrx ft",
 built_in:"array date decimal duration integer map pair string tag xml null boolean bytes keyword list locale queue set stack staticarray local var variable global data self inherited currentcapture givenblock",
 keyword:"cache database_names database_schemanames database_tablenames define_tag define_type email_batch encode_set html_comment handle handle_error header if inline iterate ljax_target link link_currentaction link_currentgroup link_currentrecord link_detail link_firstgroup link_firstrecord link_lastgroup link_lastrecord link_nextgroup link_nextrecord link_prevgroup link_prevrecord log loop namespace_using output_none portal private protect records referer referrer repeating resultset rows search_args search_arguments select sort_args sort_arguments thread_atomic value_list while abort case else fail_if fail_ifnot fail if_empty if_false if_null if_true loop_abort loop_continue loop_count params params_up return return_value run_children soap_definetag soap_lastrequest soap_lastresponse tag_name ascending average by define descending do equals frozen group handle_failure import in into join let match max min on order parent protected provide public require returnhome skip split_thread sum take thread to trait type where with yield yieldhome"
-},t=e.COMMENT("\x3c!--","--\x3e",{relevance:0}),s={className:"meta",
-begin:"\\[noprocess\\]",starts:{end:"\\[/noprocess\\]",returnEnd:!0,contains:[t]
-}},i={className:"meta",begin:"\\[/noprocess|"+a
-},l=[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.inherit(e.C_NUMBER_MODE,{
+},s=e.COMMENT("\x3c!--","--\x3e",{relevance:0}),i={className:"meta",
+begin:"\\[noprocess\\]",starts:{end:"\\[/noprocess\\]",returnEnd:!0,contains:[s]
+}},l={className:"meta",begin:"\\[/noprocess|"+n},o={className:"symbol",
+begin:"'"+a+"'"
+},c=[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.inherit(e.C_NUMBER_MODE,{
 begin:e.C_NUMBER_RE+"|(-?infinity|NaN)\\b"}),e.inherit(e.APOS_STRING_MODE,{
 illegal:null}),e.inherit(e.QUOTE_STRING_MODE,{illegal:null}),{
-className:"string",begin:"`",end:"`"},{variants:[{begin:"[#$][a-zA-Z_][\\w.]*"
-},{begin:"#",end:"\\d+",illegal:"\\W"}]},{className:"type",begin:"::\\s*",
-end:"[a-zA-Z_][\\w.]*",illegal:"\\W"},{className:"params",variants:[{
-begin:"-(?!infinity)[a-zA-Z_][\\w.]*",relevance:0},{begin:"(\\.\\.\\.)"}]},{
-begin:/(->|\.)\s*/,relevance:0,contains:[{className:"symbol",
-begin:"'[a-zA-Z_][\\w.]*'"}]},{className:"class",beginKeywords:"define",
-returnEnd:!0,end:"\\(|=>",contains:[e.inherit(e.TITLE_MODE,{
-begin:"[a-zA-Z_][\\w.]*(=(?!>))?|[-+*/%](?!>)"})]}];return{name:"Lasso",
-aliases:["ls","lassoscript"],case_insensitive:!0,keywords:r,contains:[{
-className:"meta",begin:n,relevance:0,starts:{end:"\\[|"+a,returnEnd:!0,
-relevance:0,contains:[t]}},s,i,{className:"meta",begin:"\\[no_square_brackets",
-starts:{end:"\\[/no_square_brackets\\]",keywords:r,contains:[{className:"meta",
-begin:n,relevance:0,starts:{end:"\\[noprocess\\]|"+a,returnEnd:!0,contains:[t]}
-},s,i].concat(l)}},{className:"meta",begin:"\\[",relevance:0},{className:"meta",
-begin:"^#!",end:"lasso9$",relevance:10}].concat(l)}}})()
-;hljs.registerLanguage("lasso",e)})();
\ No newline at end of file
+className:"string",begin:"`",end:"`"},{variants:[{begin:"[#$]"+a},{begin:"#",
+end:"\\d+",illegal:"\\W"}]},{className:"type",begin:"::\\s*",end:a,illegal:"\\W"
+},{className:"params",variants:[{begin:"-(?!infinity)"+a,relevance:0},{
+begin:"(\\.\\.\\.)"}]},{begin:/(->|\.)\s*/,relevance:0,contains:[o]},{
+className:"class",beginKeywords:"define",returnEnd:!0,end:"\\(|=>",
+contains:[e.inherit(e.TITLE_MODE,{begin:a+"(=(?!>))?|[-+*/%](?!>)"})]}];return{
+name:"Lasso",aliases:["ls","lassoscript"],case_insensitive:!0,keywords:t,
+contains:[{className:"meta",begin:r,relevance:0,starts:{end:"\\[|"+n,
+returnEnd:!0,relevance:0,contains:[s]}},i,l,{className:"meta",
+begin:"\\[no_square_brackets",starts:{end:"\\[/no_square_brackets\\]",
+keywords:t,contains:[{className:"meta",begin:r,relevance:0,starts:{
+end:"\\[noprocess\\]|"+n,returnEnd:!0,contains:[s]}},i,l].concat(c)}},{
+className:"meta",begin:"\\[",relevance:0},{className:"meta",begin:"^#!",
+end:"lasso9$",relevance:10}].concat(c)}}})();hljs.registerLanguage("lasso",e)
+})();
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/latex.min.js b/vendor/assets/javascripts/highlightjs/languages/latex.min.js
index b43bb121aa3..992b8b3497c 100644
--- a/vendor/assets/javascripts/highlightjs/languages/latex.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/latex.min.js
@@ -1,4 +1,4 @@
-/*! `latex` grammar compiled for Highlight.js 11.6.0 */
+/*! `latex` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const n=[{begin:/\^{6}[0-9a-f]{6}/},{
 begin:/\^{5}[0-9a-f]{5}/},{begin:/\^{4}[0-9a-f]{4}/},{begin:/\^{3}[0-9a-f]{3}/
 },{begin:/\^{2}[0-9a-f]{2}/},{begin:/\^{2}[\u0000-\u007f]/}],a=[{
diff --git a/vendor/assets/javascripts/highlightjs/languages/ldif.min.js b/vendor/assets/javascripts/highlightjs/languages/ldif.min.js
index de8e2fb2eff..2e187dee3cc 100644
--- a/vendor/assets/javascripts/highlightjs/languages/ldif.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/ldif.min.js
@@ -1,4 +1,4 @@
-/*! `ldif` grammar compiled for Highlight.js 11.6.0 */
+/*! `ldif` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var a=(()=>{"use strict";return a=>({name:"LDIF",contains:[{
 className:"attribute",match:"^dn(?=:)",relevance:10},{className:"attribute",
 match:"^\\w+(?=:)"},{className:"literal",match:"^-"},a.HASH_COMMENT_MODE]})})()
diff --git a/vendor/assets/javascripts/highlightjs/languages/leaf.min.js b/vendor/assets/javascripts/highlightjs/languages/leaf.min.js
index 2bfb99ec5f7..f180c751732 100644
--- a/vendor/assets/javascripts/highlightjs/languages/leaf.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/leaf.min.js
@@ -1,4 +1,4 @@
-/*! `leaf` grammar compiled for Highlight.js 11.6.0 */
+/*! `leaf` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"Leaf",contains:[{
 className:"function",begin:"#+[A-Za-z_0-9]*\\(",end:/ \{/,returnBegin:!0,
 excludeEnd:!0,contains:[{className:"keyword",begin:"#+"},{className:"title",
diff --git a/vendor/assets/javascripts/highlightjs/languages/less.min.js b/vendor/assets/javascripts/highlightjs/languages/less.min.js
index 37bc01af422..3a9f6ff1177 100644
--- a/vendor/assets/javascripts/highlightjs/languages/less.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/less.min.js
@@ -1,4 +1,4 @@
-/*! `less` grammar compiled for Highlight.js 11.6.0 */
+/*! `less` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict"
 ;const e=["a","abbr","address","article","aside","audio","b","blockquote","body","button","canvas","caption","cite","code","dd","del","details","dfn","div","dl","dt","em","fieldset","figcaption","figure","footer","form","h1","h2","h3","h4","h5","h6","header","hgroup","html","i","iframe","img","input","ins","kbd","label","legend","li","main","mark","menu","nav","object","ol","p","q","quote","samp","section","span","strong","summary","sup","table","tbody","td","textarea","tfoot","th","thead","time","tr","ul","var","video"],t=["any-hover","any-pointer","aspect-ratio","color","color-gamut","color-index","device-aspect-ratio","device-height","device-width","display-mode","forced-colors","grid","height","hover","inverted-colors","monochrome","orientation","overflow-block","overflow-inline","pointer","prefers-color-scheme","prefers-contrast","prefers-reduced-motion","prefers-reduced-transparency","resolution","scan","scripting","update","width","min-width","max-width","min-height","max-height"],r=["active","any-link","blank","checked","current","default","defined","dir","disabled","drop","empty","enabled","first","first-child","first-of-type","fullscreen","future","focus","focus-visible","focus-within","has","host","host-context","hover","indeterminate","in-range","invalid","is","lang","last-child","last-of-type","left","link","local-link","not","nth-child","nth-col","nth-last-child","nth-last-col","nth-last-of-type","nth-of-type","only-child","only-of-type","optional","out-of-range","past","placeholder-shown","read-only","read-write","required","right","root","scope","target","target-within","user-invalid","valid","visited","where"],i=["after","backdrop","before","cue","cue-region","first-letter","first-line","grammar-error","marker","part","placeholder","selection","slotted","spelling-error"],o=["align-content","align-items","align-self","all","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","backface-visibility","background","background-attachment","background-blend-mode","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","block-size","border","border-block","border-block-color","border-block-end","border-block-end-color","border-block-end-style","border-block-end-width","border-block-start","border-block-start-color","border-block-start-style","border-block-start-width","border-block-style","border-block-width","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-inline","border-inline-color","border-inline-end","border-inline-end-color","border-inline-end-style","border-inline-end-width","border-inline-start","border-inline-start-color","border-inline-start-style","border-inline-start-width","border-inline-style","border-inline-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","caret-color","clear","clip","clip-path","clip-rule","color","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","contain","content","content-visibility","counter-increment","counter-reset","cue","cue-after","cue-before","cursor","direction","display","empty-cells","filter","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","flow","font","font-display","font-family","font-feature-settings","font-kerning","font-language-override","font-size","font-size-adjust","font-smoothing","font-stretch","font-style","font-synthesis","font-variant","font-variant-caps","font-variant-east-asian","font-variant-ligatures","font-variant-numeric","font-variant-position","font-variation-settings","font-weight","gap","glyph-orientation-vertical","grid","grid-area","grid-auto-columns","grid-auto-flow","grid-auto-rows","grid-column","grid-column-end","grid-column-start","grid-gap","grid-row","grid-row-end","grid-row-start","grid-template","grid-template-areas","grid-template-columns","grid-template-rows","hanging-punctuation","height","hyphens","icon","image-orientation","image-rendering","image-resolution","ime-mode","inline-size","isolation","justify-content","left","letter-spacing","line-break","line-height","list-style","list-style-image","list-style-position","list-style-type","margin","margin-block","margin-block-end","margin-block-start","margin-bottom","margin-inline","margin-inline-end","margin-inline-start","margin-left","margin-right","margin-top","marks","mask","mask-border","mask-border-mode","mask-border-outset","mask-border-repeat","mask-border-slice","mask-border-source","mask-border-width","mask-clip","mask-composite","mask-image","mask-mode","mask-origin","mask-position","mask-repeat","mask-size","mask-type","max-block-size","max-height","max-inline-size","max-width","min-block-size","min-height","min-inline-size","min-width","mix-blend-mode","nav-down","nav-index","nav-left","nav-right","nav-up","none","normal","object-fit","object-position","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-wrap","overflow-x","overflow-y","padding","padding-block","padding-block-end","padding-block-start","padding-bottom","padding-inline","padding-inline-end","padding-inline-start","padding-left","padding-right","padding-top","page-break-after","page-break-before","page-break-inside","pause","pause-after","pause-before","perspective","perspective-origin","pointer-events","position","quotes","resize","rest","rest-after","rest-before","right","row-gap","scroll-margin","scroll-margin-block","scroll-margin-block-end","scroll-margin-block-start","scroll-margin-bottom","scroll-margin-inline","scroll-margin-inline-end","scroll-margin-inline-start","scroll-margin-left","scroll-margin-right","scroll-margin-top","scroll-padding","scroll-padding-block","scroll-padding-block-end","scroll-padding-block-start","scroll-padding-bottom","scroll-padding-inline","scroll-padding-inline-end","scroll-padding-inline-start","scroll-padding-left","scroll-padding-right","scroll-padding-top","scroll-snap-align","scroll-snap-stop","scroll-snap-type","scrollbar-color","scrollbar-gutter","scrollbar-width","shape-image-threshold","shape-margin","shape-outside","speak","speak-as","src","tab-size","table-layout","text-align","text-align-all","text-align-last","text-combine-upright","text-decoration","text-decoration-color","text-decoration-line","text-decoration-style","text-emphasis","text-emphasis-color","text-emphasis-position","text-emphasis-style","text-indent","text-justify","text-orientation","text-overflow","text-rendering","text-shadow","text-transform","text-underline-position","top","transform","transform-box","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","vertical-align","visibility","voice-balance","voice-duration","voice-family","voice-pitch","voice-range","voice-rate","voice-stress","voice-volume","white-space","widows","width","will-change","word-break","word-spacing","word-wrap","writing-mode","z-index"].reverse(),n=r.concat(i)
 ;return a=>{const l=(e=>({IMPORTANT:{scope:"meta",begin:"!important"},
@@ -10,35 +10,36 @@ contains:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]},CSS_NUMBER_MODE:{
 scope:"number",
 begin:e.NUMBER_RE+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",
 relevance:0},CSS_VARIABLE:{className:"attr",begin:/--[A-Za-z][A-Za-z0-9_-]*/}
-}))(a),s=n,d="([\\w-]+|@\\{[\\w-]+\\})",c=[],g=[],b=e=>({className:"string",
-begin:"~?"+e+".*?"+e}),m=(e,t,r)=>({className:e,begin:t,relevance:r}),p={
-$pattern:/[a-z-]+/,keyword:"and or not only",attribute:t.join(" ")},u={
-begin:"\\(",end:"\\)",contains:g,keywords:p,relevance:0}
-;g.push(a.C_LINE_COMMENT_MODE,a.C_BLOCK_COMMENT_MODE,b("'"),b('"'),l.CSS_NUMBER_MODE,{
+}))(a),s=n,d="[\\w-]+",c="("+d+"|@\\{"+d+"\\})",g=[],b=[],m=e=>({
+className:"string",begin:"~?"+e+".*?"+e}),p=(e,t,r)=>({className:e,begin:t,
+relevance:r}),u={$pattern:/[a-z-]+/,keyword:"and or not only",
+attribute:t.join(" ")},h={begin:"\\(",end:"\\)",contains:b,keywords:u,
+relevance:0}
+;b.push(a.C_LINE_COMMENT_MODE,a.C_BLOCK_COMMENT_MODE,m("'"),m('"'),l.CSS_NUMBER_MODE,{
 begin:"(url|data-uri)\\(",starts:{className:"string",end:"[\\)\\n]",
 excludeEnd:!0}
-},l.HEXCOLOR,u,m("variable","@@?[\\w-]+",10),m("variable","@\\{[\\w-]+\\}"),m("built_in","~?`[^`]*?`"),{
-className:"attribute",begin:"[\\w-]+\\s*:",end:":",returnBegin:!0,excludeEnd:!0
-},l.IMPORTANT,{beginKeywords:"and not"},l.FUNCTION_DISPATCH);const h=g.concat({
-begin:/\{/,end:/\}/,contains:c}),f={beginKeywords:"when",endsWithParent:!0,
-contains:[{beginKeywords:"and not"}].concat(g)},k={begin:d+"\\s*:",
+},l.HEXCOLOR,h,p("variable","@@?"+d,10),p("variable","@\\{"+d+"\\}"),p("built_in","~?`[^`]*?`"),{
+className:"attribute",begin:d+"\\s*:",end:":",returnBegin:!0,excludeEnd:!0
+},l.IMPORTANT,{beginKeywords:"and not"},l.FUNCTION_DISPATCH);const f=b.concat({
+begin:/\{/,end:/\}/,contains:g}),k={beginKeywords:"when",endsWithParent:!0,
+contains:[{beginKeywords:"and not"}].concat(b)},v={begin:c+"\\s*:",
 returnBegin:!0,end:/[;}]/,relevance:0,contains:[{begin:/-(webkit|moz|ms|o)-/
 },l.CSS_VARIABLE,{className:"attribute",begin:"\\b("+o.join("|")+")\\b",
-end:/(?=:)/,starts:{endsWithParent:!0,illegal:"[<=$]",relevance:0,contains:g}}]
+end:/(?=:)/,starts:{endsWithParent:!0,illegal:"[<=$]",relevance:0,contains:b}}]
 },w={className:"keyword",
 begin:"@(import|media|charset|font-face|(-[a-z]+-)?keyframes|supports|document|namespace|page|viewport|host)\\b",
-starts:{end:"[;{}]",keywords:p,returnEnd:!0,contains:g,relevance:0}},v={
-className:"variable",variants:[{begin:"@[\\w-]+\\s*:",relevance:15},{
-begin:"@[\\w-]+"}],starts:{end:"[;}]",returnEnd:!0,contains:h}},y={variants:[{
-begin:"[\\.#:&\\[>]",end:"[;{}]"},{begin:d,end:/\{/}],returnBegin:!0,
+starts:{end:"[;{}]",keywords:u,returnEnd:!0,contains:b,relevance:0}},y={
+className:"variable",variants:[{begin:"@"+d+"\\s*:",relevance:15},{begin:"@"+d
+}],starts:{end:"[;}]",returnEnd:!0,contains:f}},x={variants:[{
+begin:"[\\.#:&\\[>]",end:"[;{}]"},{begin:c,end:/\{/}],returnBegin:!0,
 returnEnd:!0,illegal:"[<='$\"]",relevance:0,
-contains:[a.C_LINE_COMMENT_MODE,a.C_BLOCK_COMMENT_MODE,f,m("keyword","all\\b"),m("variable","@\\{[\\w-]+\\}"),{
+contains:[a.C_LINE_COMMENT_MODE,a.C_BLOCK_COMMENT_MODE,k,p("keyword","all\\b"),p("variable","@\\{"+d+"\\}"),{
 begin:"\\b("+e.join("|")+")\\b",className:"selector-tag"
-},l.CSS_NUMBER_MODE,m("selector-tag",d,0),m("selector-id","#"+d),m("selector-class","\\."+d,0),m("selector-tag","&",0),l.ATTRIBUTE_SELECTOR_MODE,{
+},l.CSS_NUMBER_MODE,p("selector-tag",c,0),p("selector-id","#"+c),p("selector-class","\\."+c,0),p("selector-tag","&",0),l.ATTRIBUTE_SELECTOR_MODE,{
 className:"selector-pseudo",begin:":("+r.join("|")+")"},{
 className:"selector-pseudo",begin:":(:)?("+i.join("|")+")"},{begin:/\(/,
-end:/\)/,relevance:0,contains:h},{begin:"!important"},l.FUNCTION_DISPATCH]},x={
-begin:`[\\w-]+:(:)?(${s.join("|")})`,returnBegin:!0,contains:[y]}
-;return c.push(a.C_LINE_COMMENT_MODE,a.C_BLOCK_COMMENT_MODE,w,v,x,k,y,f,l.FUNCTION_DISPATCH),
-{name:"Less",case_insensitive:!0,illegal:"[=>'/<($\"]",contains:c}}})()
+end:/\)/,relevance:0,contains:f},{begin:"!important"},l.FUNCTION_DISPATCH]},_={
+begin:d+":(:)?"+`(${s.join("|")})`,returnBegin:!0,contains:[x]}
+;return g.push(a.C_LINE_COMMENT_MODE,a.C_BLOCK_COMMENT_MODE,w,y,_,v,x,k,l.FUNCTION_DISPATCH),
+{name:"Less",case_insensitive:!0,illegal:"[=>'/<($\"]",contains:g}}})()
 ;hljs.registerLanguage("less",e)})();
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/lisp.min.js b/vendor/assets/javascripts/highlightjs/languages/lisp.min.js
index 8f8e1e384c9..88a01eb7693 100644
--- a/vendor/assets/javascripts/highlightjs/languages/lisp.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/lisp.min.js
@@ -1,4 +1,4 @@
-/*! `lisp` grammar compiled for Highlight.js 11.6.0 */
+/*! `lisp` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const n="[a-zA-Z_\\-+\\*\\/<=>&#][a-zA-Z0-9_\\-+*\\/<=>&#!]*",a="\\|[^]*?\\|",i="(-|\\+)?\\d+(\\.\\d+|\\/\\d+)?((d|e|f|l|s|D|E|F|L|S)(\\+|-)?\\d+)?",s={
 className:"literal",begin:"\\b(t{1}|nil)\\b"},l={className:"number",variants:[{
diff --git a/vendor/assets/javascripts/highlightjs/languages/livecodeserver.min.js b/vendor/assets/javascripts/highlightjs/languages/livecodeserver.min.js
index 1bafe406ec4..56d200998c1 100644
--- a/vendor/assets/javascripts/highlightjs/languages/livecodeserver.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/livecodeserver.min.js
@@ -1,4 +1,4 @@
-/*! `livecodeserver` grammar compiled for Highlight.js 11.6.0 */
+/*! `livecodeserver` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const r={className:"variable",
 variants:[{begin:"\\b([gtps][A-Z]{1}[a-zA-Z0-9]*)(\\[.+\\])?(?:\\s*?)"},{
 begin:"\\$_[A-Z]+"}],relevance:0
diff --git a/vendor/assets/javascripts/highlightjs/languages/livescript.min.js b/vendor/assets/javascripts/highlightjs/languages/livescript.min.js
index 934bbb3f8f7..b0e1e4b2beb 100644
--- a/vendor/assets/javascripts/highlightjs/languages/livescript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/livescript.min.js
@@ -1,4 +1,4 @@
-/*! `livescript` grammar compiled for Highlight.js 11.6.0 */
+/*! `livescript` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict"
 ;const e=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],n=["true","false","null","undefined","NaN","Infinity"],a=[].concat(["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],["Object","Function","Boolean","Symbol","Math","Date","Number","BigInt","String","RegExp","Array","Float32Array","Float64Array","Int8Array","Uint8Array","Uint8ClampedArray","Int16Array","Int32Array","Uint16Array","Uint32Array","BigInt64Array","BigUint64Array","Set","Map","WeakSet","WeakMap","ArrayBuffer","SharedArrayBuffer","Atomics","DataView","JSON","Promise","Generator","GeneratorFunction","AsyncFunction","Reflect","Proxy","Intl","WebAssembly"],["Error","EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"])
 ;return t=>{const r={
diff --git a/vendor/assets/javascripts/highlightjs/languages/llvm.min.js b/vendor/assets/javascripts/highlightjs/languages/llvm.min.js
index 05e5180de69..df6affd2a57 100644
--- a/vendor/assets/javascripts/highlightjs/languages/llvm.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/llvm.min.js
@@ -1,4 +1,4 @@
-/*! `llvm` grammar compiled for Highlight.js 11.6.0 */
+/*! `llvm` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const a=e.regex,n=/([-a-zA-Z$._][\w$.-]*)/,t={className:"variable",variants:[{
 begin:a.concat(/%/,n)},{begin:/%\d+/},{begin:/#\d+/}]},i={className:"title",
diff --git a/vendor/assets/javascripts/highlightjs/languages/lsl.min.js b/vendor/assets/javascripts/highlightjs/languages/lsl.min.js
index 327e83e2345..dfde684b02c 100644
--- a/vendor/assets/javascripts/highlightjs/languages/lsl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/lsl.min.js
@@ -1,4 +1,4 @@
-/*! `lsl` grammar compiled for Highlight.js 11.6.0 */
+/*! `lsl` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var E=(()=>{"use strict";return E=>{const T={className:"number",
 relevance:0,begin:E.C_NUMBER_RE};return{name:"LSL (Linden Scripting Language)",
 illegal:":",contains:[{className:"string",begin:'"',end:'"',contains:[{
diff --git a/vendor/assets/javascripts/highlightjs/languages/lua.min.js b/vendor/assets/javascripts/highlightjs/languages/lua.min.js
index f72678b0cbb..16be79d2874 100644
--- a/vendor/assets/javascripts/highlightjs/languages/lua.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/lua.min.js
@@ -1,8 +1,8 @@
-/*! `lua` grammar compiled for Highlight.js 11.6.0 */
+/*! `lua` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const t="\\[=*\\[",a="\\]=*\\]",n={
 begin:t,end:a,contains:["self"]
-},o=[e.COMMENT("--(?!\\[=*\\[)","$"),e.COMMENT("--\\[=*\\[",a,{contains:[n],
-relevance:10})];return{name:"Lua",keywords:{$pattern:e.UNDERSCORE_IDENT_RE,
+},o=[e.COMMENT("--(?!"+t+")","$"),e.COMMENT("--"+t,a,{contains:[n],relevance:10
+})];return{name:"Lua",keywords:{$pattern:e.UNDERSCORE_IDENT_RE,
 literal:"true false nil",
 keyword:"and break do else elseif end for goto if in local not or repeat return then until while",
 built_in:"_G _ENV _VERSION __index __newindex __mode __call __metatable __tostring __len __gc __add __sub __mul __div __mod __pow __concat __unm __eq __lt __le assert collectgarbage dofile error getfenv getmetatable ipairs load loadfile loadstring module next pairs pcall print rawequal rawget rawset require select setfenv setmetatable tonumber tostring type unpack xpcall arg self coroutine resume yield status wrap create running debug getupvalue debug sethook getmetatable gethook setmetatable setlocal traceback setfenv getinfo setupvalue getlocal getregistry getfenv io lines write close flush open output type read stderr stdin input stdout popen tmpfile math log max acos huge ldexp pi cos tanh pow deg tan cosh sinh random randomseed frexp ceil floor rad abs sqrt modf asin min mod fmod log10 atan2 exp sin atan os exit setlocale date getenv difftime remove time clock tmpname rename execute package preload loadlib loaded loaders cpath config path seeall string sub upper len gfind rep find match char dump gmatch reverse byte format gsub lower table setn insert getn foreachi maxn foreach concat sort remove"
diff --git a/vendor/assets/javascripts/highlightjs/languages/makefile.min.js b/vendor/assets/javascripts/highlightjs/languages/makefile.min.js
index ca51878d19e..942d212007b 100644
--- a/vendor/assets/javascripts/highlightjs/languages/makefile.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/makefile.min.js
@@ -1,4 +1,4 @@
-/*! `makefile` grammar compiled for Highlight.js 11.6.0 */
+/*! `makefile` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const i={className:"variable",
 variants:[{begin:"\\$\\("+e.UNDERSCORE_IDENT_RE+"\\)",
 contains:[e.BACKSLASH_ESCAPE]},{begin:/\$[@%<?\^\+\*]/}]},a={className:"string",
diff --git a/vendor/assets/javascripts/highlightjs/languages/markdown.min.js b/vendor/assets/javascripts/highlightjs/languages/markdown.min.js
index fb40d4f11cb..b41a21e20d5 100644
--- a/vendor/assets/javascripts/highlightjs/languages/markdown.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/markdown.min.js
@@ -1,4 +1,4 @@
-/*! `markdown` grammar compiled for Highlight.js 11.6.0 */
+/*! `markdown` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const n={begin:/<\/?[A-Za-z_]/,
 end:">",subLanguage:"xml",relevance:0},a={variants:[{begin:/\[.+?\]\[.*?\]/,
 relevance:0},{
@@ -11,9 +11,9 @@ begin:/\[.*?\]\(.*?\)/,relevance:0}],returnBegin:!0,contains:[{match:/\[(?=\])/
 returnEnd:!0},{className:"link",relevance:0,begin:"\\]\\(",end:"\\)",
 excludeBegin:!0,excludeEnd:!0},{className:"symbol",relevance:0,begin:"\\]\\[",
 end:"\\]",excludeBegin:!0,excludeEnd:!0}]},i={className:"strong",contains:[],
-variants:[{begin:/_{2}/,end:/_{2}/},{begin:/\*{2}/,end:/\*{2}/}]},s={
-className:"emphasis",contains:[],variants:[{begin:/\*(?!\*)/,end:/\*/},{
-begin:/_(?!_)/,end:/_/,relevance:0}]},c=e.inherit(i,{contains:[]
+variants:[{begin:/_{2}(?!\s)/,end:/_{2}/},{begin:/\*{2}(?!\s)/,end:/\*{2}/}]
+},s={className:"emphasis",contains:[],variants:[{begin:/\*(?![*\s])/,end:/\*/},{
+begin:/_(?![_\s])/,end:/_/,relevance:0}]},c=e.inherit(i,{contains:[]
 }),t=e.inherit(s,{contains:[]});i.contains.push(t),s.contains.push(c)
 ;let g=[n,a];return[i,s,c,t].forEach((e=>{e.contains=e.contains.concat(g)
 })),g=g.concat(i,s),{name:"Markdown",aliases:["md","mkdown","mkd"],contains:[{
diff --git a/vendor/assets/javascripts/highlightjs/languages/mathematica.min.js b/vendor/assets/javascripts/highlightjs/languages/mathematica.min.js
index 79d32e62567..ea1c8cf6176 100644
--- a/vendor/assets/javascripts/highlightjs/languages/mathematica.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/mathematica.min.js
@@ -1,6 +1,6 @@
-/*! `mathematica` grammar compiled for Highlight.js 11.6.0 */
+/*! `mathematica` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict"
-;const e=["AASTriangle","AbelianGroup","Abort","AbortKernels","AbortProtect","AbortScheduledTask","Above","Abs","AbsArg","AbsArgPlot","Absolute","AbsoluteCorrelation","AbsoluteCorrelationFunction","AbsoluteCurrentValue","AbsoluteDashing","AbsoluteFileName","AbsoluteOptions","AbsolutePointSize","AbsoluteThickness","AbsoluteTime","AbsoluteTiming","AcceptanceThreshold","AccountingForm","Accumulate","Accuracy","AccuracyGoal","ActionDelay","ActionMenu","ActionMenuBox","ActionMenuBoxOptions","Activate","Active","ActiveClassification","ActiveClassificationObject","ActiveItem","ActivePrediction","ActivePredictionObject","ActiveStyle","AcyclicGraphQ","AddOnHelpPath","AddSides","AddTo","AddToSearchIndex","AddUsers","AdjacencyGraph","AdjacencyList","AdjacencyMatrix","AdjacentMeshCells","AdjustmentBox","AdjustmentBoxOptions","AdjustTimeSeriesForecast","AdministrativeDivisionData","AffineHalfSpace","AffineSpace","AffineStateSpaceModel","AffineTransform","After","AggregatedEntityClass","AggregationLayer","AircraftData","AirportData","AirPressureData","AirTemperatureData","AiryAi","AiryAiPrime","AiryAiZero","AiryBi","AiryBiPrime","AiryBiZero","AlgebraicIntegerQ","AlgebraicNumber","AlgebraicNumberDenominator","AlgebraicNumberNorm","AlgebraicNumberPolynomial","AlgebraicNumberTrace","AlgebraicRules","AlgebraicRulesData","Algebraics","AlgebraicUnitQ","Alignment","AlignmentMarker","AlignmentPoint","All","AllowAdultContent","AllowedCloudExtraParameters","AllowedCloudParameterExtensions","AllowedDimensions","AllowedFrequencyRange","AllowedHeads","AllowGroupClose","AllowIncomplete","AllowInlineCells","AllowKernelInitialization","AllowLooseGrammar","AllowReverseGroupClose","AllowScriptLevelChange","AllowVersionUpdate","AllTrue","Alphabet","AlphabeticOrder","AlphabeticSort","AlphaChannel","AlternateImage","AlternatingFactorial","AlternatingGroup","AlternativeHypothesis","Alternatives","AltitudeMethod","AmbientLight","AmbiguityFunction","AmbiguityList","Analytic","AnatomyData","AnatomyForm","AnatomyPlot3D","AnatomySkinStyle","AnatomyStyling","AnchoredSearch","And","AndersonDarlingTest","AngerJ","AngleBisector","AngleBracket","AnglePath","AnglePath3D","AngleVector","AngularGauge","Animate","AnimationCycleOffset","AnimationCycleRepetitions","AnimationDirection","AnimationDisplayTime","AnimationRate","AnimationRepetitions","AnimationRunning","AnimationRunTime","AnimationTimeIndex","Animator","AnimatorBox","AnimatorBoxOptions","AnimatorElements","Annotate","Annotation","AnnotationDelete","AnnotationKeys","AnnotationRules","AnnotationValue","Annuity","AnnuityDue","Annulus","AnomalyDetection","AnomalyDetector","AnomalyDetectorFunction","Anonymous","Antialiasing","AntihermitianMatrixQ","Antisymmetric","AntisymmetricMatrixQ","Antonyms","AnyOrder","AnySubset","AnyTrue","Apart","ApartSquareFree","APIFunction","Appearance","AppearanceElements","AppearanceRules","AppellF1","Append","AppendCheck","AppendLayer","AppendTo","Apply","ApplySides","ArcCos","ArcCosh","ArcCot","ArcCoth","ArcCsc","ArcCsch","ArcCurvature","ARCHProcess","ArcLength","ArcSec","ArcSech","ArcSin","ArcSinDistribution","ArcSinh","ArcTan","ArcTanh","Area","Arg","ArgMax","ArgMin","ArgumentCountQ","ARIMAProcess","ArithmeticGeometricMean","ARMAProcess","Around","AroundReplace","ARProcess","Array","ArrayComponents","ArrayDepth","ArrayFilter","ArrayFlatten","ArrayMesh","ArrayPad","ArrayPlot","ArrayQ","ArrayResample","ArrayReshape","ArrayRules","Arrays","Arrow","Arrow3DBox","ArrowBox","Arrowheads","ASATriangle","Ask","AskAppend","AskConfirm","AskDisplay","AskedQ","AskedValue","AskFunction","AskState","AskTemplateDisplay","AspectRatio","AspectRatioFixed","Assert","AssociateTo","Association","AssociationFormat","AssociationMap","AssociationQ","AssociationThread","AssumeDeterministic","Assuming","Assumptions","AstronomicalData","Asymptotic","AsymptoticDSolveValue","AsymptoticEqual","AsymptoticEquivalent","AsymptoticGreater","AsymptoticGreaterEqual","AsymptoticIntegrate","AsymptoticLess","AsymptoticLessEqual","AsymptoticOutputTracker","AsymptoticProduct","AsymptoticRSolveValue","AsymptoticSolve","AsymptoticSum","Asynchronous","AsynchronousTaskObject","AsynchronousTasks","Atom","AtomCoordinates","AtomCount","AtomDiagramCoordinates","AtomList","AtomQ","AttentionLayer","Attributes","Audio","AudioAmplify","AudioAnnotate","AudioAnnotationLookup","AudioBlockMap","AudioCapture","AudioChannelAssignment","AudioChannelCombine","AudioChannelMix","AudioChannels","AudioChannelSeparate","AudioData","AudioDelay","AudioDelete","AudioDevice","AudioDistance","AudioEncoding","AudioFade","AudioFrequencyShift","AudioGenerator","AudioIdentify","AudioInputDevice","AudioInsert","AudioInstanceQ","AudioIntervals","AudioJoin","AudioLabel","AudioLength","AudioLocalMeasurements","AudioLooping","AudioLoudness","AudioMeasurements","AudioNormalize","AudioOutputDevice","AudioOverlay","AudioPad","AudioPan","AudioPartition","AudioPause","AudioPitchShift","AudioPlay","AudioPlot","AudioQ","AudioRecord","AudioReplace","AudioResample","AudioReverb","AudioReverse","AudioSampleRate","AudioSpectralMap","AudioSpectralTransformation","AudioSplit","AudioStop","AudioStream","AudioStreams","AudioTimeStretch","AudioTracks","AudioTrim","AudioType","AugmentedPolyhedron","AugmentedSymmetricPolynomial","Authenticate","Authentication","AuthenticationDialog","AutoAction","Autocomplete","AutocompletionFunction","AutoCopy","AutocorrelationTest","AutoDelete","AutoEvaluateEvents","AutoGeneratedPackage","AutoIndent","AutoIndentSpacings","AutoItalicWords","AutoloadPath","AutoMatch","Automatic","AutomaticImageSize","AutoMultiplicationSymbol","AutoNumberFormatting","AutoOpenNotebooks","AutoOpenPalettes","AutoQuoteCharacters","AutoRefreshed","AutoRemove","AutorunSequencing","AutoScaling","AutoScroll","AutoSpacing","AutoStyleOptions","AutoStyleWords","AutoSubmitting","Axes","AxesEdge","AxesLabel","AxesOrigin","AxesStyle","AxiomaticTheory","Axis","BabyMonsterGroupB","Back","Background","BackgroundAppearance","BackgroundTasksSettings","Backslash","Backsubstitution","Backward","Ball","Band","BandpassFilter","BandstopFilter","BarabasiAlbertGraphDistribution","BarChart","BarChart3D","BarcodeImage","BarcodeRecognize","BaringhausHenzeTest","BarLegend","BarlowProschanImportance","BarnesG","BarOrigin","BarSpacing","BartlettHannWindow","BartlettWindow","BaseDecode","BaseEncode","BaseForm","Baseline","BaselinePosition","BaseStyle","BasicRecurrentLayer","BatchNormalizationLayer","BatchSize","BatesDistribution","BattleLemarieWavelet","BayesianMaximization","BayesianMaximizationObject","BayesianMinimization","BayesianMinimizationObject","Because","BeckmannDistribution","Beep","Before","Begin","BeginDialogPacket","BeginFrontEndInteractionPacket","BeginPackage","BellB","BellY","Below","BenfordDistribution","BeniniDistribution","BenktanderGibratDistribution","BenktanderWeibullDistribution","BernoulliB","BernoulliDistribution","BernoulliGraphDistribution","BernoulliProcess","BernsteinBasis","BesselFilterModel","BesselI","BesselJ","BesselJZero","BesselK","BesselY","BesselYZero","Beta","BetaBinomialDistribution","BetaDistribution","BetaNegativeBinomialDistribution","BetaPrimeDistribution","BetaRegularized","Between","BetweennessCentrality","BeveledPolyhedron","BezierCurve","BezierCurve3DBox","BezierCurve3DBoxOptions","BezierCurveBox","BezierCurveBoxOptions","BezierFunction","BilateralFilter","Binarize","BinaryDeserialize","BinaryDistance","BinaryFormat","BinaryImageQ","BinaryRead","BinaryReadList","BinarySerialize","BinaryWrite","BinCounts","BinLists","Binomial","BinomialDistribution","BinomialProcess","BinormalDistribution","BiorthogonalSplineWavelet","BipartiteGraphQ","BiquadraticFilterModel","BirnbaumImportance","BirnbaumSaundersDistribution","BitAnd","BitClear","BitGet","BitLength","BitNot","BitOr","BitSet","BitShiftLeft","BitShiftRight","BitXor","BiweightLocation","BiweightMidvariance","Black","BlackmanHarrisWindow","BlackmanNuttallWindow","BlackmanWindow","Blank","BlankForm","BlankNullSequence","BlankSequence","Blend","Block","BlockchainAddressData","BlockchainBase","BlockchainBlockData","BlockchainContractValue","BlockchainData","BlockchainGet","BlockchainKeyEncode","BlockchainPut","BlockchainTokenData","BlockchainTransaction","BlockchainTransactionData","BlockchainTransactionSign","BlockchainTransactionSubmit","BlockMap","BlockRandom","BlomqvistBeta","BlomqvistBetaTest","Blue","Blur","BodePlot","BohmanWindow","Bold","Bond","BondCount","BondList","BondQ","Bookmarks","Boole","BooleanConsecutiveFunction","BooleanConvert","BooleanCountingFunction","BooleanFunction","BooleanGraph","BooleanMaxterms","BooleanMinimize","BooleanMinterms","BooleanQ","BooleanRegion","Booleans","BooleanStrings","BooleanTable","BooleanVariables","BorderDimensions","BorelTannerDistribution","Bottom","BottomHatTransform","BoundaryDiscretizeGraphics","BoundaryDiscretizeRegion","BoundaryMesh","BoundaryMeshRegion","BoundaryMeshRegionQ","BoundaryStyle","BoundedRegionQ","BoundingRegion","Bounds","Box","BoxBaselineShift","BoxData","BoxDimensions","Boxed","Boxes","BoxForm","BoxFormFormatTypes","BoxFrame","BoxID","BoxMargins","BoxMatrix","BoxObject","BoxRatios","BoxRotation","BoxRotationPoint","BoxStyle","BoxWhiskerChart","Bra","BracketingBar","BraKet","BrayCurtisDistance","BreadthFirstScan","Break","BridgeData","BrightnessEqualize","BroadcastStationData","Brown","BrownForsytheTest","BrownianBridgeProcess","BrowserCategory","BSplineBasis","BSplineCurve","BSplineCurve3DBox","BSplineCurve3DBoxOptions","BSplineCurveBox","BSplineCurveBoxOptions","BSplineFunction","BSplineSurface","BSplineSurface3DBox","BSplineSurface3DBoxOptions","BubbleChart","BubbleChart3D","BubbleScale","BubbleSizes","BuildingData","BulletGauge","BusinessDayQ","ButterflyGraph","ButterworthFilterModel","Button","ButtonBar","ButtonBox","ButtonBoxOptions","ButtonCell","ButtonContents","ButtonData","ButtonEvaluator","ButtonExpandable","ButtonFrame","ButtonFunction","ButtonMargins","ButtonMinHeight","ButtonNote","ButtonNotebook","ButtonSource","ButtonStyle","ButtonStyleMenuListing","Byte","ByteArray","ByteArrayFormat","ByteArrayQ","ByteArrayToString","ByteCount","ByteOrdering","C","CachedValue","CacheGraphics","CachePersistence","CalendarConvert","CalendarData","CalendarType","Callout","CalloutMarker","CalloutStyle","CallPacket","CanberraDistance","Cancel","CancelButton","CandlestickChart","CanonicalGraph","CanonicalizePolygon","CanonicalizePolyhedron","CanonicalName","CanonicalWarpingCorrespondence","CanonicalWarpingDistance","CantorMesh","CantorStaircase","Cap","CapForm","CapitalDifferentialD","Capitalize","CapsuleShape","CaptureRunning","CardinalBSplineBasis","CarlemanLinearize","CarmichaelLambda","CaseOrdering","Cases","CaseSensitive","Cashflow","Casoratian","Catalan","CatalanNumber","Catch","CategoricalDistribution","Catenate","CatenateLayer","CauchyDistribution","CauchyWindow","CayleyGraph","CDF","CDFDeploy","CDFInformation","CDFWavelet","Ceiling","CelestialSystem","Cell","CellAutoOverwrite","CellBaseline","CellBoundingBox","CellBracketOptions","CellChangeTimes","CellContents","CellContext","CellDingbat","CellDynamicExpression","CellEditDuplicate","CellElementsBoundingBox","CellElementSpacings","CellEpilog","CellEvaluationDuplicate","CellEvaluationFunction","CellEvaluationLanguage","CellEventActions","CellFrame","CellFrameColor","CellFrameLabelMargins","CellFrameLabels","CellFrameMargins","CellGroup","CellGroupData","CellGrouping","CellGroupingRules","CellHorizontalScrolling","CellID","CellLabel","CellLabelAutoDelete","CellLabelMargins","CellLabelPositioning","CellLabelStyle","CellLabelTemplate","CellMargins","CellObject","CellOpen","CellPrint","CellProlog","Cells","CellSize","CellStyle","CellTags","CellularAutomaton","CensoredDistribution","Censoring","Center","CenterArray","CenterDot","CentralFeature","CentralMoment","CentralMomentGeneratingFunction","Cepstrogram","CepstrogramArray","CepstrumArray","CForm","ChampernowneNumber","ChangeOptions","ChannelBase","ChannelBrokerAction","ChannelDatabin","ChannelHistoryLength","ChannelListen","ChannelListener","ChannelListeners","ChannelListenerWait","ChannelObject","ChannelPreSendFunction","ChannelReceiverFunction","ChannelSend","ChannelSubscribers","ChanVeseBinarize","Character","CharacterCounts","CharacterEncoding","CharacterEncodingsPath","CharacteristicFunction","CharacteristicPolynomial","CharacterName","CharacterNormalize","CharacterRange","Characters","ChartBaseStyle","ChartElementData","ChartElementDataFunction","ChartElementFunction","ChartElements","ChartLabels","ChartLayout","ChartLegends","ChartStyle","Chebyshev1FilterModel","Chebyshev2FilterModel","ChebyshevDistance","ChebyshevT","ChebyshevU","Check","CheckAbort","CheckAll","Checkbox","CheckboxBar","CheckboxBox","CheckboxBoxOptions","ChemicalData","ChessboardDistance","ChiDistribution","ChineseRemainder","ChiSquareDistribution","ChoiceButtons","ChoiceDialog","CholeskyDecomposition","Chop","ChromaticityPlot","ChromaticityPlot3D","ChromaticPolynomial","Circle","CircleBox","CircleDot","CircleMinus","CirclePlus","CirclePoints","CircleThrough","CircleTimes","CirculantGraph","CircularOrthogonalMatrixDistribution","CircularQuaternionMatrixDistribution","CircularRealMatrixDistribution","CircularSymplecticMatrixDistribution","CircularUnitaryMatrixDistribution","Circumsphere","CityData","ClassifierFunction","ClassifierInformation","ClassifierMeasurements","ClassifierMeasurementsObject","Classify","ClassPriors","Clear","ClearAll","ClearAttributes","ClearCookies","ClearPermissions","ClearSystemCache","ClebschGordan","ClickPane","Clip","ClipboardNotebook","ClipFill","ClippingStyle","ClipPlanes","ClipPlanesStyle","ClipRange","Clock","ClockGauge","ClockwiseContourIntegral","Close","Closed","CloseKernels","ClosenessCentrality","Closing","ClosingAutoSave","ClosingEvent","ClosingSaveDialog","CloudAccountData","CloudBase","CloudConnect","CloudConnections","CloudDeploy","CloudDirectory","CloudDisconnect","CloudEvaluate","CloudExport","CloudExpression","CloudExpressions","CloudFunction","CloudGet","CloudImport","CloudLoggingData","CloudObject","CloudObjectInformation","CloudObjectInformationData","CloudObjectNameFormat","CloudObjects","CloudObjectURLType","CloudPublish","CloudPut","CloudRenderingMethod","CloudSave","CloudShare","CloudSubmit","CloudSymbol","CloudUnshare","CloudUserID","ClusterClassify","ClusterDissimilarityFunction","ClusteringComponents","ClusteringTree","CMYKColor","Coarse","CodeAssistOptions","Coefficient","CoefficientArrays","CoefficientDomain","CoefficientList","CoefficientRules","CoifletWavelet","Collect","Colon","ColonForm","ColorBalance","ColorCombine","ColorConvert","ColorCoverage","ColorData","ColorDataFunction","ColorDetect","ColorDistance","ColorFunction","ColorFunctionScaling","Colorize","ColorNegate","ColorOutput","ColorProfileData","ColorQ","ColorQuantize","ColorReplace","ColorRules","ColorSelectorSettings","ColorSeparate","ColorSetter","ColorSetterBox","ColorSetterBoxOptions","ColorSlider","ColorsNear","ColorSpace","ColorToneMapping","Column","ColumnAlignments","ColumnBackgrounds","ColumnForm","ColumnLines","ColumnsEqual","ColumnSpacings","ColumnWidths","CombinedEntityClass","CombinerFunction","CometData","CommonDefaultFormatTypes","Commonest","CommonestFilter","CommonName","CommonUnits","CommunityBoundaryStyle","CommunityGraphPlot","CommunityLabels","CommunityRegionStyle","CompanyData","CompatibleUnitQ","CompilationOptions","CompilationTarget","Compile","Compiled","CompiledCodeFunction","CompiledFunction","CompilerOptions","Complement","ComplementedEntityClass","CompleteGraph","CompleteGraphQ","CompleteKaryTree","CompletionsListPacket","Complex","ComplexContourPlot","Complexes","ComplexExpand","ComplexInfinity","ComplexityFunction","ComplexListPlot","ComplexPlot","ComplexPlot3D","ComplexRegionPlot","ComplexStreamPlot","ComplexVectorPlot","ComponentMeasurements","ComponentwiseContextMenu","Compose","ComposeList","ComposeSeries","CompositeQ","Composition","CompoundElement","CompoundExpression","CompoundPoissonDistribution","CompoundPoissonProcess","CompoundRenewalProcess","Compress","CompressedData","CompressionLevel","ComputeUncertainty","Condition","ConditionalExpression","Conditioned","Cone","ConeBox","ConfidenceLevel","ConfidenceRange","ConfidenceTransform","ConfigurationPath","ConformAudio","ConformImages","Congruent","ConicHullRegion","ConicHullRegion3DBox","ConicHullRegionBox","ConicOptimization","Conjugate","ConjugateTranspose","Conjunction","Connect","ConnectedComponents","ConnectedGraphComponents","ConnectedGraphQ","ConnectedMeshComponents","ConnectedMoleculeComponents","ConnectedMoleculeQ","ConnectionSettings","ConnectLibraryCallbackFunction","ConnectSystemModelComponents","ConnesWindow","ConoverTest","ConsoleMessage","ConsoleMessagePacket","Constant","ConstantArray","ConstantArrayLayer","ConstantImage","ConstantPlusLayer","ConstantRegionQ","Constants","ConstantTimesLayer","ConstellationData","ConstrainedMax","ConstrainedMin","Construct","Containing","ContainsAll","ContainsAny","ContainsExactly","ContainsNone","ContainsOnly","ContentFieldOptions","ContentLocationFunction","ContentObject","ContentPadding","ContentsBoundingBox","ContentSelectable","ContentSize","Context","ContextMenu","Contexts","ContextToFileName","Continuation","Continue","ContinuedFraction","ContinuedFractionK","ContinuousAction","ContinuousMarkovProcess","ContinuousTask","ContinuousTimeModelQ","ContinuousWaveletData","ContinuousWaveletTransform","ContourDetect","ContourGraphics","ContourIntegral","ContourLabels","ContourLines","ContourPlot","ContourPlot3D","Contours","ContourShading","ContourSmoothing","ContourStyle","ContraharmonicMean","ContrastiveLossLayer","Control","ControlActive","ControlAlignment","ControlGroupContentsBox","ControllabilityGramian","ControllabilityMatrix","ControllableDecomposition","ControllableModelQ","ControllerDuration","ControllerInformation","ControllerInformationData","ControllerLinking","ControllerManipulate","ControllerMethod","ControllerPath","ControllerState","ControlPlacement","ControlsRendering","ControlType","Convergents","ConversionOptions","ConversionRules","ConvertToBitmapPacket","ConvertToPostScript","ConvertToPostScriptPacket","ConvexHullMesh","ConvexPolygonQ","ConvexPolyhedronQ","ConvolutionLayer","Convolve","ConwayGroupCo1","ConwayGroupCo2","ConwayGroupCo3","CookieFunction","Cookies","CoordinateBoundingBox","CoordinateBoundingBoxArray","CoordinateBounds","CoordinateBoundsArray","CoordinateChartData","CoordinatesToolOptions","CoordinateTransform","CoordinateTransformData","CoprimeQ","Coproduct","CopulaDistribution","Copyable","CopyDatabin","CopyDirectory","CopyFile","CopyTag","CopyToClipboard","CornerFilter","CornerNeighbors","Correlation","CorrelationDistance","CorrelationFunction","CorrelationTest","Cos","Cosh","CoshIntegral","CosineDistance","CosineWindow","CosIntegral","Cot","Coth","Count","CountDistinct","CountDistinctBy","CounterAssignments","CounterBox","CounterBoxOptions","CounterClockwiseContourIntegral","CounterEvaluator","CounterFunction","CounterIncrements","CounterStyle","CounterStyleMenuListing","CountRoots","CountryData","Counts","CountsBy","Covariance","CovarianceEstimatorFunction","CovarianceFunction","CoxianDistribution","CoxIngersollRossProcess","CoxModel","CoxModelFit","CramerVonMisesTest","CreateArchive","CreateCellID","CreateChannel","CreateCloudExpression","CreateDatabin","CreateDataStructure","CreateDataSystemModel","CreateDialog","CreateDirectory","CreateDocument","CreateFile","CreateIntermediateDirectories","CreateManagedLibraryExpression","CreateNotebook","CreatePacletArchive","CreatePalette","CreatePalettePacket","CreatePermissionsGroup","CreateScheduledTask","CreateSearchIndex","CreateSystemModel","CreateTemporary","CreateUUID","CreateWindow","CriterionFunction","CriticalityFailureImportance","CriticalitySuccessImportance","CriticalSection","Cross","CrossEntropyLossLayer","CrossingCount","CrossingDetect","CrossingPolygon","CrossMatrix","Csc","Csch","CTCLossLayer","Cube","CubeRoot","Cubics","Cuboid","CuboidBox","Cumulant","CumulantGeneratingFunction","Cup","CupCap","Curl","CurlyDoubleQuote","CurlyQuote","CurrencyConvert","CurrentDate","CurrentImage","CurrentlySpeakingPacket","CurrentNotebookImage","CurrentScreenImage","CurrentValue","Curry","CurryApplied","CurvatureFlowFilter","CurveClosed","Cyan","CycleGraph","CycleIndexPolynomial","Cycles","CyclicGroup","Cyclotomic","Cylinder","CylinderBox","CylindricalDecomposition","D","DagumDistribution","DamData","DamerauLevenshteinDistance","DampingFactor","Darker","Dashed","Dashing","DatabaseConnect","DatabaseDisconnect","DatabaseReference","Databin","DatabinAdd","DatabinRemove","Databins","DatabinUpload","DataCompression","DataDistribution","DataRange","DataReversed","Dataset","DatasetDisplayPanel","DataStructure","DataStructureQ","Date","DateBounds","Dated","DateDelimiters","DateDifference","DatedUnit","DateFormat","DateFunction","DateHistogram","DateInterval","DateList","DateListLogPlot","DateListPlot","DateListStepPlot","DateObject","DateObjectQ","DateOverlapsQ","DatePattern","DatePlus","DateRange","DateReduction","DateString","DateTicksFormat","DateValue","DateWithinQ","DaubechiesWavelet","DavisDistribution","DawsonF","DayCount","DayCountConvention","DayHemisphere","DaylightQ","DayMatchQ","DayName","DayNightTerminator","DayPlus","DayRange","DayRound","DeBruijnGraph","DeBruijnSequence","Debug","DebugTag","Decapitalize","Decimal","DecimalForm","DeclareKnownSymbols","DeclarePackage","Decompose","DeconvolutionLayer","Decrement","Decrypt","DecryptFile","DedekindEta","DeepSpaceProbeData","Default","DefaultAxesStyle","DefaultBaseStyle","DefaultBoxStyle","DefaultButton","DefaultColor","DefaultControlPlacement","DefaultDuplicateCellStyle","DefaultDuration","DefaultElement","DefaultFaceGridsStyle","DefaultFieldHintStyle","DefaultFont","DefaultFontProperties","DefaultFormatType","DefaultFormatTypeForStyle","DefaultFrameStyle","DefaultFrameTicksStyle","DefaultGridLinesStyle","DefaultInlineFormatType","DefaultInputFormatType","DefaultLabelStyle","DefaultMenuStyle","DefaultNaturalLanguage","DefaultNewCellStyle","DefaultNewInlineCellStyle","DefaultNotebook","DefaultOptions","DefaultOutputFormatType","DefaultPrintPrecision","DefaultStyle","DefaultStyleDefinitions","DefaultTextFormatType","DefaultTextInlineFormatType","DefaultTicksStyle","DefaultTooltipStyle","DefaultValue","DefaultValues","Defer","DefineExternal","DefineInputStreamMethod","DefineOutputStreamMethod","DefineResourceFunction","Definition","Degree","DegreeCentrality","DegreeGraphDistribution","DegreeLexicographic","DegreeReverseLexicographic","DEigensystem","DEigenvalues","Deinitialization","Del","DelaunayMesh","Delayed","Deletable","Delete","DeleteAnomalies","DeleteBorderComponents","DeleteCases","DeleteChannel","DeleteCloudExpression","DeleteContents","DeleteDirectory","DeleteDuplicates","DeleteDuplicatesBy","DeleteFile","DeleteMissing","DeleteObject","DeletePermissionsKey","DeleteSearchIndex","DeleteSmallComponents","DeleteStopwords","DeleteWithContents","DeletionWarning","DelimitedArray","DelimitedSequence","Delimiter","DelimiterFlashTime","DelimiterMatching","Delimiters","DeliveryFunction","Dendrogram","Denominator","DensityGraphics","DensityHistogram","DensityPlot","DensityPlot3D","DependentVariables","Deploy","Deployed","Depth","DepthFirstScan","Derivative","DerivativeFilter","DerivedKey","DescriptorStateSpace","DesignMatrix","DestroyAfterEvaluation","Det","DeviceClose","DeviceConfigure","DeviceExecute","DeviceExecuteAsynchronous","DeviceObject","DeviceOpen","DeviceOpenQ","DeviceRead","DeviceReadBuffer","DeviceReadLatest","DeviceReadList","DeviceReadTimeSeries","Devices","DeviceStreams","DeviceWrite","DeviceWriteBuffer","DGaussianWavelet","DiacriticalPositioning","Diagonal","DiagonalizableMatrixQ","DiagonalMatrix","DiagonalMatrixQ","Dialog","DialogIndent","DialogInput","DialogLevel","DialogNotebook","DialogProlog","DialogReturn","DialogSymbols","Diamond","DiamondMatrix","DiceDissimilarity","DictionaryLookup","DictionaryWordQ","DifferenceDelta","DifferenceOrder","DifferenceQuotient","DifferenceRoot","DifferenceRootReduce","Differences","DifferentialD","DifferentialRoot","DifferentialRootReduce","DifferentiatorFilter","DigitalSignature","DigitBlock","DigitBlockMinimum","DigitCharacter","DigitCount","DigitQ","DihedralAngle","DihedralGroup","Dilation","DimensionalCombinations","DimensionalMeshComponents","DimensionReduce","DimensionReducerFunction","DimensionReduction","Dimensions","DiracComb","DiracDelta","DirectedEdge","DirectedEdges","DirectedGraph","DirectedGraphQ","DirectedInfinity","Direction","Directive","Directory","DirectoryName","DirectoryQ","DirectoryStack","DirichletBeta","DirichletCharacter","DirichletCondition","DirichletConvolve","DirichletDistribution","DirichletEta","DirichletL","DirichletLambda","DirichletTransform","DirichletWindow","DisableConsolePrintPacket","DisableFormatting","DiscreteAsymptotic","DiscreteChirpZTransform","DiscreteConvolve","DiscreteDelta","DiscreteHadamardTransform","DiscreteIndicator","DiscreteLimit","DiscreteLQEstimatorGains","DiscreteLQRegulatorGains","DiscreteLyapunovSolve","DiscreteMarkovProcess","DiscreteMaxLimit","DiscreteMinLimit","DiscretePlot","DiscretePlot3D","DiscreteRatio","DiscreteRiccatiSolve","DiscreteShift","DiscreteTimeModelQ","DiscreteUniformDistribution","DiscreteVariables","DiscreteWaveletData","DiscreteWaveletPacketTransform","DiscreteWaveletTransform","DiscretizeGraphics","DiscretizeRegion","Discriminant","DisjointQ","Disjunction","Disk","DiskBox","DiskMatrix","DiskSegment","Dispatch","DispatchQ","DispersionEstimatorFunction","Display","DisplayAllSteps","DisplayEndPacket","DisplayFlushImagePacket","DisplayForm","DisplayFunction","DisplayPacket","DisplayRules","DisplaySetSizePacket","DisplayString","DisplayTemporary","DisplayWith","DisplayWithRef","DisplayWithVariable","DistanceFunction","DistanceMatrix","DistanceTransform","Distribute","Distributed","DistributedContexts","DistributeDefinitions","DistributionChart","DistributionDomain","DistributionFitTest","DistributionParameterAssumptions","DistributionParameterQ","Dithering","Div","Divergence","Divide","DivideBy","Dividers","DivideSides","Divisible","Divisors","DivisorSigma","DivisorSum","DMSList","DMSString","Do","DockedCells","DocumentGenerator","DocumentGeneratorInformation","DocumentGeneratorInformationData","DocumentGenerators","DocumentNotebook","DocumentWeightingRules","Dodecahedron","DomainRegistrationInformation","DominantColors","DOSTextFormat","Dot","DotDashed","DotEqual","DotLayer","DotPlusLayer","Dotted","DoubleBracketingBar","DoubleContourIntegral","DoubleDownArrow","DoubleLeftArrow","DoubleLeftRightArrow","DoubleLeftTee","DoubleLongLeftArrow","DoubleLongLeftRightArrow","DoubleLongRightArrow","DoubleRightArrow","DoubleRightTee","DoubleUpArrow","DoubleUpDownArrow","DoubleVerticalBar","DoublyInfinite","Down","DownArrow","DownArrowBar","DownArrowUpArrow","DownLeftRightVector","DownLeftTeeVector","DownLeftVector","DownLeftVectorBar","DownRightTeeVector","DownRightVector","DownRightVectorBar","Downsample","DownTee","DownTeeArrow","DownValues","DragAndDrop","DrawEdges","DrawFrontFaces","DrawHighlighted","Drop","DropoutLayer","DSolve","DSolveValue","Dt","DualLinearProgramming","DualPolyhedron","DualSystemsModel","DumpGet","DumpSave","DuplicateFreeQ","Duration","Dynamic","DynamicBox","DynamicBoxOptions","DynamicEvaluationTimeout","DynamicGeoGraphics","DynamicImage","DynamicLocation","DynamicModule","DynamicModuleBox","DynamicModuleBoxOptions","DynamicModuleParent","DynamicModuleValues","DynamicName","DynamicNamespace","DynamicReference","DynamicSetting","DynamicUpdating","DynamicWrapper","DynamicWrapperBox","DynamicWrapperBoxOptions","E","EarthImpactData","EarthquakeData","EccentricityCentrality","Echo","EchoFunction","EclipseType","EdgeAdd","EdgeBetweennessCentrality","EdgeCapacity","EdgeCapForm","EdgeColor","EdgeConnectivity","EdgeContract","EdgeCost","EdgeCount","EdgeCoverQ","EdgeCycleMatrix","EdgeDashing","EdgeDelete","EdgeDetect","EdgeForm","EdgeIndex","EdgeJoinForm","EdgeLabeling","EdgeLabels","EdgeLabelStyle","EdgeList","EdgeOpacity","EdgeQ","EdgeRenderingFunction","EdgeRules","EdgeShapeFunction","EdgeStyle","EdgeTaggedGraph","EdgeTaggedGraphQ","EdgeTags","EdgeThickness","EdgeWeight","EdgeWeightedGraphQ","Editable","EditButtonSettings","EditCellTagsSettings","EditDistance","EffectiveInterest","Eigensystem","Eigenvalues","EigenvectorCentrality","Eigenvectors","Element","ElementData","ElementwiseLayer","ElidedForms","Eliminate","EliminationOrder","Ellipsoid","EllipticE","EllipticExp","EllipticExpPrime","EllipticF","EllipticFilterModel","EllipticK","EllipticLog","EllipticNomeQ","EllipticPi","EllipticReducedHalfPeriods","EllipticTheta","EllipticThetaPrime","EmbedCode","EmbeddedHTML","EmbeddedService","EmbeddingLayer","EmbeddingObject","EmitSound","EmphasizeSyntaxErrors","EmpiricalDistribution","Empty","EmptyGraphQ","EmptyRegion","EnableConsolePrintPacket","Enabled","Encode","Encrypt","EncryptedObject","EncryptFile","End","EndAdd","EndDialogPacket","EndFrontEndInteractionPacket","EndOfBuffer","EndOfFile","EndOfLine","EndOfString","EndPackage","EngineEnvironment","EngineeringForm","Enter","EnterExpressionPacket","EnterTextPacket","Entity","EntityClass","EntityClassList","EntityCopies","EntityFunction","EntityGroup","EntityInstance","EntityList","EntityPrefetch","EntityProperties","EntityProperty","EntityPropertyClass","EntityRegister","EntityStore","EntityStores","EntityTypeName","EntityUnregister","EntityValue","Entropy","EntropyFilter","Environment","Epilog","EpilogFunction","Equal","EqualColumns","EqualRows","EqualTilde","EqualTo","EquatedTo","Equilibrium","EquirippleFilterKernel","Equivalent","Erf","Erfc","Erfi","ErlangB","ErlangC","ErlangDistribution","Erosion","ErrorBox","ErrorBoxOptions","ErrorNorm","ErrorPacket","ErrorsDialogSettings","EscapeRadius","EstimatedBackground","EstimatedDistribution","EstimatedProcess","EstimatorGains","EstimatorRegulator","EuclideanDistance","EulerAngles","EulerCharacteristic","EulerE","EulerGamma","EulerianGraphQ","EulerMatrix","EulerPhi","Evaluatable","Evaluate","Evaluated","EvaluatePacket","EvaluateScheduledTask","EvaluationBox","EvaluationCell","EvaluationCompletionAction","EvaluationData","EvaluationElements","EvaluationEnvironment","EvaluationMode","EvaluationMonitor","EvaluationNotebook","EvaluationObject","EvaluationOrder","Evaluator","EvaluatorNames","EvenQ","EventData","EventEvaluator","EventHandler","EventHandlerTag","EventLabels","EventSeries","ExactBlackmanWindow","ExactNumberQ","ExactRootIsolation","ExampleData","Except","ExcludedForms","ExcludedLines","ExcludedPhysicalQuantities","ExcludePods","Exclusions","ExclusionsStyle","Exists","Exit","ExitDialog","ExoplanetData","Exp","Expand","ExpandAll","ExpandDenominator","ExpandFileName","ExpandNumerator","Expectation","ExpectationE","ExpectedValue","ExpGammaDistribution","ExpIntegralE","ExpIntegralEi","ExpirationDate","Exponent","ExponentFunction","ExponentialDistribution","ExponentialFamily","ExponentialGeneratingFunction","ExponentialMovingAverage","ExponentialPowerDistribution","ExponentPosition","ExponentStep","Export","ExportAutoReplacements","ExportByteArray","ExportForm","ExportPacket","ExportString","Expression","ExpressionCell","ExpressionGraph","ExpressionPacket","ExpressionUUID","ExpToTrig","ExtendedEntityClass","ExtendedGCD","Extension","ExtentElementFunction","ExtentMarkers","ExtentSize","ExternalBundle","ExternalCall","ExternalDataCharacterEncoding","ExternalEvaluate","ExternalFunction","ExternalFunctionName","ExternalIdentifier","ExternalObject","ExternalOptions","ExternalSessionObject","ExternalSessions","ExternalStorageBase","ExternalStorageDownload","ExternalStorageGet","ExternalStorageObject","ExternalStoragePut","ExternalStorageUpload","ExternalTypeSignature","ExternalValue","Extract","ExtractArchive","ExtractLayer","ExtractPacletArchive","ExtremeValueDistribution","FaceAlign","FaceForm","FaceGrids","FaceGridsStyle","FacialFeatures","Factor","FactorComplete","Factorial","Factorial2","FactorialMoment","FactorialMomentGeneratingFunction","FactorialPower","FactorInteger","FactorList","FactorSquareFree","FactorSquareFreeList","FactorTerms","FactorTermsList","Fail","Failure","FailureAction","FailureDistribution","FailureQ","False","FareySequence","FARIMAProcess","FeatureDistance","FeatureExtract","FeatureExtraction","FeatureExtractor","FeatureExtractorFunction","FeatureNames","FeatureNearest","FeatureSpacePlot","FeatureSpacePlot3D","FeatureTypes","FEDisableConsolePrintPacket","FeedbackLinearize","FeedbackSector","FeedbackSectorStyle","FeedbackType","FEEnableConsolePrintPacket","FetalGrowthData","Fibonacci","Fibonorial","FieldCompletionFunction","FieldHint","FieldHintStyle","FieldMasked","FieldSize","File","FileBaseName","FileByteCount","FileConvert","FileDate","FileExistsQ","FileExtension","FileFormat","FileHandler","FileHash","FileInformation","FileName","FileNameDepth","FileNameDialogSettings","FileNameDrop","FileNameForms","FileNameJoin","FileNames","FileNameSetter","FileNameSplit","FileNameTake","FilePrint","FileSize","FileSystemMap","FileSystemScan","FileTemplate","FileTemplateApply","FileType","FilledCurve","FilledCurveBox","FilledCurveBoxOptions","Filling","FillingStyle","FillingTransform","FilteredEntityClass","FilterRules","FinancialBond","FinancialData","FinancialDerivative","FinancialIndicator","Find","FindAnomalies","FindArgMax","FindArgMin","FindChannels","FindClique","FindClusters","FindCookies","FindCurvePath","FindCycle","FindDevices","FindDistribution","FindDistributionParameters","FindDivisions","FindEdgeCover","FindEdgeCut","FindEdgeIndependentPaths","FindEquationalProof","FindEulerianCycle","FindExternalEvaluators","FindFaces","FindFile","FindFit","FindFormula","FindFundamentalCycles","FindGeneratingFunction","FindGeoLocation","FindGeometricConjectures","FindGeometricTransform","FindGraphCommunities","FindGraphIsomorphism","FindGraphPartition","FindHamiltonianCycle","FindHamiltonianPath","FindHiddenMarkovStates","FindImageText","FindIndependentEdgeSet","FindIndependentVertexSet","FindInstance","FindIntegerNullVector","FindKClan","FindKClique","FindKClub","FindKPlex","FindLibrary","FindLinearRecurrence","FindList","FindMatchingColor","FindMaximum","FindMaximumCut","FindMaximumFlow","FindMaxValue","FindMeshDefects","FindMinimum","FindMinimumCostFlow","FindMinimumCut","FindMinValue","FindMoleculeSubstructure","FindPath","FindPeaks","FindPermutation","FindPostmanTour","FindProcessParameters","FindRepeat","FindRoot","FindSequenceFunction","FindSettings","FindShortestPath","FindShortestTour","FindSpanningTree","FindSystemModelEquilibrium","FindTextualAnswer","FindThreshold","FindTransientRepeat","FindVertexCover","FindVertexCut","FindVertexIndependentPaths","Fine","FinishDynamic","FiniteAbelianGroupCount","FiniteGroupCount","FiniteGroupData","First","FirstCase","FirstPassageTimeDistribution","FirstPosition","FischerGroupFi22","FischerGroupFi23","FischerGroupFi24Prime","FisherHypergeometricDistribution","FisherRatioTest","FisherZDistribution","Fit","FitAll","FitRegularization","FittedModel","FixedOrder","FixedPoint","FixedPointList","FlashSelection","Flat","Flatten","FlattenAt","FlattenLayer","FlatTopWindow","FlipView","Floor","FlowPolynomial","FlushPrintOutputPacket","Fold","FoldList","FoldPair","FoldPairList","FollowRedirects","Font","FontColor","FontFamily","FontForm","FontName","FontOpacity","FontPostScriptName","FontProperties","FontReencoding","FontSize","FontSlant","FontSubstitutions","FontTracking","FontVariations","FontWeight","For","ForAll","ForceVersionInstall","Format","FormatRules","FormatType","FormatTypeAutoConvert","FormatValues","FormBox","FormBoxOptions","FormControl","FormFunction","FormLayoutFunction","FormObject","FormPage","FormTheme","FormulaData","FormulaLookup","FortranForm","Forward","ForwardBackward","Fourier","FourierCoefficient","FourierCosCoefficient","FourierCosSeries","FourierCosTransform","FourierDCT","FourierDCTFilter","FourierDCTMatrix","FourierDST","FourierDSTMatrix","FourierMatrix","FourierParameters","FourierSequenceTransform","FourierSeries","FourierSinCoefficient","FourierSinSeries","FourierSinTransform","FourierTransform","FourierTrigSeries","FractionalBrownianMotionProcess","FractionalGaussianNoiseProcess","FractionalPart","FractionBox","FractionBoxOptions","FractionLine","Frame","FrameBox","FrameBoxOptions","Framed","FrameInset","FrameLabel","Frameless","FrameMargins","FrameRate","FrameStyle","FrameTicks","FrameTicksStyle","FRatioDistribution","FrechetDistribution","FreeQ","FrenetSerretSystem","FrequencySamplingFilterKernel","FresnelC","FresnelF","FresnelG","FresnelS","Friday","FrobeniusNumber","FrobeniusSolve","FromAbsoluteTime","FromCharacterCode","FromCoefficientRules","FromContinuedFraction","FromDate","FromDigits","FromDMS","FromEntity","FromJulianDate","FromLetterNumber","FromPolarCoordinates","FromRomanNumeral","FromSphericalCoordinates","FromUnixTime","Front","FrontEndDynamicExpression","FrontEndEventActions","FrontEndExecute","FrontEndObject","FrontEndResource","FrontEndResourceString","FrontEndStackSize","FrontEndToken","FrontEndTokenExecute","FrontEndValueCache","FrontEndVersion","FrontFaceColor","FrontFaceOpacity","Full","FullAxes","FullDefinition","FullForm","FullGraphics","FullInformationOutputRegulator","FullOptions","FullRegion","FullSimplify","Function","FunctionCompile","FunctionCompileExport","FunctionCompileExportByteArray","FunctionCompileExportLibrary","FunctionCompileExportString","FunctionDomain","FunctionExpand","FunctionInterpolation","FunctionPeriod","FunctionRange","FunctionSpace","FussellVeselyImportance","GaborFilter","GaborMatrix","GaborWavelet","GainMargins","GainPhaseMargins","GalaxyData","GalleryView","Gamma","GammaDistribution","GammaRegularized","GapPenalty","GARCHProcess","GatedRecurrentLayer","Gather","GatherBy","GaugeFaceElementFunction","GaugeFaceStyle","GaugeFrameElementFunction","GaugeFrameSize","GaugeFrameStyle","GaugeLabels","GaugeMarkers","GaugeStyle","GaussianFilter","GaussianIntegers","GaussianMatrix","GaussianOrthogonalMatrixDistribution","GaussianSymplecticMatrixDistribution","GaussianUnitaryMatrixDistribution","GaussianWindow","GCD","GegenbauerC","General","GeneralizedLinearModelFit","GenerateAsymmetricKeyPair","GenerateConditions","GeneratedCell","GeneratedDocumentBinding","GenerateDerivedKey","GenerateDigitalSignature","GenerateDocument","GeneratedParameters","GeneratedQuantityMagnitudes","GenerateFileSignature","GenerateHTTPResponse","GenerateSecuredAuthenticationKey","GenerateSymmetricKey","GeneratingFunction","GeneratorDescription","GeneratorHistoryLength","GeneratorOutputType","Generic","GenericCylindricalDecomposition","GenomeData","GenomeLookup","GeoAntipode","GeoArea","GeoArraySize","GeoBackground","GeoBoundingBox","GeoBounds","GeoBoundsRegion","GeoBubbleChart","GeoCenter","GeoCircle","GeoContourPlot","GeoDensityPlot","GeodesicClosing","GeodesicDilation","GeodesicErosion","GeodesicOpening","GeoDestination","GeodesyData","GeoDirection","GeoDisk","GeoDisplacement","GeoDistance","GeoDistanceList","GeoElevationData","GeoEntities","GeoGraphics","GeogravityModelData","GeoGridDirectionDifference","GeoGridLines","GeoGridLinesStyle","GeoGridPosition","GeoGridRange","GeoGridRangePadding","GeoGridUnitArea","GeoGridUnitDistance","GeoGridVector","GeoGroup","GeoHemisphere","GeoHemisphereBoundary","GeoHistogram","GeoIdentify","GeoImage","GeoLabels","GeoLength","GeoListPlot","GeoLocation","GeologicalPeriodData","GeomagneticModelData","GeoMarker","GeometricAssertion","GeometricBrownianMotionProcess","GeometricDistribution","GeometricMean","GeometricMeanFilter","GeometricOptimization","GeometricScene","GeometricTransformation","GeometricTransformation3DBox","GeometricTransformation3DBoxOptions","GeometricTransformationBox","GeometricTransformationBoxOptions","GeoModel","GeoNearest","GeoPath","GeoPosition","GeoPositionENU","GeoPositionXYZ","GeoProjection","GeoProjectionData","GeoRange","GeoRangePadding","GeoRegionValuePlot","GeoResolution","GeoScaleBar","GeoServer","GeoSmoothHistogram","GeoStreamPlot","GeoStyling","GeoStylingImageFunction","GeoVariant","GeoVector","GeoVectorENU","GeoVectorPlot","GeoVectorXYZ","GeoVisibleRegion","GeoVisibleRegionBoundary","GeoWithinQ","GeoZoomLevel","GestureHandler","GestureHandlerTag","Get","GetBoundingBoxSizePacket","GetContext","GetEnvironment","GetFileName","GetFrontEndOptionsDataPacket","GetLinebreakInformationPacket","GetMenusPacket","GetPageBreakInformationPacket","Glaisher","GlobalClusteringCoefficient","GlobalPreferences","GlobalSession","Glow","GoldenAngle","GoldenRatio","GompertzMakehamDistribution","GoochShading","GoodmanKruskalGamma","GoodmanKruskalGammaTest","Goto","Grad","Gradient","GradientFilter","GradientOrientationFilter","GrammarApply","GrammarRules","GrammarToken","Graph","Graph3D","GraphAssortativity","GraphAutomorphismGroup","GraphCenter","GraphComplement","GraphData","GraphDensity","GraphDiameter","GraphDifference","GraphDisjointUnion","GraphDistance","GraphDistanceMatrix","GraphElementData","GraphEmbedding","GraphHighlight","GraphHighlightStyle","GraphHub","Graphics","Graphics3D","Graphics3DBox","Graphics3DBoxOptions","GraphicsArray","GraphicsBaseline","GraphicsBox","GraphicsBoxOptions","GraphicsColor","GraphicsColumn","GraphicsComplex","GraphicsComplex3DBox","GraphicsComplex3DBoxOptions","GraphicsComplexBox","GraphicsComplexBoxOptions","GraphicsContents","GraphicsData","GraphicsGrid","GraphicsGridBox","GraphicsGroup","GraphicsGroup3DBox","GraphicsGroup3DBoxOptions","GraphicsGroupBox","GraphicsGroupBoxOptions","GraphicsGrouping","GraphicsHighlightColor","GraphicsRow","GraphicsSpacing","GraphicsStyle","GraphIntersection","GraphLayout","GraphLinkEfficiency","GraphPeriphery","GraphPlot","GraphPlot3D","GraphPower","GraphPropertyDistribution","GraphQ","GraphRadius","GraphReciprocity","GraphRoot","GraphStyle","GraphUnion","Gray","GrayLevel","Greater","GreaterEqual","GreaterEqualLess","GreaterEqualThan","GreaterFullEqual","GreaterGreater","GreaterLess","GreaterSlantEqual","GreaterThan","GreaterTilde","Green","GreenFunction","Grid","GridBaseline","GridBox","GridBoxAlignment","GridBoxBackground","GridBoxDividers","GridBoxFrame","GridBoxItemSize","GridBoxItemStyle","GridBoxOptions","GridBoxSpacings","GridCreationSettings","GridDefaultElement","GridElementStyleOptions","GridFrame","GridFrameMargins","GridGraph","GridLines","GridLinesStyle","GroebnerBasis","GroupActionBase","GroupBy","GroupCentralizer","GroupElementFromWord","GroupElementPosition","GroupElementQ","GroupElements","GroupElementToWord","GroupGenerators","Groupings","GroupMultiplicationTable","GroupOrbits","GroupOrder","GroupPageBreakWithin","GroupSetwiseStabilizer","GroupStabilizer","GroupStabilizerChain","GroupTogetherGrouping","GroupTogetherNestedGrouping","GrowCutComponents","Gudermannian","GuidedFilter","GumbelDistribution","HaarWavelet","HadamardMatrix","HalfLine","HalfNormalDistribution","HalfPlane","HalfSpace","HalftoneShading","HamiltonianGraphQ","HammingDistance","HammingWindow","HandlerFunctions","HandlerFunctionsKeys","HankelH1","HankelH2","HankelMatrix","HankelTransform","HannPoissonWindow","HannWindow","HaradaNortonGroupHN","HararyGraph","HarmonicMean","HarmonicMeanFilter","HarmonicNumber","Hash","HatchFilling","HatchShading","Haversine","HazardFunction","Head","HeadCompose","HeaderAlignment","HeaderBackground","HeaderDisplayFunction","HeaderLines","HeaderSize","HeaderStyle","Heads","HeavisideLambda","HeavisidePi","HeavisideTheta","HeldGroupHe","HeldPart","HelpBrowserLookup","HelpBrowserNotebook","HelpBrowserSettings","Here","HermiteDecomposition","HermiteH","HermitianMatrixQ","HessenbergDecomposition","Hessian","HeunB","HeunBPrime","HeunC","HeunCPrime","HeunD","HeunDPrime","HeunG","HeunGPrime","HeunT","HeunTPrime","HexadecimalCharacter","Hexahedron","HexahedronBox","HexahedronBoxOptions","HiddenItems","HiddenMarkovProcess","HiddenSurface","Highlighted","HighlightGraph","HighlightImage","HighlightMesh","HighpassFilter","HigmanSimsGroupHS","HilbertCurve","HilbertFilter","HilbertMatrix","Histogram","Histogram3D","HistogramDistribution","HistogramList","HistogramTransform","HistogramTransformInterpolation","HistoricalPeriodData","HitMissTransform","HITSCentrality","HjorthDistribution","HodgeDual","HoeffdingD","HoeffdingDTest","Hold","HoldAll","HoldAllComplete","HoldComplete","HoldFirst","HoldForm","HoldPattern","HoldRest","HolidayCalendar","HomeDirectory","HomePage","Horizontal","HorizontalForm","HorizontalGauge","HorizontalScrollPosition","HornerForm","HostLookup","HotellingTSquareDistribution","HoytDistribution","HTMLSave","HTTPErrorResponse","HTTPRedirect","HTTPRequest","HTTPRequestData","HTTPResponse","Hue","HumanGrowthData","HumpDownHump","HumpEqual","HurwitzLerchPhi","HurwitzZeta","HyperbolicDistribution","HypercubeGraph","HyperexponentialDistribution","Hyperfactorial","Hypergeometric0F1","Hypergeometric0F1Regularized","Hypergeometric1F1","Hypergeometric1F1Regularized","Hypergeometric2F1","Hypergeometric2F1Regularized","HypergeometricDistribution","HypergeometricPFQ","HypergeometricPFQRegularized","HypergeometricU","Hyperlink","HyperlinkAction","HyperlinkCreationSettings","Hyperplane","Hyphenation","HyphenationOptions","HypoexponentialDistribution","HypothesisTestData","I","IconData","Iconize","IconizedObject","IconRules","Icosahedron","Identity","IdentityMatrix","If","IgnoreCase","IgnoreDiacritics","IgnorePunctuation","IgnoreSpellCheck","IgnoringInactive","Im","Image","Image3D","Image3DProjection","Image3DSlices","ImageAccumulate","ImageAdd","ImageAdjust","ImageAlign","ImageApply","ImageApplyIndexed","ImageAspectRatio","ImageAssemble","ImageAugmentationLayer","ImageBoundingBoxes","ImageCache","ImageCacheValid","ImageCapture","ImageCaptureFunction","ImageCases","ImageChannels","ImageClip","ImageCollage","ImageColorSpace","ImageCompose","ImageContainsQ","ImageContents","ImageConvolve","ImageCooccurrence","ImageCorners","ImageCorrelate","ImageCorrespondingPoints","ImageCrop","ImageData","ImageDeconvolve","ImageDemosaic","ImageDifference","ImageDimensions","ImageDisplacements","ImageDistance","ImageEffect","ImageExposureCombine","ImageFeatureTrack","ImageFileApply","ImageFileFilter","ImageFileScan","ImageFilter","ImageFocusCombine","ImageForestingComponents","ImageFormattingWidth","ImageForwardTransformation","ImageGraphics","ImageHistogram","ImageIdentify","ImageInstanceQ","ImageKeypoints","ImageLabels","ImageLegends","ImageLevels","ImageLines","ImageMargins","ImageMarker","ImageMarkers","ImageMeasurements","ImageMesh","ImageMultiply","ImageOffset","ImagePad","ImagePadding","ImagePartition","ImagePeriodogram","ImagePerspectiveTransformation","ImagePosition","ImagePreviewFunction","ImagePyramid","ImagePyramidApply","ImageQ","ImageRangeCache","ImageRecolor","ImageReflect","ImageRegion","ImageResize","ImageResolution","ImageRestyle","ImageRotate","ImageRotated","ImageSaliencyFilter","ImageScaled","ImageScan","ImageSize","ImageSizeAction","ImageSizeCache","ImageSizeMultipliers","ImageSizeRaw","ImageSubtract","ImageTake","ImageTransformation","ImageTrim","ImageType","ImageValue","ImageValuePositions","ImagingDevice","ImplicitRegion","Implies","Import","ImportAutoReplacements","ImportByteArray","ImportOptions","ImportString","ImprovementImportance","In","Inactivate","Inactive","IncidenceGraph","IncidenceList","IncidenceMatrix","IncludeAromaticBonds","IncludeConstantBasis","IncludeDefinitions","IncludeDirectories","IncludeFileExtension","IncludeGeneratorTasks","IncludeHydrogens","IncludeInflections","IncludeMetaInformation","IncludePods","IncludeQuantities","IncludeRelatedTables","IncludeSingularTerm","IncludeWindowTimes","Increment","IndefiniteMatrixQ","Indent","IndentingNewlineSpacings","IndentMaxFraction","IndependenceTest","IndependentEdgeSetQ","IndependentPhysicalQuantity","IndependentUnit","IndependentUnitDimension","IndependentVertexSetQ","Indeterminate","IndeterminateThreshold","IndexCreationOptions","Indexed","IndexEdgeTaggedGraph","IndexGraph","IndexTag","Inequality","InexactNumberQ","InexactNumbers","InfiniteFuture","InfiniteLine","InfinitePast","InfinitePlane","Infinity","Infix","InflationAdjust","InflationMethod","Information","InformationData","InformationDataGrid","Inherited","InheritScope","InhomogeneousPoissonProcess","InitialEvaluationHistory","Initialization","InitializationCell","InitializationCellEvaluation","InitializationCellWarning","InitializationObjects","InitializationValue","Initialize","InitialSeeding","InlineCounterAssignments","InlineCounterIncrements","InlineRules","Inner","InnerPolygon","InnerPolyhedron","Inpaint","Input","InputAliases","InputAssumptions","InputAutoReplacements","InputField","InputFieldBox","InputFieldBoxOptions","InputForm","InputGrouping","InputNamePacket","InputNotebook","InputPacket","InputSettings","InputStream","InputString","InputStringPacket","InputToBoxFormPacket","Insert","InsertionFunction","InsertionPointObject","InsertLinebreaks","InsertResults","Inset","Inset3DBox","Inset3DBoxOptions","InsetBox","InsetBoxOptions","Insphere","Install","InstallService","InstanceNormalizationLayer","InString","Integer","IntegerDigits","IntegerExponent","IntegerLength","IntegerName","IntegerPart","IntegerPartitions","IntegerQ","IntegerReverse","Integers","IntegerString","Integral","Integrate","Interactive","InteractiveTradingChart","Interlaced","Interleaving","InternallyBalancedDecomposition","InterpolatingFunction","InterpolatingPolynomial","Interpolation","InterpolationOrder","InterpolationPoints","InterpolationPrecision","Interpretation","InterpretationBox","InterpretationBoxOptions","InterpretationFunction","Interpreter","InterpretTemplate","InterquartileRange","Interrupt","InterruptSettings","IntersectedEntityClass","IntersectingQ","Intersection","Interval","IntervalIntersection","IntervalMarkers","IntervalMarkersStyle","IntervalMemberQ","IntervalSlider","IntervalUnion","Into","Inverse","InverseBetaRegularized","InverseCDF","InverseChiSquareDistribution","InverseContinuousWaveletTransform","InverseDistanceTransform","InverseEllipticNomeQ","InverseErf","InverseErfc","InverseFourier","InverseFourierCosTransform","InverseFourierSequenceTransform","InverseFourierSinTransform","InverseFourierTransform","InverseFunction","InverseFunctions","InverseGammaDistribution","InverseGammaRegularized","InverseGaussianDistribution","InverseGudermannian","InverseHankelTransform","InverseHaversine","InverseImagePyramid","InverseJacobiCD","InverseJacobiCN","InverseJacobiCS","InverseJacobiDC","InverseJacobiDN","InverseJacobiDS","InverseJacobiNC","InverseJacobiND","InverseJacobiNS","InverseJacobiSC","InverseJacobiSD","InverseJacobiSN","InverseLaplaceTransform","InverseMellinTransform","InversePermutation","InverseRadon","InverseRadonTransform","InverseSeries","InverseShortTimeFourier","InverseSpectrogram","InverseSurvivalFunction","InverseTransformedRegion","InverseWaveletTransform","InverseWeierstrassP","InverseWishartMatrixDistribution","InverseZTransform","Invisible","InvisibleApplication","InvisibleTimes","IPAddress","IrreduciblePolynomialQ","IslandData","IsolatingInterval","IsomorphicGraphQ","IsotopeData","Italic","Item","ItemAspectRatio","ItemBox","ItemBoxOptions","ItemDisplayFunction","ItemSize","ItemStyle","ItoProcess","JaccardDissimilarity","JacobiAmplitude","Jacobian","JacobiCD","JacobiCN","JacobiCS","JacobiDC","JacobiDN","JacobiDS","JacobiNC","JacobiND","JacobiNS","JacobiP","JacobiSC","JacobiSD","JacobiSN","JacobiSymbol","JacobiZeta","JankoGroupJ1","JankoGroupJ2","JankoGroupJ3","JankoGroupJ4","JarqueBeraALMTest","JohnsonDistribution","Join","JoinAcross","Joined","JoinedCurve","JoinedCurveBox","JoinedCurveBoxOptions","JoinForm","JordanDecomposition","JordanModelDecomposition","JulianDate","JuliaSetBoettcher","JuliaSetIterationCount","JuliaSetPlot","JuliaSetPoints","K","KagiChart","KaiserBesselWindow","KaiserWindow","KalmanEstimator","KalmanFilter","KarhunenLoeveDecomposition","KaryTree","KatzCentrality","KCoreComponents","KDistribution","KEdgeConnectedComponents","KEdgeConnectedGraphQ","KeepExistingVersion","KelvinBei","KelvinBer","KelvinKei","KelvinKer","KendallTau","KendallTauTest","KernelExecute","KernelFunction","KernelMixtureDistribution","KernelObject","Kernels","Ket","Key","KeyCollisionFunction","KeyComplement","KeyDrop","KeyDropFrom","KeyExistsQ","KeyFreeQ","KeyIntersection","KeyMap","KeyMemberQ","KeypointStrength","Keys","KeySelect","KeySort","KeySortBy","KeyTake","KeyUnion","KeyValueMap","KeyValuePattern","Khinchin","KillProcess","KirchhoffGraph","KirchhoffMatrix","KleinInvariantJ","KnapsackSolve","KnightTourGraph","KnotData","KnownUnitQ","KochCurve","KolmogorovSmirnovTest","KroneckerDelta","KroneckerModelDecomposition","KroneckerProduct","KroneckerSymbol","KuiperTest","KumaraswamyDistribution","Kurtosis","KuwaharaFilter","KVertexConnectedComponents","KVertexConnectedGraphQ","LABColor","Label","Labeled","LabeledSlider","LabelingFunction","LabelingSize","LabelStyle","LabelVisibility","LaguerreL","LakeData","LambdaComponents","LambertW","LaminaData","LanczosWindow","LandauDistribution","Language","LanguageCategory","LanguageData","LanguageIdentify","LanguageOptions","LaplaceDistribution","LaplaceTransform","Laplacian","LaplacianFilter","LaplacianGaussianFilter","Large","Larger","Last","Latitude","LatitudeLongitude","LatticeData","LatticeReduce","Launch","LaunchKernels","LayeredGraphPlot","LayerSizeFunction","LayoutInformation","LCHColor","LCM","LeaderSize","LeafCount","LeapYearQ","LearnDistribution","LearnedDistribution","LearningRate","LearningRateMultipliers","LeastSquares","LeastSquaresFilterKernel","Left","LeftArrow","LeftArrowBar","LeftArrowRightArrow","LeftDownTeeVector","LeftDownVector","LeftDownVectorBar","LeftRightArrow","LeftRightVector","LeftTee","LeftTeeArrow","LeftTeeVector","LeftTriangle","LeftTriangleBar","LeftTriangleEqual","LeftUpDownVector","LeftUpTeeVector","LeftUpVector","LeftUpVectorBar","LeftVector","LeftVectorBar","LegendAppearance","Legended","LegendFunction","LegendLabel","LegendLayout","LegendMargins","LegendMarkers","LegendMarkerSize","LegendreP","LegendreQ","LegendreType","Length","LengthWhile","LerchPhi","Less","LessEqual","LessEqualGreater","LessEqualThan","LessFullEqual","LessGreater","LessLess","LessSlantEqual","LessThan","LessTilde","LetterCharacter","LetterCounts","LetterNumber","LetterQ","Level","LeveneTest","LeviCivitaTensor","LevyDistribution","Lexicographic","LibraryDataType","LibraryFunction","LibraryFunctionError","LibraryFunctionInformation","LibraryFunctionLoad","LibraryFunctionUnload","LibraryLoad","LibraryUnload","LicenseID","LiftingFilterData","LiftingWaveletTransform","LightBlue","LightBrown","LightCyan","Lighter","LightGray","LightGreen","Lighting","LightingAngle","LightMagenta","LightOrange","LightPink","LightPurple","LightRed","LightSources","LightYellow","Likelihood","Limit","LimitsPositioning","LimitsPositioningTokens","LindleyDistribution","Line","Line3DBox","Line3DBoxOptions","LinearFilter","LinearFractionalOptimization","LinearFractionalTransform","LinearGradientImage","LinearizingTransformationData","LinearLayer","LinearModelFit","LinearOffsetFunction","LinearOptimization","LinearProgramming","LinearRecurrence","LinearSolve","LinearSolveFunction","LineBox","LineBoxOptions","LineBreak","LinebreakAdjustments","LineBreakChart","LinebreakSemicolonWeighting","LineBreakWithin","LineColor","LineGraph","LineIndent","LineIndentMaxFraction","LineIntegralConvolutionPlot","LineIntegralConvolutionScale","LineLegend","LineOpacity","LineSpacing","LineWrapParts","LinkActivate","LinkClose","LinkConnect","LinkConnectedQ","LinkCreate","LinkError","LinkFlush","LinkFunction","LinkHost","LinkInterrupt","LinkLaunch","LinkMode","LinkObject","LinkOpen","LinkOptions","LinkPatterns","LinkProtocol","LinkRankCentrality","LinkRead","LinkReadHeld","LinkReadyQ","Links","LinkService","LinkWrite","LinkWriteHeld","LiouvilleLambda","List","Listable","ListAnimate","ListContourPlot","ListContourPlot3D","ListConvolve","ListCorrelate","ListCurvePathPlot","ListDeconvolve","ListDensityPlot","ListDensityPlot3D","Listen","ListFormat","ListFourierSequenceTransform","ListInterpolation","ListLineIntegralConvolutionPlot","ListLinePlot","ListLogLinearPlot","ListLogLogPlot","ListLogPlot","ListPicker","ListPickerBox","ListPickerBoxBackground","ListPickerBoxOptions","ListPlay","ListPlot","ListPlot3D","ListPointPlot3D","ListPolarPlot","ListQ","ListSliceContourPlot3D","ListSliceDensityPlot3D","ListSliceVectorPlot3D","ListStepPlot","ListStreamDensityPlot","ListStreamPlot","ListSurfacePlot3D","ListVectorDensityPlot","ListVectorPlot","ListVectorPlot3D","ListZTransform","Literal","LiteralSearch","LocalAdaptiveBinarize","LocalCache","LocalClusteringCoefficient","LocalizeDefinitions","LocalizeVariables","LocalObject","LocalObjects","LocalResponseNormalizationLayer","LocalSubmit","LocalSymbol","LocalTime","LocalTimeZone","LocationEquivalenceTest","LocationTest","Locator","LocatorAutoCreate","LocatorBox","LocatorBoxOptions","LocatorCentering","LocatorPane","LocatorPaneBox","LocatorPaneBoxOptions","LocatorRegion","Locked","Log","Log10","Log2","LogBarnesG","LogGamma","LogGammaDistribution","LogicalExpand","LogIntegral","LogisticDistribution","LogisticSigmoid","LogitModelFit","LogLikelihood","LogLinearPlot","LogLogisticDistribution","LogLogPlot","LogMultinormalDistribution","LogNormalDistribution","LogPlot","LogRankTest","LogSeriesDistribution","LongEqual","Longest","LongestCommonSequence","LongestCommonSequencePositions","LongestCommonSubsequence","LongestCommonSubsequencePositions","LongestMatch","LongestOrderedSequence","LongForm","Longitude","LongLeftArrow","LongLeftRightArrow","LongRightArrow","LongShortTermMemoryLayer","Lookup","Loopback","LoopFreeGraphQ","Looping","LossFunction","LowerCaseQ","LowerLeftArrow","LowerRightArrow","LowerTriangularize","LowerTriangularMatrixQ","LowpassFilter","LQEstimatorGains","LQGRegulator","LQOutputRegulatorGains","LQRegulatorGains","LUBackSubstitution","LucasL","LuccioSamiComponents","LUDecomposition","LunarEclipse","LUVColor","LyapunovSolve","LyonsGroupLy","MachineID","MachineName","MachineNumberQ","MachinePrecision","MacintoshSystemPageSetup","Magenta","Magnification","Magnify","MailAddressValidation","MailExecute","MailFolder","MailItem","MailReceiverFunction","MailResponseFunction","MailSearch","MailServerConnect","MailServerConnection","MailSettings","MainSolve","MaintainDynamicCaches","Majority","MakeBoxes","MakeExpression","MakeRules","ManagedLibraryExpressionID","ManagedLibraryExpressionQ","MandelbrotSetBoettcher","MandelbrotSetDistance","MandelbrotSetIterationCount","MandelbrotSetMemberQ","MandelbrotSetPlot","MangoldtLambda","ManhattanDistance","Manipulate","Manipulator","MannedSpaceMissionData","MannWhitneyTest","MantissaExponent","Manual","Map","MapAll","MapAt","MapIndexed","MAProcess","MapThread","MarchenkoPasturDistribution","MarcumQ","MardiaCombinedTest","MardiaKurtosisTest","MardiaSkewnessTest","MarginalDistribution","MarkovProcessProperties","Masking","MatchingDissimilarity","MatchLocalNameQ","MatchLocalNames","MatchQ","Material","MathematicalFunctionData","MathematicaNotation","MathieuC","MathieuCharacteristicA","MathieuCharacteristicB","MathieuCharacteristicExponent","MathieuCPrime","MathieuGroupM11","MathieuGroupM12","MathieuGroupM22","MathieuGroupM23","MathieuGroupM24","MathieuS","MathieuSPrime","MathMLForm","MathMLText","Matrices","MatrixExp","MatrixForm","MatrixFunction","MatrixLog","MatrixNormalDistribution","MatrixPlot","MatrixPower","MatrixPropertyDistribution","MatrixQ","MatrixRank","MatrixTDistribution","Max","MaxBend","MaxCellMeasure","MaxColorDistance","MaxDate","MaxDetect","MaxDuration","MaxExtraBandwidths","MaxExtraConditions","MaxFeatureDisplacement","MaxFeatures","MaxFilter","MaximalBy","Maximize","MaxItems","MaxIterations","MaxLimit","MaxMemoryUsed","MaxMixtureKernels","MaxOverlapFraction","MaxPlotPoints","MaxPoints","MaxRecursion","MaxStableDistribution","MaxStepFraction","MaxSteps","MaxStepSize","MaxTrainingRounds","MaxValue","MaxwellDistribution","MaxWordGap","McLaughlinGroupMcL","Mean","MeanAbsoluteLossLayer","MeanAround","MeanClusteringCoefficient","MeanDegreeConnectivity","MeanDeviation","MeanFilter","MeanGraphDistance","MeanNeighborDegree","MeanShift","MeanShiftFilter","MeanSquaredLossLayer","Median","MedianDeviation","MedianFilter","MedicalTestData","Medium","MeijerG","MeijerGReduce","MeixnerDistribution","MellinConvolve","MellinTransform","MemberQ","MemoryAvailable","MemoryConstrained","MemoryConstraint","MemoryInUse","MengerMesh","Menu","MenuAppearance","MenuCommandKey","MenuEvaluator","MenuItem","MenuList","MenuPacket","MenuSortingValue","MenuStyle","MenuView","Merge","MergeDifferences","MergingFunction","MersennePrimeExponent","MersennePrimeExponentQ","Mesh","MeshCellCentroid","MeshCellCount","MeshCellHighlight","MeshCellIndex","MeshCellLabel","MeshCellMarker","MeshCellMeasure","MeshCellQuality","MeshCells","MeshCellShapeFunction","MeshCellStyle","MeshConnectivityGraph","MeshCoordinates","MeshFunctions","MeshPrimitives","MeshQualityGoal","MeshRange","MeshRefinementFunction","MeshRegion","MeshRegionQ","MeshShading","MeshStyle","Message","MessageDialog","MessageList","MessageName","MessageObject","MessageOptions","MessagePacket","Messages","MessagesNotebook","MetaCharacters","MetaInformation","MeteorShowerData","Method","MethodOptions","MexicanHatWavelet","MeyerWavelet","Midpoint","Min","MinColorDistance","MinDate","MinDetect","MineralData","MinFilter","MinimalBy","MinimalPolynomial","MinimalStateSpaceModel","Minimize","MinimumTimeIncrement","MinIntervalSize","MinkowskiQuestionMark","MinLimit","MinMax","MinorPlanetData","Minors","MinRecursion","MinSize","MinStableDistribution","Minus","MinusPlus","MinValue","Missing","MissingBehavior","MissingDataMethod","MissingDataRules","MissingQ","MissingString","MissingStyle","MissingValuePattern","MittagLefflerE","MixedFractionParts","MixedGraphQ","MixedMagnitude","MixedRadix","MixedRadixQuantity","MixedUnit","MixtureDistribution","Mod","Modal","Mode","Modular","ModularInverse","ModularLambda","Module","Modulus","MoebiusMu","Molecule","MoleculeContainsQ","MoleculeEquivalentQ","MoleculeGraph","MoleculeModify","MoleculePattern","MoleculePlot","MoleculePlot3D","MoleculeProperty","MoleculeQ","MoleculeRecognize","MoleculeValue","Moment","Momentary","MomentConvert","MomentEvaluate","MomentGeneratingFunction","MomentOfInertia","Monday","Monitor","MonomialList","MonomialOrder","MonsterGroupM","MoonPhase","MoonPosition","MorletWavelet","MorphologicalBinarize","MorphologicalBranchPoints","MorphologicalComponents","MorphologicalEulerNumber","MorphologicalGraph","MorphologicalPerimeter","MorphologicalTransform","MortalityData","Most","MountainData","MouseAnnotation","MouseAppearance","MouseAppearanceTag","MouseButtons","Mouseover","MousePointerNote","MousePosition","MovieData","MovingAverage","MovingMap","MovingMedian","MoyalDistribution","Multicolumn","MultiedgeStyle","MultigraphQ","MultilaunchWarning","MultiLetterItalics","MultiLetterStyle","MultilineFunction","Multinomial","MultinomialDistribution","MultinormalDistribution","MultiplicativeOrder","Multiplicity","MultiplySides","Multiselection","MultivariateHypergeometricDistribution","MultivariatePoissonDistribution","MultivariateTDistribution","N","NakagamiDistribution","NameQ","Names","NamespaceBox","NamespaceBoxOptions","Nand","NArgMax","NArgMin","NBernoulliB","NBodySimulation","NBodySimulationData","NCache","NDEigensystem","NDEigenvalues","NDSolve","NDSolveValue","Nearest","NearestFunction","NearestMeshCells","NearestNeighborGraph","NearestTo","NebulaData","NeedCurrentFrontEndPackagePacket","NeedCurrentFrontEndSymbolsPacket","NeedlemanWunschSimilarity","Needs","Negative","NegativeBinomialDistribution","NegativeDefiniteMatrixQ","NegativeIntegers","NegativeMultinomialDistribution","NegativeRationals","NegativeReals","NegativeSemidefiniteMatrixQ","NeighborhoodData","NeighborhoodGraph","Nest","NestedGreaterGreater","NestedLessLess","NestedScriptRules","NestGraph","NestList","NestWhile","NestWhileList","NetAppend","NetBidirectionalOperator","NetChain","NetDecoder","NetDelete","NetDrop","NetEncoder","NetEvaluationMode","NetExtract","NetFlatten","NetFoldOperator","NetGANOperator","NetGraph","NetInformation","NetInitialize","NetInsert","NetInsertSharedArrays","NetJoin","NetMapOperator","NetMapThreadOperator","NetMeasurements","NetModel","NetNestOperator","NetPairEmbeddingOperator","NetPort","NetPortGradient","NetPrepend","NetRename","NetReplace","NetReplacePart","NetSharedArray","NetStateObject","NetTake","NetTrain","NetTrainResultsObject","NetworkPacketCapture","NetworkPacketRecording","NetworkPacketRecordingDuring","NetworkPacketTrace","NeumannValue","NevilleThetaC","NevilleThetaD","NevilleThetaN","NevilleThetaS","NewPrimitiveStyle","NExpectation","Next","NextCell","NextDate","NextPrime","NextScheduledTaskTime","NHoldAll","NHoldFirst","NHoldRest","NicholsGridLines","NicholsPlot","NightHemisphere","NIntegrate","NMaximize","NMaxValue","NMinimize","NMinValue","NominalVariables","NonAssociative","NoncentralBetaDistribution","NoncentralChiSquareDistribution","NoncentralFRatioDistribution","NoncentralStudentTDistribution","NonCommutativeMultiply","NonConstants","NondimensionalizationTransform","None","NoneTrue","NonlinearModelFit","NonlinearStateSpaceModel","NonlocalMeansFilter","NonNegative","NonNegativeIntegers","NonNegativeRationals","NonNegativeReals","NonPositive","NonPositiveIntegers","NonPositiveRationals","NonPositiveReals","Nor","NorlundB","Norm","Normal","NormalDistribution","NormalGrouping","NormalizationLayer","Normalize","Normalized","NormalizedSquaredEuclideanDistance","NormalMatrixQ","NormalsFunction","NormFunction","Not","NotCongruent","NotCupCap","NotDoubleVerticalBar","Notebook","NotebookApply","NotebookAutoSave","NotebookClose","NotebookConvertSettings","NotebookCreate","NotebookCreateReturnObject","NotebookDefault","NotebookDelete","NotebookDirectory","NotebookDynamicExpression","NotebookEvaluate","NotebookEventActions","NotebookFileName","NotebookFind","NotebookFindReturnObject","NotebookGet","NotebookGetLayoutInformationPacket","NotebookGetMisspellingsPacket","NotebookImport","NotebookInformation","NotebookInterfaceObject","NotebookLocate","NotebookObject","NotebookOpen","NotebookOpenReturnObject","NotebookPath","NotebookPrint","NotebookPut","NotebookPutReturnObject","NotebookRead","NotebookResetGeneratedCells","Notebooks","NotebookSave","NotebookSaveAs","NotebookSelection","NotebookSetupLayoutInformationPacket","NotebooksMenu","NotebookTemplate","NotebookWrite","NotElement","NotEqualTilde","NotExists","NotGreater","NotGreaterEqual","NotGreaterFullEqual","NotGreaterGreater","NotGreaterLess","NotGreaterSlantEqual","NotGreaterTilde","Nothing","NotHumpDownHump","NotHumpEqual","NotificationFunction","NotLeftTriangle","NotLeftTriangleBar","NotLeftTriangleEqual","NotLess","NotLessEqual","NotLessFullEqual","NotLessGreater","NotLessLess","NotLessSlantEqual","NotLessTilde","NotNestedGreaterGreater","NotNestedLessLess","NotPrecedes","NotPrecedesEqual","NotPrecedesSlantEqual","NotPrecedesTilde","NotReverseElement","NotRightTriangle","NotRightTriangleBar","NotRightTriangleEqual","NotSquareSubset","NotSquareSubsetEqual","NotSquareSuperset","NotSquareSupersetEqual","NotSubset","NotSubsetEqual","NotSucceeds","NotSucceedsEqual","NotSucceedsSlantEqual","NotSucceedsTilde","NotSuperset","NotSupersetEqual","NotTilde","NotTildeEqual","NotTildeFullEqual","NotTildeTilde","NotVerticalBar","Now","NoWhitespace","NProbability","NProduct","NProductFactors","NRoots","NSolve","NSum","NSumTerms","NuclearExplosionData","NuclearReactorData","Null","NullRecords","NullSpace","NullWords","Number","NumberCompose","NumberDecompose","NumberExpand","NumberFieldClassNumber","NumberFieldDiscriminant","NumberFieldFundamentalUnits","NumberFieldIntegralBasis","NumberFieldNormRepresentatives","NumberFieldRegulator","NumberFieldRootsOfUnity","NumberFieldSignature","NumberForm","NumberFormat","NumberLinePlot","NumberMarks","NumberMultiplier","NumberPadding","NumberPoint","NumberQ","NumberSeparator","NumberSigns","NumberString","Numerator","NumeratorDenominator","NumericalOrder","NumericalSort","NumericArray","NumericArrayQ","NumericArrayType","NumericFunction","NumericQ","NuttallWindow","NValues","NyquistGridLines","NyquistPlot","O","ObservabilityGramian","ObservabilityMatrix","ObservableDecomposition","ObservableModelQ","OceanData","Octahedron","OddQ","Off","Offset","OLEData","On","ONanGroupON","Once","OneIdentity","Opacity","OpacityFunction","OpacityFunctionScaling","Open","OpenAppend","Opener","OpenerBox","OpenerBoxOptions","OpenerView","OpenFunctionInspectorPacket","Opening","OpenRead","OpenSpecialOptions","OpenTemporary","OpenWrite","Operate","OperatingSystem","OperatorApplied","OptimumFlowData","Optional","OptionalElement","OptionInspectorSettings","OptionQ","Options","OptionsPacket","OptionsPattern","OptionValue","OptionValueBox","OptionValueBoxOptions","Or","Orange","Order","OrderDistribution","OrderedQ","Ordering","OrderingBy","OrderingLayer","Orderless","OrderlessPatternSequence","OrnsteinUhlenbeckProcess","Orthogonalize","OrthogonalMatrixQ","Out","Outer","OuterPolygon","OuterPolyhedron","OutputAutoOverwrite","OutputControllabilityMatrix","OutputControllableModelQ","OutputForm","OutputFormData","OutputGrouping","OutputMathEditExpression","OutputNamePacket","OutputResponse","OutputSizeLimit","OutputStream","Over","OverBar","OverDot","Overflow","OverHat","Overlaps","Overlay","OverlayBox","OverlayBoxOptions","Overscript","OverscriptBox","OverscriptBoxOptions","OverTilde","OverVector","OverwriteTarget","OwenT","OwnValues","Package","PackingMethod","PackPaclet","PacletDataRebuild","PacletDirectoryAdd","PacletDirectoryLoad","PacletDirectoryRemove","PacletDirectoryUnload","PacletDisable","PacletEnable","PacletFind","PacletFindRemote","PacletInformation","PacletInstall","PacletInstallSubmit","PacletNewerQ","PacletObject","PacletObjectQ","PacletSite","PacletSiteObject","PacletSiteRegister","PacletSites","PacletSiteUnregister","PacletSiteUpdate","PacletUninstall","PacletUpdate","PaddedForm","Padding","PaddingLayer","PaddingSize","PadeApproximant","PadLeft","PadRight","PageBreakAbove","PageBreakBelow","PageBreakWithin","PageFooterLines","PageFooters","PageHeaderLines","PageHeaders","PageHeight","PageRankCentrality","PageTheme","PageWidth","Pagination","PairedBarChart","PairedHistogram","PairedSmoothHistogram","PairedTTest","PairedZTest","PaletteNotebook","PalettePath","PalindromeQ","Pane","PaneBox","PaneBoxOptions","Panel","PanelBox","PanelBoxOptions","Paneled","PaneSelector","PaneSelectorBox","PaneSelectorBoxOptions","PaperWidth","ParabolicCylinderD","ParagraphIndent","ParagraphSpacing","ParallelArray","ParallelCombine","ParallelDo","Parallelepiped","ParallelEvaluate","Parallelization","Parallelize","ParallelMap","ParallelNeeds","Parallelogram","ParallelProduct","ParallelSubmit","ParallelSum","ParallelTable","ParallelTry","Parameter","ParameterEstimator","ParameterMixtureDistribution","ParameterVariables","ParametricFunction","ParametricNDSolve","ParametricNDSolveValue","ParametricPlot","ParametricPlot3D","ParametricRampLayer","ParametricRegion","ParentBox","ParentCell","ParentConnect","ParentDirectory","ParentForm","Parenthesize","ParentList","ParentNotebook","ParetoDistribution","ParetoPickandsDistribution","ParkData","Part","PartBehavior","PartialCorrelationFunction","PartialD","ParticleAcceleratorData","ParticleData","Partition","PartitionGranularity","PartitionsP","PartitionsQ","PartLayer","PartOfSpeech","PartProtection","ParzenWindow","PascalDistribution","PassEventsDown","PassEventsUp","Paste","PasteAutoQuoteCharacters","PasteBoxFormInlineCells","PasteButton","Path","PathGraph","PathGraphQ","Pattern","PatternFilling","PatternSequence","PatternTest","PauliMatrix","PaulWavelet","Pause","PausedTime","PDF","PeakDetect","PeanoCurve","PearsonChiSquareTest","PearsonCorrelationTest","PearsonDistribution","PercentForm","PerfectNumber","PerfectNumberQ","PerformanceGoal","Perimeter","PeriodicBoundaryCondition","PeriodicInterpolation","Periodogram","PeriodogramArray","Permanent","Permissions","PermissionsGroup","PermissionsGroupMemberQ","PermissionsGroups","PermissionsKey","PermissionsKeys","PermutationCycles","PermutationCyclesQ","PermutationGroup","PermutationLength","PermutationList","PermutationListQ","PermutationMax","PermutationMin","PermutationOrder","PermutationPower","PermutationProduct","PermutationReplace","Permutations","PermutationSupport","Permute","PeronaMalikFilter","Perpendicular","PerpendicularBisector","PersistenceLocation","PersistenceTime","PersistentObject","PersistentObjects","PersistentValue","PersonData","PERTDistribution","PetersenGraph","PhaseMargins","PhaseRange","PhysicalSystemData","Pi","Pick","PIDData","PIDDerivativeFilter","PIDFeedforward","PIDTune","Piecewise","PiecewiseExpand","PieChart","PieChart3D","PillaiTrace","PillaiTraceTest","PingTime","Pink","PitchRecognize","Pivoting","PixelConstrained","PixelValue","PixelValuePositions","Placed","Placeholder","PlaceholderReplace","Plain","PlanarAngle","PlanarGraph","PlanarGraphQ","PlanckRadiationLaw","PlaneCurveData","PlanetaryMoonData","PlanetData","PlantData","Play","PlayRange","Plot","Plot3D","Plot3Matrix","PlotDivision","PlotJoined","PlotLabel","PlotLabels","PlotLayout","PlotLegends","PlotMarkers","PlotPoints","PlotRange","PlotRangeClipping","PlotRangeClipPlanesStyle","PlotRangePadding","PlotRegion","PlotStyle","PlotTheme","Pluralize","Plus","PlusMinus","Pochhammer","PodStates","PodWidth","Point","Point3DBox","Point3DBoxOptions","PointBox","PointBoxOptions","PointFigureChart","PointLegend","PointSize","PoissonConsulDistribution","PoissonDistribution","PoissonProcess","PoissonWindow","PolarAxes","PolarAxesOrigin","PolarGridLines","PolarPlot","PolarTicks","PoleZeroMarkers","PolyaAeppliDistribution","PolyGamma","Polygon","Polygon3DBox","Polygon3DBoxOptions","PolygonalNumber","PolygonAngle","PolygonBox","PolygonBoxOptions","PolygonCoordinates","PolygonDecomposition","PolygonHoleScale","PolygonIntersections","PolygonScale","Polyhedron","PolyhedronAngle","PolyhedronCoordinates","PolyhedronData","PolyhedronDecomposition","PolyhedronGenus","PolyLog","PolynomialExtendedGCD","PolynomialForm","PolynomialGCD","PolynomialLCM","PolynomialMod","PolynomialQ","PolynomialQuotient","PolynomialQuotientRemainder","PolynomialReduce","PolynomialRemainder","Polynomials","PoolingLayer","PopupMenu","PopupMenuBox","PopupMenuBoxOptions","PopupView","PopupWindow","Position","PositionIndex","Positive","PositiveDefiniteMatrixQ","PositiveIntegers","PositiveRationals","PositiveReals","PositiveSemidefiniteMatrixQ","PossibleZeroQ","Postfix","PostScript","Power","PowerDistribution","PowerExpand","PowerMod","PowerModList","PowerRange","PowerSpectralDensity","PowersRepresentations","PowerSymmetricPolynomial","Precedence","PrecedenceForm","Precedes","PrecedesEqual","PrecedesSlantEqual","PrecedesTilde","Precision","PrecisionGoal","PreDecrement","Predict","PredictionRoot","PredictorFunction","PredictorInformation","PredictorMeasurements","PredictorMeasurementsObject","PreemptProtect","PreferencesPath","Prefix","PreIncrement","Prepend","PrependLayer","PrependTo","PreprocessingRules","PreserveColor","PreserveImageOptions","Previous","PreviousCell","PreviousDate","PriceGraphDistribution","PrimaryPlaceholder","Prime","PrimeNu","PrimeOmega","PrimePi","PrimePowerQ","PrimeQ","Primes","PrimeZetaP","PrimitivePolynomialQ","PrimitiveRoot","PrimitiveRootList","PrincipalComponents","PrincipalValue","Print","PrintableASCIIQ","PrintAction","PrintForm","PrintingCopies","PrintingOptions","PrintingPageRange","PrintingStartingPageNumber","PrintingStyleEnvironment","Printout3D","Printout3DPreviewer","PrintPrecision","PrintTemporary","Prism","PrismBox","PrismBoxOptions","PrivateCellOptions","PrivateEvaluationOptions","PrivateFontOptions","PrivateFrontEndOptions","PrivateKey","PrivateNotebookOptions","PrivatePaths","Probability","ProbabilityDistribution","ProbabilityPlot","ProbabilityPr","ProbabilityScalePlot","ProbitModelFit","ProcessConnection","ProcessDirectory","ProcessEnvironment","Processes","ProcessEstimator","ProcessInformation","ProcessObject","ProcessParameterAssumptions","ProcessParameterQ","ProcessStateDomain","ProcessStatus","ProcessTimeDomain","Product","ProductDistribution","ProductLog","ProgressIndicator","ProgressIndicatorBox","ProgressIndicatorBoxOptions","Projection","Prolog","PromptForm","ProofObject","Properties","Property","PropertyList","PropertyValue","Proportion","Proportional","Protect","Protected","ProteinData","Pruning","PseudoInverse","PsychrometricPropertyData","PublicKey","PublisherID","PulsarData","PunctuationCharacter","Purple","Put","PutAppend","Pyramid","PyramidBox","PyramidBoxOptions","QBinomial","QFactorial","QGamma","QHypergeometricPFQ","QnDispersion","QPochhammer","QPolyGamma","QRDecomposition","QuadraticIrrationalQ","QuadraticOptimization","Quantile","QuantilePlot","Quantity","QuantityArray","QuantityDistribution","QuantityForm","QuantityMagnitude","QuantityQ","QuantityUnit","QuantityVariable","QuantityVariableCanonicalUnit","QuantityVariableDimensions","QuantityVariableIdentifier","QuantityVariablePhysicalQuantity","Quartics","QuartileDeviation","Quartiles","QuartileSkewness","Query","QueueingNetworkProcess","QueueingProcess","QueueProperties","Quiet","Quit","Quotient","QuotientRemainder","RadialGradientImage","RadialityCentrality","RadicalBox","RadicalBoxOptions","RadioButton","RadioButtonBar","RadioButtonBox","RadioButtonBoxOptions","Radon","RadonTransform","RamanujanTau","RamanujanTauL","RamanujanTauTheta","RamanujanTauZ","Ramp","Random","RandomChoice","RandomColor","RandomComplex","RandomEntity","RandomFunction","RandomGeoPosition","RandomGraph","RandomImage","RandomInstance","RandomInteger","RandomPermutation","RandomPoint","RandomPolygon","RandomPolyhedron","RandomPrime","RandomReal","RandomSample","RandomSeed","RandomSeeding","RandomVariate","RandomWalkProcess","RandomWord","Range","RangeFilter","RangeSpecification","RankedMax","RankedMin","RarerProbability","Raster","Raster3D","Raster3DBox","Raster3DBoxOptions","RasterArray","RasterBox","RasterBoxOptions","Rasterize","RasterSize","Rational","RationalFunctions","Rationalize","Rationals","Ratios","RawArray","RawBoxes","RawData","RawMedium","RayleighDistribution","Re","Read","ReadByteArray","ReadLine","ReadList","ReadProtected","ReadString","Real","RealAbs","RealBlockDiagonalForm","RealDigits","RealExponent","Reals","RealSign","Reap","RebuildPacletData","RecognitionPrior","RecognitionThreshold","Record","RecordLists","RecordSeparators","Rectangle","RectangleBox","RectangleBoxOptions","RectangleChart","RectangleChart3D","RectangularRepeatingElement","RecurrenceFilter","RecurrenceTable","RecurringDigitsForm","Red","Reduce","RefBox","ReferenceLineStyle","ReferenceMarkers","ReferenceMarkerStyle","Refine","ReflectionMatrix","ReflectionTransform","Refresh","RefreshRate","Region","RegionBinarize","RegionBoundary","RegionBoundaryStyle","RegionBounds","RegionCentroid","RegionDifference","RegionDimension","RegionDisjoint","RegionDistance","RegionDistanceFunction","RegionEmbeddingDimension","RegionEqual","RegionFillingStyle","RegionFunction","RegionImage","RegionIntersection","RegionMeasure","RegionMember","RegionMemberFunction","RegionMoment","RegionNearest","RegionNearestFunction","RegionPlot","RegionPlot3D","RegionProduct","RegionQ","RegionResize","RegionSize","RegionSymmetricDifference","RegionUnion","RegionWithin","RegisterExternalEvaluator","RegularExpression","Regularization","RegularlySampledQ","RegularPolygon","ReIm","ReImLabels","ReImPlot","ReImStyle","Reinstall","RelationalDatabase","RelationGraph","Release","ReleaseHold","ReliabilityDistribution","ReliefImage","ReliefPlot","RemoteAuthorizationCaching","RemoteConnect","RemoteConnectionObject","RemoteFile","RemoteRun","RemoteRunProcess","Remove","RemoveAlphaChannel","RemoveAsynchronousTask","RemoveAudioStream","RemoveBackground","RemoveChannelListener","RemoveChannelSubscribers","Removed","RemoveDiacritics","RemoveInputStreamMethod","RemoveOutputStreamMethod","RemoveProperty","RemoveScheduledTask","RemoveUsers","RemoveVideoStream","RenameDirectory","RenameFile","RenderAll","RenderingOptions","RenewalProcess","RenkoChart","RepairMesh","Repeated","RepeatedNull","RepeatedString","RepeatedTiming","RepeatingElement","Replace","ReplaceAll","ReplaceHeldPart","ReplaceImageValue","ReplaceList","ReplacePart","ReplacePixelValue","ReplaceRepeated","ReplicateLayer","RequiredPhysicalQuantities","Resampling","ResamplingAlgorithmData","ResamplingMethod","Rescale","RescalingTransform","ResetDirectory","ResetMenusPacket","ResetScheduledTask","ReshapeLayer","Residue","ResizeLayer","Resolve","ResourceAcquire","ResourceData","ResourceFunction","ResourceObject","ResourceRegister","ResourceRemove","ResourceSearch","ResourceSubmissionObject","ResourceSubmit","ResourceSystemBase","ResourceSystemPath","ResourceUpdate","ResourceVersion","ResponseForm","Rest","RestartInterval","Restricted","Resultant","ResumePacket","Return","ReturnEntersInput","ReturnExpressionPacket","ReturnInputFormPacket","ReturnPacket","ReturnReceiptFunction","ReturnTextPacket","Reverse","ReverseApplied","ReverseBiorthogonalSplineWavelet","ReverseElement","ReverseEquilibrium","ReverseGraph","ReverseSort","ReverseSortBy","ReverseUpEquilibrium","RevolutionAxis","RevolutionPlot3D","RGBColor","RiccatiSolve","RiceDistribution","RidgeFilter","RiemannR","RiemannSiegelTheta","RiemannSiegelZ","RiemannXi","Riffle","Right","RightArrow","RightArrowBar","RightArrowLeftArrow","RightComposition","RightCosetRepresentative","RightDownTeeVector","RightDownVector","RightDownVectorBar","RightTee","RightTeeArrow","RightTeeVector","RightTriangle","RightTriangleBar","RightTriangleEqual","RightUpDownVector","RightUpTeeVector","RightUpVector","RightUpVectorBar","RightVector","RightVectorBar","RiskAchievementImportance","RiskReductionImportance","RogersTanimotoDissimilarity","RollPitchYawAngles","RollPitchYawMatrix","RomanNumeral","Root","RootApproximant","RootIntervals","RootLocusPlot","RootMeanSquare","RootOfUnityQ","RootReduce","Roots","RootSum","Rotate","RotateLabel","RotateLeft","RotateRight","RotationAction","RotationBox","RotationBoxOptions","RotationMatrix","RotationTransform","Round","RoundImplies","RoundingRadius","Row","RowAlignments","RowBackgrounds","RowBox","RowHeights","RowLines","RowMinHeight","RowReduce","RowsEqual","RowSpacings","RSolve","RSolveValue","RudinShapiro","RudvalisGroupRu","Rule","RuleCondition","RuleDelayed","RuleForm","RulePlot","RulerUnits","Run","RunProcess","RunScheduledTask","RunThrough","RuntimeAttributes","RuntimeOptions","RussellRaoDissimilarity","SameQ","SameTest","SameTestProperties","SampledEntityClass","SampleDepth","SampledSoundFunction","SampledSoundList","SampleRate","SamplingPeriod","SARIMAProcess","SARMAProcess","SASTriangle","SatelliteData","SatisfiabilityCount","SatisfiabilityInstances","SatisfiableQ","Saturday","Save","Saveable","SaveAutoDelete","SaveConnection","SaveDefinitions","SavitzkyGolayMatrix","SawtoothWave","Scale","Scaled","ScaleDivisions","ScaledMousePosition","ScaleOrigin","ScalePadding","ScaleRanges","ScaleRangeStyle","ScalingFunctions","ScalingMatrix","ScalingTransform","Scan","ScheduledTask","ScheduledTaskActiveQ","ScheduledTaskInformation","ScheduledTaskInformationData","ScheduledTaskObject","ScheduledTasks","SchurDecomposition","ScientificForm","ScientificNotationThreshold","ScorerGi","ScorerGiPrime","ScorerHi","ScorerHiPrime","ScreenRectangle","ScreenStyleEnvironment","ScriptBaselineShifts","ScriptForm","ScriptLevel","ScriptMinSize","ScriptRules","ScriptSizeMultipliers","Scrollbars","ScrollingOptions","ScrollPosition","SearchAdjustment","SearchIndexObject","SearchIndices","SearchQueryString","SearchResultObject","Sec","Sech","SechDistribution","SecondOrderConeOptimization","SectionGrouping","SectorChart","SectorChart3D","SectorOrigin","SectorSpacing","SecuredAuthenticationKey","SecuredAuthenticationKeys","SeedRandom","Select","Selectable","SelectComponents","SelectedCells","SelectedNotebook","SelectFirst","Selection","SelectionAnimate","SelectionCell","SelectionCellCreateCell","SelectionCellDefaultStyle","SelectionCellParentStyle","SelectionCreateCell","SelectionDebuggerTag","SelectionDuplicateCell","SelectionEvaluate","SelectionEvaluateCreateCell","SelectionMove","SelectionPlaceholder","SelectionSetStyle","SelectWithContents","SelfLoops","SelfLoopStyle","SemanticImport","SemanticImportString","SemanticInterpretation","SemialgebraicComponentInstances","SemidefiniteOptimization","SendMail","SendMessage","Sequence","SequenceAlignment","SequenceAttentionLayer","SequenceCases","SequenceCount","SequenceFold","SequenceFoldList","SequenceForm","SequenceHold","SequenceLastLayer","SequenceMostLayer","SequencePosition","SequencePredict","SequencePredictorFunction","SequenceReplace","SequenceRestLayer","SequenceReverseLayer","SequenceSplit","Series","SeriesCoefficient","SeriesData","SeriesTermGoal","ServiceConnect","ServiceDisconnect","ServiceExecute","ServiceObject","ServiceRequest","ServiceResponse","ServiceSubmit","SessionSubmit","SessionTime","Set","SetAccuracy","SetAlphaChannel","SetAttributes","Setbacks","SetBoxFormNamesPacket","SetCloudDirectory","SetCookies","SetDelayed","SetDirectory","SetEnvironment","SetEvaluationNotebook","SetFileDate","SetFileLoadingContext","SetNotebookStatusLine","SetOptions","SetOptionsPacket","SetPermissions","SetPrecision","SetProperty","SetSecuredAuthenticationKey","SetSelectedNotebook","SetSharedFunction","SetSharedVariable","SetSpeechParametersPacket","SetStreamPosition","SetSystemModel","SetSystemOptions","Setter","SetterBar","SetterBox","SetterBoxOptions","Setting","SetUsers","SetValue","Shading","Shallow","ShannonWavelet","ShapiroWilkTest","Share","SharingList","Sharpen","ShearingMatrix","ShearingTransform","ShellRegion","ShenCastanMatrix","ShiftedGompertzDistribution","ShiftRegisterSequence","Short","ShortDownArrow","Shortest","ShortestMatch","ShortestPathFunction","ShortLeftArrow","ShortRightArrow","ShortTimeFourier","ShortTimeFourierData","ShortUpArrow","Show","ShowAutoConvert","ShowAutoSpellCheck","ShowAutoStyles","ShowCellBracket","ShowCellLabel","ShowCellTags","ShowClosedCellArea","ShowCodeAssist","ShowContents","ShowControls","ShowCursorTracker","ShowGroupOpenCloseIcon","ShowGroupOpener","ShowInvisibleCharacters","ShowPageBreaks","ShowPredictiveInterface","ShowSelection","ShowShortBoxForm","ShowSpecialCharacters","ShowStringCharacters","ShowSyntaxStyles","ShrinkingDelay","ShrinkWrapBoundingBox","SiderealTime","SiegelTheta","SiegelTukeyTest","SierpinskiCurve","SierpinskiMesh","Sign","Signature","SignedRankTest","SignedRegionDistance","SignificanceLevel","SignPadding","SignTest","SimilarityRules","SimpleGraph","SimpleGraphQ","SimplePolygonQ","SimplePolyhedronQ","Simplex","Simplify","Sin","Sinc","SinghMaddalaDistribution","SingleEvaluation","SingleLetterItalics","SingleLetterStyle","SingularValueDecomposition","SingularValueList","SingularValuePlot","SingularValues","Sinh","SinhIntegral","SinIntegral","SixJSymbol","Skeleton","SkeletonTransform","SkellamDistribution","Skewness","SkewNormalDistribution","SkinStyle","Skip","SliceContourPlot3D","SliceDensityPlot3D","SliceDistribution","SliceVectorPlot3D","Slider","Slider2D","Slider2DBox","Slider2DBoxOptions","SliderBox","SliderBoxOptions","SlideView","Slot","SlotSequence","Small","SmallCircle","Smaller","SmithDecomposition","SmithDelayCompensator","SmithWatermanSimilarity","SmoothDensityHistogram","SmoothHistogram","SmoothHistogram3D","SmoothKernelDistribution","SnDispersion","Snippet","SnubPolyhedron","SocialMediaData","Socket","SocketConnect","SocketListen","SocketListener","SocketObject","SocketOpen","SocketReadMessage","SocketReadyQ","Sockets","SocketWaitAll","SocketWaitNext","SoftmaxLayer","SokalSneathDissimilarity","SolarEclipse","SolarSystemFeatureData","SolidAngle","SolidData","SolidRegionQ","Solve","SolveAlways","SolveDelayed","Sort","SortBy","SortedBy","SortedEntityClass","Sound","SoundAndGraphics","SoundNote","SoundVolume","SourceLink","Sow","Space","SpaceCurveData","SpaceForm","Spacer","Spacings","Span","SpanAdjustments","SpanCharacterRounding","SpanFromAbove","SpanFromBoth","SpanFromLeft","SpanLineThickness","SpanMaxSize","SpanMinSize","SpanningCharacters","SpanSymmetric","SparseArray","SpatialGraphDistribution","SpatialMedian","SpatialTransformationLayer","Speak","SpeakerMatchQ","SpeakTextPacket","SpearmanRankTest","SpearmanRho","SpeciesData","SpecificityGoal","SpectralLineData","Spectrogram","SpectrogramArray","Specularity","SpeechCases","SpeechInterpreter","SpeechRecognize","SpeechSynthesize","SpellingCorrection","SpellingCorrectionList","SpellingDictionaries","SpellingDictionariesPath","SpellingOptions","SpellingSuggestionsPacket","Sphere","SphereBox","SpherePoints","SphericalBesselJ","SphericalBesselY","SphericalHankelH1","SphericalHankelH2","SphericalHarmonicY","SphericalPlot3D","SphericalRegion","SphericalShell","SpheroidalEigenvalue","SpheroidalJoiningFactor","SpheroidalPS","SpheroidalPSPrime","SpheroidalQS","SpheroidalQSPrime","SpheroidalRadialFactor","SpheroidalS1","SpheroidalS1Prime","SpheroidalS2","SpheroidalS2Prime","Splice","SplicedDistribution","SplineClosed","SplineDegree","SplineKnots","SplineWeights","Split","SplitBy","SpokenString","Sqrt","SqrtBox","SqrtBoxOptions","Square","SquaredEuclideanDistance","SquareFreeQ","SquareIntersection","SquareMatrixQ","SquareRepeatingElement","SquaresR","SquareSubset","SquareSubsetEqual","SquareSuperset","SquareSupersetEqual","SquareUnion","SquareWave","SSSTriangle","StabilityMargins","StabilityMarginsStyle","StableDistribution","Stack","StackBegin","StackComplete","StackedDateListPlot","StackedListPlot","StackInhibit","StadiumShape","StandardAtmosphereData","StandardDeviation","StandardDeviationFilter","StandardForm","Standardize","Standardized","StandardOceanData","StandbyDistribution","Star","StarClusterData","StarData","StarGraph","StartAsynchronousTask","StartExternalSession","StartingStepSize","StartOfLine","StartOfString","StartProcess","StartScheduledTask","StartupSound","StartWebSession","StateDimensions","StateFeedbackGains","StateOutputEstimator","StateResponse","StateSpaceModel","StateSpaceRealization","StateSpaceTransform","StateTransformationLinearize","StationaryDistribution","StationaryWaveletPacketTransform","StationaryWaveletTransform","StatusArea","StatusCentrality","StepMonitor","StereochemistryElements","StieltjesGamma","StippleShading","StirlingS1","StirlingS2","StopAsynchronousTask","StoppingPowerData","StopScheduledTask","StrataVariables","StratonovichProcess","StreamColorFunction","StreamColorFunctionScaling","StreamDensityPlot","StreamMarkers","StreamPlot","StreamPoints","StreamPosition","Streams","StreamScale","StreamStyle","String","StringBreak","StringByteCount","StringCases","StringContainsQ","StringCount","StringDelete","StringDrop","StringEndsQ","StringExpression","StringExtract","StringForm","StringFormat","StringFreeQ","StringInsert","StringJoin","StringLength","StringMatchQ","StringPadLeft","StringPadRight","StringPart","StringPartition","StringPosition","StringQ","StringRepeat","StringReplace","StringReplaceList","StringReplacePart","StringReverse","StringRiffle","StringRotateLeft","StringRotateRight","StringSkeleton","StringSplit","StringStartsQ","StringTake","StringTemplate","StringToByteArray","StringToStream","StringTrim","StripBoxes","StripOnInput","StripWrapperBoxes","StrokeForm","StructuralImportance","StructuredArray","StructuredArrayHeadQ","StructuredSelection","StruveH","StruveL","Stub","StudentTDistribution","Style","StyleBox","StyleBoxAutoDelete","StyleData","StyleDefinitions","StyleForm","StyleHints","StyleKeyMapping","StyleMenuListing","StyleNameDialogSettings","StyleNames","StylePrint","StyleSheetPath","Subdivide","Subfactorial","Subgraph","SubMinus","SubPlus","SubresultantPolynomialRemainders","SubresultantPolynomials","Subresultants","Subscript","SubscriptBox","SubscriptBoxOptions","Subscripted","Subsequences","Subset","SubsetCases","SubsetCount","SubsetEqual","SubsetMap","SubsetPosition","SubsetQ","SubsetReplace","Subsets","SubStar","SubstitutionSystem","Subsuperscript","SubsuperscriptBox","SubsuperscriptBoxOptions","SubtitleEncoding","SubtitleTracks","Subtract","SubtractFrom","SubtractSides","SubValues","Succeeds","SucceedsEqual","SucceedsSlantEqual","SucceedsTilde","Success","SuchThat","Sum","SumConvergence","SummationLayer","Sunday","SunPosition","Sunrise","Sunset","SuperDagger","SuperMinus","SupernovaData","SuperPlus","Superscript","SuperscriptBox","SuperscriptBoxOptions","Superset","SupersetEqual","SuperStar","Surd","SurdForm","SurfaceAppearance","SurfaceArea","SurfaceColor","SurfaceData","SurfaceGraphics","SurvivalDistribution","SurvivalFunction","SurvivalModel","SurvivalModelFit","SuspendPacket","SuzukiDistribution","SuzukiGroupSuz","SwatchLegend","Switch","Symbol","SymbolName","SymletWavelet","Symmetric","SymmetricGroup","SymmetricKey","SymmetricMatrixQ","SymmetricPolynomial","SymmetricReduction","Symmetrize","SymmetrizedArray","SymmetrizedArrayRules","SymmetrizedDependentComponents","SymmetrizedIndependentComponents","SymmetrizedReplacePart","SynchronousInitialization","SynchronousUpdating","Synonyms","Syntax","SyntaxForm","SyntaxInformation","SyntaxLength","SyntaxPacket","SyntaxQ","SynthesizeMissingValues","SystemCredential","SystemCredentialData","SystemCredentialKey","SystemCredentialKeys","SystemCredentialStoreObject","SystemDialogInput","SystemException","SystemGet","SystemHelpPath","SystemInformation","SystemInformationData","SystemInstall","SystemModel","SystemModeler","SystemModelExamples","SystemModelLinearize","SystemModelParametricSimulate","SystemModelPlot","SystemModelProgressReporting","SystemModelReliability","SystemModels","SystemModelSimulate","SystemModelSimulateSensitivity","SystemModelSimulationData","SystemOpen","SystemOptions","SystemProcessData","SystemProcesses","SystemsConnectionsModel","SystemsModelDelay","SystemsModelDelayApproximate","SystemsModelDelete","SystemsModelDimensions","SystemsModelExtract","SystemsModelFeedbackConnect","SystemsModelLabels","SystemsModelLinearity","SystemsModelMerge","SystemsModelOrder","SystemsModelParallelConnect","SystemsModelSeriesConnect","SystemsModelStateFeedbackConnect","SystemsModelVectorRelativeOrders","SystemStub","SystemTest","Tab","TabFilling","Table","TableAlignments","TableDepth","TableDirections","TableForm","TableHeadings","TableSpacing","TableView","TableViewBox","TableViewBoxBackground","TableViewBoxItemSize","TableViewBoxOptions","TabSpacings","TabView","TabViewBox","TabViewBoxOptions","TagBox","TagBoxNote","TagBoxOptions","TaggingRules","TagSet","TagSetDelayed","TagStyle","TagUnset","Take","TakeDrop","TakeLargest","TakeLargestBy","TakeList","TakeSmallest","TakeSmallestBy","TakeWhile","Tally","Tan","Tanh","TargetDevice","TargetFunctions","TargetSystem","TargetUnits","TaskAbort","TaskExecute","TaskObject","TaskRemove","TaskResume","Tasks","TaskSuspend","TaskWait","TautologyQ","TelegraphProcess","TemplateApply","TemplateArgBox","TemplateBox","TemplateBoxOptions","TemplateEvaluate","TemplateExpression","TemplateIf","TemplateObject","TemplateSequence","TemplateSlot","TemplateSlotSequence","TemplateUnevaluated","TemplateVerbatim","TemplateWith","TemporalData","TemporalRegularity","Temporary","TemporaryVariable","TensorContract","TensorDimensions","TensorExpand","TensorProduct","TensorQ","TensorRank","TensorReduce","TensorSymmetry","TensorTranspose","TensorWedge","TestID","TestReport","TestReportObject","TestResultObject","Tetrahedron","TetrahedronBox","TetrahedronBoxOptions","TeXForm","TeXSave","Text","Text3DBox","Text3DBoxOptions","TextAlignment","TextBand","TextBoundingBox","TextBox","TextCases","TextCell","TextClipboardType","TextContents","TextData","TextElement","TextForm","TextGrid","TextJustification","TextLine","TextPacket","TextParagraph","TextPosition","TextRecognize","TextSearch","TextSearchReport","TextSentences","TextString","TextStructure","TextStyle","TextTranslation","Texture","TextureCoordinateFunction","TextureCoordinateScaling","TextWords","Therefore","ThermodynamicData","ThermometerGauge","Thick","Thickness","Thin","Thinning","ThisLink","ThompsonGroupTh","Thread","ThreadingLayer","ThreeJSymbol","Threshold","Through","Throw","ThueMorse","Thumbnail","Thursday","Ticks","TicksStyle","TideData","Tilde","TildeEqual","TildeFullEqual","TildeTilde","TimeConstrained","TimeConstraint","TimeDirection","TimeFormat","TimeGoal","TimelinePlot","TimeObject","TimeObjectQ","TimeRemaining","Times","TimesBy","TimeSeries","TimeSeriesAggregate","TimeSeriesForecast","TimeSeriesInsert","TimeSeriesInvertibility","TimeSeriesMap","TimeSeriesMapThread","TimeSeriesModel","TimeSeriesModelFit","TimeSeriesResample","TimeSeriesRescale","TimeSeriesShift","TimeSeriesThread","TimeSeriesWindow","TimeUsed","TimeValue","TimeWarpingCorrespondence","TimeWarpingDistance","TimeZone","TimeZoneConvert","TimeZoneOffset","Timing","Tiny","TitleGrouping","TitsGroupT","ToBoxes","ToCharacterCode","ToColor","ToContinuousTimeModel","ToDate","Today","ToDiscreteTimeModel","ToEntity","ToeplitzMatrix","ToExpression","ToFileName","Together","Toggle","ToggleFalse","Toggler","TogglerBar","TogglerBox","TogglerBoxOptions","ToHeldExpression","ToInvertibleTimeSeries","TokenWords","Tolerance","ToLowerCase","Tomorrow","ToNumberField","TooBig","Tooltip","TooltipBox","TooltipBoxOptions","TooltipDelay","TooltipStyle","ToonShading","Top","TopHatTransform","ToPolarCoordinates","TopologicalSort","ToRadicals","ToRules","ToSphericalCoordinates","ToString","Total","TotalHeight","TotalLayer","TotalVariationFilter","TotalWidth","TouchPosition","TouchscreenAutoZoom","TouchscreenControlPlacement","ToUpperCase","Tr","Trace","TraceAbove","TraceAction","TraceBackward","TraceDepth","TraceDialog","TraceForward","TraceInternal","TraceLevel","TraceOff","TraceOn","TraceOriginal","TracePrint","TraceScan","TrackedSymbols","TrackingFunction","TracyWidomDistribution","TradingChart","TraditionalForm","TraditionalFunctionNotation","TraditionalNotation","TraditionalOrder","TrainingProgressCheckpointing","TrainingProgressFunction","TrainingProgressMeasurements","TrainingProgressReporting","TrainingStoppingCriterion","TrainingUpdateSchedule","TransferFunctionCancel","TransferFunctionExpand","TransferFunctionFactor","TransferFunctionModel","TransferFunctionPoles","TransferFunctionTransform","TransferFunctionZeros","TransformationClass","TransformationFunction","TransformationFunctions","TransformationMatrix","TransformedDistribution","TransformedField","TransformedProcess","TransformedRegion","TransitionDirection","TransitionDuration","TransitionEffect","TransitiveClosureGraph","TransitiveReductionGraph","Translate","TranslationOptions","TranslationTransform","Transliterate","Transparent","TransparentColor","Transpose","TransposeLayer","TrapSelection","TravelDirections","TravelDirectionsData","TravelDistance","TravelDistanceList","TravelMethod","TravelTime","TreeForm","TreeGraph","TreeGraphQ","TreePlot","TrendStyle","Triangle","TriangleCenter","TriangleConstruct","TriangleMeasurement","TriangleWave","TriangularDistribution","TriangulateMesh","Trig","TrigExpand","TrigFactor","TrigFactorList","Trigger","TrigReduce","TrigToExp","TrimmedMean","TrimmedVariance","TropicalStormData","True","TrueQ","TruncatedDistribution","TruncatedPolyhedron","TsallisQExponentialDistribution","TsallisQGaussianDistribution","TTest","Tube","TubeBezierCurveBox","TubeBezierCurveBoxOptions","TubeBox","TubeBoxOptions","TubeBSplineCurveBox","TubeBSplineCurveBoxOptions","Tuesday","TukeyLambdaDistribution","TukeyWindow","TunnelData","Tuples","TuranGraph","TuringMachine","TuttePolynomial","TwoWayRule","Typed","TypeSpecifier","UnateQ","Uncompress","UnconstrainedParameters","Undefined","UnderBar","Underflow","Underlined","Underoverscript","UnderoverscriptBox","UnderoverscriptBoxOptions","Underscript","UnderscriptBox","UnderscriptBoxOptions","UnderseaFeatureData","UndirectedEdge","UndirectedGraph","UndirectedGraphQ","UndoOptions","UndoTrackedVariables","Unequal","UnequalTo","Unevaluated","UniformDistribution","UniformGraphDistribution","UniformPolyhedron","UniformSumDistribution","Uninstall","Union","UnionedEntityClass","UnionPlus","Unique","UnitaryMatrixQ","UnitBox","UnitConvert","UnitDimensions","Unitize","UnitRootTest","UnitSimplify","UnitStep","UnitSystem","UnitTriangle","UnitVector","UnitVectorLayer","UnityDimensions","UniverseModelData","UniversityData","UnixTime","Unprotect","UnregisterExternalEvaluator","UnsameQ","UnsavedVariables","Unset","UnsetShared","UntrackedVariables","Up","UpArrow","UpArrowBar","UpArrowDownArrow","Update","UpdateDynamicObjects","UpdateDynamicObjectsSynchronous","UpdateInterval","UpdatePacletSites","UpdateSearchIndex","UpDownArrow","UpEquilibrium","UpperCaseQ","UpperLeftArrow","UpperRightArrow","UpperTriangularize","UpperTriangularMatrixQ","Upsample","UpSet","UpSetDelayed","UpTee","UpTeeArrow","UpTo","UpValues","URL","URLBuild","URLDecode","URLDispatcher","URLDownload","URLDownloadSubmit","URLEncode","URLExecute","URLExpand","URLFetch","URLFetchAsynchronous","URLParse","URLQueryDecode","URLQueryEncode","URLRead","URLResponseTime","URLSave","URLSaveAsynchronous","URLShorten","URLSubmit","UseGraphicsRange","UserDefinedWavelet","Using","UsingFrontEnd","UtilityFunction","V2Get","ValenceErrorHandling","ValidationLength","ValidationSet","Value","ValueBox","ValueBoxOptions","ValueDimensions","ValueForm","ValuePreprocessingFunction","ValueQ","Values","ValuesData","Variables","Variance","VarianceEquivalenceTest","VarianceEstimatorFunction","VarianceGammaDistribution","VarianceTest","VectorAngle","VectorAround","VectorAspectRatio","VectorColorFunction","VectorColorFunctionScaling","VectorDensityPlot","VectorGlyphData","VectorGreater","VectorGreaterEqual","VectorLess","VectorLessEqual","VectorMarkers","VectorPlot","VectorPlot3D","VectorPoints","VectorQ","VectorRange","Vectors","VectorScale","VectorScaling","VectorSizes","VectorStyle","Vee","Verbatim","Verbose","VerboseConvertToPostScriptPacket","VerificationTest","VerifyConvergence","VerifyDerivedKey","VerifyDigitalSignature","VerifyFileSignature","VerifyInterpretation","VerifySecurityCertificates","VerifySolutions","VerifyTestAssumptions","Version","VersionedPreferences","VersionNumber","VertexAdd","VertexCapacity","VertexColors","VertexComponent","VertexConnectivity","VertexContract","VertexCoordinateRules","VertexCoordinates","VertexCorrelationSimilarity","VertexCosineSimilarity","VertexCount","VertexCoverQ","VertexDataCoordinates","VertexDegree","VertexDelete","VertexDiceSimilarity","VertexEccentricity","VertexInComponent","VertexInDegree","VertexIndex","VertexJaccardSimilarity","VertexLabeling","VertexLabels","VertexLabelStyle","VertexList","VertexNormals","VertexOutComponent","VertexOutDegree","VertexQ","VertexRenderingFunction","VertexReplace","VertexShape","VertexShapeFunction","VertexSize","VertexStyle","VertexTextureCoordinates","VertexWeight","VertexWeightedGraphQ","Vertical","VerticalBar","VerticalForm","VerticalGauge","VerticalSeparator","VerticalSlider","VerticalTilde","Video","VideoEncoding","VideoExtractFrames","VideoFrameList","VideoFrameMap","VideoPause","VideoPlay","VideoQ","VideoStop","VideoStream","VideoStreams","VideoTimeSeries","VideoTracks","VideoTrim","ViewAngle","ViewCenter","ViewMatrix","ViewPoint","ViewPointSelectorSettings","ViewPort","ViewProjection","ViewRange","ViewVector","ViewVertical","VirtualGroupData","Visible","VisibleCell","VoiceStyleData","VoigtDistribution","VolcanoData","Volume","VonMisesDistribution","VoronoiMesh","WaitAll","WaitAsynchronousTask","WaitNext","WaitUntil","WakebyDistribution","WalleniusHypergeometricDistribution","WaringYuleDistribution","WarpingCorrespondence","WarpingDistance","WatershedComponents","WatsonUSquareTest","WattsStrogatzGraphDistribution","WaveletBestBasis","WaveletFilterCoefficients","WaveletImagePlot","WaveletListPlot","WaveletMapIndexed","WaveletMatrixPlot","WaveletPhi","WaveletPsi","WaveletScale","WaveletScalogram","WaveletThreshold","WeaklyConnectedComponents","WeaklyConnectedGraphComponents","WeaklyConnectedGraphQ","WeakStationarity","WeatherData","WeatherForecastData","WebAudioSearch","WebElementObject","WeberE","WebExecute","WebImage","WebImageSearch","WebSearch","WebSessionObject","WebSessions","WebWindowObject","Wedge","Wednesday","WeibullDistribution","WeierstrassE1","WeierstrassE2","WeierstrassE3","WeierstrassEta1","WeierstrassEta2","WeierstrassEta3","WeierstrassHalfPeriods","WeierstrassHalfPeriodW1","WeierstrassHalfPeriodW2","WeierstrassHalfPeriodW3","WeierstrassInvariantG2","WeierstrassInvariantG3","WeierstrassInvariants","WeierstrassP","WeierstrassPPrime","WeierstrassSigma","WeierstrassZeta","WeightedAdjacencyGraph","WeightedAdjacencyMatrix","WeightedData","WeightedGraphQ","Weights","WelchWindow","WheelGraph","WhenEvent","Which","While","White","WhiteNoiseProcess","WhitePoint","Whitespace","WhitespaceCharacter","WhittakerM","WhittakerW","WienerFilter","WienerProcess","WignerD","WignerSemicircleDistribution","WikidataData","WikidataSearch","WikipediaData","WikipediaSearch","WilksW","WilksWTest","WindDirectionData","WindingCount","WindingPolygon","WindowClickSelect","WindowElements","WindowFloating","WindowFrame","WindowFrameElements","WindowMargins","WindowMovable","WindowOpacity","WindowPersistentStyles","WindowSelected","WindowSize","WindowStatusArea","WindowTitle","WindowToolbars","WindowWidth","WindSpeedData","WindVectorData","WinsorizedMean","WinsorizedVariance","WishartMatrixDistribution","With","WolframAlpha","WolframAlphaDate","WolframAlphaQuantity","WolframAlphaResult","WolframLanguageData","Word","WordBoundary","WordCharacter","WordCloud","WordCount","WordCounts","WordData","WordDefinition","WordFrequency","WordFrequencyData","WordList","WordOrientation","WordSearch","WordSelectionFunction","WordSeparators","WordSpacings","WordStem","WordTranslation","WorkingPrecision","WrapAround","Write","WriteLine","WriteString","Wronskian","XMLElement","XMLObject","XMLTemplate","Xnor","Xor","XYZColor","Yellow","Yesterday","YuleDissimilarity","ZernikeR","ZeroSymmetric","ZeroTest","ZeroWidthTimes","Zeta","ZetaZero","ZIPCodeData","ZipfDistribution","ZoomCenter","ZoomFactor","ZTest","ZTransform","$Aborted","$ActivationGroupID","$ActivationKey","$ActivationUserRegistered","$AddOnsDirectory","$AllowDataUpdates","$AllowExternalChannelFunctions","$AllowInternet","$AssertFunction","$Assumptions","$AsynchronousTask","$AudioDecoders","$AudioEncoders","$AudioInputDevices","$AudioOutputDevices","$BaseDirectory","$BasePacletsDirectory","$BatchInput","$BatchOutput","$BlockchainBase","$BoxForms","$ByteOrdering","$CacheBaseDirectory","$Canceled","$ChannelBase","$CharacterEncoding","$CharacterEncodings","$CloudAccountName","$CloudBase","$CloudConnected","$CloudConnection","$CloudCreditsAvailable","$CloudEvaluation","$CloudExpressionBase","$CloudObjectNameFormat","$CloudObjectURLType","$CloudRootDirectory","$CloudSymbolBase","$CloudUserID","$CloudUserUUID","$CloudVersion","$CloudVersionNumber","$CloudWolframEngineVersionNumber","$CommandLine","$CompilationTarget","$ConditionHold","$ConfiguredKernels","$Context","$ContextPath","$ControlActiveSetting","$Cookies","$CookieStore","$CreationDate","$CurrentLink","$CurrentTask","$CurrentWebSession","$DataStructures","$DateStringFormat","$DefaultAudioInputDevice","$DefaultAudioOutputDevice","$DefaultFont","$DefaultFrontEnd","$DefaultImagingDevice","$DefaultLocalBase","$DefaultMailbox","$DefaultNetworkInterface","$DefaultPath","$DefaultProxyRules","$DefaultSystemCredentialStore","$Display","$DisplayFunction","$DistributedContexts","$DynamicEvaluation","$Echo","$EmbedCodeEnvironments","$EmbeddableServices","$EntityStores","$Epilog","$EvaluationCloudBase","$EvaluationCloudObject","$EvaluationEnvironment","$ExportFormats","$ExternalIdentifierTypes","$ExternalStorageBase","$Failed","$FinancialDataSource","$FontFamilies","$FormatType","$FrontEnd","$FrontEndSession","$GeoEntityTypes","$GeoLocation","$GeoLocationCity","$GeoLocationCountry","$GeoLocationPrecision","$GeoLocationSource","$HistoryLength","$HomeDirectory","$HTMLExportRules","$HTTPCookies","$HTTPRequest","$IgnoreEOF","$ImageFormattingWidth","$ImageResolution","$ImagingDevice","$ImagingDevices","$ImportFormats","$IncomingMailSettings","$InitialDirectory","$Initialization","$InitializationContexts","$Input","$InputFileName","$InputStreamMethods","$Inspector","$InstallationDate","$InstallationDirectory","$InterfaceEnvironment","$InterpreterTypes","$IterationLimit","$KernelCount","$KernelID","$Language","$LaunchDirectory","$LibraryPath","$LicenseExpirationDate","$LicenseID","$LicenseProcesses","$LicenseServer","$LicenseSubprocesses","$LicenseType","$Line","$Linked","$LinkSupported","$LoadedFiles","$LocalBase","$LocalSymbolBase","$MachineAddresses","$MachineDomain","$MachineDomains","$MachineEpsilon","$MachineID","$MachineName","$MachinePrecision","$MachineType","$MaxExtraPrecision","$MaxLicenseProcesses","$MaxLicenseSubprocesses","$MaxMachineNumber","$MaxNumber","$MaxPiecewiseCases","$MaxPrecision","$MaxRootDegree","$MessageGroups","$MessageList","$MessagePrePrint","$Messages","$MinMachineNumber","$MinNumber","$MinorReleaseNumber","$MinPrecision","$MobilePhone","$ModuleNumber","$NetworkConnected","$NetworkInterfaces","$NetworkLicense","$NewMessage","$NewSymbol","$NotebookInlineStorageLimit","$Notebooks","$NoValue","$NumberMarks","$Off","$OperatingSystem","$Output","$OutputForms","$OutputSizeLimit","$OutputStreamMethods","$Packages","$ParentLink","$ParentProcessID","$PasswordFile","$PatchLevelID","$Path","$PathnameSeparator","$PerformanceGoal","$Permissions","$PermissionsGroupBase","$PersistenceBase","$PersistencePath","$PipeSupported","$PlotTheme","$Post","$Pre","$PreferencesDirectory","$PreInitialization","$PrePrint","$PreRead","$PrintForms","$PrintLiteral","$Printout3DPreviewer","$ProcessID","$ProcessorCount","$ProcessorType","$ProductInformation","$ProgramName","$PublisherID","$RandomState","$RecursionLimit","$RegisteredDeviceClasses","$RegisteredUserName","$ReleaseNumber","$RequesterAddress","$RequesterWolframID","$RequesterWolframUUID","$RootDirectory","$ScheduledTask","$ScriptCommandLine","$ScriptInputString","$SecuredAuthenticationKeyTokens","$ServiceCreditsAvailable","$Services","$SessionID","$SetParentLink","$SharedFunctions","$SharedVariables","$SoundDisplay","$SoundDisplayFunction","$SourceLink","$SSHAuthentication","$SubtitleDecoders","$SubtitleEncoders","$SummaryBoxDataSizeLimit","$SuppressInputFormHeads","$SynchronousEvaluation","$SyntaxHandler","$System","$SystemCharacterEncoding","$SystemCredentialStore","$SystemID","$SystemMemory","$SystemShell","$SystemTimeZone","$SystemWordLength","$TemplatePath","$TemporaryDirectory","$TemporaryPrefix","$TestFileName","$TextStyle","$TimedOut","$TimeUnit","$TimeZone","$TimeZoneEntity","$TopDirectory","$TraceOff","$TraceOn","$TracePattern","$TracePostAction","$TracePreAction","$UnitSystem","$Urgent","$UserAddOnsDirectory","$UserAgentLanguages","$UserAgentMachine","$UserAgentName","$UserAgentOperatingSystem","$UserAgentString","$UserAgentVersion","$UserBaseDirectory","$UserBasePacletsDirectory","$UserDocumentsDirectory","$Username","$UserName","$UserURLBase","$Version","$VersionNumber","$VideoDecoders","$VideoEncoders","$VoiceStyles","$WolframDocumentsDirectory","$WolframID","$WolframUUID"]
+;const e=["AASTriangle","AbelianGroup","Abort","AbortKernels","AbortProtect","AbortScheduledTask","Above","Abs","AbsArg","AbsArgPlot","Absolute","AbsoluteCorrelation","AbsoluteCorrelationFunction","AbsoluteCurrentValue","AbsoluteDashing","AbsoluteFileName","AbsoluteOptions","AbsolutePointSize","AbsoluteThickness","AbsoluteTime","AbsoluteTiming","AcceptanceThreshold","AccountingForm","Accumulate","Accuracy","AccuracyGoal","AcousticAbsorbingValue","AcousticImpedanceValue","AcousticNormalVelocityValue","AcousticPDEComponent","AcousticPressureCondition","AcousticRadiationValue","AcousticSoundHardValue","AcousticSoundSoftCondition","ActionDelay","ActionMenu","ActionMenuBox","ActionMenuBoxOptions","Activate","Active","ActiveClassification","ActiveClassificationObject","ActiveItem","ActivePrediction","ActivePredictionObject","ActiveStyle","AcyclicGraphQ","AddOnHelpPath","AddSides","AddTo","AddToSearchIndex","AddUsers","AdjacencyGraph","AdjacencyList","AdjacencyMatrix","AdjacentMeshCells","Adjugate","AdjustmentBox","AdjustmentBoxOptions","AdjustTimeSeriesForecast","AdministrativeDivisionData","AffineHalfSpace","AffineSpace","AffineStateSpaceModel","AffineTransform","After","AggregatedEntityClass","AggregationLayer","AircraftData","AirportData","AirPressureData","AirSoundAttenuation","AirTemperatureData","AiryAi","AiryAiPrime","AiryAiZero","AiryBi","AiryBiPrime","AiryBiZero","AlgebraicIntegerQ","AlgebraicNumber","AlgebraicNumberDenominator","AlgebraicNumberNorm","AlgebraicNumberPolynomial","AlgebraicNumberTrace","AlgebraicRules","AlgebraicRulesData","Algebraics","AlgebraicUnitQ","Alignment","AlignmentMarker","AlignmentPoint","All","AllowAdultContent","AllowChatServices","AllowedCloudExtraParameters","AllowedCloudParameterExtensions","AllowedDimensions","AllowedFrequencyRange","AllowedHeads","AllowGroupClose","AllowIncomplete","AllowInlineCells","AllowKernelInitialization","AllowLooseGrammar","AllowReverseGroupClose","AllowScriptLevelChange","AllowVersionUpdate","AllTrue","Alphabet","AlphabeticOrder","AlphabeticSort","AlphaChannel","AlternateImage","AlternatingFactorial","AlternatingGroup","AlternativeHypothesis","Alternatives","AltitudeMethod","AmbientLight","AmbiguityFunction","AmbiguityList","Analytic","AnatomyData","AnatomyForm","AnatomyPlot3D","AnatomySkinStyle","AnatomyStyling","AnchoredSearch","And","AndersonDarlingTest","AngerJ","AngleBisector","AngleBracket","AnglePath","AnglePath3D","AngleVector","AngularGauge","Animate","AnimatedImage","AnimationCycleOffset","AnimationCycleRepetitions","AnimationDirection","AnimationDisplayTime","AnimationRate","AnimationRepetitions","AnimationRunning","AnimationRunTime","AnimationTimeIndex","AnimationVideo","Animator","AnimatorBox","AnimatorBoxOptions","AnimatorElements","Annotate","Annotation","AnnotationDelete","AnnotationKeys","AnnotationRules","AnnotationValue","Annuity","AnnuityDue","Annulus","AnomalyDetection","AnomalyDetector","AnomalyDetectorFunction","Anonymous","Antialiasing","Antihermitian","AntihermitianMatrixQ","Antisymmetric","AntisymmetricMatrixQ","Antonyms","AnyOrder","AnySubset","AnyTrue","Apart","ApartSquareFree","APIFunction","Appearance","AppearanceElements","AppearanceRules","AppellF1","Append","AppendCheck","AppendLayer","AppendTo","Application","Apply","ApplyReaction","ApplySides","ApplyTo","ArcCos","ArcCosh","ArcCot","ArcCoth","ArcCsc","ArcCsch","ArcCurvature","ARCHProcess","ArcLength","ArcSec","ArcSech","ArcSin","ArcSinDistribution","ArcSinh","ArcTan","ArcTanh","Area","Arg","ArgMax","ArgMin","ArgumentCountQ","ArgumentsOptions","ARIMAProcess","ArithmeticGeometricMean","ARMAProcess","Around","AroundReplace","ARProcess","Array","ArrayComponents","ArrayDepth","ArrayFilter","ArrayFlatten","ArrayMesh","ArrayPad","ArrayPlot","ArrayPlot3D","ArrayQ","ArrayReduce","ArrayResample","ArrayReshape","ArrayRules","Arrays","Arrow","Arrow3DBox","ArrowBox","Arrowheads","ASATriangle","Ask","AskAppend","AskConfirm","AskDisplay","AskedQ","AskedValue","AskFunction","AskState","AskTemplateDisplay","AspectRatio","AspectRatioFixed","Assert","AssessmentFunction","AssessmentResultObject","AssociateTo","Association","AssociationFormat","AssociationMap","AssociationQ","AssociationThread","AssumeDeterministic","Assuming","Assumptions","AstroAngularSeparation","AstroBackground","AstroCenter","AstroDistance","AstroGraphics","AstroGridLines","AstroGridLinesStyle","AstronomicalData","AstroPosition","AstroProjection","AstroRange","AstroRangePadding","AstroReferenceFrame","AstroStyling","AstroZoomLevel","Asymptotic","AsymptoticDSolveValue","AsymptoticEqual","AsymptoticEquivalent","AsymptoticExpectation","AsymptoticGreater","AsymptoticGreaterEqual","AsymptoticIntegrate","AsymptoticLess","AsymptoticLessEqual","AsymptoticOutputTracker","AsymptoticProbability","AsymptoticProduct","AsymptoticRSolveValue","AsymptoticSolve","AsymptoticSum","Asynchronous","AsynchronousTaskObject","AsynchronousTasks","Atom","AtomCoordinates","AtomCount","AtomDiagramCoordinates","AtomLabels","AtomLabelStyle","AtomList","AtomQ","AttachCell","AttachedCell","AttentionLayer","Attributes","Audio","AudioAmplify","AudioAnnotate","AudioAnnotationLookup","AudioBlockMap","AudioCapture","AudioChannelAssignment","AudioChannelCombine","AudioChannelMix","AudioChannels","AudioChannelSeparate","AudioData","AudioDelay","AudioDelete","AudioDevice","AudioDistance","AudioEncoding","AudioFade","AudioFrequencyShift","AudioGenerator","AudioIdentify","AudioInputDevice","AudioInsert","AudioInstanceQ","AudioIntervals","AudioJoin","AudioLabel","AudioLength","AudioLocalMeasurements","AudioLooping","AudioLoudness","AudioMeasurements","AudioNormalize","AudioOutputDevice","AudioOverlay","AudioPad","AudioPan","AudioPartition","AudioPause","AudioPitchShift","AudioPlay","AudioPlot","AudioQ","AudioRecord","AudioReplace","AudioResample","AudioReverb","AudioReverse","AudioSampleRate","AudioSpectralMap","AudioSpectralTransformation","AudioSplit","AudioStop","AudioStream","AudioStreams","AudioTimeStretch","AudioTrackApply","AudioTrackSelection","AudioTrim","AudioType","AugmentedPolyhedron","AugmentedSymmetricPolynomial","Authenticate","Authentication","AuthenticationDialog","AutoAction","Autocomplete","AutocompletionFunction","AutoCopy","AutocorrelationTest","AutoDelete","AutoEvaluateEvents","AutoGeneratedPackage","AutoIndent","AutoIndentSpacings","AutoItalicWords","AutoloadPath","AutoMatch","Automatic","AutomaticImageSize","AutoMultiplicationSymbol","AutoNumberFormatting","AutoOpenNotebooks","AutoOpenPalettes","AutoOperatorRenderings","AutoQuoteCharacters","AutoRefreshed","AutoRemove","AutorunSequencing","AutoScaling","AutoScroll","AutoSpacing","AutoStyleOptions","AutoStyleWords","AutoSubmitting","Axes","AxesEdge","AxesLabel","AxesOrigin","AxesStyle","AxiomaticTheory","Axis","Axis3DBox","Axis3DBoxOptions","AxisBox","AxisBoxOptions","AxisLabel","AxisObject","AxisStyle","BabyMonsterGroupB","Back","BackFaceColor","BackFaceGlowColor","BackFaceOpacity","BackFaceSpecularColor","BackFaceSpecularExponent","BackFaceSurfaceAppearance","BackFaceTexture","Background","BackgroundAppearance","BackgroundTasksSettings","Backslash","Backsubstitution","Backward","Ball","Band","BandpassFilter","BandstopFilter","BarabasiAlbertGraphDistribution","BarChart","BarChart3D","BarcodeImage","BarcodeRecognize","BaringhausHenzeTest","BarLegend","BarlowProschanImportance","BarnesG","BarOrigin","BarSpacing","BartlettHannWindow","BartlettWindow","BaseDecode","BaseEncode","BaseForm","Baseline","BaselinePosition","BaseStyle","BasicRecurrentLayer","BatchNormalizationLayer","BatchSize","BatesDistribution","BattleLemarieWavelet","BayesianMaximization","BayesianMaximizationObject","BayesianMinimization","BayesianMinimizationObject","Because","BeckmannDistribution","Beep","Before","Begin","BeginDialogPacket","BeginPackage","BellB","BellY","Below","BenfordDistribution","BeniniDistribution","BenktanderGibratDistribution","BenktanderWeibullDistribution","BernoulliB","BernoulliDistribution","BernoulliGraphDistribution","BernoulliProcess","BernsteinBasis","BesagL","BesselFilterModel","BesselI","BesselJ","BesselJZero","BesselK","BesselY","BesselYZero","Beta","BetaBinomialDistribution","BetaDistribution","BetaNegativeBinomialDistribution","BetaPrimeDistribution","BetaRegularized","Between","BetweennessCentrality","Beveled","BeveledPolyhedron","BezierCurve","BezierCurve3DBox","BezierCurve3DBoxOptions","BezierCurveBox","BezierCurveBoxOptions","BezierFunction","BilateralFilter","BilateralLaplaceTransform","BilateralZTransform","Binarize","BinaryDeserialize","BinaryDistance","BinaryFormat","BinaryImageQ","BinaryRead","BinaryReadList","BinarySerialize","BinaryWrite","BinCounts","BinLists","BinnedVariogramList","Binomial","BinomialDistribution","BinomialPointProcess","BinomialProcess","BinormalDistribution","BiorthogonalSplineWavelet","BioSequence","BioSequenceBackTranslateList","BioSequenceComplement","BioSequenceInstances","BioSequenceModify","BioSequencePlot","BioSequenceQ","BioSequenceReverseComplement","BioSequenceTranscribe","BioSequenceTranslate","BipartiteGraphQ","BiquadraticFilterModel","BirnbaumImportance","BirnbaumSaundersDistribution","BitAnd","BitClear","BitGet","BitLength","BitNot","BitOr","BitRate","BitSet","BitShiftLeft","BitShiftRight","BitXor","BiweightLocation","BiweightMidvariance","Black","BlackmanHarrisWindow","BlackmanNuttallWindow","BlackmanWindow","Blank","BlankForm","BlankNullSequence","BlankSequence","Blend","Block","BlockchainAddressData","BlockchainBase","BlockchainBlockData","BlockchainContractValue","BlockchainData","BlockchainGet","BlockchainKeyEncode","BlockchainPut","BlockchainTokenData","BlockchainTransaction","BlockchainTransactionData","BlockchainTransactionSign","BlockchainTransactionSubmit","BlockDiagonalMatrix","BlockLowerTriangularMatrix","BlockMap","BlockRandom","BlockUpperTriangularMatrix","BlomqvistBeta","BlomqvistBetaTest","Blue","Blur","Blurring","BodePlot","BohmanWindow","Bold","Bond","BondCount","BondLabels","BondLabelStyle","BondList","BondQ","Bookmarks","Boole","BooleanConsecutiveFunction","BooleanConvert","BooleanCountingFunction","BooleanFunction","BooleanGraph","BooleanMaxterms","BooleanMinimize","BooleanMinterms","BooleanQ","BooleanRegion","Booleans","BooleanStrings","BooleanTable","BooleanVariables","BorderDimensions","BorelTannerDistribution","Bottom","BottomHatTransform","BoundaryDiscretizeGraphics","BoundaryDiscretizeRegion","BoundaryMesh","BoundaryMeshRegion","BoundaryMeshRegionQ","BoundaryStyle","BoundedRegionQ","BoundingRegion","Bounds","Box","BoxBaselineShift","BoxData","BoxDimensions","Boxed","Boxes","BoxForm","BoxFormFormatTypes","BoxFrame","BoxID","BoxMargins","BoxMatrix","BoxObject","BoxRatios","BoxRotation","BoxRotationPoint","BoxStyle","BoxWhiskerChart","Bra","BracketingBar","BraKet","BrayCurtisDistance","BreadthFirstScan","Break","BridgeData","BrightnessEqualize","BroadcastStationData","Brown","BrownForsytheTest","BrownianBridgeProcess","BrowserCategory","BSplineBasis","BSplineCurve","BSplineCurve3DBox","BSplineCurve3DBoxOptions","BSplineCurveBox","BSplineCurveBoxOptions","BSplineFunction","BSplineSurface","BSplineSurface3DBox","BSplineSurface3DBoxOptions","BubbleChart","BubbleChart3D","BubbleScale","BubbleSizes","BuckyballGraph","BuildCompiledComponent","BuildingData","BulletGauge","BusinessDayQ","ButterflyGraph","ButterworthFilterModel","Button","ButtonBar","ButtonBox","ButtonBoxOptions","ButtonCell","ButtonContents","ButtonData","ButtonEvaluator","ButtonExpandable","ButtonFrame","ButtonFunction","ButtonMargins","ButtonMinHeight","ButtonNote","ButtonNotebook","ButtonSource","ButtonStyle","ButtonStyleMenuListing","Byte","ByteArray","ByteArrayFormat","ByteArrayFormatQ","ByteArrayQ","ByteArrayToString","ByteCount","ByteOrdering","C","CachedValue","CacheGraphics","CachePersistence","CalendarConvert","CalendarData","CalendarType","Callout","CalloutMarker","CalloutStyle","CallPacket","CanberraDistance","Cancel","CancelButton","CandlestickChart","CanonicalGraph","CanonicalizePolygon","CanonicalizePolyhedron","CanonicalizeRegion","CanonicalName","CanonicalWarpingCorrespondence","CanonicalWarpingDistance","CantorMesh","CantorStaircase","Canvas","Cap","CapForm","CapitalDifferentialD","Capitalize","CapsuleShape","CaptureRunning","CaputoD","CardinalBSplineBasis","CarlemanLinearize","CarlsonRC","CarlsonRD","CarlsonRE","CarlsonRF","CarlsonRG","CarlsonRJ","CarlsonRK","CarlsonRM","CarmichaelLambda","CaseOrdering","Cases","CaseSensitive","Cashflow","Casoratian","Cast","Catalan","CatalanNumber","Catch","CategoricalDistribution","Catenate","CatenateLayer","CauchyDistribution","CauchyMatrix","CauchyPointProcess","CauchyWindow","CayleyGraph","CDF","CDFDeploy","CDFInformation","CDFWavelet","Ceiling","CelestialSystem","Cell","CellAutoOverwrite","CellBaseline","CellBoundingBox","CellBracketOptions","CellChangeTimes","CellContents","CellContext","CellDingbat","CellDingbatMargin","CellDynamicExpression","CellEditDuplicate","CellElementsBoundingBox","CellElementSpacings","CellEpilog","CellEvaluationDuplicate","CellEvaluationFunction","CellEvaluationLanguage","CellEventActions","CellFrame","CellFrameColor","CellFrameLabelMargins","CellFrameLabels","CellFrameMargins","CellFrameStyle","CellGroup","CellGroupData","CellGrouping","CellGroupingRules","CellHorizontalScrolling","CellID","CellInsertionPointCell","CellLabel","CellLabelAutoDelete","CellLabelMargins","CellLabelPositioning","CellLabelStyle","CellLabelTemplate","CellMargins","CellObject","CellOpen","CellPrint","CellProlog","Cells","CellSize","CellStyle","CellTags","CellTrayPosition","CellTrayWidgets","CellularAutomaton","CensoredDistribution","Censoring","Center","CenterArray","CenterDot","CenteredInterval","CentralFeature","CentralMoment","CentralMomentGeneratingFunction","Cepstrogram","CepstrogramArray","CepstrumArray","CForm","ChampernowneNumber","ChangeOptions","ChannelBase","ChannelBrokerAction","ChannelDatabin","ChannelHistoryLength","ChannelListen","ChannelListener","ChannelListeners","ChannelListenerWait","ChannelObject","ChannelPreSendFunction","ChannelReceiverFunction","ChannelSend","ChannelSubscribers","ChanVeseBinarize","Character","CharacterCounts","CharacterEncoding","CharacterEncodingsPath","CharacteristicFunction","CharacteristicPolynomial","CharacterName","CharacterNormalize","CharacterRange","Characters","ChartBaseStyle","ChartElementData","ChartElementDataFunction","ChartElementFunction","ChartElements","ChartLabels","ChartLayout","ChartLegends","ChartStyle","Chebyshev1FilterModel","Chebyshev2FilterModel","ChebyshevDistance","ChebyshevT","ChebyshevU","Check","CheckAbort","CheckAll","CheckArguments","Checkbox","CheckboxBar","CheckboxBox","CheckboxBoxOptions","ChemicalConvert","ChemicalData","ChemicalFormula","ChemicalInstance","ChemicalReaction","ChessboardDistance","ChiDistribution","ChineseRemainder","ChiSquareDistribution","ChoiceButtons","ChoiceDialog","CholeskyDecomposition","Chop","ChromaticityPlot","ChromaticityPlot3D","ChromaticPolynomial","Circle","CircleBox","CircleDot","CircleMinus","CirclePlus","CirclePoints","CircleThrough","CircleTimes","CirculantGraph","CircularArcThrough","CircularOrthogonalMatrixDistribution","CircularQuaternionMatrixDistribution","CircularRealMatrixDistribution","CircularSymplecticMatrixDistribution","CircularUnitaryMatrixDistribution","Circumsphere","CityData","ClassifierFunction","ClassifierInformation","ClassifierMeasurements","ClassifierMeasurementsObject","Classify","ClassPriors","Clear","ClearAll","ClearAttributes","ClearCookies","ClearPermissions","ClearSystemCache","ClebschGordan","ClickPane","ClickToCopy","ClickToCopyEnabled","Clip","ClipboardNotebook","ClipFill","ClippingStyle","ClipPlanes","ClipPlanesStyle","ClipRange","Clock","ClockGauge","ClockwiseContourIntegral","Close","Closed","CloseKernels","ClosenessCentrality","Closing","ClosingAutoSave","ClosingEvent","CloudAccountData","CloudBase","CloudConnect","CloudConnections","CloudDeploy","CloudDirectory","CloudDisconnect","CloudEvaluate","CloudExport","CloudExpression","CloudExpressions","CloudFunction","CloudGet","CloudImport","CloudLoggingData","CloudObject","CloudObjectInformation","CloudObjectInformationData","CloudObjectNameFormat","CloudObjects","CloudObjectURLType","CloudPublish","CloudPut","CloudRenderingMethod","CloudSave","CloudShare","CloudSubmit","CloudSymbol","CloudUnshare","CloudUserID","ClusterClassify","ClusterDissimilarityFunction","ClusteringComponents","ClusteringMeasurements","ClusteringTree","CMYKColor","Coarse","CodeAssistOptions","Coefficient","CoefficientArrays","CoefficientDomain","CoefficientList","CoefficientRules","CoifletWavelet","Collect","CollinearPoints","Colon","ColonForm","ColorBalance","ColorCombine","ColorConvert","ColorCoverage","ColorData","ColorDataFunction","ColorDetect","ColorDistance","ColorFunction","ColorFunctionBinning","ColorFunctionScaling","Colorize","ColorNegate","ColorOutput","ColorProfileData","ColorQ","ColorQuantize","ColorReplace","ColorRules","ColorSelectorSettings","ColorSeparate","ColorSetter","ColorSetterBox","ColorSetterBoxOptions","ColorSlider","ColorsNear","ColorSpace","ColorToneMapping","Column","ColumnAlignments","ColumnBackgrounds","ColumnForm","ColumnLines","ColumnsEqual","ColumnSpacings","ColumnWidths","CombinatorB","CombinatorC","CombinatorI","CombinatorK","CombinatorS","CombinatorW","CombinatorY","CombinedEntityClass","CombinerFunction","CometData","CommonDefaultFormatTypes","Commonest","CommonestFilter","CommonName","CommonUnits","CommunityBoundaryStyle","CommunityGraphPlot","CommunityLabels","CommunityRegionStyle","CompanyData","CompatibleUnitQ","CompilationOptions","CompilationTarget","Compile","Compiled","CompiledCodeFunction","CompiledComponent","CompiledExpressionDeclaration","CompiledFunction","CompiledLayer","CompilerCallback","CompilerEnvironment","CompilerEnvironmentAppend","CompilerEnvironmentAppendTo","CompilerEnvironmentObject","CompilerOptions","Complement","ComplementedEntityClass","CompleteGraph","CompleteGraphQ","CompleteIntegral","CompleteKaryTree","CompletionsListPacket","Complex","ComplexArrayPlot","ComplexContourPlot","Complexes","ComplexExpand","ComplexInfinity","ComplexityFunction","ComplexListPlot","ComplexPlot","ComplexPlot3D","ComplexRegionPlot","ComplexStreamPlot","ComplexVectorPlot","ComponentMeasurements","ComponentwiseContextMenu","Compose","ComposeList","ComposeSeries","CompositeQ","Composition","CompoundElement","CompoundExpression","CompoundPoissonDistribution","CompoundPoissonProcess","CompoundRenewalProcess","Compress","CompressedData","CompressionLevel","ComputeUncertainty","ConcaveHullMesh","Condition","ConditionalExpression","Conditioned","Cone","ConeBox","ConfidenceLevel","ConfidenceRange","ConfidenceTransform","ConfigurationPath","Confirm","ConfirmAssert","ConfirmBy","ConfirmMatch","ConfirmQuiet","ConformationMethod","ConformAudio","ConformImages","Congruent","ConicGradientFilling","ConicHullRegion","ConicHullRegion3DBox","ConicHullRegion3DBoxOptions","ConicHullRegionBox","ConicHullRegionBoxOptions","ConicOptimization","Conjugate","ConjugateTranspose","Conjunction","Connect","ConnectedComponents","ConnectedGraphComponents","ConnectedGraphQ","ConnectedMeshComponents","ConnectedMoleculeComponents","ConnectedMoleculeQ","ConnectionSettings","ConnectLibraryCallbackFunction","ConnectSystemModelComponents","ConnectSystemModelController","ConnesWindow","ConoverTest","ConservativeConvectionPDETerm","ConsoleMessage","Constant","ConstantArray","ConstantArrayLayer","ConstantImage","ConstantPlusLayer","ConstantRegionQ","Constants","ConstantTimesLayer","ConstellationData","ConstrainedMax","ConstrainedMin","Construct","Containing","ContainsAll","ContainsAny","ContainsExactly","ContainsNone","ContainsOnly","ContentDetectorFunction","ContentFieldOptions","ContentLocationFunction","ContentObject","ContentPadding","ContentsBoundingBox","ContentSelectable","ContentSize","Context","ContextMenu","Contexts","ContextToFileName","Continuation","Continue","ContinuedFraction","ContinuedFractionK","ContinuousAction","ContinuousMarkovProcess","ContinuousTask","ContinuousTimeModelQ","ContinuousWaveletData","ContinuousWaveletTransform","ContourDetect","ContourGraphics","ContourIntegral","ContourLabels","ContourLines","ContourPlot","ContourPlot3D","Contours","ContourShading","ContourSmoothing","ContourStyle","ContraharmonicMean","ContrastiveLossLayer","Control","ControlActive","ControlAlignment","ControlGroupContentsBox","ControllabilityGramian","ControllabilityMatrix","ControllableDecomposition","ControllableModelQ","ControllerDuration","ControllerInformation","ControllerInformationData","ControllerLinking","ControllerManipulate","ControllerMethod","ControllerPath","ControllerState","ControlPlacement","ControlsRendering","ControlType","ConvectionPDETerm","Convergents","ConversionOptions","ConversionRules","ConvertToPostScript","ConvertToPostScriptPacket","ConvexHullMesh","ConvexHullRegion","ConvexOptimization","ConvexPolygonQ","ConvexPolyhedronQ","ConvexRegionQ","ConvolutionLayer","Convolve","ConwayGroupCo1","ConwayGroupCo2","ConwayGroupCo3","CookieFunction","Cookies","CoordinateBoundingBox","CoordinateBoundingBoxArray","CoordinateBounds","CoordinateBoundsArray","CoordinateChartData","CoordinatesToolOptions","CoordinateTransform","CoordinateTransformData","CoplanarPoints","CoprimeQ","Coproduct","CopulaDistribution","Copyable","CopyDatabin","CopyDirectory","CopyFile","CopyFunction","CopyTag","CopyToClipboard","CoreNilpotentDecomposition","CornerFilter","CornerNeighbors","Correlation","CorrelationDistance","CorrelationFunction","CorrelationTest","Cos","Cosh","CoshIntegral","CosineDistance","CosineWindow","CosIntegral","Cot","Coth","CoulombF","CoulombG","CoulombH1","CoulombH2","Count","CountDistinct","CountDistinctBy","CounterAssignments","CounterBox","CounterBoxOptions","CounterClockwiseContourIntegral","CounterEvaluator","CounterFunction","CounterIncrements","CounterStyle","CounterStyleMenuListing","CountRoots","CountryData","Counts","CountsBy","Covariance","CovarianceEstimatorFunction","CovarianceFunction","CoxianDistribution","CoxIngersollRossProcess","CoxModel","CoxModelFit","CramerVonMisesTest","CreateArchive","CreateCellID","CreateChannel","CreateCloudExpression","CreateCompilerEnvironment","CreateDatabin","CreateDataStructure","CreateDataSystemModel","CreateDialog","CreateDirectory","CreateDocument","CreateFile","CreateIntermediateDirectories","CreateLicenseEntitlement","CreateManagedLibraryExpression","CreateNotebook","CreatePacletArchive","CreatePalette","CreatePermissionsGroup","CreateScheduledTask","CreateSearchIndex","CreateSystemModel","CreateTemporary","CreateTypeInstance","CreateUUID","CreateWindow","CriterionFunction","CriticalityFailureImportance","CriticalitySuccessImportance","CriticalSection","Cross","CrossEntropyLossLayer","CrossingCount","CrossingDetect","CrossingPolygon","CrossMatrix","Csc","Csch","CSGRegion","CSGRegionQ","CSGRegionTree","CTCLossLayer","Cube","CubeRoot","Cubics","Cuboid","CuboidBox","CuboidBoxOptions","Cumulant","CumulantGeneratingFunction","CumulativeFeatureImpactPlot","Cup","CupCap","Curl","CurlyDoubleQuote","CurlyQuote","CurrencyConvert","CurrentDate","CurrentImage","CurrentNotebookImage","CurrentScreenImage","CurrentValue","Curry","CurryApplied","CurvatureFlowFilter","CurveClosed","Cyan","CycleGraph","CycleIndexPolynomial","Cycles","CyclicGroup","Cyclotomic","Cylinder","CylinderBox","CylinderBoxOptions","CylindricalDecomposition","CylindricalDecompositionFunction","D","DagumDistribution","DamData","DamerauLevenshteinDistance","DampingFactor","Darker","Dashed","Dashing","DatabaseConnect","DatabaseDisconnect","DatabaseReference","Databin","DatabinAdd","DatabinRemove","Databins","DatabinSubmit","DatabinUpload","DataCompression","DataDistribution","DataRange","DataReversed","Dataset","DatasetDisplayPanel","DatasetTheme","DataStructure","DataStructureQ","Date","DateBounds","Dated","DateDelimiters","DateDifference","DatedUnit","DateFormat","DateFunction","DateGranularity","DateHistogram","DateInterval","DateList","DateListLogPlot","DateListPlot","DateListStepPlot","DateObject","DateObjectQ","DateOverlapsQ","DatePattern","DatePlus","DateRange","DateReduction","DateScale","DateSelect","DateString","DateTicksFormat","DateValue","DateWithinQ","DaubechiesWavelet","DavisDistribution","DawsonF","DayCount","DayCountConvention","DayHemisphere","DaylightQ","DayMatchQ","DayName","DayNightTerminator","DayPlus","DayRange","DayRound","DeBruijnGraph","DeBruijnSequence","Debug","DebugTag","Decapitalize","Decimal","DecimalForm","DeclareCompiledComponent","DeclareKnownSymbols","DeclarePackage","Decompose","DeconvolutionLayer","Decrement","Decrypt","DecryptFile","DedekindEta","DeepSpaceProbeData","Default","Default2DTool","Default3DTool","DefaultAttachedCellStyle","DefaultAxesStyle","DefaultBaseStyle","DefaultBoxStyle","DefaultButton","DefaultColor","DefaultControlPlacement","DefaultDockedCellStyle","DefaultDuplicateCellStyle","DefaultDuration","DefaultElement","DefaultFaceGridsStyle","DefaultFieldHintStyle","DefaultFont","DefaultFontProperties","DefaultFormatType","DefaultFrameStyle","DefaultFrameTicksStyle","DefaultGridLinesStyle","DefaultInlineFormatType","DefaultInputFormatType","DefaultLabelStyle","DefaultMenuStyle","DefaultNaturalLanguage","DefaultNewCellStyle","DefaultNewInlineCellStyle","DefaultNotebook","DefaultOptions","DefaultOutputFormatType","DefaultPrintPrecision","DefaultStyle","DefaultStyleDefinitions","DefaultTextFormatType","DefaultTextInlineFormatType","DefaultTicksStyle","DefaultTooltipStyle","DefaultValue","DefaultValues","Defer","DefineExternal","DefineInputStreamMethod","DefineOutputStreamMethod","DefineResourceFunction","Definition","Degree","DegreeCentrality","DegreeGraphDistribution","DegreeLexicographic","DegreeReverseLexicographic","DEigensystem","DEigenvalues","Deinitialization","Del","DelaunayMesh","Delayed","Deletable","Delete","DeleteAdjacentDuplicates","DeleteAnomalies","DeleteBorderComponents","DeleteCases","DeleteChannel","DeleteCloudExpression","DeleteContents","DeleteDirectory","DeleteDuplicates","DeleteDuplicatesBy","DeleteElements","DeleteFile","DeleteMissing","DeleteObject","DeletePermissionsKey","DeleteSearchIndex","DeleteSmallComponents","DeleteStopwords","DeleteWithContents","DeletionWarning","DelimitedArray","DelimitedSequence","Delimiter","DelimiterAutoMatching","DelimiterFlashTime","DelimiterMatching","Delimiters","DeliveryFunction","Dendrogram","Denominator","DensityGraphics","DensityHistogram","DensityPlot","DensityPlot3D","DependentVariables","Deploy","Deployed","Depth","DepthFirstScan","Derivative","DerivativeFilter","DerivativePDETerm","DerivedKey","DescriptorStateSpace","DesignMatrix","DestroyAfterEvaluation","Det","DeviceClose","DeviceConfigure","DeviceExecute","DeviceExecuteAsynchronous","DeviceObject","DeviceOpen","DeviceOpenQ","DeviceRead","DeviceReadBuffer","DeviceReadLatest","DeviceReadList","DeviceReadTimeSeries","Devices","DeviceStreams","DeviceWrite","DeviceWriteBuffer","DGaussianWavelet","DiacriticalPositioning","Diagonal","DiagonalizableMatrixQ","DiagonalMatrix","DiagonalMatrixQ","Dialog","DialogIndent","DialogInput","DialogLevel","DialogNotebook","DialogProlog","DialogReturn","DialogSymbols","Diamond","DiamondMatrix","DiceDissimilarity","DictionaryLookup","DictionaryWordQ","DifferenceDelta","DifferenceOrder","DifferenceQuotient","DifferenceRoot","DifferenceRootReduce","Differences","DifferentialD","DifferentialRoot","DifferentialRootReduce","DifferentiatorFilter","DiffusionPDETerm","DiggleGatesPointProcess","DiggleGrattonPointProcess","DigitalSignature","DigitBlock","DigitBlockMinimum","DigitCharacter","DigitCount","DigitQ","DihedralAngle","DihedralGroup","Dilation","DimensionalCombinations","DimensionalMeshComponents","DimensionReduce","DimensionReducerFunction","DimensionReduction","Dimensions","DiracComb","DiracDelta","DirectedEdge","DirectedEdges","DirectedGraph","DirectedGraphQ","DirectedInfinity","Direction","DirectionalLight","Directive","Directory","DirectoryName","DirectoryQ","DirectoryStack","DirichletBeta","DirichletCharacter","DirichletCondition","DirichletConvolve","DirichletDistribution","DirichletEta","DirichletL","DirichletLambda","DirichletTransform","DirichletWindow","DisableConsolePrintPacket","DisableFormatting","DiscreteAsymptotic","DiscreteChirpZTransform","DiscreteConvolve","DiscreteDelta","DiscreteHadamardTransform","DiscreteIndicator","DiscreteInputOutputModel","DiscreteLimit","DiscreteLQEstimatorGains","DiscreteLQRegulatorGains","DiscreteLyapunovSolve","DiscreteMarkovProcess","DiscreteMaxLimit","DiscreteMinLimit","DiscretePlot","DiscretePlot3D","DiscreteRatio","DiscreteRiccatiSolve","DiscreteShift","DiscreteTimeModelQ","DiscreteUniformDistribution","DiscreteVariables","DiscreteWaveletData","DiscreteWaveletPacketTransform","DiscreteWaveletTransform","DiscretizeGraphics","DiscretizeRegion","Discriminant","DisjointQ","Disjunction","Disk","DiskBox","DiskBoxOptions","DiskMatrix","DiskSegment","Dispatch","DispatchQ","DispersionEstimatorFunction","Display","DisplayAllSteps","DisplayEndPacket","DisplayForm","DisplayFunction","DisplayPacket","DisplayRules","DisplayString","DisplayTemporary","DisplayWith","DisplayWithRef","DisplayWithVariable","DistanceFunction","DistanceMatrix","DistanceTransform","Distribute","Distributed","DistributedContexts","DistributeDefinitions","DistributionChart","DistributionDomain","DistributionFitTest","DistributionParameterAssumptions","DistributionParameterQ","Dithering","Div","Divergence","Divide","DivideBy","Dividers","DivideSides","Divisible","Divisors","DivisorSigma","DivisorSum","DMSList","DMSString","Do","DockedCell","DockedCells","DocumentGenerator","DocumentGeneratorInformation","DocumentGeneratorInformationData","DocumentGenerators","DocumentNotebook","DocumentWeightingRules","Dodecahedron","DomainRegistrationInformation","DominantColors","DominatorTreeGraph","DominatorVertexList","DOSTextFormat","Dot","DotDashed","DotEqual","DotLayer","DotPlusLayer","Dotted","DoubleBracketingBar","DoubleContourIntegral","DoubleDownArrow","DoubleLeftArrow","DoubleLeftRightArrow","DoubleLeftTee","DoubleLongLeftArrow","DoubleLongLeftRightArrow","DoubleLongRightArrow","DoubleRightArrow","DoubleRightTee","DoubleUpArrow","DoubleUpDownArrow","DoubleVerticalBar","DoublyInfinite","Down","DownArrow","DownArrowBar","DownArrowUpArrow","DownLeftRightVector","DownLeftTeeVector","DownLeftVector","DownLeftVectorBar","DownRightTeeVector","DownRightVector","DownRightVectorBar","Downsample","DownTee","DownTeeArrow","DownValues","DownValuesFunction","DragAndDrop","DrawBackFaces","DrawEdges","DrawFrontFaces","DrawHighlighted","DrazinInverse","Drop","DropoutLayer","DropShadowing","DSolve","DSolveChangeVariables","DSolveValue","Dt","DualLinearProgramming","DualPlanarGraph","DualPolyhedron","DualSystemsModel","DumpGet","DumpSave","DuplicateFreeQ","Duration","Dynamic","DynamicBox","DynamicBoxOptions","DynamicEvaluationTimeout","DynamicGeoGraphics","DynamicImage","DynamicLocation","DynamicModule","DynamicModuleBox","DynamicModuleBoxOptions","DynamicModuleParent","DynamicModuleValues","DynamicName","DynamicNamespace","DynamicReference","DynamicSetting","DynamicUpdating","DynamicWrapper","DynamicWrapperBox","DynamicWrapperBoxOptions","E","EarthImpactData","EarthquakeData","EccentricityCentrality","Echo","EchoEvaluation","EchoFunction","EchoLabel","EchoTiming","EclipseType","EdgeAdd","EdgeBetweennessCentrality","EdgeCapacity","EdgeCapForm","EdgeChromaticNumber","EdgeColor","EdgeConnectivity","EdgeContract","EdgeCost","EdgeCount","EdgeCoverQ","EdgeCycleMatrix","EdgeDashing","EdgeDelete","EdgeDetect","EdgeForm","EdgeIndex","EdgeJoinForm","EdgeLabeling","EdgeLabels","EdgeLabelStyle","EdgeList","EdgeOpacity","EdgeQ","EdgeRenderingFunction","EdgeRules","EdgeShapeFunction","EdgeStyle","EdgeTaggedGraph","EdgeTaggedGraphQ","EdgeTags","EdgeThickness","EdgeTransitiveGraphQ","EdgeValueRange","EdgeValueSizes","EdgeWeight","EdgeWeightedGraphQ","Editable","EditButtonSettings","EditCellTagsSettings","EditDistance","EffectiveInterest","Eigensystem","Eigenvalues","EigenvectorCentrality","Eigenvectors","Element","ElementData","ElementwiseLayer","ElidedForms","Eliminate","EliminationOrder","Ellipsoid","EllipticE","EllipticExp","EllipticExpPrime","EllipticF","EllipticFilterModel","EllipticK","EllipticLog","EllipticNomeQ","EllipticPi","EllipticReducedHalfPeriods","EllipticTheta","EllipticThetaPrime","EmbedCode","EmbeddedHTML","EmbeddedService","EmbeddedSQLEntityClass","EmbeddedSQLExpression","EmbeddingLayer","EmbeddingObject","EmitSound","EmphasizeSyntaxErrors","EmpiricalDistribution","Empty","EmptyGraphQ","EmptyRegion","EmptySpaceF","EnableConsolePrintPacket","Enabled","Enclose","Encode","Encrypt","EncryptedObject","EncryptFile","End","EndAdd","EndDialogPacket","EndOfBuffer","EndOfFile","EndOfLine","EndOfString","EndPackage","EngineEnvironment","EngineeringForm","Enter","EnterExpressionPacket","EnterTextPacket","Entity","EntityClass","EntityClassList","EntityCopies","EntityFunction","EntityGroup","EntityInstance","EntityList","EntityPrefetch","EntityProperties","EntityProperty","EntityPropertyClass","EntityRegister","EntityStore","EntityStores","EntityTypeName","EntityUnregister","EntityValue","Entropy","EntropyFilter","Environment","Epilog","EpilogFunction","Equal","EqualColumns","EqualRows","EqualTilde","EqualTo","EquatedTo","Equilibrium","EquirippleFilterKernel","Equivalent","Erf","Erfc","Erfi","ErlangB","ErlangC","ErlangDistribution","Erosion","ErrorBox","ErrorBoxOptions","ErrorNorm","ErrorPacket","ErrorsDialogSettings","EscapeRadius","EstimatedBackground","EstimatedDistribution","EstimatedPointNormals","EstimatedPointProcess","EstimatedProcess","EstimatedVariogramModel","EstimatorGains","EstimatorRegulator","EuclideanDistance","EulerAngles","EulerCharacteristic","EulerE","EulerGamma","EulerianGraphQ","EulerMatrix","EulerPhi","Evaluatable","Evaluate","Evaluated","EvaluatePacket","EvaluateScheduledTask","EvaluationBox","EvaluationCell","EvaluationCompletionAction","EvaluationData","EvaluationElements","EvaluationEnvironment","EvaluationMode","EvaluationMonitor","EvaluationNotebook","EvaluationObject","EvaluationOrder","EvaluationPrivileges","EvaluationRateLimit","Evaluator","EvaluatorNames","EvenQ","EventData","EventEvaluator","EventHandler","EventHandlerTag","EventLabels","EventSeries","ExactBlackmanWindow","ExactNumberQ","ExactRootIsolation","ExampleData","Except","ExcludedContexts","ExcludedForms","ExcludedLines","ExcludedPhysicalQuantities","ExcludePods","Exclusions","ExclusionsStyle","Exists","Exit","ExitDialog","ExoplanetData","Exp","Expand","ExpandAll","ExpandDenominator","ExpandFileName","ExpandNumerator","Expectation","ExpectationE","ExpectedValue","ExpGammaDistribution","ExpIntegralE","ExpIntegralEi","ExpirationDate","Exponent","ExponentFunction","ExponentialDistribution","ExponentialFamily","ExponentialGeneratingFunction","ExponentialMovingAverage","ExponentialPowerDistribution","ExponentPosition","ExponentStep","Export","ExportAutoReplacements","ExportByteArray","ExportForm","ExportPacket","ExportString","Expression","ExpressionCell","ExpressionGraph","ExpressionPacket","ExpressionTree","ExpressionUUID","ExpToTrig","ExtendedEntityClass","ExtendedGCD","Extension","ExtentElementFunction","ExtentMarkers","ExtentSize","ExternalBundle","ExternalCall","ExternalDataCharacterEncoding","ExternalEvaluate","ExternalFunction","ExternalFunctionName","ExternalIdentifier","ExternalObject","ExternalOptions","ExternalSessionObject","ExternalSessions","ExternalStorageBase","ExternalStorageDownload","ExternalStorageGet","ExternalStorageObject","ExternalStoragePut","ExternalStorageUpload","ExternalTypeSignature","ExternalValue","Extract","ExtractArchive","ExtractLayer","ExtractPacletArchive","ExtremeValueDistribution","FaceAlign","FaceForm","FaceGrids","FaceGridsStyle","FaceRecognize","FacialFeatures","Factor","FactorComplete","Factorial","Factorial2","FactorialMoment","FactorialMomentGeneratingFunction","FactorialPower","FactorInteger","FactorList","FactorSquareFree","FactorSquareFreeList","FactorTerms","FactorTermsList","Fail","Failure","FailureAction","FailureDistribution","FailureQ","False","FareySequence","FARIMAProcess","FeatureDistance","FeatureExtract","FeatureExtraction","FeatureExtractor","FeatureExtractorFunction","FeatureImpactPlot","FeatureNames","FeatureNearest","FeatureSpacePlot","FeatureSpacePlot3D","FeatureTypes","FeatureValueDependencyPlot","FeatureValueImpactPlot","FEDisableConsolePrintPacket","FeedbackLinearize","FeedbackSector","FeedbackSectorStyle","FeedbackType","FEEnableConsolePrintPacket","FetalGrowthData","Fibonacci","Fibonorial","FieldCompletionFunction","FieldHint","FieldHintStyle","FieldMasked","FieldSize","File","FileBaseName","FileByteCount","FileConvert","FileDate","FileExistsQ","FileExtension","FileFormat","FileFormatProperties","FileFormatQ","FileHandler","FileHash","FileInformation","FileName","FileNameDepth","FileNameDialogSettings","FileNameDrop","FileNameForms","FileNameJoin","FileNames","FileNameSetter","FileNameSplit","FileNameTake","FileNameToFormatList","FilePrint","FileSize","FileSystemMap","FileSystemScan","FileSystemTree","FileTemplate","FileTemplateApply","FileType","FilledCurve","FilledCurveBox","FilledCurveBoxOptions","FilledTorus","FillForm","Filling","FillingStyle","FillingTransform","FilteredEntityClass","FilterRules","FinancialBond","FinancialData","FinancialDerivative","FinancialIndicator","Find","FindAnomalies","FindArgMax","FindArgMin","FindChannels","FindClique","FindClusters","FindCookies","FindCurvePath","FindCycle","FindDevices","FindDistribution","FindDistributionParameters","FindDivisions","FindEdgeColoring","FindEdgeCover","FindEdgeCut","FindEdgeIndependentPaths","FindEquationalProof","FindEulerianCycle","FindExternalEvaluators","FindFaces","FindFile","FindFit","FindFormula","FindFundamentalCycles","FindGeneratingFunction","FindGeoLocation","FindGeometricConjectures","FindGeometricTransform","FindGraphCommunities","FindGraphIsomorphism","FindGraphPartition","FindHamiltonianCycle","FindHamiltonianPath","FindHiddenMarkovStates","FindImageText","FindIndependentEdgeSet","FindIndependentVertexSet","FindInstance","FindIntegerNullVector","FindIsomers","FindIsomorphicSubgraph","FindKClan","FindKClique","FindKClub","FindKPlex","FindLibrary","FindLinearRecurrence","FindList","FindMatchingColor","FindMaximum","FindMaximumCut","FindMaximumFlow","FindMaxValue","FindMeshDefects","FindMinimum","FindMinimumCostFlow","FindMinimumCut","FindMinValue","FindMoleculeSubstructure","FindPath","FindPeaks","FindPermutation","FindPlanarColoring","FindPointProcessParameters","FindPostmanTour","FindProcessParameters","FindRegionTransform","FindRepeat","FindRoot","FindSequenceFunction","FindSettings","FindShortestPath","FindShortestTour","FindSpanningTree","FindSubgraphIsomorphism","FindSystemModelEquilibrium","FindTextualAnswer","FindThreshold","FindTransientRepeat","FindVertexColoring","FindVertexCover","FindVertexCut","FindVertexIndependentPaths","Fine","FinishDynamic","FiniteAbelianGroupCount","FiniteGroupCount","FiniteGroupData","First","FirstCase","FirstPassageTimeDistribution","FirstPosition","FischerGroupFi22","FischerGroupFi23","FischerGroupFi24Prime","FisherHypergeometricDistribution","FisherRatioTest","FisherZDistribution","Fit","FitAll","FitRegularization","FittedModel","FixedOrder","FixedPoint","FixedPointList","FlashSelection","Flat","FlatShading","Flatten","FlattenAt","FlattenLayer","FlatTopWindow","FlightData","FlipView","Floor","FlowPolynomial","Fold","FoldList","FoldPair","FoldPairList","FoldWhile","FoldWhileList","FollowRedirects","Font","FontColor","FontFamily","FontForm","FontName","FontOpacity","FontPostScriptName","FontProperties","FontReencoding","FontSize","FontSlant","FontSubstitutions","FontTracking","FontVariations","FontWeight","For","ForAll","ForAllType","ForceVersionInstall","Format","FormatRules","FormatType","FormatTypeAutoConvert","FormatValues","FormBox","FormBoxOptions","FormControl","FormFunction","FormLayoutFunction","FormObject","FormPage","FormProtectionMethod","FormTheme","FormulaData","FormulaLookup","FortranForm","Forward","ForwardBackward","ForwardCloudCredentials","Fourier","FourierCoefficient","FourierCosCoefficient","FourierCosSeries","FourierCosTransform","FourierDCT","FourierDCTFilter","FourierDCTMatrix","FourierDST","FourierDSTMatrix","FourierMatrix","FourierParameters","FourierSequenceTransform","FourierSeries","FourierSinCoefficient","FourierSinSeries","FourierSinTransform","FourierTransform","FourierTrigSeries","FoxH","FoxHReduce","FractionalBrownianMotionProcess","FractionalD","FractionalGaussianNoiseProcess","FractionalPart","FractionBox","FractionBoxOptions","FractionLine","Frame","FrameBox","FrameBoxOptions","Framed","FrameInset","FrameLabel","Frameless","FrameListVideo","FrameMargins","FrameRate","FrameStyle","FrameTicks","FrameTicksStyle","FRatioDistribution","FrechetDistribution","FreeQ","FrenetSerretSystem","FrequencySamplingFilterKernel","FresnelC","FresnelF","FresnelG","FresnelS","Friday","FrobeniusNumber","FrobeniusSolve","FromAbsoluteTime","FromCharacterCode","FromCoefficientRules","FromContinuedFraction","FromDate","FromDateString","FromDigits","FromDMS","FromEntity","FromJulianDate","FromLetterNumber","FromPolarCoordinates","FromRawPointer","FromRomanNumeral","FromSphericalCoordinates","FromUnixTime","Front","FrontEndDynamicExpression","FrontEndEventActions","FrontEndExecute","FrontEndObject","FrontEndResource","FrontEndResourceString","FrontEndStackSize","FrontEndToken","FrontEndTokenExecute","FrontEndValueCache","FrontEndVersion","FrontFaceColor","FrontFaceGlowColor","FrontFaceOpacity","FrontFaceSpecularColor","FrontFaceSpecularExponent","FrontFaceSurfaceAppearance","FrontFaceTexture","Full","FullAxes","FullDefinition","FullForm","FullGraphics","FullInformationOutputRegulator","FullOptions","FullRegion","FullSimplify","Function","FunctionAnalytic","FunctionBijective","FunctionCompile","FunctionCompileExport","FunctionCompileExportByteArray","FunctionCompileExportLibrary","FunctionCompileExportString","FunctionContinuous","FunctionConvexity","FunctionDeclaration","FunctionDiscontinuities","FunctionDomain","FunctionExpand","FunctionInjective","FunctionInterpolation","FunctionLayer","FunctionMeromorphic","FunctionMonotonicity","FunctionPeriod","FunctionPoles","FunctionRange","FunctionSign","FunctionSingularities","FunctionSpace","FunctionSurjective","FussellVeselyImportance","GaborFilter","GaborMatrix","GaborWavelet","GainMargins","GainPhaseMargins","GalaxyData","GalleryView","Gamma","GammaDistribution","GammaRegularized","GapPenalty","GARCHProcess","GatedRecurrentLayer","Gather","GatherBy","GaugeFaceElementFunction","GaugeFaceStyle","GaugeFrameElementFunction","GaugeFrameSize","GaugeFrameStyle","GaugeLabels","GaugeMarkers","GaugeStyle","GaussianFilter","GaussianIntegers","GaussianMatrix","GaussianOrthogonalMatrixDistribution","GaussianSymplecticMatrixDistribution","GaussianUnitaryMatrixDistribution","GaussianWindow","GCD","GegenbauerC","General","GeneralizedLinearModelFit","GenerateAsymmetricKeyPair","GenerateConditions","GeneratedAssetFormat","GeneratedAssetLocation","GeneratedCell","GeneratedCellStyles","GeneratedDocumentBinding","GenerateDerivedKey","GenerateDigitalSignature","GenerateDocument","GeneratedParameters","GeneratedQuantityMagnitudes","GenerateFileSignature","GenerateHTTPResponse","GenerateSecuredAuthenticationKey","GenerateSymmetricKey","GeneratingFunction","GeneratorDescription","GeneratorHistoryLength","GeneratorOutputType","Generic","GenericCylindricalDecomposition","GenomeData","GenomeLookup","GeoAntipode","GeoArea","GeoArraySize","GeoBackground","GeoBoundary","GeoBoundingBox","GeoBounds","GeoBoundsRegion","GeoBoundsRegionBoundary","GeoBubbleChart","GeoCenter","GeoCircle","GeoContourPlot","GeoDensityPlot","GeodesicClosing","GeodesicDilation","GeodesicErosion","GeodesicOpening","GeodesicPolyhedron","GeoDestination","GeodesyData","GeoDirection","GeoDisk","GeoDisplacement","GeoDistance","GeoDistanceList","GeoElevationData","GeoEntities","GeoGraphics","GeoGraphPlot","GeoGraphValuePlot","GeogravityModelData","GeoGridDirectionDifference","GeoGridLines","GeoGridLinesStyle","GeoGridPosition","GeoGridRange","GeoGridRangePadding","GeoGridUnitArea","GeoGridUnitDistance","GeoGridVector","GeoGroup","GeoHemisphere","GeoHemisphereBoundary","GeoHistogram","GeoIdentify","GeoImage","GeoLabels","GeoLength","GeoListPlot","GeoLocation","GeologicalPeriodData","GeomagneticModelData","GeoMarker","GeometricAssertion","GeometricBrownianMotionProcess","GeometricDistribution","GeometricMean","GeometricMeanFilter","GeometricOptimization","GeometricScene","GeometricStep","GeometricStylingRules","GeometricTest","GeometricTransformation","GeometricTransformation3DBox","GeometricTransformation3DBoxOptions","GeometricTransformationBox","GeometricTransformationBoxOptions","GeoModel","GeoNearest","GeoOrientationData","GeoPath","GeoPolygon","GeoPosition","GeoPositionENU","GeoPositionXYZ","GeoProjection","GeoProjectionData","GeoRange","GeoRangePadding","GeoRegionValuePlot","GeoResolution","GeoScaleBar","GeoServer","GeoSmoothHistogram","GeoStreamPlot","GeoStyling","GeoStylingImageFunction","GeoVariant","GeoVector","GeoVectorENU","GeoVectorPlot","GeoVectorXYZ","GeoVisibleRegion","GeoVisibleRegionBoundary","GeoWithinQ","GeoZoomLevel","GestureHandler","GestureHandlerTag","Get","GetContext","GetEnvironment","GetFileName","GetLinebreakInformationPacket","GibbsPointProcess","Glaisher","GlobalClusteringCoefficient","GlobalPreferences","GlobalSession","Glow","GoldenAngle","GoldenRatio","GompertzMakehamDistribution","GoochShading","GoodmanKruskalGamma","GoodmanKruskalGammaTest","Goto","GouraudShading","Grad","Gradient","GradientFilter","GradientFittedMesh","GradientOrientationFilter","GrammarApply","GrammarRules","GrammarToken","Graph","Graph3D","GraphAssortativity","GraphAutomorphismGroup","GraphCenter","GraphComplement","GraphData","GraphDensity","GraphDiameter","GraphDifference","GraphDisjointUnion","GraphDistance","GraphDistanceMatrix","GraphEmbedding","GraphHighlight","GraphHighlightStyle","GraphHub","Graphics","Graphics3D","Graphics3DBox","Graphics3DBoxOptions","GraphicsArray","GraphicsBaseline","GraphicsBox","GraphicsBoxOptions","GraphicsColor","GraphicsColumn","GraphicsComplex","GraphicsComplex3DBox","GraphicsComplex3DBoxOptions","GraphicsComplexBox","GraphicsComplexBoxOptions","GraphicsContents","GraphicsData","GraphicsGrid","GraphicsGridBox","GraphicsGroup","GraphicsGroup3DBox","GraphicsGroup3DBoxOptions","GraphicsGroupBox","GraphicsGroupBoxOptions","GraphicsGrouping","GraphicsHighlightColor","GraphicsRow","GraphicsSpacing","GraphicsStyle","GraphIntersection","GraphJoin","GraphLayerLabels","GraphLayers","GraphLayerStyle","GraphLayout","GraphLinkEfficiency","GraphPeriphery","GraphPlot","GraphPlot3D","GraphPower","GraphProduct","GraphPropertyDistribution","GraphQ","GraphRadius","GraphReciprocity","GraphRoot","GraphStyle","GraphSum","GraphTree","GraphUnion","Gray","GrayLevel","Greater","GreaterEqual","GreaterEqualLess","GreaterEqualThan","GreaterFullEqual","GreaterGreater","GreaterLess","GreaterSlantEqual","GreaterThan","GreaterTilde","GreekStyle","Green","GreenFunction","Grid","GridBaseline","GridBox","GridBoxAlignment","GridBoxBackground","GridBoxDividers","GridBoxFrame","GridBoxItemSize","GridBoxItemStyle","GridBoxOptions","GridBoxSpacings","GridCreationSettings","GridDefaultElement","GridElementStyleOptions","GridFrame","GridFrameMargins","GridGraph","GridLines","GridLinesStyle","GridVideo","GroebnerBasis","GroupActionBase","GroupBy","GroupCentralizer","GroupElementFromWord","GroupElementPosition","GroupElementQ","GroupElements","GroupElementToWord","GroupGenerators","Groupings","GroupMultiplicationTable","GroupOpenerColor","GroupOpenerInsideFrame","GroupOrbits","GroupOrder","GroupPageBreakWithin","GroupSetwiseStabilizer","GroupStabilizer","GroupStabilizerChain","GroupTogetherGrouping","GroupTogetherNestedGrouping","GrowCutComponents","Gudermannian","GuidedFilter","GumbelDistribution","HaarWavelet","HadamardMatrix","HalfLine","HalfNormalDistribution","HalfPlane","HalfSpace","HalftoneShading","HamiltonianGraphQ","HammingDistance","HammingWindow","HandlerFunctions","HandlerFunctionsKeys","HankelH1","HankelH2","HankelMatrix","HankelTransform","HannPoissonWindow","HannWindow","HaradaNortonGroupHN","HararyGraph","HardcorePointProcess","HarmonicMean","HarmonicMeanFilter","HarmonicNumber","Hash","HatchFilling","HatchShading","Haversine","HazardFunction","Head","HeadCompose","HeaderAlignment","HeaderBackground","HeaderDisplayFunction","HeaderLines","Headers","HeaderSize","HeaderStyle","Heads","HeatFluxValue","HeatInsulationValue","HeatOutflowValue","HeatRadiationValue","HeatSymmetryValue","HeatTemperatureCondition","HeatTransferPDEComponent","HeatTransferValue","HeavisideLambda","HeavisidePi","HeavisideTheta","HeldGroupHe","HeldPart","HelmholtzPDEComponent","HelpBrowserLookup","HelpBrowserNotebook","HelpBrowserSettings","HelpViewerSettings","Here","HermiteDecomposition","HermiteH","Hermitian","HermitianMatrixQ","HessenbergDecomposition","Hessian","HeunB","HeunBPrime","HeunC","HeunCPrime","HeunD","HeunDPrime","HeunG","HeunGPrime","HeunT","HeunTPrime","HexadecimalCharacter","Hexahedron","HexahedronBox","HexahedronBoxOptions","HiddenItems","HiddenMarkovProcess","HiddenSurface","Highlighted","HighlightGraph","HighlightImage","HighlightMesh","HighlightString","HighpassFilter","HigmanSimsGroupHS","HilbertCurve","HilbertFilter","HilbertMatrix","Histogram","Histogram3D","HistogramDistribution","HistogramList","HistogramPointDensity","HistogramTransform","HistogramTransformInterpolation","HistoricalPeriodData","HitMissTransform","HITSCentrality","HjorthDistribution","HodgeDual","HoeffdingD","HoeffdingDTest","Hold","HoldAll","HoldAllComplete","HoldComplete","HoldFirst","HoldForm","HoldPattern","HoldRest","HolidayCalendar","HomeDirectory","HomePage","Horizontal","HorizontalForm","HorizontalGauge","HorizontalScrollPosition","HornerForm","HostLookup","HotellingTSquareDistribution","HoytDistribution","HTMLSave","HTTPErrorResponse","HTTPRedirect","HTTPRequest","HTTPRequestData","HTTPResponse","Hue","HumanGrowthData","HumpDownHump","HumpEqual","HurwitzLerchPhi","HurwitzZeta","HyperbolicDistribution","HypercubeGraph","HyperexponentialDistribution","Hyperfactorial","Hypergeometric0F1","Hypergeometric0F1Regularized","Hypergeometric1F1","Hypergeometric1F1Regularized","Hypergeometric2F1","Hypergeometric2F1Regularized","HypergeometricDistribution","HypergeometricPFQ","HypergeometricPFQRegularized","HypergeometricU","Hyperlink","HyperlinkAction","HyperlinkCreationSettings","Hyperplane","Hyphenation","HyphenationOptions","HypoexponentialDistribution","HypothesisTestData","I","IconData","Iconize","IconizedObject","IconRules","Icosahedron","Identity","IdentityMatrix","If","IfCompiled","IgnoreCase","IgnoreDiacritics","IgnoreIsotopes","IgnorePunctuation","IgnoreSpellCheck","IgnoreStereochemistry","IgnoringInactive","Im","Image","Image3D","Image3DProjection","Image3DSlices","ImageAccumulate","ImageAdd","ImageAdjust","ImageAlign","ImageApply","ImageApplyIndexed","ImageAspectRatio","ImageAssemble","ImageAugmentationLayer","ImageBoundingBoxes","ImageCache","ImageCacheValid","ImageCapture","ImageCaptureFunction","ImageCases","ImageChannels","ImageClip","ImageCollage","ImageColorSpace","ImageCompose","ImageContainsQ","ImageContents","ImageConvolve","ImageCooccurrence","ImageCorners","ImageCorrelate","ImageCorrespondingPoints","ImageCrop","ImageData","ImageDeconvolve","ImageDemosaic","ImageDifference","ImageDimensions","ImageDisplacements","ImageDistance","ImageEditMode","ImageEffect","ImageExposureCombine","ImageFeatureTrack","ImageFileApply","ImageFileFilter","ImageFileScan","ImageFilter","ImageFocusCombine","ImageForestingComponents","ImageFormattingWidth","ImageForwardTransformation","ImageGraphics","ImageHistogram","ImageIdentify","ImageInstanceQ","ImageKeypoints","ImageLabels","ImageLegends","ImageLevels","ImageLines","ImageMargins","ImageMarker","ImageMarkers","ImageMeasurements","ImageMesh","ImageMultiply","ImageOffset","ImagePad","ImagePadding","ImagePartition","ImagePeriodogram","ImagePerspectiveTransformation","ImagePosition","ImagePreviewFunction","ImagePyramid","ImagePyramidApply","ImageQ","ImageRangeCache","ImageRecolor","ImageReflect","ImageRegion","ImageResize","ImageResolution","ImageRestyle","ImageRotate","ImageRotated","ImageSaliencyFilter","ImageScaled","ImageScan","ImageSize","ImageSizeAction","ImageSizeCache","ImageSizeMultipliers","ImageSizeRaw","ImageStitch","ImageSubtract","ImageTake","ImageTransformation","ImageTrim","ImageType","ImageValue","ImageValuePositions","ImageVectorscopePlot","ImageWaveformPlot","ImagingDevice","ImplicitD","ImplicitRegion","Implies","Import","ImportAutoReplacements","ImportByteArray","ImportedObject","ImportOptions","ImportString","ImprovementImportance","In","Inactivate","Inactive","InactiveStyle","IncidenceGraph","IncidenceList","IncidenceMatrix","IncludeAromaticBonds","IncludeConstantBasis","IncludedContexts","IncludeDefinitions","IncludeDirectories","IncludeFileExtension","IncludeGeneratorTasks","IncludeHydrogens","IncludeInflections","IncludeMetaInformation","IncludePods","IncludeQuantities","IncludeRelatedTables","IncludeSingularSolutions","IncludeSingularTerm","IncludeWindowTimes","Increment","IndefiniteMatrixQ","Indent","IndentingNewlineSpacings","IndentMaxFraction","IndependenceTest","IndependentEdgeSetQ","IndependentPhysicalQuantity","IndependentUnit","IndependentUnitDimension","IndependentVertexSetQ","Indeterminate","IndeterminateThreshold","IndexCreationOptions","Indexed","IndexEdgeTaggedGraph","IndexGraph","IndexTag","Inequality","InertEvaluate","InertExpression","InexactNumberQ","InexactNumbers","InfiniteFuture","InfiniteLine","InfiniteLineThrough","InfinitePast","InfinitePlane","Infinity","Infix","InflationAdjust","InflationMethod","Information","InformationData","InformationDataGrid","Inherited","InheritScope","InhomogeneousPoissonPointProcess","InhomogeneousPoissonProcess","InitialEvaluationHistory","Initialization","InitializationCell","InitializationCellEvaluation","InitializationCellWarning","InitializationObject","InitializationObjects","InitializationValue","Initialize","InitialSeeding","InlineCounterAssignments","InlineCounterIncrements","InlineRules","Inner","InnerPolygon","InnerPolyhedron","Inpaint","Input","InputAliases","InputAssumptions","InputAutoReplacements","InputField","InputFieldBox","InputFieldBoxOptions","InputForm","InputGrouping","InputNamePacket","InputNotebook","InputPacket","InputPorts","InputSettings","InputStream","InputString","InputStringPacket","InputToBoxFormPacket","Insert","InsertionFunction","InsertionPointObject","InsertLinebreaks","InsertResults","Inset","Inset3DBox","Inset3DBoxOptions","InsetBox","InsetBoxOptions","Insphere","Install","InstallService","InstanceNormalizationLayer","InString","Integer","IntegerDigits","IntegerExponent","IntegerLength","IntegerName","IntegerPart","IntegerPartitions","IntegerQ","IntegerReverse","Integers","IntegerString","Integral","Integrate","IntegrateChangeVariables","Interactive","InteractiveTradingChart","InterfaceSwitched","Interlaced","Interleaving","InternallyBalancedDecomposition","InterpolatingFunction","InterpolatingPolynomial","Interpolation","InterpolationOrder","InterpolationPoints","InterpolationPrecision","Interpretation","InterpretationBox","InterpretationBoxOptions","InterpretationFunction","Interpreter","InterpretTemplate","InterquartileRange","Interrupt","InterruptSettings","IntersectedEntityClass","IntersectingQ","Intersection","Interval","IntervalIntersection","IntervalMarkers","IntervalMarkersStyle","IntervalMemberQ","IntervalSlider","IntervalUnion","Into","Inverse","InverseBetaRegularized","InverseBilateralLaplaceTransform","InverseBilateralZTransform","InverseCDF","InverseChiSquareDistribution","InverseContinuousWaveletTransform","InverseDistanceTransform","InverseEllipticNomeQ","InverseErf","InverseErfc","InverseFourier","InverseFourierCosTransform","InverseFourierSequenceTransform","InverseFourierSinTransform","InverseFourierTransform","InverseFunction","InverseFunctions","InverseGammaDistribution","InverseGammaRegularized","InverseGaussianDistribution","InverseGudermannian","InverseHankelTransform","InverseHaversine","InverseImagePyramid","InverseJacobiCD","InverseJacobiCN","InverseJacobiCS","InverseJacobiDC","InverseJacobiDN","InverseJacobiDS","InverseJacobiNC","InverseJacobiND","InverseJacobiNS","InverseJacobiSC","InverseJacobiSD","InverseJacobiSN","InverseLaplaceTransform","InverseMellinTransform","InversePermutation","InverseRadon","InverseRadonTransform","InverseSeries","InverseShortTimeFourier","InverseSpectrogram","InverseSurvivalFunction","InverseTransformedRegion","InverseWaveletTransform","InverseWeierstrassP","InverseWishartMatrixDistribution","InverseZTransform","Invisible","InvisibleApplication","InvisibleTimes","IPAddress","IrreduciblePolynomialQ","IslandData","IsolatingInterval","IsomorphicGraphQ","IsomorphicSubgraphQ","IsotopeData","Italic","Item","ItemAspectRatio","ItemBox","ItemBoxOptions","ItemDisplayFunction","ItemSize","ItemStyle","ItoProcess","JaccardDissimilarity","JacobiAmplitude","Jacobian","JacobiCD","JacobiCN","JacobiCS","JacobiDC","JacobiDN","JacobiDS","JacobiEpsilon","JacobiNC","JacobiND","JacobiNS","JacobiP","JacobiSC","JacobiSD","JacobiSN","JacobiSymbol","JacobiZeta","JacobiZN","JankoGroupJ1","JankoGroupJ2","JankoGroupJ3","JankoGroupJ4","JarqueBeraALMTest","JohnsonDistribution","Join","JoinAcross","Joined","JoinedCurve","JoinedCurveBox","JoinedCurveBoxOptions","JoinForm","JordanDecomposition","JordanModelDecomposition","JulianDate","JuliaSetBoettcher","JuliaSetIterationCount","JuliaSetPlot","JuliaSetPoints","K","KagiChart","KaiserBesselWindow","KaiserWindow","KalmanEstimator","KalmanFilter","KarhunenLoeveDecomposition","KaryTree","KatzCentrality","KCoreComponents","KDistribution","KEdgeConnectedComponents","KEdgeConnectedGraphQ","KeepExistingVersion","KelvinBei","KelvinBer","KelvinKei","KelvinKer","KendallTau","KendallTauTest","KernelConfiguration","KernelExecute","KernelFunction","KernelMixtureDistribution","KernelObject","Kernels","Ket","Key","KeyCollisionFunction","KeyComplement","KeyDrop","KeyDropFrom","KeyExistsQ","KeyFreeQ","KeyIntersection","KeyMap","KeyMemberQ","KeypointStrength","Keys","KeySelect","KeySort","KeySortBy","KeyTake","KeyUnion","KeyValueMap","KeyValuePattern","Khinchin","KillProcess","KirchhoffGraph","KirchhoffMatrix","KleinInvariantJ","KnapsackSolve","KnightTourGraph","KnotData","KnownUnitQ","KochCurve","KolmogorovSmirnovTest","KroneckerDelta","KroneckerModelDecomposition","KroneckerProduct","KroneckerSymbol","KuiperTest","KumaraswamyDistribution","Kurtosis","KuwaharaFilter","KVertexConnectedComponents","KVertexConnectedGraphQ","LABColor","Label","Labeled","LabeledSlider","LabelingFunction","LabelingSize","LabelStyle","LabelVisibility","LaguerreL","LakeData","LambdaComponents","LambertW","LameC","LameCPrime","LameEigenvalueA","LameEigenvalueB","LameS","LameSPrime","LaminaData","LanczosWindow","LandauDistribution","Language","LanguageCategory","LanguageData","LanguageIdentify","LanguageOptions","LaplaceDistribution","LaplaceTransform","Laplacian","LaplacianFilter","LaplacianGaussianFilter","LaplacianPDETerm","Large","Larger","Last","Latitude","LatitudeLongitude","LatticeData","LatticeReduce","Launch","LaunchKernels","LayeredGraphPlot","LayeredGraphPlot3D","LayerSizeFunction","LayoutInformation","LCHColor","LCM","LeaderSize","LeafCount","LeapVariant","LeapYearQ","LearnDistribution","LearnedDistribution","LearningRate","LearningRateMultipliers","LeastSquares","LeastSquaresFilterKernel","Left","LeftArrow","LeftArrowBar","LeftArrowRightArrow","LeftDownTeeVector","LeftDownVector","LeftDownVectorBar","LeftRightArrow","LeftRightVector","LeftTee","LeftTeeArrow","LeftTeeVector","LeftTriangle","LeftTriangleBar","LeftTriangleEqual","LeftUpDownVector","LeftUpTeeVector","LeftUpVector","LeftUpVectorBar","LeftVector","LeftVectorBar","LegendAppearance","Legended","LegendFunction","LegendLabel","LegendLayout","LegendMargins","LegendMarkers","LegendMarkerSize","LegendreP","LegendreQ","LegendreType","Length","LengthWhile","LerchPhi","Less","LessEqual","LessEqualGreater","LessEqualThan","LessFullEqual","LessGreater","LessLess","LessSlantEqual","LessThan","LessTilde","LetterCharacter","LetterCounts","LetterNumber","LetterQ","Level","LeveneTest","LeviCivitaTensor","LevyDistribution","Lexicographic","LexicographicOrder","LexicographicSort","LibraryDataType","LibraryFunction","LibraryFunctionDeclaration","LibraryFunctionError","LibraryFunctionInformation","LibraryFunctionLoad","LibraryFunctionUnload","LibraryLoad","LibraryUnload","LicenseEntitlementObject","LicenseEntitlements","LicenseID","LicensingSettings","LiftingFilterData","LiftingWaveletTransform","LightBlue","LightBrown","LightCyan","Lighter","LightGray","LightGreen","Lighting","LightingAngle","LightMagenta","LightOrange","LightPink","LightPurple","LightRed","LightSources","LightYellow","Likelihood","Limit","LimitsPositioning","LimitsPositioningTokens","LindleyDistribution","Line","Line3DBox","Line3DBoxOptions","LinearFilter","LinearFractionalOptimization","LinearFractionalTransform","LinearGradientFilling","LinearGradientImage","LinearizingTransformationData","LinearLayer","LinearModelFit","LinearOffsetFunction","LinearOptimization","LinearProgramming","LinearRecurrence","LinearSolve","LinearSolveFunction","LineBox","LineBoxOptions","LineBreak","LinebreakAdjustments","LineBreakChart","LinebreakSemicolonWeighting","LineBreakWithin","LineColor","LineGraph","LineIndent","LineIndentMaxFraction","LineIntegralConvolutionPlot","LineIntegralConvolutionScale","LineLegend","LineOpacity","LineSpacing","LineWrapParts","LinkActivate","LinkClose","LinkConnect","LinkConnectedQ","LinkCreate","LinkError","LinkFlush","LinkFunction","LinkHost","LinkInterrupt","LinkLaunch","LinkMode","LinkObject","LinkOpen","LinkOptions","LinkPatterns","LinkProtocol","LinkRankCentrality","LinkRead","LinkReadHeld","LinkReadyQ","Links","LinkService","LinkWrite","LinkWriteHeld","LiouvilleLambda","List","Listable","ListAnimate","ListContourPlot","ListContourPlot3D","ListConvolve","ListCorrelate","ListCurvePathPlot","ListDeconvolve","ListDensityPlot","ListDensityPlot3D","Listen","ListFormat","ListFourierSequenceTransform","ListInterpolation","ListLineIntegralConvolutionPlot","ListLinePlot","ListLinePlot3D","ListLogLinearPlot","ListLogLogPlot","ListLogPlot","ListPicker","ListPickerBox","ListPickerBoxBackground","ListPickerBoxOptions","ListPlay","ListPlot","ListPlot3D","ListPointPlot3D","ListPolarPlot","ListQ","ListSliceContourPlot3D","ListSliceDensityPlot3D","ListSliceVectorPlot3D","ListStepPlot","ListStreamDensityPlot","ListStreamPlot","ListStreamPlot3D","ListSurfacePlot3D","ListVectorDensityPlot","ListVectorDisplacementPlot","ListVectorDisplacementPlot3D","ListVectorPlot","ListVectorPlot3D","ListZTransform","Literal","LiteralSearch","LiteralType","LoadCompiledComponent","LocalAdaptiveBinarize","LocalCache","LocalClusteringCoefficient","LocalEvaluate","LocalizeDefinitions","LocalizeVariables","LocalObject","LocalObjects","LocalResponseNormalizationLayer","LocalSubmit","LocalSymbol","LocalTime","LocalTimeZone","LocationEquivalenceTest","LocationTest","Locator","LocatorAutoCreate","LocatorBox","LocatorBoxOptions","LocatorCentering","LocatorPane","LocatorPaneBox","LocatorPaneBoxOptions","LocatorRegion","Locked","Log","Log10","Log2","LogBarnesG","LogGamma","LogGammaDistribution","LogicalExpand","LogIntegral","LogisticDistribution","LogisticSigmoid","LogitModelFit","LogLikelihood","LogLinearPlot","LogLogisticDistribution","LogLogPlot","LogMultinormalDistribution","LogNormalDistribution","LogPlot","LogRankTest","LogSeriesDistribution","LongEqual","Longest","LongestCommonSequence","LongestCommonSequencePositions","LongestCommonSubsequence","LongestCommonSubsequencePositions","LongestMatch","LongestOrderedSequence","LongForm","Longitude","LongLeftArrow","LongLeftRightArrow","LongRightArrow","LongShortTermMemoryLayer","Lookup","Loopback","LoopFreeGraphQ","Looping","LossFunction","LowerCaseQ","LowerLeftArrow","LowerRightArrow","LowerTriangularize","LowerTriangularMatrix","LowerTriangularMatrixQ","LowpassFilter","LQEstimatorGains","LQGRegulator","LQOutputRegulatorGains","LQRegulatorGains","LUBackSubstitution","LucasL","LuccioSamiComponents","LUDecomposition","LunarEclipse","LUVColor","LyapunovSolve","LyonsGroupLy","MachineID","MachineName","MachineNumberQ","MachinePrecision","MacintoshSystemPageSetup","Magenta","Magnification","Magnify","MailAddressValidation","MailExecute","MailFolder","MailItem","MailReceiverFunction","MailResponseFunction","MailSearch","MailServerConnect","MailServerConnection","MailSettings","MainSolve","MaintainDynamicCaches","Majority","MakeBoxes","MakeExpression","MakeRules","ManagedLibraryExpressionID","ManagedLibraryExpressionQ","MandelbrotSetBoettcher","MandelbrotSetDistance","MandelbrotSetIterationCount","MandelbrotSetMemberQ","MandelbrotSetPlot","MangoldtLambda","ManhattanDistance","Manipulate","Manipulator","MannedSpaceMissionData","MannWhitneyTest","MantissaExponent","Manual","Map","MapAll","MapApply","MapAt","MapIndexed","MAProcess","MapThread","MarchenkoPasturDistribution","MarcumQ","MardiaCombinedTest","MardiaKurtosisTest","MardiaSkewnessTest","MarginalDistribution","MarkovProcessProperties","Masking","MassConcentrationCondition","MassFluxValue","MassImpermeableBoundaryValue","MassOutflowValue","MassSymmetryValue","MassTransferValue","MassTransportPDEComponent","MatchingDissimilarity","MatchLocalNameQ","MatchLocalNames","MatchQ","Material","MaterialShading","MaternPointProcess","MathematicalFunctionData","MathematicaNotation","MathieuC","MathieuCharacteristicA","MathieuCharacteristicB","MathieuCharacteristicExponent","MathieuCPrime","MathieuGroupM11","MathieuGroupM12","MathieuGroupM22","MathieuGroupM23","MathieuGroupM24","MathieuS","MathieuSPrime","MathMLForm","MathMLText","Matrices","MatrixExp","MatrixForm","MatrixFunction","MatrixLog","MatrixNormalDistribution","MatrixPlot","MatrixPower","MatrixPropertyDistribution","MatrixQ","MatrixRank","MatrixTDistribution","Max","MaxBend","MaxCellMeasure","MaxColorDistance","MaxDate","MaxDetect","MaxDisplayedChildren","MaxDuration","MaxExtraBandwidths","MaxExtraConditions","MaxFeatureDisplacement","MaxFeatures","MaxFilter","MaximalBy","Maximize","MaxItems","MaxIterations","MaxLimit","MaxMemoryUsed","MaxMixtureKernels","MaxOverlapFraction","MaxPlotPoints","MaxPoints","MaxRecursion","MaxStableDistribution","MaxStepFraction","MaxSteps","MaxStepSize","MaxTrainingRounds","MaxValue","MaxwellDistribution","MaxWordGap","McLaughlinGroupMcL","Mean","MeanAbsoluteLossLayer","MeanAround","MeanClusteringCoefficient","MeanDegreeConnectivity","MeanDeviation","MeanFilter","MeanGraphDistance","MeanNeighborDegree","MeanPointDensity","MeanShift","MeanShiftFilter","MeanSquaredLossLayer","Median","MedianDeviation","MedianFilter","MedicalTestData","Medium","MeijerG","MeijerGReduce","MeixnerDistribution","MellinConvolve","MellinTransform","MemberQ","MemoryAvailable","MemoryConstrained","MemoryConstraint","MemoryInUse","MengerMesh","Menu","MenuAppearance","MenuCommandKey","MenuEvaluator","MenuItem","MenuList","MenuPacket","MenuSortingValue","MenuStyle","MenuView","Merge","MergeDifferences","MergingFunction","MersennePrimeExponent","MersennePrimeExponentQ","Mesh","MeshCellCentroid","MeshCellCount","MeshCellHighlight","MeshCellIndex","MeshCellLabel","MeshCellMarker","MeshCellMeasure","MeshCellQuality","MeshCells","MeshCellShapeFunction","MeshCellStyle","MeshConnectivityGraph","MeshCoordinates","MeshFunctions","MeshPrimitives","MeshQualityGoal","MeshRange","MeshRefinementFunction","MeshRegion","MeshRegionQ","MeshShading","MeshStyle","Message","MessageDialog","MessageList","MessageName","MessageObject","MessageOptions","MessagePacket","Messages","MessagesNotebook","MetaCharacters","MetaInformation","MeteorShowerData","Method","MethodOptions","MexicanHatWavelet","MeyerWavelet","Midpoint","MIMETypeToFormatList","Min","MinColorDistance","MinDate","MinDetect","MineralData","MinFilter","MinimalBy","MinimalPolynomial","MinimalStateSpaceModel","Minimize","MinimumTimeIncrement","MinIntervalSize","MinkowskiQuestionMark","MinLimit","MinMax","MinorPlanetData","Minors","MinPointSeparation","MinRecursion","MinSize","MinStableDistribution","Minus","MinusPlus","MinValue","Missing","MissingBehavior","MissingDataMethod","MissingDataRules","MissingQ","MissingString","MissingStyle","MissingValuePattern","MissingValueSynthesis","MittagLefflerE","MixedFractionParts","MixedGraphQ","MixedMagnitude","MixedRadix","MixedRadixQuantity","MixedUnit","MixtureDistribution","Mod","Modal","Mode","ModelPredictiveController","Modular","ModularInverse","ModularLambda","Module","Modulus","MoebiusMu","Molecule","MoleculeAlign","MoleculeContainsQ","MoleculeDraw","MoleculeEquivalentQ","MoleculeFreeQ","MoleculeGraph","MoleculeMatchQ","MoleculeMaximumCommonSubstructure","MoleculeModify","MoleculeName","MoleculePattern","MoleculePlot","MoleculePlot3D","MoleculeProperty","MoleculeQ","MoleculeRecognize","MoleculeSubstructureCount","MoleculeValue","Moment","MomentConvert","MomentEvaluate","MomentGeneratingFunction","MomentOfInertia","Monday","Monitor","MonomialList","MonomialOrder","MonsterGroupM","MoonPhase","MoonPosition","MorletWavelet","MorphologicalBinarize","MorphologicalBranchPoints","MorphologicalComponents","MorphologicalEulerNumber","MorphologicalGraph","MorphologicalPerimeter","MorphologicalTransform","MortalityData","Most","MountainData","MouseAnnotation","MouseAppearance","MouseAppearanceTag","MouseButtons","Mouseover","MousePointerNote","MousePosition","MovieData","MovingAverage","MovingMap","MovingMedian","MoyalDistribution","MultiaxisArrangement","Multicolumn","MultiedgeStyle","MultigraphQ","MultilaunchWarning","MultiLetterItalics","MultiLetterStyle","MultilineFunction","Multinomial","MultinomialDistribution","MultinormalDistribution","MultiplicativeOrder","Multiplicity","MultiplySides","MultiscriptBoxOptions","Multiselection","MultivariateHypergeometricDistribution","MultivariatePoissonDistribution","MultivariateTDistribution","N","NakagamiDistribution","NameQ","Names","NamespaceBox","NamespaceBoxOptions","Nand","NArgMax","NArgMin","NBernoulliB","NBodySimulation","NBodySimulationData","NCache","NCaputoD","NDEigensystem","NDEigenvalues","NDSolve","NDSolveValue","Nearest","NearestFunction","NearestMeshCells","NearestNeighborG","NearestNeighborGraph","NearestTo","NebulaData","NeedlemanWunschSimilarity","Needs","Negative","NegativeBinomialDistribution","NegativeDefiniteMatrixQ","NegativeIntegers","NegativelyOrientedPoints","NegativeMultinomialDistribution","NegativeRationals","NegativeReals","NegativeSemidefiniteMatrixQ","NeighborhoodData","NeighborhoodGraph","Nest","NestedGreaterGreater","NestedLessLess","NestedScriptRules","NestGraph","NestList","NestTree","NestWhile","NestWhileList","NetAppend","NetArray","NetArrayLayer","NetBidirectionalOperator","NetChain","NetDecoder","NetDelete","NetDrop","NetEncoder","NetEvaluationMode","NetExternalObject","NetExtract","NetFlatten","NetFoldOperator","NetGANOperator","NetGraph","NetInformation","NetInitialize","NetInsert","NetInsertSharedArrays","NetJoin","NetMapOperator","NetMapThreadOperator","NetMeasurements","NetModel","NetNestOperator","NetPairEmbeddingOperator","NetPort","NetPortGradient","NetPrepend","NetRename","NetReplace","NetReplacePart","NetSharedArray","NetStateObject","NetTake","NetTrain","NetTrainResultsObject","NetUnfold","NetworkPacketCapture","NetworkPacketRecording","NetworkPacketRecordingDuring","NetworkPacketTrace","NeumannValue","NevilleThetaC","NevilleThetaD","NevilleThetaN","NevilleThetaS","NewPrimitiveStyle","NExpectation","Next","NextCell","NextDate","NextPrime","NextScheduledTaskTime","NeymanScottPointProcess","NFractionalD","NHoldAll","NHoldFirst","NHoldRest","NicholsGridLines","NicholsPlot","NightHemisphere","NIntegrate","NMaximize","NMaxValue","NMinimize","NMinValue","NominalScale","NominalVariables","NonAssociative","NoncentralBetaDistribution","NoncentralChiSquareDistribution","NoncentralFRatioDistribution","NoncentralStudentTDistribution","NonCommutativeMultiply","NonConstants","NondimensionalizationTransform","None","NoneTrue","NonlinearModelFit","NonlinearStateSpaceModel","NonlocalMeansFilter","NonNegative","NonNegativeIntegers","NonNegativeRationals","NonNegativeReals","NonPositive","NonPositiveIntegers","NonPositiveRationals","NonPositiveReals","Nor","NorlundB","Norm","Normal","NormalDistribution","NormalGrouping","NormalizationLayer","Normalize","Normalized","NormalizedSquaredEuclideanDistance","NormalMatrixQ","NormalsFunction","NormFunction","Not","NotCongruent","NotCupCap","NotDoubleVerticalBar","Notebook","NotebookApply","NotebookAutoSave","NotebookBrowseDirectory","NotebookClose","NotebookConvertSettings","NotebookCreate","NotebookDefault","NotebookDelete","NotebookDirectory","NotebookDynamicExpression","NotebookEvaluate","NotebookEventActions","NotebookFileName","NotebookFind","NotebookGet","NotebookImport","NotebookInformation","NotebookInterfaceObject","NotebookLocate","NotebookObject","NotebookOpen","NotebookPath","NotebookPrint","NotebookPut","NotebookRead","Notebooks","NotebookSave","NotebookSelection","NotebooksMenu","NotebookTemplate","NotebookWrite","NotElement","NotEqualTilde","NotExists","NotGreater","NotGreaterEqual","NotGreaterFullEqual","NotGreaterGreater","NotGreaterLess","NotGreaterSlantEqual","NotGreaterTilde","Nothing","NotHumpDownHump","NotHumpEqual","NotificationFunction","NotLeftTriangle","NotLeftTriangleBar","NotLeftTriangleEqual","NotLess","NotLessEqual","NotLessFullEqual","NotLessGreater","NotLessLess","NotLessSlantEqual","NotLessTilde","NotNestedGreaterGreater","NotNestedLessLess","NotPrecedes","NotPrecedesEqual","NotPrecedesSlantEqual","NotPrecedesTilde","NotReverseElement","NotRightTriangle","NotRightTriangleBar","NotRightTriangleEqual","NotSquareSubset","NotSquareSubsetEqual","NotSquareSuperset","NotSquareSupersetEqual","NotSubset","NotSubsetEqual","NotSucceeds","NotSucceedsEqual","NotSucceedsSlantEqual","NotSucceedsTilde","NotSuperset","NotSupersetEqual","NotTilde","NotTildeEqual","NotTildeFullEqual","NotTildeTilde","NotVerticalBar","Now","NoWhitespace","NProbability","NProduct","NProductFactors","NRoots","NSolve","NSolveValues","NSum","NSumTerms","NuclearExplosionData","NuclearReactorData","Null","NullRecords","NullSpace","NullWords","Number","NumberCompose","NumberDecompose","NumberDigit","NumberExpand","NumberFieldClassNumber","NumberFieldDiscriminant","NumberFieldFundamentalUnits","NumberFieldIntegralBasis","NumberFieldNormRepresentatives","NumberFieldRegulator","NumberFieldRootsOfUnity","NumberFieldSignature","NumberForm","NumberFormat","NumberLinePlot","NumberMarks","NumberMultiplier","NumberPadding","NumberPoint","NumberQ","NumberSeparator","NumberSigns","NumberString","Numerator","NumeratorDenominator","NumericalOrder","NumericalSort","NumericArray","NumericArrayQ","NumericArrayType","NumericFunction","NumericQ","NuttallWindow","NValues","NyquistGridLines","NyquistPlot","O","ObjectExistsQ","ObservabilityGramian","ObservabilityMatrix","ObservableDecomposition","ObservableModelQ","OceanData","Octahedron","OddQ","Off","Offset","OLEData","On","ONanGroupON","Once","OneIdentity","Opacity","OpacityFunction","OpacityFunctionScaling","Open","OpenAppend","Opener","OpenerBox","OpenerBoxOptions","OpenerView","OpenFunctionInspectorPacket","Opening","OpenRead","OpenSpecialOptions","OpenTemporary","OpenWrite","Operate","OperatingSystem","OperatorApplied","OptimumFlowData","Optional","OptionalElement","OptionInspectorSettings","OptionQ","Options","OptionsPacket","OptionsPattern","OptionValue","OptionValueBox","OptionValueBoxOptions","Or","Orange","Order","OrderDistribution","OrderedQ","Ordering","OrderingBy","OrderingLayer","Orderless","OrderlessPatternSequence","OrdinalScale","OrnsteinUhlenbeckProcess","Orthogonalize","OrthogonalMatrixQ","Out","Outer","OuterPolygon","OuterPolyhedron","OutputAutoOverwrite","OutputControllabilityMatrix","OutputControllableModelQ","OutputForm","OutputFormData","OutputGrouping","OutputMathEditExpression","OutputNamePacket","OutputPorts","OutputResponse","OutputSizeLimit","OutputStream","Over","OverBar","OverDot","Overflow","OverHat","Overlaps","Overlay","OverlayBox","OverlayBoxOptions","OverlayVideo","Overscript","OverscriptBox","OverscriptBoxOptions","OverTilde","OverVector","OverwriteTarget","OwenT","OwnValues","Package","PackingMethod","PackPaclet","PacletDataRebuild","PacletDirectoryAdd","PacletDirectoryLoad","PacletDirectoryRemove","PacletDirectoryUnload","PacletDisable","PacletEnable","PacletFind","PacletFindRemote","PacletInformation","PacletInstall","PacletInstallSubmit","PacletNewerQ","PacletObject","PacletObjectQ","PacletSite","PacletSiteObject","PacletSiteRegister","PacletSites","PacletSiteUnregister","PacletSiteUpdate","PacletSymbol","PacletUninstall","PacletUpdate","PaddedForm","Padding","PaddingLayer","PaddingSize","PadeApproximant","PadLeft","PadRight","PageBreakAbove","PageBreakBelow","PageBreakWithin","PageFooterLines","PageFooters","PageHeaderLines","PageHeaders","PageHeight","PageRankCentrality","PageTheme","PageWidth","Pagination","PairCorrelationG","PairedBarChart","PairedHistogram","PairedSmoothHistogram","PairedTTest","PairedZTest","PaletteNotebook","PalettePath","PalettesMenuSettings","PalindromeQ","Pane","PaneBox","PaneBoxOptions","Panel","PanelBox","PanelBoxOptions","Paneled","PaneSelector","PaneSelectorBox","PaneSelectorBoxOptions","PaperWidth","ParabolicCylinderD","ParagraphIndent","ParagraphSpacing","ParallelArray","ParallelAxisPlot","ParallelCombine","ParallelDo","Parallelepiped","ParallelEvaluate","Parallelization","Parallelize","ParallelKernels","ParallelMap","ParallelNeeds","Parallelogram","ParallelProduct","ParallelSubmit","ParallelSum","ParallelTable","ParallelTry","Parameter","ParameterEstimator","ParameterMixtureDistribution","ParameterVariables","ParametricConvexOptimization","ParametricFunction","ParametricNDSolve","ParametricNDSolveValue","ParametricPlot","ParametricPlot3D","ParametricRampLayer","ParametricRegion","ParentBox","ParentCell","ParentConnect","ParentDirectory","ParentEdgeLabel","ParentEdgeLabelFunction","ParentEdgeLabelStyle","ParentEdgeShapeFunction","ParentEdgeStyle","ParentEdgeStyleFunction","ParentForm","Parenthesize","ParentList","ParentNotebook","ParetoDistribution","ParetoPickandsDistribution","ParkData","Part","PartBehavior","PartialCorrelationFunction","PartialD","ParticleAcceleratorData","ParticleData","Partition","PartitionGranularity","PartitionsP","PartitionsQ","PartLayer","PartOfSpeech","PartProtection","ParzenWindow","PascalDistribution","PassEventsDown","PassEventsUp","Paste","PasteAutoQuoteCharacters","PasteBoxFormInlineCells","PasteButton","Path","PathGraph","PathGraphQ","Pattern","PatternFilling","PatternReaction","PatternSequence","PatternTest","PauliMatrix","PaulWavelet","Pause","PausedTime","PDF","PeakDetect","PeanoCurve","PearsonChiSquareTest","PearsonCorrelationTest","PearsonDistribution","PenttinenPointProcess","PercentForm","PerfectNumber","PerfectNumberQ","PerformanceGoal","Perimeter","PeriodicBoundaryCondition","PeriodicInterpolation","Periodogram","PeriodogramArray","Permanent","Permissions","PermissionsGroup","PermissionsGroupMemberQ","PermissionsGroups","PermissionsKey","PermissionsKeys","PermutationCycles","PermutationCyclesQ","PermutationGroup","PermutationLength","PermutationList","PermutationListQ","PermutationMatrix","PermutationMax","PermutationMin","PermutationOrder","PermutationPower","PermutationProduct","PermutationReplace","Permutations","PermutationSupport","Permute","PeronaMalikFilter","Perpendicular","PerpendicularBisector","PersistenceLocation","PersistenceTime","PersistentObject","PersistentObjects","PersistentSymbol","PersistentValue","PersonData","PERTDistribution","PetersenGraph","PhaseMargins","PhaseRange","PhongShading","PhysicalSystemData","Pi","Pick","PickedElements","PickMode","PIDData","PIDDerivativeFilter","PIDFeedforward","PIDTune","Piecewise","PiecewiseExpand","PieChart","PieChart3D","PillaiTrace","PillaiTraceTest","PingTime","Pink","PitchRecognize","Pivoting","PixelConstrained","PixelValue","PixelValuePositions","Placed","Placeholder","PlaceholderLayer","PlaceholderReplace","Plain","PlanarAngle","PlanarFaceList","PlanarGraph","PlanarGraphQ","PlanckRadiationLaw","PlaneCurveData","PlanetaryMoonData","PlanetData","PlantData","Play","PlaybackSettings","PlayRange","Plot","Plot3D","Plot3Matrix","PlotDivision","PlotJoined","PlotLabel","PlotLabels","PlotLayout","PlotLegends","PlotMarkers","PlotPoints","PlotRange","PlotRangeClipping","PlotRangeClipPlanesStyle","PlotRangePadding","PlotRegion","PlotStyle","PlotTheme","Pluralize","Plus","PlusMinus","Pochhammer","PodStates","PodWidth","Point","Point3DBox","Point3DBoxOptions","PointBox","PointBoxOptions","PointCountDistribution","PointDensity","PointDensityFunction","PointFigureChart","PointLegend","PointLight","PointProcessEstimator","PointProcessFitTest","PointProcessParameterAssumptions","PointProcessParameterQ","PointSize","PointStatisticFunction","PointValuePlot","PoissonConsulDistribution","PoissonDistribution","PoissonPDEComponent","PoissonPointProcess","PoissonProcess","PoissonWindow","PolarAxes","PolarAxesOrigin","PolarGridLines","PolarPlot","PolarTicks","PoleZeroMarkers","PolyaAeppliDistribution","PolyGamma","Polygon","Polygon3DBox","Polygon3DBoxOptions","PolygonalNumber","PolygonAngle","PolygonBox","PolygonBoxOptions","PolygonCoordinates","PolygonDecomposition","PolygonHoleScale","PolygonIntersections","PolygonScale","Polyhedron","PolyhedronAngle","PolyhedronBox","PolyhedronBoxOptions","PolyhedronCoordinates","PolyhedronData","PolyhedronDecomposition","PolyhedronGenus","PolyLog","PolynomialExpressionQ","PolynomialExtendedGCD","PolynomialForm","PolynomialGCD","PolynomialLCM","PolynomialMod","PolynomialQ","PolynomialQuotient","PolynomialQuotientRemainder","PolynomialReduce","PolynomialRemainder","Polynomials","PolynomialSumOfSquaresList","PoolingLayer","PopupMenu","PopupMenuBox","PopupMenuBoxOptions","PopupView","PopupWindow","Position","PositionIndex","PositionLargest","PositionSmallest","Positive","PositiveDefiniteMatrixQ","PositiveIntegers","PositivelyOrientedPoints","PositiveRationals","PositiveReals","PositiveSemidefiniteMatrixQ","PossibleZeroQ","Postfix","PostScript","Power","PowerDistribution","PowerExpand","PowerMod","PowerModList","PowerRange","PowerSpectralDensity","PowersRepresentations","PowerSymmetricPolynomial","Precedence","PrecedenceForm","Precedes","PrecedesEqual","PrecedesSlantEqual","PrecedesTilde","Precision","PrecisionGoal","PreDecrement","Predict","PredictionRoot","PredictorFunction","PredictorInformation","PredictorMeasurements","PredictorMeasurementsObject","PreemptProtect","PreferencesPath","PreferencesSettings","Prefix","PreIncrement","Prepend","PrependLayer","PrependTo","PreprocessingRules","PreserveColor","PreserveImageOptions","Previous","PreviousCell","PreviousDate","PriceGraphDistribution","PrimaryPlaceholder","Prime","PrimeNu","PrimeOmega","PrimePi","PrimePowerQ","PrimeQ","Primes","PrimeZetaP","PrimitivePolynomialQ","PrimitiveRoot","PrimitiveRootList","PrincipalComponents","PrincipalValue","Print","PrintableASCIIQ","PrintAction","PrintForm","PrintingCopies","PrintingOptions","PrintingPageRange","PrintingStartingPageNumber","PrintingStyleEnvironment","Printout3D","Printout3DPreviewer","PrintPrecision","PrintTemporary","Prism","PrismBox","PrismBoxOptions","PrivateCellOptions","PrivateEvaluationOptions","PrivateFontOptions","PrivateFrontEndOptions","PrivateKey","PrivateNotebookOptions","PrivatePaths","Probability","ProbabilityDistribution","ProbabilityPlot","ProbabilityPr","ProbabilityScalePlot","ProbitModelFit","ProcessConnection","ProcessDirectory","ProcessEnvironment","Processes","ProcessEstimator","ProcessInformation","ProcessObject","ProcessParameterAssumptions","ProcessParameterQ","ProcessStateDomain","ProcessStatus","ProcessTimeDomain","Product","ProductDistribution","ProductLog","ProgressIndicator","ProgressIndicatorBox","ProgressIndicatorBoxOptions","ProgressReporting","Projection","Prolog","PromptForm","ProofObject","PropagateAborts","Properties","Property","PropertyList","PropertyValue","Proportion","Proportional","Protect","Protected","ProteinData","Pruning","PseudoInverse","PsychrometricPropertyData","PublicKey","PublisherID","PulsarData","PunctuationCharacter","Purple","Put","PutAppend","Pyramid","PyramidBox","PyramidBoxOptions","QBinomial","QFactorial","QGamma","QHypergeometricPFQ","QnDispersion","QPochhammer","QPolyGamma","QRDecomposition","QuadraticIrrationalQ","QuadraticOptimization","Quantile","QuantilePlot","Quantity","QuantityArray","QuantityDistribution","QuantityForm","QuantityMagnitude","QuantityQ","QuantityUnit","QuantityVariable","QuantityVariableCanonicalUnit","QuantityVariableDimensions","QuantityVariableIdentifier","QuantityVariablePhysicalQuantity","Quartics","QuartileDeviation","Quartiles","QuartileSkewness","Query","QuestionGenerator","QuestionInterface","QuestionObject","QuestionSelector","QueueingNetworkProcess","QueueingProcess","QueueProperties","Quiet","QuietEcho","Quit","Quotient","QuotientRemainder","RadialAxisPlot","RadialGradientFilling","RadialGradientImage","RadialityCentrality","RadicalBox","RadicalBoxOptions","RadioButton","RadioButtonBar","RadioButtonBox","RadioButtonBoxOptions","Radon","RadonTransform","RamanujanTau","RamanujanTauL","RamanujanTauTheta","RamanujanTauZ","Ramp","Random","RandomArrayLayer","RandomChoice","RandomColor","RandomComplex","RandomDate","RandomEntity","RandomFunction","RandomGeneratorState","RandomGeoPosition","RandomGraph","RandomImage","RandomInstance","RandomInteger","RandomPermutation","RandomPoint","RandomPointConfiguration","RandomPolygon","RandomPolyhedron","RandomPrime","RandomReal","RandomSample","RandomSeed","RandomSeeding","RandomTime","RandomTree","RandomVariate","RandomWalkProcess","RandomWord","Range","RangeFilter","RangeSpecification","RankedMax","RankedMin","RarerProbability","Raster","Raster3D","Raster3DBox","Raster3DBoxOptions","RasterArray","RasterBox","RasterBoxOptions","Rasterize","RasterSize","Rational","RationalExpressionQ","RationalFunctions","Rationalize","Rationals","Ratios","RawArray","RawBoxes","RawData","RawMedium","RayleighDistribution","Re","ReactionBalance","ReactionBalancedQ","ReactionPDETerm","Read","ReadByteArray","ReadLine","ReadList","ReadProtected","ReadString","Real","RealAbs","RealBlockDiagonalForm","RealDigits","RealExponent","Reals","RealSign","Reap","RebuildPacletData","RecalibrationFunction","RecognitionPrior","RecognitionThreshold","ReconstructionMesh","Record","RecordLists","RecordSeparators","Rectangle","RectangleBox","RectangleBoxOptions","RectangleChart","RectangleChart3D","RectangularRepeatingElement","RecurrenceFilter","RecurrenceTable","RecurringDigitsForm","Red","Reduce","RefBox","ReferenceLineStyle","ReferenceMarkers","ReferenceMarkerStyle","Refine","ReflectionMatrix","ReflectionTransform","Refresh","RefreshRate","Region","RegionBinarize","RegionBoundary","RegionBoundaryStyle","RegionBounds","RegionCentroid","RegionCongruent","RegionConvert","RegionDifference","RegionDilation","RegionDimension","RegionDisjoint","RegionDistance","RegionDistanceFunction","RegionEmbeddingDimension","RegionEqual","RegionErosion","RegionFillingStyle","RegionFit","RegionFunction","RegionImage","RegionIntersection","RegionMeasure","RegionMember","RegionMemberFunction","RegionMoment","RegionNearest","RegionNearestFunction","RegionPlot","RegionPlot3D","RegionProduct","RegionQ","RegionResize","RegionSimilar","RegionSize","RegionSymmetricDifference","RegionUnion","RegionWithin","RegisterExternalEvaluator","RegularExpression","Regularization","RegularlySampledQ","RegularPolygon","ReIm","ReImLabels","ReImPlot","ReImStyle","Reinstall","RelationalDatabase","RelationGraph","Release","ReleaseHold","ReliabilityDistribution","ReliefImage","ReliefPlot","RemoteAuthorizationCaching","RemoteBatchJobAbort","RemoteBatchJobObject","RemoteBatchJobs","RemoteBatchMapSubmit","RemoteBatchSubmissionEnvironment","RemoteBatchSubmit","RemoteConnect","RemoteConnectionObject","RemoteEvaluate","RemoteFile","RemoteInputFiles","RemoteKernelObject","RemoteProviderSettings","RemoteRun","RemoteRunProcess","RemovalConditions","Remove","RemoveAlphaChannel","RemoveAsynchronousTask","RemoveAudioStream","RemoveBackground","RemoveChannelListener","RemoveChannelSubscribers","Removed","RemoveDiacritics","RemoveInputStreamMethod","RemoveOutputStreamMethod","RemoveProperty","RemoveScheduledTask","RemoveUsers","RemoveVideoStream","RenameDirectory","RenameFile","RenderAll","RenderingOptions","RenewalProcess","RenkoChart","RepairMesh","Repeated","RepeatedNull","RepeatedString","RepeatedTiming","RepeatingElement","Replace","ReplaceAll","ReplaceAt","ReplaceHeldPart","ReplaceImageValue","ReplaceList","ReplacePart","ReplacePixelValue","ReplaceRepeated","ReplicateLayer","RequiredPhysicalQuantities","Resampling","ResamplingAlgorithmData","ResamplingMethod","Rescale","RescalingTransform","ResetDirectory","ResetScheduledTask","ReshapeLayer","Residue","ResidueSum","ResizeLayer","Resolve","ResolveContextAliases","ResourceAcquire","ResourceData","ResourceFunction","ResourceObject","ResourceRegister","ResourceRemove","ResourceSearch","ResourceSubmissionObject","ResourceSubmit","ResourceSystemBase","ResourceSystemPath","ResourceUpdate","ResourceVersion","ResponseForm","Rest","RestartInterval","Restricted","Resultant","ResumePacket","Return","ReturnCreatesNewCell","ReturnEntersInput","ReturnExpressionPacket","ReturnInputFormPacket","ReturnPacket","ReturnReceiptFunction","ReturnTextPacket","Reverse","ReverseApplied","ReverseBiorthogonalSplineWavelet","ReverseElement","ReverseEquilibrium","ReverseGraph","ReverseSort","ReverseSortBy","ReverseUpEquilibrium","RevolutionAxis","RevolutionPlot3D","RGBColor","RiccatiSolve","RiceDistribution","RidgeFilter","RiemannR","RiemannSiegelTheta","RiemannSiegelZ","RiemannXi","Riffle","Right","RightArrow","RightArrowBar","RightArrowLeftArrow","RightComposition","RightCosetRepresentative","RightDownTeeVector","RightDownVector","RightDownVectorBar","RightTee","RightTeeArrow","RightTeeVector","RightTriangle","RightTriangleBar","RightTriangleEqual","RightUpDownVector","RightUpTeeVector","RightUpVector","RightUpVectorBar","RightVector","RightVectorBar","RipleyK","RipleyRassonRegion","RiskAchievementImportance","RiskReductionImportance","RobustConvexOptimization","RogersTanimotoDissimilarity","RollPitchYawAngles","RollPitchYawMatrix","RomanNumeral","Root","RootApproximant","RootIntervals","RootLocusPlot","RootMeanSquare","RootOfUnityQ","RootReduce","Roots","RootSum","RootTree","Rotate","RotateLabel","RotateLeft","RotateRight","RotationAction","RotationBox","RotationBoxOptions","RotationMatrix","RotationTransform","Round","RoundImplies","RoundingRadius","Row","RowAlignments","RowBackgrounds","RowBox","RowHeights","RowLines","RowMinHeight","RowReduce","RowsEqual","RowSpacings","RSolve","RSolveValue","RudinShapiro","RudvalisGroupRu","Rule","RuleCondition","RuleDelayed","RuleForm","RulePlot","RulerUnits","RulesTree","Run","RunProcess","RunScheduledTask","RunThrough","RuntimeAttributes","RuntimeOptions","RussellRaoDissimilarity","SameAs","SameQ","SameTest","SameTestProperties","SampledEntityClass","SampleDepth","SampledSoundFunction","SampledSoundList","SampleRate","SamplingPeriod","SARIMAProcess","SARMAProcess","SASTriangle","SatelliteData","SatisfiabilityCount","SatisfiabilityInstances","SatisfiableQ","Saturday","Save","Saveable","SaveAutoDelete","SaveConnection","SaveDefinitions","SavitzkyGolayMatrix","SawtoothWave","Scale","Scaled","ScaleDivisions","ScaledMousePosition","ScaleOrigin","ScalePadding","ScaleRanges","ScaleRangeStyle","ScalingFunctions","ScalingMatrix","ScalingTransform","Scan","ScheduledTask","ScheduledTaskActiveQ","ScheduledTaskInformation","ScheduledTaskInformationData","ScheduledTaskObject","ScheduledTasks","SchurDecomposition","ScientificForm","ScientificNotationThreshold","ScorerGi","ScorerGiPrime","ScorerHi","ScorerHiPrime","ScreenRectangle","ScreenStyleEnvironment","ScriptBaselineShifts","ScriptForm","ScriptLevel","ScriptMinSize","ScriptRules","ScriptSizeMultipliers","Scrollbars","ScrollingOptions","ScrollPosition","SearchAdjustment","SearchIndexObject","SearchIndices","SearchQueryString","SearchResultObject","Sec","Sech","SechDistribution","SecondOrderConeOptimization","SectionGrouping","SectorChart","SectorChart3D","SectorOrigin","SectorSpacing","SecuredAuthenticationKey","SecuredAuthenticationKeys","SecurityCertificate","SeedRandom","Select","Selectable","SelectComponents","SelectedCells","SelectedNotebook","SelectFirst","Selection","SelectionAnimate","SelectionCell","SelectionCellCreateCell","SelectionCellDefaultStyle","SelectionCellParentStyle","SelectionCreateCell","SelectionDebuggerTag","SelectionEvaluate","SelectionEvaluateCreateCell","SelectionMove","SelectionPlaceholder","SelectWithContents","SelfLoops","SelfLoopStyle","SemanticImport","SemanticImportString","SemanticInterpretation","SemialgebraicComponentInstances","SemidefiniteOptimization","SendMail","SendMessage","Sequence","SequenceAlignment","SequenceAttentionLayer","SequenceCases","SequenceCount","SequenceFold","SequenceFoldList","SequenceForm","SequenceHold","SequenceIndicesLayer","SequenceLastLayer","SequenceMostLayer","SequencePosition","SequencePredict","SequencePredictorFunction","SequenceReplace","SequenceRestLayer","SequenceReverseLayer","SequenceSplit","Series","SeriesCoefficient","SeriesData","SeriesTermGoal","ServiceConnect","ServiceDisconnect","ServiceExecute","ServiceObject","ServiceRequest","ServiceResponse","ServiceSubmit","SessionSubmit","SessionTime","Set","SetAccuracy","SetAlphaChannel","SetAttributes","Setbacks","SetCloudDirectory","SetCookies","SetDelayed","SetDirectory","SetEnvironment","SetFileDate","SetFileFormatProperties","SetOptions","SetOptionsPacket","SetPermissions","SetPrecision","SetProperty","SetSecuredAuthenticationKey","SetSelectedNotebook","SetSharedFunction","SetSharedVariable","SetStreamPosition","SetSystemModel","SetSystemOptions","Setter","SetterBar","SetterBox","SetterBoxOptions","Setting","SetUsers","Shading","Shallow","ShannonWavelet","ShapiroWilkTest","Share","SharingList","Sharpen","ShearingMatrix","ShearingTransform","ShellRegion","ShenCastanMatrix","ShiftedGompertzDistribution","ShiftRegisterSequence","Short","ShortDownArrow","Shortest","ShortestMatch","ShortestPathFunction","ShortLeftArrow","ShortRightArrow","ShortTimeFourier","ShortTimeFourierData","ShortUpArrow","Show","ShowAutoConvert","ShowAutoSpellCheck","ShowAutoStyles","ShowCellBracket","ShowCellLabel","ShowCellTags","ShowClosedCellArea","ShowCodeAssist","ShowContents","ShowControls","ShowCursorTracker","ShowGroupOpenCloseIcon","ShowGroupOpener","ShowInvisibleCharacters","ShowPageBreaks","ShowPredictiveInterface","ShowSelection","ShowShortBoxForm","ShowSpecialCharacters","ShowStringCharacters","ShowSyntaxStyles","ShrinkingDelay","ShrinkWrapBoundingBox","SiderealTime","SiegelTheta","SiegelTukeyTest","SierpinskiCurve","SierpinskiMesh","Sign","Signature","SignedRankTest","SignedRegionDistance","SignificanceLevel","SignPadding","SignTest","SimilarityRules","SimpleGraph","SimpleGraphQ","SimplePolygonQ","SimplePolyhedronQ","Simplex","Simplify","Sin","Sinc","SinghMaddalaDistribution","SingleEvaluation","SingleLetterItalics","SingleLetterStyle","SingularValueDecomposition","SingularValueList","SingularValuePlot","SingularValues","Sinh","SinhIntegral","SinIntegral","SixJSymbol","Skeleton","SkeletonTransform","SkellamDistribution","Skewness","SkewNormalDistribution","SkinStyle","Skip","SliceContourPlot3D","SliceDensityPlot3D","SliceDistribution","SliceVectorPlot3D","Slider","Slider2D","Slider2DBox","Slider2DBoxOptions","SliderBox","SliderBoxOptions","SlideShowVideo","SlideView","Slot","SlotSequence","Small","SmallCircle","Smaller","SmithDecomposition","SmithDelayCompensator","SmithWatermanSimilarity","SmoothDensityHistogram","SmoothHistogram","SmoothHistogram3D","SmoothKernelDistribution","SmoothPointDensity","SnDispersion","Snippet","SnippetsVideo","SnubPolyhedron","SocialMediaData","Socket","SocketConnect","SocketListen","SocketListener","SocketObject","SocketOpen","SocketReadMessage","SocketReadyQ","Sockets","SocketWaitAll","SocketWaitNext","SoftmaxLayer","SokalSneathDissimilarity","SolarEclipse","SolarSystemFeatureData","SolarTime","SolidAngle","SolidBoundaryLoadValue","SolidData","SolidDisplacementCondition","SolidFixedCondition","SolidMechanicsPDEComponent","SolidMechanicsStrain","SolidMechanicsStress","SolidRegionQ","Solve","SolveAlways","SolveDelayed","SolveValues","Sort","SortBy","SortedBy","SortedEntityClass","Sound","SoundAndGraphics","SoundNote","SoundVolume","SourceLink","SourcePDETerm","Sow","Space","SpaceCurveData","SpaceForm","Spacer","Spacings","Span","SpanAdjustments","SpanCharacterRounding","SpanFromAbove","SpanFromBoth","SpanFromLeft","SpanLineThickness","SpanMaxSize","SpanMinSize","SpanningCharacters","SpanSymmetric","SparseArray","SparseArrayQ","SpatialBinnedPointData","SpatialBoundaryCorrection","SpatialEstimate","SpatialEstimatorFunction","SpatialGraphDistribution","SpatialJ","SpatialMedian","SpatialNoiseLevel","SpatialObservationRegionQ","SpatialPointData","SpatialPointSelect","SpatialRandomnessTest","SpatialTransformationLayer","SpatialTrendFunction","Speak","SpeakerMatchQ","SpearmanRankTest","SpearmanRho","SpeciesData","SpecificityGoal","SpectralLineData","Spectrogram","SpectrogramArray","Specularity","SpeechCases","SpeechInterpreter","SpeechRecognize","SpeechSynthesize","SpellingCorrection","SpellingCorrectionList","SpellingDictionaries","SpellingDictionariesPath","SpellingOptions","Sphere","SphereBox","SphereBoxOptions","SpherePoints","SphericalBesselJ","SphericalBesselY","SphericalHankelH1","SphericalHankelH2","SphericalHarmonicY","SphericalPlot3D","SphericalRegion","SphericalShell","SpheroidalEigenvalue","SpheroidalJoiningFactor","SpheroidalPS","SpheroidalPSPrime","SpheroidalQS","SpheroidalQSPrime","SpheroidalRadialFactor","SpheroidalS1","SpheroidalS1Prime","SpheroidalS2","SpheroidalS2Prime","Splice","SplicedDistribution","SplineClosed","SplineDegree","SplineKnots","SplineWeights","Split","SplitBy","SpokenString","SpotLight","Sqrt","SqrtBox","SqrtBoxOptions","Square","SquaredEuclideanDistance","SquareFreeQ","SquareIntersection","SquareMatrixQ","SquareRepeatingElement","SquaresR","SquareSubset","SquareSubsetEqual","SquareSuperset","SquareSupersetEqual","SquareUnion","SquareWave","SSSTriangle","StabilityMargins","StabilityMarginsStyle","StableDistribution","Stack","StackBegin","StackComplete","StackedDateListPlot","StackedListPlot","StackInhibit","StadiumShape","StandardAtmosphereData","StandardDeviation","StandardDeviationFilter","StandardForm","Standardize","Standardized","StandardOceanData","StandbyDistribution","Star","StarClusterData","StarData","StarGraph","StartAsynchronousTask","StartExternalSession","StartingStepSize","StartOfLine","StartOfString","StartProcess","StartScheduledTask","StartupSound","StartWebSession","StateDimensions","StateFeedbackGains","StateOutputEstimator","StateResponse","StateSpaceModel","StateSpaceRealization","StateSpaceTransform","StateTransformationLinearize","StationaryDistribution","StationaryWaveletPacketTransform","StationaryWaveletTransform","StatusArea","StatusCentrality","StepMonitor","StereochemistryElements","StieltjesGamma","StippleShading","StirlingS1","StirlingS2","StopAsynchronousTask","StoppingPowerData","StopScheduledTask","StrataVariables","StratonovichProcess","StraussHardcorePointProcess","StraussPointProcess","StreamColorFunction","StreamColorFunctionScaling","StreamDensityPlot","StreamMarkers","StreamPlot","StreamPlot3D","StreamPoints","StreamPosition","Streams","StreamScale","StreamStyle","StrictInequalities","String","StringBreak","StringByteCount","StringCases","StringContainsQ","StringCount","StringDelete","StringDrop","StringEndsQ","StringExpression","StringExtract","StringForm","StringFormat","StringFormatQ","StringFreeQ","StringInsert","StringJoin","StringLength","StringMatchQ","StringPadLeft","StringPadRight","StringPart","StringPartition","StringPosition","StringQ","StringRepeat","StringReplace","StringReplaceList","StringReplacePart","StringReverse","StringRiffle","StringRotateLeft","StringRotateRight","StringSkeleton","StringSplit","StringStartsQ","StringTake","StringTakeDrop","StringTemplate","StringToByteArray","StringToStream","StringTrim","StripBoxes","StripOnInput","StripStyleOnPaste","StripWrapperBoxes","StrokeForm","Struckthrough","StructuralImportance","StructuredArray","StructuredArrayHeadQ","StructuredSelection","StruveH","StruveL","Stub","StudentTDistribution","Style","StyleBox","StyleBoxAutoDelete","StyleData","StyleDefinitions","StyleForm","StyleHints","StyleKeyMapping","StyleMenuListing","StyleNameDialogSettings","StyleNames","StylePrint","StyleSheetPath","Subdivide","Subfactorial","Subgraph","SubMinus","SubPlus","SubresultantPolynomialRemainders","SubresultantPolynomials","Subresultants","Subscript","SubscriptBox","SubscriptBoxOptions","Subscripted","Subsequences","Subset","SubsetCases","SubsetCount","SubsetEqual","SubsetMap","SubsetPosition","SubsetQ","SubsetReplace","Subsets","SubStar","SubstitutionSystem","Subsuperscript","SubsuperscriptBox","SubsuperscriptBoxOptions","SubtitleEncoding","SubtitleTrackSelection","Subtract","SubtractFrom","SubtractSides","SubValues","Succeeds","SucceedsEqual","SucceedsSlantEqual","SucceedsTilde","Success","SuchThat","Sum","SumConvergence","SummationLayer","Sunday","SunPosition","Sunrise","Sunset","SuperDagger","SuperMinus","SupernovaData","SuperPlus","Superscript","SuperscriptBox","SuperscriptBoxOptions","Superset","SupersetEqual","SuperStar","Surd","SurdForm","SurfaceAppearance","SurfaceArea","SurfaceColor","SurfaceData","SurfaceGraphics","SurvivalDistribution","SurvivalFunction","SurvivalModel","SurvivalModelFit","SuspendPacket","SuzukiDistribution","SuzukiGroupSuz","SwatchLegend","Switch","Symbol","SymbolName","SymletWavelet","Symmetric","SymmetricDifference","SymmetricGroup","SymmetricKey","SymmetricMatrixQ","SymmetricPolynomial","SymmetricReduction","Symmetrize","SymmetrizedArray","SymmetrizedArrayRules","SymmetrizedDependentComponents","SymmetrizedIndependentComponents","SymmetrizedReplacePart","SynchronousInitialization","SynchronousUpdating","Synonyms","Syntax","SyntaxForm","SyntaxInformation","SyntaxLength","SyntaxPacket","SyntaxQ","SynthesizeMissingValues","SystemCredential","SystemCredentialData","SystemCredentialKey","SystemCredentialKeys","SystemCredentialStoreObject","SystemDialogInput","SystemException","SystemGet","SystemHelpPath","SystemInformation","SystemInformationData","SystemInstall","SystemModel","SystemModeler","SystemModelExamples","SystemModelLinearize","SystemModelMeasurements","SystemModelParametricSimulate","SystemModelPlot","SystemModelProgressReporting","SystemModelReliability","SystemModels","SystemModelSimulate","SystemModelSimulateSensitivity","SystemModelSimulationData","SystemOpen","SystemOptions","SystemProcessData","SystemProcesses","SystemsConnectionsModel","SystemsModelControllerData","SystemsModelDelay","SystemsModelDelayApproximate","SystemsModelDelete","SystemsModelDimensions","SystemsModelExtract","SystemsModelFeedbackConnect","SystemsModelLabels","SystemsModelLinearity","SystemsModelMerge","SystemsModelOrder","SystemsModelParallelConnect","SystemsModelSeriesConnect","SystemsModelStateFeedbackConnect","SystemsModelVectorRelativeOrders","SystemStub","SystemTest","Tab","TabFilling","Table","TableAlignments","TableDepth","TableDirections","TableForm","TableHeadings","TableSpacing","TableView","TableViewBox","TableViewBoxAlignment","TableViewBoxBackground","TableViewBoxHeaders","TableViewBoxItemSize","TableViewBoxItemStyle","TableViewBoxOptions","TabSpacings","TabView","TabViewBox","TabViewBoxOptions","TagBox","TagBoxNote","TagBoxOptions","TaggingRules","TagSet","TagSetDelayed","TagStyle","TagUnset","Take","TakeDrop","TakeLargest","TakeLargestBy","TakeList","TakeSmallest","TakeSmallestBy","TakeWhile","Tally","Tan","Tanh","TargetDevice","TargetFunctions","TargetSystem","TargetUnits","TaskAbort","TaskExecute","TaskObject","TaskRemove","TaskResume","Tasks","TaskSuspend","TaskWait","TautologyQ","TelegraphProcess","TemplateApply","TemplateArgBox","TemplateBox","TemplateBoxOptions","TemplateEvaluate","TemplateExpression","TemplateIf","TemplateObject","TemplateSequence","TemplateSlot","TemplateSlotSequence","TemplateUnevaluated","TemplateVerbatim","TemplateWith","TemporalData","TemporalRegularity","Temporary","TemporaryVariable","TensorContract","TensorDimensions","TensorExpand","TensorProduct","TensorQ","TensorRank","TensorReduce","TensorSymmetry","TensorTranspose","TensorWedge","TerminatedEvaluation","TernaryListPlot","TernaryPlotCorners","TestID","TestReport","TestReportObject","TestResultObject","Tetrahedron","TetrahedronBox","TetrahedronBoxOptions","TeXForm","TeXSave","Text","Text3DBox","Text3DBoxOptions","TextAlignment","TextBand","TextBoundingBox","TextBox","TextCases","TextCell","TextClipboardType","TextContents","TextData","TextElement","TextForm","TextGrid","TextJustification","TextLine","TextPacket","TextParagraph","TextPosition","TextRecognize","TextSearch","TextSearchReport","TextSentences","TextString","TextStructure","TextStyle","TextTranslation","Texture","TextureCoordinateFunction","TextureCoordinateScaling","TextWords","Therefore","ThermodynamicData","ThermometerGauge","Thick","Thickness","Thin","Thinning","ThisLink","ThomasPointProcess","ThompsonGroupTh","Thread","Threaded","ThreadingLayer","ThreeJSymbol","Threshold","Through","Throw","ThueMorse","Thumbnail","Thursday","TickDirection","TickLabelOrientation","TickLabelPositioning","TickLabels","TickLengths","TickPositions","Ticks","TicksStyle","TideData","Tilde","TildeEqual","TildeFullEqual","TildeTilde","TimeConstrained","TimeConstraint","TimeDirection","TimeFormat","TimeGoal","TimelinePlot","TimeObject","TimeObjectQ","TimeRemaining","Times","TimesBy","TimeSeries","TimeSeriesAggregate","TimeSeriesForecast","TimeSeriesInsert","TimeSeriesInvertibility","TimeSeriesMap","TimeSeriesMapThread","TimeSeriesModel","TimeSeriesModelFit","TimeSeriesResample","TimeSeriesRescale","TimeSeriesShift","TimeSeriesThread","TimeSeriesWindow","TimeSystem","TimeSystemConvert","TimeUsed","TimeValue","TimeWarpingCorrespondence","TimeWarpingDistance","TimeZone","TimeZoneConvert","TimeZoneOffset","Timing","Tiny","TitleGrouping","TitsGroupT","ToBoxes","ToCharacterCode","ToColor","ToContinuousTimeModel","ToDate","Today","ToDiscreteTimeModel","ToEntity","ToeplitzMatrix","ToExpression","ToFileName","Together","Toggle","ToggleFalse","Toggler","TogglerBar","TogglerBox","TogglerBoxOptions","ToHeldExpression","ToInvertibleTimeSeries","TokenWords","Tolerance","ToLowerCase","Tomorrow","ToNumberField","TooBig","Tooltip","TooltipBox","TooltipBoxOptions","TooltipDelay","TooltipStyle","ToonShading","Top","TopHatTransform","ToPolarCoordinates","TopologicalSort","ToRadicals","ToRawPointer","ToRules","Torus","TorusGraph","ToSphericalCoordinates","ToString","Total","TotalHeight","TotalLayer","TotalVariationFilter","TotalWidth","TouchPosition","TouchscreenAutoZoom","TouchscreenControlPlacement","ToUpperCase","TourVideo","Tr","Trace","TraceAbove","TraceAction","TraceBackward","TraceDepth","TraceDialog","TraceForward","TraceInternal","TraceLevel","TraceOff","TraceOn","TraceOriginal","TracePrint","TraceScan","TrackCellChangeTimes","TrackedSymbols","TrackingFunction","TracyWidomDistribution","TradingChart","TraditionalForm","TraditionalFunctionNotation","TraditionalNotation","TraditionalOrder","TrainImageContentDetector","TrainingProgressCheckpointing","TrainingProgressFunction","TrainingProgressMeasurements","TrainingProgressReporting","TrainingStoppingCriterion","TrainingUpdateSchedule","TrainTextContentDetector","TransferFunctionCancel","TransferFunctionExpand","TransferFunctionFactor","TransferFunctionModel","TransferFunctionPoles","TransferFunctionTransform","TransferFunctionZeros","TransformationClass","TransformationFunction","TransformationFunctions","TransformationMatrix","TransformedDistribution","TransformedField","TransformedProcess","TransformedRegion","TransitionDirection","TransitionDuration","TransitionEffect","TransitiveClosureGraph","TransitiveReductionGraph","Translate","TranslationOptions","TranslationTransform","Transliterate","Transparent","TransparentColor","Transpose","TransposeLayer","TrapEnterKey","TrapSelection","TravelDirections","TravelDirectionsData","TravelDistance","TravelDistanceList","TravelMethod","TravelTime","Tree","TreeCases","TreeChildren","TreeCount","TreeData","TreeDelete","TreeDepth","TreeElementCoordinates","TreeElementLabel","TreeElementLabelFunction","TreeElementLabelStyle","TreeElementShape","TreeElementShapeFunction","TreeElementSize","TreeElementSizeFunction","TreeElementStyle","TreeElementStyleFunction","TreeExpression","TreeExtract","TreeFold","TreeForm","TreeGraph","TreeGraphQ","TreeInsert","TreeLayout","TreeLeafCount","TreeLeafQ","TreeLeaves","TreeLevel","TreeMap","TreeMapAt","TreeOutline","TreePlot","TreePosition","TreeQ","TreeReplacePart","TreeRules","TreeScan","TreeSelect","TreeSize","TreeTraversalOrder","TrendStyle","Triangle","TriangleCenter","TriangleConstruct","TriangleMeasurement","TriangleWave","TriangularDistribution","TriangulateMesh","Trig","TrigExpand","TrigFactor","TrigFactorList","Trigger","TrigReduce","TrigToExp","TrimmedMean","TrimmedVariance","TropicalStormData","True","TrueQ","TruncatedDistribution","TruncatedPolyhedron","TsallisQExponentialDistribution","TsallisQGaussianDistribution","TTest","Tube","TubeBezierCurveBox","TubeBezierCurveBoxOptions","TubeBox","TubeBoxOptions","TubeBSplineCurveBox","TubeBSplineCurveBoxOptions","Tuesday","TukeyLambdaDistribution","TukeyWindow","TunnelData","Tuples","TuranGraph","TuringMachine","TuttePolynomial","TwoWayRule","Typed","TypeDeclaration","TypeEvaluate","TypeHint","TypeOf","TypeSpecifier","UnateQ","Uncompress","UnconstrainedParameters","Undefined","UnderBar","Underflow","Underlined","Underoverscript","UnderoverscriptBox","UnderoverscriptBoxOptions","Underscript","UnderscriptBox","UnderscriptBoxOptions","UnderseaFeatureData","UndirectedEdge","UndirectedGraph","UndirectedGraphQ","UndoOptions","UndoTrackedVariables","Unequal","UnequalTo","Unevaluated","UniformDistribution","UniformGraphDistribution","UniformPolyhedron","UniformSumDistribution","Uninstall","Union","UnionedEntityClass","UnionPlus","Unique","UniqueElements","UnitaryMatrixQ","UnitBox","UnitConvert","UnitDimensions","Unitize","UnitRootTest","UnitSimplify","UnitStep","UnitSystem","UnitTriangle","UnitVector","UnitVectorLayer","UnityDimensions","UniverseModelData","UniversityData","UnixTime","UnlabeledTree","UnmanageObject","Unprotect","UnregisterExternalEvaluator","UnsameQ","UnsavedVariables","Unset","UnsetShared","Until","UntrackedVariables","Up","UpArrow","UpArrowBar","UpArrowDownArrow","Update","UpdateDynamicObjects","UpdateDynamicObjectsSynchronous","UpdateInterval","UpdatePacletSites","UpdateSearchIndex","UpDownArrow","UpEquilibrium","UpperCaseQ","UpperLeftArrow","UpperRightArrow","UpperTriangularize","UpperTriangularMatrix","UpperTriangularMatrixQ","Upsample","UpSet","UpSetDelayed","UpTee","UpTeeArrow","UpTo","UpValues","URL","URLBuild","URLDecode","URLDispatcher","URLDownload","URLDownloadSubmit","URLEncode","URLExecute","URLExpand","URLFetch","URLFetchAsynchronous","URLParse","URLQueryDecode","URLQueryEncode","URLRead","URLResponseTime","URLSave","URLSaveAsynchronous","URLShorten","URLSubmit","UseEmbeddedLibrary","UseGraphicsRange","UserDefinedWavelet","Using","UsingFrontEnd","UtilityFunction","V2Get","ValenceErrorHandling","ValenceFilling","ValidationLength","ValidationSet","ValueBox","ValueBoxOptions","ValueDimensions","ValueForm","ValuePreprocessingFunction","ValueQ","Values","ValuesData","VandermondeMatrix","Variables","Variance","VarianceEquivalenceTest","VarianceEstimatorFunction","VarianceGammaDistribution","VarianceGammaPointProcess","VarianceTest","VariogramFunction","VariogramModel","VectorAngle","VectorAround","VectorAspectRatio","VectorColorFunction","VectorColorFunctionScaling","VectorDensityPlot","VectorDisplacementPlot","VectorDisplacementPlot3D","VectorGlyphData","VectorGreater","VectorGreaterEqual","VectorLess","VectorLessEqual","VectorMarkers","VectorPlot","VectorPlot3D","VectorPoints","VectorQ","VectorRange","Vectors","VectorScale","VectorScaling","VectorSizes","VectorStyle","Vee","Verbatim","Verbose","VerificationTest","VerifyConvergence","VerifyDerivedKey","VerifyDigitalSignature","VerifyFileSignature","VerifyInterpretation","VerifySecurityCertificates","VerifySolutions","VerifyTestAssumptions","VersionedPreferences","VertexAdd","VertexCapacity","VertexChromaticNumber","VertexColors","VertexComponent","VertexConnectivity","VertexContract","VertexCoordinateRules","VertexCoordinates","VertexCorrelationSimilarity","VertexCosineSimilarity","VertexCount","VertexCoverQ","VertexDataCoordinates","VertexDegree","VertexDelete","VertexDiceSimilarity","VertexEccentricity","VertexInComponent","VertexInComponentGraph","VertexInDegree","VertexIndex","VertexJaccardSimilarity","VertexLabeling","VertexLabels","VertexLabelStyle","VertexList","VertexNormals","VertexOutComponent","VertexOutComponentGraph","VertexOutDegree","VertexQ","VertexRenderingFunction","VertexReplace","VertexShape","VertexShapeFunction","VertexSize","VertexStyle","VertexTextureCoordinates","VertexTransitiveGraphQ","VertexWeight","VertexWeightedGraphQ","Vertical","VerticalBar","VerticalForm","VerticalGauge","VerticalSeparator","VerticalSlider","VerticalTilde","Video","VideoCapture","VideoCombine","VideoDelete","VideoEncoding","VideoExtractFrames","VideoFrameList","VideoFrameMap","VideoGenerator","VideoInsert","VideoIntervals","VideoJoin","VideoMap","VideoMapList","VideoMapTimeSeries","VideoPadding","VideoPause","VideoPlay","VideoQ","VideoRecord","VideoReplace","VideoScreenCapture","VideoSplit","VideoStop","VideoStream","VideoStreams","VideoTimeStretch","VideoTrackSelection","VideoTranscode","VideoTransparency","VideoTrim","ViewAngle","ViewCenter","ViewMatrix","ViewPoint","ViewPointSelectorSettings","ViewPort","ViewProjection","ViewRange","ViewVector","ViewVertical","VirtualGroupData","Visible","VisibleCell","VoiceStyleData","VoigtDistribution","VolcanoData","Volume","VonMisesDistribution","VoronoiMesh","WaitAll","WaitAsynchronousTask","WaitNext","WaitUntil","WakebyDistribution","WalleniusHypergeometricDistribution","WaringYuleDistribution","WarpingCorrespondence","WarpingDistance","WatershedComponents","WatsonUSquareTest","WattsStrogatzGraphDistribution","WaveletBestBasis","WaveletFilterCoefficients","WaveletImagePlot","WaveletListPlot","WaveletMapIndexed","WaveletMatrixPlot","WaveletPhi","WaveletPsi","WaveletScale","WaveletScalogram","WaveletThreshold","WavePDEComponent","WeaklyConnectedComponents","WeaklyConnectedGraphComponents","WeaklyConnectedGraphQ","WeakStationarity","WeatherData","WeatherForecastData","WebAudioSearch","WebColumn","WebElementObject","WeberE","WebExecute","WebImage","WebImageSearch","WebItem","WebPageMetaInformation","WebRow","WebSearch","WebSessionObject","WebSessions","WebWindowObject","Wedge","Wednesday","WeibullDistribution","WeierstrassE1","WeierstrassE2","WeierstrassE3","WeierstrassEta1","WeierstrassEta2","WeierstrassEta3","WeierstrassHalfPeriods","WeierstrassHalfPeriodW1","WeierstrassHalfPeriodW2","WeierstrassHalfPeriodW3","WeierstrassInvariantG2","WeierstrassInvariantG3","WeierstrassInvariants","WeierstrassP","WeierstrassPPrime","WeierstrassSigma","WeierstrassZeta","WeightedAdjacencyGraph","WeightedAdjacencyMatrix","WeightedData","WeightedGraphQ","Weights","WelchWindow","WheelGraph","WhenEvent","Which","While","White","WhiteNoiseProcess","WhitePoint","Whitespace","WhitespaceCharacter","WhittakerM","WhittakerW","WholeCellGroupOpener","WienerFilter","WienerProcess","WignerD","WignerSemicircleDistribution","WikidataData","WikidataSearch","WikipediaData","WikipediaSearch","WilksW","WilksWTest","WindDirectionData","WindingCount","WindingPolygon","WindowClickSelect","WindowElements","WindowFloating","WindowFrame","WindowFrameElements","WindowMargins","WindowMovable","WindowOpacity","WindowPersistentStyles","WindowSelected","WindowSize","WindowStatusArea","WindowTitle","WindowToolbars","WindowWidth","WindSpeedData","WindVectorData","WinsorizedMean","WinsorizedVariance","WishartMatrixDistribution","With","WithCleanup","WithLock","WolframAlpha","WolframAlphaDate","WolframAlphaQuantity","WolframAlphaResult","WolframCloudSettings","WolframLanguageData","Word","WordBoundary","WordCharacter","WordCloud","WordCount","WordCounts","WordData","WordDefinition","WordFrequency","WordFrequencyData","WordList","WordOrientation","WordSearch","WordSelectionFunction","WordSeparators","WordSpacings","WordStem","WordTranslation","WorkingPrecision","WrapAround","Write","WriteLine","WriteString","Wronskian","XMLElement","XMLObject","XMLTemplate","Xnor","Xor","XYZColor","Yellow","Yesterday","YuleDissimilarity","ZernikeR","ZeroSymmetric","ZeroTest","ZeroWidthTimes","Zeta","ZetaZero","ZIPCodeData","ZipfDistribution","ZoomCenter","ZoomFactor","ZTest","ZTransform","$Aborted","$ActivationGroupID","$ActivationKey","$ActivationUserRegistered","$AddOnsDirectory","$AllowDataUpdates","$AllowExternalChannelFunctions","$AllowInternet","$AssertFunction","$Assumptions","$AsynchronousTask","$AudioDecoders","$AudioEncoders","$AudioInputDevices","$AudioOutputDevices","$BaseDirectory","$BasePacletsDirectory","$BatchInput","$BatchOutput","$BlockchainBase","$BoxForms","$ByteOrdering","$CacheBaseDirectory","$Canceled","$ChannelBase","$CharacterEncoding","$CharacterEncodings","$CloudAccountName","$CloudBase","$CloudConnected","$CloudConnection","$CloudCreditsAvailable","$CloudEvaluation","$CloudExpressionBase","$CloudObjectNameFormat","$CloudObjectURLType","$CloudRootDirectory","$CloudSymbolBase","$CloudUserID","$CloudUserUUID","$CloudVersion","$CloudVersionNumber","$CloudWolframEngineVersionNumber","$CommandLine","$CompilationTarget","$CompilerEnvironment","$ConditionHold","$ConfiguredKernels","$Context","$ContextAliases","$ContextPath","$ControlActiveSetting","$Cookies","$CookieStore","$CreationDate","$CryptographicEllipticCurveNames","$CurrentLink","$CurrentTask","$CurrentWebSession","$DataStructures","$DateStringFormat","$DefaultAudioInputDevice","$DefaultAudioOutputDevice","$DefaultFont","$DefaultFrontEnd","$DefaultImagingDevice","$DefaultKernels","$DefaultLocalBase","$DefaultLocalKernel","$DefaultMailbox","$DefaultNetworkInterface","$DefaultPath","$DefaultProxyRules","$DefaultRemoteBatchSubmissionEnvironment","$DefaultRemoteKernel","$DefaultSystemCredentialStore","$Display","$DisplayFunction","$DistributedContexts","$DynamicEvaluation","$Echo","$EmbedCodeEnvironments","$EmbeddableServices","$EntityStores","$Epilog","$EvaluationCloudBase","$EvaluationCloudObject","$EvaluationEnvironment","$ExportFormats","$ExternalIdentifierTypes","$ExternalStorageBase","$Failed","$FinancialDataSource","$FontFamilies","$FormatType","$FrontEnd","$FrontEndSession","$GeneratedAssetLocation","$GeoEntityTypes","$GeoLocation","$GeoLocationCity","$GeoLocationCountry","$GeoLocationPrecision","$GeoLocationSource","$HistoryLength","$HomeDirectory","$HTMLExportRules","$HTTPCookies","$HTTPRequest","$IgnoreEOF","$ImageFormattingWidth","$ImageResolution","$ImagingDevice","$ImagingDevices","$ImportFormats","$IncomingMailSettings","$InitialDirectory","$Initialization","$InitializationContexts","$Input","$InputFileName","$InputStreamMethods","$Inspector","$InstallationDate","$InstallationDirectory","$InterfaceEnvironment","$InterpreterTypes","$IterationLimit","$KernelCount","$KernelID","$Language","$LaunchDirectory","$LibraryPath","$LicenseExpirationDate","$LicenseID","$LicenseProcesses","$LicenseServer","$LicenseSubprocesses","$LicenseType","$Line","$Linked","$LinkSupported","$LoadedFiles","$LocalBase","$LocalSymbolBase","$MachineAddresses","$MachineDomain","$MachineDomains","$MachineEpsilon","$MachineID","$MachineName","$MachinePrecision","$MachineType","$MaxDisplayedChildren","$MaxExtraPrecision","$MaxLicenseProcesses","$MaxLicenseSubprocesses","$MaxMachineNumber","$MaxNumber","$MaxPiecewiseCases","$MaxPrecision","$MaxRootDegree","$MessageGroups","$MessageList","$MessagePrePrint","$Messages","$MinMachineNumber","$MinNumber","$MinorReleaseNumber","$MinPrecision","$MobilePhone","$ModuleNumber","$NetworkConnected","$NetworkInterfaces","$NetworkLicense","$NewMessage","$NewSymbol","$NotebookInlineStorageLimit","$Notebooks","$NoValue","$NumberMarks","$Off","$OperatingSystem","$Output","$OutputForms","$OutputSizeLimit","$OutputStreamMethods","$Packages","$ParentLink","$ParentProcessID","$PasswordFile","$PatchLevelID","$Path","$PathnameSeparator","$PerformanceGoal","$Permissions","$PermissionsGroupBase","$PersistenceBase","$PersistencePath","$PipeSupported","$PlotTheme","$Post","$Pre","$PreferencesDirectory","$PreInitialization","$PrePrint","$PreRead","$PrintForms","$PrintLiteral","$Printout3DPreviewer","$ProcessID","$ProcessorCount","$ProcessorType","$ProductInformation","$ProgramName","$ProgressReporting","$PublisherID","$RandomGeneratorState","$RandomState","$RecursionLimit","$RegisteredDeviceClasses","$RegisteredUserName","$ReleaseNumber","$RequesterAddress","$RequesterCloudUserID","$RequesterCloudUserUUID","$RequesterWolframID","$RequesterWolframUUID","$ResourceSystemBase","$ResourceSystemPath","$RootDirectory","$ScheduledTask","$ScriptCommandLine","$ScriptInputString","$SecuredAuthenticationKeyTokens","$ServiceCreditsAvailable","$Services","$SessionID","$SetParentLink","$SharedFunctions","$SharedVariables","$SoundDisplay","$SoundDisplayFunction","$SourceLink","$SSHAuthentication","$SubtitleDecoders","$SubtitleEncoders","$SummaryBoxDataSizeLimit","$SuppressInputFormHeads","$SynchronousEvaluation","$SyntaxHandler","$System","$SystemCharacterEncoding","$SystemCredentialStore","$SystemID","$SystemMemory","$SystemShell","$SystemTimeZone","$SystemWordLength","$TargetSystems","$TemplatePath","$TemporaryDirectory","$TemporaryPrefix","$TestFileName","$TextStyle","$TimedOut","$TimeUnit","$TimeZone","$TimeZoneEntity","$TopDirectory","$TraceOff","$TraceOn","$TracePattern","$TracePostAction","$TracePreAction","$UnitSystem","$Urgent","$UserAddOnsDirectory","$UserAgentLanguages","$UserAgentMachine","$UserAgentName","$UserAgentOperatingSystem","$UserAgentString","$UserAgentVersion","$UserBaseDirectory","$UserBasePacletsDirectory","$UserDocumentsDirectory","$Username","$UserName","$UserURLBase","$Version","$VersionNumber","$VideoDecoders","$VideoEncoders","$VoiceStyles","$WolframDocumentsDirectory","$WolframID","$WolframUUID"]
 ;return t=>{
 const i=t.regex,o=i.either(i.concat(/([2-9]|[1-2]\d|[3][0-5])\^\^/,/(\w*\.\w+|\w+\.\w*|\w+)/),/(\d*\.\d+|\d+\.\d*|\d+)/),a=i.either(/``[+-]?(\d*\.\d+|\d+\.\d*|\d+)/,/`([+-]?(\d*\.\d+|\d+\.\d*|\d+))?/),n={
 className:"number",relevance:0,
diff --git a/vendor/assets/javascripts/highlightjs/languages/matlab.min.js b/vendor/assets/javascripts/highlightjs/languages/matlab.min.js
index db185514e58..1ca1cd46564 100644
--- a/vendor/assets/javascripts/highlightjs/languages/matlab.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/matlab.min.js
@@ -1,15 +1,15 @@
-/*! `matlab` grammar compiled for Highlight.js 11.6.0 */
-(()=>{var e=(()=>{"use strict";return e=>{const a={relevance:0,contains:[{
-begin:"('|\\.')+"}]};return{name:"Matlab",keywords:{
+/*! `matlab` grammar compiled for Highlight.js 11.8.0 */
+(()=>{var e=(()=>{"use strict";return e=>{const a="('|\\.')+",s={relevance:0,
+contains:[{begin:a}]};return{name:"Matlab",keywords:{
 keyword:"arguments break case catch classdef continue else elseif end enumeration events for function global if methods otherwise parfor persistent properties return spmd switch try while",
 built_in:"sin sind sinh asin asind asinh cos cosd cosh acos acosd acosh tan tand tanh atan atand atan2 atanh sec secd sech asec asecd asech csc cscd csch acsc acscd acsch cot cotd coth acot acotd acoth hypot exp expm1 log log1p log10 log2 pow2 realpow reallog realsqrt sqrt nthroot nextpow2 abs angle complex conj imag real unwrap isreal cplxpair fix floor ceil round mod rem sign airy besselj bessely besselh besseli besselk beta betainc betaln ellipj ellipke erf erfc erfcx erfinv expint gamma gammainc gammaln psi legendre cross dot factor isprime primes gcd lcm rat rats perms nchoosek factorial cart2sph cart2pol pol2cart sph2cart hsv2rgb rgb2hsv zeros ones eye repmat rand randn linspace logspace freqspace meshgrid accumarray size length ndims numel disp isempty isequal isequalwithequalnans cat reshape diag blkdiag tril triu fliplr flipud flipdim rot90 find sub2ind ind2sub bsxfun ndgrid permute ipermute shiftdim circshift squeeze isscalar isvector ans eps realmax realmin pi i|0 inf nan isnan isinf isfinite j|0 why compan gallery hadamard hankel hilb invhilb magic pascal rosser toeplitz vander wilkinson max min nanmax nanmin mean nanmean type table readtable writetable sortrows sort figure plot plot3 scatter scatter3 cellfun legend intersect ismember procrustes hold num2cell "
 },illegal:'(//|"|#|/\\*|\\s+/\\w+)',contains:[{className:"function",
 beginKeywords:"function",end:"$",contains:[e.UNDERSCORE_TITLE_MODE,{
 className:"params",variants:[{begin:"\\(",end:"\\)"},{begin:"\\[",end:"\\]"}]}]
-},{className:"built_in",begin:/true|false/,relevance:0,starts:a},{
-begin:"[a-zA-Z][a-zA-Z_0-9]*('|\\.')+",relevance:0},{className:"number",
-begin:e.C_NUMBER_RE,relevance:0,starts:a},{className:"string",begin:"'",end:"'",
-contains:[{begin:"''"}]},{begin:/\]|\}|\)/,relevance:0,starts:a},{
-className:"string",begin:'"',end:'"',contains:[{begin:'""'}],starts:a
+},{className:"built_in",begin:/true|false/,relevance:0,starts:s},{
+begin:"[a-zA-Z][a-zA-Z_0-9]*"+a,relevance:0},{className:"number",
+begin:e.C_NUMBER_RE,relevance:0,starts:s},{className:"string",begin:"'",end:"'",
+contains:[{begin:"''"}]},{begin:/\]|\}|\)/,relevance:0,starts:s},{
+className:"string",begin:'"',end:'"',contains:[{begin:'""'}],starts:s
 },e.COMMENT("^\\s*%\\{\\s*$","^\\s*%\\}\\s*$"),e.COMMENT("%","$")]}}})()
 ;hljs.registerLanguage("matlab",e)})();
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/maxima.min.js b/vendor/assets/javascripts/highlightjs/languages/maxima.min.js
index e2bcac8a324..866001e0ddd 100644
--- a/vendor/assets/javascripts/highlightjs/languages/maxima.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/maxima.min.js
@@ -1,4 +1,4 @@
-/*! `maxima` grammar compiled for Highlight.js 11.6.0 */
+/*! `maxima` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"Maxima",keywords:{
 $pattern:"[A-Za-z_%][0-9A-Za-z_%]*",
 keyword:"if then else elseif for thru do while unless step in and or not",
diff --git a/vendor/assets/javascripts/highlightjs/languages/mel.min.js b/vendor/assets/javascripts/highlightjs/languages/mel.min.js
index a74bd9c969b..b8f9f1805ed 100644
--- a/vendor/assets/javascripts/highlightjs/languages/mel.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/mel.min.js
@@ -1,4 +1,4 @@
-/*! `mel` grammar compiled for Highlight.js 11.6.0 */
+/*! `mel` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"MEL",
 keywords:"int float string vector matrix if else switch case default while do for in break continue global proc return about abs addAttr addAttributeEditorNodeHelp addDynamic addNewShelfTab addPP addPanelCategory addPrefixToName advanceToNextDrivenKey affectedNet affects aimConstraint air alias aliasAttr align alignCtx alignCurve alignSurface allViewFit ambientLight angle angleBetween animCone animCurveEditor animDisplay animView annotate appendStringArray applicationName applyAttrPreset applyTake arcLenDimContext arcLengthDimension arclen arrayMapper art3dPaintCtx artAttrCtx artAttrPaintVertexCtx artAttrSkinPaintCtx artAttrTool artBuildPaintMenu artFluidAttrCtx artPuttyCtx artSelectCtx artSetPaintCtx artUserPaintCtx assignCommand assignInputDevice assignViewportFactories attachCurve attachDeviceAttr attachSurface attrColorSliderGrp attrCompatibility attrControlGrp attrEnumOptionMenu attrEnumOptionMenuGrp attrFieldGrp attrFieldSliderGrp attrNavigationControlGrp attrPresetEditWin attributeExists attributeInfo attributeMenu attributeQuery autoKeyframe autoPlace bakeClip bakeFluidShading bakePartialHistory bakeResults bakeSimulation basename basenameEx batchRender bessel bevel bevelPlus binMembership bindSkin blend2 blendShape blendShapeEditor blendShapePanel blendTwoAttr blindDataType boneLattice boundary boxDollyCtx boxZoomCtx bufferCurve buildBookmarkMenu buildKeyframeMenu button buttonManip CBG cacheFile cacheFileCombine cacheFileMerge cacheFileTrack camera cameraView canCreateManip canvas capitalizeString catch catchQuiet ceil changeSubdivComponentDisplayLevel changeSubdivRegion channelBox character characterMap characterOutlineEditor characterize chdir checkBox checkBoxGrp checkDefaultRenderGlobals choice circle circularFillet clamp clear clearCache clip clipEditor clipEditorCurrentTimeCtx clipSchedule clipSchedulerOutliner clipTrimBefore closeCurve closeSurface cluster cmdFileOutput cmdScrollFieldExecuter cmdScrollFieldReporter cmdShell coarsenSubdivSelectionList collision color colorAtPoint colorEditor colorIndex colorIndexSliderGrp colorSliderButtonGrp colorSliderGrp columnLayout commandEcho commandLine commandPort compactHairSystem componentEditor compositingInterop computePolysetVolume condition cone confirmDialog connectAttr connectControl connectDynamic connectJoint connectionInfo constrain constrainValue constructionHistory container containsMultibyte contextInfo control convertFromOldLayers convertIffToPsd convertLightmap convertSolidTx convertTessellation convertUnit copyArray copyFlexor copyKey copySkinWeights cos cpButton cpCache cpClothSet cpCollision cpConstraint cpConvClothToMesh cpForces cpGetSolverAttr cpPanel cpProperty cpRigidCollisionFilter cpSeam cpSetEdit cpSetSolverAttr cpSolver cpSolverTypes cpTool cpUpdateClothUVs createDisplayLayer createDrawCtx createEditor createLayeredPsdFile createMotionField createNewShelf createNode createRenderLayer createSubdivRegion cross crossProduct ctxAbort ctxCompletion ctxEditMode ctxTraverse currentCtx currentTime currentTimeCtx currentUnit curve curveAddPtCtx curveCVCtx curveEPCtx curveEditorCtx curveIntersect curveMoveEPCtx curveOnSurface curveSketchCtx cutKey cycleCheck cylinder dagPose date defaultLightListCheckBox defaultNavigation defineDataServer defineVirtualDevice deformer deg_to_rad delete deleteAttr deleteShadingGroupsAndMaterials deleteShelfTab deleteUI deleteUnusedBrushes delrandstr detachCurve detachDeviceAttr detachSurface deviceEditor devicePanel dgInfo dgdirty dgeval dgtimer dimWhen directKeyCtx directionalLight dirmap dirname disable disconnectAttr disconnectJoint diskCache displacementToPoly displayAffected displayColor displayCull displayLevelOfDetail displayPref displayRGBColor displaySmoothness displayStats displayString displaySurface distanceDimContext distanceDimension doBlur dolly dollyCtx dopeSheetEditor dot dotProduct doubleProfileBirailSurface drag dragAttrContext draggerContext dropoffLocator duplicate duplicateCurve duplicateSurface dynCache dynControl dynExport dynExpression dynGlobals dynPaintEditor dynParticleCtx dynPref dynRelEdPanel dynRelEditor dynamicLoad editAttrLimits editDisplayLayerGlobals editDisplayLayerMembers editRenderLayerAdjustment editRenderLayerGlobals editRenderLayerMembers editor editorTemplate effector emit emitter enableDevice encodeString endString endsWith env equivalent equivalentTol erf error eval evalDeferred evalEcho event exactWorldBoundingBox exclusiveLightCheckBox exec executeForEachObject exists exp expression expressionEditorListen extendCurve extendSurface extrude fcheck fclose feof fflush fgetline fgetword file fileBrowserDialog fileDialog fileExtension fileInfo filetest filletCurve filter filterCurve filterExpand filterStudioImport findAllIntersections findAnimCurves findKeyframe findMenuItem findRelatedSkinCluster finder firstParentOf fitBspline flexor floatEq floatField floatFieldGrp floatScrollBar floatSlider floatSlider2 floatSliderButtonGrp floatSliderGrp floor flow fluidCacheInfo fluidEmitter fluidVoxelInfo flushUndo fmod fontDialog fopen formLayout format fprint frameLayout fread freeFormFillet frewind fromNativePath fwrite gamma gauss geometryConstraint getApplicationVersionAsFloat getAttr getClassification getDefaultBrush getFileList getFluidAttr getInputDeviceRange getMayaPanelTypes getModifiers getPanel getParticleAttr getPluginResource getenv getpid glRender glRenderEditor globalStitch gmatch goal gotoBindPose grabColor gradientControl gradientControlNoAttr graphDollyCtx graphSelectContext graphTrackCtx gravity grid gridLayout group groupObjectsByName HfAddAttractorToAS HfAssignAS HfBuildEqualMap HfBuildFurFiles HfBuildFurImages HfCancelAFR HfConnectASToHF HfCreateAttractor HfDeleteAS HfEditAS HfPerformCreateAS HfRemoveAttractorFromAS HfSelectAttached HfSelectAttractors HfUnAssignAS hardenPointCurve hardware hardwareRenderPanel headsUpDisplay headsUpMessage help helpLine hermite hide hilite hitTest hotBox hotkey hotkeyCheck hsv_to_rgb hudButton hudSlider hudSliderButton hwReflectionMap hwRender hwRenderLoad hyperGraph hyperPanel hyperShade hypot iconTextButton iconTextCheckBox iconTextRadioButton iconTextRadioCollection iconTextScrollList iconTextStaticLabel ikHandle ikHandleCtx ikHandleDisplayScale ikSolver ikSplineHandleCtx ikSystem ikSystemInfo ikfkDisplayMethod illustratorCurves image imfPlugins inheritTransform insertJoint insertJointCtx insertKeyCtx insertKnotCurve insertKnotSurface instance instanceable instancer intField intFieldGrp intScrollBar intSlider intSliderGrp interToUI internalVar intersect iprEngine isAnimCurve isConnected isDirty isParentOf isSameObject isTrue isValidObjectName isValidString isValidUiName isolateSelect itemFilter itemFilterAttr itemFilterRender itemFilterType joint jointCluster jointCtx jointDisplayScale jointLattice keyTangent keyframe keyframeOutliner keyframeRegionCurrentTimeCtx keyframeRegionDirectKeyCtx keyframeRegionDollyCtx keyframeRegionInsertKeyCtx keyframeRegionMoveKeyCtx keyframeRegionScaleKeyCtx keyframeRegionSelectKeyCtx keyframeRegionSetKeyCtx keyframeRegionTrackCtx keyframeStats lassoContext lattice latticeDeformKeyCtx launch launchImageEditor layerButton layeredShaderPort layeredTexturePort layout layoutDialog lightList lightListEditor lightListPanel lightlink lineIntersection linearPrecision linstep listAnimatable listAttr listCameras listConnections listDeviceAttachments listHistory listInputDeviceAxes listInputDeviceButtons listInputDevices listMenuAnnotation listNodeTypes listPanelCategories listRelatives listSets listTransforms listUnselected listerEditor loadFluid loadNewShelf loadPlugin loadPluginLanguageResources loadPrefObjects localizedPanelLabel lockNode loft log longNameOf lookThru ls lsThroughFilter lsType lsUI Mayatomr mag makeIdentity makeLive makePaintable makeRoll makeSingleSurface makeTubeOn makebot manipMoveContext manipMoveLimitsCtx manipOptions manipRotateContext manipRotateLimitsCtx manipScaleContext manipScaleLimitsCtx marker match max memory menu menuBarLayout menuEditor menuItem menuItemToShelf menuSet menuSetPref messageLine min minimizeApp mirrorJoint modelCurrentTimeCtx modelEditor modelPanel mouse movIn movOut move moveIKtoFK moveKeyCtx moveVertexAlongDirection multiProfileBirailSurface mute nParticle nameCommand nameField namespace namespaceInfo newPanelItems newton nodeCast nodeIconButton nodeOutliner nodePreset nodeType noise nonLinear normalConstraint normalize nurbsBoolean nurbsCopyUVSet nurbsCube nurbsEditUV nurbsPlane nurbsSelect nurbsSquare nurbsToPoly nurbsToPolygonsPref nurbsToSubdiv nurbsToSubdivPref nurbsUVSet nurbsViewDirectionVector objExists objectCenter objectLayer objectType objectTypeUI obsoleteProc oceanNurbsPreviewPlane offsetCurve offsetCurveOnSurface offsetSurface openGLExtension openMayaPref optionMenu optionMenuGrp optionVar orbit orbitCtx orientConstraint outlinerEditor outlinerPanel overrideModifier paintEffectsDisplay pairBlend palettePort paneLayout panel panelConfiguration panelHistory paramDimContext paramDimension paramLocator parent parentConstraint particle particleExists particleInstancer particleRenderInfo partition pasteKey pathAnimation pause pclose percent performanceOptions pfxstrokes pickWalk picture pixelMove planarSrf plane play playbackOptions playblast plugAttr plugNode pluginInfo pluginResourceUtil pointConstraint pointCurveConstraint pointLight pointMatrixMult pointOnCurve pointOnSurface pointPosition poleVectorConstraint polyAppend polyAppendFacetCtx polyAppendVertex polyAutoProjection polyAverageNormal polyAverageVertex polyBevel polyBlendColor polyBlindData polyBoolOp polyBridgeEdge polyCacheMonitor polyCheck polyChipOff polyClipboard polyCloseBorder polyCollapseEdge polyCollapseFacet polyColorBlindData polyColorDel polyColorPerVertex polyColorSet polyCompare polyCone polyCopyUV polyCrease polyCreaseCtx polyCreateFacet polyCreateFacetCtx polyCube polyCut polyCutCtx polyCylinder polyCylindricalProjection polyDelEdge polyDelFacet polyDelVertex polyDuplicateAndConnect polyDuplicateEdge polyEditUV polyEditUVShell polyEvaluate polyExtrudeEdge polyExtrudeFacet polyExtrudeVertex polyFlipEdge polyFlipUV polyForceUV polyGeoSampler polyHelix polyInfo polyInstallAction polyLayoutUV polyListComponentConversion polyMapCut polyMapDel polyMapSew polyMapSewMove polyMergeEdge polyMergeEdgeCtx polyMergeFacet polyMergeFacetCtx polyMergeUV polyMergeVertex polyMirrorFace polyMoveEdge polyMoveFacet polyMoveFacetUV polyMoveUV polyMoveVertex polyNormal polyNormalPerVertex polyNormalizeUV polyOptUvs polyOptions polyOutput polyPipe polyPlanarProjection polyPlane polyPlatonicSolid polyPoke polyPrimitive polyPrism polyProjection polyPyramid polyQuad polyQueryBlindData polyReduce polySelect polySelectConstraint polySelectConstraintMonitor polySelectCtx polySelectEditCtx polySeparate polySetToFaceNormal polySewEdge polyShortestPathCtx polySmooth polySoftEdge polySphere polySphericalProjection polySplit polySplitCtx polySplitEdge polySplitRing polySplitVertex polyStraightenUVBorder polySubdivideEdge polySubdivideFacet polyToSubdiv polyTorus polyTransfer polyTriangulate polyUVSet polyUnite polyWedgeFace popen popupMenu pose pow preloadRefEd print progressBar progressWindow projFileViewer projectCurve projectTangent projectionContext projectionManip promptDialog propModCtx propMove psdChannelOutliner psdEditTextureFile psdExport psdTextureFile putenv pwd python querySubdiv quit rad_to_deg radial radioButton radioButtonGrp radioCollection radioMenuItemCollection rampColorPort rand randomizeFollicles randstate rangeControl readTake rebuildCurve rebuildSurface recordAttr recordDevice redo reference referenceEdit referenceQuery refineSubdivSelectionList refresh refreshAE registerPluginResource rehash reloadImage removeJoint removeMultiInstance removePanelCategory rename renameAttr renameSelectionList renameUI render renderGlobalsNode renderInfo renderLayerButton renderLayerParent renderLayerPostProcess renderLayerUnparent renderManip renderPartition renderQualityNode renderSettings renderThumbnailUpdate renderWindowEditor renderWindowSelectContext renderer reorder reorderDeformers requires reroot resampleFluid resetAE resetPfxToPolyCamera resetTool resolutionNode retarget reverseCurve reverseSurface revolve rgb_to_hsv rigidBody rigidSolver roll rollCtx rootOf rot rotate rotationInterpolation roundConstantRadius rowColumnLayout rowLayout runTimeCommand runup sampleImage saveAllShelves saveAttrPreset saveFluid saveImage saveInitialState saveMenu savePrefObjects savePrefs saveShelf saveToolSettings scale scaleBrushBrightness scaleComponents scaleConstraint scaleKey scaleKeyCtx sceneEditor sceneUIReplacement scmh scriptCtx scriptEditorInfo scriptJob scriptNode scriptTable scriptToShelf scriptedPanel scriptedPanelType scrollField scrollLayout sculpt searchPathArray seed selLoadSettings select selectContext selectCurveCV selectKey selectKeyCtx selectKeyframeRegionCtx selectMode selectPref selectPriority selectType selectedNodes selectionConnection separator setAttr setAttrEnumResource setAttrMapping setAttrNiceNameResource setConstraintRestPosition setDefaultShadingGroup setDrivenKeyframe setDynamic setEditCtx setEditor setFluidAttr setFocus setInfinity setInputDeviceMapping setKeyCtx setKeyPath setKeyframe setKeyframeBlendshapeTargetWts setMenuMode setNodeNiceNameResource setNodeTypeFlag setParent setParticleAttr setPfxToPolyCamera setPluginResource setProject setStampDensity setStartupMessage setState setToolTo setUITemplate setXformManip sets shadingConnection shadingGeometryRelCtx shadingLightRelCtx shadingNetworkCompare shadingNode shapeCompare shelfButton shelfLayout shelfTabLayout shellField shortNameOf showHelp showHidden showManipCtx showSelectionInTitle showShadingGroupAttrEditor showWindow sign simplify sin singleProfileBirailSurface size sizeBytes skinCluster skinPercent smoothCurve smoothTangentSurface smoothstep snap2to2 snapKey snapMode snapTogetherCtx snapshot soft softMod softModCtx sort sound soundControl source spaceLocator sphere sphrand spotLight spotLightPreviewPort spreadSheetEditor spring sqrt squareSurface srtContext stackTrace startString startsWith stitchAndExplodeShell stitchSurface stitchSurfacePoints strcmp stringArrayCatenate stringArrayContains stringArrayCount stringArrayInsertAtIndex stringArrayIntersector stringArrayRemove stringArrayRemoveAtIndex stringArrayRemoveDuplicates stringArrayRemoveExact stringArrayToString stringToStringArray strip stripPrefixFromName stroke subdAutoProjection subdCleanTopology subdCollapse subdDuplicateAndConnect subdEditUV subdListComponentConversion subdMapCut subdMapSewMove subdMatchTopology subdMirror subdToBlind subdToPoly subdTransferUVsToCache subdiv subdivCrease subdivDisplaySmoothness substitute substituteAllString substituteGeometry substring surface surfaceSampler surfaceShaderList swatchDisplayPort switchTable symbolButton symbolCheckBox sysFile system tabLayout tan tangentConstraint texLatticeDeformContext texManipContext texMoveContext texMoveUVShellContext texRotateContext texScaleContext texSelectContext texSelectShortestPathCtx texSmudgeUVContext texWinToolCtx text textCurves textField textFieldButtonGrp textFieldGrp textManip textScrollList textToShelf textureDisplacePlane textureHairColor texturePlacementContext textureWindow threadCount threePointArcCtx timeControl timePort timerX toNativePath toggle toggleAxis toggleWindowVisibility tokenize tokenizeList tolerance tolower toolButton toolCollection toolDropped toolHasOptions toolPropertyWindow torus toupper trace track trackCtx transferAttributes transformCompare transformLimits translator trim trunc truncateFluidCache truncateHairCache tumble tumbleCtx turbulence twoPointArcCtx uiRes uiTemplate unassignInputDevice undo undoInfo ungroup uniform unit unloadPlugin untangleUV untitledFileName untrim upAxis updateAE userCtx uvLink uvSnapshot validateShelfName vectorize view2dToolCtx viewCamera viewClipPlane viewFit viewHeadOn viewLookAt viewManip viewPlace viewSet visor volumeAxis vortex waitCursor warning webBrowser webBrowserPrefs whatIs window windowPref wire wireContext workspace wrinkle wrinkleContext writeTake xbmLangPathList xform",
 illegal:"</",contains:[e.C_NUMBER_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{
diff --git a/vendor/assets/javascripts/highlightjs/languages/mercury.min.js b/vendor/assets/javascripts/highlightjs/languages/mercury.min.js
index df3e8434619..efba877d3ed 100644
--- a/vendor/assets/javascripts/highlightjs/languages/mercury.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/mercury.min.js
@@ -1,4 +1,4 @@
-/*! `mercury` grammar compiled for Highlight.js 11.6.0 */
+/*! `mercury` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const i=e.COMMENT("%","$"),n=e.inherit(e.APOS_STRING_MODE,{relevance:0
 }),r=e.inherit(e.QUOTE_STRING_MODE,{relevance:0})
diff --git a/vendor/assets/javascripts/highlightjs/languages/mipsasm.min.js b/vendor/assets/javascripts/highlightjs/languages/mipsasm.min.js
index 7cccca18a69..874ac62374c 100644
--- a/vendor/assets/javascripts/highlightjs/languages/mipsasm.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/mipsasm.min.js
@@ -1,4 +1,4 @@
-/*! `mipsasm` grammar compiled for Highlight.js 11.6.0 */
+/*! `mipsasm` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"MIPS Assembly",
 case_insensitive:!0,aliases:["mips"],keywords:{$pattern:"\\.?"+e.IDENT_RE,
 meta:".2byte .4byte .align .ascii .asciz .balign .byte .code .data .else .end .endif .endm .endr .equ .err .exitm .extern .global .hword .if .ifdef .ifndef .include .irp .long .macro .rept .req .section .set .skip .space .text .word .ltorg ",
diff --git a/vendor/assets/javascripts/highlightjs/languages/mizar.min.js b/vendor/assets/javascripts/highlightjs/languages/mizar.min.js
index d685f447faf..bc0a5efd190 100644
--- a/vendor/assets/javascripts/highlightjs/languages/mizar.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/mizar.min.js
@@ -1,4 +1,4 @@
-/*! `mizar` grammar compiled for Highlight.js 11.6.0 */
+/*! `mizar` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"Mizar",
 keywords:"environ vocabularies notations constructors definitions registrations theorems schemes requirements begin end definition registration cluster existence pred func defpred deffunc theorem proof let take assume then thus hence ex for st holds consider reconsider such that and in provided of as from be being by means equals implies iff redefine define now not or attr is mode suppose per cases set thesis contradiction scheme reserve struct correctness compatibility coherence symmetry assymetry reflexivity irreflexivity connectedness uniqueness commutativity idempotence involutiveness projectivity",
 contains:[e.COMMENT("::","$")]})})();hljs.registerLanguage("mizar",e)})();
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/mojolicious.min.js b/vendor/assets/javascripts/highlightjs/languages/mojolicious.min.js
index 1c62ba4b1dc..2729b8028ab 100644
--- a/vendor/assets/javascripts/highlightjs/languages/mojolicious.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/mojolicious.min.js
@@ -1,4 +1,4 @@
-/*! `mojolicious` grammar compiled for Highlight.js 11.6.0 */
+/*! `mojolicious` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"Mojolicious",subLanguage:"xml",
 contains:[{className:"meta",begin:"^__(END|DATA)__$"},{
 begin:"^\\s*%{1,2}={0,2}",end:"$",subLanguage:"perl"},{begin:"<%{1,2}={0,2}",
diff --git a/vendor/assets/javascripts/highlightjs/languages/monkey.min.js b/vendor/assets/javascripts/highlightjs/languages/monkey.min.js
index e2397e0a06b..ad883bdce8a 100644
--- a/vendor/assets/javascripts/highlightjs/languages/monkey.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/monkey.min.js
@@ -1,4 +1,4 @@
-/*! `monkey` grammar compiled for Highlight.js 11.6.0 */
+/*! `monkey` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const n={className:"number",
 relevance:0,variants:[{begin:"[$][a-fA-F0-9]+"},e.NUMBER_MODE]},a={variants:[{
 match:[/(function|method)/,/\s+/,e.UNDERSCORE_IDENT_RE]}],scope:{1:"keyword",
diff --git a/vendor/assets/javascripts/highlightjs/languages/moonscript.min.js b/vendor/assets/javascripts/highlightjs/languages/moonscript.min.js
index adaf67f7cee..b772aadfae8 100644
--- a/vendor/assets/javascripts/highlightjs/languages/moonscript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/moonscript.min.js
@@ -1,4 +1,4 @@
-/*! `moonscript` grammar compiled for Highlight.js 11.6.0 */
+/*! `moonscript` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const n={
 keyword:"if then not for in while do return else elseif break continue switch and or unless when class extends super local import export from using",
 literal:"true false nil",
diff --git a/vendor/assets/javascripts/highlightjs/languages/n1ql.min.js b/vendor/assets/javascripts/highlightjs/languages/n1ql.min.js
index d63a2c4e360..03f8d2aac56 100644
--- a/vendor/assets/javascripts/highlightjs/languages/n1ql.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/n1ql.min.js
@@ -1,4 +1,4 @@
-/*! `n1ql` grammar compiled for Highlight.js 11.6.0 */
+/*! `n1ql` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"N1QL",case_insensitive:!0,
 contains:[{
 beginKeywords:"build create index delete drop explain infer|10 insert merge prepare select update upsert|10",
diff --git a/vendor/assets/javascripts/highlightjs/languages/nestedtext.min.js b/vendor/assets/javascripts/highlightjs/languages/nestedtext.min.js
index 5e632bd9056..eb1b0848380 100644
--- a/vendor/assets/javascripts/highlightjs/languages/nestedtext.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/nestedtext.min.js
@@ -1,4 +1,4 @@
-/*! `nestedtext` grammar compiled for Highlight.js 11.6.0 */
+/*! `nestedtext` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var t=(()=>{"use strict";return t=>({name:"Nested Text",aliases:["nt"],
 contains:[t.inherit(t.HASH_COMMENT_MODE,{begin:/^\s*(?=#)/,excludeBegin:!0}),{
 variants:[{match:[/^\s*/,/-/,/[ ]/,/.*$/]},{match:[/^\s*/,/-$/]}],className:{
diff --git a/vendor/assets/javascripts/highlightjs/languages/nginx.min.js b/vendor/assets/javascripts/highlightjs/languages/nginx.min.js
index b16e3353f00..f68651a38f2 100644
--- a/vendor/assets/javascripts/highlightjs/languages/nginx.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/nginx.min.js
@@ -1,4 +1,4 @@
-/*! `nginx` grammar compiled for Highlight.js 11.6.0 */
+/*! `nginx` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const n=e.regex,a={
 className:"variable",variants:[{begin:/\$\d+/},{begin:/\$\{\w+\}/},{
 begin:n.concat(/[$@]/,e.UNDERSCORE_IDENT_RE)}]},s={endsWithParent:!0,keywords:{
diff --git a/vendor/assets/javascripts/highlightjs/languages/nim.min.js b/vendor/assets/javascripts/highlightjs/languages/nim.min.js
index 70b9e270252..e58a475e535 100644
--- a/vendor/assets/javascripts/highlightjs/languages/nim.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/nim.min.js
@@ -1,4 +1,4 @@
-/*! `nim` grammar compiled for Highlight.js 11.6.0 */
+/*! `nim` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"Nim",keywords:{
 keyword:["addr","and","as","asm","bind","block","break","case","cast","const","continue","converter","discard","distinct","div","do","elif","else","end","enum","except","export","finally","for","from","func","generic","guarded","if","import","in","include","interface","is","isnot","iterator","let","macro","method","mixin","mod","nil","not","notin","object","of","or","out","proc","ptr","raise","ref","return","shared","shl","shr","static","template","try","tuple","type","using","var","when","while","with","without","xor","yield"],
 literal:["true","false"],
diff --git a/vendor/assets/javascripts/highlightjs/languages/nix.min.js b/vendor/assets/javascripts/highlightjs/languages/nix.min.js
index 75b6e9171b2..5bcc6a272cf 100644
--- a/vendor/assets/javascripts/highlightjs/languages/nix.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/nix.min.js
@@ -1,12 +1,13 @@
-/*! `nix` grammar compiled for Highlight.js 11.6.0 */
+/*! `nix` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const n={
 keyword:["rec","with","let","in","inherit","assert","if","else","then"],
 literal:["true","false","or","and","null"],
 built_in:["import","abort","baseNameOf","dirOf","isNull","builtins","map","removeAttrs","throw","toString","derivation"]
-},i={className:"subst",begin:/\$\{/,end:/\}/,keywords:n},s={className:"string",
-contains:[i],variants:[{begin:"''",end:"''"},{begin:'"',end:'"'}]
-},t=[e.NUMBER_MODE,e.HASH_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,s,{
+},s={className:"subst",begin:/\$\{/,end:/\}/,keywords:n},a={className:"string",
+contains:[{className:"char.escape",begin:/''\$/},s],variants:[{begin:"''",
+end:"''"},{begin:'"',end:'"'}]
+},i=[e.NUMBER_MODE,e.HASH_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,a,{
 begin:/[a-zA-Z0-9-_]+(\s*=)/,returnBegin:!0,relevance:0,contains:[{
-className:"attr",begin:/\S+/,relevance:.2}]}];return i.contains=t,{name:"Nix",
-aliases:["nixos"],keywords:n,contains:t}}})();hljs.registerLanguage("nix",e)
+className:"attr",begin:/\S+/,relevance:.2}]}];return s.contains=i,{name:"Nix",
+aliases:["nixos"],keywords:n,contains:i}}})();hljs.registerLanguage("nix",e)
 })();
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/node-repl.min.js b/vendor/assets/javascripts/highlightjs/languages/node-repl.min.js
index d5457fe96a1..630a77bcafa 100644
--- a/vendor/assets/javascripts/highlightjs/languages/node-repl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/node-repl.min.js
@@ -1,4 +1,4 @@
-/*! `node-repl` grammar compiled for Highlight.js 11.6.0 */
+/*! `node-repl` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var a=(()=>{"use strict";return a=>({name:"Node REPL",contains:[{
 className:"meta.prompt",starts:{end:/ |$/,starts:{end:"$",
 subLanguage:"javascript"}},variants:[{begin:/^>(?=[ ]|$)/},{
diff --git a/vendor/assets/javascripts/highlightjs/languages/nsis.min.js b/vendor/assets/javascripts/highlightjs/languages/nsis.min.js
index d96d9502805..20c7be8244f 100644
--- a/vendor/assets/javascripts/highlightjs/languages/nsis.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/nsis.min.js
@@ -1,4 +1,4 @@
-/*! `nsis` grammar compiled for Highlight.js 11.6.0 */
+/*! `nsis` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const t=e.regex,n={
 className:"variable.constant",
 begin:t.concat(/\$/,t.either("ADMINTOOLS","APPDATA","CDBURN_AREA","CMDLINE","COMMONFILES32","COMMONFILES64","COMMONFILES","COOKIES","DESKTOP","DOCUMENTS","EXEDIR","EXEFILE","EXEPATH","FAVORITES","FONTS","HISTORY","HWNDPARENT","INSTDIR","INTERNET_CACHE","LANGUAGE","LOCALAPPDATA","MUSIC","NETHOOD","OUTDIR","PICTURES","PLUGINSDIR","PRINTHOOD","PROFILE","PROGRAMFILES32","PROGRAMFILES64","PROGRAMFILES","QUICKLAUNCH","RECENT","RESOURCES_LOCALIZED","RESOURCES","SENDTO","SMPROGRAMS","SMSTARTUP","STARTMENU","SYSDIR","TEMP","TEMPLATES","VIDEOS","WINDIR"))
diff --git a/vendor/assets/javascripts/highlightjs/languages/objectivec.min.js b/vendor/assets/javascripts/highlightjs/languages/objectivec.min.js
index 905acb3b5c1..5ee7d949344 100644
--- a/vendor/assets/javascripts/highlightjs/languages/objectivec.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/objectivec.min.js
@@ -1,4 +1,4 @@
-/*! `objectivec` grammar compiled for Highlight.js 11.6.0 */
+/*! `objectivec` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const n=/[a-zA-Z@][a-zA-Z0-9_]*/,_={
 $pattern:n,keyword:["@interface","@class","@protocol","@implementation"]}
 ;return{name:"Objective-C",
diff --git a/vendor/assets/javascripts/highlightjs/languages/ocaml.min.js b/vendor/assets/javascripts/highlightjs/languages/ocaml.min.js
index 0641ef2b682..df9ec682668 100644
--- a/vendor/assets/javascripts/highlightjs/languages/ocaml.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/ocaml.min.js
@@ -1,4 +1,4 @@
-/*! `ocaml` grammar compiled for Highlight.js 11.6.0 */
+/*! `ocaml` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"OCaml",aliases:["ml"],
 keywords:{$pattern:"[a-z_]\\w*!?",
 keyword:"and as assert asr begin class constraint do done downto else end exception external for fun function functor if in include inherit! inherit initializer land lazy let lor lsl lsr lxor match method!|10 method mod module mutable new object of open! open or private rec sig struct then to try type val! val virtual when while with parser value",
diff --git a/vendor/assets/javascripts/highlightjs/languages/openscad.min.js b/vendor/assets/javascripts/highlightjs/languages/openscad.min.js
index 2ed259a6a48..909a50d6be4 100644
--- a/vendor/assets/javascripts/highlightjs/languages/openscad.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/openscad.min.js
@@ -1,4 +1,4 @@
-/*! `openscad` grammar compiled for Highlight.js 11.6.0 */
+/*! `openscad` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const n={className:"keyword",
 begin:"\\$(f[asn]|t|vp[rtd]|children)"},r={className:"number",
 begin:"\\b\\d+(\\.\\d+)?(e-?\\d+)?",relevance:0
diff --git a/vendor/assets/javascripts/highlightjs/languages/oxygene.min.js b/vendor/assets/javascripts/highlightjs/languages/oxygene.min.js
index bbb9ca1e869..9e7356ed45a 100644
--- a/vendor/assets/javascripts/highlightjs/languages/oxygene.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/oxygene.min.js
@@ -1,4 +1,4 @@
-/*! `oxygene` grammar compiled for Highlight.js 11.6.0 */
+/*! `oxygene` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const t={$pattern:/\.?\w+/,
 keyword:"abstract add and array as asc aspect assembly async begin break block by case class concat const copy constructor continue create default delegate desc distinct div do downto dynamic each else empty end ensure enum equals event except exit extension external false final finalize finalizer finally flags for forward from function future global group has if implementation implements implies in index inherited inline interface into invariants is iterator join locked locking loop matching method mod module namespace nested new nil not notify nullable of old on operator or order out override parallel params partial pinned private procedure property protected public queryable raise read readonly record reintroduce remove repeat require result reverse sealed select self sequence set shl shr skip static step soft take then to true try tuple type union unit unsafe until uses using var virtual raises volatile where while with write xor yield await mapped deprecated stdcall cdecl pascal register safecall overload library platform reference packed strict published autoreleasepool selector strong weak unretained"
 },r=e.COMMENT(/\{/,/\}/,{relevance:0}),n=e.COMMENT("\\(\\*","\\*\\)",{
diff --git a/vendor/assets/javascripts/highlightjs/languages/parser3.min.js b/vendor/assets/javascripts/highlightjs/languages/parser3.min.js
index 3dd63598652..5b568fc5684 100644
--- a/vendor/assets/javascripts/highlightjs/languages/parser3.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/parser3.min.js
@@ -1,4 +1,4 @@
-/*! `parser3` grammar compiled for Highlight.js 11.6.0 */
+/*! `parser3` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const a=e.COMMENT(/\{/,/\}/,{
 contains:["self"]});return{name:"Parser3",subLanguage:"xml",relevance:0,
 contains:[e.COMMENT("^#","$"),e.COMMENT(/\^rem\{/,/\}/,{relevance:10,
diff --git a/vendor/assets/javascripts/highlightjs/languages/perl.min.js b/vendor/assets/javascripts/highlightjs/languages/perl.min.js
index 6102ca02e2b..1d98909a755 100644
--- a/vendor/assets/javascripts/highlightjs/languages/perl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/perl.min.js
@@ -1,4 +1,4 @@
-/*! `perl` grammar compiled for Highlight.js 11.6.0 */
+/*! `perl` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const n=e.regex,t=/[dualxmsipngr]{0,12}/,r={$pattern:/[\w.]+/,
 keyword:"abs accept alarm and atan2 bind binmode bless break caller chdir chmod chomp chop chown chr chroot close closedir connect continue cos crypt dbmclose dbmopen defined delete die do dump each else elsif endgrent endhostent endnetent endprotoent endpwent endservent eof eval exec exists exit exp fcntl fileno flock for foreach fork format formline getc getgrent getgrgid getgrnam gethostbyaddr gethostbyname gethostent getlogin getnetbyaddr getnetbyname getnetent getpeername getpgrp getpriority getprotobyname getprotobynumber getprotoent getpwent getpwnam getpwuid getservbyname getservbyport getservent getsockname getsockopt given glob gmtime goto grep gt hex if index int ioctl join keys kill last lc lcfirst length link listen local localtime log lstat lt ma map mkdir msgctl msgget msgrcv msgsnd my ne next no not oct open opendir or ord our pack package pipe pop pos print printf prototype push q|0 qq quotemeta qw qx rand read readdir readline readlink readpipe recv redo ref rename require reset return reverse rewinddir rindex rmdir say scalar seek seekdir select semctl semget semop send setgrent sethostent setnetent setpgrp setpriority setprotoent setpwent setservent setsockopt shift shmctl shmget shmread shmwrite shutdown sin sleep socket socketpair sort splice split sprintf sqrt srand stat state study sub substr symlink syscall sysopen sysread sysseek system syswrite tell telldir tie tied time times tr truncate uc ucfirst umask undef unless unlink unpack unshift untie until use utime values vec wait waitpid wantarray warn when while write x|0 xor y|0"
diff --git a/vendor/assets/javascripts/highlightjs/languages/pf.min.js b/vendor/assets/javascripts/highlightjs/languages/pf.min.js
index 00a46147031..766fe49cb22 100644
--- a/vendor/assets/javascripts/highlightjs/languages/pf.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/pf.min.js
@@ -1,4 +1,4 @@
-/*! `pf` grammar compiled for Highlight.js 11.6.0 */
+/*! `pf` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var t=(()=>{"use strict";return t=>({name:"Packet Filter config",
 aliases:["pf.conf"],keywords:{$pattern:/[a-z0-9_<>-]+/,
 built_in:"block match pass load anchor|5 antispoof|10 set table",
diff --git a/vendor/assets/javascripts/highlightjs/languages/pgsql.min.js b/vendor/assets/javascripts/highlightjs/languages/pgsql.min.js
index 05c0b5d7376..ba69fc3334e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/pgsql.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/pgsql.min.js
@@ -1,4 +1,4 @@
-/*! `pgsql` grammar compiled for Highlight.js 11.6.0 */
+/*! `pgsql` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var E=(()=>{"use strict";return E=>{
 const T=E.COMMENT("--","$"),N="\\$([a-zA-Z_]?|[a-zA-Z_][a-zA-Z_0-9]*)\\$",A="BIGINT INT8 BIGSERIAL SERIAL8 BIT VARYING VARBIT BOOLEAN BOOL BOX BYTEA CHARACTER CHAR VARCHAR CIDR CIRCLE DATE DOUBLE PRECISION FLOAT8 FLOAT INET INTEGER INT INT4 INTERVAL JSON JSONB LINE LSEG|10 MACADDR MACADDR8 MONEY NUMERIC DEC DECIMAL PATH POINT POLYGON REAL FLOAT4 SMALLINT INT2 SMALLSERIAL|10 SERIAL2|10 SERIAL|10 SERIAL4|10 TEXT TIME ZONE TIMETZ|10 TIMESTAMP TIMESTAMPTZ|10 TSQUERY|10 TSVECTOR|10 TXID_SNAPSHOT|10 UUID XML NATIONAL NCHAR INT4RANGE|10 INT8RANGE|10 NUMRANGE|10 TSRANGE|10 TSTZRANGE|10 DATERANGE|10 ANYELEMENT ANYARRAY ANYNONARRAY ANYENUM ANYRANGE CSTRING INTERNAL RECORD PG_DDL_COMMAND VOID UNKNOWN OPAQUE REFCURSOR NAME OID REGPROC|10 REGPROCEDURE|10 REGOPER|10 REGOPERATOR|10 REGCLASS|10 REGTYPE|10 REGROLE|10 REGNAMESPACE|10 REGCONFIG|10 REGDICTIONARY|10 ",R=A.trim().split(" ").map((E=>E.split("|")[0])).join("|"),I="ARRAY_AGG AVG BIT_AND BIT_OR BOOL_AND BOOL_OR COUNT EVERY JSON_AGG JSONB_AGG JSON_OBJECT_AGG JSONB_OBJECT_AGG MAX MIN MODE STRING_AGG SUM XMLAGG CORR COVAR_POP COVAR_SAMP REGR_AVGX REGR_AVGY REGR_COUNT REGR_INTERCEPT REGR_R2 REGR_SLOPE REGR_SXX REGR_SXY REGR_SYY STDDEV STDDEV_POP STDDEV_SAMP VARIANCE VAR_POP VAR_SAMP PERCENTILE_CONT PERCENTILE_DISC ROW_NUMBER RANK DENSE_RANK PERCENT_RANK CUME_DIST NTILE LAG LEAD FIRST_VALUE LAST_VALUE NTH_VALUE NUM_NONNULLS NUM_NULLS ABS CBRT CEIL CEILING DEGREES DIV EXP FLOOR LN LOG MOD PI POWER RADIANS ROUND SCALE SIGN SQRT TRUNC WIDTH_BUCKET RANDOM SETSEED ACOS ACOSD ASIN ASIND ATAN ATAND ATAN2 ATAN2D COS COSD COT COTD SIN SIND TAN TAND BIT_LENGTH CHAR_LENGTH CHARACTER_LENGTH LOWER OCTET_LENGTH OVERLAY POSITION SUBSTRING TREAT TRIM UPPER ASCII BTRIM CHR CONCAT CONCAT_WS CONVERT CONVERT_FROM CONVERT_TO DECODE ENCODE INITCAP LEFT LENGTH LPAD LTRIM MD5 PARSE_IDENT PG_CLIENT_ENCODING QUOTE_IDENT|10 QUOTE_LITERAL|10 QUOTE_NULLABLE|10 REGEXP_MATCH REGEXP_MATCHES REGEXP_REPLACE REGEXP_SPLIT_TO_ARRAY REGEXP_SPLIT_TO_TABLE REPEAT REPLACE REVERSE RIGHT RPAD RTRIM SPLIT_PART STRPOS SUBSTR TO_ASCII TO_HEX TRANSLATE OCTET_LENGTH GET_BIT GET_BYTE SET_BIT SET_BYTE TO_CHAR TO_DATE TO_NUMBER TO_TIMESTAMP AGE CLOCK_TIMESTAMP|10 DATE_PART DATE_TRUNC ISFINITE JUSTIFY_DAYS JUSTIFY_HOURS JUSTIFY_INTERVAL MAKE_DATE MAKE_INTERVAL|10 MAKE_TIME MAKE_TIMESTAMP|10 MAKE_TIMESTAMPTZ|10 NOW STATEMENT_TIMESTAMP|10 TIMEOFDAY TRANSACTION_TIMESTAMP|10 ENUM_FIRST ENUM_LAST ENUM_RANGE AREA CENTER DIAMETER HEIGHT ISCLOSED ISOPEN NPOINTS PCLOSE POPEN RADIUS WIDTH BOX BOUND_BOX CIRCLE LINE LSEG PATH POLYGON ABBREV BROADCAST HOST HOSTMASK MASKLEN NETMASK NETWORK SET_MASKLEN TEXT INET_SAME_FAMILY INET_MERGE MACADDR8_SET7BIT ARRAY_TO_TSVECTOR GET_CURRENT_TS_CONFIG NUMNODE PLAINTO_TSQUERY PHRASETO_TSQUERY WEBSEARCH_TO_TSQUERY QUERYTREE SETWEIGHT STRIP TO_TSQUERY TO_TSVECTOR JSON_TO_TSVECTOR JSONB_TO_TSVECTOR TS_DELETE TS_FILTER TS_HEADLINE TS_RANK TS_RANK_CD TS_REWRITE TSQUERY_PHRASE TSVECTOR_TO_ARRAY TSVECTOR_UPDATE_TRIGGER TSVECTOR_UPDATE_TRIGGER_COLUMN XMLCOMMENT XMLCONCAT XMLELEMENT XMLFOREST XMLPI XMLROOT XMLEXISTS XML_IS_WELL_FORMED XML_IS_WELL_FORMED_DOCUMENT XML_IS_WELL_FORMED_CONTENT XPATH XPATH_EXISTS XMLTABLE XMLNAMESPACES TABLE_TO_XML TABLE_TO_XMLSCHEMA TABLE_TO_XML_AND_XMLSCHEMA QUERY_TO_XML QUERY_TO_XMLSCHEMA QUERY_TO_XML_AND_XMLSCHEMA CURSOR_TO_XML CURSOR_TO_XMLSCHEMA SCHEMA_TO_XML SCHEMA_TO_XMLSCHEMA SCHEMA_TO_XML_AND_XMLSCHEMA DATABASE_TO_XML DATABASE_TO_XMLSCHEMA DATABASE_TO_XML_AND_XMLSCHEMA XMLATTRIBUTES TO_JSON TO_JSONB ARRAY_TO_JSON ROW_TO_JSON JSON_BUILD_ARRAY JSONB_BUILD_ARRAY JSON_BUILD_OBJECT JSONB_BUILD_OBJECT JSON_OBJECT JSONB_OBJECT JSON_ARRAY_LENGTH JSONB_ARRAY_LENGTH JSON_EACH JSONB_EACH JSON_EACH_TEXT JSONB_EACH_TEXT JSON_EXTRACT_PATH JSONB_EXTRACT_PATH JSON_OBJECT_KEYS JSONB_OBJECT_KEYS JSON_POPULATE_RECORD JSONB_POPULATE_RECORD JSON_POPULATE_RECORDSET JSONB_POPULATE_RECORDSET JSON_ARRAY_ELEMENTS JSONB_ARRAY_ELEMENTS JSON_ARRAY_ELEMENTS_TEXT JSONB_ARRAY_ELEMENTS_TEXT JSON_TYPEOF JSONB_TYPEOF JSON_TO_RECORD JSONB_TO_RECORD JSON_TO_RECORDSET JSONB_TO_RECORDSET JSON_STRIP_NULLS JSONB_STRIP_NULLS JSONB_SET JSONB_INSERT JSONB_PRETTY CURRVAL LASTVAL NEXTVAL SETVAL COALESCE NULLIF GREATEST LEAST ARRAY_APPEND ARRAY_CAT ARRAY_NDIMS ARRAY_DIMS ARRAY_FILL ARRAY_LENGTH ARRAY_LOWER ARRAY_POSITION ARRAY_POSITIONS ARRAY_PREPEND ARRAY_REMOVE ARRAY_REPLACE ARRAY_TO_STRING ARRAY_UPPER CARDINALITY STRING_TO_ARRAY UNNEST ISEMPTY LOWER_INC UPPER_INC LOWER_INF UPPER_INF RANGE_MERGE GENERATE_SERIES GENERATE_SUBSCRIPTS CURRENT_DATABASE CURRENT_QUERY CURRENT_SCHEMA|10 CURRENT_SCHEMAS|10 INET_CLIENT_ADDR INET_CLIENT_PORT INET_SERVER_ADDR INET_SERVER_PORT ROW_SECURITY_ACTIVE FORMAT_TYPE TO_REGCLASS TO_REGPROC TO_REGPROCEDURE TO_REGOPER TO_REGOPERATOR TO_REGTYPE TO_REGNAMESPACE TO_REGROLE COL_DESCRIPTION OBJ_DESCRIPTION SHOBJ_DESCRIPTION TXID_CURRENT TXID_CURRENT_IF_ASSIGNED TXID_CURRENT_SNAPSHOT TXID_SNAPSHOT_XIP TXID_SNAPSHOT_XMAX TXID_SNAPSHOT_XMIN TXID_VISIBLE_IN_SNAPSHOT TXID_STATUS CURRENT_SETTING SET_CONFIG BRIN_SUMMARIZE_NEW_VALUES BRIN_SUMMARIZE_RANGE BRIN_DESUMMARIZE_RANGE GIN_CLEAN_PENDING_LIST SUPPRESS_REDUNDANT_UPDATES_TRIGGER LO_FROM_BYTEA LO_PUT LO_GET LO_CREAT LO_CREATE LO_UNLINK LO_IMPORT LO_EXPORT LOREAD LOWRITE GROUPING CAST".split(" ").map((E=>E.split("|")[0])).join("|")
 ;return{name:"PostgreSQL",aliases:["postgres","postgresql"],supersetOf:"sql",
diff --git a/vendor/assets/javascripts/highlightjs/languages/php-template.min.js b/vendor/assets/javascripts/highlightjs/languages/php-template.min.js
index b3337376f2c..144739003b5 100644
--- a/vendor/assets/javascripts/highlightjs/languages/php-template.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/php-template.min.js
@@ -1,4 +1,4 @@
-/*! `php-template` grammar compiled for Highlight.js 11.6.0 */
+/*! `php-template` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var n=(()=>{"use strict";return n=>({name:"PHP template",
 subLanguage:"xml",contains:[{begin:/<\?(php|=)?/,end:/\?>/,subLanguage:"php",
 contains:[{begin:"/\\*",end:"\\*/",skip:!0},{begin:'b"',end:'"',skip:!0},{
diff --git a/vendor/assets/javascripts/highlightjs/languages/php.min.js b/vendor/assets/javascripts/highlightjs/languages/php.min.js
index da2fbf58f9c..9d10b8d37a0 100644
--- a/vendor/assets/javascripts/highlightjs/languages/php.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/php.min.js
@@ -1,21 +1,23 @@
-/*! `php` grammar compiled for Highlight.js 11.6.0 */
+/*! `php` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const t=e.regex,a=/(?![A-Za-z0-9])(?![$])/,r=t.concat(/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/,a),n=t.concat(/(\\?[A-Z][a-z0-9_\x7f-\xff]+|\\?[A-Z]+(?=[A-Z][a-z0-9_\x7f-\xff])){1,}/,a),o={
 scope:"variable",match:"\\$+"+r},c={scope:"subst",variants:[{begin:/\$\w+/},{
 begin:/\{\$/,end:/\}/}]},i=e.inherit(e.APOS_STRING_MODE,{illegal:null
 }),s="[ \t\n]",l={scope:"string",variants:[e.inherit(e.QUOTE_STRING_MODE,{
-illegal:null,contains:e.QUOTE_STRING_MODE.contains.concat(c)
-}),i,e.END_SAME_AS_BEGIN({begin:/<<<[ \t]*(\w+)\n/,end:/[ \t]*(\w+)\b/,
-contains:e.QUOTE_STRING_MODE.contains.concat(c)})]},_={scope:"number",
-variants:[{begin:"\\b0[bB][01]+(?:_[01]+)*\\b"},{
-begin:"\\b0[oO][0-7]+(?:_[0-7]+)*\\b"},{
+illegal:null,contains:e.QUOTE_STRING_MODE.contains.concat(c)}),i,{
+begin:/<<<[ \t]*(?:(\w+)|"(\w+)")\n/,end:/[ \t]*(\w+)\b/,
+contains:e.QUOTE_STRING_MODE.contains.concat(c),"on:begin":(e,t)=>{
+t.data._beginMatch=e[1]||e[2]},"on:end":(e,t)=>{
+t.data._beginMatch!==e[1]&&t.ignoreMatch()}},e.END_SAME_AS_BEGIN({
+begin:/<<<[ \t]*'(\w+)'\n/,end:/[ \t]*(\w+)\b/})]},d={scope:"number",variants:[{
+begin:"\\b0[bB][01]+(?:_[01]+)*\\b"},{begin:"\\b0[oO][0-7]+(?:_[0-7]+)*\\b"},{
 begin:"\\b0[xX][\\da-fA-F]+(?:_[\\da-fA-F]+)*\\b"},{
 begin:"(?:\\b\\d+(?:_\\d+)*(\\.(?:\\d+(?:_\\d+)*))?|\\B\\.\\d+)(?:[eE][+-]?\\d+)?"
 }],relevance:0
-},d=["false","null","true"],p=["__CLASS__","__DIR__","__FILE__","__FUNCTION__","__COMPILER_HALT_OFFSET__","__LINE__","__METHOD__","__NAMESPACE__","__TRAIT__","die","echo","exit","include","include_once","print","require","require_once","array","abstract","and","as","binary","bool","boolean","break","callable","case","catch","class","clone","const","continue","declare","default","do","double","else","elseif","empty","enddeclare","endfor","endforeach","endif","endswitch","endwhile","enum","eval","extends","final","finally","float","for","foreach","from","global","goto","if","implements","instanceof","insteadof","int","integer","interface","isset","iterable","list","match|0","mixed","new","never","object","or","private","protected","public","readonly","real","return","string","switch","throw","trait","try","unset","use","var","void","while","xor","yield"],b=["Error|0","AppendIterator","ArgumentCountError","ArithmeticError","ArrayIterator","ArrayObject","AssertionError","BadFunctionCallException","BadMethodCallException","CachingIterator","CallbackFilterIterator","CompileError","Countable","DirectoryIterator","DivisionByZeroError","DomainException","EmptyIterator","ErrorException","Exception","FilesystemIterator","FilterIterator","GlobIterator","InfiniteIterator","InvalidArgumentException","IteratorIterator","LengthException","LimitIterator","LogicException","MultipleIterator","NoRewindIterator","OutOfBoundsException","OutOfRangeException","OuterIterator","OverflowException","ParentIterator","ParseError","RangeException","RecursiveArrayIterator","RecursiveCachingIterator","RecursiveCallbackFilterIterator","RecursiveDirectoryIterator","RecursiveFilterIterator","RecursiveIterator","RecursiveIteratorIterator","RecursiveRegexIterator","RecursiveTreeIterator","RegexIterator","RuntimeException","SeekableIterator","SplDoublyLinkedList","SplFileInfo","SplFileObject","SplFixedArray","SplHeap","SplMaxHeap","SplMinHeap","SplObjectStorage","SplObserver","SplPriorityQueue","SplQueue","SplStack","SplSubject","SplTempFileObject","TypeError","UnderflowException","UnexpectedValueException","UnhandledMatchError","ArrayAccess","BackedEnum","Closure","Fiber","Generator","Iterator","IteratorAggregate","Serializable","Stringable","Throwable","Traversable","UnitEnum","WeakReference","WeakMap","Directory","__PHP_Incomplete_Class","parent","php_user_filter","self","static","stdClass"],E={
+},_=["false","null","true"],p=["__CLASS__","__DIR__","__FILE__","__FUNCTION__","__COMPILER_HALT_OFFSET__","__LINE__","__METHOD__","__NAMESPACE__","__TRAIT__","die","echo","exit","include","include_once","print","require","require_once","array","abstract","and","as","binary","bool","boolean","break","callable","case","catch","class","clone","const","continue","declare","default","do","double","else","elseif","empty","enddeclare","endfor","endforeach","endif","endswitch","endwhile","enum","eval","extends","final","finally","float","for","foreach","from","global","goto","if","implements","instanceof","insteadof","int","integer","interface","isset","iterable","list","match|0","mixed","new","never","object","or","private","protected","public","readonly","real","return","string","switch","throw","trait","try","unset","use","var","void","while","xor","yield"],b=["Error|0","AppendIterator","ArgumentCountError","ArithmeticError","ArrayIterator","ArrayObject","AssertionError","BadFunctionCallException","BadMethodCallException","CachingIterator","CallbackFilterIterator","CompileError","Countable","DirectoryIterator","DivisionByZeroError","DomainException","EmptyIterator","ErrorException","Exception","FilesystemIterator","FilterIterator","GlobIterator","InfiniteIterator","InvalidArgumentException","IteratorIterator","LengthException","LimitIterator","LogicException","MultipleIterator","NoRewindIterator","OutOfBoundsException","OutOfRangeException","OuterIterator","OverflowException","ParentIterator","ParseError","RangeException","RecursiveArrayIterator","RecursiveCachingIterator","RecursiveCallbackFilterIterator","RecursiveDirectoryIterator","RecursiveFilterIterator","RecursiveIterator","RecursiveIteratorIterator","RecursiveRegexIterator","RecursiveTreeIterator","RegexIterator","RuntimeException","SeekableIterator","SplDoublyLinkedList","SplFileInfo","SplFileObject","SplFixedArray","SplHeap","SplMaxHeap","SplMinHeap","SplObjectStorage","SplObserver","SplPriorityQueue","SplQueue","SplStack","SplSubject","SplTempFileObject","TypeError","UnderflowException","UnexpectedValueException","UnhandledMatchError","ArrayAccess","BackedEnum","Closure","Fiber","Generator","Iterator","IteratorAggregate","Serializable","Stringable","Throwable","Traversable","UnitEnum","WeakReference","WeakMap","Directory","__PHP_Incomplete_Class","parent","php_user_filter","self","static","stdClass"],E={
 keyword:p,literal:(e=>{const t=[];return e.forEach((e=>{
 t.push(e),e.toLowerCase()===e?t.push(e.toUpperCase()):t.push(e.toLowerCase())
-})),t})(d),built_in:b},u=e=>e.map((e=>e.replace(/\|\d+$/,""))),g={variants:[{
+})),t})(_),built_in:b},u=e=>e.map((e=>e.replace(/\|\d+$/,""))),g={variants:[{
 match:[/new/,t.concat(s,"+"),t.concat("(?!",u(b).join("\\b|"),"\\b)"),n],scope:{
 1:"keyword",4:"title.class"}}]},h=t.concat(r,"\\b(?!\\()"),m={variants:[{
 match:[t.concat(/::/,t.lookahead(/(?!class\b)/)),h],scope:{2:"variable.constant"
@@ -25,14 +27,14 @@ match:[n,t.concat(/::/,t.lookahead(/(?!class\b)/)),h],scope:{1:"title.class",
 scope:{1:"title.class"}},{match:[n,/::/,/class/],scope:{1:"title.class",
 3:"variable.language"}}]},I={scope:"attr",
 match:t.concat(r,t.lookahead(":"),t.lookahead(/(?!::)/))},f={relevance:0,
-begin:/\(/,end:/\)/,keywords:E,contains:[I,o,m,e.C_BLOCK_COMMENT_MODE,l,_,g]
+begin:/\(/,end:/\)/,keywords:E,contains:[I,o,m,e.C_BLOCK_COMMENT_MODE,l,d,g]
 },O={relevance:0,
 match:[/\b/,t.concat("(?!fn\\b|function\\b|",u(p).join("\\b|"),"|",u(b).join("\\b|"),"\\b)"),r,t.concat(s,"*"),t.lookahead(/(?=\()/)],
 scope:{3:"title.function.invoke"},contains:[f]};f.contains.push(O)
-;const v=[I,m,e.C_BLOCK_COMMENT_MODE,l,_,g];return{case_insensitive:!1,
+;const v=[I,m,e.C_BLOCK_COMMENT_MODE,l,d,g];return{case_insensitive:!1,
 keywords:E,contains:[{begin:t.concat(/#\[\s*/,n),beginScope:"meta",end:/]/,
-endScope:"meta",keywords:{literal:d,keyword:["new","array"]},contains:[{
-begin:/\[/,end:/]/,keywords:{literal:d,keyword:["new","array"]},
+endScope:"meta",keywords:{literal:_,keyword:["new","array"]},contains:[{
+begin:/\[/,end:/]/,keywords:{literal:_,keyword:["new","array"]},
 contains:["self",...v]},...v,{scope:"meta",match:n}]
 },e.HASH_COMMENT_MODE,e.COMMENT("//","$"),e.COMMENT("/\\*","\\*/",{contains:[{
 scope:"doctag",match:"@[A-Za-z]+"}]}),{match:/__halt_compiler\(\);/,
@@ -45,12 +47,12 @@ scope:"function",relevance:0,beginKeywords:"fn function",end:/[;{]/,
 excludeEnd:!0,illegal:"[$%\\[]",contains:[{beginKeywords:"use"
 },e.UNDERSCORE_TITLE_MODE,{begin:"=>",endsParent:!0},{scope:"params",
 begin:"\\(",end:"\\)",excludeBegin:!0,excludeEnd:!0,keywords:E,
-contains:["self",o,m,e.C_BLOCK_COMMENT_MODE,l,_]}]},{scope:"class",variants:[{
+contains:["self",o,m,e.C_BLOCK_COMMENT_MODE,l,d]}]},{scope:"class",variants:[{
 beginKeywords:"enum",illegal:/[($"]/},{beginKeywords:"class interface trait",
 illegal:/[:($"]/}],relevance:0,end:/\{/,excludeEnd:!0,contains:[{
 beginKeywords:"extends implements"},e.UNDERSCORE_TITLE_MODE]},{
 beginKeywords:"namespace",relevance:0,end:";",illegal:/[.']/,
 contains:[e.inherit(e.UNDERSCORE_TITLE_MODE,{scope:"title.class"})]},{
 beginKeywords:"use",relevance:0,end:";",contains:[{
-match:/\b(as|const|function)\b/,scope:"keyword"},e.UNDERSCORE_TITLE_MODE]},l,_]}
+match:/\b(as|const|function)\b/,scope:"keyword"},e.UNDERSCORE_TITLE_MODE]},l,d]}
 }})();hljs.registerLanguage("php",e)})();
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/plaintext.min.js b/vendor/assets/javascripts/highlightjs/languages/plaintext.min.js
index a3f3ff40887..0260f5483e8 100644
--- a/vendor/assets/javascripts/highlightjs/languages/plaintext.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/plaintext.min.js
@@ -1,4 +1,4 @@
-/*! `plaintext` grammar compiled for Highlight.js 11.6.0 */
+/*! `plaintext` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var t=(()=>{"use strict";return t=>({name:"Plain text",
 aliases:["text","txt"],disableAutodetect:!0})})()
 ;hljs.registerLanguage("plaintext",t)})();
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/pony.min.js b/vendor/assets/javascripts/highlightjs/languages/pony.min.js
index bca8621837a..f09c026ca69 100644
--- a/vendor/assets/javascripts/highlightjs/languages/pony.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/pony.min.js
@@ -1,4 +1,4 @@
-/*! `pony` grammar compiled for Highlight.js 11.6.0 */
+/*! `pony` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"Pony",keywords:{
 keyword:"actor addressof and as be break class compile_error compile_intrinsic consume continue delegate digestof do else elseif embed end error for fun if ifdef in interface is isnt lambda let match new not object or primitive recover repeat return struct then trait try type until use var where while with xor",
 meta:"iso val tag trn box ref",literal:"this false true"},contains:[{
diff --git a/vendor/assets/javascripts/highlightjs/languages/powershell.min.js b/vendor/assets/javascripts/highlightjs/languages/powershell.min.js
index 040cb26da7a..287e8f33340 100644
--- a/vendor/assets/javascripts/highlightjs/languages/powershell.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/powershell.min.js
@@ -1,4 +1,4 @@
-/*! `powershell` grammar compiled for Highlight.js 11.6.0 */
+/*! `powershell` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const n={$pattern:/-?[A-z\.\-]+\b/,
 keyword:"if else foreach return do while until elseif begin for trap data dynamicparam end break throw param continue finally in switch exit filter try process catch hidden static parameter",
 built_in:"ac asnp cat cd CFS chdir clc clear clhy cli clp cls clv cnsn compare copy cp cpi cpp curl cvpa dbp del diff dir dnsn ebp echo|0 epal epcsv epsn erase etsn exsn fc fhx fl ft fw gal gbp gc gcb gci gcm gcs gdr gerr ghy gi gin gjb gl gm gmo gp gps gpv group gsn gsnp gsv gtz gu gv gwmi h history icm iex ihy ii ipal ipcsv ipmo ipsn irm ise iwmi iwr kill lp ls man md measure mi mount move mp mv nal ndr ni nmo npssc nsn nv ogv oh popd ps pushd pwd r rbp rcjb rcsn rd rdr ren ri rjb rm rmdir rmo rni rnp rp rsn rsnp rujb rv rvpa rwmi sajb sal saps sasv sbp sc scb select set shcm si sl sleep sls sort sp spjb spps spsv start stz sujb sv swmi tee trcm type wget where wjb write"
diff --git a/vendor/assets/javascripts/highlightjs/languages/processing.min.js b/vendor/assets/javascripts/highlightjs/languages/processing.min.js
index 0b38cebce78..77e75982ce7 100644
--- a/vendor/assets/javascripts/highlightjs/languages/processing.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/processing.min.js
@@ -1,4 +1,4 @@
-/*! `processing` grammar compiled for Highlight.js 11.6.0 */
+/*! `processing` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const t=e.regex,a=["displayHeight","displayWidth","mouseY","mouseX","mousePressed","pmouseX","pmouseY","key","keyCode","pixels","focused","frameCount","frameRate","height","width","size","createGraphics","beginDraw","createShape","loadShape","PShape","arc","ellipse","line","point","quad","rect","triangle","bezier","bezierDetail","bezierPoint","bezierTangent","curve","curveDetail","curvePoint","curveTangent","curveTightness","shape","shapeMode","beginContour","beginShape","bezierVertex","curveVertex","endContour","endShape","quadraticVertex","vertex","ellipseMode","noSmooth","rectMode","smooth","strokeCap","strokeJoin","strokeWeight","mouseClicked","mouseDragged","mouseMoved","mousePressed","mouseReleased","mouseWheel","keyPressed","keyPressedkeyReleased","keyTyped","print","println","save","saveFrame","day","hour","millis","minute","month","second","year","background","clear","colorMode","fill","noFill","noStroke","stroke","alpha","blue","brightness","color","green","hue","lerpColor","red","saturation","modelX","modelY","modelZ","screenX","screenY","screenZ","ambient","emissive","shininess","specular","add","createImage","beginCamera","camera","endCamera","frustum","ortho","perspective","printCamera","printProjection","cursor","frameRate","noCursor","exit","loop","noLoop","popStyle","pushStyle","redraw","binary","boolean","byte","char","float","hex","int","str","unbinary","unhex","join","match","matchAll","nf","nfc","nfp","nfs","split","splitTokens","trim","append","arrayCopy","concat","expand","reverse","shorten","sort","splice","subset","box","sphere","sphereDetail","createInput","createReader","loadBytes","loadJSONArray","loadJSONObject","loadStrings","loadTable","loadXML","open","parseXML","saveTable","selectFolder","selectInput","beginRaw","beginRecord","createOutput","createWriter","endRaw","endRecord","PrintWritersaveBytes","saveJSONArray","saveJSONObject","saveStream","saveStrings","saveXML","selectOutput","popMatrix","printMatrix","pushMatrix","resetMatrix","rotate","rotateX","rotateY","rotateZ","scale","shearX","shearY","translate","ambientLight","directionalLight","lightFalloff","lights","lightSpecular","noLights","normal","pointLight","spotLight","image","imageMode","loadImage","noTint","requestImage","tint","texture","textureMode","textureWrap","blend","copy","filter","get","loadPixels","set","updatePixels","blendMode","loadShader","PShaderresetShader","shader","createFont","loadFont","text","textFont","textAlign","textLeading","textMode","textSize","textWidth","textAscent","textDescent","abs","ceil","constrain","dist","exp","floor","lerp","log","mag","map","max","min","norm","pow","round","sq","sqrt","acos","asin","atan","atan2","cos","degrees","radians","sin","tan","noise","noiseDetail","noiseSeed","random","randomGaussian","randomSeed"],r=e.IDENT_RE,s={
 variants:[{match:t.concat(t.either(...a),t.lookahead(/\s*\(/)),
diff --git a/vendor/assets/javascripts/highlightjs/languages/profile.min.js b/vendor/assets/javascripts/highlightjs/languages/profile.min.js
index f892eba9b08..ea2996e9507 100644
--- a/vendor/assets/javascripts/highlightjs/languages/profile.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/profile.min.js
@@ -1,4 +1,4 @@
-/*! `profile` grammar compiled for Highlight.js 11.6.0 */
+/*! `profile` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"Python profiler",
 contains:[e.C_NUMBER_MODE,{begin:"[a-zA-Z_][\\da-zA-Z_]+\\.[\\da-zA-Z_]{1,3}",
 end:":",excludeEnd:!0},{begin:"(ncalls|tottime|cumtime)",end:"$",
diff --git a/vendor/assets/javascripts/highlightjs/languages/prolog.min.js b/vendor/assets/javascripts/highlightjs/languages/prolog.min.js
index ed14d97f660..be59975789e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/prolog.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/prolog.min.js
@@ -1,4 +1,4 @@
-/*! `prolog` grammar compiled for Highlight.js 11.6.0 */
+/*! `prolog` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var n=(()=>{"use strict";return n=>{const e={begin:/\(/,end:/\)/,
 relevance:0},a={begin:/\[/,end:/\]/},s={className:"comment",begin:/%/,end:/$/,
 contains:[n.PHRASAL_WORDS_MODE]},i={className:"string",begin:/`/,end:/`/,
diff --git a/vendor/assets/javascripts/highlightjs/languages/properties.min.js b/vendor/assets/javascripts/highlightjs/languages/properties.min.js
index df10450d4ff..5e0bdfbc876 100644
--- a/vendor/assets/javascripts/highlightjs/languages/properties.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/properties.min.js
@@ -1,11 +1,10 @@
-/*! `properties` grammar compiled for Highlight.js 11.6.0 */
+/*! `properties` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
-const t="[ \\t\\f]*",n="([^\\\\:= \\t\\f\\n]|\\\\.)+";return{name:".properties",
+const n="[ \\t\\f]*",t=n+"[:=]"+n,s="[ \\t\\f]+",a="([^\\\\:= \\t\\f\\n]|\\\\.)+",r={
+end:"("+t+"|"+s+")",relevance:0,starts:{className:"string",end:/$/,relevance:0,
+contains:[{begin:"\\\\\\\\"},{begin:"\\\\\\n"}]}};return{name:".properties",
 disableAutodetect:!0,case_insensitive:!0,illegal:/\S/,
-contains:[e.COMMENT("^\\s*[!#]","$"),{returnBegin:!0,variants:[{
-begin:n+"[ \\t\\f]*[:=][ \\t\\f]*"},{begin:n+"[ \\t\\f]+"}],contains:[{
-className:"attr",begin:n,endsParent:!0}],starts:{
-end:"([ \\t\\f]*[:=][ \\t\\f]*|[ \\t\\f]+)",relevance:0,starts:{
-className:"string",end:/$/,relevance:0,contains:[{begin:"\\\\\\\\"},{
-begin:"\\\\\\n"}]}}},{className:"attr",begin:n+t+"$"}]}}})()
-;hljs.registerLanguage("properties",e)})();
\ No newline at end of file
+contains:[e.COMMENT("^\\s*[!#]","$"),{returnBegin:!0,variants:[{begin:a+t},{
+begin:a+s}],contains:[{className:"attr",begin:a,endsParent:!0}],starts:r},{
+className:"attr",begin:a+n+"$"}]}}})();hljs.registerLanguage("properties",e)
+})();
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/protobuf.min.js b/vendor/assets/javascripts/highlightjs/languages/protobuf.min.js
index 4560700efcc..0b51dc095ef 100644
--- a/vendor/assets/javascripts/highlightjs/languages/protobuf.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/protobuf.min.js
@@ -1,11 +1,11 @@
-/*! `protobuf` grammar compiled for Highlight.js 11.6.0 */
-(()=>{var e=(()=>{"use strict";return e=>{const t={
+/*! `protobuf` grammar compiled for Highlight.js 11.8.0 */
+(()=>{var e=(()=>{"use strict";return e=>{const s={
 match:[/(message|enum|service)\s+/,e.IDENT_RE],scope:{1:"keyword",
-2:"title.class"}};return{name:"Protocol Buffers",keywords:{
+2:"title.class"}};return{name:"Protocol Buffers",aliases:["proto"],keywords:{
 keyword:["package","import","option","optional","required","repeated","group","oneof"],
 type:["double","float","int32","int64","uint32","uint64","sint32","sint64","fixed32","fixed64","sfixed32","sfixed64","bool","string","bytes"],
 literal:["true","false"]},
-contains:[e.QUOTE_STRING_MODE,e.NUMBER_MODE,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,t,{
+contains:[e.QUOTE_STRING_MODE,e.NUMBER_MODE,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,s,{
 className:"function",beginKeywords:"rpc",end:/[{;]/,excludeEnd:!0,
 keywords:"rpc returns"},{begin:/^\s*[A-Z_]+(?=\s*=[^\n]+;$)/}]}}})()
 ;hljs.registerLanguage("protobuf",e)})();
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/puppet.min.js b/vendor/assets/javascripts/highlightjs/languages/puppet.min.js
index e9ac4b449a5..dc680c5b458 100644
--- a/vendor/assets/javascripts/highlightjs/languages/puppet.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/puppet.min.js
@@ -1,4 +1,4 @@
-/*! `puppet` grammar compiled for Highlight.js 11.6.0 */
+/*! `puppet` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const s=e.COMMENT("#","$"),r="([A-Za-z_]|::)(\\w|::)*",a=e.inherit(e.TITLE_MODE,{
 begin:r}),n={className:"variable",begin:"\\$"+r},i={className:"string",
diff --git a/vendor/assets/javascripts/highlightjs/languages/purebasic.min.js b/vendor/assets/javascripts/highlightjs/languages/purebasic.min.js
index dce3f552f9d..b564f20d679 100644
--- a/vendor/assets/javascripts/highlightjs/languages/purebasic.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/purebasic.min.js
@@ -1,4 +1,4 @@
-/*! `purebasic` grammar compiled for Highlight.js 11.6.0 */
+/*! `purebasic` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"PureBASIC",
 aliases:["pb","pbi"],
 keywords:"Align And Array As Break CallDebugger Case CompilerCase CompilerDefault CompilerElse CompilerElseIf CompilerEndIf CompilerEndSelect CompilerError CompilerIf CompilerSelect CompilerWarning Continue Data DataSection Debug DebugLevel Declare DeclareC DeclareCDLL DeclareDLL DeclareModule Default Define Dim DisableASM DisableDebugger DisableExplicit Else ElseIf EnableASM EnableDebugger EnableExplicit End EndDataSection EndDeclareModule EndEnumeration EndIf EndImport EndInterface EndMacro EndModule EndProcedure EndSelect EndStructure EndStructureUnion EndWith Enumeration EnumerationBinary Extends FakeReturn For ForEach ForEver Global Gosub Goto If Import ImportC IncludeBinary IncludeFile IncludePath Interface List Macro MacroExpandedCount Map Module NewList NewMap Next Not Or Procedure ProcedureC ProcedureCDLL ProcedureDLL ProcedureReturn Protected Prototype PrototypeC ReDim Read Repeat Restore Return Runtime Select Shared Static Step Structure StructureUnion Swap Threaded To UndefineMacro Until Until  UnuseModule UseModule Wend While With XIncludeFile XOr",
diff --git a/vendor/assets/javascripts/highlightjs/languages/python-repl.min.js b/vendor/assets/javascripts/highlightjs/languages/python-repl.min.js
index d14c9ed9ec6..4923099f0f3 100644
--- a/vendor/assets/javascripts/highlightjs/languages/python-repl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/python-repl.min.js
@@ -1,4 +1,4 @@
-/*! `python-repl` grammar compiled for Highlight.js 11.6.0 */
+/*! `python-repl` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var a=(()=>{"use strict";return a=>({aliases:["pycon"],contains:[{
 className:"meta.prompt",starts:{end:/ |$/,starts:{end:"$",subLanguage:"python"}
 },variants:[{begin:/^>>>(?=[ ]|$)/},{begin:/^\.\.\.(?=[ ]|$)/}]}]})})()
diff --git a/vendor/assets/javascripts/highlightjs/languages/python.min.js b/vendor/assets/javascripts/highlightjs/languages/python.min.js
index 62c361df5e3..6c1d2f4836c 100644
--- a/vendor/assets/javascripts/highlightjs/languages/python.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/python.min.js
@@ -1,4 +1,4 @@
-/*! `python` grammar compiled for Highlight.js 11.6.0 */
+/*! `python` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const n=e.regex,a=/[\p{XID_Start}_]\p{XID_Continue}*/u,i=["and","as","assert","async","await","break","case","class","continue","def","del","elif","else","except","finally","for","from","global","if","import","in","is","lambda","match","nonlocal|10","not","or","pass","raise","return","try","while","with","yield"],s={
 $pattern:/[A-Za-z]\w+|__\w+__/,keyword:i,
@@ -32,7 +32,7 @@ className:"params",variants:[{className:"",begin:/\(\s*\)/,skip:!0},{begin:/\(/,
 end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:s,
 contains:["self",t,g,b,e.HASH_COMMENT_MODE]}]};return r.contains=[b,g,t],{
 name:"Python",aliases:["py","gyp","ipython"],unicodeRegex:!0,keywords:s,
-illegal:/(<\/|->|\?)|=>/,contains:[t,g,{begin:/\bself\b/},{beginKeywords:"if",
+illegal:/(<\/|\?)|=>/,contains:[t,g,{begin:/\bself\b/},{beginKeywords:"if",
 relevance:0},b,p,e.HASH_COMMENT_MODE,{match:[/\bdef/,/\s+/,a],scope:{
 1:"keyword",3:"title.function"},contains:[m]},{variants:[{
 match:[/\bclass/,/\s+/,a,/\s*/,/\(\s*/,a,/\s*\)/]},{match:[/\bclass/,/\s+/,a]}],
diff --git a/vendor/assets/javascripts/highlightjs/languages/q.min.js b/vendor/assets/javascripts/highlightjs/languages/q.min.js
index 88cb38fbfd3..0e43611e433 100644
--- a/vendor/assets/javascripts/highlightjs/languages/q.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/q.min.js
@@ -1,4 +1,4 @@
-/*! `q` grammar compiled for Highlight.js 11.6.0 */
+/*! `q` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"Q",aliases:["k","kdb"],
 keywords:{$pattern:/(`?)[A-Za-z0-9_]+\b/,
 keyword:"do while select delete by update from",literal:"0b 1b",
diff --git a/vendor/assets/javascripts/highlightjs/languages/qml.min.js b/vendor/assets/javascripts/highlightjs/languages/qml.min.js
index 3c0c4754039..6edc093c8ed 100644
--- a/vendor/assets/javascripts/highlightjs/languages/qml.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/qml.min.js
@@ -1,4 +1,4 @@
-/*! `qml` grammar compiled for Highlight.js 11.6.0 */
+/*! `qml` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const n="[a-zA-Z_][a-zA-Z0-9\\._]*",r={className:"attribute",begin:"\\bid\\s*:",
 starts:{className:"string",end:n,returnEnd:!1}},a={begin:n+"\\s*:",
diff --git a/vendor/assets/javascripts/highlightjs/languages/r.min.js b/vendor/assets/javascripts/highlightjs/languages/r.min.js
index 560e9e11f53..d49a428e60e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/r.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/r.min.js
@@ -1,4 +1,4 @@
-/*! `r` grammar compiled for Highlight.js 11.6.0 */
+/*! `r` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const a=e.regex,n=/(?:(?:[a-zA-Z]|\.[._a-zA-Z])[._a-zA-Z0-9]*)|\.(?!\d)/,i=a.either(/0[xX][0-9a-fA-F]+\.[0-9a-fA-F]*[pP][+-]?\d+i?/,/0[xX][0-9a-fA-F]+(?:[pP][+-]?\d+)?[Li]?/,/(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?[Li]?/),s=/[=!<>:]=|\|\||&&|:::?|<-|<<-|->>|->|\|>|[-+*\/?!$&|:<=>@^~]|\*\*/,t=a.either(/[()]/,/[{}]/,/\[\[/,/[[\]]/,/\\/,/,/)
 ;return{name:"R",keywords:{$pattern:n,
diff --git a/vendor/assets/javascripts/highlightjs/languages/reasonml.min.js b/vendor/assets/javascripts/highlightjs/languages/reasonml.min.js
index 59c6bb6d4c1..85751d2e70e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/reasonml.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/reasonml.min.js
@@ -1,43 +1,41 @@
-/*! `reasonml` grammar compiled for Highlight.js 11.6.0 */
+/*! `reasonml` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
-const n="~?[a-z$_][0-9a-zA-Z$_]*",a="`?[A-Z$_][0-9a-zA-Z$_]*",s="("+["||","++","**","+.","*","/","*.","/.","..."].map((e=>e.split("").map((e=>"\\"+e)).join(""))).join("|")+"|\\|>|&&|==|===)",i="\\s+"+s+"\\s+",r={
+const n="~?[a-z$_][0-9a-zA-Z$_]*",a="`?[A-Z$_][0-9a-zA-Z$_]*",s="'?[a-z$_][0-9a-z$_]*",i=n+"(\\s*:\\s*[a-z$_][0-9a-z$_]*(\\(\\s*("+s+"\\s*(,"+s+"\\s*)*)?\\))?){0,2}",r="("+["||","++","**","+.","*","/","*.","/.","..."].map((e=>e.split("").map((e=>"\\"+e)).join(""))).join("|")+"|\\|>|&&|==|===)",l="\\s+"+r+"\\s+",t={
 keyword:"and as asr assert begin class constraint do done downto else end exception external for fun function functor if in include inherit initializer land lazy let lor lsl lsr lxor match method mod module mutable new nonrec object of open or private rec sig struct then to try type val virtual when while with",
 built_in:"array bool bytes char exn|5 float int int32 int64 list lazy_t|5 nativeint|5 ref string unit ",
 literal:"true false"
-},l="\\b(0[xX][a-fA-F0-9_]+[Lln]?|0[oO][0-7_]+[Lln]?|0[bB][01_]+[Lln]?|[0-9][0-9_]*([Lln]|(\\.[0-9_]*)?([eE][-+]?[0-9_]+)?)?)",t={
-className:"number",relevance:0,variants:[{begin:l},{begin:"\\(-"+l+"\\)"}]},c={
-className:"operator",relevance:0,begin:s},o=[{className:"identifier",
-relevance:0,begin:n},c,t],g=[e.QUOTE_STRING_MODE,c,{className:"module",
+},c="\\b(0[xX][a-fA-F0-9_]+[Lln]?|0[oO][0-7_]+[Lln]?|0[bB][01_]+[Lln]?|[0-9][0-9_]*([Lln]|(\\.[0-9_]*)?([eE][-+]?[0-9_]+)?)?)",o={
+className:"number",relevance:0,variants:[{begin:c},{begin:"\\(-"+c+"\\)"}]},g={
+className:"operator",relevance:0,begin:r},b=[{className:"identifier",
+relevance:0,begin:n},g,o],m=[e.QUOTE_STRING_MODE,g,{className:"module",
 begin:"\\b"+a,returnBegin:!0,relevance:0,end:".",contains:[{
-className:"identifier",begin:a,relevance:0}]}],b=[{className:"module",
+className:"identifier",begin:a,relevance:0}]}],d=[{className:"module",
 begin:"\\b"+a,returnBegin:!0,end:".",relevance:0,contains:[{
-className:"identifier",begin:a,relevance:0}]}],m={className:"function",
-relevance:0,keywords:r,variants:[{begin:"\\s(\\(\\.?.*?\\)|"+n+")\\s*=>",
+className:"identifier",begin:a,relevance:0}]}],u={className:"function",
+relevance:0,keywords:t,variants:[{begin:"\\s(\\(\\.?.*?\\)|"+n+")\\s*=>",
 end:"\\s*=>",returnBegin:!0,relevance:0,contains:[{className:"params",
-variants:[{begin:n},{
-begin:"~?[a-z$_][0-9a-zA-Z$_]*(\\s*:\\s*[a-z$_][0-9a-z$_]*(\\(\\s*('?[a-z$_][0-9a-z$_]*\\s*(,'?[a-z$_][0-9a-z$_]*\\s*)*)?\\))?){0,2}"
-},{begin:/\(\s*\)/}]}]},{begin:"\\s\\(\\.?[^;\\|]*\\)\\s*=>",end:"\\s=>",
-returnBegin:!0,relevance:0,contains:[{className:"params",relevance:0,variants:[{
-begin:n,end:"(,|\\n|\\))",relevance:0,contains:[c,{className:"typing",begin:":",
-end:"(,|\\n)",returnBegin:!0,relevance:0,contains:b}]}]}]},{
-begin:"\\(\\.\\s"+n+"\\)\\s*=>"}]};g.push(m);const d={className:"constructor",
-begin:a+"\\(",end:"\\)",illegal:"\\n",keywords:r,
-contains:[e.QUOTE_STRING_MODE,c,{className:"params",begin:"\\b"+n}]},u={
-className:"pattern-match",begin:"\\|",returnBegin:!0,keywords:r,end:"=>",
-relevance:0,contains:[d,c,{relevance:0,className:"constructor",begin:a}]},v={
-className:"module-access",keywords:r,returnBegin:!0,variants:[{
-begin:"\\b("+a+"\\.)+"+n},{begin:"\\b("+a+"\\.)+\\(",end:"\\)",returnBegin:!0,
-contains:[m,{begin:"\\(",end:"\\)",relevance:0,skip:!0}].concat(g)},{
-begin:"\\b("+a+"\\.)+\\{",end:/\}/}],contains:g};return b.push(v),{
-name:"ReasonML",aliases:["re"],keywords:r,illegal:"(:-|:=|\\$\\{|\\+=)",
-contains:[e.COMMENT("/\\*","\\*/",{illegal:"^(#,\\/\\/)"}),{
-className:"character",begin:"'(\\\\[^']+|[^'])'",illegal:"\\n",relevance:0
-},e.QUOTE_STRING_MODE,{className:"literal",begin:"\\(\\)",relevance:0},{
-className:"literal",begin:"\\[\\|",end:"\\|\\]",relevance:0,contains:o},{
-className:"literal",begin:"\\[",end:"\\]",relevance:0,contains:o},d,{
-className:"operator",begin:i,illegal:"--\x3e",relevance:0
-},t,e.C_LINE_COMMENT_MODE,u,m,{className:"module-def",
+variants:[{begin:n},{begin:i},{begin:/\(\s*\)/}]}]},{
+begin:"\\s\\(\\.?[^;\\|]*\\)\\s*=>",end:"\\s=>",returnBegin:!0,relevance:0,
+contains:[{className:"params",relevance:0,variants:[{begin:n,end:"(,|\\n|\\))",
+relevance:0,contains:[g,{className:"typing",begin:":",end:"(,|\\n)",
+returnBegin:!0,relevance:0,contains:d}]}]}]},{begin:"\\(\\.\\s"+n+"\\)\\s*=>"}]}
+;m.push(u);const v={className:"constructor",begin:a+"\\(",end:"\\)",
+illegal:"\\n",keywords:t,contains:[e.QUOTE_STRING_MODE,g,{className:"params",
+begin:"\\b"+n}]},N={className:"pattern-match",begin:"\\|",returnBegin:!0,
+keywords:t,end:"=>",relevance:0,contains:[v,g,{relevance:0,
+className:"constructor",begin:a}]},_={className:"module-access",keywords:t,
+returnBegin:!0,variants:[{begin:"\\b("+a+"\\.)+"+n},{begin:"\\b("+a+"\\.)+\\(",
+end:"\\)",returnBegin:!0,contains:[u,{begin:"\\(",end:"\\)",relevance:0,skip:!0
+}].concat(m)},{begin:"\\b("+a+"\\.)+\\{",end:/\}/}],contains:m}
+;return d.push(_),{name:"ReasonML",aliases:["re"],keywords:t,
+illegal:"(:-|:=|\\$\\{|\\+=)",contains:[e.COMMENT("/\\*","\\*/",{
+illegal:"^(#,\\/\\/)"}),{className:"character",begin:"'(\\\\[^']+|[^'])'",
+illegal:"\\n",relevance:0},e.QUOTE_STRING_MODE,{className:"literal",
+begin:"\\(\\)",relevance:0},{className:"literal",begin:"\\[\\|",end:"\\|\\]",
+relevance:0,contains:b},{className:"literal",begin:"\\[",end:"\\]",relevance:0,
+contains:b},v,{className:"operator",begin:l,illegal:"--\x3e",relevance:0
+},o,e.C_LINE_COMMENT_MODE,N,u,{className:"module-def",
 begin:"\\bmodule\\s+"+n+"\\s+"+a+"\\s+=\\s+\\{",end:/\}/,returnBegin:!0,
-keywords:r,relevance:0,contains:[{className:"module",relevance:0,begin:a},{
-begin:/\{/,end:/\}/,relevance:0,skip:!0}].concat(g)},v]}}})()
+keywords:t,relevance:0,contains:[{className:"module",relevance:0,begin:a},{
+begin:/\{/,end:/\}/,relevance:0,skip:!0}].concat(m)},_]}}})()
 ;hljs.registerLanguage("reasonml",e)})();
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/rib.min.js b/vendor/assets/javascripts/highlightjs/languages/rib.min.js
index 7e72d407487..78a7a3924f8 100644
--- a/vendor/assets/javascripts/highlightjs/languages/rib.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/rib.min.js
@@ -1,4 +1,4 @@
-/*! `rib` grammar compiled for Highlight.js 11.6.0 */
+/*! `rib` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"RenderMan RIB",
 keywords:"ArchiveRecord AreaLightSource Atmosphere Attribute AttributeBegin AttributeEnd Basis Begin Blobby Bound Clipping ClippingPlane Color ColorSamples ConcatTransform Cone CoordinateSystem CoordSysTransform CropWindow Curves Cylinder DepthOfField Detail DetailRange Disk Displacement Display End ErrorHandler Exposure Exterior Format FrameAspectRatio FrameBegin FrameEnd GeneralPolygon GeometricApproximation Geometry Hider Hyperboloid Identity Illuminate Imager Interior LightSource MakeCubeFaceEnvironment MakeLatLongEnvironment MakeShadow MakeTexture Matte MotionBegin MotionEnd NuPatch ObjectBegin ObjectEnd ObjectInstance Opacity Option Orientation Paraboloid Patch PatchMesh Perspective PixelFilter PixelSamples PixelVariance Points PointsGeneralPolygons PointsPolygons Polygon Procedural Projection Quantize ReadArchive RelativeDetail ReverseOrientation Rotate Scale ScreenWindow ShadingInterpolation ShadingRate Shutter Sides Skew SolidBegin SolidEnd Sphere SubdivisionMesh Surface TextureCoordinates Torus Transform TransformBegin TransformEnd TransformPoints Translate TrimCurve WorldBegin WorldEnd",
 illegal:"</",
diff --git a/vendor/assets/javascripts/highlightjs/languages/roboconf.min.js b/vendor/assets/javascripts/highlightjs/languages/roboconf.min.js
index 03bc447390e..b6cfa2d8b51 100644
--- a/vendor/assets/javascripts/highlightjs/languages/roboconf.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/roboconf.min.js
@@ -1,4 +1,4 @@
-/*! `roboconf` grammar compiled for Highlight.js 11.6.0 */
+/*! `roboconf` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const n="[a-zA-Z-_][^\\n{]+\\{",a={
 className:"attribute",begin:/[a-zA-Z-_]+/,end:/\s*:/,excludeEnd:!0,starts:{
 end:";",relevance:0,contains:[{className:"variable",begin:/\.[a-zA-Z-_]+/},{
diff --git a/vendor/assets/javascripts/highlightjs/languages/routeros.min.js b/vendor/assets/javascripts/highlightjs/languages/routeros.min.js
index 3522c67c55c..f44c058ec1e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/routeros.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/routeros.min.js
@@ -1,10 +1,10 @@
-/*! `routeros` grammar compiled for Highlight.js 11.6.0 */
+/*! `routeros` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const r="foreach do while for if from to step else on-error and or not in",n="true false yes no nothing nil null",i={
 className:"variable",variants:[{begin:/\$[\w\d#@][\w\d_]*/},{begin:/\$\{(.*?)\}/
 }]},s={className:"string",begin:/"/,end:/"/,contains:[e.BACKSLASH_ESCAPE,i,{
 className:"variable",begin:/\$\(/,end:/\)/,contains:[e.BACKSLASH_ESCAPE]}]},t={
-className:"string",begin:/'/,end:/'/};return{name:"Microtik RouterOS script",
+className:"string",begin:/'/,end:/'/};return{name:"MikroTik RouterOS script",
 aliases:["mikrotik"],case_insensitive:!0,keywords:{$pattern:/:?[\w-]+/,
 literal:n,
 keyword:r+" :"+r.split(" ").join(" :")+" :"+"global local beep delay put len typeof pick log time set find environment terminal error execute parse resolve toarray tobool toid toip toip6 tonum tostr totime".split(" ").join(" :")
diff --git a/vendor/assets/javascripts/highlightjs/languages/rsl.min.js b/vendor/assets/javascripts/highlightjs/languages/rsl.min.js
index be6f23d8e5d..53140dc26f2 100644
--- a/vendor/assets/javascripts/highlightjs/languages/rsl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/rsl.min.js
@@ -1,4 +1,4 @@
-/*! `rsl` grammar compiled for Highlight.js 11.6.0 */
+/*! `rsl` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const t={
 match:[/(surface|displacement|light|volume|imager)/,/\s+/,e.IDENT_RE],scope:{
 1:"keyword",3:"title.class"}};return{name:"RenderMan RSL",keywords:{
diff --git a/vendor/assets/javascripts/highlightjs/languages/ruby.min.js b/vendor/assets/javascripts/highlightjs/languages/ruby.min.js
index f44cc8f71d0..81453a00ad9 100644
--- a/vendor/assets/javascripts/highlightjs/languages/ruby.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/ruby.min.js
@@ -1,51 +1,54 @@
-/*! `ruby` grammar compiled for Highlight.js 11.6.0 */
+/*! `ruby` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
-const n=e.regex,a="([a-zA-Z_]\\w*[!?=]?|[-+~]@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?)",s=n.either(/\b([A-Z]+[a-z0-9]+)+/,/\b([A-Z]+[a-z0-9]+)+[A-Z]+/),i=n.concat(s,/(::\w+)*/),r={
-"variable.constant":["__FILE__","__LINE__"],
+const n=e.regex,a="([a-zA-Z_]\\w*[!?=]?|[-+~]@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?)",s=n.either(/\b([A-Z]+[a-z0-9]+)+/,/\b([A-Z]+[a-z0-9]+)+[A-Z]+/),i=n.concat(s,/(::\w+)*/),t={
+"variable.constant":["__FILE__","__LINE__","__ENCODING__"],
 "variable.language":["self","super"],
-keyword:["alias","and","attr_accessor","attr_reader","attr_writer","begin","BEGIN","break","case","class","defined","do","else","elsif","end","END","ensure","for","if","in","include","module","next","not","or","redo","require","rescue","retry","return","then","undef","unless","until","when","while","yield"],
-built_in:["proc","lambda"],literal:["true","false","nil"]},c={
-className:"doctag",begin:"@[A-Za-z]+"},t={begin:"#<",end:">"
-},b=[e.COMMENT("#","$",{contains:[c]}),e.COMMENT("^=begin","^=end",{
-contains:[c],relevance:10}),e.COMMENT("^__END__",e.MATCH_NOTHING_RE)],l={
-className:"subst",begin:/#\{/,end:/\}/,keywords:r},d={className:"string",
-contains:[e.BACKSLASH_ESCAPE,l],variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/
-},{begin:/`/,end:/`/},{begin:/%[qQwWx]?\(/,end:/\)/},{begin:/%[qQwWx]?\[/,
-end:/\]/},{begin:/%[qQwWx]?\{/,end:/\}/},{begin:/%[qQwWx]?</,end:/>/},{
-begin:/%[qQwWx]?\//,end:/\//},{begin:/%[qQwWx]?%/,end:/%/},{begin:/%[qQwWx]?-/,
-end:/-/},{begin:/%[qQwWx]?\|/,end:/\|/},{begin:/\B\?(\\\d{1,3})/},{
+keyword:["alias","and","begin","BEGIN","break","case","class","defined","do","else","elsif","end","END","ensure","for","if","in","module","next","not","or","redo","require","rescue","retry","return","then","undef","unless","until","when","while","yield","include","extend","prepend","public","private","protected","raise","throw"],
+built_in:["proc","lambda","attr_accessor","attr_reader","attr_writer","define_method","private_constant","module_function"],
+literal:["true","false","nil"]},c={className:"doctag",begin:"@[A-Za-z]+"},r={
+begin:"#<",end:">"},b=[e.COMMENT("#","$",{contains:[c]
+}),e.COMMENT("^=begin","^=end",{contains:[c],relevance:10
+}),e.COMMENT("^__END__",e.MATCH_NOTHING_RE)],l={className:"subst",begin:/#\{/,
+end:/\}/,keywords:t},d={className:"string",contains:[e.BACKSLASH_ESCAPE,l],
+variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/},{begin:/`/,end:/`/},{
+begin:/%[qQwWx]?\(/,end:/\)/},{begin:/%[qQwWx]?\[/,end:/\]/},{
+begin:/%[qQwWx]?\{/,end:/\}/},{begin:/%[qQwWx]?</,end:/>/},{begin:/%[qQwWx]?\//,
+end:/\//},{begin:/%[qQwWx]?%/,end:/%/},{begin:/%[qQwWx]?-/,end:/-/},{
+begin:/%[qQwWx]?\|/,end:/\|/},{begin:/\B\?(\\\d{1,3})/},{
 begin:/\B\?(\\x[A-Fa-f0-9]{1,2})/},{begin:/\B\?(\\u\{?[A-Fa-f0-9]{1,6}\}?)/},{
 begin:/\B\?(\\M-\\C-|\\M-\\c|\\c\\M-|\\M-|\\C-\\M-)[\x20-\x7e]/},{
 begin:/\B\?\\(c|C-)[\x20-\x7e]/},{begin:/\B\?\\?\S/},{
 begin:n.concat(/<<[-~]?'?/,n.lookahead(/(\w+)(?=\W)[^\n]*\n(?:[^\n]*\n)*?\s*\1\b/)),
 contains:[e.END_SAME_AS_BEGIN({begin:/(\w+)/,end:/(\w+)/,
-contains:[e.BACKSLASH_ESCAPE,l]})]}]},g="[0-9](_?[0-9])*",o={className:"number",
+contains:[e.BACKSLASH_ESCAPE,l]})]}]},o="[0-9](_?[0-9])*",g={className:"number",
 relevance:0,variants:[{
-begin:`\\b([1-9](_?[0-9])*|0)(\\.(${g}))?([eE][+-]?(${g})|r)?i?\\b`},{
+begin:`\\b([1-9](_?[0-9])*|0)(\\.(${o}))?([eE][+-]?(${o})|r)?i?\\b`},{
 begin:"\\b0[dD][0-9](_?[0-9])*r?i?\\b"},{begin:"\\b0[bB][0-1](_?[0-1])*r?i?\\b"
 },{begin:"\\b0[oO][0-7](_?[0-7])*r?i?\\b"},{
 begin:"\\b0[xX][0-9a-fA-F](_?[0-9a-fA-F])*r?i?\\b"},{
 begin:"\\b0(_?[0-7])+r?i?\\b"}]},_={variants:[{match:/\(\)/},{
 className:"params",begin:/\(/,end:/(?=\))/,excludeBegin:!0,endsParent:!0,
-keywords:r}]},u=[d,{variants:[{match:[/class\s+/,i,/\s+<\s+/,i]},{
-match:[/class\s+/,i]}],scope:{2:"title.class",4:"title.class.inherited"},
-keywords:r},{relevance:0,match:[i,/\.new[ (]/],scope:{1:"title.class"}},{
-relevance:0,match:/\b[A-Z][A-Z_0-9]+\b/,className:"variable.constant"},{
+keywords:t}]},u=[d,{variants:[{match:[/class\s+/,i,/\s+<\s+/,i]},{
+match:[/\b(class|module)\s+/,i]}],scope:{2:"title.class",
+4:"title.class.inherited"},keywords:t},{match:[/(include|extend)\s+/,i],scope:{
+2:"title.class"},keywords:t},{relevance:0,match:[i,/\.new[. (]/],scope:{
+1:"title.class"}},{relevance:0,match:/\b[A-Z][A-Z_0-9]+\b/,
+className:"variable.constant"},{relevance:0,match:s,scope:"title.class"},{
 match:[/def/,/\s+/,a],scope:{1:"keyword",3:"title.function"},contains:[_]},{
 begin:e.IDENT_RE+"::"},{className:"symbol",
 begin:e.UNDERSCORE_IDENT_RE+"(!|\\?)?:",relevance:0},{className:"symbol",
-begin:":(?!\\s)",contains:[d,{begin:a}],relevance:0},o,{className:"variable",
+begin:":(?!\\s)",contains:[d,{begin:a}],relevance:0},g,{className:"variable",
 begin:"(\\$\\W)|((\\$|@@?)(\\w+))(?=[^@$?])(?![A-Za-z])(?![@$?'])"},{
 className:"params",begin:/\|/,end:/\|/,excludeBegin:!0,excludeEnd:!0,
-relevance:0,keywords:r},{begin:"("+e.RE_STARTERS_RE+"|unless)\\s*",
+relevance:0,keywords:t},{begin:"("+e.RE_STARTERS_RE+"|unless)\\s*",
 keywords:"unless",contains:[{className:"regexp",contains:[e.BACKSLASH_ESCAPE,l],
 illegal:/\n/,variants:[{begin:"/",end:"/[a-z]*"},{begin:/%r\{/,end:/\}[a-z]*/},{
 begin:"%r\\(",end:"\\)[a-z]*"},{begin:"%r!",end:"![a-z]*"},{begin:"%r\\[",
-end:"\\][a-z]*"}]}].concat(t,b),relevance:0}].concat(t,b)
-;l.contains=u,_.contains=u;const w=[{begin:/^\s*=>/,starts:{end:"$",contains:u}
+end:"\\][a-z]*"}]}].concat(r,b),relevance:0}].concat(r,b)
+;l.contains=u,_.contains=u;const m=[{begin:/^\s*=>/,starts:{end:"$",contains:u}
 },{className:"meta.prompt",
 begin:"^([>?]>|[\\w#]+\\(\\w+\\):\\d+:\\d+[>*]|(\\w+-)?\\d+\\.\\d+\\.\\d+(p\\d+)?[^\\d][^>]+>)(?=[ ])",
-starts:{end:"$",keywords:r,contains:u}}];return b.unshift(t),{name:"Ruby",
-aliases:["rb","gemspec","podspec","thor","irb"],keywords:r,illegal:/\/\*/,
-contains:[e.SHEBANG({binary:"ruby"})].concat(w).concat(b).concat(u)}}})()
+starts:{end:"$",keywords:t,contains:u}}];return b.unshift(r),{name:"Ruby",
+aliases:["rb","gemspec","podspec","thor","irb"],keywords:t,illegal:/\/\*/,
+contains:[e.SHEBANG({binary:"ruby"})].concat(m).concat(b).concat(u)}}})()
 ;hljs.registerLanguage("ruby",e)})();
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/ruleslanguage.min.js b/vendor/assets/javascripts/highlightjs/languages/ruleslanguage.min.js
index aad544b3745..06006021901 100644
--- a/vendor/assets/javascripts/highlightjs/languages/ruleslanguage.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/ruleslanguage.min.js
@@ -1,4 +1,4 @@
-/*! `ruleslanguage` grammar compiled for Highlight.js 11.6.0 */
+/*! `ruleslanguage` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var T=(()=>{"use strict";return T=>({name:"Oracle Rules Language",
 keywords:{
 keyword:"BILL_PERIOD BILL_START BILL_STOP RS_EFFECTIVE_START RS_EFFECTIVE_STOP RS_JURIS_CODE RS_OPCO_CODE INTDADDATTRIBUTE|5 INTDADDVMSG|5 INTDBLOCKOP|5 INTDBLOCKOPNA|5 INTDCLOSE|5 INTDCOUNT|5 INTDCOUNTSTATUSCODE|5 INTDCREATEMASK|5 INTDCREATEDAYMASK|5 INTDCREATEFACTORMASK|5 INTDCREATEHANDLE|5 INTDCREATEOVERRIDEDAYMASK|5 INTDCREATEOVERRIDEMASK|5 INTDCREATESTATUSCODEMASK|5 INTDCREATETOUPERIOD|5 INTDDELETE|5 INTDDIPTEST|5 INTDEXPORT|5 INTDGETERRORCODE|5 INTDGETERRORMESSAGE|5 INTDISEQUAL|5 INTDJOIN|5 INTDLOAD|5 INTDLOADACTUALCUT|5 INTDLOADDATES|5 INTDLOADHIST|5 INTDLOADLIST|5 INTDLOADLISTDATES|5 INTDLOADLISTENERGY|5 INTDLOADLISTHIST|5 INTDLOADRELATEDCHANNEL|5 INTDLOADSP|5 INTDLOADSTAGING|5 INTDLOADUOM|5 INTDLOADUOMDATES|5 INTDLOADUOMHIST|5 INTDLOADVERSION|5 INTDOPEN|5 INTDREADFIRST|5 INTDREADNEXT|5 INTDRECCOUNT|5 INTDRELEASE|5 INTDREPLACE|5 INTDROLLAVG|5 INTDROLLPEAK|5 INTDSCALAROP|5 INTDSCALE|5 INTDSETATTRIBUTE|5 INTDSETDSTPARTICIPANT|5 INTDSETSTRING|5 INTDSETVALUE|5 INTDSETVALUESTATUS|5 INTDSHIFTSTARTTIME|5 INTDSMOOTH|5 INTDSORT|5 INTDSPIKETEST|5 INTDSUBSET|5 INTDTOU|5 INTDTOURELEASE|5 INTDTOUVALUE|5 INTDUPDATESTATS|5 INTDVALUE|5 STDEV INTDDELETEEX|5 INTDLOADEXACTUAL|5 INTDLOADEXCUT|5 INTDLOADEXDATES|5 INTDLOADEX|5 INTDLOADEXRELATEDCHANNEL|5 INTDSAVEEX|5 MVLOAD|5 MVLOADACCT|5 MVLOADACCTDATES|5 MVLOADACCTHIST|5 MVLOADDATES|5 MVLOADHIST|5 MVLOADLIST|5 MVLOADLISTDATES|5 MVLOADLISTHIST|5 IF FOR NEXT DONE SELECT END CALL ABORT CLEAR CHANNEL FACTOR LIST NUMBER OVERRIDE SET WEEK DISTRIBUTIONNODE ELSE WHEN THEN OTHERWISE IENUM CSV INCLUDE LEAVE RIDER SAVE DELETE NOVALUE SECTION WARN SAVE_UPDATE DETERMINANT LABEL REPORT REVENUE EACH IN FROM TOTAL CHARGE BLOCK AND OR CSV_FILE RATE_CODE AUXILIARY_DEMAND UIDACCOUNT RS BILL_PERIOD_SELECT HOURS_PER_MONTH INTD_ERROR_STOP SEASON_SCHEDULE_NAME ACCOUNTFACTOR ARRAYUPPERBOUND CALLSTOREDPROC GETADOCONNECTION GETCONNECT GETDATASOURCE GETQUALIFIER GETUSERID HASVALUE LISTCOUNT LISTOP LISTUPDATE LISTVALUE PRORATEFACTOR RSPRORATE SETBINPATH SETDBMONITOR WQ_OPEN BILLINGHOURS DATE DATEFROMFLOAT DATETIMEFROMSTRING DATETIMETOSTRING DATETOFLOAT DAY DAYDIFF DAYNAME DBDATETIME HOUR MINUTE MONTH MONTHDIFF MONTHHOURS MONTHNAME ROUNDDATE SAMEWEEKDAYLASTYEAR SECOND WEEKDAY WEEKDIFF YEAR YEARDAY YEARSTR COMPSUM HISTCOUNT HISTMAX HISTMIN HISTMINNZ HISTVALUE MAXNRANGE MAXRANGE MINRANGE COMPIKVA COMPKVA COMPKVARFROMKQKW COMPLF IDATTR FLAG LF2KW LF2KWH MAXKW POWERFACTOR READING2USAGE AVGSEASON MAXSEASON MONTHLYMERGE SEASONVALUE SUMSEASON ACCTREADDATES ACCTTABLELOAD CONFIGADD CONFIGGET CREATEOBJECT CREATEREPORT EMAILCLIENT EXPBLKMDMUSAGE EXPMDMUSAGE EXPORT_USAGE FACTORINEFFECT GETUSERSPECIFIEDSTOP INEFFECT ISHOLIDAY RUNRATE SAVE_PROFILE SETREPORTTITLE USEREXIT WATFORRUNRATE TO TABLE ACOS ASIN ATAN ATAN2 BITAND CEIL COS COSECANT COSH COTANGENT DIVQUOT DIVREM EXP FABS FLOOR FMOD FREPM FREXPN LOG LOG10 MAX MAXN MIN MINNZ MODF POW ROUND ROUND2VALUE ROUNDINT SECANT SIN SINH SQROOT TAN TANH FLOAT2STRING FLOAT2STRINGNC INSTR LEFT LEN LTRIM MID RIGHT RTRIM STRING STRINGNC TOLOWER TOUPPER TRIM NUMDAYS READ_DATE STAGING",
diff --git a/vendor/assets/javascripts/highlightjs/languages/rust.min.js b/vendor/assets/javascripts/highlightjs/languages/rust.min.js
index b3ad7e112f8..af0cfa31283 100644
--- a/vendor/assets/javascripts/highlightjs/languages/rust.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/rust.min.js
@@ -1,4 +1,4 @@
-/*! `rust` grammar compiled for Highlight.js 11.6.0 */
+/*! `rust` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const t=e.regex,a={
 className:"title.function.invoke",relevance:0,
 begin:t.concat(/\b/,/(?!let\b)/,e.IDENT_RE,t.lookahead(/\s*\(/))
diff --git a/vendor/assets/javascripts/highlightjs/languages/sas.min.js b/vendor/assets/javascripts/highlightjs/languages/sas.min.js
index 6c518c75ebe..5da71278a42 100644
--- a/vendor/assets/javascripts/highlightjs/languages/sas.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/sas.min.js
@@ -1,4 +1,4 @@
-/*! `sas` grammar compiled for Highlight.js 11.6.0 */
+/*! `sas` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const t=e.regex;return{name:"SAS",
 case_insensitive:!0,keywords:{
 literal:["null","missing","_all_","_automatic_","_character_","_infile_","_n_","_name_","_null_","_numeric_","_user_","_webout_"],
diff --git a/vendor/assets/javascripts/highlightjs/languages/scala.min.js b/vendor/assets/javascripts/highlightjs/languages/scala.min.js
index 99841b2e5c1..a5b773d7127 100644
--- a/vendor/assets/javascripts/highlightjs/languages/scala.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/scala.min.js
@@ -1,4 +1,4 @@
-/*! `scala` grammar compiled for Highlight.js 11.6.0 */
+/*! `scala` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const n=e.regex,a={className:"subst",
 variants:[{begin:"\\$[A-Za-z0-9_]+"},{begin:/\$\{/,end:/\}/}]},s={
 className:"string",variants:[{begin:'"""',end:'"""'},{begin:'"',end:'"',
diff --git a/vendor/assets/javascripts/highlightjs/languages/scheme.min.js b/vendor/assets/javascripts/highlightjs/languages/scheme.min.js
index 19bc0c9f8cd..410346191fd 100644
--- a/vendor/assets/javascripts/highlightjs/languages/scheme.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/scheme.min.js
@@ -1,19 +1,20 @@
-/*! `scheme` grammar compiled for Highlight.js 11.6.0 */
+/*! `scheme` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
-const t="[^\\(\\)\\[\\]\\{\\}\",'`;#|\\\\\\s]+",n={$pattern:t,
+const t="[^\\(\\)\\[\\]\\{\\}\",'`;#|\\\\\\s]+",n="(-|\\+)?\\d+([./]\\d+)?",r={
+$pattern:t,
 built_in:"case-lambda call/cc class define-class exit-handler field import inherit init-field interface let*-values let-values let/ec mixin opt-lambda override protect provide public rename require require-for-syntax syntax syntax-case syntax-error unit/sig unless when with-syntax and begin call-with-current-continuation call-with-input-file call-with-output-file case cond define define-syntax delay do dynamic-wind else for-each if lambda let let* let-syntax letrec letrec-syntax map or syntax-rules ' * + , ,@ - ... / ; < <= = => > >= ` abs acos angle append apply asin assoc assq assv atan boolean? caar cadr call-with-input-file call-with-output-file call-with-values car cdddar cddddr cdr ceiling char->integer char-alphabetic? char-ci<=? char-ci<? char-ci=? char-ci>=? char-ci>? char-downcase char-lower-case? char-numeric? char-ready? char-upcase char-upper-case? char-whitespace? char<=? char<? char=? char>=? char>? char? close-input-port close-output-port complex? cons cos current-input-port current-output-port denominator display eof-object? eq? equal? eqv? eval even? exact->inexact exact? exp expt floor force gcd imag-part inexact->exact inexact? input-port? integer->char integer? interaction-environment lcm length list list->string list->vector list-ref list-tail list? load log magnitude make-polar make-rectangular make-string make-vector max member memq memv min modulo negative? newline not null-environment null? number->string number? numerator odd? open-input-file open-output-file output-port? pair? peek-char port? positive? procedure? quasiquote quote quotient rational? rationalize read read-char real-part real? remainder reverse round scheme-report-environment set! set-car! set-cdr! sin sqrt string string->list string->number string->symbol string-append string-ci<=? string-ci<? string-ci=? string-ci>=? string-ci>? string-copy string-fill! string-length string-ref string-set! string<=? string<? string=? string>=? string>? string? substring symbol->string symbol? tan transcript-off transcript-on truncate values vector vector->list vector-fill! vector-length vector-ref vector-set! with-input-from-file with-output-to-file write write-char zero?"
-},r={className:"literal",begin:"(#t|#f|#\\\\"+t+"|#\\\\.)"},a={
-className:"number",variants:[{begin:"(-|\\+)?\\d+([./]\\d+)?",relevance:0},{
-begin:"(-|\\+)?\\d+([./]\\d+)?[+\\-](-|\\+)?\\d+([./]\\d+)?i",relevance:0},{
-begin:"#b[0-1]+(/[0-1]+)?"},{begin:"#o[0-7]+(/[0-7]+)?"},{
-begin:"#x[0-9a-f]+(/[0-9a-f]+)?"}]},i=e.QUOTE_STRING_MODE,c=[e.COMMENT(";","$",{
-relevance:0}),e.COMMENT("#\\|","\\|#")],s={begin:t,relevance:0},l={
-className:"symbol",begin:"'"+t},o={endsWithParent:!0,relevance:0},g={variants:[{
+},a={className:"literal",begin:"(#t|#f|#\\\\"+t+"|#\\\\.)"},i={
+className:"number",variants:[{begin:n,relevance:0},{begin:n+"[+\\-]"+n+"i",
+relevance:0},{begin:"#b[0-1]+(/[0-1]+)?"},{begin:"#o[0-7]+(/[0-7]+)?"},{
+begin:"#x[0-9a-f]+(/[0-9a-f]+)?"}]},c=e.QUOTE_STRING_MODE,s=[e.COMMENT(";","$",{
+relevance:0}),e.COMMENT("#\\|","\\|#")],l={begin:t,relevance:0},o={
+className:"symbol",begin:"'"+t},g={endsWithParent:!0,relevance:0},u={variants:[{
 begin:/'/},{begin:"`"}],contains:[{begin:"\\(",end:"\\)",
-contains:["self",r,i,a,s,l]}]},u={className:"name",relevance:0,begin:t,
-keywords:n},d={variants:[{begin:"\\(",end:"\\)"},{begin:"\\[",end:"\\]"}],
-contains:[{begin:/lambda/,endsWithParent:!0,returnBegin:!0,contains:[u,{
+contains:["self",a,c,i,l,o]}]},d={className:"name",relevance:0,begin:t,
+keywords:r},p={variants:[{begin:"\\(",end:"\\)"},{begin:"\\[",end:"\\]"}],
+contains:[{begin:/lambda/,endsWithParent:!0,returnBegin:!0,contains:[d,{
 endsParent:!0,variants:[{begin:/\(/,end:/\)/},{begin:/\[/,end:/\]/}],
-contains:[s]}]},u,o]};return o.contains=[r,a,i,s,l,g,d].concat(c),{
-name:"Scheme",illegal:/\S/,contains:[e.SHEBANG(),a,i,l,g,d].concat(c)}}})()
+contains:[l]}]},d,g]};return g.contains=[a,i,c,l,o,u,p].concat(s),{
+name:"Scheme",aliases:["scm"],illegal:/\S/,
+contains:[e.SHEBANG(),i,c,o,u,p].concat(s)}}})()
 ;hljs.registerLanguage("scheme",e)})();
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/scilab.min.js b/vendor/assets/javascripts/highlightjs/languages/scilab.min.js
index c1e6bae0725..387e552a87f 100644
--- a/vendor/assets/javascripts/highlightjs/languages/scilab.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/scilab.min.js
@@ -1,4 +1,4 @@
-/*! `scilab` grammar compiled for Highlight.js 11.6.0 */
+/*! `scilab` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const n=[e.C_NUMBER_MODE,{
 className:"string",begin:"'|\"",end:"'|\"",contains:[e.BACKSLASH_ESCAPE,{
 begin:"''"}]}];return{name:"Scilab",aliases:["sci"],keywords:{$pattern:/%?\w+/,
diff --git a/vendor/assets/javascripts/highlightjs/languages/scss.min.js b/vendor/assets/javascripts/highlightjs/languages/scss.min.js
index 3f9f2ce3c19..1f90ddee57d 100644
--- a/vendor/assets/javascripts/highlightjs/languages/scss.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/scss.min.js
@@ -1,4 +1,4 @@
-/*! `scss` grammar compiled for Highlight.js 11.6.0 */
+/*! `scss` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict"
 ;const e=["a","abbr","address","article","aside","audio","b","blockquote","body","button","canvas","caption","cite","code","dd","del","details","dfn","div","dl","dt","em","fieldset","figcaption","figure","footer","form","h1","h2","h3","h4","h5","h6","header","hgroup","html","i","iframe","img","input","ins","kbd","label","legend","li","main","mark","menu","nav","object","ol","p","q","quote","samp","section","span","strong","summary","sup","table","tbody","td","textarea","tfoot","th","thead","time","tr","ul","var","video"],r=["any-hover","any-pointer","aspect-ratio","color","color-gamut","color-index","device-aspect-ratio","device-height","device-width","display-mode","forced-colors","grid","height","hover","inverted-colors","monochrome","orientation","overflow-block","overflow-inline","pointer","prefers-color-scheme","prefers-contrast","prefers-reduced-motion","prefers-reduced-transparency","resolution","scan","scripting","update","width","min-width","max-width","min-height","max-height"],i=["active","any-link","blank","checked","current","default","defined","dir","disabled","drop","empty","enabled","first","first-child","first-of-type","fullscreen","future","focus","focus-visible","focus-within","has","host","host-context","hover","indeterminate","in-range","invalid","is","lang","last-child","last-of-type","left","link","local-link","not","nth-child","nth-col","nth-last-child","nth-last-col","nth-last-of-type","nth-of-type","only-child","only-of-type","optional","out-of-range","past","placeholder-shown","read-only","read-write","required","right","root","scope","target","target-within","user-invalid","valid","visited","where"],t=["after","backdrop","before","cue","cue-region","first-letter","first-line","grammar-error","marker","part","placeholder","selection","slotted","spelling-error"],o=["align-content","align-items","align-self","all","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","backface-visibility","background","background-attachment","background-blend-mode","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","block-size","border","border-block","border-block-color","border-block-end","border-block-end-color","border-block-end-style","border-block-end-width","border-block-start","border-block-start-color","border-block-start-style","border-block-start-width","border-block-style","border-block-width","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-inline","border-inline-color","border-inline-end","border-inline-end-color","border-inline-end-style","border-inline-end-width","border-inline-start","border-inline-start-color","border-inline-start-style","border-inline-start-width","border-inline-style","border-inline-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","caret-color","clear","clip","clip-path","clip-rule","color","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","contain","content","content-visibility","counter-increment","counter-reset","cue","cue-after","cue-before","cursor","direction","display","empty-cells","filter","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","flow","font","font-display","font-family","font-feature-settings","font-kerning","font-language-override","font-size","font-size-adjust","font-smoothing","font-stretch","font-style","font-synthesis","font-variant","font-variant-caps","font-variant-east-asian","font-variant-ligatures","font-variant-numeric","font-variant-position","font-variation-settings","font-weight","gap","glyph-orientation-vertical","grid","grid-area","grid-auto-columns","grid-auto-flow","grid-auto-rows","grid-column","grid-column-end","grid-column-start","grid-gap","grid-row","grid-row-end","grid-row-start","grid-template","grid-template-areas","grid-template-columns","grid-template-rows","hanging-punctuation","height","hyphens","icon","image-orientation","image-rendering","image-resolution","ime-mode","inline-size","isolation","justify-content","left","letter-spacing","line-break","line-height","list-style","list-style-image","list-style-position","list-style-type","margin","margin-block","margin-block-end","margin-block-start","margin-bottom","margin-inline","margin-inline-end","margin-inline-start","margin-left","margin-right","margin-top","marks","mask","mask-border","mask-border-mode","mask-border-outset","mask-border-repeat","mask-border-slice","mask-border-source","mask-border-width","mask-clip","mask-composite","mask-image","mask-mode","mask-origin","mask-position","mask-repeat","mask-size","mask-type","max-block-size","max-height","max-inline-size","max-width","min-block-size","min-height","min-inline-size","min-width","mix-blend-mode","nav-down","nav-index","nav-left","nav-right","nav-up","none","normal","object-fit","object-position","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-wrap","overflow-x","overflow-y","padding","padding-block","padding-block-end","padding-block-start","padding-bottom","padding-inline","padding-inline-end","padding-inline-start","padding-left","padding-right","padding-top","page-break-after","page-break-before","page-break-inside","pause","pause-after","pause-before","perspective","perspective-origin","pointer-events","position","quotes","resize","rest","rest-after","rest-before","right","row-gap","scroll-margin","scroll-margin-block","scroll-margin-block-end","scroll-margin-block-start","scroll-margin-bottom","scroll-margin-inline","scroll-margin-inline-end","scroll-margin-inline-start","scroll-margin-left","scroll-margin-right","scroll-margin-top","scroll-padding","scroll-padding-block","scroll-padding-block-end","scroll-padding-block-start","scroll-padding-bottom","scroll-padding-inline","scroll-padding-inline-end","scroll-padding-inline-start","scroll-padding-left","scroll-padding-right","scroll-padding-top","scroll-snap-align","scroll-snap-stop","scroll-snap-type","scrollbar-color","scrollbar-gutter","scrollbar-width","shape-image-threshold","shape-margin","shape-outside","speak","speak-as","src","tab-size","table-layout","text-align","text-align-all","text-align-last","text-combine-upright","text-decoration","text-decoration-color","text-decoration-line","text-decoration-style","text-emphasis","text-emphasis-color","text-emphasis-position","text-emphasis-style","text-indent","text-justify","text-orientation","text-overflow","text-rendering","text-shadow","text-transform","text-underline-position","top","transform","transform-box","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","vertical-align","visibility","voice-balance","voice-duration","voice-family","voice-pitch","voice-range","voice-rate","voice-stress","voice-volume","white-space","widows","width","will-change","word-break","word-spacing","word-wrap","writing-mode","z-index"].reverse()
 ;return n=>{const a=(e=>({IMPORTANT:{scope:"meta",begin:"!important"},
diff --git a/vendor/assets/javascripts/highlightjs/languages/shell.min.js b/vendor/assets/javascripts/highlightjs/languages/shell.min.js
index 379e2bd2914..a8846fbb868 100644
--- a/vendor/assets/javascripts/highlightjs/languages/shell.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/shell.min.js
@@ -1,4 +1,4 @@
-/*! `shell` grammar compiled for Highlight.js 11.6.0 */
+/*! `shell` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var s=(()=>{"use strict";return s=>({name:"Shell Session",
 aliases:["console","shellsession"],contains:[{className:"meta.prompt",
 begin:/^\s{0,3}[/~\w\d[\]()@-]*[>%$#][ ]?/,starts:{end:/[^\\](?=\s*$)/,
diff --git a/vendor/assets/javascripts/highlightjs/languages/smali.min.js b/vendor/assets/javascripts/highlightjs/languages/smali.min.js
index 1e424e7df70..d28f174029f 100644
--- a/vendor/assets/javascripts/highlightjs/languages/smali.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/smali.min.js
@@ -1,4 +1,4 @@
-/*! `smali` grammar compiled for Highlight.js 11.6.0 */
+/*! `smali` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const n=["add","and","cmp","cmpg","cmpl","const","div","double","float","goto","if","int","long","move","mul","neg","new","nop","not","or","rem","return","shl","shr","sput","sub","throw","ushr","xor"]
 ;return{name:"Smali",contains:[{className:"string",begin:'"',end:'"',relevance:0
diff --git a/vendor/assets/javascripts/highlightjs/languages/smalltalk.min.js b/vendor/assets/javascripts/highlightjs/languages/smalltalk.min.js
index d4a9678c186..e7b95460d2a 100644
--- a/vendor/assets/javascripts/highlightjs/languages/smalltalk.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/smalltalk.min.js
@@ -1,4 +1,4 @@
-/*! `smalltalk` grammar compiled for Highlight.js 11.6.0 */
+/*! `smalltalk` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const n="[a-z][a-zA-Z0-9_]*",a={
 className:"string",begin:"\\$.{1}"},s={className:"symbol",
 begin:"#"+e.UNDERSCORE_IDENT_RE};return{name:"Smalltalk",aliases:["st"],
diff --git a/vendor/assets/javascripts/highlightjs/languages/sml.min.js b/vendor/assets/javascripts/highlightjs/languages/sml.min.js
index 54a69790baa..6900d5b3f53 100644
--- a/vendor/assets/javascripts/highlightjs/languages/sml.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/sml.min.js
@@ -1,4 +1,4 @@
-/*! `sml` grammar compiled for Highlight.js 11.6.0 */
+/*! `sml` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"SML (Standard ML)",
 aliases:["ml"],keywords:{$pattern:"[a-z_]\\w*!?",
 keyword:"abstype and andalso as case datatype do else end eqtype exception fn fun functor handle if in include infix infixr let local nonfix of op open orelse raise rec sharing sig signature struct structure then type val with withtype where while",
diff --git a/vendor/assets/javascripts/highlightjs/languages/sqf.min.js b/vendor/assets/javascripts/highlightjs/languages/sqf.min.js
index f55c6ee9266..b891a179c5a 100644
--- a/vendor/assets/javascripts/highlightjs/languages/sqf.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/sqf.min.js
@@ -1,17 +1,17 @@
-/*! `sqf` grammar compiled for Highlight.js 11.6.0 */
+/*! `sqf` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const t={className:"string",
 variants:[{begin:'"',end:'"',contains:[{begin:'""',relevance:0}]},{begin:"'",
 end:"'",contains:[{begin:"''",relevance:0}]}]},a={className:"meta",
-begin:/#\s*[a-z]+\b/,end:/$/,keywords:{
-keyword:"define undef ifdef ifndef else endif include"},contains:[{begin:/\\\n/,
-relevance:0},e.inherit(t,{className:"string"}),{className:"string",
-begin:/<[^\n>]*>/,end:/$/,illegal:"\\n"
-},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]};return{name:"SQF",
-case_insensitive:!0,keywords:{
-keyword:["case","catch","default","do","else","exit","exitWith","for","forEach","from","if","private","switch","then","throw","to","try","waitUntil","while","with"],
-built_in:["abs","accTime","acos","action","actionIDs","actionKeys","actionKeysImages","actionKeysNames","actionKeysNamesArray","actionName","actionParams","activateAddons","activatedAddons","activateKey","add3DENConnection","add3DENEventHandler","add3DENLayer","addAction","addBackpack","addBackpackCargo","addBackpackCargoGlobal","addBackpackGlobal","addBinocularItem","addCamShake","addCuratorAddons","addCuratorCameraArea","addCuratorEditableObjects","addCuratorEditingArea","addCuratorPoints","addEditorObject","addEventHandler","addForce","addForceGeneratorRTD","addGoggles","addGroupIcon","addHandgunItem","addHeadgear","addItem","addItemCargo","addItemCargoGlobal","addItemPool","addItemToBackpack","addItemToUniform","addItemToVest","addLiveStats","addMagazine","addMagazineAmmoCargo","addMagazineCargo","addMagazineCargoGlobal","addMagazineGlobal","addMagazinePool","addMagazines","addMagazineTurret","addMenu","addMenuItem","addMissionEventHandler","addMPEventHandler","addMusicEventHandler","addonFiles","addOwnedMine","addPlayerScores","addPrimaryWeaponItem","addPublicVariableEventHandler","addRating","addResources","addScore","addScoreSide","addSecondaryWeaponItem","addSwitchableUnit","addTeamMember","addToRemainsCollector","addTorque","addUniform","addVehicle","addVest","addWaypoint","addWeapon","addWeaponCargo","addWeaponCargoGlobal","addWeaponGlobal","addWeaponItem","addWeaponPool","addWeaponTurret","addWeaponWithAttachmentsCargo","addWeaponWithAttachmentsCargoGlobal","admin","agent","agents","AGLToASL","aimedAtTarget","aimPos","airDensityCurveRTD","airDensityRTD","airplaneThrottle","airportSide","AISFinishHeal","alive","all3DENEntities","allActiveTitleEffects","allAddonsInfo","allAirports","allControls","allCurators","allCutLayers","allDead","allDeadMen","allDiarySubjects","allDisplays","allGroups","allMapMarkers","allMines","allMissionObjects","allow3DMode","allowCrewInImmobile","allowCuratorLogicIgnoreAreas","allowDamage","allowDammage","allowFileOperations","allowFleeing","allowGetIn","allowSprint","allPlayers","allSimpleObjects","allSites","allTurrets","allUnits","allUnitsUAV","allVariables","ammo","ammoOnPylon","and","animate","animateBay","animateDoor","animatePylon","animateSource","animationNames","animationPhase","animationSourcePhase","animationState","apertureParams","append","apply","armoryPoints","arrayIntersect","asin","ASLToAGL","ASLToATL","assert","assignAsCargo","assignAsCargoIndex","assignAsCommander","assignAsDriver","assignAsGunner","assignAsTurret","assignCurator","assignedCargo","assignedCommander","assignedDriver","assignedGunner","assignedItems","assignedTarget","assignedTeam","assignedVehicle","assignedVehicleRole","assignItem","assignTeam","assignToAirport","atan","atan2","atg","ATLToASL","attachedObject","attachedObjects","attachedTo","attachObject","attachTo","attackEnabled","backpack","backpackCargo","backpackContainer","backpackItems","backpackMagazines","backpackSpaceFor","batteryChargeRTD","behaviour","benchmark","bezierInterpolation","binocular","binocularItems","binocularMagazine","boundingBox","boundingBoxReal","boundingCenter","break","breakOut","breakTo","breakWith","briefingName","buildingExit","buildingPos","buldozer_EnableRoadDiag","buldozer_IsEnabledRoadDiag","buldozer_LoadNewRoads","buldozer_reloadOperMap","buttonAction","buttonSetAction","cadetMode","calculatePath","calculatePlayerVisibilityByFriendly","call","callExtension","camCommand","camCommit","camCommitPrepared","camCommitted","camConstuctionSetParams","camCreate","camDestroy","cameraEffect","cameraEffectEnableHUD","cameraInterest","cameraOn","cameraView","campaignConfigFile","camPreload","camPreloaded","camPrepareBank","camPrepareDir","camPrepareDive","camPrepareFocus","camPrepareFov","camPrepareFovRange","camPreparePos","camPrepareRelPos","camPrepareTarget","camSetBank","camSetDir","camSetDive","camSetFocus","camSetFov","camSetFovRange","camSetPos","camSetRelPos","camSetTarget","camTarget","camUseNVG","canAdd","canAddItemToBackpack","canAddItemToUniform","canAddItemToVest","cancelSimpleTaskDestination","canFire","canMove","canSlingLoad","canStand","canSuspend","canTriggerDynamicSimulation","canUnloadInCombat","canVehicleCargo","captive","captiveNum","cbChecked","cbSetChecked","ceil","channelEnabled","cheatsEnabled","checkAIFeature","checkVisibility","className","clear3DENAttribute","clear3DENInventory","clearAllItemsFromBackpack","clearBackpackCargo","clearBackpackCargoGlobal","clearForcesRTD","clearGroupIcons","clearItemCargo","clearItemCargoGlobal","clearItemPool","clearMagazineCargo","clearMagazineCargoGlobal","clearMagazinePool","clearOverlay","clearRadio","clearVehicleInit","clearWeaponCargo","clearWeaponCargoGlobal","clearWeaponPool","clientOwner","closeDialog","closeDisplay","closeOverlay","collapseObjectTree","collect3DENHistory","collectiveRTD","combatBehaviour","combatMode","commandArtilleryFire","commandChat","commander","commandFire","commandFollow","commandFSM","commandGetOut","commandingMenu","commandMove","commandRadio","commandStop","commandSuppressiveFire","commandTarget","commandWatch","comment","commitOverlay","compile","compileFinal","compileScript","completedFSM","composeText","configClasses","configFile","configHierarchy","configName","configOf","configProperties","configSourceAddonList","configSourceMod","configSourceModList","confirmSensorTarget","connectTerminalToUAV","connectToServer","continue","continueWith","controlsGroupCtrl","copyFromClipboard","copyToClipboard","copyWaypoints","cos","count","countEnemy","countFriendly","countSide","countType","countUnknown","create3DENComposition","create3DENEntity","createAgent","createCenter","createDialog","createDiaryLink","createDiaryRecord","createDiarySubject","createDisplay","createGearDialog","createGroup","createGuardedPoint","createHashMap","createHashMapFromArray","createLocation","createMarker","createMarkerLocal","createMenu","createMine","createMissionDisplay","createMPCampaignDisplay","createSimpleObject","createSimpleTask","createSite","createSoundSource","createTarget","createTask","createTeam","createTrigger","createUnit","createVehicle","createVehicleCrew","createVehicleLocal","crew","ctAddHeader","ctAddRow","ctClear","ctCurSel","ctData","ctFindHeaderRows","ctFindRowHeader","ctHeaderControls","ctHeaderCount","ctRemoveHeaders","ctRemoveRows","ctrlActivate","ctrlAddEventHandler","ctrlAngle","ctrlAnimateModel","ctrlAnimationPhaseModel","ctrlAutoScrollDelay","ctrlAutoScrollRewind","ctrlAutoScrollSpeed","ctrlChecked","ctrlClassName","ctrlCommit","ctrlCommitted","ctrlCreate","ctrlDelete","ctrlEnable","ctrlEnabled","ctrlFade","ctrlFontHeight","ctrlHTMLLoaded","ctrlIDC","ctrlIDD","ctrlMapAnimAdd","ctrlMapAnimClear","ctrlMapAnimCommit","ctrlMapAnimDone","ctrlMapCursor","ctrlMapMouseOver","ctrlMapScale","ctrlMapScreenToWorld","ctrlMapWorldToScreen","ctrlModel","ctrlModelDirAndUp","ctrlModelScale","ctrlMousePosition","ctrlParent","ctrlParentControlsGroup","ctrlPosition","ctrlRemoveAllEventHandlers","ctrlRemoveEventHandler","ctrlScale","ctrlScrollValues","ctrlSetActiveColor","ctrlSetAngle","ctrlSetAutoScrollDelay","ctrlSetAutoScrollRewind","ctrlSetAutoScrollSpeed","ctrlSetBackgroundColor","ctrlSetChecked","ctrlSetDisabledColor","ctrlSetEventHandler","ctrlSetFade","ctrlSetFocus","ctrlSetFont","ctrlSetFontH1","ctrlSetFontH1B","ctrlSetFontH2","ctrlSetFontH2B","ctrlSetFontH3","ctrlSetFontH3B","ctrlSetFontH4","ctrlSetFontH4B","ctrlSetFontH5","ctrlSetFontH5B","ctrlSetFontH6","ctrlSetFontH6B","ctrlSetFontHeight","ctrlSetFontHeightH1","ctrlSetFontHeightH2","ctrlSetFontHeightH3","ctrlSetFontHeightH4","ctrlSetFontHeightH5","ctrlSetFontHeightH6","ctrlSetFontHeightSecondary","ctrlSetFontP","ctrlSetFontPB","ctrlSetFontSecondary","ctrlSetForegroundColor","ctrlSetModel","ctrlSetModelDirAndUp","ctrlSetModelScale","ctrlSetMousePosition","ctrlSetPixelPrecision","ctrlSetPosition","ctrlSetPositionH","ctrlSetPositionW","ctrlSetPositionX","ctrlSetPositionY","ctrlSetScale","ctrlSetScrollValues","ctrlSetStructuredText","ctrlSetText","ctrlSetTextColor","ctrlSetTextColorSecondary","ctrlSetTextSecondary","ctrlSetTextSelection","ctrlSetTooltip","ctrlSetTooltipColorBox","ctrlSetTooltipColorShade","ctrlSetTooltipColorText","ctrlSetURL","ctrlShow","ctrlShown","ctrlStyle","ctrlText","ctrlTextColor","ctrlTextHeight","ctrlTextSecondary","ctrlTextSelection","ctrlTextWidth","ctrlTooltip","ctrlType","ctrlURL","ctrlVisible","ctRowControls","ctRowCount","ctSetCurSel","ctSetData","ctSetHeaderTemplate","ctSetRowTemplate","ctSetValue","ctValue","curatorAddons","curatorCamera","curatorCameraArea","curatorCameraAreaCeiling","curatorCoef","curatorEditableObjects","curatorEditingArea","curatorEditingAreaType","curatorMouseOver","curatorPoints","curatorRegisteredObjects","curatorSelected","curatorWaypointCost","current3DENOperation","currentChannel","currentCommand","currentMagazine","currentMagazineDetail","currentMagazineDetailTurret","currentMagazineTurret","currentMuzzle","currentNamespace","currentPilot","currentTask","currentTasks","currentThrowable","currentVisionMode","currentWaypoint","currentWeapon","currentWeaponMode","currentWeaponTurret","currentZeroing","cursorObject","cursorTarget","customChat","customRadio","customWaypointPosition","cutFadeOut","cutObj","cutRsc","cutText","damage","date","dateToNumber","daytime","deActivateKey","debriefingText","debugFSM","debugLog","decayGraphValues","deg","delete3DENEntities","deleteAt","deleteCenter","deleteCollection","deleteEditorObject","deleteGroup","deleteGroupWhenEmpty","deleteIdentity","deleteLocation","deleteMarker","deleteMarkerLocal","deleteRange","deleteResources","deleteSite","deleteStatus","deleteTarget","deleteTeam","deleteVehicle","deleteVehicleCrew","deleteWaypoint","detach","detectedMines","diag_activeMissionFSMs","diag_activeScripts","diag_activeSQSScripts","diag_captureFrameToFile","diag_captureSlowFrame","diag_deltaTime","diag_drawMode","diag_enable","diag_enabled","diag_fps","diag_fpsMin","diag_frameNo","diag_list","diag_mergeConfigFile","diag_scope","diag_activeSQFScripts","diag_allMissionEventHandlers","diag_captureFrame","diag_codePerformance","diag_dumpCalltraceToLog","diag_dumpTerrainSynth","diag_dynamicSimulationEnd","diag_exportConfig","diag_exportTerrainSVG","diag_lightNewLoad","diag_localized","diag_log","diag_logSlowFrame","diag_recordTurretLimits","diag_resetShapes","diag_setLightNew","diag_tickTime","diag_toggle","dialog","diaryRecordNull","diarySubjectExists","didJIP","didJIPOwner","difficulty","difficultyEnabled","difficultyEnabledRTD","difficultyOption","direction","directSay","disableAI","disableCollisionWith","disableConversation","disableDebriefingStats","disableMapIndicators","disableNVGEquipment","disableRemoteSensors","disableSerialization","disableTIEquipment","disableUAVConnectability","disableUserInput","displayAddEventHandler","displayCtrl","displayParent","displayRemoveAllEventHandlers","displayRemoveEventHandler","displaySetEventHandler","dissolveTeam","distance","distance2D","distanceSqr","distributionRegion","do3DENAction","doArtilleryFire","doFire","doFollow","doFSM","doGetOut","doMove","doorPhase","doStop","doSuppressiveFire","doTarget","doWatch","drawArrow","drawEllipse","drawIcon","drawIcon3D","drawLine","drawLine3D","drawLink","drawLocation","drawPolygon","drawRectangle","drawTriangle","driver","drop","dynamicSimulationDistance","dynamicSimulationDistanceCoef","dynamicSimulationEnabled","dynamicSimulationSystemEnabled","echo","edit3DENMissionAttributes","editObject","editorSetEventHandler","effectiveCommander","elevatePeriscope","emptyPositions","enableAI","enableAIFeature","enableAimPrecision","enableAttack","enableAudioFeature","enableAutoStartUpRTD","enableAutoTrimRTD","enableCamShake","enableCaustics","enableChannel","enableCollisionWith","enableCopilot","enableDebriefingStats","enableDiagLegend","enableDynamicSimulation","enableDynamicSimulationSystem","enableEndDialog","enableEngineArtillery","enableEnvironment","enableFatigue","enableGunLights","enableInfoPanelComponent","enableIRLasers","enableMimics","enablePersonTurret","enableRadio","enableReload","enableRopeAttach","enableSatNormalOnDetail","enableSaving","enableSentences","enableSimulation","enableSimulationGlobal","enableStamina","enableStressDamage","enableTeamSwitch","enableTraffic","enableUAVConnectability","enableUAVWaypoints","enableVehicleCargo","enableVehicleSensor","enableWeaponDisassembly","endLoadingScreen","endMission","enemy","engineOn","enginesIsOnRTD","enginesPowerRTD","enginesRpmRTD","enginesTorqueRTD","entities","environmentEnabled","environmentVolume","estimatedEndServerTime","estimatedTimeLeft","evalObjectArgument","everyBackpack","everyContainer","exec","execEditorScript","execFSM","execVM","exp","expectedDestination","exportJIPMessages","exportLandscapeXYZ","eyeDirection","eyePos","face","faction","fadeEnvironment","fadeMusic","fadeRadio","fadeSound","fadeSpeech","failMission","fileExists","fillWeaponsFromPool","find","findCover","findDisplay","findEditorObject","findEmptyPosition","findEmptyPositionReady","findIf","findNearestEnemy","finishMissionInit","finite","fire","fireAtTarget","firstBackpack","flag","flagAnimationPhase","flagOwner","flagSide","flagTexture","flatten","fleeing","floor","flyInHeight","flyInHeightASL","focusedCtrl","fog","fogForecast","fogParams","forceAddUniform","forceAtPositionRTD","forceCadetDifficulty","forcedMap","forceEnd","forceFlagTexture","forceFollowRoad","forceGeneratorRTD","forceMap","forceRespawn","forceSpeed","forceUnicode","forceWalk","forceWeaponFire","forceWeatherChange","forEachMember","forEachMemberAgent","forEachMemberTeam","forgetTarget","format","formation","formationDirection","formationLeader","formationMembers","formationPosition","formationTask","formatText","formLeader","freeLook","friendly","fromEditor","fuel","fullCrew","gearIDCAmmoCount","gearSlotAmmoCount","gearSlotData","get","get3DENActionState","get3DENAttribute","get3DENCamera","get3DENConnections","get3DENEntity","get3DENEntityID","get3DENGrid","get3DENIconsVisible","get3DENLayerEntities","get3DENLinesVisible","get3DENMissionAttribute","get3DENMouseOver","get3DENSelected","getAimingCoef","getAllEnvSoundControllers","getAllHitPointsDamage","getAllOwnedMines","getAllPylonsInfo","getAllSoundControllers","getAllUnitTraits","getAmmoCargo","getAnimAimPrecision","getAnimSpeedCoef","getArray","getArtilleryAmmo","getArtilleryComputerSettings","getArtilleryETA","getAssetDLCInfo","getAssignedCuratorLogic","getAssignedCuratorUnit","getAttackTarget","getAudioOptionVolumes","getBackpackCargo","getBleedingRemaining","getBurningValue","getCalculatePlayerVisibilityByFriendly","getCameraViewDirection","getCargoIndex","getCenterOfMass","getClientState","getClientStateNumber","getCompatiblePylonMagazines","getConnectedUAV","getContainerMaxLoad","getCursorObjectParams","getCustomAimCoef","getCustomSoundController","getCustomSoundControllerCount","getDammage","getDescription","getDir","getDirVisual","getDiverState","getDLCAssetsUsage","getDLCAssetsUsageByName","getDLCs","getDLCUsageTime","getEditorCamera","getEditorMode","getEditorObjectScope","getElevationOffset","getEnvSoundController","getFatigue","getFieldManualStartPage","getForcedFlagTexture","getFriend","getFSMVariable","getFuelCargo","getGraphValues","getGroupIcon","getGroupIconParams","getGroupIcons","getHideFrom","getHit","getHitIndex","getHitPointDamage","getItemCargo","getLighting","getLightingAt","getLoadedModsInfo","getMagazineCargo","getMarkerColor","getMarkerPos","getMarkerSize","getMarkerType","getMass","getMissionConfig","getMissionConfigValue","getMissionDLCs","getMissionLayerEntities","getMissionLayers","getMissionPath","getModelInfo","getMousePosition","getMusicPlayedTime","getNumber","getObjectArgument","getObjectChildren","getObjectDLC","getObjectFOV","getObjectMaterials","getObjectProxy","getObjectScale","getObjectTextures","getObjectType","getObjectViewDistance","getOrDefault","getOxygenRemaining","getPersonUsedDLCs","getPilotCameraDirection","getPilotCameraPosition","getPilotCameraRotation","getPilotCameraTarget","getPlateNumber","getPlayerChannel","getPlayerID","getPlayerScores","getPlayerUID","getPlayerUIDOld","getPlayerVoNVolume","getPos","getPosASL","getPosASLVisual","getPosASLW","getPosATL","getPosATLVisual","getPosVisual","getPosWorld","getPosWorldVisual","getPylonMagazines","getRelDir","getRelPos","getRemoteSensorsDisabled","getRepairCargo","getResolution","getRoadInfo","getRotorBrakeRTD","getShadowDistance","getShotParents","getSlingLoad","getSoundController","getSoundControllerResult","getSpeed","getStamina","getStatValue","getSteamFriendsServers","getSubtitleOptions","getSuppression","getTerrainGrid","getTerrainHeightASL","getText","getTextRaw","getTextWidth","getTotalDLCUsageTime","getTrimOffsetRTD","getUnitLoadout","getUnitTrait","getUserMFDText","getUserMFDValue","getVariable","getVehicleCargo","getVehicleTIPars","getWeaponCargo","getWeaponSway","getWingsOrientationRTD","getWingsPositionRTD","getWorld","getWPPos","glanceAt","globalChat","globalRadio","goggles","goto","group","groupChat","groupFromNetId","groupIconSelectable","groupIconsVisible","groupId","groupOwner","groupRadio","groupSelectedUnits","groupSelectUnit","gunner","gusts","halt","handgunItems","handgunMagazine","handgunWeapon","handsHit","hasInterface","hasPilotCamera","hasWeapon","hcAllGroups","hcGroupParams","hcLeader","hcRemoveAllGroups","hcRemoveGroup","hcSelected","hcSelectGroup","hcSetGroup","hcShowBar","hcShownBar","headgear","hideBehindScripted","hideBody","hideObject","hideObjectGlobal","hideSelection","hierarchyObjectsCount","hint","hintC","hintCadet","hintSilent","hmd","hostMission","htmlLoad","HUDMovementLevels","humidity","image","importAllGroups","importance","in","inArea","inAreaArray","incapacitatedState","inflame","inflamed","infoPanel","infoPanelComponentEnabled","infoPanelComponents","infoPanels","inGameUISetEventHandler","inheritsFrom","initAmbientLife","inPolygon","inputAction","inRangeOfArtillery","insert","insertEditorObject","intersect","is3DEN","is3DENMultiplayer","is3DENPreview","isAbleToBreathe","isActionMenuVisible","isAgent","isAimPrecisionEnabled","isArray","isAutoHoverOn","isAutonomous","isAutoStartUpEnabledRTD","isAutotest","isAutoTrimOnRTD","isBleeding","isBurning","isClass","isCollisionLightOn","isCopilotEnabled","isDamageAllowed","isDedicated","isDLCAvailable","isEngineOn","isEqualTo","isEqualType","isEqualTypeAll","isEqualTypeAny","isEqualTypeArray","isEqualTypeParams","isFilePatchingEnabled","isFinal","isFlashlightOn","isFlatEmpty","isForcedWalk","isFormationLeader","isGameFocused","isGamePaused","isGroupDeletedWhenEmpty","isHidden","isHideBehindScripted","isInRemainsCollector","isInstructorFigureEnabled","isIRLaserOn","isKeyActive","isKindOf","isLaserOn","isLightOn","isLocalized","isManualFire","isMarkedForCollection","isMultiplayer","isMultiplayerSolo","isNil","isNotEqualTo","isNull","isNumber","isObjectHidden","isObjectRTD","isOnRoad","isPiPEnabled","isPlayer","isRealTime","isRemoteExecuted","isRemoteExecutedJIP","isSensorTargetConfirmed","isServer","isShowing3DIcons","isSimpleObject","isSprintAllowed","isStaminaEnabled","isSteamMission","isStreamFriendlyUIEnabled","isStressDamageEnabled","isText","isTouchingGround","isTurnedOut","isTutHintsEnabled","isUAVConnectable","isUAVConnected","isUIContext","isUniformAllowed","isVehicleCargo","isVehicleRadarOn","isVehicleSensorEnabled","isWalking","isWeaponDeployed","isWeaponRested","itemCargo","items","itemsWithMagazines","join","joinAs","joinAsSilent","joinSilent","joinString","kbAddDatabase","kbAddDatabaseTargets","kbAddTopic","kbHasTopic","kbReact","kbRemoveTopic","kbTell","kbWasSaid","keyImage","keyName","keys","knowsAbout","land","landAt","landResult","language","laserTarget","lbAdd","lbClear","lbColor","lbColorRight","lbCurSel","lbData","lbDelete","lbIsSelected","lbPicture","lbPictureRight","lbSelection","lbSetColor","lbSetColorRight","lbSetCurSel","lbSetData","lbSetPicture","lbSetPictureColor","lbSetPictureColorDisabled","lbSetPictureColorSelected","lbSetPictureRight","lbSetPictureRightColor","lbSetPictureRightColorDisabled","lbSetPictureRightColorSelected","lbSetSelectColor","lbSetSelectColorRight","lbSetSelected","lbSetText","lbSetTextRight","lbSetTooltip","lbSetValue","lbSize","lbSort","lbSortByValue","lbText","lbTextRight","lbValue","leader","leaderboardDeInit","leaderboardGetRows","leaderboardInit","leaderboardRequestRowsFriends","leaderboardRequestRowsGlobal","leaderboardRequestRowsGlobalAroundUser","leaderboardsRequestUploadScore","leaderboardsRequestUploadScoreKeepBest","leaderboardState","leaveVehicle","libraryCredits","libraryDisclaimers","lifeState","lightAttachObject","lightDetachObject","lightIsOn","lightnings","limitSpeed","linearConversion","lineIntersects","lineIntersectsObjs","lineIntersectsSurfaces","lineIntersectsWith","linkItem","list","listObjects","listRemoteTargets","listVehicleSensors","ln","lnbAddArray","lnbAddColumn","lnbAddRow","lnbClear","lnbColor","lnbColorRight","lnbCurSelRow","lnbData","lnbDeleteColumn","lnbDeleteRow","lnbGetColumnsPosition","lnbPicture","lnbPictureRight","lnbSetColor","lnbSetColorRight","lnbSetColumnsPos","lnbSetCurSelRow","lnbSetData","lnbSetPicture","lnbSetPictureColor","lnbSetPictureColorRight","lnbSetPictureColorSelected","lnbSetPictureColorSelectedRight","lnbSetPictureRight","lnbSetText","lnbSetTextRight","lnbSetTooltip","lnbSetValue","lnbSize","lnbSort","lnbSortByValue","lnbText","lnbTextRight","lnbValue","load","loadAbs","loadBackpack","loadFile","loadGame","loadIdentity","loadMagazine","loadOverlay","loadStatus","loadUniform","loadVest","local","localize","localNamespace","locationPosition","lock","lockCameraTo","lockCargo","lockDriver","locked","lockedCargo","lockedDriver","lockedInventory","lockedTurret","lockIdentity","lockInventory","lockTurret","lockWP","log","logEntities","logNetwork","logNetworkTerminate","lookAt","lookAtPos","magazineCargo","magazines","magazinesAllTurrets","magazinesAmmo","magazinesAmmoCargo","magazinesAmmoFull","magazinesDetail","magazinesDetailBackpack","magazinesDetailUniform","magazinesDetailVest","magazinesTurret","magazineTurretAmmo","mapAnimAdd","mapAnimClear","mapAnimCommit","mapAnimDone","mapCenterOnCamera","mapGridPosition","markAsFinishedOnSteam","markerAlpha","markerBrush","markerChannel","markerColor","markerDir","markerPolyline","markerPos","markerShadow","markerShape","markerSize","markerText","markerType","matrixMultiply","matrixTranspose","max","members","menuAction","menuAdd","menuChecked","menuClear","menuCollapse","menuData","menuDelete","menuEnable","menuEnabled","menuExpand","menuHover","menuPicture","menuSetAction","menuSetCheck","menuSetData","menuSetPicture","menuSetShortcut","menuSetText","menuSetURL","menuSetValue","menuShortcut","menuShortcutText","menuSize","menuSort","menuText","menuURL","menuValue","merge","min","mineActive","mineDetectedBy","missileTarget","missileTargetPos","missionConfigFile","missionDifficulty","missionName","missionNameSource","missionNamespace","missionStart","missionVersion","mod","modelToWorld","modelToWorldVisual","modelToWorldVisualWorld","modelToWorldWorld","modParams","moonIntensity","moonPhase","morale","move","move3DENCamera","moveInAny","moveInCargo","moveInCommander","moveInDriver","moveInGunner","moveInTurret","moveObjectToEnd","moveOut","moveTarget","moveTime","moveTo","moveToCompleted","moveToFailed","musicVolume","name","namedProperties","nameSound","nearEntities","nearestBuilding","nearestLocation","nearestLocations","nearestLocationWithDubbing","nearestObject","nearestObjects","nearestTerrainObjects","nearObjects","nearObjectsReady","nearRoads","nearSupplies","nearTargets","needReload","netId","netObjNull","newOverlay","nextMenuItemIndex","nextWeatherChange","nMenuItems","not","numberOfEnginesRTD","numberToDate","object","objectCurators","objectFromNetId","objectParent","objStatus","onBriefingGear","onBriefingGroup","onBriefingNotes","onBriefingPlan","onBriefingTeamSwitch","onCommandModeChanged","onDoubleClick","onEachFrame","onGroupIconClick","onGroupIconOverEnter","onGroupIconOverLeave","onHCGroupSelectionChanged","onMapSingleClick","onPlayerConnected","onPlayerDisconnected","onPreloadFinished","onPreloadStarted","onShowNewObject","onTeamSwitch","openCuratorInterface","openDLCPage","openDSInterface","openGPS","openMap","openSteamApp","openYoutubeVideo","or","orderGetIn","overcast","overcastForecast","owner","param","params","parseNumber","parseSimpleArray","parseText","parsingNamespace","particlesQuality","periscopeElevation","pickWeaponPool","pitch","pixelGrid","pixelGridBase","pixelGridNoUIScale","pixelH","pixelW","playableSlotsNumber","playableUnits","playAction","playActionNow","player","playerRespawnTime","playerSide","playersNumber","playGesture","playMission","playMove","playMoveNow","playMusic","playScriptedMission","playSound","playSound3D","position","positionCameraToWorld","posScreenToWorld","posWorldToScreen","ppEffectAdjust","ppEffectCommit","ppEffectCommitted","ppEffectCreate","ppEffectDestroy","ppEffectEnable","ppEffectEnabled","ppEffectForceInNVG","precision","preloadCamera","preloadObject","preloadSound","preloadTitleObj","preloadTitleRsc","preprocessFile","preprocessFileLineNumbers","primaryWeapon","primaryWeaponItems","primaryWeaponMagazine","priority","processDiaryLink","processInitCommands","productVersion","profileName","profileNamespace","profileNameSteam","progressLoadingScreen","progressPosition","progressSetPosition","publicVariable","publicVariableClient","publicVariableServer","pushBack","pushBackUnique","putWeaponPool","queryItemsPool","queryMagazinePool","queryWeaponPool","rad","radioChannelAdd","radioChannelCreate","radioChannelInfo","radioChannelRemove","radioChannelSetCallSign","radioChannelSetLabel","radioVolume","rain","rainbow","random","rank","rankId","rating","rectangular","registeredTasks","registerTask","reload","reloadEnabled","remoteControl","remoteExec","remoteExecCall","remoteExecutedOwner","remove3DENConnection","remove3DENEventHandler","remove3DENLayer","removeAction","removeAll3DENEventHandlers","removeAllActions","removeAllAssignedItems","removeAllBinocularItems","removeAllContainers","removeAllCuratorAddons","removeAllCuratorCameraAreas","removeAllCuratorEditingAreas","removeAllEventHandlers","removeAllHandgunItems","removeAllItems","removeAllItemsWithMagazines","removeAllMissionEventHandlers","removeAllMPEventHandlers","removeAllMusicEventHandlers","removeAllOwnedMines","removeAllPrimaryWeaponItems","removeAllSecondaryWeaponItems","removeAllWeapons","removeBackpack","removeBackpackGlobal","removeBinocularItem","removeClothing","removeCuratorAddons","removeCuratorCameraArea","removeCuratorEditableObjects","removeCuratorEditingArea","removeDiaryRecord","removeDiarySubject","removeDrawIcon","removeDrawLinks","removeEventHandler","removeFromRemainsCollector","removeGoggles","removeGroupIcon","removeHandgunItem","removeHeadgear","removeItem","removeItemFromBackpack","removeItemFromUniform","removeItemFromVest","removeItems","removeMagazine","removeMagazineGlobal","removeMagazines","removeMagazinesTurret","removeMagazineTurret","removeMenuItem","removeMissionEventHandler","removeMPEventHandler","removeMusicEventHandler","removeOwnedMine","removePrimaryWeaponItem","removeSecondaryWeaponItem","removeSimpleTask","removeSwitchableUnit","removeTeamMember","removeUniform","removeVest","removeWeapon","removeWeaponAttachmentCargo","removeWeaponCargo","removeWeaponGlobal","removeWeaponTurret","reportRemoteTarget","requiredVersion","resetCamShake","resetSubgroupDirection","resize","resources","respawnVehicle","restartEditorCamera","reveal","revealMine","reverse","reversedMouseY","roadAt","roadsConnectedTo","roleDescription","ropeAttachedObjects","ropeAttachedTo","ropeAttachEnabled","ropeAttachTo","ropeCreate","ropeCut","ropeDestroy","ropeDetach","ropeEndPosition","ropeLength","ropes","ropeSegments","ropeSetCargoMass","ropeUnwind","ropeUnwound","rotorsForcesRTD","rotorsRpmRTD","round","runInitScript","safeZoneH","safeZoneW","safeZoneWAbs","safeZoneX","safeZoneXAbs","safeZoneY","save3DENInventory","saveGame","saveIdentity","saveJoysticks","saveOverlay","saveProfileNamespace","saveStatus","saveVar","savingEnabled","say","say2D","say3D","scopeName","score","scoreSide","screenshot","screenToWorld","scriptDone","scriptName","scudState","secondaryWeapon","secondaryWeaponItems","secondaryWeaponMagazine","select","selectBestPlaces","selectDiarySubject","selectedEditorObjects","selectEditorObject","selectionNames","selectionPosition","selectLeader","selectMax","selectMin","selectNoPlayer","selectPlayer","selectRandom","selectRandomWeighted","selectWeapon","selectWeaponTurret","sendAUMessage","sendSimpleCommand","sendTask","sendTaskResult","sendUDPMessage","serverCommand","serverCommandAvailable","serverCommandExecutable","serverName","serverTime","set","set3DENAttribute","set3DENAttributes","set3DENGrid","set3DENIconsVisible","set3DENLayer","set3DENLinesVisible","set3DENLogicType","set3DENMissionAttribute","set3DENMissionAttributes","set3DENModelsVisible","set3DENObjectType","set3DENSelected","setAccTime","setActualCollectiveRTD","setAirplaneThrottle","setAirportSide","setAmmo","setAmmoCargo","setAmmoOnPylon","setAnimSpeedCoef","setAperture","setApertureNew","setAPURTD","setArmoryPoints","setAttributes","setAutonomous","setBatteryChargeRTD","setBatteryRTD","setBehaviour","setBehaviourStrong","setBleedingRemaining","setBrakesRTD","setCameraEffect","setCameraInterest","setCamShakeDefParams","setCamShakeParams","setCamUseTI","setCaptive","setCenterOfMass","setCollisionLight","setCombatBehaviour","setCombatMode","setCompassOscillation","setConvoySeparation","setCuratorCameraAreaCeiling","setCuratorCoef","setCuratorEditingAreaType","setCuratorWaypointCost","setCurrentChannel","setCurrentTask","setCurrentWaypoint","setCustomAimCoef","setCustomMissionData","setCustomSoundController","setCustomWeightRTD","setDamage","setDammage","setDate","setDebriefingText","setDefaultCamera","setDestination","setDetailMapBlendPars","setDiaryRecordText","setDiarySubjectPicture","setDir","setDirection","setDrawIcon","setDriveOnPath","setDropInterval","setDynamicSimulationDistance","setDynamicSimulationDistanceCoef","setEditorMode","setEditorObjectScope","setEffectCondition","setEffectiveCommander","setEngineRPMRTD","setEngineRpmRTD","setFace","setFaceAnimation","setFatigue","setFeatureType","setFlagAnimationPhase","setFlagOwner","setFlagSide","setFlagTexture","setFog","setForceGeneratorRTD","setFormation","setFormationTask","setFormDir","setFriend","setFromEditor","setFSMVariable","setFuel","setFuelCargo","setGroupIcon","setGroupIconParams","setGroupIconsSelectable","setGroupIconsVisible","setGroupId","setGroupIdGlobal","setGroupOwner","setGusts","setHideBehind","setHit","setHitIndex","setHitPointDamage","setHorizonParallaxCoef","setHUDMovementLevels","setIdentity","setImportance","setInfoPanel","setLeader","setLightAmbient","setLightAttenuation","setLightBrightness","setLightColor","setLightDayLight","setLightFlareMaxDistance","setLightFlareSize","setLightIntensity","setLightnings","setLightUseFlare","setLocalWindParams","setMagazineTurretAmmo","setMarkerAlpha","setMarkerAlphaLocal","setMarkerBrush","setMarkerBrushLocal","setMarkerColor","setMarkerColorLocal","setMarkerDir","setMarkerDirLocal","setMarkerPolyline","setMarkerPolylineLocal","setMarkerPos","setMarkerPosLocal","setMarkerShadow","setMarkerShadowLocal","setMarkerShape","setMarkerShapeLocal","setMarkerSize","setMarkerSizeLocal","setMarkerText","setMarkerTextLocal","setMarkerType","setMarkerTypeLocal","setMass","setMimic","setMissileTarget","setMissileTargetPos","setMousePosition","setMusicEffect","setMusicEventHandler","setName","setNameSound","setObjectArguments","setObjectMaterial","setObjectMaterialGlobal","setObjectProxy","setObjectScale","setObjectTexture","setObjectTextureGlobal","setObjectViewDistance","setOvercast","setOwner","setOxygenRemaining","setParticleCircle","setParticleClass","setParticleFire","setParticleParams","setParticleRandom","setPilotCameraDirection","setPilotCameraRotation","setPilotCameraTarget","setPilotLight","setPiPEffect","setPitch","setPlateNumber","setPlayable","setPlayerRespawnTime","setPlayerVoNVolume","setPos","setPosASL","setPosASL2","setPosASLW","setPosATL","setPosition","setPosWorld","setPylonLoadout","setPylonsPriority","setRadioMsg","setRain","setRainbow","setRandomLip","setRank","setRectangular","setRepairCargo","setRotorBrakeRTD","setShadowDistance","setShotParents","setSide","setSimpleTaskAlwaysVisible","setSimpleTaskCustomData","setSimpleTaskDescription","setSimpleTaskDestination","setSimpleTaskTarget","setSimpleTaskType","setSimulWeatherLayers","setSize","setSkill","setSlingLoad","setSoundEffect","setSpeaker","setSpeech","setSpeedMode","setStamina","setStaminaScheme","setStarterRTD","setStatValue","setSuppression","setSystemOfUnits","setTargetAge","setTaskMarkerOffset","setTaskResult","setTaskState","setTerrainGrid","setText","setThrottleRTD","setTimeMultiplier","setTitleEffect","setToneMapping","setToneMappingParams","setTrafficDensity","setTrafficDistance","setTrafficGap","setTrafficSpeed","setTriggerActivation","setTriggerArea","setTriggerInterval","setTriggerStatements","setTriggerText","setTriggerTimeout","setTriggerType","setType","setUnconscious","setUnitAbility","setUnitCombatMode","setUnitLoadout","setUnitPos","setUnitPosWeak","setUnitRank","setUnitRecoilCoefficient","setUnitTrait","setUnloadInCombat","setUserActionText","setUserMFDText","setUserMFDValue","setVariable","setVectorDir","setVectorDirAndUp","setVectorUp","setVehicleAmmo","setVehicleAmmoDef","setVehicleArmor","setVehicleCargo","setVehicleId","setVehicleInit","setVehicleLock","setVehiclePosition","setVehicleRadar","setVehicleReceiveRemoteTargets","setVehicleReportOwnPosition","setVehicleReportRemoteTargets","setVehicleTIPars","setVehicleVarName","setVelocity","setVelocityModelSpace","setVelocityTransformation","setViewDistance","setVisibleIfTreeCollapsed","setWantedRPMRTD","setWaves","setWaypointBehaviour","setWaypointCombatMode","setWaypointCompletionRadius","setWaypointDescription","setWaypointForceBehaviour","setWaypointFormation","setWaypointHousePosition","setWaypointLoiterAltitude","setWaypointLoiterRadius","setWaypointLoiterType","setWaypointName","setWaypointPosition","setWaypointScript","setWaypointSpeed","setWaypointStatements","setWaypointTimeout","setWaypointType","setWaypointVisible","setWeaponReloadingTime","setWeaponZeroing","setWind","setWindDir","setWindForce","setWindStr","setWingForceScaleRTD","setWPPos","show3DIcons","showChat","showCinemaBorder","showCommandingMenu","showCompass","showCuratorCompass","showGPS","showHUD","showLegend","showMap","shownArtilleryComputer","shownChat","shownCompass","shownCuratorCompass","showNewEditorObject","shownGPS","shownHUD","shownMap","shownPad","shownRadio","shownScoretable","shownUAVFeed","shownWarrant","shownWatch","showPad","showRadio","showScoretable","showSubtitles","showUAVFeed","showWarrant","showWatch","showWaypoint","showWaypoints","side","sideChat","sideEmpty","sideEnemy","sideFriendly","sideRadio","simpleTasks","simulationEnabled","simulCloudDensity","simulCloudOcclusion","simulInClouds","simulSetHumidity","simulWeatherSync","sin","size","sizeOf","skill","skillFinal","skipTime","sleep","sliderPosition","sliderRange","sliderSetPosition","sliderSetRange","sliderSetSpeed","sliderSpeed","slingLoadAssistantShown","soldierMagazines","someAmmo","sort","soundVolume","spawn","speaker","speechVolume","speed","speedMode","splitString","sqrt","squadParams","stance","startLoadingScreen","step","stop","stopEngineRTD","stopped","str","sunOrMoon","supportInfo","suppressFor","surfaceIsWater","surfaceNormal","surfaceTexture","surfaceType","swimInDepth","switchableUnits","switchAction","switchCamera","switchGesture","switchLight","switchMove","synchronizedObjects","synchronizedTriggers","synchronizedWaypoints","synchronizeObjectsAdd","synchronizeObjectsRemove","synchronizeTrigger","synchronizeWaypoint","systemChat","systemOfUnits","systemTime","systemTimeUTC","tan","targetKnowledge","targets","targetsAggregate","targetsQuery","taskAlwaysVisible","taskChildren","taskCompleted","taskCustomData","taskDescription","taskDestination","taskHint","taskMarkerOffset","taskName","taskParent","taskResult","taskState","taskType","teamMember","teamName","teams","teamSwitch","teamSwitchEnabled","teamType","terminate","terrainIntersect","terrainIntersectASL","terrainIntersectAtASL","text","textLog","textLogFormat","tg","throttleRTD","time","timeMultiplier","titleCut","titleFadeOut","titleObj","titleRsc","titleText","toArray","toFixed","toLower","toLowerANSI","toString","toUpper","toUpperANSI","triggerActivated","triggerActivation","triggerAmmo","triggerArea","triggerAttachedVehicle","triggerAttachObject","triggerAttachVehicle","triggerDynamicSimulation","triggerInterval","triggerStatements","triggerText","triggerTimeout","triggerTimeoutCurrent","triggerType","trim","turretLocal","turretOwner","turretUnit","tvAdd","tvClear","tvCollapse","tvCollapseAll","tvCount","tvCurSel","tvData","tvDelete","tvExpand","tvExpandAll","tvIsSelected","tvPicture","tvPictureRight","tvSelection","tvSetColor","tvSetCurSel","tvSetData","tvSetPicture","tvSetPictureColor","tvSetPictureColorDisabled","tvSetPictureColorSelected","tvSetPictureRight","tvSetPictureRightColor","tvSetPictureRightColorDisabled","tvSetPictureRightColorSelected","tvSetSelectColor","tvSetSelected","tvSetText","tvSetTooltip","tvSetValue","tvSort","tvSortAll","tvSortByValue","tvSortByValueAll","tvText","tvTooltip","tvValue","type","typeName","typeOf","UAVControl","uiNamespace","uiSleep","unassignCurator","unassignItem","unassignTeam","unassignVehicle","underwater","uniform","uniformContainer","uniformItems","uniformMagazines","unitAddons","unitAimPosition","unitAimPositionVisual","unitBackpack","unitCombatMode","unitIsUAV","unitPos","unitReady","unitRecoilCoefficient","units","unitsBelowHeight","unitTurret","unlinkItem","unlockAchievement","unregisterTask","updateDrawIcon","updateMenuItem","updateObjectTree","useAIOperMapObstructionTest","useAISteeringComponent","useAudioTimeForMoves","userInputDisabled","vectorAdd","vectorCos","vectorCrossProduct","vectorDiff","vectorDir","vectorDirVisual","vectorDistance","vectorDistanceSqr","vectorDotProduct","vectorFromTo","vectorLinearConversion","vectorMagnitude","vectorMagnitudeSqr","vectorModelToWorld","vectorModelToWorldVisual","vectorMultiply","vectorNormalized","vectorUp","vectorUpVisual","vectorWorldToModel","vectorWorldToModelVisual","vehicle","vehicleCargoEnabled","vehicleChat","vehicleMoveInfo","vehicleRadio","vehicleReceiveRemoteTargets","vehicleReportOwnPosition","vehicleReportRemoteTargets","vehicles","vehicleVarName","velocity","velocityModelSpace","verifySignature","vest","vestContainer","vestItems","vestMagazines","viewDistance","visibleCompass","visibleGPS","visibleMap","visiblePosition","visiblePositionASL","visibleScoretable","visibleWatch","waves","waypointAttachedObject","waypointAttachedVehicle","waypointAttachObject","waypointAttachVehicle","waypointBehaviour","waypointCombatMode","waypointCompletionRadius","waypointDescription","waypointForceBehaviour","waypointFormation","waypointHousePosition","waypointLoiterAltitude","waypointLoiterRadius","waypointLoiterType","waypointName","waypointPosition","waypoints","waypointScript","waypointsEnabledUAV","waypointShow","waypointSpeed","waypointStatements","waypointTimeout","waypointTimeoutCurrent","waypointType","waypointVisible","weaponAccessories","weaponAccessoriesCargo","weaponCargo","weaponDirection","weaponInertia","weaponLowered","weapons","weaponsItems","weaponsItemsCargo","weaponState","weaponsTurret","weightRTD","WFSideText","wind","windDir","windRTD","windStr","wingsForcesRTD","worldName","worldSize","worldToModel","worldToModelVisual","worldToScreen"],
-literal:["blufor","civilian","configNull","controlNull","displayNull","east","endl","false","grpNull","independent","lineBreak","locationNull","nil","objNull","opfor","pi","resistance","scriptNull","sideAmbientLife","sideEmpty","sideLogic","sideUnknown","taskNull","teamMemberNull","true","west"]
+begin:/#\s*[a-z]+\b/,end:/$/,
+keywords:"define undef ifdef ifndef else endif include if",contains:[{
+begin:/\\\n/,relevance:0},e.inherit(t,{className:"string"}),{begin:/<[^\n>]*>/,
+end:/$/,illegal:"\\n"},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]};return{
+name:"SQF",case_insensitive:!0,keywords:{
+keyword:["break","breakWith","breakOut","breakTo","case","catch","continue","continueWith","default","do","else","exit","exitWith","for","forEach","from","if","local","private","switch","step","then","throw","to","try","waitUntil","while","with"],
+built_in:["abs","accTime","acos","action","actionIDs","actionKeys","actionKeysEx","actionKeysImages","actionKeysNames","actionKeysNamesArray","actionName","actionParams","activateAddons","activatedAddons","activateKey","activeTitleEffectParams","add3DENConnection","add3DENEventHandler","add3DENLayer","addAction","addBackpack","addBackpackCargo","addBackpackCargoGlobal","addBackpackGlobal","addBinocularItem","addCamShake","addCuratorAddons","addCuratorCameraArea","addCuratorEditableObjects","addCuratorEditingArea","addCuratorPoints","addEditorObject","addEventHandler","addForce","addForceGeneratorRTD","addGoggles","addGroupIcon","addHandgunItem","addHeadgear","addItem","addItemCargo","addItemCargoGlobal","addItemPool","addItemToBackpack","addItemToUniform","addItemToVest","addLiveStats","addMagazine","addMagazineAmmoCargo","addMagazineCargo","addMagazineCargoGlobal","addMagazineGlobal","addMagazinePool","addMagazines","addMagazineTurret","addMenu","addMenuItem","addMissionEventHandler","addMPEventHandler","addMusicEventHandler","addonFiles","addOwnedMine","addPlayerScores","addPrimaryWeaponItem","addPublicVariableEventHandler","addRating","addResources","addScore","addScoreSide","addSecondaryWeaponItem","addSwitchableUnit","addTeamMember","addToRemainsCollector","addTorque","addUniform","addUserActionEventHandler","addVehicle","addVest","addWaypoint","addWeapon","addWeaponCargo","addWeaponCargoGlobal","addWeaponGlobal","addWeaponItem","addWeaponPool","addWeaponTurret","addWeaponWithAttachmentsCargo","addWeaponWithAttachmentsCargoGlobal","admin","agent","agents","AGLToASL","aimedAtTarget","aimPos","airDensityCurveRTD","airDensityRTD","airplaneThrottle","airportSide","AISFinishHeal","alive","all3DENEntities","allActiveTitleEffects","allAddonsInfo","allAirports","allControls","allCurators","allCutLayers","allDead","allDeadMen","allDiaryRecords","allDiarySubjects","allDisplays","allEnv3DSoundSources","allGroups","allLODs","allMapMarkers","allMines","allMissionObjects","allObjects","allow3DMode","allowCrewInImmobile","allowCuratorLogicIgnoreAreas","allowDamage","allowDammage","allowedService","allowFileOperations","allowFleeing","allowGetIn","allowService","allowSprint","allPlayers","allSimpleObjects","allSites","allTurrets","allUnits","allUnitsUAV","allUsers","allVariables","ambientTemperature","ammo","ammoOnPylon","and","animate","animateBay","animateDoor","animatePylon","animateSource","animationNames","animationPhase","animationSourcePhase","animationState","apertureParams","append","apply","armoryPoints","arrayIntersect","asin","ASLToAGL","ASLToATL","assert","assignAsCargo","assignAsCargoIndex","assignAsCommander","assignAsDriver","assignAsGunner","assignAsTurret","assignCurator","assignedCargo","assignedCommander","assignedDriver","assignedGroup","assignedGunner","assignedItems","assignedTarget","assignedTeam","assignedVehicle","assignedVehicleRole","assignedVehicles","assignItem","assignTeam","assignToAirport","atan","atan2","atg","ATLToASL","attachedObject","attachedObjects","attachedTo","attachObject","attachTo","attackEnabled","awake","backpack","backpackCargo","backpackContainer","backpackItems","backpackMagazines","backpackSpaceFor","behaviour","benchmark","bezierInterpolation","binocular","binocularItems","binocularMagazine","boundingBox","boundingBoxReal","boundingCenter","brakesDisabled","briefingName","buildingExit","buildingPos","buldozer_EnableRoadDiag","buldozer_IsEnabledRoadDiag","buldozer_LoadNewRoads","buldozer_reloadOperMap","buttonAction","buttonSetAction","cadetMode","calculatePath","calculatePlayerVisibilityByFriendly","call","callExtension","camCommand","camCommit","camCommitPrepared","camCommitted","camConstuctionSetParams","camCreate","camDestroy","cameraEffect","cameraEffectEnableHUD","cameraInterest","cameraOn","cameraView","campaignConfigFile","camPreload","camPreloaded","camPrepareBank","camPrepareDir","camPrepareDive","camPrepareFocus","camPrepareFov","camPrepareFovRange","camPreparePos","camPrepareRelPos","camPrepareTarget","camSetBank","camSetDir","camSetDive","camSetFocus","camSetFov","camSetFovRange","camSetPos","camSetRelPos","camSetTarget","camTarget","camUseNVG","canAdd","canAddItemToBackpack","canAddItemToUniform","canAddItemToVest","cancelSimpleTaskDestination","canDeployWeapon","canFire","canMove","canSlingLoad","canStand","canSuspend","canTriggerDynamicSimulation","canUnloadInCombat","canVehicleCargo","captive","captiveNum","cbChecked","cbSetChecked","ceil","channelEnabled","cheatsEnabled","checkAIFeature","checkVisibility","className","clear3DENAttribute","clear3DENInventory","clearAllItemsFromBackpack","clearBackpackCargo","clearBackpackCargoGlobal","clearForcesRTD","clearGroupIcons","clearItemCargo","clearItemCargoGlobal","clearItemPool","clearMagazineCargo","clearMagazineCargoGlobal","clearMagazinePool","clearOverlay","clearRadio","clearWeaponCargo","clearWeaponCargoGlobal","clearWeaponPool","clientOwner","closeDialog","closeDisplay","closeOverlay","collapseObjectTree","collect3DENHistory","collectiveRTD","collisionDisabledWith","combatBehaviour","combatMode","commandArtilleryFire","commandChat","commander","commandFire","commandFollow","commandFSM","commandGetOut","commandingMenu","commandMove","commandRadio","commandStop","commandSuppressiveFire","commandTarget","commandWatch","comment","commitOverlay","compatibleItems","compatibleMagazines","compile","compileFinal","compileScript","completedFSM","composeText","configClasses","configFile","configHierarchy","configName","configOf","configProperties","configSourceAddonList","configSourceMod","configSourceModList","confirmSensorTarget","connectTerminalToUAV","connectToServer","controlsGroupCtrl","conversationDisabled","copyFromClipboard","copyToClipboard","copyWaypoints","cos","count","countEnemy","countFriendly","countSide","countType","countUnknown","create3DENComposition","create3DENEntity","createAgent","createCenter","createDialog","createDiaryLink","createDiaryRecord","createDiarySubject","createDisplay","createGearDialog","createGroup","createGuardedPoint","createHashMap","createHashMapFromArray","createLocation","createMarker","createMarkerLocal","createMenu","createMine","createMissionDisplay","createMPCampaignDisplay","createSimpleObject","createSimpleTask","createSite","createSoundSource","createTask","createTeam","createTrigger","createUnit","createVehicle","createVehicleCrew","createVehicleLocal","crew","ctAddHeader","ctAddRow","ctClear","ctCurSel","ctData","ctFindHeaderRows","ctFindRowHeader","ctHeaderControls","ctHeaderCount","ctRemoveHeaders","ctRemoveRows","ctrlActivate","ctrlAddEventHandler","ctrlAngle","ctrlAnimateModel","ctrlAnimationPhaseModel","ctrlAt","ctrlAutoScrollDelay","ctrlAutoScrollRewind","ctrlAutoScrollSpeed","ctrlBackgroundColor","ctrlChecked","ctrlClassName","ctrlCommit","ctrlCommitted","ctrlCreate","ctrlDelete","ctrlEnable","ctrlEnabled","ctrlFade","ctrlFontHeight","ctrlForegroundColor","ctrlHTMLLoaded","ctrlIDC","ctrlIDD","ctrlMapAnimAdd","ctrlMapAnimClear","ctrlMapAnimCommit","ctrlMapAnimDone","ctrlMapCursor","ctrlMapMouseOver","ctrlMapPosition","ctrlMapScale","ctrlMapScreenToWorld","ctrlMapSetPosition","ctrlMapWorldToScreen","ctrlModel","ctrlModelDirAndUp","ctrlModelScale","ctrlMousePosition","ctrlParent","ctrlParentControlsGroup","ctrlPosition","ctrlRemoveAllEventHandlers","ctrlRemoveEventHandler","ctrlScale","ctrlScrollValues","ctrlSetActiveColor","ctrlSetAngle","ctrlSetAutoScrollDelay","ctrlSetAutoScrollRewind","ctrlSetAutoScrollSpeed","ctrlSetBackgroundColor","ctrlSetChecked","ctrlSetDisabledColor","ctrlSetEventHandler","ctrlSetFade","ctrlSetFocus","ctrlSetFont","ctrlSetFontH1","ctrlSetFontH1B","ctrlSetFontH2","ctrlSetFontH2B","ctrlSetFontH3","ctrlSetFontH3B","ctrlSetFontH4","ctrlSetFontH4B","ctrlSetFontH5","ctrlSetFontH5B","ctrlSetFontH6","ctrlSetFontH6B","ctrlSetFontHeight","ctrlSetFontHeightH1","ctrlSetFontHeightH2","ctrlSetFontHeightH3","ctrlSetFontHeightH4","ctrlSetFontHeightH5","ctrlSetFontHeightH6","ctrlSetFontHeightSecondary","ctrlSetFontP","ctrlSetFontPB","ctrlSetFontSecondary","ctrlSetForegroundColor","ctrlSetModel","ctrlSetModelDirAndUp","ctrlSetModelScale","ctrlSetMousePosition","ctrlSetPixelPrecision","ctrlSetPosition","ctrlSetPositionH","ctrlSetPositionW","ctrlSetPositionX","ctrlSetPositionY","ctrlSetScale","ctrlSetScrollValues","ctrlSetShadow","ctrlSetStructuredText","ctrlSetText","ctrlSetTextColor","ctrlSetTextColorSecondary","ctrlSetTextSecondary","ctrlSetTextSelection","ctrlSetTooltip","ctrlSetTooltipColorBox","ctrlSetTooltipColorShade","ctrlSetTooltipColorText","ctrlSetTooltipMaxWidth","ctrlSetURL","ctrlSetURLOverlayMode","ctrlShadow","ctrlShow","ctrlShown","ctrlStyle","ctrlText","ctrlTextColor","ctrlTextHeight","ctrlTextSecondary","ctrlTextSelection","ctrlTextWidth","ctrlTooltip","ctrlType","ctrlURL","ctrlURLOverlayMode","ctrlVisible","ctRowControls","ctRowCount","ctSetCurSel","ctSetData","ctSetHeaderTemplate","ctSetRowTemplate","ctSetValue","ctValue","curatorAddons","curatorCamera","curatorCameraArea","curatorCameraAreaCeiling","curatorCoef","curatorEditableObjects","curatorEditingArea","curatorEditingAreaType","curatorMouseOver","curatorPoints","curatorRegisteredObjects","curatorSelected","curatorWaypointCost","current3DENOperation","currentChannel","currentCommand","currentMagazine","currentMagazineDetail","currentMagazineDetailTurret","currentMagazineTurret","currentMuzzle","currentNamespace","currentPilot","currentTask","currentTasks","currentThrowable","currentVisionMode","currentWaypoint","currentWeapon","currentWeaponMode","currentWeaponTurret","currentZeroing","cursorObject","cursorTarget","customChat","customRadio","customWaypointPosition","cutFadeOut","cutObj","cutRsc","cutText","damage","date","dateToNumber","dayTime","deActivateKey","debriefingText","debugFSM","debugLog","decayGraphValues","deg","delete3DENEntities","deleteAt","deleteCenter","deleteCollection","deleteEditorObject","deleteGroup","deleteGroupWhenEmpty","deleteIdentity","deleteLocation","deleteMarker","deleteMarkerLocal","deleteRange","deleteResources","deleteSite","deleteStatus","deleteTeam","deleteVehicle","deleteVehicleCrew","deleteWaypoint","detach","detectedMines","diag_activeMissionFSMs","diag_activeScripts","diag_activeSQFScripts","diag_activeSQSScripts","diag_allMissionEventHandlers","diag_captureFrame","diag_captureFrameToFile","diag_captureSlowFrame","diag_codePerformance","diag_deltaTime","diag_drawmode","diag_dumpCalltraceToLog","diag_dumpScriptAssembly","diag_dumpTerrainSynth","diag_dynamicSimulationEnd","diag_enable","diag_enabled","diag_exportConfig","diag_exportTerrainSVG","diag_fps","diag_fpsmin","diag_frameno","diag_getTerrainSegmentOffset","diag_lightNewLoad","diag_list","diag_localized","diag_log","diag_logSlowFrame","diag_mergeConfigFile","diag_recordTurretLimits","diag_resetFSM","diag_resetshapes","diag_scope","diag_setLightNew","diag_stacktrace","diag_tickTime","diag_toggle","dialog","diarySubjectExists","didJIP","didJIPOwner","difficulty","difficultyEnabled","difficultyEnabledRTD","difficultyOption","direction","directionStabilizationEnabled","directSay","disableAI","disableBrakes","disableCollisionWith","disableConversation","disableDebriefingStats","disableMapIndicators","disableNVGEquipment","disableRemoteSensors","disableSerialization","disableTIEquipment","disableUAVConnectability","disableUserInput","displayAddEventHandler","displayChild","displayCtrl","displayParent","displayRemoveAllEventHandlers","displayRemoveEventHandler","displaySetEventHandler","displayUniqueName","displayUpdate","dissolveTeam","distance","distance2D","distanceSqr","distributionRegion","do3DENAction","doArtilleryFire","doFire","doFollow","doFSM","doGetOut","doMove","doorPhase","doStop","doSuppressiveFire","doTarget","doWatch","drawArrow","drawEllipse","drawIcon","drawIcon3D","drawLaser","drawLine","drawLine3D","drawLink","drawLocation","drawPolygon","drawRectangle","drawTriangle","driver","drop","dynamicSimulationDistance","dynamicSimulationDistanceCoef","dynamicSimulationEnabled","dynamicSimulationSystemEnabled","echo","edit3DENMissionAttributes","editObject","editorSetEventHandler","effectiveCommander","elevatePeriscope","emptyPositions","enableAI","enableAIFeature","enableAimPrecision","enableAttack","enableAudioFeature","enableAutoStartUpRTD","enableAutoTrimRTD","enableCamShake","enableCaustics","enableChannel","enableCollisionWith","enableCopilot","enableDebriefingStats","enableDiagLegend","enableDirectionStabilization","enableDynamicSimulation","enableDynamicSimulationSystem","enableEndDialog","enableEngineArtillery","enableEnvironment","enableFatigue","enableGunLights","enableInfoPanelComponent","enableIRLasers","enableMimics","enablePersonTurret","enableRadio","enableReload","enableRopeAttach","enableSatNormalOnDetail","enableSaving","enableSentences","enableSimulation","enableSimulationGlobal","enableStamina","enableStressDamage","enableTeamSwitch","enableTraffic","enableUAVConnectability","enableUAVWaypoints","enableVehicleCargo","enableVehicleSensor","enableWeaponDisassembly","endLoadingScreen","endMission","engineOn","enginesIsOnRTD","enginesPowerRTD","enginesRpmRTD","enginesTorqueRTD","entities","environmentEnabled","environmentVolume","equipmentDisabled","estimatedEndServerTime","estimatedTimeLeft","evalObjectArgument","everyBackpack","everyContainer","exec","execEditorScript","execFSM","execVM","exp","expectedDestination","exportJIPMessages","eyeDirection","eyePos","face","faction","fadeEnvironment","fadeMusic","fadeRadio","fadeSound","fadeSpeech","failMission","fileExists","fillWeaponsFromPool","find","findAny","findCover","findDisplay","findEditorObject","findEmptyPosition","findEmptyPositionReady","findIf","findNearestEnemy","finishMissionInit","finite","fire","fireAtTarget","firstBackpack","flag","flagAnimationPhase","flagOwner","flagSide","flagTexture","flatten","fleeing","floor","flyInHeight","flyInHeightASL","focusedCtrl","fog","fogForecast","fogParams","forceAddUniform","forceAtPositionRTD","forceCadetDifficulty","forcedMap","forceEnd","forceFlagTexture","forceFollowRoad","forceGeneratorRTD","forceMap","forceRespawn","forceSpeed","forceUnicode","forceWalk","forceWeaponFire","forceWeatherChange","forEachMember","forEachMemberAgent","forEachMemberTeam","forgetTarget","format","formation","formationDirection","formationLeader","formationMembers","formationPosition","formationTask","formatText","formLeader","freeExtension","freeLook","fromEditor","fuel","fullCrew","gearIDCAmmoCount","gearSlotAmmoCount","gearSlotData","gestureState","get","get3DENActionState","get3DENAttribute","get3DENCamera","get3DENConnections","get3DENEntity","get3DENEntityID","get3DENGrid","get3DENIconsVisible","get3DENLayerEntities","get3DENLinesVisible","get3DENMissionAttribute","get3DENMouseOver","get3DENSelected","getAimingCoef","getAllEnv3DSoundControllers","getAllEnvSoundControllers","getAllHitPointsDamage","getAllOwnedMines","getAllPylonsInfo","getAllSoundControllers","getAllUnitTraits","getAmmoCargo","getAnimAimPrecision","getAnimSpeedCoef","getArray","getArtilleryAmmo","getArtilleryComputerSettings","getArtilleryETA","getAssetDLCInfo","getAssignedCuratorLogic","getAssignedCuratorUnit","getAttackTarget","getAudioOptionVolumes","getBackpackCargo","getBleedingRemaining","getBurningValue","getCalculatePlayerVisibilityByFriendly","getCameraViewDirection","getCargoIndex","getCenterOfMass","getClientState","getClientStateNumber","getCompatiblePylonMagazines","getConnectedUAV","getConnectedUAVUnit","getContainerMaxLoad","getCorpse","getCruiseControl","getCursorObjectParams","getCustomAimCoef","getCustomSoundController","getCustomSoundControllerCount","getDammage","getDebriefingText","getDescription","getDir","getDirVisual","getDiverState","getDLCAssetsUsage","getDLCAssetsUsageByName","getDLCs","getDLCUsageTime","getEditorCamera","getEditorMode","getEditorObjectScope","getElevationOffset","getEngineTargetRPMRTD","getEnv3DSoundController","getEnvSoundController","getEventHandlerInfo","getFatigue","getFieldManualStartPage","getForcedFlagTexture","getForcedSpeed","getFriend","getFSMVariable","getFuelCargo","getGraphValues","getGroupIcon","getGroupIconParams","getGroupIcons","getHideFrom","getHit","getHitIndex","getHitPointDamage","getItemCargo","getLighting","getLightingAt","getLoadedModsInfo","getMagazineCargo","getMarkerColor","getMarkerPos","getMarkerSize","getMarkerType","getMass","getMissionConfig","getMissionConfigValue","getMissionDLCs","getMissionLayerEntities","getMissionLayers","getMissionPath","getModelInfo","getMousePosition","getMusicPlayedTime","getNumber","getObjectArgument","getObjectChildren","getObjectDLC","getObjectFOV","getObjectID","getObjectMaterials","getObjectProxy","getObjectScale","getObjectTextures","getObjectType","getObjectViewDistance","getOpticsMode","getOrDefault","getOrDefaultCall","getOxygenRemaining","getPersonUsedDLCs","getPilotCameraDirection","getPilotCameraPosition","getPilotCameraRotation","getPilotCameraTarget","getPiPViewDistance","getPlateNumber","getPlayerChannel","getPlayerID","getPlayerScores","getPlayerUID","getPlayerVoNVolume","getPos","getPosASL","getPosASLVisual","getPosASLW","getPosATL","getPosATLVisual","getPosVisual","getPosWorld","getPosWorldVisual","getPylonMagazines","getRelDir","getRelPos","getRemoteSensorsDisabled","getRepairCargo","getResolution","getRoadInfo","getRotorBrakeRTD","getSensorTargets","getSensorThreats","getShadowDistance","getShotParents","getSlingLoad","getSoundController","getSoundControllerResult","getSpeed","getStamina","getStatValue","getSteamFriendsServers","getSubtitleOptions","getSuppression","getTerrainGrid","getTerrainHeight","getTerrainHeightASL","getTerrainInfo","getText","getTextRaw","getTextureInfo","getTextWidth","getTiParameters","getTotalDLCUsageTime","getTrimOffsetRTD","getTurretLimits","getTurretOpticsMode","getUnitFreefallInfo","getUnitLoadout","getUnitTrait","getUnloadInCombat","getUserInfo","getUserMFDText","getUserMFDValue","getVariable","getVehicleCargo","getVehicleTiPars","getWeaponCargo","getWeaponSway","getWingsOrientationRTD","getWingsPositionRTD","getWPPos","glanceAt","globalChat","globalRadio","goggles","goto","group","groupChat","groupFromNetId","groupIconSelectable","groupIconsVisible","groupID","groupOwner","groupRadio","groups","groupSelectedUnits","groupSelectUnit","gunner","gusts","halt","handgunItems","handgunMagazine","handgunWeapon","handsHit","hashValue","hasInterface","hasPilotCamera","hasWeapon","hcAllGroups","hcGroupParams","hcLeader","hcRemoveAllGroups","hcRemoveGroup","hcSelected","hcSelectGroup","hcSetGroup","hcShowBar","hcShownBar","headgear","hideBody","hideObject","hideObjectGlobal","hideSelection","hint","hintC","hintCadet","hintSilent","hmd","hostMission","htmlLoad","HUDMovementLevels","humidity","image","importAllGroups","importance","in","inArea","inAreaArray","incapacitatedState","inflame","inflamed","infoPanel","infoPanelComponentEnabled","infoPanelComponents","infoPanels","inGameUISetEventHandler","inheritsFrom","initAmbientLife","inPolygon","inputAction","inputController","inputMouse","inRangeOfArtillery","insert","insertEditorObject","intersect","is3DEN","is3DENMultiplayer","is3DENPreview","isAbleToBreathe","isActionMenuVisible","isAgent","isAimPrecisionEnabled","isAllowedCrewInImmobile","isArray","isAutoHoverOn","isAutonomous","isAutoStartUpEnabledRTD","isAutotest","isAutoTrimOnRTD","isAwake","isBleeding","isBurning","isClass","isCollisionLightOn","isCopilotEnabled","isDamageAllowed","isDedicated","isDLCAvailable","isEngineOn","isEqualRef","isEqualTo","isEqualType","isEqualTypeAll","isEqualTypeAny","isEqualTypeArray","isEqualTypeParams","isFilePatchingEnabled","isFinal","isFlashlightOn","isFlatEmpty","isForcedWalk","isFormationLeader","isGameFocused","isGamePaused","isGroupDeletedWhenEmpty","isHidden","isInRemainsCollector","isInstructorFigureEnabled","isIRLaserOn","isKeyActive","isKindOf","isLaserOn","isLightOn","isLocalized","isManualFire","isMarkedForCollection","isMissionProfileNamespaceLoaded","isMultiplayer","isMultiplayerSolo","isNil","isNotEqualRef","isNotEqualTo","isNull","isNumber","isObjectHidden","isObjectRTD","isOnRoad","isPiPEnabled","isPlayer","isRealTime","isRemoteExecuted","isRemoteExecutedJIP","isSaving","isSensorTargetConfirmed","isServer","isShowing3DIcons","isSimpleObject","isSprintAllowed","isStaminaEnabled","isSteamMission","isSteamOverlayEnabled","isStreamFriendlyUIEnabled","isStressDamageEnabled","isText","isTouchingGround","isTurnedOut","isTutHintsEnabled","isUAVConnectable","isUAVConnected","isUIContext","isUniformAllowed","isVehicleCargo","isVehicleRadarOn","isVehicleSensorEnabled","isWalking","isWeaponDeployed","isWeaponRested","itemCargo","items","itemsWithMagazines","join","joinAs","joinAsSilent","joinSilent","joinString","kbAddDatabase","kbAddDatabaseTargets","kbAddTopic","kbHasTopic","kbReact","kbRemoveTopic","kbTell","kbWasSaid","keyImage","keyName","keys","knowsAbout","land","landAt","landResult","language","laserTarget","lbAdd","lbClear","lbColor","lbColorRight","lbCurSel","lbData","lbDelete","lbIsSelected","lbPicture","lbPictureRight","lbSelection","lbSetColor","lbSetColorRight","lbSetCurSel","lbSetData","lbSetPicture","lbSetPictureColor","lbSetPictureColorDisabled","lbSetPictureColorSelected","lbSetPictureRight","lbSetPictureRightColor","lbSetPictureRightColorDisabled","lbSetPictureRightColorSelected","lbSetSelectColor","lbSetSelectColorRight","lbSetSelected","lbSetText","lbSetTextRight","lbSetTooltip","lbSetValue","lbSize","lbSort","lbSortBy","lbSortByValue","lbText","lbTextRight","lbTooltip","lbValue","leader","leaderboardDeInit","leaderboardGetRows","leaderboardInit","leaderboardRequestRowsFriends","leaderboardRequestRowsGlobal","leaderboardRequestRowsGlobalAroundUser","leaderboardsRequestUploadScore","leaderboardsRequestUploadScoreKeepBest","leaderboardState","leaveVehicle","libraryCredits","libraryDisclaimers","lifeState","lightAttachObject","lightDetachObject","lightIsOn","lightnings","limitSpeed","linearConversion","lineIntersects","lineIntersectsObjs","lineIntersectsSurfaces","lineIntersectsWith","linkItem","list","listObjects","listRemoteTargets","listVehicleSensors","ln","lnbAddArray","lnbAddColumn","lnbAddRow","lnbClear","lnbColor","lnbColorRight","lnbCurSelRow","lnbData","lnbDeleteColumn","lnbDeleteRow","lnbGetColumnsPosition","lnbPicture","lnbPictureRight","lnbSetColor","lnbSetColorRight","lnbSetColumnsPos","lnbSetCurSelRow","lnbSetData","lnbSetPicture","lnbSetPictureColor","lnbSetPictureColorRight","lnbSetPictureColorSelected","lnbSetPictureColorSelectedRight","lnbSetPictureRight","lnbSetText","lnbSetTextRight","lnbSetTooltip","lnbSetValue","lnbSize","lnbSort","lnbSortBy","lnbSortByValue","lnbText","lnbTextRight","lnbValue","load","loadAbs","loadBackpack","loadConfig","loadFile","loadGame","loadIdentity","loadMagazine","loadOverlay","loadStatus","loadUniform","loadVest","localize","localNamespace","locationPosition","lock","lockCameraTo","lockCargo","lockDriver","locked","lockedCameraTo","lockedCargo","lockedDriver","lockedInventory","lockedTurret","lockIdentity","lockInventory","lockTurret","lockWp","log","logEntities","logNetwork","logNetworkTerminate","lookAt","lookAtPos","magazineCargo","magazines","magazinesAllTurrets","magazinesAmmo","magazinesAmmoCargo","magazinesAmmoFull","magazinesDetail","magazinesDetailBackpack","magazinesDetailUniform","magazinesDetailVest","magazinesTurret","magazineTurretAmmo","mapAnimAdd","mapAnimClear","mapAnimCommit","mapAnimDone","mapCenterOnCamera","mapGridPosition","markAsFinishedOnSteam","markerAlpha","markerBrush","markerChannel","markerColor","markerDir","markerPolyline","markerPos","markerShadow","markerShape","markerSize","markerText","markerType","matrixMultiply","matrixTranspose","max","maxLoad","members","menuAction","menuAdd","menuChecked","menuClear","menuCollapse","menuData","menuDelete","menuEnable","menuEnabled","menuExpand","menuHover","menuPicture","menuSetAction","menuSetCheck","menuSetData","menuSetPicture","menuSetShortcut","menuSetText","menuSetURL","menuSetValue","menuShortcut","menuShortcutText","menuSize","menuSort","menuText","menuURL","menuValue","merge","min","mineActive","mineDetectedBy","missileTarget","missileTargetPos","missionConfigFile","missionDifficulty","missionEnd","missionName","missionNameSource","missionNamespace","missionProfileNamespace","missionStart","missionVersion","mod","modelToWorld","modelToWorldVisual","modelToWorldVisualWorld","modelToWorldWorld","modParams","moonIntensity","moonPhase","morale","move","move3DENCamera","moveInAny","moveInCargo","moveInCommander","moveInDriver","moveInGunner","moveInTurret","moveObjectToEnd","moveOut","moveTime","moveTo","moveToCompleted","moveToFailed","musicVolume","name","namedProperties","nameSound","nearEntities","nearestBuilding","nearestLocation","nearestLocations","nearestLocationWithDubbing","nearestMines","nearestObject","nearestObjects","nearestTerrainObjects","nearObjects","nearObjectsReady","nearRoads","nearSupplies","nearTargets","needReload","needService","netId","netObjNull","newOverlay","nextMenuItemIndex","nextWeatherChange","nMenuItems","not","numberOfEnginesRTD","numberToDate","objectCurators","objectFromNetId","objectParent","objStatus","onBriefingGroup","onBriefingNotes","onBriefingPlan","onBriefingTeamSwitch","onCommandModeChanged","onDoubleClick","onEachFrame","onGroupIconClick","onGroupIconOverEnter","onGroupIconOverLeave","onHCGroupSelectionChanged","onMapSingleClick","onPlayerConnected","onPlayerDisconnected","onPreloadFinished","onPreloadStarted","onShowNewObject","onTeamSwitch","openCuratorInterface","openDLCPage","openGPS","openMap","openSteamApp","openYoutubeVideo","or","orderGetIn","overcast","overcastForecast","owner","param","params","parseNumber","parseSimpleArray","parseText","parsingNamespace","particlesQuality","periscopeElevation","pickWeaponPool","pitch","pixelGrid","pixelGridBase","pixelGridNoUIScale","pixelH","pixelW","playableSlotsNumber","playableUnits","playAction","playActionNow","player","playerRespawnTime","playerSide","playersNumber","playGesture","playMission","playMove","playMoveNow","playMusic","playScriptedMission","playSound","playSound3D","playSoundUI","pose","position","positionCameraToWorld","posScreenToWorld","posWorldToScreen","ppEffectAdjust","ppEffectCommit","ppEffectCommitted","ppEffectCreate","ppEffectDestroy","ppEffectEnable","ppEffectEnabled","ppEffectForceInNVG","precision","preloadCamera","preloadObject","preloadSound","preloadTitleObj","preloadTitleRsc","preprocessFile","preprocessFileLineNumbers","primaryWeapon","primaryWeaponItems","primaryWeaponMagazine","priority","processDiaryLink","productVersion","profileName","profileNamespace","profileNameSteam","progressLoadingScreen","progressPosition","progressSetPosition","publicVariable","publicVariableClient","publicVariableServer","pushBack","pushBackUnique","putWeaponPool","queryItemsPool","queryMagazinePool","queryWeaponPool","rad","radioChannelAdd","radioChannelCreate","radioChannelInfo","radioChannelRemove","radioChannelSetCallSign","radioChannelSetLabel","radioEnabled","radioVolume","rain","rainbow","rainParams","random","rank","rankId","rating","rectangular","regexFind","regexMatch","regexReplace","registeredTasks","registerTask","reload","reloadEnabled","remoteControl","remoteExec","remoteExecCall","remoteExecutedOwner","remove3DENConnection","remove3DENEventHandler","remove3DENLayer","removeAction","removeAll3DENEventHandlers","removeAllActions","removeAllAssignedItems","removeAllBinocularItems","removeAllContainers","removeAllCuratorAddons","removeAllCuratorCameraAreas","removeAllCuratorEditingAreas","removeAllEventHandlers","removeAllHandgunItems","removeAllItems","removeAllItemsWithMagazines","removeAllMissionEventHandlers","removeAllMPEventHandlers","removeAllMusicEventHandlers","removeAllOwnedMines","removeAllPrimaryWeaponItems","removeAllSecondaryWeaponItems","removeAllUserActionEventHandlers","removeAllWeapons","removeBackpack","removeBackpackGlobal","removeBinocularItem","removeCuratorAddons","removeCuratorCameraArea","removeCuratorEditableObjects","removeCuratorEditingArea","removeDiaryRecord","removeDiarySubject","removeDrawIcon","removeDrawLinks","removeEventHandler","removeFromRemainsCollector","removeGoggles","removeGroupIcon","removeHandgunItem","removeHeadgear","removeItem","removeItemFromBackpack","removeItemFromUniform","removeItemFromVest","removeItems","removeMagazine","removeMagazineGlobal","removeMagazines","removeMagazinesTurret","removeMagazineTurret","removeMenuItem","removeMissionEventHandler","removeMPEventHandler","removeMusicEventHandler","removeOwnedMine","removePrimaryWeaponItem","removeSecondaryWeaponItem","removeSimpleTask","removeSwitchableUnit","removeTeamMember","removeUniform","removeUserActionEventHandler","removeVest","removeWeapon","removeWeaponAttachmentCargo","removeWeaponCargo","removeWeaponGlobal","removeWeaponTurret","reportRemoteTarget","requiredVersion","resetCamShake","resetSubgroupDirection","resize","resources","respawnVehicle","restartEditorCamera","reveal","revealMine","reverse","reversedMouseY","roadAt","roadsConnectedTo","roleDescription","ropeAttachedObjects","ropeAttachedTo","ropeAttachEnabled","ropeAttachTo","ropeCreate","ropeCut","ropeDestroy","ropeDetach","ropeEndPosition","ropeLength","ropes","ropesAttachedTo","ropeSegments","ropeUnwind","ropeUnwound","rotorsForcesRTD","rotorsRpmRTD","round","runInitScript","safeZoneH","safeZoneW","safeZoneWAbs","safeZoneX","safeZoneXAbs","safeZoneY","save3DENInventory","saveGame","saveIdentity","saveJoysticks","saveMissionProfileNamespace","saveOverlay","saveProfileNamespace","saveStatus","saveVar","savingEnabled","say","say2D","say3D","scopeName","score","scoreSide","screenshot","screenToWorld","scriptDone","scriptName","scudState","secondaryWeapon","secondaryWeaponItems","secondaryWeaponMagazine","select","selectBestPlaces","selectDiarySubject","selectedEditorObjects","selectEditorObject","selectionNames","selectionPosition","selectionVectorDirAndUp","selectLeader","selectMax","selectMin","selectNoPlayer","selectPlayer","selectRandom","selectRandomWeighted","selectWeapon","selectWeaponTurret","sendAUMessage","sendSimpleCommand","sendTask","sendTaskResult","sendUDPMessage","sentencesEnabled","serverCommand","serverCommandAvailable","serverCommandExecutable","serverName","serverNamespace","serverTime","set","set3DENAttribute","set3DENAttributes","set3DENGrid","set3DENIconsVisible","set3DENLayer","set3DENLinesVisible","set3DENLogicType","set3DENMissionAttribute","set3DENMissionAttributes","set3DENModelsVisible","set3DENObjectType","set3DENSelected","setAccTime","setActualCollectiveRTD","setAirplaneThrottle","setAirportSide","setAmmo","setAmmoCargo","setAmmoOnPylon","setAnimSpeedCoef","setAperture","setApertureNew","setArmoryPoints","setAttributes","setAutonomous","setBehaviour","setBehaviourStrong","setBleedingRemaining","setBrakesRTD","setCameraInterest","setCamShakeDefParams","setCamShakeParams","setCamUseTi","setCaptive","setCenterOfMass","setCollisionLight","setCombatBehaviour","setCombatMode","setCompassOscillation","setConvoySeparation","setCruiseControl","setCuratorCameraAreaCeiling","setCuratorCoef","setCuratorEditingAreaType","setCuratorWaypointCost","setCurrentChannel","setCurrentTask","setCurrentWaypoint","setCustomAimCoef","SetCustomMissionData","setCustomSoundController","setCustomWeightRTD","setDamage","setDammage","setDate","setDebriefingText","setDefaultCamera","setDestination","setDetailMapBlendPars","setDiaryRecordText","setDiarySubjectPicture","setDir","setDirection","setDrawIcon","setDriveOnPath","setDropInterval","setDynamicSimulationDistance","setDynamicSimulationDistanceCoef","setEditorMode","setEditorObjectScope","setEffectCondition","setEffectiveCommander","setEngineRpmRTD","setFace","setFaceanimation","setFatigue","setFeatureType","setFlagAnimationPhase","setFlagOwner","setFlagSide","setFlagTexture","setFog","setForceGeneratorRTD","setFormation","setFormationTask","setFormDir","setFriend","setFromEditor","setFSMVariable","setFuel","setFuelCargo","setGroupIcon","setGroupIconParams","setGroupIconsSelectable","setGroupIconsVisible","setGroupid","setGroupIdGlobal","setGroupOwner","setGusts","setHideBehind","setHit","setHitIndex","setHitPointDamage","setHorizonParallaxCoef","setHUDMovementLevels","setHumidity","setIdentity","setImportance","setInfoPanel","setLeader","setLightAmbient","setLightAttenuation","setLightBrightness","setLightColor","setLightConePars","setLightDayLight","setLightFlareMaxDistance","setLightFlareSize","setLightIntensity","setLightIR","setLightnings","setLightUseFlare","setLightVolumeShape","setLocalWindParams","setMagazineTurretAmmo","setMarkerAlpha","setMarkerAlphaLocal","setMarkerBrush","setMarkerBrushLocal","setMarkerColor","setMarkerColorLocal","setMarkerDir","setMarkerDirLocal","setMarkerPolyline","setMarkerPolylineLocal","setMarkerPos","setMarkerPosLocal","setMarkerShadow","setMarkerShadowLocal","setMarkerShape","setMarkerShapeLocal","setMarkerSize","setMarkerSizeLocal","setMarkerText","setMarkerTextLocal","setMarkerType","setMarkerTypeLocal","setMass","setMaxLoad","setMimic","setMissileTarget","setMissileTargetPos","setMousePosition","setMusicEffect","setMusicEventHandler","setName","setNameSound","setObjectArguments","setObjectMaterial","setObjectMaterialGlobal","setObjectProxy","setObjectScale","setObjectTexture","setObjectTextureGlobal","setObjectViewDistance","setOpticsMode","setOvercast","setOwner","setOxygenRemaining","setParticleCircle","setParticleClass","setParticleFire","setParticleParams","setParticleRandom","setPilotCameraDirection","setPilotCameraRotation","setPilotCameraTarget","setPilotLight","setPiPEffect","setPiPViewDistance","setPitch","setPlateNumber","setPlayable","setPlayerRespawnTime","setPlayerVoNVolume","setPos","setPosASL","setPosASL2","setPosASLW","setPosATL","setPosition","setPosWorld","setPylonLoadout","setPylonsPriority","setRadioMsg","setRain","setRainbow","setRandomLip","setRank","setRectangular","setRepairCargo","setRotorBrakeRTD","setShadowDistance","setShotParents","setSide","setSimpleTaskAlwaysVisible","setSimpleTaskCustomData","setSimpleTaskDescription","setSimpleTaskDestination","setSimpleTaskTarget","setSimpleTaskType","setSimulWeatherLayers","setSize","setSkill","setSlingLoad","setSoundEffect","setSpeaker","setSpeech","setSpeedMode","setStamina","setStaminaScheme","setStatValue","setSuppression","setSystemOfUnits","setTargetAge","setTaskMarkerOffset","setTaskResult","setTaskState","setTerrainGrid","setTerrainHeight","setText","setTimeMultiplier","setTiParameter","setTitleEffect","setTowParent","setTrafficDensity","setTrafficDistance","setTrafficGap","setTrafficSpeed","setTriggerActivation","setTriggerArea","setTriggerInterval","setTriggerStatements","setTriggerText","setTriggerTimeout","setTriggerType","setTurretLimits","setTurretOpticsMode","setType","setUnconscious","setUnitAbility","setUnitCombatMode","setUnitFreefallHeight","setUnitLoadout","setUnitPos","setUnitPosWeak","setUnitRank","setUnitRecoilCoefficient","setUnitTrait","setUnloadInCombat","setUserActionText","setUserMFDText","setUserMFDValue","setVariable","setVectorDir","setVectorDirAndUp","setVectorUp","setVehicleAmmo","setVehicleAmmoDef","setVehicleArmor","setVehicleCargo","setVehicleId","setVehicleLock","setVehiclePosition","setVehicleRadar","setVehicleReceiveRemoteTargets","setVehicleReportOwnPosition","setVehicleReportRemoteTargets","setVehicleTiPars","setVehicleVarName","setVelocity","setVelocityModelSpace","setVelocityTransformation","setViewDistance","setVisibleIfTreeCollapsed","setWantedRPMRTD","setWaves","setWaypointBehaviour","setWaypointCombatMode","setWaypointCompletionRadius","setWaypointDescription","setWaypointForceBehaviour","setWaypointFormation","setWaypointHousePosition","setWaypointLoiterAltitude","setWaypointLoiterRadius","setWaypointLoiterType","setWaypointName","setWaypointPosition","setWaypointScript","setWaypointSpeed","setWaypointStatements","setWaypointTimeout","setWaypointType","setWaypointVisible","setWeaponReloadingTime","setWeaponZeroing","setWind","setWindDir","setWindForce","setWindStr","setWingForceScaleRTD","setWPPos","show3DIcons","showChat","showCinemaBorder","showCommandingMenu","showCompass","showCuratorCompass","showGps","showHUD","showLegend","showMap","shownArtilleryComputer","shownChat","shownCompass","shownCuratorCompass","showNewEditorObject","shownGps","shownHUD","shownMap","shownPad","shownRadio","shownScoretable","shownSubtitles","shownUAVFeed","shownWarrant","shownWatch","showPad","showRadio","showScoretable","showSubtitles","showUAVFeed","showWarrant","showWatch","showWaypoint","showWaypoints","side","sideChat","sideRadio","simpleTasks","simulationEnabled","simulCloudDensity","simulCloudOcclusion","simulInClouds","simulWeatherSync","sin","size","sizeOf","skill","skillFinal","skipTime","sleep","sliderPosition","sliderRange","sliderSetPosition","sliderSetRange","sliderSetSpeed","sliderSpeed","slingLoadAssistantShown","soldierMagazines","someAmmo","sort","soundVolume","spawn","speaker","speechVolume","speed","speedMode","splitString","sqrt","squadParams","stance","startLoadingScreen","stop","stopEngineRTD","stopped","str","sunOrMoon","supportInfo","suppressFor","surfaceIsWater","surfaceNormal","surfaceTexture","surfaceType","swimInDepth","switchableUnits","switchAction","switchCamera","switchGesture","switchLight","switchMove","synchronizedObjects","synchronizedTriggers","synchronizedWaypoints","synchronizeObjectsAdd","synchronizeObjectsRemove","synchronizeTrigger","synchronizeWaypoint","systemChat","systemOfUnits","systemTime","systemTimeUTC","tan","targetKnowledge","targets","targetsAggregate","targetsQuery","taskAlwaysVisible","taskChildren","taskCompleted","taskCustomData","taskDescription","taskDestination","taskHint","taskMarkerOffset","taskName","taskParent","taskResult","taskState","taskType","teamMember","teamName","teams","teamSwitch","teamSwitchEnabled","teamType","terminate","terrainIntersect","terrainIntersectASL","terrainIntersectAtASL","text","textLog","textLogFormat","tg","time","timeMultiplier","titleCut","titleFadeOut","titleObj","titleRsc","titleText","toArray","toFixed","toLower","toLowerANSI","toString","toUpper","toUpperANSI","triggerActivated","triggerActivation","triggerAmmo","triggerArea","triggerAttachedVehicle","triggerAttachObject","triggerAttachVehicle","triggerDynamicSimulation","triggerInterval","triggerStatements","triggerText","triggerTimeout","triggerTimeoutCurrent","triggerType","trim","turretLocal","turretOwner","turretUnit","tvAdd","tvClear","tvCollapse","tvCollapseAll","tvCount","tvCurSel","tvData","tvDelete","tvExpand","tvExpandAll","tvIsSelected","tvPicture","tvPictureRight","tvSelection","tvSetColor","tvSetCurSel","tvSetData","tvSetPicture","tvSetPictureColor","tvSetPictureColorDisabled","tvSetPictureColorSelected","tvSetPictureRight","tvSetPictureRightColor","tvSetPictureRightColorDisabled","tvSetPictureRightColorSelected","tvSetSelectColor","tvSetSelected","tvSetText","tvSetTooltip","tvSetValue","tvSort","tvSortAll","tvSortByValue","tvSortByValueAll","tvText","tvTooltip","tvValue","type","typeName","typeOf","UAVControl","uiNamespace","uiSleep","unassignCurator","unassignItem","unassignTeam","unassignVehicle","underwater","uniform","uniformContainer","uniformItems","uniformMagazines","uniqueUnitItems","unitAddons","unitAimPosition","unitAimPositionVisual","unitBackpack","unitCombatMode","unitIsUAV","unitPos","unitReady","unitRecoilCoefficient","units","unitsBelowHeight","unitTurret","unlinkItem","unlockAchievement","unregisterTask","updateDrawIcon","updateMenuItem","updateObjectTree","useAIOperMapObstructionTest","useAISteeringComponent","useAudioTimeForMoves","userInputDisabled","values","vectorAdd","vectorCos","vectorCrossProduct","vectorDiff","vectorDir","vectorDirVisual","vectorDistance","vectorDistanceSqr","vectorDotProduct","vectorFromTo","vectorLinearConversion","vectorMagnitude","vectorMagnitudeSqr","vectorModelToWorld","vectorModelToWorldVisual","vectorMultiply","vectorNormalized","vectorUp","vectorUpVisual","vectorWorldToModel","vectorWorldToModelVisual","vehicle","vehicleCargoEnabled","vehicleChat","vehicleMoveInfo","vehicleRadio","vehicleReceiveRemoteTargets","vehicleReportOwnPosition","vehicleReportRemoteTargets","vehicles","vehicleVarName","velocity","velocityModelSpace","verifySignature","vest","vestContainer","vestItems","vestMagazines","viewDistance","visibleCompass","visibleGps","visibleMap","visiblePosition","visiblePositionASL","visibleScoretable","visibleWatch","waves","waypointAttachedObject","waypointAttachedVehicle","waypointAttachObject","waypointAttachVehicle","waypointBehaviour","waypointCombatMode","waypointCompletionRadius","waypointDescription","waypointForceBehaviour","waypointFormation","waypointHousePosition","waypointLoiterAltitude","waypointLoiterRadius","waypointLoiterType","waypointName","waypointPosition","waypoints","waypointScript","waypointsEnabledUAV","waypointShow","waypointSpeed","waypointStatements","waypointTimeout","waypointTimeoutCurrent","waypointType","waypointVisible","weaponAccessories","weaponAccessoriesCargo","weaponCargo","weaponDirection","weaponInertia","weaponLowered","weaponReloadingTime","weapons","weaponsInfo","weaponsItems","weaponsItemsCargo","weaponState","weaponsTurret","weightRTD","WFSideText","wind","windDir","windRTD","windStr","wingsForcesRTD","worldName","worldSize","worldToModel","worldToModelVisual","worldToScreen"],
+literal:["blufor","civilian","configNull","controlNull","displayNull","diaryRecordNull","east","endl","false","grpNull","independent","lineBreak","locationNull","nil","objNull","opfor","pi","resistance","scriptNull","sideAmbientLife","sideEmpty","sideEnemy","sideFriendly","sideLogic","sideUnknown","taskNull","teamMemberNull","true","west"]
 },contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.NUMBER_MODE,{
 className:"variable",begin:/\b_+[a-zA-Z]\w*/},{className:"title",
-begin:/[a-zA-Z]\w+_fnc_\w+/},t,a],illegal:/#|^\$ /}}})()
-;hljs.registerLanguage("sqf",e)})();
\ No newline at end of file
+begin:/[a-zA-Z][a-zA-Z_0-9]*_fnc_[a-zA-Z_0-9]+/},t,a],
+illegal:[/\$[^a-fA-F0-9]/,/\w\$/,/\?/,/@/,/ \| /,/[a-zA-Z_]\./,/\:\=/,/\[\:/]}}
+})();hljs.registerLanguage("sqf",e)})();
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/sql.min.js b/vendor/assets/javascripts/highlightjs/languages/sql.min.js
index af8dd15ed46..7b53fee1eb5 100644
--- a/vendor/assets/javascripts/highlightjs/languages/sql.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/sql.min.js
@@ -1,4 +1,4 @@
-/*! `sql` grammar compiled for Highlight.js 11.6.0 */
+/*! `sql` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const r=e.regex,t=e.COMMENT("--","$"),n=["true","false","unknown"],a=["bigint","binary","blob","boolean","char","character","clob","date","dec","decfloat","decimal","float","int","integer","interval","nchar","nclob","national","numeric","real","row","smallint","time","timestamp","varchar","varying","varbinary"],i=["abs","acos","array_agg","asin","atan","avg","cast","ceil","ceiling","coalesce","corr","cos","cosh","count","covar_pop","covar_samp","cume_dist","dense_rank","deref","element","exp","extract","first_value","floor","json_array","json_arrayagg","json_exists","json_object","json_objectagg","json_query","json_table","json_table_primitive","json_value","lag","last_value","lead","listagg","ln","log","log10","lower","max","min","mod","nth_value","ntile","nullif","percent_rank","percentile_cont","percentile_disc","position","position_regex","power","rank","regr_avgx","regr_avgy","regr_count","regr_intercept","regr_r2","regr_slope","regr_sxx","regr_sxy","regr_syy","row_number","sin","sinh","sqrt","stddev_pop","stddev_samp","substring","substring_regex","sum","tan","tanh","translate","translate_regex","treat","trim","trim_array","unnest","upper","value_of","var_pop","var_samp","width_bucket"],s=["create table","insert into","primary key","foreign key","not null","alter table","add constraint","grouping sets","on overflow","character set","respect nulls","ignore nulls","nulls first","nulls last","depth first","breadth first"],o=i,c=["abs","acos","all","allocate","alter","and","any","are","array","array_agg","array_max_cardinality","as","asensitive","asin","asymmetric","at","atan","atomic","authorization","avg","begin","begin_frame","begin_partition","between","bigint","binary","blob","boolean","both","by","call","called","cardinality","cascaded","case","cast","ceil","ceiling","char","char_length","character","character_length","check","classifier","clob","close","coalesce","collate","collect","column","commit","condition","connect","constraint","contains","convert","copy","corr","corresponding","cos","cosh","count","covar_pop","covar_samp","create","cross","cube","cume_dist","current","current_catalog","current_date","current_default_transform_group","current_path","current_role","current_row","current_schema","current_time","current_timestamp","current_path","current_role","current_transform_group_for_type","current_user","cursor","cycle","date","day","deallocate","dec","decimal","decfloat","declare","default","define","delete","dense_rank","deref","describe","deterministic","disconnect","distinct","double","drop","dynamic","each","element","else","empty","end","end_frame","end_partition","end-exec","equals","escape","every","except","exec","execute","exists","exp","external","extract","false","fetch","filter","first_value","float","floor","for","foreign","frame_row","free","from","full","function","fusion","get","global","grant","group","grouping","groups","having","hold","hour","identity","in","indicator","initial","inner","inout","insensitive","insert","int","integer","intersect","intersection","interval","into","is","join","json_array","json_arrayagg","json_exists","json_object","json_objectagg","json_query","json_table","json_table_primitive","json_value","lag","language","large","last_value","lateral","lead","leading","left","like","like_regex","listagg","ln","local","localtime","localtimestamp","log","log10","lower","match","match_number","match_recognize","matches","max","member","merge","method","min","minute","mod","modifies","module","month","multiset","national","natural","nchar","nclob","new","no","none","normalize","not","nth_value","ntile","null","nullif","numeric","octet_length","occurrences_regex","of","offset","old","omit","on","one","only","open","or","order","out","outer","over","overlaps","overlay","parameter","partition","pattern","per","percent","percent_rank","percentile_cont","percentile_disc","period","portion","position","position_regex","power","precedes","precision","prepare","primary","procedure","ptf","range","rank","reads","real","recursive","ref","references","referencing","regr_avgx","regr_avgy","regr_count","regr_intercept","regr_r2","regr_slope","regr_sxx","regr_sxy","regr_syy","release","result","return","returns","revoke","right","rollback","rollup","row","row_number","rows","running","savepoint","scope","scroll","search","second","seek","select","sensitive","session_user","set","show","similar","sin","sinh","skip","smallint","some","specific","specifictype","sql","sqlexception","sqlstate","sqlwarning","sqrt","start","static","stddev_pop","stddev_samp","submultiset","subset","substring","substring_regex","succeeds","sum","symmetric","system","system_time","system_user","table","tablesample","tan","tanh","then","time","timestamp","timezone_hour","timezone_minute","to","trailing","translate","translate_regex","translation","treat","trigger","trim","trim_array","true","truncate","uescape","union","unique","unknown","unnest","update","upper","user","using","value","values","value_of","var_pop","var_samp","varbinary","varchar","varying","versioning","when","whenever","where","width_bucket","window","with","within","without","year","add","asc","collation","desc","final","first","last","view"].filter((e=>!i.includes(e))),l={
 begin:r.concat(/\b/,r.either(...o),/\s*\(/),relevance:0,keywords:{built_in:o}}
@@ -10,8 +10,8 @@ built_in:["current_catalog","current_date","current_default_transform_group","cu
 },contains:[{begin:r.either(...s),relevance:0,keywords:{$pattern:/[\w\.]+/,
 keyword:c.concat(s),literal:n,type:a}},{className:"type",
 begin:r.either("double precision","large object","with timezone","without timezone")
-},l,{className:"variable",begin:/@[a-z0-9]+/},{className:"string",variants:[{
-begin:/'/,end:/'/,contains:[{begin:/''/}]}]},{begin:/"/,end:/"/,contains:[{
-begin:/""/}]},e.C_NUMBER_MODE,e.C_BLOCK_COMMENT_MODE,t,{className:"operator",
-begin:/[-+*/=%^~]|&&?|\|\|?|!=?|<(?:=>?|<|>)?|>[>=]?/,relevance:0}]}}})()
-;hljs.registerLanguage("sql",e)})();
\ No newline at end of file
+},l,{className:"variable",begin:/@[a-z0-9][a-z0-9_]*/},{className:"string",
+variants:[{begin:/'/,end:/'/,contains:[{begin:/''/}]}]},{begin:/"/,end:/"/,
+contains:[{begin:/""/}]},e.C_NUMBER_MODE,e.C_BLOCK_COMMENT_MODE,t,{
+className:"operator",begin:/[-+*/=%^~]|&&?|\|\|?|!=?|<(?:=>?|<|>)?|>[>=]?/,
+relevance:0}]}}})();hljs.registerLanguage("sql",e)})();
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/stan.min.js b/vendor/assets/javascripts/highlightjs/languages/stan.min.js
index 9bfc5178e57..0dfb9961e7e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/stan.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/stan.min.js
@@ -1,4 +1,4 @@
-/*! `stan` grammar compiled for Highlight.js 11.6.0 */
+/*! `stan` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const _=e.regex,o=["bernoulli","bernoulli_logit","bernoulli_logit_glm","beta","beta_binomial","beta_proportion","binomial","binomial_logit","categorical","categorical_logit","categorical_logit_glm","cauchy","chi_square","dirichlet","discrete_range","double_exponential","exp_mod_normal","exponential","frechet","gamma","gaussian_dlm_obs","gumbel","hmm_latent","hypergeometric","inv_chi_square","inv_gamma","inv_wishart","lkj_corr","lkj_corr_cholesky","logistic","lognormal","multi_gp","multi_gp_cholesky","multi_normal","multi_normal_cholesky","multi_normal_prec","multi_student_t","multinomial","multinomial_logit","neg_binomial","neg_binomial_2","neg_binomial_2_log","neg_binomial_2_log_glm","normal","normal_id_glm","ordered_logistic","ordered_logistic_glm","ordered_probit","pareto","pareto_type_2","poisson","poisson_log","poisson_log_glm","rayleigh","scaled_inv_chi_square","skew_double_exponential","skew_normal","std_normal","student_t","uniform","von_mises","weibull","wiener","wishart"],i=e.COMMENT(/\/\*/,/\*\//,{
 relevance:0,contains:[{scope:"doctag",match:/@(return|param)/}]}),r={
diff --git a/vendor/assets/javascripts/highlightjs/languages/stata.min.js b/vendor/assets/javascripts/highlightjs/languages/stata.min.js
index dbb8c46e6e2..a073b0b2b24 100644
--- a/vendor/assets/javascripts/highlightjs/languages/stata.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/stata.min.js
@@ -1,4 +1,4 @@
-/*! `stata` grammar compiled for Highlight.js 11.6.0 */
+/*! `stata` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"Stata",aliases:["do","ado"],
 case_insensitive:!0,
 keywords:"if else in foreach for forv forva forval forvalu forvalue forvalues by bys bysort xi quietly qui capture about ac ac_7 acprplot acprplot_7 adjust ado adopath adoupdate alpha ameans an ano anov anova anova_estat anova_terms anovadef aorder ap app appe appen append arch arch_dr arch_estat arch_p archlm areg areg_p args arima arima_dr arima_estat arima_p as asmprobit asmprobit_estat asmprobit_lf asmprobit_mfx__dlg asmprobit_p ass asse asser assert avplot avplot_7 avplots avplots_7 bcskew0 bgodfrey bias binreg bip0_lf biplot bipp_lf bipr_lf bipr_p biprobit bitest bitesti bitowt blogit bmemsize boot bootsamp bootstrap bootstrap_8 boxco_l boxco_p boxcox boxcox_6 boxcox_p bprobit br break brier bro brow brows browse brr brrstat bs bs_7 bsampl_w bsample bsample_7 bsqreg bstat bstat_7 bstat_8 bstrap bstrap_7 bubble bubbleplot ca ca_estat ca_p cabiplot camat canon canon_8 canon_8_p canon_estat canon_p cap caprojection capt captu captur capture cat cc cchart cchart_7 cci cd censobs_table centile cf char chdir checkdlgfiles checkestimationsample checkhlpfiles checksum chelp ci cii cl class classutil clear cli clis clist clo clog clog_lf clog_p clogi clogi_sw clogit clogit_lf clogit_p clogitp clogl_sw cloglog clonevar clslistarray cluster cluster_measures cluster_stop cluster_tree cluster_tree_8 clustermat cmdlog cnr cnre cnreg cnreg_p cnreg_sw cnsreg codebook collaps4 collapse colormult_nb colormult_nw compare compress conf confi confir confirm conren cons const constr constra constrai constrain constraint continue contract copy copyright copysource cor corc corr corr2data corr_anti corr_kmo corr_smc corre correl correla correlat correlate corrgram cou coun count cox cox_p cox_sw coxbase coxhaz coxvar cprplot cprplot_7 crc cret cretu cretur creturn cross cs cscript cscript_log csi ct ct_is ctset ctst_5 ctst_st cttost cumsp cumsp_7 cumul cusum cusum_7 cutil d|0 datasig datasign datasigna datasignat datasignatu datasignatur datasignature datetof db dbeta de dec deco decod decode deff des desc descr descri describ describe destring dfbeta dfgls dfuller di di_g dir dirstats dis discard disp disp_res disp_s displ displa display distinct do doe doed doedi doedit dotplot dotplot_7 dprobit drawnorm drop ds ds_util dstdize duplicates durbina dwstat dydx e|0 ed edi edit egen eivreg emdef en enc enco encod encode eq erase ereg ereg_lf ereg_p ereg_sw ereghet ereghet_glf ereghet_glf_sh ereghet_gp ereghet_ilf ereghet_ilf_sh ereghet_ip eret eretu eretur ereturn err erro error esize est est_cfexist est_cfname est_clickable est_expand est_hold est_table est_unhold est_unholdok estat estat_default estat_summ estat_vce_only esti estimates etodow etof etomdy ex exi exit expand expandcl fac fact facto factor factor_estat factor_p factor_pca_rotated factor_rotate factormat fcast fcast_compute fcast_graph fdades fdadesc fdadescr fdadescri fdadescrib fdadescribe fdasav fdasave fdause fh_st file open file read file close file filefilter fillin find_hlp_file findfile findit findit_7 fit fl fli flis flist for5_0 forest forestplot form forma format fpredict frac_154 frac_adj frac_chk frac_cox frac_ddp frac_dis frac_dv frac_in frac_mun frac_pp frac_pq frac_pv frac_wgt frac_xo fracgen fracplot fracplot_7 fracpoly fracpred fron_ex fron_hn fron_p fron_tn fron_tn2 frontier ftodate ftoe ftomdy ftowdate funnel funnelplot g|0 gamhet_glf gamhet_gp gamhet_ilf gamhet_ip gamma gamma_d2 gamma_p gamma_sw gammahet gdi_hexagon gdi_spokes ge gen gene gener genera generat generate genrank genstd genvmean gettoken gl gladder gladder_7 glim_l01 glim_l02 glim_l03 glim_l04 glim_l05 glim_l06 glim_l07 glim_l08 glim_l09 glim_l10 glim_l11 glim_l12 glim_lf glim_mu glim_nw1 glim_nw2 glim_nw3 glim_p glim_v1 glim_v2 glim_v3 glim_v4 glim_v5 glim_v6 glim_v7 glm glm_6 glm_p glm_sw glmpred glo glob globa global glogit glogit_8 glogit_p gmeans gnbre_lf gnbreg gnbreg_5 gnbreg_p gomp_lf gompe_sw gomper_p gompertz gompertzhet gomphet_glf gomphet_glf_sh gomphet_gp gomphet_ilf gomphet_ilf_sh gomphet_ip gphdot gphpen gphprint gprefs gprobi_p gprobit gprobit_8 gr gr7 gr_copy gr_current gr_db gr_describe gr_dir gr_draw gr_draw_replay gr_drop gr_edit gr_editviewopts gr_example gr_example2 gr_export gr_print gr_qscheme gr_query gr_read gr_rename gr_replay gr_save gr_set gr_setscheme gr_table gr_undo gr_use graph graph7 grebar greigen greigen_7 greigen_8 grmeanby grmeanby_7 gs_fileinfo gs_filetype gs_graphinfo gs_stat gsort gwood h|0 hadimvo hareg hausman haver he heck_d2 heckma_p heckman heckp_lf heckpr_p heckprob hel help hereg hetpr_lf hetpr_p hetprob hettest hexdump hilite hist hist_7 histogram hlogit hlu hmeans hotel hotelling hprobit hreg hsearch icd9 icd9_ff icd9p iis impute imtest inbase include inf infi infil infile infix inp inpu input ins insheet insp inspe inspec inspect integ inten intreg intreg_7 intreg_p intrg2_ll intrg_ll intrg_ll2 ipolate iqreg ir irf irf_create irfm iri is_svy is_svysum isid istdize ivprob_1_lf ivprob_lf ivprobit ivprobit_p ivreg ivreg_footnote ivtob_1_lf ivtob_lf ivtobit ivtobit_p jackknife jacknife jknife jknife_6 jknife_8 jkstat joinby kalarma1 kap kap_3 kapmeier kappa kapwgt kdensity kdensity_7 keep ksm ksmirnov ktau kwallis l|0 la lab labbe labbeplot labe label labelbook ladder levels levelsof leverage lfit lfit_p li lincom line linktest lis list lloghet_glf lloghet_glf_sh lloghet_gp lloghet_ilf lloghet_ilf_sh lloghet_ip llogi_sw llogis_p llogist llogistic llogistichet lnorm_lf lnorm_sw lnorma_p lnormal lnormalhet lnormhet_glf lnormhet_glf_sh lnormhet_gp lnormhet_ilf lnormhet_ilf_sh lnormhet_ip lnskew0 loadingplot loc loca local log logi logis_lf logistic logistic_p logit logit_estat logit_p loglogs logrank loneway lookfor lookup lowess lowess_7 lpredict lrecomp lroc lroc_7 lrtest ls lsens lsens_7 lsens_x lstat ltable ltable_7 ltriang lv lvr2plot lvr2plot_7 m|0 ma mac macr macro makecns man manova manova_estat manova_p manovatest mantel mark markin markout marksample mat mat_capp mat_order mat_put_rr mat_rapp mata mata_clear mata_describe mata_drop mata_matdescribe mata_matsave mata_matuse mata_memory mata_mlib mata_mosave mata_rename mata_which matalabel matcproc matlist matname matr matri matrix matrix_input__dlg matstrik mcc mcci md0_ md1_ md1debug_ md2_ md2debug_ mds mds_estat mds_p mdsconfig mdslong mdsmat mdsshepard mdytoe mdytof me_derd mean means median memory memsize menl meqparse mer merg merge meta mfp mfx mhelp mhodds minbound mixed_ll mixed_ll_reparm mkassert mkdir mkmat mkspline ml ml_5 ml_adjs ml_bhhhs ml_c_d ml_check ml_clear ml_cnt ml_debug ml_defd ml_e0 ml_e0_bfgs ml_e0_cycle ml_e0_dfp ml_e0i ml_e1 ml_e1_bfgs ml_e1_bhhh ml_e1_cycle ml_e1_dfp ml_e2 ml_e2_cycle ml_ebfg0 ml_ebfr0 ml_ebfr1 ml_ebh0q ml_ebhh0 ml_ebhr0 ml_ebr0i ml_ecr0i ml_edfp0 ml_edfr0 ml_edfr1 ml_edr0i ml_eds ml_eer0i ml_egr0i ml_elf ml_elf_bfgs ml_elf_bhhh ml_elf_cycle ml_elf_dfp ml_elfi ml_elfs ml_enr0i ml_enrr0 ml_erdu0 ml_erdu0_bfgs ml_erdu0_bhhh ml_erdu0_bhhhq ml_erdu0_cycle ml_erdu0_dfp ml_erdu0_nrbfgs ml_exde ml_footnote ml_geqnr ml_grad0 ml_graph ml_hbhhh ml_hd0 ml_hold ml_init ml_inv ml_log ml_max ml_mlout ml_mlout_8 ml_model ml_nb0 ml_opt ml_p ml_plot ml_query ml_rdgrd ml_repor ml_s_e ml_score ml_searc ml_technique ml_unhold mleval mlf_ mlmatbysum mlmatsum mlog mlogi mlogit mlogit_footnote mlogit_p mlopts mlsum mlvecsum mnl0_ mor more mov move mprobit mprobit_lf mprobit_p mrdu0_ mrdu1_ mvdecode mvencode mvreg mvreg_estat n|0 nbreg nbreg_al nbreg_lf nbreg_p nbreg_sw nestreg net newey newey_7 newey_p news nl nl_7 nl_9 nl_9_p nl_p nl_p_7 nlcom nlcom_p nlexp2 nlexp2_7 nlexp2a nlexp2a_7 nlexp3 nlexp3_7 nlgom3 nlgom3_7 nlgom4 nlgom4_7 nlinit nllog3 nllog3_7 nllog4 nllog4_7 nlog_rd nlogit nlogit_p nlogitgen nlogittree nlpred no nobreak noi nois noisi noisil noisily note notes notes_dlg nptrend numlabel numlist odbc old_ver olo olog ologi ologi_sw ologit ologit_p ologitp on one onew onewa oneway op_colnm op_comp op_diff op_inv op_str opr opro oprob oprob_sw oprobi oprobi_p oprobit oprobitp opts_exclusive order orthog orthpoly ou out outf outfi outfil outfile outs outsh outshe outshee outsheet ovtest pac pac_7 palette parse parse_dissim pause pca pca_8 pca_display pca_estat pca_p pca_rotate pcamat pchart pchart_7 pchi pchi_7 pcorr pctile pentium pergram pergram_7 permute permute_8 personal peto_st pkcollapse pkcross pkequiv pkexamine pkexamine_7 pkshape pksumm pksumm_7 pl plo plot plugin pnorm pnorm_7 poisgof poiss_lf poiss_sw poisso_p poisson poisson_estat post postclose postfile postutil pperron pr prais prais_e prais_e2 prais_p predict predictnl preserve print pro prob probi probit probit_estat probit_p proc_time procoverlay procrustes procrustes_estat procrustes_p profiler prog progr progra program prop proportion prtest prtesti pwcorr pwd q\\s qby qbys qchi qchi_7 qladder qladder_7 qnorm qnorm_7 qqplot qqplot_7 qreg qreg_c qreg_p qreg_sw qu quadchk quantile quantile_7 que quer query range ranksum ratio rchart rchart_7 rcof recast reclink recode reg reg3 reg3_p regdw regr regre regre_p2 regres regres_p regress regress_estat regriv_p remap ren rena renam rename renpfix repeat replace report reshape restore ret retu retur return rm rmdir robvar roccomp roccomp_7 roccomp_8 rocf_lf rocfit rocfit_8 rocgold rocplot rocplot_7 roctab roctab_7 rolling rologit rologit_p rot rota rotat rotate rotatemat rreg rreg_p ru run runtest rvfplot rvfplot_7 rvpplot rvpplot_7 sa safesum sample sampsi sav save savedresults saveold sc sca scal scala scalar scatter scm_mine sco scob_lf scob_p scobi_sw scobit scor score scoreplot scoreplot_help scree screeplot screeplot_help sdtest sdtesti se search separate seperate serrbar serrbar_7 serset set set_defaults sfrancia sh she shel shell shewhart shewhart_7 signestimationsample signrank signtest simul simul_7 simulate simulate_8 sktest sleep slogit slogit_d2 slogit_p smooth snapspan so sor sort spearman spikeplot spikeplot_7 spikeplt spline_x split sqreg sqreg_p sret sretu sretur sreturn ssc st st_ct st_hc st_hcd st_hcd_sh st_is st_issys st_note st_promo st_set st_show st_smpl st_subid stack statsby statsby_8 stbase stci stci_7 stcox stcox_estat stcox_fr stcox_fr_ll stcox_p stcox_sw stcoxkm stcoxkm_7 stcstat stcurv stcurve stcurve_7 stdes stem stepwise stereg stfill stgen stir stjoin stmc stmh stphplot stphplot_7 stphtest stphtest_7 stptime strate strate_7 streg streg_sw streset sts sts_7 stset stsplit stsum sttocc sttoct stvary stweib su suest suest_8 sum summ summa summar summari summariz summarize sunflower sureg survcurv survsum svar svar_p svmat svy svy_disp svy_dreg svy_est svy_est_7 svy_estat svy_get svy_gnbreg_p svy_head svy_header svy_heckman_p svy_heckprob_p svy_intreg_p svy_ivreg_p svy_logistic_p svy_logit_p svy_mlogit_p svy_nbreg_p svy_ologit_p svy_oprobit_p svy_poisson_p svy_probit_p svy_regress_p svy_sub svy_sub_7 svy_x svy_x_7 svy_x_p svydes svydes_8 svygen svygnbreg svyheckman svyheckprob svyintreg svyintreg_7 svyintrg svyivreg svylc svylog_p svylogit svymarkout svymarkout_8 svymean svymlog svymlogit svynbreg svyolog svyologit svyoprob svyoprobit svyopts svypois svypois_7 svypoisson svyprobit svyprobt svyprop svyprop_7 svyratio svyreg svyreg_p svyregress svyset svyset_7 svyset_8 svytab svytab_7 svytest svytotal sw sw_8 swcnreg swcox swereg swilk swlogis swlogit swologit swoprbt swpois swprobit swqreg swtobit swweib symmetry symmi symplot symplot_7 syntax sysdescribe sysdir sysuse szroeter ta tab tab1 tab2 tab_or tabd tabdi tabdis tabdisp tabi table tabodds tabodds_7 tabstat tabu tabul tabula tabulat tabulate te tempfile tempname tempvar tes test testnl testparm teststd tetrachoric time_it timer tis tob tobi tobit tobit_p tobit_sw token tokeni tokeniz tokenize tostring total translate translator transmap treat_ll treatr_p treatreg trim trimfill trnb_cons trnb_mean trpoiss_d2 trunc_ll truncr_p truncreg tsappend tset tsfill tsline tsline_ex tsreport tsrevar tsrline tsset tssmooth tsunab ttest ttesti tut_chk tut_wait tutorial tw tware_st two twoway twoway__fpfit_serset twoway__function_gen twoway__histogram_gen twoway__ipoint_serset twoway__ipoints_serset twoway__kdensity_gen twoway__lfit_serset twoway__normgen_gen twoway__pci_serset twoway__qfit_serset twoway__scatteri_serset twoway__sunflower_gen twoway_ksm_serset ty typ type typeof u|0 unab unabbrev unabcmd update us use uselabel var var_mkcompanion var_p varbasic varfcast vargranger varirf varirf_add varirf_cgraph varirf_create varirf_ctable varirf_describe varirf_dir varirf_drop varirf_erase varirf_graph varirf_ograph varirf_rename varirf_set varirf_table varlist varlmar varnorm varsoc varstable varstable_w varstable_w2 varwle vce vec vec_fevd vec_mkphi vec_p vec_p_w vecirf_create veclmar veclmar_w vecnorm vecnorm_w vecrank vecstable verinst vers versi versio version view viewsource vif vwls wdatetof webdescribe webseek webuse weib1_lf weib2_lf weib_lf weib_lf0 weibhet_glf weibhet_glf_sh weibhet_glfa weibhet_glfa_sh weibhet_gp weibhet_ilf weibhet_ilf_sh weibhet_ilfa weibhet_ilfa_sh weibhet_ip weibu_sw weibul_p weibull weibull_c weibull_s weibullhet wh whelp whi which whil while wilc_st wilcoxon win wind windo window winexec wntestb wntestb_7 wntestq xchart xchart_7 xcorr xcorr_7 xi xi_6 xmlsav xmlsave xmluse xpose xsh xshe xshel xshell xt_iis xt_tis xtab_p xtabond xtbin_p xtclog xtcloglog xtcloglog_8 xtcloglog_d2 xtcloglog_pa_p xtcloglog_re_p xtcnt_p xtcorr xtdata xtdes xtfront_p xtfrontier xtgee xtgee_elink xtgee_estat xtgee_makeivar xtgee_p xtgee_plink xtgls xtgls_p xthaus xthausman xtht_p xthtaylor xtile xtint_p xtintreg xtintreg_8 xtintreg_d2 xtintreg_p xtivp_1 xtivp_2 xtivreg xtline xtline_ex xtlogit xtlogit_8 xtlogit_d2 xtlogit_fe_p xtlogit_pa_p xtlogit_re_p xtmixed xtmixed_estat xtmixed_p xtnb_fe xtnb_lf xtnbreg xtnbreg_pa_p xtnbreg_refe_p xtpcse xtpcse_p xtpois xtpoisson xtpoisson_d2 xtpoisson_pa_p xtpoisson_refe_p xtpred xtprobit xtprobit_8 xtprobit_d2 xtprobit_re_p xtps_fe xtps_lf xtps_ren xtps_ren_8 xtrar_p xtrc xtrc_p xtrchh xtrefe_p xtreg xtreg_be xtreg_fe xtreg_ml xtreg_pa_p xtreg_re xtregar xtrere_p xtset xtsf_ll xtsf_llti xtsum xttab xttest0 xttobit xttobit_8 xttobit_p xttrans yx yxview__barlike_draw yxview_area_draw yxview_bar_draw yxview_dot_draw yxview_dropline_draw yxview_function_draw yxview_iarrow_draw yxview_ilabels_draw yxview_normal_draw yxview_pcarrow_draw yxview_pcbarrow_draw yxview_pccapsym_draw yxview_pcscatter_draw yxview_pcspike_draw yxview_rarea_draw yxview_rbar_draw yxview_rbarm_draw yxview_rcap_draw yxview_rcapsym_draw yxview_rconnected_draw yxview_rline_draw yxview_rscatter_draw yxview_rspike_draw yxview_spike_draw yxview_sunflower_draw zap_s zinb zinb_llf zinb_plf zip zip_llf zip_p zip_plf zt_ct_5 zt_hc_5 zt_hcd_5 zt_is_5 zt_iss_5 zt_sho_5 zt_smp_5 ztbase_5 ztcox_5 ztdes_5 ztereg_5 ztfill_5 ztgen_5 ztir_5 ztjoin_5 ztnb ztnb_p ztp ztp_p zts_5 ztset_5 ztspli_5 ztsum_5 zttoct_5 ztvary_5 ztweib_5",
diff --git a/vendor/assets/javascripts/highlightjs/languages/step21.min.js b/vendor/assets/javascripts/highlightjs/languages/step21.min.js
index 2726fac0b1d..819b3a466d3 100644
--- a/vendor/assets/javascripts/highlightjs/languages/step21.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/step21.min.js
@@ -1,4 +1,4 @@
-/*! `step21` grammar compiled for Highlight.js 11.6.0 */
+/*! `step21` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"STEP Part 21",
 aliases:["p21","step","stp"],case_insensitive:!0,keywords:{
 $pattern:"[A-Z_][A-Z0-9_.]*",keyword:["HEADER","ENDSEC","DATA"]},contains:[{
diff --git a/vendor/assets/javascripts/highlightjs/languages/stylus.min.js b/vendor/assets/javascripts/highlightjs/languages/stylus.min.js
index 036581ad2d7..7e2ca65929f 100644
--- a/vendor/assets/javascripts/highlightjs/languages/stylus.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/stylus.min.js
@@ -1,4 +1,4 @@
-/*! `stylus` grammar compiled for Highlight.js 11.6.0 */
+/*! `stylus` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict"
 ;const e=["a","abbr","address","article","aside","audio","b","blockquote","body","button","canvas","caption","cite","code","dd","del","details","dfn","div","dl","dt","em","fieldset","figcaption","figure","footer","form","h1","h2","h3","h4","h5","h6","header","hgroup","html","i","iframe","img","input","ins","kbd","label","legend","li","main","mark","menu","nav","object","ol","p","q","quote","samp","section","span","strong","summary","sup","table","tbody","td","textarea","tfoot","th","thead","time","tr","ul","var","video"],i=["any-hover","any-pointer","aspect-ratio","color","color-gamut","color-index","device-aspect-ratio","device-height","device-width","display-mode","forced-colors","grid","height","hover","inverted-colors","monochrome","orientation","overflow-block","overflow-inline","pointer","prefers-color-scheme","prefers-contrast","prefers-reduced-motion","prefers-reduced-transparency","resolution","scan","scripting","update","width","min-width","max-width","min-height","max-height"],t=["active","any-link","blank","checked","current","default","defined","dir","disabled","drop","empty","enabled","first","first-child","first-of-type","fullscreen","future","focus","focus-visible","focus-within","has","host","host-context","hover","indeterminate","in-range","invalid","is","lang","last-child","last-of-type","left","link","local-link","not","nth-child","nth-col","nth-last-child","nth-last-col","nth-last-of-type","nth-of-type","only-child","only-of-type","optional","out-of-range","past","placeholder-shown","read-only","read-write","required","right","root","scope","target","target-within","user-invalid","valid","visited","where"],r=["after","backdrop","before","cue","cue-region","first-letter","first-line","grammar-error","marker","part","placeholder","selection","slotted","spelling-error"],o=["align-content","align-items","align-self","all","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","backface-visibility","background","background-attachment","background-blend-mode","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","block-size","border","border-block","border-block-color","border-block-end","border-block-end-color","border-block-end-style","border-block-end-width","border-block-start","border-block-start-color","border-block-start-style","border-block-start-width","border-block-style","border-block-width","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-inline","border-inline-color","border-inline-end","border-inline-end-color","border-inline-end-style","border-inline-end-width","border-inline-start","border-inline-start-color","border-inline-start-style","border-inline-start-width","border-inline-style","border-inline-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","caret-color","clear","clip","clip-path","clip-rule","color","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","contain","content","content-visibility","counter-increment","counter-reset","cue","cue-after","cue-before","cursor","direction","display","empty-cells","filter","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","flow","font","font-display","font-family","font-feature-settings","font-kerning","font-language-override","font-size","font-size-adjust","font-smoothing","font-stretch","font-style","font-synthesis","font-variant","font-variant-caps","font-variant-east-asian","font-variant-ligatures","font-variant-numeric","font-variant-position","font-variation-settings","font-weight","gap","glyph-orientation-vertical","grid","grid-area","grid-auto-columns","grid-auto-flow","grid-auto-rows","grid-column","grid-column-end","grid-column-start","grid-gap","grid-row","grid-row-end","grid-row-start","grid-template","grid-template-areas","grid-template-columns","grid-template-rows","hanging-punctuation","height","hyphens","icon","image-orientation","image-rendering","image-resolution","ime-mode","inline-size","isolation","justify-content","left","letter-spacing","line-break","line-height","list-style","list-style-image","list-style-position","list-style-type","margin","margin-block","margin-block-end","margin-block-start","margin-bottom","margin-inline","margin-inline-end","margin-inline-start","margin-left","margin-right","margin-top","marks","mask","mask-border","mask-border-mode","mask-border-outset","mask-border-repeat","mask-border-slice","mask-border-source","mask-border-width","mask-clip","mask-composite","mask-image","mask-mode","mask-origin","mask-position","mask-repeat","mask-size","mask-type","max-block-size","max-height","max-inline-size","max-width","min-block-size","min-height","min-inline-size","min-width","mix-blend-mode","nav-down","nav-index","nav-left","nav-right","nav-up","none","normal","object-fit","object-position","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-wrap","overflow-x","overflow-y","padding","padding-block","padding-block-end","padding-block-start","padding-bottom","padding-inline","padding-inline-end","padding-inline-start","padding-left","padding-right","padding-top","page-break-after","page-break-before","page-break-inside","pause","pause-after","pause-before","perspective","perspective-origin","pointer-events","position","quotes","resize","rest","rest-after","rest-before","right","row-gap","scroll-margin","scroll-margin-block","scroll-margin-block-end","scroll-margin-block-start","scroll-margin-bottom","scroll-margin-inline","scroll-margin-inline-end","scroll-margin-inline-start","scroll-margin-left","scroll-margin-right","scroll-margin-top","scroll-padding","scroll-padding-block","scroll-padding-block-end","scroll-padding-block-start","scroll-padding-bottom","scroll-padding-inline","scroll-padding-inline-end","scroll-padding-inline-start","scroll-padding-left","scroll-padding-right","scroll-padding-top","scroll-snap-align","scroll-snap-stop","scroll-snap-type","scrollbar-color","scrollbar-gutter","scrollbar-width","shape-image-threshold","shape-margin","shape-outside","speak","speak-as","src","tab-size","table-layout","text-align","text-align-all","text-align-last","text-combine-upright","text-decoration","text-decoration-color","text-decoration-line","text-decoration-style","text-emphasis","text-emphasis-color","text-emphasis-position","text-emphasis-style","text-indent","text-justify","text-orientation","text-overflow","text-rendering","text-shadow","text-transform","text-underline-position","top","transform","transform-box","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","vertical-align","visibility","voice-balance","voice-duration","voice-family","voice-pitch","voice-range","voice-rate","voice-stress","voice-volume","white-space","widows","width","will-change","word-break","word-spacing","word-wrap","writing-mode","z-index"].reverse()
 ;return n=>{const a=(e=>({IMPORTANT:{scope:"meta",begin:"!important"},
@@ -15,8 +15,8 @@ relevance:0},CSS_VARIABLE:{className:"attr",begin:/--[A-Za-z][A-Za-z0-9_-]*/}
 keywords:"if else for in",
 illegal:"(\\?|(\\bReturn\\b)|(\\bEnd\\b)|(\\bend\\b)|(\\bdef\\b)|;|#\\s|\\*\\s|===\\s|\\||%)",
 contains:[n.QUOTE_STRING_MODE,n.APOS_STRING_MODE,n.C_LINE_COMMENT_MODE,n.C_BLOCK_COMMENT_MODE,a.HEXCOLOR,{
-begin:"\\.[a-zA-Z][a-zA-Z0-9_-]*(?=[.\\s\\n[:,(])",className:"selector-class"},{
-begin:"#[a-zA-Z][a-zA-Z0-9_-]*(?=[.\\s\\n[:,(])",className:"selector-id"},{
+begin:"\\.[a-zA-Z][a-zA-Z0-9_-]*"+s,className:"selector-class"},{
+begin:"#[a-zA-Z][a-zA-Z0-9_-]*"+s,className:"selector-id"},{
 begin:"\\b("+e.join("|")+")"+s,className:"selector-tag"},{
 className:"selector-pseudo",begin:"&?:("+t.join("|")+")"+s},{
 className:"selector-pseudo",begin:"&?:(:)?("+r.join("|")+")"+s
diff --git a/vendor/assets/javascripts/highlightjs/languages/subunit.min.js b/vendor/assets/javascripts/highlightjs/languages/subunit.min.js
index 1199339ba26..f76771392b3 100644
--- a/vendor/assets/javascripts/highlightjs/languages/subunit.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/subunit.min.js
@@ -1,4 +1,4 @@
-/*! `subunit` grammar compiled for Highlight.js 11.6.0 */
+/*! `subunit` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var s=(()=>{"use strict";return s=>({name:"SubUnit",case_insensitive:!0,
 contains:[{className:"string",begin:"\\[\n(multipart)?",end:"\\]\n"},{
 className:"string",begin:"\\d{4}-\\d{2}-\\d{2}(\\s+)\\d{2}:\\d{2}:\\d{2}.\\d+Z"
diff --git a/vendor/assets/javascripts/highlightjs/languages/swift.min.js b/vendor/assets/javascripts/highlightjs/languages/swift.min.js
index ebb39b50707..714ebad2c5d 100644
--- a/vendor/assets/javascripts/highlightjs/languages/swift.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/swift.min.js
@@ -1,4 +1,4 @@
-/*! `swift` grammar compiled for Highlight.js 11.6.0 */
+/*! `swift` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";function e(e){
 return e?"string"==typeof e?e:e.source:null}function a(e){return t("(?=",e,")")}
 function t(...a){return a.map((a=>e(a))).join("")}function n(...a){const t=(e=>{
@@ -16,45 +16,45 @@ $pattern:n(/\b\w+/,/#\w+/),keyword:C.concat(m),literal:o},B=[A,N,D],_=[{
 match:t(/\./,n(...p)),relevance:0},{className:"built_in",
 match:t(/\b/,n(...p),/(?=\()/)}],S={match:/->/,relevance:0},M=[S,{
 className:"operator",relevance:0,variants:[{match:b},{match:`\\.(\\.|${F})+`}]
-}],x="([0-9a-fA-F]_*)+",I={className:"number",relevance:0,variants:[{
-match:"\\b(([0-9]_*)+)(\\.(([0-9]_*)+))?([eE][+-]?(([0-9]_*)+))?\\b"},{
-match:`\\b0x(${x})(\\.(${x}))?([pP][+-]?(([0-9]_*)+))?\\b`},{
-match:/\b0o([0-7]_*)+\b/},{match:/\b0b([01]_*)+\b/}]},L=(e="")=>({
-className:"subst",variants:[{match:t(/\\/,e,/[0\\tnr"']/)},{
-match:t(/\\/,e,/u\{[0-9a-fA-F]{1,8}\}/)}]}),O=(e="")=>({className:"subst",
-match:t(/\\/,e,/[\t ]*(?:[\r\n]|\r\n)/)}),T=(e="")=>({className:"subst",
-label:"interpol",begin:t(/\\/,e,/\(/),end:/\)/}),$=(e="")=>({begin:t(e,/"""/),
-end:t(/"""/,e),contains:[L(e),O(e),T(e)]}),j=(e="")=>({begin:t(e,/"/),
-end:t(/"/,e),contains:[L(e),T(e)]}),P={className:"string",
-variants:[$(),$("#"),$("##"),$("###"),j(),j("#"),j("##"),j("###")]},K={
-match:t(/`/,w,/`/)},z=[K,{className:"variable",match:/\$\d+/},{
-className:"variable",match:`\\$${f}+`}],q=[{match:/(@|#(un)?)available/,
+}],x="([0-9]_*)+",$="([0-9a-fA-F]_*)+",I={className:"number",relevance:0,
+variants:[{match:`\\b(${x})(\\.(${x}))?([eE][+-]?(${x}))?\\b`},{
+match:`\\b0x(${$})(\\.(${$}))?([pP][+-]?(${x}))?\\b`},{match:/\b0o([0-7]_*)+\b/
+},{match:/\b0b([01]_*)+\b/}]},L=(e="")=>({className:"subst",variants:[{
+match:t(/\\/,e,/[0\\tnr"']/)},{match:t(/\\/,e,/u\{[0-9a-fA-F]{1,8}\}/)}]
+}),O=(e="")=>({className:"subst",match:t(/\\/,e,/[\t ]*(?:[\r\n]|\r\n)/)
+}),T=(e="")=>({className:"subst",label:"interpol",begin:t(/\\/,e,/\(/),end:/\)/
+}),j=(e="")=>({begin:t(e,/"""/),end:t(/"""/,e),contains:[L(e),O(e),T(e)]
+}),P=(e="")=>({begin:t(e,/"/),end:t(/"/,e),contains:[L(e),T(e)]}),K={
+className:"string",
+variants:[j(),j("#"),j("##"),j("###"),P(),P("#"),P("##"),P("###")]},z={
+match:t(/`/,w,/`/)},q=[z,{className:"variable",match:/\$\d+/},{
+className:"variable",match:`\\$${f}+`}],U=[{match:/(@|#(un)?)available/,
 className:"keyword",starts:{contains:[{begin:/\(/,end:/\)/,keywords:E,
-contains:[...M,I,P]}]}},{className:"keyword",match:t(/@/,n(...g))},{
-className:"meta",match:t(/@/,w)}],U={match:a(/\b[A-Z]/),relevance:0,contains:[{
+contains:[...M,I,K]}]}},{className:"keyword",match:t(/@/,n(...g))},{
+className:"meta",match:t(/@/,w)}],Z={match:a(/\b[A-Z]/),relevance:0,contains:[{
 className:"type",
 match:t(/(AV|CA|CF|CG|CI|CL|CM|CN|CT|MK|MP|MTK|MTL|NS|SCN|SK|UI|WK|XC)/,f,"+")
 },{className:"type",match:y,relevance:0},{match:/[?!]+/,relevance:0},{
-match:/\.\.\./,relevance:0},{match:t(/\s+&\s+/,a(y)),relevance:0}]},Z={
-begin:/</,end:/>/,keywords:k,contains:[...v,...B,...q,S,U]};U.contains.push(Z)
-;const V={begin:/\(/,end:/\)/,relevance:0,keywords:k,contains:["self",{
+match:/\.\.\./,relevance:0},{match:t(/\s+&\s+/,a(y)),relevance:0}]},V={
+begin:/</,end:/>/,keywords:k,contains:[...v,...B,...U,S,Z]};Z.contains.push(V)
+;const W={begin:/\(/,end:/\)/,relevance:0,keywords:k,contains:["self",{
 match:t(w,/\s*:/),keywords:"_|0",relevance:0
-},...v,...B,..._,...M,I,P,...z,...q,U]},W={begin:/</,end:/>/,contains:[...v,U]
-},G={begin:/\(/,end:/\)/,keywords:k,contains:[{
+},...v,...B,..._,...M,I,K,...q,...U,Z]},G={begin:/</,end:/>/,contains:[...v,Z]
+},R={begin:/\(/,end:/\)/,keywords:k,contains:[{
 begin:n(a(t(w,/\s*:/)),a(t(w,/\s+/,w,/\s*:/))),end:/:/,relevance:0,contains:[{
 className:"keyword",match:/\b_\b/},{className:"params",match:w}]
-},...v,...B,...M,I,P,...q,U,V],endsParent:!0,illegal:/["']/},R={
-match:[/func/,/\s+/,n(K.match,w,b)],className:{1:"keyword",3:"title.function"},
-contains:[W,G,d],illegal:[/\[/,/%/]},X={
+},...v,...B,...M,I,K,...U,Z,W],endsParent:!0,illegal:/["']/},X={
+match:[/func/,/\s+/,n(z.match,w,b)],className:{1:"keyword",3:"title.function"},
+contains:[G,R,d],illegal:[/\[/,/%/]},H={
 match:[/\b(?:subscript|init[?!]?)/,/\s*(?=[<(])/],className:{1:"keyword"},
-contains:[W,G,d],illegal:/\[|%/},H={match:[/operator/,/\s+/,b],className:{
-1:"keyword",3:"title"}},J={begin:[/precedencegroup/,/\s+/,y],className:{
-1:"keyword",3:"title"},contains:[U],keywords:[...l,...o],end:/}/}
-;for(const e of P.variants){const a=e.contains.find((e=>"interpol"===e.label))
-;a.keywords=k;const t=[...B,..._,...M,I,P,...z];a.contains=[...t,{begin:/\(/,
+contains:[G,R,d],illegal:/\[|%/},J={match:[/operator/,/\s+/,b],className:{
+1:"keyword",3:"title"}},Q={begin:[/precedencegroup/,/\s+/,y],className:{
+1:"keyword",3:"title"},contains:[Z],keywords:[...l,...o],end:/}/}
+;for(const e of K.variants){const a=e.contains.find((e=>"interpol"===e.label))
+;a.keywords=k;const t=[...B,..._,...M,I,K,...q];a.contains=[...t,{begin:/\(/,
 end:/\)/,contains:["self",...t]}]}return{name:"Swift",keywords:k,
-contains:[...v,R,X,{beginKeywords:"struct protocol class extension enum actor",
+contains:[...v,X,H,{beginKeywords:"struct protocol class extension enum actor",
 end:"\\{",excludeEnd:!0,keywords:k,contains:[e.inherit(e.TITLE_MODE,{
 className:"title.class",begin:/[A-Za-z$_][\u00C0-\u02B80-9A-Za-z$_]*/}),...B]
-},H,J,{beginKeywords:"import",end:/$/,contains:[...v],relevance:0
-},...B,..._,...M,I,P,...z,...q,U,V]}}})();hljs.registerLanguage("swift",e)})();
\ No newline at end of file
+},J,Q,{beginKeywords:"import",end:/$/,contains:[...v],relevance:0
+},...B,..._,...M,I,K,...q,...U,Z,W]}}})();hljs.registerLanguage("swift",e)})();
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/taggerscript.min.js b/vendor/assets/javascripts/highlightjs/languages/taggerscript.min.js
index 1656fc4aaf8..de47527c9bf 100644
--- a/vendor/assets/javascripts/highlightjs/languages/taggerscript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/taggerscript.min.js
@@ -1,4 +1,4 @@
-/*! `taggerscript` grammar compiled for Highlight.js 11.6.0 */
+/*! `taggerscript` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"Tagger Script",contains:[{
 className:"comment",begin:/\$noop\(/,end:/\)/,contains:[{begin:/\\[()]/},{
 begin:/\(/,end:/\)/,contains:[{begin:/\\[()]/},"self"]}],relevance:10},{
diff --git a/vendor/assets/javascripts/highlightjs/languages/tap.min.js b/vendor/assets/javascripts/highlightjs/languages/tap.min.js
index 00842bbe600..2c70163fd2f 100644
--- a/vendor/assets/javascripts/highlightjs/languages/tap.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/tap.min.js
@@ -1,4 +1,4 @@
-/*! `tap` grammar compiled for Highlight.js 11.6.0 */
+/*! `tap` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"Test Anything Protocol",
 case_insensitive:!0,contains:[e.HASH_COMMENT_MODE,{className:"meta",variants:[{
 begin:"^TAP version (\\d+)$"},{begin:"^1\\.\\.(\\d+)$"}]},{begin:/---$/,
diff --git a/vendor/assets/javascripts/highlightjs/languages/tcl.min.js b/vendor/assets/javascripts/highlightjs/languages/tcl.min.js
index f2505ab9793..010e1d5517c 100644
--- a/vendor/assets/javascripts/highlightjs/languages/tcl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/tcl.min.js
@@ -1,4 +1,4 @@
-/*! `tcl` grammar compiled for Highlight.js 11.6.0 */
+/*! `tcl` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const a=e.regex,t=/[a-zA-Z_][a-zA-Z0-9_]*/,r={className:"number",
 variants:[e.BINARY_NUMBER_MODE,e.C_NUMBER_MODE]};return{name:"Tcl",
diff --git a/vendor/assets/javascripts/highlightjs/languages/thrift.min.js b/vendor/assets/javascripts/highlightjs/languages/thrift.min.js
index a892ebbc7f7..81c3b9689c9 100644
--- a/vendor/assets/javascripts/highlightjs/languages/thrift.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/thrift.min.js
@@ -1,4 +1,4 @@
-/*! `thrift` grammar compiled for Highlight.js 11.6.0 */
+/*! `thrift` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const t=["bool","byte","i16","i32","i64","double","string","binary"];return{
 name:"Thrift",keywords:{
diff --git a/vendor/assets/javascripts/highlightjs/languages/tp.min.js b/vendor/assets/javascripts/highlightjs/languages/tp.min.js
index ba7c6efddd2..472e40d8f06 100644
--- a/vendor/assets/javascripts/highlightjs/languages/tp.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/tp.min.js
@@ -1,4 +1,4 @@
-/*! `tp` grammar compiled for Highlight.js 11.6.0 */
+/*! `tp` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var O=(()=>{"use strict";return O=>{const e={className:"number",
 begin:"[1-9][0-9]*",relevance:0},R={className:"symbol",begin:":[^\\]]+"};return{
 name:"TP",keywords:{
diff --git a/vendor/assets/javascripts/highlightjs/languages/twig.min.js b/vendor/assets/javascripts/highlightjs/languages/twig.min.js
index 379197c0705..7068a48ada4 100644
--- a/vendor/assets/javascripts/highlightjs/languages/twig.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/twig.min.js
@@ -1,4 +1,4 @@
-/*! `twig` grammar compiled for Highlight.js 11.6.0 */
+/*! `twig` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const a=e.regex,t=["absolute_url","asset|0","asset_version","attribute","block","constant","controller|0","country_timezones","csrf_token","cycle","date","dump","expression","form|0","form_end","form_errors","form_help","form_label","form_rest","form_row","form_start","form_widget","html_classes","include","is_granted","logout_path","logout_url","max","min","parent","path|0","random","range","relative_path","render","render_esi","source","template_from_string","url|0"]
 ;let r=["apply","autoescape","block","cache","deprecated","do","embed","extends","filter","flush","for","form_theme","from","if","import","include","macro","sandbox","set","stopwatch","trans","trans_default_domain","transchoice","use","verbatim","with"]
diff --git a/vendor/assets/javascripts/highlightjs/languages/typescript.min.js b/vendor/assets/javascripts/highlightjs/languages/typescript.min.js
index 86d57f78baf..59769ea0540 100644
--- a/vendor/assets/javascripts/highlightjs/languages/typescript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/typescript.min.js
@@ -1,93 +1,95 @@
-/*! `typescript` grammar compiled for Highlight.js 11.6.0 */
+/*! `typescript` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict"
-;const e="[A-Za-z$_][0-9A-Za-z$_]*",n=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],a=["true","false","null","undefined","NaN","Infinity"],t=["Object","Function","Boolean","Symbol","Math","Date","Number","BigInt","String","RegExp","Array","Float32Array","Float64Array","Int8Array","Uint8Array","Uint8ClampedArray","Int16Array","Int32Array","Uint16Array","Uint32Array","BigInt64Array","BigUint64Array","Set","Map","WeakSet","WeakMap","ArrayBuffer","SharedArrayBuffer","Atomics","DataView","JSON","Promise","Generator","GeneratorFunction","AsyncFunction","Reflect","Proxy","Intl","WebAssembly"],s=["Error","EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"],r=["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],c=["arguments","this","super","console","window","document","localStorage","module","global"],i=[].concat(r,t,s)
+;const e="[A-Za-z$_][0-9A-Za-z$_]*",n=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],a=["true","false","null","undefined","NaN","Infinity"],t=["Object","Function","Boolean","Symbol","Math","Date","Number","BigInt","String","RegExp","Array","Float32Array","Float64Array","Int8Array","Uint8Array","Uint8ClampedArray","Int16Array","Int32Array","Uint16Array","Uint32Array","BigInt64Array","BigUint64Array","Set","Map","WeakSet","WeakMap","ArrayBuffer","SharedArrayBuffer","Atomics","DataView","JSON","Promise","Generator","GeneratorFunction","AsyncFunction","Reflect","Proxy","Intl","WebAssembly"],s=["Error","EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"],r=["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],c=["arguments","this","super","console","window","document","localStorage","sessionStorage","module","global"],i=[].concat(r,t,s)
 ;function o(o){const l=o.regex,d=e,b={begin:/<[A-Za-z0-9\\._:-]+/,
 end:/\/[A-Za-z0-9\\._:-]+>|\/>/,isTrulyOpeningTag:(e,n)=>{
 const a=e[0].length+e.index,t=e.input[a]
 ;if("<"===t||","===t)return void n.ignoreMatch();let s
 ;">"===t&&(((e,{after:n})=>{const a="</"+e[0].slice(1)
-;return-1!==e.input.indexOf(a,n)})(e,{after:a
-})||n.ignoreMatch()),(s=e.input.substring(a).match(/^\s+extends\s+/))&&0===s.index&&n.ignoreMatch()
+;return-1!==e.input.indexOf(a,n)})(e,{after:a})||n.ignoreMatch())
+;const r=e.input.substring(a)
+;((s=r.match(/^\s*=/))||(s=r.match(/^\s+extends\s+/))&&0===s.index)&&n.ignoreMatch()
 }},g={$pattern:e,keyword:n,literal:a,built_in:i,"variable.language":c
-},u="\\.([0-9](_?[0-9])*)",m="0|[1-9](_?[0-9])*|0[0-7]*[89][0-9]*",E={
+},u="[0-9](_?[0-9])*",m=`\\.(${u})`,E="0|[1-9](_?[0-9])*|0[0-7]*[89][0-9]*",y={
 className:"number",variants:[{
-begin:`(\\b(${m})((${u})|\\.)?|(${u}))[eE][+-]?([0-9](_?[0-9])*)\\b`},{
-begin:`\\b(${m})\\b((${u})\\b|\\.)?|(${u})\\b`},{
+begin:`(\\b(${E})((${m})|\\.)?|(${m}))[eE][+-]?(${u})\\b`},{
+begin:`\\b(${E})\\b((${m})\\b|\\.)?|(${m})\\b`},{
 begin:"\\b(0|[1-9](_?[0-9])*)n\\b"},{
 begin:"\\b0[xX][0-9a-fA-F](_?[0-9a-fA-F])*n?\\b"},{
 begin:"\\b0[bB][0-1](_?[0-1])*n?\\b"},{begin:"\\b0[oO][0-7](_?[0-7])*n?\\b"},{
-begin:"\\b0[0-7]+n?\\b"}],relevance:0},y={className:"subst",begin:"\\$\\{",
-end:"\\}",keywords:g,contains:[]},A={begin:"html`",end:"",starts:{end:"`",
-returnEnd:!1,contains:[o.BACKSLASH_ESCAPE,y],subLanguage:"xml"}},_={
+begin:"\\b0[0-7]+n?\\b"}],relevance:0},A={className:"subst",begin:"\\$\\{",
+end:"\\}",keywords:g,contains:[]},p={begin:"html`",end:"",starts:{end:"`",
+returnEnd:!1,contains:[o.BACKSLASH_ESCAPE,A],subLanguage:"xml"}},N={
 begin:"css`",end:"",starts:{end:"`",returnEnd:!1,
-contains:[o.BACKSLASH_ESCAPE,y],subLanguage:"css"}},p={className:"string",
-begin:"`",end:"`",contains:[o.BACKSLASH_ESCAPE,y]},N={className:"comment",
+contains:[o.BACKSLASH_ESCAPE,A],subLanguage:"css"}},f={begin:"gql`",end:"",
+starts:{end:"`",returnEnd:!1,contains:[o.BACKSLASH_ESCAPE,A],
+subLanguage:"graphql"}},_={className:"string",begin:"`",end:"`",
+contains:[o.BACKSLASH_ESCAPE,A]},h={className:"comment",
 variants:[o.COMMENT(/\/\*\*(?!\/)/,"\\*/",{relevance:0,contains:[{
 begin:"(?=@[A-Za-z]+)",relevance:0,contains:[{className:"doctag",
 begin:"@[A-Za-z]+"},{className:"type",begin:"\\{",end:"\\}",excludeEnd:!0,
 excludeBegin:!0,relevance:0},{className:"variable",begin:d+"(?=\\s*(-)|$)",
 endsParent:!0,relevance:0},{begin:/(?=[^\n])\s/,relevance:0}]}]
 }),o.C_BLOCK_COMMENT_MODE,o.C_LINE_COMMENT_MODE]
-},f=[o.APOS_STRING_MODE,o.QUOTE_STRING_MODE,A,_,p,E];y.contains=f.concat({
-begin:/\{/,end:/\}/,keywords:g,contains:["self"].concat(f)})
-;const h=[].concat(N,y.contains),v=h.concat([{begin:/\(/,end:/\)/,keywords:g,
-contains:["self"].concat(h)}]),S={className:"params",begin:/\(/,end:/\)/,
-excludeBegin:!0,excludeEnd:!0,keywords:g,contains:v},w={variants:[{
+},S=[o.APOS_STRING_MODE,o.QUOTE_STRING_MODE,p,N,f,_,{match:/\$\d+/},y]
+;A.contains=S.concat({begin:/\{/,end:/\}/,keywords:g,contains:["self"].concat(S)
+});const v=[].concat(h,A.contains),w=v.concat([{begin:/\(/,end:/\)/,keywords:g,
+contains:["self"].concat(v)}]),R={className:"params",begin:/\(/,end:/\)/,
+excludeBegin:!0,excludeEnd:!0,keywords:g,contains:w},x={variants:[{
 match:[/class/,/\s+/,d,/\s+/,/extends/,/\s+/,l.concat(d,"(",l.concat(/\./,d),")*")],
 scope:{1:"keyword",3:"title.class",5:"keyword",7:"title.class.inherited"}},{
-match:[/class/,/\s+/,d],scope:{1:"keyword",3:"title.class"}}]},R={relevance:0,
+match:[/class/,/\s+/,d],scope:{1:"keyword",3:"title.class"}}]},k={relevance:0,
 match:l.either(/\bJSON/,/\b[A-Z][a-z]+([A-Z][a-z]*|\d)*/,/\b[A-Z]{2,}([A-Z][a-z]+|\d)+([A-Z][a-z]*)*/,/\b[A-Z]{2,}[a-z]+([A-Z][a-z]+|\d)*([A-Z][a-z]*)*/),
-className:"title.class",keywords:{_:[...t,...s]}},x={variants:[{
+className:"title.class",keywords:{_:[...t,...s]}},O={variants:[{
 match:[/function/,/\s+/,d,/(?=\s*\()/]},{match:[/function/,/\s*(?=\()/]}],
-className:{1:"keyword",3:"title.function"},label:"func.def",contains:[S],
-illegal:/%/},k={
-match:l.concat(/\b/,(O=[...r,"super"],l.concat("(?!",O.join("|"),")")),d,l.lookahead(/\(/)),
-className:"title.function",relevance:0};var O;const I={
+className:{1:"keyword",3:"title.function"},label:"func.def",contains:[R],
+illegal:/%/},C={
+match:l.concat(/\b/,(I=[...r,"super","import"],l.concat("(?!",I.join("|"),")")),d,l.lookahead(/\(/)),
+className:"title.function",relevance:0};var I;const T={
 begin:l.concat(/\./,l.lookahead(l.concat(d,/(?![0-9A-Za-z$_(])/))),end:d,
-excludeBegin:!0,keywords:"prototype",className:"property",relevance:0},C={
+excludeBegin:!0,keywords:"prototype",className:"property",relevance:0},M={
 match:[/get|set/,/\s+/,d,/(?=\()/],className:{1:"keyword",3:"title.function"},
-contains:[{begin:/\(\)/},S]
-},T="(\\([^()]*(\\([^()]*(\\([^()]*\\)[^()]*)*\\)[^()]*)*\\)|"+o.UNDERSCORE_IDENT_RE+")\\s*=>",M={
-match:[/const|var|let/,/\s+/,d,/\s*/,/=\s*/,/(async\s*)?/,l.lookahead(T)],
-keywords:"async",className:{1:"keyword",3:"title.function"},contains:[S]}
-;return{name:"Javascript",aliases:["js","jsx","mjs","cjs"],keywords:g,exports:{
-PARAMS_CONTAINS:v,CLASS_REFERENCE:R},illegal:/#(?![$_A-z])/,
+contains:[{begin:/\(\)/},R]
+},B="(\\([^()]*(\\([^()]*(\\([^()]*\\)[^()]*)*\\)[^()]*)*\\)|"+o.UNDERSCORE_IDENT_RE+")\\s*=>",$={
+match:[/const|var|let/,/\s+/,d,/\s*/,/=\s*/,/(async\s*)?/,l.lookahead(B)],
+keywords:"async",className:{1:"keyword",3:"title.function"},contains:[R]}
+;return{name:"JavaScript",aliases:["js","jsx","mjs","cjs"],keywords:g,exports:{
+PARAMS_CONTAINS:w,CLASS_REFERENCE:k},illegal:/#(?![$_A-z])/,
 contains:[o.SHEBANG({label:"shebang",binary:"node",relevance:5}),{
 label:"use_strict",className:"meta",relevance:10,
 begin:/^\s*['"]use (strict|asm)['"]/
-},o.APOS_STRING_MODE,o.QUOTE_STRING_MODE,A,_,p,N,E,R,{className:"attr",
-begin:d+l.lookahead(":"),relevance:0},M,{
+},o.APOS_STRING_MODE,o.QUOTE_STRING_MODE,p,N,f,_,h,{match:/\$\d+/},y,k,{
+className:"attr",begin:d+l.lookahead(":"),relevance:0},$,{
 begin:"("+o.RE_STARTERS_RE+"|\\b(case|return|throw)\\b)\\s*",
-keywords:"return throw case",relevance:0,contains:[N,o.REGEXP_MODE,{
-className:"function",begin:T,returnBegin:!0,end:"\\s*=>",contains:[{
+keywords:"return throw case",relevance:0,contains:[h,o.REGEXP_MODE,{
+className:"function",begin:B,returnBegin:!0,end:"\\s*=>",contains:[{
 className:"params",variants:[{begin:o.UNDERSCORE_IDENT_RE,relevance:0},{
 className:null,begin:/\(\s*\)/,skip:!0},{begin:/\(/,end:/\)/,excludeBegin:!0,
-excludeEnd:!0,keywords:g,contains:v}]}]},{begin:/,/,relevance:0},{match:/\s+/,
+excludeEnd:!0,keywords:g,contains:w}]}]},{begin:/,/,relevance:0},{match:/\s+/,
 relevance:0},{variants:[{begin:"<>",end:"</>"},{
 match:/<[A-Za-z0-9\\._:-]+\s*\/>/},{begin:b.begin,
 "on:begin":b.isTrulyOpeningTag,end:b.end}],subLanguage:"xml",contains:[{
-begin:b.begin,end:b.end,skip:!0,contains:["self"]}]}]},x,{
+begin:b.begin,end:b.end,skip:!0,contains:["self"]}]}]},O,{
 beginKeywords:"while if switch catch for"},{
 begin:"\\b(?!function)"+o.UNDERSCORE_IDENT_RE+"\\([^()]*(\\([^()]*(\\([^()]*\\)[^()]*)*\\)[^()]*)*\\)\\s*\\{",
-returnBegin:!0,label:"func.def",contains:[S,o.inherit(o.TITLE_MODE,{begin:d,
-className:"title.function"})]},{match:/\.\.\./,relevance:0},I,{match:"\\$"+d,
+returnBegin:!0,label:"func.def",contains:[R,o.inherit(o.TITLE_MODE,{begin:d,
+className:"title.function"})]},{match:/\.\.\./,relevance:0},T,{match:"\\$"+d,
 relevance:0},{match:[/\bconstructor(?=\s*\()/],className:{1:"title.function"},
-contains:[S]},k,{relevance:0,match:/\b[A-Z][A-Z_0-9]+\b/,
-className:"variable.constant"},w,C,{match:/\$[(.]/}]}}return t=>{
-const s=o(t),r=["any","void","number","boolean","string","object","never","symbol","bigint","unknown"],l={
+contains:[R]},C,{relevance:0,match:/\b[A-Z][A-Z_0-9]+\b/,
+className:"variable.constant"},x,M,{match:/\$[(.]/}]}}return t=>{
+const s=o(t),r=e,l=["any","void","number","boolean","string","object","never","symbol","bigint","unknown"],d={
 beginKeywords:"namespace",end:/\{/,excludeEnd:!0,
-contains:[s.exports.CLASS_REFERENCE]},d={beginKeywords:"interface",end:/\{/,
-excludeEnd:!0,keywords:{keyword:"interface extends",built_in:r},
-contains:[s.exports.CLASS_REFERENCE]},b={$pattern:e,
+contains:[s.exports.CLASS_REFERENCE]},b={beginKeywords:"interface",end:/\{/,
+excludeEnd:!0,keywords:{keyword:"interface extends",built_in:l},
+contains:[s.exports.CLASS_REFERENCE]},g={$pattern:e,
 keyword:n.concat(["type","namespace","interface","public","private","protected","implements","declare","abstract","readonly","enum","override"]),
-literal:a,built_in:i.concat(r),"variable.language":c},g={className:"meta",
-begin:"@[A-Za-z$_][0-9A-Za-z$_]*"},u=(e,n,a)=>{
-const t=e.contains.findIndex((e=>e.label===n))
+literal:a,built_in:i.concat(l),"variable.language":c},u={className:"meta",
+begin:"@"+r},m=(e,n,a)=>{const t=e.contains.findIndex((e=>e.label===n))
 ;if(-1===t)throw Error("can not find mode to replace");e.contains.splice(t,1,a)}
-;return Object.assign(s.keywords,b),
-s.exports.PARAMS_CONTAINS.push(g),s.contains=s.contains.concat([g,l,d]),
-u(s,"shebang",t.SHEBANG()),u(s,"use_strict",{className:"meta",relevance:10,
+;return Object.assign(s.keywords,g),
+s.exports.PARAMS_CONTAINS.push(u),s.contains=s.contains.concat([u,d,b]),
+m(s,"shebang",t.SHEBANG()),m(s,"use_strict",{className:"meta",relevance:10,
 begin:/^\s*['"]use strict['"]/
 }),s.contains.find((e=>"func.def"===e.label)).relevance=0,Object.assign(s,{
-name:"TypeScript",aliases:["ts","tsx"]}),s}})()
+name:"TypeScript",aliases:["ts","tsx","mts","cts"]}),s}})()
 ;hljs.registerLanguage("typescript",e)})();
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/vala.min.js b/vendor/assets/javascripts/highlightjs/languages/vala.min.js
index 1df26db06b6..31582446350 100644
--- a/vendor/assets/javascripts/highlightjs/languages/vala.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/vala.min.js
@@ -1,4 +1,4 @@
-/*! `vala` grammar compiled for Highlight.js 11.6.0 */
+/*! `vala` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"Vala",keywords:{
 keyword:"char uchar unichar int uint long ulong short ushort int8 int16 int32 int64 uint8 uint16 uint32 uint64 float double bool struct enum string void weak unowned owned async signal static abstract interface override virtual delegate if while do for foreach else switch case break default return try catch public private protected internal using new this get set const stdout stdin stderr var",
 built_in:"DBus GLib CCode Gee Object Gtk Posix",literal:"false true null"},
diff --git a/vendor/assets/javascripts/highlightjs/languages/vbnet.min.js b/vendor/assets/javascripts/highlightjs/languages/vbnet.min.js
index d7d68a2e8ef..899c209d612 100644
--- a/vendor/assets/javascripts/highlightjs/languages/vbnet.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/vbnet.min.js
@@ -1,4 +1,4 @@
-/*! `vbnet` grammar compiled for Highlight.js 11.6.0 */
+/*! `vbnet` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const n=e.regex,t=/\d{1,2}\/\d{1,2}\/\d{4}/,a=/\d{4}-\d{1,2}-\d{1,2}/,i=/(\d|1[012])(:\d+){0,2} *(AM|PM)/,s=/\d{1,2}(:\d{1,2}){1,2}/,r={
 className:"literal",variants:[{begin:n.concat(/# */,n.either(a,t),/ *#/)},{
diff --git a/vendor/assets/javascripts/highlightjs/languages/vbscript-html.min.js b/vendor/assets/javascripts/highlightjs/languages/vbscript-html.min.js
index bcd7469cfcb..6922a658d98 100644
--- a/vendor/assets/javascripts/highlightjs/languages/vbscript-html.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/vbscript-html.min.js
@@ -1,4 +1,4 @@
-/*! `vbscript-html` grammar compiled for Highlight.js 11.6.0 */
+/*! `vbscript-html` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"VBScript in HTML",
 subLanguage:"xml",contains:[{begin:"<%",end:"%>",subLanguage:"vbscript"}]})})()
 ;hljs.registerLanguage("vbscript-html",e)})();
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/vbscript.min.js b/vendor/assets/javascripts/highlightjs/languages/vbscript.min.js
index 1f3c261291d..58f4aa14c49 100644
--- a/vendor/assets/javascripts/highlightjs/languages/vbscript.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/vbscript.min.js
@@ -1,4 +1,4 @@
-/*! `vbscript` grammar compiled for Highlight.js 11.6.0 */
+/*! `vbscript` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const t=e.regex,r=["lcase","month","vartype","instrrev","ubound","setlocale","getobject","rgb","getref","string","weekdayname","rnd","dateadd","monthname","now","day","minute","isarray","cbool","round","formatcurrency","conversions","csng","timevalue","second","year","space","abs","clng","timeserial","fixs","len","asc","isempty","maths","dateserial","atn","timer","isobject","filter","weekday","datevalue","ccur","isdate","instr","datediff","formatdatetime","replace","isnull","right","sgn","array","snumeric","log","cdbl","hex","chr","lbound","msgbox","ucase","getlocale","cos","cdate","cbyte","rtrim","join","hour","oct","typename","trim","strcomp","int","createobject","loadpicture","tan","formatnumber","mid","split","cint","sin","datepart","ltrim","sqr","time","derived","eval","date","formatpercent","exp","inputbox","left","ascw","chrw","regexp","cstr","err"]
 ;return{name:"VBScript",aliases:["vbs"],case_insensitive:!0,keywords:{
diff --git a/vendor/assets/javascripts/highlightjs/languages/verilog.min.js b/vendor/assets/javascripts/highlightjs/languages/verilog.min.js
index fcd894c91c0..3ead7a23e7f 100644
--- a/vendor/assets/javascripts/highlightjs/languages/verilog.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/verilog.min.js
@@ -1,4 +1,4 @@
-/*! `verilog` grammar compiled for Highlight.js 11.6.0 */
+/*! `verilog` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const n=e.regex,t=["begin_keywords","celldefine","default_nettype","default_decay_time","default_trireg_strength","define","delay_mode_distributed","delay_mode_path","delay_mode_unit","delay_mode_zero","else","elsif","end_keywords","endcelldefine","endif","ifdef","ifndef","include","line","nounconnected_drive","pragma","resetall","timescale","unconnected_drive","undef","undefineall"]
 ;return{name:"Verilog",aliases:["v","sv","svh"],case_insensitive:!1,keywords:{
diff --git a/vendor/assets/javascripts/highlightjs/languages/vhdl.min.js b/vendor/assets/javascripts/highlightjs/languages/vhdl.min.js
index 5bf01ab4e2b..63d5a3a3b91 100644
--- a/vendor/assets/javascripts/highlightjs/languages/vhdl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/vhdl.min.js
@@ -1,14 +1,13 @@
-/*! `vhdl` grammar compiled for Highlight.js 11.6.0 */
-(()=>{var e=(()=>{"use strict";return e=>({name:"VHDL",case_insensitive:!0,
-keywords:{
+/*! `vhdl` grammar compiled for Highlight.js 11.8.0 */
+(()=>{var e=(()=>{"use strict";return e=>{
+const r="\\d(_|\\d)*",t="[eE][-+]?"+r,n="\\b("+r+"#\\w+(\\.\\w+)?#("+t+")?|"+r+"(\\."+r+")?("+t+")?)"
+;return{name:"VHDL",case_insensitive:!0,keywords:{
 keyword:["abs","access","after","alias","all","and","architecture","array","assert","assume","assume_guarantee","attribute","begin","block","body","buffer","bus","case","component","configuration","constant","context","cover","disconnect","downto","default","else","elsif","end","entity","exit","fairness","file","for","force","function","generate","generic","group","guarded","if","impure","in","inertial","inout","is","label","library","linkage","literal","loop","map","mod","nand","new","next","nor","not","null","of","on","open","or","others","out","package","parameter","port","postponed","procedure","process","property","protected","pure","range","record","register","reject","release","rem","report","restrict","restrict_guarantee","return","rol","ror","select","sequence","severity","shared","signal","sla","sll","sra","srl","strong","subtype","then","to","transport","type","unaffected","units","until","use","variable","view","vmode","vprop","vunit","wait","when","while","with","xnor","xor"],
 built_in:["boolean","bit","character","integer","time","delay_length","natural","positive","string","bit_vector","file_open_kind","file_open_status","std_logic","std_logic_vector","unsigned","signed","boolean_vector","integer_vector","std_ulogic","std_ulogic_vector","unresolved_unsigned","u_unsigned","unresolved_signed","u_signed","real_vector","time_vector"],
 literal:["false","true","note","warning","error","failure","line","text","side","width"]
 },illegal:/\{/,
 contains:[e.C_BLOCK_COMMENT_MODE,e.COMMENT("--","$"),e.QUOTE_STRING_MODE,{
-className:"number",
-begin:"\\b(\\d(_|\\d)*#\\w+(\\.\\w+)?#([eE][-+]?\\d(_|\\d)*)?|\\d(_|\\d)*(\\.\\d(_|\\d)*)?([eE][-+]?\\d(_|\\d)*)?)",
-relevance:0},{className:"string",begin:"'(U|X|0|1|Z|W|L|H|-)'",
-contains:[e.BACKSLASH_ESCAPE]},{className:"symbol",
-begin:"'[A-Za-z](_?[A-Za-z0-9])*",contains:[e.BACKSLASH_ESCAPE]}]})})()
-;hljs.registerLanguage("vhdl",e)})();
\ No newline at end of file
+className:"number",begin:n,relevance:0},{className:"string",
+begin:"'(U|X|0|1|Z|W|L|H|-)'",contains:[e.BACKSLASH_ESCAPE]},{
+className:"symbol",begin:"'[A-Za-z](_?[A-Za-z0-9])*",
+contains:[e.BACKSLASH_ESCAPE]}]}}})();hljs.registerLanguage("vhdl",e)})();
\ No newline at end of file
diff --git a/vendor/assets/javascripts/highlightjs/languages/vim.min.js b/vendor/assets/javascripts/highlightjs/languages/vim.min.js
index b624673c826..deed1b3ce54 100644
--- a/vendor/assets/javascripts/highlightjs/languages/vim.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/vim.min.js
@@ -1,4 +1,4 @@
-/*! `vim` grammar compiled for Highlight.js 11.6.0 */
+/*! `vim` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"Vim Script",keywords:{
 $pattern:/[!#@\w]+/,
 keyword:"N|0 P|0 X|0 a|0 ab abc abo al am an|0 ar arga argd arge argdo argg argl argu as au aug aun b|0 bN ba bad bd be bel bf bl bm bn bo bp br brea breaka breakd breakl bro bufdo buffers bun bw c|0 cN cNf ca cabc caddb cad caddf cal cat cb cc ccl cd ce cex cf cfir cgetb cgete cg changes chd che checkt cl cla clo cm cmapc cme cn cnew cnf cno cnorea cnoreme co col colo com comc comp con conf cope cp cpf cq cr cs cst cu cuna cunme cw delm deb debugg delc delf dif diffg diffo diffp diffpu diffs diffthis dig di dl dell dj dli do doautoa dp dr ds dsp e|0 ea ec echoe echoh echom echon el elsei em en endfo endf endt endw ene ex exe exi exu f|0 files filet fin fina fini fir fix fo foldc foldd folddoc foldo for fu go gr grepa gu gv ha helpf helpg helpt hi hid his ia iabc if ij il im imapc ime ino inorea inoreme int is isp iu iuna iunme j|0 ju k|0 keepa kee keepj lN lNf l|0 lad laddb laddf la lan lat lb lc lch lcl lcs le lefta let lex lf lfir lgetb lgete lg lgr lgrepa lh ll lla lli lmak lm lmapc lne lnew lnf ln loadk lo loc lockv lol lope lp lpf lr ls lt lu lua luad luaf lv lvimgrepa lw m|0 ma mak map mapc marks mat me menut mes mk mks mksp mkv mkvie mod mz mzf nbc nb nbs new nm nmapc nme nn nnoreme noa no noh norea noreme norm nu nun nunme ol o|0 om omapc ome on ono onoreme opt ou ounme ow p|0 profd prof pro promptr pc ped pe perld po popu pp pre prev ps pt ptN ptf ptj ptl ptn ptp ptr pts pu pw py3 python3 py3d py3f py pyd pyf quita qa rec red redi redr redraws reg res ret retu rew ri rightb rub rubyd rubyf rund ru rv sN san sa sal sav sb sbN sba sbf sbl sbm sbn sbp sbr scrip scripte scs se setf setg setl sf sfir sh sim sig sil sl sla sm smap smapc sme sn sni sno snor snoreme sor so spelld spe spelli spellr spellu spellw sp spr sre st sta startg startr star stopi stj sts sun sunm sunme sus sv sw sy synti sync tN tabN tabc tabdo tabe tabf tabfir tabl tabm tabnew tabn tabo tabp tabr tabs tab ta tags tc tcld tclf te tf th tj tl tm tn to tp tr try ts tu u|0 undoj undol una unh unl unlo unm unme uns up ve verb vert vim vimgrepa vi viu vie vm vmapc vme vne vn vnoreme vs vu vunme windo w|0 wN wa wh wi winc winp wn wp wq wqa ws wu wv x|0 xa xmapc xm xme xn xnoreme xu xunme y|0 z|0 ~ Next Print append abbreviate abclear aboveleft all amenu anoremenu args argadd argdelete argedit argglobal arglocal argument ascii autocmd augroup aunmenu buffer bNext ball badd bdelete behave belowright bfirst blast bmodified bnext botright bprevious brewind break breakadd breakdel breaklist browse bunload bwipeout change cNext cNfile cabbrev cabclear caddbuffer caddexpr caddfile call catch cbuffer cclose center cexpr cfile cfirst cgetbuffer cgetexpr cgetfile chdir checkpath checktime clist clast close cmap cmapclear cmenu cnext cnewer cnfile cnoremap cnoreabbrev cnoremenu copy colder colorscheme command comclear compiler continue confirm copen cprevious cpfile cquit crewind cscope cstag cunmap cunabbrev cunmenu cwindow delete delmarks debug debuggreedy delcommand delfunction diffupdate diffget diffoff diffpatch diffput diffsplit digraphs display deletel djump dlist doautocmd doautoall deletep drop dsearch dsplit edit earlier echo echoerr echohl echomsg else elseif emenu endif endfor endfunction endtry endwhile enew execute exit exusage file filetype find finally finish first fixdel fold foldclose folddoopen folddoclosed foldopen function global goto grep grepadd gui gvim hardcopy help helpfind helpgrep helptags highlight hide history insert iabbrev iabclear ijump ilist imap imapclear imenu inoremap inoreabbrev inoremenu intro isearch isplit iunmap iunabbrev iunmenu join jumps keepalt keepmarks keepjumps lNext lNfile list laddexpr laddbuffer laddfile last language later lbuffer lcd lchdir lclose lcscope left leftabove lexpr lfile lfirst lgetbuffer lgetexpr lgetfile lgrep lgrepadd lhelpgrep llast llist lmake lmap lmapclear lnext lnewer lnfile lnoremap loadkeymap loadview lockmarks lockvar lolder lopen lprevious lpfile lrewind ltag lunmap luado luafile lvimgrep lvimgrepadd lwindow move mark make mapclear match menu menutranslate messages mkexrc mksession mkspell mkvimrc mkview mode mzscheme mzfile nbclose nbkey nbsart next nmap nmapclear nmenu nnoremap nnoremenu noautocmd noremap nohlsearch noreabbrev noremenu normal number nunmap nunmenu oldfiles open omap omapclear omenu only onoremap onoremenu options ounmap ounmenu ownsyntax print profdel profile promptfind promptrepl pclose pedit perl perldo pop popup ppop preserve previous psearch ptag ptNext ptfirst ptjump ptlast ptnext ptprevious ptrewind ptselect put pwd py3do py3file python pydo pyfile quit quitall qall read recover redo redir redraw redrawstatus registers resize retab return rewind right rightbelow ruby rubydo rubyfile rundo runtime rviminfo substitute sNext sandbox sargument sall saveas sbuffer sbNext sball sbfirst sblast sbmodified sbnext sbprevious sbrewind scriptnames scriptencoding scscope set setfiletype setglobal setlocal sfind sfirst shell simalt sign silent sleep slast smagic smapclear smenu snext sniff snomagic snoremap snoremenu sort source spelldump spellgood spellinfo spellrepall spellundo spellwrong split sprevious srewind stop stag startgreplace startreplace startinsert stopinsert stjump stselect sunhide sunmap sunmenu suspend sview swapname syntax syntime syncbind tNext tabNext tabclose tabedit tabfind tabfirst tablast tabmove tabnext tabonly tabprevious tabrewind tag tcl tcldo tclfile tearoff tfirst throw tjump tlast tmenu tnext topleft tprevious trewind tselect tunmenu undo undojoin undolist unabbreviate unhide unlet unlockvar unmap unmenu unsilent update vglobal version verbose vertical vimgrep vimgrepadd visual viusage view vmap vmapclear vmenu vnew vnoremap vnoremenu vsplit vunmap vunmenu write wNext wall while winsize wincmd winpos wnext wprevious wqall wsverb wundo wviminfo xit xall xmapclear xmap xmenu xnoremap xnoremenu xunmap xunmenu yank",
diff --git a/vendor/assets/javascripts/highlightjs/languages/wasm.min.js b/vendor/assets/javascripts/highlightjs/languages/wasm.min.js
index 4ff229c7723..8372e17b925 100644
--- a/vendor/assets/javascripts/highlightjs/languages/wasm.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/wasm.min.js
@@ -1,4 +1,4 @@
-/*! `wasm` grammar compiled for Highlight.js 11.6.0 */
+/*! `wasm` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{e.regex;const a=e.COMMENT(/\(;/,/;\)/)
 ;return a.contains.push("self"),{name:"WebAssembly",keywords:{$pattern:/[\w.]+/,
 keyword:["anyfunc","block","br","br_if","br_table","call","call_indirect","data","drop","elem","else","end","export","func","global.get","global.set","local.get","local.set","local.tee","get_global","get_local","global","if","import","local","loop","memory","memory.grow","memory.size","module","mut","nop","offset","param","result","return","select","set_global","set_local","start","table","tee_local","then","type","unreachable"]
diff --git a/vendor/assets/javascripts/highlightjs/languages/wren.min.js b/vendor/assets/javascripts/highlightjs/languages/wren.min.js
index 8533fdb370f..2221843bf3a 100644
--- a/vendor/assets/javascripts/highlightjs/languages/wren.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/wren.min.js
@@ -1,4 +1,4 @@
-/*! `wren` grammar compiled for Highlight.js 11.6.0 */
+/*! `wren` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const a=e.regex,s=/[a-zA-Z]\w*/,t=["as","break","class","construct","continue","else","for","foreign","if","import","in","is","return","static","var","while"],c=["true","false","null"],n=["this","super"],r=["-","~",/\*/,"%",/\.\.\./,/\.\./,/\+/,"<<",">>",">=","<=","<",">",/\^/,/!=/,/!/,/\bis\b/,"==","&&","&",/\|\|/,/\|/,/\?:/,"="],i={
 relevance:0,match:a.concat(/\b(?!(if|while|for|else|super)\b)/,s,/(?=\s*[({])/),
diff --git a/vendor/assets/javascripts/highlightjs/languages/x86asm.min.js b/vendor/assets/javascripts/highlightjs/languages/x86asm.min.js
index c667e160e5b..2a164a3101e 100644
--- a/vendor/assets/javascripts/highlightjs/languages/x86asm.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/x86asm.min.js
@@ -1,4 +1,4 @@
-/*! `x86asm` grammar compiled for Highlight.js 11.6.0 */
+/*! `x86asm` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var s=(()=>{"use strict";return s=>({name:"Intel x86 Assembly",
 case_insensitive:!0,keywords:{$pattern:"[.%]?"+s.IDENT_RE,
 keyword:"lock rep repe repz repne repnz xaquire xrelease bnd nobnd aaa aad aam aas adc add and arpl bb0_reset bb1_reset bound bsf bsr bswap bt btc btr bts call cbw cdq cdqe clc cld cli clts cmc cmp cmpsb cmpsd cmpsq cmpsw cmpxchg cmpxchg486 cmpxchg8b cmpxchg16b cpuid cpu_read cpu_write cqo cwd cwde daa das dec div dmint emms enter equ f2xm1 fabs fadd faddp fbld fbstp fchs fclex fcmovb fcmovbe fcmove fcmovnb fcmovnbe fcmovne fcmovnu fcmovu fcom fcomi fcomip fcomp fcompp fcos fdecstp fdisi fdiv fdivp fdivr fdivrp femms feni ffree ffreep fiadd ficom ficomp fidiv fidivr fild fimul fincstp finit fist fistp fisttp fisub fisubr fld fld1 fldcw fldenv fldl2e fldl2t fldlg2 fldln2 fldpi fldz fmul fmulp fnclex fndisi fneni fninit fnop fnsave fnstcw fnstenv fnstsw fpatan fprem fprem1 fptan frndint frstor fsave fscale fsetpm fsin fsincos fsqrt fst fstcw fstenv fstp fstsw fsub fsubp fsubr fsubrp ftst fucom fucomi fucomip fucomp fucompp fxam fxch fxtract fyl2x fyl2xp1 hlt ibts icebp idiv imul in inc incbin insb insd insw int int01 int1 int03 int3 into invd invpcid invlpg invlpga iret iretd iretq iretw jcxz jecxz jrcxz jmp jmpe lahf lar lds lea leave les lfence lfs lgdt lgs lidt lldt lmsw loadall loadall286 lodsb lodsd lodsq lodsw loop loope loopne loopnz loopz lsl lss ltr mfence monitor mov movd movq movsb movsd movsq movsw movsx movsxd movzx mul mwait neg nop not or out outsb outsd outsw packssdw packsswb packuswb paddb paddd paddsb paddsiw paddsw paddusb paddusw paddw pand pandn pause paveb pavgusb pcmpeqb pcmpeqd pcmpeqw pcmpgtb pcmpgtd pcmpgtw pdistib pf2id pfacc pfadd pfcmpeq pfcmpge pfcmpgt pfmax pfmin pfmul pfrcp pfrcpit1 pfrcpit2 pfrsqit1 pfrsqrt pfsub pfsubr pi2fd pmachriw pmaddwd pmagw pmulhriw pmulhrwa pmulhrwc pmulhw pmullw pmvgezb pmvlzb pmvnzb pmvzb pop popa popad popaw popf popfd popfq popfw por prefetch prefetchw pslld psllq psllw psrad psraw psrld psrlq psrlw psubb psubd psubsb psubsiw psubsw psubusb psubusw psubw punpckhbw punpckhdq punpckhwd punpcklbw punpckldq punpcklwd push pusha pushad pushaw pushf pushfd pushfq pushfw pxor rcl rcr rdshr rdmsr rdpmc rdtsc rdtscp ret retf retn rol ror rdm rsdc rsldt rsm rsts sahf sal salc sar sbb scasb scasd scasq scasw sfence sgdt shl shld shr shrd sidt sldt skinit smi smint smintold smsw stc std sti stosb stosd stosq stosw str sub svdc svldt svts swapgs syscall sysenter sysexit sysret test ud0 ud1 ud2b ud2 ud2a umov verr verw fwait wbinvd wrshr wrmsr xadd xbts xchg xlatb xlat xor cmove cmovz cmovne cmovnz cmova cmovnbe cmovae cmovnb cmovb cmovnae cmovbe cmovna cmovg cmovnle cmovge cmovnl cmovl cmovnge cmovle cmovng cmovc cmovnc cmovo cmovno cmovs cmovns cmovp cmovpe cmovnp cmovpo je jz jne jnz ja jnbe jae jnb jb jnae jbe jna jg jnle jge jnl jl jnge jle jng jc jnc jo jno js jns jpo jnp jpe jp sete setz setne setnz seta setnbe setae setnb setnc setb setnae setcset setbe setna setg setnle setge setnl setl setnge setle setng sets setns seto setno setpe setp setpo setnp addps addss andnps andps cmpeqps cmpeqss cmpleps cmpless cmpltps cmpltss cmpneqps cmpneqss cmpnleps cmpnless cmpnltps cmpnltss cmpordps cmpordss cmpunordps cmpunordss cmpps cmpss comiss cvtpi2ps cvtps2pi cvtsi2ss cvtss2si cvttps2pi cvttss2si divps divss ldmxcsr maxps maxss minps minss movaps movhps movlhps movlps movhlps movmskps movntps movss movups mulps mulss orps rcpps rcpss rsqrtps rsqrtss shufps sqrtps sqrtss stmxcsr subps subss ucomiss unpckhps unpcklps xorps fxrstor fxrstor64 fxsave fxsave64 xgetbv xsetbv xsave xsave64 xsaveopt xsaveopt64 xrstor xrstor64 prefetchnta prefetcht0 prefetcht1 prefetcht2 maskmovq movntq pavgb pavgw pextrw pinsrw pmaxsw pmaxub pminsw pminub pmovmskb pmulhuw psadbw pshufw pf2iw pfnacc pfpnacc pi2fw pswapd maskmovdqu clflush movntdq movnti movntpd movdqa movdqu movdq2q movq2dq paddq pmuludq pshufd pshufhw pshuflw pslldq psrldq psubq punpckhqdq punpcklqdq addpd addsd andnpd andpd cmpeqpd cmpeqsd cmplepd cmplesd cmpltpd cmpltsd cmpneqpd cmpneqsd cmpnlepd cmpnlesd cmpnltpd cmpnltsd cmpordpd cmpordsd cmpunordpd cmpunordsd cmppd comisd cvtdq2pd cvtdq2ps cvtpd2dq cvtpd2pi cvtpd2ps cvtpi2pd cvtps2dq cvtps2pd cvtsd2si cvtsd2ss cvtsi2sd cvtss2sd cvttpd2pi cvttpd2dq cvttps2dq cvttsd2si divpd divsd maxpd maxsd minpd minsd movapd movhpd movlpd movmskpd movupd mulpd mulsd orpd shufpd sqrtpd sqrtsd subpd subsd ucomisd unpckhpd unpcklpd xorpd addsubpd addsubps haddpd haddps hsubpd hsubps lddqu movddup movshdup movsldup clgi stgi vmcall vmclear vmfunc vmlaunch vmload vmmcall vmptrld vmptrst vmread vmresume vmrun vmsave vmwrite vmxoff vmxon invept invvpid pabsb pabsw pabsd palignr phaddw phaddd phaddsw phsubw phsubd phsubsw pmaddubsw pmulhrsw pshufb psignb psignw psignd extrq insertq movntsd movntss lzcnt blendpd blendps blendvpd blendvps dppd dpps extractps insertps movntdqa mpsadbw packusdw pblendvb pblendw pcmpeqq pextrb pextrd pextrq phminposuw pinsrb pinsrd pinsrq pmaxsb pmaxsd pmaxud pmaxuw pminsb pminsd pminud pminuw pmovsxbw pmovsxbd pmovsxbq pmovsxwd pmovsxwq pmovsxdq pmovzxbw pmovzxbd pmovzxbq pmovzxwd pmovzxwq pmovzxdq pmuldq pmulld ptest roundpd roundps roundsd roundss crc32 pcmpestri pcmpestrm pcmpistri pcmpistrm pcmpgtq popcnt getsec pfrcpv pfrsqrtv movbe aesenc aesenclast aesdec aesdeclast aesimc aeskeygenassist vaesenc vaesenclast vaesdec vaesdeclast vaesimc vaeskeygenassist vaddpd vaddps vaddsd vaddss vaddsubpd vaddsubps vandpd vandps vandnpd vandnps vblendpd vblendps vblendvpd vblendvps vbroadcastss vbroadcastsd vbroadcastf128 vcmpeq_ospd vcmpeqpd vcmplt_ospd vcmpltpd vcmple_ospd vcmplepd vcmpunord_qpd vcmpunordpd vcmpneq_uqpd vcmpneqpd vcmpnlt_uspd vcmpnltpd vcmpnle_uspd vcmpnlepd vcmpord_qpd vcmpordpd vcmpeq_uqpd vcmpnge_uspd vcmpngepd vcmpngt_uspd vcmpngtpd vcmpfalse_oqpd vcmpfalsepd vcmpneq_oqpd vcmpge_ospd vcmpgepd vcmpgt_ospd vcmpgtpd vcmptrue_uqpd vcmptruepd vcmplt_oqpd vcmple_oqpd vcmpunord_spd vcmpneq_uspd vcmpnlt_uqpd vcmpnle_uqpd vcmpord_spd vcmpeq_uspd vcmpnge_uqpd vcmpngt_uqpd vcmpfalse_ospd vcmpneq_ospd vcmpge_oqpd vcmpgt_oqpd vcmptrue_uspd vcmppd vcmpeq_osps vcmpeqps vcmplt_osps vcmpltps vcmple_osps vcmpleps vcmpunord_qps vcmpunordps vcmpneq_uqps vcmpneqps vcmpnlt_usps vcmpnltps vcmpnle_usps vcmpnleps vcmpord_qps vcmpordps vcmpeq_uqps vcmpnge_usps vcmpngeps vcmpngt_usps vcmpngtps vcmpfalse_oqps vcmpfalseps vcmpneq_oqps vcmpge_osps vcmpgeps vcmpgt_osps vcmpgtps vcmptrue_uqps vcmptrueps vcmplt_oqps vcmple_oqps vcmpunord_sps vcmpneq_usps vcmpnlt_uqps vcmpnle_uqps vcmpord_sps vcmpeq_usps vcmpnge_uqps vcmpngt_uqps vcmpfalse_osps vcmpneq_osps vcmpge_oqps vcmpgt_oqps vcmptrue_usps vcmpps vcmpeq_ossd vcmpeqsd vcmplt_ossd vcmpltsd vcmple_ossd vcmplesd vcmpunord_qsd vcmpunordsd vcmpneq_uqsd vcmpneqsd vcmpnlt_ussd vcmpnltsd vcmpnle_ussd vcmpnlesd vcmpord_qsd vcmpordsd vcmpeq_uqsd vcmpnge_ussd vcmpngesd vcmpngt_ussd vcmpngtsd vcmpfalse_oqsd vcmpfalsesd vcmpneq_oqsd vcmpge_ossd vcmpgesd vcmpgt_ossd vcmpgtsd vcmptrue_uqsd vcmptruesd vcmplt_oqsd vcmple_oqsd vcmpunord_ssd vcmpneq_ussd vcmpnlt_uqsd vcmpnle_uqsd vcmpord_ssd vcmpeq_ussd vcmpnge_uqsd vcmpngt_uqsd vcmpfalse_ossd vcmpneq_ossd vcmpge_oqsd vcmpgt_oqsd vcmptrue_ussd vcmpsd vcmpeq_osss vcmpeqss vcmplt_osss vcmpltss vcmple_osss vcmpless vcmpunord_qss vcmpunordss vcmpneq_uqss vcmpneqss vcmpnlt_usss vcmpnltss vcmpnle_usss vcmpnless vcmpord_qss vcmpordss vcmpeq_uqss vcmpnge_usss vcmpngess vcmpngt_usss vcmpngtss vcmpfalse_oqss vcmpfalsess vcmpneq_oqss vcmpge_osss vcmpgess vcmpgt_osss vcmpgtss vcmptrue_uqss vcmptruess vcmplt_oqss vcmple_oqss vcmpunord_sss vcmpneq_usss vcmpnlt_uqss vcmpnle_uqss vcmpord_sss vcmpeq_usss vcmpnge_uqss vcmpngt_uqss vcmpfalse_osss vcmpneq_osss vcmpge_oqss vcmpgt_oqss vcmptrue_usss vcmpss vcomisd vcomiss vcvtdq2pd vcvtdq2ps vcvtpd2dq vcvtpd2ps vcvtps2dq vcvtps2pd vcvtsd2si vcvtsd2ss vcvtsi2sd vcvtsi2ss vcvtss2sd vcvtss2si vcvttpd2dq vcvttps2dq vcvttsd2si vcvttss2si vdivpd vdivps vdivsd vdivss vdppd vdpps vextractf128 vextractps vhaddpd vhaddps vhsubpd vhsubps vinsertf128 vinsertps vlddqu vldqqu vldmxcsr vmaskmovdqu vmaskmovps vmaskmovpd vmaxpd vmaxps vmaxsd vmaxss vminpd vminps vminsd vminss vmovapd vmovaps vmovd vmovq vmovddup vmovdqa vmovqqa vmovdqu vmovqqu vmovhlps vmovhpd vmovhps vmovlhps vmovlpd vmovlps vmovmskpd vmovmskps vmovntdq vmovntqq vmovntdqa vmovntpd vmovntps vmovsd vmovshdup vmovsldup vmovss vmovupd vmovups vmpsadbw vmulpd vmulps vmulsd vmulss vorpd vorps vpabsb vpabsw vpabsd vpacksswb vpackssdw vpackuswb vpackusdw vpaddb vpaddw vpaddd vpaddq vpaddsb vpaddsw vpaddusb vpaddusw vpalignr vpand vpandn vpavgb vpavgw vpblendvb vpblendw vpcmpestri vpcmpestrm vpcmpistri vpcmpistrm vpcmpeqb vpcmpeqw vpcmpeqd vpcmpeqq vpcmpgtb vpcmpgtw vpcmpgtd vpcmpgtq vpermilpd vpermilps vperm2f128 vpextrb vpextrw vpextrd vpextrq vphaddw vphaddd vphaddsw vphminposuw vphsubw vphsubd vphsubsw vpinsrb vpinsrw vpinsrd vpinsrq vpmaddwd vpmaddubsw vpmaxsb vpmaxsw vpmaxsd vpmaxub vpmaxuw vpmaxud vpminsb vpminsw vpminsd vpminub vpminuw vpminud vpmovmskb vpmovsxbw vpmovsxbd vpmovsxbq vpmovsxwd vpmovsxwq vpmovsxdq vpmovzxbw vpmovzxbd vpmovzxbq vpmovzxwd vpmovzxwq vpmovzxdq vpmulhuw vpmulhrsw vpmulhw vpmullw vpmulld vpmuludq vpmuldq vpor vpsadbw vpshufb vpshufd vpshufhw vpshuflw vpsignb vpsignw vpsignd vpslldq vpsrldq vpsllw vpslld vpsllq vpsraw vpsrad vpsrlw vpsrld vpsrlq vptest vpsubb vpsubw vpsubd vpsubq vpsubsb vpsubsw vpsubusb vpsubusw vpunpckhbw vpunpckhwd vpunpckhdq vpunpckhqdq vpunpcklbw vpunpcklwd vpunpckldq vpunpcklqdq vpxor vrcpps vrcpss vrsqrtps vrsqrtss vroundpd vroundps vroundsd vroundss vshufpd vshufps vsqrtpd vsqrtps vsqrtsd vsqrtss vstmxcsr vsubpd vsubps vsubsd vsubss vtestps vtestpd vucomisd vucomiss vunpckhpd vunpckhps vunpcklpd vunpcklps vxorpd vxorps vzeroall vzeroupper pclmullqlqdq pclmulhqlqdq pclmullqhqdq pclmulhqhqdq pclmulqdq vpclmullqlqdq vpclmulhqlqdq vpclmullqhqdq vpclmulhqhqdq vpclmulqdq vfmadd132ps vfmadd132pd vfmadd312ps vfmadd312pd vfmadd213ps vfmadd213pd vfmadd123ps vfmadd123pd vfmadd231ps vfmadd231pd vfmadd321ps vfmadd321pd vfmaddsub132ps vfmaddsub132pd vfmaddsub312ps vfmaddsub312pd vfmaddsub213ps vfmaddsub213pd vfmaddsub123ps vfmaddsub123pd vfmaddsub231ps vfmaddsub231pd vfmaddsub321ps vfmaddsub321pd vfmsub132ps vfmsub132pd vfmsub312ps vfmsub312pd vfmsub213ps vfmsub213pd vfmsub123ps vfmsub123pd vfmsub231ps vfmsub231pd vfmsub321ps vfmsub321pd vfmsubadd132ps vfmsubadd132pd vfmsubadd312ps vfmsubadd312pd vfmsubadd213ps vfmsubadd213pd vfmsubadd123ps vfmsubadd123pd vfmsubadd231ps vfmsubadd231pd vfmsubadd321ps vfmsubadd321pd vfnmadd132ps vfnmadd132pd vfnmadd312ps vfnmadd312pd vfnmadd213ps vfnmadd213pd vfnmadd123ps vfnmadd123pd vfnmadd231ps vfnmadd231pd vfnmadd321ps vfnmadd321pd vfnmsub132ps vfnmsub132pd vfnmsub312ps vfnmsub312pd vfnmsub213ps vfnmsub213pd vfnmsub123ps vfnmsub123pd vfnmsub231ps vfnmsub231pd vfnmsub321ps vfnmsub321pd vfmadd132ss vfmadd132sd vfmadd312ss vfmadd312sd vfmadd213ss vfmadd213sd vfmadd123ss vfmadd123sd vfmadd231ss vfmadd231sd vfmadd321ss vfmadd321sd vfmsub132ss vfmsub132sd vfmsub312ss vfmsub312sd vfmsub213ss vfmsub213sd vfmsub123ss vfmsub123sd vfmsub231ss vfmsub231sd vfmsub321ss vfmsub321sd vfnmadd132ss vfnmadd132sd vfnmadd312ss vfnmadd312sd vfnmadd213ss vfnmadd213sd vfnmadd123ss vfnmadd123sd vfnmadd231ss vfnmadd231sd vfnmadd321ss vfnmadd321sd vfnmsub132ss vfnmsub132sd vfnmsub312ss vfnmsub312sd vfnmsub213ss vfnmsub213sd vfnmsub123ss vfnmsub123sd vfnmsub231ss vfnmsub231sd vfnmsub321ss vfnmsub321sd rdfsbase rdgsbase rdrand wrfsbase wrgsbase vcvtph2ps vcvtps2ph adcx adox rdseed clac stac xstore xcryptecb xcryptcbc xcryptctr xcryptcfb xcryptofb montmul xsha1 xsha256 llwpcb slwpcb lwpval lwpins vfmaddpd vfmaddps vfmaddsd vfmaddss vfmaddsubpd vfmaddsubps vfmsubaddpd vfmsubaddps vfmsubpd vfmsubps vfmsubsd vfmsubss vfnmaddpd vfnmaddps vfnmaddsd vfnmaddss vfnmsubpd vfnmsubps vfnmsubsd vfnmsubss vfrczpd vfrczps vfrczsd vfrczss vpcmov vpcomb vpcomd vpcomq vpcomub vpcomud vpcomuq vpcomuw vpcomw vphaddbd vphaddbq vphaddbw vphadddq vphaddubd vphaddubq vphaddubw vphaddudq vphadduwd vphadduwq vphaddwd vphaddwq vphsubbw vphsubdq vphsubwd vpmacsdd vpmacsdqh vpmacsdql vpmacssdd vpmacssdqh vpmacssdql vpmacsswd vpmacssww vpmacswd vpmacsww vpmadcsswd vpmadcswd vpperm vprotb vprotd vprotq vprotw vpshab vpshad vpshaq vpshaw vpshlb vpshld vpshlq vpshlw vbroadcasti128 vpblendd vpbroadcastb vpbroadcastw vpbroadcastd vpbroadcastq vpermd vpermpd vpermps vpermq vperm2i128 vextracti128 vinserti128 vpmaskmovd vpmaskmovq vpsllvd vpsllvq vpsravd vpsrlvd vpsrlvq vgatherdpd vgatherqpd vgatherdps vgatherqps vpgatherdd vpgatherqd vpgatherdq vpgatherqq xabort xbegin xend xtest andn bextr blci blcic blsi blsic blcfill blsfill blcmsk blsmsk blsr blcs bzhi mulx pdep pext rorx sarx shlx shrx tzcnt tzmsk t1mskc valignd valignq vblendmpd vblendmps vbroadcastf32x4 vbroadcastf64x4 vbroadcasti32x4 vbroadcasti64x4 vcompresspd vcompressps vcvtpd2udq vcvtps2udq vcvtsd2usi vcvtss2usi vcvttpd2udq vcvttps2udq vcvttsd2usi vcvttss2usi vcvtudq2pd vcvtudq2ps vcvtusi2sd vcvtusi2ss vexpandpd vexpandps vextractf32x4 vextractf64x4 vextracti32x4 vextracti64x4 vfixupimmpd vfixupimmps vfixupimmsd vfixupimmss vgetexppd vgetexpps vgetexpsd vgetexpss vgetmantpd vgetmantps vgetmantsd vgetmantss vinsertf32x4 vinsertf64x4 vinserti32x4 vinserti64x4 vmovdqa32 vmovdqa64 vmovdqu32 vmovdqu64 vpabsq vpandd vpandnd vpandnq vpandq vpblendmd vpblendmq vpcmpltd vpcmpled vpcmpneqd vpcmpnltd vpcmpnled vpcmpd vpcmpltq vpcmpleq vpcmpneqq vpcmpnltq vpcmpnleq vpcmpq vpcmpequd vpcmpltud vpcmpleud vpcmpnequd vpcmpnltud vpcmpnleud vpcmpud vpcmpequq vpcmpltuq vpcmpleuq vpcmpnequq vpcmpnltuq vpcmpnleuq vpcmpuq vpcompressd vpcompressq vpermi2d vpermi2pd vpermi2ps vpermi2q vpermt2d vpermt2pd vpermt2ps vpermt2q vpexpandd vpexpandq vpmaxsq vpmaxuq vpminsq vpminuq vpmovdb vpmovdw vpmovqb vpmovqd vpmovqw vpmovsdb vpmovsdw vpmovsqb vpmovsqd vpmovsqw vpmovusdb vpmovusdw vpmovusqb vpmovusqd vpmovusqw vpord vporq vprold vprolq vprolvd vprolvq vprord vprorq vprorvd vprorvq vpscatterdd vpscatterdq vpscatterqd vpscatterqq vpsraq vpsravq vpternlogd vpternlogq vptestmd vptestmq vptestnmd vptestnmq vpxord vpxorq vrcp14pd vrcp14ps vrcp14sd vrcp14ss vrndscalepd vrndscaleps vrndscalesd vrndscaless vrsqrt14pd vrsqrt14ps vrsqrt14sd vrsqrt14ss vscalefpd vscalefps vscalefsd vscalefss vscatterdpd vscatterdps vscatterqpd vscatterqps vshuff32x4 vshuff64x2 vshufi32x4 vshufi64x2 kandnw kandw kmovw knotw kortestw korw kshiftlw kshiftrw kunpckbw kxnorw kxorw vpbroadcastmb2q vpbroadcastmw2d vpconflictd vpconflictq vplzcntd vplzcntq vexp2pd vexp2ps vrcp28pd vrcp28ps vrcp28sd vrcp28ss vrsqrt28pd vrsqrt28ps vrsqrt28sd vrsqrt28ss vgatherpf0dpd vgatherpf0dps vgatherpf0qpd vgatherpf0qps vgatherpf1dpd vgatherpf1dps vgatherpf1qpd vgatherpf1qps vscatterpf0dpd vscatterpf0dps vscatterpf0qpd vscatterpf0qps vscatterpf1dpd vscatterpf1dps vscatterpf1qpd vscatterpf1qps prefetchwt1 bndmk bndcl bndcu bndcn bndmov bndldx bndstx sha1rnds4 sha1nexte sha1msg1 sha1msg2 sha256rnds2 sha256msg1 sha256msg2 hint_nop0 hint_nop1 hint_nop2 hint_nop3 hint_nop4 hint_nop5 hint_nop6 hint_nop7 hint_nop8 hint_nop9 hint_nop10 hint_nop11 hint_nop12 hint_nop13 hint_nop14 hint_nop15 hint_nop16 hint_nop17 hint_nop18 hint_nop19 hint_nop20 hint_nop21 hint_nop22 hint_nop23 hint_nop24 hint_nop25 hint_nop26 hint_nop27 hint_nop28 hint_nop29 hint_nop30 hint_nop31 hint_nop32 hint_nop33 hint_nop34 hint_nop35 hint_nop36 hint_nop37 hint_nop38 hint_nop39 hint_nop40 hint_nop41 hint_nop42 hint_nop43 hint_nop44 hint_nop45 hint_nop46 hint_nop47 hint_nop48 hint_nop49 hint_nop50 hint_nop51 hint_nop52 hint_nop53 hint_nop54 hint_nop55 hint_nop56 hint_nop57 hint_nop58 hint_nop59 hint_nop60 hint_nop61 hint_nop62 hint_nop63",
diff --git a/vendor/assets/javascripts/highlightjs/languages/xl.min.js b/vendor/assets/javascripts/highlightjs/languages/xl.min.js
index dd500c1e177..49040ad760f 100644
--- a/vendor/assets/javascripts/highlightjs/languages/xl.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/xl.min.js
@@ -1,4 +1,4 @@
-/*! `xl` grammar compiled for Highlight.js 11.6.0 */
+/*! `xl` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const t={
 $pattern:/[a-zA-Z][a-zA-Z0-9_?]*/,
 keyword:["if","then","else","do","while","until","for","loop","import","with","is","as","where","when","by","data","constant","integer","real","text","name","boolean","symbol","infix","prefix","postfix","block","tree"],
diff --git a/vendor/assets/javascripts/highlightjs/languages/xml.min.js b/vendor/assets/javascripts/highlightjs/languages/xml.min.js
index 6e6367e0ef2..d86b71d8b38 100644
--- a/vendor/assets/javascripts/highlightjs/languages/xml.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/xml.min.js
@@ -1,4 +1,4 @@
-/*! `xml` grammar compiled for Highlight.js 11.6.0 */
+/*! `xml` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const a=e.regex,n=a.concat(/[\p{L}_]/u,a.optional(/[\p{L}0-9_.-]*:/u),/[\p{L}0-9_.-]*/u),s={
 className:"symbol",begin:/&[a-z]+;|&#[0-9]+;|&#x[a-f0-9]+;/},t={begin:/\s/,
diff --git a/vendor/assets/javascripts/highlightjs/languages/xquery.min.js b/vendor/assets/javascripts/highlightjs/languages/xquery.min.js
index e5b0dc9bfe8..f8afff57733 100644
--- a/vendor/assets/javascripts/highlightjs/languages/xquery.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/xquery.min.js
@@ -1,4 +1,4 @@
-/*! `xquery` grammar compiled for Highlight.js 11.6.0 */
+/*! `xquery` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>({name:"XQuery",aliases:["xpath","xq"],
 case_insensitive:!1,illegal:/(proc)|(abstract)|(extends)|(until)|(#)/,keywords:{
 $pattern:/[a-zA-Z$][a-zA-Z0-9_:-]*/,
diff --git a/vendor/assets/javascripts/highlightjs/languages/yaml.min.js b/vendor/assets/javascripts/highlightjs/languages/yaml.min.js
index 34baea6a5b7..bea9fcd0165 100644
--- a/vendor/assets/javascripts/highlightjs/languages/yaml.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/yaml.min.js
@@ -1,4 +1,4 @@
-/*! `yaml` grammar compiled for Highlight.js 11.6.0 */
+/*! `yaml` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{
 const n="true false yes no null",a="[\\w#;/?:@&=+$,.~*'()[\\]]+",s={
 className:"string",relevance:0,variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/
diff --git a/vendor/assets/javascripts/highlightjs/languages/zephir.min.js b/vendor/assets/javascripts/highlightjs/languages/zephir.min.js
index afa69cb07be..8015bb7f22c 100644
--- a/vendor/assets/javascripts/highlightjs/languages/zephir.min.js
+++ b/vendor/assets/javascripts/highlightjs/languages/zephir.min.js
@@ -1,4 +1,4 @@
-/*! `zephir` grammar compiled for Highlight.js 11.6.0 */
+/*! `zephir` grammar compiled for Highlight.js 11.8.0 */
 (()=>{var e=(()=>{"use strict";return e=>{const n={className:"string",
 contains:[e.BACKSLASH_ESCAPE],variants:[e.inherit(e.APOS_STRING_MODE,{
 illegal:null}),e.inherit(e.QUOTE_STRING_MODE,{illegal:null})]
diff --git a/vendor/assets/javascripts/highlightjs/package.json b/vendor/assets/javascripts/highlightjs/package.json
index 08811acce6f..3a11973b07c 100644
--- a/vendor/assets/javascripts/highlightjs/package.json
+++ b/vendor/assets/javascripts/highlightjs/package.json
@@ -6,7 +6,7 @@
     "syntax"
   ],
   "homepage": "https://highlightjs.org/",
-  "version": "11.6.0",
+  "version": "11.8.0",
   "author": "Josh Goebel <hello@joshgoebel.com>",
   "contributors": [
     "Josh Goebel <hello@joshgoebel.com>",
@@ -42,6 +42,7 @@
     "build": "node ./tools/build.js -t node",
     "build-cdn": "node ./tools/build.js -t cdn",
     "build-browser": "node ./tools/build.js -t browser :common",
+    "devtool": "npx http-server",
     "test": "mocha test",
     "test-markup": "mocha test/markup",
     "test-detect": "mocha test/detect",
@@ -53,37 +54,38 @@
   },
   "devDependencies": {
     "@colors/colors": "^1.5.0",
-    "@rollup/plugin-commonjs": "^22.0.0",
-    "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^13.3.0",
-    "@types/mocha": "^9.1.1",
-    "@typescript-eslint/eslint-plugin": "^5.27.1",
-    "@typescript-eslint/parser": "^5.27.1",
-    "clean-css": "^5.3.0",
+    "@rollup/plugin-commonjs": "^24.1.0",
+    "@rollup/plugin-json": "^6.0.0",
+    "@rollup/plugin-node-resolve": "^15.0.2",
+    "@types/mocha": "^10.0.1",
+    "@typescript-eslint/eslint-plugin": "^5.59.1",
+    "@typescript-eslint/parser": "^5.59.1",
+    "clean-css": "^5.3.2",
     "cli-table": "^0.3.1",
-    "commander": "9.3",
+    "commander": "^10.0.1",
     "css": "^3.0.0",
     "css-color-names": "^1.0.1",
-    "deep-freeze-es6": "^1.4.1",
+    "deep-freeze-es6": "^2.0.0",
     "del": "^6.1.1",
     "dependency-resolver": "^2.0.1",
-    "eslint": "^8.17.0",
+    "eslint": "^8.39.0",
     "eslint-config-standard": "^17.0.0",
-    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^6.0.0",
-    "glob": "^7.2.3",
-    "glob-promise": "^4.2.2",
+    "eslint-plugin-promise": "^6.1.1",
+    "glob": "^8.0.3",
+    "glob-promise": "^6.0.2",
     "handlebars": "^4.7.6",
-    "jsdom": "^20.0.0",
+    "http-server": "^14.1.1",
+    "jsdom": "^21.1.1",
     "lodash": "^4.17.20",
-    "mocha": "^10.0.0",
+    "mocha": "^10.2.0",
     "refa": "^0.4.1",
     "rollup": "^2.47.0",
     "should": "^13.2.3",
-    "terser": "^5.14.1",
+    "terser": "^5.17.1",
     "tiny-worker": "^2.3.0",
-    "typescript": "^4.7.3",
+    "typescript": "^5.0.4",
     "wcag-contrast": "^3.0.0"
   }
 }
\ No newline at end of file
diff --git a/vendor/assets/javascripts/moment-timezone-with-data.js b/vendor/assets/javascripts/moment-timezone-with-data.js
index d577bb75210..8347a351547 100644
--- a/vendor/assets/javascripts/moment-timezone-with-data.js
+++ b/vendor/assets/javascripts/moment-timezone-with-data.js
@@ -1,5 +1,5 @@
 //! moment-timezone.js
-//! version : 0.5.39
+//! version : 0.5.43
 //! Copyright (c) JS Foundation and other contributors
 //! license : MIT
 //! github.com/moment/moment-timezone
@@ -29,7 +29,7 @@
 	// 	return moment;
 	// }
 
-	var VERSION = "0.5.39",
+	var VERSION = "0.5.43",
 		zones = {},
 		links = {},
 		countries = {},
@@ -691,102 +691,101 @@
 	}
 
 	loadData({
-		"version": "2022f",
+		"version": "2023c",
 		"zones": [
 			"Africa/Abidjan|GMT|0|0||48e5",
 			"Africa/Nairobi|EAT|-30|0||47e5",
 			"Africa/Algiers|CET|-10|0||26e5",
 			"Africa/Lagos|WAT|-10|0||17e6",
-			"Africa/Maputo|CAT|-20|0||26e5",
-			"Africa/Cairo|EET|-20|0||15e6",
-			"Africa/Casablanca|+00 +01|0 -10|01010101010101010101010101|1T0q0 mo0 gM0 LA0 WM0 jA0 e00 28M0 e00 2600 gM0 2600 e00 2600 gM0 2600 gM0 2600 e00 2600 gM0 2600 e00 28M0 e00|32e5",
-			"Europe/Paris|CET CEST|-10 -20|01010101010101010101010|1T0p0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0|11e6",
+			"Africa/Khartoum|CAT|-20|0||51e5",
+			"Africa/Cairo|EET EEST|-20 -30|0101010101010|29NW0 1cL0 1cN0 1fz0 1a10 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0|15e6",
+			"Africa/Casablanca|+00 +01|0 -10|010101010101010101010101|1Vq20 jA0 e00 28M0 e00 2600 gM0 2600 e00 2600 gM0 2600 e00 28M0 e00 2600 gM0 2600 e00 28M0 e00 2600 gM0|32e5",
+			"Europe/Paris|CET CEST|-10 -20|01010101010101010101010|1Vq10 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0|11e6",
 			"Africa/Johannesburg|SAST|-20|0||84e5",
 			"Africa/Juba|EAT CAT|-30 -20|01|24nx0|",
-			"Africa/Khartoum|EAT CAT|-30 -20|01|1Usl0|51e5",
 			"Africa/Sao_Tome|GMT WAT|0 -10|010|1UQN0 2q00|",
-			"Africa/Windhoek|CAT WAT|-20 -10|010|1T3c0 11B0|32e4",
-			"America/Adak|HST HDT|a0 90|01010101010101010101010|1ST00 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0|326",
-			"America/Anchorage|AKST AKDT|90 80|01010101010101010101010|1SSX0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0|30e4",
+			"Africa/Tripoli|EET|-20|0||11e5",
+			"America/Adak|HST HDT|a0 90|01010101010101010101010|1VkA0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0|326",
+			"America/Anchorage|AKST AKDT|90 80|01010101010101010101010|1Vkz0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0|30e4",
 			"America/Santo_Domingo|AST|40|0||29e5",
 			"America/Fortaleza|-03|30|0||34e5",
-			"America/Asuncion|-03 -04|30 40|01010101010101010101010|1T0r0 1fB0 19X0 1ip0 17b0 1ip0 17b0 1ip0 19X0 1fB0 19X0 1fB0 19X0 1fB0 19X0 1ip0 17b0 1ip0 17b0 1ip0 19X0 1fB0|28e5",
+			"America/Asuncion|-03 -04|30 40|01010101010101010101010|1Vq30 1ip0 17b0 1ip0 17b0 1ip0 19X0 1fB0 19X0 1fB0 19X0 1fB0 19X0 1ip0 17b0 1ip0 17b0 1ip0 19X0 1fB0 19X0 1fB0|28e5",
 			"America/Panama|EST|50|0||15e5",
-			"America/Mexico_City|CST CDT|60 50|0101010101010|1T3k0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0|20e6",
+			"America/Mexico_City|CST CDT|60 50|01010101010|1VsU0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0|20e6",
 			"America/Managua|CST|60|0||22e5",
 			"America/Caracas|-04|40|0||29e5",
 			"America/Lima|-05|50|0||11e6",
-			"America/Denver|MST MDT|70 60|01010101010101010101010|1SSV0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0|26e5",
-			"America/Campo_Grande|-03 -04|30 40|010101|1SKr0 1zd0 On0 1HB0 FX0|77e4",
-			"America/Chicago|CST CDT|60 50|01010101010101010101010|1SSU0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0|92e5",
-			"America/Chihuahua|MST MDT CST|70 60 60|0101010101012|1T3l0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0|81e4",
+			"America/Denver|MST MDT|70 60|01010101010101010101010|1Vkx0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0|26e5",
+			"America/Campo_Grande|-03 -04|30 40|0101|1Vc30 1HB0 FX0|77e4",
+			"America/Chicago|CST CDT|60 50|01010101010101010101010|1Vkw0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0|92e5",
+			"America/Chihuahua|MST MDT CST|70 60 60|01010101012|1VsV0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0|81e4",
+			"America/Ciudad_Juarez|MST MDT CST|70 60 60|010101010120101010101010|1Vkx0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1wn0 cm0 EP0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0|",
 			"America/Phoenix|MST|70|0||42e5",
-			"America/Whitehorse|PST PDT MST|80 70 70|010101012|1SSW0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1z90|23e3",
-			"America/New_York|EST EDT|50 40|01010101010101010101010|1SST0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0|21e6",
-			"America/Los_Angeles|PST PDT|80 70|01010101010101010101010|1SSW0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0|15e6",
-			"America/Halifax|AST ADT|40 30|01010101010101010101010|1SSS0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0|39e4",
-			"America/Godthab|-03 -02|30 20|01010101010101010101010|1T0p0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0|17e3",
-			"America/Grand_Turk|AST EDT EST|40 40 50|012121212121212121212|1Vkv0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0|37e2",
-			"America/Havana|CST CDT|50 40|01010101010101010101010|1SSR0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0|21e5",
-			"America/Mazatlan|MST MDT|70 60|0101010101010|1T3l0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0|44e4",
-			"America/Metlakatla|AKST AKDT PST|90 80 80|010120101010101010101010|1SSX0 1zb0 Op0 1zb0 uM0 jB0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0|14e2",
-			"America/Miquelon|-03 -02|30 20|01010101010101010101010|1SSR0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0|61e2",
+			"America/Whitehorse|PST PDT MST|80 70 70|0101012|1Vky0 1zb0 Op0 1zb0 Op0 1z90|23e3",
+			"America/New_York|EST EDT|50 40|01010101010101010101010|1Vkv0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0|21e6",
+			"America/Los_Angeles|PST PDT|80 70|01010101010101010101010|1Vky0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0|15e6",
+			"America/Halifax|AST ADT|40 30|01010101010101010101010|1Vku0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0|39e4",
+			"America/Godthab|-03 -02 -01|30 20 10|0101010101012121212121|1Vq10 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 2so0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0|17e3",
+			"America/Grand_Turk|AST EDT EST|40 40 50|01212121212121212121212|1Vkv0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0|37e2",
+			"America/Havana|CST CDT|50 40|01010101010101010101010|1Vkt0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0|21e5",
+			"America/Mazatlan|MST MDT|70 60|01010101010|1VsV0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0|44e4",
+			"America/Metlakatla|AKST AKDT PST|90 80 80|012010101010101010101010|1Vkz0 1zb0 uM0 jB0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0|14e2",
+			"America/Miquelon|-03 -02|30 20|01010101010101010101010|1Vkt0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0|61e2",
 			"America/Noronha|-02|20|0||30e2",
-			"America/Ojinaga|MST MDT CST|70 60 60|0101010101012|1SSV0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1wn0|23e3",
-			"America/Santiago|-03 -04|30 40|01010101010101010101010|1Tk30 Ap0 1Nb0 Ap0 1zb0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 11B0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0|62e5",
-			"America/Sao_Paulo|-02 -03|20 30|010101|1SKq0 1zd0 On0 1HB0 FX0|20e6",
-			"Atlantic/Azores|-01 +00|10 0|01010101010101010101010|1T0p0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0|25e4",
-			"America/St_Johns|NST NDT|3u 2u|01010101010101010101010|1SSRu 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0|11e4",
+			"America/Ojinaga|MST MDT CST CDT|70 60 60 50|01010101012323232323232|1Vkx0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1wn0 Rc0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0|23e3",
+			"America/Santiago|-03 -04|30 40|01010101010101010101010|1VJD0 Ap0 1zb0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 11B0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0|62e5",
+			"America/Sao_Paulo|-02 -03|20 30|0101|1Vc20 1HB0 FX0|20e6",
+			"Atlantic/Azores|-01 +00|10 0|01010101010101010101010|1Vq10 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0|25e4",
+			"America/St_Johns|NST NDT|3u 2u|01010101010101010101010|1Vktu 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0|11e4",
 			"Antarctica/Casey|+11 +08|-b0 -80|0101010|1Vkh0 1o30 14k0 1kr0 12l0 1o01|10",
 			"Asia/Bangkok|+07|-70|0||15e6",
 			"Asia/Vladivostok|+10|-a0|0||60e4",
-			"Australia/Sydney|AEDT AEST|-b0 -a0|01010101010101010101010|1T340 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0|40e5",
+			"Australia/Sydney|AEDT AEST|-b0 -a0|01010101010101010101010|1VsE0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0|40e5",
 			"Asia/Tashkent|+05|-50|0||23e5",
-			"Pacific/Auckland|NZDT NZST|-d0 -c0|01010101010101010101010|1T320 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1io0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00|14e5",
+			"Pacific/Auckland|NZDT NZST|-d0 -c0|01010101010101010101010|1VsC0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1io0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00|14e5",
 			"Europe/Istanbul|+03|-30|0||13e6",
-			"Antarctica/Troll|+00 +02|0 -20|01010101010101010101010|1T0p0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0|40",
+			"Antarctica/Troll|+00 +02|0 -20|01010101010101010101010|1Vq10 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0|40",
 			"Asia/Dhaka|+06|-60|0||16e6",
-			"Asia/Amman|EET EEST +03|-20 -30 -30|0101010101012|1T2m0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 LA0 1C00|25e5",
+			"Asia/Amman|EET EEST +03|-20 -30 -30|01010101012|1VrW0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 LA0 1C00|25e5",
 			"Asia/Kamchatka|+12|-c0|0||18e4",
 			"Asia/Dubai|+04|-40|0||39e5",
-			"Asia/Beirut|EET EEST|-20 -30|01010101010101010101010|1T0m0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0|22e5",
+			"Asia/Beirut|EET EEST|-20 -30|01010101010101010101010|1VpW0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0|22e5",
 			"Asia/Kuala_Lumpur|+08|-80|0||71e5",
 			"Asia/Kolkata|IST|-5u|0||15e6",
 			"Asia/Chita|+09|-90|0||33e4",
 			"Asia/Shanghai|CST|-80|0||23e6",
 			"Asia/Colombo|+0530|-5u|0||22e5",
-			"Asia/Damascus|EET EEST +03|-20 -30 -30|0101010101012|1T2m0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0|26e5",
-			"Asia/Famagusta|+03 EET EEST|-30 -20 -30|0121212121212121212121|1Urd0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0|",
-			"Asia/Gaza|EET EEST|-20 -30|01010101010101010101010|1SXX0 1qL0 WN0 1qL0 11c0 1on0 11B0 1o00 11A0 1qo0 XA0 1qp0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0|18e5",
+			"Asia/Damascus|EET EEST +03|-20 -30 -30|01010101012|1VrW0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0|26e5",
+			"Europe/Athens|EET EEST|-20 -30|01010101010101010101010|1Vq10 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0|35e5",
+			"Asia/Gaza|EET EEST|-20 -30|01010101010101010101010|1Vpz0 1qL0 11c0 1on0 11B0 1o00 11A0 1qo0 XA0 1qp0 1cN0 1cL0 17d0 1in0 14p0 1lb0 11B0 1nX0 11B0 1qL0 WN0 1qL0|18e5",
 			"Asia/Hong_Kong|HKT|-80|0||73e5",
 			"Asia/Jakarta|WIB|-70|0||31e6",
 			"Asia/Jayapura|WIT|-90|0||26e4",
-			"Asia/Jerusalem|IST IDT|-20 -30|01010101010101010101010|1SXA0 1rz0 W10 1rz0 10N0 1oL0 10N0 1oL0 10N0 1rz0 W10 1rz0 W10 1rz0 10N0 1oL0 10N0 1oL0 10N0 1oL0 10N0 1rz0|81e4",
+			"Asia/Jerusalem|IST IDT|-20 -30|01010101010101010101010|1Vpc0 1rz0 10N0 1oL0 10N0 1oL0 10N0 1rz0 W10 1rz0 W10 1rz0 10N0 1oL0 10N0 1oL0 10N0 1oL0 10N0 1rz0 W10 1rz0|81e4",
 			"Asia/Kabul|+0430|-4u|0||46e5",
 			"Asia/Karachi|PKT|-50|0||24e6",
 			"Asia/Kathmandu|+0545|-5J|0||12e5",
 			"Asia/Sakhalin|+11|-b0|0||58e4",
 			"Asia/Makassar|WITA|-80|0||15e5",
 			"Asia/Manila|PST|-80|0||24e6",
-			"Europe/Athens|EET EEST|-20 -30|01010101010101010101010|1T0p0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0|35e5",
 			"Asia/Pyongyang|KST KST|-8u -90|01|1VGf0|29e5",
 			"Asia/Qyzylorda|+06 +05|-60 -50|01|1Xei0|73e4",
 			"Asia/Rangoon|+0630|-6u|0||48e5",
 			"Asia/Seoul|KST|-90|0||23e6",
-			"Asia/Tehran|+0330 +0430|-3u -4u|0101010101010|1SWIu 1dz0 1cp0 1dz0 1cp0 1dz0 1cp0 1dz0 1cN0 1dz0 1cp0 1dz0|14e6",
+			"Asia/Tehran|+0330 +0430|-3u -4u|01010101010|1VoIu 1dz0 1cp0 1dz0 1cp0 1dz0 1cN0 1dz0 1cp0 1dz0|14e6",
 			"Asia/Tokyo|JST|-90|0||38e6",
-			"Europe/Lisbon|WET WEST|0 -10|01010101010101010101010|1T0p0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0|27e5",
+			"Europe/Lisbon|WET WEST|0 -10|01010101010101010101010|1Vq10 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0|27e5",
 			"Atlantic/Cape_Verde|-01|10|0||50e4",
-			"Australia/Adelaide|ACDT ACST|-au -9u|01010101010101010101010|1T34u 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0|11e5",
+			"Australia/Adelaide|ACDT ACST|-au -9u|01010101010101010101010|1VsEu 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0|11e5",
 			"Australia/Brisbane|AEST|-a0|0||20e5",
 			"Australia/Darwin|ACST|-9u|0||12e4",
 			"Australia/Eucla|+0845|-8J|0||368",
-			"Australia/Lord_Howe|+11 +1030|-b0 -au|01010101010101010101010|1T330 1cMu 1cLu 1fAu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1fzu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu|347",
+			"Australia/Lord_Howe|+11 +1030|-b0 -au|01010101010101010101010|1VsD0 1fAu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1fzu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu|347",
 			"Australia/Perth|AWST|-80|0||18e5",
-			"Pacific/Easter|-05 -06|50 60|01010101010101010101010|1Tk30 Ap0 1Nb0 Ap0 1zb0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 11B0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0|30e2",
-			"Europe/Dublin|GMT IST|0 -10|01010101010101010101010|1T0p0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0|12e5",
+			"Pacific/Easter|-05 -06|50 60|01010101010101010101010|1VJD0 Ap0 1zb0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 11B0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0|30e2",
+			"Europe/Dublin|GMT IST|0 -10|01010101010101010101010|1Vq10 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0|12e5",
 			"Etc/GMT-1|+01|-10|0||",
-			"Pacific/Fakaofo|+13|-d0|0||483",
+			"Pacific/Tongatapu|+13|-d0|0||75e3",
 			"Pacific/Kiritimati|+14|-e0|0||51e2",
 			"Etc/GMT-2|+02|-20|0||",
 			"Pacific/Tahiti|-10|a0|0||18e4",
@@ -797,20 +796,19 @@
 			"Pacific/Pitcairn|-08|80|0||56",
 			"Pacific/Gambier|-09|90|0||125",
 			"Etc/UTC|UTC|0|0||",
-			"Europe/London|GMT BST|0 -10|01010101010101010101010|1T0p0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0|10e6",
-			"Europe/Chisinau|EET EEST|-20 -30|01010101010101010101010|1T0o0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0|67e4",
+			"Europe/London|GMT BST|0 -10|01010101010101010101010|1Vq10 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0|10e6",
+			"Europe/Chisinau|EET EEST|-20 -30|01010101010101010101010|1Vq00 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0|67e4",
 			"Europe/Moscow|MSK|-30|0||16e6",
-			"Europe/Volgograd|+03 +04|-30 -40|010|1WQL0 5gn0|10e5",
+			"Europe/Volgograd|MSK +04|-30 -40|010|1WQL0 5gn0|10e5",
 			"Pacific/Honolulu|HST|a0|0||37e4",
-			"MET|MET MEST|-10 -20|01010101010101010101010|1T0p0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0|",
-			"Pacific/Chatham|+1345 +1245|-dJ -cJ|01010101010101010101010|1T320 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1io0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00|600",
-			"Pacific/Apia|+14 +13|-e0 -d0|0101010101|1T320 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00 1fA0|37e3",
-			"Pacific/Fiji|+13 +12|-d0 -c0|0101010101|1Swe0 1VA0 s00 1VA0 s00 20o0 pc0 2hc0 bc0|88e4",
+			"MET|MET MEST|-10 -20|01010101010101010101010|1Vq10 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0|",
+			"Pacific/Chatham|+1345 +1245|-dJ -cJ|01010101010101010101010|1VsC0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1io0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00|600",
+			"Pacific/Apia|+14 +13|-e0 -d0|01010101|1VsC0 1cM0 1fA0 1a00 1fA0 1a00 1fA0|37e3",
+			"Pacific/Fiji|+13 +12|-d0 -c0|01010101|1UVO0 1VA0 s00 20o0 pc0 2hc0 bc0|88e4",
 			"Pacific/Guam|ChST|-a0|0||17e4",
 			"Pacific/Marquesas|-0930|9u|0||86e2",
 			"Pacific/Pago_Pago|SST|b0|0||37e2",
-			"Pacific/Norfolk|+11 +12|-b0 -c0|010101010101010101|219P0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0|25e4",
-			"Pacific/Tongatapu|+14 +13|-e0 -d0|01|1Swd0|75e3"
+			"Pacific/Norfolk|+11 +12|-b0 -c0|01010101010101010101|219P0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0|25e4"
 		],
 		"links": [
 			"Africa/Abidjan|Africa/Accra",
@@ -840,13 +838,19 @@
 			"Africa/Abidjan|Greenwich",
 			"Africa/Abidjan|Iceland",
 			"Africa/Algiers|Africa/Tunis",
-			"Africa/Cairo|Africa/Tripoli",
 			"Africa/Cairo|Egypt",
-			"Africa/Cairo|Europe/Kaliningrad",
-			"Africa/Cairo|Libya",
 			"Africa/Casablanca|Africa/El_Aaiun",
 			"Africa/Johannesburg|Africa/Maseru",
 			"Africa/Johannesburg|Africa/Mbabane",
+			"Africa/Khartoum|Africa/Blantyre",
+			"Africa/Khartoum|Africa/Bujumbura",
+			"Africa/Khartoum|Africa/Gaborone",
+			"Africa/Khartoum|Africa/Harare",
+			"Africa/Khartoum|Africa/Kigali",
+			"Africa/Khartoum|Africa/Lubumbashi",
+			"Africa/Khartoum|Africa/Lusaka",
+			"Africa/Khartoum|Africa/Maputo",
+			"Africa/Khartoum|Africa/Windhoek",
 			"Africa/Lagos|Africa/Bangui",
 			"Africa/Lagos|Africa/Brazzaville",
 			"Africa/Lagos|Africa/Douala",
@@ -857,13 +861,6 @@
 			"Africa/Lagos|Africa/Ndjamena",
 			"Africa/Lagos|Africa/Niamey",
 			"Africa/Lagos|Africa/Porto-Novo",
-			"Africa/Maputo|Africa/Blantyre",
-			"Africa/Maputo|Africa/Bujumbura",
-			"Africa/Maputo|Africa/Gaborone",
-			"Africa/Maputo|Africa/Harare",
-			"Africa/Maputo|Africa/Kigali",
-			"Africa/Maputo|Africa/Lubumbashi",
-			"Africa/Maputo|Africa/Lusaka",
 			"Africa/Nairobi|Africa/Addis_Ababa",
 			"Africa/Nairobi|Africa/Asmara",
 			"Africa/Nairobi|Africa/Asmera",
@@ -874,6 +871,8 @@
 			"Africa/Nairobi|Indian/Antananarivo",
 			"Africa/Nairobi|Indian/Comoro",
 			"Africa/Nairobi|Indian/Mayotte",
+			"Africa/Tripoli|Europe/Kaliningrad",
+			"Africa/Tripoli|Libya",
 			"America/Adak|America/Atka",
 			"America/Adak|US/Aleutian",
 			"America/Anchorage|America/Juneau",
@@ -1191,6 +1190,7 @@
 			"Etc/UTC|UTC",
 			"Etc/UTC|Universal",
 			"Etc/UTC|Zulu",
+			"Europe/Athens|Asia/Famagusta",
 			"Europe/Athens|Asia/Nicosia",
 			"Europe/Athens|EET",
 			"Europe/Athens|Europe/Bucharest",
@@ -1216,7 +1216,6 @@
 			"Europe/Istanbul|Asia/Qatar",
 			"Europe/Istanbul|Asia/Riyadh",
 			"Europe/Istanbul|Etc/GMT-3",
-			"Europe/Istanbul|Europe/Kirov",
 			"Europe/Istanbul|Europe/Minsk",
 			"Europe/Istanbul|Turkey",
 			"Europe/Lisbon|Atlantic/Canary",
@@ -1231,6 +1230,7 @@
 			"Europe/London|Europe/Jersey",
 			"Europe/London|GB",
 			"Europe/London|GB-Eire",
+			"Europe/Moscow|Europe/Kirov",
 			"Europe/Moscow|Europe/Simferopol",
 			"Europe/Moscow|W-SU",
 			"Europe/Paris|Africa/Ceuta",
@@ -1273,9 +1273,6 @@
 			"Pacific/Auckland|NZ",
 			"Pacific/Chatham|NZ-CHAT",
 			"Pacific/Easter|Chile/EasterIsland",
-			"Pacific/Fakaofo|Etc/GMT-13",
-			"Pacific/Fakaofo|Pacific/Enderbury",
-			"Pacific/Fakaofo|Pacific/Kanton",
 			"Pacific/Galapagos|Etc/GMT+6",
 			"Pacific/Gambier|Etc/GMT+9",
 			"Pacific/Guam|Pacific/Saipan",
@@ -1289,7 +1286,11 @@
 			"Pacific/Pago_Pago|US/Samoa",
 			"Pacific/Pitcairn|Etc/GMT+8",
 			"Pacific/Tahiti|Etc/GMT+10",
-			"Pacific/Tahiti|Pacific/Rarotonga"
+			"Pacific/Tahiti|Pacific/Rarotonga",
+			"Pacific/Tongatapu|Etc/GMT-13",
+			"Pacific/Tongatapu|Pacific/Enderbury",
+			"Pacific/Tongatapu|Pacific/Fakaofo",
+			"Pacific/Tongatapu|Pacific/Kanton"
 		],
 		"countries": [
 			"AD|Europe/Andorra",
@@ -1328,7 +1329,7 @@
 			"BW|Africa/Maputo Africa/Gaborone",
 			"BY|Europe/Minsk",
 			"BZ|America/Belize",
-			"CA|America/St_Johns America/Halifax America/Glace_Bay America/Moncton America/Goose_Bay America/Toronto America/Iqaluit America/Pangnirtung America/Winnipeg America/Resolute America/Rankin_Inlet America/Regina America/Swift_Current America/Edmonton America/Cambridge_Bay America/Yellowknife America/Inuvik America/Dawson_Creek America/Fort_Nelson America/Whitehorse America/Dawson America/Vancouver America/Panama America/Puerto_Rico America/Phoenix America/Blanc-Sablon America/Atikokan America/Creston",
+			"CA|America/St_Johns America/Halifax America/Glace_Bay America/Moncton America/Goose_Bay America/Toronto America/Iqaluit America/Winnipeg America/Resolute America/Rankin_Inlet America/Regina America/Swift_Current America/Edmonton America/Cambridge_Bay America/Inuvik America/Dawson_Creek America/Fort_Nelson America/Whitehorse America/Dawson America/Vancouver America/Panama America/Puerto_Rico America/Phoenix America/Blanc-Sablon America/Atikokan America/Creston",
 			"CC|Asia/Yangon Indian/Cocos",
 			"CD|Africa/Maputo Africa/Lagos Africa/Kinshasa Africa/Lubumbashi",
 			"CF|Africa/Lagos Africa/Bangui",
@@ -1446,7 +1447,7 @@
 			"MU|Indian/Mauritius",
 			"MV|Indian/Maldives",
 			"MW|Africa/Maputo Africa/Blantyre",
-			"MX|America/Mexico_City America/Cancun America/Merida America/Monterrey America/Matamoros America/Mazatlan America/Chihuahua America/Ojinaga America/Hermosillo America/Tijuana America/Bahia_Banderas",
+			"MX|America/Mexico_City America/Cancun America/Merida America/Monterrey America/Matamoros America/Chihuahua America/Ciudad_Juarez America/Ojinaga America/Mazatlan America/Bahia_Banderas America/Hermosillo America/Tijuana",
 			"MY|Asia/Kuching Asia/Singapore Asia/Kuala_Lumpur",
 			"MZ|Africa/Maputo",
 			"NA|Africa/Windhoek",
@@ -1521,7 +1522,7 @@
 			"TZ|Africa/Nairobi Africa/Dar_es_Salaam",
 			"UA|Europe/Simferopol Europe/Kyiv",
 			"UG|Africa/Nairobi Africa/Kampala",
-			"UM|Pacific/Pago_Pago Pacific/Tarawa Pacific/Honolulu Pacific/Midway Pacific/Wake",
+			"UM|Pacific/Pago_Pago Pacific/Tarawa Pacific/Midway Pacific/Wake",
 			"US|America/New_York America/Detroit America/Kentucky/Louisville America/Kentucky/Monticello America/Indiana/Indianapolis America/Indiana/Vincennes America/Indiana/Winamac America/Indiana/Marengo America/Indiana/Petersburg America/Indiana/Vevay America/Chicago America/Indiana/Tell_City America/Indiana/Knox America/Menominee America/North_Dakota/Center America/North_Dakota/New_Salem America/North_Dakota/Beulah America/Denver America/Boise America/Phoenix America/Los_Angeles America/Anchorage America/Juneau America/Sitka America/Metlakatla America/Yakutat America/Nome America/Adak Pacific/Honolulu",
 			"UY|America/Montevideo",
 			"UZ|Asia/Samarkand Asia/Tashkent",
diff --git a/vendor/assets/svg-icons/discourse-additional.svg b/vendor/assets/svg-icons/discourse-additional.svg
index 38ec0f46099..577596f7203 100644
--- a/vendor/assets/svg-icons/discourse-additional.svg
+++ b/vendor/assets/svg-icons/discourse-additional.svg
@@ -53,4 +53,7 @@ Additional SVG icons
       </clipPath>
     </defs>
   </symbol>
+  <symbol id="discourse-threads" viewBox="0 0 16 17" fill-rule="evenodd" clip-rule="evenodd">
+    <path d="M5 0L4.57143 3H1V5H4.28571L3.71429 9H0V11H3.42857L3 14L4.9799 14.2828L5.44888 11H7V9H5.73459L6.30602 5H11.2857L11 7H13.0203L13.306 5H16V3H13.5917L13.9799 0.282843L12 0L11.5714 3H6.59173L6.9799 0.282843L5 0ZM8 13.5V9C8 8.44772 8.44771 8 9 8H15C15.5523 8 16 8.44771 16 9V13.5C16 14.0523 15.5523 14.5 15 14.5H12.1194C11.5042 15.2014 10.396 16.3544 10.0417 16C9.97944 15.9223 9.99982 15.0667 10.0206 14.5H9C8.44771 14.5 8 14.0523 8 13.5Z"/>
+  </symbol>
 </svg>
diff --git a/yarn.lock b/yarn.lock
index 40febf39c5b..e7f1c19acef 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,262 +2,387 @@
 # yarn lockfile v1
 
 
-"@ampproject/remapping@^2.1.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d"
-  integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==
+"@aashutoshrathi/word-wrap@^1.2.3":
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
+  integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
+
+"@ampproject/remapping@^2.2.0":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630"
+  integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==
   dependencies:
-    "@jridgewell/gen-mapping" "^0.1.0"
+    "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@babel/code-frame@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
-  integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
+"@babel/code-frame@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.5.tgz#234d98e1551960604f1246e6475891a570ad5658"
+  integrity sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==
   dependencies:
-    "@babel/highlight" "^7.18.6"
+    "@babel/highlight" "^7.22.5"
 
-"@babel/compat-data@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.18.6.tgz#8b37d24e88e8e21c499d4328db80577d8882fa53"
-  integrity sha512-tzulrgDT0QD6U7BJ4TKVk2SDDg7wlP39P9yAx1RfLy7vP/7rsDRlWVfbWxElslu56+r7QOhB2NSDsabYYruoZQ==
+"@babel/compat-data@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.5.tgz#b1f6c86a02d85d2dd3368a2b67c09add8cd0c255"
+  integrity sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA==
 
-"@babel/core@^7.18.5":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.6.tgz#54a107a3c298aee3fe5e1947a6464b9b6faca03d"
-  integrity sha512-cQbWBpxcbbs/IUredIPkHiAGULLV8iwgNRMFzvbhEXISp4f3rUUXE5+TIw6KwUWUR3DwyI6gmBRnmAtYaWehwQ==
+"@babel/compat-data@^7.22.9":
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.9.tgz#71cdb00a1ce3a329ce4cbec3a44f9fef35669730"
+  integrity sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==
+
+"@babel/core@^7.20.12":
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.9.tgz#bd96492c68822198f33e8a256061da3cf391f58f"
+  integrity sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==
   dependencies:
-    "@ampproject/remapping" "^2.1.0"
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.18.6"
-    "@babel/helper-compilation-targets" "^7.18.6"
-    "@babel/helper-module-transforms" "^7.18.6"
-    "@babel/helpers" "^7.18.6"
-    "@babel/parser" "^7.18.6"
-    "@babel/template" "^7.18.6"
-    "@babel/traverse" "^7.18.6"
-    "@babel/types" "^7.18.6"
+    "@ampproject/remapping" "^2.2.0"
+    "@babel/code-frame" "^7.22.5"
+    "@babel/generator" "^7.22.9"
+    "@babel/helper-compilation-targets" "^7.22.9"
+    "@babel/helper-module-transforms" "^7.22.9"
+    "@babel/helpers" "^7.22.6"
+    "@babel/parser" "^7.22.7"
+    "@babel/template" "^7.22.5"
+    "@babel/traverse" "^7.22.8"
+    "@babel/types" "^7.22.5"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
-    json5 "^2.2.1"
+    json5 "^2.2.2"
+    semver "^6.3.1"
+
+"@babel/core@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.5.tgz#d67d9747ecf26ee7ecd3ebae1ee22225fe902a89"
+  integrity sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==
+  dependencies:
+    "@ampproject/remapping" "^2.2.0"
+    "@babel/code-frame" "^7.22.5"
+    "@babel/generator" "^7.22.5"
+    "@babel/helper-compilation-targets" "^7.22.5"
+    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helpers" "^7.22.5"
+    "@babel/parser" "^7.22.5"
+    "@babel/template" "^7.22.5"
+    "@babel/traverse" "^7.22.5"
+    "@babel/types" "^7.22.5"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.2.2"
     semver "^6.3.0"
 
-"@babel/eslint-parser@^7.18.2":
-  version "7.18.2"
-  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.18.2.tgz#e14dee36c010edfb0153cf900c2b0815e82e3245"
-  integrity sha512-oFQYkE8SuH14+uR51JVAmdqwKYXGRjEXx7s+WiagVjqQ+HPE+nnwyF2qlVG8evUsUHmPcA+6YXMEDbIhEyQc5A==
+"@babel/eslint-parser@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.22.5.tgz#fa032503b9e2d188e25b1b95d29e8b8431042d78"
+  integrity sha512-C69RWYNYtrgIRE5CmTd77ZiLDXqgBipahJc/jHP3sLcAGj6AJzxNIuKNpVnICqbyK7X3pFUfEvL++rvtbQpZkQ==
   dependencies:
-    eslint-scope "^5.1.1"
+    "@nicolo-ribaudo/eslint-scope-5-internals" "5.1.1-v1"
     eslint-visitor-keys "^2.1.0"
     semver "^6.3.0"
 
-"@babel/generator@^7.18.6":
-  version "7.18.7"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.7.tgz#2aa78da3c05aadfc82dbac16c99552fc802284bd"
-  integrity sha512-shck+7VLlY72a2w9c3zYWuE1pwOKEiQHV7GTUbSnhyl5eu3i04t30tBY82ZRWrDfo3gkakCFtevExnxbkf2a3A==
+"@babel/generator@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.5.tgz#1e7bf768688acfb05cf30b2369ef855e82d984f7"
+  integrity sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA==
   dependencies:
-    "@babel/types" "^7.18.7"
+    "@babel/types" "^7.22.5"
     "@jridgewell/gen-mapping" "^0.3.2"
+    "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
 
-"@babel/helper-annotate-as-pure@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb"
-  integrity sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==
+"@babel/generator@^7.22.7", "@babel/generator@^7.22.9":
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.9.tgz#572ecfa7a31002fa1de2a9d91621fd895da8493d"
+  integrity sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==
   dependencies:
-    "@babel/types" "^7.18.6"
+    "@babel/types" "^7.22.5"
+    "@jridgewell/gen-mapping" "^0.3.2"
+    "@jridgewell/trace-mapping" "^0.3.17"
+    jsesc "^2.5.1"
 
-"@babel/helper-compilation-targets@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.6.tgz#18d35bfb9f83b1293c22c55b3d576c1315b6ed96"
-  integrity sha512-vFjbfhNCzqdeAtZflUFrG5YIFqGTqsctrtkZ1D/NB0mDW9TwW3GmmUepYY4G9wCET5rY5ugz4OGTcLd614IzQg==
+"@babel/helper-annotate-as-pure@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882"
+  integrity sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==
   dependencies:
-    "@babel/compat-data" "^7.18.6"
-    "@babel/helper-validator-option" "^7.18.6"
-    browserslist "^4.20.2"
+    "@babel/types" "^7.22.5"
+
+"@babel/helper-compilation-targets@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.5.tgz#fc7319fc54c5e2fa14b2909cf3c5fd3046813e02"
+  integrity sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw==
+  dependencies:
+    "@babel/compat-data" "^7.22.5"
+    "@babel/helper-validator-option" "^7.22.5"
+    browserslist "^4.21.3"
+    lru-cache "^5.1.1"
     semver "^6.3.0"
 
-"@babel/helper-create-class-features-plugin@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.6.tgz#6f15f8459f3b523b39e00a99982e2c040871ed72"
-  integrity sha512-YfDzdnoxHGV8CzqHGyCbFvXg5QESPFkXlHtvdCkesLjjVMT2Adxe4FGUR5ChIb3DxSaXO12iIOCWoXdsUVwnqw==
+"@babel/helper-compilation-targets@^7.22.9":
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.9.tgz#f9d0a7aaaa7cd32a3f31c9316a69f5a9bcacb892"
+  integrity sha512-7qYrNM6HjpnPHJbopxmb8hSPoZ0gsX8IvUS32JGVoy+pU9e5N0nLr1VjJoR6kA4d9dmGLxNYOjeB8sUDal2WMw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-environment-visitor" "^7.18.6"
-    "@babel/helper-function-name" "^7.18.6"
-    "@babel/helper-member-expression-to-functions" "^7.18.6"
-    "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/helper-replace-supers" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/compat-data" "^7.22.9"
+    "@babel/helper-validator-option" "^7.22.5"
+    browserslist "^4.21.9"
+    lru-cache "^5.1.1"
+    semver "^6.3.1"
 
-"@babel/helper-environment-visitor@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.6.tgz#b7eee2b5b9d70602e59d1a6cad7dd24de7ca6cd7"
-  integrity sha512-8n6gSfn2baOY+qlp+VSzsosjCVGFqWKmDF0cCWOybh52Dw3SEyoWR1KrhMJASjLwIEkkAufZ0xvr+SxLHSpy2Q==
-
-"@babel/helper-function-name@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.18.6.tgz#8334fecb0afba66e6d87a7e8c6bb7fed79926b83"
-  integrity sha512-0mWMxV1aC97dhjCah5U5Ua7668r5ZmSC2DLfH2EZnf9c3/dHZKiFa5pRLMH5tjSl471tY6496ZWk/kjNONBxhw==
+"@babel/helper-create-class-features-plugin@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.5.tgz#2192a1970ece4685fbff85b48da2c32fcb130b7c"
+  integrity sha512-xkb58MyOYIslxu3gKmVXmjTtUPvBU4odYzbiIQbWwLKIHCsx6UGZGX6F1IznMFVnDdirseUZopzN+ZRt8Xb33Q==
   dependencies:
-    "@babel/template" "^7.18.6"
-    "@babel/types" "^7.18.6"
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-member-expression-to-functions" "^7.22.5"
+    "@babel/helper-optimise-call-expression" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.5"
+    semver "^6.3.0"
 
-"@babel/helper-hoist-variables@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678"
-  integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==
+"@babel/helper-environment-visitor@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz#f06dd41b7c1f44e1f8da6c4055b41ab3a09a7e98"
+  integrity sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==
+
+"@babel/helper-function-name@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz#ede300828905bb15e582c037162f99d5183af1be"
+  integrity sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==
   dependencies:
-    "@babel/types" "^7.18.6"
+    "@babel/template" "^7.22.5"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-member-expression-to-functions@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.6.tgz#44802d7d602c285e1692db0bad9396d007be2afc"
-  integrity sha512-CeHxqwwipekotzPDUuJOfIMtcIHBuc7WAzLmTYWctVigqS5RktNMQ5bEwQSuGewzYnCtTWa3BARXeiLxDTv+Ng==
+"@babel/helper-hoist-variables@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
+  integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==
   dependencies:
-    "@babel/types" "^7.18.6"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-module-imports@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e"
-  integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==
+"@babel/helper-member-expression-to-functions@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz#0a7c56117cad3372fbf8d2fb4bf8f8d64a1e76b2"
+  integrity sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==
   dependencies:
-    "@babel/types" "^7.18.6"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-module-transforms@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.18.6.tgz#57e3ca669e273d55c3cda55e6ebf552f37f483c8"
-  integrity sha512-L//phhB4al5uucwzlimruukHB3jRd5JGClwRMD/ROrVjXfLqovYnvQrK/JK36WYyVwGGO7OD3kMyVTjx+WVPhw==
+"@babel/helper-module-imports@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz#1a8f4c9f4027d23f520bd76b364d44434a72660c"
+  integrity sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.18.6"
-    "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-simple-access" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/helper-validator-identifier" "^7.18.6"
-    "@babel/template" "^7.18.6"
-    "@babel/traverse" "^7.18.6"
-    "@babel/types" "^7.18.6"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-optimise-call-expression@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe"
-  integrity sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==
+"@babel/helper-module-transforms@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz#0f65daa0716961b6e96b164034e737f60a80d2ef"
+  integrity sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw==
   dependencies:
-    "@babel/types" "^7.18.6"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-module-imports" "^7.22.5"
+    "@babel/helper-simple-access" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.5"
+    "@babel/template" "^7.22.5"
+    "@babel/traverse" "^7.22.5"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-plugin-utils@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.6.tgz#9448974dd4fb1d80fefe72e8a0af37809cd30d6d"
-  integrity sha512-gvZnm1YAAxh13eJdkb9EWHBnF3eAub3XTLCZEehHT2kWxiKVRL64+ae5Y6Ivne0mVHmMYKT+xWgZO+gQhuLUBg==
-
-"@babel/helper-replace-supers@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.18.6.tgz#efedf51cfccea7b7b8c0f00002ab317e7abfe420"
-  integrity sha512-fTf7zoXnUGl9gF25fXCWE26t7Tvtyn6H4hkLSYhATwJvw2uYxd3aoXplMSe0g9XbwK7bmxNes7+FGO0rB/xC0g==
+"@babel/helper-module-transforms@^7.22.9":
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz#92dfcb1fbbb2bc62529024f72d942a8c97142129"
+  integrity sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.18.6"
-    "@babel/helper-member-expression-to-functions" "^7.18.6"
-    "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/traverse" "^7.18.6"
-    "@babel/types" "^7.18.6"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-module-imports" "^7.22.5"
+    "@babel/helper-simple-access" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/helper-validator-identifier" "^7.22.5"
 
-"@babel/helper-simple-access@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz#d6d8f51f4ac2978068df934b569f08f29788c7ea"
-  integrity sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==
+"@babel/helper-optimise-call-expression@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz#f21531a9ccbff644fdd156b4077c16ff0c3f609e"
+  integrity sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==
   dependencies:
-    "@babel/types" "^7.18.6"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-split-export-declaration@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075"
-  integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==
+"@babel/helper-plugin-utils@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295"
+  integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==
+
+"@babel/helper-replace-supers@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.5.tgz#71bc5fb348856dea9fdc4eafd7e2e49f585145dc"
+  integrity sha512-aLdNM5I3kdI/V9xGNyKSF3X/gTyMUBohTZ+/3QdQKAA9vxIiy12E+8E2HoOP1/DjeqU+g6as35QHJNMDDYpuCg==
   dependencies:
-    "@babel/types" "^7.18.6"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-member-expression-to-functions" "^7.22.5"
+    "@babel/helper-optimise-call-expression" "^7.22.5"
+    "@babel/template" "^7.22.5"
+    "@babel/traverse" "^7.22.5"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-validator-identifier@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz#9c97e30d31b2b8c72a1d08984f2ca9b574d7a076"
-  integrity sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==
-
-"@babel/helper-validator-option@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8"
-  integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==
-
-"@babel/helpers@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.18.6.tgz#4c966140eaa1fcaa3d5a8c09d7db61077d4debfd"
-  integrity sha512-vzSiiqbQOghPngUYt/zWGvK3LAsPhz55vc9XNN0xAl2gV4ieShI2OQli5duxWHD+72PZPTKAcfcZDE1Cwc5zsQ==
+"@babel/helper-simple-access@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de"
+  integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==
   dependencies:
-    "@babel/template" "^7.18.6"
-    "@babel/traverse" "^7.18.6"
-    "@babel/types" "^7.18.6"
+    "@babel/types" "^7.22.5"
 
-"@babel/highlight@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
-  integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==
+"@babel/helper-skip-transparent-expression-wrappers@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz#007f15240b5751c537c40e77abb4e89eeaaa8847"
+  integrity sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.18.6"
+    "@babel/types" "^7.22.5"
+
+"@babel/helper-split-export-declaration@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.5.tgz#88cf11050edb95ed08d596f7a044462189127a08"
+  integrity sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
+"@babel/helper-split-export-declaration@^7.22.6":
+  version "7.22.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
+  integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
+"@babel/helper-string-parser@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
+  integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
+
+"@babel/helper-validator-identifier@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193"
+  integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==
+
+"@babel/helper-validator-option@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz#de52000a15a177413c8234fa3a8af4ee8102d0ac"
+  integrity sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==
+
+"@babel/helpers@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.22.5.tgz#74bb4373eb390d1ceed74a15ef97767e63120820"
+  integrity sha512-pSXRmfE1vzcUIDFQcSGA5Mr+GxBV9oiRKDuDxXvWQQBCh8HoIjs/2DlDB7H8smac1IVrB9/xdXj2N3Wol9Cr+Q==
+  dependencies:
+    "@babel/template" "^7.22.5"
+    "@babel/traverse" "^7.22.5"
+    "@babel/types" "^7.22.5"
+
+"@babel/helpers@^7.22.6":
+  version "7.22.6"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.22.6.tgz#8e61d3395a4f0c5a8060f309fb008200969b5ecd"
+  integrity sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==
+  dependencies:
+    "@babel/template" "^7.22.5"
+    "@babel/traverse" "^7.22.6"
+    "@babel/types" "^7.22.5"
+
+"@babel/highlight@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.5.tgz#aa6c05c5407a67ebce408162b7ede789b4d22031"
+  integrity sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.22.5"
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.6.tgz#845338edecad65ebffef058d3be851f1d28a63bc"
-  integrity sha512-uQVSa9jJUe/G/304lXspfWVpKpK4euFLgGiMQFOCpM/bgcAdeoHwi/OQz23O9GK2osz26ZiXRRV9aV+Yl1O8tw==
+"@babel/parser@^7.20.15", "@babel/parser@^7.22.5", "@babel/parser@^7.9.4":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.5.tgz#721fd042f3ce1896238cf1b341c77eb7dee7dbea"
+  integrity sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q==
 
-"@babel/plugin-proposal-decorators@^7.18.2":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.18.6.tgz#68e9fd0f022b944f84a8824bb28bfaee724d2595"
-  integrity sha512-gAdhsjaYmiZVxx5vTMiRfj31nB7LhwBJFMSLzeDxc7X4tKLixup0+k9ughn0RcpBrv9E3PBaXJW7jF5TCihAOg==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/helper-replace-supers" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/plugin-syntax-decorators" "^7.18.6"
+"@babel/parser@^7.22.7":
+  version "7.22.7"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.7.tgz#df8cf085ce92ddbdbf668a7f186ce848c9036cae"
+  integrity sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==
 
-"@babel/plugin-syntax-decorators@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.18.6.tgz#2e45af22835d0b0f8665da2bfd4463649ce5dbc1"
-  integrity sha512-fqyLgjcxf/1yhyZ6A+yo1u9gJ7eleFQod2lkaUsF9DQ7sbbY3Ligym3L0+I2c0WmqNKDpoD9UTb1AKP3qRMOAQ==
+"@babel/plugin-proposal-decorators@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.22.5.tgz#dc8cdda048e5aea947efda920e030199806b868d"
+  integrity sha512-h8hlezQ4dl6ixodgXkH8lUfcD7x+WAuIqPUjwGoItynrXOAv4a4Tci1zA/qjzQjjcl0v3QpLdc2LM6ZACQuY7A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-create-class-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.5"
+    "@babel/plugin-syntax-decorators" "^7.22.5"
 
-"@babel/template@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.6.tgz#1283f4993e00b929d6e2d3c72fdc9168a2977a31"
-  integrity sha512-JoDWzPe+wgBsTTgdnIma3iHNFC7YVJoPssVBDjiHfNlyt4YcunDtcDOUmfVDfCK5MfdsaIoX9PkijPhjH3nYUw==
+"@babel/plugin-syntax-decorators@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.22.5.tgz#329fe2907c73de184033775637dbbc507f09116a"
+  integrity sha512-avpUOBS7IU6al8MmF1XpAyj9QYeLPuSDJI5D4pVMSMdL7xQokKqJPYQC67RCT0aCTashUXPiGwMJ0DEXXCEmMA==
   dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/parser" "^7.18.6"
-    "@babel/types" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/traverse@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.6.tgz#a228562d2f46e89258efa4ddd0416942e2fd671d"
-  integrity sha512-zS/OKyqmD7lslOtFqbscH6gMLFYOfG1YPqCKfAW5KrTeolKqvB8UelR49Fpr6y93kYkW2Ik00mT1LOGiAGvizw==
+"@babel/runtime@^7.21.0":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.5.tgz#8564dd588182ce0047d55d7a75e93921107b57ec"
+  integrity sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA==
   dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.18.6"
-    "@babel/helper-environment-visitor" "^7.18.6"
-    "@babel/helper-function-name" "^7.18.6"
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.18.6"
-    "@babel/types" "^7.18.6"
+    regenerator-runtime "^0.13.11"
+
+"@babel/template@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.5.tgz#0c8c4d944509875849bd0344ff0050756eefc6ec"
+  integrity sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==
+  dependencies:
+    "@babel/code-frame" "^7.22.5"
+    "@babel/parser" "^7.22.5"
+    "@babel/types" "^7.22.5"
+
+"@babel/traverse@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.5.tgz#44bd276690db6f4940fdb84e1cb4abd2f729ccd1"
+  integrity sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ==
+  dependencies:
+    "@babel/code-frame" "^7.22.5"
+    "@babel/generator" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-hoist-variables" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.5"
+    "@babel/parser" "^7.22.5"
+    "@babel/types" "^7.22.5"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.18.6", "@babel/types@^7.18.7":
-  version "7.18.7"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.7.tgz#a4a2c910c15040ea52cdd1ddb1614a65c8041726"
-  integrity sha512-QG3yxTcTIBoAcQmkCs+wAPYZhu7Dk9rXKacINfNbdJDNERTbLQbHGyVG8q/YGMPeCJRIhSY0+fTc5+xuh6WPSQ==
+"@babel/traverse@^7.22.6", "@babel/traverse@^7.22.8":
+  version "7.22.8"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.8.tgz#4d4451d31bc34efeae01eac222b514a77aa4000e"
+  integrity sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.18.6"
+    "@babel/code-frame" "^7.22.5"
+    "@babel/generator" "^7.22.7"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-hoist-variables" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/parser" "^7.22.7"
+    "@babel/types" "^7.22.5"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
+"@babel/types@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.5.tgz#cd93eeaab025880a3a47ec881f4b096a5b786fbe"
+  integrity sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==
+  dependencies:
+    "@babel/helper-string-parser" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.5"
     to-fast-properties "^2.0.0"
 
 "@discourse/moment-timezone-names-translations@^1.0.0":
@@ -270,21 +395,43 @@
   resolved "https://registry.yarnpkg.com/@ember-data/rfc395-data/-/rfc395-data-0.0.4.tgz#ecb86efdf5d7733a76ff14ea651a1b0ed1f8a843"
   integrity sha512-tGRdvgC9/QMQSuSuJV45xoyhI0Pzjm7A9o/MVVA3HakXIImJbbzx/k/6dO9CUEQXIyS2y0fW6C1XaYOG7rY0FQ==
 
-"@eslint/eslintrc@^1.3.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.0.tgz#29f92c30bb3e771e4a2048c95fa6855392dfac4f"
-  integrity sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==
+"@ember/edition-utils@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.2.0.tgz#a039f542dc14c8e8299c81cd5abba95e2459cfa6"
+  integrity sha512-VmVq/8saCaPdesQmftPqbFtxJWrzxNGSQ+e8x8LLe3Hjm36pJ04Q8LeORGZkAeOhldoUX9seLGmSaHeXkIqoog==
+
+"@eslint-community/eslint-utils@^4.2.0":
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
+  integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
+  dependencies:
+    eslint-visitor-keys "^3.3.0"
+
+"@eslint-community/regexpp@^4.4.0":
+  version "4.5.1"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.5.1.tgz#cdd35dce4fa1a89a4fd42b1599eb35b3af408884"
+  integrity sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==
+
+"@eslint/eslintrc@^2.0.3":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.0.3.tgz#4910db5505f4d503f27774bf356e3704818a0331"
+  integrity sha512-+5gy6OQfk+xx3q0d6jGZZC3f3KzAkXc/IanVxd1is/VIIziRqqt3ongQz0FiTUXqTk0c7aDB3OaFuKnuSoJicQ==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
-    espree "^9.3.2"
-    globals "^13.15.0"
+    espree "^9.5.2"
+    globals "^13.19.0"
     ignore "^5.2.0"
     import-fresh "^3.2.1"
     js-yaml "^4.1.0"
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
+"@eslint/js@8.43.0":
+  version "8.43.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.43.0.tgz#559ca3d9ddbd6bf907ad524320a0d14b85586af0"
+  integrity sha512-s2UHCoiXfxMvmfzqoN+vrQ84ahUSYde9qNO1MdxmoEhyHWsfmwOpFlwYV+ePJEVc7gFnATGUi376WowX1N7tFg==
+
 "@fortawesome/fontawesome-free@5.15.4":
   version "5.15.4"
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz#ecda5712b61ac852c760d8b3c79c96adca5554e5"
@@ -295,140 +442,179 @@
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha512-JKF/a9I9jw6fGoz8kA7LEQslrwJ5jms5CXhu/aqkBWk+PmZ6pTl8mlb/eJ/5ujBGTiQzBhy5AIWF712iA+4/mw==
 
-"@glimmer/global-context@0.83.1":
-  version "0.83.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.83.1.tgz#3e2d97f10ff623bcfb5b7dc29a858d546a6c6d66"
-  integrity sha512-OwlgqpbOJU73EjZOZdftab0fKbtdJ4x/QQeJseL9cvaAUiK3+w52M5ONFxD1T/yPBp2Mf7NCYqA/uL8tRbzY2A==
+"@glimmer/global-context@0.84.3":
+  version "0.84.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.84.3.tgz#f8bf2cda9562716f2ddf3f96837e7559600635c4"
+  integrity sha512-8Oy9Wg5IZxMEeAnVmzD2NkObf89BeHoFSzJgJROE/deutd3rxg83mvlOez4zBBGYwnTb+VGU2LYRpet92egJjA==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.83.1":
-  version "0.83.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.83.1.tgz#fb16f5f683ddc55f130887b6141f58c0751350fe"
-  integrity sha512-rjAztghzX97v8I4rk3+NguM3XGYcFjc/GbJ8qrEj19KF2lUDoDBW1sB7f0tov3BD5HlrGXei/vOh4+DHfjeB5w==
+"@glimmer/interfaces@0.84.3":
+  version "0.84.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.84.3.tgz#629777a4abe373b0785656f6c8d08989f5784805"
+  integrity sha512-dk32ykoNojt0mvEaIW6Vli5MGTbQo58uy3Epj7ahCgTHmWOKuw/0G83f2UmFprRwFx689YTXG38I/vbpltEjzg==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/reference@^0.83.1":
-  version "0.83.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.83.1.tgz#0345b95431b5bb19843b308e6311d1ef81e36192"
-  integrity sha512-BThEwDlMkJB1WBPWDrww+VxgGyDbwxh5FFPvGhkovvCZnCb7fAMUCt9pi6CUZtviugkWOBFtE9P4eZZbOLkXeg==
+"@glimmer/reference@^0.84.3":
+  version "0.84.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.84.3.tgz#6420ad9c102633ac83939fd1b2457269d21fb632"
+  integrity sha512-lV+p/aWPVC8vUjmlvYVU7WQJsLh319SdXuAWoX/SE3pq340BJlAJiEcAc6q52y9JNhT57gMwtjMX96W5Xcx/qw==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.83.1"
-    "@glimmer/interfaces" "0.83.1"
-    "@glimmer/util" "0.83.1"
-    "@glimmer/validator" "0.83.1"
+    "@glimmer/global-context" "0.84.3"
+    "@glimmer/interfaces" "0.84.3"
+    "@glimmer/util" "0.84.3"
+    "@glimmer/validator" "0.84.3"
 
-"@glimmer/syntax@^0.83.1":
-  version "0.83.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.83.1.tgz#7e18dd445871c157ba0281f12a4fbf316fa49b41"
-  integrity sha512-n3vEd0GtjtgkOsd2gqkSimp8ecqq5KrHyana/s1XJZvVAPD5rMWT9WvAVWG8XAktns8BxjwLIUoj/vkOfA+eHg==
+"@glimmer/syntax@^0.84.2", "@glimmer/syntax@^0.84.3":
+  version "0.84.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.84.3.tgz#4045a1708cef7fd810cff42fe6deeba40c7286d0"
+  integrity sha512-ioVbTic6ZisLxqTgRBL2PCjYZTFIwobifCustrozRU2xGDiYvVIL0vt25h2c1ioDsX59UgVlDkIK4YTAQQSd2A==
   dependencies:
-    "@glimmer/interfaces" "0.83.1"
-    "@glimmer/util" "0.83.1"
+    "@glimmer/interfaces" "0.84.3"
+    "@glimmer/util" "0.84.3"
     "@handlebars/parser" "~2.0.0"
     simple-html-tokenizer "^0.5.11"
 
-"@glimmer/util@0.83.1":
-  version "0.83.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.83.1.tgz#cc7511b03164d658cf6e3262fce5a0fcb82edceb"
-  integrity sha512-amvjtl9dvrkxsoitXAly9W5NUaLIE3A2J2tWhBWIL1Z6DOFotfX7ytIosOIcPhJLZCtiXPHzMutQRv0G/MSMsA==
+"@glimmer/util@0.84.3":
+  version "0.84.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.84.3.tgz#9ae0166982c0b48aa94b02d6ba8c2c81976ade4b"
+  integrity sha512-qFkh6s16ZSRuu2rfz3T4Wp0fylFj3HBsONGXQcrAdZjdUaIS6v3pNj6mecJ71qRgcym9Hbaq/7/fefIwECUiKw==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.83.1"
+    "@glimmer/interfaces" "0.84.3"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.83.1", "@glimmer/validator@^0.83.0":
-  version "0.83.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.83.1.tgz#7578cb2284f728c8e9302c51fc6e7660b570ac54"
-  integrity sha512-LaILSNnQgDHZpaUsfjVndbS1JfVn0xdTlJdFJblPbhoVklOBSReZVekens3EQ6xOr3BC612sRm1hBnEPixOY6A==
+"@glimmer/validator@0.84.3", "@glimmer/validator@^0.84.3":
+  version "0.84.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.84.3.tgz#cd83b7f9ab78953f23cc11a32d83d7f729c54df2"
+  integrity sha512-RTBV4TokUB0vI31UC7ikpV7lOYpWUlyqaKV//pRC4pexYMlmqnVhkFrdiimB/R1XyNdUOQUmnIAcdic39NkbhQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.83.1"
+    "@glimmer/global-context" "0.84.3"
+
+"@glint/core@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@glint/core/-/core-1.0.2.tgz#eb684b6b7c830b8e0a8e3ddda550bc269d1cbb5e"
+  integrity sha512-0bVt/lT/NurpD8nBG9RTPKYlcpg51UDGCKgLoBEFOiTXv3aCSxAVKPud1IYaitGBKE0C+s5pl2PHkgptotVS+w==
+  dependencies:
+    "@glimmer/syntax" "^0.84.2"
+    escape-string-regexp "^4.0.0"
+    semver "^7.3.8"
+    silent-error "^1.1.1"
+    uuid "^8.3.2"
+    vscode-languageserver "^8.0.1"
+    vscode-languageserver-textdocument "^1.0.5"
+    vscode-uri "^3.0.2"
+    yargs "^17.5.1"
+
+"@glint/environment-ember-loose@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@glint/environment-ember-loose/-/environment-ember-loose-1.0.2.tgz#701d084625707e9ba9ca2cf5269bbea443b15d62"
+  integrity sha512-tVLYzAx6c/4vcSaijiAubwR27/+K2tujuozArxeNud58MTwncGxhUkCHSM9xl+wn4VJjsjkzI6+nmzjEdkszSg==
+
+"@glint/environment-ember-template-imports@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@glint/environment-ember-template-imports/-/environment-ember-template-imports-1.0.2.tgz#5763088ded269efa0f5ad9daf2fca19912d77108"
+  integrity sha512-PAH7obVGXPFU7gLb04JVlqiNtz/j7Q29BBTAyhS7EVy99Hc6CPe+nV6+xhUPKu/S5GOVn3MWehVt/6gXPJ+cnA==
+
+"@glint/template@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@glint/template/-/template-1.0.2.tgz#dcb96f048df52e7d0e78cf194fa07b3c42f15278"
+  integrity sha512-kFWfJrS7XM0NjC5YSN0CWA9FiN0mhUvWVlQ2O7YRz/uhrO8+TVYNLst0WKELRbfCXbdI7wyYQkazNgz6FoL9CA==
 
 "@handlebars/parser@~2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-2.0.0.tgz#5e8b7298f31ff8f7b260e6b7363c7e9ceed7d9c5"
   integrity sha512-EP9uEDZv/L5Qh9IWuMUGJRfwhXJ4h1dqKTT4/3+tY0eu7sPis7xh23j61SYUnNF4vqCQvvUXpDo9Bh/+q1zASA==
 
-"@highlightjs/cdn-assets@^11.6.0":
-  version "11.6.0"
-  resolved "https://registry.yarnpkg.com/@highlightjs/cdn-assets/-/cdn-assets-11.6.0.tgz#092b2b11213df16c33b7d94770f489bb0c2bbbd3"
-  integrity sha512-Mod+0LGTetSd0JbLGOHesCP3FLz8T/BOuDitF6stBNmHSLDmds1i4hT02T98Xlj3bGgPCbRsiF2D7i0Nraa+sQ==
+"@highlightjs/cdn-assets@11.8.0":
+  version "11.8.0"
+  resolved "https://registry.yarnpkg.com/@highlightjs/cdn-assets/-/cdn-assets-11.8.0.tgz#e3aa9f20bf742b50bd7b1d60a24c8e7d124a602f"
+  integrity sha512-gkfCH4xGBGY9xPaW+t26WpgnfpDhNhB5RtVUDLx3MHkC7ZrmKeIxXsfjzOiuOnEgRk+vydlY6XeOeglh+eVhyg==
 
-"@humanwhocodes/config-array@^0.9.2":
-  version "0.9.5"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.5.tgz#2cbaf9a89460da24b5ca6531b8bbfc23e1df50c7"
-  integrity sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==
+"@humanwhocodes/config-array@^0.11.10":
+  version "0.11.10"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.10.tgz#5a3ffe32cc9306365fb3fd572596cd602d5e12d2"
+  integrity sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==
   dependencies:
     "@humanwhocodes/object-schema" "^1.2.1"
     debug "^4.1.1"
-    minimatch "^3.0.4"
+    minimatch "^3.0.5"
+
+"@humanwhocodes/module-importer@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
+  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
 "@humanwhocodes/object-schema@^1.2.1":
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
-"@jridgewell/gen-mapping@^0.1.0":
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996"
-  integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==
-  dependencies:
-    "@jridgewell/set-array" "^1.0.0"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-
-"@jridgewell/gen-mapping@^0.3.2":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
-  integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==
+"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2":
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098"
+  integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==
   dependencies:
     "@jridgewell/set-array" "^1.0.1"
     "@jridgewell/sourcemap-codec" "^1.4.10"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@jridgewell/resolve-uri@^3.0.3":
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.8.tgz#687cc2bbf243f4e9a868ecf2262318e2658873a1"
-  integrity sha512-YK5G9LaddzGbcucK4c8h5tWFmMPBvRZ/uyWmN1/SbBdIvqGUdWGkJ5BAaccgs6XbzVLsqbPJrBSFwKv3kT9i7w==
+"@jridgewell/resolve-uri@3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
+  integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
 
-"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1":
+"@jridgewell/set-array@^1.0.1":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
   integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
 
-"@jridgewell/sourcemap-codec@^1.4.10":
+"@jridgewell/sourcemap-codec@1.4.14":
   version "1.4.14"
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
   integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
 
-"@jridgewell/trace-mapping@^0.3.9":
-  version "0.3.14"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz#b231a081d8f66796e475ad588a1ef473112701ed"
-  integrity sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==
-  dependencies:
-    "@jridgewell/resolve-uri" "^3.0.3"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
+"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.13":
+  version "1.4.15"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
+  integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
 
-"@json-editor/json-editor@^2.6.1":
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/@json-editor/json-editor/-/json-editor-2.6.1.tgz#169e8b88305d71ccac391c3ae22d4145bc63c9f7"
-  integrity sha512-8jH0n+BLO/jqBCZ3XXaes3NYzvQ+6KfO1p79MsIsTClIi5AvSvEzg3EWk4lsMWrUAFRwcM/CaififsoYDXMdMw==
+"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9":
+  version "0.3.18"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz#25783b2086daf6ff1dcb53c9249ae480e4dd4cd6"
+  integrity sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==
   dependencies:
-    core-js "^3.12.1"
+    "@jridgewell/resolve-uri" "3.1.0"
+    "@jridgewell/sourcemap-codec" "1.4.14"
+
+"@jsdoc/salty@^0.2.1":
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/@jsdoc/salty/-/salty-0.2.5.tgz#1b2fa5bb8c66485b536d86eee877c263d322f692"
+  integrity sha512-TfRP53RqunNe2HBobVBJ0VLhK1HbfvBYeTC1ahnN64PWvyYyGebmMiPkuwvD9fpw2ZbkoPb8Q7mwy0aR8Z9rvw==
+  dependencies:
+    lodash "^4.17.21"
+
+"@json-editor/json-editor@2.10.0":
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/@json-editor/json-editor/-/json-editor-2.10.0.tgz#95002ed971e8b39d8d8834df885f002275a1e5ce"
+  integrity sha512-RGkzTccb4UDtmcQ1PYDWDJ3SXoGIRmesTUTJCyZ9kyVGjHs/HgqIXlpQPmg9fHFi9D45/8RTdGqlvkZMGw2zlA==
+  dependencies:
+    core-js "^3.27.2"
 
 "@lint-todo/utils@^13.0.3":
-  version "13.0.3"
-  resolved "https://registry.yarnpkg.com/@lint-todo/utils/-/utils-13.0.3.tgz#ca222f38738b43eb43384d56e7292ba9cab3e891"
-  integrity sha512-7Grdii4L/ae8FiykBcsEfum3m9yxVKPNQXpqJDPhWMHsReEunaQDkx/WLsjiNBctRb+roNHZQuXQYlJwoTlqOw==
+  version "13.1.0"
+  resolved "https://registry.yarnpkg.com/@lint-todo/utils/-/utils-13.1.0.tgz#bb99b479e357f20fbf5fa200c59cafda2a02f849"
+  integrity sha512-uzcZPIPH7hcs+hKMiHfp58MosJpI9sTTgl1pGYau4zq34q1ppswJ6nLeohv/cDhqEBrHjtvldt8zDnVJXRvBlA==
   dependencies:
     "@types/eslint" "^7.2.13"
     find-up "^5.0.0"
     fs-extra "^9.1.0"
     proper-lockfile "^4.1.2"
     slash "^3.0.0"
-    tslib "^2.3.1"
+    tslib "^2.4.0"
     upath "^2.0.1"
 
 "@mixer/parallel-prettier@^2.0.3":
@@ -444,25 +630,32 @@
     prettier "^2.0.4"
     rxjs "^6.6.3"
 
-"@nodelib/fs.scandir@2.1.3":
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
-  integrity sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==
+"@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1":
+  version "5.1.1-v1"
+  resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz#dbf733a965ca47b1973177dc0bb6c889edcfb129"
+  integrity sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==
   dependencies:
-    "@nodelib/fs.stat" "2.0.3"
+    eslint-scope "5.1.1"
+
+"@nodelib/fs.scandir@2.1.5":
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
+  integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
+  dependencies:
+    "@nodelib/fs.stat" "2.0.5"
     run-parallel "^1.1.9"
 
-"@nodelib/fs.stat@2.0.3", "@nodelib/fs.stat@^2.0.2":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3"
-  integrity sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==
+"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
+  integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
 
-"@nodelib/fs.walk@^1.2.3":
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz#011b9202a70a6366e436ca5c065844528ab04976"
-  integrity sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==
+"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
+  integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
   dependencies:
-    "@nodelib/fs.scandir" "2.1.3"
+    "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
 "@simple-dom/interface@^1.4.0":
@@ -470,11 +663,6 @@
   resolved "https://registry.yarnpkg.com/@simple-dom/interface/-/interface-1.4.0.tgz#e8feea579232017f89b0138e2726facda6fbb71f"
   integrity sha512-l5qumKFWU0S+4ZzMaLXFU8tQZsicHEMEyAxI5kDFGhJsRqDwe0a7/iPA/GdxlGyDKseQQAgIz5kzU7eXTrlSpA==
 
-"@types/color-name@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
-  integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
-
 "@types/eslint@^7.2.13":
   version "7.29.0"
   resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.29.0.tgz#e56ddc8e542815272720bb0b4ccc2aff9c3e1c78"
@@ -484,24 +672,52 @@
     "@types/json-schema" "*"
 
 "@types/estree@*":
-  version "0.0.52"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.52.tgz#7f1f57ad5b741f3d5b210d3b1f145640d89bf8fe"
-  integrity sha512-BZWrtCU0bMVAIliIV+HJO1f1PR41M7NKjfxrFJwwhKI1KwhwOxYw1SXg9ao+CIMt774nFuGiG6eU+udtbEI9oQ==
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194"
+  integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==
 
 "@types/json-schema@*":
-  version "7.0.11"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
-  integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
+  version "7.0.12"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb"
+  integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==
+
+"@types/linkify-it@*":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.2.tgz#fd2cd2edbaa7eaac7e7f3c1748b52a19143846c9"
+  integrity sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==
+
+"@types/markdown-it@^12.2.3":
+  version "12.2.3"
+  resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-12.2.3.tgz#0d6f6e5e413f8daaa26522904597be3d6cd93b51"
+  integrity sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==
+  dependencies:
+    "@types/linkify-it" "*"
+    "@types/mdurl" "*"
+
+"@types/mdurl@*":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-1.0.2.tgz#e2ce9d83a613bacf284c7be7d491945e39e1f8e9"
+  integrity sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==
+
+"@types/minimatch@^3.0.3", "@types/minimatch@^3.0.4":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
+  integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
 
 "@types/node@*":
-  version "14.11.2"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.11.2.tgz#2de1ed6670439387da1c9f549a2ade2b0a799256"
-  integrity sha512-jiE3QIxJ8JLNcb1Ps6rDbysDhN4xa8DJJvuC9prr6w+1tIh+QAbYyNF3tyiZNLDBIuBCf4KEcV2UvQm/V60xfA==
+  version "20.3.2"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.3.2.tgz#fa6a90f2600e052a03c18b8cb3fd83dd4e599898"
+  integrity sha512-vOBLVQeCQfIcF/2Y7eKFTqrMnizK5lRNQ7ykML/5RuwVXVWxYkgwS7xbt4B6fKCUPgbSL5FSsjHQpaGQP/dQmw==
+
+"@types/symlink-or-copy@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@types/symlink-or-copy/-/symlink-or-copy-1.2.0.tgz#4151a81b4052c80bc2becbae09f3a9ec010a9c7a"
+  integrity sha512-Lja2xYuuf2B3knEsga8ShbOdsfNOtzT73GyJmZyY7eGl2+ajOqrs8yM5ze0fsSoYwvA6bw7/Qr7OZ7PEEmYwWg==
 
 "@types/yauzl@^2.9.1":
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.2.tgz#c48e5d56aff1444409e39fa164b0b4d4552a7b7a"
-  integrity sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.0.tgz#b3248295276cf8c6f153ebe6a9aba0c988cb2599"
+  integrity sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==
   dependencies:
     "@types/node" "*"
 
@@ -515,10 +731,10 @@ acorn-jsx@^5.3.2:
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn@^8.7.1:
-  version "8.7.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
-  integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
+acorn@^8.8.0:
+  version "8.9.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.9.0.tgz#78a16e3b2bcc198c10822786fa6679e245db5b59"
+  integrity sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==
 
 agent-base@6:
   version "6.0.2"
@@ -550,11 +766,10 @@ ansi-styles@^3.2.1:
     color-convert "^1.9.0"
 
 ansi-styles@^4.0.0, ansi-styles@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359"
-  integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
   dependencies:
-    "@types/color-name" "^1.1.1"
     color-convert "^2.0.1"
 
 argparse@^2.0.1:
@@ -562,17 +777,63 @@ argparse@^2.0.1:
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
-aria-query@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.0.0.tgz#210c21aaf469613ee8c9a62c7f86525e058db52c"
-  integrity sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg==
+aria-query@^5.0.2:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.3.0.tgz#650c569e41ad90b51b3d7df5e5eed1c7549c103e"
+  integrity sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==
+  dependencies:
+    dequal "^2.0.3"
+
+array-buffer-byte-length@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz#fabe8bc193fea865f317fe7807085ee0dee5aead"
+  integrity sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==
+  dependencies:
+    call-bind "^1.0.2"
+    is-array-buffer "^3.0.1"
+
+array-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
+  integrity sha512-H3LU5RLiSsGXPhN+Nipar0iR0IofH+8r89G2y1tBKxQ/agagKyAjhkAFDRBfodP2caPrNKHpAWNIM/c9yeL7uA==
 
 array-union@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
-async-promise-queue@^1.0.5:
+assertion-error@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b"
+  integrity sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==
+
+async-disk-cache@^1.2.1:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/async-disk-cache/-/async-disk-cache-1.3.5.tgz#cc6206ed79bb6982b878fc52e0505e4f52b62a02"
+  integrity sha512-VZpqfR0R7CEOJZ/0FOTgWq70lCrZyS1rkI8PXugDUkTKyyAUgZ2zQ09gLhMkEn+wN8LYeUTPxZdXtlX/kmbXKQ==
+  dependencies:
+    debug "^2.1.3"
+    heimdalljs "^0.2.3"
+    istextorbinary "2.1.0"
+    mkdirp "^0.5.0"
+    rimraf "^2.5.3"
+    rsvp "^3.0.18"
+    username-sync "^1.0.2"
+
+async-disk-cache@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/async-disk-cache/-/async-disk-cache-2.1.0.tgz#e0f37b187ed8c41a5991518a9556d206ae2843a2"
+  integrity sha512-iH+boep2xivfD9wMaZWkywYIURSmsL96d6MoqrC94BnGSvXE4Quf8hnJiHGFYhw/nLeIa1XyRaf4vvcvkwAefg==
+  dependencies:
+    debug "^4.1.1"
+    heimdalljs "^0.2.3"
+    istextorbinary "^2.5.1"
+    mkdirp "^0.5.0"
+    rimraf "^3.0.0"
+    rsvp "^4.8.5"
+    username-sync "^1.0.2"
+
+async-promise-queue@^1.0.3, async-promise-queue@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/async-promise-queue/-/async-promise-queue-1.0.5.tgz#cb23bce9fce903a133946a700cc85f27f09ea49d"
   integrity sha512-xi0aQ1rrjPWYmqbwr18rrSKbSaXIeIwSd1J4KAgVfkq8utNbdZoht7GfvfY6swFUAMJ9obkc4WPJmtGwl+B8dw==
@@ -581,9 +842,9 @@ async-promise-queue@^1.0.5:
     debug "^2.6.8"
 
 async@^2.4.1:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
-  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
+  version "2.6.4"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
+  integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==
   dependencies:
     lodash "^4.17.14"
 
@@ -592,16 +853,62 @@ at-least-node@^1.0.0:
   resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
   integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
 
+available-typed-arrays@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
+  integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
+
+babel-import-util@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-0.2.0.tgz#b468bb679919601a3570f9e317536c54f2862e23"
+  integrity sha512-CtWYYHU/MgK88rxMrLfkD356dApswtR/kWZ/c6JifG1m10e7tBBrs/366dFzWMAoqYmG5/JSh+94tUSpIwh+ag==
+
+babel-import-util@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-2.0.0.tgz#99a2e7424bcde01898bc61bb19700ff4c74379a3"
+  integrity sha512-pkWynbLwru0RZmA9iKeQL63+CkkW0RCP3kL5njCtudd6YPUKb5Pa0kL4fb3bmuKn2QDBFwY5mvvhEK/+jv2Ynw==
+
+babel-plugin-ember-modules-api-polyfill@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-3.5.0.tgz#27b6087fac75661f779f32e60f94b14d0e9f6965"
+  integrity sha512-pJajN/DkQUnStw0Az8c6khVcMQHgzqWr61lLNtVeu0g61LRW0k9jyK7vaedrHDWGe/Qe8sxG5wpiyW9NsMqFzA==
+  dependencies:
+    ember-rfc176-data "^0.3.17"
+
+babel-plugin-ember-template-compilation@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-ember-template-compilation/-/babel-plugin-ember-template-compilation-2.1.1.tgz#215c6e983617d514811361a521d61ca4f81450df"
+  integrity sha512-vwEUw7qfwAgwUokQc5xMxrcJMhCu2dVvDDMIXFyOpXwxt+kqZ2FKvXFV+rJjYchIgHH5rBduEtt4Qk1qeZ6RDA==
+  dependencies:
+    "@glimmer/syntax" "^0.84.3"
+    babel-import-util "^2.0.0"
+
+babel-plugin-htmlbars-inline-precompile@^5.3.0:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-5.3.1.tgz#5ba272e2e4b6221522401f5f1d98a73b1de38787"
+  integrity sha512-QWjjFgSKtSRIcsBhJmEwS2laIdrA6na8HAlc/pEAhjHgQsah/gMiBFRZvbQTy//hWxR4BMwV7/Mya7q5H8uHeA==
+  dependencies:
+    babel-plugin-ember-modules-api-polyfill "^3.5.0"
+    line-column "^1.0.2"
+    magic-string "^0.25.7"
+    parse-static-imports "^1.1.0"
+    string.prototype.matchall "^4.0.5"
+
 balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
 base64-js@^1.3.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
+"binaryextensions@1 || 2", binaryextensions@^2.1.2:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-2.3.0.tgz#1d269cbf7e6243ea886aa41453c3651ccbe13c22"
+  integrity sha512-nAihlQsYGyc5Bwq6+EsubvANYGExeJKHDO3RjnvwU042fawQTQfM3Kxn7IHUXQOz4bzfwsGYYHGSvXyW4zOGLg==
+
 bl@^4.0.3, bl@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
@@ -611,6 +918,16 @@ bl@^4.0.3, bl@^4.1.0:
     inherits "^2.0.4"
     readable-stream "^3.4.0"
 
+blank-object@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/blank-object/-/blank-object-1.0.2.tgz#f990793fbe9a8c8dd013fb3219420bec81d5f4b9"
+  integrity sha512-kXQ19Xhoghiyw66CUiGypnuRpWlbHAzY/+NyvqTEdTfhfQGH1/dbEMYiXju7fYKIFePpzp/y9dsu5Cu/PkmawQ==
+
+bluebird@^3.7.2:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
+  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
+
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -626,20 +943,176 @@ braces@^3.0.2:
   dependencies:
     fill-range "^7.0.1"
 
-browserslist@^4.20.2:
-  version "4.21.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.1.tgz#c9b9b0a54c7607e8dc3e01a0d311727188011a00"
-  integrity sha512-Nq8MFCSrnJXSc88yliwlzQe3qNe3VntIjhsArW9IJOEPSHNx23FalwApUVbzAWABLhYJJ7y8AynWI/XM8OdfjQ==
+broccoli-debug@^0.6.5:
+  version "0.6.5"
+  resolved "https://registry.yarnpkg.com/broccoli-debug/-/broccoli-debug-0.6.5.tgz#164a5cdafd8936e525e702bf8f91f39d758e2e78"
+  integrity sha512-RIVjHvNar9EMCLDW/FggxFRXqpjhncM/3qq87bn/y+/zR9tqEkHvTqbyOc4QnB97NO2m6342w4wGkemkaeOuWg==
   dependencies:
-    caniuse-lite "^1.0.30001359"
-    electron-to-chromium "^1.4.172"
-    node-releases "^2.0.5"
-    update-browserslist-db "^1.0.4"
+    broccoli-plugin "^1.2.1"
+    fs-tree-diff "^0.5.2"
+    heimdalljs "^0.2.1"
+    heimdalljs-logger "^0.1.7"
+    symlink-or-copy "^1.1.8"
+    tree-sync "^1.2.2"
+
+broccoli-funnel@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-2.0.2.tgz#0edf629569bc10bd02cc525f74b9a38e71366a75"
+  integrity sha512-/vDTqtv7ipjEZQOVqO4vGDVAOZyuYzQ/EgGoyewfOgh1M7IQAToBKZI0oAQPgMBeFPPlIbfMuAngk+ohPBuaHQ==
+  dependencies:
+    array-equal "^1.0.0"
+    blank-object "^1.0.1"
+    broccoli-plugin "^1.3.0"
+    debug "^2.2.0"
+    fast-ordered-set "^1.0.0"
+    fs-tree-diff "^0.5.3"
+    heimdalljs "^0.2.0"
+    minimatch "^3.0.0"
+    mkdirp "^0.5.0"
+    path-posix "^1.0.0"
+    rimraf "^2.4.3"
+    symlink-or-copy "^1.0.0"
+    walk-sync "^0.3.1"
+
+broccoli-kitchen-sink-helpers@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.3.1.tgz#77c7c18194b9664163ec4fcee2793444926e0c06"
+  integrity sha512-gqYnKSJxBSjj/uJqeuRAzYVbmjWhG0mOZ8jrp6+fnUIOgLN6MvI7XxBECDHkYMIFPJ8Smf4xaI066Q2FqQDnXg==
+  dependencies:
+    glob "^5.0.10"
+    mkdirp "^0.5.1"
+
+broccoli-merge-trees@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-3.0.2.tgz#f33b451994225522b5c9bcf27d59decfd8ba537d"
+  integrity sha512-ZyPAwrOdlCddduFbsMyyFzJUrvW6b04pMvDiAQZrCwghlvgowJDY+EfoXn+eR1RRA5nmGHJ+B68T63VnpRiT1A==
+  dependencies:
+    broccoli-plugin "^1.3.0"
+    merge-trees "^2.0.0"
+
+broccoli-node-api@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/broccoli-node-api/-/broccoli-node-api-1.7.0.tgz#391aa6edecd2a42c63c111b4162956b2fa288cb6"
+  integrity sha512-QIqLSVJWJUVOhclmkmypJJH9u9s/aWH4+FH6Q6Ju5l+Io4dtwqdPUNmDfw40o6sxhbZHhqGujDJuHTML1wG8Yw==
+
+broccoli-node-info@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/broccoli-node-info/-/broccoli-node-info-2.2.0.tgz#feb01c13020792f429e01d7f7845dc5b3a7932b3"
+  integrity sha512-VabSGRpKIzpmC+r+tJueCE5h8k6vON7EIMMWu6d/FyPdtijwLQ7QvzShEw+m3mHoDzUaj/kiZsDYrS8X2adsBg==
+
+broccoli-output-wrapper@^3.2.5:
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/broccoli-output-wrapper/-/broccoli-output-wrapper-3.2.5.tgz#514b17801c92922a2c2f87fd145df2a25a11bc5f"
+  integrity sha512-bQAtwjSrF4Nu0CK0JOy5OZqw9t5U0zzv2555EA/cF8/a8SLDTIetk9UgrtMVw7qKLKdSpOZ2liZNeZZDaKgayw==
+  dependencies:
+    fs-extra "^8.1.0"
+    heimdalljs-logger "^0.1.10"
+    symlink-or-copy "^1.2.0"
+
+broccoli-persistent-filter@^2.3.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-2.3.1.tgz#4a052e0e0868b344c3a2977e35a3d497aa9eca72"
+  integrity sha512-hVsmIgCDrl2NFM+3Gs4Cr2TA6UPaIZip99hN8mtkaUPgM8UeVnCbxelCvBjUBHo0oaaqP5jzqqnRVvb568Yu5g==
+  dependencies:
+    async-disk-cache "^1.2.1"
+    async-promise-queue "^1.0.3"
+    broccoli-plugin "^1.0.0"
+    fs-tree-diff "^2.0.0"
+    hash-for-dep "^1.5.0"
+    heimdalljs "^0.2.1"
+    heimdalljs-logger "^0.1.7"
+    mkdirp "^0.5.1"
+    promise-map-series "^0.2.1"
+    rimraf "^2.6.1"
+    rsvp "^4.7.0"
+    symlink-or-copy "^1.0.1"
+    sync-disk-cache "^1.3.3"
+    walk-sync "^1.0.0"
+
+broccoli-persistent-filter@^3.1.2:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-3.1.3.tgz#aca815bf3e3b0247bd0a7b567fdb0d0e08c99cc2"
+  integrity sha512-Q+8iezprZzL9voaBsDY3rQVl7c7H5h+bvv8SpzCZXPZgfBFCbx7KFQ2c3rZR6lW5k4Kwoqt7jG+rZMUg67Gwxw==
+  dependencies:
+    async-disk-cache "^2.0.0"
+    async-promise-queue "^1.0.3"
+    broccoli-plugin "^4.0.3"
+    fs-tree-diff "^2.0.0"
+    hash-for-dep "^1.5.0"
+    heimdalljs "^0.2.1"
+    heimdalljs-logger "^0.1.7"
+    promise-map-series "^0.2.1"
+    rimraf "^3.0.0"
+    symlink-or-copy "^1.0.1"
+    sync-disk-cache "^2.0.0"
+
+broccoli-plugin@^1.0.0, broccoli-plugin@^1.2.1, broccoli-plugin@^1.3.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-1.3.1.tgz#a26315732fb99ed2d9fb58f12a1e14e986b4fabd"
+  integrity sha512-DW8XASZkmorp+q7J4EeDEZz+LoyKLAd2XZULXyD9l4m9/hAKV3vjHmB1kiUshcWAYMgTP1m2i4NnqCE/23h6AQ==
+  dependencies:
+    promise-map-series "^0.2.1"
+    quick-temp "^0.1.3"
+    rimraf "^2.3.4"
+    symlink-or-copy "^1.1.8"
+
+broccoli-plugin@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-2.1.0.tgz#2fab6c578219cfcc64f773e9616073313fc8b334"
+  integrity sha512-ElE4caljW4slapyEhSD9jU9Uayc8SoSABWdmY9SqbV8DHNxU6xg1jJsPcMm+cXOvggR3+G+OXAYQeFjWVnznaw==
+  dependencies:
+    promise-map-series "^0.2.1"
+    quick-temp "^0.1.3"
+    rimraf "^2.3.4"
+    symlink-or-copy "^1.1.8"
+
+broccoli-plugin@^4.0.3:
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-4.0.7.tgz#dd176a85efe915ed557d913744b181abe05047db"
+  integrity sha512-a4zUsWtA1uns1K7p9rExYVYG99rdKeGRymW0qOCNkvDPHQxVi3yVyJHhQbM3EZwdt2E0mnhr5e0c/bPpJ7p3Wg==
+  dependencies:
+    broccoli-node-api "^1.7.0"
+    broccoli-output-wrapper "^3.2.5"
+    fs-merger "^3.2.1"
+    promise-map-series "^0.3.0"
+    quick-temp "^0.1.8"
+    rimraf "^3.0.2"
+    symlink-or-copy "^1.3.1"
+
+broccoli-stew@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-stew/-/broccoli-stew-3.0.0.tgz#fd1d19d162ad9490b42e5c563b78c26eb1e80b95"
+  integrity sha512-NXfi+Vas24n3Ivo21GvENTI55qxKu7OwKRnCLWXld8MiLiQKQlWIq28eoARaFj0lTUFwUa4jKZeA7fW9PiWQeg==
+  dependencies:
+    broccoli-debug "^0.6.5"
+    broccoli-funnel "^2.0.0"
+    broccoli-merge-trees "^3.0.1"
+    broccoli-persistent-filter "^2.3.0"
+    broccoli-plugin "^2.1.0"
+    chalk "^2.4.1"
+    debug "^4.1.1"
+    ensure-posix-path "^1.0.1"
+    fs-extra "^8.0.1"
+    minimatch "^3.0.4"
+    resolve "^1.11.1"
+    rsvp "^4.8.5"
+    symlink-or-copy "^1.2.0"
+    walk-sync "^1.1.3"
+
+browserslist@^4.21.3, browserslist@^4.21.9:
+  version "4.21.9"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.9.tgz#e11bdd3c313d7e2a9e87e8b4b0c7872b13897635"
+  integrity sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==
+  dependencies:
+    caniuse-lite "^1.0.30001503"
+    electron-to-chromium "^1.4.431"
+    node-releases "^2.0.12"
+    update-browserslist-db "^1.0.11"
 
 buffer-crc32@~0.2.3:
   version "0.2.13"
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
-  integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
+  integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==
 
 buffer@^5.2.1, buffer@^5.5.0:
   version "5.7.1"
@@ -649,17 +1122,52 @@ buffer@^5.2.1, buffer@^5.5.0:
     base64-js "^1.3.1"
     ieee754 "^1.1.13"
 
+call-bind@^1.0.0, call-bind@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
+  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
+  dependencies:
+    function-bind "^1.1.1"
+    get-intrinsic "^1.0.2"
+
 callsites@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
-caniuse-lite@^1.0.30001359:
-  version "1.0.30001363"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001363.tgz#26bec2d606924ba318235944e1193304ea7c4f15"
-  integrity sha512-HpQhpzTGGPVMnCjIomjt+jvyUu8vNFo3TaDiZ/RcoTrlOq/5+tC8zHdsbgFB6MxmaY+jCpsH09aD80Bb4Ow3Sg==
+can-symlink@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/can-symlink/-/can-symlink-1.0.0.tgz#97b607d8a84bb6c6e228b902d864ecb594b9d219"
+  integrity sha512-RbsNrFyhwkx+6psk/0fK/Q9orOUr9VMxohGd8vTa4djf4TGLfblBgUfqZChrZuW0Q+mz2eBPFLusw9Jfukzmhg==
+  dependencies:
+    tmp "0.0.28"
 
-chalk@^2.0.0:
+caniuse-lite@^1.0.30001503:
+  version "1.0.30001509"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001509.tgz#2b7ad5265392d6d2de25cd8776d1ab3899570d14"
+  integrity sha512-2uDDk+TRiTX5hMcUYT/7CSyzMZxjfGu0vAUjS2g0LSD8UoXOv0LtpH4LxGMemsiPq6LCVIUjNwVM0erkOkGCDA==
+
+catharsis@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/catharsis/-/catharsis-0.9.0.tgz#40382a168be0e6da308c277d3a2b3eb40c7d2121"
+  integrity sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==
+  dependencies:
+    lodash "^4.17.15"
+
+chai@^4.3.6:
+  version "4.3.7"
+  resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.7.tgz#ec63f6df01829088e8bf55fca839bcd464a8ec51"
+  integrity sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==
+  dependencies:
+    assertion-error "^1.1.0"
+    check-error "^1.0.2"
+    deep-eql "^4.1.2"
+    get-func-name "^2.0.0"
+    loupe "^2.3.1"
+    pathval "^1.1.1"
+    type-detect "^4.0.5"
+
+chalk@^2.0.0, chalk@^2.4.1:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -676,15 +1184,25 @@ chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
+chalk@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.2.0.tgz#249623b7d66869c673699fb66d65723e54dfcfb3"
+  integrity sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==
+
 chart.js@3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-3.5.1.tgz#73e24d23a4134a70ccdb5e79a917f156b6f3644a"
   integrity sha512-m5kzt72I1WQ9LILwQC4syla/LD/N413RYv2Dx2nnTkRS9iv/ey1xLTt0DnPc/eWV4zI+BgEgDYBIzbQhZHc/PQ==
 
-chartjs-plugin-datalabels@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/chartjs-plugin-datalabels/-/chartjs-plugin-datalabels-2.0.0.tgz#caacefb26803d968785071eab012dde8746c5939"
-  integrity sha512-WBsWihphzM0Y8fmQVm89+iy99mmgejmj5/jcsYqwxSioLRL/zqJ4Scv/eXq5ZqvG3TpojlGzZLeaOaSvDm7fwA==
+chartjs-plugin-datalabels@2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/chartjs-plugin-datalabels/-/chartjs-plugin-datalabels-2.2.0.tgz#369578e131d743c2e34b5fbe2d3f9335f6639b8f"
+  integrity sha512-14ZU30lH7n89oq+A4bWaJPnAG8a7ZTk7dKf48YAzMvJjQtjrgg5Dpk9f+LbjCF6bpx3RAGTeL13IXpKQYyRvlw==
+
+check-error@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
+  integrity sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==
 
 chownr@^1.1.1:
   version "1.1.4"
@@ -692,9 +1210,9 @@ chownr@^1.1.1:
   integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
 
 chrome-launcher@^0.15.1:
-  version "0.15.1"
-  resolved "https://registry.yarnpkg.com/chrome-launcher/-/chrome-launcher-0.15.1.tgz#0a0208037063641e2b3613b7e42b0fcb3fa2d399"
-  integrity sha512-UugC8u59/w2AyX5sHLZUHoxBAiSiunUhZa3zZwMH6zPVis0C3dDKiRWyUGIo14tTbZHGVviWxv3PQWZ7taZ4fg==
+  version "0.15.2"
+  resolved "https://registry.yarnpkg.com/chrome-launcher/-/chrome-launcher-0.15.2.tgz#4e6404e32200095fdce7f6a1e1004f9bd36fa5da"
+  integrity sha512-zdLEwNo3aUVzIhKhTtXfxhdvZhUghrnmkvcAq2NoDd+LeOHKf03H5jwZ8T/STsAlzyALkBVK552iaG1fGf1xVQ==
   dependencies:
     "@types/node" "*"
     escape-string-regexp "^4.0.0"
@@ -709,10 +1227,15 @@ chrome-remote-interface@^0.31.3:
     commander "2.11.x"
     ws "^7.2.0"
 
-ci-info@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.2.tgz#6d2967ffa407466481c6c90b6e16b3098f080128"
-  integrity sha512-xmDt/QIAdeZ9+nfdPsaBCpMvHNLFiLdjj59qjqn+6iPe6YmHGQ35sBnQ8uslRBXFmXkiZQOJRjvQeoGppoTjjg==
+ci-info@^3.8.0:
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91"
+  integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==
+
+clean-up-path@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/clean-up-path/-/clean-up-path-1.0.0.tgz#de9e8196519912e749c9eaf67c13d64fac72a3e5"
+  integrity sha512-PHGlEF0Z6976qQyN6gM7kKH6EH0RdfZcc8V+QhFe36eRxV0SMH5OUBZG7Bxa9YcreNzyNbK63cGiZxdSZgosRw==
 
 cli-cursor@^3.1.0:
   version "3.1.0"
@@ -722,23 +1245,23 @@ cli-cursor@^3.1.0:
     restore-cursor "^3.1.0"
 
 cli-spinners@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.5.0.tgz#12763e47251bf951cb75c201dfa58ff1bcb2d047"
-  integrity sha512-PC+AmIuK04E6aeSs/pUccSujsTzBhu4HzC2dL+CfJB/Jcc2qTRbEwZQDfIUpt2Xl8BodYBEq8w4fc0kU2I9DjQ==
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.9.0.tgz#5881d0ad96381e117bbe07ad91f2008fe6ffd8db"
+  integrity sha512-4/aL9X3Wh0yiMQlE+eeRhWP6vclO3QRtw1JHKIT0FFUs5FjpFmESqtMvYZ0+lbzBw900b95mS0hohy+qn2VK/g==
 
-cliui@^7.0.2:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
-  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
+cliui@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
+  integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
   dependencies:
     string-width "^4.2.0"
-    strip-ansi "^6.0.0"
+    strip-ansi "^6.0.1"
     wrap-ansi "^7.0.0"
 
 clone@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
-  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
+  integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==
 
 color-convert@^1.9.0:
   version "1.9.3"
@@ -757,7 +1280,7 @@ color-convert@^2.0.1:
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
 color-name@~1.1.4:
   version "1.1.4"
@@ -775,36 +1298,59 @@ commander@2.11.x:
   integrity sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==
 
 commander@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-7.0.0.tgz#3e2bbfd8bb6724760980988fb5b22b7ee6b71ab2"
-  integrity sha512-ovx/7NkTrnPuIV8sqk/GjUIIM1+iUQeqA3ye2VNpq9sVoiZsooObWlQy+OPWGI17GDaEoybuAGJm6U8yC077BA==
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
+  integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
 
 commander@^8.3.0:
   version "8.3.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
   integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
 
+commander@^9.4.1:
+  version "9.5.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-9.5.0.tgz#bc08d1eb5cedf7ccb797a96199d41c7bc3e60d30"
+  integrity sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==
+
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
+
+concurrently@^8.0.1:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-8.2.0.tgz#cdc9f621a4d913366600355d68254df2c5e782f3"
+  integrity sha512-nnLMxO2LU492mTUj9qX/az/lESonSZu81UznYDoXtz1IQf996ixVqPAgHXwvHiHCAef/7S8HIK+fTFK7Ifk8YA==
+  dependencies:
+    chalk "^4.1.2"
+    date-fns "^2.30.0"
+    lodash "^4.17.21"
+    rxjs "^7.8.1"
+    shell-quote "^1.8.1"
+    spawn-command "0.0.2"
+    supports-color "^8.1.1"
+    tree-kill "^1.2.2"
+    yargs "^17.7.2"
 
 convert-source-map@^1.7.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
-  integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
-  dependencies:
-    safe-buffer "~5.1.1"
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
+  integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
 
-core-js@^3.12.1:
-  version "3.19.3"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.19.3.tgz#6df8142a996337503019ff3235a7022d7cdf4559"
-  integrity sha512-LeLBMgEGSsG7giquSzvgBrTS7V5UL6ks3eQlUSbN8dJStlLFiRzUm5iqsRyzUB8carhfKjkJ2vzKqE6z1Vga9g==
+core-js@^3.27.2:
+  version "3.31.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.31.0.tgz#4471dd33e366c79d8c0977ed2d940821719db344"
+  integrity sha512-NIp2TQSGfR6ba5aalZD+ZQ1fSxGhDo/s1w0nx3RYzf2pnJxt7YynxFlFScP6eV7+GZsKO95NSjGxyJsU3DZgeQ==
+
+core-js@^3.4.1:
+  version "3.31.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.31.1.tgz#f2b0eea9be9da0def2c5fece71064a7e5d687653"
+  integrity sha512-2sKLtfq1eFST7l7v62zaqXacPc7uG8ZAya8ogijLhTtaKNcpzpB4TMoTw2Si+8GYKRwFPMMtUT0263QFWFfqyQ==
 
 core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
+  integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
 cross-fetch@3.1.5:
   version "3.1.5"
@@ -823,17 +1369,19 @@ cross-spawn@^7.0.2:
     which "^2.0.1"
 
 css-tree@^2.0.4:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.1.0.tgz#170e27ccf94e7c5facb183765c25898be843d1d2"
-  integrity sha512-PcysZRzToBbrpoUrZ9qfblRIRf8zbEAkU0AIpQFtgkFK0vSbzOmBCvdSAx2Zg7Xx5wiYJKUKk0NMP7kxevie/A==
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.3.1.tgz#10264ce1e5442e8572fc82fbe490644ff54b5c20"
+  integrity sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==
   dependencies:
-    mdn-data "2.0.27"
+    mdn-data "2.0.30"
     source-map-js "^1.0.1"
 
-date-fns@^2.28.0:
-  version "2.28.0"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.28.0.tgz#9570d656f5fc13143e50c975a3b6bbeb46cd08b2"
-  integrity sha512-8d35hViGYx/QH0icHYCeLmsLmMUheMmTyV9Fcm6gvNwdw31yXXH+O85sOBJ+OLnLQMKZowvpKb6FgMIQjcpvQw==
+date-fns@^2.30.0:
+  version "2.30.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.30.0.tgz#f367e644839ff57894ec6ac480de40cae4b0f4d0"
+  integrity sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==
+  dependencies:
+    "@babel/runtime" "^7.21.0"
 
 debug@4, debug@4.3.4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2:
   version "4.3.4"
@@ -842,31 +1390,51 @@ debug@4, debug@4.3.4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2:
   dependencies:
     ms "2.1.2"
 
-debug@^2.6.8:
+debug@^2.1.3, debug@^2.2.0, debug@^2.6.8, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
 
+deep-eql@^4.1.2:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-4.1.3.tgz#7c7775513092f7df98d8df9996dd085eb668cc6d"
+  integrity sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==
+  dependencies:
+    type-detect "^4.0.0"
+
 deep-is@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
 defaults@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
-  integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.4.tgz#b0b02062c1e2aa62ff5d9528f0f98baa90978d7a"
+  integrity sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==
   dependencies:
     clone "^1.0.2"
 
+define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5"
+  integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==
+  dependencies:
+    has-property-descriptors "^1.0.0"
+    object-keys "^1.1.1"
+
+dequal@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be"
+  integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==
+
 devtools-protocol@0.0.981744:
   version "0.0.981744"
   resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.981744.tgz#9960da0370284577d46c28979a0b32651022bacf"
   integrity sha512-0cuGS8+jhR67Fy7qG3i3Pc7Aw494sb9yG9QgpG97SFVWwolgYjlhJg7n+UaHxOQT30d1TYu/EYe9k01ivLErIg==
 
-diffhtml@^1.0.0-beta.20:
+diffhtml@1.0.0-beta.20:
   version "1.0.0-beta.20"
   resolved "https://registry.yarnpkg.com/diffhtml/-/diffhtml-1.0.0-beta.20.tgz#129b403fa152276c9b876188980ca0f9b2540351"
   integrity sha512-xSSwGb2dkQsTc7Bl910iySH65PkzsCtowfVGMfrmc2fEwvYrhJUpIEIx+3mpZ1wMWVt+t/0ltVwrjQkMJotxLg==
@@ -903,51 +1471,139 @@ duplexify@^4.1.1:
     readable-stream "^3.1.1"
     stream-shift "^1.0.0"
 
-electron-to-chromium@^1.4.172:
-  version "1.4.179"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.179.tgz#450561ade3ca3497dfed65af412c672972b2dad5"
-  integrity sha512-1XeTb/U/8Xgh2YgPOqhakLYsvCcU4U7jUjTMbEnhIJoIWd/Qt3yC8y0cbG+fHzn4zUNF99Ey1xiPf20bwgLO3Q==
+editions@^1.1.1:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/editions/-/editions-1.3.4.tgz#3662cb592347c3168eb8e498a0ff73271d67f50b"
+  integrity sha512-gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg==
 
-ember-rfc176-data@^0.3.15:
-  version "0.3.17"
-  resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.17.tgz#d4fc6c33abd6ef7b3440c107a28e04417b49860a"
-  integrity sha512-EVzTTKqxv9FZbEh6Ktw56YyWRAA0MijKvl7H8C06wVF+8f/cRRz3dXxa4nkwjzyVwx4rzKGuIGq77hxJAQhWWw==
+editions@^2.2.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/editions/-/editions-2.3.1.tgz#3bc9962f1978e801312fbd0aebfed63b49bfe698"
+  integrity sha512-ptGvkwTvGdGfC0hfhKg0MT+TRLRKGtUiWGBInxOm5pz7ssADezahjCUaYuZ8Dr+C05FW0AECIIPt4WBxVINEhA==
+  dependencies:
+    errlop "^2.0.0"
+    semver "^6.3.0"
 
-ember-template-lint-plugin-discourse@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ember-template-lint-plugin-discourse/-/ember-template-lint-plugin-discourse-2.0.0.tgz#9805dff60763fae68b5df82b92fb431eb739c13e"
-  integrity sha512-2bPz/47OfuYGj4w2RNyDcXCYA/4JtRAXRIsaA6PTm4Uc44exK/GBd4RfT2ywmq0CImvj2kGkqpuUgkAtVf6aZQ==
+electron-to-chromium@^1.4.431:
+  version "1.4.445"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.445.tgz#058d2c5f3a2981ab1a37440f5a5e42d15672aa6d"
+  integrity sha512-++DB+9VK8SBJwC+X1zlMfJ1tMA3F0ipi39GdEp+x3cV2TyBihqAgad8cNMWtLDEkbH39nlDQP7PfGrDr3Dr7HA==
 
-ember-template-lint@^4.10.0:
-  version "4.10.1"
-  resolved "https://registry.yarnpkg.com/ember-template-lint/-/ember-template-lint-4.10.1.tgz#2c348187a7bce15f0fdf371f6f3f54e3717b0a0a"
-  integrity sha512-uFJ4jjzbYuVKTeTEVqzLDQR7XHFbSLQDZoFC6XZ3OMxX07YArmM78MKBOAJ6ri9fVCd1LD9j99j6qXwUWqWr1g==
+ember-cli-babel-plugin-helpers@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879"
+  integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw==
+
+ember-cli-htmlbars@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-6.2.0.tgz#18ec48ee1c93f9eed862a64eb24a9d14604f1dfc"
+  integrity sha512-j5EGixjGau23HrqRiW/JjoAovg5UBHfjbyN7wX5ekE90knIEqUUj1z/Mo/cTx/J2VepQ2lE6HdXW9LWQ/WdMtw==
+  dependencies:
+    "@ember/edition-utils" "^1.2.0"
+    babel-plugin-ember-template-compilation "^2.0.0"
+    babel-plugin-htmlbars-inline-precompile "^5.3.0"
+    broccoli-debug "^0.6.5"
+    broccoli-persistent-filter "^3.1.2"
+    broccoli-plugin "^4.0.3"
+    ember-cli-version-checker "^5.1.2"
+    fs-tree-diff "^2.0.1"
+    hash-for-dep "^1.5.1"
+    heimdalljs-logger "^0.1.10"
+    js-string-escape "^1.0.1"
+    semver "^7.3.4"
+    silent-error "^1.1.1"
+    walk-sync "^2.2.0"
+
+ember-cli-version-checker@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-5.1.2.tgz#649c7b6404902e3b3d69c396e054cea964911ab0"
+  integrity sha512-rk7GY+FmLn/2e22HsZs0Ycrz8HQ1W3Fv+2TFOuEFW9optnDXDgkntPBIl6gact/LHsfBM5RKbM3dHsIIeLgl0Q==
+  dependencies:
+    resolve-package-path "^3.1.0"
+    semver "^7.3.4"
+    silent-error "^1.1.1"
+
+ember-rfc176-data@^0.3.15, ember-rfc176-data@^0.3.17:
+  version "0.3.18"
+  resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.18.tgz#bb6fdcef49999981317ea81b6cc9210fb4108d65"
+  integrity sha512-JtuLoYGSjay1W3MQAxt3eINWXNYYQliK90tLwtb8aeCuQK8zKGCRbBodVIrkcTqshULMnRuTOS6t1P7oQk3g6Q==
+
+ember-template-imports@^3.4.1, ember-template-imports@^3.4.2:
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/ember-template-imports/-/ember-template-imports-3.4.2.tgz#6cf7de7d4b8348a0fddf3aaec4947aa1211289e6"
+  integrity sha512-OS8TUVG2kQYYwP3netunLVfeijPoOKIs1SvPQRTNOQX4Pu8xGGBEZmrv0U1YTnQn12Eg+p6w/0UdGbUnITjyzw==
+  dependencies:
+    babel-import-util "^0.2.0"
+    broccoli-stew "^3.0.0"
+    ember-cli-babel-plugin-helpers "^1.1.1"
+    ember-cli-version-checker "^5.1.2"
+    line-column "^1.0.2"
+    magic-string "^0.25.7"
+    parse-static-imports "^1.1.0"
+    string.prototype.matchall "^4.0.6"
+    validate-peer-dependencies "^1.1.0"
+
+ember-template-lint-plugin-discourse@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ember-template-lint-plugin-discourse/-/ember-template-lint-plugin-discourse-3.0.0.tgz#9212226e4d2f6dce2e35b480aaf240067d736246"
+  integrity sha512-4zi/qN+vXs0ZpJZrwdMfZ5hMThJbeVCFdof6iek4PmgIJhnlA0lzqIa1BrKpSKhr3ckd5K0rUMNcCAm0uKNOtg==
+
+ember-template-lint@5.10.3:
+  version "5.10.3"
+  resolved "https://registry.yarnpkg.com/ember-template-lint/-/ember-template-lint-5.10.3.tgz#919f69de7e4ac08c095edf39c6e6275acd363dcf"
+  integrity sha512-IuvnJnCN36vnFoDUQ4TPiS9SsoMtvS3hL+zsdNpd+f3ZqKrlXSfcdyRqjKLrucbYE34Lk5BKpbYv68YZ86N69w==
   dependencies:
     "@lint-todo/utils" "^13.0.3"
-    aria-query "^5.0.0"
-    chalk "^4.1.2"
-    ci-info "^3.3.2"
-    date-fns "^2.28.0"
-    ember-template-recast "^6.1.3"
+    aria-query "^5.0.2"
+    chalk "^5.2.0"
+    ci-info "^3.8.0"
+    date-fns "^2.30.0"
+    ember-template-imports "^3.4.2"
+    ember-template-recast "^6.1.4"
+    eslint-formatter-kakoune "^1.0.0"
     find-up "^6.3.0"
     fuse.js "^6.5.3"
     get-stdin "^9.0.0"
-    globby "^13.1.2"
+    globby "^13.1.4"
     is-glob "^4.0.3"
-    language-tags "^1.0.5"
+    language-tags "^1.0.8"
     micromatch "^4.0.5"
-    resolve "^1.22.1"
+    resolve "^1.22.3"
     v8-compile-cache "^2.3.0"
-    yargs "^17.5.1"
+    yargs "^17.7.2"
 
-ember-template-recast@^6.1.3:
-  version "6.1.3"
-  resolved "https://registry.yarnpkg.com/ember-template-recast/-/ember-template-recast-6.1.3.tgz#1e9b256ee9da24bcaa7c213088d01f32afc88001"
-  integrity sha512-45lkfjrWlrMPlOd5rLFeQeePZwAvcS//x1x15kaiQTlqQdYWiYNXwbpWHqV+p9fXY6bEjl6EbyPhG/zBkgh8MA==
+ember-template-lint@^5.10.3:
+  version "5.11.0"
+  resolved "https://registry.yarnpkg.com/ember-template-lint/-/ember-template-lint-5.11.0.tgz#539ed054a9040066fd2ad2a81ffb391e8b96ce71"
+  integrity sha512-uoVz4IAFRyg3JnMTL+SDtZkHPZM6O1qhvvgcb7LD6325W6asjPZGF1YHDyxnssEOnCSVsu1S5bk77tqE5NnyNg==
   dependencies:
-    "@glimmer/reference" "^0.83.1"
-    "@glimmer/syntax" "^0.83.1"
-    "@glimmer/validator" "^0.83.0"
+    "@lint-todo/utils" "^13.0.3"
+    aria-query "^5.0.2"
+    chalk "^5.2.0"
+    ci-info "^3.8.0"
+    date-fns "^2.30.0"
+    ember-template-imports "^3.4.2"
+    ember-template-recast "^6.1.4"
+    eslint-formatter-kakoune "^1.0.0"
+    find-up "^6.3.0"
+    fuse.js "^6.5.3"
+    get-stdin "^9.0.0"
+    globby "^13.2.0"
+    is-glob "^4.0.3"
+    language-tags "^1.0.8"
+    micromatch "^4.0.5"
+    resolve "^1.22.3"
+    v8-compile-cache "^2.3.0"
+    yargs "^17.7.2"
+
+ember-template-recast@^6.1.4:
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/ember-template-recast/-/ember-template-recast-6.1.4.tgz#e964c184adfd876878009f8aa0b84c95633fce20"
+  integrity sha512-fCh+rOK6z+/tsdkTbOE+e7f84P6ObnIRQrCCrnu21E4X05hPeradikIkRMhJdxn4NWrxitfZskQDd37TR/lsNQ==
+  dependencies:
+    "@glimmer/reference" "^0.84.3"
+    "@glimmer/syntax" "^0.84.3"
+    "@glimmer/validator" "^0.84.3"
     async-promise-queue "^1.0.5"
     colors "^1.4.0"
     commander "^8.3.0"
@@ -955,7 +1611,7 @@ ember-template-recast@^6.1.3:
     ora "^5.4.0"
     slash "^3.0.0"
     tmp "^0.2.1"
-    workerpool "^6.1.5"
+    workerpool "^6.4.0"
 
 emoji-regex@^8.0.0:
   version "8.0.0"
@@ -969,6 +1625,79 @@ end-of-stream@^1.1.0, end-of-stream@^1.4.1:
   dependencies:
     once "^1.4.0"
 
+ensure-posix-path@^1.0.0, ensure-posix-path@^1.0.1, ensure-posix-path@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ensure-posix-path/-/ensure-posix-path-1.1.1.tgz#3c62bdb19fa4681544289edb2b382adc029179ce"
+  integrity sha512-VWU0/zXzVbeJNXvME/5EmLuEj2TauvoaTz6aFYK1Z92JCBlDlZ3Gu0tuGR42kpW1754ywTs+QB0g5TP0oj9Zaw==
+
+entities@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
+  integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==
+
+errlop@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/errlop/-/errlop-2.2.0.tgz#1ff383f8f917ae328bebb802d6ca69666a42d21b"
+  integrity sha512-e64Qj9+4aZzjzzFpZC7p5kmm/ccCrbLhAJplhsDXQFs87XTsXwOpH4s1Io2s90Tau/8r2j9f4l/thhDevRjzxw==
+
+es-abstract@^1.19.0, es-abstract@^1.20.4:
+  version "1.21.2"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.21.2.tgz#a56b9695322c8a185dc25975aa3b8ec31d0e7eff"
+  integrity sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==
+  dependencies:
+    array-buffer-byte-length "^1.0.0"
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    es-set-tostringtag "^2.0.1"
+    es-to-primitive "^1.2.1"
+    function.prototype.name "^1.1.5"
+    get-intrinsic "^1.2.0"
+    get-symbol-description "^1.0.0"
+    globalthis "^1.0.3"
+    gopd "^1.0.1"
+    has "^1.0.3"
+    has-property-descriptors "^1.0.0"
+    has-proto "^1.0.1"
+    has-symbols "^1.0.3"
+    internal-slot "^1.0.5"
+    is-array-buffer "^3.0.2"
+    is-callable "^1.2.7"
+    is-negative-zero "^2.0.2"
+    is-regex "^1.1.4"
+    is-shared-array-buffer "^1.0.2"
+    is-string "^1.0.7"
+    is-typed-array "^1.1.10"
+    is-weakref "^1.0.2"
+    object-inspect "^1.12.3"
+    object-keys "^1.1.1"
+    object.assign "^4.1.4"
+    regexp.prototype.flags "^1.4.3"
+    safe-regex-test "^1.0.0"
+    string.prototype.trim "^1.2.7"
+    string.prototype.trimend "^1.0.6"
+    string.prototype.trimstart "^1.0.6"
+    typed-array-length "^1.0.4"
+    unbox-primitive "^1.0.2"
+    which-typed-array "^1.1.9"
+
+es-set-tostringtag@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz#338d502f6f674301d710b80c8592de8a15f09cd8"
+  integrity sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==
+  dependencies:
+    get-intrinsic "^1.1.3"
+    has "^1.0.3"
+    has-tostringtag "^1.0.0"
+
+es-to-primitive@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
+  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
+  dependencies:
+    is-callable "^1.1.4"
+    is-date-object "^1.0.1"
+    is-symbol "^1.0.2"
+
 escalade@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
@@ -977,30 +1706,41 @@ escalade@^3.1.1:
 escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
+
+escape-string-regexp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
+  integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
 
 escape-string-regexp@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-eslint-config-discourse@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-discourse/-/eslint-config-discourse-3.3.0.tgz#e521620b5dfbd53bbd8bf0413319b3c41cc52944"
-  integrity sha512-s+N5j8DNxAsr+9czYDA7CvVVi3vsMrPgokbHwDnlLug8RJ35f47B09cHNNiREwx1ITj2epPhMbzH52wc78UPMg==
+eslint-config-discourse@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-discourse/-/eslint-config-discourse-3.5.0.tgz#528db8a5b64e5d0aa96d958a50f9d75456c91e4e"
+  integrity sha512-IwxNmfyomRKrMCP3dsgxEepKYv/QW5tcLi/NRv7hl06uRK5o+a8QvrFjFiC+KfYcNRQhTQA4So+YwXSrVpCk0A==
   dependencies:
-    "@babel/core" "^7.18.5"
-    "@babel/eslint-parser" "^7.18.2"
-    "@babel/plugin-proposal-decorators" "^7.18.2"
-    ember-template-lint "^4.10.0"
-    ember-template-lint-plugin-discourse "^2.0.0"
-    eslint "^8.17.0"
+    "@babel/core" "^7.22.5"
+    "@babel/eslint-parser" "^7.22.5"
+    "@babel/plugin-proposal-decorators" "^7.22.5"
+    ember-template-imports "^3.4.1"
+    ember-template-lint "^5.10.3"
+    ember-template-lint-plugin-discourse "^3.0.0"
+    eslint "^8.43.0"
     eslint-plugin-discourse-ember latest
-    eslint-plugin-ember "^10.6.1"
+    eslint-plugin-ember "^11.8.0"
     eslint-plugin-lodash "^7.1.0"
     eslint-plugin-node "^11.1.0"
-    eslint-plugin-sort-class-members "^1.14.1"
-    prettier "2.7.1"
+    eslint-plugin-sort-class-members "^1.18.0"
+    prettier "2.8.8"
+
+eslint-formatter-kakoune@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-formatter-kakoune/-/eslint-formatter-kakoune-1.0.0.tgz#a95cc4fe1fbc06b84e0f2397e83f5f0b68340125"
+  integrity sha512-Uk/TVLt6Nf6Xoz7C1iYuZjOSdJxe5aaauGRke8JhKeJwD66Y61/pY2FjtLP04Ooq9PwV34bzrkKkU2UZ5FtDRA==
 
 eslint-plugin-discourse-ember@latest:
   version "0.0.3"
@@ -1009,17 +1749,40 @@ eslint-plugin-discourse-ember@latest:
   dependencies:
     requireindex "~1.1.0"
 
-eslint-plugin-ember@^10.6.1:
-  version "10.6.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-10.6.1.tgz#04ea84cc82307f64a2faa4f2855b30e5ebf9f722"
-  integrity sha512-R+TN3jwhYQ2ytZCA1VkfJDZSGgHFOHjsHU1DrBlRXYRepThe56PpuGxywAyDvQ7inhoAz3e6G6M60PzpvjzmNg==
+eslint-plugin-ember@11.8.0:
+  version "11.8.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-11.8.0.tgz#3c984500513a01d930c13dcac0b4661a64ea457b"
+  integrity sha512-oZ6My7LlbyhNCguHuyBnajGbpU5+raQ5zkaF9Vqe8EkWf3Ji2uJZH7BxzMMcR4gAuyx5qTUZRXVs42km1nTzVg==
   dependencies:
     "@ember-data/rfc395-data" "^0.0.4"
+    "@glimmer/syntax" "^0.84.2"
     css-tree "^2.0.4"
     ember-rfc176-data "^0.3.15"
+    ember-template-imports "^3.4.2"
     eslint-utils "^3.0.0"
     estraverse "^5.2.0"
+    lodash.camelcase "^4.1.1"
     lodash.kebabcase "^4.1.1"
+    magic-string "^0.30.0"
+    requireindex "^1.2.0"
+    snake-case "^3.0.3"
+
+eslint-plugin-ember@^11.8.0:
+  version "11.9.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-11.9.0.tgz#b02f8d7c2d78ff2b8f13d1eaff55d13edfa8cfee"
+  integrity sha512-kpsvbdQOFw9ikzwmhxR8mmsAXtwwj+DPMGn1NOHAHJOnhTkyioKEiNO6tQK/b33VtQy1VpJP6zFu+Bt6m/cYxA==
+  dependencies:
+    "@ember-data/rfc395-data" "^0.0.4"
+    "@glimmer/syntax" "^0.84.2"
+    css-tree "^2.0.4"
+    ember-rfc176-data "^0.3.15"
+    ember-template-imports "^3.4.2"
+    ember-template-recast "^6.1.4"
+    eslint-utils "^3.0.0"
+    estraverse "^5.2.0"
+    lodash.camelcase "^4.1.1"
+    lodash.kebabcase "^4.1.1"
+    magic-string "^0.30.0"
     requireindex "^1.2.0"
     snake-case "^3.0.3"
 
@@ -1032,9 +1795,11 @@ eslint-plugin-es@^3.0.0:
     regexpp "^3.0.0"
 
 eslint-plugin-lodash@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-lodash/-/eslint-plugin-lodash-7.1.0.tgz#5ad9bf1240a01c6c3f94e956213e2d6422af3192"
-  integrity sha512-BRkEI/+ZjmeDCM1DfzR+NVwYkC/+ChJhaOSm3Xm7rer/fs89TKU6AMtkQiDdqQel1wZ4IJM+B6hlep9xwVKaMQ==
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-lodash/-/eslint-plugin-lodash-7.4.0.tgz#14a761547f126c92ff56789662a20a44f8bb6290"
+  integrity sha512-Tl83UwVXqe1OVeBRKUeWcfg6/pCW1GTRObbdnbEJgYwjxp5Q92MEWQaH9+dmzbRt6kvYU1Mp893E79nJiCSM8A==
+  dependencies:
+    lodash "^4.17.21"
 
 eslint-plugin-node@^11.1.0:
   version "11.1.0"
@@ -1048,12 +1813,12 @@ eslint-plugin-node@^11.1.0:
     resolve "^1.10.1"
     semver "^6.1.0"
 
-eslint-plugin-sort-class-members@^1.14.1:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-sort-class-members/-/eslint-plugin-sort-class-members-1.14.1.tgz#e701d6341e267ed0d0bf44c8293ff1e15b324e3c"
-  integrity sha512-/Q/cm3h4N9DBNYvJMQMhluucSmr3Yydr9U0BgGcXUQe/rgWdXKSymZ5Ewcf4vmAG0bbTmAYmekuMnYYrqlu9Rg==
+eslint-plugin-sort-class-members@1.18.0, eslint-plugin-sort-class-members@^1.18.0:
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-sort-class-members/-/eslint-plugin-sort-class-members-1.18.0.tgz#561746eb30abc4e8bb8d582d359c652299e450d8"
+  integrity sha512-y4r5OC3LJNHJZCWfVwFnnRiNrQ/LRf7Pb1wD6/CP8Y4qmUvjtmkwrLvyY755p8SFTOOXVd33HgFuF3XxVW1xbg==
 
-eslint-scope@^5.1.1:
+eslint-scope@5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
   integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
@@ -1061,10 +1826,10 @@ eslint-scope@^5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-scope@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642"
-  integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==
+eslint-scope@^7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.0.tgz#f21ebdafda02352f103634b96dd47d9f81ca117b"
+  integrity sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==
   dependencies:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
@@ -1093,39 +1858,45 @@ eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
-eslint-visitor-keys@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
-  integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994"
+  integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==
 
-eslint@^8.17.0:
-  version "8.19.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.19.0.tgz#7342a3cbc4fbc5c106a1eefe0fd0b50b6b1a7d28"
-  integrity sha512-SXOPj3x9VKvPe81TjjUJCYlV4oJjQw68Uek+AM0X4p+33dj2HY5bpTZOgnQHcG2eAm1mtCU9uNMnJi7exU/kYw==
+eslint@^8.37.0, eslint@^8.43.0:
+  version "8.43.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.43.0.tgz#3e8c6066a57097adfd9d390b8fc93075f257a094"
+  integrity sha512-aaCpf2JqqKesMFGgmRPessmVKjcGXqdlAYLLC3THM8t5nBRZRQ+st5WM/hoJXkdioEXLLbXgclUpM0TXo5HX5Q==
   dependencies:
-    "@eslint/eslintrc" "^1.3.0"
-    "@humanwhocodes/config-array" "^0.9.2"
+    "@eslint-community/eslint-utils" "^4.2.0"
+    "@eslint-community/regexpp" "^4.4.0"
+    "@eslint/eslintrc" "^2.0.3"
+    "@eslint/js" "8.43.0"
+    "@humanwhocodes/config-array" "^0.11.10"
+    "@humanwhocodes/module-importer" "^1.0.1"
+    "@nodelib/fs.walk" "^1.2.8"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
     debug "^4.3.2"
     doctrine "^3.0.0"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^7.1.1"
-    eslint-utils "^3.0.0"
-    eslint-visitor-keys "^3.3.0"
-    espree "^9.3.2"
-    esquery "^1.4.0"
+    eslint-scope "^7.2.0"
+    eslint-visitor-keys "^3.4.1"
+    espree "^9.5.2"
+    esquery "^1.4.2"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
     file-entry-cache "^6.0.1"
-    functional-red-black-tree "^1.0.1"
-    glob-parent "^6.0.1"
-    globals "^13.15.0"
+    find-up "^5.0.0"
+    glob-parent "^6.0.2"
+    globals "^13.19.0"
+    graphemer "^1.4.0"
     ignore "^5.2.0"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
+    is-path-inside "^3.0.3"
     js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
@@ -1133,25 +1904,28 @@ eslint@^8.17.0:
     minimatch "^3.1.2"
     natural-compare "^1.4.0"
     optionator "^0.9.1"
-    regexpp "^3.2.0"
     strip-ansi "^6.0.1"
     strip-json-comments "^3.1.0"
     text-table "^0.2.0"
-    v8-compile-cache "^2.0.3"
 
-espree@^9.3.2:
-  version "9.3.2"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.2.tgz#f58f77bd334731182801ced3380a8cc859091596"
-  integrity sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==
+esm@^3.2.25:
+  version "3.2.25"
+  resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.25.tgz#342c18c29d56157688ba5ce31f8431fbb795cc10"
+  integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==
+
+espree@^9.5.2:
+  version "9.5.2"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.5.2.tgz#e994e7dc33a082a7a82dceaf12883a829353215b"
+  integrity sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==
   dependencies:
-    acorn "^8.7.1"
+    acorn "^8.8.0"
     acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^3.3.0"
+    eslint-visitor-keys "^3.4.1"
 
-esquery@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
-  integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
+esquery@^1.4.2:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
+  integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
   dependencies:
     estraverse "^5.1.0"
 
@@ -1168,9 +1942,9 @@ estraverse@^4.1.1:
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
 estraverse@^5.1.0, estraverse@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
-  integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
+  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
 
 esutils@^2.0.2:
   version "2.0.3"
@@ -1199,9 +1973,9 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
 fast-glob@^3.2.11, fast-glob@^3.2.9:
-  version "3.2.11"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9"
-  integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==
+  version "3.2.12"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
+  integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
@@ -1219,17 +1993,24 @@ fast-levenshtein@^2.0.6:
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
+fast-ordered-set@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/fast-ordered-set/-/fast-ordered-set-1.0.3.tgz#3fbb36634f7be79e4f7edbdb4a357dee25d184eb"
+  integrity sha512-MxBW4URybFszOx1YlACEoK52P6lE3xiFcPaGCUZ7QQOZ6uJXKo++Se8wa31SjcZ+NC/fdAWX7UtKEfaGgHS2Vg==
+  dependencies:
+    blank-object "^1.0.1"
+
 fastq@^1.6.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.8.0.tgz#550e1f9f59bbc65fe185cb6a9b4d95357107f481"
-  integrity sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a"
+  integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==
   dependencies:
     reusify "^1.0.4"
 
 fd-slicer@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
-  integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=
+  integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==
   dependencies:
     pend "~1.2.0"
 
@@ -1280,15 +2061,40 @@ flat-cache@^3.0.4:
     rimraf "^3.0.2"
 
 flatted@^3.1.0:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.6.tgz#022e9218c637f9f3fc9c35ab9c9193f05add60b2"
-  integrity sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ==
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
+  integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
+
+for-each@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
+  integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==
+  dependencies:
+    is-callable "^1.1.3"
 
 fs-constants@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
   integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
 
+fs-extra@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
+  integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+fs-extra@^8.0.1, fs-extra@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
+  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
 fs-extra@^9.1.0:
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
@@ -1299,20 +2105,73 @@ fs-extra@^9.1.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
+fs-merger@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/fs-merger/-/fs-merger-3.2.1.tgz#a225b11ae530426138294b8fbb19e82e3d4e0b3b"
+  integrity sha512-AN6sX12liy0JE7C2evclwoo0aCG3PFulLjrTLsJpWh/2mM+DinhpSGqYLbHBBbIW1PLRNcFhJG8Axtz8mQW3ug==
+  dependencies:
+    broccoli-node-api "^1.7.0"
+    broccoli-node-info "^2.1.0"
+    fs-extra "^8.0.1"
+    fs-tree-diff "^2.0.1"
+    walk-sync "^2.2.0"
+
+fs-tree-diff@^0.5.2, fs-tree-diff@^0.5.3, fs-tree-diff@^0.5.6:
+  version "0.5.9"
+  resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-0.5.9.tgz#a4ec6182c2f5bd80b9b83c8e23e4522e6f5fd946"
+  integrity sha512-872G8ax0kHh01m9n/2KDzgYwouKza0Ad9iFltBpNykvROvf2AGtoOzPJgGx125aolGPER3JuC7uZFrQ7bG1AZw==
+  dependencies:
+    heimdalljs-logger "^0.1.7"
+    object-assign "^4.1.0"
+    path-posix "^1.0.0"
+    symlink-or-copy "^1.1.8"
+
+fs-tree-diff@^2.0.0, fs-tree-diff@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-2.0.1.tgz#343e4745ab435ec39ebac5f9059ad919cd034afa"
+  integrity sha512-x+CfAZ/lJHQqwlD64pYM5QxWjzWhSjroaVsr8PW831zOApL55qPibed0c+xebaLWVr2BnHFoHdrwOv8pzt8R5A==
+  dependencies:
+    "@types/symlink-or-copy" "^1.2.0"
+    heimdalljs-logger "^0.1.7"
+    object-assign "^4.1.0"
+    path-posix "^1.0.0"
+    symlink-or-copy "^1.1.8"
+
+fs-updater@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/fs-updater/-/fs-updater-1.0.4.tgz#2329980f99ae9176e9a0e84f7637538a182ce63b"
+  integrity sha512-0pJX4mJF/qLsNEwTct8CdnnRdagfb+LmjRPJ8sO+nCnAZLW0cTmz4rTgU25n+RvTuWSITiLKrGVJceJPBIPlKg==
+  dependencies:
+    can-symlink "^1.0.0"
+    clean-up-path "^1.0.0"
+    heimdalljs "^0.2.5"
+    heimdalljs-logger "^0.1.9"
+    rimraf "^2.6.2"
+
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
-functional-red-black-tree@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
+function.prototype.name@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621"
+  integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.0"
+    functions-have-names "^1.2.2"
+
+functions-have-names@^1.2.2, functions-have-names@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
+  integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
 fuse.js@^6.5.3:
   version "6.6.2"
@@ -1329,6 +2188,21 @@ get-caller-file@^2.0.5:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
+get-func-name@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
+  integrity sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==
+
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82"
+  integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-proto "^1.0.1"
+    has-symbols "^1.0.3"
+
 get-stdin@^9.0.0:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-9.0.0.tgz#3983ff82e03d56f1b2ea0d3e60325f39d703a575"
@@ -1341,6 +2215,14 @@ get-stream@^5.1.0:
   dependencies:
     pump "^3.0.0"
 
+get-symbol-description@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
+  integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.1"
+
 glob-parent@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
@@ -1348,7 +2230,7 @@ glob-parent@^5.1.2:
   dependencies:
     is-glob "^4.0.1"
 
-glob-parent@^6.0.1, glob-parent@^6.0.2:
+glob-parent@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
   integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
@@ -1371,6 +2253,17 @@ glob-stream@^7.0.0:
     to-absolute-glob "^2.0.2"
     unique-stream "^2.3.1"
 
+glob@^5.0.10:
+  version "5.0.15"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
+  integrity sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==
+  dependencies:
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "2 || 3"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 glob@^7.1.3, glob@^7.2.0:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
@@ -1388,13 +2281,20 @@ globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globals@^13.15.0:
-  version "13.16.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.16.0.tgz#9be4aca28f311aaeb974ea54978ebbb5e35ce46a"
-  integrity sha512-A1lrQfpNF+McdPOnnFqY3kSN0AFTy485bTi1bkLk4mVPODIUEcSfhHgRqA+QdXPksrSTTztYXx37NFV+GpGk3Q==
+globals@^13.19.0:
+  version "13.20.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.20.0.tgz#ea276a1e508ffd4f1612888f9d1bad1e2717bf82"
+  integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==
   dependencies:
     type-fest "^0.20.2"
 
+globalthis@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf"
+  integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==
+  dependencies:
+    define-properties "^1.1.3"
+
 globby@^11.0.3:
   version "11.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
@@ -1407,10 +2307,10 @@ globby@^11.0.3:
     merge2 "^1.4.1"
     slash "^3.0.0"
 
-globby@^13.1.2:
-  version "13.1.2"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-13.1.2.tgz#29047105582427ab6eca4f905200667b056da515"
-  integrity sha512-LKSDZXToac40u8Q1PQtZihbNdTYSNMuWe+K5l+oa6KgDzSvVrHXlJy40hUP522RjAIoNLJYBJi7ow+rbFpIhHQ==
+globby@^13.1.4, globby@^13.2.0:
+  version "13.2.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-13.2.0.tgz#7dd5678d765c4680c2e6d106230d86cb727cb1af"
+  integrity sha512-jWsQfayf13NvqKUIL3Ta+CIqMnvlaIDFveWE/dpOZ9+3AMEJozsxDvKA02zync9UuvOM8rOXzsD5GqKP4OnWPQ==
   dependencies:
     dir-glob "^3.0.1"
     fast-glob "^3.2.11"
@@ -1418,21 +2318,62 @@ globby@^13.1.2:
     merge2 "^1.4.1"
     slash "^4.0.0"
 
-graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4:
-  version "4.2.10"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
-  integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
+gopd@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
+  integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==
+  dependencies:
+    get-intrinsic "^1.1.3"
+
+graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.4:
+  version "4.2.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
+  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
+
+graphemer@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
+  integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
+
+has-bigints@^1.0.1, has-bigints@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
+  integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==
 
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+  integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
 
 has-flag@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
+has-property-descriptors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861"
+  integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==
+  dependencies:
+    get-intrinsic "^1.1.1"
+
+has-proto@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0"
+  integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==
+
+has-symbols@^1.0.2, has-symbols@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
+  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
+
+has-tostringtag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
+  integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==
+  dependencies:
+    has-symbols "^1.0.2"
+
 has@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
@@ -1440,6 +2381,33 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
+hash-for-dep@^1.5.0, hash-for-dep@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/hash-for-dep/-/hash-for-dep-1.5.1.tgz#497754b39bee2f1c4ade4521bfd2af0a7c1196e3"
+  integrity sha512-/dQ/A2cl7FBPI2pO0CANkvuuVi/IFS5oTyJ0PsOb6jW6WbVW1js5qJXMJTNbWHXBIPdFTWFbabjB+mE0d+gelw==
+  dependencies:
+    broccoli-kitchen-sink-helpers "^0.3.1"
+    heimdalljs "^0.2.3"
+    heimdalljs-logger "^0.1.7"
+    path-root "^0.1.1"
+    resolve "^1.10.0"
+    resolve-package-path "^1.0.11"
+
+heimdalljs-logger@^0.1.10, heimdalljs-logger@^0.1.7, heimdalljs-logger@^0.1.9:
+  version "0.1.10"
+  resolved "https://registry.yarnpkg.com/heimdalljs-logger/-/heimdalljs-logger-0.1.10.tgz#90cad58aabb1590a3c7e640ddc6a4cd3a43faaf7"
+  integrity sha512-pO++cJbhIufVI/fmB/u2Yty3KJD0TqNPecehFae0/eps0hkZ3b4Zc/PezUMOpYuHFQbA7FxHZxa305EhmjLj4g==
+  dependencies:
+    debug "^2.2.0"
+    heimdalljs "^0.2.6"
+
+heimdalljs@^0.2.0, heimdalljs@^0.2.1, heimdalljs@^0.2.3, heimdalljs@^0.2.5, heimdalljs@^0.2.6:
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/heimdalljs/-/heimdalljs-0.2.6.tgz#b0eebabc412813aeb9542f9cc622cb58dbdcd9fe"
+  integrity sha512-o9bd30+5vLBvBtzCPwwGqpry2+n0Hi6H1+qwt6y+0kwRHGGF8TFIhJPmnuM0xO97zaKrDZMwO/V56fAnn8m/tA==
+  dependencies:
+    rsvp "~3.2.1"
+
 https-proxy-agent@5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
@@ -1454,9 +2422,16 @@ ieee754@^1.1.13:
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
 ignore@^5.1.1, ignore@^5.1.8, ignore@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
-  integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
+  version "5.2.4"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
+  integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
+
+import-cwd@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-3.0.0.tgz#20845547718015126ea9b3676b7592fb8bd4cf92"
+  integrity sha512-4pnzH16plW+hgvRECbDWpQl3cqtvSofHWh44met7ESfZ8UZOWWddm8hEyDTqREJ9RbYHY8gi8DqmaelApoOGMg==
+  dependencies:
+    import-from "^3.0.0"
 
 import-fresh@^3.0.0, import-fresh@^3.2.1:
   version "3.3.0"
@@ -1466,15 +2441,22 @@ import-fresh@^3.0.0, import-fresh@^3.2.1:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
+import-from@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/import-from/-/import-from-3.0.0.tgz#055cfec38cd5a27d8057ca51376d7d3bf0891966"
+  integrity sha512-CiuXOFFSzkU5x/CR0+z7T91Iht4CXgfCxVOFRhh2Zyhg5wOpWvvDLQUsWl+gcN+QscYBjez8hDCt85O7RLDttQ==
+  dependencies:
+    resolve-from "^5.0.0"
+
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
+  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
 
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
   dependencies:
     once "^1.3.0"
     wrappy "1"
@@ -1484,6 +2466,20 @@ inherits@2, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
+inherits@2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==
+
+internal-slot@^1.0.3, internal-slot@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986"
+  integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==
+  dependencies:
+    get-intrinsic "^1.2.0"
+    has "^1.0.3"
+    side-channel "^1.0.4"
+
 is-absolute@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
@@ -1492,22 +2488,58 @@ is-absolute@^1.0.0:
     is-relative "^1.0.0"
     is-windows "^1.0.1"
 
-is-core-module@^2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69"
-  integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==
+is-array-buffer@^3.0.1, is-array-buffer@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe"
+  integrity sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.2.0"
+    is-typed-array "^1.1.10"
+
+is-bigint@^1.0.1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
+  integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==
+  dependencies:
+    has-bigints "^1.0.1"
+
+is-boolean-object@^1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719"
+  integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==
+  dependencies:
+    call-bind "^1.0.2"
+    has-tostringtag "^1.0.0"
+
+is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
+  integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
+
+is-core-module@^2.12.0:
+  version "2.12.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.1.tgz#0c0b6885b6f80011c71541ce15c8d66cf5a4f9fd"
+  integrity sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==
   dependencies:
     has "^1.0.3"
 
+is-date-object@^1.0.1:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
+  integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==
+  dependencies:
+    has-tostringtag "^1.0.0"
+
 is-docker@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156"
-  integrity sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
+  integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
 
 is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
 
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
@@ -1529,13 +2561,38 @@ is-interactive@^1.0.0:
 is-negated-glob@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2"
-  integrity sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=
+  integrity sha512-czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug==
+
+is-negative-zero@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
+  integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
+
+is-number-object@^1.0.4:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc"
+  integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==
+  dependencies:
+    has-tostringtag "^1.0.0"
 
 is-number@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
+is-path-inside@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
+  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
+
+is-regex@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
+  integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
+  dependencies:
+    call-bind "^1.0.2"
+    has-tostringtag "^1.0.0"
+
 is-relative@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
@@ -1543,6 +2600,38 @@ is-relative@^1.0.0:
   dependencies:
     is-unc-path "^1.0.0"
 
+is-shared-array-buffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
+  integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==
+  dependencies:
+    call-bind "^1.0.2"
+
+is-string@^1.0.5, is-string@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
+  integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
+  dependencies:
+    has-tostringtag "^1.0.0"
+
+is-symbol@^1.0.2, is-symbol@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
+  integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
+  dependencies:
+    has-symbols "^1.0.2"
+
+is-typed-array@^1.1.10, is-typed-array@^1.1.9:
+  version "1.1.10"
+  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.10.tgz#36a5b5cb4189b575d1a3e4b08536bfb485801e3f"
+  integrity sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==
+  dependencies:
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
+    has-tostringtag "^1.0.0"
+
 is-unc-path@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
@@ -1555,6 +2644,13 @@ is-unicode-supported@^0.1.0:
   resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
   integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
 
+is-weakref@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
+  integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==
+  dependencies:
+    call-bind "^1.0.2"
+
 is-windows@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
@@ -1567,15 +2663,45 @@ is-wsl@^2.2.0:
   dependencies:
     is-docker "^2.0.0"
 
-isarray@~1.0.0:
+isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+  integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
 
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
+
+isobject@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  integrity sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==
+  dependencies:
+    isarray "1.0.0"
+
+istextorbinary@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-2.1.0.tgz#dbed2a6f51be2f7475b68f89465811141b758874"
+  integrity sha512-kT1g2zxZ5Tdabtpp9VSdOzW9lb6LXImyWbzbQeTxoRtHhurC9Ej9Wckngr2+uepPL09ky/mJHmN9jeJPML5t6A==
+  dependencies:
+    binaryextensions "1 || 2"
+    editions "^1.1.1"
+    textextensions "1 || 2"
+
+istextorbinary@^2.5.1:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-2.6.0.tgz#60776315fb0fa3999add276c02c69557b9ca28ab"
+  integrity sha512-+XRlFseT8B3L9KyjxxLjfXSLMuErKDsd8DBNrsaxoViABMEZlOSCstwmw0qpoFX3+U6yWU1yhLudAe6/lETGGA==
+  dependencies:
+    binaryextensions "^2.1.2"
+    editions "^2.2.0"
+    textextensions "^2.5.0"
+
+js-string-escape@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
+  integrity sha512-Smw4xcfIQ5LVjAOuJCvN/zIodzA/BBSsluuoSykP+lUvScIi4U6RJLfwHet5cxFnCswUjISV8oAXaqaJDY3chg==
 
 js-tokens@^4.0.0:
   version "4.0.0"
@@ -1589,6 +2715,55 @@ js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
+js2xmlparser@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/js2xmlparser/-/js2xmlparser-4.0.2.tgz#2a1fdf01e90585ef2ae872a01bc169c6a8d5e60a"
+  integrity sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA==
+  dependencies:
+    xmlcreate "^2.0.4"
+
+jsdoc@^3.6.3:
+  version "3.6.11"
+  resolved "https://registry.yarnpkg.com/jsdoc/-/jsdoc-3.6.11.tgz#8bbb5747e6f579f141a5238cbad4e95e004458ce"
+  integrity sha512-8UCU0TYeIYD9KeLzEcAu2q8N/mx9O3phAGl32nmHlE0LpaJL71mMkP4d+QE5zWfNt50qheHtOZ0qoxVrsX5TUg==
+  dependencies:
+    "@babel/parser" "^7.9.4"
+    "@types/markdown-it" "^12.2.3"
+    bluebird "^3.7.2"
+    catharsis "^0.9.0"
+    escape-string-regexp "^2.0.0"
+    js2xmlparser "^4.0.2"
+    klaw "^3.0.0"
+    markdown-it "^12.3.2"
+    markdown-it-anchor "^8.4.1"
+    marked "^4.0.10"
+    mkdirp "^1.0.4"
+    requizzle "^0.2.3"
+    strip-json-comments "^3.1.0"
+    taffydb "2.6.2"
+    underscore "~1.13.2"
+
+jsdoc@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/jsdoc/-/jsdoc-4.0.2.tgz#a1273beba964cf433ddf7a70c23fd02c3c60296e"
+  integrity sha512-e8cIg2z62InH7azBBi3EsSEqrKx+nUtAS5bBcYTSpZFA+vhNPyhv8PTFZ0WsjOPDj04/dOLlm08EDcQJDqaGQg==
+  dependencies:
+    "@babel/parser" "^7.20.15"
+    "@jsdoc/salty" "^0.2.1"
+    "@types/markdown-it" "^12.2.3"
+    bluebird "^3.7.2"
+    catharsis "^0.9.0"
+    escape-string-regexp "^2.0.0"
+    js2xmlparser "^4.0.2"
+    klaw "^3.0.0"
+    markdown-it "^12.3.2"
+    markdown-it-anchor "^8.4.1"
+    marked "^4.0.10"
+    mkdirp "^1.0.4"
+    requizzle "^0.2.3"
+    strip-json-comments "^3.1.0"
+    underscore "~1.13.2"
+
 jsesc@^2.5.1:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
@@ -1602,13 +2777,20 @@ json-schema-traverse@^0.4.1:
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
-  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
+  integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
-json5@^2.2.1:
+json5@^2.2.2:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
+jsonfile@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
 jsonfile@^6.0.1:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
@@ -1618,59 +2800,78 @@ jsonfile@^6.0.1:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
-language-subtag-registry@~0.3.2:
+klaw@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/klaw/-/klaw-3.0.0.tgz#b11bec9cf2492f06756d6e809ab73a2910259146"
+  integrity sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==
+  dependencies:
+    graceful-fs "^4.1.9"
+
+language-subtag-registry@^0.3.20:
   version "0.3.22"
   resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz#2e1500861b2e457eba7e7ae86877cbd08fa1fd1d"
   integrity sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w==
 
-language-tags@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/language-tags/-/language-tags-1.0.5.tgz#d321dbc4da30ba8bf3024e040fa5c14661f9193a"
-  integrity sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==
+language-tags@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/language-tags/-/language-tags-1.0.8.tgz#042b4bdb0d4e771a9f8cc2fdc9bb26a52a367312"
+  integrity sha512-aWAZwgPLS8hJ20lNPm9HNVs4inexz6S2sQa3wx/+ycuutMNE5/IfYxiWYBbi+9UWCQVaXYCOPUl6gFrPR7+jGg==
   dependencies:
-    language-subtag-registry "~0.3.2"
+    language-subtag-registry "^0.3.20"
 
-lefthook-darwin-arm64@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/lefthook-darwin-arm64/-/lefthook-darwin-arm64-1.2.0.tgz#148e89174a3cc9795bea22ab472649efae0352b8"
-  integrity sha512-jOyt6HxCRPr2LYkze0vpazp2rqKHsnDz6OVFu8fwIafP92cf9lhu9aAbCSIsbnT0wrHWEYi+t9a5n8Xm05BlFw==
+lefthook-darwin-arm64@1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/lefthook-darwin-arm64/-/lefthook-darwin-arm64-1.4.3.tgz#b253fbc20041815010da66e8588faf4bbd75c0aa"
+  integrity sha512-ZFsgIzN+Z0c4RpMMHU/M4J43XFyXYGZI8r0GG4jqVMX+prDBIb/6vpgMdZxK5IozRUmnfLGQPXcVokE9WBHSOg==
 
-lefthook-darwin-x64@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/lefthook-darwin-x64/-/lefthook-darwin-x64-1.2.0.tgz#1cbeee6aabc05055bc0ab452f1c9032a1d2077cf"
-  integrity sha512-G9bFTPvZBanfXS+MIm0hMwUWdkmvL26SCh7d3P6P5bnXNnp+2hx+V1ulDy4iGb9My5P9ORNF3tLLGq+qvXRp0w==
+lefthook-darwin-x64@1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/lefthook-darwin-x64/-/lefthook-darwin-x64-1.4.3.tgz#5afa63f7a18cf89495895fc1321cdd749825bf9c"
+  integrity sha512-O6ZesdJ9MStI38gNfJh0ShExIf0KyHG1lR32F9FUFklFwhcquRM+uIDyDqVCxU3UWqmKwcbTk9AJWMjQZGPLxQ==
 
-lefthook-linux-arm64@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/lefthook-linux-arm64/-/lefthook-linux-arm64-1.2.0.tgz#f36886a04e0074d4a52f93418891b42762628fe7"
-  integrity sha512-aoBXGJtGkzkHDVIYZrSUbG/8+J8gkrtTt1y6KE5/l1uY/xH9JSh2igttYvWaKd9KNbYUjsrEnff+25uzluwOEA==
+lefthook-freebsd-arm64@1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/lefthook-freebsd-arm64/-/lefthook-freebsd-arm64-1.4.3.tgz#070141ccc981658bd7545f40b14814b410f2930e"
+  integrity sha512-6swb+98Qs6P9V9Rcd2lHWH2LunFEk+kfIPpf6oiPrOHnw3OkfFhQLmawX425Ari7Y9qy9gfDoNe/0/IR7YGmGw==
 
-lefthook-linux-x64@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/lefthook-linux-x64/-/lefthook-linux-x64-1.2.0.tgz#4d35f5bcdf0a866680008f307137fdffb75aea25"
-  integrity sha512-FxdtAIQianqVNSpU0Hqj5Qb3ALKR4YjNqk9IUfGbFFnVnp7qnPgtitrh0WkcFu6T7KoCo6YEu3dZl+8y7JP9dQ==
+lefthook-freebsd-x64@1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/lefthook-freebsd-x64/-/lefthook-freebsd-x64-1.4.3.tgz#47b4e7cf4c0459b1152e605c047541ec3eec5f0b"
+  integrity sha512-+58NARATypmIj0kDutd29ozywr6IeA0lVBxsVzq7C5ycYrd31iNak3lnaEvNJvdj5fGVNEL9X7XRojylthZlAg==
 
-lefthook-windows-arm64@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/lefthook-windows-arm64/-/lefthook-windows-arm64-1.2.0.tgz#8f4a213ee71e95f4b617811932d99f1fff5df5d2"
-  integrity sha512-ZhItQksNHvvzTitlnmWmZhnAKhoXjStSJwdGYIMMG8g7GOFZRIG3CmTrtSoWPncpZX+xRlJHd2KeEFYTcB+uzA==
+lefthook-linux-arm64@1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/lefthook-linux-arm64/-/lefthook-linux-arm64-1.4.3.tgz#b3caae33a20cc2665ec047a098e7b4e4498d63d1"
+  integrity sha512-gAWJQEhgheOfPu579fhlcNNm3KoJbNkT11AATKHlFu+esyiCxI8xZVpGwDQVMphO7s43FKbkQJSvIM4tElb6FQ==
 
-lefthook-windows-x64@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/lefthook-windows-x64/-/lefthook-windows-x64-1.2.0.tgz#473048cdf42c761b031912196e3b840c3b263d68"
-  integrity sha512-UZQb/+o2AfcaMPzP8Y8JmWirEC5inMTzZPStAuG8pBe8Lv6IhC7EFdfDSkn2bdBvxWooBEFKf/a5EdlQ/f5/bQ==
+lefthook-linux-x64@1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/lefthook-linux-x64/-/lefthook-linux-x64-1.4.3.tgz#ac2990e23a4c39bf774e4094f33c0fbaef79129c"
+  integrity sha512-mVv/amRqX81nQcizhRRx/X6KKNIkMUG4HdDItWkDazwLAviZ2zv8TRcSaEYBOpriP/dBZm8gt6EhzPpfoWtcJw==
+
+lefthook-windows-arm64@1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/lefthook-windows-arm64/-/lefthook-windows-arm64-1.4.3.tgz#dc0dcfea32badab031183bdc8cd91bda929cee9b"
+  integrity sha512-ccClPTC7AvhcbyT6pLzdV8K8e/P0T7p/THGRtcyjkKIU0IS89k95VazDlt22QPzUTc8UMNCQyZ1XY4UDx295jw==
+
+lefthook-windows-x64@1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/lefthook-windows-x64/-/lefthook-windows-x64-1.4.3.tgz#795b1215969c7d0d4007f89bfe660cfc2736075c"
+  integrity sha512-q1K5kycfqTYLm5/pOCiAFa+hoSFt/29QjHVZAWRmk/nKDIf8MvTWX0tdaEx7/VJuG3cgQT1jM+xiTwSmNUXTKg==
 
 lefthook@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/lefthook/-/lefthook-1.2.0.tgz#c31e30688df10f205b223f6d612ba14ffe118885"
-  integrity sha512-FLw0YDTDJGleWDLSVVAMJtGIQ0Kh5wX4JJJHTNQtjzT0CZOAXSBjTP87loubg6S2QOuvmspvhSc62NkW6Jn82w==
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/lefthook/-/lefthook-1.4.3.tgz#cedfd13f13c87a974ea5e055853c7fae0c6df11e"
+  integrity sha512-zvhAJ9wDQW7F27XYWRfx72L6LuPLu49be+sRUF+DKku1IGT+x3eHjQ9k70pt65lnEq1X8Xl/Xygm3Kwi/piOYg==
   optionalDependencies:
-    lefthook-darwin-arm64 "1.2.0"
-    lefthook-darwin-x64 "1.2.0"
-    lefthook-linux-arm64 "1.2.0"
-    lefthook-linux-x64 "1.2.0"
-    lefthook-windows-arm64 "1.2.0"
-    lefthook-windows-x64 "1.2.0"
+    lefthook-darwin-arm64 "1.4.3"
+    lefthook-darwin-x64 "1.4.3"
+    lefthook-freebsd-arm64 "1.4.3"
+    lefthook-freebsd-x64 "1.4.3"
+    lefthook-linux-arm64 "1.4.3"
+    lefthook-linux-x64 "1.4.3"
+    lefthook-windows-arm64 "1.4.3"
+    lefthook-windows-x64 "1.4.3"
 
 levn@^0.4.1:
   version "0.4.1"
@@ -1681,12 +2882,56 @@ levn@^0.4.1:
     type-check "~0.4.0"
 
 lighthouse-logger@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/lighthouse-logger/-/lighthouse-logger-1.2.0.tgz#b76d56935e9c137e86a04741f6bb9b2776e886ca"
-  integrity sha512-wzUvdIeJZhRsG6gpZfmSCfysaxNEr43i+QT+Hie94wvHDKFLi4n7C2GqZ4sTC+PH5b5iktmXJvU87rWvhP3lHw==
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/lighthouse-logger/-/lighthouse-logger-1.4.2.tgz#aef90f9e97cd81db367c7634292ee22079280aaa"
+  integrity sha512-gPWxznF6TKmUHrOQjlVo2UbaL2EJ71mb2CCeRs/2qBpi4L/g4LUVc9+3lKQ6DTUZwJswfM7ainGrLO1+fOqa2g==
   dependencies:
-    debug "^2.6.8"
-    marky "^1.2.0"
+    debug "^2.6.9"
+    marky "^1.2.2"
+
+line-column@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/line-column/-/line-column-1.0.2.tgz#d25af2936b6f4849172b312e4792d1d987bc34a2"
+  integrity sha512-Ktrjk5noGYlHsVnYWh62FLVs4hTb8A3e+vucNZMgPeAOITdshMSgv4cCZQeRDjm7+goqmo6+liZwTXo+U3sVww==
+  dependencies:
+    isarray "^1.0.0"
+    isobject "^2.0.0"
+
+linkify-it@^3.0.1:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.3.tgz#a98baf44ce45a550efb4d49c769d07524cc2fa2e"
+  integrity sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==
+  dependencies:
+    uc.micro "^1.0.1"
+
+lint-to-the-future-ember-template@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/lint-to-the-future-ember-template/-/lint-to-the-future-ember-template-1.2.0.tgz#d27cba1669ea569787fb1ef86a2d7953249cad6d"
+  integrity sha512-MtbF3OITW2fh900RU08TQsrGt5ljvzYklvV3SEli4o1RqQ5oM4+yTsU4irvO3usmuO4C1lpXUAGZ6az7kqeXxw==
+  dependencies:
+    esm "^3.2.25"
+    import-cwd "^3.0.0"
+    walk-sync "^2.2.0"
+
+lint-to-the-future-eslint@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/lint-to-the-future-eslint/-/lint-to-the-future-eslint-2.0.1.tgz#63a044db5af5f2f81c6abc0bb79ceec305d814e8"
+  integrity sha512-p9I4Z8ncSroU6fPZfZ6d/qnbUqLbJJLg8Lzub0db/02rdO3TXMuP+/P4dFWs0VVVAC1wL+ctSZ3Z0bJttK6oKg==
+  dependencies:
+    import-cwd "^3.0.0"
+    semver "^7.3.5"
+    walk-sync "^3.0.0"
+
+lint-to-the-future@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/lint-to-the-future/-/lint-to-the-future-2.0.0.tgz#32f0b2e18762fd041f9433f71ab30274a07ac24c"
+  integrity sha512-gutEHLC1w5Ivh4nKQTuNV9lwnXKuUtwZ1kWOhVZVAhs6dsw71IBzS28+Kt1KiNFCds/TVkbj4OFQ2sXQaPtrkg==
+  dependencies:
+    chai "^4.3.6"
+    commander "^9.4.1"
+    fs-extra "^7.0.1"
+    import-cwd "^3.0.0"
+    node-fetch "^2.6.0"
 
 locate-path@^5.0.0:
   version "5.0.0"
@@ -1703,12 +2948,17 @@ locate-path@^6.0.0:
     p-locate "^5.0.0"
 
 locate-path@^7.1.0:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-7.1.1.tgz#8e1e5a75c7343770cef02ff93c4bf1f0aa666374"
-  integrity sha512-vJXaRMJgRVD3+cUZs3Mncj2mxpt5mP0EmNOsxRSZRMlbqjvxzDEOIUWXGmavo0ZC9+tNZCBLQ66reA11nbpHZg==
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-7.2.0.tgz#69cb1779bd90b35ab1e771e1f2f89a202c2a8a8a"
+  integrity sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==
   dependencies:
     p-locate "^6.0.0"
 
+lodash.camelcase@^4.1.1:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
+  integrity sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==
+
 lodash.kebabcase@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36"
@@ -1719,7 +2969,7 @@ lodash.merge@^4.6.2:
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-lodash@^4.17.14:
+lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.21:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -1732,6 +2982,13 @@ log-symbols@^4.1.0:
     chalk "^4.1.0"
     is-unicode-supported "^0.1.0"
 
+loupe@^2.3.1:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/loupe/-/loupe-2.3.6.tgz#76e4af498103c532d1ecc9be102036a21f787b53"
+  integrity sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==
+  dependencies:
+    get-func-name "^2.0.0"
+
 lower-case@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28"
@@ -1739,20 +2996,97 @@ lower-case@^2.0.2:
   dependencies:
     tslib "^2.0.3"
 
+lru-cache@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
+  dependencies:
+    yallist "^3.0.2"
+
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
+magic-string@^0.25.7:
+  version "0.25.9"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c"
+  integrity sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==
+  dependencies:
+    sourcemap-codec "^1.4.8"
+
+magic-string@^0.30.0:
+  version "0.30.0"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.0.tgz#fd58a4748c5c4547338a424e90fa5dd17f4de529"
+  integrity sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==
+  dependencies:
+    "@jridgewell/sourcemap-codec" "^1.4.13"
+
 magnific-popup@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/magnific-popup/-/magnific-popup-1.1.0.tgz#3e7362c5bd18f6785fe99e59d013e20af33d3049"
-  integrity sha1-PnNixb0Y9nhf6Z5Z0BPiCvM9MEk=
+  integrity sha512-ghSa/1TKsOUL6ZlHfcfFCoB9Wms2nqaDdBEPh6QX9jFYQyMkUu7ciU1mrxedWWq4NM2m1C/llhHKLt6GKRYOzg==
 
-marky@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/marky/-/marky-1.2.1.tgz#a3fcf82ffd357756b8b8affec9fdbf3a30dc1b02"
-  integrity sha512-md9k+Gxa3qLH6sUKpeC2CNkJK/Ld+bEz5X96nYwloqphQE0CKCVEKco/6jxEZixinqNdz5RFi/KaCyfbMDMAXQ==
+markdown-it-anchor@^8.4.1:
+  version "8.6.7"
+  resolved "https://registry.yarnpkg.com/markdown-it-anchor/-/markdown-it-anchor-8.6.7.tgz#ee6926daf3ad1ed5e4e3968b1740eef1c6399634"
+  integrity sha512-FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA==
 
-mdn-data@2.0.27:
-  version "2.0.27"
-  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.27.tgz#1710baa7b0db8176d3b3d565ccb7915fc69525ab"
-  integrity sha512-kwqO0I0jtWr25KcfLm9pia8vLZ8qoAKhWZuZMbneJq3jjBD3gl5nZs8l8Tu3ZBlBAHVQtDur9rdDGyvtfVraHQ==
+markdown-it@^12.3.2:
+  version "12.3.2"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.3.2.tgz#bf92ac92283fe983fe4de8ff8abfb5ad72cd0c90"
+  integrity sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==
+  dependencies:
+    argparse "^2.0.1"
+    entities "~2.1.0"
+    linkify-it "^3.0.1"
+    mdurl "^1.0.1"
+    uc.micro "^1.0.5"
+
+marked@^4.0.10:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-4.3.0.tgz#796362821b019f734054582038b116481b456cf3"
+  integrity sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==
+
+marky@^1.2.2:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/marky/-/marky-1.2.5.tgz#55796b688cbd72390d2d399eaaf1832c9413e3c0"
+  integrity sha512-q9JtQJKjpsVxCRVgQ+WapguSbKC3SQ5HEzFGPAJMStgh3QjCawp00UKv3MTTAArTmGmmPUvllHZoNbZ3gs0I+Q==
+
+matcher-collection@^1.0.0, matcher-collection@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/matcher-collection/-/matcher-collection-1.1.2.tgz#1076f506f10ca85897b53d14ef54f90a5c426838"
+  integrity sha512-YQ/teqaOIIfUHedRam08PB3NK7Mjct6BvzRnJmpGDm8uFXpNr1sbY4yuflI5JcEs6COpYA0FpRQhSDBf1tT95g==
+  dependencies:
+    minimatch "^3.0.2"
+
+matcher-collection@^2.0.0, matcher-collection@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/matcher-collection/-/matcher-collection-2.0.1.tgz#90be1a4cf58d6f2949864f65bb3b0f3e41303b29"
+  integrity sha512-daE62nS2ZQsDg9raM0IlZzLmI2u+7ZapXBwdoeBUKAYERPDDIc0qNqA8E0Rp2D+gspKR7BgIFP52GeujaGXWeQ==
+  dependencies:
+    "@types/minimatch" "^3.0.3"
+    minimatch "^3.0.2"
+
+mdn-data@2.0.30:
+  version "2.0.30"
+  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.30.tgz#ce4df6f80af6cfbe218ecd5c552ba13c4dfa08cc"
+  integrity sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==
+
+mdurl@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
+  integrity sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==
+
+merge-trees@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/merge-trees/-/merge-trees-2.0.0.tgz#a560d796e566c5d9b2c40472a2967cca48d85161"
+  integrity sha512-5xBbmqYBalWqmhYm51XlohhkmVOua3VAUrrWh8t9iOkaLpS6ifqm/UVuUjQCeDVJ9Vx3g2l6ihfkbLSTeKsHbw==
+  dependencies:
+    fs-updater "^1.0.4"
+    heimdalljs "^0.2.5"
 
 merge2@^1.3.0, merge2@^1.4.1:
   version "1.4.1"
@@ -1772,26 +3106,48 @@ mimic-fn@^2.1.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
-minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
+"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
   dependencies:
     brace-expansion "^1.1.7"
 
+minimist@^1.2.6:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
+  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
+
 mkdirp-classic@^0.5.2:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
   integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
 
-moment-timezone@0.5.39:
-  version "0.5.39"
-  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.39.tgz#342625a3b98810f04c8f4ea917e448d3525e600b"
-  integrity sha512-hoB6suq4ISDj7BDgctiOy6zljBsdYT0++0ZzZm9rtxIvJhIbQ3nmbgSWe7dNFGurl6/7b1OUkHlmN9JWgXVz7w==
+mkdirp@^0.5.0, mkdirp@^0.5.1:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
+  integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
   dependencies:
-    moment ">= 2.9.0"
+    minimist "^1.2.6"
 
-moment@2.29.4, "moment@>= 2.9.0":
+mkdirp@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
+mktemp@~0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/mktemp/-/mktemp-0.4.0.tgz#6d0515611c8a8c84e484aa2000129b98e981ff0b"
+  integrity sha512-IXnMcJ6ZyTuhRmJSjzvHSRhlVPiN9Jwc6e59V0bEJ0ba6OBeX2L0E+mRN1QseeOF4mM+F1Rit6Nh7o+rl2Yn/A==
+
+moment-timezone@0.5.43:
+  version "0.5.43"
+  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.43.tgz#3dd7f3d0c67f78c23cd1906b9b2137a09b3c4790"
+  integrity sha512-72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ==
+  dependencies:
+    moment "^2.29.4"
+
+moment@2.29.4, moment@^2.29.4:
   version "2.29.4"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
   integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
@@ -1799,7 +3155,7 @@ moment@2.29.4, "moment@>= 2.9.0":
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+  integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
 
 ms@2.1.2:
   version "2.1.2"
@@ -1809,7 +3165,7 @@ ms@2.1.2:
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
-  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
+  integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
 no-case@^3.0.4:
   version "3.0.4"
@@ -1826,15 +3182,47 @@ node-fetch@2.6.7:
   dependencies:
     whatwg-url "^5.0.0"
 
-node-releases@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.5.tgz#280ed5bc3eba0d96ce44897d8aee478bfb3d9666"
-  integrity sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==
+node-fetch@^2.6.0:
+  version "2.6.11"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.11.tgz#cde7fc71deef3131ef80a738919f999e6edfff25"
+  integrity sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==
+  dependencies:
+    whatwg-url "^5.0.0"
+
+node-releases@^2.0.12:
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.12.tgz#35627cc224a23bfb06fb3380f2b3afaaa7eb1039"
+  integrity sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ==
+
+object-assign@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
+
+object-inspect@^1.12.3, object-inspect@^1.9.0:
+  version "1.12.3"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9"
+  integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==
+
+object-keys@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
+
+object.assign@^4.1.4:
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
+  integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    has-symbols "^1.0.3"
+    object-keys "^1.1.1"
 
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
   dependencies:
     wrappy "1"
 
@@ -1846,16 +3234,16 @@ onetime@^5.1.0:
     mimic-fn "^2.1.0"
 
 optionator@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
-  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
+  version "0.9.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64"
+  integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==
   dependencies:
+    "@aashutoshrathi/word-wrap" "^1.2.3"
     deep-is "^0.1.3"
     fast-levenshtein "^2.0.6"
     levn "^0.4.1"
     prelude-ls "^1.2.1"
     type-check "^0.4.0"
-    word-wrap "^1.2.3"
 
 ora@^5.3.0, ora@^5.4.0:
   version "5.4.1"
@@ -1879,6 +3267,11 @@ ordered-read-streams@^1.0.1:
   dependencies:
     readable-stream "^2.0.1"
 
+os-tmpdir@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+  integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==
+
 p-limit@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
@@ -1887,11 +3280,11 @@ p-limit@^2.2.0:
     p-try "^2.0.0"
 
 p-limit@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.0.2.tgz#1664e010af3cadc681baafd3e2a437be7b0fb5fe"
-  integrity sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
+  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
   dependencies:
-    p-try "^2.0.0"
+    yocto-queue "^0.1.0"
 
 p-limit@^4.0.0:
   version "4.0.0"
@@ -1933,6 +3326,11 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
+parse-static-imports@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/parse-static-imports/-/parse-static-imports-1.1.0.tgz#ae2f18f18da1a993080ae406a5219455c0bbad5d"
+  integrity sha512-HlxrZcISCblEV0lzXmAHheH/8qEkKgmqkdxyHTPbSqsTUV8GzqmN1L+SSti+VbNPfbBO3bYLPHDiUs2avbAdbA==
+
 path-exists@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
@@ -1946,7 +3344,7 @@ path-exists@^5.0.0:
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
 path-key@^3.1.0:
   version "3.1.1"
@@ -1958,15 +3356,37 @@ path-parse@^1.0.7:
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
+path-posix@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/path-posix/-/path-posix-1.0.0.tgz#06b26113f56beab042545a23bfa88003ccac260f"
+  integrity sha512-1gJ0WpNIiYcQydgg3Ed8KzvIqTsDpNwq+cjBCssvBtuTWjEqY1AW+i+OepiEMqDCzyro9B2sLAe4RBPajMYFiA==
+
+path-root-regex@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
+  integrity sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==
+
+path-root@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
+  integrity sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==
+  dependencies:
+    path-root-regex "^0.1.0"
+
 path-type@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
+pathval@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.1.tgz#8534e77a77ce7ac5a2512ea21e0fdb8fcf6c3d8d"
+  integrity sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==
+
 pend@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
-  integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=
+  integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
 
 picocolors@^1.0.0:
   version "1.0.0"
@@ -1995,10 +3415,22 @@ prelude-ls@^1.2.1:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
-prettier@2.7.1, prettier@^2.0.4:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64"
-  integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==
+prettier-plugin-ember-template-tag@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/prettier-plugin-ember-template-tag/-/prettier-plugin-ember-template-tag-0.3.2.tgz#dcf4e402951d6766a9880308ea6a405c9ea5a5f1"
+  integrity sha512-L/15ujsvuOpuIB9y9XJJs/QOPgdot76T0U1Q34C19igS1lsaL/cdRw8rXIVC5Z2x362yZI33Qodo//7kK7ItkA==
+  dependencies:
+    "@babel/core" "^7.20.12"
+    "@glimmer/syntax" "^0.84.2"
+    ember-cli-htmlbars "^6.2.0"
+    ember-template-imports "^3.4.1"
+    prettier "^2.8.3"
+    ts-replace-all "^1.0.0"
+
+prettier@2.8.8, prettier@^2.0.4, prettier@^2.8.3:
+  version "2.8.8"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
+  integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
 
 process-nextick-args@~2.0.0:
   version "2.0.1"
@@ -2010,6 +3442,18 @@ progress@2.0.3:
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
+promise-map-series@^0.2.1:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/promise-map-series/-/promise-map-series-0.2.3.tgz#c2d377afc93253f6bd03dbb77755eb88ab20a847"
+  integrity sha512-wx9Chrutvqu1N/NHzTayZjE1BgIwt6SJykQoCOic4IZ9yUDjKyVYrpLa/4YCNsV61eRENfs29hrEquVuB13Zlw==
+  dependencies:
+    rsvp "^3.0.14"
+
+promise-map-series@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/promise-map-series/-/promise-map-series-0.3.0.tgz#41873ca3652bb7a042b387d538552da9b576f8a1"
+  integrity sha512-3npG2NGhTc8BWBolLLf8l/92OxMGaRLbqvIh9wjCHhDXNvk4zsxaTaCpiCunW09qWPrN2zeNSNwRLVBrQQtutA==
+
 proper-lockfile@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/proper-lockfile/-/proper-lockfile-4.1.2.tgz#c8b9de2af6b2f1601067f98e01ac66baa223141f"
@@ -2042,9 +3486,9 @@ pumpify@^2.0.1:
     pump "^3.0.0"
 
 punycode@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
+  integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
 
 puppeteer-core@^13.7.0:
   version "13.7.0"
@@ -2064,10 +3508,24 @@ puppeteer-core@^13.7.0:
     unbzip2-stream "1.4.3"
     ws "8.5.0"
 
+queue-microtask@^1.2.2:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
+  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
+
+quick-temp@^0.1.3, quick-temp@^0.1.5, quick-temp@^0.1.8:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/quick-temp/-/quick-temp-0.1.8.tgz#bab02a242ab8fb0dd758a3c9776b32f9a5d94408"
+  integrity sha512-YsmIFfD9j2zaFwJkzI6eMG7y0lQP7YeWzgtFgNl38pGWZBSXJooZbOWwkcRot7Vt0Fg9L23pX0tqWU3VvLDsiA==
+  dependencies:
+    mktemp "~0.4.0"
+    rimraf "^2.5.4"
+    underscore.string "~3.3.4"
+
 readable-stream@^2.0.1, readable-stream@~2.3.6:
-  version "2.3.7"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
-  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
+  integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
@@ -2078,15 +3536,29 @@ readable-stream@^2.0.1, readable-stream@~2.3.6:
     util-deprecate "~1.0.1"
 
 readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
-  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
+  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
   dependencies:
     inherits "^2.0.3"
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-regexpp@^3.0.0, regexpp@^3.2.0:
+regenerator-runtime@^0.13.11:
+  version "0.13.11"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
+  integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
+
+regexp.prototype.flags@^1.4.3:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz#fe7ce25e7e4cca8db37b6634c8a2c7009199b9cb"
+  integrity sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    functions-have-names "^1.2.3"
+
+regexpp@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
@@ -2099,7 +3571,7 @@ remove-trailing-separator@^1.1.0:
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+  integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
 
 requireindex@^1.2.0:
   version "1.2.0"
@@ -2109,19 +3581,47 @@ requireindex@^1.2.0:
 requireindex@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/requireindex/-/requireindex-1.1.0.tgz#e5404b81557ef75db6e49c5a72004893fe03e162"
-  integrity sha1-5UBLgVV+91225JxacgBIk/4D4WI=
+  integrity sha512-LBnkqsDE7BZKvqylbmn7lTIVdpx4K/QCduRATpO5R+wtPmky/a8pN1bO2D6wXppn1497AJF9mNjqAXr6bdl9jg==
+
+requizzle@^0.2.3:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/requizzle/-/requizzle-0.2.4.tgz#319eb658b28c370f0c20f968fa8ceab98c13d27c"
+  integrity sha512-JRrFk1D4OQ4SqovXOgdav+K8EAhSB/LJZqCz8tbX0KObcdeM15Ss59ozWMBWmmINMagCwmqn4ZNryUGpBsl6Jw==
+  dependencies:
+    lodash "^4.17.21"
 
 resolve-from@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
-resolve@^1.10.1, resolve@^1.22.1:
-  version "1.22.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
-  integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
+resolve-from@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
+  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
+
+resolve-package-path@^1.0.11:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-1.2.7.tgz#2a7bc37ad96865e239330e3102c31322847e652e"
+  integrity sha512-fVEKHGeK85bGbVFuwO9o1aU0n3vqQGrezPc51JGu9UTXpFQfWq5qCeKxyaRUSvephs+06c5j5rPq/dzHGEo8+Q==
   dependencies:
-    is-core-module "^2.9.0"
+    path-root "^0.1.1"
+    resolve "^1.10.0"
+
+resolve-package-path@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-3.1.0.tgz#35faaa5d54a9c7dd481eb7c4b2a44410c9c763d8"
+  integrity sha512-2oC2EjWbMJwvSN6Z7DbDfJMnD8MYEouaLn5eIX0j8XwPsYCVIyY9bbnX88YHVkbr8XHqvZrYbxaLPibfTYKZMA==
+  dependencies:
+    path-root "^0.1.1"
+    resolve "^1.17.0"
+
+resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.17.0, resolve@^1.22.3:
+  version "1.22.3"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.3.tgz#4b4055349ffb962600972da1fdc33c46a4eb3283"
+  integrity sha512-P8ur/gp/AmbEzjr729bZnLjXK5Z+4P0zhIJgBgzqRih7hL7BOukHGtSTA3ACMY467GRFz3duQsi0bDZdR7DKdw==
+  dependencies:
+    is-core-module "^2.12.0"
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
@@ -2150,18 +3650,49 @@ rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
+rimraf@^2.2.8, rimraf@^2.3.4, rimraf@^2.4.3, rimraf@^2.5.3, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
+  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
+  dependencies:
+    glob "^7.1.3"
+
+rsvp@^3.0.14, rsvp@^3.0.18:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
+  integrity sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==
+
+rsvp@^4.7.0, rsvp@^4.8.5:
+  version "4.8.5"
+  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
+  integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
+
+rsvp@~3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.2.1.tgz#07cb4a5df25add9e826ebc67dcc9fd89db27d84a"
+  integrity sha512-Rf4YVNYpKjZ6ASAmibcwTNciQ5Co5Ztq6iZPEykHpkoflnD/K5ryE/rHehFsTm4NJj8nKDhbi3eKBWGogmNnkg==
+
 run-parallel@^1.1.9:
-  version "1.1.9"
-  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"
-  integrity sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
+  integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
+  dependencies:
+    queue-microtask "^1.2.2"
 
 rxjs@^6.6.3:
-  version "6.6.3"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552"
-  integrity sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==
+  version "6.6.7"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
+  integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
   dependencies:
     tslib "^1.9.0"
 
+rxjs@^7.8.1:
+  version "7.8.1"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
+  integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
+  dependencies:
+    tslib "^2.1.0"
+
 safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -2172,10 +3703,26 @@ safe-buffer@~5.2.0:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
-semver@^6.1.0, semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+safe-regex-test@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295"
+  integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.3"
+    is-regex "^1.1.4"
+
+semver@^6.1.0, semver@^6.3.0, semver@^6.3.1:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
+
+semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.8:
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
+  dependencies:
+    lru-cache "^6.0.0"
 
 shebang-command@^2.0.0:
   version "2.0.0"
@@ -2189,10 +3736,31 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
+shell-quote@^1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680"
+  integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==
+
+side-channel@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
+  integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
+  dependencies:
+    call-bind "^1.0.0"
+    get-intrinsic "^1.0.2"
+    object-inspect "^1.9.0"
+
 signal-exit@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
-  integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
+  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
+
+silent-error@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/silent-error/-/silent-error-1.1.1.tgz#f72af5b0d73682a2ba1778b7e32cd8aa7c2d8662"
+  integrity sha512-n4iEKyNcg4v6/jpb3c0/iyH2G1nzUNl7Gpqtn/mHIJK9S/q/7MCfoO4rwVOoO59qPFIc0hVHvMbiOJ0NdtxKKw==
+  dependencies:
+    debug "^2.2.0"
 
 simple-html-tokenizer@^0.5.11:
   version "0.5.11"
@@ -2222,6 +3790,21 @@ source-map-js@^1.0.1:
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
   integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
 
+sourcemap-codec@^1.4.8:
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
+  integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
+
+spawn-command@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2.tgz#9544e1a43ca045f8531aac1a48cb29bdae62338e"
+  integrity sha512-zC8zGoGkmc8J9ndvml8Xksr1Amk9qBujgbF0JAIWO7kXr43w0h/0GJNM/Vustixu+YE8N/MTrQ7N31FvHUACxQ==
+
+sprintf-js@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
+  integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
+
 squoosh@discourse/squoosh#dc9649d:
   version "2.0.0"
   resolved "https://codeload.github.com/discourse/squoosh/tar.gz/dc9649d0a4d396d1251c22291b17d99f1716da44"
@@ -2242,6 +3825,47 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
+string.prototype.matchall@^4.0.5, string.prototype.matchall@^4.0.6:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz#3bf85722021816dcd1bf38bb714915887ca79fd3"
+  integrity sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+    get-intrinsic "^1.1.3"
+    has-symbols "^1.0.3"
+    internal-slot "^1.0.3"
+    regexp.prototype.flags "^1.4.3"
+    side-channel "^1.0.4"
+
+string.prototype.trim@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz#a68352740859f6893f14ce3ef1bb3037f7a90533"
+  integrity sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+
+string.prototype.trimend@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533"
+  integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+
+string.prototype.trimstart@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4"
+  integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+
 string_decoder@^1.1.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
@@ -2282,11 +3906,55 @@ supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
+supports-color@^8.1.1:
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
+  integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
+  dependencies:
+    has-flag "^4.0.0"
+
 supports-preserve-symlinks-flag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
   integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
 
+symlink-or-copy@^1.0.0, symlink-or-copy@^1.0.1, symlink-or-copy@^1.1.8, symlink-or-copy@^1.2.0, symlink-or-copy@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/symlink-or-copy/-/symlink-or-copy-1.3.1.tgz#9506dd64d8e98fa21dcbf4018d1eab23e77f71fe"
+  integrity sha512-0K91MEXFpBUaywiwSSkmKjnGcasG/rVBXFLJz5DrgGabpYD6N+3yZrfD6uUIfpuTu65DZLHi7N8CizHc07BPZA==
+
+sync-disk-cache@^1.3.3:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/sync-disk-cache/-/sync-disk-cache-1.3.4.tgz#53a2c5a09d8f4bb53160bce182a456ad71574024"
+  integrity sha512-GlkGeM81GPPEKz/lH7QUTbvqLq7K/IUTuaKDSMulP9XQ42glqNJIN/RKgSOw4y8vxL1gOVvj+W7ruEO4s36eCw==
+  dependencies:
+    debug "^2.1.3"
+    heimdalljs "^0.2.3"
+    mkdirp "^0.5.0"
+    rimraf "^2.2.8"
+    username-sync "^1.0.2"
+
+sync-disk-cache@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/sync-disk-cache/-/sync-disk-cache-2.1.0.tgz#01e879edc41c34a01fcdda5b39d47dd496e154a6"
+  integrity sha512-vngT2JmkSapgq0z7uIoYtB9kWOOzMihAAYq/D3Pjm/ODOGMgS4r++B+OZ09U4hWR6EaOdy9eqQ7/8ygbH3wehA==
+  dependencies:
+    debug "^4.1.1"
+    heimdalljs "^0.2.6"
+    mkdirp "^0.5.0"
+    rimraf "^3.0.0"
+    username-sync "^1.0.2"
+
+taffydb@2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/taffydb/-/taffydb-2.6.2.tgz#7cbcb64b5a141b6a2efc2c5d2c67b4e150b2a268"
+  integrity sha512-y3JaeRSplks6NYQuCOj3ZFMO3j60rTwbuKCvZxsAraGYH2epusatvZ0baZYA01WsGqJBq/Dl6vOrMUJqyMj8kA==
+
+taffydb@^2.7.3:
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/taffydb/-/taffydb-2.7.3.tgz#2ad37169629498fca5bc84243096d3cde0ec3a34"
+  integrity sha512-GQ3gtYFSOAxSMN/apGtDKKkbJf+8izz5YfbGqIsUc7AMiQOapARZ76dhilRY2h39cynYxBFdafQo5HUL5vgkrg==
+
 tar-fs@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"
@@ -2311,7 +3979,12 @@ tar-stream@^2.1.4:
 text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
+  integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
+
+"textextensions@1 || 2", textextensions@^2.5.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-2.6.0.tgz#d7e4ab13fe54e32e08873be40d51b74229b00fc4"
+  integrity sha512-49WtAWS+tcsy93dRt6P0P3AMD2m5PvXRhuEA0kaXos5ZLlujtYmpmFsB+QvWUSxE1ZsstmYXfQ7L40+EcQgpAQ==
 
 through2-filter@^3.0.0:
   version "3.0.0"
@@ -2332,7 +4005,23 @@ through2@~2.0.0:
 through@^2.3.8:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
+  integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
+
+tidy-jsdoc@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/tidy-jsdoc/-/tidy-jsdoc-1.4.1.tgz#609289afb4094c4b4cb4367cbce746f940232edd"
+  integrity sha512-FpH1oL6fEMMO0qPPAjoV8peAriwTjdys92TMsfMufrDERDGfmg2w90ieqOQ4RGDH7yuvDTqxR7a0W1Mfun8fzA==
+  dependencies:
+    jsdoc "^3.6.3"
+    taffydb "^2.7.3"
+    util "^0.10.3"
+
+tmp@0.0.28:
+  version "0.0.28"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.28.tgz#172735b7f614ea7af39664fa84cf0de4e515d120"
+  integrity sha512-c2mmfiBmND6SOVxzogm1oda0OJ1HZVIk/5n26N59dDTh80MUeavpiCls4PGAdkX1PFkKokLpcf7prSjCeXLsJg==
+  dependencies:
+    os-tmpdir "~1.0.1"
 
 tmp@^0.2.1:
   version "0.2.1"
@@ -2352,7 +4041,7 @@ to-absolute-glob@^2.0.2:
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
-  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
+  integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==
 
 to-regex-range@^5.0.1:
   version "5.0.1"
@@ -2364,17 +4053,40 @@ to-regex-range@^5.0.1:
 tr46@~0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-  integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
+  integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
+
+tree-kill@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
+  integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
+
+tree-sync@^1.2.2:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/tree-sync/-/tree-sync-1.4.0.tgz#314598d13abaf752547d9335b8f95d9a137100d6"
+  integrity sha512-YvYllqh3qrR5TAYZZTXdspnIhlKAYezPYw11ntmweoceu4VK+keN356phHRIIo1d+RDmLpHZrUlmxga2gc9kSQ==
+  dependencies:
+    debug "^2.2.0"
+    fs-tree-diff "^0.5.6"
+    mkdirp "^0.5.1"
+    quick-temp "^0.1.5"
+    walk-sync "^0.3.3"
+
+ts-replace-all@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ts-replace-all/-/ts-replace-all-1.0.0.tgz#ef28283ccdb4da7d69fb03cf543e09e51711659b"
+  integrity sha512-6uBtdkw3jHXkPtx/e9xB/5vcngMm17CyJYsS2YZeQ+9FdRnt6Ev5g931Sg2p+dxbtMGoCm13m3ax/obicTZIkQ==
+  dependencies:
+    core-js "^3.4.1"
 
 tslib@^1.9.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
-  integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
+  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.3, tslib@^2.3.1:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
-  integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
+tslib@^2.0.3, tslib@^2.1.0, tslib@^2.4.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.0.tgz#b295854684dbda164e181d259a22cd779dcd7bc3"
+  integrity sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==
 
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
@@ -2383,11 +4095,45 @@ type-check@^0.4.0, type-check@~0.4.0:
   dependencies:
     prelude-ls "^1.2.1"
 
+type-detect@^4.0.0, type-detect@^4.0.5:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
+  integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
+
 type-fest@^0.20.2:
   version "0.20.2"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
   integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
 
+typed-array-length@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb"
+  integrity sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==
+  dependencies:
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    is-typed-array "^1.1.9"
+
+typescript@^5.1.3:
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.6.tgz#02f8ac202b6dad2c0dd5e0913745b47a37998274"
+  integrity sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==
+
+uc.micro@^1.0.1, uc.micro@^1.0.5:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
+  integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
+
+unbox-primitive@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
+  integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==
+  dependencies:
+    call-bind "^1.0.2"
+    has-bigints "^1.0.2"
+    has-symbols "^1.0.3"
+    which-boxed-primitive "^1.0.2"
+
 unbzip2-stream@1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7"
@@ -2399,7 +4145,20 @@ unbzip2-stream@1.4.3:
 unc-path-regex@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
-  integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo=
+  integrity sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==
+
+underscore.string@~3.3.4:
+  version "3.3.6"
+  resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.6.tgz#ad8cf23d7423cb3b53b898476117588f4e2f9159"
+  integrity sha512-VoC83HWXmCrF6rgkyxS9GHv8W9Q5nhMKho+OadDJGzL2oDYbYEppBaCMH6pFlwLeqj2QS+hhkw2kpXkSdD1JxQ==
+  dependencies:
+    sprintf-js "^1.1.1"
+    util-deprecate "^1.0.2"
+
+underscore@~1.13.2:
+  version "1.13.6"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441"
+  integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==
 
 unique-stream@^2.3.1:
   version "2.3.1"
@@ -2409,6 +4168,11 @@ unique-stream@^2.3.1:
     json-stable-stringify-without-jsonify "^1.0.1"
     through2-filter "^3.0.0"
 
+universalify@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
+
 universalify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
@@ -2419,56 +4183,176 @@ upath@^2.0.1:
   resolved "https://registry.yarnpkg.com/upath/-/upath-2.0.1.tgz#50c73dea68d6f6b990f51d279ce6081665d61a8b"
   integrity sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==
 
-update-browserslist-db@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.4.tgz#dbfc5a789caa26b1db8990796c2c8ebbce304824"
-  integrity sha512-jnmO2BEGUjsMOe/Fg9u0oczOe/ppIDZPebzccl1yDWGLFP16Pa1/RM5wEoKYPG2zstNcDuAStejyxsOuKINdGA==
+update-browserslist-db@^1.0.11:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940"
+  integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==
   dependencies:
     escalade "^3.1.1"
     picocolors "^1.0.0"
 
 uri-js@^4.2.2:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz#aa714261de793e8a82347a7bcc9ce74e86f28602"
-  integrity sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
   dependencies:
     punycode "^2.1.0"
 
-util-deprecate@^1.0.1, util-deprecate@~1.0.1:
+username-sync@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/username-sync/-/username-sync-1.0.3.tgz#ae41c5c8a4c8c2ecc1443a7d0742742bd7e36732"
+  integrity sha512-m/7/FSqjJNAzF2La448c/aEom0gJy7HY7Y509h6l0ePvEkFictAGptwWaj1msWJ38JbfEDOUoE8kqFee9EHKdA==
+
+util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+  integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
-v8-compile-cache@^2.0.3, v8-compile-cache@^2.3.0:
+util@^0.10.3:
+  version "0.10.4"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"
+  integrity sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==
+  dependencies:
+    inherits "2.0.3"
+
+uuid@^8.3.2:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
+
+v8-compile-cache@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
   integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
 
+validate-peer-dependencies@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/validate-peer-dependencies/-/validate-peer-dependencies-1.2.0.tgz#22aab93c514f4fda457d36c80685e8b1160d2036"
+  integrity sha512-nd2HUpKc6RWblPZQ2GDuI65sxJ2n/UqZwSBVtj64xlWjMx0m7ZB2m9b2JS3v1f+n9VWH/dd1CMhkHfP6pIdckA==
+  dependencies:
+    resolve-package-path "^3.1.0"
+    semver "^7.3.2"
+
+vscode-jsonrpc@8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0.tgz#cb9989c65e219e18533cc38e767611272d274c94"
+  integrity sha512-6TDy/abTQk+zDGYazgbIPc+4JoXdwC8NHU9Pbn4UJP1fehUyZmM4RHp5IthX7A6L5KS30PRui+j+tbbMMMafdw==
+
+vscode-languageserver-protocol@3.17.3:
+  version "3.17.3"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3.tgz#6d0d54da093f0c0ee3060b81612cce0f11060d57"
+  integrity sha512-924/h0AqsMtA5yK22GgMtCYiMdCOtWTSGgUOkgEDX+wk2b0x4sAfLiO4NxBxqbiVtz7K7/1/RgVrVI0NClZwqA==
+  dependencies:
+    vscode-jsonrpc "8.1.0"
+    vscode-languageserver-types "3.17.3"
+
+vscode-languageserver-textdocument@^1.0.5:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.8.tgz#9eae94509cbd945ea44bca8dcfe4bb0c15bb3ac0"
+  integrity sha512-1bonkGqQs5/fxGT5UchTgjGVnfysL0O8v1AYMBjqTbWQTFn721zaPGDYFkOKtfDgFiSgXM3KwaG3FMGfW4Ed9Q==
+
+vscode-languageserver-types@3.17.3:
+  version "3.17.3"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.3.tgz#72d05e47b73be93acb84d6e311b5786390f13f64"
+  integrity sha512-SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA==
+
+vscode-languageserver@^8.0.1:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-8.1.0.tgz#5024253718915d84576ce6662dd46a791498d827"
+  integrity sha512-eUt8f1z2N2IEUDBsKaNapkz7jl5QpskN2Y0G01T/ItMxBxw1fJwvtySGB9QMecatne8jFIWJGWI61dWjyTLQsw==
+  dependencies:
+    vscode-languageserver-protocol "3.17.3"
+
+vscode-uri@^3.0.2:
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.7.tgz#6d19fef387ee6b46c479e5fb00870e15e58c1eb8"
+  integrity sha512-eOpPHogvorZRobNqJGhapa0JdwaxpjVvyBp0QIUMRMSf8ZAlqOdEquKuRmw9Qwu0qXtJIWqFtMkmvJjUZmMjVA==
+
+walk-sync@^0.3.1, walk-sync@^0.3.3:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-0.3.4.tgz#cf78486cc567d3a96b5b2237c6108017a5ffb9a4"
+  integrity sha512-ttGcuHA/OBnN2pcM6johpYlEms7XpO5/fyKIr48541xXedan4roO8cS1Q2S/zbbjGH/BarYDAMeS2Mi9HE5Tig==
+  dependencies:
+    ensure-posix-path "^1.0.0"
+    matcher-collection "^1.0.0"
+
+walk-sync@^1.0.0, walk-sync@^1.1.3:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-1.1.4.tgz#81049f3d8095479b49574cfa5f558d7a252b127d"
+  integrity sha512-nowc9thB/Jg0KW4TgxoRjLLYRPvl3DB/98S89r4ZcJqq2B0alNcKDh6pzLkBSkPMzRSMsJghJHQi79qw0YWEkA==
+  dependencies:
+    "@types/minimatch" "^3.0.3"
+    ensure-posix-path "^1.1.0"
+    matcher-collection "^1.1.1"
+
+walk-sync@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-2.2.0.tgz#80786b0657fcc8c0e1c0b1a042a09eae2966387a"
+  integrity sha512-IC8sL7aB4/ZgFcGI2T1LczZeFWZ06b3zoHH7jBPyHxOtIIz1jppWHjjEXkOFvFojBVAK9pV7g47xOZ4LW3QLfg==
+  dependencies:
+    "@types/minimatch" "^3.0.3"
+    ensure-posix-path "^1.1.0"
+    matcher-collection "^2.0.0"
+    minimatch "^3.0.4"
+
+walk-sync@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-3.0.0.tgz#67f882925021e20569a1edd560b8da31da8d171c"
+  integrity sha512-41TvKmDGVpm2iuH7o+DAOt06yyu/cSHpX3uzAwetzASvlNtVddgIjXIb2DfB/Wa20B1Jo86+1Dv1CraSU7hWdw==
+  dependencies:
+    "@types/minimatch" "^3.0.4"
+    ensure-posix-path "^1.1.0"
+    matcher-collection "^2.0.1"
+    minimatch "^3.0.4"
+
 wasm-feature-detect@^1.2.11:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/wasm-feature-detect/-/wasm-feature-detect-1.3.0.tgz#fb3fc5dd4a1ba950a429be843daad67fe048bc42"
-  integrity sha512-w9datO3OReMouWgKOelvu1CozmLK/VbkXOtlzNTanBJpR0uBHyUwS3EYdXf5vBPoHKYS0lpuYo91rpqMNIZM9g==
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/wasm-feature-detect/-/wasm-feature-detect-1.5.1.tgz#0db57a7d7f8c26b743dde85386215ae2b135e78a"
+  integrity sha512-GHr23qmuehNXHY4902/hJ6EV5sUANIJC3R/yMfQ7hWDg3nfhlcJfnIL96R2ohpIwa62araN6aN4bLzzzq5GXkg==
 
 wcwidth@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
-  integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=
+  integrity sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==
   dependencies:
     defaults "^1.0.3"
 
 webidl-conversions@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-  integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
+  integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
 
 whatwg-url@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
-  integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0=
+  integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
   dependencies:
     tr46 "~0.0.3"
     webidl-conversions "^3.0.0"
 
+which-boxed-primitive@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
+  integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
+  dependencies:
+    is-bigint "^1.0.1"
+    is-boolean-object "^1.1.0"
+    is-number-object "^1.0.4"
+    is-string "^1.0.5"
+    is-symbol "^1.0.3"
+
+which-typed-array@^1.1.9:
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6"
+  integrity sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==
+  dependencies:
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
+    has-tostringtag "^1.0.0"
+    is-typed-array "^1.1.10"
+
 which@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
@@ -2476,53 +4360,10 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
-word-wrap@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
-
-workbox-cacheable-response@^4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-4.3.1.tgz#f53e079179c095a3f19e5313b284975c91428c91"
-  integrity sha512-Rp5qlzm6z8IOvnQNkCdO9qrDgDpoPNguovs0H8C+wswLuPgSzSp9p2afb5maUt9R1uTIwOXrVQMmPfPypv+npw==
-  dependencies:
-    workbox-core "^4.3.1"
-
-workbox-core@^4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-4.3.1.tgz#005d2c6a06a171437afd6ca2904a5727ecd73be6"
-  integrity sha512-I3C9jlLmMKPxAC1t0ExCq+QoAMd0vAAHULEgRZ7kieCdUd919n53WC0AfvokHNwqRhGn+tIIj7vcb5duCjs2Kg==
-
-workbox-expiration@^4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-4.3.1.tgz#d790433562029e56837f341d7f553c4a78ebe921"
-  integrity sha512-vsJLhgQsQouv9m0rpbXubT5jw0jMQdjpkum0uT+d9tTwhXcEZks7qLfQ9dGSaufTD2eimxbUOJfWLbNQpIDMPw==
-  dependencies:
-    workbox-core "^4.3.1"
-
-workbox-routing@^4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-4.3.1.tgz#a675841af623e0bb0c67ce4ed8e724ac0bed0cda"
-  integrity sha512-FkbtrODA4Imsi0p7TW9u9MXuQ5P4pVs1sWHK4dJMMChVROsbEltuE79fBoIk/BCztvOJ7yUpErMKa4z3uQLX+g==
-  dependencies:
-    workbox-core "^4.3.1"
-
-workbox-strategies@^4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-4.3.1.tgz#d2be03c4ef214c115e1ab29c9c759c9fe3e9e646"
-  integrity sha512-F/+E57BmVG8dX6dCCopBlkDvvhg/zj6VDs0PigYwSN23L8hseSRwljrceU2WzTvk/+BSYICsWmRq5qHS2UYzhw==
-  dependencies:
-    workbox-core "^4.3.1"
-
-workbox-sw@^4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-4.3.1.tgz#df69e395c479ef4d14499372bcd84c0f5e246164"
-  integrity sha512-0jXdusCL2uC5gM3yYFT6QMBzKfBr2XTk0g5TPAV4y8IZDyVNDyj1a8uSXy3/XrvkVTmQvLN4O5k3JawGReXr9w==
-
-workerpool@^6.1.5:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343"
-  integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==
+workerpool@^6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.4.0.tgz#f8d5cfb45fde32fa3b7af72ad617c3369567a462"
+  integrity sha512-i3KR1mQMNwY2wx20ozq2EjISGtQWDIfV56We+yGJ5yDs8jTwQiLLaqHlkBHITlCuJnYlVRmXegxFxZg7gqI++A==
 
 wrap-ansi@^7.0.0:
   version "7.0.0"
@@ -2536,7 +4377,7 @@ wrap-ansi@^7.0.0:
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
 ws@8.5.0:
   version "8.5.0"
@@ -2544,9 +4385,14 @@ ws@8.5.0:
   integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==
 
 ws@^7.2.0:
-  version "7.5.7"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67"
-  integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==
+  version "7.5.9"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
+  integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
+
+xmlcreate@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/xmlcreate/-/xmlcreate-2.0.4.tgz#0c5ab0f99cdd02a81065fa9cd8f8ae87624889be"
+  integrity sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg==
 
 xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.2"
@@ -2558,32 +4404,47 @@ y18n@^5.0.5:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
   integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
 
-yargs-parser@^21.0.0:
-  version "21.0.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.1.tgz#0267f286c877a4f0f728fceb6f8a3e4cb95c6e35"
-  integrity sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==
+yallist@^3.0.2:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
 
-yargs@^17.5.1:
-  version "17.5.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.5.1.tgz#e109900cab6fcb7fd44b1d8249166feb0b36e58e"
-  integrity sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==
+yallist@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+
+yargs-parser@^21.1.1:
+  version "21.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
+  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
+
+yargs@^17.5.1, yargs@^17.7.2:
+  version "17.7.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
+  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
   dependencies:
-    cliui "^7.0.2"
+    cliui "^8.0.1"
     escalade "^3.1.1"
     get-caller-file "^2.0.5"
     require-directory "^2.1.1"
     string-width "^4.2.3"
     y18n "^5.0.5"
-    yargs-parser "^21.0.0"
+    yargs-parser "^21.1.1"
 
 yauzl@^2.10.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
-  integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=
+  integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==
   dependencies:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.1.0"
 
+yocto-queue@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
+  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
+
 yocto-queue@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251"